diff --git a/.gitignore b/.gitignore
index d1d0e009f9b4..8a96be4c6e44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -548,55 +548,6 @@ extra/resolve_stack_dump
 extra/resolveip
 extra/sql_state.h
 extra/tztime.cc
-extra/yassl/src/.deps/buffer.Plo
-extra/yassl/src/.deps/cert_wrapper.Plo
-extra/yassl/src/.deps/crypto_wrapper.Plo
-extra/yassl/src/.deps/handshake.Plo
-extra/yassl/src/.deps/lock.Plo
-extra/yassl/src/.deps/log.Plo
-extra/yassl/src/.deps/socket_wrapper.Plo
-extra/yassl/src/.deps/ssl.Plo
-extra/yassl/src/.deps/template_instnt.Plo
-extra/yassl/src/.deps/timer.Plo
-extra/yassl/src/.deps/yassl_error.Plo
-extra/yassl/src/.deps/yassl_imp.Plo
-extra/yassl/src/.deps/yassl_int.Plo
-extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
-extra/yassl/taocrypt/benchmark/benchmark
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
-extra/yassl/taocrypt/test/.deps/test-test.Po
-extra/yassl/taocrypt/test/test
-extra/yassl/testsuite/.deps/testsuite-client.Po
-extra/yassl/testsuite/.deps/testsuite-echoclient.Po
-extra/yassl/testsuite/.deps/testsuite-echoserver.Po
-extra/yassl/testsuite/.deps/testsuite-server.Po
-extra/yassl/testsuite/.deps/testsuite-test.Po
-extra/yassl/testsuite/.deps/testsuite-testsuite.Po
-extra/yassl/testsuite/testsuite
 fcns.c
 fcns.h
 gdbinit
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index ac66613e6855..24375587d1d3 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
@@ -100,11 +106,8 @@ path=`dirname $0`
 export AM_MAKEFLAGS
 AM_MAKEFLAGS="-j 6"
 
-# SSL library to use.--with-ssl will select our bundled yaSSL
-# implementation of SSL. To use openSSl you will nee too point out
-# the location of openSSL headers and lbs on your system.
-# Ex --with-ssl=/usr
-SSL_LIBRARY=--with-ssl
+# SSL library to use.
+SSL_LIBRARY=--with-ssl=system
 
 if [ "x$warning_mode" = "xpedantic" ]; then
   warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
@@ -232,11 +235,9 @@ fi
 
 # The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
 # code with profiling information used by gcov.
-# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
 # The -DHAVE_gcov enables code to write out coverage info even when crashing.
 
 gcov_compile_flags="-fprofile-arcs -ftest-coverage"
-gcov_compile_flags="$gcov_compile_flags -DDISABLE_TAO_ASM"
 gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
 
 # GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well
diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh
index 1d7cf5561ad8..6af8591451bd 100755
--- a/BUILD/autorun.sh
+++ b/BUILD/autorun.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/BUILD/cmake_configure.sh b/BUILD/cmake_configure.sh
index 668d6a81b5c2..b23e864935a9 100644
--- a/BUILD/cmake_configure.sh
+++ b/BUILD/cmake_configure.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 4adb92f6f1c9..2ecc41fa2fc8 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
index 07a3faa5cb5b..7a823ecb3b72 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug
index 707f727479e2..76815280909e 100755
--- a/BUILD/compile-pentium-debug
+++ b/BUILD/compile-pentium-debug
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index 4dc468eb468f..f0c999b19086 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/BUILD/compile-pentium-debug-max-no-ndb b/BUILD/compile-pentium-debug-max-no-ndb
index 1001c0648a43..d7b88ea51fe0 100755
--- a/BUILD/compile-pentium-debug-max-no-ndb
+++ b/BUILD/compile-pentium-debug-max-no-ndb
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 40d08287b6b9..0bf5783fe0b3 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium-gprof
index 0ff56002fd6f..e3cd5c0c00fb 100755
--- a/BUILD/compile-pentium-gprof
+++ b/BUILD/compile-pentium-gprof
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
index 4601dad68a54..dbd7ca7fe205 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium-valgrind-max
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/BUILD/compile-pentium-valgrind-max-no-ndb b/BUILD/compile-pentium-valgrind-max-no-ndb
index af385328898c..682106343cf3 100755
--- a/BUILD/compile-pentium-valgrind-max-no-ndb
+++ b/BUILD/compile-pentium-valgrind-max-no-ndb
@@ -1,16 +1,22 @@
 #! /bin/sh
 
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/BUILD/compile-pentium64 b/BUILD/compile-pentium64
index e62ae2298409..6bcddc4d224f 100755
--- a/BUILD/compile-pentium64
+++ b/BUILD/compile-pentium64
@@ -1,16 +1,22 @@
 #! /bin/sh
 
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 151af7f435a5..e7a898b74264 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,29 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 IF(WIN32)
   # CMake 2.8.12 is needed for Visual Studio 2013
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+  # CMake 3.1.0 is needed for $<TARGET_PDB_FILE:${target}>
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
 ELSE()
   # There's a bug in unzipping prior to 2.8.2
   # Debian 7 has the oldest cmake we need to support
@@ -33,16 +41,27 @@ IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
  CMAKE_POLICY(SET CMP0022 OLD)
 ENDIF()
 
-# We use the LOCATION target property (CMP0026)
-# and get_target_property() for non-existent targets (CMP0045)
+# We use get_target_property() for non-existent targets (CMP0045)
 # and INSTALL_NAME_DIR (CMP0042)
 IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
    CMAKE_VERSION VERSION_GREATER "3.0.0")
- CMAKE_POLICY(SET CMP0026 OLD)
  CMAKE_POLICY(SET CMP0045 OLD)
  CMAKE_POLICY(SET CMP0042 OLD)
 ENDIF()
 
+# In CMake 3.12 and above, the
+#
+# * ``check_include_file`` macro in the ``CheckIncludeFile`` module, the
+# * ``check_include_file_cxx`` macro in the
+#   ``CheckIncludeFileCXX`` module, and the
+# * ``check_include_files`` macro in the ``CheckIncludeFiles`` module
+#
+# now prefer to link the check executable to the libraries listed in the
+# ``CMAKE_REQUIRED_LIBRARIES`` variable.
+IF(POLICY CMP0075)
+  CMAKE_POLICY(SET CMP0075 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 # Will set GIT_EXECUTABLE and GIT_FOUND
@@ -126,12 +145,41 @@ ENDIF()
 
 PROJECT(${MYSQL_PROJECT_NAME})
 
+MACRO(REPORT_CXX_FLAGS)
+  MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+  FOREACH(BUILD_TYPE "" _DEBUG _RELWITHDEBINFO _RELEASE _MINSIZEREL)
+    SET(flag "CMAKE_CXX_FLAGS${BUILD_TYPE}")
+    MESSAGE(STATUS "${flag}: ${${flag}}")
+  ENDFOREACH()
+ENDMACRO()
+
+# STRING(APPEND ...) from cmake VERSION 3.4
+MACRO(STRING_APPEND STRING_VAR INPUT)
+  SET(${STRING_VAR} "${${STRING_VAR}}${INPUT}")
+ENDMACRO()
+
+MACRO(STRING_PREPEND STRING_VAR INPUT)
+  SET(${STRING_VAR} "${INPUT}${${STRING_VAR}}")
+ENDMACRO()
+
 SET(BUILD_IS_SINGLE_CONFIG TRUE)
 MESSAGE(STATUS "CMAKE_GENERATOR: ${CMAKE_GENERATOR}")
 IF(CMAKE_GENERATOR MATCHES "Visual Studio" OR CMAKE_GENERATOR STREQUAL "Xcode")
   SET(BUILD_IS_SINGLE_CONFIG FALSE)
 ENDIF()
 
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_COMPILER_IS_CLANG 1)
+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  SET(MY_COMPILER_IS_GNU 1)
+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+  SET(MY_COMPILER_IS_SUNPRO 1)
+ENDIF()
+
+IF(MY_COMPILER_IS_CLANG OR MY_COMPILER_IS_GNU)
+  SET(MY_COMPILER_IS_GNU_OR_CLANG 1)
+ENDIF()
+
 # Maintainer mode is default on only for debug builds using GCC/G++
 IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
   IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
@@ -190,6 +238,10 @@ ENDIF()
 INCLUDE(CheckTypeSize)
 CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
 MESSAGE(STATUS "SIZEOF_VOIDP ${SIZEOF_VOIDP}")
+# On some platforms, cmake may think that CMAKE_SIZEOF_VOID_P == 4
+# even if we have configured for 64bit build....
+SET(CMAKE_SIZEOF_VOID_P ${SIZEOF_VOIDP})
+
 IF(WITH_DEFAULT_COMPILER_OPTIONS)
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/build_configurations/compiler_options.cmake)
 ENDIF()
@@ -197,13 +249,19 @@ IF(WITH_DEFAULT_FEATURE_SET)
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/build_configurations/feature_set.cmake)
 ENDIF()
 
+INCLUDE(CMakePushCheckState)
+
 # Add macros
 INCLUDE(character_sets)
+INCLUDE(compile_flags)
 INCLUDE(cpu_info)
 INCLUDE(zlib)
 INCLUDE(lz4)
 INCLUDE(libevent)
 INCLUDE(ssl)
+INCLUDE(sasl)
+INCLUDE(ldap)
+INCLUDE(rpc)
 INCLUDE(readline)
 INCLUDE(protobuf)
 INCLUDE(mysql_version)
@@ -239,6 +297,9 @@ ENDIF()
 IF(NOT WITHOUT_SERVER)
   OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 ENDIF()
+OPTION(WITH_AUTHENTICATION_LDAP
+  "Report error if the LDAP authentication plugin cannot be built." OFF)
+
 OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
 MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER)
 
@@ -279,20 +340,53 @@ MACRO (MY_CHECK_CXX_COMPILER_FLAG FLAG RESULT)
   SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
 ENDMACRO()
 
+# Check whether a specific warning option is supported.
+# Intended use is primarily to silence warnings from third-party code.
+# If *our* code has warnings with gcc[56789] or clang[345678] the
+# code should be fixed, rather than silencing the compiler warnings.
+#
+# Returns the corresponding "-Wno-<option>" if supported, 0 otherwise.
+# WARNING_OPTION should be as found in clang/gcc documentation.
+# Note: Sun Studio accepts/ignores anything starting with "-W".
+#       Visual Studio has a few /W options, but are totally different.
+# Hence we check for gcc/clang only.
+# No return value for functions in cmake, so we use an output argument.
+FUNCTION(MY_CHECK_CXX_COMPILER_WARNING WARNING_OPTION RETURN_VALUE)
+  # Strip off possible leading -Wno- or -W
+  STRING(REGEX REPLACE "^-Wno-" "" WARNING_OPTION ${WARNING_OPTION})
+  STRING(REGEX REPLACE "^-W" "" WARNING_OPTION ${WARNING_OPTION})
+  # Use HAVE_CXX_W_warning_option as cache variable.
+  STRING(REPLACE "-" "_" VAR_NAME ${WARNING_OPTION})
+  STRING(REPLACE "=" "_" VAR_NAME ${VAR_NAME})
+  STRING(REPLACE "c++" "cpp" VAR_NAME ${VAR_NAME})
+  SET(VAR_NAME "HAVE_CXX_W_${VAR_NAME}")
+  IF(MY_COMPILER_IS_GNU_OR_CLANG)
+    MY_CHECK_CXX_COMPILER_FLAG("-W${WARNING_OPTION}" ${VAR_NAME})
+  ELSE()
+    SET(${VAR_NAME} 0 CACHE INTERNAL "-W${WARNING_OPTION} not supported")
+  ENDIF()
+  IF(${VAR_NAME})
+    SET(${RETURN_VALUE} "-Wno-${WARNING_OPTION}" PARENT_SCOPE)
+  ELSE()
+    SET(${RETURN_VALUE} 0 PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
 MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
   MY_CHECK_C_COMPILER_FLAG("${SAN_OPT}" C_RESULT)
   MY_CHECK_CXX_COMPILER_FLAG("${SAN_OPT}" CXX_RESULT)
   IF(C_RESULT AND CXX_RESULT)
+    STRING_APPEND(CMAKE_C_FLAGS   " ${SAN_OPT}")
+    STRING_APPEND(CMAKE_CXX_FLAGS " ${SAN_OPT}")
     # We switch on basic optimization also for debug builds.
+    # We disable inlining for stack trace readability.
     # With optimization we may get some warnings, so we switch off -Werror
-    SET(CMAKE_C_FLAGS_DEBUG
-      "${CMAKE_C_FLAGS_DEBUG} ${SAN_OPT} -O1 -Wno-error -fPIC")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO
-      "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -fPIC")
-    SET(CMAKE_CXX_FLAGS_DEBUG
-      "${CMAKE_CXX_FLAGS_DEBUG} ${SAN_OPT} -O1 -Wno-error -fPIC")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -fPIC")
+    STRING_APPEND(CMAKE_C_FLAGS   " -O1 -fno-inline -fPIC")
+    STRING_APPEND(CMAKE_CXX_FLAGS " -O1 -fno-inline -fPIC")
+    IF(NOT SANITIZE_MAINTAINER_MODE)
+      SET(MYSQL_MAINTAINER_MODE OFF CACHE BOOL
+        "MySQL maintainer-specific development environment" FORCE)
+    ENDIF()
     SET(${RESULT} 1)
   ELSE()
     SET(${RESULT} 0)
@@ -300,24 +394,18 @@ MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
 ENDMACRO()
 
 OPTION(WITH_ASAN "Enable address sanitizer" OFF)
-OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" OFF)
 IF(WITH_ASAN)
   MY_SANITIZER_CHECK("-fsanitize=address" WITH_ASAN_OK)
   IF(WITH_ASAN_OK)
+    OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" ON)
     SET(HAVE_ASAN 1)
     # This works with clang, but not gcc it seems.
     MY_CHECK_CXX_COMPILER_FLAG(
       "-fsanitize=address -fsanitize-address-use-after-scope"
       HAVE_SANITIZE_SCOPE)
     IF(WITH_ASAN_SCOPE AND HAVE_SANITIZE_SCOPE)
-      SET(CMAKE_C_FLAGS_DEBUG
-        "${CMAKE_C_FLAGS_DEBUG} -fsanitize-address-use-after-scope")
-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO
-        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize-address-use-after-scope")
-      SET(CMAKE_CXX_FLAGS_DEBUG
-        "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize-address-use-after-scope")
-      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-        "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fsanitize-address-use-after-scope")
+      STRING_APPEND(CMAKE_C_FLAGS   " -fsanitize-address-use-after-scope")
+      STRING_APPEND(CMAKE_CXX_FLAGS " -fsanitize-address-use-after-scope")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Do not know how to enable address sanitizer")
@@ -351,30 +439,20 @@ IF(WITH_ASAN AND WITH_MSAN)
 ENDIF()
 
 
-# Always enable debug sync for debug builds.
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
- 
 # Older versions of ccache must be disabled: export CCACHE_DISABLE=1
 # See http://www.cmake.org/Wiki/CTest/Coverage
 OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
 IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
-  SET(CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
-  SET(CMAKE_C_FLAGS_DEBUG
-    "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
-  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG
-    "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
+  STRING_APPEND(CMAKE_C_FLAGS   " -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
+  STRING_APPEND(CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs -ftest-coverage -lgcov")
 ENDIF()
 
 OPTION(ENABLE_GPROF "Enable gprof (optimized, Linux builds only)" OFF)
 IF (ENABLE_GPROF AND NOT WIN32 AND NOT APPLE)
-  SET(CMAKE_C_FLAGS_RELWITHDEBINFO
-    "${CMAKE_C_FLAGS_RELWITHDEBINFO} -pg")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -pg")
-  SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-    "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -pg")
+  STRING_APPEND(CMAKE_C_FLAGS " -pg")
+  STRING_APPEND(CMAKE_CXX_FLAGS " -pg")
+  STRING_APPEND(CMAKE_EXE_LINKER_FLAGS " -pg")
 ENDIF()
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -393,12 +471,8 @@ IF(REPRODUCIBLE_BUILD)
     SET(DEBUG_PREFIX_FLAGS "${DEBUG_PREFIX_FLAGS} -gno-record-gcc-switches")
   ENDIF()
 
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${DEBUG_PREFIX_FLAGS}")
-  SET(CMAKE_C_FLAGS_RELWITHDEBINFO
-    "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${DEBUG_PREFIX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_PREFIX_FLAGS}")
-  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${DEBUG_PREFIX_FLAGS}")
+  STRING_APPEND(CMAKE_C_FLAGS   " ${DEBUG_PREFIX_FLAGS}")
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${DEBUG_PREFIX_FLAGS}")
 
   SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--build-id=none")
   SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--build-id=none")
@@ -435,31 +509,18 @@ IF(WITH_TEST_TRACE_PLUGIN AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
           Set WITH_TEST_TRACE_PLUGIN to OFF or WITH_DEBUG to ON.")
 ENDIF()
 
-# Set DBUG_OFF and other optional release-only flags for non-debug project types
-FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
-  FOREACH(LANG C CXX)
-    SET(CMAKE_${LANG}_FLAGS_${BUILD_TYPE} 
-     "${CMAKE_${LANG}_FLAGS_${BUILD_TYPE}} -DDBUG_OFF")
-  ENDFOREACH()
-ENDFOREACH()
-
-IF(NOT CMAKE_BUILD_TYPE
-    AND NOT CMAKE_GENERATOR MATCHES "Visual Studio" 
-    AND NOT CMAKE_GENERATOR MATCHES "Xcode") 
-    # This is the case of no CMAKE_BUILD_TYPE choosen, typical for VS and Xcode
-    # or if custom C flags are set. In VS and Xcode for non-Debug configurations 
-    # DBUG_OFF is already correctly set.
-    ADD_DEFINITIONS(-DDBUG_OFF)
-ENDIF()
-
 # Add safemutex for debug configurations
 IF(NOT WITH_INNODB_MEMCACHED)
   FOREACH(LANG C CXX)
-      SET(CMAKE_${LANG}_FLAGS_DEBUG
-          "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX")
+    STRING_PREPEND(CMAKE_${LANG}_FLAGS_DEBUG "-DSAFE_MUTEX ")
   ENDFOREACH()
 ENDIF()
 
+# Enable debug sync for debug builds.
+FOREACH(LANG C CXX)
+  STRING_PREPEND(CMAKE_${LANG}_FLAGS_DEBUG "-DENABLED_DEBUG_SYNC ")
+ENDFOREACH()
+
 
 # Set commonly used variables
 IF(WIN32)
@@ -520,6 +581,15 @@ ENDIF()
 # Run platform tests
 INCLUDE(configure.cmake)
 
+IF(APPLE)
+  # Homebrew default location is
+  IF(APPLE_ARM)
+    SET(HOMEBREW_HOME "/opt/homebrew/opt")
+  ELSE()
+    SET(HOMEBREW_HOME "/usr/local/opt")
+  ENDIF()
+ENDIF()
+
 # Common defines and includes
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 INCLUDE_DIRECTORIES(
@@ -528,8 +598,8 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/include
   ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
 # Add bundled or system zlib.
-MYSQL_CHECK_ZLIB_WITH_COMPRESS()
-# Add bundled yassl/taocrypt or system openssl.
+MYSQL_CHECK_ZLIB()
+# Add openssl.
 MYSQL_CHECK_SSL()
 # Add system/bundled editline.
 MYSQL_CHECK_EDITLINE()
@@ -537,6 +607,10 @@ MYSQL_CHECK_EDITLINE()
 MYSQL_CHECK_LIBEVENT()
 # Add lz4 library
 MYSQL_CHECK_LZ4()
+# Add SASL library
+MYSQL_CHECK_SASL()
+# Add LDAP library
+MYSQL_CHECK_LDAP()
 # Add protoc and libprotobuf
 IF(NOT WITHOUT_SERVER)
   MYSQL_CHECK_PROTOBUF()
@@ -632,6 +706,11 @@ ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(libbinlogevents)
 ADD_SUBDIRECTORY(libbinlogstandalone)
 
+# gcc9 will not allow CTORs to do memset(this, 0, sizeof(*this));
+IF(CMAKE_COMPILER_IS_GNUCXX AND NOT GXX_VERSION VERSION_LESS 9)
+  STRING_APPEND(CMAKE_CXX_FLAGS " -Wno-class-memaccess")
+ENDIF()
+
 IF(NOT WITHOUT_SERVER)
   SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
   SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
@@ -746,13 +825,14 @@ ENDIF()
 # RPM installs documentation directly from the source tree
 #
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-  INSTALL(FILES COPYING LICENSE.mysql 
-  DESTINATION ${INSTALL_DOCREADMEDIR} 
-  COMPONENT Readme
-  OPTIONAL
-  )
-  INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-  INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
+  INSTALL(FILES
+    README
+    LICENSE
+    DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+  INSTALL(FILES
+    ${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+    ${CMAKE_BINARY_DIR}/Docs/INFO_BIN
+    DESTINATION ${INSTALL_DOCDIR} COMPONENT Info)
 
   # MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory
   SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
@@ -770,18 +850,28 @@ ENDIF()
 
 INCLUDE(CPack)
 
-# C compiler flags consist of:
+# C/CXX compiler flags consist of:
 # CPPFLAGS        Taken from environment, see above.
 # ADD_DEFINITIONS In each individual CMakeLists.txt
-# CMAKE_C_FLAGS   From command line.
+# CMAKE_CXX_FLAGS From command line.
 #                 We extend these in maintainer.cmake
-# ENV{CFLAGS}     From environment, but environment is ignored if
-#                 CMAKE_C_FLAGS is also given on command line
-# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}
 #                 We extend these in compiler_options.cmake
+# ENV{CXXFLAGS}   From environment, but environment is ignored if
+#                 CMAKE_CXX_FLAGS is also given on command line
+# CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}, typical initial cmake values:
+#      DEBUG          -g
+#      RELWITHDEBINFO -O2 -g -DNDEBUG
+#      RELEASE        -O3 -DNDEBUG
+#      MINSIZEREL     -Os -DNDEBUG
+#
+# The compiler command line is
+# g++ DEFINITIONS CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_<configuration>
+#
+# So, if you want to use '-O3' for a RELWITHDEBINFO build, you should do:
+# cmake -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g -DNDEBUG"
 #
 # Note that CMakeCache.txt contains cmake builtins for these variables,
-# *not* the values that will actually be used:
+# *not* the values that will actually be used, which we report here:
 
 
 IF(BUILD_IS_SINGLE_CONFIG)
@@ -789,20 +879,9 @@ IF(BUILD_IS_SINGLE_CONFIG)
 ENDIF()
 GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
 MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
-MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
-MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+REPORT_CXX_FLAGS()
 MESSAGE(STATUS "CMAKE_C_LINK_FLAGS: ${CMAKE_C_LINK_FLAGS}")
 MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS: ${CMAKE_CXX_LINK_FLAGS}")
-IF(CMAKE_BUILD_TYPE AND BUILD_IS_SINGLE_CONFIG)
-  STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
-  MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")
-  MESSAGE(STATUS "CMAKE_CXX_FLAGS_${CMAKEBT}: ${CMAKE_CXX_FLAGS_${CMAKEBT}}")
-ENDIF()
-IF(NOT BUILD_IS_SINGLE_CONFIG)
-  MESSAGE(STATUS "CMAKE_C_FLAGS_DEBUG: ${CMAKE_C_FLAGS_DEBUG}")
-  MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
-  MESSAGE(STATUS
-    "CMAKE_C_FLAGS_RELWITHDEBINFO: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  MESSAGE(STATUS
-    "CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-ENDIF()
+MESSAGE(STATUS "CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}")
+MESSAGE(STATUS "CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS}")
+MESSAGE(STATUS "CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}")
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d511905c1647..000000000000
--- a/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/Docs/ChangeLog b/Docs/ChangeLog
new file mode 100644
index 000000000000..93941d908b86
--- /dev/null
+++ b/Docs/ChangeLog
@@ -0,0 +1,2 @@
+You can find a detailed list of changes at
+  to https://github.com/mysql/mysql-server/commits/5.7
diff --git a/Docs/myisam.txt b/Docs/myisam.txt
index e0b56e795488..edc06f3fde4c 100644
--- a/Docs/myisam.txt
+++ b/Docs/myisam.txt
@@ -1,3 +1,25 @@
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 #.# mi_changed()
 
 int mi_is_changed(MI_INFO *mip)
diff --git a/Docs/sp-imp-spec.txt b/Docs/sp-imp-spec.txt
index ac17a3759265..a19acbec7e03 100644
--- a/Docs/sp-imp-spec.txt
+++ b/Docs/sp-imp-spec.txt
@@ -1,3 +1,25 @@
+Copyright (c) 2003, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 
               Implementation specification for Stored Procedures
               ==================================================
@@ -1097,4 +1119,4 @@
     ) comment='Stored Procedures';
         
  --
- 
\ No newline at end of file
+ 
diff --git a/Doxyfile-perfschema b/Doxyfile-perfschema
index cbcd33ffdac9..a330a7e1cde6 100644
--- a/Doxyfile-perfschema
+++ b/Doxyfile-perfschema
@@ -1,3 +1,25 @@
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 #
 # MySQL Doxyfile for the performance_schema.
 #
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..eb3a747c40b8
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,5301 @@
+Licensing Information User Manual
+
+MySQL 5.7.44 Community
+     __________________________________________________________________
+
+Introduction
+
+   This License Information User Manual contains Oracle's product license
+   and other licensing information, including licensing information for
+   third-party software which may be included in this distribution of
+   MySQL 5.7.44 Community.
+
+   Last updated: August 2023
+
+Licensing Information
+
+   This release of MySQL 5.7.44 Community is brought to you by the MySQL
+   team at Oracle. This software is released under version 2 of the GNU
+   General Public License (GPLv2), as set forth below, with the following
+   additional permissions:
+
+   This distribution of MySQL 5.7.44 Community is distributed with certain
+   software (including but not limited to OpenSSL) that is licensed under
+   separate terms, as designated in a particular file or component or in
+   the license documentation. Without limiting your rights under the
+   GPLv2, the authors of MySQL hereby grant you an additional permission
+   to link the program and your derivative works with the separately
+   licensed software that they have included with the program.
+
+   This distribution includes the MySQL C API client library
+   (libmysqlclient) otherwise known as MySQL Connector/C. Without limiting
+   the foregoing grant of rights under the GPLv2 and additional permission
+   as to separately licensed software, this Connector is also subject to
+   the Universal FOSS Exception, version 1.0, a copy of which is
+   reproduced below and can also be found along with its FAQ at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+Election of GPLv2
+
+   For the avoidance of doubt, except that if any license choice other
+   than GPL or LGPL is available it will apply instead, Oracle elects to
+   use only the General Public License version 2 (GPLv2) at this time for
+   any software where a choice of GPL license versions is made available
+   with the language indicating that GPLv2 or any later version may be
+   used, or where a choice of which version of the GPL is applied is
+   otherwise unspecified.
+
+GNU General Public License Version 2.0, June 1991
+
+The following applies to all products licensed under the GNU General
+Public License, Version 2.0: You may not use the identified files
+except in compliance with the GNU General Public License, Version
+2.0 (the "License.") You may obtain a copy of the License at
+http://www.gnu.org/licenses/gpl-2.0.txt. A copy of the license is
+also reproduced below. Unless required by applicable law or agreed
+to in writing, software distributed under the License is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+
+
+  ======================================================================
+  ======================================================================
+
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Everyone is permitted to copy and distribute verbatim
+copies of this license document, but changing it is not
+allowed.
+
+                     Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software,
+and (2) offer you this license which gives you legal permission to
+copy, distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the original,
+so that any problems introduced by others will not reflect on the
+original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software
+    interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as
+a special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission.  For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this.  Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of
+
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+    type 'show w'. This is free software, and you are welcome
+    to redistribute it under certain conditions; type 'show c'
+    for details.
+
+The hypothetical commands 'show w' and 'show c' should show the
+appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than 'show w' and
+'show c'; they could even be mouse-clicks or menu items--whatever
+suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  program 'Gnomovision' (which makes passes at compilers) written
+  by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library,
+you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.
+
+   ======================================================================
+   ======================================================================
+
+The Universal FOSS Exception, Version 1.0
+
+   In addition to the rights set forth in the other license(s) included in
+   the distribution for this software, data, and/or documentation
+   (collectively the "Software", and such licenses collectively with this
+   additional permission the "Software License"), the copyright holders
+   wish to facilitate interoperability with other software, data, and/or
+   documentation distributed with complete corresponding source under a
+   license that is OSI-approved and/or categorized by the FSF as free
+   (collectively "Other FOSS"). We therefore hereby grant the following
+   additional permission with respect to the use and distribution of the
+   Software with Other FOSS, and the constants, function signatures, data
+   structures and other invocation methods used to run or interact with
+   each of them (as to each, such software's "Interfaces"):
+
+    i. The Software's Interfaces may, to the extent permitted by the
+       license of the Other FOSS, be copied into, used and distributed in
+       the Other FOSS in order to enable interoperability, without
+       requiring a change to the license of the Other FOSS other than as
+       to any Interfaces of the Software embedded therein. The Software's
+       Interfaces remain at all times under the Software License,
+       including without limitation as used in the Other FOSS (which upon
+       any such use also then contains a portion of the Software under the
+       Software License).
+
+   ii. The Other FOSS's Interfaces may, to the extent permitted by the
+       license of the Other FOSS, be copied into, used and distributed in
+       the Software in order to enable interoperability, without requiring
+       that such Interfaces be licensed under the terms of the Software
+       License or otherwise altering their original terms, if this does
+       not require any portion of the Software other than such Interfaces
+       to be licensed under the terms other than the Software License.
+
+   iii. If only Interfaces and no other code is copied between the
+       Software and the Other FOSS in either direction, the use and/or
+       distribution of the Software with the Other FOSS shall not be
+       deemed to require that the Other FOSS be licensed under the license
+       of the Software, other than as to any Interfaces of the Software
+       copied into the Other FOSS. This includes, by way of example and
+       without limitation, statically or dynamically linking the Software
+       together with Other FOSS after enabling interoperability using the
+       Interfaces of one or both, and distributing the resulting
+       combination under different licenses for the respective portions
+       thereof.
+
+       For avoidance of doubt, a license which is OSI-approved or
+       categorized by the FSF as free, includes, for the purpose of this
+       permission, such licenses with additional permissions, and any
+       license that has previously been so approved or categorized as
+       free, even if now deprecated or otherwise no longer recognized as
+       approved or free. Nothing in this additional permission grants any
+       right to distribute any portion of the Software on terms other than
+       those of the Software License or grants any additional permission
+       of any kind for use or distribution of the Software in conjunction
+       with software other than Other FOSS.
+
+   ======================================================================
+   ======================================================================
+
+Licenses for Third-Party Components
+
+   The following sections contain licensing information for libraries that
+   may be included with this product. We are thankful to all individuals
+   that have created these. Standard licenses referenced herein are
+   detailed in the Standard Licenses section.
+
+argparse
+
+argparse is (c) 2006-2009 Steven J. Bethard <steven.bethard@gmail.com>.
+
+The argparse module was contributed to Python as of Python 2.7 and thus was
+licensed under the Python license. Same license applies to all files in the
+argparse package project.
+
+For details about the Python License, please see doc/Python-License.txt.
+
+History
+-------
+
+Before (and including) argparse 1.1, the argparse package was licensed under
+Apache License v2.0.
+
+After argparse 1.1, all project files from the argparse project were deleted
+due to license compatibility issues between Apache License 2.0 and GNU GPL
+v2.
+
+The project repository then had a clean start with some files taken from
+Python 2.7.1, so definitely all files are under Python License now.
+
+##############################################################################
+####################################
+PSF LICENSE AGREEMENT FOR PYTHON 2.7.11
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+   and the Individual or Organization ("Licensee") accessing and otherwise
+   using Python 2.7.11 software in source or binary form and its associated
+   documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+   grants Licensee a nonexclusive, royalty-free, world-wide license to
+   reproduce, analyze, test, perform and/or display publicly, prepare
+   derivative works,distribute, and otherwise use Python 2.7.11 alone or in any
+   derivative version, provided, however, that PSF's License Agreement and
+   PSF's notice of copyright, i.e., "Copyright (c) 2001-2016 Python Software
+   Foundation; All Rights Reserved" are retained in Python 2.7.11 alone or in
+   any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+   incorporates Python 2.7.11 or any part thereof, and wants to make the
+   derivative work available to others as provided herein, then Licensee hereby
+   agrees to include in any such work a brief summary of the changes made to
+   Python 2.7.11.
+
+4. PSF is making Python 2.7.11 available to Licensee on an "AS IS" basis.
+   PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
+   EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
+   WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+   USE OF PYTHON 2.7.11 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 2.7.11
+   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+   MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.7.11, OR ANY DERIVATIVE
+   THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material breach
+   of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any relationship
+   of agency, partnership, or joint venture between PSF and Licensee. This
+   License Agreement does not grant permission to use PSF trademarks or trade
+   name in a trademark sense to endorse or promote products or services of
+   Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python 2.7.11, Licensee agrees
+   to be bound by the terms and conditions of this License Agreement.
+
+   ======================================================================
+   ======================================================================
+
+Boost C++ Libraries
+
+Use of any of this software is governed by the terms of the license
+below:
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or
+organization obtaining a copy of the software and accompanying
+documentation covered by this license (the "Software") to use,
+reproduce, display, distribute, execute, and transmit the Software,
+and to prepare derivative works of the Software, and to permit
+third-parties to whom the Software is furnished to do so, all
+subject to the following:
+
+The copyright notices in the Software and this entire statement,
+including the above license grant, this restriction and the
+following disclaimer, must be included in all copies of the
+Software, in whole or in part, and all derivative works of the
+Software, unless such copies or derivative works are solely in the
+form of machine-executable object code generated by a source
+language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE
+DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
+LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+Corosync
+
+Copyright (c) 2002-2004 MontaVista Software, Inc.
+Copyright (c) 2005-2010 RedHat, Inc.
+
+All rights reserved.
+
+This software licensed under BSD license, the text of which follows:
+
+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 name of the MontaVista Software, Inc. nor the names of its
+  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.
+
+   ======================================================================
+   ======================================================================
+
+Cyrus SASL
+
+ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any other legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+*      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+The following files
+
+./lib
+     saslint.h auxprop.c canonusr.c checkpw.c client.c common.c config.c
+     external.c saslutil.c server.c seterror.c dlopen.c
+./plugins
+    scram.c gssapi.c
+./common
+   plugin_common.c
+
+have a license header similar to the above with the following copyright:
+/*
+ * Copyright (c) 1998-2016 Carnegie Mellon University.  All rights reserved.
+ *
+
+./lib/md5.c includes the following license header:
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+*/
+
+/* Function names changed to avoid namespace collisions: Rob Siemborski */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+*/
+
+   ======================================================================
+   ======================================================================
+
+dtoa.c
+
+The author of this software is David M. Gay.
+
+Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+
+Permission to use, copy, modify, and distribute this software for
+any purpose without fee is hereby granted, provided that this entire
+notice is included in all copies of any software which is or includes
+a copy or modification of this software and in all copies of the
+supporting documentation for such software.
+
+THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT
+MAKES ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+PURPOSE.
+
+   ======================================================================
+   ======================================================================
+
+Editline Library (libedit)
+
+Copyright (c) 1992, 1993
+ The Regents of the University of California.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Christos Zoulas of Cornell University.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
+Files with different/specific license header
+======================
+src/readline.c
+src/literal.h
+src/literal.c
+src/getline.c
+src/filecomplete.h
+src/filecomplete.c
+src/eln.c
+src/chartype.h
+src/chartype.c
+src/read.h
+-----------------------
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+src/wcsdup.c
+-------------
+*
+ * Copyright (C) 2006 Aleksey Cheusov
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted
+ * without fee. Permission to modify the code and to distribute modified
+ * code is also granted without any restrictions.
+ */
+
+src/reallocarr.c
+----------------
+/*-
+ * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 HOLDERS 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.
+ */
+
+   ======================================================================
+   ======================================================================
+
+Facebook Fast Checksum Patch
+
+Facebook Fast Checksum Patch
+
+Copyright (C) 2009-2010 Facebook, Inc.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. 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.
+
+THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. "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 FACEBOOK, INC. 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.
+
+Also included:
+
+crc32.c -- compute the CRC-32 of a buf stream
+Copyright (C) 1995-2005 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Jean-loup Gailly jloup@gzip.org
+Mark Adler madler@alumni.caltech.edu
+
+   ======================================================================
+   ======================================================================
+
+Facebook Patches
+
+Copyright (c) 2012, Facebook, Inc.
+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.
+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 HOLDER 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.
+
+   ======================================================================
+   ======================================================================
+
+FindGTest.cmake
+
+FindGTest.cmake helper script (part of CMake)
+
+Copyright 2009 Kitware, Inc.
+Copyright 2009 Philip Lowman
+Copyright 2009 Daniel Blezek
+
+Distributed under the OSI-approved BSD License (the "License");
+see accompanying file Copyright.txt for details.
+
+This software is distributed WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the License for more information.
+==========================================================================
+(To distributed this file outside of CMake, substitute the full
+ License text for the above reference.)
+
+Thanks to Daniel Blezek  for the GTEST_ADD_TESTS code
+
+Text of Copyright.txt mentioned above:
+
+CMake - Cross Platform Makefile Generator
+Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+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 Kitware, Inc., the Insight Software Consortium,
+  nor the names of their 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
+HOLDER 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.
+
+   ======================================================================
+   ======================================================================
+
+Fred Fish's Dbug Library
+
+                                N O T I C E
+
+                   Copyright Abandoned, 1987, Fred Fish
+
+     This previously copyrighted work has been placed into the  public
+     domain  by  the  author  and  may be freely used for any purpose,
+     private or commercial.
+
+     Because of the number of inquiries I was receiving about the  use
+     of this product in commercially developed works I have decided to
+     simply make it public domain to further its unrestricted use.   I
+     specifically  would  be  most happy to see this material become a
+     part of the standard Unix distributions by AT&T and the  Berkeley
+     Computer  Science  Research Group, and a standard part of the GNU
+     system from the Free Software Foundation.
+
+     I would appreciate it, as a courtesy, if this notice is  left  in
+     all copies and derivative works.  Thank you.
+
+     The author makes no warranty of any kind  with  respect  to  this
+     product  and  explicitly disclaims any implied warranties of mer-
+     chantability or fitness for any particular purpose.
+
+The dbug_analyze.c file is subject to the following notice:
+
+     Copyright June 1987, Binayak Banerjee
+     All rights reserved.
+
+     This program may be freely distributed under the same terms and
+     conditions as Fred Fish's Dbug package.
+
+   ======================================================================
+   ======================================================================
+
+getarg
+
+getarg Function (getarg.h), getarg.c files)
+
+Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+(Royal Institute of Technology, Stockholm, Sweden).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with
+or without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above
+   copyright notice, this list of conditions and the
+   following disclaimer.
+2. 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.
+3. Neither the name of the Institute nor the names of its
+   contributors may be used to endorse or promote products
+   derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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 INSTITUTE 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.
+
+   ======================================================================
+   ======================================================================
+
+Google Controlling Master Thread I/O Rate Patch
+
+Copyright (c) 2009, Google Inc.
+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 name of the Google Inc. nor the names of its 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.
+
+   ======================================================================
+   ======================================================================
+
+Google Perftools (TCMalloc utility)
+
+Google Perftools (TCMalloc utility)
+
+Copyright (c) 1998-2006, Google Inc.
+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 name of Google Inc. nor the names of its
+      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.
+
+   ======================================================================
+   ======================================================================
+
+Google Protocol Buffers
+
+Protocol Buffers (aka Google protobuf)
+
+Google Protocol Buffers - protobuf
+Copyright 2008, Google Inc.
+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 name of Google Inc. nor the names of its
+  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.
+
+Code generated by the Protocol Buffer compiler is owned by
+the owner of the input file used when generating it. This
+code is not standalone and requires a support library to be
+linked with it. This support library is itself covered by
+the above license.
+
+   ======================================================================
+   ======================================================================
+
+Google SMP Patch
+
+Google SMP patch
+
+Copyright (c) 2008, Google Inc.
+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 name of the Google Inc. nor the names of its 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.
+
+   ======================================================================
+   ======================================================================
+
+Google Test (including GMock)
+
+Google Mock (GMock) is an extension to Google Test for writing and
+using C++ mock classes. Google Test (including the Google Mock
+extension) is licensed under the following terms:
+
+Copyright 2008, Google Inc.
+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 name of Google Inc. nor the names of its 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.
+
+   ======================================================================
+   ======================================================================
+
+ICU4C Unicode Libraries
+
+This Oracle Product includes or references ICU4C, which is licensed
+to Oracle under the following terms:
+
+Copyright (c) 1995-2013 International Business Machines Corporation and
+others
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
+LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization of the
+copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the property of
+their respective owners.
+
+The following Third-Party Software Licenses are also included as part of
+UCU4C:
+
+1. Unicode Data Files and Software
+EXHIBIT 1
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
+online code charts under the directory http://www.unicode.org/Public/.
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
+INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA
+FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO
+BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT
+AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR
+SOFTWARE.
+
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. Distributed
+under the Terms of Use in http://www.unicode.org/copyright.html.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Unicode data files and any associated documentation (the "Data
+Files") or Unicode software and any associated documentation (the "Software")
+to deal in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Data Files or Software, and to permit persons to
+whom the Data Files or Software are furnished to do so, provided that (a) the
+above copyright notice(s) and this permission notice appear with all copies
+of the Data Files or Software, (b) both the above copyright notice(s) and
+this permission notice appear in associated documentation, and (c) there is
+clear notice in each modified Data File or in the Software as well as in the
+documentation associated with the Data File(s) or Software that the data or
+software has been modified.
+
+    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
+CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THE DATA FILES OR SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written authorization
+of the copyright holder.
+
+    Unicode and the Unicode logo are trademarks of Unicode, Inc. in the
+United States and other countries. All third party trademarks referenced
+herein are the property of their respective owners.
+
+2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+
+ #    The Google Chrome software developed by Google is licensed under the
+BSD license. Other software included in this distribution is provided under
+other licenses, as set forth below.
+ #
+ #  The BSD License
+ #  http://opensource.org/licenses/bsd-license.php
+ #  Copyright (C) 2006-2008, Google Inc.
+ #
+ #  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 name of  Google Inc. nor the names of its 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.
+ #
+ #
+ #  The word list in cjdict.txt are generated by combining three word lists
+listed
+ #  below with further processing for compound word breaking. The frequency is
+generated
+ #  with an iterative training against Google web corpora.
+ #
+ #  * Libtabe (Chinese)
+ #    - https://sourceforge.net/project/?group_id=1519
+#   - Its license terms and conditions are shown below.
+ #
+ #  * IPADIC (Japanese)
+ #    - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+ #    - Its license terms and conditions are shown below.
+ #
+ #  ---------COPYING.libtabe ---- BEGIN--------------------
+ #
+ #  /*
+ #   * Copyrighy (c) 1999 TaBE Project.
+ #   * Copyright (c) 1999 Pai-Hsiang Hsiao.
+ #   * 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 name of the TaBE Project nor the names of its
+ #   *   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
+ #   * REGENTS 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.
+ #   */
+ #
+ #  /*
+ #   * Copyright (c) 1999 Computer Systems and Communication Lab,
+ #   *                    Institute of Information Science, Academia Sinica.
+ #   * 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 name of the Computer Systems and Communication Lab
+ #   *   nor the names of its 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
+ #   * REGENTS 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.
+ #   */
+ #
+ #  Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois
+ #  c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+ #
+ #  ---------------COPYING.libtabe-----END------------------------------------
+ #
+ #
+
+# ---------------COPYING.ipadic-----BEGIN------------------------------------
+ #
+ #  Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+ #  and Technology.  All Rights Reserved.
+ #
+ #  Use, reproduction, and distribution of this software is permitted.
+ #  Any copy of this software, whether in its original form or modified,
+ #  must include both the above copyright notice and the following
+ #  paragraphs.
+ #
+ #  Nara Institute of Science and Technology (NAIST),
+ #  the copyright holders, disclaims all warranties with regard to this
+ #  software, including all implied warranties of merchantability and
+ #  fitness, in no event shall NAIST be liable for
+ #  any special, indirect or consequential damages or any damages
+ #  whatsoever resulting from loss of use, data or profits, whether in an
+ #  action of contract, negligence or other tortuous action, arising out
+ #  of or in connection with the use or performance of this software.
+ #
+ #  A large portion of the dictionary entries
+ #  originate from ICOT Free Software.  The following conditions for ICOT
+ #  Free Software applies to the current dictionary as well.
+ #
+ #  Each User may also freely distribute the Program, whether in its
+ #  original form or modified, to any third party or parties, PROVIDED
+ #  that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+ #  on, or be attached to, the Program, which is distributed substantially
+ #  in the same form as set out herein and that such intended
+ #  distribution, if actually made, will neither violate or otherwise
+ #  contravene any of the laws and regulations of the countries having
+ #  jurisdiction over the User or the intended distribution itself.
+ #
+ #  NO WARRANTY
+ #
+ #  The program was produced on an experimental basis in the course of the
+ #  research and development conducted during the project and is provided
+ #  to users as so produced on an experimental basis.  Accordingly, the
+ #  program is provided without any warranty whatsoever, whether express,
+ #  implied, statutory or otherwise.  The term "warranty" used herein
+ #  includes, but is not limited to, any warranty of the quality,
+ #  performance, merchantability and fitness for a particular purpose of
+ #  the program and the nonexistence of any infringement or violation of
+ #  any right of any third party.
+ #
+ #  Each user of the program will agree and understand, and be deemed to
+ #  have agreed and understood, that there is no warranty whatsoever for
+ #  the program and, accordingly, the entire risk arising from or
+ #  otherwise connected with the program is assumed by the user.
+ #
+ #  Therefore, neither ICOT, the copyright holder, or any other
+ #  organization that participated in or was otherwise related to the
+ #  development of the program and their respective officials, directors,
+ #  officers and other employees shall be held liable for any and all
+ #  damages, including, without limitation, general, special, incidental
+ #  and consequential damages, arising out of or otherwise in connection
+ #  with the use or inability to use the program or any product, material
+ #  or result produced or otherwise obtained by using the program,
+ #  regardless of whether they have been advised of, or otherwise had
+ #  knowledge of, the possibility of such damages at any time during the
+ #  project or thereafter.  Each user will be deemed to have agreed to the
+ #  foregoing by his or her commencement of use of the program.  The term
+ #  "use" as used herein includes, but is not limited to, the use,
+ #  modification, copying and distribution of the program and the
+ #  production of secondary products from the program.
+ #
+ #  In the case where the program, whether in its original form or
+ #  modified, was distributed or delivered to or received by a user from
+ #  any person, organization or entity other than ICOT, unless it makes or
+ #  grants independently of ICOT any specific warranty to the user in
+ #  writing, such person, organization or entity, will also be exempted
+ #  from and not be held liable to the user for any such damages as noted
+ #  above as far as the program is concerned.
+ #
+ #  ---------------COPYING.ipadic-----END------------------------------------
+
+3. Lao Word Break Dictionary Data (laodict.txt)
+
+ #  Copyright (c) 2013 International Business Machines Corporation
+ #  and others. All Rights Reserved.
+ #
+ #  Project:    http://code.google.com/p/lao-dictionary/
+ #  Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
+ #  License:
+http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
+ #              (copied below)
+ #
+ #  This file is derived from the above dictionary, with slight modifications.
+
+# ----------------------------------------------------------------------------
+----
+ #  Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+ #  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.
+ #
+ #  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 HOLDER 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.
+
+# ----------------------------------------------------------------------------
+----
+
+4. Time Zone Database
+
+ICU uses the public domain data and code derived from Time Zone Database for
+its time zone support. The ownership of the TZ database is explained in BCP
+175: Procedure for Maintaining the Time Zone Database section 7.
+
+7.  Database Ownership
+
+   The TZ database itself is not an IETF Contribution or an IETF
+   document.  Rather it is a pre-existing and regularly updated work
+   that is in the public domain, and is intended to remain in the public
+   domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do not apply
+   to the TZ Database or contributions that individuals make to it.
+   Should any claims be made and substantiated against the TZ Database,
+   the organization that is providing the IANA Considerations defined in
+   this RFC, under the memorandum of understanding with the IETF,
+   currently ICANN, may act in accordance with all competent court
+   orders.  No ownership claims will be made by ICANN or the IETF Trust
+   on the database or the code.  Any person making a contribution to the
+   database or code waives all rights to future claims in that
+   contribution or in the TZ Database.
+
+   ======================================================================
+   ======================================================================
+
+Janson
+
+Include the following verbatim in the documentation:
+
+Licence Text:
+
+Copyright (c) (c) 2009-2013 Petri Lehtinen <petri@digip.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+jemalloc
+
+Copyright (C) 2002-present Jason Evans <jasone@canonware.com>.
+All rights reserved.
+Copyright (C) 2007-2012 Mozilla Foundation.  All rights reserved.
+Copyright (C) 2009-present Facebook, Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice(s),
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice(s),
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 HOLDER(S) 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.
+
+   ======================================================================
+   ======================================================================
+
+lib_sql.cc
+
+Copyright (c) 2000
+SWsoft company
+
+This material is provided "as is", with absolutely no warranty
+expressed or implied. Any use is at your own risk.
+
+Permission to use or copy this software for any purpose is hereby
+granted without fee, provided the above notices are retained on
+all copies. Permission to modify the code and to distribute modified
+code is granted, provided the above notices are retained, and a
+notice that the code was modified is included with the above copyright
+notice.
+
+This code was modified by the MySQL team.
+
+   ======================================================================
+   ======================================================================
+
+Libaio
+
+You may be receiving a copy of the Libaio library with this MySQL
+product. The terms of the Oracle license do NOT apply to the Libaio
+library; it is licensed under the following license, separately from
+the Oracle programs you receive. If you do not wish to install this
+program, you may delete its files.
+
+This component is licensed under
+GNU Lesser General Public License v2.1, February 1999.
+See the 'Standard Licenses' section for license text.
+
+   ======================================================================
+   ======================================================================
+
+libeditline-color
+
+Copyright (c) 1992, 1993
+ The Regents of the University of California.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Christos Zoulas of Cornell University.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
+   ======================================================================
+   ======================================================================
+
+libevent
+
+Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+==============================
+
+Portions of Libevent are based on works by others, also made available by
+them under the three-clause BSD license above.  The copyright notices are
+available in the corresponding source files; the license is as above.  Here's
+a list:
+
+log.c:
+   Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+   Copyright (c) 1993 The Regents of the University of California.
+
+strlcpy.c:
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+win32select.c:
+   Copyright (c) 2003 Michael A. Davis <mike@datanerds.net>
+
+evport.c:
+   Copyright (c) 2007 Sun Microsystems
+
+ht-internal.h:
+   Copyright (c) 2002 Christopher Clark
+
+minheap-internal.h:
+   Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
+
+==============================
+
+The arc4module is available under the following, sometimes called the
+"OpenBSD" license:
+
+   Copyright (c) 1996, David Mazieres <dm@uun.org>
+   Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+==============================
+
+The Windows timer code is based on code from libutp, which is
+distributed under this license, sometimes called the "MIT" license.
+
+Copyright (c) 2010 BitTorrent, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+libgcc & libstdc++ Libraries
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies of
+this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are
+designed to take away your freedom to share and change the works.
+By contrast, the GNU General Public License is intended to guarantee
+your freedom to share and change all versions of a program--to make
+sure it remains free software for all its users.  We, the Free
+Software Foundation, use the GNU General Public License for most
+of our software; it applies also to any other work released this
+way by its authors.  You can apply it to your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and
+charge for them if you wish), that you receive source code or can
+get it if you want it, that you can change the software or use
+pieces of it in new free programs, and that you know you can do
+these things.
+
+  To protect your rights, we need to prevent others from denying
+you these rights or asking you to surrender the rights.  Therefore,
+you have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the
+freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too,
+receive or can get the source code.  And you must show them these
+terms so they know their rights.
+
+  Developers that use the GNU GPL protect your rights with two
+steps: (1) assert copyright on the software, and (2) offer you this
+License giving you legal permission to copy, distribute and/or
+modify it.
+
+  For the developers' and authors' protection, the GPL clearly
+explains that there is no warranty for this free software.  For
+both users' and authors' sake, the GPL requires that modified
+versions be marked as changed, so that their problems will not be
+attributed erroneously to authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with
+the aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially
+in other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+  Finally, every program is threatened constantly by software
+patents. States should not allow patents to restrict development
+and use of software on general-purpose computers, but in those that
+do, we wish to avoid the special danger that patents applied to a
+free program could make it effectively proprietary.  To prevent
+this, the GPL assures that patents cannot be used to render the
+program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the
+work in a fashion requiring copyright permission, other than the
+making of an exact copy.  The resulting work is called a "modified
+version" of the earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it
+on a computer or modifying a private copy.  Propagation includes
+copying, distribution (with or without modification), making available
+to the public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to
+the extent that warranties are provided), that licensees may convey
+the work under this License, and how to view a copy of this License.
+If the interface presents a list of user commands or options, such
+as a menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case
+of interfaces specified for a particular programming language, one
+that is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form
+of packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts
+to control those activities.  However, it does not include the
+work's System Libraries, or general-purpose tools or generally
+available free programs which are used unmodified in performing
+those activities but which are not part of the work.  For example,
+Corresponding Source includes interface definition files associated
+with source files for the work, and the source code for shared
+libraries and dynamically linked subprograms that the work is
+specifically designed to require, such as by intimate data communication
+or control flow between those subprograms and other parts of the
+work.
+
+  The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running
+a covered work is covered by this License only if the output, given
+its content, constitutes a covered work.  This License acknowledges
+your rights of fair use or other equivalent, as provided by copyright
+law.
+
+  You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in
+force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide
+you with facilities for running those works, provided that you
+comply with the terms of this License in conveying all material for
+which you do not control copyright.  Those thus making or running
+the covered works for you must do so exclusively on your behalf,
+under your direction and control, on terms that prohibit them from
+making any copies of your copyrighted material outside their
+relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section
+10 makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect
+to the covered work, and you disclaim any intention to limit operation
+or modification of the work as a means of enforcing, against the
+work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any non-permissive
+terms added in accord with section 7 apply to the code; keep intact
+all notices of the absence of any warranty; and give all recipients
+a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications
+to produce it from the Program, in the form of source code under
+the terms of section 4, provided that you also meet all of these
+conditions:
+
+    a) The work must carry prominent notices stating that you
+    modified it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7.  This requirement modifies the requirement in
+    section 4 to "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has
+    interactive interfaces that do not display Appropriate Legal
+    Notices, your work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called
+an "aggregate" if the compilation and its resulting copyright are
+not used to limit the access or legal rights of the compilation's
+users beyond what the individual works permit.  Inclusion of a
+covered work in an aggregate does not cause this License to apply
+to the other parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of
+these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that
+    product model, to give anyone who possesses the object code
+    either (1) a copy of the Corresponding Source for all the
+    software in the product that is covered by this License, on a
+    durable physical medium customarily used for software
+    interchange, for a price no more than your reasonable cost
+    of physically performing this conveying of source, or (2)
+    access to copy the Corresponding Source from a network server
+    at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in
+    accord with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to
+    the Corresponding Source in the same way through the same place
+    at no further charge.  You need not require recipients to copy
+    the Corresponding Source along with the object code.  If the
+    place to copy the object code is a network server, the
+    Corresponding Source may be on a different server (operated
+    by you or a third party) that supports equivalent copying
+    facilities, provided you maintain clear directions next to the
+    object code saying where to find the Corresponding Source.
+    Regardless of what server hosts the Corresponding Source, you
+    remain obligated to ensure that it is available for as long
+    as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the
+    general public at no charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means
+any tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling.  In determining whether a product
+is a consumer product, doubtful cases shall be resolved in favor
+of coverage.  For a particular product received by a particular
+user, "normally used" refers to a typical or common use of that
+class of product, regardless of the status of the particular user
+or of the way in which the particular user actually uses, or expects
+or is expected to use, the product.  A product is a consumer product
+regardless of whether the product has substantial commercial,
+industrial or non-consumer uses, unless such uses represent the
+only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that
+User Product from a modified version of its Corresponding Source.
+The information must suffice to ensure that the continued functioning
+of the modified object code is in no case prevented or interfered
+with solely because modification has been made.
+
+  If you convey an object code work under this section in, or with,
+or specifically for use in, a User Product, and the conveying occurs
+as part of a transaction in which the right of possession and use
+of the User Product is transferred to the recipient in perpetuity
+or for a fixed term (regardless of how the transaction is characterized),
+the Corresponding Source conveyed under this section must be
+accompanied by the Installation Information.  But this requirement
+does not apply if neither you nor any third party retains the ability
+to install modified object code on the User Product (for example,
+the work has been installed in ROM).
+
+  The requirement to provide Installation Information does not include
+a requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified
+or installed.  Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of
+this License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program
+shall be treated as though they were included in this License, to
+the extent that they are valid under applicable law.  If additional
+permissions apply only to part of the Program, that part may be
+used separately under those permissions, but the entire Program
+remains governed by this License without regard to the additional
+permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part
+of it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material
+you add to a covered work, you may (if authorized by the copyright
+holders of that material) supplement the terms of this License with
+terms:
+
+    a) Disclaiming warranty or limiting liability differently from
+    the terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices
+    or author attributions in that material or in the Appropriate
+    Legal Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked
+    in reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the
+    recipient, for any liability that these contractual assumptions
+    directly impose on those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as
+you received it, or any part of it, contains a notice stating that
+it is governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document
+contains a further restriction but permits relicensing or conveying
+under this License, you may add to a covered work material governed
+by the terms of that license document, provided that the further
+restriction does not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in
+the form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate
+or modify it is void, and will automatically terminate your rights
+under this License (including any patent licenses granted under the
+third paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from
+that copyright holder, and you cure the violation prior to 30 days
+after your receipt of the notice.
+
+  Termination of your rights under this section does not terminate
+the licenses of parties who have received copies or rights from you
+under this License.  If your rights have been terminated and not
+permanently reinstated, you do not qualify to receive new licenses
+for the same material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you
+may not impose a license fee, royalty, or other charge for exercise
+of rights granted under this License, and you may not initiate
+litigation (including a cross-claim or counterclaim in a lawsuit)
+alleging that any patent claim is infringed by making, using,
+selling, offering for sale, or importing the Program or any portion
+of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired
+or hereafter acquired, that would be infringed by some manner,
+permitted by this License, of making, using, or selling its contributor
+version, but do not include claims that would be infringed only as
+a consequence of further modification of the contributor version.
+For purposes of this definition, "control" includes the right to
+grant patent sublicenses in a manner consistent with the requirements
+of this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify
+and propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a
+patent (such as an express permission to practice a patent or
+covenant not to sue for patent infringement).  To "grant" such a
+patent license to a party means to make such an agreement or
+commitment not to enforce a patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through
+a publicly available network server or other readily accessible
+means, then you must either (1) cause the Corresponding Source to
+be so available, or (2) arrange to deprive yourself of the benefit
+of the patent license for this particular work, or (3) arrange, in
+a manner consistent with the requirements of this License, to extend
+the patent license to downstream recipients.  "Knowingly relying"
+means you have actual knowledge that, but for the patent license,
+your conveying the covered work in a country, or your recipient's
+use of the covered work in a country, would infringe one or more
+identifiable patents in that country that you have reason to believe
+are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of,
+a covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate,
+modify or convey a specific copy of the covered work, then the
+patent license you grant is automatically extended to all recipients
+of the covered work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is conditioned
+on the non-exercise of one or more of the rights that are specifically
+granted under this License.  You may not convey a covered work if
+you are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to
+the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement
+or otherwise) that contradict the conditions of this License, they
+do not excuse you from the conditions of this License.  If you
+cannot convey a covered work so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations,
+then as a consequence you may not convey it at all.  For example,
+if you agree to terms that obligate you to collect a royalty for
+further conveying from those to whom you convey the Program, the
+only way you could satisfy both those terms and this License would
+be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a
+single combined work, and to convey the resulting work.  The terms
+of this License will continue to apply to the part which is the
+covered work, but the special requirements of the GNU Affero General
+Public License, section 13, concerning interaction through a network
+will apply to the combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of
+the GNU General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes
+you to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow
+a later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING
+BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE
+OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make
+it free software which everyone can redistribute and change under
+these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is
+found.
+
+    <one line to give the program's name and a brief idea of what it
+    does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation, either version 3
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the
+appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you
+would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program,
+if necessary. For more information on this, and how to apply and
+follow the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.  But
+first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+==
+
+==
+GCC RUNTIME LIBRARY EXCEPTION
+
+Version 3.1, 31 March 2009
+
+Copyright (c) 2009 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of
+this license document, but changing it is not allowed.
+
+This GCC Runtime Library Exception ("Exception") is an additional
+permission under section 7 of the GNU General Public License, version
+3 ("GPLv3"). It applies to a given file (the "Runtime Library")
+that bears a notice placed by the copyright holder of the file
+stating that the file is governed by GPLv3 along with this Exception.
+
+When you use GCC to compile a program, GCC may combine portions of
+certain GCC header files and runtime libraries with the compiled
+program. The purpose of this Exception is to allow compilation of
+non-GPL (including proprietary) programs to use, in this way, the
+header files and runtime libraries covered by this Exception.
+
+0. Definitions.
+
+A file is an "Independent Module" if it either requires the Runtime
+Library for execution after a Compilation Process, or makes use of
+an interface provided by the Runtime Library, but is not otherwise
+based on the Runtime Library.
+
+"GCC" means a version of the GNU Compiler Collection, with or without
+modifications, governed by version 3 (or a specified later version)
+of the GNU General Public License (GPL) with the option of using
+any subsequent versions published by the FSF.
+
+"GPL-compatible Software" is software whose conditions of propagation,
+modification and use would permit combination with GCC in accord
+with the license of GCC.
+
+"Target Code" refers to output from any compiler for a real or
+virtual target processor architecture, in executable form or suitable
+for input to an assembler, loader, linker and/or execution phase.
+Notwithstanding that, Target Code does not include data in any
+format that is used as a compiler intermediate representation, or
+used for producing a compiler intermediate representation.
+
+The "Compilation Process" transforms code entirely represented in
+non-intermediate languages designed for human-written code, and/or
+in Java Virtual Machine byte code, into Target Code. Thus, for
+example, use of source code generators and preprocessors need not
+be considered part of the Compilation Process, since the Compilation
+Process can be understood as starting with the output of the
+generators or preprocessors.
+
+A Compilation Process is "Eligible" if it is done using GCC, alone
+or with other GPL-compatible software, or if it is done without
+using any work based on GCC. For example, using non-GPL-compatible
+Software to optimize any GCC intermediate representations would not
+qualify as an Eligible Compilation Process.
+
+1. Grant of Additional Permission.
+
+You have permission to propagate a work of Target Code formed by
+combining the Runtime Library with Independent Modules, even if
+such propagation would otherwise violate the terms of GPLv3, provided
+that all Target Code was generated by Eligible Compilation Processes.
+You may then convey such a combination under terms of your choice,
+consistent with the licensing of the Independent Modules.
+
+2. No Weakening of GCC Copyleft.
+
+The availability of this Exception does not imply any general
+presumption that third-party software is unaffected by the copyleft
+requirements of the license of GCC.
+==
+
+==
+ Copyright (c) 1994
+ Hewlett-Packard Company
+
+ Permission to use, copy, modify, distribute and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and
+ that both that copyright notice and this permission notice appear
+ in supporting documentation.  Hewlett-Packard Company makes no
+ representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied
+ warranty.
+==
+
+==
+ Copyright (c) 1996,1997
+ Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, distribute and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and
+ that both that copyright notice and this permission notice appear
+ in supporting documentation.  Silicon Graphics makes no
+ representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied
+ warranty.
+==
+
+==
+ shared_count.hpp
+@  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
+
+ shared_ptr.hpp
+ Copyright (C) 1998, 1999 Greg Colvin and Beman Dawes.
+ Copyright (C) 2001, 2002, 2003 Peter Dimov
+
+ weak_ptr.hpp
+ Copyright (C) 2001, 2002, 2003 Peter Dimov
+
+ enable_shared_from_this.hpp
+ Copyright (C) 2002 Peter Dimov
+
+Distributed under the Boost Software License, Version 1.0.
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or
+organization obtaining a copy of the software and accompanying
+documentation covered by this license (the "Software") to use,
+reproduce, display, distribute, execute, and transmit the Software,
+and to prepare derivative works of the Software, and to permit
+third-parties to whom the Software is furnished to do so, all subject
+to the following:
+
+The copyright notices in the Software and this entire statement,
+including the above license grant, this restriction and the following
+disclaimer, must be included in all copies of the Software, in whole
+or in part, and all derivative works of the Software, unless such
+copies or derivative works are solely in the form of machine-executable
+object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE
+DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
+LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+==
+
+==
+Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
+
+Permission to use, copy, modify, sell, and distribute this software
+is hereby granted without fee, provided that the above copyright
+notice appears in all copies, and that both that copyright notice
+and this permission notice appear in supporting documentation. None
+of the above authors, nor IBM Haifa Research Laboratories, make any
+representation about the suitability of this software for any
+purpose. It is provided "as is" without express or implied warranty.
+==
+
+   ======================================================================
+   ======================================================================
+
+libssh
+
+You are receiving a copy of libssh as part of MySQL Shell (a component of the
+MySQL server) in object code form. The terms of the Oracle license do NOT apply
+to libssh; libssh is licensed under the LGPLv2.1 license, separate from MySQL.
+If you do not wish to install this library, you may remove it, but the Oracle
+program might not operate properly or at all without it. Depending on the
+operating system the library can be found in the following locations:
+
+   - Linux: <librarydir-prefix>/mysql-shell/libssh.so
+   - OSX: <librarydir-prefix>/mysql-shell/libssh.dylib
+   - Windows: <installation-path>\bin\libssh.dll
+
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+This component is licensed under
+GNU Lesser General Public License v2.1, February 1999.
+See the 'Standard Licenses' section for license text.
+
+Additional Libraries Used by libssh
+libssh has dependencies on the following libraries:
+
+libgcrypt v1.7.3
+----------------
+    The library is distributed under the terms of the GNU Lesser
+    General Public License (LGPL); see the file COPYING.LIB for the
+    actual terms.  The helper programs (e.g. gcryptrnd and getrandom)
+    as well as the documentation are distributed under the terms of
+    the GNU General Public License (GPL); see the file COPYING for the
+    actual terms.  The file LICENSES has notices about contributions
+    that require these additional notices are distributed.
+
+Oracle's libssh implementation does not use any of the GPL licensed files
+that are included with the libgcrypt distribution
+
+libgpg-error v1.24
+------------------
+Oracle uses a subset of the files in libgpg-error to build libssh,
+All of the files used by Oracle are licensed under the LGPLv2.1
+
+Libgpg-error is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of the
+License, or (at your option) any later version.  See the file
+COPYING.LIB for copyright and warranty information.  See the file
+AUTHORS for a list of authors and important mail addresses.
+
+However, some files (for example src/mkerrnos.awk) used in the build
+process of the library and the manual are covered by a different
+license.  Please see the header of these files and the file COPYING
+for copyright and warranty information on these files.  A special
+exception in the copyright license of these files makes sure that the
+output in the build process, which is used in libgpg-error, is not
+affected by the GPL.
+
+COPYING:
+----------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+COPYING.LIB:
+----------------------------------------------------------------------
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+        51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+   ======================================================================
+   ======================================================================
+
+LZ4
+
+LZ4 Library
+Copyright (c) 2011-2016, Yann Collet
+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.
+
+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 HOLDER 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.
+
+   ======================================================================
+   ======================================================================
+
+md5 (Message-Digest Algorithm 5)
+
+md5 (Message-Digest Algorithm 5)
+
+ This code implements the MD5 message-digest algorithm.
+ The algorithm is due to Ron Rivest.  This code was
+ written by Colin Plumb in 1993, no copyright is claimed.
+ This code is in the public domain; do with it what you wish.
+
+ Equivalent code is available from RSA Data Security, Inc.
+ This code has been tested against that, and is equivalent,
+ except that you don't need to include two pages of legalese
+ with every copy.
+
+ The code has been modified by Mikael Ronstroem to handle
+ calculating a hash value of a key that is always a multiple
+ of 4 bytes long. Word 0 of the calculated 4-word hash value
+ is returned as the hash value.
+
+   ======================================================================
+   ======================================================================
+
+MeCab
+
+Copyright (c) 2001-2008, Taku Kudo
+Copyright (c) 2004-2008, Nippon Telegraph and Telephone Corporation
+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 name of the Nippon Telegraph and Telegraph Corporation
+   nor the names of its 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.
+
+   ======================================================================
+   ======================================================================
+
+MeCab Dictionary
+
+Copyright 2000, 2001, 2002, 2003 Nara Institute of Science and Technology.
+All Rights Reserved.
+
+Use, reproduction, and distribution of this software is permitted. Any copy
+of this software, whether in its original form or modified, must include both
+the above copyright notice and the following paragraphs.
+
+Nara Institute of Science and Technology (NAIST), the copyright holders,
+disclaims all warranties with regard to this software, including all implied
+warranties of merchantability and fitness, in no event shall NAIST be liable
+for any special, indirect or consequential damages or any damages whatsoever
+resulting from loss of use, data or profits, whether in an action of
+contract, negligence or other tortuous action, arising out of or in
+connection with the use or performance of this software.
+
+A large portion of the dictionary entries originate from ICOT Free Software.
+The following conditions for ICOT Free Software applies to the current
+dictionary as well.
+
+Each User may also freely distribute the Program, whether in its original
+form or modified, to any third party or parties, PROVIDED that the provisions
+of Section 3 ("NO WARRANTY") will ALWAYS appear on, or be attached to, the
+Program, which is distributed substantially in the same form as set out
+herein and that such intended distribution, if actually made, will neither
+violate or otherwise contravene any of the laws and regulations of the
+countries having jurisdiction over the User or the intended distribution
+itself.
+
+NO WARRANTY
+
+The program was produced on an experimental basis in the course of the
+research and development conducted during the project and is provided to
+users as so produced on an experimental basis.  Accordingly, the program is
+provided without any warranty whatsoever, whether express, implied, statutory
+or otherwise.  The term "warranty" used herein
+includes, but is not limited to, any warranty of the quality, performance,
+merchantability and fitness for a particular purpose of the program and the
+nonexistence of any infringement or violation of any right of any third
+party.
+
+Each user of the program will agree and understand, and be deemed to have
+agreed and understood, that there is no warranty whatsoever for the program
+and, accordingly, the entire risk arising from or otherwise connected with
+the program is assumed by the user.
+
+Therefore, neither ICOT, the copyright holder, or any other organization that
+participated in or was otherwise related to the development of the program
+and their respective officials, directors, officers and other employees shall
+be held liable for any and all damages, including, without limitation,
+general, special, incidental and consequential damages, arising out of or
+otherwise in connection with the use or inability to use the program or any
+product, material or result produced or otherwise obtained by using the
+program, regardless of whether they have been advised of, or otherwise had
+knowledge of, the possibility of such damages at any time during the project
+or thereafter.  Each user will be deemed to have agreed to the foregoing by
+his or her commencement of use of the program.  The term "use" as used herein
+includes, but is not limited to, the use, modification, copying and
+distribution of the program and the production of secondary products from the
+program.
+
+In the case where the program, whether in its original form or modified, was
+distributed or delivered to or received by a user from any person,
+organization or entity other than ICOT, unless it makes or grants
+independently of ICOT any specific warranty to the user in writing, such
+person, organization or entity, will also be exempted from and not be held
+liable to the user for any such damages as noted above as far as the program
+is concerned.
+
+   ======================================================================
+   ======================================================================
+
+memcached
+
+Copyright (c) 2003, Danga Interactive, Inc.
+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 name of the Danga Interactive nor the names of its
+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.
+
+   ======================================================================
+   ======================================================================
+
+nt_servc (Windows NT Service class library)
+
+Windows NT Service class library
+Copyright Abandoned 1998 Irena Pancirov - Irnet Snc
+This file is public domain and comes with NO WARRANTY of any kind
+
+   ======================================================================
+   ======================================================================
+
+OpenSSL 3.0
+
+You may be receiving a copy of OpenSSL 3.0 as part of this product in
+object code form.
+The terms of the Oracle license do NOT apply to OpenSSL 3.0.
+OpenSSL 3.0 is licensed under the Apache 2.0 license, separate from
+the Oracle product.
+If you do not wish to install this library, you may remove it, but
+the Oracle program might not operate properly or at all without it.
+
+/*
+ * Copyright 2003-2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+*/
+
+See Apache License v2.0, January 2004 in the
+'Standard Licenses' section.
+
+   ======================================================================
+   ======================================================================
+
+Percona Multiple I/O Threads Patch
+
+Copyright (c) 2008, 2009 Percona Inc
+All rights reserved.
+
+Redistribution and use of this software 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 name of Percona Inc. nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission of Percona Inc.
+
+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.
+
+   ======================================================================
+   ======================================================================
+
+Pion
+
+This Oracle Product includes or references Pion which is licensed to
+Oracle under the following terms:
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+RapidJSON v1.1.0
+
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All
+rights reserved.
+
+If you have downloaded a copy of the RapidJSON binary from Tencent, please
+note that the RapidJSON binary is licensed under the MIT License.
+If you have downloaded a copy of the RapidJSON source code from Tencent,
+please note that RapidJSON source code is licensed under the MIT License,
+except for the third-party components listed below which are subject to
+different license terms.  Your integration of RapidJSON into your own
+projects may require compliance with the MIT License, as well as the other
+licenses applicable to the third-party components included within RapidJSON.
+To avoid the problematic JSON license in your own projects, it's sufficient
+to exclude the bin/jsonchecker/ directory, as it's the only code under the
+JSON license.
+A copy of the MIT License is included in this file.
+
+Other dependencies and licenses:
+
+Open Source Software Licensed Under the BSD License:
+--------------------------------------------------------------------
+
+The msinttypes r29
+Copyright (c) 2006-2013 Alexander Chemeris
+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 name of  copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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.
+
+Open Source Software Licensed Under the JSON License:
+--------------------------------------------------------------------
+
+json.org
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+JSON_checker
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+
+Terms of the JSON License:
+---------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Terms of the MIT License:
+--------------------------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+RegEX-Spencer Library
+
+The following software may be included in this product: Henry
+Spencer's Regular-Expression Library (RegEX-Spencer)
+
+Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
+This software is not subject to any license of the American Telephone
+and Telegraph Company or of the Regents of the University of California.
+
+Permission is granted to anyone to use this software for any purpose on
+any computer system, and to alter it and redistribute it, subject
+to the following restrictions:
+
+1. The author is not responsible for the consequences of use of this
+   software, no matter how awful, even if they arise from flaws in it.
+
+2. The origin of this software must not be misrepresented, either by
+   explicit claim or by omission.  Since few users ever read sources,
+   credits must appear in the documentation.
+
+3. Altered versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.  Since few users
+   ever read sources, credits must appear in the documentation.
+
+4. This notice may not be removed or altered.
+
+   ======================================================================
+   ======================================================================
+
+Richard A. O'Keefe String Library
+
+The Richard O'Keefe String Library is subject to the following notice:
+
+These files are in the public domain.  This includes getopt.c, which
+is the work of Henry Spencer, University of Toronto Zoology, who
+says of it "None of this software is derived from Bell software. I
+had no access to the source for Bell's versions at the time I wrote
+it.  This software is hereby explicitly placed in the public domain.
+It may be used for any purpose on any machine by anyone." I would
+greatly prefer it if *my* material received no military use.
+
+The t_ctype.h file is subject to the following notice:
+
+Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.
+Copyright (C) 1998 by Theppitak Karoonboonyanan, all rights reserved.
+
+  Permission to use, copy, modify, distribute and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that the
+  above copyright notice appear in all copies.
+
+  Smaphan Raruenrom and Pruet Boonma makes no representations about
+the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+   ======================================================================
+   ======================================================================
+
+sajson
+
+Copyright (c) 2012 Chad Austin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   ======================================================================
+   ======================================================================
+
+SHA-1 in C
+
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+   ======================================================================
+   ======================================================================
+
+Time Zone Information
+
+Unless specified below, all files in the tz code and data (including this
+LICENSE file) are in the public domain. If the files date.c,
+newstrftime.3, and strftime.c are present, they contain material derived
+from BSD and use the BSD 3-clause license. tzdata:
+    # This file is in the public domain, so clarified as of
+    # 2009-05-17 by Arthur David Olson.
+/* Copyright 1985, 1987, 1988 The Regents of the University of California.
+   All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. 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.
+   3. Neither the name of the University nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.  */
+
+   ======================================================================
+   ======================================================================
+
+Unicode Data Files
+
+# unidata-5.2.0.txt
+# Date: 2009-09-22, 16:23:42 PDT [KW]
+#
+# This file defines the Default Unicode Collation Element Table
+#   (DUCET) for the Unicode Collation Algorithm
+#
+# Copyright (c) 2001-2009 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# See UTS #10, Unicode Collation Algorithm, for more information.
+#
+# Diagnostic weight ranges
+# Primary weight range:   0200..3ACA (14539)
+# Secondary weight range: 0020..0192 (371)
+# Variant secondaries:    0159..015E (6)
+# Digit secondaries:      015F..0192 (52)
+# Tertiary weight range:  0002..001F (30)
+#
+@version 5.2.0
+
+=== http://www.unicode.org/terms_of_use.html
+For the general privacy policy governing access to this site, see the
+Unicode Privacy Policy.
+
+Unicode Copyright
+    Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.
+Definitions
+Unicode Data Files ("DATA FILES") include all data files under the
+directories:
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
+Unicode Data Files do not include PDF online code charts under the directory:
+https://www.unicode.org/Public/
+Unicode Software ("SOFTWARE") includes any source code published in the
+Unicode Standard
+or any source code or compiled code under the directories:
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
+
+Terms of Use
+Certain documents and files on this website contain a legend indicating that
+"Modification is permitted." Any person is hereby authorized, without fee, to
+modify such documents and files to create derivative works conforming to the
+Unicode(R) Standard, subject to Terms and Conditions herein.
+Any person is hereby authorized, without fee, to view, use, reproduce, and
+distribute all documents and files, subject to the Terms and Conditions
+herein.
+Further specifications of rights and restrictions pertaining to the use of
+the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files
+and Software License.
+Each version of the Unicode Standard has further specifications of rights and
+restrictions of use. For the book editions (Unicode 5.0 and earlier), these
+are found on the back of the title page.
+The Unicode PDF online code charts carry specific restrictions. Those
+restrictions are incorporated as the first page of each PDF code chart.
+All other files, including online documentation of the core specification for
+Unicode 6.0 and later, are covered under these general Terms of Use.
+No license is granted to "mirror" the Unicode website where a fee is charged
+for access to the "mirror" site.
+Modification is not permitted with respect to this document. All copies of
+this document must be verbatim.
+
+Restricted Rights Legend
+Any technical data or software which is licensed to the United States of
+America, its agencies and/or instrumentalities under this Agreement is
+commercial technical data or commercial computer software developed
+exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014
+(June 1995), as applicable. For technical data, use, duplication, or
+disclosure by the Government is subject to restrictions as set forth in DFARS
+202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this
+Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as
+applicable, use, duplication or disclosure by the Government is subject to
+the restrictions set forth in this Agreement.
+
+Warranties and Disclaimers
+This publication and/or website may include technical or typographical errors
+or other inaccuracies. Changes are periodically added to the information
+herein; these changes will be incorporated in new editions of the publication
+and/or website. Unicode, Inc. may make improvements and/or changes in the
+product(s) and/or program(s) described in this publication and/or website at
+any time.
+If this file has been purchased on magnetic or optical media from Unicode,
+Inc. the sole and exclusive remedy for any claim will be exchange of the
+defective media within ninety (90) days of original purchase.
+
+EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS
+PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR
+STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS
+LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS
+PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR
+LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+
+Waiver of Damages
+In no event shall Unicode, Inc. or its licensors be liable for any special,
+incidental, indirect or consequential damages of any kind, or any damages
+whatsoever, whether or not Unicode, Inc. was advised of the possibility of
+the damage, including, without limitation, those resulting from the
+following: loss of use, data or profits, in connection with the use,
+modification or distribution of this information or its derivatives.
+
+Trademarks & Logos
+The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc.
+¿The Unicode Consortium¿ and ¿Unicode, Inc.¿ are trade names of Unicode, Inc.
+Use of the information and materials found on this website indicates your
+acknowledgement of Unicode, Inc.¿s exclusive worldwide rights in the Unicode
+Word Mark, the Unicode Logo, and the Unicode trade names.
+The Unicode Consortium Name and Trademark Usage Policy (¿Trademark Policy¿)
+are incorporated herein by reference and you agree to abide by the provisions
+of the Trademark Policy, which may be changed from time to time in the sole
+discretion of Unicode, Inc.
+All third party trademarks referenced herein are the property of their
+respective owners.
+
+Miscellaneous
+Jurisdiction and Venue. This website is operated from a location in the State
+of California, United States of America. Unicode, Inc. makes no
+representation that the materials are appropriate for use in other locations.
+If you access this website from other locations, you are responsible for
+compliance with local laws. This Agreement, all use of this website and any
+claims and damages resulting from use of this website are governed solely by
+the laws of the State of California without regard to any principles which
+would apply the laws of a different jurisdiction. The user agrees that any
+disputes regarding this website shall be resolved solely in the courts
+located in Santa Clara County, California. The user agrees said courts have
+personal jurisdiction and agree to waive any right to transfer the dispute to
+any other forum.
+
+Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify
+this Agreement at any time by posting it to this website. The user may not
+assign any part of this Agreement without Unicode, Inc.¿s prior written
+consent.
+
+Taxes. The user agrees to pay any taxes arising from access to this website
+or use of the information herein, except for those based on Unicode¿s net
+income.
+
+Severability.  If any provision of this Agreement is declared invalid or
+unenforceable, the remaining provisions of this Agreement shall remain in
+effect.
+
+Entire Agreement. This Agreement constitutes the entire agreement between the
+parties.
+
+   ======================================================================
+   ======================================================================
+
+Unicode Data Files
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+and http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the
+directory http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard
+or under the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/,
+http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1991-2016 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the Unicode data files and any associated documentation (the "Data Files")
+or Unicode software and any associated documentation (the "Software") to deal
+in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Data Files or Software, and to permit persons to
+whom the Data Files or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
+CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written authorization
+of the copyright holder.
+
+=========================================================================
+
+ICU-LICENSE
+-----------
+ICU License - ICU 1.8.1 and later
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2016 International Business Machines Corporation and
+others
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
+LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization of the
+copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the property of
+their respective owners.
+
+   ======================================================================
+   ======================================================================
+
+xxHash
+
+Copyright (c) 2012-2014, Yann Collet
+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.
+
+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 HOLDER 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.
+
+   ======================================================================
+   ======================================================================
+
+zlib
+
+Oracle gratefully acknowledges the contributions of Jean-loup Gailly
+and Mark Adler in creating the zlib general purpose compression
+library which is used in this product.
+
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
+
+   ======================================================================
+   ======================================================================
+
+Standard Licenses
+
+GNU Lesser General Public License v2.1, February 1999
+
+The following applies to all products licensed under the
+GNU Lesser General Public License, Version 2.1: You may
+not use the identified files except in compliance with
+the GNU Lesser General Public License, Version 2.1 (the
+"License"). You may obtain a copy of the License at
+http://www.gnu.org/licenses/lgpl-2.1.html. A copy of the
+license is also reproduced below. Unless required by
+applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs
+must be allowed to use the library.  A more frequent case is that
+a free library does the same job as widely used non-free libraries.
+In this case, there is little to gain by limiting the free library
+to free software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended
+to apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+   ======================================================================
+   ======================================================================
+
+Apache License v2.0, January 2004
+
+The following applies to all products licensed under the Apache 2.0
+License: You may not use the identified files except in compliance
+with the Apache License, Version 2.0 (the "License.") You may obtain a
+copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A
+copy of the license is also reproduced below. Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+
+Apache License Version 2.0, January 2004 http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control
+with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or
+management of such entity, whether by contract or otherwise, or (ii)
+ownership of fifty percent (50%) or more of the outstanding shares, or
+(iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but not
+limited to compiled object code, generated documentation, and
+conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object
+form, made available under the License, as indicated by a copyright
+notice that is included in or attached to the work (an example is
+provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the
+purposes of this License, Derivative Works shall not include works
+that remain separable from, or merely link (or bind by name) to the
+interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the
+original version of the Work and any modifications or additions to
+that Work or Derivative Works thereof, that is intentionally submitted
+to Licensor for inclusion in the Work by the copyright owner or by an
+individual or Legal Entity authorized to submit on behalf of the
+copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent to
+the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control
+systems, and issue tracking systems that are managed by, or on behalf
+of, the Licensor for the purpose of discussing and improving the Work,
+but excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and
+such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except
+as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work to
+which such Contribution(s) was submitted. If You institute patent
+litigation against any entity (including a cross-claim or counterclaim
+in a lawsuit) alleging that the Work or a Contribution incorporated
+within the Work constitutes direct or contributory patent
+infringement, then any patent licenses granted to You under this
+License for that Work shall terminate as of the date such litigation
+is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work
+or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You meet
+the following conditions:
+
+(a) You must give any other recipients of the Work or Derivative Works
+a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works that
+You distribute, all copyright, patent, trademark, and attribution
+notices from the Source form of the Work, excluding those notices that
+do not pertain to any part of the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+
+within such NOTICE file, excluding those notices that do not pertain
+to any part of the Derivative Works, in at least one of the following
+places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided
+along with the Derivative Works; or, within a display generated by the
+Derivative Works, if and wherever such third-party notices normally
+appear. The contents of the NOTICE file are for informational purposes
+only and do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside or as
+an addendum to the NOTICE text from the Work, provided that such
+additional attribution notices cannot be construed as modifying the
+License.
+
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated
+in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work by
+You to the Licensor shall be under the terms and conditions of this
+License, without any additional terms or conditions.  Notwithstanding
+the above, nothing herein shall supersede or modify the terms of any
+separate license agreement you may have executed with Licensor
+regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed
+to in writing, Licensor provides the Work (and each Contributor
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied, including, without
+limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
+responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise, unless
+required by applicable law (such as deliberate and grossly negligent
+acts) or agreed to in writing, shall any Contributor be liable to You
+for damages, including any direct, indirect, special, incidental, or
+consequential damages of any character arising as a result of this
+License or out of the use or inability to use the Work (including but
+not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or
+losses), even if such Contributor has been advised of the possibility
+of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer, and
+charge a fee for, acceptance of support, warranty, indemnity, or other
+liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only on
+Your own behalf and on Your sole responsibility, not on behalf of any
+other Contributor, and only if You agree to indemnify, defend, and
+hold each Contributor harmless for any liability incurred by, or
+claims asserted against, such Contributor by reason of your accepting
+any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included
+on the same "printed page" as the copyright notice for easier identification
+within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions
+and limitations under the License.
+
+   ======================================================================
+   ======================================================================
+
+Written Offer for Source Code
+
+   For any software that you receive from Oracle in binary form which is
+   licensed under an open source license that gives you the right to
+   receive the source code for that binary, you can obtain a copy of the
+   applicable source code by visiting
+   http://www.oracle.com/goto/opensourcecode. If the source code for the
+   binary was not provided to you with the binary, you can also receive a
+   copy of the source code on physical media by submitting a written
+   request to the address listed below or by sending an email to Oracle
+   using the following link:
+   http://www.oracle.com/goto/opensourcecode/request.
+
+  Oracle America, Inc.
+  Attn: Senior Vice President
+  Development and Engineering Legal
+  500 Oracle Parkway, 10th Floor
+  Redwood Shores, CA 94065
+
+   Your request should include:
+
+     * The name of the binary for which you are requesting the source code
+
+     * The name and version number of the Oracle product containing the
+       binary
+
+     * The date you received the Oracle product
+
+     * Your name
+
+     * Your company name (if applicable)
+
+     * Your return mailing address and email, and
+
+     * A telephone number in the event we need to reach you.
+
+
+   We may charge you a fee to cover the cost of physical media and
+   processing.
+
+   Your request must be sent
+
+    a. within three (3) years of the date you received the Oracle product
+       that included the binary that is the subject of your request, or
+
+    b. in the case of code licensed under the GPL v3 for as long as Oracle
+       offers spare parts or customer support for that product model.
diff --git a/README b/README
index 6cfca1fffc78..b6846396fc99 100644
--- a/README
+++ b/README
@@ -1,56 +1,17 @@
-MySQL Server 5.7
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-This is a release of MySQL, a dual-license SQL database server.
-For the avoidance of doubt, this particular copy of the software
-is released under the version 2 of the GNU General Public License.
-MySQL is brought to you by Oracle.
+This is a release of MySQL, an SQL database server.
 
-Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+License information can be found in the LICENSE file.
 
-License information can be found in the COPYING file.
+This distribution may include materials developed by third parties.
+For license and attribution notices for these materials,
+please refer to the LICENSE file.
 
-MySQL FOSS License Exception
-We want free and open source software applications under certain
-licenses to be able to use specified GPL-licensed MySQL client
-libraries despite the fact that not all such FOSS licenses are
-compatible with version 2 of the GNU General Public License.
-Therefore there are special exceptions to the terms and conditions
-of the GPLv2 as applied to these client libraries, which are
-identified and described in more detail in the FOSS License
-Exception at
-<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+For further information on MySQL or additional documentation, visit
+  http://dev.mysql.com/doc/
 
-This distribution may include materials developed by third
-parties. For license and attribution notices for these
-materials, please refer to the documentation that accompanies
-this distribution (see the "Licenses for Third-Party Components"
-appendix) or view the online documentation at
-<http://dev.mysql.com/doc/>.
+For additional downloads and the source of MySQL, visit
+  http://dev.mysql.com/downloads/
 
-GPLv2 Disclaimer
-For the avoidance of doubt, except that if any license choice
-other than GPL or LGPL is available it will apply instead,
-Oracle elects to use only the General Public License version 2
-(GPLv2) at this time for any software where a choice of GPL
-license versions is made available with the language indicating
-that GPLv2 or any later version may be used, or where a choice
-of which version of the GPL is applied is otherwise unspecified.
-
-For further information about MySQL or additional documentation,
-see:
-- The latest information about MySQL: http://www.mysql.com
-- The current MySQL documentation: http://dev.mysql.com/doc
-
-Some Reference Manual sections of special interest:
-- If you are migrating from an older version of MySQL, please
-  read the "Upgrading from..." section.
-- To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installing and Upgrading
-  chapter.
-- For the new features/bugfix history, see the MySQL Change History
-  appendix.
-
-You can browse the MySQL Reference Manual online or download it
-in any of several formats at the URL given earlier in this file.
-Source distributions include a local copy of the manual in the
-Docs directory.
+MySQL is brought to you by the MySQL team at Oracle.
diff --git a/VERSION b/VERSION
index 0fb072c5b17c..49c8c0d2dc2c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=21
+MYSQL_VERSION_PATCH=44
 MYSQL_VERSION_EXTRA=
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b74f5a7f57f2..11c8d354f13b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -17,8 +24,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/client
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/mysys_ssl
-  ${ZLIB_INCLUDE_DIR}
-  ${LZ4_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libmysql
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include
@@ -35,9 +40,6 @@ ADD_SUBDIRECTORY(base)
 ## Subdirectory for mysqlpump code.
 ADD_SUBDIRECTORY(dump)
 
-## We will need libeay32.dll and ssleay32.dll when running client executables.
-COPY_OPENSSL_DLLS(copy_openssl_client)
-
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 ADD_DEFINITIONS(${SSL_DEFINES})
@@ -97,7 +99,7 @@ SET_SOURCE_FILES_PROPERTIES(mysqlslap.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
-TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
 
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
@@ -105,7 +107,7 @@ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
 IF(UNIX AND NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_install_db
     mysql_install_db.cc auth_utils.cc path.cc logger.cc)
-  TARGET_LINK_LIBRARIES(mysql_install_db mysqlclient)
+  TARGET_LINK_LIBRARIES(mysql_install_db ${FORCE_SSL_SOLARIS} mysqlclient)
   ADD_COMPILE_FLAGS(
     auth_utils.cc mysql_install_db.cc
     COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/sql/auth"
diff --git a/client/auth_utils.cc b/client/auth_utils.cc
index 96fdfcf33b23..da6f50c0e9ca 100644
--- a/client/auth_utils.cc
+++ b/client/auth_utils.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/auth_utils.h b/client/auth_utils.h
index 4788ab0c1b80..e6f8c67a876b 100644
--- a/client/auth_utils.h
+++ b/client/auth_utils.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt
index 91cce4c8ecb5..1c1ff4f2c00b 100644
--- a/client/base/CMakeLists.txt
+++ b/client/base/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -15,6 +22,8 @@
 
 ADD_DEFINITIONS(${SSL_DEFINES})
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 ADD_CONVENIENCE_LIBRARY(client_base
   i_option.cc
   bool_option.cc
diff --git a/client/base/abstract_connection_program.cc b/client/base/abstract_connection_program.cc
index 8f4dc259c855..e57cbf746991 100644
--- a/client/base/abstract_connection_program.cc
+++ b/client/base/abstract_connection_program.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_connection_program.h b/client/base/abstract_connection_program.h
index d988cfca12f4..e9963bdfc17b 100644
--- a/client/base/abstract_connection_program.h
+++ b/client/base/abstract_connection_program.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_enum_option.h b/client/base/abstract_enum_option.h
index ea322f755298..df9e1dc90f58 100644
--- a/client/base/abstract_enum_option.h
+++ b/client/base/abstract_enum_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_integer_number_option.h b/client/base/abstract_integer_number_option.h
index 84e9e37db8d2..b202a7895d7f 100644
--- a/client/base/abstract_integer_number_option.h
+++ b/client/base/abstract_integer_number_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015  Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_number_option.h b/client/base/abstract_number_option.h
index 7fb4aef48a26..97518a51712a 100644
--- a/client/base/abstract_number_option.h
+++ b/client/base/abstract_number_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_option.h b/client/base/abstract_option.h
index e916210334a2..b6c6f1d418fa 100644
--- a/client/base/abstract_option.h
+++ b/client/base/abstract_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -173,7 +180,7 @@ template<typename T_type> void
   Abstract_option<T_type>::set_option_changed_listener(
     I_option_changed_listener* listener)
 {
-  DBUG_ASSERT(this->m_option_changed_listener == NULL);
+  assert(this->m_option_changed_listener == NULL);
 
   this->m_option_changed_listener= listener;
 }
diff --git a/client/base/abstract_options_provider.cc b/client/base/abstract_options_provider.cc
index 8063c061f977..bc9209b6da4d 100644
--- a/client/base/abstract_options_provider.cc
+++ b/client/base/abstract_options_provider.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -147,7 +154,7 @@ Abstract_options_provider::~Abstract_options_provider()
 
 void Abstract_options_provider::set_option_changed_listener(I_option_changed_listener* listener)
 {
-  DBUG_ASSERT(this->m_option_changed_listener == NULL);
+  assert(this->m_option_changed_listener == NULL);
   this->m_option_changed_listener= listener;
 }
 
diff --git a/client/base/abstract_options_provider.h b/client/base/abstract_options_provider.h
index 17e1ca25bbe5..c2597e2e1139 100644
--- a/client/base/abstract_options_provider.h
+++ b/client/base/abstract_options_provider.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_program.cc b/client/base/abstract_program.cc
index 60ae746eb174..036491f6faaf 100644
--- a/client/base/abstract_program.cc
+++ b/client/base/abstract_program.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_program.h b/client/base/abstract_program.h
index 866fff2b7d54..2c8d8d7951f0 100644
--- a/client/base/abstract_program.h
+++ b/client/base/abstract_program.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_string_option.h b/client/base/abstract_string_option.h
index f974fbfc15f1..6833f249e74d 100644
--- a/client/base/abstract_string_option.h
+++ b/client/base/abstract_string_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/abstract_value_option.h b/client/base/abstract_value_option.h
index 817bfc18ebb0..fce9551be4d4 100644
--- a/client/base/abstract_value_option.h
+++ b/client/base/abstract_value_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/atomic.h b/client/base/atomic.h
index 347f4c1019cb..d54af9dc304f 100644
--- a/client/base/atomic.h
+++ b/client/base/atomic.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/base/bool_option.cc b/client/base/bool_option.cc
index e3dbff81c348..9aed534bb4d8 100644
--- a/client/base/bool_option.cc
+++ b/client/base/bool_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/bool_option.h b/client/base/bool_option.h
index 2942aec49de0..d07020ac53bc 100644
--- a/client/base/bool_option.h
+++ b/client/base/bool_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/char_array_option.cc b/client/base/char_array_option.cc
index 49a83832d54c..30f81fa2d1b0 100644
--- a/client/base/char_array_option.cc
+++ b/client/base/char_array_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/char_array_option.h b/client/base/char_array_option.h
index cf2a088e2bfa..b5e831e7998f 100644
--- a/client/base/char_array_option.h
+++ b/client/base/char_array_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/composite_options_provider.cc b/client/base/composite_options_provider.cc
index fca84c8e4373..1cb16260223c 100644
--- a/client/base/composite_options_provider.cc
+++ b/client/base/composite_options_provider.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,7 +33,7 @@ using namespace Mysql::Tools::Base::Options;
 void Composite_options_provider::add_providers(
   I_options_provider* first, ...)
 {
-  DBUG_ASSERT(this->m_options_providers.size() == 0);
+  assert(this->m_options_providers.size() == 0);
 
   va_list options_to_add;
   va_start(options_to_add, first);
diff --git a/client/base/composite_options_provider.h b/client/base/composite_options_provider.h
index 022a070e0cf5..5934a8d34bb7 100644
--- a/client/base/composite_options_provider.h
+++ b/client/base/composite_options_provider.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/debug_options.cc b/client/base/debug_options.cc
index d6fdf3320026..4a6c30f4de33 100644
--- a/client/base/debug_options.cc
+++ b/client/base/debug_options.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,7 +55,7 @@ Debug_options::Debug_options(Abstract_program* program)
 
 void Debug_options::create_options()
 {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   this->create_new_disabled_option("debug",
     "This is a non-debug version. Catch this and exit.")
     ->set_short_character('#');
diff --git a/client/base/debug_options.h b/client/base/debug_options.h
index d61f239194ea..f5cfc2161097 100644
--- a/client/base/debug_options.h
+++ b/client/base/debug_options.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/disabled_option.cc b/client/base/disabled_option.cc
index d1822dd2e4da..db9d892cbc6e 100644
--- a/client/base/disabled_option.cc
+++ b/client/base/disabled_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/disabled_option.h b/client/base/disabled_option.h
index a2814b1e0668..985fabaf92de 100644
--- a/client/base/disabled_option.h
+++ b/client/base/disabled_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/enum_option.h b/client/base/enum_option.h
index b010854593c0..31e88521685c 100644
--- a/client/base/enum_option.h
+++ b/client/base/enum_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/help_options.cc b/client/base/help_options.cc
index c43a21d61116..8e332eab87c0 100644
--- a/client/base/help_options.cc
+++ b/client/base/help_options.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/help_options.h b/client/base/help_options.h
index 89d2e8f92184..56ec459d7e16 100644
--- a/client/base/help_options.h
+++ b/client/base/help_options.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/i_connection_factory.h b/client/base/i_connection_factory.h
index c0c5f0938bbd..e4ee638d6dc1 100644
--- a/client/base/i_connection_factory.h
+++ b/client/base/i_connection_factory.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/i_option.cc b/client/base/i_option.cc
index 51a2cd324003..9b000412788d 100644
--- a/client/base/i_option.cc
+++ b/client/base/i_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/i_option.h b/client/base/i_option.h
index f8541bb11a76..a1e608d8d108 100644
--- a/client/base/i_option.h
+++ b/client/base/i_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/i_option_changed_listener.h b/client/base/i_option_changed_listener.h
index b4b03bfd56d8..bb26f127c653 100644
--- a/client/base/i_option_changed_listener.h
+++ b/client/base/i_option_changed_listener.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/i_options_provider.h b/client/base/i_options_provider.h
index 4bc0d52b837e..5b35db424da4 100644
--- a/client/base/i_options_provider.h
+++ b/client/base/i_options_provider.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/message_data.cc b/client/base/message_data.cc
index c7ab1e1ff054..711e55c5f921 100644
--- a/client/base/message_data.cc
+++ b/client/base/message_data.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/message_data.h b/client/base/message_data.h
index fba5cbd9ba75..dd25908e1bd6 100644
--- a/client/base/message_data.h
+++ b/client/base/message_data.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014,2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/mutex.cc b/client/base/mutex.cc
index dcf09051276b..74787a392125 100644
--- a/client/base/mutex.cc
+++ b/client/base/mutex.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/base/mutex.h b/client/base/mutex.h
index 16191d896d69..703522216689 100644
--- a/client/base/mutex.h
+++ b/client/base/mutex.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/base/mysql_connection_options.cc b/client/base/mysql_connection_options.cc
index d3dccdf7565b..822b1dc012df 100644
--- a/client/base/mysql_connection_options.cc
+++ b/client/base/mysql_connection_options.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,7 @@
 #include "mysql_connection_options.h"
 #include "abstract_program.h"
 #include <mysys_err.h>
+#include "caching_sha2_passwordopt-vars.h"
 
 using Mysql::Tools::Base::Abstract_program;
 using namespace Mysql::Tools::Base::Options;
@@ -112,6 +120,11 @@ void Mysql_connection_options::create_options()
     "Directory for client-side plugins.");
   this->create_new_option(&this->m_default_auth, "default_auth",
     "Default authentication client-side plugin to use.");
+  this->create_new_option(&this->m_server_public_key, "server_public_key_path",
+                          "Path to file containing server public key");
+  this->create_new_option(&this->m_get_server_public_key,
+                          "get-server-public-key",
+                          "Get public key from server");
 }
 
 MYSQL* Mysql_connection_options::create_connection()
@@ -157,6 +170,17 @@ MYSQL* Mysql_connection_options::create_connection()
   mysql_options4(connection, MYSQL_OPT_CONNECT_ATTR_ADD,
                   "program_name", this->m_program->get_name().c_str());
 
+  if (this->m_server_public_key.has_value())
+  {
+    opt_server_public_key=
+      const_cast <char *> (this->m_server_public_key.value().c_str());
+  }
+
+  opt_get_server_public_key= this->m_get_server_public_key ? TRUE : FALSE;
+
+  set_server_public_key(connection);
+  set_get_server_public_key_option(connection);
+
   if (!mysql_real_connect(connection,
     this->get_null_or_string(this->m_host),
     this->get_null_or_string(this->m_user),
diff --git a/client/base/mysql_connection_options.h b/client/base/mysql_connection_options.h
index dbfbfcd9e7c3..23d640242a54 100644
--- a/client/base/mysql_connection_options.h
+++ b/client/base/mysql_connection_options.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -137,6 +144,8 @@ class Mysql_connection_options
   Nullable<std::string> m_user;
   Nullable<std::string> m_password;
   Nullable<std::string> m_default_charset;
+  Nullable<std::string> m_server_public_key;
+  bool m_get_server_public_key;
 };
 
 }
diff --git a/client/base/mysql_query_runner.cc b/client/base/mysql_query_runner.cc
index f629794f1ee9..8f719e0589d0 100644
--- a/client/base/mysql_query_runner.cc
+++ b/client/base/mysql_query_runner.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/mysql_query_runner.h b/client/base/mysql_query_runner.h
index c7f07f1a8fc7..3902c58e9293 100644
--- a/client/base/mysql_query_runner.h
+++ b/client/base/mysql_query_runner.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/number_option.h b/client/base/number_option.h
index bd8ebcb7a345..a4aa356bf12b 100644
--- a/client/base/number_option.h
+++ b/client/base/number_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/password_option.cc b/client/base/password_option.cc
index d9083dc5ed11..be2edd393d39 100644
--- a/client/base/password_option.cc
+++ b/client/base/password_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/password_option.h b/client/base/password_option.h
index b23629256cd2..aa776aec7909 100644
--- a/client/base/password_option.h
+++ b/client/base/password_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/show_variable_query_extractor.cc b/client/base/show_variable_query_extractor.cc
index 693cd04bd443..e27d3c0e7ccf 100644
--- a/client/base/show_variable_query_extractor.cc
+++ b/client/base/show_variable_query_extractor.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/show_variable_query_extractor.h b/client/base/show_variable_query_extractor.h
index 2735b4bba4b9..4d8cb99b7167 100644
--- a/client/base/show_variable_query_extractor.h
+++ b/client/base/show_variable_query_extractor.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/simple_option.cc b/client/base/simple_option.cc
index d2b7e1d2bcaf..8e418764efcb 100644
--- a/client/base/simple_option.cc
+++ b/client/base/simple_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/simple_option.h b/client/base/simple_option.h
index 1ae8589163fa..cde4fc6a55c8 100644
--- a/client/base/simple_option.h
+++ b/client/base/simple_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/ssl_options.cc b/client/base/ssl_options.cc
index c940903492fa..60fdb75b36ee 100644
--- a/client/base/ssl_options.cc
+++ b/client/base/ssl_options.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/string_option.cc b/client/base/string_option.cc
index efb25b16668b..6a3315feb668 100644
--- a/client/base/string_option.cc
+++ b/client/base/string_option.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/base/string_option.h b/client/base/string_option.h
index f3157c733628..61f338fc2bd2 100644
--- a/client/base/string_option.h
+++ b/client/base/string_option.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/check/mysqlcheck.cc b/client/check/mysqlcheck.cc
index d534a9c26403..d6a07f8c94e2 100644
--- a/client/check/mysqlcheck.cc
+++ b/client/check/mysqlcheck.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,6 +31,7 @@
 #include <mysql_version.h>
 #include <mysqld_error.h>
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 using namespace Mysql::Tools::Check;
@@ -96,7 +104,7 @@ static struct my_option my_long_options[] =
    "Check several databases. Note the difference in usage; in this case no tables are given. All name arguments are regarded as database names.",
    &opt_databases, &opt_databases, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -198,6 +206,7 @@ static struct my_option my_long_options[] =
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"tables", OPT_TABLES, "Overrides option --databases (-B).", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"use-frm", OPT_FRM,
@@ -488,6 +497,10 @@ static int dbConnect(char *host, char *user, char *passwd)
   mysql_options(&mysql_connection, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql_connection, MYSQL_OPT_CONNECT_ATTR_ADD,
                  "program_name", "mysqlcheck");
+
+  set_server_public_key(&mysql_connection);
+  set_get_server_public_key_option(&mysql_connection);
+
   if (!(sock = mysql_real_connect(&mysql_connection, host, user, passwd,
          NULL, opt_mysql_port, opt_mysql_unix_port, 0)))
   {
diff --git a/client/check/mysqlcheck.h b/client/check/mysqlcheck.h
index 249bc37ae6ec..c4dce10475c8 100644
--- a/client/check/mysqlcheck.h
+++ b/client/check/mysqlcheck.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/check/mysqlcheck_core.cc b/client/check/mysqlcheck_core.cc
index 4a0207cb15a0..cc1415979a81 100644
--- a/client/check/mysqlcheck_core.cc
+++ b/client/check/mysqlcheck_core.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/client_priv.h b/client/client_priv.h
index 36b602cd876b..3abf9a481dac 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -107,6 +114,7 @@ enum options_client
   OPT_CONNECTION_SERVER_ID,
   OPT_TLS_VERSION,
   OPT_SSL_MODE,
+  OPT_SKIP_MYSQL_SCHEMA,
   /* Add new option above this */
   OPT_MAX_CLIENT_OPTION
 };
diff --git a/client/completion_hash.cc b/client/completion_hash.cc
index 98244d1d6a74..2b485f03de37 100644
--- a/client/completion_hash.cc
+++ b/client/completion_hash.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/completion_hash.h b/client/completion_hash.h
index 70c2cf1b371f..4c057031fa28 100644
--- a/client/completion_hash.h
+++ b/client/completion_hash.h
@@ -1,15 +1,21 @@
-/* Copyright (c) 2000-2002, 2006 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
index bae2ce763151..e56a7fb1fadd 100644
--- a/client/dump/CMakeLists.txt
+++ b/client/dump/CMakeLists.txt
@@ -1,35 +1,32 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-# If we are building client-only (-DWITHOUT_SERVER=ON) with Solaris Studio,
-# we skip building the mysqlpump tool. The server, and mysqlpump, will be built
-# using gcc.
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/dump
 )
 
-IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
-  IF (WITHOUT_SERVER)
-    MESSAGE(STATUS "Not building mysqlpump")
-    RETURN()
-  ENDIF()
-ENDIF()
-
-# Prevent Boost from including external precompiled Boost libraries, use
-# threading (not implemented for older Solaris Studio compilers)
+# Prevent Boost from including external precompiled Boost libraries,
 # and turn off unused functionality.
 IF(USING_LOCAL_BOOST)
   ADD_DEFINITIONS(
@@ -42,17 +39,17 @@ SET(BOOST_LIB_SOURCES
   ${BOOST_SOURCES_DIR}/libs/system/src/error_code.cpp
 )
 
+INCLUDE_DIRECTORIES(SYSTEM
+  ${BOOST_PATCHES_DIR}
+  ${BOOST_INCLUDE_DIR}
+  )
+
 IF(USING_LOCAL_BOOST)
   ADD_CONVENIENCE_LIBRARY(boost_lib ${BOOST_LIB_SOURCES})
 
   # Do not build library unless it is needed by some other target.
   SET_PROPERTY(TARGET boost_lib PROPERTY EXCLUDE_FROM_ALL TRUE)
 
-  ADD_COMPILE_FLAGS(
-    ${BOOST_LIB_SOURCES}
-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-    )
-
   IF(HAVE_clock_gettime_IN_rt)
     TARGET_LINK_LIBRARIES(boost_lib ${LIBRT})
   ENDIF()
@@ -143,44 +140,7 @@ ADD_CONVENIENCE_LIBRARY(mysqlpump_lib ${MYSQLPUMP_LIB_SOURCES})
 TARGET_LINK_LIBRARIES(mysqlpump_lib
    client_base ${LZ4_LIBRARY})
 
-ADD_COMPILE_FLAGS(
-  ${MYSQLPUMP_LIB_SOURCES}
-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-  )
-
-# Files that use Boost sources that trigger compilation warnings
-SET(MYSQLPUMP_BOOST_SOURCES
-  abstract_crawler.cc
-  abstract_mysql_chain_element_extension.cc
-  abstract_progress_watcher.cc
-  mysql_chain_element_options.cc
-  mysql_object_reader.cc
-  mysqldump_tool_chain_maker.cc
-  mysqldump_tool_chain_maker_options.cc
-  object_filter.cc
-  object_queue.cc
-  program.cc
-  standard_progress_watcher.cc
-  sql_formatter.cc
-  table.cc
-)
-
-# Boost source has unused local typedefs.
-MY_CHECK_CXX_COMPILER_FLAG("-Wunused-local-typedefs" HAVE_UNUSED_TYPEDEFS)
-IF(HAVE_UNUSED_TYPEDEFS)
-  ADD_COMPILE_FLAGS(${MYSQLPUMP_BOOST_SOURCES}
-    COMPILE_FLAGS "-Wno-unused-local-typedefs")
-ENDIF()
-
-ADD_COMPILE_FLAGS(
-  compression_writer.cc
-  mysqldump_tool_chain_maker.cc
-  COMPILE_FLAGS -I${LZ4_INCLUDE_DIR}
-)
 MYSQL_ADD_EXECUTABLE(mysqlpump  program.cc)
-ADD_COMPILE_FLAGS(
-  program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-)
 
 TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB})
 IF(USING_SYSTEM_BOOST)
@@ -189,12 +149,3 @@ IF(USING_SYSTEM_BOOST)
 ENDIF()
 
 SET_TARGET_PROPERTIES(mysqlpump PROPERTIES HAS_CXX TRUE)
-
-# Store the executable in our parent directory.
-# Why? In pushbuild we do 'touch client/mysql*' to prevent rebuild,
-#      in the case where we have a separate build of libmysqlclient.so
-IF (NOT WIN32)
-  SET_TARGET_PROPERTIES(mysqlpump
-    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/client)
-ENDIF()
-
diff --git a/client/dump/abstract_chain_element.cc b/client/dump/abstract_chain_element.cc
index 2ded8575aed1..040a5319330a 100644
--- a/client/dump/abstract_chain_element.cc
+++ b/client/dump/abstract_chain_element.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_chain_element.h b/client/dump/abstract_chain_element.h
index 49bfaca357f7..908c7f333833 100644
--- a/client/dump/abstract_chain_element.h
+++ b/client/dump/abstract_chain_element.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_connection_provider.cc b/client/dump/abstract_connection_provider.cc
index 5d46db7958da..c848f8850c90 100644
--- a/client/dump/abstract_connection_provider.cc
+++ b/client/dump/abstract_connection_provider.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_connection_provider.h b/client/dump/abstract_connection_provider.h
index 7b1b84620d8c..5be28a09d962 100644
--- a/client/dump/abstract_connection_provider.h
+++ b/client/dump/abstract_connection_provider.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_crawler.cc b/client/dump/abstract_crawler.cc
index bec84a7d486c..8e8e6abbeee7 100644
--- a/client/dump/abstract_crawler.cc
+++ b/client/dump/abstract_crawler.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -53,12 +60,16 @@ Mysql::Tools::Base::Abstract_program* Abstract_crawler::get_program()
 
 void Abstract_crawler::process_dump_task(I_dump_task* new_dump_task)
 {
+  /*
+   Add the tasks to this list so that even if we error out,
+   cleanup is done properly.
+  */
+  m_dump_tasks_created.push_back(new_dump_task);
+
   /* in case of error stop all further processing */
   if (get_program()->get_error_code())
     return;
 
-  m_dump_tasks_created.push_back(new_dump_task);
-
   Item_processing_data* main_item_processing_data=
     this->new_task_created(new_dump_task);
 
diff --git a/client/dump/abstract_crawler.h b/client/dump/abstract_crawler.h
index 4c7530c45dcc..21853466cd68 100644
--- a/client/dump/abstract_crawler.h
+++ b/client/dump/abstract_crawler.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_data_formatter_wrapper.cc b/client/dump/abstract_data_formatter_wrapper.cc
index 3dcfb1ac15b6..9139aa340ac9 100644
--- a/client/dump/abstract_data_formatter_wrapper.cc
+++ b/client/dump/abstract_data_formatter_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_data_formatter_wrapper.h b/client/dump/abstract_data_formatter_wrapper.h
index 163b59ff2a2a..a0a2fa7b4be7 100644
--- a/client/dump/abstract_data_formatter_wrapper.h
+++ b/client/dump/abstract_data_formatter_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_data_object.cc b/client/dump/abstract_data_object.cc
index fb6f87ed2263..5bee3b2c8313 100644
--- a/client/dump/abstract_data_object.cc
+++ b/client/dump/abstract_data_object.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_data_object.h b/client/dump/abstract_data_object.h
index 7e5e1861df92..bbdba68e8d00 100644
--- a/client/dump/abstract_data_object.h
+++ b/client/dump/abstract_data_object.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_database_dump_task.cc b/client/dump/abstract_database_dump_task.cc
index 770210c553c6..f5a857e65720 100644
--- a/client/dump/abstract_database_dump_task.cc
+++ b/client/dump/abstract_database_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_database_dump_task.h b/client/dump/abstract_database_dump_task.h
index 48ee94c182ee..dcd261e2576d 100644
--- a/client/dump/abstract_database_dump_task.h
+++ b/client/dump/abstract_database_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_dump_task.cc b/client/dump/abstract_dump_task.cc
index 8db1f05ba97c..1f18a1c0841c 100644
--- a/client/dump/abstract_dump_task.cc
+++ b/client/dump/abstract_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_dump_task.h b/client/dump/abstract_dump_task.h
index 077205af70cc..9b818fb7bca6 100644
--- a/client/dump/abstract_dump_task.h
+++ b/client/dump/abstract_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_mysql_chain_element_extension.cc b/client/dump/abstract_mysql_chain_element_extension.cc
index 8e36687306c7..4244785e8367 100644
--- a/client/dump/abstract_mysql_chain_element_extension.cc
+++ b/client/dump/abstract_mysql_chain_element_extension.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_mysql_chain_element_extension.h b/client/dump/abstract_mysql_chain_element_extension.h
index 2556b11e8bef..603e212cfbcf 100644
--- a/client/dump/abstract_mysql_chain_element_extension.h
+++ b/client/dump/abstract_mysql_chain_element_extension.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_object_reader_wrapper.cc b/client/dump/abstract_object_reader_wrapper.cc
index 1fc90fc886ef..864b3fd694aa 100644
--- a/client/dump/abstract_object_reader_wrapper.cc
+++ b/client/dump/abstract_object_reader_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_object_reader_wrapper.h b/client/dump/abstract_object_reader_wrapper.h
index ce69c631a735..c469c7d9a447 100644
--- a/client/dump/abstract_object_reader_wrapper.h
+++ b/client/dump/abstract_object_reader_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_output_writer_wrapper.cc b/client/dump/abstract_output_writer_wrapper.cc
index ece11076ab6d..ff30401747fe 100644
--- a/client/dump/abstract_output_writer_wrapper.cc
+++ b/client/dump/abstract_output_writer_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_output_writer_wrapper.h b/client/dump/abstract_output_writer_wrapper.h
index 09d400936ec2..ba237a3b1c02 100644
--- a/client/dump/abstract_output_writer_wrapper.h
+++ b/client/dump/abstract_output_writer_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_plain_sql_object.cc b/client/dump/abstract_plain_sql_object.cc
index 783d1efa30c1..07891c14d863 100644
--- a/client/dump/abstract_plain_sql_object.cc
+++ b/client/dump/abstract_plain_sql_object.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_plain_sql_object.h b/client/dump/abstract_plain_sql_object.h
index f3f762bb864e..82e5f7e66deb 100644
--- a/client/dump/abstract_plain_sql_object.h
+++ b/client/dump/abstract_plain_sql_object.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_plain_sql_object_dump_task.cc b/client/dump/abstract_plain_sql_object_dump_task.cc
index c30a034318fe..4f9a47343708 100644
--- a/client/dump/abstract_plain_sql_object_dump_task.cc
+++ b/client/dump/abstract_plain_sql_object_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_plain_sql_object_dump_task.h b/client/dump/abstract_plain_sql_object_dump_task.h
index f4d904794575..0936f6aa5d16 100644
--- a/client/dump/abstract_plain_sql_object_dump_task.h
+++ b/client/dump/abstract_plain_sql_object_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_progress_reporter.cc b/client/dump/abstract_progress_reporter.cc
index 4e07ee322862..818442864954 100644
--- a/client/dump/abstract_progress_reporter.cc
+++ b/client/dump/abstract_progress_reporter.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_progress_reporter.h b/client/dump/abstract_progress_reporter.h
index 23d39fb50fcf..116216aa948e 100644
--- a/client/dump/abstract_progress_reporter.h
+++ b/client/dump/abstract_progress_reporter.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_progress_watcher.cc b/client/dump/abstract_progress_watcher.cc
index bee656c5930a..6abebd73b429 100644
--- a/client/dump/abstract_progress_watcher.cc
+++ b/client/dump/abstract_progress_watcher.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_progress_watcher.h b/client/dump/abstract_progress_watcher.h
index de2e48c2be2a..c6a94f9e0ba0 100644
--- a/client/dump/abstract_progress_watcher.h
+++ b/client/dump/abstract_progress_watcher.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_simple_dump_task.cc b/client/dump/abstract_simple_dump_task.cc
index aaeecd1b1722..c479b45ca971 100644
--- a/client/dump/abstract_simple_dump_task.cc
+++ b/client/dump/abstract_simple_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_simple_dump_task.h b/client/dump/abstract_simple_dump_task.h
index 2bff9c53016c..8204de2a2e9b 100644
--- a/client/dump/abstract_simple_dump_task.h
+++ b/client/dump/abstract_simple_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_table_dump_task.cc b/client/dump/abstract_table_dump_task.cc
index db78fb19f58c..0242367edd0c 100644
--- a/client/dump/abstract_table_dump_task.cc
+++ b/client/dump/abstract_table_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/abstract_table_dump_task.h b/client/dump/abstract_table_dump_task.h
index a3ea346b2582..c22215c2d5ec 100644
--- a/client/dump/abstract_table_dump_task.h
+++ b/client/dump/abstract_table_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/chain_data.cc b/client/dump/chain_data.cc
index 1a628f08eb57..1edaa3a4837d 100644
--- a/client/dump/chain_data.cc
+++ b/client/dump/chain_data.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/chain_data.h b/client/dump/chain_data.h
index b6d08984d240..abc45ccf195f 100644
--- a/client/dump/chain_data.h
+++ b/client/dump/chain_data.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/composite_message_handler.cc b/client/dump/composite_message_handler.cc
index 9b32cb114177..531e77f40845 100644
--- a/client/dump/composite_message_handler.cc
+++ b/client/dump/composite_message_handler.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/composite_message_handler.h b/client/dump/composite_message_handler.h
index 19bcf9ce327b..431230c3e0f1 100644
--- a/client/dump/composite_message_handler.h
+++ b/client/dump/composite_message_handler.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/compression_lz4_writer.cc b/client/dump/compression_lz4_writer.cc
index cfba2f645bc8..244b4f697629 100644
--- a/client/dump/compression_lz4_writer.cc
+++ b/client/dump/compression_lz4_writer.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/compression_lz4_writer.h b/client/dump/compression_lz4_writer.h
index 5b2b4d9ecf2a..b11a3c745402 100644
--- a/client/dump/compression_lz4_writer.h
+++ b/client/dump/compression_lz4_writer.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/compression_zlib_writer.cc b/client/dump/compression_zlib_writer.cc
index 35e605103195..af649b6d9e64 100644
--- a/client/dump/compression_zlib_writer.cc
+++ b/client/dump/compression_zlib_writer.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/compression_zlib_writer.h b/client/dump/compression_zlib_writer.h
index fd2a32e813f8..dc25504f7283 100644
--- a/client/dump/compression_zlib_writer.h
+++ b/client/dump/compression_zlib_writer.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database.cc b/client/dump/database.cc
index 1ee73729bc74..24c0176d3e6d 100644
--- a/client/dump/database.cc
+++ b/client/dump/database.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database.h b/client/dump/database.h
index 808eb4d91392..f18a12a84830 100644
--- a/client/dump/database.h
+++ b/client/dump/database.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database_end_dump_task.cc b/client/dump/database_end_dump_task.cc
index dd8515fb4fdf..88ad219093f4 100644
--- a/client/dump/database_end_dump_task.cc
+++ b/client/dump/database_end_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database_end_dump_task.h b/client/dump/database_end_dump_task.h
index 55ebfaaa14b1..1e206892d7ea 100644
--- a/client/dump/database_end_dump_task.h
+++ b/client/dump/database_end_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database_start_dump_task.cc b/client/dump/database_start_dump_task.cc
index dc7daab16dd3..dbcbe38b6748 100644
--- a/client/dump/database_start_dump_task.cc
+++ b/client/dump/database_start_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/database_start_dump_task.h b/client/dump/database_start_dump_task.h
index d2bbe9690b07..116ec843c8cc 100644
--- a/client/dump/database_start_dump_task.h
+++ b/client/dump/database_start_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/dump_end_dump_task.cc b/client/dump/dump_end_dump_task.cc
index 71c1368c34c0..f39f38e1591c 100644
--- a/client/dump/dump_end_dump_task.cc
+++ b/client/dump/dump_end_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/dump_end_dump_task.h b/client/dump/dump_end_dump_task.h
index 21b20dd5c1a6..e526bf0c2ea1 100644
--- a/client/dump/dump_end_dump_task.h
+++ b/client/dump/dump_end_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/dump_start_dump_task.cc b/client/dump/dump_start_dump_task.cc
index 629dc7bbd8b2..c2aef828529e 100644
--- a/client/dump/dump_start_dump_task.cc
+++ b/client/dump/dump_start_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/dump_start_dump_task.h b/client/dump/dump_start_dump_task.h
index f6bc288f04bc..f24c048fc218 100644
--- a/client/dump/dump_start_dump_task.h
+++ b/client/dump/dump_start_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/event_scheduler_event.cc b/client/dump/event_scheduler_event.cc
index 9a4b63e32223..cd0a5922f588 100644
--- a/client/dump/event_scheduler_event.cc
+++ b/client/dump/event_scheduler_event.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/event_scheduler_event.h b/client/dump/event_scheduler_event.h
index fdac736ff483..2c9a420f0f7f 100644
--- a/client/dump/event_scheduler_event.h
+++ b/client/dump/event_scheduler_event.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/field.cc b/client/dump/field.cc
index 58c588e1a85d..595196c13e1e 100644
--- a/client/dump/field.cc
+++ b/client/dump/field.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/field.h b/client/dump/field.h
index f603bad05f2c..bf890cb4409b 100644
--- a/client/dump/field.h
+++ b/client/dump/field.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/file_writer.cc b/client/dump/file_writer.cc
index 0cee240bc9af..c5e358f2bf18 100644
--- a/client/dump/file_writer.cc
+++ b/client/dump/file_writer.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/file_writer.h b/client/dump/file_writer.h
index bbb478c617b1..c2c2bad1308d 100644
--- a/client/dump/file_writer.h
+++ b/client/dump/file_writer.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_chain_element.cc b/client/dump/i_chain_element.cc
index aaeb68ef7121..0a5186acce30 100644
--- a/client/dump/i_chain_element.cc
+++ b/client/dump/i_chain_element.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_chain_element.h b/client/dump/i_chain_element.h
index 7498e635308e..6a77651f7070 100644
--- a/client/dump/i_chain_element.h
+++ b/client/dump/i_chain_element.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_chain_maker.h b/client/dump/i_chain_maker.h
index 08bff09716aa..39ef57490031 100644
--- a/client/dump/i_chain_maker.h
+++ b/client/dump/i_chain_maker.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_connection_provider.cc b/client/dump/i_connection_provider.cc
index 31c71c8ed38b..14aff64e28b4 100644
--- a/client/dump/i_connection_provider.cc
+++ b/client/dump/i_connection_provider.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_connection_provider.h b/client/dump/i_connection_provider.h
index 0e7be13790b9..d53e2cd4a0a1 100644
--- a/client/dump/i_connection_provider.h
+++ b/client/dump/i_connection_provider.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_crawler.cc b/client/dump/i_crawler.cc
index d49a84ffb3c9..a3ba54d0df1e 100644
--- a/client/dump/i_crawler.cc
+++ b/client/dump/i_crawler.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_crawler.h b/client/dump/i_crawler.h
index 8f5d39f7b2f0..7f0ac901ab41 100644
--- a/client/dump/i_crawler.h
+++ b/client/dump/i_crawler.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_formatter.cc b/client/dump/i_data_formatter.cc
index a66c21937bb1..add40e3e5e3e 100644
--- a/client/dump/i_data_formatter.cc
+++ b/client/dump/i_data_formatter.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_formatter.h b/client/dump/i_data_formatter.h
index 80b94bacf858..d8bdfb7da958 100644
--- a/client/dump/i_data_formatter.h
+++ b/client/dump/i_data_formatter.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_formatter_wrapper.cc b/client/dump/i_data_formatter_wrapper.cc
index 340879e8b4be..a75c08d6a086 100644
--- a/client/dump/i_data_formatter_wrapper.cc
+++ b/client/dump/i_data_formatter_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_formatter_wrapper.h b/client/dump/i_data_formatter_wrapper.h
index 8efc03d6cd9c..09103327a91f 100644
--- a/client/dump/i_data_formatter_wrapper.h
+++ b/client/dump/i_data_formatter_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_object.cc b/client/dump/i_data_object.cc
index b3fa5187171d..c6caaa00394b 100644
--- a/client/dump/i_data_object.cc
+++ b/client/dump/i_data_object.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_data_object.h b/client/dump/i_data_object.h
index 1a2d5b2e4827..68bdba3cc240 100644
--- a/client/dump/i_data_object.h
+++ b/client/dump/i_data_object.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_dump_task.cc b/client/dump/i_dump_task.cc
index c82e540e7cf8..d09af73da1c8 100644
--- a/client/dump/i_dump_task.cc
+++ b/client/dump/i_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_dump_task.h b/client/dump/i_dump_task.h
index d07e431168bd..d7f29a91d8c6 100644
--- a/client/dump/i_dump_task.h
+++ b/client/dump/i_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_object_reader.cc b/client/dump/i_object_reader.cc
index 676c8b35e745..9661f16a2bc4 100644
--- a/client/dump/i_object_reader.cc
+++ b/client/dump/i_object_reader.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_object_reader.h b/client/dump/i_object_reader.h
index 547f6121f9c7..1ba23598620b 100644
--- a/client/dump/i_object_reader.h
+++ b/client/dump/i_object_reader.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_object_reader_wrapper.cc b/client/dump/i_object_reader_wrapper.cc
index 31af8c8190eb..0796b65a9a0c 100644
--- a/client/dump/i_object_reader_wrapper.cc
+++ b/client/dump/i_object_reader_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_object_reader_wrapper.h b/client/dump/i_object_reader_wrapper.h
index 9db48c1b1efa..d9014bec6744 100644
--- a/client/dump/i_object_reader_wrapper.h
+++ b/client/dump/i_object_reader_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_output_writer.cc b/client/dump/i_output_writer.cc
index 8a7992ecf86a..f0e8ce4155ee 100644
--- a/client/dump/i_output_writer.cc
+++ b/client/dump/i_output_writer.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_output_writer.h b/client/dump/i_output_writer.h
index 4a8963dacb04..e9d3f56a6403 100644
--- a/client/dump/i_output_writer.h
+++ b/client/dump/i_output_writer.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_output_writer_wrapper.cc b/client/dump/i_output_writer_wrapper.cc
index a42d742291a3..1d272e163dc9 100644
--- a/client/dump/i_output_writer_wrapper.cc
+++ b/client/dump/i_output_writer_wrapper.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_output_writer_wrapper.h b/client/dump/i_output_writer_wrapper.h
index e2f1904b30d7..0957145488c1 100644
--- a/client/dump/i_output_writer_wrapper.h
+++ b/client/dump/i_output_writer_wrapper.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_progress_reporter.cc b/client/dump/i_progress_reporter.cc
index 887b99434561..d444f7b64de9 100644
--- a/client/dump/i_progress_reporter.cc
+++ b/client/dump/i_progress_reporter.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_progress_reporter.h b/client/dump/i_progress_reporter.h
index c1beb4cc0ab3..c32ca6d47f6a 100644
--- a/client/dump/i_progress_reporter.h
+++ b/client/dump/i_progress_reporter.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_progress_watcher.cc b/client/dump/i_progress_watcher.cc
index bd1b196ed632..ea452c8d9149 100644
--- a/client/dump/i_progress_watcher.cc
+++ b/client/dump/i_progress_watcher.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/i_progress_watcher.h b/client/dump/i_progress_watcher.h
index 85be73ba00f3..465588a4fdc1 100644
--- a/client/dump/i_progress_watcher.h
+++ b/client/dump/i_progress_watcher.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/item_processing_data.cc b/client/dump/item_processing_data.cc
index 14a77f1c64e3..e040fa934156 100644
--- a/client/dump/item_processing_data.cc
+++ b/client/dump/item_processing_data.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/item_processing_data.h b/client/dump/item_processing_data.h
index fb05fb362ffb..dd7f927ae4ec 100644
--- a/client/dump/item_processing_data.h
+++ b/client/dump/item_processing_data.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_chain_element_options.cc b/client/dump/mysql_chain_element_options.cc
index 27707db74248..0efa26fca79a 100644
--- a/client/dump/mysql_chain_element_options.cc
+++ b/client/dump/mysql_chain_element_options.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_chain_element_options.h b/client/dump/mysql_chain_element_options.h
index e8ac05b08cc6..44084cd2a062 100644
--- a/client/dump/mysql_chain_element_options.h
+++ b/client/dump/mysql_chain_element_options.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_crawler.cc b/client/dump/mysql_crawler.cc
index 2544e24c9744..80512cdbf617 100644
--- a/client/dump/mysql_crawler.cc
+++ b/client/dump/mysql_crawler.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -19,6 +26,7 @@
 #include "mysql_function.h"
 #include "stored_procedure.h"
 #include "table_definition_dump_task.h"
+#include "mysqldump_tool_chain_maker_options.h"
 #include "table_rows_dump_task.h"
 #include "table_deferred_indexes_dump_task.h"
 #include "event_scheduler_event.h"
@@ -37,10 +45,12 @@ Mysql_crawler::Mysql_crawler(I_connection_provider* connection_provider,
   Mysql::I_callable<bool, const Mysql::Tools::Base::Message_data&>*
     message_handler, Simple_id_generator* object_id_generator,
   Mysql_chain_element_options* options,
+  Mysqldump_tool_chain_maker_options* mysqldump_tool_cmaker_options,
   Mysql::Tools::Base::Abstract_program* program)
   : Abstract_crawler(message_handler, object_id_generator, program),
   Abstract_mysql_chain_element_extension(
-  connection_provider, message_handler, options)
+  connection_provider, message_handler, options),
+  m_mysqldump_tool_cmaker_options(mysqldump_tool_cmaker_options)
 {}
 
 void Mysql_crawler::enumerate_objects()
@@ -79,6 +89,7 @@ void Mysql_crawler::enumerate_objects()
   m_tables_definition_ready_dump_task=
     new Tables_definition_ready_dump_task();
 
+  m_dump_end_task->add_dependency(m_dump_start_task);
   this->process_dump_task(m_dump_start_task);
 
   std::vector<const Mysql::Tools::Base::Mysql_query_runner::Row*> databases;
@@ -96,14 +107,29 @@ void Mysql_crawler::enumerate_objects()
       this->get_create_statement(runner, "", db_name,
       "DATABASE IF NOT EXISTS").value());
 
-    db_list.push_back(database);
     m_current_database_start_dump_task=
       new Database_start_dump_task(database);
+
+    Abstract_data_object* db_object = dynamic_cast<Abstract_data_object*>(
+    m_current_database_start_dump_task->get_related_db_object());
+
+    /*
+     This check is introduced so that only the database objects that are
+     included in the dump are validated.
+    */
+    if (!m_mysqldump_tool_cmaker_options->is_object_included_in_dump(db_object))
+    {
+      delete m_current_database_start_dump_task;
+      delete database;
+      continue;
+    }
+    db_list.push_back(database);
     m_current_database_end_dump_task=
       new Database_end_dump_task(database);
     db_end_task_list.push_back(m_current_database_end_dump_task);
 
     m_current_database_start_dump_task->add_dependency(m_dump_start_task);
+    m_dump_end_task->add_dependency(m_current_database_start_dump_task);
     m_dump_end_task->add_dependency(m_current_database_end_dump_task);
 
     this->process_dump_task(m_current_database_start_dump_task);
@@ -114,6 +140,10 @@ void Mysql_crawler::enumerate_objects()
   m_dump_end_task->add_dependency(m_tables_definition_ready_dump_task);
   this->process_dump_task(m_tables_definition_ready_dump_task);
 
+  /* SHOW CREATE USER is introduced in 5.7.6 */
+  if (use_show_create_user)
+    this->enumerate_users();
+
   std::vector<Database* >::iterator it;
   std::vector<Database_end_dump_task* >::iterator it_end;
   for (it= db_list.begin(),it_end= db_end_task_list.begin();
@@ -128,8 +158,6 @@ void Mysql_crawler::enumerate_objects()
 
   Mysql::Tools::Base::Mysql_query_runner::cleanup_result(&databases);
 
-  this->enumerate_users();
-
   this->process_dump_task(m_dump_end_task);
 
   this->report_crawler_completed(this);
@@ -271,9 +299,15 @@ void Mysql_crawler::enumerate_views(const Database& db)
         if (runner->run_query(std::string("LOCK TABLES ")
               + this->get_quoted_object_full_name(db.get_name(), table_name)
               + " READ") != 0)
+        {
+          Mysql::Tools::Base::Mysql_query_runner::cleanup_result(&check_view);
+          Mysql::Tools::Base::Mysql_query_runner::cleanup_result(&tables);
+          delete runner;
           return;
+        }
         else
           runner->run_query(std::string("UNLOCK TABLES"));
+
         View* view= new View(this->generate_new_object_id(),
                               table_name,
                               db.get_name(),
@@ -399,6 +433,7 @@ void Mysql_crawler::enumerate_users()
         this->generate_new_object_id(), user_row[0], user);
 
     grant->add_dependency(previous_grant);
+    grant->add_dependency(m_tables_definition_ready_dump_task);
     m_dump_end_task->add_dependency(grant);
     this->process_dump_task(grant);
     previous_grant= grant;
diff --git a/client/dump/mysql_crawler.h b/client/dump/mysql_crawler.h
index bd677680b818..d01f19ae6400 100644
--- a/client/dump/mysql_crawler.h
+++ b/client/dump/mysql_crawler.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -28,6 +35,7 @@
 #include "table.h"
 #include "dump_end_dump_task.h"
 #include "mysql_chain_element_options.h"
+#include "mysqldump_tool_chain_maker_options.h"
 #include "database_start_dump_task.h"
 #include "database_end_dump_task.h"
 #include "tables_definition_ready_dump_task.h"
@@ -51,6 +59,7 @@ class Mysql_crawler
     Mysql::I_callable<bool, const Mysql::Tools::Base::Message_data&>*
       message_handler, Simple_id_generator* object_id_generator,
       Mysql_chain_element_options* options,
+      Mysqldump_tool_chain_maker_options* m_mysqldump_tool_cmaker_options,
       Mysql::Tools::Base::Abstract_program* program);
   /**
     Enumerates all objects it can access, gets chains from all registered
@@ -75,6 +84,8 @@ class Mysql_crawler
 
   void enumerate_users();
 
+  Mysqldump_tool_chain_maker_options* m_mysqldump_tool_cmaker_options;
+
   /**
     Rewrite statement, enclosing it with version specific comment and with
     DEFINER clause enclosed in version-specific comment.
diff --git a/client/dump/mysql_field.cc b/client/dump/mysql_field.cc
index 69ee5fae2b73..d3c3f8bd28b6 100644
--- a/client/dump/mysql_field.cc
+++ b/client/dump/mysql_field.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_field.h b/client/dump/mysql_field.h
index 1d745b824760..292a87a17bc9 100644
--- a/client/dump/mysql_field.h
+++ b/client/dump/mysql_field.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_function.cc b/client/dump/mysql_function.cc
index 4c67cd445212..eb54cd8dafd2 100644
--- a/client/dump/mysql_function.cc
+++ b/client/dump/mysql_function.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_function.h b/client/dump/mysql_function.h
index 095ee2cfcc03..b57d679712d4 100644
--- a/client/dump/mysql_function.h
+++ b/client/dump/mysql_function.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_object_reader.cc b/client/dump/mysql_object_reader.cc
index 1f9f9350e3f9..6b63e2ac2160 100644
--- a/client/dump/mysql_object_reader.cc
+++ b/client/dump/mysql_object_reader.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_object_reader.h b/client/dump/mysql_object_reader.h
index ceff834ae999..17c792451a10 100644
--- a/client/dump/mysql_object_reader.h
+++ b/client/dump/mysql_object_reader.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_object_reader_options.cc b/client/dump/mysql_object_reader_options.cc
index d95a383b7fd4..8b6d07d66237 100644
--- a/client/dump/mysql_object_reader_options.cc
+++ b/client/dump/mysql_object_reader_options.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysql_object_reader_options.h b/client/dump/mysql_object_reader_options.h
index 1fe93b1a427d..d1f681aca204 100644
--- a/client/dump/mysql_object_reader_options.h
+++ b/client/dump/mysql_object_reader_options.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysqldump_tool_chain_maker.cc b/client/dump/mysqldump_tool_chain_maker.cc
index 7d1f8acc7880..627e9080cd31 100644
--- a/client/dump/mysqldump_tool_chain_maker.cc
+++ b/client/dump/mysqldump_tool_chain_maker.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -24,6 +31,7 @@
 #include "sql_formatter.h"
 #include "mysqldump_tool_chain_maker_options.h"
 #include <boost/algorithm/string.hpp>
+#include "m_ctype.h"
 
 using namespace Mysql::Tools::Dump;
 
@@ -45,12 +53,14 @@ I_object_reader* Mysqldump_tool_chain_maker::create_chain(
   {
     return NULL;
   }
+
   if (!m_options->is_object_included_in_dump(
     dynamic_cast<Abstract_data_object*>(
     dump_task->get_related_db_object())))
   {
     return NULL;
   }
+
   if (m_main_object_reader == NULL)
   {
     I_output_writer* writer;
diff --git a/client/dump/mysqldump_tool_chain_maker.h b/client/dump/mysqldump_tool_chain_maker.h
index 428120ef02b0..febfba10a007 100644
--- a/client/dump/mysqldump_tool_chain_maker.h
+++ b/client/dump/mysqldump_tool_chain_maker.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/mysqldump_tool_chain_maker_options.cc b/client/dump/mysqldump_tool_chain_maker_options.cc
index 26a054905644..9563039ba89f 100644
--- a/client/dump/mysqldump_tool_chain_maker_options.cc
+++ b/client/dump/mysqldump_tool_chain_maker_options.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -20,6 +27,8 @@
 
 using namespace Mysql::Tools::Dump;
 
+bool Mysql::Tools::Dump::use_show_create_user;
+
 void Mysqldump_tool_chain_maker_options::parallel_schemas_callback(char*)
 {
   std::vector<std::string> schemas;
@@ -161,18 +170,20 @@ void Mysqldump_tool_chain_maker_options::process_positional_options(
       information. ex: mysql.user, mysql.db, mysql.tables_priv,
       mysql.columns_priv, mysql.procs_priv, mysql.proxies_priv
     */
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "user"));
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "db"));
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "tables_priv"));
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "columns_priv"));
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "procs_priv"));
-    m_object_filter.m_tables_excluded.push_back(std::make_pair(
-      "mysql", "proxies_priv"));
+    if (use_show_create_user) {
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "user"));
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "db"));
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "tables_priv"));
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "columns_priv"));
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "procs_priv"));
+      m_object_filter.m_tables_excluded.push_back(std::make_pair(
+        "mysql", "proxies_priv"));
+    }
     /*
       Since we dump CREATE EVENT/FUNCTION/PROCEDURE statement skip this table.
     */
diff --git a/client/dump/mysqldump_tool_chain_maker_options.h b/client/dump/mysqldump_tool_chain_maker_options.h
index 42c73c180335..4d4d8cd52f1f 100644
--- a/client/dump/mysqldump_tool_chain_maker_options.h
+++ b/client/dump/mysqldump_tool_chain_maker_options.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -27,6 +34,8 @@ namespace Mysql{
 namespace Tools{
 namespace Dump{
 
+extern bool use_show_create_user;
+
 class Mysqldump_tool_chain_maker_options
   : public Mysql::Tools::Base::Options::Composite_options_provider
 {
diff --git a/client/dump/object_filter.cc b/client/dump/object_filter.cc
index f89e0dd3a63d..91d4dc7e2742 100644
--- a/client/dump/object_filter.cc
+++ b/client/dump/object_filter.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/object_filter.h b/client/dump/object_filter.h
index 1c1df0338c48..f274b21a6893 100644
--- a/client/dump/object_filter.h
+++ b/client/dump/object_filter.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/object_queue.cc b/client/dump/object_queue.cc
index 6787c0ce79fc..ae6e59c5987d 100644
--- a/client/dump/object_queue.cc
+++ b/client/dump/object_queue.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -150,7 +157,25 @@ void Object_queue::read_object(Item_processing_data* item_to_process)
 
 void Object_queue::stop_queue()
 {
-  m_is_queue_running= false;
+  /*
+    In case of error we stop all the running queues. Make sure the
+    cleanup of the items is done properly.
+  */
+  if (m_is_queue_running) {
+    Item_processing_data *item_to_process= NULL;
+    do
+    {
+      {
+        my_boost::mutex::scoped_lock lock(m_queue_mutex);
+        if (m_items_ready_for_processing.size() == 0)
+          break;
+        item_to_process = m_items_ready_for_processing.front();
+        m_items_ready_for_processing.pop();
+      }
+      this->object_processing_ends(item_to_process);
+    } while(item_to_process != NULL);
+    m_is_queue_running = false;
+  }
 }
 
 Object_queue::~Object_queue()
diff --git a/client/dump/object_queue.h b/client/dump/object_queue.h
index e1d59c1e07e6..d871226fdef4 100644
--- a/client/dump/object_queue.h
+++ b/client/dump/object_queue.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/pattern_matcher.cc b/client/dump/pattern_matcher.cc
index 0c46840b9199..a5bac2d5bec3 100644
--- a/client/dump/pattern_matcher.cc
+++ b/client/dump/pattern_matcher.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/pattern_matcher.h b/client/dump/pattern_matcher.h
index 6769c1ede739..c3f8263deb35 100644
--- a/client/dump/pattern_matcher.h
+++ b/client/dump/pattern_matcher.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/privilege.cc b/client/dump/privilege.cc
index 143ab7a9fd46..29a7cd1a8794 100644
--- a/client/dump/privilege.cc
+++ b/client/dump/privilege.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/privilege.h b/client/dump/privilege.h
index a0fcd7ab5065..0fc37fcec588 100644
--- a/client/dump/privilege.h
+++ b/client/dump/privilege.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/program.cc b/client/dump/program.cc
index e348ee5b7ddc..75f618dccb71 100644
--- a/client/dump/program.cc
+++ b/client/dump/program.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -150,7 +157,7 @@ int Program::execute(std::vector<std::string> positional_options)
       new Single_transaction_connection_provider(this, num_connections, message_handler)
       : new Thread_specific_connection_provider(this);
   }
-  catch (std::exception e)
+  catch (const std::exception &e)
   {
     this->error(Mysql::Tools::Base::Message_data(
       0, "Error during creating connection.",
@@ -159,16 +166,18 @@ int Program::execute(std::vector<std::string> positional_options)
 
   Mysql::Tools::Base::Mysql_query_runner* runner= connection_provider
          ->get_runner(message_handler);
-  if (mysql_get_server_version(runner->get_low_level_connection()) < 50708)
+  ulong server_version =
+    mysql_get_server_version(runner->get_low_level_connection());
+  if (server_version < 50646)
   {
     std::cerr << "Server version is not compatible. Server version should "
-                 "be 5.7.8 or above.";
+                 "be 5.6.46 or above.";
     delete runner;
     delete message_handler;
     delete connection_provider;
     return 0;
   }
-
+  use_show_create_user = (server_version > 50705);
   Simple_id_generator* id_generator= new Simple_id_generator();
 
   boost::chrono::high_resolution_clock::time_point start_time=
@@ -183,7 +192,7 @@ int Program::execute(std::vector<std::string> positional_options)
   }
   I_crawler* crawler= new Mysql_crawler(
     connection_provider, message_handler, id_generator,
-    m_mysql_chain_element_options, this);
+    m_mysql_chain_element_options, m_mysqldump_tool_chain_maker_options, this);
   m_mysqldump_tool_chain_maker_options->process_positional_options(
     positional_options);
   check_mutually_exclusive_options();
@@ -266,7 +275,13 @@ Program::Program()
 const char *load_default_groups[]=
 {
   "client", /* Read settings how to connect to server. */
-  "mysql_dump", /* Read special settings for mysql_dump. */
+  /*
+    Read special settings for mysql_dump.
+    This section will be deprecated.
+  */
+  "mysql_dump",
+  /* Read config options from mysqlpump section. */
+  "mysqlpump",
   0
 };
 
diff --git a/client/dump/program.h b/client/dump/program.h
index fc9f1a171568..525a341adde0 100644
--- a/client/dump/program.h
+++ b/client/dump/program.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/row.cc b/client/dump/row.cc
index b83b8792eb07..54186848f952 100644
--- a/client/dump/row.cc
+++ b/client/dump/row.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/row.h b/client/dump/row.h
index 5cc78ba99141..e55443f41547 100644
--- a/client/dump/row.h
+++ b/client/dump/row.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/row_group_dump_task.cc b/client/dump/row_group_dump_task.cc
index 09dacfd5696d..a63da54aa089 100644
--- a/client/dump/row_group_dump_task.cc
+++ b/client/dump/row_group_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/row_group_dump_task.h b/client/dump/row_group_dump_task.h
index 3f3a52f3d461..9dc4ea32a5f2 100644
--- a/client/dump/row_group_dump_task.h
+++ b/client/dump/row_group_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/simple_id_generator.cc b/client/dump/simple_id_generator.cc
index 6519f0f13297..22b083b8bed1 100644
--- a/client/dump/simple_id_generator.cc
+++ b/client/dump/simple_id_generator.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/simple_id_generator.h b/client/dump/simple_id_generator.h
index 46afea4be23e..06164052ab83 100644
--- a/client/dump/simple_id_generator.h
+++ b/client/dump/simple_id_generator.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/single_transaction_connection_provider.cc b/client/dump/single_transaction_connection_provider.cc
index 7b6dcf686c1c..05e9a9c800d4 100644
--- a/client/dump/single_transaction_connection_provider.cc
+++ b/client/dump/single_transaction_connection_provider.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/single_transaction_connection_provider.h b/client/dump/single_transaction_connection_provider.h
index 01612eb80046..1bece20aa975 100644
--- a/client/dump/single_transaction_connection_provider.h
+++ b/client/dump/single_transaction_connection_provider.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/sql_formatter.cc b/client/dump/sql_formatter.cc
index c13698bf261b..e04bf234ef67 100644
--- a/client/dump/sql_formatter.cc
+++ b/client/dump/sql_formatter.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -90,13 +97,12 @@ void Sql_formatter::format_row_group(Row_group_dump_task* row_group)
 
   CHARSET_INFO* charset_info= this->get_charset();
 
-  std::vector<bool> is_blob_to_hex;
+  std::vector<bool> is_blob;
   for (std::vector<Mysql_field>::const_iterator it=
     row_group->m_fields.begin(); it != row_group->m_fields.end(); ++it)
   {
-    is_blob_to_hex.push_back(
-      m_options->m_hex_blob
-      && it->get_character_set_nr() == my_charset_bin.number
+    is_blob.push_back(
+      it->get_character_set_nr() == my_charset_bin.number
       && (it->get_type() == MYSQL_TYPE_BIT
       || it->get_type() == MYSQL_TYPE_STRING
       || it->get_type() == MYSQL_TYPE_VAR_STRING
@@ -150,7 +156,7 @@ void Sql_formatter::format_row_group(Row_group_dump_task* row_group)
         else
           row_string.append(column_data, column_length);
       }
-      else if (is_blob_to_hex[column])
+      else if (m_options->m_hex_blob && is_blob[column])
       {
         row_string+= "0x";
         m_escaping_runner->append_hex_string(
@@ -158,6 +164,8 @@ void Sql_formatter::format_row_group(Row_group_dump_task* row_group)
       }
       else
       {
+        if (is_blob[column])
+          row_string += "_binary ";
         row_string+= '\"';
         m_escaping_runner->append_escape_string(
           &row_string, column_data, column_length);
@@ -171,6 +179,17 @@ void Sql_formatter::format_row_group(Row_group_dump_task* row_group)
   row_string+= ";\n";
 
   this->append_output(row_string);
+  /*
+    user account is dumped in the form of INSERT statements, thus meed to 
+    append FLUSH PRIVILEGES
+  */
+  if (!use_show_create_user) {
+    std::string schema = row_group->m_source_table->get_schema();
+    std::string name = row_group->m_source_table->get_name();
+    if ((schema == "mysql") && (name == "user")) {
+      this->append_output("/*! FLUSH PRIVILEGES */;\n");
+    }
+  }
 }
 
 void Sql_formatter::format_table_indexes(
diff --git a/client/dump/sql_formatter.h b/client/dump/sql_formatter.h
index 8bf3e033b331..b521a4c30c67 100644
--- a/client/dump/sql_formatter.h
+++ b/client/dump/sql_formatter.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/sql_formatter_options.cc b/client/dump/sql_formatter_options.cc
index 9ee7364e941d..f95bb485fb04 100644
--- a/client/dump/sql_formatter_options.cc
+++ b/client/dump/sql_formatter_options.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/sql_formatter_options.h b/client/dump/sql_formatter_options.h
index 6155e7ef9265..261abe00b009 100644
--- a/client/dump/sql_formatter_options.h
+++ b/client/dump/sql_formatter_options.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/standard_progress_watcher.cc b/client/dump/standard_progress_watcher.cc
index 061ee70032cf..87af03a7fc10 100644
--- a/client/dump/standard_progress_watcher.cc
+++ b/client/dump/standard_progress_watcher.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/standard_progress_watcher.h b/client/dump/standard_progress_watcher.h
index c31d8b0f4bed..afb5df889549 100644
--- a/client/dump/standard_progress_watcher.h
+++ b/client/dump/standard_progress_watcher.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/standard_writer.cc b/client/dump/standard_writer.cc
index 9c66dcc8773a..9f1551cf3363 100644
--- a/client/dump/standard_writer.cc
+++ b/client/dump/standard_writer.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/standard_writer.h b/client/dump/standard_writer.h
index 5c64e00210f0..71294bd09e71 100644
--- a/client/dump/standard_writer.h
+++ b/client/dump/standard_writer.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/stored_procedure.cc b/client/dump/stored_procedure.cc
index 763698c3790b..b6eaf94e403e 100644
--- a/client/dump/stored_procedure.cc
+++ b/client/dump/stored_procedure.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/stored_procedure.h b/client/dump/stored_procedure.h
index 584ec3064fc1..52f622e7578c 100644
--- a/client/dump/stored_procedure.h
+++ b/client/dump/stored_procedure.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table.cc b/client/dump/table.cc
index aa1d4da56a56..b8e80049ebf6 100644
--- a/client/dump/table.cc
+++ b/client/dump/table.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table.h b/client/dump/table.h
index b064193c6240..8c7d860738dc 100644
--- a/client/dump/table.h
+++ b/client/dump/table.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_deferred_indexes_dump_task.cc b/client/dump/table_deferred_indexes_dump_task.cc
index 912966771d8f..c7f4dc90d598 100644
--- a/client/dump/table_deferred_indexes_dump_task.cc
+++ b/client/dump/table_deferred_indexes_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_deferred_indexes_dump_task.h b/client/dump/table_deferred_indexes_dump_task.h
index 255d3c875640..61e3850d41a9 100644
--- a/client/dump/table_deferred_indexes_dump_task.h
+++ b/client/dump/table_deferred_indexes_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_definition_dump_task.cc b/client/dump/table_definition_dump_task.cc
index e33b616d161d..20a05cdf1b1c 100644
--- a/client/dump/table_definition_dump_task.cc
+++ b/client/dump/table_definition_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_definition_dump_task.h b/client/dump/table_definition_dump_task.h
index 9336995ac9c6..0d7bca2ebf96 100644
--- a/client/dump/table_definition_dump_task.h
+++ b/client/dump/table_definition_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_rows_dump_task.cc b/client/dump/table_rows_dump_task.cc
index e33a8eced473..520a5a6ec5b9 100644
--- a/client/dump/table_rows_dump_task.cc
+++ b/client/dump/table_rows_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/table_rows_dump_task.h b/client/dump/table_rows_dump_task.h
index ce776538ae35..e05430a2fc45 100644
--- a/client/dump/table_rows_dump_task.h
+++ b/client/dump/table_rows_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/tables_definition_ready_dump_task.cc b/client/dump/tables_definition_ready_dump_task.cc
index 385f411a662f..12ef51337971 100644
--- a/client/dump/tables_definition_ready_dump_task.cc
+++ b/client/dump/tables_definition_ready_dump_task.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/tables_definition_ready_dump_task.h b/client/dump/tables_definition_ready_dump_task.h
index ff7e958e1c5f..11ab2a59722d 100644
--- a/client/dump/tables_definition_ready_dump_task.h
+++ b/client/dump/tables_definition_ready_dump_task.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/this_thread.h b/client/dump/this_thread.h
index 76263e3b034c..75011c78ada6 100644
--- a/client/dump/this_thread.h
+++ b/client/dump/this_thread.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread.cc b/client/dump/thread.cc
index e327ec17242f..eb25c97a7e48 100644
--- a/client/dump/thread.cc
+++ b/client/dump/thread.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread.h b/client/dump/thread.h
index 7104384db5ae..9ff1b693899d 100644
--- a/client/dump/thread.h
+++ b/client/dump/thread.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread_group.cc b/client/dump/thread_group.cc
index 3c91424304d3..69dd9ed3c102 100644
--- a/client/dump/thread_group.cc
+++ b/client/dump/thread_group.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread_group.h b/client/dump/thread_group.h
index 545395c05ad2..55b830200b08 100644
--- a/client/dump/thread_group.h
+++ b/client/dump/thread_group.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread_specific_connection_provider.cc b/client/dump/thread_specific_connection_provider.cc
index b3c85c4a7c1f..297a72a27c8e 100644
--- a/client/dump/thread_specific_connection_provider.cc
+++ b/client/dump/thread_specific_connection_provider.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread_specific_connection_provider.h b/client/dump/thread_specific_connection_provider.h
index bd670c3a439d..0127ee58da68 100644
--- a/client/dump/thread_specific_connection_provider.h
+++ b/client/dump/thread_specific_connection_provider.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/thread_specific_ptr.h b/client/dump/thread_specific_ptr.h
index 51bb0d6e00a9..401da0f5845e 100644
--- a/client/dump/thread_specific_ptr.h
+++ b/client/dump/thread_specific_ptr.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/trigger.cc b/client/dump/trigger.cc
index 158c9a185ad2..f70a4d5d7098 100644
--- a/client/dump/trigger.cc
+++ b/client/dump/trigger.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/trigger.h b/client/dump/trigger.h
index e1d8a070cb68..d14bb385c370 100644
--- a/client/dump/trigger.h
+++ b/client/dump/trigger.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/view.cc b/client/dump/view.cc
index 8fb0ddd5dcdb..082ba44bd178 100644
--- a/client/dump/view.cc
+++ b/client/dump/view.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/dump/view.h b/client/dump/view.h
index 549315f52312..ed92a0d45dcd 100644
--- a/client/dump/view.h
+++ b/client/dump/view.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/client/echo.c b/client/echo.c
index 7117da228385..c08ea76a279a 100644
--- a/client/echo.c
+++ b/client/echo.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/get_password.c b/client/get_password.c
index 65e57635e672..c06ade6f7341 100644
--- a/client/get_password.c
+++ b/client/get_password.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/infix_ostream_it.h b/client/infix_ostream_it.h
index 49a0eb971b6e..2e331714fe9e 100644
--- a/client/infix_ostream_it.h
+++ b/client/infix_ostream_it.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/logger.cc b/client/logger.cc
index 798fc5993ab7..73262c314cbb 100644
--- a/client/logger.cc
+++ b/client/logger.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/logger.h b/client/logger.h
index 4ea88d1fb84f..57c3ac9fa3e1 100644
--- a/client/logger.h
+++ b/client/logger.h
@@ -1,16 +1,23 @@
 #ifndef LOGGER_UTIL_INCLUDED
 #define LOGGER_UTIL_INCLUDED
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/my_readline.h b/client/my_readline.h
index 18d71ea0f356..426f4127072c 100644
--- a/client/my_readline.h
+++ b/client/my_readline.h
@@ -2,16 +2,23 @@
 #define CLIENT_MY_READLINE_INCLUDED
 
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/mysql.cc b/client/mysql.cc
index 55fed58861af..4b5ec70509b4 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -168,9 +175,6 @@ static STATUS status;
 static ulong select_limit,max_join_size,opt_connect_timeout=0;
 static char mysql_charsets_dir[FN_REFLEN+1];
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
-#if !defined(HAVE_YASSL)
-static char *opt_server_public_key= 0;
-#endif
 static const char *xmlmeta[] = {
   "&", "&amp;",
   "<", "&lt;",
@@ -198,6 +202,7 @@ static char *shared_memory_base_name=0;
 static uint opt_protocol=0;
 static const CHARSET_INFO *charset_info= &my_charset_latin1;
 
+#include "caching_sha2_passwordopt-vars.h"
 #include "sslopt-vars.h"
 
 const char *default_dbug_option="d:t:o,/tmp/mysql.trace";
@@ -217,7 +222,7 @@ const char *default_dbug_option="d:t:o,/tmp/mysql.trace";
 
   For using this feature in test case, we add the option in debug code.
 */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static my_bool opt_build_completion_hash = FALSE;
 #endif
 
@@ -285,7 +290,7 @@ static int com_nopager(String *str, char*), com_pager(String *str, char*),
 #endif
 
 static int read_and_execute(bool interactive);
-static void init_connection_options(MYSQL *mysql);
+static bool init_connection_options(MYSQL *mysql);
 static int sql_connect(char *host,char *database,char *user,char *password,
 		       uint silent);
 static const char *server_version_string(MYSQL *mysql);
@@ -1662,7 +1667,7 @@ static struct my_option my_long_options[] =
   {"bind-address", 0, "IP address to bind to.",
    (uchar**) &opt_bind_addr, (uchar**) &opt_bind_addr, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"binary-as-hex", 'b', "Print binary data as hex", &opt_binhex, &opt_binhex,
+  {"binary-as-hex", 0, "Print binary data as hex", &opt_binhex, &opt_binhex,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory for character set files.", &charsets_dir,
@@ -1677,7 +1682,7 @@ static struct my_option my_long_options[] =
   {"compress", 'C', "Use compression in server/client protocol.",
    &opt_compress, &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -1813,6 +1818,7 @@ static struct my_option my_long_options[] =
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR_ALLOC,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include "sslopt-longopts.h"
+#include "caching_sha2_passwordopt-longopts.h"
   {"table", 't', "Output in table format.", &output_tables,
    &output_tables, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"tee", OPT_TEE,
@@ -1880,18 +1886,12 @@ static struct my_option my_long_options[] =
    "piped to mysql or loaded using the 'source' command). This is necessary "
    "when processing output from mysqlbinlog that may contain blobs.",
    &opt_binary_mode, &opt_binary_mode, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-#if !defined(HAVE_YASSL)
-  {"server-public-key-path", OPT_SERVER_PUBLIC_KEY,
-   "File path to the server public RSA key in PEM format.",
-   &opt_server_public_key, &opt_server_public_key, 0,
-   GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"connect-expired-password", 0,
    "Notify the server that this client is prepared to handle expired "
    "password sandbox mode.",
    &opt_connect_expired_password, &opt_connect_expired_password, 0, GET_BOOL,
    NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"build-completion-hash", 0,
    "Build completion hash even when it is in batch mode. It is used for "
    "test purpose, so it is just built when DEBUG is on.",
@@ -2468,7 +2468,7 @@ static COMMANDS *find_command(char *name)
   char *end;
   DBUG_ENTER("find_command");
 
-  DBUG_ASSERT(name != NULL);
+  assert(name != NULL);
   DBUG_PRINT("enter", ("name: '%s'", name));
 
   while (my_isspace(charset_info, *name))
@@ -2823,14 +2823,12 @@ C_MODE_END
   if not.
 */
 
-#if defined(USE_NEW_EDITLINE_INTERFACE)
-static int fake_magic_space(int, int);
-extern "C" char *no_completion(const char*,int)
-#elif defined(USE_LIBEDIT_INTERFACE)
-static int fake_magic_space(const char *, int);
-extern "C" int no_completion(const char*,int)
+#if defined(EDITLINE_HAVE_COMPLETION_CHAR)
+char *no_completion(const char *, int)
+#elif defined(EDITLINE_HAVE_COMPLETION_INT)
+int no_completion(const char *, int)
 #else
-extern "C" char *no_completion()
+char *no_completion()
 #endif
 {
   return 0;					/* No filename completion */
@@ -2868,17 +2866,19 @@ static void initialize_readline (char *name)
   /* Allow conditional parsing of the ~/.inputrc file. */
   rl_readline_name = name;
 
+  /* Accept all locales. */
+  setlocale(LC_ALL,"");
+
   /* Tell the completer that we want a crack first. */
-#if defined(USE_NEW_EDITLINE_INTERFACE)
-  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
+#if defined(EDITLINE_HAVE_COMPLETION_CHAR)
+  rl_attempted_completion_function= &new_mysql_completion;
+  rl_completion_entry_function= &no_completion;
 
-  rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1);
-#elif defined(USE_LIBEDIT_INTERFACE)
-  setlocale(LC_ALL,""); /* so as libedit use isprint */
-  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
+  rl_add_defun("magic-space", &fake_magic_space, -1);
+#elif defined(EDITLINE_HAVE_COMPLETION_INT)
+  rl_attempted_completion_function= &new_mysql_completion;
   rl_completion_entry_function= &no_completion;
-  rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+  rl_add_defun("magic-space", &fake_magic_space, -1);
 #else
   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
   rl_completion_entry_function= &no_completion;
@@ -2900,7 +2900,7 @@ static char **new_mysql_completion(const char *text,
 #if defined(USE_NEW_EDITLINE_INTERFACE)
     return rl_completion_matches(text, new_command_generator);
 #else
-    return completion_matches((char *)text, (CPFunction *)new_command_generator);
+    return completion_matches(const_cast<char*>(text), new_command_generator);
 #endif
   else
     return (char**) 0;
@@ -2999,7 +2999,7 @@ static void build_completion_hash(bool rehash, bool write_info)
   int i,j,num_fields;
   DBUG_ENTER("build_completion_hash");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (!opt_build_completion_hash)
 #endif
   {
@@ -3737,8 +3737,7 @@ com_go(String *buffer,char *line MY_ATTRIBUTE((unused)))
   if (show_warnings == 1 && (warnings >= 1 || error))
     print_warnings();
 
-  if (!error && !status.batch && 
-      (mysql.server_status & SERVER_STATUS_DB_DROPPED))
+  if (!error && (mysql.server_status & SERVER_STATUS_DB_DROPPED))
     get_current_db();
 
   executing_query= 0;
@@ -4103,9 +4102,9 @@ static int get_result_width(MYSQL_RES *result)
   MYSQL_FIELD *field;
   MYSQL_FIELD_OFFSET offset;
   
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   offset= mysql_field_tell(result);
-  DBUG_ASSERT(offset == 0);
+  assert(offset == 0);
 #else
   offset= 0;
 #endif
@@ -5016,7 +5015,12 @@ sql_real_connect(char *host,char *database,char *user,char *password,
   }
 
   mysql_init(&mysql);
-  init_connection_options(&mysql);
+  if (init_connection_options(&mysql))
+  {
+    (void) put_error(&mysql);
+    (void) fflush(stdout);
+    return ignore_errors ? -1 : 1;		// Abort
+  }
 
 #ifdef _WIN32
   uint cnv_errors;
@@ -5109,7 +5113,7 @@ sql_real_connect(char *host,char *database,char *user,char *password,
 
 
 /* Initialize options for the given connection handle. */
-static void
+static bool
 init_connection_options(MYSQL *mysql)
 {
   my_bool handle_expired= (opt_connect_expired_password || !status.batch) ?
@@ -5152,7 +5156,7 @@ init_connection_options(MYSQL *mysql)
     mysql_options(mysql, MYSQL_INIT_COMMAND, init_command);
   }
 
-  mysql_set_character_set(mysql, default_charset);
+  if (mysql_set_character_set(mysql, default_charset)) return true;
 
   if (opt_plugin_dir && *opt_plugin_dir)
     mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir);
@@ -5160,10 +5164,8 @@ init_connection_options(MYSQL *mysql)
   if (opt_default_auth && *opt_default_auth)
     mysql_options(mysql, MYSQL_DEFAULT_AUTH, opt_default_auth);
 
-#if !defined(HAVE_YASSL)
-  if (opt_server_public_key && *opt_server_public_key)
-    mysql_options(mysql, MYSQL_SERVER_PUBLIC_KEY, opt_server_public_key);
-#endif
+  set_server_public_key(mysql);
+  set_get_server_public_key_option(mysql);
 
   if (using_opt_enable_cleartext_plugin)
     mysql_options(mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
@@ -5173,6 +5175,7 @@ init_connection_options(MYSQL *mysql)
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "mysql");
 
   mysql_options(mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, &handle_expired);
+  return false;
 }
 
 
diff --git a/client/mysql_config_editor.cc b/client/mysql_config_editor.cc
index d32d64a026e4..5f3c78857b4a 100644
--- a/client/mysql_config_editor.cc
+++ b/client/mysql_config_editor.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -112,7 +119,7 @@ struct my_command_data {
 /* mysql_config_editor utility options. */
 static struct my_option my_program_long_options[]=
 {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
   0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
diff --git a/client/mysql_install_db.cc b/client/mysql_install_db.cc
index 2dc608cc7e58..28e4eaab4799 100644
--- a/client/mysql_install_db.cc
+++ b/client/mysql_install_db.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -61,9 +68,6 @@ using namespace std;
 
 #define PROGRAM_NAME "mysql_install_db"
 #define MYSQLD_EXECUTABLE "mysqld"
-#if defined(HAVE_YASSL)
-#define MYSQL_CERT_SETUP_EXECUTABLE "mysql_ssl_rsa_setup"
-#endif /* HAVE_YASSL */
 #define MAX_MYSQLD_ARGUMENTS 10
 #define MAX_USER_NAME_LEN 32
 
@@ -81,10 +85,6 @@ char *opt_adminhost= 0;
 char default_authplugin[]= "mysql_native_password";
 char *opt_authplugin= 0;
 char *opt_mysqldfile= 0;
-#if defined (HAVE_YASSL)
-char *opt_mysql_cert_setup_file= 0;
-char default_mysql_cert_setup_file[]= MYSQL_CERT_SETUP_EXECUTABLE;
-#endif
 char *opt_randpwdfile= 0;
 char default_randpwfile[]= ".mysql_secret";
 char *opt_langpath= 0;
@@ -148,10 +148,6 @@ static struct my_option my_connection_options[]=
    &opt_ssl, 0, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"mysqld-file", 0, "Qualified path to the mysqld binary.", &opt_mysqldfile,
    0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#if defined(HAVE_YASSL)
-  {"ssl-setup-file", 0, "Qualified path to the mysql_ssl_setup binary", &opt_mysql_cert_setup_file,
-   0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"random-password-file", 0, "Specifies the qualified path to the "
      ".mysql_secret temporary password file.", &opt_randpwdfile,
    0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0,
@@ -624,70 +620,6 @@ bool assert_mysqld_exists(const string &opt_mysqldfile,
   return true;
 }
 
-#if defined(HAVE_YASSL)
-/**
- Attempts to locate the mysql_ssl_rsa_setup file.
- If opt_mysql_cert_setup_file is specified then the this assumed to be a
- correct qualified path to the mysql_ssl_rsa_setup executable.
- If opt_basedir is specified then opt_basedir+"/bin" is assumed to be a
- candidate path for the mysql_ssl_rsa_setup executable.
- If opt_srcdir is set then opt_srcdir+"/bin" is assumed to be a
- candidate path for the mysql_ssl_rsa_setup executable.
- If opt_builddir is set then opt_builddir+"/client" is assumed to be a
- candidate path for the mysql_system_tables executable.
-
- If the executable isn't found in any of these locations,
- attempt to search the local directory and "bin" subdirectory.
- Finally check "/usr/bin","/usr/sbin", "/usr/local/bin","/usr/local/sbin",
- "/opt/mysql/bin","/opt/mysql/sbin"
-
-*/
-bool assert_cert_generator_exists(const string &opt_mysql_cert_setup_file,
-                                  const string &opt_basedir,
-                                  const string &opt_builddir,
-                                  const string &opt_srcdir,
-                                  Path *qpath)
-{
-  vector<Path > spaths;
-  if (opt_mysql_cert_setup_file.length() > 0)
-  {
-    /* Use explicit option to file mysql_ssl_rsa_setup */
-    if (!locate_file(opt_mysql_cert_setup_file, 0, qpath))
-    {
-      error << "No such file: " << opt_mysql_cert_setup_file << endl;
-      return false;
-    }
-  }
-  else
-  {
-    if (opt_basedir.length() > 0)
-    {
-      spaths.push_back(Path(opt_basedir).
-        append("bin"));
-    }
-    if (opt_builddir.length() > 0)
-    {
-      spaths.push_back(Path(opt_builddir).
-        append("client"));
-    }
-
-    add_standard_search_paths(&spaths);
-
-    if (!locate_file(MYSQL_CERT_SETUP_EXECUTABLE, &spaths, qpath))
-    {
-      error << "Can't locate the server executable (mysql_ssl_rsa_setup)."
-            << endl;
-      info << "The following paths were searched: ";
-      copy(spaths.begin(), spaths.end(),
-           infix_ostream_iterator<Path >(info, ", "));
-      info << endl;
-      return false;
-    }
-  }
-  return true;
-}
-#endif /* HAVE_YASSL */
-
 
 bool assert_valid_language_directory(const string &opt_langpath,
                                      const string &opt_basedir,
@@ -803,19 +735,6 @@ void create_ssl_policy(string *ssl_type, string *ssl_cipher,
   *x509_subject= "";
 }
 
-#if defined(HAVE_YASSL)
-
-class SSL_generator_writer
-{
-public:
-  bool operator()(int fh MY_ATTRIBUTE((unused)))
-  {
-    return true;
-  }
-};
-
-#endif /* HAVE_YASSL */
-
 #define  READ_BUFFER_SIZE 2048
 #define TIMEOUT_IN_SEC 30
 
@@ -1563,20 +1482,6 @@ int main(int argc,char *argv[])
     return 1;
   }
 
-#if defined(HAVE_YASSL)
-  Path mysql_cert_setup;
-  if( !opt_insecure &&
-      !assert_cert_generator_exists(create_string(opt_mysql_cert_setup_file),
-                                    basedir,
-                                    builddir,
-                                    srcdir,
-                                    &mysql_cert_setup))
-  {
-    /* Subroutine reported error */
-    return 1;
-  }
-#endif /* HAVE_YASSL */
-
   if (opt_def_extra_file)
   {
     Path def_extra_file;
@@ -1706,23 +1611,6 @@ int main(int argc,char *argv[])
   command_line.push_back(string("--basedir=")
     .append(basedir));
 
-#if defined(HAVE_YASSL)
-  vector<string> cert_setup_command_line;
-  if (!opt_insecure)
-  {
-    if (opt_no_defaults == TRUE && opt_defaults_file == NULL &&
-        opt_def_extra_file == NULL)
-      cert_setup_command_line.push_back(string("--no-defaults"));
-    cert_setup_command_line.push_back(string("--datadir=")
-      .append(data_directory.to_str()));
-    cert_setup_command_line.push_back(string("--suffix=")
-      .append(MYSQL_SERVER_VERSION));
-  }
-#endif /* HAVE_YASSL */
-
-  // DEBUG
-  //mysqld_exec.append("\"").insert(0, "gnome-terminal -e \"gdb --args ");
-
   string ssl_type;
   string ssl_cipher;
   string x509_issuer;
@@ -1787,35 +1675,5 @@ int main(int argc,char *argv[])
          << endl;
   }
 
-#if defined(HAVE_YASSL)
-  if (!opt_insecure)
-  {
-    string ssl_output;
-    info << "Generating SSL Certificates" << endl;
-    success= process_execute(mysql_cert_setup.to_str(),
-                             cert_setup_command_line.begin(),
-                             cert_setup_command_line.end(),
-                             Process_reader(&ssl_output),
-                             SSL_generator_writer());
-    if (!success)
-    {
-      warning << "failed to execute " << mysql_cert_setup.to_str() << " ";
-      copy(cert_setup_command_line.begin(), cert_setup_command_line.end(),
-           infix_ostream_iterator<Path>(error, " "));
-      warning << endl;
-      warning << "SSL functionality may not work";
-      warning << endl;
-    }
-    else if ((ssl_output.size() > 0))
-    {
-      info << "SSL certificate generation :"
-           << endl
-           << ssl_output
-           << endl;
-    }
-  }
-
-#endif /* HAVE_YASSL */
-
   return 0;
 }
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c
index f38603884ff1..3ffb48036d1a 100644
--- a/client/mysql_plugin.c
+++ b/client/mysql_plugin.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -420,7 +427,7 @@ static int get_default_values()
 static void usage(void)
 {
   PRINT_VERSION;
-  puts("Copyright (c) 2011, 2016, Oracle and/or its affiliates. "
+  puts("Copyright (c) 2011, 2023, Oracle and/or its affiliates. "
        "All rights reserved.\n");
   puts("Enable or disable plugins.");
   printf("\nUsage: %s [options] <plugin> ENABLE|DISABLE\n\nOptions:\n",
diff --git a/client/mysql_secure_installation.cc b/client/mysql_secure_installation.cc
index f265323f5aea..4c1b978bd553 100644
--- a/client/mysql_secure_installation.cc
+++ b/client/mysql_secure_installation.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -937,7 +944,7 @@ int main(int argc,char *argv[])
   if ((rc= my_handle_options(&argc, &argv, my_connection_options,
                              my_arguments_get_one_option, NULL, TRUE)))
   {
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   init_connection_options(&mysql);
diff --git a/client/mysql_ssl_rsa_setup.cc b/client/mysql_ssl_rsa_setup.cc
index b75b5c4c1869..00393c114d27 100644
--- a/client/mysql_ssl_rsa_setup.cc
+++ b/client/mysql_ssl_rsa_setup.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 9a44f5bafe54..cb930874acb1 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -70,6 +77,7 @@ static my_bool ex_status_printed = 0; /* First output is not relative. */
 static uint ex_var_count, max_var_length, max_val_length;
 
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 
 static void print_version(void);
 static void usage(void);
@@ -134,7 +142,7 @@ static struct my_option my_long_options[] =
    "Number of iterations to make. This works with -i (--sleep) only.",
    &nr_iterations, &nr_iterations, 0, GET_UINT,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -210,6 +218,7 @@ static struct my_option my_long_options[] =
    &interval, &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,
    0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"user", 'u', "User for login if not current user.", &user,
    &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Write more information.", &opt_verbose,
@@ -416,6 +425,9 @@ int main(int argc,char *argv[])
   mysql_options(&mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
                 &can_handle_passwords);
 
+  set_server_public_key(&mysql);
+  set_get_server_public_key_option(&mysql);
+
   if (sql_connect(&mysql, option_wait))
   {
     /*
@@ -898,7 +910,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	return -1;
       }
 
-      DBUG_ASSERT(mysql_num_rows(res) < MAX_MYSQL_VAR);
+      assert(mysql_num_rows(res) < MAX_MYSQL_VAR);
 
       if (!opt_vertical)
 	print_header(res);
@@ -1092,12 +1104,14 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 
       /* Warn about password being set in non ssl connection */
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-      uint ssl_mode;
-      if (!mysql_get_option(mysql, MYSQL_OPT_SSL_MODE, &ssl_mode) &&
-          ssl_mode <= SSL_MODE_PREFERRED)
       {
-        fprintf(stderr, "Warning: Since password will be sent to server in "
-                "plain text, use ssl connection to ensure password safety.\n");
+        uint ssl_mode= 0;
+        if (!mysql_get_option(mysql, MYSQL_OPT_SSL_MODE, &ssl_mode) &&
+            ssl_mode <= SSL_MODE_PREFERRED)
+        {
+          fprintf(stderr, "Warning: Since password will be sent to server in "
+                  "plain text, use ssl connection to ensure password safety.\n");
+        }
       }
 #endif
       memset(buff, 0, sizeof(buff));
@@ -1552,7 +1566,7 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
 {
   MYSQL_RES* result;
 
-  if (mysql_query(mysql, "SHOW VARIABLES LIKE 'pid_file'"))
+  if (mysql_query(mysql, "SELECT @@datadir, @@pid_file"))
   {
     my_printf_error(mysql_errno(mysql),
                     "The query to get the server's pid file failed,"
@@ -1563,8 +1577,13 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
   if (result)
   {
     MYSQL_ROW row=mysql_fetch_row(result);
-    if (row)
-      my_stpcpy(pidfile, row[1]);
+    if (row) {
+      char datadir[FN_REFLEN];
+      char pidfile_option[FN_REFLEN];
+      my_stpcpy(datadir, row[0]);
+      my_stpcpy(pidfile_option, row[1]);
+      (void) my_load_path(pidfile, pidfile_option, datadir);
+    }
     mysql_free_result(result);
     return row == 0;				/* Error if row = 0 */
   }
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index b8184e169f77..355e35674ebd 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,6 +41,7 @@
 #include "my_default.h"
 #include <my_time.h>
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
 #include "query_options.h"
 #include <signal.h>
@@ -103,7 +111,7 @@ rewrite_db(char **buf, ulong *buf_size,
   if (new_db_it == map_mysqlbinlog_rewrite_db.end())
     return false;
   const char *new_db=new_db_it->second.c_str();
-  DBUG_ASSERT(new_db && new_db != old_db);
+  assert(new_db && new_db != old_db);
 
   size_t new_db_len= strlen(new_db);
 
@@ -124,7 +132,7 @@ rewrite_db(char **buf, ulong *buf_size,
             *buf_size - (offset_db + old_db_len));
 
   // Write new_db and new_db_len.
-  strncpy((*buf) + offset_db, new_db, new_db_len);
+  memcpy((*buf) + offset_db, new_db, new_db_len);
   (*buf)[offset_len]= (char) new_db_len;
 
   // Update event length in header.
@@ -308,7 +316,7 @@ uint test_flags = 0;
 static uint opt_protocol= 0;
 static FILE *result_file;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static const char* default_dbug_option = "d:t:o,/tmp/mysqlbinlog.trace";
 #endif
 static const char *load_default_groups[]= { "mysqlbinlog","client",0 };
@@ -1167,11 +1175,14 @@ void end_binlog(PRINT_EVENT_INFO *print_event_info)
   Print the given event, and either delete it or delegate the deletion
   to someone else.
 
-  The deletion may be delegated in two cases: (1) the event is a
-  Format_description_log_event, and is saved in
-  glob_description_event; (2) the event is a Create_file_log_event,
-  and is saved in load_processor.
-
+  The deletion may be delegated in these cases:
+  (1) the event is a Format_description_log_event, and is saved in
+      glob_description_event.
+  (2) the event is a Create_file_log_event, and is saved in load_processor.
+  (3) the event is an Intvar, Rand or User_var event, it will be kept until
+      the subsequent Query_log_event.
+  (4) the event is a Table_map_log_event, it will be kept until the subsequent
+      Rows_log_event.
   @param[in,out] print_event_info Parameters and context state
   determining how to print.
   @param[in] ev Log_event to process.
@@ -1751,7 +1762,7 @@ static struct my_option my_long_options[] =
   {"rewrite-db", OPT_REWRITE_DB, "Rewrite the row event to point so that "
    "it can be applied to a new database", &rewrite, &rewrite, 0,
    GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
    {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
    {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -1867,6 +1878,7 @@ static struct my_option my_long_options[] =
    &sock, &sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
    0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"start-datetime", OPT_START_DATETIME,
    "Start reading the binlog at first event having a datetime equal or "
    "posterior to the argument; the argument must be a date and time "
@@ -2110,7 +2122,7 @@ get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
 {
   bool tty_password=0;
   switch (optid) {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   case '#':
     DBUG_PUSH(argument ? argument : default_dbug_option);
     break;
@@ -2281,6 +2293,9 @@ static Exit_status safe_connect()
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
                 "_client_role", "binary_log_listener");
 
+  set_server_public_key(mysql);
+  set_get_server_public_key_option(mysql);
+
   if (!mysql_real_connect(mysql, host, user, pass, 0, port, sock, 0))
   {
     error("Failed on connect: %s", mysql_error(mysql));
@@ -2321,7 +2336,7 @@ static Exit_status dump_single_log(PRINT_EVENT_INFO *print_event_info,
       rc= dump_remote_log_entries(print_event_info, logname);
     break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     break;
   }
   DBUG_RETURN(rc);
@@ -2590,7 +2605,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
     ptr_buffer+= BINLOG_NAME_INFO_SIZE;
 
     command_size= ptr_buffer - command_buffer;
-    DBUG_ASSERT(command_size == (allocation_size - 1));
+    assert(command_size == (allocation_size - 1));
   }
   else
   {
@@ -2632,7 +2647,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
     global_sid_lock->unlock();
 
     command_size= ptr_buffer - command_buffer;
-    DBUG_ASSERT(command_size == (allocation_size - 1));
+    assert(command_size == (allocation_size - 1));
   }
 
   if (simple_command(mysql, command, command_buffer, command_size, 1))
@@ -2819,7 +2834,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
       
       if (type == binary_log::LOAD_EVENT)
       {
-        DBUG_ASSERT(raw_mode);
+        assert(raw_mode);
         warning("Attempting to load a remote pre-4.0 binary log that contains "
                 "LOAD DATA INFILE statements. The file will not be copied from "
                 "the remote server. ");
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 3d8aeaca3637..e96df78c5f6c 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -113,7 +120,7 @@ static my_bool  verbose= 0, opt_no_create_info= 0, opt_no_data= 0,
                 opt_include_master_host_port= 0,
                 opt_events= 0, opt_comments_used= 0,
                 opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0,
-                opt_secure_auth= TRUE;
+                opt_skip_mysql_schema=0, opt_secure_auth= TRUE;
 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0;
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
 static MYSQL mysql_connection,*mysql=0;
@@ -143,6 +150,7 @@ static char * opt_mysql_unix_port=0;
 static char *opt_bind_addr = NULL;
 static int   first_error=0;
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 FILE *md_result_file= 0;
 FILE *stderror_file=0;
 
@@ -211,6 +219,12 @@ TYPELIB compatible_mode_typelib= {array_elements(compatible_mode_names) - 1,
 
 HASH ignore_table;
 
+typedef struct st_my_gtid_array
+{
+    my_ulonglong num_rows;
+    char** gtid_array;
+}MY_GTID_ARRAY;
+
 static struct my_option my_long_options[] =
 {
   {"all-databases", 'A',
@@ -282,7 +296,7 @@ static struct my_option my_long_options[] =
    "Dump several databases. Note the difference in usage; in this case no tables are given. All name arguments are regarded as database names. 'USE db_name;' will be included in the output.",
    &opt_databases, &opt_databases, 0, GET_BOOL, NO_ARG, 0, 0,
    0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -516,6 +530,9 @@ static struct my_option my_long_options[] =
   {"dump-date", OPT_DUMP_DATE, "Put a dump date to the end of the output.",
    &opt_dump_date, &opt_dump_date, 0,
    GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+  {"skip_mysql_schema", OPT_SKIP_MYSQL_SCHEMA, "Skip adding DROP DATABASE for mysql schema.",
+   &opt_skip_mysql_schema, &opt_skip_mysql_schema, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
+   0},
   {"skip-opt", OPT_SKIP_OPTIMIZATION,
    "Disable --opt. Disables --add-drop-table, --add-locks, --create-options, --quick, --extended-insert, --lock-tables, --set-charset, and --disable-keys.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -526,6 +543,7 @@ static struct my_option my_long_options[] =
     " uses old (pre-4.1.1) protocol. Deprecated. Always TRUE",
     &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"tab",'T',
    "Create tab-separated textfile for each table to given path. (Create .sql "
    "and .txt files.) NOTE: This only works if mysqldump is run on the same "
@@ -575,9 +593,9 @@ static void print_value(FILE *file, MYSQL_RES  *result, MYSQL_ROW row,
                         int string_value);
 static int dump_selected_tables(char *db, char **table_names, int tables);
 static int dump_all_tables_in_db(char *db);
-static int init_dumping_views(char *);
-static int init_dumping_tables(char *);
-static int init_dumping(char *, int init_func(char*));
+static int init_dumping_views(char *, my_bool);
+static int init_dumping_tables(char *, my_bool);
+static int init_dumping(char *, int init_func(char*, my_bool));
 static int dump_databases(char **);
 static int dump_all_databases();
 static char *quote_name(const char *name, char *buff, my_bool force);
@@ -585,14 +603,15 @@ char check_if_ignore_table(const char *table_name, char *table_type);
 static char *primary_key_fields(const char *table_name);
 static my_bool get_view_structure(char *table, char* db);
 static my_bool dump_all_views_in_db(char *database);
+static my_bool get_gtid_mode(MYSQL* mysql);
 static int dump_all_tablespaces();
 static int dump_tablespaces_for_tables(char *db, char **table_names, int tables);
 static int dump_tablespaces_for_databases(char** databases);
 static int dump_tablespaces(char* ts_where);
 static void print_comment(FILE *sql_file, my_bool is_error, const char *format,
                           ...);
-static const char* fix_identifier_with_newline(char*);
-
+static char const* fix_identifier_with_newline(char const* object_name,
+                                               my_bool* freemem);
 
 /*
   Print the supplied message if in verbose mode
@@ -700,13 +719,20 @@ static void write_header(FILE *sql_file, char *db_name)
   }
   else if (!opt_compact)
   {
+    my_bool freemem= FALSE;
+    char const* text= fix_identifier_with_newline(db_name, &freemem);
+
     print_comment(sql_file, 0,
                   "-- MySQL dump %s  Distrib %s, for %s (%s)\n--\n",
                   DUMP_VERSION, MYSQL_SERVER_VERSION, SYSTEM_TYPE,
                   MACHINE_TYPE);
     print_comment(sql_file, 0, "-- Host: %s    Database: %s\n",
                   current_host ? current_host : "localhost",
-                  db_name ? fix_identifier_with_newline(db_name) : "");
+                  text);
+
+    if (freemem)
+      my_free((void*)text);
+
     print_comment(sql_file, 0,
                   "-- ------------------------------------------------------\n"
                  );
@@ -919,14 +945,14 @@ get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
         fprintf(stderr, "Invalid mode to --compatible: %s\n", buff);
         exit(1);
       }
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
       {
         size_t size_for_sql_mode= 0;
         const char **ptr;
         for (ptr= compatible_mode_names; *ptr; ptr++)
           size_for_sql_mode+= strlen(*ptr);
         size_for_sql_mode+= sizeof(compatible_mode_names)-1;
-        DBUG_ASSERT(sizeof(compatible_mode_normal_str)>=size_for_sql_mode);
+        assert(sizeof(compatible_mode_normal_str)>=size_for_sql_mode);
       }
 #endif
       mode= opt_compatible_mode;
@@ -1008,9 +1034,6 @@ static int get_options(int *argc, char ***argv)
   if (my_hash_insert(&ignore_table,
                      (uchar*) my_strdup(PSI_NOT_INSTRUMENTED,
                                         "mysql.apply_status", MYF(MY_WME))) ||
-      my_hash_insert(&ignore_table,
-                     (uchar*) my_strdup(PSI_NOT_INSTRUMENTED,
-                                        "mysql.gtid_executed", MYF(MY_WME))) ||
       my_hash_insert(&ignore_table,
                      (uchar*) my_strdup(PSI_NOT_INSTRUMENTED,
                                         "mysql.schema", MYF(MY_WME))) ||
@@ -1366,6 +1389,37 @@ static void restore_cs_variables(FILE *sql_file,
           (const char *) delimiter);
 }
 
+/*
+ This function will remove specific sql mode.
+
+  @param[in]   sql_mode      Original sql mode from where input mode needs to
+                             be removed.
+  @param[in]   replace_mode  sql mode which needs to be removed from original
+                             sql mode.
+  @param[in]   replace_len   length of sql mode which needs to be removed.
+
+  @retval  1 replace_mode is not present
+           0 replace_mode is removed successfully
+*/
+static int remove_sql_mode(char* sql_mode, const char* replace_mode,
+  size_t replace_len) {
+  char *start = strstr(sql_mode, replace_mode);
+  /* nothing to replace */
+  if (!start)
+    return 1;
+  /* sql mode to replace is the only sql mode present or the last one */
+  if (strlen(start) == replace_len) {
+    if (start == sql_mode)
+      *start = 0;
+    else
+      start[-1] = 0;
+  }
+  else {
+    const char *next = start + replace_len + 1;
+    memmove(start, next, strlen(next) + 1);
+  }
+  return 0;
+}
 
 static void switch_sql_mode(FILE *sql_file,
                             const char *delimiter,
@@ -1482,6 +1536,7 @@ static char *cover_definer_clause(const char *stmt_str,
 
   char *query_str= NULL;
   char *query_ptr;
+  LEX_CSTRING comment= { C_STRING_WITH_LEN("*/ /*!") };
 
   if (!definer_begin)
     return NULL;
@@ -1499,10 +1554,10 @@ static char *cover_definer_clause(const char *stmt_str,
   query_str= alloc_query_str(stmt_length + 23);
 
   query_ptr= my_stpncpy(query_str, stmt_str, definer_begin - stmt_str);
-  query_ptr= my_stpncpy(query_ptr, C_STRING_WITH_LEN("*/ /*!"));
+  query_ptr= my_stpncpy(query_ptr, comment.str, comment.length + 1);
   query_ptr= my_stpncpy(query_ptr, definer_version_str, definer_version_length);
   query_ptr= my_stpncpy(query_ptr, definer_begin, definer_end - definer_begin);
-  query_ptr= my_stpncpy(query_ptr, C_STRING_WITH_LEN("*/ /*!"));
+  query_ptr= my_stpncpy(query_ptr, comment.str, comment.length + 1);
   query_ptr= my_stpncpy(query_ptr, stmt_version_str, stmt_version_length);
   query_ptr= strxmov(query_ptr, definer_end, NullS);
 
@@ -1676,6 +1731,10 @@ static int connect_to_db(char *host, char *user,char *passwd)
   mysql_options(&mysql_connection, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql_connection, MYSQL_OPT_CONNECT_ATTR_ADD,
                  "program_name", "mysqldump");
+
+  set_server_public_key(&mysql_connection);
+  set_get_server_public_key_option(&mysql_connection);
+
   if (!(mysql= mysql_real_connect(&mysql_connection,host,user,passwd,
                                   NULL,opt_mysql_port,opt_mysql_unix_port,
                                   0)))
@@ -1927,7 +1986,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg,
   while (attribute_name != NullS)
   {
     attribute_value= va_arg(arg_list, char *);
-    DBUG_ASSERT(attribute_value != NullS);
+    assert(attribute_value != NullS);
 
     fputc(' ', xml_file);
     fputs(attribute_name, xml_file);    
@@ -2155,31 +2214,85 @@ static void print_comment(FILE *sql_file, my_bool is_error, const char *format,
   print_xml_comment(sql_file, strlen(comment_buff), comment_buff);
 }
 
-/*
- This function accepts object names and prefixes -- wherever \n
- character is found.
+/**
+  @brief Accepts object names and prefixes them with "-- " wherever
+         end-of-line character ('\n') is found.
 
- @param[in]     object_name
+  @param[in]  object_name   object name list (concatenated string)
+  @param[out] freemem       should buffer be released after usage
 
- @return
-    @retval fixed object name.
+  @return
+    @retval                 pointer to a string with prefixed objects
 */
-
-static const char* fix_identifier_with_newline(char* object_name)
+static char const* fix_identifier_with_newline(char const* object_name, my_bool* freemem)
 {
-  static char buff[COMMENT_LENGTH]= {0};
-  char *ptr= buff;
-  memset(buff, 0, 255);
-  while(*object_name)
+  const size_t PREFIX_LENGTH= 3; // strlen ("-- ")
+
+  // static buffer for replacement procedure
+  static char storage[NAME_LEN + 1];
+  static char* buffer= storage;
+  static size_t buffer_size= sizeof(storage) - 1;
+  size_t index= 0;
+  size_t required_size= 0;
+
+  // we presume memory allocation won't be needed
+  *freemem= FALSE;
+
+  // traverse and reformat objects
+  while (object_name && *object_name)
   {
-    *ptr++ = *object_name;
+    ++required_size;
     if (*object_name == '\n')
-      ptr= my_stpcpy(ptr, "-- ");
-    object_name++;
+      required_size+= PREFIX_LENGTH;
+
+    // do we need dynamic (re)allocation
+    if (required_size > buffer_size)
+    {
+      // new alloc size increased in COMMENT_LENGTH multiple
+      buffer_size= COMMENT_LENGTH * (1 + required_size/COMMENT_LENGTH);
+
+      // is our buffer already dynamically allocated
+      if (*freemem)
+      {
+        // just realloc
+        buffer= (char*)my_realloc(PSI_NOT_INSTRUMENTED, buffer, buffer_size + 1,
+                                  MYF(MY_WME));
+        if (!buffer)
+          exit(1);
+      }
+      else
+      {
+        // dynamic allocation + copy from static buffer
+        buffer= (char*)my_malloc(PSI_NOT_INSTRUMENTED, buffer_size + 1,
+                                 MYF(MY_WME));
+        if (!buffer)
+          exit(1);
+
+        strncpy(buffer, storage, index);
+        *freemem= TRUE;
+      }
+    }
+
+    // copy a character
+    buffer[index]= *object_name;
+    ++index;
+
+    // prefix new lines with double dash
+    if (*object_name == '\n')
+    {
+      strcpy(buffer + index, "-- ");
+      index += PREFIX_LENGTH;
+    }
+
+    ++object_name;
   }
-  return buff;
+
+  // don't forget null termination
+  buffer[index]= '\0';
+  return buffer;
 }
 
+
 /*
  create_delimiter
  Generate a new (null-terminated) string that does not exist in  query 
@@ -2239,6 +2352,8 @@ static uint dump_events_for_db(char *db)
 
   char       db_cl_name[MY_CS_NAME_SIZE];
   int        db_cl_altered= FALSE;
+  my_bool    freemem= FALSE;
+  char const *text= fix_identifier_with_newline(db, &freemem);
 
   DBUG_ENTER("dump_events_for_db");
   DBUG_PRINT("enter", ("db: '%s'", db));
@@ -2248,7 +2363,9 @@ static uint dump_events_for_db(char *db)
   /* nice comments */
   print_comment(sql_file, 0,
                 "\n--\n-- Dumping events for database '%s'\n--\n",
-                fix_identifier_with_newline(db));
+                text);
+  if (freemem)
+    my_free((void*)text);
 
   /*
     not using "mysql_query_with_error_report" because we may have not
@@ -2348,7 +2465,7 @@ static uint dump_events_for_db(char *db)
                       "The following dump may be incomplete.\n"
                     "--\n");
           }
-
+          remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
           switch_sql_mode(sql_file, delimiter, row[1]);
 
           switch_time_zone(sql_file, delimiter, row[2]);
@@ -2453,6 +2570,8 @@ static uint dump_routines_for_db(char *db)
 
   char       db_cl_name[MY_CS_NAME_SIZE];
   int        db_cl_altered= FALSE;
+  my_bool    freemem= FALSE;
+  char const *text= fix_identifier_with_newline(db, &freemem);
 
   DBUG_ENTER("dump_routines_for_db");
   DBUG_PRINT("enter", ("db: '%s'", db));
@@ -2462,7 +2581,10 @@ static uint dump_routines_for_db(char *db)
   /* nice comments */
   print_comment(sql_file, 0,
                 "\n--\n-- Dumping routines for database '%s'\n--\n",
-                fix_identifier_with_newline(db));
+                text);
+
+  if (freemem)
+    my_free((void*)text);
 
   /*
     not using "mysql_query_with_error_report" because we may have not
@@ -2517,11 +2639,17 @@ static uint dump_routines_for_db(char *db)
                              row[2] ? strlen(row[2]) : 0));
           if (row[2] == NULL)
           {
+            my_bool freemem= FALSE;
+            char const* text= fix_identifier_with_newline(current_user, &freemem);
+
             print_comment(sql_file, 1, "\n-- insufficient privileges to %s\n",
                           query_buff);
             print_comment(sql_file, 1,
                           "-- does %s have permissions on mysql.proc?\n\n",
-                          fix_identifier_with_newline(current_user));
+                          text);
+            if (freemem)
+              my_free((void*)text);
+
             maybe_die(EX_MYSQLERR,"%s has insufficent privileges to %s!", current_user, query_buff);
           }
           else if (strlen(row[2]))
@@ -2572,7 +2700,7 @@ static uint dump_routines_for_db(char *db)
                       "--\n");
             }
 
-
+            remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
             switch_sql_mode(sql_file, ";", row[1]);
 
             fprintf(sql_file,
@@ -2626,13 +2754,17 @@ static inline my_bool general_log_or_slow_log_tables(const char *db,
            !my_strcasecmp(charset_info, table, "slow_log"));
 }
 
-/* slave_master_info and slave_relay_log_info tables under mysql database */
+/*
+ slave_master_info,slave_relay_log_info and gtid_executed tables under
+ mysql database
+*/
 static inline my_bool replication_metadata_tables(const char *db,
                                                   const char *table)
 {
   return (!my_strcasecmp(charset_info, db, "mysql")) &&
           (!my_strcasecmp(charset_info, table, "slave_master_info") ||
-           !my_strcasecmp(charset_info, table, "slave_relay_log_info"));
+           !my_strcasecmp(charset_info, table, "slave_relay_log_info") ||
+           !my_strcasecmp(charset_info, table, "gtid_executed"));
 }
 
 /*
@@ -2719,6 +2851,8 @@ static uint get_table_structure(char *table, char *db, char *table_type,
       /* Make an sql-file, if path was given iow. option -T was given */
       char buff[20+FN_REFLEN];
       MYSQL_FIELD *field;
+      my_bool freemem= FALSE;
+      char const *text;
 
       my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
 
@@ -2735,14 +2869,17 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         write_header(sql_file, db);
       }
 
+      text= fix_identifier_with_newline(result_table, &freemem);
       if (strcmp (table_type, "VIEW") == 0)         /* view */
         print_comment(sql_file, 0,
                       "\n--\n-- Temporary table structure for view %s\n--\n\n",
-                      fix_identifier_with_newline(result_table));
+                      text);
       else
         print_comment(sql_file, 0,
-                      "\n--\n-- Table structure for table %s\n--\n\n",
-                      fix_identifier_with_newline(result_table));
+                      "\n--\n-- Table structure for table %s\n--\n\n", text);
+
+      if (freemem)
+        my_free((void*)text);
 
       if (opt_drop)
       {
@@ -3023,6 +3160,9 @@ static uint get_table_structure(char *table, char *db, char *table_type,
     /* Make an sql-file, if path was given iow. option -T was given */
     if (!opt_no_create_info)
     {
+      my_bool freemem= FALSE;
+      char const *text;
+
       if (path)
       {
         if (!(sql_file= open_sql_file_for_table(table, O_WRONLY)))
@@ -3030,9 +3170,13 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         write_header(sql_file, db);
       }
 
+      text= fix_identifier_with_newline(result_table, &freemem);
       print_comment(sql_file, 0,
                     "\n--\n-- Table structure for table %s\n--\n\n",
-                    fix_identifier_with_newline(result_table));
+                    text);
+      if (freemem)
+        my_free((void*)text);
+
       if (opt_drop)
         fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n", result_table);
       if (!opt_xml)
@@ -3370,6 +3514,7 @@ static int dump_trigger(FILE *sql_file, MYSQL_RES *show_create_trigger_rs,
                         row[3],   /* character_set_results */
                         row[4]);  /* collation_connection */
 
+    remove_sql_mode(row[1], C_STRING_WITH_LEN("NO_AUTO_CREATE_USER"));
     switch_sql_mode(sql_file, ";", row[1]);
 
     if (opt_drop_trigger)
@@ -3741,6 +3886,9 @@ static void dump_table(char *table, char *db)
     {
       dynstr_append_checked(&query_string, " ORDER BY ");
       dynstr_append_checked(&query_string, order_by);
+
+      my_free(order_by);
+      order_by = 0;
     }
 
     if (mysql_real_query(mysql, query_string.str, (ulong)query_string.length))
@@ -3752,17 +3900,23 @@ static void dump_table(char *table, char *db)
   }
   else
   {
-    print_comment(md_result_file, 0,
-                  "\n--\n-- Dumping data for table %s\n--\n",
-                  fix_identifier_with_newline(result_table));
-    
+    my_bool freemem= FALSE;
+    char const* text= fix_identifier_with_newline(result_table, &freemem);
+    print_comment(md_result_file, 0, "\n--\n-- Dumping data for table %s\n--\n",
+                  text);
+    if (freemem)
+      my_free((void*)text);
+
     dynstr_append_checked(&query_string, "SELECT /*!40001 SQL_NO_CACHE */ * FROM ");
     dynstr_append_checked(&query_string, result_table);
 
     if (where)
     {
-      print_comment(md_result_file, 0, "-- WHERE:  %s\n",
-        fix_identifier_with_newline(where));
+      freemem= FALSE;
+      text= fix_identifier_with_newline(where, &freemem);
+      print_comment(md_result_file, 0, "-- WHERE:  %s\n", text);
+      if (freemem)
+        my_free((void*)text);
 
       dynstr_append_checked(&query_string, " WHERE ");
       dynstr_append_checked(&query_string, where);
@@ -3779,11 +3933,17 @@ static void dump_table(char *table, char *db)
     }
     if (order_by)
     {
-      print_comment(md_result_file, 0, "-- ORDER BY:  %s\n",
-        fix_identifier_with_newline(order_by));
+      freemem= FALSE;
+      text= fix_identifier_with_newline(order_by, &freemem);
+      print_comment(md_result_file, 0, "-- ORDER BY:  %s\n", text);
+      if (freemem)
+        my_free((void*)text);
 
       dynstr_append_checked(&query_string, " ORDER BY ");
       dynstr_append_checked(&query_string, order_by);
+
+      my_free(order_by);
+      order_by = 0;
     }
 
     if (!opt_xml && !opt_compact)
@@ -3874,9 +4034,8 @@ static void dump_table(char *table, char *db)
         /*
            63 is my_charset_bin. If charsetnr is not 63,
            we have not a BLOB but a TEXT column.
-           we'll dump in hex only BLOB columns.
         */
-        is_blob= (opt_hex_blob && field->charsetnr == 63 &&
+        is_blob= (field->charsetnr == 63 &&
                   (field->type == MYSQL_TYPE_BIT ||
                    field->type == MYSQL_TYPE_STRING ||
                    field->type == MYSQL_TYPE_VAR_STRING ||
@@ -3900,26 +4059,39 @@ static void dump_table(char *table, char *db)
               if (!(field->flags & NUM_FLAG))
               {
                 /*
-                  "length * 2 + 2" is OK for both HEX and non-HEX modes:
+                  "length * 2 + 2" is OK for HEX mode:
                   - In HEX mode we need exactly 2 bytes per character
                   plus 2 bytes for '0x' prefix.
                   - In non-HEX mode we need up to 2 bytes per character,
-                  plus 2 bytes for leading and trailing '\'' characters.
-                  Also we need to reserve 1 byte for terminating '\0'.
+                  plus 2 bytes for leading and trailing '\'' characters
+                  and reserve 1 byte for terminating '\0'.
+                  In addition to this, for the blob type, we need to
+                  reserve for the "_binary " string that gets added in
+                  front of the string in the dump.
                 */
-                dynstr_realloc_checked(&extended_row,length * 2 + 2 + 1);
                 if (opt_hex_blob && is_blob)
                 {
+                  dynstr_realloc_checked(&extended_row,length * 2 + 2 + 1);
                   dynstr_append_checked(&extended_row, "0x");
                   extended_row.length+= mysql_hex_string(extended_row.str +
                                                          extended_row.length,
                                                          row[i], length);
-                  DBUG_ASSERT(extended_row.length+1 <= extended_row.max_length);
+                  assert(extended_row.length+1 <= extended_row.max_length);
                   /* mysql_hex_string() already terminated string by '\0' */
-                  DBUG_ASSERT(extended_row.str[extended_row.length] == '\0');
+                  assert(extended_row.str[extended_row.length] == '\0');
                 }
                 else
                 {
+                  dynstr_realloc_checked(&extended_row,length * 2 + 2 + 1 +
+                                         (is_blob? strlen("_binary ") : 0));
+                  if (is_blob)
+                  {
+                    /*
+                      inform SQL parser that this string isn't in
+                      character_set_connection, so it doesn't emit a warning.
+                    */
+                    dynstr_append_checked(&extended_row, "_binary ");
+                  }
                   dynstr_append_checked(&extended_row,"'");
                   extended_row.length +=
                   mysql_real_escape_string_quote(&mysql_connection,
@@ -3991,7 +4163,14 @@ static void dump_table(char *table, char *db)
                 print_blob_as_hex(md_result_file, row[i], length);
               }
               else
+              {
+                if (is_blob)
+                {
+                  fputs("_binary ", md_result_file);
+                  check_io(md_result_file);
+                }
                 unescape(md_result_file, row[i], length);
+              }
             }
             else
             {
@@ -4446,8 +4625,18 @@ static int dump_all_databases()
   MYSQL_RES *tableres;
   int result=0;
 
+  my_ulonglong total_databases= 0;
+  char **database_list;
+  uint db_cnt = 0, cnt = 0;
+  uint mysql_db_found = 0;
+
   if (mysql_query_with_error_report(mysql, &tableres, "SHOW DATABASES"))
     return 1;
+
+  total_databases= mysql_num_rows(tableres);
+  database_list = (char **) my_malloc(PSI_NOT_INSTRUMENTED,
+    (sizeof(char *) * total_databases), MYF(MY_WME));
+
   while ((row= mysql_fetch_row(tableres)))
   {
     if (mysql_get_server_version(mysql) >= FIRST_INFORMATION_SCHEMA_VERSION &&
@@ -4465,9 +4654,37 @@ static int dump_all_databases()
     if (is_ndbinfo(mysql, row[0]))
       continue;
 
-    if (dump_all_tables_in_db(row[0]))
-      result=1;
+    if (mysql_db_found || (!my_strcasecmp(charset_info, row[0], "mysql")))
+    {
+      if (dump_all_tables_in_db(row[0]))
+        result=1;
+      mysql_db_found = 1;
+      /*
+        once mysql database is found dump all dbs saved as part
+        of database_list
+      */
+      for (; cnt < db_cnt; cnt++)
+      {
+        if (dump_all_tables_in_db(database_list[cnt]))
+          result=1;
+        my_free(database_list[cnt]);
+      }
+    }
+    else
+    {
+      /*
+        till mysql database is not found save database names to
+        database_list
+      */
+      database_list[db_cnt] = my_strdup(PSI_NOT_INSTRUMENTED, row[0],
+                                        MYF(MY_WME | MY_ZEROFILL));
+      db_cnt++;
+    }
   }
+  assert(mysql_db_found);
+  memset(database_list, 0, sizeof(*database_list));
+  my_free(database_list);
+
   mysql_free_result(tableres);
   if (seen_views)
   {
@@ -4534,12 +4751,14 @@ View Specific database initalization.
 SYNOPSIS
   init_dumping_views
   qdatabase      quoted name of the database
+  is_mysql_db    TRUE if the db is mysql, else FALSE
 
 RETURN VALUES
   0        Success.
   1        Failure.
 */
-int init_dumping_views(char *qdatabase MY_ATTRIBUTE((unused)))
+int init_dumping_views(char *qdatabase MY_ATTRIBUTE((unused)),
+                       my_bool is_mysql_db MY_ATTRIBUTE((unused)))
 {
     return 0;
 } /* init_dumping_views */
@@ -4551,13 +4770,14 @@ Table Specific database initalization.
 SYNOPSIS
   init_dumping_tables
   qdatabase      quoted name of the database
+  is_mysql_db    TRUE if the db is mysql, else FALSE
 
 RETURN VALUES
   0        Success.
   1        Failure.
 */
 
-int init_dumping_tables(char *qdatabase)
+int init_dumping_tables(char *qdatabase, my_bool is_mysql_db)
 {
   DBUG_ENTER("init_dumping_tables");
 
@@ -4574,7 +4794,7 @@ int init_dumping_tables(char *qdatabase)
     if (mysql_query(mysql, qbuf) || !(dbinfo = mysql_store_result(mysql)))
     {
       /* Old server version, dump generic CREATE DATABASE */
-      if (opt_drop_database)
+      if (opt_drop_database && (!opt_skip_mysql_schema || !is_mysql_db))
         fprintf(md_result_file,
                 "\n/*!40000 DROP DATABASE IF EXISTS %s*/;\n",
                 qdatabase);
@@ -4584,7 +4804,7 @@ int init_dumping_tables(char *qdatabase)
     }
     else
     {
-      if (opt_drop_database)
+      if (opt_drop_database && (!opt_skip_mysql_schema || !is_mysql_db))
         fprintf(md_result_file,
                 "\n/*!40000 DROP DATABASE IF EXISTS %s*/;\n",
                 qdatabase);
@@ -4600,7 +4820,7 @@ int init_dumping_tables(char *qdatabase)
 } /* init_dumping_tables */
 
 
-static int init_dumping(char *database, int init_func(char*))
+static int init_dumping(char *database, int init_func(char*, my_bool))
 {
   if (is_ndbinfo(mysql, database))
   {
@@ -4622,13 +4842,17 @@ static int init_dumping(char *database, int init_func(char*))
       */
       char quoted_database_buf[NAME_LEN*2+3];
       char *qdatabase= quote_name(database,quoted_database_buf,opt_quoted);
+      my_bool freemem= FALSE;
+      char const* text= fix_identifier_with_newline(qdatabase, &freemem);
+      my_bool is_mysql_db= !my_strcasecmp(charset_info, database, "mysql");
 
-      print_comment(md_result_file, 0,
-                    "\n--\n-- Current Database: %s\n--\n",
-                    fix_identifier_with_newline(qdatabase));
+      print_comment(md_result_file, 0, "\n--\n-- Current Database: %s\n--\n",
+                    text);
+      if (freemem)
+        my_free((void*)text);
 
       /* Call the view or table specific function */
-      init_func(qdatabase);
+      init_func(qdatabase, is_mysql_db);
 
       fprintf(md_result_file,"\nUSE %s;\n", qdatabase);
       check_io(md_result_file);
@@ -4706,8 +4930,6 @@ static int dump_all_tables_in_db(char *database)
     if (include_table((uchar*) hash_key, end - hash_key))
     {
       dump_table(table,database);
-      my_free(order_by);
-      order_by= 0;
       if (opt_dump_triggers && mysql_get_server_version(mysql) >= 50009)
       {
         if (dump_triggers_for_table(table, database))
@@ -4792,6 +5014,10 @@ static int dump_all_tables_in_db(char *database)
                                real_columns))
         verbose_msg("-- Warning: get_table_structure() failed with some internal "
                     "error for 'general_log' table\n");
+      if (order_by) {
+        my_free(order_by);
+        order_by = 0;
+      }
     }
     if (slow_log_table_exists)
     {
@@ -4800,6 +5026,10 @@ static int dump_all_tables_in_db(char *database)
                                real_columns))
         verbose_msg("-- Warning: get_table_structure() failed with some internal "
                     "error for 'slow_log' table\n");
+      if (order_by) {
+        my_free(order_by);
+        order_by = 0;
+      }
     }
   }
   if (flush_privileges && using_mysql_db)
@@ -4903,7 +5133,7 @@ static char *get_actual_table_name(const char *old_table_name, MEM_ROOT *root)
   DBUG_ENTER("get_actual_table_name");
 
   /* Check memory for quote_for_like() */
-  DBUG_ASSERT(2*sizeof(old_table_name) < sizeof(show_name_buff));
+  assert(2*sizeof(old_table_name) < sizeof(show_name_buff));
   my_snprintf(query, sizeof(query), "SHOW TABLES LIKE %s",
               quote_for_like(old_table_name, show_name_buff));
 
@@ -5075,8 +5305,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
     dump_routines_for_db(db);
   }
   free_root(&root, MYF(0));
-  my_free(order_by);
-  order_by= 0;
   if (opt_xml)
   {
     fputs("</database>\n", md_result_file);
@@ -5466,7 +5694,7 @@ char check_if_ignore_table(const char *table_name, char *table_type)
   DBUG_ENTER("check_if_ignore_table");
 
   /* Check memory for quote_for_like() */
-  DBUG_ASSERT(2*sizeof(table_name) < sizeof(show_name_buff));
+  assert(2*sizeof(table_name) < sizeof(show_name_buff));
   my_snprintf(buff, sizeof(buff), "show table status like %s",
               quote_for_like(table_name, show_name_buff));
   if (mysql_query_with_error_report(mysql, &res, buff))
@@ -5626,6 +5854,65 @@ static int replace(DYNAMIC_STRING *ds_str,
   return 0;
 }
 
+/**
+  This function will store the value for GTID_EXECUTED in the parameter
+  gtid_executed.
+
+  @param[in]  mysql          connection to the server
+
+  @param[out] gtid_executed  the result of the query will be stored
+                             in this parameter
+
+  @retval     FALSE          if query was successfully executed
+
+  @retval     TRUE           failed
+*/
+static my_bool get_gtids_executed(MYSQL* mysql, MYSQL_RES** gtid_executed)
+{
+    if (mysql_query_with_error_report(mysql, gtid_executed,
+        "SELECT @@GLOBAL.GTID_EXECUTED"))
+        return TRUE;
+
+    return FALSE;
+}
+
+
+/**
+  This function checks if GTIDs are enabled on the server.
+
+  @param[in]          mysql            the connection to the server
+
+  @retval             TRUE             if GTIDs are enabled on the server
+
+  @retval             FALSE            if GTIDs are disabled on the server
+*/
+static my_bool get_gtid_mode(MYSQL* mysql)
+{
+    char* gtid_mode_val = 0;
+    my_bool gtid_mode = FALSE;
+    MYSQL_RES* gtid_mode_res;
+    MYSQL_ROW gtid_mode_row;
+
+    /*
+      Check if the server has the knowledge of GTIDs(pre mysql-5.6)
+      or if the gtid_mode is ON or OFF.
+    */
+    if (mysql_query_with_error_report(mysql, &gtid_mode_res,
+        "SHOW VARIABLES LIKE 'gtid_mode'"))
+        return FALSE;
+
+    gtid_mode_row = mysql_fetch_row(gtid_mode_res);
+
+    /*
+      gtid_mode_row is NULL for pre 5.6 versions. For versions >= 5.6,
+      get the gtid_mode value from the second column.
+    */
+    gtid_mode_val = gtid_mode_row ? (char*)gtid_mode_row[1] : NULL;
+    gtid_mode = (gtid_mode_val && strcmp(gtid_mode_val, "OFF")) ? TRUE : FALSE;
+    mysql_free_result(gtid_mode_res);
+
+    return gtid_mode;
+}
 
 /**
   This function sets the session binlog in the dump file.
@@ -5635,24 +5922,20 @@ static int replace(DYNAMIC_STRING *ds_str,
 
   @note: md_result_file should have been opened, before
          this function is called.
-
-  @param[in]      flag          If FALSE, disable binlog.
-                                If TRUE and binlog disabled previously,
-                                restore the session binlog.
 */
 
-static void set_session_binlog(my_bool flag)
+static void set_session_binlog()
 {
   static my_bool is_binlog_disabled= FALSE;
 
-  if (!flag && !is_binlog_disabled)
+  if (!is_binlog_disabled)
   {
     fprintf(md_result_file,
             "SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN;\n");
     fprintf(md_result_file, "SET @@SESSION.SQL_LOG_BIN= 0;\n");
     is_binlog_disabled= 1;
   }
-  else if (flag && is_binlog_disabled)
+  else
   {
     fprintf(md_result_file,
             "SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;\n");
@@ -5668,44 +5951,68 @@ static void set_session_binlog(my_bool flag)
 
   @param[in]  mysql_con     connection to the server
 
+  @param[in]  gtid_array    Set of GTIDs executed on the server
+
+  @param[in]  gtid_executed_provided   If TRUE, it means that result of
+                                       SELECT @@GLOBAL.GTID_EXECUTED has
+                                       been provided in gtid_array.
+
   @retval     FALSE         succesfully printed GTID_PURGED sets
                              in the dump file.
+
   @retval     TRUE          failed.
 
 */
 
-static my_bool add_set_gtid_purged(MYSQL *mysql_con)
+static my_bool add_set_gtid_purged(MYSQL *mysql_con,
+                                   MY_GTID_ARRAY *gtid_array,
+                                   my_bool gtid_executed_provided)
 {
-  MYSQL_RES  *gtid_purged_res;
+  MYSQL_RES* gtid_purged_res;
   MYSQL_ROW  gtid_set;
-  ulonglong  num_sets, idx;
+  ulonglong  num_sets, idx = 0;
 
-  /* query to get the GTID_EXECUTED */
-  if (mysql_query_with_error_report(mysql_con, &gtid_purged_res,
-                  "SELECT @@GLOBAL.GTID_EXECUTED"))
-    return TRUE;
+  /* query to get the GTID_EXECUTED, if not fetched previously */
+  if (!gtid_executed_provided)
+  {
+      if (get_gtids_executed(mysql_con, &gtid_purged_res))
+          return TRUE;
+      num_sets = mysql_num_rows(gtid_purged_res);
+  }
+  else
+      num_sets = gtid_array->num_rows;
 
-  /* Proceed only if gtid_purged_res is non empty */
-  if ((num_sets= mysql_num_rows(gtid_purged_res)) > 0)
+  if (num_sets > 0)
   {
     if (opt_comments)
       fprintf(md_result_file,
-          "\n--\n-- GTID state at the beginning of the backup \n--\n\n");
+          "\n--\n-- GTID state at the end of the backup \n--\n\n");
 
     fprintf(md_result_file,"SET @@GLOBAL.GTID_PURGED='");
 
     /* formatting is not required, even for multiple gtid sets */
-    for (idx= 0; idx< num_sets-1; idx++)
+    for(idx = 0 ; idx < num_sets ; idx++)
     {
-      gtid_set= mysql_fetch_row(gtid_purged_res);
-      fprintf(md_result_file,"%s,", (char*)gtid_set[0]);
+      char* gtid_set_string = NULL;
+      if(gtid_executed_provided)
+	  gtid_set_string = gtid_array->gtid_array[idx];
+      else
+      {
+	  gtid_set = mysql_fetch_row(gtid_purged_res);
+	  gtid_set_string = (char *)gtid_set[0];
+      }
+      fprintf(md_result_file, "%s", gtid_set_string);
+
+      if(idx < num_sets - 1)
+	  fprintf(md_result_file, ",");
     }
-    /* for the last set */
-    gtid_set= mysql_fetch_row(gtid_purged_res);
-    /* close the SET expression */
-    fprintf(md_result_file,"%s';\n", (char*)gtid_set[0]);
+
+    /* close set expression */
+    fprintf(md_result_file, "';\n");
   }
-  mysql_free_result(gtid_purged_res);
+
+  if(!gtid_executed_provided)
+      mysql_free_result(gtid_purged_res);
 
   return FALSE;  /*success */
 }
@@ -5713,79 +6020,92 @@ static my_bool add_set_gtid_purged(MYSQL *mysql_con)
 
 /**
   This function processes the opt_set_gtid_purged option.
-  This function also calls set_session_binlog() function before
-  setting the SET @@GLOBAL.GTID_PURGED in the output.
+  This function when called with the flag as FALSE, just
+  disables the binlog by calling set_session_binlog().
+  Later when this function is called with the flag as TRUE,
+  SET @@GLOBAL.GTID_PURGED is written in the output and the
+  session binlog is restored if disabled previously.
 
   @param[in]          mysql_con     the connection to the server
 
+  @param[in]          flag          If FALSE, just disable binlog and not
+                                    set the gtid purged as it will be set
+                                    at a later point of time.
+                                    If TRUE, set the gtid purged and
+                                    restore the session binlog if disabled
+                                    previously.
+
+  @param[in]          gtid_array    Set of GTIDs executed on the server
+
+  @param[in]          gtid_executed_provided   If TRUE, it means that the
+                                               result of the query
+                                               SELECT @@GLOBAL.GTID_EXECUTED
+                                               has been provided in gtid_array
+
+  @param[in]          is_gtid_enabled   TRUE if server has gtid_mode ON
+
   @retval             FALSE         successful according to the value
                                     of opt_set_gtid_purged.
+
   @retval             TRUE          fail.
 */
 
-static my_bool process_set_gtid_purged(MYSQL* mysql_con)
+static my_bool process_set_gtid_purged(MYSQL* mysql_con, my_bool flag,
+                                       MY_GTID_ARRAY *gtid_array,
+                                       my_bool gtid_executed_provided,
+                                       my_bool is_gtid_enabled)
 {
-  MYSQL_RES  *gtid_mode_res;
-  MYSQL_ROW  gtid_mode_row;
-  char       *gtid_mode_val= 0;
-  char buf[32], query[64];
-
   if (opt_set_gtid_purged_mode == SET_GTID_PURGED_OFF)
     return FALSE;  /* nothing to be done */
 
-  /*
-    Check if the server has the knowledge of GTIDs(pre mysql-5.6)
-    or if the gtid_mode is ON or OFF.
-  */
-  my_snprintf(query, sizeof(query), "SHOW VARIABLES LIKE %s",
-              quote_for_like("gtid_mode", buf));
-
-  if (mysql_query_with_error_report(mysql_con, &gtid_mode_res, query))
-    return TRUE;
-
-  gtid_mode_row = mysql_fetch_row(gtid_mode_res);
-
-  /*
-     gtid_mode_row is NULL for pre 5.6 versions. For versions >= 5.6,
-     get the gtid_mode value from the second column.
-  */
-  gtid_mode_val = gtid_mode_row ? (char*)gtid_mode_row[1] : NULL;
-
-  if (gtid_mode_val && strcmp(gtid_mode_val, "OFF"))
+  if (is_gtid_enabled)
   {
     /*
        For any gtid_mode !=OFF and irrespective of --set-gtid-purged
        being AUTO or ON,  add GTID_PURGED in the output.
     */
-    if (opt_databases || !opt_alldbs || !opt_dump_triggers
-        || !opt_routines || !opt_events)
+    if (!flag)
+      set_session_binlog();
+    else
     {
-      fprintf(stderr,"Warning: A partial dump from a server that has GTIDs will "
-                     "by default include the GTIDs of all transactions, even "
-                     "those that changed suppressed parts of the database. If "
-                     "you don't want to restore GTIDs, pass "
-                     "--set-gtid-purged=OFF. To make a complete dump, pass "
-                     "--all-databases --triggers --routines --events. \n");
-    }
+      if (flag && (opt_databases || !opt_alldbs || !opt_dump_triggers
+          || !opt_routines || !opt_events))
+      {
+        fprintf(stderr,"Warning: A partial dump from a server that has GTIDs will "
+                       "by default include the GTIDs of all transactions, even "
+                       "those that changed suppressed parts of the database. If "
+                       "you don't want to restore GTIDs, pass "
+                       "--set-gtid-purged=OFF. To make a complete dump, pass "
+                       "--all-databases --triggers --routines --events. \n");
+      }
 
-    set_session_binlog(FALSE);
-    if (add_set_gtid_purged(mysql_con))
-    {
-      mysql_free_result(gtid_mode_res);
-      return TRUE;
+      if (!opt_lock_all_tables && !opt_master_data && !opt_single_transaction)
+      {
+          fprintf(stderr, "Warning: A dump from a server that has GTIDs "
+                          "enabled will by default include the GTIDs "
+                          "of all transactions, even those that were "
+                          "executed during its extraction and might "
+                          "not be represented in the dumped data. "
+                          "This might result in an inconsistent data dump. \n"
+                          "In order to ensure a consistent backup of the "
+                          "database, pass --single-transaction or "
+                          "--lock-all-tables or --master-data. \n");
+      }
+
+      if (add_set_gtid_purged(mysql_con, gtid_array,
+          gtid_executed_provided))
+        return TRUE;
     }
   }
   else /* gtid_mode is off */
   {
-    if (opt_set_gtid_purged_mode == SET_GTID_PURGED_ON)
+    if (flag && opt_set_gtid_purged_mode == SET_GTID_PURGED_ON)
     {
       fprintf(stderr, "Error: Server has GTIDs disabled.\n");
-      mysql_free_result(gtid_mode_res);
       return TRUE;
     }
   }
 
-  mysql_free_result(gtid_mode_res);
   return FALSE;
 }
 
@@ -5813,6 +6133,8 @@ static my_bool get_view_structure(char *table, char* db)
   char       table_buff2[NAME_LEN*2+3];
   char       query[QUERY_LENGTH];
   FILE       *sql_file= md_result_file;
+  my_bool    freemem= FALSE;
+  char const *text;
   DBUG_ENTER("get_view_structure");
 
   if (opt_no_create_info) /* Don't write table creation info */
@@ -5856,9 +6178,11 @@ static my_bool get_view_structure(char *table, char* db)
     write_header(sql_file, db);
   }
 
+  text= fix_identifier_with_newline(result_table, &freemem);
   print_comment(sql_file, 0,
-                "\n--\n-- Final view structure for view %s\n--\n\n",
-                fix_identifier_with_newline(result_table));
+                "\n--\n-- Final view structure for view %s\n--\n\n", text);
+  if (freemem)
+    my_free((void*)text);
 
   verbose_msg("-- Dropping the temporary view structure created\n");
   fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n", opt_quoted_table);
@@ -6034,6 +6358,10 @@ static void dynstr_realloc_checked(DYNAMIC_STRING *str, size_t additional_size)
 
 int main(int argc, char **argv)
 {
+  MY_GTID_ARRAY* gtid_arr = NULL;
+  my_bool server_has_gtid_enabled = FALSE;
+  my_bool single_trans_with_gtid_enabled = FALSE;
+  my_ulonglong idx = 0;
   char bin_log_name[FN_REFLEN];
   int exit_code, md_result_fd;
   MY_INIT("mysqldump");
@@ -6075,8 +6403,16 @@ int main(int argc, char **argv)
   if (opt_slave_data && do_stop_slave_sql(mysql))
     goto err;
 
+  /* check if server has GTIDs enabled */
+  server_has_gtid_enabled = get_gtid_mode(mysql);
+
+  single_trans_with_gtid_enabled =
+      (server_has_gtid_enabled && opt_single_transaction &&
+          (opt_set_gtid_purged_mode != SET_GTID_PURGED_OFF));
+
   if ((opt_lock_all_tables || opt_master_data ||
-       (opt_single_transaction && flush_logs)) &&
+       (opt_single_transaction && (flush_logs ||
+        single_trans_with_gtid_enabled))) &&
       do_flush_tables_read_lock(mysql))
     goto err;
 
@@ -6085,8 +6421,9 @@ int main(int argc, char **argv)
     this causes implicit commit starting mysql-5.5.
   */
   if (opt_lock_all_tables || opt_master_data ||
-      (opt_single_transaction && flush_logs) ||
-      opt_delete_master_logs)
+      (opt_single_transaction && (flush_logs ||
+       single_trans_with_gtid_enabled)) ||
+       opt_delete_master_logs)
   {
     if (flush_logs || opt_delete_master_logs)
     {
@@ -6108,19 +6445,59 @@ int main(int argc, char **argv)
       goto err;
   }
 
+  /* Start the transaction */
   if (opt_single_transaction && start_transaction(mysql))
     goto err;
 
+  if (single_trans_with_gtid_enabled)
+  {
+      /*
+      * If the dump was started with --single-transaction
+      * and GTIDs are enabled on the server, then we fetch the
+      * GTID_EXECUTED first, and pass them over
+      */
+      MYSQL_RES* gtid_executed = NULL;
+      if(get_gtids_executed(mysql, &gtid_executed))
+          goto err;
+
+      /* we've to perform a deep copy of gtid_executed into our struct */
+      gtid_arr = (MY_GTID_ARRAY*)malloc(sizeof(MY_GTID_ARRAY));
+
+      if(!gtid_arr)
+          die(EX_MYSQLERR, "Couldn't allocate memory");
+
+      gtid_arr->num_rows = mysql_num_rows(gtid_executed);
+      gtid_arr->gtid_array = (char**)my_malloc(PSI_NOT_INSTRUMENTED,
+                                     sizeof(char *)*(gtid_arr->num_rows),
+                                     MYF(0));
+
+      if(!(gtid_arr->gtid_array))
+          die(EX_MYSQLERR, "Couldn't allocate memory");
+
+      /* store the gtids in to the gtid_array */
+      for (idx = 0; idx < gtid_arr->num_rows; idx++)
+      {
+          MYSQL_ROW current_gtid_row = NULL;
+          current_gtid_row = mysql_fetch_row(gtid_executed);
+
+          gtid_arr->gtid_array[idx] = my_strdup(PSI_NOT_INSTRUMENTED,
+                                      ((char*)current_gtid_row[0]),
+                                      MYF(0));
+      }
+
+      /* done with gtid_executed */
+      mysql_free_result(gtid_executed);
+  }
+
   /* Add 'STOP SLAVE to beginning of dump */
   if (opt_slave_apply && add_stop_slave())
     goto err;
 
-
-  /* Process opt_set_gtid_purged and add SET @@GLOBAL.GTID_PURGED if required. */
-  if (process_set_gtid_purged(mysql))
+  /* Process opt_set_gtid_purged and add SET disable binlog if required. */
+  if (process_set_gtid_purged(mysql, FALSE, gtid_arr,
+      single_trans_with_gtid_enabled, server_has_gtid_enabled))
     goto err;
 
-
   if (opt_master_data && do_show_master_status(mysql))
     goto err;
   if (opt_slave_data && do_show_slave_status(mysql))
@@ -6173,11 +6550,10 @@ int main(int argc, char **argv)
   if (opt_slave_data && do_start_slave_sql(mysql))
     goto err;
 
-  /*
-    if --set-gtid-purged, restore binlog at the end of the session
-    if required.
-  */
-  set_session_binlog(TRUE);
+  /* Process opt_set_gtid_purged and add SET @@GLOBAL.GTID_PURGED if required. */
+   if (process_set_gtid_purged(mysql, TRUE, gtid_arr,
+       single_trans_with_gtid_enabled, server_has_gtid_enabled))
+     goto err;
 
   /* add 'START SLAVE' to end of dump */
   if (opt_slave_apply && add_slave_statements())
@@ -6201,6 +6577,17 @@ int main(int argc, char **argv)
       first_error= EX_MYSQLERR;
     goto err;
   }
+
+  /* get rid of gtid_arr */
+  if (single_trans_with_gtid_enabled)
+  {
+      for (idx = 0; idx < gtid_arr->num_rows; idx++)
+          my_free(gtid_arr->gtid_array[idx]);
+
+      my_free(gtid_arr->gtid_array);
+      free(gtid_arr);
+  }
+
   /* everything successful, purge the old logs files */
   if (opt_delete_master_logs && purge_bin_logs_to(mysql, bin_log_name))
     goto err;
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 659386e0f555..09e33bd97171 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -59,6 +66,7 @@ static char * opt_mysql_unix_port=0;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
 static longlong opt_ignore_lines= -1;
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 
 #if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
 static char *shared_memory_base_name=0;
@@ -82,7 +90,7 @@ static struct my_option my_long_options[] =
   {"compress", 'C', "Use compression in server/client protocol.",
    &opt_compress, &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
    {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
    {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -187,6 +195,7 @@ static struct my_option my_long_options[] =
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"use-threads", OPT_USE_THREADS,
    "Load files in parallel. The argument is the number "
    "of threads to use for loading data.",
@@ -497,6 +506,10 @@ static MYSQL *db_connect(char *host, char *database,
   mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
                  "program_name", "mysqlimport");
+
+  set_server_public_key(mysql);
+  set_get_server_public_key_option(mysql);
+
   if (!(mysql_real_connect(mysql,host,user,passwd,
                            database,opt_mysql_port,opt_mysql_unix_port,
                            0)))
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 055c2ea42d1a..0bc0494218ff 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,6 +35,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 #include <welcome_copyright_notice.h>   /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
 
 static char * host=0, *opt_password=0, *user=0;
@@ -145,6 +153,10 @@ int main(int argc, char **argv)
   mysql_options(&mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(&mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
                  "program_name", "mysqlshow");
+
+  set_server_public_key(&mysql);
+  set_get_server_public_key_option(&mysql);
+
   if (!(mysql_real_connect(&mysql,host,user,opt_password,
 			   (first_argument_uses_wildcards) ? "" :
                            argv[0],opt_mysql_port,opt_mysql_unix_port,
@@ -264,6 +276,7 @@ static struct my_option my_long_options[] =
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"user", 'u', "User for login if not current user.", &user,
    &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v',
diff --git a/client/mysqlslap.cc b/client/mysqlslap.cc
index 2c98add735e6..32f3656512b1 100644
--- a/client/mysqlslap.cc
+++ b/client/mysqlslap.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -87,6 +94,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <sslopt-vars.h>
+#include <caching_sha2_passwordopt-vars.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -359,6 +367,10 @@ int main(int argc, char **argv)
   if (using_opt_enable_cleartext_plugin)
     mysql_options(&mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, 
                   (char*) &opt_enable_cleartext_plugin);
+
+  set_server_public_key(&mysql);
+  set_get_server_public_key_option(&mysql);
+
   if (!opt_only_print) 
   {
     if (!(mysql_real_connect(&mysql, host, user, opt_password,
@@ -592,7 +604,7 @@ static struct my_option my_long_options[] =
   {"csv", OPT_SLAP_CSV,
 	"Generate CSV output to named file or to stdout if no file is named.",
     NULL, NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   { "debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -705,6 +717,7 @@ static struct my_option my_long_options[] =
   {"sql_mode", 0, "Specify sql-mode to run mysqlslap tool.", &sql_mode,
     &sql_mode, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
+#include <caching_sha2_passwordopt-longopts.h>
   {"user", 'u', "User for login if not current user.", &user,
     &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v',
@@ -1977,13 +1990,13 @@ extern "C" void *run_task(void *p)
           Just in case someone runs this under an experimental engine we don't
           want a crash so the if() is placed here.
         */
-        DBUG_ASSERT(primary_keys_number_of);
+        assert(primary_keys_number_of);
         if (primary_keys_number_of)
         {
           key_val= (unsigned int)(random() % primary_keys_number_of);
           key= primary_keys[key_val];
 
-          DBUG_ASSERT(key);
+          assert(key);
 
           length= snprintf(buffer, HUGE_STRING_LENGTH, "%.*s '%s'", 
                            (int)ptr->length, ptr->string, key);
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 913e8231b9b8..a4629110f098 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -50,6 +57,7 @@
 
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
+#include <sstream>
 #include <string>
 #include <algorithm>
 #include <functional>
@@ -164,9 +172,6 @@ static my_bool is_windows= 0;
 static char **default_argv;
 static const char *load_default_groups[]= { "mysqltest", "client", 0 };
 static char line_buffer[MAX_DELIMITER_LENGTH], *line_buffer_pos= line_buffer;
-#if !defined(HAVE_YASSL)
-static const char *opt_server_public_key= 0;
-#endif
 static my_bool can_handle_expired_passwords= TRUE;
 
 /* Info on properties that can be set with --enable_X and --disable_X */
@@ -298,6 +303,7 @@ typedef Prealloced_array<st_command*, 1024> Q_lines;
 Q_lines *q_lines;
 
 #include "sslopt-vars.h"
+#include <caching_sha2_passwordopt-vars.h>
 
 struct Parser
 {
@@ -388,7 +394,7 @@ enum enum_commands {
   Q_ENABLE_INFO, Q_DISABLE_INFO,
   Q_ENABLE_SESSION_TRACK_INFO, Q_DISABLE_SESSION_TRACK_INFO,
   Q_ENABLE_METADATA, Q_DISABLE_METADATA,
-  Q_EXEC, Q_EXECW, Q_DELIMITER,
+  Q_EXEC, Q_EXECW, Q_EXEC_BACKGROUND, Q_DELIMITER,
   Q_DISABLE_ABORT_ON_ERROR, Q_ENABLE_ABORT_ON_ERROR,
   Q_DISPLAY_VERTICAL_RESULTS, Q_DISPLAY_HORIZONTAL_RESULTS,
   Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, Q_SORTED_RESULT,
@@ -464,6 +470,7 @@ const char *command_names[]=
   "disable_metadata",
   "exec",
   "execw",
+  "exec_in_background",
   "delimiter",
   "disable_abort_on_error",
   "enable_abort_on_error",
@@ -747,11 +754,11 @@ class LogFile {
   void write(DYNAMIC_STRING* ds)
   {
     DBUG_ENTER("LogFile::write");
-    DBUG_ASSERT(m_file);
+    assert(m_file);
 
     if (ds->length == 0)
       DBUG_VOID_RETURN;
-    DBUG_ASSERT(ds->str);
+    assert(ds->str);
 
     if (fwrite(ds->str, 1, ds->length, m_file) != ds->length)
       die("Failed to write %lu bytes to '%s', errno: %d",
@@ -912,7 +919,7 @@ extern "C" void *connection_thread(void *arg)
         cn->result= mysql_read_query_result(&cn->mysql);
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
     }
     cn->command= 0;
     native_mutex_lock(&cn->result_mutex);
@@ -930,7 +937,7 @@ extern "C" void *connection_thread(void *arg)
 
 static void wait_query_thread_done(struct st_connection *con)
 {
-  DBUG_ASSERT(con->has_thread);
+  assert(con->has_thread);
   if (!con->query_done)
   {
     native_mutex_lock(&con->result_mutex);
@@ -943,7 +950,7 @@ static void wait_query_thread_done(struct st_connection *con)
 
 static void signal_connection_thd(struct st_connection *cn, int command)
 {
-  DBUG_ASSERT(cn->has_thread);
+  assert(cn->has_thread);
   cn->query_done= 0;
   cn->command= command;
   native_mutex_lock(&cn->query_mutex);
@@ -971,7 +978,7 @@ static int do_send_query(struct st_connection *cn, const char *q, size_t q_len)
 
 static int do_read_query_result(struct st_connection *cn)
 {
-  DBUG_ASSERT(cn->has_thread);
+  assert(cn->has_thread);
   wait_query_thread_done(cn);
   signal_connection_thd(cn, EMB_READ_QUERY_RESULT);
   wait_query_thread_done(cn);
@@ -1295,7 +1302,7 @@ void check_command_args(struct st_command *command,
       break;
 
     default:
-      DBUG_ASSERT("Unknown argument type");
+      assert("Unknown argument type");
       break;
     }
 
@@ -1484,7 +1491,7 @@ static void cleanup_and_exit(int exit_code)
     break;
     default:
       printf("unknown exit code: %d\n", exit_code);
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
 
@@ -2103,7 +2110,7 @@ void check_result()
   const char* mess= "Result content mismatch\n";
 
   DBUG_ENTER("check_result");
-  DBUG_ASSERT(result_file_name);
+  assert(result_file_name);
   DBUG_PRINT("enter", ("result_file_name: %s", result_file_name));
 
   switch (compare_files(log_file.file_name(), result_file_name)) {
@@ -2421,7 +2428,7 @@ void var_set(const char *var_name, const char *var_name_end,
       v->str_val_len= strlen(v->str_val);
     }
     /* setenv() expects \0-terminated strings */
-    DBUG_ASSERT(v->name[v->name_len] == 0);
+    assert(v->name[v->name_len] == 0);
     setenv(v->name, v->str_val, 1);
   }
   DBUG_VOID_RETURN;
@@ -3237,17 +3244,16 @@ static int replace(DYNAMIC_STRING *ds_str,
   mysqltest commmand(s) like "remove_file" for that
 */
 
-void do_exec(struct st_command *command)
+void do_exec(struct st_command *command, bool run_in_background)
 {
   int error;
-  char buf[512];
   FILE *res_file;
   char *cmd= command->first_argument;
   DYNAMIC_STRING ds_cmd;
   DBUG_ENTER("do_exec");
   DBUG_PRINT("enter", ("cmd: '%s'", cmd));
 
-  /* Skip leading space */
+  // Skip leading space
   while (*cmd && my_isspace(charset_info, *cmd))
     cmd++;
   if (!*cmd)
@@ -3255,26 +3261,44 @@ void do_exec(struct st_command *command)
   command->last_argument= command->end;
 
   init_dynamic_string(&ds_cmd, 0, command->query_len+256, 256);
-  /* Eval the command, thus replacing all environment variables */
+  // Eval the command, thus replacing all environment variables
   do_eval(&ds_cmd, cmd, command->end, !is_windows);
 
-  /* Check if echo should be replaced with "builtin" echo */
+  // Check if echo should be replaced with "builtin" echo
   if (builtin_echo[0] && strncmp(cmd, "echo", 4) == 0)
   {
-    /* Replace echo with our "builtin" echo */
+    // Replace echo with our "builtin" echo
     replace(&ds_cmd, "echo", 4, builtin_echo, strlen(builtin_echo));
   }
 
 #ifdef _WIN32
-  /* Replace /dev/null with NUL */
+  // Replace "/dev/null" with NUL
   while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
     ;
-  /* Replace "closed stdout" with non existing output fd */
+
+  // Replace "closed stdout" with non existing output fd
   while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)
     ;
 #endif
+  if (run_in_background)
+  {
+    /* Add an invocation of "START /B" on Windows, append " &" on Linux*/
+    DYNAMIC_STRING ds_tmp;
+#ifdef WIN32
+    init_dynamic_string(&ds_tmp, "START /B ",
+                        ds_cmd.length + 9, 256);
+   dynstr_append_mem(&ds_tmp, ds_cmd.str, ds_cmd.length);
+#else
+    init_dynamic_string(&ds_tmp, ds_cmd.str,
+                       ds_cmd.length + 2, 256);
+    dynstr_append_mem(&ds_tmp, " &", 2);
+#endif
+    dynstr_set(&ds_cmd, ds_tmp.str);
+    dynstr_free(&ds_tmp);
+  }
+
 
-  /* exec command is interpreted externally and will not take newlines */
+  // exec command is interpreted externally and will not take newlines
   while(replace(&ds_cmd, "\n", 1, " ", 1) == 0)
     ;
   
@@ -3286,19 +3310,52 @@ void do_exec(struct st_command *command)
     dynstr_free(&ds_cmd);
     die("popen(\"%s\", \"r\") failed", command->first_argument);
   }
-
-  while (fgets(buf, sizeof(buf), res_file))
+  if(!run_in_background)
   {
-    if (disable_result_log)
-    {
-      buf[strlen(buf)-1]=0;
-      DBUG_PRINT("exec_result",("%s", buf));
-    }
-    else
+    char buf[512];
+    std::string str;
+    while (fgets(buf, sizeof(buf), res_file))
     {
-      replace_dynstr_append(&ds_res, buf);
+      if (strlen(buf) < 1)
+        continue;
+
+      if (disable_result_log)
+      {
+        buf[strlen(buf)-1]=0;
+        DBUG_PRINT("exec_result",("%s", buf));
+      }
+      else
+      {
+        // Read the file line by line. Check if the buffer read from the
+        // file ends with EOL character.
+        if ((buf[strlen(buf)-1] != '\n' && strlen(buf) < (sizeof(buf) - 1)) ||
+            (buf[strlen(buf)-1] == '\n'))
+        {
+          // Found EOL
+          if (str.length())
+          {
+            // Temporary string exists, append the current buffer read
+            // to the temporary string.
+            str.append(buf);
+            replace_dynstr_append(&ds_res, str.c_str());
+            str.clear();
+          }
+          else
+          {
+            // Entire line is read at once
+            replace_dynstr_append(&ds_res, buf);
+          }
+        }
+        else
+        {
+          // The buffer read from the file doesn't end with EOL character,
+          // store it in a temporary string.
+          str.append(buf);
+        }
+      }
     }
   }
+
   error= pclose(res_file);
   if (error > 0)
   {
@@ -3343,7 +3400,7 @@ void do_exec(struct st_command *command)
   else if (command->expected_errors.err[0].type == ERR_ERRNO &&
            command->expected_errors.err[0].code.errnum != 0)
   {
-    /* Error code we wanted was != 0, i.e. not an expected success */
+    // Error code we wanted was != 0, i.e. not an expected success
     log_msg("exec of '%s failed, error: %d, errno: %d",
             ds_cmd.str, error, errno);
     dynstr_free(&ds_cmd);
@@ -5723,6 +5780,10 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host,
                  "program_name", "mysqltest");
   mysql_options(mysql, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
                 &can_handle_expired_passwords);
+
+  set_server_public_key(mysql);
+  set_get_server_public_key_option(mysql);
+
   while(!mysql_real_connect(mysql, host,user, pass, db, port, sock,
                             CLIENT_MULTI_STATEMENTS | CLIENT_REMEMBER_OPTIONS))
   {
@@ -5828,6 +5889,10 @@ int connect_n_handle_errors(struct st_command *command,
   mysql_options4(con, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "mysqltest");
   mysql_options(con, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
                 &can_handle_expired_passwords);
+
+  set_server_public_key(con);
+  set_get_server_public_key_option(con);
+
   while (!mysql_real_connect(con, host, user, pass, db, port, sock ? sock: 0,
                           CLIENT_MULTI_STATEMENTS))
   {
@@ -6105,12 +6170,10 @@ void do_connect(struct st_command *command)
   if (ds_default_auth.length)
     mysql_options(&con_slot->mysql, MYSQL_DEFAULT_AUTH, ds_default_auth.str);
 
-#if !defined(HAVE_YASSL)
   /* Set server public_key */
   if (opt_server_public_key && *opt_server_public_key)
     mysql_options(&con_slot->mysql, MYSQL_SERVER_PUBLIC_KEY,
                   opt_server_public_key);
-#endif
   
   if (con_cleartext_enable)
     mysql_options(&con_slot->mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
@@ -6998,7 +7061,7 @@ static struct my_option my_long_options[] =
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"database", 'D', "Database to use.", &opt_db, &opt_db, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
@@ -7081,6 +7144,7 @@ static struct my_option my_long_options[] =
    &sp_protocol, &sp_protocol, 0,
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #include "sslopt-longopts.h"
+#include <caching_sha2_passwordopt-longopts.h>
   {"tail-lines", OPT_TAIL_LINES,
    "Number of lines of the result to include in a failure report.",
    &opt_tail_lines, &opt_tail_lines, 0,
@@ -7119,12 +7183,10 @@ static struct my_option my_long_options[] =
   {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
     &opt_plugin_dir, &opt_plugin_dir, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#if !defined(HAVE_YASSL) 
   {"server-public-key-path", OPT_SERVER_PUBLIC_KEY,
    "File path to the server public RSA key in PEM format.",
    &opt_server_public_key, &opt_server_public_key, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -7199,7 +7261,7 @@ get_one_option(int optid, const struct my_option *opt, char *argument)
 {
   switch(optid) {
   case '#':
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_PUSH(argument ? argument : "d:t:S:i:O,/tmp/mysqltest.trace");
     debug_check_flag= 1;
 #endif
@@ -7216,7 +7278,7 @@ get_one_option(int optid, const struct my_option *opt, char *argument)
       argument= buff;
     }
     fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
-    DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);
+    assert(cur_file == file_stack && cur_file->file == 0);
     if (!(cur_file->file=
           fopen(buff, "rb")))
       die("Could not open '%s' for reading, errno: %d", buff, errno);
@@ -7840,7 +7902,7 @@ int append_warnings(DYNAMIC_STRING *ds, MYSQL* mysql)
     through PS API we should not issue SHOW WARNINGS until
     we have not read all results...
   */
-  DBUG_ASSERT(!mysql_more_results(mysql));
+  assert(!mysql_more_results(mysql));
 
   if (mysql_real_query(mysql, "SHOW WARNINGS", 13))
     die("Error running query \"SHOW WARNINGS\": %s", mysql_error(mysql));
@@ -7981,7 +8043,7 @@ void run_query_normal(struct st_connection *cn, struct st_command *command,
 		 mysql_sqlstate(mysql), ds);
     goto end;
   }
-  DBUG_ASSERT(err == -1); /* Successful and there are no more results */
+  assert(err == -1); /* Successful and there are no more results */
 
   /* If we come here the query is both executed and read successfully */
   handle_no_error(command);
@@ -8224,8 +8286,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
   /* Init dynamic strings for warnings */
   if (!disable_warnings)
   {
-    init_dynamic_string(&ds_prepare_warnings, NULL, 0, 256);
-    init_dynamic_string(&ds_execute_warnings, NULL, 0, 256);
+    init_dynamic_string(&ds_prepare_warnings, "", 0, 256);
+    init_dynamic_string(&ds_execute_warnings, "", 0, 256);
   }
 
   /*
@@ -8327,13 +8389,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
       append_stmt_result(ds, stmt, fields, num_fields);
 
       mysql_free_result(res);     /* Free normal result set with meta data */
-
-      /*
-        Clear prepare warnings if there are execute warnings,
-        since they are probably duplicated.
-      */
-      if (ds_execute_warnings.length || mysql->warning_count)
-        dynstr_set(&ds_prepare_warnings, NULL);
     }
     else
     {
@@ -8368,8 +8423,26 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
           dynstr_append_mem(ds, ds_warnings->str,
                             ds_warnings->length);
         if (ds_prepare_warnings.length)
-          dynstr_append_mem(ds, ds_prepare_warnings.str,
-                            ds_prepare_warnings.length);
+        {
+          /* Split the string to get each warning */
+          std::stringstream prepare_warnings(ds_prepare_warnings.str);
+          std::string prepare_warning;
+          /*
+            If the warning is already present in the execute phase,
+            do not append it
+          */
+          while (std::getline(prepare_warnings, prepare_warning))
+          {
+            std::string execute_warnings(ds_execute_warnings.str);
+            if ((execute_warnings + "\n").find(prepare_warning + "\n") ==
+                std::string::npos)
+            {
+              dynstr_append_mem(ds, prepare_warning.c_str(),
+                                prepare_warning.length());
+              dynstr_append_mem(ds, "\n", 1);
+            }
+          }
+        }
         if (ds_execute_warnings.length)
           dynstr_append_mem(ds, ds_execute_warnings.str,
                             ds_execute_warnings.length);
@@ -8755,7 +8828,8 @@ void run_explain(struct st_connection *cn, struct st_command *command,
 char *re_eprint(int err)
 {
   static char epbuf[100];
-  size_t len= my_regerror(MY_REG_ITOA | err, NULL, epbuf, sizeof(epbuf));
+  size_t len MY_ATTRIBUTE((unused))
+      = my_regerror(MY_REG_ITOA | err, NULL, epbuf, sizeof(epbuf));
   assert(len <= sizeof(epbuf));
   return(epbuf);
 }
@@ -9638,7 +9712,11 @@ int main(int argc, char **argv)
         break;
       case Q_EXEC:
       case Q_EXECW:
-	do_exec(command);
+	do_exec(command, false);
+	command_executed++;
+	break;
+      case Q_EXEC_BACKGROUND:
+	do_exec(command, true);
 	command_executed++;
 	break;
       case Q_START_TIMER:
@@ -10223,7 +10301,7 @@ void replace_strings_append(REPLACE *rep, DYNAMIC_STRING* ds,
       DBUG_PRINT("exit", ("Found end of from string"));
       DBUG_VOID_RETURN;
     }
-    DBUG_ASSERT(from <= str+len);
+    assert(from <= str+len);
     start= from;
     rep_pos=rep;
   }
diff --git a/client/path.cc b/client/path.cc
index 2474379a9dc2..436096b7f5d6 100644
--- a/client/path.cc
+++ b/client/path.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/path.h b/client/path.h
index 0f7858219bda..2b1b784e12cd 100644
--- a/client/path.h
+++ b/client/path.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/readline.cc b/client/readline.cc
index 059a18d5adca..7fe72f9919e1 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/client/upgrade/program.cc b/client/upgrade/program.cc
index 270615119d72..61241f3211db 100644
--- a/client/upgrade/program.cc
+++ b/client/upgrade/program.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake
index 9678b5423092..0e3cd963fcce 100644
--- a/cmake/abi_check.cmake
+++ b/cmake/abi_check.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/bison.cmake b/cmake/bison.cmake
index d3a729d17a71..ff01108c5042 100644
--- a/cmake/bison.cmake
+++ b/cmake/bison.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/boost.cmake b/cmake/boost.cmake
index f807897b976f..724db7ee0742 100644
--- a/cmake/boost.cmake
+++ b/cmake/boost.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
index f607508c8140..77002904e3f3 100644
--- a/cmake/build_configurations/compiler_options.cmake
+++ b/cmake/build_configurations/compiler_options.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -28,12 +35,18 @@ ENDIF()
 # Compiler options
 IF(UNIX)  
 
+  IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+    SET(SECTIONS_FLAG "-ffunction-sections -fdata-sections")
+  ELSE()
+    SET(SECTIONS_FLAG)
+  ENDIF()
+
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
-      SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
+      STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
     ENDIF()
     # Disable expensive-optimization if shift-or-optimization bug effective
     IF(HAVE_C_SHIFT_OR_OPTIMIZATION_BUG)
@@ -50,20 +63,21 @@ IF(UNIX)
     IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
       SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
     ENDIF()
-    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+    IF(NOT DISABLE_SHARED)
+      STRING_PREPEND(COMMON_C_FLAGS  "-fPIC ")
+    ENDIF()
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_CXX_FLAGS               "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
     # GCC 6 has C++14 as default, set it explicitly to the old default.
     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
                     OUTPUT_VARIABLE GXX_VERSION)
     IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
-      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -std=gnu++03")
+      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
     ENDIF()
     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
-      SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
+      STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ")
     ENDIF()
     # Disable expensive-optimization if shift-or-optimization bug effective
     IF(HAVE_CXX_SHIFT_OR_OPTIMIZATION_BUG)
@@ -72,73 +86,115 @@ IF(UNIX)
     # Disable floating point expression contractions to avoid result differences
     IF(HAVE_CXX_FLOATING_POINT_FUSED_MADD)
       IF(HAVE_CXX_FP_CONTRACT_FLAG)
-	SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -ffp-contract=off")
+	STRING_APPEND(COMMON_CXX_FLAGS " -ffp-contract=off")
       ELSE()
         SET(CXX_NO_EXPENSIVE_OPTIMIZATIONS TRUE)
       ENDIF()
     ENDIF()
     IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS)
-      SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations")
+      STRING_APPEND(COMMON_CXX_FLAGS " -fno-expensive-optimizations")
     ENDIF()
-    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
+    IF(NOT DISABLE_SHARED)
+      STRING_PREPEND(COMMON_CXX_FLAGS "-fPIC ")
+    ENDIF()
+
   ENDIF()
 
   # Default Clang flags
   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+    SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
+    IF(NOT DISABLE_SHARED)
+      STRING_PREPEND(COMMON_C_FLAGS  "-fPIC ")
+    ENDIF()
   ENDIF()
   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
+    SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
+        CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+      IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
+      ENDIF()
+    ENDIF()
+    IF(NOT DISABLE_SHARED)
+      STRING_PREPEND(COMMON_CXX_FLAGS  "-fPIC ")
+    ENDIF()
   ENDIF()
 
   # Solaris flags
   IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    IF(CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9")
-      # Link mysqld with mtmalloc on Solaris 10 and later
-      SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "")
-    ENDIF() 
+    # Link mysqld with mtmalloc on Solaris 10 and later
+    SET(WITH_MYSQLD_LDFLAGS "-lmtmalloc" CACHE STRING "")
+
     # Possible changes to the defaults set above for gcc/linux.
     # Vectorized code dumps core in 32bit mode.
     IF(CMAKE_COMPILER_IS_GNUCC AND 32BIT)
       CHECK_C_COMPILER_FLAG("-ftree-vectorize" HAVE_C_FTREE_VECTORIZE)
       IF(HAVE_C_FTREE_VECTORIZE)
-        SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-tree-vectorize")
+        STRING_APPEND(COMMON_C_FLAGS " -fno-tree-vectorize")
       ENDIF()
     ENDIF()
     IF(CMAKE_COMPILER_IS_GNUCXX AND 32BIT)
       CHECK_CXX_COMPILER_FLAG("-ftree-vectorize" HAVE_CXX_FTREE_VECTORIZE)
       IF(HAVE_CXX_FTREE_VECTORIZE)
-        SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-tree-vectorize")
+        STRING_APPEND(COMMON_CXX_FLAGS " -fno-tree-vectorize")
       ENDIF()
     ENDIF()
 
     IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-      IF(DEFINED CC_MINOR_VERSION AND CC_MINOR_VERSION GREATER 12)
-        SET(SUNPRO_FLAGS     "-xdebuginfo=no%decl")
-      ENDIF()
+      # Reduce size of debug binaries, by omitting function declarations.
+      SET(SUNPRO_FLAGS     "-xdebuginfo=no%decl")
       SET(SUNPRO_FLAGS     "${SUNPRO_FLAGS} -xbuiltin=%all")
       SET(SUNPRO_FLAGS     "${SUNPRO_FLAGS} -xlibmil")
       # Link with the libatomic library in /usr/lib
       # This prevents dependencies on libstatomic
       # This was introduced with developerstudio12.5
-      IF(CC_MINOR_VERSION GREATER 13)
-        SET(SUNPRO_FLAGS   "${SUNPRO_FLAGS} -xatomic=gcc")
-      ENDIF()
+      SET(SUNPRO_FLAGS     "${SUNPRO_FLAGS} -xatomic=gcc")
+
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(SUNPRO_FLAGS   "${SUNPRO_FLAGS} -nofstore")
       ENDIF()
 
       SET(COMMON_C_FLAGS            "-g ${SUNPRO_FLAGS}")
-      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS}")
-      SET(CMAKE_C_FLAGS_DEBUG       "${COMMON_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS_DEBUG     "${COMMON_CXX_FLAGS}")
-      SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO3 ${COMMON_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
+      SET(COMMON_CXX_FLAGS          "-g0 ${SUNPRO_FLAGS} -std=c++03")
+      # For SunPro, append our own flags rather than prepending below.
+      # We need -g0 and the misc -x flags above to reduce the size of binaries.
+      STRING_APPEND(CMAKE_C_FLAGS_DEBUG            " ${COMMON_C_FLAGS}")
+      STRING_APPEND(CMAKE_CXX_FLAGS_DEBUG          " ${COMMON_CXX_FLAGS}")
+      STRING_APPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   " -xO3 ${COMMON_C_FLAGS}")
+      STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}")
+      STRING_APPEND(CMAKE_C_FLAGS_RELEASE          " -xO3 ${COMMON_C_FLAGS}")
+      STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE        " -xO3 ${COMMON_CXX_FLAGS}")
+      STRING_APPEND(CMAKE_C_FLAGS_MINSIZEREL       " -xO3 ${COMMON_C_FLAGS}")
+      STRING_APPEND(CMAKE_CXX_FLAGS_MINSIZEREL     " -xO3 ${COMMON_CXX_FLAGS}")
+      SET(COMMON_C_FLAGS "")
+      SET(COMMON_CXX_FLAGS "")
     ENDIF()
   ENDIF()
+
+  # Use STRING_PREPEND here, so command-line input can override our defaults.
+  STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")
+  STRING_PREPEND(CMAKE_C_FLAGS_RELWITHDEBINFO   "${SECTIONS_FLAG} ")
+  STRING_PREPEND(CMAKE_C_FLAGS_RELEASE          "${SECTIONS_FLAG} ")
+  STRING_PREPEND(CMAKE_C_FLAGS_MINSIZEREL       "${SECTIONS_FLAG} ")
+
+  STRING_PREPEND(CMAKE_CXX_FLAGS                "${COMMON_CXX_FLAGS} ")
+  STRING_PREPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${SECTIONS_FLAG} ")
+  STRING_PREPEND(CMAKE_CXX_FLAGS_RELEASE        "${SECTIONS_FLAG} ")
+  STRING_PREPEND(CMAKE_CXX_FLAGS_MINSIZEREL     "${SECTIONS_FLAG} ")
+
+  # We need -O3 by default for RelWithDebInfo in order to avoid
+  # performance regressions from earlier releases.
+  # To disable this (and everything else in this file),
+  # do 'cmake -DWITH_DEFAULT_COMPILER_OPTIONS=NO'.
+  IF(LINUX)
+    FOREACH(flag
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_RELWITHDEBINFO
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        )
+      STRING(REPLACE "-O2"  "-O3" "${flag}" "${${flag}}")
+    ENDFOREACH()
+  ENDIF()
+
 ENDIF()
diff --git a/cmake/build_configurations/feature_set.cmake b/cmake/build_configurations/feature_set.cmake
index 8b5322eb1143..6dd03dc63748 100644
--- a/cmake/build_configurations/feature_set.cmake
+++ b/cmake/build_configurations/feature_set.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -44,5 +51,9 @@ IF(FEATURE_SET AND NOT WITHOUT_SERVER)
   ENDFOREACH()
 ENDIF()
 
-SET(WITH_SSL bundled CACHE STRING "")
-SET(WITH_ZLIB bundled CACHE STRING "")
+IF(NOT WITH_SSL)
+  SET(WITH_SSL system CACHE STRING "")
+ENDIF()
+IF(NOT WITH_ZLIB)
+  SET(WITH_ZLIB bundled CACHE STRING "")
+ENDIF()
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index d371c29ea920..33c24ff5e548 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -51,13 +58,3 @@ IF(UNIX)
 
 ENDIF()
 
-# Release builds on Solaris need to do an extra build to compile the
-# client libraries with Sun Studio. The release build script will replace
-# those libraries and the corresponding mysql_config before making the
-# final package.
-# But *this* mysql_config is still relevant for the embedded library
-# which will not be rebuilt, so we ensure we make a copy of it.
-
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
-  SET(COPY_MYSQL_CONFIG 1 CACHE BOOL "")
-ENDIF()
diff --git a/cmake/cat.cmake b/cmake/cat.cmake
index 1ffe2ecfa1dc..394087f188e5 100644
--- a/cmake/cat.cmake
+++ b/cmake/cat.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake
index 2dd259c55123..09f1fb97ffab 100644
--- a/cmake/character_sets.cmake
+++ b/cmake/character_sets.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/check_minimal_version.cmake b/cmake/check_minimal_version.cmake
index d96c6a934187..1fba937d4dda 100644
--- a/cmake/check_minimal_version.cmake
+++ b/cmake/check_minimal_version.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/cmake_parse_arguments.cmake b/cmake/cmake_parse_arguments.cmake
index 487fe2bacd92..aeeaf7bc12a9 100644
--- a/cmake/cmake_parse_arguments.cmake
+++ b/cmake/cmake_parse_arguments.cmake
@@ -1,15 +1,22 @@
 
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake
index b39bf7b79d65..6b247394aee8 100644
--- a/cmake/compile_flags.cmake
+++ b/cmake/compile_flags.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/cmake/compiler_bugs.cmake b/cmake/compiler_bugs.cmake
index 80df99387ab6..8714fa33edbe 100644
--- a/cmake/compiler_bugs.cmake
+++ b/cmake/compiler_bugs.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/configure.pl b/cmake/configure.pl
index 28da0f11332d..36e0403bdb80 100644
--- a/cmake/configure.pl
+++ b/cmake/configure.pl
@@ -1,16 +1,23 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/cmake/cpack_source_ignore_files.cmake b/cmake/cpack_source_ignore_files.cmake
index 7c0b9d5b7976..76b76221d14d 100644
--- a/cmake/cpack_source_ignore_files.cmake
+++ b/cmake/cpack_source_ignore_files.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/cpu_info.cmake b/cmake/cpu_info.cmake
index 9d5f321beb13..dc86cd2ac725 100644
--- a/cmake/cpu_info.cmake
+++ b/cmake/cpu_info.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/curl.cmake b/cmake/curl.cmake
index bb849058f8a9..e5e04f6328a9 100644
--- a/cmake/curl.cmake
+++ b/cmake/curl.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -27,16 +34,37 @@ MACRO(MYSQL_CHECK_CURL)
      ENDIF()
      MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}")
    ELSEIF(WITH_CURL)
+    # Explicit path given. Normalize path for the following regex replace.
+    FILE(TO_CMAKE_PATH "${WITH_CURL}" WITH_CURL)
+    # Pushbuild adds /lib to the CURL path
+    STRING(REGEX REPLACE "/lib$" "" WITH_CURL "${WITH_CURL}")
+
     LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
     FIND_LIBRARY(CURL_LIBRARY
       NAMES curl
-      PATHS ${WITH_CURL}
+      PATHS ${WITH_CURL} ${WITH_CURL}/lib
       NO_DEFAULT_PATH
       NO_CMAKE_ENVIRONMENT_PATH
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+    IF(NOT CURL_LIBRARY)
+      MESSAGE(FATAL_ERROR "CURL library not found under '${WITH_CURL}'")
+    ENDIF()
+
+    FIND_PATH(CURL_INCLUDE_DIR
+      NAMES curl/curl.h
+      PATHS ${WITH_CURL} ${WITH_CURL}/include
+      NO_DEFAULT_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      NO_SYSTEM_ENVIRONMENT_PATH
+      )
+    IF(NOT CURL_INCLUDE_DIR)
+      MESSAGE(FATAL_ERROR "CURL include files not found under '${WITH_CURL}'")
+    ENDIF()
+
     MESSAGE(STATUS "CURL_LIBRARY = ${CURL_LIBRARY}")
+    MESSAGE(STATUS "CURL_INCLUDE_DIR = ${CURL_INCLUDE_DIR}")
    ELSE()
      MESSAGE(STATUS
        "You need to set WITH_CURL. This"
diff --git a/cmake/do_abi_check.cmake b/cmake/do_abi_check.cmake
index 91de33613bcc..0934c3ab7c96 100644
--- a/cmake/do_abi_check.cmake
+++ b/cmake/do_abi_check.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
index 80050b931f2e..8d40c24f9acd 100644
--- a/cmake/dtrace.cmake
+++ b/cmake/dtrace.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -15,30 +22,52 @@
 
 # Check if OS supports DTrace
 MACRO(CHECK_DTRACE)
- FIND_PROGRAM(DTRACE dtrace)
- MARK_AS_ADVANCED(DTRACE)
+  IF(DEFINED ENABLE_DTRACE AND NOT ENABLE_DTRACE)
+    MESSAGE(STATUS "DTRACE is disabled")
+  ELSE()
+    FIND_PROGRAM(DTRACE dtrace)
+    MARK_AS_ADVANCED(DTRACE)
 
- # On FreeBSD, dtrace does not handle userland tracing yet
- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-   SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
- ENDIF()
- SET(HAVE_DTRACE ${ENABLE_DTRACE})
- EXECUTE_PROCESS(
-   COMMAND ${DTRACE} -V
-   OUTPUT_VARIABLE out)
- IF(out MATCHES "Sun D" OR out MATCHES "Oracle D")
-   IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND
-      NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-     SET(HAVE_REAL_DTRACE_INSTRUMENTING ON CACHE BOOL "Real DTrace detected")
-   ENDIF()
- ENDIF()
- IF(HAVE_REAL_DTRACE_INSTRUMENTING)
-   IF(SIZEOF_VOIDP EQUAL 4)
-     SET(DTRACE_FLAGS -32 CACHE INTERNAL "DTrace architecture flags")
-   ELSE()
-     SET(DTRACE_FLAGS -64 CACHE INTERNAL "DTrace architecture flags")
-   ENDIF()
- ENDIF()
+    IF(DTRACE)
+      EXECUTE_PROCESS(
+        COMMAND ${DTRACE} -V
+        OUTPUT_VARIABLE out)
+      IF(out MATCHES "Sun D" OR out MATCHES "Oracle D")
+        IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND
+            NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+          SET(HAVE_REAL_DTRACE_INSTRUMENTING ON CACHE BOOL "Real DTrace detected")
+        ENDIF()
+      ENDIF()
+    ENDIF()
+
+    # On FreeBSD, dtrace does not handle userland tracing yet
+    IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+      # We do not support DTrace 2.0 on Linux
+      IF(LINUX AND HAVE_REAL_DTRACE_INSTRUMENTING)
+        # Break the build if ENABLE_DTRACE set explicitly.
+        IF(DEFINED ENABLE_DTRACE AND ENABLE_DTRACE)
+          MESSAGE(FATAL_ERROR "Found unsupported dtrace at ${DTRACE}\n ${out}")
+        ELSE()
+          MESSAGE(WARNING "Found unsupported dtrace at ${DTRACE}\n ${out}")
+          SET(HAVE_REAL_DTRACE_INSTRUMENTING OFF CACHE BOOL "")
+          SET(ENABLE_DTRACE OFF CACHE BOOL "Enable dtrace")
+        ENDIF()
+      ELSE()
+        SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+        MESSAGE(STATUS "DTRACE is enabled")
+      ENDIF()
+    ENDIF()
+    SET(HAVE_DTRACE ${ENABLE_DTRACE})
+
+    IF(HAVE_REAL_DTRACE_INSTRUMENTING)
+      IF(SIZEOF_VOIDP EQUAL 4)
+        SET(DTRACE_FLAGS -32 CACHE INTERNAL "DTrace architecture flags")
+      ELSE()
+        SET(DTRACE_FLAGS -64 CACHE INTERNAL "DTrace architecture flags")
+      ENDIF()
+    ENDIF()
+
+  ENDIF()
 ENDMACRO()
 
 CHECK_DTRACE()
diff --git a/cmake/dtrace_prelink.cmake b/cmake/dtrace_prelink.cmake
index 0efc2bb64bbc..b6198e7fee8b 100644
--- a/cmake/dtrace_prelink.cmake
+++ b/cmake/dtrace_prelink.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/floating_point.cmake b/cmake/floating_point.cmake
index 719ce36d253a..d032f38871f5 100644
--- a/cmake/floating_point.cmake
+++ b/cmake/floating_point.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/info_bin.cmake b/cmake/info_bin.cmake
index 9cec3de0e0f6..a62f9eeeecc9 100644
--- a/cmake/info_bin.cmake
+++ b/cmake/info_bin.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in
index fc2f8849337a..386418694ea7 100644
--- a/cmake/info_macros.cmake.in
+++ b/cmake/info_macros.cmake.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/info_src.cmake b/cmake/info_src.cmake
index ce9873cc9d0d..10c3cee4be69 100644
--- a/cmake/info_src.cmake
+++ b/cmake/info_src.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 4dcca6809b69..294f7fa4c189 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index 2677343097f4..ba1748cb69f5 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -16,10 +23,10 @@
 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake)
 
+# For windows: install .pdf file for each target.
 MACRO (INSTALL_DEBUG_SYMBOLS targets)
   IF(MSVC)
   FOREACH(target ${targets})
-    GET_TARGET_PROPERTY(location ${target} LOCATION)
     GET_TARGET_PROPERTY(type ${target} TYPE)
     IF(NOT INSTALL_LOCATION)
       IF(type MATCHES "STATIC_LIBRARY"
@@ -33,22 +40,16 @@ MACRO (INSTALL_DEBUG_SYMBOLS targets)
           "cannot determine type of ${target}. Don't now where to install")
      ENDIF()
     ENDIF()
-    STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
-    STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
-    STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
-    IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      STRING(REPLACE
-        "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
-        pdb_location ${pdb_location})
-    ENDIF()
+
     IF(target STREQUAL "mysqld")
-	  SET(comp Server)
+      SET(comp Server)
     ELSE()
       SET(comp Debuginfo)
-    ENDIF()	  
+    ENDIF()
+
     # No .pdb file for static libraries.
     IF(NOT type MATCHES "STATIC_LIBRARY")
-      INSTALL(FILES ${pdb_location}
+      INSTALL(FILES $<TARGET_PDB_FILE:${target}>
         DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
     ENDIF()
   ENDFOREACH()
@@ -110,41 +111,112 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
   SET(INSTALL_LOCATION)
 ENDFUNCTION()
 
-# Optionally install mysqld/client/embedded from debug build run. outside of the current build dir 
+# Optionally install mysqld/client/embedded from debug build run.
+# outside of the current build dir
 # (unless multi-config generator is used like Visual Studio or Xcode). 
 # For single-config generators like Makefile generators we default Debug
 # build directory to ${buildroot}/../debug.
 GET_FILENAME_COMPONENT(BINARY_PARENTDIR ${CMAKE_BINARY_DIR} PATH)
-SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug build")
+SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL
+  "Directory of debug build")
 
 
 FUNCTION(INSTALL_DEBUG_TARGET target)
- MYSQL_PARSE_ARGUMENTS(ARG
-  "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT;SUFFIX"
-  ""
-  ${ARGN}
-  )
+  MYSQL_PARSE_ARGUMENTS(ARG
+    "DESTINATION;RENAME;COMPONENT"
+    ""
+    ${ARGN}
+    )
+
+  # Relevant only for RelWithDebInfo builds
+  IF(BUILD_IS_SINGLE_CONFIG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+    RETURN()
+  ENDIF()
+
   GET_TARGET_PROPERTY(target_type ${target} TYPE)
+  GET_TARGET_PROPERTY(target_name ${target} DEBUG_OUTPUT_NAME)
+  IF(NOT target_name)
+    GET_TARGET_PROPERTY(target_name ${target} OUTPUT_NAME)
+    IF(NOT target_name)
+      SET(target_name "${target}")
+    ENDIF()
+  ENDIF()
+
+  # On windows we install client libraries
+  IF(target_type STREQUAL "STATIC_LIBRARY")
+    SET(debug_target_location
+      "${CMAKE_BINARY_DIR}/archive_output_directory/Debug/${target_name}.lib")
+    # On UNIX we install mysqlserver which has name libmysqld.a
+    IF(UNIX)
+      IF(BUILD_IS_SINGLE_CONFIG)
+        SET(debug_target_location
+          "${DEBUGBUILDDIR}/archive_output_directory/lib${target_name}.a")
+      ELSE()
+        SET(debug_target_location
+          "${CMAKE_BINARY_DIR}/archive_output_directory/Debug/lib${target_name}.a")
+      ENDIF()
+      MESSAGE(STATUS
+        "library target ${target} debug_target ${debug_target_location}")
+    ENDIF()
+  # mysqld or mysqld-debug
+  ELSEIF(target_type STREQUAL "EXECUTABLE")
+    GET_TARGET_PROPERTY(runtime_output_directory ${target}
+      RUNTIME_OUTPUT_DIRECTORY)
+    IF(NOT runtime_output_directory)
+      MESSAGE(FATAL_ERROR "unknown executable!!")
+    ENDIF()
+
+    STRING(REPLACE
+      "${CMAKE_BINARY_DIR}/" "" RELATIVE_DIR ${runtime_output_directory})
+
+    SET(EXE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}")
+    IF(BUILD_IS_SINGLE_CONFIG)
+      SET(debug_target_location
+        "${DEBUGBUILDDIR}/${RELATIVE_DIR}/${target_name}${EXE_SUFFIX}")
+    ELSE()
+      SET(debug_target_location
+        "${CMAKE_BINARY_DIR}/${RELATIVE_DIR}/Debug/${target_name}${EXE_SUFFIX}")
+    ENDIF()
+    MESSAGE(STATUS
+      "executable target ${target} debug_target ${debug_target_location}")
+
+  # Plugins and components
+  ELSEIF(target_type STREQUAL "MODULE_LIBRARY")
+    SET(DLL_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    IF(APPLE)
+      SET(DLL_SUFFIX ".so") # we do not use .dylib
+    ENDIF()
+    GET_TARGET_PROPERTY(
+      target_output_directory ${target}  LIBRARY_OUTPUT_DIRECTORY)
+    IF(NOT target_output_directory)
+      MESSAGE(FATAL_ERROR "unknown module!!")
+    ENDIF()
+
+    STRING(REPLACE
+      "${CMAKE_BINARY_DIR}/" "" RELATIVE_DIR ${target_output_directory})
+
+    IF(BUILD_IS_SINGLE_CONFIG)
+      SET(debug_target_location
+        "${DEBUGBUILDDIR}/${RELATIVE_DIR}/${target_name}${DLL_SUFFIX}")
+    ELSE()
+      SET(debug_target_location
+        "${CMAKE_BINARY_DIR}/${RELATIVE_DIR}/Debug/${target_name}${DLL_SUFFIX}")
+    ENDIF()
+    # MESSAGE(STATUS
+    # "module target ${target} debug_target ${debug_target_location}")
+  ENDIF()
+
+  # This is only used for mysqld / mysqld-debug / libmysqlserver.a
   IF(ARG_RENAME)
-    SET(RENAME_PARAM RENAME ${ARG_RENAME}${CMAKE_${target_type}_SUFFIX})
+    SET(RENAME_PARAM RENAME ${ARG_RENAME})
   ELSE()
     SET(RENAME_PARAM)
   ENDIF()
+
   IF(NOT ARG_DESTINATION)
     MESSAGE(FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET")
   ENDIF()
-  GET_TARGET_PROPERTY(target_location ${target} LOCATION)
-  IF(BUILD_IS_SINGLE_CONFIG)
-   STRING(REPLACE "${CMAKE_BINARY_DIR}" "${DEBUGBUILDDIR}"  debug_target_location "${target_location}")
-  ELSE()
-   STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug"  debug_target_location "${target_location}" )
-  ENDIF()
-  IF(ARG_SUFFIX) 
-    GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
-    GET_FILENAME_COMPONENT(fn  ${debug_target_location} NAME_WE)
-    STRING(REPLACE "${fn}${ext}" "${fn}${ARG_SUFFIX}${ext}"
-           debug_target_location "${debug_target_location}" )
-  ENDIF()
+
   IF(NOT ARG_COMPONENT)
     SET(ARG_COMPONENT DebugBinaries)
   ENDIF()
@@ -187,20 +259,18 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
     COMPONENT ${ARG_COMPONENT}
     OPTIONAL)
 
-  IF(MSVC)
+  # For windows, install .pdb files for .exe and .dll files.
+  IF(MSVC AND NOT target_type STREQUAL "STATIC_LIBRARY")
     GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
-    STRING(REPLACE "${ext}" ".pdb"  debug_pdb_target_location "${debug_target_location}" )
+    STRING(REPLACE "${ext}" ".pdb"
+      debug_pdb_target_location "${debug_target_location}" )
     IF (RENAME_PARAM)
-      IF(NOT ARG_PDB_DESTINATION)
-        STRING(REPLACE "${ext}" ".pdb"  "${ARG_RENAME}" pdb_rename)
-        SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
-      ENDIF()
-    ENDIF()
-    IF(NOT ARG_PDB_DESTINATION)
-      SET(ARG_PDB_DESTINATION "${ARG_DESTINATION}")
+      STRING(REPLACE "${ext}" ".pdb"  pdb_rename "${ARG_RENAME}")
+      SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
     ENDIF()
+
     INSTALL(FILES ${debug_pdb_target_location}
-      DESTINATION ${ARG_PDB_DESTINATION}
+      DESTINATION ${ARG_DESTINATION}
       ${PDB_RENAME_PARAM}
       CONFIGURATIONS Release RelWithDebInfo
       COMPONENT ${ARG_COMPONENT}
diff --git a/cmake/ldap.cmake b/cmake/ldap.cmake
new file mode 100644
index 000000000000..f757fa0c49b3
--- /dev/null
+++ b/cmake/ldap.cmake
@@ -0,0 +1,150 @@
+# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+# cmake -DWITH_LDAP=system|</path/to/custom/installation>
+# system is the default
+
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFiles)
+
+SET(WITH_LDAP_DOC "\nsystem (use the OS ldap library)")
+STRING_APPEND(WITH_LDAP_DOC ", \n</path/to/custom/installation>")
+
+STRING(REPLACE "\n" "| " WITH_LDAP_DOC_STRING "${WITH_LDAP_DOC}")
+
+MACRO(FIND_SYSTEM_LDAP)
+  IF(WIN32)
+    SET(LDAP_SYSTEM_LIBRARY Wldap32 CACHE INTERNAL
+      "LDAP library is /c/Windows/system32/Wldap32.dll"
+      )
+  ELSE()
+    FIND_LIBRARY(LDAP_SYSTEM_LIBRARY
+      NAMES ldap_r ldap
+      )
+    FIND_LIBRARY(LBER_SYSTEM_LIBRARY
+      NAMES lber
+      )
+  ENDIF()
+  IF(LDAP_SYSTEM_LIBRARY AND (WIN32 OR LBER_SYSTEM_LIBRARY))
+    SET(LDAP_LIBRARY ${LDAP_SYSTEM_LIBRARY})
+    SET(LBER_LIBRARY ${LBER_SYSTEM_LIBRARY})
+    MESSAGE(STATUS "LBER_LIBRARY ${LBER_LIBRARY}")
+    MESSAGE(STATUS "LDAP_LIBRARY ${LDAP_LIBRARY}")
+  ENDIF()
+
+  IF(WIN32)
+    # LDAP system header is Winldap.h and is in some Windows SDK
+  ELSE()
+    CMAKE_PUSH_CHECK_STATE()
+
+    # For Solaris 11.3 we need to explicitly search here:
+    IF(SOLARIS)
+      INCLUDE_DIRECTORIES(BEFORE SYSTEM /usr/include/openldap)
+      SET(CMAKE_REQUIRED_INCLUDES "/usr/include/openldap")
+    ENDIF()
+
+    CHECK_INCLUDE_FILE(lber.h HAVE_LBER_H)
+    CHECK_INCLUDE_FILE(ldap.h HAVE_LDAP_H)
+    CMAKE_POP_CHECK_STATE()
+  ENDIF()
+
+ENDMACRO()
+
+MACRO(FIND_CUSTOM_LDAP)
+  FIND_PATH(LDAP_INCLUDE_DIR
+    NAMES ldap.h
+    PATHS ${WITH_LDAP_PATH}/include
+    NO_DEFAULT_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+    )
+
+  # On mac this list is <.dylib;.so;.a>
+  # We prefer static libraries, so we reverse it here.
+  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+
+  FIND_LIBRARY(LDAP_CUSTOM_LIBRARY
+    NAMES ldap_r ldap
+    PATHS ${WITH_LDAP_PATH}/lib
+    NO_DEFAULT_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+    )
+  FIND_LIBRARY(LBER_CUSTOM_LIBRARY
+    NAMES lber
+    PATHS ${WITH_LDAP_PATH}/lib
+    NO_DEFAULT_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+    )
+
+  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+
+  IF(LDAP_INCLUDE_DIR)
+    INCLUDE_DIRECTORIES(BEFORE SYSTEM ${LDAP_INCLUDE_DIR})
+
+    CMAKE_PUSH_CHECK_STATE()
+    SET(CMAKE_REQUIRED_INCLUDES ${LDAP_INCLUDE_DIR})
+    CHECK_INCLUDE_FILE(lber.h HAVE_LBER_H)
+    CHECK_INCLUDE_FILE(ldap.h HAVE_LDAP_H)
+    CMAKE_POP_CHECK_STATE()
+  ENDIF()
+
+  IF(LDAP_CUSTOM_LIBRARY AND LBER_CUSTOM_LIBRARY)
+    SET(LDAP_LIBRARY ${LDAP_CUSTOM_LIBRARY})
+    SET(LBER_LIBRARY ${LBER_CUSTOM_LIBRARY})
+    GET_FILENAME_COMPONENT(LDAP_LIBRARY_EXT ${LDAP_LIBRARY} EXT)
+    IF(LDAP_LIBRARY_EXT STREQUAL ".a")
+      SET(STATIC_LDAP_LIBRARY 1)
+    ENDIF()
+    MESSAGE(STATUS "LDAP_LIBRARY ${LDAP_LIBRARY}")
+    MESSAGE(STATUS "LBER_LIBRARY ${LBER_LIBRARY}")
+  ENDIF()
+ENDMACRO()
+
+MACRO(MYSQL_CHECK_LDAP)
+  IF(NOT WITH_LDAP)
+    SET(WITH_LDAP "system" CACHE STRING ${WITH_LDAP_DOC_STRING} FORCE)
+  ENDIF()
+
+  # See if WITH_LDAP is of the form </path/to/custom/installation>
+  FILE(GLOB WITH_LDAP_HEADER ${WITH_LDAP}/include/ldap.h)
+  IF (WITH_LDAP_HEADER)
+    FILE(TO_CMAKE_PATH "${WITH_LDAP}" WITH_LDAP)
+    SET(WITH_LDAP_PATH ${WITH_LDAP})
+  ENDIF()
+
+  IF(WITH_LDAP STREQUAL "system")
+    FIND_SYSTEM_LDAP()
+  ELSE()
+    FIND_CUSTOM_LDAP()
+  ENDIF()
+
+  IF(WIN32 AND WITH_LDAP STREQUAL "system")
+    SET(LDAP_FOUND 1)
+  ELSEIF(HAVE_LBER_H AND HAVE_LDAP_H AND LDAP_LIBRARY AND LBER_LIBRARY)
+    SET(LDAP_FOUND 1)
+  ELSE()
+    SET(LDAP_FOUND 0)
+  ENDIF()
+
+ENDMACRO()
diff --git a/cmake/libevent.cmake b/cmake/libevent.cmake
index f311243588fd..d658e98a8467 100644
--- a/cmake/libevent.cmake
+++ b/cmake/libevent.cmake
@@ -1,103 +1,134 @@
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
-
-MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
-  SET(LIBEVENT_LIBRARY  event)
-  SET(LIBEVENT_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/libevent)
-  SET(LIBEVENT_FOUND  TRUE)
-  ADD_DEFINITIONS("-DHAVE_LIBEVENT1")
-  SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent")
-  # Use EXCLUDE_FROM_ALL to build only if another component
-  # which dependens on libevent is built
-  ADD_SUBDIRECTORY(libevent EXCLUDE_FROM_ALL)
-  GET_TARGET_PROPERTY(src libevent SOURCES)
-  FOREACH(file ${src})
-    SET(LIBEVENT_SOURCES ${LIBEVENT_SOURCES} ${CMAKE_SOURCE_DIR}/libevent/${file})
-  ENDFOREACH()
-ENDMACRO()
-
-# MYSQL_CHECK_LIBEVENT
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+#
+# Usage:
+#  cmake -DWITH_LIBEVENT="bundled"|"system"
 #
-# Provides the following configure options:
-# WITH_LIBEVENT_BUNDLED
-# If this is set,we use bindled libevent
-# If this is not set,search for system libevent. 
-# if system libevent is not found, use bundled copy
-# LIBEVENT_LIBRARIES, LIBEVENT_INCLUDE_DIR and LIBEVENT_SOURCES
-# are set after this macro has run
+# Default is "bundled"
 
-MACRO (MYSQL_CHECK_LIBEVENT)
+# Router needs at least:
+SET(MIN_LIBEVENT_VERSION_REQUIRED "2.1")
 
-    IF (NOT WITH_LIBEVENT)
-      SET(WITH_LIBEVENT "bundled"  CACHE STRING "By default use bundled libevent on this platform")
-    ENDIF()
-  
-  IF(WITH_LIBEVENT STREQUAL "bundled")
-    MYSQL_USE_BUNDLED_LIBEVENT()
-  ELSEIF(WITH_LIBEVENT STREQUAL "system" OR WITH_LIBEVENT STREQUAL "yes")
-    SET(LIBEVENT_FIND_QUIETLY TRUE)
+MACRO(FIND_LIBEVENT_VERSION)
+  SET(TEST_SRC
+    "#include <event.h>
+     #include <stdio.h>
+    int main()
+    {
+      fprintf(stdout, \"%s\", LIBEVENT_VERSION);
+    }
+    "
+    )
+  FILE(WRITE
+    "${CMAKE_BINARY_DIR}/find_libevent_version.c"
+    "${TEST_SRC}"
+    )
+  TRY_RUN(TEST_RUN_RESULT COMPILE_TEST_RESULT
+    ${CMAKE_BINARY_DIR}
+    "${CMAKE_BINARY_DIR}/find_libevent_version.c"
+    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${LIBEVENT_INCLUDE_DIRS}"
+    COMPILE_OUTPUT_VARIABLE OUTPUT
+    RUN_OUTPUT_VARIABLE RUN_OUTPUT
+    )
+  # MESSAGE(STATUS "TRY_EVENT TEST_RUN_RESULT is ${TEST_RUN_RESULT}")
+  # MESSAGE(STATUS "TRY_EVENT COMPILE_TEST_RESULT is ${COMPILE_TEST_RESULT}")
+  # MESSAGE(STATUS "TRY_EVENT COMPILE_OUTPUT_VARIABLE is ${OUTPUT}")
+  # MESSAGE(STATUS "TRY_EVENT RUN_OUTPUT_VARIABLE is ${RUN_OUTPUT}")
 
-    IF (NOT LIBEVENT_INCLUDE_PATH)
-      set(LIBEVENT_INCLUDE_PATH /usr/local/include /opt/local/include)
-    ENDIF()
+  IF(COMPILE_TEST_RESULT)
+    SET(LIBEVENT_VERSION_STRING "${RUN_OUTPUT}")
+    STRING(REGEX REPLACE
+      "([.-0-9]+).*" "\\1" LIBEVENT_VERSION "${LIBEVENT_VERSION_STRING}")
+    MESSAGE(STATUS "LIBEVENT_VERSION_STRING ${LIBEVENT_VERSION_STRING}")
+    MESSAGE(STATUS "LIBEVENT_VERSION (${WITH_LIBEVENT}) ${LIBEVENT_VERSION}")
+  ELSE()
+    MESSAGE(WARNING "Could not determine LIBEVENT_VERSION")
+  ENDIF()
+ENDMACRO()
 
-    find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LIBEVENT_INCLUDE_PATH})
+MACRO (FIND_SYSTEM_LIBEVENT)
+  IF (NOT LIBEVENT_INCLUDE_PATH)
+    SET(LIBEVENT_INCLUDE_PATH /usr/local/include /opt/local/include)
+  ENDIF()
 
-    if (NOT LIBEVENT_INCLUDE_DIR)
-        MESSAGE(SEND_ERROR "Cannot find appropriate event.h in /usr/local/include or /opt/local/include. Use bundled libevent")
-    endif() 
+  FIND_PATH(LIBEVENT_INCLUDE_DIRECTORY event.h PATHS ${LIBEVENT_INCLUDE_PATH})
 
-    IF (NOT LIBEVENT_LIB_PATHS) 
-      set(LIBEVENT_LIB_PATHS /usr/local/lib /opt/local/lib)
-    ENDIF()
+  IF (NOT LIBEVENT_LIB_PATHS)
+    SET(LIBEVENT_LIB_PATHS /usr/local/lib /opt/local/lib)
+  ENDIF()
 
-    ## libevent.so is historical, use libevent_core.so if found.
-    find_library(LIBEVENT_CORE event_core PATHS ${LIBEVENT_LIB_PATHS})
-    find_library(LIBEVENT_LIB event PATHS ${LIBEVENT_LIB_PATHS})
+  FIND_LIBRARY(LIBEVENT_CORE event_core PATHS ${LIBEVENT_LIB_PATHS})
+  FIND_LIBRARY(LIBEVENT_EXTRA event_extra PATHS ${LIBEVENT_LIB_PATHS})
 
-    if (NOT LIBEVENT_LIB AND NOT LIBEVENT_CORE)
-        MESSAGE(SEND_ERROR "Cannot find appropriate event lib in /usr/local/lib or /opt/local/lib. Use bundled libevent")
-    endif() 
+  ## libevent_openssl.so is split out on Linux distros
+  FIND_LIBRARY(LIBEVENT_OPENSSL event_openssl PATHS ${LIBEVENT_LIB_PATHS})
 
-    IF ((LIBEVENT_LIB OR LIBEVENT_CORE) AND LIBEVENT_INCLUDE_DIR)
-      set(LIBEVENT_FOUND TRUE)
-      IF (LIBEVENT_CORE)
-        set(LIBEVENT_LIBS ${LIBEVENT_CORE})
-      ELSE()
-        set(LIBEVENT_LIBS ${LIBEVENT_LIB})
-      ENDIF()
-    ELSE()
-      set(LIBEVENT_FOUND FALSE)
+  IF (LIBEVENT_CORE AND LIBEVENT_INCLUDE_DIRECTORY)
+    SET(LIBEVENT_FOUND TRUE)
+    SET(LIBEVENT_LIBRARIES
+      ${LIBEVENT_CORE} ${LIBEVENT_EXTRA} ${LIBEVENT_OPENSSL})
+    SET(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIRECTORY})
+    IF(NOT LIBEVENT_INCLUDE_DIRECTORY STREQUAL "/usr/include")
+      MESSAGE(STATUS "LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIRS}")
+      # On FreeBSD this may interfere with BOOST_INCLUDE_DIR, so we rely on
+      # users of libevent doing MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT)
+      # INCLUDE_DIRECTORIES(AFTER SYSTEM ${LIBEVENT_INCLUDE_DIRS})
     ENDIF()
+  ENDIF()
+ENDMACRO()
 
-    IF(LIBEVENT_FOUND)
-      SET(LIBEVENT_SOURCES "")
-      SET(LIBEVENT_LIBRARIES ${LIBEVENT_LIBS})
-      SET(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
-      find_path(LIBEVENT2_INCLUDE_DIR event2 HINTS ${LIBEVENT_INCLUDE_PATH}/event)
-      IF (LIBEVENT2_INCLUDE_DIR)
-        ADD_DEFINITIONS("-DHAVE_LIBEVENT2")
-      ELSE()
-        ADD_DEFINITIONS("-DHAVE_LIBEVENT1")
-      ENDIF()
-    ELSE()
-      IF(WITH_LIBEVENT STREQUAL "system")
-        MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for libevent. Use bundled libevent")
-      ENDIF()
-      MYSQL_USE_BUNDLED_LIBEVENT()
-    ENDIF()
+MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
+  SET(LIBEVENT_LIBRARIES event_core event_extra event_openssl)
+  SET(LIBEVENT_BUNDLE_PATH "extra/libevent/libevent-2.1.11-stable")
+  SET(LIBEVENT_INCLUDE_DIRS
+    "${CMAKE_SOURCE_DIR}/${LIBEVENT_BUNDLE_PATH}/include"
+    "${CMAKE_BINARY_DIR}/${LIBEVENT_BUNDLE_PATH}/include")
+  SET(LIBEVENT_FOUND TRUE)
+  ADD_SUBDIRECTORY(${LIBEVENT_BUNDLE_PATH})
+ENDMACRO()
 
+MACRO (MYSQL_CHECK_LIBEVENT)
+
+  IF (NOT WITH_LIBEVENT)
+    SET(WITH_LIBEVENT "bundled"
+      CACHE STRING "By default use bundled libevent.")
+  ENDIF()
+  
+  IF(WITH_LIBEVENT STREQUAL "bundled")
+    MYSQL_USE_BUNDLED_LIBEVENT()
+  ELSEIF(WITH_LIBEVENT STREQUAL "system")
+    FIND_SYSTEM_LIBEVENT()
+    IF(NOT LIBEVENT_FOUND)
+      MESSAGE(FATAL_ERROR "Cannot find system libevent libraries.")
+    ENDIF()
+  ELSE()
+    MESSAGE(FATAL_ERROR "WITH_LIBEVENT must be bundled or system")
+  ENDIF()
+  FIND_LIBEVENT_VERSION()
+  IF(LIBEVENT_VERSION VERSION_LESS MIN_LIBEVENT_VERSION_REQUIRED)
+    MESSAGE(FATAL_ERROR
+      "LIBEVENT version must be at least ${MIN_LIBEVENT_VERSION_REQUIRED}, "
+      "found ${LIBEVENT_VERSION}.\nPlease use -DWITH_LIBEVENT=bundled")
   ENDIF()
+  SET(HAVE_LIBEVENT2 1)
+  SET(HAVE_LIBEVENT2 1 CACHE BOOL "")
 ENDMACRO()
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
index 573a5da03848..863f3e228c8d 100644
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -228,9 +235,6 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
   SET(LIBS ${ARG_DEFAULT_ARGS})
   LIST(REMOVE_AT LIBS 0)
 
-  MESSAGE(STATUS "MERGE_CONVENIENCE_LIBRARIES TARGET ${TARGET}")
-  MESSAGE(STATUS "MERGE_CONVENIENCE_LIBRARIES LIBS ${LIBS}")
-
   SET(SOURCE_FILE
     ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c)
   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
index 04d11b273b3f..f90467d85bb4 100644
--- a/cmake/lz4.cmake
+++ b/cmake/lz4.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
@@ -17,29 +24,38 @@
 # bundled is the default
 
 MACRO (FIND_SYSTEM_LZ4)
-  FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h)
-  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4)
-  IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY)
+  FIND_PATH(LZ4_INCLUDE_DIR
+    NAMES lz4frame.h)
+  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY
+    NAMES lz4)
+  IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY)
     SET(SYSTEM_LZ4_FOUND 1)
-    SET(LZ4_INCLUDE_DIR ${PATH_TO_LZ4})
     SET(LZ4_LIBRARY ${LZ4_SYSTEM_LIBRARY})
-    MESSAGE(STATUS "LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIR}")
-    MESSAGE(STATUS "LZ4_LIBRARY ${LZ4_LIBRARY}")
   ENDIF()
 ENDMACRO()
 
+SET(LZ4_VERSION "lz4-1.9.4")
+SET(BUNDLED_LZ4_PATH "${CMAKE_SOURCE_DIR}/extra/lz4/${LZ4_VERSION}/lib")
+
 MACRO (MYSQL_USE_BUNDLED_LZ4)
+  SET(WITH_LZ4 "bundled" CACHE STRING "Bundled lz4 library")
   SET(BUILD_BUNDLED_LZ4 1)
-  SET(LZ4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extra/lz4)
+  INCLUDE_DIRECTORIES(BEFORE SYSTEM ${BUNDLED_LZ4_PATH})
   SET(LZ4_LIBRARY lz4_lib)
+  ADD_CONVENIENCE_LIBRARY(lz4_lib
+    ${BUNDLED_LZ4_PATH}/lz4.c
+    ${BUNDLED_LZ4_PATH}/lz4frame.c
+    ${BUNDLED_LZ4_PATH}/lz4hc.c
+    ${BUNDLED_LZ4_PATH}/xxhash.c
+    )
 ENDMACRO()
 
-IF (NOT WITH_LZ4)
-  SET(WITH_LZ4 "bundled" CACHE STRING "By default use bundled lz4 library")
-ENDIF()
-
 MACRO (MYSQL_CHECK_LZ4)
-  IF (WITH_LZ4 STREQUAL "bundled")
+  IF(NOT WITH_LZ4)
+    SET(WITH_LZ4 "bundled" CACHE STRING "By default use bundled lz4 library")
+  ENDIF()
+
+  IF(WITH_LZ4 STREQUAL "bundled")
     MYSQL_USE_BUNDLED_LZ4()
   ELSEIF(WITH_LZ4 STREQUAL "system")
     FIND_SYSTEM_LZ4()
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
index 651be16a5df6..18d9f6f93cbf 100644
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -41,15 +48,15 @@ ENDIF()
 
 # Turn on Werror (warning => error) when using maintainer mode.
 IF(MYSQL_MAINTAINER_MODE)
-  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
-  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
+  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
 ENDIF()
 
 # Set warning flags for GCC/Clang
 IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
+  STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
 ENDIF()
 # Set warning flags for G++/Clang++
 IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}")
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${MY_CXX_WARNING_FLAGS}")
 ENDIF()
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in
index e22245e75841..c2e8507f3b34 100644
--- a/cmake/make_dist.cmake.in
+++ b/cmake/make_dist.cmake.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/merge_archives.cmake.in b/cmake/merge_archives.cmake.in
index d9a9550a8325..9a60d5c35f7f 100644
--- a/cmake/merge_archives.cmake.in
+++ b/cmake/merge_archives.cmake.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index bcbbe7d4931c..f1346ac6da49 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# 
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
+#
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -17,12 +24,11 @@
 # Usage (same as for standard CMake's ADD_EXECUTABLE)
 #
 # MYSQL_ADD_EXECUTABLE(target source1...sourceN)
-#
 # MySQL specifics:
-# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
+# - instruct CPack to install executable under
+#   ${CMAKE_INSTALL_PREFIX}/bin directory
 # On Windows :
 # - add version resource
-# - instruct CPack to do autenticode signing if SIGNCODE is set
 
 INCLUDE(cmake_parse_arguments)
 
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index f11a76678b8a..3d7c2dd80b1d 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake
index 04707663097d..ec159821d442 100644
--- a/cmake/os/Darwin.cmake
+++ b/cmake/os/Darwin.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -17,6 +24,10 @@
 
 INCLUDE(CheckCSourceRuns)
 
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+  SET(APPLE_ARM 1)
+ENDIF()
+
 # We require at least Clang 3.3 (XCode 5).
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake
index fc0843c24f29..bf2c57fc571b 100644
--- a/cmake/os/FreeBSD.cmake
+++ b/cmake/os/FreeBSD.cmake
@@ -1,23 +1,38 @@
-
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
 
-# This file includes FreeBSD specific options and quirks, related to system checks
+# This file includes FreeBSD specific options and quirks,
+# related to system checks
 
 INCLUDE(CheckCSourceRuns)
 
+SET(FREEBSD 1)
+
+# On FreeBSD some includes, e.g. sasl/sasl.h, is in /usr/local/include
+LIST(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
+# Do not INCLUDE_DIRECTORIES here, we need to do that *after* configuring boost,
+# in order to search include/boost_1_59_0/patches
+# INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
+
 # We require at least Clang 3.3.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
index b371d7d7ecc8..c9d169fe24c5 100644
--- a/cmake/os/Linux.cmake
+++ b/cmake/os/Linux.cmake
@@ -1,14 +1,21 @@
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -19,6 +26,8 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(CheckCSourceRuns)
 
+SET(LINUX 1)
+
 # We require at least GCC 4.4 or Clang 3.3.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake
index ded3095829ba..453f24ea2e97 100644
--- a/cmake/os/SunOS.cmake
+++ b/cmake/os/SunOS.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -18,13 +25,31 @@ INCLUDE(CheckCSourceRuns)
 INCLUDE(CheckCSourceCompiles) 
 INCLUDE(CheckCXXSourceCompiles)
 
-# We require at least GCC 4.4 or SunStudio 12u2 (CC 5.11)
+SET(SOLARIS 1)
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+  SET(SOLARIS_SPARC 1)
+ENDIF()
+
+IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
+  IF(NOT FORCE_UNSUPPORTED_COMPILER)
+    MESSAGE("Adding -m64")
+    STRING_APPEND(CMAKE_C_FLAGS        " -m64")
+    STRING_APPEND(CMAKE_CXX_FLAGS      " -m64")
+    STRING_APPEND(CMAKE_C_LINK_FLAGS   " -m64")
+    STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -m64")
+  ENDIF()
+ENDIF()
+
+INCLUDE(CheckTypeSize)
+CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
+
+# We require at least GCC 7.3 or SunStudio 12.2 (CC 5.14)
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_COMPILER_IS_GNUCC)
     EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                     OUTPUT_VARIABLE GCC_VERSION)
-    IF(GCC_VERSION VERSION_LESS 4.4)
-      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
+    IF(GCC_VERSION VERSION_LESS 7.3)
+      MESSAGE(FATAL_ERROR "GCC 7.3 or newer is required!")
     ENDIF()
   ELSEIF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
     # CC -V yields
@@ -44,8 +69,8 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
         VERSION_STRING ${stderr})
     ENDIF()
     SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
-    IF(${CC_MINOR_VERSION} LESS 11)
-      MESSAGE(FATAL_ERROR "SunStudio 12u2 or newer is required!")
+    IF(${CC_MINOR_VERSION} LESS 14)
+      MESSAGE(FATAL_ERROR "Oracle Studio 12.5 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")
@@ -175,6 +200,48 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
 ENDIF()
 
 # This is used for the version_compile_machine variable.
-IF(CMAKE_SIZEOF_VOID_P MATCHES 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+IF(SIZEOF_VOIDP MATCHES 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
   SET(MYSQL_MACHINE_TYPE "x86_64")
 ENDIF()
+
+
+MACRO(DIRNAME IN OUT)
+  GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
+ENDMACRO()
+
+# We assume that developer studio runtime libraries are installed.
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
+   CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
+
+  SET(LIBRARY_SUFFIX "lib/compilers/CC-gcc/lib")
+  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/sparcv9")
+  ENDIF()
+  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/amd64")
+  ENDIF()
+  FIND_LIBRARY(STL_LIBRARY_NAME
+    NAMES "stdc++"
+    PATHS ${CXX_PATH}/../${LIBRARY_SUFFIX}
+    NO_DEFAULT_PATH
+  )
+  MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
+  IF(STL_LIBRARY_NAME)
+    DIRNAME(${STL_LIBRARY_NAME} STL_LIBRARY_PATH)
+    SET(LRFLAGS " -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
+    SET(QUOTED_CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
+
+    STRING_APPEND(CMAKE_C_LINK_FLAGS          "${LRFLAGS}")
+    STRING_APPEND(CMAKE_CXX_LINK_FLAGS        "${LRFLAGS}")
+    STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   "${LRFLAGS}")
+    STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   "${LRFLAGS}")
+    STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS "${LRFLAGS}")
+  ENDIF()
+
+  STRING_APPEND(CMAKE_C_LINK_FLAGS          " -lc")
+  STRING_APPEND(CMAKE_CXX_LINK_FLAGS        " -lstdc++ -lgcc_s -lCrunG3 -lc")
+  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS   " -lstdc++ -lgcc_s -lCrunG3 -lc")
+  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS   " -lstdc++ -lgcc_s -lCrunG3 -lc")
+  STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS " -lstdc++ -lgcc_s -lCrunG3 -lc ")
+ENDIF()
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index f1498816d497..dbef87c409fc 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -30,8 +37,8 @@ INCLUDE (CheckTypeSize)
 INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL)
 
 # avoid running system checks by using pre-cached check results
-# system checks are expensive on VS since every tiny program is to be compiled in 
-# a VC solution.
+# system checks are expensive on VS since every tiny program is to be compiled
+# in a VC solution.
 GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmake)
 
@@ -88,6 +95,8 @@ IF(MSVC)
   #     information for use with the debugger. The symbolic debugging
   #     information includes the names and types of variables, as well as
   #     functions and line numbers. No .pdb file is produced by the compiler.
+  #     We can't use /ZI too since it's causing __LINE__ macros to be non-
+  #     constant on visual studio and hence XCom stops building correctly.
   # - Enable explicit inline:
   #     /Ob1
   #     Expands explicitly inlined functions. By default /Ob0 is used,
@@ -99,25 +108,29 @@ IF(MSVC)
     SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
   ENDFOREACH()
 
-    FOREACH(flag 
-     CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
-     CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
-     CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-     CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
-     IF(LINK_STATIC_RUNTIME_LIBRARIES)
-       STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
-     ENDIF()
-     STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
-     IF (NOT WIN_DEBUG_NO_INLINE)
-       STRING(REPLACE "/Ob0"  "/Ob1" "${flag}" "${${flag}}")
-     ENDIF()
-     SET("${flag}" "${${flag}} /EHsc")
-    ENDFOREACH()
+  FOREACH(flag 
+      CMAKE_C_FLAGS_MINSIZEREL
+      CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
+      CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
+      CMAKE_CXX_FLAGS_MINSIZEREL
+      CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
+      CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
+    IF(LINK_STATIC_RUNTIME_LIBRARIES)
+      STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+    ENDIF()
+    STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
+    STRING(REPLACE "/ZI"  "/Z7" "${flag}" "${${flag}}")
+    IF (NOT WIN_DEBUG_NO_INLINE)
+      STRING(REPLACE "/Ob0"  "/Ob1" "${flag}" "${${flag}}")
+    ENDIF()
+    SET("${flag}" "${${flag}} /EHsc")
+  ENDFOREACH()
   
-  # Fix CMake's predefined huge stack size
   FOREACH(type EXE SHARED MODULE)
-   STRING(REGEX REPLACE "/STACK:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS "${CMAKE_${type}_LINKER_FLAGS}")
-   STRING(REGEX REPLACE "/INCREMENTAL:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO}")
+    FOREACH(config DEBUG RELWITHDEBINFO RELEASE MINSIZEREL)
+      SET(flag "CMAKE_${type}_LINKER_FLAGS_${config}")
+      SET("${flag}" "${${flag}} /INCREMENTAL:NO")
+    ENDFOREACH()
   ENDFOREACH()
   
   # Mark 32 bit executables large address aware so they can 
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 737d95623a12..7cab4f1c41b5 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -62,7 +69,6 @@ SET(HAVE_SYS_PARAM_H CACHE  INTERNAL "")
 SET(HAVE_FNMATCH_H CACHE  INTERNAL "")
 SET(HAVE_SYS_UN_H CACHE  INTERNAL "")
 SET(HAVE_VIS_H CACHE INTERNAL "")
-SET(HAVE_SASL_SASL_H CACHE  INTERNAL "")
 
 # Libevent
 SET(HAVE_DEVPOLL CACHE  INTERNAL "")
@@ -209,6 +215,7 @@ SET(HAVE_BUILTIN_STPCPY CACHE  INTERNAL "")
 SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
 SET(HAVE_GCC_SYNC_BUILTINS CACHE  INTERNAL "")
 # Derived result HAVE_VALGRIND
+SET(HAVE_PTHREAD_THREADID_NP CACHE INTERNAL "")
 
 # IPV6
 SET(HAVE_NETINET_IN6_H CACHE  INTERNAL "")
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index 34e9bb8e9d05..65a85c7368c8 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -81,7 +88,11 @@ IF(NOT VERSION)
         ENDIF()
       ELSE()
         IF(64BIT)
-          SET(DEFAULT_MACHINE "x86_64")
+          IF(APPLE_ARM)
+            SET(DEFAULT_MACHINE "arm64")
+          ELSE()
+            SET(DEFAULT_MACHINE "x86_64")
+          ENDIF()
         ENDIF()
       ENDIF()
 
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index b7a1709b3804..1b02e01282a3 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -52,7 +59,7 @@ ENDMACRO()
 MACRO(MYSQL_ADD_PLUGIN)
   MYSQL_PARSE_ARGUMENTS(ARG
     "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
-    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY"
+    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY;SKIP_INSTALL"
     ${ARGN}
   )
   
@@ -63,7 +70,7 @@ MACRO(MYSQL_ADD_PLUGIN)
                     ${CMAKE_SOURCE_DIR}/sql/auth
                     ${CMAKE_SOURCE_DIR}/regex
                     ${SSL_INCLUDE_DIRS}
-                    ${ZLIB_INCLUDE_DIR})
+                    )
 
   LIST(GET ARG_DEFAULT_ARGS 0 plugin) 
   SET(SOURCES ${ARG_DEFAULT_ARGS})
@@ -256,24 +263,32 @@ MACRO(MYSQL_ADD_PLUGIN)
      ENDIF()
     SET_TARGET_PROPERTIES(${target} PROPERTIES 
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
+
+    # Help INSTALL_DEBUG_TARGET to locate the plugin
+    SET_TARGET_PROPERTIES(${target} PROPERTIES
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      )
+
     # Install dynamic library
-    SET(INSTALL_COMPONENT Server)
-    IF(ARG_TEST_ONLY)
-      SET(INSTALL_COMPONENT Test)
-    ENDIF()
-    MYSQL_INSTALL_TARGETS(${target}
-      DESTINATION ${INSTALL_PLUGINDIR}
-      COMPONENT ${INSTALL_COMPONENT})
-    INSTALL_DEBUG_TARGET(${target}
-      DESTINATION ${INSTALL_PLUGINDIR}/debug
-      COMPONENT ${INSTALL_COMPONENT})
-    # Add installed files to list for RPMs
-    FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-            "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
-            "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-    # For internal testing in PB2, append collections files
-    IF(DEFINED ENV{PB2WORKDIR})
-      PLUGIN_APPEND_COLLECTIONS(${plugin})
+    IF(NOT ARG_SKIP_INSTALL)
+      SET(INSTALL_COMPONENT Server)
+      IF(ARG_TEST_ONLY)
+        SET(INSTALL_COMPONENT Test)
+      ENDIF()
+      MYSQL_INSTALL_TARGETS(${target}
+        DESTINATION ${INSTALL_PLUGINDIR}
+        COMPONENT ${INSTALL_COMPONENT})
+      INSTALL_DEBUG_TARGET(${target}
+        DESTINATION ${INSTALL_PLUGINDIR}/debug
+        COMPONENT ${INSTALL_COMPONENT})
+      # Add installed files to list for RPMs
+      FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
+      # For internal testing in PB2, append collections files
+      IF(DEFINED ENV{PB2WORKDIR})
+        PLUGIN_APPEND_COLLECTIONS(${plugin})
+      ENDIF()
     ENDIF()
   ELSE()
     IF(WITHOUT_${plugin})
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
index 1b6594da4d6a..13386c0067c5 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/readline.cmake b/cmake/readline.cmake
index 24c9e42823ae..721ba0a409d3 100644
--- a/cmake/readline.cmake
+++ b/cmake/readline.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -56,10 +63,10 @@ MACRO (FIND_CURSES)
  IF(NOT CURSES_FOUND)
    SET(ERRORMSG "Curses library not found. Please install appropriate package,
     remove CMakeCache.txt and rerun cmake.")
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(ERRORMSG ${ERRORMSG} 
-    "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " 
-    "it is ncurses-devel.")
+   IF(LINUX)
+     SET(ERRORMSG ${ERRORMSG} 
+       "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " 
+       "it is ncurses-devel.")
    ENDIF()
    MESSAGE(FATAL_ERROR ${ERRORMSG})
  ENDIF()
@@ -69,24 +76,8 @@ MACRO (FIND_CURSES)
  ELSEIF(CURSES_HAVE_NCURSES_H)
    SET(HAVE_NCURSES_H 1 CACHE INTERNAL "")
  ENDIF()
- IF(CMAKE_SYSTEM_NAME MATCHES "HP")
-   # CMake uses full path to library /lib/libcurses.sl 
-   # On Itanium, it results into architecture mismatch+
-   # the library is for  PA-RISC
-   SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
- ENDIF()
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-   # CMake generates /lib/64/libcurses.so -R/lib/64
-   # The result is we cannot find
-   # /opt/studio12u2/lib/stlport4/v9/libstlport.so.1
-   # at runtime
-   SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   MESSAGE(STATUS "CURSES_LIBRARY ${CURSES_LIBRARY}")
- ENDIF()
 
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ IF(LINUX)
    # -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora 
    # Lower-level libcurses calls are exposed by libtinfo
    CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} tputs "" HAVE_TPUTS_IN_CURSES)
@@ -99,13 +90,20 @@ MACRO (FIND_CURSES)
  ENDIF()
 ENDMACRO()
 
+SET(CURRENT_LIBEDIT_DIRECTORY "extra/libedit/libedit-20221030-3.1")
+
 MACRO (MYSQL_USE_BUNDLED_EDITLINE)
+  SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")
   SET(USE_LIBEDIT_INTERFACE 1)
   SET(HAVE_HIST_ENTRY 1)
-  SET(EDITLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit/editline)
+  SET(EDITLINE_HAVE_COMPLETION_CHAR 1 CACHE INTERNAL "")
+  SET(USE_NEW_EDITLINE_INTERFACE 1 CACHE INTERNAL "")
+  SET(EDITLINE_INCLUDE_DIR
+    ${CMAKE_SOURCE_DIR}/${CURRENT_LIBEDIT_DIRECTORY}/src/editline)
+  INCLUDE_DIRECTORIES(BEFORE SYSTEM ${EDITLINE_INCLUDE_DIR})
   SET(EDITLINE_LIBRARY edit)
   FIND_CURSES()
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/libedit)
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${CURRENT_LIBEDIT_DIRECTORY}/src)
 ENDMACRO()
 
 MACRO (FIND_SYSTEM_EDITLINE)
@@ -135,8 +133,10 @@ MACRO (FIND_SYSTEM_EDITLINE)
 
   INCLUDE(CheckCXXSourceCompiles)
   IF(EDITLINE_LIBRARY AND EDITLINE_INCLUDE_DIR)
+    CMAKE_PUSH_CHECK_STATE()
+
     SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
-    SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
     #include <readline.h>
@@ -181,6 +181,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
         SET(USE_NEW_EDITLINE_INTERFACE 1)
       ENDIF()
     ENDIF()
+    CMAKE_POP_CHECK_STATE()
   ENDIF()
 ENDMACRO()
 
diff --git a/cmake/rpc.cmake b/cmake/rpc.cmake
new file mode 100644
index 000000000000..939bfc0e83a2
--- /dev/null
+++ b/cmake/rpc.cmake
@@ -0,0 +1,80 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+IF(WIN32)
+  RETURN()
+ENDIF()
+
+MACRO(MYSQL_CHECK_RPC)
+  IF(LINUX AND NOT LIBTIRPC_VERSION_TOO_OLD)
+    # Do a sanity check, before bailing out in FIND_PACKAGE below.
+    FIND_PROGRAM(MY_PKG_CONFIG_EXECUTABLE NAMES pkg-config
+      DOC "pkg-config executable")
+    IF(NOT MY_PKG_CONFIG_EXECUTABLE)
+      MESSAGE(WARNING "Cannot find pkg-config. You need to "
+        "install the required package:\n"
+        "  Debian/Ubuntu:              apt install pkg-config\n"
+        "  RedHat/Fedora/Oracle Linux: yum install pkg-config\n"
+        "  SuSE:                       zypper install pkg-config\n"
+        )
+    ENDIF()
+    FIND_PACKAGE(PkgConfig REQUIRED)
+    PKG_CHECK_MODULES(TIRPC libtirpc)
+  ENDIF()
+
+  IF(TIRPC_FOUND)
+    IF(TIRPC_VERSION VERSION_LESS 1.0)
+      SET(LIBTIRPC_VERSION_TOO_OLD 1 CACHE INTERNAL "libtirpc is too old" FORCE)
+      MESSAGE(WARNING
+        "Ignoring libtirpc version ${TIRPC_VERSION}, need at least 1.0")
+      UNSET(TIRPC_FOUND)
+      UNSET(TIRPC_FOUND CACHE)
+      GET_CMAKE_PROPERTY(CACHE_VARS CACHE_VARIABLES)
+      FOREACH(CACHE_VAR ${CACHE_VARS})
+        IF(CACHE_VAR MATCHES "^TIRPC_.*")
+          UNSET(${CACHE_VAR})
+          UNSET(${CACHE_VAR} CACHE)
+        ENDIF()
+      ENDFOREACH()
+    ENDIF()
+  ENDIF()
+
+  IF(TIRPC_FOUND)
+    ADD_DEFINITIONS(-DHAVE_TIRPC)
+
+    # RPC headers may be found in /usr/include rather than /usr/include/tirpc
+    IF(TIRPC_INCLUDE_DIRS)
+      SET(RPC_INCLUDE_DIRS ${TIRPC_INCLUDE_DIRS})
+      INCLUDE_DIRECTORIES(SYSTEM "${TIRPC_INCLUDE_DIRS}")
+    ELSE()
+      FIND_PATH(RPC_INCLUDE_DIRS NAMES rpc/rpc.h)
+    ENDIF()
+  ELSE()
+    FIND_PATH(RPC_INCLUDE_DIRS NAMES rpc/rpc.h)
+  ENDIF()
+
+  IF(NOT RPC_INCLUDE_DIRS)
+    MESSAGE(FATAL_ERROR
+      "Could not find rpc/rpc.h in /usr/include or /usr/include/tirpc")
+  ENDIF()
+
+ENDMACRO()
diff --git a/cmake/run_collection.cmake.in b/cmake/run_collection.cmake.in
index 1e8f1564b9a6..0a855f2e1810 100644
--- a/cmake/run_collection.cmake.in
+++ b/cmake/run_collection.cmake.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/sasl.cmake b/cmake/sasl.cmake
new file mode 100644
index 000000000000..0f188232300d
--- /dev/null
+++ b/cmake/sasl.cmake
@@ -0,0 +1,159 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+# cmake -DWITH_SASL=system|</path/to/custom/installation>
+# system is the default
+
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFiles)
+
+SET(WITH_SASL_DOC "\nsystem (use the OS sasl library)")
+STRING_APPEND(WITH_SASL_DOC ", \n</path/to/custom/installation>")
+
+STRING(REPLACE "\n" "| " WITH_SASL_DOC_STRING "${WITH_SASL_DOC}")
+
+MACRO(RESET_SASL_VARIABLES)
+  UNSET(SASL_INCLUDE_DIR)
+  UNSET(SASL_INCLUDE_DIR CACHE)
+  UNSET(SASL_LIBRARY)
+  UNSET(SASL_LIBRARY CACHE)
+  UNSET(SASL_ROOT_DIR)
+  UNSET(SASL_ROOT_DIR CACHE)
+  UNSET(WITH_SASL)
+  UNSET(WITH_SASL CACHE)
+  UNSET(WITH_SASL_PATH)
+  UNSET(WITH_SASL_PATH CACHE)
+  UNSET(HAVE_CUSTOM_SASL_SASL_H)
+  UNSET(HAVE_CUSTOM_SASL_SASL_H CACHE)
+  UNSET(HAVE_SASL_SASL_H)
+  UNSET(HAVE_SASL_SASL_H CACHE)
+ENDMACRO()
+
+MACRO(FIND_SYSTEM_SASL)
+  # Cyrus SASL 2.1.26 on Solaris 11.4 has a bug that requires sys/types.h
+  # to be included before checking if sasl/sasl.h exists
+  CHECK_INCLUDE_FILES("sys/types.h;sasl/sasl.h" HAVE_SASL_SASL_H)
+  FIND_LIBRARY(SASL_SYSTEM_LIBRARY NAMES "sasl2" "sasl")
+  IF (SASL_SYSTEM_LIBRARY)
+    SET(SASL_LIBRARY ${SASL_SYSTEM_LIBRARY})
+    MESSAGE(STATUS "SASL_LIBRARY ${SASL_LIBRARY}")
+  ENDIF()
+ENDMACRO()
+
+MACRO(FIND_CUSTOM_SASL)
+  # First search in WITH_SASL_PATH.
+  FIND_PATH(SASL_ROOT_DIR
+    NAMES include/sasl/sasl.h
+    NO_CMAKE_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    HINTS ${WITH_SASL_PATH}
+    )
+  # Then search in standard places (if not found above).
+  FIND_PATH(SASL_ROOT_DIR
+    NAMES include/sasl/sasl.h
+    )
+
+  FIND_PATH(SASL_INCLUDE_DIR
+    NAMES sasl/sasl.h
+    HINTS ${SASL_ROOT_DIR}/include
+    )
+
+  # On mac this list is <.dylib;.so;.a>
+  # We prefer static libraries, so we reverse it here.
+  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+
+  FIND_LIBRARY(SASL_LIBRARY
+    NAMES sasl2 sasl libsasl
+    PATHS ${WITH_SASL}/lib
+    NO_DEFAULT_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH)
+
+  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+
+  IF(SASL_LIBRARY)
+    GET_FILENAME_COMPONENT(SASL_LIBRARY_EXT ${SASL_LIBRARY} EXT)
+    IF(SASL_LIBRARY_EXT STREQUAL ".a")
+      SET(STATIC_SASL_LIBRARY 1)
+    ENDIF()
+    MESSAGE(STATUS "SASL_LIBRARY ${SASL_LIBRARY}")
+  ENDIF()
+
+  IF(SASL_INCLUDE_DIR)
+    INCLUDE_DIRECTORIES(BEFORE SYSTEM "${SASL_INCLUDE_DIR}")
+
+    CMAKE_PUSH_CHECK_STATE()
+    SET(CMAKE_REQUIRED_INCLUDES "${SASL_INCLUDE_DIR}")
+    # Windows users doing 'git pull' will have cached HAVE_SASL_SASL_H=""
+    CHECK_INCLUDE_FILE(sasl/sasl.h HAVE_CUSTOM_SASL_SASL_H)
+    IF(HAVE_CUSTOM_SASL_SASL_H)
+      SET(HAVE_SASL_SASL_H 1 CACHE INTERNAL "Have include sasl/sasl.h" FORCE)
+    ENDIF()
+    CMAKE_POP_CHECK_STATE()
+  ENDIF()
+
+  IF(WIN32)
+    FIND_FILE(SASL_LIBRARY_DLL
+      NAMES libsasl.dll
+      PATHS ${WITH_SASL}/lib
+      NO_CMAKE_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      NO_SYSTEM_ENVIRONMENT_PATH
+      )
+    FIND_FILE(SASL_SCRAM_PLUGIN
+      NAMES saslSCRAM.dll
+      PATHS ${WITH_SASL}/lib
+      NO_CMAKE_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      NO_SYSTEM_ENVIRONMENT_PATH
+      )
+  ENDIF()
+ENDMACRO()
+
+MACRO(MYSQL_CHECK_SASL)
+  IF(NOT WITH_SASL)
+    SET(WITH_SASL "system" CACHE STRING "${WITH_SASL_DOC_STRING}" FORCE)
+  ENDIF()
+
+  # See if WITH_SASL is of the form </path/to/custom/installation>
+  FILE(GLOB WITH_SASL_HEADER ${WITH_SASL}/include/sasl/sasl.h)
+  IF (WITH_SASL_HEADER)
+    FILE(TO_CMAKE_PATH "${WITH_SASL}" WITH_SASL)
+    SET(WITH_SASL_PATH ${WITH_SASL})
+  ENDIF()
+
+  IF(WITH_SASL STREQUAL "system")
+    FIND_SYSTEM_SASL()
+  ELSEIF(WITH_SASL_PATH)
+    FIND_CUSTOM_SASL()
+  ELSE()
+    RESET_SASL_VARIABLES()
+    MESSAGE(FATAL_ERROR "Could not find SASL")
+  ENDIF()
+
+  IF(HAVE_SASL_SASL_H AND SASL_LIBRARY)
+    SET(SASL_FOUND TRUE)
+  ELSE()
+    SET(SASL_FOUND FALSE)
+  ENDIF()
+
+ENDMACRO()
diff --git a/cmake/save_archive_location.cmake.in b/cmake/save_archive_location.cmake.in
index 079cf3330691..94c77f1cca37 100644
--- a/cmake/save_archive_location.cmake.in
+++ b/cmake/save_archive_location.cmake.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index d745c4c5da39..d04f94533dee 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -1,126 +1,211 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# 
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
+#
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # We support different versions of SSL:
-# - "bundled" uses source code in <source dir>/extra/yassl
 # - "system"  (typically) uses headers/libraries in /usr/lib and /usr/lib64
 # - a custom installation of openssl can be used like this
 #     - cmake -DCMAKE_PREFIX_PATH=</path/to/custom/openssl> -DWITH_SSL="system"
 #   or
 #     - cmake -DWITH_SSL=</path/to/custom/openssl>
 #
-# The default value for WITH_SSL is "bundled"
-# set in cmake/build_configurations/feature_set.cmake
+# The default value for WITH_SSL is "system".
+#
+# WITH_SSL="system" means: use the SSL library that comes with the operating
+# system. This typically means you have to do 'yum install openssl-devel'
+# or something similar.
 #
-# For custom build/install of openssl, see the accompanying README and
-# INSTALL* files. When building with gcc, you must build the shared libraries
-# (in addition to the static ones):
-#   ./config --prefix=</path/to/custom/openssl> --shared; make; make install
-# On some platforms (mac) you need to choose 32/64 bit architecture.
-# Build/Install of openssl on windows is slightly different: you need to run
-# perl and nmake. You might also need to
-#   'set path=</path/to/custom/openssl>\bin;%PATH%
-# in order to find the .dll files at runtime.
+# For Windows or macOS, WITH_SSL="system" is handled a bit differently:
+# We assume you have installed
+#     https://slproweb.com/products/Win32OpenSSL.html
+#     We look for "C:/Program Files/OpenSSL-Win64/"
+# or
+#     https://brew.sh
+#     https://formulae.brew.sh/formula/openssl@1.1
+#     We look for "${HOMEBREW_HOME}/openssl@1.1"
+#     We look for the static libraries, rather than the .dylib ones.
+# When the package has been located, we treat it as if cmake had been
+# invoked with  -DWITH_SSL=</path/to/custom/openssl>
 
-SET(WITH_SSL_DOC "bundled (use yassl)")
-SET(WITH_SSL_DOC
-  "${WITH_SSL_DOC}, yes (prefer os library if present, otherwise use bundled)")
+
+SET(WITH_SSL_DOC "\nsystem (use the OS openssl library)")
 SET(WITH_SSL_DOC
-  "${WITH_SSL_DOC}, system (use os library)")
+  "${WITH_SSL_DOC}, \nyes (synonym for system)")
 SET(WITH_SSL_DOC
-  "${WITH_SSL_DOC}, </path/to/custom/installation>")
+  "${WITH_SSL_DOC}, \n</path/to/custom/openssl/installation>")
 
-MACRO (CHANGE_SSL_SETTINGS string)
-  SET(WITH_SSL ${string} CACHE STRING ${WITH_SSL_DOC} FORCE)
-ENDMACRO()
+STRING(REPLACE "\n" "| " WITH_SSL_DOC_STRING "${WITH_SSL_DOC}")
 
-MACRO (MYSQL_USE_BUNDLED_SSL)
-  SET(INC_DIRS 
-    ${CMAKE_SOURCE_DIR}/extra/yassl/include
-    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
-  )
-  SET(SSL_LIBRARIES  yassl taocrypt)
-  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
+MACRO(FATAL_SSL_NOT_FOUND_ERROR string)
+  MESSAGE(STATUS "\n${string}"
+    "\nMake sure you have specified a supported SSL version. "
+    "\nValid options are : ${WITH_SSL_DOC}\n"
+    )
+  IF(UNIX)
+    MESSAGE(FATAL_ERROR
+      "Please install the appropriate openssl developer package.\n")
+  ENDIF()
+  IF(WIN32)
+    MESSAGE(FATAL_ERROR
+      "Please see https://wiki.openssl.org/index.php/Binaries\n")
+  ENDIF()
+  IF(APPLE)
+    MESSAGE(FATAL_ERROR
+      "Please see http://brewformulas.org/Openssl\n")
   ENDIF()
-  SET(SSL_INCLUDE_DIRS ${INC_DIRS})
-  SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
-  SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED")
-  CHANGE_SSL_SETTINGS("bundled")
-  ADD_SUBDIRECTORY(extra/yassl)
-  ADD_SUBDIRECTORY(extra/yassl/taocrypt)
-  GET_TARGET_PROPERTY(src yassl SOURCES)
-  FOREACH(file ${src})
-    SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/${file})
-  ENDFOREACH()
-  GET_TARGET_PROPERTY(src taocrypt SOURCES)
-  FOREACH(file ${src})
-    SET(SSL_SOURCES ${SSL_SOURCES}
-      ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/${file})
-  ENDFOREACH()
 ENDMACRO()
 
+MACRO(RESET_SSL_VARIABLES)
+  UNSET(WITH_SSL_PATH)
+  UNSET(WITH_SSL_PATH CACHE)
+  UNSET(OPENSSL_VERSION)
+  UNSET(OPENSSL_VERSION CACHE)
+  UNSET(OPENSSL_ROOT_DIR)
+  UNSET(OPENSSL_ROOT_DIR CACHE)
+  UNSET(OPENSSL_INCLUDE_DIR)
+  UNSET(OPENSSL_INCLUDE_DIR CACHE)
+  UNSET(OPENSSL_APPLINK_C)
+  UNSET(OPENSSL_APPLINK_C CACHE)
+  UNSET(OPENSSL_LIBRARY)
+  UNSET(OPENSSL_LIBRARY CACHE)
+  UNSET(CRYPTO_LIBRARY)
+  UNSET(CRYPTO_LIBRARY CACHE)
+  UNSET(HAVE_SHA512_DIGEST_LENGTH)
+  UNSET(HAVE_SHA512_DIGEST_LENGTH CACHE)
+ENDMACRO()
+
+# Fetch OpenSSL version number.
+# OpenSSL < 3:
+# #define OPENSSL_VERSION_NUMBER 0x1000103fL
+# Encoded as MNNFFPPS: major minor fix patch status
+#
+# OpenSSL 3:
+# #define OPENSSL_VERSION_NUMBER
+#   ( (OPENSSL_VERSION_MAJOR<<28)
+#     |(OPENSSL_VERSION_MINOR<<20)
+#     |(OPENSSL_VERSION_PATCH<<4)
+#     |_OPENSSL_VERSION_PRE_RELEASE )
+MACRO(FIND_OPENSSL_VERSION)
+  FOREACH(version_part
+      OPENSSL_VERSION_MAJOR
+      OPENSSL_VERSION_MINOR
+      OPENSSL_VERSION_PATCH
+      )
+    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" ${version_part}
+      REGEX "^#[\t ]*define[\t ]+${version_part}[\t ]+([0-9]+).*")
+    STRING(REGEX REPLACE
+      "^.*${version_part}[\t ]+([0-9]+).*" "\\1"
+      ${version_part} "${${version_part}}")
+  ENDFOREACH()
+  IF(OPENSSL_VERSION_MAJOR VERSION_EQUAL 3)
+    # OpenSSL 3
+    SET(OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_MAJOR}")
+    SET(OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_MINOR}")
+    SET(OPENSSL_FIX_VERSION "${OPENSSL_VERSION_PATCH}")
+  ELSE()
+    # Verify version number. Version information looks like:
+    #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
+    # Encoded as MNNFFPPS: major minor fix patch status
+    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+      OPENSSL_VERSION_NUMBER
+      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+      )
+    STRING(REGEX REPLACE
+      "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+      OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+      )
+    STRING(REGEX REPLACE
+      "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
+      OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+      )
+    STRING(REGEX REPLACE
+      "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
+      OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+      )
+  ENDIF()
+  SET(OPENSSL_VERSION
+    "${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}"
+    )
+  SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
+  MESSAGE(STATUS "OPENSSL_VERSION (${WITH_SSL}) is ${OPENSSL_VERSION}")
+ENDMACRO(FIND_OPENSSL_VERSION)
+
 # MYSQL_CHECK_SSL
 #
 # Provides the following configure options:
-# WITH_SSL=[yes|bundled|system|<path/to/custom/installation>]
+# WITH_SSL=[yes|system|<path/to/custom/installation>]
 MACRO (MYSQL_CHECK_SSL)
   IF(NOT WITH_SSL)
-   IF(WIN32)
-     CHANGE_SSL_SETTINGS("bundled")
-   ENDIF()
+    SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE)
   ENDIF()
 
   # See if WITH_SSL is of the form </path/to/custom/installation>
   FILE(GLOB WITH_SSL_HEADER ${WITH_SSL}/include/openssl/ssl.h)
   IF (WITH_SSL_HEADER)
+    FILE(TO_CMAKE_PATH "${WITH_SSL}" WITH_SSL)
     SET(WITH_SSL_PATH ${WITH_SSL} CACHE PATH "path to custom SSL installation")
     SET(WITH_SSL_PATH ${WITH_SSL})
   ENDIF()
 
-  IF(WITH_SSL STREQUAL "bundled")
-    MYSQL_USE_BUNDLED_SSL()
-    # Reset some variables, in case we switch from /path/to/ssl to "bundled".
-    IF (WITH_SSL_PATH)
-      UNSET(WITH_SSL_PATH)
-      UNSET(WITH_SSL_PATH CACHE)
-    ENDIF()
-    IF (OPENSSL_ROOT_DIR)
-      UNSET(OPENSSL_ROOT_DIR)
-      UNSET(OPENSSL_ROOT_DIR CACHE)
-    ENDIF()
-    IF (OPENSSL_INCLUDE_DIR)
-      UNSET(OPENSSL_INCLUDE_DIR)
-      UNSET(OPENSSL_INCLUDE_DIR CACHE)
-    ENDIF()
-    IF (WIN32 AND OPENSSL_APPLINK_C)
-      UNSET(OPENSSL_APPLINK_C)
-      UNSET(OPENSSL_APPLINK_C CACHE)
-    ENDIF()
-    IF (OPENSSL_LIBRARY)
-      UNSET(OPENSSL_LIBRARY)
-      UNSET(OPENSSL_LIBRARY CACHE)
-    ENDIF()
-    IF (CRYPTO_LIBRARY)
-      UNSET(CRYPTO_LIBRARY)
-      UNSET(CRYPTO_LIBRARY CACHE)
+  IF(WITH_SSL STREQUAL "system" OR
+      WITH_SSL STREQUAL "yes" OR
+      WITH_SSL_PATH
+      )
+    # Treat "system" the same way as -DWITH_SSL=</path/to/custom/openssl>
+    # Note: we cannot use FIND_PACKAGE(OpenSSL), as older cmake versions
+    # have buggy implementations.
+    IF((APPLE OR WIN32) AND NOT WITH_SSL_PATH AND WITH_SSL STREQUAL "system")
+      IF(APPLE)
+        SET(WITH_SSL_PATH "${HOMEBREW_HOME}/openssl@1.1")
+      ELSE()
+        SET(WITH_SSL_PATH "C:/Program Files/OpenSSL-Win64/")
+      ENDIF()
+
+      # Note that several packages may come with ssl headers,
+      # e.g. Strawberry Perl, so ignore some system paths below.
+      IF(WIN32 AND NOT OPENSSL_ROOT_DIR AND WITH_SSL STREQUAL "system")
+        FILE(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+        IF(SIZEOF_VOIDP EQUAL 8)
+          FIND_PATH(OPENSSL_WIN64
+            NAMES  "include/openssl/ssl.h"
+            PATHS "${_programfiles}/OpenSSL-Win64" "C:/OpenSSL-Win64/"
+            NO_SYSTEM_ENVIRONMENT_PATH
+            NO_CMAKE_SYSTEM_PATH
+            )
+          IF(OPENSSL_WIN64)
+            SET(OPENSSL_ROOT_DIR ${OPENSSL_WIN64})
+            FIND_LIBRARY(OPENSSL_LIBRARY
+              NAMES libssl_static
+              HINTS ${OPENSSL_ROOT_DIR}/lib)
+            FIND_LIBRARY(CRYPTO_LIBRARY
+              NAMES libcrypto_static
+              HINTS ${OPENSSL_ROOT_DIR}/lib)
+            IF(OPENSSL_LIBRARY AND CRYPTO_LIBRARY)
+              SET(FOUND_STATIC_SSL_LIBS 1)
+            ENDIF()
+          ENDIF()
+        ENDIF()
+      ENDIF()
     ENDIF()
-  ELSEIF(WITH_SSL STREQUAL "system" OR
-         WITH_SSL STREQUAL "yes" OR
-         WITH_SSL_PATH
-         )
+
     # First search in WITH_SSL_PATH.
     FIND_PATH(OPENSSL_ROOT_DIR
       NAMES include/openssl/ssl.h
@@ -141,43 +226,45 @@ MACRO (MYSQL_CHECK_SSL)
     IF (WIN32)
       FIND_FILE(OPENSSL_APPLINK_C
         NAMES openssl/applink.c
+        NO_DEFAULT_PATH
         HINTS ${OPENSSL_ROOT_DIR}/include
       )
       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
     ENDIF()
 
     # On mac this list is <.dylib;.so;.a>
-    # We prefer static libraries, so we revert it here.
+    # We prefer static libraries, so we reverse it here.
     IF (WITH_SSL_PATH)
       LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
       MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
     ENDIF()
+
     FIND_LIBRARY(OPENSSL_LIBRARY
-                 NAMES ssl ssleay32 ssleay32MD
+                 NAMES ssl libssl ssleay32 ssleay32MD
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
     FIND_LIBRARY(CRYPTO_LIBRARY
-                 NAMES crypto libeay32
+                 NAMES crypto libcrypto libeay32
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
     IF (WITH_SSL_PATH)
       LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
     ENDIF()
 
-    # Verify version number. Version information looks like:
-    #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-    # Encoded as MNNFFPPS: major minor fix patch status
-    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-      OPENSSL_VERSION_NUMBER
-      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-    )
-    STRING(REGEX REPLACE
-      "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-      OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-    )
+    IF(OPENSSL_INCLUDE_DIR)
+      FIND_OPENSSL_VERSION()
+    ENDIF()
 
+    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
+       ADD_DEFINITIONS(-DHAVE_TLSv13)
+       SET(HAVE_TLSv13 1)
+       IF(SOLARIS)
+         SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
+       ENDIF()
+    ENDIF()
     IF(OPENSSL_INCLUDE_DIR AND
        OPENSSL_LIBRARY   AND
        CRYPTO_LIBRARY      AND
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
+       (OPENSSL_MAJOR_VERSION STREQUAL "1" OR
+        OPENSSL_MAJOR_VERSION STREQUAL "3")
       )
       SET(OPENSSL_FOUND TRUE)
     ELSE()
@@ -194,7 +281,7 @@ MACRO (MYSQL_CHECK_SSL)
     IF (WITH_SSL_PATH)
       GET_FILENAME_COMPONENT(CRYPTO_EXT "${CRYPTO_LIBRARY}" EXT)
       GET_FILENAME_COMPONENT(OPENSSL_EXT "${OPENSSL_LIBRARY}" EXT)
-      IF (CRYPTO_EXT STREQUAL ".a" OR OPENSSL_EXT STREQUAL ".lib")
+      IF (CRYPTO_EXT STREQUAL ".a" OR CRYPTO_EXT STREQUAL ".lib")
         SET(MY_CRYPTO_LIBRARY imported_crypto)
         ADD_IMPORTED_LIBRARY(imported_crypto "${CRYPTO_LIBRARY}")
       ENDIF()
@@ -202,82 +289,74 @@ MACRO (MYSQL_CHECK_SSL)
         SET(MY_OPENSSL_LIBRARY imported_openssl)
         ADD_IMPORTED_LIBRARY(imported_openssl "${OPENSSL_LIBRARY}")
       ENDIF()
+      IF(CRYPTO_EXT STREQUAL ".a" OR OPENSSL_EXT STREQUAL ".a")
+        SET(STATIC_SSL_LIBRARY 1)
+      ENDIF()
     ENDIF()
 
     MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
     MESSAGE(STATUS "OPENSSL_LIBRARY = ${OPENSSL_LIBRARY}")
     MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}")
     MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}")
+    MESSAGE(STATUS "OPENSSL_MINOR_VERSION = ${OPENSSL_MINOR_VERSION}")
+    MESSAGE(STATUS "OPENSSL_FIX_VERSION = ${OPENSSL_FIX_VERSION}")
+
+    # Static SSL libraries? we require at least 1.1.1
+    IF(STATIC_SSL_LIBRARY OR (WIN32 AND WITH_SSL_PATH))
+      IF(OPENSSL_VERSION VERSION_LESS "1.1.1")
+        RESET_SSL_VARIABLES()
+        MESSAGE(FATAL_ERROR "SSL version must be at least 1.1.1")
+      ENDIF()
+      SET(SSL_DEFINES "-DHAVE_STATIC_OPENSSL")
+    ENDIF()
 
     INCLUDE(CheckSymbolExists)
+
+    CMAKE_PUSH_CHECK_STATE()
     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-    CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" 
+    CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h"
                         HAVE_SHA512_DIGEST_LENGTH)
+    CMAKE_POP_CHECK_STATE()
+
     IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH)
       SET(SSL_SOURCES "")
       SET(SSL_LIBRARIES ${MY_OPENSSL_LIBRARY} ${MY_CRYPTO_LIBRARY})
-      IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+      IF(SOLARIS)
         SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
       ENDIF()
-      IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      IF(LINUX)
         SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL})
       ENDIF()
       MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}")
+      IF(WIN32 AND WITH_SSL STREQUAL "system" AND NOT FOUND_STATIC_SSL_LIBS)
+        MESSAGE(STATUS "Please do\nPATH=\"${WITH_SSL_PATH}bin\":$PATH")
+        FILE(TO_NATIVE_PATH "${WITH_SSL_PATH}" WITH_SSL_PATH_XX)
+        MESSAGE(STATUS "or\nPATH=\"${WITH_SSL_PATH_XX}bin\":$PATH")
+      ENDIF()
       SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
       SET(SSL_INTERNAL_INCLUDE_DIRS "")
-      SET(SSL_DEFINES "-DHAVE_OPENSSL")
+      STRING_APPEND(SSL_DEFINES " -DHAVE_OPENSSL")
     ELSE()
-
-      UNSET(WITH_SSL_PATH)
-      UNSET(WITH_SSL_PATH CACHE)
-      UNSET(OPENSSL_ROOT_DIR)
-      UNSET(OPENSSL_ROOT_DIR CACHE)
-      UNSET(OPENSSL_INCLUDE_DIR)
-      UNSET(OPENSSL_INCLUDE_DIR CACHE)
-      UNSET(OPENSSL_APPLINK_C)
-      UNSET(OPENSSL_APPLINK_C CACHE)
-      UNSET(OPENSSL_LIBRARY)
-      UNSET(OPENSSL_LIBRARY CACHE)
-      UNSET(CRYPTO_LIBRARY)
-      UNSET(CRYPTO_LIBRARY CACHE)
-
-      MESSAGE(SEND_ERROR
-        "Cannot find appropriate system libraries for SSL. "
-        "Make sure you've specified a supported SSL version. "
-        "Consult the documentation for WITH_SSL alternatives")
+      RESET_SSL_VARIABLES()
+      FATAL_SSL_NOT_FOUND_ERROR(
+        "Cannot find appropriate system libraries for WITH_SSL=${WITH_SSL}.")
     ENDIF()
   ELSE()
-    MESSAGE(SEND_ERROR
-      "Wrong option or path for WITH_SSL. "
-      "Valid options are : ${WITH_SSL_DOC}")
+    RESET_SSL_VARIABLES()
+    FATAL_SSL_NOT_FOUND_ERROR(
+      "Wrong option or path for WITH_SSL=${WITH_SSL}.")
   ENDIF()
 ENDMACRO()
 
-
-# Many executables will depend on libeay32.dll and ssleay32.dll at runtime.
-# In order to ensure we find the right version(s), we copy them into
-# the same directory as the executables.
-# NOTE: Using dlls will likely crash in malloc/free,
-#       see INSTALL.W32 which comes with the openssl sources.
-# So we should be linking static versions of the libraries.
-MACRO (COPY_OPENSSL_DLLS target_name)
-  IF (WIN32 AND WITH_SSL_PATH)
-    GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
-    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE)
-    FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll")
-    FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll")
-    MESSAGE(STATUS "HAVE_CRYPTO_DLL ${HAVE_CRYPTO_DLL}")
-    MESSAGE(STATUS "HAVE_OPENSSL_DLL ${HAVE_OPENSSL_DLL}")
-    IF(HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)
-      ADD_CUSTOM_COMMAND(OUTPUT ${target_name}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll"
-          "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_NAME}.dll"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll"
-          "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_NAME}.dll"
-        )
-      ADD_CUSTOM_TARGET(${target_name} ALL)
+# Silence OpenSSL 3 deprecation warnings.
+MACRO(DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS)
+  IF(OPENSSL_MAJOR_VERSION VERSION_EQUAL 3)
+    IF(MY_COMPILER_IS_GNU_OR_CLANG)
+      ADD_COMPILE_FLAGS(${ARGV}
+        COMPILE_FLAGS "-Wno-deprecated-declarations")
+    ELSEIF(WIN32)
+      ADD_COMPILE_FLAGS(${ARGV}
+        COMPILE_FLAGS "/wd4996")
     ENDIF()
   ENDIF()
 ENDMACRO()
diff --git a/cmake/stack_direction.c b/cmake/stack_direction.c
index d75bbbfa035f..25295e3a674a 100644
--- a/cmake/stack_direction.c
+++ b/cmake/stack_direction.c
@@ -1,15 +1,22 @@
 /*
- Copyright (c) 2009 Sun Microsystems, Inc.
+ Copyright (c) 2009, 2023, Oracle and/or its affiliates.
  Use is subject to license terms.
  
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index 0ba3c45fce89..e199b8e5b31c 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/cmake/tags.cmake b/cmake/tags.cmake
index 07c1411a1d65..861397d0412b 100644
--- a/cmake/tags.cmake
+++ b/cmake/tags.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -15,12 +22,29 @@
 
 # Generate tag files
 IF(UNIX)
-  ADD_CUSTOM_TARGET (tags
-    COMMAND support-files/build-tags
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-  ADD_CUSTOM_TARGET (ctags
-    COMMAND  ctags -R -f CTAGS
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
+  FIND_PROGRAM(CTAGS_EXECUTABLE ctags)
+  IF(NOT CTAGS_EXECUTABLE)
+    RETURN()
+  ENDIF()
+  EXEC_PROGRAM(${CTAGS_EXECUTABLE} ARGS --version OUTPUT_VARIABLE CTAGS_VERSION)
+
+  IF(CTAGS_VERSION MATCHES "Exuberant")
+    ADD_CUSTOM_TARGET(tags
+      COMMAND support-files/build-tags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+    ADD_CUSTOM_TARGET(ctags
+      COMMAND support-files/build-tags ctags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+  ELSE()
+    ADD_CUSTOM_TARGET (tags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+    ADD_CUSTOM_TARGET (ctags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+  ENDIF()
 ENDIF()
diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in
index f849a9fcb59d..3096c3084340 100644
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
@@ -1,14 +1,21 @@
-// Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 // 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
index d1bd034db670..bbdae46afc0a 100644
--- a/cmake/zlib.cmake
+++ b/cmake/zlib.cmake
@@ -1,75 +1,133 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+
+# Usage:
+#  cmake -DWITH_ZLIB="bundled"|"system"
+#
+# Default is "bundled".
+# The default should be "system" on non-windows platforms,
+# but we need at least version 1.2.11, and that's not available on
+# all the platforms we need to support.
+
+# Security bug fixes required from:
+SET(MIN_ZLIB_VERSION_REQUIRED "1.2.13")
+
+
+MACRO(FIND_ZLIB_VERSION)
+  FOREACH(version_part
+      ZLIB_VER_MAJOR
+      ZLIB_VER_MINOR
+      ZLIB_VER_REVISION
+      )
+    FILE(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ${version_part}
+      REGEX "^#[\t ]*define[\t ]+${version_part}[\t ]+([0-9]+).*")
+    STRING(REGEX REPLACE
+      "^.*${version_part}[\t ]+([0-9]+).*" "\\1"
+      ${version_part} "${${version_part}}")
+  ENDFOREACH()
+  SET(ZLIB_VERSION "${ZLIB_VER_MAJOR}.${ZLIB_VER_MINOR}.${ZLIB_VER_REVISION}")
+  SET(ZLIB_VERSION "${ZLIB_VERSION}" CACHE INTERNAL "ZLIB major.minor.step")
+  MESSAGE(STATUS "ZLIB_VERSION (${WITH_ZLIB}) is ${ZLIB_VERSION}")
+  MESSAGE(STATUS "ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIR}")
+  MESSAGE(STATUS "ZLIB_LIBRARY ${ZLIB_LIBRARY}")
+ENDMACRO()
+
+MACRO (FIND_SYSTEM_ZLIB)
+  # In case we are changing from "bundled" to "system".
+  IF(DEFINED ZLIB_LIBRARY AND ZLIB_LIBRARY STREQUAL zlib)
+    UNSET(ZLIB_LIBRARY)
+    UNSET(ZLIB_LIBRARY CACHE)
+  ENDIF()
+  FIND_PACKAGE(ZLIB)
+  IF(ZLIB_FOUND)
+    SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library")
+    IF(NOT ZLIB_INCLUDE_DIR STREQUAL "/usr/include")
+      # In case of -DCMAKE_PREFIX_PATH=</path/to/custom/zlib>
+      INCLUDE_DIRECTORIES(BEFORE SYSTEM ${ZLIB_INCLUDE_DIR})
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
+MACRO (RESET_ZLIB_VARIABLES)
+  # Reset whatever FIND_PACKAGE may have left behind.
+  FOREACH(zlibvar
+      INCLUDE_DIR
+      INCLUDE_DIRS
+      LIBRARY
+      LIBRARIES
+      LIBRARY_DEBUG
+      LIBRARY_RELEASE)
+    UNSET(ZLIB_${zlibvar})
+    UNSET(ZLIB_${zlibvar} CACHE)
+    UNSET(ZLIB_${zlibvar}-ADVANCED CACHE)
+  ENDFOREACH()
+  UNSET(FIND_PACKAGE_MESSAGE_DETAILS_ZLIB)
+  UNSET(FIND_PACKAGE_MESSAGE_DETAILS_ZLIB CACHE)
+ENDMACRO()
+
+SET(ZLIB_VERSION_DIR "zlib-1.2.13")
+SET(BUNDLED_ZLIB_PATH ${CMAKE_SOURCE_DIR}/extra/zlib/${ZLIB_VERSION_DIR})
 
 MACRO (MYSQL_USE_BUNDLED_ZLIB)
+  RESET_ZLIB_VARIABLES()
+
+  SET(ZLIB_INCLUDE_DIR ${BUNDLED_ZLIB_PATH})
   SET(ZLIB_LIBRARY zlib CACHE INTERNAL "Bundled zlib library")
-  SET(ZLIB_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/zlib)
-  SET(ZLIB_FOUND  TRUE)
-  SET(WITH_ZLIB "bundled" CACHE STRING "Use bundled zlib")
-  ADD_SUBDIRECTORY(zlib)
-  GET_TARGET_PROPERTY(src zlib SOURCES)
-  FOREACH(file ${src})
-    SET(ZLIB_SOURCES ${ZLIB_SOURCES} ${CMAKE_SOURCE_DIR}/zlib/${file})
-  ENDFOREACH()
+  SET(WITH_ZLIB "bundled" CACHE STRING "Use bundled zlib" FORCE)
+  INCLUDE_DIRECTORIES(BEFORE SYSTEM
+    ${CMAKE_SOURCE_DIR}/extra/zlib/${ZLIB_VERSION_DIR}
+    ${CMAKE_BINARY_DIR}/extra/zlib/${ZLIB_VERSION_DIR}
+    )
+  ADD_SUBDIRECTORY(extra/zlib/${ZLIB_VERSION_DIR})
 ENDMACRO()
 
-# MYSQL_CHECK_ZLIB_WITH_COMPRESS
-#
-# Provides the following configure options:
-# WITH_ZLIB_BUNDLED
-# If this is set,we use bindled zlib
-# If this is not set,search for system zlib. 
-# if system zlib is not found, use bundled copy
-# ZLIB_LIBRARIES, ZLIB_INCLUDE_DIR and ZLIB_SOURCES
+# If system zlib is not found, or is too old, use bundled copy.
+# ZLIB_LIBRARY, ZLIB_INCLUDE_DIR
 # are set after this macro has run
+MACRO (MYSQL_CHECK_ZLIB)
 
-MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS)
-
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    # Use bundled zlib on some platforms by default (system one is too
-    # old or not existent)
-    IF (NOT WITH_ZLIB)
-      SET(WITH_ZLIB "bundled"  CACHE STRING "By default use bundled zlib on this platform")
-    ENDIF()
+  IF(NOT WITH_ZLIB)
+    SET(WITH_ZLIB "bundled"
+      CACHE STRING "By default use bundled zlib on this platform")
   ENDIF()
   
   IF(WITH_ZLIB STREQUAL "bundled")
     MYSQL_USE_BUNDLED_ZLIB()
-  ELSE()
-    SET(ZLIB_FIND_QUIETLY TRUE)
-    INCLUDE(FindZLIB)
-    IF(ZLIB_FOUND)
-     INCLUDE(CheckFunctionExists)
-      SET(CMAKE_REQUIRED_LIBRARIES z)
-      CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32)
-      CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND)
-      CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND)
-      SET(CMAKE_REQUIRED_LIBRARIES)
-      IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND)
-        SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library")
-        SET(WITH_ZLIB "system" CACHE STRING
-          "Which zlib to use (possible values are 'bundled' or 'system')")
-        SET(ZLIB_SOURCES "")
-      ELSE()
-        SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable")
-        MESSAGE(STATUS "system zlib found but not usable")
-      ENDIF()
-    ENDIF()
+  ELSEIF(WITH_ZLIB STREQUAL "system")
+    FIND_SYSTEM_ZLIB()
     IF(NOT ZLIB_FOUND)
-      MYSQL_USE_BUNDLED_ZLIB()
+      MESSAGE(FATAL_ERROR "Cannot find system zlib libraries.")
     ENDIF()
+  ELSE()
+    RESET_ZLIB_VARIABLES()
+    MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system")
+  ENDIF()
+  FIND_ZLIB_VERSION()
+  IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED)
+    MESSAGE(WARNING
+      "ZLIB version must be at least ${MIN_ZLIB_VERSION_REQUIRED}, "
+      "found ${ZLIB_VERSION}.\nUsing -DWITH_ZLIB=bundled")
+    RESET_ZLIB_VARIABLES()
+    MYSQL_USE_BUNDLED_ZLIB()
   ENDIF()
   SET(HAVE_COMPRESS 1)
 ENDMACRO()
diff --git a/cmd-line-utils/libedit/CMakeLists.txt b/cmd-line-utils/libedit/CMakeLists.txt
deleted file mode 100644
index d7884850f2ee..000000000000
--- a/cmd-line-utils/libedit/CMakeLists.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} )
-INCLUDE(CheckIncludeFile)
-include(CheckFunctionExists)
-CHECK_INCLUDE_FILES(term.h HAVE_TERM_H)
-
-SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
-CHECK_CXX_SOURCE_COMPILES("
-#include <term.h>
-int main()
-{
-  tgoto(0,0,0);
-  return 0;
-}" HAVE_DECL_TGOTO)
-IF(NOT HAVE_DECL_TGOTO)
-  # On Solaris 11, term.h is broken, curses.h is also required.
-  CHECK_CXX_SOURCE_COMPILES("
-  #include <curses.h>
-  #include <term.h>
-  int main()
-  {
-    tgoto(0,0,0);
-    return 0;
-  }" HAVE_DECL_TGOTO2)
-  IF(HAVE_DECL_TGOTO2)
-    SET(HAVE_DECL_TGOTO 1 CACHE INTERNAL "" FORCE)
-  ENDIF()
-ENDIF()
-
-SET(CMAKE_REQUIRED_LIBRARIES)
-
-
-
-IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  #On Solaris, default awk is next to unusable while the xpg4 one is ok.
-  IF(EXISTS /usr/xpg4/bin/awk)
-    SET(AWK_EXECUTABLE /usr/xpg4/bin/awk)
-  ENDIF()
-ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "OS400")
-  #Workaround for cases, where /usr/bin/gawk is not executable
-  IF(EXISTS /QOpenSys/usr/bin/awk)
-    SET(AWK_EXECUTABLE /QOpenSys/usr/bin/awk)
-  ENDIF()
-ENDIF()
-
-IF(NOT AWK_EXECUTABLE)
-  FIND_PROGRAM(AWK_EXECUTABLE NAMES gawk awk DOC "path to the awk executable")
-ENDIF()
-
-MARK_AS_ADVANCED(AWK_EXECUTABLE)
-SET(AWK ${AWK_EXECUTABLE})
-CONFIGURE_FILE(makelist.sh ${CMAKE_CURRENT_BINARY_DIR}/makelist @ONLY)
-
-include(CheckIncludeFile)
-
-CHECK_INCLUDE_FILE(vis.h HAVE_VIS_H)
-IF(HAVE_VIS_H)
-  CHECK_FUNCTION_EXISTS(strvis HAVE_STRVIS)
-  IF(NOT HAVE_STRVIS)
-   SET(HAVE_VIS_H FALSE CACHE INTERNAL "" FORCE)
-  ENDIF()
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(strvis HAVE_STRVIS)
-IF(NOT HAVE_STRVIS)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES}  np/vis.c)
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(strunvis HAVE_STRUNVIS)
-IF(NOT HAVE_STRUNVIS)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES} np/unvis.c)
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY)
-IF(NOT HAVE_STRLCPY)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES} np/strlcpy.c)
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
-IF(NOT HAVE_STRLCAT)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES} np/strlcat.c)
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(fgetln HAVE_FGETLN)
-IF(NOT HAVE_FGETLN)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES} np/fgetln.c)
-ENDIF()
-
-CHECK_FUNCTION_EXISTS(fgetln HAVE_WCSDUP)
-IF(NOT HAVE_WCSDUP)
-  SET(LIBEDIT_EXTRA_SOURCES ${LIBEDIT_EXTRA_SOURCES} np/wcsdup.c)
-ENDIF()
-
-# Generate headers
-FOREACH(SRCBASENAME  vi emacs common)
-  SET(SRC ${CMAKE_CURRENT_SOURCE_DIR}/${SRCBASENAME}.c)
-  SET(HDR ${CMAKE_CURRENT_BINARY_DIR}/${SRCBASENAME}.h)
-
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${HDR}
-    COMMAND sh ./makelist -h ${SRC} > ${HDR}
-    DEPENDS ${SRC})
-
-  SET(AHDR ${AHDR} ${HDR})
-  SET(ASRC ${ASRC} ${SRC})
-ENDFOREACH()
-
-# Generate source files
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/help.c
-  COMMAND sh ./makelist -bc ${ASRC} > help.c
-  DEPENDS ${ASRC}
-)
-
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/help.h
-  COMMAND sh ./makelist -bh ${ASRC} > help.h
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${ASRC}
-)
-
-ADD_CUSTOM_COMMAND(
-  OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/fcns.h
-  COMMAND sh ./makelist -fh ${AHDR} > fcns.h
-  VERBATIM
-  DEPENDS ${AHDR}
-)
-
-ADD_CUSTOM_COMMAND(
-  OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/fcns.c
-  COMMAND sh ./makelist -fc ${AHDR} > fcns.c
-  VERBATIM
-  DEPENDS ${AHDR}
-)
-
-
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_CURRENT_BINARY_DIR}
-${CURSES_INCLUDE_PATH}
-)
-
-SET(LIBEDIT_SOURCES
-  chared.c 
-  chartype.c
-  el.c 
-  eln.c 
-  history.c
-  historyn.c
-  map.c
-  prompt.c
-  readline.c 
-  search.c
-  tokenizer.c
-  tokenizern.c
-  vi.c
-  common.c
-  emacs.c 
-  hist.c
-  keymacro.c
-  parse.c
-  read.c
-  refresh.c
-  sig.c
-  terminal.c
-  tty.c
-  filecomplete.c
-  ${CMAKE_CURRENT_BINARY_DIR}/help.c
-  ${CMAKE_CURRENT_BINARY_DIR}/help.h
-  ${CMAKE_CURRENT_BINARY_DIR}/fcns.c
-  ${CMAKE_CURRENT_BINARY_DIR}/fcns.h
-  ${AHDR} 
-  ${LIBEDIT_EXTRA_SOURCES}
-)
-ADD_CONVENIENCE_LIBRARY(edit ${LIBEDIT_SOURCES})
-TARGET_LINK_LIBRARIES(edit ${CURSES_LIBRARY})
-
diff --git a/cmd-line-utils/libedit/README b/cmd-line-utils/libedit/README
deleted file mode 100644
index c4bc1554b03b..000000000000
--- a/cmd-line-utils/libedit/README
+++ /dev/null
@@ -1,50 +0,0 @@
-An approximate method to merge from upstream is:
-
-	# Fetch latest from upstream (we also include some compat stuff)
-	$ CVS_RSH=ssh; export CVS_RSH
-	$ CVSROOT="anoncvs@anoncvs.netbsd.org:/cvsroot"
-	$ cvs co -d libedit -P src/lib/libedit
-	$ mkdir libedit/np
-	$ for f in src/common/lib/libc/string/strlcat.c \
-	>          src/common/lib/libc/string/strlcpy.c \
-	>          src/include/vis.h \
-	>          src/lib/libc/gen/unvis.c \
-	>          src/lib/libc/gen/vis.c \
-	>          src/tools/compat/fgetln.c
-	> do
-	>   cvs co -P ${f}
-        >   mv ${f} libedit/np
-	> done
-	$ rm -rf src
-	$ cd libedit
-
-	# Remove files we don't need/use
-	$ rm -rf CVS TEST Makefile shlib_version *.[0-9]
-	$ (cd readline; rm -rf CVS Makefile)
-
-	# Rename files to match our naming
-	$ mv makelist makelist.sh
-	$ mv terminal.h el_terminal.h
-
-	# Remove NetBSD-specific bits
-	$ for file in $(find . -type f)
-	> do
-	>   cp ${file} ${file}.orig
-	>   sed -e 's/#include "terminal.h"/#include "el_terminal.h"/g' \
-	>       -e 's/sig_handler/el_sig_handler/g' \
-	>       -e 's/isprint/el_isprint/g' \
-	>       -e '/^__RCSID/d' \
-	>       ${file}.orig >${file}
-	>   rm ${file}.orig
-	> done
-
-then merge remaining bits by hand.  All MySQL-specific changes should be
-marked with XXXMYSQL to make them easier to identify and merge.  To generate
-a 'clean' diff against upstream you can use the above commands but use
-
-	cvs co -D "2011/10/23 17:37:55" [..]
-
-to fetch the baseline of most recent merge.
-
-Please feed any fixes to Jonathan Perkin <jonathan.perkin@oracle.com> who will
-endeavour to merge them upstream and keep diffs minimal.
diff --git a/cmd-line-utils/libedit/chared.h b/cmd-line-utils/libedit/chared.h
deleted file mode 100644
index 176475ac8f05..000000000000
--- a/cmd-line-utils/libedit/chared.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: chared.h,v 1.21 2010/08/28 15:44:59 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)chared.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.chared.h: Character editor interface
- */
-#ifndef _h_el_chared
-#define	_h_el_chared
-
-#include <ctype.h>
-#include <string.h>
-
-#include "histedit.h"
-
-#define	EL_MAXMACRO	10
-
-/*
- * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
- * like real vi: i.e. the transition from command<->insert modes moves
- * the cursor.
- *
- * On the other hand we really don't want to move the cursor, because
- * all the editing commands don't include the character under the cursor.
- * Probably the best fix is to make all the editing commands aware of
- * this fact.
- */
-#define	VI_MOVE
-
-
-typedef struct c_macro_t {
-	int	  level;
-	int	  offset;
-	Char	**macro;
-} c_macro_t;
-
-/*
- * Undo information for vi - no undo in emacs (yet)
- */
-typedef struct c_undo_t {
-	ssize_t	 len;			/* length of saved line */
-	int	 cursor;		/* position of saved cursor */
-	Char	*buf;			/* full saved text */
-} c_undo_t;
-
-/* redo for vi */
-typedef struct c_redo_t {
-	Char	*buf;			/* redo insert key sequence */
-	Char	*pos;
-	Char	*lim;
-	el_action_t	cmd;		/* command to redo */
-	Char	ch;			/* char that invoked it */
-	int	count;
-	int	action;			/* from cv_action() */
-} c_redo_t;
-
-/*
- * Current action information for vi
- */
-typedef struct c_vcmd_t {
-	int	 action;
-	Char	*pos;
-} c_vcmd_t;
-
-/*
- * Kill buffer for emacs
- */
-typedef struct c_kill_t {
-	Char	*buf;
-	Char	*last;
-	Char	*mark;
-} c_kill_t;
-
-typedef void (*el_zfunc_t)(EditLine *, void *);
-
-/*
- * Note that we use both data structures because the user can bind
- * commands from both editors!
- */
-typedef struct el_chared_t {
-	c_undo_t	c_undo;
-	c_kill_t	c_kill;
-	c_redo_t	c_redo;
-	c_vcmd_t	c_vcmd;
-	c_macro_t	c_macro;
-	el_zfunc_t	c_resizefun;
-	void *		c_resizearg;
-} el_chared_t;
-
-
-#define	STRQQ		"\"\""
-
-#define	isglob(a)	(strchr("*[]?", (a)) != NULL)
-
-#define	NOP		0x00
-#define	DELETE		0x01
-#define	INSERT		0x02
-#define	YANK		0x04
-
-#define	CHAR_FWD	(+1)
-#define	CHAR_BACK	(-1)
-
-#define	MODE_INSERT	0
-#define	MODE_REPLACE	1
-#define	MODE_REPLACE_1	2
-
-#include "common.h"
-#include "vi.h"
-#include "emacs.h"
-#include "search.h"
-#include "fcns.h"
-
-
-protected int	 cv__isword(Int);
-protected int	 cv__isWord(Int);
-protected void	 cv_delfini(EditLine *);
-protected Char	*cv__endword(Char *, Char *, int, int (*)(Int));
-protected int	 ce__isword(Int);
-protected void	 cv_undo(EditLine *);
-protected void	 cv_yank(EditLine *, const Char *, int);
-protected Char	*cv_next_word(EditLine*, Char *, Char *, int, int (*)(Int));
-protected Char	*cv_prev_word(Char *, Char *, int, int (*)(Int));
-protected Char	*c__next_word(Char *, Char *, int, int (*)(Int));
-protected Char	*c__prev_word(Char *, Char *, int, int (*)(Int));
-protected void	 c_insert(EditLine *, int);
-protected void	 c_delbefore(EditLine *, int);
-protected void	 c_delbefore1(EditLine *);
-protected void	 c_delafter(EditLine *, int);
-protected void	 c_delafter1(EditLine *);
-protected int	 c_gets(EditLine *, Char *, const Char *);
-protected int	 c_hpos(EditLine *);
-
-protected int	 ch_init(EditLine *);
-protected void	 ch_reset(EditLine *, int);
-protected int	 ch_resizefun(EditLine *, el_zfunc_t, void *);
-protected int	 ch_enlargebufs(EditLine *, size_t);
-protected void	 ch_end(EditLine *);
-
-#endif /* _h_el_chared */
diff --git a/cmd-line-utils/libedit/chartype.c b/cmd-line-utils/libedit/chartype.c
deleted file mode 100644
index b70aebeec46a..000000000000
--- a/cmd-line-utils/libedit/chartype.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*	$NetBSD: chartype.c,v 1.10 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * chartype.c: character classification and meta information
- */
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#endif /* not lint && not SCCSID */
-#include "el.h"
-#include <stdlib.h>
-
-#define CT_BUFSIZ ((size_t)1024)
-
-#ifdef WIDECHAR
-protected void
-ct_conv_buff_resize(ct_buffer_t *conv, size_t mincsize, size_t minwsize)
-{
-	void *p;
-	if (mincsize > conv->csize) {
-		conv->csize = mincsize;
-		p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
-		if (p == NULL) {
-			conv->csize = 0;
-			el_free(conv->cbuff);
-			conv->cbuff = NULL;
-		} else 
-			conv->cbuff = p;
-	}
-
-	if (minwsize > conv->wsize) {
-		conv->wsize = minwsize;
-		p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
-		if (p == NULL) {
-			conv->wsize = 0;
-			el_free(conv->wbuff);
-			conv->wbuff = NULL;
-		} else
-			conv->wbuff = p;
-	}
-}
-
-
-public char *
-ct_encode_string(const Char *s, ct_buffer_t *conv)
-{
-	char *dst;
-	ssize_t used = 0;
-	mbstate_t state;
-
-	memset(&state, 0, sizeof(mbstate_t));
-
-	if (!s)
-		return NULL;
-	if (!conv->cbuff)
-		ct_conv_buff_resize(conv, CT_BUFSIZ, (size_t)0);
-	if (!conv->cbuff)
-		return NULL;
-
-	dst = conv->cbuff;
-	while (*s) {
-		used = (ssize_t)(conv->csize - (size_t)(dst - conv->cbuff));
-		if (used < 5) {
-			used = dst - conv->cbuff;
-			ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ,
-			    (size_t)0);
-			if (!conv->cbuff)
-				return NULL;
-			dst = conv->cbuff + used;
-		}
-		used = ct_encode_char(dst, (size_t)5, *s, &state);
-		if (used == -1) /* failed to encode, need more buffer space */
-			abort();
-		++s;
-		dst += used;
-	}
-	*dst = '\0';
-	return conv->cbuff;
-}
-
-public Char *
-ct_decode_string(const char *s, ct_buffer_t *conv)
-{
-	size_t len = 0;
-
-	if (!s)
-		return NULL;
-	if (!conv->wbuff)
-		ct_conv_buff_resize(conv, (size_t)0, CT_BUFSIZ);
-	if (!conv->wbuff)
-		return NULL;
-
-	len = ct_mbstowcs(NULL, s, (size_t)0);
-	if (len == (size_t)-1)
-		return NULL;
-	if (len > conv->wsize)
-		ct_conv_buff_resize(conv, (size_t)0, len + 1);
-	if (!conv->wbuff)
-		return NULL;
-	ct_mbstowcs(conv->wbuff, s, conv->wsize);
-	return conv->wbuff;
-}
-
-
-protected Char **
-ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
-{
-	size_t bufspace;
-	int i;
-	Char *p;
-	Char **wargv;
-	ssize_t bytes;
-	mbstate_t state;
-
-	/* Make sure we have enough space in the conversion buffer to store all
-	 * the argv strings. */
-	for (i = 0, bufspace = 0; i < argc; ++i)
-		bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
-	ct_conv_buff_resize(conv, (size_t)0, bufspace);
-	if (!conv->wsize)
-		return NULL;
-
-	wargv = el_malloc((size_t)argc * sizeof(*wargv));
-
-	for (i = 0, p = conv->wbuff; i < argc; ++i) {
-		if (!argv[i]) {   /* don't pass null pointers to mbsrtowcs */
-			wargv[i] = NULL;
-			continue;
-		} else {
-			wargv[i] = p;
-			memset(&state, 0, sizeof(mbstate_t));
-			bytes = (ssize_t)mbsrtowcs(p, argv + i, bufspace, &state);
-		}
-		if (bytes == -1) {
-			el_free(wargv);
-			return NULL;
-		} else
-			bytes++;  /* include '\0' in the count */
-		bufspace -= (size_t)bytes;
-		p += bytes;
-	}
-
-	return wargv;
-}
-
-
-protected size_t
-ct_enc_width(Char c)
-{
-	/* UTF-8 encoding specific values */
-	if (c < 0x80)
-		return 1;
-	else if (c < 0x0800)
-		return 2;
-	else if (c < 0x10000)
-		return 3;
-	else if (c < 0x110000)
-		return 4;
-	else
-		return 0; /* not a valid codepoint */
-}
-
-protected ssize_t
-ct_encode_char(char *dst, size_t len, Char c, mbstate_t *state)
-{
-	ssize_t l = 0;
-
-	if (len < ct_enc_width(c))
-		return -1;
-
-	l = wcrtomb(dst, c, state);
-
-	if (l < 0) {
-		memset (state, 0, sizeof (mbstate_t));
-		l = 0;
-	}
-	return l;
-}
-#endif
-
-protected const Char *
-ct_visual_string(const Char *s)
-{
-	static Char *buff = NULL;
-	static size_t buffsize = 0;
-	void *p;
-	Char *dst;
-	ssize_t used = 0;
-
-	if (!s)
-		return NULL;
-	if (!buff) {
-	    buffsize = CT_BUFSIZ;
-	    buff = el_malloc(buffsize * sizeof(*buff));
-	}
-	dst = buff;
-	while (*s) {
-		used = ct_visual_char(dst, buffsize - (size_t)(dst - buff), *s);
-		if (used == -1) { /* failed to encode, need more buffer space */
-			used = dst - buff;
-			buffsize += CT_BUFSIZ;
-			p = el_realloc(buff, buffsize * sizeof(*buff));
-			if (p == NULL)
-				goto out;
-			buff = p;
-			dst = buff + used;
-			/* don't increment s here - we want to retry it! */
-		}
-		else
-		    ++s;
-		dst += used;
-	}
-	if (dst >= (buff + buffsize)) { /* sigh */
-		buffsize += 1;
-		p = el_realloc(buff, buffsize * sizeof(*buff));
-		if (p == NULL)
-			goto out;
-		buff = p;
-		dst = buff + buffsize - 1;
-	}
-	*dst = 0;
-	return buff;
-out:
-	el_free(buff);
-	buffsize = 0;
-	return NULL;
-}
-
-
-protected int
-ct_visual_width(Char c)
-{
-	int t = ct_chr_class(c);
-	switch (t) {
-	case CHTYPE_ASCIICTL:
-		return 2; /* ^@ ^? etc. */
-	case CHTYPE_TAB:
-		return 1; /* Hmm, this really need to be handled outside! */
-	case CHTYPE_NL:
-		return 0; /* Should this be 1 instead? */
-#ifdef WIDECHAR
-	case CHTYPE_PRINT:
-		return wcwidth(c);
-	case CHTYPE_NONPRINT:
-		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
-			return 8; /* \U+12345 */
-		else
-			return 7; /* \U+1234 */
-#else
-	case CHTYPE_PRINT:
-		return 1;
-	case CHTYPE_NONPRINT:
-		return 4; /* \123 */
-#endif
-	default:
-		return 0; /* should not happen */
-	}
-}
-
-
-protected ssize_t
-ct_visual_char(Char *dst, size_t len, Char c)
-{
-	int t = ct_chr_class(c);
-	switch (t) {
-	case CHTYPE_TAB:
-	case CHTYPE_NL:
-	case CHTYPE_ASCIICTL:
-		if (len < 2)
-			return -1;   /* insufficient space */
-		*dst++ = '^';
-		if (c == '\177')
-			*dst = '?'; /* DEL -> ^? */
-		else
-			*dst = c | 0100;    /* uncontrolify it */
-		return 2;
-	case CHTYPE_PRINT:
-		if (len < 1)
-			return -1;  /* insufficient space */
-		*dst = c;
-		return 1;
-	case CHTYPE_NONPRINT:
-		/* we only use single-width glyphs for display,
-		 * so this is right */
-		if ((ssize_t)len < ct_visual_width(c))
-			return -1;   /* insufficient space */
-#ifdef WIDECHAR
-		*dst++ = '\\';
-		*dst++ = 'U';
-		*dst++ = '+';
-#define tohexdigit(v) "0123456789ABCDEF"[v]
-		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
-			*dst++ = tohexdigit(((unsigned int) c >> 16) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >> 12) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >>  8) & 0xf);
-		*dst++ = tohexdigit(((unsigned int) c >>  4) & 0xf);
-		*dst   = tohexdigit(((unsigned int) c      ) & 0xf);
-		return c > 0xffff ? 8 : 7;
-#else
-		*dst++ = '\\';
-#define tooctaldigit(v) ((v) + '0')
-		*dst++ = tooctaldigit(((unsigned int) c >> 6) & 0x7);
-		*dst++ = tooctaldigit(((unsigned int) c >> 3) & 0x7);
-		*dst++ = tooctaldigit(((unsigned int) c     ) & 0x7);
-#endif
-		/*FALLTHROUGH*/
-	/* these two should be handled outside this function */
-	default:            /* we should never hit the default */
-		return 0;
-	}
-}
-
-
-
-
-protected int
-ct_chr_class(Char c)
-{
-	if (c == '\t')
-		return CHTYPE_TAB;
-	else if (c == '\n')
-		return CHTYPE_NL;
-	else if (IsASCII(c) && Iscntrl(c))
-		return CHTYPE_ASCIICTL;
-	else if (Isprint(c))
-		return CHTYPE_PRINT;
-	else
-		return CHTYPE_NONPRINT;
-}
diff --git a/cmd-line-utils/libedit/chartype.h b/cmd-line-utils/libedit/chartype.h
deleted file mode 100644
index 40012afb47de..000000000000
--- a/cmd-line-utils/libedit/chartype.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*	$NetBSD: chartype.h,v 1.8 2011/07/29 23:44:44 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _h_chartype_f
-#define _h_chartype_f
-
-
-
-#ifdef WIDECHAR
-
-/* Ideally we should also test the value of the define to see if it
- * supports non-BMP code points without requiring UTF-16, but nothing
- * seems to actually advertise this properly, despite Unicode 3.1 having
- * been around since 2001... */
-
-/* XXXMYSQL : Added FreeBSD & AIX to bypass this check.
-  TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
-#if !defined(__NetBSD__) && !defined(__sun) \
-  && !(defined(__APPLE__) && defined(__MACH__)) \
-  && !defined(__FreeBSD__) && !defined(_AIX)
-#ifndef __STDC_ISO_10646__
-/* In many places it is assumed that the first 127 code points are ASCII
- * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
- * funky encoding that could break us in weird and wonderful ways. */
-	#error wchar_t must store ISO 10646 characters
-#endif
-#endif
-
-/* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
- * ref: ISO/IEC DTR 19769
- */
-#if WCHAR_MAX < INT32_MAX
-#warning Build environment does not support non-BMP characters
-#endif
-
-#ifndef HAVE_WCSDUP
-wchar_t *wcsdup(const wchar_t *s);
-#endif
-
-#define ct_wctomb            wctomb
-#define ct_wctomb_reset      wctomb(0,0)
-#define ct_wcstombs          wcstombs
-#define ct_mbstowcs          mbstowcs
-
-#define Char			wchar_t
-#define Int			wint_t
-#define FUN(prefix,rest)	prefix ## _w ## rest
-#define FUNW(type)		type ## _w
-#define TYPE(type)		type ## W
-#define FSTR			"%ls"
-#define STR(x) 			L ## x
-#define UC(c)			c
-#define Isalpha(x)  iswalpha(x)
-#define Isalnum(x)  iswalnum(x)
-#define Isgraph(x)  iswgraph(x)
-#define Isspace(x)  iswspace(x)
-#define Isdigit(x)  iswdigit(x)
-#define Iscntrl(x)  iswcntrl(x)
-#define Isprint(x)  iswprint(x)
-
-#define Isupper(x)  iswupper(x)
-#define Islower(x)  iswlower(x)
-#define Toupper(x)  towupper(x)
-#define Tolower(x)  towlower(x)
-
-#define IsASCII(x)  (x < 0x100)
-
-#define Strlen(x)       wcslen(x)
-#define Strchr(s,c)     wcschr(s,c)
-#define Strrchr(s,c)    wcsrchr(s,c)
-#define Strstr(s,v)     wcsstr(s,v)
-#define Strdup(x)       wcsdup(x)
-#define Strcpy(d,s)     wcscpy(d,s)
-#define Strncpy(d,s,n)  wcsncpy(d,s,n)
-#define Strncat(d,s,n)  wcsncat(d,s,n)
-
-#define Strcmp(s,v)     wcscmp(s,v)
-#define Strncmp(s,v,n)  wcsncmp(s,v,n)
-#define Strcspn(s,r)    wcscspn(s,r)
-
-#define Strtol(p,e,b)   wcstol(p,e,b)
-
-#define Width(c)	wcwidth(c)
-
-#else /* NARROW */
-
-#define ct_mbtowc            error
-#define ct_mbtowc_reset      
-#define ct_wctomb            error
-#define ct_wctomb_reset      
-#define ct_wcstombs(a, b, c)    (strncpy(a, b, c), strlen(a))
-#define ct_mbstowcs(a, b, c)    (strncpy(a, b, c), strlen(a))
-
-#define Char			char
-#define Int			int
-#define FUN(prefix,rest)	prefix ## _ ## rest
-#define FUNW(type)		type
-#define TYPE(type)		type
-#define FSTR			"%s"
-#define STR(x) 			x
-#define UC(c)			(unsigned char)(c)
-
-#define Isalpha(x)  isalpha((unsigned char)x)
-#define Isalnum(x)  isalnum((unsigned char)x)
-#define Isgraph(x)  isgraph((unsigned char)x)
-#define Isspace(x)  isspace((unsigned char)x)
-#define Isdigit(x)  isdigit((unsigned char)x)
-#define Iscntrl(x)  iscntrl((unsigned char)x)
-#define Isprint(x)  isprint((unsigned char)x)
-
-#define Isupper(x)  isupper((unsigned char)x)
-#define Islower(x)  islower((unsigned char)x)
-#define Toupper(x)  toupper((unsigned char)x)
-#define Tolower(x)  tolower((unsigned char)x)
-
-#define IsASCII(x)  isascii((unsigned char)x)
-
-#define Strlen(x)       strlen(x)
-#define Strchr(s,c)     strchr(s,c)
-#define Strrchr(s,c)    strrchr(s,c)
-#define Strstr(s,v)     strstr(s,v)
-#define Strdup(x)       strdup(x)
-#define Strcpy(d,s)     strcpy(d,s)
-#define Strncpy(d,s,n)  strncpy(d,s,n)
-#define Strncat(d,s,n)  strncat(d,s,n)
-
-#define Strcmp(s,v)     strcmp(s,v)
-#define Strncmp(s,v,n)  strncmp(s,v,n)
-#define Strcspn(s,r)    strcspn(s,r)
-
-#define Strtol(p,e,b)   strtol(p,e,b)
-
-#define Width(c)	1
-
-#endif
-
-
-#ifdef WIDECHAR
-/*
- * Conversion buffer
- */
-typedef struct ct_buffer_t {
-        char    *cbuff;
-        size_t  csize;
-        Char *wbuff;
-        size_t  wsize;
-} ct_buffer_t;
-
-#define ct_encode_string __ct_encode_string
-/* Encode a wide-character string and return the UTF-8 encoded result. */
-public char *ct_encode_string(const Char *, ct_buffer_t *);
-
-#define ct_decode_string __ct_decode_string
-/* Decode a (multi)?byte string and return the wide-character string result. */
-public Char *ct_decode_string(const char *, ct_buffer_t *);
-
-/* Decode a (multi)?byte argv string array.
- * The pointer returned must be free()d when done. */
-protected Char **ct_decode_argv(int, const char *[],  ct_buffer_t *);
-
-/* Resizes the conversion buffer(s) if needed. */
-protected void ct_conv_buff_resize(ct_buffer_t *, size_t, size_t);
-protected ssize_t ct_encode_char(char *, size_t, Char, mbstate_t *);
-protected size_t ct_enc_width(Char);
-
-#define ct_free_argv(s)	el_free(s)
-
-#else
-#define	ct_encode_string(s, b)	(s)
-#define ct_decode_string(s, b)	(s)
-#define ct_decode_argv(l, s, b)	(s)
-#define ct_conv_buff_resize(b, os, ns)
-#define ct_encode_char(d, l, s, ps)	(*d = s, 1)
-#define ct_free_argv(s)
-#endif
-
-#ifndef NARROWCHAR
-/* Encode a characted into the destination buffer, provided there is sufficent
- * buffer space available. Returns the number of bytes used up (zero if the
- * character cannot be encoded, -1 if there was not enough space available). */
-
-/* The maximum buffer size to hold the most unwieldly visual representation,
- * in this case \U+nnnnn. */
-#define VISUAL_WIDTH_MAX ((size_t)8)
-
-/* The terminal is thought of in terms of X columns by Y lines. In the cases
- * where a wide character takes up more than one column, the adjacent 
- * occupied column entries will contain this faux character. */
-#define MB_FILL_CHAR ((Char)-1)
-
-/* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
- * style visual expansions. */
-protected int ct_visual_width(Char);
-
-/* Turn the given character into the appropriate visual format, matching
- * the width given by ct_visual_width(). Returns the number of characters used
- * up, or -1 if insufficient space. Buffer length is in count of Char's. */
-protected ssize_t ct_visual_char(Char *, size_t, Char);
-
-/* Convert the given string into visual format, using the ct_visual_char()
- * function. Uses a static buffer, so not threadsafe. */
-protected const Char *ct_visual_string(const Char *);
-
-
-/* printable character, use ct_visual_width() to find out display width */
-#define CHTYPE_PRINT        ( 0)
-/* control character found inside the ASCII portion of the charset */
-#define CHTYPE_ASCIICTL     (-1)
-/* a \t */
-#define CHTYPE_TAB          (-2)
-/* a \n */
-#define CHTYPE_NL           (-3)
-/* non-printable character */
-#define CHTYPE_NONPRINT     (-4)
-/* classification of character c, as one of the above defines */
-protected int ct_chr_class(Char c);
-#endif
-
-
-#endif /* _chartype_f */
diff --git a/cmd-line-utils/libedit/config.h b/cmd-line-utils/libedit/config.h
deleted file mode 100644
index c06d5e28a0ab..000000000000
--- a/cmd-line-utils/libedit/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "my_config.h"
-#include "sys.h"
-#ifndef NARROW_WRAPPER
-#define WIDECHAR
-#endif
diff --git a/cmd-line-utils/libedit/editline/readline.h b/cmd-line-utils/libedit/editline/readline.h
deleted file mode 100644
index d9efe3e01a83..000000000000
--- a/cmd-line-utils/libedit/editline/readline.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*	$NetBSD: readline.h,v 1.32 2010/09/16 20:08:52 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-#ifndef _READLINE_H_
-#define _READLINE_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/* list of readline stuff supported by editline library's readline wrapper */
-
-/* typedefs */
-typedef int	  Function(const char *, int);
-typedef void	  VFunction(void);
-typedef void	  VCPFunction(char *);
-typedef char	 *CPFunction(const char *, int);
-typedef char	**CPPFunction(const char *, int, int);
-typedef char     *rl_compentry_func_t(const char *, int);
-typedef int	  rl_command_func_t(int, int);
-
-/* only supports length */
-typedef struct {
-	int length;
-} HISTORY_STATE;
-
-typedef void *histdata_t;
-
-typedef struct _hist_entry {
-	const char	*line;
-	histdata_t 	 data;
-} HIST_ENTRY;
-
-typedef struct _keymap_entry {
-	char type;
-#define ISFUNC	0
-#define ISKMAP	1
-#define ISMACR	2
-	Function *function;
-} KEYMAP_ENTRY;
-
-#define KEYMAP_SIZE	256
-
-typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
-typedef KEYMAP_ENTRY *Keymap;
-
-#define control_character_threshold	0x20
-#define control_character_bit		0x40
-
-#ifndef CTRL
-#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__QNXNTO__) && !defined(__USLC__)
-#include <sys/ttydefaults.h>
-#endif
-#ifndef CTRL
-#define CTRL(c)		((c) & 037)
-#endif
-#endif
-#ifndef UNCTRL
-#define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
-#endif
-
-#define RUBOUT		0x7f
-#define ABORT_CHAR	CTRL('G')
-#define RL_READLINE_VERSION 	0x0402
-#define RL_PROMPT_START_IGNORE	'\1'
-#define RL_PROMPT_END_IGNORE	'\2'
-
-/* global variables used by readline enabled applications */
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const char	*rl_library_version;
-extern int 		rl_readline_version; 
-extern char		*rl_readline_name;
-extern FILE		*rl_instream;
-extern FILE		*rl_outstream;
-extern char		*rl_line_buffer;
-extern int		 rl_point, rl_end;
-extern int		 history_base, history_length;
-extern int		 max_input_history;
-extern char		*rl_basic_word_break_characters;
-extern char		*rl_completer_word_break_characters;
-extern char		*rl_completer_quote_characters;
-extern Function		*rl_completion_entry_function;
-extern CPPFunction	*rl_attempted_completion_function;
-extern int		 rl_attempted_completion_over;
-extern int		rl_completion_type;
-extern int		rl_completion_query_items;
-extern char		*rl_special_prefixes;
-extern int		rl_completion_append_character;
-extern int		rl_inhibit_completion;
-extern Function		*rl_pre_input_hook;
-extern Function		*rl_startup_hook;
-extern char		*rl_terminal_name;
-extern int		rl_already_prompted;
-extern char		*rl_prompt;
-/*
- * The following is not implemented
- */
-extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
-			emacs_meta_keymap,
-			emacs_ctlx_keymap;
-extern int		rl_filename_completion_desired;
-extern int		rl_ignore_completion_duplicates;
-extern int		(*rl_getc_function)(FILE *);
-extern VFunction	*rl_redisplay_function;
-extern VFunction	*rl_completion_display_matches_hook;
-extern VFunction	*rl_prep_term_function;
-extern VFunction	*rl_deprep_term_function;
-extern int		readline_echoing_p;
-extern int		_rl_print_completions_horizontally;
-
-/* supported functions */
-char		*readline(const char *);
-int		 rl_initialize(void);
-
-void		 using_history(void);
-int		 add_history(const char *);
-void		 clear_history(void);
-void		 stifle_history(int);
-int		 unstifle_history(void);
-int		 history_is_stifled(void);
-int		 where_history(void);
-HIST_ENTRY	*current_history(void);
-HIST_ENTRY	*history_get(int);
-HIST_ENTRY	*remove_history(int);
-HIST_ENTRY	*replace_history_entry(int, const char *, histdata_t);
-int		 history_total_bytes(void);
-int		 history_set_pos(int);
-HIST_ENTRY	*previous_history(void);
-HIST_ENTRY	*next_history(void);
-int		 history_search(const char *, int);
-int		 history_search_prefix(const char *, int);
-int		 history_search_pos(const char *, int, int);
-int		 read_history(const char *);
-int		 write_history(const char *);
-int		 history_truncate_file (const char *, int);
-int		 history_expand(char *, char **);
-char	       **history_tokenize(const char *);
-const char	*get_history_event(const char *, int *, int);
-char		*history_arg_extract(int, int, const char *);
-
-char		*tilde_expand(char *);
-char		*filename_completion_function(const char *, int);
-char		*username_completion_function(const char *, int);
-int		 rl_complete(int, int);
-int		 rl_read_key(void);
-char	       **completion_matches(const char *, CPFunction *);
-void		 rl_display_match_list(char **, int, int);
-
-int		 rl_insert(int, int);
-int		 rl_insert_text(const char *);
-void		 rl_reset_terminal(const char *);
-int		 rl_bind_key(int, rl_command_func_t *);
-int		 rl_newline(int, int);
-void		 rl_callback_read_char(void);
-void		 rl_callback_handler_install(const char *, VCPFunction *);
-void		 rl_callback_handler_remove(void);
-void		 rl_redisplay(void);
-int		 rl_get_previous_history(int, int);
-void		 rl_prep_terminal(int);
-void		 rl_deprep_terminal(void);
-int		 rl_read_init_file(const char *);
-int		 rl_parse_and_bind(const char *);
-int		 rl_variable_bind(const char *, const char *);
-void		 rl_stuff_char(int);
-int		 rl_add_defun(const char *, Function *, int);
-HISTORY_STATE	*history_get_history_state(void);
-void		 rl_get_screen_size(int *, int *);
-void		 rl_set_screen_size(int, int);
-char 		*rl_filename_completion_function (const char *, int);
-int		 _rl_abort_internal(void);
-int		 _rl_qsort_string_compare(char **, char **);
-char 	       **rl_completion_matches(const char *, rl_compentry_func_t *);
-void		 rl_forced_update_display(void);
-int		 rl_set_prompt(const char *);
-int		 rl_on_new_line(void);
-
-/*
- * The following are not implemented
- */
-int		 rl_kill_text(int, int);
-Keymap		 rl_get_keymap(void);
-void		 rl_set_keymap(Keymap);
-Keymap		 rl_make_bare_keymap(void);
-int		 rl_generic_bind(int, const char *, const char *, Keymap);
-int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
-void		 rl_cleanup_after_signal(void);
-void		 rl_free_line_state(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/cmd-line-utils/libedit/el.c b/cmd-line-utils/libedit/el.c
deleted file mode 100644
index c7f4f81ec936..000000000000
--- a/cmd-line-utils/libedit/el.c
+++ /dev/null
@@ -1,636 +0,0 @@
-/*	$NetBSD: el.c,v 1.68 2011/07/29 15:16:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
-#else
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * el.c: EditLine interface functions
- */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <locale.h>
-#include <langinfo.h>
-#include "el.h"
-
-/* el_init():
- *	Initialize editline and set default parameters.
- */
-public EditLine *
-el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
-{
-	EditLine *el = el_malloc(sizeof(*el));
-
-	if (el == NULL)
-		return NULL;
-
-	memset(el, 0, sizeof(EditLine));
-
-	el->el_infile = fin;
-	el->el_outfile = fout;
-	el->el_errfile = ferr;
-
-	el->el_infd = fileno(fin);
-	el->el_outfd = fileno(fout);
-	el->el_errfd = fileno(ferr);
-
-	el->el_prog = Strdup(ct_decode_string(prog, &el->el_scratch));
-	if (el->el_prog == NULL) {
-		el_free(el);
-		return NULL;
-	}
-
-	/*
-         * Initialize all the modules. Order is important!!!
-         */
-	el->el_flags = 0;
-#ifdef WIDECHAR
-	setlocale(LC_CTYPE, NULL);
-        if (MB_CUR_MAX > 1)
-		el->el_flags |= CHARSET_IS_MULTIBYTE;
-#endif
-
-	if (terminal_init(el) == -1) {
-		el_free(el->el_prog);
-		el_free(el);
-		return NULL;
-	}
-	(void) keymacro_init(el);
-	(void) map_init(el);
-	if (tty_init(el) == -1)
-		el->el_flags |= NO_TTY;
-	(void) ch_init(el);
-	(void) search_init(el);
-	(void) hist_init(el);
-	(void) prompt_init(el);
-	(void) sig_init(el);
-	(void) read_init(el);
-
-	return el;
-}
-
-
-/* el_end():
- *	Clean up.
- */
-public void
-el_end(EditLine *el)
-{
-
-	if (el == NULL)
-		return;
-
-	el_reset(el);
-
-	terminal_end(el);
-	keymacro_end(el);
-	map_end(el);
-	tty_end(el);
-	ch_end(el);
-	search_end(el);
-	hist_end(el);
-	prompt_end(el);
-	sig_end(el);
-
-	el_free(el->el_prog);
-#ifdef WIDECHAR
-	el_free(el->el_scratch.cbuff);
-	el_free(el->el_scratch.wbuff);
-	el_free(el->el_lgcyconv.cbuff);
-	el_free(el->el_lgcyconv.wbuff);
-#endif
-	el_free(el);
-}
-
-
-/* el_reset():
- *	Reset the tty and the parser
- */
-public void
-el_reset(EditLine *el)
-{
-
-	tty_cookedmode(el);
-	ch_reset(el, 0);		/* XXX: Do we want that? */
-}
-
-
-/* el_set():
- *	set the editline parameters
- */
-public int
-FUN(el,set)(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int rv = 0;
-
-	if (el == NULL)
-		return -1;
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-
-		rv = prompt_set(el, p, 0, op, 1);
-		break;
-	}
-
-	case EL_RESIZE: {
-		el_zfunc_t p = va_arg(ap, el_zfunc_t);
-		void *arg = va_arg(ap, void *);
-		rv = ch_resizefun(el, p, arg);
-		break;
-	}
-
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		int c = va_arg(ap, int);
-
-		rv = prompt_set(el, p, c, op, 1);
-		break;
-	}
-
-	case EL_TERMINAL:
-		rv = terminal_set(el, va_arg(ap, char *));
-		break;
-
-	case EL_EDITOR:
-		rv = map_set_editor(el, va_arg(ap, Char *));
-		break;
-
-	case EL_SIGNAL:
-		if (va_arg(ap, int))
-			el->el_flags |= HANDLE_SIGNALS;
-		else
-			el->el_flags &= ~HANDLE_SIGNALS;
-		break;
-
-	case EL_BIND:
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY:
-	{
-		const Char *argv[20];
-		int i;
-
-		for (i = 1; i < 20; i++)
-			if ((argv[i] = va_arg(ap, Char *)) == NULL)
-				break;
-
-		switch (op) {
-		case EL_BIND:
-			argv[0] = STR("bind");
-			rv = map_bind(el, i, argv);
-			break;
-
-		case EL_TELLTC:
-			argv[0] = STR("telltc");
-			rv = terminal_telltc(el, i, argv);
-			break;
-
-		case EL_SETTC:
-			argv[0] = STR("settc");
-			rv = terminal_settc(el, i, argv);
-			break;
-
-		case EL_ECHOTC:
-			argv[0] = STR("echotc");
-			rv = terminal_echotc(el, i, argv);
-			break;
-
-		case EL_SETTY:
-			argv[0] = STR("setty");
-			rv = tty_stty(el, i, argv);
-			break;
-
-		default:
-			rv = -1;
-			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
-			break;
-		}
-		break;
-	}
-
-	case EL_ADDFN:
-	{
-		Char *name = va_arg(ap, Char *);
-		Char *help = va_arg(ap, Char *);
-		el_func_t func = va_arg(ap, el_func_t);
-
-		rv = map_addfunc(el, name, help, func);
-		break;
-	}
-
-	case EL_HIST:
-	{
-		hist_fun_t func = va_arg(ap, hist_fun_t);
-		void *ptr = va_arg(ap, void *);
-
-		rv = hist_set(el, func, ptr);
-		if (!(el->el_flags & CHARSET_IS_MULTIBYTE))
-			el->el_flags &= ~NARROW_HISTORY;
-		break;
-	}
-
-	case EL_EDITMODE:
-		if (va_arg(ap, int))
-			el->el_flags &= ~EDIT_DISABLED;
-		else
-			el->el_flags |= EDIT_DISABLED;
-		rv = 0;
-		break;
-
-	case EL_GETCFN:
-	{
-		el_rfunc_t rc = va_arg(ap, el_rfunc_t);
-		rv = el_read_setfn(el, rc);
-		el->el_flags &= ~NARROW_READ;
-		break;
-	}
-
-	case EL_CLIENTDATA:
-		el->el_data = va_arg(ap, void *);
-		break;
-
-	case EL_UNBUFFERED:
-		rv = va_arg(ap, int);
-		if (rv && !(el->el_flags & UNBUFFERED)) {
-			el->el_flags |= UNBUFFERED;
-			read_prepare(el);
-		} else if (!rv && (el->el_flags & UNBUFFERED)) {
-			el->el_flags &= ~UNBUFFERED;
-			read_finish(el);
-		}
-		rv = 0;
-		break;
-
-	case EL_PREP_TERM:
-		rv = va_arg(ap, int);
-		if (rv)
-			(void) tty_rawmode(el);
-		else
-			(void) tty_cookedmode(el);
-		rv = 0;
-		break;
-
-	case EL_SETFP:
-	{
-		FILE *fp;
-		int what;
-
-		what = va_arg(ap, int);
-		fp = va_arg(ap, FILE *);
-
-		rv = 0;
-		switch (what) {
-		case 0:
-			el->el_infile = fp;
-			el->el_infd = fileno(fp);
-			break;
-		case 1:
-			el->el_outfile = fp;
-			el->el_outfd = fileno(fp);
-			break;
-		case 2:
-			el->el_errfile = fp;
-			el->el_errfd = fileno(fp);
-			break;
-		default:
-			rv = -1;
-			break;
-		}
-		break;
-	}
-
-	case EL_REFRESH:
-		re_clear_display(el);
-		re_refresh(el);
-		terminal__flush(el);
-		break;
-
-	default:
-		rv = -1;
-		break;
-	}
-
-	va_end(ap);
-	return rv;
-}
-
-
-/* el_get():
- *	retrieve the editline parameters
- */
-public int
-FUN(el,get)(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int rv;
-
-	if (el == NULL)
-		return -1;
-
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		rv = prompt_get(el, p, 0, op);
-		break;
-	}
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		Char *c = va_arg(ap, Char *);
-
-		rv = prompt_get(el, p, c, op);
-		break;
-	}
-
-	case EL_EDITOR:
-		rv = map_get_editor(el, va_arg(ap, const Char **));
-		break;
-
-	case EL_SIGNAL:
-		*va_arg(ap, int *) = (el->el_flags & HANDLE_SIGNALS);
-		rv = 0;
-		break;
-
-	case EL_EDITMODE:
-		*va_arg(ap, int *) = !(el->el_flags & EDIT_DISABLED);
-		rv = 0;
-		break;
-
-	case EL_TERMINAL:
-		terminal_get(el, va_arg(ap, const char **));
-		rv = 0;
-		break;
-
-	case EL_GETTC:
-	{
-		static char name[] = "gettc";
-		char *argv[20];
-		int i;
-
- 		for (i = 1; i < (int)(sizeof(argv) / sizeof(argv[0])); i++)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
-				break;
-
-		switch (op) {
-		case EL_GETTC:
-			argv[0] = name;
-			rv = terminal_gettc(el, i, argv);
-			break;
-
-		default:
-			rv = -1;
-			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
-			break;
-		}
-		break;
-	}
-
-	case EL_GETCFN:
-		*va_arg(ap, el_rfunc_t *) = el_read_getfn(el);
-		rv = 0;
-		break;
-
-	case EL_CLIENTDATA:
-		*va_arg(ap, void **) = el->el_data;
-		rv = 0;
-		break;
-
-	case EL_UNBUFFERED:
-		*va_arg(ap, int *) = (!(el->el_flags & UNBUFFERED));
-		rv = 0;
-		break;
-
-	case EL_GETFP:
-	{
-		int what;
-		FILE **fpp;
-
-		what = va_arg(ap, int);
-		fpp = va_arg(ap, FILE **);
-		rv = 0;
-		switch (what) {
-		case 0:
-			*fpp = el->el_infile;
-			break;
-		case 1:
-			*fpp = el->el_outfile;
-			break;
-		case 2:
-			*fpp = el->el_errfile;
-			break;
-		default:
-			rv = -1;
-			break;
-		}
-		break;
-	}
-	default:
-		rv = -1;
-		break;
-	}
-	va_end(ap);
-
-	return rv;
-}
-
-
-/* el_line():
- *	Return editing info
- */
-public const TYPE(LineInfo) *
-FUN(el,line)(EditLine *el)
-{
-
-	return (const TYPE(LineInfo) *)(void *)&el->el_line;
-}
-
-
-/* el_source():
- *	Source a file
- */
-public int
-el_source(EditLine *el, const char *fname)
-{
-	FILE *fp;
-	size_t len;
-	char *ptr;
-	char *path = NULL;
-	const Char *dptr;
-	int error = 0;
-
-	fp = NULL;
-	if (fname == NULL) {
-/* XXXMYSQL: Bug#49967 */
-#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) && \
-    defined(HAVE_GETGID) && defined(HAVE_GETEGID)
-#define HAVE_IDENTITY_FUNCS 1
-#endif
-
-#if (defined(HAVE_ISSETUGID) || defined(HAVE_IDENTITY_FUNCS))
-		static const char elpath[] = "/.editrc";
-		size_t plen = sizeof(elpath);
-/* XXXMYSQL: Portability fix (for which platforms?) */
-#ifdef HAVE_ISSETUGID
-		if (issetugid())
-			return -1;
-#elif defined(HAVE_IDENTITY_FUNCS)
-                if (getuid() != geteuid() || getgid() != getegid())
-                  return (-1);
-#endif
-		if ((ptr = getenv("HOME")) == NULL)
-			return -1;
-		plen += strlen(ptr);
-		if ((path = el_malloc(plen * sizeof(*path))) == NULL)
-			return -1;
-		(void)snprintf(path, plen, "%s%s", ptr, elpath);
-		fname = path;
-#else
-		/*
-		 * If issetugid() or the above mentioned get[e][u|g]id()
-		 * functions are missing, always return an error, in order
-		 * to keep from inadvertently opening up the user to a
-		 * security hole.
-		 */
-		return -1;
-#endif
-	}
-	if (fp == NULL)
-		fp = fopen(fname, "r");
-	if (fp == NULL) {
-		el_free(path);
-		return -1;
-	}
-
-	while ((ptr = fgetln(fp, &len)) != NULL) {
-		if (*ptr == '\n')
-			continue;	/* Empty line. */
-		dptr = ct_decode_string(ptr, &el->el_scratch);
-		if (!dptr)
-			continue;
-		if (len > 0 && dptr[len - 1] == '\n')
-			--len;
-
-		/* loop until first non-space char or EOL */
-		while (*dptr != '\0' && Isspace(*dptr))
-			dptr++;
-		if (*dptr == '#')
-			continue;   /* ignore, this is a comment line */
-		if ((error = parse_line(el, dptr)) == -1)
-			break;
-	}
-
-	el_free(path);
-	(void) fclose(fp);
-	return error;
-}
-
-
-/* el_resize():
- *	Called from program when terminal is resized
- */
-public void
-el_resize(EditLine *el)
-{
-	int lins, cols;
-	sigset_t oset, nset;
-
-	(void) sigemptyset(&nset);
-	(void) sigaddset(&nset, SIGWINCH);
-	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-	/* get the correct window size */
-	if (terminal_get_size(el, &lins, &cols))
-		terminal_change_size(el, lins, cols);
-
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-}
-
-
-/* el_beep():
- *	Called from the program to beep
- */
-public void
-el_beep(EditLine *el)
-{
-
-	terminal_beep(el);
-}
-
-
-/* el_editmode()
- *	Set the state of EDIT_DISABLED from the `edit' command.
- */
-protected int
-/*ARGSUSED*/
-el_editmode(EditLine *el, int argc, const Char **argv)
-{
-	const Char *how;
-
-	if (argv == NULL || argc != 2 || argv[1] == NULL)
-		return -1;
-
-	how = argv[1];
-	if (Strcmp(how, STR("on")) == 0) {
-		el->el_flags &= ~EDIT_DISABLED;
-		tty_rawmode(el);
-	} else if (Strcmp(how, STR("off")) == 0) {
-		tty_cookedmode(el);
-		el->el_flags |= EDIT_DISABLED;
-	}
-	else {
-		(void) fprintf(el->el_errfile, "edit: Bad value `" FSTR "'.\n",
-		    how);
-		return -1;
-	}
-	return 0;
-}
diff --git a/cmd-line-utils/libedit/el_terminal.h b/cmd-line-utils/libedit/el_terminal.h
deleted file mode 100644
index db0bb94fa939..000000000000
--- a/cmd-line-utils/libedit/el_terminal.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 2015
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)term.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.term.h: Termcap header
- */
-#ifndef _h_el_terminal
-#define	_h_el_terminal
-
-#include "histedit.h"
-
-typedef struct {		/* Symbolic function key bindings	*/
-	const Char	*name;	/* name of the key			*/
-	int		 key;	/* Index in termcap table		*/
-	keymacro_value_t	 fun;	/* Function bound to it			*/
-	int		 type;	/* Type of function			*/
-} funckey_t;
-
-typedef struct {
-	const char *t_name;		/* the terminal name	*/
-	coord_t	  t_size;		/* # lines and cols	*/
-	int	  t_flags;
-#define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
-#define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
-#define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
-#define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
-#define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
-#define	TERM_CAN_UP		0x020	/* Can move up		*/
-#define	TERM_HAS_META		0x040	/* Has a meta key	*/
-#define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
-#define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
-	char	 *t_buf;		/* Termcap buffer	*/
-	size_t	  t_loc;		/* location used	*/
-	char	**t_str;		/* termcap strings	*/
-	int	 *t_val;		/* termcap values	*/
-	char	 *t_cap;		/* Termcap buffer	*/
-	funckey_t	 *t_fkey;		/* Array of keys	*/
-} el_terminal_t;
-
-/*
- * fKey indexes
- */
-#define	A_K_DN		0
-#define	A_K_UP		1
-#define	A_K_LT		2
-#define	A_K_RT		3
-#define	A_K_HO		4
-#define	A_K_EN		5
-#define	A_K_NKEYS	6
-
-protected void	terminal_move_to_line(EditLine *, int);
-protected void	terminal_move_to_char(EditLine *, int);
-protected void	terminal_clear_EOL(EditLine *, int);
-protected void	terminal_overwrite(EditLine *, const Char *, size_t);
-protected void	terminal_insertwrite(EditLine *, Char *, int);
-protected void	terminal_deletechars(EditLine *, int);
-protected void	terminal_clear_screen(EditLine *);
-protected void	terminal_beep(EditLine *);
-protected int	terminal_change_size(EditLine *, int, int);
-protected int	terminal_get_size(EditLine *, int *, int *);
-protected int	terminal_init(EditLine *);
-protected void	terminal_bind_arrow(EditLine *);
-protected void	terminal_print_arrow(EditLine *, const Char *);
-protected int	terminal_clear_arrow(EditLine *, const Char *);
-protected int	terminal_set_arrow(EditLine *, const Char *, keymacro_value_t *, int);
-protected void	terminal_end(EditLine *);
-protected void	terminal_get(EditLine *, const char **);
-protected int	terminal_set(EditLine *, const char *);
-protected int	terminal_settc(EditLine *, int, const Char **);
-protected int	terminal_gettc(EditLine *, int, char **);
-protected int	terminal_telltc(EditLine *, int, const Char **);
-protected int	terminal_echotc(EditLine *, int, const Char **);
-protected int	terminal_writec(EditLine *, Int);
-protected int	terminal__putc(EditLine *, Int);
-protected void	terminal__flush(EditLine *);
-
-/*
- * Easy access macros
- */
-#define	EL_FLAGS	(el)->el_terminal.t_flags
-
-#define	EL_CAN_INSERT		(EL_FLAGS & TERM_CAN_INSERT)
-#define	EL_CAN_DELETE		(EL_FLAGS & TERM_CAN_DELETE)
-#define	EL_CAN_CEOL		(EL_FLAGS & TERM_CAN_CEOL)
-#define	EL_CAN_TAB		(EL_FLAGS & TERM_CAN_TAB)
-#define	EL_CAN_ME		(EL_FLAGS & TERM_CAN_ME)
-#define EL_CAN_UP		(EL_FLAGS & TERM_CAN_UP)
-#define	EL_HAS_META		(EL_FLAGS & TERM_HAS_META)
-#define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
-#define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
-
-#endif /* _h_el_terminal */
diff --git a/cmd-line-utils/libedit/filecomplete.c b/cmd-line-utils/libedit/filecomplete.c
deleted file mode 100644
index b67b54510bf5..000000000000
--- a/cmd-line-utils/libedit/filecomplete.c
+++ /dev/null
@@ -1,612 +0,0 @@
-/*	$NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/* AIX requires this to be the first thing in the file.  */
-#if defined (_AIX) && !defined (__GNUC__)
- #pragma alloca
-#endif
-
-#include "config.h"
-
-/* XXXMYSQL */
-#ifdef __GNUC__
-# undef alloca
-# define alloca(n) __builtin_alloca (n)
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifndef _AIX
-extern char *alloca ();
-#  endif
-# endif
-#endif
-
-#if !defined(lint) && !defined(SCCSID)
-#endif /* not lint && not SCCSID */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <string.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HAVE_VIS_H
-#include <vis.h>
-#else
-#include "np/vis.h"
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include "el.h"
-#include "fcns.h"		/* for EL_NUM_FCNS */
-#include "histedit.h"
-#include "filecomplete.h"
-
-static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
-    '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-
-
-/********************************/
-/* completion functions */
-
-/*
- * does tilde expansion of strings of type ``~user/foo''
- * if ``user'' isn't valid user name or ``txt'' doesn't start
- * w/ '~', returns pointer to strdup()ed copy of ``txt''
- *
- * it's callers's responsibility to free() returned string
- */
-char *
-fn_tilde_expand(const char *txt)
-{
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	struct passwd pwres;
-	char pwbuf[1024];
-#endif
-	struct passwd *pass;
-	char *temp;
-	size_t len = 0;
-
-	if (txt[0] != '~')
-		return strdup(txt);
-
-	temp = strchr(txt + 1, '/');
-	if (temp == NULL) {
-		temp = strdup(txt + 1);
-		if (temp == NULL)
-			return NULL;
-	} else {
-		/* text until string after slash */
-		len = (size_t)(temp - txt + 1);
-		temp = el_malloc(len * sizeof(*temp));
-		if (temp == NULL)
-			return NULL;
-		(void)strncpy(temp, txt + 1, len - 2);
-		temp[len - 2] = '\0';
-	}
-	if (temp[0] == 0) {
-#ifdef HAVE_GETPW_R_POSIX
- 		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
-		    &pass) != 0)
- 			pass = NULL;
-#elif HAVE_GETPW_R_DRAFT
-		pass = getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf));
-#else
-		pass = getpwuid(getuid());
-#endif
-	} else {
-#ifdef HAVE_GETPW_R_POSIX
-		if (getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
-			pass = NULL;
-#elif HAVE_GETPW_R_DRAFT
-		pass = getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf));
-#else
-		pass = getpwnam(temp);
-#endif
-	}
-	el_free(temp);		/* value no more needed */
-	if (pass == NULL)
-		return strdup(txt);
-
-	/* update pointer txt to point at string immedially following */
-	/* first slash */
-	txt += len;
-
-	len = strlen(pass->pw_dir) + 1 + strlen(txt) + 1;
-	temp = el_malloc(len * sizeof(*temp));
-	if (temp == NULL)
-		return NULL;
-	(void)snprintf(temp, len, "%s/%s", pass->pw_dir, txt);
-
-	return temp;
-}
-
-
-/*
- * return first found file name starting by the ``text'' or NULL if no
- * such file can be found
- * value of ``state'' is ignored
- *
- * it's caller's responsibility to free returned string
- */
-char *
-fn_filename_completion_function(const char *text, int state)
-{
-	static DIR *dir = NULL;
-	static char *filename = NULL, *dirname = NULL, *dirpath = NULL;
-	static size_t filename_len = 0;
-	struct dirent *entry;
-	char *temp;
-	size_t len;
-
-	if (state == 0 || dir == NULL) {
-		temp = strrchr(text, '/');
-		if (temp) {
-			char *nptr;
-			temp++;
-			nptr = el_realloc(filename, (strlen(temp) + 1) *
-			    sizeof(*nptr));
-			if (nptr == NULL) {
-				el_free(filename);
-				filename = NULL;
-				return NULL;
-			}
-			filename = nptr;
-			(void)strcpy(filename, temp);
-			len = (size_t)(temp - text);	/* including last slash */
-
-			nptr = el_realloc(dirname, (len + 1) *
-			    sizeof(*nptr));
-			if (nptr == NULL) {
-				el_free(dirname);
-				dirname = NULL;
-				return NULL;
-			}
-			dirname = nptr;
-			(void)strncpy(dirname, text, len);
-			dirname[len] = '\0';
-		} else {
-			el_free(filename);
-			if (*text == 0)
-				filename = NULL;
-			else {
-				filename = strdup(text);
-				if (filename == NULL)
-					return NULL;
-			}
-			el_free(dirname);
-			dirname = NULL;
-		}
-
-		if (dir != NULL) {
-			(void)closedir(dir);
-			dir = NULL;
-		}
-
-		/* support for ``~user'' syntax */
-
-		el_free(dirpath);
-		dirpath = NULL;
-		if (dirname == NULL) {
-			if ((dirname = strdup("")) == NULL)
-				return NULL;
-			dirpath = strdup("./");
-		} else if (*dirname == '~')
-			dirpath = fn_tilde_expand(dirname);
-		else
-			dirpath = strdup(dirname);
-
-		if (dirpath == NULL)
-			return NULL;
-
-		dir = opendir(dirpath);
-		if (!dir)
-			return NULL;	/* cannot open the directory */
-
-		/* will be used in cycle */
-		filename_len = filename ? strlen(filename) : 0;
-	}
-
-	/* find the match */
-	while ((entry = readdir(dir)) != NULL) {
-		/* skip . and .. */
-		if (entry->d_name[0] == '.' && (!entry->d_name[1]
-		    || (entry->d_name[1] == '.' && !entry->d_name[2])))
-			continue;
-		if (filename_len == 0)
-			break;
-		/* otherwise, get first entry where first */
-		/* filename_len characters are equal	  */
-		if (entry->d_name[0] == filename[0]
-#if HAVE_STRUCT_DIRENT_D_NAMLEN
-		    && entry->d_namlen >= filename_len
-#else
-		    && strlen(entry->d_name) >= filename_len
-#endif
-		    && strncmp(entry->d_name, filename,
-			filename_len) == 0)
-			break;
-	}
-
-	if (entry) {		/* match found */
-
-#if HAVE_STRUCT_DIRENT_D_NAMLEN
-		len = entry->d_namlen;
-#else
-		len = strlen(entry->d_name);
-#endif
-
-		len = strlen(dirname) + len + 1;
-		temp = el_malloc(len * sizeof(*temp));
-		if (temp == NULL)
-			return NULL;
-		(void)snprintf(temp, len, "%s%s", dirname, entry->d_name);
-	} else {
-		(void)closedir(dir);
-		dir = NULL;
-		temp = NULL;
-	}
-
-	return temp;
-}
-
-
-static const char *
-append_char_function(const char *name)
-{
-	struct stat stbuf;
-	char *expname = *name == '~' ? fn_tilde_expand(name) : NULL;
-	const char *rs = " ";
-
-	if (stat(expname ? expname : name, &stbuf) == -1)
-		goto out;
-	if (S_ISDIR(stbuf.st_mode))
-		rs = "/";
-out:
-	if (expname)
-		el_free(expname);
-	return rs;
-}
-/*
- * returns list of completions for text given
- * non-static for readline.
- */
-char ** completion_matches(const char *, char *(*)(const char *, int));
-char **
-completion_matches(const char *text, char *(*genfunc)(const char *, int))
-{
-	char **match_list = NULL, *retstr, *prevstr;
-	size_t match_list_len, max_equal, which, i;
-	size_t matches;
-
-	matches = 0;
-	match_list_len = 1;
-	while ((retstr = (*genfunc) (text, (int)matches)) != NULL) {
-		/* allow for list terminator here */
-		if (matches + 3 >= match_list_len) {
-			char **nmatch_list;
-			while (matches + 3 >= match_list_len)
-				match_list_len <<= 1;
-			nmatch_list = el_realloc(match_list,
-			    match_list_len * sizeof(*nmatch_list));
-			if (nmatch_list == NULL) {
-				el_free(match_list);
-				return NULL;
-			}
-			match_list = nmatch_list;
-
-		}
-		match_list[++matches] = retstr;
-	}
-
-	if (!match_list)
-		return NULL;	/* nothing found */
-
-	/* find least denominator and insert it to match_list[0] */
-	which = 2;
-	prevstr = match_list[1];
-	max_equal = strlen(prevstr);
-	for (; which <= matches; which++) {
-		for (i = 0; i < max_equal &&
-		    prevstr[i] == match_list[which][i]; i++)
-			continue;
-		max_equal = i;
-	}
-
-	retstr = el_malloc((max_equal + 1) * sizeof(*retstr));
-	if (retstr == NULL) {
-		el_free(match_list);
-		return NULL;
-	}
-	(void)strncpy(retstr, match_list[1], max_equal);
-	retstr[max_equal] = '\0';
-	match_list[0] = retstr;
-
-	/* add NULL as last pointer to the array */
-	match_list[matches + 1] = NULL;
-
-	return match_list;
-}
-
-/*
- * Sort function for qsort(). Just wrapper around strcasecmp().
- */
-static int
-_fn_qsort_string_compare(const void *i1, const void *i2)
-{
-	const char *s1 = ((const char * const *)i1)[0];
-	const char *s2 = ((const char * const *)i2)[0];
-
-	return strcasecmp(s1, s2);
-}
-
-/*
- * Display list of strings in columnar format on readline's output stream.
- * 'matches' is list of strings, 'num' is number of strings in 'matches',
- * 'width' is maximum length of string in 'matches'.
- *
- * matches[0] is not one of the match strings, but it is counted in
- * num, so the strings are matches[1] *through* matches[num-1].
- */
-void
-fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
-{
-	size_t line, lines, col, cols, thisguy;
-	int screenwidth = el->el_terminal.t_size.h;
-
-	/* Ignore matches[0]. Avoid 1-based array logic below. */
-	matches++;
-	num--;
-
-	/*
-	 * Find out how many entries can be put on one line; count
-	 * with one space between strings the same way it's printed.
-	 */
-	cols = (size_t)screenwidth / (width + 1);
-	if (cols == 0)
-		cols = 1;
-
-	/* how many lines of output, rounded up */
-	lines = (num + cols - 1) / cols;
-
-	/* Sort the items. */
-	qsort(matches, num, sizeof(char *), _fn_qsort_string_compare);
-
-	/*
-	 * On the ith line print elements i, i+lines, i+lines*2, etc.
-	 */
-	for (line = 0; line < lines; line++) {
-		for (col = 0; col < cols; col++) {
-			thisguy = line + col * lines;
-			if (thisguy >= num)
-				break;
-			(void)fprintf(el->el_outfile, "%s%-*s",
-			    col == 0 ? "" : " ", (int)width, matches[thisguy]);
-		}
-		(void)fprintf(el->el_outfile, "\n");
-	}
-}
-
-/*
- * Complete the word at or before point,
- * 'what_to_do' says what to do with the completion.
- * \t   means do standard completion.
- * `?' means list the possible completions.
- * `*' means insert all of the possible completions.
- * `!' means to do standard completion, and list all possible completions if
- * there is more than one.
- *
- * Note: '*' support is not implemented
- *       '!' could never be invoked
- */
-int
-fn_complete(EditLine *el,
-	char *(*complet_func)(const char *, int),
-	char **(*attempted_completion_function)(const char *, int, int),
-	const Char *word_break, const Char *special_prefixes,
-	const char *(*app_func)(const char *), size_t query_items,
-	int *completion_type, int *over, int *point, int *end)
-{
-	const TYPE(LineInfo) *li;
-	Char *temp;
-        char **matches;
-	const Char *ctemp;
-	size_t len;
-	int what_to_do = '\t';
-	int retval = CC_NORM;
-
-	if (el->el_state.lastcmd == el->el_state.thiscmd)
-		what_to_do = '?';
-
-	/* readline's rl_complete() has to be told what we did... */
-	if (completion_type != NULL)
-		*completion_type = what_to_do;
-
-	if (!complet_func)
-		complet_func = fn_filename_completion_function;
-	if (!app_func)
-		app_func = append_char_function;
-
-	/* We now look backwards for the start of a filename/variable word */
-	li = FUN(el,line)(el);
-	ctemp = li->cursor;
-	while (ctemp > li->buffer
-	    && !Strchr(word_break, ctemp[-1])
-	    && (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
-		ctemp--;
-
-	len = (size_t)(li->cursor - ctemp);
-#if defined(__SSP__) || defined(__SSP_ALL__)
-	temp = el_malloc((len + 1) * sizeof(*temp));
-#else
-	temp = alloca((len + 1) * sizeof(*temp));
-#endif
-	(void)Strncpy(temp, ctemp, len);
-	temp[len] = '\0';
-
-	/* these can be used by function called in completion_matches() */
-	/* or (*attempted_completion_function)() */
-	if (point != 0)
-		*point = (int)(li->cursor - li->buffer);
-	if (end != NULL)
-		*end = (int)(li->lastchar - li->buffer);
-
-	if (attempted_completion_function) {
-		int cur_off = (int)(li->cursor - li->buffer);
-		matches = (*attempted_completion_function)(
-		    ct_encode_string(temp, &el->el_scratch),
-		    cur_off - (int)len, cur_off);
-	} else
-		matches = 0;
-	if (!attempted_completion_function || 
-	    (over != NULL && !*over && !matches))
-		matches = completion_matches(
-		    ct_encode_string(temp, &el->el_scratch), complet_func);
-
-	if (over != NULL)
-		*over = 0;
-
-	if (matches) {
-		int i;
-		size_t matches_num, maxlen, match_len, match_display=1;
-
-		retval = CC_REFRESH;
-		/*
-		 * Only replace the completed string with common part of
-		 * possible matches if there is possible completion.
-		 */
-		if (matches[0][0] != '\0') {
-			el_deletestr(el, (int) len);
-			FUN(el,insertstr)(el,
-			    ct_decode_string(matches[0], &el->el_scratch));
-		}
-
-		if (what_to_do == '?')
-			goto display_matches;
-
-		if (matches[2] == NULL && strcmp(matches[0], matches[1]) == 0) {
-			/*
-			 * We found exact match. Add a space after
-			 * it, unless we do filename completion and the
-			 * object is a directory.
-			 */
-			FUN(el,insertstr)(el,
-			    ct_decode_string((*app_func)(matches[0]),
-			    &el->el_scratch));
-		} else if (what_to_do == '!') {
-    display_matches:
-			/*
-			 * More than one match and requested to list possible
-			 * matches.
-			 */
-
-			for(i = 1, maxlen = 0; matches[i]; i++) {
-				match_len = strlen(matches[i]);
-				if (match_len > maxlen)
-					maxlen = match_len;
-			}
-			/* matches[1] through matches[i-1] are available */
-			matches_num = (size_t)(i - 1);
-				
-			/* newline to get on next line from command line */
-			(void)fprintf(el->el_outfile, "\n");
-
-			/*
-			 * If there are too many items, ask user for display
-			 * confirmation.
-			 */
-			if (matches_num > query_items) {
-				(void)fprintf(el->el_outfile,
-				    "Display all %zu possibilities? (y or n) ",
-				    matches_num);
-				(void)fflush(el->el_outfile);
-				if (getc(stdin) != 'y')
-					match_display = 0;
-				(void)fprintf(el->el_outfile, "\n");
-			}
-
-			if (match_display) {
-				/*
-				 * Interface of this function requires the
-				 * strings be matches[1..num-1] for compat.
-				 * We have matches_num strings not counting
-				 * the prefix in matches[0], so we need to
-				 * add 1 to matches_num for the call.
-				 */
-				fn_display_match_list(el, matches,
-				    matches_num+1, maxlen);
-			}
-			retval = CC_REDISPLAY;
-		} else if (matches[0][0]) {
-			/*
-			 * There was some common match, but the name was
-			 * not complete enough. Next tab will print possible
-			 * completions.
-			 */
-			el_beep(el);
-		} else {
-			/* lcd is not a valid object - further specification */
-			/* is needed */
-			el_beep(el);
-			retval = CC_NORM;
-		}
-
-		/* free elements of array and the array itself */
-		for (i = 0; matches[i]; i++)
-			el_free(matches[i]);
-		el_free(matches);
-		matches = NULL;
-	}
-#if defined(__SSP__) || defined(__SSP_ALL__)
-	el_free(temp);
-#endif
-	return retval;
-}
-
-/*
- * el-compatible wrapper around rl_complete; needed for key binding
- */
-/* ARGSUSED */
-unsigned char
-_el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
-{
-	return (unsigned char)fn_complete(el, NULL, NULL,
-	    break_chars, NULL, NULL, (size_t)100,
-	    NULL, NULL, NULL, NULL);
-}
diff --git a/cmd-line-utils/libedit/hist.c b/cmd-line-utils/libedit/hist.c
deleted file mode 100644
index d24f5e7ff534..000000000000
--- a/cmd-line-utils/libedit/hist.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*	$NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
-#else
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * hist.c: History access functions
- */
-#include <stdlib.h>
-#include "el.h"
-
-/* hist_init():
- *	Initialization function.
- */
-protected int
-hist_init(EditLine *el)
-{
-
-	el->el_history.fun = NULL;
-	el->el_history.ref = NULL;
-	el->el_history.buf = el_malloc(EL_BUFSIZ * sizeof(*el->el_history.buf));
-	el->el_history.sz  = EL_BUFSIZ;
-	if (el->el_history.buf == NULL)
-		return -1;
-	el->el_history.last = el->el_history.buf;
-	return 0;
-}
-
-
-/* hist_end():
- *	clean up history;
- */
-protected void
-hist_end(EditLine *el)
-{
-
-	el_free(el->el_history.buf);
-	el->el_history.buf = NULL;
-}
-
-
-/* hist_set():
- *	Set new history interface
- */
-protected int
-hist_set(EditLine *el, hist_fun_t fun, void *ptr)
-{
-
-	el->el_history.ref = ptr;
-	el->el_history.fun = fun;
-	return 0;
-}
-
-
-/* hist_get():
- *	Get a history line and update it in the buffer.
- *	eventno tells us the event to get.
- */
-protected el_action_t
-hist_get(EditLine *el)
-{
-	const Char *hp;
-	int h;
-
-	if (el->el_history.eventno == 0) {	/* if really the current line */
-		(void) Strncpy(el->el_line.buffer, el->el_history.buf,
-		    el->el_history.sz);
-		el->el_line.lastchar = el->el_line.buffer +
-		    (el->el_history.last - el->el_history.buf);
-
-#ifdef KSHVI
-		if (el->el_map.type == MAP_VI)
-			el->el_line.cursor = el->el_line.buffer;
-		else
-#endif /* KSHVI */
-			el->el_line.cursor = el->el_line.lastchar;
-
-		return CC_REFRESH;
-	}
-	if (el->el_history.ref == NULL)
-		return CC_ERROR;
-
-	hp = HIST_FIRST(el);
-
-	if (hp == NULL)
-		return CC_ERROR;
-
-	for (h = 1; h < el->el_history.eventno; h++)
-		if ((hp = HIST_NEXT(el)) == NULL) {
-			el->el_history.eventno = h;
-			return CC_ERROR;
-		}
-	(void) Strncpy(el->el_line.buffer, hp,
-			(size_t)(el->el_line.limit - el->el_line.buffer));
-	el->el_line.buffer[el->el_line.limit - el->el_line.buffer - 1] = '\0';
-	el->el_line.lastchar = el->el_line.buffer + Strlen(el->el_line.buffer);
-
-	if (el->el_line.lastchar > el->el_line.buffer
-	    && el->el_line.lastchar[-1] == '\n')
-		el->el_line.lastchar--;
-	if (el->el_line.lastchar > el->el_line.buffer
-	    && el->el_line.lastchar[-1] == ' ')
-		el->el_line.lastchar--;
-#ifdef KSHVI
-	if (el->el_map.type == MAP_VI)
-		el->el_line.cursor = el->el_line.buffer;
-	else
-#endif /* KSHVI */
-		el->el_line.cursor = el->el_line.lastchar;
-
-	return CC_REFRESH;
-}
-
-
-/* hist_command()
- *	process a history command
- */
-protected int
-hist_command(EditLine *el, int argc, const Char **argv)
-{
-	const Char *str;
-	int num;
-	TYPE(HistEvent) ev;
-
-	if (el->el_history.ref == NULL)
-		return -1;
-
-	if (argc == 1 || Strcmp(argv[1], STR("list")) == 0) {
-		 /* List history entries */
-
-		for (str = HIST_LAST(el); str != NULL; str = HIST_PREV(el))
-			(void) fprintf(el->el_outfile, "%d %s",
-			    el->el_history.ev.num, ct_encode_string(str, &el->el_scratch));
-		return 0;
-	}
-
-	if (argc != 3)
-		return -1;
-
-	num = (int)Strtol(argv[2], NULL, 0);
-
-	if (Strcmp(argv[1], STR("size")) == 0)
-		return FUNW(history)(el->el_history.ref, &ev, H_SETSIZE, num);
-
-	if (Strcmp(argv[1], STR("unique")) == 0)
-		return FUNW(history)(el->el_history.ref, &ev, H_SETUNIQUE, num);
-
-	return -1;
-}
-
-/* hist_enlargebuf()
- *	Enlarge history buffer to specified value. Called from el_enlargebufs().
- *	Return 0 for failure, 1 for success.
- */
-protected int
-/*ARGSUSED*/
-hist_enlargebuf(EditLine *el, size_t oldsz, size_t newsz)
-{
-	Char *newbuf;
-
-	newbuf = el_realloc(el->el_history.buf, newsz * sizeof(*newbuf));
-	if (!newbuf)
-		return 0;
-
-	(void) memset(&newbuf[oldsz], '\0', (newsz - oldsz) * sizeof(*newbuf));
-
-	el->el_history.last = newbuf +
-				(el->el_history.last - el->el_history.buf);
-	el->el_history.buf = newbuf;
-	el->el_history.sz  = newsz;
-
-	return 1;
-}
-
-#ifdef WIDECHAR
-protected wchar_t *
-hist_convert(EditLine *el, int fn, void *arg)
-{
-	HistEventW ev;
-	if ((*(el)->el_history.fun)((el)->el_history.ref, &ev, fn, arg) == -1)
-		return NULL;
-	return ct_decode_string((const char *)(const void *)ev.str,
-	    &el->el_scratch);
-}
-#endif
diff --git a/cmd-line-utils/libedit/hist.h b/cmd-line-utils/libedit/hist.h
deleted file mode 100644
index a63be499dbdb..000000000000
--- a/cmd-line-utils/libedit/hist.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$NetBSD: hist.h,v 1.13 2011/07/28 20:50:55 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)hist.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.hist.c: History functions
- */
-#ifndef _h_el_hist
-#define	_h_el_hist
-
-#include "histedit.h"
-
-typedef int (*hist_fun_t)(void *, TYPE(HistEvent) *, int, ...);
-
-typedef struct el_history_t {
-	Char		*buf;		/* The history buffer		*/
-	size_t		sz;		/* Size of history buffer	*/
-	Char		*last;		/* The last character		*/
-	int		 eventno;	/* Event we are looking for	*/
-	void *		 ref;		/* Argument for history fcns	*/
-	hist_fun_t	 fun;		/* Event access			*/
-	TYPE(HistEvent)	 ev;		/* Event cookie			*/
-} el_history_t;
-
-#define	HIST_FUN_INTERNAL(el, fn, arg)	\
-    ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
-	fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
-#ifdef WIDECHAR
-#define HIST_FUN(el, fn, arg) \
-    (((el)->el_flags & NARROW_HISTORY) ? hist_convert(el, fn, arg) : \
-	HIST_FUN_INTERNAL(el, fn, arg))
-#else
-#define HIST_FUN(el, fn, arg) HIST_FUN_INTERNAL(el, fn, arg)
-#endif
-
-
-#define	HIST_NEXT(el)		HIST_FUN(el, H_NEXT, NULL)
-#define	HIST_FIRST(el)		HIST_FUN(el, H_FIRST, NULL)
-#define	HIST_LAST(el)		HIST_FUN(el, H_LAST, NULL)
-#define	HIST_PREV(el)		HIST_FUN(el, H_PREV, NULL)
-#define	HIST_SET(el, num)	HIST_FUN(el, H_SET, num)
-#define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
-#define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
-
-protected int		hist_init(EditLine *);
-protected void		hist_end(EditLine *);
-protected el_action_t	hist_get(EditLine *);
-protected int		hist_set(EditLine *, hist_fun_t, void *);
-protected int		hist_command(EditLine *, int, const Char **);
-protected int		hist_enlargebuf(EditLine *, size_t, size_t);
-#ifdef WIDECHAR
-protected wchar_t 	*hist_convert(EditLine *, int, void *);
-#endif
-
-#endif /* _h_el_hist */
diff --git a/cmd-line-utils/libedit/historyn.c b/cmd-line-utils/libedit/historyn.c
deleted file mode 100644
index 99871ea2075c..000000000000
--- a/cmd-line-utils/libedit/historyn.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define NARROW_WRAPPER
-#include "config.h"
-#undef WIDECHAR
-#define NARROWCHAR
-#include "./history.c"
diff --git a/cmd-line-utils/libedit/keymacro.h b/cmd-line-utils/libedit/keymacro.h
deleted file mode 100644
index 2445de5a5bc6..000000000000
--- a/cmd-line-utils/libedit/keymacro.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: keymacro.h,v 1.2 2011/07/28 03:44:36 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)key.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.keymacro.h: Key macro header
- */
-#ifndef _h_el_keymacro
-#define	_h_el_keymacro
-
-typedef union keymacro_value_t {
-	el_action_t	 cmd;	/* If it is a command the #	*/
-	Char		*str;	/* If it is a string...		*/
-} keymacro_value_t;
-
-typedef struct keymacro_node_t keymacro_node_t;
-
-typedef struct el_keymacromacro_t {
-	Char		*buf;	/* Key print buffer		*/
-	keymacro_node_t	*map;	/* Key map			*/
-	keymacro_value_t val;	/* Local conversion buffer	*/
-} el_keymacro_t;
-
-#define	XK_CMD	0
-#define	XK_STR	1
-#define	XK_NOD	2
-#define	XK_EXE	3
-
-protected int keymacro_init(EditLine *);
-protected void keymacro_end(EditLine *);
-protected keymacro_value_t *keymacro_map_cmd(EditLine *, int);
-protected keymacro_value_t *keymacro_map_str(EditLine *, Char *);
-protected void keymacro_reset(EditLine *);
-protected int keymacro_get(EditLine *, Char *, keymacro_value_t *);
-protected void keymacro_add(EditLine *, const Char *, keymacro_value_t *, int);
-protected void keymacro_clear(EditLine *, el_action_t *, const Char *);
-protected int keymacro_delete(EditLine *, const Char *);
-protected void keymacro_print(EditLine *, const Char *);
-protected void keymacro_kprint(EditLine *, const Char *, keymacro_value_t *,
-    int);
-protected size_t keymacro__decode_str(const Char *, char *, size_t,
-    const char *);
-
-#endif /* _h_el_keymacro */
diff --git a/cmd-line-utils/libedit/makelist.sh b/cmd-line-utils/libedit/makelist.sh
deleted file mode 100644
index b1a28c323701..000000000000
--- a/cmd-line-utils/libedit/makelist.sh
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/bin/sh -
-#	$NetBSD: makelist,v 1.16 2010/04/18 21:17:05 christos Exp $
-#
-# Copyright (c) 1992, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Christos Zoulas of Cornell University.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. 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.
-# 3. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-#
-#	@(#)makelist	5.3 (Berkeley) 6/4/93
-
-# makelist.sh: Automatically generate header files...
-
-AWK=@AWK@
-USAGE="Usage: $0 -n|-h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
-
-if [ "x$1" = "x" ]
-then
-    echo $USAGE 1>&2
-    exit 1
-fi
-
-FLAG="$1"
-shift
-
-FILES="$@"
-
-case $FLAG in
-
-#	generate foo.h file from foo.c
-#
--n)
-    cat << _EOF
-#undef WIDECHAR
-#define NARROWCHAR
-#include "${FILES}"
-_EOF
-    ;;
-    
--h)
-    set - `echo $FILES | sed -e 's/\\./_/g'`
-    hdr="_h_`basename $1`"
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef %s\n#define %s\n", "'$hdr'", "'$hdr'");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		# XXXMYSQL: support CRLF
-		name = substr($2, 1, index($2,"(") - 1);
-#
-# XXX:	need a space between name and prototype so that -fc and -fh
-#	parsing is much easier
-#
-		printf("protected el_action_t\t%s (EditLine *, Int);\n", name);
-	    }
-	}
-	END {
-	    printf("#endif /* %s */\n", "'$hdr'");
-	}'
-	;;
-
-#	generate help.c from various .c files
-#
--bc)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"config.h\"\n#include \"el.h\"\n");
-	    printf("#include \"chartype.h\"\n");
-	    printf("private const struct el_bindings_t el_func_help[] = {\n");
-	    low = "abcdefghijklmnopqrstuvwxyz_";
-	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
-	    for (i = 1; i <= length(low); i++)
-		tr[substr(low, i, 1)] = substr(high, i, 1);
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		# XXXMYSQL: support CRLF
-		name = substr($2, 1, index($2,"(") - 1);
-		uname = "";
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    uname = uname tr[s];
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf("    { %-30.30s %-30.30s\n","STR(\"" fname "\"),", uname ",");
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		printf("      STR(\"");
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-        # XXXMYSQL: support CRLF
-		sub("\r", "", $i);
-		printf("%s\") },\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf("};\n");
-	    printf("\nprotected const el_bindings_t* help__get()");
-	    printf("{ return el_func_help; }\n");
-	}'
-	;;
-
-#	generate help.h from various .c files
-#
--bh)
-    $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_help_c\n#define _h_help_c\n");
-	    printf("protected const el_bindings_t *help__get(void);\n");
-	    printf("#endif /* _h_help_c */\n");
-	}' /dev/null
-	;;
-
-#	generate fcns.h from various .h files
-#
-# XXXMYSQL: use portable tr syntax
--fh)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
-    sort | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
-	    count = 0;
-	}
-	{
-	    printf("#define\t%-30.30s\t%3d\n", $1, count++);
-	}
-	END {
-	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
-
-	    printf("typedef el_action_t (*el_func_t)(EditLine *, Int);");
-	    printf("\nprotected const el_func_t* func__get(void);\n");
-	    printf("#endif /* _h_fcns_c */\n");
-	}'
-	;;
-
-#	generate fcns.c from various .h files
-#
--fc)
-    cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"config.h\"\n#include \"el.h\"\n");
-	    printf("private const el_func_t el_func[] = {");
-	    maxlen = 80;
-	    needn = 1;
-	    len = 0;
-	}
-	{
-	    clen = 25 + 2;
-	    len += clen;
-	    if (len >= maxlen)
-		needn = 1;
-	    if (needn) {
-		printf("\n    ");
-		needn = 0;
-		len = 4 + clen;
-	    }
-	    s = $1 ",";
-	    printf("%-26.26s ", s);
-	}
-	END {
-	    printf("\n};\n");
-	    printf("\nprotected const el_func_t* func__get() { return el_func; }\n");
-	}'
-	;;
-
-#	generate editline.c from various .c files
-#
--e)
-	echo "$FILES" | tr ' ' '\012' | $AWK '
-	BEGIN {
-	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#define protected static\n");
-	    printf("#define SCCSID\n");
-	}
-	{
-	    printf("#include \"%s\"\n", $1);
-	}'
-	;;
-
-#	generate man page fragment from various .c files
-#
--m)
-    cat $FILES | $AWK '
-	BEGIN {
-	    printf(".\\\" Section automatically generated with makelist\n");
-	    printf(".Bl -tag -width 4n\n");
-	}
-	/\(\):/ {
-	    pr = substr($2, 1, 2);
-	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		# XXXMYSQL: support CRLF
-		name = substr($2, 1, index($2, "(") - 1);
-		fname = "";
-		for (i = 1; i <= length(name); i++) {
-		    s = substr(name, i, 1);
-		    if (s == "_")
-			s = "-";
-		    fname = fname s;
-		}
-
-		printf(".It Ic %s\n", fname);
-		ok = 1;
-	    }
-	}
-	/^ \*/ {
-	    if (ok) {
-		for (i = 2; i < NF; i++)
-		    printf("%s ", $i);
-		printf("%s.\n", $i);
-		ok = 0;
-	    }
-	}
-	END {
-	    printf(".El\n");
-	    printf(".\\\" End of section automatically generated with makelist\n");
-	}'
-	;;
-
-*)
-    echo $USAGE 1>&2
-    exit 1
-    ;;
-
-esac
diff --git a/cmd-line-utils/libedit/np/fgetln.c b/cmd-line-utils/libedit/np/fgetln.c
deleted file mode 100644
index 898abc758dc2..000000000000
--- a/cmd-line-utils/libedit/np/fgetln.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#else
-#include "config.h"
-#endif
-
-#if !HAVE_FGETLN
-#include <stdlib.h>
-#ifndef HAVE_NBTOOL_CONFIG_H
-/* These headers are required, but included from nbtool_config.h */
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#endif
-
-char *
-fgetln(FILE *fp, size_t *len)
-{
-	static char *buf = NULL;
-	static size_t bufsiz = 0;
-	char *ptr;
-
-
-	if (buf == NULL) {
-		bufsiz = BUFSIZ;
-		if ((buf = malloc(bufsiz)) == NULL)
-			return NULL;
-	}
-
-	if (fgets(buf, bufsiz, fp) == NULL)
-		return NULL;
-
-	*len = 0;
-	while ((ptr = strchr(&buf[*len], '\n')) == NULL) {
-		size_t nbufsiz = bufsiz + BUFSIZ;
-		char *nbuf = realloc(buf, nbufsiz);
-
-		if (nbuf == NULL) {
-			int oerrno = errno;
-			free(buf);
-			errno = oerrno;
-			buf = NULL;
-			return NULL;
-		} else
-			buf = nbuf;
-
-		if (fgets(&buf[bufsiz], BUFSIZ, fp) == NULL) {
-			buf[bufsiz] = '\0';
-			*len = strlen(buf);
-			return buf;
-		}
-
-		*len = bufsiz;
-		bufsiz = nbufsiz;
-	}
-
-	*len = (ptr - buf) + 1;
-	return buf;
-}
-
-#endif
-
-#ifdef TEST
-int
-main(int argc, char *argv[])
-{
-	char *p;
-	size_t len;
-
-	while ((p = fgetln(stdin, &len)) != NULL) {
-		(void)printf("%zu %s", len, p);
-		free(p);
-	}
-	return 0;
-}
-#endif
diff --git a/cmd-line-utils/libedit/np/strlcpy.c b/cmd-line-utils/libedit/np/strlcpy.c
deleted file mode 100644
index ccbe6812dfcf..000000000000
--- a/cmd-line-utils/libedit/np/strlcpy.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$NetBSD: strlcpy.c,v 1.3 2007/06/04 18:19:27 christos Exp $	*/
-/*	$OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#else
-#include "config.h"
-#endif
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-#include <sys/types.h>
-#include <assert.h>
-#include <string.h>
-
-#ifdef _LIBC
-# ifdef __weak_alias
-__weak_alias(strlcpy, _strlcpy)
-# endif
-#endif
-#else
-#include <lib/libkern/libkern.h>
-#endif /* !_KERNEL && !_STANDALONE */
-
-
-#if !HAVE_STRLCPY
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(src != NULL);
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
-#endif
diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c
deleted file mode 100644
index 6ab19a2a8fa6..000000000000
--- a/cmd-line-utils/libedit/np/vis.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/*	$NetBSD: vis.c,v 1.44 2011/03/12 19:52:48 christos Exp $	*/
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-/*-
- * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include "config.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#endif /* LIBC_SCCS and not lint */
-
-/* XXXMYSQL : Make compiler happy. */
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-
-#include <sys/types.h>
-
-#include <assert.h>
-/*
-  XXXMYSQL : Due to different versions of vis.h available,
-             use the one bundled with libedit.
-*/
-#include "np/vis.h"
-#include <errno.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-__weak_alias(strvisx,_strvisx)
-#endif
-
-#if !HAVE_VIS || !HAVE_SVIS
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-static char *do_svis(char *, size_t *, int, int, int, const char *);
-
-#undef BELL
-#define BELL '\a'
-
-#ifndef isoctal
-#define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#endif
-#define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
-#define issafe(c)	(c == '\b' || c == BELL || c == '\r')
-#define xtoa(c)		"0123456789abcdef"[c]
-#define XTOA(c)		"0123456789ABCDEF"[c]
-
-#define MAXEXTRAS	5
-
-#define MAKEEXTRALIST(flag, extra, orig_str)				      \
-do {									      \
-	const char *orig = orig_str;					      \
-	const char *o = orig;						      \
-	char *e;							      \
-	while (*o++)							      \
-		continue;						      \
-	extra = malloc((size_t)((o - orig) + MAXEXTRAS));		      \
-	if (!extra) break;						      \
-	for (o = orig, e = extra; (*e++ = *o++) != '\0';)		      \
-		continue;						      \
-	e--;								      \
-	if (flag & VIS_SP) *e++ = ' ';					      \
-	if (flag & VIS_TAB) *e++ = '\t';				      \
-	if (flag & VIS_NL) *e++ = '\n';					      \
-	if ((flag & VIS_NOSLASH) == 0) *e++ = '\\';			      \
-	*e = '\0';							      \
-} while (/*CONSTCOND*/0)
-
-/*
- * This is do_hvis, for HTTP style (RFC 1808)
- */
-static char *
-do_hvis(char *dst, size_t *dlen, int c, int flag, int nextc, const char *extra)
-{
-
-	if ((isascii(c) && isalnum(c))
-	    /* safe */
-	    || c == '$' || c == '-' || c == '_' || c == '.' || c == '+'
-	    /* extra */
-	    || c == '!' || c == '*' || c == '\'' || c == '(' || c == ')'
-	    || c == ',') {
-		dst = do_svis(dst, dlen, c, flag, nextc, extra);
-	} else {
-		if (dlen) {
-			if (*dlen < 3)
-				return NULL;
-			*dlen -= 3;
-		}
-		*dst++ = '%';
-		*dst++ = xtoa(((unsigned int)c >> 4) & 0xf);
-		*dst++ = xtoa((unsigned int)c & 0xf);
-	}
-
-	return dst;
-}
-
-/*
- * This is do_mvis, for Quoted-Printable MIME (RFC 2045)
- * NB: No handling of long lines or CRLF.
- */
-static char *
-do_mvis(char *dst, size_t *dlen, int c, int flag, int nextc, const char *extra)
-{
-	if ((c != '\n') &&
-	    /* Space at the end of the line */
-	    ((isspace(c) && (nextc == '\r' || nextc == '\n')) ||
-	    /* Out of range */
-	    (!isspace(c) && (c < 33 || (c > 60 && c < 62) || c > 126)) ||
-	    /* Specific char to be escaped */ 
-	    strchr("#$@[\\]^`{|}~", c) != NULL)) {
-		if (dlen) {
-			if (*dlen < 3)
-				return NULL;
-			*dlen -= 3;
-		}
-		*dst++ = '=';
-		*dst++ = XTOA(((unsigned int)c >> 4) & 0xf);
-		*dst++ = XTOA((unsigned int)c & 0xf);
-	} else {
-		dst = do_svis(dst, dlen, c, flag, nextc, extra);
-	}
-	return dst;
-}
-
-/*
- * This is do_vis, the central code of vis.
- * dst:	      Pointer to the destination buffer
- * c:	      Character to encode
- * flag:      Flag word
- * nextc:     The character following 'c'
- * extra:     Pointer to the list of extra characters to be
- *	      backslash-protected.
- */
-static char *
-do_svis(char *dst, size_t *dlen, int c, int flag, int nextc, const char *extra)
-{
-	int isextra;
-	size_t odlen = dlen ? *dlen : 0;
-
-	isextra = strchr(extra, c) != NULL;
-#define HAVE(x) \
-	do { \
-		if (dlen) { \
-			if (*dlen < (x)) \
-				goto out; \
-			*dlen -= (x); \
-		} \
-	} while (/*CONSTCOND*/0)
-	if (!isextra && isascii(c) && (isgraph(c) || iswhite(c) ||
-	    ((flag & VIS_SAFE) && issafe(c)))) {
-		HAVE(1);
-		*dst++ = c;
-		return dst;
-	}
-	if (flag & VIS_CSTYLE) {
-		HAVE(2);
-		switch (c) {
-		case '\n':
-			*dst++ = '\\'; *dst++ = 'n';
-			return dst;
-		case '\r':
-			*dst++ = '\\'; *dst++ = 'r';
-			return dst;
-		case '\b':
-			*dst++ = '\\'; *dst++ = 'b';
-			return dst;
-		case BELL:
-			*dst++ = '\\'; *dst++ = 'a';
-			return dst;
-		case '\v':
-			*dst++ = '\\'; *dst++ = 'v';
-			return dst;
-		case '\t':
-			*dst++ = '\\'; *dst++ = 't';
-			return dst;
-		case '\f':
-			*dst++ = '\\'; *dst++ = 'f';
-			return dst;
-		case ' ':
-			*dst++ = '\\'; *dst++ = 's';
-			return dst;
-		case '\0':
-			*dst++ = '\\'; *dst++ = '0';
-			if (isoctal(nextc)) {
-				HAVE(2);
-				*dst++ = '0';
-				*dst++ = '0';
-			}
-			return dst;
-		default:
-			if (isgraph(c)) {
-				*dst++ = '\\'; *dst++ = c;
-				return dst;
-			}
-			if (dlen)
-				*dlen = odlen;
-		}
-	}
-	if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) {
-		HAVE(4);
-		*dst++ = '\\';
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0';
-		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0';
-		*dst++ =			     (c	      & 07) + '0';
-	} else {
-		if ((flag & VIS_NOSLASH) == 0) {
-			HAVE(1);
-			*dst++ = '\\';
-		}
-
-		if (c & 0200) {
-			HAVE(1);
-			c &= 0177; *dst++ = 'M';
-		}
-
-		if (iscntrl(c)) {
-			HAVE(2);
-			*dst++ = '^';
-			if (c == 0177)
-				*dst++ = '?';
-			else
-				*dst++ = c + '@';
-		} else {
-			HAVE(2);
-			*dst++ = '-'; *dst++ = c;
-		}
-	}
-	return dst;
-out:
-	*dlen = odlen;
-	return NULL;
-}
-
-typedef char *(*visfun_t)(char *, size_t *, int, int, int, const char *);
-
-/*
- * Return the appropriate encoding function depending on the flags given.
- */
-static visfun_t
-getvisfun(int flag)
-{
-	if (flag & VIS_HTTPSTYLE)
-		return do_hvis;
-	if (flag & VIS_MIMESTYLE)
-		return do_mvis;
-	return do_svis;
-}
-
-/*
- * isnvis - visually encode characters, also encoding the characters
- *	  pointed to by `extra'
- */
-static char *
-isnvis(char *dst, size_t *dlen, int c, int flag, int nextc, const char *extra)
-{
-	char *nextra = NULL;
-	visfun_t f;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(extra != NULL);
-	MAKEEXTRALIST(flag, nextra, extra);
-	if (!nextra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			return NULL;
-		}
-		*dst = '\0';		/* can't create nextra, return "" */
-		return dst;
-	}
-	f = getvisfun(flag);
-	dst = (*f)(dst, dlen, c, flag, nextc, nextra);
-	free(nextra);
-	if (dst == NULL || (dlen && *dlen == 0)) {
-		errno = ENOSPC;
-		return NULL;
-	}
-	*dst = '\0';
-	return dst;
-}
-
-char *
-svis(char *dst, int c, int flag, int nextc, const char *extra)
-{
-	return isnvis(dst, NULL, c, flag, nextc, extra);
-}
-
-char *
-snvis(char *dst, size_t dlen, int c, int flag, int nextc, const char *extra)
-{
-	return isnvis(dst, &dlen, c, flag, nextc, extra);
-}
-
-
-/*
- * strsvis, strsvisx - visually encode characters from src into dst
- *
- *	Extra is a pointer to a \0-terminated list of characters to
- *	be encoded, too. These functions are useful e. g. to
- *	encode strings in such a way so that they are not interpreted
- *	by a shell.
- *
- *	Dst must be 4 times the size of src to account for possible
- *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned.
- *
- *	Strsvisx encodes exactly len bytes from src into dst.
- *	This is useful for encoding a block of data.
- */
-static int
-istrsnvis(char *dst, size_t *dlen, const char *csrc, int flag, const char *extra)
-{
-	int c;
-	char *start;
-	char *nextra = NULL;
-	const unsigned char *src = (const unsigned char *)csrc;
-	visfun_t f;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(extra != NULL);
-	MAKEEXTRALIST(flag, nextra, extra);
-	if (!nextra) {
-		*dst = '\0';		/* can't create nextra, return "" */
-		return 0;
-	}
-	f = getvisfun(flag);
-	for (start = dst; (c = *src++) != '\0'; /* empty */) {
-		dst = (*f)(dst, dlen, c, flag, *src, nextra);
-		if (dst == NULL) {
-			errno = ENOSPC;
-			return -1;
-		}
-	}
-	free(nextra);
-	if (dlen && *dlen == 0) {
-		errno = ENOSPC;
-		return -1;
-	}
-	*dst = '\0';
-	return (int)(dst - start);
-}
-
-int
-strsvis(char *dst, const char *csrc, int flag, const char *extra)
-{
-	return istrsnvis(dst, NULL, csrc, flag, extra);
-}
-
-int
-strsnvis(char *dst, size_t dlen, const char *csrc, int flag, const char *extra)
-{
-	return istrsnvis(dst, &dlen, csrc, flag, extra);
-}
-
-static int
-istrsnvisx(char *dst, size_t *dlen, const char *csrc, size_t len, int flag,
-    const char *extra)
-{
-	unsigned char c;
-	char *start;
-	char *nextra = NULL;
-	const unsigned char *src = (const unsigned char *)csrc;
-	visfun_t f;
-
-	_DIAGASSERT(dst != NULL);
-	_DIAGASSERT(src != NULL);
-	_DIAGASSERT(extra != NULL);
-	MAKEEXTRALIST(flag, nextra, extra);
-	if (! nextra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			return -1;
-		}
-		*dst = '\0';		/* can't create nextra, return "" */
-		return 0;
-	}
-
-	f = getvisfun(flag);
-	for (start = dst; len > 0; len--) {
-		c = *src++;
-		dst = (*f)(dst, dlen, c, flag, len > 1 ? *src : '\0', nextra);
-		if (dst == NULL) {
-			errno = ENOSPC;
-			return -1;
-		}
-	}
-	free(nextra);
-	if (dlen && *dlen == 0) {
-		errno = ENOSPC;
-		return -1;
-	}
-	*dst = '\0';
-	return (int)(dst - start);
-}
-
-int
-strsvisx(char *dst, const char *csrc, size_t len, int flag, const char *extra)
-{
-	return istrsnvisx(dst, NULL, csrc, len, flag, extra);
-}
-
-int
-strsnvisx(char *dst, size_t dlen, const char *csrc, size_t len, int flag,
-    const char *extra)
-{
-	return istrsnvisx(dst, &dlen, csrc, len, flag, extra);
-}
-#endif
-
-#if !HAVE_VIS
-/*
- * vis - visually encode characters
- */
-static char *
-invis(char *dst, size_t *dlen, int c, int flag, int nextc)
-{
-	char *extra = NULL;
-	unsigned char uc = (unsigned char)c;
-	visfun_t f;
-
-	_DIAGASSERT(dst != NULL);
-
-	MAKEEXTRALIST(flag, extra, "");
-	if (! extra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			return NULL;
-		}
-		*dst = '\0';		/* can't create extra, return "" */
-		return dst;
-	}
-	f = getvisfun(flag);
-	dst = (*f)(dst, dlen, uc, flag, nextc, extra);
-	free(extra);
-	if (dst == NULL || (dlen && *dlen == 0)) {
-		errno = ENOSPC;
-		return NULL;
-	}
-	*dst = '\0';
-	return dst;
-}
-
-char *
-vis(char *dst, int c, int flag, int nextc)
-{
-	return invis(dst, NULL, c, flag, nextc);
-}
-
-char *
-nvis(char *dst, size_t dlen, int c, int flag, int nextc)
-{
-	return invis(dst, &dlen, c, flag, nextc);
-}
-
-
-/*
- * strvis, strvisx - visually encode characters from src into dst
- *
- *	Dst must be 4 times the size of src to account for possible
- *	expansion.  The length of dst, not including the trailing NULL,
- *	is returned.
- *
- *	Strvisx encodes exactly len bytes from src into dst.
- *	This is useful for encoding a block of data.
- */
-static int
-istrnvis(char *dst, size_t *dlen, const char *src, int flag)
-{
-	char *extra = NULL;
-	int rv;
-
-	MAKEEXTRALIST(flag, extra, "");
-	if (!extra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			return -1;
-		}
-		*dst = '\0';		/* can't create extra, return "" */
-		return 0;
-	}
-	rv = istrsnvis(dst, dlen, src, flag, extra);
-	free(extra);
-	return rv;
-}
-
-int
-strvis(char *dst, const char *src, int flag)
-{
-	return istrnvis(dst, NULL, src, flag);
-}
-
-int
-strnvis(char *dst, size_t dlen, const char *src, int flag)
-{
-	return istrnvis(dst, &dlen, src, flag);
-}
-
-static int
-istrnvisx(char *dst, size_t *dlen, const char *src, size_t len, int flag)
-{
-	char *extra = NULL;
-	int rv;
-
-	MAKEEXTRALIST(flag, extra, "");
-	if (!extra) {
-		if (dlen && *dlen == 0) {
-			errno = ENOSPC;
-			return -1;
-		}
-		*dst = '\0';		/* can't create extra, return "" */
-		return 0;
-	}
-	rv = istrsnvisx(dst, dlen, src, len, flag, extra);
-	free(extra);
-	return rv;
-}
-
-int
-strvisx(char *dst, const char *src, size_t len, int flag)
-{
-	return istrnvisx(dst, NULL, src, len, flag);
-}
-
-int
-strnvisx(char *dst, size_t dlen, const char *src, size_t len, int flag)
-{
-	return istrnvisx(dst, &dlen, src, len, flag);
-}
-
-#endif
diff --git a/cmd-line-utils/libedit/np/vis.h b/cmd-line-utils/libedit/np/vis.h
deleted file mode 100644
index 54a76e9108f3..000000000000
--- a/cmd-line-utils/libedit/np/vis.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$NetBSD: vis.h,v 1.19 2011/03/12 19:52:45 christos Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _VIS_H_
-#define	_VIS_H_
-
-#include <sys/types.h>
-
-/*
- * to select alternate encoding format
- */
-#define	VIS_OCTAL	0x001	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x002	/* use \[nrft0..] where appropiate */
-
-/*
- * to alter set of characters encoded (default is to encode all
- * non-graphic except space, tab, and newline).
- */
-#define	VIS_SP		0x004	/* also encode space */
-#define	VIS_TAB		0x008	/* also encode tab */
-#define	VIS_NL		0x010	/* also encode newline */
-#define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
-#define	VIS_SAFE	0x020	/* only encode "unsafe" characters */
-
-/*
- * other
- */
-#define	VIS_NOSLASH	0x040	/* inhibit printing '\' */
-#define	VIS_HTTP1808	0x080	/* http-style escape % hex hex */
-#define	VIS_HTTPSTYLE	0x080	/* http-style escape % hex hex */
-#define	VIS_MIMESTYLE	0x100	/* mime-style escape = HEX HEX */
-#define	VIS_HTTP1866	0x200	/* http-style &#num; or &string; */
-#define	VIS_NOESCAPE	0x400	/* don't decode `\' */
-#define	_VIS_END	0x800	/* for unvis */
-
-/*
- * unvis return codes
- */
-#define	UNVIS_VALID	 1	/* character valid */
-#define	UNVIS_VALIDPUSH	 2	/* character valid, push back passed char */
-#define	UNVIS_NOCHAR	 3	/* valid sequence, no character produced */
-#define	UNVIS_SYNBAD	-1	/* unrecognized escape sequence */
-#define	UNVIS_ERROR	-2	/* decoder in unknown state (unrecoverable) */
-
-/*
- * unvis flags
- */
-#define	UNVIS_END	_VIS_END	/* no more characters */
-/* XXXMYSQL */
-#ifndef __RENAME
-#define __RENAME(x)
-#endif
-
-__BEGIN_DECLS
-char	*vis(char *, int, int, int);
-char	*nvis(char *, size_t, int, int, int);
-
-char	*svis(char *, int, int, int, const char *);
-char	*snvis(char *, size_t, int, int, int, const char *);
-
-int	strvis(char *, const char *, int);
-int	strnvis(char *, size_t, const char *, int);
-
-int	strsvis(char *, const char *, int, const char *);
-int	strsnvis(char *, size_t, const char *, int, const char *);
-
-int	strvisx(char *, const char *, size_t, int);
-int	strnvisx(char *, size_t, const char *, size_t, int);
-
-int	strsvisx(char *, const char *, size_t, int, const char *);
-int	strsnvisx(char *, size_t, const char *, size_t, int, const char *);
-
-int	strunvis(char *, const char *);
-int	strnunvis(char *, size_t, const char *);
-
-int	strunvisx(char *, const char *, int);
-int	strnunvisx(char *, size_t, const char *, int);
-
-#ifndef __LIBC12_SOURCE__
-int	unvis(char *, int, int *, int) __RENAME(__unvis50);
-#endif
-__END_DECLS
-
-#endif /* !_VIS_H_ */
diff --git a/cmd-line-utils/libedit/parse.c b/cmd-line-utils/libedit/parse.c
deleted file mode 100644
index b14e4ae71657..000000000000
--- a/cmd-line-utils/libedit/parse.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*	$NetBSD: parse.c,v 1.26 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
-#else
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * parse.c: parse an editline extended command
- *
- * commands are:
- *
- *	bind
- *	echotc
- *	edit
- *	gettc
- *	history
- *	settc
- *	setty
- */
-#include "el.h"
-#include <stdlib.h>
-
-private const struct {
-	const Char *name;
-	int (*func)(EditLine *, int, const Char **);
-} cmds[] = {
-	{ STR("bind"),  	map_bind	},
-	{ STR("echotc"),	terminal_echotc	},
-	{ STR("edit"),  	el_editmode	},
-	{ STR("history"),	hist_command	},
-	{ STR("telltc"),	terminal_telltc	},
-	{ STR("settc"),	        terminal_settc	},
-	{ STR("setty"),	        tty_stty	},
-	{ NULL,		        NULL		}
-};
-
-
-/* parse_line():
- *	Parse a line and dispatch it
- */
-protected int
-parse_line(EditLine *el, const Char *line)
-{
-	const Char **argv;
-	int argc;
-	TYPE(Tokenizer) *tok;
-
-	tok = FUN(tok,init)(NULL);
-	FUN(tok,str)(tok, line, &argc, &argv);
-	argc = FUN(el,parse)(el, argc, argv);
-	FUN(tok,end)(tok);
-	return argc;
-}
-
-
-/* el_parse():
- *	Command dispatcher
- */
-public int
-FUN(el,parse)(EditLine *el, int argc, const Char *argv[])
-{
-	const Char *ptr;
-	int i;
-
-	if (argc < 1)
-		return -1;
-	ptr = Strchr(argv[0], ':');
-	if (ptr != NULL) {
-		Char *tprog;
-		size_t l;
-
-		if (ptr == argv[0])
-			return 0;
-		l = (size_t)(ptr - argv[0] - 1);
-		tprog = el_malloc((l + 1) * sizeof(*tprog));
-		if (tprog == NULL)
-			return 0;
-		(void) Strncpy(tprog, argv[0], l);
-		tprog[l] = '\0';
-		ptr++;
-		l = (size_t)el_match(el->el_prog, tprog);
-		el_free(tprog);
-		if (!l)
-			return 0;
-	} else
-		ptr = argv[0];
-
-	for (i = 0; cmds[i].name != NULL; i++)
-		if (Strcmp(cmds[i].name, ptr) == 0) {
-			i = (*cmds[i].func) (el, argc, argv);
-			return -i;
-		}
-	return -1;
-}
-
-
-/* parse__escape():
- *	Parse a string of the form ^<char> \<odigit> \<char> \U+xxxx and return
- *	the appropriate character or -1 if the escape is not valid
- */
-protected int
-parse__escape(const Char **ptr)
-{
-	const Char *p;
-	Int c;
-
-	p = *ptr;
-
-	if (p[1] == 0)
-		return -1;
-
-	if (*p == '\\') {
-		p++;
-		switch (*p) {
-		case 'a':
-			c = '\007';	/* Bell */
-			break;
-		case 'b':
-			c = '\010';	/* Backspace */
-			break;
-		case 't':
-			c = '\011';	/* Horizontal Tab */
-			break;
-		case 'n':
-			c = '\012';	/* New Line */
-			break;
-		case 'v':
-			c = '\013';	/* Vertical Tab */
-			break;
-		case 'f':
-			c = '\014';	/* Form Feed */
-			break;
-		case 'r':
-			c = '\015';	/* Carriage Return */
-			break;
-		case 'e':
-			c = '\033';	/* Escape */
-			break;
-                case 'U':               /* Unicode \U+xxxx or \U+xxxxx format */
-                {
-                        int i;
-                        const Char hex[] = STR("0123456789ABCDEF");
-                        const Char *h;
-                        ++p;
-                        if (*p++ != '+')
-                                return -1;
-			c = 0;
-                        for (i = 0; i < 5; ++i) {
-                                h = Strchr(hex, *p++);
-                                if (!h && i < 4)
-                                        return -1;
-                                else if (h)
-                                        c = (c << 4) | ((int)(h - hex));
-                                else
-                                        --p;
-                        }
-                        if (c > 0x10FFFF) /* outside valid character range */
-                                return -1;
-                        break;
-                }
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		{
-			int cnt, ch;
-
-			for (cnt = 0, c = 0; cnt < 3; cnt++) {
-				ch = *p++;
-				if (ch < '0' || ch > '7') {
-					p--;
-					break;
-				}
-				c = (c << 3) | (ch - '0');
-			}
-			if ((c & (wint_t)0xffffff00) != (wint_t)0)
-				return -1;
-			--p;
-			break;
-		}
-		default:
-			c = *p;
-			break;
-		}
-	} else if (*p == '^') {
-		p++;
-		c = (*p == '?') ? '\177' : (*p & 0237);
-	} else
-		c = *p;
-	*ptr = ++p;
-	return c;
-}
-
-/* parse__string():
- *	Parse the escapes from in and put the raw string out
- */
-protected Char *
-parse__string(Char *out, const Char *in)
-{
-	Char *rv = out;
-	int n;
-
-	for (;;)
-		switch (*in) {
-		case '\0':
-			*out = '\0';
-			return rv;
-
-		case '\\':
-		case '^':
-			if ((n = parse__escape(&in)) == -1)
-				return NULL;
-			*out++ = n;
-			break;
-
-		case 'M':
-			if (in[1] == '-' && in[2] != '\0') {
-				*out++ = '\033';
-				in += 2;
-				break;
-			}
-			/*FALLTHROUGH*/
-
-		default:
-			*out++ = *in++;
-			break;
-		}
-}
-
-
-/* parse_cmd():
- *	Return the command number for the command string given
- *	or -1 if one is not found
- */
-protected int
-parse_cmd(EditLine *el, const Char *cmd)
-{
-	el_bindings_t *b;
-
-	for (b = el->el_map.help; b->name != NULL; b++)
-		if (Strcmp(b->name, cmd) == 0)
-			return b->func;
-	return -1;
-}
diff --git a/cmd-line-utils/libedit/read.c b/cmd-line-utils/libedit/read.c
deleted file mode 100644
index 01da49bb83f0..000000000000
--- a/cmd-line-utils/libedit/read.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/*	$NetBSD: read.c,v 1.67 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
-#else
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * read.c: Clean this junk up! This is horrible code.
- *	   Terminal read functions
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "el.h"
-
-#define OKCMD	-1	/* must be -1! */
-
-private int	read__fixio(int, int);
-private int	read_preread(EditLine *);
-private int	read_char(EditLine *, Char *);
-private int	read_getcmd(EditLine *, el_action_t *, Char *);
-private void	read_pop(c_macro_t *);
-
-/* read_init():
- *	Initialize the read stuff
- */
-protected int
-read_init(EditLine *el)
-{
-	/* builtin read_char */
-	el->el_read.read_char = read_char;
-	return 0;
-}
-
-
-/* el_read_setfn():
- *	Set the read char function to the one provided.
- *	If it is set to EL_BUILTIN_GETCFN, then reset to the builtin one.
- */
-protected int
-el_read_setfn(EditLine *el, el_rfunc_t rc)
-{
-	el->el_read.read_char = (rc == EL_BUILTIN_GETCFN) ? read_char : rc;
-	return 0;
-}
-
-
-/* el_read_getfn():
- *	return the current read char function, or EL_BUILTIN_GETCFN
- *	if it is the default one
- */
-protected el_rfunc_t
-el_read_getfn(EditLine *el)
-{
-       return el->el_read.read_char == read_char ?
-	    EL_BUILTIN_GETCFN : el->el_read.read_char;
-}
-
-
-#ifndef MIN
-#define MIN(A,B) ((A) < (B) ? (A) : (B))
-#endif
-
-#ifdef DEBUG_EDIT
-private void
-read_debug(EditLine *el)
-{
-
-	if (el->el_line.cursor > el->el_line.lastchar)
-		(void) fprintf(el->el_errfile, "cursor > lastchar\r\n");
-	if (el->el_line.cursor < el->el_line.buffer)
-		(void) fprintf(el->el_errfile, "cursor < buffer\r\n");
-	if (el->el_line.cursor > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "cursor > limit\r\n");
-	if (el->el_line.lastchar > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "lastchar > limit\r\n");
-	if (el->el_line.limit != &el->el_line.buffer[EL_BUFSIZ - 2])
-		(void) fprintf(el->el_errfile, "limit != &buffer[EL_BUFSIZ-2]\r\n");
-}
-#endif /* DEBUG_EDIT */
-
-
-/* read__fixio():
- *	Try to recover from a read error
- */
-/* ARGSUSED */
-private int
-read__fixio(int fd __attribute__((__unused__)), int e)
-{
-
-	switch (e) {
-	case -1:		/* Make sure that the code is reachable */
-
-#ifdef EWOULDBLOCK
-	case EWOULDBLOCK:
-#ifndef TRY_AGAIN
-#define TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK */
-
-#if defined(POSIX) && defined(EAGAIN)
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	case EAGAIN:
-#ifndef TRY_AGAIN
-#define TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
-#endif /* POSIX && EAGAIN */
-
-		e = 0;
-#ifdef TRY_AGAIN
-#if defined(F_SETFL) && defined(O_NDELAY)
-		if ((e = fcntl(fd, F_GETFL, 0)) == -1)
-			return -1;
-
-		if (fcntl(fd, F_SETFL, e & ~O_NDELAY) == -1)
-			return -1;
-		else
-			e = 1;
-#endif /* F_SETFL && O_NDELAY */
-
-#ifdef FIONBIO
-		{
-			int zero = 0;
-
-			if (ioctl(fd, FIONBIO, &zero) == -1)
-				return -1;
-			else
-				e = 1;
-		}
-#endif /* FIONBIO */
-
-#endif /* TRY_AGAIN */
-		return e ? 0 : -1;
-
-	case EINTR:
-		return 0;
-
-	default:
-		return -1;
-	}
-}
-
-
-/* read_preread():
- *	Try to read the stuff in the input queue;
- */
-private int
-read_preread(EditLine *el)
-{
-	int chrs = 0;
-
-	if (el->el_tty.t_mode == ED_IO)
-		return 0;
-
-#ifndef WIDECHAR
-/* FIONREAD attempts to buffer up multiple bytes, and to make that work
- * properly with partial wide/UTF-8 characters would need some careful work. */
-#ifdef FIONREAD
-	(void) ioctl(el->el_infd, FIONREAD, &chrs);
-	if (chrs > 0) {
-		char buf[EL_BUFSIZ];
-
-		chrs = read(el->el_infd, buf,
-		    (size_t) MIN(chrs, EL_BUFSIZ - 1));
-		if (chrs > 0) {
-			buf[chrs] = '\0';
-			el_push(el, buf);
-		}
-	}
-#endif /* FIONREAD */
-#endif
-	return chrs > 0;
-}
-
-
-/* el_push():
- *	Push a macro
- */
-public void
-FUN(el,push)(EditLine *el, const Char *str)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	if (str != NULL && ma->level + 1 < EL_MAXMACRO) {
-		ma->level++;
-		if ((ma->macro[ma->level] = Strdup(str)) != NULL)
-			return;
-		ma->level--;
-	}
-	terminal_beep(el);
-	terminal__flush(el);
-}
-
-
-/* read_getcmd():
- *	Return next command from the input stream.
- *	Character values > 255 are not looked up in the map, but inserted.
- */
-private int
-read_getcmd(EditLine *el, el_action_t *cmdnum, Char *ch)
-{
-	el_action_t cmd;
-	int num;
-
-	el->el_errno = 0;
-	do {
-		if ((num = FUN(el,getc)(el, ch)) != 1) {/* if EOF or error */
-			el->el_errno = num == 0 ? 0 : errno;
-			return num;
-		}
-
-#ifdef	KANJI
-		if ((*ch & 0200)) {
-			el->el_state.metanext = 0;
-			cmd = CcViMap[' '];
-			break;
-		} else
-#endif /* KANJI */
-
-		if (el->el_state.metanext) {
-			el->el_state.metanext = 0;
-			*ch |= 0200;
-		}
-#ifdef WIDECHAR
-		if (*ch >= N_KEYS)
-			cmd = ED_INSERT;
-		else
-#endif
-			cmd = el->el_map.current[(unsigned char) *ch];
-		if (cmd == ED_SEQUENCE_LEAD_IN) {
-			keymacro_value_t val;
-			switch (keymacro_get(el, ch, &val)) {
-			case XK_CMD:
-				cmd = val.cmd;
-				break;
-			case XK_STR:
-				FUN(el,push)(el, val.str);
-				break;
-#ifdef notyet
-			case XK_EXE:
-				/* XXX: In the future to run a user function */
-				RunCommand(val.str);
-				break;
-#endif
-			default:
-				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
-				break;
-			}
-		}
-		if (el->el_map.alt == NULL)
-			el->el_map.current = el->el_map.key;
-	} while (cmd == ED_SEQUENCE_LEAD_IN);
-	*cmdnum = cmd;
-	return OKCMD;
-}
-
-/* read_char():
- *	Read a character from the tty.
- */
-private int
-read_char(EditLine *el, Char *cp)
-{
-	ssize_t num_read;
-	int tried = 0;
-        char cbuf[MB_LEN_MAX];
-        size_t cbp = 0;
-        int bytes = 0;
-
-#ifdef WIDECHAR
-static mbstate_t state, temp_state;
-memset(&state, 0, sizeof(mbstate_t));
-#endif
-
- again:
-	el->el_signal->sig_no = 0;
-	while ((num_read = read(el->el_infd, cbuf + cbp, (size_t)1)) == -1) {
-		switch (el->el_signal->sig_no) {
-		case SIGCONT:
-			FUN(el,set)(el, EL_REFRESH);
-			/*FALLTHROUGH*/
-		case SIGWINCH:
-			sig_set(el);
-			goto again;
-                /* XXXMYSQL : In case of SIGINT, return number of bytes read. */
-		case SIGINT:
-			goto end;
-		default:
-			break;
-		}
-		if (!tried && read__fixio(el->el_infd, errno) == 0)
-			tried = 1;
-		else {
-			*cp = '\0';
-			return -1;
-		}
-	}
-
-#ifdef WIDECHAR
-        ++cbp;
-        if (cbp > (size_t) MB_CUR_MAX) { /* "shouldn't happen" */
-          *cp = '\0';
-          return (-1);
-        }
-
-        temp_state= state;
-
-        if ((bytes = mbrtowc(cp, cbuf, cbp, &state)) == -2)
-        {
-          /* Incomplete sequence, restore the state and scan more bytes. */
-          state= temp_state;
-          goto again;
-        }
-        else if (bytes == -1)
-        {
-          /* Invalid sequence, reset the state and continue. */
-          cbp= 0;
-          memset(&state, 0, sizeof(mbstate_t));
-          goto again;
-        }
-        /* We successfully read one single or multi-byte character */
-#else
-        *cp = (unsigned char)cbuf[0];
-#endif
-
-#if 0
-	if ((el->el_flags & IGNORE_EXTCHARS) && bytes > 1) {
-		cbp = 0; /* skip this character */
-		goto again;
-	}
-#endif
-/* XXXMYSQL */
-end:
-	return (int)num_read;
-}
-
-/* read_pop():
- *	Pop a macro from the stack
- */
-private void
-read_pop(c_macro_t *ma)
-{
-	int i;
-
-	el_free(ma->macro[0]);
-	for (i = 0; i < ma->level; i++)
-		ma->macro[i] = ma->macro[i + 1];
-	ma->level--;
-	ma->offset = 0;
-}
-
-/* el_getc():
- *	Read a character
- */
-public int
-FUN(el,getc)(EditLine *el, Char *cp)
-{
-	int num_read;
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	terminal__flush(el);
-	for (;;) {
-		if (ma->level < 0) {
-			if (!read_preread(el))
-				break;
-		}
-
-		if (ma->level < 0)
-			break;
-
-		if (ma->macro[0][ma->offset] == '\0') {
-			read_pop(ma);
-			continue;
-		}
-
-		*cp = ma->macro[0][ma->offset++];
-
-		if (ma->macro[0][ma->offset] == '\0') {
-			/* Needed for QuoteMode On */
-			read_pop(ma);
-		}
-
-		return 1;
-	}
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Turning raw mode on\n");
-#endif /* DEBUG_READ */
-	if (tty_rawmode(el) < 0)/* make sure the tty is set up correctly */
-		return 0;
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Reading a character\n");
-#endif /* DEBUG_READ */
-	num_read = (*el->el_read.read_char)(el, cp);
-#ifdef WIDECHAR
-	if (el->el_flags & NARROW_READ)
-		*cp = *(char *)(void *)cp;
-#endif
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Got it %c\n", *cp);
-#endif /* DEBUG_READ */
-	return num_read;
-}
-
-protected void
-read_prepare(EditLine *el)
-{
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_set(el);
-	if (el->el_flags & NO_TTY)
-		return;
-	if ((el->el_flags & (UNBUFFERED|EDIT_DISABLED)) == UNBUFFERED)
-		tty_rawmode(el);
-
-	/* This is relatively cheap, and things go terribly wrong if
-	   we have the wrong size. */
-	el_resize(el);
-	re_clear_display(el);	/* reset the display stuff */
-	ch_reset(el, 0);
-	re_refresh(el);		/* print the prompt */
-
-	if (el->el_flags & UNBUFFERED)
-		terminal__flush(el);
-}
-
-protected void
-read_finish(EditLine *el)
-{
-	if ((el->el_flags & UNBUFFERED) == 0)
-		(void) tty_cookedmode(el);
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_clr(el);
-}
-
-public const Char *
-FUN(el,gets)(EditLine *el, int *nread)
-{
-	int retval;
-	el_action_t cmdnum = 0;
-	int num;		/* how many chars we have read at NL */
-	Char ch, *cp;
-	int crlf = 0;
-	int nrb;
-#ifdef FIONREAD
-	c_macro_t *ma = &el->el_chared.c_macro;
-#endif /* FIONREAD */
-
-	if (nread == NULL)
-		nread = &nrb;
-	*nread = 0;
-
-	if (el->el_flags & NO_TTY) {
-		size_t idx;
-
-		cp = el->el_line.buffer;
-		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
-			/* make sure there is space for next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (size_t)(cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, (size_t)2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			cp++;
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (cp[-1] == '\r' || cp[-1] == '\n')
-				break;
-		}
-		if (num == -1) {
-			if (errno == EINTR)
-				cp = el->el_line.buffer;
-			el->el_errno = errno;
-		}
-
-		goto noedit;
-	}
-
-
-#ifdef FIONREAD
-	if (el->el_tty.t_mode == EX_IO && ma->level < 0) {
-		long chrs = 0;
-
-		(void) ioctl(el->el_infd, FIONREAD, &chrs);
-		if (chrs == 0) {
-			if (tty_rawmode(el) < 0) {
-				errno = 0;
-				*nread = 0;
-				return NULL;
-			}
-		}
-	}
-#endif /* FIONREAD */
-
-	if ((el->el_flags & UNBUFFERED) == 0)
-		read_prepare(el);
-
-	if (el->el_flags & EDIT_DISABLED) {
-		size_t idx;
-
-		if ((el->el_flags & UNBUFFERED) == 0)
-			cp = el->el_line.buffer;
-		else
-			cp = el->el_line.lastchar;
-
-		terminal__flush(el);
-
-		while ((num = (*el->el_read.read_char)(el, cp)) == 1) {
-			/* make sure there is space next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (size_t)(cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, (size_t)2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			cp++;
-			crlf = cp[-1] == '\r' || cp[-1] == '\n';
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (crlf)
-				break;
-		}
-
-		if (num == -1) {
-			if (errno == EINTR)
-				cp = el->el_line.buffer;
-			el->el_errno = errno;
-		}
-
-		goto noedit;
-	}
-
-	for (num = OKCMD; num == OKCMD;) {	/* while still editing this
-						 * line */
-#ifdef DEBUG_EDIT
-		read_debug(el);
-#endif /* DEBUG_EDIT */
-		/* if EOF or error */
-		if ((num = read_getcmd(el, &cmdnum, &ch)) != OKCMD) {
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "Returning from el_gets %d\n", num);
-#endif /* DEBUG_READ */
-			break;
-		}
-		if (el->el_errno == EINTR) {
-			el->el_line.buffer[0] = '\0';
-			el->el_line.lastchar =
-			    el->el_line.cursor = el->el_line.buffer;
-			break;
-		}
-		if ((unsigned int)cmdnum >= (unsigned int)el->el_map.nfunc) {	/* BUG CHECK command */
-#ifdef DEBUG_EDIT
-			(void) fprintf(el->el_errfile,
-			    "ERROR: illegal command from key 0%o\r\n", ch);
-#endif /* DEBUG_EDIT */
-			continue;	/* try again */
-		}
-		/* now do the real command */
-#ifdef DEBUG_READ
-		{
-			el_bindings_t *b;
-			for (b = el->el_map.help; b->name; b++)
-				if (b->func == cmdnum)
-					break;
-			if (b->name)
-				(void) fprintf(el->el_errfile,
-				    "Executing %s\n", b->name);
-			else
-				(void) fprintf(el->el_errfile,
-				    "Error command = %d\n", cmdnum);
-		}
-#endif /* DEBUG_READ */
-		/* vi redo needs these way down the levels... */
-		el->el_state.thiscmd = cmdnum;
-		el->el_state.thisch = ch;
-		if (el->el_map.type == MAP_VI &&
-		    el->el_map.current == el->el_map.key &&
-		    el->el_chared.c_redo.pos < el->el_chared.c_redo.lim) {
-			if (cmdnum == VI_DELETE_PREV_CHAR &&
-			    el->el_chared.c_redo.pos != el->el_chared.c_redo.buf
-			    && Isprint(el->el_chared.c_redo.pos[-1]))
-				el->el_chared.c_redo.pos--;
-			else
-				*el->el_chared.c_redo.pos++ = ch;
-		}
-		retval = (*el->el_map.func[cmdnum]) (el, ch);
-#ifdef DEBUG_READ
-		(void) fprintf(el->el_errfile,
-			"Returned state %d\n", retval );
-#endif /* DEBUG_READ */
-
-		/* save the last command here */
-		el->el_state.lastcmd = cmdnum;
-
-		/* use any return value */
-		switch (retval) {
-		case CC_CURSOR:
-			re_refresh_cursor(el);
-			break;
-
-		case CC_REDISPLAY:
-			re_clear_lines(el);
-			re_clear_display(el);
-			/* FALLTHROUGH */
-
-		case CC_REFRESH:
-			re_refresh(el);
-			break;
-
-		case CC_REFRESH_BEEP:
-			re_refresh(el);
-			terminal_beep(el);
-			break;
-
-		case CC_NORM:	/* normal char */
-			break;
-
-		case CC_ARGHACK:	/* Suggested by Rich Salz */
-			/* <rsalz@pineapple.bbn.com> */
-			continue;	/* keep going... */
-
-		case CC_EOF:	/* end of file typed */
-			if ((el->el_flags & UNBUFFERED) == 0)
-				num = 0;
-			else if (num == -1) {
-				*el->el_line.lastchar++ = CONTROL('d');
-				el->el_line.cursor = el->el_line.lastchar;
-				num = 1;
-			}
-			break;
-
-		case CC_NEWLINE:	/* normal end of line */
-			num = (int)(el->el_line.lastchar - el->el_line.buffer);
-			break;
-
-		case CC_FATAL:	/* fatal error, reset to known state */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor fatal ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			/* put (real) cursor in a known place */
-			re_clear_display(el);	/* reset the display stuff */
-			ch_reset(el, 1);	/* reset the input pointers */
-			re_refresh(el); /* print the prompt again */
-			break;
-
-		case CC_ERROR:
-		default:	/* functions we don't know about */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			terminal_beep(el);
-			terminal__flush(el);
-			break;
-		}
-		el->el_state.argument = 1;
-		el->el_state.doingarg = 0;
-		el->el_chared.c_vcmd.action = NOP;
-		if (el->el_flags & UNBUFFERED)
-			break;
-	}
-
-	terminal__flush(el);		/* flush any buffered output */
-	/* make sure the tty is set up correctly */
-	if ((el->el_flags & UNBUFFERED) == 0) {
-		read_finish(el);
-		*nread = num != -1 ? num : 0;
-	} else {
-		*nread = (int)(el->el_line.lastchar - el->el_line.buffer);
-	}
-	goto done;
-noedit:
-	el->el_line.cursor = el->el_line.lastchar = cp;
-	*cp = '\0';
-	*nread = (int)(el->el_line.cursor - el->el_line.buffer);
-done:
-	if (*nread == 0) {
-		if (num == -1) {
-			*nread = -1;
-			errno = el->el_errno;
-		}
-		return NULL;
-	} else
-		return el->el_line.buffer;
-}
diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c
deleted file mode 100644
index 0529c43706da..000000000000
--- a/cmd-line-utils/libedit/readline.c
+++ /dev/null
@@ -1,2295 +0,0 @@
-/*	$NetBSD: readline.c,v 1.99 2011/08/16 16:25:15 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#endif /* not lint && not SCCSID */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <string.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#ifdef HAVE_VIS_H
-#include <vis.h>
-#else
-#include "np/vis.h"
-#endif
-#include "editline/readline.h"
-#include "el.h"
-#include "fcns.h"		/* for EL_NUM_FCNS */
-#include "histedit.h"
-#include "filecomplete.h"
-
-void rl_prep_terminal(int);
-void rl_deprep_terminal(void);
-
-/* for rl_complete() */
-#define TAB		'\r'
-
-/* see comment at the #ifdef for sense of this */
-/* #define GDB_411_HACK */
-
-/* readline compatibility stuff - look at readline sources/documentation */
-/* to see what these variables mean */
-const char *rl_library_version = "EditLine wrapper";
-int rl_readline_version = RL_READLINE_VERSION;
-static char empty[] = { '\0' };
-static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' };
-static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
-    '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
-char *rl_readline_name = empty;
-FILE *rl_instream = NULL;
-FILE *rl_outstream = NULL;
-int rl_point = 0;
-int rl_end = 0;
-char *rl_line_buffer = NULL;
-VCPFunction *rl_linefunc = NULL;
-int rl_done = 0;
-VFunction *rl_event_hook = NULL;
-KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
-    emacs_meta_keymap,
-    emacs_ctlx_keymap;
-
-int history_base = 1;		/* probably never subject to change */
-int history_length = 0;
-int max_input_history = 0;
-char history_expansion_char = '!';
-char history_subst_char = '^';
-char *history_no_expand_chars = expand_chars;
-Function *history_inhibit_expansion_function = NULL;
-char *history_arg_extract(int start, int end, const char *str);
-
-int rl_inhibit_completion = 0;
-int rl_attempted_completion_over = 0;
-char *rl_basic_word_break_characters = break_chars;
-char *rl_completer_word_break_characters = NULL;
-char *rl_completer_quote_characters = NULL;
-Function *rl_completion_entry_function = NULL;
-CPPFunction *rl_attempted_completion_function = NULL;
-Function *rl_pre_input_hook = NULL;
-Function *rl_startup1_hook = NULL;
-int (*rl_getc_function)(FILE *) = NULL;
-char *rl_terminal_name = NULL;
-int rl_already_prompted = 0;
-int rl_filename_completion_desired = 0;
-int rl_ignore_completion_duplicates = 0;
-int rl_catch_signals = 1;
-int readline_echoing_p = 1;
-int _rl_print_completions_horizontally = 0;
-VFunction *rl_redisplay_function = NULL;
-Function *rl_startup_hook = NULL;
-VFunction *rl_completion_display_matches_hook = NULL;
-VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
-VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
-KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
-
-/*
- * The current prompt string.
- */
-char *rl_prompt = NULL;
-/*
- * This is set to character indicating type of completion being done by
- * rl_complete_internal(); this is available for application completion
- * functions.
- */
-int rl_completion_type = 0;
-
-/*
- * If more than this number of items results from query for possible
- * completions, we ask user if they are sure to really display the list.
- */
-int rl_completion_query_items = 100;
-
-/*
- * List of characters which are word break characters, but should be left
- * in the parsed text when it is passed to the completion function.
- * Shell uses this to help determine what kind of completing to do.
- */
-char *rl_special_prefixes = NULL;
-
-/*
- * This is the character appended to the completed words if at the end of
- * the line. Default is ' ' (a space).
- */
-int rl_completion_append_character = ' ';
-
-/* stuff below is used internally by libedit for readline emulation */
-
-static History *h = NULL;
-static EditLine *e = NULL;
-static Function *map[256];
-static jmp_buf topbuf;
-
-/* internal functions */
-static unsigned char	 _el_rl_complete(EditLine *, int);
-static unsigned char	 _el_rl_tstp(EditLine *, int);
-static char		*_get_prompt(EditLine *);
-static int		 _getc_function(EditLine *, char *);
-static HIST_ENTRY	*_move_history(int);
-static int		 _history_expand_command(const char *, size_t, size_t,
-    char **);
-static char		*_rl_compat_sub(const char *, const char *,
-    const char *, int);
-static int		 _rl_event_read_char(EditLine *, char *);
-static void		 _rl_update_pos(void);
-
-
-/* ARGSUSED */
-static char *
-_get_prompt(EditLine *el __attribute__((__unused__)))
-{
-	rl_already_prompted = 1;
-	return rl_prompt;
-}
-
-
-/*
- * generic function for moving around history
- */
-static HIST_ENTRY *
-_move_history(int op)
-{
-	HistEvent ev;
-	static HIST_ENTRY rl_he;
-
-	if (history(h, &ev, op) != 0)
-		return NULL;
-
-	rl_he.line = ev.str;
-	rl_he.data = NULL;
-
-	return &rl_he;
-}
-
-
-/*
- * read one key from user defined input function
- */
-static int
-/*ARGSUSED*/
-_getc_function(EditLine *el __attribute__((__unused__)), char *c)
-{
-	int i;
-
-	i = (*rl_getc_function)(NULL);
-	if (i == -1)
-		return 0;
-	*c = (char)i;
-	return 1;
-}
-
-static void
-_resize_fun(EditLine *el, void *a)
-{
-	const LineInfo *li;
-	char **ap = a;
-
-	li = el_line(el);
-	/* a cheesy way to get rid of const cast. */
-	*ap = memchr(li->buffer, *li->buffer, (size_t)1);
-}
-
-static const char *
-_default_history_file(void)
-{
-	struct passwd *p;
-	static char path[PATH_MAX];
-
-	if (*path)
-		return path;
-	if ((p = getpwuid(getuid())) == NULL)
-		return NULL;
-	(void)snprintf(path, sizeof(path), "%s/.history", p->pw_dir);
-	return path;
-}
-
-/*
- * READLINE compatibility stuff
- */
-
-/*
- * Set the prompt
- */
-int
-rl_set_prompt(const char *prompt)
-{
-	char *p;
-
-	if (!prompt)
-		prompt = "";
-	if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0) 
-		return 0;
-	if (rl_prompt)
-		el_free(rl_prompt);
-	rl_prompt = strdup(prompt);
-	if (rl_prompt == NULL)
-		return -1;
-
-	while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL)
-		*p = RL_PROMPT_START_IGNORE;
-
-	return 0;
-}
-
-/*
- * initialize rl compat stuff
- */
-int
-rl_initialize(void)
-{
-	HistEvent ev;
-	int editmode = 1;
-	struct termios t;
-
-	if (e != NULL)
-		el_end(e);
-	if (h != NULL)
-		history_end(h);
-
-	if (!rl_instream)
-		rl_instream = stdin;
-	if (!rl_outstream)
-		rl_outstream = stdout;
-
-	/*
-	 * See if we don't really want to run the editor
-	 */
-	if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0)
-		editmode = 0;
-
-	e = el_init(rl_readline_name, rl_instream, rl_outstream, stderr);
-
-	if (!editmode)
-		el_set(e, EL_EDITMODE, 0);
-
-	h = history_init();
-	if (!e || !h)
-		return -1;
-
-	history(h, &ev, H_SETSIZE, INT_MAX);	/* unlimited */
-	history_length = 0;
-	max_input_history = INT_MAX;
-	el_set(e, EL_HIST, history, h);
-
-	/* Setup resize function */
-	el_set(e, EL_RESIZE, _resize_fun, &rl_line_buffer);
-
-	/* setup getc function if valid */
-	if (rl_getc_function)
-		el_set(e, EL_GETCFN, _getc_function);
-
-	/* for proper prompt printing in readline() */
-	if (rl_set_prompt("") == -1) {
-		history_end(h);
-		el_end(e);
-		return -1;
-	}
-	el_set(e, EL_PROMPT, _get_prompt, RL_PROMPT_START_IGNORE);
-	el_set(e, EL_SIGNAL, rl_catch_signals);
-
-	/* set default mode to "emacs"-style and read setting afterwards */
-	/* so this can be overriden */
-	el_set(e, EL_EDITOR, "emacs");
-	if (rl_terminal_name != NULL)
-		el_set(e, EL_TERMINAL, rl_terminal_name);
-	else
-		el_get(e, EL_TERMINAL, &rl_terminal_name);
-
-	/*
-	 * Word completion - this has to go AFTER rebinding keys
-	 * to emacs-style.
-	 */
-	el_set(e, EL_ADDFN, "rl_complete",
-	    "ReadLine compatible completion function",
-	    _el_rl_complete);
-	el_set(e, EL_BIND, "^I", "rl_complete", NULL);
-
-	/*
-	 * Send TSTP when ^Z is pressed.
-	 */
-	el_set(e, EL_ADDFN, "rl_tstp",
-	    "ReadLine compatible suspend function",
-	    _el_rl_tstp);
-	el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
-
-        /*
-         * Set some readline compatible key-bindings.
-         */
-        el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
-
-        /*
-         * Allow the use of Home/End keys.
-         */
-        el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
-        el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
-        el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
-        el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
-        el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
-        el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
-
-        /*
-         * Allow the use of the Delete/Insert keys.
-         */
-        el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
-        el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
-
-        /*
-         * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
-         */
-        el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
-        el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
-        el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
-        el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
-        el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
-        el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
-
-	/* read settings from configuration file */
-	el_source(e, NULL);
-
-	/*
-	 * Unfortunately, some applications really do use rl_point
-	 * and rl_line_buffer directly.
-	 */
-	_resize_fun(e, &rl_line_buffer);
-	_rl_update_pos();
-
-	if (rl_startup_hook)
-		(*rl_startup_hook)(NULL, 0);
-
-	return 0;
-}
-
-
-/*
- * read one line from input stream and return it, chomping
- * trailing newline (if there is any)
- */
-char *
-readline(const char *p)
-{
-	HistEvent ev;
-	const char * volatile prompt = p;
-	int count;
-	const char *ret;
-	char *buf;
-	static int used_event_hook;
-
-	if (e == NULL || h == NULL)
-		rl_initialize();
-
-	rl_done = 0;
-
-	(void)setjmp(topbuf);
-
-	/* update prompt accordingly to what has been passed */
-	if (rl_set_prompt(prompt) == -1)
-		return NULL;
-
-	if (rl_pre_input_hook)
-		(*rl_pre_input_hook)(NULL, 0);
-
-	if (rl_event_hook && !(e->el_flags&NO_TTY)) {
-		el_set(e, EL_GETCFN, _rl_event_read_char);
-		used_event_hook = 1;
-	}
-
-	if (!rl_event_hook && used_event_hook) {
-		el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN);
-		used_event_hook = 0;
-	}
-
-	rl_already_prompted = 0;
-
-	/* get one line from input stream */
-	ret = el_gets(e, &count);
-
-	if (ret && count > 0) {
-		int lastidx;
-
-		buf = strdup(ret);
-		if (buf == NULL)
-			return NULL;
-                /* XXXMYSQL: Bug#16408762 */
-		lastidx = strlen(ret) - 1;
-		if (buf[lastidx] == '\n')
-			buf[lastidx] = '\0';
-	} else
-		buf = NULL;
-
-	history(h, &ev, H_GETSIZE);
-	history_length = ev.num;
-
-	return buf;
-}
-
-/*
- * history functions
- */
-
-/*
- * is normally called before application starts to use
- * history expansion functions
- */
-void
-using_history(void)
-{
-	if (h == NULL || e == NULL)
-		rl_initialize();
-}
-
-
-/*
- * substitute ``what'' with ``with'', returning resulting string; if
- * globally == 1, substitutes all occurrences of what, otherwise only the
- * first one
- */
-static char *
-_rl_compat_sub(const char *str, const char *what, const char *with,
-    int globally)
-{
-	const	char	*s;
-	char	*r, *result;
-	size_t	len, with_len, what_len;
-
-	len = strlen(str);
-	with_len = strlen(with);
-	what_len = strlen(what);
-
-	/* calculate length we need for result */
-	s = str;
-	while (*s) {
-		if (*s == *what && !strncmp(s, what, what_len)) {
-			len += with_len - what_len;
-			if (!globally)
-				break;
-			s += what_len;
-		} else
-			s++;
-	}
-	r = result = el_malloc((len + 1) * sizeof(*r));
-	if (result == NULL)
-		return NULL;
-	s = str;
-	while (*s) {
-		if (*s == *what && !strncmp(s, what, what_len)) {
-			(void)strncpy(r, with, with_len);
-			r += with_len;
-			s += what_len;
-			if (!globally) {
-				(void)strcpy(r, s);
-				return result;
-			}
-		} else
-			*r++ = *s++;
-	}
-	*r = '\0';
-	return result;
-}
-
-static	char	*last_search_pat;	/* last !?pat[?] search pattern */
-static	char	*last_search_match;	/* last !?pat[?] that matched */
-
-const char *
-get_history_event(const char *cmd, int *cindex, int qchar)
-{
-	int idx, sign, sub, num, begin, ret;
-	size_t len;
-	char	*pat;
-	const char *rptr;
-	HistEvent ev;
-
-	idx = *cindex;
-	if (cmd[idx++] != history_expansion_char)
-		return NULL;
-
-	/* find out which event to take */
-	if (cmd[idx] == history_expansion_char || cmd[idx] == '\0') {
-		if (history(h, &ev, H_FIRST) != 0)
-			return NULL;
-		*cindex = cmd[idx]? (idx + 1):idx;
-		return ev.str;
-	}
-	sign = 0;
-	if (cmd[idx] == '-') {
-		sign = 1;
-		idx++;
-	}
-
-	if ('0' <= cmd[idx] && cmd[idx] <= '9') {
-		HIST_ENTRY *rl_he;
-
-		num = 0;
-		while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') {
-			num = num * 10 + cmd[idx] - '0';
-			idx++;
-		}
-		if (sign)
-			num = history_length - num + 1;
-
-		if (!(rl_he = history_get(num)))
-			return NULL;
-
-		*cindex = idx;
-		return rl_he->line;
-	}
-	sub = 0;
-	if (cmd[idx] == '?') {
-		sub = 1;
-		idx++;
-	}
-	begin = idx;
-	while (cmd[idx]) {
-		if (cmd[idx] == '\n')
-			break;
-		if (sub && cmd[idx] == '?')
-			break;
-		if (!sub && (cmd[idx] == ':' || cmd[idx] == ' '
-				    || cmd[idx] == '\t' || cmd[idx] == qchar))
-			break;
-		idx++;
-	}
-	len = (size_t)idx - (size_t)begin;
-	if (sub && cmd[idx] == '?')
-		idx++;
-	if (sub && len == 0 && last_search_pat && *last_search_pat)
-		pat = last_search_pat;
-	else if (len == 0)
-		return NULL;
-	else {
-		if ((pat = el_malloc((len + 1) * sizeof(*pat))) == NULL)
-			return NULL;
-		(void)strncpy(pat, cmd + begin, len);
-		pat[len] = '\0';
-	}
-
-	if (history(h, &ev, H_CURR) != 0) {
-		if (pat != last_search_pat)
-			el_free(pat);
-		return NULL;
-	}
-	num = ev.num;
-
-	if (sub) {
-		if (pat != last_search_pat) {
-			if (last_search_pat)
-				el_free(last_search_pat);
-			last_search_pat = pat;
-		}
-		ret = history_search(pat, -1);
-	} else
-		ret = history_search_prefix(pat, -1);
-
-	if (ret == -1) {
-		/* restore to end of list on failed search */
-		history(h, &ev, H_FIRST);
-		(void)fprintf(rl_outstream, "%s: Event not found\n", pat);
-		if (pat != last_search_pat)
-			el_free(pat);
-		return NULL;
-	}
-
-	if (sub && len) {
-		if (last_search_match && last_search_match != pat)
-			el_free(last_search_match);
-		last_search_match = pat;
-	}
-
-	if (pat != last_search_pat)
-		el_free(pat);
-
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	*cindex = idx;
-	rptr = ev.str;
-
-	/* roll back to original position */
-	(void)history(h, &ev, H_SET, num);
-
-	return rptr;
-}
-
-/*
- * the real function doing history expansion - takes as argument command
- * to do and data upon which the command should be executed
- * does expansion the way I've understood readline documentation
- *
- * returns 0 if data was not modified, 1 if it was and 2 if the string
- * should be only printed and not executed; in case of error,
- * returns -1 and *result points to NULL
- * it's callers responsibility to free() string returned in *result
- */
-static int
-_history_expand_command(const char *command, size_t offs, size_t cmdlen,
-    char **result)
-{
-	char *tmp, *search = NULL, *aptr;
-	const char *ptr, *cmd;
-	static char *from = NULL, *to = NULL;
-	int start, end, idx, has_mods = 0;
-	int p_on = 0, g_on = 0;
-
-	*result = NULL;
-	aptr = NULL;
-	ptr = NULL;
-
-	/* First get event specifier */
-	idx = 0;
-
-	if (strchr(":^*$", command[offs + 1])) {
-		char str[4];
-		/*
-		* "!:" is shorthand for "!!:".
-		* "!^", "!*" and "!$" are shorthand for
-		* "!!:^", "!!:*" and "!!:$" respectively.
-		*/
-		str[0] = str[1] = '!';
-		str[2] = '0';
-		ptr = get_history_event(str, &idx, 0);
-		idx = (command[offs + 1] == ':')? 1:0;
-		has_mods = 1;
-	} else {
-		if (command[offs + 1] == '#') {
-			/* use command so far */
-			if ((aptr = el_malloc((offs + 1) * sizeof(*aptr)))
-			    == NULL)
-				return -1;
-			(void)strncpy(aptr, command, offs);
-			aptr[offs] = '\0';
-			idx = 1;
-		} else {
-			int	qchar;
-
-			qchar = (offs > 0 && command[offs - 1] == '"')? '"':0;
-			ptr = get_history_event(command + offs, &idx, qchar);
-		}
-		has_mods = command[offs + (size_t)idx] == ':';
-	}
-
-	if (ptr == NULL && aptr == NULL)
-		return -1;
-
-	if (!has_mods) {
-		*result = strdup(aptr ? aptr : ptr);
-		if (aptr)
-			el_free(aptr);
-		if (*result == NULL)
-			return -1;
-		return 1;
-	}
-
-	cmd = command + offs + idx + 1;
-
-	/* Now parse any word designators */
-
-	if (*cmd == '%')	/* last word matched by ?pat? */
-		tmp = strdup(last_search_match? last_search_match:"");
-	else if (strchr("^*$-0123456789", *cmd)) {
-		start = end = -1;
-		if (*cmd == '^')
-			start = end = 1, cmd++;
-		else if (*cmd == '$')
-			start = -1, cmd++;
-		else if (*cmd == '*')
-			start = 1, cmd++;
-	       else if (*cmd == '-' || isdigit((unsigned char) *cmd)) {
-			start = 0;
-			while (*cmd && '0' <= *cmd && *cmd <= '9')
-				start = start * 10 + *cmd++ - '0';
-
-			if (*cmd == '-') {
-				if (isdigit((unsigned char) cmd[1])) {
-					cmd++;
-					end = 0;
-					while (*cmd && '0' <= *cmd && *cmd <= '9')
-						end = end * 10 + *cmd++ - '0';
-				} else if (cmd[1] == '$') {
-					cmd += 2;
-					end = -1;
-				} else {
-					cmd++;
-					end = -2;
-				}
-			} else if (*cmd == '*')
-				end = -1, cmd++;
-			else
-				end = start;
-		}
-		tmp = history_arg_extract(start, end, aptr? aptr:ptr);
-		if (tmp == NULL) {
-			(void)fprintf(rl_outstream, "%s: Bad word specifier",
-			    command + offs + idx);
-			if (aptr)
-				el_free(aptr);
-			return -1;
-		}
-	} else
-		tmp = strdup(aptr? aptr:ptr);
-
-	if (aptr)
-		el_free(aptr);
-
-	if (*cmd == '\0' || ((size_t)(cmd - (command + offs)) >= cmdlen)) {
-		*result = tmp;
-		return 1;
-	}
-
-	for (; *cmd; cmd++) {
-		if (*cmd == ':')
-			continue;
-		else if (*cmd == 'h') {		/* remove trailing path */
-			if ((aptr = strrchr(tmp, '/')) != NULL)
-				*aptr = '\0';
-		} else if (*cmd == 't') {	/* remove leading path */
-			if ((aptr = strrchr(tmp, '/')) != NULL) {
-				aptr = strdup(aptr + 1);
-				el_free(tmp);
-				tmp = aptr;
-			}
-		} else if (*cmd == 'r') {	/* remove trailing suffix */
-			if ((aptr = strrchr(tmp, '.')) != NULL)
-				*aptr = '\0';
-		} else if (*cmd == 'e') {	/* remove all but suffix */
-			if ((aptr = strrchr(tmp, '.')) != NULL) {
-				aptr = strdup(aptr);
-				el_free(tmp);
-				tmp = aptr;
-			}
-		} else if (*cmd == 'p')		/* print only */
-			p_on = 1;
-		else if (*cmd == 'g')
-			g_on = 2;
-		else if (*cmd == 's' || *cmd == '&') {
-			char *what, *with, delim;
-			size_t len, from_len;
-			size_t size;
-
-			if (*cmd == '&' && (from == NULL || to == NULL))
-				continue;
-			else if (*cmd == 's') {
-				delim = *(++cmd), cmd++;
-				size = 16;
-				what = el_realloc(from, size * sizeof(*what));
-				if (what == NULL) {
-					el_free(from);
-					el_free(tmp);
-					return 0;
-				}
-				len = 0;
-				for (; *cmd && *cmd != delim; cmd++) {
-					if (*cmd == '\\' && cmd[1] == delim)
-						cmd++;
-					if (len >= size) {
-						char *nwhat;
-						nwhat = el_realloc(what,
-						    (size <<= 1) *
-						    sizeof(*nwhat));
-						if (nwhat == NULL) {
-							el_free(what);
-							el_free(tmp);
-							return 0;
-						}
-						what = nwhat;
-					}
-					what[len++] = *cmd;
-				}
-				what[len] = '\0';
-				from = what;
-				if (*what == '\0') {
-					el_free(what);
-					if (search) {
-						from = strdup(search);
-						if (from == NULL) {
-							el_free(tmp);
-							return 0;
-						}
-					} else {
-						from = NULL;
-						el_free(tmp);
-						return -1;
-					}
-				}
-				cmd++;	/* shift after delim */
-				if (!*cmd)
-					continue;
-
-				size = 16;
-				with = el_realloc(to, size * sizeof(*with));
-				if (with == NULL) {
-					el_free(to);
-					el_free(tmp);
-					return -1;
-				}
-				len = 0;
-				from_len = strlen(from);
-				for (; *cmd && *cmd != delim; cmd++) {
-					if (len + from_len + 1 >= size) {
-						char *nwith;
-						size += from_len + 1;
-						nwith = el_realloc(with,
-						    size * sizeof(*nwith));
-						if (nwith == NULL) {
-							el_free(with);
-							el_free(tmp);
-							return -1;
-						}
-						with = nwith;
-					}
-					if (*cmd == '&') {
-						/* safe */
-						(void)strcpy(&with[len], from);
-						len += from_len;
-						continue;
-					}
-					if (*cmd == '\\'
-					    && (*(cmd + 1) == delim
-						|| *(cmd + 1) == '&'))
-						cmd++;
-					with[len++] = *cmd;
-				}
-				with[len] = '\0';
-				to = with;
-			}
-
-			aptr = _rl_compat_sub(tmp, from, to, g_on);
-			if (aptr) {
-				el_free(tmp);
-				tmp = aptr;
-			}
-			g_on = 0;
-		}
-	}
-	*result = tmp;
-	return p_on? 2:1;
-}
-
-
-/*
- * csh-style history expansion
- */
-int
-history_expand(char *str, char **output)
-{
-	int ret = 0;
-	size_t idx, i, size;
-	char *tmp, *result;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (history_expansion_char == 0) {
-		*output = strdup(str);
-		return 0;
-	}
-
-	*output = NULL;
-	if (str[0] == history_subst_char) {
-		/* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */
-		*output = el_malloc((strlen(str) + 4 + 1) * sizeof(*output));
-		if (*output == NULL)
-			return 0;
-		(*output)[0] = (*output)[1] = history_expansion_char;
-		(*output)[2] = ':';
-		(*output)[3] = 's';
-		(void)strcpy((*output) + 4, str);
-		str = *output;
-	} else {
-		*output = strdup(str);
-		if (*output == NULL)
-			return 0;
-	}
-
-#define ADD_STRING(what, len, fr)					\
-	{								\
-		if (idx + len + 1 > size) {				\
-			char *nresult = el_realloc(result,		\
-			    (size += len + 1) * sizeof(*nresult));	\
-			if (nresult == NULL) {				\
-				el_free(*output);			\
-				if (/*CONSTCOND*/fr)			\
-					el_free(tmp);			\
-				return 0;				\
-			}						\
-			result = nresult;				\
-		}							\
-		(void)strncpy(&result[idx], what, len);			\
-		idx += len;						\
-		result[idx] = '\0';					\
-	}
-
-	result = NULL;
-	size = idx = 0;
-	tmp = NULL;
-	for (i = 0; str[i];) {
-		int qchar, loop_again;
-		size_t len, start, j;
-
-		qchar = 0;
-		loop_again = 1;
-		start = j = i;
-loop:
-		for (; str[j]; j++) {
-			if (str[j] == '\\' &&
-			    str[j + 1] == history_expansion_char) {
-				(void)strcpy(&str[j], &str[j + 1]);
-				continue;
-			}
-			if (!loop_again) {
-				if (isspace((unsigned char) str[j])
-				    || str[j] == qchar)
-					break;
-			}
-			if (str[j] == history_expansion_char
-			    && !strchr(history_no_expand_chars, str[j + 1])
-			    && (!history_inhibit_expansion_function ||
-			    (*history_inhibit_expansion_function)(str,
-			    (int)j) == 0))
-				break;
-		}
-
-		if (str[j] && loop_again) {
-			i = j;
-			qchar = (j > 0 && str[j - 1] == '"' )? '"':0;
-			j++;
-			if (str[j] == history_expansion_char)
-				j++;
-			loop_again = 0;
-			goto loop;
-		}
-		len = i - start;
-		ADD_STRING(&str[start], len, 0);
-
-		if (str[i] == '\0' || str[i] != history_expansion_char) {
-			len = j - i;
-			ADD_STRING(&str[i], len, 0);
-			if (start == 0)
-				ret = 0;
-			else
-				ret = 1;
-			break;
-		}
-		ret = _history_expand_command (str, i, (j - i), &tmp);
-		if (ret > 0 && tmp) {
-			len = strlen(tmp);
-			ADD_STRING(tmp, len, 1);
-		}
-		if (tmp) {
-			el_free(tmp);
-			tmp = NULL;
-		}
-		i = j;
-	}
-
-	/* ret is 2 for "print only" option */
-	if (ret == 2) {
-		add_history(result);
-#ifdef GDB_411_HACK
-		/* gdb 4.11 has been shipped with readline, where */
-		/* history_expand() returned -1 when the line	  */
-		/* should not be executed; in readline 2.1+	  */
-		/* it should return 2 in such a case		  */
-		ret = -1;
-#endif
-	}
-	el_free(*output);
-	*output = result;
-
-	return ret;
-}
-
-/*
-* Return a string consisting of arguments of "str" from "start" to "end".
-*/
-char *
-history_arg_extract(int start, int end, const char *str)
-{
-	size_t  i, len, max;
-	char	**arr, *result = NULL;
-
-	arr = history_tokenize(str);
-	if (!arr)
-		return NULL;
-	if (arr && *arr == NULL)
-		goto out;
-
-	for (max = 0; arr[max]; max++)
-		continue;
-	max--;
-
-	if (start == '$')
-		start = (int)max;
-	if (end == '$')
-		end = (int)max;
-	if (end < 0)
-		end = (int)max + end + 1;
-	if (start < 0)
-		start = end;
-
-	if (start < 0 || end < 0 || (size_t)start > max ||
-	    (size_t)end > max || start > end)
-		goto out;
-
-	for (i = (size_t)start, len = 0; i <= (size_t)end; i++)
-		len += strlen(arr[i]) + 1;
-	len++;
-	result = el_malloc(len * sizeof(*result));
-	if (result == NULL)
-		goto out;
-
-	for (i = (size_t)start, len = 0; i <= (size_t)end; i++) {
-		(void)strcpy(result + len, arr[i]);
-		len += strlen(arr[i]);
-		if (i < (size_t)end)
-			result[len++] = ' ';
-	}
-	result[len] = '\0';
-
-out:
-	for (i = 0; arr[i]; i++)
-		el_free(arr[i]);
-	el_free(arr);
-
-	return result;
-}
-
-/*
- * Parse the string into individual tokens,
- * similar to how shell would do it.
- */
-char **
-history_tokenize(const char *str)
-{
-	int size = 1, idx = 0, i, start;
-	size_t len;
-	char **result = NULL, *temp, delim = '\0';
-
-	for (i = 0; str[i];) {
-		while (isspace((unsigned char) str[i]))
-			i++;
-		start = i;
-		for (; str[i];) {
-			if (str[i] == '\\') {
-				if (str[i+1] != '\0')
-					i++;
-			} else if (str[i] == delim)
-				delim = '\0';
-			else if (!delim &&
-				    (isspace((unsigned char) str[i]) ||
-				strchr("()<>;&|$", str[i])))
-				break;
-			else if (!delim && strchr("'`\"", str[i]))
-				delim = str[i];
-			if (str[i])
-				i++;
-		}
-
-		if (idx + 2 >= size) {
-			char **nresult;
-			size <<= 1;
-			nresult = el_realloc(result, (size_t)size * sizeof(*nresult));
-			if (nresult == NULL) {
-				el_free(result);
-				return NULL;
-			}
-			result = nresult;
-		}
-		len = (size_t)i - (size_t)start;
-		temp = el_malloc((size_t)(len + 1) * sizeof(*temp));
-		if (temp == NULL) {
-			for (i = 0; i < idx; i++)
-				el_free(result[i]);
-			el_free(result);
-			return NULL;
-		}
-		(void)strncpy(temp, &str[start], len);
-		temp[len] = '\0';
-		result[idx++] = temp;
-		result[idx] = NULL;
-		if (str[i])
-			i++;
-	}
-	return result;
-}
-
-
-/*
- * limit size of history record to ``max'' events
- */
-void
-stifle_history(int max)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (history(h, &ev, H_SETSIZE, max) == 0)
-		max_input_history = max;
-}
-
-
-/*
- * "unlimit" size of history - set the limit to maximum allowed int value
- */
-int
-unstifle_history(void)
-{
-	HistEvent ev;
-	int omax;
-
-	history(h, &ev, H_SETSIZE, INT_MAX);
-	omax = max_input_history;
-	max_input_history = INT_MAX;
-	return omax;		/* some value _must_ be returned */
-}
-
-
-int
-history_is_stifled(void)
-{
-
-	/* cannot return true answer */
-	return max_input_history != INT_MAX;
-}
-
-static const char _history_tmp_template[] = "/tmp/.historyXXXXXX";
-
-int
-history_truncate_file (const char *filename, int nlines)
-{
-	int ret = 0;
-	FILE *fp, *tp;
-	char template[sizeof(_history_tmp_template)];
-	char buf[4096];
-	int fd;
-	char *cp;
-	off_t off;
-	int count = 0;
-	ssize_t left = 0;
-
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	if ((fp = fopen(filename, "r+")) == NULL)
-		return errno;
-	strcpy(template, _history_tmp_template);
-	if ((fd = mkstemp(template)) == -1) {
-		ret = errno;
-		goto out1;
-	}
-
-	if ((tp = fdopen(fd, "r+")) == NULL) {
-		close(fd);
-		ret = errno;
-		goto out2;
-	}
-
-	for(;;) {
-		if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
-			if (ferror(fp)) {
-				ret = errno;
-				break;
-			}
-			if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
-			    (off_t)-1) {
-				ret = errno;
-				break;
-			}
-			left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), fp);
-			if (ferror(fp)) {
-				ret = errno;
-				break;
-			}
-			if (left == 0) {
-				count--;
-				left = sizeof(buf);
-			} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
-			    != 1) {
-				ret = errno;
-				break;
-			}
-			fflush(tp);
-			break;
-		}
-		if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
-			ret = errno;
-			break;
-		}
-		count++;
-	}
-	if (ret)
-		goto out3;
-	cp = buf + left - 1;
-	if(*cp != '\n')
-		cp++;
-	for(;;) {
-		while (--cp >= buf) {
-			if (*cp == '\n') {
-				if (--nlines == 0) {
-					if (++cp >= buf + sizeof(buf)) {
-						count++;
-						cp = buf;
-					}
-					break;
-				}
-			}
-		}
-		if (nlines <= 0 || count == 0)
-			break;
-		count--;
-		if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
-			ret = errno;
-			break;
-		}
-		if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
-			if (ferror(tp)) {
-				ret = errno;
-				break;
-			}
-			ret = EAGAIN;
-			break;
-		}
-		cp = buf + sizeof(buf);
-	}
-
-	if (ret || nlines > 0)
-		goto out3;
-
-	if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
-		ret = errno;
-		goto out3;
-	}
-
-	if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
-	    (off_t)-1) {
-		ret = errno;
-		goto out3;
-	}
-
-	for(;;) {
-		if ((left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
-			if (ferror(fp))
-				ret = errno;
-			break;
-		}
-		if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
-			ret = errno;
-			break;
-		}
-	}
-	fflush(fp);
-	if((off = ftello(fp)) > 0) {
-		if (ftruncate(fileno(fp), off) == -1)
-                  ret = errno;
-        }
-out3:
-	fclose(tp);
-out2:
-	unlink(template);
-out1:
-	fclose(fp);
-
-	return ret;
-}
-
-
-/*
- * read history from a file given
- */
-int
-read_history(const char *filename)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	return history(h, &ev, H_LOAD, filename) == -1 ?
-	    (errno ? errno : EINVAL) : 0;
-}
-
-
-/*
- * write history to a file given
- */
-int
-write_history(const char *filename)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	if (filename == NULL && (filename = _default_history_file()) == NULL)
-		return errno;
-	return history(h, &ev, H_SAVE, filename) == -1 ?
-	    (errno ? errno : EINVAL) : 0;
-}
-
-
-/*
- * returns history ``num''th event
- *
- * returned pointer points to static variable
- */
-HIST_ENTRY *
-history_get(int num)
-{
-	static HIST_ENTRY she;
-	HistEvent ev;
-	int curr_num;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* save current position */
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	curr_num = ev.num;
-
-	/* start from the oldest */
-	if (history(h, &ev, H_LAST) != 0)
-		return NULL;	/* error */
-
-	/* look forwards for event matching specified offset */
-	if (history(h, &ev, H_NEXT_EVDATA, num, &she.data))
-		return NULL;
-
-	she.line = ev.str;
-
-	/* restore pointer to where it was */
-	(void)history(h, &ev, H_SET, curr_num);
-
-	return &she;
-}
-
-
-/*
- * add the line to history table
- */
-int
-add_history(const char *line)
-{
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	(void)history(h, &ev, H_ENTER, line);
-	if (history(h, &ev, H_GETSIZE) == 0)
-		history_length = ev.num;
-
-	return !(history_length > 0); /* return 0 if all is okay */
-}
-
-
-/*
- * remove the specified entry from the history list and return it.
- */
-HIST_ENTRY *
-remove_history(int num)
-{
-	HIST_ENTRY *he;
-	HistEvent ev;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if ((he = el_malloc(sizeof(*he))) == NULL)
-		return NULL;
-
-	if (history(h, &ev, H_DELDATA, num, &he->data) != 0) {
-		el_free(he);
-		return NULL;
-	}
-
-	he->line = ev.str;
-	if (history(h, &ev, H_GETSIZE) == 0)
-		history_length = ev.num;
-
-	return he;
-}
-
-
-/*
- * replace the line and data of the num-th entry
- */
-HIST_ENTRY *
-replace_history_entry(int num, const char *line, histdata_t data)
-{
-	HIST_ENTRY *he;
-	HistEvent ev;
-	int curr_num;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* save current position */
-	if (history(h, &ev, H_CURR) != 0)
-		return NULL;
-	curr_num = ev.num;
-
-	/* start from the oldest */
-	if (history(h, &ev, H_LAST) != 0)
-		return NULL;	/* error */
-
-	if ((he = el_malloc(sizeof(*he))) == NULL)
-		return NULL;
-
-	/* look forwards for event matching specified offset */
-	if (history(h, &ev, H_NEXT_EVDATA, num, &he->data))
-		goto out;
-
-	he->line = strdup(ev.str);
-	if (he->line == NULL)
-		goto out;
-
-	if (history(h, &ev, H_REPLACE, line, data))
-		goto out;
-
-	/* restore pointer to where it was */
-	if (history(h, &ev, H_SET, curr_num))
-		goto out;
-
-	return he;
-out:
-	el_free(he);
-	return NULL;
-}
-
-/*
- * clear the history list - delete all entries
- */
-void
-clear_history(void)
-{
-	HistEvent ev;
-
-	(void)history(h, &ev, H_CLEAR);
-	history_length = 0;
-}
-
-
-/*
- * returns offset of the current history event
- */
-int
-where_history(void)
-{
-	HistEvent ev;
-	int curr_num, off;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return 0;
-	curr_num = ev.num;
-
-	(void)history(h, &ev, H_FIRST);
-	off = 1;
-	while (ev.num != curr_num && history(h, &ev, H_NEXT) == 0)
-		off++;
-
-	return off;
-}
-
-
-/*
- * returns current history event or NULL if there is no such event
- */
-HIST_ENTRY *
-current_history(void)
-{
-
-	return _move_history(H_CURR);
-}
-
-
-/*
- * returns total number of bytes history events' data are using
- */
-int
-history_total_bytes(void)
-{
-	HistEvent ev;
-	int curr_num;
-	size_t size;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	(void)history(h, &ev, H_FIRST);
-	size = 0;
-	do
-		size += strlen(ev.str) * sizeof(*ev.str);
-	while (history(h, &ev, H_NEXT) == 0);
-
-	/* get to the same position as before */
-	history(h, &ev, H_PREV_EVENT, curr_num);
-
-	return (int)size;
-}
-
-
-/*
- * sets the position in the history list to ``pos''
- */
-int
-history_set_pos(int pos)
-{
-	HistEvent ev;
-	int curr_num;
-
-	if (pos >= history_length || pos < 0)
-		return -1;
-
-	(void)history(h, &ev, H_CURR);
-	curr_num = ev.num;
-
-	/*
-	 * use H_DELDATA to set to nth history (without delete) by passing
-	 * (void **)-1
-	 */
-	if (history(h, &ev, H_DELDATA, pos, (void **)-1)) {
-		(void)history(h, &ev, H_SET, curr_num);
-		return -1;
-	}
-	return 0;
-}
-
-
-/*
- * returns previous event in history and shifts pointer accordingly
- */
-HIST_ENTRY *
-previous_history(void)
-{
-
-	return _move_history(H_PREV);
-}
-
-
-/*
- * returns next event in history and shifts pointer accordingly
- */
-HIST_ENTRY *
-next_history(void)
-{
-
-	return _move_history(H_NEXT);
-}
-
-
-/*
- * searches for first history event containing the str
- */
-int
-history_search(const char *str, int direction)
-{
-	HistEvent ev;
-	const char *strp;
-	int curr_num;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	for (;;) {
-		if ((strp = strstr(ev.str, str)) != NULL)
-			return (int)(strp - ev.str);
-		if (history(h, &ev, direction < 0 ? H_NEXT:H_PREV) != 0)
-			break;
-	}
-	(void)history(h, &ev, H_SET, curr_num);
-	return -1;
-}
-
-
-/*
- * searches for first history event beginning with str
- */
-int
-history_search_prefix(const char *str, int direction)
-{
-	HistEvent ev;
-
-	return (history(h, &ev, direction < 0 ?
-	    H_PREV_STR : H_NEXT_STR, str));
-}
-
-
-/*
- * search for event in history containing str, starting at offset
- * abs(pos); continue backward, if pos<0, forward otherwise
- */
-/* ARGSUSED */
-int
-history_search_pos(const char *str,
-		   int direction __attribute__((__unused__)), int pos)
-{
-	HistEvent ev;
-	int curr_num, off;
-
-	off = (pos > 0) ? pos : -pos;
-	pos = (pos > 0) ? 1 : -1;
-
-	if (history(h, &ev, H_CURR) != 0)
-		return -1;
-	curr_num = ev.num;
-
-	if (history_set_pos(off) != 0 || history(h, &ev, H_CURR) != 0)
-		return -1;
-
-	for (;;) {
-		if (strstr(ev.str, str))
-			return off;
-		if (history(h, &ev, (pos < 0) ? H_PREV : H_NEXT) != 0)
-			break;
-	}
-
-	/* set "current" pointer back to previous state */
-	(void)history(h, &ev,
-	    pos < 0 ? H_NEXT_EVENT : H_PREV_EVENT, curr_num);
-
-	return -1;
-}
-
-
-/********************************/
-/* completion functions */
-
-char *
-tilde_expand(char *name)
-{
-	return fn_tilde_expand(name);
-}
-
-char *
-filename_completion_function(const char *name, int state)
-{
-	return fn_filename_completion_function(name, state);
-}
-
-/*
- * a completion generator for usernames; returns _first_ username
- * which starts with supplied text
- * text contains a partial username preceded by random character
- * (usually '~'); state resets search from start (??? should we do that anyway)
- * it's callers responsibility to free returned value
- */
-char *
-username_completion_function(const char *text, int state)
-{
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	struct passwd pwres;
-	char pwbuf[1024];
-#endif
-	struct passwd *pass = NULL;
-
-	if (text[0] == '\0')
-		return NULL;
-
-	if (*text == '~')
-		text++;
-
-	if (state == 0)
-		setpwent();
-
-	while (
-#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	    getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pass) == 0 && pass != NULL
-#else
-	    (pass = getpwent()) != NULL
-#endif
-	    && text[0] == pass->pw_name[0]
-	    && strcmp(text, pass->pw_name) == 0)
-		continue;
-
-	if (pass == NULL) {
-		endpwent();
-		return NULL;
-	}
-	return strdup(pass->pw_name);
-}
-
-
-/*
- * el-compatible wrapper to send TSTP on ^Z
- */
-/* ARGSUSED */
-static unsigned char
-_el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__unused__)))
-{
-	(void)kill(0, SIGTSTP);
-	return CC_NORM;
-}
-
-/*
- * Display list of strings in columnar format on readline's output stream.
- * 'matches' is list of strings, 'len' is number of strings in 'matches',
- * 'max' is maximum length of string in 'matches'.
- */
-void
-rl_display_match_list(char **matches, int len, int max)
-{
-
-	fn_display_match_list(e, matches, (size_t)len, (size_t)max);
-}
-
-static const char *
-/*ARGSUSED*/
-_rl_completion_append_character_function(const char *dummy
-    __attribute__((__unused__)))
-{
-	static char buf[2];
-	buf[0] = (char)rl_completion_append_character;
-	buf[1] = '\0';
-	return buf;
-}
-
-
-/*
- * complete word at current point
- */
-/* ARGSUSED */
-int
-rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
-{
-#ifdef WIDECHAR
-	static ct_buffer_t wbreak_conv, sprefix_conv;
-#endif
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (rl_inhibit_completion) {
-		char arr[2];
-		arr[0] = (char)invoking_key;
-		arr[1] = '\0';
-		el_insertstr(e, arr);
-		return CC_REFRESH;
-	}
-
-	/* Just look at how many global variables modify this operation! */
-	return fn_complete(e,
-	    (CPFunction *)rl_completion_entry_function,
-	    rl_attempted_completion_function,
-	    ct_decode_string(rl_basic_word_break_characters, &wbreak_conv),
-	    ct_decode_string(rl_special_prefixes, &sprefix_conv),
-	    _rl_completion_append_character_function,
-	    (size_t)rl_completion_query_items,
-	    &rl_completion_type, &rl_attempted_completion_over,
-	    &rl_point, &rl_end);
-
-
-}
-
-
-/* ARGSUSED */
-static unsigned char
-_el_rl_complete(EditLine *el __attribute__((__unused__)), int ch)
-{
-	return (unsigned char)rl_complete(0, ch);
-}
-
-/*
- * misc other functions
- */
-
-/*
- * bind key c to readline-type function func
- */
-int
-rl_bind_key(int c, rl_command_func_t *func)
-{
-	int retval = -1;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (func == rl_insert) {
-		/* XXX notice there is no range checking of ``c'' */
-		e->el_map.key[c] = ED_INSERT;
-		retval = 0;
-	}
-	return retval;
-}
-
-
-/*
- * read one key from input - handles chars pushed back
- * to input stream also
- */
-int
-rl_read_key(void)
-{
-	char fooarr[2 * sizeof(int)];
-
-	if (e == NULL || h == NULL)
-		rl_initialize();
-
-	return el_getc(e, fooarr);
-}
-
-
-/*
- * reset the terminal
- */
-/* ARGSUSED */
-void
-rl_reset_terminal(const char *p __attribute__((__unused__)))
-{
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-	el_reset(e);
-}
-
-
-/*
- * insert character ``c'' back into input stream, ``count'' times
- */
-int
-rl_insert(int count, int c)
-{
-	char arr[2];
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	/* XXX - int -> char conversion can lose on multichars */
-	arr[0] = (char)c;
-	arr[1] = '\0';
-
-	for (; count > 0; count--)
-		el_push(e, arr);
-
-	return 0;
-}
-
-int
-rl_insert_text(const char *text)
-{
-	if (!text || *text == 0)
-		return 0;
-
-	if (h == NULL || e == NULL)
-		rl_initialize();
-
-	if (el_insertstr(e, text) < 0)
-		return 0;
-	return (int)strlen(text);
-}
-
-/*ARGSUSED*/
-int
-rl_newline(int count __attribute__((__unused__)),
-    int c __attribute__((__unused__)))
-{
-	/*
-	 * Readline-4.0 appears to ignore the args.
-	 */
-	return rl_insert(1, '\n');
-}
-
-/*ARGSUSED*/
-static unsigned char
-rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c)
-{
-	if (map[c] == NULL)
-	    return CC_ERROR;
-
-	_rl_update_pos();
-
-	(*map[c])(NULL, c);
-
-	/* If rl_done was set by the above call, deal with it here */
-	if (rl_done)
-		return CC_EOF;
-
-	return CC_NORM;
-}
-
-int
-rl_add_defun(const char *name, Function *fun, int c)
-{
-	char dest[8];
-	if ((size_t)c >= sizeof(map) / sizeof(map[0]) || c < 0)
-		return -1;
-	map[(unsigned char)c] = fun;
-	el_set(e, EL_ADDFN, name, name, rl_bind_wrapper);
-	vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0);
-	el_set(e, EL_BIND, dest, name);
-	return 0;
-}
-
-void
-rl_callback_read_char()
-{
-	int count = 0, done = 0;
-	const char *buf = el_gets(e, &count);
-	char *wbuf;
-
-	if (buf == NULL || count-- <= 0)
-		return;
-	if (count == 0 && buf[0] == e->el_tty.t_c[TS_IO][C_EOF])
-		done = 1;
-	if (buf[count] == '\n' || buf[count] == '\r')
-		done = 2;
-
-	if (done && rl_linefunc != NULL) {
-		el_set(e, EL_UNBUFFERED, 0);
-		if (done == 2) {
-		    if ((wbuf = strdup(buf)) != NULL)
-			wbuf[count] = '\0';
-		} else
-			wbuf = NULL;
-		(*(void (*)(const char *))rl_linefunc)(wbuf);
-                /*el_set(e, EL_UNBUFFERED, 1);*/
-	}
-}
-
-void 
-rl_callback_handler_install(const char *prompt, VCPFunction *linefunc)
-{
-	if (e == NULL) {
-		rl_initialize();
-	}
-	(void)rl_set_prompt(prompt);
-	rl_linefunc = linefunc;
-	el_set(e, EL_UNBUFFERED, 1);
-}   
-
-void 
-rl_callback_handler_remove(void)
-{
-	el_set(e, EL_UNBUFFERED, 0);
-	rl_linefunc = NULL;
-}
-
-void
-rl_redisplay(void)
-{
-	char a[2];
-	a[0] = (char)e->el_tty.t_c[TS_IO][C_REPRINT];
-	a[1] = '\0';
-	el_push(e, a);
-}
-
-int
-rl_get_previous_history(int count, int key)
-{
-	char a[2];
-	a[0] = (char)key;
-	a[1] = '\0';
-	while (count--)
-		el_push(e, a);
-	return 0;
-}
-
-void
-/*ARGSUSED*/
-rl_prep_terminal(int meta_flag __attribute__((__unused__)))
-{
-	el_set(e, EL_PREP_TERM, 1);
-}
-
-void
-rl_deprep_terminal(void)
-{
-	el_set(e, EL_PREP_TERM, 0);
-}
-
-int
-rl_read_init_file(const char *s)
-{
-	return el_source(e, s);
-}
-
-int
-rl_parse_and_bind(const char *line)
-{
-	const char **argv;
-	int argc;
-	Tokenizer *tok;
-
-	tok = tok_init(NULL);
-	tok_str(tok, line, &argc, &argv);
-	argc = el_parse(e, argc, argv);
-	tok_end(tok);
-	return argc ? 1 : 0;
-}
-
-int
-rl_variable_bind(const char *var, const char *value)
-{
-	/*
-	 * The proper return value is undocument, but this is what the
-	 * readline source seems to do.
-	 */
-	return el_set(e, EL_BIND, "", var, value) == -1 ? 1 : 0;
-}
-
-void
-rl_stuff_char(int c)
-{
-	char buf[2];
-
-	buf[0] = (char)c;
-	buf[1] = '\0';
-	el_insertstr(e, buf);
-}
-
-static int
-_rl_event_read_char(EditLine *el, char *cp)
-{
-	int	n;
-	ssize_t num_read = 0;
-
-	*cp = '\0';
-	while (rl_event_hook) {
-
-		(*rl_event_hook)();
-
-#if defined(FIONREAD)
-		if (ioctl(el->el_infd, FIONREAD, &n) < 0)
-			return -1;
-		if (n)
-			num_read = read(el->el_infd, cp, (size_t)1);
-		else
-			num_read = 0;
-#elif defined(F_SETFL) && defined(O_NDELAY)
-		if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0)
-			return -1;
-		if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0)
-			return -1;
-		num_read = read(el->el_infd, cp, 1);
-		if (fcntl(el->el_infd, F_SETFL, n))
-			return -1;
-#else
-		/* not non-blocking, but what you gonna do? */
-		num_read = read(el->el_infd, cp, 1);
-		return -1;
-#endif
-
-		if (num_read < 0 && errno == EAGAIN)
-			continue;
-		if (num_read == 0)
-			continue;
-		break;
-	}
-	if (!rl_event_hook)
-		el_set(el, EL_GETCFN, EL_BUILTIN_GETCFN);
-	return (int)num_read;
-}
-
-static void
-_rl_update_pos(void)
-{
-	const LineInfo *li = el_line(e);
-
-	rl_point = (int)(li->cursor - li->buffer);
-	rl_end = (int)(li->lastchar - li->buffer);
-}
-
-void
-rl_get_screen_size(int *rows, int *cols)
-{
-	if (rows)
-		el_get(e, EL_GETTC, "li", rows);
-	if (cols)
-		el_get(e, EL_GETTC, "co", cols);
-}
-
-void
-rl_set_screen_size(int rows, int cols)
-{
-	char buf[64];
-	(void)snprintf(buf, sizeof(buf), "%d", rows);
-	el_set(e, EL_SETTC, "li", buf);
-	(void)snprintf(buf, sizeof(buf), "%d", cols);
-	el_set(e, EL_SETTC, "co", buf);
-}
-
-char **
-rl_completion_matches(const char *str, rl_compentry_func_t *fun)
-{
-	size_t len, max, i, j, min;
-	char **list, *match, *a, *b;
-
-	len = 1;
-	max = 10;
-	if ((list = el_malloc(max * sizeof(*list))) == NULL)
-		return NULL;
-
-	while ((match = (*fun)(str, (int)(len - 1))) != NULL) {
-		list[len++] = match;
-		if (len == max) {
-			char **nl;
-			max += 10;
-			if ((nl = el_realloc(list, max * sizeof(*nl))) == NULL)
-				goto out;
-			list = nl;
-		}
-	}
-	if (len == 1)
-		goto out;
-	list[len] = NULL;
-	if (len == 2) {
-		if ((list[0] = strdup(list[1])) == NULL)
-			goto out;
-		return list;
-	}
-	qsort(&list[1], len - 1, sizeof(*list),
-	    (int (*)(const void *, const void *)) strcmp);
-	min = SIZE_T_MAX;
-	for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
-		b = list[i + 1];
-		for (j = 0; a[j] && a[j] == b[j]; j++)
-			continue;
-		if (min > j)
-			min = j;
-	}
-	if (min == 0 && *str) {
-		if ((list[0] = strdup(str)) == NULL)
-			goto out;
-	} else {
-		if ((list[0] = el_malloc((min + 1) * sizeof(*list[0]))) == NULL)
-			goto out;
-		(void)memcpy(list[0], list[1], min);
-		list[0][min] = '\0';
-	}
-	return list;
-		
-out:
-	el_free(list);
-	return NULL;
-}
-
-char *
-rl_filename_completion_function (const char *text, int state)
-{
-	return fn_filename_completion_function(text, state);
-}
-
-void
-rl_forced_update_display(void)
-{
-	el_set(e, EL_REFRESH);
-}
-
-int
-_rl_abort_internal(void)
-{
-	el_beep(e);
-	longjmp(topbuf, 1);
-	/*NOTREACHED*/
-}
-
-int
-_rl_qsort_string_compare(char **s1, char **s2)
-{
-	return strcoll(*s1, *s2);
-}
-
-HISTORY_STATE *
-history_get_history_state(void)
-{
-	HISTORY_STATE *hs;
-
-	if ((hs = el_malloc(sizeof(*hs))) == NULL)
-		return NULL;
-	hs->length = history_length;
-	return hs;
-}
-
-int
-/*ARGSUSED*/
-rl_kill_text(int from __attribute__((__unused__)),
-    int to __attribute__((__unused__)))
-{
-	return 0;
-}
-
-Keymap
-rl_make_bare_keymap(void)
-{
-	return NULL;
-}
-
-Keymap
-rl_get_keymap(void)
-{
-	return NULL;
-}
-
-void
-/*ARGSUSED*/
-rl_set_keymap(Keymap k __attribute__((__unused__)))
-{
-}
-
-int
-/*ARGSUSED*/
-rl_generic_bind(int type __attribute__((__unused__)),
-    const char * keyseq __attribute__((__unused__)),
-    const char * data __attribute__((__unused__)),
-    Keymap k __attribute__((__unused__)))
-{
-	return 0;
-}
-
-int
-/*ARGSUSED*/
-rl_bind_key_in_map(int key __attribute__((__unused__)),
-    rl_command_func_t *fun __attribute__((__unused__)),
-    Keymap k __attribute__((__unused__)))
-{
-	return 0;
-}
-
-/* unsupported, but needed by python */
-void
-rl_cleanup_after_signal(void)
-{
-}
-
-int
-rl_on_new_line(void)
-{
-	return 0;
-}
diff --git a/cmd-line-utils/libedit/search.h b/cmd-line-utils/libedit/search.h
deleted file mode 100644
index d9f27e561854..000000000000
--- a/cmd-line-utils/libedit/search.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: search.h,v 1.9 2009/12/30 22:37:40 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)search.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * el.search.h: Line and history searching utilities
- */
-#ifndef _h_el_search
-#define	_h_el_search
-
-#include "histedit.h"
-
-typedef struct el_search_t {
-	Char	*patbuf;		/* The pattern buffer		*/
-	size_t	 patlen;		/* Length of the pattern buffer	*/
-	int	 patdir;		/* Direction of the last search	*/
-	int	 chadir;		/* Character search direction	*/
-	Char	 chacha;		/* Character we are looking for	*/
-	char	 chatflg;		/* 0 if f, 1 if t */
-} el_search_t;
-
-
-protected int		el_match(const Char *, const Char *);
-protected int		search_init(EditLine *);
-protected void		search_end(EditLine *);
-protected int		c_hmatch(EditLine *, const Char *);
-protected void		c_setpat(EditLine *);
-protected el_action_t	ce_inc_search(EditLine *, int);
-protected el_action_t	cv_search(EditLine *, int);
-protected el_action_t	ce_search_line(EditLine *, int);
-protected el_action_t	cv_repeat_srch(EditLine *, Int);
-protected el_action_t	cv_csearch(EditLine *, int, Int, int, int);
-
-#endif /* _h_el_search */
diff --git a/cmd-line-utils/libedit/sys.h b/cmd-line-utils/libedit/sys.h
deleted file mode 100644
index 33638d1565b3..000000000000
--- a/cmd-line-utils/libedit/sys.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*	$NetBSD: sys.h,v 1.17 2011/09/28 14:08:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)sys.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * sys.h: Put all the stupid compiler and system dependencies here...
- */
-#ifndef _h_sys
-#define	_h_sys
-
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
-# define __attribute__(A)
-#endif
-
-#ifndef __BEGIN_DECLS
-# ifdef  __cplusplus
-#  define __BEGIN_DECLS  extern "C" {
-#  define __END_DECLS    }
-# else
-#  define __BEGIN_DECLS
-#  define __END_DECLS
-# endif
-#endif
- 
-#ifndef public
-# define public		/* Externally visible functions/variables */
-#endif
-
-#ifndef private
-# define private	static	/* Always hidden internals */
-#endif
-
-#ifndef protected
-# define protected	/* Redefined from elsewhere to "static" */
-			/* When we want to hide everything	*/
-#endif
-
-#ifndef __arraycount
-# define __arraycount(a) (sizeof(a) / sizeof(*(a)))
-#endif
-
-#include <stdio.h>
-
-#ifndef HAVE_STRLCAT
-#define	strlcat libedit_strlcat
-size_t	strlcat(char *dst, const char *src, size_t size);
-#endif
-
-#ifndef HAVE_STRLCPY
-#define	strlcpy libedit_strlcpy
-size_t	strlcpy(char *dst, const char *src, size_t size);
-#endif
-
-#ifndef HAVE_FGETLN
-#define	fgetln libedit_fgetln
-char	*fgetln(FILE *fp, size_t *len);
-#endif
-
-#ifdef __linux__
-/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
-#ifndef __USE_XOPEN
-#define __USE_XOPEN
-#endif
-
-#include <wchar.h>
-#include <wctype.h>
-
-#ifndef HAVE_WCSDUP
-wchar_t *wcsdup(const wchar_t *);
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(x)
-#endif
-
-#ifndef __RCSID
-#define __RCSID(x)
-#endif
-
-#ifndef HAVE_U_INT32_T
-typedef unsigned int	u_int32_t;
-#endif
-
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX	((size_t)-1)
-#endif
-
-#define	REGEX		/* Use POSIX.2 regular expression functions */
-#undef	REGEXP		/* Use UNIX V8 regular expression functions */
-
-#if defined(__sun)
-extern int tgetent(char *, const char *);
-extern int tgetflag(char *);
-extern int tgetnum(char *);
-extern int tputs(const char *, int, int (*)(int));
-extern char* tgoto(const char*, int, int);
-extern char* tgetstr(char*, char**);
-#endif
-
-/* XXXMYSQL: Bug#10218 Command line recall rolls into segfault */
-#if !HAVE_DECL_TGOTO
-/*
- 'tgoto' is not declared in the system header files, this causes
- problems on 64-bit systems. The function returns a 64 bit pointer
- but caller see it as "int" and it's thus truncated to 32-bit
-*/
-extern char* tgoto(const char*, int, int);
-#endif
-
-#ifdef notdef
-# undef REGEX
-# undef REGEXP
-# include <malloc.h>
-# ifdef __GNUC__
-/*
- * Broken hdrs.
- */
-extern int	tgetent(const char *bp, char *name);
-extern int	tgetflag(const char *id);
-extern int	tgetnum(const char *id);
-extern char    *tgetstr(const char *id, char **area);
-extern char    *tgoto(const char *cap, int col, int row);
-extern int	tputs(const char *str, int affcnt, int (*putc)(int));
-extern char    *getenv(const char *);
-extern int	fprintf(FILE *, const char *, ...);
-extern int	sigsetmask(int);
-extern int	sigblock(int);
-extern int	fputc(int, FILE *);
-extern int	fgetc(FILE *);
-extern int	fflush(FILE *);
-extern int	tolower(int);
-extern int	toupper(int);
-extern int	errno, sys_nerr;
-extern char	*sys_errlist[];
-extern void	perror(const char *);
-#  include <string.h>
-#  define strerror(e)	sys_errlist[e]
-# endif
-# ifdef SABER
-extern void *   memcpy(void *, const void *, size_t);
-extern void *   memset(void *, int, size_t);
-# endif
-extern char    *fgetline(FILE *, int *);
-#endif
-
-#endif /* _h_sys */
diff --git a/cmd-line-utils/libedit/tokenizern.c b/cmd-line-utils/libedit/tokenizern.c
deleted file mode 100644
index 92376e066f15..000000000000
--- a/cmd-line-utils/libedit/tokenizern.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#define NARROW_WRAPPER
-#include "config.h"
-#undef WIDECHAR
-#define NARROWCHAR
-#include "./tokenizer.c"
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c
deleted file mode 100644
index a35716f6581c..000000000000
--- a/cmd-line-utils/libedit/vi.c
+++ /dev/null
@@ -1,1176 +0,0 @@
-/*	$NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $	*/
-
-/*-
- * Copyright (c) 1992, 2015
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/wait.h>
-
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
-#else
-#endif
-#endif /* not lint && not SCCSID */
-
-/*
- * vi.c: Vi mode commands.
- */
-#include "el.h"
-
-private el_action_t	cv_action(EditLine *, Int);
-private el_action_t	cv_paste(EditLine *, Int);
-
-/* cv_action():
- *	Handle vi actions.
- */
-private el_action_t
-cv_action(EditLine *el, Int c)
-{
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		/* 'cc', 'dd' and (possibly) friends */
-		if (c != (Int)el->el_chared.c_vcmd.action)
-			return CC_ERROR;
-
-		if (!(c & YANK))
-			cv_undo(el);
-		cv_yank(el, el->el_line.buffer,
-		    (int)(el->el_line.lastchar - el->el_line.buffer));
-		el->el_chared.c_vcmd.action = NOP;
-		el->el_chared.c_vcmd.pos = 0;
-		if (!(c & YANK)) {
-			el->el_line.lastchar = el->el_line.buffer;
-			el->el_line.cursor = el->el_line.buffer;
-		}
-		if (c & INSERT)
-			el->el_map.current = el->el_map.key;
-
-		return CC_REFRESH;
-	}
-	el->el_chared.c_vcmd.pos = el->el_line.cursor;
-	el->el_chared.c_vcmd.action = c;
-	return CC_ARGHACK;
-}
-
-/* cv_paste():
- *	Paste previous deletion before or after the cursor
- */
-private el_action_t
-cv_paste(EditLine *el, Int c)
-{
-	c_kill_t *k = &el->el_chared.c_kill;
-	size_t len = (size_t)(k->last - k->buf);
-
-	if (k->buf == NULL || len == 0)
-		return CC_ERROR;
-#ifdef DEBUG_PASTE
-	(void) fprintf(el->el_errfile, "Paste: \"%.*s\"\n", (int)len, k->buf);
-#endif
-
-	cv_undo(el);
-
-	if (!c && el->el_line.cursor < el->el_line.lastchar)
-		el->el_line.cursor++;
-
-	c_insert(el, (int)len);
-	if (el->el_line.cursor + len > el->el_line.lastchar)
-		return CC_ERROR;
-	(void) memcpy(el->el_line.cursor, k->buf, len *
-	    sizeof(*el->el_line.cursor));
-
-	return CC_REFRESH;
-}
-
-
-/* vi_paste_next():
- *	Vi paste previous deletion to the right of the cursor
- *	[p]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_paste_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_paste(el, 0);
-}
-
-
-/* vi_paste_prev():
- *	Vi paste previous deletion to the left of the cursor
- *	[P]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_paste_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_paste(el, 1);
-}
-
-
-/* vi_prev_big_word():
- *	Vi move to the previous space delimited word
- *	[B]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
-	    el->el_line.buffer,
-	    el->el_state.argument,
-	    cv__isWord);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_prev_word():
- *	Vi move to the previous word
- *	[b]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.buffer)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
-	    el->el_line.buffer,
-	    el->el_state.argument,
-	    cv__isword);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_next_big_word():
- *	Vi move to the next space delimited word
- *	[W]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar - 1)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* vi_next_word():
- *	Vi move to the next word
- *	[w]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar - 1)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isword);
-
-	if (el->el_map.type == MAP_VI)
-		if (el->el_chared.c_vcmd.action != NOP) {
-			cv_delfini(el);
-			return CC_REFRESH;
-		}
-	return CC_CURSOR;
-}
-
-
-/* vi_change_case():
- *	Vi change case of character under the cursor and advance one character
- *	[~]
- */
-protected el_action_t
-vi_change_case(EditLine *el, Int c)
-{
-	int i;
-
-	if (el->el_line.cursor >= el->el_line.lastchar)
-		return CC_ERROR;
-	cv_undo(el);
-	for (i = 0; i < el->el_state.argument; i++) {
-
-		c = *el->el_line.cursor;
-		if (Isupper(c))
-			*el->el_line.cursor = Tolower(c);
-		else if (Islower(c))
-			*el->el_line.cursor = Toupper(c);
-
-		if (++el->el_line.cursor >= el->el_line.lastchar) {
-			el->el_line.cursor--;
-			re_fastaddc(el);
-			break;
-		}
-		re_fastaddc(el);
-	}
-	return CC_NORM;
-}
-
-
-/* vi_change_meta():
- *	Vi change prefix command
- *	[c]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_change_meta(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	/*
-         * Delete with insert == change: first we delete and then we leave in
-         * insert mode.
-         */
-	return cv_action(el, DELETE | INSERT);
-}
-
-
-/* vi_insert_at_bol():
- *	Vi enter insert mode at the beginning of line
- *	[I]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_insert_at_bol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	cv_undo(el);
-	el->el_map.current = el->el_map.key;
-	return CC_CURSOR;
-}
-
-
-/* vi_replace_char():
- *	Vi replace character under the cursor with the next character typed
- *	[r]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_replace_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor >= el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_map.current = el->el_map.key;
-	el->el_state.inputmode = MODE_REPLACE_1;
-	cv_undo(el);
-	return CC_ARGHACK;
-}
-
-
-/* vi_replace_mode():
- *	Vi enter replace mode
- *	[R]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_replace_mode(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	el->el_state.inputmode = MODE_REPLACE;
-	cv_undo(el);
-	return CC_NORM;
-}
-
-
-/* vi_substitute_char():
- *	Vi replace character under the cursor and enter insert mode
- *	[s]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_substitute_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	c_delafter(el, el->el_state.argument);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_substitute_line():
- *	Vi substitute entire line
- *	[S]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_substitute_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	cv_yank(el, el->el_line.buffer,
-	    (int)(el->el_line.lastchar - el->el_line.buffer));
-	(void) em_kill_line(el, 0);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_change_to_eol():
- *	Vi change to end of line
- *	[C]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_change_to_eol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	cv_yank(el, el->el_line.cursor,
-	    (int)(el->el_line.lastchar - el->el_line.cursor));
-	(void) ed_kill_line(el, 0);
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-
-/* vi_insert():
- *	Vi enter insert mode
- *	[i]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_insert(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	cv_undo(el);
-	return CC_NORM;
-}
-
-
-/* vi_add():
- *	Vi enter insert mode after the cursor
- *	[a]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_add(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int ret;
-
-	el->el_map.current = el->el_map.key;
-	if (el->el_line.cursor < el->el_line.lastchar) {
-		el->el_line.cursor++;
-		if (el->el_line.cursor > el->el_line.lastchar)
-			el->el_line.cursor = el->el_line.lastchar;
-		ret = CC_CURSOR;
-	} else
-		ret = CC_NORM;
-
-	cv_undo(el);
-
-	return (el_action_t)ret;
-}
-
-
-/* vi_add_at_eol():
- *	Vi enter insert mode at end of line
- *	[A]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_add_at_eol(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_map.current = el->el_map.key;
-	el->el_line.cursor = el->el_line.lastchar;
-	cv_undo(el);
-	return CC_CURSOR;
-}
-
-
-/* vi_delete_meta():
- *	Vi delete prefix command
- *	[d]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_delete_meta(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_action(el, DELETE);
-}
-
-
-/* vi_end_big_word():
- *	Vi move to the end of the current space delimited word
- *	[E]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_end_big_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv__endword(el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_end_word():
- *	Vi move to the end of the current word
- *	[e]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_end_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar)
-		return CC_ERROR;
-
-	el->el_line.cursor = cv__endword(el->el_line.cursor,
-	    el->el_line.lastchar, el->el_state.argument, cv__isword);
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_undo():
- *	Vi undo last change
- *	[u]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_undo(EditLine *el, Int c __attribute__((__unused__)))
-{
-	c_undo_t un = el->el_chared.c_undo;
-
-	if (un.len == -1)
-		return CC_ERROR;
-
-	/* switch line buffer and undo buffer */
-	el->el_chared.c_undo.buf = el->el_line.buffer;
-	el->el_chared.c_undo.len = el->el_line.lastchar - el->el_line.buffer;
-	el->el_chared.c_undo.cursor =
-	    (int)(el->el_line.cursor - el->el_line.buffer);
-	el->el_line.limit = un.buf + (el->el_line.limit - el->el_line.buffer);
-	el->el_line.buffer = un.buf;
-	el->el_line.cursor = un.buf + un.cursor;
-	el->el_line.lastchar = un.buf + un.len;
-
-	return CC_REFRESH;
-}
-
-
-/* vi_command_mode():
- *	Vi enter command mode (use alternative key bindings)
- *	[<ESC>]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_command_mode(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	/* [Esc] cancels pending action */
-	el->el_chared.c_vcmd.action = NOP;
-	el->el_chared.c_vcmd.pos = 0;
-
-	el->el_state.doingarg = 0;
-
-	el->el_state.inputmode = MODE_INSERT;
-	el->el_map.current = el->el_map.alt;
-#ifdef VI_MOVE
-	if (el->el_line.cursor > el->el_line.buffer)
-		el->el_line.cursor--;
-#endif
-	return CC_CURSOR;
-}
-
-
-/* vi_zero():
- *	Vi move to the beginning of line
- *	[0]
- */
-protected el_action_t
-vi_zero(EditLine *el, Int c)
-{
-
-	if (el->el_state.doingarg)
-		return ed_argument_digit(el, c);
-
-	el->el_line.cursor = el->el_line.buffer;
-	if (el->el_chared.c_vcmd.action != NOP) {
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-
-/* vi_delete_prev_char():
- * 	Vi move to previous character (backspace)
- *	[^H] in insert mode only
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_line.cursor <= el->el_line.buffer)
-		return CC_ERROR;
-
-	c_delbefore1(el);
-	el->el_line.cursor--;
-	return CC_REFRESH;
-}
-
-
-/* vi_list_or_eof():
- *	Vi list choices for completion or indicate end of file if empty line
- *	[^D]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_list_or_eof(EditLine *el, Int c)
-{
-
-	if (el->el_line.cursor == el->el_line.lastchar) {
-		if (el->el_line.cursor == el->el_line.buffer) {
-			if(!(terminal_writec(el, c)))	/* then do a EOF */
-				return CC_EOF;
-			else
-				return CC_ERROR;
-		} else {
-			/*
-			 * Here we could list completions, but it is an
-			 * error right now
-			 */
-			terminal_beep(el);
-			return CC_ERROR;
-		}
-	} else {
-#ifdef notyet
-		re_goto_bottom(el);
-		*el->el_line.lastchar = '\0';	/* just in case */
-		return CC_LIST_CHOICES;
-#else
-		/*
-		 * Just complain for now.
-		 */
-		terminal_beep(el);
-		return CC_ERROR;
-#endif
-	}
-}
-
-
-/* vi_kill_line_prev():
- *	Vi cut from beginning of line to cursor
- *	[^U]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_kill_line_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-	Char *kp, *cp;
-
-	cp = el->el_line.buffer;
-	kp = el->el_chared.c_kill.buf;
-	while (cp < el->el_line.cursor)
-		*kp++ = *cp++;	/* copy it */
-	el->el_chared.c_kill.last = kp;
-	c_delbefore(el, (int)(el->el_line.cursor - el->el_line.buffer));
-	el->el_line.cursor = el->el_line.buffer;	/* zap! */
-	return CC_REFRESH;
-}
-
-
-/* vi_search_prev():
- *	Vi search history previous
- *	[?]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_search_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_search(el, ED_SEARCH_PREV_HISTORY);
-}
-
-
-/* vi_search_next():
- *	Vi search history next
- *	[/]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_search_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_search(el, ED_SEARCH_NEXT_HISTORY);
-}
-
-
-/* vi_repeat_search_next():
- *	Vi repeat current search in the same search direction
- *	[n]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_search_next(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_search.patlen == 0)
-		return CC_ERROR;
-	else
-		return cv_repeat_srch(el, el->el_search.patdir);
-}
-
-
-/* vi_repeat_search_prev():
- *	Vi repeat current search in the opposite search direction
- *	[N]
- */
-/*ARGSUSED*/
-protected el_action_t
-vi_repeat_search_prev(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	if (el->el_search.patlen == 0)
-		return CC_ERROR;
-	else
-		return (cv_repeat_srch(el,
-		    el->el_search.patdir == ED_SEARCH_PREV_HISTORY ?
-		    ED_SEARCH_NEXT_HISTORY : ED_SEARCH_PREV_HISTORY));
-}
-
-
-/* vi_next_char():
- *	Vi move to the character specified next
- *	[f]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 0);
-}
-
-
-/* vi_prev_char():
- *	Vi move to the character specified previous
- *	[F]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 0);
-}
-
-
-/* vi_to_next_char():
- *	Vi move up to the character specified next
- *	[t]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 1);
-}
-
-
-/* vi_to_prev_char():
- *	Vi move up to the character specified previous
- *	[T]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 1);
-}
-
-
-/* vi_repeat_next_char():
- *	Vi repeat current character search in the same search direction
- *	[;]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_next_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_csearch(el, el->el_search.chadir, el->el_search.chacha,
-		el->el_state.argument, el->el_search.chatflg);
-}
-
-
-/* vi_repeat_prev_char():
- *	Vi repeat current character search in the opposite search direction
- *	[,]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_repeat_prev_char(EditLine *el, Int c __attribute__((__unused__)))
-{
-	el_action_t r;
-	int dir = el->el_search.chadir;
-
-	r = cv_csearch(el, -dir, el->el_search.chacha,
-		el->el_state.argument, el->el_search.chatflg);
-	el->el_search.chadir = dir;
-	return r;
-}
-
-
-/* vi_match():
- *	Vi go to matching () {} or []
- *	[%]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_match(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char match_chars[] = STR("()[]{}");
-	Char *cp;
-	size_t delta, i, count;
-	Char o_ch, c_ch;
-
-	*el->el_line.lastchar = '\0';		/* just in case */
-
-	i = Strcspn(el->el_line.cursor, match_chars);
-	o_ch = el->el_line.cursor[i];
-	if (o_ch == 0)
-		return CC_ERROR;
-	delta = (size_t)(Strchr(match_chars, o_ch) - match_chars);
-	c_ch = match_chars[delta ^ 1];
-	count = 1;
-	delta = 1 - (delta & 1) * 2;
-
-	for (cp = &el->el_line.cursor[i]; count; ) {
-		cp += delta;
-		if (cp < el->el_line.buffer || cp >= el->el_line.lastchar)
-			return CC_ERROR;
-		if (*cp == o_ch)
-			count++;
-		else if (*cp == c_ch)
-			count--;
-	}
-
-	el->el_line.cursor = cp;
-
-	if (el->el_chared.c_vcmd.action != NOP) {
-		/* NB posix says char under cursor should NOT be deleted
-		   for -ve delta - this is different to netbsd vi. */
-		if (delta > 0)
-			el->el_line.cursor++;
-		cv_delfini(el);
-		return CC_REFRESH;
-	}
-	return CC_CURSOR;
-}
-
-/* vi_undo_line():
- *	Vi undo all changes to line
- *	[U]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_undo_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_undo(el);
-	return hist_get(el);
-}
-
-/* vi_to_column():
- *	Vi go to specified column
- *	[|]
- * NB netbsd vi goes to screen column 'n', posix says nth character
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_column(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	el->el_state.argument--;
-	return ed_next_char(el, 0);
-}
-
-/* vi_yank_end():
- *	Vi yank to end of line
- *	[Y]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_yank_end(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	cv_yank(el, el->el_line.cursor,
-	    (int)(el->el_line.lastchar - el->el_line.cursor));
-	return CC_REFRESH;
-}
-
-/* vi_yank():
- *	Vi yank
- *	[y]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_yank(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	return cv_action(el, YANK);
-}
-
-/* vi_comment_out():
- *	Vi comment out current command
- *	[#]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_comment_out(EditLine *el, Int c __attribute__((__unused__)))
-{
-
-	el->el_line.cursor = el->el_line.buffer;
-	c_insert(el, 1);
-	*el->el_line.cursor = '#';
-	re_refresh(el);
-	return ed_newline(el, 0);
-}
-
-/* vi_alias():
- *	Vi include shell alias
- *	[@]
- * NB: posix implies that we should enter insert mode, however
- * this is against historical precedent...
- */
-#if defined(__weak_reference) && !defined(__FreeBSD__)
-__weakref_visible char *my_get_alias_text(const char *)
-    __weak_reference(get_alias_text);
-#endif
-protected el_action_t
-/*ARGSUSED*/
-vi_alias(EditLine *el __attribute__((__unused__)),
-	 Int c __attribute__((__unused__)))
-{
-#if defined(__weak_reference) && !defined(__FreeBSD__)
-	char alias_name[3];
-	char *alias_text;
-
-	if (my_get_alias_text == 0) {
-		return CC_ERROR;
-	}
-
-	alias_name[0] = '_';
-	alias_name[2] = 0;
-	if (el_getc(el, &alias_name[1]) != 1)
-		return CC_ERROR;
-
-	alias_text = my_get_alias_text(alias_name);
-	if (alias_text != NULL)
-		FUN(el,push)(el, ct_decode_string(alias_text, &el->el_scratch));
-	return CC_NORM;
-#else
-	return CC_ERROR;
-#endif
-}
-
-/* vi_to_history_line():
- *	Vi go to specified history file line.
- *	[G]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_to_history_line(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int sv_event_no = el->el_history.eventno;
-	el_action_t rval;
-
-
-	if (el->el_history.eventno == 0) {
-		 (void) Strncpy(el->el_history.buf, el->el_line.buffer,
-		     EL_BUFSIZ);
-		 el->el_history.last = el->el_history.buf +
-			 (el->el_line.lastchar - el->el_line.buffer);
-	}
-
-	/* Lack of a 'count' means oldest, not 1 */
-	if (!el->el_state.doingarg) {
-		el->el_history.eventno = 0x7fffffff;
-		hist_get(el);
-	} else {
-		/* This is brain dead, all the rest of this code counts
-		 * upwards going into the past.  Here we need count in the
-		 * other direction (to match the output of fc -l).
-		 * I could change the world, but this seems to suffice.
-		 */
-		el->el_history.eventno = 1;
-		if (hist_get(el) == CC_ERROR)
-			return CC_ERROR;
-		el->el_history.eventno = 1 + el->el_history.ev.num 
-					- el->el_state.argument;
-		if (el->el_history.eventno < 0) {
-			el->el_history.eventno = sv_event_no;
-			return CC_ERROR;
-		}
-	}
-	rval = hist_get(el);
-	if (rval == CC_ERROR)
-		el->el_history.eventno = sv_event_no;
-	return rval;
-}
-
-/* vi_histedit():
- *	Vi edit history line with vi
- *	[v]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_histedit(EditLine *el, Int c __attribute__((__unused__)))
-{
-	int fd;
-	pid_t pid;
-	ssize_t st;
-	int status;
-	char tempfile[] = "/tmp/histedit.XXXXXXXXXX";
-	char *cp;
-	size_t len;
-	Char *line;
-	mbstate_t state;
-
-	memset(&state, 0, sizeof(mbstate_t));
-	if (el->el_state.doingarg) {
-		if (vi_to_history_line(el, 0) == CC_ERROR)
-			return CC_ERROR;
-	}
-
-	fd = mkstemp(tempfile);
-	if (fd < 0)
-		return CC_ERROR;
-	len = (size_t)(el->el_line.lastchar - el->el_line.buffer);
-#define TMP_BUFSIZ (EL_BUFSIZ * MB_LEN_MAX)
-	cp = el_malloc(TMP_BUFSIZ * sizeof(*cp));
-	if (cp == NULL) {
-		unlink(tempfile);
-		close(fd);
-		return CC_ERROR;
-	}
-	/* XXXMYSQL: Make static analyzer happy */
-	line = el_malloc((len+1) * sizeof(*line));
-	if (line == NULL) {
-		el_free(cp);
-		return CC_ERROR;
-	}
-	Strncpy(line, el->el_line.buffer, len);
-	line[len] = '\0';
-	wcsrtombs(cp, (const wchar_t **) &line, TMP_BUFSIZ - 1, &state);
-	cp[TMP_BUFSIZ - 1] = '\0';
-	len = strlen(cp);
-	if (write(fd, cp, len) == -1)
-          goto error;
-	if (write(fd, "\n", (size_t)1) == -1)
-          goto error;
-	pid = fork();
-	switch (pid) {
-	case -1:
-		close(fd);
-		unlink(tempfile);
-		el_free(cp);
-                el_free(line);
-		return CC_ERROR;
-	case 0:
-		close(fd);
-		execlp("vi", "vi", tempfile, (char *)NULL);
-		exit(0);
-		/*NOTREACHED*/
-	default:
-		while (waitpid(pid, &status, 0) != pid)
-			continue;
-		lseek(fd, (off_t)0, SEEK_SET);
-		st = read(fd, cp, TMP_BUFSIZ);
-		if (st > 0) {
-			len = (size_t)(el->el_line.lastchar -
-			    el->el_line.buffer);
-			memset(&state, 0, sizeof(mbstate_t));
-			len = mbsrtowcs(el->el_line.buffer,
-                                        (const char**) &cp, len, &state);
-			if (len > 0 && el->el_line.buffer[len -1] == '\n')
-				--len;
-		}
-		else
-			len = 0;
-                el->el_line.cursor = el->el_line.buffer;
-                el->el_line.lastchar = el->el_line.buffer + len;
-		el_free(cp);
-                el_free(line);
-		break;
-	}
-
-	close(fd);
-	unlink(tempfile);
-	/* return CC_REFRESH; */
-	return ed_newline(el, 0);
-
-/* XXXMYSQL: Avoid compiler warnings. */
-error:
-        close(fd);
-        unlink(tempfile);
-        return CC_ERROR;
-}
-
-/* vi_history_word():
- *	Vi append word from previous input line
- *	[_]
- * Who knows where this one came from!
- * '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_history_word(EditLine *el, Int c __attribute__((__unused__)))
-{
-	const Char *wp = HIST_FIRST(el);
-	const Char *wep, *wsp;
-	int len;
-	Char *cp;
-	const Char *lim;
-
-	if (wp == NULL)
-		return CC_ERROR;
-
-	wep = wsp = 0;
-	do {
-		while (Isspace(*wp))
-			wp++;
-		if (*wp == 0)
-			break;
-		wsp = wp;
-		while (*wp && !Isspace(*wp))
-			wp++;
-		wep = wp;
-	} while ((!el->el_state.doingarg || --el->el_state.argument > 0)
-	    && *wp != 0);
-
-	if (wsp == 0 || (el->el_state.doingarg && el->el_state.argument != 0))
-		return CC_ERROR;
-
-	cv_undo(el);
-	len = (int)(wep - wsp);
-	if (el->el_line.cursor < el->el_line.lastchar)
-		el->el_line.cursor++;
-	c_insert(el, len + 1);
-	cp = el->el_line.cursor;
-	lim = el->el_line.limit;
-	if (cp < lim)
-		*cp++ = ' ';
-	while (wsp < wep && cp < lim)
-		*cp++ = *wsp++;
-	el->el_line.cursor = cp;
-
-	el->el_map.current = el->el_map.key;
-	return CC_REFRESH;
-}
-
-/* vi_redo():
- *	Vi redo last non-motion command
- *	[.]
- */
-protected el_action_t
-/*ARGSUSED*/
-vi_redo(EditLine *el, Int c __attribute__((__unused__)))
-{
-	c_redo_t *r = &el->el_chared.c_redo;
-
-	if (!el->el_state.doingarg && r->count) {
-		el->el_state.doingarg = 1;
-		el->el_state.argument = r->count;
-	}
-
-	el->el_chared.c_vcmd.pos = el->el_line.cursor;
-	el->el_chared.c_vcmd.action = r->action;
-	if (r->pos != r->buf) {
-		if (r->pos + 1 > r->lim)
-			/* sanity */
-			r->pos = r->lim - 1;
-		r->pos[0] = 0;
-		FUN(el,push)(el, r->buf);
-	}
-
-	el->el_state.thiscmd = r->cmd;
-	el->el_state.thisch = r->ch;
-	return (*el->el_map.func[r->cmd])(el, r->ch);
-}
diff --git a/config.h.cmake b/config.h.cmake
index e0abaccec458..5e6b06d621d9 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,14 +1,21 @@
-/* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
  
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- 
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
@@ -35,6 +42,7 @@
 /* Header files */
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_ARPA_INET_H 1
+#cmakedefine HAVE_CRYPT_H 1
 #cmakedefine HAVE_DLFCN_H 1
 #cmakedefine HAVE_EXECINFO_H 1
 #cmakedefine HAVE_FPU_CONTROL_H 1
@@ -60,7 +68,6 @@
 #cmakedefine HAVE_SYS_PARAM_H 1
 #cmakedefine HAVE_FNMATCH_H 1
 #cmakedefine HAVE_SYS_UN_H 1
-#cmakedefine HAVE_VIS_H 1
 #cmakedefine HAVE_SASL_SASL_H 1
 
 /* Libevent */
@@ -180,6 +187,7 @@
 #cmakedefine HAVE_ULONG 1
 #cmakedefine HAVE_U_INT32_T 1
 #cmakedefine HAVE_STRUCT_TIMESPEC
+#cmakedefine HAVE_TM_GMTOFF 1
 
 /* Support for tagging symbols with __attribute__((visibility("hidden"))) */
 #cmakedefine HAVE_VISIBILITY_HIDDEN 1
@@ -198,6 +206,7 @@
 #cmakedefine HAVE_GCC_ATOMIC_BUILTINS 1
 #cmakedefine HAVE_GCC_SYNC_BUILTINS 1
 #cmakedefine HAVE_VALGRIND
+#cmakedefine HAVE_PTHREAD_THREADID_NP 1
 
 /* IPV6 */
 #cmakedefine HAVE_NETINET_IN6_H 1
@@ -223,6 +232,7 @@
 #cmakedefine IPV6_V6ONLY @IPV6_V6ONLY@
 /* This should mean case insensitive file system */
 #cmakedefine FN_NO_CASE_SENSE 1
+#cmakedefine APPLE_ARM 1
 
 /*
  * From main CMakeLists.txt
@@ -275,11 +285,19 @@
 #cmakedefine USE_LIBEDIT_INTERFACE 1
 #cmakedefine HAVE_HIST_ENTRY 1
 #cmakedefine USE_NEW_EDITLINE_INTERFACE 1
+#cmakedefine EDITLINE_HAVE_COMPLETION_CHAR 1
+#cmakedefine EDITLINE_HAVE_COMPLETION_INT 1
 
 /*
  * Libedit
  */
-#cmakedefine HAVE_DECL_TGOTO 1
+#cmakedefine HAVE_GETLINE 1
+#cmakedefine HAVE___SECURE_GETENV 1
+#cmakedefine HAVE_SECURE_GETENV 1
+#cmakedefine HAVE_VIS
+#cmakedefine HAVE_UNVIS
+#cmakedefine HAVE_GETPW_R_DRAFT
+#cmakedefine HAVE_GETPW_R_POSIX
 
 /*
  * DTrace
diff --git a/configure.cmake b/configure.cmake
index 4bbfcca658cc..93a6992d859c 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -68,50 +75,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
   ADD_DEFINITIONS(-DSOLARIS_64BIT_ENABLED)
 ENDIF()
 
-# Nothing explicit on command line? Use c++03
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
-   CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
-   NOT CMAKE_CXX_FLAGS MATCHES "-std=" AND
-   NOT CMAKE_CXX_FLAGS MATCHES "-library" AND
-   NOT CMAKE_CXX_FLAGS MATCHES "stdcxx4" AND
-   NOT CMAKE_CXX_FLAGS MATCHES "stlport"
-   )
-  IF(SUNPRO_CXX_LIBRARY)
-    MESSAGE(WARNING "You should upgrade to -std=c++03")
-  ELSE()
-    # cmake/os/SunOS.cmake has done version check
-    # /opt/solarisstudio12.4/bin/CC has CC_MINOR_VERSION == 13
-    IF(DEFINED CC_MINOR_VERSION AND CC_MINOR_VERSION GREATER 12)
-      MESSAGE("Adding -std=c++03")
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-# The default C++ library for SunPro is really old, and not standards compliant.
-# http://www.oracle.com/technetwork/server-storage/solaris/cmp-stlport-libcstd-142559.html
-# Use stlport rather than Rogue Wave,
-#   unless otherwise specified on command line.
-# This does *not* work for building the server, only for client libraries,
-# i.e. -DWITHOUT_SERVER=1
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
-    IF(CMAKE_CXX_FLAGS MATCHES "-std=")
-      # Nothing here, handled separately below
-    ELSE()
-      IF(SUNPRO_CXX_LIBRARY)
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=${SUNPRO_CXX_LIBRARY}")
-        IF(SUNPRO_CXX_LIBRARY STREQUAL "stdcxx4")
-          ADD_DEFINITIONS(-D__MATHERR_RENAME_EXCEPTION)
-          SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -template=extdef")
-        ENDIF()
-      ELSE()
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDIF()
-
 # Check to see if we are using LLVM's libc++ rather than e.g. libstd++
 # Can then check HAVE_LLBM_LIBCPP later without including e.g. ciso646.
 CHECK_CXX_SOURCE_RUNS("
@@ -125,214 +88,6 @@ int main()
 #endif
 }" HAVE_LLVM_LIBCPP)
 
-MACRO(DIRNAME IN OUT)
-  GET_FILENAME_COMPONENT(${OUT} ${IN} PATH)
-ENDMACRO()
-
-MACRO(FIND_REAL_LIBRARY SOFTLINK_NAME REALNAME)
-  # We re-distribute libstlport.so/libstdc++.so which are both symlinks.
-  # There is no 'readlink' on solaris, so we use perl to follow links:
-  SET(PERLSCRIPT
-    "my $link= $ARGV[0]; use Cwd qw(abs_path); my $file = abs_path($link); print $file;")
-  EXECUTE_PROCESS(
-    COMMAND perl -e "${PERLSCRIPT}" ${SOFTLINK_NAME}
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE real_library
-    )
-  SET(REALNAME ${real_library})
-ENDMACRO()
-
-MACRO(EXTEND_CXX_LINK_FLAGS LIBRARY_PATH)
-  # Using the $ORIGIN token with the -R option to locate the libraries
-  # on a path relative to the executable:
-  # We need an extra backslash to pass $ORIGIN to the mysql_config script...
-  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-    "${CMAKE_CXX_LINK_FLAGS} -R'\\$ORIGIN/../lib' -R${LIBRARY_PATH} ")
-  SET(CMAKE_CXX_LINK_FLAGS
-    "${CMAKE_CXX_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
-  MESSAGE(STATUS "CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS}")
-ENDMACRO()
-
-MACRO(EXTEND_C_LINK_FLAGS LIBRARY_PATH)
-  SET(CMAKE_C_LINK_FLAGS
-    "${CMAKE_C_LINK_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
-  MESSAGE(STATUS "CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS}")
-  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-    "${CMAKE_SHARED_LIBRARY_C_FLAGS} -R'\$ORIGIN/../lib' -R${LIBRARY_PATH}")
-ENDMACRO()
-
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCC)
-  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
-  SET(LIB_SUFFIX "lib")
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-    SET(LIB_SUFFIX "lib/sparcv9")
-  ENDIF()
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-    SET(LIB_SUFFIX "lib/amd64")
-  ENDIF()
-  FIND_LIBRARY(GPP_LIBRARY_NAME
-    NAMES "stdc++"
-    PATHS ${CXX_PATH}/../${LIB_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  MESSAGE(STATUS "GPP_LIBRARY_NAME ${GPP_LIBRARY_NAME}")
-  IF(GPP_LIBRARY_NAME)
-    DIRNAME(${GPP_LIBRARY_NAME} GPP_LIBRARY_PATH)
-    FIND_REAL_LIBRARY(${GPP_LIBRARY_NAME} real_library)
-    MESSAGE(STATUS "INSTALL ${GPP_LIBRARY_NAME} ${real_library}")
-    INSTALL(FILES ${GPP_LIBRARY_NAME} ${real_library}
-            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    EXTEND_CXX_LINK_FLAGS(${GPP_LIBRARY_PATH})
-    EXECUTE_PROCESS(
-      COMMAND sh -c "elfdump ${real_library} | grep SONAME"
-      RESULT_VARIABLE result
-      OUTPUT_VARIABLE sonameline
-    )
-    IF(NOT result)
-      STRING(REGEX MATCH "libstdc.*[^\n]" soname ${sonameline})
-      MESSAGE(STATUS "INSTALL ${GPP_LIBRARY_PATH}/${soname}")
-      INSTALL(FILES "${GPP_LIBRARY_PATH}/${soname}"
-              DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    ENDIF()
-  ENDIF()
-  FIND_LIBRARY(GCC_LIBRARY_NAME
-    NAMES "gcc_s"
-    PATHS ${CXX_PATH}/../${LIB_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  IF(GCC_LIBRARY_NAME)
-    DIRNAME(${GCC_LIBRARY_NAME} GCC_LIBRARY_PATH)
-    FIND_REAL_LIBRARY(${GCC_LIBRARY_NAME} real_library)
-    MESSAGE(STATUS "INSTALL ${GCC_LIBRARY_NAME} ${real_library}")
-    INSTALL(FILES ${GCC_LIBRARY_NAME} ${real_library}
-            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    EXTEND_C_LINK_FLAGS(${GCC_LIBRARY_PATH})
-  ENDIF()
-ENDIF()
-
-# TODO: consider to INSTALL this library
-# /opt/developerstudio12.5/lib/compilers/atomic/sparcv9/libstatomic.so
-# see: https://docs.oracle.com/cd/E60778_01/html/E60746/gqhbq.html
-# We assume that developer studio runtime libraries are installed.
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
-   CMAKE_CXX_COMPILER_ID STREQUAL "SunPro" AND
-   CMAKE_CXX_FLAGS MATCHES "-std=c")
-  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
-
-  SET(LIBRARY_SUFFIX "lib/compilers/CC-gcc/lib")
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/sparcv9")
-  ENDIF()
-  IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-    SET(LIBRARY_SUFFIX "${LIBRARY_SUFFIX}/amd64")
-  ENDIF()
-  FIND_LIBRARY(STL_LIBRARY_NAME
-    NAMES "stdc++"
-    PATHS ${CXX_PATH}/../${LIBRARY_SUFFIX}
-    NO_DEFAULT_PATH
-  )
-  MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
-  IF(STL_LIBRARY_NAME)
-    DIRNAME(${STL_LIBRARY_NAME} STL_LIBRARY_PATH)
-    SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-      "${CMAKE_CXX_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
-    SET(CMAKE_CXX_LINK_FLAGS
-      "${CMAKE_CXX_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
-    SET(CMAKE_C_LINK_FLAGS
-      "${CMAKE_C_LINK_FLAGS} -L${STL_LIBRARY_PATH} -R${STL_LIBRARY_PATH}")
-  ENDIF()
-  SET(CMAKE_C_LINK_FLAGS
-    "${CMAKE_C_LINK_FLAGS} -lc")
-  SET(CMAKE_CXX_LINK_FLAGS
-    "${CMAKE_CXX_LINK_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc")
-  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-    "${QUOTED_CMAKE_CXX_LINK_FLAGS} -lstdc++ -lgcc_s -lCrunG3 -lc ")
-  SET(QUOTED_CMAKE_CXX_LINK_FLAGS
-    "${QUOTED_CMAKE_CXX_LINK_FLAGS} -L/usr/lib -latomic ")
-ENDIF()
-
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
-   CMAKE_C_COMPILER_ID MATCHES "SunPro" AND
-   CMAKE_CXX_FLAGS MATCHES "stlport4")
-  DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
-  # Also extract real path to the compiler(which is normally
-  # in <install_path>/prod/bin) and try to find the
-  # stlport libs relative to that location as well.
-  GET_FILENAME_COMPONENT(CXX_REALPATH ${CMAKE_CXX_COMPILER} REALPATH)
-
-  # CC -V yields
-  # CC: Studio 12.6 Sun C++ 5.15 SunOS_sparc Beta 2016/12/19
-  # CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04
-  # CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11
-  # CC: Sun C++ 5.11 SunOS_sparc 2010/08/13
-
-  EXECUTE_PROCESS(
-    COMMAND ${CMAKE_CXX_COMPILER} "-V"
-    OUTPUT_VARIABLE stdout
-    ERROR_VARIABLE  stderr
-    RESULT_VARIABLE result
-  )
-  IF(result)
-    MESSAGE(FATAL_ERROR "Failed to execute ${CMAKE_CXX_COMPILER} -V")
-  ENDIF()
-
-  STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
-  IF (NOT CMAKE_MATCH_1 OR CMAKE_MATCH_1 STREQUAL "")
-    STRING(REGEX MATCH "CC: Studio 12\\.[56] Sun C\\+\\+ 5\\.([0-9]+)"
-      VERSION_STRING ${stderr})
-  ENDIF()
-  SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
-
-  IF(${CC_MINOR_VERSION} EQUAL 14)
-    MESSAGE(FATAL_ERROR
-      "Please run cmake with -DCMAKE_CXX_FLAGS=-std=c++03 for ${stderr}")
-  ENDIF()
-
-  IF(${CC_MINOR_VERSION} EQUAL 13)
-    SET(STLPORT_SUFFIX "lib/compilers/stlport4")
-    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-      SET(STLPORT_SUFFIX "lib/compilers/stlport4/sparcv9")
-    ENDIF()
-    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-      SET(STLPORT_SUFFIX "lib/compilers/stlport4/amd64")
-    ENDIF()
-  ELSE()
-    SET(STLPORT_SUFFIX "lib/stlport4")
-    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-      SET(STLPORT_SUFFIX "lib/stlport4/v9")
-    ENDIF()
-    IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-      SET(STLPORT_SUFFIX "lib/stlport4/amd64")
-    ENDIF()
-  ENDIF()
-
-  FIND_LIBRARY(STL_LIBRARY_NAME
-    NAMES "stlport"
-    PATHS ${CXX_PATH}/../${STLPORT_SUFFIX}
-          ${CXX_REALPATH}/../../${STLPORT_SUFFIX}
-  )
-  MESSAGE(STATUS "STL_LIBRARY_NAME ${STL_LIBRARY_NAME}")
-  IF(STL_LIBRARY_NAME)
-    DIRNAME(${STL_LIBRARY_NAME} STLPORT_PATH)
-    FIND_REAL_LIBRARY(${STL_LIBRARY_NAME} real_library)
-    MESSAGE(STATUS "INSTALL ${STL_LIBRARY_NAME} ${real_library}")
-    INSTALL(FILES ${STL_LIBRARY_NAME} ${real_library}
-            DESTINATION ${INSTALL_LIBDIR} COMPONENT SharedLibraries)
-    EXTEND_C_LINK_FLAGS(${STLPORT_PATH})
-    EXTEND_CXX_LINK_FLAGS(${STLPORT_PATH})
-  ELSE()
-    MESSAGE(STATUS "Failed to find the reuired stlport library, print some"
-                   "variables to help debugging and bail out")
-    MESSAGE(STATUS "CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER}")
-    MESSAGE(STATUS "CXX_PATH ${CXX_PATH}")
-    MESSAGE(STATUS "CXX_REALPATH ${CXX_REALPATH}")
-    MESSAGE(STATUS "STLPORT_SUFFIX ${STLPORT_SUFFIX}")
-    MESSAGE(STATUS "PATH: ${CXX_PATH}/../${STLPORT_SUFFIX}")
-    MESSAGE(STATUS "PATH: ${CXX_REALPATH}/../../${STLPORT_SUFFIX}")
-    MESSAGE(FATAL_ERROR
-      "Could not find the required stlport library.")
-  ENDIF()
-ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
   IF (CMAKE_EXE_LINKER_FLAGS MATCHES " -static " 
@@ -387,15 +142,30 @@ ENDFUNCTION()
 FIND_PACKAGE (Threads)
 
 IF(UNIX)
-  MY_SEARCH_LIBS(floor m LIBM)
+  IF(NOT LIBM)
+    MY_SEARCH_LIBS(floor m LIBM)
+  ENDIF()
   IF(NOT LIBM)
     MY_SEARCH_LIBS(__infinity m LIBM)
   ENDIF()
   MY_SEARCH_LIBS(gethostbyname_r  "nsl_r;nsl" LIBNSL)
   MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)
+  # Feature test broken with -fsanitize=address, look for lib first.
+  IF(CMAKE_C_FLAGS MATCHES "-fsanitize=")
+    CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_crypt_IN_crypt)
+    # If found, do not look in libc.
+    IF(HAVE_crypt_IN_crypt)
+      SET(LIBCRYPT crypt)
+      SET(${LIBCRYPT} 1)
+    ENDIF()
+  ENDIF()
   MY_SEARCH_LIBS(crypt crypt LIBCRYPT)
   MY_SEARCH_LIBS(setsockopt socket LIBSOCKET)
   MY_SEARCH_LIBS(dlopen dl LIBDL)
+  # HAVE_dlopen_IN_LIBC
+  IF(NOT LIBDL)
+    MY_SEARCH_LIBS(dlsym dl LIBDL)
+  ENDIF()
   MY_SEARCH_LIBS(sched_yield rt LIBRT)
   IF(NOT LIBRT)
     MY_SEARCH_LIBS(clock_gettime rt LIBRT)
@@ -466,6 +236,7 @@ INCLUDE (CheckIncludeFiles)
 
 CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
+CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILES (fpu_control.h HAVE_FPU_CONTROL_H)
@@ -477,7 +248,6 @@ CHECK_INCLUDE_FILES (netinet/in.h HAVE_NETINET_IN_H)
 CHECK_INCLUDE_FILES (poll.h HAVE_POLL_H)
 CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
 CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H) # Used by NDB
-CHECK_INCLUDE_FILES (sys/cdefs.h HAVE_SYS_CDEFS_H) # Used by libedit
 CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
 CHECK_INCLUDE_FILES (sys/mman.h HAVE_SYS_MMAN_H)
 CHECK_INCLUDE_FILES (sys/resource.h HAVE_SYS_RESOURCE_H)
@@ -491,8 +261,6 @@ CHECK_INCLUDE_FILES (sys/wait.h HAVE_SYS_WAIT_H)
 CHECK_INCLUDE_FILES (sys/param.h HAVE_SYS_PARAM_H) # Used by NDB/libevent
 CHECK_INCLUDE_FILES (fnmatch.h HAVE_FNMATCH_H)
 CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
-CHECK_INCLUDE_FILES (vis.h HAVE_VIS_H) # Used by libedit
-CHECK_INCLUDE_FILES (sasl/sasl.h HAVE_SASL_SASL_H) # Used by memcached
 
 # For libevent
 CHECK_INCLUDE_FILES(sys/devpoll.h HAVE_DEVPOLL)
@@ -654,9 +422,16 @@ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 #
 INCLUDE (CheckTypeSize)
 
-set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-        -D_LARGEFILE_SOURCE -D_LARGE_FILES -D_FILE_OFFSET_BITS=64
-        -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS)
+LIST(APPEND CMAKE_REQUIRED_DEFINITIONS
+  -D_LARGEFILE_SOURCE -D_LARGE_FILES -D_FILE_OFFSET_BITS=64
+  -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
+  )
+
+IF(SOLARIS)
+  LIST(APPEND CMAKE_REQUIRED_DEFINITIONS
+    -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS
+    )
+ENDIF()
 
 SET(CMAKE_EXTRA_INCLUDE_FILES stdint.h stdio.h sys/types.h time.h)
 
@@ -670,6 +445,9 @@ CHECK_TYPE_SIZE("off_t"     SIZEOF_OFF_T)
 CHECK_TYPE_SIZE("time_t"    SIZEOF_TIME_T)
 CHECK_TYPE_SIZE("struct timespec" STRUCT_TIMESPEC)
 
+CHECK_STRUCT_HAS_MEMBER("struct tm"
+ tm_gmtoff "time.h" HAVE_TM_GMTOFF)
+
 # If finds the size of a type, set SIZEOF_<type> and HAVE_<type>
 FUNCTION(MY_CHECK_TYPE_SIZE type defbase)
   CHECK_TYPE_SIZE("${type}" SIZEOF_${defbase})
@@ -922,6 +700,17 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in" sin_len
 CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len
   "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SOCKADDR_IN6_SIN6_LEN)
 
+# Check for pthread_threadid_np()
+CHECK_C_SOURCE_COMPILES("
+#include <pthread.h>
+int main(int ac, char **av)
+{
+  unsigned long long tid64;
+  pthread_threadid_np(NULL, &tid64);
+  return (tid64 != 0 ? 0 : 1);
+}"
+HAVE_PTHREAD_THREADID_NP)
+
 CHECK_CXX_SOURCE_COMPILES(
   "
   #include <vector>
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt
index b0a6eba5d081..9d52e496e71a 100644
--- a/dbug/CMakeLists.txt
+++ b/dbug/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 5c4f24e6974e..a2ad4c85be42 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -102,7 +102,7 @@
 #include <signal.h>
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 
 /*
diff --git a/dbug/dbug_add_tags.pl b/dbug/dbug_add_tags.pl
index 66096450f821..4b6b76d48dbf 100755
--- a/dbug/dbug_add_tags.pl
+++ b/dbug/dbug_add_tags.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2002 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/dbug/factorial.c b/dbug/factorial.c
index d1a869c06eae..018f71bdd6f1 100644
--- a/dbug/factorial.c
+++ b/dbug/factorial.c
@@ -1,4 +1,4 @@
-#ifdef DBUG_OFF				/* We are testing dbug */
+#ifdef NDEBUG				/* We are testing dbug */
 
 int factorial(int value) {
 	if(value > 1) {
diff --git a/dbug/my_main.c b/dbug/my_main.c
index 7e12d329f6f2..ca3b06b5bd3d 100644
--- a/dbug/my_main.c
+++ b/dbug/my_main.c
@@ -3,8 +3,8 @@
   fixed so that it could compile and run in MySQL source tree
 */
 
-#ifdef DBUG_OFF				/* We are testing dbug */
-#undef DBUG_OFF
+#ifdef NDEBUG				/* We are testing dbug */
+#undef NDEBUG
 #endif
 
 #include <my_global.h>	/* This includes dbug.h */
diff --git a/dbug/tests.c b/dbug/tests.c
index 8eb1417dc3a1..797d37c1ed50 100644
--- a/dbug/tests.c
+++ b/dbug/tests.c
@@ -38,7 +38,7 @@ int func1()
 int main (int argc, char *argv[])
 {
   int i;
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   return 1;
 #endif
   if (argc == 1)
diff --git a/dbug/user.r b/dbug/user.r
index 5628f5a4fa11..6fd6947939b2 100644
--- a/dbug/user.r
+++ b/dbug/user.r
@@ -317,7 +317,7 @@ First of all, notice that all of the debugger functions are implemented
 via preprocessor macros.
 This does not detract from the readability of the code and makes disabling
 all debug compilation trivial (a single preprocessor symbol, 
-.B DBUG_OFF ,
+.B NDEBUG ,
 forces the macro expansions to be null).
 .P
 Also notice the inclusion of the header file
@@ -867,14 +867,6 @@ EX:\fC
 .SP 1
 .LI DBUG_UNLOCK_FILE\ 
 Unlocks DBUG_FILE stream, that was locked with a DBUG_LOCK_FILE.
-.LI DBUG_ASSERT\ 
-This macro just does a regular assert(). The difference is that it will be
-disabled by DBUG_OFF togeher with the
-.I dbug
-library. So there will be no need to disable asserts separately with NDEBUG.
-.SP 1
-EX:\ \fCDBUG_ASSERT(\ a\ >\ 0\ );\fR
-.SP 1
 .LI DBUG_ABORT\ 
 This macro could be used instead of abort(). It flushes DBUG_FILE stream
 to ensure that no
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 3adf988a219d..d0d24ebede9d 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,22 +1,27 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
-${ZLIB_INCLUDE_DIR}
-${LZ4_INCLUDE_DIR}
 # Following is for perror, in case NDB is compiled in.
 ${CMAKE_SOURCE_DIR}/storage/ndb/include
 ${CMAKE_BINARY_DIR}/storage/ndb/include
@@ -34,15 +39,6 @@ IF(NOT CMAKE_CROSSCOMPILING)
  SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX)
 ENDIF()
 
-IF (BUILD_BUNDLED_LZ4)
-  ADD_CONVENIENCE_LIBRARY(lz4_lib
-    lz4/lz4.c
-    lz4/lz4frame.c
-    lz4/lz4hc.c
-    lz4/xxhash.c
-  )
-ENDIF()
-
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
                    COMMAND comp_err
@@ -65,16 +61,8 @@ ADD_CUSTOM_TARGET(GenError
 # Set InnoDB mutex type
 ADD_DEFINITIONS(-DMUTEX_EVENT)
 
-## Most executables depend on libeay32.dll (through mysys_ssl).
-## For 'comp_err' we need it to be available during build.
-COPY_OPENSSL_DLLS(copy_openssl_extra)
-IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRYPTO_DLL)
-  ADD_DEPENDENCIES(GenError copy_openssl_extra)
-ENDIF()
-
-
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
+TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
 
 MYSQL_ADD_EXECUTABLE(perror perror.c)
@@ -104,9 +92,8 @@ TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY})
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
 
-  IF(LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
+  IF(LZ4_LIBRARY)
     ADD_DEFINITIONS(-DHAVE_LZ4=1)
-    INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
   ENDIF()
 
   # Add path to the InnoDB headers
diff --git a/extra/RAPIDJSON-README b/extra/RAPIDJSON-README
index 8ef0b6258641..dc4f98e60233 100644
--- a/extra/RAPIDJSON-README
+++ b/extra/RAPIDJSON-README
@@ -1,13 +1,20 @@
-Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -16,22 +23,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ----
 
 The rapidjson library included in this directory is based on
-https://github.com/miloyip/rapidjson, upstream commit
-3a4835e080d213c60842f58f207991fbb1c97f74.
-
-There are three changes made to the library:
+https://github.com/Tencent/rapidjson/,
+commit 418331e99f859f00bdc8306f69eba67e8693c55e
 
-1) Two lines have been added to reader.h, which fix an assertion in the library
-   when a JSON document contains illegally escaped unicode characters. See
-   upstream commit b7e34100ed167b8134b41fcff0918895dd4e61fb for the changes.
+There is one change made to the library:
 
-2) Rapidjson-specific changes in commit 91153f3385c4917a215aa4c7818b3f6265608286
+1) Rapidjson-specific changes in commit 91153f3385c4917a215aa4c7818b3f6265608286
    have been applied, so that negative zero is handled properly (bug#19504183).
 
-3) The fix for a bug in the parsing of floating point numbers has been
-   applied to reader.h (bug#21384048). See details in the upstream bug
-   report at https://github.com/miloyip/rapidjson/issues/313 and the
-   following upstream commits:
-     - 93d13ad2acc6a52d58e09d84e76826cd36ee64f0
-     - 735354efd328709a8efb6a2a43a584bb85f2de6b
-     - 7708215b609733bcfa06074b67463920c03782e8
+We only include the contents of the folder "include/" so that we don't include
+any code licensed under the JSON License.
diff --git a/extra/comp_err.c b/extra/comp_err.c
index edeede5cc75d..754d5d005554 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,7 +52,7 @@ static char *NAMEFILE= (char*) "mysqld_ername.h";
 static char *STATEFILE= (char*) "sql_state.h";
 static char *TXTFILE= (char*) "../sql/share/errmsg-utf8.txt";
 static char *DATADIRECTORY= (char*) "../sql/share/";
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";
 #endif
 
@@ -105,7 +112,7 @@ struct errors
 
 static struct my_option my_long_options[]=
 {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
@@ -695,7 +702,7 @@ static struct message *find_message(struct errors *err, const char *lang,
       DBUG_RETURN(tmp);
     if (!strcmp(tmp->lang_short_name, default_language))
     {
-      DBUG_ASSERT(tmp->text[0] != 0);
+      assert(tmp->text[0] != 0);
       return_val= tmp;
     }
   }
@@ -768,7 +775,7 @@ static ha_checksum checksum_format_specifier(const char* msg)
 
     fprintf(stderr, "Still inside formatspecifier after end of string"
                     " in'%s'\n", msg);
-    DBUG_ASSERT(start==0);
+    assert(start==0);
   }
 
   /* Add number of format specifiers to checksum as extra safeguard */
@@ -801,7 +808,7 @@ static int check_message_format(struct errors *err,
     DBUG_RETURN(0); /* No previous message to compare against */
 
   first= dynamic_element(&err->msg, 0, struct message*);
-  DBUG_ASSERT(first != NULL);
+  assert(first != NULL);
 
   if (checksum_format_specifier(first->text) !=
       checksum_format_specifier(mess))
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 57586ebee95d..4bbec4eacf8e 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -38,6 +45,8 @@
 #include <my_getopt.h>
 #include <m_string.h>
 #include <welcome_copyright_notice.h>	/* ORACLE_WELCOME_COPYRIGHT_NOTICE */
+#include "typelib.h"
+#include "prealloced_array.h"
 
 /* Only parts of these files are included from the InnoDB codebase.
 The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */
@@ -312,7 +321,7 @@ ulong read_file(
 {
 	ulong bytes = 0;
 
-	DBUG_ASSERT(physical_page_size >= UNIV_ZIP_SIZE_MIN);
+	assert(physical_page_size >= UNIV_ZIP_SIZE_MIN);
 
 	if (partial_page_read) {
 		buf += UNIV_ZIP_SIZE_MIN;
@@ -917,10 +926,10 @@ static struct my_option innochecksum_options[] = {
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Verbose (prints progress every 5 seconds).",
     &verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"debug", '#', "Output debug log. See " REFMAN "dbug-package.html",
     &dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
   {"count", 'c', "Print the count of pages in the file and exits.",
     &just_count, &just_count, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"start_page", 's', "Start on this page number (0 based).",
@@ -959,7 +968,7 @@ static struct my_option innochecksum_options[] = {
 /* Print out the Innodb version and machine information. */
 static void print_version(void)
 {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 	printf("%s Ver %s, for %s (%s)\n",
 		my_progname, INNODB_VERSION_STR,
 		SYSTEM_TYPE, MACHINE_TYPE);
@@ -967,7 +976,7 @@ static void print_version(void)
 	printf("%s-debug Ver %s, for %s (%s)\n",
 		my_progname, INNODB_VERSION_STR,
 		SYSTEM_TYPE, MACHINE_TYPE);
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 }
 
 static void usage(void)
@@ -991,7 +1000,7 @@ innochecksum_get_one_option(
 	char			*argument MY_ATTRIBUTE((unused)))
 {
 	switch (optid) {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	case '#':
 		dbug_setting = argument
 			? argument
@@ -999,7 +1008,7 @@ innochecksum_get_one_option(
 				 "d:o,/tmp/innochecksum.trace");
 		DBUG_PUSH(dbug_setting);
 		break;
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 	case 'e':
 		use_end_page = true;
 		break;
@@ -1090,7 +1099,7 @@ int main(
 	/* our input filename. */
 	char*		filename;
 	/* Buffer to store pages read. */
-	byte*		buf = NULL;
+	Prealloced_array<byte, 1> buf(PSI_NOT_INSTRUMENTED);
 	/* bytes read count */
 	ulong		bytes;
 	/* Buffer to decompress page.*/
@@ -1170,8 +1179,8 @@ int main(
 	}
 
 
-	buf = (byte*) malloc(UNIV_PAGE_SIZE_MAX * 2);
-	tbuf = buf + UNIV_PAGE_SIZE_MAX;
+	buf.reserve(UNIV_PAGE_SIZE_MAX * 2);
+	tbuf = buf.begin() + UNIV_PAGE_SIZE_MAX;
 
 	/* The file name is not optional. */
 	for (int i = 0; i < argc; ++i) {
@@ -1241,7 +1250,7 @@ int main(
 #endif /* _WIN32 */
 
 		/* Read the minimum page size. */
-		bytes = ulong(fread(buf, 1, UNIV_ZIP_SIZE_MIN, fil_in));
+		bytes = ulong(fread(buf.begin(), 1, UNIV_ZIP_SIZE_MIN, fil_in));
 		partial_page_read = true;
 
 		if (bytes != UNIV_ZIP_SIZE_MIN) {
@@ -1250,18 +1259,17 @@ int main(
 			fprintf(stderr, "of %d bytes.  Bytes read was %lu\n",
 				UNIV_ZIP_SIZE_MIN, bytes);
 
-			free(buf);
 			DBUG_RETURN(1);
 		}
 
 		/* enable variable is_system_tablespace when space_id of given
 		file is zero. Use to skip the checksum verification and rewrite
 		for doublewrite pages. */
-		is_system_tablespace = (!memcmp(&space_id, buf +
+		is_system_tablespace = (!memcmp(&space_id, buf.begin() +
 					FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, 4))
 					? true : false;
 
-		const page_size_t&	page_size = get_page_size(buf);
+		const page_size_t&	page_size = get_page_size(buf.begin());
 
 		pages = (ulint) (size / page_size.physical());
 
@@ -1309,7 +1317,6 @@ int main(
 					perror("Error: Unable to seek to "
 						"necessary offset");
 
-					free(buf);
 					DBUG_RETURN(1);
 				}
 				/* Save the current file pointer in
@@ -1317,7 +1324,6 @@ int main(
 				if (0 != fgetpos(fil_in, &pos)) {
 					perror("fgetpos");
 
-					free(buf);
 					DBUG_RETURN(1);
 				}
 			} else {
@@ -1335,7 +1341,7 @@ int main(
 					(fseeko() on stdin doesn't work). So
 					read only the remaining part of page,
 					if partial_page_read is enable. */
-					bytes = read_file(buf,
+					bytes = read_file(buf.begin(),
 							  partial_page_read,
 							  static_cast<ulong>(
 							  page_size.physical()),
@@ -1349,7 +1355,6 @@ int main(
 							"to seek to necessary "
 							"offset");
 
-						free(buf);
 						DBUG_RETURN(1);
 					}
 				}
@@ -1375,7 +1380,7 @@ int main(
 		lastt = 0;
 		while (!feof(fil_in)) {
 
-			bytes = read_file(buf, partial_page_read,
+			bytes = read_file(buf.begin(), partial_page_read,
 					  static_cast<ulong>(
 					  page_size.physical()), fil_in);
 			partial_page_read = false;
@@ -1389,7 +1394,6 @@ int main(
 					page_size.physical());
 				perror(" ");
 
-				free(buf);
 				DBUG_RETURN(1);
 			}
 
@@ -1397,22 +1401,20 @@ int main(
 				fprintf(stderr, "Error: bytes read (%lu) "
 					"doesn't match page size (" ULINTPF ")\n",
 					bytes, page_size.physical());
-				free(buf);
 				DBUG_RETURN(1);
 			}
 
 			if (is_system_tablespace) {
 				/* enable when page is double write buffer.*/
-				skip_page = is_page_doublewritebuffer(buf);
+				skip_page = is_page_doublewritebuffer(buf.begin());
 			} else {
 				skip_page = false;
 
-				if (!page_decompress(buf, tbuf, page_size)) {
+				if (!page_decompress(buf.begin(), tbuf, page_size)) {
 
 					fprintf(stderr,
 						"Page decompress failed");
 
-					free(buf);
 					DBUG_RETURN(1);
 				}
 			}
@@ -1423,7 +1425,7 @@ int main(
 				/* Checksum verification */
 				if (!skip_page) {
 					is_corrupted = is_page_corrupted(
-						buf, page_size);
+						buf.begin(), page_size);
 
 					if (is_corrupted) {
 						fprintf(stderr, "Fail: page "
@@ -1440,7 +1442,6 @@ int main(
 								"count::%" PRIuMAX "\n",
 								allow_mismatches);
 
-							free(buf);
 							DBUG_RETURN(1);
 						}
 					}
@@ -1449,11 +1450,10 @@ int main(
 
 			/* Rewrite checksum */
 			if (do_write
-			    && !write_file(filename, fil_in, buf,
+			    && !write_file(filename, fil_in, buf.begin(),
 					   page_size.is_compressed(), &pos,
 					   static_cast<ulong>(page_size.physical()))) {
 
-				free(buf);
 				DBUG_RETURN(1);
 			}
 
@@ -1463,7 +1463,7 @@ int main(
 			}
 
 			if (page_type_summary || page_type_dump) {
-				parse_page(buf, fil_page_type);
+				parse_page(buf.begin(), fil_page_type);
 			}
 
 			/* do counter increase and progress printing */
@@ -1507,6 +1507,5 @@ int main(
 		fclose(log_file);
 	}
 
-	free(buf);
 	DBUG_RETURN(0);
 }
diff --git a/extra/libedit/libedit-20221030-3.1/COPYING b/extra/libedit/libedit-20221030-3.1/COPYING
new file mode 100644
index 000000000000..742f005f8f9c
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/COPYING
@@ -0,0 +1,30 @@
+Copyright (c) 1992, 1993
+ The Regents of the University of California.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Christos Zoulas of Cornell University.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
diff --git a/extra/libedit/libedit-20221030-3.1/ChangeLog b/extra/libedit/libedit-20221030-3.1/ChangeLog
new file mode 100644
index 000000000000..d11a9889ee7e
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/ChangeLog
@@ -0,0 +1,544 @@
+   * See also NetBSD changelog:
+	http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit
+
+2022-10-30 Jess Thrysoee
+
+   * src/sys.h, src/reallocarr.c: Remove unused sys/cdefs.h include, to compile against musl libc
+	Reported by Matt Boehlke
+
+   * version-info: 0:70:0
+
+2022-10-09 Jess Thrysoee
+
+   * version-info: 0:69:0
+
+   * src/sys.h: Add __sun guard around sys/types.h in sys.h
+
+   * all: sync with upstream source
+
+2021-09-10 Jess Thrysoee
+
+   * all: sync with upstream source
+
+2021-07-14 Jess Thrysoee
+
+   * all: sync with upstream source
+
+   * src/histedit.h: Add wcsdup declaration when ifndef HAVE_WCSDUP. Patch by Rainer Jung.
+
+   * examples/wtc1.c: Fix warnings and add missing brace. Patch by Rainer Jung.
+
+2021-05-22 Jess Thrysoee
+
+   * version-info: 0:66:0
+
+   * all: sync with upstream source
+
+   * src/el.c: editrc not read on systems without issetugid
+	Patch by Trevor Cordes
+
+2021-04-19 Jess Thrysoee
+
+   * version-info: 0:65:0
+
+   * all: sync with upstream source
+
+   * src/getline.c,src/sys.h: Provide getline.c implementation if not available
+	Patch by Claes Nästén
+
+   * src/makelist: Use Posix locale; mainly to get ASCII character classes in e.g. `tr`
+	Patch by Claes Nästén
+
+  * examples/test_filecompletion.c, examples/wtc1.c: err.h not supported by
+	Solaris
+
+2021-02-16 Jess Thrysoee
+
+   * version-info: 0:64:0
+
+   * all: sync with upstream source
+
+2019-12-31 Jess Thrysoee
+
+   * version-info: 0:63:0
+
+   * configure.ac: Support -ltinfo as split in newer ncurses
+	The newer versions of ncurses support building terminfo routines as a split -ltinfo library.
+	Patch by Michał Górny
+
+2019-12-11 Jess Thrysoee
+
+   * version-info: 0:62:0
+
+   * all: sync with upstream source
+
+2019-10-25 Jess Thrysoee
+
+   * version-info: 0:61:0
+
+   * all: sync with upstream source
+
+2019-03-24 Jess Thrysoee
+
+   * version-info: 0:60:0
+
+   * all: sync with upstream source
+
+2018-12-09 Jess Thrysoee
+
+   * version-info: 0:59:0
+
+   * all: sync with upstream source
+
+2018-05-25 Jess Thrysoee
+
+   * version-info: 0:58:0
+
+   * all: sync with upstream source
+
+2017-05-22 Jess Thrysoee
+
+   * version-info: 0:57:0
+
+   * all: sync with upstream source
+
+   * libedit.pc.in: Ncurses should not be a part of public link interface.
+	Patch by Yegor Timoshenko
+
+2017-03-29 Jess Thrysoee
+
+   * version-info: 0:56:0
+
+   * all: sync with upstream source
+
+2016-09-03 Jess Thrysoee
+
+   * version-info: 0:55:0
+
+   * all: sync with upstream source
+
+2016-06-18 Jess Thrysoee
+
+   * version-info: 0:54:0
+
+   * all: sync with upstream source
+
+   * deprecate option --enable-widec.
+	Upstream now always build with unicode (wide-char/UTF-8) support.
+
+2015-03-25 Jess Thrysoee
+
+   * version-info: 0:53:0
+
+   * all: sync with upstream source
+
+2014-10-30 Jess Thrysoee
+
+   * version-info: 0:52:0
+
+   * all: sync with upstream source
+
+   * configura.ac: Fix posix shell portability issue. Patch by Ryo Onodera.
+
+2014-06-20 Jess Thrysoee
+
+   * version-info: 0:51:0
+
+   * all: sync with upstream source
+
+2014-06-18 Jess Thrysoee
+
+   * version-info: 0:50:0
+
+   * all: sync with upstream source - add weak alias patches
+
+2014-06-18 Jess Thrysoee
+
+   * version-info: 0:49:0
+
+   * all: sync with upstream source.
+
+2014-02-13 Jess Thrysoee
+
+   * version-info: 0:48:0
+
+   * all: sync with upstream source.
+
+   * examples/fileman.c: Fix typo. Patch by Kamil Dudka.
+
+   * Makefile.am, configure.ac: Add --enable-examples configure parameter.
+	Make it possible to enable/disable building of the examples programs.
+	Patch by James Le Cuirot.
+
+2013-07-12 Jess Thrysoee
+
+   * version-info: 0:47:0
+
+   * all: sync with upstream source.
+
+   * examples/fileman.c, examples/tc1.c: fix pedantic compiler warnings
+
+2013-07-10 Jess Thrysoee
+
+   * version-info: 0:46:0
+
+   * configure.ac, src/el.c: ~/.editrc was never sourced on Linux.
+	On Linux issetugid is not available. When unable to determine if
+	the current process is tainted, we did not trust the HOME environment
+	variable and therefore could not load ~/.editrc.
+	Now instead use secure_getenv or a issetugid based implementation of secure_getenv.
+	Patch by Paolo Tosco.
+
+2013-06-11 Jess Thrysoee
+
+   * version-info: 0:45:0
+
+   * configure.ac: fix AM_CONDITIONAL regression for strlcpy, strlcat, vis,
+	unvis checks.
+
+2013-06-08 Jess Thrysoee
+
+   * version-info: 0:44:0
+
+   * configure.ac, src/Makefile.am: Prevent 'ranlib: has no symbols' build
+	warnings for systems that has strlcpy, strlcat, vis, unvis.
+
+2013-06-01 Jess Thrysoee
+
+   * version-info: 0:43:0
+
+   * all: sync with upstream source.
+
+2012-12-13 Jess Thrysoee
+
+   * version-info: 0:42:0
+
+   * all: sync with upstream source.
+
+2012-06-01 Jess Thrysoee
+
+   * version-info: 0:41:0
+
+   * all: sync with upstream source.
+
+2012-05-22 Jess Thrysoee
+
+   * version-info: 0:40:0
+
+   * all: sync with upstream source.
+
+2012-03-11 Jess Thrysoee
+
+   * version-info: 0:39:0
+
+   * all: sync with upstream source.
+
+2011-08-02 Jess Thrysoee
+
+   * version-info: 0:38:0
+
+   * all: sync with upstream source.
+
+2011-07-09 Jess Thrysoee
+
+   * version-info: 0:37:0
+
+   * all: sync with upstream source.
+
+2011-02-27 Jess Thrysoee
+
+   * version-info: 0:36:0
+
+   * all: sync with upstream source.
+
+2010-04-24 Jess Thrysoee
+
+   * version-info: 0:35:0
+
+   * all: sync with upstream source.
+	Now with UTF-8 support. To enable this run 'configure --enable-widec'.
+	For now an UTF-32 encoded wchar_t is required.
+	This requirement is met on NetBSD, Solaris and OS X for any UTF-8 locale,
+	and any system that define __STDC_ISO_10646__ (e.g. GNU libc on Linux).
+
+2009-09-23 Jess Thrysoee
+   * version-info: 0:34:0
+
+   * all: apply Apple patches from:
+	http://opensource.apple.com/source/libedit/libedit-11/patches
+
+2009-09-05 Jess Thrysoee
+
+   * version-info: 0:33:0
+
+   * all: Use predefined macro __sun to identify Solaris
+
+   * src/el.c: Ignore comment lines in .editrc
+
+2009-07-23 Jess Thrysoee
+
+   * version-info: 0:32:0
+
+   * all: sync with upstream source.
+
+2009-06-10 Jess Thrysoee
+
+   * version-info: 0:31:0
+
+   * all: sync with upstream source.
+
+2009-05-03 Jess Thrysoee
+
+   * version-info: 0:30:0
+
+   * all: sync with upstream source.
+
+2009-04-05  Jess Thrysoee
+
+   * version-info: 0:29:0
+
+   * all: sync with upstream source.
+
+2009-01-11  Jess Thrysoee
+
+   * version-info: 0:28:0
+
+   * all: sync with upstream source. MAJOR.MINOR version is now 3.0.
+	This is due to NetBSD changing time_t and dev_t to 64 bits. It does
+	not really effect this package.
+
+   * configure.ac: Remove '--enable-debug' configure flag. The autoconf way
+	to control flags is by specifying them when running configure,
+	e.g. 'CFLAGS="-O0 -g" ./configure'
+
+2008-07-12  Jess Thrysoee
+
+   * version-info: 0:27:0
+
+   * configure.ac: Added '--enable-debug' configure flag, to produce debugging
+	information.
+
+   * examples/fileman.c: cast stat struct members, st_nlink and st_size,
+	appropriately (see also 'man 2 stat'). Patch by Alex Elder.
+
+   * all: sync with upstream source. MINOR version is now 11.
+
+2007-08-31  Jess Thrysoee
+
+   * version-info: 0:26:0
+
+   * libedit.pc.in,Makefile.am,configure.ac,patches/extra_dist_list.sh:
+	Added pkg-config support for libedit. Patch by Masatake YAMATO.
+
+2007-08-13  Jess Thrysoee
+
+   * version-info: 0:25:0
+
+   * all: sync with upstream source.
+
+2007-03-02  Jess Thrysoee
+
+   * version-info: 0:24:0
+
+   * all: sync with upstream source.
+
+2006-10-22  Jess Thrysoee
+
+   * version-info: 0:23:0
+
+   * src/shlib_version: Upstream bumped minor version from 9 to 10.
+
+   * all: sync with upstream source. More readline functions.
+
+2006-10-22  Jess Thrysoee
+
+   * version-info: 0:22:0
+
+   * all: sync with upstream source.
+
+2006-08-29  Jess Thrysoee
+
+   * version-info: 0:21:0
+
+   * all: License cleanup. All 4-clause advertising BSD licenses has been
+	changed to the 3-clause version by upstream.
+
+   * src/fgetln.c: use src/tools/compat/fgetln.c instead of
+	othersrc/libexec/tnftpd/libnetbsd/fgetln.c
+
+2006-08-16  Jess Thrysoee
+
+   * version-info: 0:20:0
+
+   * all: sync with upstream source.
+
+2006-06-03  Jess Thrysoee
+
+   * version-info: 0:19:0
+
+   * COPYING: added global license file
+
+   * all: sync with upstream source.
+
+2006-02-13  Jess Thrysoee
+
+   * version-info: 0:18:0
+
+   * src/readline.c: Partial rl_getc_function support, patch by Kjeld Borch
+	Egevang.
+
+   * src/readline.c: Make write_history and read_history returncode readline
+	compatible. Upstream patch.
+
+2006-01-03  Jess Thrysoee
+
+   * version-info: 0:17:0
+
+   * patches/cvs_export.sh: strlcat.c and strlcpy.c was moved to
+	src/common/lib/libc/string in the upstream cvs repository.
+
+   * all: sync with upstream source.
+
+2005-10-22  Jess Thrysoee
+
+   * version-info: 0:16:0
+
+   * patches/*.patch, configure.ac: define SCCSID, undef LIBC_SCCS. Remove
+	fourteen cosmetic patches.
+
+   * all: sync with upstream source.
+
+2005-09-11  Jess Thrysoee
+
+   * version-info: 0:15:0
+
+   * src/Makefile.am: fix typo that meant generated files were distributes,
+	and make generated file targets dependent on the the 'makelist' input
+	files.
+
+   * all: sync with upstream source. This is just a manpage update
+
+2005-08-28  Jess Thrysoee
+
+   * version-info: 0:14:0
+
+   * src/sys.h: include config.h to avoid "redefinition of
+	`u_int32_t'". Patch by Norihiko Murase.
+
+   * src/search.c: explicitly include sys/types.h, because regex.h on
+	FreeBSD needs it and does not include it itself. Patch by Norihiko Murase.
+
+   * acinclude.m4: added EL_GETPW_R_DRAFT test and use AC_TRY_LINK instead
+	of AC_TRY_COMPILE. Suggested by Norihiko Murase.
+
+   * all: sync with upstream source.
+
+2005-08-16  Jess Thrysoee
+
+   * version-info: 0:13:0
+
+   * all: sync with upstream source.
+
+2005-08-05  Jess Thrysoee
+
+   * version-info: 0:12:0
+
+   * all: sync with upstream source.
+
+2005-07-24  Jess Thrysoee
+
+   * version-info: 0:11:0
+
+   * histedit.h, histedit.c, readline.c, editline/readline.h: From
+	upstream; added remove_history().
+
+2005-07-07  Jess Thrysoee
+
+   * version-info: 0:10:0
+
+   * history.c, key.c: From upstream source; Fix memory leaks found by
+	valgrind.
+
+2005-06-28  Jess Thrysoee
+
+   * version-info: 0:9:0
+
+   * src/readline.c: getpwent_r is not POSIX, always use getpwent.
+	Reported by Gerrit P. Haase.
+
+   * src/Makefile.am: Added libtool -no-undefined. This is needed on Cygwin
+	to get a shared editline library. Should not affect other platforms.
+	Suggested by Gerrit P. Haase.
+
+2005-06-15  Jess Thrysoee
+
+   * version-info: 0:8:0
+
+   * all: sync with upstream source.
+
+2005-06-01  Jess Thrysoee
+
+   * version-info: 0:7:0
+
+   * all: sync with upstream source.
+
+   * src/readline.c, src/filecomplete.c: Solaris use POSIX draft versions
+	of getpwent_r, getpwnam_r and getpwuid_r which return 'struct passwd *'.
+	Define HAVE_GETPW_R_POSIX if these functions are (non draft) POSIX
+	compatible. Patch by Julien Torrès.
+
+2005-05-28  Jess Thrysoee
+
+   * version-info: 0:6:0
+
+   * all: sync with upstream source.
+
+2005-03-11  Jess Thrysoee
+
+   * version-info: 0:5:0
+
+   * all: sync with upstream source.
+
+2004-12-07  Jess Thrysoee
+
+   * version-info: 0:4:0
+
+   * src/readline.c: d_namlen (in struct dirent) is not portable, always
+	use strlen. Patch by Scott Rankin.
+
+2004-11-27  Jess Thrysoee
+
+   * version-info: 0:3:0
+
+   * src/history.c: bug #26785 fixed upstream, removed local patch.
+
+2004-11-06  Jess Thrysoee
+
+   * version-info: 0:2:0
+
+   * all: sync with upstream source.
+
+   * doc/Makefile.am: If mdoc2man fails, remove empty file. Patch by
+	Darren Tucker.
+
+2004-10-14  Jess Thrysoee
+
+   * version-info: 0:1:0
+
+   * doc/Makefile.am: 'make install' twice fails. Remove old links before
+	trying to link the man pages. Patch by Rick Richardson.
+
+2004-09-28  Jess Thrysoee
+
+   * version-info: 0:0:0
+
+   * acinclude.m4 configure.ac src/Makefile.am: Adhere to
+	LibTools library interface versions recommendation.
+	http://www.gnu.org/software/libtool/manual.html#SEC32
+
+   * doc/Makefile.am: name all manpage links as el_* (e.g. el_history.3)
+	to avoid conflicts.
+
+2004-09-08  Jess Thrysoee
+
+   * all: Initial package.
diff --git a/extra/yassl/taocrypt/INSTALL b/extra/libedit/libedit-20221030-3.1/INSTALL
similarity index 100%
rename from extra/yassl/taocrypt/INSTALL
rename to extra/libedit/libedit-20221030-3.1/INSTALL
diff --git a/extra/libedit/libedit-20221030-3.1/Makefile.am b/extra/libedit/libedit-20221030-3.1/Makefile.am
new file mode 100644
index 000000000000..093990798eb7
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/Makefile.am
@@ -0,0 +1,13 @@
+
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
+if ENABLE_EXAMPLES
+  EXAMPLES_DIR=examples
+endif
+
+SUBDIRS = src $(EXAMPLES_DIR) doc
+
+EXTRA_DIST = libedit.pc.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libedit.pc
diff --git a/extra/libedit/libedit-20221030-3.1/Makefile.in b/extra/libedit/libedit-20221030-3.1/Makefile.in
new file mode 100644
index 000000000000..f7ba2e285578
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/Makefile.in
@@ -0,0 +1,887 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = libedit.pc
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+DIST_SUBDIRS = src examples doc
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/libedit.pc.in COPYING ChangeLog INSTALL THANKS \
+	compile config.guess config.sub install-sh ltmain.sh missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION = @LT_VERSION@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTYPE = @MANTYPE@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+@ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
+SUBDIRS = src $(EXAMPLES_DIR) doc
+EXTRA_DIST = libedit.pc.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libedit.pc
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+libedit.pc: $(top_builddir)/config.status $(srcdir)/libedit.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgconfigDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgconfigDATA
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip dist-zstd distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-pkgconfigDATA
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extra/libedit/libedit-20221030-3.1/THANKS b/extra/libedit/libedit-20221030-3.1/THANKS
new file mode 100644
index 000000000000..98ad22b8bc61
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/THANKS
@@ -0,0 +1 @@
+Thanks to the NetBSD Project maintainers of libedit!
diff --git a/extra/libedit/libedit-20221030-3.1/acinclude.m4 b/extra/libedit/libedit-20221030-3.1/acinclude.m4
new file mode 100644
index 000000000000..95faf65f4990
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/acinclude.m4
@@ -0,0 +1,84 @@
+
+dnl
+dnl read lib version from file (and trim trailing newline)
+dnl
+define([EL_RELEASE], [patsubst(esyscmd([. src/shlib_version; echo $major.$minor]), [
+])])
+
+dnl
+dnl read cvsexport timestamp from file (and trim trailing newline)
+dnl
+define([EL_TIMESTAMP], [patsubst(esyscmd([date +"%Y%m%d"]), [
+])])
+
+
+dnl
+dnl NetBSD use the -mdoc macro package for manpages, but e.g.
+dnl AIX and Solaris only support the -man package.
+dnl
+AC_DEFUN([EL_MANTYPE],
+[
+   MANTYPE=
+   TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb"
+   AC_PATH_PROGS(NROFF, nroff awf, /bin/false, $TestPath)
+   if ${NROFF} -mdoc ${srcdir}/doc/editrc.5.roff >/dev/null 2>&1; then
+      MANTYPE=mdoc
+   fi
+   AC_SUBST(MANTYPE)
+])
+
+
+dnl
+dnl Check if getpwnam_r and getpwuid_r are POSIX.1 compatible
+dnl POSIX draft version returns 'struct passwd *' (used on Solaris)
+dnl NOTE: getpwent_r is not POSIX so we always use getpwent
+dnl
+AC_DEFUN([EL_GETPW_R_POSIX],
+[
+   AC_MSG_CHECKING([whether getpwnam_r and getpwuid_r are posix like])
+      # The prototype for the POSIX version is:
+      # int getpwnam_r(char *, struct passwd *, char *, size_t, struct passwd **)
+      # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[#include <stdlib.h>
+                #include <sys/types.h>
+                #include <pwd.h>]],
+               [[getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL);
+                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);]])],
+      [AC_DEFINE([HAVE_GETPW_R_POSIX], 1, [Define to 1 if you have getpwnam_r and getpwuid_r that are POSIX.1 compatible.])
+       AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no)])
+])
+
+AC_DEFUN([EL_GETPW_R_DRAFT],
+[
+   AC_MSG_CHECKING([whether getpwnam_r and getpwuid_r are posix _draft_ like])
+      # The prototype for the POSIX draft version is:
+      # struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int);
+      # struct passwd *getpwnam_r(char *, struct passwd *,  char *, int);
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[#include <stdlib.h>
+                #include <sys/types.h>
+                #include <pwd.h>]],
+               [[getpwnam_r(NULL, NULL, NULL, (size_t)0);
+                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0);]])],
+      [AC_DEFINE([HAVE_GETPW_R_DRAFT], 1, [Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1 versions.])
+       AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no)])
+])
+
+
+dnl
+dnl deprecate option --enable-widec to turn on use of wide-character support
+dnl
+AC_DEFUN([EL_DEPRECATE_WIDEC],
+[
+   AC_MSG_CHECKING(if you want wide-character code)
+   AC_ARG_ENABLE(widec,
+      [  --enable-widec          deprecated, wide-character/UTF-8 is always enabled],
+      [with_widec=$enableval],
+      [with_widec=no])
+   AC_MSG_RESULT($with_widec)
+   AC_MSG_WARN([--enable-widec is deprecated, wide-character/UTF-8 is always enabled])
+])
+
diff --git a/extra/libedit/libedit-20221030-3.1/aclocal.m4 b/extra/libedit/libedit-20221030-3.1/aclocal.m4
new file mode 100644
index 000000000000..fe9723af9009
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/aclocal.m4
@@ -0,0 +1,1156 @@
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.16'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.16.5], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
+  shift
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
+  do
+    # Strip MF so we end up with the name of the file.
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
+  done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
+am__doit:
+	@echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([acinclude.m4])
diff --git a/extra/libedit/libedit-20221030-3.1/compile b/extra/libedit/libedit-20221030-3.1/compile
new file mode 100755
index 000000000000..df363c8fbfbc
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/compile
@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN* | MSYS*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/* | msys/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/extra/libedit/libedit-20221030-3.1/config.h.in b/extra/libedit/libedit-20221030-3.1/config.h.in
new file mode 100644
index 000000000000..7c2241130015
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/config.h.in
@@ -0,0 +1,348 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if the `closedir' function returns void instead of int. */
+#undef CLOSEDIR_VOID
+
+/* Define to 1 if you have the <curses.h> header file. */
+#undef HAVE_CURSES_H
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `endpwent' function. */
+#undef HAVE_ENDPWENT
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
+/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1
+   versions. */
+#undef HAVE_GETPW_R_DRAFT
+
+/* Define to 1 if you have getpwnam_r and getpwuid_r that are POSIX.1
+   compatible. */
+#undef HAVE_GETPW_R_POSIX
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
+/* Define to 1 if you have the `issetugid' function. */
+#undef HAVE_ISSETUGID
+
+/* Define to 1 if you have the `curses' library (-lcurses). */
+#undef HAVE_LIBCURSES
+
+/* Define to 1 if you have the `ncurses' library (-lncurses). */
+#undef HAVE_LIBNCURSES
+
+/* Define to 1 if you have the `termcap' library (-ltermcap). */
+#undef HAVE_LIBTERMCAP
+
+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
+#undef HAVE_LIBTINFO
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
+/* Define to 1 if you have the <ncurses.h> header file. */
+#undef HAVE_NCURSES_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the `reallocarr' function. */
+#undef HAVE_REALLOCARR
+
+/* Define to 1 if you have the `regcomp' function. */
+#undef HAVE_REGCOMP
+
+/* Define to 1 if you have the `re_comp' function. */
+#undef HAVE_RE_COMP
+
+/* Define to 1 if you have the `secure_getenv' function. */
+#undef HAVE_SECURE_GETENV
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
+#undef HAVE_STAT_EMPTY_STRING_BUG
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strcspn' function. */
+#undef HAVE_STRCSPN
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if struct dirent has member d_namlen */
+#undef HAVE_STRUCT_DIRENT_D_NAMLEN
+
+/* Define to 1 if you have the `strunvis' function. */
+#undef HAVE_STRUNVIS
+
+/* Define to 1 if you have the `strvis' function. */
+#undef HAVE_STRVIS
+
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <termcap.h> header file. */
+#undef HAVE_TERMCAP_H
+
+/* Define to 1 if you have the <term.h> header file. */
+#undef HAVE_TERM_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if the system has the type `u_int32_t'. */
+#undef HAVE_U_INT32_T
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the `vis' function. */
+#undef HAVE_VIS
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define to 1 if you have the `wcsdup' function. */
+#undef HAVE_WCSDUP
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* Define to 1 if you have the `__secure_getenv' function. */
+#undef HAVE___SECURE_GETENV
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#undef STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define as a signed integer type capable of holding a process identifier. */
+#undef pid_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
+
+
+#include "sys.h"
+#define SCCSID
+#undef LIBC_SCCS
+#define lint
+
diff --git a/extra/libedit/libedit-20221030-3.1/configure b/extra/libedit/libedit-20221030-3.1/configure
new file mode 100755
index 000000000000..8072cf6f3e97
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/configure
@@ -0,0 +1,17841 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.71 for libedit 3.1.
+#
+#
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else $as_nop
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else \$as_nop
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
+
+else \$as_nop
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
+  as_have_required=yes
+else $as_nop
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
+
+else $as_nop
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
+
+
+      if test "x$CONFIG_SHELL" != x
+then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else $as_nop
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else $as_nop
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf "%s\n" "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='libedit'
+PACKAGE_TARNAME='libedit-20221030'
+PACKAGE_VERSION='3.1'
+PACKAGE_STRING='libedit 3.1'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="src/strlcat.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_header_c_list=
+ac_func_c_list=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+HAVE_UNVIS_FALSE
+HAVE_UNVIS_TRUE
+HAVE_VIS_FALSE
+HAVE_VIS_TRUE
+HAVE_GETLINE_FALSE
+HAVE_GETLINE_TRUE
+HAVE_STRLCAT_FALSE
+HAVE_STRLCAT_TRUE
+HAVE_STRLCPY_FALSE
+HAVE_STRLCPY_TRUE
+LIBOBJS
+CPP
+ENABLE_EXAMPLES_FALSE
+ENABLE_EXAMPLES_TRUE
+MANTYPE
+NROFF
+LT_VERSION
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+FILECMD
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+CSCOPE
+ETAGS
+CTAGS
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+runstatedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+am__quote'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_silent_rules
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_widec
+enable_examples
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+LT_SYS_LIBRARY_PATH
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir runstatedir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures libedit 3.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/libedit-20221030]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of libedit 3.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-widec          deprecated, wide-character/UTF-8 is always enabled
+  --enable-examples       build the example programs [default=yes]
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+libedit configure 3.1
+generated by GNU Autoconf 2.71
+
+Copyright (C) 2021 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest.beam
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$3=yes"
+else $as_nop
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+   which can conflict with char $2 (); below.  */
+
+#include <limits.h>
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main (void)
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$3=yes"
+else $as_nop
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main (void)
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$4=yes"
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main (void)
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$4=yes"
+else $as_nop
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main (void)
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by libedit $as_me 3.1, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
+
+  $ $0$ac_configure_args_raw
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    printf "%s\n" "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    printf "%s\n" "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      printf "%s\n" "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      printf "%s\n" "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+printf "%s\n" "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+if test -n "$CONFIG_SITE"; then
+  ac_site_files="$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+else
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+fi
+
+for ac_site_file in $ac_site_files
+do
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+as_fn_append ac_header_c_list " vfork.h vfork_h HAVE_VFORK_H"
+as_fn_append ac_func_c_list " fork HAVE_FORK"
+as_fn_append ac_func_c_list " vfork HAVE_VFORK"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub ltmain.sh missing install-sh compile"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+# features of Posix that are extensions to C (define _GNU_SOURCE)
+
+
+
+
+
+
+
+
+
+
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion -version; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else $as_nop
+  ac_file=''
+fi
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main (void)
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_compiler_gnu=yes
+else $as_nop
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+y}
+ac_save_CFLAGS=$CFLAGS
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+else $as_nop
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_safe_to_define___extensions__=yes
+else $as_nop
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else $as_nop
+  MINIX=
+fi
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+am__api_version='1.16'
+
+
+  # Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test ${ac_cv_path_install+y}; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
+
+  if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     'BusyBox '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test ${ac_cv_path_mkdir+y}; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  SET_MAKE=
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
+am__doit:
+	@echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
+     ;;
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf "%s\n" "${_am_result}" >&6; }
+
+# Check whether --enable-dependency-tracking was given.
+if test ${enable_dependency_tracking+y}
+then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+# Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc='http://github.com/-I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='libedit-20221030'
+ VERSION='3.1'
+
+
+printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
+
+
+printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+case `pwd` in
+  *\ * | *\	*)
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.7'
+macro_revision='2.4.7'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+printf %s "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+printf "%s\n" "printf" >&6; } ;;
+  print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+printf "%s\n" "print -r" >&6; } ;;
+  *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+printf "%s\n" "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+printf %s "checking for fgrep... " >&6; }
+if test ${ac_cv_path_FGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in fgrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test ${with_gnu_ld+y}
+then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else $as_nop
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
+fi
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test ${lt_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+printf "%s\n" "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+printf "%s\n" "$DUMPBIN" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+printf %s "checking the name lister ($NM) interface... " >&6; }
+if test ${lt_cv_nm_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+printf "%s\n" "$lt_cv_nm_interface" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+printf %s "checking the maximum length of command line arguments... " >&6; }
+if test ${lt_cv_sys_max_cmd_len+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+printf %s "checking how to convert $build file names to $host format... " >&6; }
+if test ${lt_cv_to_host_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+printf %s "checking how to convert $build file names to toolchain format... " >&6; }
+if test ${lt_cv_to_tool_file_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+printf %s "checking for $LD option to reload object files... " >&6; }
+if test ${lt_cv_ld_reload_flag+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_ld_reload_flag='-r'
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$FILECMD"; then
+  ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FILECMD="${ac_tool_prefix}file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FILECMD=$ac_cv_prog_FILECMD
+if test -n "$FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
+printf "%s\n" "$FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FILECMD"; then
+  ac_ct_FILECMD=$FILECMD
+  # Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FILECMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_FILECMD"; then
+  ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_FILECMD="file"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
+if test -n "$ac_ct_FILECMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
+printf "%s\n" "$ac_ct_FILECMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_FILECMD" = x; then
+    FILECMD=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FILECMD=$ac_ct_FILECMD
+  fi
+else
+  FILECMD="$ac_cv_prog_FILECMD"
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+printf "%s\n" "$OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+printf %s "checking how to recognize dependent libraries... " >&6; }
+if test ${lt_cv_deplibs_check_method+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='$FILECMD -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=$FILECMD
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=$FILECMD
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=$FILECMD
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+printf "%s\n" "$DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+printf %s "checking how to associate runtime and link libraries... " >&6; }
+if test ${lt_cv_sharedlib_from_linklib_cmd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+
+
+
+
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+
+
+
+
+
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+printf %s "checking for archiver @FILE support... " >&6; }
+if test ${lt_cv_ar_at_file+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+printf %s "checking command to parse $NM output from $compiler object... " >&6; }
+if test ${lt_cv_sys_global_symbol_pipe+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+printf %s "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test ${with_sysroot+y}
+then :
+  withval=$with_sysroot;
+else $as_nop
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+printf "%s\n" "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+printf "%s\n" "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+printf %s "checking for a working dd... " >&6; }
+if test ${ac_cv_path_lt_DD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in dd
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+printf %s "checking how to truncate binary pipes... " >&6; }
+if test ${lt_cv_truncate_bin+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test ${enable_libtool_lock+y}
+then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `$FILECMD conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `$FILECMD conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+printf %s "checking whether the C compiler needs -belf... " >&6; }
+if test ${lt_cv_cc_needs_belf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_cc_needs_belf=yes
+else $as_nop
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `$FILECMD conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+printf "%s\n" "$MANIFEST_TOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if test ${lt_cv_path_mainfest_tool+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+printf "%s\n" "$DSYMUTIL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+printf "%s\n" "$NMEDIT" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_NMEDIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+printf "%s\n" "$LIPO" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_LIPO+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+printf "%s\n" "$ac_ct_LIPO" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+printf "%s\n" "$OTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+printf "%s\n" "$ac_ct_OTOOL" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+printf "%s\n" "$OTOOL64" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OTOOL64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+printf %s "checking for -single_module linker flag... " >&6; }
+if test ${lt_cv_apple_cc_single_mod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+printf %s "checking for -exported_symbols_list linker flag... " >&6; }
+if test ${lt_cv_ld_exported_symbols_list+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_ld_exported_symbols_list=yes
+else $as_nop
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+printf %s "checking for -force_load linker flag... " >&6; }
+if test ${lt_cv_ld_force_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.[012],*|,*powerpc*-darwin[5-8]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+
+fi
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test ${enable_shared+y}
+then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test ${enable_static+y}
+then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test ${with_pic+y}
+then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test ${enable_fast_install+y}
+then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else $as_nop
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+printf %s "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test ${with_aix_soname+y}
+then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else $as_nop
+  if test ${lt_cv_with_aix_soname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+printf "%s\n" "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+printf %s "checking for objdir... " >&6; }
+if test ${lt_cv_objdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+printf "%s\n" "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+printf %s "checking for ${ac_tool_prefix}file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+printf %s "checking for file... " >&6; }
+if test ${lt_cv_path_MAGIC_CMD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+printf "%s\n" "$MAGIC_CMD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test ${lt_cv_prog_compiler_rtti_exceptions+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+printf %s "checking for $compiler option to produce PIC... " >&6; }
+if test ${lt_cv_prog_compiler_pic+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test ${lt_cv_prog_compiler_pic_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test ${lt_cv_prog_compiler_static_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test ${lt_cv_prog_compiler_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+printf %s "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+printf "%s\n" "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++ or Intel C++ Compiler.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if test ${lt_cv_aix_libpath_+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++ or Intel C++ Compiler.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl* | icl*)
+	# Native MSVC or ICC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC and ICC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly* | midnightbsd*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+printf %s "checking if $CC understands -b... " >&6; }
+if test ${lt_cv_prog_compiler__b+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if test ${lt_cv_irix_exported_symbol+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  lt_cv_irix_exported_symbol=yes
+else $as_nop
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      file_list_spec='@'
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+printf "%s\n" "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+if test ${lt_cv_archive_cmds_need_lc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+printf %s "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC and ICC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if test ${lt_cv_shlibpath_overrides_runpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
+then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+printf "%s\n" "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+printf %s "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+printf "%s\n" "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dl_dlopen=yes
+else $as_nop
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else $as_nop
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes
+then :
+  lt_cv_dlopen=shl_load
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+printf %s "checking for shl_load in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_shl_load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main (void)
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dld_shl_load=yes
+else $as_nop
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes
+then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else $as_nop
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+printf %s "checking for dlopen in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dl_dlopen=yes
+else $as_nop
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+printf %s "checking for dlopen in -lsvld... " >&6; }
+if test ${ac_cv_lib_svld_dlopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main (void)
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_svld_dlopen=yes
+else $as_nop
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes
+then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+printf %s "checking for dld_link in -ldld... " >&6; }
+if test ${ac_cv_lib_dld_dld_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char dld_link ();
+int
+main (void)
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_dld_dld_link=yes
+else $as_nop
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes
+then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+printf %s "checking whether a program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
+if test ${lt_cv_dlopen_self_static+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+printf %s "checking whether stripping libraries is possible... " >&6; }
+if test -z "$STRIP"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+      else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      fi
+      ;;
+    *)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+      ;;
+    esac
+  fi
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+printf %s "checking if libtool supports shared libraries... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+printf "%s\n" "$can_build_shared" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+printf %s "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+printf "%s\n" "$enable_shared" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+printf %s "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+printf "%s\n" "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# libtool -version-info
+LT_VERSION=0:70:0
+
+
+# Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
+# Checks for programs.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion -version; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_compiler_gnu=yes
+else $as_nop
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+y}
+ac_save_CFLAGS=$CFLAGS
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+else $as_nop
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+   MANTYPE=
+   TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb"
+   for ac_prog in nroff awf
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_NROFF+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $NROFF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $TestPath
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_NROFF="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+NROFF=$ac_cv_path_NROFF
+if test -n "$NROFF"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5
+printf "%s\n" "$NROFF" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$NROFF" && break
+done
+test -n "$NROFF" || NROFF="/bin/false"
+
+   if ${NROFF} -mdoc ${srcdir}/doc/editrc.5.roff >/dev/null 2>&1; then
+      MANTYPE=mdoc
+   fi
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+printf %s "checking for tgetent in -lncurses... " >&6; }
+if test ${ac_cv_lib_ncurses_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char tgetent ();
+int
+main (void)
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_ncurses_tgetent=yes
+else $as_nop
+  ac_cv_lib_ncurses_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h
+
+  LIBS="-lncurses $LIBS"
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
+printf %s "checking for tgetent in -lcurses... " >&6; }
+if test ${ac_cv_lib_curses_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char tgetent ();
+int
+main (void)
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_curses_tgetent=yes
+else $as_nop
+  ac_cv_lib_curses_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_curses_tgetent" >&6; }
+if test "x$ac_cv_lib_curses_tgetent" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h
+
+  LIBS="-lcurses $LIBS"
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+printf %s "checking for tgetent in -ltermcap... " >&6; }
+if test ${ac_cv_lib_termcap_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltermcap  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char tgetent ();
+int
+main (void)
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_termcap_tgetent=yes
+else $as_nop
+  ac_cv_lib_termcap_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBTERMCAP 1" >>confdefs.h
+
+  LIBS="-ltermcap $LIBS"
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
+printf %s "checking for tgetent in -ltinfo... " >&6; }
+if test ${ac_cv_lib_tinfo_tgetent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltinfo  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char tgetent ();
+int
+main (void)
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_tinfo_tgetent=yes
+else $as_nop
+  ac_cv_lib_tinfo_tgetent=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
+printf "%s\n" "$ac_cv_lib_tinfo_tgetent" >&6; }
+if test "x$ac_cv_lib_tinfo_tgetent" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBTINFO 1" >>confdefs.h
+
+  LIBS="-ltinfo $LIBS"
+
+else $as_nop
+  as_fn_error $? "libncurses, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+### deprecate option --enable-widec to turn on use of wide-character support
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if you want wide-character code" >&5
+printf %s "checking if you want wide-character code... " >&6; }
+   # Check whether --enable-widec was given.
+if test ${enable_widec+y}
+then :
+  enableval=$enable_widec; with_widec=$enableval
+else $as_nop
+  with_widec=no
+fi
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_widec" >&5
+printf "%s\n" "$with_widec" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-widec is deprecated, wide-character/UTF-8 is always enabled" >&5
+printf "%s\n" "$as_me: WARNING: --enable-widec is deprecated, wide-character/UTF-8 is always enabled" >&2;}
+
+
+# Check whether --enable-examples was given.
+if test ${enable_examples+y}
+then :
+  enableval=$enable_examples; enable_examples="$enableval"
+else $as_nop
+  enable_examples="yes"
+
+fi
+
+
+ if test "$enable_examples" = "yes"; then
+  ENABLE_EXAMPLES_TRUE=
+  ENABLE_EXAMPLES_FALSE='#'
+else
+  ENABLE_EXAMPLES_TRUE='#'
+  ENABLE_EXAMPLES_FALSE=
+fi
+
+
+# Checks for header files.
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main (void)
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$as_ac_Header=yes"
+else $as_nop
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
+  cat >>confdefs.h <<_ACEOF
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char opendir ();
+int
+main (void)
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_opendir+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_opendir+y}
+then :
+
+else $as_nop
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char opendir ();
+int
+main (void)
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext
+  if test ${ac_cv_search_opendir+y}
+then :
+  break
+fi
+done
+if test ${ac_cv_search_opendir+y}
+then :
+
+else $as_nop
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no
+then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test ${ac_cv_header_sys_wait_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main (void)
+{
+  int s;
+  wait (&s);
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_header_sys_wait_h=yes
+else $as_nop
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+
+printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
+if test "x$ac_cv_header_limits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+if test "x$ac_cv_header_string_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CURSES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NCURSES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_cdefs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_CDEFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default"
+if test "x$ac_cv_header_termcap_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERMCAP_H 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes
+then :
+
+else $as_nop
+  ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = xyes
+then :
+
+else $as_nop
+  ac_fn_c_check_header_compile "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default"
+if test "x$ac_cv_header_termcap_h" = xyes
+then :
+
+else $as_nop
+  as_fn_error $? "ncurses.h, curses.h, or termcap.h is required!" "$LINENO" 5
+fi
+
+fi
+
+fi
+
+
+ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_termios_h" = xyes
+then :
+
+else $as_nop
+  as_fn_error $? "termios.h is required!" "$LINENO" 5
+fi
+
+
+## include curses.h to prevent "Present But Cannot Be Compiled"
+ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H
+# include <curses.h>
+#elif HAVE_NCURSES_H
+# include <ncurses.h>
+#endif
+
+"
+if test "x$ac_cv_header_term_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TERM_H 1" >>confdefs.h
+
+fi
+
+
+# Check for dirent.d_namlen field explicitly
+# (This is a bit more straightforward than, if not quite as portable as,
+# the recipe given by the autoconf maintainers.)
+ac_fn_c_check_member "$LINENO" "struct dirent" "d_namlen" "ac_cv_member_struct_dirent_d_namlen" "#if HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_dirent_d_namlen" = xyes
+then :
+
+printf "%s\n" "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" >>confdefs.h
+
+fi
+
+
+# Checks for typedefs, structures, and compiler characteristics.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this sort of thing.  */
+  typedef int charset[2];
+  const charset cs = { 0, 0 };
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* IBM XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_c_const=yes
+else $as_nop
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+printf "%s\n" "#define const /**/" >>confdefs.h
+
+fi
+
+
+  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default
+"
+if test "x$ac_cv_type_pid_t" = xyes
+then :
+
+else $as_nop
+                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #if defined _WIN64 && !defined __CYGWIN__
+          LLP64
+          #endif
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_pid_type='int'
+else $as_nop
+  ac_pid_type='__int64'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
+
+
+fi
+
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes
+then :
+
+else $as_nop
+
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
+if test "x$ac_cv_type_u_int32_t" = xyes
+then :
+
+printf "%s\n" "#define HAVE_U_INT32_T 1" >>confdefs.h
+
+
+fi
+
+
+# Checks for library functions.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
+printf %s "checking whether closedir returns void... " >&6; }
+if test ${ac_cv_func_closedir_void+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <$ac_header_dirent>
+
+int
+main (void)
+{
+
+  return closedir(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_func_closedir_void=no
+else $as_nop
+  ac_cv_func_closedir_void=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
+printf "%s\n" "$ac_cv_func_closedir_void" >&6; }
+if test $ac_cv_func_closedir_void = yes; then
+
+printf "%s\n" "#define CLOSEDIR_VOID 1" >>confdefs.h
+
+fi
+
+
+ac_func=
+for ac_item in $ac_func_c_list
+do
+  if test $ac_func; then
+    ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func
+    if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
+      echo "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_func=
+  else
+    ac_func=$ac_item
+  fi
+done
+
+
+
+if test "x$ac_cv_func_fork" = xyes; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+printf %s "checking for working fork... " >&6; }
+if test ${ac_cv_func_fork_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  ac_cv_func_fork_works=cross
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  ac_cv_func_fork_works=yes
+else $as_nop
+  ac_cv_func_fork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+printf "%s\n" "$ac_cv_func_fork_works" >&6; }
+
+else
+  ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+printf "%s\n" "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+printf %s "checking for working vfork... " >&6; }
+if test ${ac_cv_func_vfork_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  ac_cv_func_vfork_works=cross
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Thanks to Paul Eggert for this test.  */
+$ac_includes_default
+#include <signal.h>
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+
+static void
+do_nothing (int sig)
+{
+  (void) sig;
+}
+
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.  The compiler
+   is told about this with #include <vfork.h>, but some compilers
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+   static variable whose address is put into a register that is
+   clobbered by the vfork.  */
+static void
+sparc_address_test (int arg)
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+
+int
+main (void)
+{
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test (0);
+
+  /* On Solaris 2.4, changes by the child to the signal handler
+     also munge signal handlers in the parent.  To detect this,
+     start by putting the parent's handler in a known state.  */
+  signal (SIGTERM, SIG_DFL);
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.  This
+       test uses lots of local variables, at least as many local
+       variables as main has allocated so far including compiler
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+       reuse the register of parent for one of the local variables,
+       since it will think that parent can't possibly be used any more
+       in this routine.  Assigning to the local variable will thus
+       munge parent in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* Alter the child's signal handler.  */
+    if (signal (SIGTERM, do_nothing) != SIG_DFL)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+       from child file descriptors.  If the child closes a descriptor
+       before it execs or exits, this munges the parent's descriptor
+       as well.  Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    return (
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child munge the parent's signal handler?  */
+	 || signal (SIGTERM, SIG_DFL) != SIG_DFL
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  ac_cv_func_vfork_works=yes
+else $as_nop
+  ac_cv_func_vfork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+printf "%s\n" "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+printf "%s\n" "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+printf "%s\n" "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+printf "%s\n" "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+
+else $as_nop
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else $as_nop
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+
+else $as_nop
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else $as_nop
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
+
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+if test $ac_cv_c_compiler_gnu = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+printf %s "checking whether $CC needs -traditional... " >&6; }
+if test ${ac_cv_prog_gcc_traditional+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+    ac_pattern="Autoconf.*'x'"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sgtty.h>
+Autoconf TIOCGETP
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "$ac_pattern" >/dev/null 2>&1
+then :
+  ac_cv_prog_gcc_traditional=yes
+else $as_nop
+  ac_cv_prog_gcc_traditional=no
+fi
+rm -rf conftest*
+
+
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <termio.h>
+Autoconf TCGETA
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "$ac_pattern" >/dev/null 2>&1
+then :
+  ac_cv_prog_gcc_traditional=yes
+fi
+rm -rf conftest*
+
+  fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; }
+  if test $ac_cv_prog_gcc_traditional = yes; then
+    CC="$CC -traditional"
+  fi
+fi
+
+## _AIX is offended by rpl_malloc and rpl_realloc
+#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
+if test ${ac_cv_func_lstat_dereferences_slashed_symlink+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  rm -f conftest.sym conftest.file
+echo >conftest.file
+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+  if test "$cross_compiling" = yes
+then :
+  case "$host_os" in # ((
+			   # Guess yes on glibc systems.
+		   *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;;
+			   # If we don't know, assume the worst.
+		   *)      ac_cv_func_lstat_dereferences_slashed_symlink=no ;;
+		 esac
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+struct stat sbuf;
+     /* Linux will dereference the symlink and fail, as required by POSIX.
+	That is better in the sense that it means we will not
+	have to compile and use the lstat wrapper.  */
+     return lstat ("conftest.sym/", &sbuf) == 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+else $as_nop
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+else
+  # If the `ln -s' command failed, then we probably don't even
+  # have an lstat function.
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+fi
+rm -f conftest.sym conftest.file
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf "%s\n" "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+
+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+
+printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
+
+
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+  case " $LIBOBJS " in
+  *" lstat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
+esac
+
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+printf %s "checking whether stat accepts an empty string... " >&6; }
+if test ${ac_cv_func_stat_empty_string_bug+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  ac_cv_func_stat_empty_string_bug=yes
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main (void)
+{
+struct stat sbuf;
+  return stat ("", &sbuf) == 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  ac_cv_func_stat_empty_string_bug=no
+else $as_nop
+  ac_cv_func_stat_empty_string_bug=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+printf "%s\n" "$ac_cv_func_stat_empty_string_bug" >&6; }
+if test $ac_cv_func_stat_empty_string_bug = yes; then
+  case " $LIBOBJS " in
+  *" stat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
+ ;;
+esac
+
+
+printf "%s\n" "#define HAVE_STAT_EMPTY_STRING_BUG 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "endpwent" "ac_cv_func_endpwent"
+if test "x$ac_cv_func_endpwent" = xyes
+then :
+  printf "%s\n" "#define HAVE_ENDPWENT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
+if test "x$ac_cv_func_isascii" = xyes
+then :
+  printf "%s\n" "#define HAVE_ISASCII 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memchr" "ac_cv_func_memchr"
+if test "x$ac_cv_func_memchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
+if test "x$ac_cv_func_memset" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
+if test "x$ac_cv_func_re_comp" = xyes
+then :
+  printf "%s\n" "#define HAVE_RE_COMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
+if test "x$ac_cv_func_regcomp" = xyes
+then :
+  printf "%s\n" "#define HAVE_REGCOMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr"
+if test "x$ac_cv_func_strchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn"
+if test "x$ac_cv_func_strcspn" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCSPN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+if test "x$ac_cv_func_strdup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
+if test "x$ac_cv_func_strrchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRRCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
+if test "x$ac_cv_func_strstr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
+if test "x$ac_cv_func_strtol" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid"
+if test "x$ac_cv_func_issetugid" = xyes
+then :
+  printf "%s\n" "#define HAVE_ISSETUGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "wcsdup" "ac_cv_func_wcsdup"
+if test "x$ac_cv_func_wcsdup" = xyes
+then :
+  printf "%s\n" "#define HAVE_WCSDUP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vis" "ac_cv_func_vis"
+if test "x$ac_cv_func_vis" = xyes
+then :
+  printf "%s\n" "#define HAVE_VIS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strvis" "ac_cv_func_strvis"
+if test "x$ac_cv_func_strvis" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRVIS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strunvis" "ac_cv_func_strunvis"
+if test "x$ac_cv_func_strunvis" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRUNVIS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
+if test "x$ac_cv_func___secure_getenv" = xyes
+then :
+  printf "%s\n" "#define HAVE___SECURE_GETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "secure_getenv" "ac_cv_func_secure_getenv"
+if test "x$ac_cv_func_secure_getenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_SECURE_GETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "reallocarr" "ac_cv_func_reallocarr"
+if test "x$ac_cv_func_reallocarr" = xyes
+then :
+  printf "%s\n" "#define HAVE_REALLOCARR 1" >>confdefs.h
+
+fi
+
+
+# strlcpy
+ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes
+then :
+  found_strlcpy=yes
+else $as_nop
+  found_strlcpy=no
+fi
+
+ if test "x$found_strlcpy" = xyes; then
+  HAVE_STRLCPY_TRUE=
+  HAVE_STRLCPY_FALSE='#'
+else
+  HAVE_STRLCPY_TRUE='#'
+  HAVE_STRLCPY_FALSE=
+fi
+
+
+# strlcat
+ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = xyes
+then :
+  found_strlcat=yes
+else $as_nop
+  found_strlcat=no
+fi
+
+ if test "x$found_strlcat" = xyes; then
+  HAVE_STRLCAT_TRUE=
+  HAVE_STRLCAT_FALSE='#'
+else
+  HAVE_STRLCAT_TRUE='#'
+  HAVE_STRLCAT_FALSE=
+fi
+
+
+# getline
+ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
+if test "x$ac_cv_func_getline" = xyes
+then :
+  found_getline=yes
+else $as_nop
+  found_getline=no
+fi
+
+ if test "x$found_getline" = xyes; then
+  HAVE_GETLINE_TRUE=
+  HAVE_GETLINE_FALSE='#'
+else
+  HAVE_GETLINE_TRUE='#'
+  HAVE_GETLINE_FALSE=
+fi
+
+
+# vis
+ac_fn_c_check_func "$LINENO" "vis" "ac_cv_func_vis"
+if test "x$ac_cv_func_vis" = xyes
+then :
+  found_vis=yes
+else $as_nop
+  found_vis=no
+fi
+
+ if test "x$found_vis" = xyes; then
+  HAVE_VIS_TRUE=
+  HAVE_VIS_FALSE='#'
+else
+  HAVE_VIS_TRUE='#'
+  HAVE_VIS_FALSE=
+fi
+
+
+# unvis
+ac_fn_c_check_func "$LINENO" "unvis" "ac_cv_func_unvis"
+if test "x$ac_cv_func_unvis" = xyes
+then :
+  found_unvis=yes
+else $as_nop
+  found_unvis=no
+fi
+
+ if test "x$found_unvis" = xyes; then
+  HAVE_UNVIS_TRUE=
+  HAVE_UNVIS_FALSE='#'
+else
+  HAVE_UNVIS_TRUE='#'
+  HAVE_UNVIS_FALSE=
+fi
+
+
+
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix like" >&5
+printf %s "checking whether getpwnam_r and getpwuid_r are posix like... " >&6; }
+      # The prototype for the POSIX version is:
+      # int getpwnam_r(char *, struct passwd *, char *, size_t, struct passwd **)
+      # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+                #include <sys/types.h>
+                #include <pwd.h>
+int
+main (void)
+{
+getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL);
+                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_GETPW_R_POSIX 1" >>confdefs.h
+
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix _draft_ like" >&5
+printf %s "checking whether getpwnam_r and getpwuid_r are posix _draft_ like... " >&6; }
+      # The prototype for the POSIX draft version is:
+      # struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int);
+      # struct passwd *getpwnam_r(char *, struct passwd *,  char *, int);
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+                #include <sys/types.h>
+                #include <pwd.h>
+int
+main (void)
+{
+getpwnam_r(NULL, NULL, NULL, (size_t)0);
+                getpwuid_r((uid_t)0, NULL, NULL, (size_t)0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+
+printf "%s\n" "#define HAVE_GETPW_R_DRAFT 1" >>confdefs.h
+
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile libedit.pc src/Makefile doc/Makefile examples/Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${ENABLE_EXAMPLES_TRUE}" && test -z "${ENABLE_EXAMPLES_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_EXAMPLES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STRLCPY_TRUE}" && test -z "${HAVE_STRLCPY_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STRLCPY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STRLCAT_TRUE}" && test -z "${HAVE_STRLCAT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STRLCAT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GETLINE_TRUE}" && test -z "${HAVE_GETLINE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GETLINE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_VIS_TRUE}" && test -z "${HAVE_VIS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_VIS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_UNVIS_TRUE}" && test -z "${HAVE_UNVIS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_UNVIS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else $as_nop
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf "%s\n" "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else $as_nop
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else $as_nop
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by libedit $as_me 3.1, which was
+generated by GNU Autoconf 2.71.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config='$ac_cs_config_escaped'
+ac_cs_version="\\
+libedit config.status 3.1
+configured by $0, generated by GNU Autoconf 2.71,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2021 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    printf "%s\n" "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    printf "%s\n" "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    printf "%s\n" "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  printf "%s\n" "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='http://github.com/%60$ECHO"$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='http://github.com/%60$ECHO"$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+FILECMD \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libedit.pc") CONFIG_FILES="$CONFIG_FILES libedit.pc" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      printf "%s\n" "/* $configure_input  */" >&1 \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    printf "%s\n" "/* $configure_input  */" >&1 \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
+  shift
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
+  do
+    # Strip MF so we end up with the name of the file.
+    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$am_mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
+  done
+  if test $am_rc -ne 0; then
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE=\"gmake\" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# A file(cmd) program that detects file types.
+FILECMD=$lt_FILECMD
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive (by configure).
+lt_ar_flags=$lt_ar_flags
+
+# Flags to create an archive.
+AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  $SED '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
diff --git a/extra/libedit/libedit-20221030-3.1/configure.ac b/extra/libedit/libedit-20221030-3.1/configure.ac
new file mode 100644
index 000000000000..1b2a06db751c
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/configure.ac
@@ -0,0 +1,161 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+#
+# Compile with debug symbols:
+#    CFLAGS="-ggdb -pedandic -O0" ./configure
+#    CFLAGS="-ggdb -Wall -Wextra -pedantic -O0" ./configure
+#
+# Use libtool (glibtool on OSX) to debug:
+#
+#    libtool --mode=execute gdb examples/tc1
+# 
+# Run valgrind like this, but note
+# http://invisible-island.net/ncurses/ncurses.faq.html#config_leaks.
+#
+#    libtool --mode=execute valgrind --leak-check=full examples/tc1
+#
+# A valgrind suppressions file for ncurses is available at 
+# http://www.opensource.apple.com/source/ncurses/ncurses-27/ncurses/misc/ncurses.supp
+#
+#    libtool --mode=execute valgrind --suppressions=ncurses.supp.txt --leak-check=full examples/tc1
+#
+# Verbose output can be enabled with
+#    "./configure --disable-silent-rules" or "make V=1"
+#
+
+AC_INIT([libedit],[EL_RELEASE],[],[libedit-EL_TIMESTAMP])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([src/strlcat.c])
+AC_CONFIG_HEADERS([config.h])
+
+# features of Posix that are extensions to C (define _GNU_SOURCE)
+AC_USE_SYSTEM_EXTENSIONS
+
+AM_INIT_AUTOMAKE
+LT_INIT
+
+# libtool -version-info
+AC_SUBST(LT_VERSION, [0:70:0])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_LN_S
+AC_PROG_AWK
+EL_MANTYPE
+
+AC_CHECK_LIB(ncurses, tgetent,,
+  [AC_CHECK_LIB(curses, tgetent,,
+    [AC_CHECK_LIB(termcap, tgetent,,
+      [AC_CHECK_LIB(tinfo, tgetent,,
+        [AC_MSG_ERROR([libncurses, libcurses, libtermcap or libtinfo is required!])]
+      )]
+    )]
+  )]
+)
+
+### deprecate option --enable-widec to turn on use of wide-character support
+EL_DEPRECATE_WIDEC
+
+AC_ARG_ENABLE(
+  [examples],
+  [AS_HELP_STRING([--enable-examples], [build the example programs [default=yes]])],
+  [enable_examples="$enableval"],
+  [enable_examples="yes"]
+)
+
+AM_CONDITIONAL(ENABLE_EXAMPLES, [test "$enable_examples" = "yes"])
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
+
+AC_CHECK_HEADER([ncurses.h], [],
+  [AC_CHECK_HEADER([curses.h], [],
+    [AC_CHECK_HEADER([termcap.h], [],
+      [AC_MSG_ERROR([ncurses.h, curses.h, or termcap.h is required!])],
+    [])],
+  [])],
+[])
+
+AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])], [])
+
+## include curses.h to prevent "Present But Cannot Be Compiled"
+AC_CHECK_HEADERS([term.h],,,
+[[#if HAVE_CURSES_H
+# include <curses.h>
+#elif HAVE_NCURSES_H
+# include <ncurses.h>
+#endif
+]])
+
+# Check for dirent.d_namlen field explicitly
+# (This is a bit more straightforward than, if not quite as portable as,
+# the recipe given by the autoconf maintainers.)
+AC_CHECK_MEMBER(struct dirent.d_namlen,
+AC_DEFINE([HAVE_STRUCT_DIRENT_D_NAMLEN],[1],
+[Define to 1 if struct dirent has member d_namlen]),,
+[#if HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_CHECK_TYPES([u_int32_t])
+
+# Checks for library functions.
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_FORK
+AC_PROG_GCC_TRADITIONAL
+## _AIX is offended by rpl_malloc and rpl_realloc
+#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC
+AC_FUNC_STAT
+AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat vis strvis strunvis __secure_getenv secure_getenv reallocarr])
+
+# strlcpy
+AC_CHECK_FUNC(strlcpy, found_strlcpy=yes, found_strlcpy=no)
+AM_CONDITIONAL(HAVE_STRLCPY, [test "x$found_strlcpy" = xyes])
+
+# strlcat
+AC_CHECK_FUNC(strlcat, found_strlcat=yes, found_strlcat=no)
+AM_CONDITIONAL(HAVE_STRLCAT, [test "x$found_strlcat" = xyes])
+
+# getline
+AC_CHECK_FUNC(getline, found_getline=yes, found_getline=no)
+AM_CONDITIONAL(HAVE_GETLINE, [test "x$found_getline" = xyes])
+
+# vis
+AC_CHECK_FUNC(vis, found_vis=yes, found_vis=no)
+AM_CONDITIONAL(HAVE_VIS, [test "x$found_vis" = xyes])
+
+# unvis
+AC_CHECK_FUNC(unvis, found_unvis=yes, found_unvis=no)
+AM_CONDITIONAL(HAVE_UNVIS, [test "x$found_unvis" = xyes])
+
+
+EL_GETPW_R_POSIX
+EL_GETPW_R_DRAFT
+
+
+AH_BOTTOM([
+#include "sys.h"
+#define SCCSID
+#undef LIBC_SCCS
+#define lint
+])
+
+AC_CONFIG_FILES([Makefile
+                 libedit.pc
+                 src/Makefile
+                 doc/Makefile
+                 examples/Makefile])
+AC_OUTPUT
diff --git a/extra/libedit/libedit-20221030-3.1/depcomp b/extra/libedit/libedit-20221030-3.1/depcomp
new file mode 100755
index 000000000000..715e34311ed2
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/extra/libedit/libedit-20221030-3.1/doc/Makefile.am b/extra/libedit/libedit-20221030-3.1/doc/Makefile.am
new file mode 100644
index 000000000000..0e58949e8803
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/Makefile.am
@@ -0,0 +1,73 @@
+
+EL_MANS = editline.3 editline.7 editrc.5
+
+man_MANS = $(EL_MANS)
+
+
+EL_MAN_LINKS = \
+		el_deletestr.3 \
+		el_end.3 \
+		el_get.3 \
+		el_getc.3 \
+		el_gets.3 \
+		el_init.3 \
+		el_init_fd.3 \
+		el_insertstr.3 \
+		el_line.3 \
+		el_parse.3 \
+		el_push.3 \
+		el_reset.3 \
+		el_resize.3 \
+		el_set.3 \
+		el_source.3 \
+		history.3 \
+		history_end.3 \
+		history_init.3 \
+		tok_end.3 \
+		tok_init.3 \
+		tok_line.3 \
+		tok_reset.3 \
+		tok_str.3
+
+EL_MAN_LINKS += \
+		el_wdeletestr.3 \
+		el_wget.3 \
+		el_wgetc.3 \
+		el_wgets.3 \
+		el_winsertstr.3 \
+		el_wline.3 \
+		el_wparse.3 \
+		el_wpush.3 \
+		el_wset.3 \
+		history_w.3 \
+		history_wend.3 \
+		history_winit.3 \
+		tok_wend.3 \
+		tok_winit.3 \
+		tok_wline.3 \
+		tok_wreset.3 \
+		tok_wstr.3
+
+
+install-data-hook: $(EL_MAN_LINKS)
+
+$(EL_MAN_LINKS):
+	(cd $(DESTDIR)$(man3dir) && rm -f $@ && $(LN_S) editline.3 $@)
+
+$(EL_MANS):
+	@if test "$(MANTYPE)" = "mdoc"; then\
+		cp $(srcdir)/$@.roff $@;\
+				else\
+		$(AWK) -f $(srcdir)/mdoc2man.awk $(srcdir)/$@.roff > $@ || rm -f $@;\
+	fi;
+
+uninstall-local:
+	(cd $(DESTDIR)$(man3dir) && rm -f $(EL_MAN_LINKS))
+
+CLEANFILES = $(EL_MANS)
+EXTRA_DIST = editline.3.roff editline.7.roff editrc.5.roff mdoc2man.awk
+
+changelog.txt: ../ChangeLog
+	@sed 's/@/ (at)/g; s/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g;' $(srcdir)/$< > $@;
+
+
diff --git a/extra/libedit/libedit-20221030-3.1/doc/Makefile.in b/extra/libedit/libedit-20221030-3.1/doc/Makefile.in
new file mode 100644
index 000000000000..22e8a75b8cfd
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/Makefile.in
@@ -0,0 +1,646 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man3dir = $(mandir)/man3
+am__installdirs = "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(man7dir)"
+man5dir = $(mandir)/man5
+man7dir = $(mandir)/man7
+MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION = @LT_VERSION@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTYPE = @MANTYPE@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EL_MANS = editline.3 editline.7 editrc.5
+man_MANS = $(EL_MANS)
+EL_MAN_LINKS = el_deletestr.3 el_end.3 el_get.3 el_getc.3 el_gets.3 \
+	el_init.3 el_init_fd.3 el_insertstr.3 el_line.3 el_parse.3 \
+	el_push.3 el_reset.3 el_resize.3 el_set.3 el_source.3 \
+	history.3 history_end.3 history_init.3 tok_end.3 tok_init.3 \
+	tok_line.3 tok_reset.3 tok_str.3 el_wdeletestr.3 el_wget.3 \
+	el_wgetc.3 el_wgets.3 el_winsertstr.3 el_wline.3 el_wparse.3 \
+	el_wpush.3 el_wset.3 history_w.3 history_wend.3 \
+	history_winit.3 tok_wend.3 tok_winit.3 tok_wline.3 \
+	tok_wreset.3 tok_wstr.3
+CLEANFILES = $(EL_MANS)
+EXTRA_DIST = editline.3.roff editline.7.roff editrc.5.roff mdoc2man.awk
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man3: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man3dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.3[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man3:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man3dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.3[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man5:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man5dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.5[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-man7: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man7dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.7[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man7:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man7dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.7[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man3 install-man5 install-man7
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local uninstall-man
+
+uninstall-man: uninstall-man3 uninstall-man5 uninstall-man7
+
+.MAKE: install-am install-data-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man3 install-man5 \
+	install-man7 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-local \
+	uninstall-man uninstall-man3 uninstall-man5 uninstall-man7
+
+.PRECIOUS: Makefile
+
+
+install-data-hook: $(EL_MAN_LINKS)
+
+$(EL_MAN_LINKS):
+	(cd $(DESTDIR)$(man3dir) && rm -f $@ && $(LN_S) editline.3 $@)
+
+$(EL_MANS):
+	@if test "$(MANTYPE)" = "mdoc"; then\
+		cp $(srcdir)/$@.roff $@;\
+				else\
+		$(AWK) -f $(srcdir)/mdoc2man.awk $(srcdir)/$@.roff > $@ || rm -f $@;\
+	fi;
+
+uninstall-local:
+	(cd $(DESTDIR)$(man3dir) && rm -f $(EL_MAN_LINKS))
+
+changelog.txt: ../ChangeLog
+	@sed 's/@/ (at)/g; s/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g;' $(srcdir)/$< > $@;
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extra/libedit/libedit-20221030-3.1/doc/editline.3.roff b/extra/libedit/libedit-20221030-3.1/doc/editline.3.roff
new file mode 100644
index 000000000000..f104dcc07c7a
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/editline.3.roff
@@ -0,0 +1,1020 @@
+.\"	$NetBSD: editline.3,v 1.101 2021/08/15 10:12:54 wiz Exp $
+.\"
+.\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd August 15, 2021
+.Dt EDITLINE 3
+.Os
+.Sh NAME
+.Nm editline ,
+.Nm el_init ,
+.Nm el_init_fd ,
+.Nm el_end ,
+.Nm el_reset ,
+.Nm el_gets ,
+.Nm el_wgets ,
+.Nm el_getc ,
+.Nm el_wgetc ,
+.Nm el_push ,
+.Nm el_wpush ,
+.Nm el_parse ,
+.Nm el_wparse ,
+.Nm el_set ,
+.Nm el_wset ,
+.Nm el_get ,
+.Nm el_wget ,
+.Nm el_source ,
+.Nm el_resize ,
+.Nm el_cursor ,
+.Nm el_line ,
+.Nm el_wline ,
+.Nm el_insertstr ,
+.Nm el_winsertstr ,
+.Nm el_deletestr ,
+.Nm el_wdeletestr ,
+.Nm history_init ,
+.Nm history_winit ,
+.Nm history_end ,
+.Nm history_wend ,
+.Nm history ,
+.Nm history_w ,
+.Nm tok_init ,
+.Nm tok_winit ,
+.Nm tok_end ,
+.Nm tok_wend ,
+.Nm tok_reset ,
+.Nm tok_wreset ,
+.Nm tok_line ,
+.Nm tok_wline ,
+.Nm tok_str ,
+.Nm tok_wstr
+.Nd line editor, history and tokenization functions
+.Sh LIBRARY
+.Lb libedit
+.Sh SYNOPSIS
+.In histedit.h
+.Ft EditLine *
+.Fn el_init "const char *prog" "FILE *fin" "FILE *fout" "FILE *ferr"
+.Ft EditLine *
+.Fn el_init_fd "const char *prog" "FILE *fin" "FILE *fout" "FILE *ferr" "int fdin" "int fdout" "int fderr"
+.Ft void
+.Fn el_end "EditLine *e"
+.Ft void
+.Fn el_reset "EditLine *e"
+.Ft const char *
+.Fn el_gets "EditLine *e" "int *count"
+.Ft const wchar_t *
+.Fn el_wgets "EditLine *e" "int *count"
+.Ft int
+.Fn el_getc "EditLine *e" "char *ch"
+.Ft int
+.Fn el_wgetc "EditLine *e" "wchar_t *wc"
+.Ft void
+.Fn el_push "EditLine *e" "const char *mbs"
+.Ft void
+.Fn el_wpush "EditLine *e" "const wchar_t *wcs"
+.Ft int
+.Fn el_parse "EditLine *e" "int argc" "const char *argv[]"
+.Ft int
+.Fn el_wparse "EditLine *e" "int argc" "const wchar_t *argv[]"
+.Ft int
+.Fn el_set "EditLine *e" "int op" "..."
+.Ft int
+.Fn el_wset "EditLine *e" "int op" "..."
+.Ft int
+.Fn el_get "EditLine *e" "int op" "..."
+.Ft int
+.Fn el_wget "EditLine *e" "int op" "..."
+.Ft int
+.Fn el_source "EditLine *e" "const char *file"
+.Ft void
+.Fn el_resize "EditLine *e"
+.Ft int
+.Fn el_cursor "EditLine *e" "int count"
+.Ft const LineInfo *
+.Fn el_line "EditLine *e"
+.Ft const LineInfoW *
+.Fn el_wline "EditLine *e"
+.Ft int
+.Fn el_insertstr "EditLine *e" "const char *str"
+.Ft int
+.Fn el_winsertstr "EditLine *e" "const wchar_t *str"
+.Ft void
+.Fn el_deletestr "EditLine *e" "int count"
+.Ft void
+.Fn el_wdeletestr "EditLine *e" "int count"
+.Ft History *
+.Fn history_init void
+.Ft HistoryW *
+.Fn history_winit void
+.Ft void
+.Fn history_end "History *h"
+.Ft void
+.Fn history_wend "HistoryW *h"
+.Ft int
+.Fn history "History *h" "HistEvent *ev" "int op" "..."
+.Ft int
+.Fn history_w "HistoryW *h" "HistEventW *ev" "int op" "..."
+.Ft Tokenizer *
+.Fn tok_init "const char *IFS"
+.Ft TokenizerW *
+.Fn tok_winit "const wchar_t *IFS"
+.Ft void
+.Fn tok_end "Tokenizer *t"
+.Ft void
+.Fn tok_wend "TokenizerW *t"
+.Ft void
+.Fn tok_reset "Tokenizer *t"
+.Ft void
+.Fn tok_wreset "TokenizerW *t"
+.Ft int
+.Fn tok_line "Tokenizer *t" "const LineInfo *li" "int *argc" "const char **argv[]" "int *cursorc" "int *cursoro"
+.Ft int
+.Fn tok_wline "TokenizerW *t" "const LineInfoW *li" "int *argc" "const wchar_t **argv[]" "int *cursorc" "int *cursoro"
+.Ft int
+.Fn tok_str "Tokenizer *t" "const char *str" "int *argc" "const char **argv[]"
+.Ft int
+.Fn tok_wstr "TokenizerW *t" "const wchar_t *str" "int *argc" "const wchar_t **argv[]"
+.Sh DESCRIPTION
+The
+.Nm
+library provides generic line editing, history and tokenization functions,
+similar to those found in
+.Xr sh 1 .
+.Pp
+These functions are available in the
+.Nm libedit
+library (which needs the
+.Nm libtermcap
+library).
+Programs should be linked with
+.Fl ledit ltermcap .
+.Pp
+The
+.Nm
+library respects the
+.Ev LC_CTYPE
+locale set by the application program and never uses
+.Xr setlocale 3
+to change the locale.
+.Sh LINE EDITING FUNCTIONS
+The line editing functions use a common data structure,
+.Fa EditLine ,
+which is created by
+.Fn el_init
+or
+.Fn el_init_fd
+and freed by
+.Fn el_end .
+.Pp
+The wide-character functions behave the same way as their narrow
+counterparts.
+.Pp
+The following functions are available:
+.Bl -tag -width 4n
+.It Fn el_init
+Initialize the line editor, and return a data structure
+to be used by all other line editing functions, or
+.Dv NULL
+on failure.
+.Fa prog
+is the name of the invoking program, used when reading the
+.Xr editrc 5
+file to determine which settings to use.
+.Fa fin ,
+.Fa fout
+and
+.Fa ferr
+are the input, output, and error streams (respectively) to use.
+In this documentation, references to
+.Dq the tty
+are actually to this input/output stream combination.
+.It Fn el_init_fd
+Like
+.Fn el_init
+but allows specifying file descriptors for the
+.Xr stdio 3
+corresponding streams, in case those were created with
+.Xr funopen 3 .
+.It Fn el_end
+Clean up and finish with
+.Fa e ,
+assumed to have been created with
+.Fn el_init
+or
+.Fn el_init_fd .
+.It Fn el_reset
+Reset the tty and the parser.
+This should be called after an error which may have upset the tty's
+state.
+.It Fn el_gets
+Read a line from the tty.
+.Fa count
+is modified to contain the number of characters read.
+Returns the line read if successful, or
+.Dv NULL
+if no characters were read or if an error occurred.
+If an error occurred,
+.Fa count
+is set to \-1 and
+.Dv errno
+contains the error code that caused it.
+The return value may not remain valid across calls to
+.Fn el_gets
+and must be copied if the data is to be retained.
+.It Fn el_wgetc
+Read a wide character from the tty, respecting the current locale,
+or from the input queue described in
+.Xr editline 7
+if that is not empty, and store it in
+.Fa wc .
+If an invalid or incomplete character is found, it is discarded,
+.Va errno
+is set to
+.Er EILSEQ ,
+and the next character is read and stored in
+.Fa wc .
+Returns 1 if a valid character was read, 0 on end of file, or \-1 on
+.Xr read 2
+failure.
+In the latter case,
+.Va errno
+is set to indicate the error.
+.It Fn el_getc
+Read a wide character as described for
+.Fn el_wgetc
+and return 0 on end of file or \-1 on failure.
+If the wide character can be represented as a single-byte character,
+convert it with
+.Xr wctob 3 ,
+store the result in
+.Fa ch ,
+and return 1; otherwise, set
+.Va errno
+to
+.Er ERANGE
+and return \-1.
+In the C or POSIX locale, this simply reads a byte, but for any other
+locale, including UTF-8, this is rarely useful.
+.It Fn el_wpush
+Push the wide character string
+.Fa wcs
+back onto the input queue described in
+.Xr editline 7 .
+If the queue overflows, for example due to a recursive macro,
+or if an error occurs, for example because
+.Fa wcs
+is
+.Dv NULL
+or memory allocation fails, the function beeps at the user,
+but does not report the problem to the caller.
+.It Fn el_push
+Use the current locale to convert the multibyte string
+.Fa mbs
+to a wide character string, and pass the result to
+.Fn el_wpush .
+.It Fn el_parse
+Parses the
+.Fa argv
+array (which is
+.Fa argc
+elements in size)
+to execute builtin
+.Nm
+commands.
+If the command is prefixed with
+.Dq prog :
+then
+.Fn el_parse
+will only execute the command if
+.Dq prog
+matches the
+.Fa prog
+argument supplied to
+.Fn el_init .
+The return value is
+\-1 if the command is unknown,
+0 if there was no error or
+.Dq prog
+didn't match, or
+1 if the command returned an error.
+Refer to
+.Xr editrc 5
+for more information.
+.It Fn el_set
+Set
+.Nm
+parameters.
+.Fa op
+determines which parameter to set, and each operation has its
+own parameter list.
+Returns 0 on success, \-1 on failure.
+.Pp
+The following values for
+.Fa op
+are supported, along with the required argument list:
+.Bl -tag -width 4n
+.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)"
+Define prompt printing function as
+.Fa f ,
+which is to return a string that contains the prompt.
+.It Dv EL_PROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
+Same as
+.Dv EL_PROMPT ,
+but the
+.Fa c
+argument indicates the start/stop literal prompt character.
+.Pp
+If a start/stop literal character is found in the prompt, the
+character itself
+is not printed, but characters after it are printed directly to the
+terminal without affecting the state of the current line.
+A subsequent second start/stop literal character ends this behavior.
+This is typically used to embed literal escape sequences that change the
+color/style of the terminal in the prompt.
+Note that the literal escape character cannot be the last character in the
+prompt, as the escape sequence is attached to the next character in the prompt.
+.Dv 0
+unsets it.
+.It Dv EL_REFRESH
+Re-display the current line on the next terminal line.
+.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)"
+Define right side prompt printing function as
+.Fa f ,
+which is to return a string that contains the prompt.
+.It Dv EL_RPROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
+Define the right prompt printing function but with a literal escape character.
+.It Dv EL_TERMINAL , Fa "const char *type"
+Define terminal type of the tty to be
+.Fa type ,
+or to
+.Ev TERM
+if
+.Fa type
+is
+.Dv NULL .
+.It Dv EL_EDITOR , Fa "const char *mode"
+Set editing mode to
+.Fa mode ,
+which must be one of
+.Dq emacs
+or
+.Dq vi .
+.It Dv EL_SIGNAL , Fa "int flag"
+If
+.Fa flag
+is non-zero,
+.Nm
+will install its own signal handler for the following signals when
+reading command input:
+.Dv SIGCONT ,
+.Dv SIGHUP ,
+.Dv SIGINT ,
+.Dv SIGQUIT ,
+.Dv SIGSTOP ,
+.Dv SIGTERM ,
+.Dv SIGTSTP ,
+and
+.Dv SIGWINCH .
+Otherwise, the current signal handlers will be used.
+.It Dv EL_BIND , Fa "const char *" , Fa "..." , Dv NULL
+Perform the
+.Ic bind
+builtin command.
+Refer to
+.Xr editrc 5
+for more information.
+.It Dv EL_ECHOTC , Fa "const char *" , Fa "..." , Dv NULL
+Perform the
+.Ic echotc
+builtin command.
+Refer to
+.Xr editrc 5
+for more information.
+.It Dv EL_SETTC , Fa "const char *" , Fa "..." , Dv NULL
+Perform the
+.Ic settc
+builtin command.
+Refer to
+.Xr editrc 5
+for more information.
+.It Dv EL_SETTY , Fa "const char *" , Fa "..." , Dv NULL
+Perform the
+.Ic setty
+builtin command.
+Refer to
+.Xr editrc 5
+for more information.
+.It Dv EL_TELLTC , Fa "const char *" , Fa "..." , Dv NULL
+Perform the
+.Ic telltc
+builtin command.
+Refer to
+.Xr editrc 5
+for more information.
+.It Dv EL_ADDFN , Fa "const char *name" , Fa "const char *help" , \
+Fa "unsigned char (*func)(EditLine *e, int ch)"
+Add a user defined function,
+.Fn func ,
+referred to as
+.Fa name
+which is invoked when a key which is bound to
+.Fa name
+is entered.
+.Fa help
+is a description of
+.Fa name .
+At invocation time,
+.Fa ch
+is the key which caused the invocation.
+The return value of
+.Fn func
+should be one of:
+.Bl -tag -width "CC_REDISPLAY"
+.It Dv CC_NORM
+Add a normal character.
+.It Dv CC_NEWLINE
+End of line was entered.
+.It Dv CC_EOF
+EOF was entered.
+.It Dv CC_ARGHACK
+Expecting further command input as arguments, do nothing visually.
+.It Dv CC_REFRESH
+Refresh display.
+.It Dv CC_REFRESH_BEEP
+Refresh display, and beep.
+.It Dv CC_CURSOR
+Cursor moved, so update and perform
+.Dv CC_REFRESH .
+.It Dv CC_REDISPLAY
+Redisplay entire input line.
+This is useful if a key binding outputs extra information.
+.It Dv CC_ERROR
+An error occurred.
+Beep, and flush tty.
+.It Dv CC_FATAL
+Fatal error, reset tty to known state.
+.El
+.It Dv EL_HIST , Fa "History *(*func)(History *, int op, ...)" , \
+Fa "const char *ptr"
+Defines which history function to use, which is usually
+.Fn history .
+.Fa ptr
+should be the value returned by
+.Fn history_init .
+.It Dv EL_EDITMODE , Fa "int flag"
+If
+.Fa flag
+is non-zero,
+editing is enabled (the default).
+Note that this is only an indication, and does not
+affect the operation of
+.Nm .
+At this time, it is the caller's responsibility to
+check this
+(using
+.Fn el_get )
+to determine if editing should be enabled or not.
+.It Dv EL_UNBUFFERED , Fa "int flag"
+If
+.Fa flag
+is zero,
+unbuffered mode is disabled (the default).
+In unbuffered mode,
+.Fn el_gets
+will return immediately after processing a single character.
+.It Dv EL_SAFEREAD , Fa "int flag"
+If the
+.Fa flag
+argument is non-zero, then
+.Nm editline
+attempts to recover from read errors, ignoring the first interrrupted
+error, and trying to reset the input file descriptor to reset non-blocking I/O.
+This is disabled by default, and desirable only when
+.Nm editline
+is used in shell-like applications.
+.It Dv EL_GETCFN , Fa "el_rfunc_t f"
+Whenever reading a character, use the function
+.Bd -ragged -offset indent -compact
+.Ft int
+.Fo f
+.Fa "EditLine *e"
+.Fa "wchar_t *wc"
+.Fc
+.Ed
+which stores the character in
+.Fa wc
+and returns 1 on success, 0 on end of file, or \-1 on I/O or encoding
+errors.
+Functions internally using it include
+.Fn el_wgets ,
+.Fn el_wgetc ,
+.Fn el_gets ,
+and
+.Fn el_getc .
+Initially, a builtin function is installed, and replacing it
+is discouraged because writing such a function is very error prone.
+The builtin function can be restored at any time by passing the
+special value
+.Dv EL_BUILTIN_GETCFN
+instead of a function pointer.
+.It Dv EL_CLIENTDATA , Fa "void *data"
+Register
+.Fa data
+to be associated with this EditLine structure.
+It can be retrieved with the corresponding
+.Fn el_get
+call.
+.It Dv EL_SETFP , Fa "int fd" , Fa "FILE *fp"
+Set the current
+.Nm editline
+file pointer for
+.Dq input
+.Fa fd
+=
+.Dv 0 ,
+.Dq output
+.Fa fd
+=
+.Dv 1 ,
+or
+.Dq error
+.Fa fd
+=
+.Dv 2
+from
+.Fa fp .
+.El
+.It Fn el_get
+Get
+.Nm
+parameters.
+.Fa op
+determines which parameter to retrieve into
+.Fa result .
+Returns 0 if successful, \-1 otherwise.
+.Pp
+The following values for
+.Fa op
+are supported, along with actual type of
+.Fa result :
+.Bl -tag -width 4n
+.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c"
+Set
+.Fa f
+to a pointer to the function that displays the prompt.
+If
+.Fa c
+is not
+.Dv NULL ,
+set it to the start/stop literal prompt character.
+.It Dv EL_RPROMPT , Fa "char *(*f)(EditLine *)" , Fa "char *c"
+Set
+.Fa f
+to a pointer to the function that displays the prompt.
+If
+.Fa c
+is not
+.Dv NULL ,
+set it to the start/stop literal prompt character.
+.It Dv EL_EDITOR , Fa "const char **n"
+Set the name of the editor in
+.Fa n ,
+which will be one of
+.Dq emacs
+or
+.Dq vi .
+.It Dv EL_GETTC , Fa "const char *name" , Fa "void *value"
+If
+.Fa name
+is a valid
+.Xr termcap 5
+capability set
+.Fa value
+to the current value of that capability.
+.It Dv EL_SIGNAL , Fa "int *s"
+Set
+.Fa s
+to non-zero if
+.Nm
+has installed private signal handlers (see
+.Fn el_get
+above).
+.It Dv EL_EDITMODE , Fa "int *c"
+Set
+.Fa c
+to non-zero if editing is enabled.
+.It Dv EL_GETCFN , Fa "el_rfunc_t *f"
+Set
+.Fa f
+to a pointer to the function that reads characters, or to
+.Dv EL_BUILTIN_GETCFN
+if the builtin function is in use.
+.It Dv EL_CLIENTDATA , Fa "void **data"
+Set
+.Fa data
+to the previously registered client data set by an
+.Fn el_set
+call.
+.It Dv EL_UNBUFFERED , Fa "int *c"
+Set
+.Fa c
+to non-zero if unbuffered mode is enabled.
+.It Dv EL_SAFEREAD , Fa "int *c"
+Set
+.Fa c
+to non-zero if safe read is set.
+.It Dv EL_GETFP , Fa "int fd", Fa "FILE **fp"
+Set
+.Fa fp
+to the current
+.Nm editline
+file pointer for
+.Dq input
+.Fa fd
+=
+.Dv 0 ,
+.Dq output
+.Fa fd
+=
+.Dv 1 ,
+or
+.Dq error
+.Fa fd
+=
+.Dv 2 .
+.El
+.It Fn el_source
+Initialize
+.Nm
+by reading the contents of
+.Fa file .
+.Fn el_parse
+is called for each line in
+.Fa file .
+If
+.Fa file
+is
+.Dv NULL ,
+try
+.Pa $EDITRC
+and if that is not set
+.Pa $HOME/.editrc .
+Refer to
+.Xr editrc 5
+for details on the format of
+.Fa file .
+.Fn el_source
+returns 0 on success and \-1 on error.
+.It Fn el_resize
+Must be called if the terminal size changes.
+If
+.Dv EL_SIGNAL
+has been set with
+.Fn el_set ,
+then this is done automatically.
+Otherwise, it's the responsibility of the application to call
+.Fn el_resize
+on the appropriate occasions.
+.It Fn el_cursor
+Move the cursor to the right (if positive) or to the left (if negative)
+.Fa count
+characters.
+Returns the resulting offset of the cursor from the beginning of the line.
+.It Fn el_line
+Return the editing information for the current line in a
+.Fa LineInfo
+structure, which is defined as follows:
+.Bd -literal
+typedef struct lineinfo {
+    const char *buffer;    /* address of buffer */
+    const char *cursor;    /* address of cursor */
+    const char *lastchar;  /* address of last character */
+} LineInfo;
+.Ed
+.Pp
+.Fa buffer
+is not NUL terminated.
+This function may be called after
+.Fn el_gets
+to obtain the
+.Fa LineInfo
+structure pertaining to line returned by that function,
+and from within user defined functions added with
+.Dv EL_ADDFN .
+.It Fn el_insertstr
+Insert
+.Fa str
+into the line at the cursor.
+Returns \-1 if
+.Fa str
+is empty or won't fit, and 0 otherwise.
+.It Fn el_deletestr
+Delete
+.Fa count
+characters before the cursor.
+.El
+.Sh HISTORY LIST FUNCTIONS
+The history functions use a common data structure,
+.Fa History ,
+which is created by
+.Fn history_init
+and freed by
+.Fn history_end .
+.Pp
+The following functions are available:
+.Bl -tag -width 4n
+.It Fn history_init
+Initialize the history list, and return a data structure
+to be used by all other history list functions, or
+.Dv NULL
+on failure.
+.It Fn history_end
+Clean up and finish with
+.Fa h ,
+assumed to have been created with
+.Fn history_init .
+.It Fn history
+Perform operation
+.Fa op
+on the history list, with optional arguments as needed by the
+operation.
+.Fa ev
+is changed accordingly to operation.
+The following values for
+.Fa op
+are supported, along with the required argument list:
+.Bl -tag -width 4n
+.It Dv H_SETSIZE , Fa "int size"
+Set size of history to
+.Fa size
+elements.
+.It Dv H_GETSIZE
+Get number of events currently in history.
+.It Dv H_END
+Cleans up and finishes with
+.Fa h ,
+assumed to be created with
+.Fn history_init .
+.It Dv H_CLEAR
+Clear the history.
+.It Dv H_FUNC , Fa "void *ptr" , Fa "history_gfun_t first" , \
+Fa "history_gfun_t next" , Fa "history_gfun_t last" , \
+Fa "history_gfun_t prev" , Fa "history_gfun_t curr" , \
+Fa "history_sfun_t set" , Fa "history_vfun_t clear" , \
+Fa "history_efun_t enter" , Fa "history_efun_t add"
+Define functions to perform various history operations.
+.Fa ptr
+is the argument given to a function when it's invoked.
+.It Dv H_FIRST
+Return the first element in the history.
+.It Dv H_LAST
+Return the last element in the history.
+.It Dv H_PREV
+Return the previous element in the history.
+It is newer than the current one.
+.It Dv H_NEXT
+Return the next element in the history.
+It is older than the current one.
+.It Dv H_CURR
+Return the current element in the history.
+.It Dv H_SET , Fa "int position"
+Set the cursor to point to the requested element.
+.It Dv H_ADD , Fa "const char *str"
+Append
+.Fa str
+to the current element of the history, or perform the
+.Dv H_ENTER
+operation with argument
+.Fa str
+if there is no current element.
+.It Dv H_APPEND , Fa "const char *str"
+Append
+.Fa str
+to the last new element of the history.
+.It Dv H_ENTER , Fa "const char *str"
+Add
+.Fa str
+as a new element to the history and, if necessary,
+removing the oldest entry to keep the list to the created size.
+If
+.Dv H_SETUNIQUE
+has been called with a non-zero argument, the element
+will not be entered into the history if its contents match
+the ones of the current history element.
+If the element is entered
+.Fn history
+returns 1; if it is ignored as a duplicate returns 0.
+Finally
+.Fn history
+returns \-1 if an error occurred.
+.It Dv H_PREV_STR , Fa "const char *str"
+Return the closest previous event that starts with
+.Fa str .
+.It Dv H_NEXT_STR , Fa "const char *str"
+Return the closest next event that starts with
+.Fa str .
+.It Dv H_PREV_EVENT , Fa "int e"
+Return the previous event numbered
+.Fa e .
+.It Dv H_NEXT_EVENT , Fa "int e"
+Return the next event numbered
+.Fa e .
+.It Dv H_LOAD , Fa "const char *file"
+Load the history list stored in
+.Fa file .
+.It Dv H_SAVE , Fa "const char *file"
+Save the history list to
+.Fa file .
+.It Dv H_SAVE_FP , Fa "FILE *fp"
+Save the history list to the opened
+.Ft FILE
+pointer
+.Fa fp .
+.It Dv H_NSAVE_FP , Fa "size_t n" , Fa "FILE *fp"
+Save the last
+.Ft n
+history entries to the opened
+.Ft FILE
+pointer
+.Fa fp .
+.It Dv H_SETUNIQUE , Fa "int unique"
+Set flag that adjacent identical event strings should not be entered
+into the history.
+.It Dv H_GETUNIQUE
+Retrieve the current setting if adjacent identical elements should
+be entered into the history.
+.It Dv H_DEL , Fa "int e"
+Delete the event numbered
+.Fa e .
+This function is only provided for
+.Nm readline
+compatibility.
+The caller is responsible for free'ing the string in the returned
+.Fa HistEvent .
+.El
+.Pp
+.Fn history
+returns >= 0 if the operation
+.Fa op
+succeeds.
+Otherwise, \-1 is returned and
+.Fa ev
+is updated to contain more details about the error.
+.El
+.Sh TOKENIZATION FUNCTIONS
+The tokenization functions use a common data structure,
+.Fa Tokenizer ,
+which is created by
+.Fn tok_init
+and freed by
+.Fn tok_end .
+.Pp
+The following functions are available:
+.Bl -tag -width 4n
+.It Fn tok_init
+Initialize the tokenizer, and return a data structure
+to be used by all other tokenizer functions.
+.Fa IFS
+contains the Input Field Separators, which defaults to
+.Aq space ,
+.Aq tab ,
+and
+.Aq newline
+if
+.Dv NULL .
+.It Fn tok_end
+Clean up and finish with
+.Fa t ,
+assumed to have been created with
+.Fn tok_init .
+.It Fn tok_reset
+Reset the tokenizer state.
+Use after a line has been successfully tokenized
+by
+.Fn tok_line
+or
+.Fn tok_str
+and before a new line is to be tokenized.
+.It Fn tok_line
+Tokenize
+.Fa li ,
+If successful, modify:
+.Fa argv
+to contain the words,
+.Fa argc
+to contain the number of words,
+.Fa cursorc
+(if not
+.Dv NULL )
+to contain the index of the word containing the cursor,
+and
+.Fa cursoro
+(if not
+.Dv NULL )
+to contain the offset within
+.Fa argv[cursorc]
+of the cursor.
+.Pp
+Returns
+0 if successful,
+\-1 for an internal error,
+1 for an unmatched single quote,
+2 for an unmatched double quote,
+and
+3 for a backslash quoted
+.Aq newline .
+A positive exit code indicates that another line should be read
+and tokenization attempted again.
+.
+.It Fn tok_str
+A simpler form of
+.Fn tok_line ;
+.Fa str
+is a NUL terminated string to tokenize.
+.El
+.
+.\"XXX.Sh EXAMPLES
+.\"XXX: provide some examples
+.Sh SEE ALSO
+.Xr sh 1 ,
+.Xr signal 3 ,
+.Xr termcap 3 ,
+.Xr editrc 5 ,
+.Xr termcap 5 ,
+.Xr editline 7
+.Sh HISTORY
+The
+.Nm
+library first appeared in
+.Bx 4.4 .
+.Dv CC_REDISPLAY
+appeared in
+.Nx 1.3 .
+.Dv CC_REFRESH_BEEP ,
+.Dv EL_EDITMODE
+and the readline emulation appeared in
+.Nx 1.4 .
+.Dv EL_RPROMPT
+appeared in
+.Nx 1.5 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+library was written by
+.An Christos Zoulas .
+.An Luke Mewburn
+wrote this manual and implemented
+.Dv CC_REDISPLAY ,
+.Dv CC_REFRESH_BEEP ,
+.Dv EL_EDITMODE ,
+and
+.Dv EL_RPROMPT .
+.An Jaromir Dolecek
+implemented the readline emulation.
+.An Johny Mattsson
+implemented wide-character support.
+.Sh BUGS
+At this time, it is the responsibility of the caller to
+check the result of the
+.Dv EL_EDITMODE
+operation of
+.Fn el_get
+(after an
+.Fn el_source
+or
+.Fn el_parse )
+to determine if
+.Nm
+should be used for further input.
+I.e.,
+.Dv EL_EDITMODE
+is purely an indication of the result of the most recent
+.Xr editrc 5
+.Ic edit
+command.
diff --git a/extra/libedit/libedit-20221030-3.1/doc/editline.7.roff b/extra/libedit/libedit-20221030-3.1/doc/editline.7.roff
new file mode 100644
index 000000000000..863bab96d519
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/editline.7.roff
@@ -0,0 +1,935 @@
+.\"	$NetBSD: editline.7,v 1.5 2016/05/09 21:27:55 christos Exp $
+.\"	$OpenBSD: editline.7,v 1.1 2016/04/20 01:11:45 schwarze Exp $
+.\"
+.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd May 7, 2016
+.Dt EDITLINE 7
+.Os
+.Sh NAME
+.Nm editline
+.Nd line editing user interface
+.Sh DESCRIPTION
+When a program using the
+.Xr editline 3
+library prompts for an input string using the function
+.Xr el_wgets 3 ,
+it reads characters from the terminal.
+Invalid input bytes that do not form characters are silently
+discarded.
+For each character read, one editor command is executed.
+The mapping of input characters to editor commands depends on the
+editing mode.
+There are three editing modes: vi insert mode, vi command mode,
+and emacs mode.
+The default is vi insert mode.
+The program can switch the default to emacs mode by using the
+.Xr el_set 3
+or
+.Xr el_parse 3
+functions, and the user can switch to emacs mode either in the
+.Xr editrc 5
+configuration file or interactively with the
+.Ic ed-command
+editor command, in all three cases executing the
+.Ic bind Fl e
+builtin command.
+.Pp
+If trying to read from the terminal results in end of file or an
+error, the library signals end of file to the program and does not
+return a string.
+.Ss Input character bindings
+All default bindings described below can be overridden by individual
+programs and can be changed with the
+.Xr editrc 5
+.Ic bind
+builtin command.
+.Pp
+In the following tables,
+.Sq Ctrl-
+indicates a character with the bit 0x40 flipped, and
+.Sq Meta-
+indicates a character with the bit 0x80 set.
+In vi insert mode and in emacs mode, all Meta-characters considered
+printable by the current
+.Xr locale 1
+are bound to
+.Ic ed-insert
+instead of to the editor command listed below.
+Consequently, in UTF-8 mode, most of the Meta-characters are not
+directly accessible because their code points are occupied by
+printable Unicode characters, and Meta-characters are usually input
+using the
+.Ic em-meta-next
+editor command.
+For example, to enter
+.Sq Meta-B
+in order to call the
+.Ic ed-prev-word
+editor command in emacs mode, call
+.Ic em-meta-next
+by pressing and releasing the escape key (or equivalently, Ctrl-[),
+then press and release the
+.Sq B
+key.
+If you have configured a Meta-key on your keyboard, for example
+with
+.Ql setxkbmap -option altwin:left_meta_win ,
+the Ctrl-Meta-characters are directly accessible.
+For example, to enter
+.Sq Ctrl-Meta-H
+in order to call the
+.Ic ed-delete-prev-word
+editor command in emacs mode, hold down the keys
+.Sq Ctrl ,
+.Sq Meta ,
+and
+.Sq H
+at the same time.
+Alternatively, press and release the escape key, then press and
+release
+.Sq Ctrl-H .
+.Pp
+In vi input mode, input characters are bound to the following editor
+commands by default:
+.Bl -column -offset indent "Ctrl-Z, TSTP" "ed-search-next-history"
+.It Ctrl-D, EOF Ta Ic vi-list-or-eof
+.It Ctrl-H, BS Ta Ic vi-delete-prev-char
+.It Ctrl-J, LF Ta Ic ed-newline
+.It Ctrl-M, CR Ta Ic ed-newline
+.It Ctrl-Q Ta Ic ed-tty-start-output
+.It Ctrl-S Ta Ic ed-tty-stop-output
+.It Ctrl-U Ta Ic vi-kill-line-prev
+.It Ctrl-V Ta Ic ed-quoted-insert
+.It Ctrl-W Ta Ic ed-delete-prev-word
+.It Ctrl-[, ESC Ta Ic vi-command-mode
+.It Ctrl-\e, QUIT Ta Ic ed-tty-sigquit
+.It Ctrl-?, DEL Ta Ic vi-delete-prev-char
+.El
+.Pp
+All other input characters except the NUL character (Ctrl-@) are
+bound to
+.Ic ed-insert .
+.Pp
+In vi command mode, input characters are bound to the following
+editor commands by default:
+.Bl -column -offset indent "Ctrl-Z, TSTP" "ed-search-next-history"
+.It Ctrl-A Ta Ic ed-move-to-beg
+.It Ctrl-C, INT Ta Ic ed-tty-sigint
+.It Ctrl-E Ta Ic ed-move-to-end
+.It Ctrl-H, BS Ta Ic ed-delete-prev-char
+.It Ctrl-J, LF Ta Ic ed-newline
+.It Ctrl-K Ta Ic ed-kill-line
+.It Ctrl-L, FF Ta Ic ed-clear-screen
+.It Ctrl-M, CR Ta Ic ed-newline
+.It Ctrl-N Ta Ic ed-next-history
+.It Ctrl-O Ta Ic ed-tty-flush-output
+.It Ctrl-P Ta Ic ed-prev-history
+.It Ctrl-Q Ta Ic ed-tty-start-output
+.It Ctrl-R Ta Ic ed-redisplay
+.It Ctrl-S Ta Ic ed-tty-stop-output
+.It Ctrl-U Ta Ic vi-kill-line-prev
+.It Ctrl-W Ta Ic ed-delete-prev-word
+.It Ctrl-[, ESC Ta Ic em-meta-next
+.It Ctrl-\e, QUIT Ta Ic ed-tty-sigquit
+.It Space Ta Ic ed-next-char
+.It # Ta Ic vi-comment-out
+.It $ Ta Ic ed-move-to-end
+.It % Ta Ic vi-match
+.It + Ta Ic ed-next-history
+.It \&, Ta Ic vi-repeat-prev-char
+.It - Ta Ic ed-prev-history
+.It \&. Ta Ic vi-redo
+.It / Ta Ic vi-search-prev
+.It 0 Ta Ic vi-zero
+.It 1 to 9 Ta Ic ed-argument-digit
+.It \&: Ta Ic ed-command
+.It \&; Ta Ic vi-repeat-next-char
+.It \&? Ta Ic vi-search-next
+.It @ Ta Ic vi-alias
+.It A Ta Ic vi-add-at-eol
+.It B Ta Ic vi-prev-big-word
+.It C Ta Ic vi-change-to-eol
+.It D Ta Ic ed-kill-line
+.It E Ta Ic vi-end-big-word
+.It F Ta Ic vi-prev-char
+.It G Ta Ic vi-to-history-line
+.It I Ta Ic vi-insert-at-bol
+.It J Ta Ic ed-search-next-history
+.It K Ta Ic ed-search-prev-history
+.It N Ta Ic vi-repeat-search-prev
+.It O Ta Ic ed-sequence-lead-in
+.It P Ta Ic vi-paste-prev
+.It R Ta Ic vi-replace-mode
+.It S Ta Ic vi-substitute-line
+.It T Ta Ic vi-to-prev-char
+.It U Ta Ic vi-undo-line
+.It W Ta Ic vi-next-big-word
+.It X Ta Ic ed-delete-prev-char
+.It Y Ta Ic vi-yank-end
+.It \&[ Ta Ic ed-sequence-lead-in
+.It ^ Ta Ic ed-move-to-beg
+.It _ Ta Ic vi-history-word
+.It a Ta Ic vi-add
+.It b Ta Ic vi-prev-word
+.It c Ta Ic vi-change-meta
+.It d Ta Ic vi-delete-meta
+.It e Ta Ic vi-end-word
+.It f Ta Ic vi-next-char
+.It h Ta Ic ed-prev-char
+.It i Ta Ic vi-insert
+.It j Ta Ic ed-next-history
+.It k Ta Ic ed-prev-history
+.It l Ta Ic ed-next-char
+.It n Ta Ic vi-repeat-search-next
+.It p Ta Ic vi-paste-next
+.It r Ta Ic vi-replace-char
+.It s Ta Ic vi-substitute-char
+.It t Ta Ic vi-to-next-char
+.It u Ta Ic vi-undo
+.It v Ta Ic vi-histedit
+.It w Ta Ic vi-next-word
+.It x Ta Ic ed-delete-next-char
+.It y Ta Ic vi-yank
+.It \&| Ta Ic vi-to-column
+.It ~ Ta Ic vi-change-case
+.It Ctrl-?, DEL Ta Ic ed-delete-prev-char
+.It Meta-O Ta Ic ed-sequence-lead-in
+.It Meta-[ Ta Ic ed-sequence-lead-in
+.El
+.Pp
+In emacs mode, input characters are bound to the following editor
+commands by default:
+.Bl -column -offset indent "Ctrl-Z, TSTP" "ed-search-next-history"
+.It 0 to 9 Ta Ic ed-digit
+.It Ctrl-@, NUL Ta Ic em-set-mark
+.It Ctrl-A Ta Ic ed-move-to-beg
+.It Ctrl-B Ta Ic ed-prev-char
+.It Ctrl-C, INT Ta Ic ed-tty-sigint
+.It Ctrl-D, EOF Ta Ic em-delete-or-list
+.It Ctrl-E Ta Ic ed-move-to-end
+.It Ctrl-F Ta Ic ed-next-char
+.It Ctrl-H, BS Ta Ic em-delete-prev-char
+.It Ctrl-J, LF Ta Ic ed-newline
+.It Ctrl-K Ta Ic ed-kill-line
+.It Ctrl-L, FF Ta Ic ed-clear-screen
+.It Ctrl-M, CR Ta Ic ed-newline
+.It Ctrl-N Ta Ic ed-next-history
+.It Ctrl-O Ta Ic ed-tty-flush-output
+.It Ctrl-P Ta Ic ed-prev-history
+.It Ctrl-Q Ta Ic ed-tty-start-output
+.It Ctrl-R Ta Ic ed-redisplay
+.It Ctrl-S Ta Ic ed-tty-stop-output
+.It Ctrl-T Ta Ic ed-transpose-chars
+.It Ctrl-U Ta Ic ed-kill-line
+.It Ctrl-V Ta Ic ed-quoted-insert
+.It Ctrl-W Ta Ic em-kill-region
+.It Ctrl-X Ta Ic ed-sequence-lead-in
+.It Ctrl-Y Ta Ic em-yank
+.It Ctrl-Z, TSTP Ta Ic ed-tty-sigtstp
+.It Ctrl-[, ESC Ta Ic em-meta-next
+.It Ctrl-\e, QUIT Ta Ic ed-tty-sigquit
+.It Ctrl-] Ta Ic ed-tty-dsusp
+.It Ctrl-?, DEL Ta Ic em-delete-prev-char
+.It Ctrl-Meta-H Ta Ic ed-delete-prev-word
+.It Ctrl-Meta-L Ta Ic ed-clear-screen
+.It Ctrl-Meta-_ Ta Ic em-copy-prev-word
+.It Meta-0 to 9 Ta Ic ed-argument-digit
+.It Meta-B Ta Ic ed-prev-word
+.It Meta-C Ta Ic em-capitol-case
+.It Meta-D Ta Ic em-delete-next-word
+.It Meta-F Ta Ic em-next-word
+.It Meta-L Ta Ic em-lower-case
+.It Meta-N Ta Ic ed-search-next-history
+.It Meta-O Ta Ic ed-sequence-lead-in
+.It Meta-P Ta Ic ed-search-prev-history
+.It Meta-U Ta Ic em-upper-case
+.It Meta-W Ta Ic em-copy-region
+.It Meta-X Ta Ic ed-command
+.It Meta-[ Ta Ic ed-sequence-lead-in
+.It Meta-b Ta Ic ed-prev-word
+.It Meta-c Ta Ic em-capitol-case
+.It Meta-d Ta Ic em-delete-next-word
+.It Meta-f Ta Ic em-next-word
+.It Meta-l Ta Ic em-lower-case
+.It Meta-n Ta Ic ed-search-next-history
+.It Meta-p Ta Ic ed-search-prev-history
+.It Meta-u Ta Ic em-upper-case
+.It Meta-w Ta Ic em-copy-region
+.It Meta-x Ta Ic ed-command
+.It Ctrl-Meta-? Ta Ic ed-delete-prev-word
+.El
+.Pp
+The remaining
+.Xr ascii 7
+characters in the range 0x20 to 0x7e are bound to
+.Ic ed-insert .
+.Pp
+If standard output is not connected to a terminal device
+or
+.Xr el_set 3
+was used to set
+.Dv EL_EDITMODE
+to 0, all input character bindings are disabled and all characters
+typed are appended to the edit buffer.
+In that case, the edit buffer is returned to the program after a
+newline or carriage return character is typed, or after the first
+character typed if
+.Xr el_set 3
+was used to set
+.Dv EL_UNBUFFERED
+to non-zero.
+.Ss Editor commands
+Most editor commands accept an optional argument.
+The argument is entered by prefixing the editor command with one
+or more of the editor commands
+.Ic ed-argument-digit ,
+.Ic ed-digit ,
+.Ic em-universal-argument ,
+or
+.Ic vi-zero .
+When an argument is not provided, it defaults to 1.
+For most editor commands, the effect of an argument is to repeatedly
+execute the command that number of times.
+.Pp
+When talking about a character string from a left character to a
+right character, the left character is included in the string, while
+the right character is not included.
+.Pp
+If an editor command causes an error, the input character is discarded,
+no action occurs, and the terminal bell is rung.
+In case of a non-fatal error, the terminal bell is also rung,
+but the editor command takes effect anyway.
+.Pp
+In the following list, the default key bindings are listed after
+each editor command.
+.Bl -tag -width 4n
+.It Ic ed-argument-digit Pq vi command: 1 to 9; emacs: Meta-0 to Meta-9
+If in argument input mode, append the input digit to the argument
+being read.
+Otherwise, switch to argument input mode and use the input digit
+as the most significant digit of the argument.
+It is an error if the input character is not a digit or if the
+existing argument is already greater than a million.
+.It Ic ed-clear-screen Pq vi command: Ctrl-L; emacs: Ctrl-L, Ctrl-Meta-L
+Clear the screen and display the edit buffer at the top.
+Ignore any argument.
+.It Ic ed-command Pq vi command: So \&: Sc ; emacs: Meta-X, Meta-x
+Read a line from the terminal bypassing the normal line editing
+functionality and execute that line as an
+.Xr editrc 5
+builtin command.
+If in vi command mode, also switch back to vi insert mode.
+Ignore any argument.
+.It Ic ed-delete-next-char Pq vi command: x
+Delete the character at the cursor position.
+With an argument, delete that number of characters.
+In emacs mode, it is an error if the cursor is at the end of the
+edit buffer.
+In vi mode, the last character in the edit buffer is deleted in
+that case, and it is an error if the buffer is empty.
+.It Ic ed-delete-prev-char Pq vi command: X, Ctrl-H, BS, Ctrl-?, DEL
+Delete the character to the left of the cursor position.
+With an argument, delete that number of characters.
+It is an error if the cursor is at the beginning of the edit buffer.
+.It Ic ed-delete-prev-word Pq vi: Ctrl-W; emacs: Ctrl-Meta-H, Ctrl-Meta-?
+Move to the left to the closest beginning of a word, delete the
+string from that position to the cursor, and save it to the cut
+buffer.
+With an argument, delete that number of words.
+It is an error if the cursor is at the beginning of the edit buffer.
+.It Ic ed-digit Pq emacs: 0 to 9
+If in argument input mode, append the input digit to the argument
+being read.
+Otherwise, call
+.Ic ed-insert .
+It is an error if the input character is not a digit or if the
+existing argument is already greater than a million.
+.It Ic ed-end-of-file Pq not bound by default
+Discard the edit buffer and indicate end of file to the program.
+Ignore any argument.
+.It Ic ed-ignore Pq various
+Discard the input character and do nothing.
+.It Ic ed-insert Pq vi input: almost all; emacs: printable characters
+In insert mode, insert the input character left of the cursor
+position.
+In replace mode, overwrite the character at the cursor and move the
+cursor to the right by one character position.
+Accept an argument to do this repeatedly.
+It is an error if the input character is the NUL character (Ctrl-@).
+Failure to enlarge the edit buffer also results in an error.
+.It Ic ed-kill-line Pq vi command: D, Ctrl-K; emacs: Ctrl-K, Ctrl-U
+Delete the string from the cursor position to the end of the line
+and save it to the cut buffer.
+Ignore any argument.
+.It Ic ed-move-to-beg Pq vi command: ^, Ctrl-A; emacs: Ctrl-A
+In vi mode, move the cursor to the first non-space character in the
+edit buffer.
+In emacs mode, move the cursor to the beginning of the edit buffer.
+Ignore any argument.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.It Ic ed-move-to-end Pq vi command: $, Ctrl-E; emacs: Ctrl-E
+Move the cursor to the end of the edit buffer.
+Ignore any argument.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.It Ic ed-newline Pq all modes: Ctrl-J, LF, Ctrl-M, CR
+Append a newline character to the edit buffer and return the edit
+buffer to the program.
+Ignore any argument.
+.It Ic ed-next-char Pq vi command: Space, l; emacs: Ctrl-F
+Move the cursor one character position to the right.
+With an argument, move by that number of characters.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer.
+.It Ic ed-next-history Pq vi command: j, +, Ctrl-N; emacs: Ctrl-N
+Replace the edit buffer with the next history line.
+That line is older than the current line.
+With an argument, go forward by that number of history lines.
+It is a non-fatal error to advance by more lines than are available.
+.It Ic ed-next-line Pq not bound by default
+Move the cursor down one line.
+With an argument, move down by that number of lines.
+It is an error if the edit buffer does not contain enough newline
+characters to the right of the cursor position.
+.It Ic ed-prev-char Pq vi command: h; emacs: Ctrl-B
+Move the cursor one character position to the left.
+With an argument, move by that number of characters.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the beginning of the
+edit buffer.
+.It Ic ed-prev-history Pq vi command: k, -, Ctrl-P; emacs: Ctrl-P
+Replace the edit buffer with the previous history line.
+That line is newer than the current line.
+With an argument, go back by that number of lines.
+It is a non-fatal error to back up by more lines than are available.
+.It Ic ed-prev-line Pq not bound by default
+Move the cursor up one line.
+With an argument, move up by that number of lines.
+It is an error if the edit buffer does not contain enough newline
+characters to the left of the cursor position.
+.It Ic ed-prev-word Pq emacs: Meta-B, Meta-b
+Move the cursor to the left to the closest beginning of a word.
+With an argument, repeat that number of times.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the beginning of the
+edit buffer.
+.It Ic ed-quoted-insert Pq vi insert, emacs: Ctrl-V
+Read one character from the terminal bypassing the normal line
+editing functionality and call
+.Ic ed-insert
+on it.
+If trying to read the character returns end of file or an error,
+call
+.Ic ed-end-of-file
+instead.
+.It Ic ed-redisplay Pq vi command, emacs: Ctrl-R
+Redisplay everything.
+Ignore any argument.
+.It Ic ed-search-next-history Pq vi command: J; emacs: Meta-N, Meta-n
+Replace the edit buffer with the next matching history entry.
+.It Ic ed-search-prev-history Pq vi command: K; emacs: Meta-P, Meta-p
+Replace the edit buffer with the previous matching history entry.
+.It Ic ed-sequence-lead-in Pq vi cmd: O, \&[; emacs: Ctrl-X;\
+ both: Meta-O, Meta-[
+Call a macro.
+See the section about
+.Sx Macros
+below for details.
+.It Ic ed-start-over Pq not bound by default
+Discard the contents of the edit buffer and start from scratch.
+Ignore any argument.
+.It Ic ed-transpose-chars Pq emacs: Ctrl-T
+Exchange the character at the cursor position with the one to the
+left of it and move the cursor to the character to the right of the
+two exchanged characters.
+Ignore any argument.
+It is an error if the cursor is at the beginning of the edit buffer
+or if the edit buffer contains less than two characters.
+.It Ic ed-unassigned Pq all characters not listed
+This editor command always results in an error.
+.It Ic em-capitol-case Pq emacs: Meta-C, Meta-c
+Capitalize the string from the cursor to the end of the current
+word.
+That is, if it contains at least one alphabetic character, convert
+the first alphabetic character to upper case, and convert all
+characters to the right of it to lower case.
+In any case, move the cursor to the next character after the end
+of the current word.
+.It Ic em-copy-prev-word Pq emacs: Ctrl-Meta-_
+Copy the string from the beginning of the current word to the cursor
+and insert it to the left of the cursor.
+Move the cursor to the character after the inserted string.
+It is an error if the cursor is at the beginning of the edit buffer.
+.It Ic em-copy-region Pq emacs: Meta-W, Meta-w
+Copy the string from the cursor to the mark to the cut buffer.
+It is an error if the mark is not set.
+.It Ic em-delete-next-word Pq emacs: Meta-D, Meta-d
+Delete the string from the cursor to the end of the current word
+and save it to the cut buffer.
+It is an error if the cursor is at the end of the edit buffer.
+.It Ic em-delete-or-list Pq emacs: Ctrl-D, EOF
+If the cursor is not at the end of the line, delete the character
+at the cursor.
+If the edit buffer is empty, indicate end of file to the program.
+It is an error if the cursor is at the end of the edit buffer and
+the edit buffer is not empty.
+.It Ic em-delete-prev-char Pq emacs: Ctrl-H, BS, Ctrl-?, DEL
+Delete the character to the left of the cursor.
+It is an error if the cursor is at the beginning of the edit buffer.
+.It Ic em-exchange-mark Pq not bound by default
+Exchange the cursor and the mark.
+.It Ic em-gosmacs-transpose Pq not bound by default
+Exchange the two characters to the left of the cursor.
+It is an error if the cursor is on the first or second character
+of the edit buffer.
+.It Ic em-inc-search-next Pq not bound by default
+Emacs incremental next search.
+.It Ic em-inc-search-prev Pq not bound by default
+Emacs incremental reverse search.
+.It Ic em-kill-line Pq not bound by default
+Delete the entire contents of the edit buffer and save it to the
+cut buffer.
+.It Ic em-kill-region Pq emacs: Ctrl-W
+Delete the string from the cursor to the mark and save it to the
+cut buffer.
+It is an error if the mark is not set.
+.It Ic em-lower-case Pq emacs: Meta-L, Meta-l
+Convert the characters from the cursor to the end of the current
+word to lower case.
+.It Ic em-meta-next Pq vi command, emacs: Ctrl-[, ESC
+Set the bit 0x80 on the next character typed.
+Unless the resulting code point is printable, holding down the
+.Sq Meta-
+key while typing that character is a simpler way to achieve the
+same effect.
+.It Ic em-next-word Pq Meta-F, Meta-f
+Move the cursor to the end of the current word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer.
+.It Ic em-set-mark Pq emacs: Ctrl-Q, NUL
+Set the mark at the current cursor position.
+.It Ic em-toggle-overwrite Pq not bound by default
+Switch from insert to overwrite mode or vice versa.
+.It Ic em-universal-argument Pq not bound by default
+If in argument input mode, multiply the argument by 4.
+Otherwise, switch to argument input mode and set the argument to 4.
+It is an error if the existing argument is already greater than a
+million.
+.It Ic em-upper-case Pq emacs: Meta-U, Meta-u
+Convert the characters from the cursor to the end of the current
+word to upper case.
+.It Ic em-yank Pq emacs: Ctrl-Y
+Paste the cut buffer to the left of the cursor.
+.It Ic vi-add Pq vi command: a
+Switch to vi insert mode.
+Unless the cursor is already at the end of the edit buffer, move
+it one character position to the right.
+.It Ic vi-add-at-eol Pq vi command: A
+Switch to vi insert mode and move the cursor to the end of the edit
+buffer.
+.It Ic vi-alias Pq vi command: @
+If an alias function was defined by calling the
+.Xr el_set 3
+or
+.Xr el_wset 3
+function with the argument
+.Dv EL_ALIAS_TEXT ,
+read one character from the terminal bypassing the normal line
+editing functionality, call the alias function passing the argument that was specified with
+.Dv EL_ALIAS_TEXT
+as the first argument and the character read, with an underscore
+prepended, as the second argument, and pass the string returned
+from the alias function to
+.Xr el_wpush 3 .
+It is an error if no alias function is defined or if trying to read
+the character results in end of file or an error.
+.It Ic vi-change-case Pq vi command: ~
+Change the case of the character at the cursor and move the cursor
+one character position to the right.
+It is an error if the cursor is already at the end of the edit
+buffer.
+.It Ic vi-change-meta Pq vi command: c
+Delete the string from the cursor to the position specified by the
+following movement command and save a copy of it to the cut buffer.
+When given twice in a row, instead delete the whole contents of the
+edit buffer and save a copy of it to the cut buffer.
+In either case, switch to vi insert mode after that.
+.It Ic vi-change-to-eol Pq vi command: C
+Delete the string from the cursor position to the end of the line
+and save it to the cut buffer, then switch to vi insert mode.
+.It Ic vi-command-mode Pq vi insert: Ctrl-[, ESC
+Discard pending actions and arguments and switch to vi command mode.
+Unless the cursor is already at the beginning of the edit buffer,
+move it to the left by one character position.
+.It Ic vi-comment-out Pq vi command: #
+Insert a
+.Sq #
+character at the beginning of the edit buffer and return the edit
+buffer to the program.
+.It Ic vi-delete-meta Pq vi command: d
+Delete the string from the cursor to the position specified by the
+following movement command and save a copy of it to the cut buffer.
+When given twice in a row, instead delete the whole contents of the
+edit buffer and save a copy of it to the cut buffer.
+.It Ic vi-delete-prev-char Pq vi insert: Ctrl-H, BS, Ctrl-?, DEL
+Delete the character to the left of the cursor.
+It is an error if the cursor is already at the beginning of the
+edit buffer.
+.It Ic vi-end-big-word Pq vi command: E
+Move the cursor to the end of the current space delimited word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer.
+.It Ic vi-end-word Pq vi command: e
+Move the cursor to the end of the current word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer.
+.It Ic vi-history-word Pq vi command: _
+Insert the first word from the most recent history entry after the
+cursor, move the cursor after to the character after the inserted
+word, and switch to vi insert mode.
+It is an error if there is no history entry or the most recent
+history entry is empty.
+.It Ic vi-insert Pq vi command: i
+Enter insert mode.
+.It Ic vi-insert-at-bol Pq vi command: I
+Move the cursor to the beginning of the edit buffer and switch to
+vi insert mode.
+.It Ic vi-kill-line-prev Pq vi: Ctrl-U
+Delete the string from the beginning of the edit buffer to the
+cursor and save it to the cut buffer.
+.It Ic vi-list-or-eof Pq vi insert: Ctrl-D, EOF
+If the edit buffer is empty, indicate end of file to the program.
+It is an error if the edit buffer is not empty.
+.It Ic vi-match Pq vi command: %
+Consider opening and closing parentheses, braces, and brackets as
+delimiters.
+If the cursor is not at a delimiter, move it to the right until it
+gets to one, then move it to the matching delimiter.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if there is no delimiter at the cursor or in the
+string to the right of the cursor, or if the first such delimiter
+has no matching delimiter.
+.It Ic vi-next-big-word Pq vi command: W
+Move the cursor to the right to the beginning of the next space
+delimited word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer or on its last character.
+.It Ic vi-next-char Pq vi command: f
+Read one character from the terminal bypassing the normal line
+editing functionality and move the cursor to the right to the next
+instance of that character in the edit buffer.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+If trying to read the character results in end of file or an error,
+call
+.Ic ed-end-of-file
+instead.
+It is an error if the character is not found searching to the right
+in the edit buffer.
+.It Ic vi-next-word Pq vi command: w
+Move the cursor to the right to the beginning of the next word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the end of the edit
+buffer or on its last character.
+.It Ic vi-paste-next Pq vi command: p
+Insert a copy of the cut buffer to the right of the cursor.
+It is an error if the cut buffer is empty.
+.It Ic vi-paste-prev Pq vi command: P
+Insert a copy of the cut buffer to the left of the cursor.
+It is an error if the cut buffer is empty.
+.It Ic vi-prev-big-word Pq vi command: B
+Move the cursor to the left to the next beginning of a space delimited
+word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the beginning of the
+edit buffer.
+.It Ic vi-prev-char Pq vi command: F
+Read one character from the terminal bypassing the normal line
+editing functionality and move the cursor to the left to the next
+instance of that character in the edit buffer.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+If trying to read the character results in end of file or an error,
+call
+.Ic ed-end-of-file
+instead.
+It is an error if the character is not found searching to the left
+in the edit buffer.
+.It Ic vi-prev-word Pq vi command: b
+Move the cursor to the left to the next beginning of a word.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+It is an error if the cursor is already at the beginning of the
+edit buffer.
+.It Ic vi-redo Pq vi command: Sq \&.
+Redo the last non-motion command.
+.It Ic vi-repeat-next-char Pq vi command: Sq \&;
+Repeat the most recent character search in the same search direction.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.It Ic vi-repeat-prev-char Pq vi command: Sq \&,
+Repeat the most recent character search in the opposite search
+direction.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.It Ic vi-repeat-search-next Pq vi command: n
+Repeat the most recent history search in the same search direction.
+.It Ic vi-repeat-search-prev Pq vi command: N
+Repeat the most recent history search in the opposite search
+direction.
+.It Ic vi-replace-char Pq vi command: r
+Switch to vi replace mode, and automatically switch back to vi
+command mode after the next character typed.
+See
+.Ic ed-insert
+for a description of replace mode.
+It is an error if the cursor is at the end of the edit buffer.
+.It Ic vi-replace-mode Pq vi command: R
+Switch to vi replace mode.
+This is a variant of vi insert mode; see
+.Ic ed-insert
+for the difference.
+.It Ic vi-search-next Pq vi command: \&?
+Replace the edit buffer with the next matching history entry.
+.It Ic vi-search-prev Pq vi command: /
+Replace the edit buffer with the previous matching history entry.
+.It Ic vi-substitute-char Pq vi command: s
+Delete the character at the cursor and switch to vi insert mode.
+.It Ic vi-substitute-line Pq vi command: S
+Delete the entire contents of the edit buffer, save a copy of it
+in the cut buffer, and enter vi insert mode.
+.It Ic vi-to-column Pq vi command: \&|
+Move the cursor to the column specified as the argument.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.It Ic vi-to-history-line Pq vi command: G
+Replace the edit buffer with the specified history entry.
+.It Ic vi-to-next-char Pq vi command: t
+Read one character from the terminal bypassing the normal line
+editing functionality and move the cursor to the right to the
+character before the next instance of that character in the edit
+buffer.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+If trying to read the character results in end of file or an error,
+call
+.Ic ed-end-of-file
+instead.
+It is an error if the character is not found searching to the right
+in the edit buffer.
+.It Ic vi-to-prev-char Pq vi command: T
+Read one character from the terminal bypassing the normal line
+editing functionality and move the cursor to the left to the character
+after the next instance of that character in the edit buffer.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+If trying to read the character results in end of file or an error,
+call
+.Ic ed-end-of-file
+instead.
+It is an error if the character is not found searching to the left
+in the edit buffer.
+.It Ic vi-undo Pq vi command: u
+Undo the last change.
+.It Ic vi-undo-line Pq vi command: U
+Undo all changes to the edit buffer.
+.It Ic vi-yank Pq vi command: y
+Copy the string from the cursor to the position specified by the
+following movement command to the cut buffer.
+When given twice in a row, instead copy the whole contents of the
+edit buffer to the cut buffer.
+.It Ic vi-yank-end Pq vi command: Y
+Copy the string from the cursor to the end of the edit buffer to
+the cut buffer.
+.It Ic vi-zero Pq vi command: 0
+If in argument input mode, multiply the argument by ten.
+Otherwise, move the cursor to the beginning of the edit buffer.
+Can be used as a movement command after
+.Ic vi_change_meta ,
+.Ic vi_delete_meta ,
+or
+.Ic vi_yank .
+.El
+.Ss Macros
+If an input character is bound to the editor command
+.Ic ed-sequence-lead-in ,
+.Nm
+attempts to call a macro.
+If the input character by itself forms the name of a macro, that
+macro is executed.
+Otherwise, additional input characters are read until the string
+read forms the name of a macro, in which case that macro is executed,
+or until the string read matches the beginning of none of the existing
+macro names, in which case the string including the final, mismatching
+character is discarded and the terminal bell is rung.
+.Pp
+There are two kinds of macros.
+Command macros execute a single editor command.
+Keyboard macros return a string of characters that is appended
+as a new line to the
+.Sx Input Queue .
+.Pp
+The following command macros are defined by default in vi command
+mode and in emacs mode:
+.Bl -column -offset indent "Esc O A, Esc O A" "em-exchange-mark"
+.It Esc \&[ A, Esc O A Ta Ic ed-prev-history
+.It Esc \&[ B, Esc O B Ta Ic ed-next-history
+.It Esc \&[ C, Esc O C Ta Ic ed-next-char
+.It Esc \&[ D, Esc O D Ta Ic ed-prev-char
+.It Esc \&[ F, Esc O F Ta Ic ed-move-to-end
+.It Esc \&[ H, Esc O H Ta Ic ed-move-to-beg
+.El
+.Pp
+In vi command mode, they are also defined by default without the
+initial escape character.
+.Pp
+In addition, the
+.Nm
+library tries to bind the strings generated by the arrow keys
+as reported by the
+.Xr terminfo 5
+database to these editor commands, unless that would clobber
+user settings.
+.Pp
+In emacs mode, the two-character string
+.Dq Ctrl-X Ctrl-X
+is bound to the
+.Ic em-exchange-mark
+editor command.
+.Ss Input Queue
+The
+.Nm
+library maintains an input queue operated in FIFO mode.
+Whenever it needs an input character, it takes the first character
+from the first line of the input queue.
+When the queue is empty, it reads from the terminal.
+.Pp
+A line can be appended to the end of the input queue in several ways:
+.Bl -dash -offset indent
+.It
+By calling one of the keyboard
+.Sx Macros .
+.It
+By calling the editor command
+.Ic vi-redo .
+.It
+By calling the editor command
+.Ic vi-alias .
+.It
+By pressing a key in emacs incremental search mode that doesn't
+have a special meaning in that mode but returns to normal emacs
+mode.
+.It
+If an application program directly calls the functions
+.Xr el_push 3
+or
+.Xr el_wpush 3 ,
+it can provide additional, program-specific ways
+of appending to the input queue.
+.El
+.Sh SEE ALSO
+.Xr mg 1 ,
+.Xr vi 1 ,
+.Xr editline 3 ,
+.Xr el_wgets 3 ,
+.Xr el_wpush 3 ,
+.Xr el_wset 3 ,
+.Xr editrc 5
+.Sh HISTORY
+This manual page first appeared in
+.Ox 6.0
+and
+.Nx 8 .
+.Sh AUTHORS
+.An -nosplit
+This manual page was written by
+.An Ingo Schwarze Aq Mt schwarze@openbsd.org .
diff --git a/extra/libedit/libedit-20221030-3.1/doc/editrc.5.roff b/extra/libedit/libedit-20221030-3.1/doc/editrc.5.roff
new file mode 100644
index 000000000000..fa41dbb7db79
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/editrc.5.roff
@@ -0,0 +1,325 @@
+.\"	$NetBSD: editrc.5,v 1.33 2017/06/27 01:22:58 kre Exp $
+.\"
+.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd May 22, 2016
+.Dt EDITRC 5
+.Os
+.Sh NAME
+.Nm editrc
+.Nd configuration file for editline library
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+The
+.Nm
+file defines various settings to be used by the
+.Xr editline 3
+library.
+.Pp
+The format of each line is:
+.Pp
+.Dl [prog:]command [arg ...]
+.Pp
+.Ar command
+is one of the
+.Xr editline 3
+builtin commands.
+Refer to
+.Sx BUILTIN COMMANDS
+for more information.
+.Pp
+.Ar prog
+is the program name string that a program defines when it calls
+.Xr el_init 3
+to set up
+.Xr editline 3 ,
+which is usually
+.Va argv[0] .
+.Ar command
+will be executed for any program which matches
+.Ar prog .
+.Pp
+.Ar prog
+may also be a
+.Xr regex 3
+style
+regular expression, in which case
+.Ar command
+will be executed for any program that matches the regular expression.
+.Pp
+If
+.Ar prog
+is absent,
+.Ar command
+is executed for all programs.
+.Sh BUILTIN COMMANDS
+The
+.Nm editline
+library has some builtin commands, which affect the way
+that the line editing and history functions operate.
+These are based on similar named builtins present in the
+.Xr tcsh 1
+shell.
+.Pp
+The following builtin commands are available:
+.Bl -tag -width 4n
+.It Ic bind Oo Fl aeklrsv Oc Op Ar key Op Ar command
+Without options and arguments, list all bound keys and macros, and
+the editor command or input string to which each one is bound.
+If only
+.Ar key
+is supplied, show the binding for that key or macro.
+If
+.Ar key command
+is supplied, bind the editor
+.Ar command
+to that key or macro.
+.Pp
+The options are as follows:
+.Bl -tag -width 4n
+.It Fl a
+List or change key bindings in the
+.Xr vi 1
+mode alternate (command mode) key map.
+.It Fl e
+Bind all keys to the standard GNU Emacs-like bindings.
+.It Fl k
+.Ar key
+is interpreted as a symbolic arrow key name, which may be one of
+.Sq up ,
+.Sq down ,
+.Sq left
+or
+.Sq right .
+.It Fl l
+List all editor commands and a short description of each.
+.It Fl r
+Remove the binding of the key or macro
+.Ar key .
+.It Fl s
+Define a keyboard macro rather than a key binding or command macro:
+.Ar command
+is taken as a literal string and appended to the input queue whenever
+.Ar key
+is typed.
+Bound keys and macros in
+.Ar command
+are themselves reinterpreted, and this continues for ten levels of
+interpretation.
+.It Fl v
+Bind all keys to the standard
+.Xr vi 1 Ns -like
+bindings.
+.El
+.Pp
+The
+.Xr editline 7
+manual documents all editor commands and contains more information
+about macros and the input queue.
+.Pp
+.Ar key
+and
+.Ar command
+can contain control characters of the form
+.Sm off
+.Sq No ^ Ar character
+.Sm on
+.Po
+e.g.\&
+.Sq ^A
+.Pc ,
+and the following backslashed escape sequences:
+.Pp
+.Bl -tag -compact -offset indent -width 4n
+.It Ic \ea
+Bell
+.It Ic \eb
+Backspace
+.It Ic \ee
+Escape
+.It Ic \ef
+Formfeed
+.It Ic \en
+Newline
+.It Ic \er
+Carriage return
+.It Ic \et
+Horizontal tab
+.It Ic \ev
+Vertical tab
+.Sm off
+.It Sy \e Ar nnn
+.Sm on
+The ASCII character corresponding to the octal number
+.Ar nnn .
+.El
+.Pp
+.Sq \e
+nullifies the special meaning of the following character,
+if it has any, notably
+.Sq \e
+and
+.Sq ^ .
+.It Ic echotc Oo Fl sv Oc Ar arg Ar ...
+Exercise terminal capabilities given in
+.Ar arg ... .
+If
+.Ar arg
+is
+.Sq baud ,
+.Sq cols ,
+.Sq lines ,
+.Sq rows ,
+.Sq meta ,
+or
+.Sq tabs ,
+the value of that capability is printed, with
+.Dq yes
+or
+.Dq no
+indicating that the terminal does or does not have that capability.
+.Pp
+.Fl s
+returns an empty string for non-existent capabilities, rather than
+causing an error.
+.Fl v
+causes messages to be verbose.
+.It Ic edit Op Li on | Li off
+Enable or disable the
+.Nm editline
+functionality in a program.
+.It Ic history Ar list | Ar size Dv n | Ar unique Dv n
+The
+.Ar list
+command lists all entries in the history.
+The
+.Ar size
+command sets the history size to
+.Dv n
+entries.
+The
+.Ar unique
+command controls if history should keep duplicate entries.
+If
+.Dv n
+is non zero, only keep unique history entries.
+If
+.Dv n
+is zero, then keep all entries (the default).
+.It Ic settc Ar cap Ar val
+Set the terminal capability
+.Ar cap
+to
+.Ar val ,
+as defined in
+.Xr termcap 5 .
+No sanity checking is done.
+.It Ic setty Oo Fl a Oc Oo Fl d Oc Oo Fl q Oc Oo Fl x Oc Oo Ar +mode Oc \
+Oo Ar -mode Oc Oo Ar mode Oc Oo Ar char=c Oc
+Control which tty modes that
+.Nm
+won't allow the user to change.
+.Fl d ,
+.Fl q
+or
+.Fl x
+tells
+.Ic setty
+to act on the
+.Sq edit ,
+.Sq quote
+or
+.Sq execute
+set of tty modes respectively; defaulting to
+.Fl x .
+.Pp
+Without other arguments,
+.Ic setty
+lists the modes in the chosen set which are fixed on
+.Po
+.Sq +mode
+.Pc
+or off
+.Po
+.Sq -mode
+.Pc .
+.Fl a
+lists all tty modes in the chosen set regardless of the setting.
+With
+.Ar +mode ,
+.Ar -mode
+or
+.Ar mode ,
+fixes
+.Ar mode
+on or off or removes control of
+.Ar mode
+in the chosen set.
+.Pp
+.Ic Setty
+can also be used to set tty characters to particular values using
+.Ar char=value .
+If
+.Ar value
+is empty
+then the character is set to
+.Dv _POSIX_VDISABLE .
+.It Ic telltc
+List the values of all the terminal capabilities (see
+.Xr termcap 5 ) .
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width "~/.editrcXXX"
+.It Ev EDITRC
+Names the default configuration file for the
+.Xr editline 3
+library.
+.El
+.Sh FILES
+.Bl -tag -width "~/.editrcXXX"
+.It Pa ~/.editrc
+Last resort, if no other file is specified,
+user configuration file for the
+.Xr editline 3
+library.
+.El
+.Sh SEE ALSO
+.Xr editline 3 ,
+.Xr regex 3 ,
+.Xr termcap 5 ,
+.Xr editline 7
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm editline
+library was written by
+.An Christos Zoulas ,
+and this manual was written by
+.An Luke Mewburn ,
+with some sections inspired by
+.Xr tcsh 1 .
diff --git a/extra/libedit/libedit-20221030-3.1/doc/mdoc2man.awk b/extra/libedit/libedit-20221030-3.1/doc/mdoc2man.awk
new file mode 100644
index 000000000000..e21753f44904
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/doc/mdoc2man.awk
@@ -0,0 +1,459 @@
+#!/usr/bin/awk
+#
+# Version history:
+#  v3, I put the program under a proper license
+#      Dan Nelson <dnelson@allantgroup.com> added .An, .Aq and fixed a typo
+#  v2, fixed to work on GNU awk --posix and MacOS X
+#  v1, first attempt, didn't work on MacOS X
+#
+# Copyright (c) 2003 Peter Stuge <stuge-mdoc2man@cdy.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+BEGIN {
+  optlist=0
+  oldoptlist=0
+  nospace=0
+  synopsis=0
+  reference=0
+  block=0
+  ext=0
+  extopt=0
+  literal=0
+  prenl=0
+  breakw=0
+  line=""
+  proto=0
+  bl_level=0
+}
+
+function wtail() {
+  retval=""
+  while(w<nwords) {
+    if(length(retval))
+      retval=retval OFS
+    retval=retval words[++w]
+  }
+  return retval
+}
+
+function add(str) {
+  for(;prenl;prenl--)
+    line=line "\n"
+  line=line str
+}
+
+! /^\./ {
+  for(;prenl;prenl--)
+    print ""
+  print
+  if(literal)
+    print ".br"
+  next
+}
+
+/^\.\\"/ { next }
+
+{
+  option=0
+  parens=0
+  angles=0
+  sub("^\\.","")
+  nwords=split($0,words)
+  for(w=1;w<=nwords;w++) {
+    skip=0
+    if(match(words[w],"^Li|Pf$")) {
+      skip=1
+    } else if(match(words[w],"^Xo$")) {
+      skip=1
+      ext=1
+      if(length(line)&&!(match(line," $")||prenl))
+	add(OFS)
+    } else if(match(words[w],"^Xc$")) {
+      skip=1
+      ext=0
+      if(!extopt)
+	prenl++
+      w=nwords
+    } else if(match(words[w],"^Bd$")) {
+      skip=1
+      if(match(words[w+1],"-literal")) {
+	literal=1
+	prenl++
+	w=nwords
+      }
+    } else if(match(words[w],"^Po$")) {
+      skip=1
+      add("(")
+      if(!nospace)
+	nospace=1
+    } else if(match(words[w],"^Pc$")) {
+      skip=1
+      add(")")
+      if(!nospace)
+	nospace=1
+    } else if(match(words[w],"^Ed$")) {
+      skip=1
+      literal=0
+    } else if(match(words[w],"^Ns$")) {
+      skip=1
+      if(!nospace)
+	nospace=1
+      sub(" $","",line)
+    } else if(match(words[w],"^No$")) {
+      skip=1
+      sub(" $","",line)
+      add(words[++w])
+    } else if(match(words[w],"^Dq$")) {
+      skip=1
+      add("``")
+      add(words[++w])
+      while(w<nwords&&!match(words[w+1],"^[\\.,]"))
+	add(OFS words[++w])
+      add("''")
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Va$")) {
+      skip=1
+      add("\\fI" words[++w])
+      while(w<nwords&&!match(words[w+1],"^[\\.,]"))
+	add(OFS words[++w])
+      add("\\fP")
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Sq|Ql$")) {
+      skip=1
+      add("`" words[++w] "'")
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Oo$")) {
+      skip=1
+      extopt=1
+      if(!nospace)
+	nospace=1
+      add("[")
+    } else if(match(words[w],"^Oc$")) {
+      skip=1
+      extopt=0
+      add("]")
+    }
+    if(!skip) {
+      if(!nospace&&length(line)&&!(match(line," $")||prenl))
+	add(OFS)
+      if(nospace==1)
+	nospace=0
+    }
+    if(match(words[w],"^Dd$")) {
+      date=wtail()
+      next
+    } else if(match(words[w],"^Dt$")) {
+      id=wtail()
+      next
+    } else if(match(words[w],"^Os$")) {
+      add(".TH " id " \"" date "\" \"" wtail() "\"")
+    } else if(match(words[w],"^Sh$")) {
+      add(".SH")
+      synopsis=match(words[w+1],"SYNOPSIS")
+    } else if(match(words[w],"^Xr$")) {
+      #add("\\fB" words[++w] "\\fP(" words[++w] ")" words[++w])
+      add("\\fB" words[++w] "\\fP(" words[++w] ")")
+      sub("^Ns$", "", words[w+1])
+      add(words[++w])
+    } else if(match(words[w],"^Rs$")) {
+      split("",refauthors)
+      nrefauthors=0
+      reftitle=""
+      refissue=""
+      refdate=""
+      refopt=""
+      reference=1
+      next
+    } else if(match(words[w],"^Re$")) {
+      prenl++
+      for(i=nrefauthors-1;i>0;i--) {
+	add(refauthors[i])
+	if(i>1)
+	  add(", ")
+      }
+      if(nrefauthors>1)
+	add(" and ")
+      add(refauthors[0] ", \\fI" reftitle "\\fP")
+      if(length(refissue))
+	add(", " refissue)
+      if(length(refdate))
+	add(", " refdate)
+      if(length(refopt))
+	add(", " refopt)
+      add(".")
+      reference=0
+    } else if(reference) {
+      if(match(words[w],"^%A$")) { refauthors[nrefauthors++]=wtail() }
+      if(match(words[w],"^%T$")) {
+	reftitle=wtail()
+	sub("^\"","",reftitle)
+	sub("\"$","",reftitle)
+      }
+      if(match(words[w],"^%N$")) { refissue=wtail() }
+      if(match(words[w],"^%D$")) { refdate=wtail() }
+      if(match(words[w],"^%O$")) { refopt=wtail() }
+    } else if(match(words[w],"^Nm$")) {
+      if(synopsis) {
+	add(".br")
+	prenl++
+      }
+      n=words[++w]
+      if(!length(name))
+	name=n
+      if(!length(n))
+	n=name
+      add("\\fB" n "\\fP")
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Nd$")) {
+      add("\\- " wtail())
+    } else if(match(words[w],"^Fl$")) {
+      add("\\fB\\-" words[++w] "\\fP")
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Ar$")) {
+      add("\\fI")
+      if(w==nwords)
+	add("file ...\\fP")
+      else {
+	add(words[++w] "\\fP")
+	while(match(words[w+1],"^\\|$"))
+	  add(OFS words[++w] " \\fI" words[++w] "\\fP")
+      }
+      if(!nospace&&match(words[w+1],"^[\\.,]"))
+	nospace=1
+    } else if(match(words[w],"^Cm$")) {
+      add("\\fB" words[++w] "\\fP")
+      while(w<nwords&&match(words[w+1],"^[\\.,:;)]"))
+	add(words[++w])
+    } else if(match(words[w],"^Op$")) {
+      option=1
+      if(!nospace)
+	nospace=1
+      add("[")
+    } else if(match(words[w],"^Pp$")) {
+      prenl++
+    } else if(match(words[w],"^An$")) {
+      prenl++
+    } else if(match(words[w],"^Ss$")) {
+      add(".SS")
+    } else if(match(words[w],"^Pa$")&&!option) {
+      add("\\fI")
+      w++
+      if(match(words[w],"^\\."))
+	add("\\&")
+      add(words[w] "\\fP")
+      while(w<nwords&&match(words[w+1],"^[\\.,:;)]"))
+	add(words[++w])
+    } else if(match(words[w],"^Dv$")) {
+      #add(".BR")
+    } else if(match(words[w],"^Em|Ev$")) {
+      add(".IR")
+    } else if(match(words[w],"^Pq$")) {
+      add("(")
+      nospace=1
+      parens=1
+    } else if(match(words[w],"^Aq$")) {
+      add("<")
+      nospace=1
+      angles=1
+    } else if(match(words[w],"^S[xy]$")) {
+      add(".B " wtail())
+    } else if(match(words[w],"^Ic$")) {
+      plain=1
+      add("\\fB")
+      while(w<nwords) {
+	w++
+	if(match(words[w],"^Op$")) {
+	  w++
+	  add("[")
+	  words[nwords]=words[nwords] "]"
+	}
+	if(match(words[w],"^Ar$")) {
+	  add("\\fI" words[++w] "\\fP")
+	} else if(match(words[w],"^[\\.,]")) {
+	  sub(" $","",line)
+	  if(plain) {
+	    add("\\fP")
+	    plain=0
+	  }
+	  add(words[w])
+	} else if(match(words[w],"^Xo$")) {
+	} else {
+	  if(!plain) {
+	    add("\\fB")
+	    plain=1
+	  }
+	  add(words[w])
+	}
+	if(!nospace)
+	  add(OFS)
+      }
+      sub(" $","",line)
+      if(plain)
+	add("\\fP")
+    } else if(match(words[w],"^Dl$")) {
+       ## remove is ok for editrc.5
+    } else if(match(words[w],"^Bl$")) {
+      ++bl_level
+      if (bl_level > 1)
+         add(".RS")
+      oldoptlist=optlist
+      if(match(words[w+1],"-bullet"))
+	optlist=1
+      else if(match(words[w+1],"-enum")) {
+	optlist=2
+	enum=0
+      } else if(match(words[w+1],"-tag"))
+	optlist=3
+      else if(match(words[w+1],"-item"))
+	optlist=4
+      else if(match(words[w+1],"-bullet"))
+	optlist=1
+      w=nwords
+    } else if(match(words[w],"^El$")) {
+      if (bl_level > 1)
+         add(".RE")
+      --bl_level
+      optlist=oldoptlist
+    } else if(match(words[w],"^Bk$")) {
+      if(match(words[w+1],"-words")) {
+	w++
+	breakw=1
+      }
+    } else if(match(words[w],"^Ek$")) {
+      breakw=0
+    } else if(match(words[w],"^It$")&&optlist) {
+      if(optlist==1)
+	add(".IP \\(bu")
+      else if(optlist==2)
+	add(".IP " ++enum ".")
+      else if(optlist==3) {
+	add(".TP")
+	prenl++
+	if(match(words[w+1],"^Pa$|^Ev$")) {
+	  add(".B")
+	  w++
+	}
+      } else if(optlist==4)
+	add(".IP")
+    } else if(match(words[w],"^Sm$")) {
+      if(match(words[w+1],"off"))
+	nospace=2
+      else if(match(words[w+1],"on"))
+	nospace=0
+      w++
+    } else if(match(words[w],"^Lb$")) {
+      wtail()
+      add("Command Line Editor Library (libedit, -ledit)")
+    } else if(match(words[w],"^In$")) {
+      add(".PP\n")
+      add("\\fB#include <" wtail() ">\\fP")
+    } else if(match(words[w],"^Ft$")) {
+      add(".PP\n")
+      add("\\fI" wtail() "\\fP\n")
+      add(".br")
+      proto=1
+    } else if(match(words[w],"^Fn$")) {
+      add("\\fB" words[++w] "\\fP(")
+      punct=0
+      while(++w<=nwords) {
+         if(match(words[w], "^\".*\"$")) {
+            sub("^\"", "", words[w])
+            sub("\"$", "", words[w])
+	    add("\\fI" words[w] "\\fP")
+            if (w!=nwords) {
+	       add(", ")
+            }
+         } else if(match(words[w], "^\"")) {
+            sub("^\"", "", words[w])
+	    add("\\fI" words[w] " ")
+         } else if (match(words[w], "\"$")) {
+            sub("\"$", "", words[w])
+	    add(words[w] "\\fP")
+            if (w!=nwords) {
+	       add(", ")
+            }
+         } else {
+            if (w==nwords&&(match(words[w], "^[.,]$"))) {
+               punct=1
+            } else {
+	       add(words[w] " ")
+            }
+               
+         }
+      }
+      add(")")
+      if (punct==1) {
+         add(words[w-1])
+      } else {
+         if (proto==1) {
+            add(";")
+            proto=0
+         }
+      }
+    } else if(match(words[w],"^Fa$")) {
+      punct=0
+      add("\\fI")
+      while(++w<=nwords) {
+         if(match(words[w], "^\".*\"$")) {
+            sub("^\"", "", words[w])
+            sub("\"$", "", words[w])
+	    add(words[w])
+         } else if(match(words[w], "^\"")) {
+            sub("^\"", "", words[w])
+	    add(words[w] " ")
+         } else if (match(words[w], "\"$")) {
+            sub("\"$", "", words[w])
+	    add(words[w])
+         } else {
+            if (w==nwords&&(match(words[w], "^[.,]$"))) {
+               punct=1
+            } else {
+               if (w+1==nwords&&(match(words[w+1], "^[.,]$"))) {
+	          add(words[w])
+               } else {
+	          add(words[w] " ")
+               }
+            }
+         }
+      }
+      add("\\fP")
+      if (punct==1) {
+         add(words[w-1])
+      }
+    } else if(!skip) {
+      add(words[w])
+    }
+  }
+  if(match(line,"^\\.[^a-zA-Z]"))
+    sub("^\\.","",line)
+  if(parens)
+    add(")")
+  if(angles)
+    add(">")
+  if(option)
+    add("]")
+  if(ext&&!extopt&&!match(line," $"))
+    add(OFS)
+  if(!ext&&!extopt&&length(line)) {
+    print line
+    prenl=0
+    line=""
+  }
+}
diff --git a/extra/libedit/libedit-20221030-3.1/examples/Makefile.am b/extra/libedit/libedit-20221030-3.1/examples/Makefile.am
new file mode 100644
index 000000000000..cbee508cbb60
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/Makefile.am
@@ -0,0 +1,13 @@
+
+LDADD = $(top_builddir)/src/libedit.la
+AM_CFLAGS = -I$(top_srcdir)/src
+
+noinst_PROGRAMS  = tc1 fileman
+
+tc1_SOURCES      = tc1.c
+fileman_SOURCES  = fileman.c
+
+noinst_PROGRAMS += wtc1
+wtc1_SOURCES     = wtc1.c
+
+EXTRA_DIST = fuzz1.c
diff --git a/extra/libedit/libedit-20221030-3.1/examples/Makefile.in b/extra/libedit/libedit-20221030-3.1/examples/Makefile.in
new file mode 100644
index 000000000000..e337394ed681
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/Makefile.in
@@ -0,0 +1,625 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = tc1$(EXEEXT) fileman$(EXEEXT) wtc1$(EXEEXT)
+subdir = examples
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_fileman_OBJECTS = fileman.$(OBJEXT)
+fileman_OBJECTS = $(am_fileman_OBJECTS)
+fileman_LDADD = $(LDADD)
+fileman_DEPENDENCIES = $(top_builddir)/src/libedit.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_tc1_OBJECTS = tc1.$(OBJEXT)
+tc1_OBJECTS = $(am_tc1_OBJECTS)
+tc1_LDADD = $(LDADD)
+tc1_DEPENDENCIES = $(top_builddir)/src/libedit.la
+am_wtc1_OBJECTS = wtc1.$(OBJEXT)
+wtc1_OBJECTS = $(am_wtc1_OBJECTS)
+wtc1_LDADD = $(LDADD)
+wtc1_DEPENDENCIES = $(top_builddir)/src/libedit.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fileman.Po ./$(DEPDIR)/tc1.Po \
+	./$(DEPDIR)/wtc1.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(fileman_SOURCES) $(tc1_SOURCES) $(wtc1_SOURCES)
+DIST_SOURCES = $(fileman_SOURCES) $(tc1_SOURCES) $(wtc1_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION = @LT_VERSION@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTYPE = @MANTYPE@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+LDADD = $(top_builddir)/src/libedit.la
+AM_CFLAGS = -I$(top_srcdir)/src
+tc1_SOURCES = tc1.c
+fileman_SOURCES = fileman.c
+wtc1_SOURCES = wtc1.c
+EXTRA_DIST = fuzz1.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu examples/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+fileman$(EXEEXT): $(fileman_OBJECTS) $(fileman_DEPENDENCIES) $(EXTRA_fileman_DEPENDENCIES) 
+	@rm -f fileman$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(fileman_OBJECTS) $(fileman_LDADD) $(LIBS)
+
+tc1$(EXEEXT): $(tc1_OBJECTS) $(tc1_DEPENDENCIES) $(EXTRA_tc1_DEPENDENCIES) 
+	@rm -f tc1$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(tc1_OBJECTS) $(tc1_LDADD) $(LIBS)
+
+wtc1$(EXEEXT): $(wtc1_OBJECTS) $(wtc1_DEPENDENCIES) $(EXTRA_wtc1_DEPENDENCIES) 
+	@rm -f wtc1$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(wtc1_OBJECTS) $(wtc1_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileman.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wtc1.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/fileman.Po
+	-rm -f ./$(DEPDIR)/tc1.Po
+	-rm -f ./$(DEPDIR)/wtc1.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/fileman.Po
+	-rm -f ./$(DEPDIR)/tc1.Po
+	-rm -f ./$(DEPDIR)/wtc1.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/extra/libedit/libedit-20221030-3.1/examples/fileman.c b/extra/libedit/libedit-20221030-3.1/examples/fileman.c
new file mode 100644
index 000000000000..974a7ccd0bb6
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/fileman.c
@@ -0,0 +1,496 @@
+/* fileman.c -- A tiny application which demonstrates how to use the
+   GNU Readline library.  This application interactively allows users
+   to manipulate files and their modes.
+
+   NOTE: this was taken from the GNU Readline documentation and ported
+   to libedit. A command to output the history list was added.
+   
+   */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <locale.h>
+#include <time.h>
+
+/* GNU readline
+#include <readline/readline.h>
+#include <readline/history.h>
+*/
+#include <editline/readline.h>
+
+void * xmalloc (size_t size);
+void too_dangerous (char *caller);
+void initialize_readline ();
+int execute_line (char *line);
+int valid_argument (char *caller, char *arg);
+
+typedef int rl_icpfunc_t (char *);
+
+/* The names of functions that actually do the manipulation. */
+int com_list (char *);
+int com_view (char *);
+int com_history (char *);
+int com_rename(char *);
+int com_stat(char *);
+int com_pwd(char *);
+int com_delete(char *);
+int com_help(char *);
+int com_cd(char *);
+int com_quit(char *);
+
+/* A structure which contains information on the commands this program
+   can understand. */
+
+typedef struct {
+   char *name;                   /* User printable name of the function. */
+   rl_icpfunc_t *func;           /* Function to call to do the job. */
+   char *doc;                    /* Documentation for this function.  */
+} COMMAND;
+
+COMMAND commands[] = {
+   { "cd", com_cd, "Change to directory DIR" },
+   { "delete", com_delete, "Delete FILE" },
+   { "help", com_help, "Display this text" },
+   { "?", com_help, "Synonym for `help'" },
+   { "list", com_list, "List files in DIR" },
+   { "ls", com_list, "Synonym for `list'" },
+   { "pwd", com_pwd, "Print the current working directory" },
+   { "quit", com_quit, "Quit using Fileman" },
+   { "rename", com_rename, "Rename FILE to NEWNAME" },
+   { "stat", com_stat, "Print out statistics on FILE" },
+   { "view", com_view, "View the contents of FILE" },
+   { "history", com_history, "List editline history" },
+   { (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
+};
+
+/* Forward declarations. */
+char *stripwhite ();
+COMMAND *find_command ();
+
+/* The name of this program, as taken from argv[0]. */
+char *progname;
+
+/* When non-zero, this means the user is done using this program. */
+int done;
+
+char *
+dupstr (char* s)
+{
+   char *r;
+
+   r = xmalloc (strlen (s) + 1);
+   strcpy (r, s);
+   return (r);
+}
+
+int
+main (int argc __attribute__((__unused__)), char **argv)
+{
+   char *line, *s;
+
+   progname = argv[0];
+
+   setlocale(LC_CTYPE, "");
+
+   initialize_readline();       /* Bind our completer. */
+
+   stifle_history(7);
+
+   /* Loop reading and executing lines until the user quits. */
+   for ( ; done == 0; )
+   {
+      line = readline ("FileMan: ");
+
+      if (!line)
+         break;
+
+      /* Remove leading and trailing whitespace from the line.
+         Then, if there is anything left, add it to the history list
+         and execute it. */
+      s = stripwhite(line);
+
+      if (*s) {
+
+         char* expansion;
+         int result;
+
+         result = history_expand(s, &expansion);
+
+         if (result < 0 || result == 2) {
+            fprintf(stderr, "%s\n", expansion);
+         } else {
+            add_history(expansion);
+            execute_line(expansion);
+         }
+         free(expansion);
+      }
+
+      free(line);
+   }
+   exit (0);
+
+   return 0;
+}
+
+/* Execute a command line. */
+int
+execute_line (char *line)
+{
+   register int i;
+   COMMAND *command;
+   char *word;
+
+   /* Isolate the command word. */
+   i = 0;
+   while (line[i] && isspace (line[i]))
+      i++;
+   word = line + i;
+
+   while (line[i] && !isspace (line[i]))
+      i++;
+
+   if (line[i])
+      line[i++] = '\0';
+
+   command = find_command (word);
+
+   if (!command)
+   {
+      fprintf (stderr, "%s: No such command for FileMan.\n", word);
+      return (-1);
+   }
+
+   /* Get argument to command, if any. */
+   while (isspace (line[i]))
+      i++;
+
+   word = line + i;
+
+   /* Call the function. */
+   return ((*(command->func)) (word));
+}
+
+/* Look up NAME as the name of a command, and return a pointer to that
+   command.  Return a NULL pointer if NAME isn't a command name. */
+COMMAND *
+find_command (char *name)
+{
+   register int i;
+
+   for (i = 0; commands[i].name; i++)
+      if (strcmp (name, commands[i].name) == 0)
+         return (&commands[i]);
+
+   return ((COMMAND *)NULL);
+}
+
+/* Strip whitespace from the start and end of STRING.  Return a pointer
+   into STRING. */
+char *
+stripwhite (char *string)
+{
+   register char *s, *t;
+
+   for (s = string; isspace (*s); s++)
+      ;
+
+   if (*s == 0)
+      return (s);
+
+   t = s + strlen (s) - 1;
+   while (t > s && isspace (*t))
+      t--;
+   *++t = '\0';
+
+   return s;
+}
+
+/* **************************************************************** */
+/*                                                                  */
+/*                  Interface to Readline Completion                */
+/*                                                                  */
+/* **************************************************************** */
+
+char *command_generator(const char *, int);
+char **fileman_completion(const char *, int, int);
+
+/* Tell the GNU Readline library how to complete.  We want to try to
+   complete on command names if this is the first word in the line, or
+   on filenames if not. */
+void
+initialize_readline ()
+{
+   /* Allow conditional parsing of the ~/.inputrc file. */
+   rl_readline_name = "FileMan";
+
+   /* Tell the completer that we want a crack first. */
+   rl_attempted_completion_function = fileman_completion;
+}
+
+/* Attempt to complete on the contents of TEXT.  START and END
+   bound the region of rl_line_buffer that contains the word to
+   complete.  TEXT is the word to complete.  We can use the entire
+   contents of rl_line_buffer in case we want to do some simple
+   parsing.  Returnthe array of matches, or NULL if there aren't any. */
+char **
+fileman_completion (const char* text, int start, int end __attribute__((__unused__)))
+{
+   char **matches;
+
+   matches = (char **)NULL;
+
+   /* If this word is at the start of the line, then it is a command
+      to complete.  Otherwise it is the name of a file in the current
+      directory. */
+   if (start == 0)
+      /* TODO */
+      matches = completion_matches ((char*)text, command_generator);
+      /* matches = rl_completion_matches (text, command_generator); */
+
+   return (matches);
+}
+
+/* Generator function for command completion.  STATE lets us
+   know whether to start from scratch; without any state
+   (i.e. STATE == 0), then we start at the top of the list. */
+char *
+command_generator (text, state)
+   const char *text;
+   int state;
+{
+   static int list_index, len;
+   char *name;
+
+   /* If this is a new word to complete, initialize now.  This
+      includes saving the length of TEXT for efficiency, and
+      initializing the index variable to 0. */
+   if (!state)
+   {
+      list_index = 0;
+      len = strlen (text);
+   }
+
+   /* Return the next name which partially matches from the
+      command list. */
+   while ((name = commands[list_index].name))
+   {
+      list_index++;
+
+      if (strncmp (name, text, len) == 0)
+         return (dupstr(name));
+   }
+
+   /* If no names matched, then return NULL. */
+   return ((char *)NULL);
+}
+
+/* **************************************************************** */
+/*                                                                  */
+/*                       FileMan Commands                           */
+/*                                                                  */
+/* **************************************************************** */
+
+/* String to pass to system ().  This is for the LIST, VIEW and RENAME
+   commands. */
+static char syscom[1024];
+
+/* List the file(s) named in arg. */
+int
+com_list (char *arg)
+{
+   if (!arg)
+      arg = "";
+
+   sprintf (syscom, "ls -FClg %s", arg);
+   return (system (syscom));
+}
+
+int
+com_view (char *arg)
+{
+   if (!valid_argument ("view", arg))
+      return 1;
+
+   sprintf (syscom, "more %s", arg);
+   return (system (syscom));
+}
+
+int
+com_history(char* arg __attribute__((__unused__)))
+{
+   HIST_ENTRY *he;
+
+   /* rewind history */
+   while (previous_history())
+      ;
+
+   for (he = current_history(); he != NULL; he = next_history()) {
+      //printf("%5d  %s\n", *((int*)he->data) - 1, he->line);
+      printf("%s\n", he->line);
+   }
+
+   return 0;
+}
+
+int
+com_rename (char *arg __attribute__((__unused__)))
+{
+   too_dangerous ("rename");
+   return (1);
+}
+
+int
+com_stat (char *arg)
+{
+   struct stat finfo;
+
+   if (!valid_argument ("stat", arg))
+      return (1);
+
+   if (stat (arg, &finfo) == -1)
+   {
+      perror (arg);
+      return (1);
+   }
+
+   printf ("Statistics for `%s':\n", arg);
+
+   printf ("%s has %ld link%s, and is %lld byte%s in length.\n", arg,
+         (long) finfo.st_nlink,
+         (finfo.st_nlink == 1) ? "" : "s",
+         (long long) finfo.st_size,
+         (finfo.st_size == 1) ? "" : "s");
+   printf ("Inode Last Change at: %s", ctime (&finfo.st_ctime));
+   printf ("      Last access at: %s", ctime (&finfo.st_atime));
+   printf ("    Last modified at: %s", ctime (&finfo.st_mtime));
+   return (0);
+}
+
+int
+com_delete (char *arg __attribute__((__unused__)))
+{
+   too_dangerous ("delete");
+   return (1);
+}
+
+/* Print out help for ARG, or for all of the commands if ARG is
+   not present. */
+int
+com_help (char *arg)
+{
+   register int i;
+   int printed = 0;
+
+   for (i = 0; commands[i].name; i++)
+   {
+      if (!*arg || (strcmp (arg, commands[i].name) == 0))
+      {
+         printf ("%s\t\t%s.\n", commands[i].name, commands[i].doc);
+         printed++;
+      }
+   }
+
+   if (!printed)
+   {
+      printf ("No commands match `%s'.  Possibilties are:\n", arg);
+
+      for (i = 0; commands[i].name; i++)
+      {
+         /* Print in six columns. */
+         if (printed == 6)
+         {
+            printed = 0;
+            printf ("\n");
+         }
+
+         printf ("%s\t", commands[i].name);
+         printed++;
+      }
+
+      if (printed)
+         printf ("\n");
+   }
+   return (0);
+}
+
+/* Change to the directory ARG. */
+int
+com_cd (char *arg)
+{
+   if (chdir (arg) == -1)
+   {
+      perror (arg);
+      return 1;
+   }
+
+   com_pwd ("");
+   return (0);
+}
+
+/* Print out the current working directory. */
+int
+com_pwd (char* ignore __attribute__((__unused__)))
+{
+   char dir[1024], *s;
+
+   s = (char*)getcwd(dir, sizeof(dir) - 1);
+   if (s == 0)
+   {
+      printf ("Error getting pwd: %s\n", dir);
+      return 1;
+   }
+
+   printf ("Current directory is %s\n", dir);
+   return 0;
+}
+
+/* The user wishes to quit using this program.  Just set DONE
+   non-zero. */
+int 
+com_quit (char *arg __attribute__((__unused__)))
+{
+   done = 1;
+   return (0);
+}
+
+/* Function which tells you that you can't do this. */
+void
+too_dangerous (char *caller)
+{
+   fprintf (stderr,
+         "%s: Too dangerous for me to distribute.\n",
+         caller);
+   fprintf (stderr, "Write it yourself.\n");
+}
+
+/* Return non-zero if ARG is a valid argument for CALLER,
+   else print an error message and return zero. */
+int
+valid_argument (char *caller, char *arg)
+{
+   if (!arg || !*arg)
+   {
+      fprintf (stderr, "%s: Argument required.\n", caller);
+      return (0);
+   }
+
+   return (1);
+}
+
+void *
+xmalloc (size_t size)
+{
+   register void *value = (void*)malloc(size);
+   if (value == 0)
+      fprintf(stderr, "virtual memory exhausted");
+   return value;
+}
+
+
diff --git a/extra/libedit/libedit-20221030-3.1/examples/fuzz1.c b/extra/libedit/libedit-20221030-3.1/examples/fuzz1.c
new file mode 100644
index 000000000000..e31d26538885
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/fuzz1.c
@@ -0,0 +1,63 @@
+/*
+ * build:
+ *   CC=clang CXX=clang++ CFLAGS="-fsanitize=address,fuzzer-no-link -g" \
+ *   	CXXFLAGS="-fsanitize=address,fuzzer-no-link -g" ./configure && make
+ * run:
+ *   LD_LIBRARY_PATH=../src/.libs/ .libs/fuzz1 -max_len=32 \
+ *	-use_value_profile=1 -only_ascii=1
+ */
+#include <readline/readline.h>
+#include <locale.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int init = 0;
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+  if (!Size)
+    return 0;
+
+  if (!init) {
+    setlocale(LC_CTYPE, "");
+    stifle_history(7);
+    init = 1;
+  }
+
+  clear_history();
+
+  size_t lasti = 0;
+
+  for (size_t i = 0;; ++i) {
+    if (i == Size || Data[i] == '\n') {
+      if (i - lasti) {
+        char *s = (char *)malloc(i - lasti + 1);
+        memcpy(s, &Data[lasti], i - lasti);
+        s[i - lasti] = '\0';
+
+        char *expansion;
+        int result;
+
+#ifdef DEBUG
+        fprintf(stderr, "Calling history_expand: >%s<\n", s);
+#endif
+        result = history_expand(s, &expansion);
+
+        if (result < 0 || result == 2) {
+          /* Errors ignored */
+        } else {
+          add_history(expansion);
+        }
+        free(expansion);
+        free(s);
+      }
+      lasti = i + 1;
+    }
+
+    if (i == Size)
+      break;
+  }
+
+  return 0;
+}
diff --git a/extra/libedit/libedit-20221030-3.1/examples/tc1.c b/extra/libedit/libedit-20221030-3.1/examples/tc1.c
new file mode 100644
index 000000000000..3061038b711e
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/tc1.c
@@ -0,0 +1,309 @@
+/*	$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
+#endif /* not lint */
+
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/* from src/sys/sys/cdefs.h */
+#ifndef __UNCONST
+# define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
+#endif
+
+/*
+ * test.c: A little test program
+ */
+#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "histedit.h"
+
+static int continuation = 0;
+volatile sig_atomic_t gotsig = 0;
+
+static	unsigned char	complete(EditLine *, int);
+	int	main(int, char **);
+static	char   *prompt(EditLine *);
+static	void	sig(int);
+
+static char *
+prompt(EditLine *el __attribute__((__unused__)))
+{
+	static char a[] = "\1\033[7m\1Edit$\1\033[0m\1 ";
+	static char b[] = "Edit> ";
+
+	return (continuation ? b : a);
+}
+
+static void
+sig(int i)
+{
+	gotsig = i;
+}
+
+static unsigned char
+complete(EditLine *el, int ch __attribute__((__unused__)))
+{
+	DIR *dd = opendir(".");
+	struct dirent *dp;
+	const char* ptr;
+	const LineInfo *lf = el_line(el);
+	size_t len;
+	int res = CC_ERROR;
+
+	/*
+	 * Find the last word
+	 */
+	for (ptr = lf->cursor - 1;
+	    !isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
+		continue;
+	len = lf->cursor - ++ptr;
+
+	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
+		if (len > strlen(dp->d_name))
+			continue;
+		if (strncmp(dp->d_name, ptr, len) == 0) {
+			if (el_insertstr(el, &dp->d_name[len]) == -1)
+				res = CC_ERROR;
+			else
+				res = CC_REFRESH;
+			break;
+		}
+	}
+
+	closedir(dd);
+	return res;
+}
+
+int
+main(int argc __attribute__((__unused__)), char *argv[])
+{
+	EditLine *el = NULL;
+	int num;
+	const char *buf;
+	Tokenizer *tok;
+#if 0
+	int lastevent = 0;
+#endif
+	int ncontinuation;
+	History *hist;
+	HistEvent ev;
+
+	(void) setlocale(LC_CTYPE, "");
+	(void) signal(SIGINT, sig);
+	(void) signal(SIGQUIT, sig);
+	(void) signal(SIGHUP, sig);
+	(void) signal(SIGTERM, sig);
+
+	hist = history_init();		/* Init the builtin history	*/
+					/* Remember 100 events		*/
+	history(hist, &ev, H_SETSIZE, 100);
+
+	tok  = tok_init(NULL);		/* Initialize the tokenizer	*/
+
+					/* Initialize editline		*/
+	el = el_init(*argv, stdin, stdout, stderr);
+
+	el_set(el, EL_EDITOR, "vi");	/* Default editor is vi		*/
+	el_set(el, EL_SIGNAL, 1);	/* Handle signals gracefully	*/
+	el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
+
+			/* Tell editline to use this history interface	*/
+	el_set(el, EL_HIST, history, hist);
+
+					/* Add a user-defined function	*/
+	el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
+
+					/* Bind tab to it		*/
+	el_set(el, EL_BIND, "^I", "ed-complete", NULL);
+
+	/*
+	 * Bind j, k in vi command mode to previous and next line, instead
+	 * of previous and next history.
+	 */
+	el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
+	el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
+
+	/*
+	 * Source the user's defaults file.
+	 */
+	el_source(el, NULL);
+
+	while ((buf = el_gets(el, &num)) != NULL && num != 0)  {
+		int ac, cc, co;
+#ifdef DEBUG
+		int i;
+#endif
+		const char **av;
+		const LineInfo *li;
+		li = el_line(el);
+#ifdef DEBUG
+		(void) fprintf(stderr, "==> got %d %s", num, buf);
+		(void) fprintf(stderr, "  > li `%.*s_%.*s'\n",
+		    (li->cursor - li->buffer), li->buffer,
+		    (li->lastchar - 1 - li->cursor),
+		    (li->cursor >= li->lastchar) ? "" : li->cursor);
+
+#endif
+		if (gotsig) {
+			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
+			gotsig = 0;
+			el_reset(el);
+		}
+
+		if (!continuation && num == 1)
+			continue;
+
+		ac = cc = co = 0;
+		ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
+		if (ncontinuation < 0) {
+			(void) fprintf(stderr, "Internal error\n");
+			continuation = 0;
+			continue;
+		}
+#ifdef DEBUG
+		(void) fprintf(stderr, "  > nc %d ac %d cc %d co %d\n",
+		    ncontinuation, ac, cc, co);
+#endif
+#if 0
+		if (continuation) {
+			/*
+			 * Append to the right event in case the user
+			 * moved around in history.
+			 */
+			if (history(hist, &ev, H_SET, lastevent) == -1)
+				err(1, "%d: %s", lastevent, ev.str);
+			history(hist, &ev, H_ADD , buf);
+		} else {
+			history(hist, &ev, H_ENTER, buf);
+			lastevent = ev.num;
+		}
+#else
+				/* Simpler */
+		history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
+#endif
+
+		continuation = ncontinuation;
+		ncontinuation = 0;
+		if (continuation)
+			continue;
+#ifdef DEBUG
+		for (i = 0; i < ac; i++) {
+			(void) fprintf(stderr, "  > arg# %2d ", i);
+			if (i != cc)
+				(void) fprintf(stderr, "`%s'\n", av[i]);
+			else
+				(void) fprintf(stderr, "`%.*s_%s'\n",
+				    co, av[i], av[i] + co);
+		}
+#endif
+
+		if (strcmp(av[0], "history") == 0) {
+			int rv;
+
+			switch (ac) {
+			case 1:
+				for (rv = history(hist, &ev, H_LAST); rv != -1;
+				    rv = history(hist, &ev, H_PREV))
+					(void) fprintf(stdout, "%4d %s",
+					    ev.num, ev.str);
+				break;
+
+			case 2:
+				if (strcmp(av[1], "clear") == 0)
+					 history(hist, &ev, H_CLEAR);
+				else
+					 goto badhist;
+				break;
+
+			case 3:
+				if (strcmp(av[1], "load") == 0)
+					 history(hist, &ev, H_LOAD, av[2]);
+				else if (strcmp(av[1], "save") == 0)
+					 history(hist, &ev, H_SAVE, av[2]);
+				break;
+
+			badhist:
+			default:
+				(void) fprintf(stderr,
+				    "Bad history arguments\n");
+				break;
+			}
+		} else if (el_parse(el, ac, av) == -1) {
+			switch (fork()) {
+			case 0:
+				execvp(av[0], (char *const *)__UNCONST(av));
+				perror(av[0]);
+				_exit(1);
+				/*NOTREACHED*/
+				break;
+
+			case -1:
+				perror("fork");
+				break;
+
+			default:
+				if (wait(&num) == -1)
+					perror("wait");
+				(void) fprintf(stderr, "Exit %x\n", num);
+				break;
+			}
+		}
+
+		tok_reset(tok);
+	}
+
+	el_end(el);
+	tok_end(tok);
+	history_end(hist);
+
+	return (0);
+}
diff --git a/extra/libedit/libedit-20221030-3.1/examples/wtc1.c b/extra/libedit/libedit-20221030-3.1/examples/wtc1.c
new file mode 100644
index 000000000000..d4fab9a85198
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/examples/wtc1.c
@@ -0,0 +1,282 @@
+#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <limits.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <histedit.h>
+
+
+static int continuation;
+volatile sig_atomic_t gotsig;
+static const char hfile[] = ".whistory";
+
+static wchar_t *
+prompt(EditLine __attribute__((unused)) *el)
+{
+	static wchar_t a[] = L"\1\033[7m\1Edit$\1\033[0m\1 ";
+	static wchar_t b[] = L"Edit> ";
+
+	return continuation ? b : a;
+}
+
+
+static void
+sig(int i)
+{
+	gotsig = i;
+}
+
+const char *
+my_wcstombs(const wchar_t *wstr)
+{
+	static struct {
+		char *str;
+		int len;
+	} buf;
+
+	int needed = wcstombs(0, wstr, 0) + 1;
+	if (needed > buf.len) {
+		buf.str = malloc(needed);
+		buf.len = needed;
+	}
+	wcstombs(buf.str, wstr, needed);
+	buf.str[needed - 1] = 0;
+
+	return buf.str;
+}
+
+
+static unsigned char
+complete(EditLine *el, int __attribute__((unused)) ch)
+{
+	DIR *dd = opendir(".");
+	struct dirent *dp;
+	const wchar_t *ptr;
+	char *buf, *bptr;
+	const LineInfoW *lf = el_wline(el);
+	int len, i;
+	size_t mblen;
+	unsigned char res = 0;
+	wchar_t dir[1024];
+
+	/* Find the last word */
+	for (ptr = lf->cursor -1; !iswspace(*ptr) && ptr > lf->buffer; --ptr)
+		continue;
+	len = lf->cursor - ++ptr;
+
+	/* Convert last word to multibyte encoding, so we can compare to it */
+	wctomb(NULL, 0); /* Reset shift state */
+	mblen = MB_LEN_MAX * len + 1;
+	buf = bptr = malloc(mblen);
+	if (buf == NULL) {
+		fprintf(stderr, "malloc: %s\n", strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	for (i = 0; i < len; ++i) {
+		/* Note: really should test for -1 return from wctomb */
+		bptr += wctomb(bptr, ptr[i]);
+	}
+	*bptr = 0; /* Terminate multibyte string */
+	mblen = bptr - buf;
+
+	/* Scan directory for matching name */
+	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
+		if (mblen > strlen(dp->d_name))
+			continue;
+		if (strncmp(dp->d_name, buf, mblen) == 0) {
+			mbstowcs(dir, &dp->d_name[mblen],
+			    sizeof(dir) / sizeof(*dir));
+			if (el_winsertstr(el, dir) == -1)
+				res = CC_ERROR;
+			else
+				res = CC_REFRESH;
+			break;
+		}
+	}
+
+	closedir(dd);
+	free(buf);
+	return res;
+}
+
+
+int
+main(int  __attribute__((unused)) argc, char *argv[])
+{
+	EditLine *el = NULL;
+	int numc, ncontinuation;
+	const wchar_t *line;
+	TokenizerW *tok;
+	HistoryW *hist;
+	HistEventW ev;
+#ifdef DEBUG
+	int i;
+#endif
+
+	setlocale(LC_ALL, "");
+
+	(void)signal(SIGINT,  sig);
+	(void)signal(SIGQUIT, sig);
+	(void)signal(SIGHUP,  sig);
+	(void)signal(SIGTERM, sig);
+
+	hist = history_winit();		/* Init built-in history     */
+	history_w(hist, &ev, H_SETSIZE, 100);	/* Remember 100 events	     */
+	history_w(hist, &ev, H_LOAD, hfile);
+
+	tok = tok_winit(NULL);			/* Init the tokenizer	     */
+
+	el = el_init(argv[0], stdin, stdout, stderr);
+
+	el_wset(el, EL_EDITOR, L"vi");		/* Default editor is vi	     */
+	el_wset(el, EL_SIGNAL, 1);		/* Handle signals gracefully */
+	el_wset(el, EL_PROMPT_ESC, prompt, '\1'); /* Set the prompt function */
+
+	el_wset(el, EL_HIST, history_w, hist);	/* FIXME - history_w? */
+
+					/* Add a user-defined function	*/
+	el_wset(el, EL_ADDFN, L"ed-complete", L"Complete argument", complete);
+
+					/* Bind <tab> to it */
+	el_wset(el, EL_BIND, L"^I", L"ed-complete", NULL);
+
+	/*
+	* Bind j, k in vi command mode to previous and next line, instead
+	* of previous and next history.
+	*/
+	el_wset(el, EL_BIND, L"-a", L"k", L"ed-prev-line", NULL);
+	el_wset(el, EL_BIND, L"-a", L"j", L"ed-next-line", NULL);
+
+	/* Source the user's defaults file. */
+	el_source(el, NULL);
+
+	while((line = el_wgets(el, &numc)) != NULL && numc != 0) {
+		int ac, cc, co, rc;
+		const wchar_t **av;
+
+		const LineInfoW *li;
+		li = el_wline(el);
+
+#ifdef DEBUG
+		(void)fwprintf(stderr, L"==> got %d %ls", numc, line);
+		(void)fwprintf(stderr, L"  > li `%.*ls_%.*ls'\n",
+		    (li->cursor - li->buffer), li->buffer,
+		    (li->lastchar - 1 - li->cursor),
+		    (li->cursor >= li->lastchar) ? L"" : li->cursor);
+#endif
+
+		if (gotsig) {
+			(void)fprintf(stderr, "Got signal %d.\n", (int)gotsig);
+			gotsig = 0;
+			el_reset(el);
+		}
+
+		if(!continuation && numc == 1)
+			continue;	/* Only got a linefeed */
+
+		ac = cc = co = 0;
+		ncontinuation = tok_wline(tok, li, &ac, &av, &cc, &co);
+		if (ncontinuation < 0) {
+			(void) fprintf(stderr, "Internal error\n");
+			continuation = 0;
+			continue;
+		}
+
+#ifdef DEBUG
+		(void)fprintf(stderr, "  > nc %d ac %d cc %d co %d\n",
+			ncontinuation, ac, cc, co);
+#endif
+		history_w(hist, &ev, continuation ? H_APPEND : H_ENTER, line);
+
+		continuation = ncontinuation;
+		ncontinuation = 0;
+		if(continuation)
+			continue;
+
+#ifdef DEBUG
+		for (i = 0; i < ac; ++i) {
+			(void)fwprintf(stderr, L"  > arg# %2d ", i);
+			if (i != cc)
+				(void)fwprintf(stderr, L"`%ls'\n", av[i]);
+			else
+				(void)fwprintf(stderr, L"`%.*ls_%ls'\n",
+				    co, av[i], av[i] + co);
+		}
+#endif
+
+		if (wcscmp (av[0], L"history") == 0) {
+			switch(ac) {
+			case 1:
+				for(rc = history_w(hist, &ev, H_LAST);
+				     rc != -1;
+				     rc = history_w(hist, &ev, H_PREV))
+					(void)fwprintf(stdout, L"%4d %ls",
+					     ev.num, ev.str);
+				break;
+			case 2:
+				if (wcscmp(av[1], L"clear") == 0)
+					history_w(hist, &ev, H_CLEAR);
+				else
+					goto badhist;
+				break;
+			case 3:
+				if (wcscmp(av[1], L"load") == 0)
+					history_w(hist, &ev, H_LOAD,
+					    my_wcstombs(av[2]));
+				else if (wcscmp(av[1], L"save") == 0)
+					history_w(hist, &ev, H_SAVE,
+					    my_wcstombs(av[2]));
+				else
+					goto badhist;
+				break;
+			badhist:
+			default:
+				(void)fprintf(stderr,
+				    "Bad history arguments\n");
+				break;
+			}
+		} else if (el_wparse(el, ac, av) == -1) {
+			switch (fork()) {
+			case 0: {
+				Tokenizer *ntok = tok_init(NULL);
+				int nargc;
+				const char **nav;
+				tok_str(ntok, my_wcstombs(line), &nargc, &nav);
+				execvp(nav[0],(char **)nav);
+				perror(nav[0]);
+				_exit(1);
+				/* NOTREACHED */
+				break;
+			}
+			case -1:
+				perror("fork");
+				break;
+			default:
+				if (wait(&rc) == -1)
+					perror("wait");
+				(void)fprintf(stderr, "Exit %x\n", rc);
+				break;
+			}
+		}
+
+		tok_wreset(tok);
+	}
+
+	el_end(el);
+	tok_wend(tok);
+	history_w(hist, &ev, H_SAVE, hfile);
+	history_wend(hist);
+
+	fprintf(stdout, "\n");
+	return 0;
+}
+
+
diff --git a/extra/libedit/libedit-20221030-3.1/install-sh b/extra/libedit/libedit-20221030-3.1/install-sh
new file mode 100755
index 000000000000..ec298b537402
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/install-sh
@@ -0,0 +1,541 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2020-11-14.01; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='	'
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
+  -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -p) cpprog="$cpprog -p";;
+
+    -s) stripcmd=$stripprog;;
+
+    -S) backupsuffix="$2"
+        shift;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/extra/libedit/libedit-20221030-3.1/libedit.pc.in b/extra/libedit/libedit-20221030-3.1/libedit.pc.in
new file mode 100644
index 000000000000..1fb2f05bdcee
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/libedit.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libedit
+Description: command line editor library provides generic line editing, history, and tokenization functions.
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -ledit
+Libs.private: @LIBS@
+Cflags: -I${includedir} -I${includedir}/editline
+
diff --git a/extra/libedit/libedit-20221030-3.1/ltmain.sh b/extra/libedit/libedit-20221030-3.1/ltmain.sh
new file mode 100644
index 000000000000..2a50d7f6f72a
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/ltmain.sh
@@ -0,0 +1,11436 @@
+#! /usr/bin/env sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2019-02-19.15
+
+# libtool (GNU libtool) 2.4.7
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.7
+package_revision=2.4.7
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
+
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+fi
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+	fi"
+done
+# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those
+# in case the environment reset is needed later and the $save_* variant is not
+# defined (see the code above).
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# func_unset VAR
+# --------------
+# Portably unset VAR.
+# In some shells, an 'unset VAR' statement leaves a non-zero return
+# status if VAR is already unset, which might be problematic if the
+# statement is used at the end of a function (thus poisoning its return
+# value) or when 'set -e' is active (causing even a spurious abort of
+# the script in this case).
+func_unset ()
+{
+    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
+}
+
+
+# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
+func_unset CDPATH
+
+# Make sure ${,E,F}GREP behave sanely.
+func_unset GREP_OPTIONS
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+# require_check_ifs_backslash
+# ---------------------------
+# Check if we can use backslash as IFS='\' separator, and set
+# $check_ifs_backshlash_broken to ':' or 'false'.
+require_check_ifs_backslash=func_require_check_ifs_backslash
+func_require_check_ifs_backslash ()
+{
+  _G_save_IFS=$IFS
+  IFS='\'
+  _G_check_ifs_backshlash='a\\b'
+  for _G_i in $_G_check_ifs_backshlash
+  do
+  case $_G_i in
+  a)
+    check_ifs_backshlash_broken=false
+    ;;
+  '')
+    break
+    ;;
+  *)
+    check_ifs_backshlash_broken=:
+    break
+    ;;
+  esac
+  done
+  IFS=$_G_save_IFS
+  require_check_ifs_backslash=:
+}
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg.  Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
+{
+    $debug_cmd
+
+    $require_check_ifs_backslash
+
+    func_quote_portable_result=$2
+
+    # one-time-loop (easy break)
+    while true
+    do
+      if $1; then
+        func_quote_portable_result=`$ECHO "$2" | $SED \
+          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+        break
+      fi
+
+      # Quote for eval.
+      case $func_quote_portable_result in
+        *[\\\`\"\$]*)
+          # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
+          # contains the shell wildcard characters.
+          case $check_ifs_backshlash_broken$func_quote_portable_result in
+            :*|*[\[\*\?]*)
+              func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
+                  | $SED "$sed_quote_subst"`
+              break
+              ;;
+          esac
+
+          func_quote_portable_old_IFS=$IFS
+          for _G_char in '\' '`' '"' '$'
+          do
+            # STATE($1) PREV($2) SEPARATOR($3)
+            set start "" ""
+            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+            IFS=$_G_char
+            for _G_part in $func_quote_portable_result
+            do
+              case $1 in
+              quote)
+                func_append func_quote_portable_result "$3$2"
+                set quote "$_G_part" "\\$_G_char"
+                ;;
+              start)
+                set first "" ""
+                func_quote_portable_result=
+                ;;
+              first)
+                set quote "$_G_part" ""
+                ;;
+              esac
+            done
+          done
+          IFS=$func_quote_portable_old_IFS
+          ;;
+        *) ;;
+      esac
+      break
+    done
+
+    func_quote_portable_unquoted_result=$func_quote_portable_result
+    case $func_quote_portable_result in
+      # double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
+      # many bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_portable_result=\"$func_quote_portable_result\"
+        ;;
+    esac
+}
+
+
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed.  Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+  printf -v _GL_test_printf_tilde %q '~'
+  if test '\~' = "$_GL_test_printf_tilde"; then
+    func_quotefast_eval ()
+    {
+      printf -v func_quotefast_eval_result %q "$1"
+    }
+  else
+    # Broken older Bash implementations.  Make those faster too if possible.
+    func_quotefast_eval ()
+    {
+      case $1 in
+        '~'*)
+          func_quote_portable false "$1"
+          func_quotefast_eval_result=$func_quote_portable_result
+          ;;
+        *)
+          printf -v func_quotefast_eval_result %q "$1"
+          ;;
+      esac
+    }
+  fi
+else
+  func_quotefast_eval ()
+  {
+    func_quote_portable false "$1"
+    func_quotefast_eval_result=$func_quote_portable_result
+  }
+fi
+
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later.  MODEs argument may contain zero or more
+# specifiers listed below separated by ',' character.  This function returns two
+# values:
+#   i) func_quote_arg_result
+#      double-quoted (when needed), suitable for a subsequent eval
+#  ii) func_quote_arg_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.  Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+#       - escape shell special characters
+# 'expand'
+#       - the same as 'eval';  but do not quote variable references
+# 'pretty'
+#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
+#         be used later in func_quote to get output like: 'echo "a b"' instead
+#         of 'echo a\ b'.  This is slower than default on some shells.
+# 'unquoted'
+#       - produce also $func_quote_arg_unquoted_result which does not contain
+#         wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+#   string      | *_result              | *_unquoted_result
+#   ------------+-----------------------+-------------------
+#   "           | \"                    | \"
+#   a b         | "a b"                 | a b
+#   "a b"       | "\"a b\""             | \"a b\"
+#   *           | "*"                   | *
+#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+#   string        |   *_result          |  *_unquoted_result
+#   --------------+---------------------+--------------------
+#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
+func_quote_arg ()
+{
+    _G_quote_expand=false
+    case ,$1, in
+      *,expand,*)
+        _G_quote_expand=:
+        ;;
+    esac
+
+    case ,$1, in
+      *,pretty,*|*,expand,*|*,unquoted,*)
+        func_quote_portable $_G_quote_expand "$2"
+        func_quote_arg_result=$func_quote_portable_result
+        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+        ;;
+      *)
+        # Faster quote-for-eval for some shells.
+        func_quotefast_eval "$2"
+        func_quote_arg_result=$func_quotefast_eval_result
+        ;;
+    esac
+}
+
+
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command.  See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+    $debug_cmd
+    _G_func_quote_mode=$1 ; shift
+    func_quote_result=
+    while test 0 -lt $#; do
+      func_quote_arg "$_G_func_quote_mode" "$1"
+      if test -n "$func_quote_result"; then
+        func_append func_quote_result " $func_quote_arg_result"
+      else
+        func_append func_quote_result "$func_quote_arg_result"
+      fi
+      shift
+    done
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_arg pretty,expand "$_G_cmd"
+    eval "func_notquiet $func_quote_arg_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_arg expand,pretty "$_G_cmd"
+      eval "func_echo $func_quote_arg_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2010-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
+
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
+
+# Set a version string for this script.
+scriptversion=2019-02-19.15; # UTC
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# Copyright'.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug in processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# in the main code.  A hook is just a list of function names that can be
+# run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of hook functions to be called by
+# FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_propagate_result FUNC_NAME_A FUNC_NAME_B
+# ---------------------------------------------
+# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
+# *_result variable of FUNC_NAME_B.
+func_propagate_result ()
+{
+    $debug_cmd
+
+    func_propagate_result_result=:
+    if eval "test \"\${${1}_result+set}\" = set"
+    then
+      eval "${2}_result=\$${1}_result"
+    else
+      func_propagate_result_result=false
+    fi
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It's assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook functions." ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      func_unset "${_G_hook}_result"
+      eval $_G_hook '${1+"$@"}'
+      func_propagate_result $_G_hook func_run_hooks
+      if $func_propagate_result_result; then
+        eval set dummy "$func_run_hooks_result"; shift
+      fi
+    done
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list from your hook function.  You may remove
+# or edit any options that you action, and then pass back the remaining
+# unprocessed options in '<hooked_function_name>_result', escaped
+# suitably for 'eval'.
+#
+# The '<hooked_function_name>_result' variable is automatically unset
+# before your hook gets called; for best performance, only set the
+# *_result variable when necessary (i.e. don't call the 'func_quote'
+# function unnecessarily because it can be an expensive operation on some
+# machines).
+#
+# Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#        # No change in '$@' (ignored completely by this hook).  Leave
+#        # my_options_prep_result variable intact.
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        args_changed=false
+#
+#        # Note that, for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=:
+#                         args_changed=:
+#                         ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         args_changed=:
+#                         ;;
+#            *)           # Make sure the first unrecognised option "$_G_opt"
+#                         # is added back to "$@" in case we need it later,
+#                         # if $args_changed was set to 'true'.
+#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+#          esac
+#        done
+#
+#        # Only call 'func_quote' here if we processed at least one argument.
+#        if $args_changed; then
+#          func_quote eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_result
+#        fi
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll also need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+    $debug_cmd
+
+    func_run_hooks func_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_finish
+}
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    _G_options_quoted=false
+
+    for my_func in options_prep parse_options validate_options options_finish
+    do
+      func_unset func_${my_func}_result
+      func_unset func_run_hooks_result
+      eval func_$my_func '${1+"$@"}'
+      func_propagate_result func_$my_func func_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_options_result"; shift
+        _G_options_quoted=:
+      fi
+    done
+
+    $_G_options_quoted || {
+      # As we (func_options) are top-level options-parser function and
+      # nobody quoted "$@" for us yet, we need to do it explicitly for
+      # caller.
+      func_quote eval ${1+"$@"}
+      func_options_result=$func_quote_result
+    }
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propagate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+    func_propagate_result func_run_hooks func_options_prep
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    _G_parse_options_requote=false
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+      func_propagate_result func_run_hooks func_parse_options
+      if $func_propagate_result_result; then
+        eval set dummy "$func_parse_options_result"; shift
+        # Even though we may have changed "$@", we passed the "$@" array
+        # down into the hook and it quoted it for us (because we are in
+        # this if-branch).  No need to quote it again.
+        _G_parse_options_requote=false
+      fi
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      # We expect that one of the options parsed in this function matches
+      # and thus we remove _G_opt from "$@" and need to re-quote.
+      _G_match_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode" >&2
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      if test $# = 0 && func_missing_arg $_G_opt; then
+                        _G_parse_options_requote=:
+                        break
+                      fi
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           _G_parse_options_requote=: ; break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+                      _G_match_parse_options=false
+                      break
+                      ;;
+      esac
+
+      if $_G_match_parse_options; then
+        _G_parse_options_requote=:
+      fi
+    done
+
+    if $_G_parse_options_requote; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      func_parse_options_result=$func_quote_result
+    fi
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+    func_propagate_result func_run_hooks func_validate_options
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables
+# after splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      if test "x$func_split_equals_lhs" = "x$1"; then
+        func_split_equals_rhs=
+      fi
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs=" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+# The version message is extracted from the calling file's header
+# comments, with leading '# ' stripped:
+#   1. First display the progname and version
+#   2. Followed by the header comment line matching  /^# Written by /
+#   3. Then a blank line followed by the first following line matching
+#      /^# Copyright /
+#   4. Immediately followed by any lines between the previous matches,
+#      except lines preceding the intervening completely blank line.
+# For example, see the header comments of this file.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /^# Written by /!b
+        s|^# ||; p; n
+
+        :fwd2blnk
+        /./ {
+          n
+          b fwd2blnk
+        }
+        p; n
+
+        :holdwrnt
+        s|^# ||
+        s|^# *$||
+        /^Copyright /!{
+          /./H
+          n
+          b holdwrnt
+        }
+
+        s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+        G
+        s|\(\n\)\n*|\1|g
+        p; q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.7'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.7
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    _G_rc_lt_options_prep=:
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    *)
+      _G_rc_lt_options_prep=false
+      ;;
+    esac
+
+    if $_G_rc_lt_options_prep; then
+      # Pass back the list of options.
+      func_quote eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_result
+    fi
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    _G_rc_lt_parse_options=false
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_match_lt_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+                        _G_match_lt_parse_options=false
+                        break
+                        ;;
+      esac
+      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
+    done
+
+    if $_G_rc_lt_parse_options; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_result
+    fi
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case $lalib_p_line in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with '--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg=$arg
+	arg_mode=normal
+	;;
+
+      target )
+	libobj=$arg
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify '-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs=$IFS; IFS=,
+	  for arg in $args; do
+	    IFS=$save_ifs
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS=$save_ifs
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg=$srcfile
+	  srcfile=$arg
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_arg pretty "$libobj"
+    test "X$libobj" != "X$func_quote_arg_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_arg pretty "$srcfile"
+    qsrcfile=$func_quote_arg_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG
+  -Xcompiler FLAG   pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wa,FLAG
+  -Xassembler FLAG  pass linker-specific FLAG directly to the assembler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "'$file' was not linked with '-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir=$func_dirname_result
+	;;
+
+      *)
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file=$progdir/$program
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "'$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_arg pretty "$nonopt"
+      install_prog="$func_quote_arg_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_arg pretty "$arg"
+    func_append install_prog "$func_quote_arg_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_arg pretty "$arg"
+      func_append install_prog " $func_quote_arg_result"
+      if test -n "$arg2"; then
+	func_quote_arg pretty "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_arg_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_arg pretty "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_arg_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "'$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "'$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir=$func_dirname_result
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking '$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname=$1
+	  shift
+
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme=$stripme
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib=$destdir/$realname
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name=$func_basename_result
+	instname=$dir/${name}i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest=$destfile
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test yes = "$build_old_libs"; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile=$destdir/$destname
+	else
+	  func_basename "$file"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=.exe
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+	  finalize=:
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test no = "$fast_install" && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if $finalize; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_quiet || {
+	          func_quote_arg expand,pretty "$relink_command"
+		  eval "func_echo $func_quote_arg_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink '$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file=$outputname
+	      else
+	        func_warning "cannot relink '$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms=${my_outputname}S.c
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist=$output_objdir/$my_outputname.nm
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols=$output_objdir/$outputname.exp
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from '$dlprefile'"
+	  func_basename "$dlprefile"
+	  name=$func_basename_result
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname"; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename=$func_basename_result
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename"; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj=$output_objdir/${my_outputname}S.$objext
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
+	    1,100{
+		/ I /{
+		    s|.*|import|
+		    p
+		    q
+		}
+	    }'`
+	;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    func_quote_arg pretty "$ECHO"
+    qECHO=$func_quote_arg_result
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=$qECHO
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test yes = "$fast_install"; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	\$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test yes = "$fast_install"; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+	{
+EOF
+	    case $host in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (STREQ (argv[i], debug_opt))
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = (size_t) (q - p);
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_arg pretty,unquoted "$arg"
+      qarg=$func_quote_arg_unquoted_result
+      func_append libtool_args " $func_quote_arg_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir=$arg
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  $preload || {
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=:
+	  }
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test no = "$dlself"; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test dlprefiles = "$prev"; then
+	      dlself=yes
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test dlfiles = "$prev"; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols=$arg
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file '$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir=$func_dirname_result
+
+		if test none != "$pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object=$xdir$pic_object
+
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test dlprefiles = "$prev"; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg=$pic_object
+		fi
+
+		# Non-PIC object.
+		if test none != "$non_pic_object"; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object=$xdir$non_pic_object
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object=$pic_object
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir=$func_dirname_result
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "'$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file '$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex=$arg
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release=-$arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test rpath = "$prev"; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds=$arg
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xassembler)
+	  func_append compiler_flags " -Xassembler $qarg"
+	  prev=
+	  func_append compile_command " -Xassembler $qarg"
+	  func_append finalize_command " -Xassembler $qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test X-export-symbols = "X$arg"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between '-L' and '$1'"
+	  else
+	    func_fatal_error "need path for '-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test X-lc = "X$arg" && continue
+	    ;;
+	  esac
+	elif test X-lc_r = "X$arg"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+     -pthread)
+	case $host in
+	  *solaris2*) ;;
+	  *)
+	    case "$new_inherited_linker_flags " in
+	        *" $arg "*) ;;
+	        * ) func_append new_inherited_linker_flags " $arg" ;;
+	    esac
+	  ;;
+	esac
+	continue
+	;;
+      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module=$wl-multi_module
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_arg pretty "$flag"
+	  func_append arg " $func_quote_arg_result"
+	  func_append compiler_flags " $func_quote_arg_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs=$IFS; IFS=,
+	for flag in $args; do
+	  IFS=$save_ifs
+          func_quote_arg pretty "$flag"
+	  func_append arg " $wl$func_quote_arg_result"
+	  func_append compiler_flags " $wl$func_quote_arg_result"
+	  func_append linker_flags " $func_quote_arg_result"
+	done
+	IFS=$save_ifs
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xassembler)
+        prev=xassembler
+        continue
+        ;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
+      # -fuse-ld=*           Linker select flags for GCC
+      # -Wa,*                Pass flags directly to the assembler
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_arg pretty "$arg"
+	  arg=$func_quote_arg_result
+        fi
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir=$func_dirname_result
+
+	  test none = "$pic_object" || {
+	    # Prepend the subdirectory the object is found in.
+	    pic_object=$xdir$pic_object
+
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test dlprefiles = "$prev"; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg=$pic_object
+	  }
+
+	  # Non-PIC object.
+	  if test none != "$non_pic_object"; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object=$xdir$non_pic_object
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object=$pic_object
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir=$func_dirname_result
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "'$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test dlfiles = "$prev"; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test dlprefiles = "$prev"; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=false
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
+	deplibs=
+      fi
+      if test prog = "$linkmode"; then
+	case $pass in
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+	# Collect dlpreopened libraries
+	save_deplibs=$deplibs
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=false
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test lib = "$linkmode"; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib=$searchdir/lib$name$search_ext
+	      if test -f "$lib"; then
+		if test .la = "$search_ext"; then
+		  found=:
+		else
+		  found=false
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if $found; then
+	    # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll=$l
+		  done
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
+		    func_dirname "$lib" "" "."
+		    ladir=$func_dirname_result
+		    lib=$ladir/$old_library
+		    if test prog,link = "$linkmode,$pass"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test lib = "$linkmode"; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test conv = "$pass" && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test conv = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test scan = "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "'-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test link = "$pass"; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=false
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=:
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=:
+		;;
+	      esac
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test link != "$pass"; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test conv = "$pass"; then
+	    deplibs="$deplib $deplibs"
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=:
+	  continue
+	  ;;
+	esac # case $deplib
+
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir=$func_dirname_result
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test conv = "$pass"; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for '$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib=$l
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for '$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+	  if test -z "$dlname" ||
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of '$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir=$ladir
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname=$func_basename_result
+
+	# Find the relevant object directory and library name.
+	if test yes = "$installed"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
+	  else
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
+	  fi
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+	  fi
+	  case $host in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test lib = "$linkmode"; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test prog,link = "$linkmode,$pass"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test prog = "$linkmode" && test link != "$pass"; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if $linkalldeplibs; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test prog,link = "$linkmode,$pass"; then
+	  if test -n "$library_names" &&
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+	      # Make sure the rpath contains only unique directories.
+	      case $temp_rpath: in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test built = "$use_static_libs" && test yes = "$installed"; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test no = "$installed"; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule=$dlpremoduletest
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+	    echo
+	    if test prog = "$linkmode"; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname=$1
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname=$dlname
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc* | *os2*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix=-$major
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname=$realname
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot=$soname
+	    func_basename "$soroot"
+	    soname=$func_basename_result
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from '$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for '$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir=-L$dir ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we cannot
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library"; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add=$dir/$old_library
+			fi
+		      elif test -n "$old_library"; then
+			add=$dir/$old_library
+		      fi
+		    fi
+		esac
+	      elif test no = "$hardcode_minus_L"; then
+		case $host in
+		*-*-sunos*) add_shlibpath=$dir ;;
+		esac
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test yes != "$lib_linked"; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
+	      else
+		add=$libdir/$linklib
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir=-L$libdir
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add=-l$name
+	    fi
+
+	    if test prog = "$linkmode"; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test prog = "$linkmode"; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test yes = "$build_libtool_libs"; then
+	  # Not a shared library
+	  if test pass_all != "$deplibs_check_method"; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test yes = "$module"; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test no = "$build_old_libs"; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test lib = "$linkmode"; then
+	  if test -n "$dependency_libs" &&
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs=$temp_deplibs
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test no != "$link_all_deplibs"; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path=$deplib ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path=-L$absdir/$objdir
+		  ;;
+		esac
+		else
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "'$deplib' seems to be moved"
+
+		  path=-L$absdir
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	}
+
+	if test prog,link = "$linkmode,$pass"; then
+	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | $SED 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=
+	  ;;
+	esac
+	if test -n "$i"; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+	if test no != "$need_lib_prefix"; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test yes = "$build_libtool_libs"; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a '.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "'-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs=$IFS; IFS=:
+	set dummy $vinfo 0 0 0
+	shift
+	IFS=$save_ifs
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to '-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # that has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_minor
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current=$1
+	  revision=$2
+	  age=$3
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+	  ;;
+
+	freebsd-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	freebsd-elf | midnightbsd-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	irix | nonstopux)
+	  if test no = "$lt_irix_increment"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring=$verstring_prefix$major.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test 0 -ne "$loop"; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring_prefix$major.$iface:$verstring
+	  done
+
+	  # Before this point, $major must not contain '.'.
+	  major=.$major
+	  versuffix=$major.$revision
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test 0 -ne "$loop"; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring=$verstring:$iface.0
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":$current.0"
+	  ;;
+
+	qnx)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sunos)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 file systems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix=-$major
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type '$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring=0.0
+	    ;;
+	  esac
+	  if test no = "$need_version"; then
+	    versuffix=
+	  else
+	    versuffix=.0.0
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test yes,no = "$avoid_version,$need_version"; then
+	  major=
+	  versuffix=
+	  verstring=
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag=$no_undefined_flag
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test yes = "$build_libtool_need_lc"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=
+	versuffix=
+	major=
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=
+		    ;;
+		  esac
+		fi
+		if test -n "$i"; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i"; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test yes = "$want_nocaseglob"; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib=$potent_lib
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib"; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib=$potent_lib # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib"; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib"; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test none = "$deplibs_check_method"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test no = "$allow_undefined"; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test yes = "$hardcode_into_libs"; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs=$libdir
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir=$hardcode_libdirs
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname=$1
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname=$realname
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib=$output_objdir/$realname
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    func_dll_def_p "$export_symbols" || {
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols=$export_symbols
+	      export_symbols=
+	      always_export_symbols=yes
+	    }
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs=$IFS; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS=$save_ifs
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test yes = "$try_normal_branch" \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=$output_objdir/$output_la.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs=$tmp_deplibs
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test yes = "$compiler_needs_object" &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop=$output_objdir/${outputname}x
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test yes = "$module" && test -n "$module_cmds"; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test : != "$skipped_export" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test yes = "$compiler_needs_object"; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-$k.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test -z "$objlist" ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test 1 -eq "$k"; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-$k.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-$k.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    }
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs=$IFS; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS=$save_ifs
+	      $opt_quiet || {
+		  func_quote_arg expand,pretty "$cmd"
+		  eval "func_echo $func_quote_arg_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test relink = "$opt_mode"; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS=$save_ifs
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          ${skipped_export-false} && {
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  }
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test yes = "$module" && test -n "$module_cmds"; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs=$IFS; IFS='~'
+	for cmd in $cmds; do
+	  IFS=$sp$nl
+	  eval cmd=\"$cmd\"
+	  IFS=$save_ifs
+	  $opt_quiet || {
+	    func_quote_arg expand,pretty "$cmd"
+	    eval "func_echo $func_quote_arg_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test relink = "$opt_mode"; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS=$save_ifs
+
+	# Restore the uninstalled library and exit
+	if test relink = "$opt_mode"; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test yes = "$module" || test yes = "$export_dynamic"; then
+	  # On all known operating systems, these are identical.
+	  dlname=$soname
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj=$output
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+	else
+	  gentop=$output_objdir/${obj}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output=$libobj
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "'-release' is ignored for programs"
+
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test CXX = "$tagname"; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs=$libdir
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir=$hardcode_libdirs
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command=$compile_command$compile_rpath
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+	fi
+
+	exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test yes = "$no_install"; then
+	# We don't need to create a wrapper script.
+	link_command=$compile_var$compile_command$compile_rpath
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_arg pretty "$var_value"
+	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
+	  fi
+	done
+	func_quote eval cd "`pwd`"
+	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
+	relink_command=$func_quote_arg_unquoted_result
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host"; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
+	  build_libtool_libs=no
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
+
+      if test -n "$addlibs"; then
+	gentop=$output_objdir/${outputname}x
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop=$output_objdir/${outputname}x
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase=$func_basename_result
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj"; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test -z "$oldobjs"; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_arg pretty,unquoted "$var_value"
+	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      func_quote eval cd "`pwd`"
+      relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      func_quote_arg pretty,unquoted "$relink_command"
+      relink_command=$func_quote_arg_unquoted_result
+      if test yes = "$hardcode_automatic"; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test yes = "$installed"; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output=$output_objdir/${outputname}i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name=$func_basename_result
+		func_resolve_sysroot "$deplib"
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs=$newdependency_libs
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "'$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles=$newdlprefiles
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles=$newdlfiles
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles=$newdlprefiles
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test -n "$bindir"; then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result/$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test no,yes = "$installed,$need_relink"; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
+      else
+	odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif $rmforce; then
+	continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case $opt_mode in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" && test none != "$pic_object"; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test clean = "$opt_mode"; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/extra/libedit/libedit-20221030-3.1/m4/libtool.m4 b/extra/libedit/libedit-20221030-3.1/m4/libtool.m4
new file mode 100644
index 000000000000..79a2451ef520
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/m4/libtool.m4
@@ -0,0 +1,8400 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 59 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  $SED '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `$FILECMD conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `$FILECMD conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `$FILECMD conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `$FILECMD conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `$FILECMD conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+_LT_DECL([], [AR], [1], [The archiver])
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
+         [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -z "$STRIP"; then
+  AC_MSG_RESULT([no])
+else
+  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+    old_striplib="$STRIP --strip-debug"
+    striplib="$STRIP --strip-unneeded"
+    AC_MSG_RESULT([yes])
+  else
+    case $host_os in
+    darwin*)
+      # FIXME - insert some real tests, host_os isn't really good enough
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+      ;;
+    freebsd*)
+      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+        old_striplib="$STRIP --strip-debug"
+        striplib="$STRIP --strip-unneeded"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+      fi
+      ;;
+    *)
+      AC_MSG_RESULT([no])
+      ;;
+    esac
+  fi
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl* | *,icl*)
+    # Native MSVC or ICC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC and ICC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='$FILECMD -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly* | midnightbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=$FILECMD
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=$FILECMD
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=$FILECMD
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly* | midnightbsd*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | $SED 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl* | icl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++ or Intel C++ Compiler.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | $SED 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++ or Intel C++ Compiler.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl* | icl*)
+	# Native MSVC or ICC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC and ICC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly* | midnightbsd*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='@'
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl* | ,icl* | no,icl*)
+	  # Native MSVC or ICC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly* | midnightbsd*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | $SED 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun([_LT_DECL_FILECMD],
+[AC_CHECK_TOOL([FILECMD], [file], [:])
+_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
+])# _LD_DECL_FILECMD
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/extra/libedit/libedit-20221030-3.1/m4/ltoptions.m4 b/extra/libedit/libedit-20221030-3.1/m4/ltoptions.m4
new file mode 100644
index 000000000000..b0b5e9c21260
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/m4/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free
+#   Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/extra/libedit/libedit-20221030-3.1/m4/ltsugar.m4 b/extra/libedit/libedit-20221030-3.1/m4/ltsugar.m4
new file mode 100644
index 000000000000..902508bd93ae
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/m4/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/extra/libedit/libedit-20221030-3.1/m4/ltversion.m4 b/extra/libedit/libedit-20221030-3.1/m4/ltversion.m4
new file mode 100644
index 000000000000..b155d0aceca3
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/m4/ltversion.m4
@@ -0,0 +1,24 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
+#   Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4245 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.7])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.7'
+macro_revision='2.4.7'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/extra/libedit/libedit-20221030-3.1/missing b/extra/libedit/libedit-20221030-3.1/missing
new file mode 100755
index 000000000000..1fe1611f1851
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/extra/libedit/libedit-20221030-3.1/src/CMakeLists.txt b/extra/libedit/libedit-20221030-3.1/src/CMakeLists.txt
new file mode 100644
index 000000000000..e073d5bd871a
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/CMakeLists.txt
@@ -0,0 +1,185 @@
+# See src/Makefile.am for original build dependencies.
+
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} )
+INCLUDE(CheckIncludeFile)
+include(CheckFunctionExists)
+
+CHECK_INCLUDE_FILES (sys/cdefs.h HAVE_SYS_CDEFS_H)
+CHECK_INCLUDE_FILES(term.h HAVE_TERM_H)
+
+IF(SOLARIS)
+  #On Solaris, default awk is next to unusable while the xpg4 one is ok.
+  IF(EXISTS /usr/xpg4/bin/awk)
+    SET(AWK_EXECUTABLE /usr/xpg4/bin/awk)
+  ENDIF()
+ENDIF()
+
+IF(NOT AWK_EXECUTABLE)
+  FIND_PROGRAM(AWK_EXECUTABLE NAMES gawk awk DOC "path to the awk executable")
+ENDIF()
+MESSAGE(STATUS "AWK_EXECUTABLE is ${AWK_EXECUTABLE}")
+
+MARK_AS_ADVANCED(AWK_EXECUTABLE)
+SET(AWK ${AWK_EXECUTABLE})
+CONFIGURE_FILE(makelist.in ${CMAKE_CURRENT_BINARY_DIR}/makelist @ONLY)
+
+SET(MAKELIST ${CMAKE_CURRENT_BINARY_DIR}/makelist)
+
+CHECK_C_SOURCE_COMPILES("
+  #include <stdlib.h>
+  #include <sys/types.h>
+  #include <pwd.h>
+  int main() {
+    int ret = getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL);
+    return ret;
+  }"
+  HAVE_GETPW_R_POSIX
+  )
+
+# POSIX.1c Draft 6
+CHECK_C_SOURCE_COMPILES("
+  #include <stdlib.h>
+  #include <sys/types.h>
+  #include <pwd.h>
+  int main() {
+    struct passwd *pwd = getpwnam_r(NULL, NULL, NULL, 0);
+    return pwd != NULL;
+  }"
+  HAVE_GETPW_R_DRAFT
+)
+
+CHECK_FUNCTION_EXISTS(getline         HAVE_GETLINE)
+#    _FUNCTION_EXISTS(strlcpy         HAVE_STRLCPY) in configure.cmake
+#    _FUNCTION_EXISTS(strlcat         HAVE_STRLCAT) in configure.cmake
+CHECK_FUNCTION_EXISTS(vis             HAVE_VIS)
+CHECK_FUNCTION_EXISTS(unvis           HAVE_UNVIS)
+CHECK_FUNCTION_EXISTS(__secure_getenv HAVE___SECURE_GETENV)
+CHECK_FUNCTION_EXISTS(secure_getenv   HAVE_SECURE_GETENV)
+
+FUNCTION(MAKELIST_TARGET target outfile options infiles)
+  STRING(REPLACE ";" " " infile_string "${infiles}")
+  LIST(REMOVE_ITEM infiles vi.h emacs.h common.h) # remove from DEPENDS
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${outfile}
+    COMMAND sh ${MAKELIST} ${options} ${infile_string} > ${outfile}
+    COMMENT "makelist ${options} ${infile_string} > ${outfile}"
+    DEPENDS ${infiles}
+    )
+  ADD_CUSTOM_TARGET(${target} DEPENDS ${outfile})
+ENDFUNCTION()
+
+SET(BUILT_SOURCES vi.h emacs.h common.h fcns.h help.h func.h)
+SET(AHDR vi.h emacs.h common.h)
+SET(ASRC
+  ${CMAKE_CURRENT_SOURCE_DIR}/vi.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/emacs.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/common.c
+  )
+
+MAKELIST_TARGET(libedit_vi     vi.h     -h ${CMAKE_CURRENT_SOURCE_DIR}/vi.c)
+MAKELIST_TARGET(libedit_emacs  emacs.h  -h ${CMAKE_CURRENT_SOURCE_DIR}/emacs.c)
+MAKELIST_TARGET(libedit_common common.h -h ${CMAKE_CURRENT_SOURCE_DIR}/common.c)
+MAKELIST_TARGET(libedit_fcns   fcns.h   -fh "${AHDR}")
+MAKELIST_TARGET(libedit_help   help.h   -bh "${ASRC}")
+MAKELIST_TARGET(libedit_func   func.h   -fc "${AHDR}")
+
+# Add target dependencies, to compensate for the DEPENDS we removed above.
+ADD_DEPENDENCIES(libedit_fcns libedit_vi libedit_emacs libedit_common)
+ADD_DEPENDENCIES(libedit_func libedit_vi libedit_emacs libedit_common)
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CURSES_INCLUDE_PATH}
+)
+
+SET(LIBEDIT_SOURCES
+  chared.c
+  chartype.c
+  common.c
+  el.c
+  eln.c
+  emacs.c
+  filecomplete.c
+  hist.c
+  history.c
+  historyn.c
+  keymacro.c
+  literal.c
+  map.c
+  parse.c
+  prompt.c
+  read.c
+  readline.c
+  reallocarr.c
+  refresh.c
+  search.c
+  sig.c
+  terminal.c
+  tokenizer.c
+  tokenizern.c
+  tty.c
+  vi.c
+  ${BUILT_SOURCES}
+  ${LIBEDIT_EXTRA_SOURCES}
+  )
+
+IF(NOT HAVE_STRLCPY)
+  LIST(APPEND LIBEDIT_SOURCES strlcpy.c)
+ENDIF()
+IF(NOT HAVE_STRLCAT)
+  LIST(APPEND LIBEDIT_SOURCES strlcat.c)
+ENDIF()
+IF(NOT HAVE_VIS)
+  LIST(APPEND LIBEDIT_SOURCES vis.c)
+ENDIF()
+IF(NOT HAVE_UNVIS)
+  LIST(APPEND LIBEDIT_SOURCES unvis.c)
+ENDIF()
+IF(FREEBSD AND HAVE_GETLINE)
+  ADD_DEFINITIONS(-D_WITH_GETLINE=1)
+ENDIF()
+
+ADD_LIBRARY(edit STATIC ${LIBEDIT_SOURCES})
+TARGET_LINK_LIBRARIES(edit ${CURSES_LIBRARY})
+ADD_DEPENDENCIES(edit libedit_vi libedit_emacs libedit_common libedit_fcns libedit_help libedit_func)
+# src/chared.c:679:2:
+# error: for loop initial declarations are only allowed in C99 mode
+# Do not extend CMAKE_C_FLAGS, as that will affect feature tests.
+ADD_COMPILE_FLAGS(
+  ${LIBEDIT_SOURCES}
+  COMPILE_FLAGS "-std=c99"
+  )
+
+# clang may complain:
+# converts between pointers to integer types with different sign
+MY_CHECK_C_COMPILER_FLAG("-Wpointer-sign" HAVE_POINTER_SIGN)
+IF(HAVE_POINTER_SIGN)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-pointer-sign")
+ENDIF()
+
+MY_CHECK_C_COMPILER_FLAG("-Wstringop-overflow" HAVE_STRINGOP_OVERFLOW)
+IF(HAVE_STRINGOP_OVERFLOW)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-stringop-overflow")
+ENDIF()
+
+MY_CHECK_C_COMPILER_FLAG("-Wunused-result" HAVE_UNUSED_RESULT)
+IF(HAVE_UNUSED_RESULT)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-unused-result")
+ENDIF()
+
+MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION)
+IF(HAVE_STRINGOP_TRUNCATION)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-stringop-truncation")
+ENDIF()
+
+# warning: comparing the result of pointer addition
+MY_CHECK_C_COMPILER_FLAG("-Waddress" HAVE_ADDRESS)
+IF(HAVE_ADDRESS)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-address")
+ENDIF()
+
+# warning: pointer may be used after realloc
+MY_CHECK_C_COMPILER_FLAG("-Wuse-after-free" HAVE_USE_AFTER_FREE)
+IF(HAVE_USE_AFTER_FREE)
+  TARGET_COMPILE_OPTIONS(edit PRIVATE "-Wno-use-after-free")
+ENDIF()
diff --git a/extra/libedit/libedit-20221030-3.1/src/ChangeLog b/extra/libedit/libedit-20221030-3.1/src/ChangeLog
new file mode 100644
index 000000000000..35c9205a43d8
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/ChangeLog
@@ -0,0 +1,6 @@
+2021-08-29	Christos Zoulas	<christos@netbsd.org>
+
+	Change default mappings:
+	    map ^W to ed-delete-prev-word and not kill-region
+	    map ^R to em-inc-search-next and not redisplay
+
diff --git a/extra/libedit/libedit-20221030-3.1/src/Makefile.am b/extra/libedit/libedit-20221030-3.1/src/Makefile.am
new file mode 100644
index 000000000000..9a0b235498d5
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/Makefile.am
@@ -0,0 +1,60 @@
+
+BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h func.h
+
+AHDR= vi.h emacs.h common.h 
+ASRC= $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
+
+vi.h: Makefile $(srcdir)/vi.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/vi.c > $@
+
+emacs.h: Makefile $(srcdir)/emacs.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/emacs.c > $@
+
+common.h: Makefile $(srcdir)/common.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/common.c > $@
+
+fcns.h: Makefile $(AHDR)
+	AWK=$(AWK) sh $(srcdir)/makelist -fh $(AHDR) > $@
+
+help.h: Makefile $(ASRC)
+	AWK=$(AWK) sh $(srcdir)/makelist -bh $(ASRC) > $@
+
+func.h: Makefile $(AHDR)
+	AWK=$(AWK) sh $(srcdir)/makelist -fc $(AHDR) > $@
+
+CLEANFILES = $(BUILT_SOURCES)
+
+lib_LTLIBRARIES    = libedit.la
+libedit_la_SOURCES = chared.c common.c el.c eln.c emacs.c hist.c keymacro.c map.c chartype.c parse.c \
+							prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c \
+							reallocarr.c wcsdup.c \
+							tokenizer.c tokenizern.c \
+							history.c historyn.c \
+							filecomplete.c readline.c chared.h literal.c el.h hist.h \
+							histedit.h keymacro.h map.h chartype.h parse.h prompt.h read.h refresh.h \
+							search.h sig.h sys.h terminal.h tty.h vis.h filecomplete.h \
+							editline/readline.h literal.h
+
+if !HAVE_STRLCPY
+libedit_la_SOURCES += strlcpy.c
+endif
+if !HAVE_STRLCAT
+libedit_la_SOURCES += strlcat.c
+endif
+if !HAVE_GETLINE
+libedit_la_SOURCES += getline.c
+endif
+if !HAVE_VIS
+libedit_la_SOURCES += vis.c
+endif
+if !HAVE_UNVIS
+libedit_la_SOURCES += unvis.c
+endif
+
+EXTRA_DIST = makelist shlib_version
+nobase_include_HEADERS = histedit.h editline/readline.h
+
+nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
+
+libedit_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION)
+
diff --git a/extra/libedit/libedit-20221030-3.1/src/Makefile.in b/extra/libedit/libedit-20221030-3.1/src/Makefile.in
new file mode 100644
index 000000000000..c2313a10b68e
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/Makefile.in
@@ -0,0 +1,860 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@HAVE_STRLCPY_FALSE@am__append_1 = strlcpy.c
+@HAVE_STRLCAT_FALSE@am__append_2 = strlcat.c
+@HAVE_GETLINE_FALSE@am__append_3 = getline.c
+@HAVE_VIS_FALSE@am__append_4 = vis.c
+@HAVE_UNVIS_FALSE@am__append_5 = unvis.c
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libedit_la_LIBADD =
+am__libedit_la_SOURCES_DIST = chared.c common.c el.c eln.c emacs.c \
+	hist.c keymacro.c map.c chartype.c parse.c prompt.c read.c \
+	refresh.c search.c sig.c terminal.c tty.c vi.c reallocarr.c \
+	wcsdup.c tokenizer.c tokenizern.c history.c historyn.c \
+	filecomplete.c readline.c chared.h literal.c el.h hist.h \
+	histedit.h keymacro.h map.h chartype.h parse.h prompt.h read.h \
+	refresh.h search.h sig.h sys.h terminal.h tty.h vis.h \
+	filecomplete.h editline/readline.h literal.h strlcpy.c \
+	strlcat.c getline.c vis.c unvis.c
+@HAVE_STRLCPY_FALSE@am__objects_1 = strlcpy.lo
+@HAVE_STRLCAT_FALSE@am__objects_2 = strlcat.lo
+@HAVE_GETLINE_FALSE@am__objects_3 = getline.lo
+@HAVE_VIS_FALSE@am__objects_4 = vis.lo
+@HAVE_UNVIS_FALSE@am__objects_5 = unvis.lo
+am_libedit_la_OBJECTS = chared.lo common.lo el.lo eln.lo emacs.lo \
+	hist.lo keymacro.lo map.lo chartype.lo parse.lo prompt.lo \
+	read.lo refresh.lo search.lo sig.lo terminal.lo tty.lo vi.lo \
+	reallocarr.lo wcsdup.lo tokenizer.lo tokenizern.lo history.lo \
+	historyn.lo filecomplete.lo readline.lo literal.lo \
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4) $(am__objects_5)
+am__objects_6 =
+nodist_libedit_la_OBJECTS = $(am__objects_6)
+libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
+	$(nodist_libedit_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libedit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libedit_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/chared.Plo ./$(DEPDIR)/chartype.Plo \
+	./$(DEPDIR)/common.Plo ./$(DEPDIR)/el.Plo ./$(DEPDIR)/eln.Plo \
+	./$(DEPDIR)/emacs.Plo ./$(DEPDIR)/filecomplete.Plo \
+	./$(DEPDIR)/getline.Plo ./$(DEPDIR)/hist.Plo \
+	./$(DEPDIR)/history.Plo ./$(DEPDIR)/historyn.Plo \
+	./$(DEPDIR)/keymacro.Plo ./$(DEPDIR)/literal.Plo \
+	./$(DEPDIR)/map.Plo ./$(DEPDIR)/parse.Plo \
+	./$(DEPDIR)/prompt.Plo ./$(DEPDIR)/read.Plo \
+	./$(DEPDIR)/readline.Plo ./$(DEPDIR)/reallocarr.Plo \
+	./$(DEPDIR)/refresh.Plo ./$(DEPDIR)/search.Plo \
+	./$(DEPDIR)/sig.Plo ./$(DEPDIR)/strlcat.Plo \
+	./$(DEPDIR)/strlcpy.Plo ./$(DEPDIR)/terminal.Plo \
+	./$(DEPDIR)/tokenizer.Plo ./$(DEPDIR)/tokenizern.Plo \
+	./$(DEPDIR)/tty.Plo ./$(DEPDIR)/unvis.Plo ./$(DEPDIR)/vi.Plo \
+	./$(DEPDIR)/vis.Plo ./$(DEPDIR)/wcsdup.Plo
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libedit_la_SOURCES) $(nodist_libedit_la_SOURCES)
+DIST_SOURCES = $(am__libedit_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(nobase_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	ChangeLog
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+LT_VERSION = @LT_VERSION@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTYPE = @MANTYPE@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h func.h
+AHDR = vi.h emacs.h common.h 
+ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
+CLEANFILES = $(BUILT_SOURCES)
+lib_LTLIBRARIES = libedit.la
+libedit_la_SOURCES = chared.c common.c el.c eln.c emacs.c hist.c \
+	keymacro.c map.c chartype.c parse.c prompt.c read.c refresh.c \
+	search.c sig.c terminal.c tty.c vi.c reallocarr.c wcsdup.c \
+	tokenizer.c tokenizern.c history.c historyn.c filecomplete.c \
+	readline.c chared.h literal.c el.h hist.h histedit.h \
+	keymacro.h map.h chartype.h parse.h prompt.h read.h refresh.h \
+	search.h sig.h sys.h terminal.h tty.h vis.h filecomplete.h \
+	editline/readline.h literal.h $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_4) $(am__append_5)
+EXTRA_DIST = makelist shlib_version
+nobase_include_HEADERS = histedit.h editline/readline.h
+nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
+libedit_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libedit.la: $(libedit_la_OBJECTS) $(libedit_la_DEPENDENCIES) $(EXTRA_libedit_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libedit_la_LINK) -rpath $(libdir) $(libedit_la_OBJECTS) $(libedit_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chared.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chartype.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/el.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eln.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emacs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filecomplete.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/historyn.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keymacro.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/literal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prompt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reallocarr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refresh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terminal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizer.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizern.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unvis.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vis.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcsdup.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-nobase_includeHEADERS: $(nobase_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/chared.Plo
+	-rm -f ./$(DEPDIR)/chartype.Plo
+	-rm -f ./$(DEPDIR)/common.Plo
+	-rm -f ./$(DEPDIR)/el.Plo
+	-rm -f ./$(DEPDIR)/eln.Plo
+	-rm -f ./$(DEPDIR)/emacs.Plo
+	-rm -f ./$(DEPDIR)/filecomplete.Plo
+	-rm -f ./$(DEPDIR)/getline.Plo
+	-rm -f ./$(DEPDIR)/hist.Plo
+	-rm -f ./$(DEPDIR)/history.Plo
+	-rm -f ./$(DEPDIR)/historyn.Plo
+	-rm -f ./$(DEPDIR)/keymacro.Plo
+	-rm -f ./$(DEPDIR)/literal.Plo
+	-rm -f ./$(DEPDIR)/map.Plo
+	-rm -f ./$(DEPDIR)/parse.Plo
+	-rm -f ./$(DEPDIR)/prompt.Plo
+	-rm -f ./$(DEPDIR)/read.Plo
+	-rm -f ./$(DEPDIR)/readline.Plo
+	-rm -f ./$(DEPDIR)/reallocarr.Plo
+	-rm -f ./$(DEPDIR)/refresh.Plo
+	-rm -f ./$(DEPDIR)/search.Plo
+	-rm -f ./$(DEPDIR)/sig.Plo
+	-rm -f ./$(DEPDIR)/strlcat.Plo
+	-rm -f ./$(DEPDIR)/strlcpy.Plo
+	-rm -f ./$(DEPDIR)/terminal.Plo
+	-rm -f ./$(DEPDIR)/tokenizer.Plo
+	-rm -f ./$(DEPDIR)/tokenizern.Plo
+	-rm -f ./$(DEPDIR)/tty.Plo
+	-rm -f ./$(DEPDIR)/unvis.Plo
+	-rm -f ./$(DEPDIR)/vi.Plo
+	-rm -f ./$(DEPDIR)/vis.Plo
+	-rm -f ./$(DEPDIR)/wcsdup.Plo
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_includeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/chared.Plo
+	-rm -f ./$(DEPDIR)/chartype.Plo
+	-rm -f ./$(DEPDIR)/common.Plo
+	-rm -f ./$(DEPDIR)/el.Plo
+	-rm -f ./$(DEPDIR)/eln.Plo
+	-rm -f ./$(DEPDIR)/emacs.Plo
+	-rm -f ./$(DEPDIR)/filecomplete.Plo
+	-rm -f ./$(DEPDIR)/getline.Plo
+	-rm -f ./$(DEPDIR)/hist.Plo
+	-rm -f ./$(DEPDIR)/history.Plo
+	-rm -f ./$(DEPDIR)/historyn.Plo
+	-rm -f ./$(DEPDIR)/keymacro.Plo
+	-rm -f ./$(DEPDIR)/literal.Plo
+	-rm -f ./$(DEPDIR)/map.Plo
+	-rm -f ./$(DEPDIR)/parse.Plo
+	-rm -f ./$(DEPDIR)/prompt.Plo
+	-rm -f ./$(DEPDIR)/read.Plo
+	-rm -f ./$(DEPDIR)/readline.Plo
+	-rm -f ./$(DEPDIR)/reallocarr.Plo
+	-rm -f ./$(DEPDIR)/refresh.Plo
+	-rm -f ./$(DEPDIR)/search.Plo
+	-rm -f ./$(DEPDIR)/sig.Plo
+	-rm -f ./$(DEPDIR)/strlcat.Plo
+	-rm -f ./$(DEPDIR)/strlcpy.Plo
+	-rm -f ./$(DEPDIR)/terminal.Plo
+	-rm -f ./$(DEPDIR)/tokenizer.Plo
+	-rm -f ./$(DEPDIR)/tokenizern.Plo
+	-rm -f ./$(DEPDIR)/tty.Plo
+	-rm -f ./$(DEPDIR)/unvis.Plo
+	-rm -f ./$(DEPDIR)/vi.Plo
+	-rm -f ./$(DEPDIR)/vis.Plo
+	-rm -f ./$(DEPDIR)/wcsdup.Plo
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
+
+.MAKE: all check install install-am install-exec install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-nobase_includeHEADERS install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-nobase_includeHEADERS
+
+.PRECIOUS: Makefile
+
+
+vi.h: Makefile $(srcdir)/vi.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/vi.c > $@
+
+emacs.h: Makefile $(srcdir)/emacs.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/emacs.c > $@
+
+common.h: Makefile $(srcdir)/common.c
+	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/common.c > $@
+
+fcns.h: Makefile $(AHDR)
+	AWK=$(AWK) sh $(srcdir)/makelist -fh $(AHDR) > $@
+
+help.h: Makefile $(ASRC)
+	AWK=$(AWK) sh $(srcdir)/makelist -bh $(ASRC) > $@
+
+func.h: Makefile $(AHDR)
+	AWK=$(AWK) sh $(srcdir)/makelist -fc $(AHDR) > $@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/cmd-line-utils/libedit/chared.c b/extra/libedit/libedit-20221030-3.1/src/chared.c
similarity index 77%
rename from cmd-line-utils/libedit/chared.c
rename to extra/libedit/libedit-20221030-3.1/src/chared.c
index 647a5afe439e..ff5545bbe168 100644
--- a/cmd-line-utils/libedit/chared.c
+++ b/extra/libedit/libedit-20221030-3.1/src/chared.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.36 2011/10/23 17:37:55 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.62 2022/02/08 21:13:22 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,16 +37,20 @@
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: chared.c,v 1.62 2022/02/08 21:13:22 rillig Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * chared.c: Character editor utilities
  */
+#include <ctype.h>
 #include <stdlib.h>
-#include "el.h"
+#include <string.h>
 
-private void ch__clearmacro (EditLine *);
+#include "el.h"
+#include "common.h"
+#include "fcns.h"
 
 /* value to leave unused in line buffer */
 #define	EL_LEAVE	2
@@ -54,7 +58,7 @@ private void ch__clearmacro (EditLine *);
 /* cv_undo():
  *	Handle state for the vi undo command
  */
-protected void
+libedit_private void
 cv_undo(EditLine *el)
 {
 	c_undo_t *vu = &el->el_chared.c_undo;
@@ -78,8 +82,8 @@ cv_undo(EditLine *el)
 /* cv_yank():
  *	Save yank/delete data for paste
  */
-protected void
-cv_yank(EditLine *el, const Char *ptr, int size)
+libedit_private void
+cv_yank(EditLine *el, const wchar_t *ptr, int size)
 {
 	c_kill_t *k = &el->el_chared.c_kill;
 
@@ -91,10 +95,10 @@ cv_yank(EditLine *el, const Char *ptr, int size)
 /* c_insert():
  *	Insert num characters
  */
-protected void
+libedit_private void
 c_insert(EditLine *el, int num)
 {
-	Char *cp;
+	wchar_t *cp;
 
 	if (el->el_line.lastchar + num >= el->el_line.limit) {
 		if (!ch_enlargebufs(el, (size_t)num))
@@ -113,7 +117,7 @@ c_insert(EditLine *el, int num)
 /* c_delafter():
  *	Delete num characters after the cursor
  */
-protected void
+libedit_private void
 c_delafter(EditLine *el, int num)
 {
 
@@ -126,7 +130,7 @@ c_delafter(EditLine *el, int num)
 	}
 
 	if (num > 0) {
-		Char *cp;
+		wchar_t *cp;
 
 		for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
 			*cp = cp[num];
@@ -139,10 +143,10 @@ c_delafter(EditLine *el, int num)
 /* c_delafter1():
  *	Delete the character after the cursor, do not yank
  */
-protected void
+libedit_private void
 c_delafter1(EditLine *el)
 {
-	Char *cp;
+	wchar_t *cp;
 
 	for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
 		*cp = cp[1];
@@ -154,7 +158,7 @@ c_delafter1(EditLine *el)
 /* c_delbefore():
  *	Delete num characters before the cursor
  */
-protected void
+libedit_private void
 c_delbefore(EditLine *el, int num)
 {
 
@@ -167,10 +171,10 @@ c_delbefore(EditLine *el, int num)
 	}
 
 	if (num > 0) {
-		Char *cp;
+		wchar_t *cp;
 
 		for (cp = el->el_line.cursor - num;
-		    cp <= el->el_line.lastchar;
+		    &cp[num] <= el->el_line.lastchar;
 		    cp++)
 			*cp = cp[num];
 
@@ -182,10 +186,10 @@ c_delbefore(EditLine *el, int num)
 /* c_delbefore1():
  *	Delete the character before the cursor, do not yank
  */
-protected void
+libedit_private void
 c_delbefore1(EditLine *el)
 {
-	Char *cp;
+	wchar_t *cp;
 
 	for (cp = el->el_line.cursor - 1; cp <= el->el_line.lastchar; cp++)
 		*cp = cp[1];
@@ -197,22 +201,22 @@ c_delbefore1(EditLine *el)
 /* ce__isword():
  *	Return if p is part of a word according to emacs
  */
-protected int
-ce__isword(Int p)
+libedit_private int
+ce__isword(wint_t p)
 {
-        return Isalnum(p) || Strchr(STR("*?_-.[]~="), p) != NULL;
+	return iswalnum(p) || wcschr(L"*?_-.[]~=", p) != NULL;
 }
 
 
 /* cv__isword():
  *	Return if p is part of a word according to vi
  */
-protected int
-cv__isword(Int p)
+libedit_private int
+cv__isword(wint_t p)
 {
-	if (Isalnum(p) || p == '_')
+	if (iswalnum(p) || p == L'_')
 		return 1;
-	if (Isgraph(p))
+	if (iswgraph(p))
 		return 2;
 	return 0;
 }
@@ -221,18 +225,18 @@ cv__isword(Int p)
 /* cv__isWord():
  *	Return if p is part of a big word according to vi
  */
-protected int
-cv__isWord(Int p)
+libedit_private int
+cv__isWord(wint_t p)
 {
-	return !Isspace(p);
+	return !iswspace(p);
 }
 
 
 /* c__prev_word():
  *	Find the previous word
  */
-protected Char *
-c__prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
+libedit_private wchar_t *
+c__prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
 {
 	p--;
 
@@ -255,8 +259,8 @@ c__prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
 /* c__next_word():
  *	Find the next word
  */
-protected Char *
-c__next_word(Char *p, Char *high, int n, int (*wtest)(Int))
+libedit_private wchar_t *
+c__next_word(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
 {
 	while (n--) {
 		while ((p < high) && !(*wtest)(*p))
@@ -273,8 +277,9 @@ c__next_word(Char *p, Char *high, int n, int (*wtest)(Int))
 /* cv_next_word():
  *	Find the next word vi style
  */
-protected Char *
-cv_next_word(EditLine *el, Char *p, Char *high, int n, int (*wtest)(Int))
+libedit_private wchar_t *
+cv_next_word(EditLine *el, wchar_t *p, wchar_t *high, int n,
+    int (*wtest)(wint_t))
 {
 	int test;
 
@@ -287,7 +292,7 @@ cv_next_word(EditLine *el, Char *p, Char *high, int n, int (*wtest)(Int))
 		 * trailing whitespace! This is not what 'w' does..
 		 */
 		if (n || el->el_chared.c_vcmd.action != (DELETE|INSERT))
-			while ((p < high) && Isspace(*p))
+			while ((p < high) && iswspace(*p))
 				p++;
 	}
 
@@ -302,14 +307,14 @@ cv_next_word(EditLine *el, Char *p, Char *high, int n, int (*wtest)(Int))
 /* cv_prev_word():
  *	Find the previous word vi style
  */
-protected Char *
-cv_prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
+libedit_private wchar_t *
+cv_prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
 {
 	int test;
 
 	p--;
 	while (n--) {
-		while ((p > low) && Isspace(*p))
+		while ((p > low) && iswspace(*p))
 			p--;
 		test = (*wtest)(*p);
 		while ((p >= low) && (*wtest)(*p) == test)
@@ -328,7 +333,7 @@ cv_prev_word(Char *p, Char *low, int n, int (*wtest)(Int))
 /* cv_delfini():
  *	Finish vi delete action
  */
-protected void
+libedit_private void
 cv_delfini(EditLine *el)
 {
 	int size;
@@ -366,15 +371,15 @@ cv_delfini(EditLine *el)
 /* cv__endword():
  *	Go to the end of this word according to vi
  */
-protected Char *
-cv__endword(Char *p, Char *high, int n, int (*wtest)(Int))
+libedit_private wchar_t *
+cv__endword(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
 {
 	int test;
 
 	p++;
 
 	while (n--) {
-		while ((p < high) && Isspace(*p))
+		while ((p < high) && iswspace(*p))
 			p++;
 
 		test = (*wtest)(*p);
@@ -388,31 +393,25 @@ cv__endword(Char *p, Char *high, int n, int (*wtest)(Int))
 /* ch_init():
  *	Initialize the character editor
  */
-protected int
+libedit_private int
 ch_init(EditLine *el)
 {
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	el->el_line.buffer		= el_malloc(EL_BUFSIZ *
+	el->el_line.buffer		= el_calloc(EL_BUFSIZ,
 	    sizeof(*el->el_line.buffer));
 	if (el->el_line.buffer == NULL)
 		return -1;
 
-	(void) memset(el->el_line.buffer, 0, EL_BUFSIZ *
-	    sizeof(*el->el_line.buffer));
 	el->el_line.cursor		= el->el_line.buffer;
 	el->el_line.lastchar		= el->el_line.buffer;
 	el->el_line.limit		= &el->el_line.buffer[EL_BUFSIZ - EL_LEAVE];
 
-	el->el_chared.c_undo.buf	= el_malloc(EL_BUFSIZ *
+	el->el_chared.c_undo.buf	= el_calloc(EL_BUFSIZ,
 	    sizeof(*el->el_chared.c_undo.buf));
 	if (el->el_chared.c_undo.buf == NULL)
 		return -1;
-	(void) memset(el->el_chared.c_undo.buf, 0, EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_undo.buf));
 	el->el_chared.c_undo.len	= -1;
 	el->el_chared.c_undo.cursor	= 0;
-	el->el_chared.c_redo.buf	= el_malloc(EL_BUFSIZ *
+	el->el_chared.c_redo.buf	= el_calloc(EL_BUFSIZ,
 	    sizeof(*el->el_chared.c_redo.buf));
 	if (el->el_chared.c_redo.buf == NULL)
 		return -1;
@@ -423,16 +422,16 @@ ch_init(EditLine *el)
 	el->el_chared.c_vcmd.action	= NOP;
 	el->el_chared.c_vcmd.pos	= el->el_line.buffer;
 
-	el->el_chared.c_kill.buf	= el_malloc(EL_BUFSIZ *
+	el->el_chared.c_kill.buf	= el_calloc(EL_BUFSIZ,
 	    sizeof(*el->el_chared.c_kill.buf));
 	if (el->el_chared.c_kill.buf == NULL)
 		return -1;
-	(void) memset(el->el_chared.c_kill.buf, 0, EL_BUFSIZ *
-	    sizeof(*el->el_chared.c_kill.buf));
 	el->el_chared.c_kill.mark	= el->el_line.buffer;
 	el->el_chared.c_kill.last	= el->el_chared.c_kill.buf;
 	el->el_chared.c_resizefun	= NULL;
 	el->el_chared.c_resizearg	= NULL;
+	el->el_chared.c_aliasfun	= NULL;
+	el->el_chared.c_aliasarg	= NULL;
 
 	el->el_map.current		= el->el_map.key;
 
@@ -442,19 +441,14 @@ ch_init(EditLine *el)
 	el->el_state.argument		= 1;
 	el->el_state.lastcmd		= ED_UNASSIGNED;
 
-	ma->level	= -1;
-	ma->offset	= 0;
-	ma->macro	= el_malloc(EL_MAXMACRO * sizeof(*ma->macro));
-	if (ma->macro == NULL)
-		return -1;
 	return 0;
 }
 
 /* ch_reset():
  *	Reset the character editor
  */
-protected void
-ch_reset(EditLine *el, int mclear)
+libedit_private void
+ch_reset(EditLine *el)
 {
 	el->el_line.cursor		= el->el_line.buffer;
 	el->el_line.lastchar		= el->el_line.buffer;
@@ -476,28 +470,17 @@ ch_reset(EditLine *el, int mclear)
 	el->el_state.lastcmd		= ED_UNASSIGNED;
 
 	el->el_history.eventno		= 0;
-
-	if (mclear)
-		ch__clearmacro(el);
-}
-
-private void
-ch__clearmacro(EditLine *el)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-	while (ma->level >= 0)
-		el_free(ma->macro[ma->level--]);
 }
 
 /* ch_enlargebufs():
  *	Enlarge line buffer to be able to hold twice as much characters.
  *	Returns 1 if successful, 0 if not.
  */
-protected int
+libedit_private int
 ch_enlargebufs(EditLine *el, size_t addlen)
 {
 	size_t sz, newsz;
-	Char *newbuffer, *oldbuf, *oldkbuf;
+	wchar_t *newbuffer, *oldbuf, *oldkbuf;
 
 	sz = (size_t)(el->el_line.limit - el->el_line.buffer + EL_LEAVE);
 	newsz = sz * 2;
@@ -519,7 +502,7 @@ ch_enlargebufs(EditLine *el, size_t addlen)
 
 	/* zero the newly added memory, leave old data in */
 	(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
-	    
+
 	oldbuf = el->el_line.buffer;
 
 	el->el_line.buffer = newbuffer;
@@ -568,7 +551,7 @@ ch_enlargebufs(EditLine *el, size_t addlen)
 	el->el_chared.c_redo.lim = newbuffer +
 			(el->el_chared.c_redo.lim - el->el_chared.c_redo.buf);
 	el->el_chared.c_redo.buf = newbuffer;
-	
+
 	if (!hist_enlargebuf(el, sz, newsz))
 		return 0;
 
@@ -582,7 +565,7 @@ ch_enlargebufs(EditLine *el, size_t addlen)
 /* ch_end():
  *	Free the data structures used by the editor
  */
-protected void
+libedit_private void
 ch_end(EditLine *el)
 {
 	el_free(el->el_line.buffer);
@@ -597,21 +580,19 @@ ch_end(EditLine *el)
 	el->el_chared.c_redo.cmd = ED_UNASSIGNED;
 	el_free(el->el_chared.c_kill.buf);
 	el->el_chared.c_kill.buf = NULL;
-	ch_reset(el, 1);
-	el_free(el->el_chared.c_macro.macro);
-	el->el_chared.c_macro.macro = NULL;
+	ch_reset(el);
 }
 
 
 /* el_insertstr():
- *	Insert string at cursorI
+ *	Insert string at cursor
  */
-public int
-FUN(el,insertstr)(EditLine *el, const Char *s)
+int
+el_winsertstr(EditLine *el, const wchar_t *s)
 {
 	size_t len;
 
-	if ((len = Strlen(s)) == 0)
+	if (s == NULL || (len = wcslen(s)) == 0)
 		return -1;
 	if (el->el_line.lastchar + len >= el->el_line.limit) {
 		if (!ch_enlargebufs(el, len))
@@ -628,7 +609,7 @@ FUN(el,insertstr)(EditLine *el, const Char *s)
 /* el_deletestr():
  *	Delete num characters before the cursor
  */
-public void
+void
 el_deletestr(EditLine *el, int n)
 {
 	if (n <= 0)
@@ -643,18 +624,99 @@ el_deletestr(EditLine *el, int n)
 		el->el_line.cursor = el->el_line.buffer;
 }
 
+/* el_deletestr1():
+ *	Delete characters between start and end
+ */
+int
+el_deletestr1(EditLine *el, int start, int end)
+{
+	size_t line_length, len;
+	wchar_t *p1, *p2;
+
+	if (end <= start)
+		return 0;
+
+	line_length = (size_t)(el->el_line.lastchar - el->el_line.buffer);
+
+	if (start >= (int)line_length || end >= (int)line_length)
+		return 0;
+
+	len = (size_t)(end - start);
+	if (len > line_length - (size_t)end)
+		len = line_length - (size_t)end;
+
+	p1 = el->el_line.buffer + start;
+	p2 = el->el_line.buffer + end;
+	for (size_t i = 0; i < len; i++) {
+		*p1++ = *p2++;
+		el->el_line.lastchar--;
+	}
+
+	if (el->el_line.cursor < el->el_line.buffer)
+		el->el_line.cursor = el->el_line.buffer;
+
+	return end - start;
+}
+
+/* el_wreplacestr():
+ *	Replace the contents of the line with the provided string
+ */
+int
+el_wreplacestr(EditLine *el, const wchar_t *s)
+{
+	size_t len;
+	wchar_t * p;
+
+	if (s == NULL || (len = wcslen(s)) == 0)
+		return -1;
+
+	if (el->el_line.buffer + len >= el->el_line.limit) {
+		if (!ch_enlargebufs(el, len))
+			return -1;
+	}
+
+	p = el->el_line.buffer;
+	for (size_t i = 0; i < len; i++)
+		*p++ = *s++;
+
+	el->el_line.buffer[len] = '\0';
+	el->el_line.lastchar = el->el_line.buffer + len;
+	if (el->el_line.cursor > el->el_line.lastchar)
+		el->el_line.cursor = el->el_line.lastchar;
+
+	return 0;
+}
+
+/* el_cursor():
+ *	Move the cursor to the left or the right of the current position
+ */
+int
+el_cursor(EditLine *el, int n)
+{
+	if (n == 0)
+		goto out;
+
+	el->el_line.cursor += n;
+
+	if (el->el_line.cursor < el->el_line.buffer)
+		el->el_line.cursor = el->el_line.buffer;
+	if (el->el_line.cursor > el->el_line.lastchar)
+		el->el_line.cursor = el->el_line.lastchar;
+out:
+	return (int)(el->el_line.cursor - el->el_line.buffer);
+}
+
 /* c_gets():
  *	Get a string
  */
-protected int
-c_gets(EditLine *el, Char *buf, const Char *prompt)
+libedit_private int
+c_gets(EditLine *el, wchar_t *buf, const wchar_t *prompt)
 {
-	Char ch;
 	ssize_t len;
-	Char *cp = el->el_line.buffer;
+	wchar_t *cp = el->el_line.buffer, ch;
 
 	if (prompt) {
-		len = (ssize_t)Strlen(prompt);
+		len = (ssize_t)wcslen(prompt);
 		(void)memcpy(cp, prompt, (size_t)len * sizeof(*cp));
 		cp += len;
 	}
@@ -666,7 +728,7 @@ c_gets(EditLine *el, Char *buf, const Char *prompt)
 		el->el_line.lastchar = cp + 1;
 		re_refresh(el);
 
-		if (FUN(el,getc)(el, &ch) != 1) {
+		if (el_wgetc(el, &ch) != 1) {
 			ed_end_of_file(el, 0);
 			len = -1;
 			break;
@@ -674,18 +736,19 @@ c_gets(EditLine *el, Char *buf, const Char *prompt)
 
 		switch (ch) {
 
-		case 0010:	/* Delete and backspace */
+		case L'\b':	/* Delete and backspace */
 		case 0177:
 			if (len == 0) {
 				len = -1;
 				break;
 			}
+			len--;
 			cp--;
 			continue;
 
 		case 0033:	/* ESC */
-		case '\r':	/* Newline */
-		case '\n':
+		case L'\r':	/* Newline */
+		case L'\n':
 			buf[len] = ch;
 			break;
 
@@ -711,10 +774,10 @@ c_gets(EditLine *el, Char *buf, const Char *prompt)
 /* c_hpos():
  *	Return the current horizontal position of the cursor
  */
-protected int
+libedit_private int
 c_hpos(EditLine *el)
 {
-	Char *ptr;
+	wchar_t *ptr;
 
 	/*
 	 * Find how many characters till the beginning of this line.
@@ -730,10 +793,18 @@ c_hpos(EditLine *el)
 	}
 }
 
-protected int
+libedit_private int
 ch_resizefun(EditLine *el, el_zfunc_t f, void *a)
 {
 	el->el_chared.c_resizefun = f;
 	el->el_chared.c_resizearg = a;
 	return 0;
 }
+
+libedit_private int
+ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
+{
+	el->el_chared.c_aliasfun = f;
+	el->el_chared.c_aliasarg = a;
+	return 0;
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/chared.h b/extra/libedit/libedit-20221030-3.1/src/chared.h
new file mode 100644
index 000000000000..39f7d5173a7c
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/chared.h
@@ -0,0 +1,155 @@
+/*	$NetBSD: chared.h,v 1.30 2016/05/22 19:44:26 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)chared.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * el.chared.h: Character editor interface
+ */
+#ifndef _h_el_chared
+#define	_h_el_chared
+
+/*
+ * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
+ * like real vi: i.e. the transition from command<->insert modes moves
+ * the cursor.
+ *
+ * On the other hand we really don't want to move the cursor, because
+ * all the editing commands don't include the character under the cursor.
+ * Probably the best fix is to make all the editing commands aware of
+ * this fact.
+ */
+#define	VI_MOVE
+
+/*
+ * Undo information for vi - no undo in emacs (yet)
+ */
+typedef struct c_undo_t {
+	ssize_t	 len;			/* length of saved line */
+	int	 cursor;		/* position of saved cursor */
+	wchar_t	*buf;			/* full saved text */
+} c_undo_t;
+
+/* redo for vi */
+typedef struct c_redo_t {
+	wchar_t	*buf;			/* redo insert key sequence */
+	wchar_t	*pos;
+	wchar_t	*lim;
+	el_action_t	cmd;		/* command to redo */
+	wchar_t	ch;			/* char that invoked it */
+	int	count;
+	int	action;			/* from cv_action() */
+} c_redo_t;
+
+/*
+ * Current action information for vi
+ */
+typedef struct c_vcmd_t {
+	int	 action;
+	wchar_t	*pos;
+} c_vcmd_t;
+
+/*
+ * Kill buffer for emacs
+ */
+typedef struct c_kill_t {
+	wchar_t	*buf;
+	wchar_t	*last;
+	wchar_t	*mark;
+} c_kill_t;
+
+typedef void (*el_zfunc_t)(EditLine *, void *);
+typedef const char *(*el_afunc_t)(void *, const char *);
+
+/*
+ * Note that we use both data structures because the user can bind
+ * commands from both editors!
+ */
+typedef struct el_chared_t {
+	c_undo_t	c_undo;
+	c_kill_t	c_kill;
+	c_redo_t	c_redo;
+	c_vcmd_t	c_vcmd;
+	el_zfunc_t	c_resizefun;
+	el_afunc_t	c_aliasfun;
+	void *		c_resizearg;
+	void *		c_aliasarg;
+} el_chared_t;
+
+
+#define	STRQQ		"\"\""
+
+#define	isglob(a)	(strchr("*[]?", (a)) != NULL)
+
+#define	NOP		0x00
+#define	DELETE		0x01
+#define	INSERT		0x02
+#define	YANK		0x04
+
+#define	CHAR_FWD	(+1)
+#define	CHAR_BACK	(-1)
+
+#define	MODE_INSERT	0
+#define	MODE_REPLACE	1
+#define	MODE_REPLACE_1	2
+
+
+libedit_private int	 cv__isword(wint_t);
+libedit_private int	 cv__isWord(wint_t);
+libedit_private void	 cv_delfini(EditLine *);
+libedit_private wchar_t *cv__endword(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private int	 ce__isword(wint_t);
+libedit_private void	 cv_undo(EditLine *);
+libedit_private void	 cv_yank(EditLine *, const wchar_t *, int);
+libedit_private wchar_t *cv_next_word(EditLine*, wchar_t *, wchar_t *, int,
+			int (*)(wint_t));
+libedit_private wchar_t *cv_prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private wchar_t *c__next_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private wchar_t *c__prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private void	 c_insert(EditLine *, int);
+libedit_private void	 c_delbefore(EditLine *, int);
+libedit_private void	 c_delbefore1(EditLine *);
+libedit_private void	 c_delafter(EditLine *, int);
+libedit_private void	 c_delafter1(EditLine *);
+libedit_private int	 c_gets(EditLine *, wchar_t *, const wchar_t *);
+libedit_private int	 c_hpos(EditLine *);
+
+libedit_private int	 ch_init(EditLine *);
+libedit_private void	 ch_reset(EditLine *);
+libedit_private int	 ch_resizefun(EditLine *, el_zfunc_t, void *);
+libedit_private int	 ch_aliasfun(EditLine *, el_afunc_t, void *);
+libedit_private int	 ch_enlargebufs(EditLine *, size_t);
+libedit_private void	 ch_end(EditLine *);
+
+#endif /* _h_el_chared */
diff --git a/extra/libedit/libedit-20221030-3.1/src/chartype.c b/extra/libedit/libedit-20221030-3.1/src/chartype.c
new file mode 100644
index 000000000000..3df4af69b51a
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/chartype.c
@@ -0,0 +1,339 @@
+/*	$NetBSD: chartype.c,v 1.35 2019/07/23 10:18:52 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * chartype.c: character classification and meta information
+ */
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+__RCSID("$NetBSD: chartype.c,v 1.35 2019/07/23 10:18:52 christos Exp $");
+#endif /* not lint && not SCCSID */
+
+#include <ctype.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "el.h"
+
+#define CT_BUFSIZ ((size_t)1024)
+
+static int ct_conv_cbuff_resize(ct_buffer_t *, size_t);
+static int ct_conv_wbuff_resize(ct_buffer_t *, size_t);
+
+static int
+ct_conv_cbuff_resize(ct_buffer_t *conv, size_t csize)
+{
+	void *p;
+
+	if (csize <= conv->csize)
+		return 0;
+
+	conv->csize = csize;
+
+	p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff));
+	if (p == NULL) {
+		conv->csize = 0;
+		el_free(conv->cbuff);
+		conv->cbuff = NULL;
+		return -1;
+	}
+	conv->cbuff = p;
+	return 0;
+}
+
+static int
+ct_conv_wbuff_resize(ct_buffer_t *conv, size_t wsize)
+{
+	void *p;
+
+	if (wsize <= conv->wsize)
+		return 0;
+
+	conv->wsize = wsize;
+
+	p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff));
+	if (p == NULL) {
+		conv->wsize = 0;
+		el_free(conv->wbuff);
+		conv->wbuff = NULL;
+		return -1;
+	}
+	conv->wbuff = p;
+	return 0;
+}
+
+
+char *
+ct_encode_string(const wchar_t *s, ct_buffer_t *conv)
+{
+	char *dst;
+	ssize_t used;
+
+	if (!s)
+		return NULL;
+
+	dst = conv->cbuff;
+	for (;;) {
+		used = (ssize_t)(dst - conv->cbuff);
+		if ((conv->csize - (size_t)used) < 5) {
+			if (ct_conv_cbuff_resize(conv,
+			    conv->csize + CT_BUFSIZ) == -1)
+				return NULL;
+			dst = conv->cbuff + used;
+		}
+		if (!*s)
+			break;
+		used = ct_encode_char(dst, (size_t)5, *s);
+		if (used == -1) /* failed to encode, need more buffer space */
+			abort();
+		++s;
+		dst += used;
+	}
+	*dst = '\0';
+	return conv->cbuff;
+}
+
+wchar_t *
+ct_decode_string(const char *s, ct_buffer_t *conv)
+{
+	size_t len;
+
+	if (!s)
+		return NULL;
+
+	len = mbstowcs(NULL, s, (size_t)0);
+	if (len == (size_t)-1)
+		return NULL;
+
+	if (conv->wsize < ++len)
+		if (ct_conv_wbuff_resize(conv, len + CT_BUFSIZ) == -1)
+			return NULL;
+
+	mbstowcs(conv->wbuff, s, conv->wsize);
+	return conv->wbuff;
+}
+
+
+libedit_private wchar_t **
+ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
+{
+	size_t bufspace;
+	int i;
+	wchar_t *p;
+	wchar_t **wargv;
+	ssize_t bytes;
+
+	/* Make sure we have enough space in the conversion buffer to store all
+	 * the argv strings. */
+	for (i = 0, bufspace = 0; i < argc; ++i)
+		bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
+	if (conv->wsize < ++bufspace)
+		if (ct_conv_wbuff_resize(conv, bufspace + CT_BUFSIZ) == -1)
+			return NULL;
+
+	wargv = el_calloc((size_t)(argc + 1), sizeof(*wargv));
+
+	for (i = 0, p = conv->wbuff; i < argc; ++i) {
+		if (!argv[i]) {   /* don't pass null pointers to mbstowcs */
+			wargv[i] = NULL;
+			continue;
+		} else {
+			wargv[i] = p;
+			bytes = (ssize_t)mbstowcs(p, argv[i], bufspace);
+		}
+		if (bytes == -1) {
+			el_free(wargv);
+			return NULL;
+		} else
+			bytes++;  /* include '\0' in the count */
+		bufspace -= (size_t)bytes;
+		p += bytes;
+	}
+	wargv[i] = NULL;
+
+	return wargv;
+}
+
+
+libedit_private size_t
+ct_enc_width(wchar_t c)
+{
+	mbstate_t mbs;
+	char buf[MB_LEN_MAX];
+	size_t size;
+	memset(&mbs, 0, sizeof(mbs));
+
+	if ((size = wcrtomb(buf, c, &mbs)) == (size_t)-1)
+		return 0;
+	return size;
+}
+
+libedit_private ssize_t
+ct_encode_char(char *dst, size_t len, wchar_t c)
+{
+	ssize_t l = 0;
+	if (len < ct_enc_width(c))
+		return -1;
+	l = wctomb(dst, c);
+
+	if (l < 0) {
+		wctomb(NULL, L'\0');
+		l = 0;
+	}
+	return l;
+}
+
+libedit_private const wchar_t *
+ct_visual_string(const wchar_t *s, ct_buffer_t *conv)
+{
+	wchar_t *dst;
+	ssize_t used;
+
+	if (!s)
+		return NULL;
+
+	if (ct_conv_wbuff_resize(conv, CT_BUFSIZ) == -1)
+		return NULL;
+
+	used = 0;
+	dst = conv->wbuff;
+	while (*s) {
+		used = ct_visual_char(dst,
+		    conv->wsize - (size_t)(dst - conv->wbuff), *s);
+		if (used != -1) {
+			++s;
+			dst += used;
+			continue;
+		}
+
+		/* failed to encode, need more buffer space */
+		used = dst - conv->wbuff;
+		if (ct_conv_wbuff_resize(conv, conv->wsize + CT_BUFSIZ) == -1)
+			return NULL;
+		dst = conv->wbuff + used;
+	}
+
+	if (dst >= (conv->wbuff + conv->wsize)) { /* sigh */
+		used = dst - conv->wbuff;
+		if (ct_conv_wbuff_resize(conv, conv->wsize + CT_BUFSIZ) == -1)
+			return NULL;
+		dst = conv->wbuff + used;
+	}
+
+	*dst = L'\0';
+	return conv->wbuff;
+}
+
+
+
+libedit_private int
+ct_visual_width(wchar_t c)
+{
+	int t = ct_chr_class(c);
+	switch (t) {
+	case CHTYPE_ASCIICTL:
+		return 2; /* ^@ ^? etc. */
+	case CHTYPE_TAB:
+		return 1; /* Hmm, this really need to be handled outside! */
+	case CHTYPE_NL:
+		return 0; /* Should this be 1 instead? */
+	case CHTYPE_PRINT:
+		return wcwidth(c);
+	case CHTYPE_NONPRINT:
+		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
+			return 8; /* \U+12345 */
+		else
+			return 7; /* \U+1234 */
+	default:
+		return 0; /* should not happen */
+	}
+}
+
+
+libedit_private ssize_t
+ct_visual_char(wchar_t *dst, size_t len, wchar_t c)
+{
+	int t = ct_chr_class(c);
+	switch (t) {
+	case CHTYPE_TAB:
+	case CHTYPE_NL:
+	case CHTYPE_ASCIICTL:
+		if (len < 2)
+			return -1;   /* insufficient space */
+		*dst++ = '^';
+		if (c == '\177')
+			*dst = '?'; /* DEL -> ^? */
+		else
+			*dst = c | 0100;    /* uncontrolify it */
+		return 2;
+	case CHTYPE_PRINT:
+		if (len < 1)
+			return -1;  /* insufficient space */
+		*dst = c;
+		return 1;
+	case CHTYPE_NONPRINT:
+		/* we only use single-width glyphs for display,
+		 * so this is right */
+		if ((ssize_t)len < ct_visual_width(c))
+			return -1;   /* insufficient space */
+		*dst++ = '\\';
+		*dst++ = 'U';
+		*dst++ = '+';
+#define tohexdigit(v) "0123456789ABCDEF"[v]
+		if (c > 0xffff) /* prefer standard 4-byte display over 5-byte */
+			*dst++ = tohexdigit(((unsigned int) c >> 16) & 0xf);
+		*dst++ = tohexdigit(((unsigned int) c >> 12) & 0xf);
+		*dst++ = tohexdigit(((unsigned int) c >>  8) & 0xf);
+		*dst++ = tohexdigit(((unsigned int) c >>  4) & 0xf);
+		*dst   = tohexdigit(((unsigned int) c      ) & 0xf);
+		return c > 0xffff ? 8 : 7;
+		/*FALLTHROUGH*/
+	/* these two should be handled outside this function */
+	default:            /* we should never hit the default */
+		return 0;
+	}
+}
+
+
+
+
+libedit_private int
+ct_chr_class(wchar_t c)
+{
+	if (c == '\t')
+		return CHTYPE_TAB;
+	else if (c == '\n')
+		return CHTYPE_NL;
+	else if (c < 0x100 && iswcntrl(c))
+		return CHTYPE_ASCIICTL;
+	else if (iswprint(c))
+		return CHTYPE_PRINT;
+	else
+		return CHTYPE_NONPRINT;
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/chartype.h b/extra/libedit/libedit-20221030-3.1/src/chartype.h
new file mode 100644
index 000000000000..bcdb293a12f4
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/chartype.h
@@ -0,0 +1,120 @@
+/*	$NetBSD: chartype.h,v 1.37 2022/04/11 19:37:20 tnn Exp $	*/
+
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifndef _h_chartype_f
+#define _h_chartype_f
+
+/* Ideally we should also test the value of the define to see if it
+ * supports non-BMP code points without requiring UTF-16, but nothing
+ * seems to actually advertise this properly, despite Unicode 3.1 having
+ * been around since 2001... */
+#if	!defined(__NetBSD__) && \
+	!defined(__sun) && \
+	!defined(__osf__) && \
+	!(defined(__APPLE__) && defined(__MACH__)) && \
+	!defined(__OpenBSD__) && \
+	!defined(__FreeBSD__) && \
+	!defined(__DragonFly__)
+#ifndef __STDC_ISO_10646__
+/* In many places it is assumed that the first 127 code points are ASCII
+ * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
+ * funky encoding that could break us in weird and wonderful ways. */
+	#error wchar_t must store ISO 10646 characters
+#endif
+#endif
+
+/* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
+ * ref: ISO/IEC DTR 19769
+ */
+#if WCHAR_MAX < INT32_MAX
+#warning Build environment does not support non-BMP characters
+#endif
+
+/*
+ * Conversion buffer
+ */
+typedef struct ct_buffer_t {
+        char    *cbuff;
+        size_t  csize;
+        wchar_t *wbuff;
+        size_t  wsize;
+} ct_buffer_t;
+
+/* Encode a wide-character string and return the UTF-8 encoded result. */
+char *ct_encode_string(const wchar_t *, ct_buffer_t *);
+
+/* Decode a (multi)?byte string and return the wide-character string result. */
+wchar_t *ct_decode_string(const char *, ct_buffer_t *);
+
+/* Decode a (multi)?byte argv string array.
+ * The pointer returned must be free()d when done. */
+libedit_private wchar_t **ct_decode_argv(int, const char *[],  ct_buffer_t *);
+
+/* Encode a character into the destination buffer, provided there is sufficient
+ * buffer space available. Returns the number of bytes used up (zero if the
+ * character cannot be encoded, -1 if there was not enough space available). */
+libedit_private ssize_t ct_encode_char(char *, size_t, wchar_t);
+libedit_private size_t ct_enc_width(wchar_t);
+
+/* The maximum buffer size to hold the most unwieldy visual representation,
+ * in this case \U+nnnnn. */
+#define VISUAL_WIDTH_MAX ((size_t)8)
+
+/* The terminal is thought of in terms of X columns by Y lines. In the cases
+ * where a wide character takes up more than one column, the adjacent
+ * occupied column entries will contain this faux character. */
+#define MB_FILL_CHAR ((wint_t)-1)
+
+/* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
+ * style visual expansions. */
+libedit_private int ct_visual_width(wchar_t);
+
+/* Turn the given character into the appropriate visual format, matching
+ * the width given by ct_visual_width(). Returns the number of characters used
+ * up, or -1 if insufficient space. Buffer length is in count of wchar_t's. */
+libedit_private ssize_t ct_visual_char(wchar_t *, size_t, wchar_t);
+
+/* Convert the given string into visual format, using the ct_visual_char()
+ * function. Uses a static buffer, so not threadsafe. */
+libedit_private const wchar_t *ct_visual_string(const wchar_t *, ct_buffer_t *);
+
+
+/* printable character, use ct_visual_width() to find out display width */
+#define CHTYPE_PRINT        ( 0)
+/* control character found inside the ASCII portion of the charset */
+#define CHTYPE_ASCIICTL     (-1)
+/* a \t */
+#define CHTYPE_TAB          (-2)
+/* a \n */
+#define CHTYPE_NL           (-3)
+/* non-printable character */
+#define CHTYPE_NONPRINT     (-4)
+/* classification of character c, as one of the above defines */
+libedit_private int ct_chr_class(wchar_t c);
+
+#endif /* _chartype_f */
diff --git a/cmd-line-utils/libedit/common.c b/extra/libedit/libedit-20221030-3.1/src/common.c
similarity index 75%
rename from cmd-line-utils/libedit/common.c
rename to extra/libedit/libedit-20221030-3.1/src/common.c
index c0512061e6fb..f33c29650d79 100644
--- a/cmd-line-utils/libedit/common.c
+++ b/extra/libedit/libedit-20221030-3.1/src/common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.c,v 1.28 2011/07/29 20:58:07 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.49 2020/03/30 06:54:37 ryo Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,21 +37,29 @@
 #if 0
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: common.c,v 1.49 2020/03/30 06:54:37 ryo Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * common.c: Common Editor functions
  */
+#include <ctype.h>
+#include <string.h>
+
 #include "el.h"
+#include "common.h"
+#include "fcns.h"
+#include "parse.h"
+#include "vi.h"
 
 /* ed_end_of_file():
  *	Indicate end of file
  *	[^D]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_end_of_file(EditLine *el, Int c __attribute__((__unused__)))
+ed_end_of_file(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	re_goto_bottom(el);
@@ -64,8 +72,8 @@ ed_end_of_file(EditLine *el, Int c __attribute__((__unused__)))
  *	Add character to the line
  *	Insert a character [bound to all insert keys]
  */
-protected el_action_t
-ed_insert(EditLine *el, Int c)
+libedit_private el_action_t
+ed_insert(EditLine *el, wint_t c)
 {
 	int count = el->el_state.argument;
 
@@ -106,11 +114,11 @@ ed_insert(EditLine *el, Int c)
  *	Delete from beginning of current word to cursor
  *	[M-^?] [^W]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_delete_prev_word(EditLine *el, Int c __attribute__((__unused__)))
+ed_delete_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *p, *kp;
+	wchar_t *cp, *p, *kp;
 
 	if (el->el_line.cursor == el->el_line.buffer)
 		return CC_ERROR;
@@ -134,14 +142,14 @@ ed_delete_prev_word(EditLine *el, Int c __attribute__((__unused__)))
  *	Delete character under cursor
  *	[^D] [x]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_delete_next_char(EditLine *el, Int c __attribute__((__unused__)))
+ed_delete_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 #ifdef DEBUG_EDIT
 #define	EL	el->el_line
-	(void) fprintf(el->el_errlfile,
-	    "\nD(b: %x(%s)  c: %x(%s) last: %x(%s) limit: %x(%s)\n",
+	(void) fprintf(el->el_errfile,
+	    "\nD(b: %p(%ls)  c: %p(%ls) last: %p(%ls) limit: %p(%ls)\n",
 	    EL.buffer, EL.buffer, EL.cursor, EL.cursor, EL.lastchar,
 	    EL.lastchar, EL.limit, EL.limit);
 #endif
@@ -164,15 +172,12 @@ ed_delete_next_char(EditLine *el, Int c __attribute__((__unused__)))
 				return CC_ERROR;
 #endif
 			}
-		} else {
-			if (el->el_line.cursor != el->el_line.buffer)
-				el->el_line.cursor--;
-			else
+		} else
 				return CC_ERROR;
-		}
 	}
 	c_delafter(el, el->el_state.argument);	/* delete after dot */
-	if (el->el_line.cursor >= el->el_line.lastchar &&
+	if (el->el_map.type == MAP_VI &&
+	    el->el_line.cursor >= el->el_line.lastchar &&
 	    el->el_line.cursor > el->el_line.buffer)
 			/* bounds check */
 		el->el_line.cursor = el->el_line.lastchar - 1;
@@ -184,11 +189,11 @@ ed_delete_next_char(EditLine *el, Int c __attribute__((__unused__)))
  *	Cut to the end of line
  *	[^K] [^K]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_kill_line(EditLine *el, Int c __attribute__((__unused__)))
+ed_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *kp, *cp;
+	wchar_t *kp, *cp;
 
 	cp = el->el_line.cursor;
 	kp = el->el_chared.c_kill.buf;
@@ -205,9 +210,9 @@ ed_kill_line(EditLine *el, Int c __attribute__((__unused__)))
  *	Move cursor to the end of line
  *	[^E] [^E]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_move_to_end(EditLine *el, Int c __attribute__((__unused__)))
+ed_move_to_end(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_line.cursor = el->el_line.lastchar;
@@ -228,16 +233,16 @@ ed_move_to_end(EditLine *el, Int c __attribute__((__unused__)))
  *	Move cursor to the beginning of line
  *	[^A] [^A]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_move_to_beg(EditLine *el, Int c __attribute__((__unused__)))
+ed_move_to_beg(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_line.cursor = el->el_line.buffer;
 
 	if (el->el_map.type == MAP_VI) {
 			/* We want FIRST non space character */
-		while (Isspace(*el->el_line.cursor))
+		while (iswspace(*el->el_line.cursor))
 			el->el_line.cursor++;
 		if (el->el_chared.c_vcmd.action != NOP) {
 			cv_delfini(el);
@@ -252,8 +257,8 @@ ed_move_to_beg(EditLine *el, Int c __attribute__((__unused__)))
  *	Exchange the character to the left of the cursor with the one under it
  *	[^T] [^T]
  */
-protected el_action_t
-ed_transpose_chars(EditLine *el, Int c)
+libedit_private el_action_t
+ed_transpose_chars(EditLine *el, wint_t c)
 {
 
 	if (el->el_line.cursor < el->el_line.lastchar) {
@@ -277,11 +282,11 @@ ed_transpose_chars(EditLine *el, Int c)
  *	Move to the right one character
  *	[^F] [^F]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_next_char(EditLine *el, Int c __attribute__((__unused__)))
+ed_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *lim = el->el_line.lastchar;
+	wchar_t *lim = el->el_line.lastchar;
 
 	if (el->el_line.cursor >= lim ||
 	    (el->el_line.cursor == lim - 1 &&
@@ -306,9 +311,9 @@ ed_next_char(EditLine *el, Int c __attribute__((__unused__)))
  *	Move to the beginning of the current word
  *	[M-b] [b]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_prev_word(EditLine *el, Int c __attribute__((__unused__)))
+ed_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	if (el->el_line.cursor == el->el_line.buffer)
@@ -332,9 +337,9 @@ ed_prev_word(EditLine *el, Int c __attribute__((__unused__)))
  *	Move to the left one character
  *	[^B] [^B]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_prev_char(EditLine *el, Int c __attribute__((__unused__)))
+ed_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	if (el->el_line.cursor > el->el_line.buffer) {
@@ -357,18 +362,18 @@ ed_prev_char(EditLine *el, Int c __attribute__((__unused__)))
  *	Add the next character typed verbatim
  *	[^V] [^V]
  */
-protected el_action_t
-ed_quoted_insert(EditLine *el, Int c)
+libedit_private el_action_t
+/*ARGSUSED*/
+ed_quoted_insert(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	int num;
-	Char tc;
+	wchar_t ch;
 
 	tty_quotemode(el);
-	num = FUN(el,getc)(el, &tc);
-	c = tc;
+	num = el_wgetc(el, &ch);
 	tty_noquotemode(el);
 	if (num == 1)
-		return ed_insert(el, c);
+		return ed_insert(el, ch);
 	else
 		return ed_end_of_file(el, 0);
 }
@@ -377,11 +382,11 @@ ed_quoted_insert(EditLine *el, Int c)
 /* ed_digit():
  *	Adds to argument or enters a digit
  */
-protected el_action_t
-ed_digit(EditLine *el, Int c)
+libedit_private el_action_t
+ed_digit(EditLine *el, wint_t c)
 {
 
-	if (!Isdigit(c))
+	if (!iswdigit(c))
 		return CC_ERROR;
 
 	if (el->el_state.doingarg) {
@@ -405,11 +410,11 @@ ed_digit(EditLine *el, Int c)
  *	Digit that starts argument
  *	For ESC-n
  */
-protected el_action_t
-ed_argument_digit(EditLine *el, Int c)
+libedit_private el_action_t
+ed_argument_digit(EditLine *el, wint_t c)
 {
 
-	if (!Isdigit(c))
+	if (!iswdigit(c))
 		return CC_ERROR;
 
 	if (el->el_state.doingarg) {
@@ -429,112 +434,24 @@ ed_argument_digit(EditLine *el, Int c)
  *	Indicates unbound character
  *	Bound to keys that are not assigned
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
 ed_unassigned(EditLine *el __attribute__((__unused__)),
-    Int c __attribute__((__unused__)))
+    wint_t c __attribute__((__unused__)))
 {
 
 	return CC_ERROR;
 }
 
 
-/**
- ** TTY key handling.
- **/
-
-/* ed_tty_sigint():
- *	Tty interrupt character
- *	[^C]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigint(EditLine *el __attribute__((__unused__)), 
-	      Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_dsusp():
- *	Tty delayed suspend character
- *	[^Y]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_dsusp(EditLine *el __attribute__((__unused__)), 
-	     Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_flush_output():
- *	Tty flush output characters
- *	[^O]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_flush_output(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_sigquit():
- *	Tty quit character
- *	[^\]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigquit(EditLine *el __attribute__((__unused__)), 
-	       Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_sigtstp():
- *	Tty suspend character
- *	[^Z]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_sigtstp(EditLine *el __attribute__((__unused__)), 
-	       Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_stop_output():
- *	Tty disallow output characters
- *	[^S]
- */
-protected el_action_t
-/*ARGSUSED*/
-ed_tty_stop_output(EditLine *el __attribute__((__unused__)), 
-		   Int c __attribute__((__unused__)))
-{
-
-	return CC_NORM;
-}
-
-
-/* ed_tty_start_output():
- *	Tty allow output characters
- *	[^Q]
+/* ed_ignore():
+ *	Input characters that have no effect
+ *	[^C ^O ^Q ^S ^Z ^\ ^]] [^C ^O ^Q ^S ^\]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_tty_start_output(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
+ed_ignore(EditLine *el __attribute__((__unused__)),
+	      wint_t c __attribute__((__unused__)))
 {
 
 	return CC_NORM;
@@ -545,9 +462,9 @@ ed_tty_start_output(EditLine *el __attribute__((__unused__)),
  *	Execute command
  *	[^J]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_newline(EditLine *el, Int c __attribute__((__unused__)))
+ed_newline(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	re_goto_bottom(el);
@@ -561,9 +478,9 @@ ed_newline(EditLine *el, Int c __attribute__((__unused__)))
  *	Delete the character to the left of the cursor
  *	[^?]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
+ed_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	if (el->el_line.cursor <= el->el_line.buffer)
@@ -581,9 +498,9 @@ ed_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
  *	Clear screen leaving current line at the top
  *	[^L]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_clear_screen(EditLine *el, Int c __attribute__((__unused__)))
+ed_clear_screen(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	terminal_clear_screen(el);	/* clear the whole real screen */
@@ -596,10 +513,10 @@ ed_clear_screen(EditLine *el, Int c __attribute__((__unused__)))
  *	Redisplay everything
  *	^R
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_redisplay(EditLine *el __attribute__((__unused__)), 
-	     Int c __attribute__((__unused__)))
+ed_redisplay(EditLine *el __attribute__((__unused__)),
+	     wint_t c __attribute__((__unused__)))
 {
 
 	return CC_REDISPLAY;
@@ -610,12 +527,12 @@ ed_redisplay(EditLine *el __attribute__((__unused__)),
  *	Erase current line and start from scratch
  *	[^G]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_start_over(EditLine *el, Int c __attribute__((__unused__)))
+ed_start_over(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
-	ch_reset(el, 0);
+	ch_reset(el);
 	return CC_REFRESH;
 }
 
@@ -624,10 +541,10 @@ ed_start_over(EditLine *el, Int c __attribute__((__unused__)))
  *	First character in a bound sequence
  *	Placeholder for external keys
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_sequence_lead_in(EditLine *el __attribute__((__unused__)), 
-		    Int c __attribute__((__unused__)))
+ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
+		    wint_t c __attribute__((__unused__)))
 {
 
 	return CC_NORM;
@@ -638,9 +555,9 @@ ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
  *	Move to the previous history line
  *	[^P] [k]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_prev_history(EditLine *el, Int c __attribute__((__unused__)))
+ed_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	char beep = 0;
 	int sv_event = el->el_history.eventno;
@@ -650,7 +567,7 @@ ed_prev_history(EditLine *el, Int c __attribute__((__unused__)))
 
 	if (el->el_history.eventno == 0) {	/* save the current buffer
 						 * away */
-		(void) Strncpy(el->el_history.buf, el->el_line.buffer,
+		(void) wcsncpy(el->el_history.buf, el->el_line.buffer,
 		    EL_BUFSIZ);
 		el->el_history.last = el->el_history.buf +
 		    (el->el_line.lastchar - el->el_line.buffer);
@@ -660,7 +577,6 @@ ed_prev_history(EditLine *el, Int c __attribute__((__unused__)))
 	if (hist_get(el) == CC_ERROR) {
 		if (el->el_map.type == MAP_VI) {
 			el->el_history.eventno = sv_event;
-			
 		}
 		beep = 1;
 		/* el->el_history.eventno was fixed by first call */
@@ -676,9 +592,9 @@ ed_prev_history(EditLine *el, Int c __attribute__((__unused__)))
  *	Move to the next history line
  *	[^N] [j]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_next_history(EditLine *el, Int c __attribute__((__unused__)))
+ed_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	el_action_t beep = CC_REFRESH, rval;
 
@@ -703,13 +619,13 @@ ed_next_history(EditLine *el, Int c __attribute__((__unused__)))
  *	Search previous in history for a line matching the current
  *	next search history [M-P] [K]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_search_prev_history(EditLine *el, Int c __attribute__((__unused__)))
+ed_search_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	const Char *hp;
+	const wchar_t *hp;
 	int h;
-	bool_t found = 0;
+	int found = 0;
 
 	el->el_chared.c_vcmd.action = NOP;
 	el->el_chared.c_undo.len = -1;
@@ -723,7 +639,7 @@ ed_search_prev_history(EditLine *el, Int c __attribute__((__unused__)))
 		return CC_ERROR;
 	}
 	if (el->el_history.eventno == 0) {
-		(void) Strncpy(el->el_history.buf, el->el_line.buffer,
+		(void) wcsncpy(el->el_history.buf, el->el_line.buffer,
 		    EL_BUFSIZ);
 		el->el_history.last = el->el_history.buf +
 		    (el->el_line.lastchar - el->el_line.buffer);
@@ -742,13 +658,13 @@ ed_search_prev_history(EditLine *el, Int c __attribute__((__unused__)))
 
 	while (hp != NULL) {
 #ifdef SDEBUG
-		(void) fprintf(el->el_errfile, "Comparing with \"%s\"\n", hp);
+		(void) fprintf(el->el_errfile, "Comparing with \"%ls\"\n", hp);
 #endif
-		if ((Strncmp(hp, el->el_line.buffer, (size_t)
+		if ((wcsncmp(hp, el->el_line.buffer, (size_t)
 			    (el->el_line.lastchar - el->el_line.buffer)) ||
 			hp[el->el_line.lastchar - el->el_line.buffer]) &&
 		    c_hmatch(el, hp)) {
-			found++;
+			found = 1;
 			break;
 		}
 		h++;
@@ -771,13 +687,13 @@ ed_search_prev_history(EditLine *el, Int c __attribute__((__unused__)))
  *	Search next in history for a line matching the current
  *	[M-N] [J]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_search_next_history(EditLine *el, Int c __attribute__((__unused__)))
+ed_search_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	const Char *hp;
+	const wchar_t *hp;
 	int h;
-	bool_t found = 0;
+	int found = 0;
 
 	el->el_chared.c_vcmd.action = NOP;
 	el->el_chared.c_undo.len = -1;
@@ -797,9 +713,9 @@ ed_search_next_history(EditLine *el, Int c __attribute__((__unused__)))
 
 	for (h = 1; h < el->el_history.eventno && hp; h++) {
 #ifdef SDEBUG
-		(void) fprintf(el->el_errfile, "Comparing with \"%s\"\n", hp);
+		(void) fprintf(el->el_errfile, "Comparing with \"%ls\"\n", hp);
 #endif
-		if ((Strncmp(hp, el->el_line.buffer, (size_t)
+		if ((wcsncmp(hp, el->el_line.buffer, (size_t)
 			    (el->el_line.lastchar - el->el_line.buffer)) ||
 			hp[el->el_line.lastchar - el->el_line.buffer]) &&
 		    c_hmatch(el, hp))
@@ -825,11 +741,11 @@ ed_search_next_history(EditLine *el, Int c __attribute__((__unused__)))
  *	Move up one line
  *	Could be [k] [^p]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_prev_line(EditLine *el, Int c __attribute__((__unused__)))
+ed_prev_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *ptr;
+	wchar_t *ptr;
 	int nchars = c_hpos(el);
 
 	/*
@@ -868,11 +784,11 @@ ed_prev_line(EditLine *el, Int c __attribute__((__unused__)))
  *	Move down one line
  *	Could be [j] [^n]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_next_line(EditLine *el, Int c __attribute__((__unused__)))
+ed_next_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *ptr;
+	wchar_t *ptr;
 	int nchars = c_hpos(el);
 
 	/*
@@ -902,14 +818,14 @@ ed_next_line(EditLine *el, Int c __attribute__((__unused__)))
  *	Editline extended command
  *	[M-X] [:]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-ed_command(EditLine *el, Int c __attribute__((__unused__)))
+ed_command(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char tmpbuf[EL_BUFSIZ];
+	wchar_t tmpbuf[EL_BUFSIZ];
 	int tmplen;
 
-	tmplen = c_gets(el, tmpbuf, STR("\n: "));
+	tmplen = c_gets(el, tmpbuf, L"\n: ");
 	terminal__putc(el, '\n');
 
 	if (tmplen < 0 || (tmpbuf[tmplen] = 0, parse_line(el, tmpbuf)) == -1)
diff --git a/extra/libedit/libedit-20221030-3.1/src/config.h b/extra/libedit/libedit-20221030-3.1/src/config.h
new file mode 100644
index 000000000000..5bd5e7f911d9
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/config.h
@@ -0,0 +1,10 @@
+/*
+  To minimize source code changes, we add this source file
+  and forward to my_config.h instead.
+  See AH_BOTTOM in configure.ac for the rest.
+*/
+#include "my_config.h"
+#include "sys.h"
+#define SCCSID
+/* #undef LIBC_SCCS */
+#define lint
diff --git a/extra/libedit/libedit-20221030-3.1/src/editline/readline.h b/extra/libedit/libedit-20221030-3.1/src/editline/readline.h
new file mode 100644
index 000000000000..2bd0b7e80ab6
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/editline/readline.h
@@ -0,0 +1,267 @@
+/*	$NetBSD: readline.h,v 1.53 2022/02/19 17:45:02 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+#ifndef _READLINE_H_
+#define _READLINE_H_
+
+#include <sys/types.h>
+#include <stdio.h>
+
+/* list of readline stuff supported by editline library's readline wrapper */
+
+/* typedefs */
+typedef int	  Function(const char *, int);
+typedef char     *CPFunction(const char *, int);
+typedef void	  VFunction(void);
+typedef void	  rl_vcpfunc_t(char *);
+typedef char	**rl_completion_func_t(const char *, int, int);
+typedef char     *rl_compentry_func_t(const char *, int);
+typedef int	  rl_command_func_t(int, int);
+typedef int	  rl_hook_func_t(void);
+typedef int       rl_icppfunc_t(char **);
+
+/* only supports length */
+typedef struct {
+	int length;
+} HISTORY_STATE;
+
+typedef void *histdata_t;
+
+typedef struct _hist_entry {
+	const char	*line;
+	histdata_t	 data;
+} HIST_ENTRY;
+
+typedef struct _keymap_entry {
+	char type;
+#define ISFUNC	0
+#define ISKMAP	1
+#define ISMACR	2
+	Function *function;
+} KEYMAP_ENTRY;
+
+#define KEYMAP_SIZE	256
+
+typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
+typedef KEYMAP_ENTRY *Keymap;
+
+#define control_character_threshold	0x20
+#define control_character_bit		0x40
+
+#ifndef CTRL
+#include <sys/ioctl.h>
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#include <sys/ttydefaults.h>
+#endif
+#ifndef CTRL
+#define CTRL(c)		((c) & 037)
+#endif
+#endif
+#ifndef UNCTRL
+#define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
+#endif
+
+#define RUBOUT		0x7f
+#define ABORT_CHAR	CTRL('G')
+#define RL_READLINE_VERSION	0x0402
+#define RL_PROMPT_START_IGNORE	'\1'
+#define RL_PROMPT_END_IGNORE	'\2'
+
+#define RL_STATE_NONE		0x000000
+#define RL_STATE_DONE		0x000001
+
+#define RL_SETSTATE(x)		(rl_readline_state |= ((unsigned long) x))
+#define RL_UNSETSTATE(x)	(rl_readline_state &= ~((unsigned long) x))
+#define RL_ISSTATE(x)		(rl_readline_state & ((unsigned long) x))
+
+/* global variables used by readline enabled applications */
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const char	*rl_library_version;
+extern int		rl_readline_version;
+extern const char	*rl_readline_name;
+extern FILE		*rl_instream;
+extern FILE		*rl_outstream;
+extern char		*rl_line_buffer;
+extern int		 rl_point, rl_end;
+extern int		 history_base, history_length;
+extern int		 max_input_history;
+extern const char	*rl_basic_quote_characters;
+extern const char	*rl_basic_word_break_characters;
+extern char		*rl_completer_word_break_characters;
+extern const char	*rl_completer_quote_characters;
+extern rl_compentry_func_t *rl_completion_entry_function;
+extern char		*(*rl_completion_word_break_hook)(void);
+extern rl_completion_func_t *rl_attempted_completion_function;
+extern int		 rl_attempted_completion_over;
+extern int		rl_completion_type;
+extern int		rl_completion_query_items;
+extern const char	*rl_special_prefixes;
+extern int		rl_completion_append_character;
+extern int		rl_inhibit_completion;
+extern rl_hook_func_t		*rl_pre_input_hook;
+extern rl_hook_func_t		*rl_startup_hook;
+extern char		*rl_terminal_name;
+extern int		rl_already_prompted;
+extern char		*rl_prompt;
+extern int		rl_done;
+/*
+ * The following is not implemented
+ */
+extern unsigned long	rl_readline_state;
+extern int		rl_catch_signals;
+extern int		rl_catch_sigwinch;
+extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
+			emacs_meta_keymap,
+			emacs_ctlx_keymap;
+extern int		rl_filename_completion_desired;
+extern int		rl_ignore_completion_duplicates;
+extern int		(*rl_getc_function)(FILE *);
+extern VFunction	*rl_redisplay_function;
+extern VFunction	*rl_completion_display_matches_hook;
+extern VFunction	*rl_prep_term_function;
+extern VFunction	*rl_deprep_term_function;
+extern rl_hook_func_t	*rl_event_hook;
+extern int		readline_echoing_p;
+extern int		_rl_print_completions_horizontally;
+extern int		_rl_complete_mark_directories;
+extern rl_icppfunc_t	*rl_directory_completion_hook;
+extern int		rl_completion_suppress_append;
+extern int		rl_sort_completion_matches;
+extern int		_rl_completion_prefix_display_length;
+extern int		_rl_echoing_p;
+extern int		history_max_entries;
+extern char		*rl_display_prompt;
+extern int		rl_erase_empty_line;
+
+/* supported functions */
+char		*readline(const char *);
+int		 rl_initialize(void);
+
+void		 using_history(void);
+int		 add_history(const char *);
+void		 clear_history(void);
+int		 append_history(int, const char *);
+void		 stifle_history(int);
+int		 unstifle_history(void);
+int		 history_is_stifled(void);
+int		 where_history(void);
+HIST_ENTRY	*current_history(void);
+HIST_ENTRY	*history_get(int);
+HIST_ENTRY	*remove_history(int);
+HIST_ENTRY	*replace_history_entry(int, const char *, histdata_t);
+int		 history_total_bytes(void);
+int		 history_set_pos(int);
+HIST_ENTRY	*previous_history(void);
+HIST_ENTRY	*next_history(void);
+HIST_ENTRY     **history_list(void);
+int		 history_search(const char *, int);
+int		 history_search_prefix(const char *, int);
+int		 history_search_pos(const char *, int, int);
+int		 read_history(const char *);
+int		 write_history(const char *);
+int		 history_truncate_file(const char *, int);
+int		 history_expand(char *, char **);
+char	       **history_tokenize(const char *);
+const char	*get_history_event(const char *, int *, int);
+char		*history_arg_extract(int, int, const char *);
+
+char		*tilde_expand(char *);
+char		*filename_completion_function(const char *, int);
+char		*username_completion_function(const char *, int);
+int		 rl_complete(int, int);
+int		 rl_read_key(void);
+char	       **completion_matches(/* const */ char *, rl_compentry_func_t *);
+void		 rl_display_match_list(char **, int, int);
+
+int		 rl_insert(int, int);
+int		 rl_insert_text(const char *);
+int		 rl_reset_terminal(const char *);
+void		 rl_resize_terminal(void);
+int		 rl_bind_key(int, rl_command_func_t *);
+int		 rl_newline(int, int);
+void		 rl_callback_read_char(void);
+void		 rl_callback_handler_install(const char *, rl_vcpfunc_t *);
+void		 rl_callback_handler_remove(void);
+void		 rl_redisplay(void);
+int		 rl_get_previous_history(int, int);
+void		 rl_prep_terminal(int);
+void		 rl_deprep_terminal(void);
+int		 rl_read_init_file(const char *);
+int		 rl_parse_and_bind(const char *);
+int		 rl_variable_bind(const char *, const char *);
+int		 rl_stuff_char(int);
+int		 rl_add_defun(const char *, rl_command_func_t *, int);
+HISTORY_STATE	*history_get_history_state(void);
+void		 rl_get_screen_size(int *, int *);
+void		 rl_set_screen_size(int, int);
+char		*rl_filename_completion_function(const char *, int);
+int		 _rl_abort_internal(void);
+int		 _rl_qsort_string_compare(char **, char **);
+char	       **rl_completion_matches(const char *, rl_compentry_func_t *);
+void		 rl_forced_update_display(void);
+int		 rl_set_prompt(const char *);
+int		 rl_on_new_line(void);
+void		 rl_reset_after_signal(void);
+void		 rl_echo_signal_char(int);
+int		 rl_crlf(void);
+int		 rl_ding(void);
+char 		*rl_copy_text(int, int);
+void		 rl_replace_line(const char *, int);
+int		 rl_delete_text(int, int);
+void 		 rl_message(const char *format, ...)
+    __attribute__((__format__(__printf__, 1, 2)));
+void		 rl_save_prompt(void);
+void		 rl_restore_prompt(void);
+
+/*
+ * The following are not implemented
+ */
+int		 rl_kill_text(int, int);
+Keymap		 rl_get_keymap(void);
+void		 rl_set_keymap(Keymap);
+Keymap		 rl_make_bare_keymap(void);
+int		 rl_generic_bind(int, const char *, const char *, Keymap);
+int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
+int		 rl_set_key(const char *, rl_command_func_t *, Keymap);
+void		 rl_cleanup_after_signal(void);
+void		 rl_free_line_state(void);
+int		 rl_set_keyboard_input_timeout(int);
+int		 rl_abort(int, int);
+int	         rl_set_keymap_name(const char *, Keymap);
+histdata_t	 free_history_entry(HIST_ENTRY *);
+void		 _rl_erase_entire_line(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _READLINE_H_ */
diff --git a/extra/libedit/libedit-20221030-3.1/src/el.c b/extra/libedit/libedit-20221030-3.1/src/el.c
new file mode 100644
index 000000000000..4faf1cfc2286
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/el.c
@@ -0,0 +1,678 @@
+/*	$NetBSD: el.c,v 1.100 2021/08/15 10:08:41 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
+#else
+__RCSID("$NetBSD: el.c,v 1.100 2021/08/15 10:08:41 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
+/*
+ * el.c: EditLine interface functions
+ */
+#include <sys/types.h>
+#include <sys/param.h>
+#include <ctype.h>
+#include <langinfo.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "el.h"
+#include "parse.h"
+#include "read.h"
+
+#ifndef HAVE_SECURE_GETENV
+#	ifdef HAVE___SECURE_GETENV
+#		define secure_getenv __secure_getenv
+#		define HAVE_SECURE_GETENV 1
+#	else
+#		ifdef HAVE_ISSETUGID
+#			include <unistd.h>
+#		else
+#			undef issetugid
+#			define issetugid() 1
+#		endif
+#	endif
+#endif
+
+#ifndef HAVE_SECURE_GETENV
+char *secure_getenv(char const *name)
+{
+	if (issetugid())
+		return 0;
+	return getenv(name);
+}
+#endif
+
+/* el_init():
+ *	Initialize editline and set default parameters.
+ */
+EditLine *
+el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
+{
+    return el_init_fd(prog, fin, fout, ferr, fileno(fin), fileno(fout),
+	fileno(ferr));
+}
+
+libedit_private EditLine *
+el_init_internal(const char *prog, FILE *fin, FILE *fout, FILE *ferr,
+    int fdin, int fdout, int fderr, int flags)
+{
+	EditLine *el = el_calloc(1, sizeof(*el));
+
+	if (el == NULL)
+		return NULL;
+
+	el->el_infile = fin;
+	el->el_outfile = fout;
+	el->el_errfile = ferr;
+
+	el->el_infd = fdin;
+	el->el_outfd = fdout;
+	el->el_errfd = fderr;
+
+	el->el_prog = wcsdup(ct_decode_string(prog, &el->el_scratch));
+	if (el->el_prog == NULL) {
+		el_free(el);
+		return NULL;
+	}
+
+	/*
+         * Initialize all the modules. Order is important!!!
+         */
+	el->el_flags = flags;
+
+	if (terminal_init(el) == -1) {
+		el_free(el->el_prog);
+		el_free(el);
+		return NULL;
+	}
+	(void) keymacro_init(el);
+	(void) map_init(el);
+	if (tty_init(el) == -1)
+		el->el_flags |= NO_TTY;
+	(void) ch_init(el);
+	(void) search_init(el);
+	(void) hist_init(el);
+	(void) prompt_init(el);
+	(void) sig_init(el);
+	(void) literal_init(el);
+	if (read_init(el) == -1) {
+		el_end(el);
+		return NULL;
+	}
+	return el;
+}
+
+EditLine *
+el_init_fd(const char *prog, FILE *fin, FILE *fout, FILE *ferr,
+    int fdin, int fdout, int fderr)
+{
+	return el_init_internal(prog, fin, fout, ferr, fdin, fdout, fderr, 0);
+}
+
+/* el_end():
+ *	Clean up.
+ */
+void
+el_end(EditLine *el)
+{
+
+	if (el == NULL)
+		return;
+
+	el_reset(el);
+
+	terminal_end(el);
+	keymacro_end(el);
+	map_end(el);
+	if (!(el->el_flags & NO_TTY))
+		tty_end(el, TCSAFLUSH);
+	ch_end(el);
+	read_end(el->el_read);
+	search_end(el);
+	hist_end(el);
+	prompt_end(el);
+	sig_end(el);
+	literal_end(el);
+
+	el_free(el->el_prog);
+	el_free(el->el_visual.cbuff);
+	el_free(el->el_visual.wbuff);
+	el_free(el->el_scratch.cbuff);
+	el_free(el->el_scratch.wbuff);
+	el_free(el->el_lgcyconv.cbuff);
+	el_free(el->el_lgcyconv.wbuff);
+	el_free(el);
+}
+
+
+/* el_reset():
+ *	Reset the tty and the parser
+ */
+void
+el_reset(EditLine *el)
+{
+
+	tty_cookedmode(el);
+	ch_reset(el);		/* XXX: Do we want that? */
+}
+
+
+/* el_set():
+ *	set the editline parameters
+ */
+int
+el_wset(EditLine *el, int op, ...)
+{
+	va_list ap;
+	int rv = 0;
+
+	if (el == NULL)
+		return -1;
+	va_start(ap, op);
+
+	switch (op) {
+	case EL_PROMPT:
+	case EL_RPROMPT: {
+		el_pfunc_t p = va_arg(ap, el_pfunc_t);
+
+		rv = prompt_set(el, p, 0, op, 1);
+		break;
+	}
+
+	case EL_RESIZE: {
+		el_zfunc_t p = va_arg(ap, el_zfunc_t);
+		void *arg = va_arg(ap, void *);
+		rv = ch_resizefun(el, p, arg);
+		break;
+	}
+
+	case EL_ALIAS_TEXT: {
+		el_afunc_t p = va_arg(ap, el_afunc_t);
+		void *arg = va_arg(ap, void *);
+		rv = ch_aliasfun(el, p, arg);
+		break;
+	}
+
+	case EL_PROMPT_ESC:
+	case EL_RPROMPT_ESC: {
+		el_pfunc_t p = va_arg(ap, el_pfunc_t);
+		int c = va_arg(ap, int);
+
+		rv = prompt_set(el, p, (wchar_t)c, op, 1);
+		break;
+	}
+
+	case EL_TERMINAL:
+		rv = terminal_set(el, va_arg(ap, char *));
+		break;
+
+	case EL_EDITOR:
+		rv = map_set_editor(el, va_arg(ap, wchar_t *));
+		break;
+
+	case EL_SIGNAL:
+		if (va_arg(ap, int))
+			el->el_flags |= HANDLE_SIGNALS;
+		else
+			el->el_flags &= ~HANDLE_SIGNALS;
+		break;
+
+	case EL_BIND:
+	case EL_TELLTC:
+	case EL_SETTC:
+	case EL_ECHOTC:
+	case EL_SETTY:
+	{
+		const wchar_t *argv[20];
+		int i;
+
+		for (i = 1; i < (int)__arraycount(argv); i++)
+			if ((argv[i] = va_arg(ap, wchar_t *)) == NULL)
+				break;
+
+		switch (op) {
+		case EL_BIND:
+			argv[0] = L"bind";
+			rv = map_bind(el, i, argv);
+			break;
+
+		case EL_TELLTC:
+			argv[0] = L"telltc";
+			rv = terminal_telltc(el, i, argv);
+			break;
+
+		case EL_SETTC:
+			argv[0] = L"settc";
+			rv = terminal_settc(el, i, argv);
+			break;
+
+		case EL_ECHOTC:
+			argv[0] = L"echotc";
+			rv = terminal_echotc(el, i, argv);
+			break;
+
+		case EL_SETTY:
+			argv[0] = L"setty";
+			rv = tty_stty(el, i, argv);
+			break;
+
+		default:
+			rv = -1;
+			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
+			break;
+		}
+		break;
+	}
+
+	case EL_ADDFN:
+	{
+		wchar_t *name = va_arg(ap, wchar_t *);
+		wchar_t *help = va_arg(ap, wchar_t *);
+		el_func_t func = va_arg(ap, el_func_t);
+
+		rv = map_addfunc(el, name, help, func);
+		break;
+	}
+
+	case EL_HIST:
+	{
+		hist_fun_t func = va_arg(ap, hist_fun_t);
+		void *ptr = va_arg(ap, void *);
+
+		rv = hist_set(el, func, ptr);
+		if (MB_CUR_MAX == 1)
+			el->el_flags &= ~NARROW_HISTORY;
+		break;
+	}
+
+	case EL_SAFEREAD:
+		if (va_arg(ap, int))
+			el->el_flags |= FIXIO;
+		else
+			el->el_flags &= ~FIXIO;
+		rv = 0;
+		break;
+
+	case EL_EDITMODE:
+		if (va_arg(ap, int))
+			el->el_flags &= ~EDIT_DISABLED;
+		else
+			el->el_flags |= EDIT_DISABLED;
+		rv = 0;
+		break;
+
+	case EL_GETCFN:
+	{
+		el_rfunc_t rc = va_arg(ap, el_rfunc_t);
+		rv = el_read_setfn(el->el_read, rc);
+		break;
+	}
+
+	case EL_CLIENTDATA:
+		el->el_data = va_arg(ap, void *);
+		break;
+
+	case EL_UNBUFFERED:
+		rv = va_arg(ap, int);
+		if (rv && !(el->el_flags & UNBUFFERED)) {
+			el->el_flags |= UNBUFFERED;
+			read_prepare(el);
+		} else if (!rv && (el->el_flags & UNBUFFERED)) {
+			el->el_flags &= ~UNBUFFERED;
+			read_finish(el);
+		}
+		rv = 0;
+		break;
+
+	case EL_PREP_TERM:
+		rv = va_arg(ap, int);
+		if (rv)
+			(void) tty_rawmode(el);
+		else
+			(void) tty_cookedmode(el);
+		rv = 0;
+		break;
+
+	case EL_SETFP:
+	{
+		FILE *fp;
+		int what;
+
+		what = va_arg(ap, int);
+		fp = va_arg(ap, FILE *);
+
+		rv = 0;
+		switch (what) {
+		case 0:
+			el->el_infile = fp;
+			el->el_infd = fileno(fp);
+			break;
+		case 1:
+			el->el_outfile = fp;
+			el->el_outfd = fileno(fp);
+			break;
+		case 2:
+			el->el_errfile = fp;
+			el->el_errfd = fileno(fp);
+			break;
+		default:
+			rv = -1;
+			break;
+		}
+		break;
+	}
+
+	case EL_REFRESH:
+		re_clear_display(el);
+		re_refresh(el);
+		terminal__flush(el);
+		break;
+
+	default:
+		rv = -1;
+		break;
+	}
+
+	va_end(ap);
+	return rv;
+}
+
+
+/* el_get():
+ *	retrieve the editline parameters
+ */
+int
+el_wget(EditLine *el, int op, ...)
+{
+	va_list ap;
+	int rv;
+
+	if (el == NULL)
+		return -1;
+
+	va_start(ap, op);
+
+	switch (op) {
+	case EL_PROMPT:
+	case EL_RPROMPT: {
+		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
+		rv = prompt_get(el, p, 0, op);
+		break;
+	}
+	case EL_PROMPT_ESC:
+	case EL_RPROMPT_ESC: {
+		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
+		wchar_t *c = va_arg(ap, wchar_t *);
+
+		rv = prompt_get(el, p, c, op);
+		break;
+	}
+
+	case EL_EDITOR:
+		rv = map_get_editor(el, va_arg(ap, const wchar_t **));
+		break;
+
+	case EL_SIGNAL:
+		*va_arg(ap, int *) = (el->el_flags & HANDLE_SIGNALS);
+		rv = 0;
+		break;
+
+	case EL_EDITMODE:
+		*va_arg(ap, int *) = !(el->el_flags & EDIT_DISABLED);
+		rv = 0;
+		break;
+
+	case EL_SAFEREAD:
+		*va_arg(ap, int *) = (el->el_flags & FIXIO);
+		rv = 0;
+		break;
+
+	case EL_TERMINAL:
+		terminal_get(el, va_arg(ap, const char **));
+		rv = 0;
+		break;
+
+	case EL_GETTC:
+	{
+		static char name[] = "gettc";
+		char *argv[3];
+		argv[0] = name;
+		argv[1] = va_arg(ap, char *);
+		argv[2] = va_arg(ap, void *);
+		rv = terminal_gettc(el, 3, argv);
+		break;
+	}
+
+	case EL_GETCFN:
+		*va_arg(ap, el_rfunc_t *) = el_read_getfn(el->el_read);
+		rv = 0;
+		break;
+
+	case EL_CLIENTDATA:
+		*va_arg(ap, void **) = el->el_data;
+		rv = 0;
+		break;
+
+	case EL_UNBUFFERED:
+		*va_arg(ap, int *) = (el->el_flags & UNBUFFERED) != 0;
+		rv = 0;
+		break;
+
+	case EL_GETFP:
+	{
+		int what;
+		FILE **fpp;
+
+		what = va_arg(ap, int);
+		fpp = va_arg(ap, FILE **);
+		rv = 0;
+		switch (what) {
+		case 0:
+			*fpp = el->el_infile;
+			break;
+		case 1:
+			*fpp = el->el_outfile;
+			break;
+		case 2:
+			*fpp = el->el_errfile;
+			break;
+		default:
+			rv = -1;
+			break;
+		}
+		break;
+	}
+	default:
+		rv = -1;
+		break;
+	}
+	va_end(ap);
+
+	return rv;
+}
+
+
+/* el_line():
+ *	Return editing info
+ */
+const LineInfoW *
+el_wline(EditLine *el)
+{
+
+	return (const LineInfoW *)(void *)&el->el_line;
+}
+
+
+/* el_source():
+ *	Source a file
+ */
+int
+el_source(EditLine *el, const char *fname)
+{
+	FILE *fp;
+	size_t len;
+	ssize_t slen;
+	char *ptr;
+	char *path = NULL;
+	const wchar_t *dptr;
+	int error = 0;
+
+	fp = NULL;
+	if (fname == NULL) {
+
+		/* secure_getenv is guaranteed to be defined and do the right thing here */
+		/* because of the defines above which take into account issetugid, */
+		/* secure_getenv and __secure_getenv availability. */
+		if ((fname = secure_getenv("EDITRC")) == NULL) {
+			static const char elpath[] = "/.editrc";
+			size_t plen = sizeof(elpath);
+
+			if ((ptr = secure_getenv("HOME")) == NULL)
+				return -1;
+			plen += strlen(ptr);
+			if ((path = el_calloc(plen, sizeof(*path))) == NULL)
+				return -1;
+			(void)snprintf(path, plen, "%s%s", ptr,
+				elpath + (*ptr == '\0'));
+			fname = path;
+		}
+
+	}
+	if (fname[0] == '\0')
+		return -1;
+
+	if (fp == NULL)
+		fp = fopen(fname, "r");
+	if (fp == NULL) {
+		el_free(path);
+		return -1;
+	}
+
+	ptr = NULL;
+	len = 0;
+	while ((slen = getline(&ptr, &len, fp)) != -1) {
+		if (*ptr == '\n')
+			continue;	/* Empty line. */
+		if (slen > 0 && ptr[--slen] == '\n')
+			ptr[slen] = '\0';
+
+		dptr = ct_decode_string(ptr, &el->el_scratch);
+		if (!dptr)
+			continue;
+		/* loop until first non-space char or EOL */
+		while (*dptr != '\0' && iswspace(*dptr))
+			dptr++;
+		if (*dptr == '#')
+			continue;   /* ignore, this is a comment line */
+		if ((error = parse_line(el, dptr)) == -1)
+			break;
+	}
+	free(ptr);
+
+	el_free(path);
+	(void) fclose(fp);
+	return error;
+}
+
+
+/* el_resize():
+ *	Called from program when terminal is resized
+ */
+void
+el_resize(EditLine *el)
+{
+	int lins, cols;
+	sigset_t oset, nset;
+
+	(void) sigemptyset(&nset);
+	(void) sigaddset(&nset, SIGWINCH);
+	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
+
+	/* get the correct window size */
+	if (terminal_get_size(el, &lins, &cols))
+		terminal_change_size(el, lins, cols);
+
+	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
+}
+
+
+/* el_beep():
+ *	Called from the program to beep
+ */
+void
+el_beep(EditLine *el)
+{
+
+	terminal_beep(el);
+}
+
+
+/* el_editmode()
+ *	Set the state of EDIT_DISABLED from the `edit' command.
+ */
+libedit_private int
+/*ARGSUSED*/
+el_editmode(EditLine *el, int argc, const wchar_t **argv)
+{
+	const wchar_t *how;
+
+	if (argv == NULL || argc != 2 || argv[1] == NULL)
+		return -1;
+
+	how = argv[1];
+	if (wcscmp(how, L"on") == 0) {
+		el->el_flags &= ~EDIT_DISABLED;
+		tty_rawmode(el);
+	} else if (wcscmp(how, L"off") == 0) {
+		tty_cookedmode(el);
+		el->el_flags |= EDIT_DISABLED;
+	}
+	else {
+		(void) fprintf(el->el_errfile, "edit: Bad value `%ls'.\n",
+		    how);
+		return -1;
+	}
+	return 0;
+}
diff --git a/cmd-line-utils/libedit/el.h b/extra/libedit/libedit-20221030-3.1/src/el.h
similarity index 75%
rename from cmd-line-utils/libedit/el.h
rename to extra/libedit/libedit-20221030-3.1/src/el.h
index 403a44aa806e..757137839eb8 100644
--- a/cmd-line-utils/libedit/el.h
+++ b/extra/libedit/libedit-20221030-3.1/src/el.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: el.h,v 1.25 2011/07/29 23:44:44 christos Exp $	*/
+/*	$NetBSD: el.h,v 1.46 2021/08/15 10:08:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -48,21 +48,16 @@
 
 #include "histedit.h"
 #include "chartype.h"
-#include <stdio.h>
-#include <sys/types.h>
 
-#define	EL_BUFSIZ	((size_t)4096)	/* Maximum line size		*/
+#define	EL_BUFSIZ	((size_t)1024)	/* Maximum line size		*/
 
-#define	HANDLE_SIGNALS       0x01
-#define	NO_TTY               0x02
-#define	EDIT_DISABLED        0x04
-#define	UNBUFFERED           0x08
-#define	CHARSET_IS_MULTIBYTE 0x10
-#define	IGNORE_EXTCHARS      0x20            /* Ignore characters read > 0xff */
-#define	NARROW_HISTORY       0x40
-#define	NARROW_READ          0x80
-
-typedef int bool_t;			/* True or not			*/
+#define	HANDLE_SIGNALS	0x001
+#define	NO_TTY		0x002
+#define	EDIT_DISABLED	0x004
+#define	UNBUFFERED	0x008
+#define	NARROW_HISTORY	0x040
+#define	NO_RESET	0x080
+#define	FIXIO		0x100
 
 typedef unsigned char el_action_t;	/* Index to command array	*/
 
@@ -72,10 +67,10 @@ typedef struct coord_t {		/* Position on the screen	*/
 } coord_t;
 
 typedef struct el_line_t {
-	Char 		*buffer;	/* Input line			*/
-	Char	        *cursor;	/* Cursor position		*/
-	Char	        *lastchar;	/* Last character		*/
-	const Char	*limit;		/* Max position			*/
+	wchar_t		*buffer;	/* Input line			*/
+	wchar_t	        *cursor;	/* Cursor position		*/
+	wchar_t	        *lastchar;	/* Last character		*/
+	const wchar_t	*limit;		/* Max position			*/
 } el_line_t;
 
 /*
@@ -87,34 +82,34 @@ typedef struct el_state_t {
 	int		argument;	/* Numeric argument		*/
 	int		metanext;	/* Is the next char a meta char */
 	el_action_t	lastcmd;	/* Previous command		*/
-	el_action_t	thiscmd;	/* this command 		*/
-	Char		thisch;		/* char that generated it	*/
+	el_action_t	thiscmd;	/* this command			*/
+	wchar_t		thisch;		/* char that generated it	*/
 } el_state_t;
 
 /*
  * Until we come up with something better...
  */
 #define	el_malloc(a)	malloc(a)
+#define	el_calloc(a,b)	calloc(a, b)
 #define	el_realloc(a,b)	realloc(a, b)
 #define	el_free(a)	free(a)
 
 #include "tty.h"
 #include "prompt.h"
+#include "literal.h"
 #include "keymacro.h"
-#include "el_terminal.h"
+#include "terminal.h"
 #include "refresh.h"
 #include "chared.h"
-#include "common.h"
 #include "search.h"
 #include "hist.h"
 #include "map.h"
-#include "parse.h"
 #include "sig.h"
-#include "help.h"
-#include "read.h"
+
+struct el_read_t;
 
 struct editline {
-	Char		 *el_prog;	/* the program name		*/
+	wchar_t		 *el_prog;	/* the program name		*/
 	FILE		 *el_infile;	/* Stdio stuff			*/
 	FILE		 *el_outfile;	/* Stdio stuff			*/
 	FILE		 *el_errfile;	/* Stdio stuff			*/
@@ -122,10 +117,9 @@ struct editline {
 	int		  el_outfd;	/* Output file descriptor	*/
 	int		  el_errfd;	/* Error file descriptor	*/
 	int		  el_flags;	/* Various flags.		*/
-	int		  el_errno;	/* Local copy of errno		*/
 	coord_t		  el_cursor;	/* Cursor location		*/
-	Char		**el_display;	/* Real screen image = what is there */
-	Char		**el_vdisplay;	/* Virtual screen image = what we see */
+	wint_t		**el_display;	/* Real screen image = what is there */
+	wint_t		**el_vdisplay;	/* Virtual screen image = what we see */
 	void		 *el_data;	/* Client data			*/
 	el_line_t	  el_line;	/* The current line information	*/
 	el_state_t	  el_state;	/* Current editor state		*/
@@ -134,24 +128,23 @@ struct editline {
 	el_refresh_t	  el_refresh;	/* Refresh stuff		*/
 	el_prompt_t	  el_prompt;	/* Prompt stuff			*/
 	el_prompt_t	  el_rprompt;	/* Prompt stuff			*/
+	el_literal_t	  el_literal;	/* prompt literal bits		*/
 	el_chared_t	  el_chared;	/* Characted editor stuff	*/
 	el_map_t	  el_map;	/* Key mapping stuff		*/
 	el_keymacro_t	  el_keymacro;	/* Key binding stuff		*/
 	el_history_t	  el_history;	/* History stuff		*/
 	el_search_t	  el_search;	/* Search stuff			*/
 	el_signal_t	  el_signal;	/* Signal handling stuff	*/
-	el_read_t	  el_read;	/* Character reading stuff	*/
-#ifdef WIDECHAR
+	struct el_read_t *el_read;	/* Character reading stuff	*/
+	ct_buffer_t       el_visual;    /* Buffer for displayable str	*/
 	ct_buffer_t       el_scratch;   /* Scratch conversion buffer    */
 	ct_buffer_t       el_lgcyconv;  /* Buffer for legacy wrappers   */
 	LineInfo          el_lgcylinfo; /* Legacy LineInfo buffer       */
-#endif
 };
 
-protected int	el_editmode(EditLine *, int, const Char **);
-
-/* XXXMYSQL: Bug#23097 mysql can't insert korean on mysql prompt. */
-#define el_isprint(x)	((unsigned char) (x) < 0x80 ? isprint(x) : 1)
+libedit_private int	el_editmode(EditLine *, int, const wchar_t **);
+libedit_private EditLine *el_init_internal(const char *, FILE *, FILE *,
+    FILE *, int, int, int, int);
 
 #ifdef DEBUG
 #define	EL_ABORT(a)	do { \
diff --git a/cmd-line-utils/libedit/eln.c b/extra/libedit/libedit-20221030-3.1/src/eln.c
similarity index 80%
rename from cmd-line-utils/libedit/eln.c
rename to extra/libedit/libedit-20221030-3.1/src/eln.c
index f996367115a1..563ec2a672a9 100644
--- a/cmd-line-utils/libedit/eln.c
+++ b/extra/libedit/libedit-20221030-3.1/src/eln.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eln.c,v 1.13 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -12,13 +12,6 @@
  * 2. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -34,30 +27,38 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
+__RCSID("$NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $");
 #endif /* not lint && not SCCSID */
 
-#include "histedit.h"
-#include "el.h"
-#include "read.h"
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-public int
+#include "el.h"
+
+int
 el_getc(EditLine *el, char *cp)
 {
 	int num_read;
 	wchar_t wc = 0;
 
-	num_read = el_wgetc (el, &wc);
-
-	if (num_read > 0)
-		*cp = (char)wc;
-	return num_read;
+	num_read = el_wgetc(el, &wc);
+	*cp = '\0';
+	if (num_read <= 0)
+		return num_read;
+	num_read = wctob(wc);
+	if (num_read == EOF) {
+		errno = ERANGE;
+		return -1;
+	} else {
+		*cp = (char)num_read;
+		return 1;
+	}
 }
 
 
-public void
+void
 el_push(EditLine *el, const char *str)
 {
 	/* Using multibyte->wide string decoding works fine under single-byte
@@ -66,34 +67,41 @@ el_push(EditLine *el, const char *str)
 }
 
 
-public const char *
+const char *
 el_gets(EditLine *el, int *nread)
 {
 	const wchar_t *tmp;
 
 	tmp = el_wgets(el, nread);
+	if (tmp != NULL) {
+	    int i;
+	    size_t nwread = 0;
+
+	    for (i = 0; i < *nread; i++)
+		nwread += ct_enc_width(tmp[i]);
+	    *nread = (int)nwread;
+	}
 	return ct_encode_string(tmp, &el->el_lgcyconv);
 }
 
 
-public int
+int
 el_parse(EditLine *el, int argc, const char *argv[])
 {
 	int ret;
 	const wchar_t **wargv;
 
-	wargv = (const wchar_t **)
-	    ct_decode_argv(argc, argv, &el->el_lgcyconv);
+	wargv = (void *)ct_decode_argv(argc, argv, &el->el_lgcyconv);
 	if (!wargv)
 		return -1;
 	ret = el_wparse(el, argc, wargv);
-	ct_free_argv(wargv);
+	el_free(wargv);
 
 	return ret;
 }
 
 
-public int
+int
 el_set(EditLine *el, int op, ...)
 {
 	va_list ap;
@@ -118,6 +126,22 @@ el_set(EditLine *el, int op, ...)
 		break;
 	}
 
+	case EL_ALIAS_TEXT: {
+		el_afunc_t p = va_arg(ap, el_afunc_t);
+		void *arg = va_arg(ap, void *);
+		ret = ch_aliasfun(el, p, arg);
+		break;
+	}
+
+	case EL_PROMPT_ESC:
+	case EL_RPROMPT_ESC: {
+		el_pfunc_t p = va_arg(ap, el_pfunc_t);
+		int c = va_arg(ap, int);
+
+		ret = prompt_set(el, p, c, op, 0);
+		break;
+	}
+
 	case EL_TERMINAL:       /* const char * */
 		ret = el_wset(el, op, va_arg(ap, char *));
 		break;
@@ -129,6 +153,7 @@ el_set(EditLine *el, int op, ...)
 
 	case EL_SIGNAL:         /* int */
 	case EL_EDITMODE:
+	case EL_SAFEREAD:
 	case EL_UNBUFFERED:
 	case EL_PREP_TERM:
 		ret = el_wset(el, op, va_arg(ap, int));
@@ -142,12 +167,11 @@ el_set(EditLine *el, int op, ...)
 		const char *argv[20];
 		int i;
 		const wchar_t **wargv;
-		for (i = 1; i < (int)__arraycount(argv); ++i)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
+		for (i = 1; i < (int)__arraycount(argv) - 1; ++i)
+			if ((argv[i] = va_arg(ap, const char *)) == NULL)
 			    break;
-		argv[0] = NULL;
-		wargv = (const wchar_t **)
-		    ct_decode_argv(i, argv, &el->el_lgcyconv);
+		argv[0] = argv[i] = NULL;
+		wargv = (void *)ct_decode_argv(i + 1, argv, &el->el_lgcyconv);
 		if (!wargv) {
 		    ret = -1;
 		    goto out;
@@ -159,29 +183,29 @@ el_set(EditLine *el, int op, ...)
 		 */
 		switch (op) {
 		case EL_BIND:
-			wargv[0] = STR("bind");
+			wargv[0] = L"bind";
 			ret = map_bind(el, i, wargv);
 			break;
 		case EL_TELLTC:
-			wargv[0] = STR("telltc");
+			wargv[0] = L"telltc";
 			ret = terminal_telltc(el, i, wargv);
 			break;
 		case EL_SETTC:
-			wargv[0] = STR("settc");
+			wargv[0] = L"settc";
 			ret = terminal_settc(el, i, wargv);
 			break;
 		case EL_ECHOTC:
-			wargv[0] = STR("echotc");
+			wargv[0] = L"echotc";
 			ret = terminal_echotc(el, i, wargv);
 			break;
 		case EL_SETTY:
-			wargv[0] = STR("setty");
+			wargv[0] = L"setty";
 			ret = tty_stty(el, i, wargv);
 			break;
 		default:
 			ret = -1;
 		}
-		ct_free_argv(wargv);
+		el_free(wargv);
 		break;
 	}
 
@@ -200,10 +224,10 @@ el_set(EditLine *el, int op, ...)
 		    ret = -1;
 		    goto out;
 		}
-                /* XXX: The two strdups leak. */
-		ret = map_addfunc(el, Strdup(wargv[0]), Strdup(wargv[1]),
+		/* XXX: The two strdup's leak */
+		ret = map_addfunc(el, wcsdup(wargv[0]), wcsdup(wargv[1]),
 		    func);
-		ct_free_argv(wargv);
+		el_free(wargv);
 		break;
 	}
 	case EL_HIST: {           /* hist_fun_t, const char * */
@@ -213,27 +237,29 @@ el_set(EditLine *el, int op, ...)
 		el->el_flags |= NARROW_HISTORY;
 		break;
 	}
-	/* XXX: do we need to change el_rfunc_t? */
+
 	case EL_GETCFN:         /* el_rfunc_t */
 		ret = el_wset(el, op, va_arg(ap, el_rfunc_t));
-		el->el_flags |= NARROW_READ;
 		break;
+
 	case EL_CLIENTDATA:     /* void * */
 		ret = el_wset(el, op, va_arg(ap, void *));
 		break;
+
 	case EL_SETFP: {          /* int, FILE * */
 		int what = va_arg(ap, int);
 		FILE *fp = va_arg(ap, FILE *);
 		ret = el_wset(el, op, what, fp);
 		break;
 	}
-	case EL_PROMPT_ESC: /* el_pfunc_t, char */
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		char c = (char)va_arg(ap, int);
-		ret = prompt_set(el, p, c, op, 0);
+
+	case EL_REFRESH:
+		re_clear_display(el);
+		re_refresh(el);
+		terminal__flush(el);
+		ret = 0;
 		break;
-	}
+
 	default:
 		ret = -1;
 		break;
@@ -245,7 +271,7 @@ el_set(EditLine *el, int op, ...)
 }
 
 
-public int
+int
 el_get(EditLine *el, int op, ...)
 {
 	va_list ap;
@@ -290,24 +316,22 @@ el_get(EditLine *el, int op, ...)
 
 	case EL_SIGNAL:         /* int * */
 	case EL_EDITMODE:
+	case EL_SAFEREAD:
 	case EL_UNBUFFERED:
 	case EL_PREP_TERM:
 		ret = el_wget(el, op, va_arg(ap, int *));
 		break;
 
 	case EL_GETTC: {
-		char *argv[20];
+		char *argv[3];
 		static char gettc[] = "gettc";
-		int i;
-		for (i = 1; i < (int)__arraycount(argv); ++i)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
-				break;
 		argv[0] = gettc;
-		ret = terminal_gettc(el, i, argv);
+		argv[1] = va_arg(ap, char *);
+		argv[2] = va_arg(ap, void *);
+		ret = terminal_gettc(el, 3, argv);
 		break;
 	}
 
-	/* XXX: do we need to change el_rfunc_t? */
 	case EL_GETCFN:         /* el_rfunc_t */
 		ret = el_wget(el, op, va_arg(ap, el_rfunc_t *));
 		break;
@@ -339,7 +363,7 @@ el_line(EditLine *el)
 	const LineInfoW *winfo = el_wline(el);
 	LineInfo *info = &el->el_lgcylinfo;
 	size_t offset;
-	const Char *p;
+	const wchar_t *p;
 
 	info->buffer   = ct_encode_string(winfo->buffer, &el->el_lgcyconv);
 
@@ -362,3 +386,9 @@ el_insertstr(EditLine *el, const char *str)
 {
 	return el_winsertstr(el, ct_decode_string(str, &el->el_lgcyconv));
 }
+
+int
+el_replacestr(EditLine *el, const char *str)
+{
+	return el_wreplacestr(el, ct_decode_string(str, &el->el_lgcyconv));
+}
diff --git a/cmd-line-utils/libedit/emacs.c b/extra/libedit/libedit-20221030-3.1/src/emacs.c
similarity index 79%
rename from cmd-line-utils/libedit/emacs.c
rename to extra/libedit/libedit-20221030-3.1/src/emacs.c
index 1f1033a1cb7e..0636c28b26fc 100644
--- a/cmd-line-utils/libedit/emacs.c
+++ b/extra/libedit/libedit-20221030-3.1/src/emacs.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: emacs.c,v 1.36 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 2015
+ * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -37,31 +37,34 @@
 #if 0
 static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: emacs.c,v 1.36 2016/05/09 21:46:56 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * emacs.c: Emacs functions
  */
+#include <ctype.h>
+
 #include "el.h"
+#include "emacs.h"
+#include "fcns.h"
 
 /* em_delete_or_list():
  *	Delete character under cursor or list completions if at end of line
  *	[^D]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_delete_or_list(EditLine *el, Int c)
+em_delete_or_list(EditLine *el, wint_t c)
 {
 
 	if (el->el_line.cursor == el->el_line.lastchar) {
 					/* if I'm at the end */
 		if (el->el_line.cursor == el->el_line.buffer) {
 					/* and the beginning */
-			if(!(terminal_writec(el, c)))	/* then do an EOF */
-				return CC_EOF;
-			else
-				return CC_ERROR;
+			terminal_writec(el, c);	/* then do an EOF */
+			return CC_EOF;
 		} else {
 			/*
 			 * Here we could list completions, but it is an
@@ -87,11 +90,11 @@ em_delete_or_list(EditLine *el, Int c)
  *	Cut from cursor to end of current word
  *	[M-d]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_delete_next_word(EditLine *el, Int c __attribute__((__unused__)))
+em_delete_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *p, *kp;
+	wchar_t *cp, *p, *kp;
 
 	if (el->el_line.cursor == el->el_line.lastchar)
 		return CC_ERROR;
@@ -116,11 +119,11 @@ em_delete_next_word(EditLine *el, Int c __attribute__((__unused__)))
  *	Paste cut buffer at cursor position
  *	[^Y]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_yank(EditLine *el, Int c __attribute__((__unused__)))
+em_yank(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *kp, *cp;
+	wchar_t *kp, *cp;
 
 	if (el->el_chared.c_kill.last == el->el_chared.c_kill.buf)
 		return CC_NORM;
@@ -152,11 +155,11 @@ em_yank(EditLine *el, Int c __attribute__((__unused__)))
  *	Cut the entire line and save in cut buffer
  *	[^U]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_kill_line(EditLine *el, Int c __attribute__((__unused__)))
+em_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *kp, *cp;
+	wchar_t *kp, *cp;
 
 	cp = el->el_line.buffer;
 	kp = el->el_chared.c_kill.buf;
@@ -174,11 +177,11 @@ em_kill_line(EditLine *el, Int c __attribute__((__unused__)))
  *	Cut area between mark and cursor and save in cut buffer
  *	[^W]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_kill_region(EditLine *el, Int c __attribute__((__unused__)))
+em_kill_region(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *kp, *cp;
+	wchar_t *kp, *cp;
 
 	if (!el->el_chared.c_kill.mark)
 		return CC_ERROR;
@@ -207,11 +210,11 @@ em_kill_region(EditLine *el, Int c __attribute__((__unused__)))
  *	Copy area between mark and cursor to cut buffer
  *	[M-W]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_copy_region(EditLine *el, Int c __attribute__((__unused__)))
+em_copy_region(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *kp, *cp;
+	wchar_t *kp, *cp;
 
 	if (!el->el_chared.c_kill.mark)
 		return CC_ERROR;
@@ -237,8 +240,8 @@ em_copy_region(EditLine *el, Int c __attribute__((__unused__)))
  *	Exchange the two characters before the cursor
  *	Gosling emacs transpose chars [^T]
  */
-protected el_action_t
-em_gosmacs_transpose(EditLine *el, Int c)
+libedit_private el_action_t
+em_gosmacs_transpose(EditLine *el, wint_t c)
 {
 
 	if (el->el_line.cursor > &el->el_line.buffer[1]) {
@@ -256,9 +259,9 @@ em_gosmacs_transpose(EditLine *el, Int c)
  *	Move next to end of current word
  *	[M-f]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_next_word(EditLine *el, Int c __attribute__((__unused__)))
+em_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	if (el->el_line.cursor == el->el_line.lastchar)
 		return CC_ERROR;
@@ -281,18 +284,18 @@ em_next_word(EditLine *el, Int c __attribute__((__unused__)))
  *	Uppercase the characters from cursor to end of current word
  *	[M-u]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_upper_case(EditLine *el, Int c __attribute__((__unused__)))
+em_upper_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *ep;
+	wchar_t *cp, *ep;
 
 	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
 	    el->el_state.argument, ce__isword);
 
 	for (cp = el->el_line.cursor; cp < ep; cp++)
-		if (Islower(*cp))
-			*cp = Toupper(*cp);
+		if (iswlower(*cp))
+			*cp = towupper(*cp);
 
 	el->el_line.cursor = ep;
 	if (el->el_line.cursor > el->el_line.lastchar)
@@ -305,26 +308,26 @@ em_upper_case(EditLine *el, Int c __attribute__((__unused__)))
  *	Capitalize the characters from cursor to end of current word
  *	[M-c]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_capitol_case(EditLine *el, Int c __attribute__((__unused__)))
+em_capitol_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *ep;
+	wchar_t *cp, *ep;
 
 	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
 	    el->el_state.argument, ce__isword);
 
 	for (cp = el->el_line.cursor; cp < ep; cp++) {
-		if (Isalpha(*cp)) {
-			if (Islower(*cp))
-				*cp = Toupper(*cp);
+		if (iswalpha(*cp)) {
+			if (iswlower(*cp))
+				*cp = towupper(*cp);
 			cp++;
 			break;
 		}
 	}
 	for (; cp < ep; cp++)
-		if (Isupper(*cp))
-			*cp = Tolower(*cp);
+		if (iswupper(*cp))
+			*cp = towlower(*cp);
 
 	el->el_line.cursor = ep;
 	if (el->el_line.cursor > el->el_line.lastchar)
@@ -337,18 +340,18 @@ em_capitol_case(EditLine *el, Int c __attribute__((__unused__)))
  *	Lowercase the characters from cursor to end of current word
  *	[M-l]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_lower_case(EditLine *el, Int c __attribute__((__unused__)))
+em_lower_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *ep;
+	wchar_t *cp, *ep;
 
 	ep = c__next_word(el->el_line.cursor, el->el_line.lastchar,
 	    el->el_state.argument, ce__isword);
 
 	for (cp = el->el_line.cursor; cp < ep; cp++)
-		if (Isupper(*cp))
-			*cp = Tolower(*cp);
+		if (iswupper(*cp))
+			*cp = towlower(*cp);
 
 	el->el_line.cursor = ep;
 	if (el->el_line.cursor > el->el_line.lastchar)
@@ -361,9 +364,9 @@ em_lower_case(EditLine *el, Int c __attribute__((__unused__)))
  *	Set the mark at cursor
  *	[^@]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_set_mark(EditLine *el, Int c __attribute__((__unused__)))
+em_set_mark(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_chared.c_kill.mark = el->el_line.cursor;
@@ -375,11 +378,11 @@ em_set_mark(EditLine *el, Int c __attribute__((__unused__)))
  *	Exchange the cursor and mark
  *	[^X^X]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_exchange_mark(EditLine *el, Int c __attribute__((__unused__)))
+em_exchange_mark(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp;
+	wchar_t *cp;
 
 	cp = el->el_line.cursor;
 	el->el_line.cursor = el->el_chared.c_kill.mark;
@@ -392,9 +395,9 @@ em_exchange_mark(EditLine *el, Int c __attribute__((__unused__)))
  *	Universal argument (argument times 4)
  *	[^U]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_universal_argument(EditLine *el, Int c __attribute__((__unused__)))
+em_universal_argument(EditLine *el, wint_t c __attribute__((__unused__)))
 {				/* multiply current argument by 4 */
 
 	if (el->el_state.argument > 1000000)
@@ -409,9 +412,9 @@ em_universal_argument(EditLine *el, Int c __attribute__((__unused__)))
  *	Add 8th bit to next character typed
  *	[<ESC>]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_meta_next(EditLine *el, Int c __attribute__((__unused__)))
+em_meta_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_state.metanext = 1;
@@ -422,9 +425,9 @@ em_meta_next(EditLine *el, Int c __attribute__((__unused__)))
 /* em_toggle_overwrite():
  *	Switch from insert to overwrite mode or vice versa
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_toggle_overwrite(EditLine *el, Int c __attribute__((__unused__)))
+em_toggle_overwrite(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_state.inputmode = (el->el_state.inputmode == MODE_INSERT) ?
@@ -436,11 +439,11 @@ em_toggle_overwrite(EditLine *el, Int c __attribute__((__unused__)))
 /* em_copy_prev_word():
  *	Copy current word to cursor
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_copy_prev_word(EditLine *el, Int c __attribute__((__unused__)))
+em_copy_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
-	Char *cp, *oldc, *dp;
+	wchar_t *cp, *oldc, *dp;
 
 	if (el->el_line.cursor == el->el_line.buffer)
 		return CC_ERROR;
@@ -463,9 +466,9 @@ em_copy_prev_word(EditLine *el, Int c __attribute__((__unused__)))
 /* em_inc_search_next():
  *	Emacs incremental next search
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_inc_search_next(EditLine *el, Int c __attribute__((__unused__)))
+em_inc_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_search.patlen = 0;
@@ -476,9 +479,9 @@ em_inc_search_next(EditLine *el, Int c __attribute__((__unused__)))
 /* em_inc_search_prev():
  *	Emacs incremental reverse search
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_inc_search_prev(EditLine *el, Int c __attribute__((__unused__)))
+em_inc_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	el->el_search.patlen = 0;
@@ -490,9 +493,9 @@ em_inc_search_prev(EditLine *el, Int c __attribute__((__unused__)))
  *	Delete the character to the left of the cursor
  *	[^?]
  */
-protected el_action_t
+libedit_private el_action_t
 /*ARGSUSED*/
-em_delete_prev_char(EditLine *el, Int c __attribute__((__unused__)))
+em_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
 	if (el->el_line.cursor <= el->el_line.buffer)
diff --git a/extra/libedit/libedit-20221030-3.1/src/filecomplete.c b/extra/libedit/libedit-20221030-3.1/src/filecomplete.c
new file mode 100644
index 000000000000..f3f50c50d814
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/filecomplete.c
@@ -0,0 +1,846 @@
+/*	$NetBSD: filecomplete.c,v 1.70 2022/03/12 15:29:17 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include "config.h"
+
+#if !defined(lint) && !defined(SCCSID)
+__RCSID("$NetBSD: filecomplete.c,v 1.70 2022/03/12 15:29:17 christos Exp $");
+#endif /* not lint && not SCCSID */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "el.h"
+#include "filecomplete.h"
+
+static const wchar_t break_chars[] = L" \t\n\"\\'`@$><=;|&{(";
+
+/********************************/
+/* completion functions */
+
+/*
+ * does tilde expansion of strings of type ``~user/foo''
+ * if ``user'' isn't valid user name or ``txt'' doesn't start
+ * w/ '~', returns pointer to strdup()ed copy of ``txt''
+ *
+ * it's the caller's responsibility to free() the returned string
+ */
+char *
+fn_tilde_expand(const char *txt)
+{
+#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
+	struct passwd pwres;
+	char pwbuf[1024];
+#endif
+	struct passwd *pass;
+	const char *pos;
+	char *temp;
+	size_t len = 0;
+
+	if (txt[0] != '~')
+		return strdup(txt);
+
+	pos = strchr(txt + 1, '/');
+	if (pos == NULL) {
+		temp = strdup(txt + 1);
+		if (temp == NULL)
+			return NULL;
+	} else {
+		/* text until string after slash */
+		len = (size_t)(pos - txt + 1);
+		temp = el_calloc(len, sizeof(*temp));
+		if (temp == NULL)
+			return NULL;
+		(void)strlcpy(temp, txt + 1, len - 1);
+	}
+	if (temp[0] == 0) {
+#ifdef HAVE_GETPW_R_POSIX
+		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
+		    &pass) != 0)
+			pass = NULL;
+#elif HAVE_GETPW_R_DRAFT
+		pass = getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf));
+#else
+		pass = getpwuid(getuid());
+#endif
+	} else {
+#ifdef HAVE_GETPW_R_POSIX
+		if (getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
+			pass = NULL;
+#elif HAVE_GETPW_R_DRAFT
+		pass = getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf));
+#else
+		pass = getpwnam(temp);
+#endif
+	}
+	el_free(temp);		/* value no more needed */
+	if (pass == NULL)
+		return strdup(txt);
+
+	/* update pointer txt to point at string immedially following */
+	/* first slash */
+	txt += len;
+
+	len = strlen(pass->pw_dir) + 1 + strlen(txt) + 1;
+	temp = el_calloc(len, sizeof(*temp));
+	if (temp == NULL)
+		return NULL;
+	(void)snprintf(temp, len, "%s/%s", pass->pw_dir, txt);
+
+	return temp;
+}
+
+static int
+needs_escaping(wchar_t c)
+{
+	switch (c) {
+	case '\'':
+	case '"':
+	case '(':
+	case ')':
+	case '\\':
+	case '<':
+	case '>':
+	case '$':
+	case '#':
+	case ' ':
+	case '\n':
+	case '\t':
+	case '?':
+	case ';':
+	case '`':
+	case '@':
+	case '=':
+	case '|':
+	case '{':
+	case '}':
+	case '&':
+	case '*':
+	case '[':
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static int
+needs_dquote_escaping(char c)
+{
+	switch (c) {
+	case '"':
+	case '\\':
+	case '`':
+	case '$':
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+
+static wchar_t *
+unescape_string(const wchar_t *string, size_t length)
+{
+	size_t i;
+	size_t j = 0;
+	wchar_t *unescaped = el_calloc(length + 1, sizeof(*string));
+	if (unescaped == NULL)
+		return NULL;
+	for (i = 0; i < length ; i++) {
+		if (string[i] == '\\')
+			continue;
+		unescaped[j++] = string[i];
+	}
+	unescaped[j] = 0;
+	return unescaped;
+}
+
+static char *
+escape_filename(EditLine * el, const char *filename, int single_match,
+		const char *(*app_func)(const char *))
+{
+	size_t original_len = 0;
+	size_t escaped_character_count = 0;
+	size_t offset = 0;
+	size_t newlen;
+	const char *s;
+	char c;
+	size_t s_quoted = 0;	/* does the input contain a single quote */
+	size_t d_quoted = 0;	/* does the input contain a double quote */
+	char *escaped_str;
+	wchar_t *temp = el->el_line.buffer;
+	const char *append_char = NULL;
+
+	if (filename == NULL)
+		return NULL;
+
+	while (temp != el->el_line.cursor) {
+		/*
+		 * If we see a single quote but have not seen a double quote
+		 * so far set/unset s_quote, unless it is already quoted
+		 */
+		if (temp[0] == '\'' && !d_quoted &&
+		    (temp == el->el_line.buffer || temp[-1] != '\\'))
+			s_quoted = !s_quoted;
+		/*
+		 * vice versa to the above condition
+		 */
+		else if (temp[0] == '"' && !s_quoted)
+			d_quoted = !d_quoted;
+		temp++;
+	}
+
+	/* Count number of special characters so that we can calculate
+	 * number of extra bytes needed in the new string
+	 */
+	for (s = filename; *s; s++, original_len++) {
+		c = *s;
+		/* Inside a single quote only single quotes need escaping */
+		if (s_quoted && c == '\'') {
+			escaped_character_count += 3;
+			continue;
+		}
+		/* Inside double quotes only ", \, ` and $ need escaping */
+		if (d_quoted && needs_dquote_escaping(c)) {
+			escaped_character_count++;
+			continue;
+		}
+		if (!s_quoted && !d_quoted && needs_escaping(c))
+			escaped_character_count++;
+	}
+
+	newlen = original_len + escaped_character_count + 1;
+	if (s_quoted || d_quoted)
+		newlen++;
+
+	if (single_match && app_func)
+		newlen++;
+
+	if ((escaped_str = el_malloc(newlen)) == NULL)
+		return NULL;
+
+	for (s = filename; *s; s++) {
+		c = *s;
+		if (!needs_escaping(c)) {
+			/* no escaping is required continue as usual */
+			escaped_str[offset++] = c;
+			continue;
+		}
+
+		/* single quotes inside single quotes require special handling */
+		if (c == '\'' && s_quoted) {
+			escaped_str[offset++] = '\'';
+			escaped_str[offset++] = '\\';
+			escaped_str[offset++] = '\'';
+			escaped_str[offset++] = '\'';
+			continue;
+		}
+
+		/* Otherwise no escaping needed inside single quotes */
+		if (s_quoted) {
+			escaped_str[offset++] = c;
+			continue;
+		}
+
+		/* No escaping needed inside a double quoted string either
+		 * unless we see a '$', '\', '`', or '"' (itself)
+		 */
+		if (d_quoted && !needs_dquote_escaping(c)) {
+			escaped_str[offset++] = c;
+			continue;
+		}
+
+		/* If we reach here that means escaping is actually needed */
+		escaped_str[offset++] = '\\';
+		escaped_str[offset++] = c;
+	}
+
+	if (single_match && app_func) {
+		escaped_str[offset] = 0;
+		append_char = app_func(filename);
+		/* we want to append space only if we are not inside quotes */
+		if (append_char[0] == ' ') {
+			if (!s_quoted && !d_quoted)
+				escaped_str[offset++] = append_char[0];
+		} else
+			escaped_str[offset++] = append_char[0];
+	}
+
+	/* close the quotes if single match and the match is not a directory */
+	if (single_match && (append_char && append_char[0] == ' ')) { 
+		if (s_quoted)
+			escaped_str[offset++] = '\'';
+		else if (d_quoted)
+			escaped_str[offset++] = '"';
+	}
+
+	escaped_str[offset] = 0;
+	return escaped_str;
+}
+
+/*
+ * return first found file name starting by the ``text'' or NULL if no
+ * such file can be found
+ * value of ``state'' is ignored
+ *
+ * it's the caller's responsibility to free the returned string
+ */
+char *
+fn_filename_completion_function(const char *text, int state)
+{
+	static DIR *dir = NULL;
+	static char *filename = NULL, *dirname = NULL, *dirpath = NULL;
+	static size_t filename_len = 0;
+	struct dirent *entry;
+	char *temp;
+	const char *pos;
+	size_t len;
+
+	if (state == 0 || dir == NULL) {
+		pos = strrchr(text, '/');
+		if (pos) {
+			char *nptr;
+			pos++;
+			nptr = el_realloc(filename, (strlen(pos) + 1) *
+			    sizeof(*nptr));
+			if (nptr == NULL) {
+				el_free(filename);
+				filename = NULL;
+				return NULL;
+			}
+			filename = nptr;
+			(void)strcpy(filename, pos);
+			len = (size_t)(pos - text);	/* including last slash */
+
+			nptr = el_realloc(dirname, (len + 1) *
+			    sizeof(*nptr));
+			if (nptr == NULL) {
+				el_free(dirname);
+				dirname = NULL;
+				return NULL;
+			}
+			dirname = nptr;
+			(void)strlcpy(dirname, text, len + 1);
+		} else {
+			el_free(filename);
+			if (*text == 0)
+				filename = NULL;
+			else {
+				filename = strdup(text);
+				if (filename == NULL)
+					return NULL;
+			}
+			el_free(dirname);
+			dirname = NULL;
+		}
+
+		if (dir != NULL) {
+			(void)closedir(dir);
+			dir = NULL;
+		}
+
+		/* support for ``~user'' syntax */
+
+		el_free(dirpath);
+		dirpath = NULL;
+		if (dirname == NULL) {
+			if ((dirname = strdup("")) == NULL)
+				return NULL;
+			dirpath = strdup("./");
+		} else if (*dirname == '~')
+			dirpath = fn_tilde_expand(dirname);
+		else
+			dirpath = strdup(dirname);
+
+		if (dirpath == NULL)
+			return NULL;
+
+		dir = opendir(dirpath);
+		if (!dir)
+			return NULL;	/* cannot open the directory */
+
+		/* will be used in cycle */
+		filename_len = filename ? strlen(filename) : 0;
+	}
+
+	/* find the match */
+	while ((entry = readdir(dir)) != NULL) {
+		/* skip . and .. */
+		if (entry->d_name[0] == '.' && (!entry->d_name[1]
+		    || (entry->d_name[1] == '.' && !entry->d_name[2])))
+			continue;
+		if (filename_len == 0)
+			break;
+		/* otherwise, get first entry where first */
+		/* filename_len characters are equal	  */
+		if (entry->d_name[0] == filename[0]
+          /* Some dirents have d_namlen, but it is not portable. */
+		    && strlen(entry->d_name) >= filename_len
+		    && strncmp(entry->d_name, filename,
+			filename_len) == 0)
+			break;
+	}
+
+	if (entry) {		/* match found */
+
+       /* Some dirents have d_namlen, but it is not portable. */
+		len = strlen(entry->d_name);
+
+		len = strlen(dirname) + len + 1;
+		temp = el_calloc(len, sizeof(*temp));
+		if (temp == NULL)
+			return NULL;
+		(void)snprintf(temp, len, "%s%s", dirname, entry->d_name);
+	} else {
+		(void)closedir(dir);
+		dir = NULL;
+		temp = NULL;
+	}
+
+	return temp;
+}
+
+
+static const char *
+append_char_function(const char *name)
+{
+	struct stat stbuf;
+	char *expname = *name == '~' ? fn_tilde_expand(name) : NULL;
+	const char *rs = " ";
+
+	if (stat(expname ? expname : name, &stbuf) == -1)
+		goto out;
+	if (S_ISDIR(stbuf.st_mode))
+		rs = "/";
+out:
+	if (expname)
+		el_free(expname);
+	return rs;
+}
+/*
+ * returns list of completions for text given
+ * non-static for readline.
+ */
+char ** completion_matches(const char *, char *(*)(const char *, int));
+char **
+completion_matches(const char *text, char *(*genfunc)(const char *, int))
+{
+	char **match_list = NULL, *retstr, *prevstr;
+	size_t match_list_len, max_equal, which, i;
+	size_t matches;
+
+	matches = 0;
+	match_list_len = 1;
+	while ((retstr = (*genfunc) (text, (int)matches)) != NULL) {
+		/* allow for list terminator here */
+		if (matches + 3 >= match_list_len) {
+			char **nmatch_list;
+			while (matches + 3 >= match_list_len)
+				match_list_len <<= 1;
+			nmatch_list = el_realloc(match_list,
+			    match_list_len * sizeof(*nmatch_list));
+			if (nmatch_list == NULL) {
+				el_free(match_list);
+				return NULL;
+			}
+			match_list = nmatch_list;
+
+		}
+		match_list[++matches] = retstr;
+	}
+
+	if (!match_list)
+		return NULL;	/* nothing found */
+
+	/* find least denominator and insert it to match_list[0] */
+	which = 2;
+	prevstr = match_list[1];
+	max_equal = strlen(prevstr);
+	for (; which <= matches; which++) {
+		for (i = 0; i < max_equal &&
+		    prevstr[i] == match_list[which][i]; i++)
+			continue;
+		max_equal = i;
+	}
+
+	retstr = el_calloc(max_equal + 1, sizeof(*retstr));
+	if (retstr == NULL) {
+		el_free(match_list);
+		return NULL;
+	}
+	(void)strlcpy(retstr, match_list[1], max_equal + 1);
+	match_list[0] = retstr;
+
+	/* add NULL as last pointer to the array */
+	match_list[matches + 1] = NULL;
+
+	return match_list;
+}
+
+/*
+ * Sort function for qsort(). Just wrapper around strcasecmp().
+ */
+static int
+_fn_qsort_string_compare(const void *i1, const void *i2)
+{
+	const char *s1 = ((const char * const *)i1)[0];
+	const char *s2 = ((const char * const *)i2)[0];
+
+	return strcasecmp(s1, s2);
+}
+
+/*
+ * Display list of strings in columnar format on readline's output stream.
+ * 'matches' is list of strings, 'num' is number of strings in 'matches',
+ * 'width' is maximum length of string in 'matches'.
+ *
+ * matches[0] is not one of the match strings, but it is counted in
+ * num, so the strings are matches[1] *through* matches[num-1].
+ */
+void
+fn_display_match_list(EditLine * el, char **matches, size_t num, size_t width,
+    const char *(*app_func) (const char *))
+{
+	size_t line, lines, col, cols, thisguy;
+	int screenwidth = el->el_terminal.t_size.h;
+	if (app_func == NULL)
+		app_func = append_char_function;
+
+	/* Ignore matches[0]. Avoid 1-based array logic below. */
+	matches++;
+	num--;
+
+	/*
+	 * Find out how many entries can be put on one line; count
+	 * with one space between strings the same way it's printed.
+	 */
+	cols = (size_t)screenwidth / (width + 2);
+	if (cols == 0)
+		cols = 1;
+
+	/* how many lines of output, rounded up */
+	lines = (num + cols - 1) / cols;
+
+	/* Sort the items. */
+	qsort(matches, num, sizeof(char *), _fn_qsort_string_compare);
+
+	/*
+	 * On the ith line print elements i, i+lines, i+lines*2, etc.
+	 */
+	for (line = 0; line < lines; line++) {
+		for (col = 0; col < cols; col++) {
+			thisguy = line + col * lines;
+			if (thisguy >= num)
+				break;
+			(void)fprintf(el->el_outfile, "%s%s%s",
+			    col == 0 ? "" : " ", matches[thisguy],
+				(*app_func)(matches[thisguy]));
+			(void)fprintf(el->el_outfile, "%-*s",
+				(int) (width - strlen(matches[thisguy])), "");
+		}
+		(void)fprintf(el->el_outfile, "\n");
+	}
+}
+
+static wchar_t *
+find_word_to_complete(const wchar_t * cursor, const wchar_t * buffer,
+    const wchar_t * word_break, const wchar_t * special_prefixes, size_t * length,
+	int do_unescape)
+{
+	/* We now look backwards for the start of a filename/variable word */
+	const wchar_t *ctemp = cursor;
+	wchar_t *temp;
+	size_t len;
+
+	/* if the cursor is placed at a slash or a quote, we need to find the
+	 * word before it
+	 */
+	if (ctemp > buffer) {
+		switch (ctemp[-1]) {
+		case '\\':
+		case '\'':
+		case '"':
+			ctemp--;
+			break;
+		default:
+			break;
+		}
+	}
+
+	for (;;) {
+		if (ctemp <= buffer)
+			break;
+		if (ctemp - buffer >= 2 && ctemp[-2] == '\\' &&
+		    needs_escaping(ctemp[-1])) {
+			ctemp -= 2;
+			continue;
+		}
+		if (wcschr(word_break, ctemp[-1]))
+			break;
+		if (special_prefixes && wcschr(special_prefixes, ctemp[-1]))
+			break;
+		ctemp--;
+	}
+
+	len = (size_t) (cursor - ctemp);
+	if (len == 1 && (ctemp[0] == '\'' || ctemp[0] == '"')) {
+		len = 0;
+		ctemp++;
+	}
+	*length = len;
+	if (do_unescape) {
+		wchar_t *unescaped_word = unescape_string(ctemp, len);
+		if (unescaped_word == NULL)
+			return NULL;
+		return unescaped_word;
+	}
+	temp = el_malloc((len + 1) * sizeof(*temp));
+	(void) wcsncpy(temp, ctemp, len);
+	temp[len] = '\0';
+	return temp;
+}
+
+/*
+ * Complete the word at or before point,
+ * 'what_to_do' says what to do with the completion.
+ * \t   means do standard completion.
+ * `?' means list the possible completions.
+ * `*' means insert all of the possible completions.
+ * `!' means to do standard completion, and list all possible completions if
+ * there is more than one.
+ *
+ * Note: '*' support is not implemented
+ *       '!' could never be invoked
+ */
+int
+fn_complete2(EditLine *el,
+    char *(*complete_func)(const char *, int),
+    char **(*attempted_completion_function)(const char *, int, int),
+    const wchar_t *word_break, const wchar_t *special_prefixes,
+    const char *(*app_func)(const char *), size_t query_items,
+    int *completion_type, int *over, int *point, int *end,
+    unsigned int flags)
+{
+	const LineInfoW *li;
+	wchar_t *temp;
+	char **matches;
+	char *completion;
+	size_t len;
+	int what_to_do = '\t';
+	int retval = CC_NORM;
+	int do_unescape = flags & FN_QUOTE_MATCH;
+
+	if (el->el_state.lastcmd == el->el_state.thiscmd)
+		what_to_do = '?';
+
+	/* readline's rl_complete() has to be told what we did... */
+	if (completion_type != NULL)
+		*completion_type = what_to_do;
+
+	if (!complete_func)
+		complete_func = fn_filename_completion_function;
+	if (!app_func)
+		app_func = append_char_function;
+
+	li = el_wline(el);
+	temp = find_word_to_complete(li->cursor,
+	    li->buffer, word_break, special_prefixes, &len, do_unescape);
+	if (temp == NULL)
+		goto out;
+
+	/* these can be used by function called in completion_matches() */
+	/* or (*attempted_completion_function)() */
+	if (point != NULL)
+		*point = (int)(li->cursor - li->buffer);
+	if (end != NULL)
+		*end = (int)(li->lastchar - li->buffer);
+
+	if (attempted_completion_function) {
+		int cur_off = (int)(li->cursor - li->buffer);
+		matches = (*attempted_completion_function)(
+		    ct_encode_string(temp, &el->el_scratch),
+		    cur_off - (int)len, cur_off);
+	} else
+		matches = NULL;
+	if (!attempted_completion_function ||
+	    (over != NULL && !*over && !matches))
+		matches = completion_matches(
+		    ct_encode_string(temp, &el->el_scratch), complete_func);
+
+	if (over != NULL)
+		*over = 0;
+
+	if (matches == NULL) {
+		goto out;
+	}
+	int i;
+	size_t matches_num, maxlen, match_len, match_display=1;
+	int single_match = matches[2] == NULL &&
+		(matches[1] == NULL || strcmp(matches[0], matches[1]) == 0);
+
+	retval = CC_REFRESH;
+
+	if (matches[0][0] != '\0') {
+		el_deletestr(el, (int)len);
+		if (flags & FN_QUOTE_MATCH)
+			completion = escape_filename(el, matches[0],
+			    single_match, app_func);
+		else
+			completion = strdup(matches[0]);
+		if (completion == NULL)
+			goto out2;
+
+		/*
+		 * Replace the completed string with the common part of
+		 * all possible matches if there is a possible completion.
+		 */
+		el_winsertstr(el,
+		    ct_decode_string(completion, &el->el_scratch));
+
+		if (single_match && attempted_completion_function &&
+		    !(flags & FN_QUOTE_MATCH))
+		{
+			/*
+			 * We found an exact match. Add a space after
+			 * it, unless we do filename completion and the
+			 * object is a directory. Also do necessary
+			 * escape quoting
+			 */
+			el_winsertstr(el, ct_decode_string(
+			    (*app_func)(completion), &el->el_scratch));
+		}
+		free(completion);
+	}
+
+
+	if (!single_match && (what_to_do == '!' || what_to_do == '?')) {
+		/*
+		 * More than one match and requested to list possible
+		 * matches.
+		 */
+
+		for(i = 1, maxlen = 0; matches[i]; i++) {
+			match_len = strlen(matches[i]);
+			if (match_len > maxlen)
+				maxlen = match_len;
+		}
+		/* matches[1] through matches[i-1] are available */
+		matches_num = (size_t)(i - 1);
+
+		/* newline to get on next line from command line */
+		(void)fprintf(el->el_outfile, "\n");
+
+		/*
+		 * If there are too many items, ask user for display
+		 * confirmation.
+		 */
+		if (matches_num > query_items) {
+			(void)fprintf(el->el_outfile,
+			    "Display all %zu possibilities? (y or n) ",
+			    matches_num);
+			(void)fflush(el->el_outfile);
+			if (getc(stdin) != 'y')
+				match_display = 0;
+			(void)fprintf(el->el_outfile, "\n");
+		}
+
+		if (match_display) {
+			/*
+			 * Interface of this function requires the
+			 * strings be matches[1..num-1] for compat.
+			 * We have matches_num strings not counting
+			 * the prefix in matches[0], so we need to
+			 * add 1 to matches_num for the call.
+			 */
+			fn_display_match_list(el, matches,
+			    matches_num+1, maxlen, app_func);
+		}
+		retval = CC_REDISPLAY;
+	} else if (matches[0][0]) {
+		/*
+		 * There was some common match, but the name was
+		 * not complete enough. Next tab will print possible
+		 * completions.
+		 */
+		el_beep(el);
+	} else {
+		/* lcd is not a valid object - further specification */
+		/* is needed */
+		el_beep(el);
+		retval = CC_NORM;
+	}
+
+	/* free elements of array and the array itself */
+out2:
+	for (i = 0; matches[i]; i++)
+		el_free(matches[i]);
+	el_free(matches);
+	matches = NULL;
+
+out:
+	el_free(temp);
+	return retval;
+}
+
+int
+fn_complete(EditLine *el,
+    char *(*complete_func)(const char *, int),
+    char **(*attempted_completion_function)(const char *, int, int),
+    const wchar_t *word_break, const wchar_t *special_prefixes,
+    const char *(*app_func)(const char *), size_t query_items,
+    int *completion_type, int *over, int *point, int *end)
+{
+	return fn_complete2(el, complete_func, attempted_completion_function,
+	    word_break, special_prefixes, app_func, query_items,
+	    completion_type, over, point, end,
+	    attempted_completion_function ? 0 : FN_QUOTE_MATCH);
+}
+
+/*
+ * el-compatible wrapper around rl_complete; needed for key binding
+ */
+/* ARGSUSED */
+unsigned char
+_el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
+{
+	return (unsigned char)fn_complete(el, NULL, NULL,
+	    break_chars, NULL, NULL, (size_t)100,
+	    NULL, NULL, NULL, NULL);
+}
diff --git a/cmd-line-utils/libedit/filecomplete.h b/extra/libedit/libedit-20221030-3.1/src/filecomplete.h
similarity index 77%
rename from cmd-line-utils/libedit/filecomplete.h
rename to extra/libedit/libedit-20221030-3.1/src/filecomplete.h
index 971e6e059391..796ae7ab3276 100644
--- a/cmd-line-utils/libedit/filecomplete.h
+++ b/extra/libedit/libedit-20221030-3.1/src/filecomplete.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.h,v 1.9 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: filecomplete.h,v 1.14 2021/09/26 13:45:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,10 +34,17 @@
 int fn_complete(EditLine *,
     char *(*)(const char *, int),
     char **(*)(const char *, int, int),
-    const Char *, const Char *, const char *(*)(const char *), size_t,
+    const wchar_t *, const wchar_t *, const char *(*)(const char *), size_t,
     int *, int *, int *, int *);
+int fn_complete2(EditLine *,
+    char *(*)(const char *, int),
+    char **(*)(const char *, int, int),
+    const wchar_t *, const wchar_t *, const char *(*)(const char *), size_t,
+    int *, int *, int *, int *, unsigned int);
+#define FN_QUOTE_MATCH 1U		/* Quote the returned match */
 
-void fn_display_match_list(EditLine *, char **, size_t, size_t);
+void fn_display_match_list(EditLine *, char **, size_t, size_t,
+	const char *(*)(const char *));
 char *fn_tilde_expand(const char *);
 char *fn_filename_completion_function(const char *, int);
 
diff --git a/extra/libedit/libedit-20221030-3.1/src/getline.c b/extra/libedit/libedit-20221030-3.1/src/getline.c
new file mode 100644
index 000000000000..1861533dfe39
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/getline.c
@@ -0,0 +1,111 @@
+/*	$NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if !HAVE_GETLINE
+#include <stdlib.h>
+
+#ifndef HAVE_NBTOOL_CONFIG_H
+/* These headers are required, but included from nbtool_config.h */
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#endif
+
+ssize_t
+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+	char *ptr, *eptr;
+
+
+	if (*buf == NULL || *bufsiz == 0) {
+		*bufsiz = BUFSIZ;
+		if ((*buf = malloc(*bufsiz)) == NULL)
+			return -1;
+	}
+
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
+		}
+		*ptr++ = c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
+		}
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
+				return -1;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
+		}
+	}
+}
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+	return getdelim(buf, bufsiz, '\n', fp);
+}
+
+#endif
+
+#ifdef TEST
+int
+main(int argc, char *argv[])
+{
+	char *p = NULL;
+	ssize_t len;
+	size_t n = 0;
+
+	while ((len = getline(&p, &n, stdin)) != -1)
+		(void)printf("%zd %s", len, p);
+	free(p);
+	return 0;
+}
+#endif
diff --git a/extra/libedit/libedit-20221030-3.1/src/hist.c b/extra/libedit/libedit-20221030-3.1/src/hist.c
new file mode 100644
index 000000000000..19ce1c161722
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/hist.c
@@ -0,0 +1,252 @@
+/*	$NetBSD: hist.c,v 1.34 2019/07/23 10:19:35 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: hist.c,v 1.34 2019/07/23 10:19:35 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/*
+ * hist.c: History access functions
+ */
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+
+#include "el.h"
+
+/* hist_init():
+ *	Initialization function.
+ */
+libedit_private int
+hist_init(EditLine *el)
+{
+
+	el->el_history.fun = NULL;
+	el->el_history.ref = NULL;
+	el->el_history.buf = el_calloc(EL_BUFSIZ, sizeof(*el->el_history.buf));
+	if (el->el_history.buf == NULL)
+		return -1;
+	el->el_history.sz  = EL_BUFSIZ;
+	el->el_history.last = el->el_history.buf;
+	return 0;
+}
+
+
+/* hist_end():
+ *	clean up history;
+ */
+libedit_private void
+hist_end(EditLine *el)
+{
+
+	el_free(el->el_history.buf);
+	el->el_history.buf = NULL;
+}
+
+
+/* hist_set():
+ *	Set new history interface
+ */
+libedit_private int
+hist_set(EditLine *el, hist_fun_t fun, void *ptr)
+{
+
+	el->el_history.ref = ptr;
+	el->el_history.fun = fun;
+	return 0;
+}
+
+
+/* hist_get():
+ *	Get a history line and update it in the buffer.
+ *	eventno tells us the event to get.
+ */
+libedit_private el_action_t
+hist_get(EditLine *el)
+{
+	const wchar_t *hp;
+	int h;
+	size_t blen, hlen;
+
+	if (el->el_history.eventno == 0) {	/* if really the current line */
+		(void) wcsncpy(el->el_line.buffer, el->el_history.buf,
+		    el->el_history.sz);
+		el->el_line.lastchar = el->el_line.buffer +
+		    (el->el_history.last - el->el_history.buf);
+
+#ifdef KSHVI
+		if (el->el_map.type == MAP_VI)
+			el->el_line.cursor = el->el_line.buffer;
+		else
+#endif /* KSHVI */
+			el->el_line.cursor = el->el_line.lastchar;
+
+		return CC_REFRESH;
+	}
+	if (el->el_history.ref == NULL)
+		return CC_ERROR;
+
+	hp = HIST_FIRST(el);
+
+	if (hp == NULL)
+		return CC_ERROR;
+
+	for (h = 1; h < el->el_history.eventno; h++)
+		if ((hp = HIST_NEXT(el)) == NULL)
+			goto out;
+
+	hlen = wcslen(hp) + 1;
+	blen = (size_t)(el->el_line.limit - el->el_line.buffer);
+	if (hlen > blen && !ch_enlargebufs(el, hlen))
+		goto out;
+
+	memcpy(el->el_line.buffer, hp, hlen * sizeof(*hp));
+	el->el_line.lastchar = el->el_line.buffer + hlen - 1;
+
+	if (el->el_line.lastchar > el->el_line.buffer
+	    && el->el_line.lastchar[-1] == '\n')
+		el->el_line.lastchar--;
+	if (el->el_line.lastchar > el->el_line.buffer
+	    && el->el_line.lastchar[-1] == ' ')
+		el->el_line.lastchar--;
+#ifdef KSHVI
+	if (el->el_map.type == MAP_VI)
+		el->el_line.cursor = el->el_line.buffer;
+	else
+#endif /* KSHVI */
+		el->el_line.cursor = el->el_line.lastchar;
+
+	return CC_REFRESH;
+out:
+	el->el_history.eventno = h;
+	return CC_ERROR;
+
+}
+
+
+/* hist_command()
+ *	process a history command
+ */
+libedit_private int
+hist_command(EditLine *el, int argc, const wchar_t **argv)
+{
+	const wchar_t *str;
+	int num;
+	HistEventW ev;
+
+	if (el->el_history.ref == NULL)
+		return -1;
+
+	if (argc == 1 || wcscmp(argv[1], L"list") == 0) {
+		size_t maxlen = 0;
+		char *buf = NULL;
+		int hno = 1;
+		 /* List history entries */
+
+		for (str = HIST_LAST(el); str != NULL; str = HIST_PREV(el)) {
+			char *ptr =
+			    ct_encode_string(str, &el->el_scratch);
+			size_t len = strlen(ptr);
+			if (len > 0 && ptr[len - 1] == '\n') 
+				ptr[--len] = '\0';
+			len = len * 4 + 1;
+			if (len >= maxlen) {
+				maxlen = len + 1024;
+				char *nbuf = el_realloc(buf, maxlen);
+				if (nbuf == NULL) {
+					el_free(buf);
+					return -1;
+				}
+				buf = nbuf;
+			}
+			strvis(buf, ptr, VIS_NL);
+			(void) fprintf(el->el_outfile, "%d\t%s\n",
+			    hno++, buf);
+		}
+		el_free(buf);
+		return 0;
+	}
+
+	if (argc != 3)
+		return -1;
+
+	num = (int)wcstol(argv[2], NULL, 0);
+
+	if (wcscmp(argv[1], L"size") == 0)
+		return history_w(el->el_history.ref, &ev, H_SETSIZE, num);
+
+	if (wcscmp(argv[1], L"unique") == 0)
+		return history_w(el->el_history.ref, &ev, H_SETUNIQUE, num);
+
+	return -1;
+}
+
+/* hist_enlargebuf()
+ *	Enlarge history buffer to specified value. Called from el_enlargebufs().
+ *	Return 0 for failure, 1 for success.
+ */
+libedit_private int
+/*ARGSUSED*/
+hist_enlargebuf(EditLine *el, size_t oldsz, size_t newsz)
+{
+	wchar_t *newbuf;
+
+	newbuf = el_realloc(el->el_history.buf, newsz * sizeof(*newbuf));
+	if (!newbuf)
+		return 0;
+
+	(void) memset(&newbuf[oldsz], '\0', (newsz - oldsz) * sizeof(*newbuf));
+
+	el->el_history.last = newbuf +
+				(el->el_history.last - el->el_history.buf);
+	el->el_history.buf = newbuf;
+	el->el_history.sz  = newsz;
+
+	return 1;
+}
+
+libedit_private wchar_t *
+hist_convert(EditLine *el, int fn, void *arg)
+{
+	HistEventW ev;
+	if ((*(el)->el_history.fun)((el)->el_history.ref, &ev, fn, arg) == -1)
+		return NULL;
+	return ct_decode_string((const char *)(const void *)ev.str,
+	    &el->el_scratch);
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/hist.h b/extra/libedit/libedit-20221030-3.1/src/hist.h
new file mode 100644
index 000000000000..8f5ab08390d2
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/hist.h
@@ -0,0 +1,80 @@
+/*	$NetBSD: hist.h,v 1.23 2017/09/01 10:19:10 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)hist.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * el.hist.c: History functions
+ */
+#ifndef _h_el_hist
+#define	_h_el_hist
+
+typedef int (*hist_fun_t)(void *, HistEventW *, int, ...);
+
+typedef struct el_history_t {
+	wchar_t		*buf;		/* The history buffer		*/
+	size_t		 sz;		/* Size of history buffer	*/
+	wchar_t		*last;		/* The last character		*/
+	int		 eventno;	/* Event we are looking for	*/
+	void		*ref;		/* Argument for history fcns	*/
+	hist_fun_t	 fun;		/* Event access			*/
+	HistEventW	 ev;		/* Event cookie			*/
+} el_history_t;
+
+#define	HIST_FUN_INTERNAL(el, fn, arg)	\
+    ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
+	fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
+#define HIST_FUN(el, fn, arg) \
+    (((el)->el_flags & NARROW_HISTORY) ? hist_convert(el, fn, arg) : \
+	HIST_FUN_INTERNAL(el, fn, arg))
+
+#define	HIST_NEXT(el)			HIST_FUN(el, H_NEXT, NULL)
+#define	HIST_FIRST(el)			HIST_FUN(el, H_FIRST, NULL)
+#define	HIST_LAST(el)			HIST_FUN(el, H_LAST, NULL)
+#define	HIST_PREV(el)			HIST_FUN(el, H_PREV, NULL)
+#define	HIST_SET(el, num)		HIST_FUN(el, H_SET, num)
+#define	HIST_LOAD(el, fname)		HIST_FUN(el, H_LOAD fname)
+#define	HIST_SAVE(el, fname)		HIST_FUN(el, H_SAVE fname)
+#define	HIST_SAVE_FP(el, fp)		HIST_FUN(el, H_SAVE_FP, fp)
+#define	HIST_NSAVE_FP(el, n, fp)	HIST_FUN(el, H_NSAVE_FP, n, fp)
+
+libedit_private int		hist_init(EditLine *);
+libedit_private void		hist_end(EditLine *);
+libedit_private el_action_t	hist_get(EditLine *);
+libedit_private int		hist_set(EditLine *, hist_fun_t, void *);
+libedit_private int		hist_command(EditLine *, int, const wchar_t **);
+libedit_private int		hist_enlargebuf(EditLine *, size_t, size_t);
+libedit_private wchar_t	*hist_convert(EditLine *, int, void *);
+
+#endif /* _h_el_hist */
diff --git a/cmd-line-utils/libedit/histedit.h b/extra/libedit/libedit-20221030-3.1/src/histedit.h
similarity index 92%
rename from cmd-line-utils/libedit/histedit.h
rename to extra/libedit/libedit-20221030-3.1/src/histedit.h
index 523d27b0be27..1e215fc88d1c 100644
--- a/cmd-line-utils/libedit/histedit.h
+++ b/extra/libedit/libedit-20221030-3.1/src/histedit.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: histedit.h,v 1.48 2011/07/28 20:50:55 christos Exp $	*/
+/*	$NetBSD: histedit.h,v 1.61 2022/02/08 21:13:22 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -43,13 +43,6 @@
 #define	LIBEDIT_MAJOR 2
 #define	LIBEDIT_MINOR 11
 
-/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
-#if defined(__sun) || defined(__sun__)
-#include <sys/inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
 #include <sys/types.h>
 #include <stdio.h>
 
@@ -91,6 +84,8 @@ typedef struct lineinfo {
  * Initialization, cleanup, and resetting
  */
 EditLine	*el_init(const char *, FILE *, FILE *, FILE *);
+EditLine	*el_init_fd(const char *, FILE *, FILE *, FILE *,
+    int, int, int);
 void		 el_end(EditLine *);
 void		 el_reset(EditLine *);
 
@@ -133,7 +128,7 @@ unsigned char	_el_fn_complete(EditLine *, int);
  * For operations that support set or set/get, the argument types listed are for
  * the "set" operation. For "get", each listed type must be a pointer.
  * E.g. EL_EDITMODE takes an int when set, but an int* when get.
- * 
+ *
  * Operations that only support "get" have the correct argument types listed.
  */
 #define	EL_PROMPT	0	/* , prompt_func);		      set/get */
@@ -146,7 +141,7 @@ unsigned char	_el_fn_complete(EditLine *, int);
 #define	EL_ECHOTC	7	/* , const Char *, ..., NULL);        set     */
 #define	EL_SETTY	8	/* , const Char *, ..., NULL);        set     */
 #define	EL_ADDFN	9	/* , const Char *, const Char,        set     */
-				/*   el_func_t);		 	      */
+				/*   el_func_t);			      */
 #define	EL_HIST		10	/* , hist_fun_t, const void *);	      set     */
 #define	EL_EDITMODE	11	/* , int);			      set/get */
 #define	EL_RPROMPT	12	/* , prompt_func);		      set/get */
@@ -161,6 +156,8 @@ unsigned char	_el_fn_complete(EditLine *, int);
 #define	EL_PROMPT_ESC	21	/* , prompt_func, Char);	      set/get */
 #define	EL_RPROMPT_ESC	22	/* , prompt_func, Char);	      set/get */
 #define	EL_RESIZE	23	/* , el_zfunc_t, void *);	      set     */
+#define	EL_ALIAS_TEXT	24	/* , el_afunc_t, void *);	      set     */
+#define	EL_SAFEREAD	25	/* , int);			      set/get */
 
 #define	EL_BUILTIN_GETCFN	(NULL)
 
@@ -182,7 +179,8 @@ void		 el_resize(EditLine *);
 const LineInfo	*el_line(EditLine *);
 int		 el_insertstr(EditLine *, const char *);
 void		 el_deletestr(EditLine *, int);
-
+int		 el_replacestr(EditLine *, const char *);
+int		 el_deletestr1(EditLine *, int, int);
 
 /*
  * ==== History ====
@@ -229,6 +227,8 @@ int		history(History *, HistEvent *, int, ...);
 #define	H_NEXT_EVDATA	23	/* , const int, histdata_t *);	*/
 #define	H_DELDATA	24	/* , int, histdata_t *);*/
 #define	H_REPLACE	25	/* , const char *, histdata_t);	*/
+#define	H_SAVE_FP	26	/* , FILE *);		*/
+#define	H_NSAVE_FP	27	/* , size_t, FILE *);	*/
 
 
 
@@ -252,10 +252,12 @@ int		 tok_str(Tokenizer *, const char *,
 /*
  * Begin Wide Character Support
  */
+#include <wchar.h>
+#include <wctype.h>
 
-/*
- * Wide character versions
- */
+#ifndef HAVE_WCSDUP
+wchar_t * wcsdup(const wchar_t *str);
+#endif
 
 /*
  * ==== Editing ====
@@ -266,6 +268,8 @@ typedef struct lineinfow {
 	const wchar_t	*lastchar;
 } LineInfoW;
 
+typedef int	(*el_rfunc_t)(EditLine *, wchar_t *);
+
 const wchar_t	*el_wgets(EditLine *, int *);
 int		 el_wgetc(EditLine *, wchar_t *);
 void		 el_wpush(EditLine *, const wchar_t *);
@@ -275,9 +279,11 @@ int		 el_wparse(EditLine *, int, const wchar_t **);
 int		 el_wset(EditLine *, int, ...);
 int		 el_wget(EditLine *, int, ...);
 
+int		 el_cursor(EditLine *, int);
 const LineInfoW	*el_wline(EditLine *);
 int		 el_winsertstr(EditLine *, const wchar_t *);
 #define          el_wdeletestr  el_deletestr
+int		 el_wreplacestr(EditLine *, const wchar_t *);
 
 /*
  * ==== History ====
diff --git a/cmd-line-utils/libedit/history.c b/extra/libedit/libedit-20221030-3.1/src/history.c
similarity index 82%
rename from cmd-line-utils/libedit/history.c
rename to extra/libedit/libedit-20221030-3.1/src/history.c
index 6d2176c258b3..2a8ca1aa2c82 100644
--- a/cmd-line-utils/libedit/history.c
+++ b/extra/libedit/libedit-20221030-3.1/src/history.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: history.c,v 1.45 2011/07/29 23:44:44 christos Exp $	*/
+/*	$NetBSD: history.c,v 1.63 2019/10/08 19:17:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -32,32 +32,68 @@
  * SUCH DAMAGE.
  */
 
+#ifndef NARROWCHAR
 #include "config.h"
+#endif
+
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: history.c,v 1.63 2019/10/08 19:17:57 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * hist.c: TYPE(History) access functions
  */
-#include <string.h>
-#include <stdlib.h>
+#include <sys/stat.h>
 #include <stdarg.h>
-#ifdef HAVE_VIS_H
+#include <stdlib.h>
+#include <string.h>
 #include <vis.h>
-#else
-#include "np/vis.h"
-#endif
-#include <sys/stat.h>
 
 static const char hist_cookie[] = "_HiStOrY_V2_\n";
 
 #include "histedit.h"
+
+
+#ifdef NARROWCHAR
+
+#define	Char			char
+#define	FUN(prefix, rest)	prefix ## _ ## rest
+#define	FUNW(type)		type
+#define	TYPE(type)		type
+#define	STR(x)			x
+
+#define	Strlen(s)		strlen(s)
+#define	Strdup(s)		strdup(s)
+#define	Strcmp(d, s)		strcmp(d, s)
+#define	Strncmp(d, s, n)	strncmp(d, s, n)
+#define	Strncpy(d, s, n)	strncpy(d, s, n)
+#define	Strncat(d, s, n)	strncat(d, s, n)
+#define	ct_decode_string(s, b)	(s)
+#define	ct_encode_string(s, b)	(s)
+
+#else
 #include "chartype.h"
 
+#define	Char			wchar_t
+#define	FUN(prefix, rest)	prefix ## _w ## rest
+#define	FUNW(type)		type ## _w
+#define	TYPE(type)		type ## W
+#define	STR(x)			L ## x
+
+#define	Strlen(s)		wcslen(s)
+#define	Strdup(s)		wcsdup(s)
+#define	Strcmp(d, s)		wcscmp(d, s)
+#define	Strncmp(d, s, n)	wcsncmp(d, s, n)
+#define	Strncpy(d, s, n)	wcsncpy(d, s, n)
+#define	Strncat(d, s, n)	wcsncat(d, s, n)
+
+#endif
+
+
 typedef int (*history_gfun_t)(void *, TYPE(HistEvent) *);
 typedef int (*history_efun_t)(void *, TYPE(HistEvent) *, const Char *);
 typedef void (*history_vfun_t)(void *, TYPE(HistEvent) *);
@@ -100,18 +136,20 @@ typedef struct {
 } HistEventPrivate;
 
 
-
-private int history_setsize(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_getsize(TYPE(History) *, TYPE(HistEvent) *);
-private int history_setunique(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_getunique(TYPE(History) *, TYPE(HistEvent) *);
-private int history_set_fun(TYPE(History) *, TYPE(History) *);
-private int history_load(TYPE(History) *, const char *);
-private int history_save(TYPE(History) *, const char *);
-private int history_prev_event(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_next_event(TYPE(History) *, TYPE(HistEvent) *, int);
-private int history_next_string(TYPE(History) *, TYPE(HistEvent) *, const Char *);
-private int history_prev_string(TYPE(History) *, TYPE(HistEvent) *, const Char *);
+static int history_setsize(TYPE(History) *, TYPE(HistEvent) *, int);
+static int history_getsize(TYPE(History) *, TYPE(HistEvent) *);
+static int history_setunique(TYPE(History) *, TYPE(HistEvent) *, int);
+static int history_getunique(TYPE(History) *, TYPE(HistEvent) *);
+static int history_set_fun(TYPE(History) *, TYPE(History) *);
+static int history_load(TYPE(History) *, const char *);
+static int history_save(TYPE(History) *, const char *);
+static int history_save_fp(TYPE(History) *, size_t, FILE *);
+static int history_prev_event(TYPE(History) *, TYPE(HistEvent) *, int);
+static int history_next_event(TYPE(History) *, TYPE(HistEvent) *, int);
+static int history_next_string(TYPE(History) *, TYPE(HistEvent) *,
+    const Char *);
+static int history_prev_string(TYPE(History) *, TYPE(HistEvent) *,
+    const Char *);
 
 
 /***********************************************************************/
@@ -136,23 +174,23 @@ typedef struct history_t {
 #define H_UNIQUE	1	/* Store only unique elements	*/
 } history_t;
 
-private int history_def_next(void *, TYPE(HistEvent) *);
-private int history_def_first(void *, TYPE(HistEvent) *);
-private int history_def_prev(void *, TYPE(HistEvent) *);
-private int history_def_last(void *, TYPE(HistEvent) *);
-private int history_def_curr(void *, TYPE(HistEvent) *);
-private int history_def_set(void *, TYPE(HistEvent) *, const int);
-private void history_def_clear(void *, TYPE(HistEvent) *);
-private int history_def_enter(void *, TYPE(HistEvent) *, const Char *);
-private int history_def_add(void *, TYPE(HistEvent) *, const Char *);
-private int history_def_del(void *, TYPE(HistEvent) *, const int);
+static int history_def_next(void *, TYPE(HistEvent) *);
+static int history_def_first(void *, TYPE(HistEvent) *);
+static int history_def_prev(void *, TYPE(HistEvent) *);
+static int history_def_last(void *, TYPE(HistEvent) *);
+static int history_def_curr(void *, TYPE(HistEvent) *);
+static int history_def_set(void *, TYPE(HistEvent) *, const int);
+static void history_def_clear(void *, TYPE(HistEvent) *);
+static int history_def_enter(void *, TYPE(HistEvent) *, const Char *);
+static int history_def_add(void *, TYPE(HistEvent) *, const Char *);
+static int history_def_del(void *, TYPE(HistEvent) *, const int);
 
-private int history_def_init(void **, TYPE(HistEvent) *, int);
-private int history_def_insert(history_t *, TYPE(HistEvent) *, const Char *);
-private void history_def_delete(history_t *, TYPE(HistEvent) *, hentry_t *);
+static int history_def_init(void **, TYPE(HistEvent) *, int);
+static int history_def_insert(history_t *, TYPE(HistEvent) *, const Char *);
+static void history_def_delete(history_t *, TYPE(HistEvent) *, hentry_t *);
 
-private int history_deldata_nth(history_t *, TYPE(HistEvent) *, int, void **);
-private int history_set_nth(void *, TYPE(HistEvent) *, int);
+static int history_deldata_nth(history_t *, TYPE(HistEvent) *, int, void **);
+static int history_set_nth(void *, TYPE(HistEvent) *, int);
 
 #define	history_def_setsize(p, num)(void) (((history_t *)p)->max = (num))
 #define	history_def_getsize(p)  (((history_t *)p)->cur)
@@ -209,7 +247,7 @@ static const Char *const he_errlist[] = {
 /* history_def_first():
  *	Default function to return the first event in the history.
  */
-private int
+static int
 history_def_first(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -229,7 +267,7 @@ history_def_first(void *p, TYPE(HistEvent) *ev)
 /* history_def_last():
  *	Default function to return the last event in the history.
  */
-private int
+static int
 history_def_last(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -249,7 +287,7 @@ history_def_last(void *p, TYPE(HistEvent) *ev)
 /* history_def_next():
  *	Default function to return the next event in the history.
  */
-private int
+static int
 history_def_next(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -274,7 +312,7 @@ history_def_next(void *p, TYPE(HistEvent) *ev)
 /* history_def_prev():
  *	Default function to return the previous event in the history.
  */
-private int
+static int
 history_def_prev(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -300,7 +338,7 @@ history_def_prev(void *p, TYPE(HistEvent) *ev)
 /* history_def_curr():
  *	Default function to return the current event in the history.
  */
-private int
+static int
 history_def_curr(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -321,7 +359,7 @@ history_def_curr(void *p, TYPE(HistEvent) *ev)
  *	Default function to set the current event in the history to the
  *	given one.
  */
-private int
+static int
 history_def_set(void *p, TYPE(HistEvent) *ev, const int n)
 {
 	history_t *h = (history_t *) p;
@@ -348,7 +386,7 @@ history_def_set(void *p, TYPE(HistEvent) *ev, const int n)
  *	Default function to set the current event in the history to the
  *	n-th one.
  */
-private int
+static int
 history_set_nth(void *p, TYPE(HistEvent) *ev, int n)
 {
 	history_t *h = (history_t *) p;
@@ -372,25 +410,27 @@ history_set_nth(void *p, TYPE(HistEvent) *ev, int n)
 /* history_def_add():
  *	Append string to element
  */
-private int
+static int
 history_def_add(void *p, TYPE(HistEvent) *ev, const Char *str)
 {
 	history_t *h = (history_t *) p;
-	size_t len;
+	size_t len, elen, slen;
 	Char *s;
 	HistEventPrivate *evp = (void *)&h->cursor->ev;
 
 	if (h->cursor == &h->list)
 		return history_def_enter(p, ev, str);
-	len = Strlen(evp->str) + Strlen(str) + 1;
+	elen = Strlen(evp->str);
+	slen = Strlen(str);
+	len = elen + slen + 1;
 	s = h_malloc(len * sizeof(*s));
 	if (s == NULL) {
 		he_seterrev(ev, _HE_MALLOC_FAILED);
 		return -1;
 	}
-	(void) Strncpy(s, h->cursor->ev.str, len);
+	memcpy(s, evp->str, elen * sizeof(*s));
+	memcpy(s + elen, str, slen * sizeof(*s)); 
         s[len - 1] = '\0';
-	(void) Strncat(s, str, len - Strlen(s) - 1);
 	h_free(evp->str);
 	evp->str = s;
 	*ev = h->cursor->ev;
@@ -398,7 +438,7 @@ history_def_add(void *p, TYPE(HistEvent) *ev, const Char *str)
 }
 
 
-private int
+static int
 history_deldata_nth(history_t *h, TYPE(HistEvent) *ev,
     int num, void **data)
 {
@@ -420,7 +460,7 @@ history_deldata_nth(history_t *h, TYPE(HistEvent) *ev,
  *	Delete element hp of the h list
  */
 /* ARGSUSED */
-private int
+static int
 history_def_del(void *p, TYPE(HistEvent) *ev __attribute__((__unused__)),
     const int num)
 {
@@ -438,8 +478,8 @@ history_def_del(void *p, TYPE(HistEvent) *ev __attribute__((__unused__)),
  *	Delete element hp of the h list
  */
 /* ARGSUSED */
-private void
-history_def_delete(history_t *h, 
+static void
+history_def_delete(history_t *h,
 		   TYPE(HistEvent) *ev __attribute__((__unused__)), hentry_t *hp)
 {
 	HistEventPrivate *evp = (void *)&hp->ev;
@@ -461,7 +501,7 @@ history_def_delete(history_t *h,
 /* history_def_insert():
  *	Insert element with string str in the h list
  */
-private int
+static int
 history_def_insert(history_t *h, TYPE(HistEvent) *ev, const Char *str)
 {
 	hentry_t *c;
@@ -493,7 +533,7 @@ history_def_insert(history_t *h, TYPE(HistEvent) *ev, const Char *str)
 /* history_def_enter():
  *	Default function to enter an item in the history
  */
-private int
+static int
 history_def_enter(void *p, TYPE(HistEvent) *ev, const Char *str)
 {
 	history_t *h = (history_t *) p;
@@ -520,7 +560,7 @@ history_def_enter(void *p, TYPE(HistEvent) *ev, const Char *str)
  *	Default history initialization function
  */
 /* ARGSUSED */
-private int
+static int
 history_def_init(void **p, TYPE(HistEvent) *ev __attribute__((__unused__)), int n)
 {
 	history_t *h = (history_t *) h_malloc(sizeof(*h));
@@ -545,7 +585,7 @@ history_def_init(void **p, TYPE(HistEvent) *ev __attribute__((__unused__)), int
 /* history_def_clear():
  *	Default history cleanup function
  */
-private void
+static void
 history_def_clear(void *p, TYPE(HistEvent) *ev)
 {
 	history_t *h = (history_t *) p;
@@ -565,7 +605,7 @@ history_def_clear(void *p, TYPE(HistEvent) *ev)
 /* history_init():
  *	Initialization function.
  */
-public TYPE(History) *
+TYPE(History) *
 FUN(history,init)(void)
 {
 	TYPE(HistEvent) ev;
@@ -596,7 +636,7 @@ FUN(history,init)(void)
 /* history_end():
  *	clean up history;
  */
-public void
+void
 FUN(history,end)(TYPE(History) *h)
 {
 	TYPE(HistEvent) ev;
@@ -612,7 +652,7 @@ FUN(history,end)(TYPE(History) *h)
 /* history_setsize():
  *	Set history number of events
  */
-private int
+static int
 history_setsize(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 {
 
@@ -632,7 +672,7 @@ history_setsize(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 /* history_getsize():
  *      Get number of events currently in history
  */
-private int
+static int
 history_getsize(TYPE(History) *h, TYPE(HistEvent) *ev)
 {
 	if (h->h_next != history_def_next) {
@@ -651,7 +691,7 @@ history_getsize(TYPE(History) *h, TYPE(HistEvent) *ev)
 /* history_setunique():
  *	Set if adjacent equal events should not be entered in history.
  */
-private int
+static int
 history_setunique(TYPE(History) *h, TYPE(HistEvent) *ev, int uni)
 {
 
@@ -667,7 +707,7 @@ history_setunique(TYPE(History) *h, TYPE(HistEvent) *ev, int uni)
 /* history_getunique():
  *	Get if adjacent equal events should not be entered in history.
  */
-private int
+static int
 history_getunique(TYPE(History) *h, TYPE(HistEvent) *ev)
 {
 	if (h->h_next != history_def_next) {
@@ -682,7 +722,7 @@ history_getunique(TYPE(History) *h, TYPE(HistEvent) *ev)
 /* history_set_fun():
  *	Set history functions
  */
-private int
+static int
 history_set_fun(TYPE(History) *h, TYPE(History) *nh)
 {
 	TYPE(HistEvent) ev;
@@ -692,7 +732,8 @@ history_set_fun(TYPE(History) *h, TYPE(History) *nh)
 	    nh->h_enter == NULL || nh->h_add == NULL || nh->h_clear == NULL ||
 	    nh->h_del == NULL || nh->h_ref == NULL) {
 		if (h->h_next != history_def_next) {
-			history_def_init(&h->h_ref, &ev, 0);
+			if (history_def_init(&h->h_ref, &ev, 0) == -1)
+				return -1;
 			h->h_first = history_def_first;
 			h->h_next = history_def_next;
 			h->h_last = history_def_last;
@@ -728,42 +769,42 @@ history_set_fun(TYPE(History) *h, TYPE(History) *nh)
 /* history_load():
  *	TYPE(History) load function
  */
-private int
+static int
 history_load(TYPE(History) *h, const char *fname)
 {
 	FILE *fp;
 	char *line;
-	size_t sz, max_size;
+	size_t llen;
+	ssize_t sz;
+	size_t max_size;
 	char *ptr;
 	int i = -1;
 	TYPE(HistEvent) ev;
-#ifdef WIDECHAR
+	Char *decode_result;
+#ifndef NARROWCHAR
 	static ct_buffer_t conv;
 #endif
 
 	if ((fp = fopen(fname, "r")) == NULL)
 		return i;
 
-	if ((line = fgetln(fp, &sz)) == NULL)
+	line = NULL;
+	llen = 0;
+	if ((sz = getline(&line, &llen, fp)) == -1)
 		goto done;
 
-	if (strncmp(line, hist_cookie, sz) != 0)
+	if (strncmp(line, hist_cookie, (size_t)sz) != 0)
 		goto done;
 
 	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
 	if (ptr == NULL)
 		goto done;
-	for (i = 0; (line = fgetln(fp, &sz)) != NULL; i++) {
-		char c = line[sz];
-
-		if (sz != 0 && line[sz - 1] == '\n')
+	for (i = 0; (sz = getline(&line, &llen, fp)) != -1; i++) {
+		if (sz > 0 && line[sz - 1] == '\n')
 			line[--sz] = '\0';
-		else
-			line[sz] = '\0';
-
-		if (max_size < sz) {
+		if (max_size < (size_t)sz) {
 			char *nptr;
-			max_size = (sz + 1024) & (size_t)~1023;
+			max_size = ((size_t)sz + 1024) & (size_t)~1023;
 			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
 			if (nptr == NULL) {
 				i = -1;
@@ -772,8 +813,10 @@ history_load(TYPE(History) *h, const char *fname)
 			ptr = nptr;
 		}
 		(void) strunvis(ptr, line);
-		line[sz] = c;
-		if (HENTER(h, &ev, ct_decode_string(ptr, &conv)) == -1) {
+		decode_result = ct_decode_string(ptr, &conv);
+		if (decode_result == NULL)
+			continue;
+		if (HENTER(h, &ev, decode_result) == -1) {
 			i = -1;
 			goto oomem;
 		}
@@ -781,43 +824,48 @@ history_load(TYPE(History) *h, const char *fname)
 oomem:
 	h_free(ptr);
 done:
+	free(line);
 	(void) fclose(fp);
 	return i;
 }
 
 
-/* history_save():
+/* history_save_fp():
  *	TYPE(History) save function
  */
-private int
-history_save(TYPE(History) *h, const char *fname)
+static int
+history_save_fp(TYPE(History) *h, size_t nelem, FILE *fp)
 {
-	FILE *fp;
 	TYPE(HistEvent) ev;
 	int i = -1, retval;
 	size_t len, max_size;
 	char *ptr;
 	const char *str;
-#ifdef WIDECHAR
+#ifndef NARROWCHAR
 	static ct_buffer_t conv;
 #endif
 
-	if ((fp = fopen(fname, "w")) == NULL)
-		return -1;
-
 	if (fchmod(fileno(fp), S_IRUSR|S_IWUSR) == -1)
 		goto done;
-	if (fputs(hist_cookie, fp) == EOF)
+	if (ftell(fp) == 0 && fputs(hist_cookie, fp) == EOF)
 		goto done;
 	ptr = h_malloc((max_size = 1024) * sizeof(*ptr));
 	if (ptr == NULL)
 		goto done;
-	for (i = 0, retval = HLAST(h, &ev);
-	    retval != -1;
-	    retval = HPREV(h, &ev), i++) {
+	if (nelem != (size_t)-1) {
+		for (retval = HFIRST(h, &ev); retval != -1 && nelem-- > 0;
+		    retval = HNEXT(h, &ev))
+			continue;
+	} else
+		retval = -1;
+
+	if (retval == -1)
+		retval = HLAST(h, &ev);
+
+	for (i = 0; retval != -1; retval = HPREV(h, &ev), i++) {
 		str = ct_encode_string(ev.str, &conv);
-		len = strlen(str) * 4;
-		if (len >= max_size) {
+		len = strlen(str) * 4 + 1;
+		if (len > max_size) {
 			char *nptr;
 			max_size = (len + 1024) & (size_t)~1023;
 			nptr = h_realloc(ptr, max_size * sizeof(*ptr));
@@ -833,15 +881,33 @@ history_save(TYPE(History) *h, const char *fname)
 oomem:
 	h_free(ptr);
 done:
-	(void) fclose(fp);
 	return i;
 }
 
 
+/* history_save():
+ *    History save function
+ */
+static int
+history_save(TYPE(History) *h, const char *fname)
+{
+    FILE *fp;
+    int i;
+
+    if ((fp = fopen(fname, "w")) == NULL)
+	return -1;
+
+    i = history_save_fp(h, (size_t)-1, fp);
+
+    (void) fclose(fp);
+    return i;
+}
+
+
 /* history_prev_event():
  *	Find the previous event, with number given
  */
-private int
+static int
 history_prev_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 {
 	int retval;
@@ -855,7 +921,7 @@ history_prev_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 }
 
 
-private int
+static int
 history_next_evdata(TYPE(History) *h, TYPE(HistEvent) *ev, int num, void **d)
 {
 	int retval;
@@ -875,7 +941,7 @@ history_next_evdata(TYPE(History) *h, TYPE(HistEvent) *ev, int num, void **d)
 /* history_next_event():
  *	Find the next event, with number given
  */
-private int
+static int
 history_next_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 {
 	int retval;
@@ -892,7 +958,7 @@ history_next_event(TYPE(History) *h, TYPE(HistEvent) *ev, int num)
 /* history_prev_string():
  *	Find the previous event beginning with string
  */
-private int
+static int
 history_prev_string(TYPE(History) *h, TYPE(HistEvent) *ev, const Char *str)
 {
 	size_t len = Strlen(str);
@@ -910,7 +976,7 @@ history_prev_string(TYPE(History) *h, TYPE(HistEvent) *ev, const Char *str)
 /* history_next_string():
  *	Find the next event beginning with string
  */
-private int
+static int
 history_next_string(TYPE(History) *h, TYPE(HistEvent) *ev, const Char *str)
 {
 	size_t len = Strlen(str);
@@ -1018,6 +1084,21 @@ FUNW(history)(TYPE(History) *h, TYPE(HistEvent) *ev, int fun, ...)
 			he_seterrev(ev, _HE_HIST_WRITE);
 		break;
 
+	case H_SAVE_FP:
+		retval = history_save_fp(h, (size_t)-1, va_arg(va, FILE *));
+		if (retval == -1)
+		    he_seterrev(ev, _HE_HIST_WRITE);
+		break;
+
+	case H_NSAVE_FP:
+	{
+		size_t sz = va_arg(va, size_t);
+		retval = history_save_fp(h, sz, va_arg(va, FILE *));
+		if (retval == -1)
+		    he_seterrev(ev, _HE_HIST_WRITE);
+		break;
+	}
+
 	case H_PREV_EVENT:
 		retval = history_prev_event(h, ev, va_arg(va, int));
 		break;
diff --git a/extra/libedit/libedit-20221030-3.1/src/historyn.c b/extra/libedit/libedit-20221030-3.1/src/historyn.c
new file mode 100644
index 000000000000..59130dea3451
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/historyn.c
@@ -0,0 +1,3 @@
+#include "config.h"
+#define NARROWCHAR
+#include "history.c"
diff --git a/cmd-line-utils/libedit/keymacro.c b/extra/libedit/libedit-20221030-3.1/src/keymacro.c
similarity index 82%
rename from cmd-line-utils/libedit/keymacro.c
rename to extra/libedit/libedit-20221030-3.1/src/keymacro.c
index 8df60e85d6cb..cef24a1752e6 100644
--- a/cmd-line-utils/libedit/keymacro.c
+++ b/extra/libedit/libedit-20221030-3.1/src/keymacro.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: keymacro.c,v 1.7 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: keymacro.c,v 1.24 2019/07/23 10:18:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: keymacro.c,v 1.24 2019/07/23 10:18:52 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -49,7 +50,7 @@ static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
  *	number of characters.  This module maintains a map (the
  *	el->el_keymacro.map)
  *	to convert these extended-key sequences into input strs
- *	(XK_STR), editor functions (XK_CMD), or unix commands (XK_EXE).
+ *	(XK_STR) or editor functions (XK_CMD).
  *
  *      Warning:
  *	  If key is a substr of some other keys, then the longer
@@ -62,36 +63,37 @@ static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
  *      1) It is not possible to have one key that is a
  *	   substr of another.
  */
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "el.h"
+#include "fcns.h"
 
 /*
  * The Nodes of the el->el_keymacro.map.  The el->el_keymacro.map is a
  * linked list of these node elements
  */
 struct keymacro_node_t {
-	Char		 ch;		/* single character of key 	 */
+	wchar_t		 ch;		/* single character of key	 */
 	int		 type;		/* node type			 */
 	keymacro_value_t val;		/* command code or pointer to str,  */
-					/* if this is a leaf 		 */
+					/* if this is a leaf		 */
 	struct keymacro_node_t *next;	/* ptr to next char of this key  */
 	struct keymacro_node_t *sibling;/* ptr to another key with same prefix*/
 };
 
-private int		 node_trav(EditLine *, keymacro_node_t *, Char *,
+static int		 node_trav(EditLine *, keymacro_node_t *, wchar_t *,
     keymacro_value_t *);
-private int		 node__try(EditLine *, keymacro_node_t *, const Char *,
-    keymacro_value_t *, int);
-private keymacro_node_t	*node__get(Int);
-private void		 node__free(keymacro_node_t *);
-private void		 node__put(EditLine *, keymacro_node_t *);
-private int		 node__delete(EditLine *, keymacro_node_t **,
-    const Char *);
-private int		 node_lookup(EditLine *, const Char *,
+static int		 node__try(EditLine *, keymacro_node_t *,
+    const wchar_t *, keymacro_value_t *, int);
+static keymacro_node_t	*node__get(wint_t);
+static void		 node__free(keymacro_node_t *);
+static void		 node__put(EditLine *, keymacro_node_t *);
+static int		 node__delete(EditLine *, keymacro_node_t **,
+    const wchar_t *);
+static int		 node_lookup(EditLine *, const wchar_t *,
     keymacro_node_t *, size_t);
-private int		 node_enum(EditLine *, keymacro_node_t *, size_t);
+static int		 node_enum(EditLine *, keymacro_node_t *, size_t);
 
 #define	KEY_BUFSIZ	EL_BUFSIZ
 
@@ -99,11 +101,11 @@ private int		 node_enum(EditLine *, keymacro_node_t *, size_t);
 /* keymacro_init():
  *	Initialize the key maps
  */
-protected int
+libedit_private int
 keymacro_init(EditLine *el)
 {
 
-	el->el_keymacro.buf = el_malloc(KEY_BUFSIZ *
+	el->el_keymacro.buf = el_calloc(KEY_BUFSIZ,
 	    sizeof(*el->el_keymacro.buf));
 	if (el->el_keymacro.buf == NULL)
 		return -1;
@@ -115,7 +117,7 @@ keymacro_init(EditLine *el)
 /* keymacro_end():
  *	Free the key maps
  */
-protected void
+libedit_private void
 keymacro_end(EditLine *el)
 {
 
@@ -128,7 +130,7 @@ keymacro_end(EditLine *el)
 /* keymacro_map_cmd():
  *	Associate cmd with a key value
  */
-protected keymacro_value_t *
+libedit_private keymacro_value_t *
 keymacro_map_cmd(EditLine *el, int cmd)
 {
 
@@ -140,8 +142,8 @@ keymacro_map_cmd(EditLine *el, int cmd)
 /* keymacro_map_str():
  *	Associate str with a key value
  */
-protected keymacro_value_t *
-keymacro_map_str(EditLine *el, Char *str)
+libedit_private keymacro_value_t *
+keymacro_map_str(EditLine *el, wchar_t *str)
 {
 
 	el->el_keymacro.val.str = str;
@@ -154,7 +156,7 @@ keymacro_map_str(EditLine *el, Char *str)
  *	Then initializes el->el_keymacro.map with arrow keys
  *	[Always bind the ansi arrow keys?]
  */
-protected void
+libedit_private void
 keymacro_reset(EditLine *el)
 {
 
@@ -168,12 +170,13 @@ keymacro_reset(EditLine *el)
  *	Calls the recursive function with entry point el->el_keymacro.map
  *      Looks up *ch in map and then reads characters until a
  *      complete match is found or a mismatch occurs. Returns the
- *      type of the match found (XK_STR, XK_CMD, or XK_EXE).
+ *      type of the match found (XK_STR or XK_CMD).
  *      Returns NULL in val.str and XK_STR for no match.
+ *      Returns XK_NOD for end of file or read error.
  *      The last character read is returned in *ch.
  */
-protected int
-keymacro_get(EditLine *el, Char *ch, keymacro_value_t *val)
+libedit_private int
+keymacro_get(EditLine *el, wchar_t *ch, keymacro_value_t *val)
 {
 
 	return node_trav(el, el->el_keymacro.map, ch, val);
@@ -186,8 +189,9 @@ keymacro_get(EditLine *el, Char *ch, keymacro_value_t *val)
  *	code is applied to the existing key. Ntype specifies if code is a
  *	command, an out str or a unix command.
  */
-protected void
-keymacro_add(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
+libedit_private void
+keymacro_add(EditLine *el, const wchar_t *key, keymacro_value_t *val,
+    int ntype)
 {
 
 	if (key[0] == '\0') {
@@ -214,13 +218,11 @@ keymacro_add(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
 /* keymacro_clear():
  *
  */
-protected void
-keymacro_clear(EditLine *el, el_action_t *map, const Char *in)
+libedit_private void
+keymacro_clear(EditLine *el, el_action_t *map, const wchar_t *in)
 {
-#ifdef WIDECHAR
         if (*in > N_KEYS) /* can't be in the map */
                 return;
-#endif
 	if ((map[(unsigned char)*in] == ED_SEQUENCE_LEAD_IN) &&
 	    ((map == el->el_map.key &&
 	    el->el_map.alt[(unsigned char)*in] != ED_SEQUENCE_LEAD_IN) ||
@@ -234,8 +236,8 @@ keymacro_clear(EditLine *el, el_action_t *map, const Char *in)
  *      Delete the key and all longer keys staring with key, if
  *      they exists.
  */
-protected int
-keymacro_delete(EditLine *el, const Char *key)
+libedit_private int
+keymacro_delete(EditLine *el, const wchar_t *key)
 {
 
 	if (key[0] == '\0') {
@@ -255,8 +257,8 @@ keymacro_delete(EditLine *el, const Char *key)
  *	Print the binding associated with key key.
  *	Print entire el->el_keymacro.map if null
  */
-protected void
-keymacro_print(EditLine *el, const Char *key)
+libedit_private void
+keymacro_print(EditLine *el, const wchar_t *key)
 {
 
 	/* do nothing if el->el_keymacro.map is empty and null key specified */
@@ -266,7 +268,7 @@ keymacro_print(EditLine *el, const Char *key)
 	el->el_keymacro.buf[0] = '"';
 	if (node_lookup(el, key, el->el_keymacro.map, (size_t)1) <= -1)
 		/* key is not bound */
-		(void) fprintf(el->el_errfile, "Unbound extended key \"" FSTR
+		(void) fprintf(el->el_errfile, "Unbound extended key \"%ls"
 		    "\"\n", key);
 	return;
 }
@@ -274,21 +276,19 @@ keymacro_print(EditLine *el, const Char *key)
 
 /* node_trav():
  *	recursively traverses node in tree until match or mismatch is
- * 	found.  May read in more characters.
+ *	found.  May read in more characters.
  */
-private int
-node_trav(EditLine *el, keymacro_node_t *ptr, Char *ch, keymacro_value_t *val)
+static int
+node_trav(EditLine *el, keymacro_node_t *ptr, wchar_t *ch,
+    keymacro_value_t *val)
 {
 
 	if (ptr->ch == *ch) {
 		/* match found */
 		if (ptr->next) {
 			/* key not complete so get next char */
-			if (FUN(el,getc)(el, ch) != 1) {/* if EOF or error */
-				val->cmd = ED_END_OF_FILE;
-				return XK_CMD;
-				/* PWP: Pretend we just read an end-of-file */
-			}
+			if (el_wgetc(el, ch) != 1)
+				return XK_NOD;
 			return node_trav(el, ptr->next, ch, val);
 		} else {
 			*val = ptr->val;
@@ -311,10 +311,10 @@ node_trav(EditLine *el, keymacro_node_t *ptr, Char *ch, keymacro_value_t *val)
 
 
 /* node__try():
- * 	Find a node that matches *str or allocate a new one
+ *	Find a node that matches *str or allocate a new one
  */
-private int
-node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
+static int
+node__try(EditLine *el, keymacro_node_t *ptr, const wchar_t *str,
     keymacro_value_t *val, int ntype)
 {
 
@@ -340,7 +340,6 @@ node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
 		case XK_NOD:
 			break;
 		case XK_STR:
-		case XK_EXE:
 			if (ptr->val.str)
 				el_free(ptr->val.str);
 			break;
@@ -355,8 +354,7 @@ node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
 			ptr->val = *val;
 			break;
 		case XK_STR:
-		case XK_EXE:
-			if ((ptr->val.str = Strdup(val->str)) == NULL)
+			if ((ptr->val.str = wcsdup(val->str)) == NULL)
 				return -1;
 			break;
 		default:
@@ -376,8 +374,8 @@ node__try(EditLine *el, keymacro_node_t *ptr, const Char *str,
 /* node__delete():
  *	Delete node that matches str
  */
-private int
-node__delete(EditLine *el, keymacro_node_t **inptr, const Char *str)
+static int
+node__delete(EditLine *el, keymacro_node_t **inptr, const wchar_t *str)
 {
 	keymacro_node_t *ptr;
 	keymacro_node_t *prev_ptr = NULL;
@@ -424,7 +422,7 @@ node__delete(EditLine *el, keymacro_node_t **inptr, const Char *str)
 /* node__put():
  *	Puts a tree of nodes onto free list using free(3).
  */
-private void
+static void
 node__put(EditLine *el, keymacro_node_t *ptr)
 {
 	if (ptr == NULL)
@@ -440,7 +438,6 @@ node__put(EditLine *el, keymacro_node_t *ptr)
 	case XK_CMD:
 	case XK_NOD:
 		break;
-	case XK_EXE:
 	case XK_STR:
 		if (ptr->val.str != NULL)
 			el_free(ptr->val.str);
@@ -456,8 +453,8 @@ node__put(EditLine *el, keymacro_node_t *ptr)
 /* node__get():
  *	Returns pointer to a keymacro_node_t for ch.
  */
-private keymacro_node_t *
-node__get(Int ch)
+static keymacro_node_t *
+node__get(wint_t ch)
 {
 	keymacro_node_t *ptr;
 
@@ -472,7 +469,7 @@ node__get(Int ch)
 	return ptr;
 }
 
-private void
+static void
 node__free(keymacro_node_t *k)
 {
 	if (k == NULL)
@@ -486,8 +483,9 @@ node__free(keymacro_node_t *k)
  *	look for the str starting at node ptr.
  *	Print if last node
  */
-private int
-node_lookup(EditLine *el, const Char *str, keymacro_node_t *ptr, size_t cnt)
+static int
+node_lookup(EditLine *el, const wchar_t *str, keymacro_node_t *ptr,
+    size_t cnt)
 {
 	ssize_t used;
 
@@ -538,7 +536,7 @@ node_lookup(EditLine *el, const Char *str, keymacro_node_t *ptr, size_t cnt)
 /* node_enum():
  *	Traverse the node printing the characters it is bound in buffer
  */
-private int
+static int
 node_enum(EditLine *el, keymacro_node_t *ptr, size_t cnt)
 {
         ssize_t used;
@@ -548,7 +546,7 @@ node_enum(EditLine *el, keymacro_node_t *ptr, size_t cnt)
 		el->el_keymacro.buf[++cnt] = '\0';
 		(void) fprintf(el->el_errfile,
 		    "Some extended keys too long for internal print buffer");
-		(void) fprintf(el->el_errfile, " \"" FSTR "...\"\n",
+		(void) fprintf(el->el_errfile, " \"%ls...\"\n",
 		    el->el_keymacro.buf);
 		return 0;
 	}
@@ -581,21 +579,19 @@ node_enum(EditLine *el, keymacro_node_t *ptr, size_t cnt)
  *	Print the specified key and its associated
  *	function specified by val
  */
-protected void
-keymacro_kprint(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
+libedit_private void
+keymacro_kprint(EditLine *el, const wchar_t *key, keymacro_value_t *val,
+    int ntype)
 {
 	el_bindings_t *fp;
 	char unparsbuf[EL_BUFSIZ];
 	static const char fmt[] = "%-15s->  %s\n";
-	mbstate_t state;
 
-	memset(&state, 0, sizeof(mbstate_t));
 	if (val != NULL)
 		switch (ntype) {
 		case XK_STR:
-		case XK_EXE:
 			(void) keymacro__decode_str(val->str, unparsbuf,
-			    sizeof(unparsbuf), 
+			    sizeof(unparsbuf),
 			    ntype == XK_STR ? "\"\"" : "[]");
 			(void) fprintf(el->el_outfile, fmt,
 			    ct_encode_string(key, &el->el_scratch), unparsbuf);
@@ -603,9 +599,7 @@ keymacro_kprint(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
 		case XK_CMD:
 			for (fp = el->el_map.help; fp->name; fp++)
 				if (val->cmd == fp->func) {
-                    memset(&state, 0, sizeof(mbstate_t));
-                    wcsrtombs(unparsbuf, (const wchar_t **) &fp->name,
-                              sizeof(unparsbuf), &state);
+                    wcstombs(unparsbuf, fp->name, sizeof(unparsbuf));
                     unparsbuf[sizeof(unparsbuf) -1] = '\0';
 					(void) fprintf(el->el_outfile, fmt,
                         ct_encode_string(key, &el->el_scratch), unparsbuf);
@@ -636,14 +630,13 @@ keymacro_kprint(EditLine *el, const Char *key, keymacro_value_t *val, int ntype)
 /* keymacro__decode_str():
  *	Make a printable version of the ey
  */
-protected size_t
-keymacro__decode_str(const Char *str, char *buf, size_t len, const char *sep)
+libedit_private size_t
+keymacro__decode_str(const wchar_t *str, char *buf, size_t len,
+    const char *sep)
 {
 	char *b = buf, *eb = b + len;
-	const Char *p;
-	mbstate_t state;
+	const wchar_t *p;
 
-	memset(&state, 0, sizeof(mbstate_t));
 	b = buf;
 	if (sep[0] != '\0') {
 		ADDC(sep[0]);
@@ -654,12 +647,11 @@ keymacro__decode_str(const Char *str, char *buf, size_t len, const char *sep)
 		goto add_endsep;
 	}
 	for (p = str; *p != 0; p++) {
-		Char dbuf[VISUAL_WIDTH_MAX];
-		Char *p2 = dbuf;
+		wchar_t dbuf[VISUAL_WIDTH_MAX];
+		wchar_t *p2 = dbuf;
 		ssize_t l = ct_visual_char(dbuf, VISUAL_WIDTH_MAX, *p);
 		while (l-- > 0) {
-			ssize_t n = ct_encode_char(b, (size_t)(eb - b), *p2++,
-                                                   &state);
+			ssize_t n = ct_encode_char(b, (size_t)(eb - b), *p2++);
 			if (n == -1) /* ran out of space */
 				goto add_endsep;
 			else
diff --git a/extra/libedit/libedit-20221030-3.1/src/keymacro.h b/extra/libedit/libedit-20221030-3.1/src/keymacro.h
new file mode 100644
index 000000000000..0653bbe3f287
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/keymacro.h
@@ -0,0 +1,76 @@
+/*	$NetBSD: keymacro.h,v 1.6 2016/05/09 21:46:56 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)key.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * el.keymacro.h: Key macro header
+ */
+#ifndef _h_el_keymacro
+#define	_h_el_keymacro
+
+typedef union keymacro_value_t {
+	el_action_t	 cmd;	/* If it is a command the #	*/
+	wchar_t		*str;	/* If it is a string...		*/
+} keymacro_value_t;
+
+typedef struct keymacro_node_t keymacro_node_t;
+
+typedef struct el_keymacro_t {
+	wchar_t		*buf;	/* Key print buffer		*/
+	keymacro_node_t	*map;	/* Key map			*/
+	keymacro_value_t val;	/* Local conversion buffer	*/
+} el_keymacro_t;
+
+#define	XK_CMD	0
+#define	XK_STR	1
+#define	XK_NOD	2
+
+libedit_private int keymacro_init(EditLine *);
+libedit_private void keymacro_end(EditLine *);
+libedit_private keymacro_value_t *keymacro_map_cmd(EditLine *, int);
+libedit_private keymacro_value_t *keymacro_map_str(EditLine *, wchar_t *);
+libedit_private void keymacro_reset(EditLine *);
+libedit_private int keymacro_get(EditLine *, wchar_t *, keymacro_value_t *);
+libedit_private void keymacro_add(EditLine *, const wchar_t *,
+    keymacro_value_t *, int);
+libedit_private void keymacro_clear(EditLine *, el_action_t *, const wchar_t *);
+libedit_private int keymacro_delete(EditLine *, const wchar_t *);
+libedit_private void keymacro_print(EditLine *, const wchar_t *);
+libedit_private void keymacro_kprint(EditLine *, const wchar_t *,
+    keymacro_value_t *, int);
+libedit_private size_t keymacro__decode_str(const wchar_t *, char *, size_t,
+    const char *);
+
+#endif /* _h_el_keymacro */
diff --git a/extra/libedit/libedit-20221030-3.1/src/literal.c b/extra/libedit/libedit-20221030-3.1/src/literal.c
new file mode 100644
index 000000000000..3c568164872f
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/literal.c
@@ -0,0 +1,138 @@
+/*	$NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+__RCSID("$NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/*
+ * literal.c: Literal sequences handling.
+ */
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "el.h"
+
+libedit_private void
+literal_init(EditLine *el)
+{
+	el_literal_t *l = &el->el_literal;
+
+	memset(l, 0, sizeof(*l));
+}
+
+libedit_private void
+literal_end(EditLine *el)
+{
+	literal_clear(el);
+}
+
+libedit_private void
+literal_clear(EditLine *el)
+{
+	el_literal_t *l = &el->el_literal;
+	size_t i;
+
+	if (l->l_len == 0)
+		return;
+
+	for (i = 0; i < l->l_idx; i++)
+		el_free(l->l_buf[i]);
+	el_free(l->l_buf);
+	l->l_buf = NULL;
+	l->l_len = 0;
+	l->l_idx = 0;
+}
+
+libedit_private wint_t
+literal_add(EditLine *el, const wchar_t *buf, const wchar_t *end, int *wp)
+{
+	el_literal_t *l = &el->el_literal;
+	size_t i, len;
+	ssize_t w, n;
+	char *b;
+
+	w = wcwidth(end[1]);	/* column width of the visible char */
+	*wp = (int)w;
+
+	if (w <= 0)		/* we require something to be printed */
+		return 0;
+
+	len = (size_t)(end - buf);
+	for (w = 0, i = 0; i < len; i++)
+		w += ct_enc_width(buf[i]);
+	w += ct_enc_width(end[1]);
+
+	b = el_malloc((size_t)(w + 1));
+	if (b == NULL)
+		return 0;
+
+	for (n = 0, i = 0; i < len; i++)
+		n += ct_encode_char(b + n, (size_t)(w - n), buf[i]);
+	n += ct_encode_char(b + n, (size_t)(w - n), end[1]);
+	b[n] = '\0';
+
+	/*
+	 * Then save this literal string in the list of such strings,
+	 * and return a "magic character" to put into the terminal buffer.
+	 * When that magic char is 'printed' the saved string (which includes
+	 * the char that belongs in that position) gets sent instead.
+	 */
+	if (l->l_idx == l->l_len) {
+		char **bp;
+
+		l->l_len += 4;
+		bp = el_realloc(l->l_buf, sizeof(*l->l_buf) * l->l_len);
+		if (bp == NULL) {
+			free(b);
+			l->l_len -= 4;
+			return 0;
+		}
+		l->l_buf = bp;
+	}
+	l->l_buf[l->l_idx++] = b;
+	return EL_LITERAL | (wint_t)(l->l_idx - 1);
+}
+
+libedit_private const char *
+literal_get(EditLine *el, wint_t idx)
+{
+	el_literal_t *l = &el->el_literal;
+
+	assert(idx & EL_LITERAL);
+	idx &= ~EL_LITERAL;
+	assert(l->l_idx > (size_t)idx);
+	return l->l_buf[idx];
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/literal.h b/extra/libedit/libedit-20221030-3.1/src/literal.h
new file mode 100644
index 000000000000..a8e0a416888b
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/literal.h
@@ -0,0 +1,53 @@
+/*	$NetBSD: literal.h,v 1.2 2017/06/30 20:26:52 kre Exp $	*/
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+/*
+ * el.literal.h: Literal character
+ */
+#ifndef _h_el_literal
+#define	_h_el_literal
+
+#define EL_LITERAL	((wint_t)0x80000000)
+
+typedef struct el_literal_t {
+	char		**l_buf;	/* array of buffers */
+	size_t		l_idx;		/* max in use */
+	size_t		l_len;		/* max allocated */
+} el_literal_t;
+
+libedit_private void literal_init(EditLine *);
+libedit_private void literal_end(EditLine *);
+libedit_private void literal_clear(EditLine *);
+libedit_private wint_t literal_add(EditLine *, const wchar_t *,
+    const wchar_t *, int *);
+libedit_private const char *literal_get(EditLine *, wint_t);
+
+#endif /* _h_el_literal */
diff --git a/extra/libedit/libedit-20221030-3.1/src/makelist.in b/extra/libedit/libedit-20221030-3.1/src/makelist.in
new file mode 100644
index 000000000000..54c89f624864
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/makelist.in
@@ -0,0 +1,182 @@
+#!/bin/sh -
+#	$NetBSD: makelist,v 1.29 2016/05/09 21:46:56 christos Exp $
+#
+# Copyright (c) 1992, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# This code is derived from software contributed to Berkeley by
+# Christos Zoulas of Cornell University.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+# 3. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+#
+#	@(#)makelist	5.3 (Berkeley) 6/4/93
+
+# makelist.sh: Automatically generate header files...
+
+LC_ALL=C
+LANG=C
+export LC_ALL LANG
+
+if [ "x$AWK" = "x" ]
+then
+   AWK=@AWK@
+fi
+
+USAGE="Usage: $0 -h|-fc|-fh|-bh <filenames>"
+
+if [ "x$1" = "x" ]
+then
+    echo $USAGE 1>&2
+    exit 1
+fi
+
+FLAG="$1"
+shift
+
+FILES="$@"
+
+case $FLAG in
+
+-h)
+    set - `echo $FILES | sed -e 's/\\./_/g'`
+    hdr="_h_`basename $1`"
+    cat $FILES | $AWK '
+	BEGIN {
+	    printf("/* Automatically generated file, do not edit */\n");
+	    printf("#ifndef %s\n#define %s\n", "'$hdr'", "'$hdr'");
+	}
+	/\(\):/ {
+	    pr = substr($2, 1, 2);
+	    if (pr == "vi" || pr == "em" || pr == "ed") {
+		name = substr($2, 1, length($2) - 3);
+#
+# XXX:	need a space between name and prototype so that -fc and -fh
+#	parsing is much easier
+#
+		printf("libedit_private el_action_t\t%s (EditLine *, wint_t);\n",
+		    name);
+	    }
+	}
+	END {
+	    printf("#endif /* %s */\n", "'$hdr'");
+	}'
+	;;
+
+#	generate help.h from various .c files
+#
+-bh)
+    cat $FILES | $AWK '
+	BEGIN {
+	    printf("/* Automatically generated file, do not edit */\n");
+	    printf("static const struct el_bindings_t el_func_help[] = {\n");
+	    low = "abcdefghijklmnopqrstuvwxyz_";
+	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
+	    for (i = 1; i <= length(low); i++)
+		tr[substr(low, i, 1)] = substr(high, i, 1);
+	}
+	/\(\):/ {
+	    pr = substr($2, 1, 2);
+	    if (pr == "vi" || pr == "em" || pr == "ed") {
+		name = substr($2, 1, length($2) - 3);
+		uname = "";
+		fname = "";
+		for (i = 1; i <= length(name); i++) {
+		    s = substr(name, i, 1);
+		    uname = uname tr[s];
+		    if (s == "_")
+			s = "-";
+		    fname = fname s;
+		}
+
+		printf("    { %-30.30s %-30.30s\n","L\"" fname "\",", uname ",");
+		ok = 1;
+	    }
+	}
+	/^ \*/ {
+	    if (ok) {
+		printf("      L\"");
+		for (i = 2; i < NF; i++)
+		    printf("%s ", $i);
+		printf("%s\" },\n", $i);
+		ok = 0;
+	    }
+	}
+	END {
+	    printf("};\n");
+	}'
+	;;
+
+#	generate fcns.h from various .h files
+#
+-fh)
+    cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
+    sort | tr '[:lower:]' '[:upper:]' | $AWK '
+	BEGIN {
+	    printf("/* Automatically generated file, do not edit */\n");
+	    count = 0;
+	}
+	{
+	    printf("#define\t%-30.30s\t%3d\n", $1, count++);
+	}
+	END {
+	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
+	}'
+	;;
+
+#	generate func.h from various .h files
+#
+-fc)
+    cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
+	BEGIN {
+	    printf("/* Automatically generated file, do not edit */\n");
+	    printf("static const el_func_t el_func[] = {");
+	    maxlen = 80;
+	    needn = 1;
+	    len = 0;
+	}
+	{
+	    clen = 25 + 2;
+	    len += clen;
+	    if (len >= maxlen)
+		needn = 1;
+	    if (needn) {
+		printf("\n    ");
+		needn = 0;
+		len = 4 + clen;
+	    }
+	    s = $1 ",";
+	    printf("%-26.26s ", s);
+	}
+	END {
+	    printf("\n};\n");
+	}'
+	;;
+
+*)
+    echo $USAGE 1>&2
+    exit 1
+    ;;
+
+esac
diff --git a/cmd-line-utils/libedit/map.c b/extra/libedit/libedit-20221030-3.1/src/map.c
similarity index 91%
rename from cmd-line-utils/libedit/map.c
rename to extra/libedit/libedit-20221030-3.1/src/map.c
index 17b07391b692..321bb3539222 100644
--- a/cmd-line-utils/libedit/map.c
+++ b/extra/libedit/libedit-20221030-3.1/src/map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: map.c,v 1.30 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: map.c,v 1.54 2021/08/29 09:41:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,29 +37,40 @@
 #if 0
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: map.c,v 1.54 2021/08/29 09:41:59 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
 /*
  * map.c: Editor function definitions
  */
+#include <ctype.h>
 #include <stdlib.h>
-#include "el.h"
+#include <string.h>
 
-private void	map_print_key(EditLine *, el_action_t *, const Char *);
-private void	map_print_some_keys(EditLine *, el_action_t *, Int, Int);
-private void	map_print_all_keys(EditLine *);
-private void	map_init_nls(EditLine *);
-private void	map_init_meta(EditLine *);
+#include "el.h"
+#include "common.h"
+#include "emacs.h"
+#include "vi.h"
+#include "fcns.h"
+#include "func.h"
+#include "help.h"
+#include "parse.h"
+
+static void	map_print_key(EditLine *, el_action_t *, const wchar_t *);
+static void	map_print_some_keys(EditLine *, el_action_t *, wint_t, wint_t);
+static void	map_print_all_keys(EditLine *);
+static void	map_init_nls(EditLine *);
+static void	map_init_meta(EditLine *);
 
 /* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */
 
 
-private const el_action_t  el_map_emacs[] = {
+static const el_action_t  el_map_emacs[] = {
 	/*   0 */	EM_SET_MARK,		/* ^@ */
 	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
 	/*   2 */	ED_PREV_CHAR,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
+	/*   3 */	ED_IGNORE,		/* ^C */
 	/*   4 */	EM_DELETE_OR_LIST,	/* ^D */
 	/*   5 */	ED_MOVE_TO_END,		/* ^E */
 	/*   6 */	ED_NEXT_CHAR,		/* ^F */
@@ -71,21 +82,21 @@ private const el_action_t  el_map_emacs[] = {
 	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
 	/*  13 */	ED_NEWLINE,		/* ^M */
 	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
+	/*  15 */	ED_IGNORE,		/* ^O */
 	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
-	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
+	/*  17 */	ED_IGNORE,		/* ^Q */
+	/*  18 */	EM_INC_SEARCH_PREV,	/* ^R */
+	/*  19 */	ED_IGNORE,		/* ^S */
 	/*  20 */	ED_TRANSPOSE_CHARS,	/* ^T */
 	/*  21 */	EM_KILL_LINE,		/* ^U */
 	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
-	/*  23 */	EM_KILL_REGION,		/* ^W */
+	/*  23 */	ED_DELETE_PREV_WORD,	/* ^W */
 	/*  24 */	ED_SEQUENCE_LEAD_IN,	/* ^X */
 	/*  25 */	EM_YANK,		/* ^Y */
-	/*  26 */	ED_TTY_SIGTSTP,		/* ^Z */
+	/*  26 */	ED_IGNORE,		/* ^Z */
 	/*  27 */	EM_META_NEXT,		/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
-	/*  29 */	ED_TTY_DSUSP,		/* ^] */
+	/*  28 */	ED_IGNORE,		/* ^\ */
+	/*  29 */	ED_IGNORE,		/* ^] */
 	/*  30 */	ED_UNASSIGNED,		/* ^^ */
 	/*  31 */	ED_UNASSIGNED,		/* ^_ */
 	/*  32 */	ED_INSERT,		/* SPACE */
@@ -322,7 +333,7 @@ private const el_action_t  el_map_emacs[] = {
  * insert mode characters are in the normal keymap, and command mode
  * in the extended keymap.
  */
-private const el_action_t  el_map_vi_insert[] = {
+static const el_action_t  el_map_vi_insert[] = {
 #ifdef KSHVI
 	/*   0 */	ED_UNASSIGNED,		/* ^@ */
 	/*   1 */	ED_INSERT,		/* ^A */
@@ -341,9 +352,9 @@ private const el_action_t  el_map_vi_insert[] = {
 	/*  14 */	ED_INSERT,		/* ^N */
 	/*  15 */	ED_INSERT,		/* ^O */
 	/*  16 */	ED_INSERT,		/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
+	/*  17 */	ED_IGNORE,		/* ^Q */
 	/*  18 */	ED_INSERT,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
+	/*  19 */	ED_IGNORE,		/* ^S */
 	/*  20 */	ED_INSERT,		/* ^T */
 	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
 	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
@@ -353,7 +364,7 @@ private const el_action_t  el_map_vi_insert[] = {
 	/*  25 */	ED_INSERT,		/* ^Y */
 	/*  26 */	ED_INSERT,		/* ^Z */
 	/*  27 */	VI_COMMAND_MODE,	/* ^[ */  /* [ Esc ] key */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
+	/*  28 */	ED_IGNORE,		/* ^\ */
 	/*  29 */	ED_INSERT,		/* ^] */
 	/*  30 */	ED_INSERT,		/* ^^ */
 	/*  31 */	ED_INSERT,		/* ^_ */
@@ -367,7 +378,7 @@ private const el_action_t  el_map_vi_insert[] = {
 	/*   0 */	ED_UNASSIGNED,		/* ^@ */
 	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
 	/*   2 */	ED_PREV_CHAR,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
+	/*   3 */	ED_IGNORE,		/* ^C */
 	/*   4 */	VI_LIST_OR_EOF,		/* ^D */
 	/*   5 */	ED_MOVE_TO_END,		/* ^E */
 	/*   6 */	ED_NEXT_CHAR,		/* ^F */
@@ -379,20 +390,20 @@ private const el_action_t  el_map_vi_insert[] = {
 	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
 	/*  13 */	ED_NEWLINE,		/* ^M */
 	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
+	/*  15 */	ED_IGNORE,		/* ^O */
 	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
+	/*  17 */	ED_IGNORE,		/* ^Q */
 	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
+	/*  19 */	ED_IGNORE,		/* ^S */
 	/*  20 */	ED_TRANSPOSE_CHARS,	/* ^T */
 	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
 	/*  22 */	ED_QUOTED_INSERT,	/* ^V */
 	/*  23 */	ED_DELETE_PREV_WORD,	/* ^W */
 	/*  24 */	ED_UNASSIGNED,		/* ^X */
-	/*  25 */	ED_TTY_DSUSP,		/* ^Y */
-	/*  26 */	ED_TTY_SIGTSTP,		/* ^Z */
+	/*  25 */	ED_IGNORE,		/* ^Y */
+	/*  26 */	ED_IGNORE,		/* ^Z */
 	/*  27 */	VI_COMMAND_MODE,	/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
+	/*  28 */	ED_IGNORE,		/* ^\ */
 	/*  29 */	ED_UNASSIGNED,		/* ^] */
 	/*  30 */	ED_UNASSIGNED,		/* ^^ */
 	/*  31 */	ED_UNASSIGNED,		/* ^_ */
@@ -623,11 +634,11 @@ private const el_action_t  el_map_vi_insert[] = {
 	/* 255 */	ED_INSERT		/* M-^? */
 };
 
-private const el_action_t el_map_vi_command[] = {
+static const el_action_t el_map_vi_command[] = {
 	/*   0 */	ED_UNASSIGNED,		/* ^@ */
 	/*   1 */	ED_MOVE_TO_BEG,		/* ^A */
 	/*   2 */	ED_UNASSIGNED,		/* ^B */
-	/*   3 */	ED_TTY_SIGINT,		/* ^C */
+	/*   3 */	ED_IGNORE,		/* ^C */
 	/*   4 */	ED_UNASSIGNED,		/* ^D */
 	/*   5 */	ED_MOVE_TO_END,		/* ^E */
 	/*   6 */	ED_UNASSIGNED,		/* ^F */
@@ -639,11 +650,11 @@ private const el_action_t el_map_vi_command[] = {
 	/*  12 */	ED_CLEAR_SCREEN,	/* ^L */
 	/*  13 */	ED_NEWLINE,		/* ^M */
 	/*  14 */	ED_NEXT_HISTORY,	/* ^N */
-	/*  15 */	ED_TTY_FLUSH_OUTPUT,	/* ^O */
+	/*  15 */	ED_IGNORE,		/* ^O */
 	/*  16 */	ED_PREV_HISTORY,	/* ^P */
-	/*  17 */	ED_TTY_START_OUTPUT,	/* ^Q */
+	/*  17 */	ED_IGNORE,		/* ^Q */
 	/*  18 */	ED_REDISPLAY,		/* ^R */
-	/*  19 */	ED_TTY_STOP_OUTPUT,	/* ^S */
+	/*  19 */	ED_IGNORE,		/* ^S */
 	/*  20 */	ED_UNASSIGNED,		/* ^T */
 	/*  21 */	VI_KILL_LINE_PREV,	/* ^U */
 	/*  22 */	ED_UNASSIGNED,		/* ^V */
@@ -652,7 +663,7 @@ private const el_action_t el_map_vi_command[] = {
 	/*  25 */	ED_UNASSIGNED,		/* ^Y */
 	/*  26 */	ED_UNASSIGNED,		/* ^Z */
 	/*  27 */	EM_META_NEXT,		/* ^[ */
-	/*  28 */	ED_TTY_SIGQUIT,		/* ^\ */
+	/*  28 */	ED_IGNORE,		/* ^\ */
 	/*  29 */	ED_UNASSIGNED,		/* ^] */
 	/*  30 */	ED_UNASSIGNED,		/* ^^ */
 	/*  31 */	ED_UNASSIGNED,		/* ^_ */
@@ -886,7 +897,7 @@ private const el_action_t el_map_vi_command[] = {
 /* map_init():
  *	Initialize and allocate the maps
  */
-protected int
+libedit_private int
 map_init(EditLine *el)
 {
 
@@ -895,31 +906,31 @@ map_init(EditLine *el)
          */
 #ifdef MAP_DEBUG
 	if (sizeof(el_map_emacs) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Emacs map incorrect\n"));
+		EL_ABORT((el->el_errfile, "Emacs map incorrect\n"));
 	if (sizeof(el_map_vi_command) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Vi command map incorrect\n"));
+		EL_ABORT((el->el_errfile, "Vi command map incorrect\n"));
 	if (sizeof(el_map_vi_insert) != N_KEYS * sizeof(el_action_t))
-		EL_ABORT((el->errfile, "Vi insert map incorrect\n"));
+		EL_ABORT((el->el_errfile, "Vi insert map incorrect\n"));
 #endif
 
-	el->el_map.alt = el_malloc(sizeof(*el->el_map.alt) * N_KEYS);
+	el->el_map.alt = el_calloc(N_KEYS, sizeof(*el->el_map.alt));
 	if (el->el_map.alt == NULL)
 		return -1;
-	el->el_map.key = el_malloc(sizeof(*el->el_map.key) * N_KEYS);
+	el->el_map.key = el_calloc(N_KEYS, sizeof(*el->el_map.key));
 	if (el->el_map.key == NULL)
 		return -1;
 	el->el_map.emacs = el_map_emacs;
 	el->el_map.vic = el_map_vi_command;
 	el->el_map.vii = el_map_vi_insert;
-	el->el_map.help = el_malloc(sizeof(*el->el_map.help) * EL_NUM_FCNS);
+	el->el_map.help = el_calloc(EL_NUM_FCNS, sizeof(*el->el_map.help));
 	if (el->el_map.help == NULL)
 		return -1;
-	(void) memcpy(el->el_map.help, help__get(),
+	(void) memcpy(el->el_map.help, el_func_help,
 	    sizeof(*el->el_map.help) * EL_NUM_FCNS);
-	el->el_map.func = el_malloc(sizeof(*el->el_map.func) * EL_NUM_FCNS);
+	el->el_map.func = el_calloc(EL_NUM_FCNS, sizeof(*el->el_map.func));
 	if (el->el_map.func == NULL)
 		return -1;
-	memcpy(el->el_map.func, func__get(), sizeof(*el->el_map.func)
+	memcpy(el->el_map.func, el_func, sizeof(*el->el_map.func)
 	    * EL_NUM_FCNS);
 	el->el_map.nfunc = EL_NUM_FCNS;
 
@@ -935,7 +946,7 @@ map_init(EditLine *el)
 /* map_end():
  *	Free the space taken by the editor maps
  */
-protected void
+libedit_private void
 map_end(EditLine *el)
 {
 
@@ -956,7 +967,7 @@ map_end(EditLine *el)
 /* map_init_nls():
  *	Find all the printable keys and bind them to self insert
  */
-private void
+static void
 map_init_nls(EditLine *el)
 {
 	int i;
@@ -964,7 +975,7 @@ map_init_nls(EditLine *el)
 	el_action_t *map = el->el_map.key;
 
 	for (i = 0200; i <= 0377; i++)
-		if (Isprint(i))
+		if (iswprint(i))
 			map[i] = ED_INSERT;
 }
 
@@ -972,10 +983,10 @@ map_init_nls(EditLine *el)
 /* map_init_meta():
  *	Bind all the meta keys to the appropriate ESC-<key> sequence
  */
-private void
+static void
 map_init_meta(EditLine *el)
 {
-	Char buf[3];
+	wchar_t buf[3];
 	int i;
 	el_action_t *map = el->el_map.key;
 	el_action_t *alt = el->el_map.alt;
@@ -993,7 +1004,7 @@ map_init_meta(EditLine *el)
 		} else
 			map = alt;
 	}
-	buf[0] = (Char) i;
+	buf[0] = (wchar_t)i;
 	buf[2] = 0;
 	for (i = 0200; i <= 0377; i++)
 		switch (map[i]) {
@@ -1013,7 +1024,7 @@ map_init_meta(EditLine *el)
 /* map_init_vi():
  *	Initialize the vi bindings
  */
-protected void
+libedit_private void
 map_init_vi(EditLine *el)
 {
 	int i;
@@ -1043,11 +1054,11 @@ map_init_vi(EditLine *el)
 /* map_init_emacs():
  *	Initialize the emacs bindings
  */
-protected void
+libedit_private void
 map_init_emacs(EditLine *el)
 {
 	int i;
-	Char buf[3];
+	wchar_t buf[3];
 	el_action_t *key = el->el_map.key;
 	el_action_t *alt = el->el_map.alt;
 	const el_action_t *emacs = el->el_map.emacs;
@@ -1077,15 +1088,15 @@ map_init_emacs(EditLine *el)
 /* map_set_editor():
  *	Set the editor
  */
-protected int
-map_set_editor(EditLine *el, Char *editor)
+libedit_private int
+map_set_editor(EditLine *el, wchar_t *editor)
 {
 
-	if (Strcmp(editor, STR("emacs")) == 0) {
+	if (wcscmp(editor, L"emacs") == 0) {
 		map_init_emacs(el);
 		return 0;
 	}
-	if (Strcmp(editor, STR("vi")) == 0) {
+	if (wcscmp(editor, L"vi") == 0) {
 		map_init_vi(el);
 		return 0;
 	}
@@ -1096,18 +1107,18 @@ map_set_editor(EditLine *el, Char *editor)
 /* map_get_editor():
  *	Retrieve the editor
  */
-protected int
-map_get_editor(EditLine *el, const Char **editor)
+libedit_private int
+map_get_editor(EditLine *el, const wchar_t **editor)
 {
 
 	if (editor == NULL)
 		return -1;
 	switch (el->el_map.type) {
 	case MAP_EMACS:
-		*editor = STR("emacs");
+		*editor = L"emacs";
 		return 0;
 	case MAP_VI:
-		*editor = STR("vi");
+		*editor = L"vi";
 		return 0;
 	}
 	return -1;
@@ -1117,8 +1128,8 @@ map_get_editor(EditLine *el, const Char **editor)
 /* map_print_key():
  *	Print the function description for 1 key
  */
-private void
-map_print_key(EditLine *el, el_action_t *map, const Char *in)
+static void
+map_print_key(EditLine *el, el_action_t *map, const wchar_t *in)
 {
 	char outbuf[EL_BUFSIZ];
 	el_bindings_t *bp, *ep;
@@ -1129,7 +1140,7 @@ map_print_key(EditLine *el, el_action_t *map, const Char *in)
 		for (bp = el->el_map.help; bp < ep; bp++)
 			if (bp->func == map[(unsigned char) *in]) {
 				(void) fprintf(el->el_outfile,
-				    "%s\t->\t" FSTR "\n", outbuf, bp->name);
+				    "%s\t->\t%ls\n", outbuf, bp->name);
 				return;
 			}
 	} else
@@ -1140,11 +1151,11 @@ map_print_key(EditLine *el, el_action_t *map, const Char *in)
 /* map_print_some_keys():
  *	Print keys from first to last
  */
-private void
-map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
+static void
+map_print_some_keys(EditLine *el, el_action_t *map, wint_t first, wint_t last)
 {
 	el_bindings_t *bp, *ep;
-	Char firstbuf[2], lastbuf[2];
+	wchar_t firstbuf[2], lastbuf[2];
 	char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ];
 
 	firstbuf[0] = first;
@@ -1153,7 +1164,7 @@ map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
 	lastbuf[1] = 0;
 	if (map[first] == ED_UNASSIGNED) {
 		if (first == last) {
-			(void) keymacro__decode_str(firstbuf, unparsbuf, 
+			(void) keymacro__decode_str(firstbuf, unparsbuf,
 			    sizeof(unparsbuf), STRQQ);
 			(void) fprintf(el->el_outfile,
 			    "%-15s->  is undefined\n", unparsbuf);
@@ -1164,17 +1175,17 @@ map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
 	for (bp = el->el_map.help; bp < ep; bp++) {
 		if (bp->func == map[first]) {
 			if (first == last) {
-				(void) keymacro__decode_str(firstbuf, unparsbuf, 
+				(void) keymacro__decode_str(firstbuf, unparsbuf,
 				    sizeof(unparsbuf), STRQQ);
-				(void) fprintf(el->el_outfile, "%-15s->  " FSTR "\n",
+				(void) fprintf(el->el_outfile, "%-15s->  %ls\n",
 				    unparsbuf, bp->name);
 			} else {
-				(void) keymacro__decode_str(firstbuf, unparsbuf, 
+				(void) keymacro__decode_str(firstbuf, unparsbuf,
 				    sizeof(unparsbuf), STRQQ);
-				(void) keymacro__decode_str(lastbuf, extrabuf, 
+				(void) keymacro__decode_str(lastbuf, extrabuf,
 				    sizeof(extrabuf), STRQQ);
 				(void) fprintf(el->el_outfile,
-				    "%-4s to %-7s->  " FSTR "\n",
+				    "%-4s to %-7s->  %ls\n",
 				    unparsbuf, extrabuf, bp->name);
 			}
 			return;
@@ -1182,14 +1193,14 @@ map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
 	}
 #ifdef MAP_DEBUG
 	if (map == el->el_map.key) {
-		(void) keymacro__decode_str(firstbuf, unparsbuf, 
+		(void) keymacro__decode_str(firstbuf, unparsbuf,
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
 		(void) fprintf(el->el_outfile, "el->el_map.key[%d] == %d\n",
 		    first, el->el_map.key[first]);
 	} else {
-		(void) keymacro__decode_str(firstbuf, unparsbuf, 
+		(void) keymacro__decode_str(firstbuf, unparsbuf,
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
@@ -1204,7 +1215,7 @@ map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
 /* map_print_all_keys():
  *	Print the function description for all keys.
  */
-private void
+static void
 map_print_all_keys(EditLine *el)
 {
 	int prev, i;
@@ -1230,25 +1241,25 @@ map_print_all_keys(EditLine *el)
 	map_print_some_keys(el, el->el_map.alt, prev, i - 1);
 
 	(void) fprintf(el->el_outfile, "Multi-character bindings\n");
-	keymacro_print(el, STR(""));
+	keymacro_print(el, L"");
 	(void) fprintf(el->el_outfile, "Arrow key bindings\n");
-	terminal_print_arrow(el, STR(""));
+	terminal_print_arrow(el, L"");
 }
 
 
 /* map_bind():
  *	Add/remove/change bindings
  */
-protected int
-map_bind(EditLine *el, int argc, const Char **argv)
+libedit_private int
+map_bind(EditLine *el, int argc, const wchar_t **argv)
 {
 	el_action_t *map;
 	int ntype, rem;
-	const Char *p;
-	Char inbuf[EL_BUFSIZ];
-	Char outbuf[EL_BUFSIZ];
-	const Char *in = NULL;
-	Char *out = NULL;
+	const wchar_t *p;
+	wchar_t inbuf[EL_BUFSIZ];
+	wchar_t outbuf[EL_BUFSIZ];
+	const wchar_t *in = NULL;
+	wchar_t *out;
 	el_bindings_t *bp, *ep;
 	int cmd;
 	int key;
@@ -1269,11 +1280,6 @@ map_bind(EditLine *el, int argc, const Char **argv)
 			case 's':
 				ntype = XK_STR;
 				break;
-#ifdef notyet
-			case 'c':
-				ntype = XK_EXE;
-				break;
-#endif
 			case 'k':
 				key = 1;
 				break;
@@ -1294,13 +1300,13 @@ map_bind(EditLine *el, int argc, const Char **argv)
 				ep = &el->el_map.help[el->el_map.nfunc];
 				for (bp = el->el_map.help; bp < ep; bp++)
 					(void) fprintf(el->el_outfile,
-					    "" FSTR "\n\t" FSTR "\n",
+					    "%ls\n\t%ls\n",
 					    bp->name, bp->description);
 				return 0;
 			default:
 				(void) fprintf(el->el_errfile,
-				    "" FSTR ": Invalid switch `%c'.\n",
-                                               argv[0], (int) p[1]);
+				    "%ls: Invalid switch `%lc'.\n",
+				    argv[0], (wint_t)p[1]);
 			}
 		else
 			break;
@@ -1313,7 +1319,7 @@ map_bind(EditLine *el, int argc, const Char **argv)
 		in = argv[argc++];
 	else if ((in = parse__string(inbuf, argv[argc++])) == NULL) {
 		(void) fprintf(el->el_errfile,
-		    "" FSTR ": Invalid \\ or ^ in instring.\n",
+		    "%ls: Invalid \\ or ^ in instring.\n",
 		    argv[0]);
 		return -1;
 	}
@@ -1346,10 +1352,9 @@ map_bind(EditLine *el, int argc, const Char **argv)
 
 	switch (ntype) {
 	case XK_STR:
-	case XK_EXE:
 		if ((out = parse__string(outbuf, argv[argc])) == NULL) {
 			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Invalid \\ or ^ in outstring.\n", argv[0]);
+			    "%ls: Invalid \\ or ^ in outstring.\n", argv[0]);
 			return -1;
 		}
 		if (key)
@@ -1362,12 +1367,12 @@ map_bind(EditLine *el, int argc, const Char **argv)
 	case XK_CMD:
 		if ((cmd = parse_cmd(el, argv[argc])) == -1) {
 			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Invalid command `" FSTR "'.\n",
+			    "%ls: Invalid command `%ls'.\n",
 			    argv[0], argv[argc]);
 			return -1;
 		}
 		if (key)
-			terminal_set_arrow(el, in, keymacro_map_str(el, out), ntype);
+			terminal_set_arrow(el, in, keymacro_map_cmd(el, cmd), ntype);
 		else {
 			if (in[1]) {
 				keymacro_add(el, in, keymacro_map_cmd(el, cmd), ntype);
@@ -1379,6 +1384,7 @@ map_bind(EditLine *el, int argc, const Char **argv)
 		}
 		break;
 
+	/* coverity[dead_error_begin] */
 	default:
 		EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
 		break;
@@ -1390,11 +1396,12 @@ map_bind(EditLine *el, int argc, const Char **argv)
 /* map_addfunc():
  *	add a user defined function
  */
-protected int
-map_addfunc(EditLine *el, const Char *name, const Char *help, el_func_t func)
+libedit_private int
+map_addfunc(EditLine *el, const wchar_t *name, const wchar_t *help,
+    el_func_t func)
 {
 	void *p;
-	size_t nf = (size_t)el->el_map.nfunc + 1;
+	size_t nf = el->el_map.nfunc + 1;
 
 	if (name == NULL || help == NULL || func == NULL)
 		return -1;
diff --git a/cmd-line-utils/libedit/map.h b/extra/libedit/libedit-20221030-3.1/src/map.h
similarity index 77%
rename from cmd-line-utils/libedit/map.h
rename to extra/libedit/libedit-20221030-3.1/src/map.h
index 8e0c7e4eaa11..b4e4e2899a1d 100644
--- a/cmd-line-utils/libedit/map.h
+++ b/extra/libedit/libedit-20221030-3.1/src/map.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: map.h,v 1.9 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: map.h,v 1.13 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,13 +40,14 @@
 #ifndef _h_el_map
 #define	_h_el_map
 
+typedef el_action_t (*el_func_t)(EditLine *, wint_t);
+
 typedef struct el_bindings_t {	/* for the "bind" shell command */
-	const Char	*name;		/* function name for bind command */
+	const wchar_t	*name;		/* function name for bind command */
 	int		 func;		/* function numeric value */
-	const Char	*description;	/* description of function */
+	const wchar_t	*description;	/* description of function */
 } el_bindings_t;
 
-
 typedef struct el_map_t {
 	el_action_t	*alt;		/* The current alternate key map */
 	el_action_t	*key;		/* The current normal key map	*/
@@ -57,7 +58,7 @@ typedef struct el_map_t {
 	int		 type;		/* Emacs or vi			*/
 	el_bindings_t	*help;		/* The help for the editor functions */
 	el_func_t	*func;		/* List of available functions	*/
-	int		 nfunc;		/* The number of functions/help items */
+	size_t		 nfunc;		/* The number of functions/help items */
 } el_map_t;
 
 #define	MAP_EMACS	0
@@ -65,13 +66,14 @@ typedef struct el_map_t {
 
 #define N_KEYS      256
 
-protected int	map_bind(EditLine *, int, const Char **);
-protected int	map_init(EditLine *);
-protected void	map_end(EditLine *);
-protected void	map_init_vi(EditLine *);
-protected void	map_init_emacs(EditLine *);
-protected int	map_set_editor(EditLine *, Char *);
-protected int	map_get_editor(EditLine *, const Char **);
-protected int	map_addfunc(EditLine *, const Char *, const Char *, el_func_t);
+libedit_private int	map_bind(EditLine *, int, const wchar_t **);
+libedit_private int	map_init(EditLine *);
+libedit_private void	map_end(EditLine *);
+libedit_private void	map_init_vi(EditLine *);
+libedit_private void	map_init_emacs(EditLine *);
+libedit_private int	map_set_editor(EditLine *, wchar_t *);
+libedit_private int	map_get_editor(EditLine *, const wchar_t **);
+libedit_private int	map_addfunc(EditLine *, const wchar_t *, const wchar_t *,
+    el_func_t);
 
 #endif /* _h_el_map */
diff --git a/extra/libedit/libedit-20221030-3.1/src/parse.c b/extra/libedit/libedit-20221030-3.1/src/parse.c
new file mode 100644
index 000000000000..93396c7e1a03
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/parse.c
@@ -0,0 +1,289 @@
+/*	$NetBSD: parse.c,v 1.42 2019/07/23 10:18:52 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: parse.c,v 1.42 2019/07/23 10:18:52 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/*
+ * parse.c: parse an editline extended command
+ *
+ * commands are:
+ *
+ *	bind
+ *	echotc
+ *	edit
+ *	gettc
+ *	history
+ *	settc
+ *	setty
+ */
+#include <stdlib.h>
+#include <string.h>
+
+#include "el.h"
+#include "parse.h"
+
+static const struct {
+	const wchar_t *name;
+	int (*func)(EditLine *, int, const wchar_t **);
+} cmds[] = {
+	{ L"bind",		map_bind	},
+	{ L"echotc",		terminal_echotc	},
+	{ L"edit",		el_editmode	},
+	{ L"history",		hist_command	},
+	{ L"telltc",		terminal_telltc	},
+	{ L"settc",		terminal_settc	},
+	{ L"setty",		tty_stty	},
+	{ NULL,			NULL		}
+};
+
+
+/* parse_line():
+ *	Parse a line and dispatch it
+ */
+libedit_private int
+parse_line(EditLine *el, const wchar_t *line)
+{
+	const wchar_t **argv = NULL;
+	int argc = 0;
+	TokenizerW *tok;
+
+	tok = tok_winit(NULL);
+	tok_wstr(tok, line, &argc, &argv);
+	argc = el_wparse(el, argc, argv);
+	tok_wend(tok);
+	return argc;
+}
+
+
+/* el_parse():
+ *	Command dispatcher
+ */
+int
+el_wparse(EditLine *el, int argc, const wchar_t *argv[])
+{
+	const wchar_t *ptr;
+	int i;
+
+	if (argc < 1)
+		return -1;
+	ptr = wcschr(argv[0], L':');
+	if (ptr != NULL) {
+		wchar_t *tprog;
+		size_t l;
+
+		if (ptr == argv[0])
+			return 0;
+		l = (size_t)(ptr - argv[0]);
+		tprog = el_calloc(l + 1, sizeof(*tprog));
+		if (tprog == NULL)
+			return 0;
+		(void) wcsncpy(tprog, argv[0], l);
+		tprog[l] = '\0';
+		ptr++;
+		l = (size_t)el_match(el->el_prog, tprog);
+		el_free(tprog);
+		if (!l)
+			return 0;
+	} else
+		ptr = argv[0];
+
+	for (i = 0; cmds[i].name != NULL; i++)
+		if (wcscmp(cmds[i].name, ptr) == 0) {
+			i = (*cmds[i].func) (el, argc, argv);
+			return -i;
+		}
+	return -1;
+}
+
+
+/* parse__escape():
+ *	Parse a string of the form ^<char> \<odigit> \<char> \U+xxxx and return
+ *	the appropriate character or -1 if the escape is not valid
+ */
+libedit_private int
+parse__escape(const wchar_t **ptr)
+{
+	const wchar_t *p;
+	wint_t c;
+
+	p = *ptr;
+
+	if (p[1] == 0)
+		return -1;
+
+	if (*p == '\\') {
+		p++;
+		switch (*p) {
+		case 'a':
+			c = '\007';	/* Bell */
+			break;
+		case 'b':
+			c = '\010';	/* Backspace */
+			break;
+		case 't':
+			c = '\011';	/* Horizontal Tab */
+			break;
+		case 'n':
+			c = '\012';	/* New Line */
+			break;
+		case 'v':
+			c = '\013';	/* Vertical Tab */
+			break;
+		case 'f':
+			c = '\014';	/* Form Feed */
+			break;
+		case 'r':
+			c = '\015';	/* Carriage Return */
+			break;
+		case 'e':
+			c = '\033';	/* Escape */
+			break;
+		case 'U':		/* Unicode \U+xxxx or \U+xxxxx format */
+		{
+			int i;
+			const wchar_t hex[] = L"0123456789ABCDEF";
+			const wchar_t *h;
+			++p;
+			if (*p++ != '+')
+				return -1;
+			c = 0;
+			for (i = 0; i < 5; ++i) {
+				h = wcschr(hex, *p++);
+				if (!h && i < 4)
+					return -1;
+				else if (h)
+					c = (c << 4) | ((int)(h - hex));
+				else
+					--p;
+			}
+			if (c > 0x10FFFF) /* outside valid character range */
+				return -1;
+			break;
+		}
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		{
+			int cnt, ch;
+
+			for (cnt = 0, c = 0; cnt < 3; cnt++) {
+				ch = *p++;
+				if (ch < '0' || ch > '7') {
+					p--;
+					break;
+				}
+				c = (c << 3) | (ch - '0');
+			}
+			if ((c & (wint_t)0xffffff00) != (wint_t)0)
+				return -1;
+			--p;
+			break;
+		}
+		default:
+			c = *p;
+			break;
+		}
+	} else if (*p == '^') {
+		p++;
+		c = (*p == '?') ? '\177' : (*p & 0237);
+	} else
+		c = *p;
+	*ptr = ++p;
+	return c;
+}
+
+/* parse__string():
+ *	Parse the escapes from in and put the raw string out
+ */
+libedit_private wchar_t *
+parse__string(wchar_t *out, const wchar_t *in)
+{
+	wchar_t *rv = out;
+	int n;
+
+	for (;;)
+		switch (*in) {
+		case '\0':
+			*out = '\0';
+			return rv;
+
+		case '\\':
+		case '^':
+			if ((n = parse__escape(&in)) == -1)
+				return NULL;
+			*out++ = (wchar_t)n;
+			break;
+
+		case 'M':
+			if (in[1] == '-' && in[2] != '\0') {
+				*out++ = '\033';
+				in += 2;
+				break;
+			}
+			/*FALLTHROUGH*/
+
+		default:
+			*out++ = *in++;
+			break;
+		}
+}
+
+
+/* parse_cmd():
+ *	Return the command number for the command string given
+ *	or -1 if one is not found
+ */
+libedit_private int
+parse_cmd(EditLine *el, const wchar_t *cmd)
+{
+	el_bindings_t *b = el->el_map.help;
+	size_t i;
+
+	for (i = 0; i < el->el_map.nfunc; i++)
+		if (wcscmp(b[i].name, cmd) == 0)
+			return b[i].func;
+	return -1;
+}
diff --git a/cmd-line-utils/libedit/parse.h b/extra/libedit/libedit-20221030-3.1/src/parse.h
similarity index 85%
rename from cmd-line-utils/libedit/parse.h
rename to extra/libedit/libedit-20221030-3.1/src/parse.h
index ec04051bc27e..fe8eb4733521 100644
--- a/cmd-line-utils/libedit/parse.h
+++ b/extra/libedit/libedit-20221030-3.1/src/parse.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.h,v 1.7 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: parse.h,v 1.9 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,9 +40,9 @@
 #ifndef _h_el_parse
 #define	_h_el_parse
 
-protected int	 parse_line(EditLine *, const Char *);
-protected int	 parse__escape(const Char **);
-protected Char	*parse__string(Char *, const Char *);
-protected int	 parse_cmd(EditLine *, const Char *);
+libedit_private int	 parse_line(EditLine *, const wchar_t *);
+libedit_private int	 parse__escape(const wchar_t **);
+libedit_private wchar_t *parse__string(wchar_t *, const wchar_t *);
+libedit_private int	 parse_cmd(EditLine *, const wchar_t *);
 
 #endif /* _h_el_parse */
diff --git a/cmd-line-utils/libedit/prompt.c b/extra/libedit/libedit-20221030-3.1/src/prompt.c
similarity index 83%
rename from cmd-line-utils/libedit/prompt.c
rename to extra/libedit/libedit-20221030-3.1/src/prompt.c
index 3f8d73303ec2..026a746af5fa 100644
--- a/cmd-line-utils/libedit/prompt.c
+++ b/extra/libedit/libedit-20221030-3.1/src/prompt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $	*/
+/*	$NetBSD: prompt.c,v 1.27 2017/06/27 23:25:13 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: prompt.c,v 1.27 2017/06/27 23:25:13 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -46,17 +47,17 @@ static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #include <stdio.h>
 #include "el.h"
 
-private Char	*prompt_default(EditLine *);
-private Char	*prompt_default_r(EditLine *);
+static wchar_t	*prompt_default(EditLine *);
+static wchar_t	*prompt_default_r(EditLine *);
 
 /* prompt_default():
  *	Just a default prompt, in case the user did not provide one
  */
-private Char *
+static wchar_t *
 /*ARGSUSED*/
 prompt_default(EditLine *el __attribute__((__unused__)))
 {
-	static Char a[3] = {'?', ' ', '\0'};
+	static wchar_t a[3] = L"? ";
 
 	return a;
 }
@@ -65,11 +66,11 @@ prompt_default(EditLine *el __attribute__((__unused__)))
 /* prompt_default_r():
  *	Just a default rprompt, in case the user did not provide one
  */
-private Char *
+static wchar_t *
 /*ARGSUSED*/
 prompt_default_r(EditLine *el __attribute__((__unused__)))
 {
-	static Char a[1] = {'\0'};
+	static wchar_t a[1] = L"";
 
 	return a;
 }
@@ -78,12 +79,11 @@ prompt_default_r(EditLine *el __attribute__((__unused__)))
 /* prompt_print():
  *	Print the prompt and update the prompt position.
  */
-protected void
+libedit_private void
 prompt_print(EditLine *el, int op)
 {
 	el_prompt_t *elp;
-	Char *p;
-	int ignore = 0;
+	wchar_t *p;
 
 	if (op == EL_PROMPT)
 		elp = &el->el_prompt;
@@ -98,13 +98,17 @@ prompt_print(EditLine *el, int op)
 
 	for (; *p; p++) {
 		if (elp->p_ignore == *p) {
-			ignore = !ignore;
+			wchar_t *litstart = ++p;
+			while (*p && *p != elp->p_ignore)
+				p++;
+			if (!*p || !p[1]) {
+				// XXX: We lose the last literal
+				break;
+			}
+			re_putliteral(el, litstart, p++);
 			continue;
 		}
-		if (ignore)
-			terminal__putc(el, *p);
-		else
-			re_putc(el, *p, 1);
+		re_putc(el, *p, 1);
 	}
 
 	elp->p_pos.v = el->el_refresh.r_cursor.v;
@@ -115,7 +119,7 @@ prompt_print(EditLine *el, int op)
 /* prompt_init():
  *	Initialize the prompt stuff
  */
-protected int
+libedit_private int
 prompt_init(EditLine *el)
 {
 
@@ -134,7 +138,7 @@ prompt_init(EditLine *el)
 /* prompt_end():
  *	Clean up the prompt stuff
  */
-protected void
+libedit_private void
 /*ARGSUSED*/
 prompt_end(EditLine *el __attribute__((__unused__)))
 {
@@ -144,8 +148,8 @@ prompt_end(EditLine *el __attribute__((__unused__)))
 /* prompt_set():
  *	Install a prompt printing function
  */
-protected int
-prompt_set(EditLine *el, el_pfunc_t prf, Char c, int op, int wide)
+libedit_private int
+prompt_set(EditLine *el, el_pfunc_t prf, wchar_t c, int op, int wide)
 {
 	el_prompt_t *p;
 
@@ -176,8 +180,8 @@ prompt_set(EditLine *el, el_pfunc_t prf, Char c, int op, int wide)
 /* prompt_get():
  *	Retrieve the prompt printing function
  */
-protected int
-prompt_get(EditLine *el, el_pfunc_t *prf, Char *c, int op)
+libedit_private int
+prompt_get(EditLine *el, el_pfunc_t *prf, wchar_t *c, int op)
 {
 	el_prompt_t *p;
 
diff --git a/cmd-line-utils/libedit/prompt.h b/extra/libedit/libedit-20221030-3.1/src/prompt.h
similarity index 81%
rename from cmd-line-utils/libedit/prompt.h
rename to extra/libedit/libedit-20221030-3.1/src/prompt.h
index af63b82b6849..2931428dbb35 100644
--- a/cmd-line-utils/libedit/prompt.h
+++ b/extra/libedit/libedit-20221030-3.1/src/prompt.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: prompt.h,v 1.10 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: prompt.h,v 1.15 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,21 +40,19 @@
 #ifndef _h_el_prompt
 #define	_h_el_prompt
 
-#include "histedit.h"
-
-typedef Char    *(*el_pfunc_t)(EditLine *);
+typedef wchar_t    *(*el_pfunc_t)(EditLine *);
 
 typedef struct el_prompt_t {
 	el_pfunc_t	p_func;		/* Function to return the prompt */
 	coord_t		p_pos;		/* position in the line after prompt */
-	Char		p_ignore;	/* character to start/end literal */
-	int		p_wide;	
+	wchar_t		p_ignore;	/* character to start/end literal */
+	int		p_wide;
 } el_prompt_t;
 
-protected void	prompt_print(EditLine *, int);
-protected int	prompt_set(EditLine *, el_pfunc_t, Char, int, int);
-protected int	prompt_get(EditLine *, el_pfunc_t *, Char *, int);
-protected int	prompt_init(EditLine *);
-protected void	prompt_end(EditLine *);
+libedit_private void	prompt_print(EditLine *, int);
+libedit_private int	prompt_set(EditLine *, el_pfunc_t, wchar_t, int, int);
+libedit_private int	prompt_get(EditLine *, el_pfunc_t *, wchar_t *, int);
+libedit_private int	prompt_init(EditLine *);
+libedit_private void	prompt_end(EditLine *);
 
 #endif /* _h_el_prompt */
diff --git a/extra/libedit/libedit-20221030-3.1/src/read.c b/extra/libedit/libedit-20221030-3.1/src/read.c
new file mode 100644
index 000000000000..ae53e9cc2fdd
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/read.c
@@ -0,0 +1,624 @@
+/*	$NetBSD: read.c,v 1.107 2021/08/15 10:08:41 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: read.c,v 1.107 2021/08/15 10:08:41 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/*
+ * read.c: Terminal read functions
+ */
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "el.h"
+#include "fcns.h"
+#include "read.h"
+
+#define	EL_MAXMACRO	10
+
+struct macros {
+	wchar_t	**macro;
+	int	  level;
+	int	  offset;
+};
+
+struct el_read_t {
+	struct macros	 macros;
+	el_rfunc_t	 read_char;	/* Function to read a character. */
+	int		 read_errno;
+};
+
+static int	read__fixio(int, int);
+static int	read_char(EditLine *, wchar_t *);
+static int	read_getcmd(EditLine *, el_action_t *, wchar_t *);
+static void	read_clearmacros(struct macros *);
+static void	read_pop(struct macros *);
+static const wchar_t *noedit_wgets(EditLine *, int *);
+
+/* read_init():
+ *	Initialize the read stuff
+ */
+libedit_private int
+read_init(EditLine *el)
+{
+	struct macros *ma;
+
+	if ((el->el_read = el_malloc(sizeof(*el->el_read))) == NULL)
+		return -1;
+
+	ma = &el->el_read->macros;
+	if ((ma->macro = el_calloc(EL_MAXMACRO, sizeof(*ma->macro))) == NULL) {
+		free(el->el_read);
+		return -1;
+	}
+	ma->level = -1;
+	ma->offset = 0;
+
+	/* builtin read_char */
+	el->el_read->read_char = read_char;
+	return 0;
+}
+
+/* el_read_end():
+ *	Free the data structures used by the read stuff.
+ */
+libedit_private void
+read_end(struct el_read_t *el_read)
+{
+	read_clearmacros(&el_read->macros);
+	el_free(el_read->macros.macro);
+	el_read->macros.macro = NULL;
+	el_free(el_read);
+}
+
+/* el_read_setfn():
+ *	Set the read char function to the one provided.
+ *	If it is set to EL_BUILTIN_GETCFN, then reset to the builtin one.
+ */
+libedit_private int
+el_read_setfn(struct el_read_t *el_read, el_rfunc_t rc)
+{
+	el_read->read_char = (rc == EL_BUILTIN_GETCFN) ? read_char : rc;
+	return 0;
+}
+
+
+/* el_read_getfn():
+ *	return the current read char function, or EL_BUILTIN_GETCFN
+ *	if it is the default one
+ */
+libedit_private el_rfunc_t
+el_read_getfn(struct el_read_t *el_read)
+{
+       return el_read->read_char == read_char ?
+	    EL_BUILTIN_GETCFN : el_read->read_char;
+}
+
+
+/* read__fixio():
+ *	Try to recover from a read error
+ */
+/* ARGSUSED */
+static int
+read__fixio(int fd __attribute__((__unused__)), int e)
+{
+
+	switch (e) {
+	case -1:		/* Make sure that the code is reachable */
+
+#ifdef EWOULDBLOCK
+	case EWOULDBLOCK:
+#ifndef TRY_AGAIN
+#define TRY_AGAIN
+#endif
+#endif /* EWOULDBLOCK */
+
+#if defined(POSIX) && defined(EAGAIN)
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	case EAGAIN:
+#ifndef TRY_AGAIN
+#define TRY_AGAIN
+#endif
+#endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
+#endif /* POSIX && EAGAIN */
+
+		e = 0;
+#ifdef TRY_AGAIN
+#if defined(F_SETFL) && defined(O_NDELAY)
+		if ((e = fcntl(fd, F_GETFL, 0)) == -1)
+			return -1;
+
+		if (fcntl(fd, F_SETFL, e & ~O_NDELAY) == -1)
+			return -1;
+		else
+			e = 1;
+#endif /* F_SETFL && O_NDELAY */
+
+#ifdef FIONBIO
+		{
+			int zero = 0;
+
+			if (ioctl(fd, FIONBIO, &zero) == -1)
+				return -1;
+			else
+				e = 1;
+		}
+#endif /* FIONBIO */
+
+#endif /* TRY_AGAIN */
+		return e ? 0 : -1;
+
+	case EINTR:
+		return 0;
+
+	default:
+		return -1;
+	}
+}
+
+
+/* el_push():
+ *	Push a macro
+ */
+void
+el_wpush(EditLine *el, const wchar_t *str)
+{
+	struct macros *ma = &el->el_read->macros;
+
+	if (str != NULL && ma->level + 1 < EL_MAXMACRO) {
+		ma->level++;
+		if ((ma->macro[ma->level] = wcsdup(str)) != NULL)
+			return;
+		ma->level--;
+	}
+	terminal_beep(el);
+	terminal__flush(el);
+}
+
+
+/* read_getcmd():
+ *	Get next command from the input stream,
+ *	return 0 on success or -1 on EOF or error.
+ *	Character values > 255 are not looked up in the map, but inserted.
+ */
+static int
+read_getcmd(EditLine *el, el_action_t *cmdnum, wchar_t *ch)
+{
+	static const wchar_t meta = (wchar_t)0x80;
+	el_action_t cmd;
+
+	do {
+		if (el_wgetc(el, ch) != 1)
+			return -1;
+
+#ifdef	KANJI
+		if ((*ch & meta)) {
+			el->el_state.metanext = 0;
+			cmd = CcViMap[' '];
+			break;
+		} else
+#endif /* KANJI */
+
+		if (el->el_state.metanext) {
+			el->el_state.metanext = 0;
+			*ch |= meta;
+		}
+		if (*ch >= N_KEYS)
+			cmd = ED_INSERT;
+		else
+			cmd = el->el_map.current[(unsigned char) *ch];
+		if (cmd == ED_SEQUENCE_LEAD_IN) {
+			keymacro_value_t val;
+			switch (keymacro_get(el, ch, &val)) {
+			case XK_CMD:
+				cmd = val.cmd;
+				break;
+			case XK_STR:
+				el_wpush(el, val.str);
+				break;
+			case XK_NOD:
+				return -1;
+			default:
+				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
+				break;
+			}
+		}
+	} while (cmd == ED_SEQUENCE_LEAD_IN);
+	*cmdnum = cmd;
+	return 0;
+}
+
+/* read_char():
+ *	Read a character from the tty.
+ */
+static int
+read_char(EditLine *el, wchar_t *cp)
+{
+	ssize_t num_read;
+	int tried = (el->el_flags & FIXIO) == 0;
+	char cbuf[MB_LEN_MAX];
+	size_t cbp = 0;
+	int save_errno = errno;
+
+ again:
+	el->el_signal->sig_no = 0;
+	while ((num_read = read(el->el_infd, cbuf + cbp, (size_t)1)) == -1) {
+		int e = errno;
+		switch (el->el_signal->sig_no) {
+		case SIGCONT:
+			el_wset(el, EL_REFRESH);
+			/*FALLTHROUGH*/
+		case SIGWINCH:
+			sig_set(el);
+			goto again;
+		/* Abort input of current line. */
+		case SIGINT:
+			return (int) num_read;
+		default:
+			break;
+		}
+		if (!tried && read__fixio(el->el_infd, e) == 0) {
+			errno = save_errno;
+			tried = 1;
+		} else {
+			errno = e;
+			*cp = L'\0';
+			return -1;
+		}
+	}
+
+	/* Test for EOF */
+	if (num_read == 0) {
+		*cp = L'\0';
+		return 0;
+	}
+
+	for (;;) {
+		mbstate_t mbs;
+
+		++cbp;
+		/* This only works because UTF8 is stateless. */
+		memset(&mbs, 0, sizeof(mbs));
+		switch (mbrtowc(cp, cbuf, cbp, &mbs)) {
+		case (size_t)-1:
+			if (cbp > 1) {
+				/*
+				 * Invalid sequence, discard all bytes
+				 * except the last one.
+				 */
+				cbuf[0] = cbuf[cbp - 1];
+				cbp = 0;
+				break;
+			} else {
+				/* Invalid byte, discard it. */
+				cbp = 0;
+				goto again;
+			}
+		case (size_t)-2:
+			if (cbp >= MB_LEN_MAX) {
+				errno = EILSEQ;
+				*cp = L'\0';
+				return -1;
+			}
+			/* Incomplete sequence, read another byte. */
+			goto again;
+		default:
+			/* Valid character, process it. */
+			return 1;
+		}
+	}
+}
+
+/* read_pop():
+ *	Pop a macro from the stack
+ */
+static void
+read_pop(struct macros *ma)
+{
+	int i;
+
+	el_free(ma->macro[0]);
+	for (i = 0; i < ma->level; i++)
+		ma->macro[i] = ma->macro[i + 1];
+	ma->level--;
+	ma->offset = 0;
+}
+
+static void
+read_clearmacros(struct macros *ma)
+{
+	while (ma->level >= 0)
+		el_free(ma->macro[ma->level--]);
+	ma->offset = 0;
+}
+
+/* el_wgetc():
+ *	Read a wide character
+ */
+int
+el_wgetc(EditLine *el, wchar_t *cp)
+{
+	struct macros *ma = &el->el_read->macros;
+	int num_read;
+
+	terminal__flush(el);
+	for (;;) {
+		if (ma->level < 0)
+			break;
+
+		if (ma->macro[0][ma->offset] == '\0') {
+			read_pop(ma);
+			continue;
+		}
+
+		*cp = ma->macro[0][ma->offset++];
+
+		if (ma->macro[0][ma->offset] == '\0') {
+			/* Needed for QuoteMode On */
+			read_pop(ma);
+		}
+
+		return 1;
+	}
+
+	if (tty_rawmode(el) < 0)/* make sure the tty is set up correctly */
+		return 0;
+
+	num_read = (*el->el_read->read_char)(el, cp);
+
+	/*
+	 * Remember the original reason of a read failure
+	 * such that el_wgets() can restore it after doing
+	 * various cleanup operation that might change errno.
+	 */
+	if (num_read < 0)
+		el->el_read->read_errno = errno;
+
+	return num_read;
+}
+
+libedit_private void
+read_prepare(EditLine *el)
+{
+	if (el->el_flags & HANDLE_SIGNALS)
+		sig_set(el);
+	if (el->el_flags & NO_TTY)
+		return;
+	if ((el->el_flags & (UNBUFFERED|EDIT_DISABLED)) == UNBUFFERED)
+		tty_rawmode(el);
+
+	/* This is relatively cheap, and things go terribly wrong if
+	   we have the wrong size. */
+	el_resize(el);
+	re_clear_display(el);	/* reset the display stuff */
+	ch_reset(el);
+	re_refresh(el);		/* print the prompt */
+
+	if (el->el_flags & UNBUFFERED)
+		terminal__flush(el);
+}
+
+libedit_private void
+read_finish(EditLine *el)
+{
+	if ((el->el_flags & UNBUFFERED) == 0)
+		(void) tty_cookedmode(el);
+	if (el->el_flags & HANDLE_SIGNALS)
+		sig_clr(el);
+}
+
+static const wchar_t *
+noedit_wgets(EditLine *el, int *nread)
+{
+	el_line_t	*lp = &el->el_line;
+	int		 num;
+
+	while ((num = (*el->el_read->read_char)(el, lp->lastchar)) == 1) {
+		if (lp->lastchar + 1 >= lp->limit &&
+		    !ch_enlargebufs(el, (size_t)2))
+			break;
+		lp->lastchar++;
+		if (el->el_flags & UNBUFFERED ||
+		    lp->lastchar[-1] == '\r' ||
+		    lp->lastchar[-1] == '\n')
+			break;
+	}
+	if (num == -1 && errno == EINTR)
+		lp->lastchar = lp->buffer;
+	lp->cursor = lp->lastchar;
+	*lp->lastchar = '\0';
+	*nread = (int)(lp->lastchar - lp->buffer);
+	return *nread ? lp->buffer : NULL;
+}
+
+const wchar_t *
+el_wgets(EditLine *el, int *nread)
+{
+	int retval;
+	el_action_t cmdnum = 0;
+	int num;		/* how many chars we have read at NL */
+	wchar_t ch;
+	int nrb;
+
+	if (nread == NULL)
+		nread = &nrb;
+	*nread = 0;
+	el->el_read->read_errno = 0;
+
+	if (el->el_flags & NO_TTY) {
+		el->el_line.lastchar = el->el_line.buffer;
+		return noedit_wgets(el, nread);
+	}
+
+#ifdef FIONREAD
+	if (el->el_tty.t_mode == EX_IO && el->el_read->macros.level < 0) {
+		int chrs = 0;
+
+		(void) ioctl(el->el_infd, FIONREAD, &chrs);
+		if (chrs == 0) {
+			if (tty_rawmode(el) < 0) {
+				errno = 0;
+				*nread = 0;
+				return NULL;
+			}
+		}
+	}
+#endif /* FIONREAD */
+
+	if ((el->el_flags & UNBUFFERED) == 0)
+		read_prepare(el);
+
+	if (el->el_flags & EDIT_DISABLED) {
+		if ((el->el_flags & UNBUFFERED) == 0)
+			el->el_line.lastchar = el->el_line.buffer;
+		terminal__flush(el);
+		return noedit_wgets(el, nread);
+	}
+
+	for (num = -1; num == -1;) {  /* while still editing this line */
+		/* if EOF or error */
+		if (read_getcmd(el, &cmdnum, &ch) == -1)
+			break;
+		if ((size_t)cmdnum >= el->el_map.nfunc) /* BUG CHECK command */
+			continue;	/* try again */
+		/* now do the real command */
+		/* vi redo needs these way down the levels... */
+		el->el_state.thiscmd = cmdnum;
+		el->el_state.thisch = ch;
+		if (el->el_map.type == MAP_VI &&
+		    el->el_map.current == el->el_map.key &&
+		    el->el_chared.c_redo.pos < el->el_chared.c_redo.lim) {
+			if (cmdnum == VI_DELETE_PREV_CHAR &&
+			    el->el_chared.c_redo.pos != el->el_chared.c_redo.buf
+			    && iswprint(el->el_chared.c_redo.pos[-1]))
+				el->el_chared.c_redo.pos--;
+			else
+				*el->el_chared.c_redo.pos++ = ch;
+		}
+		retval = (*el->el_map.func[cmdnum]) (el, ch);
+
+		/* save the last command here */
+		el->el_state.lastcmd = cmdnum;
+
+		/* use any return value */
+		switch (retval) {
+		case CC_CURSOR:
+			re_refresh_cursor(el);
+			break;
+
+		case CC_REDISPLAY:
+			re_clear_lines(el);
+			re_clear_display(el);
+			/* FALLTHROUGH */
+
+		case CC_REFRESH:
+			re_refresh(el);
+			break;
+
+		case CC_REFRESH_BEEP:
+			re_refresh(el);
+			terminal_beep(el);
+			break;
+
+		case CC_NORM:	/* normal char */
+			break;
+
+		case CC_ARGHACK:	/* Suggested by Rich Salz */
+			/* <rsalz@pineapple.bbn.com> */
+			continue;	/* keep going... */
+
+		case CC_EOF:	/* end of file typed */
+			if ((el->el_flags & UNBUFFERED) == 0)
+				num = 0;
+			else if (num == -1) {
+				*el->el_line.lastchar++ = CONTROL('d');
+				el->el_line.cursor = el->el_line.lastchar;
+				num = 1;
+			}
+			break;
+
+		case CC_NEWLINE:	/* normal end of line */
+			num = (int)(el->el_line.lastchar - el->el_line.buffer);
+			break;
+
+		case CC_FATAL:	/* fatal error, reset to known state */
+			/* put (real) cursor in a known place */
+			re_clear_display(el);	/* reset the display stuff */
+			ch_reset(el);	/* reset the input pointers */
+			read_clearmacros(&el->el_read->macros);
+			re_refresh(el); /* print the prompt again */
+			break;
+
+		case CC_ERROR:
+		default:	/* functions we don't know about */
+			terminal_beep(el);
+			terminal__flush(el);
+			break;
+		}
+		el->el_state.argument = 1;
+		el->el_state.doingarg = 0;
+		el->el_chared.c_vcmd.action = NOP;
+		if (el->el_flags & UNBUFFERED)
+			break;
+	}
+
+	terminal__flush(el);		/* flush any buffered output */
+	/* make sure the tty is set up correctly */
+	if ((el->el_flags & UNBUFFERED) == 0) {
+		read_finish(el);
+		*nread = num != -1 ? num : 0;
+	} else
+		*nread = (int)(el->el_line.lastchar - el->el_line.buffer);
+
+	if (*nread == 0) {
+		if (num == -1) {
+			*nread = -1;
+			if (el->el_read->read_errno)
+				errno = el->el_read->read_errno;
+		}
+		return NULL;
+	} else
+		return el->el_line.buffer;
+}
diff --git a/cmd-line-utils/libedit/read.h b/extra/libedit/libedit-20221030-3.1/src/read.h
similarity index 78%
rename from cmd-line-utils/libedit/read.h
rename to extra/libedit/libedit-20221030-3.1/src/read.h
index 852606a9c17d..1acf5d67637e 100644
--- a/cmd-line-utils/libedit/read.h
+++ b/extra/libedit/libedit-20221030-3.1/src/read.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: read.h,v 1.7 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: read.h,v 1.12 2016/05/22 19:44:26 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,16 +35,11 @@
 #ifndef	_h_el_read
 #define	_h_el_read
 
-typedef int (*el_rfunc_t)(EditLine *, Char *);
-
-typedef struct el_read_t {
-	el_rfunc_t	read_char;	/* Function to read a character */
-} el_read_t;
- 
-protected int		read_init(EditLine *);
-protected void		read_prepare(EditLine *);
-protected void		read_finish(EditLine *);
-protected int		el_read_setfn(EditLine *, el_rfunc_t);
-protected el_rfunc_t	el_read_getfn(EditLine *);
+libedit_private int		read_init(EditLine *);
+libedit_private void		read_end(struct el_read_t *);
+libedit_private void		read_prepare(EditLine *);
+libedit_private void		read_finish(EditLine *);
+libedit_private int		el_read_setfn(struct el_read_t *, el_rfunc_t);
+libedit_private el_rfunc_t	el_read_getfn(struct el_read_t *);
 
 #endif /* _h_el_read */
diff --git a/extra/libedit/libedit-20221030-3.1/src/readline.c b/extra/libedit/libedit-20221030-3.1/src/readline.c
new file mode 100644
index 000000000000..8fdd13c5f368
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/readline.c
@@ -0,0 +1,2617 @@
+/*	$NetBSD: readline.c,v 1.176 2022/09/21 01:33:53 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+__RCSID("$NetBSD: readline.c,v 1.176 2022/09/21 01:33:53 christos Exp $");
+#endif /* not lint && not SCCSID */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <pwd.h>
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <vis.h>
+
+#include "editline/readline.h"
+#include "el.h"
+#include "fcns.h"
+#include "filecomplete.h"
+
+#if !defined(SIZE_T_MAX)
+# define SIZE_T_MAX (size_t)(-1)
+#endif
+
+void rl_prep_terminal(int);
+void rl_deprep_terminal(void);
+
+/* for rl_complete() */
+#define TAB		'\r'
+
+/* see comment at the #ifdef for sense of this */
+/* #define GDB_411_HACK */
+
+/* readline compatibility stuff - look at readline sources/documentation */
+/* to see what these variables mean */
+const char *rl_library_version = "EditLine wrapper";
+int rl_readline_version = RL_READLINE_VERSION;
+static char empty[] = { '\0' };
+static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' };
+static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
+    '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
+const char *rl_readline_name = empty;
+FILE *rl_instream = NULL;
+FILE *rl_outstream = NULL;
+int rl_point = 0;
+int rl_end = 0;
+char *rl_line_buffer = NULL;
+rl_vcpfunc_t *rl_linefunc = NULL;
+int rl_done = 0;
+rl_hook_func_t *rl_event_hook = NULL;
+KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
+    emacs_meta_keymap,
+    emacs_ctlx_keymap;
+/*
+ * The following is not implemented; we always catch signals in the
+ * libedit fashion: set handlers on entry to el_gets() and clear them
+ * on the way out. This simplistic approach works for most cases; if
+ * it does not work for your application, please let us know.
+ */
+int rl_catch_signals = 1;
+int rl_catch_sigwinch = 1;
+
+int history_base = 1;		/* probably never subject to change */
+int history_length = 0;
+int history_offset = 0;
+int max_input_history = 0;
+char history_expansion_char = '!';
+char history_subst_char = '^';
+char *history_no_expand_chars = expand_chars;
+Function *history_inhibit_expansion_function = NULL;
+char *history_arg_extract(int start, int end, const char *str);
+
+int rl_inhibit_completion = 0;
+int rl_attempted_completion_over = 0;
+const char *rl_basic_word_break_characters = break_chars;
+char *rl_completer_word_break_characters = NULL;
+const char *rl_completer_quote_characters = NULL;
+const char *rl_basic_quote_characters = "\"'";
+rl_compentry_func_t *rl_completion_entry_function = NULL;
+char *(*rl_completion_word_break_hook)(void) = NULL;
+rl_completion_func_t *rl_attempted_completion_function = NULL;
+rl_hook_func_t *rl_pre_input_hook = NULL;
+rl_hook_func_t *rl_startup1_hook = NULL;
+int (*rl_getc_function)(FILE *) = NULL;
+char *rl_terminal_name = NULL;
+int rl_already_prompted = 0;
+int rl_filename_completion_desired = 0;
+int rl_ignore_completion_duplicates = 0;
+int readline_echoing_p = 1;
+int _rl_print_completions_horizontally = 0;
+VFunction *rl_redisplay_function = NULL;
+rl_hook_func_t *rl_startup_hook = NULL;
+VFunction *rl_completion_display_matches_hook = NULL;
+VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
+VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
+KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
+unsigned long rl_readline_state = RL_STATE_NONE;
+int _rl_complete_mark_directories;
+rl_icppfunc_t *rl_directory_completion_hook;
+int rl_completion_suppress_append;
+int rl_sort_completion_matches;
+int _rl_completion_prefix_display_length;
+int _rl_echoing_p;
+int history_max_entries;
+char *rl_display_prompt;
+int rl_erase_empty_line;
+
+/*
+ * The current prompt string.
+ */
+char *rl_prompt = NULL;
+char *rl_prompt_saved = NULL;
+/*
+ * This is set to character indicating type of completion being done by
+ * rl_complete_internal(); this is available for application completion
+ * functions.
+ */
+int rl_completion_type = 0;
+
+/*
+ * If more than this number of items results from query for possible
+ * completions, we ask user if they are sure to really display the list.
+ */
+int rl_completion_query_items = 100;
+
+/*
+ * List of characters which are word break characters, but should be left
+ * in the parsed text when it is passed to the completion function.
+ * Shell uses this to help determine what kind of completing to do.
+ */
+const char *rl_special_prefixes = NULL;
+
+/*
+ * This is the character appended to the completed words if at the end of
+ * the line. Default is ' ' (a space).
+ */
+int rl_completion_append_character = ' ';
+
+/* stuff below is used internally by libedit for readline emulation */
+
+static History *h = NULL;
+static EditLine *e = NULL;
+static rl_command_func_t *map[256];
+static jmp_buf topbuf;
+
+/* internal functions */
+static unsigned char	 _el_rl_complete(EditLine *, int);
+static unsigned char	 _el_rl_tstp(EditLine *, int);
+static char		*_get_prompt(EditLine *);
+static int		 _getc_function(EditLine *, wchar_t *);
+static int		 _history_expand_command(const char *, size_t, size_t,
+    char **);
+static char		*_rl_compat_sub(const char *, const char *,
+    const char *, int);
+static int		 _rl_event_read_char(EditLine *, wchar_t *);
+static void		 _rl_update_pos(void);
+
+static HIST_ENTRY rl_he;
+
+/* ARGSUSED */
+static char *
+_get_prompt(EditLine *el __attribute__((__unused__)))
+{
+	rl_already_prompted = 1;
+	return rl_prompt;
+}
+
+
+/*
+ * read one key from user defined input function
+ */
+static int
+/*ARGSUSED*/
+_getc_function(EditLine *el __attribute__((__unused__)), wchar_t *c)
+{
+	int i;
+
+	i = (*rl_getc_function)(rl_instream);
+	if (i == -1)
+		return 0;
+	*c = (wchar_t)i;
+	return 1;
+}
+
+static void
+_resize_fun(EditLine *el, void *a)
+{
+	const LineInfo *li;
+	const char **ap = a;
+
+	li = el_line(el);
+	*ap = li->buffer;
+}
+
+static const char *
+_default_history_file(void)
+{
+	struct passwd *p;
+	static char *path;
+	size_t len;
+
+	if (path)
+		return path;
+
+	if ((p = getpwuid(getuid())) == NULL)
+		return NULL;
+
+	len = strlen(p->pw_dir) + sizeof("/.history");
+	if ((path = malloc(len)) == NULL)
+		return NULL;
+
+	(void)snprintf(path, len, "%s/.history", p->pw_dir);
+	return path;
+}
+
+/*
+ * READLINE compatibility stuff
+ */
+
+/*
+ * Set the prompt
+ */
+int
+rl_set_prompt(const char *prompt)
+{
+	char *p;
+
+	if (!prompt)
+		prompt = "";
+	if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0)
+		return 0;
+	if (rl_prompt)
+		el_free(rl_prompt);
+	rl_prompt = strdup(prompt);
+	if (rl_prompt == NULL)
+		return -1;
+
+	while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL) {
+		/* Remove adjacent end/start markers to avoid double-escapes. */
+		if (p[1] == RL_PROMPT_START_IGNORE) {
+			memmove(p, p + 2, 1 + strlen(p + 2));
+		} else {
+			*p = RL_PROMPT_START_IGNORE;
+		}
+	}
+
+	return 0;
+}
+
+void
+rl_save_prompt(void)
+{
+	rl_prompt_saved = strdup(rl_prompt);
+}
+
+void
+rl_restore_prompt(void)
+{
+	if (!rl_prompt_saved)
+		return;
+	rl_prompt = rl_prompt_saved;
+	rl_prompt_saved = NULL;
+}
+
+/*
+ * initialize rl compat stuff
+ */
+int
+rl_initialize(void)
+{
+	HistEvent ev;
+	int editmode = 1;
+	struct termios t;
+
+	if (e != NULL)
+		el_end(e);
+	if (h != NULL)
+		history_end(h);
+
+	RL_UNSETSTATE(RL_STATE_DONE);
+
+	if (!rl_instream)
+		rl_instream = stdin;
+	if (!rl_outstream)
+		rl_outstream = stdout;
+
+	/*
+	 * See if we don't really want to run the editor
+	 */
+	if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0)
+		editmode = 0;
+
+	e = el_init_internal(rl_readline_name, rl_instream, rl_outstream,
+	    stderr, fileno(rl_instream), fileno(rl_outstream), fileno(stderr),
+	    NO_RESET);
+
+	if (!editmode)
+		el_set(e, EL_EDITMODE, 0);
+
+	h = history_init();
+	if (!e || !h)
+		return -1;
+
+	history(h, &ev, H_SETSIZE, INT_MAX);	/* unlimited */
+	history_length = 0;
+	max_input_history = INT_MAX;
+	el_set(e, EL_HIST, history, h);
+
+	/* Setup resize function */
+	el_set(e, EL_RESIZE, _resize_fun, &rl_line_buffer);
+
+	/* setup getc function if valid */
+	if (rl_getc_function)
+		el_set(e, EL_GETCFN, _getc_function);
+
+	/* for proper prompt printing in readline() */
+	if (rl_set_prompt("") == -1) {
+		history_end(h);
+		el_end(e);
+		return -1;
+	}
+	el_set(e, EL_PROMPT_ESC, _get_prompt, RL_PROMPT_START_IGNORE);
+	el_set(e, EL_SIGNAL, rl_catch_signals);
+
+	/* set default mode to "emacs"-style and read setting afterwards */
+	/* so this can be overridden */
+	el_set(e, EL_EDITOR, "emacs");
+	if (rl_terminal_name != NULL)
+		el_set(e, EL_TERMINAL, rl_terminal_name);
+	else
+		el_get(e, EL_TERMINAL, &rl_terminal_name);
+
+	/*
+	 * Word completion - this has to go AFTER rebinding keys
+	 * to emacs-style.
+	 */
+	el_set(e, EL_ADDFN, "rl_complete",
+	    "ReadLine compatible completion function",
+	    _el_rl_complete);
+	el_set(e, EL_BIND, "^I", "rl_complete", NULL);
+
+	/*
+	 * Send TSTP when ^Z is pressed.
+	 */
+	el_set(e, EL_ADDFN, "rl_tstp",
+	    "ReadLine compatible suspend function",
+	    _el_rl_tstp);
+	el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
+
+	/*
+	 * Set some readline compatible key-bindings.
+	 */
+	el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
+
+	/*
+	 * Allow the use of Home/End keys.
+	 */
+	el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
+	el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
+	el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
+	el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
+	el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
+	el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
+
+	/*
+	 * Allow the use of the Delete/Insert keys.
+	 */
+	el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
+	el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
+
+	/*
+	 * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
+	 */
+	el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
+	el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
+	el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
+	el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
+	el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
+	el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
+
+	/* read settings from configuration file */
+	el_source(e, NULL);
+
+	/*
+	 * Unfortunately, some applications really do use rl_point
+	 * and rl_line_buffer directly.
+	 */
+	_resize_fun(e, &rl_line_buffer);
+	_rl_update_pos();
+
+	tty_end(e, TCSADRAIN);
+
+	return 0;
+}
+
+
+/*
+ * read one line from input stream and return it, chomping
+ * trailing newline (if there is any)
+ */
+char *
+readline(const char *p)
+{
+	HistEvent ev;
+	const char * volatile prompt = p;
+	int count;
+	const char *ret;
+	char *buf;
+	static int used_event_hook;
+
+	if (e == NULL || h == NULL)
+		rl_initialize();
+	if (rl_startup_hook) {
+		(*rl_startup_hook)();
+	}
+	tty_init(e);
+
+
+	rl_done = 0;
+
+	(void)setjmp(topbuf);
+	buf = NULL;
+
+	/* update prompt accordingly to what has been passed */
+	if (rl_set_prompt(prompt) == -1)
+		goto out;
+
+	if (rl_pre_input_hook)
+		(*rl_pre_input_hook)();
+
+	if (rl_event_hook && !(e->el_flags & NO_TTY)) {
+		el_set(e, EL_GETCFN, _rl_event_read_char);
+		used_event_hook = 1;
+	}
+
+	if (!rl_event_hook && used_event_hook) {
+		el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN);
+		used_event_hook = 0;
+	}
+
+	rl_already_prompted = 0;
+
+	/* get one line from input stream */
+	ret = el_gets(e, &count);
+
+	if (ret && count > 0) {
+		int lastidx;
+
+		buf = strdup(ret);
+		if (buf == NULL)
+			goto out;
+		lastidx = count - 1;
+		if (buf[lastidx] == '\n')
+			buf[lastidx] = '\0';
+	} else
+		buf = NULL;
+
+	history(h, &ev, H_GETSIZE);
+	history_length = ev.num;
+
+out:
+	tty_end(e, TCSADRAIN);
+	return buf;
+}
+
+/*
+ * history functions
+ */
+
+/*
+ * is normally called before application starts to use
+ * history expansion functions
+ */
+void
+using_history(void)
+{
+	if (h == NULL || e == NULL)
+		rl_initialize();
+	history_offset = history_length;
+}
+
+
+/*
+ * substitute ``what'' with ``with'', returning resulting string; if
+ * globally == 1, substitutes all occurrences of what, otherwise only the
+ * first one
+ */
+static char *
+_rl_compat_sub(const char *str, const char *what, const char *with,
+    int globally)
+{
+	const	char	*s;
+	char	*r, *result;
+	size_t	len, with_len, what_len;
+
+	len = strlen(str);
+	with_len = strlen(with);
+	what_len = strlen(what);
+
+	/* calculate length we need for result */
+	s = str;
+	while (*s) {
+		if (*s == *what && !strncmp(s, what, what_len)) {
+			len += with_len - what_len;
+			if (!globally)
+				break;
+			s += what_len;
+		} else
+			s++;
+	}
+	r = result = el_calloc(len + 1, sizeof(*r));
+	if (result == NULL)
+		return NULL;
+	s = str;
+	while (*s) {
+		if (*s == *what && !strncmp(s, what, what_len)) {
+			memcpy(r, with, with_len);
+			r += with_len;
+			s += what_len;
+			if (!globally) {
+				(void)strcpy(r, s);
+				return result;
+			}
+		} else
+			*r++ = *s++;
+	}
+	*r = '\0';
+	return result;
+}
+
+static	char	*last_search_pat;	/* last !?pat[?] search pattern */
+static	char	*last_search_match;	/* last !?pat[?] that matched */
+
+const char *
+get_history_event(const char *cmd, int *cindex, int qchar)
+{
+	int idx, sign, sub, num, begin, ret;
+	size_t len;
+	char	*pat;
+	const char *rptr;
+	HistEvent ev;
+
+	idx = *cindex;
+	if (cmd[idx++] != history_expansion_char)
+		return NULL;
+
+	/* find out which event to take */
+	if (cmd[idx] == history_expansion_char || cmd[idx] == '\0') {
+		if (history(h, &ev, H_FIRST) != 0)
+			return NULL;
+		*cindex = cmd[idx]? (idx + 1):idx;
+		return ev.str;
+	}
+	sign = 0;
+	if (cmd[idx] == '-') {
+		sign = 1;
+		idx++;
+	}
+
+	if ('0' <= cmd[idx] && cmd[idx] <= '9') {
+		HIST_ENTRY *he;
+
+		num = 0;
+		while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') {
+			num = num * 10 + cmd[idx] - '0';
+			idx++;
+		}
+		if (sign)
+			num = history_length - num + history_base;
+
+		if (!(he = history_get(num)))
+			return NULL;
+
+		*cindex = idx;
+		return he->line;
+	}
+	sub = 0;
+	if (cmd[idx] == '?') {
+		sub = 1;
+		idx++;
+	}
+	begin = idx;
+	while (cmd[idx]) {
+		if (cmd[idx] == '\n')
+			break;
+		if (sub && cmd[idx] == '?')
+			break;
+		if (!sub && (cmd[idx] == ':' || cmd[idx] == ' '
+		    || cmd[idx] == '\t' || cmd[idx] == qchar))
+			break;
+		idx++;
+	}
+	len = (size_t)idx - (size_t)begin;
+	if (sub && cmd[idx] == '?')
+		idx++;
+	if (sub && len == 0 && last_search_pat && *last_search_pat)
+		pat = last_search_pat;
+	else if (len == 0)
+		return NULL;
+	else {
+		if ((pat = el_calloc(len + 1, sizeof(*pat))) == NULL)
+			return NULL;
+		(void)strlcpy(pat, cmd + begin, len + 1);
+	}
+
+	if (history(h, &ev, H_CURR) != 0) {
+		if (pat != last_search_pat)
+			el_free(pat);
+		return NULL;
+	}
+	num = ev.num;
+
+	if (sub) {
+		if (pat != last_search_pat) {
+			el_free(last_search_pat);
+			last_search_pat = pat;
+		}
+		ret = history_search(pat, -1);
+	} else
+		ret = history_search_prefix(pat, -1);
+
+	if (ret == -1) {
+		/* restore to end of list on failed search */
+		history(h, &ev, H_FIRST);
+		(void)fprintf(rl_outstream, "%s: Event not found\n", pat);
+		if (pat != last_search_pat)
+			el_free(pat);
+		return NULL;
+	}
+
+	if (sub && len) {
+		el_free(last_search_match);
+		last_search_match = strdup(pat);
+	}
+
+	if (pat != last_search_pat)
+		el_free(pat);
+
+	if (history(h, &ev, H_CURR) != 0)
+		return NULL;
+	*cindex = idx;
+	rptr = ev.str;
+
+	/* roll back to original position */
+	(void)history(h, &ev, H_SET, num);
+
+	return rptr;
+}
+
+static int
+getfrom(const char **cmdp, char **fromp, const char *search, int delim)
+{
+	size_t size = 16;
+	size_t len = 0;
+	const char *cmd = *cmdp;
+	char *what = el_realloc(*fromp, size * sizeof(*what));
+	if (what == NULL){
+		el_free(*fromp);
+		*fromp = NULL;
+		return 0;
+	}
+	for (; *cmd && *cmd != delim; cmd++) {
+		if (*cmd == '\\' && cmd[1] == delim)
+			cmd++;
+		if (len - 1 >= size) {
+			char *nwhat;
+			nwhat = el_realloc(what, (size <<= 1) * sizeof(*nwhat));
+			if (nwhat == NULL) {
+				el_free(what);
+				el_free(*fromp);
+				*cmdp = cmd;
+				*fromp = NULL;
+				return 0;
+			}
+			what = nwhat;
+		}
+		what[len++] = *cmd;
+	}
+	what[len] = '\0';
+	*fromp = what;
+	*cmdp = cmd;
+	if (*what == '\0') {
+		el_free(what);
+		if (search) {
+			*fromp = strdup(search);
+			if (*fromp == NULL) {
+				return 0;
+			}
+		} else {
+			*fromp = NULL;
+			return -1;
+		}
+	}
+	if (!*cmd) {
+		el_free(what);
+		*fromp = NULL;
+		return -1;
+	}
+
+	cmd++;	/* shift after delim */
+	*cmdp = cmd;
+
+	if (!*cmd) {
+		el_free(what);
+		*fromp = NULL;
+		return -1;
+	}
+	return 1;
+}
+
+static int
+getto(const char **cmdp, char **top, const char *from, int delim)
+{
+	size_t size = 16;
+	size_t len = 0;
+	size_t from_len = strlen(from);
+	const char *cmd = *cmdp;
+	char *with = el_realloc(*top, size * sizeof(*with));
+	*top = NULL;
+	if (with == NULL)
+		goto out;
+
+	for (; *cmd && *cmd != delim; cmd++) {
+		if (len + from_len + 1 >= size) {
+			char *nwith;
+			size += from_len + 1;
+			nwith = el_realloc(with, size * sizeof(*nwith));
+			if (nwith == NULL)
+				goto out;
+			with = nwith;
+		}
+		if (*cmd == '&') {
+			/* safe */
+			strcpy(&with[len], from);
+			len += from_len;
+			continue;
+		}
+		if (*cmd == '\\' && (*(cmd + 1) == delim || *(cmd + 1) == '&'))
+			cmd++;
+		with[len++] = *cmd;
+	}
+	if (!*cmd)
+		goto out;
+	with[len] = '\0';
+	*top = with;
+	*cmdp = cmd;
+	return 1;
+out:
+	el_free(with);
+	el_free(*top);
+	*top = NULL;
+	*cmdp = cmd;
+	return -1;
+}
+
+static void
+replace(char **tmp, int c)
+{
+	char *aptr;
+	if ((aptr = strrchr(*tmp, c)) == NULL)
+		return;
+	aptr = strdup(aptr + 1); // XXX: check
+	el_free(*tmp);
+	*tmp = aptr;
+}
+
+/*
+ * the real function doing history expansion - takes as argument command
+ * to do and data upon which the command should be executed
+ * does expansion the way I've understood readline documentation
+ *
+ * returns 0 if data was not modified, 1 if it was and 2 if the string
+ * should be only printed and not executed; in case of error,
+ * returns -1 and *result points to NULL
+ * it's the caller's responsibility to free() the string returned in *result
+ */
+static int
+_history_expand_command(const char *command, size_t offs, size_t cmdlen,
+    char **result)
+{
+	char *tmp, *search = NULL, *aptr, delim;
+	const char *ptr, *cmd;
+	static char *from = NULL, *to = NULL;
+	int start, end, idx, has_mods = 0;
+	int p_on = 0, g_on = 0, ev;
+
+	*result = NULL;
+	aptr = NULL;
+	ptr = NULL;
+
+	/* First get event specifier */
+	idx = 0;
+
+	if (strchr(":^*$", command[offs + 1])) {
+		char str[4];
+		/*
+		* "!:" is shorthand for "!!:".
+		* "!^", "!*" and "!$" are shorthand for
+		* "!!:^", "!!:*" and "!!:$" respectively.
+		*/
+		str[0] = str[1] = '!';
+		str[2] = '0';
+		ptr = get_history_event(str, &idx, 0);
+		idx = (command[offs + 1] == ':')? 1:0;
+		has_mods = 1;
+	} else {
+		if (command[offs + 1] == '#') {
+			/* use command so far */
+			if ((aptr = el_calloc(offs + 1, sizeof(*aptr)))
+			    == NULL)
+				return -1;
+			(void)strlcpy(aptr, command, offs + 1);
+			idx = 1;
+		} else {
+			int	qchar;
+
+			qchar = (offs > 0 && command[offs - 1] == '"')
+			    ? '"' : '\0';
+			ptr = get_history_event(command + offs, &idx, qchar);
+		}
+		has_mods = command[offs + (size_t)idx] == ':';
+	}
+
+	if (ptr == NULL && aptr == NULL)
+		return -1;
+
+	if (!has_mods) {
+		*result = strdup(aptr ? aptr : ptr);
+		if (aptr)
+			el_free(aptr);
+		if (*result == NULL)
+			return -1;
+		return 1;
+	}
+
+	cmd = command + offs + idx + 1;
+
+	/* Now parse any word designators */
+
+	if (*cmd == '%')	/* last word matched by ?pat? */
+		tmp = strdup(last_search_match ? last_search_match : "");
+	else if (strchr("^*$-0123456789", *cmd)) {
+		start = end = -1;
+		if (*cmd == '^')
+			start = end = 1, cmd++;
+		else if (*cmd == '$')
+			start = -1, cmd++;
+		else if (*cmd == '*')
+			start = 1, cmd++;
+		else if (*cmd == '-' || isdigit((unsigned char) *cmd)) {
+			start = 0;
+			while (*cmd && '0' <= *cmd && *cmd <= '9')
+				start = start * 10 + *cmd++ - '0';
+
+			if (*cmd == '-') {
+				if (isdigit((unsigned char) cmd[1])) {
+					cmd++;
+					end = 0;
+					while (*cmd && '0' <= *cmd && *cmd <= '9')
+						end = end * 10 + *cmd++ - '0';
+				} else if (cmd[1] == '$') {
+					cmd += 2;
+					end = -1;
+				} else {
+					cmd++;
+					end = -2;
+				}
+			} else if (*cmd == '*')
+				end = -1, cmd++;
+			else
+				end = start;
+		}
+		tmp = history_arg_extract(start, end, aptr? aptr:ptr);
+		if (tmp == NULL) {
+			(void)fprintf(rl_outstream, "%s: Bad word specifier",
+			    command + offs + idx);
+			if (aptr)
+				el_free(aptr);
+			return -1;
+		}
+	} else
+		tmp = strdup(aptr? aptr:ptr);
+
+	if (aptr)
+		el_free(aptr);
+
+	if (*cmd == '\0' || ((size_t)(cmd - (command + offs)) >= cmdlen)) {
+		*result = tmp;
+		return 1;
+	}
+
+	for (; *cmd; cmd++) {
+		switch (*cmd) {
+		case ':':
+			continue;
+		case 'h':	/* remove trailing path */
+			if ((aptr = strrchr(tmp, '/')) != NULL)
+				*aptr = '\0';
+			continue;
+		case 't':	/* remove leading path */
+			replace(&tmp, '/');
+			continue;
+		case 'r':	/* remove trailing suffix */
+			if ((aptr = strrchr(tmp, '.')) != NULL)
+				*aptr = '\0';
+			continue;
+		case 'e':	/* remove all but suffix */
+			replace(&tmp, '.');
+			continue;
+		case 'p':	/* print only */
+			p_on = 1;
+			continue;
+		case 'g':
+			g_on = 2;
+			continue;
+		case '&':
+			if (from == NULL || to == NULL)
+				continue;
+			/*FALLTHROUGH*/
+		case 's':
+			ev = -1;
+			delim = *++cmd;
+			if (delim == '\0' || *++cmd == '\0')
+				goto out;
+			if ((ev = getfrom(&cmd, &from, search, delim)) != 1)
+				goto out;
+			if ((ev = getto(&cmd, &to, from, delim)) != 1)
+				goto out;
+			aptr = _rl_compat_sub(tmp, from, to, g_on);
+			if (aptr) {
+				el_free(tmp);
+				tmp = aptr;
+			}
+			g_on = 0;
+			cmd--;
+			continue;
+		}
+	}
+	*result = tmp;
+	return p_on ? 2 : 1;
+out:
+	el_free(tmp);
+	return ev;
+	
+}
+
+
+/*
+ * csh-style history expansion
+ */
+int
+history_expand(char *str, char **output)
+{
+	int ret = 0;
+	size_t idx, i, size;
+	char *tmp, *result;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (history_expansion_char == 0) {
+		*output = strdup(str);
+		return 0;
+	}
+
+	*output = NULL;
+	if (str[0] == history_subst_char) {
+		/* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */
+		*output = el_calloc(strlen(str) + 4 + 1, sizeof(**output));
+		if (*output == NULL)
+			return 0;
+		(*output)[0] = (*output)[1] = history_expansion_char;
+		(*output)[2] = ':';
+		(*output)[3] = 's';
+		(void)strcpy((*output) + 4, str);
+		str = *output;
+	} else {
+		*output = strdup(str);
+		if (*output == NULL)
+			return 0;
+	}
+
+#define ADD_STRING(what, len, fr)					\
+	{								\
+		if (idx + len + 1 > size) {				\
+			char *nresult = el_realloc(result,		\
+			    (size += len + 1) * sizeof(*nresult));	\
+			if (nresult == NULL) {				\
+				el_free(*output);			\
+				el_free(fr);				\
+				return 0;				\
+			}						\
+			result = nresult;				\
+		}							\
+		(void)strlcpy(&result[idx], what, len + 1);		\
+		idx += len;						\
+	}
+
+	result = NULL;
+	size = idx = 0;
+	tmp = NULL;
+	for (i = 0; str[i];) {
+		int qchar, loop_again;
+		size_t len, start, j;
+
+		qchar = 0;
+		loop_again = 1;
+		start = j = i;
+loop:
+		for (; str[j]; j++) {
+			if (str[j] == '\\' &&
+			    str[j + 1] == history_expansion_char) {
+				len = strlen(&str[j + 1]) + 1;
+				memmove(&str[j], &str[j + 1], len);
+				continue;
+			}
+			if (!loop_again) {
+				if (isspace((unsigned char) str[j])
+				    || str[j] == qchar)
+					break;
+			}
+			if (str[j] == history_expansion_char
+			    && !strchr(history_no_expand_chars, str[j + 1])
+			    && (!history_inhibit_expansion_function ||
+			    (*history_inhibit_expansion_function)(str,
+			    (int)j) == 0))
+				break;
+		}
+
+		if (str[j] && loop_again) {
+			i = j;
+			qchar = (j > 0 && str[j - 1] == '"' )? '"':0;
+			j++;
+			if (str[j] == history_expansion_char)
+				j++;
+			loop_again = 0;
+			goto loop;
+		}
+		len = i - start;
+		ADD_STRING(&str[start], len, NULL);
+
+		if (str[i] == '\0' || str[i] != history_expansion_char) {
+			len = j - i;
+			ADD_STRING(&str[i], len, NULL);
+			if (start == 0)
+				ret = 0;
+			else
+				ret = 1;
+			break;
+		}
+		ret = _history_expand_command (str, i, (j - i), &tmp);
+		if (ret > 0 && tmp) {
+			len = strlen(tmp);
+			ADD_STRING(tmp, len, tmp);
+		}
+		if (tmp) {
+			el_free(tmp);
+			tmp = NULL;
+		}
+		i = j;
+	}
+
+	/* ret is 2 for "print only" option */
+	if (ret == 2) {
+		add_history(result);
+#ifdef GDB_411_HACK
+		/* gdb 4.11 has been shipped with readline, where */
+		/* history_expand() returned -1 when the line	  */
+		/* should not be executed; in readline 2.1+	  */
+		/* it should return 2 in such a case		  */
+		ret = -1;
+#endif
+	}
+	el_free(*output);
+	*output = result;
+
+	return ret;
+}
+
+/*
+* Return a string consisting of arguments of "str" from "start" to "end".
+*/
+char *
+history_arg_extract(int start, int end, const char *str)
+{
+	size_t  i, len, max;
+	char	**arr, *result = NULL;
+
+	arr = history_tokenize(str);
+	if (!arr)
+		return NULL;
+	if (arr && *arr == NULL)
+		goto out;
+
+	for (max = 0; arr[max]; max++)
+		continue;
+	max--;
+
+	if (start == '$')
+		start = (int)max;
+	if (end == '$')
+		end = (int)max;
+	if (end < 0)
+		end = (int)max + end + 1;
+	if (start < 0)
+		start = end;
+
+	if (start < 0 || end < 0 || (size_t)start > max ||
+	    (size_t)end > max || start > end)
+		goto out;
+
+	for (i = (size_t)start, len = 0; i <= (size_t)end; i++)
+		len += strlen(arr[i]) + 1;
+	len++;
+	result = el_calloc(len, sizeof(*result));
+	if (result == NULL)
+		goto out;
+
+	for (i = (size_t)start, len = 0; i <= (size_t)end; i++) {
+		(void)strcpy(result + len, arr[i]);
+		len += strlen(arr[i]);
+		if (i < (size_t)end)
+			result[len++] = ' ';
+	}
+	result[len] = '\0';
+
+out:
+	for (i = 0; arr[i]; i++)
+		el_free(arr[i]);
+	el_free(arr);
+
+	return result;
+}
+
+/*
+ * Parse the string into individual tokens,
+ * similar to how shell would do it.
+ */
+char **
+history_tokenize(const char *str)
+{
+	int size = 1, idx = 0, i, start;
+	size_t len;
+	char **result = NULL, *temp, delim = '\0';
+
+	for (i = 0; str[i];) {
+		while (isspace((unsigned char) str[i]))
+			i++;
+		start = i;
+		for (; str[i];) {
+			if (str[i] == '\\') {
+				if (str[i+1] != '\0')
+					i++;
+			} else if (str[i] == delim)
+				delim = '\0';
+			else if (!delim &&
+				    (isspace((unsigned char) str[i]) ||
+				strchr("()<>;&|$", str[i])))
+				break;
+			else if (!delim && strchr("'`\"", str[i]))
+				delim = str[i];
+			if (str[i])
+				i++;
+		}
+
+		if (idx + 2 >= size) {
+			char **nresult;
+			size <<= 1;
+			nresult = el_realloc(result, (size_t)size * sizeof(*nresult));
+			if (nresult == NULL) {
+				el_free(result);
+				return NULL;
+			}
+			result = nresult;
+		}
+		len = (size_t)i - (size_t)start;
+		temp = el_calloc(len + 1, sizeof(*temp));
+		if (temp == NULL) {
+			for (i = 0; i < idx; i++)
+				el_free(result[i]);
+			el_free(result);
+			return NULL;
+		}
+		(void)strlcpy(temp, &str[start], len + 1);
+		result[idx++] = temp;
+		result[idx] = NULL;
+		if (str[i])
+			i++;
+	}
+	return result;
+}
+
+
+/*
+ * limit size of history record to ``max'' events
+ */
+void
+stifle_history(int max)
+{
+	HistEvent ev;
+	HIST_ENTRY *he;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (history(h, &ev, H_SETSIZE, max) == 0) {
+		max_input_history = max;
+		if (history_length > max)
+			history_base = history_length - max;
+		while (history_length > max) {
+			he = remove_history(0);
+			el_free(he->data);
+			el_free((void *)(unsigned long)he->line);
+			el_free(he);
+		}
+	}
+}
+
+
+/*
+ * "unlimit" size of history - set the limit to maximum allowed int value
+ */
+int
+unstifle_history(void)
+{
+	HistEvent ev;
+	int omax;
+
+	history(h, &ev, H_SETSIZE, INT_MAX);
+	omax = max_input_history;
+	max_input_history = INT_MAX;
+	return omax;		/* some value _must_ be returned */
+}
+
+
+int
+history_is_stifled(void)
+{
+
+	/* cannot return true answer */
+	return max_input_history != INT_MAX;
+}
+
+static const char _history_tmp_template[] = "/tmp/.historyXXXXXX";
+
+int
+history_truncate_file (const char *filename, int nlines)
+{
+	int ret = 0;
+	FILE *fp, *tp;
+	char template[sizeof(_history_tmp_template)];
+	char buf[4096];
+	int fd;
+	char *cp;
+	off_t off;
+	int count = 0;
+	ssize_t left = 0;
+
+	if (filename == NULL && (filename = _default_history_file()) == NULL)
+		return errno;
+	if ((fp = fopen(filename, "r+")) == NULL)
+		return errno;
+	strcpy(template, _history_tmp_template);
+	if ((fd = mkstemp(template)) == -1) {
+		ret = errno;
+		goto out1;
+	}
+
+	if ((tp = fdopen(fd, "r+")) == NULL) {
+		close(fd);
+		ret = errno;
+		goto out2;
+	}
+
+	for(;;) {
+		if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
+			if (ferror(fp)) {
+				ret = errno;
+				break;
+			}
+			if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
+			    (off_t)-1) {
+				ret = errno;
+				break;
+			}
+			left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), fp);
+			if (ferror(fp)) {
+				ret = errno;
+				break;
+			}
+			if (left == 0) {
+				count--;
+				left = sizeof(buf);
+			} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
+			    != 1) {
+				ret = errno;
+				break;
+			}
+			fflush(tp);
+			break;
+		}
+		if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
+			ret = errno;
+			break;
+		}
+		count++;
+	}
+	if (ret)
+		goto out3;
+	cp = buf + left - 1;
+	if(*cp != '\n')
+		cp++;
+	for(;;) {
+		while (--cp >= buf) {
+			if (*cp == '\n') {
+				if (--nlines == 0) {
+					if (++cp >= buf + sizeof(buf)) {
+						count++;
+						cp = buf;
+					}
+					break;
+				}
+			}
+		}
+		if (nlines <= 0 || count == 0)
+			break;
+		count--;
+		if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
+			ret = errno;
+			break;
+		}
+		if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
+			if (ferror(tp)) {
+				ret = errno;
+				break;
+			}
+			ret = EAGAIN;
+			break;
+		}
+		cp = buf + sizeof(buf);
+	}
+
+	if (ret || nlines > 0)
+		goto out3;
+
+	if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
+		ret = errno;
+		goto out3;
+	}
+
+	if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
+	    (off_t)-1) {
+		ret = errno;
+		goto out3;
+	}
+
+	for(;;) {
+		if ((left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
+			if (ferror(fp))
+				ret = errno;
+			break;
+		}
+		if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
+			ret = errno;
+			break;
+		}
+	}
+	fflush(fp);
+	if((off = ftello(fp)) > 0)
+		(void)ftruncate(fileno(fp), off);
+out3:
+	fclose(tp);
+out2:
+	unlink(template);
+out1:
+	fclose(fp);
+
+	return ret;
+}
+
+
+/*
+ * read history from a file given
+ */
+int
+read_history(const char *filename)
+{
+	HistEvent ev;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+	if (filename == NULL && (filename = _default_history_file()) == NULL)
+		return errno;
+	errno = 0;
+	if (history(h, &ev, H_LOAD, filename) == -1)
+		return errno ? errno : EINVAL;
+	if (history(h, &ev, H_GETSIZE) == 0)
+		history_length = ev.num;
+	if (history_length < 0)
+		return EINVAL;
+	return 0;
+}
+
+
+/*
+ * write history to a file given
+ */
+int
+write_history(const char *filename)
+{
+	HistEvent ev;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+	if (filename == NULL && (filename = _default_history_file()) == NULL)
+		return errno;
+	return history(h, &ev, H_SAVE, filename) == -1 ?
+	    (errno ? errno : EINVAL) : 0;
+}
+
+int
+append_history(int n, const char *filename)
+{
+	HistEvent ev;
+	FILE *fp;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+	if (filename == NULL && (filename = _default_history_file()) == NULL)
+		return errno;
+
+	if ((fp = fopen(filename, "a")) == NULL)
+		return errno;
+
+	if (history(h, &ev, H_NSAVE_FP, (size_t)n,  fp) == -1) {
+		int serrno = errno ? errno : EINVAL;
+		fclose(fp);
+		return serrno;
+	}
+	fclose(fp);
+	return 0;
+}
+
+/*
+ * returns history ``num''th event
+ *
+ * returned pointer points to static variable
+ */
+HIST_ENTRY *
+history_get(int num)
+{
+	static HIST_ENTRY she;
+	HistEvent ev;
+	int curr_num;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (num < history_base)
+		return NULL;
+
+	/* save current position */
+	if (history(h, &ev, H_CURR) != 0)
+		return NULL;
+	curr_num = ev.num;
+
+	/*
+	 * use H_DELDATA to set to nth history (without delete) by passing
+	 * (void **)-1  -- as in history_set_pos
+	 */
+	if (history(h, &ev, H_DELDATA, num - history_base, (void **)-1) != 0)
+		goto out;
+
+	/* get current entry */
+	if (history(h, &ev, H_CURR) != 0)
+		goto out;
+	if (history(h, &ev, H_NEXT_EVDATA, ev.num, &she.data) != 0)
+		goto out;
+	she.line = ev.str;
+
+	/* restore pointer to where it was */
+	(void)history(h, &ev, H_SET, curr_num);
+
+	return &she;
+
+out:
+	/* restore pointer to where it was */
+	(void)history(h, &ev, H_SET, curr_num);
+	return NULL;
+}
+
+
+/*
+ * add the line to history table
+ */
+int
+add_history(const char *line)
+{
+	HistEvent ev;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (history(h, &ev, H_ENTER, line) == -1)
+		return 0;
+
+	(void)history(h, &ev, H_GETSIZE);
+	if (ev.num == history_length)
+		history_base++;
+	else {
+		history_offset++;
+		history_length = ev.num;
+	}
+	return 0;
+}
+
+
+/*
+ * remove the specified entry from the history list and return it.
+ */
+HIST_ENTRY *
+remove_history(int num)
+{
+	HIST_ENTRY *he;
+	HistEvent ev;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if ((he = el_malloc(sizeof(*he))) == NULL)
+		return NULL;
+
+	if (history(h, &ev, H_DELDATA, num, &he->data) != 0) {
+		el_free(he);
+		return NULL;
+	}
+
+	he->line = ev.str;
+	if (history(h, &ev, H_GETSIZE) == 0)
+		history_length = ev.num;
+
+	return he;
+}
+
+
+/*
+ * replace the line and data of the num-th entry
+ */
+HIST_ENTRY *
+replace_history_entry(int num, const char *line, histdata_t data)
+{
+	HIST_ENTRY *he;
+	HistEvent ev;
+	int curr_num;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	/* save current position */
+	if (history(h, &ev, H_CURR) != 0)
+		return NULL;
+	curr_num = ev.num;
+
+	/* start from the oldest */
+	if (history(h, &ev, H_LAST) != 0)
+		return NULL;	/* error */
+
+	if ((he = el_malloc(sizeof(*he))) == NULL)
+		return NULL;
+
+	/* look forwards for event matching specified offset */
+	if (history(h, &ev, H_NEXT_EVDATA, num, &he->data))
+		goto out;
+
+	he->line = strdup(ev.str);
+	if (he->line == NULL)
+		goto out;
+
+	if (history(h, &ev, H_REPLACE, line, data))
+		goto out;
+
+	/* restore pointer to where it was */
+	if (history(h, &ev, H_SET, curr_num))
+		goto out;
+
+	return he;
+out:
+	el_free(he);
+	return NULL;
+}
+
+/*
+ * clear the history list - delete all entries
+ */
+void
+clear_history(void)
+{
+	HistEvent ev;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	(void)history(h, &ev, H_CLEAR);
+	history_offset = history_length = 0;
+}
+
+
+/*
+ * returns offset of the current history event
+ */
+int
+where_history(void)
+{
+	return history_offset;
+}
+
+static HIST_ENTRY **_history_listp;
+static HIST_ENTRY *_history_list;
+
+HIST_ENTRY **
+history_list(void)
+{
+	HistEvent ev;
+	HIST_ENTRY **nlp, *nl;
+	int i;
+
+	if (history(h, &ev, H_LAST) != 0)
+		return NULL;
+
+	if ((nlp = el_realloc(_history_listp,
+	    ((size_t)history_length + 1) * sizeof(*nlp))) == NULL)
+		return NULL;
+	_history_listp = nlp;
+
+	if ((nl = el_realloc(_history_list,
+	    (size_t)history_length * sizeof(*nl))) == NULL)
+		return NULL;
+	_history_list = nl;
+
+	i = 0;
+	do {
+		_history_listp[i] = &_history_list[i];
+		_history_list[i].line = ev.str;
+		_history_list[i].data = NULL;
+		if (i++ == history_length)
+			abort();
+	} while (history(h, &ev, H_PREV) == 0);
+	_history_listp[i] = NULL;
+	return _history_listp;
+}
+
+/*
+ * returns current history event or NULL if there is no such event
+ */
+HIST_ENTRY *
+current_history(void)
+{
+	HistEvent ev;
+
+	if (history(h, &ev, H_PREV_EVENT, history_offset + 1) != 0)
+		return NULL;
+
+	rl_he.line = ev.str;
+	rl_he.data = NULL;
+	return &rl_he;
+}
+
+
+/*
+ * returns total number of bytes history events' data are using
+ */
+int
+history_total_bytes(void)
+{
+	HistEvent ev;
+	int curr_num;
+	size_t size;
+
+	if (history(h, &ev, H_CURR) != 0)
+		return -1;
+	curr_num = ev.num;
+
+	(void)history(h, &ev, H_FIRST);
+	size = 0;
+	do
+		size += strlen(ev.str) * sizeof(*ev.str);
+	while (history(h, &ev, H_NEXT) == 0);
+
+	/* get to the same position as before */
+	history(h, &ev, H_PREV_EVENT, curr_num);
+
+	return (int)size;
+}
+
+
+/*
+ * sets the position in the history list to ``pos''
+ */
+int
+history_set_pos(int pos)
+{
+	if (pos >= history_length || pos < 0)
+		return 0;
+
+	history_offset = pos;
+	return 1;
+}
+
+
+/*
+ * returns previous event in history and shifts pointer accordingly
+ * Note that readline and editline define directions in opposite ways.
+ */
+HIST_ENTRY *
+previous_history(void)
+{
+	HistEvent ev;
+
+	if (history_offset == 0)
+		return NULL;
+
+	if (history(h, &ev, H_LAST) != 0)
+		return NULL;
+
+	history_offset--;
+	return current_history();
+}
+
+
+/*
+ * returns next event in history and shifts pointer accordingly
+ */
+HIST_ENTRY *
+next_history(void)
+{
+	HistEvent ev;
+
+	if (history_offset >= history_length)
+		return NULL;
+
+	if (history(h, &ev, H_LAST) != 0)
+		return NULL;
+
+	history_offset++;
+	return current_history();
+}
+
+
+/*
+ * searches for first history event containing the str
+ */
+int
+history_search(const char *str, int direction)
+{
+	HistEvent ev;
+	const char *strp;
+	int curr_num;
+
+	if (history(h, &ev, H_CURR) != 0)
+		return -1;
+	curr_num = ev.num;
+
+	for (;;) {
+		if ((strp = strstr(ev.str, str)) != NULL)
+			return (int)(strp - ev.str);
+		if (history(h, &ev, direction < 0 ? H_NEXT:H_PREV) != 0)
+			break;
+	}
+	(void)history(h, &ev, H_SET, curr_num);
+	return -1;
+}
+
+
+/*
+ * searches for first history event beginning with str
+ */
+int
+history_search_prefix(const char *str, int direction)
+{
+	HistEvent ev;
+
+	return (history(h, &ev, direction < 0 ?
+	    H_PREV_STR : H_NEXT_STR, str));
+}
+
+
+/*
+ * search for event in history containing str, starting at offset
+ * abs(pos); continue backward, if pos<0, forward otherwise
+ */
+/* ARGSUSED */
+int
+history_search_pos(const char *str,
+		   int direction __attribute__((__unused__)), int pos)
+{
+	HistEvent ev;
+	int curr_num, off;
+
+	off = (pos > 0) ? pos : -pos;
+	pos = (pos > 0) ? 1 : -1;
+
+	if (history(h, &ev, H_CURR) != 0)
+		return -1;
+	curr_num = ev.num;
+
+	if (!history_set_pos(off) || history(h, &ev, H_CURR) != 0)
+		return -1;
+
+	for (;;) {
+		if (strstr(ev.str, str))
+			return off;
+		if (history(h, &ev, (pos < 0) ? H_PREV : H_NEXT) != 0)
+			break;
+	}
+
+	/* set "current" pointer back to previous state */
+	(void)history(h, &ev,
+	    pos < 0 ? H_NEXT_EVENT : H_PREV_EVENT, curr_num);
+
+	return -1;
+}
+
+
+/********************************/
+/* completion functions */
+
+char *
+tilde_expand(char *name)
+{
+	return fn_tilde_expand(name);
+}
+
+char *
+filename_completion_function(const char *name, int state)
+{
+	return fn_filename_completion_function(name, state);
+}
+
+/*
+ * a completion generator for usernames; returns _first_ username
+ * which starts with supplied text
+ * text contains a partial username preceded by random character
+ * (usually '~'); state resets search from start (??? should we do that anyway)
+ * it's the caller's responsibility to free the returned value
+ */
+char *
+username_completion_function(const char *text, int state)
+{
+	struct passwd *pass = NULL;
+
+	if (text[0] == '\0')
+		return NULL;
+
+	if (*text == '~')
+		text++;
+
+	if (state == 0)
+		setpwent();
+
+	while (
+	    (pass = getpwent()) != NULL
+	    && text[0] == pass->pw_name[0]
+	    && strcmp(text, pass->pw_name) == 0)
+		continue;
+
+	if (pass == NULL) {
+		endpwent();
+		return NULL;
+	}
+	return strdup(pass->pw_name);
+}
+
+
+/*
+ * el-compatible wrapper to send TSTP on ^Z
+ */
+/* ARGSUSED */
+static unsigned char
+_el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__unused__)))
+{
+	(void)kill(0, SIGTSTP);
+	return CC_NORM;
+}
+
+static const char *
+/*ARGSUSED*/
+_rl_completion_append_character_function(const char *dummy
+    __attribute__((__unused__)))
+{
+	static char buf[2];
+	buf[0] = (char)rl_completion_append_character;
+	buf[1] = '\0';
+	return buf;
+}
+
+
+/*
+ * Display list of strings in columnar format on readline's output stream.
+ * 'matches' is list of strings, 'len' is number of strings in 'matches',
+ * 'max' is maximum length of string in 'matches'.
+ */
+void
+rl_display_match_list(char **matches, int len, int max)
+{
+
+	fn_display_match_list(e, matches, (size_t)len, (size_t)max,
+		_rl_completion_append_character_function);
+}
+
+/*
+ * complete word at current point
+ */
+/* ARGSUSED */
+int
+rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
+{
+	static ct_buffer_t wbreak_conv, sprefix_conv;
+	const char *breakchars;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (rl_inhibit_completion) {
+		char arr[2];
+		arr[0] = (char)invoking_key;
+		arr[1] = '\0';
+		el_insertstr(e, arr);
+		return CC_REFRESH;
+	}
+
+	if (rl_completion_word_break_hook != NULL)
+		breakchars = (*rl_completion_word_break_hook)();
+	else
+		breakchars = rl_basic_word_break_characters;
+
+	_rl_update_pos();
+
+	/* Just look at how many global variables modify this operation! */
+	return fn_complete(e,
+	    (rl_compentry_func_t *)rl_completion_entry_function,
+	    rl_attempted_completion_function,
+	    ct_decode_string(rl_basic_word_break_characters, &wbreak_conv),
+	    ct_decode_string(breakchars, &sprefix_conv),
+	    _rl_completion_append_character_function,
+	    (size_t)rl_completion_query_items,
+	    &rl_completion_type, &rl_attempted_completion_over,
+	    &rl_point, &rl_end);
+
+
+}
+
+
+/* ARGSUSED */
+static unsigned char
+_el_rl_complete(EditLine *el __attribute__((__unused__)), int ch)
+{
+	return (unsigned char)rl_complete(0, ch);
+}
+
+/*
+ * misc other functions
+ */
+
+/*
+ * bind key c to readline-type function func
+ */
+int
+rl_bind_key(int c, rl_command_func_t *func)
+{
+	int retval = -1;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (func == rl_insert) {
+		/* XXX notice there is no range checking of ``c'' */
+		e->el_map.key[c] = ED_INSERT;
+		retval = 0;
+	}
+	return retval;
+}
+
+
+/*
+ * read one key from input - handles chars pushed back
+ * to input stream also
+ */
+int
+rl_read_key(void)
+{
+	char fooarr[2 * sizeof(int)];
+
+	if (e == NULL || h == NULL)
+		rl_initialize();
+
+	return el_getc(e, fooarr);
+}
+
+
+/*
+ * reset the terminal
+ */
+/* ARGSUSED */
+int
+rl_reset_terminal(const char *p __attribute__((__unused__)))
+{
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+	el_reset(e);
+	return 0;
+}
+
+
+/*
+ * insert character ``c'' back into input stream, ``count'' times
+ */
+int
+rl_insert(int count, int c)
+{
+	char arr[2];
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	/* XXX - int -> char conversion can lose on multichars */
+	arr[0] = (char)c;
+	arr[1] = '\0';
+
+	for (; count > 0; count--)
+		el_push(e, arr);
+
+	return 0;
+}
+
+int
+rl_insert_text(const char *text)
+{
+	if (!text || *text == 0)
+		return 0;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	if (el_insertstr(e, text) < 0)
+		return 0;
+	return (int)strlen(text);
+}
+
+/*ARGSUSED*/
+int
+rl_newline(int count __attribute__((__unused__)),
+    int c __attribute__((__unused__)))
+{
+	/*
+	 * Readline-4.0 appears to ignore the args.
+	 */
+	return rl_insert(1, '\n');
+}
+
+/*ARGSUSED*/
+static unsigned char
+rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c)
+{
+	if (map[c] == NULL)
+		return CC_ERROR;
+
+	_rl_update_pos();
+
+	(*map[c])(1, c);
+
+	/* If rl_done was set by the above call, deal with it here */
+	if (rl_done)
+		return CC_EOF;
+
+	return CC_NORM;
+}
+
+int
+rl_add_defun(const char *name, rl_command_func_t *fun, int c)
+{
+	char dest[8];
+	if ((size_t)c >= sizeof(map) / sizeof(map[0]) || c < 0)
+		return -1;
+	map[(unsigned char)c] = fun;
+	el_set(e, EL_ADDFN, name, name, rl_bind_wrapper);
+	vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0);
+	el_set(e, EL_BIND, dest, name, NULL);
+	return 0;
+}
+
+void
+rl_callback_read_char(void)
+{
+	int count = 0, done = 0;
+	const char *buf = el_gets(e, &count);
+	char *wbuf;
+
+	el_set(e, EL_UNBUFFERED, 1);
+	if (buf == NULL || count-- <= 0)
+		return;
+	if (count == 0 && buf[0] == e->el_tty.t_c[TS_IO][C_EOF])
+		done = 1;
+	if (buf[count] == '\n' || buf[count] == '\r')
+		done = 2;
+
+	if (done && rl_linefunc != NULL) {
+		el_set(e, EL_UNBUFFERED, 0);
+		if (done == 2) {
+			if ((wbuf = strdup(buf)) != NULL)
+				wbuf[count] = '\0';
+			RL_SETSTATE(RL_STATE_DONE);
+		} else
+			wbuf = NULL;
+		(*(void (*)(const char *))rl_linefunc)(wbuf);
+	}
+	_rl_update_pos();
+}
+
+void
+rl_callback_handler_install(const char *prompt, rl_vcpfunc_t *linefunc)
+{
+	if (e == NULL) {
+		rl_initialize();
+	}
+	(void)rl_set_prompt(prompt);
+	rl_linefunc = linefunc;
+	el_set(e, EL_UNBUFFERED, 1);
+}
+
+void
+rl_callback_handler_remove(void)
+{
+	el_set(e, EL_UNBUFFERED, 0);
+	rl_linefunc = NULL;
+}
+
+void
+rl_redisplay(void)
+{
+	char a[2];
+	a[0] = (char)e->el_tty.t_c[TS_IO][C_REPRINT];
+	a[1] = '\0';
+	el_push(e, a);
+	rl_forced_update_display();
+}
+
+int
+rl_get_previous_history(int count, int key)
+{
+	char a[2];
+	a[0] = (char)key;
+	a[1] = '\0';
+	while (count--)
+		el_push(e, a);
+	return 0;
+}
+
+void
+/*ARGSUSED*/
+rl_prep_terminal(int meta_flag __attribute__((__unused__)))
+{
+	el_set(e, EL_PREP_TERM, 1);
+}
+
+void
+rl_deprep_terminal(void)
+{
+	el_set(e, EL_PREP_TERM, 0);
+}
+
+int
+rl_read_init_file(const char *s)
+{
+	return el_source(e, s);
+}
+
+int
+rl_parse_and_bind(const char *line)
+{
+	const char **argv;
+	int argc;
+	Tokenizer *tok;
+
+	tok = tok_init(NULL);
+	tok_str(tok, line, &argc, &argv);
+	argc = el_parse(e, argc, argv);
+	tok_end(tok);
+	return argc ? 1 : 0;
+}
+
+int
+rl_variable_bind(const char *var, const char *value)
+{
+	/*
+	 * The proper return value is undocument, but this is what the
+	 * readline source seems to do.
+	 */
+	return el_set(e, EL_BIND, "", var, value, NULL) == -1 ? 1 : 0;
+}
+
+int
+rl_stuff_char(int c)
+{
+	char buf[2];
+
+	buf[0] = (char)c;
+	buf[1] = '\0';
+	el_insertstr(e, buf);
+	return 1;
+}
+
+static int
+_rl_event_read_char(EditLine *el, wchar_t *wc)
+{
+	char	ch;
+	int	n;
+	ssize_t num_read = 0;
+
+	ch = '\0';
+	*wc = L'\0';
+	while (rl_event_hook) {
+
+		(*rl_event_hook)();
+
+#if defined(FIONREAD)
+		if (ioctl(el->el_infd, FIONREAD, &n) < 0)
+			return -1;
+		if (n)
+			num_read = read(el->el_infd, &ch, (size_t)1);
+		else
+			num_read = 0;
+#elif defined(F_SETFL) && defined(O_NDELAY)
+		if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0)
+			return -1;
+		if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0)
+			return -1;
+		num_read = read(el->el_infd, &ch, 1);
+		if (fcntl(el->el_infd, F_SETFL, n))
+			return -1;
+#else
+		/* not non-blocking, but what you gonna do? */
+		num_read = read(el->el_infd, &ch, 1);
+		return -1;
+#endif
+
+		if (num_read < 0 && errno == EAGAIN)
+			continue;
+		if (num_read == 0)
+			continue;
+		break;
+	}
+	if (!rl_event_hook)
+		el_set(el, EL_GETCFN, EL_BUILTIN_GETCFN);
+	*wc = (wchar_t)ch;
+	return (int)num_read;
+}
+
+static void
+_rl_update_pos(void)
+{
+	const LineInfo *li = el_line(e);
+
+	rl_point = (int)(li->cursor - li->buffer);
+	rl_end = (int)(li->lastchar - li->buffer);
+	rl_line_buffer[rl_end] = '\0';
+}
+
+char *
+rl_copy_text(int from, int to)
+{
+	const LineInfo *li;
+	size_t len;
+	char * out;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	li = el_line(e);
+
+	if (from > to)
+		return NULL;
+
+	if (li->buffer + from > li->lastchar)
+		from = (int)(li->lastchar - li->buffer);
+
+	if (li->buffer + to > li->lastchar)
+		to = (int)(li->lastchar - li->buffer);
+
+	len = (size_t)(to - from);
+	out = el_malloc((size_t)len + 1);
+	(void)strlcpy(out, li->buffer + from , len);
+
+	return out;
+}
+
+void
+rl_replace_line(const char * text, int clear_undo __attribute__((__unused__)))
+{
+	if (!text || *text == 0)
+		return;
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	el_replacestr(e, text);
+}
+
+int
+rl_delete_text(int start, int end)
+{
+
+	if (h == NULL || e == NULL)
+		rl_initialize();
+
+	return el_deletestr1(e, start, end);
+}
+
+void
+rl_get_screen_size(int *rows, int *cols)
+{
+	if (rows)
+		el_get(e, EL_GETTC, "li", rows);
+	if (cols)
+		el_get(e, EL_GETTC, "co", cols);
+}
+
+#define MAX_MESSAGE 160
+void
+rl_message(const char *format, ...)
+{
+	char msg[MAX_MESSAGE];
+	va_list args;
+
+	va_start(args, format);
+	vsnprintf(msg, sizeof(msg), format, args);
+	va_end(args);
+
+	rl_set_prompt(msg);
+	rl_forced_update_display();
+}
+
+void
+rl_set_screen_size(int rows, int cols)
+{
+	char buf[64];
+	(void)snprintf(buf, sizeof(buf), "%d", rows);
+	el_set(e, EL_SETTC, "li", buf, NULL);
+	(void)snprintf(buf, sizeof(buf), "%d", cols);
+	el_set(e, EL_SETTC, "co", buf, NULL);
+}
+
+char **
+rl_completion_matches(const char *str, rl_compentry_func_t *fun)
+{
+	size_t len, max, i, j, min;
+	char **list, *match, *a, *b;
+
+	len = 1;
+	max = 10;
+	if ((list = el_calloc(max, sizeof(*list))) == NULL)
+		return NULL;
+
+	while ((match = (*fun)(str, (int)(len - 1))) != NULL) {
+		list[len++] = match;
+		if (len == max) {
+			char **nl;
+			max += 10;
+			if ((nl = el_realloc(list, max * sizeof(*nl))) == NULL)
+				goto out;
+			list = nl;
+		}
+	}
+	if (len == 1)
+		goto out;
+	list[len] = NULL;
+	if (len == 2) {
+		if ((list[0] = strdup(list[1])) == NULL)
+			goto out;
+		return list;
+	}
+	qsort(&list[1], len - 1, sizeof(*list),
+	    (int (*)(const void *, const void *)) strcmp);
+	min = SIZE_MAX;
+	for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
+		b = list[i + 1];
+		for (j = 0; a[j] && a[j] == b[j]; j++)
+			continue;
+		if (min > j)
+			min = j;
+	}
+	if (min == 0 && *str) {
+		if ((list[0] = strdup(str)) == NULL)
+			goto out;
+	} else {
+		if ((list[0] = el_calloc(min + 1, sizeof(*list[0]))) == NULL)
+			goto out;
+		(void)memcpy(list[0], list[1], min);
+		list[0][min] = '\0';
+	}
+	return list;
+
+out:
+	el_free(list);
+	return NULL;
+}
+
+char *
+rl_filename_completion_function (const char *text, int state)
+{
+	return fn_filename_completion_function(text, state);
+}
+
+void
+rl_forced_update_display(void)
+{
+	el_set(e, EL_REFRESH);
+}
+
+int
+_rl_abort_internal(void)
+{
+	el_beep(e);
+	longjmp(topbuf, 1);
+	/*NOTREACHED*/
+}
+
+int
+_rl_qsort_string_compare(char **s1, char **s2)
+{
+	return strcoll(*s1, *s2);
+}
+
+HISTORY_STATE *
+history_get_history_state(void)
+{
+	HISTORY_STATE *hs;
+
+	if ((hs = el_malloc(sizeof(*hs))) == NULL)
+		return NULL;
+	hs->length = history_length;
+	return hs;
+}
+
+int
+/*ARGSUSED*/
+rl_kill_text(int from __attribute__((__unused__)),
+    int to __attribute__((__unused__)))
+{
+	return 0;
+}
+
+Keymap
+rl_make_bare_keymap(void)
+{
+	return NULL;
+}
+
+Keymap
+rl_get_keymap(void)
+{
+	return NULL;
+}
+
+void
+/*ARGSUSED*/
+rl_set_keymap(Keymap k __attribute__((__unused__)))
+{
+}
+
+int
+/*ARGSUSED*/
+rl_generic_bind(int type __attribute__((__unused__)),
+    const char * keyseq __attribute__((__unused__)),
+    const char * data __attribute__((__unused__)),
+    Keymap k __attribute__((__unused__)))
+{
+	return 0;
+}
+
+int
+/*ARGSUSED*/
+rl_bind_key_in_map(int key __attribute__((__unused__)),
+    rl_command_func_t *fun __attribute__((__unused__)),
+    Keymap k __attribute__((__unused__)))
+{
+	return 0;
+}
+
+int
+rl_set_key(const char *keyseq  __attribute__((__unused__)),
+	rl_command_func_t *function __attribute__((__unused__)),
+	Keymap k __attribute__((__unused__)))
+{
+	return 0;
+}
+
+/* unsupported, but needed by python */
+void
+rl_cleanup_after_signal(void)
+{
+}
+
+int
+rl_on_new_line(void)
+{
+	return 0;
+}
+
+void
+rl_free_line_state(void)
+{
+}
+
+int
+/*ARGSUSED*/
+rl_set_keyboard_input_timeout(int u __attribute__((__unused__)))
+{
+	return 0;
+}
+
+void
+rl_resize_terminal(void)
+{
+	el_resize(e);
+}
+
+void
+rl_reset_after_signal(void)
+{
+	if (rl_prep_term_function)
+		(*rl_prep_term_function)();
+}
+
+void
+rl_echo_signal_char(int sig)
+{
+	int c = tty_get_signal_character(e, sig);
+	if (c == -1)
+		return;
+	re_putc(e, c, 0);
+}
+
+int
+rl_crlf(void)
+{
+	re_putc(e, '\n', 0);
+	return 0;
+}
+
+int
+rl_ding(void)
+{
+	re_putc(e, '\a', 0);
+	return 0;
+}
+
+int
+rl_abort(int count, int key)
+{
+	return count && key ? 0 : 0;
+}
+
+int
+rl_set_keymap_name(const char *name, Keymap k)
+{
+	return name && k ? 0 : 0;
+}
+
+histdata_t
+free_history_entry(HIST_ENTRY *he)
+{
+	return he ? NULL : NULL;
+}
+
+void
+_rl_erase_entire_line(void)
+{
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/reallocarr.c b/extra/libedit/libedit-20221030-3.1/src/reallocarr.c
new file mode 100644
index 000000000000..549573af8cce
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/reallocarr.c
@@ -0,0 +1,96 @@
+/* $NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * 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 HOLDERS 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.
+ */
+
+#if !HAVE_REALLOCARR
+
+#include "config.h"
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+__RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $");
+
+#include <errno.h>
+/* Old POSIX has SIZE_MAX in limits.h */
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _LIBC
+#ifdef __weak_alias
+__weak_alias(reallocarr, _reallocarr)
+#endif
+#endif
+
+#define SQRT_SIZE_MAX (((size_t)1) << (sizeof(size_t) * CHAR_BIT / 2))
+
+int
+reallocarr(void *ptr, size_t number, size_t size)
+{
+	int saved_errno, result;
+	void *optr;
+	void *nptr;
+
+	saved_errno = errno;
+	memcpy(&optr, ptr, sizeof(ptr));
+	if (number == 0 || size == 0) {
+		free(optr);
+		nptr = NULL;
+		memcpy(ptr, &nptr, sizeof(ptr));
+		errno = saved_errno;
+		return 0;
+	}
+
+	/*
+	 * Try to avoid division here.
+	 *
+	 * It isn't possible to overflow during multiplication if neither
+	 * operand uses any of the most significant half of the bits.
+	 */
+	if ((number|size) >= SQRT_SIZE_MAX &&
+	                    number > SIZE_MAX / size) {
+		errno = saved_errno;
+		return EOVERFLOW;
+	}
+
+	nptr = realloc(optr, number * size);
+	if (nptr == NULL) {
+		result = errno;
+	} else {
+		result = 0;
+		memcpy(ptr, &nptr, sizeof(ptr));
+	}
+	errno = saved_errno;
+	return result;
+}
+#endif
diff --git a/cmd-line-utils/libedit/refresh.c b/extra/libedit/libedit-20221030-3.1/src/refresh.c
similarity index 85%
rename from cmd-line-utils/libedit/refresh.c
rename to extra/libedit/libedit-20221030-3.1/src/refresh.c
index 64057eaabfe7..26a49fe751c6 100644
--- a/cmd-line-utils/libedit/refresh.c
+++ b/extra/libedit/libedit-20221030-3.1/src/refresh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp $	*/
+/*	$NetBSD: refresh.c,v 1.58 2021/09/09 20:24:07 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: refresh.c,v 1.58 2021/09/09 20:24:07 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -44,26 +45,26 @@ static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
  * refresh.c: Lower level screen refreshing functions
  */
 #include <stdio.h>
-#include <ctype.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "el.h"
 
-private void	re_nextline(EditLine *);
-private void	re_addc(EditLine *, Int);
-private void	re_update_line(EditLine *, Char *, Char *, int);
-private void	re_insert (EditLine *, Char *, int, int, Char *, int);
-private void	re_delete(EditLine *, Char *, int, int, int);
-private void	re_fastputc(EditLine *, Int);
-private void	re_clear_eol(EditLine *, int, int, int);
-private void	re__strncopy(Char *, Char *, size_t);
-private void	re__copy_and_pad(Char *, const Char *, size_t);
+static void	re_nextline(EditLine *);
+static void	re_addc(EditLine *, wint_t);
+static void	re_update_line(EditLine *, wchar_t *, wchar_t *, int);
+static void	re_insert (EditLine *, wchar_t *, int, int, wchar_t *, int);
+static void	re_delete(EditLine *, wchar_t *, int, int, int);
+static void	re_fastputc(EditLine *, wint_t);
+static void	re_clear_eol(EditLine *, int, int, int);
+static void	re__strncopy(wchar_t *, wchar_t *, size_t);
+static void	re__copy_and_pad(wchar_t *, const wchar_t *, size_t);
 
 #ifdef DEBUG_REFRESH
-private void	re_printstr(EditLine *, const char *, char *, char *);
+static void	re_printstr(EditLine *, const char *, wchar_t *, wchar_t *);
 #define	__F el->el_errfile
-#define	ELRE_ASSERT(a, b, c)	do 				\
+#define	ELRE_ASSERT(a, b, c)	do				\
 				    if (/*CONSTCOND*/ a) {	\
 					(void) fprintf b;	\
 					c;			\
@@ -74,8 +75,8 @@ private void	re_printstr(EditLine *, const char *, char *, char *);
 /* re_printstr():
  *	Print a string on the debugging pty
  */
-private void
-re_printstr(EditLine *el, const char *str, char *f, char *t)
+static void
+re_printstr(EditLine *el, const char *str, wchar_t *f, wchar_t *t)
 {
 
 	ELRE_DEBUG(1, (__F, "%s:\"", str));
@@ -91,7 +92,7 @@ re_printstr(EditLine *el, const char *str, char *f, char *t)
 /* re_nextline():
  *	Move to the next line or scroll
  */
-private void
+static void
 re_nextline(EditLine *el)
 {
 	el->el_refresh.r_cursor.h = 0;	/* reset it. */
@@ -104,12 +105,12 @@ re_nextline(EditLine *el)
 	 */
 	if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) {
 		int i, lins = el->el_terminal.t_size.v;
-		Char *firstline = el->el_vdisplay[0];
+		wint_t *firstline = el->el_vdisplay[0];
 
 		for(i = 1; i < lins; i++)
 			el->el_vdisplay[i - 1] = el->el_vdisplay[i];
 
-		firstline[0] = '\0';		/* empty the string */	
+		firstline[0] = '\0';		/* empty the string */
 		el->el_vdisplay[i - 1] = firstline;
 	} else
 		el->el_refresh.r_cursor.v++;
@@ -123,10 +124,10 @@ re_nextline(EditLine *el)
 /* re_addc():
  *	Draw c, expanding tabs, control chars etc.
  */
-private void
-re_addc(EditLine *el, Int c)
+static void
+re_addc(EditLine *el, wint_t c)
 {
-	switch (ct_chr_class((Char)c)) {
+	switch (ct_chr_class(c)) {
 	case CHTYPE_TAB:        /* expand the tab */
 		for (;;) {
 			re_putc(el, ' ', 1);
@@ -145,9 +146,9 @@ re_addc(EditLine *el, Int c)
 		re_putc(el, c, 1);
 		break;
 	default: {
-		Char visbuf[VISUAL_WIDTH_MAX];
+		wchar_t visbuf[VISUAL_WIDTH_MAX];
 		ssize_t i, n =
-		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c);
+		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
 		for (i = 0; n-- > 0; ++i)
 		    re_putc(el, visbuf[i], 1);
 		break;
@@ -155,35 +156,66 @@ re_addc(EditLine *el, Int c)
 	}
 }
 
+/* re_putliteral():
+ *	Place the literal string given
+ */
+libedit_private void
+re_putliteral(EditLine *el, const wchar_t *begin, const wchar_t *end)
+{
+	coord_t *cur = &el->el_refresh.r_cursor;
+	wint_t c;
+	int sizeh = el->el_terminal.t_size.h;
+	int i, w;
+
+	c = literal_add(el, begin, end, &w);
+	if (c == 0 || w <= 0)
+		return;
+	el->el_vdisplay[cur->v][cur->h] = c;
+
+	i = w;
+	if (i > sizeh - cur->h)		/* avoid overflow */
+		i = sizeh - cur->h;
+	while (--i > 0)
+		el->el_vdisplay[cur->v][cur->h + i] = MB_FILL_CHAR;
+
+	cur->h += w;
+	if (cur->h >= sizeh) {
+		/* assure end of line */
+		el->el_vdisplay[cur->v][sizeh] = '\0';
+		re_nextline(el);
+	}
+}
 
 /* re_putc():
  *	Draw the character given
  */
-protected void
-re_putc(EditLine *el, Int c, int shift)
+libedit_private void
+re_putc(EditLine *el, wint_t c, int shift)
 {
-	int i, w = Width(c);
-	ELRE_DEBUG(1, (__F, "printing %5x '%c'\r\n", c, c));
+	coord_t *cur = &el->el_refresh.r_cursor;
+	int i, w = wcwidth(c);
+	int sizeh = el->el_terminal.t_size.h;
 
-	while (shift && (el->el_refresh.r_cursor.h + w > el->el_terminal.t_size.h))
+	ELRE_DEBUG(1, (__F, "printing %5x '%lc'\r\n", c, c));
+	if (w == -1)
+		w = 0;
+
+	while (shift && (cur->h + w > sizeh))
 	    re_putc(el, ' ', 1);
 
-	el->el_vdisplay[el->el_refresh.r_cursor.v]
-	    [el->el_refresh.r_cursor.h] = c;
+	el->el_vdisplay[cur->v][cur->h] = c;
 	/* assumes !shift is only used for single-column chars */
 	i = w;
 	while (--i > 0)
-		el->el_vdisplay[el->el_refresh.r_cursor.v]
-		    [el->el_refresh.r_cursor.h + i] = MB_FILL_CHAR;
+		el->el_vdisplay[cur->v][cur->h + i] = MB_FILL_CHAR;
 
 	if (!shift)
 		return;
 
-	el->el_refresh.r_cursor.h += w;	/* advance to next place */
-	if (el->el_refresh.r_cursor.h >= el->el_terminal.t_size.h) {
+	cur->h += w;	/* advance to next place */
+	if (cur->h >= sizeh) {
 		/* assure end of line */
-		el->el_vdisplay[el->el_refresh.r_cursor.v][el->el_terminal.t_size.h]
-		    = '\0';
+		el->el_vdisplay[cur->v][sizeh] = '\0';
 		re_nextline(el);
 	}
 }
@@ -191,27 +223,30 @@ re_putc(EditLine *el, Int c, int shift)
 
 /* re_refresh():
  *	draws the new virtual screen image from the current input
- *  	line, then goes line-by-line changing the real image to the new
+ *	line, then goes line-by-line changing the real image to the new
  *	virtual image. The routine to re-draw a line can be replaced
  *	easily in hopes of a smarter one being placed there.
  */
-protected void
+libedit_private void
 re_refresh(EditLine *el)
 {
 	int i, rhdiff;
-	Char *cp, *st;
+	wchar_t *cp, *st;
 	coord_t cur;
 #ifdef notyet
 	size_t termsz;
 #endif
 
-	ELRE_DEBUG(1, (__F, "el->el_line.buffer = :%s:\r\n",
+	ELRE_DEBUG(1, (__F, "el->el_line.buffer = :%ls:\r\n",
 	    el->el_line.buffer));
 
+	literal_clear(el);
 	/* reset the Drawing cursor */
 	el->el_refresh.r_cursor.h = 0;
 	el->el_refresh.r_cursor.v = 0;
 
+	terminal_move_to_char(el, 0);
+
 	/* temporarily draw rprompt to calculate its size */
 	prompt_print(el, EL_RPROMPT);
 
@@ -251,7 +286,7 @@ re_refresh(EditLine *el)
 
 	for (cp = st; cp < el->el_line.lastchar; cp++) {
 		if (cp == el->el_line.cursor) {
-                        int w = Width(*cp);
+                        int w = wcwidth(*cp);
 			/* save for later */
 			cur.h = el->el_refresh.r_cursor.h;
 			cur.v = el->el_refresh.r_cursor.v;
@@ -293,12 +328,14 @@ re_refresh(EditLine *el)
 	ELRE_DEBUG(1, (__F,
 		"term.h=%d vcur.h=%d vcur.v=%d vdisplay[0]=\r\n:%80.80s:\r\n",
 		el->el_terminal.t_size.h, el->el_refresh.r_cursor.h,
-		el->el_refresh.r_cursor.v, ct_encode_string(el->el_vdisplay[0])));
+		el->el_refresh.r_cursor.v, ct_encode_string(el->el_vdisplay[0],
+		&el->el_scratch)));
 
 	ELRE_DEBUG(1, (__F, "updating %d lines.\r\n", el->el_refresh.r_newcv));
 	for (i = 0; i <= el->el_refresh.r_newcv; i++) {
 		/* NOTE THAT re_update_line MAY CHANGE el_display[i] */
-		re_update_line(el, el->el_display[i], el->el_vdisplay[i], i);
+		re_update_line(el, (wchar_t *)el->el_display[i],
+		    (wchar_t *)el->el_vdisplay[i], i);
 
 		/*
 		 * Copy the new line to be the current one, and pad out with
@@ -307,7 +344,8 @@ re_refresh(EditLine *el)
 		 * end of the screen line, it won't be a NUL or some old
 		 * leftover stuff.
 		 */
-		re__copy_and_pad(el->el_display[i], el->el_vdisplay[i],
+		re__copy_and_pad((wchar_t *)el->el_display[i],
+		    (wchar_t *)el->el_vdisplay[i],
 		    (size_t) el->el_terminal.t_size.h);
 	}
 	ELRE_DEBUG(1, (__F,
@@ -318,10 +356,11 @@ re_refresh(EditLine *el)
 		for (; i <= el->el_refresh.r_oldcv; i++) {
 			terminal_move_to_line(el, i);
 			terminal_move_to_char(el, 0);
-                        /* This Strlen should be safe even with MB_FILL_CHARs */
-			terminal_clear_EOL(el, (int) Strlen(el->el_display[i]));
+                        /* This wcslen should be safe even with MB_FILL_CHARs */
+			terminal_clear_EOL(el,
+			    (int) wcslen((const wchar_t *)el->el_display[i]));
 #ifdef DEBUG_REFRESH
-			terminal_overwrite(el, "C\b", (size_t)2);
+			terminal_overwrite(el, L"C\b", 2);
 #endif /* DEBUG_REFRESH */
 			el->el_display[i][0] = '\0';
 		}
@@ -339,7 +378,7 @@ re_refresh(EditLine *el)
 /* re_goto_bottom():
  *	 used to go to last used screen line
  */
-protected void
+libedit_private void
 re_goto_bottom(EditLine *el)
 {
 
@@ -354,12 +393,12 @@ re_goto_bottom(EditLine *el)
  *	insert num characters of s into d (in front of the character)
  *	at dat, maximum length of d is dlen
  */
-private void
+static void
 /*ARGSUSED*/
 re_insert(EditLine *el __attribute__((__unused__)),
-    Char *d, int dat, int dlen, Char *s, int num)
+    wchar_t *d, int dat, int dlen, wchar_t *s, int num)
 {
-	Char *a, *b;
+	wchar_t *a, *b;
 
 	if (num <= 0)
 		return;
@@ -368,8 +407,9 @@ re_insert(EditLine *el __attribute__((__unused__)),
 
 	ELRE_DEBUG(1,
 	    (__F, "re_insert() starting: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
-	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s)));
+	    num, dat, dlen, ct_encode_string(d, &el->el_scratch)));
+	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s,
+	    &el->el_scratch)));
 
 	/* open up the space for num chars */
 	if (num > 0) {
@@ -382,8 +422,9 @@ re_insert(EditLine *el __attribute__((__unused__)),
 
 	ELRE_DEBUG(1, (__F,
 		"re_insert() after insert: %d at %d max %d, d == \"%s\"\n",
-		num, dat, dlen, ct_encode_string(d)));
-	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s)));
+		num, dat, dlen, ct_encode_string(d, &el->el_scratch)));
+	ELRE_DEBUG(1, (__F, "s == \"%s\"\n", ct_encode_string(s,
+		&el->el_scratch)));
 
 	/* copy the characters */
 	for (a = d + dat; (a < d + dlen) && (num > 0); num--)
@@ -403,12 +444,12 @@ re_insert(EditLine *el __attribute__((__unused__)),
 /* re_delete():
  *	delete num characters d at dat, maximum length of d is dlen
  */
-private void
+static void
 /*ARGSUSED*/
 re_delete(EditLine *el __attribute__((__unused__)),
-    Char *d, int dat, int dlen, int num)
+    wchar_t *d, int dat, int dlen, int num)
 {
-	Char *a, *b;
+	wchar_t *a, *b;
 
 	if (num <= 0)
 		return;
@@ -418,7 +459,7 @@ re_delete(EditLine *el __attribute__((__unused__)),
 	}
 	ELRE_DEBUG(1,
 	    (__F, "re_delete() starting: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
+	    num, dat, dlen, ct_encode_string(d, &el->el_scratch)));
 
 	/* open up the space for num chars */
 	if (num > 0) {
@@ -430,15 +471,15 @@ re_delete(EditLine *el __attribute__((__unused__)),
 	}
 	ELRE_DEBUG(1,
 	    (__F, "re_delete() after delete: %d at %d max %d, d == \"%s\"\n",
-	    num, dat, dlen, ct_encode_string(d)));
+	    num, dat, dlen, ct_encode_string(d, &el->el_scratch)));
 }
 
 
 /* re__strncopy():
  *	Like strncpy without padding.
  */
-private void
-re__strncopy(Char *a, Char *b, size_t n)
+static void
+re__strncopy(wchar_t *a, wchar_t *b, size_t n)
 {
 
 	while (n-- && *b)
@@ -450,9 +491,9 @@ re__strncopy(Char *a, Char *b, size_t n)
  *	in order to make sure that we have cleared the previous contents of
  *	the line. fx and sx is the number of characters inserted or deleted
  *	in the first or second diff, diff is the difference between the
- * 	number of characters between the new and old line.
+ *	number of characters between the new and old line.
  */
-private void
+static void
 re_clear_eol(EditLine *el, int fx, int sx, int diff)
 {
 
@@ -496,12 +537,12 @@ new:	eddie> Oh, my little buggy says to me, as lurgid as
  */
 #define	MIN_END_KEEP	4
 
-private void
-re_update_line(EditLine *el, Char *old, Char *new, int i)
+static void
+re_update_line(EditLine *el, wchar_t *old, wchar_t *new, int i)
 {
-	Char *o, *n, *p, c;
-	Char *ofd, *ols, *oe, *nfd, *nls, *ne;
-	Char *osb, *ose, *nsb, *nse;
+	wchar_t *o, *n, *p, c;
+	wchar_t *ofd, *ols, *oe, *nfd, *nls, *ne;
+	wchar_t *osb, *ose, *nsb, *nse;
 	int fx, sx;
 	size_t len;
 
@@ -558,7 +599,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 	nls = ++n;
 
 	/*
-         * find same begining and same end
+         * find same beginning and same end
          */
 	osb = ols;
 	nsb = nls;
@@ -688,9 +729,9 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 	sx = (int)((nls - nse) - (ols - ose));
 
 	ELRE_DEBUG(1, (__F, "fx %d, sx %d\n", fx, sx));
-	ELRE_DEBUG(1, (__F, "ofd %d, osb %d, ose %d, ols %d, oe %d\n",
+	ELRE_DEBUG(1, (__F, "ofd %td, osb %td, ose %td, ols %td, oe %td\n",
 		ofd - old, osb - old, ose - old, ols - old, oe - old));
-	ELRE_DEBUG(1, (__F, "nfd %d, nsb %d, nse %d, nls %d, ne %d\n",
+	ELRE_DEBUG(1, (__F, "nfd %td, nsb %td, nse %td, nls %td, ne %td\n",
 		nfd - new, nsb - new, nse - new, nls - new, ne - new));
 	ELRE_DEBUG(1, (__F,
 		"xxx-xxx:\"00000000001111111111222222222233333333334\"\r\n"));
@@ -764,7 +805,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 	if ((nsb != nfd) && fx > 0 &&
 	    ((p - old) + fx <= el->el_terminal.t_size.h)) {
 		ELRE_DEBUG(1,
-		    (__F, "first diff insert at %d...\r\n", nfd - new));
+		    (__F, "first diff insert at %td...\r\n", nfd - new));
 		/*
 		 * Move to the first char to insert, where the first diff is.
 		 */
@@ -803,7 +844,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 		}
 	} else if (fx < 0) {
 		ELRE_DEBUG(1,
-		    (__F, "first diff delete at %d...\r\n", ofd - old));
+		    (__F, "first diff delete at %td...\r\n", ofd - old));
 		/*
 		 * move to the first char to delete where the first diff is
 		 */
@@ -850,7 +891,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 
 	if (sx < 0 && (ose - old) + fx < el->el_terminal.t_size.h) {
 		ELRE_DEBUG(1, (__F,
-		    "second diff delete at %d...\r\n", (ose - old) + fx));
+		    "second diff delete at %td...\r\n", (ose - old) + fx));
 		/*
 		 * Check if we have stuff to delete
 		 */
@@ -888,7 +929,7 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
          * if we have a first insert AND WE HAVEN'T ALREADY DONE IT...
          */
 	if ((nsb != nfd) && (osb - ofd) <= (nsb - nfd) && (fx == 0)) {
-		ELRE_DEBUG(1, (__F, "late first diff insert at %d...\r\n",
+		ELRE_DEBUG(1, (__F, "late first diff insert at %td...\r\n",
 		    nfd - new));
 
 		terminal_move_to_char(el, (int)(nfd - new));
@@ -966,8 +1007,8 @@ re_update_line(EditLine *el, Char *old, Char *new, int i)
 /* re__copy_and_pad():
  *	Copy string and pad with spaces
  */
-private void
-re__copy_and_pad(Char *dst, const Char *src, size_t width)
+static void
+re__copy_and_pad(wchar_t *dst, const wchar_t *src, size_t width)
 {
 	size_t i;
 
@@ -987,10 +1028,10 @@ re__copy_and_pad(Char *dst, const Char *src, size_t width)
 /* re_refresh_cursor():
  *	Move to the new cursor position
  */
-protected void
+libedit_private void
 re_refresh_cursor(EditLine *el)
 {
-	Char *cp;
+	wchar_t *cp;
 	int h, v, th, w;
 
 	if (el->el_line.cursor >= el->el_line.lastchar) {
@@ -1018,7 +1059,7 @@ re_refresh_cursor(EditLine *el)
 				continue;
 			break;
 		default:
-			w = Width(*cp);
+			w = wcwidth(*cp);
 			if (w > 1 && h + w > th) { /* won't fit on line */
 				h = 0;
 				v++;
@@ -1034,7 +1075,7 @@ re_refresh_cursor(EditLine *el)
 	}
         /* if we have a next character, and it's a doublewidth one, we need to
          * check whether we need to linebreak for it to fit */
-        if (cp < el->el_line.lastchar && (w = Width(*cp)) > 1)
+        if (cp < el->el_line.lastchar && (w = wcwidth(*cp)) > 1)
                 if (h + w > th) {
                     h = 0;
                     v++;
@@ -1050,10 +1091,13 @@ re_refresh_cursor(EditLine *el)
 /* re_fastputc():
  *	Add a character fast.
  */
-private void
-re_fastputc(EditLine *el, Int c)
+static void
+re_fastputc(EditLine *el, wint_t c)
 {
-	int w = Width((Char)c);
+	wint_t *lastline;
+	int w;
+
+	w = wcwidth(c);
 	while (w > 1 && el->el_cursor.h + w > el->el_terminal.t_size.h)
 	    re_fastputc(el, ' ');
 
@@ -1075,17 +1119,19 @@ re_fastputc(EditLine *el, Int c)
 		 */
 		if (el->el_cursor.v + 1 >= el->el_terminal.t_size.v) {
 			int i, lins = el->el_terminal.t_size.v;
-			Char *firstline = el->el_display[0];
-	
+
+			lastline = el->el_display[0];
 			for(i = 1; i < lins; i++)
 				el->el_display[i - 1] = el->el_display[i];
 
-			re__copy_and_pad(firstline, STR(""), (size_t)0);
-			el->el_display[i - 1] = firstline;
+			el->el_display[i - 1] = lastline;
 		} else {
 			el->el_cursor.v++;
-			el->el_refresh.r_oldcv++;
+			lastline = el->el_display[++el->el_refresh.r_oldcv];
 		}
+		re__copy_and_pad((wchar_t *)lastline, L"",
+		    (size_t)el->el_terminal.t_size.h);
+
 		if (EL_HAS_AUTO_MARGINS) {
 			if (EL_HAS_MAGIC_MARGINS) {
 				terminal__putc(el, ' ');
@@ -1103,10 +1149,10 @@ re_fastputc(EditLine *el, Int c)
  *	we added just one char, handle it fast.
  *	Assumes that screen cursor == real cursor
  */
-protected void
+libedit_private void
 re_fastaddc(EditLine *el)
 {
-	Char c;
+	wchar_t c;
 	int rhdiff;
 
 	c = el->el_line.cursor[-1];
@@ -1130,9 +1176,9 @@ re_fastaddc(EditLine *el)
 		break;
 	case CHTYPE_ASCIICTL:
 	case CHTYPE_NONPRINT: {
-		Char visbuf[VISUAL_WIDTH_MAX];
+		wchar_t visbuf[VISUAL_WIDTH_MAX];
 		ssize_t i, n =
-		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, (Char)c);
+		    ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
 		for (i = 0; n-- > 0; ++i)
 			re_fastputc(el, visbuf[i]);
 		break;
@@ -1145,7 +1191,7 @@ re_fastaddc(EditLine *el)
 /* re_clear_display():
  *	clear the screen buffers so that new new prompt starts fresh.
  */
-protected void
+libedit_private void
 re_clear_display(EditLine *el)
 {
 	int i;
@@ -1161,7 +1207,7 @@ re_clear_display(EditLine *el)
 /* re_clear_lines():
  *	Make sure all lines are *really* blank
  */
-protected void
+libedit_private void
 re_clear_lines(EditLine *el)
 {
 
diff --git a/cmd-line-utils/libedit/refresh.h b/extra/libedit/libedit-20221030-3.1/src/refresh.h
similarity index 80%
rename from cmd-line-utils/libedit/refresh.h
rename to extra/libedit/libedit-20221030-3.1/src/refresh.h
index f80be4635456..22e4ccb9dc8f 100644
--- a/cmd-line-utils/libedit/refresh.h
+++ b/extra/libedit/libedit-20221030-3.1/src/refresh.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: refresh.h,v 1.6 2009/12/30 22:37:40 christos Exp $	*/
+/*	$NetBSD: refresh.h,v 1.11 2017/06/27 23:23:48 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,20 +40,20 @@
 #ifndef _h_el_refresh
 #define	_h_el_refresh
 
-#include "histedit.h"
-
 typedef struct {
 	coord_t	r_cursor;	/* Refresh cursor position	*/
 	int	r_oldcv;	/* Vertical locations		*/
 	int	r_newcv;
 } el_refresh_t;
 
-protected void	re_putc(EditLine *, Int, int);
-protected void	re_clear_lines(EditLine *);
-protected void	re_clear_display(EditLine *);
-protected void	re_refresh(EditLine *);
-protected void	re_refresh_cursor(EditLine *);
-protected void	re_fastaddc(EditLine *);
-protected void	re_goto_bottom(EditLine *);
+libedit_private void	re_putc(EditLine *, wint_t, int);
+libedit_private void	re_putliteral(EditLine *, const wchar_t *,
+    const wchar_t *);
+libedit_private void	re_clear_lines(EditLine *);
+libedit_private void	re_clear_display(EditLine *);
+libedit_private void	re_refresh(EditLine *);
+libedit_private void	re_refresh_cursor(EditLine *);
+libedit_private void	re_fastaddc(EditLine *);
+libedit_private void	re_goto_bottom(EditLine *);
 
 #endif /* _h_el_refresh */
diff --git a/cmd-line-utils/libedit/search.c b/extra/libedit/libedit-20221030-3.1/src/search.c
similarity index 85%
rename from cmd-line-utils/libedit/search.c
rename to extra/libedit/libedit-20221030-3.1/src/search.c
index 2324cc94d76e..b8b70b6f09f5 100644
--- a/cmd-line-utils/libedit/search.c
+++ b/extra/libedit/libedit-20221030-3.1/src/search.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $	*/
+/*	$NetBSD: search.c,v 1.51 2020/03/30 06:56:38 ryo Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: search.c,v 1.51 2020/03/30 06:56:38 ryo Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -44,12 +45,17 @@ static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
  * search.c: History and character search functions
  */
 #include <stdlib.h>
+#include <sys/types.h>
+#include <string.h>
 #if defined(REGEX)
 #include <regex.h>
 #elif defined(REGEXP)
 #include <regexp.h>
 #endif
+
 #include "el.h"
+#include "common.h"
+#include "fcns.h"
 
 /*
  * Adjust cursor in vi mode to include the character under it
@@ -61,17 +67,18 @@ static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 /* search_init():
  *	Initialize the search stuff
  */
-protected int
+libedit_private int
 search_init(EditLine *el)
 {
 
-	el->el_search.patbuf = el_malloc(EL_BUFSIZ *
+	el->el_search.patbuf = el_calloc(EL_BUFSIZ,
 	    sizeof(*el->el_search.patbuf));
 	if (el->el_search.patbuf == NULL)
 		return -1;
+	el->el_search.patbuf[0] = L'\0';
 	el->el_search.patlen = 0;
 	el->el_search.patdir = -1;
-	el->el_search.chacha = '\0';
+	el->el_search.chacha = L'\0';
 	el->el_search.chadir = CHAR_FWD;
 	el->el_search.chatflg = 0;
 	return 0;
@@ -81,7 +88,7 @@ search_init(EditLine *el)
 /* search_end():
  *	Initialize the search stuff
  */
-protected void
+libedit_private void
 search_end(EditLine *el)
 {
 
@@ -94,7 +101,7 @@ search_end(EditLine *el)
 /* regerror():
  *	Handle regular expression errors
  */
-public void
+void
 /*ARGSUSED*/
 regerror(const char *msg)
 {
@@ -105,12 +112,10 @@ regerror(const char *msg)
 /* el_match():
  *	Return if string matches pattern
  */
-protected int
-el_match(const Char *str, const Char *pat)
+libedit_private int
+el_match(const wchar_t *str, const wchar_t *pat)
 {
-#ifdef WIDECHAR
 	static ct_buffer_t conv;
-#endif
 #if defined (REGEX)
 	regex_t re;
 	int rv;
@@ -122,7 +127,7 @@ el_match(const Char *str, const Char *pat)
 	extern int	 re_exec(const char *);
 #endif
 
-	if (Strstr(str, pat) != 0)
+	if (wcsstr(str, pat) != 0)
 		return 1;
 
 #if defined(REGEX)
@@ -146,7 +151,7 @@ el_match(const Char *str, const Char *pat)
 	if (re_comp(ct_encode_string(pat, &conv)) != NULL)
 		return 0;
 	else
-		return re_exec(ct_encode_string(str, &conv) == 1);
+		return re_exec(ct_encode_string(str, &conv)) == 1;
 #endif
 }
 
@@ -154,11 +159,11 @@ el_match(const Char *str, const Char *pat)
 /* c_hmatch():
  *	 return True if the pattern matches the prefix
  */
-protected int
-c_hmatch(EditLine *el, const Char *str)
+libedit_private int
+c_hmatch(EditLine *el, const wchar_t *str)
 {
 #ifdef SDEBUG
-	(void) fprintf(el->el_errfile, "match `%s' with `%s'\n",
+	(void) fprintf(el->el_errfile, "match `%ls' with `%ls'\n",
 	    el->el_search.patbuf, str);
 #endif /* SDEBUG */
 
@@ -169,7 +174,7 @@ c_hmatch(EditLine *el, const Char *str)
 /* c_setpat():
  *	Set the history seatch pattern
  */
-protected void
+libedit_private void
 c_setpat(EditLine *el)
 {
 	if (el->el_state.lastcmd != ED_SEARCH_PREV_HISTORY &&
@@ -178,20 +183,17 @@ c_setpat(EditLine *el)
 		    (size_t)(EL_CURSOR(el) - el->el_line.buffer);
 		if (el->el_search.patlen >= EL_BUFSIZ)
 			el->el_search.patlen = EL_BUFSIZ - 1;
-		if (el->el_search.patlen != 0) {
-			(void) Strncpy(el->el_search.patbuf, el->el_line.buffer,
-			    el->el_search.patlen);
-			el->el_search.patbuf[el->el_search.patlen] = '\0';
-		} else
-			el->el_search.patlen = Strlen(el->el_search.patbuf);
+		(void) wcsncpy(el->el_search.patbuf, el->el_line.buffer,
+		    el->el_search.patlen);
+		el->el_search.patbuf[el->el_search.patlen] = '\0';
 	}
 #ifdef SDEBUG
 	(void) fprintf(el->el_errfile, "\neventno = %d\n",
 	    el->el_history.eventno);
-	(void) fprintf(el->el_errfile, "patlen = %d\n", el->el_search.patlen);
-	(void) fprintf(el->el_errfile, "patbuf = \"%s\"\n",
+	(void) fprintf(el->el_errfile, "patlen = %ld\n", el->el_search.patlen);
+	(void) fprintf(el->el_errfile, "patbuf = \"%ls\"\n",
 	    el->el_search.patbuf);
-	(void) fprintf(el->el_errfile, "cursor %d lastchar %d\n",
+	(void) fprintf(el->el_errfile, "cursor %ld lastchar %ld\n",
 	    EL_CURSOR(el) - el->el_line.buffer,
 	    el->el_line.lastchar - el->el_line.buffer);
 #endif
@@ -201,15 +203,14 @@ c_setpat(EditLine *el)
 /* ce_inc_search():
  *	Emacs incremental search
  */
-protected el_action_t
+libedit_private el_action_t
 ce_inc_search(EditLine *el, int dir)
 {
-	static const Char STRfwd[] = {'f', 'w', 'd', '\0'},
-	     STRbck[] = {'b', 'c', 'k', '\0'};
-	static Char pchar = ':';/* ':' = normal, '?' = failed */
-	static Char endcmd[2] = {'\0', '\0'};
-	Char ch, *ocursor = el->el_line.cursor, oldpchar = pchar;
-	const Char *cp;
+	static const wchar_t STRfwd[] = L"fwd", STRbck[] = L"bck";
+	static wchar_t pchar = L':';  /* ':' = normal, '?' = failed */
+	static wchar_t endcmd[2] = {'\0', '\0'};
+	wchar_t *ocursor = el->el_line.cursor, oldpchar = pchar, ch;
+	const wchar_t *cp;
 
 	el_action_t ret = CC_NORM;
 
@@ -248,7 +249,7 @@ ce_inc_search(EditLine *el, int dir)
 		*el->el_line.lastchar = '\0';
 		re_refresh(el);
 
-		if (FUN(el,getc)(el, &ch) != 1)
+		if (el_wgetc(el, &ch) != 1)
 			return ed_end_of_file(el, 0);
 
 		switch (el->el_map.current[(unsigned char) ch]) {
@@ -324,7 +325,7 @@ ce_inc_search(EditLine *el, int dir)
 
 			default:	/* Terminate and execute cmd */
 				endcmd[0] = ch;
-				FUN(el,push)(el, endcmd);
+				el_wpush(el, endcmd);
 				/* FALLTHROUGH */
 
 			case 0033:	/* ESC: Terminate */
@@ -344,14 +345,14 @@ ce_inc_search(EditLine *el, int dir)
 
 			/* Can't search if unmatched '[' */
 			for (cp = &el->el_search.patbuf[el->el_search.patlen-1],
-			    ch = ']';
+			    ch = L']';
 			    cp >= &el->el_search.patbuf[LEN];
 			    cp--)
 				if (*cp == '[' || *cp == ']') {
 					ch = *cp;
 					break;
 				}
-			if (el->el_search.patlen > LEN && ch != '[') {
+			if (el->el_search.patlen > LEN && ch != L'[') {
 				if (redo && newdir == dir) {
 					if (pchar == '?') { /* wrap around */
 						el->el_history.eventno =
@@ -449,11 +450,11 @@ ce_inc_search(EditLine *el, int dir)
 /* cv_search():
  *	Vi search.
  */
-protected el_action_t
+libedit_private el_action_t
 cv_search(EditLine *el, int dir)
 {
-	Char ch;
-	Char tmpbuf[EL_BUFSIZ];
+	wchar_t ch;
+	wchar_t tmpbuf[EL_BUFSIZ];
 	ssize_t tmplen;
 
 #ifdef ANCHOR
@@ -465,7 +466,7 @@ cv_search(EditLine *el, int dir)
 	el->el_search.patdir = dir;
 
 	tmplen = c_gets(el, &tmpbuf[LEN],
-		dir == ED_SEARCH_PREV_HISTORY ? STR("\n/") : STR("\n?") );
+		dir == ED_SEARCH_PREV_HISTORY ? L"\n/" : L"\n?" );
 	if (tmplen == -1)
 		return CC_REFRESH;
 
@@ -484,11 +485,11 @@ cv_search(EditLine *el, int dir)
 #ifdef ANCHOR
 		if (el->el_search.patbuf[0] != '.' &&
 		    el->el_search.patbuf[0] != '*') {
-			(void) Strncpy(tmpbuf, el->el_search.patbuf,
+			(void) wcsncpy(tmpbuf, el->el_search.patbuf,
 			    sizeof(tmpbuf) / sizeof(*tmpbuf) - 1);
 			el->el_search.patbuf[0] = '.';
 			el->el_search.patbuf[1] = '*';
-			(void) Strncpy(&el->el_search.patbuf[2], tmpbuf,
+			(void) wcsncpy(&el->el_search.patbuf[2], tmpbuf,
 			    EL_BUFSIZ - 3);
 			el->el_search.patlen++;
 			el->el_search.patbuf[el->el_search.patlen++] = '.';
@@ -502,7 +503,7 @@ cv_search(EditLine *el, int dir)
 		tmpbuf[tmplen++] = '*';
 #endif
 		tmpbuf[tmplen] = '\0';
-		(void) Strncpy(el->el_search.patbuf, tmpbuf, EL_BUFSIZ - 1);
+		(void) wcsncpy(el->el_search.patbuf, tmpbuf, EL_BUFSIZ - 1);
 		el->el_search.patlen = (size_t)tmplen;
 	}
 	el->el_state.lastcmd = (el_action_t) dir;	/* avoid c_setpat */
@@ -523,12 +524,12 @@ cv_search(EditLine *el, int dir)
 /* ce_search_line():
  *	Look for a pattern inside a line
  */
-protected el_action_t
+libedit_private el_action_t
 ce_search_line(EditLine *el, int dir)
 {
-	Char *cp = el->el_line.cursor;
-	Char *pattern = el->el_search.patbuf;
-	Char oc, *ocp;
+	wchar_t *cp = el->el_line.cursor;
+	wchar_t *pattern = el->el_search.patbuf;
+	wchar_t oc, *ocp;
 #ifdef ANCHOR
 	ocp = &pattern[1];
 	oc = *ocp;
@@ -565,13 +566,14 @@ ce_search_line(EditLine *el, int dir)
 /* cv_repeat_srch():
  *	Vi repeat search
  */
-protected el_action_t
-cv_repeat_srch(EditLine *el, Int c)
+libedit_private el_action_t
+cv_repeat_srch(EditLine *el, wint_t c)
 {
 
 #ifdef SDEBUG
-	(void) fprintf(el->el_errfile, "dir %d patlen %d patbuf %s\n",
-	    c, el->el_search.patlen, ct_encode_string(el->el_search.patbuf));
+	static ct_buffer_t conv;
+	(void) fprintf(el->el_errfile, "dir %d patlen %ld patbuf %s\n",
+	    c, el->el_search.patlen, ct_encode_string(el->el_search.patbuf, &conv));
 #endif
 
 	el->el_state.lastcmd = (el_action_t) c;	/* Hack to stop c_setpat */
@@ -591,17 +593,17 @@ cv_repeat_srch(EditLine *el, Int c)
 /* cv_csearch():
  *	Vi character search
  */
-protected el_action_t
-cv_csearch(EditLine *el, int direction, Int ch, int count, int tflag)
+libedit_private el_action_t
+cv_csearch(EditLine *el, int direction, wint_t ch, int count, int tflag)
 {
-	Char *cp;
+	wchar_t *cp;
 
 	if (ch == 0)
 		return CC_ERROR;
 
-	if (ch == (Int)-1) {
-		Char c;
-		if (FUN(el,getc)(el, &c) != 1)
+	if (ch == (wint_t)-1) {
+		wchar_t c;
+		if (el_wgetc(el, &c) != 1)
 			return ed_end_of_file(el, 0);
 		ch = c;
 	}
@@ -613,14 +615,14 @@ cv_csearch(EditLine *el, int direction, Int ch, int count, int tflag)
 
 	cp = el->el_line.cursor;
 	while (count--) {
-		if ((Int)*cp == ch)
+		if ((wint_t)*cp == ch)
 			cp += direction;
 		for (;;cp += direction) {
 			if (cp >= el->el_line.lastchar)
 				return CC_ERROR;
 			if (cp < el->el_line.buffer)
 				return CC_ERROR;
-			if ((Int)*cp == ch)
+			if ((wint_t)*cp == ch)
 				break;
 		}
 	}
diff --git a/extra/libedit/libedit-20221030-3.1/src/search.h b/extra/libedit/libedit-20221030-3.1/src/search.h
new file mode 100644
index 000000000000..4ca39c4c00e9
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/search.h
@@ -0,0 +1,64 @@
+/*	$NetBSD: search.h,v 1.14 2016/05/09 21:46:56 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)search.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * el.search.h: Line and history searching utilities
+ */
+#ifndef _h_el_search
+#define	_h_el_search
+
+typedef struct el_search_t {
+	wchar_t	*patbuf;		/* The pattern buffer		*/
+	size_t	 patlen;		/* Length of the pattern buffer	*/
+	int	 patdir;		/* Direction of the last search	*/
+	int	 chadir;		/* Character search direction	*/
+	wchar_t	 chacha;		/* Character we are looking for	*/
+	char	 chatflg;		/* 0 if f, 1 if t */
+} el_search_t;
+
+
+libedit_private int		el_match(const wchar_t *, const wchar_t *);
+libedit_private int		search_init(EditLine *);
+libedit_private void		search_end(EditLine *);
+libedit_private int		c_hmatch(EditLine *, const wchar_t *);
+libedit_private void		c_setpat(EditLine *);
+libedit_private el_action_t	ce_inc_search(EditLine *, int);
+libedit_private el_action_t	cv_search(EditLine *, int);
+libedit_private el_action_t	ce_search_line(EditLine *, int);
+libedit_private el_action_t	cv_repeat_srch(EditLine *, wint_t);
+libedit_private el_action_t	cv_csearch(EditLine *, int, wint_t, int, int);
+
+#endif /* _h_el_search */
diff --git a/extra/libedit/libedit-20221030-3.1/src/shlib_version b/extra/libedit/libedit-20221030-3.1/src/shlib_version
new file mode 100644
index 000000000000..303609d268aa
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/shlib_version
@@ -0,0 +1,5 @@
+#	$NetBSD: shlib_version,v 1.19 2013/01/22 20:23:21 christos Exp $
+#	Remember to update distrib/sets/lists/base/shl.* when changing
+#
+major=3
+minor=1
diff --git a/cmd-line-utils/libedit/sig.c b/extra/libedit/libedit-20221030-3.1/src/sig.c
similarity index 92%
rename from cmd-line-utils/libedit/sig.c
rename to extra/libedit/libedit-20221030-3.1/src/sig.c
index 986ad5792e23..83742a3d6588 100644
--- a/cmd-line-utils/libedit/sig.c
+++ b/extra/libedit/libedit-20221030-3.1/src/sig.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig.c,v 1.17 2011/07/28 20:50:55 christos Exp $	*/
+/*	$NetBSD: sig.c,v 1.26 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: sig.c,v 1.26 2016/05/09 21:46:56 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,31 +46,35 @@ static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
  *	  our policy is to trap all signals, set a good state
  *	  and pass the ball to our caller.
  */
-#include "el.h"
+#include <errno.h>
 #include <stdlib.h>
 
-private EditLine *sel = NULL;
+#include "el.h"
+#include "common.h"
+
+static EditLine *sel = NULL;
 
-private const int sighdl[] = {
+static const int sighdl[] = {
 #define	_DO(a)	(a),
 	ALLSIGS
 #undef	_DO
 	- 1
 };
 
-private void sig_handler(int);
+static void sig_handler(int);
 
 /* sig_handler():
  *	This is the handler called for all signals
  *	XXX: we cannot pass any data so we just store the old editline
  *	state in a private variable
  */
-private void
+static void
 sig_handler(int signo)
 {
-	int i;
+	int i, save_errno;
 	sigset_t nset, oset;
 
+	save_errno = errno;
 	(void) sigemptyset(&nset);
 	(void) sigaddset(&nset, signo);
 	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
@@ -103,13 +108,14 @@ sig_handler(int signo)
 	sigemptyset(&sel->el_signal->sig_action[i].sa_mask);
 	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
 	(void) kill(0, signo);
+	errno = save_errno;
 }
 
 
 /* sig_init():
  *	Initialize all signal stuff
  */
-protected int
+libedit_private int
 sig_init(EditLine *el)
 {
 	size_t i;
@@ -141,7 +147,7 @@ sig_init(EditLine *el)
 /* sig_end():
  *	Clear all signal stuff
  */
-protected void
+libedit_private void
 sig_end(EditLine *el)
 {
 
@@ -153,7 +159,7 @@ sig_end(EditLine *el)
 /* sig_set():
  *	set all the signal handlers
  */
-protected void
+libedit_private void
 sig_set(EditLine *el)
 {
 	size_t i;
@@ -180,7 +186,7 @@ sig_set(EditLine *el)
 /* sig_clr():
  *	clear all the signal handlers
  */
-protected void
+libedit_private void
 sig_clr(EditLine *el)
 {
 	size_t i;
diff --git a/cmd-line-utils/libedit/sig.h b/extra/libedit/libedit-20221030-3.1/src/sig.h
similarity index 90%
rename from cmd-line-utils/libedit/sig.h
rename to extra/libedit/libedit-20221030-3.1/src/sig.h
index c957cfdf5a72..5ee453fb6121 100644
--- a/cmd-line-utils/libedit/sig.h
+++ b/extra/libedit/libedit-20221030-3.1/src/sig.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp $	*/
+/*	$NetBSD: sig.h,v 1.11 2016/05/09 21:46:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,8 +42,6 @@
 
 #include <signal.h>
 
-#include "histedit.h"
-
 /*
  * Define here all the signals we are going to handle
  * The _DO macro is used to iterate in the source code
@@ -64,9 +62,9 @@ typedef struct {
 	volatile sig_atomic_t sig_no;
 } *el_signal_t;
 
-protected void	sig_end(EditLine*);
-protected int	sig_init(EditLine*);
-protected void	sig_set(EditLine*);
-protected void	sig_clr(EditLine*);
+libedit_private void	sig_end(EditLine*);
+libedit_private int	sig_init(EditLine*);
+libedit_private void	sig_set(EditLine*);
+libedit_private void	sig_clr(EditLine*);
 
 #endif /* _h_el_sig */
diff --git a/cmd-line-utils/libedit/np/strlcat.c b/extra/libedit/libedit-20221030-3.1/src/strlcat.c
similarity index 80%
rename from cmd-line-utils/libedit/np/strlcat.c
rename to extra/libedit/libedit-20221030-3.1/src/strlcat.c
index 4e2897d8f356..c1ef3a21894b 100644
--- a/cmd-line-utils/libedit/np/strlcat.c
+++ b/extra/libedit/libedit-20221030-3.1/src/strlcat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strlcat.c,v 1.3 2007/06/04 18:19:27 christos Exp $	*/
+/*	$NetBSD: strlcat.c,v 1.4 2013/01/23 07:57:27 matt Exp $	*/
 /*	$OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $	*/
 
 /*
@@ -17,19 +17,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#else
 #include "config.h"
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: strlcat.c,v 1.4 2013/01/23 07:57:27 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef _LIBC
-#include "namespace.h"
-#endif
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>
@@ -40,10 +33,6 @@ __weak_alias(strlcat, _strlcat)
 # endif
 #endif
 
-#else
-#include <lib/libkern/libkern.h>
-#endif /* !_KERNEL && !_STANDALONE */
-
 #if !HAVE_STRLCAT
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
@@ -55,6 +44,7 @@ __weak_alias(strlcat, _strlcat)
 size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
+#if 1
 	char *d = dst;
 	const char *s = src;
 	size_t n = siz;
@@ -81,5 +71,20 @@ strlcat(char *dst, const char *src, size_t siz)
 	*d = '\0';
 
 	return(dlen + (s - src));	/* count does not include NUL */
+#else
+	_DIAGASSERT(dst != NULL);
+	_DIAGASSERT(src != NULL);
+
+	/*
+	 * Find length of string in dst (maxing out at siz).
+	 */
+	size_t dlen = strnlen(dst, siz);
+
+	/*
+	 * Copy src into any remaining space in dst (truncating if needed).
+	 * Note strlcpy(dst, src, 0) returns strlen(src).
+	 */
+	return dlen + strlcpy(dst + dlen, src, siz - dlen);
+#endif
 }
 #endif
diff --git a/extra/libedit/libedit-20221030-3.1/src/strlcpy.c b/extra/libedit/libedit-20221030-3.1/src/strlcpy.c
new file mode 100644
index 000000000000..8b3dfad211fa
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/strlcpy.c
@@ -0,0 +1,70 @@
+/*	$NetBSD: strlcpy.c,v 1.3 2007/06/04 18:19:27 christos Exp $	*/
+/*	$OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "config.h"
+
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: strlcpy.c,v 1.3 2007/06/04 18:19:27 christos Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <assert.h>
+#include <string.h>
+
+#ifdef _LIBC
+# ifdef __weak_alias
+__weak_alias(strlcpy, _strlcpy)
+# endif
+#endif
+
+#if !HAVE_STRLCPY
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	_DIAGASSERT(dst != NULL);
+	_DIAGASSERT(src != NULL);
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+#endif
diff --git a/extra/libedit/libedit-20221030-3.1/src/sys.h b/extra/libedit/libedit-20221030-3.1/src/sys.h
new file mode 100644
index 000000000000..917afe358e92
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/sys.h
@@ -0,0 +1,136 @@
+/*	$NetBSD: sys.h,v 1.27 2016/05/09 21:46:56 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)sys.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * sys.h: Put all the stupid compiler and system dependencies here...
+ */
+#ifndef _h_sys
+#define	_h_sys
+
+#if defined(HAVE_SYS_TYPES_H) && defined(__sun)
+#include <sys/types.h>
+#endif
+#include <limits.h> // SIZE_MAX
+
+#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
+# define __attribute__(A)
+#endif
+
+#ifndef _DIAGASSERT
+# define _DIAGASSERT(x)
+#endif
+
+#ifndef __BEGIN_DECLS
+# ifdef  __cplusplus
+#  define __BEGIN_DECLS  extern "C" {
+#  define __END_DECLS    }
+# else
+#  define __BEGIN_DECLS
+#  define __END_DECLS
+# endif
+#endif
+
+/* If your compiler does not support this, define it to be empty. */
+#define libedit_private __attribute__((__visibility__("hidden")))
+
+#ifndef __arraycount
+# define __arraycount(a) (sizeof(a) / sizeof(*(a)))
+#endif
+
+#ifndef _PTR_T
+# define _PTR_T
+typedef void	*ptr_t;
+#endif
+
+#ifndef _IOCTL_T
+# define _IOCTL_T
+typedef void	*ioctl_t;
+#endif
+
+#include <stdio.h>
+
+#ifndef HAVE_STRLCAT
+//#define	strlcat libedit_strlcat
+size_t	strlcat(char *dst, const char *src, size_t size);
+#endif
+
+#ifndef HAVE_STRLCPY
+//#define	strlcpy libedit_strlcpy
+size_t	strlcpy(char *dst, const char *src, size_t size);
+#endif
+
+#ifndef HAVE_GETLINE
+//#define	getline libedit_getline
+ssize_t	getline(char **line, size_t *len, FILE *fp);
+#endif
+
+#ifndef HAVE_HAVE_REALLOCARR
+int reallocarr(void *ptr, size_t number, size_t size);
+#endif
+
+#ifndef HAVE_WCSDUP
+wchar_t * wcsdup(const wchar_t *str);
+#endif
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(x)
+#endif
+
+#ifndef __RCSID
+#define __RCSID(x)
+#endif
+
+#ifndef HAVE_U_INT32_T
+typedef unsigned int	u_int32_t;
+#endif
+
+// #ifndef HAVE_SIZE_MAX
+// #define SIZE_MAX	((size_t)-1)
+// #endif
+
+#define	REGEX		/* Use POSIX.2 regular expression functions */
+#undef	REGEXP		/* Use UNIX V8 regular expression functions */
+
+#if defined(__sun)
+extern int tgetent(char *, const char *);
+extern int tgetflag(char *);
+extern int tgetnum(char *);
+extern int tputs(const char *, int, int (*)(int));
+extern char* tgoto(const char*, int, int);
+extern char* tgetstr(char*, char**);
+#endif
+
+#endif /* _h_sys */
diff --git a/cmd-line-utils/libedit/terminal.c b/extra/libedit/libedit-20221030-3.1/src/terminal.c
similarity index 81%
rename from cmd-line-utils/libedit/terminal.c
rename to extra/libedit/libedit-20221030-3.1/src/terminal.c
index cae2e910da16..3bea1fc27a89 100644
--- a/cmd-line-utils/libedit/terminal.c
+++ b/extra/libedit/libedit-20221030-3.1/src/terminal.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $	*/
+/*	$NetBSD: terminal.c,v 1.44 2021/09/09 20:24:07 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 2015
+ * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #else
+__RCSID("$NetBSD: terminal.c,v 1.44 2021/09/09 20:24:07 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,17 +46,17 @@ static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
  *	       We have to declare a static variable here, since the
  *	       termcap putchar routine does not take an argument!
  */
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <limits.h>
 #include <signal.h>
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <limits.h>
-#if 0 /* TODO: do we need this */
 #ifdef HAVE_TERMCAP_H
 #include <termcap.h>
 #endif
-#endif
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #elif HAVE_NCURSES_H
@@ -63,18 +64,16 @@ static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #endif
 
 /* Solaris's term.h does horrid things. */
-#if defined(HAVE_TERM_H) && !defined(__sun)
+#if defined(HAVE_TERM_H) && !defined(__sun) && !defined(HAVE_TERMCAP_H)
 #include <term.h>
 #endif
- 
-#include <sys/types.h>
-#include <sys/ioctl.h>
 
 #ifdef _REENTRANT
 #include <pthread.h>
 #endif
 
 #include "el.h"
+#include "fcns.h"
 
 /*
  * IMPORTANT NOTE: these routines are allowed to look at the current screen
@@ -90,7 +89,7 @@ static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #define	Str(a)		el->el_terminal.t_str[a]
 #define	Val(a)		el->el_terminal.t_val[a]
 
-private const struct termcapstr {
+static const struct termcapstr {
 	const char *name;
 	const char *long_name;
 } tstr[] = {
@@ -170,11 +169,13 @@ private const struct termcapstr {
 	{ "kh", "send cursor home" },
 #define	T_at7	37
 	{ "@7", "send cursor end" },
-#define	T_str	38
+#define	T_kD	38
+	{ "kD", "send cursor delete" },
+#define	T_str	39
 	{ NULL, NULL }
 };
 
-private const struct termcapval {
+static const struct termcapval {
 	const char *name;
 	const char *long_name;
 } tval[] = {
@@ -199,27 +200,27 @@ private const struct termcapval {
 };
 /* do two or more of the attributes use me */
 
-private void	terminal_setflags(EditLine *);
-private int	terminal_rebuffer_display(EditLine *);
-private void	terminal_free_display(EditLine *);
-private int	terminal_alloc_display(EditLine *);
-private void	terminal_alloc(EditLine *, const struct termcapstr *,
+static void	terminal_setflags(EditLine *);
+static int	terminal_rebuffer_display(EditLine *);
+static void	terminal_free_display(EditLine *);
+static int	terminal_alloc_display(EditLine *);
+static void	terminal_alloc(EditLine *, const struct termcapstr *,
     const char *);
-private void	terminal_init_arrow(EditLine *);
-private void	terminal_reset_arrow(EditLine *);
-private int	terminal_putc(int);
-private void	terminal_tputs(EditLine *, const char *, int);
+static void	terminal_init_arrow(EditLine *);
+static void	terminal_reset_arrow(EditLine *);
+static int	terminal_putc(int);
+static void	terminal_tputs(EditLine *, const char *, int);
 
 #ifdef _REENTRANT
-private pthread_mutex_t terminal_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t terminal_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
-private FILE *terminal_outfile = NULL;
+static FILE *terminal_outfile = NULL;
 
 
 /* terminal_setflags():
  *	Set the terminal capability flags
  */
-private void
+static void
 terminal_setflags(EditLine *el)
 {
 	EL_FLAGS = 0;
@@ -264,44 +265,54 @@ terminal_setflags(EditLine *el)
 /* terminal_init():
  *	Initialize the terminal stuff
  */
-protected int
+libedit_private int
 terminal_init(EditLine *el)
 {
 
-	el->el_terminal.t_buf = el_malloc(TC_BUFSIZE *
+	el->el_terminal.t_buf = el_calloc(TC_BUFSIZE,
 	    sizeof(*el->el_terminal.t_buf));
 	if (el->el_terminal.t_buf == NULL)
-		return -1;
-	el->el_terminal.t_cap = el_malloc(TC_BUFSIZE *
+		goto fail1;
+	el->el_terminal.t_cap = el_calloc(TC_BUFSIZE,
 	    sizeof(*el->el_terminal.t_cap));
 	if (el->el_terminal.t_cap == NULL)
-		return -1;
-	el->el_terminal.t_fkey = el_malloc(A_K_NKEYS *
+		goto fail2;
+	el->el_terminal.t_fkey = el_calloc(A_K_NKEYS,
 	    sizeof(*el->el_terminal.t_fkey));
 	if (el->el_terminal.t_fkey == NULL)
-		return -1;
+		goto fail3;
 	el->el_terminal.t_loc = 0;
-	el->el_terminal.t_str = el_malloc(T_str *
+	el->el_terminal.t_str = el_calloc(T_str,
 	    sizeof(*el->el_terminal.t_str));
 	if (el->el_terminal.t_str == NULL)
-		return -1;
-	(void) memset(el->el_terminal.t_str, 0, T_str *
-	    sizeof(*el->el_terminal.t_str));
-	el->el_terminal.t_val = el_malloc(T_val *
+		goto fail4;
+	el->el_terminal.t_val = el_calloc(T_val,
 	    sizeof(*el->el_terminal.t_val));
 	if (el->el_terminal.t_val == NULL)
-		return -1;
-	(void) memset(el->el_terminal.t_val, 0, T_val *
-	    sizeof(*el->el_terminal.t_val));
+		goto fail5;
 	(void) terminal_set(el, NULL);
 	terminal_init_arrow(el);
 	return 0;
+fail5:
+	free(el->el_terminal.t_str);
+	el->el_terminal.t_str = NULL;
+fail4:
+	free(el->el_terminal.t_fkey);
+	el->el_terminal.t_fkey = NULL;
+fail3:
+	free(el->el_terminal.t_cap);
+	el->el_terminal.t_cap = NULL;
+fail2:
+	free(el->el_terminal.t_buf);
+	el->el_terminal.t_buf = NULL;
+fail1:
+	return -1;
 }
 
 /* terminal_end():
  *	Clean up the terminal stuff
  */
-protected void
+libedit_private void
 terminal_end(EditLine *el)
 {
 
@@ -323,7 +334,7 @@ terminal_end(EditLine *el)
 /* terminal_alloc():
  *	Maintain a string pool for termcap strings
  */
-private void
+static void
 terminal_alloc(EditLine *el, const struct termcapstr *t, const char *cap)
 {
 	char termbuf[TC_BUFSIZE];
@@ -331,6 +342,7 @@ terminal_alloc(EditLine *el, const struct termcapstr *t, const char *cap)
 	char **tlist = el->el_terminal.t_str;
 	char **tmp, **str = &tlist[t - tstr];
 
+	(void) memset(termbuf, 0, sizeof(termbuf));
 	if (cap == NULL || *cap == '\0') {
 		*str = NULL;
 		return;
@@ -388,7 +400,7 @@ terminal_alloc(EditLine *el, const struct termcapstr *t, const char *cap)
 /* terminal_rebuffer_display():
  *	Rebuffer the display after the screen changed size
  */
-private int
+static int
 terminal_rebuffer_display(EditLine *el)
 {
 	coord_t *c = &el->el_terminal.t_size;
@@ -403,81 +415,81 @@ terminal_rebuffer_display(EditLine *el)
 	return 0;
 }
 
-
-/* terminal_alloc_display():
- *	Allocate a new display.
- */
-private int
-terminal_alloc_display(EditLine *el)
+static wint_t **
+terminal_alloc_buffer(EditLine *el)
 {
-	int i;
-	Char **b;
+	wint_t **b;
 	coord_t *c = &el->el_terminal.t_size;
+	int i;
 
-	b =  el_malloc(sizeof(*b) * (size_t)(c->v + 1));
+	b =  el_calloc((size_t)(c->v + 1), sizeof(*b));
 	if (b == NULL)
-		return -1;
+		return NULL;
 	for (i = 0; i < c->v; i++) {
-		b[i] = el_malloc(sizeof(**b) * (size_t)(c->h + 1));
+		b[i] = el_calloc((size_t)(c->h + 1), sizeof(**b));
 		if (b[i] == NULL) {
 			while (--i >= 0)
 				el_free(b[i]);
 			el_free(b);
-			return -1;
+			return NULL;
 		}
 	}
 	b[c->v] = NULL;
-	el->el_display = b;
+	return b;
+}
 
-	b = el_malloc(sizeof(*b) * (size_t)(c->v + 1));
-	if (b == NULL)
-		return -1;
-	for (i = 0; i < c->v; i++) {
-		b[i] = el_malloc(sizeof(**b) * (size_t)(c->h + 1));
-		if (b[i] == NULL) {
-			while (--i >= 0)
-				el_free(b[i]);
-			el_free(b);
-			return -1;
-		}
-	}
-	b[c->v] = NULL;
-	el->el_vdisplay = b;
+static void
+terminal_free_buffer(wint_t ***bp)
+{
+	wint_t **b;
+	wint_t **bufp;
+
+	if (*bp == NULL)
+		return;
+
+	b = *bp;
+	*bp = NULL;
+
+	for (bufp = b; *bufp != NULL; bufp++)
+		el_free(*bufp);
+	el_free(b);
+}
+
+/* terminal_alloc_display():
+ *	Allocate a new display.
+ */
+static int
+terminal_alloc_display(EditLine *el)
+{
+	el->el_display = terminal_alloc_buffer(el);
+	if (el->el_display == NULL)
+		goto done;
+	el->el_vdisplay = terminal_alloc_buffer(el);
+	if (el->el_vdisplay == NULL)
+		goto done;
 	return 0;
+done:
+	terminal_free_display(el);
+	return -1;
 }
 
 
 /* terminal_free_display():
  *	Free the display buffers
  */
-private void
+static void
 terminal_free_display(EditLine *el)
 {
-	Char **b;
-	Char **bufp;
-
-	b = el->el_display;
-	el->el_display = NULL;
-	if (b != NULL) {
-		for (bufp = b; *bufp != NULL; bufp++)
-			el_free(*bufp);
-		el_free(b);
-	}
-	b = el->el_vdisplay;
-	el->el_vdisplay = NULL;
-	if (b != NULL) {
-		for (bufp = b; *bufp != NULL; bufp++)
-			el_free(*bufp);
-		el_free(b);
-	}
+	terminal_free_buffer(&el->el_display);
+	terminal_free_buffer(&el->el_vdisplay);
 }
 
 
 /* terminal_move_to_line():
  *	move to line <where> (first line == 0)
- * 	as efficiently as possible
+ *	as efficiently as possible
  */
-protected void
+libedit_private void
 terminal_move_to_line(EditLine *el, int where)
 {
 	int del;
@@ -485,48 +497,22 @@ terminal_move_to_line(EditLine *el, int where)
 	if (where == el->el_cursor.v)
 		return;
 
-	if (where > el->el_terminal.t_size.v) {
+	if (where >= el->el_terminal.t_size.v) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
-		    "terminal_move_to_line: where is ridiculous: %d\r\n",
-		    where);
+		    "%s: where is ridiculous: %d\r\n", __func__, where);
 #endif /* DEBUG_SCREEN */
 		return;
 	}
 	if ((del = where - el->el_cursor.v) > 0) {
-		while (del > 0) {
-			if (EL_HAS_AUTO_MARGINS &&
-			    el->el_display[el->el_cursor.v][0] != '\0') {
-                                size_t h = (size_t)
-				    (el->el_terminal.t_size.h - 1);
-#ifdef WIDECHAR
-                                for (; h > 0 &&
-                                         el->el_display[el->el_cursor.v][h] ==
-                                                 MB_FILL_CHAR;
-                                         h--)
-                                                continue;
-#endif
-				/* move without newline */
-				terminal_move_to_char(el, (int)h);
-				terminal_overwrite(el, &el->el_display
-				    [el->el_cursor.v][el->el_cursor.h],
-				    (size_t)(el->el_terminal.t_size.h -
-				    el->el_cursor.h));
-				/* updates Cursor */
-				del--;
-			} else {
-				if ((del > 1) && GoodStr(T_DO)) {
-					terminal_tputs(el, tgoto(Str(T_DO), del,
-					    del), del);
-					del = 0;
-				} else {
-					for (; del > 0; del--)
-						terminal__putc(el, '\n');
-					/* because the \n will become \r\n */
-					el->el_cursor.h = 0;
-				}
-			}
-		}
+		/*
+		 * We don't use DO here because some terminals are buggy
+		 * if the destination is beyond bottom of the screen.
+		 */
+		for (; del > 0; del--)
+			terminal__putc(el, '\n');
+		/* because the \n will become \r\n */
+		el->el_cursor.h = 0;
 	} else {		/* del < 0 */
 		if (GoodStr(T_UP) && (-del > 1 || !GoodStr(T_up)))
 			terminal_tputs(el, tgoto(Str(T_UP), -del, -del), -del);
@@ -543,7 +529,7 @@ terminal_move_to_line(EditLine *el, int where)
 /* terminal_move_to_char():
  *	Move to the character position specified
  */
-protected void
+libedit_private void
 terminal_move_to_char(EditLine *el, int where)
 {
 	int del, i;
@@ -555,8 +541,7 @@ terminal_move_to_char(EditLine *el, int where)
 	if (where > el->el_terminal.t_size.h) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
-		    "terminal_move_to_char: where is riduculous: %d\r\n",
-		    where);
+		    "%s: where is ridiculous: %d\r\n", __func__, where);
 #endif /* DEBUG_SCREEN */
 		return;
 	}
@@ -580,11 +565,9 @@ terminal_move_to_char(EditLine *el, int where)
 				if (EL_CAN_TAB) {
 					if ((el->el_cursor.h & 0370) !=
 					    (where & ~0x7)
-#ifdef WIDECHAR
 					    && (el->el_display[
 					    el->el_cursor.v][where & 0370] !=
 					    MB_FILL_CHAR)
-#endif
 					    ) {
 						/* if not within tab stop */
 						for (i =
@@ -592,7 +575,7 @@ terminal_move_to_char(EditLine *el, int where)
 						    i < (where & ~0x7);
 						    i += 8)
 							terminal__putc(el,
-							    '\t');	
+							    '\t');
 							/* then tab over */
 						el->el_cursor.h = where & ~0x7;
 					}
@@ -605,7 +588,8 @@ terminal_move_to_char(EditLine *el, int where)
 				 * NOTE THAT terminal_overwrite() WILL CHANGE
 				 * el->el_cursor.h!!!
 				 */
-				terminal_overwrite(el, &el->el_display[
+				terminal_overwrite(el,
+				    (wchar_t *)&el->el_display[
 				    el->el_cursor.v][el->el_cursor.h],
 				    (size_t)(where - el->el_cursor.h));
 
@@ -641,52 +625,41 @@ terminal_move_to_char(EditLine *el, int where)
  *	Overstrike num characters
  *	Assumes MB_FILL_CHARs are present to keep the column count correct
  */
-protected void
-terminal_overwrite(EditLine *el, const Char *cp, size_t n)
+libedit_private void
+terminal_overwrite(EditLine *el, const wchar_t *cp, size_t n)
 {
-#ifdef WIDECHAR
-	int width;
-#endif
-
 	if (n == 0)
 		return;
 
 	if (n > (size_t)el->el_terminal.t_size.h) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
-		    "terminal_overwrite: n is riduculous: %d\r\n", n);
+		    "%s: n is ridiculous: %zu\r\n", __func__, n);
 #endif /* DEBUG_SCREEN */
 		return;
 	}
 
         do {
-#ifdef WIDECHAR
-                width = wcwidth(*cp);    /* Returns -1 for faux character. */
-                if (width != -1)
-                  el->el_cursor.h += width;
-#else
-                el->el_cursor.h++;
-#endif
                 /* terminal__putc() ignores any MB_FILL_CHARs */
                 terminal__putc(el, *cp++);
+                el->el_cursor.h++;
         } while (--n);
 
 	if (el->el_cursor.h >= el->el_terminal.t_size.h) {	/* wrap? */
 		if (EL_HAS_AUTO_MARGINS) {	/* yes */
 			el->el_cursor.h = 0;
-			el->el_cursor.v++;
+			if (el->el_cursor.v + 1 < el->el_terminal.t_size.v)
+				el->el_cursor.v++;
 			if (EL_HAS_MAGIC_MARGINS) {
 				/* force the wrap to avoid the "magic"
 				 * situation */
-				Char c;
+				wchar_t c;
 				if ((c = el->el_display[el->el_cursor.v]
 				    [el->el_cursor.h]) != '\0') {
 					terminal_overwrite(el, &c, (size_t)1);
-#ifdef WIDECHAR
 					while (el->el_display[el->el_cursor.v]
 					    [el->el_cursor.h] == MB_FILL_CHAR)
 						el->el_cursor.h++;
-#endif
 				} else {
 					terminal__putc(el, ' ');
 					el->el_cursor.h = 1;
@@ -701,7 +674,7 @@ terminal_overwrite(EditLine *el, const Char *cp, size_t n)
 /* terminal_deletechars():
  *	Delete num characters
  */
-protected void
+libedit_private void
 terminal_deletechars(EditLine *el, int num)
 {
 	if (num <= 0)
@@ -716,7 +689,7 @@ terminal_deletechars(EditLine *el, int num)
 	if (num > el->el_terminal.t_size.h) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
-		    "terminal_deletechars: num is riduculous: %d\r\n", num);
+		    "%s: num is ridiculous: %d\r\n", __func__, num);
 #endif /* DEBUG_SCREEN */
 		return;
 	}
@@ -743,8 +716,8 @@ terminal_deletechars(EditLine *el, int num)
  *	characters in the line
  *      Assumes MB_FILL_CHARs are present to keep column count correct
  */
-protected void
-terminal_insertwrite(EditLine *el, Char *cp, int num)
+libedit_private void
+terminal_insertwrite(EditLine *el, wchar_t *cp, int num)
 {
 	if (num <= 0)
 		return;
@@ -757,7 +730,7 @@ terminal_insertwrite(EditLine *el, Char *cp, int num)
 	if (num > el->el_terminal.t_size.h) {
 #ifdef DEBUG_SCREEN
 		(void) fprintf(el->el_errfile,
-		    "StartInsert: num is riduculous: %d\r\n", num);
+		    "%s: num is ridiculous: %d\r\n", __func__, num);
 #endif /* DEBUG_SCREEN */
 		return;
 	}
@@ -802,7 +775,7 @@ terminal_insertwrite(EditLine *el, Char *cp, int num)
 /* terminal_clear_EOL():
  *	clear to end of line.  There are num characters to clear
  */
-protected void
+libedit_private void
 terminal_clear_EOL(EditLine *el, int num)
 {
 	int i;
@@ -820,7 +793,7 @@ terminal_clear_EOL(EditLine *el, int num)
 /* terminal_clear_screen():
  *	Clear the screen
  */
-protected void
+libedit_private void
 terminal_clear_screen(EditLine *el)
 {				/* clear the whole screen and home */
 
@@ -841,7 +814,7 @@ terminal_clear_screen(EditLine *el)
 /* terminal_beep():
  *	Beep the way the terminal wants us
  */
-protected void
+libedit_private void
 terminal_beep(EditLine *el)
 {
 	if (GoodStr(T_bl))
@@ -852,7 +825,7 @@ terminal_beep(EditLine *el)
 }
 
 
-protected void
+libedit_private void
 terminal_get(EditLine *el, const char **term)
 {
 	*term = el->el_terminal.t_name;
@@ -862,7 +835,7 @@ terminal_get(EditLine *el, const char **term)
 /* terminal_set():
  *	Read in the terminal capabilities from the requested terminal
  */
-protected int
+libedit_private int
 terminal_set(EditLine *el, const char *term)
 {
 	int i;
@@ -888,7 +861,7 @@ terminal_set(EditLine *el, const char *term)
 	if (strcmp(term, "emacs") == 0)
 		el->el_flags |= EDIT_DISABLED;
 
-	memset(el->el_terminal.t_cap, 0, TC_BUFSIZE);
+	(void) memset(el->el_terminal.t_cap, 0, TC_BUFSIZE);
 
 	i = tgetent(el->el_terminal.t_cap, term);
 
@@ -951,7 +924,7 @@ terminal_set(EditLine *el, const char *term)
  *	Return the new window size in lines and cols, and
  *	true if the size was changed.
  */
-protected int
+libedit_private int
 terminal_get_size(EditLine *el, int *lins, int *cols)
 {
 
@@ -987,12 +960,13 @@ terminal_get_size(EditLine *el, int *lins, int *cols)
 /* terminal_change_size():
  *	Change the size of the terminal
  */
-protected int
+libedit_private int
 terminal_change_size(EditLine *el, int lins, int cols)
 {
+	coord_t cur = el->el_cursor;
 	/*
-         * Just in case
-         */
+	 * Just in case
+	 */
 	Val(T_co) = (cols < 2) ? 80 : cols;
 	Val(T_li) = (lins < 1) ? 24 : lins;
 
@@ -1000,6 +974,7 @@ terminal_change_size(EditLine *el, int lins, int cols)
 	if (terminal_rebuffer_display(el) == -1)
 		return -1;
 	re_clear_display(el);
+	el->el_cursor = cur;
 	return 0;
 }
 
@@ -1007,62 +982,67 @@ terminal_change_size(EditLine *el, int lins, int cols)
 /* terminal_init_arrow():
  *	Initialize the arrow key bindings from termcap
  */
-private void
+static void
 terminal_init_arrow(EditLine *el)
 {
 	funckey_t *arrow = el->el_terminal.t_fkey;
 
-	arrow[A_K_DN].name = STR("down");
+	arrow[A_K_DN].name = L"down";
 	arrow[A_K_DN].key = T_kd;
 	arrow[A_K_DN].fun.cmd = ED_NEXT_HISTORY;
 	arrow[A_K_DN].type = XK_CMD;
 
-	arrow[A_K_UP].name = STR("up");
+	arrow[A_K_UP].name = L"up";
 	arrow[A_K_UP].key = T_ku;
 	arrow[A_K_UP].fun.cmd = ED_PREV_HISTORY;
 	arrow[A_K_UP].type = XK_CMD;
 
-	arrow[A_K_LT].name = STR("left");
+	arrow[A_K_LT].name = L"left";
 	arrow[A_K_LT].key = T_kl;
 	arrow[A_K_LT].fun.cmd = ED_PREV_CHAR;
 	arrow[A_K_LT].type = XK_CMD;
 
-	arrow[A_K_RT].name = STR("right");
+	arrow[A_K_RT].name = L"right";
 	arrow[A_K_RT].key = T_kr;
 	arrow[A_K_RT].fun.cmd = ED_NEXT_CHAR;
 	arrow[A_K_RT].type = XK_CMD;
 
-	arrow[A_K_HO].name = STR("home");
+	arrow[A_K_HO].name = L"home";
 	arrow[A_K_HO].key = T_kh;
 	arrow[A_K_HO].fun.cmd = ED_MOVE_TO_BEG;
 	arrow[A_K_HO].type = XK_CMD;
 
-	arrow[A_K_EN].name = STR("end");
+	arrow[A_K_EN].name = L"end";
 	arrow[A_K_EN].key = T_at7;
 	arrow[A_K_EN].fun.cmd = ED_MOVE_TO_END;
 	arrow[A_K_EN].type = XK_CMD;
+
+	arrow[A_K_DE].name = L"delete";
+	arrow[A_K_DE].key = T_kD;
+	arrow[A_K_DE].fun.cmd = ED_DELETE_NEXT_CHAR;
+	arrow[A_K_DE].type = XK_CMD;
 }
 
 
 /* terminal_reset_arrow():
  *	Reset arrow key bindings
  */
-private void
+static void
 terminal_reset_arrow(EditLine *el)
 {
 	funckey_t *arrow = el->el_terminal.t_fkey;
-	static const Char strA[] = {033, '[', 'A', '\0'};
-	static const Char strB[] = {033, '[', 'B', '\0'};
-	static const Char strC[] = {033, '[', 'C', '\0'};
-	static const Char strD[] = {033, '[', 'D', '\0'};
-	static const Char strH[] = {033, '[', 'H', '\0'};
-	static const Char strF[] = {033, '[', 'F', '\0'};
-	static const Char stOA[] = {033, 'O', 'A', '\0'};
-	static const Char stOB[] = {033, 'O', 'B', '\0'};
-	static const Char stOC[] = {033, 'O', 'C', '\0'};
-	static const Char stOD[] = {033, 'O', 'D', '\0'};
-	static const Char stOH[] = {033, 'O', 'H', '\0'};
-	static const Char stOF[] = {033, 'O', 'F', '\0'};
+	static const wchar_t strA[] = L"\033[A";
+	static const wchar_t strB[] = L"\033[B";
+	static const wchar_t strC[] = L"\033[C";
+	static const wchar_t strD[] = L"\033[D";
+	static const wchar_t strH[] = L"\033[H";
+	static const wchar_t strF[] = L"\033[F";
+	static const wchar_t stOA[] = L"\033OA";
+	static const wchar_t stOB[] = L"\033OB";
+	static const wchar_t stOC[] = L"\033OC";
+	static const wchar_t stOD[] = L"\033OD";
+	static const wchar_t stOH[] = L"\033OH";
+	static const wchar_t stOF[] = L"\033OF";
 
 	keymacro_add(el, strA, &arrow[A_K_UP].fun, arrow[A_K_UP].type);
 	keymacro_add(el, strB, &arrow[A_K_DN].fun, arrow[A_K_DN].type);
@@ -1097,15 +1077,15 @@ terminal_reset_arrow(EditLine *el)
 /* terminal_set_arrow():
  *	Set an arrow key binding
  */
-protected int
-terminal_set_arrow(EditLine *el, const Char *name, keymacro_value_t *fun,
+libedit_private int
+terminal_set_arrow(EditLine *el, const wchar_t *name, keymacro_value_t *fun,
     int type)
 {
 	funckey_t *arrow = el->el_terminal.t_fkey;
 	int i;
 
 	for (i = 0; i < A_K_NKEYS; i++)
-		if (Strcmp(name, arrow[i].name) == 0) {
+		if (wcscmp(name, arrow[i].name) == 0) {
 			arrow[i].fun = *fun;
 			arrow[i].type = type;
 			return 0;
@@ -1117,14 +1097,14 @@ terminal_set_arrow(EditLine *el, const Char *name, keymacro_value_t *fun,
 /* terminal_clear_arrow():
  *	Clear an arrow key binding
  */
-protected int
-terminal_clear_arrow(EditLine *el, const Char *name)
+libedit_private int
+terminal_clear_arrow(EditLine *el, const wchar_t *name)
 {
 	funckey_t *arrow = el->el_terminal.t_fkey;
 	int i;
 
 	for (i = 0; i < A_K_NKEYS; i++)
-		if (Strcmp(name, arrow[i].name) == 0) {
+		if (wcscmp(name, arrow[i].name) == 0) {
 			arrow[i].type = XK_NOD;
 			return 0;
 		}
@@ -1135,14 +1115,14 @@ terminal_clear_arrow(EditLine *el, const Char *name)
 /* terminal_print_arrow():
  *	Print the arrow key bindings
  */
-protected void
-terminal_print_arrow(EditLine *el, const Char *name)
+libedit_private void
+terminal_print_arrow(EditLine *el, const wchar_t *name)
 {
 	int i;
 	funckey_t *arrow = el->el_terminal.t_fkey;
 
 	for (i = 0; i < A_K_NKEYS; i++)
-		if (*name == '\0' || Strcmp(name, arrow[i].name) == 0)
+		if (*name == '\0' || wcscmp(name, arrow[i].name) == 0)
 			if (arrow[i].type != XK_NOD)
 				keymacro_kprint(el, arrow[i].name,
 				    &arrow[i].fun, arrow[i].type);
@@ -1152,7 +1132,7 @@ terminal_print_arrow(EditLine *el, const Char *name)
 /* terminal_bind_arrow():
  *	Bind the arrow keys
  */
-protected void
+libedit_private void
 terminal_bind_arrow(EditLine *el)
 {
 	el_action_t *map;
@@ -1171,8 +1151,8 @@ terminal_bind_arrow(EditLine *el)
 	terminal_reset_arrow(el);
 
 	for (i = 0; i < A_K_NKEYS; i++) {
-		Char wt_str[VISUAL_WIDTH_MAX];
-		Char *px;
+		wchar_t wt_str[VISUAL_WIDTH_MAX];
+		wchar_t *px;
 		size_t n;
 
 		p = el->el_terminal.t_str[arrow[i].key];
@@ -1217,7 +1197,7 @@ terminal_bind_arrow(EditLine *el)
 /* terminal_putc():
  *	Add a character
  */
-private int
+static int
 terminal_putc(int c)
 {
 	if (terminal_outfile == NULL)
@@ -1225,7 +1205,7 @@ terminal_putc(int c)
 	return fputc(c, terminal_outfile);
 }
 
-private void
+static void
 terminal_tputs(EditLine *el, const char *cap, int affcnt)
 {
 #ifdef _REENTRANT
@@ -1241,17 +1221,16 @@ terminal_tputs(EditLine *el, const char *cap, int affcnt)
 /* terminal__putc():
  *	Add a character
  */
-protected int
-terminal__putc(EditLine *el, Int c)
+libedit_private int
+terminal__putc(EditLine *el, wint_t c)
 {
 	char buf[MB_LEN_MAX +1];
 	ssize_t i;
-	mbstate_t state;
-
-	memset(&state, 0, sizeof(mbstate_t));
-	if (c == (Int)MB_FILL_CHAR)
+	if (c == MB_FILL_CHAR)
 		return 0;
-	i = ct_encode_char(buf, (size_t)MB_CUR_MAX, c, &state);
+	if (c & EL_LITERAL)
+		return fputs(literal_get(el, c), el->el_outfile);
+	i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c);
 	if (i <= 0)
 		return (int)i;
 	buf[i] = '\0';
@@ -1261,7 +1240,7 @@ terminal__putc(EditLine *el, Int c)
 /* terminal__flush():
  *	Flush output
  */
-protected void
+libedit_private void
 terminal__flush(EditLine *el)
 {
 
@@ -1271,29 +1250,26 @@ terminal__flush(EditLine *el)
 /* terminal_writec():
  *	Write the given character out, in a human readable form
  */
-protected int
-terminal_writec(EditLine *el, Int c)
+libedit_private void
+terminal_writec(EditLine *el, wint_t c)
 {
-	Char visbuf[VISUAL_WIDTH_MAX +1];
+	wchar_t visbuf[VISUAL_WIDTH_MAX +1];
 	ssize_t vcnt = ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
-	if(vcnt == -1)
-		return 1;   /* Error due to insufficient space */
-	else {
-		visbuf[vcnt] = '\0';
-		terminal_overwrite(el, visbuf, (size_t)vcnt);
-		terminal__flush(el);
-		return 0;
-	}
+	if (vcnt < 0)
+		vcnt = 0;
+	visbuf[vcnt] = '\0';
+	terminal_overwrite(el, visbuf, (size_t)vcnt);
+	terminal__flush(el);
 }
 
 
 /* terminal_telltc():
  *	Print the current termcap characteristics
  */
-protected int
+libedit_private int
 /*ARGSUSED*/
-terminal_telltc(EditLine *el, int argc __attribute__((__unused__)), 
-    const Char **argv __attribute__((__unused__)))
+terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
+    const wchar_t **argv __attribute__((__unused__)))
 {
 	const struct termcapstr *t;
 	char **ts;
@@ -1316,8 +1292,8 @@ terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
 		const char *ub;
 		if (*ts && **ts) {
 			ub = ct_encode_string(ct_visual_string(
-			    ct_decode_string(*ts, &el->el_scratch)),
-			    &el->el_scratch);
+			    ct_decode_string(*ts, &el->el_scratch),
+			    &el->el_visual), &el->el_scratch);
 		} else {
 			ub = "(empty)";
 		}
@@ -1332,22 +1308,22 @@ terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
 /* terminal_settc():
  *	Change the current terminal characteristics
  */
-protected int
+libedit_private int
 /*ARGSUSED*/
 terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
-    const Char **argv)
+    const wchar_t **argv)
 {
 	const struct termcapstr *ts;
 	const struct termcapval *tv;
 	char what[8], how[8];
+	long i;
+	char *ep;
 
 	if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
 		return -1;
 
-	strncpy(what, ct_encode_string(argv[1], &el->el_scratch), sizeof(what));
-	what[sizeof(what) - 1] = '\0';
-	strncpy(how,  ct_encode_string(argv[2], &el->el_scratch), sizeof(how));
-	how[sizeof(how) - 1] = '\0';
+	strlcpy(what, ct_encode_string(argv[1], &el->el_scratch), sizeof(what));
+	strlcpy(how,  ct_encode_string(argv[2], &el->el_scratch), sizeof(how));
 
 	/*
          * Do the strings first
@@ -1368,50 +1344,58 @@ terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
 		if (strcmp(tv->name, what) == 0)
 			break;
 
-	if (tv->name != NULL)
+	if (tv->name == NULL) {
+		(void) fprintf(el->el_errfile,
+		    "%ls: Bad capability `%s'.\n", argv[0], what);
 		return -1;
+	}
 
 	if (tv == &tval[T_pt] || tv == &tval[T_km] ||
 	    tv == &tval[T_am] || tv == &tval[T_xn]) {
+		/*
+		 * Booleans
+		 */
 		if (strcmp(how, "yes") == 0)
 			el->el_terminal.t_val[tv - tval] = 1;
 		else if (strcmp(how, "no") == 0)
 			el->el_terminal.t_val[tv - tval] = 0;
 		else {
 			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Bad value `%s'.\n", argv[0], how);
+			    "%ls: Bad value `%s'.\n", argv[0], how);
 			return -1;
 		}
 		terminal_setflags(el);
-		if (terminal_change_size(el, Val(T_li), Val(T_co)) == -1)
-			return -1;
 		return 0;
-	} else {
-		long i;
-		char *ep;
+	}
 
-		i = strtol(how, &ep, 10);
-		if (*ep != '\0') {
-			(void) fprintf(el->el_errfile,
-			    "" FSTR ": Bad value `%s'.\n", argv[0], how);
-			return -1;
-		}
-		el->el_terminal.t_val[tv - tval] = (int) i;
+	/*
+	 * Numerics
+	 */
+	i = strtol(how, &ep, 10);
+	if (*ep != '\0') {
+		(void) fprintf(el->el_errfile,
+		    "%ls: Bad value `%s'.\n", argv[0], how);
+		return -1;
+	}
+	el->el_terminal.t_val[tv - tval] = (int) i;
+	i = 0;
+	if (tv == &tval[T_co]) {
 		el->el_terminal.t_size.v = Val(T_co);
+		i++;
+	} else if (tv == &tval[T_li]) {
 		el->el_terminal.t_size.h = Val(T_li);
-		if (tv == &tval[T_co] || tv == &tval[T_li])
-			if (terminal_change_size(el, Val(T_li), Val(T_co))
-			    == -1)
-				return -1;
-		return 0;
+		i++;
 	}
+	if (i && terminal_change_size(el, Val(T_li), Val(T_co)) == -1)
+		return -1;
+	return 0;
 }
 
 
 /* terminal_gettc():
  *	Get the current terminal characteristics
  */
-protected int
+libedit_private int
 /*ARGSUSED*/
 terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
 {
@@ -1465,13 +1449,13 @@ terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
 /* terminal_echotc():
  *	Print the termcap string out with variable substitution
  */
-protected int
+libedit_private int
 /*ARGSUSED*/
 terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
-    const Char **argv)
+    const wchar_t **argv)
 {
 	char *cap, *scap;
-	Char *ep;
+	wchar_t *ep;
 	int arg_need, arg_cols, arg_rows;
 	int verbose = 0, silent = 0;
 	char *area;
@@ -1502,28 +1486,28 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 	}
 	if (!*argv || *argv[0] == '\0')
 		return 0;
-	if (Strcmp(*argv, STR("tabs")) == 0) {
+	if (wcscmp(*argv, L"tabs") == 0) {
 		(void) fprintf(el->el_outfile, fmts, EL_CAN_TAB ? "yes" : "no");
 		return 0;
-	} else if (Strcmp(*argv, STR("meta")) == 0) {
+	} else if (wcscmp(*argv, L"meta") == 0) {
 		(void) fprintf(el->el_outfile, fmts, Val(T_km) ? "yes" : "no");
 		return 0;
-	} else if (Strcmp(*argv, STR("xn")) == 0) {
+	} else if (wcscmp(*argv, L"xn") == 0) {
 		(void) fprintf(el->el_outfile, fmts, EL_HAS_MAGIC_MARGINS ?
 		    "yes" : "no");
 		return 0;
-	} else if (Strcmp(*argv, STR("am")) == 0) {
+	} else if (wcscmp(*argv, L"am") == 0) {
 		(void) fprintf(el->el_outfile, fmts, EL_HAS_AUTO_MARGINS ?
 		    "yes" : "no");
 		return 0;
-	} else if (Strcmp(*argv, STR("baud")) == 0) {
+	} else if (wcscmp(*argv, L"baud") == 0) {
 		(void) fprintf(el->el_outfile, fmtd, (int)el->el_tty.t_speed);
 		return 0;
-	} else if (Strcmp(*argv, STR("rows")) == 0 ||
-                   Strcmp(*argv, STR("lines")) == 0) {
+	} else if (wcscmp(*argv, L"rows") == 0 ||
+                   wcscmp(*argv, L"lines") == 0) {
 		(void) fprintf(el->el_outfile, fmtd, Val(T_li));
 		return 0;
-	} else if (Strcmp(*argv, STR("cols")) == 0) {
+	} else if (wcscmp(*argv, L"cols") == 0) {
 		(void) fprintf(el->el_outfile, fmtd, Val(T_co));
 		return 0;
 	}
@@ -1544,7 +1528,7 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 	if (!scap || scap[0] == '\0') {
 		if (!silent)
 			(void) fprintf(el->el_errfile,
-			    "echotc: Termcap parameter `" FSTR "' not found.\n",
+			    "echotc: Termcap parameter `%ls' not found.\n",
 			    *argv);
 		return -1;
 	}
@@ -1587,7 +1571,7 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 		if (*argv && *argv[0]) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR "'.\n",
+				    "echotc: Warning: Extra argument `%ls'.\n",
 				    *argv);
 			return -1;
 		}
@@ -1602,11 +1586,11 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 			return -1;
 		}
 		arg_cols = 0;
-		i = Strtol(*argv, &ep, 10);
+		i = wcstol(*argv, &ep, 10);
 		if (*ep != '\0' || i < 0) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for rows.\n",
+				    "echotc: Bad value `%ls' for rows.\n",
 				    *argv);
 			return -1;
 		}
@@ -1615,7 +1599,7 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 		if (*argv && *argv[0]) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR
+				    "echotc: Warning: Extra argument `%ls"
 				    "'.\n", *argv);
 			return -1;
 		}
@@ -1636,11 +1620,11 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 				    "echotc: Warning: Missing argument.\n");
 			return -1;
 		}
-		i = Strtol(*argv, &ep, 10);
+		i = wcstol(*argv, &ep, 10);
 		if (*ep != '\0' || i < 0) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for cols.\n",
+				    "echotc: Bad value `%ls' for cols.\n",
 				    *argv);
 			return -1;
 		}
@@ -1652,11 +1636,11 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 				    "echotc: Warning: Missing argument.\n");
 			return -1;
 		}
-		i = Strtol(*argv, &ep, 10);
+		i = wcstol(*argv, &ep, 10);
 		if (*ep != '\0' || i < 0) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "' for rows.\n",
+				    "echotc: Bad value `%ls' for rows.\n",
 				    *argv);
 			return -1;
 		}
@@ -1664,14 +1648,14 @@ terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
 		if (*ep != '\0') {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Bad value `" FSTR "'.\n", *argv);
+				    "echotc: Bad value `%ls'.\n", *argv);
 			return -1;
 		}
 		argv++;
 		if (*argv && *argv[0]) {
 			if (!silent)
 				(void) fprintf(el->el_errfile,
-				    "echotc: Warning: Extra argument `" FSTR
+				    "echotc: Warning: Extra argument `%ls"
 				    "'.\n", *argv);
 			return -1;
 		}
diff --git a/extra/libedit/libedit-20221030-3.1/src/terminal.h b/extra/libedit/libedit-20221030-3.1/src/terminal.h
new file mode 100644
index 000000000000..e45836954829
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/terminal.h
@@ -0,0 +1,134 @@
+/*	$NetBSD: terminal.h,v 1.9 2016/05/09 21:46:56 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)term.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * el.term.h: Termcap header
+ */
+#ifndef _h_el_terminal
+#define	_h_el_terminal
+
+typedef struct {		/* Symbolic function key bindings	*/
+	const wchar_t	*name;	/* name of the key			*/
+	int		 key;	/* Index in termcap table		*/
+	keymacro_value_t	 fun;	/* Function bound to it			*/
+	int		 type;	/* Type of function			*/
+} funckey_t;
+
+typedef struct {
+	const char *t_name;		/* the terminal name	*/
+	coord_t	  t_size;		/* # lines and cols	*/
+	int	  t_flags;
+#define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
+#define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
+#define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
+#define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
+#define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
+#define	TERM_CAN_UP		0x020	/* Can move up		*/
+#define	TERM_HAS_META		0x040	/* Has a meta key	*/
+#define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
+#define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
+	char	 *t_buf;		/* Termcap buffer	*/
+	size_t	  t_loc;		/* location used	*/
+	char	**t_str;		/* termcap strings	*/
+	int	 *t_val;		/* termcap values	*/
+	char	 *t_cap;		/* Termcap buffer	*/
+	funckey_t	 *t_fkey;		/* Array of keys	*/
+} el_terminal_t;
+
+/*
+ * fKey indexes
+ */
+#define	A_K_DN		0
+#define	A_K_UP		1
+#define	A_K_LT		2
+#define	A_K_RT		3
+#define	A_K_HO		4
+#define	A_K_EN		5
+#define	A_K_DE		6
+#define	A_K_NKEYS	7
+
+#ifdef __sun
+extern int tgetent(char *, const char *);
+extern int tgetflag(char *);
+extern int tgetnum(char *);
+extern int tputs(const char *, int, int (*)(int));
+extern char* tgoto(const char*, int, int);
+extern char* tgetstr(char*, char**);
+#endif
+
+libedit_private void	terminal_move_to_line(EditLine *, int);
+libedit_private void	terminal_move_to_char(EditLine *, int);
+libedit_private void	terminal_clear_EOL(EditLine *, int);
+libedit_private void	terminal_overwrite(EditLine *, const wchar_t *, size_t);
+libedit_private void	terminal_insertwrite(EditLine *, wchar_t *, int);
+libedit_private void	terminal_deletechars(EditLine *, int);
+libedit_private void	terminal_clear_screen(EditLine *);
+libedit_private void	terminal_beep(EditLine *);
+libedit_private int	terminal_change_size(EditLine *, int, int);
+libedit_private int	terminal_get_size(EditLine *, int *, int *);
+libedit_private int	terminal_init(EditLine *);
+libedit_private void	terminal_bind_arrow(EditLine *);
+libedit_private void	terminal_print_arrow(EditLine *, const wchar_t *);
+libedit_private int	terminal_clear_arrow(EditLine *, const wchar_t *);
+libedit_private int	terminal_set_arrow(EditLine *, const wchar_t *,
+    keymacro_value_t *, int);
+libedit_private void	terminal_end(EditLine *);
+libedit_private void	terminal_get(EditLine *, const char **);
+libedit_private int	terminal_set(EditLine *, const char *);
+libedit_private int	terminal_settc(EditLine *, int, const wchar_t **);
+libedit_private int	terminal_gettc(EditLine *, int, char **);
+libedit_private int	terminal_telltc(EditLine *, int, const wchar_t **);
+libedit_private int	terminal_echotc(EditLine *, int, const wchar_t **);
+libedit_private void	terminal_writec(EditLine *, wint_t);
+libedit_private int	terminal__putc(EditLine *, wint_t);
+libedit_private void	terminal__flush(EditLine *);
+
+/*
+ * Easy access macros
+ */
+#define	EL_FLAGS	(el)->el_terminal.t_flags
+
+#define	EL_CAN_INSERT		(EL_FLAGS & TERM_CAN_INSERT)
+#define	EL_CAN_DELETE		(EL_FLAGS & TERM_CAN_DELETE)
+#define	EL_CAN_CEOL		(EL_FLAGS & TERM_CAN_CEOL)
+#define	EL_CAN_TAB		(EL_FLAGS & TERM_CAN_TAB)
+#define	EL_CAN_ME		(EL_FLAGS & TERM_CAN_ME)
+#define EL_CAN_UP		(EL_FLAGS & TERM_CAN_UP)
+#define	EL_HAS_META		(EL_FLAGS & TERM_HAS_META)
+#define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
+#define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
+
+#endif /* _h_el_terminal */
diff --git a/cmd-line-utils/libedit/tokenizer.c b/extra/libedit/libedit-20221030-3.1/src/tokenizer.c
similarity index 88%
rename from cmd-line-utils/libedit/tokenizer.c
rename to extra/libedit/libedit-20221030-3.1/src/tokenizer.c
index 7267164e9b6f..5efb43275e2a 100644
--- a/cmd-line-utils/libedit/tokenizer.c
+++ b/extra/libedit/libedit-20221030-3.1/src/tokenizer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tokenizer.c,v 1.19 2011/07/28 20:50:55 christos Exp $	*/
+/*	$NetBSD: tokenizer.c,v 1.28 2016/04/11 18:56:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -32,11 +32,15 @@
  * SUCH DAMAGE.
  */
 
+#ifndef NARROWCHAR
 #include "config.h"
+#endif
+
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: tokenizer.c,v 1.28 2016/04/11 18:56:31 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -44,10 +48,10 @@ static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 /*
  * tokenize.c: Bourne shell like tokenizer
  */
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "histedit.h"
-#include "chartype.h"
 
 typedef enum {
 	Q_none, Q_single, Q_double, Q_one, Q_doubleone
@@ -64,12 +68,26 @@ typedef enum {
 #define	tok_malloc(a)		malloc(a)
 #define	tok_free(a)		free(a)
 #define	tok_realloc(a, b)	realloc(a, b)
-#define	tok_strdup(a)		Strdup(a)
 
+#ifdef NARROWCHAR
+#define	Char			char
+#define	FUN(prefix, rest)	prefix ## _ ## rest
+#define	TYPE(type)		type
+#define	STR(x)			x
+#define	Strchr(s, c)		strchr(s, c)
+#define	tok_strdup(s)		strdup(s)
+#else
+#define	Char			wchar_t
+#define	FUN(prefix, rest)	prefix ## _w ## rest
+#define	TYPE(type)		type ## W
+#define	STR(x)			L ## x
+#define	Strchr(s, c)		wcschr(s, c)
+#define	tok_strdup(s)		wcsdup(s)
+#endif
 
 struct TYPE(tokenizer) {
 	Char	*ifs;		/* In field separator			 */
-	int	 argc, amax;	/* Current and maximum number of args	 */
+	size_t	 argc, amax;	/* Current and maximum number of args	 */
 	Char   **argv;		/* Argument list			 */
 	Char	*wptr, *wmax;	/* Space and limit on the word buffer	 */
 	Char	*wstart;	/* Beginning of next word		 */
@@ -79,13 +97,13 @@ struct TYPE(tokenizer) {
 };
 
 
-private void FUN(tok,finish)(TYPE(Tokenizer) *);
+static void FUN(tok,finish)(TYPE(Tokenizer) *);
 
 
 /* FUN(tok,finish)():
  *	Finish a word in the tokenizer.
  */
-private void
+static void
 FUN(tok,finish)(TYPE(Tokenizer) *tok)
 {
 
@@ -102,7 +120,7 @@ FUN(tok,finish)(TYPE(Tokenizer) *tok)
 /* FUN(tok,init)():
  *	Initialize the tokenizer
  */
-public TYPE(Tokenizer) *
+TYPE(Tokenizer) *
 FUN(tok,init)(const Char *ifs)
 {
 	TYPE(Tokenizer) *tok = tok_malloc(sizeof(*tok));
@@ -136,14 +154,14 @@ FUN(tok,init)(const Char *ifs)
 	tok->flags = 0;
 	tok->quote = Q_none;
 
-	return (tok);
+	return tok;
 }
 
 
 /* FUN(tok,reset)():
  *	Reset the tokenizer
  */
-public void
+void
 FUN(tok,reset)(TYPE(Tokenizer) *tok)
 {
 
@@ -158,7 +176,7 @@ FUN(tok,reset)(TYPE(Tokenizer) *tok)
 /* FUN(tok,end)():
  *	Clean up
  */
-public void
+void
 FUN(tok,end)(TYPE(Tokenizer) *tok)
 {
 
@@ -187,7 +205,7 @@ FUN(tok,end)(TYPE(Tokenizer) *tok)
  *		cursorc	if !NULL, argv element containing cursor
  *		cursorv	if !NULL, offset in argv[cursorc] of cursor
  */
-public int
+int
 FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
     int *argc, const Char ***argv, int *cursorc, int *cursoro)
 {
@@ -200,7 +218,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 		if (ptr >= line->lastchar)
 			ptr = STR("");
 		if (ptr == line->cursor) {
-			cc = tok->argc;
+			cc = (int)tok->argc;
 			co = (int)(tok->wptr - tok->wstart);
 		}
 		switch (*ptr) {
@@ -232,7 +250,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (-1);
+				return -1;
 			}
 			break;
 
@@ -263,7 +281,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (-1);
+				return -1;
 			}
 			break;
 
@@ -294,7 +312,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (-1);
+				return -1;
 			}
 			break;
 
@@ -320,7 +338,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (0);
+				return 0;
 			}
 			break;
 
@@ -330,15 +348,15 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				/* Finish word and return */
 				if (tok->flags & TOK_EAT) {
 					tok->flags &= ~TOK_EAT;
-					return (3);
+					return 3;
 				}
 				goto tok_line_outok;
 
 			case Q_single:
-				return (1);
+				return 1;
 
 			case Q_double:
-				return (2);
+				return 2;
 
 			case Q_doubleone:
 				tok->quote = Q_double;
@@ -351,7 +369,7 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (-1);
+				return -1;
 			}
 			break;
 
@@ -383,21 +401,21 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 				break;
 
 			default:
-				return (-1);
+				return -1;
 
 			}
 			break;
 		}
 
 		if (tok->wptr >= tok->wmax - 4) {
-			size_t size = tok->wmax - tok->wspace + WINCR;
+			size_t size = (size_t)(tok->wmax - tok->wspace + WINCR);
 			Char *s = tok_realloc(tok->wspace,
 			    size * sizeof(*s));
 			if (s == NULL)
-				return (-1);
+				return -1;
 
 			if (s != tok->wspace) {
-				int i;
+				size_t i;
 				for (i = 0; i < tok->argc; i++) {
 				    tok->argv[i] =
 					(tok->argv[i] - tok->wspace) + s;
@@ -412,14 +430,16 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 			Char **p;
 			tok->amax += AINCR;
 			p = tok_realloc(tok->argv, tok->amax * sizeof(*p));
-			if (p == NULL)
-				return (-1);
+			if (p == NULL) {
+				tok->amax -= AINCR;
+				return -1;
+			}
 			tok->argv = p;
 		}
 	}
  tok_line_outok:
 	if (cc == -1 && co == -1) {
-		cc = tok->argc;
+		cc = (int)tok->argc;
 		co = (int)(tok->wptr - tok->wstart);
 	}
 	if (cursorc != NULL)
@@ -428,15 +448,15 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 		*cursoro = co;
 	FUN(tok,finish)(tok);
 	*argv = (const Char **)tok->argv;
-	*argc = tok->argc;
-	return (0);
+	*argc = (int)tok->argc;
+	return 0;
 }
 
 /* FUN(tok,str)():
  *	Simpler version of tok_line, taking a NUL terminated line
  *	and splitting into words, ignoring cursor state.
  */
-public int
+int
 FUN(tok,str)(TYPE(Tokenizer) *tok, const Char *line, int *argc,
     const Char ***argv)
 {
@@ -445,5 +465,5 @@ FUN(tok,str)(TYPE(Tokenizer) *tok, const Char *line, int *argc,
 	memset(&li, 0, sizeof(li));
 	li.buffer = line;
 	li.cursor = li.lastchar = Strchr(line, '\0');
-	return (FUN(tok,line)(tok, &li, argc, argv, NULL, NULL));
+	return FUN(tok,line)(tok, &li, argc, argv, NULL, NULL);
 }
diff --git a/extra/libedit/libedit-20221030-3.1/src/tokenizern.c b/extra/libedit/libedit-20221030-3.1/src/tokenizern.c
new file mode 100644
index 000000000000..5846b60643c5
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/tokenizern.c
@@ -0,0 +1,3 @@
+#include "config.h"
+#define NARROWCHAR
+#include "tokenizer.c"
diff --git a/cmd-line-utils/libedit/tty.c b/extra/libedit/libedit-20221030-3.1/src/tty.c
similarity index 76%
rename from cmd-line-utils/libedit/tty.c
rename to extra/libedit/libedit-20221030-3.1/src/tty.c
index 821368500a7a..b96c9a53c268 100644
--- a/cmd-line-utils/libedit/tty.c
+++ b/extra/libedit/libedit-20221030-3.1/src/tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.41 2011/10/04 15:27:04 christos Exp $	*/
+/*	$NetBSD: tty.c,v 1.70 2021/07/14 07:47:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,6 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: tty.c,v 1.70 2021/07/14 07:47:23 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,10 +46,14 @@ static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
  */
 #include <assert.h>
 #include <errno.h>
-#include <unistd.h>	/* for isatty */
+#include <stdlib.h>	/* for abort */
+#include <string.h>
 #include <strings.h>	/* for ffs */
+#include <unistd.h>	/* for isatty */
+
 #include "el.h"
-#include "tty.h"
+#include "fcns.h"
+#include "parse.h"
 
 typedef struct ttymodes_t {
 	const char *m_name;
@@ -57,12 +62,12 @@ typedef struct ttymodes_t {
 }          ttymodes_t;
 
 typedef struct ttymap_t {
-	Int nch, och;		/* Internal and termio rep of chars */
+	wint_t nch, och;	/* Internal and termio rep of chars */
 	el_action_t bind[3];	/* emacs, vi, and vi-cmd */
 } ttymap_t;
 
 
-private const ttyperm_t ttyperm = {
+static const ttyperm_t ttyperm = {
 	{
 		{"iflag:", ICRNL, (INLCR | IGNCR)},
 		{"oflag:", (OPOST | ONLCR), ONLRET},
@@ -90,7 +95,7 @@ private const ttyperm_t ttyperm = {
 	}
 };
 
-private const ttychar_t ttychar = {
+static const ttychar_t ttychar = {
 	{
 		CINTR, CQUIT, CERASE, CKILL,
 		CEOF, CEOL, CEOL2, CSWTCH,
@@ -120,7 +125,7 @@ private const ttychar_t ttychar = {
 	}
 };
 
-private const ttymap_t tty_map[] = {
+static const ttymap_t tty_map[] = {
 #ifdef VERASE
 	{C_ERASE, VERASE,
 	{EM_DELETE_PREV_CHAR, VI_DELETE_PREV_CHAR, ED_PREV_CHAR}},
@@ -153,11 +158,11 @@ private const ttymap_t tty_map[] = {
 	{C_LNEXT, VLNEXT,
 	{ED_QUOTED_INSERT, ED_QUOTED_INSERT, ED_UNASSIGNED}},
 #endif /* VLNEXT */
-	{(Int)-1, (Int)-1,
+	{(wint_t)-1, (wint_t)-1,
 	{ED_UNASSIGNED, ED_UNASSIGNED, ED_UNASSIGNED}}
 };
 
-private const ttymodes_t ttymodes[] = {
+static const ttymodes_t ttymodes[] = {
 #ifdef	IGNBRK
 	{"ignbrk", IGNBRK, MD_INP},
 #endif /* IGNBRK */
@@ -451,20 +456,21 @@ private const ttymodes_t ttymodes[] = {
 #define	tty__geteightbit(td)	(((td)->c_cflag & CSIZE) == CS8)
 #define	tty__cooked_mode(td)	((td)->c_lflag & ICANON)
 
-private int	tty_getty(EditLine *, struct termios *);
-private int	tty_setty(EditLine *, int, const struct termios *);
-private int	tty__getcharindex(int);
-private void	tty__getchar(struct termios *, unsigned char *);
-private void	tty__setchar(struct termios *, unsigned char *);
-private speed_t	tty__getspeed(struct termios *);
-private int	tty_setup(EditLine *);
+static int	tty_getty(EditLine *, struct termios *);
+static int	tty_setty(EditLine *, int, const struct termios *);
+static int	tty__getcharindex(int);
+static void	tty__getchar(struct termios *, unsigned char *);
+static void	tty__setchar(struct termios *, unsigned char *);
+static speed_t	tty__getspeed(struct termios *);
+static int	tty_setup(EditLine *);
+static void	tty_setup_flags(EditLine *, struct termios *, int);
 
 #define	t_qu	t_ts
 
 /* tty_getty():
  *	Wrapper for tcgetattr to handle EINTR
  */
-private int
+static int
 tty_getty(EditLine *el, struct termios *t)
 {
 	int rv;
@@ -476,7 +482,7 @@ tty_getty(EditLine *el, struct termios *t)
 /* tty_setty():
  *	Wrapper for tcsetattr to handle EINTR
  */
-private int
+static int
 tty_setty(EditLine *el, int action, const struct termios *t)
 {
 	int rv;
@@ -488,45 +494,38 @@ tty_setty(EditLine *el, int action, const struct termios *t)
 /* tty_setup():
  *	Get the tty parameters and initialize the editing state
  */
-private int
+static int
 tty_setup(EditLine *el)
 {
-	int rst = 1;
+	int rst = (el->el_flags & NO_RESET) == 0;
 
 	if (el->el_flags & EDIT_DISABLED)
 		return 0;
 
+	if (el->el_tty.t_initialized)
+		return -1;
+
 	if (!isatty(el->el_outfd)) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile,
-		    "tty_setup: isatty: %s\n", strerror(errno));
+		(void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__,
+		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
 	}
-	if (tty_getty(el, &el->el_tty.t_ed) == -1) {
+	if (tty_getty(el, &el->el_tty.t_or) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile,
-		    "tty_setup: tty_getty: %s\n", strerror(errno));
+		(void) fprintf(el->el_errfile, "%s: tty_getty: %s\n", __func__,
+		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
 	}
-	el->el_tty.t_ts = el->el_tty.t_ex = el->el_tty.t_ed;
+	el->el_tty.t_ts = el->el_tty.t_ex = el->el_tty.t_ed = el->el_tty.t_or;
 
 	el->el_tty.t_speed = tty__getspeed(&el->el_tty.t_ex);
 	el->el_tty.t_tabs = tty__gettabs(&el->el_tty.t_ex);
 	el->el_tty.t_eight = tty__geteightbit(&el->el_tty.t_ex);
 
-	el->el_tty.t_ex.c_iflag &= ~el->el_tty.t_t[EX_IO][MD_INP].t_clrmask;
-	el->el_tty.t_ex.c_iflag |= el->el_tty.t_t[EX_IO][MD_INP].t_setmask;
-
-	el->el_tty.t_ex.c_oflag &= ~el->el_tty.t_t[EX_IO][MD_OUT].t_clrmask;
-	el->el_tty.t_ex.c_oflag |= el->el_tty.t_t[EX_IO][MD_OUT].t_setmask;
-
-	el->el_tty.t_ex.c_cflag &= ~el->el_tty.t_t[EX_IO][MD_CTL].t_clrmask;
-	el->el_tty.t_ex.c_cflag |= el->el_tty.t_t[EX_IO][MD_CTL].t_setmask;
-
-	el->el_tty.t_ex.c_lflag &= ~el->el_tty.t_t[EX_IO][MD_LIN].t_clrmask;
-	el->el_tty.t_ex.c_lflag |= el->el_tty.t_t[EX_IO][MD_LIN].t_setmask;
+	tty_setup_flags(el, &el->el_tty.t_ex, EX_IO);
 
 	/*
          * Reset the tty chars to reasonable defaults
@@ -554,37 +553,28 @@ tty_setup(EditLine *el)
 		tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
 		if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
 #ifdef DEBUG_TTY
-			(void) fprintf(el->el_errfile,
-			    "tty_setup: tty_setty: %s\n",
-			    strerror(errno));
+			(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n",
+			    __func__, strerror(errno));
 #endif /* DEBUG_TTY */
 			return -1;
 		}
 	}
 
-	el->el_tty.t_ed.c_iflag &= ~el->el_tty.t_t[ED_IO][MD_INP].t_clrmask;
-	el->el_tty.t_ed.c_iflag |= el->el_tty.t_t[ED_IO][MD_INP].t_setmask;
-
-	el->el_tty.t_ed.c_oflag &= ~el->el_tty.t_t[ED_IO][MD_OUT].t_clrmask;
-	el->el_tty.t_ed.c_oflag |= el->el_tty.t_t[ED_IO][MD_OUT].t_setmask;
-
-	el->el_tty.t_ed.c_cflag &= ~el->el_tty.t_t[ED_IO][MD_CTL].t_clrmask;
-	el->el_tty.t_ed.c_cflag |= el->el_tty.t_t[ED_IO][MD_CTL].t_setmask;
-
-	el->el_tty.t_ed.c_lflag &= ~el->el_tty.t_t[ED_IO][MD_LIN].t_clrmask;
-	el->el_tty.t_ed.c_lflag |= el->el_tty.t_t[ED_IO][MD_LIN].t_setmask;
+	tty_setup_flags(el, &el->el_tty.t_ed, ED_IO);
 
 	tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
 	tty_bind_char(el, 1);
+	el->el_tty.t_initialized = 1;
 	return 0;
 }
 
-protected int
+libedit_private int
 tty_init(EditLine *el)
 {
 
 	el->el_tty.t_mode = EX_IO;
 	el->el_tty.t_vdisable = _POSIX_VDISABLE;
+	el->el_tty.t_initialized = 0;
 	(void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
 	(void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
 	return tty_setup(el);
@@ -594,19 +584,30 @@ tty_init(EditLine *el)
 /* tty_end():
  *	Restore the tty to its original settings
  */
-protected void
+libedit_private void
 /*ARGSUSED*/
-tty_end(EditLine *el __attribute__((__unused__)))
+tty_end(EditLine *el, int how)
 {
+	if (el->el_flags & EDIT_DISABLED)
+		return;
 
-	/* XXX: Maybe reset to an initial state? */
+	if (!el->el_tty.t_initialized)
+		return;
+
+	if (tty_setty(el, how, &el->el_tty.t_or) == -1)
+	{
+#ifdef DEBUG_TTY
+		(void) fprintf(el->el_errfile,
+		    "%s: tty_setty: %s\n", __func__, strerror(errno));
+#endif /* DEBUG_TTY */
+	}
 }
 
 
 /* tty__getspeed():
  *	Get the tty speed
  */
-private speed_t
+static speed_t
 tty__getspeed(struct termios *td)
 {
 	speed_t spd;
@@ -619,7 +620,7 @@ tty__getspeed(struct termios *td)
 /* tty__getspeed():
  *	Return the index of the asked char in the c_cc array
  */
-private int
+static int
 tty__getcharindex(int i)
 {
 	switch (i) {
@@ -727,7 +728,7 @@ tty__getcharindex(int i)
 /* tty__getchar():
  *	Get the tty characters
  */
-private void
+static void
 tty__getchar(struct termios *td, unsigned char *s)
 {
 
@@ -809,7 +810,7 @@ tty__getchar(struct termios *td, unsigned char *s)
 /* tty__setchar():
  *	Set the tty characters
  */
-private void
+static void
 tty__setchar(struct termios *td, unsigned char *s)
 {
 
@@ -891,13 +892,13 @@ tty__setchar(struct termios *td, unsigned char *s)
 /* tty_bind_char():
  *	Rebind the editline functions
  */
-protected void
+libedit_private void
 tty_bind_char(EditLine *el, int force)
 {
 
 	unsigned char *t_n = el->el_tty.t_c[ED_IO];
 	unsigned char *t_o = el->el_tty.t_ed.c_cc;
-	Char new[2], old[2];
+	wchar_t new[2], old[2];
 	const ttymap_t *tp;
 	el_action_t *map, *alt;
 	const el_action_t *dmap, *dalt;
@@ -913,31 +914,85 @@ tty_bind_char(EditLine *el, int force)
 		dalt = NULL;
 	}
 
-	for (tp = tty_map; tp->nch != (Int)-1; tp++) {
-		new[0] = t_n[tp->nch];
-		old[0] = t_o[tp->och];
+	for (tp = tty_map; tp->nch != (wint_t)-1; tp++) {
+		new[0] = (wchar_t)t_n[tp->nch];
+		old[0] = (wchar_t)t_o[tp->och];
 		if (new[0] == old[0] && !force)
 			continue;
 		/* Put the old default binding back, and set the new binding */
 		keymacro_clear(el, map, old);
-		map[UC(old[0])] = dmap[UC(old[0])];
+		map[(unsigned char)old[0]] = dmap[(unsigned char)old[0]];
 		keymacro_clear(el, map, new);
 		/* MAP_VI == 1, MAP_EMACS == 0... */
-		map[UC(new[0])] = tp->bind[el->el_map.type];
+		map[(unsigned char)new[0]] = tp->bind[el->el_map.type];
 		if (dalt) {
 			keymacro_clear(el, alt, old);
-			alt[UC(old[0])] = dalt[UC(old[0])];
+			alt[(unsigned char)old[0]] =
+			    dalt[(unsigned char)old[0]];
 			keymacro_clear(el, alt, new);
-			alt[UC(new[0])] = tp->bind[el->el_map.type + 1];
+			alt[(unsigned char)new[0]] =
+			    tp->bind[el->el_map.type + 1];
 		}
 	}
 }
 
 
+static tcflag_t *
+tty__get_flag(struct termios *t, int kind) {
+	switch (kind) {
+	case MD_INP:
+		return &t->c_iflag;
+	case MD_OUT:
+		return &t->c_oflag;
+	case MD_CTL:
+		return &t->c_cflag;
+	case MD_LIN:
+		return &t->c_lflag;
+	default:
+		abort();
+		/*NOTREACHED*/
+	}
+}
+
+
+static tcflag_t
+tty_update_flag(EditLine *el, tcflag_t f, int mode, int kind)
+{
+	f &= ~el->el_tty.t_t[mode][kind].t_clrmask;
+	f |= el->el_tty.t_t[mode][kind].t_setmask;
+	return f;
+}
+
+
+static void
+tty_update_flags(EditLine *el, int kind)
+{
+	tcflag_t *tt, *ed, *ex;
+	tt = tty__get_flag(&el->el_tty.t_ts, kind);
+	ed = tty__get_flag(&el->el_tty.t_ed, kind);
+	ex = tty__get_flag(&el->el_tty.t_ex, kind);
+
+	if (*tt != *ex && (kind != MD_CTL || *tt != *ed)) {
+		*ed = tty_update_flag(el, *tt, ED_IO, kind);
+		*ex = tty_update_flag(el, *tt, EX_IO, kind);
+	}
+}
+
+
+static void
+tty_update_char(EditLine *el, int mode, int c) {
+	if (!((el->el_tty.t_t[mode][MD_CHAR].t_setmask & C_SH(c)))
+	    && (el->el_tty.t_c[TS_IO][c] != el->el_tty.t_c[EX_IO][c]))
+		el->el_tty.t_c[mode][c] = el->el_tty.t_c[TS_IO][c];
+	if (el->el_tty.t_t[mode][MD_CHAR].t_clrmask & C_SH(c))
+		el->el_tty.t_c[mode][c] = el->el_tty.t_vdisable;
+}
+
+
 /* tty_rawmode():
- * 	Set terminal into 1 character at a time mode.
+ *	Set terminal into 1 character at a time mode.
  */
-protected int
+libedit_private int
 tty_rawmode(EditLine *el)
 {
 
@@ -949,7 +1004,7 @@ tty_rawmode(EditLine *el)
 
 	if (tty_getty(el, &el->el_tty.t_ts) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "tty_rawmode: tty_getty: %s\n",
+		(void) fprintf(el->el_errfile, "%s: tty_getty: %s\n", __func__,
 		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
@@ -969,117 +1024,47 @@ tty_rawmode(EditLine *el)
 		(void) cfsetospeed(&el->el_tty.t_ed, el->el_tty.t_speed);
 	}
 	if (tty__cooked_mode(&el->el_tty.t_ts)) {
-		if (el->el_tty.t_ts.c_cflag != el->el_tty.t_ex.c_cflag) {
-			el->el_tty.t_ex.c_cflag =
-			    el->el_tty.t_ts.c_cflag;
-			el->el_tty.t_ex.c_cflag &=
-			    ~el->el_tty.t_t[EX_IO][MD_CTL].t_clrmask;
-			el->el_tty.t_ex.c_cflag |=
-			    el->el_tty.t_t[EX_IO][MD_CTL].t_setmask;
-
-			el->el_tty.t_ed.c_cflag =
-			    el->el_tty.t_ts.c_cflag;
-			el->el_tty.t_ed.c_cflag &=
-			    ~el->el_tty.t_t[ED_IO][MD_CTL].t_clrmask;
-			el->el_tty.t_ed.c_cflag |=
-			    el->el_tty.t_t[ED_IO][MD_CTL].t_setmask;
-		}
-		if ((el->el_tty.t_ts.c_lflag != el->el_tty.t_ex.c_lflag) &&
-		    (el->el_tty.t_ts.c_lflag != el->el_tty.t_ed.c_lflag)) {
-			el->el_tty.t_ex.c_lflag =
-			    el->el_tty.t_ts.c_lflag;
-			el->el_tty.t_ex.c_lflag &=
-			    ~el->el_tty.t_t[EX_IO][MD_LIN].t_clrmask;
-			el->el_tty.t_ex.c_lflag |=
-			    el->el_tty.t_t[EX_IO][MD_LIN].t_setmask;
-
-			el->el_tty.t_ed.c_lflag =
-			    el->el_tty.t_ts.c_lflag;
-			el->el_tty.t_ed.c_lflag &=
-			    ~el->el_tty.t_t[ED_IO][MD_LIN].t_clrmask;
-			el->el_tty.t_ed.c_lflag |=
-			    el->el_tty.t_t[ED_IO][MD_LIN].t_setmask;
-		}
-		if ((el->el_tty.t_ts.c_iflag != el->el_tty.t_ex.c_iflag) &&
-		    (el->el_tty.t_ts.c_iflag != el->el_tty.t_ed.c_iflag)) {
-			el->el_tty.t_ex.c_iflag =
-			    el->el_tty.t_ts.c_iflag;
-			el->el_tty.t_ex.c_iflag &=
-			    ~el->el_tty.t_t[EX_IO][MD_INP].t_clrmask;
-			el->el_tty.t_ex.c_iflag |=
-			    el->el_tty.t_t[EX_IO][MD_INP].t_setmask;
-
-			el->el_tty.t_ed.c_iflag =
-			    el->el_tty.t_ts.c_iflag;
-			el->el_tty.t_ed.c_iflag &=
-			    ~el->el_tty.t_t[ED_IO][MD_INP].t_clrmask;
-			el->el_tty.t_ed.c_iflag |=
-			    el->el_tty.t_t[ED_IO][MD_INP].t_setmask;
-		}
-		if ((el->el_tty.t_ts.c_oflag != el->el_tty.t_ex.c_oflag) &&
-		    (el->el_tty.t_ts.c_oflag != el->el_tty.t_ed.c_oflag)) {
-			el->el_tty.t_ex.c_oflag =
-			    el->el_tty.t_ts.c_oflag;
-			el->el_tty.t_ex.c_oflag &=
-			    ~el->el_tty.t_t[EX_IO][MD_OUT].t_clrmask;
-			el->el_tty.t_ex.c_oflag |=
-			    el->el_tty.t_t[EX_IO][MD_OUT].t_setmask;
-
-			el->el_tty.t_ed.c_oflag =
-			    el->el_tty.t_ts.c_oflag;
-			el->el_tty.t_ed.c_oflag &=
-			    ~el->el_tty.t_t[ED_IO][MD_OUT].t_clrmask;
-			el->el_tty.t_ed.c_oflag |=
-			    el->el_tty.t_t[ED_IO][MD_OUT].t_setmask;
-		}
+		int i;
+
+		for (i = MD_INP; i <= MD_LIN; i++)
+			tty_update_flags(el, i);
+
 		if (tty__gettabs(&el->el_tty.t_ex) == 0)
 			el->el_tty.t_tabs = 0;
 		else
 			el->el_tty.t_tabs = EL_CAN_TAB ? 1 : 0;
 
-		{
-			int i;
+		tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
+		/*
+		 * Check if the user made any changes.
+		 * If he did, then propagate the changes to the
+		 * edit and execute data structures.
+		 */
+		for (i = 0; i < C_NCC; i++)
+			if (el->el_tty.t_c[TS_IO][i] !=
+			    el->el_tty.t_c[EX_IO][i])
+				break;
 
-			tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
+		if (i != C_NCC) {
 			/*
-		         * Check if the user made any changes.
-		         * If he did, then propagate the changes to the
-		         * edit and execute data structures.
-		         */
+			 * Propagate changes only to the unlibedit_private
+			 * chars that have been modified just now.
+			 */
 			for (i = 0; i < C_NCC; i++)
-				if (el->el_tty.t_c[TS_IO][i] !=
-				    el->el_tty.t_c[EX_IO][i])
-					break;
-
-			if (i != C_NCC) {
-				/*
-				 * Propagate changes only to the unprotected
-				 * chars that have been modified just now.
-				 */
-				for (i = 0; i < C_NCC; i++) {
-					if (!((el->el_tty.t_t[ED_IO][MD_CHAR].t_setmask & C_SH(i)))
-					    && (el->el_tty.t_c[TS_IO][i] != el->el_tty.t_c[EX_IO][i]))
-						el->el_tty.t_c[ED_IO][i] = el->el_tty.t_c[TS_IO][i];
-					if (el->el_tty.t_t[ED_IO][MD_CHAR].t_clrmask & C_SH(i))
-						el->el_tty.t_c[ED_IO][i] = el->el_tty.t_vdisable;
-				}
-				tty_bind_char(el, 0);
-				tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
-
-				for (i = 0; i < C_NCC; i++) {
-					if (!((el->el_tty.t_t[EX_IO][MD_CHAR].t_setmask & C_SH(i)))
-					    && (el->el_tty.t_c[TS_IO][i] != el->el_tty.t_c[EX_IO][i]))
-						el->el_tty.t_c[EX_IO][i] = el->el_tty.t_c[TS_IO][i];
-					if (el->el_tty.t_t[EX_IO][MD_CHAR].t_clrmask & C_SH(i))
-						el->el_tty.t_c[EX_IO][i] = el->el_tty.t_vdisable;
-				}
-				tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
-			}
+				tty_update_char(el, ED_IO, i);
+
+			tty_bind_char(el, 0);
+			tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
+
+			for (i = 0; i < C_NCC; i++)
+				tty_update_char(el, EX_IO, i);
+
+			tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
 		}
 	}
 	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "tty_rawmode: tty_setty: %s\n",
+		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
 		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
@@ -1092,7 +1077,7 @@ tty_rawmode(EditLine *el)
 /* tty_cookedmode():
  *	Set the tty back to normal mode
  */
-protected int
+libedit_private int
 tty_cookedmode(EditLine *el)
 {				/* set tty in normal setup */
 
@@ -1104,8 +1089,7 @@ tty_cookedmode(EditLine *el)
 
 	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile,
-		    "tty_cookedmode: tty_setty: %s\n",
+		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
 		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
@@ -1118,7 +1102,7 @@ tty_cookedmode(EditLine *el)
 /* tty_quotemode():
  *	Turn on quote mode
  */
-protected int
+libedit_private int
 tty_quotemode(EditLine *el)
 {
 	if (el->el_tty.t_mode == QU_IO)
@@ -1126,21 +1110,11 @@ tty_quotemode(EditLine *el)
 
 	el->el_tty.t_qu = el->el_tty.t_ed;
 
-	el->el_tty.t_qu.c_iflag &= ~el->el_tty.t_t[QU_IO][MD_INP].t_clrmask;
-	el->el_tty.t_qu.c_iflag |= el->el_tty.t_t[QU_IO][MD_INP].t_setmask;
-
-	el->el_tty.t_qu.c_oflag &= ~el->el_tty.t_t[QU_IO][MD_OUT].t_clrmask;
-	el->el_tty.t_qu.c_oflag |= el->el_tty.t_t[QU_IO][MD_OUT].t_setmask;
-
-	el->el_tty.t_qu.c_cflag &= ~el->el_tty.t_t[QU_IO][MD_CTL].t_clrmask;
-	el->el_tty.t_qu.c_cflag |= el->el_tty.t_t[QU_IO][MD_CTL].t_setmask;
-
-	el->el_tty.t_qu.c_lflag &= ~el->el_tty.t_t[QU_IO][MD_LIN].t_clrmask;
-	el->el_tty.t_qu.c_lflag |= el->el_tty.t_t[QU_IO][MD_LIN].t_setmask;
+	tty_setup_flags(el, &el->el_tty.t_qu, QU_IO);
 
 	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_qu) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "QuoteModeOn: tty_setty: %s\n",
+		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
 		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
@@ -1153,7 +1127,7 @@ tty_quotemode(EditLine *el)
 /* tty_noquotemode():
  *	Turn off quote mode
  */
-protected int
+libedit_private int
 tty_noquotemode(EditLine *el)
 {
 
@@ -1161,7 +1135,7 @@ tty_noquotemode(EditLine *el)
 		return 0;
 	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
 #ifdef DEBUG_TTY
-		(void) fprintf(el->el_errfile, "QuoteModeOff: tty_setty: %s\n",
+		(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n", __func__,
 		    strerror(errno));
 #endif /* DEBUG_TTY */
 		return -1;
@@ -1174,22 +1148,22 @@ tty_noquotemode(EditLine *el)
 /* tty_stty():
  *	Stty builtin
  */
-protected int
+libedit_private int
 /*ARGSUSED*/
-tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
+tty_stty(EditLine *el, int argc __attribute__((__unused__)),
+    const wchar_t **argv)
 {
 	const ttymodes_t *m;
 	char x;
 	int aflag = 0;
-	const Char *s, *d;
+	const wchar_t *s, *d;
         char name[EL_BUFSIZ];
 	struct termios *tios = &el->el_tty.t_ex;
 	int z = EX_IO;
 
 	if (argv == NULL)
 		return -1;
-	strncpy(name, ct_encode_string(*argv++, &el->el_scratch), sizeof(name));
-        name[sizeof(name) - 1] = '\0';
+	strlcpy(name, ct_encode_string(*argv++, &el->el_scratch), sizeof(name));
 
 	while (argv && *argv && argv[0][0] == '-' && argv[0][2] == '\0')
 		switch (argv[0][1]) {
@@ -1214,8 +1188,8 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 			break;
 		default:
 			(void) fprintf(el->el_errfile,
-			    "%s: Unknown switch `%c'.\n",
-                                       name, (int) argv[0][1]);
+			    "%s: Unknown switch `%lc'.\n",
+			    name, (wint_t)argv[0][1]);
 			return -1;
 		}
 
@@ -1245,7 +1219,8 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 
 				cu = strlen(m->m_name) + (x != '\0') + 1;
 
-				if (len + cu >= (size_t)el->el_terminal.t_size.h) {
+				if (len + cu >=
+				    (size_t)el->el_terminal.t_size.h) {
 					(void) fprintf(el->el_outfile, "\n%*s",
 					    (int)st, "");
 					len = st + cu;
@@ -1264,7 +1239,7 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 		return 0;
 	}
 	while (argv && (s = *argv++)) {
-		const Char *p;
+		const wchar_t *p;
 		switch (*s) {
 		case '+':
 		case '-':
@@ -1275,16 +1250,18 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 			break;
 		}
 		d = s;
-		p = Strchr(s, '=');
+		p = wcschr(s, L'=');
 		for (m = ttymodes; m->m_name; m++)
-			if ((p ? strncmp(m->m_name, ct_encode_string(d, &el->el_scratch), (size_t)(p - d)) :
-			    strcmp(m->m_name, ct_encode_string(d, &el->el_scratch))) == 0 &&
+			if ((p ? strncmp(m->m_name, ct_encode_string(d,
+			    &el->el_scratch), (size_t)(p - d)) :
+			    strcmp(m->m_name, ct_encode_string(d,
+			    &el->el_scratch))) == 0 &&
 			    (p == NULL || m->m_type == MD_CHAR))
 				break;
 
 		if (!m->m_name) {
 			(void) fprintf(el->el_errfile,
-			    "%s: Invalid argument `" FSTR "'.\n", name, d);
+			    "%s: Invalid argument `%ls'.\n", name, d);
 			return -1;
 		}
 		if (p) {
@@ -1314,11 +1291,12 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 		}
 	}
 
+	tty_setup_flags(el, tios, z);
 	if (el->el_tty.t_mode == z) {
 		if (tty_setty(el, TCSADRAIN, tios) == -1) {
 #ifdef DEBUG_TTY
-			(void) fprintf(el->el_errfile,
-			    "tty_stty: tty_setty: %s\n", strerror(errno));
+			(void) fprintf(el->el_errfile, "%s: tty_setty: %s\n",
+			    __func__, strerror(errno));
 #endif /* DEBUG_TTY */
 			return -1;
 		}
@@ -1332,7 +1310,7 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const Char **argv)
 /* tty_printchar():
  *	DEbugging routine to print the tty characters
  */
-private void
+static void
 tty_printchar(EditLine *el, unsigned char *s)
 {
 	ttyperm_t *m;
@@ -1351,3 +1329,44 @@ tty_printchar(EditLine *el, unsigned char *s)
 	(void) fprintf(el->el_errfile, "\n");
 }
 #endif /* notyet */
+
+
+static void
+tty_setup_flags(EditLine *el, struct termios *tios, int mode)
+{
+	int kind;
+	for (kind = MD_INP; kind <= MD_LIN; kind++) {
+		tcflag_t *f = tty__get_flag(tios, kind);
+		*f = tty_update_flag(el, *f, mode, kind);
+	}
+}
+
+libedit_private int
+tty_get_signal_character(EditLine *el, int sig)
+{
+#ifdef ECHOCTL
+	tcflag_t *ed = tty__get_flag(&el->el_tty.t_ed, MD_INP);
+	if ((*ed & ECHOCTL) == 0)
+		return -1;
+#endif
+	switch (sig) {
+#if defined(SIGINT) && defined(VINTR)
+	case SIGINT:
+		return el->el_tty.t_c[ED_IO][VINTR];
+#endif
+#if defined(SIGQUIT) && defined(VQUIT)
+	case SIGQUIT:
+		return el->el_tty.t_c[ED_IO][VQUIT];
+#endif
+#if defined(SIGINFO) && defined(VSTATUS)
+	case SIGINFO:
+		return el->el_tty.t_c[ED_IO][VSTATUS];
+#endif
+#if defined(SIGTSTP) && defined(VSUSP)
+	case SIGTSTP:
+		return el->el_tty.t_c[ED_IO][VSUSP];
+#endif
+	default:
+		return -1;
+	}
+}
diff --git a/cmd-line-utils/libedit/tty.h b/extra/libedit/libedit-20221030-3.1/src/tty.h
similarity index 93%
rename from cmd-line-utils/libedit/tty.h
rename to extra/libedit/libedit-20221030-3.1/src/tty.h
index 04485eb83ada..ac817c8ad7b7 100644
--- a/cmd-line-utils/libedit/tty.h
+++ b/extra/libedit/libedit-20221030-3.1/src/tty.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.h,v 1.13 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: tty.h,v 1.24 2021/07/31 20:51:32 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
 #ifndef _h_el_tty
 #define	_h_el_tty
 
-#include "sys.h"
-#include "histedit.h"
 #include <termios.h>
 #include <unistd.h>
 
@@ -434,7 +432,7 @@
 #define	C_SH(A)		((unsigned int)(1 << (A)))
 
 /*
- * Terminal dependend data structures
+ * Terminal dependent data structures
  */
 #define	EX_IO	0	/* while we are executing	*/
 #define	ED_IO	1	/* while we are editing		*/
@@ -442,6 +440,7 @@
 #define	QU_IO	2	/* used only for quoted chars	*/
 #define	NN_IO	3	/* The number of entries	*/
 
+/* Don't re-order */
 #define	MD_INP	0
 #define	MD_OUT	1
 #define	MD_CTL	2
@@ -457,24 +456,26 @@ typedef struct {
 
 typedef unsigned char ttychar_t[NN_IO][C_NCC];
 
-protected int	tty_init(EditLine *);
-protected void	tty_end(EditLine *);
-protected int	tty_stty(EditLine *, int, const Char **);
-protected int	tty_rawmode(EditLine *);
-protected int	tty_cookedmode(EditLine *);
-protected int	tty_quotemode(EditLine *);
-protected int	tty_noquotemode(EditLine *);
-protected void	tty_bind_char(EditLine *, int);
+libedit_private int	tty_init(EditLine *);
+libedit_private void	tty_end(EditLine *, int);
+libedit_private int	tty_stty(EditLine *, int, const wchar_t **);
+libedit_private int	tty_rawmode(EditLine *);
+libedit_private int	tty_cookedmode(EditLine *);
+libedit_private int	tty_quotemode(EditLine *);
+libedit_private int	tty_noquotemode(EditLine *);
+libedit_private void	tty_bind_char(EditLine *, int);
+libedit_private int	tty_get_signal_character(EditLine *, int);
 
 typedef struct {
     ttyperm_t t_t;
     ttychar_t t_c;
-    struct termios t_ex, t_ed, t_ts;
+    struct termios t_or, t_ex, t_ed, t_ts;
     int t_tabs;
     int t_eight;
     speed_t t_speed;
-    int t_mode;
+    unsigned char t_mode;
     unsigned char t_vdisable;
+    unsigned char t_initialized;
 } el_tty_t;
 
 
diff --git a/cmd-line-utils/libedit/np/unvis.c b/extra/libedit/libedit-20221030-3.1/src/unvis.c
similarity index 93%
rename from cmd-line-utils/libedit/np/unvis.c
rename to extra/libedit/libedit-20221030-3.1/src/unvis.c
index 754a79a26b55..b88b309fb3d5 100644
--- a/cmd-line-utils/libedit/np/unvis.c
+++ b/extra/libedit/libedit-20221030-3.1/src/unvis.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.36 2011/03/18 09:07:20 martin Exp $	*/
+/*	$NetBSD: unvis.c,v 1.45 2022/04/19 20:32:15 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -30,38 +30,24 @@
  */
 
 #include "config.h"
-
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
 #else
+__RCSID("$NetBSD: unvis.c,v 1.45 2022/04/19 20:32:15 rillig Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-/* XXXMYSQL : Make compiler happy. */
-#ifdef _LIBC
-#include "namespace.h"
-#endif
-
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
-
-/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
-#if defined(__sun) || defined(__sun__)
-#include <sys/inttypes.h>
-#else
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-
 #include <stdio.h>
 #include <errno.h>
-/*
-  XXXMYSQL : Due to different versions of vis.h available,
-             use the one bundled with libedit.
-*/
-#include "np/vis.h"
+#include <vis.h>
 
 #ifdef __weak_alias
 __weak_alias(strnunvisx,_strnunvisx)
@@ -78,26 +64,25 @@ __weak_alias(strnunvisx,_strnunvisx)
 #define	S_CTRL		4	/* control char started (^) */
 #define	S_OCTAL2	5	/* octal digit 2 */
 #define	S_OCTAL3	6	/* octal digit 3 */
-#define	S_HEX1		7	/* http hex digit */
-#define	S_HEX2		8	/* http hex digit 2 */
-#define S_MIME1		9	/* mime hex digit 1 */
-#define S_MIME2		10	/* mime hex digit 2 */
-#define S_EATCRNL	11	/* mime eating CRNL */
-#define S_AMP		12	/* seen & */
-#define S_NUMBER	13	/* collecting number */
-#define S_STRING	14	/* collecting string */
-
-#ifndef isoctal
+#define	S_HEX		7	/* mandatory hex digit */
+#define	S_HEX1		8	/* http hex digit */
+#define	S_HEX2		9	/* http hex digit 2 */
+#define	S_MIME1		10	/* mime hex digit 1 */
+#define	S_MIME2		11	/* mime hex digit 2 */
+#define	S_EATCRNL	12	/* mime eating CRNL */
+#define	S_AMP		13	/* seen & */
+#define	S_NUMBER	14	/* collecting number */
+#define	S_STRING	15	/* collecting string */
+
 #define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#endif
-#define xtod(c)		(isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
-#define XTOD(c)		(isdigit(c) ? (c - '0') : ((c - 'A') + 10))
+#define	xtod(c)		(isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
+#define	XTOD(c)		(isdigit(c) ? (c - '0') : ((c - 'A') + 10))
 
 /*
  * RFC 1866
  */
 static const struct nv {
-	const char *name;
+	char name[7];
 	uint8_t value;
 } nv[] = {
 	{ "AElig",	198 }, /* capital AE diphthong (ligature)  */
@@ -314,6 +299,9 @@ unvis(char *cp, int c, int *astate, int flag)
 			*cp = '\033';
 			*astate = SS(0, S_GROUND);
 			return UNVIS_VALID;
+		case 'x':
+			*astate = SS(0, S_HEX);
+			return UNVIS_NOCHAR;
 		case '\n':
 			/*
 			 * hidden newline
@@ -326,6 +314,12 @@ unvis(char *cp, int c, int *astate, int flag)
 			 */
 			*astate = SS(0, S_GROUND);
 			return UNVIS_NOCHAR;
+		default:
+			if (isgraph(c)) {
+				*cp = c;
+				*astate = SS(0, S_GROUND);
+				return UNVIS_VALID;
+			}
 		}
 		goto bad;
 
@@ -377,6 +371,10 @@ unvis(char *cp, int c, int *astate, int flag)
 		 */
 		return UNVIS_VALIDPUSH;
 
+	case S_HEX:
+		if (!isxdigit(uc))
+			goto bad;
+		/*FALLTHROUGH*/
 	case S_HEX1:
 		if (isxdigit(uc)) {
 			*cp = xtod(uc);
@@ -497,7 +495,7 @@ int
 strnunvisx(char *dst, size_t dlen, const char *src, int flag)
 {
 	char c;
-	char t, *start = dst;
+	char t = '\0', *start = dst;
 	int state = 0;
 
 	_DIAGASSERT(src != NULL);
@@ -508,7 +506,7 @@ strnunvisx(char *dst, size_t dlen, const char *src, int flag)
 			errno = ENOSPC; \
 			return -1; \
 		} \
-	} while (/*CONSTCOND*/0)
+	} while (0)
 
 	while ((c = *src++) != '\0') {
  again:
@@ -528,7 +526,7 @@ strnunvisx(char *dst, size_t dlen, const char *src, int flag)
 			errno = EINVAL;
 			return -1;
 		default:
-			_DIAGASSERT(0);
+			_DIAGASSERT(/*CONSTCOND*/0);
 			errno = EINVAL;
 			return -1;
 		}
diff --git a/extra/libedit/libedit-20221030-3.1/src/vi.c b/extra/libedit/libedit-20221030-3.1/src/vi.c
new file mode 100644
index 000000000000..e7f78494f88b
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/vi.c
@@ -0,0 +1,1160 @@
+/*	$NetBSD: vi.c,v 1.64 2021/08/28 17:17:47 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#if !defined(lint) && !defined(SCCSID)
+#if 0
+static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: vi.c,v 1.64 2021/08/28 17:17:47 christos Exp $");
+#endif
+#endif /* not lint && not SCCSID */
+
+/*
+ * vi.c: Vi mode commands.
+ */
+#include <sys/wait.h>
+#include <ctype.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "el.h"
+#include "common.h"
+#include "emacs.h"
+#include "fcns.h"
+#include "vi.h"
+
+static el_action_t	cv_action(EditLine *, wint_t);
+static el_action_t	cv_paste(EditLine *, wint_t);
+
+/* cv_action():
+ *	Handle vi actions.
+ */
+static el_action_t
+cv_action(EditLine *el, wint_t c)
+{
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		/* 'cc', 'dd' and (possibly) friends */
+		if (c != (wint_t)el->el_chared.c_vcmd.action)
+			return CC_ERROR;
+
+		if (!(c & YANK))
+			cv_undo(el);
+		cv_yank(el, el->el_line.buffer,
+		    (int)(el->el_line.lastchar - el->el_line.buffer));
+		el->el_chared.c_vcmd.action = NOP;
+		el->el_chared.c_vcmd.pos = 0;
+		if (!(c & YANK)) {
+			el->el_line.lastchar = el->el_line.buffer;
+			el->el_line.cursor = el->el_line.buffer;
+		}
+		if (c & INSERT)
+			el->el_map.current = el->el_map.key;
+
+		return CC_REFRESH;
+	}
+	el->el_chared.c_vcmd.pos = el->el_line.cursor;
+	el->el_chared.c_vcmd.action = c;
+	return CC_ARGHACK;
+}
+
+/* cv_paste():
+ *	Paste previous deletion before or after the cursor
+ */
+static el_action_t
+cv_paste(EditLine *el, wint_t c)
+{
+	c_kill_t *k = &el->el_chared.c_kill;
+	size_t len = (size_t)(k->last - k->buf);
+
+	if (k->buf == NULL || len == 0)
+		return CC_ERROR;
+#ifdef DEBUG_PASTE
+	(void) fprintf(el->el_errfile, "Paste: \"%.*ls\"\n", (int)len,
+	    k->buf);
+#endif
+
+	cv_undo(el);
+
+	if (!c && el->el_line.cursor < el->el_line.lastchar)
+		el->el_line.cursor++;
+
+	c_insert(el, (int)len);
+	if (el->el_line.cursor + len > el->el_line.lastchar)
+		return CC_ERROR;
+	(void) memcpy(el->el_line.cursor, k->buf, len *
+	    sizeof(*el->el_line.cursor));
+
+	return CC_REFRESH;
+}
+
+
+/* vi_paste_next():
+ *	Vi paste previous deletion to the right of the cursor
+ *	[p]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_paste_next(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_paste(el, 0);
+}
+
+
+/* vi_paste_prev():
+ *	Vi paste previous deletion to the left of the cursor
+ *	[P]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_paste_prev(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_paste(el, 1);
+}
+
+
+/* vi_prev_big_word():
+ *	Vi move to the previous space delimited word
+ *	[B]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_prev_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor == el->el_line.buffer)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
+	    el->el_line.buffer,
+	    el->el_state.argument,
+	    cv__isWord);
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+
+/* vi_prev_word():
+ *	Vi move to the previous word
+ *	[b]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor == el->el_line.buffer)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv_prev_word(el->el_line.cursor,
+	    el->el_line.buffer,
+	    el->el_state.argument,
+	    cv__isword);
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+
+/* vi_next_big_word():
+ *	Vi move to the next space delimited word
+ *	[W]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_next_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor >= el->el_line.lastchar - 1)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
+	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
+
+	if (el->el_map.type == MAP_VI)
+		if (el->el_chared.c_vcmd.action != NOP) {
+			cv_delfini(el);
+			return CC_REFRESH;
+		}
+	return CC_CURSOR;
+}
+
+
+/* vi_next_word():
+ *	Vi move to the next word
+ *	[w]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor >= el->el_line.lastchar - 1)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv_next_word(el, el->el_line.cursor,
+	    el->el_line.lastchar, el->el_state.argument, cv__isword);
+
+	if (el->el_map.type == MAP_VI)
+		if (el->el_chared.c_vcmd.action != NOP) {
+			cv_delfini(el);
+			return CC_REFRESH;
+		}
+	return CC_CURSOR;
+}
+
+
+/* vi_change_case():
+ *	Vi change case of character under the cursor and advance one character
+ *	[~]
+ */
+libedit_private el_action_t
+vi_change_case(EditLine *el, wint_t c)
+{
+	int i;
+
+	if (el->el_line.cursor >= el->el_line.lastchar)
+		return CC_ERROR;
+	cv_undo(el);
+	for (i = 0; i < el->el_state.argument; i++) {
+
+		c = *el->el_line.cursor;
+		if (iswupper(c))
+			*el->el_line.cursor = towlower(c);
+		else if (iswlower(c))
+			*el->el_line.cursor = towupper(c);
+
+		if (++el->el_line.cursor >= el->el_line.lastchar) {
+			el->el_line.cursor--;
+			re_fastaddc(el);
+			break;
+		}
+		re_fastaddc(el);
+	}
+	return CC_NORM;
+}
+
+
+/* vi_change_meta():
+ *	Vi change prefix command
+ *	[c]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_change_meta(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	/*
+         * Delete with insert == change: first we delete and then we leave in
+         * insert mode.
+         */
+	return cv_action(el, DELETE | INSERT);
+}
+
+
+/* vi_insert_at_bol():
+ *	Vi enter insert mode at the beginning of line
+ *	[I]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_insert_at_bol(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_line.cursor = el->el_line.buffer;
+	cv_undo(el);
+	el->el_map.current = el->el_map.key;
+	return CC_CURSOR;
+}
+
+
+/* vi_replace_char():
+ *	Vi replace character under the cursor with the next character typed
+ *	[r]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_replace_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor >= el->el_line.lastchar)
+		return CC_ERROR;
+
+	el->el_map.current = el->el_map.key;
+	el->el_state.inputmode = MODE_REPLACE_1;
+	cv_undo(el);
+	return CC_ARGHACK;
+}
+
+
+/* vi_replace_mode():
+ *	Vi enter replace mode
+ *	[R]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_replace_mode(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_map.current = el->el_map.key;
+	el->el_state.inputmode = MODE_REPLACE;
+	cv_undo(el);
+	return CC_NORM;
+}
+
+
+/* vi_substitute_char():
+ *	Vi replace character under the cursor and enter insert mode
+ *	[s]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_substitute_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	c_delafter(el, el->el_state.argument);
+	el->el_map.current = el->el_map.key;
+	return CC_REFRESH;
+}
+
+
+/* vi_substitute_line():
+ *	Vi substitute entire line
+ *	[S]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_substitute_line(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	cv_undo(el);
+	cv_yank(el, el->el_line.buffer,
+	    (int)(el->el_line.lastchar - el->el_line.buffer));
+	(void) em_kill_line(el, 0);
+	el->el_map.current = el->el_map.key;
+	return CC_REFRESH;
+}
+
+
+/* vi_change_to_eol():
+ *	Vi change to end of line
+ *	[C]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_change_to_eol(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	cv_undo(el);
+	cv_yank(el, el->el_line.cursor,
+	    (int)(el->el_line.lastchar - el->el_line.cursor));
+	(void) ed_kill_line(el, 0);
+	el->el_map.current = el->el_map.key;
+	return CC_REFRESH;
+}
+
+
+/* vi_insert():
+ *	Vi enter insert mode
+ *	[i]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_insert(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_map.current = el->el_map.key;
+	cv_undo(el);
+	return CC_NORM;
+}
+
+
+/* vi_add():
+ *	Vi enter insert mode after the cursor
+ *	[a]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_add(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	int ret;
+
+	el->el_map.current = el->el_map.key;
+	if (el->el_line.cursor < el->el_line.lastchar) {
+		el->el_line.cursor++;
+		if (el->el_line.cursor > el->el_line.lastchar)
+			el->el_line.cursor = el->el_line.lastchar;
+		ret = CC_CURSOR;
+	} else
+		ret = CC_NORM;
+
+	cv_undo(el);
+
+	return (el_action_t)ret;
+}
+
+
+/* vi_add_at_eol():
+ *	Vi enter insert mode at end of line
+ *	[A]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_add_at_eol(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_map.current = el->el_map.key;
+	el->el_line.cursor = el->el_line.lastchar;
+	cv_undo(el);
+	return CC_CURSOR;
+}
+
+
+/* vi_delete_meta():
+ *	Vi delete prefix command
+ *	[d]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_delete_meta(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_action(el, DELETE);
+}
+
+
+/* vi_end_big_word():
+ *	Vi move to the end of the current space delimited word
+ *	[E]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_end_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor == el->el_line.lastchar)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv__endword(el->el_line.cursor,
+	    el->el_line.lastchar, el->el_state.argument, cv__isWord);
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		el->el_line.cursor++;
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+
+/* vi_end_word():
+ *	Vi move to the end of the current word
+ *	[e]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_end_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor == el->el_line.lastchar)
+		return CC_ERROR;
+
+	el->el_line.cursor = cv__endword(el->el_line.cursor,
+	    el->el_line.lastchar, el->el_state.argument, cv__isword);
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		el->el_line.cursor++;
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+
+/* vi_undo():
+ *	Vi undo last change
+ *	[u]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_undo(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	c_undo_t un = el->el_chared.c_undo;
+
+	if (un.len == -1)
+		return CC_ERROR;
+
+	/* switch line buffer and undo buffer */
+	el->el_chared.c_undo.buf = el->el_line.buffer;
+	el->el_chared.c_undo.len = el->el_line.lastchar - el->el_line.buffer;
+	el->el_chared.c_undo.cursor =
+	    (int)(el->el_line.cursor - el->el_line.buffer);
+	el->el_line.limit = un.buf + (el->el_line.limit - el->el_line.buffer);
+	el->el_line.buffer = un.buf;
+	el->el_line.cursor = un.buf + un.cursor;
+	el->el_line.lastchar = un.buf + un.len;
+
+	return CC_REFRESH;
+}
+
+
+/* vi_command_mode():
+ *	Vi enter command mode (use alternative key bindings)
+ *	[<ESC>]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_command_mode(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	/* [Esc] cancels pending action */
+	el->el_chared.c_vcmd.action = NOP;
+	el->el_chared.c_vcmd.pos = 0;
+
+	el->el_state.doingarg = 0;
+
+	el->el_state.inputmode = MODE_INSERT;
+	el->el_map.current = el->el_map.alt;
+#ifdef VI_MOVE
+	if (el->el_line.cursor > el->el_line.buffer)
+		el->el_line.cursor--;
+#endif
+	return CC_CURSOR;
+}
+
+
+/* vi_zero():
+ *	Vi move to the beginning of line
+ *	[0]
+ */
+libedit_private el_action_t
+vi_zero(EditLine *el, wint_t c)
+{
+
+	if (el->el_state.doingarg)
+		return ed_argument_digit(el, c);
+
+	el->el_line.cursor = el->el_line.buffer;
+	if (el->el_chared.c_vcmd.action != NOP) {
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+
+/* vi_delete_prev_char():
+ *	Vi move to previous character (backspace)
+ *	[^H] in insert mode only
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_line.cursor <= el->el_line.buffer)
+		return CC_ERROR;
+
+	c_delbefore1(el);
+	el->el_line.cursor--;
+	return CC_REFRESH;
+}
+
+
+/* vi_list_or_eof():
+ *	Vi list choices for completion or indicate end of file if empty line
+ *	[^D]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_list_or_eof(EditLine *el, wint_t c)
+{
+
+	if (el->el_line.cursor == el->el_line.lastchar) {
+		if (el->el_line.cursor == el->el_line.buffer) {
+			terminal_writec(el, c);	/* then do a EOF */
+			return CC_EOF;
+		} else {
+			/*
+			 * Here we could list completions, but it is an
+			 * error right now
+			 */
+			terminal_beep(el);
+			return CC_ERROR;
+		}
+	} else {
+#ifdef notyet
+		re_goto_bottom(el);
+		*el->el_line.lastchar = '\0';	/* just in case */
+		return CC_LIST_CHOICES;
+#else
+		/*
+		 * Just complain for now.
+		 */
+		terminal_beep(el);
+		return CC_ERROR;
+#endif
+	}
+}
+
+
+/* vi_kill_line_prev():
+ *	Vi cut from beginning of line to cursor
+ *	[^U]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_kill_line_prev(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	wchar_t *kp, *cp;
+
+	cp = el->el_line.buffer;
+	kp = el->el_chared.c_kill.buf;
+	while (cp < el->el_line.cursor)
+		*kp++ = *cp++;	/* copy it */
+	el->el_chared.c_kill.last = kp;
+	c_delbefore(el, (int)(el->el_line.cursor - el->el_line.buffer));
+	el->el_line.cursor = el->el_line.buffer;	/* zap! */
+	return CC_REFRESH;
+}
+
+
+/* vi_search_prev():
+ *	Vi search history previous
+ *	[?]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_search(el, ED_SEARCH_PREV_HISTORY);
+}
+
+
+/* vi_search_next():
+ *	Vi search history next
+ *	[/]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_search(el, ED_SEARCH_NEXT_HISTORY);
+}
+
+
+/* vi_repeat_search_next():
+ *	Vi repeat current search in the same search direction
+ *	[n]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_repeat_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_search.patlen == 0)
+		return CC_ERROR;
+	else
+		return cv_repeat_srch(el, el->el_search.patdir);
+}
+
+
+/* vi_repeat_search_prev():
+ *	Vi repeat current search in the opposite search direction
+ *	[N]
+ */
+/*ARGSUSED*/
+libedit_private el_action_t
+vi_repeat_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	if (el->el_search.patlen == 0)
+		return CC_ERROR;
+	else
+		return (cv_repeat_srch(el,
+		    el->el_search.patdir == ED_SEARCH_PREV_HISTORY ?
+		    ED_SEARCH_NEXT_HISTORY : ED_SEARCH_PREV_HISTORY));
+}
+
+
+/* vi_next_char():
+ *	Vi move to the character specified next
+ *	[f]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 0);
+}
+
+
+/* vi_prev_char():
+ *	Vi move to the character specified previous
+ *	[F]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 0);
+}
+
+
+/* vi_to_next_char():
+ *	Vi move up to the character specified next
+ *	[t]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_to_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 1);
+}
+
+
+/* vi_to_prev_char():
+ *	Vi move up to the character specified previous
+ *	[T]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_to_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 1);
+}
+
+
+/* vi_repeat_next_char():
+ *	Vi repeat current character search in the same search direction
+ *	[;]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_repeat_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_csearch(el, el->el_search.chadir, el->el_search.chacha,
+		el->el_state.argument, el->el_search.chatflg);
+}
+
+
+/* vi_repeat_prev_char():
+ *	Vi repeat current character search in the opposite search direction
+ *	[,]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_repeat_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	el_action_t r;
+	int dir = el->el_search.chadir;
+
+	r = cv_csearch(el, -dir, el->el_search.chacha,
+		el->el_state.argument, el->el_search.chatflg);
+	el->el_search.chadir = dir;
+	return r;
+}
+
+
+/* vi_match():
+ *	Vi go to matching () {} or []
+ *	[%]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_match(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	const wchar_t match_chars[] = L"()[]{}";
+	wchar_t *cp;
+	size_t delta, i, count;
+	wchar_t o_ch, c_ch;
+
+	*el->el_line.lastchar = '\0';		/* just in case */
+
+	i = wcscspn(el->el_line.cursor, match_chars);
+	o_ch = el->el_line.cursor[i];
+	if (o_ch == 0)
+		return CC_ERROR;
+	delta = (size_t)(wcschr(match_chars, o_ch) - match_chars);
+	c_ch = match_chars[delta ^ 1];
+	count = 1;
+	delta = 1 - (delta & 1) * 2;
+
+	for (cp = &el->el_line.cursor[i]; count; ) {
+		cp += delta;
+		if (cp < el->el_line.buffer || cp >= el->el_line.lastchar)
+			return CC_ERROR;
+		if (*cp == o_ch)
+			count++;
+		else if (*cp == c_ch)
+			count--;
+	}
+
+	el->el_line.cursor = cp;
+
+	if (el->el_chared.c_vcmd.action != NOP) {
+		/* NB posix says char under cursor should NOT be deleted
+		   for -ve delta - this is different to netbsd vi. */
+		if (delta > 0)
+			el->el_line.cursor++;
+		cv_delfini(el);
+		return CC_REFRESH;
+	}
+	return CC_CURSOR;
+}
+
+/* vi_undo_line():
+ *	Vi undo all changes to line
+ *	[U]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_undo_line(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	cv_undo(el);
+	return hist_get(el);
+}
+
+/* vi_to_column():
+ *	Vi go to specified column
+ *	[|]
+ * NB netbsd vi goes to screen column 'n', posix says nth character
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_to_column(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_line.cursor = el->el_line.buffer;
+	el->el_state.argument--;
+	return ed_next_char(el, 0);
+}
+
+/* vi_yank_end():
+ *	Vi yank to end of line
+ *	[Y]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_yank_end(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	cv_yank(el, el->el_line.cursor,
+	    (int)(el->el_line.lastchar - el->el_line.cursor));
+	return CC_REFRESH;
+}
+
+/* vi_yank():
+ *	Vi yank
+ *	[y]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_yank(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	return cv_action(el, YANK);
+}
+
+/* vi_comment_out():
+ *	Vi comment out current command
+ *	[#]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_comment_out(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+
+	el->el_line.cursor = el->el_line.buffer;
+	c_insert(el, 1);
+	*el->el_line.cursor = '#';
+	re_refresh(el);
+	return ed_newline(el, 0);
+}
+
+/* vi_alias():
+ *	Vi include shell alias
+ *	[@]
+ * NB: posix implies that we should enter insert mode, however
+ * this is against historical precedent...
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_alias(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	char alias_name[3];
+	const char *alias_text;
+
+	if (el->el_chared.c_aliasfun == NULL)
+		return CC_ERROR;
+
+	alias_name[0] = '_';
+	alias_name[2] = 0;
+	if (el_getc(el, &alias_name[1]) != 1)
+		return CC_ERROR;
+
+	alias_text = (*el->el_chared.c_aliasfun)(el->el_chared.c_aliasarg,
+	    alias_name);
+	if (alias_text != NULL)
+		el_wpush(el, ct_decode_string(alias_text, &el->el_scratch));
+	return CC_NORM;
+}
+
+/* vi_to_history_line():
+ *	Vi go to specified history file line.
+ *	[G]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_to_history_line(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	int sv_event_no = el->el_history.eventno;
+	el_action_t rval;
+
+
+	if (el->el_history.eventno == 0) {
+		 (void) wcsncpy(el->el_history.buf, el->el_line.buffer,
+		     EL_BUFSIZ);
+		 el->el_history.last = el->el_history.buf +
+			 (el->el_line.lastchar - el->el_line.buffer);
+	}
+
+	/* Lack of a 'count' means oldest, not 1 */
+	if (!el->el_state.doingarg) {
+		el->el_history.eventno = 0x7fffffff;
+		hist_get(el);
+	} else {
+		/* This is brain dead, all the rest of this code counts
+		 * upwards going into the past.  Here we need count in the
+		 * other direction (to match the output of fc -l).
+		 * I could change the world, but this seems to suffice.
+		 */
+		el->el_history.eventno = 1;
+		if (hist_get(el) == CC_ERROR)
+			return CC_ERROR;
+		el->el_history.eventno = 1 + el->el_history.ev.num
+					- el->el_state.argument;
+		if (el->el_history.eventno < 0) {
+			el->el_history.eventno = sv_event_no;
+			return CC_ERROR;
+		}
+	}
+	rval = hist_get(el);
+	if (rval == CC_ERROR)
+		el->el_history.eventno = sv_event_no;
+	return rval;
+}
+
+/* vi_histedit():
+ *	Vi edit history line with vi
+ *	[v]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_histedit(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	int fd;
+	pid_t pid;
+	ssize_t st;
+	int status;
+	char tempfile[] = "/tmp/histedit.XXXXXXXXXX";
+	char *cp = NULL;
+	size_t len;
+	wchar_t *line = NULL;
+	const char *editor;
+
+	if (el->el_state.doingarg) {
+		if (vi_to_history_line(el, 0) == CC_ERROR)
+			return CC_ERROR;
+	}
+
+	if ((editor = getenv("EDITOR")) == NULL)
+		editor = "vi";
+	fd = mkstemp(tempfile);
+	if (fd < 0)
+		return CC_ERROR;
+	len = (size_t)(el->el_line.lastchar - el->el_line.buffer);
+#define TMP_BUFSIZ (EL_BUFSIZ * MB_LEN_MAX)
+	cp = el_calloc(TMP_BUFSIZ, sizeof(*cp));
+	if (cp == NULL)
+		goto error;
+	line = el_calloc(len + 1, sizeof(*line));
+	if (line == NULL)
+		goto error;
+	wcsncpy(line, el->el_line.buffer, len);
+	line[len] = '\0';
+	wcstombs(cp, line, TMP_BUFSIZ - 1);
+	cp[TMP_BUFSIZ - 1] = '\0';
+	len = strlen(cp);
+	write(fd, cp, len);
+	write(fd, "\n", (size_t)1);
+	pid = fork();
+	switch (pid) {
+	case -1:
+		goto error;
+	case 0:
+		close(fd);
+		execlp(editor, editor, tempfile, (char *)NULL);
+		exit(0);
+		/*NOTREACHED*/
+	default:
+		while (waitpid(pid, &status, 0) != pid)
+			continue;
+		lseek(fd, (off_t)0, SEEK_SET);
+		st = read(fd, cp, TMP_BUFSIZ - 1);
+		if (st > 0) {
+			cp[st] = '\0';
+			len = (size_t)(el->el_line.limit - el->el_line.buffer);
+			len = mbstowcs(el->el_line.buffer, cp, len);
+			if (len > 0 && el->el_line.buffer[len - 1] == '\n')
+				--len;
+		}
+		else
+			len = 0;
+                el->el_line.cursor = el->el_line.buffer;
+                el->el_line.lastchar = el->el_line.buffer + len;
+		el_free(cp);
+                el_free(line);
+		break;
+	}
+
+	close(fd);
+	unlink(tempfile);
+	/* return CC_REFRESH; */
+	return ed_newline(el, 0);
+error:
+	el_free(line);
+	el_free(cp);
+	close(fd);
+	unlink(tempfile);
+	return CC_ERROR;
+}
+
+/* vi_history_word():
+ *	Vi append word from previous input line
+ *	[_]
+ * Who knows where this one came from!
+ * '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_history_word(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	const wchar_t *wp = HIST_FIRST(el);
+	const wchar_t *wep, *wsp;
+	int len;
+	wchar_t *cp;
+	const wchar_t *lim;
+
+	if (wp == NULL)
+		return CC_ERROR;
+
+	wep = wsp = NULL;
+	do {
+		while (iswspace(*wp))
+			wp++;
+		if (*wp == 0)
+			break;
+		wsp = wp;
+		while (*wp && !iswspace(*wp))
+			wp++;
+		wep = wp;
+	} while ((!el->el_state.doingarg || --el->el_state.argument > 0)
+	    && *wp != 0);
+
+	if (wsp == NULL || (el->el_state.doingarg && el->el_state.argument != 0))
+		return CC_ERROR;
+
+	cv_undo(el);
+	len = (int)(wep - wsp);
+	if (el->el_line.cursor < el->el_line.lastchar)
+		el->el_line.cursor++;
+	c_insert(el, len + 1);
+	cp = el->el_line.cursor;
+	lim = el->el_line.limit;
+	if (cp < lim)
+		*cp++ = ' ';
+	while (wsp < wep && cp < lim)
+		*cp++ = *wsp++;
+	el->el_line.cursor = cp;
+
+	el->el_map.current = el->el_map.key;
+	return CC_REFRESH;
+}
+
+/* vi_redo():
+ *	Vi redo last non-motion command
+ *	[.]
+ */
+libedit_private el_action_t
+/*ARGSUSED*/
+vi_redo(EditLine *el, wint_t c __attribute__((__unused__)))
+{
+	c_redo_t *r = &el->el_chared.c_redo;
+
+	if (!el->el_state.doingarg && r->count) {
+		el->el_state.doingarg = 1;
+		el->el_state.argument = r->count;
+	}
+
+	el->el_chared.c_vcmd.pos = el->el_line.cursor;
+	el->el_chared.c_vcmd.action = r->action;
+	if (r->pos != r->buf) {
+		if (r->pos + 1 > r->lim)
+			/* sanity */
+			r->pos = r->lim - 1;
+		r->pos[0] = 0;
+		el_wpush(el, r->buf);
+	}
+
+	el->el_state.thiscmd = r->cmd;
+	el->el_state.thisch = r->ch;
+	return (*el->el_map.func[r->cmd])(el, r->ch);
+}
diff --git a/extra/libedit/libedit-20221030-3.1/src/vis.c b/extra/libedit/libedit-20221030-3.1/src/vis.c
new file mode 100644
index 000000000000..d2ec0d072a31
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/vis.c
@@ -0,0 +1,786 @@
+/*	$NetBSD: vis.c,v 1.75 2021/06/18 10:57:14 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+/*-
+ * Copyright (c) 1999, 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include "config.h"
+
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: vis.c,v 1.75 2021/06/18 10:57:14 christos Exp $");
+#endif /* LIBC_SCCS and not lint */
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
+#endif
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <stdint.h>
+#include <assert.h>
+#include <vis.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#ifdef __weak_alias
+__weak_alias(strvisx,_strvisx)
+#endif
+
+/*
+ * Solaris has MIN in <utility.h> and <sys/sysmacros.h>
+ * (rather than <sys/param.h>)
+ * But those files define a lot of other stuff as well.
+ * So we define it here instead.
+ */
+#ifdef __sun
+#ifndef MIN
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+#endif
+#endif
+
+#if !HAVE_VIS || !HAVE_SVIS
+#include <ctype.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * The reason for going through the trouble to deal with character encodings
+ * in vis(3), is that we use this to safe encode output of commands. This
+ * safe encoding varies depending on the character set. For example if we
+ * display ps output in French, we don't want to display French characters
+ * as M-foo.
+ */
+
+static wchar_t *do_svis(wchar_t *, wint_t, int, wint_t, const wchar_t *);
+
+#undef BELL
+#define BELL L'\a'
+ 
+#if defined(LC_C_LOCALE)
+#define iscgraph(c)      isgraph_l(c, LC_C_LOCALE)
+#else
+/* Keep it simple for now, no locale stuff */
+#define iscgraph(c)	isgraph(c)
+#ifdef notyet
+#include <locale.h>
+static int
+iscgraph(int c) {
+	int rv;
+	char *ol;
+
+	ol = setlocale(LC_CTYPE, "C");
+	rv = isgraph(c);
+	if (ol)
+		setlocale(LC_CTYPE, ol);
+	return rv;
+}
+#endif
+#endif
+
+#define ISGRAPH(flags, c) \
+    (((flags) & VIS_NOLOCALE) ? iscgraph(c) : iswgraph(c))
+
+#define iswoctal(c)	(((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7')
+#define iswwhite(c)	(c == L' ' || c == L'\t' || c == L'\n')
+#define iswsafe(c)	(c == L'\b' || c == BELL || c == L'\r')
+#define xtoa(c)		L"0123456789abcdef"[c]
+#define XTOA(c)		L"0123456789ABCDEF"[c]
+
+#define MAXEXTRAS	30
+
+static const wchar_t char_shell[] = L"'`\";&<>()|{}]\\$!^~";
+static const wchar_t char_glob[] = L"*?[#";
+
+#if !HAVE_NBTOOL_CONFIG_H
+#ifndef __NetBSD__
+/*
+ * On NetBSD MB_LEN_MAX is currently 32 which does not fit on any integer
+ * integral type and it is probably wrong, since currently the maximum
+ * number of bytes and character needs is 6. Until this is fixed, the
+ * loops below are using sizeof(uint64_t) - 1 instead of MB_LEN_MAX, and
+ * the assertion is commented out.
+ */
+#ifdef __FreeBSD__
+/*
+ * On FreeBSD including <sys/systm.h> for CTASSERT only works in kernel
+ * mode.
+ */
+#ifndef CTASSERT
+#define CTASSERT(x)             _CTASSERT(x, __LINE__)
+#define _CTASSERT(x, y)         __CTASSERT(x, y)
+#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
+#endif
+#endif /* __FreeBSD__ */
+/*
+CTASSERT(MB_LEN_MAX <= sizeof(uint64_t));
+*/
+#endif /* !__NetBSD__ */
+#endif
+
+/*
+ * This is do_hvis, for HTTP style (RFC 1808)
+ */
+static wchar_t *
+do_hvis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
+{
+	if (iswalnum(c)
+	    /* safe */
+	    || c == L'$' || c == L'-' || c == L'_' || c == L'.' || c == L'+'
+	    /* extra */
+	    || c == L'!' || c == L'*' || c == L'\'' || c == L'(' || c == L')'
+	    || c == L',')
+		dst = do_svis(dst, c, flags, nextc, extra);
+	else {
+		*dst++ = L'%';
+		*dst++ = xtoa(((unsigned int)c >> 4) & 0xf);
+		*dst++ = xtoa((unsigned int)c & 0xf);
+	}
+
+	return dst;
+}
+
+/*
+ * This is do_mvis, for Quoted-Printable MIME (RFC 2045)
+ * NB: No handling of long lines or CRLF.
+ */
+static wchar_t *
+do_mvis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
+{
+	if ((c != L'\n') &&
+	    /* Space at the end of the line */
+	    ((iswspace(c) && (nextc == L'\r' || nextc == L'\n')) ||
+	    /* Out of range */
+	    (!iswspace(c) && (c < 33 || (c > 60 && c < 62) || c > 126)) ||
+	    /* Specific char to be escaped */
+	    wcschr(L"#$@[\\]^`{|}~", c) != NULL)) {
+		*dst++ = L'=';
+		*dst++ = XTOA(((unsigned int)c >> 4) & 0xf);
+		*dst++ = XTOA((unsigned int)c & 0xf);
+	} else
+		dst = do_svis(dst, c, flags, nextc, extra);
+	return dst;
+}
+
+/*
+ * Output single byte of multibyte character.
+ */
+static wchar_t *
+do_mbyte(wchar_t *dst, wint_t c, int flags, wint_t nextc, int iswextra)
+{
+	if (flags & VIS_CSTYLE) {
+		switch (c) {
+		case L'\n':
+			*dst++ = L'\\'; *dst++ = L'n';
+			return dst;
+		case L'\r':
+			*dst++ = L'\\'; *dst++ = L'r';
+			return dst;
+		case L'\b':
+			*dst++ = L'\\'; *dst++ = L'b';
+			return dst;
+		case BELL:
+			*dst++ = L'\\'; *dst++ = L'a';
+			return dst;
+		case L'\v':
+			*dst++ = L'\\'; *dst++ = L'v';
+			return dst;
+		case L'\t':
+			*dst++ = L'\\'; *dst++ = L't';
+			return dst;
+		case L'\f':
+			*dst++ = L'\\'; *dst++ = L'f';
+			return dst;
+		case L' ':
+			*dst++ = L'\\'; *dst++ = L's';
+			return dst;
+		case L'\0':
+			*dst++ = L'\\'; *dst++ = L'0';
+			if (iswoctal(nextc)) {
+				*dst++ = L'0';
+				*dst++ = L'0';
+			}
+			return dst;
+		/* We cannot encode these characters in VIS_CSTYLE
+		 * because they special meaning */
+		case L'n':
+		case L'r':
+		case L'b':
+		case L'a':
+		case L'v':
+		case L't':
+		case L'f':
+		case L's':
+		case L'0':
+		case L'M':
+		case L'^':
+		case L'$': /* vis(1) -l */
+			break;
+		default:
+			if (ISGRAPH(flags, c) && !iswoctal(c)) {
+				*dst++ = L'\\';
+				*dst++ = c;
+				return dst;
+			}
+		}
+	}
+	if (iswextra || ((c & 0177) == L' ') || (flags & VIS_OCTAL)) {
+		*dst++ = L'\\';
+		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + L'0';
+		*dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + L'0';
+		*dst++ =			     (c	      & 07) + L'0';
+	} else {
+		if ((flags & VIS_NOSLASH) == 0)
+			*dst++ = L'\\';
+
+		if (c & 0200) {
+			c &= 0177;
+			*dst++ = L'M';
+		}
+
+		if (iswcntrl(c)) {
+			*dst++ = L'^';
+			if (c == 0177)
+				*dst++ = L'?';
+			else
+				*dst++ = c + L'@';
+		} else {
+			*dst++ = L'-';
+			*dst++ = c;
+		}
+	}
+
+	return dst;
+}
+
+/*
+ * This is do_vis, the central code of vis.
+ * dst:	      Pointer to the destination buffer
+ * c:	      Character to encode
+ * flags:     Flags word
+ * nextc:     The character following 'c'
+ * extra:     Pointer to the list of extra characters to be
+ *	      backslash-protected.
+ */
+static wchar_t *
+do_svis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
+{
+	int iswextra, i, shft;
+	uint64_t bmsk, wmsk;
+
+	iswextra = wcschr(extra, c) != NULL;
+	if (!iswextra && (ISGRAPH(flags, c) || iswwhite(c) ||
+	    ((flags & VIS_SAFE) && iswsafe(c)))) {
+		*dst++ = c;
+		return dst;
+	}
+
+	/* See comment in istrsenvisx() output loop, below. */
+	wmsk = 0;
+	for (i = sizeof(wmsk) - 1; i >= 0; i--) {
+		shft = i * NBBY;
+		bmsk = (uint64_t)0xffLL << shft;
+		wmsk |= bmsk;
+		if ((c & wmsk) || i == 0)
+			dst = do_mbyte(dst, (wint_t)(
+			    (uint64_t)(c & bmsk) >> shft),
+			    flags, nextc, iswextra);
+	}
+
+	return dst;
+}
+
+typedef wchar_t *(*visfun_t)(wchar_t *, wint_t, int, wint_t, const wchar_t *);
+
+/*
+ * Return the appropriate encoding function depending on the flags given.
+ */
+static visfun_t
+getvisfun(int flags)
+{
+	if (flags & VIS_HTTPSTYLE)
+		return do_hvis;
+	if (flags & VIS_MIMESTYLE)
+		return do_mvis;
+	return do_svis;
+}
+
+/*
+ * Expand list of extra characters to not visually encode.
+ */
+static wchar_t *
+makeextralist(int flags, const char *src)
+{
+	wchar_t *dst, *d;
+	size_t len;
+	const wchar_t *s;
+	mbstate_t mbstate;
+
+	len = strlen(src);
+	if ((dst = calloc(len + MAXEXTRAS, sizeof(*dst))) == NULL)
+		return NULL;
+
+	memset(&mbstate, 0, sizeof(mbstate));
+	if ((flags & VIS_NOLOCALE)
+	    || mbsrtowcs(dst, &src, len, &mbstate) == (size_t)-1) {
+		size_t i;
+		for (i = 0; i < len; i++)
+			dst[i] = (wchar_t)(u_char)src[i];
+		d = dst + len;
+	} else
+		d = dst + wcslen(dst);
+
+	if (flags & VIS_GLOB)
+		for (s = char_glob; *s; *d++ = *s++)
+			continue;
+
+	if (flags & VIS_SHELL)
+		for (s = char_shell; *s; *d++ = *s++)
+			continue;
+
+	if (flags & VIS_SP) *d++ = L' ';
+	if (flags & VIS_TAB) *d++ = L'\t';
+	if (flags & VIS_NL) *d++ = L'\n';
+	if (flags & VIS_DQ) *d++ = L'"';
+	if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
+	*d = L'\0';
+
+	return dst;
+}
+
+/*
+ * istrsenvisx()
+ * 	The main internal function.
+ *	All user-visible functions call this one.
+ */
+static int
+istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength,
+    int flags, const char *mbextra, int *cerr_ptr)
+{
+	wchar_t *dst, *src, *pdst, *psrc, *start, *extra;
+	size_t len, olen;
+	uint64_t bmsk, wmsk;
+	wint_t c;
+	visfun_t f;
+	int clen = 0, cerr, error = -1, i, shft;
+	char *mbdst, *mdst;
+	ssize_t mbslength, maxolen;
+	mbstate_t mbstate;
+
+	_DIAGASSERT(mbdstp != NULL);
+	_DIAGASSERT(mbsrc != NULL || mblength == 0);
+	_DIAGASSERT(mbextra != NULL);
+
+	mbslength = (ssize_t)mblength;
+	/*
+	 * When inputing a single character, must also read in the
+	 * next character for nextc, the look-ahead character.
+	 */
+	if (mbslength == 1)
+		mbslength++;
+
+	/*
+	 * Input (mbsrc) is a char string considered to be multibyte
+	 * characters.  The input loop will read this string pulling
+	 * one character, possibly multiple bytes, from mbsrc and
+	 * converting each to wchar_t in src.
+	 *
+	 * The vis conversion will be done using the wide char
+	 * wchar_t string.
+	 *
+	 * This will then be converted back to a multibyte string to
+	 * return to the caller.
+	 */
+
+	/* Allocate space for the wide char strings */
+	psrc = pdst = extra = NULL;
+	mdst = NULL;
+	if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
+		return -1;
+	if ((pdst = calloc((16 * mbslength) + 1, sizeof(*pdst))) == NULL)
+		goto out;
+	if (*mbdstp == NULL) {
+		if ((mdst = calloc((16 * mbslength) + 1, sizeof(*mdst))) == NULL)
+			goto out;
+		*mbdstp = mdst;
+	}
+
+	mbdst = *mbdstp;
+	dst = pdst;
+	src = psrc;
+
+	if (flags & VIS_NOLOCALE) {
+		/* Do one byte at a time conversion */
+		cerr = 1;
+	} else {
+		/* Use caller's multibyte conversion error flag. */
+		cerr = cerr_ptr ? *cerr_ptr : 0;
+	}
+
+	/*
+	 * Input loop.
+	 * Handle up to mblength characters (not bytes).  We do not
+	 * stop at NULs because we may be processing a block of data
+	 * that includes NULs.
+	 */
+	memset(&mbstate, 0, sizeof(mbstate));
+	while (mbslength > 0) {
+		/* Convert one multibyte character to wchar_t. */
+		if (!cerr)
+			clen = mbrtowc(src, mbsrc, MIN(mbslength, MB_LEN_MAX),
+			    &mbstate);
+		if (cerr || clen < 0) {
+			/* Conversion error, process as a byte instead. */
+			*src = (wint_t)(u_char)*mbsrc;
+			clen = 1;
+			cerr = 1;
+		}
+		if (clen == 0) {
+			/*
+			 * NUL in input gives 0 return value. process
+			 * as single NUL byte and keep going.
+			 */
+			clen = 1;
+		}
+		/* Advance buffer character pointer. */
+		src++;
+		/* Advance input pointer by number of bytes read. */
+		mbsrc += clen;
+		/* Decrement input byte count. */
+		mbslength -= clen;
+	}
+	len = src - psrc;
+	src = psrc;
+
+	/*
+	 * In the single character input case, we will have actually
+	 * processed two characters, c and nextc.  Reset len back to
+	 * just a single character.
+	 */
+	if (mblength < len)
+		len = mblength;
+
+	/* Convert extra argument to list of characters for this mode. */
+	extra = makeextralist(flags, mbextra);
+	if (!extra) {
+		if (dlen && *dlen == 0) {
+			errno = ENOSPC;
+			goto out;
+		}
+		*mbdst = '\0';	/* can't create extra, return "" */
+		error = 0;
+		goto out;
+	}
+
+	/* Look up which processing function to call. */
+	f = getvisfun(flags);
+
+	/*
+	 * Main processing loop.
+	 * Call do_Xvis processing function one character at a time
+	 * with next character available for look-ahead.
+	 */
+	for (start = dst; len > 0; len--) {
+		c = *src++;
+		dst = (*f)(dst, c, flags, len >= 1 ? *src : L'\0', extra);
+		if (dst == NULL) {
+			errno = ENOSPC;
+			goto out;
+		}
+	}
+
+	/* Terminate the string in the buffer. */
+	*dst = L'\0';
+
+	/*
+	 * Output loop.
+	 * Convert wchar_t string back to multibyte output string.
+	 * If we have hit a multi-byte conversion error on input,
+	 * output byte-by-byte here.  Else use wctomb().
+	 */
+	len = wcslen(start);
+	maxolen = dlen ? *dlen : (wcslen(start) * MB_LEN_MAX + 1);
+	olen = 0;
+	memset(&mbstate, 0, sizeof(mbstate));
+	for (dst = start; len > 0; len--) {
+		if (!cerr)
+			clen = wcrtomb(mbdst, *dst, &mbstate);
+		if (cerr || clen < 0) {
+			/*
+			 * Conversion error, process as a byte(s) instead.
+			 * Examine each byte and higher-order bytes for
+			 * data.  E.g.,
+			 *	0x000000000000a264 -> a2 64
+			 *	0x000000001f00a264 -> 1f 00 a2 64
+			 */
+			clen = 0;
+			wmsk = 0;
+			for (i = sizeof(wmsk) - 1; i >= 0; i--) {
+				shft = i * NBBY;
+				bmsk = (uint64_t)0xffLL << shft;
+				wmsk |= bmsk;
+				if ((*dst & wmsk) || i == 0)
+					mbdst[clen++] = (char)(
+					    (uint64_t)(*dst & bmsk) >>
+					    shft);
+			}
+			cerr = 1;
+		}
+		/* If this character would exceed our output limit, stop. */
+		if (olen + clen > (size_t)maxolen)
+			break;
+		/* Advance output pointer by number of bytes written. */
+		mbdst += clen;
+		/* Advance buffer character pointer. */
+		dst++;
+		/* Incrment output character count. */
+		olen += clen;
+	}
+
+	/* Terminate the output string. */
+	*mbdst = '\0';
+
+	if (flags & VIS_NOLOCALE) {
+		/* Pass conversion error flag out. */
+		if (cerr_ptr)
+			*cerr_ptr = cerr;
+	}
+
+	free(extra);
+	free(pdst);
+	free(psrc);
+
+	return (int)olen;
+out:
+	free(extra);
+	free(pdst);
+	free(psrc);
+	free(mdst);
+	return error;
+}
+
+static int
+istrsenvisxl(char **mbdstp, size_t *dlen, const char *mbsrc,
+    int flags, const char *mbextra, int *cerr_ptr)
+{
+	return istrsenvisx(mbdstp, dlen, mbsrc,
+	    mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
+}
+
+#endif
+
+#if !HAVE_SVIS
+/*
+ *	The "svis" variants all take an "extra" arg that is a pointer
+ *	to a NUL-terminated list of characters to be encoded, too.
+ *	These functions are useful e. g. to encode strings in such a
+ *	way so that they are not interpreted by a shell.
+ */
+
+char *
+svis(char *mbdst, int c, int flags, int nextc, const char *mbextra)
+{
+	char cc[2];
+	int ret;
+
+	cc[0] = c;
+	cc[1] = nextc;
+
+	ret = istrsenvisx(&mbdst, NULL, cc, 1, flags, mbextra, NULL);
+	if (ret < 0)
+		return NULL;
+	return mbdst + ret;
+}
+
+char *
+snvis(char *mbdst, size_t dlen, int c, int flags, int nextc, const char *mbextra)
+{
+	char cc[2];
+	int ret;
+
+	cc[0] = c;
+	cc[1] = nextc;
+
+	ret = istrsenvisx(&mbdst, &dlen, cc, 1, flags, mbextra, NULL);
+	if (ret < 0)
+		return NULL;
+	return mbdst + ret;
+}
+
+int
+strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
+{
+	return istrsenvisxl(&mbdst, NULL, mbsrc, flags, mbextra, NULL);
+}
+
+int
+strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
+{
+	return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, mbextra, NULL);
+}
+
+int
+strsvisx(char *mbdst, const char *mbsrc, size_t len, int flags, const char *mbextra)
+{
+	return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, mbextra, NULL);
+}
+
+int
+strsnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
+    const char *mbextra)
+{
+	return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, NULL);
+}
+
+int
+strsenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
+    const char *mbextra, int *cerr_ptr)
+{
+	return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr);
+}
+#endif
+
+#if !HAVE_VIS
+/*
+ * vis - visually encode characters
+ */
+char *
+vis(char *mbdst, int c, int flags, int nextc)
+{
+	char cc[2];
+	int ret;
+
+	cc[0] = c;
+	cc[1] = nextc;
+
+	ret = istrsenvisx(&mbdst, NULL, cc, 1, flags, "", NULL);
+	if (ret < 0)
+		return NULL;
+	return mbdst + ret;
+}
+
+char *
+nvis(char *mbdst, size_t dlen, int c, int flags, int nextc)
+{
+	char cc[2];
+	int ret;
+
+	cc[0] = c;
+	cc[1] = nextc;
+
+	ret = istrsenvisx(&mbdst, &dlen, cc, 1, flags, "", NULL);
+	if (ret < 0)
+		return NULL;
+	return mbdst + ret;
+}
+
+/*
+ * strvis - visually encode characters from src into dst
+ *
+ *	Dst must be 4 times the size of src to account for possible
+ *	expansion.  The length of dst, not including the trailing NULL,
+ *	is returned.
+ */
+
+int
+strvis(char *mbdst, const char *mbsrc, int flags)
+{
+	return istrsenvisxl(&mbdst, NULL, mbsrc, flags, "", NULL);
+}
+
+int
+strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
+{
+	return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
+}
+
+int
+stravis(char **mbdstp, const char *mbsrc, int flags)
+{
+	*mbdstp = NULL;
+	return istrsenvisxl(mbdstp, NULL, mbsrc, flags, "", NULL);
+}
+
+/*
+ * strvisx - visually encode characters from src into dst
+ *
+ *	Dst must be 4 times the size of src to account for possible
+ *	expansion.  The length of dst, not including the trailing NULL,
+ *	is returned.
+ *
+ *	Strvisx encodes exactly len characters from src into dst.
+ *	This is useful for encoding a block of data.
+ */
+
+int
+strvisx(char *mbdst, const char *mbsrc, size_t len, int flags)
+{
+	return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, "", NULL);
+}
+
+int
+strnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags)
+{
+	return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", NULL);
+}
+
+int
+strenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
+    int *cerr_ptr)
+{
+	return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr);
+}
+#endif
diff --git a/extra/libedit/libedit-20221030-3.1/src/vis.h b/extra/libedit/libedit-20221030-3.1/src/vis.h
new file mode 100644
index 000000000000..65ee43300e93
--- /dev/null
+++ b/extra/libedit/libedit-20221030-3.1/src/vis.h
@@ -0,0 +1,117 @@
+/*	$NetBSD: vis.h,v 1.26 2022/05/20 21:31:24 andvar Exp $	*/
+
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	@(#)vis.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _VIS_H_
+#define	_VIS_H_
+
+/*
+ * to select alternate encoding format
+ */
+#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
+#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropriate */
+
+/*
+ * to alter set of characters encoded (default is to encode all
+ * non-graphic except space, tab, and newline).
+ */
+#define	VIS_SP		0x0004	/* also encode space */
+#define	VIS_TAB		0x0008	/* also encode tab */
+#define	VIS_NL		0x0010	/* also encode newline */
+#define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
+#define	VIS_SAFE	0x0020	/* only encode "unsafe" characters */
+#define	VIS_DQ		0x8000	/* also encode double quotes */
+
+/*
+ * other
+ */
+#define	VIS_NOSLASH	0x0040	/* inhibit printing '\' */
+#define	VIS_HTTP1808	0x0080	/* http-style escape % hex hex */
+#define	VIS_HTTPSTYLE	0x0080	/* http-style escape % hex hex */
+#define	VIS_MIMESTYLE	0x0100	/* mime-style escape = HEX HEX */
+#define	VIS_HTTP1866	0x0200	/* http-style &#num; or &string; */
+#define	VIS_NOESCAPE	0x0400	/* don't decode `\' */
+#define	_VIS_END	0x0800	/* for unvis */
+#define	VIS_GLOB	0x1000	/* encode glob(3) magic characters */
+#define	VIS_SHELL	0x2000	/* encode shell special characters [not glob] */
+#define	VIS_META	(VIS_WHITE | VIS_GLOB | VIS_SHELL)
+#define	VIS_NOLOCALE	0x4000	/* encode using the C locale */
+
+/*
+ * unvis return codes
+ */
+#define	UNVIS_VALID	 1	/* character valid */
+#define	UNVIS_VALIDPUSH	 2	/* character valid, push back passed char */
+#define	UNVIS_NOCHAR	 3	/* valid sequence, no character produced */
+#define	UNVIS_SYNBAD	-1	/* unrecognized escape sequence */
+#define	UNVIS_ERROR	-2	/* decoder in unknown state (unrecoverable) */
+
+/*
+ * unvis flags
+ */
+#define	UNVIS_END	_VIS_END	/* no more characters */
+
+__BEGIN_DECLS
+char	*vis(char *, int, int, int);
+char	*nvis(char *, size_t, int, int, int);
+
+char	*svis(char *, int, int, int, const char *);
+char	*snvis(char *, size_t, int, int, int, const char *);
+
+int	strvis(char *, const char *, int);
+int	stravis(char **, const char *, int);
+int	strnvis(char *, size_t, const char *, int);
+
+int	strsvis(char *, const char *, int, const char *);
+int	strsnvis(char *, size_t, const char *, int, const char *);
+
+int	strvisx(char *, const char *, size_t, int);
+int	strnvisx(char *, size_t, const char *, size_t, int);
+int 	strenvisx(char *, size_t, const char *, size_t, int, int *);
+
+int	strsvisx(char *, const char *, size_t, int, const char *);
+int	strsnvisx(char *, size_t, const char *, size_t, int, const char *);
+int	strsenvisx(char *, size_t, const char *, size_t , int, const char *,
+    int *);
+
+int	strunvis(char *, const char *);
+int	strnunvis(char *, size_t, const char *);
+
+int	strunvisx(char *, const char *, int);
+int	strnunvisx(char *, size_t, const char *, int);
+
+#ifndef __LIBC12_SOURCE__
+int	unvis(char *, int, int *, int);
+#endif
+__END_DECLS
+
+#endif /* !_VIS_H_ */
diff --git a/cmd-line-utils/libedit/np/wcsdup.c b/extra/libedit/libedit-20221030-3.1/src/wcsdup.c
similarity index 76%
rename from cmd-line-utils/libedit/np/wcsdup.c
rename to extra/libedit/libedit-20221030-3.1/src/wcsdup.c
index 2a77375e0b74..2405e0d7e3c4 100644
--- a/cmd-line-utils/libedit/np/wcsdup.c
+++ b/extra/libedit/libedit-20221030-3.1/src/wcsdup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $	*/
+/*	$NetBSD: wcsdup.c,v 1.6 2022/03/12 17:31:40 christos Exp $	*/
 
 /*
  * Copyright (C) 2006 Aleksey Cheusov
@@ -16,11 +16,12 @@
 #include "config.h"
 
 #if defined(LIBC_SCCS) && !defined(lint) 
-__RCSID("$NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $"); 
+__RCSID("$NetBSD: wcsdup.c,v 1.6 2022/03/12 17:31:40 christos Exp $"); 
 #endif /* LIBC_SCCS and not lint */ 
 
 #include <stdlib.h>
 #include <assert.h>
+#include <errno.h>
 #include <wchar.h>
 
 wchar_t *
@@ -32,9 +33,10 @@ wcsdup(const wchar_t *str)
 	_DIAGASSERT(str != NULL);
 
 	len = wcslen(str) + 1;
-	copy = malloc(len * sizeof (wchar_t));
 
-	if (!copy)
+	copy = NULL;
+	errno = reallocarr(&copy, len, sizeof(*copy));
+	if (errno)
 		return NULL;
 
 	return wmemcpy(copy, str, len);
diff --git a/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt b/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt
new file mode 100644
index 000000000000..d93b84ed8f67
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt
@@ -0,0 +1,1566 @@
+#
+# Libevent CMake project
+#
+# Based on initial work by:
+#    Alexey Ozeritsky
+#
+# Additional changes:
+#   Brodie Thiesfield
+#   Joakim Soderberg
+#   Trond Norbye
+#   Sergei Nikulov
+#
+#   Build example:
+#
+#       cd libevent
+#       md build
+#       cd build
+#       cmake -G "Visual Studio 10" ..
+#       start libevent.sln
+#
+
+cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+
+if (POLICY CMP0054)
+    cmake_policy(SET CMP0054 NEW)
+endif()
+if (POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+endif()
+if (POLICY CMP0075)
+    cmake_policy(SET CMP0075 NEW)
+endif()
+
+# This is only used by plugins, so we need -fPIC
+STRING_APPEND (CMAKE_C_FLAGS " ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+
+# if(NOT CMAKE_BUILD_TYPE)
+#     set(CMAKE_BUILD_TYPE Release
+#         CACHE STRING "Set build type to Debug o Release (default Release)" FORCE)
+# endif()
+string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+
+# get rid of the extra default configurations
+# what? why would you get id of other useful build types? - Ellzey
+# set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Limited configurations" FORCE)
+
+set(EVENT__LIBRARY_TYPE DEFAULT CACHE STRING
+    "Set library type to SHARED/STATIC/BOTH (default SHARED for MSVC, otherwise BOTH)")
+
+project(libevent C)
+
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
+string(REGEX MATCH "SunOS" SOLARIS "${CMAKE_SYSTEM_NAME}")
+
+
+include(CheckTypeSize)
+include(CheckFunctionExistsEx)
+include(CheckFileOffsetBits)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckVariableExists)
+include(CheckSymbolExists)
+include(CheckStructHasMember)
+include(CheckCSourceCompiles)
+include(CheckPrototypeDefinition)
+include(CheckFunctionKeywords)
+include(CheckConstExists)
+include(AddCompilerFlags)
+include(VersionViaGit)
+
+event_fuzzy_version_from_git()
+
+set(EVENT_VERSION_MAJOR ${EVENT_GIT___VERSION_MAJOR})
+set(EVENT_VERSION_MINOR ${EVENT_GIT___VERSION_MINOR})
+set(EVENT_VERSION_PATCH ${EVENT_GIT___VERSION_PATCH})
+set(EVENT_VERSION_STAGE ${EVENT_GIT___VERSION_STAGE})
+
+
+set(EVENT_ABI_MAJOR ${EVENT_VERSION_MAJOR})
+set(EVENT_ABI_MINOR ${EVENT_VERSION_MINOR})
+set(EVENT_ABI_PATCH ${EVENT_VERSION_PATCH})
+
+set(EVENT_ABI_LIBVERSION
+    "${EVENT_ABI_MAJOR}.${EVENT_ABI_MINOR}.${EVENT_ABI_PATCH}")
+
+set(EVENT_PACKAGE_VERSION
+    "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}")
+
+set(EVENT_NUMERIC_VERSION 0x02010b00)
+# equals to VERSION_INFO in Makefile.am
+set(EVENT_ABI_LIBVERSION_CURRENT   7)
+set(EVENT_ABI_LIBVERSION_REVISION  0)
+set(EVENT_ABI_LIBVERSION_AGE       0)
+
+# equals to RELEASE in Makefile.am
+set(EVENT_PACKAGE_RELEASE 2.1)
+
+# only a subset of names can be used, defaults to "beta"
+set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE})
+
+# a list that defines what can set for EVENT_STAGE_VERSION
+set(EVENT__ALLOWED_STAGE_NAMES
+	rc
+	beta
+	alpha
+	alpha-dev
+	release
+	stable
+)
+list(
+	FIND EVENT__ALLOWED_STAGE_NAMES
+	"${EVENT_STAGE_NAME}"
+	EVENT__STAGE_RET
+)
+if (EVENT__STAGE_RET EQUAL -1)
+	message(WARNING
+		"stage ${EVENT_STAGE_NAME} is not allowed, reset to beta")
+	set(EVENT_STAGE_NAME beta)
+endif()
+
+set(EVENT_VERSION
+	"${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-${EVENT_STAGE_NAME}")
+
+option(EVENT__DISABLE_DEBUG_MODE
+    "Define if libevent should build without support for a debug mode" OFF)
+
+option(EVENT__ENABLE_VERBOSE_DEBUG
+    "Enables verbose debugging" OFF)
+
+option(EVENT__DISABLE_MM_REPLACEMENT
+    "Define if libevent should not allow replacing the mm functions" OFF)
+
+option(EVENT__DISABLE_THREAD_SUPPORT
+    "Define if libevent should not be compiled with thread support" OFF)
+
+option(EVENT__DISABLE_OPENSSL
+    "Define if libevent should build without support for OpenSSL encryption" OFF)
+
+option(EVENT__DISABLE_BENCHMARK
+    "Defines if libevent should build without the benchmark executables" OFF)
+
+option(EVENT__DISABLE_TESTS
+    "If tests should be compiled or not" OFF)
+
+option(EVENT__DISABLE_REGRESS
+    "Disable the regress tests" OFF)
+
+option(EVENT__DISABLE_SAMPLES
+    "Disable sample files" OFF)
+
+option(EVENT__DISABLE_CLOCK_GETTIME
+    "Do not use clock_gettime even if it is available" OFF)
+
+option(EVENT__FORCE_KQUEUE_CHECK
+    "When crosscompiling forces running a test program that verifies that Kqueue works with pipes. Note that this requires you to manually run the test program on the cross compilation target to verify that it works. See cmake documentation for try_run for more details" OFF)
+
+# TODO: Add --disable-largefile     omit support for large files
+option(EVENT__COVERAGE
+"Enable running gcov to get a test coverage report (only works with GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well." OFF)
+
+# Put the libaries and binaries that get built into directories at the
+# top of the build tree rather than in hard-to-find leaf directories.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+
+if (EVENT__ENABLE_VERBOSE_DEBUG)
+    add_definitions(-DUSE_DEBUG=1)
+endif()
+
+# make it colorful under ninja-build
+if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+    add_compiler_flags(-fdiagnostics-color=always)
+endif()
+
+# Setup compiler flags for coverage.
+if (EVENT__COVERAGE)
+    if (NOT "${CMAKE_BUILD_TYPE_LOWER}" STREQUAL "debug")
+        message(FATAL_ERROR "Coverage requires -DCMAKE_BUILD_TYPE=Debug")
+    endif()
+
+    message(STATUS "Setting coverage compiler flags")
+
+    set(CMAKE_REQUIRED_LIBRARIES "--coverage")
+    add_compiler_flags(-g -O0 --coverage)
+    set(CMAKE_REQUIRED_LIBRARIES "")
+endif()
+
+set(GNUC 0)
+set(CLANG 0)
+set(MSVC 0)
+if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR
+    ("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang"))
+    set(CLANG 1)
+endif()
+if (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR (${CLANG}))
+    set(GNUC 1)
+endif()
+if (("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") OR (${CLANG}))
+    set(MSVC 1)
+endif()
+
+# Detect library type
+set(EVENT_LIBRARY_TYPE)
+if ("${EVENT__LIBRARY_TYPE}" STREQUAL "DEFAULT")
+    if (${MSVC})
+        set(EVENT_LIBRARY_TYPE SHARED)
+    else()
+        set(EVENT_LIBRARY_TYPE BOTH)
+    endif()
+else()
+    string(TOUPPER "${EVENT__LIBRARY_TYPE}" EVENT_LIBRARY_TYPE)
+endif()
+if ((${MSVC}) AND ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH"))
+    message(WARNING
+      "Building SHARED and STATIC is not supported for MSVC "
+      "(due to conflicts in library name"
+      " between STATIC library and IMPORTED library for SHARED libraries)")
+endif()
+set(EVENT_LIBRARY_STATIC OFF)
+set(EVENT_LIBRARY_SHARED OFF)
+if ("${EVENT_LIBRARY_TYPE}" STREQUAL "BOTH")
+    set(EVENT_LIBRARY_STATIC ON)
+    set(EVENT_LIBRARY_SHARED ON)
+elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC")
+    set(EVENT_LIBRARY_STATIC ON)
+elseif ("${EVENT_LIBRARY_TYPE}" STREQUAL "SHARED")
+    set(EVENT_LIBRARY_SHARED ON)
+else()
+    message(FATAL_ERROR "${EVENT_LIBRARY_TYPE} is not supported")
+endif()
+
+if (${MSVC})
+    set(msvc_static_runtime OFF)
+    if ("${EVENT_LIBRARY_TYPE}" STREQUAL "STATIC")
+        set(msvc_static_runtime ON)
+    endif()
+
+    # For more info:
+    # - https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library?view=vs-2017
+    # - https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime
+    option(EVENT__MSVC_STATIC_RUNTIME
+           "Link static runtime libraries"
+           ${msvc_static_runtime})
+
+    if (EVENT__MSVC_STATIC_RUNTIME)
+        foreach (flag_var
+                 CMAKE_C_FLAGS
+                 CMAKE_C_FLAGS_DEBUG
+                 CMAKE_C_FLAGS_RELEASE
+                 CMAKE_C_FLAGS_MINSIZEREL
+                 CMAKE_C_FLAGS_RELWITHDEBINFO
+        )
+            if (${flag_var} MATCHES "/MD")
+                string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+            endif()
+        endforeach()
+    endif()
+endif()
+
+# GNUC specific options.
+if (${GNUC})
+    option(EVENT__DISABLE_GCC_WARNINGS "Disable verbose warnings with GCC" OFF)
+    option(EVENT__ENABLE_GCC_HARDENING "Enable compiler security checks" OFF)
+    option(EVENT__ENABLE_GCC_FUNCTION_SECTIONS "Enable gcc function sections" OFF)
+    option(EVENT__ENABLE_GCC_WARNINGS "Make all GCC warnings into errors" OFF)
+
+    set(GCC_V ${CMAKE_C_COMPILER_VERSION})
+
+    list(APPEND __FLAGS
+         -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes
+
+         -fno-strict-aliasing # gcc 2.9.5+
+         -Wmissing-prototypes
+
+         # gcc 4
+         -Winit-self
+         -Wmissing-field-initializers
+         -Wdeclaration-after-statement
+
+         # gcc 4.2
+         -Waddress
+         -Wnormalized=id
+         -Woverride-init
+
+         # gcc 4.5
+         -Wlogical-op
+
+         -Wwrite-strings
+    )
+
+    if (${CLANG})
+        list(APPEND __FLAGS -Wno-unused-function)
+    endif()
+
+    if (EVENT__DISABLE_GCC_WARNINGS)
+        list(APPEND __FLAGS -w)
+    endif()
+
+    if (EVENT__ENABLE_GCC_HARDENING)
+        list(APPEND __FLAGS
+             -fstack-protector-all
+             -fwrapv
+             -fPIE
+             -Wstack-protector
+             "--param ssp-buffer-size=1")
+
+        add_definitions(-D_FORTIFY_SOURCE=2)
+    endif()
+
+    if (EVENT__ENABLE_GCC_FUNCTION_SECTIONS)
+        list(APPEND __FLAGS -ffunction-sections)
+        # TODO: Add --gc-sections support. We need some checks for NetBSD to ensure this works.
+    endif()
+
+    if (EVENT__ENABLE_GCC_WARNINGS)
+        list(APPEND __FLAGS -Werror)
+    endif()
+
+    add_compiler_flags(${__FLAGS})
+endif()
+
+if (APPLE)
+    # Get rid of deprecated warnings for OpenSSL on OSX 10.7 and greater.
+    add_compiler_flags(
+        -Wno-error=deprecated-declarations
+        -Wno-unused-function
+        -Qunused-arguments
+    )
+endif()
+
+CMAKE_PUSH_CHECK_STATE()
+
+# Winsock.
+if(WIN32)
+    set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h ws2tcpip.h)
+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES  ws2_32.lib shell32.lib advapi32.lib)
+    set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h)
+endif()
+if (SOLARIS)
+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES socket nsl)
+endif()
+
+# Check if _GNU_SOURCE is available.
+if (NOT DEFINED _GNU_SOURCE)
+  CHECK_SYMBOL_EXISTS(__GNU_LIBRARY__ "features.h" _GNU_SOURCE)
+
+  if (NOT _GNU_SOURCE)
+    unset(_GNU_SOURCE CACHE)
+    CHECK_SYMBOL_EXISTS(_GNU_SOURCE "features.h" _GNU_SOURCE)
+  endif()
+
+  if (ANDROID)
+    set(_GNU_SOURCE TRUE)
+  endif()
+endif()
+
+if (_GNU_SOURCE)
+    add_definitions(-D_GNU_SOURCE=1)
+endif()
+
+CHECK_INCLUDE_FILE(sys/types.h EVENT__HAVE_SYS_TYPES_H)
+if(EVENT__HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
+endif()
+
+CHECK_INCLUDE_FILE(sys/socket.h EVENT__HAVE_SYS_SOCKET_H)
+if(EVENT__HAVE_SYS_SOCKET_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
+endif()
+
+CHECK_INCLUDE_FILE(netinet/in.h EVENT__HAVE_NETINET_IN_H)
+if(EVENT__HAVE_NETINET_IN_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES netinet/in.h)
+endif()
+
+CHECK_INCLUDE_FILE(sys/un.h EVENT__HAVE_SYS_UN_H)
+if(EVENT__HAVE_SYS_UN_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES sys/un.h)
+endif()
+
+if(WIN32)
+    CHECK_INCLUDE_FILE(afunix.h EVENT__HAVE_AFUNIX_H)
+    if(EVENT__HAVE_AFUNIX_H)
+        list(APPEND CMAKE_EXTRA_INCLUDE_FILES afunix.h)
+    endif()
+endif()
+CHECK_TYPE_SIZE("struct sockaddr_un" EVENT__HAVE_STRUCT_SOCKADDR_UN)
+
+CHECK_INCLUDE_FILE(netinet/in6.h EVENT__HAVE_NETINET_IN6_H)
+if(EVENT__HAVE_NETINET_IN6_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES netinet/in6.h)
+endif()
+
+CHECK_INCLUDE_FILE(unistd.h EVENT__HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE(netdb.h EVENT__HAVE_NETDB_H)
+CHECK_INCLUDE_FILE(dlfcn.h EVENT__HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE(arpa/inet.h EVENT__HAVE_ARPA_INET_H)
+CHECK_INCLUDE_FILE(fcntl.h EVENT__HAVE_FCNTL_H)
+if(EVENT__HAVE_FCNTL_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES fcntl.h)
+endif()
+CHECK_INCLUDE_FILE(inttypes.h EVENT__HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE(memory.h EVENT__HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE(poll.h EVENT__HAVE_POLL_H)
+CHECK_INCLUDE_FILE(port.h EVENT__HAVE_PORT_H)
+if(EVENT__HAVE_PORT_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES port.h)
+endif()
+CHECK_INCLUDE_FILE(signal.h EVENT__HAVE_SIGNAL_H)
+CHECK_INCLUDE_FILE(stdarg.h EVENT__HAVE_STDARG_H)
+CHECK_INCLUDE_FILE(stddef.h EVENT__HAVE_STDDEF_H)
+CHECK_INCLUDE_FILE(stdint.h EVENT__HAVE_STDINT_H)
+CHECK_INCLUDE_FILE(stdlib.h EVENT__HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE(strings.h EVENT__HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE(string.h EVENT__HAVE_STRING_H)
+CHECK_INCLUDE_FILE(sys/devpoll.h EVENT__HAVE_DEVPOLL)
+CHECK_INCLUDE_FILE(sys/epoll.h EVENT__HAVE_SYS_EPOLL_H)
+CHECK_INCLUDE_FILE(sys/eventfd.h EVENT__HAVE_SYS_EVENTFD_H)
+CHECK_INCLUDE_FILE(sys/event.h EVENT__HAVE_SYS_EVENT_H)
+CHECK_INCLUDE_FILE(sys/ioctl.h EVENT__HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILE(sys/mman.h EVENT__HAVE_SYS_MMAN_H)
+CHECK_INCLUDE_FILE(sys/param.h EVENT__HAVE_SYS_PARAM_H)
+CHECK_INCLUDE_FILE(sys/queue.h EVENT__HAVE_SYS_QUEUE_H)
+CHECK_INCLUDE_FILE(sys/select.h EVENT__HAVE_SYS_SELECT_H)
+CHECK_INCLUDE_FILE(sys/sendfile.h EVENT__HAVE_SYS_SENDFILE_H)
+CHECK_INCLUDE_FILE(sys/stat.h EVENT__HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE(sys/time.h EVENT__HAVE_SYS_TIME_H)
+if(EVENT__HAVE_SYS_TIME_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES sys/time.h)
+endif()
+CHECK_INCLUDE_FILE(sys/uio.h EVENT__HAVE_SYS_UIO_H)
+CHECK_INCLUDE_FILES("sys/types.h;ifaddrs.h" EVENT__HAVE_IFADDRS_H)
+CHECK_INCLUDE_FILE(mach/mach_time.h EVENT__HAVE_MACH_MACH_TIME_H)
+CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H)
+CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H)
+CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H)
+CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H)
+CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H)
+CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H)
+
+IF(EVENT__HAVE_SYS_SYSCTL_H)
+  # The <sys/sysctl.h> header is deprecated and will be removed." [-W#warnings]
+  MY_CHECK_C_COMPILER_FLAG("-W#warnings" HAVE_PREPROCESSOR_WARNINGS)
+  IF(HAVE_PREPROCESSOR_WARNINGS)
+    ADD_COMPILE_FLAGS(evutil_rand.c COMPILE_FLAGS "-Wno-cpp")
+  ENDIF()
+  MY_CHECK_C_COMPILER_FLAG("-Wcpp" HAVE_CPP_WARNINGS)
+  IF(HAVE_CPP_WARNINGS)
+    ADD_COMPILE_FLAGS(evutil_rand.c COMPILE_FLAGS "-Wno-cpp")
+  ENDIF()
+  MY_CHECK_C_COMPILER_FLAG("-Wdeprecated-declarations" HAVE_DEPRECATED_DECLARATIONS)
+  IF(HAVE_DEPRECATED_DECLARATIONS)
+    ADD_COMPILE_FLAGS(evutil_rand.c COMPILE_FLAGS "-Wno-deprecated-declarations")
+  ENDIF()
+ENDIF()
+
+CHECK_FUNCTION_EXISTS_EX(epoll_create EVENT__HAVE_EPOLL)
+CHECK_FUNCTION_EXISTS_EX(epoll_ctl EVENT__HAVE_EPOLL_CTL)
+CHECK_FUNCTION_EXISTS_EX(eventfd EVENT__HAVE_EVENTFD)
+if(NOT EVENT__DISABLE_CLOCK_GETTIME)
+    CHECK_FUNCTION_EXISTS_EX(clock_gettime EVENT__HAVE_CLOCK_GETTIME)
+endif()
+CHECK_FUNCTION_EXISTS_EX(fcntl EVENT__HAVE_FCNTL)
+CHECK_FUNCTION_EXISTS_EX(getaddrinfo EVENT__HAVE_GETADDRINFO)
+CHECK_FUNCTION_EXISTS_EX(getnameinfo EVENT__HAVE_GETNAMEINFO)
+CHECK_FUNCTION_EXISTS_EX(gettimeofday EVENT__HAVE_GETTIMEOFDAY)
+CHECK_FUNCTION_EXISTS_EX(getprotobynumber EVENT__HAVE_GETPROTOBYNUMBER)
+CHECK_FUNCTION_EXISTS_EX(getservbyname EVENT__HAVE_GETSERVBYNAME)
+CHECK_FUNCTION_EXISTS_EX(inet_ntop EVENT__HAVE_INET_NTOP)
+CHECK_FUNCTION_EXISTS_EX(inet_pton EVENT__HAVE_INET_PTON)
+CHECK_FUNCTION_EXISTS_EX(kqueue EVENT__HAVE_KQUEUE)
+CHECK_FUNCTION_EXISTS_EX(mmap EVENT__HAVE_MMAP)
+CHECK_FUNCTION_EXISTS_EX(pipe EVENT__HAVE_PIPE)
+CHECK_FUNCTION_EXISTS_EX(pipe2 EVENT__HAVE_PIPE2)
+CHECK_FUNCTION_EXISTS_EX(poll EVENT__HAVE_POLL)
+CHECK_FUNCTION_EXISTS_EX(port_create EVENT__HAVE_PORT_CREATE)
+CHECK_FUNCTION_EXISTS_EX(sendfile EVENT__HAVE_SENDFILE)
+CHECK_FUNCTION_EXISTS_EX(sigaction EVENT__HAVE_SIGACTION)
+CHECK_FUNCTION_EXISTS_EX(signal EVENT__HAVE_SIGNAL)
+CHECK_FUNCTION_EXISTS_EX(splice EVENT__HAVE_SPLICE)
+CHECK_FUNCTION_EXISTS_EX(strlcpy EVENT__HAVE_STRLCPY)
+CHECK_FUNCTION_EXISTS_EX(strsep EVENT__HAVE_STRSEP)
+CHECK_FUNCTION_EXISTS_EX(strtok_r EVENT__HAVE_STRTOK_R)
+CHECK_FUNCTION_EXISTS_EX(strtoll EVENT__HAVE_STRTOLL)
+CHECK_FUNCTION_EXISTS_EX(vasprintf EVENT__HAVE_VASPRINTF)
+CHECK_FUNCTION_EXISTS_EX(sysctl EVENT__HAVE_SYSCTL)
+CHECK_FUNCTION_EXISTS_EX(accept4 EVENT__HAVE_ACCEPT4)
+CHECK_FUNCTION_EXISTS_EX(arc4random EVENT__HAVE_ARC4RANDOM)
+CHECK_FUNCTION_EXISTS_EX(arc4random_buf EVENT__HAVE_ARC4RANDOM_BUF)
+# Disabled, as the underlying arc4random_addrandom is not portable,
+# and is deprecated on those platforms that have it.
+# CHECK_FUNCTION_EXISTS_EX(arc4random_addrandom EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+UNSET(EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+UNSET(EVENT__HAVE_ARC4RANDOM_ADDRANDOM CACHE)
+CHECK_FUNCTION_EXISTS_EX(epoll_create1 EVENT__HAVE_EPOLL_CREATE1)
+CHECK_FUNCTION_EXISTS_EX(getegid EVENT__HAVE_GETEGID)
+CHECK_FUNCTION_EXISTS_EX(geteuid EVENT__HAVE_GETEUID)
+CHECK_FUNCTION_EXISTS_EX(getifaddrs EVENT__HAVE_GETIFADDRS)
+CHECK_FUNCTION_EXISTS_EX(issetugid EVENT__HAVE_ISSETUGID)
+CHECK_FUNCTION_EXISTS_EX(mach_absolute_time EVENT__HAVE_MACH_ABSOLUTE_TIME)
+CHECK_FUNCTION_EXISTS_EX(nanosleep EVENT__HAVE_NANOSLEEP)
+CHECK_FUNCTION_EXISTS_EX(usleep EVENT__HAVE_USLEEP)
+CHECK_FUNCTION_EXISTS_EX(timeradd EVENT__HAVE_TIMERADD)
+CHECK_FUNCTION_EXISTS_EX(timerclear EVENT__HAVE_TIMERCLEAR)
+CHECK_FUNCTION_EXISTS_EX(timercmp EVENT__HAVE_TIMERCMP)
+CHECK_FUNCTION_EXISTS_EX(timerfd_create EVENT__HAVE_TIMERFD_CREATE)
+CHECK_FUNCTION_EXISTS_EX(timerisset EVENT__HAVE_TIMERISSET)
+CHECK_FUNCTION_EXISTS_EX(putenv EVENT__HAVE_PUTENV)
+CHECK_FUNCTION_EXISTS_EX(setenv EVENT__HAVE_SETENV)
+CHECK_FUNCTION_EXISTS_EX(setrlimit EVENT__HAVE_SETRLIMIT)
+CHECK_FUNCTION_EXISTS_EX(umask EVENT__HAVE_UMASK)
+CHECK_FUNCTION_EXISTS_EX(unsetenv EVENT__HAVE_UNSETENV)
+
+# Get the gethostbyname_r prototype.
+CHECK_FUNCTION_EXISTS_EX(gethostbyname_r EVENT__HAVE_GETHOSTBYNAME_R)
+
+if(EVENT__HAVE_GETHOSTBYNAME_R)
+    CHECK_PROTOTYPE_DEFINITION(gethostbyname_r
+        "int gethostbyname_r(const char *name, struct hostent *hp, struct hostent_data *hdata)"
+        "0"
+        "netdb.h"
+        EVENT__HAVE_GETHOSTBYNAME_R_3_ARG)
+
+    CHECK_PROTOTYPE_DEFINITION(gethostbyname_r
+        "struct hostent *gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, int *herr)"
+        "NULL"
+        "netdb.h"
+        EVENT__HAVE_GETHOSTBYNAME_R_5_ARG)
+
+    CHECK_PROTOTYPE_DEFINITION(gethostbyname_r
+        "int gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, struct hostent **result, int *herr)"
+        "0"
+        "netdb.h"
+        EVENT__HAVE_GETHOSTBYNAME_R_6_ARG)
+endif()
+
+if(HAVE_PORT_H AND HAVE_PORT_CREATE)
+    set(EVENT__HAVE_EVENT_PORTS 1)
+endif()
+
+if(NOT WIN32)
+    CHECK_FUNCTION_EXISTS_EX(select EVENT__HAVE_SELECT)
+endif()
+
+CHECK_TYPE_SIZE("uint8_t" EVENT__HAVE_UINT8_T)
+CHECK_TYPE_SIZE("uint16_t" EVENT__HAVE_UINT16_T)
+CHECK_TYPE_SIZE("uint32_t" EVENT__HAVE_UINT32_T)
+CHECK_TYPE_SIZE("uint64_t" EVENT__HAVE_UINT64_T)
+CHECK_TYPE_SIZE("short" EVENT__SIZEOF_SHORT BUILTIN_TYPES_ONLY)
+CHECK_TYPE_SIZE("int" EVENT__SIZEOF_INT BUILTIN_TYPES_ONLY)
+CHECK_TYPE_SIZE("unsigned" EVENT__SIZEOF_UNSIGNED BUILTIN_TYPES_ONLY)
+CHECK_TYPE_SIZE("unsigned int" EVENT__SIZEOF_UNSIGNED_INT BUILTIN_TYPES_ONLY)
+CHECK_TYPE_SIZE("long" EVENT__SIZEOF_LONG BUILTIN_TYPES_ONLY)
+CHECK_TYPE_SIZE("long long" EVENT__SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY)
+
+if(WIN32)
+    # These aren't available until Windows Vista.
+    # But you can still link them. They just won't be found when running the exe.
+    set(EVENT__HAVE_INET_NTOP 0)
+    set(EVENT__HAVE_INET_PTON 0)
+endif()
+
+# Check for different inline keyword versions.
+check_function_keywords("inline" "__inline" "__inline__")
+
+if (HAVE_INLINE)
+    set(EVENT__inline inline)
+elseif (HAVE___INLINE)
+    set(EVENT__inline __inline)
+elseif(HAVE___INLINE__)
+    set(EVENT__inline __inline__)
+else()
+    set(EVENT__inline)
+endif()
+
+# __func__/__FUNCTION__ is not a macros in general
+CHECK_SYMBOL_EXISTS("__func__"     "" EVENT__HAVE___func__)
+CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__)
+
+CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH)
+CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN)
+CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND)
+CHECK_CONST_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM)
+CHECK_CONST_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID)
+CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD)
+
+CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK)
+
+CHECK_TYPE_SIZE(size_t EVENT__SIZEOF_SIZE_T)
+if(NOT EVENT__SIZEOF_SIZE_T)
+  set(EVENT__size_t "unsigned")
+  set(EVENT__SIZEOF_SIZE_T ${EVENT__SIZEOF_UNSIGNED})
+else()
+    set(EVENT__size_t size_t)
+endif()
+
+CHECK_TYPE_SIZE("off_t" EVENT__SIZEOF_OFF_T LANGUAGE C)
+
+
+# XXX we should functionalize these size and type sets. --elley
+
+# Winssck.
+if (_MSC_VER)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES BaseTsd.h)
+endif()
+CHECK_TYPE_SIZE("ssize_t" EVENT__SIZEOF_SSIZE_T_LOWER LANGUAGE C)
+CHECK_TYPE_SIZE("SSIZE_T" EVENT__SIZEOF_SSIZE_T_UPPER LANGUAGE C)
+
+if (EVENT__SIZEOF_SSIZE_T_LOWER)
+    set(EVENT__ssize_t "ssize_t")
+    set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_LOWER})
+elseif (EVENT__SIZEOF_SSIZE_T_UPPER)
+    set(EVENT__ssize_t "SSIZE_T")
+    set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_SSIZE_T_UPPER})
+else()
+    set(EVENT__ssize_t "int")
+    set(EVENT__SIZEOF_SSIZE_T ${EVENT__SIZEOF_INT})
+endif()
+
+CHECK_TYPE_SIZE(socklen_t EVENT__SIZEOF_SOCKLEN_T)
+if(NOT EVENT__SIZEOF_SOCKLEN_T)
+  set(EVENT__socklen_t "unsigned int")
+  set(EVENT__SIZEOF_SOCKLEN_T ${EVENT__SIZEOF_UNSIGNED_INT})
+else()
+    set(EVENT__socklen_t "socklen_t")
+endif()
+
+CHECK_TYPE_SIZE(pid_t EVENT__SIZEOF_PID_T)
+if(NOT EVENT__SIZEOF_PID_T)
+  set(EVENT__SIZEOF_PID_T ${EVENT__SIZEOF_INT})
+else()
+	set(EVENT__SIZEOF_PID_T EVENT__SIZEOF_PID_T)
+endif()
+
+if (NOT EVENT__DISABLE_THREAD_SUPPORT)
+    if (NOT WIN32)
+        list(APPEND CMAKE_EXTRA_INCLUDE_FILES pthread.h)
+    endif()
+    CHECK_TYPE_SIZE(pthread_t EVENT__SIZEOF_PTHREAD_T)
+endif()
+
+if(EVENT__HAVE_CLOCK_GETTIME)
+  set(EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1)
+endif()
+
+# we're just getting lazy now.
+CHECK_TYPE_SIZE("uintptr_t" EVENT__HAVE_UINTPTR_T)
+CHECK_TYPE_SIZE("void *" EVENT__SIZEOF_VOID_P)
+CHECK_TYPE_SIZE("time_t" EVENT__SIZEOF_TIME_T)
+
+# Tests file offset bits.
+# TODO: Add AIX test for if -D_LARGE_FILES is needed.
+
+# XXX: Why is this here? we don't even use it. Well, we don't even use it
+#      on top of that, why is it set in the config.h?! IT_MAKES_NO_SENSE
+#      I'm commenting it out for now.
+#      - ellzey
+
+#CHECK_FILE_OFFSET_BITS()
+
+# Verify kqueue works with pipes.
+if (EVENT__HAVE_KQUEUE)
+    if ((CMAKE_CROSSCOMPILING OR APPLE) AND NOT EVENT__FORCE_KQUEUE_CHECK)
+        message(WARNING "Cannot check if kqueue works with pipes when running on APPLE or crosscompiling, use EVENT__FORCE_KQUEUE_CHECK to be sure (this requires manually running a test program on the cross compilation target)")
+        set(EVENT__HAVE_WORKING_KQUEUE 1)
+    else()
+        message(STATUS "Checking if kqueue works with pipes...")
+        include(CheckWorkingKqueue)
+    endif()
+endif()
+
+if(EVENT__HAVE_NETDB_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES netdb.h)
+    CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO)
+elseif(WIN32)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h)
+    CHECK_TYPE_SIZE("struct addrinfo" EVENT__HAVE_STRUCT_ADDRINFO)
+endif()
+
+# Check for sockaddr structure sizes.
+set(SOCKADDR_HEADERS)
+if (WIN32)
+    set(CMAKE_REQUIRED_DEFINITIONS "-DWIN32_LEAN_AND_MEAN")
+    if (_MSC_VER LESS 1300)
+        set(SOCKADDR_HEADERS winsock.h)
+    else()
+        set(SOCKADDR_HEADERS winsock2.h ws2tcpip.h)
+    endif()
+else()
+    if (EVENT__HAVE_NETINET_IN_H)
+        set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in.h)
+    endif()
+
+    if (EVENT__HAVE_NETINET_IN6_H)
+        set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netinet/in6.h)
+    endif()
+
+    if (EVENT__HAVE_SYS_SOCKET_H)
+        set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} sys/socket.h)
+    endif()
+
+    if (EVENT__HAVE_NETDB_H)
+        set(SOCKADDR_HEADERS ${SOCKADDR_HEADERS} netdb.h)
+    endif()
+endif()
+
+CHECK_TYPE_SIZE("struct in6_addr" EVENT__HAVE_STRUCT_IN6_ADDR)
+if(EVENT__HAVE_STRUCT_IN6_ADDR)
+    CHECK_STRUCT_HAS_MEMBER("struct in6_addr"
+            s6_addr16 "${SOCKADDR_HEADERS}"
+            EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16)
+
+    CHECK_STRUCT_HAS_MEMBER("struct in6_addr"
+            s6_addr32 "${SOCKADDR_HEADERS}"
+            EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32)
+endif()
+
+CHECK_TYPE_SIZE("sa_family_t" EVENT__HAVE_SA_FAMILY_T)
+CHECK_TYPE_SIZE("struct sockaddr_in6" EVENT__HAVE_STRUCT_SOCKADDR_IN6)
+
+if(EVENT__HAVE_STRUCT_SOCKADDR_IN6)
+    CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6"
+            sin6_len "${SOCKADDR_HEADERS}"
+            EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN)
+
+    CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6"
+            sin_len "${SOCKADDR_HEADERS}"
+            EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
+endif()
+
+CHECK_TYPE_SIZE("struct sockaddr_storage" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE)
+if(EVENT__HAVE_STRUCT_SOCKADDR_STORAGE)
+    CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage"
+            ss_family "${SOCKADDR_HEADERS}"
+            EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY)
+
+    CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage"
+            __ss_family "${SOCKADDR_HEADERS}" EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY)
+endif()
+
+CHECK_TYPE_SIZE("struct linger" EVENT__HAVE_STRUCT_LINGER)
+
+CMAKE_POP_CHECK_STATE()
+
+# Group the source files.
+set(HDR_PRIVATE
+    bufferevent-internal.h
+    changelist-internal.h
+    defer-internal.h
+    epolltable-internal.h
+    evbuffer-internal.h
+    event-internal.h
+    evmap-internal.h
+    evrpc-internal.h
+    evsignal-internal.h
+    evthread-internal.h
+    ht-internal.h
+    http-internal.h
+    iocp-internal.h
+    ipv6-internal.h
+    log-internal.h
+    minheap-internal.h
+    mm-internal.h
+    ratelim-internal.h
+    strlcpy-internal.h
+    util-internal.h
+    evconfig-private.h
+    compat/sys/queue.h)
+
+set(HDR_COMPAT
+    include/evdns.h
+    include/evrpc.h
+    include/event.h
+    include/evhttp.h
+    include/evutil.h)
+
+set(HDR_PUBLIC
+    include/event2/buffer.h
+    include/event2/bufferevent.h
+    include/event2/bufferevent_compat.h
+    include/event2/bufferevent_struct.h
+    include/event2/buffer_compat.h
+    include/event2/dns.h
+    include/event2/dns_compat.h
+    include/event2/dns_struct.h
+    include/event2/event.h
+    include/event2/event_compat.h
+    include/event2/event_struct.h
+    include/event2/http.h
+    include/event2/http_compat.h
+    include/event2/http_struct.h
+    include/event2/keyvalq_struct.h
+    include/event2/listener.h
+    include/event2/rpc.h
+    include/event2/rpc_compat.h
+    include/event2/rpc_struct.h
+    include/event2/tag.h
+    include/event2/tag_compat.h
+    include/event2/thread.h
+    include/event2/util.h
+    include/event2/visibility.h
+    ${PROJECT_BINARY_DIR}/include/event2/event-config.h)
+
+set(SRC_CORE
+    buffer.c
+    bufferevent.c
+    bufferevent_filter.c
+    bufferevent_pair.c
+    bufferevent_ratelim.c
+    bufferevent_sock.c
+    event.c
+    evmap.c
+    evthread.c
+    evutil.c
+    evutil_rand.c
+    evutil_time.c
+    listener.c
+    log.c
+    signal.c
+    strlcpy.c)
+
+if(EVENT__HAVE_SELECT)
+    list(APPEND SRC_CORE select.c)
+endif()
+
+if(EVENT__HAVE_POLL)
+    list(APPEND SRC_CORE poll.c)
+endif()
+
+if(EVENT__HAVE_KQUEUE)
+    list(APPEND SRC_CORE kqueue.c)
+endif()
+
+if(EVENT__HAVE_DEVPOLL)
+    list(APPEND SRC_CORE devpoll.c)
+endif()
+
+if(EVENT__HAVE_EPOLL)
+    list(APPEND SRC_CORE epoll.c)
+endif()
+
+if(EVENT__HAVE_EVENT_PORTS)
+    list(APPEND SRC_CORE evport.c)
+endif()
+
+if (NOT EVENT__DISABLE_OPENSSL)
+#   SSL is configured in cmake/ssl.cmake
+#   find_package(OpenSSL REQUIRED)
+
+    INCLUDE_DIRECTORIES(BEFORE SYSTEM ${SSL_INCLUDE_DIRS})
+    set(EVENT__HAVE_OPENSSL 1)
+
+    list(APPEND SRC_OPENSSL bufferevent_openssl.c)
+    list(APPEND HDR_PUBLIC include/event2/bufferevent_ssl.h)
+    list(APPEND LIB_APPS ${OPENSSL_LIBRARIES})
+endif()
+
+if (NOT EVENT__DISABLE_THREAD_SUPPORT)
+    if (WIN32)
+        list(APPEND SRC_CORE evthread_win32.c)
+    else()
+        find_package(Threads REQUIRED)
+        if (NOT CMAKE_USE_PTHREADS_INIT)
+            message(FATAL_ERROR
+                    "Failed to find Pthreads, set EVENT__DISABLE_THREAD_SUPPORT to disable")
+        endif()
+
+        set(EVENT__HAVE_PTHREADS 1)
+        list(APPEND LIB_APPS ${CMAKE_THREAD_LIBS_INIT})
+    endif()
+endif()
+
+## if (NOT EVENT__DISABLE_TESTS)
+##     # Zlib is only used for testing.
+##     find_package(ZLIB)
+## 
+##     if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+##         include_directories(${ZLIB_INCLUDE_DIRS})
+## 
+##         set(EVENT__HAVE_LIBZ 1)
+##         list(APPEND LIB_APPS ${ZLIB_LIBRARIES})
+##     endif()
+## endif()
+
+set(SRC_EXTRA
+    event_tagging.c
+    http.c
+    evdns.c
+    evrpc.c)
+
+add_definitions(-DHAVE_CONFIG_H)
+
+# We use BEFORE here so we don't accidentally look in system directories
+# first for some previous versions of the headers that are installed.
+include_directories(BEFORE ${PROJECT_SOURCE_DIR}
+    ${PROJECT_SOURCE_DIR}/compat
+    ${PROJECT_SOURCE_DIR}/include)
+
+if(WIN32)
+    list(APPEND SRC_CORE
+        buffer_iocp.c
+        bufferevent_async.c
+        event_iocp.c
+        win32select.c)
+
+    list(APPEND HDR_PRIVATE WIN32-Code/getopt.h)
+
+    set(EVENT__DNS_USE_FTIME_FOR_ID 1)
+    set(LIB_PLATFORM ws2_32 shell32 advapi32)
+    add_definitions(
+            -D_CRT_SECURE_NO_WARNINGS
+            -D_CRT_NONSTDC_NO_DEPRECATE)
+    # Removing WIN32_LEAN_AND_MEAN definition to avoid:
+    # "warning C4005: 'WIN32_LEAN_AND_MEAN': macro redefinition" in several files
+    remove_definitions(-DWIN32_LEAN_AND_MEAN)
+
+    include_directories(./WIN32-Code)
+endif()
+
+if (SOLARIS)
+    list(APPEND LIB_PLATFORM socket nsl)
+endif()
+
+source_group("Headers Private"  FILES ${HDR_PRIVATE})
+source_group("Header Compat"    FILES ${HDR_COMPAT})
+source_group("Headers Public"   FILES ${HDR_PUBLIC})
+source_group("Source Core"      FILES ${SRC_CORE})
+source_group("Source Extra"     FILES ${SRC_EXTRA})
+
+# Generate the configure headers.
+# (Place them in the build dir so we don't polute the source tree with generated files).
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include)
+
+if (${GNUC})
+    set(EVENT_SHARED_FLAGS -fvisibility=hidden)
+elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "SunPro")
+    set(EVENT_SHARED_FLAGS -xldscope=hidden)
+endif()
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/event-config.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/include/event2/event-config.h
+        NEWLINE_STYLE UNIX)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/evconfig-private.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/include/evconfig-private.h)
+
+#
+# Create the libraries.
+# Do not use add_event_library, it will install them.
+# include(AddEventLibrary)
+add_library(event_core STATIC ${SRC_CORE})
+add_library(event_extra STATIC ${SRC_EXTRA})
+add_library(event_openssl STATIC ${SRC_OPENSSL})
+# These are interdependent libraries.
+TARGET_LINK_LIBRARIES(event_extra event_core)
+TARGET_LINK_LIBRARIES(event_openssl event_core)
+
+IF(NOT WIN32)
+  SET_TARGET_PROPERTIES(event_core
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+  SET_TARGET_PROPERTIES(event_extra
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+  SET_TARGET_PROPERTIES(event_openssl
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+ENDIF()
+
+if (CMAKE_USE_PTHREADS_INIT)
+  set(SRC_PTHREADS evthread_pthread.c)
+  add_library(event_pthreads ${SRC_PTHREADS})
+  SET_TARGET_PROPERTIES(event_pthreads
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+endif()
+
+# Do not generate legacy event library, and do not install or test anything.
+RETURN()
+
+# library exists for historical reasons; it contains the contents of
+# both libevent_core and libevent_extra. You shouldn’t use it; it may
+# go away in a future version of Libevent.
+add_event_library(event SOURCES ${SRC_CORE} ${SRC_EXTRA})
+
+set(WIN32_GETOPT)
+if (WIN32)
+    list(APPEND WIN32_GETOPT
+         WIN32-Code/getopt.c
+         WIN32-Code/getopt_long.c)
+endif()
+
+#
+# Samples.
+#
+macro(add_sample_prog ssl name)
+    add_executable(${name} ${ARGN})
+
+    target_link_libraries(${name}
+                          event_extra
+                          event_core
+                          ${LIB_APPS}
+                          ${LIB_PLATFORM})
+
+    if (${ssl})
+        target_link_libraries(${name} event_openssl)
+    endif()
+endmacro()
+if (NOT EVENT__DISABLE_SAMPLES)
+    set(SAMPLES
+        event-read-fifo
+        hello-world
+        signal-test
+        http-connect
+        time-test)
+
+    foreach(SAMPLE ${SAMPLES})
+        add_sample_prog(OFF ${SAMPLE} sample/${SAMPLE}.c)
+    endforeach()
+
+    if (NOT EVENT__DISABLE_OPENSSL)
+        add_sample_prog(ON https-client
+                        sample/https-client.c
+                        sample/openssl_hostname_validation.c
+                        sample/hostcheck.c)
+        add_sample_prog(ON le-proxy
+                        sample/le-proxy.c)
+    endif()
+
+    set(SAMPLES_WOPT
+        dns-example
+        http-server
+    )
+    foreach (SAMPLE ${SAMPLES_WOPT})
+        add_sample_prog(OFF ${SAMPLE} sample/${SAMPLE}.c ${WIN32_GETOPT})
+    endforeach()
+endif()
+
+#
+# Benchmarks
+#
+macro(add_bench_prog prog)
+    add_executable(${prog} ${ARGN})
+    target_link_libraries(${prog}
+                          event_extra
+                          event_core
+                          ${LIB_APPS}
+                          ${LIB_PLATFORM})
+endmacro()
+if (NOT EVENT__DISABLE_BENCHMARK)
+    foreach (BENCHMARK bench_http bench_httpclient)
+        add_bench_prog(${BENCHMARK} test/${BENCHMARK}.c)
+    endforeach()
+
+    add_bench_prog(bench test/bench.c ${WIN32_GETOPT})
+    add_bench_prog(bench_cascade test/bench_cascade.c ${WIN32_GETOPT})
+endif()
+
+#
+# Tests
+#
+macro(add_test_prog prog)
+    add_executable(${prog} test/${prog}.c)
+    target_link_libraries(${prog}
+                          ${LIB_APPS}
+                          ${LIB_PLATFORM}
+                          event_core
+                          event_extra
+                          ${ARGN})
+endmacro()
+if (NOT EVENT__DISABLE_TESTS)
+    #
+    # Generate Regress tests.
+    #
+    if (NOT EVENT__DISABLE_REGRESS)
+        # (We require python to generate the regress tests)
+        find_package(PythonInterp 3)
+
+        if (PYTHONINTERP_FOUND)
+            set(__FOUND_USABLE_PYTHON 1)
+        else()
+            find_package(PythonInterp 2)
+            if (PYTHONINTERP_FOUND)
+                set(__FOUND_USABLE_PYTHON 1)
+            else()
+                message(ERROR "No suitable Python version found, bailing...")
+            endif()
+        endif()
+
+        if (__FOUND_USABLE_PYTHON)
+            message(STATUS "Generating regress tests...")
+
+            add_definitions(-DTINYTEST_LOCAL)
+
+            add_custom_command(
+                OUTPUT
+                    ${CMAKE_CURRENT_SOURCE_DIR}/test/regress.gen.c
+                    ${CMAKE_CURRENT_SOURCE_DIR}/test/regress.gen.h
+                DEPENDS
+                    event_rpcgen.py
+                    test/regress.rpc
+                COMMAND ${PYTHON_EXECUTABLE} ../event_rpcgen.py regress.rpc
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+
+            list(APPEND SRC_REGRESS
+                 test/regress.c
+                 test/regress.gen.c
+                 test/regress.gen.h
+                 test/regress_buffer.c
+                 test/regress_bufferevent.c
+                 test/regress_dns.c
+                 test/regress_et.c
+                 test/regress_finalize.c
+                 test/regress_http.c
+                 test/regress_listener.c
+                 test/regress_main.c
+                 test/regress_minheap.c
+                 test/regress_rpc.c
+                 test/regress_testutils.c
+                 test/regress_testutils.h
+                 test/regress_util.c
+                 test/tinytest.c)
+
+            if (WIN32)
+                list(APPEND SRC_REGRESS test/regress_iocp.c)
+                if (NOT EVENT__DISABLE_THREAD_SUPPORT)
+                    list(APPEND SRC_REGRESS test/regress_thread.c)
+                endif()
+            elseif (CMAKE_USE_PTHREADS_INIT)
+                list(APPEND SRC_REGRESS test/regress_thread.c)
+            endif()
+
+            if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+                list(APPEND SRC_REGRESS test/regress_zlib.c)
+            endif()
+
+            if (NOT EVENT__DISABLE_OPENSSL)
+                list(APPEND SRC_REGRESS test/regress_ssl.c)
+            endif()
+
+            add_executable(regress ${SRC_REGRESS})
+
+            target_link_libraries(regress
+                                  ${LIB_APPS}
+                                  ${LIB_PLATFORM}
+                                  event_core
+                                  event_extra)
+            if (NOT EVENT__DISABLE_OPENSSL)
+                target_link_libraries(regress event_openssl)
+            endif()
+            if (CMAKE_USE_PTHREADS_INIT)
+                target_link_libraries(regress event_pthreads)
+            endif()
+        else()
+            message(WARNING "No suitable Python interpreter found, cannot generate regress tests!")
+        endif()
+    endif()
+
+    #
+    # Test programs.
+    #
+    # all of these, including the cmakelists.txt should be moved
+    # into the dirctory 'tests' first.
+    #
+    # doing this, we can remove all the DISABLE_TESTS stuff, and simply
+    # do something like:
+    #
+    # add_custom_targets(tests)
+    # add_executable(... EXCLUDE_FROM_ALL ...c)
+    # add_dependencis(tests testa testb testc)
+    # add_test(....)
+    #
+    # then you can just run 'make tests' instead of them all
+    # auto-compile|running
+    # - ellzey
+    set(TESTPROGS test-changelist
+                  test-eof
+                  test-fdleak
+                  test-init
+                  test-time
+                  test-weof)
+
+    foreach (TESTPROG ${TESTPROGS} test-dumpevents)
+        add_test_prog(${TESTPROG})
+    endforeach()
+    if (UNIX)
+        add_test_prog(test-ratelim m)
+    else()
+        add_test_prog(test-ratelim)
+    endif()
+
+    set(ALL_TESTPROGS
+        ${TESTPROGS}
+        test-dumpevents
+        test-ratelim
+    )
+
+    #
+    # We run all tests with the different backends turned on one at a time.
+    #
+
+    # Add event backends based on system introspection result.
+    set(BACKENDS "")
+
+    if (EVENT__HAVE_EPOLL)
+        list(APPEND BACKENDS EPOLL)
+    endif()
+
+    if (EVENT__HAVE_SELECT)
+        list(APPEND BACKENDS SELECT)
+    endif()
+
+    if (EVENT__HAVE_POLL)
+        list(APPEND BACKENDS POLL)
+    endif()
+
+    if (EVENT__HAVE_KQUEUE)
+        list(APPEND BACKENDS KQUEUE)
+    endif()
+
+    if (EVENT__HAVE_EVENT_PORTS)
+        list(APPEND BACKENDS EVPORT)
+    endif()
+
+    if (EVENT__HAVE_DEVPOLL)
+        list(APPEND BACKENDS DEVPOLL)
+    endif()
+
+    if (WIN32)
+        list(APPEND BACKENDS WIN32)
+    endif()
+
+
+    # Default environment variables turns off all event systems,
+    # then we enable each one, one at a time when creating the tests.
+    set(DEFAULT_TEST_ENV_VARS "EVENT_SHOW_METHOD=1;")
+    foreach(BACKEND ${BACKENDS})
+        set(BACKEND_ENV_VAR "EVENT_NO${BACKEND}=1")
+        list(APPEND DEFAULT_TEST_ENV_VARS "${BACKEND_ENV_VAR}")
+    endforeach()
+
+    # Macro that creates the ctest test for a backend.
+    macro(add_backend_test BACKEND_TEST_NAME ENV_VARS)
+        set(TEST_NAMES "")
+
+        foreach (TESTPROG ${TESTPROGS})
+            set(TEST_NAME ${TESTPROG}__${BACKEND_TEST_NAME})
+
+            add_test(${TEST_NAME}
+                     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTPROG})
+
+            list(APPEND TEST_NAMES ${TEST_NAME})
+
+            set_tests_properties(${TEST_NAME}
+                                 PROPERTIES ENVIRONMENT "${ENV_VARS}")
+        endforeach()
+
+        # Dump events test.
+        if (__FOUND_USABLE_PYTHON)
+            set(TEST_NAME test-dumpevents__${BACKEND_TEST_NAME})
+
+            add_test(${TEST_NAME}
+                     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-dumpevents |
+                     ${PYTHON_EXECUTABLE}
+                     ${CMAKE_CURRENT_SOURCE_DIR}/test/check-dumpevents.py)
+
+            set_tests_properties(${TEST_NAME}
+                                 PROPERTIES ENVIRONMENT "${ENV_VARS}")
+        else()
+            message(WARNING "test-dumpevents will be run without output check since python was not found!")
+            set(TEST_NAME test-dumpevents__${BACKEND_TEST_NAME}_no_check)
+
+            add_test(${TEST_NAME}
+                     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-dumpevents)
+
+            set_tests_properties(${TEST_NAME}
+                                 PROPERTIES ENVIRONMENT "${ENV_VARS}")
+        endif()
+
+        # Regress tests.
+        if (NOT EVENT__DISABLE_REGRESS AND __FOUND_USABLE_PYTHON)
+            set(TEST_NAME regress__${BACKEND_TEST_NAME})
+
+            add_test(${TEST_NAME}
+                     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/regress)
+
+            set_tests_properties(${TEST_NAME}
+                                 PROPERTIES ENVIRONMENT "${ENV_VARS}")
+
+            add_test(${TEST_NAME}_debug
+                     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/regress)
+
+            set_tests_properties(${TEST_NAME}_debug
+                                 PROPERTIES ENVIRONMENT "${ENV_VARS};EVENT_DEBUG_MODE=1")
+        endif()
+    endmacro()
+
+    # Add the tests for each backend.
+    foreach(BACKEND ${BACKENDS})
+        # Enable this backend only.
+        set(BACKEND_ENV_VARS ${DEFAULT_TEST_ENV_VARS})
+        list(REMOVE_ITEM BACKEND_ENV_VARS EVENT_NO${BACKEND}=1)
+
+        # Epoll has some extra settings.
+        if (${BACKEND} STREQUAL "EPOLL")
+            add_backend_test(timerfd_${BACKEND}
+                            "${BACKEND_ENV_VARS};EVENT_PRECISE_TIMER=1")
+
+            add_backend_test(changelist_${BACKEND}
+                            "${BACKEND_ENV_VARS};EVENT_EPOLL_USE_CHANGELIST=yes")
+
+            add_backend_test(timerfd_changelist_${BACKEND}
+                            "${BACKEND_ENV_VARS};EVENT_EPOLL_USE_CHANGELIST=yes;EVENT_PRECISE_TIMER=1")
+        else()
+            add_backend_test(${BACKEND} "${BACKEND_ENV_VARS}")
+        endif()
+    endforeach()
+
+    #
+    # Rate limiter tests.
+    #
+
+    # Group limits, no connection limit.
+    set(RL_BIN ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-ratelim)
+
+    add_test(test-ratelim__group_lim
+             ${RL_BIN}
+             -g 30000
+             -n 30
+             -t 100
+             --check-grouplimit 1000
+             --check-stddev 100)
+
+    # Connection limit, no group limit.
+    add_test(test-ratelim__con_lim
+             ${RL_BIN}
+             -c 1000
+             -n 30
+             -t 100
+             --check-connlimit 50
+             --check-stddev 50)
+
+    # Connection limit and group limit.
+    add_test(test-ratelim__group_con_lim
+             ${RL_BIN}
+             -c 1000
+             -g 30000
+             -n 30
+             -t 100
+             --check-grouplimit 1000
+             --check-connlimit 50
+             --check-stddev 50)
+
+    # Connection limit and group limit with independent drain.
+    add_test(test-ratelim__group_con_lim_drain
+             ${RL_BIN}
+             -c 1000
+             -g 35000
+             -n 30
+             -t 100
+             -G 500
+             --check-grouplimit 1000
+             --check-connlimit 50
+             --check-stddev 50)
+
+    # Add a "make verify" target, same as for autoconf.
+    # (Important! This will unset all EVENT_NO* environment variables.
+    #  If they are set in the shell the tests are running using simply "ctest" or "make test" will fail)
+    if (WIN32)
+        # Windows doesn't have "unset". But you can use "set VAR=" instead.
+        # We need to guard against the possibility taht EVENT_NOWIN32 is set, and all test failing
+        # since no event backend being available.
+        file(TO_NATIVE_PATH ${CMAKE_CTEST_COMMAND} WINDOWS_CTEST_COMMAND)
+
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/verify_tests.bat
+            "
+            set EVENT_NOWIN32=
+            \"${WINDOWS_CTEST_COMMAND}\"
+            ")
+
+        message(STATUS "${WINDOWS_CTEST_COMMAND}")
+
+        file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tmp/verify_tests.bat
+             DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+             FILE_PERMISSIONS
+                             OWNER_READ
+                             OWNER_WRITE
+                             OWNER_EXECUTE
+                             GROUP_READ
+                             GROUP_EXECUTE
+                             WORLD_READ WORLD_EXECUTE)
+
+        file(TO_NATIVE_PATH
+                    "${CMAKE_CURRENT_BINARY_DIR}/verify_tests.bat" VERIFY_PATH)
+
+        add_custom_target(verify COMMAND "${VERIFY_PATH}"
+                          DEPENDS event ${ALL_TESTPROGS})
+    else()
+        # On some platforms doing exec(unset) as CMake does won't work, so make sure
+        # we run the unset command in a shell instead.
+        # First we write the script contents.
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp/verify_tests.sh
+            "
+            #!/bin/bash
+            unset EVENT_NOEPOLL; unset EVENT_NOPOLL; unset EVENT_NOSELECT; unset EVENT_NOWIN32; unset EVENT_NOEVPORT; unset EVENT_NOKQUEUE; unset EVENT_NODEVPOLL
+            ${CMAKE_CTEST_COMMAND}
+            ")
+
+        # Then we copy the file (this allows us to set execute permission on it)
+        file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tmp/verify_tests.sh
+             DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+             FILE_PERMISSIONS
+                             OWNER_READ
+                             OWNER_WRITE
+                             OWNER_EXECUTE
+                             GROUP_READ
+                             GROUP_EXECUTE
+                             WORLD_READ
+                             WORLD_EXECUTE)
+
+        # Create the target that runs the script.
+        add_custom_target(verify
+                          COMMAND ${CMAKE_CURRENT_BINARY_DIR}/verify_tests.sh
+                          DEPENDS event ${ALL_TESTPROGS})
+    endif()
+
+    if (NOT EVENT__DISABLE_REGRESS AND __FOUND_USABLE_PYTHON)
+        add_dependencies(verify regress)
+    endif()
+
+    if (EVENT__COVERAGE)
+        include(CodeCoverage)
+
+        setup_target_for_coverage(
+            verify_coverage # Coverage target name "make verify_coverage"
+            make            # Test runner.
+            coverage        # Output directory.
+            verify)         # Arguments passed to test runner. "make verify"
+    endif()
+
+    enable_testing()
+
+    include(CTest)
+endif()
+
+#
+# Installation preparation.
+#
+
+if(WIN32 AND NOT CYGWIN)
+  set(DEF_INSTALL_CMAKE_DIR cmake)
+else()
+  set(DEF_INSTALL_CMAKE_DIR lib/cmake/libevent)
+endif()
+
+set(EVENT_INSTALL_CMAKE_DIR
+    "${CMAKE_INSTALL_PREFIX}/${DEF_INSTALL_CMAKE_DIR}"
+    CACHE PATH "Installation directory for CMake files")
+
+export(PACKAGE libevent)
+
+# Generate the config file for the build-tree.
+set(EVENT__INCLUDE_DIRS
+    "${PROJECT_SOURCE_DIR}/include"
+    "${PROJECT_BINARY_DIR}/include")
+
+set(LIBEVENT_INCLUDE_DIRS
+    ${EVENT__INCLUDE_DIRS}
+    CACHE PATH "Libevent include directories")
+
+configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigBuildTree.cmake.in
+               ${PROJECT_BINARY_DIR}/LibeventConfig.cmake
+               @ONLY)
+
+# Generate the config file for the installation tree.
+# Calculate the relative directory from the Cmake dir.
+file(RELATIVE_PATH
+     REL_INCLUDE_DIR
+     "${EVENT_INSTALL_CMAKE_DIR}"
+     "${CMAKE_INSTALL_PREFIX}/include")
+
+# Note the LIBEVENT_CMAKE_DIR is defined in LibeventConfig.cmake.in,
+# we escape it here so it's evaluated when it is included instead
+# so that the include dirs are given relative to where the
+# config file is located.
+set(EVENT_INSTALL_INCLUDE_DIR "\${LIBEVENT_CMAKE_DIR}/${REL_INCLUDE_DIR}")
+
+configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfig.cmake.in
+               ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake
+               @ONLY)
+
+# Generate version info for both build-tree and install-tree.
+configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigVersion.cmake.in
+               ${PROJECT_BINARY_DIR}/LibeventConfigVersion.cmake
+               @ONLY)
+
+# Install compat headers
+install(FILES ${HDR_COMPAT}
+        DESTINATION "include"
+        COMPONENT dev)
+
+# Install the configs.
+install(FILES
+        ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake
+        ${PROJECT_BINARY_DIR}/LibeventConfigVersion.cmake
+        DESTINATION "${EVENT_INSTALL_CMAKE_DIR}"
+        COMPONENT dev)
+
+# Install exports for the install-tree.
+install(EXPORT LibeventTargets
+        DESTINATION "${DEF_INSTALL_CMAKE_DIR}"
+        COMPONENT dev)
+
+# Install the scripts.
+install(PROGRAMS
+       ${CMAKE_CURRENT_SOURCE_DIR}/event_rpcgen.py
+       DESTINATION "bin"
+       COMPONENT runtime)
+
+# Create documents with doxygen.
+find_program(DOXYGEN doxygen)
+if (DOXYGEN)
+    add_custom_target(doxygen
+                      COMMAND ${DOXYGEN} Doxyfile
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+else()
+    message(WARNING "The doxygen target will not support since doxygen command was not found!")
+endif()
+
+
+# Create the uninstall target.
+# https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake
+configure_file(${PROJECT_SOURCE_DIR}/cmake/Uninstall.cmake.in
+               ${PROJECT_BINARY_DIR}/Uninstall.cmake
+               @ONLY)
+
+add_custom_target(uninstall
+                  COMMAND ${CMAKE_COMMAND} -P ${PROJECT_BINARY_DIR}/Uninstall.cmake)
+
+
+message(STATUS "")
+message(STATUS "        ---( Libevent " ${EVENT_VERSION} " )---")
+message(STATUS "")
+message(STATUS "Available event backends: ${BACKENDS}")
+message(STATUS "CMAKE_BINARY_DIR:         ${CMAKE_BINARY_DIR}")
+message(STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
+message(STATUS "CMAKE_SOURCE_DIR:         ${CMAKE_SOURCE_DIR}")
+message(STATUS "CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "PROJECT_BINARY_DIR:       ${PROJECT_BINARY_DIR}")
+message(STATUS "PROJECT_SOURCE_DIR:       ${PROJECT_SOURCE_DIR}")
+message(STATUS "CMAKE_MODULE_PATH:        ${CMAKE_MODULE_PATH}")
+message(STATUS "CMAKE_COMMAND:            ${CMAKE_COMMAND}")
+message(STATUS "CMAKE_ROOT:               ${CMAKE_ROOT}")
+message(STATUS "CMAKE_SYSTEM:             ${CMAKE_SYSTEM}")
+message(STATUS "CMAKE_SYSTEM_NAME:        ${CMAKE_SYSTEM_NAME}")
+message(STATUS "CMAKE_SYSTEM_VERSION:     ${CMAKE_SYSTEM_VERSION}")
+message(STATUS "CMAKE_SYSTEM_PROCESSOR:   ${CMAKE_SYSTEM_PROCESSOR}")
+message(STATUS "CMAKE_SKIP_RPATH:         ${CMAKE_SKIP_RPATH}")
+message(STATUS "CMAKE_VERBOSE_MAKEFILE:   ${CMAKE_VERBOSE_MAKEFILE}")
+message(STATUS "CMAKE_C_FLAGS:            ${CMAKE_C_FLAGS}")
+message(STATUS "CMAKE_BUILD_TYPE:         ${CMAKE_BUILD_TYPE}")
+message(STATUS "CMAKE_C_COMPILER:         ${CMAKE_C_COMPILER} (id ${CMAKE_C_COMPILER_ID}, clang ${CLANG}, GNUC ${GNUC})")
+message(STATUS "CMAKE_AR:                 ${CMAKE_AR}")
+message(STATUS "CMAKE_RANLIB:             ${CMAKE_RANLIB}")
+message(STATUS "")
+
diff --git a/extra/libevent/libevent-2.1.11-stable/ChangeLog b/extra/libevent/libevent-2.1.11-stable/ChangeLog
new file mode 100644
index 000000000000..e89d5a810853
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ChangeLog
@@ -0,0 +1,2081 @@
+Changes in version 2.1.11-stable (01 Aug 2019)
+
+ This release contains one ABI breakage fix (that had been introduced in
+ 2.1.10, and strictly speaking this release breaks ABI again to make it
+ compatible with 2.1.9 and less, please take a look at 18104973 for more
+ details). Apart from that it contains some bug fixes, that grouped below.
+
+ And even though the return value for evbuffer_setcb() had been changed it
+ should ABI compatible (anyway that function is in -compat.h header).
+
+ There is also one patch that introduce new functionality, this is 546a366c,
+ to tune SO_RCVBUF/SO_SNDBUF in evdns, but one can count it as a bug-fix on
+ the application level, since before you cannot tune this settings and hence
+ you could stumble on problems.
+
+ ABI breakage:
+  o Protect min_heap_push_ against integer overflow. (8c899768 Tobias Stoeckmann)
+  o Revert "Protect min_heap_push_ against integer overflow." (18104973 Azat Khuzhin)
+
+ functionality:
+  o evdns: add new options -- so-rcvbuf/so-sndbuf (546a366c Azat Khuzhin)
+
+ build:
+  o Change autoconf version to 2.62 and automake version to 1.11.2 (2a333008 yuangongji)
+  o cmake: install shared library only if it was requested (596855f7 Azat Khuzhin)
+  o Missing <winerror.h> on win7/MinGW(MINGW32_NT-6.1)/MSYS (9559349c yuangongji)
+  o cmake: set library names to be the same as with autotools (305251b9 yuangongji)
+  o Enable _GNU_SOURCE for Android (f013fc7d Keith Smiley)
+  o Enable kqueue for APPLE targets (3aa68a82 Keith Smiley)
+  o autotools: do not install bufferevent_ssl.h under --disable-openssl (5349a07e Azat Khuzhin)
+  o cmake: link against shell32.lib/advapi32.lib (c9ce638c Azat Khuzhin)
+  o Add README.md into dist archive (3660a4cc Azat Khuzhin)
+  o cmake: add missing autotools targets (doxygen, uninstall, event_rpcgen.py) (2d65071c yuangongji)
+  o m4/libevent_openssl.m4: fix detection of openssl (d4056e59 Fabrice Fontaine)
+  o Fix detection of the __has_attribute() for apple clang [ci skip] (7fd7c5ef Azat Khuzhin)
+
+ lib:
+  o buffer: fix possible NULL dereference in evbuffer_setcb() on ENOMEM (598f247d Azat Khuzhin)
+  o Warn if forked from the event loop during event_reinit() (b75922ae Azat Khuzhin)
+  o evutil: set the have_checked_interfaces in evutil_check_interfaces()
+    (ef498aa2, a09265ac jeremyerb)
+
+ samples:
+  o https-client: correction error checking (a8a04565 wenyg)
+
+
+Changes in version 2.1.10-stable (26 May 2019)
+
+ This release contains mostly fixes (some evbuffer oddity, AF_UNIX handling in
+ http server, some UB fixes and others) but also some new functionality
+ (without ABI breakage as usual) and now dist archive can be used for building
+ on windows (getopt had been added into it).
+
+ Above you will find changelog for this particular release (but with some
+ trivial fixes pruned out from it - to make it a little bit more informative).
+
+ To view full changelog please use git:
+   git log --format='  o %s (%h %aN)' release-2.1.9-beta...release-2.1.10-stable
+
+ dist:
+  o Add getopt into dist archive (7042ff24 Azat Khuzhin)
+
+ functionality:
+  o evdns: add DNS_OPTION_NAMESERVERS_NO_DEFAULT/EVDNS_BASE_NAMESERVERS_NO_DEFAULT
+  (58e81106 Azat Khuzhin)
+  o Add support for EV_TIMEOUT to event_base_active_by_fd (3f893f0a John Ohl)
+
+ fixes:
+  o Merge branch 'evbuffer-fixes-806-v2' (2fea04b3 Azat Khuzhin)
+  o Merge branch 'issue-807-accept4-getnameinfo-AF_UNIX' (7c4da937, e2790a7f
+    Azat Khuzhin)
+  o kqueue: Avoid undefined behaviour. (e70e18e9 Tobias Stoeckmann)
+  o Prevent integer overflow in kq_build_changes_list. (43a55a23 Tobias Stoeckmann)
+  o evdns: fix lock/unlock mismatch in evdns_close_server_port() (54103883 zhuizhuhaomeng)
+  o Merge remote-tracking branch 'official/pr/804' -- Enforce limit of NSIG
+    signals (87fa93a8 Tobias Stoeckmann)
+  o Protect min_heap_push_ against integer overflow. (0b46bb8c Tobias Stoeckmann)
+  o le-proxy: initiate use of the Winsock DLL (2a1e1530 linxiaohui)
+  o Fix leaks in error path of the bufferevent_init_common_() (bb0f8fe7 Azat Khuzhin)
+  o buffer: make evbuffer_prepend() of zero-length array no-op (61fa7b7d Azat Khuzhin)
+  o Merge branch 'evbuffer-empty-chain-handling' (6a3dd717 Azat Khuzhin)
+  o Don't loose top error in SSL (3d1a7a1d Yury Korzhetsky)
+  o Remove needless check for arc4_seeded_ok (6602a97d Seong-Joong Kim)
+  o Merge pull request #769 from sungjungk/fix-return-handling (91084140 Nathan French)
+
+ build:
+  o Define `_GNU_SOURCE` properly/consistently per autoconf (00ba9fa2 Enji Cooper)
+  o signal: guard __cdecl definition with #ifdef (d89045a6 Azat Khuzhin)
+  o Link test/regress with event_core/event_extra over event (22380996 Azat Khuzhin)
+
+ tests:
+  o Use kill() over raise() for raising the signal (fixes osx 10.14 with
+    kqueue) (3db5296b, a45f6733 Azat Khuzhin)
+  o tinytest: implement per-test timeout (via alarm() under !win32 only)
+    (b64dbfb6, 75d7e1ff Azat Khuzhin)
+
+Changes in version 2.1.9-beta (10 February 2019)
+
+ This changelog will differs from other releases in the next few clauses:
+ - contains only highlighted changes (so now it will not contains a lot of
+   patches that fixes some stuff in regression tests, typos, leaks fixes in
+   samples and so forth)
+ - no authors (since merge commits breaks them anyway, but AUTHORS sections in
+   README will be kept up to date)
+ - group name trimmed from commit subjects trimmed
+ - it's been 2 years since the previoius release, so it is pretty huge
+
+ And I think that this is more useful, so from now on it will always has the
+ same look (until there will too many objections of course).
+
+ To view full changelog please use git:
+   git log --format='  o %s (%h %aN)' release-2.1.8-stable...release-2.1.9-beta
+
+
+ dist archive:
+  o Add cmake rules into dist archive (bf3a67cf)
+  o Add missing print-winsock-errors.c into dist archive (822d6462)
+  o Include openssl-compat.h into dist archive (08658136)
+
+ core:
+  o Merge branch 'check-O_NONBLOCK-in-debug' (a39898f3, a8155c62)
+  o Merge branch 'event-ET-#636-v2' (ca4b6404)
+  o Fix visibility issues under (mostly on win32)
+    (349081e1g, 802be13ag, a1f28e2f)
+  o Define __EXT_POSIX2 for QNX (a2176f2c)
+  o Cleanup __func__ detection (b3af7bdd)
+  o Add convenience macros for user-triggered events (06ec5de6)
+  o Notify event base if there are no more events, so it can exit without delay (d9d1c09e)
+  o Fix base unlocking in event_del() if event_base_set() runned in another thread (4f0f40e3)
+  o If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER (27dee54d)
+  o Fix race in access to ev_res from event loop with event_active() (43d92a6d)
+  o Return from event_del() after the last event callback termination (876c7ac7)
+
+ http:
+  o Merge branch 'http-EVHTTP_CON_READ_ON_WRITE_ERROR-fixes-v2' (eb7b472b)
+  o Preserve socket error from listen across closesocket cleanup (2ccd00a6)
+  o fix connection retries when there more then one request for connection (d30e7bba)
+  o improve error path for bufferevent_{setfd,enable,disable}() (a8cc449e)
+  o Fix conceivable UAF of the bufferevent in evhttp_connection_free() (6ac2ec25)
+  o Merge branch 'http-request-line-parsing' (cdcfbafe)
+  o Fix evhttp_connection_get_addr() fox incomming http connections (4215c003)
+  o fix leaks in evhttp_uriencode() (123362e9)
+  o CONNECT method only takes an authority (7d1ffe64)
+  o Allow bodies for GET/DELETE/OPTIONS/CONNECT (23eb38b9)
+  o Do not crash when evhttp_send_reply_start() is called after a timeout. (826f1134)
+  o Fix crashing http server when callback do not reply in place (5b40744d, b2581380)
+  o fix handling of close_notify (ssl) in http with openssl bufferevents (7e91622b)
+
+ evrpc:
+  o use *_new_with_arg() to match function prototype (a95cc9e3)
+  o avoid NULL dereference on request is not EVHTTP_REQ_POST (e05136c7)
+
+ regression tests:
+  o Merge branch 'TT_RETRIABLE' (6ea1ec68, f9b592aa)
+
+ bufferevent:
+  o Merge branch 'iocp-fixes' (6bfac964)
+  o Merge branch 'be-wm-overrun-v2' (3f692fff)
+  o bufferevent_socket_connect{,_hostname}() missing event callback and use ret code (1dde74ef)
+  o don't fail be_null_filter if bytes are copied (b92b0792)
+  o Call underlying bev ctrl GET_FD on filtered bufferevents (ebfac517)
+
+ bufferevent_openssl/openssl:
+  o Merge branch 'ssl_bufferevent_wm_filter-fix' (30020a35)
+  o be_openssl: avoid leaking of SSL structure (e86ccfe5)
+  o Fix build with LibreSSL 2.7 (894ca48a)
+  o Add missing includes into openssl-compat.h (01bc36c1)
+  o Explicitly call SSL_clear when reseting the fd. (29b7a516)
+  o Unbreak build with LibreSSL after openssl 1.1 support added (230af9f0)
+
+ samples:
+  o Merge branch 'sample-http-server' (b6309bcc)
+  o sample/https-client: use host SSL certificate store by default (5c0132f3)
+
+ listener:
+  o ipv6only socket bind support (ba148796)
+  o Merge branch 'listener-immediate-close' (df2ed13f)
+  o Merge branch 'evconnlistener-do-not-close-client-fd' (42e851bb)
+
+ evdns:
+  o evdns: handle NULL filename explicitly (0033f5cc)
+  o Merge branch 'evdns_getaddrinfo-race-fix' (3237d697)
+  o Generating evdns_base_config_windows_nameservers docs on all platforms (3bd2ce43)
+
+ utils:
+  o Merge branch 'evutil_found_ifaddr-dev' (b07e43e6)
+  o Avoid possible SEGVs in select() (in unit tests) (8818c86c)
+  o Port `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3. (532a8cc3)
+
+ buffer:
+  o Fix assert() condition in evbuffer_drain() for IOCP (d6326104)
+  o fix incorrect unlock of the buffer mutex (for deferred callbacks) (2b4d127d)
+  o Fix wrong assert in evbuffer_drain() (9f4d0dce)
+
+ cmake:
+  o fix checking of devpoll backend (like in autotools, by devpoll.h existence) (7f161902)
+  o support static runtime (MSVC) (c8b3ec17, 61fb055a)
+  o do not build both (SHARED and STATIC) for MSVC/win32 (bc7f2fd9)
+  o introduce EVENT__LIBRARY_TYPE option (eb10a738)
+  o ensure windows dll's are installed as well as lib files (29590718)
+  o Fix generation of LibeventConfig.cmake for the installation tree (7fa08c4b)
+  o fix pkgconfig generation (copy-paste typo) (cc554d87)
+  o Merge branch 'cmake-missing-bits' (9806b126)
+  o Fix detection of timerfd_create() in CMake. (e50af331)
+  o Merge branch 'cmake-configure-fixes-v2' (a0bfe2c4)
+  o Do not add epoll_sub (syscall wrappers) for epoll in cmake (cea61de6)
+  o Fix RPATH for APPLE (45b1f379)
+
+ autotools:
+  o include win32 specific headers for socklen_t detection on win32/mingw (d7579fb9)
+  o Ignore evconfig-private.h for autotools (37423849)
+  o config.h can't be prefixed unconditionally (63a054f8)
+  o Merge branch 'pull-628' (7e56c8b2)
+  o Provide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS} (2f060c5f)
+  o confirm openssl is working before using (b39ccf8e)
+  o pass $(OPENSSL_INCS) for samples (FTBFS macOS) (c2495265)
+  o Add configure check for midipix (d433201e)
+  o Fix tests with detached builds (c46ff439)
+
+ build:
+  o Fix arc4random_addrandom() detecting and fallback (regression) (303d6d77)
+  o Merge branch 'win32-fixes' (ebd12e6d)
+  o Merge branch 'fix-openssl-linking' (e7bd9e03)
+  o Merge branch 'fix-struct-linger' (8567f2f5)
+
+ CI:
+  o travis-ci/appveyor now uses fast_finish+allow_failures
+    (5e97b6e6, dd472e7d, dfb5fc167)
+  o Merge branch 'travis-ci-osx-fixes' (9f02b39c)
+  o Merge branch 'win64-fixes' (aee0fcd5)
+
+
+Changes in version 2.1.8-stable (22 January 2017)
+
+ Libevent 2.1.8-stable, it contains openssl fixes for resetting fd and using
+ bufferevent_openssl_filter_new(). vagrant fixes, some build fixes, increased
+ timeout for some tests (to reduce number of failures due to timing issues),
+ date in RFC1123 format and running tests in parallel.
+
+ There are highlighted changes above.
+
+ Build fixes:
+  o Fix _FILE_OFFSET_BITS redinition (solaris/autotools) (336f3b11 Azat Khuzhin)
+  o util-internal: fix __func__ redefinition (netbsd) (253e7fa9 Azat Khuzhin)
+  o Fix signedness differ for iov_base (solaris) (2c62062e Azat Khuzhin)
+  o evutil_time: include <unistd.h> when there is only sleep()/usleep() (3e75194c Azat Khuzhin)
+  o http: fix formatter for pritnf for req->ntoread (osx) (1cbf26f6 Azat Khuzhin)
+ Testing environment:
+  o Merge branch 'automake-tests-parallel-v4' (*includes ci bits also*) (59e217df Azat Khuzhin)
+ Vagrant env fixes:
+  o vagrant/netbsd: missing libtool (9c9be399 Azat Khuzhin)
+  o vagrant/netbsd: more reliable way of installing packages (36da6877 Azat Khuzhin)
+  o vagrant/osx: use make instead of gmake (there is no gmake) (f7c70aef Azat Khuzhin)
+  o vagrant: add centos box (ca591c5b Azat Khuzhin)
+ Tests:
+  o test/dns: replace servname since solaris does not have "http" (d6bafbbe Azat Khuzhin)
+  o test/thread: netbsd is too slow, increase timeout for conditions_simple (3c7422fc Azat Khuzhin)
+  o test/dns: run async resolving after sync one (to avoid timeouts) (07862531 Azat Khuzhin)
+  o test/http: turn off some tests that based on backlog filling (falky) (26f416c1 Azat Khuzhin)
+ Bugfixes:
+  o Merge branch 'openssl-filter-fixes-v4' (83e0f43b Azat Khuzhin)
+  o Merge branch 'date-rfc1123' (68def435,4798de6c,4545807d Azat Khuzhin)
+  o Merge branch 'be-openssl-fd-reset-fix-v2' (86fa0070,32adf434 Azat Khuzhin)
+  o Merge branch 'openssl-1.1-init-fixes-v2' (18a161f0 Azat Khuzhin)
+  o Fix incorrect MIME type (23f9a20e johnsonlee)
+ Trivial fixes:
+ Documentation updates:
+  o Update README.md (3821cca1 Breaker)
+
+
+Changes in version 2.1.7-rc (2 Novemer 2016)
+
+ Libevent 2.1.7-rc contains openssl 1.1 support, build fixes, CI improvements
+ and plus Vagrantfile for testing under multiple OS'es.
+
+
+ Continious Integration:
+  o Use coveralls.io via travis (9ac000c Azat Khuzhin)
+  o travis-ci: use container-based infrastructure (7e12e96 Azat Khuzhin)
+  o travis-ci/osx: fix compiling/linking openssl libraries (9d2f8d4 Azat Khuzhin)
+  o travis-ci: use gcc-5 (fixes osx|gcc failures) (d7ceae5 Azat Khuzhin)
+  o Testing with vagrant for 6 OS and cmake+autoconf (9585338 Azat Khuzhin)
+  o travis-ci/osx: install lcov (e4e099b Azat Khuzhin)
+
+ Build Improvements/Fixes:
+  o Fix cmake -DEVENT__COVERAGE=ON (40fbffc Azat Khuzhin)
+  o autogen.sh: learn about gmake (9376ac4 Azat Khuzhin)
+  o autogen.sh: remove all autoconf/automake caches, if any (69cce25 Azat Khuzhin)
+  o cmake: fix finding python2, and check that it is really 2 (3453c08 Azat Khuzhin)
+  o cmake: fix CheckFunctionExistsEx/CheckPrototypeDefinition (CMP0054) (43b69b2 Azat Khuzhin)
+  o cmake: cleanup (dc624ad Zonr Chang)
+  o cmake/win32: fix running regress, but fixing finding python2 interpreter (bcb990a Azat Khuzhin)
+  o cmake: use PYTHON_EXECUTABLE to find python2 (a4d044c Azat Khuzhin)
+  o Merge branch 'force-disable-clockgettime' (83c7cdf Azat Khuzhin)
+
+ Code Improvements (core)
+  o use ev_uint16_t instead of unsigned short for port (e983712 Thomas Bernard)
+  o Merge branch 'contrib-guide-v2' (b9c5077 Azat Khuzhin)
+  o poll: Prevent libevent from spinning if POLLNVAL occurs (675974c Tim Hentenaar)
+
+ Testing:
+  o test/regress: cover a polling of invalid fd (cb0df5c Tim Hentenaar)
+
+ Code Improvements (bufferevent_openssl)
+  o Make it build using OpenSSL 1.1.0 (3e9e0a0 Kurt Roeckx)
+  o Don't call BIO_number_{read|written} on NULL BIOs. (6702da1 Adam Langley)
+  o Switch from a 512 to 2048-bit RSA key. (f9803a6 Adam Langley)
+
+ Trivial fixes:
+  o Ignore temporary configure files (8fb08ae Azat Khuzhin)
+  o README.md: fix typo: ar -> are (2361616 Simone Basso)
+  o be: just a simple mistake, reinclude the <errno.h> (7521664 Seven)
+
+Changes in version 2.1.6-beta (4 July 2016)
+
+ Libevent 2.1.6-beta contains mostly bug fixes (evbuffers, evthread, evdns,
+ bufferevents, core, http, samples), improvements but mostly to fix some
+ possible issues (EVHTTP_CON_LINGERING_CLOSE), a lot of new unit tests and new
+ appveyor integration.
+
+ Security Fixes (utils)
+   o evutil_parse_sockaddr_port(): fix buffer overflow (329acc1 Azat Khuzhin)
+
+ Security Fixes (evdns)
+   o evdns: name_parse(): fix remote stack overread (96f64a0 Azat Khuzhin)
+   o evdns: fix searching empty hostnames (ec65c42 Azat Khuzhin)
+
+ New APIs (evdns)
+   o New function to get address for nameserver. (537177d Nick Mathewson)
+
+ New APIs (bufferevents)
+   o expose bufferevent_incref/decref (with fewer modifications) (1ed6718 Mark Ellzey)
+
+ New APIs (internal)
+   o evdns: export cancel via callbacks in util (like async lib core/extra issues) (8cbe65d Azat Khuzhin)
+
+ New APIs/Improvements (http)
+   o http: take EVHTTP_CON_LINGERING_CLOSE into account for "Expect: 100-Continue" (ac448a7 Azat Khuzhin)
+   o http: lingering close (like nginx have) for entity-too-large (9fde518 Azat Khuzhin)
+   o http: read server response even after server closed the connection (680742e Azat Khuzhin)
+   o http: export evhttp_connection_set_family() (714fc70 Azat Khuzhin)
+   o http: reuse connected address only with EVHTTP_CON_REUSE_CONNECTED_ADDR (a50f5f0 Azat Khuzhin)
+   o http: use IP address that we got before (if any) during retrying (54c887d Azat Khuzhin)
+
+ Bugfixes (core)
+   o Fix getaddrinfo under solaris (for multiprotocol case) (40730ae Azat Khuzhin)
+   o Check for Mac OS X 10.4 kqueue bug properly (df6f99e Mark Mentovai)
+   o event_reinit: make signals works after fork() without evsig_add() (88640aa Nicholas Marriott)
+   o event_reinit: always re-init signal's socketpair (ad0c237 Nicholas Marriott)
+   o Free event queues even for recursive finalizers (7c8d015 Azat Khuzhin)
+   o Fix checking for make_base_notifiable() (f337296 Azat Khuzhin)
+   o Set correct socklen for PF_INET6 sockaddr len (3499ad9 Mark Ellzey)
+   o Fix garbage value in socketpair util function, stdint? (043ae74 Mark Ellzey)
+   o fix the return value of event_deferred_cb_schedule_ (38cef64 Greg Hazel)
+   o event_free_debug_globals_locks(): disable lock debugging (e5c87d1 Azat Khuzhin)
+   o event: call event_disable_debug_mode() in libevent_global_shutdown() (941faae Azat Khuzhin)
+   o ht-internal: don't reset hth_table_length explicitly in name_##HT_CLEAR (597c7b2 Azat Khuzhin)
+
+ Bugfixes (evthread)
+   o evthread: fix evthread_setup_global_lock_() for debug-lock with a real-lock case (e4556fc Azat Khuzhin)
+   o evthread: evthreadimpl_disable_lock_debugging_() for libevent_global_shutdown() (ccc5593 Azat Khuzhin)
+
+ Bugfixes (evdns)
+   o evdns: avoid double-free in evdns_base_free() for probing requests (4db15e0 Azat Khuzhin)
+   o evdns: evdns_base_free(): fix UAF of evdns_base with @fail_requests (00313c5 Azat Khuzhin)
+   o evdns: evdns_base_free(): free requests before namservers (14f84bb Azat Khuzhin)
+   o evdns: fix randomize-case by make case-insensitive as required (9c238de Azat Khuzhin)
+
+ Bugfixes (bufferevents)
+   o be_sock: handle readv() returns ECONNREFUSED (freebsd 9.2) (3189eb0 Azat Khuzhin)
+   o be_filter: avoid data stuck under active watermarks (b627ad8 Eduardo Panisset)
+   o Fix bufferevent_pair to properly set BEV_EVENT_{READING,WRITING} on flush. (2851889 David Paschich)
+   o be_openssl: clear all pending errors before SSL_*() calls (38e0f4a Azat Khuzhin)
+   o be_sock: cancel in-progress dns requests (86dfd2c Azat Khuzhin)
+   o be_sock: unfreeze buffers on fd changing (255525d Azat Khuzhin)
+   o be_sock: bufferevent_socket_connect_hostname(): make it thread-safe (809bb39 Azat Khuzhin)
+   o be_openssl: don't call do_write() directly from outbuf_cb (da52933 Azat Khuzhin)
+   o be_openssl: use bufferevent_enable() instead of bufferevent_add_event_() (0c66d32 Azat Khuzhin)
+   o be_openssl: don't add events during bev creation (like be_sock) (f4b6284 Azat Khuzhin)
+   o Fix lock leak in be_pair_flush() if flush type is BEV_NORMAL (f45d39d Bill Vaughan)
+   o be_openssl: don't use *_auto() in do_handshake() we can't have fd == -1 there (877280d Azat Khuzhin)
+   o be_openssl: don't call set_open_callbacks() if fd == -1 (e8a2da9 Azat Khuzhin)
+   o be_openssl: get rid off hackish "fd_is_set", to fix some corner cases (40b0379 Azat Khuzhin)
+   o be: we don't need to use getpeername() we we have conn_address (2c271e2 Azat Khuzhin)
+   o Call underlying bev ctrl SET_FD on filtered bufferevents (c2aa7dc Mark Ellzey)
+   o be_pair: release shared lock with the latest of bufferevent_pair (92a359e Azat Khuzhin)
+
+ Bugfixes (http)
+   o [Issue #313] set method to ASCII "NULL" if evhttp_method() returns NULL (17cc636 Mark Ellzey)
+   o evhttp_have_expect(): fix -Wlogical-not-parentheses (24b5214 Azat Khuzhin)
+   o http: set fd to -1 unconditioally, to avoid leaking of DNS requests (7a4b472 Azat Khuzhin)
+   o http: avoid leaking of fd in evhttp_connection_free() (f0e1341 Azat Khuzhin)
+   o http: get fd from be layer during connection reset (4a53c54 Azat Khuzhin)
+   o http: fix EVHTTP_CON_READ_ON_WRITE_ERROR when it doesn't supported by OS (2ff164a Azat Khuzhin)
+   o http: do not do function calls under EVUTIL_ASSERT() to fix NDEBUG builds (7c89999 Azat Khuzhin)
+   o http: fix leaking of response_code_line (8f18a62 Azat Khuzhin)
+   o http: fix "Expect: 100-continue" client side (0b46b39 Azat Khuzhin)
+   o http: fix conflicts EVHTTP_CON_AUTOFREE and EVHTTP_CON_REUSE_CONNECTED_ADDR (4dc0979 Azat Khuzhin)
+   o http: avoid epoll_ctl() on already closed fd (triggers by http/chunk_out) (ab3bc69 Azat Khuzhin)
+   o http: install timeout for read too during connect for ssl (040000d Azat Khuzhin)
+   o http: fix evhttp_request_own() by checking EVHTTP_USER_OWNED in more cases (b0d3964 Azat Khuzhin)
+   o http: fix detecting EOF without write (7ed02ac Azat Khuzhin)
+   o evhttp: Fix failure to send all output data for POST/PUT requests (24eea0d John Ohl)
+   o Fix evhttp_uriencode() regression. (c6b1ec1 Mark Ellzey)
+   o removed unused vars (e94250c Mark Ellzey)
+   o pointer overflow checks for evhttp_uriencode (72afe4c Zonr Chang)
+
+ Bugfixes (evbuffers)
+   o buffer: fix overflow check in evbuffer_expand_singlechain() (a3f4ccd Azat Khuzhin)
+   o buffer: evbuffer_add_buffer(): clean empty chains from destination buffer (26fd932 Azat Khuzhin)
+   o Fix n_add_for_cb in evbuffer_prepend() in case of new buffer required (0abd039 Azat Khuzhin)
+   o be_filter: actually disable output_filter during processing output (c031215 Simon Perreault)
+   o evbuffer_add: Use last_with_datap if set, not last. (a8769ef Marcus Sundberg)
+   o EVBUFFER_PTR_SET -> EVBUFFER_PTR_ADD (8674e4f jer-gentoo)
+
+ Bugfixes (evconnlistener)
+   o listener: unlock lev on error in listener_read_cb() (2a71b33 Azat Khuzhin)
+   o Fix potential fd leak in listener_read_cb() (a695a72 Mark Ellzey)
+
+ Testing
+   o tests: use waitpid(..., WNOWAIT) to fix failing of main/fork under solaris (43eb56c Azat Khuzhin)
+   o test: replace sleeping with syncing pair in main/fork (16d220c Azat Khuzhin)
+   o test/http: do not run tests that based on backlog filling (freebsd) (500b6b7 Azat Khuzhin)
+   o test/bufferevent/iocp: fix test name for "bufferevent_connect_fail_eventcb" (4410e9d Azat Khuzhin)
+   o test/ssl: use send()/recv()/EVUTIL_ERR_RW_RETRIABLE()/EVUTIL_SOCKET_ERROR() to fix win32 (a9e8cd6 Azat Khuzhin)
+   o test/https_basic: increase timeout for complete write (fixes win32) (d5a2f2f Azat Khuzhin)
+   o test: fix building with --disable-thread-support under win32 (a487706 Azat Khuzhin)
+   o test/buffer: evbuffer_add_buffer() with empty chains (a272bc4 Azat Khuzhin)
+   o test/buffer: evbuffer_remove_buffer() with empty chains (prepend) (f0cfa14 Azat Khuzhin)
+   o test/buffer: evbuffer_remove_buffer() with empty chains (evbuffer_add_buffer()) (2880ce6 Azat Khuzhin)
+   o test/buffer: cover evbuffer_expand() for overflow (48dab7a Azat Khuzhin)
+   o test/be_filter: creating test case for data stuck with active watermarks (766194b Eduardo Panisset)
+   o test/http: avoid using conditionals with omitted operands (fixes VS2015) (2a4bf29 Azat Khuzhin)
+   o test/http: don't mix declarations and code (fixes -Wdeclaration-after-statement) (aabf1c2 Azat Khuzhin)
+   o test/buffer: fix leak in test_evbuffer_prepend() (c08d90b Azat Khuzhin)
+   o test/buffer: avoid errors with --no-fork (reinitialize static vars) (e7d1e39 Azat Khuzhin)
+   o test/buffer: cover n_add_for_cb when evbuffer_prepend() need to allocate buffer (e77ff41 Azat Khuzhin)
+   o test/tinytest_macros: add new one tt_nstr_op() (bd19a28 Azat Khuzhin)
+   o test/bufferevent: check that output_filter disabled during processing output (ae28812 Azat Khuzhin)
+   o test/listener: regression for missing unlock in listener_read_cb() (7d85651 Azat Khuzhin)
+   o test/regress: add tests for evbuffer_add() breakage on empty last chain (d5ee739 Marcus Sundberg)
+   o test/http: fix running some tests sequential (with --no-fork) (bddad71 Azat Khuzhin)
+   o test/http: localize evhttp server structure (cbc3209 Azat Khuzhin)
+   o test/dns: regression for empty hostname (d7348ba Azat Khuzhin)
+   o test/http: fix SERVER_TIMEOUT tests under win32 (d49a658 Azat Khuzhin)
+   o test/http: add a helper for creating timedout/failed request (376f107 Azat Khuzhin)
+   o test/http: adopt for C90 (mixed code and declarations) (d02a285 Azat Khuzhin)
+   o test/http: cover NS timed out during request cancellations separatelly (0c343af Azat Khuzhin)
+   o test/http: request cancellation with resolving/{conn,write}-timeouts in progress (334340d Azat Khuzhin)
+   o test/http: exit from the loop in the errorcb to wait cancellation (927ab33 Azat Khuzhin)
+   o regress_clean_dnsserver(): reset global port vars (351207f Azat Khuzhin)
+   o test/http: read_on_write_error: fix it for win32 (3b58169 Azat Khuzhin)
+   o test/http: separate coverage for EVHTTP_CON_READ_ON_WRITE_ERROR (5c2b4c1 Azat Khuzhin)
+   o test/http: cover "Expect: 100-continue" client-server interaction (31d8116 Azat Khuzhin)
+   o test/http: *lingering tests shouldn't have "Expect: 100-continue" (ed469ab Azat Khuzhin)
+   o test: use EVUTIL_SHUT_WR (04fc82f Azat Khuzhin)
+   o test/http: avoid huge stack allocations to fix win32 builds (3166765 Azat Khuzhin)
+   o test: http/lingering_close: cover EVHTTP_SERVER_LINGERING_CLOSE (e122ca1 Azat Khuzhin)
+   o test: http/non_lingering_close: cover ~EVHTTP_SERVER_LINGERING_CLOSE (f41e1b0 Azat Khuzhin)
+   o test: http/*: update expected HTTP codes for body exceeds `max_body_size` (addf2b9 Azat Khuzhin)
+   o test: http/data_length_constrains: set EVHTTP_CON_READ_ON_WRITE_ERROR (d38a723 Azat Khuzhin)
+   o test: increase buffer size for http/data_length_constraints to trigger EPIPE (0792e1e Azat Khuzhin)
+   o test/tinytest_demo: include <windows.h> for win32 to fix tdm-gcc (f062bbe Azat Khuzhin)
+   o test/regress: cover event_del() waiting mechanism (5b58b70 Azat Khuzhin)
+   o test/regress: cover existing signal callbacks and fork() + event_reinit() (ceddc60 Azat Khuzhin)
+   o test/regress: cover signals after fork() + event_reinit() (b075b81 Azat Khuzhin)
+   o test/regress: main/fork: rewrite assertions by just removing event in callback (088d8b3 Azat Khuzhin)
+   o test/dns: check exit code of evdns_getaddrinfo() (0b9d432 Azat Khuzhin)
+   o test/dns: cover evdns_getaddrinfo() and evdns_base_free() with @fail_requests (4ad3483 Azat Khuzhin)
+   o test/dns: cover @fail_requests for evdns_base_free() (d6c6fb4 Azat Khuzhin)
+   o test/dns: more graceful coverage of @fail_requests (123d372 Azat Khuzhin)
+   o test/ssl: cover busy-loop (i.e. {read,write}-blocked-on-{write,read} stuff) (da0ea7a Azat Khuzhin)
+   o test/http: write_during_read for https (23c77b6 Azat Khuzhin)
+   o test/http: connection_fail for https (7ea26f7 Azat Khuzhin)
+   o test/http: stream_out for https (ac04968 Azat Khuzhin)
+   o test/http: chunk_out for https (a71ffb9 Azat Khuzhin)
+   o test/regress: fix ssl-less builds (need to make this prettier) (3160716 Azat Khuzhin)
+   o test/http: allow dirty shutdown for ssl to fix https_incomplete (1ede326 Azat Khuzhin)
+   o test/http: https basic (59714b4 Azat Khuzhin)
+   o test/http: incomplete{,_timeout} for https (615490d Azat Khuzhin)
+   o test/http: add simplest test for http/https/https_dirty_shutdown (93b19dc Azat Khuzhin)
+   o test/http: https: retry coverage (7c2d24a Azat Khuzhin)
+   o test/http: https server support (plus some helpers) (a7088ad Azat Khuzhin)
+   o test/http: more sanity checks (a27c53c Azat Khuzhin)
+   o test/ssl: export getkey()/getcert()/get_ssl_ctx()/init_ssl() for https (0c4c387 Azat Khuzhin)
+   o test/regress_be: basic coverage bufferevent_flush() for pair/sock layers (ad52602 Azat Khuzhin)
+   o test/regress_be: socket_filter_inactive: check bufferevent after creation (f8081af Azat Khuzhin)
+   o test/regress_be: cover finalizers from inactive to active queue (337684b Azat Khuzhin)
+   o test/regress_buffer: fix clang compilation warnings (d8fd4c0 Azat Khuzhin)
+   o test/regress_http: fix compilation warnings (-Wmissing-field-initializers) (cd422e0 Azat Khuzhin)
+   o test/regress_dns: fix compilation warnings (-Wmissing-field-initializers/for) (f55db98 Azat Khuzhin)
+   o tests/regress_dns: cover that randomize-case works case-insensitive (1e8bfbc Azat Khuzhin)
+   o test: fix bufferevent/bufferevent_pair_release_lock in debug mode (3f749e9 Azat Khuzhin)
+   o test: fix bufferevent/bufferevent_pair_release_lock for freebsd (79f9ace Azat Khuzhin)
+   o test/regress_be: bufferevent_enable() shouldn't call eventcb by it's own (a0f308d Azat Khuzhin)
+   o test/regress_be: introduce fake_listener_create() (37dc9e0 Azat Khuzhin)
+   o test/regress_http: cover evhttp_request_own() (6f6fa0d Azat Khuzhin)
+   o test/regress_http: cover write during read (3d15aeb Azat Khuzhin)
+   o test/regress_http: verify that closecb will be called without multiple write (4be6c70 Azat Khuzhin)
+   o test/regress: fix bufferevent_pair_release_lock with EVENT_DEBUG_MODE (6ea6655 Azat Khuzhin)
+   o test/regress_ssl: check events fd/pending after timeout triggered (cdafdf0 Azat Khuzhin)
+   o test/regress_ssl: cover case when server didn't up (failed with timeout) (74845f1 Azat Khuzhin)
+   o test/regress_ssl: covert that we can't change fd with underlying (df507af Azat Khuzhin)
+   o test/regress_ssl: cover that events (read/write) at finish not pending (762edb4 Azat Khuzhin)
+   o test/regress_ssl: cover fd manipulations (b78a829 Azat Khuzhin)
+   o test/regress_ssl: convert open_ssl_bufevs() to mask (46bba73 Azat Khuzhin)
+   o test/regress_ssl: convert client/server to mask too (3455991 Azat Khuzhin)
+   o test/regress_ssl: cover "allow_dirty_shutdown" (0430327 Azat Khuzhin)
+   o test/regress_ssl: convert regress_bufferevent_openssl() to bitmask (342e116 Azat Khuzhin)
+   o tests/regress_ssl: drop duplicated assert (25e56fd Azat Khuzhin)
+   o test/regress_http: initialize "dns_base" to avoid reading trash (9f0bff3 Azat Khuzhin)
+   o test/http: cover retrying with saved conn_address by shutting down dns server (f4874d8 Azat Khuzhin)
+   o be_pair/regress: cover use of shared lock (lock/unlock/free) (a558fcd Azat Khuzhin)
+   o regress_dns: drop hack for event_debug_map_HT_GROW in leak tests (3540a19 Azat Khuzhin)
+
+ Sample code
+   o Fix memory leak in signal-test.c (666db91 basavesh.as)
+   o sample/hello-world: exAmple, not eXMple (2d3cd35 kirillDanshin)
+   o dns-example: allow to set ns from args (df19a97 Azat Khuzhin)
+   o dns-example: convert to getopt() (32f8592 Azat Khuzhin)
+   o http-connect: make it win32 compilable (1bf7595 Azat Khuzhin)
+   o sample/https-client: allow to change path to ca-certificates (fdf713a Azat Khuzhin)
+   o sample/https-client: check for ERR_remove_thread_state() existence (c4e9d9b Azat Khuzhin)
+   o sample/https-client: replace ERR_remove_state() by ERR_remove_thread_state() (77ad68a Azat Khuzhin)
+   o sample/https-client: add -timeout option (4637aa8 Azat Khuzhin)
+   o sample/https-client: don't try to free uninitialized SSL (f3d7ff5 Azat Khuzhin)
+   o sample/https-client: graceful exit with freeing memory (to make valgrind happy) (24a1f25 Azat Khuzhin)
+   o https-client: correctly handle URLs with no path (like "https://host:port") (29a0482 Andrey Skriabin)
+   o sample/http-connect: don't use assert() to make it work with NDEBUG (6dc71e7 Azat Khuzhin)
+   o sample/http-connect: made it compatible with C90 (f976d43 Azat Khuzhin)
+   o sample: add HTTP CONNECT tunnelling example using libevent http layer (1d34498 Azat Khuzhin)
+   o Update dns-example. (620ff24 Mark Ellzey)
+
+ Documentation
+   o Update README.md (b8ec70c Mark Ellzey)
+   o Update README.md (80faee9 Mark Ellzey)
+   o Update README.md (ad4a897 Mark Ellzey)
+   o Update README.md (a2b2e1e Mark Ellzey)
+   o Update README.md (0dfa5dc Mark Ellzey)
+
+ Code Improvements (evthread)
+   o evthread: add evthread_get_{lock,condition}_callbacks() helpers (c0b34f6 Azat Khuzhin)
+
+ Code Improvements (core)
+   o util: make @sa const for evutil_socket_connect_() (a8d32c2 Azat Khuzhin)
+
+ Code Improvements (http)
+   o http: assert's that evbuffer_drain() success on connection reset (2185e63 Azat Khuzhin)
+   o http: introduce evhttp_request_free_() helper (22061ac Azat Khuzhin)
+   o http: introduce evhttp_is_request_connection_close() helper (6540da3 Azat Khuzhin)
+
+ Code Improvements (bufferevents)
+   o be_sock: bufferevent_socket_set_conn_address(): assert instead of silent no-op (0ab88c2 Azat Khuzhin)
+   o be_sock: sanity check in bufferevent_socket_set_conn_address() (eedbeff Azat Khuzhin)
+   o be: replace sockaddr_storage with sockaddr_in6 for conn_address (3889612 Azat Khuzhin)
+   o be: replace conn_address by full struct instead of pointer (e5615aa Azat Khuzhin)
+   o bufferevent: move conn_address out from http into bufferevent (8bb3842 Azat Khuzhin)
+   o be: make @sa const for bufferevent_socket_connect() (dc33c78 Azat Khuzhin)
+
+ Cleanups (core)
+   o Refactoring conditional directives that break parts of statements. (4b41eeb lzmths)
+   o epoll: introduce PRINT_CHANGES() macro to avoid copy-pasting (a1b142b Azat Khuzhin)
+   o tab (6e7a580 Greg Hazel)
+
+ Cleanups (evbuffers)
+   o buffer_compat: fix comment -- we have EVBUFFER_EOL_ANY not EOL_STYLE_ANY (575ff67 Azat Khuzhin)
+
+ Cleanups (bufferevents)
+   o be_sock: evutil_getaddrinfo_async_() always return 0 (dbff101 Azat Khuzhin)
+   o be_sock: drop be_sock_add() macro (useless and debug unfriendly) (fad5fe2 Azat Khuzhin)
+   o be: introduce bufferevent_generic_adj_existing_timeouts_() (3c1f58f Azat Khuzhin)
+   o be: add_event: use evutil_timerisset() (a96b73b Azat Khuzhin)
+   o be_openssl: introduce be_openssl_auto_fd() helper (2a8a711 Azat Khuzhin)
+   o be_openssl: introduce set_open_callbacks_auto() (510da71 Azat Khuzhin)
+
+ Cleanups (http)
+   o http: make fallback for EVHTTP_CON_READ_ON_WRITE_ERROR more cleaner (d405492 Azat Khuzhin)
+   o http: coding style issue (365f181 Azat Khuzhin)
+
+ Cleanups (evdns)
+   o evnds: inline TEST_NAME macro to make debuggin easier (0c615f4 Azat Khuzhin)
+
+ Portability Fixes
+   o [#372] check for errno.h (3031617 Mark Ellzey)
+   o Fixed Unicode issue in error messages. (e8b7895 Mattes D)
+   o Assume that ke_udata is an integer type on CloudABI. (5602e45 Ed Schouten)
+   o Add missing include of <netinet/in.h>. (b2c68bc Ed Schouten)
+   o Include <sys/ioctl.h>, <sys/resource.h> and <sys/wait.h> optionally. (c1404b5 Ed Schouten)
+   o Test against SO_REUSEADDR (along with _WIN32). (ce1776c Ed Schouten)
+   o Always define missing TAILQ functions from sys/queue.h (2828bdb Christopher Wiley)
+   o Don't use BSD u_* types. (fd36647 Ed Schouten)
+   o Remove BSD-ism: TIMEVAL_TO_TIMESPEC(). (193c7de Ed Schouten)
+   o be: include all variations of headers for sockaddr_in6 struct (c212291 Azat Khuzhin)
+   o be: fix sockaddr_in6 type definition for win32 (c42bc6b Azat Khuzhin)
+
+ Continious Integration:
+   o travis: split long lines, and make it cleaner (685a6a1 Azat Khuzhin)
+   o travis: fix autotools on osx by reinstalling libtool (088ea5e Azat Khuzhin)
+   o appveyor/autotools: link with openssl by passing LDFLAGS/CFLAGS (6fcfa25 Azat Khuzhin)
+   o appveyor: image already had openssl installed (4634b85 Azat Khuzhin)
+   o appveyor: check -DUNICODE -D_UNICODE according to ReleaseChecklist (cmake only) (e9acc44 Azat Khuzhin)
+   o appveyor: ignore failure of mingw-get (1810857 Azat Khuzhin)
+   o appveyor: drop shallow_clone, since we use tags for detecting version in cmake (ac90133 Azat Khuzhin)
+   o appveyor: support cmake & autotools using build matrix (like travis-ci has) (8f95015 Azat Khuzhin)
+   o travis-ci/osx: relink gcc/g++ instead of clang (481481d Azat Khuzhin)
+   o travis-ci: enable multi-os mode (osx, linux) (79917e4 Azat Khuzhin)
+   o travis-ci: increase matrix (--disable-foo) (59649f7 Azat Khuzhin)
+   o travis-ci: adjust alignment (c8be339 Azat Khuzhin)
+   o travis: add builds without debug mode into matrix (3e56da2 Azat Khuzhin)
+   o test: run regress with EVENT_DEBUG_MODE=1 and without (cf2cf2a Azat Khuzhin)
+   o Update travis config for status updates (37453ab Mark Ellzey)
+   o Use autotools for appveyor until cmake is fixed. (1cc2e29 Mark Ellzey)
+   o Fix the link for appveyor OpenSSL installer (WIN32) (107d565 Mark Ellzey)
+   o Forgot to install OpenSSL for appveyor (26164a5 Joakim Söderberg)
+   o Add support for appveyor.com windows CI (5f89c37 Joakim Söderberg)
+
+ Build Improvements/Fixes:
+   o evutil: mark ai_find_protocol() static (prototype-less) (5a157c8 Azat Khuzhin)
+   o cmake/solaris: set CMAKE_REQUIRED_LIBRARIES to fix functions detections (dc95823 Azat Khuzhin)
+   o cmake/solaris: fix building (link with socket,nsl) (050bfc7 Azat Khuzhin)
+   o cmake: check for ZLIB_INCLUDE_DIR, since we can have only library without headers (c4dfb93 Azat Khuzhin)
+   o autotools/win32: fix searching ssl library (671a24f Azat Khuzhin)
+   o cmake/win32: do not compile regress_thread on -DEVENT__DISABLE_THREAD_SUPPORT=ON (de0c196 Azat Khuzhin)
+   o cmake/win32: do not compile evthread_win32 on -DEVENT__DISABLE_THREAD_SUPPORT=ON (ecb0ec8 Azat Khuzhin)
+   o cmake: fix -DEVENT__ENABLE_VERBOSE_DEBUG (typo on -DUSE_DEBUG) (e35f224 Azat Khuzhin)
+   o cmake: do not use stderr for notifications/version-info (38716c6 Azat Khuzhin)
+   o autoconf: fix --disable-thread-support build under win32 (bb09535 Azat Khuzhin)
+   o buffer: don't mix code and declarations (8892f4c Azat Khuzhin)
+   o Update gitignore file to ignore cscope gen'ed files (0aaa4fb Neeraj Badlani)
+   o For non GCC/clang on OSX the -Wno-deprecated-declarations may not be valid (b5ca365 Rainer Keller)
+   o automake: define serial-tests only if automake have this option (61179de Azat Khuzhin)
+   o test/automake: don't use paralell test harness (since automake 1.12) (44d755e Azat Khuzhin)
+   o Ignore all pkgconfig generated stuff (ce38993 Azat Khuzhin)
+   o libevent_core and libevent_extra also deserve a pkgconfig file (b8d7c62 Jan Heylen)
+   o Ignore verify_tests.bat (win32 version) (0f2de10 Azat Khuzhin)
+   o cmake: require 3.1 only for win32 to make it work under ubunty precise (87f7238 Azat Khuzhin)
+   o cmake: require at least 3.1 for target_sources() (c46ead5 Azat Khuzhin)
+   o cmake: fix adding of compiler flags, and now it will (36588e1 Azat Khuzhin)
+   o Replace -Wswitch-enum with -Wswitch, and add it into cmake rules too (f29f59e Azat Khuzhin)
+   o test/regress_ssl: Fix compile problems for win32 (73d0360 Trond Norbye)
+   o util: fix "%zu" format on TDM-gcc/MinGW-w64 (79b69d8 Azat Khuzhin)
+   o cmake: don't define EVENT__NEED_DLLIMPORT always (fixes VS2013 static build) (49bd790 Azat Khuzhin)
+   o Add missing return statement to del_wait_thread so libevent can build. (4f778ab Nick Mathewson)
+   o cmake: fix building dns-example under win32 (missing getopt) (a1609a8 Azat Khuzhin)
+   o visibility: align it to make it more readable (bb6b53d Azat Khuzhin)
+   o cmake: Fix detection of ssize_t/SSIZE_T (7707f6b Azat Khuzhin)
+   o Ignore more configure stuff (configure.lineno) (8d34302 Azat Khuzhin)
+   o Fixed issue with cmake version generation (d56efd9 Mark Ellzey)
+   o Cmake is now officially working. (7f9646d Mark Ellzey)
+   o More cmake updates, lot's of missing definitions (49a5381 Mark Ellzey)
+   o CMake syntax fixes fo .in files (6aad23d Mark Ellzey)
+   o Revert "The Windows socket type is defined as SOCKET." (a264da8 Mark Ellzey)
+   o CMAKE CMAKE CMAKE CLEANUPS (a9db46a Mark Ellzey)
+   o Lot's of cmake updates (8b228e2 Mark Ellzey)
+   o Provide a mechanism for building the library on Windows with different compiler flags. Add a batch file that builds it for the M[DT][d] options and performs a hunt and gather of the different output libraries. (ded8086 billsegall)
+   o The Windows socket type is defined as SOCKET. (c9e6c3d billsegall)
+   o autotools: fix getservbyname() detection (959a4c2 Azat Khuzhin)
+   o Add missing <string.h> for openssl_hostname_validation module (3316a21 Azat Khuzhin)
+   o make test/regress_ssl.c compile without warnings (9f02a44 Thomas Bernard)
+   o test/regress_be: drop debug __asm__(int3) to fix arm build (8240379 Azat Khuzhin)
+   o event_debug_created_threadable_ctx_: fix compilation without debug mode (a068f2e Azat Khuzhin)
+   o Add a prototype for event_disable_debug_mode() (bfcedee Sebastian Hahn)
+   o http: eliminate warning about "socklen" in evhttp_connection_connect_() (dfad1a4 Azat Khuzhin)
+   o Updated gitignore (1dbb55d Mark Ellzey)
+   o Update bench_httpclient.c (cb96931 Seungmo Koo)
+   o *fix: bench_httpclient to support win32 (4e9325e zeliard)
+   o Commented out a WIN32 threading / timing test for now (e84e269 Mark Ellzey)
+   o Fix mixed declarations and code (forbidden by ISO C90) (0c7f217 Thomas Bernard)
+   o Fix "function declaration isn’t a prototype" (746d2c5 Thomas Bernard)
+   o This fixes a bug introduced in 27bd9faf498b91923296cc91643e03ec4055c230 (19ba454 Joakim Söderberg)
+   o changed strtotimeval signature as per #211 (bdbc823 Xiao Bao Clark)
+   o Added cmake-generated files to ignore list. (6c12bfe Matyas Dolak)
+   o Ignore `make dist` generated files (8a2c6c7 Azat Khuzhin)
+
+  Debugging
+   o Debug mode option to error on evthread init AFTER other event calls. (dcfb19a Mark Ellzey)
+
+
+
+Changes in version 2.1.5-beta (5 January 2015)
+
+ Security Fixes (evbuffers)
+   o Avoid integer overflow bugs in evbuffer_add() and related functions.  See CVE-2014-6272 advisory for more information. (d49bc0e88b81a5812116074dc007f1db0ca1eecd)
+
+ New APIs (evconnlistener)
+   o Provide support for SO_REUSEPORT through LEV_OPT_REUSABLE_PORT (b625361 Maciej Soltysiak)
+
+ Bugfixes (core)
+    o Fix use-after-free error in EV_CLOSURE_EVENT callback (3cc0eac John Ohl)
+    o Fix race caused by event_active (3c7d6fc vjpai)
+
+ Bugfixes (evbuffer)
+   o Fix evbuffer_peek() with len==-1 and start_at non-NULL. (ba59923)
+   o Consistently check for failure from evbuffer_pullup() (60f8f72)
+   o Fix evbuffer_peek() with len==-1 and start_at non-NULL. (fb7e76a)
+
+ Bugfixes (windows, IOCP)
+   o be async: avoid double close() (f133b86 Azat Khuzhin)
+
+ Bugfixes (bufferevents)
+   o Fix issue #127, double free for filterevents that use BEV_OPT_CLOSE_ON_FREE (2c82aa0 John Ohl)
+   o make bufferevent_getwatermark api more robust (a21e510 ufo2243)
+   o [Bugfix] fix bufferevent setwatermark suspend_read (b34e4ac ufo2243)
+   o bufferevent_openssl: reset fd_is_set when setfd with -1 is called (3da84c2 Azat Khuzhin)
+   o Fix compilation for older OpenSSL versions. (5c7282f Joakim Soderberg)
+
+ New APIs (evhttp)
+   o Add evhttp_connection_set_family() to set addrinfo->family for DNS requests (12c29b0 Azat Khuzhin)
+   o Implement interface that provides the ability to have an outbound evhttp_connection free itself once all requests have completed (2b9ec4c,10fe4f John Ohl)
+
+ New APIs (core)
+   o Implement new/free for struct evutil_monotonic_timer and export monotonic time functions (f2645f8 Andrea Shepard)
+
+ Bugfixes (evdns)
+   o Load hosts file on Windows. (a0b247c Vilmos Nebehaj)
+   o Don't truncate hosts file path on Windows. (d0dc861 Vilmos Nebehaj)
+   o Fix a crash in evdns related to shutting down evdns (9f39c88,e8fe749)
+   o evdns: avoid read-after-free in evdns_request_timeout_callback() (61262a0 Azat Khuzhin)
+   o Correctly handle allocation failures in evdns_getaddrinfo (6a53d15)
+   o evdns: fix EVDNS_BASE_DISABLE_WHEN_INACTIVE in case retransmit/retry (74d0eee Azat Khuzhin)
+   o evdns: add retry/reissue tests for EVDNS_BASE_DISABLE_WHEN_INACTIVE (3ca9d43 Azat Khuzhin)
+   o evdns: fail ns after we are failing/retrasmitting request (97c750d Azat Khuzhin)
+
+ Bugfixes (evhttp)
+   o http: reset connection before installing retry timer (fix http retries handling) (bc79cc5 Azat Khuzhin)
+
+
+ Testing
+   o regress_dns: fix leaks in getaddrinfo_async{,_cancel_stress} tests (2fdc5f2 Azat Khuzhin)
+   o test: add family argument for http_connection_test_() (177b8a7 Azat Khuzhin)
+   o test: add regress for evhttp_connection_set_family() with AF_INET and AF_UNSPEC (42aefeb Azat Khuzhin)
+   o test/http: add regress test for set family to AF_INET6 (3fbf3cc Azat Khuzhin)
+   o Update to a more recent tinytest_macros. (8da5a18)
+   o test/regress: add simplestsignal: to track reorder bugs separately (b897bef Azat Khuzhin)
+   o test/evbuffer_peek: add regress in case we have first buffer greater (e2d139d Azat Khuzhin)
+   o More evbuffer_peek() test cases (154006a)
+   o use correct tt macro for pointer compare (08c88ea)
+   o regress_buffer: fix 'memcmp' compare size (79800df Maks Naumov)
+   o Fix a use-after-free in unit tests. CID 752027 (3739057)
+   o Fix a dead-code warning in unit tests. CID 1193548 (c119f24)
+   o Use evutil_weakrand() in unit tests. (a677b72, 364c110)
+   o Use a more precise calculation for max in time-ratelim.c (ca5b5c7)
+   o Make a buffer larger in the tests to avoid a scary evbuffer_copyout_from() (fb57b8b)
+   o Fix several memory leaks in the unit tests. (89c1a3b)
+   o Add test for evhttp_connection_free_on_completion (b0e9924 John Ohl)
+   o Fix annoying heisenbug in test-time.c (cb73704)
+
+ Sample code
+   o Make http-server.c output into good html5 (6d72bdc)
+   o Use FindClose for handle from FindFirstFile in http-server.c (6466e88)
+   o https-client: add -retries argument, for connection retries (d9da844 Azat Khuzhin)
+
+ Bugfixes (build)
+   o Add missing headerfile for cmake (15d90cc Trond Norbye)
+   o ignore one more test binary (b6593aa Michael Richardson)
+   o ignore config.cache/test-driver files (c83f333 Mike Frysinger)
+   o add a --disable-samples configure flag (0c492b3 Mike Frysinger)
+   o Add a few files created by "make verify" to .gitignore. (1a8295a Pierre Phaneuf)
+   o updates in cmake build (27bd9fa Sergey Nikulov)
+   o Fix cmake error when the Module path has more than one entry. (befbd13 Acer Yang)
+   o Fix CMake shared library build (e69d910 Nobuaki Sukegawa)
+   o Fix warnings when compiling with clang 3.5 (f5b4765 John Ohl)
+   o Fix mixed declarations and code (forbidden by ISO C90) (8afbdbc Thomas Bernard)
+
+ Bugfixes (miscellaneous)
+   o tree.h: drop duplicated content of tree.h (6193187 Azat Khuzhin)
+   o evdns: disable probing with EVDNS_BASE_DISABLE_WHEN_INACTIVE (610410b,ad0493e,fea86a6,d83b337,5ca9e97 Azat Khuzhin)
+   o [Bugfix] fix grammer error (3a4d249 ufo2243)
+   o Change return type of evutil_load_windows_system_library_ to HMODULE (f691389)
+   o Fix a c90 warning (76643dd)
+   o Fix a typo in a doxygen comment. Reported by 亦得. (be1aeff)
+   o remove trailing comma from enum (b361b8a Jean-Philippe Ouellet)
+
+ Bugfixes (FreeBSD)
+   o Handle ENOTCAPABLE from FreeBSD - this is returned if an event in the changelist is for an FD that has been closed. (6fd7394 Adrian Chadd)
+
+
+
+Changes in version 2.1.4-alpha (21 Mar 2014)
+
+ Libevent 2.1.4-alpha adds a number of new miscellaneous APIs to make
+ Libevent more useful, including support for early close detection with
+ epoll via EPOLLRDHUP, triggering bufferevent callbacks, adding more
+ evhttp callbacks, and more. There are also numerous bugfixes, including
+ a number for finalize-related issues from 2.1.3-alpha; and an
+ alternative (non-primary!) cmake-based build mechanism.
+
+ New APIs (core)
+   o Added event_base_get_num_events() (0fa107d Mobai Zhang)
+   o New event_base_active_by_fd API (865a142 Greg Hazel, 5c9da9a, 87fa2b0)
+   o Add event_base_active_by_signal by analogy (4865943)
+   o Add access to max event count stats (5173bef, efbd3dc, 26230a2
+     Andrew Sweeney)
+   o Implemented EV_CLOSED event for epoll backend
+     (EPOLLRDHUP). (b1b69ac Diego Giagio, 53d2793, 43ffcf6, dfe1e52
+     Marcin Juszkiewicz, ff26633 Joakim Soderberg, 3908a5e)
+
+ New APIs (evutil_secure_rng)
+   o Add evutil_secure_rng_set_urandom_device_file (2bbb5d7)
+
+ New APIs (bufferevents)
+   o Add function to fetch underlying ratelimit cfg (4b3d5af Mark Ellzey)
+   o Pass and return const for bufferevent_get_token_bucket_cfg (1c77fbb
+     Mark Ellzey)
+   o Add watermark introspection (4ce242b Ondřej Kuzník)
+   o Add an option to trigger bufferevent I/O callbacks (61ee18b Ondřej Kuzník)
+   o Add an option to trigger bufferevent event callbacks (a7384c7
+     Ondřej Kuzník)
+   o Clarifications in response to merge req. comments (bd41947 Ondřej
+     Kuzník)
+   o Minor optimizations on bufferevent_trigger options (a3172a4)
+
+ New APIs (evhttp)
+   o Add evhttp_connection_get_server(). (a7f82a3 Maxime Henrion)
+   o add a http default content type option (5a5acd9 Nicolas Martyanoff)
+   o http: implement new evhttp_connection_get_addr() api. (0c7f040 Azat
+     Khuzhin)
+   o Add a variant of evhttp_send_reply_chunk() with a callback on
+     evhttp_write_buffer() (8d8decf Julien BLACHE)
+   o Allow registering callback for parsing HTTP headers (b0bd7fe Balint Reczey)
+   o Provide on request complete callback facility (b083ca0 Andrew Sweeney)
+   o evhttp_request_set_on_complete_cb to be more specific about what
+     the function actually does and usage (da86dda Andrew Sweeney)
+   o Update unit test to make sure that the callback happens after the
+     output data is written (b85f398 Andrew Sweeney)
+
+ Features (evdns)
+   o bug fix for issues #293 evdns_base_load_hosts doesn't remove
+     outdated addresses (954d2f9, f03d353, 45eba6f Kuldeep Gupta)
+
+ Features: (cmake build support)
+   o Initial CMake commit. (e415196 Joakim Soderberg)
+   o Add all tests and benchmarks to CMake project. (e9fc014 Joakim Soderberg)
+   o More work on adding tests to CMake project (99c1dc3 Joakim Soderberg)
+   o Generate a dummy evconfig-private.h so things build
+     properly. (ce14def Joakim Soderberg)
+   o Link libm on unix platforms. (58fcd42 Joakim Soderberg)
+   o Added some GCC specific options. (19222e5 Joakim Soderberg)
+   o Use evutil_closesocket instead. (dbf2b51 Joakim Soderberg)
+   o Add copyright and licensing files for CMake modules. (c259d53
+     Joakim Soderberg)
+   o Only include WIN32 getopt where it is used. (9bbce0b Joakim Soderberg)
+   o Fix bench_cascade program on Windows. (78da644 Joakim Soderberg)
+   o Don't segfault on no found event backend. (8f2af50 Joakim Soderberg)
+   o Only test the event backends available on the system. (7ea4159
+     Joakim Soderberg)
+   o Added a "make verify" target. (e053c4f Joakim Soderberg)
+   o Fix the make "verify" target on Windows. (67e5d74 Joakim Soderberg)
+   o Get rid of deprecation warnings for OpenSSL on OSX 10.7+ (69c3516
+     Joakim Söderberg)
+   o Fix kqueue support. (a831f2f Joakim Söderberg)
+   o Added a test for testing if kqueue works with pipes. (2799b35
+     Joakim Söderberg)
+   o Change the BSD license from 4 to 3-clause. (86df3ed Joakim Soderberg)
+   o Minimum required python version is 2.4. (968e97b Joakim Soderberg)
+   o Get rid of unknown pragma warnings. (0ef1d04 Joakim Soderberg)
+   o Add a "make verify_coverage" target generation coverage
+     info. (f2483f8 Joakim Soderberg)
+   o Fix the "make verify" target on NetBSD (4ac086a Joakim Soderberg)
+   o Only look for ZLib when it is used (if tests are
+     included). (f780593 Joakim Soderberg)
+   o Added EVENT__ENABLE_GCC_WARNINGS, turns all warnings into
+     errors. (dd413bd Joakim Soderberg)
+   o Add CMake config and install targets. (f3446ed Joakim Soderberg)
+   o Fix typo (4b754df Joakim Soderberg)
+   o Some work on making it possible to simply do add_subdirectory() on
+     the project. (49ab363 Joakim Soderberg)
+   o Set USE_DEBUG=1 on EVENT__ENABLE_VERBOSE_DEBUG (fd42e70 Joakim Soderberg)
+   o Fix so that old nmake project still builds. (24d6466 Joakim
+     Soderberg)
+   o Rename README to README.md and use markdown to format. (d2bc39a
+     Joakim Soderberg)
+   o Update README with CMake build instructions. (604b8cc Joakim Soderberg)
+   o Clean up the README some. (8d4cb35 JoakimSoderberg)
+   o Forgotten headers for old nmake project compatability. (8697b99
+     Joakim Soderberg)
+   o Change all uses of WIN32 to _WIN32 (4e14395 Joakim Söderberg)
+   o Fix include bug. (2024467 Joakim Söderberg)
+   o Check if we're on OSX before disabling deprecation in le-proxy
+     (8b40a5b Joakim Söderberg)
+   o Fix broken autotools build. (ae1bd82 Joakim Söderberg)
+   o Disclaimerize cmake a little in the README (d03b5bf)
+   o Fix CMake compile when OpenSSL is disabled. (e423d42 Joakim
+     Söderberg)
+   o CMake: Get rid of python not found warning when regress tests
+     turned off. (d38d798 Joakim Söderberg)
+   o Fix https-client compilation on Windows. (d7be788 Joakim Soderberg)
+   o Guard against EVENT_NOWIN32 being set during testing. (f1715b4
+     Joakim Soderberg)
+   o Check for OSX when checking for clang. (e212c54 Joakim Soderberg)
+   o Added a Travis-CI configuration file. (8c0f0a9 Joakim Soderberg)
+   o Added -Qunused-arguments for clang on macosx (ed99d92 Trond Norbye)
+   o Rename event_extras to event_extra (a0dd5df Trond Norbye)
+   o Add option to build shared library (4545fa9 Trond Norbye)
+   o Add -Qunused-arguments for clang on macos (b56611d Trond Norbye)
+   o Add cmake-related files to .gitignore (e061321 Trond Norbye)
+   o Export event_extra not event_extras. (2b41bcf Joakim Söderberg)
+
+ Bugfixes (core)
+   o If evsel->del() fails, don't leave the evmap in an inconsistent
+     state (9b5a527 Maxime Henrion)
+   o Move event_debug_note_teardown_ before mm_free. (69b5c64)
+   o Check CLOCK_MONOTONIC_* at runtime if needed. (911abf3)
+   o Fix reinit of fds with EV_WRITE but not EV_READ. (ebfd8a8 maksqwe)
+   o Tweaked callbacks to prevent race condition
+     (https://github.com/libevent/libevent/issues/104) (40830f1, 2ea15ed
+     John Ohl)
+   o Move assert(ev) to before we use ev in EV_CLOSURE_EVENT_FINALIZE
+     case (9805972)
+
+ Bugfixes (evhttp)
+   o Fix a double close() bug in evhttp when the underlying bufferevent uses
+     BEV_OPT_CLOSE_ON_FREE. (31db8a0 Maxime Henrion)
+   o Fix an unlikely but possible error case for http connections (f22049e)
+   o Avoid racy bufferevent activation (5eb1788 Nate Rosenblum)
+
+ Bugfixes on 2.0 (Windows)
+   o Use windows vsnprintf fixup logic on all windows environments (e826f19)
+   o libevent/win32_dealloc() : fix sizeof(pointer) vs sizeof(*pointer)
+    (b8f5980 Frank Denis)
+
+ Bugfixes (evutil_secure_rng)
+   o When we seed from /proc/sys/kernel/random/uuid, count it as success
+     (e35b540)
+   o We should return after arc4random_buf() (1ea1f26 Makoto Kato)
+   o Avoid other RNG initialization FS reads when urandom file is
+     specified (9695e9c)
+   o Really remove RNG seeds from the stack (f5ced88)
+   o Fix another arc4random_buf-related warning (e64a2b0)
+
+ Bugfixes (bufferevents)
+   o Initialize async bufferevent timeout CBs unconditionally (af9b2a7)
+
+ Bugfixes (evdns)
+   o Checking request nameserver for NULL, before using it. (5c710c0
+     Belobrov Andrey)
+   o Fix SEGFAULT after evdns_base_resume if no nameservers
+     installed. (14971a8 Azat Khuzhin)
+   o Actually use the log facility for reporting evdns problems. (e1766a1)
+   o Fix SEGFAULT after evdns_base_resume if no nameservers
+     installed. (f8d7df8 Azat Khuzhin)
+   o fix for ServFail from RIPE Atlas release (62f596b Antony Antony)
+
+ Bugfixes (compilation)
+   o Fix test compilation with nmake: add the gdi.lib dependency (5ba8ab7)
+   o Whoops. It is gdi.lib, not gdi32.lib. (github issue #61) (8ab612e)
+   o Don't use return since return type is void and build error occurs
+     using clang (838161d Makoto Kato)
+   o Use void casts to suppress some "unchecked return value" warns (7080d55)
+   o rpcgen: Generate regress.gen.[c,h] in build rather than src dir
+     (243386c Ross Lagerwall)
+   o Fix a compiler warning when checking for arc4random_buf linker
+     breakage. (5cb3865)
+   o Fix 'make distcheck' by adding regress.gen.[ch] to DISTCLEANFILES
+    (239d834)
+
+   o Fix a c90 warning (c207682)
+   o Fix consts in WIN32-Code/getopt*.[ch] (57abb35)
+
+ Bugfixes (locks, synchronization)
+   o Missed lock acquire/release in event_base_cancel_single_callback_()
+     (d3d999a Azat Khuzhin)
+   o Fix locking in bufferevent_get_options_(). (dbc9cd4 Maxime Henrion)
+
+ Bugfixes (leaks)
+   o Avoid leaking segment mappings when offset is not a page multiple (d409514)
+
+ Testing
+   o Add tests for evdns_base_resume(). (1cd9ff5 Azat Khuzhin)
+   o Fix dns/leak_resume_send_err test. (7e876df Azat Khuzhin)
+   o Add checks for evhttp_connection_get_server() in unit
+     tests. (fbc323b Maxime Henrion)
+   o Fix a (failure-only) null dereference in the unit tests (1104d0b)
+   o Fix a logic error in test_evbuffer_freeze (7765884)
+   o Add missing check to test_evbuffer_file_segment_add_cleanup_cb (eba4506)
+   o Fix some crash-on-fail cases in DNS regression tests (87cd6f0)
+   o DNS tests: add a missing check (f314900)
+   o Finalize tests: add a missing check (82b6956)
+   o test_evutil_rtrim: add another missing check. (e193c95)
+   o regress_main: logging all if env EVENT_DEBUG_LOGGING_ALL isset
+     (611e28b Azat Khuzhin)
+   o regress_http: add tests for evhttp_connection_get_addr() (4dd500c
+     Azat Khuzhin)
+   o Update to the latest version of tinytest (7a80476)
+   o Heap-allocate zlib data structure in regress_zlib tests (4947c18)
+
+ Performance tweaks (core)
+   o Avoid redundant syscall to make a nonblocking socket nonblocking
+     (42c03da Maxime Henrion)
+   o Avoid redundant syscall if making a socket cloexec twice (1f29b18)
+   o Avoid redundant invocations of init_extension_functions for IOCP (3b77d62)
+
+ Documentation
+   o Document that arc4random is not a great cryptographic PRNG. (6e49696)
+   o Small doxygen tweaks (6e67b51)
+   o Try another doxygen tweak (ccf432b)
+   o Clarify event_base_loop exit conditions (031a803)
+   o Fix a typo (be7bf2c Ondřej Kuzník)
+   o Document deferred eventcb behaviour (13a9a02 Ondřej Kuzník)
+   o Typo fixes from Linus Nordberg (cec62cb, 8cd695b)
+   o Fix duplicate paragraph in evbuffer_ptr documentation (58408ee)
+
+ Code Improvements (coverity)
+   o Fix a pile of coverity warnings in the unit tests (867f401)
+   o Fix coverity warnings in benchmark tools. (ff7f739)
+   o Whoops; fix compilation in bench.c (544cf88)
+   o Remove spurious checks in evrpc.c error cases (coverity) (991b362)
+   o Fix a couple of compilation warnings in regress_http.c (860767e)
+   o Fix even more coverity warnings. (d240328)
+   o Stop checking for inet_aton; we don't use it. (f665d5c)
+   o Add an include to evrpc-internal to fix openbsd compilation warning
+     (5e161c6)
+
+ Cleanups
+   o Remove an unreachable return statement in minheap-internal.h (e639a9e)
+   o Refactor evmap_{io,signal}_active_() to tolerate bad inputs (974c60e)
+   o Fix needless bufferevent includes in evdns.c (254c04e)
+   o Fix a couple of "#ifdef WIN32" instances (88ecda3)
+   o Remove unneeded declaration in bufferevent-internal.h (4c8ebcd)
+
+ Sample code
+   o le-proxy: Fail more gracefully if opening listener fails (44b2491)
+   o http-server: drop uri_root from base_url in http-server. (6171e1c Azat Khuzhin)
+   o https-client: POST supported, args supported (c5887f7 Alexey Ozeritsky)
+   o https-client: code cleanup (29af65e Alexey Ozeritsky)
+   o https-client: Small tweaks to https-client.c (90786eb)
+   o https-client: Set hostname for SNI extension (by f69m) (d1976f8)
+   o https-client: add a cast to https-client.c (462e6b6)
+
+
+
+Changes in version 2.1.3-alpha (1 May 2013)
+
+ Libevent 2.1.3-alpha fixes various bugs, adds new unit tests, and cleans
+ up the code in a couple of places. It has a new callback in evhttp for
+ reporting errors during a request, a new feature for allowing evdns to
+ not keep the event_base looping when there are no requests inflight, and
+ example code for writing an https client.
+
+ Libevent 2.1.3-alpha also has an important new (experimental) event
+ finalization feature to allow safe event teardown in multithreaded
+ programs. This ought to fix the longstanding bug with deadlocks in
+ multithreaded use of SSL-based bufferevents that some people have been
+ experiencing since Libevent 2.0.
+
+
+ Core (event finalization)
+   o Implement event_finalize() and related functions to avoid certain
+     deadlocks (8eedeab)
+   o Use finalization feature so bufferevents can avoid deadlocks (02fbf68)
+   o Always run pending finalizers when event_base_free() is called (e9ebef8)
+   o Remove bufferevent_del_generic_timeout_cbs as now unused (4ea4c6a)
+   o More documentation for finalization feature (a800b91)
+   o Make the event_finalize* functions return an error code (5d11f4f)
+   o Mark the finalize stuff as experiemental in case it needs to
+     change (23e2e29)
+
+ Evdns
+   o evdns: New flag to make evdns not prevent the event loop from
+     exiting (6b7fa62 Azat Khuzhin)
+
+ Bugfixes (Core)
+   o Make event_remove_timer behave correctly with persistent timers (5623e80)
+   o Unit test for event_remove_timer with EV_PERSIST. (96150dd)
+   o Double-check next timeout when adding events (9443868 Nate Rosenblum)
+   o event_base_update_cache_time should be a no-op if the loop isn't
+     running (5e6fa2a)
+
+ Bugfixes (evhttp, crash fix, from 2.0)
+   o fix #73 and fix http_connection_fail_test to catch it (b618204 Greg Hazel)
+
+ Bugfixes (compilation and portability, from 2.0)
+   o Fix compilation with WIN32_HAVE_CONDITION_VARIABLES enabled (7e45739)
+   o Fix missing AC_PROG_SED on older Autoconfs (9ab2b3f Tay Ray Chuan)
+   o Backport libevent to vanilla Autoconf 2.59 (as used in RHEL5)
+     (74d4c44 Kevin Bowling)
+   o Use AC_CONFIG_HEADERS in place of AM_CONFIG_HEADERS for autmake
+     1.13 compat (817ea36)
+   o Rename configure.in to configure.ac to appease newer autoconfs (0c79787)
+   o Avoid using top_srcdir in TESTS: new automakes do not like this (a55514e)
+
+ Bugfixes (resource leaks/lock errors on error, from 2.0)
+   o Avoid leaking fds on evconnlistener with no callback set (69db261)
+   o Avoid double-close on getsockname error in evutil_ersatz_socketpair
+     (0a822a6)
+   o Fix a locking error in bufferevent_socket_get_dns_error. (0a5eb2e)
+
+ Documentation Fixes (from 2.0)
+   o Fix a mistake in evbuffer_remove() arguments in example http server code
+     (c322c20 Gyepi Sam)
+   o Fix a typo in a comment in buffer.h. Spotted by Alt_F4 (773b0a5)
+
+ Documentation Fixes
+   o minor documentation typos (809586a Patrick Pelletier)
+   o Fix cut-and-paste err in whatsnew-2.1 (49905ac)
+   o Fix comment to refer to sample/include.am correctly (9e8cdf3 Sebastian
+     Hahn)
+   o Fix typo : Dispatching instead of Dispaching (0c2bacc Volker Lendecke)
+   o fix some hinky indentation in evhttp_make_request (80e220e Patrick
+     Pelletier)
+   o "buffer" spelling (a452811 Patrick Pelletier)
+   o Specify return behavior in header for evbuffer_pullup() in corner case
+     (cf8d1cd Dan Petro)
+   o Clarify an important point about event_base_foreach_event() (920a5e6)
+
+ Compilation Fixes/Tool Support
+   o avoid valgrind false positive by zeroing epoll_event (1258614 Patrick
+     Pelletier)
+   o Fix harmless clang enum warning (b452a43 Sebastian Hahn)
+   o remove all exes on "make clean", not just regress.exe (974bfa0 Patrick
+     Pelletier)
+   o Make --disable-libevent-regress work again (787fd74)
+   o Do not build strlcpy.c when it will have no code. (4914620)
+
+ Portability Fixes
+   o When EWOULDBLOCK is not EAGAIN, treat it as equivalent to it (bf7a0ff)
+   o Preliminary changes for Minix3. (0dda56a Nicholas Heath)
+   o Use AC_CONFIG_HEADERS in place of AM_CONFIG_HEADERS for autmake 1.13
+     compat (bf278b)
+   o Avoid using $(top_srcdir) in TESTS. (2863c83)
+   o build test/test-script.sh on systems with a less-featureful $< (f935e21)
+   o Implement EVUTIL_ERR_IS_EAGAIN on windows. (42aaf4d)
+
+ Evhttp changes:
+   o Fix ipv6 support for http. When URL contain domain, not IP
+     address. (71e709c Azat Khuzhin)
+   o uri decode: fix for warning "use of uninitialised value" (64b6ece Azat
+     Khuzhin)
+   o uri decode: changed the test for the existence of the next character
+     (e1903e3 Azat Khuzhin)
+   o Move prototype of evhttp_decode_uri_internal() to http-internal.h
+     (de8101a Azat Khuzhin)
+   o Test: decoding just part of string with evhttp_decode_uri_internal()
+     (1367653 Azat Khuzhin)
+   o Add new error_cb for actual reporting of HTTP request errors. (7b07719
+     Azat Khuzhin)
+   o Add test for EVREQ_HTTP_REQUEST_CANCEL into http_cancel_test() (862c217
+     Azat Khuzhin)
+   o Drop extra header http_struct.h from regress_http.c (54cc800 Azat Khuzhin)
+
+ Testing
+   o Add regress test ipv6_for_domain. (9ec88bd Azat Khuzhin)
+   o Add an environment variable (EVENT_DEBUG_MODE) to run unit tests in debug
+     mode (2fad0f3)
+   o Add a test with an active_later event at event_base_free time. (1c3147f)
+   o Make all tests pass under EVENT_DEBUG_MODE=1 (b1b054f)
+   o Add some verbose notes to bufferevent unit tests (9d893c9)
+   o New test for active_later->active transition on event_active (a153874)
+   o New tests for event_base_foreach_event() (0b096ef)
+   o Unit tests for event_base_gettimeofday_cached() and
+     event_base_update_cache_time() (30ea291)
+   o A test for event_get_assignment() (f09629e)
+   o More unit tests for initializing common timeouts. (d596739)
+   o Fix a bug in the new main/event_foreach test (702c9aa)
+
+ Windows:
+   o use FormatMessage for winsock errors (0c6ec5d, 2078e9b, 4ccdd53, c9ad3af
+     Patrick Pelletier)
+   o a program to print out the error strings for winsock errors (7296512
+     Patrick Pelletier)
+   o Fix a warning introduced in 0c6ec5d8 (eeb700c)
+   o Fix another warning introduced in 0c6ec5d8 (ed26561)
+
+ Examples (http)
+   o Add sample/https-client.c, an example of stacking evhttp as a client on
+     top of bufferevent_ssl. (be46c99 Catalin Patulea)
+   o use ${OPENSSL_LIBS} instead of -lssl -lcrypto (bf31fa5 Patrick Pelletier)
+   o https-client was putting newlines at 256-byte boundaries (42d7441 Patrick
+     Pelletier)
+   o better handling of OpenSSL errors (5754d96 Patrick Pelletier)
+   o use Debian's default root certificate location (aacd674 Patrick Pelletier)
+   o use iSECPartners code to validate hostname in certificate (64d9f16
+     Patrick Pelletier)
+   o avoid sign mismatch warning in openssl_hostname_validation.c (6021cb5
+     Patrick Pelletier)
+   o pull in wildcard matching code from cURL (4db9da6 Patrick Pelletier)
+   o Another tweak to https-client.c (95acdaa)
+   o Remove http_struct.h usage in sample/https-client.c (8a90a85)
+
+
+
+Changes in version 2.1.2-alpha (18 Nov 2012)
+
+ Libevent 2.1.2-alpha includes more portable for monotonic timers,
+ refactors much of Libevent's internal and external infrastructure,
+ closes some longstanding gaps in the interface, makde other
+ improvements.  Ths log below tries to organize features by rough area of
+ effect.  It omits a few commits which were pure bugfixes on other commits
+ listed below.  For more detail, see the git changelogs.  For more
+ insight, see the "whatsnew-2.1.txt" document included in the Libevent
+ 2.1.2-alpha distribution.
+
+ Libevent 2.1.2-alpha also includes all changes made in 2.0.19-stable
+ through 2.0.21-stable inclusive.
+
+ Performance (core):
+   o Replace pipe-based notification with EVFILT_USER where possible. This
+     should make multithreaded programs on OSX and *BSD alert the main thread a
+     little faster. (53a07fe)
+   o Make th_base_lock nonrecursive. (9cd5acb)
+
+ New/Changed API Functions:
+   o New event_get_priority() function to return an event's priority (f90e255)
+   o Add a bufferevent_get_priority() function (bd39554)
+   o Add an event_base_loopcontinue() to tell Libevent to rescan for more
+     events right away (7d6aa5e)
+   o Add a new callback to get called on evbuffer_file_segment free
+     (e9f8feb yangacer, 64051b9)
+   o Expose event_base_foreach_event() as a public API. (84fd6d7 Roman
+      Puls, 232055e, ffe1643)
+   o Add an event_remove_timer() to remove timer on an event without
+     deleting it (e3b2e08)
+   o Make bufferevent_set_timeouts(bev, NULL, NULL) have plausible
+     semantics (9dee36b)
+   o Rename event_enable_lock_debuging() to ..._debugging(). (The old name
+     should still work.) (07e132e)
+   o Add missing implementation for event_enable_debug_logging (3b3e21d)
+
+ PORTABLE MONOTONIC TIMERS:
+
+   Libevent 2.1.2 includes internal support for monotonic timers on
+   (nearly) all supported platforms, including Windows, and OSX.  Libevent
+   applications should now be more resilient to jumps forwards or backwards
+   in the system clock.  Also, on Linux systems with epoll, we now
+   optionally support microsecond-level timeouts (whereas epoll only
+   supports millisecond-precision timeouts).
+
+   o Use mach_absolute_time() for monotonic clock support on OSX. (b8fd6f9)
+   o Do not track use_monotonic field when is no monotonic clock (cb653a0)
+   o EVENT_BASE_FLAG_PRECISE_TIMER indicates we want fine timer precision
+     (ddd69d3)
+   o On Linux, use CLOCK_MONOTONIC_COARSE by default (55780a7)
+   o Implement a GetTickCount-based monotonic timer for Windows (d5e1d5a)
+   o Refactor monotonic timer handling into a new type and set of
+     functions; add a gettimeofday-based ratcheting implementation (f5e4eb0)
+   o Add EVENT_PRECISE_TIMER environment var for selecting precise-but-slow
+     timer (a2598ec)
+   o Implement fast/precise monotonic clocks on Windows (2c47045)
+   o Simple unit tests for monotonic timers (630f077)
+   o Improve the monotonic-time unit test: make it check the step size (7428c78)
+   o When PRECISE_TIMERS is set with epoll, use timerfd for microsecond
+     precision (26c7582)
+   o Split out time-related evutil functions into a new evutil_time.c (c419485)
+   o Split out time-related prototypes into time-internal.h (71bca50)
+   o Add evutil_time.obj to Makefile.nmake (0ba0683)
+   o Avoid giving a spurious warning when timerfd support is unavailable
+     (1aaf9f0 Dave Hart)
+   o Make test_evutil_monotonic a little more tolerant (def3b83)
+   o Avoid unused-var warning on systems with clock_gettime but without
+     CLOCK_MONOTONIC_COARSE (9be5468)
+
+EVENT_BASE_ONCE LEAKS:
+   If a callback added by event_base_once() is never invoked, Libevent no
+   longer leaks internal memory.
+
+   o Free dangling event_once objects on event_base_free() (c17dd59)
+   o Add a unit test in which an event is created with event_base_once()
+     but never fires (4343edf)
+
+TESTING SUPPORT, FIXES AND IMPROVEMENTS:
+
+   Libevent now disables by default its unit tests that would touch the
+   network, or that tend to fail on heavily-loaded systems.  To re-enable
+   them, invoke the ./test/regress program with the @all alias.
+
+   o Simplify test.sh code significantly. (9b856fd Ross Lagerwall)
+   o Make all tests that hit the network disabled by default (f2cea87)
+   o Avoid a resource leak on error in http client benchmark (ea92fba)
+   o Update to latest tinytest (911b4f0349377) (ef7c4f7)
+   o Avoid (unlikely) overflow in bench_httpclient.c (5671033)
+   o Shave 700 msec off the persistent_timeout_jump test (21205b8)
+   o Check return value of write() in regress.c (c8009d2)
+   o Make load-dependent monotonic timer tests off-by-default (2b6fe8b)
+   o Add deferred_cb_skew to list of timing-dependent tests (34c8f31)
+   o Avoid test -e; older shs don't have one. (f1bd938)
+   o Fix renegotiation test to work around openssl 1.0.1 bug (c2f3086)
+   o Fix a couple of compile warnings in the unit tests (5a9a014)
+
+MISC:
+   o Change evutil_weakrand_() to avoid platform random() (e86af4b Nicholas
+     Marriott, 3aa4415)
+
+INFRASTRUCTURE (Active-later events):
+   As a simplification and optimization to Libevent's "deferred callback"
+   logic (introduced in 2.0 to avoid callback recursion), Libevent now
+   treats all of its deferrable callback types using the same logic it uses
+   for active events.  Now deferred events no longer cause priority
+   inversion, no longer require special code to cancel them, and so on.
+
+   o Refactor the callback part of an event into its own event_callback
+     type (cba59e5)
+   o Add "active later" event_callbacks to supersede deferred (745a63d)
+   o event_base_assert_ok: check value of event_active_count for
+     correctness (fec8bae)
+   o Replace deferred_cbs with event_callback-based implementation. (ae2b84b)
+   o Replace more deferred_cb names with event_callback (a4079aa)
+   o Give event_base_process_active a single exit path (581b5be)
+   o Restore our priority-inversion-prevention code with deferreds (c0e425a)
+   o Refactor event_persist_closure: raise and extract some common logic
+     (bec22b4)
+   o Remove the unused bits from EVLIST_ALL (9889a3d)
+||||||| merged common ancestors
+Changes in version 2.0.22-stable (?? Dec 2013)
+
+ (As of 3b77d62829c4393bda6f9105a5d3b73b48a64b71.)
+
+BUGFIXES (evhttp)
+ o fix #73 and fix http_connection_fail_test to catch it (crash fix) (b618204 Greg Hazel)
+ o Avoid racy bufferevent activation (5eb1788 Nate Rosenblum)
+
+BUGFIXES (compilation and portability)
+ o Fix compilation with WIN32_HAVE_CONDITION_VARIABLES enabled (7e45739)
+ o Fix missing AC_PROG_SED on older Autoconfs (9ab2b3f Tay Ray Chuan)
+ o Backport libevent to vanilla Autoconf 2.59 (as used in RHEL5) (74d4c44 Kevin Bowling)
+ o Use AC_CONFIG_HEADERS in place of AM_CONFIG_HEADERS for autmake 1.13 compat (817ea36)
+ o Rename configure.in to configure.ac to appease newer autoconfs (0c79787)
+ o Avoid using top_srcdir in TESTS: new automakes do not like this (a55514e)
+ o Use windows vsnprintf fixup logic on all windows environments (e826f19)
+ o Fix a compiler warning when checking for arc4random_buf linker breakage. (5cb3865)
+ o Fix another arc4random_buf-related warning (e64a2b0)
+
+BUGFIXES (resource leaks/lock errors on error)
+ o Avoid leaking fds on evconnlistener with no callback set (69db261)
+ o Avoid double-close on getsockname error in evutil_ersatz_socketpair (0a822a6)
+ o Fix a locking error in bufferevent_socket_get_dns_error. (0a5eb2e)
+ o libevent/win32_dealloc() : fix sizeof(pointer) vs sizeof(*pointer) (b8f5980 Frank Denis)
+
+BUGFIXES (miscellaneous)
+ o Avoid other RNG initialization FS reads when urandom file is specified (9695e9c, bb52471)
+ o Avoid redundant invocations of init_extension_functions for IOCP (3b77d62)
+
+BUFGIXES (evdns)
+ o Checking request nameserver for NULL, before using it. (5c710c0 Belobrov Andrey)
+ o Fix SEGFAULT after evdns_base_resume if no nameservers installed. (f8d7df8 Azat Khuzhin)
+
+BUGFIXES (evutil_secure_random)
+ o When we seed from /proc/sys/kernel/random/uuid, count it as success (e35b540)
+ o Document that arc4random is not a great cryptographic PRNG. (6e49696)
+ o Add evutil_secure_rng_set_urandom_device_file (2bbb5d7)
+ o Really remove RNG seeds from the stack (f5ced88)
+
+
+DOCUMENTATION FIXES
+ o Fix a mistake in evbuffer_remove() arguments in example http server code (c322c20 Gyepi Sam)
+ o Fix a typo in a comment in buffer.h. Spotted by Alt_F4 (773b0a5)
+
+
+
+Changes in version 2.0.21-stable (18 Nov 2012)
+BUGFIXES:
+ o ssl: Don't discard SSL read event when timeout and read come close together (576b29f)
+ o ssl: Stop looping in "consider_reading" if reading is suspended. (f719b8a Joachim Bauch)
+ o ssl: No need to reserve space if reading is suspended. (1acf2eb Joachim Bauch)
+ o dns: Avoid a memory-leak on OOM in evdns. (73e85dd, f2bff75 George Danchev)
+ o build: Use python2 rather than python (0eb0109 Ross Lagerwall)
+ o build: Compile without warnings on mingw64 (94866c2)
+ o build: Fix compilation on mingw64 with -DUSE_DEBUG (62bd2c4)
+ o build: Make rpcgen_wrapper.sh work on systems without a "python2" binary (f3009e4)
+ o iocp: Close IOCP listener socket on free when LEV_OPT_CLOSE_ON_FREE is set (cb853ea Juan Pablo Fernandez)
+ o core: Avoid crash when event_pending() called with no event_base set on event (e3cccf3)
+ o misc: remove stray 'x' so print_err will compile when uncommented (ac35650 Patrick Pelletier)
+ o tests: Fix renegotiation test to work around openssl 1.0.1 bug (c2f3086)
+ o tests: Warn when openssl version in unit test mismatches compiled version. (ac009f9)
+
+
+Changes in version 2.0.20-stable (23 Aug 2012)
+BUGFIXES:
+ o core: Make event_pending() threadsafe. (be7a95c Simon Liu)
+ o win32: avoid crash when waiting forever on zero fds. (160e58b)
+ o evhttp: Fix a memory leak on error in evhttp_uriencode (11c8b31)
+ o evbuffer: Avoid possible needless call to writev. Found by coverity. (6a4ec5c)
+ o evdns: memset sockaddr_in before using it. Found by coverity. (a1a0e67)
+ o evhttp: Check more setsockopt return values when binding sockets. Found by coverity (a0912e3)
+ o evdns: Avoid segfault on weird timeout during name lookup. (dc32077 Greg Hazel)
+ o bufferevent_ssl: Correctly invoke callbacks when a SSL bufferevent reads some and then blocks. (606ac43)
+
+
+PORTABILITY FIXES:
+ o check for arc4random_buf at runtime, on OS X (bff5f94 Greg Hazel)
+ o Correctly check for arc4random_buf (fcec3e8 Sebastian Hahn)
+ o Add explicit AC_PROG_SED to configure.in so all autoconfs will expose $(SED) (ca80ea6)
+
+BUILD FIXES:
+ o Add GCC annotations so that the vsprintf functions get checked properly (117e327)
+ o Fix an unused variable warning on *BSD. (c0720c1)
+
+UNIT TEST FIXES:
+ o Fix a couple of memory leaks (found with Valgrind). (3b2529a Ross Lagerwall)
+ o Remove deadcode in http regression tests. Found by coverity. (5553346)
+ o Fix possible uninitialized read in dns regression tests. Found by coverity. (2259777)
+ o Set umask before calling mkstemp in unit tests. Found by coverity (f1ce15d)
+ o Fix various check-after-dereference issues in unit tests: found by coverity (4f3732d)
+ o Fix resource leaks in the unit tests; found by coverity (270f279)
+ o Add some missing null checks to unit tests; found by coverity (f021c3d)
+ o Avoid more crashes/bad calls in unit tests; found by coverity (3cde5bf)
+ o Remove unused variable; spotted by coverity (6355b2a)
+ o Add checks to various return values in unit tests. Found by coverity (b9e7329)
+ o Move assignment outside tt_assert in ssl unit tests. Appeases coverity. (a2006c0)
+
+
+
+Changes in version 2.0.19-stable (3 May 2012)
+BUGFIXES (CORE):
+ o Refactor event_persist_closure: raise and extract some common logic (bec22b4)
+ o If time has jumped so we'd reschedule a periodic event in the past, schedule it for the future instead (dfd808c)
+ o If a higher-priority event becomes active, don't continue running events of the current priority. (2bfda40)
+
+BUGFIXES (SSL):
+ o Fixed potential double-readcb execution with openssl bufferevents. (4e62cd1 Mark Ellzey)
+
+BUGFIXES (DNS):
+ o Cancel a probe request when the server is freed, and ignore cancelled probe callbacks (94d2336 Greg Hazel)
+ o Remove redundant DNS_ERR_CANCEL check, move comment (46b8060 Greg Hazel)
+ o When retransmitting a timed-out DNS request, pick a fresh nameserver. (3d9e52a)
+
+DOCUMENTATION FIXES:
+ o Fix a typo in the bufferevent documentation (98e9119)
+ o Add missing ) to changelog; spotted by rransom (4c7ee6b)
+ o Fix the website URL in the readme (f775521)
+
+COMPILATION FIXES:
+ o Fix a compilation error with MSVC 2005 due to use of mode_t (336dcae)
+ o Configure with gcc older than 2.95 (4a6fd43 Sebastian Hahn)
+ o Generate event-config.h with a single sed script (30b6f88 Zack Weinberg)
+
+FORWARD-COMPATIBILITY:
+ o Backport: provide EVENT_LOG_* names, and deprecate _EVENT_LOG_* (d1a03b2)
+
+TESTING/DEBUGGING SUPPORT:
+ o dns-example.c can now take a resolv.conf file on the commandline (6610fa5)
+ o Make some evdns.c debug logs more verbose (d873d67)
+ o Work-around a stupid gcov-breaking bug in OSX 10.6 (b3887cd)
+
+
+
+Changes in version 2.0.18-stable (22 Mar 2012)
+BUGFIXES (core):
+ o Make uses of open() close-on-exec safe by introducing an internal evutil_open_closeonexec. (d2b5f72 Ross Lagerwall, 03dce42)
+
+BUGFIXES (kqueue):
+ o Properly zero the kevent in kq_setup_kevent() (c2c7b39 Sebastian Hahn)
+
+BUILD FIXES:
+ o Added OPENSSL_LDFLAGS env variable which is appended to SSL checks. (9278196 Mark Ellzey)
+ o Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD (2d67b63 Mark Ellzey)
+ o Don't do clang version detection when disabling some flags (083296b Sebastian Hahn)
+
+BUGFIXES (dns):
+ o Stop crashing in evdns when nameserver probes give a weird error (bec5068)
+
+
+Changes in version 2.0.17-stable (10 Feb 2012)
+
+BUGFIXES (core):
+ o Be absolutely sure to clear pncalls before leaving event_signal_closure (11f36a5)
+ o check for sysctl before we use it (358c745 Mike Frysinger)
+ o Remove bogus casts of socket to int before calling ev_callback (f032516)
+ o Make evconnlistener work around bug in older Linux when getting nmapped (ecfc720)
+ o Fix a list corruption bug when using event_reinit() with signals present (6e41cdc)
+ o Fix a fd leak in event_reinit() (3f18ad1)
+ o Do a memberwise comparison of threading function tables (c94a5f2 Nate R)
+ o Use C-style comments in C source files (for compatibility with compilers such as xlc on AIX). (d84d917 Greg Hewgill)
+ o Avoid crash when freeing event_iocp and using event_set_mem_functions (19715a6)
+ o In the kqueue backend, do not report EBADF as an EV_READ (5d7bfa1 Nicholas Marriott)
+
+BUGFIXES (evbuffer and bufferevents):
+ o Fix behavior of evbuffer_peek(buf,-1,NULL,NULL,0) (c986f23 Zack Weinberg)
+ o Loop on filtering SSL reads until we are blocked or exhausted. (5b4b812)
+
+BUGFIXES (evhttp):
+ o Force strict validation of HTTP version in response. (790f6b3 Catalin Patulea)
+
+BUGFIXES (evdns):
+ o evdns: fix a bug in circular-queue implementation (d6094b1)
+
+BUILD FIXES:
+ o Fix a silly compilation error with the sun compiler (1927776 Colin Watt)
+ o Suppress a gcc warning from ignoring fwrite return in http-sample.c (7206e8c)
+
+DOCUMENTATION FIXES:
+ o Slightly clarify evbuffer_peek documentation (7bbf6ca)
+ o Update copyright notices to 2012 (e49e289)
+
+NEW APIS:
+ o Backport evhttp_connection_get_bufferevent to Libevent 2.0 (da70fa7 Arno Bakker)
+
+TESTS AND TEST FIXES:
+ o Fix a race condition in the dns/bufferevent_connect_hostname test. (cba48c7)
+ o Add function to check referential integrity of an event_base (27737d5)
+ o Check event_base correctness at end of each unit test (3312b02)
+ o Workaround in the unit tests for an apparent epoll bug in Linux 3.2 (dab9187)
+ o Better workaround for Linux 3.2 edge-triggered epoll bug (9f9e259)
+
+Changes in version 2.0.16-stable (18 Nov 2011)
+BUGFIXES (core):
+ o More detailed message in case of libevent self-debugging failure. (9e6a4ef Leonid Evdokimov)
+ o epoll: close fd on alloc fail at initialization (1aee718 Jamie Iles)
+ o Fix compile warning from saying event2/*.h inside a comment (447b0ba)
+ o Warn when unable to construct base because of failing make_base_notifiable (4e797f3)
+ o Don't try to make notifiable event_base when no threading fns are configured (e787413)
+
+BUGFIXES (evbuffer):
+ o unit test for remove_buffer bug (90bd620 Greg Hazel)
+ o Fix an evbuffer crash in evbuffer_remove_buffer() (c37069c)
+
+BUGFIXES (bufferevent_openssl):
+ o Refactor amount-to-read calculations in buffervent_ssl consider_reading() (a186e73 Mark Ellzey)
+ o Move SSL rate-limit enforcement into bytes_to_read() (96c562f)
+ o Avoid spinning on OpenSSL reads (2aa036f Mark Ellzey)
+
+BUGFIXES (dns)
+ o Empty DNS reply with OK status is another way to say NODATA. (21a08d6 Leonid Evdokimov)
+
+TESTING:
+ o Tests for 94fba5b and f72e8f6 (d58c15e Leonid Evdokimov)
+ o Test for commit aff6ba1 (f7841bf Leonid Evdokimov)
+ o Style and comment tweaks for dns/leak* tests (5e42202)
+ o improve test to remove at least one buffer from src (7eb52eb Greg Hazel)
+
+DOCUMENTATION:
+ o Add note about evhttp_send_reply_end to its doxygen (724bfb5)
+ o Update copyright dates to 2011. (3c824bd)
+ o Fix typo in whatsnew-2.0.txt (674bc6a Mansour Moufid)
+ o Improve win32 behavior of dns-sample.c code (a3f320e Gisle Vanem)
+
+
+
+Changes in version 2.0.15-stable (12 Oct 2011)
+BUGFIXES (DNS):
+ o DNS: add ttl for negative answers using RFC 2308 idea. (f72e8f6 Leonid Evdokimov)
+ o Add DNS_ERR_NODATA error code to handle empty replies. (94fba5b Leonid Evdokimov)
+
+BUFGIXES (bufferevents and evbuffers):
+ o Make evbuffer callbacks get the right n_added value after evbuffer_add (1ef1f68 Alex)
+ o Prefer mmap to sendfile unless a DRAINS_TO_FD flag is set. Allows add_file to work with SSL. (0ba0af9)
+
+BUGFIXES (event loop):
+ o When a signal callback is activated to run multiple times, allow event_base_loopbreak to work even before they all have run. (4e8eb6a)
+
+DOCUMENTATION FIXES:
+ o Fix docstring in dns.h (2b6eae5 Leonid Evdokimov)
+ o refer to non-deprecated evdns functions in comments (ba5c27d Greg Hazel)
+
+BUILD AND TESTING FIXES:
+ o le-proxy and regress depend on openssl directly (9ae061a Sergey Avseyev)
+ o Use _SOURCES, not _sources, in sample/Makefile.am (7f82382)
+ o Fixed compiler warnings for unchecked read/write calls. (c3b62fd Mark Ellzey)
+ o Make write-checking fixes use tt_fail_perror (2b76847)
+ o Fix some "value never used" warnings with gcc 4.6.1 (39c0cf7)
+
+
+
+Changes in version 2.0.14-stable (31 Aug 2011)
+BUGFIXES (bufferevents and evbuffers):
+ o Propagate errors on the underlying bufferevent to the user. (4a34394 Joachim Bauch)
+ o Ignore OpenSSL deprecation warnings on OS X (5d1b255 Sebastian Hahn)
+ o Fix handling of group rate limits under 64 bytes of burst (6d5440e)
+ o Solaris sendfile: correctly detect amount of data sent (643922e Michael Herf)
+ o Make rate limiting work with common_timeout logic (5b18f13)
+ o clear read watermark on underlying bufferevent when creating filtering bev to fix potentially failing fragmented ssl handshakes (54f7e61 Joachim Bauch)
+
+BUGFIXES (IOCP):
+ o IOCP: don't launch reads or writes on an unconnected socket (495c227)
+ o Make IOCP rate-limiting group support stricter and less surprising. (a98da7b)
+ o Have test-ratelim.c support IOCP (0ff2c5a)
+ o Make overlapped reads result in evbuffer callbacks getting invoked (6acfbdd)
+ o Correctly terminate IO on an async bufferevent on bufferevent_free (e6af35d)
+
+BUGFIXES (other):
+ o Fix evsig_dealloc memory leak with debugging turned on. (9b724b2 Leonid Evdokimov)
+ o Fix request_finished memory leak with debugging turned on. (aff6ba1 Leonid Evdokimov)
+
+BUILD AND TESTING FIXES:
+ o Allow OS-neutral builds for platforms where some versions have arc4random_buf (b442302 Mitchell Livingston)
+ o Try to fix 'make distcheck' errors when building out-of-tree (04656ea Dave Hart)
+ o Clean up some problems identified by Coverity. (7c11e51 Harlan Stenn)
+
+
+Changes in version 2.0.13-stable (18 Jul 2011)
+BUGFIXES
+ o Avoid race-condition when initializing global locks (b683cae)
+ o Fix bug in SSL bufferevents backed by a bev with a write high-watermarks (e050703 Joachim Bauch)
+ o Speed up invoke_callbacks on evbuffers when there are no callbacks (f87f568 Mark Ellzey)
+ o Avoid a segfault when all methods are disabled or broken (27ce38b)
+ o Fix incorrect results from evbuffer_search_eol(EOL_LF) (4461f1a)
+ o Add some missing checks for mm_calloc failures (89d5e09)
+ o Replace an assertion for event_base_free(NULL) with a check-and-warn (09fe97d)
+ o Report kqueue ebadf, epipe, and eperm as EV_READ events (1fd34ab)
+ o Check if the `evhttp_new_object' function in `http.c' returns NULL. (446cc7a Mansour Moufid)
+ o Use the correct printf args when formatting size_t (3203f88)
+ o Complain if the caller tries to change threading cbs after setting them (cb6ecee)
+
+DOCUMENTATION FIXES AND IMPROVEMENTS
+ o Revise the event/evbuffer/bufferevent doxygen for clarity and accuracy (2888fac)
+ o Update Doxyfile to produce more useful output (aea0555)
+
+TEST FIXES
+ o Fix up test_evutil_snprintf (caf695a)
+ o Fix tinytest invocation from windows shell (57def34 Ed Day)
+
+BUILD FIXES
+ o Use AM_CPPFLAGS in sample/Makefile.am, not AM_CFLAGS (4a5c82d)
+ o Fix select.c compilation on systems with no NFDBITS (49d1136)
+ o Fix a few warnings on OpenBSD (8ee9f9c Nicholas Marriott)
+ o Don't break when building tests from git without python installed (b031adf)
+ o Don't install event_rpcgen.py when --disable-libevent-install is used (e23cda3 Harlan Stenn)
+ o Fix AIX build issue with TAILQ_FOREACH definition (e934096)
+
+
+Changes in version 2.0.12-stable (4 Jun 2011)
+BUGFIXES
+ o Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors (28317a0)
+ o Fix an assert-inducing fencepost bug in the select backend (d90149d)
+ o Fix failing http assertion introducd in commit 0d6622e (0848814 Kevin Ko)
+ o Fix a bug that prevented us from configuring IPv6 nameservers. (74760f1)
+ o Prevent size_t overflow in evhttp_htmlescape. (06c51cd Mansour Moufid)
+ o Added several checks for under/overflow conditions in evhttp_handle_chunked_read (a279272 Mark Ellzey)
+ o Added overflow checks in evhttp_read_body and evhttp_get_body (84560fc Mark Ellzey)
+
+DOCUMENTATION:
+ o Add missing words to EVLOOP_NONBLOCK documentation (9556a7d)
+
+BUILD FIXES
+ o libssl depends on libcrypto, not the other way around. (274dd03 Peter Rosin)
+ o Libtool brings in the dependencies of libevent_openssl.la automatically (7b819f2 Peter Rosin)
+ o Use OPENSSL_LIBS in Makefile.am (292092e Sebastian Hahn)
+ o Move the win32 detection in configure.in (ceb03b9 Sebastian Hahn)
+ o Correctly detect openssl on windows (6619385 Sebastian Hahn)
+ o Fix a compile warning with zlib 1.2.4 and 1.2.5 (5786b91 Sebastian Hahn)
+ o Fix compilation with GCC 2, which had no __builtin_expect (09d39a1 Dave Hart)
+ o Fix new warnings from GCC 4.6 (06a714f)
+ o Link with -lshell32 and -ladvapi32 on Win32. (86090ee Peter Rosin)
+ o Make the tests build when OpenSSL is not available. (07c41be Peter Rosin)
+ o Bring in the compile script from automake, if needed. (f3c7a4c Peter Rosin)
+ o MSVC does not provide S_ISDIR, so provide it manually. (70be7d1 Peter Rosin)
+ o unistd.h and sys/time.h might not exist. (fe93022 Peter Rosin)
+ o Make sure TINYTEST_LOCAL is defined when building tinytest.c (8fa030c Peter Rosin)
+ o Fix winsock2.h #include issues with MSVC (3d768dc Peter Rosin)
+ o Use evutil_gettimeofday instead of relying on the system gettimeofday. (0de87fe Peter Rosin)
+ o Always use evutil_snprintf, even if OS provides it (d1b2d11 Sebastian Hahn)
+ o InitializeCriticalSectionAndSpinCount requires _WIN32_WINNT >= 0x0403. (816115a Peter Rosin)
+ o cygwin: make it possible to build DLLs (d54d3fc)
+
+
+
+Changes in version 2.0.11-stable (27 Apr 2011)
+  [Autogenerated from the Git log, sorted and cleaned by hand.]
+BUGFIXES:
+ o Fix evport handling of POLLHUP and POLLERR (b42ce4b)
+ o Fix compilation on Windows with NDEBUG (cb8059d)
+ o Check for POLLERR, POLLHUP and POLLNVAL for Solaris event ports (0144886 Trond Norbye)
+ o Detect and handle more allocation failures. (666b096 Jardel Weyrich)
+ o Use event_err() only if the failure is truly unrecoverable. (3f8d22a Jardel Weyrich)
+ o Handle resize failures in the select backend better. (83e805a)
+ o Correctly free selectop fields when select_resize fails in select_init (0c0ec0b)
+ o Make --enable-gcc-warnings a no-op if not using gcc (3267703)
+ o Fix a type error in our (unused) arc4random_stir() (f736198)
+ o Correctly detect and stop non-chunked http requests when the body is too long (63a715e)
+ o Have event_base_gettimeofday_cached() always return wall-clock time (a459ef7)
+ o Workaround for http crash bug 3078187 (5dc5662 Tomash Brechko)
+ o Fix incorrect assertions and possible use-after-free in evrpc_free() (4b8f02f Christophe Fillot)
+ o Reset outgoing http connection when read data in idle state. (272823f Tomash Brechko)
+ o Fix subtle recursion in evhttp_connection_cb_cleanup(). (218cf19 Tomash Brechko)
+ o Fix the case when failed evhttp_make_request() leaved request in the queue. (0d6622e Tomash Brechko)
+ o Fix a crash bug in evdns server circular list code (00e91b3)
+ o Handle calloc failure in evdns. (Found by Dave Hart) (364291e)
+ o Fix a memory leak on win32 socket->event map. (b4f89f0)
+ o Add a forgotten NULL check to evhttp_parse_headers (12311ff Sebastian Hahn)
+ o Fix possible NULL-deref in evdns_cancel_request (5208544 Sebastian Hahn)
+
+PORTABILITY:
+ o Fall back to sscanf if we have no other way to implement strtoll (453317b)
+ o Build correctly on platforms without sockaddr_storage (9184563)
+ o Try to build correctly on platforms with no IPv6 support (713c254)
+ o Build on systems without AI_PASSIVE (cb92113)
+ o Fix http unit test on non-windows platforms without getaddrinfo (6092f12)
+ o Do not check for gethostbyname_r versions if we have getaddrinfo (c1260b0)
+ o Include arpa/inet.h as needed on HPUX (10c834c Harlan Stenn)
+ o Include util-internal.h as needed to build on platforms with no sockaddr_storage (bbf5515 Harlan Stenn)
+ o Check for getservbyname even if not on win32. (af08a94 Harlan Stenn)
+ o Add -D_OSF_SOURCE to fix hpux builds (0b33479 Harlan Stenn)
+ o Check for allocation failures in apply_socktype_protocol_hack (637d17a)
+ o Fix the check for multicast or broadcast addresses in evutil_check_interfaces (1a21d7b)
+ o Avoid a free(NULL) if out-of-memory in evdns_getaddrinfo. Found by Dave Hart (3417f68)
+
+DEFENSIVE PROGRAMMING:
+ o Add compile-time check for AF_UNSPEC==PF_UNSPEC (3c8f4e7)
+
+BUGS IN TESTS:
+ o Fix test.sh output on solaris (b4f89b6 Dave Hart)
+ o Make test-eof fail with a timeout if we never get an eof. (05a2c22 Harlan Stenn)
+ o Use %s with printf in test.sh (039b9bd)
+ o Add an assert to appease clang's static analyzer (b0ff7eb Sebastian Hahn)
+ o Add a forgotten return value check in the unit tests (3819b62 Sebastian Hahn)
+ o Actually send NULL request in http_bad_request_test (b693c32 Sebastian Hahn)
+ o add some (void) casts for unused variables (65707d7 Sebastian Hahn)
+ o Refactor test_getaddrinfo_async_cancel_stress() (48c44a6 Sebastian Hahn)
+ o Be nice and "handle" error return values in sample code (4bac793 Sebastian Hahn)
+ o Check return value of evbuffer_add_cb in tests (93a1abb Sebastian Hahn)
+ o Remote some dead code from dns-example.c (744c745 Sebastian Hahn)
+ o Zero a struct sockaddr_in before using it (646f9fe Sebastian Hahn)
+
+BUILD FIXES:
+ o Fix warnings about AC_LANG_PROGRAM usage (f663112 Sebastian Hahn)
+ o Skip check for zlib if we have no zlib.h (a317c06 Harlan Stenn)
+ o Fix autoconf bracket issues; make check for getaddrinfo include netdb.h (833e5e9 Harlan Stenn)
+ o Correct an AM_CFLAGS to an AM_CPPFLAGS in test/Makefile.am (9c469db Dave Hart)
+ o Fix make distcheck & installation of libevent 1 headers (b5a1f9f Dave Hart)
+ o Fix compilation under LLVM/clang with --enable-gcc-warnings (ad9ff58 Sebastian Hahn)
+
+FEATURES:
+ o Make URI parser able to tolerate nonconformant URIs. (95060b5)
+
+DOCUMENTATION:
+ o Clarify event_set_mem_functions doc (926f816)
+ o Correct evhttp_del_accept_socket documentation on whether socket is closed (f665924)
+ o fix spelling mistake in whatsnew-2.0.txt (deb2f73)
+ o Fix sample/http-server ipv6 fixes (eb692be)
+ o Comment internal headers used in sample code. (4eb281c)
+ o Be explicit about how long event loops run in event.h documentation (f95bafb)
+ o Add comment to configure.in to explain gc-sections test logic (c621359)
+ o Fix a couple of memory leaks in samples/http-server.c. Found by Dave Hart. (2e9f665)
+
+
+
+BUILD IMPROVEMENTS:
+ Libevent 2.1.2-alpha modernizes Libevent's use of autotools, and makes
+ numerous other build system. Parallel builds should be faster, and all
+ builds should be quieter.
+
+   o Split long lists in Makefile.am into one-item-per-line (2711cda)
+   o Remove unnecessary code in configure.in. (e65914f Ross Lagerwall)
+   o attempt to support OpenSSL in Makefile.nmake (eba0eb2 Patrick Pelletier)
+   o Use newer syntax for autoconf/automake init (7d60ba8)
+   o Enable silent build rules by default. Override with V=1 (7b18e5c)
+   o Switch to non-recursive makefiles (7092f3b)
+   o Rename subordinate Makefile.ams to include.am (6cdfeeb)
+   o Make quiet build even quieter (371a123)
+   o New --quiet option for event_rpcgen.py (aa59c1e)
+   o Be quiet when making regress.gen.[ch] (607a8ff)
+   o Fix handling of no-python case for nonrecursive make (1e3123d)
+   o We now require automake 1.9 or later. Modernize! (b7f6e89)
+   o Rename configure.in to configure.ac. (b3fea67 Ross Lagerwall)
+   o Use correct openssl libs and includes in pkgconfig file (d70af27)
+   o Use the same CFLAGS for openssl when building unit tests as with
+     libevent (1d9d511)
+
+DOCUMENTATION
+   o Note that make_base_notifiable should not be necessary (26ee5f9)
+   o Be more clear that LEV_OPT_DEFERRED_ACCEPT has tricky prereqs (371efeb)
+   o Add caveat to docs about bufferevent_free() with data in outbuf (6fab9ee)
+   o Make it more clear that NOLOCK means "I promise, no multithreading"
+    (9444524)
+   o Fix a comment in test-fdleak after 077c7e949. (3881d8f Ross Lagerwall)
+   o Make the Makefile.nmake warning slightly less dire (e7bf4c8)
+   o Fix typo : events instead of evets (05f1aca Azat Khuzhin)
+   o Additional comments about OPENSSL_DIR variable, prompted by Dave Hart
+     (6bde2ef Patrick Pelletier)
+
+EVHTTP:
+   o ignore LWS after field-content in headers (370a2c0 Artem Germanov)
+   o Clean up rtrim implementation (aa59d80)
+   o Remove trailing tabs in HTTP headers as well. (ac42519)
+   o Remove internal ws from multiline http headers correctly (c6ff381)
+   o Move evutil_rtrim_lws_ to evutil.c where it belongs (61b93af)
+   o add evhttp_request_get_response_code_line (4f4d0c9 Jay R. Wren)
+   o Use EVUTIL_SOCKET_ERROR() wrapper to save/restore errno in
+     evhttp_connection_fail_ (7afbd60)
+   o preserve errno in evhttp_connection_fail_ for inspection by the
+     callback (36d0ee5 Patrick Pelletier)
+
+BUGFIXES:
+   o Correctly handle running on a system where accept4 doesn't work. (9fbfe9b)
+   o Avoid double-free on error in evbuffer_add_file. Found by
+     coverity. (6a81b1f)
+   o Fix another possible uninitialized read in dns regression tests. Found
+     by coverity. (13525c5)
+   o Add checks for functions in test-ratelim.c; found by Coverity (aa501e1)
+   o Avoid memory leak in test_event_calloc unit test; found by coverity
+     (92817a1)
+   o Fix a shadowed variable in addfile_test_readcb; found by coverity
+     (225344c)
+   o Check return value when using LEV_OPT_DEFERRED_ACCEPT. Found by
+     coverity (6487f63)
+   o Prevent reference leak of bufferevent if getaddrinfo fails. (b757786
+     Joachim Bauch)
+   o Make event_base_getnpriorities work with old "implicit base" code
+     (c46cb9c)
+   o Simplify and correct evutil_open_closeonexec_ (0de587f)
+   o Fix event_dlist definition when sys/queue not included (81b6209
+     Derrick Pallas)
+
+
+
+Changes in version 2.1.1-alpha (4 Apr 2012)
+
+ Libevent 2.1.1-alpha includes a number of new features and performance
+ improvements.  The log below tries to organize them by rough area of
+ effect.  It omits some commits which were pure bugfixes on other commits
+ listed below.  For more detail, see the git changelogs.  For more
+ insight, see the "whatsnew-2.1.txt" document included in the Libevent
+ 2.1.1-alpha distribution.
+
+ Performance: Core
+   o Replace several TAILQ users with LIST. LIST can be a little faster than
+     TAILQ for cases where we don't need queue-like behavior. (f9db33d,
+     6494772, d313c29, 974d004)
+   o Disabled code to optimize the case where we reinsert an existing
+     timeout (e47042f, 09cbc3d)
+   o Remove a needless base-notify when rescheduling the first timeout (77a96fd)
+   o Save a needless comparison when removing/adjusting timeouts (dd5189b)
+   o Possible optimization: split event_queue_insert/remove into
+     separate functions. needs testing (efc4dc5)
+   o Make event_count maintenance branchless at the expense of an
+     extra shift. Needs benchmarking (d1cee3b)
+   o In the 2.1 branch, let's try out lazy gettimeofday/clock_gettime
+     comparison (2a83ecc)
+   o Optimization in event_process_active(): ignore maxcb & endtime
+     for highest priority events. (a9866aa Alexander Drozdov)
+   o Bypass event_add when using event_base_once() for a 0-sec timeout (35c5c95)
+   o Remove the eventqueue list and the ev_next pointers. (604569b 066775e)
+
+ Performance: Evbuffers
+   o Roughly 20% speed increase when line-draining a buffer using
+     EVBUFFER_EOL_CRLF (5dde0f0 Mina Naguib)
+   o Try to squeeze a little more speed out of EVBUFFER_EOL_CRLF (7b9d139)
+   o Fix a bug in the improved EOL_CRLF code (d927965)
+   o Remove a needless branch in evbuffer_drain() (d19a326)
+
+ Performance: Linux
+   o Infrastructure for using faster/fewer syscalls when creating
+     sockets (a1c042b)
+   o Minimize syscalls during socket creation in listener.c (7e9e289)
+   o Use a wrapper function to create the notification
+     pipe/socketpair/eventfd (ca76cd9)
+   o Use pipes for telling signals to main thread when possible (a35f396)
+   o Save syscalls when constructing listener sockets for evhttp (af6c9d8)
+   o Save some syscalls when creating evdns sockets (713e570)
+   o Save some syscalls when constructing a socket for a bufferevent (33fca62)
+   o Prefer epoll_create1 on Linuxen that have it (bac906c)
+
+ Performance: Epoll backend
+   o Use current event set rather than current pending change when
+     deciding whether to no-op a del (04ba27e Mike Smellie)
+   o Replace big chain of if/thens in epoll.c with a table lookup (8c83eb6)
+   o Clean up error handling in epoll_apply_one_change() a little (2d55a19)
+
+ Performance: Evport backend
+   o evport: use evmap_io to track fdinfo status. Should save time and
+     RAM. (4687ce4)
+   o evport: Remove a linear search over recent events when
+     reactivating them (0f77efe)
+   o evport: Use portev_user to remember fdinfo struct (276ec0e)
+   o evport: don't scan more events in ed_pending than needed (849a5cf)
+   o evport: Remove artificial low limit on max events per getn call (c04d927)
+   o Reenable main/many_events_slow_add for evport in 2.1 (e903db3)
+
+ Performance: Windows
+   o Use GetSystemTimeAsFileTime to implement gettimeofday on
+     win32. It's faster and more accurate than our old
+     approach. (b8b8aa5)
+
+ New functions and features: debugging
+   o Add event_enable_debug_logging() to control use of debug logs (e30a82f)
+
+ New functions and features: core
+   o Add event_config function to limit time/callbacks between calls
+     to dispatch (fd4de1e, 9fa56bd, a37a0c0, 3c63edd)
+   o New EVLOOP_NO_EXIT_ON_EMPTY option to keep looping even when no
+     events are pending (084e68f)
+   o Add event_base_get_npriorities() function. (ee3a4ee Alexander Drozdov)
+   o Make evbase_priority_init() and evbase_get_npriorities()
+     threadsafe (3c55b5e)
+   o New event_base_update_cache_time() to set cached_tv to current
+     time (212533e Abel Mathew)
+   o Add event_self_cbarg() to be used in conjunction with
+     event_new(). (ed36e6a Ross Lagerwall, fa931bb, 09a1906, 1338e6c,
+     33e43ef)
+   o Add a new libevent_global_shutdown() to free all globals before
+     exiting. (041ca00 Mark Ellzey, f98c158, 15296d0, 55e991b)
+   o Use getifaddrs to detect our interfaces if possible (7085a45)
+   o Add event_base_get_running_event() to get the event* whose cb we
+     are in (c5732fd, 13dad99)
+
+ New functions and features: building
+   o Implement --enable-gcc-hardening configure option (7550267 Sebastian Hahn)
+
+ New functions and features: evbuffers
+   o Add evbuffer_add_file_segment() so one fd can be used efficiently
+     in more than one evbuffer_add_file at a time (e72afae, c2d9884,
+     3f405d2, 0aad014)
+   o Fix windows file segment mappings (8254de7)
+   o Allow evbuffer_ptr_set to yield a point just after the end of the
+     buffer. (e6fe1da)
+   o Allow evbuffer_ptr to point to position 0 in an empty evbuffer
+     (7aeb2fd Nir Soffer)
+   o Set the special "not found" evbuffer_ptr consistently. (e3e97ae Nir Soffer)
+   o support adding buffers to other buffers non-destructively
+     (9d7368a Joachim Bauch)
+   o prevent nested multicast references, reworked locking (26041a8
+     Joachim Bauch)
+   o New EVBUFFER_EOL_NUL to read NUL-terminated strings from an
+     evbuffer (d7a8b36 Andrea Montefusco, 54142c9)
+   o Make evbuffer_file_segment_types adaptable (c6bbbf1)
+   o Added evbuffer_add_iovec and unit tests. (aaec5ac Mark Ellzey, 27b5398)
+   o Add evbuffer_copyout_from to copy data from the middle of a
+     buffer (27e2225)
+
+ New functions and features: bufferevents
+   o Allow users to set allow_dirty_shutdown (099d27d Catalin Patulea)
+   o Tweak allow_dirty_shutdown documentation (a44cd2b)
+   o Fix two issues in the allow_dirty_shutdown code. (f3b89de)
+   o Add a bufferevent_getcb() to find a bufferevent's current
+     callbacks (a650394)
+   o bufferevent: Add functions to set/get max_single_read/write
+     values. (998c813 Alexander Drozdov)
+   o bev_ssl: Be more specific in event callbacks. evhttp in particular gets
+     confused without at least one of BEV_EVENT_{READING|WRITING}. (f7eb69a
+     Catalin Patulea)
+
+ New functions and features: evconnlisteners
+   o Support TCP_DEFER_ACCEPT sockopts for listeners (5880e4a Mark Ellzey,
+     a270728)
+   o Add another caveat to the TCP_DEFER_ACCEPT documentation (a270728)
+   o Allow evconnlistener to be created in disabled state. (9593a33
+     Alexander Drozdov)
+   o The LEV_OPT_CLOSE_ON_EXEC flag now applies to accepted listener
+     sockets too (4970329)
+
+ Evhttp:
+   o Add new evhttp_{connection_}set_timeout_tv() functions to set
+     finger-grained http timeouts (6350e6c Constantine Verutin)
+   o Performance tweak to evhttp_parse_request_line. (aee1a97 Mark Ellzey)
+   o Add missing break to evhttp_parse_request_line (0fcc536)
+   o Add evhttp callback for bufferevent creation; this lets evhttp
+     support SSL. (8d3a850)
+   o Remove calls to deprecated bufferevent functions from evhttp.c (4d63758)
+   o evhttp: Add evhttp_foreach_bound_socket. (a2c48e3 Samy Al Bahra)
+
+ Build improvements:
+   o Add AC_USE_SYSTEM_EXTENSIONS to configure.in. Requires follow on
+     patches for correctness and robustness. (1fa7dbe Kevin Bowling)
+   o Filter '# define' statements from autoconf and generate
+     event-private.h (321b558 Kevin Bowling)
+   o Remove internal usage of _GNU_SOURCE (3b26541 Kevin Bowling)
+   o Eliminate a couple more manual internal _GNU_SOURCE defines (c51ef93
+     Kevin Bowling)
+   o Add AC_GNU_SOURCE to the fallback case. (ea8fa4c Kevin Bowling)
+   o Use a Configuration Header Template for evconfig-private.h (868f888
+     Kevin Bowling)
+   o Fix a comment warning and add evconfig-private.h to .gitignore
+     (f6d66bc Kevin Bowling)
+   o Include evconfig-private.h in internal files for great good. (0915ca0
+     Kevin Bowling)
+   o Backport libevent to vanilla Autoconf 2.59 (as used in RHEL5)
+     (ad03952 Kevin Bowling)
+   o Prefer the ./configure evconfig-private.h in MinGW, just in
+     case. (f964b72 Kevin Bowling)
+   o Shell hack for weird mkdir -p commands (fd7b5a8 Kevin Bowling)
+   o Add evconfig-private to remaining files (ded0a09 Kevin Bowling)
+   o Allow use of --enable-silent-rules for quieter compilation with
+     automake 1.11 (f1f8514 Dave Hart)
+   o Use "_WIN32", not WIN32: it's standard and we don't need to fake it
+     (9f560b)
+   o In configure, test for _WIN32 not WIN32. (85078b1 Peter Rosin)
+   o Do not define WIN32 in Makefile.nmake (d41f3ea Peter Rosin)
+   o Provide the autoconf m4 macros for the new OpenSSL via pkg-config
+     stuff. (674dc3d Harlan Stenn)
+   o Use pkg-config (if available) to handle OpenSSL. (1c63860 Harlan Stenn)
+   o We need AM_CPPFLAGS when compiling bufferevent_openssl.c (6d2613b
+     Harlan Stenn)
+   o Fix OSX build: $(OPENSSL_INCS) needs to be after
+     $(AM_CPPFLAGS). (46f1769 Zack Weinberg)
+   o Make gcc warnings on by default, and --enable-gcc-warnings only add
+     -Werror (d46517e Sebastian Hahn)
+   o Split up extra-long AC_CHECK_FUNCS/HEADERS lines in configure.in (88a30ad)
+   o Move libevent 1.x headers to include/, to put all public headers in
+     one place. (bbea8d6)
+   o Put #ifdef around some files to support alternate build
+     systems. (76d4c92 Ross Lagerwall)
+   o Also make win32select.c conditional for IDE users (bf2c5a7)
+
+ Debugging:
+   o Add a magic number to debug_locks to better catch lock-coding
+     errors. (b4a29c0 Dave Hart)
+   o munge the debug_lock signature before freeing it: it might help us
+     catch use-after-free (f28084d)
+   o Added --enable-event-debugging in configure (bc7b4e4, a9c2c9a Mark Ellzey)
+   o Debug addition for printing usec on TIMEOUT debugging. (ac43ce0 Mark Ellzey)
+   o Added usec debug in another area for debug (3baab0d Mark Ellzey)
+   o added timeout debug logs to include event ptr. (4b7d298 Mark Ellzey)
+   o more event dbg updates (6727543 Mark Ellzey)
+   o Clarify event_enable_debug_logging a little (6207826)
+   o Make --enable-verbose-debug option match its help text (10c3450)
+   o Add argument checks to some memory functions in `event.c'. (c8953d1
+     Mansour Moufid)
+
+ Testing:
+   o More abstraction in test.sh (cd74c4e)
+   o Add failing test for evbuffer_search_range. (8e26154 Nir Soffer)
+   o Tweaks to return types with end-of-buf ptrs (9ab8ab8)
+   o Add an (internal) usleep function for use by unit tests (f25d9d3)
+   o Synchronize with upstream tinytest (6c81be7)
+   o Make test-changelist faster (7622d26)
+   o Reduce the timeout in the main/fork test. (ab14f7c)
+   o New evhttp function to adjust initial retry timeout (350a3c4)
+   o Make regression tests run over 3x faster. (67a1763)
+   o Use test_timeval_diff_eq more consistently (b77b43f)
+   o Allow more slop in deferred_cb_skew test; freebsd needs it (b9f7e5f)
+   o When including an -internal.h header outside the main tree, do so
+     early (95e2455)
+   o Add a new test: test-fdleak which tests for fd leaks by creating many
+     sockets. (2ef9278 Ross Lagerwall, f7af194, 1c4288f, etc)
+   o Add a unit test for event_base_dump_events() (7afe48a, 8d08cce)
+   o Test more bufferevent_ratelim features (c24f91a)
+
+ Documentation:
+   o Improve evbuffer_ptr documentation (261ba63)
+   o added comments to describe refcounting of multicast chains (ba24f61
+     Joachim Bauch)
+   o Add doxygen for event_base_dump_events (cad5753)
+
+ OSX:
+   o Use "unlimited select" on OSX so that we can have more than
+     FD_SETSIZE fds (1fb5cc6)
+
+ KQueue:
+   o Use SIG_IGN instead of a do-nothing handler for signal events with
+     kqueue (148458e Zack Weinberg)
+
+ evprc:
+   o event_rpcgen.py now prints status information to stdout and errors to
+     stderr. (ffb0ba0 Ross Lagerwall)
+
+ Code improvement and refactoring:
+   o Make event_reinit() more robust and maintainable (272033e)
+   o Restore fast-path event_reinit() for slower backends (2c4b5de)
+   o Check changelist as part of checking representational integrity (39b3f38)
+   o Fix a compile warning in event_reinit (e4a56ed Sebastian Hahn)
+   o Refactor the functions that run over every event. (c89b4e6)
+   o Remove the last vestiges of _EVENT_USE_EVENTLIST (a3cec90)
+   o Make event-config.h depend on Makefile.am (2958a5c)
+
+ Build fixes:
+   o Don't do clang version detection when disabling some flags (083296b
+     Sebastian Hahn)
+
+ C standards conformance:
+   o Check for NULL return on win32 mm_calloc, and set ENOMEM. (af7ba69)
+   o Convert event-config.h macros to avoid reserved identifiers (68120d9)
+   o Generate event-config.h using the correct macros. (f82c57e)
+   o Convert include-guard macro convention to avoid reserved identifiers
+     (3f8c7cd)
+   o Make event_rpcgen.py output conform to identifier conventions (372bff1)
+   o Stop referring to an obsolete include guard in bench_http.h (5c0f7e0)
+   o Make the generated event-config.h use correct include guards (639383a)
+   o Fix all identifiers with names beginning with underscore. (cb9da0b)
+   o Make event_rpcgen.py output conform to identifier conventions, more
+     (bcefd24)
+   o Fix some problems introduced by automated identifier cleanup script
+     (c963534)
+   o Have all visible internal function names end with an underscore. (8ac3c4c)
+   o Apply the naming convention to our EVUTIL_IS* functions (c7848fa)
+   o Clean up lingering _identifiers. (946b584)
+   o Fix doxygen to use new macro conventions (da455e9)
+
+ Bugfixes:
+   o Do not use system EAI/AI values if we are not using the system
+     getaddrinfo. (7bcac07)
+
+ Sample Code:
+   o Fix up sample/event-test.c to use newer interfaces and make it
+     actually work. (19bab4f Ross Lagerwall)
+   o On Unix, remove event.fifo left by sample/event-test.c. (c0dacd2 Ross
+     Lagerwall)
+   o Rename event-test.c to event-read-fifo.c. (a5b370a Ross Lagerwall)
+   o event-read-fifo: Use EV_PERSIST appropriately (24dab0b)
+
+
+
+
diff --git a/extra/libevent/libevent-2.1.11-stable/ChangeLog-1.4 b/extra/libevent/libevent-2.1.11-stable/ChangeLog-1.4
new file mode 100644
index 000000000000..d7f6517b2b92
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ChangeLog-1.4
@@ -0,0 +1,231 @@
+Changes in 1.4.14b-stable
+ o Set the VERSION_INFO correctly for 1.4.14
+
+Changes in 1.4.14-stable
+ o Add a .gitignore file for the 1.4 branch. (d014edb)
+ o Backport evbuffer_readln(). (b04cc60 Nicholas Marriott)
+ o Make the evbuffer_readln backport follow the current API (c545485)
+ o Valgrind fix: Clear struct kevent before checking for OSX bug. (5713d5d William Ahern)
+ o Fix a crash when reading badly formatted resolve.conf (5b10d00 Yasuoka Masahiko)
+ o Fix memory-leak of signal handler array with kqueue. [backport] (01f3775)
+ o Update sample/signal-test.c to use newer APIs and not leak. (891765c Evan Jones)
+ o Correct all versions in 1.4 branch (ac0d213)
+ o Make evutil_make_socket_nonblocking() leave any other flags alone. (81c26ba Jardel Weyrich)
+ o Adjusted fcntl() retval comparison on evutil_make_socket_nonblocking(). (5f2e250 Jardel Weyrich)
+ o Correct a debug message in evhttp_parse_request_line (35df59e)
+ o Merge branch 'readln-backport' into patches-1.4 (8771d5b)
+ o Do not send an HTTP error when we've already closed or responded. (4fd2dd9 Pavel Plesov)
+ o Re-add event_siglcb; some old code _was_ still using it. :( (bd03d06)
+ o Make Libevent 1.4 build on win32 with Unicode enabled. (bce58d6 Brodie Thiesfield)
+ o Distribute nmake makefile for 1.4 (20d706d)
+ o do not fail while sending on http connections the client closed. (5c8b446)
+ o make evhttp_send() safe against terminated connections, too (01ea0c5)
+ o Fix a free(NULL) in min_heap.h (2458934)
+ o Fix memory leak when setting up priorities; reported by Alexander Drozdov (cb1a722)
+ o Clean up properly when adding a signal handler fails. (ae6ece0 Gilad Benjamini)
+ o Do not abort HTTP requests missing a reason string. (29d7b32 Pierre Phaneuf)
+ o Fix compile warning in http.c (906d573)
+ o Define _REENTRANT as needed on Solaris, elsewhere (6cbea13)
+
+
+Changes in 1.4.13-stable:
+ o If the kernel tells us that there are a negative number of bytes to read from a socket, do not believe it.  Fixes bug 2841177; found by Alexander Pronchenkov.
+ o Do not allocate the maximum event queue and fd array for the epoll backend at startup.  Instead, start out accepting 32 events at a time, and double the queue's size when it seems that the OS is generating events faster than we're requesting them.  Saves up to 512K per epoll-based event_base.  Resolves bug 2839240.
+ o Fix compilation on Android, which forgot to define fd_mask in its sys/select.h
+ o Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec
+ o Rename our replacement compat/sys/_time.h header to avoid build a conflict on HPUX; reported by Kathryn Hogg.
+ o Build kqueue.c correctly on GNU/kFreeBSD platforms. Patch pulled upstream from Debian.
+ o Fix a problem with excessive memory allocation when using multiple event priorities.
+ o When running set[ug]id, don't check the environment. Based on a patch from OpenBSD.
+
+
+Changes in 1.4.12-stable:
+ o Try to contain degree of failure when running on a win32 version so heavily firewalled that we can't fake a socketpair.
+ o Fix an obscure timing-dependent, allocator-dependent crash in the evdns code.
+ o Use __VA_ARGS__ syntax for varargs macros in event_rpcgen when compiler is not GCC.
+ o Activate fd events in a pseudorandom order with O(N) backends, so that we don't systematically favor low fds (select) or earlier-added fds (poll, win32).
+ o Fix another pair of fencepost bugs in epoll.c.  [Patch from Adam Langley.]
+ o Do not break evdns connections to nameservers when our IP changes.
+ o Set truncated flag correctly in evdns server replies.
+ o Disable strict aliasing with GCC: our code is not compliant with it.
+
+Changes in 1.4.11-stable:
+ o Fix a bug when removing a timeout from the heap. [Patch from Marko Kreen]
+ o Remove the limit on size of HTTP headers by removing static buffers.
+ o Fix a nasty dangling pointer bug in epoll.c that could occur after epoll_recalc(). [Patch from Kevin Springborn]
+ o Distribute Win32-Code/event-config.h, not ./event-config.h
+
+Changes in 1.4.10-stable:
+ o clean up buffered http connection data on reset; reported by Brian O'Kelley
+ o bug fix and potential race condition in signal handling; from Alexander Drozdov
+ o rename the Solaris event ports backend to evport
+ o support compilation on Haiku
+ o fix signal processing when a signal callback delivers a signal; from Alexander Drozdov
+ o const-ify some arguments to evdns functions.
+ o off-by-one error in epoll_recalc; reported by Victor Goya
+ o include Doxyfile in tar ball; from Jeff Garzik
+ o correctly parse queries with encoded \r, \n or + characters
+
+Changes in 1.4.9-stable:
+ o event_add would not return error for some backends; from Dean McNamee
+ o Clear the timer cache on entering the event loop; reported by Victor Chang
+ o Only bind the socket on connect when a local address has been provided; reported by Alejo Sanchez
+ o Allow setting of local port for evhttp connections to support millions of connections from a single system; from Richard Jones.
+ o Clear the timer cache when leaving the event loop; reported by Robin Haberkorn
+ o Fix a typo in setting the global event base; reported by lance.
+ o Fix a memory leak when reading multi-line headers
+ o Fix a memory leak by not running explicit close detection for server connections
+
+Changes in 1.4.8-stable:
+ o Match the query in DNS replies to the query in the request; from Vsevolod Stakhov.
+ o Fix a merge problem in which name_from_addr returned pointers to the stack; found by Jiang Hong.
+ o Do not remove Accept-Encoding header
+	
+Changes in 1.4.7-stable:
+ o Fix a bug where headers arriving in multiple packets were not parsed; fix from Jiang Hong; test by me.
+	
+Changes in 1.4.6-stable:
+ o evutil.h now includes <stdarg.h> directly
+ o switch all uses of [v]snprintf over to evutil
+ o Correct handling of trailing headers in chunked replies; from Scott Lamb.
+ o Support multi-line HTTP headers; based on a patch from Moshe Litvin
+ o Reject negative Content-Length headers; anonymous bug report
+ o Detect CLOCK_MONOTONIC at runtime for evdns; anonymous bug report	
+ o Fix a bug where deleting signals with the kqueue backend would cause subsequent adds to fail
+ o Support multiple events listening on the same signal; make signals regular events that go on the same event queue; problem report by Alexander Drozdov.
+ o Deal with evbuffer_read() returning -1 on EINTR|EAGAIN; from Adam Langley.
+ o Fix a bug in which the DNS server would incorrectly set the type of a cname reply to a.
+ o Fix a bug where setting the timeout on a bufferevent would take not effect if the event was already pending.
+ o Fix a memory leak when using signals for some event bases; reported by Alexander Drozdov.
+ o Add libevent.vcproj file to distribution to help with Windows build.
+ o Fix a problem with epoll() and reinit; problem report by Alexander Drozdov.	
+ o Fix off-by-one errors in devpoll; from Ian Bell
+ o Make event_add not change any state if it fails; reported by Ian Bell.
+ o Do not warn on accept when errno is either EAGAIN or EINTR
+
+Changes in 1.4.5-stable:
+ o Fix connection keep-alive behavior for HTTP/1.0
+ o Fix use of freed memory in event_reinit; pointed out by Peter Postma
+ o Constify struct timeval * where possible; pointed out by Forest Wilkinson
+ o allow min_heap_erase to be called on removed members; from liusifan.
+ o Rename INPUT and OUTPUT to EVRPC_INPUT and EVRPC_OUTPUT.  Retain INPUT/OUTPUT aliases on on-win32 platforms for backwards compatibility.
+ o Do not use SO_REUSEADDR when connecting
+ o Fix Windows build
+ o Fix a bug in event_rpcgen when generated fixed-sized entries
+
+Changes in 1.4.4-stable:
+ o Correct the documentation on buffer printf functions.
+ o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select.
+ o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c.  This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed.
+ o Fix a potential stack corruption bug in tagging on 64-bit CPUs.
+ o expose bufferevent_setwatermark via header files and fix high watermark on read
+ o fix a bug in bufferevent read water marks and add a test for them
+ o introduce bufferevent_setcb and bufferevent_setfd to allow better manipulation of bufferevents
+ o use libevent's internal timercmp on all platforms, to avoid bugs on old platforms where timercmp(a,b,<=) is buggy.
+ o reduce system calls for getting current time by caching it.
+ o fix evhttp_bind_socket() so that multiple sockets can be bound by the same http server.
+ o Build test directory correctly with CPPFLAGS set.
+ o Fix build under Visual C++ 2005.
+ o Expose evhttp_accept_socket() API.
+ o Merge windows gettimeofday() replacement into a new evutil_gettimeofday() function.
+ o Fix autoconf script behavior on IRIX.
+ o Make sure winsock2.h include always comes before windows.h include.
+
+Changes in 1.4.3-stable:
+ o include Content-Length in reply for HTTP/1.0 requests with keep-alive
+ o Patch from Tani Hosokawa: make some functions in http.c threadsafe.
+ o Do not free the kqop file descriptor in other processes, also allow it to be 0; from Andrei Nigmatulin
+ o make event_rpcgen.py generate code include event-config.h; reported by Sam Banks.
+ o make event methods static so that they are not exported; from Andrei Nigmatulin
+ o make RPC replies use application/octet-stream as mime type
+ o do not delete uninitialized timeout event in evdns
+
+Changes in 1.4.2-rc:
+ o remove pending timeouts on event_base_free()
+ o also check EAGAIN for Solaris' event ports; from W.C.A. Wijngaards
+ o devpoll and evport need reinit; tested by W.C.A Wijngaards
+ o event_base_get_method; from Springande Ulv
+ o Send CRLF after each chunk in HTTP output, for compliance with RFC2626.  Patch from "propanbutan".  Fixes bug 1894184.
+ o Add a int64_t parsing function, with unit tests, so we can apply Scott Lamb's fix to allow large HTTP values.
+ o Use a 64-bit field to hold HTTP content-lengths.  Patch from Scott Lamb.
+ o Allow regression code to build even without Python installed
+ o remove NDEBUG ifdefs from evdns.c
+ o update documentation of event_loop and event_base_loop; from Tani Hosokawa.
+ o detect integer types properly on platforms without stdint.h
+ o Remove "AM_MAINTAINER_MODE" declaration in configure.in: now makefiles and configure should get re-generated automatically when Makefile.am or configure.in chanes.
+ o do not insert event into list when evsel->add fails
+
+Changes in 1.4.1-beta:
+ o free minheap on event_base_free(); from Christopher Layne
+ o debug cleanups in signal.c; from Christopher Layne
+ o provide event_base_new() that does not set the current_base global
+ o bufferevent_write now uses a const source argument; report from Charles Kerr
+ o better documentation for event_base_loopexit; from Scott Lamb.
+ o Make kqueue have the same behavior as other backends when a signal is caught between event_add() and event_loop().  Previously, it would catch and ignore such signals.
+ o Make kqueue restore signal handlers correctly when event_del() is called.
+ o provide event_reinit() to reintialize an event_base after fork
+ o small improvements to evhttp documentation
+ o always generate Date and Content-Length headers for HTTP/1.1 replies
+ o set the correct event base for HTTP close events
+ o New function, event_{base_}loopbreak.  Like event_loopexit, it makes an event loop stop executing and return.  Unlike event_loopexit, it keeps subsequent pending events from getting executed.  Patch from Scott Lamb
+ o Removed obsoleted recalc code
+ o pull setters/getters out of RPC structures into a base class to which we just need to store a pointer; this reduces the memory footprint of these structures.
+ o fix a bug with event_rpcgen for integers
+ o move EV_PERSIST handling out of the event backends
+ o support for 32-bit tag numbers in rpc structures; this is wire compatible, but changes the API slightly.
+ o prefix {encode,decode}_tag functions with evtag to avoid collisions
+ o Correctly handle DNS replies with no answers set (Fixes bug 1846282)
+ o The configure script now takes an --enable-gcc-warnings option that turns on many optional gcc warnings.  (Nick has been building with these for a while, but they might be useful to other developers.)
+ o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
+ o removed linger from http server socket; reported by Ilya Martynov
+ o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
+ o demote most http warnings to debug messages
+ o Fix Solaris compilation; from Magne Mahre
+ o Add a "Date" header to HTTP responses, as required by HTTP 1.1.
+ o Support specifying the local address of an evhttp_connection using set_local_address
+ o Fix a memory leak in which failed HTTP connections would not free the request object
+ o Make adding of array members in event_rpcgen more efficient, but doubling memory allocation
+ o Fix a memory leak in the DNS server
+ o Fix compilation when DNS_USE_OPENSSL_FOR_ID is enabled
+ o Fix buffer size and string generation in evdns_resolve_reverse_ipv6().
+ o Respond to nonstandard DNS queries with "NOTIMPL" rather than by ignoring them.
+ o In DNS responses, the CD flag should be preserved, not the TC flag.
+ o Fix http.c to compile properly with USE_DEBUG; from Christopher Layne
+ o Handle NULL timeouts correctly on Solaris; from Trond Norbye
+ o Recalculate pending events properly when reallocating event array on Solaris; from Trond Norbye
+ o Add Doxygen documentation to header files; from Mark Heily
+ o Add a evdns_set_transaction_id_fn() function to override the default
+   transaction ID generation code.
+ o Add an evutil module (with header evutil.h) to implement our standard cross-platform hacks, on the theory that somebody else would like to use them too.
+ o Fix signals implementation on windows.
+ o Fix http module on windows to close sockets properly.
+ o Make autogen.sh script run correctly on systems where /bin/sh isn't bash. (Patch from Trond Norbye, rewritten by Hagne Mahre and then Hannah Schroeter.)
+ o Skip calling gettime() in timeout_process if we are not in fact waiting for any events. (Patch from Trond Norbye)
+ o Make test subdirectory compile under mingw.
+ o Fix win32 buffer.c behavior so that it is correct for sockets (which do not like ReadFile and WriteFile).
+ o Make the test.sh script run unit tests for the evpoll method.
+ o Make the entire evdns.h header enclosed in "extern C" as appropriate.
+ o Fix implementation of strsep on platforms that lack it
+ o Fix implementation of getaddrinfo on platforms that lack it; mainly, this will make Windows http.c work better.  Original patch by Lubomir Marinov.
+ o Fix evport implementation: port_disassociate called on unassociated events resulting in bogus errors; more efficient memory management; from Trond Norbye and Prakash Sangappa
+ o support for hooks on rpc input and output; can be used to implement rpc independent processing such as compression or authentication.
+ o use a min heap instead of a red-black tree for timeouts; as a result finding the min is a O(1) operation now; from Maxim Yegorushkin
+ o associate an event base with an rpc pool
+ o added two additional libraries: libevent_core and libevent_extra in addition to the regular libevent.  libevent_core contains only the event core whereas libevent_extra contains dns, http and rpc support
+ o Begin using libtool's library versioning support correctly.  If we don't mess up, this will more or less guarantee binaries linked against old versions of libevent continue working when we make changes to libevent that do not break backward compatibility.
+ o Fix evhttp.h compilation when TAILQ_ENTRY is not defined.
+ o Small code cleanups in epoll_dispatch().
+ o Increase the maximum number of addresses read from a packet in evdns to 32.
+ o Remove support for the rtsig method: it hasn't compiled for a while, and nobody seems to miss it very much.  Let us know if there's a good reason to put it back in.
+ o Rename the "class" field in evdns_server_request to dns_question_class, so that it won't break compilation under C++.  Use a macro so that old code won't break.  Mark the macro as deprecated.
+ o Fix DNS unit tests so that having a DNS server with broken IPv6 support is no longer cause for aborting the unit tests.
+ o Make event_base_free() succeed even if there are pending non-internal events on a base.  This may still leak memory and fds, but at least it no longer crashes.
+ o Post-process the config.h file into a new, installed event-config.h file that we can install, and whose macros will be safe to include in header files.
+ o Remove the long-deprecated acconfig.h file.
+ o Do not require #include <sys/types.h> before #include <event.h>.
+ o Add new evutil_timer* functions to wrap (or replace) the regular timeval manipulation functions.
+ o Fix many build issues when using the Microsoft C compiler.
+ o Remove a bash-ism in autogen.sh
+ o When calling event_del on a signal, restore the signal handler's previous value rather than setting it to SIG_DFL. Patch from Christopher Layne.
+ o Make the logic for active events work better with internal events; patch from Christopher Layne.
+ o We do not need to specially remove a timeout before calling event_del; patch from Christopher Layne.
diff --git a/extra/libevent/libevent-2.1.11-stable/ChangeLog-2.0 b/extra/libevent/libevent-2.1.11-stable/ChangeLog-2.0
new file mode 100644
index 000000000000..16f36008cdec
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ChangeLog-2.0
@@ -0,0 +1,1280 @@
+Changes in version 2.0.21-stable (18 Nov 2012)
+BUGFIXES:
+ o ssl: Don't discard SSL read event when timeout and read come close together (576b29f)
+ o ssl: Stop looping in "consider_reading" if reading is suspended. (f719b8a Joachim Bauch)
+ o ssl: No need to reserve space if reading is suspended. (1acf2eb Joachim Bauch)
+ o dns: Avoid a memory-leak on OOM in evdns. (73e85dd, f2bff75 George Danchev)
+ o build: Use python2 rather than python (0eb0109 Ross Lagerwall)
+ o build: Compile without warnings on mingw64 (94866c2)
+ o build: Fix compilation on mingw64 with -DUSE_DEBUG (62bd2c4)
+ o build: Make rpcgen_wrapper.sh work on systems without a "python2" binary (f3009e4)
+ o iocp: Close IOCP listener socket on free when LEV_OPT_CLOSE_ON_FREE is set (cb853ea Juan Pablo Fernandez)
+ o core: Avoid crash when event_pending() called with no event_base set on event (e3cccf3)
+ o misc: remove stray 'x' so print_err will compile when uncommented (ac35650 Patrick Pelletier)
+ o tests: Fix renegotiation test to work around openssl 1.0.1 bug (c2f3086)
+ o tests: Warn when openssl version in unit test mismatches compiled version. (ac009f9)
+
+
+Changes in version 2.0.20-stable (23 Aug 2012)
+BUGFIXES:
+ o core: Make event_pending() threadsafe. (be7a95c Simon Liu)
+ o win32: avoid crash when waiting forever on zero fds. (160e58b)
+ o evhttp: Fix a memory leak on error in evhttp_uriencode (11c8b31)
+ o evbuffer: Avoid possible needless call to writev. Found by coverity. (6a4ec5c)
+ o evdns: memset sockaddr_in before using it. Found by coverity. (a1a0e67)
+ o evhttp: Check more setsockopt return values when binding sockets. Found by coverity (a0912e3)
+ o evdns: Avoid segfault on weird timeout during name lookup. (dc32077 Greg Hazel)
+ o bufferevent_ssl: Correctly invoke callbacks when a SSL bufferevent reads some and then blocks. (606ac43)
+
+
+PORTABILITY FIXES:
+ o check for arc4random_buf at runtime, on OS X (bff5f94 Greg Hazel)
+ o Correctly check for arc4random_buf (fcec3e8 Sebastian Hahn)
+ o Add explicit AC_PROG_SED to configure.in so all autoconfs will expose $(SED) (ca80ea6)
+
+BUILD FIXES:
+ o Add GCC annotations so that the vsprintf functions get checked properly (117e327)
+ o Fix an unused variable warning on *BSD. (c0720c1)
+
+UNIT TEST FIXES:
+ o Fix a couple of memory leaks (found with Valgrind). (3b2529a Ross Lagerwall)
+ o Remove deadcode in http regression tests. Found by coverity. (5553346)
+ o Fix possible uninitialized read in dns regression tests. Found by coverity. (2259777)
+ o Set umask before calling mkstemp in unit tests. Found by coverity (f1ce15d)
+ o Fix various check-after-dereference issues in unit tests: found by coverity (4f3732d)
+ o Fix resource leaks in the unit tests; found by coverity (270f279)
+ o Add some missing null checks to unit tests; found by coverity (f021c3d)
+ o Avoid more crashes/bad calls in unit tests; found by coverity (3cde5bf)
+ o Remove unused variable; spotted by coverity (6355b2a)
+ o Add checks to various return values in unit tests. Found by coverity (b9e7329)
+ o Move assignment outside tt_assert in ssl unit tests. Appeases coverity. (a2006c0)
+
+
+
+Changes in version 2.0.19-stable (3 May 2012)
+BUGFIXES (CORE):
+ o Refactor event_persist_closure: raise and extract some common logic (bec22b4)
+ o If time has jumped so we'd reschedule a periodic event in the past, schedule it for the future instead (dfd808c)
+ o If a higher-priority event becomes active, don't continue running events of the current priority. (2bfda40)
+
+BUGFIXES (SSL):
+ o Fixed potential double-readcb execution with openssl bufferevents. (4e62cd1 Mark Ellzey)
+
+BUGFIXES (DNS):
+ o Cancel a probe request when the server is freed, and ignore cancelled probe callbacks (94d2336 Greg Hazel)
+ o Remove redundant DNS_ERR_CANCEL check, move comment (46b8060 Greg Hazel)
+ o When retransmitting a timed-out DNS request, pick a fresh nameserver. (3d9e52a)
+
+DOCUMENTATION FIXES:
+ o Fix a typo in the bufferevent documentation (98e9119)
+ o Add missing ) to changelog; spotted by rransom (4c7ee6b)
+ o Fix the website URL in the readme (f775521)
+
+COMPILATION FIXES:
+ o Fix a compilation error with MSVC 2005 due to use of mode_t (336dcae)
+ o Configure with gcc older than 2.95 (4a6fd43 Sebastian Hahn)
+ o Generate event-config.h with a single sed script (30b6f88 Zack Weinberg)
+
+FORWARD-COMPATIBILITY:
+ o Backport: provide EVENT_LOG_* names, and deprecate _EVENT_LOG_* (d1a03b2)
+
+TESTING/DEBUGGING SUPPORT:
+ o dns-example.c can now take a resolv.conf file on the commandline (6610fa5)
+ o Make some evdns.c debug logs more verbose (d873d67)
+ o Work-around a stupid gcov-breaking bug in OSX 10.6 (b3887cd)
+
+
+
+Changes in version 2.0.18-stable (22 Mar 2012)
+BUGFIXES (core):
+ o Make uses of open() close-on-exec safe by introducing an internal evutil_open_closeonexec. (d2b5f72 Ross Lagerwall, 03dce42)
+
+BUGFIXES (kqueue):
+ o Properly zero the kevent in kq_setup_kevent() (c2c7b39 Sebastian Hahn)
+
+BUILD FIXES:
+ o Added OPENSSL_LDFLAGS env variable which is appended to SSL checks. (9278196 Mark Ellzey)
+ o Changed OPENSSL_LDFLAGS to OPENSSL_LIBADD (2d67b63 Mark Ellzey)
+ o Don't do clang version detection when disabling some flags (083296b Sebastian Hahn)
+
+BUGFIXES (dns):
+ o Stop crashing in evdns when nameserver probes give a weird error (bec5068)
+
+
+Changes in version 2.0.17-stable (10 Feb 2012)
+
+BUGFIXES (core):
+ o Be absolutely sure to clear pncalls before leaving event_signal_closure (11f36a5)
+ o check for sysctl before we use it (358c745 Mike Frysinger)
+ o Remove bogus casts of socket to int before calling ev_callback (f032516)
+ o Make evconnlistener work around bug in older Linux when getting nmapped (ecfc720)
+ o Fix a list corruption bug when using event_reinit() with signals present (6e41cdc)
+ o Fix a fd leak in event_reinit() (3f18ad1)
+ o Do a memberwise comparison of threading function tables (c94a5f2 Nate R)
+ o Use C-style comments in C source files (for compatibility with compilers such as xlc on AIX). (d84d917 Greg Hewgill)
+ o Avoid crash when freeing event_iocp and using event_set_mem_functions (19715a6)
+ o In the kqueue backend, do not report EBADF as an EV_READ (5d7bfa1 Nicholas Marriott)
+
+BUGFIXES (evbuffer and bufferevents):
+ o Fix behavior of evbuffer_peek(buf,-1,NULL,NULL,0) (c986f23 Zack Weinberg)
+ o Loop on filtering SSL reads until we are blocked or exhausted. (5b4b812)
+
+BUGFIXES (evhttp):
+ o Force strict validation of HTTP version in response. (790f6b3 Catalin Patulea)
+
+BUGFIXES (evdns):
+ o evdns: fix a bug in circular-queue implementation (d6094b1)
+
+BUILD FIXES:
+ o Fix a silly compilation error with the sun compiler (1927776 Colin Watt)
+ o Suppress a gcc warning from ignoring fwrite return in http-sample.c (7206e8c)
+
+DOCUMENTATION FIXES:
+ o Slightly clarify evbuffer_peek documentation (7bbf6ca)
+ o Update copyright notices to 2012 (e49e289)
+
+NEW APIS:
+ o Backport evhttp_connection_get_bufferevent to Libevent 2.0 (da70fa7 Arno Bakker)
+
+TESTS AND TEST FIXES:
+ o Fix a race condition in the dns/bufferevent_connect_hostname test. (cba48c7)
+ o Add function to check referential integrity of an event_base (27737d5)
+ o Check event_base correctness at end of each unit test (3312b02)
+ o Workaround in the unit tests for an apparent epoll bug in Linux 3.2 (dab9187)
+ o Better workaround for Linux 3.2 edge-triggered epoll bug (9f9e259)
+
+Changes in version 2.0.16-stable (18 Nov 2011)
+BUGFIXES (core):
+ o More detailed message in case of libevent self-debugging failure. (9e6a4ef Leonid Evdokimov)
+ o epoll: close fd on alloc fail at initialization (1aee718 Jamie Iles)
+ o Fix compile warning from saying event2/*.h inside a comment (447b0ba)
+ o Warn when unable to construct base because of failing make_base_notifiable (4e797f3)
+ o Don't try to make notifiable event_base when no threading fns are configured (e787413)
+
+BUGFIXES (evbuffer):
+ o unit test for remove_buffer bug (90bd620 Greg Hazel)
+ o Fix an evbuffer crash in evbuffer_remove_buffer() (c37069c)
+
+BUGFIXES (bufferevent_openssl):
+ o Refactor amount-to-read calculations in buffervent_ssl consider_reading() (a186e73 Mark Ellzey)
+ o Move SSL rate-limit enforcement into bytes_to_read() (96c562f)
+ o Avoid spinning on OpenSSL reads (2aa036f Mark Ellzey)
+
+BUGFIXES (dns)
+ o Empty DNS reply with OK status is another way to say NODATA. (21a08d6 Leonid Evdokimov)
+
+TESTING:
+ o Tests for 94fba5b and f72e8f6 (d58c15e Leonid Evdokimov)
+ o Test for commit aff6ba1 (f7841bf Leonid Evdokimov)
+ o Style and comment tweaks for dns/leak* tests (5e42202)
+ o improve test to remove at least one buffer from src (7eb52eb Greg Hazel)
+
+DOCUMENTATION:
+ o Add note about evhttp_send_reply_end to its doxygen (724bfb5)
+ o Update copyright dates to 2011. (3c824bd)
+ o Fix typo in whatsnew-2.0.txt (674bc6a Mansour Moufid)
+ o Improve win32 behavior of dns-sample.c code (a3f320e Gisle Vanem)
+
+
+
+Changes in version 2.0.15-stable (12 Oct 2011)
+BUGFIXES (DNS):
+ o DNS: add ttl for negative answers using RFC 2308 idea. (f72e8f6 Leonid Evdokimov)
+ o Add DNS_ERR_NODATA error code to handle empty replies. (94fba5b Leonid Evdokimov)
+
+BUFGIXES (bufferevents and evbuffers):
+ o Make evbuffer callbacks get the right n_added value after evbuffer_add (1ef1f68 Alex)
+ o Prefer mmap to sendfile unless a DRAINS_TO_FD flag is set. Allows add_file to work with SSL. (0ba0af9)
+
+BUGFIXES (event loop):
+ o When a signal callback is activated to run multiple times, allow event_base_loopbreak to work even before they all have run. (4e8eb6a)
+
+DOCUMENTATION FIXES:
+ o Fix docstring in dns.h (2b6eae5 Leonid Evdokimov)
+ o refer to non-deprecated evdns functions in comments (ba5c27d Greg Hazel)
+
+BUILD AND TESTING FIXES:
+ o le-proxy and regress depend on openssl directly (9ae061a Sergey Avseyev)
+ o Use _SOURCES, not _sources, in sample/Makefile.am (7f82382)
+ o Fixed compiler warnings for unchecked read/write calls. (c3b62fd Mark Ellzey)
+ o Make write-checking fixes use tt_fail_perror (2b76847)
+ o Fix some "value never used" warnings with gcc 4.6.1 (39c0cf7)
+
+
+
+Changes in version 2.0.14-stable (31 Aug 2011)
+BUGFIXES (bufferevents and evbuffers):
+ o Propagate errors on the underlying bufferevent to the user. (4a34394 Joachim Bauch)
+ o Ignore OpenSSL deprecation warnings on OS X (5d1b255 Sebastian Hahn)
+ o Fix handling of group rate limits under 64 bytes of burst (6d5440e)
+ o Solaris sendfile: correctly detect amount of data sent (643922e Michael Herf)
+ o Make rate limiting work with common_timeout logic (5b18f13)
+ o clear read watermark on underlying bufferevent when creating filtering bev to fix potentially failing fragmented ssl handshakes (54f7e61 Joachim Bauch)
+
+BUGFIXES (IOCP):
+ o IOCP: don't launch reads or writes on an unconnected socket (495c227)
+ o Make IOCP rate-limiting group support stricter and less surprising. (a98da7b)
+ o Have test-ratelim.c support IOCP (0ff2c5a)
+ o Make overlapped reads result in evbuffer callbacks getting invoked (6acfbdd)
+ o Correctly terminate IO on an async bufferevent on bufferevent_free (e6af35d)
+
+BUGFIXES (other):
+ o Fix evsig_dealloc memory leak with debugging turned on. (9b724b2 Leonid Evdokimov)
+ o Fix request_finished memory leak with debugging turned on. (aff6ba1 Leonid Evdokimov)
+
+BUILD AND TESTING FIXES:
+ o Allow OS-neutral builds for platforms where some versions have arc4random_buf (b442302 Mitchell Livingston)
+ o Try to fix 'make distcheck' errors when building out-of-tree (04656ea Dave Hart)
+ o Clean up some problems identified by Coverity. (7c11e51 Harlan Stenn)
+
+
+Changes in version 2.0.13-stable (18 Jul 2011)
+BUGFIXES
+ o Avoid race-condition when initializing global locks (b683cae)
+ o Fix bug in SSL bufferevents backed by a bev with a write high-watermarks (e050703 Joachim Bauch)
+ o Speed up invoke_callbacks on evbuffers when there are no callbacks (f87f568 Mark Ellzey)
+ o Avoid a segfault when all methods are disabled or broken (27ce38b)
+ o Fix incorrect results from evbuffer_search_eol(EOL_LF) (4461f1a)
+ o Add some missing checks for mm_calloc failures (89d5e09)
+ o Replace an assertion for event_base_free(NULL) with a check-and-warn (09fe97d)
+ o Report kqueue ebadf, epipe, and eperm as EV_READ events (1fd34ab)
+ o Check if the `evhttp_new_object' function in `http.c' returns NULL. (446cc7a Mansour Moufid)
+ o Use the correct printf args when formatting size_t (3203f88)
+ o Complain if the caller tries to change threading cbs after setting them (cb6ecee)
+
+DOCUMENTATION FIXES AND IMPROVEMENTS
+ o Revise the event/evbuffer/bufferevent doxygen for clarity and accuracy (2888fac)
+ o Update Doxyfile to produce more useful output (aea0555)
+
+TEST FIXES
+ o Fix up test_evutil_snprintf (caf695a)
+ o Fix tinytest invocation from windows shell (57def34 Ed Day)
+
+BUILD FIXES
+ o Use AM_CPPFLAGS in sample/Makefile.am, not AM_CFLAGS (4a5c82d)
+ o Fix select.c compilation on systems with no NFDBITS (49d1136)
+ o Fix a few warnings on OpenBSD (8ee9f9c Nicholas Marriott)
+ o Don't break when building tests from git without python installed (b031adf)
+ o Don't install event_rpcgen.py when --disable-libevent-install is used (e23cda3 Harlan Stenn)
+ o Fix AIX build issue with TAILQ_FOREACH definition (e934096)
+
+
+Changes in version 2.0.12-stable (4 Jun 2011)
+BUGFIXES
+ o Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors (28317a0)
+ o Fix an assert-inducing fencepost bug in the select backend (d90149d)
+ o Fix failing http assertion introducd in commit 0d6622e (0848814 Kevin Ko)
+ o Fix a bug that prevented us from configuring IPv6 nameservers. (74760f1)
+ o Prevent size_t overflow in evhttp_htmlescape. (06c51cd Mansour Moufid)
+ o Added several checks for under/overflow conditions in evhttp_handle_chunked_read (a279272 Mark Ellzey)
+ o Added overflow checks in evhttp_read_body and evhttp_get_body (84560fc Mark Ellzey)
+
+DOCUMENTATION:
+ o Add missing words to EVLOOP_NONBLOCK documentation (9556a7d)
+
+BUILD FIXES
+ o libssl depends on libcrypto, not the other way around. (274dd03 Peter Rosin)
+ o Libtool brings in the dependencies of libevent_openssl.la automatically (7b819f2 Peter Rosin)
+ o Use OPENSSL_LIBS in Makefile.am (292092e Sebastian Hahn)
+ o Move the win32 detection in configure.in (ceb03b9 Sebastian Hahn)
+ o Correctly detect openssl on windows (6619385 Sebastian Hahn)
+ o Fix a compile warning with zlib 1.2.4 and 1.2.5 (5786b91 Sebastian Hahn)
+ o Fix compilation with GCC 2, which had no __builtin_expect (09d39a1 Dave Hart)
+ o Fix new warnings from GCC 4.6 (06a714f)
+ o Link with -lshell32 and -ladvapi32 on Win32. (86090ee Peter Rosin)
+ o Make the tests build when OpenSSL is not available. (07c41be Peter Rosin)
+ o Bring in the compile script from automake, if needed. (f3c7a4c Peter Rosin)
+ o MSVC does not provide S_ISDIR, so provide it manually. (70be7d1 Peter Rosin)
+ o unistd.h and sys/time.h might not exist. (fe93022 Peter Rosin)
+ o Make sure TINYTEST_LOCAL is defined when building tinytest.c (8fa030c Peter Rosin)
+ o Fix winsock2.h #include issues with MSVC (3d768dc Peter Rosin)
+ o Use evutil_gettimeofday instead of relying on the system gettimeofday. (0de87fe Peter Rosin)
+ o Always use evutil_snprintf, even if OS provides it (d1b2d11 Sebastian Hahn)
+ o InitializeCriticalSectionAndSpinCount requires _WIN32_WINNT >= 0x0403. (816115a Peter Rosin)
+ o cygwin: make it possible to build DLLs (d54d3fc)
+
+
+
+Changes in version 2.0.11-stable (27 Apr 2011)
+  [Autogenerated from the Git log, sorted and cleaned by hand.]
+BUGFIXES:
+ o Fix evport handling of POLLHUP and POLLERR (b42ce4b)
+ o Fix compilation on Windows with NDEBUG (cb8059d)
+ o Check for POLLERR, POLLHUP and POLLNVAL for Solaris event ports (0144886 Trond Norbye)
+ o Detect and handle more allocation failures. (666b096 Jardel Weyrich)
+ o Use event_err() only if the failure is truly unrecoverable. (3f8d22a Jardel Weyrich)
+ o Handle resize failures in the select backend better. (83e805a)
+ o Correctly free selectop fields when select_resize fails in select_init (0c0ec0b)
+ o Make --enable-gcc-warnings a no-op if not using gcc (3267703)
+ o Fix a type error in our (unused) arc4random_stir() (f736198)
+ o Correctly detect and stop non-chunked http requests when the body is too long (63a715e)
+ o Have event_base_gettimeofday_cached() always return wall-clock time (a459ef7)
+ o Workaround for http crash bug 3078187 (5dc5662 Tomash Brechko)
+ o Fix incorrect assertions and possible use-after-free in evrpc_free() (4b8f02f Christophe Fillot)
+ o Reset outgoing http connection when read data in idle state. (272823f Tomash Brechko)
+ o Fix subtle recursion in evhttp_connection_cb_cleanup(). (218cf19 Tomash Brechko)
+ o Fix the case when failed evhttp_make_request() leaved request in the queue. (0d6622e Tomash Brechko)
+ o Fix a crash bug in evdns server circular list code (00e91b3)
+ o Handle calloc failure in evdns. (Found by Dave Hart) (364291e)
+ o Fix a memory leak on win32 socket->event map. (b4f89f0)
+ o Add a forgotten NULL check to evhttp_parse_headers (12311ff Sebastian Hahn)
+ o Fix possible NULL-deref in evdns_cancel_request (5208544 Sebastian Hahn)
+
+PORTABILITY:
+ o Fall back to sscanf if we have no other way to implement strtoll (453317b)
+ o Build correctly on platforms without sockaddr_storage (9184563)
+ o Try to build correctly on platforms with no IPv6 support (713c254)
+ o Build on systems without AI_PASSIVE (cb92113)
+ o Fix http unit test on non-windows platforms without getaddrinfo (6092f12)
+ o Do not check for gethostbyname_r versions if we have getaddrinfo (c1260b0)
+ o Include arpa/inet.h as needed on HPUX (10c834c Harlan Stenn)
+ o Include util-internal.h as needed to build on platforms with no sockaddr_storage (bbf5515 Harlan Stenn)
+ o Check for getservbyname even if not on win32. (af08a94 Harlan Stenn)
+ o Add -D_OSF_SOURCE to fix hpux builds (0b33479 Harlan Stenn)
+ o Check for allocation failures in apply_socktype_protocol_hack (637d17a)
+ o Fix the check for multicast or broadcast addresses in evutil_check_interfaces (1a21d7b)
+ o Avoid a free(NULL) if out-of-memory in evdns_getaddrinfo. Found by Dave Hart (3417f68)
+
+DEFENSIVE PROGRAMMING:
+ o Add compile-time check for AF_UNSPEC==PF_UNSPEC (3c8f4e7)
+
+BUGS IN TESTS:
+ o Fix test.sh output on solaris (b4f89b6 Dave Hart)
+ o Make test-eof fail with a timeout if we never get an eof. (05a2c22 Harlan Stenn)
+ o Use %s with printf in test.sh (039b9bd)
+ o Add an assert to appease clang's static analyzer (b0ff7eb Sebastian Hahn)
+ o Add a forgotten return value check in the unit tests (3819b62 Sebastian Hahn)
+ o Actually send NULL request in http_bad_request_test (b693c32 Sebastian Hahn)
+ o add some (void) casts for unused variables (65707d7 Sebastian Hahn)
+ o Refactor test_getaddrinfo_async_cancel_stress() (48c44a6 Sebastian Hahn)
+ o Be nice and "handle" error return values in sample code (4bac793 Sebastian Hahn)
+ o Check return value of evbuffer_add_cb in tests (93a1abb Sebastian Hahn)
+ o Remote some dead code from dns-example.c (744c745 Sebastian Hahn)
+ o Zero a struct sockaddr_in before using it (646f9fe Sebastian Hahn)
+
+BUILD FIXES:
+ o Fix warnings about AC_LANG_PROGRAM usage (f663112 Sebastian Hahn)
+ o Skip check for zlib if we have no zlib.h (a317c06 Harlan Stenn)
+ o Fix autoconf bracket issues; make check for getaddrinfo include netdb.h (833e5e9 Harlan Stenn)
+ o Correct an AM_CFLAGS to an AM_CPPFLAGS in test/Makefile.am (9c469db Dave Hart)
+ o Fix make distcheck & installation of libevent 1 headers (b5a1f9f Dave Hart)
+ o Fix compilation under LLVM/clang with --enable-gcc-warnings (ad9ff58 Sebastian Hahn)
+
+FEATURES:
+ o Make URI parser able to tolerate nonconformant URIs. (95060b5)
+
+DOCUMENTATION:
+ o Clarify event_set_mem_functions doc (926f816)
+ o Correct evhttp_del_accept_socket documentation on whether socket is closed (f665924)
+ o fix spelling mistake in whatsnew-2.0.txt (deb2f73)
+ o Fix sample/http-server ipv6 fixes (eb692be)
+ o Comment internal headers used in sample code. (4eb281c)
+ o Be explicit about how long event loops run in event.h documentation (f95bafb)
+ o Add comment to configure.in to explain gc-sections test logic (c621359)
+ o Fix a couple of memory leaks in samples/http-server.c. Found by Dave Hart. (2e9f665)
+
+BUILD IMPROVEMENTS:
+ o Use the gcc -ffunction-segments feature to allow gc when linking with static libevent (0965c56 Dave Hart)
+ o Add configure options to disable installation, regression tests (49e9bb7 Dave Hart)
+
+
+
+Changes in version 2.0.10-stable (16 Dec 2010)
+  [Autogenerated from the Git log, sorted and cleaned by hand.]
+BUGFIXES
+ o Minor fix for IOCP shutdown handling fix (2599b2d Kelly Brock)
+ o Correctly notify the main thread when activating an event from a subthread (5beeec9)
+ o Reject overlong http requests early when Expect:100-continue is set (d23839f Constantine Verutin)
+ o EVUTIL_ASSERT: Use sizeof() to avoid "unused variable" warnings with -DNDEBUG. (b63ab17 Evan Jones)
+
+CODE CLEANUPS
+ o bufferevent-internal.h: Use the new event2/util.h header, not evutil.h (ef5e65a Evan Jones)
+ o Use relative includes instead of system includes consistently. (fbe64f2 Evan Jones)
+ o Make whitespace more consistent
+
+TESTING
+ o tests: Use new event2 headers instead of old compatibility headers. (4f33209 Evan Jones)
+
+DOCUMENTATION
+ o Document that the cpu_hint is only used on Windows with IOCP for now (57689c4)
+ o Add stuff to "whats new in 2.0" based on reading include changes since August. (18adc3f)
+
+
+Changes in 2.0.9-rc (30 Nov 2010):
+  [Autogenerated from the Git log, sorted and cleaned by hand.]
+NEW AND MODIFIED APIs
+ o Add a function to change a listener's callback. (46ee061)
+ o Make evbuffer_add_file take ev_off_t, not off_t (ac7e52d)
+ o Make rate-limits go up to SIZE_MAX/EV_SSIZE_MAX, not just INT32_MAX (2cbb1a1)
+ o Add a bufferevent_get_base function (aab49b6)
+
+MAJOR BUGFIXES
+ o Disable changelist for epoll by default because of Linux dup() bug; add an option and/or an envvar to reenable it for speed. (9531763)
+ o Fix a 100%-CPU bug where an SSL connection would sometimes never stop trying to write (1213d3d)
+ o Fix a nasty bug related to use of dup() with epoll on Linux (c281aba)
+ o Fix bugs in posix thread-id calculation when sizeof(pthread_t) != sizeof(long) (fbaf077)
+ o Fix some ints to evutil_socket_t; make tests pass on win64. (f817bfa Dimitre Piskyulev)
+ o Set _EVENT_SIZEOF_VOID_P correctly on win32 and win64 (1ae82cd Dimitre Piskyulev)
+ o Avoid double-invocation of user callback with EVUTIL_EAI_CANCEL (abf01ed)
+ o Set SO_UPDATE_ACCEPT_CONTEXT on sockets from AcceptEx so that shutdown() can work (52aa419)
+ o When closing a filtering bufferevent, clear callbacks on the underlying bufferevent (fc7b1b0)
+
+NEW AND MODIFIED HTTP APIs
+ o Add evhttp_parse_query_str to be used with evhttp_uri_parse. (2075fbc)
+ o Add evhttp_response_code to remove one more reason to include http_struct.h (22e0a9b)
+ o Define enumerators for all HTTP methods, including PATCH from RFC5789 (75a7341 Felix Nawothnig)
+ o Functions to actually use evhttp_bound_socket with/as evconnlistener. (006efa7)
+ o Add evhttp_request_get_command so code can tell GET from POST without peeking at the struct. (49f4bf7)
+ o Introduce absolute URI parsing helpers. (86dd720 Pavel Plesov)
+ o Revise evhttp_uri_parse implementation to handle more of RFC3986 (eaa5f1d)
+ o Add evhttp_connection_get_base() to get the event_base from an http connection (cd00079)
+ o Let evhttp_parse_query return -1 on failure (b1756d0)
+ o New evhttp_uri(encode|decode) functions to handle + and NUL characters right (a8148ce)
+ o Add evhttp_response_code to remove one more reason to include http_struct.h (22e0a9b)
+ o Tweak interface for allowed methods (f5b391e)
+ o Add evhttp server alias interface, correct flagging of proxy requests. (aab8c38 Christopher Davis)
+
+HTTP BUGFIXES
+ o Add some comments to http.c and make a few functions static. (90b3ed5)
+ o Fix Content-Length when trying send more than 100GB of data (!) on an evhttp. (525da3e)
+ o Fix a bug where we would read too much data in HTTP bodies or requests. (58a1cc6)
+ o Correctly count req->body_size on http usage without Content-Length (8e342e5)
+ o Avoid missed-request bug when entire http request arrives before data is flushed (74c0e86)
+ o reset "chunked" flag when sending non-chunked reply (aa5f55f Joachim Bauch)
+ o evhttp_encode_uri encodes all reserved characters, including !$'()*+,/:=@ (2e63a60)
+ o Replace exact-version checks for HTTP/1.1 with >= or < checks (647e094)
+ o evhttp: Return 501 when we get an unrecognized method, not 400. (536311a)
+ o Don't disable reading from the HTTP connection after sending the request to be notified of connection-close in time (c76640b Felix Nawothnig)
+ o Never call evhttp_readcb while writing. (0512487)
+ o Try to fix an assertion failure related to close detection (0faaa39)
+ o Correctly detect timeouts during http connects (04861d5)
+ o Preliminary support for Continue expectation in evhttp. (fa9305f Christopher Davis)
+
+OTHER BUGFIXES
+ o Correct logic for realigning a chain in evbuffer_add (e4f34e8)
+ o Fix a minor syntax error that most compilers didn't care about (e56ff65)
+ o Fix some uses of int for socket in regress (5d389dc)
+ o Check return value for ioctlsocket on win32 (f5ad31c Trond Norbye)
+ o Fix som event_warns that should have been event_warnx (19c71e7)
+ o Fix signal handler types for win64. (b81217f)
+ o Try to clear up more size_t vs int/long issues. (598d133)
+ o Make sure IOCP evconnlistener uses virtual events. (7b40a00 Christopher Davis)
+ o Don't free evdns_request handles until after the callback is invoked (9ed30de)
+ o Fix some more cancel-related bugs in getaddrinfo_async (c7cfbcf)
+ o Make evdns_getaddrinfo_cancel threadsafe (d51b2fc)
+ o Only clear underlying callbacks when the user hasn't reset them. (1ac5b23)
+ o Fix bug in bufferevent_connect on an openssl bufferevent that already had an fd (4f228a1)
+ o Resolve an evport bug in the thread/forking test (3a67d0b)
+ o Make sure the CLOEXEC flag is set on fds we open for base notification (3ab578f)
+ o Fix IRIX build.  sa_family collides with a #define in sys/socket.h on IRIX. (e874982 Kevin Bowling)
+ o If not WIN32, include <sys/socket.h> in event2/util.h. (1cd45e5 Kevin Bowling)
+ o Fix some C99-style comments to work with the xlC compiler. (c2e5e22 Kevin Bowling)
+ o Add some checks since lack of TAILQ_FOREACH doesn't imply lack of FIRST, END, NEXT, or INSERT_BEFORE.  Quiet some warnings in XL C. (c4dc335 Kevin Bowling)
+ o Reworked AIX __ss_family workaround to use AC_STRUCT_MEMBER. (2e2a3d7 Kevin Bowling)
+ o Take select from <sys/select.h> when testing in autoconf.  AIX build fix. (a3a9f6b Kevin Bowling)
+ o Fix snprintf related failures on IRIX. (3239073 Kevin Bowling)
+ o Remove _event_initialized(); make event_initialized() a function(); make it consistent on windows and non-windows (652024b)
+ o Do not let EVLOOP_ONCE exit the loop until all deferred callbacks have run (2d5e1bd)
+ o Make EVLOOP_ONCE ignore internal events (0617a81)
+ o Possible crash fix when freeing an underlying bufferevent of an openssl bufferevent (29f7623)
+
+HTTP CLEANUPS
+ o Stop using Libevent-1 headers in regress_http (1f507d7)
+ o Modernize header usage in bench_http.c (e587069)
+ o fix signed/unsigned warnings in http.c (74a91e5)
+ o Update the HTTP regression tests to use Libevent2 apis for non-http stuff (d9ffa89)
+ o Start porting http tests to not use legacy interfaces (8505a74)
+ o Convert the rest of the http tests to be non-legacy unit tests. (9bb8239)
+ o Rename the confusing "base" static variable in regress_http.c (353402a)
+ o Stop accessing http request struct directly from in the unit tests. (0b137f4)
+ o Refactor http version parsing into a single function (a38140b)
+
+TESTING
+ o Improvements to tinytest_macros.h (ad923a1)
+ o Add a huge pile of tests for the new URI functions, and make them pass. (a5a76e6)
+ o Unit tests for evhttp_uri_set* (bc98f5e)
+ o Increase the skew tolerance to 2 seconds in thread/deferred_cb_skew (f806476 Christopher Davis)
+ o Reorder backends in test.sh to match preference order in event.c (ece974f)
+ o Add a stress test for getaddrinfo_cancel (da1bf52)
+ o Units test for unexpected evhttp methods. (75e3320)
+
+DOCUMENTATION
+ o Document behavior of URI parsing more thoroughly. (3a33462)
+ o Document that two bufferevent functions only work on socket bufferevents (70e1b60)
+ o add a requested docstring for event_rpcgen.CommandLine.__init__ (f1250eb)
+ o Fix a mistake in http documentation found by Julien Blache (229714d)
+ o Add a basic example of how to write a static HTTP server. (4e794d5)
+ o Document event_get_assignment (88be27d)
+ o Note that reentrant calls to libevent from logging cbs may fail badly (e431bcd)
+ o Clarify EVLOOP_* documentation to be more precise. (057a514)
+
+CLEANUPS
+ o Simplify the logic for choosing EPOLL_CTL_ADD vs EPOLL_CTL_MOD (2c66983)
+ o Rename "size" variables in win32select that were really fd counts. (b6a158c)
+ o Fix even more win64 warnings (7484df6)
+ o Fix even more win64 warnings: buffer, event_tagging, http, evdns, evrpc (545a611)
+ o Fix more wn64 warnings. (34b84b9 Christopher Davis)
+ o Use the label_len local variable in evdns instead of recalculating it over and over (ba01456)
+ o Fix some irix compilation warnings spotted by Kevin Bowling (7bcace2)
+
+
+
+Changes in 2.0.8-rc (14 Oct 2010):
+ [Autogenerated from the Git log, sorted and cleaned by hand.]
+NEW APIS
+ o Add error callback to evconnlistener (c4be8d8 Simon Perreault)
+ o Add a LEV_OPT_THREADSAFE option for threadsafe evconnlisteners (127d4f2)
+
+CHANGED BEHAVIOR
+ o Correct logic on disabling underlying bufferevents when disabling a filter (ac27eb8)
+
+BUGFIXES
+ o Obey enabled status when unsuspending (040a019 Simon Perreault)
+ o Warn when using the error-prone EV_SIGNAL interface in an error-prone way.  Also, fix a couple of race conditions in signal.c (720bd93)
+ O Make default signal backend fully threadsafe (95a7d41)
+ o Put internal events at highest priority (90651b3)
+ o Fix warnings in the main codebase flagged by -Wsigned-compare (9c8db0, 5e4bafb, 5c214a, 6be589a, e06f514)
+ o Fix compile in kqueue.c (b395392 Sebastian Hahn)
+ o Do not search outside of the system directory for windows DLLs (d49b5e3)
+ o Fix a spurious-call bug on epoll.c (0faaee0)
+ o Send a shutdown(SHUT_WR) before closing an http connection (e0fd870 Christopher Davis)
+ o Fix warnings on mingw with gcc 4.5 (5b7a370)
+ o Fix an EINVAL on evbuffer_write_iovec on OpenSolaris. (fdc640b)
+ o Fix allocation error for IOCP listeners. Probably harmless, since struct event is big (481ef92)
+ o Make iocp/listener/error work; don't accept again if lev is disabled. (62b429a Christopher Davis)
+ o Handle rate-limiting for reading on OpenSSL bufferevents correctly. (819b171)
+ o Fix serious bugs in per-bufferevent rate-limiting code (34d64f8)
+ o Avoid spurious reads from just-created open openssl bufferevents (223ee40)
+ o Fix a case where an ssl bufferevent with CLOSE_ON_FREE didn't close its fd (93bb7d8)
+ o The corrected bufferevent filter semantics let us fix our openssl tests (34331e4)
+
+TESTING
+ o Make SSL tests cover enabling/disabling EV_READ. (a5ce9ad)
+ o Bump to the latest version of tinytest (f0bd83e)
+ o Unit tests for listener error callbacks (045eef4)
+ o New unit test for ssl bufferevents starting with connected SSLs. (02f6259)
+
+DEBUGGABILITY
+ o Make debugging output for epoll backend more comprehensive (ec2b05e)
+ o Make event.c debugging messages report fds (e119899)
+ o Make the --enable-gcc-warnings option include signed comparison warnings (d3b096c)
+
+DEADCODE REMOVAL
+ o Remove the now-useless evsig_caught and evsig_process (4858b79)
+ o Remove event_base.evsigbase; nothing used it. (38d0960)
+
+
+
+Changes in 2.0.7-rc (9 Sep 2010):
+ [Autogenerated from the Git log, sorted and cleaned by hand.]
+NEW APIS
+ o Expose a evdns_base_nameserver_sockaddr_add() function to add a nameserver by sockaddr (1952143)
+ o Add event_config_set_num_cpus_hint() for tuning win32 IOCP thread pools, etc. (2447fe8 Christopher Davis)
+
+BUGFIXES
+ o Fix a nasty dangling-event bug when using rate-limiting groups (0bffe43)
+ o Clean up syntax on TAILQ_ENTRY() usage to build correctly with recent MSVC (60433a0 Gilad Benjamini)
+ o Make definition of WIN32_LEAN_AND_MEAN in event.h conditional (3920172 Gilad Benjamini)
+ o Correctly detect failure to delete bufferevent read-timeout event (da6e7cd)
+ o Set close-on-exec bit for filedescriptors created by dns subsystem (d0b8843)
+ o Fix kqueue correctness test on x84_64 (6123d12)
+ o Detect events with no ev_base; warn instead of crashing (f1074b7)
+ o Fix an issue with forking and signal socketpairs in select/poll backends (d61b2f3)
+ o Stop using global arrays to implement the EVUTIL_ctype functions (1fdec20)
+ o On windows, make lock/thread function tables static (5de2bcb)
+ o Close th_notify_fds and open a new pair on reinit (495ed66)
+ o Declare signal handler function as "__cdecl" on Windows (f0056d0)
+ o Use the _func() replacements for open, fstat, etc in evutil.c on win32 (e50c0fc)
+ o Only process up to MAX_DEFERRED deferred_cbs at a time (17a14f1 Christopher Davis)
+
+THREADING BUGFIXES
+ o Avoid deadlock when activating signals (970e6ad)
+ o Add a condition variable backend, with implementations for pthreads and win32 (d4977b5)
+ o Use conditions instead of current_event_lock to fix a deadlock (e0972c2)
+ o Fix logic error in win32 TRY_LOCK that caused problems with rate-limiting (4c32b9d)
+ o Avoid needlessly calling evthread_notify_base() when the loop is not running (c7a06bf)
+ o Minimize calls to base_notify implementation functions, thereby avoiding needless syscalls (4632b78)
+
+IOCP BUGFIXES
+ o IOCP-related evbuffer fixes (03afa20 Christopher Davis)
+ o Stop IOCP when freeing the event_base (d844242 Christopher Davis)
+ o Some IOCP bufferevent tweaks (76f7e7a Christopher Davis)
+
+TESTS
+ o Make the regress_pthread.c tests work on windows with current test APIs (d74ae38)
+ o Add a unit test for conditions (5fb1095)
+ o Allow more than one copy of regression tests to run at once (a97320a)
+ o Fix event_del(0) instance in bench.c (b0f284c Shuo Chen)
+ o Fix a few memory leaks in the tests (1115366)
+ o IOCP-related unit test tweaks (499452f Christopher Davis)
+ o Improve testing of when thread-notification occurs (ce85280)
+
+BUILD AND DISTRIBUTION
+ o Add pkgconfig files for libevent_{openssl,pthreads} (ebcb1f0)
+ o Change include order in Makefile.nmake (4022b28)
+ o Make include/event2/event-config.h not included in source dist (a4af9be)
+ o Honor NDEBUG; build without warnings with NDEBUG; make NDEBUG always-off in unit test code (743f866)
+ o Declare evkeyvalq and event_list even if event_struct.h comes before sys/queue.h (d3ceca8)
+ o Move evkeyvalq into a separate header for evhttp_parse_query users (ca9048f)
+ o Prefer autoreconf -ivf to manual autogen.sh (7ea8e89)
+
+CLEANUP
+ o Completely remove the (mostly-removed) obsolete thread functions (3808168)
+ o Rename regress_pthread.c to regress_thread.c (041989f)
+ o Make defer-internal.h use lock macros, not direct calls to lock fns (5218d2a)
+
+DOCUMENTATION
+ o Document that DNS_NO_SEARCH is an obsolete alias for DNS_QUERY_NO_SEARCH (33200e7)
+ o Update the whatsnew-2.0.txt document (4991669)
+
+
+
+Changes in 2.0.6-rc (6 Aug 2010):
+ [Autogenerated from the Git log, sorted by hand.]
+DOCUMENTATION
+ o Document a change in the semantics of event_get_struct_event_size() (e21f5d1)
+ o Add a comment to describe our plan for library versioning (9659ece)
+ o Fix sentence fragment in docs for event_get_struct_event_size() (7b259b6)
+
+NEW FEATURES AND INTERFACE CHANGES
+ o Remove the obsolete evthread interfaces (c5bab56)
+ o Let evhttp_send_error infer the right error reasons (3990669)
+ o Add a function to retrieve the other side of a bufferevent pair (17a8e2d)
+ o Add bufferevent_lock()/bufferevent_unlock() (215e629)
+ o Stop asserting when asked for a (unsupported) TCP dns port. Just return NULL. (7e87a59)
+ o Replace (unused,always 0) is_tcp argument to evdns_add_server_port*() with flags (e1c1167)
+ o Constify a couple of arguments to evdns_server_request_add_*_reply (cc2379d)
+ o Add an interface to expose min_share in ratelimiting groups (6ae53d6)
+
+BUGFIXES
+ o Avoid event_del on uninitialized event in event_base_free (6d19510)
+ o Add some missing includes to fix Linux build again (75701e8)
+ o Avoid close of uninitialized socket in evbuffer unit test (bda21e7)
+ o Correctly recognize .255 addresses as link-local when looking for interfaces (8c3452b)
+ o If no evdns request can be launched, return NULL, not a handle (b14f151)
+ o Use generic win32 interfaces, not ASCII-only ones, where possible. (899b0a3)
+ o Fix the default HTTP error template (06bd056 Felix Nawothnig)
+ o Close the file in evutil_read_file whether there's an error or not. (0798dd1 Pierre Phaneuf)
+ o Fix possible nullptr dereference in evhttp_send_reply_end() (29b2e23 Felix Nawothnig)
+ o never let bufferevent_rlim functions return negative (0859870)
+ o Make sample/hello_world work on windows (d89fdba)
+ o Fix a deadlock related to event-base notification.  Diagnosed by Zhou Li, Avi Bab, and Scott Lamb. (17522d2)
+ o Possible fix to 100% cpu usage with epoll and openssl (cf249e7 Mike Smellie)
+ o Don't race when calling event_active/event_add on a running signal event (fc5e0a2)
+ o Suppress a spurious EPERM warning in epoll.c (e73cbde)
+ o Fix wrong size calculation of iovec buffers when exact=1 (65abdc2 niks)
+ o Change bufferevent_openssl::do_write so it doesn't call SSL_write with a 0 length buffer (c991317 Mike Smellie)
+ o Fixed compilation of sample/le-proxy.c on win32 (13b912e Trond Norbye)
+ o Fix rate-limit calculation on openssl bufferevents. (009f300)
+ o Remember to initialize timeout events for bufferevent_async (de1f5d6 Christopher Davis)
+
+BUILD AND DISTRIBUTION CHANGES
+ o Test the unlocked-deferred callback case of bufferevents (dfb75ab)
+ o Remove the now-unusable EVTHREAD_LOCK/UNLOCK constants (fdfc3fc)
+ o Use -Wlogical-op on gcc 4.5 or higher (d14bb92)
+ o Add the libtool-generated /m4/* stuff to .gitignore (c21c663)
+ o Remove some automake-generated files from version control. (9b14911)
+ o Have autogen.sh pass --force-missing to automake (8a44062)
+ o Set library version for libevent_pthreads correctly (b2d7440)
+ o Really only add libevent_core.la to LIBADD on mingw (1425003 Sebastian Hahn)
+ o Build more cleanly with NetBSDs that dislike toupper(char) (42a8c71)
+ o Fix unit tests with -DUSE_DEBUG enabled (28f31a4)
+ o Fix evdns build with -DUNICODE (5fa30d2)
+ o Move event-config.h to include/event2 (ec347b9)
+
+TESTING
+ o Add options to test-ratelim.c to check its results (2b44dcc)
+ o Make test-ratelim clean up after itself better. (b5bfc44)
+ o Remove the now-obsolete setup_test() and cleanup_test() functions (e73f1d7)
+ o Remove all non-error prints from test/regress.c (8bc1e3d)
+ o Make test.sh exit with nonzero status if tests fail (faf2a04)
+ o Have the unit tests report errors from test.sh (3689bd2)
+ o Fix logic in correcting high values from FIONREAD (3467f2f)
+ o Add test for behavior on remote socket close (44d57ee)
+ o Unit test for event_get_struct_event_size() (7510aac)
+ o Make test/test.sh call test-changelist (7c92691)
+ o Fix badly-behaved subtest of dns/bufferevent_connect_hostname (840a72f Joachim Bauch)
+ o Add option to test-ratelim to test min_share (42f6b62)
+ o Fix an assertion bug in test-ratelim (b2c6202)
+ o Make tests quieter on local dns resolver failure (e996b3d)
+ o Increase the tolerance in our unit tests for sloppy clocks. (170ffd2)
+ o Use AF_INET socketpair to test sendfile on Solaris (9b60209)
+ o Make test-changelist count cpu usage right on win32 (ea1ea3d)
+
+INTERNALS, PERFORMANCE, AND CODE CLEANUPS
+ o Mark the event_err() functions as __attribute__((noreturn)) (33bbbed)
+ o Do not check that event_base is set in EVBASE_ACQUIRE_LOCK (218a3c3)
+ o Replace (safe) use of strcpy with memcpy to appease OpenBSD (caca2f4)
+ o Remove some dead assignments (47c5dfb)
+ o Fix a pedantic gcc 4.4 warning in event2/event.h (276e7ee)
+ o Drain th_notify_fd[0] more bytes at a time. (a5bc15b)
+ o Tidy up the code in evthread_make_base_notifiable a little (61e1eee)
+ o Pass flags to fcntl(F_SETFL) and fcntl(F_SETFD) as int, not long (7c2dea1)
+ o Remove unused variables in test/test-changelist.c (b00d4c0)
+ o Fix whitespace. (cb927a5)
+ o Improve error message for failed epoll to make debugging easier. (9e725f7)
+ o Turn our socketpair() replacement into its own function (57b30cd)
+
+
+
+Changes in 2.0.5-beta (10 May 2010):
+ [Autogenerated from the Git log, sorted by hand.]
+DOCUMENTATION
+ o Update all our copyright notices to say "2010" (17efc1c)
+ o Add Christopher Clark and Maxim Yegorushkin to the LICENSE file (38b7b57)
+ o Clarify Christopher Clark's status as writer of original ht code. (78772c3)
+ o Try to comment some of the event code more (cdd4c49)
+ o Add a few more evmap/changelist comments (c247adc)
+ o Add a comment to explain why evdns_request is now separte from request (ceefbe8)
+ o Document evutil_secure_rng_init() and evutil_secure_rng_add_bytes() (a5bf43a)
+ o Stop distributing and installing manpages: they were too inaccurate (7731ec8)
+
+NEW FEATURES AND INTERFACE CHANGES
+ o Remove signal_assign() and signal_new() macros. (2fac0f7)
+ o Make evdns use the regular logging system by default (b2f2be6)
+ o Allow evbuffer_read() to split across more than 2 iovecs (e470ad3)
+ o Functions to manipulate existing rate limiting groups. (ee41aca)
+ o Functions to track the total bytes sent over a rate limit group. (fb366c1)
+ o Detect and refuse reentrant event_base_loop() calls (b557b17)
+ o Limit the maximum number of events on each socket to 65535 (819f949)
+ o Add evbuffer_copyout to copy data from an evbuffer without draining (eb86c8c)
+ o Expose the request and reply members of rpc_req_generic() (07edf78 Shuo Chen)
+ o Add void* arguments to request_new and reply_new evrpc hooks (755fbf1 Shuo Chen)
+ o Seed the RNG using sysctl() as well as /dev/urandom (71fc3eb)
+ o Make evutil_secure_rng_init() work even with builtin arc4random (f980716)
+ o Report DNS error when lookup fails during bufferevent_socket_connect_hostname. (0ef4070 Christopher Davis)
+ o Release locks on bufferevents while executing callbacks (a5208fe Joachim Bauch) o Make debug mode catch mixed ET and non-ET events on an fd (cb67074)
+ o Catch attempts to enable debug_mode too late (9ecf0d4)
+ o Refuse null keys in evhttp_parse_query() (953e229 Frank Denis)
+
+BUGFIXES
+ o Avoid a spurious close(-1) on Linux (70a44b6)
+ o Do not close(-1) when freeing an uninitialized socket bufferevent (b34abf3)
+ o Free evdns_base->req_heads on evdns_base_free (859af67)
+ o Avoid an (untriggerable so far) crash bug in bufferevent_free() (0cf1431)
+ o Set mem_offset for every bufferevent type (657d1b6)
+ o Fix infrequent memory leak in bufferevent_init_common(). (8398641 Jardel Weyrich)
+ o Make evutil_signal_active() match declaration. (e1e703d Patrick Galbraith)
+ o Fix minheap code to use replacement malloc functions (a527618)
+ o Fix a free(NULL) in minheap-internal.h (6f20492)
+ o Fix critical bug in evbuffer_write when writev is not available (cda56ab)
+ o Make the no_iovecs case of write_atmost compile (8e227b0)
+ o Fix a memory leak when appending/prepending to a buffer with unused space. (45068a3)
+ o Clean up a mistake in pointer manipulation in evbuffer_remove (28bfed4 Christopher Davis)
+ o Always round up when there's a fractional number of msecs. (8f9e60c Christopher Davis)
+ o Fix compiler warnings under WIN32 (d469c50 Giuseppe Scrivano)
+ o Clean up properly when adding a signal handler fails. (b84b598 Gilad Benjamini) o Ensure that evdns_request is a persistent handle. (15bb82d Christopher Davis)
+ o Free search state when finished searching to avoid an infinite loop. (a625840 Christopher Davis)
+ o Assert for valid requests as necessary. (67072f3 Christopher Davis)
+ o do not leak the request object on persistent connections (9d8edf2)
+ o Make evdns logging threadsafe (b1c7950)
+ o Fix a couple of bugs in the BSD sysctl arc4seed logic (a47a4b7)
+ o Remove one last bug in last_with_datap logic. Found with valgrind (d49b92a)
+ o fix a leak when unpausing evrpc requests (94ee125)
+ o Fix a memory leak when unmarshalling RPC object arrays (f6ab2a2)
+ o Fix compilation when openssl support is disabled (40c301b)
+ o Allow empty reason line in HTTP status (739e688 Pierre Phaneuf)
+ o Fix a compile warning introduced in 739e688 (bd1ed5f Sebastian Hahn)
+ o Fix nonstandard TAILQ_FOREACH_REVERSE() definition (71afc52 Frank Denis)
+ o Try /proc on Linux as entropy fallback; use sysctl as last resort (20fda29)
+ o Fix symbol conflict between mm_*() macros and libmm (99e50e9)
+ o Fix some crazy macro mistakes in arc4random.c (90d4225)
+ o Make evbuffer_add_file() work on windows (dcdae6b)
+ o Fix unused-variable warning when building with threads disabled (ad811cd)
+ o Numerous opensolaris compilation fixes (c44de06)
+ o Fix getaddrinfo with protocol unset on Solaris 9. Found by Dagobert Michelsen (2cf2a28)
+ o Fix another nasty solaris getaddrinfo() behavior (3557071)
+ o Define _REENTRANT as needed on Solaris, elsewhere (c1cd32a)
+ o Fix some autoconf issues on OpenBSD (7c519df)
+
+BUILD AND DISTRIBUTION CHANGES
+ o Distribute libevent.pc.in, not libevent.pc (22aff04)
+ o Avoid errors in evutil.c when building with _UNICODE defined (b677032 Brodie Thiesfield)
+ o Avoid errors in http.c when building with VC 2003 .NET (13e4f3b Brodie Thiesfield)
+ o Support the standard 'make check' target in place of 'make verify' (426c8fb)
+ o Remove redundant stuff from EXTRA_DIST (b660edf)
+ o Switch to using AM conditionals in place of AC_LIBOBJ (2e898f5)
+ o Remove an orphaned RELEASE flag in Makefile.am (0794b0d)
+ o Give a better warning for bad automake versions. (77c917d)
+ o Use dist_bin_SCRIPTS, not EXTRA_DIST, to distribute scripts (9eb2fd7)
+ o Never test for select() on windows (3eb044d Trond Norbye)
+ o Do not inhibit automake dependencies generation (10c4c90 Giuseppe Scrivano)
+ o Create shared libraries under Windows (3cbca86 Giuseppe Scrivano)
+ o Add ctags/etags files to .gitignore (0861d17)
+ o Only specify -no-undefined on mingw (25433b9)
+ o Only add libevent_core.la to LIBADD on mingw (fdc6297)
+
+TESTING
+ o Get bench_http to work on Windows; add a switch to enable IOCP. (4ac38a5 Christopher Davis)
+ o VC has no getopt(), so do without in bench_http. (1273d2f Christopher Davis)
+ o Fix an obnoxious typo in the bufferevent_timeout_filter test (0d047c3)
+ o Fix a write of uninitialized RAM in regression tests (68dc742)
+ o Fix some memory leaks in the unit tests (274a7bd)
+ o Make 'main/many_events' test 70 fds, not 64. (33874b0)
+ o Unit-test every evbuffer_add_file() implementation. (06a4443)
+ o Add more unit tests for evbuffer_expand (8c83e99)
+ o Test another case of evbuffer_prepend (1234b95)
+ o Fix a possible double-free bug in SSL bufferevents with CLOSE_ON_FREE (7501895) o Add dns/search_cancel unit test. (39b870b Christopher Davis)
+ o Make http_base_test stop leaking an event_base. (96730d3)
+ o Detect broken unsetenv at unit-test runtime (f37cd4c)
+ o Implement regress_make_tempfile on win32 to test evbuffer_add_file (b4f12a1)
+ o add more (currently skipped) add_file tests on win32 (05de45d)
+ o Fix bench_http build on win32. (384d124)
+ o Make unit test for add_file able to tell "error" from "done" (88a543f)
+ o Make test for bufferevent_connect_hostname system-neutral (f89168e)
+ o Make test.sh support mingw/msys on win32 (0ee6f6c)
+ o Fix test.sh on freebsd (3d9e05b)
+
+INTERNALS, PERFORMANCE, AND AND CODE CLEANUPS
+ o Improve the speed of evbuffer_readln() (cc1600a)
+ o more whitespace normalization (2c2618d)
+ o Revise evbuffer to add last_with_data (2a6d2a1)
+ o Use last_with_data in place of previous_to_last (c8ac57f)
+ o Remove previous_to_last from evbuffer (6f47bd1)
+ o Fix last_with_data compilation on windows (1e7b986)
+ o Add some glass-box tests for the last_with_data code. (17da042)
+ o Improve robustness for refcounting (f1bc125)
+ o Remove a needless min_heap_shift_up_() call (7204b91)
+ o Increase MIN_BUFFER_SIZE to 512 (1024 on 64-bit) (2014ae4)
+ o Do not use evbuffer_expand() to add the first chain to a buffer (5c0ebb3)
+ o Make evbuffer_prepend handle empty buffers better (c87272b)
+ o Replace last_with_data with a slightly smarter version (b7442f8)
+ o Turn the increasingly complex *_CHAIN() macros into functions (96865c4)
+ o Rewrite evbuffer_expand and its users (d5ebcf3)
+ o Add evutil_tv_to_msec for safe conversion of timevals to milliseconds. (850c3ff Christopher Davis)
+ o Initialize last_with_datap correctly in evbuffer_overlapped (a0983b6)
+ o Replace EVUTIL_CLOSESOCKET macro with a function (899c1dc Sebastian Sjöberg)
+ o Move domain search state to evdns_request. (beaa14a Christopher Davis)
+ o Remove redundant checks for lock!=NULL before calling EVLOCK_LOCK (50ec59f)
+ o Rename current_base symbol to event_global_current_base_ (c16e684)
+ o Fix whitespace in evutil.c (935e150)
+ o Replace users of "int fd" with "evutil_socket_t fd" in portable code (c7cf6f0)
+
+
+
+Changes in 2.0.4-alpha (28 Feb 2010):
+ [Autogenerated from the Git log, sorted by hand.]
+DOCUMENTATION
+ o Add stub header for 2.0.4-alpha changelog. (94d0065)
+ o Improve the README with more information and links. (0b42726)
+ o Add more people who wrote patches to the acknowledgments (0af10d5)
+ o Add a warning about the use of event_initialized. (f32b575)
+ o Add a LICENSE file so people can find our license easily (7067006)
+ o Add a new "hello world" sample program (becb9f9)
+ o Clarify status of example programs (d60a1bd)
+ o Update time-test.c to use event2 (f4190bf)
+ o Add the arc4random.c license to the LICENSE file. (e15e1e9)
+
+NEW FEATURES AND INTERFACE CHANGES
+ o Improved optional lock debugging. (0cd3bb9)
+ o Rate-limiting for bufferevents; group and individual limits are supported. (737c9cd)
+ o Testing code for bufferevent rate-limiting. (f0c0124)
+ o Make the initial nameserver probe timeout configurable. (1e56a32)
+ o Revise the locking API: deprecate the old locking callbacks and add trylock. (347952f)
+ o Do not make bufferevent_setfd implicitly disable EV_READ and EV_WRITE. (8274379)
+ o Do not ignore bufferevent_enable(EV_READ) before bufferevent_connect(). (4a5b534)
+ o Introduced evutil_make_socket_closeonexec() to preserve fd flags for F_SETFD. (d0939d2 Jardel Weyrich)
+ o evdns_getaddrinfo() now supports the /etc/hosts file. (72dd666)
+ o Look at the proper /etc/hosts file on windows. (66c02c7)
+ o Allow http connections to use evdns for hostname looksups. (c698b77)
+ o Changelist code to defer event changes until just before dispatch (27308aa)
+ o do not use a function to assign the evdns base; instead assign it via evhttp_connection_base_new() which is a new function introduced in 2.0 (5032e52)
+ o Functions to access more fields of struct event. (0683950)
+ o Make kqueue use changelists. (45e5ae3)
+ o Remove kqueue->pend_changes. (3225dfb)
+ o Minimize epoll_ctl calls by using changelist (c8c6a89)
+ o Add support for a "debug mode" to try to catch common errors. (cd17c3a)
+ o Note a missing ratelim function (361da8f)
+ o Add ev_[u]intptr_t to include/event2/util.h (1fa4c81)
+ o const-ify a few more functions in event.h (d38a7a1)
+ o Deprecate EVENT_FD and EVENT_SIGNAL. (f6b2694)
+ o Remove EVUTIL_CHECK_FMT. (6c21c89)
+ o Add EV_*_MAX macros to event2/util.h to expose limits for ev_* types. (aba1fff) o Functions to view and manipulate rate-limiting buckets. (85047a6)
+ o Add the rest of the integer limits, and add a test for them. (60742d5)
+ o Remove the 'flags' argument from evdns_base_set_option() (1dd7e6d)
+ o Add an arc4random implementation for use by evdns (d4de062)
+ o Use off_t for the length parameter of evbuffer_add_file (3fe60fd)
+ o Construct Windows locks using InitializeCriticalSectionAndSpinCount (32c6f1b)
+ o Expose view of current rate limit as constrained by group limit (162ce8a)
+ o Provide consistent, tested semantics for bufferevent timeouts (d328829)
+
+BUGFIXES AND TESTS
+ o Tolerate code that returns from a fatal_cb. (91fe23f)
+ o Parenthesize macro arguments more aggressively (07e9e9b)
+ o Fix memory-leak of signal handler array with kqueue. (e1ffbb8)
+ o Stop passing EVTHREAD_READ and EVTHREAD_WRITE to non-rw locks. (76cd2b7)
+ o Fix two use-after-free bugs in unit tests spoted by lock debugging (d84d838)
+ o Fix a locking bug in event_base_loop() (da1718b)
+ o Fix an evdns lock violation. (2df1f82 Zhuang Yuyao)
+ o Valgrind fix: Clear struct kevent before checking for OSX bug. (56771a3 William Ahern)
+ o Fix up evthread compilation on windows (bd6f1ba Roman Puls)
+ o Fix regress_iocp.c usage of old lock allocation macros. (31687b4 unknown)
+ o Update nmake makefile to build evthread.c (b62d979 unknown)
+ o Fix a crash when reading badly formatted resolve.conf; from Yasuoka Masahiko (6c7c579 Yasuoka Masahiko)
+ o Fix a snow leopard compile warning in the unit tests. (7ae9445)
+ o Fix compile on Snow Leopard with gcc warnings enabled (70cdfe4 Sebastian Hahn)
+ o Only define _GNU_SOURCE if it is not already defined. (ea6b1df Joachim Bauch)
+ o Update sample/signal-test.c to use newer APIs and not leak. (f6430ac Evan Jones)
+ o Fix a segfault when writing a very fragmented evbuffer onto an SSL (a6adeca Joachim Bauch)
+ o Fix a segfault when freeing SSL bufferevents in an unusual order (a773df5 Joachim Bauch)
+ o Drop install-sh from our git repo: a mismatched version could break "make dist" (6799527)
+ o Set all instances of the version number correctly. (5a112d3)
+ o Fix a few locking issues on windows. (c51bb3c unknown)
+ o Use evutil_socket_t, not int, when logging socket errors. (292467c)
+ o Fix up behavior of never-defered callbacks a little (390e056)
+ o Replace some cases of uint32_t with ev_uint32_t. (a47d88d)
+ o Fix compilation of devpoll.c by adding missing thread includes. (fee2c77 Dagobert Michelsen)
+ o Make evutil_make_socket_nonblocking() leave any other flags alone. (4c8b7cd Jardel Weyrich)
+ o Fix an fd leak in evconnlistener_new_bind(). (24fb502 Jardel Weyrich)
+ o Fix a bogus free in evutil_new_addrinfo() (0d64051 Jardel Weyrich)
+ o Adjusted fcntl() retval comparison on evutil_make_socket_nonblocking(). (4df7dbc Jardel Weyrich)
+ o Fix the code that allowed DNS options to not end with : (ee4953f)
+ o Fix crash bugs when a bufferevent's eventcb is not set. (2e8eeea)
+ o Fix test-ratelim compilation on Linux. (885b427)
+ o Fix compilation of rate-limiting code on win32. (165d30e)
+ o Eradicated the last free() call. Let mm_free() take care of deallocation. (0546ce1 Jardel Weyrich)
+ o Fix byte counts when mixing deferred and non-deferred evbuffer callbacks. (29151e6)
+ o Fixed a memory leak on windows threads implementation. The CRITICAL_SECTION was not being free'd in evthread_win32_lock_free(). (2f33e00 Jardel Weyrich)
+ o Fixed a fd leak in start_accepting(), plus cosmetic changes (4367a33 Jardel Weyrich)
+ o Improved error handling in evconnlistener_new_async(). Also keeping the fd open because it is not opened by this function, so the caller is responsible for closing it. Additionally, since evconnlistener_new_bind() creates a socket and passes it to the function above, it required error checking to close the same socket. (fec66f9 Jardel Weyrich)
+ o Don't use a bind address for nameservers on loopback (8d4aaf9)
+ o Fix compilation of rate-limit code when threading support is disabled (97a8c79)
+ o Detect setenv/unsetenv; skip main/base_environ test if we can't fake them. (7296971)
+ o Check more internal event_add() calls for failure (ff3f6cd)
+ o Fix windows and msvc build (5c7a7bc)
+ o Call event_debug_unassign on internal events (a19b4a0)
+ o Try to fix a warning in hash_debug_entry (137f2c6)
+ o Fix a dumb typo in ev_intptr_t definitions. (27c9a40)
+ o do not fail while sending on http connections the client closed. (93d7369)
+ o make evhttp_send() safe against terminated connections, too (3978180)
+ o Make Libevent 1.4.12 build on win32 with Unicode enabled. (000a33e Brodie Thiesfield)
+ o Fix some additional -DUNICODE issues on win32. (a7a9431)
+ o Add a check to make soure our EVUTIL_AI flags do not conflict with the native ones (c18490e)
+ o Always use our own gai_strerror() replacement. (6810bdb)
+ o Make RNG work when we have arc4random() but not arc4random_buf() (4ec8fea)
+ o validate close cb on server when client connection closes (2f782af)
+ o Fix two unlocked reads in evbuffer. (7116bf2)
+ o When working without a current event base, don't try to use IOCP listeners (cb52838)
+ o Fix getpid() usage on Windows (ff2a134)
+ o Add a unit test for secure rng. (48a29b6)
+ o Add some headers to fix freebsd compilation (b72be50)
+ o When connect() succeeds immediately, don't invoke the callback immediately. (7515de9)
+ o Suspend read/write on bufferevents during hostname lookup (db08f64)
+ o Make bufferevent_free() clear all callbacks immediately. (b2fbeb3)
+ o Fix some race conditions in persistent events and event_reinit (e2642f0)
+ o Fix a bug in resetting timeouts on persistent events when IO triggers. (38ec0a7)
+ o Add a test for timeouts on filtering bufferevents. (c02bfe1)
+ o Add test for periodic timers that get activated for other reasons (8fcb7a1)
+ o Use new timeval diff comparison function in bufferevent test (f3dfe46)
+ o Delete stack-alloced event in new unit test before returning. (7ffd387)
+ o Fix mingw compilation (23170a6)
+ o Try to define a sane _EVENT_SIZEOF_SIZE_T for msvc compilation (1e14f82)
+ o Fix arc4random compilation on MSVC. (98edb89)
+ o deal with connect() failing immediately (7bc48bf)
+ o Small cleanups on freebsd-connect-refused patch. (57b7248)
+
+BUILD AND DISTRIBUTION CHANGES
+ o Remove the contents of WIN32-Prj as unmaintained. (c69d5a5)
+ o Allow the user to redirect the verbose output of test/test.sh to a file (c382de6)
+ o Allow test.sh to be run as ./test/test.sh (7dfbe94)
+ o Never believe that we have pthreads on win32, even if gcc thinks we do. (78ed097)
+ o Make it compile under gcc --std=c89. (e2ca403)
+ o Fix a number of warnings from gcc -pedantic (918e9c5)
+ o Add the msvc-generated .lib files to .gitignore. (e244a2e)
+ o Add the "compile" script to gitignore. (1ba6bed)
+
+INTERNALS AND CODE CLEANUPS
+ o Add a .gitignore file. (ba34071)
+ o New EVTHREAD_TRY_LOCK function to try to grab a lock. (689fc09)
+ o Add the abilitity to mark some buffer callbacks as never-deferred. (438f9ed)
+ o Refactor our 'suspend operation' logic on bufferevents. (0d744aa)
+ o Simplify the read high-watermark checking. (5846bf6)
+ o Improve readability of evutil_unparse_protoname() (5a43df8 Jardel Weyrich)
+ o Expose our cached gettimeofday value with a new interface (47854a8)
+ o Whitespace fixes in test.sh (0b151a9)
+ o Enable branch-prediction hints with EVUTIL_UNLIKELY. (eaaf27f)
+ o Refactor code from evdns into a new internal "read a file" function. (0f7144f)
+ o Comestic changes in evconnlistener_new(), new_accepting_socket(), accepted_socket_invoke_user_cb() and iocp_listener_enable(). (510ab6b Jardel Weyrich)
+ o Add unit-test for bad_request bug fixed in 1.4 recently. (6cc79c6 Pavel Plesov) o Add a comment on evthread_enable_lock_debuging. (b9f43b2)
+ o Fix test.sh on shells without echo -n (94131e9)
+ o More unit tests for getaddrinfo_async: v4timeout and cancel. (a334b31)
+ o Make http use evconnlistener. (ec34533)
+ o move dns utility functions into a separate file so that we can use them for http testing (b822639)
+ o add a test for evhttp_connection_base_new with a dns_base (26714ca)
+ o forgot to add void to test function (78a50fe)
+ o Add a forgotten header (changelist-internal.h) (4b9f307)
+ o Remove some commented-out code in evutil (26e1b6f)
+ o Remove a needless include of rpc_compat.h (70a4a3e)
+ o Use less memory for each entry in a hashtable (a66e947)
+ o Try to untangle the logic in server_port_flush(). (439aea0)
+ o Use ev_[u]intptr_t types in place of [u]intptr_t (cef61a2)
+ o Reduce windows header includes in our own headers. (da6135e)
+ o clean up terminate_chunked test (e8a9782)
+ o Increment the submicro version number. (63e868e)
+ o Update event-config.h version number to match configure.in (aae7db5)
+ o Clean up formatting: Disallow space-before-tab. (8fdf09c)
+ o Clean up formatting: use tabs, not 8-spaces, to indent. (e5bbd40)
+ o Clean up formatting: remove trailing spaces (e5cf987)
+ o Clean up formatting: function/keyword spacing consistency. (4faeaea)
+
+
+
+Changes in 2.0.3-alpha (20 Nov 2009):
+ o Add a new code to support SSL/TLS on bufferevents, using the OpenSSL library (where available).
+ o Fix a bug where we didn't allocate enough memory in event_get_supported_methods().
+ o Avoid segfault during failed allocation of locked evdns_base. (Found by Rocco Carbone.)
+ o Export new evutil_ascii_* functions to perform locale-independent character type operations.
+ o Try to compile better with MSVC: patches from Brodie Thiesfield
+ o New evconnlistener_get_fd function to expose a listener's associated socket.
+ o Expose an ev_socklen_t type for consistent use across platforms.
+ o Make bufferevent_socket_connect() work when the original fd was -1.
+ o Fix a bug in bufferevent_socket_connect() when the connection succeeds too quickly.
+ o Export an evutil_sockaddr_cmp() to compare to sockaddr objects for equality.
+ o Add a bufferevent_get_enabled() to tell what a bufferevent has been configured to do.
+ o Add an evbuffer_search_eol() function to locate the end of a line nondestructively.
+ o Add an evbuffer_search_range() function to search a bounded range of a buffer.
+ o Fix a rare crash bug in evdns.
+ o Have bufferevent_socket_connect() with no arguments put a bufferevent into connecting mode.
+ o Support sendfile on Solaris: patch from Caitlin Mercer.
+ o New functions to explicitly reference a socket used by an evhttp object. Patches from David Reiss.
+ o When we send a BEV_EVENT_CONNECTED to indicate connected status, we no longer invoke the write callback as well unless we actually wrote data too.
+ o If the kernel tells us that there are a negative number of bytes to read from a socket, do not believe it.  Fixes bug 2841177; found by Alexander Pronchenkov.
+ o Do not detect whether we have monotonic clock support every time a new event base is created: instead do it only once.  Patch taken from Chromium.
+ o Do not allocate the maximum event queue for the epoll backend at startup.  Instead, start out accepting 32 events at a time, and double the queue's size when it seems that the OS is generating events faster than we're requesting them.  Saves up to 374K per epoll-based event_base.  Resolves bug 2839240.
+ o Treat an event with a negative fd as valid but untriggerable by Libevent.  This is useful for applications that want to manually activate events.
+ o Fix compilation on Android, which forgot to define fd_mask in its sys/select.h
+ o Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec
+ o New event_base_got_exit() and event_base_got_break() functions to tell whether an event loop exited because of an event_base_loopexit() or an event_base_loopbreak().  Patch from Ka-Hing Cheung.
+ o When adding or deleting an event from a non-main thread, only wake up the main thread when its behavior actually needs to change.
+ o Fix some bugs when using the old evdns interfaces to initialize the evdns module.
+ o Detect errors during bufferevent_connect().  Patch from Christopher Davis.
+ o Fix compilation for listener.h for C++ - missing extern "C".  Patch from Ferenc Szalai.
+ o Make the event_base_loop() family of functions respect thread-safety better.  This should clear up a few hard-to-debug race conditions.
+ o Fix a bug when using a specialized memory allocator on win32.
+ o Have the win32 select() backend label TCP-socket-connected events as EV_WRITE, not EV_READ.  This should bring it in line with the other backends, and improve portability.  Patch from Christopher Davis.
+ o Stop using enums as arguments or return values when what we mean is a bitfield of enum values.  C++ doesn't believe that you can OR two enum values together and get another enum, and C++ takes its typing seriously.  Patch from Christopher Davis.
+ o Add an API to replace all fatal calls to exit() with a user-provided panic function.
+ o Replace all assert() calls with a variant that is aware of the user-provided logging and panic functions.
+ o Add a return value to event_assign so that it can fail rather than asserting when the user gives it bad input.  event_set still dies on bad input.
+ o The event_base_new() and event_base_new_with_config() functions now never call exit() on failure.  For backward "compatibility", event_init() still does, but more consistently.
+ o Remove compat/sys/_time.h.  It interfered with system headers on HPUX, and its functionality has been subsumed by event2/util.h and util-internal.h.
+ o Add a new bufferevent_socket_connect_hostname() to encapsulate the resolve-then-connect operation.
+ o Build kqueue.c correctly on GNU/kFreeBSD platforms. Patch pulled upstream from Debian.
+ o Alternative queue-based timeout algorithm for programs that use a large number of timeouts with the same value.
+ o New event_base_config option to disable the timeval cache entirely.
+ o Make EV_PERSIST timeouts more accurate: schedule the next event based on the scheduled time of the previous event, not based on the current time.
+ o Allow http.c to handle cases where getaddrinfo returns an IPv6 address.  Patch from Ryan Phillips.
+ o Fix a problem with excessive memory allocation when using multiple event priorities.
+ o Default to using arc4random for DNS transaction IDs on systems that have it; from OpenBSD.
+ o Never check the environment when we're running setuid or setgid; from OpenBSD.
+ o Options passed to evdns_set_option() no longer need to end with a colon.
+ o Add an evutil_getaddrinfo() function to clone getaddrinfo on platforms that don't have it.
+ o Add an evdns_getaddrinfo() function to provide a nonblocking getaddrinfo using evdns, so programs can perform useful hostname lookup.
+ o Finally expose the IOCP-based bufferevent backend.  It passes its unit tests, but probably still has some bugs remaining.  Code by Nick Mathewson and Christopher Davis.
+ o Numerous other bugfixes.
+ o On FreeBSD and other OSes, connect can return ECONREFUSED immediately; instead of failing the function call, pretend with faileld in the callback.
+ o Fix a race condition in the pthreads test case; found by Nick Mathewson
+ o Remove most calls to event_err() in http and deal with memory errors instead
+
+
+
+Changes in 2.0.2-alpha (25 Jul 2009):
+ o Add a new flag to bufferevents to make all callbacks automatically deferred.
+ o Make evdns functionality locked, and automatically defer dns callbacks.
+ o Fix a possible free(NULL) when freeing an event_base with no signals.
+ o Add a flag to disable checking environment varibles when making an event_base
+ o Disallow setting less than 1 priority.
+ o Fix a bug when removing a timeout from the heap. [Patch from Marko Kreen]
+ o Use signal.h, not sys/signal.h. [Patch from mmadia]
+ o Try harder to build with certain older c99 compilers.
+ o Make sure that an event_config's flags field is always initialized to 0. [Bug report from Victor Goya]
+ o Avoid data corruption when reading data entirely into the second-to-last chain of an evbuffer. [Bug report from Victor Goya]
+ o Make sendfile work on FreeBSD
+ o Do not use vararg macros for accessing evrpc structures; this is not backwards compatible, but we did not promise any backwards compatibility for the rpc code.
+ o Actually define the event_config_set_flag() function.
+ o Try harder to compile with Visual C++.
+ o Move event_set() and its allies to event2/event_compat.h where they belong.
+ o Remove the event_gotsig code, which has long been deprecated and unused.
+ o Add an event_get_base() function to return the base assigned to an event.
+ o New function to automate connecting on a socket-based bufferevent.
+ o New functions to automate listening for incoming TCP connections.
+ o Do case-insensitive checks with a locale-independent comparison function.
+ o Rename the evbuffercb and everrorcb callbacks to bufferevent_data_cb and bufferevent_event_cb respectively.  The old names are available in bufferevent_compat.h.
+ o Rename the EVBUFFER_* codes used by bufferevent event callbacks to BEV_EVENT_*, to avoid namespace collision with evbuffer flags.  The old names are available in bufferevent_compat.h.
+ o Move the EVBUFFER_INPUT and EVBUFFER_OUTPUT macros to bufferevent_compat.h
+ o Add a bufferevent_getfd() function to mirror bufferevent_setfd()
+ o Make bufferevent_setfd() return an error code if the operation is not successful.
+ o Shave 22 bytes off struct event on 32-bit platforms by shrinking and re-ordering fields.  The savings on 64-bit platforms is likely higher.
+ o Cap the maximum number of priorities at 256.
+ o Change the semantics of evbuffer_cb_set_flags() to be set-flag only; add a new evbuffer_cb_clear_flags() to remove set flags.
+ o Change the interface of evbuffer_add_reference so that the cleanup callback gets more information
+ o Revise the new evbuffer_reserve_space/evbuffer_commit_space() interfaces so that you can use them without causing extraneous copies or leaving gaps in the evbuffer.
+ o Add a new evbuffer_peek() interface to inspect data in an evbuffer without removing it.
+ o Fix a deadlock when suspending reads in a bufferevent due to a full buffer. (Spotted by Joachim Bauch.)
+ o Fix a memory error when freeing a thread-enabled event base with registered events. (Spotted by Joachim Bauch.)
+ o Try to contain degree of failure when running on a win32 version so heavily firewalled that we can't fake a socketpair.
+ o Activate fd events in a pseudorandom order with O(N) backends, so that we don't systematically favor low fds (select) or earlier-added fds (poll, win32).
+ o Replace some read()/write() instances with send()/recv() to work properly on win32.
+ o Set truncated flag correctly in evdns server replies.
+ o Raise RpcGenError in event_rpcgen.py; from jmanison and Zack Weinberg
+ o Fix preamble of rpcgen-generated files to rely on event2 includes; based on work by jmansion; patch from Zack Weinberg.
+ o Allow specifying the output filename for rpcgen; based on work by jmansion; patch from Zack Weinberg.
+ o Allow C identifiers as struct names; allow multiple comments in .rpc files; from Zack Weinberg
+ o Mitigate a race condition when using socket bufferevents in multiple threads.
+ o Use AC_SEARCH_LIBS, not AC_CHECK_LIB to avoid needless library use.
+ o Do not allow event_del(ev) to return while that event's callback is executing in another thread.  This fixes a nasty race condition.
+ o event_get_supported_methods() now lists methods that have been disabled with the EVENT_NO* environment options.
+ o Rename encode_int[64] to evtag_encode_int[64] to avoid polluting the global namespace.  The old method names are still available as macros in event2/tag_compat.h.
+
+
+
+Changes in 2.0.1-alpha (17 Apr 2009):
+ o free minheap on event_base_free(); from Christopher Layne
+ o debug cleanups in signal.c; from Christopher Layne
+ o provide event_base_new() that does not set the current_base global
+ o bufferevent_write now uses a const source argument; report from Charles Kerr
+ o improve documentation on event_base_loopexit; patch from Scott Lamb
+ o New function, event_{base_}loopbreak.  Like event_loopexit, it makes an event loop stop executing and return.  Unlike event_loopexit, it keeps subsequent pending events from getting executed.  Patch from Scott Lamb
+ o Check return value of event_add in signal.c
+ o provide event_reinit() to reintialize an event_base after fork
+ o New function event_set_mem_functinons.  It allows the user to give libevent replacement functions to use for memory management in place of malloc(), free(), etc.  This should be generally useful for memory instrumentation, specialized allocators, and so on.
+ o The kqueue implementation now catches signals that are raised after event_add() is called but before the event_loop() call.  This makes it match the other implementations.
+ o The kqueue implementation now restores original signal handlers correctly when its signal events are removed.
+ o Check return value of event_add in signal.c
+ o Add a more powerful evbuffer_readln as a replacement for evbuffer_readline.  The new function handles more newline styles, and is more useful with buffers that may contain a nul characters.
+ o Do not mangle socket handles on 64-bit windows.
+ o The configure script now takes an --enable-gcc-warnings option that turns on many optional gcc warnings.  (Nick has been building with these for a while, but they might be useful to other developers.)
+ o move EV_PERSIST handling out of the event backends
+ o small improvements to evhttp documentation
+ o always generate Date and Content-Length headers for HTTP/1.1 replies
+ o set the correct event base for HTTP close events
+ o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
+ o Rewrite win32.c backend to be O(n lg n) rather than O(n^2).
+ o Removed obsoleted recalc code
+ o support for 32-bit tag numbers in rpc structures; this is wire compatible, but changes the API slightly.
+ o pull setters/getters out of RPC structures into a base class to which we just need to store a pointer; this reduces the memory footprint of these structures.
+ o prefix {encode,decode}_tag functions with evtag to avoid collisions
+ o fix a bug with event_rpcgen for integers
+ o Correctly handle DNS replies with no answers set (Fixes bug 1846282)
+ o add -Wstrict-aliasing to warnings and more cleanup
+ o removed linger from http server socket; reported by Ilya Martynov
+ o event_rpcgen now allows creating integer arrays
+ o support string arrays in event_rpcgen
+ o change evrpc hooking to allow pausing of RPCs; this will make it possible for the hook to do some meaning ful work; this is not backwards compatible.
+ o allow an http request callback to take ownership of a request structure
+ o allow association of meta data with RPC requests for hook processing
+ o associate more context for hooks to query such as the connection object
+ o remove pending timeouts on event_base_free()
+ o also check EAGAIN for Solaris' event ports; from W.C.A. Wijngaards
+ o devpoll and evport need reinit; tested by W.C.A Wijngaards
+ o event_base_get_method; from Springande Ulv
+ o Send CRLF after each chunk in HTTP output, for compliance with RFC2626.  Patch from "propanbutan".  Fixes bug 1894184.
+ o Add a int64_t parsing function, with unit tests, so we can apply Scott Lamb's fix to allow large HTTP values.
+ o Use a 64-bit field to hold HTTP content-lengths.  Patch from Scott Lamb.
+ o Allow regression code to build even without Python installed
+ o remove NDEBUG ifdefs from evdns.c
+ o detect integer types properly on platforms without stdint.h
+ o udpate documentation of event_loop and event_base_loop; from Tani Hosokawa.
+ o simplify evbuffer by removing orig_buffer
+ o do not insert event into list when evsel->add fails
+ o add support for PUT/DELETE requests; from Josh Rotenberg
+ o introduce evhttp_accept_socket() to accept from an already created socket
+ o include Content-Length in reply for HTTP/1.0 requests with keep-alive
+ o increase listen queue for http sockets to 128; if that is not enough the evhttp_accpet_socket() api can be used with a prepared socket.
+ o Patch from Tani Hosokawa: make some functions in http.c threadsafe.
+ o test support for PUT/DELETE requests; from Josh Rotenberg
+ o rewrite of the evbuffer code to reduce memory copies
+ o Some older Solaris versions demand that _REENTRANT be defined to get strtok_r(); do so.
+ o Do not free the kqop file descriptor in other processes, also allow it to be 0; from Andrei Nigmatulin
+ o Provide OpenSSL style support for multiple threads accessing the same event_base
+ o make event_rpcgen.py generate code include event-config.h; reported by Sam Banks.
+ o switch thread support so that locks get allocated as they are needed.
+ o make event methods static so that they are not exported; from Andrei Nigmatulin
+ o make RPC replies use application/octet-stream as mime type
+ o do not delete uninitialized timeout event in evdns
+ o Correct the documentation on buffer printf functions.
+ o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select.
+ o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c.  This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed.
+ o Make name_from_addr() threadsafe in http.c
+ o Add new thread-safe interfaces to evdns functions.
+ o Make all event_tagging interfaces threadsafe.
+ o Rename internal memory management functions.
+ o New functions (event_assign, event_new, event_free) for use by apps that want to be safely threadsafe, or want to remain ignorant of the contents of struct event.
+ o introduce bufferevent_read_buffer; allows reading without memory copy.
+ o expose bufferevent_setwatermark via header files and fix high watermark on read
+ o fix a bug in buffrevent read water marks and add a test for them
+ o fix a bug in which bufferevent_write_buffer would not schedule a write event
+ o provide bufferevent_input and bufferevent_output without requiring knowledge of the structure
+ o introduce bufferevent_setcb and bufferevent_setfd to allow better manipulation of bufferevents
+ o convert evhttp_connection to use bufferevents.
+ o use libevent's internal timercmp on all platforms, to avoid bugs on old platforms where timercmp(a,b,<=) is buggy.
+ o Remove the never-exported, never-used evhttp_hostportfile function.
+ o Support input/output filters for bufferevents; somewhat similar to libio's model.  This will allow us to implement SSL, compression, etc, transparently to users of bufferevents such as the http layer.
+ o allow connections to be removed from an rpc pool
+ o add new evtimer_assign, signal_assign, evtimer_new, and signal_new functions to manipulate timer and signal events, analagous to the now-recommended event_assign and event_new
+ o switch internal uses of event_set over to use event_assign.
+ o introduce evbuffer_contiguous_space() api that tells a user how much data is available in the first buffer chain
+ o introduce evbuffer_reserve_space() and evbuffer_commit_space() to make processing in filters more efficient.
+ o reduce system calls for getting current time by caching it.
+ o separate signal events from io events; making the code less complex.
+ o support for periodic timeouts
+ o support for virtual HTTP hosts.
+ o turn event_initialized() into a function, and add function equivalents to EVENT_SIGNAL and EVENT_FD so that people don't need to include event_struct.h
+ o Build test directory correctly with CPPFLAGS set.
+ o Provide an API for retrieving the supported event mechanisms.
+ o event_base_new_with_config() and corresponding config APIs.
+ o migrate the evhttp header to event2/ but accessors are still missing.
+ o deprecate timeout_* event functions by moving them to event_compat.h
+ o Move	windows gettimeofday replacement into a new evutil_gettimeofday().
+ o Make configure script work on IRIX.
+ o provide a method for canceling ongoing http requests.
+ o Make vsnprintf() returns consistent on win32.
+ o Fix connection keep-alive behavior for HTTP/1.0
+ o Fix use of freed memory in event_reinit; pointed out by Peter Postma
+ o constify struct timeval * where possible
+ o make event_get_supported_methods obey environment variables
+ o support for edge-triggered events on epoll and kqueue backends: patch from Valery Kholodkov
+ o support for selecting event backends by their features, and for querying the features of a backend.
+ o change failing behavior of event_base_new_with_config: if a config is provided and no backend is selected, return NULL instead of aborting.
+ o deliver partial data to request callbacks when chunked callback is set even if there is no chunking on the http level; allows cancelation of requests from within the chunked callback; from Scott Lamb.
+ o allow min_heap_erase to be called on removed members; from liusifan.
+ o Rename INPUT and OUTPUT to EVRPC_INPUT and EVRPC_OUTPUT.  Retain INPUT/OUTPUT aliases on on-win32 platforms for backwards compatibility.
+ o Do not use SO_REUSEADDR when connecting
+ o Support 64-bit integers in RPC structs
+ o Correct handling of trailing headers in chunked replies; from Scott Lamb.
+ o Support multi-line HTTP headers; based on a patch from Moshe Litvin
+ o Reject negative Content-Length headers; anonymous bug report
+ o Detect CLOCK_MONOTONIC at runtime for evdns; anonymous bug report	
+ o Various HTTP correctness fixes from Scott Lamb
+ o Fix a bug where deleting signals with the kqueue backend would cause subsequent adds to fail
+ o Support multiple events listening on the same signal; make signals regular events that go on the same event queue; problem report by Alexander Drozdov.
+ o Fix a problem with epoll() and reinit; problem report by Alexander Drozdov.	
+ o Fix off-by-one errors in devpoll; from Ian Bell
+ o Make event_add not change any state if it fails; reported by Ian Bell.
+ o Fix a bug where headers arriving in multiple packets were not parsed; fix from Jiang Hong; test by me.
+ o Match the query in DNS replies to the query in the request; from Vsevolod Stakhov.
+ o Add new utility functions to correctly observe and log winsock errors.
+ o Do not remove Accept-Encoding header
+ o Clear the timer cache on entering the event loop; reported by Victor Chang
+ o Only bind the socket on connect when a local address has been provided; reported by Alejo Sanchez
+ o Allow setting of local port for evhttp connections to support millions of connections from a single system; from Richard Jones.
+ o Clear the timer cache when leaving the event loop; reported by Robin Haberkorn
+ o Fix a typo in setting the global event base; reported by lance.
+ o Set the 0x20 bit on outgoing alphabetic characters in DNS requests randomly, and insist on a match in replies.  This helps resist DNS poisoning attacks.
+ o Make the http connection close detection work properly with bufferevents and fix a potential memory leak associated with it.
+ o Restructure the event backends so that they do not need to keep track of events themselves, as a side effect multiple events can use the same fd or signal.
+ o Add generic implementations for parsing and emiting IPv6 addresses on platforms that do not have inet_ntop and/or inet_pton.
+ o Allow DNS servers that have IPv6 addresses.
+ o Add an evbuffer_write_atmost() function to write a limited number of bytes to an fd.
+ o Refactor internal notify-main-thread logic to prefer eventfd to pipe, then pipe to socketpair, and only use socketpairs as a last resort.
+ o Try harder to pack all evbuffer reads into as few chains as possible, using readv/WSARecv as appropriate.
+ o New evthread_use_windows_threads() and evthread_use_pthreads() functions to set up the evthread callbacks with reasonable defaults.
+ o Change the semantics of timeouts in conjunction with EV_PERSIST; timeouts in that case will now repeat until deleted.
+ o sendfile, mmap and memory reference support for evbuffers.
+ o New evutil_make_listen_socket_reuseable() to abstract SO_REUSEADDR.
+ o New bind-to option to allow DNS clients to bind to an arbitrary port for outgoing requests.
+ o evbuffers can now be "frozen" to prevent operations at one or both ends.
+ o Bufferevents now notice external attempts to add data to an inbuf or remove it from an outbuf, and stop them.
+ o Fix parsing of queries where the encoded queries contained \r, \n or +
+ o Do not allow internal events to starve lower-priority events.
+
diff --git a/extra/libevent/libevent-2.1.11-stable/LICENSE b/extra/libevent/libevent-2.1.11-stable/LICENSE
new file mode 100644
index 000000000000..402ca50896cd
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/LICENSE
@@ -0,0 +1,99 @@
+Libevent is available for use under the following license, commonly known
+as the 3-clause (or "modified") BSD license:
+
+==============================
+Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+==============================
+
+Portions of Libevent are based on works by others, also made available by
+them under the three-clause BSD license above.  The copyright notices are
+available in the corresponding source files; the license is as above.  Here's
+a list:
+
+log.c:
+   Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+   Copyright (c) 1993 The Regents of the University of California.
+
+strlcpy.c:
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+win32select.c:
+   Copyright (c) 2003 Michael A. Davis <mike@datanerds.net>
+
+evport.c:
+   Copyright (c) 2007 Sun Microsystems
+
+ht-internal.h:
+   Copyright (c) 2002 Christopher Clark
+
+minheap-internal.h:
+   Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
+
+==============================
+
+The arc4module is available under the following, sometimes called the
+"OpenBSD" license:
+
+   Copyright (c) 1996, David Mazieres <dm@uun.org>
+   Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+==============================
+
+The Windows timer code is based on code from libutp, which is
+distributed under this license, sometimes called the "MIT" license.
+
+
+Copyright (c) 2010 BitTorrent, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/extra/libevent/libevent-2.1.11-stable/README.md b/extra/libevent/libevent-2.1.11-stable/README.md
new file mode 100644
index 000000000000..8be37f495056
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/README.md
@@ -0,0 +1,469 @@
+<p align="center">
+  <img src="https://strcpy.net/libevent3.png" alt="libevent logo"/>
+</p>
+
+
+
+[![Appveyor Win32 Build Status](https://ci.appveyor.com/api/projects/status/ng3jg0uhy44mp7ik?svg=true)](https://ci.appveyor.com/project/libevent/libevent)
+[![Travis Build Status](https://travis-ci.org/libevent/libevent.svg?branch=master)](https://travis-ci.org/libevent/libevent)
+[![Coverage Status](https://coveralls.io/repos/github/libevent/libevent/badge.svg)](https://coveralls.io/github/libevent/libevent)
+[![Join the chat at https://gitter.im/libevent/libevent](https://badges.gitter.im/libevent/libevent.svg)](https://gitter.im/libevent/libevent?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+
+
+# 0. BUILDING AND INSTALLATION (Briefly)
+
+## Autoconf
+
+     $ ./configure
+     $ make
+     $ make verify   # (optional)
+     $ sudo make install
+
+## CMake (General)
+
+
+The following Libevent specific CMake variables are as follows (the values being
+the default).
+
+```
+# Type of the library to build (SHARED or STATIC)
+# Default is: SHARED for MSVC, otherwise BOTH
+EVENT__LIBRARY_TYPE:STRING=DEFAULT
+
+# Installation directory for CMake files
+EVENT_INSTALL_CMAKE_DIR:PATH=lib/cmake/libevent
+
+# Enable running gcov to get a test coverage report (only works with
+# GCC/CLang). Make sure to enable -DCMAKE_BUILD_TYPE=Debug as well.
+EVENT__COVERAGE:BOOL=OFF
+
+# Defines if Libevent should build without the benchmark executables
+EVENT__DISABLE_BENCHMARK:BOOL=OFF
+
+# Define if Libevent should build without support for a debug mode
+EVENT__DISABLE_DEBUG_MODE:BOOL=OFF
+
+# Define if Libevent should not allow replacing the mm functions
+EVENT__DISABLE_MM_REPLACEMENT:BOOL=OFF
+
+# Define if Libevent should build without support for OpenSSL encryption
+EVENT__DISABLE_OPENSSL:BOOL=OFF
+
+# Disable the regress tests
+EVENT__DISABLE_REGRESS:BOOL=OFF
+
+# Disable sample files
+EVENT__DISABLE_SAMPLES:BOOL=OFF
+
+# If tests should be compiled or not
+EVENT__DISABLE_TESTS:BOOL=OFF
+
+# Define if Libevent should not be compiled with thread support
+EVENT__DISABLE_THREAD_SUPPORT:BOOL=OFF
+
+# Enables verbose debugging
+EVENT__ENABLE_VERBOSE_DEBUG:BOOL=OFF
+
+# When cross compiling, forces running a test program that verifies that Kqueue
+# works with pipes. Note that this requires you to manually run the test program
+# on the the cross compilation target to verify that it works. See CMake
+# documentation for try_run for more details
+EVENT__FORCE_KQUEUE_CHECK:BOOL=OFF
+```
+
+__More variables can be found by running `cmake -LAH <sourcedir_path>`__
+
+
+## CMake (Windows)
+
+Install CMake: <https://www.cmake.org>
+
+
+     $ md build && cd build
+     $ cmake -G "Visual Studio 10" ..   # Or whatever generator you want to use cmake --help for a list.
+     $ start libevent.sln
+
+## CMake (Unix)
+
+     $ mkdir build && cd build
+     $ cmake ..     # Default to Unix Makefiles.
+     $ make
+     $ make verify  # (optional)
+
+
+# 1. BUILDING AND INSTALLATION (In Depth)
+
+## Autoconf
+
+To build Libevent, type
+
+     $ ./configure && make
+
+
+ (If you got Libevent from the git repository, you will
+  first need to run the included "autogen.sh" script in order to
+  generate the configure script.)
+
+You can run the regression tests by running
+
+     $ make verify
+
+Install as root via
+
+     $ make install
+
+Before reporting any problems, please run the regression tests.
+
+To enable low-level tracing, build the library as:
+
+     $ CFLAGS=-DUSE_DEBUG ./configure [...]
+
+Standard configure flags should work.  In particular, see:
+
+     --disable-shared          Only build static libraries.
+     --prefix                  Install all files relative to this directory.
+
+
+The configure script also supports the following flags:
+
+     --enable-gcc-warnings     Enable extra compiler checking with GCC.
+     --disable-malloc-replacement
+                               Don't let applications replace our memory
+                               management functions.
+     --disable-openssl         Disable support for OpenSSL encryption.
+     --disable-thread-support  Don't support multithreaded environments.
+
+## CMake (Windows)
+
+(Note that autoconf is currently the most mature and supported build
+environment for Libevent; the CMake instructions here are new and
+experimental, though they _should_ be solid.  We hope that CMake will
+still be supported in future versions of Libevent, and will try to
+make sure that happens.)
+
+First of all install <https://www.cmake.org>.
+
+To build Libevent using Microsoft Visual studio open the "Visual Studio Command prompt" and type:
+
+```
+$ cd <libevent source dir>
+$ mkdir build && cd build
+$ cmake -G "Visual Studio 10" ..   # Or whatever generator you want to use cmake --help for a list.
+$ start libevent.sln
+```
+
+In the above, the ".." refers to the dir containing the Libevent source code. 
+You can build multiple versions (with different compile time settings) from the same source tree
+by creating other build directories. 
+
+It is highly recommended to build "out of source" when using
+CMake instead of "in source" like the normal behaviour of autoconf for this reason.
+
+The "NMake Makefiles" CMake generator can be used to build entirely via the command line.
+
+To get a list of settings available for the project you can type:
+
+```
+$ cmake -LH ..
+```
+
+### GUI
+
+CMake also provides a GUI that lets you specify the source directory and output (binary) directory
+that the build should be placed in.
+
+# 2. USEFUL LINKS:
+
+For the latest released version of Libevent, see the official website at
+<http://libevent.org/> .
+
+There's a pretty good work-in-progress manual up at
+   <http://www.wangafu.net/~nickm/libevent-book/> .
+
+For the latest development versions of Libevent, access our Git repository
+via
+
+```
+$ git clone https://github.com/libevent/libevent.git
+```
+
+You can browse the git repository online at:
+
+<https://github.com/libevent/libevent>
+
+To report bugs, issues, or ask for new features:
+
+__Patches__: https://github.com/libevent/libevent/pulls
+> OK, those are not really _patches_. You fork, modify, and hit the "Create Pull Request" button.
+> You can still submit normal git patches via the mailing list.
+
+__Bugs, Features [RFC], and Issues__: https://github.com/libevent/libevent/issues
+> Or you can do it via the mailing list.
+
+There's also a libevent-users mailing list for talking about Libevent
+use and development: 
+
+<http://archives.seul.org/libevent/users/>
+
+# 3. ACKNOWLEDGMENTS
+
+The following people have helped with suggestions, ideas, code or
+fixing bugs:
+
+ * Samy Al Bahra
+ * Antony Antony
+ * Jacob Appelbaum
+ * Arno Bakker
+ * Weston Andros Adamson
+ * William Ahern
+ * Ivan Andropov
+ * Sergey Avseyev
+ * Avi Bab
+ * Joachim Bauch
+ * Andrey Belobrov
+ * Gilad Benjamini
+ * Stas Bekman
+ * Denis Bilenko
+ * Julien Blache
+ * Kevin Bowling
+ * Tomash Brechko
+ * Kelly Brock
+ * Ralph Castain
+ * Adrian Chadd
+ * Lawnstein Chan
+ * Shuo Chen
+ * Ka-Hing Cheung
+ * Andrew Cox
+ * Paul Croome
+ * George Danchev
+ * Andrew Danforth
+ * Ed Day
+ * Christopher Davis
+ * Mike Davis
+ * Frank Denis
+ * Antony Dovgal
+ * Mihai Draghicioiu
+ * Alexander Drozdov
+ * Mark Ellzey
+ * Shie Erlich
+ * Leonid Evdokimov
+ * Juan Pablo Fernandez
+ * Christophe Fillot
+ * Mike Frysinger
+ * Remi Gacogne
+ * Artem Germanov
+ * Alexander von Gernler
+ * Diego Giagio
+ * Artur Grabowski
+ * Diwaker Gupta
+ * Kuldeep Gupta
+ * Sebastian Hahn
+ * Dave Hart
+ * Greg Hazel
+ * Nicholas Heath
+ * Michael Herf
+ * Savg He
+ * Mark Heily
+ * Maxime Henrion
+ * Michael Herf
+ * Greg Hewgill
+ * Andrew Hochhaus
+ * Aaron Hopkins
+ * Tani Hosokawa
+ * Jamie Iles
+ * Xiuqiang Jiang
+ * Claudio Jeker
+ * Evan Jones
+ * Marcin Juszkiewicz
+ * George Kadianakis
+ * Makoto Kato
+ * Phua Keat
+ * Azat Khuzhin
+ * Alexander Klauer
+ * Kevin Ko
+ * Brian Koehmstedt
+ * Marko Kreen
+ * Ondřej Kuzník
+ * Valery Kyholodov
+ * Ross Lagerwall
+ * Scott Lamb
+ * Christopher Layne
+ * Adam Langley
+ * Graham Leggett
+ * Volker Lendecke
+ * Philip Lewis
+ * Zhou Li
+ * David Libenzi
+ * Yan Lin
+ * Moshe Litvin
+ * Simon Liu
+ * Mitchell Livingston
+ * Hagne Mahre
+ * Lubomir Marinov
+ * Abilio Marques
+ * Nicolas Martyanoff
+ * Abel Mathew
+ * Nick Mathewson
+ * James Mansion
+ * Nicholas Marriott
+ * Andrey Matveev
+ * Caitlin Mercer
+ * Dagobert Michelsen
+ * Andrea Montefusco
+ * Mansour Moufid
+ * Mina Naguib
+ * Felix Nawothnig
+ * Trond Norbye
+ * Linus Nordberg
+ * Richard Nyberg
+ * Jon Oberheide
+ * John Ohl
+ * Phil Oleson
+ * Alexey Ozeritsky
+ * Dave Pacheco
+ * Derrick Pallas
+ * Tassilo von Parseval
+ * Catalin Patulea
+ * Patrick Pelletier
+ * Simon Perreault
+ * Dan Petro
+ * Pierre Phaneuf
+ * Amarin Phaosawasdi
+ * Ryan Phillips
+ * Dimitre Piskyulev
+ * Pavel Plesov
+ * Jon Poland
+ * Roman Puls
+ * Nate R
+ * Robert Ransom
+ * Balint Reczey
+ * Bert JW Regeer
+ * Nate Rosenblum
+ * Peter Rosin
+ * Maseeb Abdul Qadir
+ * Wang Qin
+ * Alex S
+ * Gyepi Sam
+ * Hanna Schroeter
+ * Ralf Schmitt
+ * Mike Smellie
+ * Steve Snyder
+ * Nir Soffer
+ * Dug Song
+ * Dongsheng Song
+ * Hannes Sowa
+ * Joakim Soderberg
+ * Joseph Spadavecchia
+ * Kevin Springborn
+ * Harlan Stenn
+ * Andrew Sweeney
+ * Ferenc Szalai
+ * Brodie Thiesfield
+ * Jason Toffaletti
+ * Brian Utterback
+ * Gisle Vanem
+ * Bas Verhoeven
+ * Constantine Verutin
+ * Colin Watt
+ * Zack Weinberg
+ * Jardel Weyrich
+ * Jay R. Wren
+ * Zack Weinberg
+ * Mobai Zhang
+ * Alejo
+ * Alex
+ * Taral
+ * propanbutan
+ * masksqwe
+ * mmadia
+ * yangacer
+ * Andrey Skriabin
+ * basavesh.as
+ * billsegall
+ * Bill Vaughan
+ * Christopher Wiley
+ * David Paschich
+ * Ed Schouten
+ * Eduardo Panisset
+ * Jan Heylen
+ * jer-gentoo
+ * Joakim Söderberg
+ * kirillDanshin
+ * lzmths
+ * Marcus Sundberg
+ * Mark Mentovai
+ * Mattes D
+ * Matyas Dolak
+ * Neeraj Badlani
+ * Nick Mathewson
+ * Rainer Keller
+ * Seungmo Koo
+ * Thomas Bernard
+ * Xiao Bao Clark
+ * zeliard
+ * Zonr Chang
+ * Kurt Roeckx
+ * Seven
+ * Simone Basso
+ * Vlad Shcherban
+ * Tim Hentenaar
+ * Breaker
+ * johnsonlee
+ * Philip Prindeville
+ * Vis Virial
+ * Andreas Gustafsson
+ * Andrey Okoshkin
+ * an-tao
+ * baixiangcpp
+ * Bernard Spil
+ * Bogdan Harjoc
+ * Carlo Marcelo Arenas Belón
+ * David Benjamin
+ * David Disseldorp
+ * Dmitry Alimov
+ * Dominic Chen
+ * dpayne
+ * ejurgensen
+ * Fredrik Strupe
+ * Gonçalo Ribeiro
+ * James Synge
+ * Jan Beich
+ * Jesse Fang
+ * Jiri Luznicky
+ * José Luis Millán
+ * Kiyoshi Aman
+ * Leo Zhang
+ * lightningkay
+ * Luke Dashjr
+ * Marcin Szewczyk
+ * Maximilian Brunner
+ * Maya Rashish
+ * Murat Demirten
+ * Nathan French
+ * Nikolay Edigaryev
+ * Philip Herron
+ * Redfoxmoon
+ * stenn
+ * SuckShit
+ * The Gitter Badger
+ * tim-le
+ * Vincent JARDIN
+ * Xiang Zhang
+ * Xiaozhou Liu
+ * yongqing.jiao
+ * Enji Cooper
+ * linxiaohui
+ * Seong-Joong Kim
+ * Tobias Stoeckmann
+ * Yury Korzhetsky
+ * zhuizhuhaomeng
+ * Pierce Lopez
+ * yuangongji
+ * Keith Smiley
+ * jeremyerb
+ * Fabrice Fontaine
+ * wenyg
+
+
+If we have forgotten your name, please contact us.
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.c b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.c
new file mode 100644
index 000000000000..0fcba5d91529
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.c
@@ -0,0 +1,149 @@
+/*	$NetBSD: getopt.c,v 1.16 1999/12/02 13:15:56 kleink Exp $	*/
+
+/*
+ * Copyright (c) 1987, 1993, 1994, 1995
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the names of the copyright holders nor the names of its
+ *    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 REGENTS 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.
+ */
+
+#if 0
+static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#define __P(x) x
+#define _DIAGASSERT(x) assert(x)
+
+#ifdef __weak_alias
+__weak_alias(getopt,_getopt);
+#endif
+
+
+int	opterr = 1,		/* if error message should be printed */
+	optind = 1,		/* index into parent argv vector */
+	optopt,			/* character checked for validity */
+	optreset;		/* reset getopt */
+char	*optarg;		/* argument associated with option */
+
+static char * _progname __P((char *));
+int getopt_internal __P((int, char * const *, const char *));
+
+static char *
+_progname(nargv0)
+	char * nargv0;
+{
+	char * tmp;
+
+	_DIAGASSERT(nargv0 != NULL);
+
+	tmp = strrchr(nargv0, '/');
+	if (tmp)
+		tmp++;
+	else
+		tmp = nargv0;
+	return(tmp);
+}
+
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
+
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt(nargc, nargv, ostr)
+	int nargc;
+	char * const nargv[];
+	const char *ostr;
+{
+	static char *__progname = 0;
+	static char *place = EMSG;		/* option letter processing */
+	char *oli;				/* option letter list index */
+        __progname = __progname?__progname:_progname(*nargv);
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(ostr != NULL);
+
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc || *(place = nargv[optind]) != '-') {
+			place = EMSG;
+			return (-1);
+		}
+		if (place[1] && *++place == '-'	/* found "--" */
+		    && place[1] == '\0') {
+			++optind;
+			place = EMSG;
+			return (-1);
+		}
+	}					/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' ||
+	    !(oli = strchr(ostr, optopt))) {
+		/*
+		 * if the user didn't specify '-' as an option,
+		 * assume it means -1.
+		 */
+		if (optopt == (int)'-')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (opterr && *ostr != ':')
+			(void)fprintf(stderr,
+			    "%s: illegal option -- %c\n", __progname, optopt);
+		return (BADCH);
+	}
+	if (*++oli != ':') {			/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	}
+	else {					/* need an argument */
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			if (*ostr == ':')
+				return (BADARG);
+			if (opterr)
+				(void)fprintf(stderr,
+				    "%s: option requires an argument -- %c\n",
+				    __progname, optopt);
+			return (BADCH);
+		}
+	 	else				/* white space */
+			optarg = nargv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return (optopt);			/* dump back option letter */
+}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.h b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.h
new file mode 100644
index 000000000000..796f4550509d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt.h
@@ -0,0 +1,33 @@
+#ifndef __GETOPT_H__
+#define __GETOPT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int opterr;		/* if error message should be printed */
+extern int optind;		/* index into parent argv vector */
+extern int optopt;		/* character checked for validity */
+extern int optreset;		/* reset getopt */
+extern char *optarg;		/* argument associated with option */
+
+struct option
+{
+  const char *name;
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+#define no_argument       0
+#define required_argument 1
+#define optional_argument 2
+
+int getopt(int, char**, const char*);
+int getopt_long(int, char**, const char*, const struct option*, int*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GETOPT_H__ */
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt_long.c b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt_long.c
new file mode 100644
index 000000000000..092defbc4bed
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/getopt_long.c
@@ -0,0 +1,234 @@
+
+/*
+ * Copyright (c) 1987, 1993, 1994, 1996
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the names of the copyright holders nor the names of its
+ *    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 REGENTS 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.
+ */
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "getopt.h"
+
+extern int	  opterr;	/* if error message should be printed */
+extern int	  optind;	/* index into parent argv vector */
+extern int	  optopt;	/* character checked for validity */
+extern int	  optreset;	/* reset getopt */
+extern char *optarg;	/* argument associated with option */
+
+#define __P(x) x
+#define _DIAGASSERT(x) assert(x)
+
+static char * __progname __P((char *));
+int getopt_internal __P((int, char * const *, const char *));
+
+static char *
+__progname(nargv0)
+	char * nargv0;
+{
+	char * tmp;
+
+	_DIAGASSERT(nargv0 != NULL);
+
+	tmp = strrchr(nargv0, '/');
+	if (tmp)
+		tmp++;
+	else
+		tmp = nargv0;
+	return(tmp);
+}
+
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
+
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_internal(nargc, nargv, ostr)
+	int nargc;
+	char * const *nargv;
+	const char *ostr;
+{
+	static char *place = EMSG;		/* option letter processing */
+	char *oli;				/* option letter list index */
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(ostr != NULL);
+
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc || *(place = nargv[optind]) != '-') {
+			place = EMSG;
+			return (-1);
+		}
+		if (place[1] && *++place == '-') {	/* found "--" */
+			/* ++optind; */
+			place = EMSG;
+			return (-2);
+		}
+	}					/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' ||
+	    !(oli = strchr(ostr, optopt))) {
+		/*
+		 * if the user didn't specify '-' as an option,
+		 * assume it means -1.
+		 */
+		if (optopt == (int)'-')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (opterr && *ostr != ':')
+			(void)fprintf(stderr,
+			    "%s: illegal option -- %c\n", __progname(nargv[0]), optopt);
+		return (BADCH);
+	}
+	if (*++oli != ':') {			/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	} else {				/* need an argument */
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			if ((opterr) && (*ostr != ':'))
+				(void)fprintf(stderr,
+				    "%s: option requires an argument -- %c\n",
+				    __progname(nargv[0]), optopt);
+			return (BADARG);
+		} else				/* white space */
+			optarg = nargv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return (optopt);			/* dump back option letter */
+}
+
+#if 0
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt2(nargc, nargv, ostr)
+	int nargc;
+	char * const *nargv;
+	const char *ostr;
+{
+	int retval;
+
+	if ((retval = getopt_internal(nargc, nargv, ostr)) == -2) {
+		retval = -1;
+		++optind; 
+	}
+	return(retval);
+}
+#endif
+
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(nargc, nargv, options, long_options, index)
+	int nargc;
+	char ** nargv;
+	const char * options;
+	const struct option * long_options;
+	int * index;
+{
+	int retval;
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(options != NULL);
+	_DIAGASSERT(long_options != NULL);
+	/* index may be NULL */
+
+	if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
+		char *current_argv = nargv[optind++] + 2, *has_equal;
+		int i, match = -1;
+		size_t current_argv_len;
+
+		if (*current_argv == '\0') {
+			return(-1);
+		}
+		if ((has_equal = strchr(current_argv, '=')) != NULL) {
+			current_argv_len = has_equal - current_argv;
+			has_equal++;
+		} else
+			current_argv_len = strlen(current_argv);
+
+		for (i = 0; long_options[i].name; i++) {
+			if (strncmp(current_argv, long_options[i].name, current_argv_len))
+				continue;
+
+			if (strlen(long_options[i].name) == current_argv_len) {
+				match = i;
+				break;
+			}
+			if (match == -1)
+				match = i;
+		}
+		if (match != -1) {
+			if (long_options[match].has_arg == required_argument ||
+			    long_options[match].has_arg == optional_argument) {
+				if (has_equal)
+					optarg = has_equal;
+				else
+					optarg = nargv[optind++];
+			}
+			if ((long_options[match].has_arg == required_argument)
+			    && (optarg == NULL)) {
+				/*
+				 * Missing argument, leading :
+				 * indicates no error should be generated
+				 */
+				if ((opterr) && (*options != ':'))
+					(void)fprintf(stderr,
+				      "%s: option requires an argument -- %s\n",
+				      __progname(nargv[0]), current_argv);
+				return (BADARG);
+			}
+		} else { /* No matching argument */
+			if ((opterr) && (*options != ':'))
+				(void)fprintf(stderr,
+				    "%s: illegal option -- %s\n", __progname(nargv[0]), current_argv);
+			return (BADCH);
+		}
+		if (long_options[match].flag) {
+			*long_options[match].flag = long_options[match].val;
+			retval = 0;
+		} else 
+			retval = long_options[match].val;
+		if (index)
+			*index = match;
+	}
+	return(retval);
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/evconfig-private.h b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/evconfig-private.h
new file mode 100644
index 000000000000..88e206272bf9
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/evconfig-private.h
@@ -0,0 +1,6 @@
+#if !defined(EVENT_EVCONFIG__PRIVATE_H_) && !defined(__MINGW32__)
+#define EVENT_EVCONFIG__PRIVATE_H_
+
+/* Nothing to see here.  Move along. */
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/event2/event-config.h b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/event2/event-config.h
new file mode 100644
index 000000000000..35ec16fd9fb6
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/nmake/event2/event-config.h
@@ -0,0 +1,350 @@
+/* event2/event-config.h
+ *
+ * This file was generated by autoconf when libevent was built, and post-
+ * processed by Libevent so that its macros would have a uniform prefix.
+ *
+ * DO NOT EDIT THIS FILE.
+ *
+ * Do not rely on macros in this file existing in later versions.
+ */
+#ifndef EVENT_CONFIG_H__
+#define EVENT_CONFIG_H__
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if libevent should not allow replacing the mm functions */
+/* #undef EVENT__DISABLE_MM_REPLACEMENT */
+
+/* Define if libevent should not be compiled with thread support */
+/* #undef EVENT__DISABLE_THREAD_SUPPORT */
+
+/* Define if clock_gettime is available in libc */
+/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */
+
+/* Define is no secure id variant is available */
+/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */
+#define EVENT_DNS_USE_FTIME_FOR_ID_ 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+/* #undef EVENT__HAVE_ARPA_INET_H */
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef EVENT__HAVE_CLOCK_GETTIME */
+
+/* Define if /dev/poll is available */
+/* #undef EVENT__HAVE_DEVPOLL */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef EVENT__HAVE_DLFCN_H */
+
+/* Define if your system supports the epoll system calls */
+/* #undef EVENT__HAVE_EPOLL */
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+/* #undef EVENT__HAVE_EPOLL_CTL */
+
+/* Define to 1 if you have the `eventfd' function. */
+/* #undef EVENT__HAVE_EVENTFD */
+
+/* Define if your system supports event ports */
+/* #undef EVENT__HAVE_EVENT_PORTS */
+
+/* Define to 1 if you have the `fcntl' function. */
+/* #undef EVENT__HAVE_FCNTL */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define EVENT__HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define EVENT__HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#define EVENT__HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getprotobynumber' function. */
+#define EVENT__HAVE_GETPROTOBYNUMBER 1
+
+/* Define to 1 if you have the `getservbyname' function. */
+#define EVENT__HAVE_GETSERVBYNAME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+/* #define EVENT__HAVE_GETTIMEOFDAY 1 */
+
+/* Define to 1 if you have the `inet_ntop' function. */
+/* #undef EVENT__HAVE_INET_NTOP */
+
+/* Define to 1 if you have the `inet_pton' function. */
+/* #undef EVENT__HAVE_INET_PTON */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #define EVENT__HAVE_INTTYPES_H 1 */
+
+/* Define to 1 if you have the `kqueue' function. */
+/* #undef EVENT__HAVE_KQUEUE */
+
+/* Define if the system has zlib */
+/* #undef EVENT__HAVE_LIBZ */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define EVENT__HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mmap' function. */
+/* #undef EVENT__HAVE_MMAP */
+
+/* Define to 1 if you have the <netinet/in6.h> header file. */
+/* #undef EVENT__HAVE_NETINET_IN6_H */
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+/* #undef EVENT__HAVE_NETINET_IN_H */
+
+/* Define to 1 if you have the `pipe' function. */
+/* #undef EVENT__HAVE_PIPE */
+
+/* Define to 1 if you have the `poll' function. */
+/* #undef EVENT__HAVE_POLL */
+
+/* Define to 1 if you have the <poll.h> header file. */
+/* #undef EVENT__HAVE_POLL_H */
+
+/* Define to 1 if you have the `port_create' function. */
+/* #undef EVENT__HAVE_PORT_CREATE */
+
+/* Define to 1 if you have the <port.h> header file. */
+/* #undef EVENT__HAVE_PORT_H */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef EVENT__HAVE_PTHREAD */
+
+/* Define if we have pthreads on this system */
+/* #undef EVENT__HAVE_PTHREADS */
+
+/* Define to 1 if the system has the type `sa_family_t'. */
+/* #undef EVENT__HAVE_SA_FAMILY_T */
+
+/* Define to 1 if you have the `select' function. */
+/* #undef EVENT__HAVE_SELECT */
+
+/* Define to 1 if you have the `sendfile' function. */
+/* #undef EVENT__HAVE_SENDFILE */
+
+/* Define if F_SETFD is defined in <fcntl.h> */
+/* #undef EVENT__HAVE_SETFD */
+
+/* Define to 1 if you have the `sigaction' function. */
+/* #undef EVENT__HAVE_SIGACTION */
+
+/* Define to 1 if you have the `signal' function. */
+#define EVENT__HAVE_SIGNAL 1
+
+/* Define to 1 if you have the `splice' function. */
+/* #undef EVENT__HAVE_SPLICE */
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define EVENT__HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define EVENT__HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #define EVENT__HAVE_STDINT_H 1 */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define EVENT__HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define EVENT__HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define EVENT__HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+/* #undef EVENT__HAVE_STRLCPY */
+
+/* Define to 1 if you have the `strsep' function. */
+/* #undef EVENT__HAVE_STRSEP */
+
+/* Define to 1 if you have the `strtok_r' function. */
+/* #undef EVENT__HAVE_STRTOK_R */
+
+/* Define to 1 if you have the `strtoll' function. */
+/* #define EVENT__HAVE_STRTOLL 1 */
+
+#define EVENT__HAVE_STRUCT_ADDRINFO 1
+
+/* Define to 1 if the system has the type `struct in6_addr'. */
+#define EVENT__HAVE_STRUCT_IN6_ADDR 1
+
+/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */
+#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1
+
+/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */
+#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */
+/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN */
+
+/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
+/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef EVENT__HAVE_SYS_EPOLL_H */
+
+/* Define to 1 if you have the <sys/eventfd.h> header file. */
+/* #undef EVENT__HAVE_SYS_EVENTFD_H */
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+/* #undef EVENT__HAVE_SYS_EVENT_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* #undef EVENT__HAVE_SYS_IOCTL_H */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef EVENT__HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #define EVENT__HAVE_SYS_PARAM_H 1 */
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+/* #undef EVENT__HAVE_SYS_QUEUE_H */
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+/* #undef EVENT__HAVE_SYS_SELECT_H */
+
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+/* #undef EVENT__HAVE_SYS_SENDFILE_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+/* #undef EVENT__HAVE_SYS_SOCKET_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define EVENT__HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #define EVENT__HAVE_SYS_TIME_H 1 */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define EVENT__HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+/* #undef EVENT__HAVE_SYS_UIO_H */
+
+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
+/* #undef EVENT__HAVE_TAILQFOREACH */
+
+/* Define if timeradd is defined in <sys/time.h> */
+/* #undef EVENT__HAVE_TIMERADD */
+
+/* Define if timerclear is defined in <sys/time.h> */
+#define EVENT__HAVE_TIMERCLEAR 1
+
+/* Define if timercmp is defined in <sys/time.h> */
+#define EVENT__HAVE_TIMERCMP 1
+
+/* Define if timerisset is defined in <sys/time.h> */
+#define EVENT__HAVE_TIMERISSET 1
+
+/* Define to 1 if the system has the type `uint16_t'. */
+/* #define EVENT__HAVE_UINT16_T 1 */
+
+/* Define to 1 if the system has the type `uint32_t'. */
+/* #define EVENT__HAVE_UINT32_T 1 */
+
+/* Define to 1 if the system has the type `uint64_t'. */
+/* #define EVENT__HAVE_UINT64_T 1 */
+
+/* Define to 1 if the system has the type `uint8_t'. */
+/* #define EVENT__HAVE_UINT8_T 1 */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #define EVENT__HAVE_UNISTD_H 1 */
+
+/* Define to 1 if you have the `vasprintf' function. */
+/* #undef EVENT__HAVE_VASPRINTF */
+
+/* Define if kqueue works correctly with pipes */
+/* #undef EVENT__HAVE_WORKING_KQUEUE */
+
+/* Numeric representation of the version */
+#define EVENT__NUMERIC_VERSION 0x02010b00
+
+/* Name of package */
+#define EVENT__PACKAGE "libevent"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define EVENT__PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define EVENT__PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define EVENT__PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define EVENT__PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define EVENT__PACKAGE_VERSION ""
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef EVENT__PTHREAD_CREATE_JOINABLE */
+
+/* The size of a `int', as computed by sizeof. */
+#define EVENT__SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define EVENT__SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+#define EVENT__SIZEOF_LONG_LONG 8
+
+/* The size of a `short', as computed by sizeof. */
+#define EVENT__SIZEOF_SHORT 2
+
+/* The size of `size_t', as computed by sizeof. */
+#ifdef _WIN64
+#define EVENT__SIZEOF_SIZE_T 8
+#else
+#define EVENT__SIZEOF_SIZE_T 4
+#endif
+
+/* The size of `void *', as computed by sizeof. */
+#ifdef _WIN64
+#define EVENT__SIZEOF_VOID_P 8
+#else
+#define EVENT__SIZEOF_VOID_P 4
+#endif
+
+/* The size of `time_t`, as computed by sizeof. */
+#ifdef _WIN64
+#define EVENT__SIZEOF_TIME_T 8
+#else
+#define EVENT__SIZEOF_TIME_T 4
+#endif
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define EVENT__TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define EVENT__VERSION "2.1.11-stable"
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#define EVENT__inline __inline
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef EVENT__size_t */
+
+/* Define to unsigned int if you dont have it */
+#define EVENT__socklen_t unsigned int
+
+/* Define to `int' if <sys/types.h> does not define. */
+#define EVENT__ssize_t SSIZE_T
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/WIN32-Code/tree.h b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/tree.h
new file mode 100644
index 000000000000..2ccfbf20ac91
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/WIN32-Code/tree.h
@@ -0,0 +1,677 @@
+/*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
+/*
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#ifndef	_SYS_TREE_H_
+#define	_SYS_TREE_H_
+
+/*
+ * This file defines data structures for different types of trees:
+ * splay trees and red-black trees.
+ *
+ * A splay tree is a self-organizing data structure.  Every operation
+ * on the tree causes a splay to happen.  The splay moves the requested
+ * node to the root of the tree and partly rebalances it.
+ *
+ * This has the benefit that request locality causes faster lookups as
+ * the requested nodes move to the top of the tree.  On the other hand,
+ * every lookup causes memory writes.
+ *
+ * The Balance Theorem bounds the total access time for m operations
+ * and n inserts on an initially empty tree as O((m + n)lg n).  The
+ * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
+ *
+ * A red-black tree is a binary search tree with the node color as an
+ * extra attribute.  It fulfills a set of conditions:
+ *	- every search path from the root to a leaf consists of the
+ *	  same number of black nodes,
+ *	- each red node (except for the root) has a black parent,
+ *	- each leaf node is black.
+ *
+ * Every operation on a red-black tree is bounded as O(lg n).
+ * The maximum height of a red-black tree is 2lg (n+1).
+ */
+
+#define SPLAY_HEAD(name, type)						\
+struct name {								\
+	struct type *sph_root; /* root of the tree */			\
+}
+
+#define SPLAY_INITIALIZER(root)						\
+	{ NULL }
+
+#define SPLAY_INIT(root) do {						\
+	(root)->sph_root = NULL;					\
+} while (0)
+
+#define SPLAY_ENTRY(type)						\
+struct {								\
+	struct type *spe_left; /* left element */			\
+	struct type *spe_right; /* right element */			\
+}
+
+#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
+#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
+#define SPLAY_ROOT(head)		(head)->sph_root
+#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
+
+/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
+#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (0)
+
+#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (0)
+
+#define SPLAY_LINKLEFT(head, tmp, field) do {				\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
+} while (0)
+
+#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
+} while (0)
+
+#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
+	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
+	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
+} while (0)
+
+/* Generates prototypes and inline functions */
+
+#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
+void name##_SPLAY(struct name *, struct type *);			\
+void name##_SPLAY_MINMAX(struct name *, int);				\
+struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
+struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
+									\
+/* Finds the node with the same key as elm */				\
+static __inline struct type *						\
+name##_SPLAY_FIND(struct name *head, struct type *elm)			\
+{									\
+	if (SPLAY_EMPTY(head))						\
+		return(NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0)				\
+		return (head->sph_root);				\
+	return (NULL);							\
+}									\
+									\
+static __inline struct type *						\
+name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
+{									\
+	name##_SPLAY(head, elm);					\
+	if (SPLAY_RIGHT(elm, field) != NULL) {				\
+		elm = SPLAY_RIGHT(elm, field);				\
+		while (SPLAY_LEFT(elm, field) != NULL) {		\
+			elm = SPLAY_LEFT(elm, field);			\
+		}							\
+	} else								\
+		elm = NULL;						\
+	return (elm);							\
+}									\
+									\
+static __inline struct type *						\
+name##_SPLAY_MIN_MAX(struct name *head, int val)			\
+{									\
+	name##_SPLAY_MINMAX(head, val);					\
+	return (SPLAY_ROOT(head));					\
+}
+
+/* Main splay operation.
+ * Moves node close to the key of elm to top
+ */
+#define SPLAY_GENERATE(name, type, field, cmp)				\
+struct type *								\
+name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
+{									\
+    if (SPLAY_EMPTY(head)) {						\
+	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
+    } else {								\
+	    int __comp;							\
+	    name##_SPLAY(head, elm);					\
+	    __comp = (cmp)(elm, (head)->sph_root);			\
+	    if(__comp < 0) {						\
+		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
+		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
+		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
+	    } else if (__comp > 0) {					\
+		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
+		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
+		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
+	    } else							\
+		    return ((head)->sph_root);				\
+    }									\
+    (head)->sph_root = (elm);						\
+    return (NULL);							\
+}									\
+									\
+struct type *								\
+name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
+{									\
+	struct type *__tmp;						\
+	if (SPLAY_EMPTY(head))						\
+		return (NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0) {			\
+		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
+			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
+		} else {						\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
+			name##_SPLAY(head, elm);			\
+			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
+		}							\
+		return (elm);						\
+	}								\
+	return (NULL);							\
+}									\
+									\
+void									\
+name##_SPLAY(struct name *head, struct type *elm)			\
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+	int __comp;							\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while ((__comp = (cmp)(elm, (head)->sph_root))) {		\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) < 0){			\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) > 0){			\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}									\
+									\
+/* Splay with either the minimum or the maximum element			\
+ * Used to find minimum or maximum element in tree.			\
+ */									\
+void name##_SPLAY_MINMAX(struct name *head, int __comp) \
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while (1) {							\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp < 0){				\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp > 0) {				\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}
+
+#define SPLAY_NEGINF	-1
+#define SPLAY_INF	1
+
+#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
+#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
+#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
+#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
+#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
+#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
+
+#define SPLAY_FOREACH(x, name, head)					\
+	for ((x) = SPLAY_MIN(name, head);				\
+	     (x) != NULL;						\
+	     (x) = SPLAY_NEXT(name, head, x))
+
+/* Macros that define a red-back tree */
+#define RB_HEAD(name, type)						\
+struct name {								\
+	struct type *rbh_root; /* root of the tree */			\
+}
+
+#define RB_INITIALIZER(root)						\
+	{ NULL }
+
+#define RB_INIT(root) do {						\
+	(root)->rbh_root = NULL;					\
+} while (0)
+
+#define RB_BLACK	0
+#define RB_RED		1
+#define RB_ENTRY(type)							\
+struct {								\
+	struct type *rbe_left;		/* left element */		\
+	struct type *rbe_right;		/* right element */		\
+	struct type *rbe_parent;	/* parent element */		\
+	int rbe_color;			/* node color */		\
+}
+
+#define RB_LEFT(elm, field)		(elm)->field.rbe_left
+#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
+#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
+#define RB_COLOR(elm, field)		(elm)->field.rbe_color
+#define RB_ROOT(head)			(head)->rbh_root
+#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
+
+#define RB_SET(elm, parent, field) do {					\
+	RB_PARENT(elm, field) = parent;					\
+	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
+	RB_COLOR(elm, field) = RB_RED;					\
+} while (0)
+
+#define RB_SET_BLACKRED(black, red, field) do {				\
+	RB_COLOR(black, field) = RB_BLACK;				\
+	RB_COLOR(red, field) = RB_RED;					\
+} while (0)
+
+#ifndef RB_AUGMENT
+#define RB_AUGMENT(x)
+#endif
+
+#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
+	(tmp) = RB_RIGHT(elm, field);					\
+	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) {		\
+		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_LEFT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (0)
+
+#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
+	(tmp) = RB_LEFT(elm, field);					\
+	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) {		\
+		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_RIGHT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (0)
+
+/* Generates prototypes and inline functions */
+#define RB_PROTOTYPE(name, type, field, cmp)				\
+void name##_RB_INSERT_COLOR(struct name *, struct type *);	\
+void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
+struct type *name##_RB_REMOVE(struct name *, struct type *);		\
+struct type *name##_RB_INSERT(struct name *, struct type *);		\
+struct type *name##_RB_FIND(struct name *, struct type *);		\
+struct type *name##_RB_NEXT(struct type *);				\
+struct type *name##_RB_MINMAX(struct name *, int);			\
+									\
+
+/* Main rb operation.
+ * Moves node close to the key of elm to top
+ */
+#define RB_GENERATE(name, type, field, cmp)				\
+void									\
+name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
+{									\
+	struct type *parent, *gparent, *tmp;				\
+	while ((parent = RB_PARENT(elm, field)) &&			\
+	    RB_COLOR(parent, field) == RB_RED) {			\
+		gparent = RB_PARENT(parent, field);			\
+		if (parent == RB_LEFT(gparent, field)) {		\
+			tmp = RB_RIGHT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_RIGHT(parent, field) == elm) {		\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
+		} else {						\
+			tmp = RB_LEFT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_LEFT(parent, field) == elm) {		\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
+		}							\
+	}								\
+	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
+}									\
+									\
+void									\
+name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
+{									\
+	struct type *tmp;						\
+	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
+	    elm != RB_ROOT(head)) {					\
+		if (RB_LEFT(parent, field) == elm) {			\
+			tmp = RB_RIGHT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = RB_RIGHT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_RIGHT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
+					struct type *oleft;		\
+					if ((oleft = RB_LEFT(tmp, field)))\
+						RB_COLOR(oleft, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
+					tmp = RB_RIGHT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_RIGHT(tmp, field))		\
+					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		} else {						\
+			tmp = RB_LEFT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = RB_LEFT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_LEFT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
+					struct type *oright;		\
+					if ((oright = RB_RIGHT(tmp, field)))\
+						RB_COLOR(oright, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_LEFT(head, tmp, oright, field);\
+					tmp = RB_LEFT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_LEFT(tmp, field))		\
+					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		}							\
+	}								\
+	if (elm)							\
+		RB_COLOR(elm, field) = RB_BLACK;			\
+}									\
+									\
+struct type *								\
+name##_RB_REMOVE(struct name *head, struct type *elm)			\
+{									\
+	struct type *child, *parent, *old = elm;			\
+	int color;							\
+	if (RB_LEFT(elm, field) == NULL)				\
+		child = RB_RIGHT(elm, field);				\
+	else if (RB_RIGHT(elm, field) == NULL)				\
+		child = RB_LEFT(elm, field);				\
+	else {								\
+		struct type *left;					\
+		elm = RB_RIGHT(elm, field);				\
+		while ((left = RB_LEFT(elm, field)))			\
+			elm = left;					\
+		child = RB_RIGHT(elm, field);				\
+		parent = RB_PARENT(elm, field);				\
+		color = RB_COLOR(elm, field);				\
+		if (child)						\
+			RB_PARENT(child, field) = parent;		\
+		if (parent) {						\
+			if (RB_LEFT(parent, field) == elm)		\
+				RB_LEFT(parent, field) = child;		\
+			else						\
+				RB_RIGHT(parent, field) = child;	\
+			RB_AUGMENT(parent);				\
+		} else							\
+			RB_ROOT(head) = child;				\
+		if (RB_PARENT(elm, field) == old)			\
+			parent = elm;					\
+		(elm)->field = (old)->field;				\
+		if (RB_PARENT(old, field)) {				\
+			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
+				RB_LEFT(RB_PARENT(old, field), field) = elm;\
+			else						\
+				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
+			RB_AUGMENT(RB_PARENT(old, field));		\
+		} else							\
+			RB_ROOT(head) = elm;				\
+		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
+		if (RB_RIGHT(old, field))				\
+			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
+		if (parent) {						\
+			left = parent;					\
+			do {						\
+				RB_AUGMENT(left);			\
+			} while ((left = RB_PARENT(left, field)));	\
+		}							\
+		goto color;						\
+	}								\
+	parent = RB_PARENT(elm, field);					\
+	color = RB_COLOR(elm, field);					\
+	if (child)							\
+		RB_PARENT(child, field) = parent;			\
+	if (parent) {							\
+		if (RB_LEFT(parent, field) == elm)			\
+			RB_LEFT(parent, field) = child;			\
+		else							\
+			RB_RIGHT(parent, field) = child;		\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = child;					\
+color:									\
+	if (color == RB_BLACK)						\
+		name##_RB_REMOVE_COLOR(head, parent, child);		\
+	return (old);							\
+}									\
+									\
+/* Inserts a node into the RB tree */					\
+struct type *								\
+name##_RB_INSERT(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp;						\
+	struct type *parent = NULL;					\
+	int comp = 0;							\
+	tmp = RB_ROOT(head);						\
+	while (tmp) {							\
+		parent = tmp;						\
+		comp = (cmp)(elm, parent);				\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	RB_SET(elm, parent, field);					\
+	if (parent != NULL) {						\
+		if (comp < 0)						\
+			RB_LEFT(parent, field) = elm;			\
+		else							\
+			RB_RIGHT(parent, field) = elm;			\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = elm;					\
+	name##_RB_INSERT_COLOR(head, elm);				\
+	return (NULL);							\
+}									\
+									\
+/* Finds the node with the same key as elm */				\
+struct type *								\
+name##_RB_FIND(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	int comp;							\
+	while (tmp) {							\
+		comp = cmp(elm, tmp);					\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	return (NULL);							\
+}									\
+									\
+struct type *								\
+name##_RB_NEXT(struct type *elm)					\
+{									\
+	if (RB_RIGHT(elm, field)) {					\
+		elm = RB_RIGHT(elm, field);				\
+		while (RB_LEFT(elm, field))				\
+			elm = RB_LEFT(elm, field);			\
+	} else {							\
+		if (RB_PARENT(elm, field) &&				\
+		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
+			elm = RB_PARENT(elm, field);			\
+		else {							\
+			while (RB_PARENT(elm, field) &&			\
+			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
+				elm = RB_PARENT(elm, field);		\
+			elm = RB_PARENT(elm, field);			\
+		}							\
+	}								\
+	return (elm);							\
+}									\
+									\
+struct type *								\
+name##_RB_MINMAX(struct name *head, int val)				\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	struct type *parent = NULL;					\
+	while (tmp) {							\
+		parent = tmp;						\
+		if (val < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else							\
+			tmp = RB_RIGHT(tmp, field);			\
+	}								\
+	return (parent);						\
+}
+
+#define RB_NEGINF	-1
+#define RB_INF	1
+
+#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
+#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
+#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
+#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
+#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
+#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
+
+#define RB_FOREACH(x, name, head)					\
+	for ((x) = RB_MIN(name, head);					\
+	     (x) != NULL;						\
+	     (x) = name##_RB_NEXT(x))
+
+#endif	/* _SYS_TREE_H_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/arc4random.c b/extra/libevent/libevent-2.1.11-stable/arc4random.c
new file mode 100644
index 000000000000..be64452ba34a
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/arc4random.c
@@ -0,0 +1,550 @@
+/* Portable arc4random.c based on arc4random.c from OpenBSD.
+ * Portable version by Chris Davis, adapted for Libevent by Nick Mathewson
+ * Copyright (c) 2010 Chris Davis, Niels Provos, and Nick Mathewson
+ * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
+ *
+ * Note that in Libevent, this file isn't compiled directly.  Instead,
+ * it's included from evutil_rand.c
+ */
+
+/*
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Arc4 random number generator for OpenBSD.
+ *
+ * This code is derived from section 17.1 of Applied Cryptography,
+ * second edition, which describes a stream cipher allegedly
+ * compatible with RSA Labs "RC4" cipher (the actual description of
+ * which is a trade secret).  The same algorithm is used as a stream
+ * cipher called "arcfour" in Tatu Ylonen's ssh package.
+ *
+ * Here the stream cipher has been modified always to include the time
+ * when initializing the state.  That makes it impossible to
+ * regenerate the same random sequence twice, so this can't be used
+ * for encryption, but will generate good random numbers.
+ *
+ * RC4 is a registered trademark of RSA Laboratories.
+ */
+
+#ifndef ARC4RANDOM_EXPORT
+#define ARC4RANDOM_EXPORT
+#endif
+
+#ifndef ARC4RANDOM_UINT32
+#define ARC4RANDOM_UINT32 uint32_t
+#endif
+
+#ifndef ARC4RANDOM_NO_INCLUDES
+#include "evconfig-private.h"
+#ifdef _WIN32
+#include <wincrypt.h>
+#include <process.h>
+#include <winerror.h>
+#else
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#ifdef EVENT__HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#endif
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+/* Add platform entropy 32 bytes (256 bits) at a time. */
+#define ADD_ENTROPY 32
+
+/* Re-seed from the platform RNG after generating this many bytes. */
+#define BYTES_BEFORE_RESEED 1600000
+
+struct arc4_stream {
+	unsigned char i;
+	unsigned char j;
+	unsigned char s[256];
+};
+
+#ifdef _WIN32
+#define getpid _getpid
+#define pid_t int
+#endif
+
+static int rs_initialized;
+static struct arc4_stream rs;
+static pid_t arc4_stir_pid;
+static int arc4_count;
+
+static inline unsigned char arc4_getbyte(void);
+
+static inline void
+arc4_init(void)
+{
+	int     n;
+
+	for (n = 0; n < 256; n++)
+		rs.s[n] = n;
+	rs.i = 0;
+	rs.j = 0;
+}
+
+static inline void
+arc4_addrandom(const unsigned char *dat, int datlen)
+{
+	int     n;
+	unsigned char si;
+
+	rs.i--;
+	for (n = 0; n < 256; n++) {
+		rs.i = (rs.i + 1);
+		si = rs.s[rs.i];
+		rs.j = (rs.j + si + dat[n % datlen]);
+		rs.s[rs.i] = rs.s[rs.j];
+		rs.s[rs.j] = si;
+	}
+	rs.j = rs.i;
+}
+
+#ifndef _WIN32
+static ssize_t
+read_all(int fd, unsigned char *buf, size_t count)
+{
+	size_t numread = 0;
+	ssize_t result;
+
+	while (numread < count) {
+		result = read(fd, buf+numread, count-numread);
+		if (result<0)
+			return -1;
+		else if (result == 0)
+			break;
+		numread += result;
+	}
+
+	return (ssize_t)numread;
+}
+#endif
+
+#ifdef _WIN32
+#define TRY_SEED_WIN32
+static int
+arc4_seed_win32(void)
+{
+	/* This is adapted from Tor's crypto_seed_rng() */
+	static int provider_set = 0;
+	static HCRYPTPROV provider;
+	unsigned char buf[ADD_ENTROPY];
+
+	if (!provider_set) {
+		if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
+		    CRYPT_VERIFYCONTEXT)) {
+			if (GetLastError() != (DWORD)NTE_BAD_KEYSET)
+				return -1;
+		}
+		provider_set = 1;
+	}
+	if (!CryptGenRandom(provider, sizeof(buf), buf))
+		return -1;
+	arc4_addrandom(buf, sizeof(buf));
+	evutil_memclear_(buf, sizeof(buf));
+	return 0;
+}
+#endif
+
+#if defined(EVENT__HAVE_SYS_SYSCTL_H) && defined(EVENT__HAVE_SYSCTL)
+#if EVENT__HAVE_DECL_CTL_KERN && EVENT__HAVE_DECL_KERN_RANDOM && EVENT__HAVE_DECL_RANDOM_UUID
+#define TRY_SEED_SYSCTL_LINUX
+static int
+arc4_seed_sysctl_linux(void)
+{
+	/* Based on code by William Ahern, this function tries to use the
+	 * RANDOM_UUID sysctl to get entropy from the kernel.  This can work
+	 * even if /dev/urandom is inaccessible for some reason (e.g., we're
+	 * running in a chroot). */
+	int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
+	unsigned char buf[ADD_ENTROPY];
+	size_t len, n;
+	unsigned i;
+	int any_set;
+
+	memset(buf, 0, sizeof(buf));
+
+	for (len = 0; len < sizeof(buf); len += n) {
+		n = sizeof(buf) - len;
+
+		if (0 != sysctl(mib, 3, &buf[len], &n, NULL, 0))
+			return -1;
+	}
+	/* make sure that the buffer actually got set. */
+	for (i=0,any_set=0; i<sizeof(buf); ++i) {
+		any_set |= buf[i];
+	}
+	if (!any_set)
+		return -1;
+
+	arc4_addrandom(buf, sizeof(buf));
+	evutil_memclear_(buf, sizeof(buf));
+	return 0;
+}
+#endif
+
+#if EVENT__HAVE_DECL_CTL_KERN && EVENT__HAVE_DECL_KERN_ARND
+#define TRY_SEED_SYSCTL_BSD
+static int
+arc4_seed_sysctl_bsd(void)
+{
+	/* Based on code from William Ahern and from OpenBSD, this function
+	 * tries to use the KERN_ARND syscall to get entropy from the kernel.
+	 * This can work even if /dev/urandom is inaccessible for some reason
+	 * (e.g., we're running in a chroot). */
+	int mib[] = { CTL_KERN, KERN_ARND };
+	unsigned char buf[ADD_ENTROPY];
+	size_t len, n;
+	int i, any_set;
+
+	memset(buf, 0, sizeof(buf));
+
+	len = sizeof(buf);
+	if (sysctl(mib, 2, buf, &len, NULL, 0) == -1) {
+		for (len = 0; len < sizeof(buf); len += sizeof(unsigned)) {
+			n = sizeof(unsigned);
+			if (n + len > sizeof(buf))
+			    n = len - sizeof(buf);
+			if (sysctl(mib, 2, &buf[len], &n, NULL, 0) == -1)
+				return -1;
+		}
+	}
+	/* make sure that the buffer actually got set. */
+	for (i=any_set=0; i<sizeof(buf); ++i) {
+		any_set |= buf[i];
+	}
+	if (!any_set)
+		return -1;
+
+	arc4_addrandom(buf, sizeof(buf));
+	evutil_memclear_(buf, sizeof(buf));
+	return 0;
+}
+#endif
+#endif /* defined(EVENT__HAVE_SYS_SYSCTL_H) */
+
+#ifdef __linux__
+#define TRY_SEED_PROC_SYS_KERNEL_RANDOM_UUID
+static int
+arc4_seed_proc_sys_kernel_random_uuid(void)
+{
+	/* Occasionally, somebody will make /proc/sys accessible in a chroot,
+	 * but not /dev/urandom.  Let's try /proc/sys/kernel/random/uuid.
+	 * Its format is stupid, so we need to decode it from hex.
+	 */
+	int fd;
+	char buf[128];
+	unsigned char entropy[64];
+	int bytes, n, i, nybbles;
+	for (bytes = 0; bytes<ADD_ENTROPY; ) {
+		fd = evutil_open_closeonexec_("/proc/sys/kernel/random/uuid", O_RDONLY, 0);
+		if (fd < 0)
+			return -1;
+		n = read(fd, buf, sizeof(buf));
+		close(fd);
+		if (n<=0)
+			return -1;
+		memset(entropy, 0, sizeof(entropy));
+		for (i=nybbles=0; i<n; ++i) {
+			if (EVUTIL_ISXDIGIT_(buf[i])) {
+				int nyb = evutil_hex_char_to_int_(buf[i]);
+				if (nybbles & 1) {
+					entropy[nybbles/2] |= nyb;
+				} else {
+					entropy[nybbles/2] |= nyb<<4;
+				}
+				++nybbles;
+			}
+		}
+		if (nybbles < 2)
+			return -1;
+		arc4_addrandom(entropy, nybbles/2);
+		bytes += nybbles/2;
+	}
+	evutil_memclear_(entropy, sizeof(entropy));
+	evutil_memclear_(buf, sizeof(buf));
+	return 0;
+}
+#endif
+
+#ifndef _WIN32
+#define TRY_SEED_URANDOM
+static char *arc4random_urandom_filename = NULL;
+
+static int arc4_seed_urandom_helper_(const char *fname)
+{
+	unsigned char buf[ADD_ENTROPY];
+	int fd;
+	size_t n;
+
+	fd = evutil_open_closeonexec_(fname, O_RDONLY, 0);
+	if (fd<0)
+		return -1;
+	n = read_all(fd, buf, sizeof(buf));
+	close(fd);
+	if (n != sizeof(buf))
+		return -1;
+	arc4_addrandom(buf, sizeof(buf));
+	evutil_memclear_(buf, sizeof(buf));
+	return 0;
+}
+
+static int
+arc4_seed_urandom(void)
+{
+	/* This is adapted from Tor's crypto_seed_rng() */
+	static const char *filenames[] = {
+		"/dev/srandom", "/dev/urandom", "/dev/random", NULL
+	};
+	int i;
+	if (arc4random_urandom_filename)
+		return arc4_seed_urandom_helper_(arc4random_urandom_filename);
+
+	for (i = 0; filenames[i]; ++i) {
+		if (arc4_seed_urandom_helper_(filenames[i]) == 0) {
+			return 0;
+		}
+	}
+
+	return -1;
+}
+#endif
+
+static int
+arc4_seed(void)
+{
+	int ok = 0;
+	/* We try every method that might work, and don't give up even if one
+	 * does seem to work.  There's no real harm in over-seeding, and if
+	 * one of these sources turns out to be broken, that would be bad. */
+#ifdef TRY_SEED_WIN32
+	if (0 == arc4_seed_win32())
+		ok = 1;
+#endif
+#ifdef TRY_SEED_URANDOM
+	if (0 == arc4_seed_urandom())
+		ok = 1;
+#endif
+#ifdef TRY_SEED_PROC_SYS_KERNEL_RANDOM_UUID
+	if (arc4random_urandom_filename == NULL &&
+	    0 == arc4_seed_proc_sys_kernel_random_uuid())
+		ok = 1;
+#endif
+#ifdef TRY_SEED_SYSCTL_LINUX
+	/* Apparently Linux is deprecating sysctl, and spewing warning
+	 * messages when you try to use it. */
+	if (!ok && 0 == arc4_seed_sysctl_linux())
+		ok = 1;
+#endif
+#ifdef TRY_SEED_SYSCTL_BSD
+	if (0 == arc4_seed_sysctl_bsd())
+		ok = 1;
+#endif
+	return ok ? 0 : -1;
+}
+
+static int
+arc4_stir(void)
+{
+	int     i;
+
+	if (!rs_initialized) {
+		arc4_init();
+		rs_initialized = 1;
+	}
+
+	if (0 != arc4_seed())
+		return -1;
+
+	/*
+	 * Discard early keystream, as per recommendations in
+	 * "Weaknesses in the Key Scheduling Algorithm of RC4" by
+	 * Scott Fluhrer, Itsik Mantin, and Adi Shamir.
+	 * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps
+	 *
+	 * Ilya Mironov's "(Not So) Random Shuffles of RC4" suggests that
+	 * we drop at least 2*256 bytes, with 12*256 as a conservative
+	 * value.
+	 *
+	 * RFC4345 says to drop 6*256.
+	 *
+	 * At least some versions of this code drop 4*256, in a mistaken
+	 * belief that "words" in the Fluhrer/Mantin/Shamir paper refers
+	 * to processor words.
+	 *
+	 * We add another sect to the cargo cult, and choose 12*256.
+	 */
+	for (i = 0; i < 12*256; i++)
+		(void)arc4_getbyte();
+
+	arc4_count = BYTES_BEFORE_RESEED;
+
+	return 0;
+}
+
+
+static void
+arc4_stir_if_needed(void)
+{
+	pid_t pid = getpid();
+
+	if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid)
+	{
+		arc4_stir_pid = pid;
+		arc4_stir();
+	}
+}
+
+static inline unsigned char
+arc4_getbyte(void)
+{
+	unsigned char si, sj;
+
+	rs.i = (rs.i + 1);
+	si = rs.s[rs.i];
+	rs.j = (rs.j + si);
+	sj = rs.s[rs.j];
+	rs.s[rs.i] = sj;
+	rs.s[rs.j] = si;
+	return (rs.s[(si + sj) & 0xff]);
+}
+
+static inline unsigned int
+arc4_getword(void)
+{
+	unsigned int val;
+
+	val = arc4_getbyte() << 24;
+	val |= arc4_getbyte() << 16;
+	val |= arc4_getbyte() << 8;
+	val |= arc4_getbyte();
+
+	return val;
+}
+
+#ifndef ARC4RANDOM_NOSTIR
+ARC4RANDOM_EXPORT int
+arc4random_stir(void)
+{
+	int val;
+	ARC4_LOCK_();
+	val = arc4_stir();
+	ARC4_UNLOCK_();
+	return val;
+}
+#endif
+
+#ifndef ARC4RANDOM_NOADDRANDOM
+ARC4RANDOM_EXPORT void
+arc4random_addrandom(const unsigned char *dat, int datlen)
+{
+	int j;
+	ARC4_LOCK_();
+	if (!rs_initialized)
+		arc4_stir();
+	for (j = 0; j < datlen; j += 256) {
+		/* arc4_addrandom() ignores all but the first 256 bytes of
+		 * its input.  We want to make sure to look at ALL the
+		 * data in 'dat', just in case the user is doing something
+		 * crazy like passing us all the files in /var/log. */
+		arc4_addrandom(dat + j, datlen - j);
+	}
+	ARC4_UNLOCK_();
+}
+#endif
+
+#ifndef ARC4RANDOM_NORANDOM
+ARC4RANDOM_EXPORT ARC4RANDOM_UINT32
+arc4random(void)
+{
+	ARC4RANDOM_UINT32 val;
+	ARC4_LOCK_();
+	arc4_count -= 4;
+	arc4_stir_if_needed();
+	val = arc4_getword();
+	ARC4_UNLOCK_();
+	return val;
+}
+#endif
+
+ARC4RANDOM_EXPORT void
+arc4random_buf(void *buf_, size_t n)
+{
+	unsigned char *buf = buf_;
+	ARC4_LOCK_();
+	arc4_stir_if_needed();
+	while (n--) {
+		if (--arc4_count <= 0)
+			arc4_stir();
+		buf[n] = arc4_getbyte();
+	}
+	ARC4_UNLOCK_();
+}
+
+#ifndef ARC4RANDOM_NOUNIFORM
+/*
+ * Calculate a uniformly distributed random number less than upper_bound
+ * avoiding "modulo bias".
+ *
+ * Uniformity is achieved by generating new random numbers until the one
+ * returned is outside the range [0, 2**32 % upper_bound).  This
+ * guarantees the selected random number will be inside
+ * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
+ * after reduction modulo upper_bound.
+ */
+ARC4RANDOM_EXPORT unsigned int
+arc4random_uniform(unsigned int upper_bound)
+{
+	ARC4RANDOM_UINT32 r, min;
+
+	if (upper_bound < 2)
+		return 0;
+
+#if (UINT_MAX > 0xffffffffUL)
+	min = 0x100000000UL % upper_bound;
+#else
+	/* Calculate (2**32 % upper_bound) avoiding 64-bit math */
+	if (upper_bound > 0x80000000)
+		min = 1 + ~upper_bound;		/* 2**32 - upper_bound */
+	else {
+		/* (2**32 - (x * 2)) % x == 2**32 % x when x <= 2**31 */
+		min = ((0xffffffff - (upper_bound * 2)) + 1) % upper_bound;
+	}
+#endif
+
+	/*
+	 * This could theoretically loop forever but each retry has
+	 * p > 0.5 (worst case, usually far better) of selecting a
+	 * number inside the range we need, so it should rarely need
+	 * to re-roll.
+	 */
+	for (;;) {
+		r = arc4random();
+		if (r >= min)
+			break;
+	}
+
+	return r % upper_bound;
+}
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/buffer.c b/extra/libevent/libevent-2.1.11-stable/buffer.c
new file mode 100644
index 000000000000..a51b6c5f66eb
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/buffer.c
@@ -0,0 +1,3463 @@
+/*
+ * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <windows.h>
+#include <io.h>
+#endif
+
+#ifdef EVENT__HAVE_VASPRINTF
+/* If we have vasprintf, we need to define _GNU_SOURCE before we include
+ * stdio.h.  This comes from evconfig-private.h.
+ */
+#endif
+
+#include <sys/types.h>
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_SENDFILE_H
+#include <sys/sendfile.h>
+#endif
+#ifdef EVENT__HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <limits.h>
+
+#include "event2/event.h"
+#include "event2/buffer.h"
+#include "event2/buffer_compat.h"
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_compat.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/thread.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+#include "evthread-internal.h"
+#include "evbuffer-internal.h"
+#include "bufferevent-internal.h"
+#include "event-internal.h"
+
+/* some systems do not have MAP_FAILED */
+#ifndef MAP_FAILED
+#define MAP_FAILED	((void *)-1)
+#endif
+
+/* send file support */
+#if defined(EVENT__HAVE_SYS_SENDFILE_H) && defined(EVENT__HAVE_SENDFILE) && defined(__linux__)
+#define USE_SENDFILE		1
+#define SENDFILE_IS_LINUX	1
+#elif defined(EVENT__HAVE_SENDFILE) && defined(__FreeBSD__)
+#define USE_SENDFILE		1
+#define SENDFILE_IS_FREEBSD	1
+#elif defined(EVENT__HAVE_SENDFILE) && defined(__APPLE__)
+#define USE_SENDFILE		1
+#define SENDFILE_IS_MACOSX	1
+#elif defined(EVENT__HAVE_SENDFILE) && defined(__sun__) && defined(__svr4__)
+#define USE_SENDFILE		1
+#define SENDFILE_IS_SOLARIS	1
+#endif
+
+/* Mask of user-selectable callback flags. */
+#define EVBUFFER_CB_USER_FLAGS	    0xffff
+/* Mask of all internal-use-only flags. */
+#define EVBUFFER_CB_INTERNAL_FLAGS  0xffff0000
+
+/* Flag set if the callback is using the cb_obsolete function pointer  */
+#define EVBUFFER_CB_OBSOLETE	       0x00040000
+
+/* evbuffer_chain support */
+#define CHAIN_SPACE_PTR(ch) ((ch)->buffer + (ch)->misalign + (ch)->off)
+#define CHAIN_SPACE_LEN(ch) ((ch)->flags & EVBUFFER_IMMUTABLE ? \
+	    0 : (ch)->buffer_len - ((ch)->misalign + (ch)->off))
+
+#define CHAIN_PINNED(ch)  (((ch)->flags & EVBUFFER_MEM_PINNED_ANY) != 0)
+#define CHAIN_PINNED_R(ch)  (((ch)->flags & EVBUFFER_MEM_PINNED_R) != 0)
+
+/* evbuffer_ptr support */
+#define PTR_NOT_FOUND(ptr) do {			\
+	(ptr)->pos = -1;					\
+	(ptr)->internal_.chain = NULL;		\
+	(ptr)->internal_.pos_in_chain = 0;	\
+} while (0)
+
+static void evbuffer_chain_align(struct evbuffer_chain *chain);
+static int evbuffer_chain_should_realign(struct evbuffer_chain *chain,
+    size_t datalen);
+static void evbuffer_deferred_callback(struct event_callback *cb, void *arg);
+static int evbuffer_ptr_memcmp(const struct evbuffer *buf,
+    const struct evbuffer_ptr *pos, const char *mem, size_t len);
+static struct evbuffer_chain *evbuffer_expand_singlechain(struct evbuffer *buf,
+    size_t datlen);
+static int evbuffer_ptr_subtract(struct evbuffer *buf, struct evbuffer_ptr *pos,
+    size_t howfar);
+static int evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg);
+static inline void evbuffer_chain_incref(struct evbuffer_chain *chain);
+
+static struct evbuffer_chain *
+evbuffer_chain_new(size_t size)
+{
+	struct evbuffer_chain *chain;
+	size_t to_alloc;
+
+	if (size > EVBUFFER_CHAIN_MAX - EVBUFFER_CHAIN_SIZE)
+		return (NULL);
+
+	size += EVBUFFER_CHAIN_SIZE;
+
+	/* get the next largest memory that can hold the buffer */
+	if (size < EVBUFFER_CHAIN_MAX / 2) {
+		to_alloc = MIN_BUFFER_SIZE;
+		while (to_alloc < size) {
+			to_alloc <<= 1;
+		}
+	} else {
+		to_alloc = size;
+	}
+
+	/* we get everything in one chunk */
+	if ((chain = mm_malloc(to_alloc)) == NULL)
+		return (NULL);
+
+	memset(chain, 0, EVBUFFER_CHAIN_SIZE);
+
+	chain->buffer_len = to_alloc - EVBUFFER_CHAIN_SIZE;
+
+	/* this way we can manipulate the buffer to different addresses,
+	 * which is required for mmap for example.
+	 */
+	chain->buffer = EVBUFFER_CHAIN_EXTRA(unsigned char, chain);
+
+	chain->refcnt = 1;
+
+	return (chain);
+}
+
+static inline void
+evbuffer_chain_free(struct evbuffer_chain *chain)
+{
+	EVUTIL_ASSERT(chain->refcnt > 0);
+	if (--chain->refcnt > 0) {
+		/* chain is still referenced by other chains */
+		return;
+	}
+
+	if (CHAIN_PINNED(chain)) {
+		/* will get freed once no longer dangling */
+		chain->refcnt++;
+		chain->flags |= EVBUFFER_DANGLING;
+		return;
+	}
+
+	/* safe to release chain, it's either a referencing
+	 * chain or all references to it have been freed */
+	if (chain->flags & EVBUFFER_REFERENCE) {
+		struct evbuffer_chain_reference *info =
+		    EVBUFFER_CHAIN_EXTRA(
+			    struct evbuffer_chain_reference,
+			    chain);
+		if (info->cleanupfn)
+			(*info->cleanupfn)(chain->buffer,
+			    chain->buffer_len,
+			    info->extra);
+	}
+	if (chain->flags & EVBUFFER_FILESEGMENT) {
+		struct evbuffer_chain_file_segment *info =
+		    EVBUFFER_CHAIN_EXTRA(
+			    struct evbuffer_chain_file_segment,
+			    chain);
+		if (info->segment) {
+#ifdef _WIN32
+			if (info->segment->is_mapping)
+				UnmapViewOfFile(chain->buffer);
+#endif
+			evbuffer_file_segment_free(info->segment);
+		}
+	}
+	if (chain->flags & EVBUFFER_MULTICAST) {
+		struct evbuffer_multicast_parent *info =
+		    EVBUFFER_CHAIN_EXTRA(
+			    struct evbuffer_multicast_parent,
+			    chain);
+		/* referencing chain is being freed, decrease
+		 * refcounts of source chain and associated
+		 * evbuffer (which get freed once both reach
+		 * zero) */
+		EVUTIL_ASSERT(info->source != NULL);
+		EVUTIL_ASSERT(info->parent != NULL);
+		EVBUFFER_LOCK(info->source);
+		evbuffer_chain_free(info->parent);
+		evbuffer_decref_and_unlock_(info->source);
+	}
+
+	mm_free(chain);
+}
+
+static void
+evbuffer_free_all_chains(struct evbuffer_chain *chain)
+{
+	struct evbuffer_chain *next;
+	for (; chain; chain = next) {
+		next = chain->next;
+		evbuffer_chain_free(chain);
+	}
+}
+
+#ifndef NDEBUG
+static int
+evbuffer_chains_all_empty(struct evbuffer_chain *chain)
+{
+	for (; chain; chain = chain->next) {
+		if (chain->off)
+			return 0;
+	}
+	return 1;
+}
+#else
+/* The definition is needed for EVUTIL_ASSERT, which uses sizeof to avoid
+"unused variable" warnings. */
+static inline int evbuffer_chains_all_empty(struct evbuffer_chain *chain) {
+	return 1;
+}
+#endif
+
+/* Free all trailing chains in 'buf' that are neither pinned nor empty, prior
+ * to replacing them all with a new chain.  Return a pointer to the place
+ * where the new chain will go.
+ *
+ * Internal; requires lock.  The caller must fix up buf->last and buf->first
+ * as needed; they might have been freed.
+ */
+static struct evbuffer_chain **
+evbuffer_free_trailing_empty_chains(struct evbuffer *buf)
+{
+	struct evbuffer_chain **ch = buf->last_with_datap;
+	/* Find the first victim chain.  It might be *last_with_datap */
+	while ((*ch) && ((*ch)->off != 0 || CHAIN_PINNED(*ch)))
+		ch = &(*ch)->next;
+	if (*ch) {
+		EVUTIL_ASSERT(evbuffer_chains_all_empty(*ch));
+		evbuffer_free_all_chains(*ch);
+		*ch = NULL;
+	}
+	return ch;
+}
+
+/* Add a single chain 'chain' to the end of 'buf', freeing trailing empty
+ * chains as necessary.  Requires lock.  Does not schedule callbacks.
+ */
+static void
+evbuffer_chain_insert(struct evbuffer *buf,
+    struct evbuffer_chain *chain)
+{
+	ASSERT_EVBUFFER_LOCKED(buf);
+	if (*buf->last_with_datap == NULL) {
+		/* There are no chains data on the buffer at all. */
+		EVUTIL_ASSERT(buf->last_with_datap == &buf->first);
+		EVUTIL_ASSERT(buf->first == NULL);
+		buf->first = buf->last = chain;
+	} else {
+		struct evbuffer_chain **chp;
+		chp = evbuffer_free_trailing_empty_chains(buf);
+		*chp = chain;
+		if (chain->off)
+			buf->last_with_datap = chp;
+		buf->last = chain;
+	}
+	buf->total_len += chain->off;
+}
+
+static inline struct evbuffer_chain *
+evbuffer_chain_insert_new(struct evbuffer *buf, size_t datlen)
+{
+	struct evbuffer_chain *chain;
+	if ((chain = evbuffer_chain_new(datlen)) == NULL)
+		return NULL;
+	evbuffer_chain_insert(buf, chain);
+	return chain;
+}
+
+void
+evbuffer_chain_pin_(struct evbuffer_chain *chain, unsigned flag)
+{
+	EVUTIL_ASSERT((chain->flags & flag) == 0);
+	chain->flags |= flag;
+}
+
+void
+evbuffer_chain_unpin_(struct evbuffer_chain *chain, unsigned flag)
+{
+	EVUTIL_ASSERT((chain->flags & flag) != 0);
+	chain->flags &= ~flag;
+	if (chain->flags & EVBUFFER_DANGLING)
+		evbuffer_chain_free(chain);
+}
+
+static inline void
+evbuffer_chain_incref(struct evbuffer_chain *chain)
+{
+    ++chain->refcnt;
+}
+
+struct evbuffer *
+evbuffer_new(void)
+{
+	struct evbuffer *buffer;
+
+	buffer = mm_calloc(1, sizeof(struct evbuffer));
+	if (buffer == NULL)
+		return (NULL);
+
+	LIST_INIT(&buffer->callbacks);
+	buffer->refcnt = 1;
+	buffer->last_with_datap = &buffer->first;
+
+	return (buffer);
+}
+
+int
+evbuffer_set_flags(struct evbuffer *buf, ev_uint64_t flags)
+{
+	EVBUFFER_LOCK(buf);
+	buf->flags |= (ev_uint32_t)flags;
+	EVBUFFER_UNLOCK(buf);
+	return 0;
+}
+
+int
+evbuffer_clear_flags(struct evbuffer *buf, ev_uint64_t flags)
+{
+	EVBUFFER_LOCK(buf);
+	buf->flags &= ~(ev_uint32_t)flags;
+	EVBUFFER_UNLOCK(buf);
+	return 0;
+}
+
+void
+evbuffer_incref_(struct evbuffer *buf)
+{
+	EVBUFFER_LOCK(buf);
+	++buf->refcnt;
+	EVBUFFER_UNLOCK(buf);
+}
+
+void
+evbuffer_incref_and_lock_(struct evbuffer *buf)
+{
+	EVBUFFER_LOCK(buf);
+	++buf->refcnt;
+}
+
+int
+evbuffer_defer_callbacks(struct evbuffer *buffer, struct event_base *base)
+{
+	EVBUFFER_LOCK(buffer);
+	buffer->cb_queue = base;
+	buffer->deferred_cbs = 1;
+	event_deferred_cb_init_(&buffer->deferred,
+	    event_base_get_npriorities(base) / 2,
+	    evbuffer_deferred_callback, buffer);
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+int
+evbuffer_enable_locking(struct evbuffer *buf, void *lock)
+{
+#ifdef EVENT__DISABLE_THREAD_SUPPORT
+	return -1;
+#else
+	if (buf->lock)
+		return -1;
+
+	if (!lock) {
+		EVTHREAD_ALLOC_LOCK(lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+		if (!lock)
+			return -1;
+		buf->lock = lock;
+		buf->own_lock = 1;
+	} else {
+		buf->lock = lock;
+		buf->own_lock = 0;
+	}
+
+	return 0;
+#endif
+}
+
+void
+evbuffer_set_parent_(struct evbuffer *buf, struct bufferevent *bev)
+{
+	EVBUFFER_LOCK(buf);
+	buf->parent = bev;
+	EVBUFFER_UNLOCK(buf);
+}
+
+static void
+evbuffer_run_callbacks(struct evbuffer *buffer, int running_deferred)
+{
+	struct evbuffer_cb_entry *cbent, *next;
+	struct evbuffer_cb_info info;
+	size_t new_size;
+	ev_uint32_t mask, masked_val;
+	int clear = 1;
+
+	if (running_deferred) {
+		mask = EVBUFFER_CB_NODEFER|EVBUFFER_CB_ENABLED;
+		masked_val = EVBUFFER_CB_ENABLED;
+	} else if (buffer->deferred_cbs) {
+		mask = EVBUFFER_CB_NODEFER|EVBUFFER_CB_ENABLED;
+		masked_val = EVBUFFER_CB_NODEFER|EVBUFFER_CB_ENABLED;
+		/* Don't zero-out n_add/n_del, since the deferred callbacks
+		   will want to see them. */
+		clear = 0;
+	} else {
+		mask = EVBUFFER_CB_ENABLED;
+		masked_val = EVBUFFER_CB_ENABLED;
+	}
+
+	ASSERT_EVBUFFER_LOCKED(buffer);
+
+	if (LIST_EMPTY(&buffer->callbacks)) {
+		buffer->n_add_for_cb = buffer->n_del_for_cb = 0;
+		return;
+	}
+	if (buffer->n_add_for_cb == 0 && buffer->n_del_for_cb == 0)
+		return;
+
+	new_size = buffer->total_len;
+	info.orig_size = new_size + buffer->n_del_for_cb - buffer->n_add_for_cb;
+	info.n_added = buffer->n_add_for_cb;
+	info.n_deleted = buffer->n_del_for_cb;
+	if (clear) {
+		buffer->n_add_for_cb = 0;
+		buffer->n_del_for_cb = 0;
+	}
+	for (cbent = LIST_FIRST(&buffer->callbacks);
+	     cbent != LIST_END(&buffer->callbacks);
+	     cbent = next) {
+		/* Get the 'next' pointer now in case this callback decides
+		 * to remove itself or something. */
+		next = LIST_NEXT(cbent, next);
+
+		if ((cbent->flags & mask) != masked_val)
+			continue;
+
+		if ((cbent->flags & EVBUFFER_CB_OBSOLETE))
+			cbent->cb.cb_obsolete(buffer,
+			    info.orig_size, new_size, cbent->cbarg);
+		else
+			cbent->cb.cb_func(buffer, &info, cbent->cbarg);
+	}
+}
+
+void
+evbuffer_invoke_callbacks_(struct evbuffer *buffer)
+{
+	if (LIST_EMPTY(&buffer->callbacks)) {
+		buffer->n_add_for_cb = buffer->n_del_for_cb = 0;
+		return;
+	}
+
+	if (buffer->deferred_cbs) {
+		if (event_deferred_cb_schedule_(buffer->cb_queue, &buffer->deferred)) {
+			evbuffer_incref_and_lock_(buffer);
+			if (buffer->parent)
+				bufferevent_incref_(buffer->parent);
+			EVBUFFER_UNLOCK(buffer);
+		}
+	}
+
+	evbuffer_run_callbacks(buffer, 0);
+}
+
+static void
+evbuffer_deferred_callback(struct event_callback *cb, void *arg)
+{
+	struct bufferevent *parent = NULL;
+	struct evbuffer *buffer = arg;
+
+	/* XXXX It would be better to run these callbacks without holding the
+	 * lock */
+	EVBUFFER_LOCK(buffer);
+	parent = buffer->parent;
+	evbuffer_run_callbacks(buffer, 1);
+	evbuffer_decref_and_unlock_(buffer);
+	if (parent)
+		bufferevent_decref_(parent);
+}
+
+static void
+evbuffer_remove_all_callbacks(struct evbuffer *buffer)
+{
+	struct evbuffer_cb_entry *cbent;
+
+	while ((cbent = LIST_FIRST(&buffer->callbacks))) {
+		LIST_REMOVE(cbent, next);
+		mm_free(cbent);
+	}
+}
+
+void
+evbuffer_decref_and_unlock_(struct evbuffer *buffer)
+{
+	struct evbuffer_chain *chain, *next;
+	ASSERT_EVBUFFER_LOCKED(buffer);
+
+	EVUTIL_ASSERT(buffer->refcnt > 0);
+
+	if (--buffer->refcnt > 0) {
+		EVBUFFER_UNLOCK(buffer);
+		return;
+	}
+
+	for (chain = buffer->first; chain != NULL; chain = next) {
+		next = chain->next;
+		evbuffer_chain_free(chain);
+	}
+	evbuffer_remove_all_callbacks(buffer);
+	if (buffer->deferred_cbs)
+		event_deferred_cb_cancel_(buffer->cb_queue, &buffer->deferred);
+
+	EVBUFFER_UNLOCK(buffer);
+	if (buffer->own_lock)
+		EVTHREAD_FREE_LOCK(buffer->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	mm_free(buffer);
+}
+
+void
+evbuffer_free(struct evbuffer *buffer)
+{
+	EVBUFFER_LOCK(buffer);
+	evbuffer_decref_and_unlock_(buffer);
+}
+
+void
+evbuffer_lock(struct evbuffer *buf)
+{
+	EVBUFFER_LOCK(buf);
+}
+
+void
+evbuffer_unlock(struct evbuffer *buf)
+{
+	EVBUFFER_UNLOCK(buf);
+}
+
+size_t
+evbuffer_get_length(const struct evbuffer *buffer)
+{
+	size_t result;
+
+	EVBUFFER_LOCK(buffer);
+
+	result = (buffer->total_len);
+
+	EVBUFFER_UNLOCK(buffer);
+
+	return result;
+}
+
+size_t
+evbuffer_get_contiguous_space(const struct evbuffer *buf)
+{
+	struct evbuffer_chain *chain;
+	size_t result;
+
+	EVBUFFER_LOCK(buf);
+	chain = buf->first;
+	result = (chain != NULL ? chain->off : 0);
+	EVBUFFER_UNLOCK(buf);
+
+	return result;
+}
+
+size_t
+evbuffer_add_iovec(struct evbuffer * buf, struct evbuffer_iovec * vec, int n_vec) {
+	int n;
+	size_t res;
+	size_t to_alloc;
+
+	EVBUFFER_LOCK(buf);
+
+	res = to_alloc = 0;
+
+	for (n = 0; n < n_vec; n++) {
+		to_alloc += vec[n].iov_len;
+	}
+
+	if (evbuffer_expand_fast_(buf, to_alloc, 2) < 0) {
+		goto done;
+	}
+
+	for (n = 0; n < n_vec; n++) {
+		/* XXX each 'add' call here does a bunch of setup that's
+		 * obviated by evbuffer_expand_fast_, and some cleanup that we
+		 * would like to do only once.  Instead we should just extract
+		 * the part of the code that's needed. */
+
+		if (evbuffer_add(buf, vec[n].iov_base, vec[n].iov_len) < 0) {
+			goto done;
+		}
+
+		res += vec[n].iov_len;
+	}
+
+done:
+    EVBUFFER_UNLOCK(buf);
+    return res;
+}
+
+int
+evbuffer_reserve_space(struct evbuffer *buf, ev_ssize_t size,
+    struct evbuffer_iovec *vec, int n_vecs)
+{
+	struct evbuffer_chain *chain, **chainp;
+	int n = -1;
+
+	EVBUFFER_LOCK(buf);
+	if (buf->freeze_end)
+		goto done;
+	if (n_vecs < 1)
+		goto done;
+	if (n_vecs == 1) {
+		if ((chain = evbuffer_expand_singlechain(buf, size)) == NULL)
+			goto done;
+
+		vec[0].iov_base = (void *)CHAIN_SPACE_PTR(chain);
+		vec[0].iov_len = (size_t)CHAIN_SPACE_LEN(chain);
+		EVUTIL_ASSERT(size<0 || (size_t)vec[0].iov_len >= (size_t)size);
+		n = 1;
+	} else {
+		if (evbuffer_expand_fast_(buf, size, n_vecs)<0)
+			goto done;
+		n = evbuffer_read_setup_vecs_(buf, size, vec, n_vecs,
+				&chainp, 0);
+	}
+
+done:
+	EVBUFFER_UNLOCK(buf);
+	return n;
+
+}
+
+static int
+advance_last_with_data(struct evbuffer *buf)
+{
+	int n = 0;
+	struct evbuffer_chain **chainp = buf->last_with_datap;
+
+	ASSERT_EVBUFFER_LOCKED(buf);
+
+	if (!*chainp)
+		return 0;
+
+	while ((*chainp)->next) {
+		chainp = &(*chainp)->next;
+		if ((*chainp)->off)
+			buf->last_with_datap = chainp;
+		++n;
+	}
+	return n;
+}
+
+int
+evbuffer_commit_space(struct evbuffer *buf,
+    struct evbuffer_iovec *vec, int n_vecs)
+{
+	struct evbuffer_chain *chain, **firstchainp, **chainp;
+	int result = -1;
+	size_t added = 0;
+	int i;
+
+	EVBUFFER_LOCK(buf);
+
+	if (buf->freeze_end)
+		goto done;
+	if (n_vecs == 0) {
+		result = 0;
+		goto done;
+	} else if (n_vecs == 1 &&
+	    (buf->last && vec[0].iov_base == (void *)CHAIN_SPACE_PTR(buf->last))) {
+		/* The user only got or used one chain; it might not
+		 * be the first one with space in it. */
+		if ((size_t)vec[0].iov_len > (size_t)CHAIN_SPACE_LEN(buf->last))
+			goto done;
+		buf->last->off += vec[0].iov_len;
+		added = vec[0].iov_len;
+		if (added)
+			advance_last_with_data(buf);
+		goto okay;
+	}
+
+	/* Advance 'firstchain' to the first chain with space in it. */
+	firstchainp = buf->last_with_datap;
+	if (!*firstchainp)
+		goto done;
+	if (CHAIN_SPACE_LEN(*firstchainp) == 0) {
+		firstchainp = &(*firstchainp)->next;
+	}
+
+	chain = *firstchainp;
+	/* pass 1: make sure that the pointers and lengths of vecs[] are in
+	 * bounds before we try to commit anything. */
+	for (i=0; i<n_vecs; ++i) {
+		if (!chain)
+			goto done;
+		if (vec[i].iov_base != (void *)CHAIN_SPACE_PTR(chain) ||
+		    (size_t)vec[i].iov_len > CHAIN_SPACE_LEN(chain))
+			goto done;
+		chain = chain->next;
+	}
+	/* pass 2: actually adjust all the chains. */
+	chainp = firstchainp;
+	for (i=0; i<n_vecs; ++i) {
+		(*chainp)->off += vec[i].iov_len;
+		added += vec[i].iov_len;
+		if (vec[i].iov_len) {
+			buf->last_with_datap = chainp;
+		}
+		chainp = &(*chainp)->next;
+	}
+
+okay:
+	buf->total_len += added;
+	buf->n_add_for_cb += added;
+	result = 0;
+	evbuffer_invoke_callbacks_(buf);
+
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+static inline int
+HAS_PINNED_R(struct evbuffer *buf)
+{
+	return (buf->last && CHAIN_PINNED_R(buf->last));
+}
+
+static inline void
+ZERO_CHAIN(struct evbuffer *dst)
+{
+	ASSERT_EVBUFFER_LOCKED(dst);
+	dst->first = NULL;
+	dst->last = NULL;
+	dst->last_with_datap = &(dst)->first;
+	dst->total_len = 0;
+}
+
+/* Prepares the contents of src to be moved to another buffer by removing
+ * read-pinned chains. The first pinned chain is saved in first, and the
+ * last in last. If src has no read-pinned chains, first and last are set
+ * to NULL. */
+static int
+PRESERVE_PINNED(struct evbuffer *src, struct evbuffer_chain **first,
+		struct evbuffer_chain **last)
+{
+	struct evbuffer_chain *chain, **pinned;
+
+	ASSERT_EVBUFFER_LOCKED(src);
+
+	if (!HAS_PINNED_R(src)) {
+		*first = *last = NULL;
+		return 0;
+	}
+
+	pinned = src->last_with_datap;
+	if (!CHAIN_PINNED_R(*pinned))
+		pinned = &(*pinned)->next;
+	EVUTIL_ASSERT(CHAIN_PINNED_R(*pinned));
+	chain = *first = *pinned;
+	*last = src->last;
+
+	/* If there's data in the first pinned chain, we need to allocate
+	 * a new chain and copy the data over. */
+	if (chain->off) {
+		struct evbuffer_chain *tmp;
+
+		EVUTIL_ASSERT(pinned == src->last_with_datap);
+		tmp = evbuffer_chain_new(chain->off);
+		if (!tmp)
+			return -1;
+		memcpy(tmp->buffer, chain->buffer + chain->misalign,
+			chain->off);
+		tmp->off = chain->off;
+		*src->last_with_datap = tmp;
+		src->last = tmp;
+		chain->misalign += chain->off;
+		chain->off = 0;
+	} else {
+		src->last = *src->last_with_datap;
+		*pinned = NULL;
+	}
+
+	return 0;
+}
+
+static inline void
+RESTORE_PINNED(struct evbuffer *src, struct evbuffer_chain *pinned,
+		struct evbuffer_chain *last)
+{
+	ASSERT_EVBUFFER_LOCKED(src);
+
+	if (!pinned) {
+		ZERO_CHAIN(src);
+		return;
+	}
+
+	src->first = pinned;
+	src->last = last;
+	src->last_with_datap = &src->first;
+	src->total_len = 0;
+}
+
+static inline void
+COPY_CHAIN(struct evbuffer *dst, struct evbuffer *src)
+{
+	ASSERT_EVBUFFER_LOCKED(dst);
+	ASSERT_EVBUFFER_LOCKED(src);
+	dst->first = src->first;
+	if (src->last_with_datap == &src->first)
+		dst->last_with_datap = &dst->first;
+	else
+		dst->last_with_datap = src->last_with_datap;
+	dst->last = src->last;
+	dst->total_len = src->total_len;
+}
+
+static void
+APPEND_CHAIN(struct evbuffer *dst, struct evbuffer *src)
+{
+	struct evbuffer_chain **chp;
+
+	ASSERT_EVBUFFER_LOCKED(dst);
+	ASSERT_EVBUFFER_LOCKED(src);
+
+	chp = evbuffer_free_trailing_empty_chains(dst);
+	*chp = src->first;
+
+	if (src->last_with_datap == &src->first)
+		dst->last_with_datap = chp;
+	else
+		dst->last_with_datap = src->last_with_datap;
+	dst->last = src->last;
+	dst->total_len += src->total_len;
+}
+
+static inline void
+APPEND_CHAIN_MULTICAST(struct evbuffer *dst, struct evbuffer *src)
+{
+	struct evbuffer_chain *tmp;
+	struct evbuffer_chain *chain = src->first;
+	struct evbuffer_multicast_parent *extra;
+
+	ASSERT_EVBUFFER_LOCKED(dst);
+	ASSERT_EVBUFFER_LOCKED(src);
+
+	for (; chain; chain = chain->next) {
+		if (!chain->off || chain->flags & EVBUFFER_DANGLING) {
+			/* skip empty chains */
+			continue;
+		}
+
+		tmp = evbuffer_chain_new(sizeof(struct evbuffer_multicast_parent));
+		if (!tmp) {
+			event_warn("%s: out of memory", __func__);
+			return;
+		}
+		extra = EVBUFFER_CHAIN_EXTRA(struct evbuffer_multicast_parent, tmp);
+		/* reference evbuffer containing source chain so it
+		 * doesn't get released while the chain is still
+		 * being referenced to */
+		evbuffer_incref_(src);
+		extra->source = src;
+		/* reference source chain which now becomes immutable */
+		evbuffer_chain_incref(chain);
+		extra->parent = chain;
+		chain->flags |= EVBUFFER_IMMUTABLE;
+		tmp->buffer_len = chain->buffer_len;
+		tmp->misalign = chain->misalign;
+		tmp->off = chain->off;
+		tmp->flags |= EVBUFFER_MULTICAST|EVBUFFER_IMMUTABLE;
+		tmp->buffer = chain->buffer;
+		evbuffer_chain_insert(dst, tmp);
+	}
+}
+
+static void
+PREPEND_CHAIN(struct evbuffer *dst, struct evbuffer *src)
+{
+	ASSERT_EVBUFFER_LOCKED(dst);
+	ASSERT_EVBUFFER_LOCKED(src);
+	src->last->next = dst->first;
+	dst->first = src->first;
+	dst->total_len += src->total_len;
+	if (*dst->last_with_datap == NULL) {
+		if (src->last_with_datap == &(src)->first)
+			dst->last_with_datap = &dst->first;
+		else
+			dst->last_with_datap = src->last_with_datap;
+	} else if (dst->last_with_datap == &dst->first) {
+		dst->last_with_datap = &src->last->next;
+	}
+}
+
+int
+evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
+{
+	struct evbuffer_chain *pinned, *last;
+	size_t in_total_len, out_total_len;
+	int result = 0;
+
+	EVBUFFER_LOCK2(inbuf, outbuf);
+	in_total_len = inbuf->total_len;
+	out_total_len = outbuf->total_len;
+
+	if (in_total_len == 0 || outbuf == inbuf)
+		goto done;
+
+	if (outbuf->freeze_end || inbuf->freeze_start) {
+		result = -1;
+		goto done;
+	}
+
+	if (PRESERVE_PINNED(inbuf, &pinned, &last) < 0) {
+		result = -1;
+		goto done;
+	}
+
+	if (out_total_len == 0) {
+		/* There might be an empty chain at the start of outbuf; free
+		 * it. */
+		evbuffer_free_all_chains(outbuf->first);
+		COPY_CHAIN(outbuf, inbuf);
+	} else {
+		APPEND_CHAIN(outbuf, inbuf);
+	}
+
+	RESTORE_PINNED(inbuf, pinned, last);
+
+	inbuf->n_del_for_cb += in_total_len;
+	outbuf->n_add_for_cb += in_total_len;
+
+	evbuffer_invoke_callbacks_(inbuf);
+	evbuffer_invoke_callbacks_(outbuf);
+
+done:
+	EVBUFFER_UNLOCK2(inbuf, outbuf);
+	return result;
+}
+
+int
+evbuffer_add_buffer_reference(struct evbuffer *outbuf, struct evbuffer *inbuf)
+{
+	size_t in_total_len, out_total_len;
+	struct evbuffer_chain *chain;
+	int result = 0;
+
+	EVBUFFER_LOCK2(inbuf, outbuf);
+	in_total_len = inbuf->total_len;
+	out_total_len = outbuf->total_len;
+	chain = inbuf->first;
+
+	if (in_total_len == 0)
+		goto done;
+
+	if (outbuf->freeze_end || outbuf == inbuf) {
+		result = -1;
+		goto done;
+	}
+
+	for (; chain; chain = chain->next) {
+		if ((chain->flags & (EVBUFFER_FILESEGMENT|EVBUFFER_SENDFILE|EVBUFFER_MULTICAST)) != 0) {
+			/* chain type can not be referenced */
+			result = -1;
+			goto done;
+		}
+	}
+
+	if (out_total_len == 0) {
+		/* There might be an empty chain at the start of outbuf; free
+		 * it. */
+		evbuffer_free_all_chains(outbuf->first);
+	}
+	APPEND_CHAIN_MULTICAST(outbuf, inbuf);
+
+	outbuf->n_add_for_cb += in_total_len;
+	evbuffer_invoke_callbacks_(outbuf);
+
+done:
+	EVBUFFER_UNLOCK2(inbuf, outbuf);
+	return result;
+}
+
+int
+evbuffer_prepend_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
+{
+	struct evbuffer_chain *pinned, *last;
+	size_t in_total_len, out_total_len;
+	int result = 0;
+
+	EVBUFFER_LOCK2(inbuf, outbuf);
+
+	in_total_len = inbuf->total_len;
+	out_total_len = outbuf->total_len;
+
+	if (!in_total_len || inbuf == outbuf)
+		goto done;
+
+	if (outbuf->freeze_start || inbuf->freeze_start) {
+		result = -1;
+		goto done;
+	}
+
+	if (PRESERVE_PINNED(inbuf, &pinned, &last) < 0) {
+		result = -1;
+		goto done;
+	}
+
+	if (out_total_len == 0) {
+		/* There might be an empty chain at the start of outbuf; free
+		 * it. */
+		evbuffer_free_all_chains(outbuf->first);
+		COPY_CHAIN(outbuf, inbuf);
+	} else {
+		PREPEND_CHAIN(outbuf, inbuf);
+	}
+
+	RESTORE_PINNED(inbuf, pinned, last);
+
+	inbuf->n_del_for_cb += in_total_len;
+	outbuf->n_add_for_cb += in_total_len;
+
+	evbuffer_invoke_callbacks_(inbuf);
+	evbuffer_invoke_callbacks_(outbuf);
+done:
+	EVBUFFER_UNLOCK2(inbuf, outbuf);
+	return result;
+}
+
+int
+evbuffer_drain(struct evbuffer *buf, size_t len)
+{
+	struct evbuffer_chain *chain, *next;
+	size_t remaining, old_len;
+	int result = 0;
+
+	EVBUFFER_LOCK(buf);
+	old_len = buf->total_len;
+
+	if (old_len == 0)
+		goto done;
+
+	if (buf->freeze_start) {
+		result = -1;
+		goto done;
+	}
+
+	if (len >= old_len && !HAS_PINNED_R(buf)) {
+		len = old_len;
+		for (chain = buf->first; chain != NULL; chain = next) {
+			next = chain->next;
+			evbuffer_chain_free(chain);
+		}
+
+		ZERO_CHAIN(buf);
+	} else {
+		if (len >= old_len)
+			len = old_len;
+
+		buf->total_len -= len;
+		remaining = len;
+		for (chain = buf->first;
+		     remaining >= chain->off;
+		     chain = next) {
+			next = chain->next;
+			remaining -= chain->off;
+
+			if (chain == *buf->last_with_datap) {
+				buf->last_with_datap = &buf->first;
+			}
+			if (&chain->next == buf->last_with_datap)
+				buf->last_with_datap = &buf->first;
+
+			if (CHAIN_PINNED_R(chain)) {
+				EVUTIL_ASSERT(remaining == 0);
+				chain->misalign += chain->off;
+				chain->off = 0;
+				break;
+			} else
+				evbuffer_chain_free(chain);
+		}
+
+		buf->first = chain;
+		EVUTIL_ASSERT(remaining <= chain->off);
+		chain->misalign += remaining;
+		chain->off -= remaining;
+	}
+
+	buf->n_del_for_cb += len;
+	/* Tell someone about changes in this buffer */
+	evbuffer_invoke_callbacks_(buf);
+
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+/* Reads data from an event buffer and drains the bytes read */
+int
+evbuffer_remove(struct evbuffer *buf, void *data_out, size_t datlen)
+{
+	ev_ssize_t n;
+	EVBUFFER_LOCK(buf);
+	n = evbuffer_copyout_from(buf, NULL, data_out, datlen);
+	if (n > 0) {
+		if (evbuffer_drain(buf, n)<0)
+			n = -1;
+	}
+	EVBUFFER_UNLOCK(buf);
+	return (int)n;
+}
+
+ev_ssize_t
+evbuffer_copyout(struct evbuffer *buf, void *data_out, size_t datlen)
+{
+	return evbuffer_copyout_from(buf, NULL, data_out, datlen);
+}
+
+ev_ssize_t
+evbuffer_copyout_from(struct evbuffer *buf, const struct evbuffer_ptr *pos,
+    void *data_out, size_t datlen)
+{
+	/*XXX fails badly on sendfile case. */
+	struct evbuffer_chain *chain;
+	char *data = data_out;
+	size_t nread;
+	ev_ssize_t result = 0;
+	size_t pos_in_chain;
+
+	EVBUFFER_LOCK(buf);
+
+	if (pos) {
+		if (datlen > (size_t)(EV_SSIZE_MAX - pos->pos)) {
+			result = -1;
+			goto done;
+		}
+		chain = pos->internal_.chain;
+		pos_in_chain = pos->internal_.pos_in_chain;
+		if (datlen + pos->pos > buf->total_len)
+			datlen = buf->total_len - pos->pos;
+	} else {
+		chain = buf->first;
+		pos_in_chain = 0;
+		if (datlen > buf->total_len)
+			datlen = buf->total_len;
+	}
+
+
+	if (datlen == 0)
+		goto done;
+
+	if (buf->freeze_start) {
+		result = -1;
+		goto done;
+	}
+
+	nread = datlen;
+
+	while (datlen && datlen >= chain->off - pos_in_chain) {
+		size_t copylen = chain->off - pos_in_chain;
+		memcpy(data,
+		    chain->buffer + chain->misalign + pos_in_chain,
+		    copylen);
+		data += copylen;
+		datlen -= copylen;
+
+		chain = chain->next;
+		pos_in_chain = 0;
+		EVUTIL_ASSERT(chain || datlen==0);
+	}
+
+	if (datlen) {
+		EVUTIL_ASSERT(chain);
+		EVUTIL_ASSERT(datlen+pos_in_chain <= chain->off);
+
+		memcpy(data, chain->buffer + chain->misalign + pos_in_chain,
+		    datlen);
+	}
+
+	result = nread;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+/* reads data from the src buffer to the dst buffer, avoids memcpy as
+ * possible. */
+/*  XXXX should return ev_ssize_t */
+int
+evbuffer_remove_buffer(struct evbuffer *src, struct evbuffer *dst,
+    size_t datlen)
+{
+	/*XXX We should have an option to force this to be zero-copy.*/
+
+	/*XXX can fail badly on sendfile case. */
+	struct evbuffer_chain *chain, *previous;
+	size_t nread = 0;
+	int result;
+
+	EVBUFFER_LOCK2(src, dst);
+
+	chain = previous = src->first;
+
+	if (datlen == 0 || dst == src) {
+		result = 0;
+		goto done;
+	}
+
+	if (dst->freeze_end || src->freeze_start) {
+		result = -1;
+		goto done;
+	}
+
+	/* short-cut if there is no more data buffered */
+	if (datlen >= src->total_len) {
+		datlen = src->total_len;
+		evbuffer_add_buffer(dst, src);
+		result = (int)datlen; /*XXXX should return ev_ssize_t*/
+		goto done;
+	}
+
+	/* removes chains if possible */
+	while (chain->off <= datlen) {
+		/* We can't remove the last with data from src unless we
+		 * remove all chains, in which case we would have done the if
+		 * block above */
+		EVUTIL_ASSERT(chain != *src->last_with_datap);
+		nread += chain->off;
+		datlen -= chain->off;
+		previous = chain;
+		if (src->last_with_datap == &chain->next)
+			src->last_with_datap = &src->first;
+		chain = chain->next;
+	}
+
+	if (chain != src->first) {
+		/* we can remove the chain */
+		struct evbuffer_chain **chp;
+		chp = evbuffer_free_trailing_empty_chains(dst);
+
+		if (dst->first == NULL) {
+			dst->first = src->first;
+		} else {
+			*chp = src->first;
+		}
+		dst->last = previous;
+		previous->next = NULL;
+		src->first = chain;
+		advance_last_with_data(dst);
+
+		dst->total_len += nread;
+		dst->n_add_for_cb += nread;
+	}
+
+	/* we know that there is more data in the src buffer than
+	 * we want to read, so we manually drain the chain */
+	evbuffer_add(dst, chain->buffer + chain->misalign, datlen);
+	chain->misalign += datlen;
+	chain->off -= datlen;
+	nread += datlen;
+
+	/* You might think we would want to increment dst->n_add_for_cb
+	 * here too.  But evbuffer_add above already took care of that.
+	 */
+	src->total_len -= nread;
+	src->n_del_for_cb += nread;
+
+	if (nread) {
+		evbuffer_invoke_callbacks_(dst);
+		evbuffer_invoke_callbacks_(src);
+	}
+	result = (int)nread;/*XXXX should change return type */
+
+done:
+	EVBUFFER_UNLOCK2(src, dst);
+	return result;
+}
+
+unsigned char *
+evbuffer_pullup(struct evbuffer *buf, ev_ssize_t size)
+{
+	struct evbuffer_chain *chain, *next, *tmp, *last_with_data;
+	unsigned char *buffer, *result = NULL;
+	ev_ssize_t remaining;
+	int removed_last_with_data = 0;
+	int removed_last_with_datap = 0;
+
+	EVBUFFER_LOCK(buf);
+
+	chain = buf->first;
+
+	if (size < 0)
+		size = buf->total_len;
+	/* if size > buf->total_len, we cannot guarantee to the user that she
+	 * is going to have a long enough buffer afterwards; so we return
+	 * NULL */
+	if (size == 0 || (size_t)size > buf->total_len)
+		goto done;
+
+	/* No need to pull up anything; the first size bytes are
+	 * already here. */
+	if (chain->off >= (size_t)size) {
+		result = chain->buffer + chain->misalign;
+		goto done;
+	}
+
+	/* Make sure that none of the chains we need to copy from is pinned. */
+	remaining = size - chain->off;
+	EVUTIL_ASSERT(remaining >= 0);
+	for (tmp=chain->next; tmp; tmp=tmp->next) {
+		if (CHAIN_PINNED(tmp))
+			goto done;
+		if (tmp->off >= (size_t)remaining)
+			break;
+		remaining -= tmp->off;
+	}
+
+	if (CHAIN_PINNED(chain)) {
+		size_t old_off = chain->off;
+		if (CHAIN_SPACE_LEN(chain) < size - chain->off) {
+			/* not enough room at end of chunk. */
+			goto done;
+		}
+		buffer = CHAIN_SPACE_PTR(chain);
+		tmp = chain;
+		tmp->off = size;
+		size -= old_off;
+		chain = chain->next;
+	} else if (chain->buffer_len - chain->misalign >= (size_t)size) {
+		/* already have enough space in the first chain */
+		size_t old_off = chain->off;
+		buffer = chain->buffer + chain->misalign + chain->off;
+		tmp = chain;
+		tmp->off = size;
+		size -= old_off;
+		chain = chain->next;
+	} else {
+		if ((tmp = evbuffer_chain_new(size)) == NULL) {
+			event_warn("%s: out of memory", __func__);
+			goto done;
+		}
+		buffer = tmp->buffer;
+		tmp->off = size;
+		buf->first = tmp;
+	}
+
+	/* TODO(niels): deal with buffers that point to NULL like sendfile */
+
+	/* Copy and free every chunk that will be entirely pulled into tmp */
+	last_with_data = *buf->last_with_datap;
+	for (; chain != NULL && (size_t)size >= chain->off; chain = next) {
+		next = chain->next;
+
+		memcpy(buffer, chain->buffer + chain->misalign, chain->off);
+		size -= chain->off;
+		buffer += chain->off;
+		if (chain == last_with_data)
+			removed_last_with_data = 1;
+		if (&chain->next == buf->last_with_datap)
+			removed_last_with_datap = 1;
+
+		evbuffer_chain_free(chain);
+	}
+
+	if (chain != NULL) {
+		memcpy(buffer, chain->buffer + chain->misalign, size);
+		chain->misalign += size;
+		chain->off -= size;
+	} else {
+		buf->last = tmp;
+	}
+
+	tmp->next = chain;
+
+	if (removed_last_with_data) {
+		buf->last_with_datap = &buf->first;
+	} else if (removed_last_with_datap) {
+		if (buf->first->next && buf->first->next->off)
+			buf->last_with_datap = &buf->first->next;
+		else
+			buf->last_with_datap = &buf->first;
+	}
+
+	result = (tmp->buffer + tmp->misalign);
+
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+/*
+ * Reads a line terminated by either '\r\n', '\n\r' or '\r' or '\n'.
+ * The returned buffer needs to be freed by the called.
+ */
+char *
+evbuffer_readline(struct evbuffer *buffer)
+{
+	return evbuffer_readln(buffer, NULL, EVBUFFER_EOL_ANY);
+}
+
+static inline ev_ssize_t
+evbuffer_strchr(struct evbuffer_ptr *it, const char chr)
+{
+	struct evbuffer_chain *chain = it->internal_.chain;
+	size_t i = it->internal_.pos_in_chain;
+	while (chain != NULL) {
+		char *buffer = (char *)chain->buffer + chain->misalign;
+		char *cp = memchr(buffer+i, chr, chain->off-i);
+		if (cp) {
+			it->internal_.chain = chain;
+			it->internal_.pos_in_chain = cp - buffer;
+			it->pos += (cp - buffer - i);
+			return it->pos;
+		}
+		it->pos += chain->off - i;
+		i = 0;
+		chain = chain->next;
+	}
+
+	return (-1);
+}
+
+static inline char *
+find_eol_char(char *s, size_t len)
+{
+#define CHUNK_SZ 128
+	/* Lots of benchmarking found this approach to be faster in practice
+	 * than doing two memchrs over the whole buffer, doin a memchr on each
+	 * char of the buffer, or trying to emulate memchr by hand. */
+	char *s_end, *cr, *lf;
+	s_end = s+len;
+	while (s < s_end) {
+		size_t chunk = (s + CHUNK_SZ < s_end) ? CHUNK_SZ : (s_end - s);
+		cr = memchr(s, '\r', chunk);
+		lf = memchr(s, '\n', chunk);
+		if (cr) {
+			if (lf && lf < cr)
+				return lf;
+			return cr;
+		} else if (lf) {
+			return lf;
+		}
+		s += CHUNK_SZ;
+	}
+
+	return NULL;
+#undef CHUNK_SZ
+}
+
+static ev_ssize_t
+evbuffer_find_eol_char(struct evbuffer_ptr *it)
+{
+	struct evbuffer_chain *chain = it->internal_.chain;
+	size_t i = it->internal_.pos_in_chain;
+	while (chain != NULL) {
+		char *buffer = (char *)chain->buffer + chain->misalign;
+		char *cp = find_eol_char(buffer+i, chain->off-i);
+		if (cp) {
+			it->internal_.chain = chain;
+			it->internal_.pos_in_chain = cp - buffer;
+			it->pos += (cp - buffer) - i;
+			return it->pos;
+		}
+		it->pos += chain->off - i;
+		i = 0;
+		chain = chain->next;
+	}
+
+	return (-1);
+}
+
+static inline size_t
+evbuffer_strspn(
+	struct evbuffer_ptr *ptr, const char *chrset)
+{
+	size_t count = 0;
+	struct evbuffer_chain *chain = ptr->internal_.chain;
+	size_t i = ptr->internal_.pos_in_chain;
+
+	if (!chain)
+		return 0;
+
+	while (1) {
+		char *buffer = (char *)chain->buffer + chain->misalign;
+		for (; i < chain->off; ++i) {
+			const char *p = chrset;
+			while (*p) {
+				if (buffer[i] == *p++)
+					goto next;
+			}
+			ptr->internal_.chain = chain;
+			ptr->internal_.pos_in_chain = i;
+			ptr->pos += count;
+			return count;
+		next:
+			++count;
+		}
+		i = 0;
+
+		if (! chain->next) {
+			ptr->internal_.chain = chain;
+			ptr->internal_.pos_in_chain = i;
+			ptr->pos += count;
+			return count;
+		}
+
+		chain = chain->next;
+	}
+}
+
+
+static inline int
+evbuffer_getchr(struct evbuffer_ptr *it)
+{
+	struct evbuffer_chain *chain = it->internal_.chain;
+	size_t off = it->internal_.pos_in_chain;
+
+	if (chain == NULL)
+		return -1;
+
+	return (unsigned char)chain->buffer[chain->misalign + off];
+}
+
+struct evbuffer_ptr
+evbuffer_search_eol(struct evbuffer *buffer,
+    struct evbuffer_ptr *start, size_t *eol_len_out,
+    enum evbuffer_eol_style eol_style)
+{
+	struct evbuffer_ptr it, it2;
+	size_t extra_drain = 0;
+	int ok = 0;
+
+	/* Avoid locking in trivial edge cases */
+	if (start && start->internal_.chain == NULL) {
+		PTR_NOT_FOUND(&it);
+		if (eol_len_out)
+			*eol_len_out = extra_drain;
+		return it;
+	}
+
+	EVBUFFER_LOCK(buffer);
+
+	if (start) {
+		memcpy(&it, start, sizeof(it));
+	} else {
+		it.pos = 0;
+		it.internal_.chain = buffer->first;
+		it.internal_.pos_in_chain = 0;
+	}
+
+	/* the eol_style determines our first stop character and how many
+	 * characters we are going to drain afterwards. */
+	switch (eol_style) {
+	case EVBUFFER_EOL_ANY:
+		if (evbuffer_find_eol_char(&it) < 0)
+			goto done;
+		memcpy(&it2, &it, sizeof(it));
+		extra_drain = evbuffer_strspn(&it2, "\r\n");
+		break;
+	case EVBUFFER_EOL_CRLF_STRICT: {
+		it = evbuffer_search(buffer, "\r\n", 2, &it);
+		if (it.pos < 0)
+			goto done;
+		extra_drain = 2;
+		break;
+	}
+	case EVBUFFER_EOL_CRLF: {
+		ev_ssize_t start_pos = it.pos;
+		/* Look for a LF ... */
+		if (evbuffer_strchr(&it, '\n') < 0)
+			goto done;
+		extra_drain = 1;
+		/* ... optionally preceeded by a CR. */
+		if (it.pos == start_pos)
+			break; /* If the first character is \n, don't back up */
+		/* This potentially does an extra linear walk over the first
+		 * few chains.  Probably, that's not too expensive unless you
+		 * have a really pathological setup. */
+		memcpy(&it2, &it, sizeof(it));
+		if (evbuffer_ptr_subtract(buffer, &it2, 1)<0)
+			break;
+		if (evbuffer_getchr(&it2) == '\r') {
+			memcpy(&it, &it2, sizeof(it));
+			extra_drain = 2;
+		}
+		break;
+	}
+	case EVBUFFER_EOL_LF:
+		if (evbuffer_strchr(&it, '\n') < 0)
+			goto done;
+		extra_drain = 1;
+		break;
+	case EVBUFFER_EOL_NUL:
+		if (evbuffer_strchr(&it, '\0') < 0)
+			goto done;
+		extra_drain = 1;
+		break;
+	default:
+		goto done;
+	}
+
+	ok = 1;
+done:
+	EVBUFFER_UNLOCK(buffer);
+
+	if (!ok)
+		PTR_NOT_FOUND(&it);
+	if (eol_len_out)
+		*eol_len_out = extra_drain;
+
+	return it;
+}
+
+char *
+evbuffer_readln(struct evbuffer *buffer, size_t *n_read_out,
+		enum evbuffer_eol_style eol_style)
+{
+	struct evbuffer_ptr it;
+	char *line;
+	size_t n_to_copy=0, extra_drain=0;
+	char *result = NULL;
+
+	EVBUFFER_LOCK(buffer);
+
+	if (buffer->freeze_start) {
+		goto done;
+	}
+
+	it = evbuffer_search_eol(buffer, NULL, &extra_drain, eol_style);
+	if (it.pos < 0)
+		goto done;
+	n_to_copy = it.pos;
+
+	if ((line = mm_malloc(n_to_copy+1)) == NULL) {
+		event_warn("%s: out of memory", __func__);
+		goto done;
+	}
+
+	evbuffer_remove(buffer, line, n_to_copy);
+	line[n_to_copy] = '\0';
+
+	evbuffer_drain(buffer, extra_drain);
+	result = line;
+done:
+	EVBUFFER_UNLOCK(buffer);
+
+	if (n_read_out)
+		*n_read_out = result ? n_to_copy : 0;
+
+	return result;
+}
+
+#define EVBUFFER_CHAIN_MAX_AUTO_SIZE 4096
+
+/* Adds data to an event buffer */
+
+int
+evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
+{
+	struct evbuffer_chain *chain, *tmp;
+	const unsigned char *data = data_in;
+	size_t remain, to_alloc;
+	int result = -1;
+
+	EVBUFFER_LOCK(buf);
+
+	if (buf->freeze_end) {
+		goto done;
+	}
+	/* Prevent buf->total_len overflow */
+	if (datlen > EV_SIZE_MAX - buf->total_len) {
+		goto done;
+	}
+
+	if (*buf->last_with_datap == NULL) {
+		chain = buf->last;
+	} else {
+		chain = *buf->last_with_datap;
+	}
+
+	/* If there are no chains allocated for this buffer, allocate one
+	 * big enough to hold all the data. */
+	if (chain == NULL) {
+		chain = evbuffer_chain_new(datlen);
+		if (!chain)
+			goto done;
+		evbuffer_chain_insert(buf, chain);
+	}
+
+	if ((chain->flags & EVBUFFER_IMMUTABLE) == 0) {
+		/* Always true for mutable buffers */
+		EVUTIL_ASSERT(chain->misalign >= 0 &&
+		    (ev_uint64_t)chain->misalign <= EVBUFFER_CHAIN_MAX);
+		remain = chain->buffer_len - (size_t)chain->misalign - chain->off;
+		if (remain >= datlen) {
+			/* there's enough space to hold all the data in the
+			 * current last chain */
+			memcpy(chain->buffer + chain->misalign + chain->off,
+			    data, datlen);
+			chain->off += datlen;
+			buf->total_len += datlen;
+			buf->n_add_for_cb += datlen;
+			goto out;
+		} else if (!CHAIN_PINNED(chain) &&
+		    evbuffer_chain_should_realign(chain, datlen)) {
+			/* we can fit the data into the misalignment */
+			evbuffer_chain_align(chain);
+
+			memcpy(chain->buffer + chain->off, data, datlen);
+			chain->off += datlen;
+			buf->total_len += datlen;
+			buf->n_add_for_cb += datlen;
+			goto out;
+		}
+	} else {
+		/* we cannot write any data to the last chain */
+		remain = 0;
+	}
+
+	/* we need to add another chain */
+	to_alloc = chain->buffer_len;
+	if (to_alloc <= EVBUFFER_CHAIN_MAX_AUTO_SIZE/2)
+		to_alloc <<= 1;
+	if (datlen > to_alloc)
+		to_alloc = datlen;
+	tmp = evbuffer_chain_new(to_alloc);
+	if (tmp == NULL)
+		goto done;
+
+	if (remain) {
+		memcpy(chain->buffer + chain->misalign + chain->off,
+		    data, remain);
+		chain->off += remain;
+		buf->total_len += remain;
+		buf->n_add_for_cb += remain;
+	}
+
+	data += remain;
+	datlen -= remain;
+
+	memcpy(tmp->buffer, data, datlen);
+	tmp->off = datlen;
+	evbuffer_chain_insert(buf, tmp);
+	buf->n_add_for_cb += datlen;
+
+out:
+	evbuffer_invoke_callbacks_(buf);
+	result = 0;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+int
+evbuffer_prepend(struct evbuffer *buf, const void *data, size_t datlen)
+{
+	struct evbuffer_chain *chain, *tmp;
+	int result = -1;
+
+	EVBUFFER_LOCK(buf);
+
+	if (datlen == 0) {
+		result = 0;
+		goto done;
+	}
+	if (buf->freeze_start) {
+		goto done;
+	}
+	if (datlen > EV_SIZE_MAX - buf->total_len) {
+		goto done;
+	}
+
+	chain = buf->first;
+
+	if (chain == NULL) {
+		chain = evbuffer_chain_new(datlen);
+		if (!chain)
+			goto done;
+		evbuffer_chain_insert(buf, chain);
+	}
+
+	/* we cannot touch immutable buffers */
+	if ((chain->flags & EVBUFFER_IMMUTABLE) == 0) {
+		/* Always true for mutable buffers */
+		EVUTIL_ASSERT(chain->misalign >= 0 &&
+		    (ev_uint64_t)chain->misalign <= EVBUFFER_CHAIN_MAX);
+
+		/* If this chain is empty, we can treat it as
+		 * 'empty at the beginning' rather than 'empty at the end' */
+		if (chain->off == 0)
+			chain->misalign = chain->buffer_len;
+
+		if ((size_t)chain->misalign >= datlen) {
+			/* we have enough space to fit everything */
+			memcpy(chain->buffer + chain->misalign - datlen,
+			    data, datlen);
+			chain->off += datlen;
+			chain->misalign -= datlen;
+			buf->total_len += datlen;
+			buf->n_add_for_cb += datlen;
+			goto out;
+		} else if (chain->misalign) {
+			/* we can only fit some of the data. */
+			memcpy(chain->buffer,
+			    (char*)data + datlen - chain->misalign,
+			    (size_t)chain->misalign);
+			chain->off += (size_t)chain->misalign;
+			buf->total_len += (size_t)chain->misalign;
+			buf->n_add_for_cb += (size_t)chain->misalign;
+			datlen -= (size_t)chain->misalign;
+			chain->misalign = 0;
+		}
+	}
+
+	/* we need to add another chain */
+	if ((tmp = evbuffer_chain_new(datlen)) == NULL)
+		goto done;
+	buf->first = tmp;
+	if (buf->last_with_datap == &buf->first && chain->off)
+		buf->last_with_datap = &tmp->next;
+
+	tmp->next = chain;
+
+	tmp->off = datlen;
+	EVUTIL_ASSERT(datlen <= tmp->buffer_len);
+	tmp->misalign = tmp->buffer_len - datlen;
+
+	memcpy(tmp->buffer + tmp->misalign, data, datlen);
+	buf->total_len += datlen;
+	buf->n_add_for_cb += datlen;
+
+out:
+	evbuffer_invoke_callbacks_(buf);
+	result = 0;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+/** Helper: realigns the memory in chain->buffer so that misalign is 0. */
+static void
+evbuffer_chain_align(struct evbuffer_chain *chain)
+{
+	EVUTIL_ASSERT(!(chain->flags & EVBUFFER_IMMUTABLE));
+	EVUTIL_ASSERT(!(chain->flags & EVBUFFER_MEM_PINNED_ANY));
+	memmove(chain->buffer, chain->buffer + chain->misalign, chain->off);
+	chain->misalign = 0;
+}
+
+#define MAX_TO_COPY_IN_EXPAND 4096
+#define MAX_TO_REALIGN_IN_EXPAND 2048
+
+/** Helper: return true iff we should realign chain to fit datalen bytes of
+    data in it. */
+static int
+evbuffer_chain_should_realign(struct evbuffer_chain *chain,
+    size_t datlen)
+{
+	return chain->buffer_len - chain->off >= datlen &&
+	    (chain->off < chain->buffer_len / 2) &&
+	    (chain->off <= MAX_TO_REALIGN_IN_EXPAND);
+}
+
+/* Expands the available space in the event buffer to at least datlen, all in
+ * a single chunk.  Return that chunk. */
+static struct evbuffer_chain *
+evbuffer_expand_singlechain(struct evbuffer *buf, size_t datlen)
+{
+	struct evbuffer_chain *chain, **chainp;
+	struct evbuffer_chain *result = NULL;
+	ASSERT_EVBUFFER_LOCKED(buf);
+
+	chainp = buf->last_with_datap;
+
+	/* XXX If *chainp is no longer writeable, but has enough space in its
+	 * misalign, this might be a bad idea: we could still use *chainp, not
+	 * (*chainp)->next. */
+	if (*chainp && CHAIN_SPACE_LEN(*chainp) == 0)
+		chainp = &(*chainp)->next;
+
+	/* 'chain' now points to the first chain with writable space (if any)
+	 * We will either use it, realign it, replace it, or resize it. */
+	chain = *chainp;
+
+	if (chain == NULL ||
+	    (chain->flags & (EVBUFFER_IMMUTABLE|EVBUFFER_MEM_PINNED_ANY))) {
+		/* We can't use the last_with_data chain at all.  Just add a
+		 * new one that's big enough. */
+		goto insert_new;
+	}
+
+	/* If we can fit all the data, then we don't have to do anything */
+	if (CHAIN_SPACE_LEN(chain) >= datlen) {
+		result = chain;
+		goto ok;
+	}
+
+	/* If the chain is completely empty, just replace it by adding a new
+	 * empty chain. */
+	if (chain->off == 0) {
+		goto insert_new;
+	}
+
+	/* If the misalignment plus the remaining space fulfills our data
+	 * needs, we could just force an alignment to happen.  Afterwards, we
+	 * have enough space.  But only do this if we're saving a lot of space
+	 * and not moving too much data.  Otherwise the space savings are
+	 * probably offset by the time lost in copying.
+	 */
+	if (evbuffer_chain_should_realign(chain, datlen)) {
+		evbuffer_chain_align(chain);
+		result = chain;
+		goto ok;
+	}
+
+	/* At this point, we can either resize the last chunk with space in
+	 * it, use the next chunk after it, or   If we add a new chunk, we waste
+	 * CHAIN_SPACE_LEN(chain) bytes in the former last chunk.  If we
+	 * resize, we have to copy chain->off bytes.
+	 */
+
+	/* Would expanding this chunk be affordable and worthwhile? */
+	if (CHAIN_SPACE_LEN(chain) < chain->buffer_len / 8 ||
+	    chain->off > MAX_TO_COPY_IN_EXPAND ||
+		datlen >= (EVBUFFER_CHAIN_MAX - chain->off)) {
+		/* It's not worth resizing this chain. Can the next one be
+		 * used? */
+		if (chain->next && CHAIN_SPACE_LEN(chain->next) >= datlen) {
+			/* Yes, we can just use the next chain (which should
+			 * be empty. */
+			result = chain->next;
+			goto ok;
+		} else {
+			/* No; append a new chain (which will free all
+			 * terminal empty chains.) */
+			goto insert_new;
+		}
+	} else {
+		/* Okay, we're going to try to resize this chain: Not doing so
+		 * would waste at least 1/8 of its current allocation, and we
+		 * can do so without having to copy more than
+		 * MAX_TO_COPY_IN_EXPAND bytes. */
+		/* figure out how much space we need */
+		size_t length = chain->off + datlen;
+		struct evbuffer_chain *tmp = evbuffer_chain_new(length);
+		if (tmp == NULL)
+			goto err;
+
+		/* copy the data over that we had so far */
+		tmp->off = chain->off;
+		memcpy(tmp->buffer, chain->buffer + chain->misalign,
+		    chain->off);
+		/* fix up the list */
+		EVUTIL_ASSERT(*chainp == chain);
+		result = *chainp = tmp;
+
+		if (buf->last == chain)
+			buf->last = tmp;
+
+		tmp->next = chain->next;
+		evbuffer_chain_free(chain);
+		goto ok;
+	}
+
+insert_new:
+	result = evbuffer_chain_insert_new(buf, datlen);
+	if (!result)
+		goto err;
+ok:
+	EVUTIL_ASSERT(result);
+	EVUTIL_ASSERT(CHAIN_SPACE_LEN(result) >= datlen);
+err:
+	return result;
+}
+
+/* Make sure that datlen bytes are available for writing in the last n
+ * chains.  Never copies or moves data. */
+int
+evbuffer_expand_fast_(struct evbuffer *buf, size_t datlen, int n)
+{
+	struct evbuffer_chain *chain = buf->last, *tmp, *next;
+	size_t avail;
+	int used;
+
+	ASSERT_EVBUFFER_LOCKED(buf);
+	EVUTIL_ASSERT(n >= 2);
+
+	if (chain == NULL || (chain->flags & EVBUFFER_IMMUTABLE)) {
+		/* There is no last chunk, or we can't touch the last chunk.
+		 * Just add a new chunk. */
+		chain = evbuffer_chain_new(datlen);
+		if (chain == NULL)
+			return (-1);
+
+		evbuffer_chain_insert(buf, chain);
+		return (0);
+	}
+
+	used = 0; /* number of chains we're using space in. */
+	avail = 0; /* how much space they have. */
+	/* How many bytes can we stick at the end of buffer as it is?  Iterate
+	 * over the chains at the end of the buffer, tring to see how much
+	 * space we have in the first n. */
+	for (chain = *buf->last_with_datap; chain; chain = chain->next) {
+		if (chain->off) {
+			size_t space = (size_t) CHAIN_SPACE_LEN(chain);
+			EVUTIL_ASSERT(chain == *buf->last_with_datap);
+			if (space) {
+				avail += space;
+				++used;
+			}
+		} else {
+			/* No data in chain; realign it. */
+			chain->misalign = 0;
+			avail += chain->buffer_len;
+			++used;
+		}
+		if (avail >= datlen) {
+			/* There is already enough space.  Just return */
+			return (0);
+		}
+		if (used == n)
+			break;
+	}
+
+	/* There wasn't enough space in the first n chains with space in
+	 * them. Either add a new chain with enough space, or replace all
+	 * empty chains with one that has enough space, depending on n. */
+	if (used < n) {
+		/* The loop ran off the end of the chains before it hit n
+		 * chains; we can add another. */
+		EVUTIL_ASSERT(chain == NULL);
+
+		tmp = evbuffer_chain_new(datlen - avail);
+		if (tmp == NULL)
+			return (-1);
+
+		buf->last->next = tmp;
+		buf->last = tmp;
+		/* (we would only set last_with_data if we added the first
+		 * chain. But if the buffer had no chains, we would have
+		 * just allocated a new chain earlier) */
+		return (0);
+	} else {
+		/* Nuke _all_ the empty chains. */
+		int rmv_all = 0; /* True iff we removed last_with_data. */
+		chain = *buf->last_with_datap;
+		if (!chain->off) {
+			EVUTIL_ASSERT(chain == buf->first);
+			rmv_all = 1;
+			avail = 0;
+		} else {
+			/* can't overflow, since only mutable chains have
+			 * huge misaligns. */
+			avail = (size_t) CHAIN_SPACE_LEN(chain);
+			chain = chain->next;
+		}
+
+
+		for (; chain; chain = next) {
+			next = chain->next;
+			EVUTIL_ASSERT(chain->off == 0);
+			evbuffer_chain_free(chain);
+		}
+		EVUTIL_ASSERT(datlen >= avail);
+		tmp = evbuffer_chain_new(datlen - avail);
+		if (tmp == NULL) {
+			if (rmv_all) {
+				ZERO_CHAIN(buf);
+			} else {
+				buf->last = *buf->last_with_datap;
+				(*buf->last_with_datap)->next = NULL;
+			}
+			return (-1);
+		}
+
+		if (rmv_all) {
+			buf->first = buf->last = tmp;
+			buf->last_with_datap = &buf->first;
+		} else {
+			(*buf->last_with_datap)->next = tmp;
+			buf->last = tmp;
+		}
+		return (0);
+	}
+}
+
+int
+evbuffer_expand(struct evbuffer *buf, size_t datlen)
+{
+	struct evbuffer_chain *chain;
+
+	EVBUFFER_LOCK(buf);
+	chain = evbuffer_expand_singlechain(buf, datlen);
+	EVBUFFER_UNLOCK(buf);
+	return chain ? 0 : -1;
+}
+
+/*
+ * Reads data from a file descriptor into a buffer.
+ */
+
+#if defined(EVENT__HAVE_SYS_UIO_H) || defined(_WIN32)
+#define USE_IOVEC_IMPL
+#endif
+
+#ifdef USE_IOVEC_IMPL
+
+#ifdef EVENT__HAVE_SYS_UIO_H
+/* number of iovec we use for writev, fragmentation is going to determine
+ * how much we end up writing */
+
+#define DEFAULT_WRITE_IOVEC 128
+
+#if defined(UIO_MAXIOV) && UIO_MAXIOV < DEFAULT_WRITE_IOVEC
+#define NUM_WRITE_IOVEC UIO_MAXIOV
+#elif defined(IOV_MAX) && IOV_MAX < DEFAULT_WRITE_IOVEC
+#define NUM_WRITE_IOVEC IOV_MAX
+#else
+#define NUM_WRITE_IOVEC DEFAULT_WRITE_IOVEC
+#endif
+
+#define IOV_TYPE struct iovec
+#define IOV_PTR_FIELD iov_base
+#define IOV_LEN_FIELD iov_len
+#define IOV_LEN_TYPE size_t
+#else
+#define NUM_WRITE_IOVEC 16
+#define IOV_TYPE WSABUF
+#define IOV_PTR_FIELD buf
+#define IOV_LEN_FIELD len
+#define IOV_LEN_TYPE unsigned long
+#endif
+#endif
+#define NUM_READ_IOVEC 4
+
+#define EVBUFFER_MAX_READ	4096
+
+/** Helper function to figure out which space to use for reading data into
+    an evbuffer.  Internal use only.
+
+    @param buf The buffer to read into
+    @param howmuch How much we want to read.
+    @param vecs An array of two or more iovecs or WSABUFs.
+    @param n_vecs_avail The length of vecs
+    @param chainp A pointer to a variable to hold the first chain we're
+      reading into.
+    @param exact Boolean: if true, we do not provide more than 'howmuch'
+      space in the vectors, even if more space is available.
+    @return The number of buffers we're using.
+ */
+int
+evbuffer_read_setup_vecs_(struct evbuffer *buf, ev_ssize_t howmuch,
+    struct evbuffer_iovec *vecs, int n_vecs_avail,
+    struct evbuffer_chain ***chainp, int exact)
+{
+	struct evbuffer_chain *chain;
+	struct evbuffer_chain **firstchainp;
+	size_t so_far;
+	int i;
+	ASSERT_EVBUFFER_LOCKED(buf);
+
+	if (howmuch < 0)
+		return -1;
+
+	so_far = 0;
+	/* Let firstchain be the first chain with any space on it */
+	firstchainp = buf->last_with_datap;
+	EVUTIL_ASSERT(*firstchainp);
+	if (CHAIN_SPACE_LEN(*firstchainp) == 0) {
+		firstchainp = &(*firstchainp)->next;
+	}
+
+	chain = *firstchainp;
+	EVUTIL_ASSERT(chain);
+	for (i = 0; i < n_vecs_avail && so_far < (size_t)howmuch; ++i) {
+		size_t avail = (size_t) CHAIN_SPACE_LEN(chain);
+		if (avail > (howmuch - so_far) && exact)
+			avail = howmuch - so_far;
+		vecs[i].iov_base = (void *)CHAIN_SPACE_PTR(chain);
+		vecs[i].iov_len = avail;
+		so_far += avail;
+		chain = chain->next;
+	}
+
+	*chainp = firstchainp;
+	return i;
+}
+
+static int
+get_n_bytes_readable_on_socket(evutil_socket_t fd)
+{
+#if defined(FIONREAD) && defined(_WIN32)
+	unsigned long lng = EVBUFFER_MAX_READ;
+	if (ioctlsocket(fd, FIONREAD, &lng) < 0)
+		return -1;
+	/* Can overflow, but mostly harmlessly. XXXX */
+	return (int)lng;
+#elif defined(FIONREAD)
+	int n = EVBUFFER_MAX_READ;
+	if (ioctl(fd, FIONREAD, &n) < 0)
+		return -1;
+	return n;
+#else
+	return EVBUFFER_MAX_READ;
+#endif
+}
+
+/* TODO(niels): should this function return ev_ssize_t and take ev_ssize_t
+ * as howmuch? */
+int
+evbuffer_read(struct evbuffer *buf, evutil_socket_t fd, int howmuch)
+{
+	struct evbuffer_chain **chainp;
+	int n;
+	int result;
+
+#ifdef USE_IOVEC_IMPL
+	int nvecs, i, remaining;
+#else
+	struct evbuffer_chain *chain;
+	unsigned char *p;
+#endif
+
+	EVBUFFER_LOCK(buf);
+
+	if (buf->freeze_end) {
+		result = -1;
+		goto done;
+	}
+
+	n = get_n_bytes_readable_on_socket(fd);
+	if (n <= 0 || n > EVBUFFER_MAX_READ)
+		n = EVBUFFER_MAX_READ;
+	if (howmuch < 0 || howmuch > n)
+		howmuch = n;
+
+#ifdef USE_IOVEC_IMPL
+	/* Since we can use iovecs, we're willing to use the last
+	 * NUM_READ_IOVEC chains. */
+	if (evbuffer_expand_fast_(buf, howmuch, NUM_READ_IOVEC) == -1) {
+		result = -1;
+		goto done;
+	} else {
+		IOV_TYPE vecs[NUM_READ_IOVEC];
+#ifdef EVBUFFER_IOVEC_IS_NATIVE_
+		nvecs = evbuffer_read_setup_vecs_(buf, howmuch, vecs,
+		    NUM_READ_IOVEC, &chainp, 1);
+#else
+		/* We aren't using the native struct iovec.  Therefore,
+		   we are on win32. */
+		struct evbuffer_iovec ev_vecs[NUM_READ_IOVEC];
+		nvecs = evbuffer_read_setup_vecs_(buf, howmuch, ev_vecs, 2,
+		    &chainp, 1);
+
+		for (i=0; i < nvecs; ++i)
+			WSABUF_FROM_EVBUFFER_IOV(&vecs[i], &ev_vecs[i]);
+#endif
+
+#ifdef _WIN32
+		{
+			DWORD bytesRead;
+			DWORD flags=0;
+			if (WSARecv(fd, vecs, nvecs, &bytesRead, &flags, NULL, NULL)) {
+				/* The read failed. It might be a close,
+				 * or it might be an error. */
+				if (WSAGetLastError() == WSAECONNABORTED)
+					n = 0;
+				else
+					n = -1;
+			} else
+				n = bytesRead;
+		}
+#else
+		n = readv(fd, vecs, nvecs);
+#endif
+	}
+
+#else /*!USE_IOVEC_IMPL*/
+	/* If we don't have FIONREAD, we might waste some space here */
+	/* XXX we _will_ waste some space here if there is any space left
+	 * over on buf->last. */
+	if ((chain = evbuffer_expand_singlechain(buf, howmuch)) == NULL) {
+		result = -1;
+		goto done;
+	}
+
+	/* We can append new data at this point */
+	p = chain->buffer + chain->misalign + chain->off;
+
+#ifndef _WIN32
+	n = read(fd, p, howmuch);
+#else
+	n = recv(fd, p, howmuch, 0);
+#endif
+#endif /* USE_IOVEC_IMPL */
+
+	if (n == -1) {
+		result = -1;
+		goto done;
+	}
+	if (n == 0) {
+		result = 0;
+		goto done;
+	}
+
+#ifdef USE_IOVEC_IMPL
+	remaining = n;
+	for (i=0; i < nvecs; ++i) {
+		/* can't overflow, since only mutable chains have
+		 * huge misaligns. */
+		size_t space = (size_t) CHAIN_SPACE_LEN(*chainp);
+		/* XXXX This is a kludge that can waste space in perverse
+		 * situations. */
+		if (space > EVBUFFER_CHAIN_MAX)
+			space = EVBUFFER_CHAIN_MAX;
+		if ((ev_ssize_t)space < remaining) {
+			(*chainp)->off += space;
+			remaining -= (int)space;
+		} else {
+			(*chainp)->off += remaining;
+			buf->last_with_datap = chainp;
+			break;
+		}
+		chainp = &(*chainp)->next;
+	}
+#else
+	chain->off += n;
+	advance_last_with_data(buf);
+#endif
+	buf->total_len += n;
+	buf->n_add_for_cb += n;
+
+	/* Tell someone about changes in this buffer */
+	evbuffer_invoke_callbacks_(buf);
+	result = n;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+#ifdef USE_IOVEC_IMPL
+static inline int
+evbuffer_write_iovec(struct evbuffer *buffer, evutil_socket_t fd,
+    ev_ssize_t howmuch)
+{
+	IOV_TYPE iov[NUM_WRITE_IOVEC];
+	struct evbuffer_chain *chain = buffer->first;
+	int n, i = 0;
+
+	if (howmuch < 0)
+		return -1;
+
+	ASSERT_EVBUFFER_LOCKED(buffer);
+	/* XXX make this top out at some maximal data length?  if the
+	 * buffer has (say) 1MB in it, split over 128 chains, there's
+	 * no way it all gets written in one go. */
+	while (chain != NULL && i < NUM_WRITE_IOVEC && howmuch) {
+#ifdef USE_SENDFILE
+		/* we cannot write the file info via writev */
+		if (chain->flags & EVBUFFER_SENDFILE)
+			break;
+#endif
+		iov[i].IOV_PTR_FIELD = (void *) (chain->buffer + chain->misalign);
+		if ((size_t)howmuch >= chain->off) {
+			/* XXXcould be problematic when windows supports mmap*/
+			iov[i++].IOV_LEN_FIELD = (IOV_LEN_TYPE)chain->off;
+			howmuch -= chain->off;
+		} else {
+			/* XXXcould be problematic when windows supports mmap*/
+			iov[i++].IOV_LEN_FIELD = (IOV_LEN_TYPE)howmuch;
+			break;
+		}
+		chain = chain->next;
+	}
+	if (! i)
+		return 0;
+
+#ifdef _WIN32
+	{
+		DWORD bytesSent;
+		if (WSASend(fd, iov, i, &bytesSent, 0, NULL, NULL))
+			n = -1;
+		else
+			n = bytesSent;
+	}
+#else
+	n = writev(fd, iov, i);
+#endif
+	return (n);
+}
+#endif
+
+#ifdef USE_SENDFILE
+static inline int
+evbuffer_write_sendfile(struct evbuffer *buffer, evutil_socket_t dest_fd,
+    ev_ssize_t howmuch)
+{
+	struct evbuffer_chain *chain = buffer->first;
+	struct evbuffer_chain_file_segment *info =
+	    EVBUFFER_CHAIN_EXTRA(struct evbuffer_chain_file_segment,
+		chain);
+	const int source_fd = info->segment->fd;
+#if defined(SENDFILE_IS_MACOSX) || defined(SENDFILE_IS_FREEBSD)
+	int res;
+	ev_off_t len = chain->off;
+#elif defined(SENDFILE_IS_LINUX) || defined(SENDFILE_IS_SOLARIS)
+	ev_ssize_t res;
+	off_t offset = chain->misalign;
+#endif
+
+	ASSERT_EVBUFFER_LOCKED(buffer);
+
+#if defined(SENDFILE_IS_MACOSX)
+	res = sendfile(source_fd, dest_fd, chain->misalign, &len, NULL, 0);
+	if (res == -1 && !EVUTIL_ERR_RW_RETRIABLE(errno))
+		return (-1);
+
+	return (len);
+#elif defined(SENDFILE_IS_FREEBSD)
+	res = sendfile(source_fd, dest_fd, chain->misalign, chain->off, NULL, &len, 0);
+	if (res == -1 && !EVUTIL_ERR_RW_RETRIABLE(errno))
+		return (-1);
+
+	return (len);
+#elif defined(SENDFILE_IS_LINUX)
+	/* TODO(niels): implement splice */
+	res = sendfile(dest_fd, source_fd, &offset, chain->off);
+	if (res == -1 && EVUTIL_ERR_RW_RETRIABLE(errno)) {
+		/* if this is EAGAIN or EINTR return 0; otherwise, -1 */
+		return (0);
+	}
+	return (res);
+#elif defined(SENDFILE_IS_SOLARIS)
+	{
+		const off_t offset_orig = offset;
+		res = sendfile(dest_fd, source_fd, &offset, chain->off);
+		if (res == -1 && EVUTIL_ERR_RW_RETRIABLE(errno)) {
+			if (offset - offset_orig)
+				return offset - offset_orig;
+			/* if this is EAGAIN or EINTR and no bytes were
+			 * written, return 0 */
+			return (0);
+		}
+		return (res);
+	}
+#endif
+}
+#endif
+
+int
+evbuffer_write_atmost(struct evbuffer *buffer, evutil_socket_t fd,
+    ev_ssize_t howmuch)
+{
+	int n = -1;
+
+	EVBUFFER_LOCK(buffer);
+
+	if (buffer->freeze_start) {
+		goto done;
+	}
+
+	if (howmuch < 0 || (size_t)howmuch > buffer->total_len)
+		howmuch = buffer->total_len;
+
+	if (howmuch > 0) {
+#ifdef USE_SENDFILE
+		struct evbuffer_chain *chain = buffer->first;
+		if (chain != NULL && (chain->flags & EVBUFFER_SENDFILE))
+			n = evbuffer_write_sendfile(buffer, fd, howmuch);
+		else {
+#endif
+#ifdef USE_IOVEC_IMPL
+		n = evbuffer_write_iovec(buffer, fd, howmuch);
+#elif defined(_WIN32)
+		/* XXX(nickm) Don't disable this code until we know if
+		 * the WSARecv code above works. */
+		void *p = evbuffer_pullup(buffer, howmuch);
+		EVUTIL_ASSERT(p || !howmuch);
+		n = send(fd, p, howmuch, 0);
+#else
+		void *p = evbuffer_pullup(buffer, howmuch);
+		EVUTIL_ASSERT(p || !howmuch);
+		n = write(fd, p, howmuch);
+#endif
+#ifdef USE_SENDFILE
+		}
+#endif
+	}
+
+	if (n > 0)
+		evbuffer_drain(buffer, n);
+
+done:
+	EVBUFFER_UNLOCK(buffer);
+	return (n);
+}
+
+int
+evbuffer_write(struct evbuffer *buffer, evutil_socket_t fd)
+{
+	return evbuffer_write_atmost(buffer, fd, -1);
+}
+
+unsigned char *
+evbuffer_find(struct evbuffer *buffer, const unsigned char *what, size_t len)
+{
+	unsigned char *search;
+	struct evbuffer_ptr ptr;
+
+	EVBUFFER_LOCK(buffer);
+
+	ptr = evbuffer_search(buffer, (const char *)what, len, NULL);
+	if (ptr.pos < 0) {
+		search = NULL;
+	} else {
+		search = evbuffer_pullup(buffer, ptr.pos + len);
+		if (search)
+			search += ptr.pos;
+	}
+	EVBUFFER_UNLOCK(buffer);
+	return search;
+}
+
+/* Subract <b>howfar</b> from the position of <b>pos</b> within
+ * <b>buf</b>. Returns 0 on success, -1 on failure.
+ *
+ * This isn't exposed yet, because of potential inefficiency issues.
+ * Maybe it should be. */
+static int
+evbuffer_ptr_subtract(struct evbuffer *buf, struct evbuffer_ptr *pos,
+    size_t howfar)
+{
+	if (pos->pos < 0)
+		return -1;
+	if (howfar > (size_t)pos->pos)
+		return -1;
+	if (pos->internal_.chain && howfar <= pos->internal_.pos_in_chain) {
+		pos->internal_.pos_in_chain -= howfar;
+		pos->pos -= howfar;
+		return 0;
+	} else {
+		const size_t newpos = pos->pos - howfar;
+		/* Here's the inefficient part: it walks over the
+		 * chains until we hit newpos. */
+		return evbuffer_ptr_set(buf, pos, newpos, EVBUFFER_PTR_SET);
+	}
+}
+
+int
+evbuffer_ptr_set(struct evbuffer *buf, struct evbuffer_ptr *pos,
+    size_t position, enum evbuffer_ptr_how how)
+{
+	size_t left = position;
+	struct evbuffer_chain *chain = NULL;
+	int result = 0;
+
+	EVBUFFER_LOCK(buf);
+
+	switch (how) {
+	case EVBUFFER_PTR_SET:
+		chain = buf->first;
+		pos->pos = position;
+		position = 0;
+		break;
+	case EVBUFFER_PTR_ADD:
+		/* this avoids iterating over all previous chains if
+		   we just want to advance the position */
+		if (pos->pos < 0 || EV_SIZE_MAX - position < (size_t)pos->pos) {
+			EVBUFFER_UNLOCK(buf);
+			return -1;
+		}
+		chain = pos->internal_.chain;
+		pos->pos += position;
+		position = pos->internal_.pos_in_chain;
+		break;
+	}
+
+	EVUTIL_ASSERT(EV_SIZE_MAX - left >= position);
+	while (chain && position + left >= chain->off) {
+		left -= chain->off - position;
+		chain = chain->next;
+		position = 0;
+	}
+	if (chain) {
+		pos->internal_.chain = chain;
+		pos->internal_.pos_in_chain = position + left;
+	} else if (left == 0) {
+		/* The first byte in the (nonexistent) chain after the last chain */
+		pos->internal_.chain = NULL;
+		pos->internal_.pos_in_chain = 0;
+	} else {
+		PTR_NOT_FOUND(pos);
+		result = -1;
+	}
+
+	EVBUFFER_UNLOCK(buf);
+
+	return result;
+}
+
+/**
+   Compare the bytes in buf at position pos to the len bytes in mem.  Return
+   less than 0, 0, or greater than 0 as memcmp.
+ */
+static int
+evbuffer_ptr_memcmp(const struct evbuffer *buf, const struct evbuffer_ptr *pos,
+    const char *mem, size_t len)
+{
+	struct evbuffer_chain *chain;
+	size_t position;
+	int r;
+
+	ASSERT_EVBUFFER_LOCKED(buf);
+
+	if (pos->pos < 0 ||
+	    EV_SIZE_MAX - len < (size_t)pos->pos ||
+	    pos->pos + len > buf->total_len)
+		return -1;
+
+	chain = pos->internal_.chain;
+	position = pos->internal_.pos_in_chain;
+	while (len && chain) {
+		size_t n_comparable;
+		if (len + position > chain->off)
+			n_comparable = chain->off - position;
+		else
+			n_comparable = len;
+		r = memcmp(chain->buffer + chain->misalign + position, mem,
+		    n_comparable);
+		if (r)
+			return r;
+		mem += n_comparable;
+		len -= n_comparable;
+		position = 0;
+		chain = chain->next;
+	}
+
+	return 0;
+}
+
+struct evbuffer_ptr
+evbuffer_search(struct evbuffer *buffer, const char *what, size_t len, const struct evbuffer_ptr *start)
+{
+	return evbuffer_search_range(buffer, what, len, start, NULL);
+}
+
+struct evbuffer_ptr
+evbuffer_search_range(struct evbuffer *buffer, const char *what, size_t len, const struct evbuffer_ptr *start, const struct evbuffer_ptr *end)
+{
+	struct evbuffer_ptr pos;
+	struct evbuffer_chain *chain, *last_chain = NULL;
+	const unsigned char *p;
+	char first;
+
+	EVBUFFER_LOCK(buffer);
+
+	if (start) {
+		memcpy(&pos, start, sizeof(pos));
+		chain = pos.internal_.chain;
+	} else {
+		pos.pos = 0;
+		chain = pos.internal_.chain = buffer->first;
+		pos.internal_.pos_in_chain = 0;
+	}
+
+	if (end)
+		last_chain = end->internal_.chain;
+
+	if (!len || len > EV_SSIZE_MAX)
+		goto done;
+
+	first = what[0];
+
+	while (chain) {
+		const unsigned char *start_at =
+		    chain->buffer + chain->misalign +
+		    pos.internal_.pos_in_chain;
+		p = memchr(start_at, first,
+		    chain->off - pos.internal_.pos_in_chain);
+		if (p) {
+			pos.pos += p - start_at;
+			pos.internal_.pos_in_chain += p - start_at;
+			if (!evbuffer_ptr_memcmp(buffer, &pos, what, len)) {
+				if (end && pos.pos + (ev_ssize_t)len > end->pos)
+					goto not_found;
+				else
+					goto done;
+			}
+			++pos.pos;
+			++pos.internal_.pos_in_chain;
+			if (pos.internal_.pos_in_chain == chain->off) {
+				chain = pos.internal_.chain = chain->next;
+				pos.internal_.pos_in_chain = 0;
+			}
+		} else {
+			if (chain == last_chain)
+				goto not_found;
+			pos.pos += chain->off - pos.internal_.pos_in_chain;
+			chain = pos.internal_.chain = chain->next;
+			pos.internal_.pos_in_chain = 0;
+		}
+	}
+
+not_found:
+	PTR_NOT_FOUND(&pos);
+done:
+	EVBUFFER_UNLOCK(buffer);
+	return pos;
+}
+
+int
+evbuffer_peek(struct evbuffer *buffer, ev_ssize_t len,
+    struct evbuffer_ptr *start_at,
+    struct evbuffer_iovec *vec, int n_vec)
+{
+	struct evbuffer_chain *chain;
+	int idx = 0;
+	ev_ssize_t len_so_far = 0;
+
+	/* Avoid locking in trivial edge cases */
+	if (start_at && start_at->internal_.chain == NULL)
+		return 0;
+
+	EVBUFFER_LOCK(buffer);
+
+	if (start_at) {
+		chain = start_at->internal_.chain;
+		len_so_far = chain->off
+		    - start_at->internal_.pos_in_chain;
+		idx = 1;
+		if (n_vec > 0) {
+			vec[0].iov_base = (void *)(chain->buffer + chain->misalign
+			    + start_at->internal_.pos_in_chain);
+			vec[0].iov_len = len_so_far;
+		}
+		chain = chain->next;
+	} else {
+		chain = buffer->first;
+	}
+
+	if (n_vec == 0 && len < 0) {
+		/* If no vectors are provided and they asked for "everything",
+		 * pretend they asked for the actual available amount. */
+		len = buffer->total_len;
+		if (start_at) {
+			len -= start_at->pos;
+		}
+	}
+
+	while (chain) {
+		if (len >= 0 && len_so_far >= len)
+			break;
+		if (idx<n_vec) {
+			vec[idx].iov_base = (void *)(chain->buffer + chain->misalign);
+			vec[idx].iov_len = chain->off;
+		} else if (len<0) {
+			break;
+		}
+		++idx;
+		len_so_far += chain->off;
+		chain = chain->next;
+	}
+
+	EVBUFFER_UNLOCK(buffer);
+
+	return idx;
+}
+
+
+int
+evbuffer_add_vprintf(struct evbuffer *buf, const char *fmt, va_list ap)
+{
+	char *buffer;
+	size_t space;
+	int sz, result = -1;
+	va_list aq;
+	struct evbuffer_chain *chain;
+
+
+	EVBUFFER_LOCK(buf);
+
+	if (buf->freeze_end) {
+		goto done;
+	}
+
+	/* make sure that at least some space is available */
+	if ((chain = evbuffer_expand_singlechain(buf, 64)) == NULL)
+		goto done;
+
+	for (;;) {
+#if 0
+		size_t used = chain->misalign + chain->off;
+		buffer = (char *)chain->buffer + chain->misalign + chain->off;
+		EVUTIL_ASSERT(chain->buffer_len >= used);
+		space = chain->buffer_len - used;
+#endif
+		buffer = (char*) CHAIN_SPACE_PTR(chain);
+		space = (size_t) CHAIN_SPACE_LEN(chain);
+
+#ifndef va_copy
+#define	va_copy(dst, src)	memcpy(&(dst), &(src), sizeof(va_list))
+#endif
+		va_copy(aq, ap);
+
+		sz = evutil_vsnprintf(buffer, space, fmt, aq);
+
+		va_end(aq);
+
+		if (sz < 0)
+			goto done;
+		if (INT_MAX >= EVBUFFER_CHAIN_MAX &&
+		    (size_t)sz >= EVBUFFER_CHAIN_MAX)
+			goto done;
+		if ((size_t)sz < space) {
+			chain->off += sz;
+			buf->total_len += sz;
+			buf->n_add_for_cb += sz;
+
+			advance_last_with_data(buf);
+			evbuffer_invoke_callbacks_(buf);
+			result = sz;
+			goto done;
+		}
+		if ((chain = evbuffer_expand_singlechain(buf, sz + 1)) == NULL)
+			goto done;
+	}
+	/* NOTREACHED */
+
+done:
+	EVBUFFER_UNLOCK(buf);
+	return result;
+}
+
+int
+evbuffer_add_printf(struct evbuffer *buf, const char *fmt, ...)
+{
+	int res = -1;
+	va_list ap;
+
+	va_start(ap, fmt);
+	res = evbuffer_add_vprintf(buf, fmt, ap);
+	va_end(ap);
+
+	return (res);
+}
+
+int
+evbuffer_add_reference(struct evbuffer *outbuf,
+    const void *data, size_t datlen,
+    evbuffer_ref_cleanup_cb cleanupfn, void *extra)
+{
+	struct evbuffer_chain *chain;
+	struct evbuffer_chain_reference *info;
+	int result = -1;
+
+	chain = evbuffer_chain_new(sizeof(struct evbuffer_chain_reference));
+	if (!chain)
+		return (-1);
+	chain->flags |= EVBUFFER_REFERENCE | EVBUFFER_IMMUTABLE;
+	chain->buffer = (unsigned char *)data;
+	chain->buffer_len = datlen;
+	chain->off = datlen;
+
+	info = EVBUFFER_CHAIN_EXTRA(struct evbuffer_chain_reference, chain);
+	info->cleanupfn = cleanupfn;
+	info->extra = extra;
+
+	EVBUFFER_LOCK(outbuf);
+	if (outbuf->freeze_end) {
+		/* don't call chain_free; we do not want to actually invoke
+		 * the cleanup function */
+		mm_free(chain);
+		goto done;
+	}
+	evbuffer_chain_insert(outbuf, chain);
+	outbuf->n_add_for_cb += datlen;
+
+	evbuffer_invoke_callbacks_(outbuf);
+
+	result = 0;
+done:
+	EVBUFFER_UNLOCK(outbuf);
+
+	return result;
+}
+
+/* TODO(niels): we may want to add to automagically convert to mmap, in
+ * case evbuffer_remove() or evbuffer_pullup() are being used.
+ */
+struct evbuffer_file_segment *
+evbuffer_file_segment_new(
+	int fd, ev_off_t offset, ev_off_t length, unsigned flags)
+{
+	struct evbuffer_file_segment *seg =
+	    mm_calloc(sizeof(struct evbuffer_file_segment), 1);
+	if (!seg)
+		return NULL;
+	seg->refcnt = 1;
+	seg->fd = fd;
+	seg->flags = flags;
+	seg->file_offset = offset;
+	seg->cleanup_cb = NULL;
+	seg->cleanup_cb_arg = NULL;
+#ifdef _WIN32
+#ifndef lseek
+#define lseek _lseeki64
+#endif
+#ifndef fstat
+#define fstat _fstat
+#endif
+#ifndef stat
+#define stat _stat
+#endif
+#endif
+	if (length == -1) {
+		struct stat st;
+		if (fstat(fd, &st) < 0)
+			goto err;
+		length = st.st_size;
+	}
+	seg->length = length;
+
+	if (offset < 0 || length < 0 ||
+	    ((ev_uint64_t)length > EVBUFFER_CHAIN_MAX) ||
+	    (ev_uint64_t)offset > (ev_uint64_t)(EVBUFFER_CHAIN_MAX - length))
+		goto err;
+
+#if defined(USE_SENDFILE)
+	if (!(flags & EVBUF_FS_DISABLE_SENDFILE)) {
+		seg->can_sendfile = 1;
+		goto done;
+	}
+#endif
+
+	if (evbuffer_file_segment_materialize(seg)<0)
+		goto err;
+
+#if defined(USE_SENDFILE)
+done:
+#endif
+	if (!(flags & EVBUF_FS_DISABLE_LOCKING)) {
+		EVTHREAD_ALLOC_LOCK(seg->lock, 0);
+	}
+	return seg;
+err:
+	mm_free(seg);
+	return NULL;
+}
+
+#ifdef EVENT__HAVE_MMAP
+static long
+get_page_size(void)
+{
+#ifdef SC_PAGE_SIZE
+	return sysconf(SC_PAGE_SIZE);
+#elif defined(_SC_PAGE_SIZE)
+	return sysconf(_SC_PAGE_SIZE);
+#else
+	return 1;
+#endif
+}
+#endif
+
+/* DOCDOC */
+/* Requires lock */
+static int
+evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
+{
+	const unsigned flags = seg->flags;
+	const int fd = seg->fd;
+	const ev_off_t length = seg->length;
+	const ev_off_t offset = seg->file_offset;
+
+	if (seg->contents)
+		return 0; /* already materialized */
+
+#if defined(EVENT__HAVE_MMAP)
+	if (!(flags & EVBUF_FS_DISABLE_MMAP)) {
+		off_t offset_rounded = 0, offset_leftover = 0;
+		void *mapped;
+		if (offset) {
+			/* mmap implementations don't generally like us
+			 * to have an offset that isn't a round  */
+			long page_size = get_page_size();
+			if (page_size == -1)
+				goto err;
+			offset_leftover = offset % page_size;
+			offset_rounded = offset - offset_leftover;
+		}
+		mapped = mmap(NULL, length + offset_leftover,
+		    PROT_READ,
+#ifdef MAP_NOCACHE
+		    MAP_NOCACHE | /* ??? */
+#endif
+#ifdef MAP_FILE
+		    MAP_FILE |
+#endif
+		    MAP_PRIVATE,
+		    fd, offset_rounded);
+		if (mapped == MAP_FAILED) {
+			event_warn("%s: mmap(%d, %d, %zu) failed",
+			    __func__, fd, 0, (size_t)(offset + length));
+		} else {
+			seg->mapping = mapped;
+			seg->contents = (char*)mapped+offset_leftover;
+			seg->mmap_offset = 0;
+			seg->is_mapping = 1;
+			goto done;
+		}
+	}
+#endif
+#ifdef _WIN32
+	if (!(flags & EVBUF_FS_DISABLE_MMAP)) {
+		intptr_t h = _get_osfhandle(fd);
+		HANDLE m;
+		ev_uint64_t total_size = length+offset;
+		if ((HANDLE)h == INVALID_HANDLE_VALUE)
+			goto err;
+		m = CreateFileMapping((HANDLE)h, NULL, PAGE_READONLY,
+		    (total_size >> 32), total_size & 0xfffffffful,
+		    NULL);
+		if (m != INVALID_HANDLE_VALUE) { /* Does h leak? */
+			seg->mapping_handle = m;
+			seg->mmap_offset = offset;
+			seg->is_mapping = 1;
+			goto done;
+		}
+	}
+#endif
+	{
+		ev_off_t start_pos = lseek(fd, 0, SEEK_CUR), pos;
+		ev_off_t read_so_far = 0;
+		char *mem;
+		int e;
+		ev_ssize_t n = 0;
+		if (!(mem = mm_malloc(length)))
+			goto err;
+		if (start_pos < 0) {
+			mm_free(mem);
+			goto err;
+		}
+		if (lseek(fd, offset, SEEK_SET) < 0) {
+			mm_free(mem);
+			goto err;
+		}
+		while (read_so_far < length) {
+			n = read(fd, mem+read_so_far, length-read_so_far);
+			if (n <= 0)
+				break;
+			read_so_far += n;
+		}
+
+		e = errno;
+		pos = lseek(fd, start_pos, SEEK_SET);
+		if (n < 0 || (n == 0 && length > read_so_far)) {
+			mm_free(mem);
+			errno = e;
+			goto err;
+		} else if (pos < 0) {
+			mm_free(mem);
+			goto err;
+		}
+
+		seg->contents = mem;
+	}
+
+done:
+	return 0;
+err:
+	return -1;
+}
+
+void evbuffer_file_segment_add_cleanup_cb(struct evbuffer_file_segment *seg,
+	evbuffer_file_segment_cleanup_cb cb, void* arg)
+{
+	EVUTIL_ASSERT(seg->refcnt > 0);
+	seg->cleanup_cb = cb;
+	seg->cleanup_cb_arg = arg;
+}
+
+void
+evbuffer_file_segment_free(struct evbuffer_file_segment *seg)
+{
+	int refcnt;
+	EVLOCK_LOCK(seg->lock, 0);
+	refcnt = --seg->refcnt;
+	EVLOCK_UNLOCK(seg->lock, 0);
+	if (refcnt > 0)
+		return;
+	EVUTIL_ASSERT(refcnt == 0);
+
+	if (seg->is_mapping) {
+#ifdef _WIN32
+		CloseHandle(seg->mapping_handle);
+#elif defined (EVENT__HAVE_MMAP)
+		off_t offset_leftover;
+		offset_leftover = seg->file_offset % get_page_size();
+		if (munmap(seg->mapping, seg->length + offset_leftover) == -1)
+			event_warn("%s: munmap failed", __func__);
+#endif
+	} else if (seg->contents) {
+		mm_free(seg->contents);
+	}
+
+	if ((seg->flags & EVBUF_FS_CLOSE_ON_FREE) && seg->fd >= 0) {
+		close(seg->fd);
+	}
+	
+	if (seg->cleanup_cb) {
+		(*seg->cleanup_cb)((struct evbuffer_file_segment const*)seg, 
+		    seg->flags, seg->cleanup_cb_arg);
+		seg->cleanup_cb = NULL;
+		seg->cleanup_cb_arg = NULL;
+	}
+
+	EVTHREAD_FREE_LOCK(seg->lock, 0);
+	mm_free(seg);
+}
+
+int
+evbuffer_add_file_segment(struct evbuffer *buf,
+    struct evbuffer_file_segment *seg, ev_off_t offset, ev_off_t length)
+{
+	struct evbuffer_chain *chain;
+	struct evbuffer_chain_file_segment *extra;
+	int can_use_sendfile = 0;
+
+	EVBUFFER_LOCK(buf);
+	EVLOCK_LOCK(seg->lock, 0);
+	if (buf->flags & EVBUFFER_FLAG_DRAINS_TO_FD) {
+		can_use_sendfile = 1;
+	} else {
+		if (!seg->contents) {
+			if (evbuffer_file_segment_materialize(seg)<0) {
+				EVLOCK_UNLOCK(seg->lock, 0);
+				EVBUFFER_UNLOCK(buf);
+				return -1;
+			}
+		}
+	}
+	++seg->refcnt;
+	EVLOCK_UNLOCK(seg->lock, 0);
+
+	if (buf->freeze_end)
+		goto err;
+
+	if (length < 0) {
+		if (offset > seg->length)
+			goto err;
+		length = seg->length - offset;
+	}
+
+	/* Can we actually add this? */
+	if (offset+length > seg->length)
+		goto err;
+
+	chain = evbuffer_chain_new(sizeof(struct evbuffer_chain_file_segment));
+	if (!chain)
+		goto err;
+	extra = EVBUFFER_CHAIN_EXTRA(struct evbuffer_chain_file_segment, chain);
+
+	chain->flags |= EVBUFFER_IMMUTABLE|EVBUFFER_FILESEGMENT;
+	if (can_use_sendfile && seg->can_sendfile) {
+		chain->flags |= EVBUFFER_SENDFILE;
+		chain->misalign = seg->file_offset + offset;
+		chain->off = length;
+		chain->buffer_len = chain->misalign + length;
+	} else if (seg->is_mapping) {
+#ifdef _WIN32
+		ev_uint64_t total_offset = seg->mmap_offset+offset;
+		ev_uint64_t offset_rounded=0, offset_remaining=0;
+		LPVOID data;
+		if (total_offset) {
+			SYSTEM_INFO si;
+			memset(&si, 0, sizeof(si)); /* cargo cult */
+			GetSystemInfo(&si);
+			offset_remaining = total_offset % si.dwAllocationGranularity;
+			offset_rounded = total_offset - offset_remaining;
+		}
+		data = MapViewOfFile(
+			seg->mapping_handle,
+			FILE_MAP_READ,
+			offset_rounded >> 32,
+			offset_rounded & 0xfffffffful,
+			length + offset_remaining);
+		if (data == NULL) {
+			mm_free(chain);
+			goto err;
+		}
+		chain->buffer = (unsigned char*) data;
+		chain->buffer_len = length+offset_remaining;
+		chain->misalign = offset_remaining;
+		chain->off = length;
+#else
+		chain->buffer = (unsigned char*)(seg->contents + offset);
+		chain->buffer_len = length;
+		chain->off = length;
+#endif
+	} else {
+		chain->buffer = (unsigned char*)(seg->contents + offset);
+		chain->buffer_len = length;
+		chain->off = length;
+	}
+
+	extra->segment = seg;
+	buf->n_add_for_cb += length;
+	evbuffer_chain_insert(buf, chain);
+
+	evbuffer_invoke_callbacks_(buf);
+
+	EVBUFFER_UNLOCK(buf);
+
+	return 0;
+err:
+	EVBUFFER_UNLOCK(buf);
+	evbuffer_file_segment_free(seg); /* Lowers the refcount */
+	return -1;
+}
+
+int
+evbuffer_add_file(struct evbuffer *buf, int fd, ev_off_t offset, ev_off_t length)
+{
+	struct evbuffer_file_segment *seg;
+	unsigned flags = EVBUF_FS_CLOSE_ON_FREE;
+	int r;
+
+	seg = evbuffer_file_segment_new(fd, offset, length, flags);
+	if (!seg)
+		return -1;
+	r = evbuffer_add_file_segment(buf, seg, 0, length);
+	if (r == 0)
+		evbuffer_file_segment_free(seg);
+	return r;
+}
+
+int
+evbuffer_setcb(struct evbuffer *buffer, evbuffer_cb cb, void *cbarg)
+{
+	EVBUFFER_LOCK(buffer);
+
+	if (!LIST_EMPTY(&buffer->callbacks))
+		evbuffer_remove_all_callbacks(buffer);
+
+	if (cb) {
+		struct evbuffer_cb_entry *ent =
+		    evbuffer_add_cb(buffer, NULL, cbarg);
+		if (!ent) {
+			EVBUFFER_UNLOCK(buffer);
+			return -1;
+		}
+		ent->cb.cb_obsolete = cb;
+		ent->flags |= EVBUFFER_CB_OBSOLETE;
+	}
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+struct evbuffer_cb_entry *
+evbuffer_add_cb(struct evbuffer *buffer, evbuffer_cb_func cb, void *cbarg)
+{
+	struct evbuffer_cb_entry *e;
+	if (! (e = mm_calloc(1, sizeof(struct evbuffer_cb_entry))))
+		return NULL;
+	EVBUFFER_LOCK(buffer);
+	e->cb.cb_func = cb;
+	e->cbarg = cbarg;
+	e->flags = EVBUFFER_CB_ENABLED;
+	LIST_INSERT_HEAD(&buffer->callbacks, e, next);
+	EVBUFFER_UNLOCK(buffer);
+	return e;
+}
+
+int
+evbuffer_remove_cb_entry(struct evbuffer *buffer,
+			 struct evbuffer_cb_entry *ent)
+{
+	EVBUFFER_LOCK(buffer);
+	LIST_REMOVE(ent, next);
+	EVBUFFER_UNLOCK(buffer);
+	mm_free(ent);
+	return 0;
+}
+
+int
+evbuffer_remove_cb(struct evbuffer *buffer, evbuffer_cb_func cb, void *cbarg)
+{
+	struct evbuffer_cb_entry *cbent;
+	int result = -1;
+	EVBUFFER_LOCK(buffer);
+	LIST_FOREACH(cbent, &buffer->callbacks, next) {
+		if (cb == cbent->cb.cb_func && cbarg == cbent->cbarg) {
+			result = evbuffer_remove_cb_entry(buffer, cbent);
+			goto done;
+		}
+	}
+done:
+	EVBUFFER_UNLOCK(buffer);
+	return result;
+}
+
+int
+evbuffer_cb_set_flags(struct evbuffer *buffer,
+		      struct evbuffer_cb_entry *cb, ev_uint32_t flags)
+{
+	/* the user isn't allowed to mess with these. */
+	flags &= ~EVBUFFER_CB_INTERNAL_FLAGS;
+	EVBUFFER_LOCK(buffer);
+	cb->flags |= flags;
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+int
+evbuffer_cb_clear_flags(struct evbuffer *buffer,
+		      struct evbuffer_cb_entry *cb, ev_uint32_t flags)
+{
+	/* the user isn't allowed to mess with these. */
+	flags &= ~EVBUFFER_CB_INTERNAL_FLAGS;
+	EVBUFFER_LOCK(buffer);
+	cb->flags &= ~flags;
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+int
+evbuffer_freeze(struct evbuffer *buffer, int start)
+{
+	EVBUFFER_LOCK(buffer);
+	if (start)
+		buffer->freeze_start = 1;
+	else
+		buffer->freeze_end = 1;
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+int
+evbuffer_unfreeze(struct evbuffer *buffer, int start)
+{
+	EVBUFFER_LOCK(buffer);
+	if (start)
+		buffer->freeze_start = 0;
+	else
+		buffer->freeze_end = 0;
+	EVBUFFER_UNLOCK(buffer);
+	return 0;
+}
+
+#if 0
+void
+evbuffer_cb_suspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb)
+{
+	if (!(cb->flags & EVBUFFER_CB_SUSPENDED)) {
+		cb->size_before_suspend = evbuffer_get_length(buffer);
+		cb->flags |= EVBUFFER_CB_SUSPENDED;
+	}
+}
+
+void
+evbuffer_cb_unsuspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb)
+{
+	if ((cb->flags & EVBUFFER_CB_SUSPENDED)) {
+		unsigned call = (cb->flags & EVBUFFER_CB_CALL_ON_UNSUSPEND);
+		size_t sz = cb->size_before_suspend;
+		cb->flags &= ~(EVBUFFER_CB_SUSPENDED|
+			       EVBUFFER_CB_CALL_ON_UNSUSPEND);
+		cb->size_before_suspend = 0;
+		if (call && (cb->flags & EVBUFFER_CB_ENABLED)) {
+			cb->cb(buffer, sz, evbuffer_get_length(buffer), cb->cbarg);
+		}
+	}
+}
+#endif
+
+int
+evbuffer_get_callbacks_(struct evbuffer *buffer, struct event_callback **cbs,
+    int max_cbs)
+{
+	int r = 0;
+	EVBUFFER_LOCK(buffer);
+	if (buffer->deferred_cbs) {
+		if (max_cbs < 1) {
+			r = -1;
+			goto done;
+		}
+		cbs[0] = &buffer->deferred;
+		r = 1;
+	}
+done:
+	EVBUFFER_UNLOCK(buffer);
+	return r;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/buffer_iocp.c b/extra/libevent/libevent-2.1.11-stable/buffer_iocp.c
new file mode 100644
index 000000000000..2af0c49cc64b
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/buffer_iocp.c
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/**
+   @file buffer_iocp.c
+
+   This module implements overlapped read and write functions for evbuffer
+   objects on Windows.
+*/
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include "event2/buffer.h"
+#include "event2/buffer_compat.h"
+#include "event2/util.h"
+#include "event2/thread.h"
+#include "util-internal.h"
+#include "evthread-internal.h"
+#include "evbuffer-internal.h"
+#include "iocp-internal.h"
+#include "mm-internal.h"
+
+#include <winsock2.h>
+#include <winerror.h>
+#include <windows.h>
+#include <stdio.h>
+
+#define MAX_WSABUFS 16
+
+/** An evbuffer that can handle overlapped IO. */
+struct evbuffer_overlapped {
+	struct evbuffer buffer;
+	/** The socket that we're doing overlapped IO on. */
+	evutil_socket_t fd;
+
+	/** pending I/O type */
+	unsigned read_in_progress : 1;
+	unsigned write_in_progress : 1;
+
+	/** The first pinned chain in the buffer. */
+	struct evbuffer_chain *first_pinned;
+
+	/** How many chains are pinned; how many of the fields in buffers
+	 * are we using. */
+	int n_buffers;
+	WSABUF buffers[MAX_WSABUFS];
+};
+
+/** Given an evbuffer, return the correponding evbuffer structure, or NULL if
+ * the evbuffer isn't overlapped. */
+static inline struct evbuffer_overlapped *
+upcast_evbuffer(struct evbuffer *buf)
+{
+	if (!buf || !buf->is_overlapped)
+		return NULL;
+	return EVUTIL_UPCAST(buf, struct evbuffer_overlapped, buffer);
+}
+
+/** Unpin all the chains noted as pinned in 'eo'. */
+static void
+pin_release(struct evbuffer_overlapped *eo, unsigned flag)
+{
+	int i;
+	struct evbuffer_chain *next, *chain = eo->first_pinned;
+
+	for (i = 0; i < eo->n_buffers; ++i) {
+		EVUTIL_ASSERT(chain);
+		next = chain->next;
+		evbuffer_chain_unpin_(chain, flag);
+		chain = next;
+	}
+}
+
+void
+evbuffer_commit_read_(struct evbuffer *evbuf, ev_ssize_t nBytes)
+{
+	struct evbuffer_overlapped *buf = upcast_evbuffer(evbuf);
+	struct evbuffer_chain **chainp;
+	size_t remaining, len;
+	unsigned i;
+
+	EVBUFFER_LOCK(evbuf);
+	EVUTIL_ASSERT(buf->read_in_progress && !buf->write_in_progress);
+	EVUTIL_ASSERT(nBytes >= 0); /* XXXX Can this be false? */
+
+	evbuffer_unfreeze(evbuf, 0);
+
+	chainp = evbuf->last_with_datap;
+	if (!((*chainp)->flags & EVBUFFER_MEM_PINNED_R))
+		chainp = &(*chainp)->next;
+	remaining = nBytes;
+	for (i = 0; remaining > 0 && i < (unsigned)buf->n_buffers; ++i) {
+		EVUTIL_ASSERT(*chainp);
+		len = buf->buffers[i].len;
+		if (remaining < len)
+			len = remaining;
+		(*chainp)->off += len;
+		evbuf->last_with_datap = chainp;
+		remaining -= len;
+		chainp = &(*chainp)->next;
+	}
+
+	pin_release(buf, EVBUFFER_MEM_PINNED_R);
+
+	buf->read_in_progress = 0;
+
+	evbuf->total_len += nBytes;
+	evbuf->n_add_for_cb += nBytes;
+
+	evbuffer_invoke_callbacks_(evbuf);
+
+	evbuffer_decref_and_unlock_(evbuf);
+}
+
+void
+evbuffer_commit_write_(struct evbuffer *evbuf, ev_ssize_t nBytes)
+{
+	struct evbuffer_overlapped *buf = upcast_evbuffer(evbuf);
+
+	EVBUFFER_LOCK(evbuf);
+	EVUTIL_ASSERT(buf->write_in_progress && !buf->read_in_progress);
+	evbuffer_unfreeze(evbuf, 1);
+	evbuffer_drain(evbuf, nBytes);
+	pin_release(buf,EVBUFFER_MEM_PINNED_W);
+	buf->write_in_progress = 0;
+	evbuffer_decref_and_unlock_(evbuf);
+}
+
+struct evbuffer *
+evbuffer_overlapped_new_(evutil_socket_t fd)
+{
+	struct evbuffer_overlapped *evo;
+
+	evo = mm_calloc(1, sizeof(struct evbuffer_overlapped));
+	if (!evo)
+		return NULL;
+
+	LIST_INIT(&evo->buffer.callbacks);
+	evo->buffer.refcnt = 1;
+	evo->buffer.last_with_datap = &evo->buffer.first;
+
+	evo->buffer.is_overlapped = 1;
+	evo->fd = fd;
+
+	return &evo->buffer;
+}
+
+int
+evbuffer_launch_write_(struct evbuffer *buf, ev_ssize_t at_most,
+		struct event_overlapped *ol)
+{
+	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
+	int r = -1;
+	int i;
+	struct evbuffer_chain *chain;
+	DWORD bytesSent;
+
+	if (!buf) {
+		/* No buffer, or it isn't overlapped */
+		return -1;
+	}
+
+	EVBUFFER_LOCK(buf);
+	EVUTIL_ASSERT(!buf_o->read_in_progress);
+	if (buf->freeze_start || buf_o->write_in_progress)
+		goto done;
+	if (!buf->total_len) {
+		/* Nothing to write */
+		r = 0;
+		goto done;
+	} else if (at_most < 0 || (size_t)at_most > buf->total_len) {
+		at_most = buf->total_len;
+	}
+	evbuffer_freeze(buf, 1);
+
+	buf_o->first_pinned = NULL;
+	buf_o->n_buffers = 0;
+	memset(buf_o->buffers, 0, sizeof(buf_o->buffers));
+
+	chain = buf_o->first_pinned = buf->first;
+
+	for (i=0; i < MAX_WSABUFS && chain; ++i, chain=chain->next) {
+		WSABUF *b = &buf_o->buffers[i];
+		b->buf = (char*)( chain->buffer + chain->misalign );
+		evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_W);
+
+		if ((size_t)at_most > chain->off) {
+			/* XXXX Cast is safe for now, since win32 has no
+			   mmaped chains.  But later, we need to have this
+			   add more WSAbufs if chain->off is greater than
+			   ULONG_MAX */
+			b->len = (unsigned long)chain->off;
+			at_most -= chain->off;
+		} else {
+			b->len = (unsigned long)at_most;
+			++i;
+			break;
+		}
+	}
+
+	buf_o->n_buffers = i;
+	evbuffer_incref_(buf);
+	if (WSASend(buf_o->fd, buf_o->buffers, i, &bytesSent, 0,
+		&ol->overlapped, NULL)) {
+		int error = WSAGetLastError();
+		if (error != WSA_IO_PENDING) {
+			/* An actual error. */
+			pin_release(buf_o, EVBUFFER_MEM_PINNED_W);
+			evbuffer_unfreeze(buf, 1);
+			evbuffer_free(buf); /* decref */
+			goto done;
+		}
+	}
+
+	buf_o->write_in_progress = 1;
+	r = 0;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return r;
+}
+
+int
+evbuffer_launch_read_(struct evbuffer *buf, size_t at_most,
+		struct event_overlapped *ol)
+{
+	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
+	int r = -1, i;
+	int nvecs;
+	int npin=0;
+	struct evbuffer_chain *chain=NULL, **chainp;
+	DWORD bytesRead;
+	DWORD flags = 0;
+	struct evbuffer_iovec vecs[MAX_WSABUFS];
+
+	if (!buf_o)
+		return -1;
+	EVBUFFER_LOCK(buf);
+	EVUTIL_ASSERT(!buf_o->write_in_progress);
+	if (buf->freeze_end || buf_o->read_in_progress)
+		goto done;
+
+	buf_o->first_pinned = NULL;
+	buf_o->n_buffers = 0;
+	memset(buf_o->buffers, 0, sizeof(buf_o->buffers));
+
+	if (evbuffer_expand_fast_(buf, at_most, MAX_WSABUFS) == -1)
+		goto done;
+	evbuffer_freeze(buf, 0);
+
+	nvecs = evbuffer_read_setup_vecs_(buf, at_most,
+	    vecs, MAX_WSABUFS, &chainp, 1);
+	for (i=0;i<nvecs;++i) {
+		WSABUF_FROM_EVBUFFER_IOV(
+			&buf_o->buffers[i],
+			&vecs[i]);
+	}
+
+	buf_o->n_buffers = nvecs;
+	buf_o->first_pinned = chain = *chainp;
+
+	npin=0;
+	for ( ; chain; chain = chain->next) {
+		evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_R);
+		++npin;
+	}
+	EVUTIL_ASSERT(npin == nvecs);
+
+	evbuffer_incref_(buf);
+	if (WSARecv(buf_o->fd, buf_o->buffers, nvecs, &bytesRead, &flags,
+		    &ol->overlapped, NULL)) {
+		int error = WSAGetLastError();
+		if (error != WSA_IO_PENDING) {
+			/* An actual error. */
+			pin_release(buf_o, EVBUFFER_MEM_PINNED_R);
+			evbuffer_unfreeze(buf, 0);
+			evbuffer_free(buf); /* decref */
+			goto done;
+		}
+	}
+
+	buf_o->read_in_progress = 1;
+	r = 0;
+done:
+	EVBUFFER_UNLOCK(buf);
+	return r;
+}
+
+evutil_socket_t
+evbuffer_overlapped_get_fd_(struct evbuffer *buf)
+{
+	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
+	return buf_o ? buf_o->fd : -1;
+}
+
+void
+evbuffer_overlapped_set_fd_(struct evbuffer *buf, evutil_socket_t fd)
+{
+	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
+	EVBUFFER_LOCK(buf);
+	/* XXX is this right?, should it cancel current I/O operations? */
+	if (buf_o)
+		buf_o->fd = fd;
+	EVBUFFER_UNLOCK(buf);
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent-internal.h b/extra/libevent/libevent-2.1.11-stable/bufferevent-internal.h
new file mode 100644
index 000000000000..87ab9ad9c0f7
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent-internal.h
@@ -0,0 +1,518 @@
+/*
+ * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef BUFFEREVENT_INTERNAL_H_INCLUDED_
+#define BUFFEREVENT_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "event2/event_struct.h"
+#include "evconfig-private.h"
+#include "event2/util.h"
+#include "defer-internal.h"
+#include "evthread-internal.h"
+#include "event2/thread.h"
+#include "ratelim-internal.h"
+#include "event2/bufferevent_struct.h"
+
+#include "ipv6-internal.h"
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+/* These flags are reasons that we might be declining to actually enable
+   reading or writing on a bufferevent.
+ */
+
+/* On a all bufferevents, for reading: used when we have read up to the
+   watermark value.
+
+   On a filtering bufferevent, for writing: used when the underlying
+   bufferevent's write buffer has been filled up to its watermark
+   value.
+*/
+#define BEV_SUSPEND_WM 0x01
+/* On a base bufferevent: when we have emptied a bandwidth buckets */
+#define BEV_SUSPEND_BW 0x02
+/* On a base bufferevent: when we have emptied the group's bandwidth bucket. */
+#define BEV_SUSPEND_BW_GROUP 0x04
+/* On a socket bufferevent: can't do any operations while we're waiting for
+ * name lookup to finish. */
+#define BEV_SUSPEND_LOOKUP 0x08
+/* On a base bufferevent, for reading: used when a filter has choked this
+ * (underlying) bufferevent because it has stopped reading from it. */
+#define BEV_SUSPEND_FILT_READ 0x10
+
+typedef ev_uint16_t bufferevent_suspend_flags;
+
+struct bufferevent_rate_limit_group {
+	/** List of all members in the group */
+	LIST_HEAD(rlim_group_member_list, bufferevent_private) members;
+	/** Current limits for the group. */
+	struct ev_token_bucket rate_limit;
+	struct ev_token_bucket_cfg rate_limit_cfg;
+
+	/** True iff we don't want to read from any member of the group.until
+	 * the token bucket refills.  */
+	unsigned read_suspended : 1;
+	/** True iff we don't want to write from any member of the group.until
+	 * the token bucket refills.  */
+	unsigned write_suspended : 1;
+	/** True iff we were unable to suspend one of the bufferevents in the
+	 * group for reading the last time we tried, and we should try
+	 * again. */
+	unsigned pending_unsuspend_read : 1;
+	/** True iff we were unable to suspend one of the bufferevents in the
+	 * group for writing the last time we tried, and we should try
+	 * again. */
+	unsigned pending_unsuspend_write : 1;
+
+	/*@{*/
+	/** Total number of bytes read or written in this group since last
+	 * reset. */
+	ev_uint64_t total_read;
+	ev_uint64_t total_written;
+	/*@}*/
+
+	/** The number of bufferevents in the group. */
+	int n_members;
+
+	/** The smallest number of bytes that any member of the group should
+	 * be limited to read or write at a time. */
+	ev_ssize_t min_share;
+	ev_ssize_t configured_min_share;
+
+	/** Timeout event that goes off once a tick, when the bucket is ready
+	 * to refill. */
+	struct event master_refill_event;
+
+	/** Seed for weak random number generator. Protected by 'lock' */
+	struct evutil_weakrand_state weakrand_seed;
+
+	/** Lock to protect the members of this group.  This lock should nest
+	 * within every bufferevent lock: if you are holding this lock, do
+	 * not assume you can lock another bufferevent. */
+	void *lock;
+};
+
+/** Fields for rate-limiting a single bufferevent. */
+struct bufferevent_rate_limit {
+	/* Linked-list elements for storing this bufferevent_private in a
+	 * group.
+	 *
+	 * Note that this field is supposed to be protected by the group
+	 * lock */
+	LIST_ENTRY(bufferevent_private) next_in_group;
+	/** The rate-limiting group for this bufferevent, or NULL if it is
+	 * only rate-limited on its own. */
+	struct bufferevent_rate_limit_group *group;
+
+	/* This bufferevent's current limits. */
+	struct ev_token_bucket limit;
+	/* Pointer to the rate-limit configuration for this bufferevent.
+	 * Can be shared.  XXX reference-count this? */
+	struct ev_token_bucket_cfg *cfg;
+
+	/* Timeout event used when one this bufferevent's buckets are
+	 * empty. */
+	struct event refill_bucket_event;
+};
+
+/** Parts of the bufferevent structure that are shared among all bufferevent
+ * types, but not exposed in bufferevent_struct.h. */
+struct bufferevent_private {
+	/** The underlying bufferevent structure. */
+	struct bufferevent bev;
+
+	/** Evbuffer callback to enforce watermarks on input. */
+	struct evbuffer_cb_entry *read_watermarks_cb;
+
+	/** If set, we should free the lock when we free the bufferevent. */
+	unsigned own_lock : 1;
+
+	/** Flag: set if we have deferred callbacks and a read callback is
+	 * pending. */
+	unsigned readcb_pending : 1;
+	/** Flag: set if we have deferred callbacks and a write callback is
+	 * pending. */
+	unsigned writecb_pending : 1;
+	/** Flag: set if we are currently busy connecting. */
+	unsigned connecting : 1;
+	/** Flag: set if a connect failed prematurely; this is a hack for
+	 * getting around the bufferevent abstraction. */
+	unsigned connection_refused : 1;
+	/** Set to the events pending if we have deferred callbacks and
+	 * an events callback is pending. */
+	short eventcb_pending;
+
+	/** If set, read is suspended until one or more conditions are over.
+	 * The actual value here is a bitfield of those conditions; see the
+	 * BEV_SUSPEND_* flags above. */
+	bufferevent_suspend_flags read_suspended;
+
+	/** If set, writing is suspended until one or more conditions are over.
+	 * The actual value here is a bitfield of those conditions; see the
+	 * BEV_SUSPEND_* flags above. */
+	bufferevent_suspend_flags write_suspended;
+
+	/** Set to the current socket errno if we have deferred callbacks and
+	 * an events callback is pending. */
+	int errno_pending;
+
+	/** The DNS error code for bufferevent_socket_connect_hostname */
+	int dns_error;
+
+	/** Used to implement deferred callbacks */
+	struct event_callback deferred;
+
+	/** The options this bufferevent was constructed with */
+	enum bufferevent_options options;
+
+	/** Current reference count for this bufferevent. */
+	int refcnt;
+
+	/** Lock for this bufferevent.  Shared by the inbuf and the outbuf.
+	 * If NULL, locking is disabled. */
+	void *lock;
+
+	/** No matter how big our bucket gets, don't try to read more than this
+	 * much in a single read operation. */
+	ev_ssize_t max_single_read;
+
+	/** No matter how big our bucket gets, don't try to write more than this
+	 * much in a single write operation. */
+	ev_ssize_t max_single_write;
+
+	/** Rate-limiting information for this bufferevent */
+	struct bufferevent_rate_limit *rate_limiting;
+
+	/* Saved conn_addr, to extract IP address from it.
+	 *
+	 * Because some servers may reset/close connection without waiting clients,
+	 * in that case we can't extract IP address even in close_cb.
+	 * So we need to save it, just after we connected to remote server, or
+	 * after resolving (to avoid extra dns requests during retrying, since UDP
+	 * is slow) */
+	union {
+		struct sockaddr_in6 in6;
+		struct sockaddr_in in;
+	} conn_address;
+
+	struct evdns_getaddrinfo_request *dns_request;
+};
+
+/** Possible operations for a control callback. */
+enum bufferevent_ctrl_op {
+	BEV_CTRL_SET_FD,
+	BEV_CTRL_GET_FD,
+	BEV_CTRL_GET_UNDERLYING,
+	BEV_CTRL_CANCEL_ALL
+};
+
+/** Possible data types for a control callback */
+union bufferevent_ctrl_data {
+	void *ptr;
+	evutil_socket_t fd;
+};
+
+/**
+   Implementation table for a bufferevent: holds function pointers and other
+   information to make the various bufferevent types work.
+*/
+struct bufferevent_ops {
+	/** The name of the bufferevent's type. */
+	const char *type;
+	/** At what offset into the implementation type will we find a
+	    bufferevent structure?
+
+	    Example: if the type is implemented as
+	    struct bufferevent_x {
+	       int extra_data;
+	       struct bufferevent bev;
+	    }
+	    then mem_offset should be offsetof(struct bufferevent_x, bev)
+	*/
+	off_t mem_offset;
+
+	/** Enables one or more of EV_READ|EV_WRITE on a bufferevent.  Does
+	    not need to adjust the 'enabled' field.  Returns 0 on success, -1
+	    on failure.
+	 */
+	int (*enable)(struct bufferevent *, short);
+
+	/** Disables one or more of EV_READ|EV_WRITE on a bufferevent.  Does
+	    not need to adjust the 'enabled' field.  Returns 0 on success, -1
+	    on failure.
+	 */
+	int (*disable)(struct bufferevent *, short);
+
+	/** Detatches the bufferevent from related data structures. Called as
+	 * soon as its reference count reaches 0. */
+	void (*unlink)(struct bufferevent *);
+
+	/** Free any storage and deallocate any extra data or structures used
+	    in this implementation. Called when the bufferevent is
+	    finalized.
+	 */
+	void (*destruct)(struct bufferevent *);
+
+	/** Called when the timeouts on the bufferevent have changed.*/
+	int (*adj_timeouts)(struct bufferevent *);
+
+	/** Called to flush data. */
+	int (*flush)(struct bufferevent *, short, enum bufferevent_flush_mode);
+
+	/** Called to access miscellaneous fields. */
+	int (*ctrl)(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
+
+};
+
+extern const struct bufferevent_ops bufferevent_ops_socket;
+extern const struct bufferevent_ops bufferevent_ops_filter;
+extern const struct bufferevent_ops bufferevent_ops_pair;
+
+#define BEV_IS_SOCKET(bevp) ((bevp)->be_ops == &bufferevent_ops_socket)
+#define BEV_IS_FILTER(bevp) ((bevp)->be_ops == &bufferevent_ops_filter)
+#define BEV_IS_PAIR(bevp) ((bevp)->be_ops == &bufferevent_ops_pair)
+
+#if defined(EVENT__HAVE_OPENSSL)
+extern const struct bufferevent_ops bufferevent_ops_openssl;
+#define BEV_IS_OPENSSL(bevp) ((bevp)->be_ops == &bufferevent_ops_openssl)
+#else
+#define BEV_IS_OPENSSL(bevp) 0
+#endif
+
+#ifdef _WIN32
+extern const struct bufferevent_ops bufferevent_ops_async;
+#define BEV_IS_ASYNC(bevp) ((bevp)->be_ops == &bufferevent_ops_async)
+#else
+#define BEV_IS_ASYNC(bevp) 0
+#endif
+
+/** Initialize the shared parts of a bufferevent. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_init_common_(struct bufferevent_private *, struct event_base *, const struct bufferevent_ops *, enum bufferevent_options options);
+
+/** For internal use: temporarily stop all reads on bufev, until the conditions
+ * in 'what' are over. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_suspend_read_(struct bufferevent *bufev, bufferevent_suspend_flags what);
+/** For internal use: clear the conditions 'what' on bufev, and re-enable
+ * reading if there are no conditions left. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_unsuspend_read_(struct bufferevent *bufev, bufferevent_suspend_flags what);
+
+/** For internal use: temporarily stop all writes on bufev, until the conditions
+ * in 'what' are over. */
+void bufferevent_suspend_write_(struct bufferevent *bufev, bufferevent_suspend_flags what);
+/** For internal use: clear the conditions 'what' on bufev, and re-enable
+ * writing if there are no conditions left. */
+void bufferevent_unsuspend_write_(struct bufferevent *bufev, bufferevent_suspend_flags what);
+
+#define bufferevent_wm_suspend_read(b) \
+	bufferevent_suspend_read_((b), BEV_SUSPEND_WM)
+#define bufferevent_wm_unsuspend_read(b) \
+	bufferevent_unsuspend_read_((b), BEV_SUSPEND_WM)
+
+/*
+  Disable a bufferevent.  Equivalent to bufferevent_disable(), but
+  first resets 'connecting' flag to force EV_WRITE down for sure.
+
+  XXXX this method will go away in the future; try not to add new users.
+    See comment in evhttp_connection_reset_() for discussion.
+
+  @param bufev the bufferevent to be disabled
+  @param event any combination of EV_READ | EV_WRITE.
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_disable()
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_disable_hard_(struct bufferevent *bufev, short event);
+
+/** Internal: Set up locking on a bufferevent.  If lock is set, use it.
+ * Otherwise, use a new lock. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_enable_locking_(struct bufferevent *bufev, void *lock);
+/** Internal: backwards compat macro for the now public function
+ * Increment the reference count on bufev. */
+#define bufferevent_incref_(bufev) bufferevent_incref(bufev)
+/** Internal: Lock bufev and increase its reference count.
+ * unlocking it otherwise. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_incref_and_lock_(struct bufferevent *bufev);
+/** Internal: backwards compat macro for the now public function
+ * Decrement the reference count on bufev.  Returns 1 if it freed
+ * the bufferevent.*/
+#define bufferevent_decref_(bufev) bufferevent_decref(bufev)
+
+/** Internal: Drop the reference count on bufev, freeing as necessary, and
+ * unlocking it otherwise.  Returns 1 if it freed the bufferevent. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decref_and_unlock_(struct bufferevent *bufev);
+
+/** Internal: If callbacks are deferred and we have a read callback, schedule
+ * a readcb.  Otherwise just run the readcb. Ignores watermarks. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_run_readcb_(struct bufferevent *bufev, int options);
+/** Internal: If callbacks are deferred and we have a write callback, schedule
+ * a writecb.  Otherwise just run the writecb. Ignores watermarks. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_run_writecb_(struct bufferevent *bufev, int options);
+/** Internal: If callbacks are deferred and we have an eventcb, schedule
+ * it to run with events "what".  Otherwise just run the eventcb.
+ * See bufferevent_trigger_event for meaning of "options". */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_run_eventcb_(struct bufferevent *bufev, short what, int options);
+
+/** Internal: Run or schedule (if deferred or options contain
+ * BEV_TRIG_DEFER_CALLBACKS) I/O callbacks specified in iotype.
+ * Must already hold the bufev lock. Honors watermarks unless
+ * BEV_TRIG_IGNORE_WATERMARKS is in options. */
+static inline void bufferevent_trigger_nolock_(struct bufferevent *bufev, short iotype, int options);
+
+/* Making this inline since all of the common-case calls to this function in
+ * libevent use constant arguments. */
+static inline void
+bufferevent_trigger_nolock_(struct bufferevent *bufev, short iotype, int options)
+{
+	if ((iotype & EV_READ) && ((options & BEV_TRIG_IGNORE_WATERMARKS) ||
+	    evbuffer_get_length(bufev->input) >= bufev->wm_read.low))
+		bufferevent_run_readcb_(bufev, options);
+	if ((iotype & EV_WRITE) && ((options & BEV_TRIG_IGNORE_WATERMARKS) ||
+	    evbuffer_get_length(bufev->output) <= bufev->wm_write.low))
+		bufferevent_run_writecb_(bufev, options);
+}
+
+/** Internal: Add the event 'ev' with timeout tv, unless tv is set to 0, in
+ * which case add ev with no timeout. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_add_event_(struct event *ev, const struct timeval *tv);
+
+/* =========
+ * These next functions implement timeouts for bufferevents that aren't doing
+ * anything else with ev_read and ev_write, to handle timeouts.
+ * ========= */
+/** Internal use: Set up the ev_read and ev_write callbacks so that
+ * the other "generic_timeout" functions will work on it.  Call this from
+ * the constructor function. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_init_generic_timeout_cbs_(struct bufferevent *bev);
+/** Internal use: Add or delete the generic timeout events as appropriate.
+ * (If an event is enabled and a timeout is set, we add the event.  Otherwise
+ * we delete it.)  Call this from anything that changes the timeout values,
+ * that enabled EV_READ or EV_WRITE, or that disables EV_READ or EV_WRITE. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_generic_adj_timeouts_(struct bufferevent *bev);
+EVENT2_EXPORT_SYMBOL
+int bufferevent_generic_adj_existing_timeouts_(struct bufferevent *bev);
+
+EVENT2_EXPORT_SYMBOL
+enum bufferevent_options bufferevent_get_options_(struct bufferevent *bev);
+
+EVENT2_EXPORT_SYMBOL
+const struct sockaddr*
+bufferevent_socket_get_conn_address_(struct bufferevent *bev);
+
+EVENT2_EXPORT_SYMBOL
+void
+bufferevent_socket_set_conn_address_fd_(struct bufferevent *bev, evutil_socket_t fd);
+
+EVENT2_EXPORT_SYMBOL
+void
+bufferevent_socket_set_conn_address_(struct bufferevent *bev, struct sockaddr *addr, size_t addrlen);
+
+
+/** Internal use: We have just successfully read data into an inbuf, so
+ * reset the read timeout (if any). */
+#define BEV_RESET_GENERIC_READ_TIMEOUT(bev)				\
+	do {								\
+		if (evutil_timerisset(&(bev)->timeout_read))		\
+			event_add(&(bev)->ev_read, &(bev)->timeout_read); \
+	} while (0)
+/** Internal use: We have just successfully written data from an inbuf, so
+ * reset the read timeout (if any). */
+#define BEV_RESET_GENERIC_WRITE_TIMEOUT(bev)				\
+	do {								\
+		if (evutil_timerisset(&(bev)->timeout_write))		\
+			event_add(&(bev)->ev_write, &(bev)->timeout_write); \
+	} while (0)
+#define BEV_DEL_GENERIC_READ_TIMEOUT(bev)	\
+		event_del(&(bev)->ev_read)
+#define BEV_DEL_GENERIC_WRITE_TIMEOUT(bev)	\
+		event_del(&(bev)->ev_write)
+
+
+/** Internal: Given a bufferevent, return its corresponding
+ * bufferevent_private. */
+#define BEV_UPCAST(b) EVUTIL_UPCAST((b), struct bufferevent_private, bev)
+
+#ifdef EVENT__DISABLE_THREAD_SUPPORT
+#define BEV_LOCK(b) EVUTIL_NIL_STMT_
+#define BEV_UNLOCK(b) EVUTIL_NIL_STMT_
+#else
+/** Internal: Grab the lock (if any) on a bufferevent */
+#define BEV_LOCK(b) do {						\
+		struct bufferevent_private *locking =  BEV_UPCAST(b);	\
+		EVLOCK_LOCK(locking->lock, 0);				\
+	} while (0)
+
+/** Internal: Release the lock (if any) on a bufferevent */
+#define BEV_UNLOCK(b) do {						\
+		struct bufferevent_private *locking =  BEV_UPCAST(b);	\
+		EVLOCK_UNLOCK(locking->lock, 0);			\
+	} while (0)
+#endif
+
+
+/* ==== For rate-limiting. */
+
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decrement_write_buckets_(struct bufferevent_private *bev,
+    ev_ssize_t bytes);
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decrement_read_buckets_(struct bufferevent_private *bev,
+    ev_ssize_t bytes);
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_read_max_(struct bufferevent_private *bev);
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_write_max_(struct bufferevent_private *bev);
+
+int bufferevent_ratelim_init_(struct bufferevent_private *bev);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* BUFFEREVENT_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent.c b/extra/libevent/libevent-2.1.11-stable/bufferevent.c
new file mode 100644
index 000000000000..08c0486c087d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent.c
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#include "event2/util.h"
+#include "event2/buffer.h"
+#include "event2/buffer_compat.h"
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/bufferevent_compat.h"
+#include "event2/event.h"
+#include "event-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+#include "evbuffer-internal.h"
+#include "util-internal.h"
+
+static void bufferevent_cancel_all_(struct bufferevent *bev);
+static void bufferevent_finalize_cb_(struct event_callback *evcb, void *arg_);
+
+void
+bufferevent_suspend_read_(struct bufferevent *bufev, bufferevent_suspend_flags what)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	BEV_LOCK(bufev);
+	if (!bufev_private->read_suspended)
+		bufev->be_ops->disable(bufev, EV_READ);
+	bufev_private->read_suspended |= what;
+	BEV_UNLOCK(bufev);
+}
+
+void
+bufferevent_unsuspend_read_(struct bufferevent *bufev, bufferevent_suspend_flags what)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	BEV_LOCK(bufev);
+	bufev_private->read_suspended &= ~what;
+	if (!bufev_private->read_suspended && (bufev->enabled & EV_READ))
+		bufev->be_ops->enable(bufev, EV_READ);
+	BEV_UNLOCK(bufev);
+}
+
+void
+bufferevent_suspend_write_(struct bufferevent *bufev, bufferevent_suspend_flags what)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	BEV_LOCK(bufev);
+	if (!bufev_private->write_suspended)
+		bufev->be_ops->disable(bufev, EV_WRITE);
+	bufev_private->write_suspended |= what;
+	BEV_UNLOCK(bufev);
+}
+
+void
+bufferevent_unsuspend_write_(struct bufferevent *bufev, bufferevent_suspend_flags what)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	BEV_LOCK(bufev);
+	bufev_private->write_suspended &= ~what;
+	if (!bufev_private->write_suspended && (bufev->enabled & EV_WRITE))
+		bufev->be_ops->enable(bufev, EV_WRITE);
+	BEV_UNLOCK(bufev);
+}
+
+/**
+ * Sometimes bufferevent's implementation can overrun high watermarks
+ * (one of examples is openssl) and in this case if the read callback
+ * will not handle enough data do over condition above the read
+ * callback will never be called again (due to suspend above).
+ *
+ * To avoid this we are scheduling read callback again here, but only
+ * from the user callback to avoid multiple scheduling:
+ * - when the data had been added to it
+ * - when the data had been drained from it (user specified read callback)
+ */
+static void bufferevent_inbuf_wm_check(struct bufferevent *bev)
+{
+	if (!bev->wm_read.high)
+		return;
+	if (!(bev->enabled & EV_READ))
+		return;
+	if (evbuffer_get_length(bev->input) < bev->wm_read.high)
+		return;
+
+	bufferevent_trigger(bev, EV_READ, BEV_OPT_DEFER_CALLBACKS);
+}
+
+/* Callback to implement watermarks on the input buffer.  Only enabled
+ * if the watermark is set. */
+static void
+bufferevent_inbuf_wm_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo,
+    void *arg)
+{
+	struct bufferevent *bufev = arg;
+	size_t size;
+
+	size = evbuffer_get_length(buf);
+
+	if (size >= bufev->wm_read.high)
+		bufferevent_wm_suspend_read(bufev);
+	else
+		bufferevent_wm_unsuspend_read(bufev);
+}
+
+static void
+bufferevent_run_deferred_callbacks_locked(struct event_callback *cb, void *arg)
+{
+	struct bufferevent_private *bufev_private = arg;
+	struct bufferevent *bufev = &bufev_private->bev;
+
+	BEV_LOCK(bufev);
+	if ((bufev_private->eventcb_pending & BEV_EVENT_CONNECTED) &&
+	    bufev->errorcb) {
+		/* The "connected" happened before any reads or writes, so
+		   send it first. */
+		bufev_private->eventcb_pending &= ~BEV_EVENT_CONNECTED;
+		bufev->errorcb(bufev, BEV_EVENT_CONNECTED, bufev->cbarg);
+	}
+	if (bufev_private->readcb_pending && bufev->readcb) {
+		bufev_private->readcb_pending = 0;
+		bufev->readcb(bufev, bufev->cbarg);
+		bufferevent_inbuf_wm_check(bufev);
+	}
+	if (bufev_private->writecb_pending && bufev->writecb) {
+		bufev_private->writecb_pending = 0;
+		bufev->writecb(bufev, bufev->cbarg);
+	}
+	if (bufev_private->eventcb_pending && bufev->errorcb) {
+		short what = bufev_private->eventcb_pending;
+		int err = bufev_private->errno_pending;
+		bufev_private->eventcb_pending = 0;
+		bufev_private->errno_pending = 0;
+		EVUTIL_SET_SOCKET_ERROR(err);
+		bufev->errorcb(bufev, what, bufev->cbarg);
+	}
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+static void
+bufferevent_run_deferred_callbacks_unlocked(struct event_callback *cb, void *arg)
+{
+	struct bufferevent_private *bufev_private = arg;
+	struct bufferevent *bufev = &bufev_private->bev;
+
+	BEV_LOCK(bufev);
+#define UNLOCKED(stmt) \
+	do { BEV_UNLOCK(bufev); stmt; BEV_LOCK(bufev); } while(0)
+
+	if ((bufev_private->eventcb_pending & BEV_EVENT_CONNECTED) &&
+	    bufev->errorcb) {
+		/* The "connected" happened before any reads or writes, so
+		   send it first. */
+		bufferevent_event_cb errorcb = bufev->errorcb;
+		void *cbarg = bufev->cbarg;
+		bufev_private->eventcb_pending &= ~BEV_EVENT_CONNECTED;
+		UNLOCKED(errorcb(bufev, BEV_EVENT_CONNECTED, cbarg));
+	}
+	if (bufev_private->readcb_pending && bufev->readcb) {
+		bufferevent_data_cb readcb = bufev->readcb;
+		void *cbarg = bufev->cbarg;
+		bufev_private->readcb_pending = 0;
+		UNLOCKED(readcb(bufev, cbarg));
+		bufferevent_inbuf_wm_check(bufev);
+	}
+	if (bufev_private->writecb_pending && bufev->writecb) {
+		bufferevent_data_cb writecb = bufev->writecb;
+		void *cbarg = bufev->cbarg;
+		bufev_private->writecb_pending = 0;
+		UNLOCKED(writecb(bufev, cbarg));
+	}
+	if (bufev_private->eventcb_pending && bufev->errorcb) {
+		bufferevent_event_cb errorcb = bufev->errorcb;
+		void *cbarg = bufev->cbarg;
+		short what = bufev_private->eventcb_pending;
+		int err = bufev_private->errno_pending;
+		bufev_private->eventcb_pending = 0;
+		bufev_private->errno_pending = 0;
+		EVUTIL_SET_SOCKET_ERROR(err);
+		UNLOCKED(errorcb(bufev,what,cbarg));
+	}
+	bufferevent_decref_and_unlock_(bufev);
+#undef UNLOCKED
+}
+
+#define SCHEDULE_DEFERRED(bevp)						\
+	do {								\
+		if (event_deferred_cb_schedule_(			\
+			    (bevp)->bev.ev_base,			\
+			&(bevp)->deferred))				\
+			bufferevent_incref_(&(bevp)->bev);		\
+	} while (0)
+
+
+void
+bufferevent_run_readcb_(struct bufferevent *bufev, int options)
+{
+	/* Requires that we hold the lock and a reference */
+	struct bufferevent_private *p = BEV_UPCAST(bufev);
+	if (bufev->readcb == NULL)
+		return;
+	if ((p->options|options) & BEV_OPT_DEFER_CALLBACKS) {
+		p->readcb_pending = 1;
+		SCHEDULE_DEFERRED(p);
+	} else {
+		bufev->readcb(bufev, bufev->cbarg);
+		bufferevent_inbuf_wm_check(bufev);
+	}
+}
+
+void
+bufferevent_run_writecb_(struct bufferevent *bufev, int options)
+{
+	/* Requires that we hold the lock and a reference */
+	struct bufferevent_private *p = BEV_UPCAST(bufev);
+	if (bufev->writecb == NULL)
+		return;
+	if ((p->options|options) & BEV_OPT_DEFER_CALLBACKS) {
+		p->writecb_pending = 1;
+		SCHEDULE_DEFERRED(p);
+	} else {
+		bufev->writecb(bufev, bufev->cbarg);
+	}
+}
+
+#define BEV_TRIG_ALL_OPTS (			\
+		BEV_TRIG_IGNORE_WATERMARKS|	\
+		BEV_TRIG_DEFER_CALLBACKS	\
+	)
+
+void
+bufferevent_trigger(struct bufferevent *bufev, short iotype, int options)
+{
+	bufferevent_incref_and_lock_(bufev);
+	bufferevent_trigger_nolock_(bufev, iotype, options&BEV_TRIG_ALL_OPTS);
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+void
+bufferevent_run_eventcb_(struct bufferevent *bufev, short what, int options)
+{
+	/* Requires that we hold the lock and a reference */
+	struct bufferevent_private *p = BEV_UPCAST(bufev);
+	if (bufev->errorcb == NULL)
+		return;
+	if ((p->options|options) & BEV_OPT_DEFER_CALLBACKS) {
+		p->eventcb_pending |= what;
+		p->errno_pending = EVUTIL_SOCKET_ERROR();
+		SCHEDULE_DEFERRED(p);
+	} else {
+		bufev->errorcb(bufev, what, bufev->cbarg);
+	}
+}
+
+void
+bufferevent_trigger_event(struct bufferevent *bufev, short what, int options)
+{
+	bufferevent_incref_and_lock_(bufev);
+	bufferevent_run_eventcb_(bufev, what, options&BEV_TRIG_ALL_OPTS);
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+int
+bufferevent_init_common_(struct bufferevent_private *bufev_private,
+    struct event_base *base,
+    const struct bufferevent_ops *ops,
+    enum bufferevent_options options)
+{
+	struct bufferevent *bufev = &bufev_private->bev;
+
+	if (!bufev->input) {
+		if ((bufev->input = evbuffer_new()) == NULL)
+			goto err;
+	}
+
+	if (!bufev->output) {
+		if ((bufev->output = evbuffer_new()) == NULL)
+			goto err;
+	}
+
+	bufev_private->refcnt = 1;
+	bufev->ev_base = base;
+
+	/* Disable timeouts. */
+	evutil_timerclear(&bufev->timeout_read);
+	evutil_timerclear(&bufev->timeout_write);
+
+	bufev->be_ops = ops;
+
+	if (bufferevent_ratelim_init_(bufev_private))
+		goto err;
+
+	/*
+	 * Set to EV_WRITE so that using bufferevent_write is going to
+	 * trigger a callback.  Reading needs to be explicitly enabled
+	 * because otherwise no data will be available.
+	 */
+	bufev->enabled = EV_WRITE;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (options & BEV_OPT_THREADSAFE) {
+		if (bufferevent_enable_locking_(bufev, NULL) < 0)
+			goto err;
+	}
+#endif
+	if ((options & (BEV_OPT_DEFER_CALLBACKS|BEV_OPT_UNLOCK_CALLBACKS))
+	    == BEV_OPT_UNLOCK_CALLBACKS) {
+		event_warnx("UNLOCK_CALLBACKS requires DEFER_CALLBACKS");
+		goto err;
+	}
+	if (options & BEV_OPT_UNLOCK_CALLBACKS)
+		event_deferred_cb_init_(
+		    &bufev_private->deferred,
+		    event_base_get_npriorities(base) / 2,
+		    bufferevent_run_deferred_callbacks_unlocked,
+		    bufev_private);
+	else
+		event_deferred_cb_init_(
+		    &bufev_private->deferred,
+		    event_base_get_npriorities(base) / 2,
+		    bufferevent_run_deferred_callbacks_locked,
+		    bufev_private);
+
+	bufev_private->options = options;
+
+	evbuffer_set_parent_(bufev->input, bufev);
+	evbuffer_set_parent_(bufev->output, bufev);
+
+	return 0;
+
+err:
+	if (bufev->input) {
+		evbuffer_free(bufev->input);
+		bufev->input = NULL;
+	}
+	if (bufev->output) {
+		evbuffer_free(bufev->output);
+		bufev->output = NULL;
+	}
+	return -1;
+}
+
+void
+bufferevent_setcb(struct bufferevent *bufev,
+    bufferevent_data_cb readcb, bufferevent_data_cb writecb,
+    bufferevent_event_cb eventcb, void *cbarg)
+{
+	BEV_LOCK(bufev);
+
+	bufev->readcb = readcb;
+	bufev->writecb = writecb;
+	bufev->errorcb = eventcb;
+
+	bufev->cbarg = cbarg;
+	BEV_UNLOCK(bufev);
+}
+
+void
+bufferevent_getcb(struct bufferevent *bufev,
+    bufferevent_data_cb *readcb_ptr,
+    bufferevent_data_cb *writecb_ptr,
+    bufferevent_event_cb *eventcb_ptr,
+    void **cbarg_ptr)
+{
+	BEV_LOCK(bufev);
+	if (readcb_ptr)
+		*readcb_ptr = bufev->readcb;
+	if (writecb_ptr)
+		*writecb_ptr = bufev->writecb;
+	if (eventcb_ptr)
+		*eventcb_ptr = bufev->errorcb;
+	if (cbarg_ptr)
+		*cbarg_ptr = bufev->cbarg;
+
+	BEV_UNLOCK(bufev);
+}
+
+struct evbuffer *
+bufferevent_get_input(struct bufferevent *bufev)
+{
+	return bufev->input;
+}
+
+struct evbuffer *
+bufferevent_get_output(struct bufferevent *bufev)
+{
+	return bufev->output;
+}
+
+struct event_base *
+bufferevent_get_base(struct bufferevent *bufev)
+{
+	return bufev->ev_base;
+}
+
+int
+bufferevent_get_priority(const struct bufferevent *bufev)
+{
+	if (event_initialized(&bufev->ev_read)) {
+		return event_get_priority(&bufev->ev_read);
+	} else {
+		return event_base_get_npriorities(bufev->ev_base) / 2;
+	}
+}
+
+int
+bufferevent_write(struct bufferevent *bufev, const void *data, size_t size)
+{
+	if (evbuffer_add(bufev->output, data, size) == -1)
+		return (-1);
+
+	return 0;
+}
+
+int
+bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf)
+{
+	if (evbuffer_add_buffer(bufev->output, buf) == -1)
+		return (-1);
+
+	return 0;
+}
+
+size_t
+bufferevent_read(struct bufferevent *bufev, void *data, size_t size)
+{
+	return (evbuffer_remove(bufev->input, data, size));
+}
+
+int
+bufferevent_read_buffer(struct bufferevent *bufev, struct evbuffer *buf)
+{
+	return (evbuffer_add_buffer(buf, bufev->input));
+}
+
+int
+bufferevent_enable(struct bufferevent *bufev, short event)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	short impl_events = event;
+	int r = 0;
+
+	bufferevent_incref_and_lock_(bufev);
+	if (bufev_private->read_suspended)
+		impl_events &= ~EV_READ;
+	if (bufev_private->write_suspended)
+		impl_events &= ~EV_WRITE;
+
+	bufev->enabled |= event;
+
+	if (impl_events && bufev->be_ops->enable(bufev, impl_events) < 0)
+		r = -1;
+	if (r)
+		event_debug(("%s: cannot enable 0x%hx on %p", __func__, event, bufev));
+
+	bufferevent_decref_and_unlock_(bufev);
+	return r;
+}
+
+int
+bufferevent_set_timeouts(struct bufferevent *bufev,
+			 const struct timeval *tv_read,
+			 const struct timeval *tv_write)
+{
+	int r = 0;
+	BEV_LOCK(bufev);
+	if (tv_read) {
+		bufev->timeout_read = *tv_read;
+	} else {
+		evutil_timerclear(&bufev->timeout_read);
+	}
+	if (tv_write) {
+		bufev->timeout_write = *tv_write;
+	} else {
+		evutil_timerclear(&bufev->timeout_write);
+	}
+
+	if (bufev->be_ops->adj_timeouts)
+		r = bufev->be_ops->adj_timeouts(bufev);
+	BEV_UNLOCK(bufev);
+
+	return r;
+}
+
+
+/* Obsolete; use bufferevent_set_timeouts */
+void
+bufferevent_settimeout(struct bufferevent *bufev,
+		       int timeout_read, int timeout_write)
+{
+	struct timeval tv_read, tv_write;
+	struct timeval *ptv_read = NULL, *ptv_write = NULL;
+
+	memset(&tv_read, 0, sizeof(tv_read));
+	memset(&tv_write, 0, sizeof(tv_write));
+
+	if (timeout_read) {
+		tv_read.tv_sec = timeout_read;
+		ptv_read = &tv_read;
+	}
+	if (timeout_write) {
+		tv_write.tv_sec = timeout_write;
+		ptv_write = &tv_write;
+	}
+
+	bufferevent_set_timeouts(bufev, ptv_read, ptv_write);
+}
+
+
+int
+bufferevent_disable_hard_(struct bufferevent *bufev, short event)
+{
+	int r = 0;
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+
+	BEV_LOCK(bufev);
+	bufev->enabled &= ~event;
+
+	bufev_private->connecting = 0;
+	if (bufev->be_ops->disable(bufev, event) < 0)
+		r = -1;
+
+	BEV_UNLOCK(bufev);
+	return r;
+}
+
+int
+bufferevent_disable(struct bufferevent *bufev, short event)
+{
+	int r = 0;
+
+	BEV_LOCK(bufev);
+	bufev->enabled &= ~event;
+
+	if (bufev->be_ops->disable(bufev, event) < 0)
+		r = -1;
+	if (r)
+		event_debug(("%s: cannot disable 0x%hx on %p", __func__, event, bufev));
+
+	BEV_UNLOCK(bufev);
+	return r;
+}
+
+/*
+ * Sets the water marks
+ */
+
+void
+bufferevent_setwatermark(struct bufferevent *bufev, short events,
+    size_t lowmark, size_t highmark)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+
+	BEV_LOCK(bufev);
+	if (events & EV_WRITE) {
+		bufev->wm_write.low = lowmark;
+		bufev->wm_write.high = highmark;
+	}
+
+	if (events & EV_READ) {
+		bufev->wm_read.low = lowmark;
+		bufev->wm_read.high = highmark;
+
+		if (highmark) {
+			/* There is now a new high-water mark for read.
+			   enable the callback if needed, and see if we should
+			   suspend/bufferevent_wm_unsuspend. */
+
+			if (bufev_private->read_watermarks_cb == NULL) {
+				bufev_private->read_watermarks_cb =
+				    evbuffer_add_cb(bufev->input,
+						    bufferevent_inbuf_wm_cb,
+						    bufev);
+			}
+			evbuffer_cb_set_flags(bufev->input,
+				      bufev_private->read_watermarks_cb,
+				      EVBUFFER_CB_ENABLED|EVBUFFER_CB_NODEFER);
+
+			if (evbuffer_get_length(bufev->input) >= highmark)
+				bufferevent_wm_suspend_read(bufev);
+			else if (evbuffer_get_length(bufev->input) < highmark)
+				bufferevent_wm_unsuspend_read(bufev);
+		} else {
+			/* There is now no high-water mark for read. */
+			if (bufev_private->read_watermarks_cb)
+				evbuffer_cb_clear_flags(bufev->input,
+				    bufev_private->read_watermarks_cb,
+				    EVBUFFER_CB_ENABLED);
+			bufferevent_wm_unsuspend_read(bufev);
+		}
+	}
+	BEV_UNLOCK(bufev);
+}
+
+int
+bufferevent_getwatermark(struct bufferevent *bufev, short events,
+    size_t *lowmark, size_t *highmark)
+{
+	if (events == EV_WRITE) {
+		BEV_LOCK(bufev);
+		if (lowmark)
+			*lowmark = bufev->wm_write.low;
+		if (highmark)
+			*highmark = bufev->wm_write.high;
+		BEV_UNLOCK(bufev);
+		return 0;
+	}
+
+	if (events == EV_READ) {
+		BEV_LOCK(bufev);
+		if (lowmark)
+			*lowmark = bufev->wm_read.low;
+		if (highmark)
+			*highmark = bufev->wm_read.high;
+		BEV_UNLOCK(bufev);
+		return 0;
+	}
+	return -1;
+}
+
+int
+bufferevent_flush(struct bufferevent *bufev,
+    short iotype,
+    enum bufferevent_flush_mode mode)
+{
+	int r = -1;
+	BEV_LOCK(bufev);
+	if (bufev->be_ops->flush)
+		r = bufev->be_ops->flush(bufev, iotype, mode);
+	BEV_UNLOCK(bufev);
+	return r;
+}
+
+void
+bufferevent_incref_and_lock_(struct bufferevent *bufev)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	BEV_LOCK(bufev);
+	++bufev_private->refcnt;
+}
+
+#if 0
+static void
+bufferevent_transfer_lock_ownership_(struct bufferevent *donor,
+    struct bufferevent *recipient)
+{
+	struct bufferevent_private *d = BEV_UPCAST(donor);
+	struct bufferevent_private *r = BEV_UPCAST(recipient);
+	if (d->lock != r->lock)
+		return;
+	if (r->own_lock)
+		return;
+	if (d->own_lock) {
+		d->own_lock = 0;
+		r->own_lock = 1;
+	}
+}
+#endif
+
+int
+bufferevent_decref_and_unlock_(struct bufferevent *bufev)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	int n_cbs = 0;
+#define MAX_CBS 16
+	struct event_callback *cbs[MAX_CBS];
+
+	EVUTIL_ASSERT(bufev_private->refcnt > 0);
+
+	if (--bufev_private->refcnt) {
+		BEV_UNLOCK(bufev);
+		return 0;
+	}
+
+	if (bufev->be_ops->unlink)
+		bufev->be_ops->unlink(bufev);
+
+	/* Okay, we're out of references. Let's finalize this once all the
+	 * callbacks are done running. */
+	cbs[0] = &bufev->ev_read.ev_evcallback;
+	cbs[1] = &bufev->ev_write.ev_evcallback;
+	cbs[2] = &bufev_private->deferred;
+	n_cbs = 3;
+	if (bufev_private->rate_limiting) {
+		struct event *e = &bufev_private->rate_limiting->refill_bucket_event;
+		if (event_initialized(e))
+			cbs[n_cbs++] = &e->ev_evcallback;
+	}
+	n_cbs += evbuffer_get_callbacks_(bufev->input, cbs+n_cbs, MAX_CBS-n_cbs);
+	n_cbs += evbuffer_get_callbacks_(bufev->output, cbs+n_cbs, MAX_CBS-n_cbs);
+
+	event_callback_finalize_many_(bufev->ev_base, n_cbs, cbs,
+	    bufferevent_finalize_cb_);
+
+#undef MAX_CBS
+	BEV_UNLOCK(bufev);
+
+	return 1;
+}
+
+static void
+bufferevent_finalize_cb_(struct event_callback *evcb, void *arg_)
+{
+	struct bufferevent *bufev = arg_;
+	struct bufferevent *underlying;
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+
+	BEV_LOCK(bufev);
+	underlying = bufferevent_get_underlying(bufev);
+
+	/* Clean up the shared info */
+	if (bufev->be_ops->destruct)
+		bufev->be_ops->destruct(bufev);
+
+	/* XXX what happens if refcnt for these buffers is > 1?
+	 * The buffers can share a lock with this bufferevent object,
+	 * but the lock might be destroyed below. */
+	/* evbuffer will free the callbacks */
+	evbuffer_free(bufev->input);
+	evbuffer_free(bufev->output);
+
+	if (bufev_private->rate_limiting) {
+		if (bufev_private->rate_limiting->group)
+			bufferevent_remove_from_rate_limit_group_internal_(bufev,0);
+		mm_free(bufev_private->rate_limiting);
+		bufev_private->rate_limiting = NULL;
+	}
+
+
+	BEV_UNLOCK(bufev);
+
+	if (bufev_private->own_lock)
+		EVTHREAD_FREE_LOCK(bufev_private->lock,
+		    EVTHREAD_LOCKTYPE_RECURSIVE);
+
+	/* Free the actual allocated memory. */
+	mm_free(((char*)bufev) - bufev->be_ops->mem_offset);
+
+	/* Release the reference to underlying now that we no longer need the
+	 * reference to it.  We wait this long mainly in case our lock is
+	 * shared with underlying.
+	 *
+	 * The 'destruct' function will also drop a reference to underlying
+	 * if BEV_OPT_CLOSE_ON_FREE is set.
+	 *
+	 * XXX Should we/can we just refcount evbuffer/bufferevent locks?
+	 * It would probably save us some headaches.
+	 */
+	if (underlying)
+		bufferevent_decref_(underlying);
+}
+
+int
+bufferevent_decref(struct bufferevent *bufev)
+{
+	BEV_LOCK(bufev);
+	return bufferevent_decref_and_unlock_(bufev);
+}
+
+void
+bufferevent_free(struct bufferevent *bufev)
+{
+	BEV_LOCK(bufev);
+	bufferevent_setcb(bufev, NULL, NULL, NULL, NULL);
+	bufferevent_cancel_all_(bufev);
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+void
+bufferevent_incref(struct bufferevent *bufev)
+{
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+
+	/* XXX: now that this function is public, we might want to
+	 * - return the count from this function
+	 * - create a new function to atomically grab the current refcount
+	 */
+	BEV_LOCK(bufev);
+	++bufev_private->refcnt;
+	BEV_UNLOCK(bufev);
+}
+
+int
+bufferevent_enable_locking_(struct bufferevent *bufev, void *lock)
+{
+#ifdef EVENT__DISABLE_THREAD_SUPPORT
+	return -1;
+#else
+	struct bufferevent *underlying;
+
+	if (BEV_UPCAST(bufev)->lock)
+		return -1;
+	underlying = bufferevent_get_underlying(bufev);
+
+	if (!lock && underlying && BEV_UPCAST(underlying)->lock) {
+		lock = BEV_UPCAST(underlying)->lock;
+		BEV_UPCAST(bufev)->lock = lock;
+		BEV_UPCAST(bufev)->own_lock = 0;
+	} else if (!lock) {
+		EVTHREAD_ALLOC_LOCK(lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+		if (!lock)
+			return -1;
+		BEV_UPCAST(bufev)->lock = lock;
+		BEV_UPCAST(bufev)->own_lock = 1;
+	} else {
+		BEV_UPCAST(bufev)->lock = lock;
+		BEV_UPCAST(bufev)->own_lock = 0;
+	}
+	evbuffer_enable_locking(bufev->input, lock);
+	evbuffer_enable_locking(bufev->output, lock);
+
+	if (underlying && !BEV_UPCAST(underlying)->lock)
+		bufferevent_enable_locking_(underlying, lock);
+
+	return 0;
+#endif
+}
+
+int
+bufferevent_setfd(struct bufferevent *bev, evutil_socket_t fd)
+{
+	union bufferevent_ctrl_data d;
+	int res = -1;
+	d.fd = fd;
+	BEV_LOCK(bev);
+	if (bev->be_ops->ctrl)
+		res = bev->be_ops->ctrl(bev, BEV_CTRL_SET_FD, &d);
+	if (res)
+		event_debug(("%s: cannot set fd for %p to "EV_SOCK_FMT, __func__, bev, fd));
+	BEV_UNLOCK(bev);
+	return res;
+}
+
+evutil_socket_t
+bufferevent_getfd(struct bufferevent *bev)
+{
+	union bufferevent_ctrl_data d;
+	int res = -1;
+	d.fd = -1;
+	BEV_LOCK(bev);
+	if (bev->be_ops->ctrl)
+		res = bev->be_ops->ctrl(bev, BEV_CTRL_GET_FD, &d);
+	if (res)
+		event_debug(("%s: cannot get fd for %p", __func__, bev));
+	BEV_UNLOCK(bev);
+	return (res<0) ? -1 : d.fd;
+}
+
+enum bufferevent_options
+bufferevent_get_options_(struct bufferevent *bev)
+{
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	enum bufferevent_options options;
+
+	BEV_LOCK(bev);
+	options = bev_p->options;
+	BEV_UNLOCK(bev);
+	return options;
+}
+
+
+static void
+bufferevent_cancel_all_(struct bufferevent *bev)
+{
+	union bufferevent_ctrl_data d;
+	memset(&d, 0, sizeof(d));
+	BEV_LOCK(bev);
+	if (bev->be_ops->ctrl)
+		bev->be_ops->ctrl(bev, BEV_CTRL_CANCEL_ALL, &d);
+	BEV_UNLOCK(bev);
+}
+
+short
+bufferevent_get_enabled(struct bufferevent *bufev)
+{
+	short r;
+	BEV_LOCK(bufev);
+	r = bufev->enabled;
+	BEV_UNLOCK(bufev);
+	return r;
+}
+
+struct bufferevent *
+bufferevent_get_underlying(struct bufferevent *bev)
+{
+	union bufferevent_ctrl_data d;
+	int res = -1;
+	d.ptr = NULL;
+	BEV_LOCK(bev);
+	if (bev->be_ops->ctrl)
+		res = bev->be_ops->ctrl(bev, BEV_CTRL_GET_UNDERLYING, &d);
+	BEV_UNLOCK(bev);
+	return (res<0) ? NULL : d.ptr;
+}
+
+static void
+bufferevent_generic_read_timeout_cb(evutil_socket_t fd, short event, void *ctx)
+{
+	struct bufferevent *bev = ctx;
+	bufferevent_incref_and_lock_(bev);
+	bufferevent_disable(bev, EV_READ);
+	bufferevent_run_eventcb_(bev, BEV_EVENT_TIMEOUT|BEV_EVENT_READING, 0);
+	bufferevent_decref_and_unlock_(bev);
+}
+static void
+bufferevent_generic_write_timeout_cb(evutil_socket_t fd, short event, void *ctx)
+{
+	struct bufferevent *bev = ctx;
+	bufferevent_incref_and_lock_(bev);
+	bufferevent_disable(bev, EV_WRITE);
+	bufferevent_run_eventcb_(bev, BEV_EVENT_TIMEOUT|BEV_EVENT_WRITING, 0);
+	bufferevent_decref_and_unlock_(bev);
+}
+
+void
+bufferevent_init_generic_timeout_cbs_(struct bufferevent *bev)
+{
+	event_assign(&bev->ev_read, bev->ev_base, -1, EV_FINALIZE,
+	    bufferevent_generic_read_timeout_cb, bev);
+	event_assign(&bev->ev_write, bev->ev_base, -1, EV_FINALIZE,
+	    bufferevent_generic_write_timeout_cb, bev);
+}
+
+int
+bufferevent_generic_adj_timeouts_(struct bufferevent *bev)
+{
+	const short enabled = bev->enabled;
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	int r1=0, r2=0;
+	if ((enabled & EV_READ) && !bev_p->read_suspended &&
+	    evutil_timerisset(&bev->timeout_read))
+		r1 = event_add(&bev->ev_read, &bev->timeout_read);
+	else
+		r1 = event_del(&bev->ev_read);
+
+	if ((enabled & EV_WRITE) && !bev_p->write_suspended &&
+	    evutil_timerisset(&bev->timeout_write) &&
+	    evbuffer_get_length(bev->output))
+		r2 = event_add(&bev->ev_write, &bev->timeout_write);
+	else
+		r2 = event_del(&bev->ev_write);
+	if (r1 < 0 || r2 < 0)
+		return -1;
+	return 0;
+}
+
+int
+bufferevent_generic_adj_existing_timeouts_(struct bufferevent *bev)
+{
+	int r = 0;
+	if (event_pending(&bev->ev_read, EV_READ, NULL)) {
+		if (evutil_timerisset(&bev->timeout_read)) {
+			    if (bufferevent_add_event_(&bev->ev_read, &bev->timeout_read) < 0)
+				    r = -1;
+		} else {
+			event_remove_timer(&bev->ev_read);
+		}
+	}
+	if (event_pending(&bev->ev_write, EV_WRITE, NULL)) {
+		if (evutil_timerisset(&bev->timeout_write)) {
+			if (bufferevent_add_event_(&bev->ev_write, &bev->timeout_write) < 0)
+				r = -1;
+		} else {
+			event_remove_timer(&bev->ev_write);
+		}
+	}
+	return r;
+}
+
+int
+bufferevent_add_event_(struct event *ev, const struct timeval *tv)
+{
+	if (!evutil_timerisset(tv))
+		return event_add(ev, NULL);
+	else
+		return event_add(ev, tv);
+}
+
+/* For use by user programs only; internally, we should be calling
+   either bufferevent_incref_and_lock_(), or BEV_LOCK. */
+void
+bufferevent_lock(struct bufferevent *bev)
+{
+	bufferevent_incref_and_lock_(bev);
+}
+
+void
+bufferevent_unlock(struct bufferevent *bev)
+{
+	bufferevent_decref_and_unlock_(bev);
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_async.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_async.c
new file mode 100644
index 000000000000..40c7c5e8d0d3
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_async.c
@@ -0,0 +1,706 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <winerror.h>
+#include <ws2tcpip.h>
+#endif
+
+#include <sys/queue.h>
+
+#include "event2/util.h"
+#include "event2/bufferevent.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/event.h"
+#include "event2/util.h"
+#include "event-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+#include "util-internal.h"
+#include "iocp-internal.h"
+
+#ifndef SO_UPDATE_CONNECT_CONTEXT
+/* Mingw is sometimes missing this */
+#define SO_UPDATE_CONNECT_CONTEXT 0x7010
+#endif
+
+/* prototypes */
+static int be_async_enable(struct bufferevent *, short);
+static int be_async_disable(struct bufferevent *, short);
+static void be_async_destruct(struct bufferevent *);
+static int be_async_flush(struct bufferevent *, short, enum bufferevent_flush_mode);
+static int be_async_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
+
+struct bufferevent_async {
+	struct bufferevent_private bev;
+	struct event_overlapped connect_overlapped;
+	struct event_overlapped read_overlapped;
+	struct event_overlapped write_overlapped;
+	size_t read_in_progress;
+	size_t write_in_progress;
+	unsigned ok : 1;
+	unsigned read_added : 1;
+	unsigned write_added : 1;
+};
+
+const struct bufferevent_ops bufferevent_ops_async = {
+	"socket_async",
+	evutil_offsetof(struct bufferevent_async, bev.bev),
+	be_async_enable,
+	be_async_disable,
+	NULL, /* Unlink */
+	be_async_destruct,
+	bufferevent_generic_adj_timeouts_,
+	be_async_flush,
+	be_async_ctrl,
+};
+
+static inline void
+be_async_run_eventcb(struct bufferevent *bev, short what, int options)
+{ bufferevent_run_eventcb_(bev, what, options|BEV_TRIG_DEFER_CALLBACKS); }
+
+static inline void
+be_async_trigger_nolock(struct bufferevent *bev, short what, int options)
+{ bufferevent_trigger_nolock_(bev, what, options|BEV_TRIG_DEFER_CALLBACKS); }
+
+static inline int
+fatal_error(int err)
+{
+	switch (err) {
+		/* We may have already associated this fd with a port.
+		 * Let's hope it's this port, and that the error code
+		 * for doing this neer changes. */
+		case ERROR_INVALID_PARAMETER:
+			return 0;
+	}
+	return 1;
+}
+
+static inline struct bufferevent_async *
+upcast(struct bufferevent *bev)
+{
+	struct bufferevent_async *bev_a;
+	if (!BEV_IS_ASYNC(bev))
+		return NULL;
+	bev_a = EVUTIL_UPCAST(bev, struct bufferevent_async, bev.bev);
+	return bev_a;
+}
+
+static inline struct bufferevent_async *
+upcast_connect(struct event_overlapped *eo)
+{
+	struct bufferevent_async *bev_a;
+	bev_a = EVUTIL_UPCAST(eo, struct bufferevent_async, connect_overlapped);
+	EVUTIL_ASSERT(BEV_IS_ASYNC(&bev_a->bev.bev));
+	return bev_a;
+}
+
+static inline struct bufferevent_async *
+upcast_read(struct event_overlapped *eo)
+{
+	struct bufferevent_async *bev_a;
+	bev_a = EVUTIL_UPCAST(eo, struct bufferevent_async, read_overlapped);
+	EVUTIL_ASSERT(BEV_IS_ASYNC(&bev_a->bev.bev));
+	return bev_a;
+}
+
+static inline struct bufferevent_async *
+upcast_write(struct event_overlapped *eo)
+{
+	struct bufferevent_async *bev_a;
+	bev_a = EVUTIL_UPCAST(eo, struct bufferevent_async, write_overlapped);
+	EVUTIL_ASSERT(BEV_IS_ASYNC(&bev_a->bev.bev));
+	return bev_a;
+}
+
+static void
+bev_async_del_write(struct bufferevent_async *beva)
+{
+	struct bufferevent *bev = &beva->bev.bev;
+
+	if (beva->write_added) {
+		beva->write_added = 0;
+		event_base_del_virtual_(bev->ev_base);
+	}
+}
+
+static void
+bev_async_del_read(struct bufferevent_async *beva)
+{
+	struct bufferevent *bev = &beva->bev.bev;
+
+	if (beva->read_added) {
+		beva->read_added = 0;
+		event_base_del_virtual_(bev->ev_base);
+	}
+}
+
+static void
+bev_async_add_write(struct bufferevent_async *beva)
+{
+	struct bufferevent *bev = &beva->bev.bev;
+
+	if (!beva->write_added) {
+		beva->write_added = 1;
+		event_base_add_virtual_(bev->ev_base);
+	}
+}
+
+static void
+bev_async_add_read(struct bufferevent_async *beva)
+{
+	struct bufferevent *bev = &beva->bev.bev;
+
+	if (!beva->read_added) {
+		beva->read_added = 1;
+		event_base_add_virtual_(bev->ev_base);
+	}
+}
+
+static void
+bev_async_consider_writing(struct bufferevent_async *beva)
+{
+	size_t at_most;
+	int limit;
+	struct bufferevent *bev = &beva->bev.bev;
+
+	/* Don't write if there's a write in progress, or we do not
+	 * want to write, or when there's nothing left to write. */
+	if (beva->write_in_progress || beva->bev.connecting)
+		return;
+	if (!beva->ok || !(bev->enabled&EV_WRITE) ||
+	    !evbuffer_get_length(bev->output)) {
+		bev_async_del_write(beva);
+		return;
+	}
+
+	at_most = evbuffer_get_length(bev->output);
+
+	/* This is safe so long as bufferevent_get_write_max never returns
+	 * more than INT_MAX.  That's true for now. XXXX */
+	limit = (int)bufferevent_get_write_max_(&beva->bev);
+	if (at_most >= (size_t)limit && limit >= 0)
+		at_most = limit;
+
+	if (beva->bev.write_suspended) {
+		bev_async_del_write(beva);
+		return;
+	}
+
+	/*  XXXX doesn't respect low-water mark very well. */
+	bufferevent_incref_(bev);
+	if (evbuffer_launch_write_(bev->output, at_most,
+	    &beva->write_overlapped)) {
+		bufferevent_decref_(bev);
+		beva->ok = 0;
+		be_async_run_eventcb(bev, BEV_EVENT_ERROR, 0);
+	} else {
+		beva->write_in_progress = at_most;
+		bufferevent_decrement_write_buckets_(&beva->bev, at_most);
+		bev_async_add_write(beva);
+	}
+}
+
+static void
+bev_async_consider_reading(struct bufferevent_async *beva)
+{
+	size_t cur_size;
+	size_t read_high;
+	size_t at_most;
+	int limit;
+	struct bufferevent *bev = &beva->bev.bev;
+
+	/* Don't read if there is a read in progress, or we do not
+	 * want to read. */
+	if (beva->read_in_progress || beva->bev.connecting)
+		return;
+	if (!beva->ok || !(bev->enabled&EV_READ)) {
+		bev_async_del_read(beva);
+		return;
+	}
+
+	/* Don't read if we're full */
+	cur_size = evbuffer_get_length(bev->input);
+	read_high = bev->wm_read.high;
+	if (read_high) {
+		if (cur_size >= read_high) {
+			bev_async_del_read(beva);
+			return;
+		}
+		at_most = read_high - cur_size;
+	} else {
+		at_most = 16384; /* FIXME totally magic. */
+	}
+
+	/* XXXX This over-commits. */
+	/* XXXX see also not above on cast on bufferevent_get_write_max_() */
+	limit = (int)bufferevent_get_read_max_(&beva->bev);
+	if (at_most >= (size_t)limit && limit >= 0)
+		at_most = limit;
+
+	if (beva->bev.read_suspended) {
+		bev_async_del_read(beva);
+		return;
+	}
+
+	bufferevent_incref_(bev);
+	if (evbuffer_launch_read_(bev->input, at_most, &beva->read_overlapped)) {
+		beva->ok = 0;
+		be_async_run_eventcb(bev, BEV_EVENT_ERROR, 0);
+		bufferevent_decref_(bev);
+	} else {
+		beva->read_in_progress = at_most;
+		bufferevent_decrement_read_buckets_(&beva->bev, at_most);
+		bev_async_add_read(beva);
+	}
+
+	return;
+}
+
+static void
+be_async_outbuf_callback(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo,
+    void *arg)
+{
+	struct bufferevent *bev = arg;
+	struct bufferevent_async *bev_async = upcast(bev);
+
+	/* If we added data to the outbuf and were not writing before,
+	 * we may want to write now. */
+
+	bufferevent_incref_and_lock_(bev);
+
+	if (cbinfo->n_added)
+		bev_async_consider_writing(bev_async);
+
+	bufferevent_decref_and_unlock_(bev);
+}
+
+static void
+be_async_inbuf_callback(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo,
+    void *arg)
+{
+	struct bufferevent *bev = arg;
+	struct bufferevent_async *bev_async = upcast(bev);
+
+	/* If we drained data from the inbuf and were not reading before,
+	 * we may want to read now */
+
+	bufferevent_incref_and_lock_(bev);
+
+	if (cbinfo->n_deleted)
+		bev_async_consider_reading(bev_async);
+
+	bufferevent_decref_and_unlock_(bev);
+}
+
+static int
+be_async_enable(struct bufferevent *buf, short what)
+{
+	struct bufferevent_async *bev_async = upcast(buf);
+
+	if (!bev_async->ok)
+		return -1;
+
+	if (bev_async->bev.connecting) {
+		/* Don't launch anything during connection attempts. */
+		return 0;
+	}
+
+	if (what & EV_READ)
+		BEV_RESET_GENERIC_READ_TIMEOUT(buf);
+	if (what & EV_WRITE)
+		BEV_RESET_GENERIC_WRITE_TIMEOUT(buf);
+
+	/* If we newly enable reading or writing, and we aren't reading or
+	   writing already, consider launching a new read or write. */
+
+	if (what & EV_READ)
+		bev_async_consider_reading(bev_async);
+	if (what & EV_WRITE)
+		bev_async_consider_writing(bev_async);
+	return 0;
+}
+
+static int
+be_async_disable(struct bufferevent *bev, short what)
+{
+	struct bufferevent_async *bev_async = upcast(bev);
+	/* XXXX If we disable reading or writing, we may want to consider
+	 * canceling any in-progress read or write operation, though it might
+	 * not work. */
+
+	if (what & EV_READ) {
+		BEV_DEL_GENERIC_READ_TIMEOUT(bev);
+		bev_async_del_read(bev_async);
+	}
+	if (what & EV_WRITE) {
+		BEV_DEL_GENERIC_WRITE_TIMEOUT(bev);
+		bev_async_del_write(bev_async);
+	}
+
+	return 0;
+}
+
+static void
+be_async_destruct(struct bufferevent *bev)
+{
+	struct bufferevent_async *bev_async = upcast(bev);
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	evutil_socket_t fd;
+
+	EVUTIL_ASSERT(!upcast(bev)->write_in_progress &&
+			!upcast(bev)->read_in_progress);
+
+	bev_async_del_read(bev_async);
+	bev_async_del_write(bev_async);
+
+	fd = evbuffer_overlapped_get_fd_(bev->input);
+	if (fd != (evutil_socket_t)EVUTIL_INVALID_SOCKET &&
+		(bev_p->options & BEV_OPT_CLOSE_ON_FREE)) {
+		evutil_closesocket(fd);
+		evbuffer_overlapped_set_fd_(bev->input, EVUTIL_INVALID_SOCKET);
+	}
+}
+
+/* GetQueuedCompletionStatus doesn't reliably yield WSA error codes, so
+ * we use WSAGetOverlappedResult to translate. */
+static void
+bev_async_set_wsa_error(struct bufferevent *bev, struct event_overlapped *eo)
+{
+	DWORD bytes, flags;
+	evutil_socket_t fd;
+
+	fd = evbuffer_overlapped_get_fd_(bev->input);
+	WSAGetOverlappedResult(fd, &eo->overlapped, &bytes, FALSE, &flags);
+}
+
+static int
+be_async_flush(struct bufferevent *bev, short what,
+    enum bufferevent_flush_mode mode)
+{
+	return 0;
+}
+
+static void
+connect_complete(struct event_overlapped *eo, ev_uintptr_t key,
+    ev_ssize_t nbytes, int ok)
+{
+	struct bufferevent_async *bev_a = upcast_connect(eo);
+	struct bufferevent *bev = &bev_a->bev.bev;
+	evutil_socket_t sock;
+
+	BEV_LOCK(bev);
+
+	EVUTIL_ASSERT(bev_a->bev.connecting);
+	bev_a->bev.connecting = 0;
+	sock = evbuffer_overlapped_get_fd_(bev_a->bev.bev.input);
+	/* XXXX Handle error? */
+	setsockopt(sock, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0);
+
+	if (ok)
+		bufferevent_async_set_connected_(bev);
+	else
+		bev_async_set_wsa_error(bev, eo);
+
+	be_async_run_eventcb(bev, ok ? BEV_EVENT_CONNECTED : BEV_EVENT_ERROR, 0);
+
+	event_base_del_virtual_(bev->ev_base);
+
+	bufferevent_decref_and_unlock_(bev);
+}
+
+static void
+read_complete(struct event_overlapped *eo, ev_uintptr_t key,
+    ev_ssize_t nbytes, int ok)
+{
+	struct bufferevent_async *bev_a = upcast_read(eo);
+	struct bufferevent *bev = &bev_a->bev.bev;
+	short what = BEV_EVENT_READING;
+	ev_ssize_t amount_unread;
+	BEV_LOCK(bev);
+	EVUTIL_ASSERT(bev_a->read_in_progress);
+
+	amount_unread = bev_a->read_in_progress - nbytes;
+	evbuffer_commit_read_(bev->input, nbytes);
+	bev_a->read_in_progress = 0;
+	if (amount_unread)
+		bufferevent_decrement_read_buckets_(&bev_a->bev, -amount_unread);
+
+	if (!ok)
+		bev_async_set_wsa_error(bev, eo);
+
+	if (bev_a->ok) {
+		if (ok && nbytes) {
+			BEV_RESET_GENERIC_READ_TIMEOUT(bev);
+			be_async_trigger_nolock(bev, EV_READ, 0);
+			bev_async_consider_reading(bev_a);
+		} else if (!ok) {
+			what |= BEV_EVENT_ERROR;
+			bev_a->ok = 0;
+			be_async_run_eventcb(bev, what, 0);
+		} else if (!nbytes) {
+			what |= BEV_EVENT_EOF;
+			bev_a->ok = 0;
+			be_async_run_eventcb(bev, what, 0);
+		}
+	}
+
+	bufferevent_decref_and_unlock_(bev);
+}
+
+static void
+write_complete(struct event_overlapped *eo, ev_uintptr_t key,
+    ev_ssize_t nbytes, int ok)
+{
+	struct bufferevent_async *bev_a = upcast_write(eo);
+	struct bufferevent *bev = &bev_a->bev.bev;
+	short what = BEV_EVENT_WRITING;
+	ev_ssize_t amount_unwritten;
+
+	BEV_LOCK(bev);
+	EVUTIL_ASSERT(bev_a->write_in_progress);
+
+	amount_unwritten = bev_a->write_in_progress - nbytes;
+	evbuffer_commit_write_(bev->output, nbytes);
+	bev_a->write_in_progress = 0;
+
+	if (amount_unwritten)
+		bufferevent_decrement_write_buckets_(&bev_a->bev,
+		                                     -amount_unwritten);
+
+
+	if (!ok)
+		bev_async_set_wsa_error(bev, eo);
+
+	if (bev_a->ok) {
+		if (ok && nbytes) {
+			BEV_RESET_GENERIC_WRITE_TIMEOUT(bev);
+			be_async_trigger_nolock(bev, EV_WRITE, 0);
+			bev_async_consider_writing(bev_a);
+		} else if (!ok) {
+			what |= BEV_EVENT_ERROR;
+			bev_a->ok = 0;
+			be_async_run_eventcb(bev, what, 0);
+		} else if (!nbytes) {
+			what |= BEV_EVENT_EOF;
+			bev_a->ok = 0;
+			be_async_run_eventcb(bev, what, 0);
+		}
+	}
+
+	bufferevent_decref_and_unlock_(bev);
+}
+
+struct bufferevent *
+bufferevent_async_new_(struct event_base *base,
+    evutil_socket_t fd, int options)
+{
+	struct bufferevent_async *bev_a;
+	struct bufferevent *bev;
+	struct event_iocp_port *iocp;
+
+	options |= BEV_OPT_THREADSAFE;
+
+	if (!(iocp = event_base_get_iocp_(base)))
+		return NULL;
+
+	if (fd >= 0 && event_iocp_port_associate_(iocp, fd, 1)<0) {
+		if (fatal_error(GetLastError()))
+			return NULL;
+	}
+
+	if (!(bev_a = mm_calloc(1, sizeof(struct bufferevent_async))))
+		return NULL;
+
+	bev = &bev_a->bev.bev;
+	if (!(bev->input = evbuffer_overlapped_new_(fd))) {
+		mm_free(bev_a);
+		return NULL;
+	}
+	if (!(bev->output = evbuffer_overlapped_new_(fd))) {
+		evbuffer_free(bev->input);
+		mm_free(bev_a);
+		return NULL;
+	}
+
+	if (bufferevent_init_common_(&bev_a->bev, base, &bufferevent_ops_async,
+		options)<0)
+		goto err;
+
+	evbuffer_add_cb(bev->input, be_async_inbuf_callback, bev);
+	evbuffer_add_cb(bev->output, be_async_outbuf_callback, bev);
+
+	event_overlapped_init_(&bev_a->connect_overlapped, connect_complete);
+	event_overlapped_init_(&bev_a->read_overlapped, read_complete);
+	event_overlapped_init_(&bev_a->write_overlapped, write_complete);
+
+	bufferevent_init_generic_timeout_cbs_(bev);
+
+	bev_a->ok = fd >= 0;
+
+	return bev;
+err:
+	bufferevent_free(&bev_a->bev.bev);
+	return NULL;
+}
+
+void
+bufferevent_async_set_connected_(struct bufferevent *bev)
+{
+	struct bufferevent_async *bev_async = upcast(bev);
+	bev_async->ok = 1;
+	/* Now's a good time to consider reading/writing */
+	be_async_enable(bev, bev->enabled);
+}
+
+int
+bufferevent_async_can_connect_(struct bufferevent *bev)
+{
+	const struct win32_extension_fns *ext =
+	    event_get_win32_extension_fns_();
+
+	if (BEV_IS_ASYNC(bev) &&
+	    event_base_get_iocp_(bev->ev_base) &&
+	    ext && ext->ConnectEx)
+		return 1;
+
+	return 0;
+}
+
+int
+bufferevent_async_connect_(struct bufferevent *bev, evutil_socket_t fd,
+	const struct sockaddr *sa, int socklen)
+{
+	BOOL rc;
+	struct bufferevent_async *bev_async = upcast(bev);
+	struct sockaddr_storage ss;
+	const struct win32_extension_fns *ext =
+	    event_get_win32_extension_fns_();
+
+	EVUTIL_ASSERT(ext && ext->ConnectEx && fd >= 0 && sa != NULL);
+
+	/* ConnectEx() requires that the socket be bound to an address
+	 * with bind() before using, otherwise it will fail. We attempt
+	 * to issue a bind() here, taking into account that the error
+	 * code is set to WSAEINVAL when the socket is already bound. */
+	memset(&ss, 0, sizeof(ss));
+	if (sa->sa_family == AF_INET) {
+		struct sockaddr_in *sin = (struct sockaddr_in *)&ss;
+		sin->sin_family = AF_INET;
+		sin->sin_addr.s_addr = INADDR_ANY;
+	} else if (sa->sa_family == AF_INET6) {
+		struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&ss;
+		sin6->sin6_family = AF_INET6;
+		sin6->sin6_addr = in6addr_any;
+	} else {
+		/* Well, the user will have to bind() */
+		return -1;
+	}
+	if (bind(fd, (struct sockaddr *)&ss, sizeof(ss)) < 0 &&
+	    WSAGetLastError() != WSAEINVAL)
+		return -1;
+
+	event_base_add_virtual_(bev->ev_base);
+	bufferevent_incref_(bev);
+	rc = ext->ConnectEx(fd, sa, socklen, NULL, 0, NULL,
+			    &bev_async->connect_overlapped.overlapped);
+	if (rc || WSAGetLastError() == ERROR_IO_PENDING)
+		return 0;
+
+	event_base_del_virtual_(bev->ev_base);
+	bufferevent_decref_(bev);
+
+	return -1;
+}
+
+static int
+be_async_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op,
+    union bufferevent_ctrl_data *data)
+{
+	switch (op) {
+	case BEV_CTRL_GET_FD:
+		data->fd = evbuffer_overlapped_get_fd_(bev->input);
+		return 0;
+	case BEV_CTRL_SET_FD: {
+		struct bufferevent_async *bev_a = upcast(bev);
+		struct event_iocp_port *iocp;
+
+		if (data->fd == evbuffer_overlapped_get_fd_(bev->input))
+			return 0;
+		if (!(iocp = event_base_get_iocp_(bev->ev_base)))
+			return -1;
+		if (event_iocp_port_associate_(iocp, data->fd, 1) < 0) {
+			if (fatal_error(GetLastError()))
+				return -1;
+		}
+		evbuffer_overlapped_set_fd_(bev->input, data->fd);
+		evbuffer_overlapped_set_fd_(bev->output, data->fd);
+		bev_a->ok = data->fd >= 0;
+		return 0;
+	}
+	case BEV_CTRL_CANCEL_ALL: {
+		struct bufferevent_async *bev_a = upcast(bev);
+		evutil_socket_t fd = evbuffer_overlapped_get_fd_(bev->input);
+		if (fd != (evutil_socket_t)EVUTIL_INVALID_SOCKET &&
+		    (bev_a->bev.options & BEV_OPT_CLOSE_ON_FREE)) {
+			closesocket(fd);
+			evbuffer_overlapped_set_fd_(bev->input, EVUTIL_INVALID_SOCKET);
+		}
+		bev_a->ok = 0;
+		return 0;
+	}
+	case BEV_CTRL_GET_UNDERLYING:
+	default:
+		return -1;
+	}
+}
+
+
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_filter.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_filter.c
new file mode 100644
index 000000000000..a7bdedddfe1d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_filter.c
@@ -0,0 +1,625 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#include "event2/event-config.h"
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#include "event2/util.h"
+#include "event2/bufferevent.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/event.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+#include "util-internal.h"
+
+/* prototypes */
+static int be_filter_enable(struct bufferevent *, short);
+static int be_filter_disable(struct bufferevent *, short);
+static void be_filter_unlink(struct bufferevent *);
+static void be_filter_destruct(struct bufferevent *);
+
+static void be_filter_readcb(struct bufferevent *, void *);
+static void be_filter_writecb(struct bufferevent *, void *);
+static void be_filter_eventcb(struct bufferevent *, short, void *);
+static int be_filter_flush(struct bufferevent *bufev,
+    short iotype, enum bufferevent_flush_mode mode);
+static int be_filter_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
+
+static void bufferevent_filtered_inbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo, void *arg);
+
+static void bufferevent_filtered_outbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *info, void *arg);
+
+struct bufferevent_filtered {
+	struct bufferevent_private bev;
+
+	/** The bufferevent that we read/write filtered data from/to. */
+	struct bufferevent *underlying;
+	/** A callback on our inbuf to notice somebory removes data */
+	struct evbuffer_cb_entry *inbuf_cb;
+	/** A callback on our outbuf to notice when somebody adds data */
+	struct evbuffer_cb_entry *outbuf_cb;
+	/** True iff we have received an EOF callback from the underlying
+	 * bufferevent. */
+	unsigned got_eof;
+
+	/** Function to free context when we're done. */
+	void (*free_context)(void *);
+	/** Input filter */
+	bufferevent_filter_cb process_in;
+	/** Output filter */
+	bufferevent_filter_cb process_out;
+	/** User-supplied argument to the filters. */
+	void *context;
+};
+
+const struct bufferevent_ops bufferevent_ops_filter = {
+	"filter",
+	evutil_offsetof(struct bufferevent_filtered, bev.bev),
+	be_filter_enable,
+	be_filter_disable,
+	be_filter_unlink,
+	be_filter_destruct,
+	bufferevent_generic_adj_timeouts_,
+	be_filter_flush,
+	be_filter_ctrl,
+};
+
+/* Given a bufferevent that's really the bev filter of a bufferevent_filtered,
+ * return that bufferevent_filtered. Returns NULL otherwise.*/
+static inline struct bufferevent_filtered *
+upcast(struct bufferevent *bev)
+{
+	struct bufferevent_filtered *bev_f;
+	if (!BEV_IS_FILTER(bev))
+		return NULL;
+	bev_f = (void*)( ((char*)bev) -
+			 evutil_offsetof(struct bufferevent_filtered, bev.bev));
+	EVUTIL_ASSERT(BEV_IS_FILTER(&bev_f->bev.bev));
+	return bev_f;
+}
+
+#define downcast(bev_f) (&(bev_f)->bev.bev)
+
+/** Return 1 iff bevf's underlying bufferevent's output buffer is at or
+ * over its high watermark such that we should not write to it in a given
+ * flush mode. */
+static int
+be_underlying_writebuf_full(struct bufferevent_filtered *bevf,
+    enum bufferevent_flush_mode state)
+{
+	struct bufferevent *u = bevf->underlying;
+	return state == BEV_NORMAL &&
+	    u->wm_write.high &&
+	    evbuffer_get_length(u->output) >= u->wm_write.high;
+}
+
+/** Return 1 if our input buffer is at or over its high watermark such that we
+ * should not write to it in a given flush mode. */
+static int
+be_readbuf_full(struct bufferevent_filtered *bevf,
+    enum bufferevent_flush_mode state)
+{
+	struct bufferevent *bufev = downcast(bevf);
+	return state == BEV_NORMAL &&
+	    bufev->wm_read.high &&
+	    evbuffer_get_length(bufev->input) >= bufev->wm_read.high;
+}
+
+
+/* Filter to use when we're created with a NULL filter. */
+static enum bufferevent_filter_result
+be_null_filter(struct evbuffer *src, struct evbuffer *dst, ev_ssize_t lim,
+	       enum bufferevent_flush_mode state, void *ctx)
+{
+	(void)state;
+	if (evbuffer_remove_buffer(src, dst, lim) >= 0)
+		return BEV_OK;
+	else
+		return BEV_ERROR;
+}
+
+struct bufferevent *
+bufferevent_filter_new(struct bufferevent *underlying,
+		       bufferevent_filter_cb input_filter,
+		       bufferevent_filter_cb output_filter,
+		       int options,
+		       void (*free_context)(void *),
+		       void *ctx)
+{
+	struct bufferevent_filtered *bufev_f;
+	int tmp_options = options & ~BEV_OPT_THREADSAFE;
+
+	if (!underlying)
+		return NULL;
+
+	if (!input_filter)
+		input_filter = be_null_filter;
+	if (!output_filter)
+		output_filter = be_null_filter;
+
+	bufev_f = mm_calloc(1, sizeof(struct bufferevent_filtered));
+	if (!bufev_f)
+		return NULL;
+
+	if (bufferevent_init_common_(&bufev_f->bev, underlying->ev_base,
+				    &bufferevent_ops_filter, tmp_options) < 0) {
+		mm_free(bufev_f);
+		return NULL;
+	}
+	if (options & BEV_OPT_THREADSAFE) {
+		bufferevent_enable_locking_(downcast(bufev_f), NULL);
+	}
+
+	bufev_f->underlying = underlying;
+
+	bufev_f->process_in = input_filter;
+	bufev_f->process_out = output_filter;
+	bufev_f->free_context = free_context;
+	bufev_f->context = ctx;
+
+	bufferevent_setcb(bufev_f->underlying,
+	    be_filter_readcb, be_filter_writecb, be_filter_eventcb, bufev_f);
+
+	bufev_f->inbuf_cb = evbuffer_add_cb(downcast(bufev_f)->input,
+		bufferevent_filtered_inbuf_cb, bufev_f);
+	evbuffer_cb_clear_flags(downcast(bufev_f)->input, bufev_f->inbuf_cb,
+		EVBUFFER_CB_ENABLED);
+
+	bufev_f->outbuf_cb = evbuffer_add_cb(downcast(bufev_f)->output,
+	   bufferevent_filtered_outbuf_cb, bufev_f);
+
+	bufferevent_init_generic_timeout_cbs_(downcast(bufev_f));
+	bufferevent_incref_(underlying);
+
+	bufferevent_enable(underlying, EV_READ|EV_WRITE);
+	bufferevent_suspend_read_(underlying, BEV_SUSPEND_FILT_READ);
+
+	return downcast(bufev_f);
+}
+
+static void
+be_filter_unlink(struct bufferevent *bev)
+{
+	struct bufferevent_filtered *bevf = upcast(bev);
+	EVUTIL_ASSERT(bevf);
+
+	if (bevf->bev.options & BEV_OPT_CLOSE_ON_FREE) {
+		/* Yes, there is also a decref in bufferevent_decref_.
+		 * That decref corresponds to the incref when we set
+		 * underlying for the first time.  This decref is an
+		 * extra one to remove the last reference.
+		 */
+		if (BEV_UPCAST(bevf->underlying)->refcnt < 2) {
+			event_warnx("BEV_OPT_CLOSE_ON_FREE set on an "
+			    "bufferevent with too few references");
+		} else {
+			bufferevent_free(bevf->underlying);
+		}
+	} else {
+		if (bevf->underlying) {
+			if (bevf->underlying->errorcb == be_filter_eventcb)
+				bufferevent_setcb(bevf->underlying,
+				    NULL, NULL, NULL, NULL);
+			bufferevent_unsuspend_read_(bevf->underlying,
+			    BEV_SUSPEND_FILT_READ);
+		}
+	}
+}
+
+static void
+be_filter_destruct(struct bufferevent *bev)
+{
+	struct bufferevent_filtered *bevf = upcast(bev);
+	EVUTIL_ASSERT(bevf);
+	if (bevf->free_context)
+		bevf->free_context(bevf->context);
+
+	if (bevf->inbuf_cb)
+		evbuffer_remove_cb_entry(bev->input, bevf->inbuf_cb);
+
+	if (bevf->outbuf_cb)
+		evbuffer_remove_cb_entry(bev->output, bevf->outbuf_cb);
+}
+
+static int
+be_filter_enable(struct bufferevent *bev, short event)
+{
+	struct bufferevent_filtered *bevf = upcast(bev);
+	if (event & EV_WRITE)
+		BEV_RESET_GENERIC_WRITE_TIMEOUT(bev);
+
+	if (event & EV_READ) {
+		BEV_RESET_GENERIC_READ_TIMEOUT(bev);
+		bufferevent_unsuspend_read_(bevf->underlying,
+		    BEV_SUSPEND_FILT_READ);
+	}
+	return 0;
+}
+
+static int
+be_filter_disable(struct bufferevent *bev, short event)
+{
+	struct bufferevent_filtered *bevf = upcast(bev);
+	if (event & EV_WRITE)
+		BEV_DEL_GENERIC_WRITE_TIMEOUT(bev);
+	if (event & EV_READ) {
+		BEV_DEL_GENERIC_READ_TIMEOUT(bev);
+		bufferevent_suspend_read_(bevf->underlying,
+		    BEV_SUSPEND_FILT_READ);
+	}
+	return 0;
+}
+
+static enum bufferevent_filter_result
+be_filter_process_input(struct bufferevent_filtered *bevf,
+			enum bufferevent_flush_mode state,
+			int *processed_out)
+{
+	enum bufferevent_filter_result res;
+	struct bufferevent *bev = downcast(bevf);
+
+	if (state == BEV_NORMAL) {
+		/* If we're in 'normal' mode, don't urge data on the filter
+		 * unless we're reading data and under our high-water mark.*/
+		if (!(bev->enabled & EV_READ) ||
+		    be_readbuf_full(bevf, state))
+			return BEV_OK;
+	}
+
+	do {
+		ev_ssize_t limit = -1;
+		if (state == BEV_NORMAL && bev->wm_read.high)
+			limit = bev->wm_read.high -
+			    evbuffer_get_length(bev->input);
+
+		res = bevf->process_in(bevf->underlying->input,
+		    bev->input, limit, state, bevf->context);
+
+		if (res == BEV_OK)
+			*processed_out = 1;
+	} while (res == BEV_OK &&
+		 (bev->enabled & EV_READ) &&
+		 evbuffer_get_length(bevf->underlying->input) &&
+		 !be_readbuf_full(bevf, state));
+
+	if (*processed_out)
+		BEV_RESET_GENERIC_READ_TIMEOUT(bev);
+
+	return res;
+}
+
+
+static enum bufferevent_filter_result
+be_filter_process_output(struct bufferevent_filtered *bevf,
+			 enum bufferevent_flush_mode state,
+			 int *processed_out)
+{
+	/* Requires references and lock: might call writecb */
+	enum bufferevent_filter_result res = BEV_OK;
+	struct bufferevent *bufev = downcast(bevf);
+	int again = 0;
+
+	if (state == BEV_NORMAL) {
+		/* If we're in 'normal' mode, don't urge data on the
+		 * filter unless we're writing data, and the underlying
+		 * bufferevent is accepting data, and we have data to
+		 * give the filter.  If we're in 'flush' or 'finish',
+		 * call the filter no matter what. */
+		if (!(bufev->enabled & EV_WRITE) ||
+		    be_underlying_writebuf_full(bevf, state) ||
+		    !evbuffer_get_length(bufev->output))
+			return BEV_OK;
+	}
+
+	/* disable the callback that calls this function
+	   when the user adds to the output buffer. */
+	evbuffer_cb_clear_flags(bufev->output, bevf->outbuf_cb,
+	    EVBUFFER_CB_ENABLED);
+
+	do {
+		int processed = 0;
+		again = 0;
+
+		do {
+			ev_ssize_t limit = -1;
+			if (state == BEV_NORMAL &&
+			    bevf->underlying->wm_write.high)
+				limit = bevf->underlying->wm_write.high -
+				    evbuffer_get_length(bevf->underlying->output);
+
+			res = bevf->process_out(downcast(bevf)->output,
+			    bevf->underlying->output,
+			    limit,
+			    state,
+			    bevf->context);
+
+			if (res == BEV_OK)
+				processed = *processed_out = 1;
+		} while (/* Stop if the filter wasn't successful...*/
+			res == BEV_OK &&
+			/* Or if we aren't writing any more. */
+			(bufev->enabled & EV_WRITE) &&
+			/* Of if we have nothing more to write and we are
+			 * not flushing. */
+			evbuffer_get_length(bufev->output) &&
+			/* Or if we have filled the underlying output buffer. */
+			!be_underlying_writebuf_full(bevf,state));
+
+		if (processed) {
+			/* call the write callback.*/
+			bufferevent_trigger_nolock_(bufev, EV_WRITE, 0);
+
+			if (res == BEV_OK &&
+			    (bufev->enabled & EV_WRITE) &&
+			    evbuffer_get_length(bufev->output) &&
+			    !be_underlying_writebuf_full(bevf, state)) {
+				again = 1;
+			}
+		}
+	} while (again);
+
+	/* reenable the outbuf_cb */
+	evbuffer_cb_set_flags(bufev->output,bevf->outbuf_cb,
+	    EVBUFFER_CB_ENABLED);
+
+	if (*processed_out)
+		BEV_RESET_GENERIC_WRITE_TIMEOUT(bufev);
+
+	return res;
+}
+
+/* Called when the size of our outbuf changes. */
+static void
+bufferevent_filtered_outbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo, void *arg)
+{
+	struct bufferevent_filtered *bevf = arg;
+	struct bufferevent *bev = downcast(bevf);
+
+	if (cbinfo->n_added) {
+		int processed_any = 0;
+		/* Somebody added more data to the output buffer. Try to
+		 * process it, if we should. */
+		bufferevent_incref_and_lock_(bev);
+		be_filter_process_output(bevf, BEV_NORMAL, &processed_any);
+		bufferevent_decref_and_unlock_(bev);
+	}
+}
+
+static void
+be_filter_read_nolock_(struct bufferevent *underlying, void *me_)
+{
+	struct bufferevent_filtered *bevf = me_;
+	enum bufferevent_filter_result res;
+	enum bufferevent_flush_mode state;
+	struct bufferevent *bufev = downcast(bevf);
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bufev);
+	int processed_any = 0;
+
+	// It's possible our refcount is 0 at this point if another thread free'd our filterevent
+	EVUTIL_ASSERT(bufev_private->refcnt >= 0);
+
+	// If our refcount is > 0
+	if (bufev_private->refcnt > 0) {
+
+		if (bevf->got_eof)
+			state = BEV_FINISHED;
+		else
+			state = BEV_NORMAL;
+
+		/* XXXX use return value */
+		res = be_filter_process_input(bevf, state, &processed_any);
+		(void)res;
+
+		/* XXX This should be in process_input, not here.  There are
+		 * other places that can call process-input, and they should
+		 * force readcb calls as needed. */
+		if (processed_any) {
+			bufferevent_trigger_nolock_(bufev, EV_READ, 0);
+			if (evbuffer_get_length(underlying->input) > 0 &&
+				be_readbuf_full(bevf, state)) {
+				/* data left in underlying buffer and filter input buffer
+				 * hit its read high watermark.
+				 * Schedule callback to avoid data gets stuck in underlying
+				 * input buffer.
+				 */
+				evbuffer_cb_set_flags(bufev->input, bevf->inbuf_cb,
+					EVBUFFER_CB_ENABLED);
+			}
+		}
+	}
+}
+
+/* Called when the size of our inbuf changes. */
+static void
+bufferevent_filtered_inbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo, void *arg)
+{
+	struct bufferevent_filtered *bevf = arg;
+	enum bufferevent_flush_mode state;
+	struct bufferevent *bev = downcast(bevf);
+
+	BEV_LOCK(bev);
+
+	if (bevf->got_eof)
+		state = BEV_FINISHED;
+	else
+		state = BEV_NORMAL;
+
+
+	if (!be_readbuf_full(bevf, state)) {
+		/* opportunity to read data which was left in underlying
+		 * input buffer because filter input buffer hit read
+		 * high watermark.
+		 */
+		evbuffer_cb_clear_flags(bev->input, bevf->inbuf_cb,
+			EVBUFFER_CB_ENABLED);
+		if (evbuffer_get_length(bevf->underlying->input) > 0)
+			be_filter_read_nolock_(bevf->underlying, bevf);
+	}
+
+	BEV_UNLOCK(bev);
+}
+
+/* Called when the underlying socket has read. */
+static void
+be_filter_readcb(struct bufferevent *underlying, void *me_)
+{
+	struct bufferevent_filtered *bevf = me_;
+	struct bufferevent *bev = downcast(bevf);
+
+	BEV_LOCK(bev);
+
+	be_filter_read_nolock_(underlying, me_);
+
+	BEV_UNLOCK(bev);
+}
+
+/* Called when the underlying socket has drained enough that we can write to
+   it. */
+static void
+be_filter_writecb(struct bufferevent *underlying, void *me_)
+{
+	struct bufferevent_filtered *bevf = me_;
+	struct bufferevent *bev = downcast(bevf);
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bev);
+	int processed_any = 0;
+
+	BEV_LOCK(bev);
+
+	// It's possible our refcount is 0 at this point if another thread free'd our filterevent
+	EVUTIL_ASSERT(bufev_private->refcnt >= 0);
+
+	// If our refcount is > 0
+	if (bufev_private->refcnt > 0) {
+		be_filter_process_output(bevf, BEV_NORMAL, &processed_any);
+	}
+
+	BEV_UNLOCK(bev);
+}
+
+/* Called when the underlying socket has given us an error */
+static void
+be_filter_eventcb(struct bufferevent *underlying, short what, void *me_)
+{
+	struct bufferevent_filtered *bevf = me_;
+	struct bufferevent *bev = downcast(bevf);
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bev);
+
+	BEV_LOCK(bev);
+
+	// It's possible our refcount is 0 at this point if another thread free'd our filterevent
+	EVUTIL_ASSERT(bufev_private->refcnt >= 0);
+
+	// If our refcount is > 0
+	if (bufev_private->refcnt > 0) {
+
+		/* All we can really to is tell our own eventcb. */
+		bufferevent_run_eventcb_(bev, what, 0);
+	}
+
+	BEV_UNLOCK(bev);
+}
+
+static int
+be_filter_flush(struct bufferevent *bufev,
+    short iotype, enum bufferevent_flush_mode mode)
+{
+	struct bufferevent_filtered *bevf = upcast(bufev);
+	int processed_any = 0;
+	EVUTIL_ASSERT(bevf);
+
+	bufferevent_incref_and_lock_(bufev);
+
+	if (iotype & EV_READ) {
+		be_filter_process_input(bevf, mode, &processed_any);
+	}
+	if (iotype & EV_WRITE) {
+		be_filter_process_output(bevf, mode, &processed_any);
+	}
+	/* XXX check the return value? */
+	/* XXX does this want to recursively call lower-level flushes? */
+	bufferevent_flush(bevf->underlying, iotype, mode);
+
+	bufferevent_decref_and_unlock_(bufev);
+
+	return processed_any;
+}
+
+static int
+be_filter_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op,
+    union bufferevent_ctrl_data *data)
+{
+	struct bufferevent_filtered *bevf;
+	switch (op) {
+	case BEV_CTRL_GET_UNDERLYING:
+		bevf = upcast(bev);
+		data->ptr = bevf->underlying;
+		return 0;
+	case BEV_CTRL_SET_FD:
+	case BEV_CTRL_GET_FD:
+		bevf = upcast(bev);
+
+		if (bevf->underlying &&
+			bevf->underlying->be_ops &&
+			bevf->underlying->be_ops->ctrl) {
+		    return (bevf->underlying->be_ops->ctrl)(bevf->underlying, op, data);
+		}
+		EVUTIL_FALLTHROUGH;
+
+	case BEV_CTRL_CANCEL_ALL:
+		EVUTIL_FALLTHROUGH;
+	default:
+		return -1;
+	}
+
+	return -1;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_openssl.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_openssl.c
new file mode 100644
index 000000000000..b51b834bca7f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_openssl.c
@@ -0,0 +1,1524 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+// Get rid of OSX 10.7 and greater deprecation warnings.
+#if defined(__APPLE__) && defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/bufferevent_ssl.h"
+#include "event2/buffer.h"
+#include "event2/event.h"
+
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+#include "log-internal.h"
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include "openssl-compat.h"
+
+/*
+ * Define an OpenSSL bio that targets a bufferevent.
+ */
+
+/* --------------------
+   A BIO is an OpenSSL abstraction that handles reading and writing data.  The
+   library will happily speak SSL over anything that implements a BIO
+   interface.
+
+   Here we define a BIO implementation that directs its output to a
+   bufferevent.  We'll want to use this only when none of OpenSSL's built-in
+   IO mechanisms work for us.
+   -------------------- */
+
+/* every BIO type needs its own integer type value. */
+#define BIO_TYPE_LIBEVENT 57
+/* ???? Arguably, we should set BIO_TYPE_FILTER or BIO_TYPE_SOURCE_SINK on
+ * this. */
+
+#if 0
+static void
+print_err(int val)
+{
+	int err;
+	printf("Error was %d\n", val);
+
+	while ((err = ERR_get_error())) {
+		const char *msg = (const char*)ERR_reason_error_string(err);
+		const char *lib = (const char*)ERR_lib_error_string(err);
+		const char *func = (const char*)ERR_func_error_string(err);
+
+		printf("%s in %s %s\n", msg, lib, func);
+	}
+}
+#else
+#define print_err(v) ((void)0)
+#endif
+
+/* Called to initialize a new BIO */
+static int
+bio_bufferevent_new(BIO *b)
+{
+	BIO_set_init(b, 0);
+	BIO_set_data(b, NULL); /* We'll be putting the bufferevent in this field.*/
+	return 1;
+}
+
+/* Called to uninitialize the BIO. */
+static int
+bio_bufferevent_free(BIO *b)
+{
+	if (!b)
+		return 0;
+	if (BIO_get_shutdown(b)) {
+		if (BIO_get_init(b) && BIO_get_data(b))
+			bufferevent_free(BIO_get_data(b));
+		BIO_free(b);
+	}
+	return 1;
+}
+
+/* Called to extract data from the BIO. */
+static int
+bio_bufferevent_read(BIO *b, char *out, int outlen)
+{
+	int r = 0;
+	struct evbuffer *input;
+
+	BIO_clear_retry_flags(b);
+
+	if (!out)
+		return 0;
+	if (!BIO_get_data(b))
+		return -1;
+
+	input = bufferevent_get_input(BIO_get_data(b));
+	if (evbuffer_get_length(input) == 0) {
+		/* If there's no data to read, say so. */
+		BIO_set_retry_read(b);
+		return -1;
+	} else {
+		r = evbuffer_remove(input, out, outlen);
+	}
+
+	return r;
+}
+
+/* Called to write data into the BIO */
+static int
+bio_bufferevent_write(BIO *b, const char *in, int inlen)
+{
+	struct bufferevent *bufev = BIO_get_data(b);
+	struct evbuffer *output;
+	size_t outlen;
+
+	BIO_clear_retry_flags(b);
+
+	if (!BIO_get_data(b))
+		return -1;
+
+	output = bufferevent_get_output(bufev);
+	outlen = evbuffer_get_length(output);
+
+	/* Copy only as much data onto the output buffer as can fit under the
+	 * high-water mark. */
+	if (bufev->wm_write.high && bufev->wm_write.high <= (outlen+inlen)) {
+		if (bufev->wm_write.high <= outlen) {
+			/* If no data can fit, we'll need to retry later. */
+			BIO_set_retry_write(b);
+			return -1;
+		}
+		inlen = bufev->wm_write.high - outlen;
+	}
+
+	EVUTIL_ASSERT(inlen > 0);
+	evbuffer_add(output, in, inlen);
+	return inlen;
+}
+
+/* Called to handle various requests */
+static long
+bio_bufferevent_ctrl(BIO *b, int cmd, long num, void *ptr)
+{
+	struct bufferevent *bufev = BIO_get_data(b);
+	long ret = 1;
+
+	switch (cmd) {
+	case BIO_CTRL_GET_CLOSE:
+		ret = BIO_get_shutdown(b);
+		break;
+	case BIO_CTRL_SET_CLOSE:
+		BIO_set_shutdown(b, (int)num);
+		break;
+	case BIO_CTRL_PENDING:
+		ret = evbuffer_get_length(bufferevent_get_input(bufev)) != 0;
+		break;
+	case BIO_CTRL_WPENDING:
+		ret = evbuffer_get_length(bufferevent_get_output(bufev)) != 0;
+		break;
+	/* XXXX These two are given a special-case treatment because
+	 * of cargo-cultism.  I should come up with a better reason. */
+	case BIO_CTRL_DUP:
+	case BIO_CTRL_FLUSH:
+		ret = 1;
+		break;
+	default:
+		ret = 0;
+		break;
+	}
+	return ret;
+}
+
+/* Called to write a string to the BIO */
+static int
+bio_bufferevent_puts(BIO *b, const char *s)
+{
+	return bio_bufferevent_write(b, s, strlen(s));
+}
+
+/* Method table for the bufferevent BIO */
+static BIO_METHOD *methods_bufferevent;
+
+/* Return the method table for the bufferevents BIO */
+static BIO_METHOD *
+BIO_s_bufferevent(void)
+{
+	if (methods_bufferevent == NULL) {
+		methods_bufferevent = BIO_meth_new(BIO_TYPE_LIBEVENT, "bufferevent");
+		if (methods_bufferevent == NULL)
+			return NULL;
+		BIO_meth_set_write(methods_bufferevent, bio_bufferevent_write);
+		BIO_meth_set_read(methods_bufferevent, bio_bufferevent_read);
+		BIO_meth_set_puts(methods_bufferevent, bio_bufferevent_puts);
+		BIO_meth_set_ctrl(methods_bufferevent, bio_bufferevent_ctrl);
+		BIO_meth_set_create(methods_bufferevent, bio_bufferevent_new);
+		BIO_meth_set_destroy(methods_bufferevent, bio_bufferevent_free);
+	}
+	return methods_bufferevent;
+}
+
+/* Create a new BIO to wrap communication around a bufferevent.  If close_flag
+ * is true, the bufferevent will be freed when the BIO is closed. */
+static BIO *
+BIO_new_bufferevent(struct bufferevent *bufferevent)
+{
+	BIO *result;
+	if (!bufferevent)
+		return NULL;
+	if (!(result = BIO_new(BIO_s_bufferevent())))
+		return NULL;
+	BIO_set_init(result, 1);
+	BIO_set_data(result, bufferevent);
+	/* We don't tell the BIO to close the bufferevent; we do it ourselves on
+	 * be_openssl_destruct() */
+	BIO_set_shutdown(result, 0);
+	return result;
+}
+
+/* --------------------
+   Now, here's the OpenSSL-based implementation of bufferevent.
+
+   The implementation comes in two flavors: one that connects its SSL object
+   to an underlying bufferevent using a BIO_bufferevent, and one that has the
+   SSL object connect to a socket directly.  The latter should generally be
+   faster, except on Windows, where your best bet is using a
+   bufferevent_async.
+
+   (OpenSSL supports many other BIO types, too.  But we can't use any unless
+   we have a good way to get notified when they become readable/writable.)
+   -------------------- */
+
+struct bio_data_counts {
+	unsigned long n_written;
+	unsigned long n_read;
+};
+
+struct bufferevent_openssl {
+	/* Shared fields with common bufferevent implementation code.
+	   If we were set up with an underlying bufferevent, we use the
+	   events here as timers only.  If we have an SSL, then we use
+	   the events as socket events.
+	 */
+	struct bufferevent_private bev;
+	/* An underlying bufferevent that we're directing our output to.
+	   If it's NULL, then we're connected to an fd, not an evbuffer. */
+	struct bufferevent *underlying;
+	/* The SSL object doing our encryption. */
+	SSL *ssl;
+
+	/* A callback that's invoked when data arrives on our outbuf so we
+	   know to write data to the SSL. */
+	struct evbuffer_cb_entry *outbuf_cb;
+
+	/* A count of how much data the bios have read/written total.  Used
+	   for rate-limiting. */
+	struct bio_data_counts counts;
+
+	/* If this value is greater than 0, then the last SSL_write blocked,
+	 * and we need to try it again with this many bytes. */
+	ev_ssize_t last_write;
+
+#define NUM_ERRORS 3
+	ev_uint32_t errors[NUM_ERRORS];
+
+	/* When we next get available space, we should say "read" instead of
+	   "write". This can happen if there's a renegotiation during a read
+	   operation. */
+	unsigned read_blocked_on_write : 1;
+	/* When we next get data, we should say "write" instead of "read". */
+	unsigned write_blocked_on_read : 1;
+	/* Treat TCP close before SSL close on SSL >= v3 as clean EOF. */
+	unsigned allow_dirty_shutdown : 1;
+	/* XXX */
+	unsigned n_errors : 2;
+
+	/* Are we currently connecting, accepting, or doing IO? */
+	unsigned state : 2;
+	/* If we reset fd, we sould reset state too */
+	unsigned old_state : 2;
+};
+
+static int be_openssl_enable(struct bufferevent *, short);
+static int be_openssl_disable(struct bufferevent *, short);
+static void be_openssl_unlink(struct bufferevent *);
+static void be_openssl_destruct(struct bufferevent *);
+static int be_openssl_adj_timeouts(struct bufferevent *);
+static int be_openssl_flush(struct bufferevent *bufev,
+    short iotype, enum bufferevent_flush_mode mode);
+static int be_openssl_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
+
+const struct bufferevent_ops bufferevent_ops_openssl = {
+	"ssl",
+	evutil_offsetof(struct bufferevent_openssl, bev.bev),
+	be_openssl_enable,
+	be_openssl_disable,
+	be_openssl_unlink,
+	be_openssl_destruct,
+	be_openssl_adj_timeouts,
+	be_openssl_flush,
+	be_openssl_ctrl,
+};
+
+/* Given a bufferevent, return a pointer to the bufferevent_openssl that
+ * contains it, if any. */
+static inline struct bufferevent_openssl *
+upcast(struct bufferevent *bev)
+{
+	struct bufferevent_openssl *bev_o;
+	if (!BEV_IS_OPENSSL(bev))
+		return NULL;
+	bev_o = (void*)( ((char*)bev) -
+			 evutil_offsetof(struct bufferevent_openssl, bev.bev));
+	EVUTIL_ASSERT(BEV_IS_OPENSSL(&bev_o->bev.bev));
+	return bev_o;
+}
+
+static inline void
+put_error(struct bufferevent_openssl *bev_ssl, unsigned long err)
+{
+	if (bev_ssl->n_errors == NUM_ERRORS)
+		return;
+	/* The error type according to openssl is "unsigned long", but
+	   openssl never uses more than 32 bits of it.  It _can't_ use more
+	   than 32 bits of it, since it needs to report errors on systems
+	   where long is only 32 bits.
+	 */
+	bev_ssl->errors[bev_ssl->n_errors++] = (ev_uint32_t) err;
+}
+
+/* Have the base communications channel (either the underlying bufferevent or
+ * ev_read and ev_write) start reading.  Take the read-blocked-on-write flag
+ * into account. */
+static int
+start_reading(struct bufferevent_openssl *bev_ssl)
+{
+	if (bev_ssl->underlying) {
+		bufferevent_unsuspend_read_(bev_ssl->underlying,
+		    BEV_SUSPEND_FILT_READ);
+		return 0;
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		int r;
+		r = bufferevent_add_event_(&bev->ev_read, &bev->timeout_read);
+		if (r == 0 && bev_ssl->read_blocked_on_write)
+			r = bufferevent_add_event_(&bev->ev_write,
+			    &bev->timeout_write);
+		return r;
+	}
+}
+
+/* Have the base communications channel (either the underlying bufferevent or
+ * ev_read and ev_write) start writing.  Take the write-blocked-on-read flag
+ * into account. */
+static int
+start_writing(struct bufferevent_openssl *bev_ssl)
+{
+	int r = 0;
+	if (bev_ssl->underlying) {
+		if (bev_ssl->write_blocked_on_read) {
+			bufferevent_unsuspend_read_(bev_ssl->underlying,
+			    BEV_SUSPEND_FILT_READ);
+		}
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		r = bufferevent_add_event_(&bev->ev_write, &bev->timeout_write);
+		if (!r && bev_ssl->write_blocked_on_read)
+			r = bufferevent_add_event_(&bev->ev_read,
+			    &bev->timeout_read);
+	}
+	return r;
+}
+
+static void
+stop_reading(struct bufferevent_openssl *bev_ssl)
+{
+	if (bev_ssl->write_blocked_on_read)
+		return;
+	if (bev_ssl->underlying) {
+		bufferevent_suspend_read_(bev_ssl->underlying,
+		    BEV_SUSPEND_FILT_READ);
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		event_del(&bev->ev_read);
+	}
+}
+
+static void
+stop_writing(struct bufferevent_openssl *bev_ssl)
+{
+	if (bev_ssl->read_blocked_on_write)
+		return;
+	if (bev_ssl->underlying) {
+		bufferevent_unsuspend_read_(bev_ssl->underlying,
+		    BEV_SUSPEND_FILT_READ);
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		event_del(&bev->ev_write);
+	}
+}
+
+static int
+set_rbow(struct bufferevent_openssl *bev_ssl)
+{
+	if (!bev_ssl->underlying)
+		stop_reading(bev_ssl);
+	bev_ssl->read_blocked_on_write = 1;
+	return start_writing(bev_ssl);
+}
+
+static int
+set_wbor(struct bufferevent_openssl *bev_ssl)
+{
+	if (!bev_ssl->underlying)
+		stop_writing(bev_ssl);
+	bev_ssl->write_blocked_on_read = 1;
+	return start_reading(bev_ssl);
+}
+
+static int
+clear_rbow(struct bufferevent_openssl *bev_ssl)
+{
+	struct bufferevent *bev = &bev_ssl->bev.bev;
+	int r = 0;
+	bev_ssl->read_blocked_on_write = 0;
+	if (!(bev->enabled & EV_WRITE))
+		stop_writing(bev_ssl);
+	if (bev->enabled & EV_READ)
+		r = start_reading(bev_ssl);
+	return r;
+}
+
+
+static int
+clear_wbor(struct bufferevent_openssl *bev_ssl)
+{
+	struct bufferevent *bev = &bev_ssl->bev.bev;
+	int r = 0;
+	bev_ssl->write_blocked_on_read = 0;
+	if (!(bev->enabled & EV_READ))
+		stop_reading(bev_ssl);
+	if (bev->enabled & EV_WRITE)
+		r = start_writing(bev_ssl);
+	return r;
+}
+
+static void
+conn_closed(struct bufferevent_openssl *bev_ssl, int when, int errcode, int ret)
+{
+	int event = BEV_EVENT_ERROR;
+	int dirty_shutdown = 0;
+	unsigned long err;
+
+	switch (errcode) {
+	case SSL_ERROR_ZERO_RETURN:
+		/* Possibly a clean shutdown. */
+		if (SSL_get_shutdown(bev_ssl->ssl) & SSL_RECEIVED_SHUTDOWN)
+			event = BEV_EVENT_EOF;
+		else
+			dirty_shutdown = 1;
+		break;
+	case SSL_ERROR_SYSCALL:
+		/* IO error; possibly a dirty shutdown. */
+		if ((ret == 0 || ret == -1) && ERR_peek_error() == 0)
+			dirty_shutdown = 1;
+		put_error(bev_ssl, errcode);
+		break;
+	case SSL_ERROR_SSL:
+		/* Protocol error. */
+		put_error(bev_ssl, errcode);
+		break;
+	case SSL_ERROR_WANT_X509_LOOKUP:
+		/* XXXX handle this. */
+		put_error(bev_ssl, errcode);
+		break;
+	case SSL_ERROR_NONE:
+	case SSL_ERROR_WANT_READ:
+	case SSL_ERROR_WANT_WRITE:
+	case SSL_ERROR_WANT_CONNECT:
+	case SSL_ERROR_WANT_ACCEPT:
+	default:
+		/* should be impossible; treat as normal error. */
+		event_warnx("BUG: Unexpected OpenSSL error code %d", errcode);
+		break;
+	}
+
+	while ((err = ERR_get_error())) {
+		put_error(bev_ssl, err);
+	}
+
+	if (dirty_shutdown && bev_ssl->allow_dirty_shutdown)
+		event = BEV_EVENT_EOF;
+
+	stop_reading(bev_ssl);
+	stop_writing(bev_ssl);
+
+	/* when is BEV_EVENT_{READING|WRITING} */
+	event = when | event;
+	bufferevent_run_eventcb_(&bev_ssl->bev.bev, event, 0);
+}
+
+static void
+init_bio_counts(struct bufferevent_openssl *bev_ssl)
+{
+	BIO *rbio, *wbio;
+
+	wbio = SSL_get_wbio(bev_ssl->ssl);
+	bev_ssl->counts.n_written = wbio ? BIO_number_written(wbio) : 0;
+	rbio = SSL_get_rbio(bev_ssl->ssl);
+	bev_ssl->counts.n_read = rbio ? BIO_number_read(rbio) : 0;
+}
+
+static inline void
+decrement_buckets(struct bufferevent_openssl *bev_ssl)
+{
+	unsigned long num_w = BIO_number_written(SSL_get_wbio(bev_ssl->ssl));
+	unsigned long num_r = BIO_number_read(SSL_get_rbio(bev_ssl->ssl));
+	/* These next two subtractions can wrap around. That's okay. */
+	unsigned long w = num_w - bev_ssl->counts.n_written;
+	unsigned long r = num_r - bev_ssl->counts.n_read;
+	if (w)
+		bufferevent_decrement_write_buckets_(&bev_ssl->bev, w);
+	if (r)
+		bufferevent_decrement_read_buckets_(&bev_ssl->bev, r);
+	bev_ssl->counts.n_written = num_w;
+	bev_ssl->counts.n_read = num_r;
+}
+
+#define OP_MADE_PROGRESS 1
+#define OP_BLOCKED 2
+#define OP_ERR 4
+
+/* Return a bitmask of OP_MADE_PROGRESS (if we read anything); OP_BLOCKED (if
+   we're now blocked); and OP_ERR (if an error occurred). */
+static int
+do_read(struct bufferevent_openssl *bev_ssl, int n_to_read) {
+	/* Requires lock */
+	struct bufferevent *bev = &bev_ssl->bev.bev;
+	struct evbuffer *input = bev->input;
+	int r, n, i, n_used = 0, atmost;
+	struct evbuffer_iovec space[2];
+	int result = 0;
+
+	if (bev_ssl->bev.read_suspended)
+		return 0;
+
+	atmost = bufferevent_get_read_max_(&bev_ssl->bev);
+	if (n_to_read > atmost)
+		n_to_read = atmost;
+
+	n = evbuffer_reserve_space(input, n_to_read, space, 2);
+	if (n < 0)
+		return OP_ERR;
+
+	for (i=0; i<n; ++i) {
+		if (bev_ssl->bev.read_suspended)
+			break;
+		ERR_clear_error();
+		r = SSL_read(bev_ssl->ssl, space[i].iov_base, space[i].iov_len);
+		if (r>0) {
+			result |= OP_MADE_PROGRESS;
+			if (bev_ssl->read_blocked_on_write)
+				if (clear_rbow(bev_ssl) < 0)
+					return OP_ERR | result;
+			++n_used;
+			space[i].iov_len = r;
+			decrement_buckets(bev_ssl);
+		} else {
+			int err = SSL_get_error(bev_ssl->ssl, r);
+			print_err(err);
+			switch (err) {
+			case SSL_ERROR_WANT_READ:
+				/* Can't read until underlying has more data. */
+				if (bev_ssl->read_blocked_on_write)
+					if (clear_rbow(bev_ssl) < 0)
+						return OP_ERR | result;
+				break;
+			case SSL_ERROR_WANT_WRITE:
+				/* This read operation requires a write, and the
+				 * underlying is full */
+				if (!bev_ssl->read_blocked_on_write)
+					if (set_rbow(bev_ssl) < 0)
+						return OP_ERR | result;
+				break;
+			default:
+				conn_closed(bev_ssl, BEV_EVENT_READING, err, r);
+				break;
+			}
+			result |= OP_BLOCKED;
+			break; /* out of the loop */
+		}
+	}
+
+	if (n_used) {
+		evbuffer_commit_space(input, space, n_used);
+		if (bev_ssl->underlying)
+			BEV_RESET_GENERIC_READ_TIMEOUT(bev);
+	}
+
+	return result;
+}
+
+/* Return a bitmask of OP_MADE_PROGRESS (if we wrote anything); OP_BLOCKED (if
+   we're now blocked); and OP_ERR (if an error occurred). */
+static int
+do_write(struct bufferevent_openssl *bev_ssl, int atmost)
+{
+	int i, r, n, n_written = 0;
+	struct bufferevent *bev = &bev_ssl->bev.bev;
+	struct evbuffer *output = bev->output;
+	struct evbuffer_iovec space[8];
+	int result = 0;
+
+	if (bev_ssl->last_write > 0)
+		atmost = bev_ssl->last_write;
+	else
+		atmost = bufferevent_get_write_max_(&bev_ssl->bev);
+
+	n = evbuffer_peek(output, atmost, NULL, space, 8);
+	if (n < 0)
+		return OP_ERR | result;
+
+	if (n > 8)
+		n = 8;
+	for (i=0; i < n; ++i) {
+		if (bev_ssl->bev.write_suspended)
+			break;
+
+		/* SSL_write will (reasonably) return 0 if we tell it to
+		   send 0 data.  Skip this case so we don't interpret the
+		   result as an error */
+		if (space[i].iov_len == 0)
+			continue;
+
+		ERR_clear_error();
+		r = SSL_write(bev_ssl->ssl, space[i].iov_base,
+		    space[i].iov_len);
+		if (r > 0) {
+			result |= OP_MADE_PROGRESS;
+			if (bev_ssl->write_blocked_on_read)
+				if (clear_wbor(bev_ssl) < 0)
+					return OP_ERR | result;
+			n_written += r;
+			bev_ssl->last_write = -1;
+			decrement_buckets(bev_ssl);
+		} else {
+			int err = SSL_get_error(bev_ssl->ssl, r);
+			print_err(err);
+			switch (err) {
+			case SSL_ERROR_WANT_WRITE:
+				/* Can't read until underlying has more data. */
+				if (bev_ssl->write_blocked_on_read)
+					if (clear_wbor(bev_ssl) < 0)
+						return OP_ERR | result;
+				bev_ssl->last_write = space[i].iov_len;
+				break;
+			case SSL_ERROR_WANT_READ:
+				/* This read operation requires a write, and the
+				 * underlying is full */
+				if (!bev_ssl->write_blocked_on_read)
+					if (set_wbor(bev_ssl) < 0)
+						return OP_ERR | result;
+				bev_ssl->last_write = space[i].iov_len;
+				break;
+			default:
+				conn_closed(bev_ssl, BEV_EVENT_WRITING, err, r);
+				bev_ssl->last_write = -1;
+				break;
+			}
+			result |= OP_BLOCKED;
+			break;
+		}
+	}
+	if (n_written) {
+		evbuffer_drain(output, n_written);
+		if (bev_ssl->underlying)
+			BEV_RESET_GENERIC_WRITE_TIMEOUT(bev);
+
+		bufferevent_trigger_nolock_(bev, EV_WRITE, BEV_OPT_DEFER_CALLBACKS);
+	}
+	return result;
+}
+
+#define WRITE_FRAME 15000
+
+#define READ_DEFAULT 4096
+
+/* Try to figure out how many bytes to read; return 0 if we shouldn't be
+ * reading. */
+static int
+bytes_to_read(struct bufferevent_openssl *bev)
+{
+	struct evbuffer *input = bev->bev.bev.input;
+	struct event_watermark *wm = &bev->bev.bev.wm_read;
+	int result = READ_DEFAULT;
+	ev_ssize_t limit;
+	/* XXX 99% of this is generic code that nearly all bufferevents will
+	 * want. */
+
+	if (bev->write_blocked_on_read) {
+		return 0;
+	}
+
+	if (! (bev->bev.bev.enabled & EV_READ)) {
+		return 0;
+	}
+
+	if (bev->bev.read_suspended) {
+		return 0;
+	}
+
+	if (wm->high) {
+		if (evbuffer_get_length(input) >= wm->high) {
+			return 0;
+		}
+
+		result = wm->high - evbuffer_get_length(input);
+	} else {
+		result = READ_DEFAULT;
+	}
+
+	/* Respect the rate limit */
+	limit = bufferevent_get_read_max_(&bev->bev);
+	if (result > limit) {
+		result = limit;
+	}
+
+	return result;
+}
+
+
+/* Things look readable.  If write is blocked on read, write till it isn't.
+ * Read from the underlying buffer until we block or we hit our high-water
+ * mark.
+ */
+static void
+consider_reading(struct bufferevent_openssl *bev_ssl)
+{
+	int r;
+	int n_to_read;
+	int all_result_flags = 0;
+
+	while (bev_ssl->write_blocked_on_read) {
+		r = do_write(bev_ssl, WRITE_FRAME);
+		if (r & (OP_BLOCKED|OP_ERR))
+			break;
+	}
+	if (bev_ssl->write_blocked_on_read)
+		return;
+
+	n_to_read = bytes_to_read(bev_ssl);
+
+	while (n_to_read) {
+		r = do_read(bev_ssl, n_to_read);
+		all_result_flags |= r;
+
+		if (r & (OP_BLOCKED|OP_ERR))
+			break;
+
+		if (bev_ssl->bev.read_suspended)
+			break;
+
+		/* Read all pending data.  This won't hit the network
+		 * again, and will (most importantly) put us in a state
+		 * where we don't need to read anything else until the
+		 * socket is readable again.  It'll potentially make us
+		 * overrun our read high-watermark (somewhat
+		 * regrettable).  The damage to the rate-limit has
+		 * already been done, since OpenSSL went and read a
+		 * whole SSL record anyway. */
+		n_to_read = SSL_pending(bev_ssl->ssl);
+
+		/* XXX This if statement is actually a bad bug, added to avoid
+		 * XXX a worse bug.
+		 *
+		 * The bad bug: It can potentially cause resource unfairness
+		 * by reading too much data from the underlying bufferevent;
+		 * it can potentially cause read looping if the underlying
+		 * bufferevent is a bufferevent_pair and deferred callbacks
+		 * aren't used.
+		 *
+		 * The worse bug: If we didn't do this, then we would
+		 * potentially not read any more from bev_ssl->underlying
+		 * until more data arrived there, which could lead to us
+		 * waiting forever.
+		 */
+		if (!n_to_read && bev_ssl->underlying)
+			n_to_read = bytes_to_read(bev_ssl);
+	}
+
+	if (all_result_flags & OP_MADE_PROGRESS) {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+
+		bufferevent_trigger_nolock_(bev, EV_READ, 0);
+	}
+
+	if (!bev_ssl->underlying) {
+		/* Should be redundant, but let's avoid busy-looping */
+		if (bev_ssl->bev.read_suspended ||
+		    !(bev_ssl->bev.bev.enabled & EV_READ)) {
+			event_del(&bev_ssl->bev.bev.ev_read);
+		}
+	}
+}
+
+static void
+consider_writing(struct bufferevent_openssl *bev_ssl)
+{
+	int r;
+	struct evbuffer *output = bev_ssl->bev.bev.output;
+	struct evbuffer *target = NULL;
+	struct event_watermark *wm = NULL;
+
+	while (bev_ssl->read_blocked_on_write) {
+		r = do_read(bev_ssl, 1024); /* XXXX 1024 is a hack */
+		if (r & OP_MADE_PROGRESS) {
+			struct bufferevent *bev = &bev_ssl->bev.bev;
+
+			bufferevent_trigger_nolock_(bev, EV_READ, 0);
+		}
+		if (r & (OP_ERR|OP_BLOCKED))
+			break;
+	}
+	if (bev_ssl->read_blocked_on_write)
+		return;
+	if (bev_ssl->underlying) {
+		target = bev_ssl->underlying->output;
+		wm = &bev_ssl->underlying->wm_write;
+	}
+	while ((bev_ssl->bev.bev.enabled & EV_WRITE) &&
+	    (! bev_ssl->bev.write_suspended) &&
+	    evbuffer_get_length(output) &&
+	    (!target || (! wm->high || evbuffer_get_length(target) < wm->high))) {
+		int n_to_write;
+		if (wm && wm->high)
+			n_to_write = wm->high - evbuffer_get_length(target);
+		else
+			n_to_write = WRITE_FRAME;
+		r = do_write(bev_ssl, n_to_write);
+		if (r & (OP_BLOCKED|OP_ERR))
+			break;
+	}
+
+	if (!bev_ssl->underlying) {
+		if (evbuffer_get_length(output) == 0) {
+			event_del(&bev_ssl->bev.bev.ev_write);
+		} else if (bev_ssl->bev.write_suspended ||
+		    !(bev_ssl->bev.bev.enabled & EV_WRITE)) {
+			/* Should be redundant, but let's avoid busy-looping */
+			event_del(&bev_ssl->bev.bev.ev_write);
+		}
+	}
+}
+
+static void
+be_openssl_readcb(struct bufferevent *bev_base, void *ctx)
+{
+	struct bufferevent_openssl *bev_ssl = ctx;
+	consider_reading(bev_ssl);
+}
+
+static void
+be_openssl_writecb(struct bufferevent *bev_base, void *ctx)
+{
+	struct bufferevent_openssl *bev_ssl = ctx;
+	consider_writing(bev_ssl);
+}
+
+static void
+be_openssl_eventcb(struct bufferevent *bev_base, short what, void *ctx)
+{
+	struct bufferevent_openssl *bev_ssl = ctx;
+	int event = 0;
+
+	if (what & BEV_EVENT_EOF) {
+		if (bev_ssl->allow_dirty_shutdown)
+			event = BEV_EVENT_EOF;
+		else
+			event = BEV_EVENT_ERROR;
+	} else if (what & BEV_EVENT_TIMEOUT) {
+		/* We sure didn't set this.  Propagate it to the user. */
+		event = what;
+	} else if (what & BEV_EVENT_ERROR) {
+		/* An error occurred on the connection.  Propagate it to the user. */
+		event = what;
+	} else if (what & BEV_EVENT_CONNECTED) {
+		/* Ignore it.  We're saying SSL_connect() already, which will
+		   eat it. */
+	}
+	if (event)
+		bufferevent_run_eventcb_(&bev_ssl->bev.bev, event, 0);
+}
+
+static void
+be_openssl_readeventcb(evutil_socket_t fd, short what, void *ptr)
+{
+	struct bufferevent_openssl *bev_ssl = ptr;
+	bufferevent_incref_and_lock_(&bev_ssl->bev.bev);
+	if (what == EV_TIMEOUT) {
+		bufferevent_run_eventcb_(&bev_ssl->bev.bev,
+		    BEV_EVENT_TIMEOUT|BEV_EVENT_READING, 0);
+	} else {
+		consider_reading(bev_ssl);
+	}
+	bufferevent_decref_and_unlock_(&bev_ssl->bev.bev);
+}
+
+static void
+be_openssl_writeeventcb(evutil_socket_t fd, short what, void *ptr)
+{
+	struct bufferevent_openssl *bev_ssl = ptr;
+	bufferevent_incref_and_lock_(&bev_ssl->bev.bev);
+	if (what == EV_TIMEOUT) {
+		bufferevent_run_eventcb_(&bev_ssl->bev.bev,
+		    BEV_EVENT_TIMEOUT|BEV_EVENT_WRITING, 0);
+	} else {
+		consider_writing(bev_ssl);
+	}
+	bufferevent_decref_and_unlock_(&bev_ssl->bev.bev);
+}
+
+static evutil_socket_t
+be_openssl_auto_fd(struct bufferevent_openssl *bev_ssl, evutil_socket_t fd)
+{
+	if (!bev_ssl->underlying) {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		if (event_initialized(&bev->ev_read) && fd < 0) {
+			fd = event_get_fd(&bev->ev_read);
+		}
+	}
+	return fd;
+}
+
+static int
+set_open_callbacks(struct bufferevent_openssl *bev_ssl, evutil_socket_t fd)
+{
+	if (bev_ssl->underlying) {
+		bufferevent_setcb(bev_ssl->underlying,
+		    be_openssl_readcb, be_openssl_writecb, be_openssl_eventcb,
+		    bev_ssl);
+		return 0;
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+		int rpending=0, wpending=0, r1=0, r2=0;
+
+		if (event_initialized(&bev->ev_read)) {
+			rpending = event_pending(&bev->ev_read, EV_READ, NULL);
+			wpending = event_pending(&bev->ev_write, EV_WRITE, NULL);
+
+			event_del(&bev->ev_read);
+			event_del(&bev->ev_write);
+		}
+
+		event_assign(&bev->ev_read, bev->ev_base, fd,
+		    EV_READ|EV_PERSIST|EV_FINALIZE,
+		    be_openssl_readeventcb, bev_ssl);
+		event_assign(&bev->ev_write, bev->ev_base, fd,
+		    EV_WRITE|EV_PERSIST|EV_FINALIZE,
+		    be_openssl_writeeventcb, bev_ssl);
+
+		if (rpending)
+			r1 = bufferevent_add_event_(&bev->ev_read, &bev->timeout_read);
+		if (wpending)
+			r2 = bufferevent_add_event_(&bev->ev_write, &bev->timeout_write);
+
+		return (r1<0 || r2<0) ? -1 : 0;
+	}
+}
+
+static int
+do_handshake(struct bufferevent_openssl *bev_ssl)
+{
+	int r;
+
+	switch (bev_ssl->state) {
+	default:
+	case BUFFEREVENT_SSL_OPEN:
+		EVUTIL_ASSERT(0);
+		return -1;
+	case BUFFEREVENT_SSL_CONNECTING:
+	case BUFFEREVENT_SSL_ACCEPTING:
+		ERR_clear_error();
+		r = SSL_do_handshake(bev_ssl->ssl);
+		break;
+	}
+	decrement_buckets(bev_ssl);
+
+	if (r==1) {
+		evutil_socket_t fd = event_get_fd(&bev_ssl->bev.bev.ev_read);
+		/* We're done! */
+		bev_ssl->state = BUFFEREVENT_SSL_OPEN;
+		set_open_callbacks(bev_ssl, fd); /* XXXX handle failure */
+		/* Call do_read and do_write as needed */
+		bufferevent_enable(&bev_ssl->bev.bev, bev_ssl->bev.bev.enabled);
+		bufferevent_run_eventcb_(&bev_ssl->bev.bev,
+		    BEV_EVENT_CONNECTED, 0);
+		return 1;
+	} else {
+		int err = SSL_get_error(bev_ssl->ssl, r);
+		print_err(err);
+		switch (err) {
+		case SSL_ERROR_WANT_WRITE:
+			stop_reading(bev_ssl);
+			return start_writing(bev_ssl);
+		case SSL_ERROR_WANT_READ:
+			stop_writing(bev_ssl);
+			return start_reading(bev_ssl);
+		default:
+			conn_closed(bev_ssl, BEV_EVENT_READING, err, r);
+			return -1;
+		}
+	}
+}
+
+static void
+be_openssl_handshakecb(struct bufferevent *bev_base, void *ctx)
+{
+	struct bufferevent_openssl *bev_ssl = ctx;
+	do_handshake(bev_ssl);/* XXX handle failure */
+}
+
+static void
+be_openssl_handshakeeventcb(evutil_socket_t fd, short what, void *ptr)
+{
+	struct bufferevent_openssl *bev_ssl = ptr;
+
+	bufferevent_incref_and_lock_(&bev_ssl->bev.bev);
+	if (what & EV_TIMEOUT) {
+		bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_TIMEOUT, 0);
+	} else
+		do_handshake(bev_ssl);/* XXX handle failure */
+	bufferevent_decref_and_unlock_(&bev_ssl->bev.bev);
+}
+
+static int
+set_handshake_callbacks(struct bufferevent_openssl *bev_ssl, evutil_socket_t fd)
+{
+	if (bev_ssl->underlying) {
+		bufferevent_setcb(bev_ssl->underlying,
+		    be_openssl_handshakecb, be_openssl_handshakecb,
+		    be_openssl_eventcb,
+		    bev_ssl);
+
+		if (fd < 0)
+			return 0;
+
+		if (bufferevent_setfd(bev_ssl->underlying, fd))
+			return 1;
+
+		return do_handshake(bev_ssl);
+	} else {
+		struct bufferevent *bev = &bev_ssl->bev.bev;
+
+		if (event_initialized(&bev->ev_read)) {
+			event_del(&bev->ev_read);
+			event_del(&bev->ev_write);
+		}
+
+		event_assign(&bev->ev_read, bev->ev_base, fd,
+		    EV_READ|EV_PERSIST|EV_FINALIZE,
+		    be_openssl_handshakeeventcb, bev_ssl);
+		event_assign(&bev->ev_write, bev->ev_base, fd,
+		    EV_WRITE|EV_PERSIST|EV_FINALIZE,
+		    be_openssl_handshakeeventcb, bev_ssl);
+		if (fd >= 0)
+			bufferevent_enable(bev, bev->enabled);
+		return 0;
+	}
+}
+
+int
+bufferevent_ssl_renegotiate(struct bufferevent *bev)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+	if (!bev_ssl)
+		return -1;
+	if (SSL_renegotiate(bev_ssl->ssl) < 0)
+		return -1;
+	bev_ssl->state = BUFFEREVENT_SSL_CONNECTING;
+	if (set_handshake_callbacks(bev_ssl, be_openssl_auto_fd(bev_ssl, -1)) < 0)
+		return -1;
+	if (!bev_ssl->underlying)
+		return do_handshake(bev_ssl);
+	return 0;
+}
+
+static void
+be_openssl_outbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo, void *arg)
+{
+	struct bufferevent_openssl *bev_ssl = arg;
+	int r = 0;
+	/* XXX need to hold a reference here. */
+
+	if (cbinfo->n_added && bev_ssl->state == BUFFEREVENT_SSL_OPEN) {
+		if (cbinfo->orig_size == 0)
+			r = bufferevent_add_event_(&bev_ssl->bev.bev.ev_write,
+			    &bev_ssl->bev.bev.timeout_write);
+
+		if (bev_ssl->underlying)
+			consider_writing(bev_ssl);
+	}
+	/* XXX Handle r < 0 */
+	(void)r;
+}
+
+
+static int
+be_openssl_enable(struct bufferevent *bev, short events)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+	int r1 = 0, r2 = 0;
+
+	if (events & EV_READ)
+		r1 = start_reading(bev_ssl);
+	if (events & EV_WRITE)
+		r2 = start_writing(bev_ssl);
+
+	if (bev_ssl->underlying) {
+		if (events & EV_READ)
+			BEV_RESET_GENERIC_READ_TIMEOUT(bev);
+		if (events & EV_WRITE)
+			BEV_RESET_GENERIC_WRITE_TIMEOUT(bev);
+
+		if (events & EV_READ)
+			consider_reading(bev_ssl);
+		if (events & EV_WRITE)
+			consider_writing(bev_ssl);
+	}
+	return (r1 < 0 || r2 < 0) ? -1 : 0;
+}
+
+static int
+be_openssl_disable(struct bufferevent *bev, short events)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+
+	if (events & EV_READ)
+		stop_reading(bev_ssl);
+	if (events & EV_WRITE)
+		stop_writing(bev_ssl);
+
+	if (bev_ssl->underlying) {
+		if (events & EV_READ)
+			BEV_DEL_GENERIC_READ_TIMEOUT(bev);
+		if (events & EV_WRITE)
+			BEV_DEL_GENERIC_WRITE_TIMEOUT(bev);
+	}
+	return 0;
+}
+
+static void
+be_openssl_unlink(struct bufferevent *bev)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+
+	if (bev_ssl->bev.options & BEV_OPT_CLOSE_ON_FREE) {
+		if (bev_ssl->underlying) {
+			if (BEV_UPCAST(bev_ssl->underlying)->refcnt < 2) {
+				event_warnx("BEV_OPT_CLOSE_ON_FREE set on an "
+				    "bufferevent with too few references");
+			} else {
+				bufferevent_free(bev_ssl->underlying);
+				/* We still have a reference to it, via our
+				 * BIO. So we don't drop this. */
+				// bev_ssl->underlying = NULL;
+			}
+		}
+	} else {
+		if (bev_ssl->underlying) {
+			if (bev_ssl->underlying->errorcb == be_openssl_eventcb)
+				bufferevent_setcb(bev_ssl->underlying,
+				    NULL,NULL,NULL,NULL);
+			bufferevent_unsuspend_read_(bev_ssl->underlying,
+			    BEV_SUSPEND_FILT_READ);
+		}
+	}
+}
+
+static void
+be_openssl_destruct(struct bufferevent *bev)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+
+	if (bev_ssl->bev.options & BEV_OPT_CLOSE_ON_FREE) {
+		if (! bev_ssl->underlying) {
+			evutil_socket_t fd = EVUTIL_INVALID_SOCKET;
+			BIO *bio = SSL_get_wbio(bev_ssl->ssl);
+			if (bio)
+				fd = BIO_get_fd(bio, NULL);
+			if (fd >= 0)
+				evutil_closesocket(fd);
+		}
+		SSL_free(bev_ssl->ssl);
+	}
+}
+
+static int
+be_openssl_adj_timeouts(struct bufferevent *bev)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+
+	if (bev_ssl->underlying) {
+		return bufferevent_generic_adj_timeouts_(bev);
+	} else {
+		return bufferevent_generic_adj_existing_timeouts_(bev);
+	}
+}
+
+static int
+be_openssl_flush(struct bufferevent *bufev,
+    short iotype, enum bufferevent_flush_mode mode)
+{
+	/* XXXX Implement this. */
+	return 0;
+}
+
+static int
+be_openssl_set_fd(struct bufferevent_openssl *bev_ssl,
+    enum bufferevent_ssl_state state, evutil_socket_t fd)
+{
+	bev_ssl->state = state;
+
+	switch (state) {
+	case BUFFEREVENT_SSL_ACCEPTING:
+		if (!SSL_clear(bev_ssl->ssl))
+			return -1;
+		SSL_set_accept_state(bev_ssl->ssl);
+		if (set_handshake_callbacks(bev_ssl, fd) < 0)
+			return -1;
+		break;
+	case BUFFEREVENT_SSL_CONNECTING:
+		if (!SSL_clear(bev_ssl->ssl))
+			return -1;
+		SSL_set_connect_state(bev_ssl->ssl);
+		if (set_handshake_callbacks(bev_ssl, fd) < 0)
+			return -1;
+		break;
+	case BUFFEREVENT_SSL_OPEN:
+		if (set_open_callbacks(bev_ssl, fd) < 0)
+			return -1;
+		break;
+	default:
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+be_openssl_ctrl(struct bufferevent *bev,
+    enum bufferevent_ctrl_op op, union bufferevent_ctrl_data *data)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bev);
+	switch (op) {
+	case BEV_CTRL_SET_FD:
+		if (!bev_ssl->underlying) {
+			BIO *bio;
+			bio = BIO_new_socket((int)data->fd, 0);
+			SSL_set_bio(bev_ssl->ssl, bio, bio);
+		} else {
+			BIO *bio;
+			if (!(bio = BIO_new_bufferevent(bev_ssl->underlying)))
+				return -1;
+			SSL_set_bio(bev_ssl->ssl, bio, bio);
+		}
+
+		return be_openssl_set_fd(bev_ssl, bev_ssl->old_state, data->fd);
+	case BEV_CTRL_GET_FD:
+		if (bev_ssl->underlying) {
+			data->fd = event_get_fd(&bev_ssl->underlying->ev_read);
+		} else {
+			data->fd = event_get_fd(&bev->ev_read);
+		}
+		return 0;
+	case BEV_CTRL_GET_UNDERLYING:
+		data->ptr = bev_ssl->underlying;
+		return 0;
+	case BEV_CTRL_CANCEL_ALL:
+	default:
+		return -1;
+	}
+}
+
+SSL *
+bufferevent_openssl_get_ssl(struct bufferevent *bufev)
+{
+	struct bufferevent_openssl *bev_ssl = upcast(bufev);
+	if (!bev_ssl)
+		return NULL;
+	return bev_ssl->ssl;
+}
+
+static struct bufferevent *
+bufferevent_openssl_new_impl(struct event_base *base,
+    struct bufferevent *underlying,
+    evutil_socket_t fd,
+    SSL *ssl,
+    enum bufferevent_ssl_state state,
+    int options)
+{
+	struct bufferevent_openssl *bev_ssl = NULL;
+	struct bufferevent_private *bev_p = NULL;
+	int tmp_options = options & ~BEV_OPT_THREADSAFE;
+
+	/* Only one can be set. */
+	if (underlying != NULL && fd >= 0)
+		goto err;
+
+	if (!(bev_ssl = mm_calloc(1, sizeof(struct bufferevent_openssl))))
+		goto err;
+
+	bev_p = &bev_ssl->bev;
+
+	if (bufferevent_init_common_(bev_p, base,
+		&bufferevent_ops_openssl, tmp_options) < 0)
+		goto err;
+
+	/* Don't explode if we decide to realloc a chunk we're writing from in
+	 * the output buffer. */
+	SSL_set_mode(ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+
+	bev_ssl->underlying = underlying;
+	bev_ssl->ssl = ssl;
+
+	bev_ssl->outbuf_cb = evbuffer_add_cb(bev_p->bev.output,
+	    be_openssl_outbuf_cb, bev_ssl);
+
+	if (options & BEV_OPT_THREADSAFE)
+		bufferevent_enable_locking_(&bev_ssl->bev.bev, NULL);
+
+	if (underlying) {
+		bufferevent_init_generic_timeout_cbs_(&bev_ssl->bev.bev);
+		bufferevent_incref_(underlying);
+	}
+
+	bev_ssl->old_state = state;
+	bev_ssl->last_write = -1;
+
+	init_bio_counts(bev_ssl);
+
+	fd = be_openssl_auto_fd(bev_ssl, fd);
+	if (be_openssl_set_fd(bev_ssl, state, fd))
+		goto err;
+
+	if (underlying) {
+		bufferevent_setwatermark(underlying, EV_READ, 0, 0);
+		bufferevent_enable(underlying, EV_READ|EV_WRITE);
+		if (state == BUFFEREVENT_SSL_OPEN)
+			bufferevent_suspend_read_(underlying,
+			    BEV_SUSPEND_FILT_READ);
+	}
+
+	return &bev_ssl->bev.bev;
+err:
+	if (options & BEV_OPT_CLOSE_ON_FREE)
+		SSL_free(ssl);
+	if (bev_ssl) {
+		bev_ssl->ssl = NULL;
+		bufferevent_free(&bev_ssl->bev.bev);
+	}
+	return NULL;
+}
+
+struct bufferevent *
+bufferevent_openssl_filter_new(struct event_base *base,
+    struct bufferevent *underlying,
+    SSL *ssl,
+    enum bufferevent_ssl_state state,
+    int options)
+{
+	BIO *bio;
+	struct bufferevent *bev;
+
+	if (!underlying)
+		goto err;
+	if (!(bio = BIO_new_bufferevent(underlying)))
+		goto err;
+
+	SSL_set_bio(ssl, bio, bio);
+
+	bev = bufferevent_openssl_new_impl(
+		base, underlying, -1, ssl, state, options);
+	return bev;
+
+err:
+	if (options & BEV_OPT_CLOSE_ON_FREE)
+		SSL_free(ssl);
+	return NULL;
+}
+
+struct bufferevent *
+bufferevent_openssl_socket_new(struct event_base *base,
+    evutil_socket_t fd,
+    SSL *ssl,
+    enum bufferevent_ssl_state state,
+    int options)
+{
+	/* Does the SSL already have an fd? */
+	BIO *bio = SSL_get_wbio(ssl);
+	long have_fd = -1;
+
+	if (bio)
+		have_fd = BIO_get_fd(bio, NULL);
+
+	if (have_fd >= 0) {
+		/* The SSL is already configured with an fd. */
+		if (fd < 0) {
+			/* We should learn the fd from the SSL. */
+			fd = (evutil_socket_t) have_fd;
+		} else if (have_fd == (long)fd) {
+			/* We already know the fd from the SSL; do nothing */
+		} else {
+			/* We specified an fd different from that of the SSL.
+			   This is probably an error on our part.  Fail. */
+			goto err;
+		}
+		BIO_set_close(bio, 0);
+	} else {
+		/* The SSL isn't configured with a BIO with an fd. */
+		if (fd >= 0) {
+			/* ... and we have an fd we want to use. */
+			bio = BIO_new_socket((int)fd, 0);
+			SSL_set_bio(ssl, bio, bio);
+		} else {
+			/* Leave the fd unset. */
+		}
+	}
+
+	return bufferevent_openssl_new_impl(
+		base, NULL, fd, ssl, state, options);
+
+err:
+	if (options & BEV_OPT_CLOSE_ON_FREE)
+		SSL_free(ssl);
+	return NULL;
+}
+
+int
+bufferevent_openssl_get_allow_dirty_shutdown(struct bufferevent *bev)
+{
+	int allow_dirty_shutdown = -1;
+	struct bufferevent_openssl *bev_ssl;
+	BEV_LOCK(bev);
+	bev_ssl = upcast(bev);
+	if (bev_ssl)
+		allow_dirty_shutdown = bev_ssl->allow_dirty_shutdown;
+	BEV_UNLOCK(bev);
+	return allow_dirty_shutdown;
+}
+
+void
+bufferevent_openssl_set_allow_dirty_shutdown(struct bufferevent *bev,
+    int allow_dirty_shutdown)
+{
+	struct bufferevent_openssl *bev_ssl;
+	BEV_LOCK(bev);
+	bev_ssl = upcast(bev);
+	if (bev_ssl)
+		bev_ssl->allow_dirty_shutdown = !!allow_dirty_shutdown;
+	BEV_UNLOCK(bev);
+}
+
+unsigned long
+bufferevent_get_openssl_error(struct bufferevent *bev)
+{
+	unsigned long err = 0;
+	struct bufferevent_openssl *bev_ssl;
+	BEV_LOCK(bev);
+	bev_ssl = upcast(bev);
+	if (bev_ssl && bev_ssl->n_errors) {
+		err = bev_ssl->errors[--bev_ssl->n_errors];
+	}
+	BEV_UNLOCK(bev);
+	return err;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_pair.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_pair.c
new file mode 100644
index 000000000000..f88cd751de1b
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_pair.c
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#include "event2/util.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/event.h"
+#include "defer-internal.h"
+#include "bufferevent-internal.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+
+struct bufferevent_pair {
+	struct bufferevent_private bev;
+	struct bufferevent_pair *partner;
+	/* For ->destruct() lock checking */
+	struct bufferevent_pair *unlinked_partner;
+};
+
+
+/* Given a bufferevent that's really a bev part of a bufferevent_pair,
+ * return that bufferevent_filtered. Returns NULL otherwise.*/
+static inline struct bufferevent_pair *
+upcast(struct bufferevent *bev)
+{
+	struct bufferevent_pair *bev_p;
+	if (!BEV_IS_PAIR(bev))
+		return NULL;
+	bev_p = EVUTIL_UPCAST(bev, struct bufferevent_pair, bev.bev);
+	EVUTIL_ASSERT(BEV_IS_PAIR(&bev_p->bev.bev));
+	return bev_p;
+}
+
+#define downcast(bev_pair) (&(bev_pair)->bev.bev)
+
+static inline void
+incref_and_lock(struct bufferevent *b)
+{
+	struct bufferevent_pair *bevp;
+	bufferevent_incref_and_lock_(b);
+	bevp = upcast(b);
+	if (bevp->partner)
+		bufferevent_incref_and_lock_(downcast(bevp->partner));
+}
+
+static inline void
+decref_and_unlock(struct bufferevent *b)
+{
+	struct bufferevent_pair *bevp = upcast(b);
+	if (bevp->partner)
+		bufferevent_decref_and_unlock_(downcast(bevp->partner));
+	bufferevent_decref_and_unlock_(b);
+}
+
+/* XXX Handle close */
+
+static void be_pair_outbuf_cb(struct evbuffer *,
+    const struct evbuffer_cb_info *, void *);
+
+static struct bufferevent_pair *
+bufferevent_pair_elt_new(struct event_base *base,
+    int options)
+{
+	struct bufferevent_pair *bufev;
+	if (! (bufev = mm_calloc(1, sizeof(struct bufferevent_pair))))
+		return NULL;
+	if (bufferevent_init_common_(&bufev->bev, base, &bufferevent_ops_pair,
+		options)) {
+		mm_free(bufev);
+		return NULL;
+	}
+	if (!evbuffer_add_cb(bufev->bev.bev.output, be_pair_outbuf_cb, bufev)) {
+		bufferevent_free(downcast(bufev));
+		return NULL;
+	}
+
+	bufferevent_init_generic_timeout_cbs_(&bufev->bev.bev);
+
+	return bufev;
+}
+
+int
+bufferevent_pair_new(struct event_base *base, int options,
+    struct bufferevent *pair[2])
+{
+	struct bufferevent_pair *bufev1 = NULL, *bufev2 = NULL;
+	int tmp_options;
+
+	options |= BEV_OPT_DEFER_CALLBACKS;
+	tmp_options = options & ~BEV_OPT_THREADSAFE;
+
+	bufev1 = bufferevent_pair_elt_new(base, options);
+	if (!bufev1)
+		return -1;
+	bufev2 = bufferevent_pair_elt_new(base, tmp_options);
+	if (!bufev2) {
+		bufferevent_free(downcast(bufev1));
+		return -1;
+	}
+
+	if (options & BEV_OPT_THREADSAFE) {
+		/*XXXX check return */
+		bufferevent_enable_locking_(downcast(bufev2), bufev1->bev.lock);
+	}
+
+	bufev1->partner = bufev2;
+	bufev2->partner = bufev1;
+
+	evbuffer_freeze(downcast(bufev1)->input, 0);
+	evbuffer_freeze(downcast(bufev1)->output, 1);
+	evbuffer_freeze(downcast(bufev2)->input, 0);
+	evbuffer_freeze(downcast(bufev2)->output, 1);
+
+	pair[0] = downcast(bufev1);
+	pair[1] = downcast(bufev2);
+
+	return 0;
+}
+
+static void
+be_pair_transfer(struct bufferevent *src, struct bufferevent *dst,
+    int ignore_wm)
+{
+	size_t dst_size;
+	size_t n;
+
+	evbuffer_unfreeze(src->output, 1);
+	evbuffer_unfreeze(dst->input, 0);
+
+	if (dst->wm_read.high) {
+		dst_size = evbuffer_get_length(dst->input);
+		if (dst_size < dst->wm_read.high) {
+			n = dst->wm_read.high - dst_size;
+			evbuffer_remove_buffer(src->output, dst->input, n);
+		} else {
+			if (!ignore_wm)
+				goto done;
+			n = evbuffer_get_length(src->output);
+			evbuffer_add_buffer(dst->input, src->output);
+		}
+	} else {
+		n = evbuffer_get_length(src->output);
+		evbuffer_add_buffer(dst->input, src->output);
+	}
+
+	if (n) {
+		BEV_RESET_GENERIC_READ_TIMEOUT(dst);
+
+		if (evbuffer_get_length(dst->output))
+			BEV_RESET_GENERIC_WRITE_TIMEOUT(dst);
+		else
+			BEV_DEL_GENERIC_WRITE_TIMEOUT(dst);
+	}
+
+	bufferevent_trigger_nolock_(dst, EV_READ, 0);
+	bufferevent_trigger_nolock_(src, EV_WRITE, 0);
+done:
+	evbuffer_freeze(src->output, 1);
+	evbuffer_freeze(dst->input, 0);
+}
+
+static inline int
+be_pair_wants_to_talk(struct bufferevent_pair *src,
+    struct bufferevent_pair *dst)
+{
+	return (downcast(src)->enabled & EV_WRITE) &&
+	    (downcast(dst)->enabled & EV_READ) &&
+	    !dst->bev.read_suspended &&
+	    evbuffer_get_length(downcast(src)->output);
+}
+
+static void
+be_pair_outbuf_cb(struct evbuffer *outbuf,
+    const struct evbuffer_cb_info *info, void *arg)
+{
+	struct bufferevent_pair *bev_pair = arg;
+	struct bufferevent_pair *partner = bev_pair->partner;
+
+	incref_and_lock(downcast(bev_pair));
+
+	if (info->n_added > info->n_deleted && partner) {
+		/* We got more data.  If the other side's reading, then
+		   hand it over. */
+		if (be_pair_wants_to_talk(bev_pair, partner)) {
+			be_pair_transfer(downcast(bev_pair), downcast(partner), 0);
+		}
+	}
+
+	decref_and_unlock(downcast(bev_pair));
+}
+
+static int
+be_pair_enable(struct bufferevent *bufev, short events)
+{
+	struct bufferevent_pair *bev_p = upcast(bufev);
+	struct bufferevent_pair *partner = bev_p->partner;
+
+	incref_and_lock(bufev);
+
+	if (events & EV_READ) {
+		BEV_RESET_GENERIC_READ_TIMEOUT(bufev);
+	}
+	if ((events & EV_WRITE) && evbuffer_get_length(bufev->output))
+		BEV_RESET_GENERIC_WRITE_TIMEOUT(bufev);
+
+	/* We're starting to read! Does the other side have anything to write?*/
+	if ((events & EV_READ) && partner &&
+	    be_pair_wants_to_talk(partner, bev_p)) {
+		be_pair_transfer(downcast(partner), bufev, 0);
+	}
+	/* We're starting to write! Does the other side want to read? */
+	if ((events & EV_WRITE) && partner &&
+	    be_pair_wants_to_talk(bev_p, partner)) {
+		be_pair_transfer(bufev, downcast(partner), 0);
+	}
+	decref_and_unlock(bufev);
+	return 0;
+}
+
+static int
+be_pair_disable(struct bufferevent *bev, short events)
+{
+	if (events & EV_READ) {
+		BEV_DEL_GENERIC_READ_TIMEOUT(bev);
+	}
+	if (events & EV_WRITE) {
+		BEV_DEL_GENERIC_WRITE_TIMEOUT(bev);
+	}
+	return 0;
+}
+
+static void
+be_pair_unlink(struct bufferevent *bev)
+{
+	struct bufferevent_pair *bev_p = upcast(bev);
+
+	if (bev_p->partner) {
+		bev_p->unlinked_partner = bev_p->partner;
+		bev_p->partner->partner = NULL;
+		bev_p->partner = NULL;
+	}
+}
+
+/* Free *shared* lock in the latest be (since we share it between two of them). */
+static void
+be_pair_destruct(struct bufferevent *bev)
+{
+	struct bufferevent_pair *bev_p = upcast(bev);
+
+	/* Transfer ownership of the lock into partner, otherwise we will use
+	 * already free'd lock during freeing second bev, see next example:
+	 *
+	 * bev1->own_lock = 1
+	 * bev2->own_lock = 0
+	 * bev2->lock = bev1->lock
+	 *
+	 * bufferevent_free(bev1) # refcnt == 0 -> unlink
+	 * bufferevent_free(bev2) # refcnt == 0 -> unlink
+	 *
+	 * event_base_free() -> finilizers -> EVTHREAD_FREE_LOCK(bev1->lock)
+	 *                                 -> BEV_LOCK(bev2->lock) <-- already freed
+	 *
+	 * Where bev1 == pair[0], bev2 == pair[1].
+	 */
+	if (bev_p->unlinked_partner && bev_p->bev.own_lock) {
+		bev_p->unlinked_partner->bev.own_lock = 1;
+		bev_p->bev.own_lock = 0;
+	}
+	bev_p->unlinked_partner = NULL;
+}
+
+static int
+be_pair_flush(struct bufferevent *bev, short iotype,
+    enum bufferevent_flush_mode mode)
+{
+	struct bufferevent_pair *bev_p = upcast(bev);
+	struct bufferevent *partner;
+
+	if (!bev_p->partner)
+		return -1;
+
+	if (mode == BEV_NORMAL)
+		return 0;
+
+	incref_and_lock(bev);
+
+	partner = downcast(bev_p->partner);
+
+	if ((iotype & EV_READ) != 0)
+		be_pair_transfer(partner, bev, 1);
+
+	if ((iotype & EV_WRITE) != 0)
+		be_pair_transfer(bev, partner, 1);
+
+	if (mode == BEV_FINISHED) {
+		short what = BEV_EVENT_EOF;
+		if (iotype & EV_READ)
+			what |= BEV_EVENT_WRITING;
+		if (iotype & EV_WRITE)
+			what |= BEV_EVENT_READING;
+		bufferevent_run_eventcb_(partner, what, 0);
+	}
+	decref_and_unlock(bev);
+	return 0;
+}
+
+struct bufferevent *
+bufferevent_pair_get_partner(struct bufferevent *bev)
+{
+	struct bufferevent_pair *bev_p;
+	struct bufferevent *partner = NULL;
+	bev_p = upcast(bev);
+	if (! bev_p)
+		return NULL;
+
+	incref_and_lock(bev);
+	if (bev_p->partner)
+		partner = downcast(bev_p->partner);
+	decref_and_unlock(bev);
+	return partner;
+}
+
+const struct bufferevent_ops bufferevent_ops_pair = {
+	"pair_elt",
+	evutil_offsetof(struct bufferevent_pair, bev.bev),
+	be_pair_enable,
+	be_pair_disable,
+	be_pair_unlink,
+	be_pair_destruct,
+	bufferevent_generic_adj_timeouts_,
+	be_pair_flush,
+	NULL, /* ctrl */
+};
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_ratelim.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_ratelim.c
new file mode 100644
index 000000000000..258749685353
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_ratelim.c
@@ -0,0 +1,1089 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/util.h"
+#include "event2/bufferevent.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/buffer.h"
+
+#include "ratelim-internal.h"
+
+#include "bufferevent-internal.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+#include "event-internal.h"
+
+int
+ev_token_bucket_init_(struct ev_token_bucket *bucket,
+    const struct ev_token_bucket_cfg *cfg,
+    ev_uint32_t current_tick,
+    int reinitialize)
+{
+	if (reinitialize) {
+		/* on reinitialization, we only clip downwards, since we've
+		   already used who-knows-how-much bandwidth this tick.  We
+		   leave "last_updated" as it is; the next update will add the
+		   appropriate amount of bandwidth to the bucket.
+		*/
+		if (bucket->read_limit > (ev_int64_t) cfg->read_maximum)
+			bucket->read_limit = cfg->read_maximum;
+		if (bucket->write_limit > (ev_int64_t) cfg->write_maximum)
+			bucket->write_limit = cfg->write_maximum;
+	} else {
+		bucket->read_limit = cfg->read_rate;
+		bucket->write_limit = cfg->write_rate;
+		bucket->last_updated = current_tick;
+	}
+	return 0;
+}
+
+int
+ev_token_bucket_update_(struct ev_token_bucket *bucket,
+    const struct ev_token_bucket_cfg *cfg,
+    ev_uint32_t current_tick)
+{
+	/* It's okay if the tick number overflows, since we'll just
+	 * wrap around when we do the unsigned substraction. */
+	unsigned n_ticks = current_tick - bucket->last_updated;
+
+	/* Make sure some ticks actually happened, and that time didn't
+	 * roll back. */
+	if (n_ticks == 0 || n_ticks > INT_MAX)
+		return 0;
+
+	/* Naively, we would say
+		bucket->limit += n_ticks * cfg->rate;
+
+		if (bucket->limit > cfg->maximum)
+			bucket->limit = cfg->maximum;
+
+	   But we're worried about overflow, so we do it like this:
+	*/
+
+	if ((cfg->read_maximum - bucket->read_limit) / n_ticks < cfg->read_rate)
+		bucket->read_limit = cfg->read_maximum;
+	else
+		bucket->read_limit += n_ticks * cfg->read_rate;
+
+
+	if ((cfg->write_maximum - bucket->write_limit) / n_ticks < cfg->write_rate)
+		bucket->write_limit = cfg->write_maximum;
+	else
+		bucket->write_limit += n_ticks * cfg->write_rate;
+
+
+	bucket->last_updated = current_tick;
+
+	return 1;
+}
+
+static inline void
+bufferevent_update_buckets(struct bufferevent_private *bev)
+{
+	/* Must hold lock on bev. */
+	struct timeval now;
+	unsigned tick;
+	event_base_gettimeofday_cached(bev->bev.ev_base, &now);
+	tick = ev_token_bucket_get_tick_(&now, bev->rate_limiting->cfg);
+	if (tick != bev->rate_limiting->limit.last_updated)
+		ev_token_bucket_update_(&bev->rate_limiting->limit,
+		    bev->rate_limiting->cfg, tick);
+}
+
+ev_uint32_t
+ev_token_bucket_get_tick_(const struct timeval *tv,
+    const struct ev_token_bucket_cfg *cfg)
+{
+	/* This computation uses two multiplies and a divide.  We could do
+	 * fewer if we knew that the tick length was an integer number of
+	 * seconds, or if we knew it divided evenly into a second.  We should
+	 * investigate that more.
+	 */
+
+	/* We cast to an ev_uint64_t first, since we don't want to overflow
+	 * before we do the final divide. */
+	ev_uint64_t msec = (ev_uint64_t)tv->tv_sec * 1000 + tv->tv_usec / 1000;
+	return (unsigned)(msec / cfg->msec_per_tick);
+}
+
+struct ev_token_bucket_cfg *
+ev_token_bucket_cfg_new(size_t read_rate, size_t read_burst,
+    size_t write_rate, size_t write_burst,
+    const struct timeval *tick_len)
+{
+	struct ev_token_bucket_cfg *r;
+	struct timeval g;
+	if (! tick_len) {
+		g.tv_sec = 1;
+		g.tv_usec = 0;
+		tick_len = &g;
+	}
+	if (read_rate > read_burst || write_rate > write_burst ||
+	    read_rate < 1 || write_rate < 1)
+		return NULL;
+	if (read_rate > EV_RATE_LIMIT_MAX ||
+	    write_rate > EV_RATE_LIMIT_MAX ||
+	    read_burst > EV_RATE_LIMIT_MAX ||
+	    write_burst > EV_RATE_LIMIT_MAX)
+		return NULL;
+	r = mm_calloc(1, sizeof(struct ev_token_bucket_cfg));
+	if (!r)
+		return NULL;
+	r->read_rate = read_rate;
+	r->write_rate = write_rate;
+	r->read_maximum = read_burst;
+	r->write_maximum = write_burst;
+	memcpy(&r->tick_timeout, tick_len, sizeof(struct timeval));
+	r->msec_per_tick = (tick_len->tv_sec * 1000) +
+	    (tick_len->tv_usec & COMMON_TIMEOUT_MICROSECONDS_MASK)/1000;
+	return r;
+}
+
+void
+ev_token_bucket_cfg_free(struct ev_token_bucket_cfg *cfg)
+{
+	mm_free(cfg);
+}
+
+/* Default values for max_single_read & max_single_write variables. */
+#define MAX_SINGLE_READ_DEFAULT 16384
+#define MAX_SINGLE_WRITE_DEFAULT 16384
+
+#define LOCK_GROUP(g) EVLOCK_LOCK((g)->lock, 0)
+#define UNLOCK_GROUP(g) EVLOCK_UNLOCK((g)->lock, 0)
+
+static int bev_group_suspend_reading_(struct bufferevent_rate_limit_group *g);
+static int bev_group_suspend_writing_(struct bufferevent_rate_limit_group *g);
+static void bev_group_unsuspend_reading_(struct bufferevent_rate_limit_group *g);
+static void bev_group_unsuspend_writing_(struct bufferevent_rate_limit_group *g);
+
+/** Helper: figure out the maximum amount we should write if is_write, or
+    the maximum amount we should read if is_read.  Return that maximum, or
+    0 if our bucket is wholly exhausted.
+ */
+static inline ev_ssize_t
+bufferevent_get_rlim_max_(struct bufferevent_private *bev, int is_write)
+{
+	/* needs lock on bev. */
+	ev_ssize_t max_so_far = is_write?bev->max_single_write:bev->max_single_read;
+
+#define LIM(x)						\
+	(is_write ? (x).write_limit : (x).read_limit)
+
+#define GROUP_SUSPENDED(g)			\
+	(is_write ? (g)->write_suspended : (g)->read_suspended)
+
+	/* Sets max_so_far to MIN(x, max_so_far) */
+#define CLAMPTO(x)				\
+	do {					\
+		if (max_so_far > (x))		\
+			max_so_far = (x);	\
+	} while (0);
+
+	if (!bev->rate_limiting)
+		return max_so_far;
+
+	/* If rate-limiting is enabled at all, update the appropriate
+	   bucket, and take the smaller of our rate limit and the group
+	   rate limit.
+	 */
+
+	if (bev->rate_limiting->cfg) {
+		bufferevent_update_buckets(bev);
+		max_so_far = LIM(bev->rate_limiting->limit);
+	}
+	if (bev->rate_limiting->group) {
+		struct bufferevent_rate_limit_group *g =
+		    bev->rate_limiting->group;
+		ev_ssize_t share;
+		LOCK_GROUP(g);
+		if (GROUP_SUSPENDED(g)) {
+			/* We can get here if we failed to lock this
+			 * particular bufferevent while suspending the whole
+			 * group. */
+			if (is_write)
+				bufferevent_suspend_write_(&bev->bev,
+				    BEV_SUSPEND_BW_GROUP);
+			else
+				bufferevent_suspend_read_(&bev->bev,
+				    BEV_SUSPEND_BW_GROUP);
+			share = 0;
+		} else {
+			/* XXXX probably we should divide among the active
+			 * members, not the total members. */
+			share = LIM(g->rate_limit) / g->n_members;
+			if (share < g->min_share)
+				share = g->min_share;
+		}
+		UNLOCK_GROUP(g);
+		CLAMPTO(share);
+	}
+
+	if (max_so_far < 0)
+		max_so_far = 0;
+	return max_so_far;
+}
+
+ev_ssize_t
+bufferevent_get_read_max_(struct bufferevent_private *bev)
+{
+	return bufferevent_get_rlim_max_(bev, 0);
+}
+
+ev_ssize_t
+bufferevent_get_write_max_(struct bufferevent_private *bev)
+{
+	return bufferevent_get_rlim_max_(bev, 1);
+}
+
+int
+bufferevent_decrement_read_buckets_(struct bufferevent_private *bev, ev_ssize_t bytes)
+{
+	/* XXXXX Make sure all users of this function check its return value */
+	int r = 0;
+	/* need to hold lock on bev */
+	if (!bev->rate_limiting)
+		return 0;
+
+	if (bev->rate_limiting->cfg) {
+		bev->rate_limiting->limit.read_limit -= bytes;
+		if (bev->rate_limiting->limit.read_limit <= 0) {
+			bufferevent_suspend_read_(&bev->bev, BEV_SUSPEND_BW);
+			if (event_add(&bev->rate_limiting->refill_bucket_event,
+				&bev->rate_limiting->cfg->tick_timeout) < 0)
+				r = -1;
+		} else if (bev->read_suspended & BEV_SUSPEND_BW) {
+			if (!(bev->write_suspended & BEV_SUSPEND_BW))
+				event_del(&bev->rate_limiting->refill_bucket_event);
+			bufferevent_unsuspend_read_(&bev->bev, BEV_SUSPEND_BW);
+		}
+	}
+
+	if (bev->rate_limiting->group) {
+		LOCK_GROUP(bev->rate_limiting->group);
+		bev->rate_limiting->group->rate_limit.read_limit -= bytes;
+		bev->rate_limiting->group->total_read += bytes;
+		if (bev->rate_limiting->group->rate_limit.read_limit <= 0) {
+			bev_group_suspend_reading_(bev->rate_limiting->group);
+		} else if (bev->rate_limiting->group->read_suspended) {
+			bev_group_unsuspend_reading_(bev->rate_limiting->group);
+		}
+		UNLOCK_GROUP(bev->rate_limiting->group);
+	}
+
+	return r;
+}
+
+int
+bufferevent_decrement_write_buckets_(struct bufferevent_private *bev, ev_ssize_t bytes)
+{
+	/* XXXXX Make sure all users of this function check its return value */
+	int r = 0;
+	/* need to hold lock */
+	if (!bev->rate_limiting)
+		return 0;
+
+	if (bev->rate_limiting->cfg) {
+		bev->rate_limiting->limit.write_limit -= bytes;
+		if (bev->rate_limiting->limit.write_limit <= 0) {
+			bufferevent_suspend_write_(&bev->bev, BEV_SUSPEND_BW);
+			if (event_add(&bev->rate_limiting->refill_bucket_event,
+				&bev->rate_limiting->cfg->tick_timeout) < 0)
+				r = -1;
+		} else if (bev->write_suspended & BEV_SUSPEND_BW) {
+			if (!(bev->read_suspended & BEV_SUSPEND_BW))
+				event_del(&bev->rate_limiting->refill_bucket_event);
+			bufferevent_unsuspend_write_(&bev->bev, BEV_SUSPEND_BW);
+		}
+	}
+
+	if (bev->rate_limiting->group) {
+		LOCK_GROUP(bev->rate_limiting->group);
+		bev->rate_limiting->group->rate_limit.write_limit -= bytes;
+		bev->rate_limiting->group->total_written += bytes;
+		if (bev->rate_limiting->group->rate_limit.write_limit <= 0) {
+			bev_group_suspend_writing_(bev->rate_limiting->group);
+		} else if (bev->rate_limiting->group->write_suspended) {
+			bev_group_unsuspend_writing_(bev->rate_limiting->group);
+		}
+		UNLOCK_GROUP(bev->rate_limiting->group);
+	}
+
+	return r;
+}
+
+/** Stop reading on every bufferevent in <b>g</b> */
+static int
+bev_group_suspend_reading_(struct bufferevent_rate_limit_group *g)
+{
+	/* Needs group lock */
+	struct bufferevent_private *bev;
+	g->read_suspended = 1;
+	g->pending_unsuspend_read = 0;
+
+	/* Note that in this loop we call EVLOCK_TRY_LOCK_ instead of BEV_LOCK,
+	   to prevent a deadlock.  (Ordinarily, the group lock nests inside
+	   the bufferevent locks.  If we are unable to lock any individual
+	   bufferevent, it will find out later when it looks at its limit
+	   and sees that its group is suspended.)
+	*/
+	LIST_FOREACH(bev, &g->members, rate_limiting->next_in_group) {
+		if (EVLOCK_TRY_LOCK_(bev->lock)) {
+			bufferevent_suspend_read_(&bev->bev,
+			    BEV_SUSPEND_BW_GROUP);
+			EVLOCK_UNLOCK(bev->lock, 0);
+		}
+	}
+	return 0;
+}
+
+/** Stop writing on every bufferevent in <b>g</b> */
+static int
+bev_group_suspend_writing_(struct bufferevent_rate_limit_group *g)
+{
+	/* Needs group lock */
+	struct bufferevent_private *bev;
+	g->write_suspended = 1;
+	g->pending_unsuspend_write = 0;
+	LIST_FOREACH(bev, &g->members, rate_limiting->next_in_group) {
+		if (EVLOCK_TRY_LOCK_(bev->lock)) {
+			bufferevent_suspend_write_(&bev->bev,
+			    BEV_SUSPEND_BW_GROUP);
+			EVLOCK_UNLOCK(bev->lock, 0);
+		}
+	}
+	return 0;
+}
+
+/** Timer callback invoked on a single bufferevent with one or more exhausted
+    buckets when they are ready to refill. */
+static void
+bev_refill_callback_(evutil_socket_t fd, short what, void *arg)
+{
+	unsigned tick;
+	struct timeval now;
+	struct bufferevent_private *bev = arg;
+	int again = 0;
+	BEV_LOCK(&bev->bev);
+	if (!bev->rate_limiting || !bev->rate_limiting->cfg) {
+		BEV_UNLOCK(&bev->bev);
+		return;
+	}
+
+	/* First, update the bucket */
+	event_base_gettimeofday_cached(bev->bev.ev_base, &now);
+	tick = ev_token_bucket_get_tick_(&now,
+	    bev->rate_limiting->cfg);
+	ev_token_bucket_update_(&bev->rate_limiting->limit,
+	    bev->rate_limiting->cfg,
+	    tick);
+
+	/* Now unsuspend any read/write operations as appropriate. */
+	if ((bev->read_suspended & BEV_SUSPEND_BW)) {
+		if (bev->rate_limiting->limit.read_limit > 0)
+			bufferevent_unsuspend_read_(&bev->bev, BEV_SUSPEND_BW);
+		else
+			again = 1;
+	}
+	if ((bev->write_suspended & BEV_SUSPEND_BW)) {
+		if (bev->rate_limiting->limit.write_limit > 0)
+			bufferevent_unsuspend_write_(&bev->bev, BEV_SUSPEND_BW);
+		else
+			again = 1;
+	}
+	if (again) {
+		/* One or more of the buckets may need another refill if they
+		   started negative.
+
+		   XXXX if we need to be quiet for more ticks, we should
+		   maybe figure out what timeout we really want.
+		*/
+		/* XXXX Handle event_add failure somehow */
+		event_add(&bev->rate_limiting->refill_bucket_event,
+		    &bev->rate_limiting->cfg->tick_timeout);
+	}
+	BEV_UNLOCK(&bev->bev);
+}
+
+/** Helper: grab a random element from a bufferevent group.
+ *
+ * Requires that we hold the lock on the group.
+ */
+static struct bufferevent_private *
+bev_group_random_element_(struct bufferevent_rate_limit_group *group)
+{
+	int which;
+	struct bufferevent_private *bev;
+
+	/* requires group lock */
+
+	if (!group->n_members)
+		return NULL;
+
+	EVUTIL_ASSERT(! LIST_EMPTY(&group->members));
+
+	which = evutil_weakrand_range_(&group->weakrand_seed, group->n_members);
+
+	bev = LIST_FIRST(&group->members);
+	while (which--)
+		bev = LIST_NEXT(bev, rate_limiting->next_in_group);
+
+	return bev;
+}
+
+/** Iterate over the elements of a rate-limiting group 'g' with a random
+    starting point, assigning each to the variable 'bev', and executing the
+    block 'block'.
+
+    We do this in a half-baked effort to get fairness among group members.
+    XXX Round-robin or some kind of priority queue would be even more fair.
+ */
+#define FOREACH_RANDOM_ORDER(block)			\
+	do {						\
+		first = bev_group_random_element_(g);	\
+		for (bev = first; bev != LIST_END(&g->members); \
+		    bev = LIST_NEXT(bev, rate_limiting->next_in_group)) { \
+			block ;					 \
+		}						 \
+		for (bev = LIST_FIRST(&g->members); bev && bev != first; \
+		    bev = LIST_NEXT(bev, rate_limiting->next_in_group)) { \
+			block ;						\
+		}							\
+	} while (0)
+
+static void
+bev_group_unsuspend_reading_(struct bufferevent_rate_limit_group *g)
+{
+	int again = 0;
+	struct bufferevent_private *bev, *first;
+
+	g->read_suspended = 0;
+	FOREACH_RANDOM_ORDER({
+		if (EVLOCK_TRY_LOCK_(bev->lock)) {
+			bufferevent_unsuspend_read_(&bev->bev,
+			    BEV_SUSPEND_BW_GROUP);
+			EVLOCK_UNLOCK(bev->lock, 0);
+		} else {
+			again = 1;
+		}
+	});
+	g->pending_unsuspend_read = again;
+}
+
+static void
+bev_group_unsuspend_writing_(struct bufferevent_rate_limit_group *g)
+{
+	int again = 0;
+	struct bufferevent_private *bev, *first;
+	g->write_suspended = 0;
+
+	FOREACH_RANDOM_ORDER({
+		if (EVLOCK_TRY_LOCK_(bev->lock)) {
+			bufferevent_unsuspend_write_(&bev->bev,
+			    BEV_SUSPEND_BW_GROUP);
+			EVLOCK_UNLOCK(bev->lock, 0);
+		} else {
+			again = 1;
+		}
+	});
+	g->pending_unsuspend_write = again;
+}
+
+/** Callback invoked every tick to add more elements to the group bucket
+    and unsuspend group members as needed.
+ */
+static void
+bev_group_refill_callback_(evutil_socket_t fd, short what, void *arg)
+{
+	struct bufferevent_rate_limit_group *g = arg;
+	unsigned tick;
+	struct timeval now;
+
+	event_base_gettimeofday_cached(event_get_base(&g->master_refill_event), &now);
+
+	LOCK_GROUP(g);
+
+	tick = ev_token_bucket_get_tick_(&now, &g->rate_limit_cfg);
+	ev_token_bucket_update_(&g->rate_limit, &g->rate_limit_cfg, tick);
+
+	if (g->pending_unsuspend_read ||
+	    (g->read_suspended && (g->rate_limit.read_limit >= g->min_share))) {
+		bev_group_unsuspend_reading_(g);
+	}
+	if (g->pending_unsuspend_write ||
+	    (g->write_suspended && (g->rate_limit.write_limit >= g->min_share))){
+		bev_group_unsuspend_writing_(g);
+	}
+
+	/* XXXX Rather than waiting to the next tick to unsuspend stuff
+	 * with pending_unsuspend_write/read, we should do it on the
+	 * next iteration of the mainloop.
+	 */
+
+	UNLOCK_GROUP(g);
+}
+
+int
+bufferevent_set_rate_limit(struct bufferevent *bev,
+    struct ev_token_bucket_cfg *cfg)
+{
+	struct bufferevent_private *bevp = BEV_UPCAST(bev);
+	int r = -1;
+	struct bufferevent_rate_limit *rlim;
+	struct timeval now;
+	ev_uint32_t tick;
+	int reinit = 0, suspended = 0;
+	/* XXX reference-count cfg */
+
+	BEV_LOCK(bev);
+
+	if (cfg == NULL) {
+		if (bevp->rate_limiting) {
+			rlim = bevp->rate_limiting;
+			rlim->cfg = NULL;
+			bufferevent_unsuspend_read_(bev, BEV_SUSPEND_BW);
+			bufferevent_unsuspend_write_(bev, BEV_SUSPEND_BW);
+			if (event_initialized(&rlim->refill_bucket_event))
+				event_del(&rlim->refill_bucket_event);
+		}
+		r = 0;
+		goto done;
+	}
+
+	event_base_gettimeofday_cached(bev->ev_base, &now);
+	tick = ev_token_bucket_get_tick_(&now, cfg);
+
+	if (bevp->rate_limiting && bevp->rate_limiting->cfg == cfg) {
+		/* no-op */
+		r = 0;
+		goto done;
+	}
+	if (bevp->rate_limiting == NULL) {
+		rlim = mm_calloc(1, sizeof(struct bufferevent_rate_limit));
+		if (!rlim)
+			goto done;
+		bevp->rate_limiting = rlim;
+	} else {
+		rlim = bevp->rate_limiting;
+	}
+	reinit = rlim->cfg != NULL;
+
+	rlim->cfg = cfg;
+	ev_token_bucket_init_(&rlim->limit, cfg, tick, reinit);
+
+	if (reinit) {
+		EVUTIL_ASSERT(event_initialized(&rlim->refill_bucket_event));
+		event_del(&rlim->refill_bucket_event);
+	}
+	event_assign(&rlim->refill_bucket_event, bev->ev_base,
+	    -1, EV_FINALIZE, bev_refill_callback_, bevp);
+
+	if (rlim->limit.read_limit > 0) {
+		bufferevent_unsuspend_read_(bev, BEV_SUSPEND_BW);
+	} else {
+		bufferevent_suspend_read_(bev, BEV_SUSPEND_BW);
+		suspended=1;
+	}
+	if (rlim->limit.write_limit > 0) {
+		bufferevent_unsuspend_write_(bev, BEV_SUSPEND_BW);
+	} else {
+		bufferevent_suspend_write_(bev, BEV_SUSPEND_BW);
+		suspended = 1;
+	}
+
+	if (suspended)
+		event_add(&rlim->refill_bucket_event, &cfg->tick_timeout);
+
+	r = 0;
+
+done:
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+struct bufferevent_rate_limit_group *
+bufferevent_rate_limit_group_new(struct event_base *base,
+    const struct ev_token_bucket_cfg *cfg)
+{
+	struct bufferevent_rate_limit_group *g;
+	struct timeval now;
+	ev_uint32_t tick;
+
+	event_base_gettimeofday_cached(base, &now);
+	tick = ev_token_bucket_get_tick_(&now, cfg);
+
+	g = mm_calloc(1, sizeof(struct bufferevent_rate_limit_group));
+	if (!g)
+		return NULL;
+	memcpy(&g->rate_limit_cfg, cfg, sizeof(g->rate_limit_cfg));
+	LIST_INIT(&g->members);
+
+	ev_token_bucket_init_(&g->rate_limit, cfg, tick, 0);
+
+	event_assign(&g->master_refill_event, base, -1, EV_PERSIST|EV_FINALIZE,
+	    bev_group_refill_callback_, g);
+	/*XXXX handle event_add failure */
+	event_add(&g->master_refill_event, &cfg->tick_timeout);
+
+	EVTHREAD_ALLOC_LOCK(g->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+
+	bufferevent_rate_limit_group_set_min_share(g, 64);
+
+	evutil_weakrand_seed_(&g->weakrand_seed,
+	    (ev_uint32_t) ((now.tv_sec + now.tv_usec) + (ev_intptr_t)g));
+
+	return g;
+}
+
+int
+bufferevent_rate_limit_group_set_cfg(
+	struct bufferevent_rate_limit_group *g,
+	const struct ev_token_bucket_cfg *cfg)
+{
+	int same_tick;
+	if (!g || !cfg)
+		return -1;
+
+	LOCK_GROUP(g);
+	same_tick = evutil_timercmp(
+		&g->rate_limit_cfg.tick_timeout, &cfg->tick_timeout, ==);
+	memcpy(&g->rate_limit_cfg, cfg, sizeof(g->rate_limit_cfg));
+
+	if (g->rate_limit.read_limit > (ev_ssize_t)cfg->read_maximum)
+		g->rate_limit.read_limit = cfg->read_maximum;
+	if (g->rate_limit.write_limit > (ev_ssize_t)cfg->write_maximum)
+		g->rate_limit.write_limit = cfg->write_maximum;
+
+	if (!same_tick) {
+		/* This can cause a hiccup in the schedule */
+		event_add(&g->master_refill_event, &cfg->tick_timeout);
+	}
+
+	/* The new limits might force us to adjust min_share differently. */
+	bufferevent_rate_limit_group_set_min_share(g, g->configured_min_share);
+
+	UNLOCK_GROUP(g);
+	return 0;
+}
+
+int
+bufferevent_rate_limit_group_set_min_share(
+	struct bufferevent_rate_limit_group *g,
+	size_t share)
+{
+	if (share > EV_SSIZE_MAX)
+		return -1;
+
+	g->configured_min_share = share;
+
+	/* Can't set share to less than the one-tick maximum.  IOW, at steady
+	 * state, at least one connection can go per tick. */
+	if (share > g->rate_limit_cfg.read_rate)
+		share = g->rate_limit_cfg.read_rate;
+	if (share > g->rate_limit_cfg.write_rate)
+		share = g->rate_limit_cfg.write_rate;
+
+	g->min_share = share;
+	return 0;
+}
+
+void
+bufferevent_rate_limit_group_free(struct bufferevent_rate_limit_group *g)
+{
+	LOCK_GROUP(g);
+	EVUTIL_ASSERT(0 == g->n_members);
+	event_del(&g->master_refill_event);
+	UNLOCK_GROUP(g);
+	EVTHREAD_FREE_LOCK(g->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	mm_free(g);
+}
+
+int
+bufferevent_add_to_rate_limit_group(struct bufferevent *bev,
+    struct bufferevent_rate_limit_group *g)
+{
+	int wsuspend, rsuspend;
+	struct bufferevent_private *bevp = BEV_UPCAST(bev);
+	BEV_LOCK(bev);
+
+	if (!bevp->rate_limiting) {
+		struct bufferevent_rate_limit *rlim;
+		rlim = mm_calloc(1, sizeof(struct bufferevent_rate_limit));
+		if (!rlim) {
+			BEV_UNLOCK(bev);
+			return -1;
+		}
+		event_assign(&rlim->refill_bucket_event, bev->ev_base,
+		    -1, EV_FINALIZE, bev_refill_callback_, bevp);
+		bevp->rate_limiting = rlim;
+	}
+
+	if (bevp->rate_limiting->group == g) {
+		BEV_UNLOCK(bev);
+		return 0;
+	}
+	if (bevp->rate_limiting->group)
+		bufferevent_remove_from_rate_limit_group(bev);
+
+	LOCK_GROUP(g);
+	bevp->rate_limiting->group = g;
+	++g->n_members;
+	LIST_INSERT_HEAD(&g->members, bevp, rate_limiting->next_in_group);
+
+	rsuspend = g->read_suspended;
+	wsuspend = g->write_suspended;
+
+	UNLOCK_GROUP(g);
+
+	if (rsuspend)
+		bufferevent_suspend_read_(bev, BEV_SUSPEND_BW_GROUP);
+	if (wsuspend)
+		bufferevent_suspend_write_(bev, BEV_SUSPEND_BW_GROUP);
+
+	BEV_UNLOCK(bev);
+	return 0;
+}
+
+int
+bufferevent_remove_from_rate_limit_group(struct bufferevent *bev)
+{
+	return bufferevent_remove_from_rate_limit_group_internal_(bev, 1);
+}
+
+int
+bufferevent_remove_from_rate_limit_group_internal_(struct bufferevent *bev,
+    int unsuspend)
+{
+	struct bufferevent_private *bevp = BEV_UPCAST(bev);
+	BEV_LOCK(bev);
+	if (bevp->rate_limiting && bevp->rate_limiting->group) {
+		struct bufferevent_rate_limit_group *g =
+		    bevp->rate_limiting->group;
+		LOCK_GROUP(g);
+		bevp->rate_limiting->group = NULL;
+		--g->n_members;
+		LIST_REMOVE(bevp, rate_limiting->next_in_group);
+		UNLOCK_GROUP(g);
+	}
+	if (unsuspend) {
+		bufferevent_unsuspend_read_(bev, BEV_SUSPEND_BW_GROUP);
+		bufferevent_unsuspend_write_(bev, BEV_SUSPEND_BW_GROUP);
+	}
+	BEV_UNLOCK(bev);
+	return 0;
+}
+
+/* ===
+ * API functions to expose rate limits.
+ *
+ * Don't use these from inside Libevent; they're meant to be for use by
+ * the program.
+ * === */
+
+/* Mostly you don't want to use this function from inside libevent;
+ * bufferevent_get_read_max_() is more likely what you want*/
+ev_ssize_t
+bufferevent_get_read_limit(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	if (bevp->rate_limiting && bevp->rate_limiting->cfg) {
+		bufferevent_update_buckets(bevp);
+		r = bevp->rate_limiting->limit.read_limit;
+	} else {
+		r = EV_SSIZE_MAX;
+	}
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+/* Mostly you don't want to use this function from inside libevent;
+ * bufferevent_get_write_max_() is more likely what you want*/
+ev_ssize_t
+bufferevent_get_write_limit(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	if (bevp->rate_limiting && bevp->rate_limiting->cfg) {
+		bufferevent_update_buckets(bevp);
+		r = bevp->rate_limiting->limit.write_limit;
+	} else {
+		r = EV_SSIZE_MAX;
+	}
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+int
+bufferevent_set_max_single_read(struct bufferevent *bev, size_t size)
+{
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	if (size == 0 || size > EV_SSIZE_MAX)
+		bevp->max_single_read = MAX_SINGLE_READ_DEFAULT;
+	else
+		bevp->max_single_read = size;
+	BEV_UNLOCK(bev);
+	return 0;
+}
+
+int
+bufferevent_set_max_single_write(struct bufferevent *bev, size_t size)
+{
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	if (size == 0 || size > EV_SSIZE_MAX)
+		bevp->max_single_write = MAX_SINGLE_WRITE_DEFAULT;
+	else
+		bevp->max_single_write = size;
+	BEV_UNLOCK(bev);
+	return 0;
+}
+
+ev_ssize_t
+bufferevent_get_max_single_read(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+
+	BEV_LOCK(bev);
+	r = BEV_UPCAST(bev)->max_single_read;
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+ev_ssize_t
+bufferevent_get_max_single_write(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+
+	BEV_LOCK(bev);
+	r = BEV_UPCAST(bev)->max_single_write;
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+ev_ssize_t
+bufferevent_get_max_to_read(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+	BEV_LOCK(bev);
+	r = bufferevent_get_read_max_(BEV_UPCAST(bev));
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+ev_ssize_t
+bufferevent_get_max_to_write(struct bufferevent *bev)
+{
+	ev_ssize_t r;
+	BEV_LOCK(bev);
+	r = bufferevent_get_write_max_(BEV_UPCAST(bev));
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+const struct ev_token_bucket_cfg *
+bufferevent_get_token_bucket_cfg(const struct bufferevent *bev) {
+	struct bufferevent_private *bufev_private = BEV_UPCAST(bev);
+	struct ev_token_bucket_cfg *cfg;
+
+	BEV_LOCK(bev);
+
+	if (bufev_private->rate_limiting) {
+		cfg = bufev_private->rate_limiting->cfg;
+	} else {
+		cfg = NULL;
+	}
+
+	BEV_UNLOCK(bev);
+
+	return cfg;
+}
+
+/* Mostly you don't want to use this function from inside libevent;
+ * bufferevent_get_read_max_() is more likely what you want*/
+ev_ssize_t
+bufferevent_rate_limit_group_get_read_limit(
+	struct bufferevent_rate_limit_group *grp)
+{
+	ev_ssize_t r;
+	LOCK_GROUP(grp);
+	r = grp->rate_limit.read_limit;
+	UNLOCK_GROUP(grp);
+	return r;
+}
+
+/* Mostly you don't want to use this function from inside libevent;
+ * bufferevent_get_write_max_() is more likely what you want. */
+ev_ssize_t
+bufferevent_rate_limit_group_get_write_limit(
+	struct bufferevent_rate_limit_group *grp)
+{
+	ev_ssize_t r;
+	LOCK_GROUP(grp);
+	r = grp->rate_limit.write_limit;
+	UNLOCK_GROUP(grp);
+	return r;
+}
+
+int
+bufferevent_decrement_read_limit(struct bufferevent *bev, ev_ssize_t decr)
+{
+	int r = 0;
+	ev_ssize_t old_limit, new_limit;
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	EVUTIL_ASSERT(bevp->rate_limiting && bevp->rate_limiting->cfg);
+	old_limit = bevp->rate_limiting->limit.read_limit;
+
+	new_limit = (bevp->rate_limiting->limit.read_limit -= decr);
+	if (old_limit > 0 && new_limit <= 0) {
+		bufferevent_suspend_read_(bev, BEV_SUSPEND_BW);
+		if (event_add(&bevp->rate_limiting->refill_bucket_event,
+			&bevp->rate_limiting->cfg->tick_timeout) < 0)
+			r = -1;
+	} else if (old_limit <= 0 && new_limit > 0) {
+		if (!(bevp->write_suspended & BEV_SUSPEND_BW))
+			event_del(&bevp->rate_limiting->refill_bucket_event);
+		bufferevent_unsuspend_read_(bev, BEV_SUSPEND_BW);
+	}
+
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+int
+bufferevent_decrement_write_limit(struct bufferevent *bev, ev_ssize_t decr)
+{
+	/* XXXX this is mostly copy-and-paste from
+	 * bufferevent_decrement_read_limit */
+	int r = 0;
+	ev_ssize_t old_limit, new_limit;
+	struct bufferevent_private *bevp;
+	BEV_LOCK(bev);
+	bevp = BEV_UPCAST(bev);
+	EVUTIL_ASSERT(bevp->rate_limiting && bevp->rate_limiting->cfg);
+	old_limit = bevp->rate_limiting->limit.write_limit;
+
+	new_limit = (bevp->rate_limiting->limit.write_limit -= decr);
+	if (old_limit > 0 && new_limit <= 0) {
+		bufferevent_suspend_write_(bev, BEV_SUSPEND_BW);
+		if (event_add(&bevp->rate_limiting->refill_bucket_event,
+			&bevp->rate_limiting->cfg->tick_timeout) < 0)
+			r = -1;
+	} else if (old_limit <= 0 && new_limit > 0) {
+		if (!(bevp->read_suspended & BEV_SUSPEND_BW))
+			event_del(&bevp->rate_limiting->refill_bucket_event);
+		bufferevent_unsuspend_write_(bev, BEV_SUSPEND_BW);
+	}
+
+	BEV_UNLOCK(bev);
+	return r;
+}
+
+int
+bufferevent_rate_limit_group_decrement_read(
+	struct bufferevent_rate_limit_group *grp, ev_ssize_t decr)
+{
+	int r = 0;
+	ev_ssize_t old_limit, new_limit;
+	LOCK_GROUP(grp);
+	old_limit = grp->rate_limit.read_limit;
+	new_limit = (grp->rate_limit.read_limit -= decr);
+
+	if (old_limit > 0 && new_limit <= 0) {
+		bev_group_suspend_reading_(grp);
+	} else if (old_limit <= 0 && new_limit > 0) {
+		bev_group_unsuspend_reading_(grp);
+	}
+
+	UNLOCK_GROUP(grp);
+	return r;
+}
+
+int
+bufferevent_rate_limit_group_decrement_write(
+	struct bufferevent_rate_limit_group *grp, ev_ssize_t decr)
+{
+	int r = 0;
+	ev_ssize_t old_limit, new_limit;
+	LOCK_GROUP(grp);
+	old_limit = grp->rate_limit.write_limit;
+	new_limit = (grp->rate_limit.write_limit -= decr);
+
+	if (old_limit > 0 && new_limit <= 0) {
+		bev_group_suspend_writing_(grp);
+	} else if (old_limit <= 0 && new_limit > 0) {
+		bev_group_unsuspend_writing_(grp);
+	}
+
+	UNLOCK_GROUP(grp);
+	return r;
+}
+
+void
+bufferevent_rate_limit_group_get_totals(struct bufferevent_rate_limit_group *grp,
+    ev_uint64_t *total_read_out, ev_uint64_t *total_written_out)
+{
+	EVUTIL_ASSERT(grp != NULL);
+	if (total_read_out)
+		*total_read_out = grp->total_read;
+	if (total_written_out)
+		*total_written_out = grp->total_written;
+}
+
+void
+bufferevent_rate_limit_group_reset_totals(struct bufferevent_rate_limit_group *grp)
+{
+	grp->total_read = grp->total_written = 0;
+}
+
+int
+bufferevent_ratelim_init_(struct bufferevent_private *bev)
+{
+	bev->rate_limiting = NULL;
+	bev->max_single_read = MAX_SINGLE_READ_DEFAULT;
+	bev->max_single_write = MAX_SINGLE_WRITE_DEFAULT;
+
+	return 0;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/bufferevent_sock.c b/extra/libevent/libevent-2.1.11-stable/bufferevent_sock.c
new file mode 100644
index 000000000000..f275b0238099
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/bufferevent_sock.c
@@ -0,0 +1,707 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+#include "event2/util.h"
+#include "event2/bufferevent.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent_struct.h"
+#include "event2/bufferevent_compat.h"
+#include "event2/event.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+#include "util-internal.h"
+#ifdef _WIN32
+#include "iocp-internal.h"
+#endif
+
+/* prototypes */
+static int be_socket_enable(struct bufferevent *, short);
+static int be_socket_disable(struct bufferevent *, short);
+static void be_socket_destruct(struct bufferevent *);
+static int be_socket_flush(struct bufferevent *, short, enum bufferevent_flush_mode);
+static int be_socket_ctrl(struct bufferevent *, enum bufferevent_ctrl_op, union bufferevent_ctrl_data *);
+
+static void be_socket_setfd(struct bufferevent *, evutil_socket_t);
+
+const struct bufferevent_ops bufferevent_ops_socket = {
+	"socket",
+	evutil_offsetof(struct bufferevent_private, bev),
+	be_socket_enable,
+	be_socket_disable,
+	NULL, /* unlink */
+	be_socket_destruct,
+	bufferevent_generic_adj_existing_timeouts_,
+	be_socket_flush,
+	be_socket_ctrl,
+};
+
+const struct sockaddr*
+bufferevent_socket_get_conn_address_(struct bufferevent *bev)
+{
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	return (struct sockaddr *)&bev_p->conn_address;
+}
+
+void
+bufferevent_socket_set_conn_address_fd_(struct bufferevent *bev,
+	evutil_socket_t fd)
+{
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+
+	socklen_t len = sizeof(bev_p->conn_address);
+
+	struct sockaddr *addr = (struct sockaddr *)&bev_p->conn_address;
+	if (addr->sa_family != AF_UNSPEC)
+		getpeername(fd, addr, &len);
+}
+
+void
+bufferevent_socket_set_conn_address_(struct bufferevent *bev,
+	struct sockaddr *addr, size_t addrlen)
+{
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	EVUTIL_ASSERT(addrlen <= sizeof(bev_p->conn_address));
+	memcpy(&bev_p->conn_address, addr, addrlen);
+}
+
+static void
+bufferevent_socket_outbuf_cb(struct evbuffer *buf,
+    const struct evbuffer_cb_info *cbinfo,
+    void *arg)
+{
+	struct bufferevent *bufev = arg;
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+
+	if (cbinfo->n_added &&
+	    (bufev->enabled & EV_WRITE) &&
+	    !event_pending(&bufev->ev_write, EV_WRITE, NULL) &&
+	    !bufev_p->write_suspended) {
+		/* Somebody added data to the buffer, and we would like to
+		 * write, and we were not writing.  So, start writing. */
+		if (bufferevent_add_event_(&bufev->ev_write, &bufev->timeout_write) == -1) {
+		    /* Should we log this? */
+		}
+	}
+}
+
+static void
+bufferevent_readcb(evutil_socket_t fd, short event, void *arg)
+{
+	struct bufferevent *bufev = arg;
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+	struct evbuffer *input;
+	int res = 0;
+	short what = BEV_EVENT_READING;
+	ev_ssize_t howmuch = -1, readmax=-1;
+
+	bufferevent_incref_and_lock_(bufev);
+
+	if (event == EV_TIMEOUT) {
+		/* Note that we only check for event==EV_TIMEOUT. If
+		 * event==EV_TIMEOUT|EV_READ, we can safely ignore the
+		 * timeout, since a read has occurred */
+		what |= BEV_EVENT_TIMEOUT;
+		goto error;
+	}
+
+	input = bufev->input;
+
+	/*
+	 * If we have a high watermark configured then we don't want to
+	 * read more data than would make us reach the watermark.
+	 */
+	if (bufev->wm_read.high != 0) {
+		howmuch = bufev->wm_read.high - evbuffer_get_length(input);
+		/* we somehow lowered the watermark, stop reading */
+		if (howmuch <= 0) {
+			bufferevent_wm_suspend_read(bufev);
+			goto done;
+		}
+	}
+	readmax = bufferevent_get_read_max_(bufev_p);
+	if (howmuch < 0 || howmuch > readmax) /* The use of -1 for "unlimited"
+					       * uglifies this code. XXXX */
+		howmuch = readmax;
+	if (bufev_p->read_suspended)
+		goto done;
+
+	evbuffer_unfreeze(input, 0);
+	res = evbuffer_read(input, fd, (int)howmuch); /* XXXX evbuffer_read would do better to take and return ev_ssize_t */
+	evbuffer_freeze(input, 0);
+
+	if (res == -1) {
+		int err = evutil_socket_geterror(fd);
+		if (EVUTIL_ERR_RW_RETRIABLE(err))
+			goto reschedule;
+		if (EVUTIL_ERR_CONNECT_REFUSED(err)) {
+			bufev_p->connection_refused = 1;
+			goto done;
+		}
+		/* error case */
+		what |= BEV_EVENT_ERROR;
+	} else if (res == 0) {
+		/* eof case */
+		what |= BEV_EVENT_EOF;
+	}
+
+	if (res <= 0)
+		goto error;
+
+	bufferevent_decrement_read_buckets_(bufev_p, res);
+
+	/* Invoke the user callback - must always be called last */
+	bufferevent_trigger_nolock_(bufev, EV_READ, 0);
+
+	goto done;
+
+ reschedule:
+	goto done;
+
+ error:
+	bufferevent_disable(bufev, EV_READ);
+	bufferevent_run_eventcb_(bufev, what, 0);
+
+ done:
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+static void
+bufferevent_writecb(evutil_socket_t fd, short event, void *arg)
+{
+	struct bufferevent *bufev = arg;
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+	int res = 0;
+	short what = BEV_EVENT_WRITING;
+	int connected = 0;
+	ev_ssize_t atmost = -1;
+
+	bufferevent_incref_and_lock_(bufev);
+
+	if (event == EV_TIMEOUT) {
+		/* Note that we only check for event==EV_TIMEOUT. If
+		 * event==EV_TIMEOUT|EV_WRITE, we can safely ignore the
+		 * timeout, since a read has occurred */
+		what |= BEV_EVENT_TIMEOUT;
+		goto error;
+	}
+	if (bufev_p->connecting) {
+		int c = evutil_socket_finished_connecting_(fd);
+		/* we need to fake the error if the connection was refused
+		 * immediately - usually connection to localhost on BSD */
+		if (bufev_p->connection_refused) {
+			bufev_p->connection_refused = 0;
+			c = -1;
+		}
+
+		if (c == 0)
+			goto done;
+
+		bufev_p->connecting = 0;
+		if (c < 0) {
+			event_del(&bufev->ev_write);
+			event_del(&bufev->ev_read);
+			bufferevent_run_eventcb_(bufev, BEV_EVENT_ERROR, 0);
+			goto done;
+		} else {
+			connected = 1;
+			bufferevent_socket_set_conn_address_fd_(bufev, fd);
+#ifdef _WIN32
+			if (BEV_IS_ASYNC(bufev)) {
+				event_del(&bufev->ev_write);
+				bufferevent_async_set_connected_(bufev);
+				bufferevent_run_eventcb_(bufev,
+						BEV_EVENT_CONNECTED, 0);
+				goto done;
+			}
+#endif
+			bufferevent_run_eventcb_(bufev,
+					BEV_EVENT_CONNECTED, 0);
+			if (!(bufev->enabled & EV_WRITE) ||
+			    bufev_p->write_suspended) {
+				event_del(&bufev->ev_write);
+				goto done;
+			}
+		}
+	}
+
+	atmost = bufferevent_get_write_max_(bufev_p);
+
+	if (bufev_p->write_suspended)
+		goto done;
+
+	if (evbuffer_get_length(bufev->output)) {
+		evbuffer_unfreeze(bufev->output, 1);
+		res = evbuffer_write_atmost(bufev->output, fd, atmost);
+		evbuffer_freeze(bufev->output, 1);
+		if (res == -1) {
+			int err = evutil_socket_geterror(fd);
+			if (EVUTIL_ERR_RW_RETRIABLE(err))
+				goto reschedule;
+			what |= BEV_EVENT_ERROR;
+		} else if (res == 0) {
+			/* eof case
+			   XXXX Actually, a 0 on write doesn't indicate
+			   an EOF. An ECONNRESET might be more typical.
+			 */
+			what |= BEV_EVENT_EOF;
+		}
+		if (res <= 0)
+			goto error;
+
+		bufferevent_decrement_write_buckets_(bufev_p, res);
+	}
+
+	if (evbuffer_get_length(bufev->output) == 0) {
+		event_del(&bufev->ev_write);
+	}
+
+	/*
+	 * Invoke the user callback if our buffer is drained or below the
+	 * low watermark.
+	 */
+	if (res || !connected) {
+		bufferevent_trigger_nolock_(bufev, EV_WRITE, 0);
+	}
+
+	goto done;
+
+ reschedule:
+	if (evbuffer_get_length(bufev->output) == 0) {
+		event_del(&bufev->ev_write);
+	}
+	goto done;
+
+ error:
+	bufferevent_disable(bufev, EV_WRITE);
+	bufferevent_run_eventcb_(bufev, what, 0);
+
+ done:
+	bufferevent_decref_and_unlock_(bufev);
+}
+
+struct bufferevent *
+bufferevent_socket_new(struct event_base *base, evutil_socket_t fd,
+    int options)
+{
+	struct bufferevent_private *bufev_p;
+	struct bufferevent *bufev;
+
+#ifdef _WIN32
+	if (base && event_base_get_iocp_(base))
+		return bufferevent_async_new_(base, fd, options);
+#endif
+
+	if ((bufev_p = mm_calloc(1, sizeof(struct bufferevent_private)))== NULL)
+		return NULL;
+
+	if (bufferevent_init_common_(bufev_p, base, &bufferevent_ops_socket,
+				    options) < 0) {
+		mm_free(bufev_p);
+		return NULL;
+	}
+	bufev = &bufev_p->bev;
+	evbuffer_set_flags(bufev->output, EVBUFFER_FLAG_DRAINS_TO_FD);
+
+	event_assign(&bufev->ev_read, bufev->ev_base, fd,
+	    EV_READ|EV_PERSIST|EV_FINALIZE, bufferevent_readcb, bufev);
+	event_assign(&bufev->ev_write, bufev->ev_base, fd,
+	    EV_WRITE|EV_PERSIST|EV_FINALIZE, bufferevent_writecb, bufev);
+
+	evbuffer_add_cb(bufev->output, bufferevent_socket_outbuf_cb, bufev);
+
+	evbuffer_freeze(bufev->input, 0);
+	evbuffer_freeze(bufev->output, 1);
+
+	return bufev;
+}
+
+int
+bufferevent_socket_connect(struct bufferevent *bev,
+    const struct sockaddr *sa, int socklen)
+{
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bev);
+
+	evutil_socket_t fd;
+	int r = 0;
+	int result=-1;
+	int ownfd = 0;
+
+	bufferevent_incref_and_lock_(bev);
+
+	fd = bufferevent_getfd(bev);
+	if (fd < 0) {
+		if (!sa)
+			goto done;
+		fd = evutil_socket_(sa->sa_family,
+		    SOCK_STREAM|EVUTIL_SOCK_NONBLOCK, 0);
+		if (fd < 0)
+			goto freesock;
+		ownfd = 1;
+	}
+	if (sa) {
+#ifdef _WIN32
+		if (bufferevent_async_can_connect_(bev)) {
+			bufferevent_setfd(bev, fd);
+			r = bufferevent_async_connect_(bev, fd, sa, socklen);
+			if (r < 0)
+				goto freesock;
+			bufev_p->connecting = 1;
+			result = 0;
+			goto done;
+		} else
+#endif
+		r = evutil_socket_connect_(&fd, sa, socklen);
+		if (r < 0)
+			goto freesock;
+	}
+#ifdef _WIN32
+	/* ConnectEx() isn't always around, even when IOCP is enabled.
+	 * Here, we borrow the socket object's write handler to fall back
+	 * on a non-blocking connect() when ConnectEx() is unavailable. */
+	if (BEV_IS_ASYNC(bev)) {
+		event_assign(&bev->ev_write, bev->ev_base, fd,
+		    EV_WRITE|EV_PERSIST|EV_FINALIZE, bufferevent_writecb, bev);
+	}
+#endif
+	bufferevent_setfd(bev, fd);
+	if (r == 0) {
+		if (! be_socket_enable(bev, EV_WRITE)) {
+			bufev_p->connecting = 1;
+			result = 0;
+			goto done;
+		}
+	} else if (r == 1) {
+		/* The connect succeeded already. How very BSD of it. */
+		result = 0;
+		bufev_p->connecting = 1;
+		bufferevent_trigger_nolock_(bev, EV_WRITE, BEV_OPT_DEFER_CALLBACKS);
+	} else {
+		/* The connect failed already.  How very BSD of it. */
+		result = 0;
+		bufferevent_run_eventcb_(bev, BEV_EVENT_ERROR, BEV_OPT_DEFER_CALLBACKS);
+		bufferevent_disable(bev, EV_WRITE|EV_READ);
+	}
+
+	goto done;
+
+freesock:
+	if (ownfd)
+		evutil_closesocket(fd);
+done:
+	bufferevent_decref_and_unlock_(bev);
+	return result;
+}
+
+static void
+bufferevent_connect_getaddrinfo_cb(int result, struct evutil_addrinfo *ai,
+    void *arg)
+{
+	struct bufferevent *bev = arg;
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+	int r;
+	BEV_LOCK(bev);
+
+	bufferevent_unsuspend_write_(bev, BEV_SUSPEND_LOOKUP);
+	bufferevent_unsuspend_read_(bev, BEV_SUSPEND_LOOKUP);
+
+	bev_p->dns_request = NULL;
+
+	if (result == EVUTIL_EAI_CANCEL) {
+		bev_p->dns_error = result;
+		bufferevent_decref_and_unlock_(bev);
+		return;
+	}
+	if (result != 0) {
+		bev_p->dns_error = result;
+		bufferevent_run_eventcb_(bev, BEV_EVENT_ERROR, 0);
+		bufferevent_decref_and_unlock_(bev);
+		if (ai)
+			evutil_freeaddrinfo(ai);
+		return;
+	}
+
+	/* XXX use the other addrinfos? */
+	bufferevent_socket_set_conn_address_(bev, ai->ai_addr, (int)ai->ai_addrlen);
+	r = bufferevent_socket_connect(bev, ai->ai_addr, (int)ai->ai_addrlen);
+	if (r < 0)
+		bufferevent_run_eventcb_(bev, BEV_EVENT_ERROR, 0);
+	bufferevent_decref_and_unlock_(bev);
+	evutil_freeaddrinfo(ai);
+}
+
+int
+bufferevent_socket_connect_hostname(struct bufferevent *bev,
+    struct evdns_base *evdns_base, int family, const char *hostname, int port)
+{
+	char portbuf[10];
+	struct evutil_addrinfo hint;
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+
+	if (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)
+		return -1;
+	if (port < 1 || port > 65535)
+		return -1;
+
+	memset(&hint, 0, sizeof(hint));
+	hint.ai_family = family;
+	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_socktype = SOCK_STREAM;
+
+	evutil_snprintf(portbuf, sizeof(portbuf), "%d", port);
+
+	BEV_LOCK(bev);
+	bev_p->dns_error = 0;
+
+	bufferevent_suspend_write_(bev, BEV_SUSPEND_LOOKUP);
+	bufferevent_suspend_read_(bev, BEV_SUSPEND_LOOKUP);
+
+	bufferevent_incref_(bev);
+	bev_p->dns_request = evutil_getaddrinfo_async_(evdns_base, hostname,
+	    portbuf, &hint, bufferevent_connect_getaddrinfo_cb, bev);
+	BEV_UNLOCK(bev);
+
+	return 0;
+}
+
+int
+bufferevent_socket_get_dns_error(struct bufferevent *bev)
+{
+	int rv;
+	struct bufferevent_private *bev_p = BEV_UPCAST(bev);
+
+	BEV_LOCK(bev);
+	rv = bev_p->dns_error;
+	BEV_UNLOCK(bev);
+
+	return rv;
+}
+
+/*
+ * Create a new buffered event object.
+ *
+ * The read callback is invoked whenever we read new data.
+ * The write callback is invoked whenever the output buffer is drained.
+ * The error callback is invoked on a write/read error or on EOF.
+ *
+ * Both read and write callbacks maybe NULL.  The error callback is not
+ * allowed to be NULL and have to be provided always.
+ */
+
+struct bufferevent *
+bufferevent_new(evutil_socket_t fd,
+    bufferevent_data_cb readcb, bufferevent_data_cb writecb,
+    bufferevent_event_cb eventcb, void *cbarg)
+{
+	struct bufferevent *bufev;
+
+	if (!(bufev = bufferevent_socket_new(NULL, fd, 0)))
+		return NULL;
+
+	bufferevent_setcb(bufev, readcb, writecb, eventcb, cbarg);
+
+	return bufev;
+}
+
+
+static int
+be_socket_enable(struct bufferevent *bufev, short event)
+{
+	if (event & EV_READ &&
+	    bufferevent_add_event_(&bufev->ev_read, &bufev->timeout_read) == -1)
+			return -1;
+	if (event & EV_WRITE &&
+	    bufferevent_add_event_(&bufev->ev_write, &bufev->timeout_write) == -1)
+			return -1;
+	return 0;
+}
+
+static int
+be_socket_disable(struct bufferevent *bufev, short event)
+{
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+	if (event & EV_READ) {
+		if (event_del(&bufev->ev_read) == -1)
+			return -1;
+	}
+	/* Don't actually disable the write if we are trying to connect. */
+	if ((event & EV_WRITE) && ! bufev_p->connecting) {
+		if (event_del(&bufev->ev_write) == -1)
+			return -1;
+	}
+	return 0;
+}
+
+static void
+be_socket_destruct(struct bufferevent *bufev)
+{
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+	evutil_socket_t fd;
+	EVUTIL_ASSERT(BEV_IS_SOCKET(bufev));
+
+	fd = event_get_fd(&bufev->ev_read);
+
+	if ((bufev_p->options & BEV_OPT_CLOSE_ON_FREE) && fd >= 0)
+		EVUTIL_CLOSESOCKET(fd);
+
+	evutil_getaddrinfo_cancel_async_(bufev_p->dns_request);
+}
+
+static int
+be_socket_flush(struct bufferevent *bev, short iotype,
+    enum bufferevent_flush_mode mode)
+{
+	return 0;
+}
+
+
+static void
+be_socket_setfd(struct bufferevent *bufev, evutil_socket_t fd)
+{
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+
+	BEV_LOCK(bufev);
+	EVUTIL_ASSERT(BEV_IS_SOCKET(bufev));
+
+	event_del(&bufev->ev_read);
+	event_del(&bufev->ev_write);
+
+	evbuffer_unfreeze(bufev->input, 0);
+	evbuffer_unfreeze(bufev->output, 1);
+
+	event_assign(&bufev->ev_read, bufev->ev_base, fd,
+	    EV_READ|EV_PERSIST|EV_FINALIZE, bufferevent_readcb, bufev);
+	event_assign(&bufev->ev_write, bufev->ev_base, fd,
+	    EV_WRITE|EV_PERSIST|EV_FINALIZE, bufferevent_writecb, bufev);
+
+	if (fd >= 0)
+		bufferevent_enable(bufev, bufev->enabled);
+
+	evutil_getaddrinfo_cancel_async_(bufev_p->dns_request);
+
+	BEV_UNLOCK(bufev);
+}
+
+/* XXXX Should non-socket bufferevents support this? */
+int
+bufferevent_priority_set(struct bufferevent *bufev, int priority)
+{
+	int r = -1;
+	struct bufferevent_private *bufev_p = BEV_UPCAST(bufev);
+
+	BEV_LOCK(bufev);
+	if (!BEV_IS_SOCKET(bufev))
+		goto done;
+
+	if (event_priority_set(&bufev->ev_read, priority) == -1)
+		goto done;
+	if (event_priority_set(&bufev->ev_write, priority) == -1)
+		goto done;
+
+	event_deferred_cb_set_priority_(&bufev_p->deferred, priority);
+
+	r = 0;
+done:
+	BEV_UNLOCK(bufev);
+	return r;
+}
+
+/* XXXX Should non-socket bufferevents support this? */
+int
+bufferevent_base_set(struct event_base *base, struct bufferevent *bufev)
+{
+	int res = -1;
+
+	BEV_LOCK(bufev);
+	if (!BEV_IS_SOCKET(bufev))
+		goto done;
+
+	bufev->ev_base = base;
+
+	res = event_base_set(base, &bufev->ev_read);
+	if (res == -1)
+		goto done;
+
+	res = event_base_set(base, &bufev->ev_write);
+done:
+	BEV_UNLOCK(bufev);
+	return res;
+}
+
+static int
+be_socket_ctrl(struct bufferevent *bev, enum bufferevent_ctrl_op op,
+    union bufferevent_ctrl_data *data)
+{
+	switch (op) {
+	case BEV_CTRL_SET_FD:
+		be_socket_setfd(bev, data->fd);
+		return 0;
+	case BEV_CTRL_GET_FD:
+		data->fd = event_get_fd(&bev->ev_read);
+		return 0;
+	case BEV_CTRL_GET_UNDERLYING:
+	case BEV_CTRL_CANCEL_ALL:
+	default:
+		return -1;
+	}
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/changelist-internal.h b/extra/libevent/libevent-2.1.11-stable/changelist-internal.h
new file mode 100644
index 000000000000..98fc52aebfa7
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/changelist-internal.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef CHANGELIST_INTERNAL_H_INCLUDED_
+#define CHANGELIST_INTERNAL_H_INCLUDED_
+
+/*
+  A "changelist" is a list of all the fd status changes that should be made
+  between calls to the backend's dispatch function.  There are a few reasons
+  that a backend would want to queue changes like this rather than processing
+  them immediately.
+
+    1) Sometimes applications will add and delete the same event more than
+       once between calls to dispatch.  Processing these changes immediately
+       is needless, and potentially expensive (especially if we're on a system
+       that makes one syscall per changed event).
+
+    2) Sometimes we can coalesce multiple changes on the same fd into a single
+       syscall if we know about them in advance.  For example, epoll can do an
+       add and a delete at the same time, but only if we have found out about
+       both of them before we tell epoll.
+
+    3) Sometimes adding an event that we immediately delete can cause
+       unintended consequences: in kqueue, this makes pending events get
+       reported spuriously.
+ */
+
+#include "event2/util.h"
+
+/** Represents a */
+struct event_change {
+	/** The fd or signal whose events are to be changed */
+	evutil_socket_t fd;
+	/* The events that were enabled on the fd before any of these changes
+	   were made.  May include EV_READ or EV_WRITE. */
+	short old_events;
+
+	/* The changes that we want to make in reading and writing on this fd.
+	 * If this is a signal, then read_change has EV_CHANGE_SIGNAL set,
+	 * and write_change is unused. */
+	ev_uint8_t read_change;
+	ev_uint8_t write_change;
+	ev_uint8_t close_change;
+};
+
+/* Flags for read_change and write_change. */
+
+/* If set, add the event. */
+#define EV_CHANGE_ADD     0x01
+/* If set, delete the event.  Exclusive with EV_CHANGE_ADD */
+#define EV_CHANGE_DEL     0x02
+/* If set, this event refers a signal, not an fd. */
+#define EV_CHANGE_SIGNAL  EV_SIGNAL
+/* Set for persistent events.  Currently not used. */
+#define EV_CHANGE_PERSIST EV_PERSIST
+/* Set for adding edge-triggered events. */
+#define EV_CHANGE_ET      EV_ET
+
+/* The value of fdinfo_size that a backend should use if it is letting
+ * changelist handle its add and delete functions. */
+#define EVENT_CHANGELIST_FDINFO_SIZE sizeof(int)
+
+/** Set up the data fields in a changelist. */
+void event_changelist_init_(struct event_changelist *changelist);
+/** Remove every change in the changelist, and make corresponding changes
+ * in the event maps in the base.  This function is generally used right
+ * after making all the changes in the changelist. */
+void event_changelist_remove_all_(struct event_changelist *changelist,
+    struct event_base *base);
+/** Free all memory held in a changelist. */
+void event_changelist_freemem_(struct event_changelist *changelist);
+
+/** Implementation of eventop_add that queues the event in a changelist. */
+int event_changelist_add_(struct event_base *base, evutil_socket_t fd, short old, short events,
+    void *p);
+/** Implementation of eventop_del that queues the event in a changelist. */
+int event_changelist_del_(struct event_base *base, evutil_socket_t fd, short old, short events,
+    void *p);
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/AddCompilerFlags.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/AddCompilerFlags.cmake
new file mode 100644
index 000000000000..9dc21d03adc5
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/AddCompilerFlags.cmake
@@ -0,0 +1,13 @@
+include(CheckCCompilerFlag)
+
+macro(add_compiler_flags)
+	foreach(flag ${ARGN})
+		string(REGEX REPLACE "[-.+/:= ]" "_" _flag_esc "${flag}")
+
+		check_c_compiler_flag("${flag}" check_c_compiler_flag_${_flag_esc})
+
+		if (check_c_compiler_flag_${_flag_esc})
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
+		endif()
+	endforeach()
+endmacro()
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/AddEventLibrary.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/AddEventLibrary.cmake
new file mode 100644
index 000000000000..352c86ba5860
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/AddEventLibrary.cmake
@@ -0,0 +1,163 @@
+include(CMakeParseArguments)
+
+set(LIBEVENT_SHARED_LIBRARIES "")
+set(LIBEVENT_STATIC_LIBRARIES "")
+
+macro(set_event_shared_lib_flags LIB_NAME)
+    set_target_properties("${LIB_NAME}_shared" PROPERTIES
+        COMPILE_FLAGS ${ARGN})
+    set_target_properties("${LIB_NAME}_shared" PROPERTIES
+        LINK_FLAGS ${ARGN})
+endmacro()
+
+macro(generate_pkgconfig LIB_NAME)
+    set(prefix      ${CMAKE_INSTALL_PREFIX})
+    set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+    set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
+    set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
+
+    set(VERSION ${EVENT_ABI_LIBVERSION})
+
+    set(LIBS         "")
+    foreach (LIB ${LIB_PLATFORM})
+        set(LIBS "${LIBS} -L${LIB}")
+    endforeach()
+
+    set(OPENSSL_LIBS "")
+    foreach(LIB ${OPENSSL_LIBRARIES})
+        set(OPENSSL_LIBS "${OPENSSL_LIBS} -L${LIB}")
+    endforeach()
+
+    configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY)
+    install(
+        FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig"
+    )
+endmacro()
+
+
+# Global variables that it uses:
+# - EVENT_ABI_LIBVERSION
+# - EVENT_ABI_LIBVERSION_CURRENT
+# - EVENT_ABI_LIBVERSION_REVISION
+# - EVENT_ABI_LIBVERSION_AGE
+# - EVENT_PACKAGE_RELEASE
+# - CMAKE_THREAD_LIBS_INIT LIB_PLATFORM
+# - OPENSSL_LIBRARIES
+# - HDR_PUBLIC
+# - EVENT_INSTALL_INCLUDE_DIR
+# - EVENT_SHARED_FLAGS
+# - EVENT_LIBRARY_STATIC
+# - EVENT_LIBRARY_SHARED
+#
+# Exported variables:
+# - LIBEVENT_SHARED_LIBRARIES
+# - LIBEVENT_STATIC_LIBRARIES
+macro(add_event_library LIB_NAME)
+    cmake_parse_arguments(LIB
+        "" # Options
+        "VERSION" # One val
+        "SOURCES;LIBRARIES" # Multi val
+        ${ARGN}
+    )
+
+    set(ADD_EVENT_LIBRARY_TARGETS)
+    set(ADD_EVENT_LIBRARY_INTERFACE)
+
+    if (${EVENT_LIBRARY_STATIC})
+        add_library("${LIB_NAME}_static" STATIC ${LIB_SOURCES})
+        set_target_properties("${LIB_NAME}_static" PROPERTIES
+            OUTPUT_NAME "${LIB_NAME}"
+            CLEAN_DIRECT_OUTPUT 1)
+        set_target_properties(
+            "${LIB_NAME}_static" PROPERTIES
+            PUBLIC_HEADER "${HDR_PUBLIC}")
+
+        list(APPEND LIBEVENT_STATIC_LIBRARIES "${LIB_NAME}_static")
+        list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static")
+
+        set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_static")
+    endif()
+
+    if (${EVENT_LIBRARY_SHARED})
+        add_library("${LIB_NAME}_shared" SHARED ${LIB_SOURCES})
+
+        target_link_libraries("${LIB_NAME}_shared"
+            ${CMAKE_THREAD_LIBS_INIT}
+            ${LIB_PLATFORM}
+            ${LIB_LIBRARIES})
+
+        if (EVENT_SHARED_FLAGS)
+            set_event_shared_lib_flags("${LIB_NAME}" "${EVENT_SHARED_FLAGS}")
+        endif()
+
+        if (WIN32)
+            set_target_properties(
+                "${LIB_NAME}_shared" PROPERTIES
+                OUTPUT_NAME "${LIB_NAME}"
+                SOVERSION ${EVENT_ABI_LIBVERSION})
+        elseif (APPLE)
+            math(EXPR COMPATIBILITY_VERSION "${EVENT_ABI_LIBVERSION_CURRENT}+1")
+            math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}")
+            set_target_properties(
+                "${LIB_NAME}_shared" PROPERTIES
+                OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}.${CURRENT_MINUS_AGE}"
+                INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+                LINK_FLAGS "-compatibility_version ${COMPATIBILITY_VERSION} -current_version ${COMPATIBILITY_VERSION}.${EVENT_ABI_LIBVERSION_REVISION}")
+        else()
+            math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}")
+            set_target_properties(
+                "${LIB_NAME}_shared" PROPERTIES
+                OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}"
+                VERSION "${CURRENT_MINUS_AGE}.${EVENT_ABI_LIBVERSION_AGE}.${EVENT_ABI_LIBVERSION_REVISION}"
+                SOVERSION "${CURRENT_MINUS_AGE}")
+        endif()
+
+        set_target_properties(
+            "${LIB_NAME}_shared" PROPERTIES
+            PUBLIC_HEADER "${HDR_PUBLIC}"
+            CLEAN_DIRECT_OUTPUT 1)
+
+        if (NOT WIN32)
+            set(LIB_LINK_NAME
+                "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+
+            add_custom_command(TARGET ${LIB_NAME}_shared
+                POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E create_symlink
+                    "$<TARGET_FILE_NAME:${LIB_NAME}_shared>"
+                    "${LIB_LINK_NAME}"
+                WORKING_DIRECTORY "lib")
+        endif()
+
+        list(APPEND LIBEVENT_SHARED_LIBRARIES "${LIB_NAME}_shared")
+        list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_shared")
+
+        set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_shared")
+    endif()
+
+    export(TARGETS ${ADD_EVENT_LIBRARY_TARGETS}
+       FILE "${PROJECT_BINARY_DIR}/LibeventTargets.cmake"
+       APPEND
+    )
+
+    install(TARGETS ${ADD_EVENT_LIBRARY_TARGETS}
+        EXPORT LibeventTargets
+        LIBRARY DESTINATION "lib" COMPONENT lib
+        ARCHIVE DESTINATION "lib" COMPONENT lib
+        RUNTIME DESTINATION "lib" COMPONENT lib
+        PUBLIC_HEADER DESTINATION "include/event2"
+        COMPONENT dev
+    )
+    if (NOT WIN32 AND ${EVENT_LIBRARY_SHARED})
+        install(FILES
+            "$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}"
+            DESTINATION "lib"
+            COMPONENT lib)
+    endif()
+
+    add_library(${LIB_NAME} INTERFACE)
+    target_link_libraries(${LIB_NAME} INTERFACE ${ADD_EVENT_LIBRARY_INTERFACE})
+
+    generate_pkgconfig("${LIB_NAME}")
+endmacro()
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/COPYING-CMAKE-SCRIPTS b/extra/libevent/libevent-2.1.11-stable/cmake/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 000000000000..ab3c4d25d164
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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/extra/libevent/libevent-2.1.11-stable/cmake/CheckConstExists.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckConstExists.cmake
new file mode 100644
index 000000000000..c22c09721995
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckConstExists.cmake
@@ -0,0 +1,32 @@
+include(CheckCSourceCompiles)
+
+macro(check_const_exists CONST FILES VARIABLE)
+  if (DEFINED ${VARIABLE})
+    IF(${VARIABLE} STREQUAL "")
+      # Set, but empty: unset it to do the checking below.
+      UNSET(${VARIABLE})
+      UNSET(${VARIABLE} CACHE)
+    ENDIF()
+  endif()
+  if (NOT DEFINED ${VARIABLE})
+    set(check_const_exists_source "")
+    foreach(file ${FILES})
+      set(check_const_exists_source
+          "${check_const_exists_source}
+          #include <${file}>")
+    endforeach()
+    set(check_const_exists_source
+        "${check_const_exists_source}
+        int main() { (void)${CONST}; return 0; }")
+
+    check_c_source_compiles("${check_const_exists_source}" ${VARIABLE})
+
+    if (${${VARIABLE}})
+      set(${VARIABLE} 1 CACHE INTERNAL "Have const ${CONST}")
+      message(STATUS "Looking for ${CONST} - found")
+    else()
+      set(${VARIABLE} 0 CACHE INTERNAL "Have const ${CONST}")
+      message(STATUS "Looking for ${CONST} - not found")
+    endif()
+  endif()
+endmacro(check_const_exists)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.c b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.c
new file mode 100644
index 000000000000..d948fecf2b4e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.c
@@ -0,0 +1,14 @@
+#include <sys/types.h>
+
+#define KB ((off_t)1024)
+#define MB ((off_t)1024 * KB)
+#define GB ((off_t)1024 * MB)
+#define TB ((off_t)1024 * GB)
+int t2[(((64 * GB -1) % 671088649) == 268434537)
+       && (((TB - (64 * GB -1) + 255) % 1792151290) == 305159546)? 1: -1];
+
+int main()
+{
+  ;
+  return 0;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.cmake
new file mode 100644
index 000000000000..12534401605c
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFileOffsetBits.cmake
@@ -0,0 +1,43 @@
+# - Check if _FILE_OFFSET_BITS macro needed for large files
+# CHECK_FILE_OFFSET_BITS ()
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+# Copyright (c) 2009, Michihiro NAKAJIMA
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+#INCLUDE(CheckCSourceCompiles)
+
+GET_FILENAME_COMPONENT(_selfdir_CheckFileOffsetBits
+	 "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+MACRO (CHECK_FILE_OFFSET_BITS)
+  IF(NOT DEFINED _FILE_OFFSET_BITS)
+    MESSAGE(STATUS "Cheking _FILE_OFFSET_BITS for large files")
+    TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
+    IF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
+      TRY_COMPILE(__WITH_FILE_OFFSET_BITS_64
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
+        COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=64)
+    ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
+
+    IF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+      SET(_FILE_OFFSET_BITS 64 CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
+      MESSAGE(STATUS "Cheking _FILE_OFFSET_BITS for large files - needed")
+    ELSE(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+      SET(_FILE_OFFSET_BITS "" CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
+      MESSAGE(STATUS "Cheking _FILE_OFFSET_BITS for large files - not needed")
+    ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+  ENDIF(NOT DEFINED _FILE_OFFSET_BITS)
+
+ENDMACRO (CHECK_FILE_OFFSET_BITS)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.c b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.c
new file mode 100644
index 000000000000..224e34041292
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.c
@@ -0,0 +1,28 @@
+#ifdef CHECK_FUNCTION_EXISTS
+
+#ifdef __cplusplus
+extern "C"
+#endif
+  char
+  CHECK_FUNCTION_EXISTS(void);
+#ifdef __CLASSIC_C__
+int main()
+{
+  int ac;
+  char* av[];
+#else
+int main(int ac, char* av[])
+{
+#endif
+  CHECK_FUNCTION_EXISTS();
+  if (ac > 1000) {
+    return *av[0];
+  }
+  return 0;
+}
+
+#else /* CHECK_FUNCTION_EXISTS */
+
+#error "CHECK_FUNCTION_EXISTS has to specify the function"
+
+#endif /* CHECK_FUNCTION_EXISTS */
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.cmake
new file mode 100644
index 000000000000..78bc2ecc1b9c
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionExistsEx.cmake
@@ -0,0 +1,69 @@
+# - Check if a C function can be linked
+# CHECK_FUNCTION_EXISTS(<function> <variable>)
+#
+# Check that the <function> is provided by libraries on the system and
+# store the result in a <variable>.  This does not verify that any
+# system header file declares the function, only that it can be found
+# at link time (considure using CheckSymbolExists).
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+#=============================================================================
+# Copyright 2002-2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+MACRO(CHECK_FUNCTION_EXISTS_EX FUNCTION VARIABLE)
+  IF(${VARIABLE} MATCHES "^${VARIABLE}$")
+    SET(MACRO_CHECK_FUNCTION_DEFINITIONS 
+      "-DCHECK_FUNCTION_EXISTS=${FUNCTION} ${CMAKE_REQUIRED_FLAGS}")
+    MESSAGE(STATUS "Looking for ${FUNCTION}")
+    IF(CMAKE_REQUIRED_LIBRARIES)
+      SET(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES
+        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+    ELSE(CMAKE_REQUIRED_LIBRARIES)
+      SET(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES)
+    ENDIF(CMAKE_REQUIRED_LIBRARIES)
+    IF(CMAKE_REQUIRED_INCLUDES)
+      SET(CHECK_FUNCTION_EXISTS_ADD_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    ELSE(CMAKE_REQUIRED_INCLUDES)
+      SET(CHECK_FUNCTION_EXISTS_ADD_INCLUDES)
+    ENDIF(CMAKE_REQUIRED_INCLUDES)
+    TRY_COMPILE(${VARIABLE}
+      ${CMAKE_BINARY_DIR}
+	  ${PROJECT_SOURCE_DIR}/cmake/CheckFunctionExistsEx.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+      "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}"
+      "${CHECK_FUNCTION_EXISTS_ADD_INCLUDES}"
+      OUTPUT_VARIABLE OUTPUT)
+    IF(${VARIABLE})
+      SET(${VARIABLE} 1 CACHE INTERNAL "Have function ${FUNCTION}")
+      MESSAGE(STATUS "Looking for ${FUNCTION} - found")
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
+        "Determining if the function ${FUNCTION} exists passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    ELSE(${VARIABLE})
+      MESSAGE(STATUS "Looking for ${FUNCTION} - not found")
+      SET(${VARIABLE} "" CACHE INTERNAL "Have function ${FUNCTION}")
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
+        "Determining if the function ${FUNCTION} exists failed with the following output:\n"
+        "${OUTPUT}\n\n")
+    ENDIF(${VARIABLE})
+  ENDIF()
+ENDMACRO(CHECK_FUNCTION_EXISTS_EX)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionKeywords.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionKeywords.cmake
new file mode 100644
index 000000000000..3d968b8a6b1a
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckFunctionKeywords.cmake
@@ -0,0 +1,14 @@
+include(CheckCSourceCompiles)
+
+macro(check_function_keywords _wordlist)
+  set(${_result} "")
+  foreach(flag ${_wordlist})
+    string(REGEX REPLACE "[-+/ ()]" "_" flagname "${flag}")
+    string(TOUPPER "${flagname}" flagname)
+    set(have_flag "HAVE_${flagname}")
+    check_c_source_compiles("${flag} void func(); void func() { } int main() { func(); return 0; }" ${have_flag})
+    if(${have_flag} AND NOT ${_result})
+      set(${_result} "${flag}")
+    endif(${have_flag} AND NOT ${_result})
+  endforeach(flag)
+endmacro(check_function_keywords)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.c.in b/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.c.in
new file mode 100644
index 000000000000..a97344ac3e10
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.c.in
@@ -0,0 +1,29 @@
+@CHECK_PROTOTYPE_DEFINITION_HEADER@
+
+static void cmakeRequireSymbol(int dummy, ...) {
+  (void) dummy;
+}
+
+static void checkSymbol(void) {
+#ifndef @CHECK_PROTOTYPE_DEFINITION_SYMBOL@
+  cmakeRequireSymbol(0, &@CHECK_PROTOTYPE_DEFINITION_SYMBOL@);
+#endif
+}
+
+@CHECK_PROTOTYPE_DEFINITION_PROTO@ {
+  return @CHECK_PROTOTYPE_DEFINITION_RETURN@;
+}
+
+#ifdef __CLASSIC_C__
+int main() {
+  int ac;
+  char*av[];
+#else
+int main(int ac, char *av[]) {
+#endif
+  checkSymbol();
+  if (ac > 1000) {
+    return *av[0];
+  }
+  return 0;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.cmake
new file mode 100644
index 000000000000..940d1ff0ce38
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckPrototypeDefinition.cmake
@@ -0,0 +1,82 @@
+# - Check if the protoype we expect is correct.
+# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
+#
+#  FUNCTION - The name of the function (used to check if prototype exists)
+#  PROTOTYPE- The prototype to check.
+#  RETURN - The return value of the function.
+#  HEADER - The header files required.
+#  VARIABLE - The variable to store the result.
+#
+# Example:
+#
+# check_prototype_definition(getpwent_r
+#     "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
+#     "NULL"
+#     "unistd.h;pwd.h"
+#     SOLARIS_GETPWENT_R)
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+
+function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
+    if (${_VARIABLE} MATCHES "^${_VARIABLE}$")
+        set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
+
+        set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
+        if (CMAKE_REQUIRED_LIBRARIES)
+          set(CHECK_PROTOTYPE_DEFINITION_LIBS
+              "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+        else(CMAKE_REQUIRED_LIBRARIES)
+            set(CHECK_PROTOTYPE_DEFINITION_LIBS)
+        endif(CMAKE_REQUIRED_LIBRARIES)
+        if (CMAKE_REQUIRED_INCLUDES)
+            set(CMAKE_SYMBOL_EXISTS_INCLUDES
+                "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+        else(CMAKE_REQUIRED_INCLUDES)
+            set(CMAKE_SYMBOL_EXISTS_INCLUDES)
+        endif(CMAKE_REQUIRED_INCLUDES)
+
+        foreach(_FILE ${_HEADER})
+          set(CHECK_PROTOTYPE_DEFINITION_HEADER
+            "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
+        endforeach(_FILE)
+
+        set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
+        set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
+        set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
+
+        configure_file("${PROJECT_SOURCE_DIR}/cmake/CheckPrototypeDefinition.c.in"
+            "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
+
+        file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
+
+        try_compile(${_VARIABLE}
+          ${CMAKE_BINARY_DIR}
+          ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
+          COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+          CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
+          "${CHECK_PROTOTYPE_DEFINITION_LIBS}"
+          "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+          OUTPUT_VARIABLE OUTPUT)
+
+        if (${_VARIABLE})
+            set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+            message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
+            file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+                "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
+                "${OUTPUT}\n\n")
+        else (${_VARIABLE})
+            message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
+            set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+            file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+                "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
+                "${OUTPUT}\n\n${_SOURCE}\n\n")
+        endif (${_VARIABLE})
+    endif()
+endfunction(CHECK_PROTOTYPE_DEFINITION)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CheckWorkingKqueue.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CheckWorkingKqueue.cmake
new file mode 100644
index 000000000000..2f482783c6cf
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CheckWorkingKqueue.cmake
@@ -0,0 +1,54 @@
+include(CheckCSourceRuns)
+
+check_c_source_runs(
+"
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/event.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+int
+main(int argc, char **argv)
+{
+    int kq;
+    int n;
+    int fd[2];
+    struct kevent ev;
+    struct timespec ts;
+    char buf[80000];
+
+    if (pipe(fd) == -1)
+        exit(1);
+    if (fcntl(fd[1], F_SETFL, O_NONBLOCK) == -1)
+        exit(1);
+
+    while ((n = write(fd[1], buf, sizeof(buf))) == sizeof(buf))
+        ;
+
+    if ((kq = kqueue()) == -1)
+        exit(1);
+
+    memset(&ev, 0, sizeof(ev));
+    ev.ident = fd[1];
+    ev.filter = EVFILT_WRITE;
+    ev.flags = EV_ADD | EV_ENABLE;
+    n = kevent(kq, &ev, 1, NULL, 0, NULL);
+    if (n == -1)
+        exit(1);
+
+    read(fd[0], buf, sizeof(buf));
+
+    ts.tv_sec = 0;
+    ts.tv_nsec = 0;
+    n = kevent(kq, NULL, 0, &ev, 1, &ts);
+    if (n == -1 || n == 0)
+        exit(1);
+
+    exit(0);
+}
+
+" EVENT__HAVE_WORKING_KQUEUE)
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/CodeCoverage.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/CodeCoverage.cmake
new file mode 100644
index 000000000000..eba85b3fb77e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/CodeCoverage.cmake
@@ -0,0 +1,165 @@
+#
+# Boost Software License - Version 1.0 - August 17th, 2003
+#
+# Permission is hereby granted, free of charge, to any person or organization
+# obtaining a copy of the software and accompanying documentation covered by
+# this license (the "Software") to use, reproduce, display, distribute,
+# execute, and transmit the Software, and to prepare derivative works of the
+# Software, and to permit third-parties to whom the Software is furnished to
+# do so, all subject to the following:
+# 
+# The copyright notices in the Software and this entire statement, including
+# the above license grant, this restriction and the following disclaimer,
+# must be included in all copies of the Software, in whole or in part, and
+# all derivative works of the Software, unless such copies or derivative
+# works are solely in the form of machine-executable object code generated by
+# a source language processor.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# 2012-01-31, Lars Bilke
+# - Enable Code Coverage
+#
+# 2013-09-17, Joakim Söderberg
+# - Added support for Clang.
+# - Some additional usage instructions.
+#
+# 2016-11-02, Azat Khuzhin
+# - Adopt for C compiler only (libevent)
+#
+# USAGE:
+# 1. Copy this file into your cmake modules path.
+#
+# 2. Add the following line to your CMakeLists.txt:
+#      INCLUDE(CodeCoverage)
+#
+# 3. Set compiler flags to turn off optimization and enable coverage: 
+#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
+#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
+#  
+# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
+#    which runs your test executable and produces a lcov code coverage report:
+#    Example:
+#	 SETUP_TARGET_FOR_COVERAGE(
+#				my_coverage_target  # Name for custom target.
+#				test_driver         # Name of the test driver executable that runs the tests.
+#									# NOTE! This should always have a ZERO as exit code
+#									# otherwise the coverage generation will not complete.
+#				coverage            # Name of output directory.
+#				)
+#
+# 4. Build a Debug build:
+#	 cmake -DCMAKE_BUILD_TYPE=Debug ..
+#	 make
+#	 make my_coverage_target
+#
+#
+
+# Check prereqs
+FIND_PROGRAM( GCOV_PATH gcov )
+FIND_PROGRAM( LCOV_PATH lcov )
+FIND_PROGRAM( GENHTML_PATH genhtml )
+FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
+
+IF(NOT GCOV_PATH)
+	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
+ENDIF() # NOT GCOV_PATH
+
+IF(NOT CMAKE_COMPILER_IS_GNUCC)
+	# Clang version 3.0.0 and greater now supports gcov as well.
+	MESSAGE(WARNING "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
+	
+	IF(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+		MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+	ENDIF()
+ENDIF() # NOT CMAKE_COMPILER_IS_GNUCC
+
+IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
+  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
+ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
+
+
+# Param _targetname     The name of new the custom make target
+# Param _testrunner     The name of the target which runs the tests.
+#						MUST return ZERO always, even on errors. 
+#						If not, no coverage report will be created!
+# Param _outputname     lcov output is generated as _outputname.info
+#                       HTML report is generated in _outputname/index.html
+# Optional fourth parameter is passed as arguments to _testrunner
+#   Pass them in list form, e.g.: "-j;2" for -j 2
+FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
+
+	IF(NOT LCOV_PATH)
+		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+	ENDIF() # NOT LCOV_PATH
+
+	IF(NOT GENHTML_PATH)
+		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
+	ENDIF() # NOT GENHTML_PATH
+
+	# Setup target
+	ADD_CUSTOM_TARGET(${_targetname}
+		
+		# Cleanup lcov
+		${LCOV_PATH} --directory . --zerocounters
+		
+		# Run tests
+		COMMAND ${_testrunner} ${ARGV3}
+		
+		# Capturing lcov counters and generating report
+		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info
+		COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
+		COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned
+		COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
+		
+		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
+	)
+	
+	# Show info where to find the report
+	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+		COMMAND ;
+		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
+	)
+
+ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
+
+# Param _targetname     The name of new the custom make target
+# Param _testrunner     The name of the target which runs the tests
+# Param _outputname     cobertura output is generated as _outputname.xml
+# Optional fourth parameter is passed as arguments to _testrunner
+#   Pass them in list form, e.g.: "-j;2" for -j 2
+FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
+
+	IF(NOT PYTHON_EXECUTABLE)
+		MESSAGE(FATAL_ERROR "Python not found! Aborting...")
+	ENDIF() # NOT PYTHON_EXECUTABLE
+
+	IF(NOT GCOVR_PATH)
+		MESSAGE(FATAL_ERROR "gcovr not found! Aborting...")
+	ENDIF() # NOT GCOVR_PATH
+
+	ADD_CUSTOM_TARGET(${_targetname}
+
+		# Run tests
+		${_testrunner} ${ARGV3}
+
+		# Running gcovr
+		COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} -e '${CMAKE_SOURCE_DIR}/tests/'  -o ${_outputname}.xml
+		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		COMMENT "Running gcovr to produce Cobertura code coverage report."
+	)
+
+	# Show info where to find the report
+	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+		COMMAND ;
+		COMMENT "Cobertura code coverage report saved in ${_outputname}.xml."
+	)
+
+ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE_COBERTURA
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/Copyright.txt b/extra/libevent/libevent-2.1.11-stable/cmake/Copyright.txt
new file mode 100644
index 000000000000..813124f02eef
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/Copyright.txt
@@ -0,0 +1,57 @@
+CMake - Cross Platform Makefile Generator
+Copyright 2000-2013 Kitware, Inc.
+Copyright 2000-2011 Insight Software Consortium
+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 Kitware, Inc., the Insight Software Consortium,
+  nor the names of their 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
+HOLDER 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.
+
+------------------------------------------------------------------------------
+
+The above copyright and license notice applies to distributions of
+CMake in source and binary form.  Some source files contain additional
+notices of original copyright by their contributors; see each source
+for details.  Third-party software packages supplied with CMake under
+compatible licenses provide their own copyright notices documented in
+corresponding subdirectories.
+
+------------------------------------------------------------------------------
+
+CMake was initially developed by Kitware with the following sponsorship:
+
+ * National Library of Medicine at the National Institutes of Health
+   as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+ * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+   Visualization Initiative.
+
+ * National Alliance for Medical Image Computing (NAMIC) is funded by the
+   National Institutes of Health through the NIH Roadmap for Medical Research,
+   Grant U54 EB005149.
+
+ * Kitware, Inc.
\ No newline at end of file
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/FindGit.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/FindGit.cmake
new file mode 100644
index 000000000000..2abbfe4e9df6
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/FindGit.cmake
@@ -0,0 +1,45 @@
+# The module defines the following variables:
+#   GIT_EXECUTABLE - path to git command line client
+#   GIT_FOUND - true if the command line client was found
+# Example usage:
+#   find_package(Git)
+#   if(GIT_FOUND)
+#     message("git found: ${GIT_EXECUTABLE}")
+#   endif()
+
+#=============================================================================
+# Copyright 2010 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Look for 'git' or 'eg' (easy git)
+set(git_names git eg)
+
+# Prefer .cmd variants on Windows unless running in a Makefile
+# in the MSYS shell.
+if(WIN32)
+  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
+    set(git_names git.cmd git eg.cmd eg)
+  endif()
+endif()
+
+find_program(GIT_EXECUTABLE
+  NAMES ${git_names}
+  DOC "git command line client")
+
+mark_as_advanced(GIT_EXECUTABLE)
+
+# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
+# all listed variables are TRUE
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
+
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfig.cmake.in b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfig.cmake.in
new file mode 100644
index 000000000000..54223360a443
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfig.cmake.in
@@ -0,0 +1,18 @@
+# - Config file for the Libevent package
+# It defines the following variables
+#  LIBEVENT_INCLUDE_DIRS     - include directories
+#  LIBEVENT_STATIC_LIBRARIES - libraries to link against (archive/static)
+#  LIBEVENT_SHARED_LIBRARIES - libraries to link against (shared)
+
+# Get the path of the current file.
+get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+# Set the include directories.
+set(LIBEVENT_INCLUDE_DIRS "@EVENT_INSTALL_INCLUDE_DIR@")
+
+# Include the project Targets file, this contains definitions for IMPORTED targets.
+include(${LIBEVENT_CMAKE_DIR}/LibeventTargets.cmake)
+
+# IMPORTED targets from LibeventTargets.cmake
+set(LIBEVENT_STATIC_LIBRARIES "@LIBEVENT_STATIC_LIBRARIES@")
+set(LIBEVENT_SHARED_LIBRARIES "@LIBEVENT_SHARED_LIBRARIES@")
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigBuildTree.cmake.in b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigBuildTree.cmake.in
new file mode 100644
index 000000000000..02edef32fcd8
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigBuildTree.cmake.in
@@ -0,0 +1,17 @@
+# - Config file for the Libevent package
+# It defines the following variables
+#  LIBEVENT_INCLUDE_DIRS - include directories for FooBar
+#  LIBEVENT_LIBRARIES    - libraries to link against
+
+# Get the path of the current file.
+get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+# Set the include directories.
+set(LIBEVENT_INCLUDE_DIRS "@EVENT__INCLUDE_DIRS@")
+
+# Include the project Targets file, this contains definitions for IMPORTED targets.
+include(${LIBEVENT_CMAKE_DIR}/LibeventTargets.cmake)
+
+# IMPORTED targets from LibeventTargets.cmake
+set(LIBEVENT_LIBRARIES event event_core event_extra)
+
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigVersion.cmake.in b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigVersion.cmake.in
new file mode 100644
index 000000000000..56371a8fee77
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/LibeventConfigVersion.cmake.in
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@EVENT_PACKAGE_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()	
diff --git a/extra/libevent/libevent-2.1.11-stable/cmake/VersionViaGit.cmake b/extra/libevent/libevent-2.1.11-stable/cmake/VersionViaGit.cmake
new file mode 100644
index 000000000000..77708b1c0276
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/cmake/VersionViaGit.cmake
@@ -0,0 +1,64 @@
+# This module defines the following variables utilizing
+# git to determine the parent tag. And if found the macro
+# will attempt to parse them in the github tag fomat
+#
+# Useful for auto-versioning in our CMakeLists
+#
+#  EVENT_GIT___VERSION_MAJOR - Major version.
+#  EVENT_GIT___VERSION_MINOR - Minor version
+#  EVENT_GIT___VERSION_STAGE - Stage version
+#
+# Example usage:
+#
+# event_fuzzy_version_from_git()
+#    message("Libvent major=${EVENT_GIT___VERSION_MAJOR}")
+#    message("        minor=${EVENT_GIT___VERSION_MINOR}")
+#    message("        patch=${EVENT_GIT___VERSION_PATCH}")
+#    message("        stage=${EVENT_GIT___VERSION_STAGE}")
+# endif()
+
+include(FindGit)
+
+macro(event_fuzzy_version_from_git)
+	# set our defaults.
+	set(EVENT_GIT___VERSION_MAJOR 2)
+	set(EVENT_GIT___VERSION_MINOR 1)
+	set(EVENT_GIT___VERSION_PATCH 11)
+	set(EVENT_GIT___VERSION_STAGE "stable")
+
+##	find_package(Git)
+##
+##	if (GIT_FOUND)
+##		execute_process(
+##			COMMAND
+##				${GIT_EXECUTABLE} describe --abbrev=0
+##			WORKING_DIRECTORY
+##				${PROJECT_SOURCE_DIR}
+##			RESULT_VARIABLE
+##				GITRET
+##			OUTPUT_VARIABLE
+##				GITVERSION
+##			OUTPUT_STRIP_TRAILING_WHITESPACE
+##		)
+##
+##		string(REGEX REPLACE "[\\._-]" ";" VERSION_LIST "${GITVERSION}")
+##		list(LENGTH VERSION_LIST VERSION_LIST_LENGTH)
+##
+##		if ((GITRET EQUAL 0) AND (VERSION_LIST_LENGTH EQUAL 5))
+##			list(GET VERSION_LIST 1 _MAJOR)
+##			list(GET VERSION_LIST 2 _MINOR)
+##			list(GET VERSION_LIST 3 _PATCH)
+##			list(GET VERSION_LIST 4 _STAGE)
+##
+##			set(_DEFAULT_VERSION "${EVENT_GIT___VERSION_MAJOR}.${EVENT_GIT___VERSION_MINOR}.${EVENT_GIT___VERSION_PATCH}-${EVENT_GIT___VERSION_STAGE}")
+##			set(_GIT_VERSION     "${_MAJOR}.${_MINOR}.${_PATCH}-${_STAGE}")
+##
+##			if (${_DEFAULT_VERSION} VERSION_LESS ${_GIT_VERSION})
+##				set(EVENT_GIT___VERSION_MAJOR ${_MAJOR})
+##				set(EVENT_GIT___VERSION_MINOR ${_MINOR})
+##				set(EVENT_GIT___VERSION_PATCH ${_PATCH})
+##				set(EVENT_GIT___VERSION_STAGE ${_STAGE})
+##			endif()
+##		endif()
+##	endif()
+endmacro()
diff --git a/libevent/compat/sys/queue.h b/extra/libevent/libevent-2.1.11-stable/compat/sys/queue.h
similarity index 98%
rename from libevent/compat/sys/queue.h
rename to extra/libevent/libevent-2.1.11-stable/compat/sys/queue.h
index c0956ddce43e..c387bdcf5049 100644
--- a/libevent/compat/sys/queue.h
+++ b/extra/libevent/libevent-2.1.11-stable/compat/sys/queue.h
@@ -32,11 +32,11 @@
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  */
 
-#ifndef	_SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
+#ifndef	SYS_QUEUE_H__
+#define	SYS_QUEUE_H__
 
 /*
- * This file defines five types of data structures: singly-linked lists, 
+ * This file defines five types of data structures: singly-linked lists,
  * lists, simple queues, tail queues, and circular queues.
  *
  *
@@ -89,11 +89,11 @@
 struct name {								\
 	struct type *slh_first;	/* first element */			\
 }
- 
+
 #define	SLIST_HEAD_INITIALIZER(head)					\
 	{ NULL }
 
-#ifndef WIN32
+#ifndef _WIN32
 #define SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\
@@ -287,8 +287,8 @@ struct {								\
 	struct type **tqe_prev;	/* address of previous next element */	\
 }
 
-/* 
- * tail queue access methods 
+/*
+ * tail queue access methods
  */
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
@@ -306,7 +306,7 @@ struct {								\
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_NEXT(var, field))
 
-#define TAILQ_FOREACH_REVERSE(var, head, field, headname)		\
+#define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
 	for((var) = TAILQ_LAST(head, headname);				\
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_PREV(var, headname, field))
@@ -391,7 +391,7 @@ struct {								\
 }
 
 /*
- * Circular queue access methods 
+ * Circular queue access methods
  */
 #define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
 #define	CIRCLEQ_LAST(head)		((head)->cqh_last)
@@ -485,4 +485,4 @@ struct {								\
 		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
 } while (0)
 
-#endif	/* !_SYS_QUEUE_H_ */
+#endif	/* !SYS_QUEUE_H__ */
diff --git a/extra/libevent/libevent-2.1.11-stable/config.h.in b/extra/libevent/libevent-2.1.11-stable/config.h.in
new file mode 100644
index 000000000000..122aecff87b0
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/config.h.in
@@ -0,0 +1,541 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if libevent should build without support for a debug mode */
+#undef DISABLE_DEBUG_MODE
+
+/* Define if libevent should not allow replacing the mm functions */
+#undef DISABLE_MM_REPLACEMENT
+
+/* Define if libevent should not be compiled with thread support */
+#undef DISABLE_THREAD_SUPPORT
+
+/* Define to 1 if you have the `accept4' function. */
+#undef HAVE_ACCEPT4
+
+/* Define to 1 if you have the `arc4random' function. */
+#undef HAVE_ARC4RANDOM
+
+/* Define to 1 if you have the `arc4random_addrandom' function. */
+#undef HAVE_ARC4RANDOM_ADDRANDOM
+
+/* Define to 1 if you have the `arc4random_buf' function. */
+#undef HAVE_ARC4RANDOM_BUF
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
+/* Define to 1 if you have the declaration of `CTL_KERN', and to 0 if you
+   don't. */
+#undef HAVE_DECL_CTL_KERN
+
+/* Define to 1 if you have the declaration of `KERN_ARND', and to 0 if you
+   don't. */
+#undef HAVE_DECL_KERN_ARND
+
+/* Define to 1 if you have the declaration of `KERN_RANDOM', and to 0 if you
+   don't. */
+#undef HAVE_DECL_KERN_RANDOM
+
+/* Define to 1 if you have the declaration of `RANDOM_UUID', and to 0 if you
+   don't. */
+#undef HAVE_DECL_RANDOM_UUID
+
+/* Define if /dev/poll is available */
+#undef HAVE_DEVPOLL
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if your system supports the epoll system calls */
+#undef HAVE_EPOLL
+
+/* Define to 1 if you have the `epoll_create1' function. */
+#undef HAVE_EPOLL_CREATE1
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+#undef HAVE_EPOLL_CTL
+
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define to 1 if you have the `eventfd' function. */
+#undef HAVE_EVENTFD
+
+/* Define if your system supports event ports */
+#undef HAVE_EVENT_PORTS
+
+/* Define to 1 if you have the `fcntl' function. */
+#undef HAVE_FCNTL
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if the system has the type `fd_mask'. */
+#undef HAVE_FD_MASK
+
+/* Do we have getaddrinfo()? */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the `getegid' function. */
+#undef HAVE_GETEGID
+
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
+
+/* Define this if you have any gethostbyname_r() */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define this if gethostbyname_r takes 3 arguments */
+#undef HAVE_GETHOSTBYNAME_R_3_ARG
+
+/* Define this if gethostbyname_r takes 5 arguments */
+#undef HAVE_GETHOSTBYNAME_R_5_ARG
+
+/* Define this if gethostbyname_r takes 6 arguments */
+#undef HAVE_GETHOSTBYNAME_R_6_ARG
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#undef HAVE_GETIFADDRS
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#undef HAVE_GETNAMEINFO
+
+/* Define to 1 if you have the `getprotobynumber' function. */
+#undef HAVE_GETPROTOBYNUMBER
+
+/* Define to 1 if you have the `getservbyname' function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#undef HAVE_IFADDRS_H
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
+/* Define to 1 if you have the `inet_pton' function. */
+#undef HAVE_INET_PTON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `issetugid' function. */
+#undef HAVE_ISSETUGID
+
+/* Define to 1 if you have the `kqueue' function. */
+#undef HAVE_KQUEUE
+
+/* Define if the system has zlib */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the `mach_absolute_time' function. */
+#undef HAVE_MACH_ABSOLUTE_TIME
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+#undef HAVE_MACH_MACH_TIME_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `nanosleep' function. */
+#undef HAVE_NANOSLEEP
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define to 1 if you have the <netinet/in6.h> header file. */
+#undef HAVE_NETINET_IN6_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#undef HAVE_NETINET_TCP_H
+
+/* Define if the system has openssl */
+#undef HAVE_OPENSSL
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define to 1 if you have the `pipe' function. */
+#undef HAVE_PIPE
+
+/* Define to 1 if you have the `pipe2' function. */
+#undef HAVE_PIPE2
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
+
+/* Define to 1 if you have the `port_create' function. */
+#undef HAVE_PORT_CREATE
+
+/* Define to 1 if you have the <port.h> header file. */
+#undef HAVE_PORT_H
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define if we have pthreads on this system */
+#undef HAVE_PTHREADS
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if the system has the type `sa_family_t'. */
+#undef HAVE_SA_FAMILY_T
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
+
+/* Define to 1 if you have the `sendfile' function. */
+#undef HAVE_SENDFILE
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define if F_SETFD is defined in <fcntl.h> */
+#undef HAVE_SETFD
+
+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the `signal' function. */
+#undef HAVE_SIGNAL
+
+/* Define to 1 if you have the `splice' function. */
+#undef HAVE_SPLICE
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strsep' function. */
+#undef HAVE_STRSEP
+
+/* Define to 1 if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
+
+/* Define to 1 if you have the `strtoll' function. */
+#undef HAVE_STRTOLL
+
+/* Define to 1 if the system has the type `struct addrinfo'. */
+#undef HAVE_STRUCT_ADDRINFO
+
+/* Define to 1 if the system has the type `struct in6_addr'. */
+#undef HAVE_STRUCT_IN6_ADDR
+
+/* Define to 1 if `s6_addr16' is a member of `struct in6_addr'. */
+#undef HAVE_STRUCT_IN6_ADDR_S6_ADDR16
+
+/* Define to 1 if `s6_addr32' is a member of `struct in6_addr'. */
+#undef HAVE_STRUCT_IN6_ADDR_S6_ADDR32
+
+/* Define to 1 if the system has the type `struct linger'. */
+#undef HAVE_STRUCT_LINGER
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#undef HAVE_STRUCT_SOCKADDR_IN6
+
+/* Define to 1 if `sin6_len' is a member of `struct sockaddr_in6'. */
+#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
+
+/* Define to 1 if `sin_len' is a member of `struct sockaddr_in'. */
+#undef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
+/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
+
+/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
+
+/* Define to 1 if the system has the type `struct sockaddr_un'. */
+#undef HAVE_STRUCT_SOCKADDR_UN
+
+/* Define to 1 if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
+
+/* Define to 1 if you have the <sys/devpoll.h> header file. */
+#undef HAVE_SYS_DEVPOLL_H
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#undef HAVE_SYS_EPOLL_H
+
+/* Define to 1 if you have the <sys/eventfd.h> header file. */
+#undef HAVE_SYS_EVENTFD_H
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#undef HAVE_SYS_EVENT_H
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#undef HAVE_SYS_QUEUE_H
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+#undef HAVE_SYS_SENDFILE_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Define to 1 if you have the <sys/timerfd.h> header file. */
+#undef HAVE_SYS_TIMERFD_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
+#undef HAVE_TAILQFOREACH
+
+/* Define if timeradd is defined in <sys/time.h> */
+#undef HAVE_TIMERADD
+
+/* Define if timerclear is defined in <sys/time.h> */
+#undef HAVE_TIMERCLEAR
+
+/* Define if timercmp is defined in <sys/time.h> */
+#undef HAVE_TIMERCMP
+
+/* Define to 1 if you have the `timerfd_create' function. */
+#undef HAVE_TIMERFD_CREATE
+
+/* Define if timerisset is defined in <sys/time.h> */
+#undef HAVE_TIMERISSET
+
+/* Define to 1 if the system has the type `uint16_t'. */
+#undef HAVE_UINT16_T
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#undef HAVE_UINT32_T
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#undef HAVE_UINT64_T
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#undef HAVE_UINT8_T
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
+
+/* Define to 1 if you have the `umask' function. */
+#undef HAVE_UMASK
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Define to 1 if you have the `usleep' function. */
+#undef HAVE_USLEEP
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
+/* Define if kqueue works correctly with pipes */
+#undef HAVE_WORKING_KQUEUE
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* Define to 1 if compiler have __FUNCTION__ */
+#undef HAVE___FUNCTION__
+
+/* Define to 1 if compiler have __func__ */
+#undef HAVE___func__
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Numeric representation of the version */
+#undef NUMERIC_VERSION
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `off_t', as computed by sizeof. */
+#undef SIZEOF_OFF_T
+
+/* The size of `pthread_t', as computed by sizeof. */
+#undef SIZEOF_PTHREAD_T
+
+/* The size of `short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* The size of `size_t', as computed by sizeof. */
+#undef SIZEOF_SIZE_T
+
+/* The size of `time_t', as computed by sizeof. */
+#undef SIZEOF_TIME_T
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to unsigned int if you dont have it */
+#undef socklen_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef ssize_t
diff --git a/extra/libevent/libevent-2.1.11-stable/defer-internal.h b/extra/libevent/libevent-2.1.11-stable/defer-internal.h
new file mode 100644
index 000000000000..d6f80a1180aa
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/defer-internal.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef DEFER_INTERNAL_H_INCLUDED_
+#define DEFER_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/queue.h>
+
+struct event_callback;
+typedef void (*deferred_cb_fn)(struct event_callback *, void *);
+
+/**
+   Initialize an empty, non-pending event_callback.
+
+   @param deferred The struct event_callback structure to initialize.
+   @param priority The priority that the callback should run at.
+   @param cb The function to run when the struct event_callback executes.
+   @param arg The function's second argument.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_deferred_cb_init_(struct event_callback *, ev_uint8_t, deferred_cb_fn, void *);
+/**
+   Change the priority of a non-pending event_callback.
+ */
+void event_deferred_cb_set_priority_(struct event_callback *, ev_uint8_t);
+/**
+   Cancel a struct event_callback if it is currently scheduled in an event_base.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_deferred_cb_cancel_(struct event_base *, struct event_callback *);
+/**
+   Activate a struct event_callback if it is not currently scheduled in an event_base.
+
+   Return true if it was not previously scheduled.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_deferred_cb_schedule_(struct event_base *, struct event_callback *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT_INTERNAL_H_INCLUDED_ */
+
diff --git a/extra/libevent/libevent-2.1.11-stable/devpoll.c b/extra/libevent/libevent-2.1.11-stable/devpoll.c
new file mode 100644
index 000000000000..3a2f86d6f1aa
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/devpoll.c
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2000-2009 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_DEVPOLL
+
+#include <sys/types.h>
+#include <sys/resource.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <sys/devpoll.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/thread.h"
+#include "event-internal.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "evthread-internal.h"
+
+struct devpollop {
+	struct pollfd *events;
+	int nevents;
+	int dpfd;
+	struct pollfd *changes;
+	int nchanges;
+};
+
+static void *devpoll_init(struct event_base *);
+static int devpoll_add(struct event_base *, int fd, short old, short events, void *);
+static int devpoll_del(struct event_base *, int fd, short old, short events, void *);
+static int devpoll_dispatch(struct event_base *, struct timeval *);
+static void devpoll_dealloc(struct event_base *);
+
+const struct eventop devpollops = {
+	"devpoll",
+	devpoll_init,
+	devpoll_add,
+	devpoll_del,
+	devpoll_dispatch,
+	devpoll_dealloc,
+	1, /* need reinit */
+	EV_FEATURE_FDS|EV_FEATURE_O1,
+	0
+};
+
+#define NEVENT	32000
+
+static int
+devpoll_commit(struct devpollop *devpollop)
+{
+	/*
+	 * Due to a bug in Solaris, we have to use pwrite with an offset of 0.
+	 * Write is limited to 2GB of data, until it will fail.
+	 */
+	if (pwrite(devpollop->dpfd, devpollop->changes,
+		sizeof(struct pollfd) * devpollop->nchanges, 0) == -1)
+		return (-1);
+
+	devpollop->nchanges = 0;
+	return (0);
+}
+
+static int
+devpoll_queue(struct devpollop *devpollop, int fd, int events) {
+	struct pollfd *pfd;
+
+	if (devpollop->nchanges >= devpollop->nevents) {
+		/*
+		 * Change buffer is full, must commit it to /dev/poll before
+		 * adding more
+		 */
+		if (devpoll_commit(devpollop) != 0)
+			return (-1);
+	}
+
+	pfd = &devpollop->changes[devpollop->nchanges++];
+	pfd->fd = fd;
+	pfd->events = events;
+	pfd->revents = 0;
+
+	return (0);
+}
+
+static void *
+devpoll_init(struct event_base *base)
+{
+	int dpfd, nfiles = NEVENT;
+	struct rlimit rl;
+	struct devpollop *devpollop;
+
+	if (!(devpollop = mm_calloc(1, sizeof(struct devpollop))))
+		return (NULL);
+
+	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
+	    rl.rlim_cur != RLIM_INFINITY)
+		nfiles = rl.rlim_cur;
+
+	/* Initialize the kernel queue */
+	if ((dpfd = evutil_open_closeonexec_("/dev/poll", O_RDWR, 0)) == -1) {
+		event_warn("open: /dev/poll");
+		mm_free(devpollop);
+		return (NULL);
+	}
+
+	devpollop->dpfd = dpfd;
+
+	/* Initialize fields */
+	/* FIXME: allocating 'nfiles' worth of space here can be
+	 * expensive and unnecessary.  See how epoll.c does it instead. */
+	devpollop->events = mm_calloc(nfiles, sizeof(struct pollfd));
+	if (devpollop->events == NULL) {
+		mm_free(devpollop);
+		close(dpfd);
+		return (NULL);
+	}
+	devpollop->nevents = nfiles;
+
+	devpollop->changes = mm_calloc(nfiles, sizeof(struct pollfd));
+	if (devpollop->changes == NULL) {
+		mm_free(devpollop->events);
+		mm_free(devpollop);
+		close(dpfd);
+		return (NULL);
+	}
+
+	evsig_init_(base);
+
+	return (devpollop);
+}
+
+static int
+devpoll_dispatch(struct event_base *base, struct timeval *tv)
+{
+	struct devpollop *devpollop = base->evbase;
+	struct pollfd *events = devpollop->events;
+	struct dvpoll dvp;
+	int i, res, timeout = -1;
+
+	if (devpollop->nchanges)
+		devpoll_commit(devpollop);
+
+	if (tv != NULL)
+		timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
+
+	dvp.dp_fds = devpollop->events;
+	dvp.dp_nfds = devpollop->nevents;
+	dvp.dp_timeout = timeout;
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = ioctl(devpollop->dpfd, DP_POLL, &dvp);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (res == -1) {
+		if (errno != EINTR) {
+			event_warn("ioctl: DP_POLL");
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	event_debug(("%s: devpoll_wait reports %d", __func__, res));
+
+	for (i = 0; i < res; i++) {
+		int which = 0;
+		int what = events[i].revents;
+
+		if (what & POLLHUP)
+			what |= POLLIN | POLLOUT;
+		else if (what & POLLERR)
+			what |= POLLIN | POLLOUT;
+
+		if (what & POLLIN)
+			which |= EV_READ;
+		if (what & POLLOUT)
+			which |= EV_WRITE;
+
+		if (!which)
+			continue;
+
+		/* XXX(niels): not sure if this works for devpoll */
+		evmap_io_active_(base, events[i].fd, which);
+	}
+
+	return (0);
+}
+
+
+static int
+devpoll_add(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct devpollop *devpollop = base->evbase;
+	int res;
+	(void)p;
+
+	/*
+	 * It's not necessary to OR the existing read/write events that we
+	 * are currently interested in with the new event we are adding.
+	 * The /dev/poll driver ORs any new events with the existing events
+	 * that it has cached for the fd.
+	 */
+
+	res = 0;
+	if (events & EV_READ)
+		res |= POLLIN;
+	if (events & EV_WRITE)
+		res |= POLLOUT;
+
+	if (devpoll_queue(devpollop, fd, res) != 0)
+		return (-1);
+
+	return (0);
+}
+
+static int
+devpoll_del(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct devpollop *devpollop = base->evbase;
+	int res;
+	(void)p;
+
+	res = 0;
+	if (events & EV_READ)
+		res |= POLLIN;
+	if (events & EV_WRITE)
+		res |= POLLOUT;
+
+	/*
+	 * The only way to remove an fd from the /dev/poll monitored set is
+	 * to use POLLREMOVE by itself.  This removes ALL events for the fd
+	 * provided so if we care about two events and are only removing one
+	 * we must re-add the other event after POLLREMOVE.
+	 */
+
+	if (devpoll_queue(devpollop, fd, POLLREMOVE) != 0)
+		return (-1);
+
+	if ((res & (POLLIN|POLLOUT)) != (POLLIN|POLLOUT)) {
+		/*
+		 * We're not deleting all events, so we must resubmit the
+		 * event that we are still interested in if one exists.
+		 */
+
+		if ((res & POLLIN) && (old & EV_WRITE)) {
+			/* Deleting read, still care about write */
+			devpoll_queue(devpollop, fd, POLLOUT);
+		} else if ((res & POLLOUT) && (old & EV_READ)) {
+			/* Deleting write, still care about read */
+			devpoll_queue(devpollop, fd, POLLIN);
+		}
+	}
+
+	return (0);
+}
+
+static void
+devpoll_dealloc(struct event_base *base)
+{
+	struct devpollop *devpollop = base->evbase;
+
+	evsig_dealloc_(base);
+	if (devpollop->events)
+		mm_free(devpollop->events);
+	if (devpollop->changes)
+		mm_free(devpollop->changes);
+	if (devpollop->dpfd >= 0)
+		close(devpollop->dpfd);
+
+	memset(devpollop, 0, sizeof(struct devpollop));
+	mm_free(devpollop);
+}
+
+#endif /* EVENT__HAVE_DEVPOLL */
diff --git a/extra/libevent/libevent-2.1.11-stable/epoll.c b/extra/libevent/libevent-2.1.11-stable/epoll.c
new file mode 100644
index 000000000000..a0df0d21bf89
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/epoll.c
@@ -0,0 +1,543 @@
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_EPOLL
+
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/resource.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <sys/epoll.h>
+#include <signal.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIMERFD_H
+#include <sys/timerfd.h>
+#endif
+
+#include "event-internal.h"
+#include "evsignal-internal.h"
+#include "event2/thread.h"
+#include "evthread-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "changelist-internal.h"
+#include "time-internal.h"
+
+/* Since Linux 2.6.17, epoll is able to report about peer half-closed connection
+   using special EPOLLRDHUP flag on a read event.
+*/
+#if !defined(EPOLLRDHUP)
+#define EPOLLRDHUP 0
+#define EARLY_CLOSE_IF_HAVE_RDHUP 0
+#else
+#define EARLY_CLOSE_IF_HAVE_RDHUP EV_FEATURE_EARLY_CLOSE
+#endif
+
+#include "epolltable-internal.h"
+
+#if defined(EVENT__HAVE_SYS_TIMERFD_H) &&			  \
+	defined(EVENT__HAVE_TIMERFD_CREATE) &&			  \
+	defined(HAVE_POSIX_MONOTONIC) && defined(TFD_NONBLOCK) && \
+	defined(TFD_CLOEXEC)
+/* Note that we only use timerfd if TFD_NONBLOCK and TFD_CLOEXEC are available
+   and working.  This means that we can't support it on 2.6.25 (where timerfd
+   was introduced) or 2.6.26, since 2.6.27 introduced those flags.
+ */
+#define USING_TIMERFD
+#endif
+
+struct epollop {
+	struct epoll_event *events;
+	int nevents;
+	int epfd;
+#ifdef USING_TIMERFD
+	int timerfd;
+#endif
+};
+
+static void *epoll_init(struct event_base *);
+static int epoll_dispatch(struct event_base *, struct timeval *);
+static void epoll_dealloc(struct event_base *);
+
+static const struct eventop epollops_changelist = {
+	"epoll (with changelist)",
+	epoll_init,
+	event_changelist_add_,
+	event_changelist_del_,
+	epoll_dispatch,
+	epoll_dealloc,
+	1, /* need reinit */
+	EV_FEATURE_ET|EV_FEATURE_O1| EARLY_CLOSE_IF_HAVE_RDHUP,
+	EVENT_CHANGELIST_FDINFO_SIZE
+};
+
+
+static int epoll_nochangelist_add(struct event_base *base, evutil_socket_t fd,
+    short old, short events, void *p);
+static int epoll_nochangelist_del(struct event_base *base, evutil_socket_t fd,
+    short old, short events, void *p);
+
+const struct eventop epollops = {
+	"epoll",
+	epoll_init,
+	epoll_nochangelist_add,
+	epoll_nochangelist_del,
+	epoll_dispatch,
+	epoll_dealloc,
+	1, /* need reinit */
+	EV_FEATURE_ET|EV_FEATURE_O1|EV_FEATURE_EARLY_CLOSE,
+	0
+};
+
+#define INITIAL_NEVENT 32
+#define MAX_NEVENT 4096
+
+/* On Linux kernels at least up to 2.6.24.4, epoll can't handle timeout
+ * values bigger than (LONG_MAX - 999ULL)/HZ.  HZ in the wild can be
+ * as big as 1000, and LONG_MAX can be as small as (1<<31)-1, so the
+ * largest number of msec we can support here is 2147482.  Let's
+ * round that down by 47 seconds.
+ */
+#define MAX_EPOLL_TIMEOUT_MSEC (35*60*1000)
+
+static void *
+epoll_init(struct event_base *base)
+{
+	int epfd = -1;
+	struct epollop *epollop;
+
+#ifdef EVENT__HAVE_EPOLL_CREATE1
+	/* First, try the shiny new epoll_create1 interface, if we have it. */
+	epfd = epoll_create1(EPOLL_CLOEXEC);
+#endif
+	if (epfd == -1) {
+		/* Initialize the kernel queue using the old interface.  (The
+		size field is ignored   since 2.6.8.) */
+		if ((epfd = epoll_create(32000)) == -1) {
+			if (errno != ENOSYS)
+				event_warn("epoll_create");
+			return (NULL);
+		}
+		evutil_make_socket_closeonexec(epfd);
+	}
+
+	if (!(epollop = mm_calloc(1, sizeof(struct epollop)))) {
+		close(epfd);
+		return (NULL);
+	}
+
+	epollop->epfd = epfd;
+
+	/* Initialize fields */
+	epollop->events = mm_calloc(INITIAL_NEVENT, sizeof(struct epoll_event));
+	if (epollop->events == NULL) {
+		mm_free(epollop);
+		close(epfd);
+		return (NULL);
+	}
+	epollop->nevents = INITIAL_NEVENT;
+
+	if ((base->flags & EVENT_BASE_FLAG_EPOLL_USE_CHANGELIST) != 0 ||
+	    ((base->flags & EVENT_BASE_FLAG_IGNORE_ENV) == 0 &&
+		evutil_getenv_("EVENT_EPOLL_USE_CHANGELIST") != NULL)) {
+
+		base->evsel = &epollops_changelist;
+	}
+
+#ifdef USING_TIMERFD
+	/*
+	  The epoll interface ordinarily gives us one-millisecond precision,
+	  so on Linux it makes perfect sense to use the CLOCK_MONOTONIC_COARSE
+	  timer.  But when the user has set the new PRECISE_TIMER flag for an
+	  event_base, we can try to use timerfd to give them finer granularity.
+	*/
+	if ((base->flags & EVENT_BASE_FLAG_PRECISE_TIMER) &&
+	    base->monotonic_timer.monotonic_clock == CLOCK_MONOTONIC) {
+		int fd;
+		fd = epollop->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC);
+		if (epollop->timerfd >= 0) {
+			struct epoll_event epev;
+			memset(&epev, 0, sizeof(epev));
+			epev.data.fd = epollop->timerfd;
+			epev.events = EPOLLIN;
+			if (epoll_ctl(epollop->epfd, EPOLL_CTL_ADD, fd, &epev) < 0) {
+				event_warn("epoll_ctl(timerfd)");
+				close(fd);
+				epollop->timerfd = -1;
+			}
+		} else {
+			if (errno != EINVAL && errno != ENOSYS) {
+				/* These errors probably mean that we were
+				 * compiled with timerfd/TFD_* support, but
+				 * we're running on a kernel that lacks those.
+				 */
+				event_warn("timerfd_create");
+			}
+			epollop->timerfd = -1;
+		}
+	} else {
+		epollop->timerfd = -1;
+	}
+#endif
+
+	evsig_init_(base);
+
+	return (epollop);
+}
+
+static const char *
+change_to_string(int change)
+{
+	change &= (EV_CHANGE_ADD|EV_CHANGE_DEL);
+	if (change == EV_CHANGE_ADD) {
+		return "add";
+	} else if (change == EV_CHANGE_DEL) {
+		return "del";
+	} else if (change == 0) {
+		return "none";
+	} else {
+		return "???";
+	}
+}
+
+static const char *
+epoll_op_to_string(int op)
+{
+	return op == EPOLL_CTL_ADD?"ADD":
+	    op == EPOLL_CTL_DEL?"DEL":
+	    op == EPOLL_CTL_MOD?"MOD":
+	    "???";
+}
+
+#define PRINT_CHANGES(op, events, ch, status)  \
+	"Epoll %s(%d) on fd %d " status ". "       \
+	"Old events were %d; "                     \
+	"read change was %d (%s); "                \
+	"write change was %d (%s); "               \
+	"close change was %d (%s)",                \
+	epoll_op_to_string(op),                    \
+	events,                                    \
+	ch->fd,                                    \
+	ch->old_events,                            \
+	ch->read_change,                           \
+	change_to_string(ch->read_change),         \
+	ch->write_change,                          \
+	change_to_string(ch->write_change),        \
+	ch->close_change,                          \
+	change_to_string(ch->close_change)
+
+static int
+epoll_apply_one_change(struct event_base *base,
+    struct epollop *epollop,
+    const struct event_change *ch)
+{
+	struct epoll_event epev;
+	int op, events = 0;
+	int idx;
+
+	idx = EPOLL_OP_TABLE_INDEX(ch);
+	op = epoll_op_table[idx].op;
+	events = epoll_op_table[idx].events;
+
+	if (!events) {
+		EVUTIL_ASSERT(op == 0);
+		return 0;
+	}
+
+	if ((ch->read_change|ch->write_change) & EV_CHANGE_ET)
+		events |= EPOLLET;
+
+	memset(&epev, 0, sizeof(epev));
+	epev.data.fd = ch->fd;
+	epev.events = events;
+	if (epoll_ctl(epollop->epfd, op, ch->fd, &epev) == 0) {
+		event_debug((PRINT_CHANGES(op, epev.events, ch, "okay")));
+		return 0;
+	}
+
+	switch (op) {
+	case EPOLL_CTL_MOD:
+		if (errno == ENOENT) {
+			/* If a MOD operation fails with ENOENT, the
+			 * fd was probably closed and re-opened.  We
+			 * should retry the operation as an ADD.
+			 */
+			if (epoll_ctl(epollop->epfd, EPOLL_CTL_ADD, ch->fd, &epev) == -1) {
+				event_warn("Epoll MOD(%d) on %d retried as ADD; that failed too",
+				    (int)epev.events, ch->fd);
+				return -1;
+			} else {
+				event_debug(("Epoll MOD(%d) on %d retried as ADD; succeeded.",
+					(int)epev.events,
+					ch->fd));
+				return 0;
+			}
+		}
+		break;
+	case EPOLL_CTL_ADD:
+		if (errno == EEXIST) {
+			/* If an ADD operation fails with EEXIST,
+			 * either the operation was redundant (as with a
+			 * precautionary add), or we ran into a fun
+			 * kernel bug where using dup*() to duplicate the
+			 * same file into the same fd gives you the same epitem
+			 * rather than a fresh one.  For the second case,
+			 * we must retry with MOD. */
+			if (epoll_ctl(epollop->epfd, EPOLL_CTL_MOD, ch->fd, &epev) == -1) {
+				event_warn("Epoll ADD(%d) on %d retried as MOD; that failed too",
+				    (int)epev.events, ch->fd);
+				return -1;
+			} else {
+				event_debug(("Epoll ADD(%d) on %d retried as MOD; succeeded.",
+					(int)epev.events,
+					ch->fd));
+				return 0;
+			}
+		}
+		break;
+	case EPOLL_CTL_DEL:
+		if (errno == ENOENT || errno == EBADF || errno == EPERM) {
+			/* If a delete fails with one of these errors,
+			 * that's fine too: we closed the fd before we
+			 * got around to calling epoll_dispatch. */
+			event_debug(("Epoll DEL(%d) on fd %d gave %s: DEL was unnecessary.",
+				(int)epev.events,
+				ch->fd,
+				strerror(errno)));
+			return 0;
+		}
+		break;
+	default:
+		break;
+	}
+
+	event_warn(PRINT_CHANGES(op, epev.events, ch, "failed"));
+	return -1;
+}
+
+static int
+epoll_apply_changes(struct event_base *base)
+{
+	struct event_changelist *changelist = &base->changelist;
+	struct epollop *epollop = base->evbase;
+	struct event_change *ch;
+
+	int r = 0;
+	int i;
+
+	for (i = 0; i < changelist->n_changes; ++i) {
+		ch = &changelist->changes[i];
+		if (epoll_apply_one_change(base, epollop, ch) < 0)
+			r = -1;
+	}
+
+	return (r);
+}
+
+static int
+epoll_nochangelist_add(struct event_base *base, evutil_socket_t fd,
+    short old, short events, void *p)
+{
+	struct event_change ch;
+	ch.fd = fd;
+	ch.old_events = old;
+	ch.read_change = ch.write_change = ch.close_change = 0;
+	if (events & EV_WRITE)
+		ch.write_change = EV_CHANGE_ADD |
+		    (events & EV_ET);
+	if (events & EV_READ)
+		ch.read_change = EV_CHANGE_ADD |
+		    (events & EV_ET);
+	if (events & EV_CLOSED)
+		ch.close_change = EV_CHANGE_ADD |
+		    (events & EV_ET);
+
+	return epoll_apply_one_change(base, base->evbase, &ch);
+}
+
+static int
+epoll_nochangelist_del(struct event_base *base, evutil_socket_t fd,
+    short old, short events, void *p)
+{
+	struct event_change ch;
+	ch.fd = fd;
+	ch.old_events = old;
+	ch.read_change = ch.write_change = ch.close_change = 0;
+	if (events & EV_WRITE)
+		ch.write_change = EV_CHANGE_DEL |
+		    (events & EV_ET);
+	if (events & EV_READ)
+		ch.read_change = EV_CHANGE_DEL |
+		    (events & EV_ET);
+	if (events & EV_CLOSED)
+		ch.close_change = EV_CHANGE_DEL |
+		    (events & EV_ET);
+
+	return epoll_apply_one_change(base, base->evbase, &ch);
+}
+
+static int
+epoll_dispatch(struct event_base *base, struct timeval *tv)
+{
+	struct epollop *epollop = base->evbase;
+	struct epoll_event *events = epollop->events;
+	int i, res;
+	long timeout = -1;
+
+#ifdef USING_TIMERFD
+	if (epollop->timerfd >= 0) {
+		struct itimerspec is;
+		is.it_interval.tv_sec = 0;
+		is.it_interval.tv_nsec = 0;
+		if (tv == NULL) {
+			/* No timeout; disarm the timer. */
+			is.it_value.tv_sec = 0;
+			is.it_value.tv_nsec = 0;
+		} else {
+			if (tv->tv_sec == 0 && tv->tv_usec == 0) {
+				/* we need to exit immediately; timerfd can't
+				 * do that. */
+				timeout = 0;
+			}
+			is.it_value.tv_sec = tv->tv_sec;
+			is.it_value.tv_nsec = tv->tv_usec * 1000;
+		}
+		/* TODO: we could avoid unnecessary syscalls here by only
+		   calling timerfd_settime when the top timeout changes, or
+		   when we're called with a different timeval.
+		*/
+		if (timerfd_settime(epollop->timerfd, 0, &is, NULL) < 0) {
+			event_warn("timerfd_settime");
+		}
+	} else
+#endif
+	if (tv != NULL) {
+		timeout = evutil_tv_to_msec_(tv);
+		if (timeout < 0 || timeout > MAX_EPOLL_TIMEOUT_MSEC) {
+			/* Linux kernels can wait forever if the timeout is
+			 * too big; see comment on MAX_EPOLL_TIMEOUT_MSEC. */
+			timeout = MAX_EPOLL_TIMEOUT_MSEC;
+		}
+	}
+
+	epoll_apply_changes(base);
+	event_changelist_remove_all_(&base->changelist, base);
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = epoll_wait(epollop->epfd, events, epollop->nevents, timeout);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (res == -1) {
+		if (errno != EINTR) {
+			event_warn("epoll_wait");
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	event_debug(("%s: epoll_wait reports %d", __func__, res));
+	EVUTIL_ASSERT(res <= epollop->nevents);
+
+	for (i = 0; i < res; i++) {
+		int what = events[i].events;
+		short ev = 0;
+#ifdef USING_TIMERFD
+		if (events[i].data.fd == epollop->timerfd)
+			continue;
+#endif
+
+		if (what & (EPOLLHUP|EPOLLERR)) {
+			ev = EV_READ | EV_WRITE;
+		} else {
+			if (what & EPOLLIN)
+				ev |= EV_READ;
+			if (what & EPOLLOUT)
+				ev |= EV_WRITE;
+			if (what & EPOLLRDHUP)
+				ev |= EV_CLOSED;
+		}
+
+		if (!ev)
+			continue;
+
+		evmap_io_active_(base, events[i].data.fd, ev | EV_ET);
+	}
+
+	if (res == epollop->nevents && epollop->nevents < MAX_NEVENT) {
+		/* We used all of the event space this time.  We should
+		   be ready for more events next time. */
+		int new_nevents = epollop->nevents * 2;
+		struct epoll_event *new_events;
+
+		new_events = mm_realloc(epollop->events,
+		    new_nevents * sizeof(struct epoll_event));
+		if (new_events) {
+			epollop->events = new_events;
+			epollop->nevents = new_nevents;
+		}
+	}
+
+	return (0);
+}
+
+
+static void
+epoll_dealloc(struct event_base *base)
+{
+	struct epollop *epollop = base->evbase;
+
+	evsig_dealloc_(base);
+	if (epollop->events)
+		mm_free(epollop->events);
+	if (epollop->epfd >= 0)
+		close(epollop->epfd);
+#ifdef USING_TIMERFD
+	if (epollop->timerfd >= 0)
+		close(epollop->timerfd);
+#endif
+
+	memset(epollop, 0, sizeof(struct epollop));
+	mm_free(epollop);
+}
+
+#endif /* EVENT__HAVE_EPOLL */
diff --git a/libevent/epoll_sub.c b/extra/libevent/libevent-2.1.11-stable/epoll_sub.c
similarity index 98%
rename from libevent/epoll_sub.c
rename to extra/libevent/libevent-2.1.11-stable/epoll_sub.c
index 890b81324260..3f01f6a69959 100644
--- a/libevent/epoll_sub.c
+++ b/extra/libevent/libevent-2.1.11-stable/epoll_sub.c
@@ -24,6 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "evconfig-private.h"
 #include <stdint.h>
 
 #include <sys/param.h>
@@ -62,4 +63,4 @@ epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
 #else
 	return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
 #endif
-}
\ No newline at end of file
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/epolltable-internal.h b/extra/libevent/libevent-2.1.11-stable/epolltable-internal.h
new file mode 100644
index 000000000000..73c2e3647e29
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/epolltable-internal.h
@@ -0,0 +1,1166 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EPOLLTABLE_INTERNAL_H_INCLUDED_
+#define EPOLLTABLE_INTERNAL_H_INCLUDED_
+
+/*
+  Here are the values we're masking off to decide what operations to do.
+  Note that since EV_READ|EV_WRITE.
+
+  Note also that this table is a little sparse, since ADD+DEL is
+  nonsensical ("xxx" in the list below.)
+
+  Note also that we are shifting old_events by only 5 bits, since
+  EV_READ is 2 and EV_WRITE is 4.
+
+  The table was auto-generated with a python script, according to this
+  pseudocode:[*0]
+
+      If either the read or the write change is add+del:
+	 This is impossible; Set op==-1, events=0.
+      Else, if either the read or the write change is add:
+	 Set events to 0.
+	 If the read change is add, or
+	    (the read change is not del, and ev_read is in old_events):
+	       Add EPOLLIN to events.
+	 If the write change is add, or
+	    (the write change is not del, and ev_write is in old_events):
+	       Add EPOLLOUT to events.
+
+	 If old_events is set:
+	       Set op to EPOLL_CTL_MOD [*1,*2]
+	Else:
+	       Set op to EPOLL_CTL_ADD [*3]
+
+      Else, if the read or the write change is del:
+	 Set op to EPOLL_CTL_DEL.
+	 If the read change is del:
+	     If the write change is del:
+		 Set events to EPOLLIN|EPOLLOUT
+	     Else if ev_write is in old_events:
+		 Set events to EPOLLOUT
+		Set op to EPOLL_CTL_MOD
+	     Else
+		 Set events to EPOLLIN
+	 Else:
+	     {The write change is del.}
+	    If ev_read is in old_events:
+		 Set events to EPOLLIN
+		Set op to EPOLL_CTL_MOD
+	    Else:
+		Set the events to EPOLLOUT
+
+      Else:
+	   There is no read or write change; set op to 0 and events to 0.
+
+      The logic is a little tricky, since we had no events set on the fd before,
+      we need to set op="ADD" and set events=the events we want to add.	 If we
+      had any events set on the fd before, and we want any events to remain on
+      the fd, we need to say op="MOD" and set events=the events we want to
+      remain.  But if we want to delete the last event, we say op="DEL" and
+      set events=(any non-null pointer).
+
+  [*0] Actually, the Python script has gotten a bit more complicated, to
+       support EPOLLRDHUP.
+
+  [*1] This MOD is only a guess.  MOD might fail with ENOENT if the file was
+       closed and a new file was opened with the same fd.  If so, we'll retry
+       with ADD.
+
+  [*2] We can't replace this with a no-op even if old_events is the same as
+       the new events: if the file was closed and reopened, we need to retry
+       with an ADD.  (We do a MOD in this case since "no change" is more
+       common than "close and reopen", so we'll usually wind up doing 1
+       syscalls instead of 2.)
+
+  [*3] This ADD is only a guess.  There is a fun Linux kernel issue where if
+       you have two fds for the same file (via dup) and you ADD one to an
+       epfd, then close it, then re-create it with the same fd (via dup2 or an
+       unlucky dup), then try to ADD it again, you'll get an EEXIST, since the
+       struct epitem is not actually removed from the struct eventpoll until
+       the file itself is closed.
+
+  EV_CHANGE_ADD==1
+  EV_CHANGE_DEL==2
+  EV_READ      ==2
+  EV_WRITE     ==4
+  EV_CLOSED    ==0x80
+
+  Bit 0: close change is add
+  Bit 1: close change is del
+  Bit 2: read change is add
+  Bit 3: read change is del
+  Bit 4: write change is add
+  Bit 5: write change is del
+  Bit 6: old events had EV_READ
+  Bit 7: old events had EV_WRITE
+  Bit 8: old events had EV_CLOSED
+*/
+
+#define EPOLL_OP_TABLE_INDEX(c) \
+	(   (((c)->close_change&(EV_CHANGE_ADD|EV_CHANGE_DEL))) |		\
+	    (((c)->read_change&(EV_CHANGE_ADD|EV_CHANGE_DEL)) << 2) |	\
+	    (((c)->write_change&(EV_CHANGE_ADD|EV_CHANGE_DEL)) << 4) |	\
+	    (((c)->old_events&(EV_READ|EV_WRITE)) << 5) |		\
+	    (((c)->old_events&(EV_CLOSED)) << 1)				\
+	    )
+
+#if EV_READ != 2 || EV_WRITE != 4 || EV_CLOSED != 0x80 || EV_CHANGE_ADD != 1 || EV_CHANGE_DEL != 2
+#error "Libevent's internals changed!  Regenerate the op_table in epolltable-internal.h"
+#endif
+
+static const struct operation {
+	int events;
+	int op;
+} epoll_op_table[] = {
+	/* old=  0, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old=  0, write:  0, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:  0, read:  0, close:del */
+	{ EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  0, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_ADD },
+	/* old=  0, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:  0, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_ADD },
+	/* old=  0, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:del, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_DEL },
+	/* old=  0, write:  0, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:  0, read:del, close:del */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  0, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  0, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:add, read:  0, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:add, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_ADD },
+	/* old=  0, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  0, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  0, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:del, read:  0, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_DEL },
+	/* old=  0, write:del, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:del, read:  0, close:del */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  0, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:del, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_ADD },
+	/* old=  0, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_ADD },
+	/* old=  0, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:del, read:del, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_DEL },
+	/* old=  0, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_ADD },
+	/* old=  0, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  0, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  0, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  0, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  0, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old=  r, write:  0, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:del, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_DEL },
+	/* old=  r, write:  0, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:  0, read:del, close:del */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  r, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  r, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:add, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:add, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  r, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  r, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  r, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:del, read:  0, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:del, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:del, read:del, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_DEL },
+	/* old=  r, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  r, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  r, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  r, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  r, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  r, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old=  w, write:  0, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  w, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:add, read:  0, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:add, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  w, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  w, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  w, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:del, read:  0, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_DEL },
+	/* old=  w, write:del, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:del, read:  0, close:del */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  w, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:del, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  w, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  w, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:del, read:del, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_DEL },
+	/* old=  w, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  w, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  w, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  w, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  w, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  w, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old= rw, write:  0, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= rw, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:add, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:add, read:del, close:  0 */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= rw, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= rw, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= rw, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:del, read:  0, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:del, read:add, close:  0 */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:del, read:del, close:  0 */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_DEL },
+	/* old= rw, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= rw, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old= rw, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= rw, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= rw, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= rw, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old=  c, write:  0, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:  0, close:del */
+	{ EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  c, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:  0, read:del, close:del */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  c, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  c, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:add, read:  0, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:add, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=  c, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  c, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  c, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:del, read:  0, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:  0, close:del */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  c, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:del, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:del, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=  c, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=  c, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  c, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  c, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=  c, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old= cr, write:  0, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:  0, read:del, close:del */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old= cr, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cr, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:add, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:add, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cr, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cr, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cr, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:del, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:del, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:del, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cr, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old= cr, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cr, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cr, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cr, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old= cw, write:  0, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cw, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:add, read:  0, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:  0, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:  0, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:add, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old= cw, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cw, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cw, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:del, read:  0, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:  0, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:  0, close:del */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old= cw, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:del, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:del, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old= cw, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old= cw, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cw, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cw, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old= cw, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:  0, close:  0 */
+	{ 0, 0 },
+	/* old=crw, write:  0, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:  0, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=crw, write:  0, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:add, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:  0, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:  0, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:add, read:add, close:  0 */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:add, close:add */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:add, close:del */
+	{ EPOLLIN|EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:add, read:del, close:  0 */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:del, close:add */
+	{ EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:del, close:del */
+	{ EPOLLOUT, EPOLL_CTL_MOD },
+	/* old=crw, write:add, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:add, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:add, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=crw, write:add, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=crw, write:add, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:del, read:  0, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:  0, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:  0, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:del, read:add, close:  0 */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:add, close:add */
+	{ EPOLLIN|EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:add, close:del */
+	{ EPOLLIN, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:del, read:del, close:  0 */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:del, close:add */
+	{ EPOLLRDHUP, EPOLL_CTL_MOD },
+	/* old=crw, write:del, read:del, close:del */
+	{ EPOLLIN|EPOLLOUT|EPOLLRDHUP, EPOLL_CTL_DEL },
+	/* old=crw, write:del, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:del, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:del, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=crw, write:del, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=crw, write:del, read:xxx, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:  0, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:  0, close:add */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:  0, close:del */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:  0, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:add, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:add, close:add */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:add, close:del */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:add, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:del, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:del, close:add */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:del, close:del */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:del, close:xxx */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:xxx, close:  0 */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:xxx, close:add */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:xxx, close:del */
+	{ 0, 255 },
+	/* old=crw, write:xxx, read:xxx, close:xxx */
+	{ 0, 255 },
+};
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/evbuffer-internal.h b/extra/libevent/libevent-2.1.11-stable/evbuffer-internal.h
new file mode 100644
index 000000000000..d09b4f1ddd58
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evbuffer-internal.h
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVBUFFER_INTERNAL_H_INCLUDED_
+#define EVBUFFER_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+#include "event2/util.h"
+#include "event2/event_struct.h"
+#include "util-internal.h"
+#include "defer-internal.h"
+
+/* Experimental cb flag: "never deferred."  Implementation note:
+ * these callbacks may get an inaccurate view of n_del/n_added in their
+ * arguments. */
+#define EVBUFFER_CB_NODEFER 2
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+#include <sys/queue.h>
+
+/* Minimum allocation for a chain.  We define this so that we're burning no
+ * more than 5% of each allocation on overhead.  It would be nice to lose even
+ * less space, though. */
+#if EVENT__SIZEOF_VOID_P < 8
+#define MIN_BUFFER_SIZE	512
+#else
+#define MIN_BUFFER_SIZE	1024
+#endif
+
+/** A single evbuffer callback for an evbuffer. This function will be invoked
+ * when bytes are added to or removed from the evbuffer. */
+struct evbuffer_cb_entry {
+	/** Structures to implement a doubly-linked queue of callbacks */
+	LIST_ENTRY(evbuffer_cb_entry) next;
+	/** The callback function to invoke when this callback is called.
+	    If EVBUFFER_CB_OBSOLETE is set in flags, the cb_obsolete field is
+	    valid; otherwise, cb_func is valid. */
+	union {
+		evbuffer_cb_func cb_func;
+		evbuffer_cb cb_obsolete;
+	} cb;
+	/** Argument to pass to cb. */
+	void *cbarg;
+	/** Currently set flags on this callback. */
+	ev_uint32_t flags;
+};
+
+struct bufferevent;
+struct evbuffer_chain;
+struct evbuffer {
+	/** The first chain in this buffer's linked list of chains. */
+	struct evbuffer_chain *first;
+	/** The last chain in this buffer's linked list of chains. */
+	struct evbuffer_chain *last;
+
+	/** Pointer to the next pointer pointing at the 'last_with_data' chain.
+	 *
+	 * To unpack:
+	 *
+	 * The last_with_data chain is the last chain that has any data in it.
+	 * If all chains in the buffer are empty, it is the first chain.
+	 * If the buffer has no chains, it is NULL.
+	 *
+	 * The last_with_datap pointer points at _whatever 'next' pointer_
+	 * pointing at the last_with_data chain. If the last_with_data chain
+	 * is the first chain, or it is NULL, then the last_with_datap pointer
+	 * is &buf->first.
+	 */
+	struct evbuffer_chain **last_with_datap;
+
+	/** Total amount of bytes stored in all chains.*/
+	size_t total_len;
+
+	/** Number of bytes we have added to the buffer since we last tried to
+	 * invoke callbacks. */
+	size_t n_add_for_cb;
+	/** Number of bytes we have removed from the buffer since we last
+	 * tried to invoke callbacks. */
+	size_t n_del_for_cb;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	/** A lock used to mediate access to this buffer. */
+	void *lock;
+#endif
+	/** True iff we should free the lock field when we free this
+	 * evbuffer. */
+	unsigned own_lock : 1;
+	/** True iff we should not allow changes to the front of the buffer
+	 * (drains or prepends). */
+	unsigned freeze_start : 1;
+	/** True iff we should not allow changes to the end of the buffer
+	 * (appends) */
+	unsigned freeze_end : 1;
+	/** True iff this evbuffer's callbacks are not invoked immediately
+	 * upon a change in the buffer, but instead are deferred to be invoked
+	 * from the event_base's loop.	Useful for preventing enormous stack
+	 * overflows when we have mutually recursive callbacks, and for
+	 * serializing callbacks in a single thread. */
+	unsigned deferred_cbs : 1;
+#ifdef _WIN32
+	/** True iff this buffer is set up for overlapped IO. */
+	unsigned is_overlapped : 1;
+#endif
+	/** Zero or more EVBUFFER_FLAG_* bits */
+	ev_uint32_t flags;
+
+	/** Used to implement deferred callbacks. */
+	struct event_base *cb_queue;
+
+	/** A reference count on this evbuffer.	 When the reference count
+	 * reaches 0, the buffer is destroyed.	Manipulated with
+	 * evbuffer_incref and evbuffer_decref_and_unlock and
+	 * evbuffer_free. */
+	int refcnt;
+
+	/** A struct event_callback handle to make all of this buffer's callbacks
+	 * invoked from the event loop. */
+	struct event_callback deferred;
+
+	/** A doubly-linked-list of callback functions */
+	LIST_HEAD(evbuffer_cb_queue, evbuffer_cb_entry) callbacks;
+
+	/** The parent bufferevent object this evbuffer belongs to.
+	 * NULL if the evbuffer stands alone. */
+	struct bufferevent *parent;
+};
+
+#if EVENT__SIZEOF_OFF_T < EVENT__SIZEOF_SIZE_T
+typedef ev_ssize_t ev_misalign_t;
+#define EVBUFFER_CHAIN_MAX ((size_t)EV_SSIZE_MAX)
+#else
+typedef ev_off_t ev_misalign_t;
+#if EVENT__SIZEOF_OFF_T > EVENT__SIZEOF_SIZE_T
+#define EVBUFFER_CHAIN_MAX EV_SIZE_MAX
+#else
+#define EVBUFFER_CHAIN_MAX ((size_t)EV_SSIZE_MAX)
+#endif
+#endif
+
+/** A single item in an evbuffer. */
+struct evbuffer_chain {
+	/** points to next buffer in the chain */
+	struct evbuffer_chain *next;
+
+	/** total allocation available in the buffer field. */
+	size_t buffer_len;
+
+	/** unused space at the beginning of buffer or an offset into a
+	 * file for sendfile buffers. */
+	ev_misalign_t misalign;
+
+	/** Offset into buffer + misalign at which to start writing.
+	 * In other words, the total number of bytes actually stored
+	 * in buffer. */
+	size_t off;
+
+	/** Set if special handling is required for this chain */
+	unsigned flags;
+#define EVBUFFER_FILESEGMENT	0x0001  /**< A chain used for a file segment */
+#define EVBUFFER_SENDFILE	0x0002	/**< a chain used with sendfile */
+#define EVBUFFER_REFERENCE	0x0004	/**< a chain with a mem reference */
+#define EVBUFFER_IMMUTABLE	0x0008	/**< read-only chain */
+	/** a chain that mustn't be reallocated or freed, or have its contents
+	 * memmoved, until the chain is un-pinned. */
+#define EVBUFFER_MEM_PINNED_R	0x0010
+#define EVBUFFER_MEM_PINNED_W	0x0020
+#define EVBUFFER_MEM_PINNED_ANY (EVBUFFER_MEM_PINNED_R|EVBUFFER_MEM_PINNED_W)
+	/** a chain that should be freed, but can't be freed until it is
+	 * un-pinned. */
+#define EVBUFFER_DANGLING	0x0040
+	/** a chain that is a referenced copy of another chain */
+#define EVBUFFER_MULTICAST	0x0080
+
+	/** number of references to this chain */
+	int refcnt;
+
+	/** Usually points to the read-write memory belonging to this
+	 * buffer allocated as part of the evbuffer_chain allocation.
+	 * For mmap, this can be a read-only buffer and
+	 * EVBUFFER_IMMUTABLE will be set in flags.  For sendfile, it
+	 * may point to NULL.
+	 */
+	unsigned char *buffer;
+};
+
+/** callback for a reference chain; lets us know what to do with it when
+ * we're done with it. Lives at the end of an evbuffer_chain with the
+ * EVBUFFER_REFERENCE flag set */
+struct evbuffer_chain_reference {
+	evbuffer_ref_cleanup_cb cleanupfn;
+	void *extra;
+};
+
+/** File segment for a file-segment chain.  Lives at the end of an
+ * evbuffer_chain with the EVBUFFER_FILESEGMENT flag set.  */
+struct evbuffer_chain_file_segment {
+	struct evbuffer_file_segment *segment;
+#ifdef _WIN32
+	/** If we're using CreateFileMapping, this is the handle to the view. */
+	HANDLE view_handle;
+#endif
+};
+
+/* Declared in event2/buffer.h; defined here. */
+struct evbuffer_file_segment {
+	void *lock; /**< lock prevent concurrent access to refcnt */
+	int refcnt; /**< Reference count for this file segment */
+	unsigned flags; /**< combination of EVBUF_FS_* flags  */
+
+	/** What kind of file segment is this? */
+	unsigned can_sendfile : 1;
+	unsigned is_mapping : 1;
+
+	/** The fd that we read the data from. */
+	int fd;
+	/** If we're using mmap, this is the raw mapped memory. */
+	void *mapping;
+#ifdef _WIN32
+	/** If we're using CreateFileMapping, this is the mapping */
+	HANDLE mapping_handle;
+#endif
+	/** If we're using mmap or IO, this is the content of the file
+	 * segment. */
+	char *contents;
+	/** Position of this segment within the file. */
+	ev_off_t file_offset;
+	/** If we're using mmap, this is the offset within 'mapping' where
+	 * this data segment begins. */
+	ev_off_t mmap_offset;
+	/** The length of this segment. */
+	ev_off_t length;
+	/** Cleanup callback function */
+	evbuffer_file_segment_cleanup_cb cleanup_cb;
+	/** Argument to be pass to cleanup callback function */
+	void *cleanup_cb_arg;
+};
+
+/** Information about the multicast parent of a chain.  Lives at the
+ * end of an evbuffer_chain with the EVBUFFER_MULTICAST flag set.  */
+struct evbuffer_multicast_parent {
+	/** source buffer the multicast parent belongs to */
+	struct evbuffer *source;
+	/** multicast parent for this chain */
+	struct evbuffer_chain *parent;
+};
+
+#define EVBUFFER_CHAIN_SIZE sizeof(struct evbuffer_chain)
+/** Return a pointer to extra data allocated along with an evbuffer. */
+#define EVBUFFER_CHAIN_EXTRA(t, c) (t *)((struct evbuffer_chain *)(c) + 1)
+
+/** Assert that we are holding the lock on an evbuffer */
+#define ASSERT_EVBUFFER_LOCKED(buffer)			\
+	EVLOCK_ASSERT_LOCKED((buffer)->lock)
+
+#define EVBUFFER_LOCK(buffer)						\
+	do {								\
+		EVLOCK_LOCK((buffer)->lock, 0);				\
+	} while (0)
+#define EVBUFFER_UNLOCK(buffer)						\
+	do {								\
+		EVLOCK_UNLOCK((buffer)->lock, 0);			\
+	} while (0)
+#define EVBUFFER_LOCK2(buffer1, buffer2)				\
+	do {								\
+		EVLOCK_LOCK2((buffer1)->lock, (buffer2)->lock, 0, 0);	\
+	} while (0)
+#define EVBUFFER_UNLOCK2(buffer1, buffer2)				\
+	do {								\
+		EVLOCK_UNLOCK2((buffer1)->lock, (buffer2)->lock, 0, 0);	\
+	} while (0)
+
+/** Increase the reference count of buf by one. */
+void evbuffer_incref_(struct evbuffer *buf);
+/** Increase the reference count of buf by one and acquire the lock. */
+void evbuffer_incref_and_lock_(struct evbuffer *buf);
+/** Pin a single buffer chain using a given flag. A pinned chunk may not be
+ * moved or freed until it is unpinned. */
+void evbuffer_chain_pin_(struct evbuffer_chain *chain, unsigned flag);
+/** Unpin a single buffer chain using a given flag. */
+void evbuffer_chain_unpin_(struct evbuffer_chain *chain, unsigned flag);
+/** As evbuffer_free, but requires that we hold a lock on the buffer, and
+ * releases the lock before freeing it and the buffer. */
+void evbuffer_decref_and_unlock_(struct evbuffer *buffer);
+
+/** As evbuffer_expand, but does not guarantee that the newly allocated memory
+ * is contiguous.  Instead, it may be split across two or more chunks. */
+int evbuffer_expand_fast_(struct evbuffer *, size_t, int);
+
+/** Helper: prepares for a readv/WSARecv call by expanding the buffer to
+ * hold enough memory to read 'howmuch' bytes in possibly noncontiguous memory.
+ * Sets up the one or two iovecs in 'vecs' to point to the free memory and its
+ * extent, and *chainp to point to the first chain that we'll try to read into.
+ * Returns the number of vecs used.
+ */
+int evbuffer_read_setup_vecs_(struct evbuffer *buf, ev_ssize_t howmuch,
+    struct evbuffer_iovec *vecs, int n_vecs, struct evbuffer_chain ***chainp,
+    int exact);
+
+/* Helper macro: copies an evbuffer_iovec in ei to a win32 WSABUF in i. */
+#define WSABUF_FROM_EVBUFFER_IOV(i,ei) do {		\
+		(i)->buf = (ei)->iov_base;		\
+		(i)->len = (unsigned long)(ei)->iov_len;	\
+	} while (0)
+/* XXXX the cast above is safe for now, but not if we allow mmaps on win64.
+ * See note in buffer_iocp's launch_write function */
+
+/** Set the parent bufferevent object for buf to bev */
+void evbuffer_set_parent_(struct evbuffer *buf, struct bufferevent *bev);
+
+void evbuffer_invoke_callbacks_(struct evbuffer *buf);
+
+
+int evbuffer_get_callbacks_(struct evbuffer *buffer,
+    struct event_callback **cbs,
+    int max_cbs);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVBUFFER_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.cmake b/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.cmake
new file mode 100644
index 000000000000..1adf9c03d1b4
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.cmake
@@ -0,0 +1,40 @@
+
+#ifndef EVCONFIG_PRIVATE_H_INCLUDED_
+#define EVCONFIG_PRIVATE_H_INCLUDED_
+
+/* Enable extensions on AIX 3, Interix.  */
+#cmakedefine _ALL_SOURCE
+
+/* Enable GNU extensions on systems that have them.  */
+#cmakedefine _GNU_SOURCE 1
+
+/* Enable threading extensions on Solaris.  */
+#cmakedefine _POSIX_PTHREAD_SEMANTICS 1
+
+/* Enable extensions on HP NonStop.  */
+#cmakedefine _TANDEM_SOURCE 1
+
+/* Enable general extensions on Solaris.  */
+#cmakedefine __EXTENSIONS__
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#cmakedefine _FILE_OFFSET_BITS 1
+/* Define for large files, on AIX-style hosts. */
+#cmakedefine _LARGE_FILES 1
+
+/* Define to 1 if on MINIX. */
+#cmakedefine _MINIX 1
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#cmakedefine _POSIX_1_SOURCE 1
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#cmakedefine _POSIX_SOURCE 1
+
+/* Enable POSIX.2 extensions on QNX for getopt */
+#ifdef __QNX__
+#cmakedefine __EXT_POSIX2 1
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.in b/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.in
new file mode 100644
index 000000000000..8cd647874332
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evconfig-private.h.in
@@ -0,0 +1,55 @@
+/* evconfig-private.h template - see "Configuration Header Templates" */
+/* in AC manual.  Kevin Bowling <kevin.bowling@kev009.com */
+#ifndef EVCONFIG_PRIVATE_H_INCLUDED_
+#define EVCONFIG_PRIVATE_H_INCLUDED_
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#ifndef _MINIX
+#undef _MINIX
+#endif
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#ifndef _POSIX_1_SOURCE
+#undef _POSIX_1_SOURCE
+#endif
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#ifndef _POSIX_SOURCE
+#undef _POSIX_SOURCE
+#endif
+
+/* Enable POSIX.2 extensions on QNX for getopt */
+#ifdef __QNX__
+# ifndef __EXT_POSIX2
+#  define __EXT_POSIX2
+# endif
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/evdns.c b/extra/libevent/libevent-2.1.11-stable/evdns.c
new file mode 100644
index 000000000000..de3848ad18ce
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evdns.c
@@ -0,0 +1,4844 @@
+/* Copyright 2006-2007 Niels Provos
+ * Copyright 2007-2012 Nick Mathewson and Niels Provos
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/* Based on software by Adam Langly. Adam's original message:
+ *
+ * Async DNS Library
+ * Adam Langley <agl@imperialviolet.org>
+ * http://www.imperialviolet.org/eventdns.html
+ * Public Domain code
+ *
+ * This software is Public Domain. To view a copy of the public domain dedication,
+ * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
+ * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+ *
+ * I ask and expect, but do not require, that all derivative works contain an
+ * attribution similar to:
+ *	Parts developed by Adam Langley <agl@imperialviolet.org>
+ *
+ * You may wish to replace the word "Parts" with something else depending on
+ * the amount of original code.
+ *
+ * (Derivative works does not include programs which link against, run or include
+ * the source verbatim in their source distributions)
+ *
+ * Version: 0.1b
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifndef _FORTIFY_SOURCE
+#define _FORTIFY_SOURCE 3
+#endif
+
+#include <string.h>
+#include <fcntl.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef EVENT__HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <limits.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdarg.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <winerror.h>
+#include <ws2tcpip.h>
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x400
+#endif
+#include <shlobj.h>
+#endif
+
+#include "event2/dns.h"
+#include "event2/dns_struct.h"
+#include "event2/dns_compat.h"
+#include "event2/util.h"
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/thread.h"
+
+#include "defer-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "strlcpy-internal.h"
+#include "ipv6-internal.h"
+#include "util-internal.h"
+#include "evthread-internal.h"
+#ifdef _WIN32
+#include <ctype.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <iphlpapi.h>
+#include <io.h>
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#ifdef EVENT__HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+#define EVDNS_LOG_DEBUG EVENT_LOG_DEBUG
+#define EVDNS_LOG_WARN EVENT_LOG_WARN
+#define EVDNS_LOG_MSG EVENT_LOG_MSG
+
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif
+
+#include <stdio.h>
+
+#undef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+
+#define ASSERT_VALID_REQUEST(req) \
+	EVUTIL_ASSERT((req)->handle && (req)->handle->current_req == (req))
+
+#define u64 ev_uint64_t
+#define u32 ev_uint32_t
+#define u16 ev_uint16_t
+#define u8  ev_uint8_t
+
+/* maximum number of addresses from a single packet */
+/* that we bother recording */
+#define MAX_V4_ADDRS 32
+#define MAX_V6_ADDRS 32
+
+
+#define TYPE_A	       EVDNS_TYPE_A
+#define TYPE_CNAME     5
+#define TYPE_PTR       EVDNS_TYPE_PTR
+#define TYPE_SOA       EVDNS_TYPE_SOA
+#define TYPE_AAAA      EVDNS_TYPE_AAAA
+
+#define CLASS_INET     EVDNS_CLASS_INET
+
+/* Persistent handle.  We keep this separate from 'struct request' since we
+ * need some object to last for as long as an evdns_request is outstanding so
+ * that it can be canceled, whereas a search request can lead to multiple
+ * 'struct request' instances being created over its lifetime. */
+struct evdns_request {
+	struct request *current_req;
+	struct evdns_base *base;
+
+	int pending_cb; /* Waiting for its callback to be invoked; not
+			 * owned by event base any more. */
+
+	/* elements used by the searching code */
+	int search_index;
+	struct search_state *search_state;
+	char *search_origname;	/* needs to be free()ed */
+	int search_flags;
+};
+
+struct request {
+	u8 *request;  /* the dns packet data */
+	u8 request_type; /* TYPE_PTR or TYPE_A or TYPE_AAAA */
+	unsigned int request_len;
+	int reissue_count;
+	int tx_count;  /* the number of times that this packet has been sent */
+	void *user_pointer;  /* the pointer given to us for this request */
+	evdns_callback_type user_callback;
+	struct nameserver *ns;	/* the server which we last sent it */
+
+	/* these objects are kept in a circular list */
+	/* XXX We could turn this into a CIRCLEQ. */
+	struct request *next, *prev;
+
+	struct event timeout_event;
+
+	u16 trans_id;  /* the transaction id */
+	unsigned request_appended :1;	/* true if the request pointer is data which follows this struct */
+	unsigned transmit_me :1;  /* needs to be transmitted */
+
+	/* XXXX This is a horrible hack. */
+	char **put_cname_in_ptr; /* store the cname here if we get one. */
+
+	struct evdns_base *base;
+
+	struct evdns_request *handle;
+};
+
+struct reply {
+	unsigned int type;
+	unsigned int have_answer : 1;
+	union {
+		struct {
+			u32 addrcount;
+			u32 addresses[MAX_V4_ADDRS];
+		} a;
+		struct {
+			u32 addrcount;
+			struct in6_addr addresses[MAX_V6_ADDRS];
+		} aaaa;
+		struct {
+			char name[HOST_NAME_MAX];
+		} ptr;
+	} data;
+};
+
+struct nameserver {
+	evutil_socket_t socket;	 /* a connected UDP socket */
+	struct sockaddr_storage address;
+	ev_socklen_t addrlen;
+	int failed_times;  /* number of times which we have given this server a chance */
+	int timedout;  /* number of times in a row a request has timed out */
+	struct event event;
+	/* these objects are kept in a circular list */
+	struct nameserver *next, *prev;
+	struct event timeout_event;  /* used to keep the timeout for */
+				     /* when we next probe this server. */
+				     /* Valid if state == 0 */
+	/* Outstanding probe request for this nameserver, if any */
+	struct evdns_request *probe_request;
+	char state;  /* zero if we think that this server is down */
+	char choked;  /* true if we have an EAGAIN from this server's socket */
+	char write_waiting;  /* true if we are waiting for EV_WRITE events */
+	struct evdns_base *base;
+
+	/* Number of currently inflight requests: used
+	 * to track when we should add/del the event. */
+	int requests_inflight;
+};
+
+
+/* Represents a local port where we're listening for DNS requests. Right now, */
+/* only UDP is supported. */
+struct evdns_server_port {
+	evutil_socket_t socket; /* socket we use to read queries and write replies. */
+	int refcnt; /* reference count. */
+	char choked; /* Are we currently blocked from writing? */
+	char closing; /* Are we trying to close this port, pending writes? */
+	evdns_request_callback_fn_type user_callback; /* Fn to handle requests */
+	void *user_data; /* Opaque pointer passed to user_callback */
+	struct event event; /* Read/write event */
+	/* circular list of replies that we want to write. */
+	struct server_request *pending_replies;
+	struct event_base *event_base;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	void *lock;
+#endif
+};
+
+/* Represents part of a reply being built.	(That is, a single RR.) */
+struct server_reply_item {
+	struct server_reply_item *next; /* next item in sequence. */
+	char *name; /* name part of the RR */
+	u16 type; /* The RR type */
+	u16 class; /* The RR class (usually CLASS_INET) */
+	u32 ttl; /* The RR TTL */
+	char is_name; /* True iff data is a label */
+	u16 datalen; /* Length of data; -1 if data is a label */
+	void *data; /* The contents of the RR */
+};
+
+/* Represents a request that we've received as a DNS server, and holds */
+/* the components of the reply as we're constructing it. */
+struct server_request {
+	/* Pointers to the next and previous entries on the list of replies */
+	/* that we're waiting to write.	 Only set if we have tried to respond */
+	/* and gotten EAGAIN. */
+	struct server_request *next_pending;
+	struct server_request *prev_pending;
+
+	u16 trans_id; /* Transaction id. */
+	struct evdns_server_port *port; /* Which port received this request on? */
+	struct sockaddr_storage addr; /* Where to send the response */
+	ev_socklen_t addrlen; /* length of addr */
+
+	int n_answer; /* how many answer RRs have been set? */
+	int n_authority; /* how many authority RRs have been set? */
+	int n_additional; /* how many additional RRs have been set? */
+
+	struct server_reply_item *answer; /* linked list of answer RRs */
+	struct server_reply_item *authority; /* linked list of authority RRs */
+	struct server_reply_item *additional; /* linked list of additional RRs */
+
+	/* Constructed response.  Only set once we're ready to send a reply. */
+	/* Once this is set, the RR fields are cleared, and no more should be set. */
+	char *response;
+	size_t response_len;
+
+	/* Caller-visible fields: flags, questions. */
+	struct evdns_server_request base;
+};
+
+struct evdns_base {
+	/* An array of n_req_heads circular lists for inflight requests.
+	 * Each inflight request req is in req_heads[req->trans_id % n_req_heads].
+	 */
+	struct request **req_heads;
+	/* A circular list of requests that we're waiting to send, but haven't
+	 * sent yet because there are too many requests inflight */
+	struct request *req_waiting_head;
+	/* A circular list of nameservers. */
+	struct nameserver *server_head;
+	int n_req_heads;
+
+	struct event_base *event_base;
+
+	/* The number of good nameservers that we have */
+	int global_good_nameservers;
+
+	/* inflight requests are contained in the req_head list */
+	/* and are actually going out across the network */
+	int global_requests_inflight;
+	/* requests which aren't inflight are in the waiting list */
+	/* and are counted here */
+	int global_requests_waiting;
+
+	int global_max_requests_inflight;
+
+	struct timeval global_timeout;	/* 5 seconds by default */
+	int global_max_reissues;  /* a reissue occurs when we get some errors from the server */
+	int global_max_retransmits;  /* number of times we'll retransmit a request which timed out */
+	/* number of timeouts in a row before we consider this server to be down */
+	int global_max_nameserver_timeout;
+	/* true iff we will use the 0x20 hack to prevent poisoning attacks. */
+	int global_randomize_case;
+
+	/* The first time that a nameserver fails, how long do we wait before
+	 * probing to see if it has returned?  */
+	struct timeval global_nameserver_probe_initial_timeout;
+
+	/** Port to bind to for outgoing DNS packets. */
+	struct sockaddr_storage global_outgoing_address;
+	/** ev_socklen_t for global_outgoing_address. 0 if it isn't set. */
+	ev_socklen_t global_outgoing_addrlen;
+
+	struct timeval global_getaddrinfo_allow_skew;
+
+	int so_rcvbuf;
+	int so_sndbuf;
+
+	int getaddrinfo_ipv4_timeouts;
+	int getaddrinfo_ipv6_timeouts;
+	int getaddrinfo_ipv4_answered;
+	int getaddrinfo_ipv6_answered;
+
+	struct search_state *global_search_state;
+
+	TAILQ_HEAD(hosts_list, hosts_entry) hostsdb;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	void *lock;
+#endif
+
+	int disable_when_inactive;
+};
+
+struct hosts_entry {
+	TAILQ_ENTRY(hosts_entry) next;
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in sin;
+		struct sockaddr_in6 sin6;
+	} addr;
+	int addrlen;
+	char hostname[1];
+};
+
+static struct evdns_base *current_base = NULL;
+
+struct evdns_base *
+evdns_get_global_base(void)
+{
+	return current_base;
+}
+
+/* Given a pointer to an evdns_server_request, get the corresponding */
+/* server_request. */
+#define TO_SERVER_REQUEST(base_ptr)					\
+	((struct server_request*)					\
+	  (((char*)(base_ptr) - evutil_offsetof(struct server_request, base))))
+
+#define REQ_HEAD(base, id) ((base)->req_heads[id % (base)->n_req_heads])
+
+static struct nameserver *nameserver_pick(struct evdns_base *base);
+static void evdns_request_insert(struct request *req, struct request **head);
+static void evdns_request_remove(struct request *req, struct request **head);
+static void nameserver_ready_callback(evutil_socket_t fd, short events, void *arg);
+static int evdns_transmit(struct evdns_base *base);
+static int evdns_request_transmit(struct request *req);
+static void nameserver_send_probe(struct nameserver *const ns);
+static void search_request_finished(struct evdns_request *const);
+static int search_try_next(struct evdns_request *const req);
+static struct request *search_request_new(struct evdns_base *base, struct evdns_request *handle, int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg);
+static void evdns_requests_pump_waiting_queue(struct evdns_base *base);
+static u16 transaction_id_pick(struct evdns_base *base);
+static struct request *request_new(struct evdns_base *base, struct evdns_request *handle, int type, const char *name, int flags, evdns_callback_type callback, void *ptr);
+static void request_submit(struct request *const req);
+
+static int server_request_free(struct server_request *req);
+static void server_request_free_answers(struct server_request *req);
+static void server_port_free(struct evdns_server_port *port);
+static void server_port_ready_callback(evutil_socket_t fd, short events, void *arg);
+static int evdns_base_resolv_conf_parse_impl(struct evdns_base *base, int flags, const char *const filename);
+static int evdns_base_set_option_impl(struct evdns_base *base,
+    const char *option, const char *val, int flags);
+static void evdns_base_free_and_unlock(struct evdns_base *base, int fail_requests);
+static void evdns_request_timeout_callback(evutil_socket_t fd, short events, void *arg);
+
+static int strtoint(const char *const str);
+
+#ifdef EVENT__DISABLE_THREAD_SUPPORT
+#define EVDNS_LOCK(base)  EVUTIL_NIL_STMT_
+#define EVDNS_UNLOCK(base) EVUTIL_NIL_STMT_
+#define ASSERT_LOCKED(base) EVUTIL_NIL_STMT_
+#else
+#define EVDNS_LOCK(base)			\
+	EVLOCK_LOCK((base)->lock, 0)
+#define EVDNS_UNLOCK(base)			\
+	EVLOCK_UNLOCK((base)->lock, 0)
+#define ASSERT_LOCKED(base)			\
+	EVLOCK_ASSERT_LOCKED((base)->lock)
+#endif
+
+static evdns_debug_log_fn_type evdns_log_fn = NULL;
+
+void
+evdns_set_log_fn(evdns_debug_log_fn_type fn)
+{
+	evdns_log_fn = fn;
+}
+
+#ifdef __GNUC__
+#define EVDNS_LOG_CHECK	 __attribute__ ((format(printf, 2, 3)))
+#else
+#define EVDNS_LOG_CHECK
+#endif
+
+static void evdns_log_(int severity, const char *fmt, ...) EVDNS_LOG_CHECK;
+static void
+evdns_log_(int severity, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args,fmt);
+	if (evdns_log_fn) {
+		char buf[512];
+		int is_warn = (severity == EVDNS_LOG_WARN);
+		evutil_vsnprintf(buf, sizeof(buf), fmt, args);
+		evdns_log_fn(is_warn, buf);
+	} else {
+		event_logv_(severity, NULL, fmt, args);
+	}
+	va_end(args);
+}
+
+#define log evdns_log_
+
+/* This walks the list of inflight requests to find the */
+/* one with a matching transaction id. Returns NULL on */
+/* failure */
+static struct request *
+request_find_from_trans_id(struct evdns_base *base, u16 trans_id) {
+	struct request *req = REQ_HEAD(base, trans_id);
+	struct request *const started_at = req;
+
+	ASSERT_LOCKED(base);
+
+	if (req) {
+		do {
+			if (req->trans_id == trans_id) return req;
+			req = req->next;
+		} while (req != started_at);
+	}
+
+	return NULL;
+}
+
+/* a libevent callback function which is called when a nameserver */
+/* has gone down and we want to test if it has came back to life yet */
+static void
+nameserver_prod_callback(evutil_socket_t fd, short events, void *arg) {
+	struct nameserver *const ns = (struct nameserver *) arg;
+	(void)fd;
+	(void)events;
+
+	EVDNS_LOCK(ns->base);
+	nameserver_send_probe(ns);
+	EVDNS_UNLOCK(ns->base);
+}
+
+/* a libevent callback which is called when a nameserver probe (to see if */
+/* it has come back to life) times out. We increment the count of failed_times */
+/* and wait longer to send the next probe packet. */
+static void
+nameserver_probe_failed(struct nameserver *const ns) {
+	struct timeval timeout;
+	int i;
+
+	ASSERT_LOCKED(ns->base);
+	(void) evtimer_del(&ns->timeout_event);
+	if (ns->state == 1) {
+		/* This can happen if the nameserver acts in a way which makes us mark */
+		/* it as bad and then starts sending good replies. */
+		return;
+	}
+
+#define MAX_PROBE_TIMEOUT 3600
+#define TIMEOUT_BACKOFF_FACTOR 3
+
+	memcpy(&timeout, &ns->base->global_nameserver_probe_initial_timeout,
+	    sizeof(struct timeval));
+	for (i=ns->failed_times; i > 0 && timeout.tv_sec < MAX_PROBE_TIMEOUT; --i) {
+		timeout.tv_sec *= TIMEOUT_BACKOFF_FACTOR;
+		timeout.tv_usec *= TIMEOUT_BACKOFF_FACTOR;
+		if (timeout.tv_usec > 1000000) {
+			timeout.tv_sec += timeout.tv_usec / 1000000;
+			timeout.tv_usec %= 1000000;
+		}
+	}
+	if (timeout.tv_sec > MAX_PROBE_TIMEOUT) {
+		timeout.tv_sec = MAX_PROBE_TIMEOUT;
+		timeout.tv_usec = 0;
+	}
+
+	ns->failed_times++;
+
+	if (evtimer_add(&ns->timeout_event, &timeout) < 0) {
+		char addrbuf[128];
+		log(EVDNS_LOG_WARN,
+		    "Error from libevent when adding timer event for %s",
+		    evutil_format_sockaddr_port_(
+			    (struct sockaddr *)&ns->address,
+			    addrbuf, sizeof(addrbuf)));
+	}
+}
+
+static void
+request_swap_ns(struct request *req, struct nameserver *ns) {
+	if (ns && req->ns != ns) {
+		EVUTIL_ASSERT(req->ns->requests_inflight > 0);
+		req->ns->requests_inflight--;
+		ns->requests_inflight++;
+
+		req->ns = ns;
+	}
+}
+
+/* called when a nameserver has been deemed to have failed. For example, too */
+/* many packets have timed out etc */
+static void
+nameserver_failed(struct nameserver *const ns, const char *msg) {
+	struct request *req, *started_at;
+	struct evdns_base *base = ns->base;
+	int i;
+	char addrbuf[128];
+
+	ASSERT_LOCKED(base);
+	/* if this nameserver has already been marked as failed */
+	/* then don't do anything */
+	if (!ns->state) return;
+
+	log(EVDNS_LOG_MSG, "Nameserver %s has failed: %s",
+	    evutil_format_sockaddr_port_(
+		    (struct sockaddr *)&ns->address,
+		    addrbuf, sizeof(addrbuf)),
+	    msg);
+
+	base->global_good_nameservers--;
+	EVUTIL_ASSERT(base->global_good_nameservers >= 0);
+	if (base->global_good_nameservers == 0) {
+		log(EVDNS_LOG_MSG, "All nameservers have failed");
+	}
+
+	ns->state = 0;
+	ns->failed_times = 1;
+
+	if (evtimer_add(&ns->timeout_event,
+		&base->global_nameserver_probe_initial_timeout) < 0) {
+		log(EVDNS_LOG_WARN,
+		    "Error from libevent when adding timer event for %s",
+		    evutil_format_sockaddr_port_(
+			    (struct sockaddr *)&ns->address,
+			    addrbuf, sizeof(addrbuf)));
+		/* ???? Do more? */
+	}
+
+	/* walk the list of inflight requests to see if any can be reassigned to */
+	/* a different server. Requests in the waiting queue don't have a */
+	/* nameserver assigned yet */
+
+	/* if we don't have *any* good nameservers then there's no point */
+	/* trying to reassign requests to one */
+	if (!base->global_good_nameservers) return;
+
+	for (i = 0; i < base->n_req_heads; ++i) {
+		req = started_at = base->req_heads[i];
+		if (req) {
+			do {
+				if (req->tx_count == 0 && req->ns == ns) {
+					/* still waiting to go out, can be moved */
+					/* to another server */
+					request_swap_ns(req, nameserver_pick(base));
+				}
+				req = req->next;
+			} while (req != started_at);
+		}
+	}
+}
+
+static void
+nameserver_up(struct nameserver *const ns)
+{
+	char addrbuf[128];
+	ASSERT_LOCKED(ns->base);
+	if (ns->state) return;
+	log(EVDNS_LOG_MSG, "Nameserver %s is back up",
+	    evutil_format_sockaddr_port_(
+		    (struct sockaddr *)&ns->address,
+		    addrbuf, sizeof(addrbuf)));
+	evtimer_del(&ns->timeout_event);
+	if (ns->probe_request) {
+		evdns_cancel_request(ns->base, ns->probe_request);
+		ns->probe_request = NULL;
+	}
+	ns->state = 1;
+	ns->failed_times = 0;
+	ns->timedout = 0;
+	ns->base->global_good_nameservers++;
+}
+
+static void
+request_trans_id_set(struct request *const req, const u16 trans_id) {
+	req->trans_id = trans_id;
+	*((u16 *) req->request) = htons(trans_id);
+}
+
+/* Called to remove a request from a list and dealloc it. */
+/* head is a pointer to the head of the list it should be */
+/* removed from or NULL if the request isn't in a list. */
+/* when free_handle is one, free the handle as well. */
+static void
+request_finished(struct request *const req, struct request **head, int free_handle) {
+	struct evdns_base *base = req->base;
+	int was_inflight = (head != &base->req_waiting_head);
+	EVDNS_LOCK(base);
+	ASSERT_VALID_REQUEST(req);
+
+	if (head)
+		evdns_request_remove(req, head);
+
+	log(EVDNS_LOG_DEBUG, "Removing timeout for request %p", req);
+	if (was_inflight) {
+		evtimer_del(&req->timeout_event);
+		base->global_requests_inflight--;
+		req->ns->requests_inflight--;
+	} else {
+		base->global_requests_waiting--;
+	}
+	/* it was initialized during request_new / evtimer_assign */
+	event_debug_unassign(&req->timeout_event);
+
+	if (req->ns &&
+	    req->ns->requests_inflight == 0 &&
+	    req->base->disable_when_inactive) {
+		event_del(&req->ns->event);
+		evtimer_del(&req->ns->timeout_event);
+	}
+
+	if (!req->request_appended) {
+		/* need to free the request data on it's own */
+		mm_free(req->request);
+	} else {
+		/* the request data is appended onto the header */
+		/* so everything gets free()ed when we: */
+	}
+
+	if (req->handle) {
+		EVUTIL_ASSERT(req->handle->current_req == req);
+
+		if (free_handle) {
+			search_request_finished(req->handle);
+			req->handle->current_req = NULL;
+			if (! req->handle->pending_cb) {
+				/* If we're planning to run the callback,
+				 * don't free the handle until later. */
+				mm_free(req->handle);
+			}
+			req->handle = NULL; /* If we have a bug, let's crash
+					     * early */
+		} else {
+			req->handle->current_req = NULL;
+		}
+	}
+
+	mm_free(req);
+
+	evdns_requests_pump_waiting_queue(base);
+	EVDNS_UNLOCK(base);
+}
+
+/* This is called when a server returns a funny error code. */
+/* We try the request again with another server. */
+/* */
+/* return: */
+/*   0 ok */
+/*   1 failed/reissue is pointless */
+static int
+request_reissue(struct request *req) {
+	const struct nameserver *const last_ns = req->ns;
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+	/* the last nameserver should have been marked as failing */
+	/* by the caller of this function, therefore pick will try */
+	/* not to return it */
+	request_swap_ns(req, nameserver_pick(req->base));
+	if (req->ns == last_ns) {
+		/* ... but pick did return it */
+		/* not a lot of point in trying again with the */
+		/* same server */
+		return 1;
+	}
+
+	req->reissue_count++;
+	req->tx_count = 0;
+	req->transmit_me = 1;
+
+	return 0;
+}
+
+/* this function looks for space on the inflight queue and promotes */
+/* requests from the waiting queue if it can. */
+/* */
+/* TODO: */
+/* add return code, see at nameserver_pick() and other functions. */
+static void
+evdns_requests_pump_waiting_queue(struct evdns_base *base) {
+	ASSERT_LOCKED(base);
+	while (base->global_requests_inflight < base->global_max_requests_inflight &&
+		   base->global_requests_waiting) {
+		struct request *req;
+
+		EVUTIL_ASSERT(base->req_waiting_head);
+		req = base->req_waiting_head;
+
+		req->ns = nameserver_pick(base);
+		if (!req->ns)
+			return;
+
+		/* move a request from the waiting queue to the inflight queue */
+		req->ns->requests_inflight++;
+
+		evdns_request_remove(req, &base->req_waiting_head);
+
+		base->global_requests_waiting--;
+		base->global_requests_inflight++;
+
+		request_trans_id_set(req, transaction_id_pick(base));
+
+		evdns_request_insert(req, &REQ_HEAD(base, req->trans_id));
+		evdns_request_transmit(req);
+		evdns_transmit(base);
+	}
+}
+
+/* TODO(nickm) document */
+struct deferred_reply_callback {
+	struct event_callback deferred;
+	struct evdns_request *handle;
+	u8 request_type;
+	u8 have_reply;
+	u32 ttl;
+	u32 err;
+	evdns_callback_type user_callback;
+	struct reply reply;
+};
+
+static void
+reply_run_callback(struct event_callback *d, void *user_pointer)
+{
+	struct deferred_reply_callback *cb =
+	    EVUTIL_UPCAST(d, struct deferred_reply_callback, deferred);
+
+	switch (cb->request_type) {
+	case TYPE_A:
+		if (cb->have_reply)
+			cb->user_callback(DNS_ERR_NONE, DNS_IPv4_A,
+			    cb->reply.data.a.addrcount, cb->ttl,
+			    cb->reply.data.a.addresses,
+			    user_pointer);
+		else
+			cb->user_callback(cb->err, 0, 0, cb->ttl, NULL, user_pointer);
+		break;
+	case TYPE_PTR:
+		if (cb->have_reply) {
+			char *name = cb->reply.data.ptr.name;
+			cb->user_callback(DNS_ERR_NONE, DNS_PTR, 1, cb->ttl,
+			    &name, user_pointer);
+		} else {
+			cb->user_callback(cb->err, 0, 0, cb->ttl, NULL, user_pointer);
+		}
+		break;
+	case TYPE_AAAA:
+		if (cb->have_reply)
+			cb->user_callback(DNS_ERR_NONE, DNS_IPv6_AAAA,
+			    cb->reply.data.aaaa.addrcount, cb->ttl,
+			    cb->reply.data.aaaa.addresses,
+			    user_pointer);
+		else
+			cb->user_callback(cb->err, 0, 0, cb->ttl, NULL, user_pointer);
+		break;
+	default:
+		EVUTIL_ASSERT(0);
+	}
+
+	if (cb->handle && cb->handle->pending_cb) {
+		mm_free(cb->handle);
+	}
+
+	mm_free(cb);
+}
+
+static void
+reply_schedule_callback(struct request *const req, u32 ttl, u32 err, struct reply *reply)
+{
+	struct deferred_reply_callback *d = mm_calloc(1, sizeof(*d));
+
+	if (!d) {
+		event_warn("%s: Couldn't allocate space for deferred callback.",
+		    __func__);
+		return;
+	}
+
+	ASSERT_LOCKED(req->base);
+
+	d->request_type = req->request_type;
+	d->user_callback = req->user_callback;
+	d->ttl = ttl;
+	d->err = err;
+	if (reply) {
+		d->have_reply = 1;
+		memcpy(&d->reply, reply, sizeof(struct reply));
+	}
+
+	if (req->handle) {
+		req->handle->pending_cb = 1;
+		d->handle = req->handle;
+	}
+
+	event_deferred_cb_init_(
+	    &d->deferred,
+	    event_get_priority(&req->timeout_event),
+	    reply_run_callback,
+	    req->user_pointer);
+	event_deferred_cb_schedule_(
+		req->base->event_base,
+		&d->deferred);
+}
+
+
+#define _QR_MASK    0x8000U
+#define _OP_MASK    0x7800U
+#define _AA_MASK    0x0400U
+#define _TC_MASK    0x0200U
+#define _RD_MASK    0x0100U
+#define _RA_MASK    0x0080U
+#define _Z_MASK     0x0040U
+#define _AD_MASK    0x0020U
+#define _CD_MASK    0x0010U
+#define _RCODE_MASK 0x000fU
+#define _Z_MASK_DEPRECATED 0x0070U
+
+/* this processes a parsed reply packet */
+static void
+reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply) {
+	int error;
+	char addrbuf[128];
+	static const int error_codes[] = {
+		DNS_ERR_FORMAT, DNS_ERR_SERVERFAILED, DNS_ERR_NOTEXIST,
+		DNS_ERR_NOTIMPL, DNS_ERR_REFUSED
+	};
+
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+
+	if (flags & (_RCODE_MASK | _TC_MASK) || !reply || !reply->have_answer) {
+		/* there was an error */
+		if (flags & _TC_MASK) {
+			error = DNS_ERR_TRUNCATED;
+		} else if (flags & _RCODE_MASK) {
+			u16 error_code = (flags & _RCODE_MASK) - 1;
+			if (error_code > 4) {
+				error = DNS_ERR_UNKNOWN;
+			} else {
+				error = error_codes[error_code];
+			}
+		} else if (reply && !reply->have_answer) {
+			error = DNS_ERR_NODATA;
+		} else {
+			error = DNS_ERR_UNKNOWN;
+		}
+
+		switch (error) {
+		case DNS_ERR_NOTIMPL:
+		case DNS_ERR_REFUSED:
+			/* we regard these errors as marking a bad nameserver */
+			if (req->reissue_count < req->base->global_max_reissues) {
+				char msg[64];
+				evutil_snprintf(msg, sizeof(msg), "Bad response %d (%s)",
+					 error, evdns_err_to_string(error));
+				nameserver_failed(req->ns, msg);
+				if (!request_reissue(req)) return;
+			}
+			break;
+		case DNS_ERR_SERVERFAILED:
+			/* rcode 2 (servfailed) sometimes means "we
+			 * are broken" and sometimes (with some binds)
+			 * means "that request was very confusing."
+			 * Treat this as a timeout, not a failure.
+			 */
+			log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver"
+				"at %s; will allow the request to time out.",
+			    evutil_format_sockaddr_port_(
+				    (struct sockaddr *)&req->ns->address,
+				    addrbuf, sizeof(addrbuf)));
+			/* Call the timeout function */
+			evdns_request_timeout_callback(0, 0, req);
+			return;
+		default:
+			/* we got a good reply from the nameserver: it is up. */
+			if (req->handle == req->ns->probe_request) {
+				/* Avoid double-free */
+				req->ns->probe_request = NULL;
+			}
+
+			nameserver_up(req->ns);
+		}
+
+		if (req->handle->search_state &&
+		    req->request_type != TYPE_PTR) {
+			/* if we have a list of domains to search in,
+			 * try the next one */
+			if (!search_try_next(req->handle)) {
+				/* a new request was issued so this
+				 * request is finished and */
+				/* the user callback will be made when
+				 * that request (or a */
+				/* child of it) finishes. */
+				return;
+			}
+		}
+
+		/* all else failed. Pass the failure up */
+		reply_schedule_callback(req, ttl, error, NULL);
+		request_finished(req, &REQ_HEAD(req->base, req->trans_id), 1);
+	} else {
+		/* all ok, tell the user */
+		reply_schedule_callback(req, ttl, 0, reply);
+		if (req->handle == req->ns->probe_request)
+			req->ns->probe_request = NULL; /* Avoid double-free */
+		nameserver_up(req->ns);
+		request_finished(req, &REQ_HEAD(req->base, req->trans_id), 1);
+	}
+}
+
+static int
+name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
+	int name_end = -1;
+	int j = *idx;
+	int ptr_count = 0;
+#define GET32(x) do { if (j + 4 > length) goto err; memcpy(&t32_, packet + j, 4); j += 4; x = ntohl(t32_); } while (0)
+#define GET16(x) do { if (j + 2 > length) goto err; memcpy(&t_, packet + j, 2); j += 2; x = ntohs(t_); } while (0)
+#define GET8(x) do { if (j >= length) goto err; x = packet[j++]; } while (0)
+
+	char *cp = name_out;
+	const char *const end = name_out + name_out_len;
+
+	/* Normally, names are a series of length prefixed strings terminated */
+	/* with a length of 0 (the lengths are u8's < 63). */
+	/* However, the length can start with a pair of 1 bits and that */
+	/* means that the next 14 bits are a pointer within the current */
+	/* packet. */
+
+	for (;;) {
+		u8 label_len;
+		GET8(label_len);
+		if (!label_len) break;
+		if (label_len & 0xc0) {
+			u8 ptr_low;
+			GET8(ptr_low);
+			if (name_end < 0) name_end = j;
+			j = (((int)label_len & 0x3f) << 8) + ptr_low;
+			/* Make sure that the target offset is in-bounds. */
+			if (j < 0 || j >= length) return -1;
+			/* If we've jumped more times than there are characters in the
+			 * message, we must have a loop. */
+			if (++ptr_count > length) return -1;
+			continue;
+		}
+		if (label_len > 63) return -1;
+		if (cp != name_out) {
+			if (cp + 1 >= end) return -1;
+			*cp++ = '.';
+		}
+		if (cp + label_len >= end) return -1;
+		if (j + label_len > length) return -1;
+		memcpy(cp, packet + j, label_len);
+		cp += label_len;
+		j += label_len;
+	}
+	if (cp >= end) return -1;
+	*cp = '\0';
+	if (name_end < 0)
+		*idx = j;
+	else
+		*idx = name_end;
+	return 0;
+ err:
+	return -1;
+}
+
+/* parses a raw request from a nameserver */
+static int
+reply_parse(struct evdns_base *base, u8 *packet, int length) {
+	int j = 0, k = 0;  /* index into packet */
+	u16 t_;	 /* used by the macros */
+	u32 t32_;  /* used by the macros */
+	char tmp_name[256], cmp_name[256]; /* used by the macros */
+	int name_matches = 0;
+
+	u16 trans_id, questions, answers, authority, additional, datalength;
+	u16 flags = 0;
+	u32 ttl, ttl_r = 0xffffffff;
+	struct reply reply;
+	struct request *req = NULL;
+	unsigned int i;
+
+	ASSERT_LOCKED(base);
+
+	GET16(trans_id);
+	GET16(flags);
+	GET16(questions);
+	GET16(answers);
+	GET16(authority);
+	GET16(additional);
+	(void) authority; /* suppress "unused variable" warnings. */
+	(void) additional; /* suppress "unused variable" warnings. */
+
+	req = request_find_from_trans_id(base, trans_id);
+	if (!req) return -1;
+	EVUTIL_ASSERT(req->base == base);
+
+	memset(&reply, 0, sizeof(reply));
+
+	/* If it's not an answer, it doesn't correspond to any request. */
+	if (!(flags & _QR_MASK)) return -1;  /* must be an answer */
+	if ((flags & (_RCODE_MASK|_TC_MASK)) && (flags & (_RCODE_MASK|_TC_MASK)) != DNS_ERR_NOTEXIST) {
+		/* there was an error and it's not NXDOMAIN */
+		goto err;
+	}
+	/* if (!answers) return; */  /* must have an answer of some form */
+
+	/* This macro skips a name in the DNS reply. */
+#define SKIP_NAME						\
+	do { tmp_name[0] = '\0';				\
+		if (name_parse(packet, length, &j, tmp_name,	\
+			sizeof(tmp_name))<0)			\
+			goto err;				\
+	} while (0)
+
+	reply.type = req->request_type;
+
+	/* skip over each question in the reply */
+	for (i = 0; i < questions; ++i) {
+		/* the question looks like
+		 *   <label:name><u16:type><u16:class>
+		 */
+		tmp_name[0] = '\0';
+		cmp_name[0] = '\0';
+		k = j;
+		if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name)) < 0)
+			goto err;
+		if (name_parse(req->request, req->request_len, &k,
+			cmp_name, sizeof(cmp_name))<0)
+			goto err;
+		if (!base->global_randomize_case) {
+			if (strcmp(tmp_name, cmp_name) == 0)
+				name_matches = 1;
+		} else {
+			if (evutil_ascii_strcasecmp(tmp_name, cmp_name) == 0)
+				name_matches = 1;
+		}
+
+		j += 4;
+		if (j > length)
+			goto err;
+	}
+
+	if (!name_matches)
+		goto err;
+
+	/* now we have the answer section which looks like
+	 * <label:name><u16:type><u16:class><u32:ttl><u16:len><data...>
+	 */
+
+	for (i = 0; i < answers; ++i) {
+		u16 type, class;
+
+		SKIP_NAME;
+		GET16(type);
+		GET16(class);
+		GET32(ttl);
+		GET16(datalength);
+
+		if (type == TYPE_A && class == CLASS_INET) {
+			int addrcount, addrtocopy;
+			if (req->request_type != TYPE_A) {
+				j += datalength; continue;
+			}
+			if ((datalength & 3) != 0) /* not an even number of As. */
+			    goto err;
+			addrcount = datalength >> 2;
+			addrtocopy = MIN(MAX_V4_ADDRS - reply.data.a.addrcount, (unsigned)addrcount);
+
+			ttl_r = MIN(ttl_r, ttl);
+			/* we only bother with the first four addresses. */
+			if (j + 4*addrtocopy > length) goto err;
+			memcpy(&reply.data.a.addresses[reply.data.a.addrcount],
+				   packet + j, 4*addrtocopy);
+			j += 4*addrtocopy;
+			reply.data.a.addrcount += addrtocopy;
+			reply.have_answer = 1;
+			if (reply.data.a.addrcount == MAX_V4_ADDRS) break;
+		} else if (type == TYPE_PTR && class == CLASS_INET) {
+			if (req->request_type != TYPE_PTR) {
+				j += datalength; continue;
+			}
+			if (name_parse(packet, length, &j, reply.data.ptr.name,
+						   sizeof(reply.data.ptr.name))<0)
+				goto err;
+			ttl_r = MIN(ttl_r, ttl);
+			reply.have_answer = 1;
+			break;
+		} else if (type == TYPE_CNAME) {
+			char cname[HOST_NAME_MAX];
+			if (!req->put_cname_in_ptr || *req->put_cname_in_ptr) {
+				j += datalength; continue;
+			}
+			if (name_parse(packet, length, &j, cname,
+				sizeof(cname))<0)
+				goto err;
+			*req->put_cname_in_ptr = mm_strdup(cname);
+		} else if (type == TYPE_AAAA && class == CLASS_INET) {
+			int addrcount, addrtocopy;
+			if (req->request_type != TYPE_AAAA) {
+				j += datalength; continue;
+			}
+			if ((datalength & 15) != 0) /* not an even number of AAAAs. */
+				goto err;
+			addrcount = datalength >> 4;  /* each address is 16 bytes long */
+			addrtocopy = MIN(MAX_V6_ADDRS - reply.data.aaaa.addrcount, (unsigned)addrcount);
+			ttl_r = MIN(ttl_r, ttl);
+
+			/* we only bother with the first four addresses. */
+			if (j + 16*addrtocopy > length) goto err;
+			memcpy(&reply.data.aaaa.addresses[reply.data.aaaa.addrcount],
+				   packet + j, 16*addrtocopy);
+			reply.data.aaaa.addrcount += addrtocopy;
+			j += 16*addrtocopy;
+			reply.have_answer = 1;
+			if (reply.data.aaaa.addrcount == MAX_V6_ADDRS) break;
+		} else {
+			/* skip over any other type of resource */
+			j += datalength;
+		}
+	}
+
+	if (!reply.have_answer) {
+		for (i = 0; i < authority; ++i) {
+			u16 type, class;
+			SKIP_NAME;
+			GET16(type);
+			GET16(class);
+			GET32(ttl);
+			GET16(datalength);
+			if (type == TYPE_SOA && class == CLASS_INET) {
+				u32 serial, refresh, retry, expire, minimum;
+				SKIP_NAME;
+				SKIP_NAME;
+				GET32(serial);
+				GET32(refresh);
+				GET32(retry);
+				GET32(expire);
+				GET32(minimum);
+				(void)expire;
+				(void)retry;
+				(void)refresh;
+				(void)serial;
+				ttl_r = MIN(ttl_r, ttl);
+				ttl_r = MIN(ttl_r, minimum);
+			} else {
+				/* skip over any other type of resource */
+				j += datalength;
+			}
+		}
+	}
+
+	if (ttl_r == 0xffffffff)
+		ttl_r = 0;
+
+	reply_handle(req, flags, ttl_r, &reply);
+	return 0;
+ err:
+	if (req)
+		reply_handle(req, flags, 0, NULL);
+	return -1;
+}
+
+/* Parse a raw request (packet,length) sent to a nameserver port (port) from */
+/* a DNS client (addr,addrlen), and if it's well-formed, call the corresponding */
+/* callback. */
+static int
+request_parse(u8 *packet, int length, struct evdns_server_port *port, struct sockaddr *addr, ev_socklen_t addrlen)
+{
+	int j = 0;	/* index into packet */
+	u16 t_;	 /* used by the macros */
+	char tmp_name[256]; /* used by the macros */
+
+	int i;
+	u16 trans_id, flags, questions, answers, authority, additional;
+	struct server_request *server_req = NULL;
+
+	ASSERT_LOCKED(port);
+
+	/* Get the header fields */
+	GET16(trans_id);
+	GET16(flags);
+	GET16(questions);
+	GET16(answers);
+	GET16(authority);
+	GET16(additional);
+	(void)answers;
+	(void)additional;
+	(void)authority;
+
+	if (flags & _QR_MASK) return -1; /* Must not be an answer. */
+	flags &= (_RD_MASK|_CD_MASK); /* Only RD and CD get preserved. */
+
+	server_req = mm_malloc(sizeof(struct server_request));
+	if (server_req == NULL) return -1;
+	memset(server_req, 0, sizeof(struct server_request));
+
+	server_req->trans_id = trans_id;
+	memcpy(&server_req->addr, addr, addrlen);
+	server_req->addrlen = addrlen;
+
+	server_req->base.flags = flags;
+	server_req->base.nquestions = 0;
+	server_req->base.questions = mm_calloc(sizeof(struct evdns_server_question *), questions);
+	if (server_req->base.questions == NULL)
+		goto err;
+
+	for (i = 0; i < questions; ++i) {
+		u16 type, class;
+		struct evdns_server_question *q;
+		int namelen;
+		if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0)
+			goto err;
+		GET16(type);
+		GET16(class);
+		namelen = (int)strlen(tmp_name);
+		q = mm_malloc(sizeof(struct evdns_server_question) + namelen);
+		if (!q)
+			goto err;
+		q->type = type;
+		q->dns_question_class = class;
+		memcpy(q->name, tmp_name, namelen+1);
+		server_req->base.questions[server_req->base.nquestions++] = q;
+	}
+
+	/* Ignore answers, authority, and additional. */
+
+	server_req->port = port;
+	port->refcnt++;
+
+	/* Only standard queries are supported. */
+	if (flags & _OP_MASK) {
+		evdns_server_request_respond(&(server_req->base), DNS_ERR_NOTIMPL);
+		return -1;
+	}
+
+	port->user_callback(&(server_req->base), port->user_data);
+
+	return 0;
+err:
+	if (server_req->base.questions) {
+		for (i = 0; i < server_req->base.nquestions; ++i)
+			mm_free(server_req->base.questions[i]);
+		mm_free(server_req->base.questions);
+	}
+	mm_free(server_req);
+	return -1;
+
+#undef SKIP_NAME
+#undef GET32
+#undef GET16
+#undef GET8
+}
+
+
+void
+evdns_set_transaction_id_fn(ev_uint16_t (*fn)(void))
+{
+}
+
+void
+evdns_set_random_bytes_fn(void (*fn)(char *, size_t))
+{
+}
+
+/* Try to choose a strong transaction id which isn't already in flight */
+static u16
+transaction_id_pick(struct evdns_base *base) {
+	ASSERT_LOCKED(base);
+	for (;;) {
+		u16 trans_id;
+		evutil_secure_rng_get_bytes(&trans_id, sizeof(trans_id));
+
+		if (trans_id == 0xffff) continue;
+		/* now check to see if that id is already inflight */
+		if (request_find_from_trans_id(base, trans_id) == NULL)
+			return trans_id;
+	}
+}
+
+/* choose a namesever to use. This function will try to ignore */
+/* nameservers which we think are down and load balance across the rest */
+/* by updating the server_head global each time. */
+static struct nameserver *
+nameserver_pick(struct evdns_base *base) {
+	struct nameserver *started_at = base->server_head, *picked;
+	ASSERT_LOCKED(base);
+	if (!base->server_head) return NULL;
+
+	/* if we don't have any good nameservers then there's no */
+	/* point in trying to find one. */
+	if (!base->global_good_nameservers) {
+		base->server_head = base->server_head->next;
+		return base->server_head;
+	}
+
+	/* remember that nameservers are in a circular list */
+	for (;;) {
+		if (base->server_head->state) {
+			/* we think this server is currently good */
+			picked = base->server_head;
+			base->server_head = base->server_head->next;
+			return picked;
+		}
+
+		base->server_head = base->server_head->next;
+		if (base->server_head == started_at) {
+			/* all the nameservers seem to be down */
+			/* so we just return this one and hope for the */
+			/* best */
+			EVUTIL_ASSERT(base->global_good_nameservers == 0);
+			picked = base->server_head;
+			base->server_head = base->server_head->next;
+			return picked;
+		}
+	}
+}
+
+/* this is called when a namesever socket is ready for reading */
+static void
+nameserver_read(struct nameserver *ns) {
+	struct sockaddr_storage ss;
+	ev_socklen_t addrlen = sizeof(ss);
+	u8 packet[1500];
+	char addrbuf[128];
+	ASSERT_LOCKED(ns->base);
+
+	for (;;) {
+		const int r = recvfrom(ns->socket, (void*)packet,
+		    sizeof(packet), 0,
+		    (struct sockaddr*)&ss, &addrlen);
+		if (r < 0) {
+			int err = evutil_socket_geterror(ns->socket);
+			if (EVUTIL_ERR_RW_RETRIABLE(err))
+				return;
+			nameserver_failed(ns,
+			    evutil_socket_error_to_string(err));
+			return;
+		}
+		if (evutil_sockaddr_cmp((struct sockaddr*)&ss,
+			(struct sockaddr*)&ns->address, 0)) {
+			log(EVDNS_LOG_WARN, "Address mismatch on received "
+			    "DNS packet.  Apparent source was %s",
+			    evutil_format_sockaddr_port_(
+				    (struct sockaddr *)&ss,
+				    addrbuf, sizeof(addrbuf)));
+			return;
+		}
+
+		ns->timedout = 0;
+		reply_parse(ns->base, packet, r);
+	}
+}
+
+/* Read a packet from a DNS client on a server port s, parse it, and */
+/* act accordingly. */
+static void
+server_port_read(struct evdns_server_port *s) {
+	u8 packet[1500];
+	struct sockaddr_storage addr;
+	ev_socklen_t addrlen;
+	int r;
+	ASSERT_LOCKED(s);
+
+	for (;;) {
+		addrlen = sizeof(struct sockaddr_storage);
+		r = recvfrom(s->socket, (void*)packet, sizeof(packet), 0,
+					 (struct sockaddr*) &addr, &addrlen);
+		if (r < 0) {
+			int err = evutil_socket_geterror(s->socket);
+			if (EVUTIL_ERR_RW_RETRIABLE(err))
+				return;
+			log(EVDNS_LOG_WARN,
+			    "Error %s (%d) while reading request.",
+			    evutil_socket_error_to_string(err), err);
+			return;
+		}
+		request_parse(packet, r, s, (struct sockaddr*) &addr, addrlen);
+	}
+}
+
+/* Try to write all pending replies on a given DNS server port. */
+static void
+server_port_flush(struct evdns_server_port *port)
+{
+	struct server_request *req = port->pending_replies;
+	ASSERT_LOCKED(port);
+	while (req) {
+		int r = sendto(port->socket, req->response, (int)req->response_len, 0,
+			   (struct sockaddr*) &req->addr, (ev_socklen_t)req->addrlen);
+		if (r < 0) {
+			int err = evutil_socket_geterror(port->socket);
+			if (EVUTIL_ERR_RW_RETRIABLE(err))
+				return;
+			log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", evutil_socket_error_to_string(err), err);
+		}
+		if (server_request_free(req)) {
+			/* we released the last reference to req->port. */
+			return;
+		} else {
+			EVUTIL_ASSERT(req != port->pending_replies);
+			req = port->pending_replies;
+		}
+	}
+
+	/* We have no more pending requests; stop listening for 'writeable' events. */
+	(void) event_del(&port->event);
+	event_assign(&port->event, port->event_base,
+				 port->socket, EV_READ | EV_PERSIST,
+				 server_port_ready_callback, port);
+
+	if (event_add(&port->event, NULL) < 0) {
+		log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server.");
+		/* ???? Do more? */
+	}
+}
+
+/* set if we are waiting for the ability to write to this server. */
+/* if waiting is true then we ask libevent for EV_WRITE events, otherwise */
+/* we stop these events. */
+static void
+nameserver_write_waiting(struct nameserver *ns, char waiting) {
+	ASSERT_LOCKED(ns->base);
+	if (ns->write_waiting == waiting) return;
+
+	ns->write_waiting = waiting;
+	(void) event_del(&ns->event);
+	event_assign(&ns->event, ns->base->event_base,
+	    ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST,
+	    nameserver_ready_callback, ns);
+	if (event_add(&ns->event, NULL) < 0) {
+		char addrbuf[128];
+		log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s",
+		    evutil_format_sockaddr_port_(
+			    (struct sockaddr *)&ns->address,
+			    addrbuf, sizeof(addrbuf)));
+		/* ???? Do more? */
+	}
+}
+
+/* a callback function. Called by libevent when the kernel says that */
+/* a nameserver socket is ready for writing or reading */
+static void
+nameserver_ready_callback(evutil_socket_t fd, short events, void *arg) {
+	struct nameserver *ns = (struct nameserver *) arg;
+	(void)fd;
+
+	EVDNS_LOCK(ns->base);
+	if (events & EV_WRITE) {
+		ns->choked = 0;
+		if (!evdns_transmit(ns->base)) {
+			nameserver_write_waiting(ns, 0);
+		}
+	}
+	if (events & EV_READ) {
+		nameserver_read(ns);
+	}
+	EVDNS_UNLOCK(ns->base);
+}
+
+/* a callback function. Called by libevent when the kernel says that */
+/* a server socket is ready for writing or reading. */
+static void
+server_port_ready_callback(evutil_socket_t fd, short events, void *arg) {
+	struct evdns_server_port *port = (struct evdns_server_port *) arg;
+	(void) fd;
+
+	EVDNS_LOCK(port);
+	if (events & EV_WRITE) {
+		port->choked = 0;
+		server_port_flush(port);
+	}
+	if (events & EV_READ) {
+		server_port_read(port);
+	}
+	EVDNS_UNLOCK(port);
+}
+
+/* This is an inefficient representation; only use it via the dnslabel_table_*
+ * functions, so that is can be safely replaced with something smarter later. */
+#define MAX_LABELS 128
+/* Structures used to implement name compression */
+struct dnslabel_entry { char *v; off_t pos; };
+struct dnslabel_table {
+	int n_labels; /* number of current entries */
+	/* map from name to position in message */
+	struct dnslabel_entry labels[MAX_LABELS];
+};
+
+/* Initialize dnslabel_table. */
+static void
+dnslabel_table_init(struct dnslabel_table *table)
+{
+	table->n_labels = 0;
+}
+
+/* Free all storage held by table, but not the table itself. */
+static void
+dnslabel_clear(struct dnslabel_table *table)
+{
+	int i;
+	for (i = 0; i < table->n_labels; ++i)
+		mm_free(table->labels[i].v);
+	table->n_labels = 0;
+}
+
+/* return the position of the label in the current message, or -1 if the label */
+/* hasn't been used yet. */
+static int
+dnslabel_table_get_pos(const struct dnslabel_table *table, const char *label)
+{
+	int i;
+	for (i = 0; i < table->n_labels; ++i) {
+		if (!strcmp(label, table->labels[i].v))
+			return table->labels[i].pos;
+	}
+	return -1;
+}
+
+/* remember that we've used the label at position pos */
+static int
+dnslabel_table_add(struct dnslabel_table *table, const char *label, off_t pos)
+{
+	char *v;
+	int p;
+	if (table->n_labels == MAX_LABELS)
+		return (-1);
+	v = mm_strdup(label);
+	if (v == NULL)
+		return (-1);
+	p = table->n_labels++;
+	table->labels[p].v = v;
+	table->labels[p].pos = pos;
+
+	return (0);
+}
+
+/* Converts a string to a length-prefixed set of DNS labels, starting */
+/* at buf[j]. name and buf must not overlap. name_len should be the length */
+/* of name.	 table is optional, and is used for compression. */
+/* */
+/* Input: abc.def */
+/* Output: <3>abc<3>def<0> */
+/* */
+/* Returns the first index after the encoded name, or negative on error. */
+/*	 -1	 label was > 63 bytes */
+/*	 -2	 name too long to fit in buffer. */
+/* */
+static off_t
+dnsname_to_labels(u8 *const buf, size_t buf_len, off_t j,
+				  const char *name, const size_t name_len,
+				  struct dnslabel_table *table) {
+	const char *end = name + name_len;
+	int ref = 0;
+	u16 t_;
+
+#define APPEND16(x) do {						\
+		if (j + 2 > (off_t)buf_len)				\
+			goto overflow;					\
+		t_ = htons(x);						\
+		memcpy(buf + j, &t_, 2);				\
+		j += 2;							\
+	} while (0)
+#define APPEND32(x) do {						\
+		if (j + 4 > (off_t)buf_len)				\
+			goto overflow;					\
+		t32_ = htonl(x);					\
+		memcpy(buf + j, &t32_, 4);				\
+		j += 4;							\
+	} while (0)
+
+	if (name_len > 255) return -2;
+
+	for (;;) {
+		const char *const start = name;
+		if (table && (ref = dnslabel_table_get_pos(table, name)) >= 0) {
+			APPEND16(ref | 0xc000);
+			return j;
+		}
+		name = strchr(name, '.');
+		if (!name) {
+			const size_t label_len = end - start;
+			if (label_len > 63) return -1;
+			if ((size_t)(j+label_len+1) > buf_len) return -2;
+			if (table) dnslabel_table_add(table, start, j);
+			buf[j++] = (ev_uint8_t)label_len;
+
+			memcpy(buf + j, start, label_len);
+			j += (int) label_len;
+			break;
+		} else {
+			/* append length of the label. */
+			const size_t label_len = name - start;
+			if (label_len > 63) return -1;
+			if ((size_t)(j+label_len+1) > buf_len) return -2;
+			if (table) dnslabel_table_add(table, start, j);
+			buf[j++] = (ev_uint8_t)label_len;
+
+			memcpy(buf + j, start, label_len);
+			j += (int) label_len;
+			/* hop over the '.' */
+			name++;
+		}
+	}
+
+	/* the labels must be terminated by a 0. */
+	/* It's possible that the name ended in a . */
+	/* in which case the zero is already there */
+	if (!j || buf[j-1]) buf[j++] = 0;
+	return j;
+ overflow:
+	return (-2);
+}
+
+/* Finds the length of a dns request for a DNS name of the given */
+/* length. The actual request may be smaller than the value returned */
+/* here */
+static size_t
+evdns_request_len(const size_t name_len) {
+	return 96 + /* length of the DNS standard header */
+		name_len + 2 +
+		4;  /* space for the resource type */
+}
+
+/* build a dns request packet into buf. buf should be at least as long */
+/* as evdns_request_len told you it should be. */
+/* */
+/* Returns the amount of space used. Negative on error. */
+static int
+evdns_request_data_build(const char *const name, const size_t name_len,
+    const u16 trans_id, const u16 type, const u16 class,
+    u8 *const buf, size_t buf_len) {
+	off_t j = 0;  /* current offset into buf */
+	u16 t_;	 /* used by the macros */
+
+	APPEND16(trans_id);
+	APPEND16(0x0100);  /* standard query, recusion needed */
+	APPEND16(1);  /* one question */
+	APPEND16(0);  /* no answers */
+	APPEND16(0);  /* no authority */
+	APPEND16(0);  /* no additional */
+
+	j = dnsname_to_labels(buf, buf_len, j, name, name_len, NULL);
+	if (j < 0) {
+		return (int)j;
+	}
+
+	APPEND16(type);
+	APPEND16(class);
+
+	return (int)j;
+ overflow:
+	return (-1);
+}
+
+/* exported function */
+struct evdns_server_port *
+evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int flags, evdns_request_callback_fn_type cb, void *user_data)
+{
+	struct evdns_server_port *port;
+	if (flags)
+		return NULL; /* flags not yet implemented */
+	if (!(port = mm_malloc(sizeof(struct evdns_server_port))))
+		return NULL;
+	memset(port, 0, sizeof(struct evdns_server_port));
+
+
+	port->socket = socket;
+	port->refcnt = 1;
+	port->choked = 0;
+	port->closing = 0;
+	port->user_callback = cb;
+	port->user_data = user_data;
+	port->pending_replies = NULL;
+	port->event_base = base;
+
+	event_assign(&port->event, port->event_base,
+				 port->socket, EV_READ | EV_PERSIST,
+				 server_port_ready_callback, port);
+	if (event_add(&port->event, NULL) < 0) {
+		mm_free(port);
+		return NULL;
+	}
+	EVTHREAD_ALLOC_LOCK(port->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	return port;
+}
+
+struct evdns_server_port *
+evdns_add_server_port(evutil_socket_t socket, int flags, evdns_request_callback_fn_type cb, void *user_data)
+{
+	return evdns_add_server_port_with_base(NULL, socket, flags, cb, user_data);
+}
+
+/* exported function */
+void
+evdns_close_server_port(struct evdns_server_port *port)
+{
+	EVDNS_LOCK(port);
+	if (--port->refcnt == 0) {
+		EVDNS_UNLOCK(port);
+		server_port_free(port);
+	} else {
+		port->closing = 1;
+		EVDNS_UNLOCK(port);
+	}
+}
+
+/* exported function */
+int
+evdns_server_request_add_reply(struct evdns_server_request *req_, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data)
+{
+	struct server_request *req = TO_SERVER_REQUEST(req_);
+	struct server_reply_item **itemp, *item;
+	int *countp;
+	int result = -1;
+
+	EVDNS_LOCK(req->port);
+	if (req->response) /* have we already answered? */
+		goto done;
+
+	switch (section) {
+	case EVDNS_ANSWER_SECTION:
+		itemp = &req->answer;
+		countp = &req->n_answer;
+		break;
+	case EVDNS_AUTHORITY_SECTION:
+		itemp = &req->authority;
+		countp = &req->n_authority;
+		break;
+	case EVDNS_ADDITIONAL_SECTION:
+		itemp = &req->additional;
+		countp = &req->n_additional;
+		break;
+	default:
+		goto done;
+	}
+	while (*itemp) {
+		itemp = &((*itemp)->next);
+	}
+	item = mm_malloc(sizeof(struct server_reply_item));
+	if (!item)
+		goto done;
+	item->next = NULL;
+	if (!(item->name = mm_strdup(name))) {
+		mm_free(item);
+		goto done;
+	}
+	item->type = type;
+	item->dns_question_class = class;
+	item->ttl = ttl;
+	item->is_name = is_name != 0;
+	item->datalen = 0;
+	item->data = NULL;
+	if (data) {
+		if (item->is_name) {
+			if (!(item->data = mm_strdup(data))) {
+				mm_free(item->name);
+				mm_free(item);
+				goto done;
+			}
+			item->datalen = (u16)-1;
+		} else {
+			if (!(item->data = mm_malloc(datalen))) {
+				mm_free(item->name);
+				mm_free(item);
+				goto done;
+			}
+			item->datalen = datalen;
+			memcpy(item->data, data, datalen);
+		}
+	}
+
+	*itemp = item;
+	++(*countp);
+	result = 0;
+done:
+	EVDNS_UNLOCK(req->port);
+	return result;
+}
+
+/* exported function */
+int
+evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl)
+{
+	return evdns_server_request_add_reply(
+		  req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET,
+		  ttl, n*4, 0, addrs);
+}
+
+/* exported function */
+int
+evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl)
+{
+	return evdns_server_request_add_reply(
+		  req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET,
+		  ttl, n*16, 0, addrs);
+}
+
+/* exported function */
+int
+evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl)
+{
+	u32 a;
+	char buf[32];
+	if (in && inaddr_name)
+		return -1;
+	else if (!in && !inaddr_name)
+		return -1;
+	if (in) {
+		a = ntohl(in->s_addr);
+		evutil_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
+				(int)(u8)((a	)&0xff),
+				(int)(u8)((a>>8 )&0xff),
+				(int)(u8)((a>>16)&0xff),
+				(int)(u8)((a>>24)&0xff));
+		inaddr_name = buf;
+	}
+	return evdns_server_request_add_reply(
+		  req, EVDNS_ANSWER_SECTION, inaddr_name, TYPE_PTR, CLASS_INET,
+		  ttl, -1, 1, hostname);
+}
+
+/* exported function */
+int
+evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl)
+{
+	return evdns_server_request_add_reply(
+		  req, EVDNS_ANSWER_SECTION, name, TYPE_CNAME, CLASS_INET,
+		  ttl, -1, 1, cname);
+}
+
+/* exported function */
+void
+evdns_server_request_set_flags(struct evdns_server_request *exreq, int flags)
+{
+	struct server_request *req = TO_SERVER_REQUEST(exreq);
+	req->base.flags &= ~(EVDNS_FLAGS_AA|EVDNS_FLAGS_RD);
+	req->base.flags |= flags;
+}
+
+static int
+evdns_server_request_format_response(struct server_request *req, int err)
+{
+	unsigned char buf[1500];
+	size_t buf_len = sizeof(buf);
+	off_t j = 0, r;
+	u16 t_;
+	u32 t32_;
+	int i;
+	u16 flags;
+	struct dnslabel_table table;
+
+	if (err < 0 || err > 15) return -1;
+
+	/* Set response bit and error code; copy OPCODE and RD fields from
+	 * question; copy RA and AA if set by caller. */
+	flags = req->base.flags;
+	flags |= (_QR_MASK | err);
+
+	dnslabel_table_init(&table);
+	APPEND16(req->trans_id);
+	APPEND16(flags);
+	APPEND16(req->base.nquestions);
+	APPEND16(req->n_answer);
+	APPEND16(req->n_authority);
+	APPEND16(req->n_additional);
+
+	/* Add questions. */
+	for (i=0; i < req->base.nquestions; ++i) {
+		const char *s = req->base.questions[i]->name;
+		j = dnsname_to_labels(buf, buf_len, j, s, strlen(s), &table);
+		if (j < 0) {
+			dnslabel_clear(&table);
+			return (int) j;
+		}
+		APPEND16(req->base.questions[i]->type);
+		APPEND16(req->base.questions[i]->dns_question_class);
+	}
+
+	/* Add answer, authority, and additional sections. */
+	for (i=0; i<3; ++i) {
+		struct server_reply_item *item;
+		if (i==0)
+			item = req->answer;
+		else if (i==1)
+			item = req->authority;
+		else
+			item = req->additional;
+		while (item) {
+			r = dnsname_to_labels(buf, buf_len, j, item->name, strlen(item->name), &table);
+			if (r < 0)
+				goto overflow;
+			j = r;
+
+			APPEND16(item->type);
+			APPEND16(item->dns_question_class);
+			APPEND32(item->ttl);
+			if (item->is_name) {
+				off_t len_idx = j, name_start;
+				j += 2;
+				name_start = j;
+				r = dnsname_to_labels(buf, buf_len, j, item->data, strlen(item->data), &table);
+				if (r < 0)
+					goto overflow;
+				j = r;
+				t_ = htons( (short) (j-name_start) );
+				memcpy(buf+len_idx, &t_, 2);
+			} else {
+				APPEND16(item->datalen);
+				if (j+item->datalen > (off_t)buf_len)
+					goto overflow;
+				memcpy(buf+j, item->data, item->datalen);
+				j += item->datalen;
+			}
+			item = item->next;
+		}
+	}
+
+	if (j > 512) {
+overflow:
+		j = 512;
+		buf[2] |= 0x02; /* set the truncated bit. */
+	}
+
+	req->response_len = j;
+
+	if (!(req->response = mm_malloc(req->response_len))) {
+		server_request_free_answers(req);
+		dnslabel_clear(&table);
+		return (-1);
+	}
+	memcpy(req->response, buf, req->response_len);
+	server_request_free_answers(req);
+	dnslabel_clear(&table);
+	return (0);
+}
+
+/* exported function */
+int
+evdns_server_request_respond(struct evdns_server_request *req_, int err)
+{
+	struct server_request *req = TO_SERVER_REQUEST(req_);
+	struct evdns_server_port *port = req->port;
+	int r = -1;
+
+	EVDNS_LOCK(port);
+	if (!req->response) {
+		if ((r = evdns_server_request_format_response(req, err))<0)
+			goto done;
+	}
+
+	r = sendto(port->socket, req->response, (int)req->response_len, 0,
+			   (struct sockaddr*) &req->addr, (ev_socklen_t)req->addrlen);
+	if (r<0) {
+		int sock_err = evutil_socket_geterror(port->socket);
+		if (EVUTIL_ERR_RW_RETRIABLE(sock_err))
+			goto done;
+
+		if (port->pending_replies) {
+			req->prev_pending = port->pending_replies->prev_pending;
+			req->next_pending = port->pending_replies;
+			req->prev_pending->next_pending =
+				req->next_pending->prev_pending = req;
+		} else {
+			req->prev_pending = req->next_pending = req;
+			port->pending_replies = req;
+			port->choked = 1;
+
+			(void) event_del(&port->event);
+			event_assign(&port->event, port->event_base, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port);
+
+			if (event_add(&port->event, NULL) < 0) {
+				log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server");
+			}
+
+		}
+
+		r = 1;
+		goto done;
+	}
+	if (server_request_free(req)) {
+		r = 0;
+		goto done;
+	}
+
+	if (port->pending_replies)
+		server_port_flush(port);
+
+	r = 0;
+done:
+	EVDNS_UNLOCK(port);
+	return r;
+}
+
+/* Free all storage held by RRs in req. */
+static void
+server_request_free_answers(struct server_request *req)
+{
+	struct server_reply_item *victim, *next, **list;
+	int i;
+	for (i = 0; i < 3; ++i) {
+		if (i==0)
+			list = &req->answer;
+		else if (i==1)
+			list = &req->authority;
+		else
+			list = &req->additional;
+
+		victim = *list;
+		while (victim) {
+			next = victim->next;
+			mm_free(victim->name);
+			if (victim->data)
+				mm_free(victim->data);
+			mm_free(victim);
+			victim = next;
+		}
+		*list = NULL;
+	}
+}
+
+/* Free all storage held by req, and remove links to it. */
+/* return true iff we just wound up freeing the server_port. */
+static int
+server_request_free(struct server_request *req)
+{
+	int i, rc=1, lock=0;
+	if (req->base.questions) {
+		for (i = 0; i < req->base.nquestions; ++i)
+			mm_free(req->base.questions[i]);
+		mm_free(req->base.questions);
+	}
+
+	if (req->port) {
+		EVDNS_LOCK(req->port);
+		lock=1;
+		if (req->port->pending_replies == req) {
+			if (req->next_pending && req->next_pending != req)
+				req->port->pending_replies = req->next_pending;
+			else
+				req->port->pending_replies = NULL;
+		}
+		rc = --req->port->refcnt;
+	}
+
+	if (req->response) {
+		mm_free(req->response);
+	}
+
+	server_request_free_answers(req);
+
+	if (req->next_pending && req->next_pending != req) {
+		req->next_pending->prev_pending = req->prev_pending;
+		req->prev_pending->next_pending = req->next_pending;
+	}
+
+	if (rc == 0) {
+		EVDNS_UNLOCK(req->port); /* ????? nickm */
+		server_port_free(req->port);
+		mm_free(req);
+		return (1);
+	}
+	if (lock)
+		EVDNS_UNLOCK(req->port);
+	mm_free(req);
+	return (0);
+}
+
+/* Free all storage held by an evdns_server_port.  Only called when  */
+static void
+server_port_free(struct evdns_server_port *port)
+{
+	EVUTIL_ASSERT(port);
+	EVUTIL_ASSERT(!port->refcnt);
+	EVUTIL_ASSERT(!port->pending_replies);
+	if (port->socket > 0) {
+		evutil_closesocket(port->socket);
+		port->socket = -1;
+	}
+	(void) event_del(&port->event);
+	event_debug_unassign(&port->event);
+	EVTHREAD_FREE_LOCK(port->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	mm_free(port);
+}
+
+/* exported function */
+int
+evdns_server_request_drop(struct evdns_server_request *req_)
+{
+	struct server_request *req = TO_SERVER_REQUEST(req_);
+	server_request_free(req);
+	return 0;
+}
+
+/* exported function */
+int
+evdns_server_request_get_requesting_addr(struct evdns_server_request *req_, struct sockaddr *sa, int addr_len)
+{
+	struct server_request *req = TO_SERVER_REQUEST(req_);
+	if (addr_len < (int)req->addrlen)
+		return -1;
+	memcpy(sa, &(req->addr), req->addrlen);
+	return req->addrlen;
+}
+
+#undef APPEND16
+#undef APPEND32
+
+/* this is a libevent callback function which is called when a request */
+/* has timed out. */
+static void
+evdns_request_timeout_callback(evutil_socket_t fd, short events, void *arg) {
+	struct request *const req = (struct request *) arg;
+	struct evdns_base *base = req->base;
+
+	(void) fd;
+	(void) events;
+
+	log(EVDNS_LOG_DEBUG, "Request %p timed out", arg);
+	EVDNS_LOCK(base);
+
+	if (req->tx_count >= req->base->global_max_retransmits) {
+		struct nameserver *ns = req->ns;
+		/* this request has failed */
+		log(EVDNS_LOG_DEBUG, "Giving up on request %p; tx_count==%d",
+		    arg, req->tx_count);
+		reply_schedule_callback(req, 0, DNS_ERR_TIMEOUT, NULL);
+
+		request_finished(req, &REQ_HEAD(req->base, req->trans_id), 1);
+		nameserver_failed(ns, "request timed out.");
+	} else {
+		/* retransmit it */
+		log(EVDNS_LOG_DEBUG, "Retransmitting request %p; tx_count==%d",
+		    arg, req->tx_count);
+		(void) evtimer_del(&req->timeout_event);
+		request_swap_ns(req, nameserver_pick(base));
+		evdns_request_transmit(req);
+
+		req->ns->timedout++;
+		if (req->ns->timedout > req->base->global_max_nameserver_timeout) {
+			req->ns->timedout = 0;
+			nameserver_failed(req->ns, "request timed out.");
+		}
+	}
+
+	EVDNS_UNLOCK(base);
+}
+
+/* try to send a request to a given server. */
+/* */
+/* return: */
+/*   0 ok */
+/*   1 temporary failure */
+/*   2 other failure */
+static int
+evdns_request_transmit_to(struct request *req, struct nameserver *server) {
+	int r;
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+
+	if (server->requests_inflight == 1 &&
+		req->base->disable_when_inactive &&
+		event_add(&server->event, NULL) < 0) {
+		return 1;
+	}
+
+	r = sendto(server->socket, (void*)req->request, req->request_len, 0,
+	    (struct sockaddr *)&server->address, server->addrlen);
+	if (r < 0) {
+		int err = evutil_socket_geterror(server->socket);
+		if (EVUTIL_ERR_RW_RETRIABLE(err))
+			return 1;
+		nameserver_failed(req->ns, evutil_socket_error_to_string(err));
+		return 2;
+	} else if (r != (int)req->request_len) {
+		return 1;  /* short write */
+	} else {
+		return 0;
+	}
+}
+
+/* try to send a request, updating the fields of the request */
+/* as needed */
+/* */
+/* return: */
+/*   0 ok */
+/*   1 failed */
+static int
+evdns_request_transmit(struct request *req) {
+	int retcode = 0, r;
+
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+	/* if we fail to send this packet then this flag marks it */
+	/* for evdns_transmit */
+	req->transmit_me = 1;
+	EVUTIL_ASSERT(req->trans_id != 0xffff);
+
+	if (!req->ns)
+	{
+		/* unable to transmit request if no nameservers */
+		return 1;
+	}
+
+	if (req->ns->choked) {
+		/* don't bother trying to write to a socket */
+		/* which we have had EAGAIN from */
+		return 1;
+	}
+
+	r = evdns_request_transmit_to(req, req->ns);
+	switch (r) {
+	case 1:
+		/* temp failure */
+		req->ns->choked = 1;
+		nameserver_write_waiting(req->ns, 1);
+		return 1;
+	case 2:
+		/* failed to transmit the request entirely. we can fallthrough since
+		 * we'll set a timeout, which will time out, and make us retransmit the
+		 * request anyway. */
+		retcode = 1;
+		EVUTIL_FALLTHROUGH;
+	default:
+		/* all ok */
+		log(EVDNS_LOG_DEBUG,
+		    "Setting timeout for request %p, sent to nameserver %p", req, req->ns);
+		if (evtimer_add(&req->timeout_event, &req->base->global_timeout) < 0) {
+			log(EVDNS_LOG_WARN,
+		      "Error from libevent when adding timer for request %p",
+			    req);
+			/* ???? Do more? */
+		}
+		req->tx_count++;
+		req->transmit_me = 0;
+		return retcode;
+	}
+}
+
+static void
+nameserver_probe_callback(int result, char type, int count, int ttl, void *addresses, void *arg) {
+	struct nameserver *const ns = (struct nameserver *) arg;
+	(void) type;
+	(void) count;
+	(void) ttl;
+	(void) addresses;
+
+	if (result == DNS_ERR_CANCEL) {
+		/* We canceled this request because the nameserver came up
+		 * for some other reason.  Do not change our opinion about
+		 * the nameserver. */
+		return;
+	}
+
+	EVDNS_LOCK(ns->base);
+	ns->probe_request = NULL;
+	if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) {
+		/* this is a good reply */
+		nameserver_up(ns);
+	} else {
+		nameserver_probe_failed(ns);
+	}
+	EVDNS_UNLOCK(ns->base);
+}
+
+static void
+nameserver_send_probe(struct nameserver *const ns) {
+	struct evdns_request *handle;
+	struct request *req;
+	char addrbuf[128];
+	/* here we need to send a probe to a given nameserver */
+	/* in the hope that it is up now. */
+
+	ASSERT_LOCKED(ns->base);
+	log(EVDNS_LOG_DEBUG, "Sending probe to %s",
+	    evutil_format_sockaddr_port_(
+		    (struct sockaddr *)&ns->address,
+		    addrbuf, sizeof(addrbuf)));
+	handle = mm_calloc(1, sizeof(*handle));
+	if (!handle) return;
+	req = request_new(ns->base, handle, TYPE_A, "google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, ns);
+	if (!req) {
+		mm_free(handle);
+		return;
+	}
+	ns->probe_request = handle;
+	/* we force this into the inflight queue no matter what */
+	request_trans_id_set(req, transaction_id_pick(ns->base));
+	req->ns = ns;
+	request_submit(req);
+}
+
+/* returns: */
+/*   0 didn't try to transmit anything */
+/*   1 tried to transmit something */
+static int
+evdns_transmit(struct evdns_base *base) {
+	char did_try_to_transmit = 0;
+	int i;
+
+	ASSERT_LOCKED(base);
+	for (i = 0; i < base->n_req_heads; ++i) {
+		if (base->req_heads[i]) {
+			struct request *const started_at = base->req_heads[i], *req = started_at;
+			/* first transmit all the requests which are currently waiting */
+			do {
+				if (req->transmit_me) {
+					did_try_to_transmit = 1;
+					evdns_request_transmit(req);
+				}
+
+				req = req->next;
+			} while (req != started_at);
+		}
+	}
+
+	return did_try_to_transmit;
+}
+
+/* exported function */
+int
+evdns_base_count_nameservers(struct evdns_base *base)
+{
+	const struct nameserver *server;
+	int n = 0;
+
+	EVDNS_LOCK(base);
+	server = base->server_head;
+	if (!server)
+		goto done;
+	do {
+		++n;
+		server = server->next;
+	} while (server != base->server_head);
+done:
+	EVDNS_UNLOCK(base);
+	return n;
+}
+
+int
+evdns_count_nameservers(void)
+{
+	return evdns_base_count_nameservers(current_base);
+}
+
+/* exported function */
+int
+evdns_base_clear_nameservers_and_suspend(struct evdns_base *base)
+{
+	struct nameserver *server, *started_at;
+	int i;
+
+	EVDNS_LOCK(base);
+	server = base->server_head;
+	started_at = base->server_head;
+	if (!server) {
+		EVDNS_UNLOCK(base);
+		return 0;
+	}
+	while (1) {
+		struct nameserver *next = server->next;
+		(void) event_del(&server->event);
+		if (evtimer_initialized(&server->timeout_event))
+			(void) evtimer_del(&server->timeout_event);
+		if (server->probe_request) {
+			evdns_cancel_request(server->base, server->probe_request);
+			server->probe_request = NULL;
+		}
+		if (server->socket >= 0)
+			evutil_closesocket(server->socket);
+		mm_free(server);
+		if (next == started_at)
+			break;
+		server = next;
+	}
+	base->server_head = NULL;
+	base->global_good_nameservers = 0;
+
+	for (i = 0; i < base->n_req_heads; ++i) {
+		struct request *req, *req_started_at;
+		req = req_started_at = base->req_heads[i];
+		while (req) {
+			struct request *next = req->next;
+			req->tx_count = req->reissue_count = 0;
+			req->ns = NULL;
+			/* ???? What to do about searches? */
+			(void) evtimer_del(&req->timeout_event);
+			req->trans_id = 0;
+			req->transmit_me = 0;
+
+			base->global_requests_waiting++;
+			evdns_request_insert(req, &base->req_waiting_head);
+			/* We want to insert these suspended elements at the front of
+			 * the waiting queue, since they were pending before any of
+			 * the waiting entries were added.  This is a circular list,
+			 * so we can just shift the start back by one.*/
+			base->req_waiting_head = base->req_waiting_head->prev;
+
+			if (next == req_started_at)
+				break;
+			req = next;
+		}
+		base->req_heads[i] = NULL;
+	}
+
+	base->global_requests_inflight = 0;
+
+	EVDNS_UNLOCK(base);
+	return 0;
+}
+
+int
+evdns_clear_nameservers_and_suspend(void)
+{
+	return evdns_base_clear_nameservers_and_suspend(current_base);
+}
+
+
+/* exported function */
+int
+evdns_base_resume(struct evdns_base *base)
+{
+	EVDNS_LOCK(base);
+	evdns_requests_pump_waiting_queue(base);
+	EVDNS_UNLOCK(base);
+
+	return 0;
+}
+
+int
+evdns_resume(void)
+{
+	return evdns_base_resume(current_base);
+}
+
+static int
+evdns_nameserver_add_impl_(struct evdns_base *base, const struct sockaddr *address, int addrlen) {
+	/* first check to see if we already have this nameserver */
+
+	const struct nameserver *server = base->server_head, *const started_at = base->server_head;
+	struct nameserver *ns;
+	int err = 0;
+	char addrbuf[128];
+
+	ASSERT_LOCKED(base);
+	if (server) {
+		do {
+			if (!evutil_sockaddr_cmp((struct sockaddr*)&server->address, address, 1)) return 3;
+			server = server->next;
+		} while (server != started_at);
+	}
+	if (addrlen > (int)sizeof(ns->address)) {
+		log(EVDNS_LOG_DEBUG, "Addrlen %d too long.", (int)addrlen);
+		return 2;
+	}
+
+	ns = (struct nameserver *) mm_malloc(sizeof(struct nameserver));
+	if (!ns) return -1;
+
+	memset(ns, 0, sizeof(struct nameserver));
+	ns->base = base;
+
+	evtimer_assign(&ns->timeout_event, ns->base->event_base, nameserver_prod_callback, ns);
+
+	ns->socket = evutil_socket_(address->sa_family,
+	    SOCK_DGRAM|EVUTIL_SOCK_NONBLOCK|EVUTIL_SOCK_CLOEXEC, 0);
+	if (ns->socket < 0) { err = 1; goto out1; }
+
+	if (base->global_outgoing_addrlen &&
+	    !evutil_sockaddr_is_loopback_(address)) {
+		if (bind(ns->socket,
+			(struct sockaddr*)&base->global_outgoing_address,
+			base->global_outgoing_addrlen) < 0) {
+			log(EVDNS_LOG_WARN,"Couldn't bind to outgoing address");
+			err = 2;
+			goto out2;
+		}
+	}
+
+	if (base->so_rcvbuf) {
+		if (setsockopt(ns->socket, SOL_SOCKET, SO_RCVBUF,
+		    (void *)&base->so_rcvbuf, sizeof(base->so_rcvbuf))) {
+			log(EVDNS_LOG_WARN, "Couldn't set SO_RCVBUF to %i", base->so_rcvbuf);
+			err = -SO_RCVBUF;
+			goto out2;
+		}
+	}
+	if (base->so_sndbuf) {
+		if (setsockopt(ns->socket, SOL_SOCKET, SO_SNDBUF,
+		    (void *)&base->so_sndbuf, sizeof(base->so_sndbuf))) {
+			log(EVDNS_LOG_WARN, "Couldn't set SO_SNDBUF to %i", base->so_sndbuf);
+			err = -SO_SNDBUF;
+			goto out2;
+		}
+	}
+
+	memcpy(&ns->address, address, addrlen);
+	ns->addrlen = addrlen;
+	ns->state = 1;
+	event_assign(&ns->event, ns->base->event_base, ns->socket,
+				 EV_READ | EV_PERSIST, nameserver_ready_callback, ns);
+	if (!base->disable_when_inactive && event_add(&ns->event, NULL) < 0) {
+		err = 2;
+		goto out2;
+	}
+
+	log(EVDNS_LOG_DEBUG, "Added nameserver %s as %p",
+	    evutil_format_sockaddr_port_(address, addrbuf, sizeof(addrbuf)), ns);
+
+	/* insert this nameserver into the list of them */
+	if (!base->server_head) {
+		ns->next = ns->prev = ns;
+		base->server_head = ns;
+	} else {
+		ns->next = base->server_head->next;
+		ns->prev = base->server_head;
+		base->server_head->next = ns;
+		ns->next->prev = ns;
+	}
+
+	base->global_good_nameservers++;
+
+	return 0;
+
+out2:
+	evutil_closesocket(ns->socket);
+out1:
+	event_debug_unassign(&ns->event);
+	mm_free(ns);
+	log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d",
+	    evutil_format_sockaddr_port_(address, addrbuf, sizeof(addrbuf)), err);
+	return err;
+}
+
+/* exported function */
+int
+evdns_base_nameserver_add(struct evdns_base *base, unsigned long int address)
+{
+	struct sockaddr_in sin;
+	int res;
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_addr.s_addr = address;
+	sin.sin_port = htons(53);
+	sin.sin_family = AF_INET;
+	EVDNS_LOCK(base);
+	res = evdns_nameserver_add_impl_(base, (struct sockaddr*)&sin, sizeof(sin));
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+int
+evdns_nameserver_add(unsigned long int address) {
+	if (!current_base)
+		current_base = evdns_base_new(NULL, 0);
+	return evdns_base_nameserver_add(current_base, address);
+}
+
+static void
+sockaddr_setport(struct sockaddr *sa, ev_uint16_t port)
+{
+	if (sa->sa_family == AF_INET) {
+		((struct sockaddr_in *)sa)->sin_port = htons(port);
+	} else if (sa->sa_family == AF_INET6) {
+		((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
+	}
+}
+
+static ev_uint16_t
+sockaddr_getport(struct sockaddr *sa)
+{
+	if (sa->sa_family == AF_INET) {
+		return ntohs(((struct sockaddr_in *)sa)->sin_port);
+	} else if (sa->sa_family == AF_INET6) {
+		return ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+	} else {
+		return 0;
+	}
+}
+
+/* exported function */
+int
+evdns_base_nameserver_ip_add(struct evdns_base *base, const char *ip_as_string) {
+	struct sockaddr_storage ss;
+	struct sockaddr *sa;
+	int len = sizeof(ss);
+	int res;
+	if (evutil_parse_sockaddr_port(ip_as_string, (struct sockaddr *)&ss,
+		&len)) {
+		log(EVDNS_LOG_WARN, "Unable to parse nameserver address %s",
+			ip_as_string);
+		return 4;
+	}
+	sa = (struct sockaddr *) &ss;
+	if (sockaddr_getport(sa) == 0)
+		sockaddr_setport(sa, 53);
+
+	EVDNS_LOCK(base);
+	res = evdns_nameserver_add_impl_(base, sa, len);
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+int
+evdns_nameserver_ip_add(const char *ip_as_string) {
+	if (!current_base)
+		current_base = evdns_base_new(NULL, 0);
+	return evdns_base_nameserver_ip_add(current_base, ip_as_string);
+}
+
+int
+evdns_base_nameserver_sockaddr_add(struct evdns_base *base,
+    const struct sockaddr *sa, ev_socklen_t len, unsigned flags)
+{
+	int res;
+	EVUTIL_ASSERT(base);
+	EVDNS_LOCK(base);
+	res = evdns_nameserver_add_impl_(base, sa, len);
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+int
+evdns_base_get_nameserver_addr(struct evdns_base *base, int idx,
+    struct sockaddr *sa, ev_socklen_t len)
+{
+	int result = -1;
+	int i;
+	struct nameserver *server;
+	EVDNS_LOCK(base);
+	server = base->server_head;
+	for (i = 0; i < idx && server; ++i, server = server->next) {
+		if (server->next == base->server_head)
+			goto done;
+	}
+	if (! server)
+		goto done;
+
+	if (server->addrlen > len) {
+		result = (int) server->addrlen;
+		goto done;
+	}
+
+	memcpy(sa, &server->address, server->addrlen);
+	result = (int) server->addrlen;
+done:
+	EVDNS_UNLOCK(base);
+	return result;
+}
+
+/* remove from the queue */
+static void
+evdns_request_remove(struct request *req, struct request **head)
+{
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+
+#if 0
+	{
+		struct request *ptr;
+		int found = 0;
+		EVUTIL_ASSERT(*head != NULL);
+
+		ptr = *head;
+		do {
+			if (ptr == req) {
+				found = 1;
+				break;
+			}
+			ptr = ptr->next;
+		} while (ptr != *head);
+		EVUTIL_ASSERT(found);
+
+		EVUTIL_ASSERT(req->next);
+	}
+#endif
+
+	if (req->next == req) {
+		/* only item in the list */
+		*head = NULL;
+	} else {
+		req->next->prev = req->prev;
+		req->prev->next = req->next;
+		if (*head == req) *head = req->next;
+	}
+	req->next = req->prev = NULL;
+}
+
+/* insert into the tail of the queue */
+static void
+evdns_request_insert(struct request *req, struct request **head) {
+	ASSERT_LOCKED(req->base);
+	ASSERT_VALID_REQUEST(req);
+	if (!*head) {
+		*head = req;
+		req->next = req->prev = req;
+		return;
+	}
+
+	req->prev = (*head)->prev;
+	req->prev->next = req;
+	req->next = *head;
+	(*head)->prev = req;
+}
+
+static int
+string_num_dots(const char *s) {
+	int count = 0;
+	while ((s = strchr(s, '.'))) {
+		s++;
+		count++;
+	}
+	return count;
+}
+
+static struct request *
+request_new(struct evdns_base *base, struct evdns_request *handle, int type,
+	    const char *name, int flags, evdns_callback_type callback,
+	    void *user_ptr) {
+
+	const char issuing_now =
+	    (base->global_requests_inflight < base->global_max_requests_inflight) ? 1 : 0;
+
+	const size_t name_len = strlen(name);
+	const size_t request_max_len = evdns_request_len(name_len);
+	const u16 trans_id = issuing_now ? transaction_id_pick(base) : 0xffff;
+	/* the request data is alloced in a single block with the header */
+	struct request *const req =
+	    mm_malloc(sizeof(struct request) + request_max_len);
+	int rlen;
+	char namebuf[256];
+	(void) flags;
+
+	ASSERT_LOCKED(base);
+
+	if (!req) return NULL;
+
+	if (name_len >= sizeof(namebuf)) {
+		mm_free(req);
+		return NULL;
+	}
+
+	memset(req, 0, sizeof(struct request));
+	req->base = base;
+
+	evtimer_assign(&req->timeout_event, req->base->event_base, evdns_request_timeout_callback, req);
+
+	if (base->global_randomize_case) {
+		unsigned i;
+		char randbits[(sizeof(namebuf)+7)/8];
+		strlcpy(namebuf, name, sizeof(namebuf));
+		evutil_secure_rng_get_bytes(randbits, (name_len+7)/8);
+		for (i = 0; i < name_len; ++i) {
+			if (EVUTIL_ISALPHA_(namebuf[i])) {
+				if ((randbits[i >> 3] & (1<<(i & 7))))
+					namebuf[i] |= 0x20;
+				else
+					namebuf[i] &= ~0x20;
+			}
+		}
+		name = namebuf;
+	}
+
+	/* request data lives just after the header */
+	req->request = ((u8 *) req) + sizeof(struct request);
+	/* denotes that the request data shouldn't be free()ed */
+	req->request_appended = 1;
+	rlen = evdns_request_data_build(name, name_len, trans_id,
+	    type, CLASS_INET, req->request, request_max_len);
+	if (rlen < 0)
+		goto err1;
+
+	req->request_len = rlen;
+	req->trans_id = trans_id;
+	req->tx_count = 0;
+	req->request_type = type;
+	req->user_pointer = user_ptr;
+	req->user_callback = callback;
+	req->ns = issuing_now ? nameserver_pick(base) : NULL;
+	req->next = req->prev = NULL;
+	req->handle = handle;
+	if (handle) {
+		handle->current_req = req;
+		handle->base = base;
+	}
+
+	return req;
+err1:
+	mm_free(req);
+	return NULL;
+}
+
+static void
+request_submit(struct request *const req) {
+	struct evdns_base *base = req->base;
+	ASSERT_LOCKED(base);
+	ASSERT_VALID_REQUEST(req);
+	if (req->ns) {
+		/* if it has a nameserver assigned then this is going */
+		/* straight into the inflight queue */
+		evdns_request_insert(req, &REQ_HEAD(base, req->trans_id));
+
+		base->global_requests_inflight++;
+		req->ns->requests_inflight++;
+
+		evdns_request_transmit(req);
+	} else {
+		evdns_request_insert(req, &base->req_waiting_head);
+		base->global_requests_waiting++;
+	}
+}
+
+/* exported function */
+void
+evdns_cancel_request(struct evdns_base *base, struct evdns_request *handle)
+{
+	struct request *req;
+
+	if (!handle->current_req)
+		return;
+
+	if (!base) {
+		/* This redundancy is silly; can we fix it? (Not for 2.0) XXXX */
+		base = handle->base;
+		if (!base)
+			base = handle->current_req->base;
+	}
+
+	EVDNS_LOCK(base);
+	if (handle->pending_cb) {
+		EVDNS_UNLOCK(base);
+		return;
+	}
+
+	req = handle->current_req;
+	ASSERT_VALID_REQUEST(req);
+
+	reply_schedule_callback(req, 0, DNS_ERR_CANCEL, NULL);
+	if (req->ns) {
+		/* remove from inflight queue */
+		request_finished(req, &REQ_HEAD(base, req->trans_id), 1);
+	} else {
+		/* remove from global_waiting head */
+		request_finished(req, &base->req_waiting_head, 1);
+	}
+	EVDNS_UNLOCK(base);
+}
+
+/* exported function */
+struct evdns_request *
+evdns_base_resolve_ipv4(struct evdns_base *base, const char *name, int flags,
+    evdns_callback_type callback, void *ptr) {
+	struct evdns_request *handle;
+	struct request *req;
+	log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
+	handle = mm_calloc(1, sizeof(*handle));
+	if (handle == NULL)
+		return NULL;
+	EVDNS_LOCK(base);
+	if (flags & DNS_QUERY_NO_SEARCH) {
+		req =
+			request_new(base, handle, TYPE_A, name, flags,
+				    callback, ptr);
+		if (req)
+			request_submit(req);
+	} else {
+		search_request_new(base, handle, TYPE_A, name, flags,
+		    callback, ptr);
+	}
+	if (handle->current_req == NULL) {
+		mm_free(handle);
+		handle = NULL;
+	}
+	EVDNS_UNLOCK(base);
+	return handle;
+}
+
+int evdns_resolve_ipv4(const char *name, int flags,
+					   evdns_callback_type callback, void *ptr)
+{
+	return evdns_base_resolve_ipv4(current_base, name, flags, callback, ptr)
+		? 0 : -1;
+}
+
+
+/* exported function */
+struct evdns_request *
+evdns_base_resolve_ipv6(struct evdns_base *base,
+    const char *name, int flags,
+    evdns_callback_type callback, void *ptr)
+{
+	struct evdns_request *handle;
+	struct request *req;
+	log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
+	handle = mm_calloc(1, sizeof(*handle));
+	if (handle == NULL)
+		return NULL;
+	EVDNS_LOCK(base);
+	if (flags & DNS_QUERY_NO_SEARCH) {
+		req = request_new(base, handle, TYPE_AAAA, name, flags,
+				  callback, ptr);
+		if (req)
+			request_submit(req);
+	} else {
+		search_request_new(base, handle, TYPE_AAAA, name, flags,
+		    callback, ptr);
+	}
+	if (handle->current_req == NULL) {
+		mm_free(handle);
+		handle = NULL;
+	}
+	EVDNS_UNLOCK(base);
+	return handle;
+}
+
+int evdns_resolve_ipv6(const char *name, int flags,
+    evdns_callback_type callback, void *ptr) {
+	return evdns_base_resolve_ipv6(current_base, name, flags, callback, ptr)
+		? 0 : -1;
+}
+
+struct evdns_request *
+evdns_base_resolve_reverse(struct evdns_base *base, const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr) {
+	char buf[32];
+	struct evdns_request *handle;
+	struct request *req;
+	u32 a;
+	EVUTIL_ASSERT(in);
+	a = ntohl(in->s_addr);
+	evutil_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
+			(int)(u8)((a	)&0xff),
+			(int)(u8)((a>>8 )&0xff),
+			(int)(u8)((a>>16)&0xff),
+			(int)(u8)((a>>24)&0xff));
+	handle = mm_calloc(1, sizeof(*handle));
+	if (handle == NULL)
+		return NULL;
+	log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
+	EVDNS_LOCK(base);
+	req = request_new(base, handle, TYPE_PTR, buf, flags, callback, ptr);
+	if (req)
+		request_submit(req);
+	if (handle->current_req == NULL) {
+		mm_free(handle);
+		handle = NULL;
+	}
+	EVDNS_UNLOCK(base);
+	return (handle);
+}
+
+int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr) {
+	return evdns_base_resolve_reverse(current_base, in, flags, callback, ptr)
+		? 0 : -1;
+}
+
+struct evdns_request *
+evdns_base_resolve_reverse_ipv6(struct evdns_base *base, const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
+	/* 32 nybbles, 32 periods, "ip6.arpa", NUL. */
+	char buf[73];
+	char *cp;
+	struct evdns_request *handle;
+	struct request *req;
+	int i;
+	EVUTIL_ASSERT(in);
+	cp = buf;
+	for (i=15; i >= 0; --i) {
+		u8 byte = in->s6_addr[i];
+		*cp++ = "0123456789abcdef"[byte & 0x0f];
+		*cp++ = '.';
+		*cp++ = "0123456789abcdef"[byte >> 4];
+		*cp++ = '.';
+	}
+	EVUTIL_ASSERT(cp + strlen("ip6.arpa") < buf+sizeof(buf));
+	memcpy(cp, "ip6.arpa", strlen("ip6.arpa")+1);
+	handle = mm_calloc(1, sizeof(*handle));
+	if (handle == NULL)
+		return NULL;
+	log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
+	EVDNS_LOCK(base);
+	req = request_new(base, handle, TYPE_PTR, buf, flags, callback, ptr);
+	if (req)
+		request_submit(req);
+	if (handle->current_req == NULL) {
+		mm_free(handle);
+		handle = NULL;
+	}
+	EVDNS_UNLOCK(base);
+	return (handle);
+}
+
+int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
+	return evdns_base_resolve_reverse_ipv6(current_base, in, flags, callback, ptr)
+		? 0 : -1;
+}
+
+/* ================================================================= */
+/* Search support */
+/* */
+/* the libc resolver has support for searching a number of domains */
+/* to find a name. If nothing else then it takes the single domain */
+/* from the gethostname() call. */
+/* */
+/* It can also be configured via the domain and search options in a */
+/* resolv.conf. */
+/* */
+/* The ndots option controls how many dots it takes for the resolver */
+/* to decide that a name is non-local and so try a raw lookup first. */
+
+struct search_domain {
+	int len;
+	struct search_domain *next;
+	/* the text string is appended to this structure */
+};
+
+struct search_state {
+	int refcount;
+	int ndots;
+	int num_domains;
+	struct search_domain *head;
+};
+
+static void
+search_state_decref(struct search_state *const state) {
+	if (!state) return;
+	state->refcount--;
+	if (!state->refcount) {
+		struct search_domain *next, *dom;
+		for (dom = state->head; dom; dom = next) {
+			next = dom->next;
+			mm_free(dom);
+		}
+		mm_free(state);
+	}
+}
+
+static struct search_state *
+search_state_new(void) {
+	struct search_state *state = (struct search_state *) mm_malloc(sizeof(struct search_state));
+	if (!state) return NULL;
+	memset(state, 0, sizeof(struct search_state));
+	state->refcount = 1;
+	state->ndots = 1;
+
+	return state;
+}
+
+static void
+search_postfix_clear(struct evdns_base *base) {
+	search_state_decref(base->global_search_state);
+
+	base->global_search_state = search_state_new();
+}
+
+/* exported function */
+void
+evdns_base_search_clear(struct evdns_base *base)
+{
+	EVDNS_LOCK(base);
+	search_postfix_clear(base);
+	EVDNS_UNLOCK(base);
+}
+
+void
+evdns_search_clear(void) {
+	evdns_base_search_clear(current_base);
+}
+
+static void
+search_postfix_add(struct evdns_base *base, const char *domain) {
+	size_t domain_len;
+	struct search_domain *sdomain;
+	while (domain[0] == '.') domain++;
+	domain_len = strlen(domain);
+
+	ASSERT_LOCKED(base);
+	if (!base->global_search_state) base->global_search_state = search_state_new();
+	if (!base->global_search_state) return;
+	base->global_search_state->num_domains++;
+
+	sdomain = (struct search_domain *) mm_malloc(sizeof(struct search_domain) + domain_len);
+	if (!sdomain) return;
+	memcpy( ((u8 *) sdomain) + sizeof(struct search_domain), domain, domain_len);
+	sdomain->next = base->global_search_state->head;
+	sdomain->len = (int) domain_len;
+
+	base->global_search_state->head = sdomain;
+}
+
+/* reverse the order of members in the postfix list. This is needed because, */
+/* when parsing resolv.conf we push elements in the wrong order */
+static void
+search_reverse(struct evdns_base *base) {
+	struct search_domain *cur, *prev = NULL, *next;
+	ASSERT_LOCKED(base);
+	cur = base->global_search_state->head;
+	while (cur) {
+		next = cur->next;
+		cur->next = prev;
+		prev = cur;
+		cur = next;
+	}
+
+	base->global_search_state->head = prev;
+}
+
+/* exported function */
+void
+evdns_base_search_add(struct evdns_base *base, const char *domain) {
+	EVDNS_LOCK(base);
+	search_postfix_add(base, domain);
+	EVDNS_UNLOCK(base);
+}
+void
+evdns_search_add(const char *domain) {
+	evdns_base_search_add(current_base, domain);
+}
+
+/* exported function */
+void
+evdns_base_search_ndots_set(struct evdns_base *base, const int ndots) {
+	EVDNS_LOCK(base);
+	if (!base->global_search_state) base->global_search_state = search_state_new();
+	if (base->global_search_state)
+		base->global_search_state->ndots = ndots;
+	EVDNS_UNLOCK(base);
+}
+void
+evdns_search_ndots_set(const int ndots) {
+	evdns_base_search_ndots_set(current_base, ndots);
+}
+
+static void
+search_set_from_hostname(struct evdns_base *base) {
+	char hostname[HOST_NAME_MAX + 1], *domainname;
+
+	ASSERT_LOCKED(base);
+	search_postfix_clear(base);
+	if (gethostname(hostname, sizeof(hostname))) return;
+	domainname = strchr(hostname, '.');
+	if (!domainname) return;
+	search_postfix_add(base, domainname);
+}
+
+/* warning: returns malloced string */
+static char *
+search_make_new(const struct search_state *const state, int n, const char *const base_name) {
+	const size_t base_len = strlen(base_name);
+	char need_to_append_dot;
+	struct search_domain *dom;
+
+	if (!base_len) return NULL;
+	need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1;
+
+	for (dom = state->head; dom; dom = dom->next) {
+		if (!n--) {
+			/* this is the postfix we want */
+			/* the actual postfix string is kept at the end of the structure */
+			const u8 *const postfix = ((u8 *) dom) + sizeof(struct search_domain);
+			const int postfix_len = dom->len;
+			char *const newname = (char *) mm_malloc(base_len + need_to_append_dot + postfix_len + 1);
+			if (!newname) return NULL;
+			memcpy(newname, base_name, base_len);
+			if (need_to_append_dot) newname[base_len] = '.';
+			memcpy(newname + base_len + need_to_append_dot, postfix, postfix_len);
+			newname[base_len + need_to_append_dot + postfix_len] = 0;
+			return newname;
+		}
+	}
+
+	/* we ran off the end of the list and still didn't find the requested string */
+	EVUTIL_ASSERT(0);
+	return NULL; /* unreachable; stops warnings in some compilers. */
+}
+
+static struct request *
+search_request_new(struct evdns_base *base, struct evdns_request *handle,
+		   int type, const char *const name, int flags,
+		   evdns_callback_type user_callback, void *user_arg) {
+	ASSERT_LOCKED(base);
+	EVUTIL_ASSERT(type == TYPE_A || type == TYPE_AAAA);
+	EVUTIL_ASSERT(handle->current_req == NULL);
+	if ( ((flags & DNS_QUERY_NO_SEARCH) == 0) &&
+	     base->global_search_state &&
+		 base->global_search_state->num_domains) {
+		/* we have some domains to search */
+		struct request *req;
+		if (string_num_dots(name) >= base->global_search_state->ndots) {
+			req = request_new(base, handle, type, name, flags, user_callback, user_arg);
+			if (!req) return NULL;
+			handle->search_index = -1;
+		} else {
+			char *const new_name = search_make_new(base->global_search_state, 0, name);
+			if (!new_name) return NULL;
+			req = request_new(base, handle, type, new_name, flags, user_callback, user_arg);
+			mm_free(new_name);
+			if (!req) return NULL;
+			handle->search_index = 0;
+		}
+		EVUTIL_ASSERT(handle->search_origname == NULL);
+		handle->search_origname = mm_strdup(name);
+		if (handle->search_origname == NULL) {
+			/* XXX Should we dealloc req? If yes, how? */
+			if (req)
+				mm_free(req);
+			return NULL;
+		}
+		handle->search_state = base->global_search_state;
+		handle->search_flags = flags;
+		base->global_search_state->refcount++;
+		request_submit(req);
+		return req;
+	} else {
+		struct request *const req = request_new(base, handle, type, name, flags, user_callback, user_arg);
+		if (!req) return NULL;
+		request_submit(req);
+		return req;
+	}
+}
+
+/* this is called when a request has failed to find a name. We need to check */
+/* if it is part of a search and, if so, try the next name in the list */
+/* returns: */
+/*   0 another request has been submitted */
+/*   1 no more requests needed */
+static int
+search_try_next(struct evdns_request *const handle) {
+	struct request *req = handle->current_req;
+	struct evdns_base *base = req->base;
+	struct request *newreq;
+	ASSERT_LOCKED(base);
+	if (handle->search_state) {
+		/* it is part of a search */
+		char *new_name;
+		handle->search_index++;
+		if (handle->search_index >= handle->search_state->num_domains) {
+			/* no more postfixes to try, however we may need to try */
+			/* this name without a postfix */
+			if (string_num_dots(handle->search_origname) < handle->search_state->ndots) {
+				/* yep, we need to try it raw */
+				newreq = request_new(base, NULL, req->request_type, handle->search_origname, handle->search_flags, req->user_callback, req->user_pointer);
+				log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", handle->search_origname);
+				if (newreq) {
+					search_request_finished(handle);
+					goto submit_next;
+				}
+			}
+			return 1;
+		}
+
+		new_name = search_make_new(handle->search_state, handle->search_index, handle->search_origname);
+		if (!new_name) return 1;
+		log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, handle->search_index);
+		newreq = request_new(base, NULL, req->request_type, new_name, handle->search_flags, req->user_callback, req->user_pointer);
+		mm_free(new_name);
+		if (!newreq) return 1;
+		goto submit_next;
+	}
+	return 1;
+
+submit_next:
+	request_finished(req, &REQ_HEAD(req->base, req->trans_id), 0);
+	handle->current_req = newreq;
+	newreq->handle = handle;
+	request_submit(newreq);
+	return 0;
+}
+
+static void
+search_request_finished(struct evdns_request *const handle) {
+	ASSERT_LOCKED(handle->current_req->base);
+	if (handle->search_state) {
+		search_state_decref(handle->search_state);
+		handle->search_state = NULL;
+	}
+	if (handle->search_origname) {
+		mm_free(handle->search_origname);
+		handle->search_origname = NULL;
+	}
+}
+
+/* ================================================================= */
+/* Parsing resolv.conf files */
+
+static void
+evdns_resolv_set_defaults(struct evdns_base *base, int flags) {
+	int add_default = flags & DNS_OPTION_NAMESERVERS;
+	if (flags & DNS_OPTION_NAMESERVERS_NO_DEFAULT)
+		add_default = 0;
+
+	/* if the file isn't found then we assume a local resolver */
+	ASSERT_LOCKED(base);
+	if (flags & DNS_OPTION_SEARCH)
+		search_set_from_hostname(base);
+	if (add_default)
+		evdns_base_nameserver_ip_add(base, "127.0.0.1");
+}
+
+#ifndef EVENT__HAVE_STRTOK_R
+static char *
+strtok_r(char *s, const char *delim, char **state) {
+	char *cp, *start;
+	start = cp = s ? s : *state;
+	if (!cp)
+		return NULL;
+	while (*cp && !strchr(delim, *cp))
+		++cp;
+	if (!*cp) {
+		if (cp == start)
+			return NULL;
+		*state = NULL;
+		return start;
+	} else {
+		*cp++ = '\0';
+		*state = cp;
+		return start;
+	}
+}
+#endif
+
+/* helper version of atoi which returns -1 on error */
+static int
+strtoint(const char *const str)
+{
+	char *endptr;
+	const int r = strtol(str, &endptr, 10);
+	if (*endptr) return -1;
+	return r;
+}
+
+/* Parse a number of seconds into a timeval; return -1 on error. */
+static int
+evdns_strtotimeval(const char *const str, struct timeval *out)
+{
+	double d;
+	char *endptr;
+	d = strtod(str, &endptr);
+	if (*endptr) return -1;
+	if (d < 0) return -1;
+	out->tv_sec = (int) d;
+	out->tv_usec = (int) ((d - (int) d)*1000000);
+	if (out->tv_sec == 0 && out->tv_usec < 1000) /* less than 1 msec */
+		return -1;
+	return 0;
+}
+
+/* helper version of atoi that returns -1 on error and clips to bounds. */
+static int
+strtoint_clipped(const char *const str, int min, int max)
+{
+	int r = strtoint(str);
+	if (r == -1)
+		return r;
+	else if (r<min)
+		return min;
+	else if (r>max)
+		return max;
+	else
+		return r;
+}
+
+static int
+evdns_base_set_max_requests_inflight(struct evdns_base *base, int maxinflight)
+{
+	int old_n_heads = base->n_req_heads, n_heads;
+	struct request **old_heads = base->req_heads, **new_heads, *req;
+	int i;
+
+	ASSERT_LOCKED(base);
+	if (maxinflight < 1)
+		maxinflight = 1;
+	n_heads = (maxinflight+4) / 5;
+	EVUTIL_ASSERT(n_heads > 0);
+	new_heads = mm_calloc(n_heads, sizeof(struct request*));
+	if (!new_heads)
+		return (-1);
+	if (old_heads) {
+		for (i = 0; i < old_n_heads; ++i) {
+			while (old_heads[i]) {
+				req = old_heads[i];
+				evdns_request_remove(req, &old_heads[i]);
+				evdns_request_insert(req, &new_heads[req->trans_id % n_heads]);
+			}
+		}
+		mm_free(old_heads);
+	}
+	base->req_heads = new_heads;
+	base->n_req_heads = n_heads;
+	base->global_max_requests_inflight = maxinflight;
+	return (0);
+}
+
+/* exported function */
+int
+evdns_base_set_option(struct evdns_base *base,
+    const char *option, const char *val)
+{
+	int res;
+	EVDNS_LOCK(base);
+	res = evdns_base_set_option_impl(base, option, val, DNS_OPTIONS_ALL);
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+static inline int
+str_matches_option(const char *s1, const char *optionname)
+{
+	/* Option names are given as "option:" We accept either 'option' in
+	 * s1, or 'option:randomjunk'.  The latter form is to implement the
+	 * resolv.conf parser. */
+	size_t optlen = strlen(optionname);
+	size_t slen = strlen(s1);
+	if (slen == optlen || slen == optlen - 1)
+		return !strncmp(s1, optionname, slen);
+	else if (slen > optlen)
+		return !strncmp(s1, optionname, optlen);
+	else
+		return 0;
+}
+
+static int
+evdns_base_set_option_impl(struct evdns_base *base,
+    const char *option, const char *val, int flags)
+{
+	ASSERT_LOCKED(base);
+	if (str_matches_option(option, "ndots:")) {
+		const int ndots = strtoint(val);
+		if (ndots == -1) return -1;
+		if (!(flags & DNS_OPTION_SEARCH)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots);
+		if (!base->global_search_state) base->global_search_state = search_state_new();
+		if (!base->global_search_state) return -1;
+		base->global_search_state->ndots = ndots;
+	} else if (str_matches_option(option, "timeout:")) {
+		struct timeval tv;
+		if (evdns_strtotimeval(val, &tv) == -1) return -1;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting timeout to %s", val);
+		memcpy(&base->global_timeout, &tv, sizeof(struct timeval));
+	} else if (str_matches_option(option, "getaddrinfo-allow-skew:")) {
+		struct timeval tv;
+		if (evdns_strtotimeval(val, &tv) == -1) return -1;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting getaddrinfo-allow-skew to %s",
+		    val);
+		memcpy(&base->global_getaddrinfo_allow_skew, &tv,
+		    sizeof(struct timeval));
+	} else if (str_matches_option(option, "max-timeouts:")) {
+		const int maxtimeout = strtoint_clipped(val, 1, 255);
+		if (maxtimeout == -1) return -1;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d",
+			maxtimeout);
+		base->global_max_nameserver_timeout = maxtimeout;
+	} else if (str_matches_option(option, "max-inflight:")) {
+		const int maxinflight = strtoint_clipped(val, 1, 65000);
+		if (maxinflight == -1) return -1;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d",
+			maxinflight);
+		evdns_base_set_max_requests_inflight(base, maxinflight);
+	} else if (str_matches_option(option, "attempts:")) {
+		int retries = strtoint(val);
+		if (retries == -1) return -1;
+		if (retries > 255) retries = 255;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries);
+		base->global_max_retransmits = retries;
+	} else if (str_matches_option(option, "randomize-case:")) {
+		int randcase = strtoint(val);
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		base->global_randomize_case = randcase;
+	} else if (str_matches_option(option, "bind-to:")) {
+		/* XXX This only applies to successive nameservers, not
+		 * to already-configured ones.	We might want to fix that. */
+		int len = sizeof(base->global_outgoing_address);
+		if (!(flags & DNS_OPTION_NAMESERVERS)) return 0;
+		if (evutil_parse_sockaddr_port(val,
+			(struct sockaddr*)&base->global_outgoing_address, &len))
+			return -1;
+		base->global_outgoing_addrlen = len;
+	} else if (str_matches_option(option, "initial-probe-timeout:")) {
+		struct timeval tv;
+		if (evdns_strtotimeval(val, &tv) == -1) return -1;
+		if (tv.tv_sec > 3600)
+			tv.tv_sec = 3600;
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting initial probe timeout to %s",
+		    val);
+		memcpy(&base->global_nameserver_probe_initial_timeout, &tv,
+		    sizeof(tv));
+	} else if (str_matches_option(option, "so-rcvbuf:")) {
+		int buf = strtoint(val);
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting SO_RCVBUF to %s", val);
+		base->so_rcvbuf = buf;
+	} else if (str_matches_option(option, "so-sndbuf:")) {
+		int buf = strtoint(val);
+		if (!(flags & DNS_OPTION_MISC)) return 0;
+		log(EVDNS_LOG_DEBUG, "Setting SO_SNDBUF to %s", val);
+		base->so_sndbuf = buf;
+	}
+	return 0;
+}
+
+int
+evdns_set_option(const char *option, const char *val, int flags)
+{
+	if (!current_base)
+		current_base = evdns_base_new(NULL, 0);
+	return evdns_base_set_option(current_base, option, val);
+}
+
+static void
+resolv_conf_parse_line(struct evdns_base *base, char *const start, int flags) {
+	char *strtok_state;
+	static const char *const delims = " \t";
+#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
+
+
+	char *const first_token = strtok_r(start, delims, &strtok_state);
+	ASSERT_LOCKED(base);
+	if (!first_token) return;
+
+	if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
+		const char *const nameserver = NEXT_TOKEN;
+
+		if (nameserver)
+			evdns_base_nameserver_ip_add(base, nameserver);
+	} else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) {
+		const char *const domain = NEXT_TOKEN;
+		if (domain) {
+			search_postfix_clear(base);
+			search_postfix_add(base, domain);
+		}
+	} else if (!strcmp(first_token, "search") && (flags & DNS_OPTION_SEARCH)) {
+		const char *domain;
+		search_postfix_clear(base);
+
+		while ((domain = NEXT_TOKEN)) {
+			search_postfix_add(base, domain);
+		}
+		search_reverse(base);
+	} else if (!strcmp(first_token, "options")) {
+		const char *option;
+		while ((option = NEXT_TOKEN)) {
+			const char *val = strchr(option, ':');
+			evdns_base_set_option_impl(base, option, val ? val+1 : "", flags);
+		}
+	}
+#undef NEXT_TOKEN
+}
+
+/* exported function */
+/* returns: */
+/*   0 no errors */
+/*   1 failed to open file */
+/*   2 failed to stat file */
+/*   3 file too large */
+/*   4 out of memory */
+/*   5 short read from file */
+int
+evdns_base_resolv_conf_parse(struct evdns_base *base, int flags, const char *const filename) {
+	int res;
+	EVDNS_LOCK(base);
+	res = evdns_base_resolv_conf_parse_impl(base, flags, filename);
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+static char *
+evdns_get_default_hosts_filename(void)
+{
+#ifdef _WIN32
+	/* Windows is a little coy about where it puts its configuration
+	 * files.  Sure, they're _usually_ in C:\windows\system32, but
+	 * there's no reason in principle they couldn't be in
+	 * W:\hoboken chicken emergency\
+	 */
+	char path[MAX_PATH+1];
+	static const char hostfile[] = "\\drivers\\etc\\hosts";
+	char *path_out;
+	size_t len_out;
+
+	if (! SHGetSpecialFolderPathA(NULL, path, CSIDL_SYSTEM, 0))
+		return NULL;
+	len_out = strlen(path)+strlen(hostfile)+1;
+	path_out = mm_malloc(len_out);
+	evutil_snprintf(path_out, len_out, "%s%s", path, hostfile);
+	return path_out;
+#else
+	return mm_strdup("/etc/hosts");
+#endif
+}
+
+static int
+evdns_base_resolv_conf_parse_impl(struct evdns_base *base, int flags, const char *const filename) {
+	size_t n;
+	char *resolv;
+	char *start;
+	int err = 0;
+	int add_default;
+
+	log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename);
+
+	add_default = flags & DNS_OPTION_NAMESERVERS;
+	if (flags & DNS_OPTION_NAMESERVERS_NO_DEFAULT)
+		add_default = 0;
+
+	if (flags & DNS_OPTION_HOSTSFILE) {
+		char *fname = evdns_get_default_hosts_filename();
+		evdns_base_load_hosts(base, fname);
+		if (fname)
+			mm_free(fname);
+	}
+
+	if (!filename) {
+		evdns_resolv_set_defaults(base, flags);
+		return 1;
+	}
+
+	if ((err = evutil_read_file_(filename, &resolv, &n, 0)) < 0) {
+		if (err == -1) {
+			/* No file. */
+			evdns_resolv_set_defaults(base, flags);
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	start = resolv;
+	for (;;) {
+		char *const newline = strchr(start, '\n');
+		if (!newline) {
+			resolv_conf_parse_line(base, start, flags);
+			break;
+		} else {
+			*newline = 0;
+			resolv_conf_parse_line(base, start, flags);
+			start = newline + 1;
+		}
+	}
+
+	if (!base->server_head && add_default) {
+		/* no nameservers were configured. */
+		evdns_base_nameserver_ip_add(base, "127.0.0.1");
+		err = 6;
+	}
+	if (flags & DNS_OPTION_SEARCH && (!base->global_search_state || base->global_search_state->num_domains == 0)) {
+		search_set_from_hostname(base);
+	}
+
+	mm_free(resolv);
+	return err;
+}
+
+int
+evdns_resolv_conf_parse(int flags, const char *const filename) {
+	if (!current_base)
+		current_base = evdns_base_new(NULL, 0);
+	return evdns_base_resolv_conf_parse(current_base, flags, filename);
+}
+
+
+#ifdef _WIN32
+/* Add multiple nameservers from a space-or-comma-separated list. */
+static int
+evdns_nameserver_ip_add_line(struct evdns_base *base, const char *ips) {
+	const char *addr;
+	char *buf;
+	int r;
+	ASSERT_LOCKED(base);
+	while (*ips) {
+		while (isspace(*ips) || *ips == ',' || *ips == '\t')
+			++ips;
+		addr = ips;
+		while (isdigit(*ips) || *ips == '.' || *ips == ':' ||
+		    *ips=='[' || *ips==']')
+			++ips;
+		buf = mm_malloc(ips-addr+1);
+		if (!buf) return 4;
+		memcpy(buf, addr, ips-addr);
+		buf[ips-addr] = '\0';
+		r = evdns_base_nameserver_ip_add(base, buf);
+		mm_free(buf);
+		if (r) return r;
+	}
+	return 0;
+}
+
+typedef DWORD(WINAPI *GetNetworkParams_fn_t)(FIXED_INFO *, DWORD*);
+
+/* Use the windows GetNetworkParams interface in iphlpapi.dll to */
+/* figure out what our nameservers are. */
+static int
+load_nameservers_with_getnetworkparams(struct evdns_base *base)
+{
+	/* Based on MSDN examples and inspection of  c-ares code. */
+	FIXED_INFO *fixed;
+	HMODULE handle = 0;
+	ULONG size = sizeof(FIXED_INFO);
+	void *buf = NULL;
+	int status = 0, r, added_any;
+	IP_ADDR_STRING *ns;
+	GetNetworkParams_fn_t fn;
+
+	ASSERT_LOCKED(base);
+	if (!(handle = evutil_load_windows_system_library_(
+			TEXT("iphlpapi.dll")))) {
+		log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
+		status = -1;
+		goto done;
+	}
+	if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, "GetNetworkParams"))) {
+		log(EVDNS_LOG_WARN, "Could not get address of function.");
+		status = -1;
+		goto done;
+	}
+
+	buf = mm_malloc(size);
+	if (!buf) { status = 4; goto done; }
+	fixed = buf;
+	r = fn(fixed, &size);
+	if (r != ERROR_SUCCESS && r != ERROR_BUFFER_OVERFLOW) {
+		status = -1;
+		goto done;
+	}
+	if (r != ERROR_SUCCESS) {
+		mm_free(buf);
+		buf = mm_malloc(size);
+		if (!buf) { status = 4; goto done; }
+		fixed = buf;
+		r = fn(fixed, &size);
+		if (r != ERROR_SUCCESS) {
+			log(EVDNS_LOG_DEBUG, "fn() failed.");
+			status = -1;
+			goto done;
+		}
+	}
+
+	EVUTIL_ASSERT(fixed);
+	added_any = 0;
+	ns = &(fixed->DnsServerList);
+	while (ns) {
+		r = evdns_nameserver_ip_add_line(base, ns->IpAddress.String);
+		if (r) {
+			log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list,error: %d",
+				(ns->IpAddress.String),(int)GetLastError());
+			status = r;
+		} else {
+			++added_any;
+			log(EVDNS_LOG_DEBUG,"Successfully added %s as nameserver",ns->IpAddress.String);
+		}
+
+		ns = ns->Next;
+	}
+
+	if (!added_any) {
+		log(EVDNS_LOG_DEBUG, "No nameservers added.");
+		if (status == 0)
+			status = -1;
+	} else {
+		status = 0;
+	}
+
+ done:
+	if (buf)
+		mm_free(buf);
+	if (handle)
+		FreeLibrary(handle);
+	return status;
+}
+
+static int
+config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const TCHAR *subkey)
+{
+	char *buf;
+	DWORD bufsz = 0, type = 0;
+	int status = 0;
+
+	ASSERT_LOCKED(base);
+	if (RegQueryValueEx(key, subkey, 0, &type, NULL, &bufsz)
+	    != ERROR_MORE_DATA)
+		return -1;
+	if (!(buf = mm_malloc(bufsz)))
+		return -1;
+
+	if (RegQueryValueEx(key, subkey, 0, &type, (LPBYTE)buf, &bufsz)
+	    == ERROR_SUCCESS && bufsz > 1) {
+		status = evdns_nameserver_ip_add_line(base,buf);
+	}
+
+	mm_free(buf);
+	return status;
+}
+
+#define SERVICES_KEY TEXT("System\\CurrentControlSet\\Services\\")
+#define WIN_NS_9X_KEY  SERVICES_KEY TEXT("VxD\\MSTCP")
+#define WIN_NS_NT_KEY  SERVICES_KEY TEXT("Tcpip\\Parameters")
+
+static int
+load_nameservers_from_registry(struct evdns_base *base)
+{
+	int found = 0;
+	int r;
+#define TRY(k, name) \
+	if (!found && config_nameserver_from_reg_key(base,k,TEXT(name)) == 0) { \
+		log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \
+		found = 1;						\
+	} else if (!found) {						\
+		log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \
+		    #k,#name);						\
+	}
+
+	ASSERT_LOCKED(base);
+
+	if (((int)GetVersion()) > 0) { /* NT */
+		HKEY nt_key = 0, interfaces_key = 0;
+
+		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
+				 KEY_READ, &nt_key) != ERROR_SUCCESS) {
+			log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError());
+			return -1;
+		}
+		r = RegOpenKeyEx(nt_key, TEXT("Interfaces"), 0,
+			     KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
+			     &interfaces_key);
+		if (r != ERROR_SUCCESS) {
+			log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError());
+			return -1;
+		}
+		TRY(nt_key, "NameServer");
+		TRY(nt_key, "DhcpNameServer");
+		TRY(interfaces_key, "NameServer");
+		TRY(interfaces_key, "DhcpNameServer");
+		RegCloseKey(interfaces_key);
+		RegCloseKey(nt_key);
+	} else {
+		HKEY win_key = 0;
+		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
+				 KEY_READ, &win_key) != ERROR_SUCCESS) {
+			log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError());
+			return -1;
+		}
+		TRY(win_key, "NameServer");
+		RegCloseKey(win_key);
+	}
+
+	if (found == 0) {
+		log(EVDNS_LOG_WARN,"Didn't find any nameservers.");
+	}
+
+	return found ? 0 : -1;
+#undef TRY
+}
+
+int
+evdns_base_config_windows_nameservers(struct evdns_base *base)
+{
+	int r;
+	char *fname;
+	if (base == NULL)
+		base = current_base;
+	if (base == NULL)
+		return -1;
+	EVDNS_LOCK(base);
+	fname = evdns_get_default_hosts_filename();
+	log(EVDNS_LOG_DEBUG, "Loading hosts entries from %s", fname);
+	evdns_base_load_hosts(base, fname);
+	if (fname)
+		mm_free(fname);
+
+	if (load_nameservers_with_getnetworkparams(base) == 0) {
+		EVDNS_UNLOCK(base);
+		return 0;
+	}
+	r = load_nameservers_from_registry(base);
+
+	EVDNS_UNLOCK(base);
+	return r;
+}
+
+int
+evdns_config_windows_nameservers(void)
+{
+	if (!current_base) {
+		current_base = evdns_base_new(NULL, 1);
+		return current_base == NULL ? -1 : 0;
+	} else {
+		return evdns_base_config_windows_nameservers(current_base);
+	}
+}
+#endif
+
+struct evdns_base *
+evdns_base_new(struct event_base *event_base, int flags)
+{
+	struct evdns_base *base;
+
+	if (evutil_secure_rng_init() < 0) {
+		log(EVDNS_LOG_WARN, "Unable to seed random number generator; "
+		    "DNS can't run.");
+		return NULL;
+	}
+
+	/* Give the evutil library a hook into its evdns-enabled
+	 * functionality.  We can't just call evdns_getaddrinfo directly or
+	 * else libevent-core will depend on libevent-extras. */
+	evutil_set_evdns_getaddrinfo_fn_(evdns_getaddrinfo);
+	evutil_set_evdns_getaddrinfo_cancel_fn_(evdns_getaddrinfo_cancel);
+
+	base = mm_malloc(sizeof(struct evdns_base));
+	if (base == NULL)
+		return (NULL);
+	memset(base, 0, sizeof(struct evdns_base));
+	base->req_waiting_head = NULL;
+
+	EVTHREAD_ALLOC_LOCK(base->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	EVDNS_LOCK(base);
+
+	/* Set max requests inflight and allocate req_heads. */
+	base->req_heads = NULL;
+
+	evdns_base_set_max_requests_inflight(base, 64);
+
+	base->server_head = NULL;
+	base->event_base = event_base;
+	base->global_good_nameservers = base->global_requests_inflight =
+		base->global_requests_waiting = 0;
+
+	base->global_timeout.tv_sec = 5;
+	base->global_timeout.tv_usec = 0;
+	base->global_max_reissues = 1;
+	base->global_max_retransmits = 3;
+	base->global_max_nameserver_timeout = 3;
+	base->global_search_state = NULL;
+	base->global_randomize_case = 1;
+	base->global_getaddrinfo_allow_skew.tv_sec = 3;
+	base->global_getaddrinfo_allow_skew.tv_usec = 0;
+	base->global_nameserver_probe_initial_timeout.tv_sec = 10;
+	base->global_nameserver_probe_initial_timeout.tv_usec = 0;
+
+	TAILQ_INIT(&base->hostsdb);
+
+#define EVDNS_BASE_ALL_FLAGS ( \
+	EVDNS_BASE_INITIALIZE_NAMESERVERS | \
+	EVDNS_BASE_DISABLE_WHEN_INACTIVE  | \
+	EVDNS_BASE_NAMESERVERS_NO_DEFAULT | \
+	0)
+
+	if (flags & ~EVDNS_BASE_ALL_FLAGS) {
+		flags = EVDNS_BASE_INITIALIZE_NAMESERVERS;
+		log(EVDNS_LOG_WARN,
+		    "Unrecognized flag passed to evdns_base_new(). Assuming "
+		    "you meant EVDNS_BASE_INITIALIZE_NAMESERVERS.");
+	}
+#undef EVDNS_BASE_ALL_FLAGS
+
+	if (flags & EVDNS_BASE_INITIALIZE_NAMESERVERS) {
+		int r;
+		int opts = DNS_OPTIONS_ALL;
+		if (flags & EVDNS_BASE_NAMESERVERS_NO_DEFAULT) {
+			opts |= DNS_OPTION_NAMESERVERS_NO_DEFAULT;
+		}
+
+#ifdef _WIN32
+		r = evdns_base_config_windows_nameservers(base);
+#else
+		r = evdns_base_resolv_conf_parse(base, opts, "/etc/resolv.conf");
+#endif
+		if (r == -1) {
+			evdns_base_free_and_unlock(base, 0);
+			return NULL;
+		}
+	}
+	if (flags & EVDNS_BASE_DISABLE_WHEN_INACTIVE) {
+		base->disable_when_inactive = 1;
+	}
+
+	EVDNS_UNLOCK(base);
+	return base;
+}
+
+int
+evdns_init(void)
+{
+	struct evdns_base *base = evdns_base_new(NULL, 1);
+	if (base) {
+		current_base = base;
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+const char *
+evdns_err_to_string(int err)
+{
+    switch (err) {
+	case DNS_ERR_NONE: return "no error";
+	case DNS_ERR_FORMAT: return "misformatted query";
+	case DNS_ERR_SERVERFAILED: return "server failed";
+	case DNS_ERR_NOTEXIST: return "name does not exist";
+	case DNS_ERR_NOTIMPL: return "query not implemented";
+	case DNS_ERR_REFUSED: return "refused";
+
+	case DNS_ERR_TRUNCATED: return "reply truncated or ill-formed";
+	case DNS_ERR_UNKNOWN: return "unknown";
+	case DNS_ERR_TIMEOUT: return "request timed out";
+	case DNS_ERR_SHUTDOWN: return "dns subsystem shut down";
+	case DNS_ERR_CANCEL: return "dns request canceled";
+	case DNS_ERR_NODATA: return "no records in the reply";
+	default: return "[Unknown error code]";
+    }
+}
+
+static void
+evdns_nameserver_free(struct nameserver *server)
+{
+	if (server->socket >= 0)
+		evutil_closesocket(server->socket);
+	(void) event_del(&server->event);
+	event_debug_unassign(&server->event);
+	if (server->state == 0)
+		(void) event_del(&server->timeout_event);
+	if (server->probe_request) {
+		evdns_cancel_request(server->base, server->probe_request);
+		server->probe_request = NULL;
+	}
+	event_debug_unassign(&server->timeout_event);
+	mm_free(server);
+}
+
+static void
+evdns_base_free_and_unlock(struct evdns_base *base, int fail_requests)
+{
+	struct nameserver *server, *server_next;
+	struct search_domain *dom, *dom_next;
+	int i;
+
+	/* Requires that we hold the lock. */
+
+	/* TODO(nickm) we might need to refcount here. */
+
+	for (i = 0; i < base->n_req_heads; ++i) {
+		while (base->req_heads[i]) {
+			if (fail_requests)
+				reply_schedule_callback(base->req_heads[i], 0, DNS_ERR_SHUTDOWN, NULL);
+			request_finished(base->req_heads[i], &REQ_HEAD(base, base->req_heads[i]->trans_id), 1);
+		}
+	}
+	while (base->req_waiting_head) {
+		if (fail_requests)
+			reply_schedule_callback(base->req_waiting_head, 0, DNS_ERR_SHUTDOWN, NULL);
+		request_finished(base->req_waiting_head, &base->req_waiting_head, 1);
+	}
+	base->global_requests_inflight = base->global_requests_waiting = 0;
+
+	for (server = base->server_head; server; server = server_next) {
+		server_next = server->next;
+		/** already done something before */
+		server->probe_request = NULL;
+		evdns_nameserver_free(server);
+		if (server_next == base->server_head)
+			break;
+	}
+	base->server_head = NULL;
+	base->global_good_nameservers = 0;
+
+	if (base->global_search_state) {
+		for (dom = base->global_search_state->head; dom; dom = dom_next) {
+			dom_next = dom->next;
+			mm_free(dom);
+		}
+		mm_free(base->global_search_state);
+		base->global_search_state = NULL;
+	}
+
+	{
+		struct hosts_entry *victim;
+		while ((victim = TAILQ_FIRST(&base->hostsdb))) {
+			TAILQ_REMOVE(&base->hostsdb, victim, next);
+			mm_free(victim);
+		}
+	}
+
+	mm_free(base->req_heads);
+
+	EVDNS_UNLOCK(base);
+	EVTHREAD_FREE_LOCK(base->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+
+	mm_free(base);
+}
+
+void
+evdns_base_free(struct evdns_base *base, int fail_requests)
+{
+	EVDNS_LOCK(base);
+	evdns_base_free_and_unlock(base, fail_requests);
+}
+
+void
+evdns_base_clear_host_addresses(struct evdns_base *base)
+{
+	struct hosts_entry *victim;
+	EVDNS_LOCK(base);
+	while ((victim = TAILQ_FIRST(&base->hostsdb))) {
+		TAILQ_REMOVE(&base->hostsdb, victim, next);
+		mm_free(victim);
+	}
+	EVDNS_UNLOCK(base);
+}
+
+void
+evdns_shutdown(int fail_requests)
+{
+	if (current_base) {
+		struct evdns_base *b = current_base;
+		current_base = NULL;
+		evdns_base_free(b, fail_requests);
+	}
+	evdns_log_fn = NULL;
+}
+
+static int
+evdns_base_parse_hosts_line(struct evdns_base *base, char *line)
+{
+	char *strtok_state;
+	static const char *const delims = " \t";
+	char *const addr = strtok_r(line, delims, &strtok_state);
+	char *hostname, *hash;
+	struct sockaddr_storage ss;
+	int socklen = sizeof(ss);
+	ASSERT_LOCKED(base);
+
+#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
+
+	if (!addr || *addr == '#')
+		return 0;
+
+	memset(&ss, 0, sizeof(ss));
+	if (evutil_parse_sockaddr_port(addr, (struct sockaddr*)&ss, &socklen)<0)
+		return -1;
+	if (socklen > (int)sizeof(struct sockaddr_in6))
+		return -1;
+
+	if (sockaddr_getport((struct sockaddr*)&ss))
+		return -1;
+
+	while ((hostname = NEXT_TOKEN)) {
+		struct hosts_entry *he;
+		size_t namelen;
+		if ((hash = strchr(hostname, '#'))) {
+			if (hash == hostname)
+				return 0;
+			*hash = '\0';
+		}
+
+		namelen = strlen(hostname);
+
+		he = mm_calloc(1, sizeof(struct hosts_entry)+namelen);
+		if (!he)
+			return -1;
+		EVUTIL_ASSERT(socklen <= (int)sizeof(he->addr));
+		memcpy(&he->addr, &ss, socklen);
+		memcpy(he->hostname, hostname, namelen+1);
+		he->addrlen = socklen;
+
+		TAILQ_INSERT_TAIL(&base->hostsdb, he, next);
+
+		if (hash)
+			return 0;
+	}
+
+	return 0;
+#undef NEXT_TOKEN
+}
+
+static int
+evdns_base_load_hosts_impl(struct evdns_base *base, const char *hosts_fname)
+{
+	char *str=NULL, *cp, *eol;
+	size_t len;
+	int err=0;
+
+	ASSERT_LOCKED(base);
+
+	if (hosts_fname == NULL ||
+	    (err = evutil_read_file_(hosts_fname, &str, &len, 0)) < 0) {
+		char tmp[64];
+		strlcpy(tmp, "127.0.0.1   localhost", sizeof(tmp));
+		evdns_base_parse_hosts_line(base, tmp);
+		strlcpy(tmp, "::1   localhost", sizeof(tmp));
+		evdns_base_parse_hosts_line(base, tmp);
+		return err ? -1 : 0;
+	}
+
+	/* This will break early if there is a NUL in the hosts file.
+	 * Probably not a problem.*/
+	cp = str;
+	for (;;) {
+		eol = strchr(cp, '\n');
+
+		if (eol) {
+			*eol = '\0';
+			evdns_base_parse_hosts_line(base, cp);
+			cp = eol+1;
+		} else {
+			evdns_base_parse_hosts_line(base, cp);
+			break;
+		}
+	}
+
+	mm_free(str);
+	return 0;
+}
+
+int
+evdns_base_load_hosts(struct evdns_base *base, const char *hosts_fname)
+{
+	int res;
+	if (!base)
+		base = current_base;
+	EVDNS_LOCK(base);
+	res = evdns_base_load_hosts_impl(base, hosts_fname);
+	EVDNS_UNLOCK(base);
+	return res;
+}
+
+/* A single request for a getaddrinfo, either v4 or v6. */
+struct getaddrinfo_subrequest {
+	struct evdns_request *r;
+	ev_uint32_t type;
+};
+
+/* State data used to implement an in-progress getaddrinfo. */
+struct evdns_getaddrinfo_request {
+	struct evdns_base *evdns_base;
+	/* Copy of the modified 'hints' data that we'll use to build
+	 * answers. */
+	struct evutil_addrinfo hints;
+	/* The callback to invoke when we're done */
+	evdns_getaddrinfo_cb user_cb;
+	/* User-supplied data to give to the callback. */
+	void *user_data;
+	/* The port to use when building sockaddrs. */
+	ev_uint16_t port;
+	/* The sub_request for an A record (if any) */
+	struct getaddrinfo_subrequest ipv4_request;
+	/* The sub_request for an AAAA record (if any) */
+	struct getaddrinfo_subrequest ipv6_request;
+
+	/* The cname result that we were told (if any) */
+	char *cname_result;
+
+	/* If we have one request answered and one request still inflight,
+	 * then this field holds the answer from the first request... */
+	struct evutil_addrinfo *pending_result;
+	/* And this event is a timeout that will tell us to cancel the second
+	 * request if it's taking a long time. */
+	struct event timeout;
+
+	/* And this field holds the error code from the first request... */
+	int pending_error;
+	/* If this is set, the user canceled this request. */
+	unsigned user_canceled : 1;
+	/* If this is set, the user can no longer cancel this request; we're
+	 * just waiting for the free. */
+	unsigned request_done : 1;
+};
+
+/* Convert an evdns errors to the equivalent getaddrinfo error. */
+static int
+evdns_err_to_getaddrinfo_err(int e1)
+{
+	/* XXX Do this better! */
+	if (e1 == DNS_ERR_NONE)
+		return 0;
+	else if (e1 == DNS_ERR_NOTEXIST)
+		return EVUTIL_EAI_NONAME;
+	else
+		return EVUTIL_EAI_FAIL;
+}
+
+/* Return the more informative of two getaddrinfo errors. */
+static int
+getaddrinfo_merge_err(int e1, int e2)
+{
+	/* XXXX be cleverer here. */
+	if (e1 == 0)
+		return e2;
+	else
+		return e1;
+}
+
+static void
+free_getaddrinfo_request(struct evdns_getaddrinfo_request *data)
+{
+	/* DO NOT CALL this if either of the requests is pending.  Only once
+	 * both callbacks have been invoked is it safe to free the request */
+	if (data->pending_result)
+		evutil_freeaddrinfo(data->pending_result);
+	if (data->cname_result)
+		mm_free(data->cname_result);
+	event_del(&data->timeout);
+	mm_free(data);
+	return;
+}
+
+static void
+add_cname_to_reply(struct evdns_getaddrinfo_request *data,
+    struct evutil_addrinfo *ai)
+{
+	if (data->cname_result && ai) {
+		ai->ai_canonname = data->cname_result;
+		data->cname_result = NULL;
+	}
+}
+
+/* Callback: invoked when one request in a mixed-format A/AAAA getaddrinfo
+ * request has finished, but the other one took too long to answer. Pass
+ * along the answer we got, and cancel the other request.
+ */
+static void
+evdns_getaddrinfo_timeout_cb(evutil_socket_t fd, short what, void *ptr)
+{
+	int v4_timedout = 0, v6_timedout = 0;
+	struct evdns_getaddrinfo_request *data = ptr;
+
+	/* Cancel any pending requests, and note which one */
+	if (data->ipv4_request.r) {
+		/* XXXX This does nothing if the request's callback is already
+		 * running (pending_cb is set). */
+		evdns_cancel_request(NULL, data->ipv4_request.r);
+		v4_timedout = 1;
+		EVDNS_LOCK(data->evdns_base);
+		++data->evdns_base->getaddrinfo_ipv4_timeouts;
+		EVDNS_UNLOCK(data->evdns_base);
+	}
+	if (data->ipv6_request.r) {
+		/* XXXX This does nothing if the request's callback is already
+		 * running (pending_cb is set). */
+		evdns_cancel_request(NULL, data->ipv6_request.r);
+		v6_timedout = 1;
+		EVDNS_LOCK(data->evdns_base);
+		++data->evdns_base->getaddrinfo_ipv6_timeouts;
+		EVDNS_UNLOCK(data->evdns_base);
+	}
+
+	/* We only use this timeout callback when we have an answer for
+	 * one address. */
+	EVUTIL_ASSERT(!v4_timedout || !v6_timedout);
+
+	/* Report the outcome of the other request that didn't time out. */
+	if (data->pending_result) {
+		add_cname_to_reply(data, data->pending_result);
+		data->user_cb(0, data->pending_result, data->user_data);
+		data->pending_result = NULL;
+	} else {
+		int e = data->pending_error;
+		if (!e)
+			e = EVUTIL_EAI_AGAIN;
+		data->user_cb(e, NULL, data->user_data);
+	}
+
+	data->user_cb = NULL; /* prevent double-call if evdns callbacks are
+			       * in-progress. XXXX It would be better if this
+			       * weren't necessary. */
+
+	if (!v4_timedout && !v6_timedout) {
+		/* should be impossible? XXXX */
+		free_getaddrinfo_request(data);
+	}
+}
+
+static int
+evdns_getaddrinfo_set_timeout(struct evdns_base *evdns_base,
+    struct evdns_getaddrinfo_request *data)
+{
+	return event_add(&data->timeout, &evdns_base->global_getaddrinfo_allow_skew);
+}
+
+static inline int
+evdns_result_is_answer(int result)
+{
+	return (result != DNS_ERR_NOTIMPL && result != DNS_ERR_REFUSED &&
+	    result != DNS_ERR_SERVERFAILED && result != DNS_ERR_CANCEL);
+}
+
+static void
+evdns_getaddrinfo_gotresolve(int result, char type, int count,
+    int ttl, void *addresses, void *arg)
+{
+	int i;
+	struct getaddrinfo_subrequest *req = arg;
+	struct getaddrinfo_subrequest *other_req;
+	struct evdns_getaddrinfo_request *data;
+
+	struct evutil_addrinfo *res;
+
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+	struct sockaddr *sa;
+	int socklen, addrlen;
+	void *addrp;
+	int err;
+	int user_canceled;
+
+	EVUTIL_ASSERT(req->type == DNS_IPv4_A || req->type == DNS_IPv6_AAAA);
+	if (req->type == DNS_IPv4_A) {
+		data = EVUTIL_UPCAST(req, struct evdns_getaddrinfo_request, ipv4_request);
+		other_req = &data->ipv6_request;
+	} else {
+		data = EVUTIL_UPCAST(req, struct evdns_getaddrinfo_request, ipv6_request);
+		other_req = &data->ipv4_request;
+	}
+
+	/** Called from evdns_base_free() with @fail_requests == 1 */
+	if (result != DNS_ERR_SHUTDOWN) {
+		EVDNS_LOCK(data->evdns_base);
+		if (evdns_result_is_answer(result)) {
+			if (req->type == DNS_IPv4_A)
+				++data->evdns_base->getaddrinfo_ipv4_answered;
+			else
+				++data->evdns_base->getaddrinfo_ipv6_answered;
+		}
+		user_canceled = data->user_canceled;
+		if (other_req->r == NULL)
+			data->request_done = 1;
+		EVDNS_UNLOCK(data->evdns_base);
+	} else {
+		data->evdns_base = NULL;
+		user_canceled = data->user_canceled;
+	}
+
+	req->r = NULL;
+
+	if (result == DNS_ERR_CANCEL && ! user_canceled) {
+		/* Internal cancel request from timeout or internal error.
+		 * we already answered the user. */
+		if (other_req->r == NULL)
+			free_getaddrinfo_request(data);
+		return;
+	}
+
+	if (data->user_cb == NULL) {
+		/* We already answered.  XXXX This shouldn't be needed; see
+		 * comments in evdns_getaddrinfo_timeout_cb */
+		free_getaddrinfo_request(data);
+		return;
+	}
+
+	if (result == DNS_ERR_NONE) {
+		if (count == 0)
+			err = EVUTIL_EAI_NODATA;
+		else
+			err = 0;
+	} else {
+		err = evdns_err_to_getaddrinfo_err(result);
+	}
+
+	if (err) {
+		/* Looks like we got an error. */
+		if (other_req->r) {
+			/* The other request is still working; maybe it will
+			 * succeed. */
+			/* XXXX handle failure from set_timeout */
+			if (result != DNS_ERR_SHUTDOWN) {
+				evdns_getaddrinfo_set_timeout(data->evdns_base, data);
+			}
+			data->pending_error = err;
+			return;
+		}
+
+		if (user_canceled) {
+			data->user_cb(EVUTIL_EAI_CANCEL, NULL, data->user_data);
+		} else if (data->pending_result) {
+			/* If we have an answer waiting, and we weren't
+			 * canceled, ignore this error. */
+			add_cname_to_reply(data, data->pending_result);
+			data->user_cb(0, data->pending_result, data->user_data);
+			data->pending_result = NULL;
+		} else {
+			if (data->pending_error)
+				err = getaddrinfo_merge_err(err,
+				    data->pending_error);
+			data->user_cb(err, NULL, data->user_data);
+		}
+		free_getaddrinfo_request(data);
+		return;
+	} else if (user_canceled) {
+		if (other_req->r) {
+			/* The other request is still working; let it hit this
+			 * callback with EVUTIL_EAI_CANCEL callback and report
+			 * the failure. */
+			return;
+		}
+		data->user_cb(EVUTIL_EAI_CANCEL, NULL, data->user_data);
+		free_getaddrinfo_request(data);
+		return;
+	}
+
+	/* Looks like we got some answers. We should turn them into addrinfos
+	 * and then either queue those or return them all. */
+	EVUTIL_ASSERT(type == DNS_IPv4_A || type == DNS_IPv6_AAAA);
+
+	if (type == DNS_IPv4_A) {
+		memset(&sin, 0, sizeof(sin));
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(data->port);
+
+		sa = (struct sockaddr *)&sin;
+		socklen = sizeof(sin);
+		addrlen = 4;
+		addrp = &sin.sin_addr.s_addr;
+	} else {
+		memset(&sin6, 0, sizeof(sin6));
+		sin6.sin6_family = AF_INET6;
+		sin6.sin6_port = htons(data->port);
+
+		sa = (struct sockaddr *)&sin6;
+		socklen = sizeof(sin6);
+		addrlen = 16;
+		addrp = &sin6.sin6_addr.s6_addr;
+	}
+
+	res = NULL;
+	for (i=0; i < count; ++i) {
+		struct evutil_addrinfo *ai;
+		memcpy(addrp, ((char*)addresses)+i*addrlen, addrlen);
+		ai = evutil_new_addrinfo_(sa, socklen, &data->hints);
+		if (!ai) {
+			if (other_req->r) {
+				evdns_cancel_request(NULL, other_req->r);
+			}
+			data->user_cb(EVUTIL_EAI_MEMORY, NULL, data->user_data);
+			if (res)
+				evutil_freeaddrinfo(res);
+
+			if (other_req->r == NULL)
+				free_getaddrinfo_request(data);
+			return;
+		}
+		res = evutil_addrinfo_append_(res, ai);
+	}
+
+	if (other_req->r) {
+		/* The other request is still in progress; wait for it */
+		/* XXXX handle failure from set_timeout */
+		evdns_getaddrinfo_set_timeout(data->evdns_base, data);
+		data->pending_result = res;
+		return;
+	} else {
+		/* The other request is done or never started; append its
+		 * results (if any) and return them. */
+		if (data->pending_result) {
+			if (req->type == DNS_IPv4_A)
+				res = evutil_addrinfo_append_(res,
+				    data->pending_result);
+			else
+				res = evutil_addrinfo_append_(
+				    data->pending_result, res);
+			data->pending_result = NULL;
+		}
+
+		/* Call the user callback. */
+		add_cname_to_reply(data, res);
+		data->user_cb(0, res, data->user_data);
+
+		/* Free data. */
+		free_getaddrinfo_request(data);
+	}
+}
+
+static struct hosts_entry *
+find_hosts_entry(struct evdns_base *base, const char *hostname,
+    struct hosts_entry *find_after)
+{
+	struct hosts_entry *e;
+
+	if (find_after)
+		e = TAILQ_NEXT(find_after, next);
+	else
+		e = TAILQ_FIRST(&base->hostsdb);
+
+	for (; e; e = TAILQ_NEXT(e, next)) {
+		if (!evutil_ascii_strcasecmp(e->hostname, hostname))
+			return e;
+	}
+	return NULL;
+}
+
+static int
+evdns_getaddrinfo_fromhosts(struct evdns_base *base,
+    const char *nodename, struct evutil_addrinfo *hints, ev_uint16_t port,
+    struct evutil_addrinfo **res)
+{
+	int n_found = 0;
+	struct hosts_entry *e;
+	struct evutil_addrinfo *ai=NULL;
+	int f = hints->ai_family;
+
+	EVDNS_LOCK(base);
+	for (e = find_hosts_entry(base, nodename, NULL); e;
+	    e = find_hosts_entry(base, nodename, e)) {
+		struct evutil_addrinfo *ai_new;
+		++n_found;
+		if ((e->addr.sa.sa_family == AF_INET && f == PF_INET6) ||
+		    (e->addr.sa.sa_family == AF_INET6 && f == PF_INET))
+			continue;
+		ai_new = evutil_new_addrinfo_(&e->addr.sa, e->addrlen, hints);
+		if (!ai_new) {
+			n_found = 0;
+			goto out;
+		}
+		sockaddr_setport(ai_new->ai_addr, port);
+		ai = evutil_addrinfo_append_(ai, ai_new);
+	}
+	EVDNS_UNLOCK(base);
+out:
+	if (n_found) {
+		/* Note that we return an empty answer if we found entries for
+		 * this hostname but none were of the right address type. */
+		*res = ai;
+		return 0;
+	} else {
+		if (ai)
+			evutil_freeaddrinfo(ai);
+		return -1;
+	}
+}
+
+struct evdns_getaddrinfo_request *
+evdns_getaddrinfo(struct evdns_base *dns_base,
+    const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in,
+    evdns_getaddrinfo_cb cb, void *arg)
+{
+	struct evdns_getaddrinfo_request *data;
+	struct evutil_addrinfo hints;
+	struct evutil_addrinfo *res = NULL;
+	int err;
+	int port = 0;
+	int want_cname = 0;
+	int started = 0;
+
+	if (!dns_base) {
+		dns_base = current_base;
+		if (!dns_base) {
+			log(EVDNS_LOG_WARN,
+			    "Call to getaddrinfo_async with no "
+			    "evdns_base configured.");
+			cb(EVUTIL_EAI_FAIL, NULL, arg); /* ??? better error? */
+			return NULL;
+		}
+	}
+
+	/* If we _must_ answer this immediately, do so. */
+	if ((hints_in && (hints_in->ai_flags & EVUTIL_AI_NUMERICHOST))) {
+		res = NULL;
+		err = evutil_getaddrinfo(nodename, servname, hints_in, &res);
+		cb(err, res, arg);
+		return NULL;
+	}
+
+	if (hints_in) {
+		memcpy(&hints, hints_in, sizeof(hints));
+	} else {
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+	}
+
+	evutil_adjust_hints_for_addrconfig_(&hints);
+
+	/* Now try to see if we _can_ answer immediately. */
+	/* (It would be nice to do this by calling getaddrinfo directly, with
+	 * AI_NUMERICHOST, on plaforms that have it, but we can't: there isn't
+	 * a reliable way to distinguish the "that wasn't a numeric host!" case
+	 * from any other EAI_NONAME cases.) */
+	err = evutil_getaddrinfo_common_(nodename, servname, &hints, &res, &port);
+	if (err != EVUTIL_EAI_NEED_RESOLVE) {
+		cb(err, res, arg);
+		return NULL;
+	}
+
+	/* If there is an entry in the hosts file, we should give it now. */
+	if (!evdns_getaddrinfo_fromhosts(dns_base, nodename, &hints, port, &res)) {
+		cb(0, res, arg);
+		return NULL;
+	}
+
+	/* Okay, things are serious now. We're going to need to actually
+	 * launch a request.
+	 */
+	data = mm_calloc(1,sizeof(struct evdns_getaddrinfo_request));
+	if (!data) {
+		cb(EVUTIL_EAI_MEMORY, NULL, arg);
+		return NULL;
+	}
+
+	memcpy(&data->hints, &hints, sizeof(data->hints));
+	data->port = (ev_uint16_t)port;
+	data->ipv4_request.type = DNS_IPv4_A;
+	data->ipv6_request.type = DNS_IPv6_AAAA;
+	data->user_cb = cb;
+	data->user_data = arg;
+	data->evdns_base = dns_base;
+
+	want_cname = (hints.ai_flags & EVUTIL_AI_CANONNAME);
+
+	/* If we are asked for a PF_UNSPEC address, we launch two requests in
+	 * parallel: one for an A address and one for an AAAA address.  We
+	 * can't send just one request, since many servers only answer one
+	 * question per DNS request.
+	 *
+	 * Once we have the answer to one request, we allow for a short
+	 * timeout before we report it, to see if the other one arrives.  If
+	 * they both show up in time, then we report both the answers.
+	 *
+	 * If too many addresses of one type time out or fail, we should stop
+	 * launching those requests. (XXX we don't do that yet.)
+	 */
+
+	EVDNS_LOCK(dns_base);
+
+	if (hints.ai_family != PF_INET6) {
+		log(EVDNS_LOG_DEBUG, "Sending request for %s on ipv4 as %p",
+		    nodename, &data->ipv4_request);
+
+		data->ipv4_request.r = evdns_base_resolve_ipv4(dns_base,
+		    nodename, 0, evdns_getaddrinfo_gotresolve,
+		    &data->ipv4_request);
+		if (want_cname && data->ipv4_request.r)
+			data->ipv4_request.r->current_req->put_cname_in_ptr =
+			    &data->cname_result;
+	}
+	if (hints.ai_family != PF_INET) {
+		log(EVDNS_LOG_DEBUG, "Sending request for %s on ipv6 as %p",
+		    nodename, &data->ipv6_request);
+
+		data->ipv6_request.r = evdns_base_resolve_ipv6(dns_base,
+		    nodename, 0, evdns_getaddrinfo_gotresolve,
+		    &data->ipv6_request);
+		if (want_cname && data->ipv6_request.r)
+			data->ipv6_request.r->current_req->put_cname_in_ptr =
+			    &data->cname_result;
+	}
+
+	evtimer_assign(&data->timeout, dns_base->event_base,
+	    evdns_getaddrinfo_timeout_cb, data);
+
+	started = (data->ipv4_request.r || data->ipv6_request.r);
+
+	EVDNS_UNLOCK(dns_base);
+
+	if (started) {
+		return data;
+	} else {
+		mm_free(data);
+		cb(EVUTIL_EAI_FAIL, NULL, arg);
+		return NULL;
+	}
+}
+
+void
+evdns_getaddrinfo_cancel(struct evdns_getaddrinfo_request *data)
+{
+	EVDNS_LOCK(data->evdns_base);
+	if (data->request_done) {
+		EVDNS_UNLOCK(data->evdns_base);
+		return;
+	}
+	event_del(&data->timeout);
+	data->user_canceled = 1;
+	if (data->ipv4_request.r)
+		evdns_cancel_request(data->evdns_base, data->ipv4_request.r);
+	if (data->ipv6_request.r)
+		evdns_cancel_request(data->evdns_base, data->ipv6_request.r);
+	EVDNS_UNLOCK(data->evdns_base);
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake b/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake
new file mode 100644
index 000000000000..498ab1eac90f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake
@@ -0,0 +1,507 @@
+/* event-config.h
+ *
+ * This file was generated by cmake when the makefiles were generated.
+ *
+ * DO NOT EDIT THIS FILE.
+ *
+ * Do not rely on macros in this file existing in later versions.
+ */
+#ifndef EVENT2_EVENT_CONFIG_H_INCLUDED_
+#define EVENT2_EVENT_CONFIG_H_INCLUDED_
+
+/* Numeric representation of the version */
+#define EVENT__NUMERIC_VERSION @EVENT_NUMERIC_VERSION@
+#define EVENT__PACKAGE_VERSION "@EVENT_PACKAGE_VERSION@"
+
+#define EVENT__VERSION_MAJOR @EVENT_VERSION_MAJOR@
+#define EVENT__VERSION_MINOR @EVENT_VERSION_MINOR@
+#define EVENT__VERSION_PATCH @EVENT_VERSION_PATCH@
+
+/* Version number of package */
+#define EVENT__VERSION "@EVENT_VERSION@"
+
+/* Name of package */
+#define EVENT__PACKAGE "libevent"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define EVENT__PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define EVENT__PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define EVENT__PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define EVENT__PACKAGE_TARNAME ""
+
+/* Define if libevent should build without support for a debug mode */
+#cmakedefine EVENT__DISABLE_DEBUG_MODE 1
+
+/* Define if libevent should not allow replacing the mm functions */
+#cmakedefine EVENT__DISABLE_MM_REPLACEMENT 1
+
+/* Define if libevent should not be compiled with thread support */
+#cmakedefine EVENT__DISABLE_THREAD_SUPPORT 1
+
+/* Define to 1 if you have the `accept4' function. */
+#cmakedefine EVENT__HAVE_ACCEPT4 1
+
+/* Define to 1 if you have the `arc4random' function. */
+#cmakedefine EVENT__HAVE_ARC4RANDOM 1
+
+/* Define to 1 if you have the `arc4random_buf' function. */
+#cmakedefine EVENT__HAVE_ARC4RANDOM_BUF 1
+
+/* Define to 1 if you have the `arc4random_addrandom' function. */
+#cmakedefine EVENT__HAVE_ARC4RANDOM_ADDRANDOM 1
+
+/* Define if clock_gettime is available in libc */
+#cmakedefine EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1
+
+/* Define is no secure id variant is available */
+#cmakedefine EVENT__DNS_USE_GETTIMEOFDAY_FOR_ID 1
+#cmakedefine EVENT__DNS_USE_FTIME_FOR_ID 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#cmakedefine EVENT__HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#cmakedefine EVENT__HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the declaration of `CTL_KERN'. */
+#define EVENT__HAVE_DECL_CTL_KERN @EVENT__HAVE_DECL_CTL_KERN@
+
+/* Define to 1 if you have the declaration of `KERN_ARND'. */
+#define EVENT__HAVE_DECL_KERN_ARND @EVENT__HAVE_DECL_KERN_ARND@
+
+/* Define to 1 if you have the declaration of `KERN_RANDOM'. */
+#define EVENT__HAVE_DECL_KERN_RANDOM @EVENT__HAVE_DECL_KERN_RANDOM@
+
+/* Define to 1 if you have the declaration of `RANDOM_UUID'. */
+#define EVENT__HAVE_DECL_RANDOM_UUID @EVENT__HAVE_DECL_RANDOM_UUID@
+
+/* Define if /dev/poll is available */
+#cmakedefine EVENT__HAVE_DEVPOLL 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#cmakedefine EVENT__HAVE_NETDB_H 1
+
+/* Define to 1 if fd_mask type is defined */
+#cmakedefine EVENT__HAVE_FD_MASK 1
+
+/* Define to 1 if the <sys/queue.h> header file defines TAILQ_FOREACH. */
+#cmakedefine EVENT__HAVE_TAILQFOREACH 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#cmakedefine EVENT__HAVE_DLFCN_H 1
+
+/* Define if your system supports the epoll system calls */
+#cmakedefine EVENT__HAVE_EPOLL 1
+
+/* Define to 1 if you have the `epoll_create1' function. */
+#cmakedefine EVENT__HAVE_EPOLL_CREATE1 1
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+#cmakedefine EVENT__HAVE_EPOLL_CTL 1
+
+/* Define to 1 if you have the `eventfd' function. */
+#cmakedefine EVENT__HAVE_EVENTFD 1
+
+/* Define if your system supports event ports */
+#cmakedefine EVENT__HAVE_EVENT_PORTS 1
+
+/* Define to 1 if you have the `fcntl' function. */
+#cmakedefine EVENT__HAVE_FCNTL 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine EVENT__HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#cmakedefine EVENT__HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getegid' function. */
+#cmakedefine EVENT__HAVE_GETEGID 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#cmakedefine EVENT__HAVE_GETEUID 1
+
+/* TODO: Check for different gethostname argument counts. CheckPrototypeDefinition.cmake can be used. */
+/* Define this if you have any gethostbyname_r() */
+#cmakedefine EVENT__HAVE_GETHOSTBYNAME_R 1
+
+/* Define this if gethostbyname_r takes 3 arguments */
+#cmakedefine EVENT__HAVE_GETHOSTBYNAME_R_3_ARG 1
+
+/* Define this if gethostbyname_r takes 5 arguments */
+#cmakedefine EVENT__HAVE_GETHOSTBYNAME_R_5_ARG 1
+
+/* Define this if gethostbyname_r takes 6 arguments */
+#cmakedefine EVENT__HAVE_GETHOSTBYNAME_R_6_ARG 1
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#cmakedefine EVENT__HAVE_GETIFADDRS 1
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#cmakedefine EVENT__HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getprotobynumber' function. */
+#cmakedefine EVENT__HAVE_GETPROTOBYNUMBER 1
+
+/* Define to 1 if you have the `getservbyname' function. */
+#cmakedefine EVENT__HAVE_GETSERVBYNAME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#cmakedefine EVENT__HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#cmakedefine EVENT__HAVE_IFADDRS_H 1
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#cmakedefine EVENT__HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the `inet_pton' function. */
+#cmakedefine EVENT__HAVE_INET_PTON 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#cmakedefine EVENT__HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `issetugid' function. */
+#cmakedefine EVENT__HAVE_ISSETUGID 1
+
+/* Define to 1 if you have the `kqueue' function. */
+#cmakedefine EVENT__HAVE_KQUEUE 1
+
+/* Define if the system has zlib */
+#cmakedefine EVENT__HAVE_LIBZ 1
+
+/* Define to 1 if you have the `mach_absolute_time' function. */
+#cmakedefine EVENT__HAVE_MACH_ABSOLUTE_TIME 1
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+#cmakedefine EVENT__HAVE_MACH_MACH_TIME_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#cmakedefine EVENT__HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mmap' function. */
+#cmakedefine EVENT__HAVE_MMAP 1
+
+/* Define to 1 if you have the `nanosleep' function. */
+#cmakedefine EVENT__HAVE_NANOSLEEP 1
+
+/* Define to 1 if you have the `usleep' function. */
+#cmakedefine EVENT__HAVE_USLEEP 1
+
+/* Define to 1 if you have the <netinet/in6.h> header file. */
+#cmakedefine EVENT__HAVE_NETINET_IN6_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#cmakedefine EVENT__HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#cmakedefine EVENT__HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <afunix.h> header file. */
+#cmakedefine EVENT__HAVE_AFUNIX_H 1
+
+/* Define if the system has openssl */
+#cmakedefine EVENT__HAVE_OPENSSL 1
+
+/* Define to 1 if you have the `pipe' function. */
+#cmakedefine EVENT__HAVE_PIPE 1
+
+/* Define to 1 if you have the `pipe2' function. */
+#cmakedefine EVENT__HAVE_PIPE2 1
+
+/* Define to 1 if you have the `poll' function. */
+#cmakedefine EVENT__HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#cmakedefine EVENT__HAVE_POLL_H 1
+
+/* Define to 1 if you have the `port_create' function. */
+#cmakedefine EVENT__HAVE_PORT_CREATE 1
+
+/* Define to 1 if you have the <port.h> header file. */
+#cmakedefine EVENT__HAVE_PORT_H 1
+
+/* Define if we have pthreads on this system */
+#cmakedefine EVENT__HAVE_PTHREADS 1
+
+/* Define to 1 if you have the `putenv' function. */
+#cmakedefine EVENT__HAVE_PUTENV 1
+
+/* Define to 1 if the system has the type `sa_family_t'. */
+#cmakedefine EVENT__HAVE_SA_FAMILY_T 1
+
+/* Define to 1 if you have the `select' function. */
+#cmakedefine EVENT__HAVE_SELECT 1
+
+/* Define to 1 if you have the `setenv' function. */
+#cmakedefine EVENT__HAVE_SETENV 1
+
+/* Define if F_SETFD is defined in <fcntl.h> */
+#cmakedefine EVENT__HAVE_SETFD 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#cmakedefine EVENT__HAVE_SETRLIMIT 1
+
+/* Define to 1 if you have the `sendfile' function. */
+#cmakedefine EVENT__HAVE_SENDFILE 1
+
+/* Define to 1 if you have the `sigaction' function. */
+#cmakedefine EVENT__HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `signal' function. */
+#cmakedefine EVENT__HAVE_SIGNAL 1
+
+/* Define to 1 if you have the `splice' function. */
+#cmakedefine EVENT__HAVE_SPLICE 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#cmakedefine EVENT__HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#cmakedefine EVENT__HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#cmakedefine EVENT__HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#cmakedefine EVENT__HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine EVENT__HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#cmakedefine EVENT__HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#cmakedefine EVENT__HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strsep' function. */
+#cmakedefine EVENT__HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strtok_r' function. */
+#cmakedefine EVENT__HAVE_STRTOK_R 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#cmakedefine EVENT__HAVE_STRTOLL 1
+
+/* Define to 1 if the system has the type `struct addrinfo'. */
+#cmakedefine EVENT__HAVE_STRUCT_ADDRINFO 1
+
+/* Define to 1 if the system has the type `struct in6_addr'. */
+#cmakedefine EVENT__HAVE_STRUCT_IN6_ADDR 1
+
+/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */
+#cmakedefine EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1
+
+/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */
+#cmakedefine EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1
+
+/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
+
+/* Define to 1 if the system has the type `struct sockaddr_un'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_UN 1
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+
+/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
+#cmakedefine EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY 1
+
+/* Define to 1 if the system has the type `struct linger'. */
+#cmakedefine EVENT__HAVE_STRUCT_LINGER 1
+
+/* Define to 1 if you have the `sysctl' function. */
+#cmakedefine EVENT__HAVE_SYSCTL 1
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_EPOLL_H 1
+
+/* Define to 1 if you have the <sys/eventfd.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_EVENTFD_H 1
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_EVENT_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_QUEUE_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_SENDFILE_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/timerfd.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_TIMERFD_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#cmakedefine EVENT__HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#cmakedefine EVENT__HAVE_ERRNO_H 1
+
+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
+#cmakedefine EVENT__HAVE_TAILQFOREACH 1
+
+/* Define if timeradd is defined in <sys/time.h> */
+#cmakedefine EVENT__HAVE_TIMERADD 1
+
+/* Define if timerclear is defined in <sys/time.h> */
+#cmakedefine EVENT__HAVE_TIMERCLEAR 1
+
+/* Define if timercmp is defined in <sys/time.h> */
+#cmakedefine EVENT__HAVE_TIMERCMP 1
+
+
+/* Define to 1 if you have the `timerfd_create' function. */
+#cmakedefine EVENT__HAVE_TIMERFD_CREATE 1
+
+/* Define if timerisset is defined in <sys/time.h> */
+#cmakedefine EVENT__HAVE_TIMERISSET 1
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#cmakedefine EVENT__HAVE_UINT8_T 1
+
+/* Define to 1 if the system has the type `uint16_t'. */
+#cmakedefine EVENT__HAVE_UINT16_T 1
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#cmakedefine EVENT__HAVE_UINT32_T 1
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#cmakedefine EVENT__HAVE_UINT64_T 1
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#cmakedefine EVENT__HAVE_UINTPTR_T 1
+
+/* Define to 1 if you have the `umask' function. */
+#cmakedefine EVENT__HAVE_UMASK 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine EVENT__HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `unsetenv' function. */
+#cmakedefine EVENT__HAVE_UNSETENV 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#cmakedefine EVENT__HAVE_VASPRINTF 1
+
+/* Define if kqueue works correctly with pipes */
+#cmakedefine EVENT__HAVE_WORKING_KQUEUE 1
+
+#ifdef __USE_UNUSED_DEFINITIONS__
+/* Define to necessary symbol if this constant uses a non-standard name on your system. */
+/* XXX: Hello, this isn't even used, nor is it defined anywhere... - Ellzey */
+#define EVENT__PTHREAD_CREATE_JOINABLE ${EVENT__PTHREAD_CREATE_JOINABLE}
+#endif
+
+/* The size of `pthread_t', as computed by sizeof. */
+#define EVENT__SIZEOF_PTHREAD_T @EVENT__SIZEOF_PTHREAD_T@
+
+/* The size of a `int', as computed by sizeof. */
+#define EVENT__SIZEOF_INT @EVENT__SIZEOF_INT@
+
+/* The size of a `long', as computed by sizeof. */
+#define EVENT__SIZEOF_LONG @EVENT__SIZEOF_LONG@
+
+/* The size of a `long long', as computed by sizeof. */
+#define EVENT__SIZEOF_LONG_LONG @EVENT__SIZEOF_LONG_LONG@
+
+/* The size of `off_t', as computed by sizeof. */
+#define EVENT__SIZEOF_OFF_T @EVENT__SIZEOF_OFF_T@
+
+#define EVENT__SIZEOF_SSIZE_T @EVENT__SIZEOF_SSIZE_T@
+
+
+/* The size of a `short', as computed by sizeof. */
+#define EVENT__SIZEOF_SHORT @EVENT__SIZEOF_SHORT@
+
+/* The size of `size_t', as computed by sizeof. */
+#define EVENT__SIZEOF_SIZE_T @EVENT__SIZEOF_SIZE_T@
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#cmakedefine EVENT__TIME_WITH_SYS_TIME 1
+
+/* The size of `socklen_t', as computed by sizeof. */
+#define EVENT__SIZEOF_SOCKLEN_T @EVENT__SIZEOF_SOCKLEN_T@
+
+/* The size of 'void *', as computer by sizeof */
+#define EVENT__SIZEOF_VOID_P @EVENT__SIZEOF_VOID_P@
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* why not c++?
+ *
+ *  and are we really expected to use EVENT__inline everywhere,
+ *  shouldn't we just do:
+ *     ifdef EVENT__inline
+ *     define inline EVENT__inline
+ *
+ * - Ellzey
+ */
+
+#define EVENT__inline @EVENT__inline@
+#endif
+
+#cmakedefine EVENT__HAVE___func__ 1
+#cmakedefine EVENT__HAVE___FUNCTION__ 1
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#define EVENT__size_t @EVENT__size_t@
+
+/* Define to unsigned int if you dont have it */
+#define EVENT__socklen_t @EVENT__socklen_t@
+
+/* Define to `int' if <sys/types.h> does not define. */
+#define EVENT__ssize_t @EVENT__ssize_t@
+
+#endif /* \EVENT2_EVENT_CONFIG_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/event-internal.h b/extra/libevent/libevent-2.1.11-stable/event-internal.h
new file mode 100644
index 000000000000..92941b71364a
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/event-internal.h
@@ -0,0 +1,488 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT_INTERNAL_H_INCLUDED_
+#define EVENT_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <time.h>
+#include <sys/queue.h>
+#include "event2/event_struct.h"
+#include "minheap-internal.h"
+#include "evsignal-internal.h"
+#include "mm-internal.h"
+#include "defer-internal.h"
+
+/* map union members back */
+
+/* mutually exclusive */
+#define ev_signal_next	ev_.ev_signal.ev_signal_next
+#define ev_io_next	ev_.ev_io.ev_io_next
+#define ev_io_timeout	ev_.ev_io.ev_timeout
+
+/* used only by signals */
+#define ev_ncalls	ev_.ev_signal.ev_ncalls
+#define ev_pncalls	ev_.ev_signal.ev_pncalls
+
+#define ev_pri ev_evcallback.evcb_pri
+#define ev_flags ev_evcallback.evcb_flags
+#define ev_closure ev_evcallback.evcb_closure
+#define ev_callback ev_evcallback.evcb_cb_union.evcb_callback
+#define ev_arg ev_evcallback.evcb_arg
+
+/** @name Event closure codes
+
+    Possible values for evcb_closure in struct event_callback
+
+    @{
+ */
+/** A regular event. Uses the evcb_callback callback */
+#define EV_CLOSURE_EVENT 0
+/** A signal event. Uses the evcb_callback callback */
+#define EV_CLOSURE_EVENT_SIGNAL 1
+/** A persistent non-signal event. Uses the evcb_callback callback */
+#define EV_CLOSURE_EVENT_PERSIST 2
+/** A simple callback. Uses the evcb_selfcb callback. */
+#define EV_CLOSURE_CB_SELF 3
+/** A finalizing callback. Uses the evcb_cbfinalize callback. */
+#define EV_CLOSURE_CB_FINALIZE 4
+/** A finalizing event. Uses the evcb_evfinalize callback. */
+#define EV_CLOSURE_EVENT_FINALIZE 5
+/** A finalizing event that should get freed after. Uses the evcb_evfinalize
+ * callback. */
+#define EV_CLOSURE_EVENT_FINALIZE_FREE 6
+/** @} */
+
+/** Structure to define the backend of a given event_base. */
+struct eventop {
+	/** The name of this backend. */
+	const char *name;
+	/** Function to set up an event_base to use this backend.  It should
+	 * create a new structure holding whatever information is needed to
+	 * run the backend, and return it.  The returned pointer will get
+	 * stored by event_init into the event_base.evbase field.  On failure,
+	 * this function should return NULL. */
+	void *(*init)(struct event_base *);
+	/** Enable reading/writing on a given fd or signal.  'events' will be
+	 * the events that we're trying to enable: one or more of EV_READ,
+	 * EV_WRITE, EV_SIGNAL, and EV_ET.  'old' will be those events that
+	 * were enabled on this fd previously.  'fdinfo' will be a structure
+	 * associated with the fd by the evmap; its size is defined by the
+	 * fdinfo field below.  It will be set to 0 the first time the fd is
+	 * added.  The function should return 0 on success and -1 on error.
+	 */
+	int (*add)(struct event_base *, evutil_socket_t fd, short old, short events, void *fdinfo);
+	/** As "add", except 'events' contains the events we mean to disable. */
+	int (*del)(struct event_base *, evutil_socket_t fd, short old, short events, void *fdinfo);
+	/** Function to implement the core of an event loop.  It must see which
+	    added events are ready, and cause event_active to be called for each
+	    active event (usually via event_io_active or such).  It should
+	    return 0 on success and -1 on error.
+	 */
+	int (*dispatch)(struct event_base *, struct timeval *);
+	/** Function to clean up and free our data from the event_base. */
+	void (*dealloc)(struct event_base *);
+	/** Flag: set if we need to reinitialize the event base after we fork.
+	 */
+	int need_reinit;
+	/** Bit-array of supported event_method_features that this backend can
+	 * provide. */
+	enum event_method_feature features;
+	/** Length of the extra information we should record for each fd that
+	    has one or more active events.  This information is recorded
+	    as part of the evmap entry for each fd, and passed as an argument
+	    to the add and del functions above.
+	 */
+	size_t fdinfo_len;
+};
+
+#ifdef _WIN32
+/* If we're on win32, then file descriptors are not nice low densely packed
+   integers.  Instead, they are pointer-like windows handles, and we want to
+   use a hashtable instead of an array to map fds to events.
+*/
+#define EVMAP_USE_HT
+#endif
+
+/* #define HT_CACHE_HASH_VALS */
+
+#ifdef EVMAP_USE_HT
+#define HT_NO_CACHE_HASH_VALUES
+#include "ht-internal.h"
+struct event_map_entry;
+HT_HEAD(event_io_map, event_map_entry);
+#else
+#define event_io_map event_signal_map
+#endif
+
+/* Used to map signal numbers to a list of events.  If EVMAP_USE_HT is not
+   defined, this structure is also used as event_io_map, which maps fds to a
+   list of events.
+*/
+struct event_signal_map {
+	/* An array of evmap_io * or of evmap_signal *; empty entries are
+	 * set to NULL. */
+	void **entries;
+	/* The number of entries available in entries */
+	int nentries;
+};
+
+/* A list of events waiting on a given 'common' timeout value.  Ordinarily,
+ * events waiting for a timeout wait on a minheap.  Sometimes, however, a
+ * queue can be faster.
+ **/
+struct common_timeout_list {
+	/* List of events currently waiting in the queue. */
+	struct event_list events;
+	/* 'magic' timeval used to indicate the duration of events in this
+	 * queue. */
+	struct timeval duration;
+	/* Event that triggers whenever one of the events in the queue is
+	 * ready to activate */
+	struct event timeout_event;
+	/* The event_base that this timeout list is part of */
+	struct event_base *base;
+};
+
+/** Mask used to get the real tv_usec value from a common timeout. */
+#define COMMON_TIMEOUT_MICROSECONDS_MASK       0x000fffff
+
+struct event_change;
+
+/* List of 'changes' since the last call to eventop.dispatch.  Only maintained
+ * if the backend is using changesets. */
+struct event_changelist {
+	struct event_change *changes;
+	int n_changes;
+	int changes_size;
+};
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+/* Global internal flag: set to one if debug mode is on. */
+extern int event_debug_mode_on_;
+#define EVENT_DEBUG_MODE_IS_ON() (event_debug_mode_on_)
+#else
+#define EVENT_DEBUG_MODE_IS_ON() (0)
+#endif
+
+TAILQ_HEAD(evcallback_list, event_callback);
+
+/* Sets up an event for processing once */
+struct event_once {
+	LIST_ENTRY(event_once) next_once;
+	struct event ev;
+
+	void (*cb)(evutil_socket_t, short, void *);
+	void *arg;
+};
+
+struct event_base {
+	/** Function pointers and other data to describe this event_base's
+	 * backend. */
+	const struct eventop *evsel;
+	/** Pointer to backend-specific data. */
+	void *evbase;
+
+	/** List of changes to tell backend about at next dispatch.  Only used
+	 * by the O(1) backends. */
+	struct event_changelist changelist;
+
+	/** Function pointers used to describe the backend that this event_base
+	 * uses for signals */
+	const struct eventop *evsigsel;
+	/** Data to implement the common signal handler code. */
+	struct evsig_info sig;
+
+	/** Number of virtual events */
+	int virtual_event_count;
+	/** Maximum number of virtual events active */
+	int virtual_event_count_max;
+	/** Number of total events added to this event_base */
+	int event_count;
+	/** Maximum number of total events added to this event_base */
+	int event_count_max;
+	/** Number of total events active in this event_base */
+	int event_count_active;
+	/** Maximum number of total events active in this event_base */
+	int event_count_active_max;
+
+	/** Set if we should terminate the loop once we're done processing
+	 * events. */
+	int event_gotterm;
+	/** Set if we should terminate the loop immediately */
+	int event_break;
+	/** Set if we should start a new instance of the loop immediately. */
+	int event_continue;
+
+	/** The currently running priority of events */
+	int event_running_priority;
+
+	/** Set if we're running the event_base_loop function, to prevent
+	 * reentrant invocation. */
+	int running_loop;
+
+	/** Set to the number of deferred_cbs we've made 'active' in the
+	 * loop.  This is a hack to prevent starvation; it would be smarter
+	 * to just use event_config_set_max_dispatch_interval's max_callbacks
+	 * feature */
+	int n_deferreds_queued;
+
+	/* Active event management. */
+	/** An array of nactivequeues queues for active event_callbacks (ones
+	 * that have triggered, and whose callbacks need to be called).  Low
+	 * priority numbers are more important, and stall higher ones.
+	 */
+	struct evcallback_list *activequeues;
+	/** The length of the activequeues array */
+	int nactivequeues;
+	/** A list of event_callbacks that should become active the next time
+	 * we process events, but not this time. */
+	struct evcallback_list active_later_queue;
+
+	/* common timeout logic */
+
+	/** An array of common_timeout_list* for all of the common timeout
+	 * values we know. */
+	struct common_timeout_list **common_timeout_queues;
+	/** The number of entries used in common_timeout_queues */
+	int n_common_timeouts;
+	/** The total size of common_timeout_queues. */
+	int n_common_timeouts_allocated;
+
+	/** Mapping from file descriptors to enabled (added) events */
+	struct event_io_map io;
+
+	/** Mapping from signal numbers to enabled (added) events. */
+	struct event_signal_map sigmap;
+
+	/** Priority queue of events with timeouts. */
+	struct min_heap timeheap;
+
+	/** Stored timeval: used to avoid calling gettimeofday/clock_gettime
+	 * too often. */
+	struct timeval tv_cache;
+
+	struct evutil_monotonic_timer monotonic_timer;
+
+	/** Difference between internal time (maybe from clock_gettime) and
+	 * gettimeofday. */
+	struct timeval tv_clock_diff;
+	/** Second in which we last updated tv_clock_diff, in monotonic time. */
+	time_t last_updated_clock_diff;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	/* threading support */
+	/** The thread currently running the event_loop for this base */
+	unsigned long th_owner_id;
+	/** A lock to prevent conflicting accesses to this event_base */
+	void *th_base_lock;
+	/** A condition that gets signalled when we're done processing an
+	 * event with waiters on it. */
+	void *current_event_cond;
+	/** Number of threads blocking on current_event_cond. */
+	int current_event_waiters;
+#endif
+	/** The event whose callback is executing right now */
+	struct event_callback *current_event;
+
+#ifdef _WIN32
+	/** IOCP support structure, if IOCP is enabled. */
+	struct event_iocp_port *iocp;
+#endif
+
+	/** Flags that this base was configured with */
+	enum event_base_config_flag flags;
+
+	struct timeval max_dispatch_time;
+	int max_dispatch_callbacks;
+	int limit_callbacks_after_prio;
+
+	/* Notify main thread to wake up break, etc. */
+	/** True if the base already has a pending notify, and we don't need
+	 * to add any more. */
+	int is_notify_pending;
+	/** A socketpair used by some th_notify functions to wake up the main
+	 * thread. */
+	evutil_socket_t th_notify_fd[2];
+	/** An event used by some th_notify functions to wake up the main
+	 * thread. */
+	struct event th_notify;
+	/** A function used to wake up the main thread from another thread. */
+	int (*th_notify_fn)(struct event_base *base);
+
+	/** Saved seed for weak random number generator. Some backends use
+	 * this to produce fairness among sockets. Protected by th_base_lock. */
+	struct evutil_weakrand_state weakrand_seed;
+
+	/** List of event_onces that have not yet fired. */
+	LIST_HEAD(once_event_list, event_once) once_events;
+
+};
+
+struct event_config_entry {
+	TAILQ_ENTRY(event_config_entry) next;
+
+	const char *avoid_method;
+};
+
+/** Internal structure: describes the configuration we want for an event_base
+ * that we're about to allocate. */
+struct event_config {
+	TAILQ_HEAD(event_configq, event_config_entry) entries;
+
+	int n_cpus_hint;
+	struct timeval max_dispatch_interval;
+	int max_dispatch_callbacks;
+	int limit_callbacks_after_prio;
+	enum event_method_feature require_features;
+	enum event_base_config_flag flags;
+};
+
+/* Internal use only: Functions that might be missing from <sys/queue.h> */
+#ifndef LIST_END
+#define LIST_END(head)			NULL
+#endif
+
+#ifndef TAILQ_FIRST
+#define	TAILQ_FIRST(head)		((head)->tqh_first)
+#endif
+#ifndef TAILQ_END
+#define	TAILQ_END(head)			NULL
+#endif
+#ifndef TAILQ_NEXT
+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
+#endif
+
+#ifndef TAILQ_FOREACH
+#define TAILQ_FOREACH(var, head, field)					\
+	for ((var) = TAILQ_FIRST(head);					\
+	     (var) != TAILQ_END(head);					\
+	     (var) = TAILQ_NEXT(var, field))
+#endif
+
+#ifndef TAILQ_INSERT_BEFORE
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	(elm)->field.tqe_next = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
+} while (0)
+#endif
+
+#define N_ACTIVE_CALLBACKS(base)					\
+	((base)->event_count_active)
+
+int evsig_set_handler_(struct event_base *base, int evsignal,
+			  void (*fn)(int));
+int evsig_restore_handler_(struct event_base *base, int evsignal);
+
+int event_add_nolock_(struct event *ev,
+    const struct timeval *tv, int tv_is_absolute);
+/** Argument for event_del_nolock_. Tells event_del not to block on the event
+ * if it's running in another thread. */
+#define EVENT_DEL_NOBLOCK 0
+/** Argument for event_del_nolock_. Tells event_del to block on the event
+ * if it's running in another thread, regardless of its value for EV_FINALIZE
+ */
+#define EVENT_DEL_BLOCK 1
+/** Argument for event_del_nolock_. Tells event_del to block on the event
+ * if it is running in another thread and it doesn't have EV_FINALIZE set.
+ */
+#define EVENT_DEL_AUTOBLOCK 2
+/** Argument for event_del_nolock_. Tells event_del to procede even if the
+ * event is set up for finalization rather for regular use.*/
+#define EVENT_DEL_EVEN_IF_FINALIZING 3
+int event_del_nolock_(struct event *ev, int blocking);
+int event_remove_timer_nolock_(struct event *ev);
+
+void event_active_nolock_(struct event *ev, int res, short count);
+EVENT2_EXPORT_SYMBOL
+int event_callback_activate_(struct event_base *, struct event_callback *);
+int event_callback_activate_nolock_(struct event_base *, struct event_callback *);
+int event_callback_cancel_(struct event_base *base,
+    struct event_callback *evcb);
+
+void event_callback_finalize_nolock_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *));
+EVENT2_EXPORT_SYMBOL
+void event_callback_finalize_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *));
+int event_callback_finalize_many_(struct event_base *base, int n_cbs, struct event_callback **evcb, void (*cb)(struct event_callback *, void *));
+
+
+EVENT2_EXPORT_SYMBOL
+void event_active_later_(struct event *ev, int res);
+void event_active_later_nolock_(struct event *ev, int res);
+int event_callback_activate_later_nolock_(struct event_base *base,
+    struct event_callback *evcb);
+int event_callback_cancel_nolock_(struct event_base *base,
+    struct event_callback *evcb, int even_if_finalizing);
+void event_callback_init_(struct event_base *base,
+    struct event_callback *cb);
+
+/* FIXME document. */
+EVENT2_EXPORT_SYMBOL
+void event_base_add_virtual_(struct event_base *base);
+void event_base_del_virtual_(struct event_base *base);
+
+/** For debugging: unless assertions are disabled, verify the referential
+    integrity of the internal data structures of 'base'.  This operation can
+    be expensive.
+
+    Returns on success; aborts on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+void event_base_assert_ok_(struct event_base *base);
+void event_base_assert_ok_nolock_(struct event_base *base);
+
+
+/* Helper function: Call 'fn' exactly once every inserted or active event in
+ * the event_base 'base'.
+ *
+ * If fn returns 0, continue on to the next event. Otherwise, return the same
+ * value that fn returned.
+ *
+ * Requires that 'base' be locked.
+ */
+int event_base_foreach_event_nolock_(struct event_base *base,
+    event_base_foreach_event_cb cb, void *arg);
+
+/* Cleanup function to reset debug mode during shutdown.
+ *
+ * Calling this function doesn't mean it'll be possible to re-enable
+ * debug mode if any events were added.
+ */
+void event_disable_debug_mode(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/event.c b/extra/libevent/libevent-2.1.11-stable/event.c
new file mode 100644
index 000000000000..b2ad341026a8
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/event.c
@@ -0,0 +1,4023 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+#include <sys/types.h>
+#if !defined(_WIN32) && defined(EVENT__HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <ctype.h>
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/event_compat.h"
+#include "event-internal.h"
+#include "defer-internal.h"
+#include "evthread-internal.h"
+#include "event2/thread.h"
+#include "event2/util.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "iocp-internal.h"
+#include "changelist-internal.h"
+#define HT_NO_CACHE_HASH_VALUES
+#include "ht-internal.h"
+#include "util-internal.h"
+
+
+#ifdef EVENT__HAVE_WORKING_KQUEUE
+#include "kqueue-internal.h"
+#endif
+
+#ifdef EVENT__HAVE_EVENT_PORTS
+extern const struct eventop evportops;
+#endif
+#ifdef EVENT__HAVE_SELECT
+extern const struct eventop selectops;
+#endif
+#ifdef EVENT__HAVE_POLL
+extern const struct eventop pollops;
+#endif
+#ifdef EVENT__HAVE_EPOLL
+extern const struct eventop epollops;
+#endif
+#ifdef EVENT__HAVE_WORKING_KQUEUE
+extern const struct eventop kqops;
+#endif
+#ifdef EVENT__HAVE_DEVPOLL
+extern const struct eventop devpollops;
+#endif
+#ifdef _WIN32
+extern const struct eventop win32ops;
+#endif
+
+/* Array of backends in order of preference. */
+static const struct eventop *eventops[] = {
+#ifdef EVENT__HAVE_EVENT_PORTS
+	&evportops,
+#endif
+#ifdef EVENT__HAVE_WORKING_KQUEUE
+	&kqops,
+#endif
+#ifdef EVENT__HAVE_EPOLL
+	&epollops,
+#endif
+#ifdef EVENT__HAVE_DEVPOLL
+	&devpollops,
+#endif
+#ifdef EVENT__HAVE_POLL
+	&pollops,
+#endif
+#ifdef EVENT__HAVE_SELECT
+	&selectops,
+#endif
+#ifdef _WIN32
+	&win32ops,
+#endif
+	NULL
+};
+
+/* Global state; deprecated */
+EVENT2_EXPORT_SYMBOL
+struct event_base *event_global_current_base_ = NULL;
+#define current_base event_global_current_base_
+
+/* Global state */
+
+static void *event_self_cbarg_ptr_ = NULL;
+
+/* Prototypes */
+static void	event_queue_insert_active(struct event_base *, struct event_callback *);
+static void	event_queue_insert_active_later(struct event_base *, struct event_callback *);
+static void	event_queue_insert_timeout(struct event_base *, struct event *);
+static void	event_queue_insert_inserted(struct event_base *, struct event *);
+static void	event_queue_remove_active(struct event_base *, struct event_callback *);
+static void	event_queue_remove_active_later(struct event_base *, struct event_callback *);
+static void	event_queue_remove_timeout(struct event_base *, struct event *);
+static void	event_queue_remove_inserted(struct event_base *, struct event *);
+static void event_queue_make_later_events_active(struct event_base *base);
+
+static int evthread_make_base_notifiable_nolock_(struct event_base *base);
+static int event_del_(struct event *ev, int blocking);
+
+#ifdef USE_REINSERT_TIMEOUT
+/* This code seems buggy; only turn it on if we find out what the trouble is. */
+static void	event_queue_reinsert_timeout(struct event_base *,struct event *, int was_common, int is_common, int old_timeout_idx);
+#endif
+
+static int	event_haveevents(struct event_base *);
+
+static int	event_process_active(struct event_base *);
+
+static int	timeout_next(struct event_base *, struct timeval **);
+static void	timeout_process(struct event_base *);
+
+static inline void	event_signal_closure(struct event_base *, struct event *ev);
+static inline void	event_persist_closure(struct event_base *, struct event *ev);
+
+static int	evthread_notify_base(struct event_base *base);
+
+static void insert_common_timeout_inorder(struct common_timeout_list *ctl,
+    struct event *ev);
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+/* These functions implement a hashtable of which 'struct event *' structures
+ * have been setup or added.  We don't want to trust the content of the struct
+ * event itself, since we're trying to work through cases where an event gets
+ * clobbered or freed.  Instead, we keep a hashtable indexed by the pointer.
+ */
+
+struct event_debug_entry {
+	HT_ENTRY(event_debug_entry) node;
+	const struct event *ptr;
+	unsigned added : 1;
+};
+
+static inline unsigned
+hash_debug_entry(const struct event_debug_entry *e)
+{
+	/* We need to do this silliness to convince compilers that we
+	 * honestly mean to cast e->ptr to an integer, and discard any
+	 * part of it that doesn't fit in an unsigned.
+	 */
+	unsigned u = (unsigned) ((ev_uintptr_t) e->ptr);
+	/* Our hashtable implementation is pretty sensitive to low bits,
+	 * and every struct event is over 64 bytes in size, so we can
+	 * just say >>6. */
+	return (u >> 6);
+}
+
+static inline int
+eq_debug_entry(const struct event_debug_entry *a,
+    const struct event_debug_entry *b)
+{
+	return a->ptr == b->ptr;
+}
+
+int event_debug_mode_on_ = 0;
+
+
+#if !defined(EVENT__DISABLE_THREAD_SUPPORT) && !defined(EVENT__DISABLE_DEBUG_MODE)
+/**
+ * @brief debug mode variable which is set for any function/structure that needs
+ *        to be shared across threads (if thread support is enabled).
+ *
+ *        When and if evthreads are initialized, this variable will be evaluated,
+ *        and if set to something other than zero, this means the evthread setup 
+ *        functions were called out of order.
+ *
+ *        See: "Locks and threading" in the documentation.
+ */
+int event_debug_created_threadable_ctx_ = 0;
+#endif
+
+/* Set if it's too late to enable event_debug_mode. */
+static int event_debug_mode_too_late = 0;
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+static void *event_debug_map_lock_ = NULL;
+#endif
+static HT_HEAD(event_debug_map, event_debug_entry) global_debug_map =
+	HT_INITIALIZER();
+
+HT_PROTOTYPE(event_debug_map, event_debug_entry, node, hash_debug_entry,
+    eq_debug_entry)
+HT_GENERATE(event_debug_map, event_debug_entry, node, hash_debug_entry,
+    eq_debug_entry, 0.5, mm_malloc, mm_realloc, mm_free)
+
+/* record that ev is now setup (that is, ready for an add) */
+static void event_debug_note_setup_(const struct event *ev)
+{
+	struct event_debug_entry *dent, find;
+
+	if (!event_debug_mode_on_)
+		goto out;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_FIND(event_debug_map, &global_debug_map, &find);
+	if (dent) {
+		dent->added = 0;
+	} else {
+		dent = mm_malloc(sizeof(*dent));
+		if (!dent)
+			event_err(1,
+			    "Out of memory in debugging code");
+		dent->ptr = ev;
+		dent->added = 0;
+		HT_INSERT(event_debug_map, &global_debug_map, dent);
+	}
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+
+out:
+	event_debug_mode_too_late = 1;
+}
+/* record that ev is no longer setup */
+static void event_debug_note_teardown_(const struct event *ev)
+{
+	struct event_debug_entry *dent, find;
+
+	if (!event_debug_mode_on_)
+		goto out;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_REMOVE(event_debug_map, &global_debug_map, &find);
+	if (dent)
+		mm_free(dent);
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+
+out:
+	event_debug_mode_too_late = 1;
+}
+/* Macro: record that ev is now added */
+static void event_debug_note_add_(const struct event *ev)
+{
+	struct event_debug_entry *dent,find;
+
+	if (!event_debug_mode_on_)
+		goto out;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_FIND(event_debug_map, &global_debug_map, &find);
+	if (dent) {
+		dent->added = 1;
+	} else {
+		event_errx(EVENT_ERR_ABORT_,
+		    "%s: noting an add on a non-setup event %p"
+		    " (events: 0x%x, fd: "EV_SOCK_FMT
+		    ", flags: 0x%x)",
+		    __func__, ev, ev->ev_events,
+		    EV_SOCK_ARG(ev->ev_fd), ev->ev_flags);
+	}
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+
+out:
+	event_debug_mode_too_late = 1;
+}
+/* record that ev is no longer added */
+static void event_debug_note_del_(const struct event *ev)
+{
+	struct event_debug_entry *dent, find;
+
+	if (!event_debug_mode_on_)
+		goto out;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_FIND(event_debug_map, &global_debug_map, &find);
+	if (dent) {
+		dent->added = 0;
+	} else {
+		event_errx(EVENT_ERR_ABORT_,
+		    "%s: noting a del on a non-setup event %p"
+		    " (events: 0x%x, fd: "EV_SOCK_FMT
+		    ", flags: 0x%x)",
+		    __func__, ev, ev->ev_events,
+		    EV_SOCK_ARG(ev->ev_fd), ev->ev_flags);
+	}
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+
+out:
+	event_debug_mode_too_late = 1;
+}
+/* assert that ev is setup (i.e., okay to add or inspect) */
+static void event_debug_assert_is_setup_(const struct event *ev)
+{
+	struct event_debug_entry *dent, find;
+
+	if (!event_debug_mode_on_)
+		return;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_FIND(event_debug_map, &global_debug_map, &find);
+	if (!dent) {
+		event_errx(EVENT_ERR_ABORT_,
+		    "%s called on a non-initialized event %p"
+		    " (events: 0x%x, fd: "EV_SOCK_FMT
+		    ", flags: 0x%x)",
+		    __func__, ev, ev->ev_events,
+		    EV_SOCK_ARG(ev->ev_fd), ev->ev_flags);
+	}
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+}
+/* assert that ev is not added (i.e., okay to tear down or set up again) */
+static void event_debug_assert_not_added_(const struct event *ev)
+{
+	struct event_debug_entry *dent, find;
+
+	if (!event_debug_mode_on_)
+		return;
+
+	find.ptr = ev;
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	dent = HT_FIND(event_debug_map, &global_debug_map, &find);
+	if (dent && dent->added) {
+		event_errx(EVENT_ERR_ABORT_,
+		    "%s called on an already added event %p"
+		    " (events: 0x%x, fd: "EV_SOCK_FMT", "
+		    "flags: 0x%x)",
+		    __func__, ev, ev->ev_events,
+		    EV_SOCK_ARG(ev->ev_fd), ev->ev_flags);
+	}
+	EVLOCK_UNLOCK(event_debug_map_lock_, 0);
+}
+static void event_debug_assert_socket_nonblocking_(evutil_socket_t fd)
+{
+	if (!event_debug_mode_on_)
+		return;
+	if (fd < 0)
+		return;
+
+#ifndef _WIN32
+	{
+		int flags;
+		if ((flags = fcntl(fd, F_GETFL, NULL)) >= 0) {
+			EVUTIL_ASSERT(flags & O_NONBLOCK);
+		}
+	}
+#endif
+}
+#else
+static void event_debug_note_setup_(const struct event *ev) { (void)ev; }
+static void event_debug_note_teardown_(const struct event *ev) { (void)ev; }
+static void event_debug_note_add_(const struct event *ev) { (void)ev; }
+static void event_debug_note_del_(const struct event *ev) { (void)ev; }
+static void event_debug_assert_is_setup_(const struct event *ev) { (void)ev; }
+static void event_debug_assert_not_added_(const struct event *ev) { (void)ev; }
+static void event_debug_assert_socket_nonblocking_(evutil_socket_t fd) { (void)fd; }
+#endif
+
+#define EVENT_BASE_ASSERT_LOCKED(base)		\
+	EVLOCK_ASSERT_LOCKED((base)->th_base_lock)
+
+/* How often (in seconds) do we check for changes in wall clock time relative
+ * to monotonic time?  Set this to -1 for 'never.' */
+#define CLOCK_SYNC_INTERVAL 5
+
+/** Set 'tp' to the current time according to 'base'.  We must hold the lock
+ * on 'base'.  If there is a cached time, return it.  Otherwise, use
+ * clock_gettime or gettimeofday as appropriate to find out the right time.
+ * Return 0 on success, -1 on failure.
+ */
+static int
+gettime(struct event_base *base, struct timeval *tp)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (base->tv_cache.tv_sec) {
+		*tp = base->tv_cache;
+		return (0);
+	}
+
+	if (evutil_gettime_monotonic_(&base->monotonic_timer, tp) == -1) {
+		return -1;
+	}
+
+	if (base->last_updated_clock_diff + CLOCK_SYNC_INTERVAL
+	    < tp->tv_sec) {
+		struct timeval tv;
+		evutil_gettimeofday(&tv,NULL);
+		evutil_timersub(&tv, tp, &base->tv_clock_diff);
+		base->last_updated_clock_diff = tp->tv_sec;
+	}
+
+	return 0;
+}
+
+int
+event_base_gettimeofday_cached(struct event_base *base, struct timeval *tv)
+{
+	int r;
+	if (!base) {
+		base = current_base;
+		if (!current_base)
+			return evutil_gettimeofday(tv, NULL);
+	}
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	if (base->tv_cache.tv_sec == 0) {
+		r = evutil_gettimeofday(tv, NULL);
+	} else {
+		evutil_timeradd(&base->tv_cache, &base->tv_clock_diff, tv);
+		r = 0;
+	}
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+/** Make 'base' have no current cached time. */
+static inline void
+clear_time_cache(struct event_base *base)
+{
+	base->tv_cache.tv_sec = 0;
+}
+
+/** Replace the cached time in 'base' with the current time. */
+static inline void
+update_time_cache(struct event_base *base)
+{
+	base->tv_cache.tv_sec = 0;
+	if (!(base->flags & EVENT_BASE_FLAG_NO_CACHE_TIME))
+	    gettime(base, &base->tv_cache);
+}
+
+int
+event_base_update_cache_time(struct event_base *base)
+{
+
+	if (!base) {
+		base = current_base;
+		if (!current_base)
+			return -1;
+	}
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	if (base->running_loop)
+		update_time_cache(base);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return 0;
+}
+
+static inline struct event *
+event_callback_to_event(struct event_callback *evcb)
+{
+	EVUTIL_ASSERT((evcb->evcb_flags & EVLIST_INIT));
+	return EVUTIL_UPCAST(evcb, struct event, ev_evcallback);
+}
+
+static inline struct event_callback *
+event_to_event_callback(struct event *ev)
+{
+	return &ev->ev_evcallback;
+}
+
+struct event_base *
+event_init(void)
+{
+	struct event_base *base = event_base_new_with_config(NULL);
+
+	if (base == NULL) {
+		event_errx(1, "%s: Unable to construct event_base", __func__);
+		return NULL;
+	}
+
+	current_base = base;
+
+	return (base);
+}
+
+struct event_base *
+event_base_new(void)
+{
+	struct event_base *base = NULL;
+	struct event_config *cfg = event_config_new();
+	if (cfg) {
+		base = event_base_new_with_config(cfg);
+		event_config_free(cfg);
+	}
+	return base;
+}
+
+/** Return true iff 'method' is the name of a method that 'cfg' tells us to
+ * avoid. */
+static int
+event_config_is_avoided_method(const struct event_config *cfg,
+    const char *method)
+{
+	struct event_config_entry *entry;
+
+	TAILQ_FOREACH(entry, &cfg->entries, next) {
+		if (entry->avoid_method != NULL &&
+		    strcmp(entry->avoid_method, method) == 0)
+			return (1);
+	}
+
+	return (0);
+}
+
+/** Return true iff 'method' is disabled according to the environment. */
+static int
+event_is_method_disabled(const char *name)
+{
+	char environment[64];
+	int i;
+
+	evutil_snprintf(environment, sizeof(environment), "EVENT_NO%s", name);
+	for (i = 8; environment[i] != '\0'; ++i)
+		environment[i] = EVUTIL_TOUPPER_(environment[i]);
+	/* Note that evutil_getenv_() ignores the environment entirely if
+	 * we're setuid */
+	return (evutil_getenv_(environment) != NULL);
+}
+
+int
+event_base_get_features(const struct event_base *base)
+{
+	return base->evsel->features;
+}
+
+void
+event_enable_debug_mode(void)
+{
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_mode_on_)
+		event_errx(1, "%s was called twice!", __func__);
+	if (event_debug_mode_too_late)
+		event_errx(1, "%s must be called *before* creating any events "
+		    "or event_bases",__func__);
+
+	event_debug_mode_on_ = 1;
+
+	HT_INIT(event_debug_map, &global_debug_map);
+#endif
+}
+
+void
+event_disable_debug_mode(void)
+{
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	struct event_debug_entry **ent, *victim;
+
+	EVLOCK_LOCK(event_debug_map_lock_, 0);
+	for (ent = HT_START(event_debug_map, &global_debug_map); ent; ) {
+		victim = *ent;
+		ent = HT_NEXT_RMV(event_debug_map, &global_debug_map, ent);
+		mm_free(victim);
+	}
+	HT_CLEAR(event_debug_map, &global_debug_map);
+	EVLOCK_UNLOCK(event_debug_map_lock_ , 0);
+
+	event_debug_mode_on_  = 0;
+#endif
+}
+
+struct event_base *
+event_base_new_with_config(const struct event_config *cfg)
+{
+	int i;
+	struct event_base *base;
+	int should_check_environment;
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	event_debug_mode_too_late = 1;
+#endif
+
+	if ((base = mm_calloc(1, sizeof(struct event_base))) == NULL) {
+		event_warn("%s: calloc", __func__);
+		return NULL;
+	}
+
+	if (cfg)
+		base->flags = cfg->flags;
+
+	should_check_environment =
+	    !(cfg && (cfg->flags & EVENT_BASE_FLAG_IGNORE_ENV));
+
+	{
+		struct timeval tmp;
+		int precise_time =
+		    cfg && (cfg->flags & EVENT_BASE_FLAG_PRECISE_TIMER);
+		int flags;
+		if (should_check_environment && !precise_time) {
+			precise_time = evutil_getenv_("EVENT_PRECISE_TIMER") != NULL;
+			if (precise_time) {
+				base->flags |= EVENT_BASE_FLAG_PRECISE_TIMER;
+			}
+		}
+		flags = precise_time ? EV_MONOT_PRECISE : 0;
+		evutil_configure_monotonic_time_(&base->monotonic_timer, flags);
+
+		gettime(base, &tmp);
+	}
+
+	min_heap_ctor_(&base->timeheap);
+
+	base->sig.ev_signal_pair[0] = -1;
+	base->sig.ev_signal_pair[1] = -1;
+	base->th_notify_fd[0] = -1;
+	base->th_notify_fd[1] = -1;
+
+	TAILQ_INIT(&base->active_later_queue);
+
+	evmap_io_initmap_(&base->io);
+	evmap_signal_initmap_(&base->sigmap);
+	event_changelist_init_(&base->changelist);
+
+	base->evbase = NULL;
+
+	if (cfg) {
+		memcpy(&base->max_dispatch_time,
+		    &cfg->max_dispatch_interval, sizeof(struct timeval));
+		base->limit_callbacks_after_prio =
+		    cfg->limit_callbacks_after_prio;
+	} else {
+		base->max_dispatch_time.tv_sec = -1;
+		base->limit_callbacks_after_prio = 1;
+	}
+	if (cfg && cfg->max_dispatch_callbacks >= 0) {
+		base->max_dispatch_callbacks = cfg->max_dispatch_callbacks;
+	} else {
+		base->max_dispatch_callbacks = INT_MAX;
+	}
+	if (base->max_dispatch_callbacks == INT_MAX &&
+	    base->max_dispatch_time.tv_sec == -1)
+		base->limit_callbacks_after_prio = INT_MAX;
+
+	for (i = 0; eventops[i] && !base->evbase; i++) {
+		if (cfg != NULL) {
+			/* determine if this backend should be avoided */
+			if (event_config_is_avoided_method(cfg,
+				eventops[i]->name))
+				continue;
+			if ((eventops[i]->features & cfg->require_features)
+			    != cfg->require_features)
+				continue;
+		}
+
+		/* also obey the environment variables */
+		if (should_check_environment &&
+		    event_is_method_disabled(eventops[i]->name))
+			continue;
+
+		base->evsel = eventops[i];
+
+		base->evbase = base->evsel->init(base);
+	}
+
+	if (base->evbase == NULL) {
+		event_warnx("%s: no event mechanism available",
+		    __func__);
+		base->evsel = NULL;
+		event_base_free(base);
+		return NULL;
+	}
+
+	if (evutil_getenv_("EVENT_SHOW_METHOD"))
+		event_msgx("libevent using: %s", base->evsel->name);
+
+	/* allocate a single active event queue */
+	if (event_base_priority_init(base, 1) < 0) {
+		event_base_free(base);
+		return NULL;
+	}
+
+	/* prepare for threading */
+
+#if !defined(EVENT__DISABLE_THREAD_SUPPORT) && !defined(EVENT__DISABLE_DEBUG_MODE)
+	event_debug_created_threadable_ctx_ = 1;
+#endif
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (EVTHREAD_LOCKING_ENABLED() &&
+	    (!cfg || !(cfg->flags & EVENT_BASE_FLAG_NOLOCK))) {
+		int r;
+		EVTHREAD_ALLOC_LOCK(base->th_base_lock, 0);
+		EVTHREAD_ALLOC_COND(base->current_event_cond);
+		r = evthread_make_base_notifiable(base);
+		if (r<0) {
+			event_warnx("%s: Unable to make base notifiable.", __func__);
+			event_base_free(base);
+			return NULL;
+		}
+	}
+#endif
+
+#ifdef _WIN32
+	if (cfg && (cfg->flags & EVENT_BASE_FLAG_STARTUP_IOCP))
+		event_base_start_iocp_(base, cfg->n_cpus_hint);
+#endif
+
+	return (base);
+}
+
+int
+event_base_start_iocp_(struct event_base *base, int n_cpus)
+{
+#ifdef _WIN32
+	if (base->iocp)
+		return 0;
+	base->iocp = event_iocp_port_launch_(n_cpus);
+	if (!base->iocp) {
+		event_warnx("%s: Couldn't launch IOCP", __func__);
+		return -1;
+	}
+	return 0;
+#else
+	return -1;
+#endif
+}
+
+void
+event_base_stop_iocp_(struct event_base *base)
+{
+#ifdef _WIN32
+	int rv;
+
+	if (!base->iocp)
+		return;
+	rv = event_iocp_shutdown_(base->iocp, -1);
+	EVUTIL_ASSERT(rv >= 0);
+	base->iocp = NULL;
+#endif
+}
+
+static int
+event_base_cancel_single_callback_(struct event_base *base,
+    struct event_callback *evcb,
+    int run_finalizers)
+{
+	int result = 0;
+
+	if (evcb->evcb_flags & EVLIST_INIT) {
+		struct event *ev = event_callback_to_event(evcb);
+		if (!(ev->ev_flags & EVLIST_INTERNAL)) {
+			event_del_(ev, EVENT_DEL_EVEN_IF_FINALIZING);
+			result = 1;
+		}
+	} else {
+		EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+		event_callback_cancel_nolock_(base, evcb, 1);
+		EVBASE_RELEASE_LOCK(base, th_base_lock);
+		result = 1;
+	}
+
+	if (run_finalizers && (evcb->evcb_flags & EVLIST_FINALIZING)) {
+		switch (evcb->evcb_closure) {
+		case EV_CLOSURE_EVENT_FINALIZE:
+		case EV_CLOSURE_EVENT_FINALIZE_FREE: {
+			struct event *ev = event_callback_to_event(evcb);
+			ev->ev_evcallback.evcb_cb_union.evcb_evfinalize(ev, ev->ev_arg);
+			if (evcb->evcb_closure == EV_CLOSURE_EVENT_FINALIZE_FREE)
+				mm_free(ev);
+			break;
+		}
+		case EV_CLOSURE_CB_FINALIZE:
+			evcb->evcb_cb_union.evcb_cbfinalize(evcb, evcb->evcb_arg);
+			break;
+		default:
+			break;
+		}
+	}
+	return result;
+}
+
+static int event_base_free_queues_(struct event_base *base, int run_finalizers)
+{
+	int deleted = 0, i;
+
+	for (i = 0; i < base->nactivequeues; ++i) {
+		struct event_callback *evcb, *next;
+		for (evcb = TAILQ_FIRST(&base->activequeues[i]); evcb; ) {
+			next = TAILQ_NEXT(evcb, evcb_active_next);
+			deleted += event_base_cancel_single_callback_(base, evcb, run_finalizers);
+			evcb = next;
+		}
+	}
+
+	{
+		struct event_callback *evcb;
+		while ((evcb = TAILQ_FIRST(&base->active_later_queue))) {
+			deleted += event_base_cancel_single_callback_(base, evcb, run_finalizers);
+		}
+	}
+
+	return deleted;
+}
+
+static void
+event_base_free_(struct event_base *base, int run_finalizers)
+{
+	int i, n_deleted=0;
+	struct event *ev;
+	/* XXXX grab the lock? If there is contention when one thread frees
+	 * the base, then the contending thread will be very sad soon. */
+
+	/* event_base_free(NULL) is how to free the current_base if we
+	 * made it with event_init and forgot to hold a reference to it. */
+	if (base == NULL && current_base)
+		base = current_base;
+	/* Don't actually free NULL. */
+	if (base == NULL) {
+		event_warnx("%s: no base to free", __func__);
+		return;
+	}
+	/* XXX(niels) - check for internal events first */
+
+#ifdef _WIN32
+	event_base_stop_iocp_(base);
+#endif
+
+	/* threading fds if we have them */
+	if (base->th_notify_fd[0] != -1) {
+		event_del(&base->th_notify);
+		EVUTIL_CLOSESOCKET(base->th_notify_fd[0]);
+		if (base->th_notify_fd[1] != -1)
+			EVUTIL_CLOSESOCKET(base->th_notify_fd[1]);
+		base->th_notify_fd[0] = -1;
+		base->th_notify_fd[1] = -1;
+		event_debug_unassign(&base->th_notify);
+	}
+
+	/* Delete all non-internal events. */
+	evmap_delete_all_(base);
+
+	while ((ev = min_heap_top_(&base->timeheap)) != NULL) {
+		event_del(ev);
+		++n_deleted;
+	}
+	for (i = 0; i < base->n_common_timeouts; ++i) {
+		struct common_timeout_list *ctl =
+		    base->common_timeout_queues[i];
+		event_del(&ctl->timeout_event); /* Internal; doesn't count */
+		event_debug_unassign(&ctl->timeout_event);
+		for (ev = TAILQ_FIRST(&ctl->events); ev; ) {
+			struct event *next = TAILQ_NEXT(ev,
+			    ev_timeout_pos.ev_next_with_common_timeout);
+			if (!(ev->ev_flags & EVLIST_INTERNAL)) {
+				event_del(ev);
+				++n_deleted;
+			}
+			ev = next;
+		}
+		mm_free(ctl);
+	}
+	if (base->common_timeout_queues)
+		mm_free(base->common_timeout_queues);
+
+	for (;;) {
+		/* For finalizers we can register yet another finalizer out from
+		 * finalizer, and iff finalizer will be in active_later_queue we can
+		 * add finalizer to activequeues, and we will have events in
+		 * activequeues after this function returns, which is not what we want
+		 * (we even have an assertion for this).
+		 *
+		 * A simple case is bufferevent with underlying (i.e. filters).
+		 */
+		int i = event_base_free_queues_(base, run_finalizers);
+		event_debug(("%s: %d events freed", __func__, i));
+		if (!i) {
+			break;
+		}
+		n_deleted += i;
+	}
+
+	if (n_deleted)
+		event_debug(("%s: %d events were still set in base",
+			__func__, n_deleted));
+
+	while (LIST_FIRST(&base->once_events)) {
+		struct event_once *eonce = LIST_FIRST(&base->once_events);
+		LIST_REMOVE(eonce, next_once);
+		mm_free(eonce);
+	}
+
+	if (base->evsel != NULL && base->evsel->dealloc != NULL)
+		base->evsel->dealloc(base);
+
+	for (i = 0; i < base->nactivequeues; ++i)
+		EVUTIL_ASSERT(TAILQ_EMPTY(&base->activequeues[i]));
+
+	EVUTIL_ASSERT(min_heap_empty_(&base->timeheap));
+	min_heap_dtor_(&base->timeheap);
+
+	mm_free(base->activequeues);
+
+	evmap_io_clear_(&base->io);
+	evmap_signal_clear_(&base->sigmap);
+	event_changelist_freemem_(&base->changelist);
+
+	EVTHREAD_FREE_LOCK(base->th_base_lock, 0);
+	EVTHREAD_FREE_COND(base->current_event_cond);
+
+	/* If we're freeing current_base, there won't be a current_base. */
+	if (base == current_base)
+		current_base = NULL;
+	mm_free(base);
+}
+
+void
+event_base_free_nofinalize(struct event_base *base)
+{
+	event_base_free_(base, 0);
+}
+
+void
+event_base_free(struct event_base *base)
+{
+	event_base_free_(base, 1);
+}
+
+/* Fake eventop; used to disable the backend temporarily inside event_reinit
+ * so that we can call event_del() on an event without telling the backend.
+ */
+static int
+nil_backend_del(struct event_base *b, evutil_socket_t fd, short old,
+    short events, void *fdinfo)
+{
+	return 0;
+}
+const struct eventop nil_eventop = {
+	"nil",
+	NULL, /* init: unused. */
+	NULL, /* add: unused. */
+	nil_backend_del, /* del: used, so needs to be killed. */
+	NULL, /* dispatch: unused. */
+	NULL, /* dealloc: unused. */
+	0, 0, 0
+};
+
+/* reinitialize the event base after a fork */
+int
+event_reinit(struct event_base *base)
+{
+	const struct eventop *evsel;
+	int res = 0;
+	int was_notifiable = 0;
+	int had_signal_added = 0;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (base->running_loop) {
+		event_warnx("%s: forked from the event_loop.", __func__);
+		res = -1;
+		goto done;
+	}
+
+	evsel = base->evsel;
+
+	/* check if this event mechanism requires reinit on the backend */
+	if (evsel->need_reinit) {
+		/* We're going to call event_del() on our notify events (the
+		 * ones that tell about signals and wakeup events).  But we
+		 * don't actually want to tell the backend to change its
+		 * state, since it might still share some resource (a kqueue,
+		 * an epoll fd) with the parent process, and we don't want to
+		 * delete the fds from _that_ backend, we temporarily stub out
+		 * the evsel with a replacement.
+		 */
+		base->evsel = &nil_eventop;
+	}
+
+	/* We need to re-create a new signal-notification fd and a new
+	 * thread-notification fd.  Otherwise, we'll still share those with
+	 * the parent process, which would make any notification sent to them
+	 * get received by one or both of the event loops, more or less at
+	 * random.
+	 */
+	if (base->sig.ev_signal_added) {
+		event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
+		event_debug_unassign(&base->sig.ev_signal);
+		memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
+		had_signal_added = 1;
+		base->sig.ev_signal_added = 0;
+	}
+	if (base->sig.ev_signal_pair[0] != -1)
+		EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
+	if (base->sig.ev_signal_pair[1] != -1)
+		EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+	if (base->th_notify_fn != NULL) {
+		was_notifiable = 1;
+		base->th_notify_fn = NULL;
+	}
+	if (base->th_notify_fd[0] != -1) {
+		event_del_nolock_(&base->th_notify, EVENT_DEL_AUTOBLOCK);
+		EVUTIL_CLOSESOCKET(base->th_notify_fd[0]);
+		if (base->th_notify_fd[1] != -1)
+			EVUTIL_CLOSESOCKET(base->th_notify_fd[1]);
+		base->th_notify_fd[0] = -1;
+		base->th_notify_fd[1] = -1;
+		event_debug_unassign(&base->th_notify);
+	}
+
+	/* Replace the original evsel. */
+        base->evsel = evsel;
+
+	if (evsel->need_reinit) {
+		/* Reconstruct the backend through brute-force, so that we do
+		 * not share any structures with the parent process. For some
+		 * backends, this is necessary: epoll and kqueue, for
+		 * instance, have events associated with a kernel
+		 * structure. If didn't reinitialize, we'd share that
+		 * structure with the parent process, and any changes made by
+		 * the parent would affect our backend's behavior (and vice
+		 * versa).
+		 */
+		if (base->evsel->dealloc != NULL)
+			base->evsel->dealloc(base);
+		base->evbase = evsel->init(base);
+		if (base->evbase == NULL) {
+			event_errx(1,
+			   "%s: could not reinitialize event mechanism",
+			   __func__);
+			res = -1;
+			goto done;
+		}
+
+		/* Empty out the changelist (if any): we are starting from a
+		 * blank slate. */
+		event_changelist_freemem_(&base->changelist);
+
+		/* Tell the event maps to re-inform the backend about all
+		 * pending events. This will make the signal notification
+		 * event get re-created if necessary. */
+		if (evmap_reinit_(base) < 0)
+			res = -1;
+	} else {
+		res = evsig_init_(base);
+		if (res == 0 && had_signal_added) {
+			res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
+			if (res == 0)
+				base->sig.ev_signal_added = 1;
+		}
+	}
+
+	/* If we were notifiable before, and nothing just exploded, become
+	 * notifiable again. */
+	if (was_notifiable && res == 0)
+		res = evthread_make_base_notifiable_nolock_(base);
+
+done:
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return (res);
+}
+
+/* Get the monotonic time for this event_base' timer */
+int
+event_gettime_monotonic(struct event_base *base, struct timeval *tv)
+{
+  int rv = -1;
+
+  if (base && tv) {
+    EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+    rv = evutil_gettime_monotonic_(&(base->monotonic_timer), tv);
+    EVBASE_RELEASE_LOCK(base, th_base_lock);
+  }
+
+  return rv;
+}
+
+const char **
+event_get_supported_methods(void)
+{
+	static const char **methods = NULL;
+	const struct eventop **method;
+	const char **tmp;
+	int i = 0, k;
+
+	/* count all methods */
+	for (method = &eventops[0]; *method != NULL; ++method) {
+		++i;
+	}
+
+	/* allocate one more than we need for the NULL pointer */
+	tmp = mm_calloc((i + 1), sizeof(char *));
+	if (tmp == NULL)
+		return (NULL);
+
+	/* populate the array with the supported methods */
+	for (k = 0, i = 0; eventops[k] != NULL; ++k) {
+		tmp[i++] = eventops[k]->name;
+	}
+	tmp[i] = NULL;
+
+	if (methods != NULL)
+		mm_free((char**)methods);
+
+	methods = tmp;
+
+	return (methods);
+}
+
+struct event_config *
+event_config_new(void)
+{
+	struct event_config *cfg = mm_calloc(1, sizeof(*cfg));
+
+	if (cfg == NULL)
+		return (NULL);
+
+	TAILQ_INIT(&cfg->entries);
+	cfg->max_dispatch_interval.tv_sec = -1;
+	cfg->max_dispatch_callbacks = INT_MAX;
+	cfg->limit_callbacks_after_prio = 1;
+
+	return (cfg);
+}
+
+static void
+event_config_entry_free(struct event_config_entry *entry)
+{
+	if (entry->avoid_method != NULL)
+		mm_free((char *)entry->avoid_method);
+	mm_free(entry);
+}
+
+void
+event_config_free(struct event_config *cfg)
+{
+	struct event_config_entry *entry;
+
+	while ((entry = TAILQ_FIRST(&cfg->entries)) != NULL) {
+		TAILQ_REMOVE(&cfg->entries, entry, next);
+		event_config_entry_free(entry);
+	}
+	mm_free(cfg);
+}
+
+int
+event_config_set_flag(struct event_config *cfg, int flag)
+{
+	if (!cfg)
+		return -1;
+	cfg->flags |= flag;
+	return 0;
+}
+
+int
+event_config_avoid_method(struct event_config *cfg, const char *method)
+{
+	struct event_config_entry *entry = mm_malloc(sizeof(*entry));
+	if (entry == NULL)
+		return (-1);
+
+	if ((entry->avoid_method = mm_strdup(method)) == NULL) {
+		mm_free(entry);
+		return (-1);
+	}
+
+	TAILQ_INSERT_TAIL(&cfg->entries, entry, next);
+
+	return (0);
+}
+
+int
+event_config_require_features(struct event_config *cfg,
+    int features)
+{
+	if (!cfg)
+		return (-1);
+	cfg->require_features = features;
+	return (0);
+}
+
+int
+event_config_set_num_cpus_hint(struct event_config *cfg, int cpus)
+{
+	if (!cfg)
+		return (-1);
+	cfg->n_cpus_hint = cpus;
+	return (0);
+}
+
+int
+event_config_set_max_dispatch_interval(struct event_config *cfg,
+    const struct timeval *max_interval, int max_callbacks, int min_priority)
+{
+	if (max_interval)
+		memcpy(&cfg->max_dispatch_interval, max_interval,
+		    sizeof(struct timeval));
+	else
+		cfg->max_dispatch_interval.tv_sec = -1;
+	cfg->max_dispatch_callbacks =
+	    max_callbacks >= 0 ? max_callbacks : INT_MAX;
+	if (min_priority < 0)
+		min_priority = 0;
+	cfg->limit_callbacks_after_prio = min_priority;
+	return (0);
+}
+
+int
+event_priority_init(int npriorities)
+{
+	return event_base_priority_init(current_base, npriorities);
+}
+
+int
+event_base_priority_init(struct event_base *base, int npriorities)
+{
+	int i, r;
+	r = -1;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (N_ACTIVE_CALLBACKS(base) || npriorities < 1
+	    || npriorities >= EVENT_MAX_PRIORITIES)
+		goto err;
+
+	if (npriorities == base->nactivequeues)
+		goto ok;
+
+	if (base->nactivequeues) {
+		mm_free(base->activequeues);
+		base->nactivequeues = 0;
+	}
+
+	/* Allocate our priority queues */
+	base->activequeues = (struct evcallback_list *)
+	  mm_calloc(npriorities, sizeof(struct evcallback_list));
+	if (base->activequeues == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto err;
+	}
+	base->nactivequeues = npriorities;
+
+	for (i = 0; i < base->nactivequeues; ++i) {
+		TAILQ_INIT(&base->activequeues[i]);
+	}
+
+ok:
+	r = 0;
+err:
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return (r);
+}
+
+int
+event_base_get_npriorities(struct event_base *base)
+{
+
+	int n;
+	if (base == NULL)
+		base = current_base;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	n = base->nactivequeues;
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return (n);
+}
+
+int
+event_base_get_num_events(struct event_base *base, unsigned int type)
+{
+	int r = 0;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (type & EVENT_BASE_COUNT_ACTIVE)
+		r += base->event_count_active;
+
+	if (type & EVENT_BASE_COUNT_VIRTUAL)
+		r += base->virtual_event_count;
+
+	if (type & EVENT_BASE_COUNT_ADDED)
+		r += base->event_count;
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	return r;
+}
+
+int
+event_base_get_max_events(struct event_base *base, unsigned int type, int clear)
+{
+	int r = 0;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (type & EVENT_BASE_COUNT_ACTIVE) {
+		r += base->event_count_active_max;
+		if (clear)
+			base->event_count_active_max = 0;
+	}
+
+	if (type & EVENT_BASE_COUNT_VIRTUAL) {
+		r += base->virtual_event_count_max;
+		if (clear)
+			base->virtual_event_count_max = 0;
+	}
+
+	if (type & EVENT_BASE_COUNT_ADDED) {
+		r += base->event_count_max;
+		if (clear)
+			base->event_count_max = 0;
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	return r;
+}
+
+/* Returns true iff we're currently watching any events. */
+static int
+event_haveevents(struct event_base *base)
+{
+	/* Caller must hold th_base_lock */
+	return (base->virtual_event_count > 0 || base->event_count > 0);
+}
+
+/* "closure" function called when processing active signal events */
+static inline void
+event_signal_closure(struct event_base *base, struct event *ev)
+{
+	short ncalls;
+	int should_break;
+
+	/* Allows deletes to work */
+	ncalls = ev->ev_ncalls;
+	if (ncalls != 0)
+		ev->ev_pncalls = &ncalls;
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	while (ncalls) {
+		ncalls--;
+		ev->ev_ncalls = ncalls;
+		if (ncalls == 0)
+			ev->ev_pncalls = NULL;
+		(*ev->ev_callback)(ev->ev_fd, ev->ev_res, ev->ev_arg);
+
+		EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+		should_break = base->event_break;
+		EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+		if (should_break) {
+			if (ncalls != 0)
+				ev->ev_pncalls = NULL;
+			return;
+		}
+	}
+}
+
+/* Common timeouts are special timeouts that are handled as queues rather than
+ * in the minheap.  This is more efficient than the minheap if we happen to
+ * know that we're going to get several thousands of timeout events all with
+ * the same timeout value.
+ *
+ * Since all our timeout handling code assumes timevals can be copied,
+ * assigned, etc, we can't use "magic pointer" to encode these common
+ * timeouts.  Searching through a list to see if every timeout is common could
+ * also get inefficient.  Instead, we take advantage of the fact that tv_usec
+ * is 32 bits long, but only uses 20 of those bits (since it can never be over
+ * 999999.)  We use the top bits to encode 4 bites of magic number, and 8 bits
+ * of index into the event_base's aray of common timeouts.
+ */
+
+#define MICROSECONDS_MASK       COMMON_TIMEOUT_MICROSECONDS_MASK
+#define COMMON_TIMEOUT_IDX_MASK 0x0ff00000
+#define COMMON_TIMEOUT_IDX_SHIFT 20
+#define COMMON_TIMEOUT_MASK     0xf0000000
+#define COMMON_TIMEOUT_MAGIC    0x50000000
+
+#define COMMON_TIMEOUT_IDX(tv) \
+	(((tv)->tv_usec & COMMON_TIMEOUT_IDX_MASK)>>COMMON_TIMEOUT_IDX_SHIFT)
+
+/** Return true iff if 'tv' is a common timeout in 'base' */
+static inline int
+is_common_timeout(const struct timeval *tv,
+    const struct event_base *base)
+{
+	int idx;
+	if ((tv->tv_usec & COMMON_TIMEOUT_MASK) != COMMON_TIMEOUT_MAGIC)
+		return 0;
+	idx = COMMON_TIMEOUT_IDX(tv);
+	return idx < base->n_common_timeouts;
+}
+
+/* True iff tv1 and tv2 have the same common-timeout index, or if neither
+ * one is a common timeout. */
+static inline int
+is_same_common_timeout(const struct timeval *tv1, const struct timeval *tv2)
+{
+	return (tv1->tv_usec & ~MICROSECONDS_MASK) ==
+	    (tv2->tv_usec & ~MICROSECONDS_MASK);
+}
+
+/** Requires that 'tv' is a common timeout.  Return the corresponding
+ * common_timeout_list. */
+static inline struct common_timeout_list *
+get_common_timeout_list(struct event_base *base, const struct timeval *tv)
+{
+	return base->common_timeout_queues[COMMON_TIMEOUT_IDX(tv)];
+}
+
+#if 0
+static inline int
+common_timeout_ok(const struct timeval *tv,
+    struct event_base *base)
+{
+	const struct timeval *expect =
+	    &get_common_timeout_list(base, tv)->duration;
+	return tv->tv_sec == expect->tv_sec &&
+	    tv->tv_usec == expect->tv_usec;
+}
+#endif
+
+/* Add the timeout for the first event in given common timeout list to the
+ * event_base's minheap. */
+static void
+common_timeout_schedule(struct common_timeout_list *ctl,
+    const struct timeval *now, struct event *head)
+{
+	struct timeval timeout = head->ev_timeout;
+	timeout.tv_usec &= MICROSECONDS_MASK;
+	event_add_nolock_(&ctl->timeout_event, &timeout, 1);
+}
+
+/* Callback: invoked when the timeout for a common timeout queue triggers.
+ * This means that (at least) the first event in that queue should be run,
+ * and the timeout should be rescheduled if there are more events. */
+static void
+common_timeout_callback(evutil_socket_t fd, short what, void *arg)
+{
+	struct timeval now;
+	struct common_timeout_list *ctl = arg;
+	struct event_base *base = ctl->base;
+	struct event *ev = NULL;
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	gettime(base, &now);
+	while (1) {
+		ev = TAILQ_FIRST(&ctl->events);
+		if (!ev || ev->ev_timeout.tv_sec > now.tv_sec ||
+		    (ev->ev_timeout.tv_sec == now.tv_sec &&
+			(ev->ev_timeout.tv_usec&MICROSECONDS_MASK) > now.tv_usec))
+			break;
+		event_del_nolock_(ev, EVENT_DEL_NOBLOCK);
+		event_active_nolock_(ev, EV_TIMEOUT, 1);
+	}
+	if (ev)
+		common_timeout_schedule(ctl, &now, ev);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+#define MAX_COMMON_TIMEOUTS 256
+
+const struct timeval *
+event_base_init_common_timeout(struct event_base *base,
+    const struct timeval *duration)
+{
+	int i;
+	struct timeval tv;
+	const struct timeval *result=NULL;
+	struct common_timeout_list *new_ctl;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	if (duration->tv_usec > 1000000) {
+		memcpy(&tv, duration, sizeof(struct timeval));
+		if (is_common_timeout(duration, base))
+			tv.tv_usec &= MICROSECONDS_MASK;
+		tv.tv_sec += tv.tv_usec / 1000000;
+		tv.tv_usec %= 1000000;
+		duration = &tv;
+	}
+	for (i = 0; i < base->n_common_timeouts; ++i) {
+		const struct common_timeout_list *ctl =
+		    base->common_timeout_queues[i];
+		if (duration->tv_sec == ctl->duration.tv_sec &&
+		    duration->tv_usec ==
+		    (ctl->duration.tv_usec & MICROSECONDS_MASK)) {
+			EVUTIL_ASSERT(is_common_timeout(&ctl->duration, base));
+			result = &ctl->duration;
+			goto done;
+		}
+	}
+	if (base->n_common_timeouts == MAX_COMMON_TIMEOUTS) {
+		event_warnx("%s: Too many common timeouts already in use; "
+		    "we only support %d per event_base", __func__,
+		    MAX_COMMON_TIMEOUTS);
+		goto done;
+	}
+	if (base->n_common_timeouts_allocated == base->n_common_timeouts) {
+		int n = base->n_common_timeouts < 16 ? 16 :
+		    base->n_common_timeouts*2;
+		struct common_timeout_list **newqueues =
+		    mm_realloc(base->common_timeout_queues,
+			n*sizeof(struct common_timeout_queue *));
+		if (!newqueues) {
+			event_warn("%s: realloc",__func__);
+			goto done;
+		}
+		base->n_common_timeouts_allocated = n;
+		base->common_timeout_queues = newqueues;
+	}
+	new_ctl = mm_calloc(1, sizeof(struct common_timeout_list));
+	if (!new_ctl) {
+		event_warn("%s: calloc",__func__);
+		goto done;
+	}
+	TAILQ_INIT(&new_ctl->events);
+	new_ctl->duration.tv_sec = duration->tv_sec;
+	new_ctl->duration.tv_usec =
+	    duration->tv_usec | COMMON_TIMEOUT_MAGIC |
+	    (base->n_common_timeouts << COMMON_TIMEOUT_IDX_SHIFT);
+	evtimer_assign(&new_ctl->timeout_event, base,
+	    common_timeout_callback, new_ctl);
+	new_ctl->timeout_event.ev_flags |= EVLIST_INTERNAL;
+	event_priority_set(&new_ctl->timeout_event, 0);
+	new_ctl->base = base;
+	base->common_timeout_queues[base->n_common_timeouts++] = new_ctl;
+	result = &new_ctl->duration;
+
+done:
+	if (result)
+		EVUTIL_ASSERT(is_common_timeout(result, base));
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return result;
+}
+
+/* Closure function invoked when we're activating a persistent event. */
+static inline void
+event_persist_closure(struct event_base *base, struct event *ev)
+{
+	void (*evcb_callback)(evutil_socket_t, short, void *);
+
+        // Other fields of *ev that must be stored before executing
+        evutil_socket_t evcb_fd;
+        short evcb_res;
+        void *evcb_arg;
+
+	/* reschedule the persistent event if we have a timeout. */
+	if (ev->ev_io_timeout.tv_sec || ev->ev_io_timeout.tv_usec) {
+		/* If there was a timeout, we want it to run at an interval of
+		 * ev_io_timeout after the last time it was _scheduled_ for,
+		 * not ev_io_timeout after _now_.  If it fired for another
+		 * reason, though, the timeout ought to start ticking _now_. */
+		struct timeval run_at, relative_to, delay, now;
+		ev_uint32_t usec_mask = 0;
+		EVUTIL_ASSERT(is_same_common_timeout(&ev->ev_timeout,
+			&ev->ev_io_timeout));
+		gettime(base, &now);
+		if (is_common_timeout(&ev->ev_timeout, base)) {
+			delay = ev->ev_io_timeout;
+			usec_mask = delay.tv_usec & ~MICROSECONDS_MASK;
+			delay.tv_usec &= MICROSECONDS_MASK;
+			if (ev->ev_res & EV_TIMEOUT) {
+				relative_to = ev->ev_timeout;
+				relative_to.tv_usec &= MICROSECONDS_MASK;
+			} else {
+				relative_to = now;
+			}
+		} else {
+			delay = ev->ev_io_timeout;
+			if (ev->ev_res & EV_TIMEOUT) {
+				relative_to = ev->ev_timeout;
+			} else {
+				relative_to = now;
+			}
+		}
+		evutil_timeradd(&relative_to, &delay, &run_at);
+		if (evutil_timercmp(&run_at, &now, <)) {
+			/* Looks like we missed at least one invocation due to
+			 * a clock jump, not running the event loop for a
+			 * while, really slow callbacks, or
+			 * something. Reschedule relative to now.
+			 */
+			evutil_timeradd(&now, &delay, &run_at);
+		}
+		run_at.tv_usec |= usec_mask;
+		event_add_nolock_(ev, &run_at, 1);
+	}
+
+	// Save our callback before we release the lock
+	evcb_callback = ev->ev_callback;
+        evcb_fd = ev->ev_fd;
+        evcb_res = ev->ev_res;
+        evcb_arg = ev->ev_arg;
+
+	// Release the lock
+ 	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	// Execute the callback
+        (evcb_callback)(evcb_fd, evcb_res, evcb_arg);
+}
+
+/*
+  Helper for event_process_active to process all the events in a single queue,
+  releasing the lock as we go.  This function requires that the lock be held
+  when it's invoked.  Returns -1 if we get a signal or an event_break that
+  means we should stop processing any active events now.  Otherwise returns
+  the number of non-internal event_callbacks that we processed.
+*/
+static int
+event_process_active_single_queue(struct event_base *base,
+    struct evcallback_list *activeq,
+    int max_to_process, const struct timeval *endtime)
+{
+	struct event_callback *evcb;
+	int count = 0;
+
+	EVUTIL_ASSERT(activeq != NULL);
+
+	for (evcb = TAILQ_FIRST(activeq); evcb; evcb = TAILQ_FIRST(activeq)) {
+		struct event *ev=NULL;
+		if (evcb->evcb_flags & EVLIST_INIT) {
+			ev = event_callback_to_event(evcb);
+
+			if (ev->ev_events & EV_PERSIST || ev->ev_flags & EVLIST_FINALIZING)
+				event_queue_remove_active(base, evcb);
+			else
+				event_del_nolock_(ev, EVENT_DEL_NOBLOCK);
+			event_debug((
+			    "event_process_active: event: %p, %s%s%scall %p",
+			    ev,
+			    ev->ev_res & EV_READ ? "EV_READ " : " ",
+			    ev->ev_res & EV_WRITE ? "EV_WRITE " : " ",
+			    ev->ev_res & EV_CLOSED ? "EV_CLOSED " : " ",
+			    ev->ev_callback));
+		} else {
+			event_queue_remove_active(base, evcb);
+			event_debug(("event_process_active: event_callback %p, "
+				"closure %d, call %p",
+				evcb, evcb->evcb_closure, evcb->evcb_cb_union.evcb_callback));
+		}
+
+		if (!(evcb->evcb_flags & EVLIST_INTERNAL))
+			++count;
+
+
+		base->current_event = evcb;
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+		base->current_event_waiters = 0;
+#endif
+
+		switch (evcb->evcb_closure) {
+		case EV_CLOSURE_EVENT_SIGNAL:
+			EVUTIL_ASSERT(ev != NULL);
+			event_signal_closure(base, ev);
+			break;
+		case EV_CLOSURE_EVENT_PERSIST:
+			EVUTIL_ASSERT(ev != NULL);
+			event_persist_closure(base, ev);
+			break;
+		case EV_CLOSURE_EVENT: {
+			void (*evcb_callback)(evutil_socket_t, short, void *);
+			short res;
+			EVUTIL_ASSERT(ev != NULL);
+			evcb_callback = *ev->ev_callback;
+			res = ev->ev_res;
+			EVBASE_RELEASE_LOCK(base, th_base_lock);
+			evcb_callback(ev->ev_fd, res, ev->ev_arg);
+		}
+		break;
+		case EV_CLOSURE_CB_SELF: {
+			void (*evcb_selfcb)(struct event_callback *, void *) = evcb->evcb_cb_union.evcb_selfcb;
+			EVBASE_RELEASE_LOCK(base, th_base_lock);
+			evcb_selfcb(evcb, evcb->evcb_arg);
+		}
+		break;
+		case EV_CLOSURE_EVENT_FINALIZE:
+		case EV_CLOSURE_EVENT_FINALIZE_FREE: {
+			void (*evcb_evfinalize)(struct event *, void *);
+			int evcb_closure = evcb->evcb_closure;
+			EVUTIL_ASSERT(ev != NULL);
+			base->current_event = NULL;
+			evcb_evfinalize = ev->ev_evcallback.evcb_cb_union.evcb_evfinalize;
+			EVUTIL_ASSERT((evcb->evcb_flags & EVLIST_FINALIZING));
+			EVBASE_RELEASE_LOCK(base, th_base_lock);
+			evcb_evfinalize(ev, ev->ev_arg);
+			event_debug_note_teardown_(ev);
+			if (evcb_closure == EV_CLOSURE_EVENT_FINALIZE_FREE)
+				mm_free(ev);
+		}
+		break;
+		case EV_CLOSURE_CB_FINALIZE: {
+			void (*evcb_cbfinalize)(struct event_callback *, void *) = evcb->evcb_cb_union.evcb_cbfinalize;
+			base->current_event = NULL;
+			EVUTIL_ASSERT((evcb->evcb_flags & EVLIST_FINALIZING));
+			EVBASE_RELEASE_LOCK(base, th_base_lock);
+			evcb_cbfinalize(evcb, evcb->evcb_arg);
+		}
+		break;
+		default:
+			EVUTIL_ASSERT(0);
+		}
+
+		EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+		base->current_event = NULL;
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+		if (base->current_event_waiters) {
+			base->current_event_waiters = 0;
+			EVTHREAD_COND_BROADCAST(base->current_event_cond);
+		}
+#endif
+
+		if (base->event_break)
+			return -1;
+		if (count >= max_to_process)
+			return count;
+		if (count && endtime) {
+			struct timeval now;
+			update_time_cache(base);
+			gettime(base, &now);
+			if (evutil_timercmp(&now, endtime, >=))
+				return count;
+		}
+		if (base->event_continue)
+			break;
+	}
+	return count;
+}
+
+/*
+ * Active events are stored in priority queues.  Lower priorities are always
+ * process before higher priorities.  Low priority events can starve high
+ * priority ones.
+ */
+
+static int
+event_process_active(struct event_base *base)
+{
+	/* Caller must hold th_base_lock */
+	struct evcallback_list *activeq = NULL;
+	int i, c = 0;
+	const struct timeval *endtime;
+	struct timeval tv;
+	const int maxcb = base->max_dispatch_callbacks;
+	const int limit_after_prio = base->limit_callbacks_after_prio;
+	if (base->max_dispatch_time.tv_sec >= 0) {
+		update_time_cache(base);
+		gettime(base, &tv);
+		evutil_timeradd(&base->max_dispatch_time, &tv, &tv);
+		endtime = &tv;
+	} else {
+		endtime = NULL;
+	}
+
+	for (i = 0; i < base->nactivequeues; ++i) {
+		if (TAILQ_FIRST(&base->activequeues[i]) != NULL) {
+			base->event_running_priority = i;
+			activeq = &base->activequeues[i];
+			if (i < limit_after_prio)
+				c = event_process_active_single_queue(base, activeq,
+				    INT_MAX, NULL);
+			else
+				c = event_process_active_single_queue(base, activeq,
+				    maxcb, endtime);
+			if (c < 0) {
+				goto done;
+			} else if (c > 0)
+				break; /* Processed a real event; do not
+					* consider lower-priority events */
+			/* If we get here, all of the events we processed
+			 * were internal.  Continue. */
+		}
+	}
+
+done:
+	base->event_running_priority = -1;
+
+	return c;
+}
+
+/*
+ * Wait continuously for events.  We exit only if no events are left.
+ */
+
+int
+event_dispatch(void)
+{
+	return (event_loop(0));
+}
+
+int
+event_base_dispatch(struct event_base *event_base)
+{
+	return (event_base_loop(event_base, 0));
+}
+
+const char *
+event_base_get_method(const struct event_base *base)
+{
+	EVUTIL_ASSERT(base);
+	return (base->evsel->name);
+}
+
+/** Callback: used to implement event_base_loopexit by telling the event_base
+ * that it's time to exit its loop. */
+static void
+event_loopexit_cb(evutil_socket_t fd, short what, void *arg)
+{
+	struct event_base *base = arg;
+	base->event_gotterm = 1;
+}
+
+int
+event_loopexit(const struct timeval *tv)
+{
+	return (event_once(-1, EV_TIMEOUT, event_loopexit_cb,
+		    current_base, tv));
+}
+
+int
+event_base_loopexit(struct event_base *event_base, const struct timeval *tv)
+{
+	return (event_base_once(event_base, -1, EV_TIMEOUT, event_loopexit_cb,
+		    event_base, tv));
+}
+
+int
+event_loopbreak(void)
+{
+	return (event_base_loopbreak(current_base));
+}
+
+int
+event_base_loopbreak(struct event_base *event_base)
+{
+	int r = 0;
+	if (event_base == NULL)
+		return (-1);
+
+	EVBASE_ACQUIRE_LOCK(event_base, th_base_lock);
+	event_base->event_break = 1;
+
+	if (EVBASE_NEED_NOTIFY(event_base)) {
+		r = evthread_notify_base(event_base);
+	} else {
+		r = (0);
+	}
+	EVBASE_RELEASE_LOCK(event_base, th_base_lock);
+	return r;
+}
+
+int
+event_base_loopcontinue(struct event_base *event_base)
+{
+	int r = 0;
+	if (event_base == NULL)
+		return (-1);
+
+	EVBASE_ACQUIRE_LOCK(event_base, th_base_lock);
+	event_base->event_continue = 1;
+
+	if (EVBASE_NEED_NOTIFY(event_base)) {
+		r = evthread_notify_base(event_base);
+	} else {
+		r = (0);
+	}
+	EVBASE_RELEASE_LOCK(event_base, th_base_lock);
+	return r;
+}
+
+int
+event_base_got_break(struct event_base *event_base)
+{
+	int res;
+	EVBASE_ACQUIRE_LOCK(event_base, th_base_lock);
+	res = event_base->event_break;
+	EVBASE_RELEASE_LOCK(event_base, th_base_lock);
+	return res;
+}
+
+int
+event_base_got_exit(struct event_base *event_base)
+{
+	int res;
+	EVBASE_ACQUIRE_LOCK(event_base, th_base_lock);
+	res = event_base->event_gotterm;
+	EVBASE_RELEASE_LOCK(event_base, th_base_lock);
+	return res;
+}
+
+/* not thread safe */
+
+int
+event_loop(int flags)
+{
+	return event_base_loop(current_base, flags);
+}
+
+int
+event_base_loop(struct event_base *base, int flags)
+{
+	const struct eventop *evsel = base->evsel;
+	struct timeval tv;
+	struct timeval *tv_p;
+	int res, done, retval = 0;
+
+	/* Grab the lock.  We will release it inside evsel.dispatch, and again
+	 * as we invoke user callbacks. */
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (base->running_loop) {
+		event_warnx("%s: reentrant invocation.  Only one event_base_loop"
+		    " can run on each event_base at once.", __func__);
+		EVBASE_RELEASE_LOCK(base, th_base_lock);
+		return -1;
+	}
+
+	base->running_loop = 1;
+
+	clear_time_cache(base);
+
+	if (base->sig.ev_signal_added && base->sig.ev_n_signals_added)
+		evsig_set_base_(base);
+
+	done = 0;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	base->th_owner_id = EVTHREAD_GET_ID();
+#endif
+
+	base->event_gotterm = base->event_break = 0;
+
+	while (!done) {
+		base->event_continue = 0;
+		base->n_deferreds_queued = 0;
+
+		/* Terminate the loop if we have been asked to */
+		if (base->event_gotterm) {
+			break;
+		}
+
+		if (base->event_break) {
+			break;
+		}
+
+		tv_p = &tv;
+		if (!N_ACTIVE_CALLBACKS(base) && !(flags & EVLOOP_NONBLOCK)) {
+			timeout_next(base, &tv_p);
+		} else {
+			/*
+			 * if we have active events, we just poll new events
+			 * without waiting.
+			 */
+			evutil_timerclear(&tv);
+		}
+
+		/* If we have no events, we just exit */
+		if (0==(flags&EVLOOP_NO_EXIT_ON_EMPTY) &&
+		    !event_haveevents(base) && !N_ACTIVE_CALLBACKS(base)) {
+			event_debug(("%s: no events registered.", __func__));
+			retval = 1;
+			goto done;
+		}
+
+		event_queue_make_later_events_active(base);
+
+		clear_time_cache(base);
+
+		res = evsel->dispatch(base, tv_p);
+
+		if (res == -1) {
+			event_debug(("%s: dispatch returned unsuccessfully.",
+				__func__));
+			retval = -1;
+			goto done;
+		}
+
+		update_time_cache(base);
+
+		timeout_process(base);
+
+		if (N_ACTIVE_CALLBACKS(base)) {
+			int n = event_process_active(base);
+			if ((flags & EVLOOP_ONCE)
+			    && N_ACTIVE_CALLBACKS(base) == 0
+			    && n != 0)
+				done = 1;
+		} else if (flags & EVLOOP_NONBLOCK)
+			done = 1;
+	}
+	event_debug(("%s: asked to terminate loop.", __func__));
+
+done:
+	clear_time_cache(base);
+	base->running_loop = 0;
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	return (retval);
+}
+
+/* One-time callback to implement event_base_once: invokes the user callback,
+ * then deletes the allocated storage */
+static void
+event_once_cb(evutil_socket_t fd, short events, void *arg)
+{
+	struct event_once *eonce = arg;
+
+	(*eonce->cb)(fd, events, eonce->arg);
+	EVBASE_ACQUIRE_LOCK(eonce->ev.ev_base, th_base_lock);
+	LIST_REMOVE(eonce, next_once);
+	EVBASE_RELEASE_LOCK(eonce->ev.ev_base, th_base_lock);
+	event_debug_unassign(&eonce->ev);
+	mm_free(eonce);
+}
+
+/* not threadsafe, event scheduled once. */
+int
+event_once(evutil_socket_t fd, short events,
+    void (*callback)(evutil_socket_t, short, void *),
+    void *arg, const struct timeval *tv)
+{
+	return event_base_once(current_base, fd, events, callback, arg, tv);
+}
+
+/* Schedules an event once */
+int
+event_base_once(struct event_base *base, evutil_socket_t fd, short events,
+    void (*callback)(evutil_socket_t, short, void *),
+    void *arg, const struct timeval *tv)
+{
+	struct event_once *eonce;
+	int res = 0;
+	int activate = 0;
+
+	/* We cannot support signals that just fire once, or persistent
+	 * events. */
+	if (events & (EV_SIGNAL|EV_PERSIST))
+		return (-1);
+
+	if ((eonce = mm_calloc(1, sizeof(struct event_once))) == NULL)
+		return (-1);
+
+	eonce->cb = callback;
+	eonce->arg = arg;
+
+	if ((events & (EV_TIMEOUT|EV_SIGNAL|EV_READ|EV_WRITE|EV_CLOSED)) == EV_TIMEOUT) {
+		evtimer_assign(&eonce->ev, base, event_once_cb, eonce);
+
+		if (tv == NULL || ! evutil_timerisset(tv)) {
+			/* If the event is going to become active immediately,
+			 * don't put it on the timeout queue.  This is one
+			 * idiom for scheduling a callback, so let's make
+			 * it fast (and order-preserving). */
+			activate = 1;
+		}
+	} else if (events & (EV_READ|EV_WRITE|EV_CLOSED)) {
+		events &= EV_READ|EV_WRITE|EV_CLOSED;
+
+		event_assign(&eonce->ev, base, fd, events, event_once_cb, eonce);
+	} else {
+		/* Bad event combination */
+		mm_free(eonce);
+		return (-1);
+	}
+
+	if (res == 0) {
+		EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+		if (activate)
+			event_active_nolock_(&eonce->ev, EV_TIMEOUT, 1);
+		else
+			res = event_add_nolock_(&eonce->ev, tv, 0);
+
+		if (res != 0) {
+			mm_free(eonce);
+			return (res);
+		} else {
+			LIST_INSERT_HEAD(&base->once_events, eonce, next_once);
+		}
+		EVBASE_RELEASE_LOCK(base, th_base_lock);
+	}
+
+	return (0);
+}
+
+int
+event_assign(struct event *ev, struct event_base *base, evutil_socket_t fd, short events, void (*callback)(evutil_socket_t, short, void *), void *arg)
+{
+	if (!base)
+		base = current_base;
+	if (arg == &event_self_cbarg_ptr_)
+		arg = ev;
+
+	if (!(events & EV_SIGNAL))
+		event_debug_assert_socket_nonblocking_(fd);
+	event_debug_assert_not_added_(ev);
+
+	ev->ev_base = base;
+
+	ev->ev_callback = callback;
+	ev->ev_arg = arg;
+	ev->ev_fd = fd;
+	ev->ev_events = events;
+	ev->ev_res = 0;
+	ev->ev_flags = EVLIST_INIT;
+	ev->ev_ncalls = 0;
+	ev->ev_pncalls = NULL;
+
+	if (events & EV_SIGNAL) {
+		if ((events & (EV_READ|EV_WRITE|EV_CLOSED)) != 0) {
+			event_warnx("%s: EV_SIGNAL is not compatible with "
+			    "EV_READ, EV_WRITE or EV_CLOSED", __func__);
+			return -1;
+		}
+		ev->ev_closure = EV_CLOSURE_EVENT_SIGNAL;
+	} else {
+		if (events & EV_PERSIST) {
+			evutil_timerclear(&ev->ev_io_timeout);
+			ev->ev_closure = EV_CLOSURE_EVENT_PERSIST;
+		} else {
+			ev->ev_closure = EV_CLOSURE_EVENT;
+		}
+	}
+
+	min_heap_elem_init_(ev);
+
+	if (base != NULL) {
+		/* by default, we put new events into the middle priority */
+		ev->ev_pri = base->nactivequeues / 2;
+	}
+
+	event_debug_note_setup_(ev);
+
+	return 0;
+}
+
+int
+event_base_set(struct event_base *base, struct event *ev)
+{
+	/* Only innocent events may be assigned to a different base */
+	if (ev->ev_flags != EVLIST_INIT)
+		return (-1);
+
+	event_debug_assert_is_setup_(ev);
+
+	ev->ev_base = base;
+	ev->ev_pri = base->nactivequeues/2;
+
+	return (0);
+}
+
+void
+event_set(struct event *ev, evutil_socket_t fd, short events,
+	  void (*callback)(evutil_socket_t, short, void *), void *arg)
+{
+	int r;
+	r = event_assign(ev, current_base, fd, events, callback, arg);
+	EVUTIL_ASSERT(r == 0);
+}
+
+void *
+event_self_cbarg(void)
+{
+	return &event_self_cbarg_ptr_;
+}
+
+struct event *
+event_base_get_running_event(struct event_base *base)
+{
+	struct event *ev = NULL;
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	if (EVBASE_IN_THREAD(base)) {
+		struct event_callback *evcb = base->current_event;
+		if (evcb->evcb_flags & EVLIST_INIT)
+			ev = event_callback_to_event(evcb);
+	}
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return ev;
+}
+
+struct event *
+event_new(struct event_base *base, evutil_socket_t fd, short events, void (*cb)(evutil_socket_t, short, void *), void *arg)
+{
+	struct event *ev;
+	ev = mm_malloc(sizeof(struct event));
+	if (ev == NULL)
+		return (NULL);
+	if (event_assign(ev, base, fd, events, cb, arg) < 0) {
+		mm_free(ev);
+		return (NULL);
+	}
+
+	return (ev);
+}
+
+void
+event_free(struct event *ev)
+{
+	/* This is disabled, so that events which have been finalized be a
+	 * valid target for event_free(). That's */
+	// event_debug_assert_is_setup_(ev);
+
+	/* make sure that this event won't be coming back to haunt us. */
+	event_del(ev);
+	event_debug_note_teardown_(ev);
+	mm_free(ev);
+
+}
+
+void
+event_debug_unassign(struct event *ev)
+{
+	event_debug_assert_not_added_(ev);
+	event_debug_note_teardown_(ev);
+
+	ev->ev_flags &= ~EVLIST_INIT;
+}
+
+#define EVENT_FINALIZE_FREE_ 0x10000
+static int
+event_finalize_nolock_(struct event_base *base, unsigned flags, struct event *ev, event_finalize_callback_fn cb)
+{
+	ev_uint8_t closure = (flags & EVENT_FINALIZE_FREE_) ?
+	    EV_CLOSURE_EVENT_FINALIZE_FREE : EV_CLOSURE_EVENT_FINALIZE;
+
+	event_del_nolock_(ev, EVENT_DEL_NOBLOCK);
+	ev->ev_closure = closure;
+	ev->ev_evcallback.evcb_cb_union.evcb_evfinalize = cb;
+	event_active_nolock_(ev, EV_FINALIZE, 1);
+	ev->ev_flags |= EVLIST_FINALIZING;
+	return 0;
+}
+
+static int
+event_finalize_impl_(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
+{
+	int r;
+	struct event_base *base = ev->ev_base;
+	if (EVUTIL_FAILURE_CHECK(!base)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return -1;
+	}
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	r = event_finalize_nolock_(base, flags, ev, cb);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+int
+event_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
+{
+	return event_finalize_impl_(flags, ev, cb);
+}
+
+int
+event_free_finalize(unsigned flags, struct event *ev, event_finalize_callback_fn cb)
+{
+	return event_finalize_impl_(flags|EVENT_FINALIZE_FREE_, ev, cb);
+}
+
+void
+event_callback_finalize_nolock_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *))
+{
+	struct event *ev = NULL;
+	if (evcb->evcb_flags & EVLIST_INIT) {
+		ev = event_callback_to_event(evcb);
+		event_del_nolock_(ev, EVENT_DEL_NOBLOCK);
+	} else {
+		event_callback_cancel_nolock_(base, evcb, 0); /*XXX can this fail?*/
+	}
+
+	evcb->evcb_closure = EV_CLOSURE_CB_FINALIZE;
+	evcb->evcb_cb_union.evcb_cbfinalize = cb;
+	event_callback_activate_nolock_(base, evcb); /* XXX can this really fail?*/
+	evcb->evcb_flags |= EVLIST_FINALIZING;
+}
+
+void
+event_callback_finalize_(struct event_base *base, unsigned flags, struct event_callback *evcb, void (*cb)(struct event_callback *, void *))
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	event_callback_finalize_nolock_(base, flags, evcb, cb);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+/** Internal: Finalize all of the n_cbs callbacks in evcbs.  The provided
+ * callback will be invoked on *one of them*, after they have *all* been
+ * finalized. */
+int
+event_callback_finalize_many_(struct event_base *base, int n_cbs, struct event_callback **evcbs, void (*cb)(struct event_callback *, void *))
+{
+	int n_pending = 0, i;
+
+	if (base == NULL)
+		base = current_base;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	event_debug(("%s: %d events finalizing", __func__, n_cbs));
+
+	/* At most one can be currently executing; the rest we just
+	 * cancel... But we always make sure that the finalize callback
+	 * runs. */
+	for (i = 0; i < n_cbs; ++i) {
+		struct event_callback *evcb = evcbs[i];
+		if (evcb == base->current_event) {
+			event_callback_finalize_nolock_(base, 0, evcb, cb);
+			++n_pending;
+		} else {
+			event_callback_cancel_nolock_(base, evcb, 0);
+		}
+	}
+
+	if (n_pending == 0) {
+		/* Just do the first one. */
+		event_callback_finalize_nolock_(base, 0, evcbs[0], cb);
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return 0;
+}
+
+/*
+ * Set's the priority of an event - if an event is already scheduled
+ * changing the priority is going to fail.
+ */
+
+int
+event_priority_set(struct event *ev, int pri)
+{
+	event_debug_assert_is_setup_(ev);
+
+	if (ev->ev_flags & EVLIST_ACTIVE)
+		return (-1);
+	if (pri < 0 || pri >= ev->ev_base->nactivequeues)
+		return (-1);
+
+	ev->ev_pri = pri;
+
+	return (0);
+}
+
+/*
+ * Checks if a specific event is pending or scheduled.
+ */
+
+int
+event_pending(const struct event *ev, short event, struct timeval *tv)
+{
+	int flags = 0;
+
+	if (EVUTIL_FAILURE_CHECK(ev->ev_base == NULL)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return 0;
+	}
+
+	EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
+	event_debug_assert_is_setup_(ev);
+
+	if (ev->ev_flags & EVLIST_INSERTED)
+		flags |= (ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED|EV_SIGNAL));
+	if (ev->ev_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER))
+		flags |= ev->ev_res;
+	if (ev->ev_flags & EVLIST_TIMEOUT)
+		flags |= EV_TIMEOUT;
+
+	event &= (EV_TIMEOUT|EV_READ|EV_WRITE|EV_CLOSED|EV_SIGNAL);
+
+	/* See if there is a timeout that we should report */
+	if (tv != NULL && (flags & event & EV_TIMEOUT)) {
+		struct timeval tmp = ev->ev_timeout;
+		tmp.tv_usec &= MICROSECONDS_MASK;
+		/* correctly remamp to real time */
+		evutil_timeradd(&ev->ev_base->tv_clock_diff, &tmp, tv);
+	}
+
+	EVBASE_RELEASE_LOCK(ev->ev_base, th_base_lock);
+
+	return (flags & event);
+}
+
+int
+event_initialized(const struct event *ev)
+{
+	if (!(ev->ev_flags & EVLIST_INIT))
+		return 0;
+
+	return 1;
+}
+
+void
+event_get_assignment(const struct event *event, struct event_base **base_out, evutil_socket_t *fd_out, short *events_out, event_callback_fn *callback_out, void **arg_out)
+{
+	event_debug_assert_is_setup_(event);
+
+	if (base_out)
+		*base_out = event->ev_base;
+	if (fd_out)
+		*fd_out = event->ev_fd;
+	if (events_out)
+		*events_out = event->ev_events;
+	if (callback_out)
+		*callback_out = event->ev_callback;
+	if (arg_out)
+		*arg_out = event->ev_arg;
+}
+
+size_t
+event_get_struct_event_size(void)
+{
+	return sizeof(struct event);
+}
+
+evutil_socket_t
+event_get_fd(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_fd;
+}
+
+struct event_base *
+event_get_base(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_base;
+}
+
+short
+event_get_events(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_events;
+}
+
+event_callback_fn
+event_get_callback(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_callback;
+}
+
+void *
+event_get_callback_arg(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_arg;
+}
+
+int
+event_get_priority(const struct event *ev)
+{
+	event_debug_assert_is_setup_(ev);
+	return ev->ev_pri;
+}
+
+int
+event_add(struct event *ev, const struct timeval *tv)
+{
+	int res;
+
+	if (EVUTIL_FAILURE_CHECK(!ev->ev_base)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return -1;
+	}
+
+	EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
+
+	res = event_add_nolock_(ev, tv, 0);
+
+	EVBASE_RELEASE_LOCK(ev->ev_base, th_base_lock);
+
+	return (res);
+}
+
+/* Helper callback: wake an event_base from another thread.  This version
+ * works by writing a byte to one end of a socketpair, so that the event_base
+ * listening on the other end will wake up as the corresponding event
+ * triggers */
+static int
+evthread_notify_base_default(struct event_base *base)
+{
+	char buf[1];
+	int r;
+	buf[0] = (char) 0;
+#ifdef _WIN32
+	r = send(base->th_notify_fd[1], buf, 1, 0);
+#else
+	r = write(base->th_notify_fd[1], buf, 1);
+#endif
+	return (r < 0 && ! EVUTIL_ERR_IS_EAGAIN(errno)) ? -1 : 0;
+}
+
+#ifdef EVENT__HAVE_EVENTFD
+/* Helper callback: wake an event_base from another thread.  This version
+ * assumes that you have a working eventfd() implementation. */
+static int
+evthread_notify_base_eventfd(struct event_base *base)
+{
+	ev_uint64_t msg = 1;
+	int r;
+	do {
+		r = write(base->th_notify_fd[0], (void*) &msg, sizeof(msg));
+	} while (r < 0 && errno == EAGAIN);
+
+	return (r < 0) ? -1 : 0;
+}
+#endif
+
+
+/** Tell the thread currently running the event_loop for base (if any) that it
+ * needs to stop waiting in its dispatch function (if it is) and process all
+ * active callbacks. */
+static int
+evthread_notify_base(struct event_base *base)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (!base->th_notify_fn)
+		return -1;
+	if (base->is_notify_pending)
+		return 0;
+	base->is_notify_pending = 1;
+	return base->th_notify_fn(base);
+}
+
+/* Implementation function to remove a timeout on a currently pending event.
+ */
+int
+event_remove_timer_nolock_(struct event *ev)
+{
+	struct event_base *base = ev->ev_base;
+
+	EVENT_BASE_ASSERT_LOCKED(base);
+	event_debug_assert_is_setup_(ev);
+
+	event_debug(("event_remove_timer_nolock: event: %p", ev));
+
+	/* If it's not pending on a timeout, we don't need to do anything. */
+	if (ev->ev_flags & EVLIST_TIMEOUT) {
+		event_queue_remove_timeout(base, ev);
+		evutil_timerclear(&ev->ev_.ev_io.ev_timeout);
+	}
+
+	return (0);
+}
+
+int
+event_remove_timer(struct event *ev)
+{
+	int res;
+
+	if (EVUTIL_FAILURE_CHECK(!ev->ev_base)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return -1;
+	}
+
+	EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
+
+	res = event_remove_timer_nolock_(ev);
+
+	EVBASE_RELEASE_LOCK(ev->ev_base, th_base_lock);
+
+	return (res);
+}
+
+/* Implementation function to add an event.  Works just like event_add,
+ * except: 1) it requires that we have the lock.  2) if tv_is_absolute is set,
+ * we treat tv as an absolute time, not as an interval to add to the current
+ * time */
+int
+event_add_nolock_(struct event *ev, const struct timeval *tv,
+    int tv_is_absolute)
+{
+	struct event_base *base = ev->ev_base;
+	int res = 0;
+	int notify = 0;
+
+	EVENT_BASE_ASSERT_LOCKED(base);
+	event_debug_assert_is_setup_(ev);
+
+	event_debug((
+		 "event_add: event: %p (fd "EV_SOCK_FMT"), %s%s%s%scall %p",
+		 ev,
+		 EV_SOCK_ARG(ev->ev_fd),
+		 ev->ev_events & EV_READ ? "EV_READ " : " ",
+		 ev->ev_events & EV_WRITE ? "EV_WRITE " : " ",
+		 ev->ev_events & EV_CLOSED ? "EV_CLOSED " : " ",
+		 tv ? "EV_TIMEOUT " : " ",
+		 ev->ev_callback));
+
+	EVUTIL_ASSERT(!(ev->ev_flags & ~EVLIST_ALL));
+
+	if (ev->ev_flags & EVLIST_FINALIZING) {
+		/* XXXX debug */
+		return (-1);
+	}
+
+	/*
+	 * prepare for timeout insertion further below, if we get a
+	 * failure on any step, we should not change any state.
+	 */
+	if (tv != NULL && !(ev->ev_flags & EVLIST_TIMEOUT)) {
+		if (min_heap_reserve_(&base->timeheap,
+			1 + min_heap_size_(&base->timeheap)) == -1)
+			return (-1);  /* ENOMEM == errno */
+	}
+
+	/* If the main thread is currently executing a signal event's
+	 * callback, and we are not the main thread, then we want to wait
+	 * until the callback is done before we mess with the event, or else
+	 * we can race on ev_ncalls and ev_pncalls below. */
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (base->current_event == event_to_event_callback(ev) &&
+	    (ev->ev_events & EV_SIGNAL)
+	    && !EVBASE_IN_THREAD(base)) {
+		++base->current_event_waiters;
+		EVTHREAD_COND_WAIT(base->current_event_cond, base->th_base_lock);
+	}
+#endif
+
+	if ((ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED|EV_SIGNAL)) &&
+	    !(ev->ev_flags & (EVLIST_INSERTED|EVLIST_ACTIVE|EVLIST_ACTIVE_LATER))) {
+		if (ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED))
+			res = evmap_io_add_(base, ev->ev_fd, ev);
+		else if (ev->ev_events & EV_SIGNAL)
+			res = evmap_signal_add_(base, (int)ev->ev_fd, ev);
+		if (res != -1)
+			event_queue_insert_inserted(base, ev);
+		if (res == 1) {
+			/* evmap says we need to notify the main thread. */
+			notify = 1;
+			res = 0;
+		}
+	}
+
+	/*
+	 * we should change the timeout state only if the previous event
+	 * addition succeeded.
+	 */
+	if (res != -1 && tv != NULL) {
+		struct timeval now;
+		int common_timeout;
+#ifdef USE_REINSERT_TIMEOUT
+		int was_common;
+		int old_timeout_idx;
+#endif
+
+		/*
+		 * for persistent timeout events, we remember the
+		 * timeout value and re-add the event.
+		 *
+		 * If tv_is_absolute, this was already set.
+		 */
+		if (ev->ev_closure == EV_CLOSURE_EVENT_PERSIST && !tv_is_absolute)
+			ev->ev_io_timeout = *tv;
+
+#ifndef USE_REINSERT_TIMEOUT
+		if (ev->ev_flags & EVLIST_TIMEOUT) {
+			event_queue_remove_timeout(base, ev);
+		}
+#endif
+
+		/* Check if it is active due to a timeout.  Rescheduling
+		 * this timeout before the callback can be executed
+		 * removes it from the active list. */
+		if ((ev->ev_flags & EVLIST_ACTIVE) &&
+		    (ev->ev_res & EV_TIMEOUT)) {
+			if (ev->ev_events & EV_SIGNAL) {
+				/* See if we are just active executing
+				 * this event in a loop
+				 */
+				if (ev->ev_ncalls && ev->ev_pncalls) {
+					/* Abort loop */
+					*ev->ev_pncalls = 0;
+				}
+			}
+
+			event_queue_remove_active(base, event_to_event_callback(ev));
+		}
+
+		gettime(base, &now);
+
+		common_timeout = is_common_timeout(tv, base);
+#ifdef USE_REINSERT_TIMEOUT
+		was_common = is_common_timeout(&ev->ev_timeout, base);
+		old_timeout_idx = COMMON_TIMEOUT_IDX(&ev->ev_timeout);
+#endif
+
+		if (tv_is_absolute) {
+			ev->ev_timeout = *tv;
+		} else if (common_timeout) {
+			struct timeval tmp = *tv;
+			tmp.tv_usec &= MICROSECONDS_MASK;
+			evutil_timeradd(&now, &tmp, &ev->ev_timeout);
+			ev->ev_timeout.tv_usec |=
+			    (tv->tv_usec & ~MICROSECONDS_MASK);
+		} else {
+			evutil_timeradd(&now, tv, &ev->ev_timeout);
+		}
+
+		event_debug((
+			 "event_add: event %p, timeout in %d seconds %d useconds, call %p",
+			 ev, (int)tv->tv_sec, (int)tv->tv_usec, ev->ev_callback));
+
+#ifdef USE_REINSERT_TIMEOUT
+		event_queue_reinsert_timeout(base, ev, was_common, common_timeout, old_timeout_idx);
+#else
+		event_queue_insert_timeout(base, ev);
+#endif
+
+		if (common_timeout) {
+			struct common_timeout_list *ctl =
+			    get_common_timeout_list(base, &ev->ev_timeout);
+			if (ev == TAILQ_FIRST(&ctl->events)) {
+				common_timeout_schedule(ctl, &now, ev);
+			}
+		} else {
+			struct event* top = NULL;
+			/* See if the earliest timeout is now earlier than it
+			 * was before: if so, we will need to tell the main
+			 * thread to wake up earlier than it would otherwise.
+			 * We double check the timeout of the top element to
+			 * handle time distortions due to system suspension.
+			 */
+			if (min_heap_elt_is_top_(ev))
+				notify = 1;
+			else if ((top = min_heap_top_(&base->timeheap)) != NULL &&
+					 evutil_timercmp(&top->ev_timeout, &now, <))
+				notify = 1;
+		}
+	}
+
+	/* if we are not in the right thread, we need to wake up the loop */
+	if (res != -1 && notify && EVBASE_NEED_NOTIFY(base))
+		evthread_notify_base(base);
+
+	event_debug_note_add_(ev);
+
+	return (res);
+}
+
+static int
+event_del_(struct event *ev, int blocking)
+{
+	int res;
+	struct event_base *base = ev->ev_base;
+
+	if (EVUTIL_FAILURE_CHECK(!base)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return -1;
+	}
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	res = event_del_nolock_(ev, blocking);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	return (res);
+}
+
+int
+event_del(struct event *ev)
+{
+	return event_del_(ev, EVENT_DEL_AUTOBLOCK);
+}
+
+int
+event_del_block(struct event *ev)
+{
+	return event_del_(ev, EVENT_DEL_BLOCK);
+}
+
+int
+event_del_noblock(struct event *ev)
+{
+	return event_del_(ev, EVENT_DEL_NOBLOCK);
+}
+
+/** Helper for event_del: always called with th_base_lock held.
+ *
+ * "blocking" must be one of the EVENT_DEL_{BLOCK, NOBLOCK, AUTOBLOCK,
+ * EVEN_IF_FINALIZING} values. See those for more information.
+ */
+int
+event_del_nolock_(struct event *ev, int blocking)
+{
+	struct event_base *base;
+	int res = 0, notify = 0;
+
+	event_debug(("event_del: %p (fd "EV_SOCK_FMT"), callback %p",
+		ev, EV_SOCK_ARG(ev->ev_fd), ev->ev_callback));
+
+	/* An event without a base has not been added */
+	if (ev->ev_base == NULL)
+		return (-1);
+
+	EVENT_BASE_ASSERT_LOCKED(ev->ev_base);
+
+	if (blocking != EVENT_DEL_EVEN_IF_FINALIZING) {
+		if (ev->ev_flags & EVLIST_FINALIZING) {
+			/* XXXX Debug */
+			return 0;
+		}
+	}
+
+	base = ev->ev_base;
+
+	EVUTIL_ASSERT(!(ev->ev_flags & ~EVLIST_ALL));
+
+	/* See if we are just active executing this event in a loop */
+	if (ev->ev_events & EV_SIGNAL) {
+		if (ev->ev_ncalls && ev->ev_pncalls) {
+			/* Abort loop */
+			*ev->ev_pncalls = 0;
+		}
+	}
+
+	if (ev->ev_flags & EVLIST_TIMEOUT) {
+		/* NOTE: We never need to notify the main thread because of a
+		 * deleted timeout event: all that could happen if we don't is
+		 * that the dispatch loop might wake up too early.  But the
+		 * point of notifying the main thread _is_ to wake up the
+		 * dispatch loop early anyway, so we wouldn't gain anything by
+		 * doing it.
+		 */
+		event_queue_remove_timeout(base, ev);
+	}
+
+	if (ev->ev_flags & EVLIST_ACTIVE)
+		event_queue_remove_active(base, event_to_event_callback(ev));
+	else if (ev->ev_flags & EVLIST_ACTIVE_LATER)
+		event_queue_remove_active_later(base, event_to_event_callback(ev));
+
+	if (ev->ev_flags & EVLIST_INSERTED) {
+		event_queue_remove_inserted(base, ev);
+		if (ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED))
+			res = evmap_io_del_(base, ev->ev_fd, ev);
+		else
+			res = evmap_signal_del_(base, (int)ev->ev_fd, ev);
+		if (res == 1) {
+			/* evmap says we need to notify the main thread. */
+			notify = 1;
+			res = 0;
+		}
+		/* If we do not have events, let's notify event base so it can
+		 * exit without waiting */
+		if (!event_haveevents(base) && !N_ACTIVE_CALLBACKS(base))
+			notify = 1;
+	}
+
+	/* if we are not in the right thread, we need to wake up the loop */
+	if (res != -1 && notify && EVBASE_NEED_NOTIFY(base))
+		evthread_notify_base(base);
+
+	event_debug_note_del_(ev);
+
+	/* If the main thread is currently executing this event's callback,
+	 * and we are not the main thread, then we want to wait until the
+	 * callback is done before returning. That way, when this function
+	 * returns, it will be safe to free the user-supplied argument.
+	 */
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (blocking != EVENT_DEL_NOBLOCK &&
+	    base->current_event == event_to_event_callback(ev) &&
+	    !EVBASE_IN_THREAD(base) &&
+	    (blocking == EVENT_DEL_BLOCK || !(ev->ev_events & EV_FINALIZE))) {
+		++base->current_event_waiters;
+		EVTHREAD_COND_WAIT(base->current_event_cond, base->th_base_lock);
+	}
+#endif
+
+	return (res);
+}
+
+void
+event_active(struct event *ev, int res, short ncalls)
+{
+	if (EVUTIL_FAILURE_CHECK(!ev->ev_base)) {
+		event_warnx("%s: event has no event_base set.", __func__);
+		return;
+	}
+
+	EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
+
+	event_debug_assert_is_setup_(ev);
+
+	event_active_nolock_(ev, res, ncalls);
+
+	EVBASE_RELEASE_LOCK(ev->ev_base, th_base_lock);
+}
+
+
+void
+event_active_nolock_(struct event *ev, int res, short ncalls)
+{
+	struct event_base *base;
+
+	event_debug(("event_active: %p (fd "EV_SOCK_FMT"), res %d, callback %p",
+		ev, EV_SOCK_ARG(ev->ev_fd), (int)res, ev->ev_callback));
+
+	base = ev->ev_base;
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (ev->ev_flags & EVLIST_FINALIZING) {
+		/* XXXX debug */
+		return;
+	}
+
+	switch ((ev->ev_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER))) {
+	default:
+	case EVLIST_ACTIVE|EVLIST_ACTIVE_LATER:
+		EVUTIL_ASSERT(0);
+		break;
+	case EVLIST_ACTIVE:
+		/* We get different kinds of events, add them together */
+		ev->ev_res |= res;
+		return;
+	case EVLIST_ACTIVE_LATER:
+		ev->ev_res |= res;
+		break;
+	case 0:
+		ev->ev_res = res;
+		break;
+	}
+
+	if (ev->ev_pri < base->event_running_priority)
+		base->event_continue = 1;
+
+	if (ev->ev_events & EV_SIGNAL) {
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+		if (base->current_event == event_to_event_callback(ev) &&
+		    !EVBASE_IN_THREAD(base)) {
+			++base->current_event_waiters;
+			EVTHREAD_COND_WAIT(base->current_event_cond, base->th_base_lock);
+		}
+#endif
+		ev->ev_ncalls = ncalls;
+		ev->ev_pncalls = NULL;
+	}
+
+	event_callback_activate_nolock_(base, event_to_event_callback(ev));
+}
+
+void
+event_active_later_(struct event *ev, int res)
+{
+	EVBASE_ACQUIRE_LOCK(ev->ev_base, th_base_lock);
+	event_active_later_nolock_(ev, res);
+	EVBASE_RELEASE_LOCK(ev->ev_base, th_base_lock);
+}
+
+void
+event_active_later_nolock_(struct event *ev, int res)
+{
+	struct event_base *base = ev->ev_base;
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (ev->ev_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)) {
+		/* We get different kinds of events, add them together */
+		ev->ev_res |= res;
+		return;
+	}
+
+	ev->ev_res = res;
+
+	event_callback_activate_later_nolock_(base, event_to_event_callback(ev));
+}
+
+int
+event_callback_activate_(struct event_base *base,
+    struct event_callback *evcb)
+{
+	int r;
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	r = event_callback_activate_nolock_(base, evcb);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+int
+event_callback_activate_nolock_(struct event_base *base,
+    struct event_callback *evcb)
+{
+	int r = 1;
+
+	if (evcb->evcb_flags & EVLIST_FINALIZING)
+		return 0;
+
+	switch (evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)) {
+	default:
+		EVUTIL_ASSERT(0);
+		EVUTIL_FALLTHROUGH;
+	case EVLIST_ACTIVE_LATER:
+		event_queue_remove_active_later(base, evcb);
+		r = 0;
+		break;
+	case EVLIST_ACTIVE:
+		return 0;
+	case 0:
+		break;
+	}
+
+	event_queue_insert_active(base, evcb);
+
+	if (EVBASE_NEED_NOTIFY(base))
+		evthread_notify_base(base);
+
+	return r;
+}
+
+int
+event_callback_activate_later_nolock_(struct event_base *base,
+    struct event_callback *evcb)
+{
+	if (evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER))
+		return 0;
+
+	event_queue_insert_active_later(base, evcb);
+	if (EVBASE_NEED_NOTIFY(base))
+		evthread_notify_base(base);
+	return 1;
+}
+
+void
+event_callback_init_(struct event_base *base,
+    struct event_callback *cb)
+{
+	memset(cb, 0, sizeof(*cb));
+	cb->evcb_pri = base->nactivequeues - 1;
+}
+
+int
+event_callback_cancel_(struct event_base *base,
+    struct event_callback *evcb)
+{
+	int r;
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	r = event_callback_cancel_nolock_(base, evcb, 0);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+int
+event_callback_cancel_nolock_(struct event_base *base,
+    struct event_callback *evcb, int even_if_finalizing)
+{
+	if ((evcb->evcb_flags & EVLIST_FINALIZING) && !even_if_finalizing)
+		return 0;
+
+	if (evcb->evcb_flags & EVLIST_INIT)
+		return event_del_nolock_(event_callback_to_event(evcb),
+		    even_if_finalizing ? EVENT_DEL_EVEN_IF_FINALIZING : EVENT_DEL_AUTOBLOCK);
+
+	switch ((evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER))) {
+	default:
+	case EVLIST_ACTIVE|EVLIST_ACTIVE_LATER:
+		EVUTIL_ASSERT(0);
+		break;
+	case EVLIST_ACTIVE:
+		/* We get different kinds of events, add them together */
+		event_queue_remove_active(base, evcb);
+		return 0;
+	case EVLIST_ACTIVE_LATER:
+		event_queue_remove_active_later(base, evcb);
+		break;
+	case 0:
+		break;
+	}
+
+	return 0;
+}
+
+void
+event_deferred_cb_init_(struct event_callback *cb, ev_uint8_t priority, deferred_cb_fn fn, void *arg)
+{
+	memset(cb, 0, sizeof(*cb));
+	cb->evcb_cb_union.evcb_selfcb = fn;
+	cb->evcb_arg = arg;
+	cb->evcb_pri = priority;
+	cb->evcb_closure = EV_CLOSURE_CB_SELF;
+}
+
+void
+event_deferred_cb_set_priority_(struct event_callback *cb, ev_uint8_t priority)
+{
+	cb->evcb_pri = priority;
+}
+
+void
+event_deferred_cb_cancel_(struct event_base *base, struct event_callback *cb)
+{
+	if (!base)
+		base = current_base;
+	event_callback_cancel_(base, cb);
+}
+
+#define MAX_DEFERREDS_QUEUED 32
+int
+event_deferred_cb_schedule_(struct event_base *base, struct event_callback *cb)
+{
+	int r = 1;
+	if (!base)
+		base = current_base;
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	if (base->n_deferreds_queued > MAX_DEFERREDS_QUEUED) {
+		r = event_callback_activate_later_nolock_(base, cb);
+	} else {
+		r = event_callback_activate_nolock_(base, cb);
+		if (r) {
+			++base->n_deferreds_queued;
+		}
+	}
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+static int
+timeout_next(struct event_base *base, struct timeval **tv_p)
+{
+	/* Caller must hold th_base_lock */
+	struct timeval now;
+	struct event *ev;
+	struct timeval *tv = *tv_p;
+	int res = 0;
+
+	ev = min_heap_top_(&base->timeheap);
+
+	if (ev == NULL) {
+		/* if no time-based events are active wait for I/O */
+		*tv_p = NULL;
+		goto out;
+	}
+
+	if (gettime(base, &now) == -1) {
+		res = -1;
+		goto out;
+	}
+
+	if (evutil_timercmp(&ev->ev_timeout, &now, <=)) {
+		evutil_timerclear(tv);
+		goto out;
+	}
+
+	evutil_timersub(&ev->ev_timeout, &now, tv);
+
+	EVUTIL_ASSERT(tv->tv_sec >= 0);
+	EVUTIL_ASSERT(tv->tv_usec >= 0);
+	event_debug(("timeout_next: event: %p, in %d seconds, %d useconds", ev, (int)tv->tv_sec, (int)tv->tv_usec));
+
+out:
+	return (res);
+}
+
+/* Activate every event whose timeout has elapsed. */
+static void
+timeout_process(struct event_base *base)
+{
+	/* Caller must hold lock. */
+	struct timeval now;
+	struct event *ev;
+
+	if (min_heap_empty_(&base->timeheap)) {
+		return;
+	}
+
+	gettime(base, &now);
+
+	while ((ev = min_heap_top_(&base->timeheap))) {
+		if (evutil_timercmp(&ev->ev_timeout, &now, >))
+			break;
+
+		/* delete this event from the I/O queues */
+		event_del_nolock_(ev, EVENT_DEL_NOBLOCK);
+
+		event_debug(("timeout_process: event: %p, call %p",
+			 ev, ev->ev_callback));
+		event_active_nolock_(ev, EV_TIMEOUT, 1);
+	}
+}
+
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+#define MAX_EVENT_COUNT(var, v) var = MAX(var, v)
+
+/* These are a fancy way to spell
+     if (~flags & EVLIST_INTERNAL)
+         base->event_count--/++;
+*/
+#define DECR_EVENT_COUNT(base,flags) \
+	((base)->event_count -= !((flags) & EVLIST_INTERNAL))
+#define INCR_EVENT_COUNT(base,flags) do {					\
+	((base)->event_count += !((flags) & EVLIST_INTERNAL));			\
+	MAX_EVENT_COUNT((base)->event_count_max, (base)->event_count);		\
+} while (0)
+
+static void
+event_queue_remove_inserted(struct event_base *base, struct event *ev)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (EVUTIL_FAILURE_CHECK(!(ev->ev_flags & EVLIST_INSERTED))) {
+		event_errx(1, "%s: %p(fd "EV_SOCK_FMT") not on queue %x", __func__,
+		    ev, EV_SOCK_ARG(ev->ev_fd), EVLIST_INSERTED);
+		return;
+	}
+	DECR_EVENT_COUNT(base, ev->ev_flags);
+	ev->ev_flags &= ~EVLIST_INSERTED;
+}
+static void
+event_queue_remove_active(struct event_base *base, struct event_callback *evcb)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (EVUTIL_FAILURE_CHECK(!(evcb->evcb_flags & EVLIST_ACTIVE))) {
+		event_errx(1, "%s: %p not on queue %x", __func__,
+			   evcb, EVLIST_ACTIVE);
+		return;
+	}
+	DECR_EVENT_COUNT(base, evcb->evcb_flags);
+	evcb->evcb_flags &= ~EVLIST_ACTIVE;
+	base->event_count_active--;
+
+	TAILQ_REMOVE(&base->activequeues[evcb->evcb_pri],
+	    evcb, evcb_active_next);
+}
+static void
+event_queue_remove_active_later(struct event_base *base, struct event_callback *evcb)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (EVUTIL_FAILURE_CHECK(!(evcb->evcb_flags & EVLIST_ACTIVE_LATER))) {
+		event_errx(1, "%s: %p not on queue %x", __func__,
+			   evcb, EVLIST_ACTIVE_LATER);
+		return;
+	}
+	DECR_EVENT_COUNT(base, evcb->evcb_flags);
+	evcb->evcb_flags &= ~EVLIST_ACTIVE_LATER;
+	base->event_count_active--;
+
+	TAILQ_REMOVE(&base->active_later_queue, evcb, evcb_active_next);
+}
+static void
+event_queue_remove_timeout(struct event_base *base, struct event *ev)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (EVUTIL_FAILURE_CHECK(!(ev->ev_flags & EVLIST_TIMEOUT))) {
+		event_errx(1, "%s: %p(fd "EV_SOCK_FMT") not on queue %x", __func__,
+		    ev, EV_SOCK_ARG(ev->ev_fd), EVLIST_TIMEOUT);
+		return;
+	}
+	DECR_EVENT_COUNT(base, ev->ev_flags);
+	ev->ev_flags &= ~EVLIST_TIMEOUT;
+
+	if (is_common_timeout(&ev->ev_timeout, base)) {
+		struct common_timeout_list *ctl =
+		    get_common_timeout_list(base, &ev->ev_timeout);
+		TAILQ_REMOVE(&ctl->events, ev,
+		    ev_timeout_pos.ev_next_with_common_timeout);
+	} else {
+		min_heap_erase_(&base->timeheap, ev);
+	}
+}
+
+#ifdef USE_REINSERT_TIMEOUT
+/* Remove and reinsert 'ev' into the timeout queue. */
+static void
+event_queue_reinsert_timeout(struct event_base *base, struct event *ev,
+    int was_common, int is_common, int old_timeout_idx)
+{
+	struct common_timeout_list *ctl;
+	if (!(ev->ev_flags & EVLIST_TIMEOUT)) {
+		event_queue_insert_timeout(base, ev);
+		return;
+	}
+
+	switch ((was_common<<1) | is_common) {
+	case 3: /* Changing from one common timeout to another */
+		ctl = base->common_timeout_queues[old_timeout_idx];
+		TAILQ_REMOVE(&ctl->events, ev,
+		    ev_timeout_pos.ev_next_with_common_timeout);
+		ctl = get_common_timeout_list(base, &ev->ev_timeout);
+		insert_common_timeout_inorder(ctl, ev);
+		break;
+	case 2: /* Was common; is no longer common */
+		ctl = base->common_timeout_queues[old_timeout_idx];
+		TAILQ_REMOVE(&ctl->events, ev,
+		    ev_timeout_pos.ev_next_with_common_timeout);
+		min_heap_push_(&base->timeheap, ev);
+		break;
+	case 1: /* Wasn't common; has become common. */
+		min_heap_erase_(&base->timeheap, ev);
+		ctl = get_common_timeout_list(base, &ev->ev_timeout);
+		insert_common_timeout_inorder(ctl, ev);
+		break;
+	case 0: /* was in heap; is still on heap. */
+		min_heap_adjust_(&base->timeheap, ev);
+		break;
+	default:
+		EVUTIL_ASSERT(0); /* unreachable */
+		break;
+	}
+}
+#endif
+
+/* Add 'ev' to the common timeout list in 'ev'. */
+static void
+insert_common_timeout_inorder(struct common_timeout_list *ctl,
+    struct event *ev)
+{
+	struct event *e;
+	/* By all logic, we should just be able to append 'ev' to the end of
+	 * ctl->events, since the timeout on each 'ev' is set to {the common
+	 * timeout} + {the time when we add the event}, and so the events
+	 * should arrive in order of their timeeouts.  But just in case
+	 * there's some wacky threading issue going on, we do a search from
+	 * the end of 'ev' to find the right insertion point.
+	 */
+	TAILQ_FOREACH_REVERSE(e, &ctl->events,
+	    event_list, ev_timeout_pos.ev_next_with_common_timeout) {
+		/* This timercmp is a little sneaky, since both ev and e have
+		 * magic values in tv_usec.  Fortunately, they ought to have
+		 * the _same_ magic values in tv_usec.  Let's assert for that.
+		 */
+		EVUTIL_ASSERT(
+			is_same_common_timeout(&e->ev_timeout, &ev->ev_timeout));
+		if (evutil_timercmp(&ev->ev_timeout, &e->ev_timeout, >=)) {
+			TAILQ_INSERT_AFTER(&ctl->events, e, ev,
+			    ev_timeout_pos.ev_next_with_common_timeout);
+			return;
+		}
+	}
+	TAILQ_INSERT_HEAD(&ctl->events, ev,
+	    ev_timeout_pos.ev_next_with_common_timeout);
+}
+
+static void
+event_queue_insert_inserted(struct event_base *base, struct event *ev)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (EVUTIL_FAILURE_CHECK(ev->ev_flags & EVLIST_INSERTED)) {
+		event_errx(1, "%s: %p(fd "EV_SOCK_FMT") already inserted", __func__,
+		    ev, EV_SOCK_ARG(ev->ev_fd));
+		return;
+	}
+
+	INCR_EVENT_COUNT(base, ev->ev_flags);
+
+	ev->ev_flags |= EVLIST_INSERTED;
+}
+
+static void
+event_queue_insert_active(struct event_base *base, struct event_callback *evcb)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (evcb->evcb_flags & EVLIST_ACTIVE) {
+		/* Double insertion is possible for active events */
+		return;
+	}
+
+	INCR_EVENT_COUNT(base, evcb->evcb_flags);
+
+	evcb->evcb_flags |= EVLIST_ACTIVE;
+
+	base->event_count_active++;
+	MAX_EVENT_COUNT(base->event_count_active_max, base->event_count_active);
+	EVUTIL_ASSERT(evcb->evcb_pri < base->nactivequeues);
+	TAILQ_INSERT_TAIL(&base->activequeues[evcb->evcb_pri],
+	    evcb, evcb_active_next);
+}
+
+static void
+event_queue_insert_active_later(struct event_base *base, struct event_callback *evcb)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+	if (evcb->evcb_flags & (EVLIST_ACTIVE_LATER|EVLIST_ACTIVE)) {
+		/* Double insertion is possible */
+		return;
+	}
+
+	INCR_EVENT_COUNT(base, evcb->evcb_flags);
+	evcb->evcb_flags |= EVLIST_ACTIVE_LATER;
+	base->event_count_active++;
+	MAX_EVENT_COUNT(base->event_count_active_max, base->event_count_active);
+	EVUTIL_ASSERT(evcb->evcb_pri < base->nactivequeues);
+	TAILQ_INSERT_TAIL(&base->active_later_queue, evcb, evcb_active_next);
+}
+
+static void
+event_queue_insert_timeout(struct event_base *base, struct event *ev)
+{
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	if (EVUTIL_FAILURE_CHECK(ev->ev_flags & EVLIST_TIMEOUT)) {
+		event_errx(1, "%s: %p(fd "EV_SOCK_FMT") already on timeout", __func__,
+		    ev, EV_SOCK_ARG(ev->ev_fd));
+		return;
+	}
+
+	INCR_EVENT_COUNT(base, ev->ev_flags);
+
+	ev->ev_flags |= EVLIST_TIMEOUT;
+
+	if (is_common_timeout(&ev->ev_timeout, base)) {
+		struct common_timeout_list *ctl =
+		    get_common_timeout_list(base, &ev->ev_timeout);
+		insert_common_timeout_inorder(ctl, ev);
+	} else {
+		min_heap_push_(&base->timeheap, ev);
+	}
+}
+
+static void
+event_queue_make_later_events_active(struct event_base *base)
+{
+	struct event_callback *evcb;
+	EVENT_BASE_ASSERT_LOCKED(base);
+
+	while ((evcb = TAILQ_FIRST(&base->active_later_queue))) {
+		TAILQ_REMOVE(&base->active_later_queue, evcb, evcb_active_next);
+		evcb->evcb_flags = (evcb->evcb_flags & ~EVLIST_ACTIVE_LATER) | EVLIST_ACTIVE;
+		EVUTIL_ASSERT(evcb->evcb_pri < base->nactivequeues);
+		TAILQ_INSERT_TAIL(&base->activequeues[evcb->evcb_pri], evcb, evcb_active_next);
+		base->n_deferreds_queued += (evcb->evcb_closure == EV_CLOSURE_CB_SELF);
+	}
+}
+
+/* Functions for debugging */
+
+const char *
+event_get_version(void)
+{
+	return (EVENT__VERSION);
+}
+
+ev_uint32_t
+event_get_version_number(void)
+{
+	return (EVENT__NUMERIC_VERSION);
+}
+
+/*
+ * No thread-safe interface needed - the information should be the same
+ * for all threads.
+ */
+
+const char *
+event_get_method(void)
+{
+	return (current_base->evsel->name);
+}
+
+#ifndef EVENT__DISABLE_MM_REPLACEMENT
+static void *(*mm_malloc_fn_)(size_t sz) = NULL;
+static void *(*mm_realloc_fn_)(void *p, size_t sz) = NULL;
+static void (*mm_free_fn_)(void *p) = NULL;
+
+void *
+event_mm_malloc_(size_t sz)
+{
+	if (sz == 0)
+		return NULL;
+
+	if (mm_malloc_fn_)
+		return mm_malloc_fn_(sz);
+	else
+		return malloc(sz);
+}
+
+void *
+event_mm_calloc_(size_t count, size_t size)
+{
+	if (count == 0 || size == 0)
+		return NULL;
+
+	if (mm_malloc_fn_) {
+		size_t sz = count * size;
+		void *p = NULL;
+		if (count > EV_SIZE_MAX / size)
+			goto error;
+		p = mm_malloc_fn_(sz);
+		if (p)
+			return memset(p, 0, sz);
+	} else {
+		void *p = calloc(count, size);
+#ifdef _WIN32
+		/* Windows calloc doesn't reliably set ENOMEM */
+		if (p == NULL)
+			goto error;
+#endif
+		return p;
+	}
+
+error:
+	errno = ENOMEM;
+	return NULL;
+}
+
+char *
+event_mm_strdup_(const char *str)
+{
+	if (!str) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if (mm_malloc_fn_) {
+		size_t ln = strlen(str);
+		void *p = NULL;
+		if (ln == EV_SIZE_MAX)
+			goto error;
+		p = mm_malloc_fn_(ln+1);
+		if (p)
+			return memcpy(p, str, ln+1);
+	} else
+#ifdef _WIN32
+		return _strdup(str);
+#else
+		return strdup(str);
+#endif
+
+error:
+	errno = ENOMEM;
+	return NULL;
+}
+
+void *
+event_mm_realloc_(void *ptr, size_t sz)
+{
+	if (mm_realloc_fn_)
+		return mm_realloc_fn_(ptr, sz);
+	else
+		return realloc(ptr, sz);
+}
+
+void
+event_mm_free_(void *ptr)
+{
+	if (mm_free_fn_)
+		mm_free_fn_(ptr);
+	else
+		free(ptr);
+}
+
+void
+event_set_mem_functions(void *(*malloc_fn)(size_t sz),
+			void *(*realloc_fn)(void *ptr, size_t sz),
+			void (*free_fn)(void *ptr))
+{
+	mm_malloc_fn_ = malloc_fn;
+	mm_realloc_fn_ = realloc_fn;
+	mm_free_fn_ = free_fn;
+}
+#endif
+
+#ifdef EVENT__HAVE_EVENTFD
+static void
+evthread_notify_drain_eventfd(evutil_socket_t fd, short what, void *arg)
+{
+	ev_uint64_t msg;
+	ev_ssize_t r;
+	struct event_base *base = arg;
+
+	r = read(fd, (void*) &msg, sizeof(msg));
+	if (r<0 && errno != EAGAIN) {
+		event_sock_warn(fd, "Error reading from eventfd");
+	}
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	base->is_notify_pending = 0;
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+#endif
+
+static void
+evthread_notify_drain_default(evutil_socket_t fd, short what, void *arg)
+{
+	unsigned char buf[1024];
+	struct event_base *base = arg;
+#ifdef _WIN32
+	while (recv(fd, (char*)buf, sizeof(buf), 0) > 0)
+		;
+#else
+	while (read(fd, (char*)buf, sizeof(buf)) > 0)
+		;
+#endif
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	base->is_notify_pending = 0;
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+int
+evthread_make_base_notifiable(struct event_base *base)
+{
+	int r;
+	if (!base)
+		return -1;
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	r = evthread_make_base_notifiable_nolock_(base);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+static int
+evthread_make_base_notifiable_nolock_(struct event_base *base)
+{
+	void (*cb)(evutil_socket_t, short, void *);
+	int (*notify)(struct event_base *);
+
+	if (base->th_notify_fn != NULL) {
+		/* The base is already notifiable: we're doing fine. */
+		return 0;
+	}
+
+#if defined(EVENT__HAVE_WORKING_KQUEUE)
+	if (base->evsel == &kqops && event_kq_add_notify_event_(base) == 0) {
+		base->th_notify_fn = event_kq_notify_base_;
+		/* No need to add an event here; the backend can wake
+		 * itself up just fine. */
+		return 0;
+	}
+#endif
+
+#ifdef EVENT__HAVE_EVENTFD
+	base->th_notify_fd[0] = evutil_eventfd_(0,
+	    EVUTIL_EFD_CLOEXEC|EVUTIL_EFD_NONBLOCK);
+	if (base->th_notify_fd[0] >= 0) {
+		base->th_notify_fd[1] = -1;
+		notify = evthread_notify_base_eventfd;
+		cb = evthread_notify_drain_eventfd;
+	} else
+#endif
+	if (evutil_make_internal_pipe_(base->th_notify_fd) == 0) {
+		notify = evthread_notify_base_default;
+		cb = evthread_notify_drain_default;
+	} else {
+		return -1;
+	}
+
+	base->th_notify_fn = notify;
+
+	/* prepare an event that we can use for wakeup */
+	event_assign(&base->th_notify, base, base->th_notify_fd[0],
+				 EV_READ|EV_PERSIST, cb, base);
+
+	/* we need to mark this as internal event */
+	base->th_notify.ev_flags |= EVLIST_INTERNAL;
+	event_priority_set(&base->th_notify, 0);
+
+	return event_add_nolock_(&base->th_notify, NULL, 0);
+}
+
+int
+event_base_foreach_event_nolock_(struct event_base *base,
+    event_base_foreach_event_cb fn, void *arg)
+{
+	int r, i;
+	unsigned u;
+	struct event *ev;
+
+	/* Start out with all the EVLIST_INSERTED events. */
+	if ((r = evmap_foreach_event_(base, fn, arg)))
+		return r;
+
+	/* Okay, now we deal with those events that have timeouts and are in
+	 * the min-heap. */
+	for (u = 0; u < base->timeheap.n; ++u) {
+		ev = base->timeheap.p[u];
+		if (ev->ev_flags & EVLIST_INSERTED) {
+			/* we already processed this one */
+			continue;
+		}
+		if ((r = fn(base, ev, arg)))
+			return r;
+	}
+
+	/* Now for the events in one of the timeout queues.
+	 * the min-heap. */
+	for (i = 0; i < base->n_common_timeouts; ++i) {
+		struct common_timeout_list *ctl =
+		    base->common_timeout_queues[i];
+		TAILQ_FOREACH(ev, &ctl->events,
+		    ev_timeout_pos.ev_next_with_common_timeout) {
+			if (ev->ev_flags & EVLIST_INSERTED) {
+				/* we already processed this one */
+				continue;
+			}
+			if ((r = fn(base, ev, arg)))
+				return r;
+		}
+	}
+
+	/* Finally, we deal wit all the active events that we haven't touched
+	 * yet. */
+	for (i = 0; i < base->nactivequeues; ++i) {
+		struct event_callback *evcb;
+		TAILQ_FOREACH(evcb, &base->activequeues[i], evcb_active_next) {
+			if ((evcb->evcb_flags & (EVLIST_INIT|EVLIST_INSERTED|EVLIST_TIMEOUT)) != EVLIST_INIT) {
+				/* This isn't an event (evlist_init clear), or
+				 * we already processed it. (inserted or
+				 * timeout set */
+				continue;
+			}
+			ev = event_callback_to_event(evcb);
+			if ((r = fn(base, ev, arg)))
+				return r;
+		}
+	}
+
+	return 0;
+}
+
+/* Helper for event_base_dump_events: called on each event in the event base;
+ * dumps only the inserted events. */
+static int
+dump_inserted_event_fn(const struct event_base *base, const struct event *e, void *arg)
+{
+	FILE *output = arg;
+	const char *gloss = (e->ev_events & EV_SIGNAL) ?
+	    "sig" : "fd ";
+
+	if (! (e->ev_flags & (EVLIST_INSERTED|EVLIST_TIMEOUT)))
+		return 0;
+
+	fprintf(output, "  %p [%s "EV_SOCK_FMT"]%s%s%s%s%s%s%s",
+	    (void*)e, gloss, EV_SOCK_ARG(e->ev_fd),
+	    (e->ev_events&EV_READ)?" Read":"",
+	    (e->ev_events&EV_WRITE)?" Write":"",
+	    (e->ev_events&EV_CLOSED)?" EOF":"",
+	    (e->ev_events&EV_SIGNAL)?" Signal":"",
+	    (e->ev_events&EV_PERSIST)?" Persist":"",
+	    (e->ev_events&EV_ET)?" ET":"",
+	    (e->ev_flags&EVLIST_INTERNAL)?" Internal":"");
+	if (e->ev_flags & EVLIST_TIMEOUT) {
+		struct timeval tv;
+		tv.tv_sec = e->ev_timeout.tv_sec;
+		tv.tv_usec = e->ev_timeout.tv_usec & MICROSECONDS_MASK;
+		evutil_timeradd(&tv, &base->tv_clock_diff, &tv);
+		fprintf(output, " Timeout=%ld.%06d",
+		    (long)tv.tv_sec, (int)(tv.tv_usec & MICROSECONDS_MASK));
+	}
+	fputc('\n', output);
+
+	return 0;
+}
+
+/* Helper for event_base_dump_events: called on each event in the event base;
+ * dumps only the active events. */
+static int
+dump_active_event_fn(const struct event_base *base, const struct event *e, void *arg)
+{
+	FILE *output = arg;
+	const char *gloss = (e->ev_events & EV_SIGNAL) ?
+	    "sig" : "fd ";
+
+	if (! (e->ev_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)))
+		return 0;
+
+	fprintf(output, "  %p [%s "EV_SOCK_FMT", priority=%d]%s%s%s%s%s active%s%s\n",
+	    (void*)e, gloss, EV_SOCK_ARG(e->ev_fd), e->ev_pri,
+	    (e->ev_res&EV_READ)?" Read":"",
+	    (e->ev_res&EV_WRITE)?" Write":"",
+	    (e->ev_res&EV_CLOSED)?" EOF":"",
+	    (e->ev_res&EV_SIGNAL)?" Signal":"",
+	    (e->ev_res&EV_TIMEOUT)?" Timeout":"",
+	    (e->ev_flags&EVLIST_INTERNAL)?" [Internal]":"",
+	    (e->ev_flags&EVLIST_ACTIVE_LATER)?" [NextTime]":"");
+
+	return 0;
+}
+
+int
+event_base_foreach_event(struct event_base *base,
+    event_base_foreach_event_cb fn, void *arg)
+{
+	int r;
+	if ((!fn) || (!base)) {
+		return -1;
+	}
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	r = event_base_foreach_event_nolock_(base, fn, arg);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+	return r;
+}
+
+
+void
+event_base_dump_events(struct event_base *base, FILE *output)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	fprintf(output, "Inserted events:\n");
+	event_base_foreach_event_nolock_(base, dump_inserted_event_fn, output);
+
+	fprintf(output, "Active events:\n");
+	event_base_foreach_event_nolock_(base, dump_active_event_fn, output);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+void
+event_base_active_by_fd(struct event_base *base, evutil_socket_t fd, short events)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	/* Activate any non timer events */
+	if (!(events & EV_TIMEOUT)) {
+		evmap_io_active_(base, fd, events & (EV_READ|EV_WRITE|EV_CLOSED));
+	} else {
+		/* If we want to activate timer events, loop and activate each event with
+		 * the same fd in both the timeheap and common timeouts list */
+		int i;
+		unsigned u;
+		struct event *ev;
+
+		for (u = 0; u < base->timeheap.n; ++u) {
+			ev = base->timeheap.p[u];
+			if (ev->ev_fd == fd) {
+				event_active_nolock_(ev, EV_TIMEOUT, 1);
+			}
+		}
+
+		for (i = 0; i < base->n_common_timeouts; ++i) {
+			struct common_timeout_list *ctl = base->common_timeout_queues[i];
+			TAILQ_FOREACH(ev, &ctl->events,
+				ev_timeout_pos.ev_next_with_common_timeout) {
+				if (ev->ev_fd == fd) {
+					event_active_nolock_(ev, EV_TIMEOUT, 1);
+				}
+			}
+		}
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+void
+event_base_active_by_signal(struct event_base *base, int sig)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	evmap_signal_active_(base, sig, 1);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+
+void
+event_base_add_virtual_(struct event_base *base)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	base->virtual_event_count++;
+	MAX_EVENT_COUNT(base->virtual_event_count_max, base->virtual_event_count);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+void
+event_base_del_virtual_(struct event_base *base)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	EVUTIL_ASSERT(base->virtual_event_count > 0);
+	base->virtual_event_count--;
+	if (base->virtual_event_count == 0 && EVBASE_NEED_NOTIFY(base))
+		evthread_notify_base(base);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+static void
+event_free_debug_globals_locks(void)
+{
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_map_lock_ != NULL) {
+		EVTHREAD_FREE_LOCK(event_debug_map_lock_, 0);
+		event_debug_map_lock_ = NULL;
+		evthreadimpl_disable_lock_debugging_();
+	}
+#endif /* EVENT__DISABLE_DEBUG_MODE */
+#endif /* EVENT__DISABLE_THREAD_SUPPORT */
+	return;
+}
+
+static void
+event_free_debug_globals(void)
+{
+	event_free_debug_globals_locks();
+}
+
+static void
+event_free_evsig_globals(void)
+{
+	evsig_free_globals_();
+}
+
+static void
+event_free_evutil_globals(void)
+{
+	evutil_free_globals_();
+}
+
+static void
+event_free_globals(void)
+{
+	event_free_debug_globals();
+	event_free_evsig_globals();
+	event_free_evutil_globals();
+}
+
+void
+libevent_global_shutdown(void)
+{
+	event_disable_debug_mode();
+	event_free_globals();
+}
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+event_global_setup_locks_(const int enable_locks)
+{
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	EVTHREAD_SETUP_GLOBAL_LOCK(event_debug_map_lock_, 0);
+#endif
+	if (evsig_global_setup_locks_(enable_locks) < 0)
+		return -1;
+	if (evutil_global_setup_locks_(enable_locks) < 0)
+		return -1;
+	if (evutil_secure_rng_global_setup_locks_(enable_locks) < 0)
+		return -1;
+	return 0;
+}
+#endif
+
+void
+event_base_assert_ok_(struct event_base *base)
+{
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	event_base_assert_ok_nolock_(base);
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+void
+event_base_assert_ok_nolock_(struct event_base *base)
+{
+	int i;
+	int count;
+
+	/* First do checks on the per-fd and per-signal lists */
+	evmap_check_integrity_(base);
+
+	/* Check the heap property */
+	for (i = 1; i < (int)base->timeheap.n; ++i) {
+		int parent = (i - 1) / 2;
+		struct event *ev, *p_ev;
+		ev = base->timeheap.p[i];
+		p_ev = base->timeheap.p[parent];
+		EVUTIL_ASSERT(ev->ev_flags & EVLIST_TIMEOUT);
+		EVUTIL_ASSERT(evutil_timercmp(&p_ev->ev_timeout, &ev->ev_timeout, <=));
+		EVUTIL_ASSERT(ev->ev_timeout_pos.min_heap_idx == i);
+	}
+
+	/* Check that the common timeouts are fine */
+	for (i = 0; i < base->n_common_timeouts; ++i) {
+		struct common_timeout_list *ctl = base->common_timeout_queues[i];
+		struct event *last=NULL, *ev;
+
+		EVUTIL_ASSERT_TAILQ_OK(&ctl->events, event, ev_timeout_pos.ev_next_with_common_timeout);
+
+		TAILQ_FOREACH(ev, &ctl->events, ev_timeout_pos.ev_next_with_common_timeout) {
+			if (last)
+				EVUTIL_ASSERT(evutil_timercmp(&last->ev_timeout, &ev->ev_timeout, <=));
+			EVUTIL_ASSERT(ev->ev_flags & EVLIST_TIMEOUT);
+			EVUTIL_ASSERT(is_common_timeout(&ev->ev_timeout,base));
+			EVUTIL_ASSERT(COMMON_TIMEOUT_IDX(&ev->ev_timeout) == i);
+			last = ev;
+		}
+	}
+
+	/* Check the active queues. */
+	count = 0;
+	for (i = 0; i < base->nactivequeues; ++i) {
+		struct event_callback *evcb;
+		EVUTIL_ASSERT_TAILQ_OK(&base->activequeues[i], event_callback, evcb_active_next);
+		TAILQ_FOREACH(evcb, &base->activequeues[i], evcb_active_next) {
+			EVUTIL_ASSERT((evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)) == EVLIST_ACTIVE);
+			EVUTIL_ASSERT(evcb->evcb_pri == i);
+			++count;
+		}
+	}
+
+	{
+		struct event_callback *evcb;
+		TAILQ_FOREACH(evcb, &base->active_later_queue, evcb_active_next) {
+			EVUTIL_ASSERT((evcb->evcb_flags & (EVLIST_ACTIVE|EVLIST_ACTIVE_LATER)) == EVLIST_ACTIVE_LATER);
+			++count;
+		}
+	}
+	EVUTIL_ASSERT(count == base->event_count_active);
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/event_iocp.c b/extra/libevent/libevent-2.1.11-stable/event_iocp.c
new file mode 100644
index 000000000000..6b2a2e15ef86
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/event_iocp.c
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "evconfig-private.h"
+
+#ifndef _WIN32_WINNT
+/* Minimum required for InitializeCriticalSectionAndSpinCount */
+#define _WIN32_WINNT 0x0403
+#endif
+#include <winsock2.h>
+#include <windows.h>
+#include <process.h>
+#include <stdio.h>
+#include <mswsock.h>
+
+#include "event2/util.h"
+#include "util-internal.h"
+#include "iocp-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "event-internal.h"
+#include "evthread-internal.h"
+
+#define NOTIFICATION_KEY ((ULONG_PTR)-1)
+
+void
+event_overlapped_init_(struct event_overlapped *o, iocp_callback cb)
+{
+	memset(o, 0, sizeof(struct event_overlapped));
+	o->cb = cb;
+}
+
+static void
+handle_entry(OVERLAPPED *o, ULONG_PTR completion_key, DWORD nBytes, int ok)
+{
+	struct event_overlapped *eo =
+	    EVUTIL_UPCAST(o, struct event_overlapped, overlapped);
+	eo->cb(eo, completion_key, nBytes, ok);
+}
+
+static void
+loop(void *port_)
+{
+	struct event_iocp_port *port = port_;
+	long ms = port->ms;
+	HANDLE p = port->port;
+
+	if (ms <= 0)
+		ms = INFINITE;
+
+	while (1) {
+		OVERLAPPED *overlapped=NULL;
+		ULONG_PTR key=0;
+		DWORD bytes=0;
+		int ok = GetQueuedCompletionStatus(p, &bytes, &key,
+			&overlapped, ms);
+		EnterCriticalSection(&port->lock);
+		if (port->shutdown) {
+			if (--port->n_live_threads == 0)
+				ReleaseSemaphore(port->shutdownSemaphore, 1,
+						NULL);
+			LeaveCriticalSection(&port->lock);
+			return;
+		}
+		LeaveCriticalSection(&port->lock);
+
+		if (key != NOTIFICATION_KEY && overlapped)
+			handle_entry(overlapped, key, bytes, ok);
+		else if (!overlapped)
+			break;
+	}
+	event_warnx("GetQueuedCompletionStatus exited with no event.");
+	EnterCriticalSection(&port->lock);
+	if (--port->n_live_threads == 0)
+		ReleaseSemaphore(port->shutdownSemaphore, 1, NULL);
+	LeaveCriticalSection(&port->lock);
+}
+
+int
+event_iocp_port_associate_(struct event_iocp_port *port, evutil_socket_t fd,
+    ev_uintptr_t key)
+{
+	HANDLE h;
+	h = CreateIoCompletionPort((HANDLE)fd, port->port, key, port->n_threads);
+	if (!h)
+		return -1;
+	return 0;
+}
+
+static void *
+get_extension_function(SOCKET s, const GUID *which_fn)
+{
+	void *ptr = NULL;
+	DWORD bytes=0;
+	WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
+	    (GUID*)which_fn, sizeof(*which_fn),
+	    &ptr, sizeof(ptr),
+	    &bytes, NULL, NULL);
+
+	/* No need to detect errors here: if ptr is set, then we have a good
+	   function pointer.  Otherwise, we should behave as if we had no
+	   function pointer.
+	*/
+	return ptr;
+}
+
+/* Mingw doesn't have these in its mswsock.h.  The values are copied from
+   wine.h.   Perhaps if we copy them exactly, the cargo will come again.
+*/
+#ifndef WSAID_ACCEPTEX
+#define WSAID_ACCEPTEX \
+	{0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
+#endif
+#ifndef WSAID_CONNECTEX
+#define WSAID_CONNECTEX \
+	{0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}}
+#endif
+#ifndef WSAID_GETACCEPTEXSOCKADDRS
+#define WSAID_GETACCEPTEXSOCKADDRS \
+	{0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
+#endif
+
+static int extension_fns_initialized = 0;
+
+static void
+init_extension_functions(struct win32_extension_fns *ext)
+{
+	const GUID acceptex = WSAID_ACCEPTEX;
+	const GUID connectex = WSAID_CONNECTEX;
+	const GUID getacceptexsockaddrs = WSAID_GETACCEPTEXSOCKADDRS;
+	SOCKET s = socket(AF_INET, SOCK_STREAM, 0);
+	if (s == EVUTIL_INVALID_SOCKET)
+		return;
+	ext->AcceptEx = get_extension_function(s, &acceptex);
+	ext->ConnectEx = get_extension_function(s, &connectex);
+	ext->GetAcceptExSockaddrs = get_extension_function(s,
+	    &getacceptexsockaddrs);
+	closesocket(s);
+
+	extension_fns_initialized = 1;
+}
+
+static struct win32_extension_fns the_extension_fns;
+
+const struct win32_extension_fns *
+event_get_win32_extension_fns_(void)
+{
+	return &the_extension_fns;
+}
+
+#define N_CPUS_DEFAULT 2
+
+struct event_iocp_port *
+event_iocp_port_launch_(int n_cpus)
+{
+	struct event_iocp_port *port;
+	int i;
+
+	if (!extension_fns_initialized)
+		init_extension_functions(&the_extension_fns);
+
+	if (!(port = mm_calloc(1, sizeof(struct event_iocp_port))))
+		return NULL;
+
+	if (n_cpus <= 0)
+		n_cpus = N_CPUS_DEFAULT;
+	port->n_threads = n_cpus * 2;
+	port->threads = mm_calloc(port->n_threads, sizeof(HANDLE));
+	if (!port->threads)
+		goto err;
+
+	port->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0,
+			n_cpus);
+	port->ms = -1;
+	if (!port->port)
+		goto err;
+
+	port->shutdownSemaphore = CreateSemaphore(NULL, 0, 1, NULL);
+	if (!port->shutdownSemaphore)
+		goto err;
+
+	for (i=0; i<port->n_threads; ++i) {
+		ev_uintptr_t th = _beginthread(loop, 0, port);
+		if (th == (ev_uintptr_t)-1)
+			goto err;
+		port->threads[i] = (HANDLE)th;
+		++port->n_live_threads;
+	}
+
+	InitializeCriticalSectionAndSpinCount(&port->lock, 1000);
+
+	return port;
+err:
+	if (port->port)
+		CloseHandle(port->port);
+	if (port->threads)
+		mm_free(port->threads);
+	if (port->shutdownSemaphore)
+		CloseHandle(port->shutdownSemaphore);
+	mm_free(port);
+	return NULL;
+}
+
+static void
+event_iocp_port_unlock_and_free_(struct event_iocp_port *port)
+{
+	DeleteCriticalSection(&port->lock);
+	CloseHandle(port->port);
+	CloseHandle(port->shutdownSemaphore);
+	mm_free(port->threads);
+	mm_free(port);
+}
+
+static int
+event_iocp_notify_all(struct event_iocp_port *port)
+{
+	int i, r, ok=1;
+	for (i=0; i<port->n_threads; ++i) {
+		r = PostQueuedCompletionStatus(port->port, 0, NOTIFICATION_KEY,
+		    NULL);
+		if (!r)
+			ok = 0;
+	}
+	return ok ? 0 : -1;
+}
+
+int
+event_iocp_shutdown_(struct event_iocp_port *port, long waitMsec)
+{
+	DWORD ms = INFINITE;
+	int n;
+
+	EnterCriticalSection(&port->lock);
+	port->shutdown = 1;
+	LeaveCriticalSection(&port->lock);
+	event_iocp_notify_all(port);
+
+	if (waitMsec >= 0)
+		ms = waitMsec;
+
+	WaitForSingleObject(port->shutdownSemaphore, ms);
+	EnterCriticalSection(&port->lock);
+	n = port->n_live_threads;
+	LeaveCriticalSection(&port->lock);
+	if (n == 0) {
+		event_iocp_port_unlock_and_free_(port);
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+int
+event_iocp_activate_overlapped_(
+    struct event_iocp_port *port, struct event_overlapped *o,
+    ev_uintptr_t key, ev_uint32_t n)
+{
+	BOOL r;
+
+	r = PostQueuedCompletionStatus(port->port, n, key, &o->overlapped);
+	return (r==0) ? -1 : 0;
+}
+
+struct event_iocp_port *
+event_base_get_iocp_(struct event_base *base)
+{
+#ifdef _WIN32
+	return base->iocp;
+#else
+	return NULL;
+#endif
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/event_tagging.c b/extra/libevent/libevent-2.1.11-stable/event_tagging.c
new file mode 100644
index 000000000000..b021e8c8dea2
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/event_tagging.c
@@ -0,0 +1,609 @@
+/*
+ * Copyright (c) 2003-2009 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef EVENT__HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#include <sys/queue.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef _WIN32
+#include <syslog.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <limits.h>
+
+#include "event2/event.h"
+#include "event2/tag.h"
+#include "event2/buffer.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+
+/*
+  Here's our wire format:
+
+  Stream = TaggedData*
+
+  TaggedData = Tag Length Data
+       where the integer value of 'Length' is the length of 'data'.
+
+  Tag = HByte* LByte
+       where HByte is a byte with the high bit set, and LByte is a byte
+       with the high bit clear. The integer value of the tag is taken
+       by concatenating the lower 7 bits from all the tags.  So for example,
+       the tag 0x66 is encoded as [66], whereas the tag 0x166 is encoded as
+       [82 66]
+
+  Length = Integer
+
+  Integer = NNibbles Nibble* Padding?
+       where NNibbles is a 4-bit value encoding the number of nibbles-1,
+       and each Nibble is 4 bits worth of encoded integer, in big-endian
+       order.  If the total encoded integer size is an odd number of nibbles,
+       a final padding nibble with value 0 is appended.
+*/
+
+EVENT2_EXPORT_SYMBOL
+int evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf);
+EVENT2_EXPORT_SYMBOL
+int evtag_decode_int64(ev_uint64_t *pnumber, struct evbuffer *evbuf);
+EVENT2_EXPORT_SYMBOL
+int evtag_encode_tag(struct evbuffer *evbuf, ev_uint32_t tag);
+EVENT2_EXPORT_SYMBOL
+int evtag_decode_tag(ev_uint32_t *ptag, struct evbuffer *evbuf);
+
+void
+evtag_init(void)
+{
+}
+
+/*
+ * We encode integers by nibbles; the first nibble contains the number
+ * of significant nibbles - 1;  this allows us to encode up to 64-bit
+ * integers.  This function is byte-order independent.
+ *
+ * @param number a 32-bit unsigned integer to encode
+ * @param data a pointer to where the data should be written.  Must
+ *    have at least 5 bytes free.
+ * @return the number of bytes written into data.
+ */
+
+#define ENCODE_INT_INTERNAL(data, number) do {				\
+	int off = 1, nibbles = 0;					\
+									\
+	memset(data, 0, sizeof(number)+1);				\
+	while (number) {						\
+		if (off & 0x1)						\
+			data[off/2] = (data[off/2] & 0xf0) | (number & 0x0f); \
+		else							\
+			data[off/2] = (data[off/2] & 0x0f) |		\
+			    ((number & 0x0f) << 4);			\
+		number >>= 4;						\
+		off++;							\
+	}								\
+									\
+	if (off > 2)							\
+		nibbles = off - 2;					\
+									\
+	/* Off - 1 is the number of encoded nibbles */			\
+	data[0] = (data[0] & 0x0f) | ((nibbles & 0x0f) << 4);		\
+									\
+	return ((off + 1) / 2);						\
+} while (0)
+
+static inline int
+encode_int_internal(ev_uint8_t *data, ev_uint32_t number)
+{
+	ENCODE_INT_INTERNAL(data, number);
+}
+
+static inline int
+encode_int64_internal(ev_uint8_t *data, ev_uint64_t number)
+{
+	ENCODE_INT_INTERNAL(data, number);
+}
+
+void
+evtag_encode_int(struct evbuffer *evbuf, ev_uint32_t number)
+{
+	ev_uint8_t data[5];
+	int len = encode_int_internal(data, number);
+	evbuffer_add(evbuf, data, len);
+}
+
+void
+evtag_encode_int64(struct evbuffer *evbuf, ev_uint64_t number)
+{
+	ev_uint8_t data[9];
+	int len = encode_int64_internal(data, number);
+	evbuffer_add(evbuf, data, len);
+}
+
+/*
+ * Support variable length encoding of tags; we use the high bit in each
+ * octet as a continuation signal.
+ */
+
+int
+evtag_encode_tag(struct evbuffer *evbuf, ev_uint32_t tag)
+{
+	int bytes = 0;
+	ev_uint8_t data[5];
+
+	memset(data, 0, sizeof(data));
+	do {
+		ev_uint8_t lower = tag & 0x7f;
+		tag >>= 7;
+
+		if (tag)
+			lower |= 0x80;
+
+		data[bytes++] = lower;
+	} while (tag);
+
+	if (evbuf != NULL)
+		evbuffer_add(evbuf, data, bytes);
+
+	return (bytes);
+}
+
+static int
+decode_tag_internal(ev_uint32_t *ptag, struct evbuffer *evbuf, int dodrain)
+{
+	ev_uint32_t number = 0;
+	size_t len = evbuffer_get_length(evbuf);
+	ev_uint8_t *data;
+	size_t count = 0;
+	int  shift = 0, done = 0;
+
+	/*
+	 * the encoding of a number is at most one byte more than its
+	 * storage size.  however, it may also be much smaller.
+	 */
+	data = evbuffer_pullup(
+		evbuf, len < sizeof(number) + 1 ? len : sizeof(number) + 1);
+	if (!data)
+		return (-1);
+
+	while (count++ < len) {
+		ev_uint8_t lower = *data++;
+		if (shift >= 28) {
+			/* Make sure it fits into 32 bits */
+			if (shift > 28)
+				return (-1);
+			if ((lower & 0x7f) > 15)
+				return (-1);
+		}
+		number |= (lower & (unsigned)0x7f) << shift;
+		shift += 7;
+
+		if (!(lower & 0x80)) {
+			done = 1;
+			break;
+		}
+	}
+
+	if (!done)
+		return (-1);
+
+	if (dodrain)
+		evbuffer_drain(evbuf, count);
+
+	if (ptag != NULL)
+		*ptag = number;
+
+	return count > INT_MAX ? INT_MAX : (int)(count);
+}
+
+int
+evtag_decode_tag(ev_uint32_t *ptag, struct evbuffer *evbuf)
+{
+	return (decode_tag_internal(ptag, evbuf, 1 /* dodrain */));
+}
+
+/*
+ * Marshal a data type, the general format is as follows:
+ *
+ * tag number: one byte; length: var bytes; payload: var bytes
+ */
+
+void
+evtag_marshal(struct evbuffer *evbuf, ev_uint32_t tag,
+    const void *data, ev_uint32_t len)
+{
+	evtag_encode_tag(evbuf, tag);
+	evtag_encode_int(evbuf, len);
+	evbuffer_add(evbuf, (void *)data, len);
+}
+
+void
+evtag_marshal_buffer(struct evbuffer *evbuf, ev_uint32_t tag,
+    struct evbuffer *data)
+{
+	evtag_encode_tag(evbuf, tag);
+	/* XXX support more than UINT32_MAX data */
+	evtag_encode_int(evbuf, (ev_uint32_t)evbuffer_get_length(data));
+	evbuffer_add_buffer(evbuf, data);
+}
+
+/* Marshaling for integers */
+void
+evtag_marshal_int(struct evbuffer *evbuf, ev_uint32_t tag, ev_uint32_t integer)
+{
+	ev_uint8_t data[5];
+	int len = encode_int_internal(data, integer);
+
+	evtag_encode_tag(evbuf, tag);
+	evtag_encode_int(evbuf, len);
+	evbuffer_add(evbuf, data, len);
+}
+
+void
+evtag_marshal_int64(struct evbuffer *evbuf, ev_uint32_t tag,
+    ev_uint64_t integer)
+{
+	ev_uint8_t data[9];
+	int len = encode_int64_internal(data, integer);
+
+	evtag_encode_tag(evbuf, tag);
+	evtag_encode_int(evbuf, len);
+	evbuffer_add(evbuf, data, len);
+}
+
+void
+evtag_marshal_string(struct evbuffer *buf, ev_uint32_t tag, const char *string)
+{
+	/* TODO support strings longer than UINT32_MAX ? */
+	evtag_marshal(buf, tag, string, (ev_uint32_t)strlen(string));
+}
+
+void
+evtag_marshal_timeval(struct evbuffer *evbuf, ev_uint32_t tag, struct timeval *tv)
+{
+	ev_uint8_t data[10];
+	int len = encode_int_internal(data, tv->tv_sec);
+	len += encode_int_internal(data + len, tv->tv_usec);
+	evtag_marshal(evbuf, tag, data, len);
+}
+
+#define DECODE_INT_INTERNAL(number, maxnibbles, pnumber, evbuf, offset) \
+do {									\
+	ev_uint8_t *data;						\
+	ev_ssize_t len = evbuffer_get_length(evbuf) - offset;		\
+	int nibbles = 0;						\
+									\
+	if (len <= 0)							\
+		return (-1);						\
+									\
+	/* XXX(niels): faster? */					\
+	data = evbuffer_pullup(evbuf, offset + 1) + offset;		\
+	if (!data)							\
+		return (-1);						\
+									\
+	nibbles = ((data[0] & 0xf0) >> 4) + 1;				\
+	if (nibbles > maxnibbles || (nibbles >> 1) + 1 > len)		\
+		return (-1);						\
+	len = (nibbles >> 1) + 1;					\
+									\
+	data = evbuffer_pullup(evbuf, offset + len) + offset;		\
+	if (!data)							\
+		return (-1);						\
+									\
+	while (nibbles > 0) {						\
+		number <<= 4;						\
+		if (nibbles & 0x1)					\
+			number |= data[nibbles >> 1] & 0x0f;		\
+		else							\
+			number |= (data[nibbles >> 1] & 0xf0) >> 4;	\
+		nibbles--;						\
+	}								\
+									\
+	*pnumber = number;						\
+									\
+	return (int)(len);						\
+} while (0)
+
+/* Internal: decode an integer from an evbuffer, without draining it.
+ *  Only integers up to 32-bits are supported.
+ *
+ * @param evbuf the buffer to read from
+ * @param offset an index into the buffer at which we should start reading.
+ * @param pnumber a pointer to receive the integer.
+ * @return The length of the number as encoded, or -1 on error.
+ */
+
+static int
+decode_int_internal(ev_uint32_t *pnumber, struct evbuffer *evbuf, int offset)
+{
+	ev_uint32_t number = 0;
+	DECODE_INT_INTERNAL(number, 8, pnumber, evbuf, offset);
+}
+
+static int
+decode_int64_internal(ev_uint64_t *pnumber, struct evbuffer *evbuf, int offset)
+{
+	ev_uint64_t number = 0;
+	DECODE_INT_INTERNAL(number, 16, pnumber, evbuf, offset);
+}
+
+int
+evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf)
+{
+	int res = decode_int_internal(pnumber, evbuf, 0);
+	if (res != -1)
+		evbuffer_drain(evbuf, res);
+
+	return (res == -1 ? -1 : 0);
+}
+
+int
+evtag_decode_int64(ev_uint64_t *pnumber, struct evbuffer *evbuf)
+{
+	int res = decode_int64_internal(pnumber, evbuf, 0);
+	if (res != -1)
+		evbuffer_drain(evbuf, res);
+
+	return (res == -1 ? -1 : 0);
+}
+
+int
+evtag_peek(struct evbuffer *evbuf, ev_uint32_t *ptag)
+{
+	return (decode_tag_internal(ptag, evbuf, 0 /* dodrain */));
+}
+
+int
+evtag_peek_length(struct evbuffer *evbuf, ev_uint32_t *plength)
+{
+	int res, len;
+
+	len = decode_tag_internal(NULL, evbuf, 0 /* dodrain */);
+	if (len == -1)
+		return (-1);
+
+	res = decode_int_internal(plength, evbuf, len);
+	if (res == -1)
+		return (-1);
+
+	*plength += res + len;
+
+	return (0);
+}
+
+int
+evtag_payload_length(struct evbuffer *evbuf, ev_uint32_t *plength)
+{
+	int res, len;
+
+	len = decode_tag_internal(NULL, evbuf, 0 /* dodrain */);
+	if (len == -1)
+		return (-1);
+
+	res = decode_int_internal(plength, evbuf, len);
+	if (res == -1)
+		return (-1);
+
+	return (0);
+}
+
+/* just unmarshals the header and returns the length of the remaining data */
+
+int
+evtag_unmarshal_header(struct evbuffer *evbuf, ev_uint32_t *ptag)
+{
+	ev_uint32_t len;
+
+	if (decode_tag_internal(ptag, evbuf, 1 /* dodrain */) == -1)
+		return (-1);
+	if (evtag_decode_int(&len, evbuf) == -1)
+		return (-1);
+
+	if (evbuffer_get_length(evbuf) < len)
+		return (-1);
+
+	return (len);
+}
+
+int
+evtag_consume(struct evbuffer *evbuf)
+{
+	int len;
+	if ((len = evtag_unmarshal_header(evbuf, NULL)) == -1)
+		return (-1);
+	evbuffer_drain(evbuf, len);
+
+	return (0);
+}
+
+/* Reads the data type from an event buffer */
+
+int
+evtag_unmarshal(struct evbuffer *src, ev_uint32_t *ptag, struct evbuffer *dst)
+{
+	int len;
+
+	if ((len = evtag_unmarshal_header(src, ptag)) == -1)
+		return (-1);
+
+	if (evbuffer_add(dst, evbuffer_pullup(src, len), len) == -1)
+		return (-1);
+
+	evbuffer_drain(src, len);
+
+	return (len);
+}
+
+/* Marshaling for integers */
+
+int
+evtag_unmarshal_int(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    ev_uint32_t *pinteger)
+{
+	ev_uint32_t tag;
+	ev_uint32_t len;
+	int result;
+
+	if (decode_tag_internal(&tag, evbuf, 1 /* dodrain */) == -1)
+		return (-1);
+	if (need_tag != tag)
+		return (-1);
+	if (evtag_decode_int(&len, evbuf) == -1)
+		return (-1);
+
+	if (evbuffer_get_length(evbuf) < len)
+		return (-1);
+
+	result = decode_int_internal(pinteger, evbuf, 0);
+	evbuffer_drain(evbuf, len);
+	if (result < 0 || (size_t)result > len) /* XXX Should this be != rather than > ?*/
+		return (-1);
+	else
+		return result;
+}
+
+int
+evtag_unmarshal_int64(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    ev_uint64_t *pinteger)
+{
+	ev_uint32_t tag;
+	ev_uint32_t len;
+	int result;
+
+	if (decode_tag_internal(&tag, evbuf, 1 /* dodrain */) == -1)
+		return (-1);
+	if (need_tag != tag)
+		return (-1);
+	if (evtag_decode_int(&len, evbuf) == -1)
+		return (-1);
+
+	if (evbuffer_get_length(evbuf) < len)
+		return (-1);
+
+	result = decode_int64_internal(pinteger, evbuf, 0);
+	evbuffer_drain(evbuf, len);
+	if (result < 0 || (size_t)result > len) /* XXX Should this be != rather than > ?*/
+		return (-1);
+	else
+		return result;
+}
+
+/* Unmarshal a fixed length tag */
+
+int
+evtag_unmarshal_fixed(struct evbuffer *src, ev_uint32_t need_tag, void *data,
+    size_t len)
+{
+	ev_uint32_t tag;
+	int tag_len;
+
+	/* Now unmarshal a tag and check that it matches the tag we want */
+	if ((tag_len = evtag_unmarshal_header(src, &tag)) < 0 ||
+	    tag != need_tag)
+		return (-1);
+
+	if ((size_t)tag_len != len)
+		return (-1);
+
+	evbuffer_remove(src, data, len);
+	return (0);
+}
+
+int
+evtag_unmarshal_string(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    char **pstring)
+{
+	ev_uint32_t tag;
+	int tag_len;
+
+	if ((tag_len = evtag_unmarshal_header(evbuf, &tag)) == -1 ||
+	    tag != need_tag)
+		return (-1);
+
+	*pstring = mm_malloc(tag_len + 1);
+	if (*pstring == NULL) {
+		event_warn("%s: malloc", __func__);
+		return -1;
+	}
+	evbuffer_remove(evbuf, *pstring, tag_len);
+	(*pstring)[tag_len] = '\0';
+
+	return (0);
+}
+
+int
+evtag_unmarshal_timeval(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    struct timeval *ptv)
+{
+	ev_uint32_t tag;
+	ev_uint32_t integer;
+	int len, offset, offset2;
+	int result = -1;
+
+	if ((len = evtag_unmarshal_header(evbuf, &tag)) == -1)
+		return (-1);
+	if (tag != need_tag)
+		goto done;
+	if ((offset = decode_int_internal(&integer, evbuf, 0)) == -1)
+		goto done;
+	ptv->tv_sec = integer;
+	if ((offset2 = decode_int_internal(&integer, evbuf, offset)) == -1)
+		goto done;
+	ptv->tv_usec = integer;
+	if (offset + offset2 > len) /* XXX Should this be != instead of > ? */
+		goto done;
+
+	result = 0;
+ done:
+	evbuffer_drain(evbuf, len);
+	return result;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/evmap-internal.h b/extra/libevent/libevent-2.1.11-stable/evmap-internal.h
new file mode 100644
index 000000000000..dfc81d5087a9
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evmap-internal.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVMAP_INTERNAL_H_INCLUDED_
+#define EVMAP_INTERNAL_H_INCLUDED_
+
+/** @file evmap-internal.h
+ *
+ * An event_map is a utility structure to map each fd or signal to zero or
+ * more events.  Functions to manipulate event_maps should only be used from
+ * inside libevent.  They generally need to hold the lock on the corresponding
+ * event_base.
+ **/
+
+struct event_base;
+struct event;
+
+/** Initialize an event_map for use.
+ */
+void evmap_io_initmap_(struct event_io_map* ctx);
+void evmap_signal_initmap_(struct event_signal_map* ctx);
+
+/** Remove all entries from an event_map.
+
+	@param ctx the map to clear.
+ */
+void evmap_io_clear_(struct event_io_map* ctx);
+void evmap_signal_clear_(struct event_signal_map* ctx);
+
+/** Add an IO event (some combination of EV_READ or EV_WRITE) to an
+    event_base's list of events on a given file descriptor, and tell the
+    underlying eventops about the fd if its state has changed.
+
+    Requires that ev is not already added.
+
+    @param base the event_base to operate on.
+    @param fd the file descriptor corresponding to ev.
+    @param ev the event to add.
+*/
+int evmap_io_add_(struct event_base *base, evutil_socket_t fd, struct event *ev);
+/** Remove an IO event (some combination of EV_READ or EV_WRITE) to an
+    event_base's list of events on a given file descriptor, and tell the
+    underlying eventops about the fd if its state has changed.
+
+    @param base the event_base to operate on.
+    @param fd the file descriptor corresponding to ev.
+    @param ev the event to remove.
+ */
+int evmap_io_del_(struct event_base *base, evutil_socket_t fd, struct event *ev);
+/** Active the set of events waiting on an event_base for a given fd.
+
+    @param base the event_base to operate on.
+    @param fd the file descriptor that has become active.
+    @param events a bitmask of EV_READ|EV_WRITE|EV_ET.
+*/
+void evmap_io_active_(struct event_base *base, evutil_socket_t fd, short events);
+
+
+/* These functions behave in the same way as evmap_io_*, except they work on
+ * signals rather than fds.  signals use a linear map everywhere; fds use
+ * either a linear map or a hashtable. */
+int evmap_signal_add_(struct event_base *base, int signum, struct event *ev);
+int evmap_signal_del_(struct event_base *base, int signum, struct event *ev);
+void evmap_signal_active_(struct event_base *base, evutil_socket_t signum, int ncalls);
+
+/* Return the fdinfo object associated with a given fd.  If the fd has no
+ * events associated with it, the result may be NULL.
+ */
+void *evmap_io_get_fdinfo_(struct event_io_map *ctx, evutil_socket_t fd);
+
+/* Helper for event_reinit(): Tell the backend to re-add every fd and signal
+ * for which we have a pending event.
+ */
+int evmap_reinit_(struct event_base *base);
+
+/* Helper for event_base_free(): Call event_del() on every pending fd and
+ * signal event.
+ */
+void evmap_delete_all_(struct event_base *base);
+
+/* Helper for event_base_assert_ok_(): Check referential integrity of the
+ * evmaps.
+ */
+void evmap_check_integrity_(struct event_base *base);
+
+/* Helper: Call fn on every fd or signal event, passing as its arguments the
+ * provided event_base, the event, and arg.  If fn returns 0, process the next
+ * event.  If it returns any other value, return that value and process no
+ * more events.
+ */
+int evmap_foreach_event_(struct event_base *base,
+    event_base_foreach_event_cb fn,
+    void *arg);
+
+#endif /* EVMAP_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/evmap.c b/extra/libevent/libevent-2.1.11-stable/evmap.c
new file mode 100644
index 000000000000..ffc991f5ccd6
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evmap.c
@@ -0,0 +1,1062 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+#include <sys/types.h>
+#if !defined(_WIN32) && defined(EVENT__HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <string.h>
+#include <time.h>
+
+#include "event-internal.h"
+#include "evmap-internal.h"
+#include "mm-internal.h"
+#include "changelist-internal.h"
+
+/** An entry for an evmap_io list: notes all the events that want to read or
+	write on a given fd, and the number of each.
+  */
+struct evmap_io {
+	struct event_dlist events;
+	ev_uint16_t nread;
+	ev_uint16_t nwrite;
+	ev_uint16_t nclose;
+};
+
+/* An entry for an evmap_signal list: notes all the events that want to know
+   when a signal triggers. */
+struct evmap_signal {
+	struct event_dlist events;
+};
+
+/* On some platforms, fds start at 0 and increment by 1 as they are
+   allocated, and old numbers get used.  For these platforms, we
+   implement io maps just like signal maps: as an array of pointers to
+   struct evmap_io.  But on other platforms (windows), sockets are not
+   0-indexed, not necessarily consecutive, and not necessarily reused.
+   There, we use a hashtable to implement evmap_io.
+*/
+#ifdef EVMAP_USE_HT
+struct event_map_entry {
+	HT_ENTRY(event_map_entry) map_node;
+	evutil_socket_t fd;
+	union { /* This is a union in case we need to make more things that can
+			   be in the hashtable. */
+		struct evmap_io evmap_io;
+	} ent;
+};
+
+/* Helper used by the event_io_map hashtable code; tries to return a good hash
+ * of the fd in e->fd. */
+static inline unsigned
+hashsocket(struct event_map_entry *e)
+{
+	/* On win32, in practice, the low 2-3 bits of a SOCKET seem not to
+	 * matter.  Our hashtable implementation really likes low-order bits,
+	 * though, so let's do the rotate-and-add trick. */
+	unsigned h = (unsigned) e->fd;
+	h += (h >> 2) | (h << 30);
+	return h;
+}
+
+/* Helper used by the event_io_map hashtable code; returns true iff e1 and e2
+ * have the same e->fd. */
+static inline int
+eqsocket(struct event_map_entry *e1, struct event_map_entry *e2)
+{
+	return e1->fd == e2->fd;
+}
+
+HT_PROTOTYPE(event_io_map, event_map_entry, map_node, hashsocket, eqsocket)
+HT_GENERATE(event_io_map, event_map_entry, map_node, hashsocket, eqsocket,
+			0.5, mm_malloc, mm_realloc, mm_free)
+
+#define GET_IO_SLOT(x, map, slot, type)					\
+	do {								\
+		struct event_map_entry key_, *ent_;			\
+		key_.fd = slot;						\
+		ent_ = HT_FIND(event_io_map, map, &key_);		\
+		(x) = ent_ ? &ent_->ent.type : NULL;			\
+	} while (0);
+
+#define GET_IO_SLOT_AND_CTOR(x, map, slot, type, ctor, fdinfo_len)	\
+	do {								\
+		struct event_map_entry key_, *ent_;			\
+		key_.fd = slot;						\
+		HT_FIND_OR_INSERT_(event_io_map, map_node, hashsocket, map, \
+		    event_map_entry, &key_, ptr,			\
+		    {							\
+			    ent_ = *ptr;				\
+		    },							\
+		    {							\
+			    ent_ = mm_calloc(1,sizeof(struct event_map_entry)+fdinfo_len); \
+			    if (EVUTIL_UNLIKELY(ent_ == NULL))		\
+				    return (-1);			\
+			    ent_->fd = slot;				\
+			    (ctor)(&ent_->ent.type);			\
+			    HT_FOI_INSERT_(map_node, map, &key_, ent_, ptr) \
+				});					\
+		(x) = &ent_->ent.type;					\
+	} while (0)
+
+void evmap_io_initmap_(struct event_io_map *ctx)
+{
+	HT_INIT(event_io_map, ctx);
+}
+
+void evmap_io_clear_(struct event_io_map *ctx)
+{
+	struct event_map_entry **ent, **next, *this;
+	for (ent = HT_START(event_io_map, ctx); ent; ent = next) {
+		this = *ent;
+		next = HT_NEXT_RMV(event_io_map, ctx, ent);
+		mm_free(this);
+	}
+	HT_CLEAR(event_io_map, ctx); /* remove all storage held by the ctx. */
+}
+#endif
+
+/* Set the variable 'x' to the field in event_map 'map' with fields of type
+   'struct type *' corresponding to the fd or signal 'slot'.  Set 'x' to NULL
+   if there are no entries for 'slot'.  Does no bounds-checking. */
+#define GET_SIGNAL_SLOT(x, map, slot, type)			\
+	(x) = (struct type *)((map)->entries[slot])
+/* As GET_SLOT, but construct the entry for 'slot' if it is not present,
+   by allocating enough memory for a 'struct type', and initializing the new
+   value by calling the function 'ctor' on it.  Makes the function
+   return -1 on allocation failure.
+ */
+#define GET_SIGNAL_SLOT_AND_CTOR(x, map, slot, type, ctor, fdinfo_len)	\
+	do {								\
+		if ((map)->entries[slot] == NULL) {			\
+			(map)->entries[slot] =				\
+			    mm_calloc(1,sizeof(struct type)+fdinfo_len); \
+			if (EVUTIL_UNLIKELY((map)->entries[slot] == NULL)) \
+				return (-1);				\
+			(ctor)((struct type *)(map)->entries[slot]);	\
+		}							\
+		(x) = (struct type *)((map)->entries[slot]);		\
+	} while (0)
+
+/* If we aren't using hashtables, then define the IO_SLOT macros and functions
+   as thin aliases over the SIGNAL_SLOT versions. */
+#ifndef EVMAP_USE_HT
+#define GET_IO_SLOT(x,map,slot,type) GET_SIGNAL_SLOT(x,map,slot,type)
+#define GET_IO_SLOT_AND_CTOR(x,map,slot,type,ctor,fdinfo_len)	\
+	GET_SIGNAL_SLOT_AND_CTOR(x,map,slot,type,ctor,fdinfo_len)
+#define FDINFO_OFFSET sizeof(struct evmap_io)
+void
+evmap_io_initmap_(struct event_io_map* ctx)
+{
+	evmap_signal_initmap_(ctx);
+}
+void
+evmap_io_clear_(struct event_io_map* ctx)
+{
+	evmap_signal_clear_(ctx);
+}
+#endif
+
+
+/** Expand 'map' with new entries of width 'msize' until it is big enough
+	to store a value in 'slot'.
+ */
+static int
+evmap_make_space(struct event_signal_map *map, int slot, int msize)
+{
+	if (map->nentries <= slot) {
+		int nentries = map->nentries ? map->nentries : 32;
+		void **tmp;
+
+		if (slot > INT_MAX / 2)
+			return (-1);
+
+		while (nentries <= slot)
+			nentries <<= 1;
+
+		if (nentries > INT_MAX / msize)
+			return (-1);
+
+		tmp = (void **)mm_realloc(map->entries, nentries * msize);
+		if (tmp == NULL)
+			return (-1);
+
+		memset(&tmp[map->nentries], 0,
+		    (nentries - map->nentries) * msize);
+
+		map->nentries = nentries;
+		map->entries = tmp;
+	}
+
+	return (0);
+}
+
+void
+evmap_signal_initmap_(struct event_signal_map *ctx)
+{
+	ctx->nentries = 0;
+	ctx->entries = NULL;
+}
+
+void
+evmap_signal_clear_(struct event_signal_map *ctx)
+{
+	if (ctx->entries != NULL) {
+		int i;
+		for (i = 0; i < ctx->nentries; ++i) {
+			if (ctx->entries[i] != NULL)
+				mm_free(ctx->entries[i]);
+		}
+		mm_free(ctx->entries);
+		ctx->entries = NULL;
+	}
+	ctx->nentries = 0;
+}
+
+
+/* code specific to file descriptors */
+
+/** Constructor for struct evmap_io */
+static void
+evmap_io_init(struct evmap_io *entry)
+{
+	LIST_INIT(&entry->events);
+	entry->nread = 0;
+	entry->nwrite = 0;
+	entry->nclose = 0;
+}
+
+
+/* return -1 on error, 0 on success if nothing changed in the event backend,
+ * and 1 on success if something did. */
+int
+evmap_io_add_(struct event_base *base, evutil_socket_t fd, struct event *ev)
+{
+	const struct eventop *evsel = base->evsel;
+	struct event_io_map *io = &base->io;
+	struct evmap_io *ctx = NULL;
+	int nread, nwrite, nclose, retval = 0;
+	short res = 0, old = 0;
+	struct event *old_ev;
+
+	EVUTIL_ASSERT(fd == ev->ev_fd);
+
+	if (fd < 0)
+		return 0;
+
+#ifndef EVMAP_USE_HT
+	if (fd >= io->nentries) {
+		if (evmap_make_space(io, fd, sizeof(struct evmap_io *)) == -1)
+			return (-1);
+	}
+#endif
+	GET_IO_SLOT_AND_CTOR(ctx, io, fd, evmap_io, evmap_io_init,
+						 evsel->fdinfo_len);
+
+	nread = ctx->nread;
+	nwrite = ctx->nwrite;
+	nclose = ctx->nclose;
+
+	if (nread)
+		old |= EV_READ;
+	if (nwrite)
+		old |= EV_WRITE;
+	if (nclose)
+		old |= EV_CLOSED;
+
+	if (ev->ev_events & EV_READ) {
+		if (++nread == 1)
+			res |= EV_READ;
+	}
+	if (ev->ev_events & EV_WRITE) {
+		if (++nwrite == 1)
+			res |= EV_WRITE;
+	}
+	if (ev->ev_events & EV_CLOSED) {
+		if (++nclose == 1)
+			res |= EV_CLOSED;
+	}
+	if (EVUTIL_UNLIKELY(nread > 0xffff || nwrite > 0xffff || nclose > 0xffff)) {
+		event_warnx("Too many events reading or writing on fd %d",
+		    (int)fd);
+		return -1;
+	}
+	if (EVENT_DEBUG_MODE_IS_ON() &&
+	    (old_ev = LIST_FIRST(&ctx->events)) &&
+	    (old_ev->ev_events&EV_ET) != (ev->ev_events&EV_ET)) {
+		event_warnx("Tried to mix edge-triggered and non-edge-triggered"
+		    " events on fd %d", (int)fd);
+		return -1;
+	}
+
+	if (res) {
+		void *extra = ((char*)ctx) + sizeof(struct evmap_io);
+		/* XXX(niels): we cannot mix edge-triggered and
+		 * level-triggered, we should probably assert on
+		 * this. */
+		if (evsel->add(base, ev->ev_fd,
+			old, (ev->ev_events & EV_ET) | res, extra) == -1)
+			return (-1);
+		retval = 1;
+	}
+
+	ctx->nread = (ev_uint16_t) nread;
+	ctx->nwrite = (ev_uint16_t) nwrite;
+	ctx->nclose = (ev_uint16_t) nclose;
+	LIST_INSERT_HEAD(&ctx->events, ev, ev_io_next);
+
+	return (retval);
+}
+
+/* return -1 on error, 0 on success if nothing changed in the event backend,
+ * and 1 on success if something did. */
+int
+evmap_io_del_(struct event_base *base, evutil_socket_t fd, struct event *ev)
+{
+	const struct eventop *evsel = base->evsel;
+	struct event_io_map *io = &base->io;
+	struct evmap_io *ctx;
+	int nread, nwrite, nclose, retval = 0;
+	short res = 0, old = 0;
+
+	if (fd < 0)
+		return 0;
+
+	EVUTIL_ASSERT(fd == ev->ev_fd);
+
+#ifndef EVMAP_USE_HT
+	if (fd >= io->nentries)
+		return (-1);
+#endif
+
+	GET_IO_SLOT(ctx, io, fd, evmap_io);
+
+	nread = ctx->nread;
+	nwrite = ctx->nwrite;
+	nclose = ctx->nclose;
+
+	if (nread)
+		old |= EV_READ;
+	if (nwrite)
+		old |= EV_WRITE;
+	if (nclose)
+		old |= EV_CLOSED;
+
+	if (ev->ev_events & EV_READ) {
+		if (--nread == 0)
+			res |= EV_READ;
+		EVUTIL_ASSERT(nread >= 0);
+	}
+	if (ev->ev_events & EV_WRITE) {
+		if (--nwrite == 0)
+			res |= EV_WRITE;
+		EVUTIL_ASSERT(nwrite >= 0);
+	}
+	if (ev->ev_events & EV_CLOSED) {
+		if (--nclose == 0)
+			res |= EV_CLOSED;
+		EVUTIL_ASSERT(nclose >= 0);
+	}
+
+	if (res) {
+		void *extra = ((char*)ctx) + sizeof(struct evmap_io);
+		if (evsel->del(base, ev->ev_fd,
+			old, (ev->ev_events & EV_ET) | res, extra) == -1) {
+			retval = -1;
+		} else {
+			retval = 1;
+		}
+	}
+
+	ctx->nread = nread;
+	ctx->nwrite = nwrite;
+	ctx->nclose = nclose;
+	LIST_REMOVE(ev, ev_io_next);
+
+	return (retval);
+}
+
+void
+evmap_io_active_(struct event_base *base, evutil_socket_t fd, short events)
+{
+	struct event_io_map *io = &base->io;
+	struct evmap_io *ctx;
+	struct event *ev;
+
+#ifndef EVMAP_USE_HT
+	if (fd < 0 || fd >= io->nentries)
+		return;
+#endif
+	GET_IO_SLOT(ctx, io, fd, evmap_io);
+
+	if (NULL == ctx)
+		return;
+	LIST_FOREACH(ev, &ctx->events, ev_io_next) {
+		if (ev->ev_events & events)
+			event_active_nolock_(ev, ev->ev_events & events, 1);
+	}
+}
+
+/* code specific to signals */
+
+static void
+evmap_signal_init(struct evmap_signal *entry)
+{
+	LIST_INIT(&entry->events);
+}
+
+
+int
+evmap_signal_add_(struct event_base *base, int sig, struct event *ev)
+{
+	const struct eventop *evsel = base->evsigsel;
+	struct event_signal_map *map = &base->sigmap;
+	struct evmap_signal *ctx = NULL;
+
+	if (sig < 0 || sig >= NSIG)
+		return (-1);
+
+	if (sig >= map->nentries) {
+		if (evmap_make_space(
+			map, sig, sizeof(struct evmap_signal *)) == -1)
+			return (-1);
+	}
+	GET_SIGNAL_SLOT_AND_CTOR(ctx, map, sig, evmap_signal, evmap_signal_init,
+	    base->evsigsel->fdinfo_len);
+
+	if (LIST_EMPTY(&ctx->events)) {
+		if (evsel->add(base, ev->ev_fd, 0, EV_SIGNAL, NULL)
+		    == -1)
+			return (-1);
+	}
+
+	LIST_INSERT_HEAD(&ctx->events, ev, ev_signal_next);
+
+	return (1);
+}
+
+int
+evmap_signal_del_(struct event_base *base, int sig, struct event *ev)
+{
+	const struct eventop *evsel = base->evsigsel;
+	struct event_signal_map *map = &base->sigmap;
+	struct evmap_signal *ctx;
+
+	if (sig < 0 || sig >= map->nentries)
+		return (-1);
+
+	GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal);
+
+	LIST_REMOVE(ev, ev_signal_next);
+
+	if (LIST_FIRST(&ctx->events) == NULL) {
+		if (evsel->del(base, ev->ev_fd, 0, EV_SIGNAL, NULL) == -1)
+			return (-1);
+	}
+
+	return (1);
+}
+
+void
+evmap_signal_active_(struct event_base *base, evutil_socket_t sig, int ncalls)
+{
+	struct event_signal_map *map = &base->sigmap;
+	struct evmap_signal *ctx;
+	struct event *ev;
+
+	if (sig < 0 || sig >= map->nentries)
+		return;
+	GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal);
+
+	if (!ctx)
+		return;
+	LIST_FOREACH(ev, &ctx->events, ev_signal_next)
+		event_active_nolock_(ev, EV_SIGNAL, ncalls);
+}
+
+void *
+evmap_io_get_fdinfo_(struct event_io_map *map, evutil_socket_t fd)
+{
+	struct evmap_io *ctx;
+	GET_IO_SLOT(ctx, map, fd, evmap_io);
+	if (ctx)
+		return ((char*)ctx) + sizeof(struct evmap_io);
+	else
+		return NULL;
+}
+
+/* Callback type for evmap_io_foreach_fd */
+typedef int (*evmap_io_foreach_fd_cb)(
+	struct event_base *, evutil_socket_t, struct evmap_io *, void *);
+
+/* Multipurpose helper function: Iterate over every file descriptor event_base
+ * for which we could have EV_READ or EV_WRITE events.  For each such fd, call
+ * fn(base, signum, evmap_io, arg), where fn is the user-provided
+ * function, base is the event_base, signum is the signal number, evmap_io
+ * is an evmap_io structure containing a list of events pending on the
+ * file descriptor, and arg is the user-supplied argument.
+ *
+ * If fn returns 0, continue on to the next signal. Otherwise, return the same
+ * value that fn returned.
+ *
+ * Note that there is no guarantee that the file descriptors will be processed
+ * in any particular order.
+ */
+static int
+evmap_io_foreach_fd(struct event_base *base,
+    evmap_io_foreach_fd_cb fn,
+    void *arg)
+{
+	evutil_socket_t fd;
+	struct event_io_map *iomap = &base->io;
+	int r = 0;
+#ifdef EVMAP_USE_HT
+	struct event_map_entry **mapent;
+	HT_FOREACH(mapent, event_io_map, iomap) {
+		struct evmap_io *ctx = &(*mapent)->ent.evmap_io;
+		fd = (*mapent)->fd;
+#else
+	for (fd = 0; fd < iomap->nentries; ++fd) {
+		struct evmap_io *ctx = iomap->entries[fd];
+		if (!ctx)
+			continue;
+#endif
+		if ((r = fn(base, fd, ctx, arg)))
+			break;
+	}
+	return r;
+}
+
+/* Callback type for evmap_signal_foreach_signal */
+typedef int (*evmap_signal_foreach_signal_cb)(
+	struct event_base *, int, struct evmap_signal *, void *);
+
+/* Multipurpose helper function: Iterate over every signal number in the
+ * event_base for which we could have signal events.  For each such signal,
+ * call fn(base, signum, evmap_signal, arg), where fn is the user-provided
+ * function, base is the event_base, signum is the signal number, evmap_signal
+ * is an evmap_signal structure containing a list of events pending on the
+ * signal, and arg is the user-supplied argument.
+ *
+ * If fn returns 0, continue on to the next signal. Otherwise, return the same
+ * value that fn returned.
+ */
+static int
+evmap_signal_foreach_signal(struct event_base *base,
+    evmap_signal_foreach_signal_cb fn,
+    void *arg)
+{
+	struct event_signal_map *sigmap = &base->sigmap;
+	int r = 0;
+	int signum;
+
+	for (signum = 0; signum < sigmap->nentries; ++signum) {
+		struct evmap_signal *ctx = sigmap->entries[signum];
+		if (!ctx)
+			continue;
+		if ((r = fn(base, signum, ctx, arg)))
+			break;
+	}
+	return r;
+}
+
+/* Helper for evmap_reinit_: tell the backend to add every fd for which we have
+ * pending events, with the appropriate combination of EV_READ, EV_WRITE, and
+ * EV_ET. */
+static int
+evmap_io_reinit_iter_fn(struct event_base *base, evutil_socket_t fd,
+    struct evmap_io *ctx, void *arg)
+{
+	const struct eventop *evsel = base->evsel;
+	void *extra;
+	int *result = arg;
+	short events = 0;
+	struct event *ev;
+	EVUTIL_ASSERT(ctx);
+
+	extra = ((char*)ctx) + sizeof(struct evmap_io);
+	if (ctx->nread)
+		events |= EV_READ;
+	if (ctx->nwrite)
+		events |= EV_WRITE;
+	if (ctx->nclose)
+		events |= EV_CLOSED;
+	if (evsel->fdinfo_len)
+		memset(extra, 0, evsel->fdinfo_len);
+	if (events &&
+	    (ev = LIST_FIRST(&ctx->events)) &&
+	    (ev->ev_events & EV_ET))
+		events |= EV_ET;
+	if (evsel->add(base, fd, 0, events, extra) == -1)
+		*result = -1;
+
+	return 0;
+}
+
+/* Helper for evmap_reinit_: tell the backend to add every signal for which we
+ * have pending events.  */
+static int
+evmap_signal_reinit_iter_fn(struct event_base *base,
+    int signum, struct evmap_signal *ctx, void *arg)
+{
+	const struct eventop *evsel = base->evsigsel;
+	int *result = arg;
+
+	if (!LIST_EMPTY(&ctx->events)) {
+		if (evsel->add(base, signum, 0, EV_SIGNAL, NULL) == -1)
+			*result = -1;
+	}
+	return 0;
+}
+
+int
+evmap_reinit_(struct event_base *base)
+{
+	int result = 0;
+
+	evmap_io_foreach_fd(base, evmap_io_reinit_iter_fn, &result);
+	if (result < 0)
+		return -1;
+	evmap_signal_foreach_signal(base, evmap_signal_reinit_iter_fn, &result);
+	if (result < 0)
+		return -1;
+	return 0;
+}
+
+/* Helper for evmap_delete_all_: delete every event in an event_dlist. */
+static int
+delete_all_in_dlist(struct event_dlist *dlist)
+{
+	struct event *ev;
+	while ((ev = LIST_FIRST(dlist)))
+		event_del(ev);
+	return 0;
+}
+
+/* Helper for evmap_delete_all_: delete every event pending on an fd. */
+static int
+evmap_io_delete_all_iter_fn(struct event_base *base, evutil_socket_t fd,
+    struct evmap_io *io_info, void *arg)
+{
+	return delete_all_in_dlist(&io_info->events);
+}
+
+/* Helper for evmap_delete_all_: delete every event pending on a signal. */
+static int
+evmap_signal_delete_all_iter_fn(struct event_base *base, int signum,
+    struct evmap_signal *sig_info, void *arg)
+{
+	return delete_all_in_dlist(&sig_info->events);
+}
+
+void
+evmap_delete_all_(struct event_base *base)
+{
+	evmap_signal_foreach_signal(base, evmap_signal_delete_all_iter_fn, NULL);
+	evmap_io_foreach_fd(base, evmap_io_delete_all_iter_fn, NULL);
+}
+
+/** Per-fd structure for use with changelists.  It keeps track, for each fd or
+ * signal using the changelist, of where its entry in the changelist is.
+ */
+struct event_changelist_fdinfo {
+	int idxplus1; /* this is the index +1, so that memset(0) will make it
+		       * a no-such-element */
+};
+
+void
+event_changelist_init_(struct event_changelist *changelist)
+{
+	changelist->changes = NULL;
+	changelist->changes_size = 0;
+	changelist->n_changes = 0;
+}
+
+/** Helper: return the changelist_fdinfo corresponding to a given change. */
+static inline struct event_changelist_fdinfo *
+event_change_get_fdinfo(struct event_base *base,
+    const struct event_change *change)
+{
+	char *ptr;
+	if (change->read_change & EV_CHANGE_SIGNAL) {
+		struct evmap_signal *ctx;
+		GET_SIGNAL_SLOT(ctx, &base->sigmap, change->fd, evmap_signal);
+		ptr = ((char*)ctx) + sizeof(struct evmap_signal);
+	} else {
+		struct evmap_io *ctx;
+		GET_IO_SLOT(ctx, &base->io, change->fd, evmap_io);
+		ptr = ((char*)ctx) + sizeof(struct evmap_io);
+	}
+	return (void*)ptr;
+}
+
+/** Callback helper for event_changelist_assert_ok */
+static int
+event_changelist_assert_ok_foreach_iter_fn(
+	struct event_base *base,
+	evutil_socket_t fd, struct evmap_io *io, void *arg)
+{
+	struct event_changelist *changelist = &base->changelist;
+	struct event_changelist_fdinfo *f;
+	f = (void*)
+	    ( ((char*)io) + sizeof(struct evmap_io) );
+	if (f->idxplus1) {
+		struct event_change *c = &changelist->changes[f->idxplus1 - 1];
+		EVUTIL_ASSERT(c->fd == fd);
+	}
+	return 0;
+}
+
+/** Make sure that the changelist is consistent with the evmap structures. */
+static void
+event_changelist_assert_ok(struct event_base *base)
+{
+	int i;
+	struct event_changelist *changelist = &base->changelist;
+
+	EVUTIL_ASSERT(changelist->changes_size >= changelist->n_changes);
+	for (i = 0; i < changelist->n_changes; ++i) {
+		struct event_change *c = &changelist->changes[i];
+		struct event_changelist_fdinfo *f;
+		EVUTIL_ASSERT(c->fd >= 0);
+		f = event_change_get_fdinfo(base, c);
+		EVUTIL_ASSERT(f);
+		EVUTIL_ASSERT(f->idxplus1 == i + 1);
+	}
+
+	evmap_io_foreach_fd(base,
+	    event_changelist_assert_ok_foreach_iter_fn,
+	    NULL);
+}
+
+#ifdef DEBUG_CHANGELIST
+#define event_changelist_check(base)  event_changelist_assert_ok((base))
+#else
+#define event_changelist_check(base)  ((void)0)
+#endif
+
+void
+event_changelist_remove_all_(struct event_changelist *changelist,
+    struct event_base *base)
+{
+	int i;
+
+	event_changelist_check(base);
+
+	for (i = 0; i < changelist->n_changes; ++i) {
+		struct event_change *ch = &changelist->changes[i];
+		struct event_changelist_fdinfo *fdinfo =
+		    event_change_get_fdinfo(base, ch);
+		EVUTIL_ASSERT(fdinfo->idxplus1 == i + 1);
+		fdinfo->idxplus1 = 0;
+	}
+
+	changelist->n_changes = 0;
+
+	event_changelist_check(base);
+}
+
+void
+event_changelist_freemem_(struct event_changelist *changelist)
+{
+	if (changelist->changes)
+		mm_free(changelist->changes);
+	event_changelist_init_(changelist); /* zero it all out. */
+}
+
+/** Increase the size of 'changelist' to hold more changes. */
+static int
+event_changelist_grow(struct event_changelist *changelist)
+{
+	int new_size;
+	struct event_change *new_changes;
+	if (changelist->changes_size < 64)
+		new_size = 64;
+	else
+		new_size = changelist->changes_size * 2;
+
+	new_changes = mm_realloc(changelist->changes,
+	    new_size * sizeof(struct event_change));
+
+	if (EVUTIL_UNLIKELY(new_changes == NULL))
+		return (-1);
+
+	changelist->changes = new_changes;
+	changelist->changes_size = new_size;
+
+	return (0);
+}
+
+/** Return a pointer to the changelist entry for the file descriptor or signal
+ * 'fd', whose fdinfo is 'fdinfo'.  If none exists, construct it, setting its
+ * old_events field to old_events.
+ */
+static struct event_change *
+event_changelist_get_or_construct(struct event_changelist *changelist,
+    evutil_socket_t fd,
+    short old_events,
+    struct event_changelist_fdinfo *fdinfo)
+{
+	struct event_change *change;
+
+	if (fdinfo->idxplus1 == 0) {
+		int idx;
+		EVUTIL_ASSERT(changelist->n_changes <= changelist->changes_size);
+
+		if (changelist->n_changes == changelist->changes_size) {
+			if (event_changelist_grow(changelist) < 0)
+				return NULL;
+		}
+
+		idx = changelist->n_changes++;
+		change = &changelist->changes[idx];
+		fdinfo->idxplus1 = idx + 1;
+
+		memset(change, 0, sizeof(struct event_change));
+		change->fd = fd;
+		change->old_events = old_events;
+	} else {
+		change = &changelist->changes[fdinfo->idxplus1 - 1];
+		EVUTIL_ASSERT(change->fd == fd);
+	}
+	return change;
+}
+
+int
+event_changelist_add_(struct event_base *base, evutil_socket_t fd, short old, short events,
+    void *p)
+{
+	struct event_changelist *changelist = &base->changelist;
+	struct event_changelist_fdinfo *fdinfo = p;
+	struct event_change *change;
+	ev_uint8_t evchange = EV_CHANGE_ADD | (events & (EV_ET|EV_PERSIST|EV_SIGNAL));
+
+	event_changelist_check(base);
+
+	change = event_changelist_get_or_construct(changelist, fd, old, fdinfo);
+	if (!change)
+		return -1;
+
+	/* An add replaces any previous delete, but doesn't result in a no-op,
+	 * since the delete might fail (because the fd had been closed since
+	 * the last add, for instance. */
+
+	if (events & (EV_READ|EV_SIGNAL))
+		change->read_change = evchange;
+	if (events & EV_WRITE)
+		change->write_change = evchange;
+	if (events & EV_CLOSED)
+		change->close_change = evchange;
+
+	event_changelist_check(base);
+	return (0);
+}
+
+int
+event_changelist_del_(struct event_base *base, evutil_socket_t fd, short old, short events,
+    void *p)
+{
+	struct event_changelist *changelist = &base->changelist;
+	struct event_changelist_fdinfo *fdinfo = p;
+	struct event_change *change;
+	ev_uint8_t del = EV_CHANGE_DEL | (events & EV_ET);
+
+	event_changelist_check(base);
+	change = event_changelist_get_or_construct(changelist, fd, old, fdinfo);
+	event_changelist_check(base);
+	if (!change)
+		return -1;
+
+	/* A delete on an event set that doesn't contain the event to be
+	   deleted produces a no-op.  This effectively emoves any previous
+	   uncommitted add, rather than replacing it: on those platforms where
+	   "add, delete, dispatch" is not the same as "no-op, dispatch", we
+	   want the no-op behavior.
+
+	   If we have a no-op item, we could remove it it from the list
+	   entirely, but really there's not much point: skipping the no-op
+	   change when we do the dispatch later is far cheaper than rejuggling
+	   the array now.
+
+	   As this stands, it also lets through deletions of events that are
+	   not currently set.
+	 */
+
+	if (events & (EV_READ|EV_SIGNAL)) {
+		if (!(change->old_events & (EV_READ | EV_SIGNAL)))
+			change->read_change = 0;
+		else
+			change->read_change = del;
+	}
+	if (events & EV_WRITE) {
+		if (!(change->old_events & EV_WRITE))
+			change->write_change = 0;
+		else
+			change->write_change = del;
+	}
+	if (events & EV_CLOSED) {
+		if (!(change->old_events & EV_CLOSED))
+			change->close_change = 0;
+		else
+			change->close_change = del;
+	}
+
+	event_changelist_check(base);
+	return (0);
+}
+
+/* Helper for evmap_check_integrity_: verify that all of the events pending on
+ * given fd are set up correctly, and that the nread and nwrite counts on that
+ * fd are correct. */
+static int
+evmap_io_check_integrity_fn(struct event_base *base, evutil_socket_t fd,
+    struct evmap_io *io_info, void *arg)
+{
+	struct event *ev;
+	int n_read = 0, n_write = 0, n_close = 0;
+
+	/* First, make sure the list itself isn't corrupt. Otherwise,
+	 * running LIST_FOREACH could be an exciting adventure. */
+	EVUTIL_ASSERT_LIST_OK(&io_info->events, event, ev_io_next);
+
+	LIST_FOREACH(ev, &io_info->events, ev_io_next) {
+		EVUTIL_ASSERT(ev->ev_flags & EVLIST_INSERTED);
+		EVUTIL_ASSERT(ev->ev_fd == fd);
+		EVUTIL_ASSERT(!(ev->ev_events & EV_SIGNAL));
+		EVUTIL_ASSERT((ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED)));
+		if (ev->ev_events & EV_READ)
+			++n_read;
+		if (ev->ev_events & EV_WRITE)
+			++n_write;
+		if (ev->ev_events & EV_CLOSED)
+			++n_close;
+	}
+
+	EVUTIL_ASSERT(n_read == io_info->nread);
+	EVUTIL_ASSERT(n_write == io_info->nwrite);
+	EVUTIL_ASSERT(n_close == io_info->nclose);
+
+	return 0;
+}
+
+/* Helper for evmap_check_integrity_: verify that all of the events pending
+ * on given signal are set up correctly. */
+static int
+evmap_signal_check_integrity_fn(struct event_base *base,
+    int signum, struct evmap_signal *sig_info, void *arg)
+{
+	struct event *ev;
+	/* First, make sure the list itself isn't corrupt. */
+	EVUTIL_ASSERT_LIST_OK(&sig_info->events, event, ev_signal_next);
+
+	LIST_FOREACH(ev, &sig_info->events, ev_io_next) {
+		EVUTIL_ASSERT(ev->ev_flags & EVLIST_INSERTED);
+		EVUTIL_ASSERT(ev->ev_fd == signum);
+		EVUTIL_ASSERT((ev->ev_events & EV_SIGNAL));
+		EVUTIL_ASSERT(!(ev->ev_events & (EV_READ|EV_WRITE|EV_CLOSED)));
+	}
+	return 0;
+}
+
+void
+evmap_check_integrity_(struct event_base *base)
+{
+	evmap_io_foreach_fd(base, evmap_io_check_integrity_fn, NULL);
+	evmap_signal_foreach_signal(base, evmap_signal_check_integrity_fn, NULL);
+
+	if (base->evsel->add == event_changelist_add_)
+		event_changelist_assert_ok(base);
+}
+
+/* Helper type for evmap_foreach_event_: Bundles a function to call on every
+ * event, and the user-provided void* to use as its third argument. */
+struct evmap_foreach_event_helper {
+	event_base_foreach_event_cb fn;
+	void *arg;
+};
+
+/* Helper for evmap_foreach_event_: calls a provided function on every event
+ * pending on a given fd.  */
+static int
+evmap_io_foreach_event_fn(struct event_base *base, evutil_socket_t fd,
+    struct evmap_io *io_info, void *arg)
+{
+	struct evmap_foreach_event_helper *h = arg;
+	struct event *ev;
+	int r;
+	LIST_FOREACH(ev, &io_info->events, ev_io_next) {
+		if ((r = h->fn(base, ev, h->arg)))
+			return r;
+	}
+	return 0;
+}
+
+/* Helper for evmap_foreach_event_: calls a provided function on every event
+ * pending on a given signal.  */
+static int
+evmap_signal_foreach_event_fn(struct event_base *base, int signum,
+    struct evmap_signal *sig_info, void *arg)
+{
+	struct event *ev;
+	struct evmap_foreach_event_helper *h = arg;
+	int r;
+	LIST_FOREACH(ev, &sig_info->events, ev_signal_next) {
+		if ((r = h->fn(base, ev, h->arg)))
+			return r;
+	}
+	return 0;
+}
+
+int
+evmap_foreach_event_(struct event_base *base,
+    event_base_foreach_event_cb fn, void *arg)
+{
+	struct evmap_foreach_event_helper h;
+	int r;
+	h.fn = fn;
+	h.arg = arg;
+	if ((r = evmap_io_foreach_fd(base, evmap_io_foreach_event_fn, &h)))
+		return r;
+	return evmap_signal_foreach_signal(base, evmap_signal_foreach_event_fn, &h);
+}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/evport.c b/extra/libevent/libevent-2.1.11-stable/evport.c
new file mode 100644
index 000000000000..a014386bfe31
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evport.c
@@ -0,0 +1,451 @@
+/*
+ * Submitted by David Pacheco (dp.spambait@gmail.com)
+ *
+ * Copyright 2006-2007 Niels Provos
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SUN MICROSYSTEMS, INC. ``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 SUN MICROSYSTEMS, INC. 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.
+ */
+
+/*
+ * Copyright (c) 2007 Sun Microsystems. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * evport.c: event backend using Solaris 10 event ports. See port_create(3C).
+ * This implementation is loosely modeled after the one used for select(2) (in
+ * select.c).
+ *
+ * The outstanding events are tracked in a data structure called evport_data.
+ * Each entry in the ed_fds array corresponds to a file descriptor, and contains
+ * pointers to the read and write events that correspond to that fd. (That is,
+ * when the file is readable, the "read" event should handle it, etc.)
+ *
+ * evport_add and evport_del update this data structure. evport_dispatch uses it
+ * to determine where to callback when an event occurs (which it gets from
+ * port_getn).
+ *
+ * Helper functions are used: grow() grows the file descriptor array as
+ * necessary when large fd's come in. reassociate() takes care of maintaining
+ * the proper file-descriptor/event-port associations.
+ *
+ * As in the select(2) implementation, signals are handled by evsignal.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_EVENT_PORTS
+
+#include <sys/time.h>
+#include <sys/queue.h>
+#include <errno.h>
+#include <poll.h>
+#include <port.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "event2/thread.h"
+
+#include "evthread-internal.h"
+#include "event-internal.h"
+#include "log-internal.h"
+#include "evsignal-internal.h"
+#include "evmap-internal.h"
+
+#define INITIAL_EVENTS_PER_GETN 8
+#define MAX_EVENTS_PER_GETN 4096
+
+/*
+ * Per-file-descriptor information about what events we're subscribed to. These
+ * fields are NULL if no event is subscribed to either of them.
+ */
+
+struct fd_info {
+	/* combinations of EV_READ and EV_WRITE */
+	short fdi_what;
+	/* Index of this fd within ed_pending, plus 1.  Zero if this fd is
+	 * not in ed_pending.  (The +1 is a hack so that memset(0) will set
+	 * it to a nil index. */
+	int pending_idx_plus_1;
+};
+
+#define FDI_HAS_READ(fdi)  ((fdi)->fdi_what & EV_READ)
+#define FDI_HAS_WRITE(fdi) ((fdi)->fdi_what & EV_WRITE)
+#define FDI_HAS_EVENTS(fdi) (FDI_HAS_READ(fdi) || FDI_HAS_WRITE(fdi))
+#define FDI_TO_SYSEVENTS(fdi) (FDI_HAS_READ(fdi) ? POLLIN : 0) | \
+    (FDI_HAS_WRITE(fdi) ? POLLOUT : 0)
+
+struct evport_data {
+	int		ed_port;	/* event port for system events  */
+	/* How many elements of ed_pending should we look at? */
+	int ed_npending;
+	/* How many elements are allocated in ed_pending and pevtlist? */
+	int ed_maxevents;
+	/* fdi's that we need to reassoc */
+	int *ed_pending;
+	/* storage space for incoming events. */ 
+	port_event_t *ed_pevtlist;
+	
+};
+
+static void*	evport_init(struct event_base *);
+static int evport_add(struct event_base *, int fd, short old, short events, void *);
+static int evport_del(struct event_base *, int fd, short old, short events, void *);
+static int	evport_dispatch(struct event_base *, struct timeval *);
+static void	evport_dealloc(struct event_base *);
+static int	grow(struct evport_data *, int min_events);
+
+const struct eventop evportops = {
+	"evport",
+	evport_init,
+	evport_add,
+	evport_del,
+	evport_dispatch,
+	evport_dealloc,
+	1, /* need reinit */
+	0, /* features */
+	sizeof(struct fd_info), /* fdinfo length */
+};
+
+/*
+ * Initialize the event port implementation.
+ */
+
+static void*
+evport_init(struct event_base *base)
+{
+	struct evport_data *evpd;
+
+	if (!(evpd = mm_calloc(1, sizeof(struct evport_data))))
+		return (NULL);
+
+	if ((evpd->ed_port = port_create()) == -1) {
+		mm_free(evpd);
+		return (NULL);
+	}
+
+	if (grow(evpd, INITIAL_EVENTS_PER_GETN) < 0) {
+		close(evpd->ed_port);
+		mm_free(evpd);
+		return NULL;
+	}
+		
+	evpd->ed_npending = 0;
+
+	evsig_init_(base);
+
+	return (evpd);
+}
+
+static int
+grow(struct evport_data *data, int min_events)
+{
+	int newsize;
+	int *new_pending;
+	port_event_t *new_pevtlist;
+	if (data->ed_maxevents) {
+		newsize = data->ed_maxevents;
+		do {
+			newsize *= 2;
+		} while (newsize < min_events);
+	} else {
+		newsize = min_events;
+	}
+
+	new_pending = mm_realloc(data->ed_pending, sizeof(int)*newsize);
+	if (new_pending == NULL)
+		return -1;
+	data->ed_pending = new_pending;
+	new_pevtlist = mm_realloc(data->ed_pevtlist, sizeof(port_event_t)*newsize);
+	if (new_pevtlist == NULL)
+		return -1;
+	data->ed_pevtlist = new_pevtlist; 
+
+	data->ed_maxevents = newsize;
+	return 0;
+}
+
+#ifdef CHECK_INVARIANTS
+/*
+ * Checks some basic properties about the evport_data structure. Because it
+ * checks all file descriptors, this function can be expensive when the maximum
+ * file descriptor ever used is rather large.
+ */
+
+static void
+check_evportop(struct evport_data *evpd)
+{
+	EVUTIL_ASSERT(evpd);
+	EVUTIL_ASSERT(evpd->ed_port > 0);
+}
+
+/*
+ * Verifies very basic integrity of a given port_event.
+ */
+static void
+check_event(port_event_t* pevt)
+{
+	/*
+	 * We've only registered for PORT_SOURCE_FD events. The only
+	 * other thing we can legitimately receive is PORT_SOURCE_ALERT,
+	 * but since we're not using port_alert either, we can assume
+	 * PORT_SOURCE_FD.
+	 */
+	EVUTIL_ASSERT(pevt->portev_source == PORT_SOURCE_FD);
+}
+
+#else
+#define check_evportop(epop)
+#define check_event(pevt)
+#endif /* CHECK_INVARIANTS */
+
+/*
+ * (Re)associates the given file descriptor with the event port. The OS events
+ * are specified (implicitly) from the fd_info struct.
+ */
+static int
+reassociate(struct evport_data *epdp, struct fd_info *fdip, int fd)
+{
+	int sysevents = FDI_TO_SYSEVENTS(fdip);
+
+	if (sysevents != 0) {
+		if (port_associate(epdp->ed_port, PORT_SOURCE_FD,
+				   fd, sysevents, fdip) == -1) {
+			event_warn("port_associate");
+			return (-1);
+		}
+	}
+
+	check_evportop(epdp);
+
+	return (0);
+}
+
+/*
+ * Main event loop - polls port_getn for some number of events, and processes
+ * them.
+ */
+
+static int
+evport_dispatch(struct event_base *base, struct timeval *tv)
+{
+	int i, res;
+	struct evport_data *epdp = base->evbase;
+	port_event_t *pevtlist = epdp->ed_pevtlist;
+
+	/*
+	 * port_getn will block until it has at least nevents events. It will
+	 * also return how many it's given us (which may be more than we asked
+	 * for, as long as it's less than our maximum (ed_maxevents)) in
+	 * nevents.
+	 */
+	int nevents = 1;
+
+	/*
+	 * We have to convert a struct timeval to a struct timespec
+	 * (only difference is nanoseconds vs. microseconds). If no time-based
+	 * events are active, we should wait for I/O (and tv == NULL).
+	 */
+	struct timespec ts;
+	struct timespec *ts_p = NULL;
+	if (tv != NULL) {
+		ts.tv_sec = tv->tv_sec;
+		ts.tv_nsec = tv->tv_usec * 1000;
+		ts_p = &ts;
+	}
+
+	/*
+	 * Before doing anything else, we need to reassociate the events we hit
+	 * last time which need reassociation. See comment at the end of the
+	 * loop below.
+	 */
+	for (i = 0; i < epdp->ed_npending; ++i) {
+		struct fd_info *fdi = NULL;
+		const int fd = epdp->ed_pending[i];
+		if (fd != -1) {
+			/* We might have cleared out this event; we need
+			 * to be sure that it's still set. */
+			fdi = evmap_io_get_fdinfo_(&base->io, fd);
+		}
+
+		if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
+			reassociate(epdp, fdi, fd);
+			/* epdp->ed_pending[i] = -1; */
+			fdi->pending_idx_plus_1 = 0;
+		}
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = port_getn(epdp->ed_port, pevtlist, epdp->ed_maxevents,
+	    (unsigned int *) &nevents, ts_p);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (res == -1) {
+		if (errno == EINTR || errno == EAGAIN) {
+			return (0);
+		} else if (errno == ETIME) {
+			if (nevents == 0)
+				return (0);
+		} else {
+			event_warn("port_getn");
+			return (-1);
+		}
+	}
+
+	event_debug(("%s: port_getn reports %d events", __func__, nevents));
+
+	for (i = 0; i < nevents; ++i) {
+		port_event_t *pevt = &pevtlist[i];
+		int fd = (int) pevt->portev_object;
+		struct fd_info *fdi = pevt->portev_user;
+		/*EVUTIL_ASSERT(evmap_io_get_fdinfo_(&base->io, fd) == fdi);*/
+
+		check_evportop(epdp);
+		check_event(pevt);
+		epdp->ed_pending[i] = fd;
+		fdi->pending_idx_plus_1 = i + 1;
+
+		/*
+		 * Figure out what kind of event it was
+		 * (because we have to pass this to the callback)
+		 */
+		res = 0;
+		if (pevt->portev_events & (POLLERR|POLLHUP)) {
+			res = EV_READ | EV_WRITE;
+		} else {
+			if (pevt->portev_events & POLLIN)
+				res |= EV_READ;
+			if (pevt->portev_events & POLLOUT)
+				res |= EV_WRITE;
+		}
+
+		/*
+		 * Check for the error situations or a hangup situation
+		 */
+		if (pevt->portev_events & (POLLERR|POLLHUP|POLLNVAL))
+			res |= EV_READ|EV_WRITE;
+
+		evmap_io_active_(base, fd, res);
+	} /* end of all events gotten */
+	epdp->ed_npending = nevents;
+
+	if (nevents == epdp->ed_maxevents &&
+	    epdp->ed_maxevents < MAX_EVENTS_PER_GETN) {
+		/* we used all the space this time.  We should be ready
+		 * for more events next time around. */
+		grow(epdp, epdp->ed_maxevents * 2);
+	}
+
+	check_evportop(epdp);
+
+	return (0);
+}
+
+
+/*
+ * Adds the given event (so that you will be notified when it happens via
+ * the callback function).
+ */
+
+static int
+evport_add(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct evport_data *evpd = base->evbase;
+	struct fd_info *fdi = p;
+
+	check_evportop(evpd);
+
+	fdi->fdi_what |= events;
+
+	return reassociate(evpd, fdi, fd);
+}
+
+/*
+ * Removes the given event from the list of events to wait for.
+ */
+
+static int
+evport_del(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct evport_data *evpd = base->evbase;
+	struct fd_info *fdi = p;
+	int associated = ! fdi->pending_idx_plus_1;
+
+	check_evportop(evpd);
+
+	fdi->fdi_what &= ~(events &(EV_READ|EV_WRITE));
+
+	if (associated) {
+		if (!FDI_HAS_EVENTS(fdi) &&
+		    port_dissociate(evpd->ed_port, PORT_SOURCE_FD, fd) == -1) {
+			/*
+			 * Ignore EBADFD error the fd could have been closed
+			 * before event_del() was called.
+			 */
+			if (errno != EBADFD) {
+				event_warn("port_dissociate");
+				return (-1);
+			}
+		} else {
+			if (FDI_HAS_EVENTS(fdi)) {
+				return (reassociate(evpd, fdi, fd));
+			}
+		}
+	} else {
+		if ((fdi->fdi_what & (EV_READ|EV_WRITE)) == 0) {
+			const int i = fdi->pending_idx_plus_1 - 1;
+			EVUTIL_ASSERT(evpd->ed_pending[i] == fd);
+			evpd->ed_pending[i] = -1;
+			fdi->pending_idx_plus_1 = 0;
+		}
+	}
+	return 0;
+}
+
+
+static void
+evport_dealloc(struct event_base *base)
+{
+	struct evport_data *evpd = base->evbase;
+
+	evsig_dealloc_(base);
+
+	close(evpd->ed_port);
+
+	if (evpd->ed_pending)
+		mm_free(evpd->ed_pending);
+	if (evpd->ed_pevtlist)
+		mm_free(evpd->ed_pevtlist);
+
+	mm_free(evpd);
+}
+
+#endif /* EVENT__HAVE_EVENT_PORTS */
diff --git a/extra/libevent/libevent-2.1.11-stable/evrpc-internal.h b/extra/libevent/libevent-2.1.11-stable/evrpc-internal.h
new file mode 100644
index 000000000000..9eb376386de4
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evrpc-internal.h
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVRPC_INTERNAL_H_INCLUDED_
+#define EVRPC_INTERNAL_H_INCLUDED_
+
+#include "event2/http.h"
+#include "http-internal.h"
+
+struct evrpc;
+struct evrpc_request_wrapper;
+
+#define EVRPC_URI_PREFIX "/.rpc."
+
+struct evrpc_hook {
+	TAILQ_ENTRY(evrpc_hook) next;
+
+	/* returns EVRPC_TERMINATE; if the rpc should be aborted.
+	 * a hook is is allowed to rewrite the evbuffer
+	 */
+	int (*process)(void *, struct evhttp_request *,
+	    struct evbuffer *, void *);
+	void *process_arg;
+};
+
+TAILQ_HEAD(evrpc_hook_list, evrpc_hook);
+
+/*
+ * this is shared between the base and the pool, so that we can reuse
+ * the hook adding functions; we alias both evrpc_pool and evrpc_base
+ * to this common structure.
+ */
+
+struct evrpc_hook_ctx;
+TAILQ_HEAD(evrpc_pause_list, evrpc_hook_ctx);
+
+struct evrpc_hooks_ {
+	/* hooks for processing outbound and inbound rpcs */
+	struct evrpc_hook_list in_hooks;
+	struct evrpc_hook_list out_hooks;
+
+	struct evrpc_pause_list pause_requests;
+};
+
+#define input_hooks common.in_hooks
+#define output_hooks common.out_hooks
+#define paused_requests common.pause_requests
+
+struct evrpc_base {
+	struct evrpc_hooks_ common;
+
+	/* the HTTP server under which we register our RPC calls */
+	struct evhttp* http_server;
+
+	/* a list of all RPCs registered with us */
+	TAILQ_HEAD(evrpc_list, evrpc) registered_rpcs;
+};
+
+struct evrpc_req_generic;
+void evrpc_reqstate_free_(struct evrpc_req_generic* rpc_state);
+
+/* A pool for holding evhttp_connection objects */
+struct evrpc_pool {
+	struct evrpc_hooks_ common;
+
+	struct event_base *base;
+
+	struct evconq connections;
+
+	int timeout;
+
+	TAILQ_HEAD(evrpc_requestq, evrpc_request_wrapper) (requests);
+};
+
+struct evrpc_hook_ctx {
+	TAILQ_ENTRY(evrpc_hook_ctx) next;
+
+	void *ctx;
+	void (*cb)(void *, enum EVRPC_HOOK_RESULT);
+};
+
+struct evrpc_meta {
+	TAILQ_ENTRY(evrpc_meta) next;
+	char *key;
+
+	void *data;
+	size_t data_size;
+};
+
+TAILQ_HEAD(evrpc_meta_list, evrpc_meta);
+
+struct evrpc_hook_meta {
+	struct evrpc_meta_list meta_data;
+	struct evhttp_connection *evcon;
+};
+
+/* allows association of meta data with a request */
+static void evrpc_hook_associate_meta_(struct evrpc_hook_meta **pctx,
+    struct evhttp_connection *evcon);
+
+/* creates a new meta data store */
+static struct evrpc_hook_meta *evrpc_hook_meta_new_(void);
+
+/* frees the meta data associated with a request */
+static void evrpc_hook_context_free_(struct evrpc_hook_meta *ctx);
+
+/* the server side of an rpc */
+
+/* We alias the RPC specific structs to this voided one */
+struct evrpc_req_generic {
+	/*
+	 * allows association of meta data via hooks - needs to be
+	 * synchronized with evrpc_request_wrapper
+	 */
+	struct evrpc_hook_meta *hook_meta;
+
+	/* the unmarshaled request object */
+	void *request;
+
+	/* the empty reply object that needs to be filled in */
+	void *reply;
+
+	/*
+	 * the static structure for this rpc; that can be used to
+	 * automatically unmarshal and marshal the http buffers.
+	 */
+	struct evrpc *rpc;
+
+	/*
+	 * the http request structure on which we need to answer.
+	 */
+	struct evhttp_request* http_req;
+
+	/*
+	 * Temporary data store for marshaled data
+	 */
+	struct evbuffer* rpc_data;
+};
+
+/* the client side of an rpc request */
+struct evrpc_request_wrapper {
+	/*
+	 * allows association of meta data via hooks - needs to be
+	 * synchronized with evrpc_req_generic.
+	 */
+	struct evrpc_hook_meta *hook_meta;
+
+	TAILQ_ENTRY(evrpc_request_wrapper) next;
+
+	/* pool on which this rpc request is being made */
+	struct evrpc_pool *pool;
+
+	/* connection on which the request is being sent */
+	struct evhttp_connection *evcon;
+
+	/* the actual  request */
+	struct evhttp_request *req;
+
+	/* event for implementing request timeouts */
+	struct event ev_timeout;
+
+	/* the name of the rpc */
+	char *name;
+
+	/* callback */
+	void (*cb)(struct evrpc_status*, void *request, void *reply, void *arg);
+	void *cb_arg;
+
+	void *request;
+	void *reply;
+
+	/* unmarshals the buffer into the proper request structure */
+	void (*request_marshal)(struct evbuffer *, void *);
+
+	/* removes all stored state in the reply */
+	void (*reply_clear)(void *);
+
+	/* marshals the reply into a buffer */
+	int (*reply_unmarshal)(void *, struct evbuffer*);
+};
+
+#endif /* EVRPC_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/evrpc.c b/extra/libevent/libevent-2.1.11-stable/evrpc.c
new file mode 100644
index 000000000000..4a60ca5f0703
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evrpc.c
@@ -0,0 +1,1171 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+
+#include <sys/queue.h>
+
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/rpc.h"
+#include "event2/rpc_struct.h"
+#include "evrpc-internal.h"
+#include "event2/http.h"
+#include "event2/buffer.h"
+#include "event2/tag.h"
+#include "event2/http_struct.h"
+#include "event2/http_compat.h"
+#include "event2/util.h"
+#include "util-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+
+struct evrpc_base *
+evrpc_init(struct evhttp *http_server)
+{
+	struct evrpc_base* base = mm_calloc(1, sizeof(struct evrpc_base));
+	if (base == NULL)
+		return (NULL);
+
+	/* we rely on the tagging sub system */
+	evtag_init();
+
+	TAILQ_INIT(&base->registered_rpcs);
+	TAILQ_INIT(&base->input_hooks);
+	TAILQ_INIT(&base->output_hooks);
+
+	TAILQ_INIT(&base->paused_requests);
+
+	base->http_server = http_server;
+
+	return (base);
+}
+
+void
+evrpc_free(struct evrpc_base *base)
+{
+	struct evrpc *rpc;
+	struct evrpc_hook *hook;
+	struct evrpc_hook_ctx *pause;
+	int r;
+
+	while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) {
+		r = evrpc_unregister_rpc(base, rpc->uri);
+		EVUTIL_ASSERT(r == 0);
+	}
+	while ((pause = TAILQ_FIRST(&base->paused_requests)) != NULL) {
+		TAILQ_REMOVE(&base->paused_requests, pause, next);
+		mm_free(pause);
+	}
+	while ((hook = TAILQ_FIRST(&base->input_hooks)) != NULL) {
+		r = evrpc_remove_hook(base, EVRPC_INPUT, hook);
+		EVUTIL_ASSERT(r);
+	}
+	while ((hook = TAILQ_FIRST(&base->output_hooks)) != NULL) {
+		r = evrpc_remove_hook(base, EVRPC_OUTPUT, hook);
+		EVUTIL_ASSERT(r);
+	}
+	mm_free(base);
+}
+
+void *
+evrpc_add_hook(void *vbase,
+    enum EVRPC_HOOK_TYPE hook_type,
+    int (*cb)(void *, struct evhttp_request *, struct evbuffer *, void *),
+    void *cb_arg)
+{
+	struct evrpc_hooks_ *base = vbase;
+	struct evrpc_hook_list *head = NULL;
+	struct evrpc_hook *hook = NULL;
+	switch (hook_type) {
+	case EVRPC_INPUT:
+		head = &base->in_hooks;
+		break;
+	case EVRPC_OUTPUT:
+		head = &base->out_hooks;
+		break;
+	default:
+		EVUTIL_ASSERT(hook_type == EVRPC_INPUT || hook_type == EVRPC_OUTPUT);
+	}
+
+	hook = mm_calloc(1, sizeof(struct evrpc_hook));
+	EVUTIL_ASSERT(hook != NULL);
+
+	hook->process = cb;
+	hook->process_arg = cb_arg;
+	TAILQ_INSERT_TAIL(head, hook, next);
+
+	return (hook);
+}
+
+static int
+evrpc_remove_hook_internal(struct evrpc_hook_list *head, void *handle)
+{
+	struct evrpc_hook *hook = NULL;
+	TAILQ_FOREACH(hook, head, next) {
+		if (hook == handle) {
+			TAILQ_REMOVE(head, hook, next);
+			mm_free(hook);
+			return (1);
+		}
+	}
+
+	return (0);
+}
+
+/*
+ * remove the hook specified by the handle
+ */
+
+int
+evrpc_remove_hook(void *vbase, enum EVRPC_HOOK_TYPE hook_type, void *handle)
+{
+	struct evrpc_hooks_ *base = vbase;
+	struct evrpc_hook_list *head = NULL;
+	switch (hook_type) {
+	case EVRPC_INPUT:
+		head = &base->in_hooks;
+		break;
+	case EVRPC_OUTPUT:
+		head = &base->out_hooks;
+		break;
+	default:
+		EVUTIL_ASSERT(hook_type == EVRPC_INPUT || hook_type == EVRPC_OUTPUT);
+	}
+
+	return (evrpc_remove_hook_internal(head, handle));
+}
+
+static int
+evrpc_process_hooks(struct evrpc_hook_list *head, void *ctx,
+    struct evhttp_request *req, struct evbuffer *evbuf)
+{
+	struct evrpc_hook *hook;
+	TAILQ_FOREACH(hook, head, next) {
+		int res = hook->process(ctx, req, evbuf, hook->process_arg);
+		if (res != EVRPC_CONTINUE)
+			return (res);
+	}
+
+	return (EVRPC_CONTINUE);
+}
+
+static void evrpc_pool_schedule(struct evrpc_pool *pool);
+static void evrpc_request_cb(struct evhttp_request *, void *);
+
+/*
+ * Registers a new RPC with the HTTP server.   The evrpc object is expected
+ * to have been filled in via the EVRPC_REGISTER_OBJECT macro which in turn
+ * calls this function.
+ */
+
+static char *
+evrpc_construct_uri(const char *uri)
+{
+	char *constructed_uri;
+	size_t constructed_uri_len;
+
+	constructed_uri_len = strlen(EVRPC_URI_PREFIX) + strlen(uri) + 1;
+	if ((constructed_uri = mm_malloc(constructed_uri_len)) == NULL)
+		event_err(1, "%s: failed to register rpc at %s",
+		    __func__, uri);
+	memcpy(constructed_uri, EVRPC_URI_PREFIX, strlen(EVRPC_URI_PREFIX));
+	memcpy(constructed_uri + strlen(EVRPC_URI_PREFIX), uri, strlen(uri));
+	constructed_uri[constructed_uri_len - 1] = '\0';
+
+	return (constructed_uri);
+}
+
+int
+evrpc_register_rpc(struct evrpc_base *base, struct evrpc *rpc,
+    void (*cb)(struct evrpc_req_generic *, void *), void *cb_arg)
+{
+	char *constructed_uri = evrpc_construct_uri(rpc->uri);
+
+	rpc->base = base;
+	rpc->cb = cb;
+	rpc->cb_arg = cb_arg;
+
+	TAILQ_INSERT_TAIL(&base->registered_rpcs, rpc, next);
+
+	evhttp_set_cb(base->http_server,
+	    constructed_uri,
+	    evrpc_request_cb,
+	    rpc);
+
+	mm_free(constructed_uri);
+
+	return (0);
+}
+
+int
+evrpc_unregister_rpc(struct evrpc_base *base, const char *name)
+{
+	char *registered_uri = NULL;
+	struct evrpc *rpc;
+	int r;
+
+	/* find the right rpc; linear search might be slow */
+	TAILQ_FOREACH(rpc, &base->registered_rpcs, next) {
+		if (strcmp(rpc->uri, name) == 0)
+			break;
+	}
+	if (rpc == NULL) {
+		/* We did not find an RPC with this name */
+		return (-1);
+	}
+	TAILQ_REMOVE(&base->registered_rpcs, rpc, next);
+
+	registered_uri = evrpc_construct_uri(name);
+
+	/* remove the http server callback */
+	r = evhttp_del_cb(base->http_server, registered_uri);
+	EVUTIL_ASSERT(r == 0);
+
+	mm_free(registered_uri);
+
+	mm_free((char *)rpc->uri);
+	mm_free(rpc);
+	return (0);
+}
+
+static int evrpc_pause_request(void *vbase, void *ctx,
+    void (*cb)(void *, enum EVRPC_HOOK_RESULT));
+static void evrpc_request_cb_closure(void *, enum EVRPC_HOOK_RESULT);
+
+static void
+evrpc_request_cb(struct evhttp_request *req, void *arg)
+{
+	struct evrpc *rpc = arg;
+	struct evrpc_req_generic *rpc_state = NULL;
+
+	/* let's verify the outside parameters */
+	if (req->type != EVHTTP_REQ_POST ||
+	    evbuffer_get_length(req->input_buffer) <= 0)
+		goto error;
+
+	rpc_state = mm_calloc(1, sizeof(struct evrpc_req_generic));
+	if (rpc_state == NULL)
+		goto error;
+	rpc_state->rpc = rpc;
+	rpc_state->http_req = req;
+	rpc_state->rpc_data = NULL;
+
+	if (TAILQ_FIRST(&rpc->base->input_hooks) != NULL) {
+		int hook_res;
+
+		evrpc_hook_associate_meta_(&rpc_state->hook_meta, req->evcon);
+
+		/*
+		 * allow hooks to modify the outgoing request
+		 */
+		hook_res = evrpc_process_hooks(&rpc->base->input_hooks,
+		    rpc_state, req, req->input_buffer);
+		switch (hook_res) {
+		case EVRPC_TERMINATE:
+			goto error;
+		case EVRPC_PAUSE:
+			evrpc_pause_request(rpc->base, rpc_state,
+			    evrpc_request_cb_closure);
+			return;
+		case EVRPC_CONTINUE:
+			break;
+		default:
+			EVUTIL_ASSERT(hook_res == EVRPC_TERMINATE ||
+			    hook_res == EVRPC_CONTINUE ||
+			    hook_res == EVRPC_PAUSE);
+		}
+	}
+
+	evrpc_request_cb_closure(rpc_state, EVRPC_CONTINUE);
+	return;
+
+error:
+	if (rpc_state)
+		evrpc_reqstate_free_(rpc_state);
+	evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
+	return;
+}
+
+static void
+evrpc_request_cb_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
+{
+	struct evrpc_req_generic *rpc_state = arg;
+	struct evrpc *rpc;
+	struct evhttp_request *req;
+
+	EVUTIL_ASSERT(rpc_state);
+	rpc = rpc_state->rpc;
+	req = rpc_state->http_req;
+
+	if (hook_res == EVRPC_TERMINATE)
+		goto error;
+
+	/* let's check that we can parse the request */
+	rpc_state->request = rpc->request_new(rpc->request_new_arg);
+	if (rpc_state->request == NULL)
+		goto error;
+
+	if (rpc->request_unmarshal(
+		    rpc_state->request, req->input_buffer) == -1) {
+		/* we failed to parse the request; that's a bummer */
+		goto error;
+	}
+
+	/* at this point, we have a well formed request, prepare the reply */
+
+	rpc_state->reply = rpc->reply_new(rpc->reply_new_arg);
+	if (rpc_state->reply == NULL)
+		goto error;
+
+	/* give the rpc to the user; they can deal with it */
+	rpc->cb(rpc_state, rpc->cb_arg);
+
+	return;
+
+error:
+	evrpc_reqstate_free_(rpc_state);
+	evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
+	return;
+}
+
+
+void
+evrpc_reqstate_free_(struct evrpc_req_generic* rpc_state)
+{
+	struct evrpc *rpc;
+	EVUTIL_ASSERT(rpc_state != NULL);
+	rpc = rpc_state->rpc;
+
+	/* clean up all memory */
+	if (rpc_state->hook_meta != NULL)
+		evrpc_hook_context_free_(rpc_state->hook_meta);
+	if (rpc_state->request != NULL)
+		rpc->request_free(rpc_state->request);
+	if (rpc_state->reply != NULL)
+		rpc->reply_free(rpc_state->reply);
+	if (rpc_state->rpc_data != NULL)
+		evbuffer_free(rpc_state->rpc_data);
+	mm_free(rpc_state);
+}
+
+static void
+evrpc_request_done_closure(void *, enum EVRPC_HOOK_RESULT);
+
+void
+evrpc_request_done(struct evrpc_req_generic *rpc_state)
+{
+	struct evhttp_request *req;
+	struct evrpc *rpc;
+
+	EVUTIL_ASSERT(rpc_state);
+
+	req = rpc_state->http_req;
+	rpc = rpc_state->rpc;
+
+	if (rpc->reply_complete(rpc_state->reply) == -1) {
+		/* the reply was not completely filled in.  error out */
+		goto error;
+	}
+
+	if ((rpc_state->rpc_data = evbuffer_new()) == NULL) {
+		/* out of memory */
+		goto error;
+	}
+
+	/* serialize the reply */
+	rpc->reply_marshal(rpc_state->rpc_data, rpc_state->reply);
+
+	if (TAILQ_FIRST(&rpc->base->output_hooks) != NULL) {
+		int hook_res;
+
+		evrpc_hook_associate_meta_(&rpc_state->hook_meta, req->evcon);
+
+		/* do hook based tweaks to the request */
+		hook_res = evrpc_process_hooks(&rpc->base->output_hooks,
+		    rpc_state, req, rpc_state->rpc_data);
+		switch (hook_res) {
+		case EVRPC_TERMINATE:
+			goto error;
+		case EVRPC_PAUSE:
+			if (evrpc_pause_request(rpc->base, rpc_state,
+				evrpc_request_done_closure) == -1)
+				goto error;
+			return;
+		case EVRPC_CONTINUE:
+			break;
+		default:
+			EVUTIL_ASSERT(hook_res == EVRPC_TERMINATE ||
+			    hook_res == EVRPC_CONTINUE ||
+			    hook_res == EVRPC_PAUSE);
+		}
+	}
+
+	evrpc_request_done_closure(rpc_state, EVRPC_CONTINUE);
+	return;
+
+error:
+	evrpc_reqstate_free_(rpc_state);
+	evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
+	return;
+}
+
+void *
+evrpc_get_request(struct evrpc_req_generic *req)
+{
+	return req->request;
+}
+
+void *
+evrpc_get_reply(struct evrpc_req_generic *req)
+{
+	return req->reply;
+}
+
+static void
+evrpc_request_done_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
+{
+	struct evrpc_req_generic *rpc_state = arg;
+	struct evhttp_request *req;
+	EVUTIL_ASSERT(rpc_state);
+	req = rpc_state->http_req;
+
+	if (hook_res == EVRPC_TERMINATE)
+		goto error;
+
+	/* on success, we are going to transmit marshaled binary data */
+	if (evhttp_find_header(req->output_headers, "Content-Type") == NULL) {
+		evhttp_add_header(req->output_headers,
+		    "Content-Type", "application/octet-stream");
+	}
+	evhttp_send_reply(req, HTTP_OK, "OK", rpc_state->rpc_data);
+
+	evrpc_reqstate_free_(rpc_state);
+
+	return;
+
+error:
+	evrpc_reqstate_free_(rpc_state);
+	evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
+	return;
+}
+
+
+/* Client implementation of RPC site */
+
+static int evrpc_schedule_request(struct evhttp_connection *connection,
+    struct evrpc_request_wrapper *ctx);
+
+struct evrpc_pool *
+evrpc_pool_new(struct event_base *base)
+{
+	struct evrpc_pool *pool = mm_calloc(1, sizeof(struct evrpc_pool));
+	if (pool == NULL)
+		return (NULL);
+
+	TAILQ_INIT(&pool->connections);
+	TAILQ_INIT(&pool->requests);
+
+	TAILQ_INIT(&pool->paused_requests);
+
+	TAILQ_INIT(&pool->input_hooks);
+	TAILQ_INIT(&pool->output_hooks);
+
+	pool->base = base;
+	pool->timeout = -1;
+
+	return (pool);
+}
+
+static void
+evrpc_request_wrapper_free(struct evrpc_request_wrapper *request)
+{
+	if (request->hook_meta != NULL)
+		evrpc_hook_context_free_(request->hook_meta);
+	mm_free(request->name);
+	mm_free(request);
+}
+
+void
+evrpc_pool_free(struct evrpc_pool *pool)
+{
+	struct evhttp_connection *connection;
+	struct evrpc_request_wrapper *request;
+	struct evrpc_hook_ctx *pause;
+	struct evrpc_hook *hook;
+	int r;
+
+	while ((request = TAILQ_FIRST(&pool->requests)) != NULL) {
+		TAILQ_REMOVE(&pool->requests, request, next);
+		evrpc_request_wrapper_free(request);
+	}
+
+	while ((pause = TAILQ_FIRST(&pool->paused_requests)) != NULL) {
+		TAILQ_REMOVE(&pool->paused_requests, pause, next);
+		mm_free(pause);
+	}
+
+	while ((connection = TAILQ_FIRST(&pool->connections)) != NULL) {
+		TAILQ_REMOVE(&pool->connections, connection, next);
+		evhttp_connection_free(connection);
+	}
+
+	while ((hook = TAILQ_FIRST(&pool->input_hooks)) != NULL) {
+		r = evrpc_remove_hook(pool, EVRPC_INPUT, hook);
+		EVUTIL_ASSERT(r);
+	}
+
+	while ((hook = TAILQ_FIRST(&pool->output_hooks)) != NULL) {
+		r = evrpc_remove_hook(pool, EVRPC_OUTPUT, hook);
+		EVUTIL_ASSERT(r);
+	}
+
+	mm_free(pool);
+}
+
+/*
+ * Add a connection to the RPC pool.   A request scheduled on the pool
+ * may use any available connection.
+ */
+
+void
+evrpc_pool_add_connection(struct evrpc_pool *pool,
+    struct evhttp_connection *connection)
+{
+	EVUTIL_ASSERT(connection->http_server == NULL);
+	TAILQ_INSERT_TAIL(&pool->connections, connection, next);
+
+	/*
+	 * associate an event base with this connection
+	 */
+	if (pool->base != NULL)
+		evhttp_connection_set_base(connection, pool->base);
+
+	/*
+	 * unless a timeout was specifically set for a connection,
+	 * the connection inherits the timeout from the pool.
+	 */
+	if (!evutil_timerisset(&connection->timeout))
+		evhttp_connection_set_timeout(connection, pool->timeout);
+
+	/*
+	 * if we have any requests pending, schedule them with the new
+	 * connections.
+	 */
+
+	if (TAILQ_FIRST(&pool->requests) != NULL) {
+		struct evrpc_request_wrapper *request =
+		    TAILQ_FIRST(&pool->requests);
+		TAILQ_REMOVE(&pool->requests, request, next);
+		evrpc_schedule_request(connection, request);
+	}
+}
+
+void
+evrpc_pool_remove_connection(struct evrpc_pool *pool,
+    struct evhttp_connection *connection)
+{
+	TAILQ_REMOVE(&pool->connections, connection, next);
+}
+
+void
+evrpc_pool_set_timeout(struct evrpc_pool *pool, int timeout_in_secs)
+{
+	struct evhttp_connection *evcon;
+	TAILQ_FOREACH(evcon, &pool->connections, next) {
+		evhttp_connection_set_timeout(evcon, timeout_in_secs);
+	}
+	pool->timeout = timeout_in_secs;
+}
+
+
+static void evrpc_reply_done(struct evhttp_request *, void *);
+static void evrpc_request_timeout(evutil_socket_t, short, void *);
+
+/*
+ * Finds a connection object associated with the pool that is currently
+ * idle and can be used to make a request.
+ */
+static struct evhttp_connection *
+evrpc_pool_find_connection(struct evrpc_pool *pool)
+{
+	struct evhttp_connection *connection;
+	TAILQ_FOREACH(connection, &pool->connections, next) {
+		if (TAILQ_FIRST(&connection->requests) == NULL)
+			return (connection);
+	}
+
+	return (NULL);
+}
+
+/*
+ * Prototypes responsible for evrpc scheduling and hooking
+ */
+
+static void evrpc_schedule_request_closure(void *ctx, enum EVRPC_HOOK_RESULT);
+
+/*
+ * We assume that the ctx is no longer queued on the pool.
+ */
+static int
+evrpc_schedule_request(struct evhttp_connection *connection,
+    struct evrpc_request_wrapper *ctx)
+{
+	struct evhttp_request *req = NULL;
+	struct evrpc_pool *pool = ctx->pool;
+	struct evrpc_status status;
+
+	if ((req = evhttp_request_new(evrpc_reply_done, ctx)) == NULL)
+		goto error;
+
+	/* serialize the request data into the output buffer */
+	ctx->request_marshal(req->output_buffer, ctx->request);
+
+	/* we need to know the connection that we might have to abort */
+	ctx->evcon = connection;
+
+	/* if we get paused we also need to know the request */
+	ctx->req = req;
+
+	if (TAILQ_FIRST(&pool->output_hooks) != NULL) {
+		int hook_res;
+
+		evrpc_hook_associate_meta_(&ctx->hook_meta, connection);
+
+		/* apply hooks to the outgoing request */
+		hook_res = evrpc_process_hooks(&pool->output_hooks,
+		    ctx, req, req->output_buffer);
+
+		switch (hook_res) {
+		case EVRPC_TERMINATE:
+			goto error;
+		case EVRPC_PAUSE:
+			/* we need to be explicitly resumed */
+			if (evrpc_pause_request(pool, ctx,
+				evrpc_schedule_request_closure) == -1)
+				goto error;
+			return (0);
+		case EVRPC_CONTINUE:
+			/* we can just continue */
+			break;
+		default:
+			EVUTIL_ASSERT(hook_res == EVRPC_TERMINATE ||
+			    hook_res == EVRPC_CONTINUE ||
+			    hook_res == EVRPC_PAUSE);
+		}
+	}
+
+	evrpc_schedule_request_closure(ctx, EVRPC_CONTINUE);
+	return (0);
+
+error:
+	memset(&status, 0, sizeof(status));
+	status.error = EVRPC_STATUS_ERR_UNSTARTED;
+	(*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
+	evrpc_request_wrapper_free(ctx);
+	return (-1);
+}
+
+static void
+evrpc_schedule_request_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
+{
+	struct evrpc_request_wrapper *ctx = arg;
+	struct evhttp_connection *connection = ctx->evcon;
+	struct evhttp_request *req = ctx->req;
+	struct evrpc_pool *pool = ctx->pool;
+	struct evrpc_status status;
+	char *uri = NULL;
+	int res = 0;
+
+	if (hook_res == EVRPC_TERMINATE)
+		goto error;
+
+	uri = evrpc_construct_uri(ctx->name);
+	if (uri == NULL)
+		goto error;
+
+	if (pool->timeout > 0) {
+		/*
+		 * a timeout after which the whole rpc is going to be aborted.
+		 */
+		struct timeval tv;
+		evutil_timerclear(&tv);
+		tv.tv_sec = pool->timeout;
+		evtimer_add(&ctx->ev_timeout, &tv);
+	}
+
+	/* start the request over the connection */
+	res = evhttp_make_request(connection, req, EVHTTP_REQ_POST, uri);
+	mm_free(uri);
+
+	if (res == -1)
+		goto error;
+
+	return;
+
+error:
+	memset(&status, 0, sizeof(status));
+	status.error = EVRPC_STATUS_ERR_UNSTARTED;
+	(*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
+	evrpc_request_wrapper_free(ctx);
+}
+
+/* we just queue the paused request on the pool under the req object */
+static int
+evrpc_pause_request(void *vbase, void *ctx,
+    void (*cb)(void *, enum EVRPC_HOOK_RESULT))
+{
+	struct evrpc_hooks_ *base = vbase;
+	struct evrpc_hook_ctx *pause = mm_malloc(sizeof(*pause));
+	if (pause == NULL)
+		return (-1);
+
+	pause->ctx = ctx;
+	pause->cb = cb;
+
+	TAILQ_INSERT_TAIL(&base->pause_requests, pause, next);
+	return (0);
+}
+
+int
+evrpc_resume_request(void *vbase, void *ctx, enum EVRPC_HOOK_RESULT res)
+{
+	struct evrpc_hooks_ *base = vbase;
+	struct evrpc_pause_list *head = &base->pause_requests;
+	struct evrpc_hook_ctx *pause;
+
+	TAILQ_FOREACH(pause, head, next) {
+		if (pause->ctx == ctx)
+			break;
+	}
+
+	if (pause == NULL)
+		return (-1);
+
+	(*pause->cb)(pause->ctx, res);
+	TAILQ_REMOVE(head, pause, next);
+	mm_free(pause);
+	return (0);
+}
+
+int
+evrpc_make_request(struct evrpc_request_wrapper *ctx)
+{
+	struct evrpc_pool *pool = ctx->pool;
+
+	/* initialize the event structure for this rpc */
+	evtimer_assign(&ctx->ev_timeout, pool->base, evrpc_request_timeout, ctx);
+
+	/* we better have some available connections on the pool */
+	EVUTIL_ASSERT(TAILQ_FIRST(&pool->connections) != NULL);
+
+	/*
+	 * if no connection is available, we queue the request on the pool,
+	 * the next time a connection is empty, the rpc will be send on that.
+	 */
+	TAILQ_INSERT_TAIL(&pool->requests, ctx, next);
+
+	evrpc_pool_schedule(pool);
+
+	return (0);
+}
+
+
+struct evrpc_request_wrapper *
+evrpc_make_request_ctx(
+	struct evrpc_pool *pool, void *request, void *reply,
+	const char *rpcname,
+	void (*req_marshal)(struct evbuffer*, void *),
+	void (*rpl_clear)(void *),
+	int (*rpl_unmarshal)(void *, struct evbuffer *),
+	void (*cb)(struct evrpc_status *, void *, void *, void *),
+	void *cbarg)
+{
+	struct evrpc_request_wrapper *ctx = (struct evrpc_request_wrapper *)
+	    mm_malloc(sizeof(struct evrpc_request_wrapper));
+	if (ctx == NULL)
+		return (NULL);
+
+	ctx->pool = pool;
+	ctx->hook_meta = NULL;
+	ctx->evcon = NULL;
+	ctx->name = mm_strdup(rpcname);
+	if (ctx->name == NULL) {
+		mm_free(ctx);
+		return (NULL);
+	}
+	ctx->cb = cb;
+	ctx->cb_arg = cbarg;
+	ctx->request = request;
+	ctx->reply = reply;
+	ctx->request_marshal = req_marshal;
+	ctx->reply_clear = rpl_clear;
+	ctx->reply_unmarshal = rpl_unmarshal;
+
+	return (ctx);
+}
+
+static void
+evrpc_reply_done_closure(void *, enum EVRPC_HOOK_RESULT);
+
+static void
+evrpc_reply_done(struct evhttp_request *req, void *arg)
+{
+	struct evrpc_request_wrapper *ctx = arg;
+	struct evrpc_pool *pool = ctx->pool;
+	int hook_res = EVRPC_CONTINUE;
+
+	/* cancel any timeout we might have scheduled */
+	event_del(&ctx->ev_timeout);
+
+	ctx->req = req;
+
+	/* we need to get the reply now */
+	if (req == NULL) {
+		evrpc_reply_done_closure(ctx, EVRPC_CONTINUE);
+		return;
+	}
+
+	if (TAILQ_FIRST(&pool->input_hooks) != NULL) {
+		evrpc_hook_associate_meta_(&ctx->hook_meta, ctx->evcon);
+
+		/* apply hooks to the incoming request */
+		hook_res = evrpc_process_hooks(&pool->input_hooks,
+		    ctx, req, req->input_buffer);
+
+		switch (hook_res) {
+		case EVRPC_TERMINATE:
+		case EVRPC_CONTINUE:
+			break;
+		case EVRPC_PAUSE:
+			/*
+			 * if we get paused we also need to know the
+			 * request.  unfortunately, the underlying
+			 * layer is going to free it.  we need to
+			 * request ownership explicitly
+			 */
+			evhttp_request_own(req);
+
+			evrpc_pause_request(pool, ctx,
+			    evrpc_reply_done_closure);
+			return;
+		default:
+			EVUTIL_ASSERT(hook_res == EVRPC_TERMINATE ||
+			    hook_res == EVRPC_CONTINUE ||
+			    hook_res == EVRPC_PAUSE);
+		}
+	}
+
+	evrpc_reply_done_closure(ctx, hook_res);
+
+	/* http request is being freed by underlying layer */
+}
+
+static void
+evrpc_reply_done_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
+{
+	struct evrpc_request_wrapper *ctx = arg;
+	struct evhttp_request *req = ctx->req;
+	struct evrpc_pool *pool = ctx->pool;
+	struct evrpc_status status;
+	int res = -1;
+
+	memset(&status, 0, sizeof(status));
+	status.http_req = req;
+
+	/* we need to get the reply now */
+	if (req == NULL) {
+		status.error = EVRPC_STATUS_ERR_TIMEOUT;
+	} else if (hook_res == EVRPC_TERMINATE) {
+		status.error = EVRPC_STATUS_ERR_HOOKABORTED;
+	} else {
+		res = ctx->reply_unmarshal(ctx->reply, req->input_buffer);
+		if (res == -1)
+			status.error = EVRPC_STATUS_ERR_BADPAYLOAD;
+	}
+
+	if (res == -1) {
+		/* clear everything that we might have written previously */
+		ctx->reply_clear(ctx->reply);
+	}
+
+	(*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
+
+	evrpc_request_wrapper_free(ctx);
+
+	/* the http layer owned the original request structure, but if we
+	 * got paused, we asked for ownership and need to free it here. */
+	if (req != NULL && evhttp_request_is_owned(req))
+		evhttp_request_free(req);
+
+	/* see if we can schedule another request */
+	evrpc_pool_schedule(pool);
+}
+
+static void
+evrpc_pool_schedule(struct evrpc_pool *pool)
+{
+	struct evrpc_request_wrapper *ctx = TAILQ_FIRST(&pool->requests);
+	struct evhttp_connection *evcon;
+
+	/* if no requests are pending, we have no work */
+	if (ctx == NULL)
+		return;
+
+	if ((evcon = evrpc_pool_find_connection(pool)) != NULL) {
+		TAILQ_REMOVE(&pool->requests, ctx, next);
+		evrpc_schedule_request(evcon, ctx);
+	}
+}
+
+static void
+evrpc_request_timeout(evutil_socket_t fd, short what, void *arg)
+{
+	struct evrpc_request_wrapper *ctx = arg;
+	struct evhttp_connection *evcon = ctx->evcon;
+	EVUTIL_ASSERT(evcon != NULL);
+
+	evhttp_connection_fail_(evcon, EVREQ_HTTP_TIMEOUT);
+}
+
+/*
+ * frees potential meta data associated with a request.
+ */
+
+static void
+evrpc_meta_data_free(struct evrpc_meta_list *meta_data)
+{
+	struct evrpc_meta *entry;
+	EVUTIL_ASSERT(meta_data != NULL);
+
+	while ((entry = TAILQ_FIRST(meta_data)) != NULL) {
+		TAILQ_REMOVE(meta_data, entry, next);
+		mm_free(entry->key);
+		mm_free(entry->data);
+		mm_free(entry);
+	}
+}
+
+static struct evrpc_hook_meta *
+evrpc_hook_meta_new_(void)
+{
+	struct evrpc_hook_meta *ctx;
+	ctx = mm_malloc(sizeof(struct evrpc_hook_meta));
+	EVUTIL_ASSERT(ctx != NULL);
+
+	TAILQ_INIT(&ctx->meta_data);
+	ctx->evcon = NULL;
+
+	return (ctx);
+}
+
+static void
+evrpc_hook_associate_meta_(struct evrpc_hook_meta **pctx,
+    struct evhttp_connection *evcon)
+{
+	struct evrpc_hook_meta *ctx = *pctx;
+	if (ctx == NULL)
+		*pctx = ctx = evrpc_hook_meta_new_();
+	ctx->evcon = evcon;
+}
+
+static void
+evrpc_hook_context_free_(struct evrpc_hook_meta *ctx)
+{
+	evrpc_meta_data_free(&ctx->meta_data);
+	mm_free(ctx);
+}
+
+/* Adds meta data */
+void
+evrpc_hook_add_meta(void *ctx, const char *key,
+    const void *data, size_t data_size)
+{
+	struct evrpc_request_wrapper *req = ctx;
+	struct evrpc_hook_meta *store = NULL;
+	struct evrpc_meta *meta = NULL;
+
+	if ((store = req->hook_meta) == NULL)
+		store = req->hook_meta = evrpc_hook_meta_new_();
+
+	meta = mm_malloc(sizeof(struct evrpc_meta));
+	EVUTIL_ASSERT(meta != NULL);
+	meta->key = mm_strdup(key);
+	EVUTIL_ASSERT(meta->key != NULL);
+	meta->data_size = data_size;
+	meta->data = mm_malloc(data_size);
+	EVUTIL_ASSERT(meta->data != NULL);
+	memcpy(meta->data, data, data_size);
+
+	TAILQ_INSERT_TAIL(&store->meta_data, meta, next);
+}
+
+int
+evrpc_hook_find_meta(void *ctx, const char *key, void **data, size_t *data_size)
+{
+	struct evrpc_request_wrapper *req = ctx;
+	struct evrpc_meta *meta = NULL;
+
+	if (req->hook_meta == NULL)
+		return (-1);
+
+	TAILQ_FOREACH(meta, &req->hook_meta->meta_data, next) {
+		if (strcmp(meta->key, key) == 0) {
+			*data = meta->data;
+			*data_size = meta->data_size;
+			return (0);
+		}
+	}
+
+	return (-1);
+}
+
+struct evhttp_connection *
+evrpc_hook_get_connection(void *ctx)
+{
+	struct evrpc_request_wrapper *req = ctx;
+	return (req->hook_meta != NULL ? req->hook_meta->evcon : NULL);
+}
+
+int
+evrpc_send_request_generic(struct evrpc_pool *pool,
+    void *request, void *reply,
+    void (*cb)(struct evrpc_status *, void *, void *, void *),
+    void *cb_arg,
+    const char *rpcname,
+    void (*req_marshal)(struct evbuffer *, void *),
+    void (*rpl_clear)(void *),
+    int (*rpl_unmarshal)(void *, struct evbuffer *))
+{
+	struct evrpc_status status;
+	struct evrpc_request_wrapper *ctx;
+	ctx = evrpc_make_request_ctx(pool, request, reply,
+	    rpcname, req_marshal, rpl_clear, rpl_unmarshal, cb, cb_arg);
+	if (ctx == NULL)
+		goto error;
+	return (evrpc_make_request(ctx));
+error:
+	memset(&status, 0, sizeof(status));
+	status.error = EVRPC_STATUS_ERR_UNSTARTED;
+	(*(cb))(&status, request, reply, cb_arg);
+	return (-1);
+}
+
+/** Takes a request object and fills it in with the right magic */
+static struct evrpc *
+evrpc_register_object(const char *name,
+    void *(*req_new)(void*), void *req_new_arg, void (*req_free)(void *),
+    int (*req_unmarshal)(void *, struct evbuffer *),
+    void *(*rpl_new)(void*), void *rpl_new_arg, void (*rpl_free)(void *),
+    int (*rpl_complete)(void *),
+    void (*rpl_marshal)(struct evbuffer *, void *))
+{
+	struct evrpc* rpc = (struct evrpc *)mm_calloc(1, sizeof(struct evrpc));
+	if (rpc == NULL)
+		return (NULL);
+	rpc->uri = mm_strdup(name);
+	if (rpc->uri == NULL) {
+		mm_free(rpc);
+		return (NULL);
+	}
+	rpc->request_new = req_new;
+	rpc->request_new_arg = req_new_arg;
+	rpc->request_free = req_free;
+	rpc->request_unmarshal = req_unmarshal;
+	rpc->reply_new = rpl_new;
+	rpc->reply_new_arg = rpl_new_arg;
+	rpc->reply_free = rpl_free;
+	rpc->reply_complete = rpl_complete;
+	rpc->reply_marshal = rpl_marshal;
+	return (rpc);
+}
+
+int
+evrpc_register_generic(struct evrpc_base *base, const char *name,
+    void (*callback)(struct evrpc_req_generic *, void *), void *cbarg,
+    void *(*req_new)(void *), void *req_new_arg, void (*req_free)(void *),
+    int (*req_unmarshal)(void *, struct evbuffer *),
+    void *(*rpl_new)(void *), void *rpl_new_arg, void (*rpl_free)(void *),
+    int (*rpl_complete)(void *),
+    void (*rpl_marshal)(struct evbuffer *, void *))
+{
+	struct evrpc* rpc =
+	    evrpc_register_object(name, req_new, req_new_arg, req_free, req_unmarshal,
+		rpl_new, rpl_new_arg, rpl_free, rpl_complete, rpl_marshal);
+	if (rpc == NULL)
+		return (-1);
+	evrpc_register_rpc(base, rpc,
+	    (void (*)(struct evrpc_req_generic*, void *))callback, cbarg);
+	return (0);
+}
+
+/** accessors for obscure and undocumented functionality */
+struct evrpc_pool *
+evrpc_request_get_pool(struct evrpc_request_wrapper *ctx)
+{
+	return (ctx->pool);
+}
+
+void
+evrpc_request_set_pool(struct evrpc_request_wrapper *ctx,
+    struct evrpc_pool *pool)
+{
+	ctx->pool = pool;
+}
+
+void
+evrpc_request_set_cb(struct evrpc_request_wrapper *ctx,
+    void (*cb)(struct evrpc_status*, void *request, void *reply, void *arg),
+    void *cb_arg)
+{
+	ctx->cb = cb;
+	ctx->cb_arg = cb_arg;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/evsignal-internal.h b/extra/libevent/libevent-2.1.11-stable/evsignal-internal.h
new file mode 100644
index 000000000000..5cff03b52555
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evsignal-internal.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVSIGNAL_INTERNAL_H_INCLUDED_
+#define EVSIGNAL_INTERNAL_H_INCLUDED_
+
+#ifndef evutil_socket_t
+#include "event2/util.h"
+#endif
+#include <signal.h>
+
+typedef void (*ev_sighandler_t)(int);
+
+/* Data structure for the default signal-handling implementation in signal.c
+ */
+struct evsig_info {
+	/* Event watching ev_signal_pair[1] */
+	struct event ev_signal;
+	/* Socketpair used to send notifications from the signal handler */
+	evutil_socket_t ev_signal_pair[2];
+	/* True iff we've added the ev_signal event yet. */
+	int ev_signal_added;
+	/* Count of the number of signals we're currently watching. */
+	int ev_n_signals_added;
+
+	/* Array of previous signal handler objects before Libevent started
+	 * messing with them.  Used to restore old signal handlers. */
+#ifdef EVENT__HAVE_SIGACTION
+	struct sigaction **sh_old;
+#else
+	ev_sighandler_t **sh_old;
+#endif
+	/* Size of sh_old. */
+	int sh_old_max;
+};
+int evsig_init_(struct event_base *);
+void evsig_dealloc_(struct event_base *);
+
+void evsig_set_base_(struct event_base *base);
+void evsig_free_globals_(void);
+
+#endif /* EVSIGNAL_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/evthread-internal.h b/extra/libevent/libevent-2.1.11-stable/evthread-internal.h
new file mode 100644
index 000000000000..5fdf31619cc8
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evthread-internal.h
@@ -0,0 +1,406 @@
+/*
+ * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVTHREAD_INTERNAL_H_INCLUDED_
+#define EVTHREAD_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include "event2/thread.h"
+#include "util-internal.h"
+
+struct event_base;
+
+#ifndef _WIN32
+/* On Windows, the way we currently make DLLs, it's not allowed for us to
+ * have shared global structures.  Thus, we only do the direct-call-to-function
+ * code path if we know that the local shared library system supports it.
+ */
+#define EVTHREAD_EXPOSE_STRUCTS
+#endif
+
+#if ! defined(EVENT__DISABLE_THREAD_SUPPORT) && defined(EVTHREAD_EXPOSE_STRUCTS)
+/* Global function pointers to lock-related functions. NULL if locking isn't
+   enabled. */
+EVENT2_EXPORT_SYMBOL
+extern struct evthread_lock_callbacks evthread_lock_fns_;
+EVENT2_EXPORT_SYMBOL
+extern struct evthread_condition_callbacks evthread_cond_fns_;
+extern unsigned long (*evthread_id_fn_)(void);
+EVENT2_EXPORT_SYMBOL
+extern int evthread_lock_debugging_enabled_;
+
+/** Return the ID of the current thread, or 1 if threading isn't enabled. */
+#define EVTHREAD_GET_ID() \
+	(evthread_id_fn_ ? evthread_id_fn_() : 1)
+
+/** Return true iff we're in the thread that is currently (or most recently)
+ * running a given event_base's loop. Requires lock. */
+#define EVBASE_IN_THREAD(base)				 \
+	(evthread_id_fn_ == NULL ||			 \
+	(base)->th_owner_id == evthread_id_fn_())
+
+/** Return true iff we need to notify the base's main thread about changes to
+ * its state, because it's currently running the main loop in another
+ * thread. Requires lock. */
+#define EVBASE_NEED_NOTIFY(base)			 \
+	(evthread_id_fn_ != NULL &&			 \
+	    (base)->running_loop &&			 \
+	    (base)->th_owner_id != evthread_id_fn_())
+
+/** Allocate a new lock, and store it in lockvar, a void*.  Sets lockvar to
+    NULL if locking is not enabled. */
+#define EVTHREAD_ALLOC_LOCK(lockvar, locktype)		\
+	((lockvar) = evthread_lock_fns_.alloc ?		\
+	    evthread_lock_fns_.alloc(locktype) : NULL)
+
+/** Free a given lock, if it is present and locking is enabled. */
+#define EVTHREAD_FREE_LOCK(lockvar, locktype)				\
+	do {								\
+		void *lock_tmp_ = (lockvar);				\
+		if (lock_tmp_ && evthread_lock_fns_.free)		\
+			evthread_lock_fns_.free(lock_tmp_, (locktype)); \
+	} while (0)
+
+/** Acquire a lock. */
+#define EVLOCK_LOCK(lockvar,mode)					\
+	do {								\
+		if (lockvar)						\
+			evthread_lock_fns_.lock(mode, lockvar);		\
+	} while (0)
+
+/** Release a lock */
+#define EVLOCK_UNLOCK(lockvar,mode)					\
+	do {								\
+		if (lockvar)						\
+			evthread_lock_fns_.unlock(mode, lockvar);	\
+	} while (0)
+
+/** Helper: put lockvar1 and lockvar2 into pointerwise ascending order. */
+#define EVLOCK_SORTLOCKS_(lockvar1, lockvar2)				\
+	do {								\
+		if (lockvar1 && lockvar2 && lockvar1 > lockvar2) {	\
+			void *tmp = lockvar1;				\
+			lockvar1 = lockvar2;				\
+			lockvar2 = tmp;					\
+		}							\
+	} while (0)
+
+/** Lock an event_base, if it is set up for locking.  Acquires the lock
+    in the base structure whose field is named 'lockvar'. */
+#define EVBASE_ACQUIRE_LOCK(base, lockvar) do {				\
+		EVLOCK_LOCK((base)->lockvar, 0);			\
+	} while (0)
+
+/** Unlock an event_base, if it is set up for locking. */
+#define EVBASE_RELEASE_LOCK(base, lockvar) do {				\
+		EVLOCK_UNLOCK((base)->lockvar, 0);			\
+	} while (0)
+
+/** If lock debugging is enabled, and lock is non-null, assert that 'lock' is
+ * locked and held by us. */
+#define EVLOCK_ASSERT_LOCKED(lock)					\
+	do {								\
+		if ((lock) && evthread_lock_debugging_enabled_) {	\
+			EVUTIL_ASSERT(evthread_is_debug_lock_held_(lock)); \
+		}							\
+	} while (0)
+
+/** Try to grab the lock for 'lockvar' without blocking, and return 1 if we
+ * manage to get it. */
+static inline int EVLOCK_TRY_LOCK_(void *lock);
+static inline int
+EVLOCK_TRY_LOCK_(void *lock)
+{
+	if (lock && evthread_lock_fns_.lock) {
+		int r = evthread_lock_fns_.lock(EVTHREAD_TRY, lock);
+		return !r;
+	} else {
+		/* Locking is disabled either globally or for this thing;
+		 * of course we count as having the lock. */
+		return 1;
+	}
+}
+
+/** Allocate a new condition variable and store it in the void *, condvar */
+#define EVTHREAD_ALLOC_COND(condvar)					\
+	do {								\
+		(condvar) = evthread_cond_fns_.alloc_condition ?	\
+		    evthread_cond_fns_.alloc_condition(0) : NULL;	\
+	} while (0)
+/** Deallocate and free a condition variable in condvar */
+#define EVTHREAD_FREE_COND(cond)					\
+	do {								\
+		if (cond)						\
+			evthread_cond_fns_.free_condition((cond));	\
+	} while (0)
+/** Signal one thread waiting on cond */
+#define EVTHREAD_COND_SIGNAL(cond)					\
+	( (cond) ? evthread_cond_fns_.signal_condition((cond), 0) : 0 )
+/** Signal all threads waiting on cond */
+#define EVTHREAD_COND_BROADCAST(cond)					\
+	( (cond) ? evthread_cond_fns_.signal_condition((cond), 1) : 0 )
+/** Wait until the condition 'cond' is signalled.  Must be called while
+ * holding 'lock'.  The lock will be released until the condition is
+ * signalled, at which point it will be acquired again.  Returns 0 for
+ * success, -1 for failure. */
+#define EVTHREAD_COND_WAIT(cond, lock)					\
+	( (cond) ? evthread_cond_fns_.wait_condition((cond), (lock), NULL) : 0 )
+/** As EVTHREAD_COND_WAIT, but gives up after 'tv' has elapsed.  Returns 1
+ * on timeout. */
+#define EVTHREAD_COND_WAIT_TIMED(cond, lock, tv)			\
+	( (cond) ? evthread_cond_fns_.wait_condition((cond), (lock), (tv)) : 0 )
+
+/** True iff locking functions have been configured. */
+#define EVTHREAD_LOCKING_ENABLED()		\
+	(evthread_lock_fns_.lock != NULL)
+
+#elif ! defined(EVENT__DISABLE_THREAD_SUPPORT)
+
+unsigned long evthreadimpl_get_id_(void);
+EVENT2_EXPORT_SYMBOL
+int evthreadimpl_is_lock_debugging_enabled_(void);
+EVENT2_EXPORT_SYMBOL
+void *evthreadimpl_lock_alloc_(unsigned locktype);
+EVENT2_EXPORT_SYMBOL
+void evthreadimpl_lock_free_(void *lock, unsigned locktype);
+EVENT2_EXPORT_SYMBOL
+int evthreadimpl_lock_lock_(unsigned mode, void *lock);
+EVENT2_EXPORT_SYMBOL
+int evthreadimpl_lock_unlock_(unsigned mode, void *lock);
+EVENT2_EXPORT_SYMBOL
+void *evthreadimpl_cond_alloc_(unsigned condtype);
+EVENT2_EXPORT_SYMBOL
+void evthreadimpl_cond_free_(void *cond);
+EVENT2_EXPORT_SYMBOL
+int evthreadimpl_cond_signal_(void *cond, int broadcast);
+EVENT2_EXPORT_SYMBOL
+int evthreadimpl_cond_wait_(void *cond, void *lock, const struct timeval *tv);
+int evthreadimpl_locking_enabled_(void);
+
+#define EVTHREAD_GET_ID() evthreadimpl_get_id_()
+#define EVBASE_IN_THREAD(base)				\
+	((base)->th_owner_id == evthreadimpl_get_id_())
+#define EVBASE_NEED_NOTIFY(base)			 \
+	((base)->running_loop &&			 \
+	    ((base)->th_owner_id != evthreadimpl_get_id_()))
+
+#define EVTHREAD_ALLOC_LOCK(lockvar, locktype)		\
+	((lockvar) = evthreadimpl_lock_alloc_(locktype))
+
+#define EVTHREAD_FREE_LOCK(lockvar, locktype)				\
+	do {								\
+		void *lock_tmp_ = (lockvar);				\
+		if (lock_tmp_)						\
+			evthreadimpl_lock_free_(lock_tmp_, (locktype)); \
+	} while (0)
+
+/** Acquire a lock. */
+#define EVLOCK_LOCK(lockvar,mode)					\
+	do {								\
+		if (lockvar)						\
+			evthreadimpl_lock_lock_(mode, lockvar);		\
+	} while (0)
+
+/** Release a lock */
+#define EVLOCK_UNLOCK(lockvar,mode)					\
+	do {								\
+		if (lockvar)						\
+			evthreadimpl_lock_unlock_(mode, lockvar);	\
+	} while (0)
+
+/** Lock an event_base, if it is set up for locking.  Acquires the lock
+    in the base structure whose field is named 'lockvar'. */
+#define EVBASE_ACQUIRE_LOCK(base, lockvar) do {				\
+		EVLOCK_LOCK((base)->lockvar, 0);			\
+	} while (0)
+
+/** Unlock an event_base, if it is set up for locking. */
+#define EVBASE_RELEASE_LOCK(base, lockvar) do {				\
+		EVLOCK_UNLOCK((base)->lockvar, 0);			\
+	} while (0)
+
+/** If lock debugging is enabled, and lock is non-null, assert that 'lock' is
+ * locked and held by us. */
+#define EVLOCK_ASSERT_LOCKED(lock)					\
+	do {								\
+		if ((lock) && evthreadimpl_is_lock_debugging_enabled_()) { \
+			EVUTIL_ASSERT(evthread_is_debug_lock_held_(lock)); \
+		}							\
+	} while (0)
+
+/** Try to grab the lock for 'lockvar' without blocking, and return 1 if we
+ * manage to get it. */
+static inline int EVLOCK_TRY_LOCK_(void *lock);
+static inline int
+EVLOCK_TRY_LOCK_(void *lock)
+{
+	if (lock) {
+		int r = evthreadimpl_lock_lock_(EVTHREAD_TRY, lock);
+		return !r;
+	} else {
+		/* Locking is disabled either globally or for this thing;
+		 * of course we count as having the lock. */
+		return 1;
+	}
+}
+
+/** Allocate a new condition variable and store it in the void *, condvar */
+#define EVTHREAD_ALLOC_COND(condvar)					\
+	do {								\
+		(condvar) = evthreadimpl_cond_alloc_(0);		\
+	} while (0)
+/** Deallocate and free a condition variable in condvar */
+#define EVTHREAD_FREE_COND(cond)					\
+	do {								\
+		if (cond)						\
+			evthreadimpl_cond_free_((cond));		\
+	} while (0)
+/** Signal one thread waiting on cond */
+#define EVTHREAD_COND_SIGNAL(cond)					\
+	( (cond) ? evthreadimpl_cond_signal_((cond), 0) : 0 )
+/** Signal all threads waiting on cond */
+#define EVTHREAD_COND_BROADCAST(cond)					\
+	( (cond) ? evthreadimpl_cond_signal_((cond), 1) : 0 )
+/** Wait until the condition 'cond' is signalled.  Must be called while
+ * holding 'lock'.  The lock will be released until the condition is
+ * signalled, at which point it will be acquired again.  Returns 0 for
+ * success, -1 for failure. */
+#define EVTHREAD_COND_WAIT(cond, lock)					\
+	( (cond) ? evthreadimpl_cond_wait_((cond), (lock), NULL) : 0 )
+/** As EVTHREAD_COND_WAIT, but gives up after 'tv' has elapsed.  Returns 1
+ * on timeout. */
+#define EVTHREAD_COND_WAIT_TIMED(cond, lock, tv)			\
+	( (cond) ? evthreadimpl_cond_wait_((cond), (lock), (tv)) : 0 )
+
+#define EVTHREAD_LOCKING_ENABLED()		\
+	(evthreadimpl_locking_enabled_())
+
+#else /* EVENT__DISABLE_THREAD_SUPPORT */
+
+#define EVTHREAD_GET_ID()	1
+#define EVTHREAD_ALLOC_LOCK(lockvar, locktype) EVUTIL_NIL_STMT_
+#define EVTHREAD_FREE_LOCK(lockvar, locktype) EVUTIL_NIL_STMT_
+
+#define EVLOCK_LOCK(lockvar, mode) EVUTIL_NIL_STMT_
+#define EVLOCK_UNLOCK(lockvar, mode) EVUTIL_NIL_STMT_
+#define EVLOCK_LOCK2(lock1,lock2,mode1,mode2) EVUTIL_NIL_STMT_
+#define EVLOCK_UNLOCK2(lock1,lock2,mode1,mode2) EVUTIL_NIL_STMT_
+
+#define EVBASE_IN_THREAD(base)	1
+#define EVBASE_NEED_NOTIFY(base) 0
+#define EVBASE_ACQUIRE_LOCK(base, lock) EVUTIL_NIL_STMT_
+#define EVBASE_RELEASE_LOCK(base, lock) EVUTIL_NIL_STMT_
+#define EVLOCK_ASSERT_LOCKED(lock) EVUTIL_NIL_STMT_
+
+#define EVLOCK_TRY_LOCK_(lock) 1
+
+#define EVTHREAD_ALLOC_COND(condvar) EVUTIL_NIL_STMT_
+#define EVTHREAD_FREE_COND(cond) EVUTIL_NIL_STMT_
+#define EVTHREAD_COND_SIGNAL(cond) EVUTIL_NIL_STMT_
+#define EVTHREAD_COND_BROADCAST(cond) EVUTIL_NIL_STMT_
+#define EVTHREAD_COND_WAIT(cond, lock) EVUTIL_NIL_STMT_
+#define EVTHREAD_COND_WAIT_TIMED(cond, lock, howlong) EVUTIL_NIL_STMT_
+
+#define EVTHREAD_LOCKING_ENABLED() 0
+
+#endif
+
+/* This code is shared between both lock impls */
+#if ! defined(EVENT__DISABLE_THREAD_SUPPORT)
+/** Helper: put lockvar1 and lockvar2 into pointerwise ascending order. */
+#define EVLOCK_SORTLOCKS_(lockvar1, lockvar2)				\
+	do {								\
+		if (lockvar1 && lockvar2 && lockvar1 > lockvar2) {	\
+			void *tmp = lockvar1;				\
+			lockvar1 = lockvar2;				\
+			lockvar2 = tmp;					\
+		}							\
+	} while (0)
+
+/** Acquire both lock1 and lock2.  Always allocates locks in the same order,
+ * so that two threads locking two locks with LOCK2 will not deadlock. */
+#define EVLOCK_LOCK2(lock1,lock2,mode1,mode2)				\
+	do {								\
+		void *lock1_tmplock_ = (lock1);				\
+		void *lock2_tmplock_ = (lock2);				\
+		EVLOCK_SORTLOCKS_(lock1_tmplock_,lock2_tmplock_);	\
+		EVLOCK_LOCK(lock1_tmplock_,mode1);			\
+		if (lock2_tmplock_ != lock1_tmplock_)			\
+			EVLOCK_LOCK(lock2_tmplock_,mode2);		\
+	} while (0)
+/** Release both lock1 and lock2.  */
+#define EVLOCK_UNLOCK2(lock1,lock2,mode1,mode2)				\
+	do {								\
+		void *lock1_tmplock_ = (lock1);				\
+		void *lock2_tmplock_ = (lock2);				\
+		EVLOCK_SORTLOCKS_(lock1_tmplock_,lock2_tmplock_);	\
+		if (lock2_tmplock_ != lock1_tmplock_)			\
+			EVLOCK_UNLOCK(lock2_tmplock_,mode2);		\
+		EVLOCK_UNLOCK(lock1_tmplock_,mode1);			\
+	} while (0)
+
+EVENT2_EXPORT_SYMBOL
+int evthread_is_debug_lock_held_(void *lock);
+void *evthread_debug_get_real_lock_(void *lock);
+
+void *evthread_setup_global_lock_(void *lock_, unsigned locktype,
+    int enable_locks);
+
+#define EVTHREAD_SETUP_GLOBAL_LOCK(lockvar, locktype)			\
+	do {								\
+		lockvar = evthread_setup_global_lock_(lockvar,		\
+		    (locktype), enable_locks);				\
+		if (!lockvar) {						\
+			event_warn("Couldn't allocate %s", #lockvar);	\
+			return -1;					\
+		}							\
+	} while (0);
+
+int event_global_setup_locks_(const int enable_locks);
+int evsig_global_setup_locks_(const int enable_locks);
+int evutil_global_setup_locks_(const int enable_locks);
+int evutil_secure_rng_global_setup_locks_(const int enable_locks);
+
+/** Return current evthread_lock_callbacks */
+EVENT2_EXPORT_SYMBOL
+struct evthread_lock_callbacks *evthread_get_lock_callbacks(void);
+/** Return current evthread_condition_callbacks */
+struct evthread_condition_callbacks *evthread_get_condition_callbacks(void);
+/** Disable locking for internal usage (like global shutdown) */
+void evthreadimpl_disable_lock_debugging_(void);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVTHREAD_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/evthread.c b/extra/libevent/libevent-2.1.11-stable/evthread.c
new file mode 100644
index 000000000000..3eac594d64dc
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evthread.c
@@ -0,0 +1,509 @@
+/*
+ * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+
+#include "event2/thread.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+#include "evthread-internal.h"
+
+#ifdef EVTHREAD_EXPOSE_STRUCTS
+#define GLOBAL
+#else
+#define GLOBAL static
+#endif
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+extern int event_debug_created_threadable_ctx_;
+extern int event_debug_mode_on_;
+#endif
+
+/* globals */
+GLOBAL int evthread_lock_debugging_enabled_ = 0;
+GLOBAL struct evthread_lock_callbacks evthread_lock_fns_ = {
+	0, 0, NULL, NULL, NULL, NULL
+};
+GLOBAL unsigned long (*evthread_id_fn_)(void) = NULL;
+GLOBAL struct evthread_condition_callbacks evthread_cond_fns_ = {
+	0, NULL, NULL, NULL, NULL
+};
+
+/* Used for debugging */
+static struct evthread_lock_callbacks original_lock_fns_ = {
+	0, 0, NULL, NULL, NULL, NULL
+};
+static struct evthread_condition_callbacks original_cond_fns_ = {
+	0, NULL, NULL, NULL, NULL
+};
+
+void
+evthread_set_id_callback(unsigned long (*id_fn)(void))
+{
+	evthread_id_fn_ = id_fn;
+}
+
+struct evthread_lock_callbacks *evthread_get_lock_callbacks()
+{
+	return evthread_lock_debugging_enabled_
+	    ? &original_lock_fns_ : &evthread_lock_fns_;
+}
+struct evthread_condition_callbacks *evthread_get_condition_callbacks()
+{
+	return evthread_lock_debugging_enabled_
+	    ? &original_cond_fns_ : &evthread_cond_fns_;
+}
+void evthreadimpl_disable_lock_debugging_(void)
+{
+	evthread_lock_debugging_enabled_ = 0;
+}
+
+int
+evthread_set_lock_callbacks(const struct evthread_lock_callbacks *cbs)
+{
+	struct evthread_lock_callbacks *target = evthread_get_lock_callbacks();
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_mode_on_) {
+		if (event_debug_created_threadable_ctx_) {
+		    event_errx(1, "evthread initialization must be called BEFORE anything else!");
+		}
+	}
+#endif
+
+	if (!cbs) {
+		if (target->alloc)
+			event_warnx("Trying to disable lock functions after "
+			    "they have been set up will probaby not work.");
+		memset(target, 0, sizeof(evthread_lock_fns_));
+		return 0;
+	}
+	if (target->alloc) {
+		/* Uh oh; we already had locking callbacks set up.*/
+		if (target->lock_api_version == cbs->lock_api_version &&
+			target->supported_locktypes == cbs->supported_locktypes &&
+			target->alloc == cbs->alloc &&
+			target->free == cbs->free &&
+			target->lock == cbs->lock &&
+			target->unlock == cbs->unlock) {
+			/* no change -- allow this. */
+			return 0;
+		}
+		event_warnx("Can't change lock callbacks once they have been "
+		    "initialized.");
+		return -1;
+	}
+	if (cbs->alloc && cbs->free && cbs->lock && cbs->unlock) {
+		memcpy(target, cbs, sizeof(evthread_lock_fns_));
+		return event_global_setup_locks_(1);
+	} else {
+		return -1;
+	}
+}
+
+int
+evthread_set_condition_callbacks(const struct evthread_condition_callbacks *cbs)
+{
+	struct evthread_condition_callbacks *target = evthread_get_condition_callbacks();
+
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_mode_on_) {
+		if (event_debug_created_threadable_ctx_) {
+		    event_errx(1, "evthread initialization must be called BEFORE anything else!");
+		}
+	}
+#endif
+
+	if (!cbs) {
+		if (target->alloc_condition)
+			event_warnx("Trying to disable condition functions "
+			    "after they have been set up will probaby not "
+			    "work.");
+		memset(target, 0, sizeof(evthread_cond_fns_));
+		return 0;
+	}
+	if (target->alloc_condition) {
+		/* Uh oh; we already had condition callbacks set up.*/
+		if (target->condition_api_version == cbs->condition_api_version &&
+			target->alloc_condition == cbs->alloc_condition &&
+			target->free_condition == cbs->free_condition &&
+			target->signal_condition == cbs->signal_condition &&
+			target->wait_condition == cbs->wait_condition) {
+			/* no change -- allow this. */
+			return 0;
+		}
+		event_warnx("Can't change condition callbacks once they "
+		    "have been initialized.");
+		return -1;
+	}
+	if (cbs->alloc_condition && cbs->free_condition &&
+	    cbs->signal_condition && cbs->wait_condition) {
+		memcpy(target, cbs, sizeof(evthread_cond_fns_));
+	}
+	if (evthread_lock_debugging_enabled_) {
+		evthread_cond_fns_.alloc_condition = cbs->alloc_condition;
+		evthread_cond_fns_.free_condition = cbs->free_condition;
+		evthread_cond_fns_.signal_condition = cbs->signal_condition;
+	}
+	return 0;
+}
+
+#define DEBUG_LOCK_SIG	0xdeb0b10c
+
+struct debug_lock {
+	unsigned signature;
+	unsigned locktype;
+	unsigned long held_by;
+	/* XXXX if we ever use read-write locks, we will need a separate
+	 * lock to protect count. */
+	int count;
+	void *lock;
+};
+
+static void *
+debug_lock_alloc(unsigned locktype)
+{
+	struct debug_lock *result = mm_malloc(sizeof(struct debug_lock));
+	if (!result)
+		return NULL;
+	if (original_lock_fns_.alloc) {
+		if (!(result->lock = original_lock_fns_.alloc(
+				locktype|EVTHREAD_LOCKTYPE_RECURSIVE))) {
+			mm_free(result);
+			return NULL;
+		}
+	} else {
+		result->lock = NULL;
+	}
+	result->signature = DEBUG_LOCK_SIG;
+	result->locktype = locktype;
+	result->count = 0;
+	result->held_by = 0;
+	return result;
+}
+
+static void
+debug_lock_free(void *lock_, unsigned locktype)
+{
+	struct debug_lock *lock = lock_;
+	EVUTIL_ASSERT(lock->count == 0);
+	EVUTIL_ASSERT(locktype == lock->locktype);
+	EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
+	if (original_lock_fns_.free) {
+		original_lock_fns_.free(lock->lock,
+		    lock->locktype|EVTHREAD_LOCKTYPE_RECURSIVE);
+	}
+	lock->lock = NULL;
+	lock->count = -100;
+	lock->signature = 0x12300fda;
+	mm_free(lock);
+}
+
+static void
+evthread_debug_lock_mark_locked(unsigned mode, struct debug_lock *lock)
+{
+	EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
+	++lock->count;
+	if (!(lock->locktype & EVTHREAD_LOCKTYPE_RECURSIVE))
+		EVUTIL_ASSERT(lock->count == 1);
+	if (evthread_id_fn_) {
+		unsigned long me;
+		me = evthread_id_fn_();
+		if (lock->count > 1)
+			EVUTIL_ASSERT(lock->held_by == me);
+		lock->held_by = me;
+	}
+}
+
+static int
+debug_lock_lock(unsigned mode, void *lock_)
+{
+	struct debug_lock *lock = lock_;
+	int res = 0;
+	if (lock->locktype & EVTHREAD_LOCKTYPE_READWRITE)
+		EVUTIL_ASSERT(mode & (EVTHREAD_READ|EVTHREAD_WRITE));
+	else
+		EVUTIL_ASSERT((mode & (EVTHREAD_READ|EVTHREAD_WRITE)) == 0);
+	if (original_lock_fns_.lock)
+		res = original_lock_fns_.lock(mode, lock->lock);
+	if (!res) {
+		evthread_debug_lock_mark_locked(mode, lock);
+	}
+	return res;
+}
+
+static void
+evthread_debug_lock_mark_unlocked(unsigned mode, struct debug_lock *lock)
+{
+	EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
+	if (lock->locktype & EVTHREAD_LOCKTYPE_READWRITE)
+		EVUTIL_ASSERT(mode & (EVTHREAD_READ|EVTHREAD_WRITE));
+	else
+		EVUTIL_ASSERT((mode & (EVTHREAD_READ|EVTHREAD_WRITE)) == 0);
+	if (evthread_id_fn_) {
+		unsigned long me;
+		me = evthread_id_fn_();
+		EVUTIL_ASSERT(lock->held_by == me);
+		if (lock->count == 1)
+			lock->held_by = 0;
+	}
+	--lock->count;
+	EVUTIL_ASSERT(lock->count >= 0);
+}
+
+static int
+debug_lock_unlock(unsigned mode, void *lock_)
+{
+	struct debug_lock *lock = lock_;
+	int res = 0;
+	evthread_debug_lock_mark_unlocked(mode, lock);
+	if (original_lock_fns_.unlock)
+		res = original_lock_fns_.unlock(mode, lock->lock);
+	return res;
+}
+
+static int
+debug_cond_wait(void *cond_, void *lock_, const struct timeval *tv)
+{
+	int r;
+	struct debug_lock *lock = lock_;
+	EVUTIL_ASSERT(lock);
+	EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
+	EVLOCK_ASSERT_LOCKED(lock_);
+	evthread_debug_lock_mark_unlocked(0, lock);
+	r = original_cond_fns_.wait_condition(cond_, lock->lock, tv);
+	evthread_debug_lock_mark_locked(0, lock);
+	return r;
+}
+
+/* misspelled version for backward compatibility */
+void
+evthread_enable_lock_debuging(void)
+{
+	evthread_enable_lock_debugging();
+}
+
+void
+evthread_enable_lock_debugging(void)
+{
+	struct evthread_lock_callbacks cbs = {
+		EVTHREAD_LOCK_API_VERSION,
+		EVTHREAD_LOCKTYPE_RECURSIVE,
+		debug_lock_alloc,
+		debug_lock_free,
+		debug_lock_lock,
+		debug_lock_unlock
+	};
+	if (evthread_lock_debugging_enabled_)
+		return;
+	memcpy(&original_lock_fns_, &evthread_lock_fns_,
+	    sizeof(struct evthread_lock_callbacks));
+	memcpy(&evthread_lock_fns_, &cbs,
+	    sizeof(struct evthread_lock_callbacks));
+
+	memcpy(&original_cond_fns_, &evthread_cond_fns_,
+	    sizeof(struct evthread_condition_callbacks));
+	evthread_cond_fns_.wait_condition = debug_cond_wait;
+	evthread_lock_debugging_enabled_ = 1;
+
+	/* XXX return value should get checked. */
+	event_global_setup_locks_(0);
+}
+
+int
+evthread_is_debug_lock_held_(void *lock_)
+{
+	struct debug_lock *lock = lock_;
+	if (! lock->count)
+		return 0;
+	if (evthread_id_fn_) {
+		unsigned long me = evthread_id_fn_();
+		if (lock->held_by != me)
+			return 0;
+	}
+	return 1;
+}
+
+void *
+evthread_debug_get_real_lock_(void *lock_)
+{
+	struct debug_lock *lock = lock_;
+	return lock->lock;
+}
+
+void *
+evthread_setup_global_lock_(void *lock_, unsigned locktype, int enable_locks)
+{
+	/* there are four cases here:
+	   1) we're turning on debugging; locking is not on.
+	   2) we're turning on debugging; locking is on.
+	   3) we're turning on locking; debugging is not on.
+	   4) we're turning on locking; debugging is on. */
+
+	if (!enable_locks && original_lock_fns_.alloc == NULL) {
+		/* Case 1: allocate a debug lock. */
+		EVUTIL_ASSERT(lock_ == NULL);
+		return debug_lock_alloc(locktype);
+	} else if (!enable_locks && original_lock_fns_.alloc != NULL) {
+		/* Case 2: wrap the lock in a debug lock. */
+		struct debug_lock *lock;
+		EVUTIL_ASSERT(lock_ != NULL);
+
+		if (!(locktype & EVTHREAD_LOCKTYPE_RECURSIVE)) {
+			/* We can't wrap it: We need a recursive lock */
+			original_lock_fns_.free(lock_, locktype);
+			return debug_lock_alloc(locktype);
+		}
+		lock = mm_malloc(sizeof(struct debug_lock));
+		if (!lock) {
+			original_lock_fns_.free(lock_, locktype);
+			return NULL;
+		}
+		lock->lock = lock_;
+		lock->locktype = locktype;
+		lock->count = 0;
+		lock->held_by = 0;
+		return lock;
+	} else if (enable_locks && ! evthread_lock_debugging_enabled_) {
+		/* Case 3: allocate a regular lock */
+		EVUTIL_ASSERT(lock_ == NULL);
+		return evthread_lock_fns_.alloc(locktype);
+	} else {
+		/* Case 4: Fill in a debug lock with a real lock */
+		struct debug_lock *lock = lock_ ? lock_ : debug_lock_alloc(locktype);
+		EVUTIL_ASSERT(enable_locks &&
+		              evthread_lock_debugging_enabled_);
+		EVUTIL_ASSERT(lock->locktype == locktype);
+		if (!lock->lock) {
+			lock->lock = original_lock_fns_.alloc(
+				locktype|EVTHREAD_LOCKTYPE_RECURSIVE);
+			if (!lock->lock) {
+				lock->count = -200;
+				mm_free(lock);
+				return NULL;
+			}
+		}
+		return lock;
+	}
+}
+
+
+#ifndef EVTHREAD_EXPOSE_STRUCTS
+unsigned long
+evthreadimpl_get_id_()
+{
+	return evthread_id_fn_ ? evthread_id_fn_() : 1;
+}
+void *
+evthreadimpl_lock_alloc_(unsigned locktype)
+{
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_mode_on_) {
+		event_debug_created_threadable_ctx_ = 1;
+	}
+#endif
+
+	return evthread_lock_fns_.alloc ?
+	    evthread_lock_fns_.alloc(locktype) : NULL;
+}
+void
+evthreadimpl_lock_free_(void *lock, unsigned locktype)
+{
+	if (evthread_lock_fns_.free)
+		evthread_lock_fns_.free(lock, locktype);
+}
+int
+evthreadimpl_lock_lock_(unsigned mode, void *lock)
+{
+	if (evthread_lock_fns_.lock)
+		return evthread_lock_fns_.lock(mode, lock);
+	else
+		return 0;
+}
+int
+evthreadimpl_lock_unlock_(unsigned mode, void *lock)
+{
+	if (evthread_lock_fns_.unlock)
+		return evthread_lock_fns_.unlock(mode, lock);
+	else
+		return 0;
+}
+void *
+evthreadimpl_cond_alloc_(unsigned condtype)
+{
+#ifndef EVENT__DISABLE_DEBUG_MODE
+	if (event_debug_mode_on_) {
+		event_debug_created_threadable_ctx_ = 1;
+	}
+#endif
+
+	return evthread_cond_fns_.alloc_condition ?
+	    evthread_cond_fns_.alloc_condition(condtype) : NULL;
+}
+void
+evthreadimpl_cond_free_(void *cond)
+{
+	if (evthread_cond_fns_.free_condition)
+		evthread_cond_fns_.free_condition(cond);
+}
+int
+evthreadimpl_cond_signal_(void *cond, int broadcast)
+{
+	if (evthread_cond_fns_.signal_condition)
+		return evthread_cond_fns_.signal_condition(cond, broadcast);
+	else
+		return 0;
+}
+int
+evthreadimpl_cond_wait_(void *cond, void *lock, const struct timeval *tv)
+{
+	if (evthread_cond_fns_.wait_condition)
+		return evthread_cond_fns_.wait_condition(cond, lock, tv);
+	else
+		return 0;
+}
+int
+evthreadimpl_is_lock_debugging_enabled_(void)
+{
+	return evthread_lock_debugging_enabled_;
+}
+
+int
+evthreadimpl_locking_enabled_(void)
+{
+	return evthread_lock_fns_.lock != NULL;
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/evthread_pthread.c b/extra/libevent/libevent-2.1.11-stable/evthread_pthread.c
new file mode 100644
index 000000000000..4e11f74970ab
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evthread_pthread.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+/* With glibc we need to define _GNU_SOURCE to get PTHREAD_MUTEX_RECURSIVE.
+ * This comes from evconfig-private.h
+ */
+#include <pthread.h>
+
+struct event_base;
+#include "event2/thread.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include "mm-internal.h"
+#include "evthread-internal.h"
+
+static pthread_mutexattr_t attr_recursive;
+
+static void *
+evthread_posix_lock_alloc(unsigned locktype)
+{
+	pthread_mutexattr_t *attr = NULL;
+	pthread_mutex_t *lock = mm_malloc(sizeof(pthread_mutex_t));
+	if (!lock)
+		return NULL;
+	if (locktype & EVTHREAD_LOCKTYPE_RECURSIVE)
+		attr = &attr_recursive;
+	if (pthread_mutex_init(lock, attr)) {
+		mm_free(lock);
+		return NULL;
+	}
+	return lock;
+}
+
+static void
+evthread_posix_lock_free(void *lock_, unsigned locktype)
+{
+	pthread_mutex_t *lock = lock_;
+	pthread_mutex_destroy(lock);
+	mm_free(lock);
+}
+
+static int
+evthread_posix_lock(unsigned mode, void *lock_)
+{
+	pthread_mutex_t *lock = lock_;
+	if (mode & EVTHREAD_TRY)
+		return pthread_mutex_trylock(lock);
+	else
+		return pthread_mutex_lock(lock);
+}
+
+static int
+evthread_posix_unlock(unsigned mode, void *lock_)
+{
+	pthread_mutex_t *lock = lock_;
+	return pthread_mutex_unlock(lock);
+}
+
+static unsigned long
+evthread_posix_get_id(void)
+{
+	union {
+		pthread_t thr;
+#if EVENT__SIZEOF_PTHREAD_T > EVENT__SIZEOF_LONG
+		ev_uint64_t id;
+#else
+		unsigned long id;
+#endif
+	} r;
+#if EVENT__SIZEOF_PTHREAD_T < EVENT__SIZEOF_LONG
+	memset(&r, 0, sizeof(r));
+#endif
+	r.thr = pthread_self();
+	return (unsigned long)r.id;
+}
+
+static void *
+evthread_posix_cond_alloc(unsigned condflags)
+{
+	pthread_cond_t *cond = mm_malloc(sizeof(pthread_cond_t));
+	if (!cond)
+		return NULL;
+	if (pthread_cond_init(cond, NULL)) {
+		mm_free(cond);
+		return NULL;
+	}
+	return cond;
+}
+
+static void
+evthread_posix_cond_free(void *cond_)
+{
+	pthread_cond_t *cond = cond_;
+	pthread_cond_destroy(cond);
+	mm_free(cond);
+}
+
+static int
+evthread_posix_cond_signal(void *cond_, int broadcast)
+{
+	pthread_cond_t *cond = cond_;
+	int r;
+	if (broadcast)
+		r = pthread_cond_broadcast(cond);
+	else
+		r = pthread_cond_signal(cond);
+	return r ? -1 : 0;
+}
+
+static int
+evthread_posix_cond_wait(void *cond_, void *lock_, const struct timeval *tv)
+{
+	int r;
+	pthread_cond_t *cond = cond_;
+	pthread_mutex_t *lock = lock_;
+
+	if (tv) {
+		struct timeval now, abstime;
+		struct timespec ts;
+		evutil_gettimeofday(&now, NULL);
+		evutil_timeradd(&now, tv, &abstime);
+		ts.tv_sec = abstime.tv_sec;
+		ts.tv_nsec = abstime.tv_usec*1000;
+		r = pthread_cond_timedwait(cond, lock, &ts);
+		if (r == ETIMEDOUT)
+			return 1;
+		else if (r)
+			return -1;
+		else
+			return 0;
+	} else {
+		r = pthread_cond_wait(cond, lock);
+		return r ? -1 : 0;
+	}
+}
+
+int
+evthread_use_pthreads(void)
+{
+	struct evthread_lock_callbacks cbs = {
+		EVTHREAD_LOCK_API_VERSION,
+		EVTHREAD_LOCKTYPE_RECURSIVE,
+		evthread_posix_lock_alloc,
+		evthread_posix_lock_free,
+		evthread_posix_lock,
+		evthread_posix_unlock
+	};
+	struct evthread_condition_callbacks cond_cbs = {
+		EVTHREAD_CONDITION_API_VERSION,
+		evthread_posix_cond_alloc,
+		evthread_posix_cond_free,
+		evthread_posix_cond_signal,
+		evthread_posix_cond_wait
+	};
+	/* Set ourselves up to get recursive locks. */
+	if (pthread_mutexattr_init(&attr_recursive))
+		return -1;
+	if (pthread_mutexattr_settype(&attr_recursive, PTHREAD_MUTEX_RECURSIVE))
+		return -1;
+
+	evthread_set_lock_callbacks(&cbs);
+	evthread_set_condition_callbacks(&cond_cbs);
+	evthread_set_id_callback(evthread_posix_get_id);
+	return 0;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/evthread_win32.c b/extra/libevent/libevent-2.1.11-stable/evthread_win32.c
new file mode 100644
index 000000000000..2ec80560a5c9
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evthread_win32.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#ifndef _WIN32_WINNT
+/* Minimum required for InitializeCriticalSectionAndSpinCount */
+#define _WIN32_WINNT 0x0403
+#endif
+#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <sys/locking.h>
+#endif
+
+struct event_base;
+#include "event2/thread.h"
+
+#include "mm-internal.h"
+#include "evthread-internal.h"
+#include "time-internal.h"
+
+#define SPIN_COUNT 2000
+
+static void *
+evthread_win32_lock_create(unsigned locktype)
+{
+	CRITICAL_SECTION *lock = mm_malloc(sizeof(CRITICAL_SECTION));
+	if (!lock)
+		return NULL;
+	if (InitializeCriticalSectionAndSpinCount(lock, SPIN_COUNT) == 0) {
+		mm_free(lock);
+		return NULL;
+	}
+	return lock;
+}
+
+static void
+evthread_win32_lock_free(void *lock_, unsigned locktype)
+{
+	CRITICAL_SECTION *lock = lock_;
+	DeleteCriticalSection(lock);
+	mm_free(lock);
+}
+
+static int
+evthread_win32_lock(unsigned mode, void *lock_)
+{
+	CRITICAL_SECTION *lock = lock_;
+	if ((mode & EVTHREAD_TRY)) {
+		return ! TryEnterCriticalSection(lock);
+	} else {
+		EnterCriticalSection(lock);
+		return 0;
+	}
+}
+
+static int
+evthread_win32_unlock(unsigned mode, void *lock_)
+{
+	CRITICAL_SECTION *lock = lock_;
+	LeaveCriticalSection(lock);
+	return 0;
+}
+
+static unsigned long
+evthread_win32_get_id(void)
+{
+	return (unsigned long) GetCurrentThreadId();
+}
+
+#ifdef WIN32_HAVE_CONDITION_VARIABLES
+static void WINAPI (*InitializeConditionVariable_fn)(PCONDITION_VARIABLE)
+	= NULL;
+static BOOL WINAPI (*SleepConditionVariableCS_fn)(
+	PCONDITION_VARIABLE, PCRITICAL_SECTION, DWORD) = NULL;
+static void WINAPI (*WakeAllConditionVariable_fn)(PCONDITION_VARIABLE) = NULL;
+static void WINAPI (*WakeConditionVariable_fn)(PCONDITION_VARIABLE) = NULL;
+
+static int
+evthread_win32_condvar_init(void)
+{
+	HANDLE lib;
+
+	lib = GetModuleHandle(TEXT("kernel32.dll"));
+	if (lib == NULL)
+		return 0;
+
+#define LOAD(name)				\
+	name##_fn = GetProcAddress(lib, #name)
+	LOAD(InitializeConditionVariable);
+	LOAD(SleepConditionVariableCS);
+	LOAD(WakeAllConditionVariable);
+	LOAD(WakeConditionVariable);
+
+	return InitializeConditionVariable_fn && SleepConditionVariableCS_fn &&
+	    WakeAllConditionVariable_fn && WakeConditionVariable_fn;
+}
+
+/* XXXX Even if we can build this, we don't necessarily want to: the functions
+ * in question didn't exist before Vista, so we'd better LoadProc them. */
+static void *
+evthread_win32_condvar_alloc(unsigned condflags)
+{
+	CONDITION_VARIABLE *cond = mm_malloc(sizeof(CONDITION_VARIABLE));
+	if (!cond)
+		return NULL;
+	InitializeConditionVariable_fn(cond);
+	return cond;
+}
+
+static void
+evthread_win32_condvar_free(void *cond_)
+{
+	CONDITION_VARIABLE *cond = cond_;
+	/* There doesn't _seem_ to be a cleaup fn here... */
+	mm_free(cond);
+}
+
+static int
+evthread_win32_condvar_signal(void *cond, int broadcast)
+{
+	CONDITION_VARIABLE *cond = cond_;
+	if (broadcast)
+		WakeAllConditionVariable_fn(cond);
+	else
+		WakeConditionVariable_fn(cond);
+	return 0;
+}
+
+static int
+evthread_win32_condvar_wait(void *cond_, void *lock_, const struct timeval *tv)
+{
+	CONDITION_VARIABLE *cond = cond_;
+	CRITICAL_SECTION *lock = lock_;
+	DWORD ms, err;
+	BOOL result;
+
+	if (tv)
+		ms = evutil_tv_to_msec_(tv);
+	else
+		ms = INFINITE;
+	result = SleepConditionVariableCS_fn(cond, lock, ms);
+	if (result) {
+		if (GetLastError() == WAIT_TIMEOUT)
+			return 1;
+		else
+			return -1;
+	} else {
+		return 0;
+	}
+}
+#endif
+
+struct evthread_win32_cond {
+	HANDLE event;
+
+	CRITICAL_SECTION lock;
+	int n_waiting;
+	int n_to_wake;
+	int generation;
+};
+
+static void *
+evthread_win32_cond_alloc(unsigned flags)
+{
+	struct evthread_win32_cond *cond;
+	if (!(cond = mm_malloc(sizeof(struct evthread_win32_cond))))
+		return NULL;
+	if (InitializeCriticalSectionAndSpinCount(&cond->lock, SPIN_COUNT)==0) {
+		mm_free(cond);
+		return NULL;
+	}
+	if ((cond->event = CreateEvent(NULL,TRUE,FALSE,NULL)) == NULL) {
+		DeleteCriticalSection(&cond->lock);
+		mm_free(cond);
+		return NULL;
+	}
+	cond->n_waiting = cond->n_to_wake = cond->generation = 0;
+	return cond;
+}
+
+static void
+evthread_win32_cond_free(void *cond_)
+{
+	struct evthread_win32_cond *cond = cond_;
+	DeleteCriticalSection(&cond->lock);
+	CloseHandle(cond->event);
+	mm_free(cond);
+}
+
+static int
+evthread_win32_cond_signal(void *cond_, int broadcast)
+{
+	struct evthread_win32_cond *cond = cond_;
+	EnterCriticalSection(&cond->lock);
+	if (broadcast)
+		cond->n_to_wake = cond->n_waiting;
+	else
+		++cond->n_to_wake;
+	cond->generation++;
+	SetEvent(cond->event);
+	LeaveCriticalSection(&cond->lock);
+	return 0;
+}
+
+static int
+evthread_win32_cond_wait(void *cond_, void *lock_, const struct timeval *tv)
+{
+	struct evthread_win32_cond *cond = cond_;
+	CRITICAL_SECTION *lock = lock_;
+	int generation_at_start;
+	int waiting = 1;
+	int result = -1;
+	DWORD ms = INFINITE, ms_orig = INFINITE, startTime, endTime;
+	if (tv)
+		ms_orig = ms = evutil_tv_to_msec_(tv);
+
+	EnterCriticalSection(&cond->lock);
+	++cond->n_waiting;
+	generation_at_start = cond->generation;
+	LeaveCriticalSection(&cond->lock);
+
+	LeaveCriticalSection(lock);
+
+	startTime = GetTickCount();
+	do {
+		DWORD res;
+		res = WaitForSingleObject(cond->event, ms);
+		EnterCriticalSection(&cond->lock);
+		if (cond->n_to_wake &&
+		    cond->generation != generation_at_start) {
+			--cond->n_to_wake;
+			--cond->n_waiting;
+			result = 0;
+			waiting = 0;
+			goto out;
+		} else if (res != WAIT_OBJECT_0) {
+			result = (res==WAIT_TIMEOUT) ? 1 : -1;
+			--cond->n_waiting;
+			waiting = 0;
+			goto out;
+		} else if (ms != INFINITE) {
+			endTime = GetTickCount();
+			if (startTime + ms_orig <= endTime) {
+				result = 1; /* Timeout */
+				--cond->n_waiting;
+				waiting = 0;
+				goto out;
+			} else {
+				ms = startTime + ms_orig - endTime;
+			}
+		}
+		/* If we make it here, we are still waiting. */
+		if (cond->n_to_wake == 0) {
+			/* There is nobody else who should wake up; reset
+			 * the event. */
+			ResetEvent(cond->event);
+		}
+	out:
+		LeaveCriticalSection(&cond->lock);
+	} while (waiting);
+
+	EnterCriticalSection(lock);
+
+	EnterCriticalSection(&cond->lock);
+	if (!cond->n_waiting)
+		ResetEvent(cond->event);
+	LeaveCriticalSection(&cond->lock);
+
+	return result;
+}
+
+int
+evthread_use_windows_threads(void)
+{
+	struct evthread_lock_callbacks cbs = {
+		EVTHREAD_LOCK_API_VERSION,
+		EVTHREAD_LOCKTYPE_RECURSIVE,
+		evthread_win32_lock_create,
+		evthread_win32_lock_free,
+		evthread_win32_lock,
+		evthread_win32_unlock
+	};
+
+
+	struct evthread_condition_callbacks cond_cbs = {
+		EVTHREAD_CONDITION_API_VERSION,
+		evthread_win32_cond_alloc,
+		evthread_win32_cond_free,
+		evthread_win32_cond_signal,
+		evthread_win32_cond_wait
+	};
+#ifdef WIN32_HAVE_CONDITION_VARIABLES
+	struct evthread_condition_callbacks condvar_cbs = {
+		EVTHREAD_CONDITION_API_VERSION,
+		evthread_win32_condvar_alloc,
+		evthread_win32_condvar_free,
+		evthread_win32_condvar_signal,
+		evthread_win32_condvar_wait
+	};
+#endif
+
+	evthread_set_lock_callbacks(&cbs);
+	evthread_set_id_callback(evthread_win32_get_id);
+#ifdef WIN32_HAVE_CONDITION_VARIABLES
+	if (evthread_win32_condvar_init()) {
+		evthread_set_condition_callbacks(&condvar_cbs);
+		return 0;
+	}
+#endif
+	evthread_set_condition_callbacks(&cond_cbs);
+
+	return 0;
+}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/evutil.c b/extra/libevent/libevent-2.1.11-stable/evutil.c
new file mode 100644
index 000000000000..3412c2aeda25
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evutil.c
@@ -0,0 +1,2719 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <winerror.h>
+#include <ws2tcpip.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <io.h>
+#include <tchar.h>
+#include <process.h>
+#undef _WIN32_WINNT
+/* For structs needed by GetAdaptersAddresses */
+#define _WIN32_WINNT 0x0501
+#include <iphlpapi.h>
+#endif
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef EVENT__HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef EVENT__HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef EVENT__HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+#ifdef EVENT__HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#include <time.h>
+#include <sys/stat.h>
+#ifdef EVENT__HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#include "event2/util.h"
+#include "util-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+#include "evthread-internal.h"
+
+#include "strlcpy-internal.h"
+#include "ipv6-internal.h"
+
+#ifdef _WIN32
+#define HT_NO_CACHE_HASH_VALUES
+#include "ht-internal.h"
+#define open _open
+#define read _read
+#define close _close
+#ifndef fstat
+#define fstat _fstati64
+#endif
+#ifndef stat
+#define stat _stati64
+#endif
+#define mode_t int
+#endif
+
+int
+evutil_open_closeonexec_(const char *pathname, int flags, unsigned mode)
+{
+	int fd;
+
+#ifdef O_CLOEXEC
+	fd = open(pathname, flags|O_CLOEXEC, (mode_t)mode);
+	if (fd >= 0 || errno == EINVAL)
+		return fd;
+	/* If we got an EINVAL, fall through and try without O_CLOEXEC */
+#endif
+	fd = open(pathname, flags, (mode_t)mode);
+	if (fd < 0)
+		return -1;
+
+#if defined(FD_CLOEXEC)
+	if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) {
+		close(fd);
+		return -1;
+	}
+#endif
+
+	return fd;
+}
+
+/**
+   Read the contents of 'filename' into a newly allocated NUL-terminated
+   string.  Set *content_out to hold this string, and *len_out to hold its
+   length (not including the appended NUL).  If 'is_binary', open the file in
+   binary mode.
+
+   Returns 0 on success, -1 if the open fails, and -2 for all other failures.
+
+   Used internally only; may go away in a future version.
+ */
+int
+evutil_read_file_(const char *filename, char **content_out, size_t *len_out,
+    int is_binary)
+{
+	int fd, r;
+	struct stat st;
+	char *mem;
+	size_t read_so_far=0;
+	int mode = O_RDONLY;
+
+	EVUTIL_ASSERT(content_out);
+	EVUTIL_ASSERT(len_out);
+	*content_out = NULL;
+	*len_out = 0;
+
+#ifdef O_BINARY
+	if (is_binary)
+		mode |= O_BINARY;
+#endif
+
+	fd = evutil_open_closeonexec_(filename, mode, 0);
+	if (fd < 0)
+		return -1;
+	if (fstat(fd, &st) || st.st_size < 0 ||
+	    st.st_size > EV_SSIZE_MAX-1 ) {
+		close(fd);
+		return -2;
+	}
+	mem = mm_malloc((size_t)st.st_size + 1);
+	if (!mem) {
+		close(fd);
+		return -2;
+	}
+	read_so_far = 0;
+#ifdef _WIN32
+#define N_TO_READ(x) ((x) > INT_MAX) ? INT_MAX : ((int)(x))
+#else
+#define N_TO_READ(x) (x)
+#endif
+	while ((r = read(fd, mem+read_so_far, N_TO_READ(st.st_size - read_so_far))) > 0) {
+		read_so_far += r;
+		if (read_so_far >= (size_t)st.st_size)
+			break;
+		EVUTIL_ASSERT(read_so_far < (size_t)st.st_size);
+	}
+	close(fd);
+	if (r < 0) {
+		mm_free(mem);
+		return -2;
+	}
+	mem[read_so_far] = 0;
+
+	*len_out = read_so_far;
+	*content_out = mem;
+	return 0;
+}
+
+int
+evutil_socketpair(int family, int type, int protocol, evutil_socket_t fd[2])
+{
+#ifndef _WIN32
+	return socketpair(family, type, protocol, fd);
+#else
+	return evutil_ersatz_socketpair_(family, type, protocol, fd);
+#endif
+}
+
+int
+evutil_ersatz_socketpair_(int family, int type, int protocol,
+    evutil_socket_t fd[2])
+{
+	/* This code is originally from Tor.  Used with permission. */
+
+	/* This socketpair does not work when localhost is down. So
+	 * it's really not the same thing at all. But it's close enough
+	 * for now, and really, when localhost is down sometimes, we
+	 * have other problems too.
+	 */
+#ifdef _WIN32
+#define ERR(e) WSA##e
+#else
+#define ERR(e) e
+#endif
+	evutil_socket_t listener = -1;
+	evutil_socket_t connector = -1;
+	evutil_socket_t acceptor = -1;
+	struct sockaddr_in listen_addr;
+	struct sockaddr_in connect_addr;
+	ev_socklen_t size;
+	int saved_errno = -1;
+	int family_test;
+	
+	family_test = family != AF_INET;
+#ifdef AF_UNIX
+	family_test = family_test && (family != AF_UNIX);
+#endif
+	if (protocol || family_test) {
+		EVUTIL_SET_SOCKET_ERROR(ERR(EAFNOSUPPORT));
+		return -1;
+	}
+	
+	if (!fd) {
+		EVUTIL_SET_SOCKET_ERROR(ERR(EINVAL));
+		return -1;
+	}
+
+	listener = socket(AF_INET, type, 0);
+	if (listener < 0)
+		return -1;
+	memset(&listen_addr, 0, sizeof(listen_addr));
+	listen_addr.sin_family = AF_INET;
+	listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	listen_addr.sin_port = 0;	/* kernel chooses port.	 */
+	if (bind(listener, (struct sockaddr *) &listen_addr, sizeof (listen_addr))
+		== -1)
+		goto tidy_up_and_fail;
+	if (listen(listener, 1) == -1)
+		goto tidy_up_and_fail;
+
+	connector = socket(AF_INET, type, 0);
+	if (connector < 0)
+		goto tidy_up_and_fail;
+
+	memset(&connect_addr, 0, sizeof(connect_addr));
+
+	/* We want to find out the port number to connect to.  */
+	size = sizeof(connect_addr);
+	if (getsockname(listener, (struct sockaddr *) &connect_addr, &size) == -1)
+		goto tidy_up_and_fail;
+	if (size != sizeof (connect_addr))
+		goto abort_tidy_up_and_fail;
+	if (connect(connector, (struct sockaddr *) &connect_addr,
+				sizeof(connect_addr)) == -1)
+		goto tidy_up_and_fail;
+
+	size = sizeof(listen_addr);
+	acceptor = accept(listener, (struct sockaddr *) &listen_addr, &size);
+	if (acceptor < 0)
+		goto tidy_up_and_fail;
+	if (size != sizeof(listen_addr))
+		goto abort_tidy_up_and_fail;
+	/* Now check we are talking to ourself by matching port and host on the
+	   two sockets.	 */
+	if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1)
+		goto tidy_up_and_fail;
+	if (size != sizeof (connect_addr)
+		|| listen_addr.sin_family != connect_addr.sin_family
+		|| listen_addr.sin_addr.s_addr != connect_addr.sin_addr.s_addr
+		|| listen_addr.sin_port != connect_addr.sin_port)
+		goto abort_tidy_up_and_fail;
+	evutil_closesocket(listener);
+	fd[0] = connector;
+	fd[1] = acceptor;
+
+	return 0;
+
+ abort_tidy_up_and_fail:
+	saved_errno = ERR(ECONNABORTED);
+ tidy_up_and_fail:
+	if (saved_errno < 0)
+		saved_errno = EVUTIL_SOCKET_ERROR();
+	if (listener != -1)
+		evutil_closesocket(listener);
+	if (connector != -1)
+		evutil_closesocket(connector);
+	if (acceptor != -1)
+		evutil_closesocket(acceptor);
+
+	EVUTIL_SET_SOCKET_ERROR(saved_errno);
+	return -1;
+#undef ERR
+}
+
+int
+evutil_make_socket_nonblocking(evutil_socket_t fd)
+{
+#ifdef _WIN32
+	{
+		unsigned long nonblocking = 1;
+		if (ioctlsocket(fd, FIONBIO, &nonblocking) == SOCKET_ERROR) {
+			event_sock_warn(fd, "fcntl(%d, F_GETFL)", (int)fd);
+			return -1;
+		}
+	}
+#else
+	{
+		int flags;
+		if ((flags = fcntl(fd, F_GETFL, NULL)) < 0) {
+			event_warn("fcntl(%d, F_GETFL)", fd);
+			return -1;
+		}
+		if (!(flags & O_NONBLOCK)) {
+			if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
+				event_warn("fcntl(%d, F_SETFL)", fd);
+				return -1;
+			}
+		}
+	}
+#endif
+	return 0;
+}
+
+/* Faster version of evutil_make_socket_nonblocking for internal use.
+ *
+ * Requires that no F_SETFL flags were previously set on the fd.
+ */
+static int
+evutil_fast_socket_nonblocking(evutil_socket_t fd)
+{
+#ifdef _WIN32
+	return evutil_make_socket_nonblocking(fd);
+#else
+	if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
+		event_warn("fcntl(%d, F_SETFL)", fd);
+		return -1;
+	}
+	return 0;
+#endif
+}
+
+int
+evutil_make_listen_socket_reuseable(evutil_socket_t sock)
+{
+#if defined(SO_REUSEADDR) && !defined(_WIN32)
+	int one = 1;
+	/* REUSEADDR on Unix means, "don't hang on to this address after the
+	 * listener is closed."  On Windows, though, it means "don't keep other
+	 * processes from binding to this address while we're using it. */
+	return setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one,
+	    (ev_socklen_t)sizeof(one));
+#else
+	return 0;
+#endif
+}
+
+int
+evutil_make_listen_socket_reuseable_port(evutil_socket_t sock)
+{
+#if defined __linux__ && defined(SO_REUSEPORT)
+	int one = 1;
+	/* REUSEPORT on Linux 3.9+ means, "Multiple servers (processes or
+	 * threads) can bind to the same port if they each set the option. */
+	return setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (void*) &one,
+	    (ev_socklen_t)sizeof(one));
+#else
+	return 0;
+#endif
+}
+
+int
+evutil_make_listen_socket_ipv6only(evutil_socket_t sock)
+{
+#if defined(IPV6_V6ONLY)
+	int one = 1;
+	return setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void*) &one,
+	    (ev_socklen_t)sizeof(one));
+#endif
+	return 0;
+}
+
+int
+evutil_make_tcp_listen_socket_deferred(evutil_socket_t sock)
+{
+#if defined(EVENT__HAVE_NETINET_TCP_H) && defined(TCP_DEFER_ACCEPT)
+	int one = 1;
+
+	/* TCP_DEFER_ACCEPT tells the kernel to call defer accept() only after data
+	 * has arrived and ready to read */ 
+	return setsockopt(sock, IPPROTO_TCP, TCP_DEFER_ACCEPT, &one,
+		(ev_socklen_t)sizeof(one)); 
+#endif
+	return 0;
+}
+
+int
+evutil_make_socket_closeonexec(evutil_socket_t fd)
+{
+#if !defined(_WIN32) && defined(EVENT__HAVE_SETFD)
+	int flags;
+	if ((flags = fcntl(fd, F_GETFD, NULL)) < 0) {
+		event_warn("fcntl(%d, F_GETFD)", fd);
+		return -1;
+	}
+	if (!(flags & FD_CLOEXEC)) {
+		if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) {
+			event_warn("fcntl(%d, F_SETFD)", fd);
+			return -1;
+		}
+	}
+#endif
+	return 0;
+}
+
+/* Faster version of evutil_make_socket_closeonexec for internal use.
+ *
+ * Requires that no F_SETFD flags were previously set on the fd.
+ */
+static int
+evutil_fast_socket_closeonexec(evutil_socket_t fd)
+{
+#if !defined(_WIN32) && defined(EVENT__HAVE_SETFD)
+	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
+		event_warn("fcntl(%d, F_SETFD)", fd);
+		return -1;
+	}
+#endif
+	return 0;
+}
+
+int
+evutil_closesocket(evutil_socket_t sock)
+{
+#ifndef _WIN32
+	return close(sock);
+#else
+	return closesocket(sock);
+#endif
+}
+
+ev_int64_t
+evutil_strtoll(const char *s, char **endptr, int base)
+{
+#ifdef EVENT__HAVE_STRTOLL
+	return (ev_int64_t)strtoll(s, endptr, base);
+#elif EVENT__SIZEOF_LONG == 8
+	return (ev_int64_t)strtol(s, endptr, base);
+#elif defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1300
+	/* XXXX on old versions of MS APIs, we only support base
+	 * 10. */
+	ev_int64_t r;
+	if (base != 10)
+		return 0;
+	r = (ev_int64_t) _atoi64(s);
+	while (isspace(*s))
+		++s;
+	if (*s == '-')
+		++s;
+	while (isdigit(*s))
+		++s;
+	if (endptr)
+		*endptr = (char*) s;
+	return r;
+#elif defined(_WIN32)
+	return (ev_int64_t) _strtoi64(s, endptr, base);
+#elif defined(EVENT__SIZEOF_LONG_LONG) && EVENT__SIZEOF_LONG_LONG == 8
+	long long r;
+	int n;
+	if (base != 10 && base != 16)
+		return 0;
+	if (base == 10) {
+		n = sscanf(s, "%lld", &r);
+	} else {
+		unsigned long long ru=0;
+		n = sscanf(s, "%llx", &ru);
+		if (ru > EV_INT64_MAX)
+			return 0;
+		r = (long long) ru;
+	}
+	if (n != 1)
+		return 0;
+	while (EVUTIL_ISSPACE_(*s))
+		++s;
+	if (*s == '-')
+		++s;
+	if (base == 10) {
+		while (EVUTIL_ISDIGIT_(*s))
+			++s;
+	} else {
+		while (EVUTIL_ISXDIGIT_(*s))
+			++s;
+	}
+	if (endptr)
+		*endptr = (char*) s;
+	return r;
+#else
+#error "I don't know how to parse 64-bit integers."
+#endif
+}
+
+#ifdef _WIN32
+int
+evutil_socket_geterror(evutil_socket_t sock)
+{
+	int optval, optvallen=sizeof(optval);
+	int err = WSAGetLastError();
+	if (err == WSAEWOULDBLOCK && sock >= 0) {
+		if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)&optval,
+					   &optvallen))
+			return err;
+		if (optval)
+			return optval;
+	}
+	return err;
+}
+#endif
+
+/* XXX we should use an enum here. */
+/* 2 for connection refused, 1 for connected, 0 for not yet, -1 for error. */
+int
+evutil_socket_connect_(evutil_socket_t *fd_ptr, const struct sockaddr *sa, int socklen)
+{
+	int made_fd = 0;
+
+	if (*fd_ptr < 0) {
+		if ((*fd_ptr = socket(sa->sa_family, SOCK_STREAM, 0)) < 0)
+			goto err;
+		made_fd = 1;
+		if (evutil_make_socket_nonblocking(*fd_ptr) < 0) {
+			goto err;
+		}
+	}
+
+	if (connect(*fd_ptr, sa, socklen) < 0) {
+		int e = evutil_socket_geterror(*fd_ptr);
+		if (EVUTIL_ERR_CONNECT_RETRIABLE(e))
+			return 0;
+		if (EVUTIL_ERR_CONNECT_REFUSED(e))
+			return 2;
+		goto err;
+	} else {
+		return 1;
+	}
+
+err:
+	if (made_fd) {
+		evutil_closesocket(*fd_ptr);
+		*fd_ptr = -1;
+	}
+	return -1;
+}
+
+/* Check whether a socket on which we called connect() is done
+   connecting. Return 1 for connected, 0 for not yet, -1 for error.  In the
+   error case, set the current socket errno to the error that happened during
+   the connect operation. */
+int
+evutil_socket_finished_connecting_(evutil_socket_t fd)
+{
+	int e;
+	ev_socklen_t elen = sizeof(e);
+
+	if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&e, &elen) < 0)
+		return -1;
+
+	if (e) {
+		if (EVUTIL_ERR_CONNECT_RETRIABLE(e))
+			return 0;
+		EVUTIL_SET_SOCKET_ERROR(e);
+		return -1;
+	}
+
+	return 1;
+}
+
+#if (EVUTIL_AI_PASSIVE|EVUTIL_AI_CANONNAME|EVUTIL_AI_NUMERICHOST| \
+     EVUTIL_AI_NUMERICSERV|EVUTIL_AI_V4MAPPED|EVUTIL_AI_ALL| \
+     EVUTIL_AI_ADDRCONFIG) != \
+    (EVUTIL_AI_PASSIVE^EVUTIL_AI_CANONNAME^EVUTIL_AI_NUMERICHOST^ \
+     EVUTIL_AI_NUMERICSERV^EVUTIL_AI_V4MAPPED^EVUTIL_AI_ALL^ \
+     EVUTIL_AI_ADDRCONFIG)
+#error "Some of our EVUTIL_AI_* flags seem to overlap with system AI_* flags"
+#endif
+
+/* We sometimes need to know whether we have an ipv4 address and whether we
+   have an ipv6 address. If 'have_checked_interfaces', then we've already done
+   the test.  If 'had_ipv4_address', then it turns out we had an ipv4 address.
+   If 'had_ipv6_address', then it turns out we had an ipv6 address.   These are
+   set by evutil_check_interfaces. */
+static int have_checked_interfaces, had_ipv4_address, had_ipv6_address;
+
+/* True iff the IPv4 address 'addr', in host order, is in 127.0.0.0/8 */
+static inline int evutil_v4addr_is_localhost(ev_uint32_t addr)
+{ return addr>>24 == 127; }
+
+/* True iff the IPv4 address 'addr', in host order, is link-local
+ * 169.254.0.0/16 (RFC3927) */
+static inline int evutil_v4addr_is_linklocal(ev_uint32_t addr)
+{ return ((addr & 0xffff0000U) == 0xa9fe0000U); }
+
+/* True iff the IPv4 address 'addr', in host order, is a class D
+ * (multiclass) address.  */
+static inline int evutil_v4addr_is_classd(ev_uint32_t addr)
+{ return ((addr>>24) & 0xf0) == 0xe0; }
+
+int
+evutil_v4addr_is_local_(const struct in_addr *in)
+{
+	const ev_uint32_t addr = ntohl(in->s_addr);
+	return addr == INADDR_ANY ||
+		evutil_v4addr_is_localhost(addr) ||
+		evutil_v4addr_is_linklocal(addr) ||
+		evutil_v4addr_is_classd(addr);
+}
+int
+evutil_v6addr_is_local_(const struct in6_addr *in)
+{
+	static const char ZEROES[] =
+		"\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00";
+
+	const unsigned char *addr = (const unsigned char *)in->s6_addr;
+	return !memcmp(addr, ZEROES, 8) ||
+		((addr[0] & 0xfe) == 0xfc) ||
+		(addr[0] == 0xfe && (addr[1] & 0xc0) == 0x80) ||
+		(addr[0] == 0xfe && (addr[1] & 0xc0) == 0xc0) ||
+		(addr[0] == 0xff);
+}
+
+static void
+evutil_found_ifaddr(const struct sockaddr *sa)
+{
+	if (sa->sa_family == AF_INET) {
+		const struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+		if (!evutil_v4addr_is_local_(&sin->sin_addr)) {
+			event_debug(("Detected an IPv4 interface"));
+			had_ipv4_address = 1;
+		}
+	} else if (sa->sa_family == AF_INET6) {
+		const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
+		if (!evutil_v6addr_is_local_(&sin6->sin6_addr)) {
+			event_debug(("Detected an IPv6 interface"));
+			had_ipv6_address = 1;
+		}
+	}
+}
+
+#ifdef _WIN32
+typedef ULONG (WINAPI *GetAdaptersAddresses_fn_t)(
+              ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
+#endif
+
+static int
+evutil_check_ifaddrs(void)
+{
+#if defined(EVENT__HAVE_GETIFADDRS)
+	/* Most free Unixy systems provide getifaddrs, which gives us a linked list
+	 * of struct ifaddrs. */
+	struct ifaddrs *ifa = NULL;
+	const struct ifaddrs *i;
+	if (getifaddrs(&ifa) < 0) {
+		event_warn("Unable to call getifaddrs()");
+		return -1;
+	}
+
+	for (i = ifa; i; i = i->ifa_next) {
+		if (!i->ifa_addr)
+			continue;
+		evutil_found_ifaddr(i->ifa_addr);
+	}
+
+	freeifaddrs(ifa);
+	return 0;
+#elif defined(_WIN32)
+	/* Windows XP began to provide GetAdaptersAddresses. Windows 2000 had a
+	   "GetAdaptersInfo", but that's deprecated; let's just try
+	   GetAdaptersAddresses and fall back to connect+getsockname.
+	*/
+	HMODULE lib = evutil_load_windows_system_library_(TEXT("ihplapi.dll"));
+	GetAdaptersAddresses_fn_t fn;
+	ULONG size, res;
+	IP_ADAPTER_ADDRESSES *addresses = NULL, *address;
+	int result = -1;
+
+#define FLAGS (GAA_FLAG_SKIP_ANYCAST | \
+               GAA_FLAG_SKIP_MULTICAST | \
+               GAA_FLAG_SKIP_DNS_SERVER)
+
+	if (!lib)
+		goto done;
+
+	if (!(fn = (GetAdaptersAddresses_fn_t) GetProcAddress(lib, "GetAdaptersAddresses")))
+		goto done;
+
+	/* Guess how much space we need. */
+	size = 15*1024;
+	addresses = mm_malloc(size);
+	if (!addresses)
+		goto done;
+	res = fn(AF_UNSPEC, FLAGS, NULL, addresses, &size);
+	if (res == ERROR_BUFFER_OVERFLOW) {
+		/* we didn't guess that we needed enough space; try again */
+		mm_free(addresses);
+		addresses = mm_malloc(size);
+		if (!addresses)
+			goto done;
+		res = fn(AF_UNSPEC, FLAGS, NULL, addresses, &size);
+	}
+	if (res != NO_ERROR)
+		goto done;
+
+	for (address = addresses; address; address = address->Next) {
+		IP_ADAPTER_UNICAST_ADDRESS *a;
+		for (a = address->FirstUnicastAddress; a; a = a->Next) {
+			/* Yes, it's a linked list inside a linked list */
+			struct sockaddr *sa = a->Address.lpSockaddr;
+			evutil_found_ifaddr(sa);
+		}
+	}
+
+	result = 0;
+done:
+	if (lib)
+		FreeLibrary(lib);
+	if (addresses)
+		mm_free(addresses);
+	return result;
+#else
+	return -1;
+#endif
+}
+
+/* Test whether we have an ipv4 interface and an ipv6 interface.  Return 0 if
+ * the test seemed successful. */
+static int
+evutil_check_interfaces(void)
+{
+	evutil_socket_t fd = -1;
+	struct sockaddr_in sin, sin_out;
+	struct sockaddr_in6 sin6, sin6_out;
+	ev_socklen_t sin_out_len = sizeof(sin_out);
+	ev_socklen_t sin6_out_len = sizeof(sin6_out);
+	int r;
+	if (have_checked_interfaces)
+		return 0;
+
+	/* From this point on we have done the ipv4/ipv6 interface check */
+	have_checked_interfaces = 1;
+
+	if (evutil_check_ifaddrs() == 0) {
+		/* Use a nice sane interface, if this system has one. */
+		return 0;
+	}
+
+	/* Ugh. There was no nice sane interface.  So to check whether we have
+	 * an interface open for a given protocol, will try to make a UDP
+	 * 'connection' to a remote host on the internet.  We don't actually
+	 * use it, so the address doesn't matter, but we want to pick one that
+	 * keep us from using a host- or link-local interface. */
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(53);
+	r = evutil_inet_pton(AF_INET, "18.244.0.188", &sin.sin_addr);
+	EVUTIL_ASSERT(r);
+
+	memset(&sin6, 0, sizeof(sin6));
+	sin6.sin6_family = AF_INET6;
+	sin6.sin6_port = htons(53);
+	r = evutil_inet_pton(AF_INET6, "2001:4860:b002::68", &sin6.sin6_addr);
+	EVUTIL_ASSERT(r);
+
+	memset(&sin_out, 0, sizeof(sin_out));
+	memset(&sin6_out, 0, sizeof(sin6_out));
+
+	/* XXX some errnos mean 'no address'; some mean 'not enough sockets'. */
+	if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) >= 0 &&
+	    connect(fd, (struct sockaddr*)&sin, sizeof(sin)) == 0 &&
+	    getsockname(fd, (struct sockaddr*)&sin_out, &sin_out_len) == 0) {
+		/* We might have an IPv4 interface. */
+		evutil_found_ifaddr((struct sockaddr*) &sin_out);
+	}
+	if (fd >= 0)
+		evutil_closesocket(fd);
+
+	if ((fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)) >= 0 &&
+	    connect(fd, (struct sockaddr*)&sin6, sizeof(sin6)) == 0 &&
+	    getsockname(fd, (struct sockaddr*)&sin6_out, &sin6_out_len) == 0) {
+		/* We might have an IPv6 interface. */
+		evutil_found_ifaddr((struct sockaddr*) &sin6_out);
+	}
+
+	if (fd >= 0)
+		evutil_closesocket(fd);
+
+	return 0;
+}
+
+/* Internal addrinfo flag.  This one is set when we allocate the addrinfo from
+ * inside libevent.  Otherwise, the built-in getaddrinfo() function allocated
+ * it, and we should trust what they said.
+ **/
+#define EVUTIL_AI_LIBEVENT_ALLOCATED 0x80000000
+
+/* Helper: construct a new addrinfo containing the socket address in
+ * 'sa', which must be a sockaddr_in or a sockaddr_in6.  Take the
+ * socktype and protocol info from hints.  If they weren't set, then
+ * allocate both a TCP and a UDP addrinfo.
+ */
+struct evutil_addrinfo *
+evutil_new_addrinfo_(struct sockaddr *sa, ev_socklen_t socklen,
+    const struct evutil_addrinfo *hints)
+{
+	struct evutil_addrinfo *res;
+	EVUTIL_ASSERT(hints);
+
+	if (hints->ai_socktype == 0 && hints->ai_protocol == 0) {
+		/* Indecisive user! Give them a UDP and a TCP. */
+		struct evutil_addrinfo *r1, *r2;
+		struct evutil_addrinfo tmp;
+		memcpy(&tmp, hints, sizeof(tmp));
+		tmp.ai_socktype = SOCK_STREAM; tmp.ai_protocol = IPPROTO_TCP;
+		r1 = evutil_new_addrinfo_(sa, socklen, &tmp);
+		if (!r1)
+			return NULL;
+		tmp.ai_socktype = SOCK_DGRAM; tmp.ai_protocol = IPPROTO_UDP;
+		r2 = evutil_new_addrinfo_(sa, socklen, &tmp);
+		if (!r2) {
+			evutil_freeaddrinfo(r1);
+			return NULL;
+		}
+		r1->ai_next = r2;
+		return r1;
+	}
+
+	/* We're going to allocate extra space to hold the sockaddr. */
+	res = mm_calloc(1,sizeof(struct evutil_addrinfo)+socklen);
+	if (!res)
+		return NULL;
+	res->ai_addr = (struct sockaddr*)
+	    (((char*)res) + sizeof(struct evutil_addrinfo));
+	memcpy(res->ai_addr, sa, socklen);
+	res->ai_addrlen = socklen;
+	res->ai_family = sa->sa_family; /* Same or not? XXX */
+	res->ai_flags = EVUTIL_AI_LIBEVENT_ALLOCATED;
+	res->ai_socktype = hints->ai_socktype;
+	res->ai_protocol = hints->ai_protocol;
+
+	return res;
+}
+
+/* Append the addrinfo 'append' to the end of 'first', and return the start of
+ * the list.  Either element can be NULL, in which case we return the element
+ * that is not NULL. */
+struct evutil_addrinfo *
+evutil_addrinfo_append_(struct evutil_addrinfo *first,
+    struct evutil_addrinfo *append)
+{
+	struct evutil_addrinfo *ai = first;
+	if (!ai)
+		return append;
+	while (ai->ai_next)
+		ai = ai->ai_next;
+	ai->ai_next = append;
+
+	return first;
+}
+
+static int
+parse_numeric_servname(const char *servname)
+{
+	int n;
+	char *endptr=NULL;
+	n = (int) strtol(servname, &endptr, 10);
+	if (n>=0 && n <= 65535 && servname[0] && endptr && !endptr[0])
+		return n;
+	else
+		return -1;
+}
+
+/** Parse a service name in 'servname', which can be a decimal port.
+ * Return the port number, or -1 on error.
+ */
+static int
+evutil_parse_servname(const char *servname, const char *protocol,
+    const struct evutil_addrinfo *hints)
+{
+	int n = parse_numeric_servname(servname);
+	if (n>=0)
+		return n;
+#if defined(EVENT__HAVE_GETSERVBYNAME) || defined(_WIN32)
+	if (!(hints->ai_flags & EVUTIL_AI_NUMERICSERV)) {
+		struct servent *ent = getservbyname(servname, protocol);
+		if (ent) {
+			return ntohs(ent->s_port);
+		}
+	}
+#endif
+	return -1;
+}
+
+/* Return a string corresponding to a protocol number that we can pass to
+ * getservyname.  */
+static const char *
+evutil_unparse_protoname(int proto)
+{
+	switch (proto) {
+	case 0:
+		return NULL;
+	case IPPROTO_TCP:
+		return "tcp";
+	case IPPROTO_UDP:
+		return "udp";
+#ifdef IPPROTO_SCTP
+	case IPPROTO_SCTP:
+		return "sctp";
+#endif
+	default:
+#ifdef EVENT__HAVE_GETPROTOBYNUMBER
+		{
+			struct protoent *ent = getprotobynumber(proto);
+			if (ent)
+				return ent->p_name;
+		}
+#endif
+		return NULL;
+	}
+}
+
+static void
+evutil_getaddrinfo_infer_protocols(struct evutil_addrinfo *hints)
+{
+	/* If we can guess the protocol from the socktype, do so. */
+	if (!hints->ai_protocol && hints->ai_socktype) {
+		if (hints->ai_socktype == SOCK_DGRAM)
+			hints->ai_protocol = IPPROTO_UDP;
+		else if (hints->ai_socktype == SOCK_STREAM)
+			hints->ai_protocol = IPPROTO_TCP;
+	}
+
+	/* Set the socktype if it isn't set. */
+	if (!hints->ai_socktype && hints->ai_protocol) {
+		if (hints->ai_protocol == IPPROTO_UDP)
+			hints->ai_socktype = SOCK_DGRAM;
+		else if (hints->ai_protocol == IPPROTO_TCP)
+			hints->ai_socktype = SOCK_STREAM;
+#ifdef IPPROTO_SCTP
+		else if (hints->ai_protocol == IPPROTO_SCTP)
+			hints->ai_socktype = SOCK_STREAM;
+#endif
+	}
+}
+
+#if AF_UNSPEC != PF_UNSPEC
+#error "I cannot build on a system where AF_UNSPEC != PF_UNSPEC"
+#endif
+
+/** Implements the part of looking up hosts by name that's common to both
+ * the blocking and nonblocking resolver:
+ *   - Adjust 'hints' to have a reasonable socktype and protocol.
+ *   - Look up the port based on 'servname', and store it in *portnum,
+ *   - Handle the nodename==NULL case
+ *   - Handle some invalid arguments cases.
+ *   - Handle the cases where nodename is an IPv4 or IPv6 address.
+ *
+ * If we need the resolver to look up the hostname, we return
+ * EVUTIL_EAI_NEED_RESOLVE.  Otherwise, we can completely implement
+ * getaddrinfo: we return 0 or an appropriate EVUTIL_EAI_* error, and
+ * set *res as getaddrinfo would.
+ */
+int
+evutil_getaddrinfo_common_(const char *nodename, const char *servname,
+    struct evutil_addrinfo *hints, struct evutil_addrinfo **res, int *portnum)
+{
+	int port = 0;
+	const char *pname;
+
+	if (nodename == NULL && servname == NULL)
+		return EVUTIL_EAI_NONAME;
+
+	/* We only understand 3 families */
+	if (hints->ai_family != PF_UNSPEC && hints->ai_family != PF_INET &&
+	    hints->ai_family != PF_INET6)
+		return EVUTIL_EAI_FAMILY;
+
+	evutil_getaddrinfo_infer_protocols(hints);
+
+	/* Look up the port number and protocol, if possible. */
+	pname = evutil_unparse_protoname(hints->ai_protocol);
+	if (servname) {
+		/* XXXX We could look at the protocol we got back from
+		 * getservbyname, but it doesn't seem too useful. */
+		port = evutil_parse_servname(servname, pname, hints);
+		if (port < 0) {
+			return EVUTIL_EAI_NONAME;
+		}
+	}
+
+	/* If we have no node name, then we're supposed to bind to 'any' and
+	 * connect to localhost. */
+	if (nodename == NULL) {
+		struct evutil_addrinfo *res4=NULL, *res6=NULL;
+		if (hints->ai_family != PF_INET) { /* INET6 or UNSPEC. */
+			struct sockaddr_in6 sin6;
+			memset(&sin6, 0, sizeof(sin6));
+			sin6.sin6_family = AF_INET6;
+			sin6.sin6_port = htons(port);
+			if (hints->ai_flags & EVUTIL_AI_PASSIVE) {
+				/* Bind to :: */
+			} else {
+				/* connect to ::1 */
+				sin6.sin6_addr.s6_addr[15] = 1;
+			}
+			res6 = evutil_new_addrinfo_((struct sockaddr*)&sin6,
+			    sizeof(sin6), hints);
+			if (!res6)
+				return EVUTIL_EAI_MEMORY;
+		}
+
+		if (hints->ai_family != PF_INET6) { /* INET or UNSPEC */
+			struct sockaddr_in sin;
+			memset(&sin, 0, sizeof(sin));
+			sin.sin_family = AF_INET;
+			sin.sin_port = htons(port);
+			if (hints->ai_flags & EVUTIL_AI_PASSIVE) {
+				/* Bind to 0.0.0.0 */
+			} else {
+				/* connect to 127.0.0.1 */
+				sin.sin_addr.s_addr = htonl(0x7f000001);
+			}
+			res4 = evutil_new_addrinfo_((struct sockaddr*)&sin,
+			    sizeof(sin), hints);
+			if (!res4) {
+				if (res6)
+					evutil_freeaddrinfo(res6);
+				return EVUTIL_EAI_MEMORY;
+			}
+		}
+		*res = evutil_addrinfo_append_(res4, res6);
+		return 0;
+	}
+
+	/* If we can, we should try to parse the hostname without resolving
+	 * it. */
+	/* Try ipv6. */
+	if (hints->ai_family == PF_INET6 || hints->ai_family == PF_UNSPEC) {
+		struct sockaddr_in6 sin6;
+		memset(&sin6, 0, sizeof(sin6));
+		if (1==evutil_inet_pton(AF_INET6, nodename, &sin6.sin6_addr)) {
+			/* Got an ipv6 address. */
+			sin6.sin6_family = AF_INET6;
+			sin6.sin6_port = htons(port);
+			*res = evutil_new_addrinfo_((struct sockaddr*)&sin6,
+			    sizeof(sin6), hints);
+			if (!*res)
+				return EVUTIL_EAI_MEMORY;
+			return 0;
+		}
+	}
+
+	/* Try ipv4. */
+	if (hints->ai_family == PF_INET || hints->ai_family == PF_UNSPEC) {
+		struct sockaddr_in sin;
+		memset(&sin, 0, sizeof(sin));
+		if (1==evutil_inet_pton(AF_INET, nodename, &sin.sin_addr)) {
+			/* Got an ipv4 address. */
+			sin.sin_family = AF_INET;
+			sin.sin_port = htons(port);
+			*res = evutil_new_addrinfo_((struct sockaddr*)&sin,
+			    sizeof(sin), hints);
+			if (!*res)
+				return EVUTIL_EAI_MEMORY;
+			return 0;
+		}
+	}
+
+
+	/* If we have reached this point, we definitely need to do a DNS
+	 * lookup. */
+	if ((hints->ai_flags & EVUTIL_AI_NUMERICHOST)) {
+		/* If we're not allowed to do one, then say so. */
+		return EVUTIL_EAI_NONAME;
+	}
+	*portnum = port;
+	return EVUTIL_EAI_NEED_RESOLVE;
+}
+
+#ifdef EVENT__HAVE_GETADDRINFO
+#define USE_NATIVE_GETADDRINFO
+#endif
+
+#ifdef USE_NATIVE_GETADDRINFO
+/* A mask of all the flags that we declare, so we can clear them before calling
+ * the native getaddrinfo */
+static const unsigned int ALL_NONNATIVE_AI_FLAGS =
+#ifndef AI_PASSIVE
+    EVUTIL_AI_PASSIVE |
+#endif
+#ifndef AI_CANONNAME
+    EVUTIL_AI_CANONNAME |
+#endif
+#ifndef AI_NUMERICHOST
+    EVUTIL_AI_NUMERICHOST |
+#endif
+#ifndef AI_NUMERICSERV
+    EVUTIL_AI_NUMERICSERV |
+#endif
+#ifndef AI_ADDRCONFIG
+    EVUTIL_AI_ADDRCONFIG |
+#endif
+#ifndef AI_ALL
+    EVUTIL_AI_ALL |
+#endif
+#ifndef AI_V4MAPPED
+    EVUTIL_AI_V4MAPPED |
+#endif
+    EVUTIL_AI_LIBEVENT_ALLOCATED;
+
+static const unsigned int ALL_NATIVE_AI_FLAGS =
+#ifdef AI_PASSIVE
+    AI_PASSIVE |
+#endif
+#ifdef AI_CANONNAME
+    AI_CANONNAME |
+#endif
+#ifdef AI_NUMERICHOST
+    AI_NUMERICHOST |
+#endif
+#ifdef AI_NUMERICSERV
+    AI_NUMERICSERV |
+#endif
+#ifdef AI_ADDRCONFIG
+    AI_ADDRCONFIG |
+#endif
+#ifdef AI_ALL
+    AI_ALL |
+#endif
+#ifdef AI_V4MAPPED
+    AI_V4MAPPED |
+#endif
+    0;
+#endif
+
+#ifndef USE_NATIVE_GETADDRINFO
+/* Helper for systems with no getaddrinfo(): make one or more addrinfos out of
+ * a struct hostent.
+ */
+static struct evutil_addrinfo *
+addrinfo_from_hostent(const struct hostent *ent,
+    int port, const struct evutil_addrinfo *hints)
+{
+	int i;
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+	struct sockaddr *sa;
+	int socklen;
+	struct evutil_addrinfo *res=NULL, *ai;
+	void *addrp;
+
+	if (ent->h_addrtype == PF_INET) {
+		memset(&sin, 0, sizeof(sin));
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(port);
+		sa = (struct sockaddr *)&sin;
+		socklen = sizeof(struct sockaddr_in);
+		addrp = &sin.sin_addr;
+		if (ent->h_length != sizeof(sin.sin_addr)) {
+			event_warnx("Weird h_length from gethostbyname");
+			return NULL;
+		}
+	} else if (ent->h_addrtype == PF_INET6) {
+		memset(&sin6, 0, sizeof(sin6));
+		sin6.sin6_family = AF_INET6;
+		sin6.sin6_port = htons(port);
+		sa = (struct sockaddr *)&sin6;
+		socklen = sizeof(struct sockaddr_in6);
+		addrp = &sin6.sin6_addr;
+		if (ent->h_length != sizeof(sin6.sin6_addr)) {
+			event_warnx("Weird h_length from gethostbyname");
+			return NULL;
+		}
+	} else
+		return NULL;
+
+	for (i = 0; ent->h_addr_list[i]; ++i) {
+		memcpy(addrp, ent->h_addr_list[i], ent->h_length);
+		ai = evutil_new_addrinfo_(sa, socklen, hints);
+		if (!ai) {
+			evutil_freeaddrinfo(res);
+			return NULL;
+		}
+		res = evutil_addrinfo_append_(res, ai);
+	}
+
+	if (res && ((hints->ai_flags & EVUTIL_AI_CANONNAME) && ent->h_name)) {
+		res->ai_canonname = mm_strdup(ent->h_name);
+		if (res->ai_canonname == NULL) {
+			evutil_freeaddrinfo(res);
+			return NULL;
+		}
+	}
+
+	return res;
+}
+#endif
+
+/* If the EVUTIL_AI_ADDRCONFIG flag is set on hints->ai_flags, and
+ * hints->ai_family is PF_UNSPEC, then revise the value of hints->ai_family so
+ * that we'll only get addresses we could maybe connect to.
+ */
+void
+evutil_adjust_hints_for_addrconfig_(struct evutil_addrinfo *hints)
+{
+	if (!(hints->ai_flags & EVUTIL_AI_ADDRCONFIG))
+		return;
+	if (hints->ai_family != PF_UNSPEC)
+		return;
+	evutil_check_interfaces();
+	if (had_ipv4_address && !had_ipv6_address) {
+		hints->ai_family = PF_INET;
+	} else if (!had_ipv4_address && had_ipv6_address) {
+		hints->ai_family = PF_INET6;
+	}
+}
+
+#ifdef USE_NATIVE_GETADDRINFO
+static int need_numeric_port_hack_=0;
+static int need_socktype_protocol_hack_=0;
+static int tested_for_getaddrinfo_hacks=0;
+
+/* Some older BSDs (like OpenBSD up to 4.6) used to believe that
+   giving a numeric port without giving an ai_socktype was verboten.
+   We test for this so we can apply an appropriate workaround.  If it
+   turns out that the bug is present, then:
+
+    - If nodename==NULL and servname is numeric, we build an answer
+      ourselves using evutil_getaddrinfo_common_().
+
+    - If nodename!=NULL and servname is numeric, then we set
+      servname=NULL when calling getaddrinfo, and post-process the
+      result to set the ports on it.
+
+   We test for this bug at runtime, since otherwise we can't have the
+   same binary run on multiple BSD versions.
+
+   - Some versions of Solaris believe that it's nice to leave to protocol
+     field set to 0.  We test for this so we can apply an appropriate
+     workaround.
+*/
+static struct evutil_addrinfo *ai_find_protocol(struct evutil_addrinfo *ai)
+{
+	while (ai) {
+		if (ai->ai_protocol)
+			return ai;
+		ai = ai->ai_next;
+	}
+	return NULL;
+}
+static void
+test_for_getaddrinfo_hacks(void)
+{
+	int r, r2;
+	struct evutil_addrinfo *ai=NULL, *ai2=NULL, *ai3=NULL;
+	struct evutil_addrinfo hints;
+
+	memset(&hints,0,sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_flags =
+#ifdef AI_NUMERICHOST
+	    AI_NUMERICHOST |
+#endif
+#ifdef AI_NUMERICSERV
+	    AI_NUMERICSERV |
+#endif
+	    0;
+	r = getaddrinfo("1.2.3.4", "80", &hints, &ai);
+	getaddrinfo("1.2.3.4", NULL, &hints, &ai3);
+	hints.ai_socktype = SOCK_STREAM;
+	r2 = getaddrinfo("1.2.3.4", "80", &hints, &ai2);
+	if (r2 == 0 && r != 0) {
+		need_numeric_port_hack_=1;
+	}
+	if (!ai_find_protocol(ai2) || !ai_find_protocol(ai3)) {
+		need_socktype_protocol_hack_=1;
+	}
+
+	if (ai)
+		freeaddrinfo(ai);
+	if (ai2)
+		freeaddrinfo(ai2);
+	if (ai3)
+		freeaddrinfo(ai3);
+	tested_for_getaddrinfo_hacks=1;
+}
+
+static inline int
+need_numeric_port_hack(void)
+{
+	if (!tested_for_getaddrinfo_hacks)
+		test_for_getaddrinfo_hacks();
+	return need_numeric_port_hack_;
+}
+
+static inline int
+need_socktype_protocol_hack(void)
+{
+	if (!tested_for_getaddrinfo_hacks)
+		test_for_getaddrinfo_hacks();
+	return need_socktype_protocol_hack_;
+}
+
+static void
+apply_numeric_port_hack(int port, struct evutil_addrinfo **ai)
+{
+	/* Now we run through the list and set the ports on all of the
+	 * results where ports would make sense. */
+	for ( ; *ai; ai = &(*ai)->ai_next) {
+		struct sockaddr *sa = (*ai)->ai_addr;
+		if (sa && sa->sa_family == AF_INET) {
+			struct sockaddr_in *sin = (struct sockaddr_in*)sa;
+			sin->sin_port = htons(port);
+		} else if (sa && sa->sa_family == AF_INET6) {
+			struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)sa;
+			sin6->sin6_port = htons(port);
+		} else {
+			/* A numeric port makes no sense here; remove this one
+			 * from the list. */
+			struct evutil_addrinfo *victim = *ai;
+			*ai = victim->ai_next;
+			victim->ai_next = NULL;
+			freeaddrinfo(victim);
+		}
+	}
+}
+
+static int
+apply_socktype_protocol_hack(struct evutil_addrinfo *ai)
+{
+	struct evutil_addrinfo *ai_new;
+	for (; ai; ai = ai->ai_next) {
+		evutil_getaddrinfo_infer_protocols(ai);
+		if (ai->ai_socktype || ai->ai_protocol)
+			continue;
+		ai_new = mm_malloc(sizeof(*ai_new));
+		if (!ai_new)
+			return -1;
+		memcpy(ai_new, ai, sizeof(*ai_new));
+		ai->ai_socktype = SOCK_STREAM;
+		ai->ai_protocol = IPPROTO_TCP;
+		ai_new->ai_socktype = SOCK_DGRAM;
+		ai_new->ai_protocol = IPPROTO_UDP;
+
+		ai_new->ai_next = ai->ai_next;
+		ai->ai_next = ai_new;
+	}
+	return 0;
+}
+#endif
+
+int
+evutil_getaddrinfo(const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in, struct evutil_addrinfo **res)
+{
+#ifdef USE_NATIVE_GETADDRINFO
+	struct evutil_addrinfo hints;
+	int portnum=-1, need_np_hack, err;
+
+	if (hints_in) {
+		memcpy(&hints, hints_in, sizeof(hints));
+	} else {
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+	}
+
+#ifndef AI_ADDRCONFIG
+	/* Not every system has AI_ADDRCONFIG, so fake it. */
+	if (hints.ai_family == PF_UNSPEC &&
+	    (hints.ai_flags & EVUTIL_AI_ADDRCONFIG)) {
+		evutil_adjust_hints_for_addrconfig_(&hints);
+	}
+#endif
+
+#ifndef AI_NUMERICSERV
+	/* Not every system has AI_NUMERICSERV, so fake it. */
+	if (hints.ai_flags & EVUTIL_AI_NUMERICSERV) {
+		if (servname && parse_numeric_servname(servname)<0)
+			return EVUTIL_EAI_NONAME;
+	}
+#endif
+
+	/* Enough operating systems handle enough common non-resolve
+	 * cases here weirdly enough that we are better off just
+	 * overriding them.  For example:
+	 *
+	 * - Windows doesn't like to infer the protocol from the
+	 *   socket type, or fill in socket or protocol types much at
+	 *   all.  It also seems to do its own broken implicit
+	 *   always-on version of AI_ADDRCONFIG that keeps it from
+	 *   ever resolving even a literal IPv6 address when
+	 *   ai_addrtype is PF_UNSPEC.
+	 */
+#ifdef _WIN32
+	{
+		int tmp_port;
+		err = evutil_getaddrinfo_common_(nodename,servname,&hints,
+		    res, &tmp_port);
+		if (err == 0 ||
+		    err == EVUTIL_EAI_MEMORY ||
+		    err == EVUTIL_EAI_NONAME)
+			return err;
+		/* If we make it here, the system getaddrinfo can
+		 * have a crack at it. */
+	}
+#endif
+
+	/* See documentation for need_numeric_port_hack above.*/
+	need_np_hack = need_numeric_port_hack() && servname && !hints.ai_socktype
+	    && ((portnum=parse_numeric_servname(servname)) >= 0);
+	if (need_np_hack) {
+		if (!nodename)
+			return evutil_getaddrinfo_common_(
+				NULL,servname,&hints, res, &portnum);
+		servname = NULL;
+	}
+
+	if (need_socktype_protocol_hack()) {
+		evutil_getaddrinfo_infer_protocols(&hints);
+	}
+
+	/* Make sure that we didn't actually steal any AI_FLAGS values that
+	 * the system is using.  (This is a constant expression, and should ge
+	 * optimized out.)
+	 *
+	 * XXXX Turn this into a compile-time failure rather than a run-time
+	 * failure.
+	 */
+	EVUTIL_ASSERT((ALL_NONNATIVE_AI_FLAGS & ALL_NATIVE_AI_FLAGS) == 0);
+
+	/* Clear any flags that only libevent understands. */
+	hints.ai_flags &= ~ALL_NONNATIVE_AI_FLAGS;
+
+	err = getaddrinfo(nodename, servname, &hints, res);
+	if (need_np_hack)
+		apply_numeric_port_hack(portnum, res);
+
+	if (need_socktype_protocol_hack()) {
+		if (apply_socktype_protocol_hack(*res) < 0) {
+			evutil_freeaddrinfo(*res);
+			*res = NULL;
+			return EVUTIL_EAI_MEMORY;
+		}
+	}
+	return err;
+#else
+	int port=0, err;
+	struct hostent *ent = NULL;
+	struct evutil_addrinfo hints;
+
+	if (hints_in) {
+		memcpy(&hints, hints_in, sizeof(hints));
+	} else {
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+	}
+
+	evutil_adjust_hints_for_addrconfig_(&hints);
+
+	err = evutil_getaddrinfo_common_(nodename, servname, &hints, res, &port);
+	if (err != EVUTIL_EAI_NEED_RESOLVE) {
+		/* We either succeeded or failed.  No need to continue */
+		return err;
+	}
+
+	err = 0;
+	/* Use any of the various gethostbyname_r variants as available. */
+	{
+#ifdef EVENT__HAVE_GETHOSTBYNAME_R_6_ARG
+		/* This one is what glibc provides. */
+		char buf[2048];
+		struct hostent hostent;
+		int r;
+		r = gethostbyname_r(nodename, &hostent, buf, sizeof(buf), &ent,
+		    &err);
+#elif defined(EVENT__HAVE_GETHOSTBYNAME_R_5_ARG)
+		char buf[2048];
+		struct hostent hostent;
+		ent = gethostbyname_r(nodename, &hostent, buf, sizeof(buf),
+		    &err);
+#elif defined(EVENT__HAVE_GETHOSTBYNAME_R_3_ARG)
+		struct hostent_data data;
+		struct hostent hostent;
+		memset(&data, 0, sizeof(data));
+		err = gethostbyname_r(nodename, &hostent, &data);
+		ent = err ? NULL : &hostent;
+#else
+		/* fall back to gethostbyname. */
+		/* XXXX This needs a lock everywhere but Windows. */
+		ent = gethostbyname(nodename);
+#ifdef _WIN32
+		err = WSAGetLastError();
+#else
+		err = h_errno;
+#endif
+#endif
+
+		/* Now we have either ent or err set. */
+		if (!ent) {
+			/* XXX is this right for windows ? */
+			switch (err) {
+			case TRY_AGAIN:
+				return EVUTIL_EAI_AGAIN;
+			case NO_RECOVERY:
+			default:
+				return EVUTIL_EAI_FAIL;
+			case HOST_NOT_FOUND:
+				return EVUTIL_EAI_NONAME;
+			case NO_ADDRESS:
+#if NO_DATA != NO_ADDRESS
+			case NO_DATA:
+#endif
+				return EVUTIL_EAI_NODATA;
+			}
+		}
+
+		if (ent->h_addrtype != hints.ai_family &&
+		    hints.ai_family != PF_UNSPEC) {
+			/* This wasn't the type we were hoping for.  Too bad
+			 * we never had a chance to ask gethostbyname for what
+			 * we wanted. */
+			return EVUTIL_EAI_NONAME;
+		}
+
+		/* Make sure we got _some_ answers. */
+		if (ent->h_length == 0)
+			return EVUTIL_EAI_NODATA;
+
+		/* If we got an address type we don't know how to make a
+		   sockaddr for, give up. */
+		if (ent->h_addrtype != PF_INET && ent->h_addrtype != PF_INET6)
+			return EVUTIL_EAI_FAMILY;
+
+		*res = addrinfo_from_hostent(ent, port, &hints);
+		if (! *res)
+			return EVUTIL_EAI_MEMORY;
+	}
+
+	return 0;
+#endif
+}
+
+void
+evutil_freeaddrinfo(struct evutil_addrinfo *ai)
+{
+#ifdef EVENT__HAVE_GETADDRINFO
+	if (!(ai->ai_flags & EVUTIL_AI_LIBEVENT_ALLOCATED)) {
+		freeaddrinfo(ai);
+		return;
+	}
+#endif
+	while (ai) {
+		struct evutil_addrinfo *next = ai->ai_next;
+		if (ai->ai_canonname)
+			mm_free(ai->ai_canonname);
+		mm_free(ai);
+		ai = next;
+	}
+}
+
+static evdns_getaddrinfo_fn evdns_getaddrinfo_impl = NULL;
+static evdns_getaddrinfo_cancel_fn evdns_getaddrinfo_cancel_impl = NULL;
+
+void
+evutil_set_evdns_getaddrinfo_fn_(evdns_getaddrinfo_fn fn)
+{
+	if (!evdns_getaddrinfo_impl)
+		evdns_getaddrinfo_impl = fn;
+}
+void
+evutil_set_evdns_getaddrinfo_cancel_fn_(evdns_getaddrinfo_cancel_fn fn)
+{
+	if (!evdns_getaddrinfo_cancel_impl)
+		evdns_getaddrinfo_cancel_impl = fn;
+}
+
+/* Internal helper function: act like evdns_getaddrinfo if dns_base is set;
+ * otherwise do a blocking resolve and pass the result to the callback in the
+ * way that evdns_getaddrinfo would.
+ */
+struct evdns_getaddrinfo_request *evutil_getaddrinfo_async_(
+    struct evdns_base *dns_base,
+    const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in,
+    void (*cb)(int, struct evutil_addrinfo *, void *), void *arg)
+{
+	if (dns_base && evdns_getaddrinfo_impl) {
+		return evdns_getaddrinfo_impl(
+			dns_base, nodename, servname, hints_in, cb, arg);
+	} else {
+		struct evutil_addrinfo *ai=NULL;
+		int err;
+		err = evutil_getaddrinfo(nodename, servname, hints_in, &ai);
+		cb(err, ai, arg);
+		return NULL;
+	}
+}
+
+void evutil_getaddrinfo_cancel_async_(struct evdns_getaddrinfo_request *data)
+{
+	if (evdns_getaddrinfo_cancel_impl && data) {
+		evdns_getaddrinfo_cancel_impl(data);
+	}
+}
+
+const char *
+evutil_gai_strerror(int err)
+{
+	/* As a sneaky side-benefit, this case statement will get most
+	 * compilers to tell us if any of the error codes we defined
+	 * conflict with the platform's native error codes. */
+	switch (err) {
+	case EVUTIL_EAI_CANCEL:
+		return "Request canceled";
+	case 0:
+		return "No error";
+
+	case EVUTIL_EAI_ADDRFAMILY:
+		return "address family for nodename not supported";
+	case EVUTIL_EAI_AGAIN:
+		return "temporary failure in name resolution";
+	case EVUTIL_EAI_BADFLAGS:
+		return "invalid value for ai_flags";
+	case EVUTIL_EAI_FAIL:
+		return "non-recoverable failure in name resolution";
+	case EVUTIL_EAI_FAMILY:
+		return "ai_family not supported";
+	case EVUTIL_EAI_MEMORY:
+		return "memory allocation failure";
+	case EVUTIL_EAI_NODATA:
+		return "no address associated with nodename";
+	case EVUTIL_EAI_NONAME:
+		return "nodename nor servname provided, or not known";
+	case EVUTIL_EAI_SERVICE:
+		return "servname not supported for ai_socktype";
+	case EVUTIL_EAI_SOCKTYPE:
+		return "ai_socktype not supported";
+	case EVUTIL_EAI_SYSTEM:
+		return "system error";
+	default:
+#if defined(USE_NATIVE_GETADDRINFO) && defined(_WIN32)
+		return gai_strerrorA(err);
+#elif defined(USE_NATIVE_GETADDRINFO)
+		return gai_strerror(err);
+#else
+		return "Unknown error code";
+#endif
+	}
+}
+
+#ifdef _WIN32
+/* destructively remove a trailing line terminator from s */
+static void
+chomp (char *s)
+{
+	size_t len;
+	if (s && (len = strlen (s)) > 0 && s[len - 1] == '\n') {
+		s[--len] = 0;
+		if (len > 0 && s[len - 1] == '\r')
+			s[--len] = 0;
+	}
+}
+
+/* FormatMessage returns allocated strings, but evutil_socket_error_to_string
+ * is supposed to return a string which is good indefinitely without having
+ * to be freed.  To make this work without leaking memory, we cache the
+ * string the first time FormatMessage is called on a particular error
+ * code, and then return the cached string on subsequent calls with the
+ * same code.  The strings aren't freed until libevent_global_shutdown
+ * (or never).  We use a linked list to cache the errors, because we
+ * only expect there to be a few dozen, and that should be fast enough.
+ */
+
+struct cached_sock_errs_entry {
+	HT_ENTRY(cached_sock_errs_entry) node;
+	DWORD code;
+	char *msg; /* allocated with LocalAlloc; free with LocalFree */
+};
+
+static inline unsigned
+hash_cached_sock_errs(const struct cached_sock_errs_entry *e)
+{
+	/* Use Murmur3's 32-bit finalizer as an integer hash function */
+	DWORD h = e->code;
+	h ^= h >> 16;
+	h *= 0x85ebca6b;
+	h ^= h >> 13;
+	h *= 0xc2b2ae35;
+	h ^= h >> 16;
+	return h;
+}
+
+static inline int
+eq_cached_sock_errs(const struct cached_sock_errs_entry *a,
+		    const struct cached_sock_errs_entry *b)
+{
+	return a->code == b->code;
+}
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+static void *windows_socket_errors_lock_ = NULL;
+#endif
+
+static HT_HEAD(cached_sock_errs_map, cached_sock_errs_entry)
+     windows_socket_errors = HT_INITIALIZER();
+
+HT_PROTOTYPE(cached_sock_errs_map,
+	     cached_sock_errs_entry,
+	     node,
+	     hash_cached_sock_errs,
+	     eq_cached_sock_errs);
+
+HT_GENERATE(cached_sock_errs_map,
+	    cached_sock_errs_entry,
+	    node,
+	    hash_cached_sock_errs,
+	    eq_cached_sock_errs,
+	    0.5,
+	    mm_malloc,
+	    mm_realloc,
+	    mm_free);
+
+/** Equivalent to strerror, but for windows socket errors. */
+const char *
+evutil_socket_error_to_string(int errcode)
+{
+	struct cached_sock_errs_entry *errs, *newerr, find;
+	char *msg = NULL;
+
+	EVLOCK_LOCK(windows_socket_errors_lock_, 0);
+
+	find.code = errcode;
+	errs = HT_FIND(cached_sock_errs_map, &windows_socket_errors, &find);
+	if (errs) {
+		msg = errs->msg;
+		goto done;
+	}
+
+	if (0 != FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+			       FORMAT_MESSAGE_IGNORE_INSERTS |
+			       FORMAT_MESSAGE_ALLOCATE_BUFFER,
+			       NULL, errcode, 0, (char *)&msg, 0, NULL))
+		chomp (msg);	/* because message has trailing newline */
+	else {
+		size_t len = 50;
+		/* use LocalAlloc because FormatMessage does */
+		msg = LocalAlloc(LMEM_FIXED, len);
+		if (!msg) {
+			msg = (char *)"LocalAlloc failed during Winsock error";
+			goto done;
+		}
+		evutil_snprintf(msg, len, "winsock error 0x%08x", errcode);
+	}
+
+	newerr = (struct cached_sock_errs_entry *)
+		mm_malloc(sizeof (struct cached_sock_errs_entry));
+
+	if (!newerr) {
+		LocalFree(msg);
+		msg = (char *)"malloc failed during Winsock error";
+		goto done;
+	}
+
+	newerr->code = errcode;
+	newerr->msg = msg;
+	HT_INSERT(cached_sock_errs_map, &windows_socket_errors, newerr);
+
+ done:
+	EVLOCK_UNLOCK(windows_socket_errors_lock_, 0);
+
+	return msg;
+}
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+evutil_global_setup_locks_(const int enable_locks)
+{
+	EVTHREAD_SETUP_GLOBAL_LOCK(windows_socket_errors_lock_, 0);
+	return 0;
+}
+#endif
+
+static void
+evutil_free_sock_err_globals(void)
+{
+	struct cached_sock_errs_entry **errs, *tofree;
+
+	for (errs = HT_START(cached_sock_errs_map, &windows_socket_errors)
+		     ; errs; ) {
+		tofree = *errs;
+		errs = HT_NEXT_RMV(cached_sock_errs_map,
+				   &windows_socket_errors,
+				   errs);
+		LocalFree(tofree->msg);
+		mm_free(tofree);
+	}
+
+	HT_CLEAR(cached_sock_errs_map, &windows_socket_errors);
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (windows_socket_errors_lock_ != NULL) {
+		EVTHREAD_FREE_LOCK(windows_socket_errors_lock_, 0);
+		windows_socket_errors_lock_ = NULL;
+	}
+#endif
+}
+
+#else
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+evutil_global_setup_locks_(const int enable_locks)
+{
+	return 0;
+}
+#endif
+
+static void
+evutil_free_sock_err_globals(void)
+{
+}
+
+#endif
+
+int
+evutil_snprintf(char *buf, size_t buflen, const char *format, ...)
+{
+	int r;
+	va_list ap;
+	va_start(ap, format);
+	r = evutil_vsnprintf(buf, buflen, format, ap);
+	va_end(ap);
+	return r;
+}
+
+int
+evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
+{
+	int r;
+	if (!buflen)
+		return 0;
+#if defined(_MSC_VER) || defined(_WIN32)
+	r = _vsnprintf(buf, buflen, format, ap);
+	if (r < 0)
+		r = _vscprintf(format, ap);
+#elif defined(sgi)
+	/* Make sure we always use the correct vsnprintf on IRIX */
+	extern int      _xpg5_vsnprintf(char * __restrict,
+		__SGI_LIBC_NAMESPACE_QUALIFIER size_t,
+		const char * __restrict, /* va_list */ char *);
+
+	r = _xpg5_vsnprintf(buf, buflen, format, ap);
+#else
+	r = vsnprintf(buf, buflen, format, ap);
+#endif
+	buf[buflen-1] = '\0';
+	return r;
+}
+
+#define USE_INTERNAL_NTOP
+#define USE_INTERNAL_PTON
+
+const char *
+evutil_inet_ntop(int af, const void *src, char *dst, size_t len)
+{
+#if defined(EVENT__HAVE_INET_NTOP) && !defined(USE_INTERNAL_NTOP)
+	return inet_ntop(af, src, dst, len);
+#else
+	if (af == AF_INET) {
+		const struct in_addr *in = src;
+		const ev_uint32_t a = ntohl(in->s_addr);
+		int r;
+		r = evutil_snprintf(dst, len, "%d.%d.%d.%d",
+		    (int)(ev_uint8_t)((a>>24)&0xff),
+		    (int)(ev_uint8_t)((a>>16)&0xff),
+		    (int)(ev_uint8_t)((a>>8 )&0xff),
+		    (int)(ev_uint8_t)((a    )&0xff));
+		if (r<0||(size_t)r>=len)
+			return NULL;
+		else
+			return dst;
+#ifdef AF_INET6
+	} else if (af == AF_INET6) {
+		const struct in6_addr *addr = src;
+		char buf[64], *cp;
+		int longestGapLen = 0, longestGapPos = -1, i,
+			curGapPos = -1, curGapLen = 0;
+		ev_uint16_t words[8];
+		for (i = 0; i < 8; ++i) {
+			words[i] =
+			    (((ev_uint16_t)addr->s6_addr[2*i])<<8) + addr->s6_addr[2*i+1];
+		}
+		if (words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 &&
+		    words[4] == 0 && ((words[5] == 0 && words[6] && words[7]) ||
+			(words[5] == 0xffff))) {
+			/* This is an IPv4 address. */
+			if (words[5] == 0) {
+				evutil_snprintf(buf, sizeof(buf), "::%d.%d.%d.%d",
+				    addr->s6_addr[12], addr->s6_addr[13],
+				    addr->s6_addr[14], addr->s6_addr[15]);
+			} else {
+				evutil_snprintf(buf, sizeof(buf), "::%x:%d.%d.%d.%d", words[5],
+				    addr->s6_addr[12], addr->s6_addr[13],
+				    addr->s6_addr[14], addr->s6_addr[15]);
+			}
+			if (strlen(buf) > len)
+				return NULL;
+			strlcpy(dst, buf, len);
+			return dst;
+		}
+		i = 0;
+		while (i < 8) {
+			if (words[i] == 0) {
+				curGapPos = i++;
+				curGapLen = 1;
+				while (i<8 && words[i] == 0) {
+					++i; ++curGapLen;
+				}
+				if (curGapLen > longestGapLen) {
+					longestGapPos = curGapPos;
+					longestGapLen = curGapLen;
+				}
+			} else {
+				++i;
+			}
+		}
+		if (longestGapLen<=1)
+			longestGapPos = -1;
+
+		cp = buf;
+		for (i = 0; i < 8; ++i) {
+			if (words[i] == 0 && longestGapPos == i) {
+				if (i == 0)
+					*cp++ = ':';
+				*cp++ = ':';
+				while (i < 8 && words[i] == 0)
+					++i;
+				--i; /* to compensate for loop increment. */
+			} else {
+				evutil_snprintf(cp,
+								sizeof(buf)-(cp-buf), "%x", (unsigned)words[i]);
+				cp += strlen(cp);
+				if (i != 7)
+					*cp++ = ':';
+			}
+		}
+		*cp = '\0';
+		if (strlen(buf) > len)
+			return NULL;
+		strlcpy(dst, buf, len);
+		return dst;
+#endif
+	} else {
+		return NULL;
+	}
+#endif
+}
+
+int
+evutil_inet_pton(int af, const char *src, void *dst)
+{
+#if defined(EVENT__HAVE_INET_PTON) && !defined(USE_INTERNAL_PTON)
+	return inet_pton(af, src, dst);
+#else
+	if (af == AF_INET) {
+		unsigned a,b,c,d;
+		char more;
+		struct in_addr *addr = dst;
+		if (sscanf(src, "%u.%u.%u.%u%c", &a,&b,&c,&d,&more) != 4)
+			return 0;
+		if (a > 255) return 0;
+		if (b > 255) return 0;
+		if (c > 255) return 0;
+		if (d > 255) return 0;
+		addr->s_addr = htonl((a<<24) | (b<<16) | (c<<8) | d);
+		return 1;
+#ifdef AF_INET6
+	} else if (af == AF_INET6) {
+		struct in6_addr *out = dst;
+		ev_uint16_t words[8];
+		int gapPos = -1, i, setWords=0;
+		const char *dot = strchr(src, '.');
+		const char *eow; /* end of words. */
+		if (dot == src)
+			return 0;
+		else if (!dot)
+			eow = src+strlen(src);
+		else {
+			unsigned byte1,byte2,byte3,byte4;
+			char more;
+			for (eow = dot-1; eow >= src && EVUTIL_ISDIGIT_(*eow); --eow)
+				;
+			++eow;
+
+			/* We use "scanf" because some platform inet_aton()s are too lax
+			 * about IPv4 addresses of the form "1.2.3" */
+			if (sscanf(eow, "%u.%u.%u.%u%c",
+					   &byte1,&byte2,&byte3,&byte4,&more) != 4)
+				return 0;
+
+			if (byte1 > 255 ||
+			    byte2 > 255 ||
+			    byte3 > 255 ||
+			    byte4 > 255)
+				return 0;
+
+			words[6] = (byte1<<8) | byte2;
+			words[7] = (byte3<<8) | byte4;
+			setWords += 2;
+		}
+
+		i = 0;
+		while (src < eow) {
+			if (i > 7)
+				return 0;
+			if (EVUTIL_ISXDIGIT_(*src)) {
+				char *next;
+				long r = strtol(src, &next, 16);
+				if (next > 4+src)
+					return 0;
+				if (next == src)
+					return 0;
+				if (r<0 || r>65536)
+					return 0;
+
+				words[i++] = (ev_uint16_t)r;
+				setWords++;
+				src = next;
+				if (*src != ':' && src != eow)
+					return 0;
+				++src;
+			} else if (*src == ':' && i > 0 && gapPos==-1) {
+				gapPos = i;
+				++src;
+			} else if (*src == ':' && i == 0 && src[1] == ':' && gapPos==-1) {
+				gapPos = i;
+				src += 2;
+			} else {
+				return 0;
+			}
+		}
+
+		if (setWords > 8 ||
+			(setWords == 8 && gapPos != -1) ||
+			(setWords < 8 && gapPos == -1))
+			return 0;
+
+		if (gapPos >= 0) {
+			int nToMove = setWords - (dot ? 2 : 0) - gapPos;
+			int gapLen = 8 - setWords;
+			/* assert(nToMove >= 0); */
+			if (nToMove < 0)
+				return -1; /* should be impossible */
+			memmove(&words[gapPos+gapLen], &words[gapPos],
+					sizeof(ev_uint16_t)*nToMove);
+			memset(&words[gapPos], 0, sizeof(ev_uint16_t)*gapLen);
+		}
+		for (i = 0; i < 8; ++i) {
+			out->s6_addr[2*i  ] = words[i] >> 8;
+			out->s6_addr[2*i+1] = words[i] & 0xff;
+		}
+
+		return 1;
+#endif
+	} else {
+		return -1;
+	}
+#endif
+}
+
+int
+evutil_parse_sockaddr_port(const char *ip_as_string, struct sockaddr *out, int *outlen)
+{
+	int port;
+	char buf[128];
+	const char *cp, *addr_part, *port_part;
+	int is_ipv6;
+	/* recognized formats are:
+	 * [ipv6]:port
+	 * ipv6
+	 * [ipv6]
+	 * ipv4:port
+	 * ipv4
+	 */
+
+	cp = strchr(ip_as_string, ':');
+	if (*ip_as_string == '[') {
+		size_t len;
+		if (!(cp = strchr(ip_as_string, ']'))) {
+			return -1;
+		}
+		len = ( cp-(ip_as_string + 1) );
+		if (len > sizeof(buf)-1) {
+			return -1;
+		}
+		memcpy(buf, ip_as_string+1, len);
+		buf[len] = '\0';
+		addr_part = buf;
+		if (cp[1] == ':')
+			port_part = cp+2;
+		else
+			port_part = NULL;
+		is_ipv6 = 1;
+	} else if (cp && strchr(cp+1, ':')) {
+		is_ipv6 = 1;
+		addr_part = ip_as_string;
+		port_part = NULL;
+	} else if (cp) {
+		is_ipv6 = 0;
+		if (cp - ip_as_string > (int)sizeof(buf)-1) {
+			return -1;
+		}
+		memcpy(buf, ip_as_string, cp-ip_as_string);
+		buf[cp-ip_as_string] = '\0';
+		addr_part = buf;
+		port_part = cp+1;
+	} else {
+		addr_part = ip_as_string;
+		port_part = NULL;
+		is_ipv6 = 0;
+	}
+
+	if (port_part == NULL) {
+		port = 0;
+	} else {
+		port = atoi(port_part);
+		if (port <= 0 || port > 65535) {
+			return -1;
+		}
+	}
+
+	if (!addr_part)
+		return -1; /* Should be impossible. */
+#ifdef AF_INET6
+	if (is_ipv6)
+	{
+		struct sockaddr_in6 sin6;
+		memset(&sin6, 0, sizeof(sin6));
+#ifdef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
+		sin6.sin6_len = sizeof(sin6);
+#endif
+		sin6.sin6_family = AF_INET6;
+		sin6.sin6_port = htons(port);
+		if (1 != evutil_inet_pton(AF_INET6, addr_part, &sin6.sin6_addr))
+			return -1;
+		if ((int)sizeof(sin6) > *outlen)
+			return -1;
+		memset(out, 0, *outlen);
+		memcpy(out, &sin6, sizeof(sin6));
+		*outlen = sizeof(sin6);
+		return 0;
+	}
+	else
+#endif
+	{
+		struct sockaddr_in sin;
+		memset(&sin, 0, sizeof(sin));
+#ifdef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+		sin.sin_len = sizeof(sin);
+#endif
+		sin.sin_family = AF_INET;
+		sin.sin_port = htons(port);
+		if (1 != evutil_inet_pton(AF_INET, addr_part, &sin.sin_addr))
+			return -1;
+		if ((int)sizeof(sin) > *outlen)
+			return -1;
+		memset(out, 0, *outlen);
+		memcpy(out, &sin, sizeof(sin));
+		*outlen = sizeof(sin);
+		return 0;
+	}
+}
+
+const char *
+evutil_format_sockaddr_port_(const struct sockaddr *sa, char *out, size_t outlen)
+{
+	char b[128];
+	const char *res=NULL;
+	int port;
+	if (sa->sa_family == AF_INET) {
+		const struct sockaddr_in *sin = (const struct sockaddr_in*)sa;
+		res = evutil_inet_ntop(AF_INET, &sin->sin_addr,b,sizeof(b));
+		port = ntohs(sin->sin_port);
+		if (res) {
+			evutil_snprintf(out, outlen, "%s:%d", b, port);
+			return out;
+		}
+	} else if (sa->sa_family == AF_INET6) {
+		const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6*)sa;
+		res = evutil_inet_ntop(AF_INET6, &sin6->sin6_addr,b,sizeof(b));
+		port = ntohs(sin6->sin6_port);
+		if (res) {
+			evutil_snprintf(out, outlen, "[%s]:%d", b, port);
+			return out;
+		}
+	}
+
+	evutil_snprintf(out, outlen, "<addr with socktype %d>",
+	    (int)sa->sa_family);
+	return out;
+}
+
+int
+evutil_sockaddr_cmp(const struct sockaddr *sa1, const struct sockaddr *sa2,
+    int include_port)
+{
+	int r;
+	if (0 != (r = (sa1->sa_family - sa2->sa_family)))
+		return r;
+
+	if (sa1->sa_family == AF_INET) {
+		const struct sockaddr_in *sin1, *sin2;
+		sin1 = (const struct sockaddr_in *)sa1;
+		sin2 = (const struct sockaddr_in *)sa2;
+		if (sin1->sin_addr.s_addr < sin2->sin_addr.s_addr)
+			return -1;
+		else if (sin1->sin_addr.s_addr > sin2->sin_addr.s_addr)
+			return 1;
+		else if (include_port &&
+		    (r = ((int)sin1->sin_port - (int)sin2->sin_port)))
+			return r;
+		else
+			return 0;
+	}
+#ifdef AF_INET6
+	else if (sa1->sa_family == AF_INET6) {
+		const struct sockaddr_in6 *sin1, *sin2;
+		sin1 = (const struct sockaddr_in6 *)sa1;
+		sin2 = (const struct sockaddr_in6 *)sa2;
+		if ((r = memcmp(sin1->sin6_addr.s6_addr, sin2->sin6_addr.s6_addr, 16)))
+			return r;
+		else if (include_port &&
+		    (r = ((int)sin1->sin6_port - (int)sin2->sin6_port)))
+			return r;
+		else
+			return 0;
+	}
+#endif
+	return 1;
+}
+
+/* Tables to implement ctypes-replacement EVUTIL_IS*() functions.  Each table
+ * has 256 bits to look up whether a character is in some set or not.  This
+ * fails on non-ASCII platforms, but so does every other place where we
+ * take a char and write it onto the network.
+ **/
+static const ev_uint32_t EVUTIL_ISALPHA_TABLE[8] =
+  { 0, 0, 0x7fffffe, 0x7fffffe, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISALNUM_TABLE[8] =
+  { 0, 0x3ff0000, 0x7fffffe, 0x7fffffe, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISSPACE_TABLE[8] = { 0x3e00, 0x1, 0, 0, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISXDIGIT_TABLE[8] =
+  { 0, 0x3ff0000, 0x7e, 0x7e, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISDIGIT_TABLE[8] = { 0, 0x3ff0000, 0, 0, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISPRINT_TABLE[8] =
+  { 0, 0xffffffff, 0xffffffff, 0x7fffffff, 0, 0, 0, 0x0 };
+static const ev_uint32_t EVUTIL_ISUPPER_TABLE[8] = { 0, 0, 0x7fffffe, 0, 0, 0, 0, 0 };
+static const ev_uint32_t EVUTIL_ISLOWER_TABLE[8] = { 0, 0, 0, 0x7fffffe, 0, 0, 0, 0 };
+/* Upper-casing and lowercasing tables to map characters to upper/lowercase
+ * equivalents. */
+static const unsigned char EVUTIL_TOUPPER_TABLE[256] = {
+  0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
+  16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
+  32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,
+  48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,
+  64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,
+  80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,
+  96,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,
+  80,81,82,83,84,85,86,87,88,89,90,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+};
+static const unsigned char EVUTIL_TOLOWER_TABLE[256] = {
+  0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
+  16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
+  32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,
+  48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,
+  64,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,91,92,93,94,95,
+  96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
+};
+
+#define IMPL_CTYPE_FN(name)						\
+	int EVUTIL_##name##_(char c) {					\
+		ev_uint8_t u = c;					\
+		return !!(EVUTIL_##name##_TABLE[(u >> 5) & 7] & (1 << (u & 31))); \
+	}
+IMPL_CTYPE_FN(ISALPHA)
+IMPL_CTYPE_FN(ISALNUM)
+IMPL_CTYPE_FN(ISSPACE)
+IMPL_CTYPE_FN(ISDIGIT)
+IMPL_CTYPE_FN(ISXDIGIT)
+IMPL_CTYPE_FN(ISPRINT)
+IMPL_CTYPE_FN(ISLOWER)
+IMPL_CTYPE_FN(ISUPPER)
+
+char EVUTIL_TOLOWER_(char c)
+{
+	return ((char)EVUTIL_TOLOWER_TABLE[(ev_uint8_t)c]);
+}
+char EVUTIL_TOUPPER_(char c)
+{
+	return ((char)EVUTIL_TOUPPER_TABLE[(ev_uint8_t)c]);
+}
+int
+evutil_ascii_strcasecmp(const char *s1, const char *s2)
+{
+	char c1, c2;
+	while (1) {
+		c1 = EVUTIL_TOLOWER_(*s1++);
+		c2 = EVUTIL_TOLOWER_(*s2++);
+		if (c1 < c2)
+			return -1;
+		else if (c1 > c2)
+			return 1;
+		else if (c1 == 0)
+			return 0;
+	}
+}
+int evutil_ascii_strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	char c1, c2;
+	while (n--) {
+		c1 = EVUTIL_TOLOWER_(*s1++);
+		c2 = EVUTIL_TOLOWER_(*s2++);
+		if (c1 < c2)
+			return -1;
+		else if (c1 > c2)
+			return 1;
+		else if (c1 == 0)
+			return 0;
+	}
+	return 0;
+}
+
+void
+evutil_rtrim_lws_(char *str)
+{
+	char *cp;
+
+	if (str == NULL)
+		return;
+
+	if ((cp = strchr(str, '\0')) == NULL || (cp == str))
+		return;
+
+	--cp;
+
+	while (*cp == ' ' || *cp == '\t') {
+		*cp = '\0';
+		if (cp == str)
+			break;
+		--cp;
+	}
+}
+
+static int
+evutil_issetugid(void)
+{
+#ifdef EVENT__HAVE_ISSETUGID
+	return issetugid();
+#else
+
+#ifdef EVENT__HAVE_GETEUID
+	if (getuid() != geteuid())
+		return 1;
+#endif
+#ifdef EVENT__HAVE_GETEGID
+	if (getgid() != getegid())
+		return 1;
+#endif
+	return 0;
+#endif
+}
+
+const char *
+evutil_getenv_(const char *varname)
+{
+	if (evutil_issetugid())
+		return NULL;
+
+	return getenv(varname);
+}
+
+ev_uint32_t
+evutil_weakrand_seed_(struct evutil_weakrand_state *state, ev_uint32_t seed)
+{
+	if (seed == 0) {
+		struct timeval tv;
+		evutil_gettimeofday(&tv, NULL);
+		seed = (ev_uint32_t)tv.tv_sec + (ev_uint32_t)tv.tv_usec;
+#ifdef _WIN32
+		seed += (ev_uint32_t) _getpid();
+#else
+		seed += (ev_uint32_t) getpid();
+#endif
+	}
+	state->seed = seed;
+	return seed;
+}
+
+ev_int32_t
+evutil_weakrand_(struct evutil_weakrand_state *state)
+{
+	/* This RNG implementation is a linear congruential generator, with
+	 * modulus 2^31, multiplier 1103515245, and addend 12345.  It's also
+	 * used by OpenBSD, and by Glibc's TYPE_0 RNG.
+	 *
+	 * The linear congruential generator is not an industrial-strength
+	 * RNG!  It's fast, but it can have higher-order patterns.  Notably,
+	 * the low bits tend to have periodicity.
+	 */
+	state->seed = ((state->seed) * 1103515245 + 12345) & 0x7fffffff;
+	return (ev_int32_t)(state->seed);
+}
+
+ev_int32_t
+evutil_weakrand_range_(struct evutil_weakrand_state *state, ev_int32_t top)
+{
+	ev_int32_t divisor, result;
+
+	/* We can't just do weakrand() % top, since the low bits of the LCG
+	 * are less random than the high ones.  (Specifically, since the LCG
+	 * modulus is 2^N, every 2^m for m<N will divide the modulus, and so
+	 * therefore the low m bits of the LCG will have period 2^m.) */
+	divisor = EVUTIL_WEAKRAND_MAX / top;
+	do {
+		result = evutil_weakrand_(state) / divisor;
+	} while (result >= top);
+	return result;
+}
+
+/**
+ * Volatile pointer to memset: we use this to keep the compiler from
+ * eliminating our call to memset.
+ */
+void * (*volatile evutil_memset_volatile_)(void *, int, size_t) = memset;
+
+void
+evutil_memclear_(void *mem, size_t len)
+{
+	evutil_memset_volatile_(mem, 0, len);
+}
+
+int
+evutil_sockaddr_is_loopback_(const struct sockaddr *addr)
+{
+	static const char LOOPBACK_S6[16] =
+	    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1";
+	if (addr->sa_family == AF_INET) {
+		struct sockaddr_in *sin = (struct sockaddr_in *)addr;
+		return (ntohl(sin->sin_addr.s_addr) & 0xff000000) == 0x7f000000;
+	} else if (addr->sa_family == AF_INET6) {
+		struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
+		return !memcmp(sin6->sin6_addr.s6_addr, LOOPBACK_S6, 16);
+	}
+	return 0;
+}
+
+int
+evutil_hex_char_to_int_(char c)
+{
+	switch(c)
+	{
+		case '0': return 0;
+		case '1': return 1;
+		case '2': return 2;
+		case '3': return 3;
+		case '4': return 4;
+		case '5': return 5;
+		case '6': return 6;
+		case '7': return 7;
+		case '8': return 8;
+		case '9': return 9;
+		case 'A': case 'a': return 10;
+		case 'B': case 'b': return 11;
+		case 'C': case 'c': return 12;
+		case 'D': case 'd': return 13;
+		case 'E': case 'e': return 14;
+		case 'F': case 'f': return 15;
+	}
+	return -1;
+}
+
+#ifdef _WIN32
+HMODULE
+evutil_load_windows_system_library_(const TCHAR *library_name)
+{
+  TCHAR path[MAX_PATH];
+  unsigned n;
+  n = GetSystemDirectory(path, MAX_PATH);
+  if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH)
+    return 0;
+  _tcscat(path, TEXT("\\"));
+  _tcscat(path, library_name);
+  return LoadLibrary(path);
+}
+#endif
+
+/* Internal wrapper around 'socket' to provide Linux-style support for
+ * syscall-saving methods where available.
+ *
+ * In addition to regular socket behavior, you can use a bitwise or to set the
+ * flags EVUTIL_SOCK_NONBLOCK and EVUTIL_SOCK_CLOEXEC in the 'type' argument,
+ * to make the socket nonblocking or close-on-exec with as few syscalls as
+ * possible.
+ */
+evutil_socket_t
+evutil_socket_(int domain, int type, int protocol)
+{
+	evutil_socket_t r;
+#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC)
+	r = socket(domain, type, protocol);
+	if (r >= 0)
+		return r;
+	else if ((type & (SOCK_NONBLOCK|SOCK_CLOEXEC)) == 0)
+		return -1;
+#endif
+#define SOCKET_TYPE_MASK (~(EVUTIL_SOCK_NONBLOCK|EVUTIL_SOCK_CLOEXEC))
+	r = socket(domain, type & SOCKET_TYPE_MASK, protocol);
+	if (r < 0)
+		return -1;
+	if (type & EVUTIL_SOCK_NONBLOCK) {
+		if (evutil_fast_socket_nonblocking(r) < 0) {
+			evutil_closesocket(r);
+			return -1;
+		}
+	}
+	if (type & EVUTIL_SOCK_CLOEXEC) {
+		if (evutil_fast_socket_closeonexec(r) < 0) {
+			evutil_closesocket(r);
+			return -1;
+		}
+	}
+	return r;
+}
+
+/* Internal wrapper around 'accept' or 'accept4' to provide Linux-style
+ * support for syscall-saving methods where available.
+ *
+ * In addition to regular accept behavior, you can set one or more of flags
+ * EVUTIL_SOCK_NONBLOCK and EVUTIL_SOCK_CLOEXEC in the 'flags' argument, to
+ * make the socket nonblocking or close-on-exec with as few syscalls as
+ * possible.
+ */
+evutil_socket_t
+evutil_accept4_(evutil_socket_t sockfd, struct sockaddr *addr,
+    ev_socklen_t *addrlen, int flags)
+{
+	evutil_socket_t result;
+#if defined(EVENT__HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
+	result = accept4(sockfd, addr, addrlen, flags);
+	if (result >= 0 || (errno != EINVAL && errno != ENOSYS)) {
+		/* A nonnegative result means that we succeeded, so return.
+		 * Failing with EINVAL means that an option wasn't supported,
+		 * and failing with ENOSYS means that the syscall wasn't
+		 * there: in those cases we want to fall back.  Otherwise, we
+		 * got a real error, and we should return. */
+		return result;
+	}
+#endif
+	result = accept(sockfd, addr, addrlen);
+	if (result < 0)
+		return result;
+
+	if (flags & EVUTIL_SOCK_CLOEXEC) {
+		if (evutil_fast_socket_closeonexec(result) < 0) {
+			evutil_closesocket(result);
+			return -1;
+		}
+	}
+	if (flags & EVUTIL_SOCK_NONBLOCK) {
+		if (evutil_fast_socket_nonblocking(result) < 0) {
+			evutil_closesocket(result);
+			return -1;
+		}
+	}
+	return result;
+}
+
+/* Internal function: Set fd[0] and fd[1] to a pair of fds such that writes on
+ * fd[1] get read from fd[0].  Make both fds nonblocking and close-on-exec.
+ * Return 0 on success, -1 on failure.
+ */
+int
+evutil_make_internal_pipe_(evutil_socket_t fd[2])
+{
+	/*
+	  Making the second socket nonblocking is a bit subtle, given that we
+	  ignore any EAGAIN returns when writing to it, and you don't usally
+	  do that for a nonblocking socket. But if the kernel gives us EAGAIN,
+	  then there's no need to add any more data to the buffer, since
+	  the main thread is already either about to wake up and drain it,
+	  or woken up and in the process of draining it.
+	*/
+
+#if defined(EVENT__HAVE_PIPE2)
+	if (pipe2(fd, O_NONBLOCK|O_CLOEXEC) == 0)
+		return 0;
+#endif
+#if defined(EVENT__HAVE_PIPE)
+	if (pipe(fd) == 0) {
+		if (evutil_fast_socket_nonblocking(fd[0]) < 0 ||
+		    evutil_fast_socket_nonblocking(fd[1]) < 0 ||
+		    evutil_fast_socket_closeonexec(fd[0]) < 0 ||
+		    evutil_fast_socket_closeonexec(fd[1]) < 0) {
+			close(fd[0]);
+			close(fd[1]);
+			fd[0] = fd[1] = -1;
+			return -1;
+		}
+		return 0;
+	} else {
+		event_warn("%s: pipe", __func__);
+	}
+#endif
+
+#ifdef _WIN32
+#define LOCAL_SOCKETPAIR_AF AF_INET
+#else
+#define LOCAL_SOCKETPAIR_AF AF_UNIX
+#endif
+	if (evutil_socketpair(LOCAL_SOCKETPAIR_AF, SOCK_STREAM, 0, fd) == 0) {
+		if (evutil_fast_socket_nonblocking(fd[0]) < 0 ||
+		    evutil_fast_socket_nonblocking(fd[1]) < 0 ||
+		    evutil_fast_socket_closeonexec(fd[0]) < 0 ||
+		    evutil_fast_socket_closeonexec(fd[1]) < 0) {
+			evutil_closesocket(fd[0]);
+			evutil_closesocket(fd[1]);
+			fd[0] = fd[1] = -1;
+			return -1;
+		}
+		return 0;
+	}
+	fd[0] = fd[1] = -1;
+	return -1;
+}
+
+/* Wrapper around eventfd on systems that provide it.  Unlike the system
+ * eventfd, it always supports EVUTIL_EFD_CLOEXEC and EVUTIL_EFD_NONBLOCK as
+ * flags.  Returns -1 on error or if eventfd is not supported.
+ */
+evutil_socket_t
+evutil_eventfd_(unsigned initval, int flags)
+{
+#if defined(EVENT__HAVE_EVENTFD) && defined(EVENT__HAVE_SYS_EVENTFD_H)
+	int r;
+#if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK)
+	r = eventfd(initval, flags);
+	if (r >= 0 || flags == 0)
+		return r;
+#endif
+	r = eventfd(initval, 0);
+	if (r < 0)
+		return r;
+	if (flags & EVUTIL_EFD_CLOEXEC) {
+		if (evutil_fast_socket_closeonexec(r) < 0) {
+			evutil_closesocket(r);
+			return -1;
+		}
+	}
+	if (flags & EVUTIL_EFD_NONBLOCK) {
+		if (evutil_fast_socket_nonblocking(r) < 0) {
+			evutil_closesocket(r);
+			return -1;
+		}
+	}
+	return r;
+#else
+	return -1;
+#endif
+}
+
+void
+evutil_free_globals_(void)
+{
+	evutil_free_secure_rng_globals_();
+	evutil_free_sock_err_globals();
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/evutil_rand.c b/extra/libevent/libevent-2.1.11-stable/evutil_rand.c
new file mode 100644
index 000000000000..8e9afdaa6753
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evutil_rand.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/* This file has our secure PRNG code.  On platforms that have arc4random(),
+ * we just use that.  Otherwise, we include arc4random.c as a bunch of static
+ * functions, and wrap it lightly.  We don't expose the arc4random*() APIs
+ * because A) they aren't in our namespace, and B) it's not nice to name your
+ * APIs after their implementations.  We keep them in a separate file
+ * so that other people can rip it out and use it for whatever.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <limits.h>
+
+#include "util-internal.h"
+#include "evthread-internal.h"
+
+#ifdef EVENT__HAVE_ARC4RANDOM
+#include <stdlib.h>
+#include <string.h>
+int
+evutil_secure_rng_set_urandom_device_file(char *fname)
+{
+	(void) fname;
+	return -1;
+}
+int
+evutil_secure_rng_init(void)
+{
+	/* call arc4random() now to force it to self-initialize */
+	(void) arc4random();
+	return 0;
+}
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+evutil_secure_rng_global_setup_locks_(const int enable_locks)
+{
+	return 0;
+}
+#endif
+static void
+evutil_free_secure_rng_globals_locks(void)
+{
+}
+
+static void
+ev_arc4random_buf(void *buf, size_t n)
+{
+#if defined(EVENT__HAVE_ARC4RANDOM_BUF) && !defined(__APPLE__)
+	arc4random_buf(buf, n);
+	return;
+#else
+	unsigned char *b = buf;
+
+#if defined(EVENT__HAVE_ARC4RANDOM_BUF)
+	/* OSX 10.7 introducd arc4random_buf, so if you build your program
+	 * there, you'll get surprised when older versions of OSX fail to run.
+	 * To solve this, we can check whether the function pointer is set,
+	 * and fall back otherwise.  (OSX does this using some linker
+	 * trickery.)
+	 */
+	{
+		void (*tptr)(void *,size_t) =
+		    (void (*)(void*,size_t))arc4random_buf;
+		if (tptr != NULL) {
+			arc4random_buf(buf, n);
+			return;
+		}
+	}
+#endif
+	/* Make sure that we start out with b at a 4-byte alignment; plenty
+	 * of CPUs care about this for 32-bit access. */
+	if (n >= 4 && ((ev_uintptr_t)b) & 3) {
+		ev_uint32_t u = arc4random();
+		int n_bytes = 4 - (((ev_uintptr_t)b) & 3);
+		memcpy(b, &u, n_bytes);
+		b += n_bytes;
+		n -= n_bytes;
+	}
+	while (n >= 4) {
+		*(ev_uint32_t*)b = arc4random();
+		b += 4;
+		n -= 4;
+	}
+	if (n) {
+		ev_uint32_t u = arc4random();
+		memcpy(b, &u, n);
+	}
+#endif
+}
+
+#else /* !EVENT__HAVE_ARC4RANDOM { */
+
+#ifdef EVENT__ssize_t
+#define ssize_t EVENT__ssize_t
+#endif
+#define ARC4RANDOM_EXPORT static
+#define ARC4_LOCK_() EVLOCK_LOCK(arc4rand_lock, 0)
+#define ARC4_UNLOCK_() EVLOCK_UNLOCK(arc4rand_lock, 0)
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+static void *arc4rand_lock;
+#endif
+
+#define ARC4RANDOM_UINT32 ev_uint32_t
+#define ARC4RANDOM_NOSTIR
+#define ARC4RANDOM_NORANDOM
+#define ARC4RANDOM_NOUNIFORM
+
+#include "./arc4random.c"
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+evutil_secure_rng_global_setup_locks_(const int enable_locks)
+{
+	EVTHREAD_SETUP_GLOBAL_LOCK(arc4rand_lock, 0);
+	return 0;
+}
+#endif
+
+static void
+evutil_free_secure_rng_globals_locks(void)
+{
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (arc4rand_lock != NULL) {
+		EVTHREAD_FREE_LOCK(arc4rand_lock, 0);
+		arc4rand_lock = NULL;
+	}
+#endif
+	return;
+}
+
+int
+evutil_secure_rng_set_urandom_device_file(char *fname)
+{
+#ifdef TRY_SEED_URANDOM
+	ARC4_LOCK_();
+	arc4random_urandom_filename = fname;
+	ARC4_UNLOCK_();
+#endif
+	return 0;
+}
+
+int
+evutil_secure_rng_init(void)
+{
+	int val;
+
+	ARC4_LOCK_();
+	val = (!arc4_stir()) ? 0 : -1;
+	ARC4_UNLOCK_();
+	return val;
+}
+
+static void
+ev_arc4random_buf(void *buf, size_t n)
+{
+	arc4random_buf(buf, n);
+}
+
+#endif /* } !EVENT__HAVE_ARC4RANDOM */
+
+void
+evutil_secure_rng_get_bytes(void *buf, size_t n)
+{
+	ev_arc4random_buf(buf, n);
+}
+
+#if !defined(EVENT__HAVE_ARC4RANDOM) || defined(EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+void
+evutil_secure_rng_add_bytes(const char *buf, size_t n)
+{
+	arc4random_addrandom((unsigned char*)buf,
+	    n>(size_t)INT_MAX ? INT_MAX : (int)n);
+}
+#endif
+
+void
+evutil_free_secure_rng_globals_(void)
+{
+    evutil_free_secure_rng_globals_locks();
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/evutil_time.c b/extra/libevent/libevent-2.1.11-stable/evutil_time.c
new file mode 100644
index 000000000000..c3a2358960ff
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/evutil_time.c
@@ -0,0 +1,579 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+#ifndef EVENT__HAVE_GETTIMEOFDAY
+#include <sys/timeb.h>
+#endif
+#if !defined(EVENT__HAVE_NANOSLEEP) && !defined(EVENT__HAVE_USLEEP) && \
+	!defined(_WIN32)
+#include <sys/select.h>
+#endif
+#include <time.h>
+#include <sys/stat.h>
+#include <string.h>
+
+/** evutil_usleep_() */
+#if defined(_WIN32)
+#elif defined(EVENT__HAVE_NANOSLEEP)
+#elif defined(EVENT__HAVE_USLEEP)
+#include <unistd.h>
+#endif
+
+#include "event2/util.h"
+#include "util-internal.h"
+#include "log-internal.h"
+#include "mm-internal.h"
+
+#ifndef EVENT__HAVE_GETTIMEOFDAY
+/* No gettimeofday; this must be windows. */
+int
+evutil_gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+#ifdef _MSC_VER
+#define U64_LITERAL(n) n##ui64
+#else
+#define U64_LITERAL(n) n##llu
+#endif
+
+	/* Conversion logic taken from Tor, which in turn took it
+	 * from Perl.  GetSystemTimeAsFileTime returns its value as
+	 * an unaligned (!) 64-bit value containing the number of
+	 * 100-nanosecond intervals since 1 January 1601 UTC. */
+#define EPOCH_BIAS U64_LITERAL(116444736000000000)
+#define UNITS_PER_SEC U64_LITERAL(10000000)
+#define USEC_PER_SEC U64_LITERAL(1000000)
+#define UNITS_PER_USEC U64_LITERAL(10)
+	union {
+		FILETIME ft_ft;
+		ev_uint64_t ft_64;
+	} ft;
+
+	if (tv == NULL)
+		return -1;
+
+	GetSystemTimeAsFileTime(&ft.ft_ft);
+
+	if (EVUTIL_UNLIKELY(ft.ft_64 < EPOCH_BIAS)) {
+		/* Time before the unix epoch. */
+		return -1;
+	}
+	ft.ft_64 -= EPOCH_BIAS;
+	tv->tv_sec = (long) (ft.ft_64 / UNITS_PER_SEC);
+	tv->tv_usec = (long) ((ft.ft_64 / UNITS_PER_USEC) % USEC_PER_SEC);
+	return 0;
+}
+#endif
+
+#define MAX_SECONDS_IN_MSEC_LONG \
+	(((LONG_MAX) - 999) / 1000)
+
+long
+evutil_tv_to_msec_(const struct timeval *tv)
+{
+	if (tv->tv_usec > 1000000 || tv->tv_sec > MAX_SECONDS_IN_MSEC_LONG)
+		return -1;
+
+	return (tv->tv_sec * 1000) + ((tv->tv_usec + 999) / 1000);
+}
+
+/*
+  Replacement for usleep on platforms that don't have one.  Not guaranteed to
+  be any more finegrained than 1 msec.
+ */
+void
+evutil_usleep_(const struct timeval *tv)
+{
+	if (!tv)
+		return;
+#if defined(_WIN32)
+	{
+		long msec = evutil_tv_to_msec_(tv);
+		Sleep((DWORD)msec);
+	}
+#elif defined(EVENT__HAVE_NANOSLEEP)
+	{
+		struct timespec ts;
+		ts.tv_sec = tv->tv_sec;
+		ts.tv_nsec = tv->tv_usec*1000;
+		nanosleep(&ts, NULL);
+	}
+#elif defined(EVENT__HAVE_USLEEP)
+	/* Some systems don't like to usleep more than 999999 usec */
+	sleep(tv->tv_sec);
+	usleep(tv->tv_usec);
+#else
+	{
+		struct timeval tv2 = *tv;
+		select(0, NULL, NULL, NULL, &tv2);
+	}
+#endif
+}
+
+int
+evutil_date_rfc1123(char *date, const size_t datelen, const struct tm *tm)
+{
+	static const char *DAYS[] =
+		{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+	static const char *MONTHS[] =
+		{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+
+	time_t t = time(NULL);
+
+#ifndef _WIN32
+	struct tm sys;
+#endif
+
+	/* If `tm` is null, set system's current time. */
+	if (tm == NULL) {
+#ifdef _WIN32
+		/** TODO: detect _gmtime64()/_gmtime64_s() */
+		tm = gmtime(&t);
+#else
+		gmtime_r(&t, &sys);
+		tm = &sys;
+#endif
+	}
+
+	return evutil_snprintf(
+		date, datelen, "%s, %02d %s %4d %02d:%02d:%02d GMT",
+		DAYS[tm->tm_wday], tm->tm_mday, MONTHS[tm->tm_mon],
+		1900 + tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec);
+}
+
+/*
+   This function assumes it's called repeatedly with a
+   not-actually-so-monotonic time source whose outputs are in 'tv'. It
+   implements a trivial ratcheting mechanism so that the values never go
+   backwards.
+ */
+static void
+adjust_monotonic_time(struct evutil_monotonic_timer *base,
+    struct timeval *tv)
+{
+	evutil_timeradd(tv, &base->adjust_monotonic_clock, tv);
+
+	if (evutil_timercmp(tv, &base->last_time, <)) {
+		/* Guess it wasn't monotonic after all. */
+		struct timeval adjust;
+		evutil_timersub(&base->last_time, tv, &adjust);
+		evutil_timeradd(&adjust, &base->adjust_monotonic_clock,
+		    &base->adjust_monotonic_clock);
+		*tv = base->last_time;
+	}
+	base->last_time = *tv;
+}
+
+/*
+   Allocate a new struct evutil_monotonic_timer
+ */
+struct evutil_monotonic_timer *
+evutil_monotonic_timer_new(void)
+{
+  struct evutil_monotonic_timer *p = NULL;
+
+  p = mm_malloc(sizeof(*p));
+  if (!p) goto done;
+
+  memset(p, 0, sizeof(*p));
+
+ done:
+  return p;
+}
+
+/*
+   Free a struct evutil_monotonic_timer
+ */
+void
+evutil_monotonic_timer_free(struct evutil_monotonic_timer *timer)
+{
+  if (timer) {
+    mm_free(timer);
+  }
+}
+
+/*
+   Set up a struct evutil_monotonic_timer for initial use
+ */
+int
+evutil_configure_monotonic_time(struct evutil_monotonic_timer *timer,
+                                int flags)
+{
+  return evutil_configure_monotonic_time_(timer, flags);
+}
+
+/*
+   Query the current monotonic time
+ */
+int
+evutil_gettime_monotonic(struct evutil_monotonic_timer *timer,
+                         struct timeval *tp)
+{
+  return evutil_gettime_monotonic_(timer, tp);
+}
+
+
+#if defined(HAVE_POSIX_MONOTONIC)
+/* =====
+   The POSIX clock_gettime() interface provides a few ways to get at a
+   monotonic clock.  CLOCK_MONOTONIC is most widely supported.  Linux also
+   provides a CLOCK_MONOTONIC_COARSE with accuracy of about 1-4 msec.
+
+   On all platforms I'm aware of, CLOCK_MONOTONIC really is monotonic.
+   Platforms don't agree about whether it should jump on a sleep/resume.
+ */
+
+int
+evutil_configure_monotonic_time_(struct evutil_monotonic_timer *base,
+    int flags)
+{
+	/* CLOCK_MONOTONIC exists on FreeBSD, Linux, and Solaris.  You need to
+	 * check for it at runtime, because some older kernel versions won't
+	 * have it working. */
+#ifdef CLOCK_MONOTONIC_COARSE
+	const int precise = flags & EV_MONOT_PRECISE;
+#endif
+	const int fallback = flags & EV_MONOT_FALLBACK;
+	struct timespec	ts;
+
+#ifdef CLOCK_MONOTONIC_COARSE
+	if (CLOCK_MONOTONIC_COARSE < 0) {
+		/* Technically speaking, nothing keeps CLOCK_* from being
+		 * negative (as far as I know). This check and the one below
+		 * make sure that it's safe for us to use -1 as an "unset"
+		 * value. */
+		event_errx(1,"I didn't expect CLOCK_MONOTONIC_COARSE to be < 0");
+	}
+	if (! precise && ! fallback) {
+		if (clock_gettime(CLOCK_MONOTONIC_COARSE, &ts) == 0) {
+			base->monotonic_clock = CLOCK_MONOTONIC_COARSE;
+			return 0;
+		}
+	}
+#endif
+	if (!fallback && clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
+		base->monotonic_clock = CLOCK_MONOTONIC;
+		return 0;
+	}
+
+	if (CLOCK_MONOTONIC < 0) {
+		event_errx(1,"I didn't expect CLOCK_MONOTONIC to be < 0");
+	}
+
+	base->monotonic_clock = -1;
+	return 0;
+}
+
+int
+evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
+    struct timeval *tp)
+{
+	struct timespec ts;
+
+	if (base->monotonic_clock < 0) {
+		if (evutil_gettimeofday(tp, NULL) < 0)
+			return -1;
+		adjust_monotonic_time(base, tp);
+		return 0;
+	}
+
+	if (clock_gettime(base->monotonic_clock, &ts) == -1)
+		return -1;
+	tp->tv_sec = ts.tv_sec;
+	tp->tv_usec = ts.tv_nsec / 1000;
+
+	return 0;
+}
+#endif
+
+#if defined(HAVE_MACH_MONOTONIC)
+/* ======
+   Apple is a little late to the POSIX party.  And why not?  Instead of
+   clock_gettime(), they provide mach_absolute_time().  Its units are not
+   fixed; we need to use mach_timebase_info() to get the right functions to
+   convert its units into nanoseconds.
+
+   To all appearances, mach_absolute_time() seems to be honest-to-goodness
+   monotonic.  Whether it stops during sleep or not is unspecified in
+   principle, and dependent on CPU architecture in practice.
+ */
+
+int
+evutil_configure_monotonic_time_(struct evutil_monotonic_timer *base,
+    int flags)
+{
+	const int fallback = flags & EV_MONOT_FALLBACK;
+	struct mach_timebase_info mi;
+	memset(base, 0, sizeof(*base));
+	/* OSX has mach_absolute_time() */
+	if (!fallback &&
+	    mach_timebase_info(&mi) == 0 &&
+	    mach_absolute_time() != 0) {
+		/* mach_timebase_info tells us how to convert
+		 * mach_absolute_time() into nanoseconds, but we
+		 * want to use microseconds instead. */
+		mi.denom *= 1000;
+		memcpy(&base->mach_timebase_units, &mi, sizeof(mi));
+	} else {
+		base->mach_timebase_units.numer = 0;
+	}
+	return 0;
+}
+
+int
+evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
+    struct timeval *tp)
+{
+	ev_uint64_t abstime, usec;
+	if (base->mach_timebase_units.numer == 0) {
+		if (evutil_gettimeofday(tp, NULL) < 0)
+			return -1;
+		adjust_monotonic_time(base, tp);
+		return 0;
+	}
+
+	abstime = mach_absolute_time();
+	usec = (abstime * base->mach_timebase_units.numer)
+	    / (base->mach_timebase_units.denom);
+	tp->tv_sec = usec / 1000000;
+	tp->tv_usec = usec % 1000000;
+
+	return 0;
+}
+#endif
+
+#if defined(HAVE_WIN32_MONOTONIC)
+/* =====
+   Turn we now to Windows.  Want monontonic time on Windows?
+
+   Windows has QueryPerformanceCounter(), which gives time most high-
+   resolution time.  It's a pity it's not so monotonic in practice; it's
+   also got some fun bugs, especially: with older Windowses, under
+   virtualizations, with funny hardware, on multiprocessor systems, and so
+   on.  PEP418 [1] has a nice roundup of the issues here.
+
+   There's GetTickCount64() on Vista and later, which gives a number of 1-msec
+   ticks since startup.  The accuracy here might be as bad as 10-20 msec, I
+   hear.  There's an undocumented function (NtSetTimerResolution) that
+   allegedly increases the accuracy. Good luck!
+
+   There's also GetTickCount(), which is only 32 bits, but seems to be
+   supported on pre-Vista versions of Windows.  Apparently, you can coax
+   another 14 bits out of it, giving you 2231 years before rollover.
+
+   The less said about timeGetTime() the better.
+
+   "We don't care.  We don't have to.  We're the Phone Company."
+            -- Lily Tomlin, SNL
+
+   Our strategy, if precise timers are turned off, is to just use the best
+   GetTickCount equivalent available.  If we've been asked for precise timing,
+   then we mostly[2] assume that GetTickCount is monotonic, and correct
+   GetPerformanceCounter to approximate it.
+
+   [1] http://www.python.org/dev/peps/pep-0418
+   [2] Of course, we feed the Windows stuff into adjust_monotonic_time()
+       anyway, just in case it isn't.
+
+ */
+/*
+    Parts of our logic in the win32 timer code here are closely based on
+    BitTorrent's libUTP library.  That code is subject to the following
+    license:
+
+      Copyright (c) 2010 BitTorrent, Inc.
+
+      Permission is hereby granted, free of charge, to any person obtaining a
+      copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject to
+      the following conditions:
+
+      The above copyright notice and this permission notice shall be included
+      in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+      OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+      LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+static ev_uint64_t
+evutil_GetTickCount_(struct evutil_monotonic_timer *base)
+{
+	if (base->GetTickCount64_fn) {
+		/* Let's just use GetTickCount64 if we can. */
+		return base->GetTickCount64_fn();
+	} else if (base->GetTickCount_fn) {
+		/* Greg Hazel assures me that this works, that BitTorrent has
+		 * done it for years, and this it won't turn around and
+		 * bite us.  He says they found it on some game programmers'
+		 * forum some time around 2007.
+		 */
+		ev_uint64_t v = base->GetTickCount_fn();
+		return (DWORD)v | ((v >> 18) & 0xFFFFFFFF00000000);
+	} else {
+		/* Here's the fallback implementation. We have to use
+		 * GetTickCount() with its given signature, so we only get
+		 * 32 bits worth of milliseconds, which will roll ove every
+		 * 49 days or so.  */
+		DWORD ticks = GetTickCount();
+		if (ticks < base->last_tick_count) {
+			base->adjust_tick_count += ((ev_uint64_t)1) << 32;
+		}
+		base->last_tick_count = ticks;
+		return ticks + base->adjust_tick_count;
+	}
+}
+
+int
+evutil_configure_monotonic_time_(struct evutil_monotonic_timer *base,
+    int flags)
+{
+	const int precise = flags & EV_MONOT_PRECISE;
+	const int fallback = flags & EV_MONOT_FALLBACK;
+	HANDLE h;
+	memset(base, 0, sizeof(*base));
+
+	h = evutil_load_windows_system_library_(TEXT("kernel32.dll"));
+	if (h != NULL && !fallback) {
+		base->GetTickCount64_fn = (ev_GetTickCount_func)GetProcAddress(h, "GetTickCount64");
+		base->GetTickCount_fn = (ev_GetTickCount_func)GetProcAddress(h, "GetTickCount");
+	}
+
+	base->first_tick = base->last_tick_count = evutil_GetTickCount_(base);
+	if (precise && !fallback) {
+		LARGE_INTEGER freq;
+		if (QueryPerformanceFrequency(&freq)) {
+			LARGE_INTEGER counter;
+			QueryPerformanceCounter(&counter);
+			base->first_counter = counter.QuadPart;
+			base->usec_per_count = 1.0e6 / freq.QuadPart;
+			base->use_performance_counter = 1;
+		}
+	}
+
+	return 0;
+}
+
+static inline ev_int64_t
+abs64(ev_int64_t i)
+{
+	return i < 0 ? -i : i;
+}
+
+
+int
+evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
+    struct timeval *tp)
+{
+	ev_uint64_t ticks = evutil_GetTickCount_(base);
+	if (base->use_performance_counter) {
+		/* Here's a trick we took from BitTorrent's libutp, at Greg
+		 * Hazel's recommendation.  We use QueryPerformanceCounter for
+		 * our high-resolution timer, but use GetTickCount*() to keep
+		 * it sane, and adjust_monotonic_time() to keep it monotonic.
+		 */
+		LARGE_INTEGER counter;
+		ev_int64_t counter_elapsed, counter_usec_elapsed, ticks_elapsed;
+		QueryPerformanceCounter(&counter);
+		counter_elapsed = (ev_int64_t)
+		    (counter.QuadPart - base->first_counter);
+		ticks_elapsed = ticks - base->first_tick;
+		/* TODO: This may upset VC6. If you need this to work with
+		 * VC6, please supply an appropriate patch. */
+		counter_usec_elapsed = (ev_int64_t)
+		    (counter_elapsed * base->usec_per_count);
+
+		if (abs64(ticks_elapsed*1000 - counter_usec_elapsed) > 1000000) {
+			/* It appears that the QueryPerformanceCounter()
+			 * result is more than 1 second away from
+			 * GetTickCount() result. Let's adjust it to be as
+			 * accurate as we can; adjust_monotnonic_time() below
+			 * will keep it monotonic. */
+			counter_usec_elapsed = ticks_elapsed * 1000;
+			base->first_counter = (ev_uint64_t) (counter.QuadPart - counter_usec_elapsed / base->usec_per_count);
+		}
+		tp->tv_sec = (time_t) (counter_usec_elapsed / 1000000);
+		tp->tv_usec = counter_usec_elapsed % 1000000;
+
+	} else {
+		/* We're just using GetTickCount(). */
+		tp->tv_sec = (time_t) (ticks / 1000);
+		tp->tv_usec = (ticks % 1000) * 1000;
+	}
+	adjust_monotonic_time(base, tp);
+
+	return 0;
+}
+#endif
+
+#if defined(HAVE_FALLBACK_MONOTONIC)
+/* =====
+   And if none of the other options work, let's just use gettimeofday(), and
+   ratchet it forward so that it acts like a monotonic timer, whether it
+   wants to or not.
+ */
+
+int
+evutil_configure_monotonic_time_(struct evutil_monotonic_timer *base,
+    int precise)
+{
+	memset(base, 0, sizeof(*base));
+	return 0;
+}
+
+int
+evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
+    struct timeval *tp)
+{
+	if (evutil_gettimeofday(tp, NULL) < 0)
+		return -1;
+	adjust_monotonic_time(base, tp);
+	return 0;
+
+}
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/ht-internal.h b/extra/libevent/libevent-2.1.11-stable/ht-internal.h
new file mode 100644
index 000000000000..50375bbaa94c
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ht-internal.h
@@ -0,0 +1,487 @@
+/* Copyright 2002 Christopher Clark */
+/* Copyright 2005-2012 Nick Mathewson */
+/* Copyright 2009-2012 Niels Provos and Nick Mathewson */
+/* See license at end. */
+
+/* Based on ideas by Christopher Clark and interfaces from Niels Provos. */
+
+#ifndef HT_INTERNAL_H_INCLUDED_
+#define HT_INTERNAL_H_INCLUDED_
+
+#define HT_HEAD(name, type)                                             \
+  struct name {                                                         \
+    /* The hash table itself. */                                        \
+    struct type **hth_table;                                            \
+    /* How long is the hash table? */                                   \
+    unsigned hth_table_length;                                          \
+    /* How many elements does the table contain? */                     \
+    unsigned hth_n_entries;                                             \
+    /* How many elements will we allow in the table before resizing it? */ \
+    unsigned hth_load_limit;                                            \
+    /* Position of hth_table_length in the primes table. */             \
+    int hth_prime_idx;                                                  \
+  }
+
+#define HT_INITIALIZER()                        \
+  { NULL, 0, 0, 0, -1 }
+
+#ifdef HT_NO_CACHE_HASH_VALUES
+#define HT_ENTRY(type)                          \
+  struct {                                      \
+    struct type *hte_next;                      \
+  }
+#else
+#define HT_ENTRY(type)                          \
+  struct {                                      \
+    struct type *hte_next;                      \
+    unsigned hte_hash;                          \
+  }
+#endif
+
+#define HT_EMPTY(head)                          \
+  ((head)->hth_n_entries == 0)
+
+/* How many elements in 'head'? */
+#define HT_SIZE(head)                           \
+  ((head)->hth_n_entries)
+
+/* Return memory usage for a hashtable (not counting the entries themselves) */
+#define HT_MEM_USAGE(head)                         \
+  (sizeof(*head) + (head)->hth_table_length * sizeof(void*))
+
+#define HT_FIND(name, head, elm)     name##_HT_FIND((head), (elm))
+#define HT_INSERT(name, head, elm)   name##_HT_INSERT((head), (elm))
+#define HT_REPLACE(name, head, elm)  name##_HT_REPLACE((head), (elm))
+#define HT_REMOVE(name, head, elm)   name##_HT_REMOVE((head), (elm))
+#define HT_START(name, head)         name##_HT_START(head)
+#define HT_NEXT(name, head, elm)     name##_HT_NEXT((head), (elm))
+#define HT_NEXT_RMV(name, head, elm) name##_HT_NEXT_RMV((head), (elm))
+#define HT_CLEAR(name, head)         name##_HT_CLEAR(head)
+#define HT_INIT(name, head)          name##_HT_INIT(head)
+/* Helper: */
+static inline unsigned
+ht_improve_hash_(unsigned h)
+{
+  /* Aim to protect against poor hash functions by adding logic here
+   * - logic taken from java 1.4 hashtable source */
+  h += ~(h << 9);
+  h ^=  ((h >> 14) | (h << 18)); /* >>> */
+  h +=  (h << 4);
+  h ^=  ((h >> 10) | (h << 22)); /* >>> */
+  return h;
+}
+
+#if 0
+/** Basic string hash function, from Java standard String.hashCode(). */
+static inline unsigned
+ht_string_hash_(const char *s)
+{
+  unsigned h = 0;
+  int m = 1;
+  while (*s) {
+    h += ((signed char)*s++)*m;
+    m = (m<<5)-1; /* m *= 31 */
+  }
+  return h;
+}
+#endif
+
+/** Basic string hash function, from Python's str.__hash__() */
+static inline unsigned
+ht_string_hash_(const char *s)
+{
+  unsigned h;
+  const unsigned char *cp = (const unsigned char *)s;
+  h = *cp << 7;
+  while (*cp) {
+    h = (1000003*h) ^ *cp++;
+  }
+  /* This conversion truncates the length of the string, but that's ok. */
+  h ^= (unsigned)(cp-(const unsigned char*)s);
+  return h;
+}
+
+#ifndef HT_NO_CACHE_HASH_VALUES
+#define HT_SET_HASH_(elm, field, hashfn)        \
+	do { (elm)->field.hte_hash = hashfn(elm); } while (0)
+#define HT_SET_HASHVAL_(elm, field, val)	\
+	do { (elm)->field.hte_hash = (val); } while (0)
+#define HT_ELT_HASH_(elm, field, hashfn)	\
+	((elm)->field.hte_hash)
+#else
+#define HT_SET_HASH_(elm, field, hashfn)	\
+	((void)0)
+#define HT_ELT_HASH_(elm, field, hashfn)	\
+	(hashfn(elm))
+#define HT_SET_HASHVAL_(elm, field, val)	\
+        ((void)0)
+#endif
+
+/* Helper: alias for the bucket containing 'elm'. */
+#define HT_BUCKET_(head, field, elm, hashfn)				\
+	((head)->hth_table[HT_ELT_HASH_(elm,field,hashfn) % head->hth_table_length])
+
+#define HT_FOREACH(x, name, head)                 \
+  for ((x) = HT_START(name, head);                \
+       (x) != NULL;                               \
+       (x) = HT_NEXT(name, head, x))
+
+#define HT_PROTOTYPE(name, type, field, hashfn, eqfn)                   \
+  int name##_HT_GROW(struct name *ht, unsigned min_capacity);           \
+  void name##_HT_CLEAR(struct name *ht);                                \
+  int name##_HT_REP_IS_BAD_(const struct name *ht);			\
+  static inline void                                                    \
+  name##_HT_INIT(struct name *head) {                                   \
+    head->hth_table_length = 0;                                         \
+    head->hth_table = NULL;                                             \
+    head->hth_n_entries = 0;                                            \
+    head->hth_load_limit = 0;                                           \
+    head->hth_prime_idx = -1;                                           \
+  }                                                                     \
+  /* Helper: returns a pointer to the right location in the table       \
+   * 'head' to find or insert the element 'elm'. */                     \
+  static inline struct type **                                          \
+  name##_HT_FIND_P_(struct name *head, struct type *elm)		\
+  {                                                                     \
+    struct type **p;                                                    \
+    if (!head->hth_table)                                               \
+      return NULL;                                                      \
+    p = &HT_BUCKET_(head, field, elm, hashfn);				\
+    while (*p) {                                                        \
+      if (eqfn(*p, elm))                                                \
+        return p;                                                       \
+      p = &(*p)->field.hte_next;                                        \
+    }                                                                   \
+    return p;                                                           \
+  }                                                                     \
+  /* Return a pointer to the element in the table 'head' matching 'elm', \
+   * or NULL if no such element exists */                               \
+  static inline struct type *                                           \
+  name##_HT_FIND(const struct name *head, struct type *elm)             \
+  {                                                                     \
+    struct type **p;                                                    \
+    struct name *h = (struct name *) head;                              \
+    HT_SET_HASH_(elm, field, hashfn);                                   \
+    p = name##_HT_FIND_P_(h, elm);					\
+    return p ? *p : NULL;                                               \
+  }                                                                     \
+  /* Insert the element 'elm' into the table 'head'.  Do not call this  \
+   * function if the table might already contain a matching element. */ \
+  static inline void                                                    \
+  name##_HT_INSERT(struct name *head, struct type *elm)                 \
+  {                                                                     \
+    struct type **p;                                                    \
+    if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \
+      name##_HT_GROW(head, head->hth_n_entries+1);                      \
+    ++head->hth_n_entries;                                              \
+    HT_SET_HASH_(elm, field, hashfn);                                   \
+    p = &HT_BUCKET_(head, field, elm, hashfn);				\
+    elm->field.hte_next = *p;                                           \
+    *p = elm;                                                           \
+  }                                                                     \
+  /* Insert the element 'elm' into the table 'head'. If there already   \
+   * a matching element in the table, replace that element and return   \
+   * it. */                                                             \
+  static inline struct type *                                           \
+  name##_HT_REPLACE(struct name *head, struct type *elm)                \
+  {                                                                     \
+    struct type **p, *r;                                                \
+    if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \
+      name##_HT_GROW(head, head->hth_n_entries+1);                      \
+    HT_SET_HASH_(elm, field, hashfn);                                   \
+    p = name##_HT_FIND_P_(head, elm);					\
+    r = *p;                                                             \
+    *p = elm;                                                           \
+    if (r && (r!=elm)) {                                                \
+      elm->field.hte_next = r->field.hte_next;                          \
+      r->field.hte_next = NULL;                                         \
+      return r;                                                         \
+    } else {                                                            \
+      ++head->hth_n_entries;                                            \
+      return NULL;                                                      \
+    }                                                                   \
+  }                                                                     \
+  /* Remove any element matching 'elm' from the table 'head'.  If such  \
+   * an element is found, return it; otherwise return NULL. */          \
+  static inline struct type *                                           \
+  name##_HT_REMOVE(struct name *head, struct type *elm)                 \
+  {                                                                     \
+    struct type **p, *r;                                                \
+    HT_SET_HASH_(elm, field, hashfn);                                   \
+    p = name##_HT_FIND_P_(head,elm);					\
+    if (!p || !*p)                                                      \
+      return NULL;                                                      \
+    r = *p;                                                             \
+    *p = r->field.hte_next;                                             \
+    r->field.hte_next = NULL;                                           \
+    --head->hth_n_entries;                                              \
+    return r;                                                           \
+  }                                                                     \
+  /* Invoke the function 'fn' on every element of the table 'head',     \
+   * using 'data' as its second argument.  If the function returns      \
+   * nonzero, remove the most recently examined element before invoking \
+   * the function again. */                                             \
+  static inline void                                                    \
+  name##_HT_FOREACH_FN(struct name *head,                               \
+                       int (*fn)(struct type *, void *),                \
+                       void *data)                                      \
+  {                                                                     \
+    unsigned idx;                                                       \
+    struct type **p, **nextp, *next;                                    \
+    if (!head->hth_table)                                               \
+      return;                                                           \
+    for (idx=0; idx < head->hth_table_length; ++idx) {                  \
+      p = &head->hth_table[idx];                                        \
+      while (*p) {                                                      \
+        nextp = &(*p)->field.hte_next;                                  \
+        next = *nextp;                                                  \
+        if (fn(*p, data)) {                                             \
+          --head->hth_n_entries;                                        \
+          *p = next;                                                    \
+        } else {                                                        \
+          p = nextp;                                                    \
+        }                                                               \
+      }                                                                 \
+    }                                                                   \
+  }                                                                     \
+  /* Return a pointer to the first element in the table 'head', under   \
+   * an arbitrary order.  This order is stable under remove operations, \
+   * but not under others. If the table is empty, return NULL. */       \
+  static inline struct type **                                          \
+  name##_HT_START(struct name *head)                                    \
+  {                                                                     \
+    unsigned b = 0;                                                     \
+    while (b < head->hth_table_length) {                                \
+      if (head->hth_table[b])                                           \
+        return &head->hth_table[b];                                     \
+      ++b;                                                              \
+    }                                                                   \
+    return NULL;                                                        \
+  }                                                                     \
+  /* Return the next element in 'head' after 'elm', under the arbitrary \
+   * order used by HT_START.  If there are no more elements, return     \
+   * NULL.  If 'elm' is to be removed from the table, you must call     \
+   * this function for the next value before you remove it.             \
+   */                                                                   \
+  static inline struct type **                                          \
+  name##_HT_NEXT(struct name *head, struct type **elm)                  \
+  {                                                                     \
+    if ((*elm)->field.hte_next) {                                       \
+      return &(*elm)->field.hte_next;                                   \
+    } else {                                                            \
+      unsigned b = (HT_ELT_HASH_(*elm, field, hashfn) % head->hth_table_length)+1; \
+      while (b < head->hth_table_length) {                              \
+        if (head->hth_table[b])                                         \
+          return &head->hth_table[b];                                   \
+        ++b;                                                            \
+      }                                                                 \
+      return NULL;                                                      \
+    }                                                                   \
+  }                                                                     \
+  static inline struct type **                                          \
+  name##_HT_NEXT_RMV(struct name *head, struct type **elm)              \
+  {                                                                     \
+    unsigned h = HT_ELT_HASH_(*elm, field, hashfn);		        \
+    *elm = (*elm)->field.hte_next;                                      \
+    --head->hth_n_entries;                                              \
+    if (*elm) {                                                         \
+      return elm;                                                       \
+    } else {                                                            \
+      unsigned b = (h % head->hth_table_length)+1;                      \
+      while (b < head->hth_table_length) {                              \
+        if (head->hth_table[b])                                         \
+          return &head->hth_table[b];                                   \
+        ++b;                                                            \
+      }                                                                 \
+      return NULL;                                                      \
+    }                                                                   \
+  }
+
+#define HT_GENERATE(name, type, field, hashfn, eqfn, load, mallocfn,    \
+                    reallocfn, freefn)                                  \
+  static unsigned name##_PRIMES[] = {                                   \
+    53, 97, 193, 389,                                                   \
+    769, 1543, 3079, 6151,                                              \
+    12289, 24593, 49157, 98317,                                         \
+    196613, 393241, 786433, 1572869,                                    \
+    3145739, 6291469, 12582917, 25165843,                               \
+    50331653, 100663319, 201326611, 402653189,                          \
+    805306457, 1610612741                                               \
+  };                                                                    \
+  static unsigned name##_N_PRIMES =                                     \
+    (unsigned)(sizeof(name##_PRIMES)/sizeof(name##_PRIMES[0]));         \
+  /* Expand the internal table of 'head' until it is large enough to    \
+   * hold 'size' elements.  Return 0 on success, -1 on allocation       \
+   * failure. */                                                        \
+  int                                                                   \
+  name##_HT_GROW(struct name *head, unsigned size)                      \
+  {                                                                     \
+    unsigned new_len, new_load_limit;                                   \
+    int prime_idx;                                                      \
+    struct type **new_table;                                            \
+    if (head->hth_prime_idx == (int)name##_N_PRIMES - 1)                \
+      return 0;                                                         \
+    if (head->hth_load_limit > size)                                    \
+      return 0;                                                         \
+    prime_idx = head->hth_prime_idx;                                    \
+    do {                                                                \
+      new_len = name##_PRIMES[++prime_idx];                             \
+      new_load_limit = (unsigned)(load*new_len);                        \
+    } while (new_load_limit <= size &&                                  \
+             prime_idx < (int)name##_N_PRIMES);                         \
+    if ((new_table = mallocfn(new_len*sizeof(struct type*)))) {         \
+      unsigned b;                                                       \
+      memset(new_table, 0, new_len*sizeof(struct type*));               \
+      for (b = 0; b < head->hth_table_length; ++b) {                    \
+        struct type *elm, *next;                                        \
+        unsigned b2;                                                    \
+        elm = head->hth_table[b];                                       \
+        while (elm) {                                                   \
+          next = elm->field.hte_next;                                   \
+          b2 = HT_ELT_HASH_(elm, field, hashfn) % new_len;              \
+          elm->field.hte_next = new_table[b2];                          \
+          new_table[b2] = elm;                                          \
+          elm = next;                                                   \
+        }                                                               \
+      }                                                                 \
+      if (head->hth_table)                                              \
+        freefn(head->hth_table);                                        \
+      head->hth_table = new_table;                                      \
+    } else {                                                            \
+      unsigned b, b2;                                                   \
+      new_table = reallocfn(head->hth_table, new_len*sizeof(struct type*)); \
+      if (!new_table) return -1;                                        \
+      memset(new_table + head->hth_table_length, 0,                     \
+             (new_len - head->hth_table_length)*sizeof(struct type*));  \
+      for (b=0; b < head->hth_table_length; ++b) {                      \
+        struct type *e, **pE;                                           \
+        for (pE = &new_table[b], e = *pE; e != NULL; e = *pE) {         \
+          b2 = HT_ELT_HASH_(e, field, hashfn) % new_len;                \
+          if (b2 == b) {                                                \
+            pE = &e->field.hte_next;                                    \
+          } else {                                                      \
+            *pE = e->field.hte_next;                                    \
+            e->field.hte_next = new_table[b2];                          \
+            new_table[b2] = e;                                          \
+          }                                                             \
+        }                                                               \
+      }                                                                 \
+      head->hth_table = new_table;                                      \
+    }                                                                   \
+    head->hth_table_length = new_len;                                   \
+    head->hth_prime_idx = prime_idx;                                    \
+    head->hth_load_limit = new_load_limit;                              \
+    return 0;                                                           \
+  }                                                                     \
+  /* Free all storage held by 'head'.  Does not free 'head' itself, or  \
+   * individual elements. */                                            \
+  void                                                                  \
+  name##_HT_CLEAR(struct name *head)                                    \
+  {                                                                     \
+    if (head->hth_table)                                                \
+      freefn(head->hth_table);                                          \
+    name##_HT_INIT(head);                                               \
+  }                                                                     \
+  /* Debugging helper: return false iff the representation of 'head' is \
+   * internally consistent. */                                          \
+  int                                                                   \
+  name##_HT_REP_IS_BAD_(const struct name *head)			\
+  {                                                                     \
+    unsigned n, i;                                                      \
+    struct type *elm;                                                   \
+    if (!head->hth_table_length) {                                      \
+      if (!head->hth_table && !head->hth_n_entries &&                   \
+          !head->hth_load_limit && head->hth_prime_idx == -1)           \
+        return 0;                                                       \
+      else                                                              \
+        return 1;                                                       \
+    }                                                                   \
+    if (!head->hth_table || head->hth_prime_idx < 0 ||                  \
+        !head->hth_load_limit)                                          \
+      return 2;                                                         \
+    if (head->hth_n_entries > head->hth_load_limit)                     \
+      return 3;                                                         \
+    if (head->hth_table_length != name##_PRIMES[head->hth_prime_idx])   \
+      return 4;                                                         \
+    if (head->hth_load_limit != (unsigned)(load*head->hth_table_length)) \
+      return 5;                                                         \
+    for (n = i = 0; i < head->hth_table_length; ++i) {                  \
+      for (elm = head->hth_table[i]; elm; elm = elm->field.hte_next) {  \
+        if (HT_ELT_HASH_(elm, field, hashfn) != hashfn(elm))	        \
+          return 1000 + i;                                              \
+        if ((HT_ELT_HASH_(elm, field, hashfn) % head->hth_table_length) != i) \
+          return 10000 + i;                                             \
+        ++n;                                                            \
+      }                                                                 \
+    }                                                                   \
+    if (n != head->hth_n_entries)                                       \
+      return 6;                                                         \
+    return 0;                                                           \
+  }
+
+/** Implements an over-optimized "find and insert if absent" block;
+ * not meant for direct usage by typical code, or usage outside the critical
+ * path.*/
+#define HT_FIND_OR_INSERT_(name, field, hashfn, head, eltype, elm, var, y, n) \
+  {                                                                     \
+    struct name *var##_head_ = head;                                    \
+    struct eltype **var;                                                \
+    if (!var##_head_->hth_table ||                                      \
+        var##_head_->hth_n_entries >= var##_head_->hth_load_limit)      \
+      name##_HT_GROW(var##_head_, var##_head_->hth_n_entries+1);        \
+    HT_SET_HASH_((elm), field, hashfn);                                 \
+    var = name##_HT_FIND_P_(var##_head_, (elm));                        \
+    if (*var) {                                                         \
+      y;                                                                \
+    } else {                                                            \
+      n;                                                                \
+    }                                                                   \
+  }
+#define HT_FOI_INSERT_(field, head, elm, newent, var)       \
+  {                                                         \
+    HT_SET_HASHVAL_(newent, field, (elm)->field.hte_hash);  \
+    newent->field.hte_next = NULL;                          \
+    *var = newent;                                          \
+    ++((head)->hth_n_entries);                              \
+  }
+
+/*
+ * Copyright 2005, Nick Mathewson.  Implementation logic is adapted from code
+ * by Christopher Clark, retrofit to allow drop-in memory management, and to
+ * use the same interface as Niels Provos's tree.h.  This is probably still
+ * a derived work, so the original license below still applies.
+ *
+ * Copyright (c) 2002, Christopher Clark
+ * 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 name of the original author; nor the names of any 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.
+*/
+
+#endif
+
diff --git a/extra/libevent/libevent-2.1.11-stable/http-internal.h b/extra/libevent/libevent-2.1.11-stable/http-internal.h
new file mode 100644
index 000000000000..feaf436d7421
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/http-internal.h
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2001-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * This header file contains definitions for dealing with HTTP requests
+ * that are internal to libevent.  As user of the library, you should not
+ * need to know about these.
+ */
+
+#ifndef HTTP_INTERNAL_H_INCLUDED_
+#define HTTP_INTERNAL_H_INCLUDED_
+
+#include "event2/event_struct.h"
+#include "util-internal.h"
+#include "defer-internal.h"
+
+#define HTTP_CONNECT_TIMEOUT	45
+#define HTTP_WRITE_TIMEOUT	50
+#define HTTP_READ_TIMEOUT	50
+
+enum message_read_status {
+	ALL_DATA_READ = 1,
+	MORE_DATA_EXPECTED = 0,
+	DATA_CORRUPTED = -1,
+	REQUEST_CANCELED = -2,
+	DATA_TOO_LONG = -3
+};
+
+struct evbuffer;
+struct addrinfo;
+struct evhttp_request;
+
+/* Indicates an unknown request method. */
+#define EVHTTP_REQ_UNKNOWN_ (1<<15)
+
+enum evhttp_connection_state {
+	EVCON_DISCONNECTED,	/**< not currently connected not trying either*/
+	EVCON_CONNECTING,	/**< tries to currently connect */
+	EVCON_IDLE,		/**< connection is established */
+	EVCON_READING_FIRSTLINE,/**< reading Request-Line (incoming conn) or
+				 **< Status-Line (outgoing conn) */
+	EVCON_READING_HEADERS,	/**< reading request/response headers */
+	EVCON_READING_BODY,	/**< reading request/response body */
+	EVCON_READING_TRAILER,	/**< reading request/response chunked trailer */
+	EVCON_WRITING		/**< writing request/response headers/body */
+};
+
+struct event_base;
+
+/* A client or server connection. */
+struct evhttp_connection {
+	/* we use this tailq only if this connection was created for an http
+	 * server */
+	TAILQ_ENTRY(evhttp_connection) next;
+
+	evutil_socket_t fd;
+	struct bufferevent *bufev;
+
+	struct event retry_ev;		/* for retrying connects */
+
+	char *bind_address;		/* address to use for binding the src */
+	ev_uint16_t bind_port;		/* local port for binding the src */
+
+	char *address;			/* address to connect to */
+	ev_uint16_t port;
+
+	size_t max_headers_size;
+	ev_uint64_t max_body_size;
+
+	int flags;
+#define EVHTTP_CON_INCOMING	0x0001       /* only one request on it ever */
+#define EVHTTP_CON_OUTGOING	0x0002       /* multiple requests possible */
+#define EVHTTP_CON_CLOSEDETECT	0x0004   /* detecting if persistent close */
+/* set when we want to auto free the connection */
+#define EVHTTP_CON_AUTOFREE	EVHTTP_CON_PUBLIC_FLAGS_END
+/* Installed when attempt to read HTTP error after write failed, see
+ * EVHTTP_CON_READ_ON_WRITE_ERROR */
+#define EVHTTP_CON_READING_ERROR	(EVHTTP_CON_AUTOFREE << 1)
+
+	struct timeval timeout;		/* timeout for events */
+	int retry_cnt;			/* retry count */
+	int retry_max;			/* maximum number of retries */
+	struct timeval initial_retry_timeout; /* Timeout for low long to wait
+					       * after first failing attempt
+					       * before retry */
+
+	enum evhttp_connection_state state;
+
+	/* for server connections, the http server they are connected with */
+	struct evhttp *http_server;
+
+	TAILQ_HEAD(evcon_requestq, evhttp_request) requests;
+
+	void (*cb)(struct evhttp_connection *, void *);
+	void *cb_arg;
+
+	void (*closecb)(struct evhttp_connection *, void *);
+	void *closecb_arg;
+
+	struct event_callback read_more_deferred_cb;
+
+	struct event_base *base;
+	struct evdns_base *dns_base;
+	int ai_family;
+};
+
+/* A callback for an http server */
+struct evhttp_cb {
+	TAILQ_ENTRY(evhttp_cb) next;
+
+	char *what;
+
+	void (*cb)(struct evhttp_request *req, void *);
+	void *cbarg;
+};
+
+/* both the http server as well as the rpc system need to queue connections */
+TAILQ_HEAD(evconq, evhttp_connection);
+
+/* each bound socket is stored in one of these */
+struct evhttp_bound_socket {
+	TAILQ_ENTRY(evhttp_bound_socket) next;
+
+	struct evconnlistener *listener;
+};
+
+/* server alias list item. */
+struct evhttp_server_alias {
+	TAILQ_ENTRY(evhttp_server_alias) next;
+
+	char *alias; /* the server alias. */
+};
+
+struct evhttp {
+	/* Next vhost, if this is a vhost. */
+	TAILQ_ENTRY(evhttp) next_vhost;
+
+	/* All listeners for this host */
+	TAILQ_HEAD(boundq, evhttp_bound_socket) sockets;
+
+	TAILQ_HEAD(httpcbq, evhttp_cb) callbacks;
+
+	/* All live connections on this host. */
+	struct evconq connections;
+
+	TAILQ_HEAD(vhostsq, evhttp) virtualhosts;
+
+	TAILQ_HEAD(aliasq, evhttp_server_alias) aliases;
+
+	/* NULL if this server is not a vhost */
+	char *vhost_pattern;
+
+	struct timeval timeout;
+
+	size_t default_max_headers_size;
+	ev_uint64_t default_max_body_size;
+	int flags;
+	const char *default_content_type;
+
+	/* Bitmask of all HTTP methods that we accept and pass to user
+	 * callbacks. */
+	ev_uint16_t allowed_methods;
+
+	/* Fallback callback if all the other callbacks for this connection
+	   don't match. */
+	void (*gencb)(struct evhttp_request *req, void *);
+	void *gencbarg;
+	struct bufferevent* (*bevcb)(struct event_base *, void *);
+	void *bevcbarg;
+
+	struct event_base *base;
+};
+
+/* XXX most of these functions could be static. */
+
+/* resets the connection; can be reused for more requests */
+void evhttp_connection_reset_(struct evhttp_connection *);
+
+/* connects if necessary */
+int evhttp_connection_connect_(struct evhttp_connection *);
+
+enum evhttp_request_error;
+/* notifies the current request that it failed; resets connection */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_fail_(struct evhttp_connection *,
+    enum evhttp_request_error error);
+
+enum message_read_status;
+
+EVENT2_EXPORT_SYMBOL
+enum message_read_status evhttp_parse_firstline_(struct evhttp_request *, struct evbuffer*);
+EVENT2_EXPORT_SYMBOL
+enum message_read_status evhttp_parse_headers_(struct evhttp_request *, struct evbuffer*);
+
+void evhttp_start_read_(struct evhttp_connection *);
+void evhttp_start_write_(struct evhttp_connection *);
+
+/* response sending HTML the data in the buffer */
+void evhttp_response_code_(struct evhttp_request *, int, const char *);
+void evhttp_send_page_(struct evhttp_request *, struct evbuffer *);
+
+EVENT2_EXPORT_SYMBOL
+int evhttp_decode_uri_internal(const char *uri, size_t length,
+    char *ret, int decode_plus);
+
+#endif /* HTTP_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/http.c b/extra/libevent/libevent-2.1.11-stable/http.c
new file mode 100644
index 000000000000..5331602a7a7d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/http.c
@@ -0,0 +1,5117 @@
+/*
+ * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_IOCCOM_H
+#include <sys/ioccom.h>
+#endif
+#ifdef EVENT__HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef EVENT__HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifndef _WIN32
+#include <sys/socket.h>
+#include <sys/stat.h>
+#else /* _WIN32 */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif /* _WIN32 */
+
+#ifdef EVENT__HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef EVENT__HAVE_AFUNIX_H
+#include <afunix.h>
+#endif
+
+#include <sys/queue.h>
+
+#ifdef EVENT__HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef EVENT__HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef EVENT__HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef _WIN32
+#include <syslog.h>
+#endif /* !_WIN32 */
+#include <signal.h>
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#undef timeout_pending
+#undef timeout_initialized
+
+#include "strlcpy-internal.h"
+#include "event2/http.h"
+#include "event2/event.h"
+#include "event2/buffer.h"
+#include "event2/bufferevent.h"
+#include "event2/http_struct.h"
+#include "event2/http_compat.h"
+#include "event2/util.h"
+#include "event2/listener.h"
+#include "log-internal.h"
+#include "util-internal.h"
+#include "http-internal.h"
+#include "mm-internal.h"
+#include "bufferevent-internal.h"
+
+#ifndef EVENT__HAVE_GETNAMEINFO
+#define NI_MAXSERV 32
+#define NI_MAXHOST 1025
+
+#ifndef NI_NUMERICHOST
+#define NI_NUMERICHOST 1
+#endif
+
+#ifndef NI_NUMERICSERV
+#define NI_NUMERICSERV 2
+#endif
+
+static int
+fake_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
+	size_t hostlen, char *serv, size_t servlen, int flags)
+{
+	struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+
+	if (serv != NULL) {
+		char tmpserv[16];
+		evutil_snprintf(tmpserv, sizeof(tmpserv),
+		    "%d", ntohs(sin->sin_port));
+		if (strlcpy(serv, tmpserv, servlen) >= servlen)
+			return (-1);
+	}
+
+	if (host != NULL) {
+		if (flags & NI_NUMERICHOST) {
+			if (strlcpy(host, inet_ntoa(sin->sin_addr),
+			    hostlen) >= hostlen)
+				return (-1);
+			else
+				return (0);
+		} else {
+			struct hostent *hp;
+			hp = gethostbyaddr((char *)&sin->sin_addr,
+			    sizeof(struct in_addr), AF_INET);
+			if (hp == NULL)
+				return (-2);
+
+			if (strlcpy(host, hp->h_name, hostlen) >= hostlen)
+				return (-1);
+			else
+				return (0);
+		}
+	}
+	return (0);
+}
+
+#endif
+
+#define REQ_VERSION_BEFORE(req, major_v, minor_v)			\
+	((req)->major < (major_v) ||					\
+	    ((req)->major == (major_v) && (req)->minor < (minor_v)))
+
+#define REQ_VERSION_ATLEAST(req, major_v, minor_v)			\
+	((req)->major > (major_v) ||					\
+	    ((req)->major == (major_v) && (req)->minor >= (minor_v)))
+
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+extern int debug;
+
+static evutil_socket_t bind_socket_ai(struct evutil_addrinfo *, int reuse);
+static evutil_socket_t bind_socket(const char *, ev_uint16_t, int reuse);
+static void name_from_addr(struct sockaddr *, ev_socklen_t, char **, char **);
+static struct evhttp_uri *evhttp_uri_parse_authority(char *source_uri);
+static int evhttp_associate_new_request_with_connection(
+	struct evhttp_connection *evcon);
+static void evhttp_connection_start_detectclose(
+	struct evhttp_connection *evcon);
+static void evhttp_connection_stop_detectclose(
+	struct evhttp_connection *evcon);
+static void evhttp_request_dispatch(struct evhttp_connection* evcon);
+static void evhttp_read_firstline(struct evhttp_connection *evcon,
+				  struct evhttp_request *req);
+static void evhttp_read_header(struct evhttp_connection *evcon,
+    struct evhttp_request *req);
+static int evhttp_add_header_internal(struct evkeyvalq *headers,
+    const char *key, const char *value);
+static const char *evhttp_response_phrase_internal(int code);
+static void evhttp_get_request(struct evhttp *, evutil_socket_t, struct sockaddr *, ev_socklen_t);
+static void evhttp_write_buffer(struct evhttp_connection *,
+    void (*)(struct evhttp_connection *, void *), void *);
+static void evhttp_make_header(struct evhttp_connection *, struct evhttp_request *);
+
+/* callbacks for bufferevent */
+static void evhttp_read_cb(struct bufferevent *, void *);
+static void evhttp_write_cb(struct bufferevent *, void *);
+static void evhttp_error_cb(struct bufferevent *bufev, short what, void *arg);
+static int evhttp_find_vhost(struct evhttp *http, struct evhttp **outhttp,
+		  const char *hostname);
+
+#ifndef EVENT__HAVE_STRSEP
+/* strsep replacement for platforms that lack it.  Only works if
+ * del is one character long. */
+static char *
+strsep(char **s, const char *del)
+{
+	char *d, *tok;
+	EVUTIL_ASSERT(strlen(del) == 1);
+	if (!s || !*s)
+		return NULL;
+	tok = *s;
+	d = strstr(tok, del);
+	if (d) {
+		*d = '\0';
+		*s = d + 1;
+	} else
+		*s = NULL;
+	return tok;
+}
+#endif
+
+static size_t
+html_replace(const char ch, const char **escaped)
+{
+	switch (ch) {
+	case '<':
+		*escaped = "&lt;";
+		return 4;
+	case '>':
+		*escaped = "&gt;";
+		return 4;
+	case '"':
+		*escaped = "&quot;";
+		return 6;
+	case '\'':
+		*escaped = "&#039;";
+		return 6;
+	case '&':
+		*escaped = "&amp;";
+		return 5;
+	default:
+		break;
+	}
+
+	return 1;
+}
+
+/*
+ * Replaces <, >, ", ' and & with &lt;, &gt;, &quot;,
+ * &#039; and &amp; correspondingly.
+ *
+ * The returned string needs to be freed by the caller.
+ */
+
+char *
+evhttp_htmlescape(const char *html)
+{
+	size_t i;
+	size_t new_size = 0, old_size = 0;
+	char *escaped_html, *p;
+
+	if (html == NULL)
+		return (NULL);
+
+	old_size = strlen(html);
+	for (i = 0; i < old_size; ++i) {
+		const char *replaced = NULL;
+		const size_t replace_size = html_replace(html[i], &replaced);
+		if (replace_size > EV_SIZE_MAX - new_size) {
+			event_warn("%s: html_replace overflow", __func__);
+			return (NULL);
+		}
+		new_size += replace_size;
+	}
+
+	if (new_size == EV_SIZE_MAX)
+		return (NULL);
+	p = escaped_html = mm_malloc(new_size + 1);
+	if (escaped_html == NULL) {
+		event_warn("%s: malloc(%lu)", __func__,
+		           (unsigned long)(new_size + 1));
+		return (NULL);
+	}
+	for (i = 0; i < old_size; ++i) {
+		const char *replaced = &html[i];
+		const size_t len = html_replace(html[i], &replaced);
+		memcpy(p, replaced, len);
+		p += len;
+	}
+
+	*p = '\0';
+
+	return (escaped_html);
+}
+
+/** Given an evhttp_cmd_type, returns a constant string containing the
+ * equivalent HTTP command, or NULL if the evhttp_command_type is
+ * unrecognized. */
+static const char *
+evhttp_method(enum evhttp_cmd_type type)
+{
+	const char *method;
+
+	switch (type) {
+	case EVHTTP_REQ_GET:
+		method = "GET";
+		break;
+	case EVHTTP_REQ_POST:
+		method = "POST";
+		break;
+	case EVHTTP_REQ_HEAD:
+		method = "HEAD";
+		break;
+	case EVHTTP_REQ_PUT:
+		method = "PUT";
+		break;
+	case EVHTTP_REQ_DELETE:
+		method = "DELETE";
+		break;
+	case EVHTTP_REQ_OPTIONS:
+		method = "OPTIONS";
+		break;
+	case EVHTTP_REQ_TRACE:
+		method = "TRACE";
+		break;
+	case EVHTTP_REQ_CONNECT:
+		method = "CONNECT";
+		break;
+	case EVHTTP_REQ_PATCH:
+		method = "PATCH";
+		break;
+	default:
+		method = NULL;
+		break;
+	}
+
+	return (method);
+}
+
+/**
+ * Determines if a response should have a body.
+ * Follows the rules in RFC 2616 section 4.3.
+ * @return 1 if the response MUST have a body; 0 if the response MUST NOT have
+ *     a body.
+ */
+static int
+evhttp_response_needs_body(struct evhttp_request *req)
+{
+	return (req->response_code != HTTP_NOCONTENT &&
+		req->response_code != HTTP_NOTMODIFIED &&
+		(req->response_code < 100 || req->response_code >= 200) &&
+		req->type != EVHTTP_REQ_HEAD);
+}
+
+/** Helper: called after we've added some data to an evcon's bufferevent's
+ * output buffer.  Sets the evconn's writing-is-done callback, and puts
+ * the bufferevent into writing mode.
+ */
+static void
+evhttp_write_buffer(struct evhttp_connection *evcon,
+    void (*cb)(struct evhttp_connection *, void *), void *arg)
+{
+	event_debug(("%s: preparing to write buffer\n", __func__));
+
+	/* Set call back */
+	evcon->cb = cb;
+	evcon->cb_arg = arg;
+
+	/* Disable the read callback: we don't actually care about data;
+	 * we only care about close detection. (We don't disable reading --
+	 * EV_READ, since we *do* want to learn about any close events.) */
+	bufferevent_setcb(evcon->bufev,
+	    NULL, /*read*/
+	    evhttp_write_cb,
+	    evhttp_error_cb,
+	    evcon);
+
+	bufferevent_enable(evcon->bufev, EV_READ|EV_WRITE);
+}
+
+static void
+evhttp_send_continue_done(struct evhttp_connection *evcon, void *arg)
+{
+	bufferevent_disable(evcon->bufev, EV_WRITE);
+}
+
+static void
+evhttp_send_continue(struct evhttp_connection *evcon,
+			struct evhttp_request *req)
+{
+	bufferevent_enable(evcon->bufev, EV_WRITE);
+	evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
+			"HTTP/%d.%d 100 Continue\r\n\r\n",
+			req->major, req->minor);
+	evcon->cb = evhttp_send_continue_done;
+	evcon->cb_arg = NULL;
+	bufferevent_setcb(evcon->bufev,
+	    evhttp_read_cb,
+	    evhttp_write_cb,
+	    evhttp_error_cb,
+	    evcon);
+}
+
+/** Helper: returns true iff evconn is in any connected state. */
+static int
+evhttp_connected(struct evhttp_connection *evcon)
+{
+	switch (evcon->state) {
+	case EVCON_DISCONNECTED:
+	case EVCON_CONNECTING:
+		return (0);
+	case EVCON_IDLE:
+	case EVCON_READING_FIRSTLINE:
+	case EVCON_READING_HEADERS:
+	case EVCON_READING_BODY:
+	case EVCON_READING_TRAILER:
+	case EVCON_WRITING:
+	default:
+		return (1);
+	}
+}
+
+/* Create the headers needed for an outgoing HTTP request, adds them to
+ * the request's header list, and writes the request line to the
+ * connection's output buffer.
+ */
+static void
+evhttp_make_header_request(struct evhttp_connection *evcon,
+    struct evhttp_request *req)
+{
+	const char *method;
+
+	evhttp_remove_header(req->output_headers, "Proxy-Connection");
+
+	/* Generate request line */
+	if (!(method = evhttp_method(req->type))) {
+		method = "NULL";
+	}
+
+	evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
+	    "%s %s HTTP/%d.%d\r\n",
+	    method, req->uri, req->major, req->minor);
+
+	/* Add the content length on a post or put request if missing */
+	if ((req->type == EVHTTP_REQ_POST || req->type == EVHTTP_REQ_PUT) &&
+	    evhttp_find_header(req->output_headers, "Content-Length") == NULL){
+		char size[22];
+		evutil_snprintf(size, sizeof(size), EV_SIZE_FMT,
+		    EV_SIZE_ARG(evbuffer_get_length(req->output_buffer)));
+		evhttp_add_header(req->output_headers, "Content-Length", size);
+	}
+}
+
+/** Return true if the list of headers in 'headers', intepreted with respect
+ * to flags, means that we should send a "connection: close" when the request
+ * is done. */
+static int
+evhttp_is_connection_close(int flags, struct evkeyvalq* headers)
+{
+	if (flags & EVHTTP_PROXY_REQUEST) {
+		/* proxy connection */
+		const char *connection = evhttp_find_header(headers, "Proxy-Connection");
+		return (connection == NULL || evutil_ascii_strcasecmp(connection, "keep-alive") != 0);
+	} else {
+		const char *connection = evhttp_find_header(headers, "Connection");
+		return (connection != NULL && evutil_ascii_strcasecmp(connection, "close") == 0);
+	}
+}
+static int
+evhttp_is_request_connection_close(struct evhttp_request *req)
+{
+	return
+		evhttp_is_connection_close(req->flags, req->input_headers) ||
+		evhttp_is_connection_close(req->flags, req->output_headers);
+}
+
+/* Return true iff 'headers' contains 'Connection: keep-alive' */
+static int
+evhttp_is_connection_keepalive(struct evkeyvalq* headers)
+{
+	const char *connection = evhttp_find_header(headers, "Connection");
+	return (connection != NULL
+	    && evutil_ascii_strncasecmp(connection, "keep-alive", 10) == 0);
+}
+
+/* Add a correct "Date" header to headers, unless it already has one. */
+static void
+evhttp_maybe_add_date_header(struct evkeyvalq *headers)
+{
+	if (evhttp_find_header(headers, "Date") == NULL) {
+		char date[50];
+		if (sizeof(date) - evutil_date_rfc1123(date, sizeof(date), NULL) > 0) {
+			evhttp_add_header(headers, "Date", date);
+		}
+	}
+}
+
+/* Add a "Content-Length" header with value 'content_length' to headers,
+ * unless it already has a content-length or transfer-encoding header. */
+static void
+evhttp_maybe_add_content_length_header(struct evkeyvalq *headers,
+    size_t content_length)
+{
+	if (evhttp_find_header(headers, "Transfer-Encoding") == NULL &&
+	    evhttp_find_header(headers,	"Content-Length") == NULL) {
+		char len[22];
+		evutil_snprintf(len, sizeof(len), EV_SIZE_FMT,
+		    EV_SIZE_ARG(content_length));
+		evhttp_add_header(headers, "Content-Length", len);
+	}
+}
+
+/*
+ * Create the headers needed for an HTTP reply in req->output_headers,
+ * and write the first HTTP response for req line to evcon.
+ */
+static void
+evhttp_make_header_response(struct evhttp_connection *evcon,
+    struct evhttp_request *req)
+{
+	int is_keepalive = evhttp_is_connection_keepalive(req->input_headers);
+	evbuffer_add_printf(bufferevent_get_output(evcon->bufev),
+	    "HTTP/%d.%d %d %s\r\n",
+	    req->major, req->minor, req->response_code,
+	    req->response_code_line);
+
+	if (req->major == 1) {
+		if (req->minor >= 1)
+			evhttp_maybe_add_date_header(req->output_headers);
+
+		/*
+		 * if the protocol is 1.0; and the connection was keep-alive
+		 * we need to add a keep-alive header, too.
+		 */
+		if (req->minor == 0 && is_keepalive)
+			evhttp_add_header(req->output_headers,
+			    "Connection", "keep-alive");
+
+		if ((req->minor >= 1 || is_keepalive) &&
+		    evhttp_response_needs_body(req)) {
+			/*
+			 * we need to add the content length if the
+			 * user did not give it, this is required for
+			 * persistent connections to work.
+			 */
+			evhttp_maybe_add_content_length_header(
+				req->output_headers,
+				evbuffer_get_length(req->output_buffer));
+		}
+	}
+
+	/* Potentially add headers for unidentified content. */
+	if (evhttp_response_needs_body(req)) {
+		if (evhttp_find_header(req->output_headers,
+			"Content-Type") == NULL
+		    && evcon->http_server->default_content_type) {
+			evhttp_add_header(req->output_headers,
+			    "Content-Type",
+			    evcon->http_server->default_content_type);
+		}
+	}
+
+	/* if the request asked for a close, we send a close, too */
+	if (evhttp_is_connection_close(req->flags, req->input_headers)) {
+		evhttp_remove_header(req->output_headers, "Connection");
+		if (!(req->flags & EVHTTP_PROXY_REQUEST))
+		    evhttp_add_header(req->output_headers, "Connection", "close");
+		evhttp_remove_header(req->output_headers, "Proxy-Connection");
+	}
+}
+
+enum expect { NO, CONTINUE, OTHER };
+static enum expect evhttp_have_expect(struct evhttp_request *req, int input)
+{
+	const char *expect;
+	struct evkeyvalq *h = input ? req->input_headers : req->output_headers;
+
+	if (!(req->kind == EVHTTP_REQUEST) || !REQ_VERSION_ATLEAST(req, 1, 1))
+		return NO;
+
+	expect = evhttp_find_header(h, "Expect");
+	if (!expect)
+		return NO;
+
+	return !evutil_ascii_strcasecmp(expect, "100-continue") ? CONTINUE : OTHER;
+}
+
+
+/** Generate all headers appropriate for sending the http request in req (or
+ * the response, if we're sending a response), and write them to evcon's
+ * bufferevent. Also writes all data from req->output_buffer */
+static void
+evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req)
+{
+	struct evkeyval *header;
+	struct evbuffer *output = bufferevent_get_output(evcon->bufev);
+
+	/*
+	 * Depending if this is a HTTP request or response, we might need to
+	 * add some new headers or remove existing headers.
+	 */
+	if (req->kind == EVHTTP_REQUEST) {
+		evhttp_make_header_request(evcon, req);
+	} else {
+		evhttp_make_header_response(evcon, req);
+	}
+
+	TAILQ_FOREACH(header, req->output_headers, next) {
+		evbuffer_add_printf(output, "%s: %s\r\n",
+		    header->key, header->value);
+	}
+	evbuffer_add(output, "\r\n", 2);
+
+	if (evhttp_have_expect(req, 0) != CONTINUE &&
+		evbuffer_get_length(req->output_buffer)) {
+		/*
+		 * For a request, we add the POST data, for a reply, this
+		 * is the regular data.
+		 */
+		evbuffer_add_buffer(output, req->output_buffer);
+	}
+}
+
+void
+evhttp_connection_set_max_headers_size(struct evhttp_connection *evcon,
+    ev_ssize_t new_max_headers_size)
+{
+	if (new_max_headers_size<0)
+		evcon->max_headers_size = EV_SIZE_MAX;
+	else
+		evcon->max_headers_size = new_max_headers_size;
+}
+void
+evhttp_connection_set_max_body_size(struct evhttp_connection* evcon,
+    ev_ssize_t new_max_body_size)
+{
+	if (new_max_body_size<0)
+		evcon->max_body_size = EV_UINT64_MAX;
+	else
+		evcon->max_body_size = new_max_body_size;
+}
+
+static int
+evhttp_connection_incoming_fail(struct evhttp_request *req,
+    enum evhttp_request_error error)
+{
+	switch (error) {
+		case EVREQ_HTTP_DATA_TOO_LONG:
+			req->response_code = HTTP_ENTITYTOOLARGE;
+			break;
+		default:
+			req->response_code = HTTP_BADREQUEST;
+	}
+
+	switch (error) {
+	case EVREQ_HTTP_TIMEOUT:
+	case EVREQ_HTTP_EOF:
+		/*
+		 * these are cases in which we probably should just
+		 * close the connection and not send a reply.  this
+		 * case may happen when a browser keeps a persistent
+		 * connection open and we timeout on the read.  when
+		 * the request is still being used for sending, we
+		 * need to disassociated it from the connection here.
+		 */
+		if (!req->userdone) {
+			/* remove it so that it will not be freed */
+			TAILQ_REMOVE(&req->evcon->requests, req, next);
+			/* indicate that this request no longer has a
+			 * connection object
+			 */
+			req->evcon = NULL;
+		}
+		return (-1);
+	case EVREQ_HTTP_INVALID_HEADER:
+	case EVREQ_HTTP_BUFFER_ERROR:
+	case EVREQ_HTTP_REQUEST_CANCEL:
+	case EVREQ_HTTP_DATA_TOO_LONG:
+	default:	/* xxx: probably should just error on default */
+		/* the callback looks at the uri to determine errors */
+		if (req->uri) {
+			mm_free(req->uri);
+			req->uri = NULL;
+		}
+		if (req->uri_elems) {
+			evhttp_uri_free(req->uri_elems);
+			req->uri_elems = NULL;
+		}
+
+		/*
+		 * the callback needs to send a reply, once the reply has
+		 * been send, the connection should get freed.
+		 */
+		(*req->cb)(req, req->cb_arg);
+	}
+
+	return (0);
+}
+
+/* Free connection ownership of which can be acquired by user using
+ * evhttp_request_own(). */
+static inline void
+evhttp_request_free_auto(struct evhttp_request *req)
+{
+	if (!(req->flags & EVHTTP_USER_OWNED))
+		evhttp_request_free(req);
+}
+
+static void
+evhttp_request_free_(struct evhttp_connection *evcon, struct evhttp_request *req)
+{
+	TAILQ_REMOVE(&evcon->requests, req, next);
+	evhttp_request_free_auto(req);
+}
+
+/* Called when evcon has experienced a (non-recoverable? -NM) error, as
+ * given in error. If it's an outgoing connection, reset the connection,
+ * retry any pending requests, and inform the user.  If it's incoming,
+ * delegates to evhttp_connection_incoming_fail(). */
+void
+evhttp_connection_fail_(struct evhttp_connection *evcon,
+    enum evhttp_request_error error)
+{
+	const int errsave = EVUTIL_SOCKET_ERROR();
+	struct evhttp_request* req = TAILQ_FIRST(&evcon->requests);
+	void (*cb)(struct evhttp_request *, void *);
+	void *cb_arg;
+	void (*error_cb)(enum evhttp_request_error, void *);
+	void *error_cb_arg;
+	EVUTIL_ASSERT(req != NULL);
+
+	bufferevent_disable(evcon->bufev, EV_READ|EV_WRITE);
+
+	if (evcon->flags & EVHTTP_CON_INCOMING) {
+		/*
+		 * for incoming requests, there are two different
+		 * failure cases.  it's either a network level error
+		 * or an http layer error. for problems on the network
+		 * layer like timeouts we just drop the connections.
+		 * For HTTP problems, we might have to send back a
+		 * reply before the connection can be freed.
+		 */
+		if (evhttp_connection_incoming_fail(req, error) == -1)
+			evhttp_connection_free(evcon);
+		return;
+	}
+
+	error_cb = req->error_cb;
+	error_cb_arg = req->cb_arg;
+	/* when the request was canceled, the callback is not executed */
+	if (error != EVREQ_HTTP_REQUEST_CANCEL) {
+		/* save the callback for later; the cb might free our object */
+		cb = req->cb;
+		cb_arg = req->cb_arg;
+	} else {
+		cb = NULL;
+		cb_arg = NULL;
+	}
+
+	/* do not fail all requests; the next request is going to get
+	 * send over a new connection.   when a user cancels a request,
+	 * all other pending requests should be processed as normal
+	 */
+	evhttp_request_free_(evcon, req);
+
+	/* reset the connection */
+	evhttp_connection_reset_(evcon);
+
+	/* We are trying the next request that was queued on us */
+	if (TAILQ_FIRST(&evcon->requests) != NULL)
+		evhttp_connection_connect_(evcon);
+
+	/* The call to evhttp_connection_reset_ overwrote errno.
+	 * Let's restore the original errno, so that the user's
+	 * callback can have a better idea of what the error was.
+	 */
+	EVUTIL_SET_SOCKET_ERROR(errsave);
+
+	/* inform the user */
+	if (error_cb != NULL)
+		error_cb(error, error_cb_arg);
+	if (cb != NULL)
+		(*cb)(NULL, cb_arg);
+}
+
+/* Bufferevent callback: invoked when any data has been written from an
+ * http connection's bufferevent */
+static void
+evhttp_write_cb(struct bufferevent *bufev, void *arg)
+{
+	struct evhttp_connection *evcon = arg;
+
+	/* Activate our call back */
+	if (evcon->cb != NULL)
+		(*evcon->cb)(evcon, evcon->cb_arg);
+}
+
+/**
+ * Advance the connection state.
+ * - If this is an outgoing connection, we've just processed the response;
+ *   idle or close the connection.
+ * - If this is an incoming connection, we've just processed the request;
+ *   respond.
+ */
+static void
+evhttp_connection_done(struct evhttp_connection *evcon)
+{
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+	int con_outgoing = evcon->flags & EVHTTP_CON_OUTGOING;
+	int free_evcon = 0;
+
+	if (con_outgoing) {
+		/* idle or close the connection */
+		int need_close = evhttp_is_request_connection_close(req);
+		TAILQ_REMOVE(&evcon->requests, req, next);
+		req->evcon = NULL;
+
+		evcon->state = EVCON_IDLE;
+
+		/* check if we got asked to close the connection */
+		if (need_close)
+			evhttp_connection_reset_(evcon);
+
+		if (TAILQ_FIRST(&evcon->requests) != NULL) {
+			/*
+			 * We have more requests; reset the connection
+			 * and deal with the next request.
+			 */
+			if (!evhttp_connected(evcon))
+				evhttp_connection_connect_(evcon);
+			else
+				evhttp_request_dispatch(evcon);
+		} else if (!need_close) {
+			/*
+			 * The connection is going to be persistent, but we
+			 * need to detect if the other side closes it.
+			 */
+			evhttp_connection_start_detectclose(evcon);
+		} else if ((evcon->flags & EVHTTP_CON_AUTOFREE)) {
+			/*
+			 * If we have no more requests that need completion
+			 * and we're not waiting for the connection to close
+			 */
+			 free_evcon = 1;
+		}
+	} else {
+		/*
+		 * incoming connection - we need to leave the request on the
+		 * connection so that we can reply to it.
+		 */
+		evcon->state = EVCON_WRITING;
+	}
+
+	/* notify the user of the request */
+	(*req->cb)(req, req->cb_arg);
+
+	/* if this was an outgoing request, we own and it's done. so free it. */
+	if (con_outgoing) {
+		evhttp_request_free_auto(req);
+	}
+
+	/* If this was the last request of an outgoing connection and we're
+	 * not waiting to receive a connection close event and we want to
+	 * automatically free the connection. We check to ensure our request
+	 * list is empty one last time just in case our callback added a
+	 * new request.
+	 */
+	if (free_evcon && TAILQ_FIRST(&evcon->requests) == NULL) {
+		evhttp_connection_free(evcon);
+	}
+}
+
+/*
+ * Handles reading from a chunked request.
+ *   return ALL_DATA_READ:
+ *     all data has been read
+ *   return MORE_DATA_EXPECTED:
+ *     more data is expected
+ *   return DATA_CORRUPTED:
+ *     data is corrupted
+ *   return REQUEST_CANCELED:
+ *     request was canceled by the user calling evhttp_cancel_request
+ *   return DATA_TOO_LONG:
+ *     ran over the maximum limit
+ */
+
+static enum message_read_status
+evhttp_handle_chunked_read(struct evhttp_request *req, struct evbuffer *buf)
+{
+	if (req == NULL || buf == NULL) {
+	    return DATA_CORRUPTED;
+	}
+
+	while (1) {
+		size_t buflen;
+
+		if ((buflen = evbuffer_get_length(buf)) == 0) {
+			break;
+		}
+
+		/* evbuffer_get_length returns size_t, but len variable is ssize_t,
+		 * check for overflow conditions */
+		if (buflen > EV_SSIZE_MAX) {
+			return DATA_CORRUPTED;
+		}
+
+		if (req->ntoread < 0) {
+			/* Read chunk size */
+			ev_int64_t ntoread;
+			char *p = evbuffer_readln(buf, NULL, EVBUFFER_EOL_CRLF);
+			char *endp;
+			int error;
+			if (p == NULL)
+				break;
+			/* the last chunk is on a new line? */
+			if (strlen(p) == 0) {
+				mm_free(p);
+				continue;
+			}
+			ntoread = evutil_strtoll(p, &endp, 16);
+			error = (*p == '\0' ||
+			    (*endp != '\0' && *endp != ' ') ||
+			    ntoread < 0);
+			mm_free(p);
+			if (error) {
+				/* could not get chunk size */
+				return (DATA_CORRUPTED);
+			}
+
+			/* ntoread is signed int64, body_size is unsigned size_t, check for under/overflow conditions */
+			if ((ev_uint64_t)ntoread > EV_SIZE_MAX - req->body_size) {
+			    return DATA_CORRUPTED;
+			}
+
+			if (req->body_size + (size_t)ntoread > req->evcon->max_body_size) {
+				/* failed body length test */
+				event_debug(("Request body is too long"));
+				return (DATA_TOO_LONG);
+			}
+
+			req->body_size += (size_t)ntoread;
+			req->ntoread = ntoread;
+			if (req->ntoread == 0) {
+				/* Last chunk */
+				return (ALL_DATA_READ);
+			}
+			continue;
+		}
+
+		/* req->ntoread is signed int64, len is ssize_t, based on arch,
+		 * ssize_t could only be 32b, check for these conditions */
+		if (req->ntoread > EV_SSIZE_MAX) {
+			return DATA_CORRUPTED;
+		}
+
+		/* don't have enough to complete a chunk; wait for more */
+		if (req->ntoread > 0 && buflen < (ev_uint64_t)req->ntoread)
+			return (MORE_DATA_EXPECTED);
+
+		/* Completed chunk */
+		evbuffer_remove_buffer(buf, req->input_buffer, (size_t)req->ntoread);
+		req->ntoread = -1;
+		if (req->chunk_cb != NULL) {
+			req->flags |= EVHTTP_REQ_DEFER_FREE;
+			(*req->chunk_cb)(req, req->cb_arg);
+			evbuffer_drain(req->input_buffer,
+			    evbuffer_get_length(req->input_buffer));
+			req->flags &= ~EVHTTP_REQ_DEFER_FREE;
+			if ((req->flags & EVHTTP_REQ_NEEDS_FREE) != 0) {
+				return (REQUEST_CANCELED);
+			}
+		}
+	}
+
+	return (MORE_DATA_EXPECTED);
+}
+
+static void
+evhttp_read_trailer(struct evhttp_connection *evcon, struct evhttp_request *req)
+{
+	struct evbuffer *buf = bufferevent_get_input(evcon->bufev);
+
+	switch (evhttp_parse_headers_(req, buf)) {
+	case DATA_CORRUPTED:
+	case DATA_TOO_LONG:
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_DATA_TOO_LONG);
+		break;
+	case ALL_DATA_READ:
+		bufferevent_disable(evcon->bufev, EV_READ);
+		evhttp_connection_done(evcon);
+		break;
+	case MORE_DATA_EXPECTED:
+	case REQUEST_CANCELED: /* ??? */
+	default:
+		break;
+	}
+}
+
+static void
+evhttp_lingering_close(struct evhttp_connection *evcon,
+	struct evhttp_request *req)
+{
+	struct evbuffer *buf = bufferevent_get_input(evcon->bufev);
+
+	size_t n = evbuffer_get_length(buf);
+	if (n > (size_t) req->ntoread)
+		n = (size_t) req->ntoread;
+	req->ntoread -= n;
+	req->body_size += n;
+
+	event_debug(("Request body is too long, left " EV_I64_FMT,
+		EV_I64_ARG(req->ntoread)));
+
+	evbuffer_drain(buf, n);
+	if (!req->ntoread)
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_DATA_TOO_LONG);
+}
+static void
+evhttp_lingering_fail(struct evhttp_connection *evcon,
+	struct evhttp_request *req)
+{
+	if (evcon->flags & EVHTTP_CON_LINGERING_CLOSE)
+		evhttp_lingering_close(evcon, req);
+	else
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_DATA_TOO_LONG);
+}
+
+static void
+evhttp_read_body(struct evhttp_connection *evcon, struct evhttp_request *req)
+{
+	struct evbuffer *buf = bufferevent_get_input(evcon->bufev);
+
+	if (req->chunked) {
+		switch (evhttp_handle_chunked_read(req, buf)) {
+		case ALL_DATA_READ:
+			/* finished last chunk */
+			evcon->state = EVCON_READING_TRAILER;
+			evhttp_read_trailer(evcon, req);
+			return;
+		case DATA_CORRUPTED:
+		case DATA_TOO_LONG:
+			/* corrupted data */
+			evhttp_connection_fail_(evcon,
+			    EVREQ_HTTP_DATA_TOO_LONG);
+			return;
+		case REQUEST_CANCELED:
+			/* request canceled */
+			evhttp_request_free_auto(req);
+			return;
+		case MORE_DATA_EXPECTED:
+		default:
+			break;
+		}
+	} else if (req->ntoread < 0) {
+		/* Read until connection close. */
+		if ((size_t)(req->body_size + evbuffer_get_length(buf)) < req->body_size) {
+			evhttp_connection_fail_(evcon, EVREQ_HTTP_INVALID_HEADER);
+			return;
+		}
+
+		req->body_size += evbuffer_get_length(buf);
+		evbuffer_add_buffer(req->input_buffer, buf);
+	} else if (req->chunk_cb != NULL || evbuffer_get_length(buf) >= (size_t)req->ntoread) {
+		/* XXX: the above get_length comparison has to be fixed for overflow conditions! */
+		/* We've postponed moving the data until now, but we're
+		 * about to use it. */
+		size_t n = evbuffer_get_length(buf);
+
+		if (n > (size_t) req->ntoread)
+			n = (size_t) req->ntoread;
+		req->ntoread -= n;
+		req->body_size += n;
+		evbuffer_remove_buffer(buf, req->input_buffer, n);
+	}
+
+	if (req->body_size > req->evcon->max_body_size ||
+	    (!req->chunked && req->ntoread >= 0 &&
+		(size_t)req->ntoread > req->evcon->max_body_size)) {
+		/* XXX: The above casted comparison must checked for overflow */
+		/* failed body length test */
+
+		evhttp_lingering_fail(evcon, req);
+		return;
+	}
+
+	if (evbuffer_get_length(req->input_buffer) > 0 && req->chunk_cb != NULL) {
+		req->flags |= EVHTTP_REQ_DEFER_FREE;
+		(*req->chunk_cb)(req, req->cb_arg);
+		req->flags &= ~EVHTTP_REQ_DEFER_FREE;
+		evbuffer_drain(req->input_buffer,
+		    evbuffer_get_length(req->input_buffer));
+		if ((req->flags & EVHTTP_REQ_NEEDS_FREE) != 0) {
+			evhttp_request_free_auto(req);
+			return;
+		}
+	}
+
+	if (!req->ntoread) {
+		bufferevent_disable(evcon->bufev, EV_READ);
+		/* Completed content length */
+		evhttp_connection_done(evcon);
+		return;
+	}
+}
+
+#define get_deferred_queue(evcon)		\
+	((evcon)->base)
+
+/*
+ * Gets called when more data becomes available
+ */
+
+static void
+evhttp_read_cb(struct bufferevent *bufev, void *arg)
+{
+	struct evhttp_connection *evcon = arg;
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+
+	/* Cancel if it's pending. */
+	event_deferred_cb_cancel_(get_deferred_queue(evcon),
+	    &evcon->read_more_deferred_cb);
+
+	switch (evcon->state) {
+	case EVCON_READING_FIRSTLINE:
+		evhttp_read_firstline(evcon, req);
+		/* note the request may have been freed in
+		 * evhttp_read_body */
+		break;
+	case EVCON_READING_HEADERS:
+		evhttp_read_header(evcon, req);
+		/* note the request may have been freed in
+		 * evhttp_read_body */
+		break;
+	case EVCON_READING_BODY:
+		evhttp_read_body(evcon, req);
+		/* note the request may have been freed in
+		 * evhttp_read_body */
+		break;
+	case EVCON_READING_TRAILER:
+		evhttp_read_trailer(evcon, req);
+		break;
+	case EVCON_IDLE:
+		{
+#ifdef USE_DEBUG
+			struct evbuffer *input;
+			size_t total_len;
+
+			input = bufferevent_get_input(evcon->bufev);
+			total_len = evbuffer_get_length(input);
+			event_debug(("%s: read "EV_SIZE_FMT
+				" bytes in EVCON_IDLE state,"
+				" resetting connection",
+				__func__, EV_SIZE_ARG(total_len)));
+#endif
+
+			evhttp_connection_reset_(evcon);
+		}
+		break;
+	case EVCON_DISCONNECTED:
+	case EVCON_CONNECTING:
+	case EVCON_WRITING:
+	default:
+		event_errx(1, "%s: illegal connection state %d",
+			   __func__, evcon->state);
+	}
+}
+
+static void
+evhttp_deferred_read_cb(struct event_callback *cb, void *data)
+{
+	struct evhttp_connection *evcon = data;
+	struct bufferevent *bev = evcon->bufev;
+	if (bev->readcb)
+		(bev->readcb)(evcon->bufev, evcon);
+}
+
+static void
+evhttp_write_connectioncb(struct evhttp_connection *evcon, void *arg)
+{
+	/* This is after writing the request to the server */
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+	struct evbuffer *output = bufferevent_get_output(evcon->bufev);
+	EVUTIL_ASSERT(req != NULL);
+
+	EVUTIL_ASSERT(evcon->state == EVCON_WRITING);
+
+	/* We need to wait until we've written all of our output data before we can
+	 * continue */
+	if (evbuffer_get_length(output) > 0)
+		return;
+
+	/* We are done writing our header and are now expecting the response */
+	req->kind = EVHTTP_RESPONSE;
+
+	evhttp_start_read_(evcon);
+}
+
+/*
+ * Clean up a connection object
+ */
+
+void
+evhttp_connection_free(struct evhttp_connection *evcon)
+{
+	struct evhttp_request *req;
+	int need_close = 0;
+
+	/* notify interested parties that this connection is going down */
+	if (evcon->fd != -1) {
+		if (evhttp_connected(evcon) && evcon->closecb != NULL)
+			(*evcon->closecb)(evcon, evcon->closecb_arg);
+	}
+
+	/* remove all requests that might be queued on this
+	 * connection.  for server connections, this should be empty.
+	 * because it gets dequeued either in evhttp_connection_done or
+	 * evhttp_connection_fail_.
+	 */
+	while ((req = TAILQ_FIRST(&evcon->requests)) != NULL) {
+		evhttp_request_free_(evcon, req);
+	}
+
+	if (evcon->http_server != NULL) {
+		struct evhttp *http = evcon->http_server;
+		TAILQ_REMOVE(&http->connections, evcon, next);
+	}
+
+	if (event_initialized(&evcon->retry_ev)) {
+		event_del(&evcon->retry_ev);
+		event_debug_unassign(&evcon->retry_ev);
+	}
+
+	event_deferred_cb_cancel_(get_deferred_queue(evcon),
+	    &evcon->read_more_deferred_cb);
+
+	if (evcon->bufev != NULL) {
+		need_close =
+			!(bufferevent_get_options_(evcon->bufev) & BEV_OPT_CLOSE_ON_FREE);
+		if (evcon->fd == -1)
+			evcon->fd = bufferevent_getfd(evcon->bufev);
+
+		bufferevent_free(evcon->bufev);
+	}
+
+	if (evcon->fd != -1) {
+		shutdown(evcon->fd, EVUTIL_SHUT_WR);
+		if (need_close)
+			evutil_closesocket(evcon->fd);
+	}
+
+	if (evcon->bind_address != NULL)
+		mm_free(evcon->bind_address);
+
+	if (evcon->address != NULL)
+		mm_free(evcon->address);
+
+	mm_free(evcon);
+}
+
+void
+evhttp_connection_free_on_completion(struct evhttp_connection *evcon) {
+	evcon->flags |= EVHTTP_CON_AUTOFREE;
+}
+
+void
+evhttp_connection_set_local_address(struct evhttp_connection *evcon,
+    const char *address)
+{
+	EVUTIL_ASSERT(evcon->state == EVCON_DISCONNECTED);
+	if (evcon->bind_address)
+		mm_free(evcon->bind_address);
+	if ((evcon->bind_address = mm_strdup(address)) == NULL)
+		event_warn("%s: strdup", __func__);
+}
+
+void
+evhttp_connection_set_local_port(struct evhttp_connection *evcon,
+    ev_uint16_t port)
+{
+	EVUTIL_ASSERT(evcon->state == EVCON_DISCONNECTED);
+	evcon->bind_port = port;
+}
+
+static void
+evhttp_request_dispatch(struct evhttp_connection* evcon)
+{
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+
+	/* this should not usually happy but it's possible */
+	if (req == NULL)
+		return;
+
+	EVUTIL_ASSERT(req->kind == EVHTTP_REQUEST);
+
+	/* delete possible close detection events */
+	evhttp_connection_stop_detectclose(evcon);
+
+	/* we assume that the connection is connected already */
+	EVUTIL_ASSERT(evcon->state == EVCON_IDLE);
+
+	evcon->state = EVCON_WRITING;
+
+	/* Create the header from the store arguments */
+	evhttp_make_header(evcon, req);
+
+	evhttp_write_buffer(evcon, evhttp_write_connectioncb, NULL);
+}
+
+/* Reset our connection state: disables reading/writing, closes our fd (if
+* any), clears out buffers, and puts us in state DISCONNECTED. */
+void
+evhttp_connection_reset_(struct evhttp_connection *evcon)
+{
+	struct evbuffer *tmp;
+	int err;
+
+	bufferevent_setcb(evcon->bufev, NULL, NULL, NULL, NULL);
+
+	/* XXXX This is not actually an optimal fix.  Instead we ought to have
+	   an API for "stop connecting", or use bufferevent_setfd to turn off
+	   connecting.  But for Libevent 2.0, this seems like a minimal change
+	   least likely to disrupt the rest of the bufferevent and http code.
+
+	   Why is this here?  If the fd is set in the bufferevent, and the
+	   bufferevent is connecting, then you can't actually stop the
+	   bufferevent from trying to connect with bufferevent_disable().  The
+	   connect will never trigger, since we close the fd, but the timeout
+	   might.  That caused an assertion failure in evhttp_connection_fail_.
+	*/
+	bufferevent_disable_hard_(evcon->bufev, EV_READ|EV_WRITE);
+
+	if (evcon->fd == -1)
+		evcon->fd = bufferevent_getfd(evcon->bufev);
+
+	if (evcon->fd != -1) {
+		/* inform interested parties about connection close */
+		if (evhttp_connected(evcon) && evcon->closecb != NULL)
+			(*evcon->closecb)(evcon, evcon->closecb_arg);
+
+		shutdown(evcon->fd, EVUTIL_SHUT_WR);
+		evutil_closesocket(evcon->fd);
+		evcon->fd = -1;
+	}
+	err = bufferevent_setfd(evcon->bufev, -1);
+	EVUTIL_ASSERT(!err && "setfd");
+
+	/* we need to clean up any buffered data */
+	tmp = bufferevent_get_output(evcon->bufev);
+	err = evbuffer_drain(tmp, -1);
+	EVUTIL_ASSERT(!err && "drain output");
+	tmp = bufferevent_get_input(evcon->bufev);
+	err = evbuffer_drain(tmp, -1);
+	EVUTIL_ASSERT(!err && "drain input");
+
+	evcon->flags &= ~EVHTTP_CON_READING_ERROR;
+
+	evcon->state = EVCON_DISCONNECTED;
+}
+
+static void
+evhttp_connection_start_detectclose(struct evhttp_connection *evcon)
+{
+	evcon->flags |= EVHTTP_CON_CLOSEDETECT;
+	bufferevent_enable(evcon->bufev, EV_READ);
+}
+
+static void
+evhttp_connection_stop_detectclose(struct evhttp_connection *evcon)
+{
+	evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
+	bufferevent_disable(evcon->bufev, EV_READ);
+}
+
+static void
+evhttp_connection_retry(evutil_socket_t fd, short what, void *arg)
+{
+	struct evhttp_connection *evcon = arg;
+
+	evcon->state = EVCON_DISCONNECTED;
+	evhttp_connection_connect_(evcon);
+}
+
+static void
+evhttp_connection_cb_cleanup(struct evhttp_connection *evcon)
+{
+	struct evcon_requestq requests;
+
+	evhttp_connection_reset_(evcon);
+	if (evcon->retry_max < 0 || evcon->retry_cnt < evcon->retry_max) {
+		struct timeval tv_retry = evcon->initial_retry_timeout;
+		int i;
+		evtimer_assign(&evcon->retry_ev, evcon->base, evhttp_connection_retry, evcon);
+		/* XXXX handle failure from evhttp_add_event */
+		for (i=0; i < evcon->retry_cnt; ++i) {
+			tv_retry.tv_usec *= 2;
+			if (tv_retry.tv_usec > 1000000) {
+				tv_retry.tv_usec -= 1000000;
+				tv_retry.tv_sec += 1;
+			}
+			tv_retry.tv_sec *= 2;
+			if (tv_retry.tv_sec > 3600) {
+				tv_retry.tv_sec = 3600;
+				tv_retry.tv_usec = 0;
+			}
+		}
+		event_add(&evcon->retry_ev, &tv_retry);
+		evcon->retry_cnt++;
+		return;
+	}
+
+	/*
+	 * User callback can do evhttp_make_request() on the same
+	 * evcon so new request will be added to evcon->requests.  To
+	 * avoid freeing it prematurely we iterate over the copy of
+	 * the queue.
+	 */
+	TAILQ_INIT(&requests);
+	while (TAILQ_FIRST(&evcon->requests) != NULL) {
+		struct evhttp_request *request = TAILQ_FIRST(&evcon->requests);
+		TAILQ_REMOVE(&evcon->requests, request, next);
+		TAILQ_INSERT_TAIL(&requests, request, next);
+	}
+
+	/* for now, we just signal all requests by executing their callbacks */
+	while (TAILQ_FIRST(&requests) != NULL) {
+		struct evhttp_request *request = TAILQ_FIRST(&requests);
+		TAILQ_REMOVE(&requests, request, next);
+		request->evcon = NULL;
+
+		/* we might want to set an error here */
+		request->cb(request, request->cb_arg);
+		evhttp_request_free_auto(request);
+	}
+}
+
+static void
+evhttp_connection_read_on_write_error(struct evhttp_connection *evcon,
+    struct evhttp_request *req)
+{
+	struct evbuffer *buf;
+
+	/** Second time, we can't read anything */
+	if (evcon->flags & EVHTTP_CON_READING_ERROR) {
+		evcon->flags &= ~EVHTTP_CON_READING_ERROR;
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
+		return;
+	}
+
+	req->kind = EVHTTP_RESPONSE;
+
+	buf = bufferevent_get_output(evcon->bufev);
+	evbuffer_unfreeze(buf, 1);
+	evbuffer_drain(buf, evbuffer_get_length(buf));
+	evbuffer_freeze(buf, 1);
+
+	evhttp_start_read_(evcon);
+	evcon->flags |= EVHTTP_CON_READING_ERROR;
+}
+
+static void
+evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
+{
+	struct evhttp_connection *evcon = arg;
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+
+	if (evcon->fd == -1)
+		evcon->fd = bufferevent_getfd(bufev);
+
+	switch (evcon->state) {
+	case EVCON_CONNECTING:
+		if (what & BEV_EVENT_TIMEOUT) {
+			event_debug(("%s: connection timeout for \"%s:%d\" on "
+				EV_SOCK_FMT,
+				__func__, evcon->address, evcon->port,
+				EV_SOCK_ARG(evcon->fd)));
+			evhttp_connection_cb_cleanup(evcon);
+			return;
+		}
+		break;
+
+	case EVCON_READING_BODY:
+		if (!req->chunked && req->ntoread < 0
+		    && what == (BEV_EVENT_READING|BEV_EVENT_EOF)) {
+			/* EOF on read can be benign */
+			evhttp_connection_done(evcon);
+			return;
+		}
+		break;
+
+	case EVCON_DISCONNECTED:
+	case EVCON_IDLE:
+	case EVCON_READING_FIRSTLINE:
+	case EVCON_READING_HEADERS:
+	case EVCON_READING_TRAILER:
+	case EVCON_WRITING:
+	default:
+		break;
+	}
+
+	/* when we are in close detect mode, a read error means that
+	 * the other side closed their connection.
+	 */
+	if (evcon->flags & EVHTTP_CON_CLOSEDETECT) {
+		evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
+		EVUTIL_ASSERT(evcon->http_server == NULL);
+		/* For connections from the client, we just
+		 * reset the connection so that it becomes
+		 * disconnected.
+		 */
+		EVUTIL_ASSERT(evcon->state == EVCON_IDLE);
+		evhttp_connection_reset_(evcon);
+
+		/*
+		 * If we have no more requests that need completion
+		 * and we want to auto-free the connection when all
+		 * requests have been completed.
+		 */
+		if (TAILQ_FIRST(&evcon->requests) == NULL
+		  && (evcon->flags & EVHTTP_CON_OUTGOING)
+		  && (evcon->flags & EVHTTP_CON_AUTOFREE)) {
+			evhttp_connection_free(evcon);
+		}
+		return;
+	}
+
+	if (what & BEV_EVENT_TIMEOUT) {
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_TIMEOUT);
+	} else if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
+		if (what & BEV_EVENT_WRITING &&
+			evcon->flags & EVHTTP_CON_READ_ON_WRITE_ERROR) {
+			evhttp_connection_read_on_write_error(evcon, req);
+			return;
+		}
+
+		if (what & BEV_EVENT_READING &&
+			evcon->flags & EVHTTP_CON_READ_ON_WRITE_ERROR &&
+			evbuffer_get_length(bufferevent_get_input(bufev))) {
+			event_deferred_cb_schedule_(get_deferred_queue(evcon),
+			    &evcon->read_more_deferred_cb);
+			return;
+		}
+
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
+	} else if (what == BEV_EVENT_CONNECTED) {
+	} else {
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_BUFFER_ERROR);
+	}
+}
+
+/*
+ * Event callback for asynchronous connection attempt.
+ */
+static void
+evhttp_connection_cb(struct bufferevent *bufev, short what, void *arg)
+{
+	struct evhttp_connection *evcon = arg;
+	int error;
+	ev_socklen_t errsz = sizeof(error);
+
+	if (evcon->fd == -1)
+		evcon->fd = bufferevent_getfd(bufev);
+
+	if (!(what & BEV_EVENT_CONNECTED)) {
+		/* some operating systems return ECONNREFUSED immediately
+		 * when connecting to a local address.  the cleanup is going
+		 * to reschedule this function call.
+		 */
+#ifndef _WIN32
+		if (errno == ECONNREFUSED)
+			goto cleanup;
+#endif
+		evhttp_error_cb(bufev, what, arg);
+		return;
+	}
+
+	if (evcon->fd == -1) {
+		event_debug(("%s: bufferevent_getfd returned -1",
+			__func__));
+		goto cleanup;
+	}
+
+	/* Check if the connection completed */
+	if (getsockopt(evcon->fd, SOL_SOCKET, SO_ERROR, (void*)&error,
+		       &errsz) == -1) {
+		event_debug(("%s: getsockopt for \"%s:%d\" on "EV_SOCK_FMT,
+			__func__, evcon->address, evcon->port,
+			EV_SOCK_ARG(evcon->fd)));
+		goto cleanup;
+	}
+
+	if (error) {
+		event_debug(("%s: connect failed for \"%s:%d\" on "
+			EV_SOCK_FMT": %s",
+			__func__, evcon->address, evcon->port,
+			EV_SOCK_ARG(evcon->fd),
+			evutil_socket_error_to_string(error)));
+		goto cleanup;
+	}
+
+	/* We are connected to the server now */
+	event_debug(("%s: connected to \"%s:%d\" on "EV_SOCK_FMT"\n",
+			__func__, evcon->address, evcon->port,
+			EV_SOCK_ARG(evcon->fd)));
+
+	/* Reset the retry count as we were successful in connecting */
+	evcon->retry_cnt = 0;
+	evcon->state = EVCON_IDLE;
+
+	/* reset the bufferevent cbs */
+	bufferevent_setcb(evcon->bufev,
+	    evhttp_read_cb,
+	    evhttp_write_cb,
+	    evhttp_error_cb,
+	    evcon);
+
+	if (!evutil_timerisset(&evcon->timeout)) {
+		const struct timeval read_tv = { HTTP_READ_TIMEOUT, 0 };
+		const struct timeval write_tv = { HTTP_WRITE_TIMEOUT, 0 };
+		bufferevent_set_timeouts(evcon->bufev, &read_tv, &write_tv);
+	} else {
+		bufferevent_set_timeouts(evcon->bufev, &evcon->timeout, &evcon->timeout);
+	}
+
+	/* try to start requests that have queued up on this connection */
+	evhttp_request_dispatch(evcon);
+	return;
+
+ cleanup:
+	evhttp_connection_cb_cleanup(evcon);
+}
+
+/*
+ * Check if we got a valid response code.
+ */
+
+static int
+evhttp_valid_response_code(int code)
+{
+	if (code == 0)
+		return (0);
+
+	return (1);
+}
+
+static int
+evhttp_parse_http_version(const char *version, struct evhttp_request *req)
+{
+	int major, minor;
+	char ch;
+	int n = sscanf(version, "HTTP/%d.%d%c", &major, &minor, &ch);
+	if (n != 2 || major > 1) {
+		event_debug(("%s: bad version %s on message %p from %s",
+			__func__, version, req, req->remote_host));
+		return (-1);
+	}
+	req->major = major;
+	req->minor = minor;
+	return (0);
+}
+
+/* Parses the status line of a web server */
+
+static int
+evhttp_parse_response_line(struct evhttp_request *req, char *line)
+{
+	char *protocol;
+	char *number;
+	const char *readable = "";
+
+	protocol = strsep(&line, " ");
+	if (line == NULL)
+		return (-1);
+	number = strsep(&line, " ");
+	if (line != NULL)
+		readable = line;
+
+	if (evhttp_parse_http_version(protocol, req) < 0)
+		return (-1);
+
+	req->response_code = atoi(number);
+	if (!evhttp_valid_response_code(req->response_code)) {
+		event_debug(("%s: bad response code \"%s\"",
+			__func__, number));
+		return (-1);
+	}
+
+	if (req->response_code_line != NULL)
+		mm_free(req->response_code_line);
+	if ((req->response_code_line = mm_strdup(readable)) == NULL) {
+		event_warn("%s: strdup", __func__);
+		return (-1);
+	}
+
+	return (0);
+}
+
+/* Parse the first line of a HTTP request */
+
+static int
+evhttp_parse_request_line(struct evhttp_request *req, char *line, size_t len)
+{
+	char *eos = line + len;
+	char *method;
+	char *uri;
+	char *version;
+	const char *hostname;
+	const char *scheme;
+	size_t method_len;
+	enum evhttp_cmd_type type;
+
+	while (eos > line && *(eos-1) == ' ') {
+		*(eos-1) = '\0';
+		--eos;
+		--len;
+	}
+	if (len < strlen("GET / HTTP/1.0"))
+		return -1;
+
+	/* Parse the request line */
+	method = strsep(&line, " ");
+	if (!line)
+		return -1;
+	uri = line;
+	version = strrchr(uri, ' ');
+	if (!version || uri == version)
+		return -1;
+	*version = '\0';
+	version++;
+
+	method_len = (uri - method) - 1;
+	type       = EVHTTP_REQ_UNKNOWN_;
+
+	/* First line */
+	switch (method_len) {
+	    case 3:
+		/* The length of the method string is 3, meaning it can only be one of two methods: GET or PUT */
+            
+		/* Since both GET and PUT share the same character 'T' at the end,
+		 * if the string doesn't have 'T', we can immediately determine this
+		 * is an invalid HTTP method */
+            
+		if (method[2] != 'T') {
+		    break;
+		}
+            
+		switch (*method) {
+		    case 'G':
+			/* This first byte is 'G', so make sure the next byte is
+			 * 'E', if it isn't then this isn't a valid method */
+                    
+			if (method[1] == 'E') {
+			    type = EVHTTP_REQ_GET;
+			}
+                    
+			break;
+		    case 'P':
+			/* First byte is P, check second byte for 'U', if not,
+			 * we know it's an invalid method */
+			if (method[1] == 'U') {
+			    type = EVHTTP_REQ_PUT;
+			}
+			break;
+		    default:
+			break;
+		}
+		break;
+	    case 4:
+		/* The method length is 4 bytes, leaving only the methods "POST" and "HEAD" */
+		switch (*method) {
+		    case 'P':
+			if (method[3] == 'T' && method[2] == 'S' && method[1] == 'O') {
+			    type = EVHTTP_REQ_POST;
+			}
+			break;
+		    case 'H':
+			if (method[3] == 'D' && method[2] == 'A' && method[1] == 'E') {
+			    type = EVHTTP_REQ_HEAD;
+			}
+			break;
+		    default:
+			break;
+		}
+		break;
+	    case 5:
+		/* Method length is 5 bytes, which can only encompass PATCH and TRACE */
+		switch (*method) {
+		    case 'P':
+			if (method[4] == 'H' && method[3] == 'C' && method[2] == 'T' && method[1] == 'A') {
+			    type = EVHTTP_REQ_PATCH;
+			}
+			break;
+		    case 'T':
+			if (method[4] == 'E' && method[3] == 'C' && method[2] == 'A' && method[1] == 'R') {
+			    type = EVHTTP_REQ_TRACE;
+			}
+                    
+			break;
+		    default:
+			break;
+		}
+		break;
+	    case 6:
+		/* Method length is 6, only valid method 6 bytes in length is DELEte */
+            
+		/* If the first byte isn't 'D' then it's invalid */
+		if (*method != 'D') {
+		    break;
+		}
+
+		if (method[5] == 'E' && method[4] == 'T' && method[3] == 'E' && method[2] == 'L' && method[1] == 'E') {
+		    type = EVHTTP_REQ_DELETE;
+		}
+
+		break;
+	    case 7:
+		/* Method length is 7, only valid methods are "OPTIONS" and "CONNECT" */
+		switch (*method) {
+		    case 'O':
+			if (method[6] == 'S' && method[5] == 'N' && method[4] == 'O' &&
+				method[3] == 'I' && method[2] == 'T' && method[1] == 'P') {
+			    type = EVHTTP_REQ_OPTIONS;
+			}
+                   
+		       	break;
+		    case 'C':
+			if (method[6] == 'T' && method[5] == 'C' && method[4] == 'E' &&
+				method[3] == 'N' && method[2] == 'N' && method[1] == 'O') {
+			    type = EVHTTP_REQ_CONNECT;
+			}
+                    
+			break;
+		    default:
+			break;
+		}
+		break;
+	} /* switch */
+
+	if ((int)type == EVHTTP_REQ_UNKNOWN_) {
+	        event_debug(("%s: bad method %s on request %p from %s",
+			__func__, method, req, req->remote_host));
+                /* No error yet; we'll give a better error later when
+                 * we see that req->type is unsupported. */
+	}
+	    
+	req->type = type;
+
+	if (evhttp_parse_http_version(version, req) < 0)
+		return -1;
+
+	if ((req->uri = mm_strdup(uri)) == NULL) {
+		event_debug(("%s: mm_strdup", __func__));
+		return -1;
+	}
+
+	if (type == EVHTTP_REQ_CONNECT) {
+		if ((req->uri_elems = evhttp_uri_parse_authority(req->uri)) == NULL) {
+			return -1;
+		}
+	} else {
+		if ((req->uri_elems = evhttp_uri_parse_with_flags(req->uri,
+			    EVHTTP_URI_NONCONFORMANT)) == NULL) {
+			return -1;
+		}
+	}
+
+	/* If we have an absolute-URI, check to see if it is an http request
+	   for a known vhost or server alias. If we don't know about this
+	   host, we consider it a proxy request. */
+	scheme = evhttp_uri_get_scheme(req->uri_elems);
+	hostname = evhttp_uri_get_host(req->uri_elems);
+	if (scheme && (!evutil_ascii_strcasecmp(scheme, "http") ||
+		       !evutil_ascii_strcasecmp(scheme, "https")) &&
+	    hostname &&
+	    !evhttp_find_vhost(req->evcon->http_server, NULL, hostname))
+		req->flags |= EVHTTP_PROXY_REQUEST;
+
+	return 0;
+}
+
+const char *
+evhttp_find_header(const struct evkeyvalq *headers, const char *key)
+{
+	struct evkeyval *header;
+
+	TAILQ_FOREACH(header, headers, next) {
+		if (evutil_ascii_strcasecmp(header->key, key) == 0)
+			return (header->value);
+	}
+
+	return (NULL);
+}
+
+void
+evhttp_clear_headers(struct evkeyvalq *headers)
+{
+	struct evkeyval *header;
+
+	for (header = TAILQ_FIRST(headers);
+	    header != NULL;
+	    header = TAILQ_FIRST(headers)) {
+		TAILQ_REMOVE(headers, header, next);
+		mm_free(header->key);
+		mm_free(header->value);
+		mm_free(header);
+	}
+}
+
+/*
+ * Returns 0,  if the header was successfully removed.
+ * Returns -1, if the header could not be found.
+ */
+
+int
+evhttp_remove_header(struct evkeyvalq *headers, const char *key)
+{
+	struct evkeyval *header;
+
+	TAILQ_FOREACH(header, headers, next) {
+		if (evutil_ascii_strcasecmp(header->key, key) == 0)
+			break;
+	}
+
+	if (header == NULL)
+		return (-1);
+
+	/* Free and remove the header that we found */
+	TAILQ_REMOVE(headers, header, next);
+	mm_free(header->key);
+	mm_free(header->value);
+	mm_free(header);
+
+	return (0);
+}
+
+static int
+evhttp_header_is_valid_value(const char *value)
+{
+	const char *p = value;
+
+	while ((p = strpbrk(p, "\r\n")) != NULL) {
+		/* we really expect only one new line */
+		p += strspn(p, "\r\n");
+		/* we expect a space or tab for continuation */
+		if (*p != ' ' && *p != '\t')
+			return (0);
+	}
+	return (1);
+}
+
+int
+evhttp_add_header(struct evkeyvalq *headers,
+    const char *key, const char *value)
+{
+	event_debug(("%s: key: %s val: %s\n", __func__, key, value));
+
+	if (strchr(key, '\r') != NULL || strchr(key, '\n') != NULL) {
+		/* drop illegal headers */
+		event_debug(("%s: dropping illegal header key\n", __func__));
+		return (-1);
+	}
+
+	if (!evhttp_header_is_valid_value(value)) {
+		event_debug(("%s: dropping illegal header value\n", __func__));
+		return (-1);
+	}
+
+	return (evhttp_add_header_internal(headers, key, value));
+}
+
+static int
+evhttp_add_header_internal(struct evkeyvalq *headers,
+    const char *key, const char *value)
+{
+	struct evkeyval *header = mm_calloc(1, sizeof(struct evkeyval));
+	if (header == NULL) {
+		event_warn("%s: calloc", __func__);
+		return (-1);
+	}
+	if ((header->key = mm_strdup(key)) == NULL) {
+		mm_free(header);
+		event_warn("%s: strdup", __func__);
+		return (-1);
+	}
+	if ((header->value = mm_strdup(value)) == NULL) {
+		mm_free(header->key);
+		mm_free(header);
+		event_warn("%s: strdup", __func__);
+		return (-1);
+	}
+
+	TAILQ_INSERT_TAIL(headers, header, next);
+
+	return (0);
+}
+
+/*
+ * Parses header lines from a request or a response into the specified
+ * request object given an event buffer.
+ *
+ * Returns
+ *   DATA_CORRUPTED      on error
+ *   MORE_DATA_EXPECTED  when we need to read more headers
+ *   ALL_DATA_READ       when all headers have been read.
+ */
+
+enum message_read_status
+evhttp_parse_firstline_(struct evhttp_request *req, struct evbuffer *buffer)
+{
+	char *line;
+	enum message_read_status status = ALL_DATA_READ;
+
+	size_t len;
+	/* XXX try */
+	line = evbuffer_readln(buffer, &len, EVBUFFER_EOL_CRLF);
+	if (line == NULL) {
+		if (req->evcon != NULL &&
+		    evbuffer_get_length(buffer) > req->evcon->max_headers_size)
+			return (DATA_TOO_LONG);
+		else
+			return (MORE_DATA_EXPECTED);
+	}
+
+	if (req->evcon != NULL && len > req->evcon->max_headers_size) {
+		mm_free(line);
+		return (DATA_TOO_LONG);
+	}
+
+	req->headers_size = len;
+
+	switch (req->kind) {
+	case EVHTTP_REQUEST:
+		if (evhttp_parse_request_line(req, line, len) == -1)
+			status = DATA_CORRUPTED;
+		break;
+	case EVHTTP_RESPONSE:
+		if (evhttp_parse_response_line(req, line) == -1)
+			status = DATA_CORRUPTED;
+		break;
+	default:
+		status = DATA_CORRUPTED;
+	}
+
+	mm_free(line);
+	return (status);
+}
+
+static int
+evhttp_append_to_last_header(struct evkeyvalq *headers, char *line)
+{
+	struct evkeyval *header = TAILQ_LAST(headers, evkeyvalq);
+	char *newval;
+	size_t old_len, line_len;
+
+	if (header == NULL)
+		return (-1);
+
+	old_len = strlen(header->value);
+
+	/* Strip space from start and end of line. */
+	while (*line == ' ' || *line == '\t')
+		++line;
+	evutil_rtrim_lws_(line);
+
+	line_len = strlen(line);
+
+	newval = mm_realloc(header->value, old_len + line_len + 2);
+	if (newval == NULL)
+		return (-1);
+
+	newval[old_len] = ' ';
+	memcpy(newval + old_len + 1, line, line_len + 1);
+	header->value = newval;
+
+	return (0);
+}
+
+enum message_read_status
+evhttp_parse_headers_(struct evhttp_request *req, struct evbuffer* buffer)
+{
+	enum message_read_status errcode = DATA_CORRUPTED;
+	char *line;
+	enum message_read_status status = MORE_DATA_EXPECTED;
+
+	struct evkeyvalq* headers = req->input_headers;
+	size_t len;
+	while ((line = evbuffer_readln(buffer, &len, EVBUFFER_EOL_CRLF))
+	       != NULL) {
+		char *skey, *svalue;
+
+		req->headers_size += len;
+
+		if (req->evcon != NULL &&
+		    req->headers_size > req->evcon->max_headers_size) {
+			errcode = DATA_TOO_LONG;
+			goto error;
+		}
+
+		if (*line == '\0') { /* Last header - Done */
+			status = ALL_DATA_READ;
+			mm_free(line);
+			break;
+		}
+
+		/* Check if this is a continuation line */
+		if (*line == ' ' || *line == '\t') {
+			if (evhttp_append_to_last_header(headers, line) == -1)
+				goto error;
+			mm_free(line);
+			continue;
+		}
+
+		/* Processing of header lines */
+		svalue = line;
+		skey = strsep(&svalue, ":");
+		if (svalue == NULL)
+			goto error;
+
+		svalue += strspn(svalue, " ");
+		evutil_rtrim_lws_(svalue);
+
+		if (evhttp_add_header(headers, skey, svalue) == -1)
+			goto error;
+
+		mm_free(line);
+	}
+
+	if (status == MORE_DATA_EXPECTED) {
+		if (req->evcon != NULL &&
+		req->headers_size + evbuffer_get_length(buffer) > req->evcon->max_headers_size)
+			return (DATA_TOO_LONG);
+	}
+
+	return (status);
+
+ error:
+	mm_free(line);
+	return (errcode);
+}
+
+static int
+evhttp_get_body_length(struct evhttp_request *req)
+{
+	struct evkeyvalq *headers = req->input_headers;
+	const char *content_length;
+	const char *connection;
+
+	content_length = evhttp_find_header(headers, "Content-Length");
+	connection = evhttp_find_header(headers, "Connection");
+
+	if (content_length == NULL && connection == NULL)
+		req->ntoread = -1;
+	else if (content_length == NULL &&
+	    evutil_ascii_strcasecmp(connection, "Close") != 0) {
+		req->ntoread = 0;
+	} else if (content_length == NULL) {
+		req->ntoread = -1;
+	} else {
+		char *endp;
+		ev_int64_t ntoread = evutil_strtoll(content_length, &endp, 10);
+		if (*content_length == '\0' || *endp != '\0' || ntoread < 0) {
+			event_debug(("%s: illegal content length: %s",
+				__func__, content_length));
+			return (-1);
+		}
+		req->ntoread = ntoread;
+	}
+
+	event_debug(("%s: bytes to read: "EV_I64_FMT" (in buffer "EV_SIZE_FMT")\n",
+		__func__, EV_I64_ARG(req->ntoread),
+		EV_SIZE_ARG(evbuffer_get_length(bufferevent_get_input(req->evcon->bufev)))));
+
+	return (0);
+}
+
+static int
+evhttp_method_may_have_body(enum evhttp_cmd_type type)
+{
+	switch (type) {
+	case EVHTTP_REQ_POST:
+	case EVHTTP_REQ_PUT:
+	case EVHTTP_REQ_PATCH:
+
+	case EVHTTP_REQ_GET:
+	case EVHTTP_REQ_DELETE:
+	case EVHTTP_REQ_OPTIONS:
+	case EVHTTP_REQ_CONNECT:
+		return 1;
+
+	case EVHTTP_REQ_TRACE:
+	case EVHTTP_REQ_HEAD:
+	default:
+		return 0;
+	}
+}
+
+static void
+evhttp_get_body(struct evhttp_connection *evcon, struct evhttp_request *req)
+{
+	const char *xfer_enc;
+
+	/* If this is a request without a body, then we are done */
+	if (req->kind == EVHTTP_REQUEST &&
+	    !evhttp_method_may_have_body(req->type)) {
+		evhttp_connection_done(evcon);
+		return;
+	}
+	evcon->state = EVCON_READING_BODY;
+	xfer_enc = evhttp_find_header(req->input_headers, "Transfer-Encoding");
+	if (xfer_enc != NULL && evutil_ascii_strcasecmp(xfer_enc, "chunked") == 0) {
+		req->chunked = 1;
+		req->ntoread = -1;
+	} else {
+		if (evhttp_get_body_length(req) == -1) {
+			evhttp_connection_fail_(evcon, EVREQ_HTTP_INVALID_HEADER);
+			return;
+		}
+		if (req->kind == EVHTTP_REQUEST && req->ntoread < 1) {
+			/* An incoming request with no content-length and no
+			 * transfer-encoding has no body. */
+			evhttp_connection_done(evcon);
+			return;
+		}
+	}
+
+	/* Should we send a 100 Continue status line? */
+	switch (evhttp_have_expect(req, 1)) {
+		case CONTINUE:
+				/* XXX It would be nice to do some sanity
+				   checking here. Does the resource exist?
+				   Should the resource accept post requests? If
+				   no, we should respond with an error. For
+				   now, just optimistically tell the client to
+				   send their message body. */
+				if (req->ntoread > 0) {
+					/* ntoread is ev_int64_t, max_body_size is ev_uint64_t */ 
+					if ((req->evcon->max_body_size <= EV_INT64_MAX) &&
+						(ev_uint64_t)req->ntoread > req->evcon->max_body_size) {
+						evhttp_lingering_fail(evcon, req);
+						return;
+					}
+				}
+				if (!evbuffer_get_length(bufferevent_get_input(evcon->bufev)))
+					evhttp_send_continue(evcon, req);
+			break;
+		case OTHER:
+			evhttp_send_error(req, HTTP_EXPECTATIONFAILED, NULL);
+			return;
+		case NO: break;
+	}
+
+	evhttp_read_body(evcon, req);
+	/* note the request may have been freed in evhttp_read_body */
+}
+
+static void
+evhttp_read_firstline(struct evhttp_connection *evcon,
+		      struct evhttp_request *req)
+{
+	enum message_read_status res;
+
+	res = evhttp_parse_firstline_(req, bufferevent_get_input(evcon->bufev));
+	if (res == DATA_CORRUPTED || res == DATA_TOO_LONG) {
+		/* Error while reading, terminate */
+		event_debug(("%s: bad header lines on "EV_SOCK_FMT"\n",
+			__func__, EV_SOCK_ARG(evcon->fd)));
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_INVALID_HEADER);
+		return;
+	} else if (res == MORE_DATA_EXPECTED) {
+		/* Need more header lines */
+		return;
+	}
+
+	evcon->state = EVCON_READING_HEADERS;
+	evhttp_read_header(evcon, req);
+}
+
+static void
+evhttp_read_header(struct evhttp_connection *evcon,
+		   struct evhttp_request *req)
+{
+	enum message_read_status res;
+	evutil_socket_t fd = evcon->fd;
+
+	res = evhttp_parse_headers_(req, bufferevent_get_input(evcon->bufev));
+	if (res == DATA_CORRUPTED || res == DATA_TOO_LONG) {
+		/* Error while reading, terminate */
+		event_debug(("%s: bad header lines on "EV_SOCK_FMT"\n",
+			__func__, EV_SOCK_ARG(fd)));
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_INVALID_HEADER);
+		return;
+	} else if (res == MORE_DATA_EXPECTED) {
+		/* Need more header lines */
+		return;
+	}
+
+	/* Callback can shut down connection with negative return value */
+	if (req->header_cb != NULL) {
+		if ((*req->header_cb)(req, req->cb_arg) < 0) {
+			evhttp_connection_fail_(evcon, EVREQ_HTTP_EOF);
+			return;
+		}
+	}
+
+	/* Done reading headers, do the real work */
+	switch (req->kind) {
+	case EVHTTP_REQUEST:
+		event_debug(("%s: checking for post data on "EV_SOCK_FMT"\n",
+			__func__, EV_SOCK_ARG(fd)));
+		evhttp_get_body(evcon, req);
+		/* note the request may have been freed in evhttp_get_body */
+		break;
+
+	case EVHTTP_RESPONSE:
+		/* Start over if we got a 100 Continue response. */
+		if (req->response_code == 100) {
+			struct evbuffer *output = bufferevent_get_output(evcon->bufev);
+			evbuffer_add_buffer(output, req->output_buffer);
+			evhttp_start_write_(evcon);
+			return;
+		}
+		if (!evhttp_response_needs_body(req)) {
+			event_debug(("%s: skipping body for code %d\n",
+					__func__, req->response_code));
+			evhttp_connection_done(evcon);
+		} else {
+			event_debug(("%s: start of read body for %s on "
+				EV_SOCK_FMT"\n",
+				__func__, req->remote_host, EV_SOCK_ARG(fd)));
+			evhttp_get_body(evcon, req);
+			/* note the request may have been freed in
+			 * evhttp_get_body */
+		}
+		break;
+
+	default:
+		event_warnx("%s: bad header on "EV_SOCK_FMT, __func__,
+		    EV_SOCK_ARG(fd));
+		evhttp_connection_fail_(evcon, EVREQ_HTTP_INVALID_HEADER);
+		break;
+	}
+	/* request may have been freed above */
+}
+
+/*
+ * Creates a TCP connection to the specified port and executes a callback
+ * when finished.  Failure or success is indicate by the passed connection
+ * object.
+ *
+ * Although this interface accepts a hostname, it is intended to take
+ * only numeric hostnames so that non-blocking DNS resolution can
+ * happen elsewhere.
+ */
+
+struct evhttp_connection *
+evhttp_connection_new(const char *address, ev_uint16_t port)
+{
+	return (evhttp_connection_base_new(NULL, NULL, address, port));
+}
+
+struct evhttp_connection *
+evhttp_connection_base_bufferevent_new(struct event_base *base, struct evdns_base *dnsbase, struct bufferevent* bev,
+    const char *address, ev_uint16_t port)
+{
+	struct evhttp_connection *evcon = NULL;
+
+	event_debug(("Attempting connection to %s:%d\n", address, port));
+
+	if ((evcon = mm_calloc(1, sizeof(struct evhttp_connection))) == NULL) {
+		event_warn("%s: calloc failed", __func__);
+		goto error;
+	}
+
+	evcon->fd = -1;
+	evcon->port = port;
+
+	evcon->max_headers_size = EV_SIZE_MAX;
+	evcon->max_body_size = EV_SIZE_MAX;
+
+	evutil_timerclear(&evcon->timeout);
+	evcon->retry_cnt = evcon->retry_max = 0;
+
+	if ((evcon->address = mm_strdup(address)) == NULL) {
+		event_warn("%s: strdup failed", __func__);
+		goto error;
+	}
+
+	if (bev == NULL) {
+		if (!(bev = bufferevent_socket_new(base, -1, 0))) {
+			event_warn("%s: bufferevent_socket_new failed", __func__);
+			goto error;
+		}
+	}
+
+	bufferevent_setcb(bev, evhttp_read_cb, evhttp_write_cb, evhttp_error_cb, evcon);
+	evcon->bufev = bev;
+
+	evcon->state = EVCON_DISCONNECTED;
+	TAILQ_INIT(&evcon->requests);
+
+	evcon->initial_retry_timeout.tv_sec = 2;
+	evcon->initial_retry_timeout.tv_usec = 0;
+
+	if (base != NULL) {
+		evcon->base = base;
+		if (bufferevent_get_base(bev) != base)
+			bufferevent_base_set(base, evcon->bufev);
+	}
+
+	event_deferred_cb_init_(
+	    &evcon->read_more_deferred_cb,
+	    bufferevent_get_priority(bev),
+	    evhttp_deferred_read_cb, evcon);
+
+	evcon->dns_base = dnsbase;
+	evcon->ai_family = AF_UNSPEC;
+
+	return (evcon);
+
+ error:
+	if (evcon != NULL)
+		evhttp_connection_free(evcon);
+	return (NULL);
+}
+
+struct bufferevent* evhttp_connection_get_bufferevent(struct evhttp_connection *evcon)
+{
+	return evcon->bufev;
+}
+
+struct evhttp *
+evhttp_connection_get_server(struct evhttp_connection *evcon)
+{
+	return evcon->http_server;
+}
+
+struct evhttp_connection *
+evhttp_connection_base_new(struct event_base *base, struct evdns_base *dnsbase,
+    const char *address, ev_uint16_t port)
+{
+	return evhttp_connection_base_bufferevent_new(base, dnsbase, NULL, address, port);
+}
+
+void evhttp_connection_set_family(struct evhttp_connection *evcon,
+	int family)
+{
+	evcon->ai_family = family;
+}
+
+int evhttp_connection_set_flags(struct evhttp_connection *evcon,
+	int flags)
+{
+	int avail_flags = 0;
+	avail_flags |= EVHTTP_CON_REUSE_CONNECTED_ADDR;
+	avail_flags |= EVHTTP_CON_READ_ON_WRITE_ERROR;
+
+	if (flags & ~avail_flags || flags > EVHTTP_CON_PUBLIC_FLAGS_END)
+		return 1;
+	evcon->flags &= ~avail_flags;
+
+	evcon->flags |= flags;
+
+	return 0;
+}
+
+void
+evhttp_connection_set_base(struct evhttp_connection *evcon,
+    struct event_base *base)
+{
+	EVUTIL_ASSERT(evcon->base == NULL);
+	EVUTIL_ASSERT(evcon->state == EVCON_DISCONNECTED);
+	evcon->base = base;
+	bufferevent_base_set(base, evcon->bufev);
+}
+
+void
+evhttp_connection_set_timeout(struct evhttp_connection *evcon,
+    int timeout_in_secs)
+{
+	if (timeout_in_secs == -1)
+		evhttp_connection_set_timeout_tv(evcon, NULL);
+	else {
+		struct timeval tv;
+		tv.tv_sec = timeout_in_secs;
+		tv.tv_usec = 0;
+		evhttp_connection_set_timeout_tv(evcon, &tv);
+	}
+}
+
+void
+evhttp_connection_set_timeout_tv(struct evhttp_connection *evcon,
+    const struct timeval* tv)
+{
+	if (tv) {
+		evcon->timeout = *tv;
+		bufferevent_set_timeouts(evcon->bufev, &evcon->timeout, &evcon->timeout);
+	} else {
+		const struct timeval read_tv = { HTTP_READ_TIMEOUT, 0 };
+		const struct timeval write_tv = { HTTP_WRITE_TIMEOUT, 0 };
+		evutil_timerclear(&evcon->timeout);
+		bufferevent_set_timeouts(evcon->bufev, &read_tv, &write_tv);
+	}
+}
+
+void
+evhttp_connection_set_initial_retry_tv(struct evhttp_connection *evcon,
+    const struct timeval *tv)
+{
+	if (tv) {
+		evcon->initial_retry_timeout = *tv;
+	} else {
+		evutil_timerclear(&evcon->initial_retry_timeout);
+		evcon->initial_retry_timeout.tv_sec = 2;
+	}
+}
+
+void
+evhttp_connection_set_retries(struct evhttp_connection *evcon,
+    int retry_max)
+{
+	evcon->retry_max = retry_max;
+}
+
+void
+evhttp_connection_set_closecb(struct evhttp_connection *evcon,
+    void (*cb)(struct evhttp_connection *, void *), void *cbarg)
+{
+	evcon->closecb = cb;
+	evcon->closecb_arg = cbarg;
+}
+
+void
+evhttp_connection_get_peer(struct evhttp_connection *evcon,
+    char **address, ev_uint16_t *port)
+{
+	*address = evcon->address;
+	*port = evcon->port;
+}
+
+const struct sockaddr*
+evhttp_connection_get_addr(struct evhttp_connection *evcon)
+{
+	return bufferevent_socket_get_conn_address_(evcon->bufev);
+}
+
+int
+evhttp_connection_connect_(struct evhttp_connection *evcon)
+{
+	int old_state = evcon->state;
+	const char *address = evcon->address;
+	const struct sockaddr *sa = evhttp_connection_get_addr(evcon);
+	int ret;
+
+	if (evcon->state == EVCON_CONNECTING)
+		return (0);
+
+	evhttp_connection_reset_(evcon);
+
+	EVUTIL_ASSERT(!(evcon->flags & EVHTTP_CON_INCOMING));
+	evcon->flags |= EVHTTP_CON_OUTGOING;
+
+	if (evcon->bind_address || evcon->bind_port) {
+		evcon->fd = bind_socket(
+			evcon->bind_address, evcon->bind_port, 0 /*reuse*/);
+		if (evcon->fd == -1) {
+			event_debug(("%s: failed to bind to \"%s\"",
+				__func__, evcon->bind_address));
+			return (-1);
+		}
+
+		if (bufferevent_setfd(evcon->bufev, evcon->fd))
+			return (-1);
+	} else {
+		if (bufferevent_setfd(evcon->bufev, -1))
+			return (-1);
+	}
+
+	/* Set up a callback for successful connection setup */
+	bufferevent_setcb(evcon->bufev,
+	    NULL /* evhttp_read_cb */,
+	    NULL /* evhttp_write_cb */,
+	    evhttp_connection_cb,
+	    evcon);
+	if (!evutil_timerisset(&evcon->timeout)) {
+		const struct timeval conn_tv = { HTTP_CONNECT_TIMEOUT, 0 };
+		bufferevent_set_timeouts(evcon->bufev, &conn_tv, &conn_tv);
+	} else {
+		bufferevent_set_timeouts(evcon->bufev, &evcon->timeout, &evcon->timeout);
+	}
+	/* make sure that we get a write callback */
+	if (bufferevent_enable(evcon->bufev, EV_WRITE))
+		return (-1);
+
+	evcon->state = EVCON_CONNECTING;
+
+	if (evcon->flags & EVHTTP_CON_REUSE_CONNECTED_ADDR &&
+		sa &&
+		(sa->sa_family == AF_INET || sa->sa_family == AF_INET6)) {
+		int socklen = sizeof(struct sockaddr_in);
+		if (sa->sa_family == AF_INET6) {
+			socklen = sizeof(struct sockaddr_in6);
+		}
+		ret = bufferevent_socket_connect(evcon->bufev, sa, socklen);
+	} else {
+		ret = bufferevent_socket_connect_hostname(evcon->bufev,
+				evcon->dns_base, evcon->ai_family, address, evcon->port);
+	}
+
+	if (ret < 0) {
+		evcon->state = old_state;
+		event_sock_warn(evcon->fd, "%s: connection to \"%s\" failed",
+		    __func__, evcon->address);
+		/* some operating systems return ECONNREFUSED immediately
+		 * when connecting to a local address.  the cleanup is going
+		 * to reschedule this function call.
+		 */
+		evhttp_connection_cb_cleanup(evcon);
+		return (0);
+	}
+
+	return (0);
+}
+
+/*
+ * Starts an HTTP request on the provided evhttp_connection object.
+ * If the connection object is not connected to the web server already,
+ * this will start the connection.
+ */
+
+int
+evhttp_make_request(struct evhttp_connection *evcon,
+    struct evhttp_request *req,
+    enum evhttp_cmd_type type, const char *uri)
+{
+	/* We are making a request */
+	req->kind = EVHTTP_REQUEST;
+	req->type = type;
+	if (req->uri != NULL)
+		mm_free(req->uri);
+	if ((req->uri = mm_strdup(uri)) == NULL) {
+		event_warn("%s: strdup", __func__);
+		evhttp_request_free_auto(req);
+		return (-1);
+	}
+
+	/* Set the protocol version if it is not supplied */
+	if (!req->major && !req->minor) {
+		req->major = 1;
+		req->minor = 1;
+	}
+
+	EVUTIL_ASSERT(req->evcon == NULL);
+	req->evcon = evcon;
+	EVUTIL_ASSERT(!(req->flags & EVHTTP_REQ_OWN_CONNECTION));
+
+	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
+
+	/* We do not want to conflict with retry_ev */
+	if (evcon->retry_cnt)
+		return (0);
+
+	/* If the connection object is not connected; make it so */
+	if (!evhttp_connected(evcon)) {
+		int res = evhttp_connection_connect_(evcon);
+		/* evhttp_connection_fail_(), which is called through
+		 * evhttp_connection_connect_(), assumes that req lies in
+		 * evcon->requests.  Thus, enqueue the request in advance and
+		 * remove it in the error case. */
+		if (res != 0)
+			TAILQ_REMOVE(&evcon->requests, req, next);
+
+		return (res);
+	}
+
+	/*
+	 * If it's connected already and we are the first in the queue,
+	 * then we can dispatch this request immediately.  Otherwise, it
+	 * will be dispatched once the pending requests are completed.
+	 */
+	if (TAILQ_FIRST(&evcon->requests) == req)
+		evhttp_request_dispatch(evcon);
+
+	return (0);
+}
+
+void
+evhttp_cancel_request(struct evhttp_request *req)
+{
+	struct evhttp_connection *evcon = req->evcon;
+	if (evcon != NULL) {
+		/* We need to remove it from the connection */
+		if (TAILQ_FIRST(&evcon->requests) == req) {
+			/* it's currently being worked on, so reset
+			 * the connection.
+			 */
+			evhttp_connection_fail_(evcon,
+			    EVREQ_HTTP_REQUEST_CANCEL);
+
+			/* connection fail freed the request */
+			return;
+		} else {
+			/* otherwise, we can just remove it from the
+			 * queue
+			 */
+			TAILQ_REMOVE(&evcon->requests, req, next);
+		}
+	}
+
+	evhttp_request_free_auto(req);
+}
+
+/*
+ * Reads data from file descriptor into request structure
+ * Request structure needs to be set up correctly.
+ */
+
+void
+evhttp_start_read_(struct evhttp_connection *evcon)
+{
+	bufferevent_disable(evcon->bufev, EV_WRITE);
+	bufferevent_enable(evcon->bufev, EV_READ);
+
+	evcon->state = EVCON_READING_FIRSTLINE;
+	/* Reset the bufferevent callbacks */
+	bufferevent_setcb(evcon->bufev,
+	    evhttp_read_cb,
+	    evhttp_write_cb,
+	    evhttp_error_cb,
+	    evcon);
+
+	/* If there's still data pending, process it next time through the
+	 * loop.  Don't do it now; that could get recusive. */
+	if (evbuffer_get_length(bufferevent_get_input(evcon->bufev))) {
+		event_deferred_cb_schedule_(get_deferred_queue(evcon),
+		    &evcon->read_more_deferred_cb);
+	}
+}
+
+void
+evhttp_start_write_(struct evhttp_connection *evcon)
+{
+	bufferevent_disable(evcon->bufev, EV_WRITE);
+	bufferevent_enable(evcon->bufev, EV_READ);
+
+	evcon->state = EVCON_WRITING;
+	evhttp_write_buffer(evcon, evhttp_write_connectioncb, NULL);
+}
+
+static void
+evhttp_send_done(struct evhttp_connection *evcon, void *arg)
+{
+	int need_close;
+	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
+	TAILQ_REMOVE(&evcon->requests, req, next);
+
+	if (req->on_complete_cb != NULL) {
+		req->on_complete_cb(req, req->on_complete_cb_arg);
+	}
+
+	need_close =
+	    (REQ_VERSION_BEFORE(req, 1, 1) &&
+	    !evhttp_is_connection_keepalive(req->input_headers)) ||
+	    evhttp_is_request_connection_close(req);
+
+	EVUTIL_ASSERT(req->flags & EVHTTP_REQ_OWN_CONNECTION);
+	evhttp_request_free(req);
+
+	if (need_close) {
+		evhttp_connection_free(evcon);
+		return;
+	}
+
+	/* we have a persistent connection; try to accept another request. */
+	if (evhttp_associate_new_request_with_connection(evcon) == -1) {
+		evhttp_connection_free(evcon);
+	}
+}
+
+/*
+ * Returns an error page.
+ */
+
+void
+evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
+{
+
+#define ERR_FORMAT "<HTML><HEAD>\n" \
+	    "<TITLE>%d %s</TITLE>\n" \
+	    "</HEAD><BODY>\n" \
+	    "<H1>%s</H1>\n" \
+	    "</BODY></HTML>\n"
+
+	struct evbuffer *buf = evbuffer_new();
+	if (buf == NULL) {
+		/* if we cannot allocate memory; we just drop the connection */
+		evhttp_connection_free(req->evcon);
+		return;
+	}
+	if (reason == NULL) {
+		reason = evhttp_response_phrase_internal(error);
+	}
+
+	evhttp_response_code_(req, error, reason);
+
+	evbuffer_add_printf(buf, ERR_FORMAT, error, reason, reason);
+
+	evhttp_send_page_(req, buf);
+
+	evbuffer_free(buf);
+#undef ERR_FORMAT
+}
+
+/* Requires that headers and response code are already set up */
+
+static inline void
+evhttp_send(struct evhttp_request *req, struct evbuffer *databuf)
+{
+	struct evhttp_connection *evcon = req->evcon;
+
+	if (evcon == NULL) {
+		evhttp_request_free(req);
+		return;
+	}
+
+	EVUTIL_ASSERT(TAILQ_FIRST(&evcon->requests) == req);
+
+	/* we expect no more calls form the user on this request */
+	req->userdone = 1;
+
+	/* xxx: not sure if we really should expose the data buffer this way */
+	if (databuf != NULL)
+		evbuffer_add_buffer(req->output_buffer, databuf);
+
+	/* Adds headers to the response */
+	evhttp_make_header(evcon, req);
+
+	evhttp_write_buffer(evcon, evhttp_send_done, NULL);
+}
+
+void
+evhttp_send_reply(struct evhttp_request *req, int code, const char *reason,
+    struct evbuffer *databuf)
+{
+	evhttp_response_code_(req, code, reason);
+
+	evhttp_send(req, databuf);
+}
+
+void
+evhttp_send_reply_start(struct evhttp_request *req, int code,
+    const char *reason)
+{
+	evhttp_response_code_(req, code, reason);
+
+	if (req->evcon == NULL)
+		return;
+
+	if (evhttp_find_header(req->output_headers, "Content-Length") == NULL &&
+	    REQ_VERSION_ATLEAST(req, 1, 1) &&
+	    evhttp_response_needs_body(req)) {
+		/*
+		 * prefer HTTP/1.1 chunked encoding to closing the connection;
+		 * note RFC 2616 section 4.4 forbids it with Content-Length:
+		 * and it's not necessary then anyway.
+		 */
+		evhttp_add_header(req->output_headers, "Transfer-Encoding",
+		    "chunked");
+		req->chunked = 1;
+	} else {
+		req->chunked = 0;
+	}
+	evhttp_make_header(req->evcon, req);
+	evhttp_write_buffer(req->evcon, NULL, NULL);
+}
+
+void
+evhttp_send_reply_chunk_with_cb(struct evhttp_request *req, struct evbuffer *databuf,
+    void (*cb)(struct evhttp_connection *, void *), void *arg)
+{
+	struct evhttp_connection *evcon = req->evcon;
+	struct evbuffer *output;
+
+	if (evcon == NULL)
+		return;
+
+	output = bufferevent_get_output(evcon->bufev);
+
+	if (evbuffer_get_length(databuf) == 0)
+		return;
+	if (!evhttp_response_needs_body(req))
+		return;
+	if (req->chunked) {
+		evbuffer_add_printf(output, "%x\r\n",
+				    (unsigned)evbuffer_get_length(databuf));
+	}
+	evbuffer_add_buffer(output, databuf);
+	if (req->chunked) {
+		evbuffer_add(output, "\r\n", 2);
+	}
+	evhttp_write_buffer(evcon, cb, arg);
+}
+
+void
+evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf)
+{
+	evhttp_send_reply_chunk_with_cb(req, databuf, NULL, NULL);
+}
+void
+evhttp_send_reply_end(struct evhttp_request *req)
+{
+	struct evhttp_connection *evcon = req->evcon;
+	struct evbuffer *output;
+
+	if (evcon == NULL) {
+		evhttp_request_free(req);
+		return;
+	}
+
+	output = bufferevent_get_output(evcon->bufev);
+
+	/* we expect no more calls form the user on this request */
+	req->userdone = 1;
+
+	if (req->chunked) {
+		evbuffer_add(output, "0\r\n\r\n", 5);
+		evhttp_write_buffer(req->evcon, evhttp_send_done, NULL);
+		req->chunked = 0;
+	} else if (evbuffer_get_length(output) == 0) {
+		/* let the connection know that we are done with the request */
+		evhttp_send_done(evcon, NULL);
+	} else {
+		/* make the callback execute after all data has been written */
+		evcon->cb = evhttp_send_done;
+		evcon->cb_arg = NULL;
+	}
+}
+
+static const char *informational_phrases[] = {
+	/* 100 */ "Continue",
+	/* 101 */ "Switching Protocols"
+};
+
+static const char *success_phrases[] = {
+	/* 200 */ "OK",
+	/* 201 */ "Created",
+	/* 202 */ "Accepted",
+	/* 203 */ "Non-Authoritative Information",
+	/* 204 */ "No Content",
+	/* 205 */ "Reset Content",
+	/* 206 */ "Partial Content"
+};
+
+static const char *redirection_phrases[] = {
+	/* 300 */ "Multiple Choices",
+	/* 301 */ "Moved Permanently",
+	/* 302 */ "Found",
+	/* 303 */ "See Other",
+	/* 304 */ "Not Modified",
+	/* 305 */ "Use Proxy",
+	/* 307 */ "Temporary Redirect"
+};
+
+static const char *client_error_phrases[] = {
+	/* 400 */ "Bad Request",
+	/* 401 */ "Unauthorized",
+	/* 402 */ "Payment Required",
+	/* 403 */ "Forbidden",
+	/* 404 */ "Not Found",
+	/* 405 */ "Method Not Allowed",
+	/* 406 */ "Not Acceptable",
+	/* 407 */ "Proxy Authentication Required",
+	/* 408 */ "Request Time-out",
+	/* 409 */ "Conflict",
+	/* 410 */ "Gone",
+	/* 411 */ "Length Required",
+	/* 412 */ "Precondition Failed",
+	/* 413 */ "Request Entity Too Large",
+	/* 414 */ "Request-URI Too Large",
+	/* 415 */ "Unsupported Media Type",
+	/* 416 */ "Requested range not satisfiable",
+	/* 417 */ "Expectation Failed"
+};
+
+static const char *server_error_phrases[] = {
+	/* 500 */ "Internal Server Error",
+	/* 501 */ "Not Implemented",
+	/* 502 */ "Bad Gateway",
+	/* 503 */ "Service Unavailable",
+	/* 504 */ "Gateway Time-out",
+	/* 505 */ "HTTP Version not supported"
+};
+
+struct response_class {
+	const char *name;
+	size_t num_responses;
+	const char **responses;
+};
+
+#ifndef MEMBERSOF
+#define MEMBERSOF(x) (sizeof(x)/sizeof(x[0]))
+#endif
+
+static const struct response_class response_classes[] = {
+	/* 1xx */ { "Informational", MEMBERSOF(informational_phrases), informational_phrases },
+	/* 2xx */ { "Success", MEMBERSOF(success_phrases), success_phrases },
+	/* 3xx */ { "Redirection", MEMBERSOF(redirection_phrases), redirection_phrases },
+	/* 4xx */ { "Client Error", MEMBERSOF(client_error_phrases), client_error_phrases },
+	/* 5xx */ { "Server Error", MEMBERSOF(server_error_phrases), server_error_phrases }
+};
+
+static const char *
+evhttp_response_phrase_internal(int code)
+{
+	int klass = code / 100 - 1;
+	int subcode = code % 100;
+
+	/* Unknown class - can't do any better here */
+	if (klass < 0 || klass >= (int) MEMBERSOF(response_classes))
+		return "Unknown Status Class";
+
+	/* Unknown sub-code, return class name at least */
+	if (subcode >= (int) response_classes[klass].num_responses)
+		return response_classes[klass].name;
+
+	return response_classes[klass].responses[subcode];
+}
+
+void
+evhttp_response_code_(struct evhttp_request *req, int code, const char *reason)
+{
+	req->kind = EVHTTP_RESPONSE;
+	req->response_code = code;
+	if (req->response_code_line != NULL)
+		mm_free(req->response_code_line);
+	if (reason == NULL)
+		reason = evhttp_response_phrase_internal(code);
+	req->response_code_line = mm_strdup(reason);
+	if (req->response_code_line == NULL) {
+		event_warn("%s: strdup", __func__);
+		/* XXX what else can we do? */
+	}
+}
+
+void
+evhttp_send_page_(struct evhttp_request *req, struct evbuffer *databuf)
+{
+	if (!req->major || !req->minor) {
+		req->major = 1;
+		req->minor = 1;
+	}
+
+	if (req->kind != EVHTTP_RESPONSE)
+		evhttp_response_code_(req, 200, "OK");
+
+	evhttp_clear_headers(req->output_headers);
+	evhttp_add_header(req->output_headers, "Content-Type", "text/html");
+	evhttp_add_header(req->output_headers, "Connection", "close");
+
+	evhttp_send(req, databuf);
+}
+
+static const char uri_chars[256] = {
+	/* 0 */
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 1, 1, 0,
+	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 0, 0, 0, 0, 0, 0,
+	/* 64 */
+	0, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 0, 0, 0, 0, 1,
+	0, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 0, 0, 0, 1, 0,
+	/* 128 */
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	/* 192 */
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+#define CHAR_IS_UNRESERVED(c)			\
+	(uri_chars[(unsigned char)(c)])
+
+/*
+ * Helper functions to encode/decode a string for inclusion in a URI.
+ * The returned string must be freed by the caller.
+ */
+char *
+evhttp_uriencode(const char *uri, ev_ssize_t len, int space_as_plus)
+{
+	struct evbuffer *buf = evbuffer_new();
+	const char *p, *end;
+	char *result = NULL;
+
+	if (!buf) {
+		goto out;
+	}
+
+	if (len >= 0) {
+		if (uri + len < uri) {
+			goto out;
+		}
+
+		end = uri + len;
+	} else {
+		size_t slen = strlen(uri);
+
+		if (slen >= EV_SSIZE_MAX) {
+			/* we don't want to mix signed and unsigned */
+			goto out;
+		}
+
+		if (uri + slen < uri) {
+			goto out;
+		}
+
+		end = uri + slen;
+	}
+
+	for (p = uri; p < end; p++) {
+		if (CHAR_IS_UNRESERVED(*p)) {
+			evbuffer_add(buf, p, 1);
+		} else if (*p == ' ' && space_as_plus) {
+			evbuffer_add(buf, "+", 1);
+		} else {
+			evbuffer_add_printf(buf, "%%%02X", (unsigned char)(*p));
+		}
+	}
+
+	evbuffer_add(buf, "", 1); /* NUL-terminator. */
+	result = mm_malloc(evbuffer_get_length(buf));
+
+	if (result)
+		evbuffer_remove(buf, result, evbuffer_get_length(buf));
+
+out:
+	if (buf)
+		evbuffer_free(buf);
+	return result;
+}
+
+char *
+evhttp_encode_uri(const char *str)
+{
+	return evhttp_uriencode(str, -1, 0);
+}
+
+/*
+ * @param decode_plus_ctl: if 1, we decode plus into space.  If 0, we don't.
+ *     If -1, when true we transform plus to space only after we've seen
+ *     a ?.  -1 is deprecated.
+ * @return the number of bytes written to 'ret'.
+ */
+int
+evhttp_decode_uri_internal(
+	const char *uri, size_t length, char *ret, int decode_plus_ctl)
+{
+	char c;
+	int j;
+	int decode_plus = (decode_plus_ctl == 1) ? 1: 0;
+	unsigned i;
+
+	for (i = j = 0; i < length; i++) {
+		c = uri[i];
+		if (c == '?') {
+			if (decode_plus_ctl < 0)
+				decode_plus = 1;
+		} else if (c == '+' && decode_plus) {
+			c = ' ';
+		} else if ((i + 2) < length && c == '%' &&
+			EVUTIL_ISXDIGIT_(uri[i+1]) && EVUTIL_ISXDIGIT_(uri[i+2])) {
+			char tmp[3];
+			tmp[0] = uri[i+1];
+			tmp[1] = uri[i+2];
+			tmp[2] = '\0';
+			c = (char)strtol(tmp, NULL, 16);
+			i += 2;
+		}
+		ret[j++] = c;
+	}
+	ret[j] = '\0';
+
+	return (j);
+}
+
+/* deprecated */
+char *
+evhttp_decode_uri(const char *uri)
+{
+	char *ret;
+
+	if ((ret = mm_malloc(strlen(uri) + 1)) == NULL) {
+		event_warn("%s: malloc(%lu)", __func__,
+			  (unsigned long)(strlen(uri) + 1));
+		return (NULL);
+	}
+
+	evhttp_decode_uri_internal(uri, strlen(uri),
+	    ret, -1 /*always_decode_plus*/);
+
+	return (ret);
+}
+
+char *
+evhttp_uridecode(const char *uri, int decode_plus, size_t *size_out)
+{
+	char *ret;
+	int n;
+
+	if ((ret = mm_malloc(strlen(uri) + 1)) == NULL) {
+		event_warn("%s: malloc(%lu)", __func__,
+			  (unsigned long)(strlen(uri) + 1));
+		return (NULL);
+	}
+
+	n = evhttp_decode_uri_internal(uri, strlen(uri),
+	    ret, !!decode_plus/*always_decode_plus*/);
+
+	if (size_out) {
+		EVUTIL_ASSERT(n >= 0);
+		*size_out = (size_t)n;
+	}
+
+	return (ret);
+}
+
+/*
+ * Helper function to parse out arguments in a query.
+ * The arguments are separated by key and value.
+ */
+
+static int
+evhttp_parse_query_impl(const char *str, struct evkeyvalq *headers,
+    int is_whole_uri)
+{
+	char *line=NULL;
+	char *argument;
+	char *p;
+	const char *query_part;
+	int result = -1;
+	struct evhttp_uri *uri=NULL;
+
+	TAILQ_INIT(headers);
+
+	if (is_whole_uri) {
+		uri = evhttp_uri_parse(str);
+		if (!uri)
+			goto error;
+		query_part = evhttp_uri_get_query(uri);
+	} else {
+		query_part = str;
+	}
+
+	/* No arguments - we are done */
+	if (!query_part || !strlen(query_part)) {
+		result = 0;
+		goto done;
+	}
+
+	if ((line = mm_strdup(query_part)) == NULL) {
+		event_warn("%s: strdup", __func__);
+		goto error;
+	}
+
+	p = argument = line;
+	while (p != NULL && *p != '\0') {
+		char *key, *value, *decoded_value;
+		argument = strsep(&p, "&");
+
+		value = argument;
+		key = strsep(&value, "=");
+		if (value == NULL || *key == '\0') {
+			goto error;
+		}
+
+		if ((decoded_value = mm_malloc(strlen(value) + 1)) == NULL) {
+			event_warn("%s: mm_malloc", __func__);
+			goto error;
+		}
+		evhttp_decode_uri_internal(value, strlen(value),
+		    decoded_value, 1 /*always_decode_plus*/);
+		event_debug(("Query Param: %s -> %s\n", key, decoded_value));
+		evhttp_add_header_internal(headers, key, decoded_value);
+		mm_free(decoded_value);
+	}
+
+	result = 0;
+	goto done;
+error:
+	evhttp_clear_headers(headers);
+done:
+	if (line)
+		mm_free(line);
+	if (uri)
+		evhttp_uri_free(uri);
+	return result;
+}
+
+int
+evhttp_parse_query(const char *uri, struct evkeyvalq *headers)
+{
+	return evhttp_parse_query_impl(uri, headers, 1);
+}
+int
+evhttp_parse_query_str(const char *uri, struct evkeyvalq *headers)
+{
+	return evhttp_parse_query_impl(uri, headers, 0);
+}
+
+static struct evhttp_cb *
+evhttp_dispatch_callback(struct httpcbq *callbacks, struct evhttp_request *req)
+{
+	struct evhttp_cb *cb;
+	size_t offset = 0;
+	char *translated;
+	const char *path;
+
+	/* Test for different URLs */
+	path = evhttp_uri_get_path(req->uri_elems);
+	offset = strlen(path);
+	if ((translated = mm_malloc(offset + 1)) == NULL)
+		return (NULL);
+	evhttp_decode_uri_internal(path, offset, translated,
+	    0 /* decode_plus */);
+
+	TAILQ_FOREACH(cb, callbacks, next) {
+		if (!strcmp(cb->what, translated)) {
+			mm_free(translated);
+			return (cb);
+		}
+	}
+
+	mm_free(translated);
+	return (NULL);
+}
+
+
+static int
+prefix_suffix_match(const char *pattern, const char *name, int ignorecase)
+{
+	char c;
+
+	while (1) {
+		switch (c = *pattern++) {
+		case '\0':
+			return *name == '\0';
+
+		case '*':
+			while (*name != '\0') {
+				if (prefix_suffix_match(pattern, name,
+					ignorecase))
+					return (1);
+				++name;
+			}
+			return (0);
+		default:
+			if (c != *name) {
+				if (!ignorecase ||
+				    EVUTIL_TOLOWER_(c) != EVUTIL_TOLOWER_(*name))
+					return (0);
+			}
+			++name;
+		}
+	}
+	/* NOTREACHED */
+}
+
+/*
+   Search the vhost hierarchy beginning with http for a server alias
+   matching hostname.  If a match is found, and outhttp is non-null,
+   outhttp is set to the matching http object and 1 is returned.
+*/
+
+static int
+evhttp_find_alias(struct evhttp *http, struct evhttp **outhttp,
+		  const char *hostname)
+{
+	struct evhttp_server_alias *alias;
+	struct evhttp *vhost;
+
+	TAILQ_FOREACH(alias, &http->aliases, next) {
+		/* XXX Do we need to handle IP addresses? */
+		if (!evutil_ascii_strcasecmp(alias->alias, hostname)) {
+			if (outhttp)
+				*outhttp = http;
+			return 1;
+		}
+	}
+
+	/* XXX It might be good to avoid recursion here, but I don't
+	   see a way to do that w/o a list. */
+	TAILQ_FOREACH(vhost, &http->virtualhosts, next_vhost) {
+		if (evhttp_find_alias(vhost, outhttp, hostname))
+			return 1;
+	}
+
+	return 0;
+}
+
+/*
+   Attempts to find the best http object to handle a request for a hostname.
+   All aliases for the root http object and vhosts are searched for an exact
+   match. Then, the vhost hierarchy is traversed again for a matching
+   pattern.
+
+   If an alias or vhost is matched, 1 is returned, and outhttp, if non-null,
+   is set with the best matching http object. If there are no matches, the
+   root http object is stored in outhttp and 0 is returned.
+*/
+
+static int
+evhttp_find_vhost(struct evhttp *http, struct evhttp **outhttp,
+		  const char *hostname)
+{
+	struct evhttp *vhost;
+	struct evhttp *oldhttp;
+	int match_found = 0;
+
+	if (evhttp_find_alias(http, outhttp, hostname))
+		return 1;
+
+	do {
+		oldhttp = http;
+		TAILQ_FOREACH(vhost, &http->virtualhosts, next_vhost) {
+			if (prefix_suffix_match(vhost->vhost_pattern,
+				hostname, 1 /* ignorecase */)) {
+				http = vhost;
+				match_found = 1;
+				break;
+			}
+		}
+	} while (oldhttp != http);
+
+	if (outhttp)
+		*outhttp = http;
+
+	return match_found;
+}
+
+static void
+evhttp_handle_request(struct evhttp_request *req, void *arg)
+{
+	struct evhttp *http = arg;
+	struct evhttp_cb *cb = NULL;
+	const char *hostname;
+
+	/* we have a new request on which the user needs to take action */
+	req->userdone = 0;
+
+	bufferevent_disable(req->evcon->bufev, EV_READ);
+
+	if (req->type == 0 || req->uri == NULL) {
+		evhttp_send_error(req, req->response_code, NULL);
+		return;
+	}
+
+	if ((http->allowed_methods & req->type) == 0) {
+		event_debug(("Rejecting disallowed method %x (allowed: %x)\n",
+			(unsigned)req->type, (unsigned)http->allowed_methods));
+		evhttp_send_error(req, HTTP_NOTIMPLEMENTED, NULL);
+		return;
+	}
+
+	/* handle potential virtual hosts */
+	hostname = evhttp_request_get_host(req);
+	if (hostname != NULL) {
+		evhttp_find_vhost(http, &http, hostname);
+	}
+
+	if ((cb = evhttp_dispatch_callback(&http->callbacks, req)) != NULL) {
+		(*cb->cb)(req, cb->cbarg);
+		return;
+	}
+
+	/* Generic call back */
+	if (http->gencb) {
+		(*http->gencb)(req, http->gencbarg);
+		return;
+	} else {
+		/* We need to send a 404 here */
+#define ERR_FORMAT "<html><head>" \
+		    "<title>404 Not Found</title>" \
+		    "</head><body>" \
+		    "<h1>Not Found</h1>" \
+		    "<p>The requested URL %s was not found on this server.</p>"\
+		    "</body></html>\n"
+
+		char *escaped_html;
+		struct evbuffer *buf;
+
+		if ((escaped_html = evhttp_htmlescape(req->uri)) == NULL) {
+			evhttp_connection_free(req->evcon);
+			return;
+		}
+
+		if ((buf = evbuffer_new()) == NULL) {
+			mm_free(escaped_html);
+			evhttp_connection_free(req->evcon);
+			return;
+		}
+
+		evhttp_response_code_(req, HTTP_NOTFOUND, "Not Found");
+
+		evbuffer_add_printf(buf, ERR_FORMAT, escaped_html);
+
+		mm_free(escaped_html);
+
+		evhttp_send_page_(req, buf);
+
+		evbuffer_free(buf);
+#undef ERR_FORMAT
+	}
+}
+
+/* Listener callback when a connection arrives at a server. */
+static void
+accept_socket_cb(struct evconnlistener *listener, evutil_socket_t nfd, struct sockaddr *peer_sa, int peer_socklen, void *arg)
+{
+	struct evhttp *http = arg;
+
+	evhttp_get_request(http, nfd, peer_sa, peer_socklen);
+}
+
+int
+evhttp_bind_socket(struct evhttp *http, const char *address, ev_uint16_t port)
+{
+	struct evhttp_bound_socket *bound =
+		evhttp_bind_socket_with_handle(http, address, port);
+	if (bound == NULL)
+		return (-1);
+	return (0);
+}
+
+struct evhttp_bound_socket *
+evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port)
+{
+	evutil_socket_t fd;
+	struct evhttp_bound_socket *bound;
+	int serrno;
+
+	if ((fd = bind_socket(address, port, 1 /*reuse*/)) == -1)
+		return (NULL);
+
+	if (listen(fd, 128) == -1) {
+		serrno = EVUTIL_SOCKET_ERROR();
+		event_sock_warn(fd, "%s: listen", __func__);
+		evutil_closesocket(fd);
+		EVUTIL_SET_SOCKET_ERROR(serrno);
+		return (NULL);
+	}
+
+	bound = evhttp_accept_socket_with_handle(http, fd);
+
+	if (bound != NULL) {
+		event_debug(("Bound to port %d - Awaiting connections ... ",
+			port));
+		return (bound);
+	}
+
+	return (NULL);
+}
+
+int
+evhttp_accept_socket(struct evhttp *http, evutil_socket_t fd)
+{
+	struct evhttp_bound_socket *bound =
+		evhttp_accept_socket_with_handle(http, fd);
+	if (bound == NULL)
+		return (-1);
+	return (0);
+}
+
+void
+evhttp_foreach_bound_socket(struct evhttp *http,
+                            evhttp_bound_socket_foreach_fn *function,
+                            void *argument)
+{
+	struct evhttp_bound_socket *bound;
+
+	TAILQ_FOREACH(bound, &http->sockets, next)
+		function(bound, argument);
+}
+
+struct evhttp_bound_socket *
+evhttp_accept_socket_with_handle(struct evhttp *http, evutil_socket_t fd)
+{
+	struct evhttp_bound_socket *bound;
+	struct evconnlistener *listener;
+	const int flags =
+	    LEV_OPT_REUSEABLE|LEV_OPT_CLOSE_ON_EXEC|LEV_OPT_CLOSE_ON_FREE;
+
+	listener = evconnlistener_new(http->base, NULL, NULL,
+	    flags,
+	    0, /* Backlog is '0' because we already said 'listen' */
+	    fd);
+	if (!listener)
+		return (NULL);
+
+	bound = evhttp_bind_listener(http, listener);
+	if (!bound) {
+		evconnlistener_free(listener);
+		return (NULL);
+	}
+	return (bound);
+}
+
+struct evhttp_bound_socket *
+evhttp_bind_listener(struct evhttp *http, struct evconnlistener *listener)
+{
+	struct evhttp_bound_socket *bound;
+
+	bound = mm_malloc(sizeof(struct evhttp_bound_socket));
+	if (bound == NULL)
+		return (NULL);
+
+	bound->listener = listener;
+	TAILQ_INSERT_TAIL(&http->sockets, bound, next);
+
+	evconnlistener_set_cb(listener, accept_socket_cb, http);
+	return bound;
+}
+
+evutil_socket_t
+evhttp_bound_socket_get_fd(struct evhttp_bound_socket *bound)
+{
+	return evconnlistener_get_fd(bound->listener);
+}
+
+struct evconnlistener *
+evhttp_bound_socket_get_listener(struct evhttp_bound_socket *bound)
+{
+	return bound->listener;
+}
+
+void
+evhttp_del_accept_socket(struct evhttp *http, struct evhttp_bound_socket *bound)
+{
+	TAILQ_REMOVE(&http->sockets, bound, next);
+	evconnlistener_free(bound->listener);
+	mm_free(bound);
+}
+
+static struct evhttp*
+evhttp_new_object(void)
+{
+	struct evhttp *http = NULL;
+
+	if ((http = mm_calloc(1, sizeof(struct evhttp))) == NULL) {
+		event_warn("%s: calloc", __func__);
+		return (NULL);
+	}
+
+	evutil_timerclear(&http->timeout);
+	evhttp_set_max_headers_size(http, EV_SIZE_MAX);
+	evhttp_set_max_body_size(http, EV_SIZE_MAX);
+	evhttp_set_default_content_type(http, "text/html; charset=ISO-8859-1");
+	evhttp_set_allowed_methods(http,
+	    EVHTTP_REQ_GET |
+	    EVHTTP_REQ_POST |
+	    EVHTTP_REQ_HEAD |
+	    EVHTTP_REQ_PUT |
+	    EVHTTP_REQ_DELETE);
+
+	TAILQ_INIT(&http->sockets);
+	TAILQ_INIT(&http->callbacks);
+	TAILQ_INIT(&http->connections);
+	TAILQ_INIT(&http->virtualhosts);
+	TAILQ_INIT(&http->aliases);
+
+	return (http);
+}
+
+struct evhttp *
+evhttp_new(struct event_base *base)
+{
+	struct evhttp *http = NULL;
+
+	http = evhttp_new_object();
+	if (http == NULL)
+		return (NULL);
+	http->base = base;
+
+	return (http);
+}
+
+/*
+ * Start a web server on the specified address and port.
+ */
+
+struct evhttp *
+evhttp_start(const char *address, ev_uint16_t port)
+{
+	struct evhttp *http = NULL;
+
+	http = evhttp_new_object();
+	if (http == NULL)
+		return (NULL);
+	if (evhttp_bind_socket(http, address, port) == -1) {
+		mm_free(http);
+		return (NULL);
+	}
+
+	return (http);
+}
+
+void
+evhttp_free(struct evhttp* http)
+{
+	struct evhttp_cb *http_cb;
+	struct evhttp_connection *evcon;
+	struct evhttp_bound_socket *bound;
+	struct evhttp* vhost;
+	struct evhttp_server_alias *alias;
+
+	/* Remove the accepting part */
+	while ((bound = TAILQ_FIRST(&http->sockets)) != NULL) {
+		TAILQ_REMOVE(&http->sockets, bound, next);
+
+		evconnlistener_free(bound->listener);
+
+		mm_free(bound);
+	}
+
+	while ((evcon = TAILQ_FIRST(&http->connections)) != NULL) {
+		/* evhttp_connection_free removes the connection */
+		evhttp_connection_free(evcon);
+	}
+
+	while ((http_cb = TAILQ_FIRST(&http->callbacks)) != NULL) {
+		TAILQ_REMOVE(&http->callbacks, http_cb, next);
+		mm_free(http_cb->what);
+		mm_free(http_cb);
+	}
+
+	while ((vhost = TAILQ_FIRST(&http->virtualhosts)) != NULL) {
+		TAILQ_REMOVE(&http->virtualhosts, vhost, next_vhost);
+
+		evhttp_free(vhost);
+	}
+
+	if (http->vhost_pattern != NULL)
+		mm_free(http->vhost_pattern);
+
+	while ((alias = TAILQ_FIRST(&http->aliases)) != NULL) {
+		TAILQ_REMOVE(&http->aliases, alias, next);
+		mm_free(alias->alias);
+		mm_free(alias);
+	}
+
+	mm_free(http);
+}
+
+int
+evhttp_add_virtual_host(struct evhttp* http, const char *pattern,
+    struct evhttp* vhost)
+{
+	/* a vhost can only be a vhost once and should not have bound sockets */
+	if (vhost->vhost_pattern != NULL ||
+	    TAILQ_FIRST(&vhost->sockets) != NULL)
+		return (-1);
+
+	vhost->vhost_pattern = mm_strdup(pattern);
+	if (vhost->vhost_pattern == NULL)
+		return (-1);
+
+	TAILQ_INSERT_TAIL(&http->virtualhosts, vhost, next_vhost);
+
+	return (0);
+}
+
+int
+evhttp_remove_virtual_host(struct evhttp* http, struct evhttp* vhost)
+{
+	if (vhost->vhost_pattern == NULL)
+		return (-1);
+
+	TAILQ_REMOVE(&http->virtualhosts, vhost, next_vhost);
+
+	mm_free(vhost->vhost_pattern);
+	vhost->vhost_pattern = NULL;
+
+	return (0);
+}
+
+int
+evhttp_add_server_alias(struct evhttp *http, const char *alias)
+{
+	struct evhttp_server_alias *evalias;
+
+	evalias = mm_calloc(1, sizeof(*evalias));
+	if (!evalias)
+		return -1;
+
+	evalias->alias = mm_strdup(alias);
+	if (!evalias->alias) {
+		mm_free(evalias);
+		return -1;
+	}
+
+	TAILQ_INSERT_TAIL(&http->aliases, evalias, next);
+
+	return 0;
+}
+
+int
+evhttp_remove_server_alias(struct evhttp *http, const char *alias)
+{
+	struct evhttp_server_alias *evalias;
+
+	TAILQ_FOREACH(evalias, &http->aliases, next) {
+		if (evutil_ascii_strcasecmp(evalias->alias, alias) == 0) {
+			TAILQ_REMOVE(&http->aliases, evalias, next);
+			mm_free(evalias->alias);
+			mm_free(evalias);
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+void
+evhttp_set_timeout(struct evhttp* http, int timeout_in_secs)
+{
+	if (timeout_in_secs == -1) {
+		evhttp_set_timeout_tv(http, NULL);
+	} else {
+		struct timeval tv;
+		tv.tv_sec = timeout_in_secs;
+		tv.tv_usec = 0;
+		evhttp_set_timeout_tv(http, &tv);
+	}
+}
+
+void
+evhttp_set_timeout_tv(struct evhttp* http, const struct timeval* tv)
+{
+	if (tv) {
+		http->timeout = *tv;
+	} else {
+		evutil_timerclear(&http->timeout);
+	}
+}
+
+int evhttp_set_flags(struct evhttp *http, int flags)
+{
+	int avail_flags = 0;
+	avail_flags |= EVHTTP_SERVER_LINGERING_CLOSE;
+
+	if (flags & ~avail_flags)
+		return 1;
+	http->flags &= ~avail_flags;
+
+	http->flags |= flags;
+
+	return 0;
+}
+
+void
+evhttp_set_max_headers_size(struct evhttp* http, ev_ssize_t max_headers_size)
+{
+	if (max_headers_size < 0)
+		http->default_max_headers_size = EV_SIZE_MAX;
+	else
+		http->default_max_headers_size = max_headers_size;
+}
+
+void
+evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size)
+{
+	if (max_body_size < 0)
+		http->default_max_body_size = EV_UINT64_MAX;
+	else
+		http->default_max_body_size = max_body_size;
+}
+
+void
+evhttp_set_default_content_type(struct evhttp *http,
+	const char *content_type) {
+	http->default_content_type = content_type;
+}
+
+void
+evhttp_set_allowed_methods(struct evhttp* http, ev_uint16_t methods)
+{
+	http->allowed_methods = methods;
+}
+
+int
+evhttp_set_cb(struct evhttp *http, const char *uri,
+    void (*cb)(struct evhttp_request *, void *), void *cbarg)
+{
+	struct evhttp_cb *http_cb;
+
+	TAILQ_FOREACH(http_cb, &http->callbacks, next) {
+		if (strcmp(http_cb->what, uri) == 0)
+			return (-1);
+	}
+
+	if ((http_cb = mm_calloc(1, sizeof(struct evhttp_cb))) == NULL) {
+		event_warn("%s: calloc", __func__);
+		return (-2);
+	}
+
+	http_cb->what = mm_strdup(uri);
+	if (http_cb->what == NULL) {
+		event_warn("%s: strdup", __func__);
+		mm_free(http_cb);
+		return (-3);
+	}
+	http_cb->cb = cb;
+	http_cb->cbarg = cbarg;
+
+	TAILQ_INSERT_TAIL(&http->callbacks, http_cb, next);
+
+	return (0);
+}
+
+int
+evhttp_del_cb(struct evhttp *http, const char *uri)
+{
+	struct evhttp_cb *http_cb;
+
+	TAILQ_FOREACH(http_cb, &http->callbacks, next) {
+		if (strcmp(http_cb->what, uri) == 0)
+			break;
+	}
+	if (http_cb == NULL)
+		return (-1);
+
+	TAILQ_REMOVE(&http->callbacks, http_cb, next);
+	mm_free(http_cb->what);
+	mm_free(http_cb);
+
+	return (0);
+}
+
+void
+evhttp_set_gencb(struct evhttp *http,
+    void (*cb)(struct evhttp_request *, void *), void *cbarg)
+{
+	http->gencb = cb;
+	http->gencbarg = cbarg;
+}
+
+void
+evhttp_set_bevcb(struct evhttp *http,
+    struct bufferevent* (*cb)(struct event_base *, void *), void *cbarg)
+{
+	http->bevcb = cb;
+	http->bevcbarg = cbarg;
+}
+
+/*
+ * Request related functions
+ */
+
+struct evhttp_request *
+evhttp_request_new(void (*cb)(struct evhttp_request *, void *), void *arg)
+{
+	struct evhttp_request *req = NULL;
+
+	/* Allocate request structure */
+	if ((req = mm_calloc(1, sizeof(struct evhttp_request))) == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto error;
+	}
+
+	req->headers_size = 0;
+	req->body_size = 0;
+
+	req->kind = EVHTTP_RESPONSE;
+	req->input_headers = mm_calloc(1, sizeof(struct evkeyvalq));
+	if (req->input_headers == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto error;
+	}
+	TAILQ_INIT(req->input_headers);
+
+	req->output_headers = mm_calloc(1, sizeof(struct evkeyvalq));
+	if (req->output_headers == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto error;
+	}
+	TAILQ_INIT(req->output_headers);
+
+	if ((req->input_buffer = evbuffer_new()) == NULL) {
+		event_warn("%s: evbuffer_new", __func__);
+		goto error;
+	}
+
+	if ((req->output_buffer = evbuffer_new()) == NULL) {
+		event_warn("%s: evbuffer_new", __func__);
+		goto error;
+	}
+
+	req->cb = cb;
+	req->cb_arg = arg;
+
+	return (req);
+
+ error:
+	if (req != NULL)
+		evhttp_request_free(req);
+	return (NULL);
+}
+
+void
+evhttp_request_free(struct evhttp_request *req)
+{
+	if ((req->flags & EVHTTP_REQ_DEFER_FREE) != 0) {
+		req->flags |= EVHTTP_REQ_NEEDS_FREE;
+		return;
+	}
+
+	if (req->remote_host != NULL)
+		mm_free(req->remote_host);
+	if (req->uri != NULL)
+		mm_free(req->uri);
+	if (req->uri_elems != NULL)
+		evhttp_uri_free(req->uri_elems);
+	if (req->response_code_line != NULL)
+		mm_free(req->response_code_line);
+	if (req->host_cache != NULL)
+		mm_free(req->host_cache);
+
+	evhttp_clear_headers(req->input_headers);
+	mm_free(req->input_headers);
+
+	evhttp_clear_headers(req->output_headers);
+	mm_free(req->output_headers);
+
+	if (req->input_buffer != NULL)
+		evbuffer_free(req->input_buffer);
+
+	if (req->output_buffer != NULL)
+		evbuffer_free(req->output_buffer);
+
+	mm_free(req);
+}
+
+void
+evhttp_request_own(struct evhttp_request *req)
+{
+	req->flags |= EVHTTP_USER_OWNED;
+}
+
+int
+evhttp_request_is_owned(struct evhttp_request *req)
+{
+	return (req->flags & EVHTTP_USER_OWNED) != 0;
+}
+
+struct evhttp_connection *
+evhttp_request_get_connection(struct evhttp_request *req)
+{
+	return req->evcon;
+}
+
+struct event_base *
+evhttp_connection_get_base(struct evhttp_connection *conn)
+{
+	return conn->base;
+}
+
+void
+evhttp_request_set_chunked_cb(struct evhttp_request *req,
+    void (*cb)(struct evhttp_request *, void *))
+{
+	req->chunk_cb = cb;
+}
+
+void
+evhttp_request_set_header_cb(struct evhttp_request *req,
+    int (*cb)(struct evhttp_request *, void *))
+{
+	req->header_cb = cb;
+}
+
+void
+evhttp_request_set_error_cb(struct evhttp_request *req,
+    void (*cb)(enum evhttp_request_error, void *))
+{
+	req->error_cb = cb;
+}
+
+void
+evhttp_request_set_on_complete_cb(struct evhttp_request *req,
+    void (*cb)(struct evhttp_request *, void *), void *cb_arg)
+{
+	req->on_complete_cb = cb;
+	req->on_complete_cb_arg = cb_arg;
+}
+
+/*
+ * Allows for inspection of the request URI
+ */
+
+const char *
+evhttp_request_get_uri(const struct evhttp_request *req) {
+	if (req->uri == NULL)
+		event_debug(("%s: request %p has no uri\n", __func__, req));
+	return (req->uri);
+}
+
+const struct evhttp_uri *
+evhttp_request_get_evhttp_uri(const struct evhttp_request *req) {
+	if (req->uri_elems == NULL)
+		event_debug(("%s: request %p has no uri elems\n",
+			    __func__, req));
+	return (req->uri_elems);
+}
+
+const char *
+evhttp_request_get_host(struct evhttp_request *req)
+{
+	const char *host = NULL;
+
+	if (req->host_cache)
+		return req->host_cache;
+
+	if (req->uri_elems)
+		host = evhttp_uri_get_host(req->uri_elems);
+	if (!host && req->input_headers) {
+		const char *p;
+		size_t len;
+
+		host = evhttp_find_header(req->input_headers, "Host");
+		/* The Host: header may include a port. Remove it here
+		   to be consistent with uri_elems case above. */
+		if (host) {
+			p = host + strlen(host) - 1;
+			while (p > host && EVUTIL_ISDIGIT_(*p))
+				--p;
+			if (p > host && *p == ':') {
+				len = p - host;
+				req->host_cache = mm_malloc(len + 1);
+				if (!req->host_cache) {
+					event_warn("%s: malloc", __func__);
+					return NULL;
+				}
+				memcpy(req->host_cache, host, len);
+				req->host_cache[len] = '\0';
+				host = req->host_cache;
+			}
+		}
+	}
+
+	return host;
+}
+
+enum evhttp_cmd_type
+evhttp_request_get_command(const struct evhttp_request *req) {
+	return (req->type);
+}
+
+int
+evhttp_request_get_response_code(const struct evhttp_request *req)
+{
+	return req->response_code;
+}
+
+const char *
+evhttp_request_get_response_code_line(const struct evhttp_request *req)
+{
+	return req->response_code_line;
+}
+
+/** Returns the input headers */
+struct evkeyvalq *evhttp_request_get_input_headers(struct evhttp_request *req)
+{
+	return (req->input_headers);
+}
+
+/** Returns the output headers */
+struct evkeyvalq *evhttp_request_get_output_headers(struct evhttp_request *req)
+{
+	return (req->output_headers);
+}
+
+/** Returns the input buffer */
+struct evbuffer *evhttp_request_get_input_buffer(struct evhttp_request *req)
+{
+	return (req->input_buffer);
+}
+
+/** Returns the output buffer */
+struct evbuffer *evhttp_request_get_output_buffer(struct evhttp_request *req)
+{
+	return (req->output_buffer);
+}
+
+
+/*
+ * Takes a file descriptor to read a request from.
+ * The callback is executed once the whole request has been read.
+ */
+
+static struct evhttp_connection*
+evhttp_get_request_connection(
+	struct evhttp* http,
+	evutil_socket_t fd, struct sockaddr *sa, ev_socklen_t salen)
+{
+	struct evhttp_connection *evcon;
+	char *hostname = NULL, *portname = NULL;
+	struct bufferevent* bev = NULL;
+
+#ifdef EVENT__HAVE_STRUCT_SOCKADDR_UN
+	if (sa->sa_family == AF_UNIX) {
+		struct sockaddr_un *sa_un = (struct sockaddr_un *)sa;
+		sa_un->sun_path[0] = '\0';
+	}
+#endif
+
+	name_from_addr(sa, salen, &hostname, &portname);
+	if (hostname == NULL || portname == NULL) {
+		if (hostname) mm_free(hostname);
+		if (portname) mm_free(portname);
+		return (NULL);
+	}
+
+	event_debug(("%s: new request from %s:%s on "EV_SOCK_FMT"\n",
+		__func__, hostname, portname, EV_SOCK_ARG(fd)));
+
+	/* we need a connection object to put the http request on */
+	if (http->bevcb != NULL) {
+		bev = (*http->bevcb)(http->base, http->bevcbarg);
+	}
+	evcon = evhttp_connection_base_bufferevent_new(
+		http->base, NULL, bev, hostname, atoi(portname));
+	mm_free(hostname);
+	mm_free(portname);
+	if (evcon == NULL)
+		return (NULL);
+
+	evcon->max_headers_size = http->default_max_headers_size;
+	evcon->max_body_size = http->default_max_body_size;
+	if (http->flags & EVHTTP_SERVER_LINGERING_CLOSE)
+		evcon->flags |= EVHTTP_CON_LINGERING_CLOSE;
+
+	evcon->flags |= EVHTTP_CON_INCOMING;
+	evcon->state = EVCON_READING_FIRSTLINE;
+
+	evcon->fd = fd;
+
+	if (bufferevent_setfd(evcon->bufev, fd))
+		goto err;
+	if (bufferevent_enable(evcon->bufev, EV_READ))
+		goto err;
+	if (bufferevent_disable(evcon->bufev, EV_WRITE))
+		goto err;
+	bufferevent_socket_set_conn_address_(evcon->bufev, sa, salen);
+
+	return (evcon);
+
+err:
+	evhttp_connection_free(evcon);
+	return (NULL);
+}
+
+static int
+evhttp_associate_new_request_with_connection(struct evhttp_connection *evcon)
+{
+	struct evhttp *http = evcon->http_server;
+	struct evhttp_request *req;
+	if ((req = evhttp_request_new(evhttp_handle_request, http)) == NULL)
+		return (-1);
+
+	if ((req->remote_host = mm_strdup(evcon->address)) == NULL) {
+		event_warn("%s: strdup", __func__);
+		evhttp_request_free(req);
+		return (-1);
+	}
+	req->remote_port = evcon->port;
+
+	req->evcon = evcon;	/* the request ends up owning the connection */
+	req->flags |= EVHTTP_REQ_OWN_CONNECTION;
+
+	/* We did not present the request to the user user yet, so treat it as
+	 * if the user was done with the request.  This allows us to free the
+	 * request on a persistent connection if the client drops it without
+	 * sending a request.
+	 */
+	req->userdone = 1;
+
+	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
+
+	req->kind = EVHTTP_REQUEST;
+
+
+	evhttp_start_read_(evcon);
+
+	return (0);
+}
+
+static void
+evhttp_get_request(struct evhttp *http, evutil_socket_t fd,
+    struct sockaddr *sa, ev_socklen_t salen)
+{
+	struct evhttp_connection *evcon;
+
+	evcon = evhttp_get_request_connection(http, fd, sa, salen);
+	if (evcon == NULL) {
+		event_sock_warn(fd, "%s: cannot get connection on "EV_SOCK_FMT,
+		    __func__, EV_SOCK_ARG(fd));
+		evutil_closesocket(fd);
+		return;
+	}
+
+	/* the timeout can be used by the server to close idle connections */
+	if (evutil_timerisset(&http->timeout))
+		evhttp_connection_set_timeout_tv(evcon, &http->timeout);
+
+	/*
+	 * if we want to accept more than one request on a connection,
+	 * we need to know which http server it belongs to.
+	 */
+	evcon->http_server = http;
+	TAILQ_INSERT_TAIL(&http->connections, evcon, next);
+
+	if (evhttp_associate_new_request_with_connection(evcon) == -1)
+		evhttp_connection_free(evcon);
+}
+
+
+/*
+ * Network helper functions that we do not want to export to the rest of
+ * the world.
+ */
+
+static void
+name_from_addr(struct sockaddr *sa, ev_socklen_t salen,
+    char **phost, char **pport)
+{
+	char ntop[NI_MAXHOST];
+	char strport[NI_MAXSERV];
+	int ni_result;
+
+#ifdef EVENT__HAVE_GETNAMEINFO
+	ni_result = getnameinfo(sa, salen,
+		ntop, sizeof(ntop), strport, sizeof(strport),
+		NI_NUMERICHOST|NI_NUMERICSERV);
+
+	if (ni_result != 0) {
+#ifdef EAI_SYSTEM
+		/* Windows doesn't have an EAI_SYSTEM. */
+		if (ni_result == EAI_SYSTEM)
+			event_err(1, "getnameinfo failed");
+		else
+#endif
+			event_errx(1, "getnameinfo failed: %s", gai_strerror(ni_result));
+		return;
+	}
+#else
+	ni_result = fake_getnameinfo(sa, salen,
+		ntop, sizeof(ntop), strport, sizeof(strport),
+		NI_NUMERICHOST|NI_NUMERICSERV);
+	if (ni_result != 0)
+			return;
+#endif
+
+	*phost = mm_strdup(ntop);
+	*pport = mm_strdup(strport);
+}
+
+/* Create a non-blocking socket and bind it */
+/* todo: rename this function */
+static evutil_socket_t
+bind_socket_ai(struct evutil_addrinfo *ai, int reuse)
+{
+	evutil_socket_t fd;
+
+	int on = 1, r;
+	int serrno;
+
+	/* Create listen socket */
+	fd = evutil_socket_(ai ? ai->ai_family : AF_INET,
+	    SOCK_STREAM|EVUTIL_SOCK_NONBLOCK|EVUTIL_SOCK_CLOEXEC, 0);
+	if (fd == -1) {
+			event_sock_warn(-1, "socket");
+			return (-1);
+	}
+
+	if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on))<0)
+		goto out;
+	if (reuse) {
+		if (evutil_make_listen_socket_reuseable(fd) < 0)
+			goto out;
+	}
+
+	if (ai != NULL) {
+		r = bind(fd, ai->ai_addr, (ev_socklen_t)ai->ai_addrlen);
+		if (r == -1)
+			goto out;
+	}
+
+	return (fd);
+
+ out:
+	serrno = EVUTIL_SOCKET_ERROR();
+	evutil_closesocket(fd);
+	EVUTIL_SET_SOCKET_ERROR(serrno);
+	return (-1);
+}
+
+static struct evutil_addrinfo *
+make_addrinfo(const char *address, ev_uint16_t port)
+{
+	struct evutil_addrinfo *ai = NULL;
+
+	struct evutil_addrinfo hints;
+	char strport[NI_MAXSERV];
+	int ai_result;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	/* turn NULL hostname into INADDR_ANY, and skip looking up any address
+	 * types we don't have an interface to connect to. */
+	hints.ai_flags = EVUTIL_AI_PASSIVE|EVUTIL_AI_ADDRCONFIG;
+	evutil_snprintf(strport, sizeof(strport), "%d", port);
+	if ((ai_result = evutil_getaddrinfo(address, strport, &hints, &ai))
+	    != 0) {
+		if (ai_result == EVUTIL_EAI_SYSTEM)
+			event_warn("getaddrinfo");
+		else
+			event_warnx("getaddrinfo: %s",
+			    evutil_gai_strerror(ai_result));
+		return (NULL);
+	}
+
+	return (ai);
+}
+
+static evutil_socket_t
+bind_socket(const char *address, ev_uint16_t port, int reuse)
+{
+	evutil_socket_t fd;
+	struct evutil_addrinfo *aitop = NULL;
+
+	/* just create an unbound socket */
+	if (address == NULL && port == 0)
+		return bind_socket_ai(NULL, 0);
+
+	aitop = make_addrinfo(address, port);
+
+	if (aitop == NULL)
+		return (-1);
+
+	fd = bind_socket_ai(aitop, reuse);
+
+	evutil_freeaddrinfo(aitop);
+
+	return (fd);
+}
+
+struct evhttp_uri {
+	unsigned flags;
+	char *scheme; /* scheme; e.g http, ftp etc */
+	char *userinfo; /* userinfo (typically username:pass), or NULL */
+	char *host; /* hostname, IP address, or NULL */
+	int port; /* port, or zero */
+	char *path; /* path, or "". */
+	char *query; /* query, or NULL */
+	char *fragment; /* fragment or NULL */
+};
+
+struct evhttp_uri *
+evhttp_uri_new(void)
+{
+	struct evhttp_uri *uri = mm_calloc(sizeof(struct evhttp_uri), 1);
+	if (uri)
+		uri->port = -1;
+	return uri;
+}
+
+void
+evhttp_uri_set_flags(struct evhttp_uri *uri, unsigned flags)
+{
+	uri->flags = flags;
+}
+
+/* Return true if the string starting at s and ending immediately before eos
+ * is a valid URI scheme according to RFC3986
+ */
+static int
+scheme_ok(const char *s, const char *eos)
+{
+	/* scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) */
+	EVUTIL_ASSERT(eos >= s);
+	if (s == eos)
+		return 0;
+	if (!EVUTIL_ISALPHA_(*s))
+		return 0;
+	while (++s < eos) {
+		if (! EVUTIL_ISALNUM_(*s) &&
+		    *s != '+' && *s != '-' && *s != '.')
+			return 0;
+	}
+	return 1;
+}
+
+#define SUBDELIMS "!$&'()*+,;="
+
+/* Return true iff [s..eos) is a valid userinfo */
+static int
+userinfo_ok(const char *s, const char *eos)
+{
+	while (s < eos) {
+		if (CHAR_IS_UNRESERVED(*s) ||
+		    strchr(SUBDELIMS, *s) ||
+		    *s == ':')
+			++s;
+		else if (*s == '%' && s+2 < eos &&
+		    EVUTIL_ISXDIGIT_(s[1]) &&
+		    EVUTIL_ISXDIGIT_(s[2]))
+			s += 3;
+		else
+			return 0;
+	}
+	return 1;
+}
+
+static int
+regname_ok(const char *s, const char *eos)
+{
+	while (s && s<eos) {
+		if (CHAR_IS_UNRESERVED(*s) ||
+		    strchr(SUBDELIMS, *s))
+			++s;
+		else if (*s == '%' &&
+		    EVUTIL_ISXDIGIT_(s[1]) &&
+		    EVUTIL_ISXDIGIT_(s[2]))
+			s += 3;
+		else
+			return 0;
+	}
+	return 1;
+}
+
+static int
+parse_port(const char *s, const char *eos)
+{
+	int portnum = 0;
+	while (s < eos) {
+		if (! EVUTIL_ISDIGIT_(*s))
+			return -1;
+		portnum = (portnum * 10) + (*s - '0');
+		if (portnum < 0)
+			return -1;
+		if (portnum > 65535)
+			return -1;
+		++s;
+	}
+	return portnum;
+}
+
+/* returns 0 for bad, 1 for ipv6, 2 for IPvFuture */
+static int
+bracket_addr_ok(const char *s, const char *eos)
+{
+	if (s + 3 > eos || *s != '[' || *(eos-1) != ']')
+		return 0;
+	if (s[1] == 'v') {
+		/* IPvFuture, or junk.
+		   "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+		 */
+		s += 2; /* skip [v */
+		--eos;
+		if (!EVUTIL_ISXDIGIT_(*s)) /*require at least one*/
+			return 0;
+		while (s < eos && *s != '.') {
+			if (EVUTIL_ISXDIGIT_(*s))
+				++s;
+			else
+				return 0;
+		}
+		if (*s != '.')
+			return 0;
+		++s;
+		while (s < eos) {
+			if (CHAR_IS_UNRESERVED(*s) ||
+			    strchr(SUBDELIMS, *s) ||
+			    *s == ':')
+				++s;
+			else
+				return 0;
+		}
+		return 2;
+	} else {
+		/* IPv6, or junk */
+		char buf[64];
+		ev_ssize_t n_chars = eos-s-2;
+		struct in6_addr in6;
+		if (n_chars >= 64) /* way too long */
+			return 0;
+		memcpy(buf, s+1, n_chars);
+		buf[n_chars]='\0';
+		return (evutil_inet_pton(AF_INET6,buf,&in6)==1) ? 1 : 0;
+	}
+}
+
+static int
+parse_authority(struct evhttp_uri *uri, char *s, char *eos)
+{
+	char *cp, *port;
+	EVUTIL_ASSERT(eos);
+	if (eos == s) {
+		uri->host = mm_strdup("");
+		if (uri->host == NULL) {
+			event_warn("%s: strdup", __func__);
+			return -1;
+		}
+		return 0;
+	}
+
+	/* Optionally, we start with "userinfo@" */
+
+	cp = strchr(s, '@');
+	if (cp && cp < eos) {
+		if (! userinfo_ok(s,cp))
+			return -1;
+		*cp++ = '\0';
+		uri->userinfo = mm_strdup(s);
+		if (uri->userinfo == NULL) {
+			event_warn("%s: strdup", __func__);
+			return -1;
+		}
+	} else {
+		cp = s;
+	}
+	/* Optionally, we end with ":port" */
+	for (port=eos-1; port >= cp && EVUTIL_ISDIGIT_(*port); --port)
+		;
+	if (port >= cp && *port == ':') {
+		if (port+1 == eos) /* Leave port unspecified; the RFC allows a
+				    * nil port */
+			uri->port = -1;
+		else if ((uri->port = parse_port(port+1, eos))<0)
+			return -1;
+		eos = port;
+	}
+	/* Now, cp..eos holds the "host" port, which can be an IPv4Address,
+	 * an IP-Literal, or a reg-name */
+	EVUTIL_ASSERT(eos >= cp);
+	if (*cp == '[' && eos >= cp+2 && *(eos-1) == ']') {
+		/* IPv6address, IP-Literal, or junk. */
+		if (! bracket_addr_ok(cp, eos))
+			return -1;
+	} else {
+		/* Make sure the host part is ok. */
+		if (! regname_ok(cp,eos)) /* Match IPv4Address or reg-name */
+			return -1;
+	}
+	uri->host = mm_malloc(eos-cp+1);
+	if (uri->host == NULL) {
+		event_warn("%s: malloc", __func__);
+		return -1;
+	}
+	memcpy(uri->host, cp, eos-cp);
+	uri->host[eos-cp] = '\0';
+	return 0;
+
+}
+
+static char *
+end_of_authority(char *cp)
+{
+	while (*cp) {
+		if (*cp == '?' || *cp == '#' || *cp == '/')
+			return cp;
+		++cp;
+	}
+	return cp;
+}
+
+enum uri_part {
+	PART_PATH,
+	PART_QUERY,
+	PART_FRAGMENT
+};
+
+/* Return the character after the longest prefix of 'cp' that matches...
+ *   *pchar / "/" if allow_qchars is false, or
+ *   *(pchar / "/" / "?") if allow_qchars is true.
+ */
+static char *
+end_of_path(char *cp, enum uri_part part, unsigned flags)
+{
+	if (flags & EVHTTP_URI_NONCONFORMANT) {
+		/* If NONCONFORMANT:
+		 *   Path is everything up to a # or ? or nul.
+		 *   Query is everything up a # or nul
+		 *   Fragment is everything up to a nul.
+		 */
+		switch (part) {
+		case PART_PATH:
+			while (*cp && *cp != '#' && *cp != '?')
+				++cp;
+			break;
+		case PART_QUERY:
+			while (*cp && *cp != '#')
+				++cp;
+			break;
+		case PART_FRAGMENT:
+			cp += strlen(cp);
+			break;
+		};
+		return cp;
+	}
+
+	while (*cp) {
+		if (CHAR_IS_UNRESERVED(*cp) ||
+		    strchr(SUBDELIMS, *cp) ||
+		    *cp == ':' || *cp == '@' || *cp == '/')
+			++cp;
+		else if (*cp == '%' && EVUTIL_ISXDIGIT_(cp[1]) &&
+		    EVUTIL_ISXDIGIT_(cp[2]))
+			cp += 3;
+		else if (*cp == '?' && part != PART_PATH)
+			++cp;
+		else
+			return cp;
+	}
+	return cp;
+}
+
+static int
+path_matches_noscheme(const char *cp)
+{
+	while (*cp) {
+		if (*cp == ':')
+			return 0;
+		else if (*cp == '/')
+			return 1;
+		++cp;
+	}
+	return 1;
+}
+
+struct evhttp_uri *
+evhttp_uri_parse(const char *source_uri)
+{
+	return evhttp_uri_parse_with_flags(source_uri, 0);
+}
+
+struct evhttp_uri *
+evhttp_uri_parse_with_flags(const char *source_uri, unsigned flags)
+{
+	char *readbuf = NULL, *readp = NULL, *token = NULL, *query = NULL;
+	char *path = NULL, *fragment = NULL;
+	int got_authority = 0;
+
+	struct evhttp_uri *uri = mm_calloc(1, sizeof(struct evhttp_uri));
+	if (uri == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto err;
+	}
+	uri->port = -1;
+	uri->flags = flags;
+
+	readbuf = mm_strdup(source_uri);
+	if (readbuf == NULL) {
+		event_warn("%s: strdup", __func__);
+		goto err;
+	}
+
+	readp = readbuf;
+	token = NULL;
+
+	/* We try to follow RFC3986 here as much as we can, and match
+	   the productions
+
+	      URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+
+	      relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+	 */
+
+	/* 1. scheme: */
+	token = strchr(readp, ':');
+	if (token && scheme_ok(readp,token)) {
+		*token = '\0';
+		uri->scheme = mm_strdup(readp);
+		if (uri->scheme == NULL) {
+			event_warn("%s: strdup", __func__);
+			goto err;
+		}
+		readp = token+1; /* eat : */
+	}
+
+	/* 2. Optionally, "//" then an 'authority' part. */
+	if (readp[0]=='/' && readp[1] == '/') {
+		char *authority;
+		readp += 2;
+		authority = readp;
+		path = end_of_authority(readp);
+		if (parse_authority(uri, authority, path) < 0)
+			goto err;
+		readp = path;
+		got_authority = 1;
+	}
+
+	/* 3. Query: path-abempty, path-absolute, path-rootless, or path-empty
+	 */
+	path = readp;
+	readp = end_of_path(path, PART_PATH, flags);
+
+	/* Query */
+	if (*readp == '?') {
+		*readp = '\0';
+		++readp;
+		query = readp;
+		readp = end_of_path(readp, PART_QUERY, flags);
+	}
+	/* fragment */
+	if (*readp == '#') {
+		*readp = '\0';
+		++readp;
+		fragment = readp;
+		readp = end_of_path(readp, PART_FRAGMENT, flags);
+	}
+	if (*readp != '\0') {
+		goto err;
+	}
+
+	/* These next two cases may be unreachable; I'm leaving them
+	 * in to be defensive. */
+	/* If you didn't get an authority, the path can't begin with "//" */
+	if (!got_authority && path[0]=='/' && path[1]=='/')
+		goto err;
+	/* If you did get an authority, the path must begin with "/" or be
+	 * empty. */
+	if (got_authority && path[0] != '/' && path[0] != '\0')
+		goto err;
+	/* (End of maybe-unreachable cases) */
+
+	/* If there was no scheme, the first part of the path (if any) must
+	 * have no colon in it. */
+	if (! uri->scheme && !path_matches_noscheme(path))
+		goto err;
+
+	EVUTIL_ASSERT(path);
+	uri->path = mm_strdup(path);
+	if (uri->path == NULL) {
+		event_warn("%s: strdup", __func__);
+		goto err;
+	}
+
+	if (query) {
+		uri->query = mm_strdup(query);
+		if (uri->query == NULL) {
+			event_warn("%s: strdup", __func__);
+			goto err;
+		}
+	}
+	if (fragment) {
+		uri->fragment = mm_strdup(fragment);
+		if (uri->fragment == NULL) {
+			event_warn("%s: strdup", __func__);
+			goto err;
+		}
+	}
+
+	mm_free(readbuf);
+
+	return uri;
+err:
+	if (uri)
+		evhttp_uri_free(uri);
+	if (readbuf)
+		mm_free(readbuf);
+	return NULL;
+}
+
+static struct evhttp_uri *
+evhttp_uri_parse_authority(char *source_uri)
+{
+	struct evhttp_uri *uri = mm_calloc(1, sizeof(struct evhttp_uri));
+	char *end;
+
+	if (uri == NULL) {
+		event_warn("%s: calloc", __func__);
+		goto err;
+	}
+	uri->port = -1;
+	uri->flags = 0;
+
+	end = end_of_authority(source_uri);
+	if (parse_authority(uri, source_uri, end) < 0)
+		goto err;
+
+	uri->path = mm_strdup("");
+	if (uri->path == NULL) {
+		event_warn("%s: strdup", __func__);
+		goto err;
+	}
+
+	return uri;
+err:
+	if (uri)
+		evhttp_uri_free(uri);
+	return NULL;
+}
+
+void
+evhttp_uri_free(struct evhttp_uri *uri)
+{
+#define URI_FREE_STR_(f)		\
+	if (uri->f) {			\
+		mm_free(uri->f);		\
+	}
+
+	URI_FREE_STR_(scheme);
+	URI_FREE_STR_(userinfo);
+	URI_FREE_STR_(host);
+	URI_FREE_STR_(path);
+	URI_FREE_STR_(query);
+	URI_FREE_STR_(fragment);
+
+	mm_free(uri);
+#undef URI_FREE_STR_
+}
+
+char *
+evhttp_uri_join(struct evhttp_uri *uri, char *buf, size_t limit)
+{
+	struct evbuffer *tmp = 0;
+	size_t joined_size = 0;
+	char *output = NULL;
+
+#define URI_ADD_(f)	evbuffer_add(tmp, uri->f, strlen(uri->f))
+
+	if (!uri || !buf || !limit)
+		return NULL;
+
+	tmp = evbuffer_new();
+	if (!tmp)
+		return NULL;
+
+	if (uri->scheme) {
+		URI_ADD_(scheme);
+		evbuffer_add(tmp, ":", 1);
+	}
+	if (uri->host) {
+		evbuffer_add(tmp, "//", 2);
+		if (uri->userinfo)
+			evbuffer_add_printf(tmp,"%s@", uri->userinfo);
+		URI_ADD_(host);
+		if (uri->port >= 0)
+			evbuffer_add_printf(tmp,":%d", uri->port);
+
+		if (uri->path && uri->path[0] != '/' && uri->path[0] != '\0')
+			goto err;
+	}
+
+	if (uri->path)
+		URI_ADD_(path);
+
+	if (uri->query) {
+		evbuffer_add(tmp, "?", 1);
+		URI_ADD_(query);
+	}
+
+	if (uri->fragment) {
+		evbuffer_add(tmp, "#", 1);
+		URI_ADD_(fragment);
+	}
+
+	evbuffer_add(tmp, "\0", 1); /* NUL */
+
+	joined_size = evbuffer_get_length(tmp);
+
+	if (joined_size > limit) {
+		/* It doesn't fit. */
+		evbuffer_free(tmp);
+		return NULL;
+	}
+       	evbuffer_remove(tmp, buf, joined_size);
+
+	output = buf;
+err:
+	evbuffer_free(tmp);
+
+	return output;
+#undef URI_ADD_
+}
+
+const char *
+evhttp_uri_get_scheme(const struct evhttp_uri *uri)
+{
+	return uri->scheme;
+}
+const char *
+evhttp_uri_get_userinfo(const struct evhttp_uri *uri)
+{
+	return uri->userinfo;
+}
+const char *
+evhttp_uri_get_host(const struct evhttp_uri *uri)
+{
+	return uri->host;
+}
+int
+evhttp_uri_get_port(const struct evhttp_uri *uri)
+{
+	return uri->port;
+}
+const char *
+evhttp_uri_get_path(const struct evhttp_uri *uri)
+{
+	return uri->path;
+}
+const char *
+evhttp_uri_get_query(const struct evhttp_uri *uri)
+{
+	return uri->query;
+}
+const char *
+evhttp_uri_get_fragment(const struct evhttp_uri *uri)
+{
+	return uri->fragment;
+}
+
+#define URI_SET_STR_(f) do {					\
+	if (uri->f)						\
+		mm_free(uri->f);				\
+	if (f) {						\
+		if ((uri->f = mm_strdup(f)) == NULL) {		\
+			event_warn("%s: strdup()", __func__);	\
+			return -1;				\
+		}						\
+	} else {						\
+		uri->f = NULL;					\
+	}							\
+	} while(0)
+
+int
+evhttp_uri_set_scheme(struct evhttp_uri *uri, const char *scheme)
+{
+	if (scheme && !scheme_ok(scheme, scheme+strlen(scheme)))
+		return -1;
+
+	URI_SET_STR_(scheme);
+	return 0;
+}
+int
+evhttp_uri_set_userinfo(struct evhttp_uri *uri, const char *userinfo)
+{
+	if (userinfo && !userinfo_ok(userinfo, userinfo+strlen(userinfo)))
+		return -1;
+	URI_SET_STR_(userinfo);
+	return 0;
+}
+int
+evhttp_uri_set_host(struct evhttp_uri *uri, const char *host)
+{
+	if (host) {
+		if (host[0] == '[') {
+			if (! bracket_addr_ok(host, host+strlen(host)))
+				return -1;
+		} else {
+			if (! regname_ok(host, host+strlen(host)))
+				return -1;
+		}
+	}
+
+	URI_SET_STR_(host);
+	return 0;
+}
+int
+evhttp_uri_set_port(struct evhttp_uri *uri, int port)
+{
+	if (port < -1)
+		return -1;
+	uri->port = port;
+	return 0;
+}
+#define end_of_cpath(cp,p,f) \
+	((const char*)(end_of_path(((char*)(cp)), (p), (f))))
+
+int
+evhttp_uri_set_path(struct evhttp_uri *uri, const char *path)
+{
+	if (path && end_of_cpath(path, PART_PATH, uri->flags) != path+strlen(path))
+		return -1;
+
+	URI_SET_STR_(path);
+	return 0;
+}
+int
+evhttp_uri_set_query(struct evhttp_uri *uri, const char *query)
+{
+	if (query && end_of_cpath(query, PART_QUERY, uri->flags) != query+strlen(query))
+		return -1;
+	URI_SET_STR_(query);
+	return 0;
+}
+int
+evhttp_uri_set_fragment(struct evhttp_uri *uri, const char *fragment)
+{
+	if (fragment && end_of_cpath(fragment, PART_FRAGMENT, uri->flags) != fragment+strlen(fragment))
+		return -1;
+	URI_SET_STR_(fragment);
+	return 0;
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/include/evdns.h b/extra/libevent/libevent-2.1.11-stable/include/evdns.h
new file mode 100644
index 000000000000..8672db03698f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/evdns.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT1_EVDNS_H_INCLUDED_
+#define EVENT1_EVDNS_H_INCLUDED_
+
+/** @file evdns.h
+
+  A dns subsystem for Libevent.
+
+  The <evdns.h> header is deprecated in Libevent 2.0 and later; please
+  use <event2/evdns.h> instead.  Depending on what functionality you
+  need, you may also want to include more of the other <event2/...>
+  headers.
+ */
+
+#include <event.h>
+#include <event2/dns.h>
+#include <event2/dns_compat.h>
+#include <event2/dns_struct.h>
+
+#endif /* EVENT1_EVDNS_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event.h b/extra/libevent/libevent-2.1.11-stable/include/event.h
new file mode 100644
index 000000000000..ba5186713bb9
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT1_EVENT_H_INCLUDED_
+#define EVENT1_EVENT_H_INCLUDED_
+
+/** @file event.h
+
+  A library for writing event-driven network servers.
+
+  The <event.h> header is deprecated in Libevent 2.0 and later; please
+  use <event2/event.h> instead.  Depending on what functionality you
+  need, you may also want to include more of the other event2/
+  headers.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef EVENT__HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#include <stdarg.h>
+
+/* For int types. */
+#include <evutil.h>
+
+#ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
+#include <event2/event_struct.h>
+#include <event2/event.h>
+#include <event2/event_compat.h>
+#include <event2/buffer.h>
+#include <event2/buffer_compat.h>
+#include <event2/bufferevent.h>
+#include <event2/bufferevent_struct.h>
+#include <event2/bufferevent_compat.h>
+#include <event2/tag.h>
+#include <event2/tag_compat.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT1_EVENT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/buffer.h b/extra/libevent/libevent-2.1.11-stable/include/event2/buffer.h
new file mode 100644
index 000000000000..468588b9f141
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/buffer.h
@@ -0,0 +1,1076 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_BUFFER_H_INCLUDED_
+#define EVENT2_BUFFER_H_INCLUDED_
+
+/** @file event2/buffer.h
+
+  Functions for buffering data for network sending or receiving.
+
+  An evbuffer can be used for preparing data before sending it to
+  the network or conversely for reading data from the network.
+  Evbuffers try to avoid memory copies as much as possible.  As a
+  result, evbuffers can be used to pass data around without actually
+  incurring the overhead of copying the data.
+
+  A new evbuffer can be allocated with evbuffer_new(), and can be
+  freed with evbuffer_free().  Most users will be using evbuffers via
+  the bufferevent interface.  To access a bufferevent's evbuffers, use
+  bufferevent_get_input() and bufferevent_get_output().
+
+  There are several guidelines for using evbuffers.
+
+  - if you already know how much data you are going to add as a result
+    of calling evbuffer_add() multiple times, it makes sense to use
+    evbuffer_expand() first to make sure that enough memory is allocated
+    before hand.
+
+  - evbuffer_add_buffer() adds the contents of one buffer to the other
+    without incurring any unnecessary memory copies.
+
+  - evbuffer_add() and evbuffer_add_buffer() do not mix very well:
+    if you use them, you will wind up with fragmented memory in your
+	buffer.
+
+  - For high-performance code, you may want to avoid copying data into and out
+    of buffers.  You can skip the copy step by using
+    evbuffer_reserve_space()/evbuffer_commit_space() when writing into a
+    buffer, and evbuffer_peek() when reading.
+
+  In Libevent 2.0 and later, evbuffers are represented using a linked
+  list of memory chunks, with pointers to the first and last chunk in
+  the chain.
+
+  As the contents of an evbuffer can be stored in multiple different
+  memory blocks, it cannot be accessed directly.  Instead, evbuffer_pullup()
+  can be used to force a specified number of bytes to be contiguous. This
+  will cause memory reallocation and memory copies if the data is split
+  across multiple blocks.  It is more efficient, however, to use
+  evbuffer_peek() if you don't require that the memory to be contiguous.
+ */
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#include <stdarg.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+#include <event2/util.h>
+
+/**
+   An evbuffer is an opaque data type for efficiently buffering data to be
+   sent or received on the network.
+
+   @see event2/event.h for more information
+*/
+struct evbuffer
+#ifdef EVENT_IN_DOXYGEN_
+{}
+#endif
+;
+
+/**
+    Pointer to a position within an evbuffer.
+
+    Used when repeatedly searching through a buffer.  Calling any function
+    that modifies or re-packs the buffer contents may invalidate all
+    evbuffer_ptrs for that buffer.  Do not modify or contruct these values
+    except with evbuffer_ptr_set.
+
+    An evbuffer_ptr can represent any position from the start of a buffer up
+    to a position immediately after the end of a buffer.
+
+    @see evbuffer_ptr_set()
+ */
+struct evbuffer_ptr {
+	ev_ssize_t pos;
+
+	/* Do not alter or rely on the values of fields: they are for internal
+	 * use */
+	struct {
+		void *chain;
+		size_t pos_in_chain;
+	} internal_;
+};
+
+/** Describes a single extent of memory inside an evbuffer.  Used for
+    direct-access functions.
+
+    @see evbuffer_reserve_space, evbuffer_commit_space, evbuffer_peek
+ */
+#ifdef EVENT__HAVE_SYS_UIO_H
+#define evbuffer_iovec iovec
+/* Internal use -- defined only if we are using the native struct iovec */
+#define EVBUFFER_IOVEC_IS_NATIVE_
+#else
+struct evbuffer_iovec {
+	/** The start of the extent of memory. */
+	void *iov_base;
+	/** The length of the extent of memory. */
+	size_t iov_len;
+};
+#endif
+
+/**
+  Allocate storage for a new evbuffer.
+
+  @return a pointer to a newly allocated evbuffer struct, or NULL if an error
+	occurred
+ */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *evbuffer_new(void);
+/**
+  Deallocate storage for an evbuffer.
+
+  @param buf pointer to the evbuffer to be freed
+ */
+EVENT2_EXPORT_SYMBOL
+void evbuffer_free(struct evbuffer *buf);
+
+/**
+   Enable locking on an evbuffer so that it can safely be used by multiple
+   threads at the same time.
+
+   NOTE: when locking is enabled, the lock will be held when callbacks are
+   invoked.  This could result in deadlock if you aren't careful.  Plan
+   accordingly!
+
+   @param buf An evbuffer to make lockable.
+   @param lock A lock object, or NULL if we should allocate our own.
+   @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_enable_locking(struct evbuffer *buf, void *lock);
+
+/**
+   Acquire the lock on an evbuffer.  Has no effect if locking was not enabled
+   with evbuffer_enable_locking.
+*/
+EVENT2_EXPORT_SYMBOL
+void evbuffer_lock(struct evbuffer *buf);
+
+/**
+   Release the lock on an evbuffer.  Has no effect if locking was not enabled
+   with evbuffer_enable_locking.
+*/
+EVENT2_EXPORT_SYMBOL
+void evbuffer_unlock(struct evbuffer *buf);
+
+
+/** If this flag is set, then we will not use evbuffer_peek(),
+ * evbuffer_remove(), evbuffer_remove_buffer(), and so on to read bytes
+ * from this buffer: we'll only take bytes out of this buffer by
+ * writing them to the network (as with evbuffer_write_atmost), by
+ * removing them without observing them (as with evbuffer_drain),
+ * or by copying them all out at once (as with evbuffer_add_buffer).
+ *
+ * Using this option allows the implementation to use sendfile-based
+ * operations for evbuffer_add_file(); see that function for more
+ * information.
+ *
+ * This flag is on by default for bufferevents that can take advantage
+ * of it; you should never actually need to set it on a bufferevent's
+ * output buffer.
+ */
+#define EVBUFFER_FLAG_DRAINS_TO_FD 1
+
+/** Change the flags that are set for an evbuffer by adding more.
+ *
+ * @param buffer the evbuffer that the callback is watching.
+ * @param cb the callback whose status we want to change.
+ * @param flags One or more EVBUFFER_FLAG_* options
+ * @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_set_flags(struct evbuffer *buf, ev_uint64_t flags);
+/** Change the flags that are set for an evbuffer by removing some.
+ *
+ * @param buffer the evbuffer that the callback is watching.
+ * @param cb the callback whose status we want to change.
+ * @param flags One or more EVBUFFER_FLAG_* options
+ * @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_clear_flags(struct evbuffer *buf, ev_uint64_t flags);
+
+/**
+  Returns the total number of bytes stored in the evbuffer
+
+  @param buf pointer to the evbuffer
+  @return the number of bytes stored in the evbuffer
+*/
+EVENT2_EXPORT_SYMBOL
+size_t evbuffer_get_length(const struct evbuffer *buf);
+
+/**
+   Returns the number of contiguous available bytes in the first buffer chain.
+
+   This is useful when processing data that might be split into multiple
+   chains, or that might all be in the first chain.  Calls to
+   evbuffer_pullup() that cause reallocation and copying of data can thus be
+   avoided.
+
+   @param buf pointer to the evbuffer
+   @return 0 if no data is available, otherwise the number of available bytes
+     in the first buffer chain.
+*/
+EVENT2_EXPORT_SYMBOL
+size_t evbuffer_get_contiguous_space(const struct evbuffer *buf);
+
+/**
+  Expands the available space in an evbuffer.
+
+  Expands the available space in the evbuffer to at least datlen, so that
+  appending datlen additional bytes will not require any new allocations.
+
+  @param buf the evbuffer to be expanded
+  @param datlen the new minimum length requirement
+  @return 0 if successful, or -1 if an error occurred
+*/
+EVENT2_EXPORT_SYMBOL
+int evbuffer_expand(struct evbuffer *buf, size_t datlen);
+
+/**
+   Reserves space in the last chain or chains of an evbuffer.
+
+   Makes space available in the last chain or chains of an evbuffer that can
+   be arbitrarily written to by a user.  The space does not become
+   available for reading until it has been committed with
+   evbuffer_commit_space().
+
+   The space is made available as one or more extents, represented by
+   an initial pointer and a length.  You can force the memory to be
+   available as only one extent.  Allowing more extents, however, makes the
+   function more efficient.
+
+   Multiple subsequent calls to this function will make the same space
+   available until evbuffer_commit_space() has been called.
+
+   It is an error to do anything that moves around the buffer's internal
+   memory structures before committing the space.
+
+   NOTE: The code currently does not ever use more than two extents.
+   This may change in future versions.
+
+   @param buf the evbuffer in which to reserve space.
+   @param size how much space to make available, at minimum.  The
+      total length of the extents may be greater than the requested
+      length.
+   @param vec an array of one or more evbuffer_iovec structures to
+      hold pointers to the reserved extents of memory.
+   @param n_vec The length of the vec array.  Must be at least 1;
+       2 is more efficient.
+   @return the number of provided extents, or -1 on error.
+   @see evbuffer_commit_space()
+*/
+EVENT2_EXPORT_SYMBOL
+int
+evbuffer_reserve_space(struct evbuffer *buf, ev_ssize_t size,
+    struct evbuffer_iovec *vec, int n_vec);
+
+/**
+   Commits previously reserved space.
+
+   Commits some of the space previously reserved with
+   evbuffer_reserve_space().  It then becomes available for reading.
+
+   This function may return an error if the pointer in the extents do
+   not match those returned from evbuffer_reserve_space, or if data
+   has been added to the buffer since the space was reserved.
+
+   If you want to commit less data than you got reserved space for,
+   modify the iov_len pointer of the appropriate extent to a smaller
+   value.  Note that you may have received more space than you
+   requested if it was available!
+
+   @param buf the evbuffer in which to reserve space.
+   @param vec one or two extents returned by evbuffer_reserve_space.
+   @param n_vecs the number of extents.
+   @return 0 on success, -1 on error
+   @see evbuffer_reserve_space()
+*/
+EVENT2_EXPORT_SYMBOL
+int evbuffer_commit_space(struct evbuffer *buf,
+    struct evbuffer_iovec *vec, int n_vecs);
+
+/**
+  Append data to the end of an evbuffer.
+
+  @param buf the evbuffer to be appended to
+  @param data pointer to the beginning of the data buffer
+  @param datlen the number of bytes to be copied from the data buffer
+  @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add(struct evbuffer *buf, const void *data, size_t datlen);
+
+
+/**
+  Read data from an evbuffer and drain the bytes read.
+
+  If more bytes are requested than are available in the evbuffer, we
+  only extract as many bytes as were available.
+
+  @param buf the evbuffer to be read from
+  @param data the destination buffer to store the result
+  @param datlen the maximum size of the destination buffer
+  @return the number of bytes read, or -1 if we can't drain the buffer.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen);
+
+/**
+  Read data from an evbuffer, and leave the buffer unchanged.
+
+  If more bytes are requested than are available in the evbuffer, we
+  only extract as many bytes as were available.
+
+  @param buf the evbuffer to be read from
+  @param data_out the destination buffer to store the result
+  @param datlen the maximum size of the destination buffer
+  @return the number of bytes read, or -1 if we can't drain the buffer.
+ */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t evbuffer_copyout(struct evbuffer *buf, void *data_out, size_t datlen);
+
+/**
+  Read data from the middle of an evbuffer, and leave the buffer unchanged.
+
+  If more bytes are requested than are available in the evbuffer, we
+  only extract as many bytes as were available.
+
+  @param buf the evbuffer to be read from
+  @param pos the position to start reading from
+  @param data_out the destination buffer to store the result
+  @param datlen the maximum size of the destination buffer
+  @return the number of bytes read, or -1 if we can't drain the buffer.
+ */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t evbuffer_copyout_from(struct evbuffer *buf, const struct evbuffer_ptr *pos, void *data_out, size_t datlen);
+
+/**
+  Read data from an evbuffer into another evbuffer, draining
+  the bytes from the source buffer.  This function avoids copy
+  operations to the extent possible.
+
+  If more bytes are requested than are available in src, the src
+  buffer is drained completely.
+
+  @param src the evbuffer to be read from
+  @param dst the destination evbuffer to store the result into
+  @param datlen the maximum numbers of bytes to transfer
+  @return the number of bytes read
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_remove_buffer(struct evbuffer *src, struct evbuffer *dst,
+    size_t datlen);
+
+/** Used to tell evbuffer_readln what kind of line-ending to look for.
+ */
+enum evbuffer_eol_style {
+	/** Any sequence of CR and LF characters is acceptable as an
+	 * EOL.
+	 *
+	 * Note that this style can produce ambiguous results: the
+	 * sequence "CRLF" will be treated as a single EOL if it is
+	 * all in the buffer at once, but if you first read a CR from
+	 * the network and later read an LF from the network, it will
+	 * be treated as two EOLs.
+	 */
+	EVBUFFER_EOL_ANY,
+	/** An EOL is an LF, optionally preceded by a CR.  This style is
+	 * most useful for implementing text-based internet protocols. */
+	EVBUFFER_EOL_CRLF,
+	/** An EOL is a CR followed by an LF. */
+	EVBUFFER_EOL_CRLF_STRICT,
+	/** An EOL is a LF. */
+	EVBUFFER_EOL_LF,
+	/** An EOL is a NUL character (that is, a single byte with value 0) */
+	EVBUFFER_EOL_NUL
+};
+
+/**
+ * Read a single line from an evbuffer.
+ *
+ * Reads a line terminated by an EOL as determined by the evbuffer_eol_style
+ * argument.  Returns a newly allocated nul-terminated string; the caller must
+ * free the returned value.  The EOL is not included in the returned string.
+ *
+ * @param buffer the evbuffer to read from
+ * @param n_read_out if non-NULL, points to a size_t that is set to the
+ *       number of characters in the returned string.  This is useful for
+ *       strings that can contain NUL characters.
+ * @param eol_style the style of line-ending to use.
+ * @return pointer to a single line, or NULL if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+char *evbuffer_readln(struct evbuffer *buffer, size_t *n_read_out,
+    enum evbuffer_eol_style eol_style);
+
+/**
+  Move all data from one evbuffer into another evbuffer.
+
+  This is a destructive add.  The data from one buffer moves into
+  the other buffer.  However, no unnecessary memory copies occur.
+
+  @param outbuf the output buffer
+  @param inbuf the input buffer
+  @return 0 if successful, or -1 if an error occurred
+
+  @see evbuffer_remove_buffer()
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf);
+
+/**
+  Copy data from one evbuffer into another evbuffer.
+
+  This is a non-destructive add.  The data from one buffer is copied
+  into the other buffer.  However, no unnecessary memory copies occur.
+
+  Note that buffers already containing buffer references can't be added
+  to other buffers.
+
+  @param outbuf the output buffer
+  @param inbuf the input buffer
+  @return 0 if successful, or -1 if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_buffer_reference(struct evbuffer *outbuf,
+    struct evbuffer *inbuf);
+
+/**
+   A cleanup function for a piece of memory added to an evbuffer by
+   reference.
+
+   @see evbuffer_add_reference()
+ */
+typedef void (*evbuffer_ref_cleanup_cb)(const void *data,
+    size_t datalen, void *extra);
+
+/**
+  Reference memory into an evbuffer without copying.
+
+  The memory needs to remain valid until all the added data has been
+  read.  This function keeps just a reference to the memory without
+  actually incurring the overhead of a copy.
+
+  @param outbuf the output buffer
+  @param data the memory to reference
+  @param datlen how memory to reference
+  @param cleanupfn callback to be invoked when the memory is no longer
+	referenced by this evbuffer.
+  @param cleanupfn_arg optional argument to the cleanup callback
+  @return 0 if successful, or -1 if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_reference(struct evbuffer *outbuf,
+    const void *data, size_t datlen,
+    evbuffer_ref_cleanup_cb cleanupfn, void *cleanupfn_arg);
+
+/**
+  Copy data from a file into the evbuffer for writing to a socket.
+
+  This function avoids unnecessary data copies between userland and
+  kernel.  If sendfile is available and the EVBUFFER_FLAG_DRAINS_TO_FD
+  flag is set, it uses those functions.  Otherwise, it tries to use
+  mmap (or CreateFileMapping on Windows).
+
+  The function owns the resulting file descriptor and will close it
+  when finished transferring data.
+
+  The results of using evbuffer_remove() or evbuffer_pullup() on
+  evbuffers whose data was added using this function are undefined.
+
+  For more fine-grained control, use evbuffer_add_file_segment.
+
+  @param outbuf the output buffer
+  @param fd the file descriptor
+  @param offset the offset from which to read data
+  @param length how much data to read, or -1 to read as much as possible.
+    (-1 requires that 'fd' support fstat.)
+  @return 0 if successful, or -1 if an error occurred
+*/
+
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_file(struct evbuffer *outbuf, int fd, ev_off_t offset,
+    ev_off_t length);
+
+/**
+  An evbuffer_file_segment holds a reference to a range of a file --
+  possibly the whole file! -- for use in writing from an evbuffer to a
+  socket.  It could be implemented with mmap, sendfile, splice, or (if all
+  else fails) by just pulling all the data into RAM.  A single
+  evbuffer_file_segment can be added more than once, and to more than one
+  evbuffer.
+ */
+struct evbuffer_file_segment;
+
+/**
+    Flag for creating evbuffer_file_segment: If this flag is set, then when
+    the evbuffer_file_segment is freed and no longer in use by any
+    evbuffer, the underlying fd is closed.
+ */
+#define EVBUF_FS_CLOSE_ON_FREE    0x01
+/**
+   Flag for creating evbuffer_file_segment: Disable memory-map based
+   implementations.
+ */
+#define EVBUF_FS_DISABLE_MMAP     0x02
+/**
+   Flag for creating evbuffer_file_segment: Disable direct fd-to-fd
+   implementations (including sendfile and splice).
+
+   You might want to use this option if data needs to be taken from the
+   evbuffer by any means other than writing it to the network: the sendfile
+   backend is fast, but it only works for sending files directly to the
+   network.
+ */
+#define EVBUF_FS_DISABLE_SENDFILE 0x04
+/**
+   Flag for creating evbuffer_file_segment: Do not allocate a lock for this
+   segment.  If this option is set, then neither the segment nor any
+   evbuffer it is added to may ever be accessed from more than one thread
+   at a time.
+ */
+#define EVBUF_FS_DISABLE_LOCKING  0x08
+
+/**
+   A cleanup function for a evbuffer_file_segment added to an evbuffer
+   for reference.
+ */
+typedef void (*evbuffer_file_segment_cleanup_cb)(
+    struct evbuffer_file_segment const* seg, int flags, void* arg);
+
+/**
+   Create and return a new evbuffer_file_segment for reading data from a
+   file and sending it out via an evbuffer.
+
+   This function avoids unnecessary data copies between userland and
+   kernel.  Where available, it uses sendfile or splice.
+
+   The file descriptor must not be closed so long as any evbuffer is using
+   this segment.
+
+   The results of using evbuffer_remove() or evbuffer_pullup() or any other
+   function that reads bytes from an evbuffer on any evbuffer containing
+   the newly returned segment are undefined, unless you pass the
+   EVBUF_FS_DISABLE_SENDFILE flag to this function.
+
+   @param fd an open file to read from.
+   @param offset an index within the file at which to start reading
+   @param length how much data to read, or -1 to read as much as possible.
+      (-1 requires that 'fd' support fstat.)
+   @param flags any number of the EVBUF_FS_* flags
+   @return a new evbuffer_file_segment, or NULL on failure.
+ **/
+EVENT2_EXPORT_SYMBOL
+struct evbuffer_file_segment *evbuffer_file_segment_new(
+	int fd, ev_off_t offset, ev_off_t length, unsigned flags);
+
+/**
+   Free an evbuffer_file_segment
+
+   It is safe to call this function even if the segment has been added to
+   one or more evbuffers.  The evbuffer_file_segment will not be freed
+   until no more references to it exist.
+ */
+EVENT2_EXPORT_SYMBOL
+void evbuffer_file_segment_free(struct evbuffer_file_segment *seg);
+
+/**
+   Add cleanup callback and argument for the callback to an
+   evbuffer_file_segment.
+
+   The cleanup callback will be invoked when no more references to the
+   evbuffer_file_segment exist.
+ **/
+EVENT2_EXPORT_SYMBOL
+void evbuffer_file_segment_add_cleanup_cb(struct evbuffer_file_segment *seg,
+	evbuffer_file_segment_cleanup_cb cb, void* arg);
+
+/**
+   Insert some or all of an evbuffer_file_segment at the end of an evbuffer
+
+   Note that the offset and length parameters of this function have a
+   different meaning from those provided to evbuffer_file_segment_new: When
+   you create the segment, the offset is the offset _within the file_, and
+   the length is the length _of the segment_, whereas when you add a
+   segment to an evbuffer, the offset is _within the segment_ and the
+   length is the length of the _part of the segment you want to use.
+
+   In other words, if you have a 10 KiB file, and you create an
+   evbuffer_file_segment for it with offset 20 and length 1000, it will
+   refer to bytes 20..1019 inclusive.  If you then pass this segment to
+   evbuffer_add_file_segment and specify an offset of 20 and a length of
+   50, you will be adding bytes 40..99 inclusive.
+
+   @param buf the evbuffer to append to
+   @param seg the segment to add
+   @param offset the offset within the segment to start from
+   @param length the amount of data to add, or -1 to add it all.
+   @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_file_segment(struct evbuffer *buf,
+    struct evbuffer_file_segment *seg, ev_off_t offset, ev_off_t length);
+
+/**
+  Append a formatted string to the end of an evbuffer.
+
+  The string is formated as printf.
+
+  @param buf the evbuffer that will be appended to
+  @param fmt a format string
+  @param ... arguments that will be passed to printf(3)
+  @return The number of bytes added if successful, or -1 if an error occurred.
+
+  @see evutil_printf(), evbuffer_add_vprintf()
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_printf(struct evbuffer *buf, const char *fmt, ...)
+#ifdef __GNUC__
+  __attribute__((format(printf, 2, 3)))
+#endif
+;
+
+/**
+  Append a va_list formatted string to the end of an evbuffer.
+
+  @param buf the evbuffer that will be appended to
+  @param fmt a format string
+  @param ap a varargs va_list argument array that will be passed to vprintf(3)
+  @return The number of bytes added if successful, or -1 if an error occurred.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_add_vprintf(struct evbuffer *buf, const char *fmt, va_list ap)
+#ifdef __GNUC__
+	__attribute__((format(printf, 2, 0)))
+#endif
+;
+
+
+/**
+  Remove a specified number of bytes data from the beginning of an evbuffer.
+
+  @param buf the evbuffer to be drained
+  @param len the number of bytes to drain from the beginning of the buffer
+  @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_drain(struct evbuffer *buf, size_t len);
+
+
+/**
+  Write the contents of an evbuffer to a file descriptor.
+
+  The evbuffer will be drained after the bytes have been successfully written.
+
+  @param buffer the evbuffer to be written and drained
+  @param fd the file descriptor to be written to
+  @return the number of bytes written, or -1 if an error occurred
+  @see evbuffer_read()
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_write(struct evbuffer *buffer, evutil_socket_t fd);
+
+/**
+  Write some of the contents of an evbuffer to a file descriptor.
+
+  The evbuffer will be drained after the bytes have been successfully written.
+
+  @param buffer the evbuffer to be written and drained
+  @param fd the file descriptor to be written to
+  @param howmuch the largest allowable number of bytes to write, or -1
+	to write as many bytes as we can.
+  @return the number of bytes written, or -1 if an error occurred
+  @see evbuffer_read()
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_write_atmost(struct evbuffer *buffer, evutil_socket_t fd,
+						  ev_ssize_t howmuch);
+
+/**
+  Read from a file descriptor and store the result in an evbuffer.
+
+  @param buffer the evbuffer to store the result
+  @param fd the file descriptor to read from
+  @param howmuch the number of bytes to be read
+  @return the number of bytes read, or -1 if an error occurred
+  @see evbuffer_write()
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_read(struct evbuffer *buffer, evutil_socket_t fd, int howmuch);
+
+/**
+   Search for a string within an evbuffer.
+
+   @param buffer the evbuffer to be searched
+   @param what the string to be searched for
+   @param len the length of the search string
+   @param start NULL or a pointer to a valid struct evbuffer_ptr.
+   @return a struct evbuffer_ptr whose 'pos' field has the offset of the
+     first occurrence of the string in the buffer after 'start'.  The 'pos'
+     field of the result is -1 if the string was not found.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer_ptr evbuffer_search(struct evbuffer *buffer, const char *what, size_t len, const struct evbuffer_ptr *start);
+
+/**
+   Search for a string within part of an evbuffer.
+
+   @param buffer the evbuffer to be searched
+   @param what the string to be searched for
+   @param len the length of the search string
+   @param start NULL or a pointer to a valid struct evbuffer_ptr that
+     indicates where we should start searching.
+   @param end NULL or a pointer to a valid struct evbuffer_ptr that
+     indicates where we should stop searching.
+   @return a struct evbuffer_ptr whose 'pos' field has the offset of the
+     first occurrence of the string in the buffer after 'start'.  The 'pos'
+     field of the result is -1 if the string was not found.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer_ptr evbuffer_search_range(struct evbuffer *buffer, const char *what, size_t len, const struct evbuffer_ptr *start, const struct evbuffer_ptr *end);
+
+/**
+   Defines how to adjust an evbuffer_ptr by evbuffer_ptr_set()
+
+   @see evbuffer_ptr_set() */
+enum evbuffer_ptr_how {
+	/** Sets the pointer to the position; can be called on with an
+	    uninitialized evbuffer_ptr. */
+	EVBUFFER_PTR_SET,
+	/** Advances the pointer by adding to the current position. */
+	EVBUFFER_PTR_ADD
+};
+
+/**
+   Sets the search pointer in the buffer to position.
+
+   There are two ways to use this function: you can call
+      evbuffer_ptr_set(buf, &pos, N, EVBUFFER_PTR_SET)
+   to move 'pos' to a position 'N' bytes after the start of the buffer, or
+      evbuffer_ptr_set(buf, &pos, N, EVBUFFER_PTR_ADD)
+   to move 'pos' forward by 'N' bytes.
+
+   If evbuffer_ptr is not initialized, this function can only be called
+   with EVBUFFER_PTR_SET.
+
+   An evbuffer_ptr can represent any position from the start of the buffer to
+   a position immediately after the end of the buffer.
+
+   @param buffer the evbuffer to be search
+   @param ptr a pointer to a struct evbuffer_ptr
+   @param position the position at which to start the next search
+   @param how determines how the pointer should be manipulated.
+   @returns 0 on success or -1 otherwise
+*/
+EVENT2_EXPORT_SYMBOL
+int
+evbuffer_ptr_set(struct evbuffer *buffer, struct evbuffer_ptr *ptr,
+    size_t position, enum evbuffer_ptr_how how);
+
+/**
+   Search for an end-of-line string within an evbuffer.
+
+   @param buffer the evbuffer to be searched
+   @param start NULL or a pointer to a valid struct evbuffer_ptr to start
+      searching at.
+   @param eol_len_out If non-NULL, the pointed-to value will be set to
+      the length of the end-of-line string.
+   @param eol_style The kind of EOL to look for; see evbuffer_readln() for
+      more information
+   @return a struct evbuffer_ptr whose 'pos' field has the offset of the
+     first occurrence EOL in the buffer after 'start'.  The 'pos'
+     field of the result is -1 if the string was not found.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer_ptr evbuffer_search_eol(struct evbuffer *buffer,
+    struct evbuffer_ptr *start, size_t *eol_len_out,
+    enum evbuffer_eol_style eol_style);
+
+/** Function to peek at data inside an evbuffer without removing it or
+    copying it out.
+
+    Pointers to the data are returned by filling the 'vec_out' array
+    with pointers to one or more extents of data inside the buffer.
+
+    The total data in the extents that you get back may be more than
+    you requested (if there is more data last extent than you asked
+    for), or less (if you do not provide enough evbuffer_iovecs, or if
+    the buffer does not have as much data as you asked to see).
+
+    @param buffer the evbuffer to peek into,
+    @param len the number of bytes to try to peek.  If len is negative, we
+       will try to fill as much of vec_out as we can.  If len is negative
+       and vec_out is not provided, we return the number of evbuffer_iovecs
+       that would be needed to get all the data in the buffer.
+    @param start_at an evbuffer_ptr indicating the point at which we
+       should start looking for data.  NULL means, "At the start of the
+       buffer."
+    @param vec_out an array of evbuffer_iovec
+    @param n_vec the length of vec_out.  If 0, we only count how many
+       extents would be necessary to point to the requested amount of
+       data.
+    @return The number of extents needed.  This may be less than n_vec
+       if we didn't need all the evbuffer_iovecs we were given, or more
+       than n_vec if we would need more to return all the data that was
+       requested.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_peek(struct evbuffer *buffer, ev_ssize_t len,
+    struct evbuffer_ptr *start_at,
+    struct evbuffer_iovec *vec_out, int n_vec);
+
+
+/** Structure passed to an evbuffer_cb_func evbuffer callback
+
+    @see evbuffer_cb_func, evbuffer_add_cb()
+ */
+struct evbuffer_cb_info {
+	/** The number of bytes in this evbuffer when callbacks were last
+	 * invoked. */
+	size_t orig_size;
+	/** The number of bytes added since callbacks were last invoked. */
+	size_t n_added;
+	/** The number of bytes removed since callbacks were last invoked. */
+	size_t n_deleted;
+};
+
+/** Type definition for a callback that is invoked whenever data is added or
+    removed from an evbuffer.
+
+    An evbuffer may have one or more callbacks set at a time.  The order
+    in which they are executed is undefined.
+
+    A callback function may add more callbacks, or remove itself from the
+    list of callbacks, or add or remove data from the buffer.  It may not
+    remove another callback from the list.
+
+    If a callback adds or removes data from the buffer or from another
+    buffer, this can cause a recursive invocation of your callback or
+    other callbacks.  If you ask for an infinite loop, you might just get
+    one: watch out!
+
+    @param buffer the buffer whose size has changed
+    @param info a structure describing how the buffer changed.
+    @param arg a pointer to user data
+*/
+typedef void (*evbuffer_cb_func)(struct evbuffer *buffer, const struct evbuffer_cb_info *info, void *arg);
+
+struct evbuffer_cb_entry;
+/** Add a new callback to an evbuffer.
+
+  Subsequent calls to evbuffer_add_cb() add new callbacks.  To remove this
+  callback, call evbuffer_remove_cb or evbuffer_remove_cb_entry.
+
+  @param buffer the evbuffer to be monitored
+  @param cb the callback function to invoke when the evbuffer is modified,
+	or NULL to remove all callbacks.
+  @param cbarg an argument to be provided to the callback function
+  @return a handle to the callback on success, or NULL on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer_cb_entry *evbuffer_add_cb(struct evbuffer *buffer, evbuffer_cb_func cb, void *cbarg);
+
+/** Remove a callback from an evbuffer, given a handle returned from
+    evbuffer_add_cb.
+
+    Calling this function invalidates the handle.
+
+    @return 0 if a callback was removed, or -1 if no matching callback was
+    found.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_remove_cb_entry(struct evbuffer *buffer,
+			     struct evbuffer_cb_entry *ent);
+
+/** Remove a callback from an evbuffer, given the function and argument
+    used to add it.
+
+    @return 0 if a callback was removed, or -1 if no matching callback was
+    found.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_remove_cb(struct evbuffer *buffer, evbuffer_cb_func cb, void *cbarg);
+
+/** If this flag is not set, then a callback is temporarily disabled, and
+ * should not be invoked.
+ *
+ * @see evbuffer_cb_set_flags(), evbuffer_cb_clear_flags()
+ */
+#define EVBUFFER_CB_ENABLED 1
+
+/** Change the flags that are set for a callback on a buffer by adding more.
+
+    @param buffer the evbuffer that the callback is watching.
+    @param cb the callback whose status we want to change.
+    @param flags EVBUFFER_CB_ENABLED to re-enable the callback.
+    @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_cb_set_flags(struct evbuffer *buffer,
+			  struct evbuffer_cb_entry *cb, ev_uint32_t flags);
+
+/** Change the flags that are set for a callback on a buffer by removing some
+
+    @param buffer the evbuffer that the callback is watching.
+    @param cb the callback whose status we want to change.
+    @param flags EVBUFFER_CB_ENABLED to disable the callback.
+    @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_cb_clear_flags(struct evbuffer *buffer,
+			  struct evbuffer_cb_entry *cb, ev_uint32_t flags);
+
+#if 0
+/** Postpone calling a given callback until unsuspend is called later.
+
+    This is different from disabling the callback, since the callback will get
+	invoked later if the buffer size changes between now and when we unsuspend
+	it.
+
+	@param the buffer that the callback is watching.
+	@param cb the callback we want to suspend.
+ */
+EVENT2_EXPORT_SYMBOL
+void evbuffer_cb_suspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb);
+/** Stop postponing a callback that we postponed with evbuffer_cb_suspend.
+
+	If data was added to or removed from the buffer while the callback was
+	suspended, the callback will get called once now.
+
+	@param the buffer that the callback is watching.
+	@param cb the callback we want to stop suspending.
+ */
+EVENT2_EXPORT_SYMBOL
+void evbuffer_cb_unsuspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb);
+#endif
+
+/**
+  Makes the data at the beginning of an evbuffer contiguous.
+
+  @param buf the evbuffer to make contiguous
+  @param size the number of bytes to make contiguous, or -1 to make the
+	entire buffer contiguous.
+  @return a pointer to the contiguous memory array, or NULL if param size
+	requested more data than is present in the buffer.
+*/
+
+EVENT2_EXPORT_SYMBOL
+unsigned char *evbuffer_pullup(struct evbuffer *buf, ev_ssize_t size);
+
+/**
+  Prepends data to the beginning of the evbuffer
+
+  @param buf the evbuffer to which to prepend data
+  @param data a pointer to the memory to prepend
+  @param size the number of bytes to prepend
+  @return 0 if successful, or -1 otherwise
+*/
+
+EVENT2_EXPORT_SYMBOL
+int evbuffer_prepend(struct evbuffer *buf, const void *data, size_t size);
+
+/**
+  Prepends all data from the src evbuffer to the beginning of the dst
+  evbuffer.
+
+  @param dst the evbuffer to which to prepend data
+  @param src the evbuffer to prepend; it will be emptied as a result
+  @return 0 if successful, or -1 otherwise
+*/
+EVENT2_EXPORT_SYMBOL
+int evbuffer_prepend_buffer(struct evbuffer *dst, struct evbuffer* src);
+
+/**
+   Prevent calls that modify an evbuffer from succeeding. A buffer may
+   frozen at the front, at the back, or at both the front and the back.
+
+   If the front of a buffer is frozen, operations that drain data from
+   the front of the buffer, or that prepend data to the buffer, will
+   fail until it is unfrozen.   If the back a buffer is frozen, operations
+   that append data from the buffer will fail until it is unfrozen.
+
+   @param buf The buffer to freeze
+   @param at_front If true, we freeze the front of the buffer.  If false,
+      we freeze the back.
+   @return 0 on success, -1 on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+int evbuffer_freeze(struct evbuffer *buf, int at_front);
+/**
+   Re-enable calls that modify an evbuffer.
+
+   @param buf The buffer to un-freeze
+   @param at_front If true, we unfreeze the front of the buffer.  If false,
+      we unfreeze the back.
+   @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_unfreeze(struct evbuffer *buf, int at_front);
+
+struct event_base;
+/**
+   Force all the callbacks on an evbuffer to be run, not immediately after
+   the evbuffer is altered, but instead from inside the event loop.
+
+   This can be used to serialize all the callbacks to a single thread
+   of execution.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_defer_callbacks(struct evbuffer *buffer, struct event_base *base);
+
+/**
+  Append data from 1 or more iovec's to an evbuffer
+
+  Calculates the number of bytes needed for an iovec structure and guarantees
+  all data will fit into a single chain. Can be used in lieu of functionality
+  which calls evbuffer_add() constantly before being used to increase
+  performance.
+
+  @param buffer the destination buffer
+  @param vec the source iovec
+  @param n_vec the number of iovec structures.
+  @return the number of bytes successfully written to the output buffer.
+*/
+EVENT2_EXPORT_SYMBOL
+size_t evbuffer_add_iovec(struct evbuffer * buffer, struct evbuffer_iovec * vec, int n_vec);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_BUFFER_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/buffer_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/buffer_compat.h
new file mode 100644
index 000000000000..0ce10254487d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/buffer_compat.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#ifndef EVENT2_BUFFER_COMPAT_H_INCLUDED_
+#define EVENT2_BUFFER_COMPAT_H_INCLUDED_
+
+#include <event2/visibility.h>
+
+/** @file event2/buffer_compat.h
+
+	Obsolete and deprecated versions of the functions in buffer.h: provided
+	only for backward compatibility.
+ */
+
+
+/**
+   Obsolete alias for evbuffer_readln(buffer, NULL, EVBUFFER_EOL_ANY).
+
+   @deprecated This function is deprecated because its behavior is not correct
+      for almost any protocol, and also because it's wholly subsumed by
+      evbuffer_readln().
+
+   @param buffer the evbuffer to read from
+   @return pointer to a single line, or NULL if an error occurred
+
+*/
+EVENT2_EXPORT_SYMBOL
+char *evbuffer_readline(struct evbuffer *buffer);
+
+/** Type definition for a callback that is invoked whenever data is added or
+    removed from an evbuffer.
+
+    An evbuffer may have one or more callbacks set at a time.  The order
+    in which they are executed is undefined.
+
+    A callback function may add more callbacks, or remove itself from the
+    list of callbacks, or add or remove data from the buffer.  It may not
+    remove another callback from the list.
+
+    If a callback adds or removes data from the buffer or from another
+    buffer, this can cause a recursive invocation of your callback or
+    other callbacks.  If you ask for an infinite loop, you might just get
+    one: watch out!
+
+    @param buffer the buffer whose size has changed
+    @param old_len the previous length of the buffer
+    @param new_len the current length of the buffer
+    @param arg a pointer to user data
+*/
+typedef void (*evbuffer_cb)(struct evbuffer *buffer, size_t old_len, size_t new_len, void *arg);
+
+/**
+  Replace all callbacks on an evbuffer with a single new callback, or
+  remove them.
+
+  Subsequent calls to evbuffer_setcb() replace callbacks set by previous
+  calls.  Setting the callback to NULL removes any previously set callback.
+
+  @deprecated This function is deprecated because it clears all previous
+     callbacks set on the evbuffer, which can cause confusing behavior if
+     multiple parts of the code all want to add their own callbacks on a
+     buffer.  Instead, use evbuffer_add(), evbuffer_del(), and
+     evbuffer_setflags() to manage your own evbuffer callbacks without
+     interfering with callbacks set by others.
+
+  @param buffer the evbuffer to be monitored
+  @param cb the callback function to invoke when the evbuffer is modified,
+	 or NULL to remove all callbacks.
+  @param cbarg an argument to be provided to the callback function
+  @return 0 if successful, or -1 on error
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_setcb(struct evbuffer *buffer, evbuffer_cb cb, void *cbarg);
+
+
+/**
+  Find a string within an evbuffer.
+
+  @param buffer the evbuffer to be searched
+  @param what the string to be searched for
+  @param len the length of the search string
+  @return a pointer to the beginning of the search string, or NULL if the search failed.
+ */
+EVENT2_EXPORT_SYMBOL
+unsigned char *evbuffer_find(struct evbuffer *buffer, const unsigned char *what, size_t len);
+
+/** deprecated in favor of calling the functions directly */
+#define EVBUFFER_LENGTH(x)	evbuffer_get_length(x)
+/** deprecated in favor of calling the functions directly */
+#define EVBUFFER_DATA(x)	evbuffer_pullup((x), -1)
+
+#endif
+
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent.h b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent.h
new file mode 100644
index 000000000000..48cd153563bb
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent.h
@@ -0,0 +1,1024 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_BUFFEREVENT_H_INCLUDED_
+#define EVENT2_BUFFEREVENT_H_INCLUDED_
+
+/**
+   @file event2/bufferevent.h
+
+  Functions for buffering data for network sending or receiving.  Bufferevents
+  are higher level than evbuffers: each has an underlying evbuffer for reading
+  and one for writing, and callbacks that are invoked under certain
+  circumstances.
+
+  A bufferevent provides input and output buffers that get filled and
+  drained automatically.  The user of a bufferevent no longer deals
+  directly with the I/O, but instead is reading from input and writing
+  to output buffers.
+
+  Once initialized, the bufferevent structure can be used repeatedly
+  with bufferevent_enable() and bufferevent_disable().
+
+  When reading is enabled, the bufferevent will try to read from the
+  file descriptor onto its input buffer, and call the read callback.
+  When writing is enabled, the bufferevent will try to write data onto its
+  file descriptor when the output buffer has enough data, and call the write
+  callback when the output buffer is sufficiently drained.
+
+  Bufferevents come in several flavors, including:
+
+  <dl>
+    <dt>Socket-based bufferevents</dt>
+      <dd>A bufferevent that reads and writes data onto a network
+          socket. Created with bufferevent_socket_new().</dd>
+
+    <dt>Paired bufferevents</dt>
+      <dd>A pair of bufferevents that send and receive data to one
+          another without touching the network.  Created with
+          bufferevent_pair_new().</dd>
+
+    <dt>Filtering bufferevents</dt>
+       <dd>A bufferevent that transforms data, and sends or receives it
+          over another underlying bufferevent.  Created with
+          bufferevent_filter_new().</dd>
+
+    <dt>SSL-backed bufferevents</dt>
+      <dd>A bufferevent that uses the openssl library to send and
+          receive data over an encrypted connection. Created with
+	  bufferevent_openssl_socket_new() or
+	  bufferevent_openssl_filter_new().</dd>
+  </dl>
+ */
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/** @name Bufferevent event codes
+
+    These flags are passed as arguments to a bufferevent's event callback.
+
+    @{
+*/
+#define BEV_EVENT_READING	0x01	/**< error encountered while reading */
+#define BEV_EVENT_WRITING	0x02	/**< error encountered while writing */
+#define BEV_EVENT_EOF		0x10	/**< eof file reached */
+#define BEV_EVENT_ERROR		0x20	/**< unrecoverable error encountered */
+#define BEV_EVENT_TIMEOUT	0x40	/**< user-specified timeout reached */
+#define BEV_EVENT_CONNECTED	0x80	/**< connect operation finished. */
+/**@}*/
+
+/**
+   An opaque type for handling buffered IO
+
+   @see event2/bufferevent.h
+ */
+struct bufferevent
+#ifdef EVENT_IN_DOXYGEN_
+{}
+#endif
+;
+struct event_base;
+struct evbuffer;
+struct sockaddr;
+
+/**
+   A read or write callback for a bufferevent.
+
+   The read callback is triggered when new data arrives in the input
+   buffer and the amount of readable data exceed the low watermark
+   which is 0 by default.
+
+   The write callback is triggered if the write buffer has been
+   exhausted or fell below its low watermark.
+
+   @param bev the bufferevent that triggered the callback
+   @param ctx the user-specified context for this bufferevent
+ */
+typedef void (*bufferevent_data_cb)(struct bufferevent *bev, void *ctx);
+
+/**
+   An event/error callback for a bufferevent.
+
+   The event callback is triggered if either an EOF condition or another
+   unrecoverable error was encountered.
+
+   For bufferevents with deferred callbacks, this is a bitwise OR of all errors
+   that have happened on the bufferevent since the last callback invocation.
+
+   @param bev the bufferevent for which the error condition was reached
+   @param what a conjunction of flags: BEV_EVENT_READING or BEV_EVENT_WRITING
+	  to indicate if the error was encountered on the read or write path,
+	  and one of the following flags: BEV_EVENT_EOF, BEV_EVENT_ERROR,
+	  BEV_EVENT_TIMEOUT, BEV_EVENT_CONNECTED.
+
+   @param ctx the user-specified context for this bufferevent
+*/
+typedef void (*bufferevent_event_cb)(struct bufferevent *bev, short what, void *ctx);
+
+/** Options that can be specified when creating a bufferevent */
+enum bufferevent_options {
+	/** If set, we close the underlying file
+	 * descriptor/bufferevent/whatever when this bufferevent is freed. */
+	BEV_OPT_CLOSE_ON_FREE = (1<<0),
+
+	/** If set, and threading is enabled, operations on this bufferevent
+	 * are protected by a lock */
+	BEV_OPT_THREADSAFE = (1<<1),
+
+	/** If set, callbacks are run deferred in the event loop. */
+	BEV_OPT_DEFER_CALLBACKS = (1<<2),
+
+	/** If set, callbacks are executed without locks being held on the
+	* bufferevent.  This option currently requires that
+	* BEV_OPT_DEFER_CALLBACKS also be set; a future version of Libevent
+	* might remove the requirement.*/
+	BEV_OPT_UNLOCK_CALLBACKS = (1<<3)
+};
+
+/**
+  Create a new socket bufferevent over an existing socket.
+
+  @param base the event base to associate with the new bufferevent.
+  @param fd the file descriptor from which data is read and written to.
+	    This file descriptor is not allowed to be a pipe(2).
+	    It is safe to set the fd to -1, so long as you later
+	    set it with bufferevent_setfd or bufferevent_socket_connect().
+  @param options Zero or more BEV_OPT_* flags
+  @return a pointer to a newly allocated bufferevent struct, or NULL if an
+	  error occurred
+  @see bufferevent_free()
+  */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *bufferevent_socket_new(struct event_base *base, evutil_socket_t fd, int options);
+
+/**
+   Launch a connect() attempt with a socket-based bufferevent.
+
+   When the connect succeeds, the eventcb will be invoked with
+   BEV_EVENT_CONNECTED set.
+
+   If the bufferevent does not already have a socket set, we allocate a new
+   socket here and make it nonblocking before we begin.
+
+   If no address is provided, we assume that the socket is already connecting,
+   and configure the bufferevent so that a BEV_EVENT_CONNECTED event will be
+   yielded when it is done connecting.
+
+   @param bufev an existing bufferevent allocated with
+       bufferevent_socket_new().
+   @param addr the address we should connect to
+   @param socklen The length of the address
+   @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_socket_connect(struct bufferevent *, const struct sockaddr *, int);
+
+struct evdns_base;
+/**
+   Resolve the hostname 'hostname' and connect to it as with
+   bufferevent_socket_connect().
+
+   @param bufev An existing bufferevent allocated with bufferevent_socket_new()
+   @param evdns_base Optionally, an evdns_base to use for resolving hostnames
+      asynchronously. May be set to NULL for a blocking resolve.
+   @param family A preferred address family to resolve addresses to, or
+      AF_UNSPEC for no preference.  Only AF_INET, AF_INET6, and AF_UNSPEC are
+      supported.
+   @param hostname The hostname to resolve; see below for notes on recognized
+      formats
+   @param port The port to connect to on the resolved address.
+   @return 0 if successful, -1 on failure.
+
+   Recognized hostname formats are:
+
+       www.example.com	(hostname)
+       1.2.3.4		(ipv4address)
+       ::1		(ipv6address)
+       [::1]		([ipv6address])
+
+   Performance note: If you do not provide an evdns_base, this function
+   may block while it waits for a DNS response.	 This is probably not
+   what you want.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_socket_connect_hostname(struct bufferevent *,
+    struct evdns_base *, int, const char *, int);
+
+/**
+   Return the error code for the last failed DNS lookup attempt made by
+   bufferevent_socket_connect_hostname().
+
+   @param bev The bufferevent object.
+   @return DNS error code.
+   @see evutil_gai_strerror()
+*/
+EVENT2_EXPORT_SYMBOL
+int bufferevent_socket_get_dns_error(struct bufferevent *bev);
+
+/**
+  Assign a bufferevent to a specific event_base.
+
+  NOTE that only socket bufferevents support this function.
+
+  @param base an event_base returned by event_init()
+  @param bufev a bufferevent struct returned by bufferevent_new()
+     or bufferevent_socket_new()
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_new()
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev);
+
+/**
+   Return the event_base used by a bufferevent
+*/
+EVENT2_EXPORT_SYMBOL
+struct event_base *bufferevent_get_base(struct bufferevent *bev);
+
+/**
+  Assign a priority to a bufferevent.
+
+  Only supported for socket bufferevents.
+
+  @param bufev a bufferevent struct
+  @param pri the priority to be assigned
+  @return 0 if successful, or -1 if an error occurred
+  */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_priority_set(struct bufferevent *bufev, int pri);
+
+/**
+   Return the priority of a bufferevent.
+
+   Only supported for socket bufferevents
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_get_priority(const struct bufferevent *bufev);
+
+/**
+  Deallocate the storage associated with a bufferevent structure.
+
+  If there is pending data to write on the bufferevent, it probably won't be
+  flushed before the bufferevent is freed.
+
+  @param bufev the bufferevent structure to be freed.
+  */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_free(struct bufferevent *bufev);
+
+
+/**
+  Changes the callbacks for a bufferevent.
+
+  @param bufev the bufferevent object for which to change callbacks
+  @param readcb callback to invoke when there is data to be read, or NULL if
+	 no callback is desired
+  @param writecb callback to invoke when the file descriptor is ready for
+	 writing, or NULL if no callback is desired
+  @param eventcb callback to invoke when there is an event on the file
+	 descriptor
+  @param cbarg an argument that will be supplied to each of the callbacks
+	 (readcb, writecb, and errorcb)
+  @see bufferevent_new()
+  */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_setcb(struct bufferevent *bufev,
+    bufferevent_data_cb readcb, bufferevent_data_cb writecb,
+    bufferevent_event_cb eventcb, void *cbarg);
+
+/**
+ Retrieves the callbacks for a bufferevent.
+
+ @param bufev the bufferevent to examine.
+ @param readcb_ptr if readcb_ptr is nonnull, *readcb_ptr is set to the current
+    read callback for the bufferevent.
+ @param writecb_ptr if writecb_ptr is nonnull, *writecb_ptr is set to the
+    current write callback for the bufferevent.
+ @param eventcb_ptr if eventcb_ptr is nonnull, *eventcb_ptr is set to the
+    current event callback for the bufferevent.
+ @param cbarg_ptr if cbarg_ptr is nonnull, *cbarg_ptr is set to the current
+    callback argument for the bufferevent.
+ @see buffervent_setcb()
+*/
+EVENT2_EXPORT_SYMBOL
+void bufferevent_getcb(struct bufferevent *bufev,
+    bufferevent_data_cb *readcb_ptr,
+    bufferevent_data_cb *writecb_ptr,
+    bufferevent_event_cb *eventcb_ptr,
+    void **cbarg_ptr);
+
+/**
+  Changes the file descriptor on which the bufferevent operates.
+  Not supported for all bufferevent types.
+
+  @param bufev the bufferevent object for which to change the file descriptor
+  @param fd the file descriptor to operate on
+*/
+EVENT2_EXPORT_SYMBOL
+int bufferevent_setfd(struct bufferevent *bufev, evutil_socket_t fd);
+
+/**
+   Returns the file descriptor associated with a bufferevent, or -1 if
+   no file descriptor is associated with the bufferevent.
+ */
+EVENT2_EXPORT_SYMBOL
+evutil_socket_t bufferevent_getfd(struct bufferevent *bufev);
+
+/**
+   Returns the underlying bufferevent associated with a bufferevent (if
+   the bufferevent is a wrapper), or NULL if there is no underlying bufferevent.
+ */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *bufferevent_get_underlying(struct bufferevent *bufev);
+
+/**
+  Write data to a bufferevent buffer.
+
+  The bufferevent_write() function can be used to write data to the file
+  descriptor.  The data is appended to the output buffer and written to the
+  descriptor automatically as it becomes available for writing.
+
+  @param bufev the bufferevent to be written to
+  @param data a pointer to the data to be written
+  @param size the length of the data, in bytes
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_write_buffer()
+  */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_write(struct bufferevent *bufev,
+    const void *data, size_t size);
+
+
+/**
+  Write data from an evbuffer to a bufferevent buffer.	The evbuffer is
+  being drained as a result.
+
+  @param bufev the bufferevent to be written to
+  @param buf the evbuffer to be written
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_write()
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf);
+
+
+/**
+  Read data from a bufferevent buffer.
+
+  The bufferevent_read() function is used to read data from the input buffer.
+
+  @param bufev the bufferevent to be read from
+  @param data pointer to a buffer that will store the data
+  @param size the size of the data buffer, in bytes
+  @return the amount of data read, in bytes.
+ */
+EVENT2_EXPORT_SYMBOL
+size_t bufferevent_read(struct bufferevent *bufev, void *data, size_t size);
+
+/**
+  Read data from a bufferevent buffer into an evbuffer.	 This avoids
+  memory copies.
+
+  @param bufev the bufferevent to be read from
+  @param buf the evbuffer to which to add data
+  @return 0 if successful, or -1 if an error occurred.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_read_buffer(struct bufferevent *bufev, struct evbuffer *buf);
+
+/**
+   Returns the input buffer.
+
+   The user MUST NOT set the callback on this buffer.
+
+   @param bufev the bufferevent from which to get the evbuffer
+   @return the evbuffer object for the input buffer
+ */
+
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *bufferevent_get_input(struct bufferevent *bufev);
+
+/**
+   Returns the output buffer.
+
+   The user MUST NOT set the callback on this buffer.
+
+   When filters are being used, the filters need to be manually
+   triggered if the output buffer was manipulated.
+
+   @param bufev the bufferevent from which to get the evbuffer
+   @return the evbuffer object for the output buffer
+ */
+
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *bufferevent_get_output(struct bufferevent *bufev);
+
+/**
+  Enable a bufferevent.
+
+  @param bufev the bufferevent to be enabled
+  @param event any combination of EV_READ | EV_WRITE.
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_disable()
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_enable(struct bufferevent *bufev, short event);
+
+/**
+  Disable a bufferevent.
+
+  @param bufev the bufferevent to be disabled
+  @param event any combination of EV_READ | EV_WRITE.
+  @return 0 if successful, or -1 if an error occurred
+  @see bufferevent_enable()
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_disable(struct bufferevent *bufev, short event);
+
+/**
+   Return the events that are enabled on a given bufferevent.
+
+   @param bufev the bufferevent to inspect
+   @return A combination of EV_READ | EV_WRITE
+ */
+EVENT2_EXPORT_SYMBOL
+short bufferevent_get_enabled(struct bufferevent *bufev);
+
+/**
+  Set the read and write timeout for a bufferevent.
+
+  A bufferevent's timeout will fire the first time that the indicated
+  amount of time has elapsed since a successful read or write operation,
+  during which the bufferevent was trying to read or write.
+
+  (In other words, if reading or writing is disabled, or if the
+  bufferevent's read or write operation has been suspended because
+  there's no data to write, or not enough bandwidth, or so on, the
+  timeout isn't active.  The timeout only becomes active when we we're
+  willing to actually read or write.)
+
+  Calling bufferevent_enable or setting a timeout for a bufferevent
+  whose timeout is already pending resets its timeout.
+
+  If the timeout elapses, the corresponding operation (EV_READ or
+  EV_WRITE) becomes disabled until you re-enable it again.  The
+  bufferevent's event callback is called with the
+  BEV_EVENT_TIMEOUT|BEV_EVENT_READING or
+  BEV_EVENT_TIMEOUT|BEV_EVENT_WRITING.
+
+  @param bufev the bufferevent to be modified
+  @param timeout_read the read timeout, or NULL
+  @param timeout_write the write timeout, or NULL
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_set_timeouts(struct bufferevent *bufev,
+    const struct timeval *timeout_read, const struct timeval *timeout_write);
+
+/**
+  Sets the watermarks for read and write events.
+
+  On input, a bufferevent does not invoke the user read callback unless
+  there is at least low watermark data in the buffer.	If the read buffer
+  is beyond the high watermark, the bufferevent stops reading from the network.
+  But be aware that bufferevent input/read buffer can overrun high watermark
+  limit (typical example is openssl bufferevent), so you should not relay in
+  this.
+
+  On output, the user write callback is invoked whenever the buffered data
+  falls below the low watermark.  Filters that write to this bufev will try
+  not to write more bytes to this buffer than the high watermark would allow,
+  except when flushing.
+
+  @param bufev the bufferevent to be modified
+  @param events EV_READ, EV_WRITE or both
+  @param lowmark the lower watermark to set
+  @param highmark the high watermark to set
+*/
+
+EVENT2_EXPORT_SYMBOL
+void bufferevent_setwatermark(struct bufferevent *bufev, short events,
+    size_t lowmark, size_t highmark);
+
+/**
+  Retrieves the watermarks for read or write events.
+  Returns non-zero if events contains not only EV_READ or EV_WRITE.
+  Returns zero if events equal EV_READ or EV_WRITE
+
+  @param bufev the bufferevent to be examined
+  @param events EV_READ or EV_WRITE
+  @param lowmark receives the lower watermark if not NULL
+  @param highmark receives the high watermark if not NULL
+*/
+EVENT2_EXPORT_SYMBOL
+int bufferevent_getwatermark(struct bufferevent *bufev, short events,
+    size_t *lowmark, size_t *highmark);
+
+/**
+   Acquire the lock on a bufferevent.  Has no effect if locking was not
+   enabled with BEV_OPT_THREADSAFE.
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_lock(struct bufferevent *bufev);
+
+/**
+   Release the lock on a bufferevent.  Has no effect if locking was not
+   enabled with BEV_OPT_THREADSAFE.
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_unlock(struct bufferevent *bufev);
+
+
+/**
+ * Public interface to manually increase the reference count of a bufferevent
+ * this is useful in situations where a user may reference the bufferevent
+ * somewhere else (unknown to libevent)
+ *
+ * @param bufev the bufferevent to increase the refcount on
+ *
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_incref(struct bufferevent *bufev);
+
+/**
+ * Public interface to manually decrement the reference count of a bufferevent
+ *
+ * Warning: make sure you know what you're doing. This is mainly used in
+ * conjunction with bufferevent_incref(). This will free up all data associated
+ * with a bufferevent if the reference count hits 0.
+ *
+ * @param bufev the bufferevent to decrement the refcount on
+ *
+ * @return 1 if the bufferevent was freed, otherwise 0 (still referenced)
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decref(struct bufferevent *bufev);
+
+/**
+   Flags that can be passed into filters to let them know how to
+   deal with the incoming data.
+*/
+enum bufferevent_flush_mode {
+	/** usually set when processing data */
+	BEV_NORMAL = 0,
+
+	/** want to checkpoint all data sent. */
+	BEV_FLUSH = 1,
+
+	/** encountered EOF on read or done sending data */
+	BEV_FINISHED = 2
+};
+
+/**
+   Triggers the bufferevent to produce more data if possible.
+
+   @param bufev the bufferevent object
+   @param iotype either EV_READ or EV_WRITE or both.
+   @param mode either BEV_NORMAL or BEV_FLUSH or BEV_FINISHED
+   @return -1 on failure, 0 if no data was produces, 1 if data was produced
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_flush(struct bufferevent *bufev,
+    short iotype,
+    enum bufferevent_flush_mode mode);
+
+/**
+   Flags for bufferevent_trigger(_event) that modify when and how to trigger
+   the callback.
+*/
+enum bufferevent_trigger_options {
+	/** trigger the callback regardless of the watermarks */
+	BEV_TRIG_IGNORE_WATERMARKS = (1<<16),
+
+	/** defer even if the callbacks are not */
+	BEV_TRIG_DEFER_CALLBACKS = BEV_OPT_DEFER_CALLBACKS
+
+	/* (Note: for internal reasons, these need to be disjoint from
+	 * bufferevent_options, except when they mean the same thing. */
+};
+
+/**
+   Triggers bufferevent data callbacks.
+
+   The function will honor watermarks unless options contain
+   BEV_TRIG_IGNORE_WATERMARKS. If the options contain BEV_OPT_DEFER_CALLBACKS,
+   the callbacks are deferred.
+
+   @param bufev the bufferevent object
+   @param iotype either EV_READ or EV_WRITE or both.
+   @param options
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_trigger(struct bufferevent *bufev, short iotype,
+    int options);
+
+/**
+   Triggers the bufferevent event callback.
+
+   If the options contain BEV_OPT_DEFER_CALLBACKS, the callbacks are deferred.
+
+   @param bufev the bufferevent object
+   @param what the flags to pass onto the event callback
+   @param options
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_trigger_event(struct bufferevent *bufev, short what,
+    int options);
+
+/**
+   @name Filtering support
+
+   @{
+*/
+/**
+   Values that filters can return.
+ */
+enum bufferevent_filter_result {
+	/** everything is okay */
+	BEV_OK = 0,
+
+	/** the filter needs to read more data before output */
+	BEV_NEED_MORE = 1,
+
+	/** the filter encountered a critical error, no further data
+	    can be processed. */
+	BEV_ERROR = 2
+};
+
+/** A callback function to implement a filter for a bufferevent.
+
+    @param src An evbuffer to drain data from.
+    @param dst An evbuffer to add data to.
+    @param limit A suggested upper bound of bytes to write to dst.
+       The filter may ignore this value, but doing so means that
+       it will overflow the high-water mark associated with dst.
+       -1 means "no limit".
+    @param mode Whether we should write data as may be convenient
+       (BEV_NORMAL), or flush as much data as we can (BEV_FLUSH),
+       or flush as much as we can, possibly including an end-of-stream
+       marker (BEV_FINISH).
+    @param ctx A user-supplied pointer.
+
+    @return BEV_OK if we wrote some data; BEV_NEED_MORE if we can't
+       produce any more output until we get some input; and BEV_ERROR
+       on an error.
+ */
+typedef enum bufferevent_filter_result (*bufferevent_filter_cb)(
+    struct evbuffer *src, struct evbuffer *dst, ev_ssize_t dst_limit,
+    enum bufferevent_flush_mode mode, void *ctx);
+
+/**
+   Allocate a new filtering bufferevent on top of an existing bufferevent.
+
+   @param underlying the underlying bufferevent.
+   @param input_filter The filter to apply to data we read from the underlying
+     bufferevent
+   @param output_filter The filer to apply to data we write to the underlying
+     bufferevent
+   @param options A bitfield of bufferevent options.
+   @param free_context A function to use to free the filter context when
+     this bufferevent is freed.
+   @param ctx A context pointer to pass to the filter functions.
+ */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *
+bufferevent_filter_new(struct bufferevent *underlying,
+		       bufferevent_filter_cb input_filter,
+		       bufferevent_filter_cb output_filter,
+		       int options,
+		       void (*free_context)(void *),
+		       void *ctx);
+/**@}*/
+
+/**
+   Allocate a pair of linked bufferevents.  The bufferevents behave as would
+   two bufferevent_sock instances connected to opposite ends of a
+   socketpair(), except that no internal socketpair is allocated.
+
+   @param base The event base to associate with the socketpair.
+   @param options A set of options for this bufferevent
+   @param pair A pointer to an array to hold the two new bufferevent objects.
+   @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_pair_new(struct event_base *base, int options,
+    struct bufferevent *pair[2]);
+
+/**
+   Given one bufferevent returned by bufferevent_pair_new(), returns the
+   other one if it still exists.  Otherwise returns NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *bufferevent_pair_get_partner(struct bufferevent *bev);
+
+/**
+   Abstract type used to configure rate-limiting on a bufferevent or a group
+   of bufferevents.
+ */
+struct ev_token_bucket_cfg;
+
+/**
+   A group of bufferevents which are configured to respect the same rate
+   limit.
+*/
+struct bufferevent_rate_limit_group;
+
+/** Maximum configurable rate- or burst-limit. */
+#define EV_RATE_LIMIT_MAX EV_SSIZE_MAX
+
+/**
+   Initialize and return a new object to configure the rate-limiting behavior
+   of bufferevents.
+
+   @param read_rate The maximum number of bytes to read per tick on
+     average.
+   @param read_burst The maximum number of bytes to read in any single tick.
+   @param write_rate The maximum number of bytes to write per tick on
+     average.
+   @param write_burst The maximum number of bytes to write in any single tick.
+   @param tick_len The length of a single tick.	 Defaults to one second.
+     Any fractions of a millisecond are ignored.
+
+   Note that all rate-limits hare are currently best-effort: future versions
+   of Libevent may implement them more tightly.
+ */
+EVENT2_EXPORT_SYMBOL
+struct ev_token_bucket_cfg *ev_token_bucket_cfg_new(
+	size_t read_rate, size_t read_burst,
+	size_t write_rate, size_t write_burst,
+	const struct timeval *tick_len);
+
+/** Free all storage held in 'cfg'.
+
+    Note: 'cfg' is not currently reference-counted; it is not safe to free it
+    until no bufferevent is using it.
+ */
+EVENT2_EXPORT_SYMBOL
+void ev_token_bucket_cfg_free(struct ev_token_bucket_cfg *cfg);
+
+/**
+   Set the rate-limit of a the bufferevent 'bev' to the one specified in
+   'cfg'.  If 'cfg' is NULL, disable any per-bufferevent rate-limiting on
+   'bev'.
+
+   Note that only some bufferevent types currently respect rate-limiting.
+   They are: socket-based bufferevents (normal and IOCP-based), and SSL-based
+   bufferevents.
+
+   Return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_set_rate_limit(struct bufferevent *bev,
+    struct ev_token_bucket_cfg *cfg);
+
+/**
+   Create a new rate-limit group for bufferevents.  A rate-limit group
+   constrains the maximum number of bytes sent and received, in toto,
+   by all of its bufferevents.
+
+   @param base An event_base to run any necessary timeouts for the group.
+      Note that all bufferevents in the group do not necessarily need to share
+      this event_base.
+   @param cfg The rate-limit for this group.
+
+   Note that all rate-limits hare are currently best-effort: future versions
+   of Libevent may implement them more tightly.
+
+   Note also that only some bufferevent types currently respect rate-limiting.
+   They are: socket-based bufferevents (normal and IOCP-based), and SSL-based
+   bufferevents.
+ */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent_rate_limit_group *bufferevent_rate_limit_group_new(
+	struct event_base *base,
+	const struct ev_token_bucket_cfg *cfg);
+/**
+   Change the rate-limiting settings for a given rate-limiting group.
+
+   Return 0 on success, -1 on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+int bufferevent_rate_limit_group_set_cfg(
+	struct bufferevent_rate_limit_group *,
+	const struct ev_token_bucket_cfg *);
+
+/**
+   Change the smallest quantum we're willing to allocate to any single
+   bufferevent in a group for reading or writing at a time.
+
+   The rationale is that, because of TCP/IP protocol overheads and kernel
+   behavior, if a rate-limiting group is so tight on bandwidth that you're
+   only willing to send 1 byte per tick per bufferevent, you might instead
+   want to batch up the reads and writes so that you send N bytes per
+   1/N of the bufferevents (chosen at random) each tick, so you still wind
+   up send 1 byte per tick per bufferevent on average, but you don't send
+   so many tiny packets.
+
+   The default min-share is currently 64 bytes.
+
+   Returns 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_rate_limit_group_set_min_share(
+	struct bufferevent_rate_limit_group *, size_t);
+
+/**
+   Free a rate-limiting group.  The group must have no members when
+   this function is called.
+*/
+EVENT2_EXPORT_SYMBOL
+void bufferevent_rate_limit_group_free(struct bufferevent_rate_limit_group *);
+
+/**
+   Add 'bev' to the list of bufferevents whose aggregate reading and writing
+   is restricted by 'g'.  If 'g' is NULL, remove 'bev' from its current group.
+
+   A bufferevent may belong to no more than one rate-limit group at a time.
+   If 'bev' is already a member of a group, it will be removed from its old
+   group before being added to 'g'.
+
+   Return 0 on success and -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_add_to_rate_limit_group(struct bufferevent *bev,
+    struct bufferevent_rate_limit_group *g);
+
+/** Remove 'bev' from its current rate-limit group (if any). */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_remove_from_rate_limit_group(struct bufferevent *bev);
+
+/**
+   Set the size limit for single read operation.
+
+   Set to 0 for a reasonable default.
+
+   Return 0 on success and -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_set_max_single_read(struct bufferevent *bev, size_t size);
+
+/**
+   Set the size limit for single write operation.
+
+   Set to 0 for a reasonable default.
+
+   Return 0 on success and -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_set_max_single_write(struct bufferevent *bev, size_t size);
+
+/** Get the current size limit for single read operation. */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_max_single_read(struct bufferevent *bev);
+
+/** Get the current size limit for single write operation. */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_max_single_write(struct bufferevent *bev);
+
+/**
+   @name Rate limit inspection
+
+   Return the current read or write bucket size for a bufferevent.
+   If it is not configured with a per-bufferevent ratelimit, return
+   EV_SSIZE_MAX.  This function does not inspect the group limit, if any.
+   Note that it can return a negative value if the bufferevent has been
+   made to read or write more than its limit.
+
+   @{
+ */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_read_limit(struct bufferevent *bev);
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_write_limit(struct bufferevent *bev);
+/*@}*/
+
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_max_to_read(struct bufferevent *bev);
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_get_max_to_write(struct bufferevent *bev);
+
+EVENT2_EXPORT_SYMBOL
+const struct ev_token_bucket_cfg *bufferevent_get_token_bucket_cfg(const struct bufferevent * bev);
+
+/**
+   @name Group Rate limit inspection
+
+   Return the read or write bucket size for a bufferevent rate limit
+   group.  Note that it can return a negative value if bufferevents in
+   the group have been made to read or write more than their limits.
+
+   @{
+ */
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_rate_limit_group_get_read_limit(
+	struct bufferevent_rate_limit_group *);
+EVENT2_EXPORT_SYMBOL
+ev_ssize_t bufferevent_rate_limit_group_get_write_limit(
+	struct bufferevent_rate_limit_group *);
+/*@}*/
+
+/**
+   @name Rate limit manipulation
+
+   Subtract a number of bytes from a bufferevent's read or write bucket.
+   The decrement value can be negative, if you want to manually refill
+   the bucket.	If the change puts the bucket above or below zero, the
+   bufferevent will resume or suspend reading writing as appropriate.
+   These functions make no change in the buckets for the bufferevent's
+   group, if any.
+
+   Returns 0 on success, -1 on internal error.
+
+   @{
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decrement_read_limit(struct bufferevent *bev, ev_ssize_t decr);
+EVENT2_EXPORT_SYMBOL
+int bufferevent_decrement_write_limit(struct bufferevent *bev, ev_ssize_t decr);
+/*@}*/
+
+/**
+   @name Group rate limit manipulation
+
+   Subtract a number of bytes from a bufferevent rate-limiting group's
+   read or write bucket.  The decrement value can be negative, if you
+   want to manually refill the bucket.	If the change puts the bucket
+   above or below zero, the bufferevents in the group will resume or
+   suspend reading writing as appropriate.
+
+   Returns 0 on success, -1 on internal error.
+
+   @{
+ */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_rate_limit_group_decrement_read(
+	struct bufferevent_rate_limit_group *, ev_ssize_t);
+EVENT2_EXPORT_SYMBOL
+int bufferevent_rate_limit_group_decrement_write(
+	struct bufferevent_rate_limit_group *, ev_ssize_t);
+/*@}*/
+
+
+/**
+ * Inspect the total bytes read/written on a group.
+ *
+ * Set the variable pointed to by total_read_out to the total number of bytes
+ * ever read on grp, and the variable pointed to by total_written_out to the
+ * total number of bytes ever written on grp. */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_rate_limit_group_get_totals(
+    struct bufferevent_rate_limit_group *grp,
+    ev_uint64_t *total_read_out, ev_uint64_t *total_written_out);
+
+/**
+ * Reset the total bytes read/written on a group.
+ *
+ * Reset the number of bytes read or written on grp as given by
+ * bufferevent_rate_limit_group_reset_totals(). */
+EVENT2_EXPORT_SYMBOL
+void
+bufferevent_rate_limit_group_reset_totals(
+	struct bufferevent_rate_limit_group *grp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_BUFFEREVENT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_compat.h
new file mode 100644
index 000000000000..a5a3c7207d64
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_compat.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos, Nick Mathewson
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_BUFFEREVENT_COMPAT_H_INCLUDED_
+#define EVENT2_BUFFEREVENT_COMPAT_H_INCLUDED_
+
+#include <event2/visibility.h>
+
+#define evbuffercb bufferevent_data_cb
+#define everrorcb bufferevent_event_cb
+
+/**
+  Create a new bufferevent for an fd.
+
+  This function is deprecated.  Use bufferevent_socket_new and
+  bufferevent_set_callbacks instead.
+
+  Libevent provides an abstraction on top of the regular event callbacks.
+  This abstraction is called a buffered event.  A buffered event provides
+  input and output buffers that get filled and drained automatically.  The
+  user of a buffered event no longer deals directly with the I/O, but
+  instead is reading from input and writing to output buffers.
+
+  Once initialized, the bufferevent structure can be used repeatedly with
+  bufferevent_enable() and bufferevent_disable().
+
+  When read enabled the bufferevent will try to read from the file descriptor
+  and call the read callback.  The write callback is executed whenever the
+  output buffer is drained below the write low watermark, which is 0 by
+  default.
+
+  If multiple bases are in use, bufferevent_base_set() must be called before
+  enabling the bufferevent for the first time.
+
+  @deprecated This function is deprecated because it uses the current
+    event base, and as such can be error prone for multithreaded programs.
+    Use bufferevent_socket_new() instead.
+
+  @param fd the file descriptor from which data is read and written to.
+	 This file descriptor is not allowed to be a pipe(2).
+  @param readcb callback to invoke when there is data to be read, or NULL if
+	 no callback is desired
+  @param writecb callback to invoke when the file descriptor is ready for
+	 writing, or NULL if no callback is desired
+  @param errorcb callback to invoke when there is an error on the file
+	 descriptor
+  @param cbarg an argument that will be supplied to each of the callbacks
+	 (readcb, writecb, and errorcb)
+  @return a pointer to a newly allocated bufferevent struct, or NULL if an
+	  error occurred
+  @see bufferevent_base_set(), bufferevent_free()
+  */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *bufferevent_new(evutil_socket_t fd,
+    evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg);
+
+
+/**
+  Set the read and write timeout for a buffered event.
+
+  @param bufev the bufferevent to be modified
+  @param timeout_read the read timeout
+  @param timeout_write the write timeout
+ */
+EVENT2_EXPORT_SYMBOL
+void bufferevent_settimeout(struct bufferevent *bufev,
+    int timeout_read, int timeout_write);
+
+#define EVBUFFER_READ		BEV_EVENT_READING
+#define EVBUFFER_WRITE		BEV_EVENT_WRITING
+#define EVBUFFER_EOF		BEV_EVENT_EOF
+#define EVBUFFER_ERROR		BEV_EVENT_ERROR
+#define EVBUFFER_TIMEOUT	BEV_EVENT_TIMEOUT
+
+/** macro for getting access to the input buffer of a bufferevent */
+#define EVBUFFER_INPUT(x)	bufferevent_get_input(x)
+/** macro for getting access to the output buffer of a bufferevent */
+#define EVBUFFER_OUTPUT(x)	bufferevent_get_output(x)
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_ssl.h b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_ssl.h
new file mode 100644
index 000000000000..bf39b844a965
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_ssl.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_BUFFEREVENT_SSL_H_INCLUDED_
+#define EVENT2_BUFFEREVENT_SSL_H_INCLUDED_
+
+/** @file event2/bufferevent_ssl.h
+
+    OpenSSL support for bufferevents.
+ */
+#include <event2/visibility.h>
+#include <event2/event-config.h>
+#include <event2/bufferevent.h>
+#include <event2/util.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is what openssl's SSL objects are underneath. */
+struct ssl_st;
+
+/**
+   The state of an SSL object to be used when creating a new
+   SSL bufferevent.
+ */
+enum bufferevent_ssl_state {
+	BUFFEREVENT_SSL_OPEN = 0,
+	BUFFEREVENT_SSL_CONNECTING = 1,
+	BUFFEREVENT_SSL_ACCEPTING = 2
+};
+
+#if defined(EVENT__HAVE_OPENSSL) || defined(EVENT_IN_DOXYGEN_)
+/**
+   Create a new SSL bufferevent to send its data over another bufferevent.
+
+   @param base An event_base to use to detect reading and writing.  It
+      must also be the base for the underlying bufferevent.
+   @param underlying A socket to use for this SSL
+   @param ssl A SSL* object from openssl.
+   @param state The current state of the SSL connection
+   @param options One or more bufferevent_options
+   @return A new bufferevent on success, or NULL on failure
+*/
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *
+bufferevent_openssl_filter_new(struct event_base *base,
+    struct bufferevent *underlying,
+    struct ssl_st *ssl,
+    enum bufferevent_ssl_state state,
+    int options);
+
+/**
+   Create a new SSL bufferevent to send its data over an SSL * on a socket.
+
+   @param base An event_base to use to detect reading and writing
+   @param fd A socket to use for this SSL
+   @param ssl A SSL* object from openssl.
+   @param state The current state of the SSL connection
+   @param options One or more bufferevent_options
+   @return A new bufferevent on success, or NULL on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *
+bufferevent_openssl_socket_new(struct event_base *base,
+    evutil_socket_t fd,
+    struct ssl_st *ssl,
+    enum bufferevent_ssl_state state,
+    int options);
+
+/** Control how to report dirty SSL shutdowns.
+
+    If the peer (or the network, or an attacker) closes the TCP
+    connection before closing the SSL channel, and the protocol is SSL >= v3,
+    this is a "dirty" shutdown.  If allow_dirty_shutdown is 0 (default),
+    this is reported as BEV_EVENT_ERROR.
+
+    If instead allow_dirty_shutdown=1, a dirty shutdown is reported as
+    BEV_EVENT_EOF.
+
+    (Note that if the protocol is < SSLv3, you will always receive
+    BEV_EVENT_EOF, since SSL 2 and earlier cannot distinguish a secure
+    connection close from a dirty one.  This is one reason (among many)
+    not to use SSL 2.)
+*/
+
+EVENT2_EXPORT_SYMBOL
+int bufferevent_openssl_get_allow_dirty_shutdown(struct bufferevent *bev);
+EVENT2_EXPORT_SYMBOL
+void bufferevent_openssl_set_allow_dirty_shutdown(struct bufferevent *bev,
+    int allow_dirty_shutdown);
+
+/** Return the underlying openssl SSL * object for an SSL bufferevent. */
+EVENT2_EXPORT_SYMBOL
+struct ssl_st *
+bufferevent_openssl_get_ssl(struct bufferevent *bufev);
+
+/** Tells a bufferevent to begin SSL renegotiation. */
+EVENT2_EXPORT_SYMBOL
+int bufferevent_ssl_renegotiate(struct bufferevent *bev);
+
+/** Return the most recent OpenSSL error reported on an SSL bufferevent. */
+EVENT2_EXPORT_SYMBOL
+unsigned long bufferevent_get_openssl_error(struct bufferevent *bev);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_BUFFEREVENT_SSL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_struct.h
new file mode 100644
index 000000000000..e84c082c30cc
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/bufferevent_struct.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_BUFFEREVENT_STRUCT_H_INCLUDED_
+#define EVENT2_BUFFEREVENT_STRUCT_H_INCLUDED_
+
+/** @file event2/bufferevent_struct.h
+
+  Data structures for bufferevents.  Using these structures may hurt forward
+  compatibility with later versions of Libevent: be careful!
+
+  @deprecated Use of bufferevent_struct.h is completely deprecated; these
+    structures are only exposed for backward compatibility with programs
+    written before Libevent 2.0 that used them.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+/* For struct event */
+#include <event2/event_struct.h>
+
+struct event_watermark {
+	size_t low;
+	size_t high;
+};
+
+/**
+  Shared implementation of a bufferevent.
+
+  This type is exposed only because it was exposed in previous versions,
+  and some people's code may rely on manipulating it.  Otherwise, you
+  should really not rely on the layout, size, or contents of this structure:
+  it is fairly volatile, and WILL change in future versions of the code.
+**/
+struct bufferevent {
+	/** Event base for which this bufferevent was created. */
+	struct event_base *ev_base;
+	/** Pointer to a table of function pointers to set up how this
+	    bufferevent behaves. */
+	const struct bufferevent_ops *be_ops;
+
+	/** A read event that triggers when a timeout has happened or a socket
+	    is ready to read data.  Only used by some subtypes of
+	    bufferevent. */
+	struct event ev_read;
+	/** A write event that triggers when a timeout has happened or a socket
+	    is ready to write data.  Only used by some subtypes of
+	    bufferevent. */
+	struct event ev_write;
+
+	/** An input buffer. Only the bufferevent is allowed to add data to
+	    this buffer, though the user is allowed to drain it. */
+	struct evbuffer *input;
+
+	/** An input buffer. Only the bufferevent is allowed to drain data
+	    from this buffer, though the user is allowed to add it. */
+	struct evbuffer *output;
+
+	struct event_watermark wm_read;
+	struct event_watermark wm_write;
+
+	bufferevent_data_cb readcb;
+	bufferevent_data_cb writecb;
+	/* This should be called 'eventcb', but renaming it would break
+	 * backward compatibility */
+	bufferevent_event_cb errorcb;
+	void *cbarg;
+
+	struct timeval timeout_read;
+	struct timeval timeout_write;
+
+	/** Events that are currently enabled: currently EV_READ and EV_WRITE
+	    are supported. */
+	short enabled;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_BUFFEREVENT_STRUCT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/dns.h b/extra/libevent/libevent-2.1.11-stable/include/event2/dns.h
new file mode 100644
index 000000000000..13ce027e4a8c
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/dns.h
@@ -0,0 +1,751 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * The original DNS code is due to Adam Langley with heavy
+ * modifications by Nick Mathewson.  Adam put his DNS software in the
+ * public domain.  You can find his original copyright below.  Please,
+ * aware that the code as part of Libevent is governed by the 3-clause
+ * BSD license above.
+ *
+ * This software is Public Domain. To view a copy of the public domain dedication,
+ * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
+ * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+ *
+ * I ask and expect, but do not require, that all derivative works contain an
+ * attribution similar to:
+ *     Parts developed by Adam Langley <agl@imperialviolet.org>
+ *
+ * You may wish to replace the word "Parts" with something else depending on
+ * the amount of original code.
+ *
+ * (Derivative works does not include programs which link against, run or include
+ * the source verbatim in their source distributions)
+ */
+
+/** @file event2/dns.h
+ *
+ * Welcome, gentle reader
+ *
+ * Async DNS lookups are really a whole lot harder than they should be,
+ * mostly stemming from the fact that the libc resolver has never been
+ * very good at them. Before you use this library you should see if libc
+ * can do the job for you with the modern async call getaddrinfo_a
+ * (see http://www.imperialviolet.org/page25.html#e498). Otherwise,
+ * please continue.
+ *
+ * The library keeps track of the state of nameservers and will avoid
+ * them when they go down. Otherwise it will round robin between them.
+ *
+ * Quick start guide:
+ *   #include "evdns.h"
+ *   void callback(int result, char type, int count, int ttl,
+ *		 void *addresses, void *arg);
+ *   evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
+ *   evdns_resolve("www.hostname.com", 0, callback, NULL);
+ *
+ * When the lookup is complete the callback function is called. The
+ * first argument will be one of the DNS_ERR_* defines in evdns.h.
+ * Hopefully it will be DNS_ERR_NONE, in which case type will be
+ * DNS_IPv4_A, count will be the number of IP addresses, ttl is the time
+ * which the data can be cached for (in seconds), addresses will point
+ * to an array of uint32_t's and arg will be whatever you passed to
+ * evdns_resolve.
+ *
+ * Searching:
+ *
+ * In order for this library to be a good replacement for glibc's resolver it
+ * supports searching. This involves setting a list of default domains, in
+ * which names will be queried for. The number of dots in the query name
+ * determines the order in which this list is used.
+ *
+ * Searching appears to be a single lookup from the point of view of the API,
+ * although many DNS queries may be generated from a single call to
+ * evdns_resolve. Searching can also drastically slow down the resolution
+ * of names.
+ *
+ * To disable searching:
+ *   1. Never set it up. If you never call evdns_resolv_conf_parse or
+ *   evdns_search_add then no searching will occur.
+ *
+ *   2. If you do call evdns_resolv_conf_parse then don't pass
+ *   DNS_OPTION_SEARCH (or DNS_OPTIONS_ALL, which implies it).
+ *
+ *   3. When calling evdns_resolve, pass the DNS_QUERY_NO_SEARCH flag.
+ *
+ * The order of searches depends on the number of dots in the name. If the
+ * number is greater than the ndots setting then the names is first tried
+ * globally. Otherwise each search domain is appended in turn.
+ *
+ * The ndots setting can either be set from a resolv.conf, or by calling
+ * evdns_search_ndots_set.
+ *
+ * For example, with ndots set to 1 (the default) and a search domain list of
+ * ["myhome.net"]:
+ *  Query: www
+ *  Order: www.myhome.net, www.
+ *
+ *  Query: www.abc
+ *  Order: www.abc., www.abc.myhome.net
+ *
+ * Internals:
+ *
+ * Requests are kept in two queues. The first is the inflight queue. In
+ * this queue requests have an allocated transaction id and nameserver.
+ * They will soon be transmitted if they haven't already been.
+ *
+ * The second is the waiting queue. The size of the inflight ring is
+ * limited and all other requests wait in waiting queue for space. This
+ * bounds the number of concurrent requests so that we don't flood the
+ * nameserver. Several algorithms require a full walk of the inflight
+ * queue and so bounding its size keeps thing going nicely under huge
+ * (many thousands of requests) loads.
+ *
+ * If a nameserver loses too many requests it is considered down and we
+ * try not to use it. After a while we send a probe to that nameserver
+ * (a lookup for google.com) and, if it replies, we consider it working
+ * again. If the nameserver fails a probe we wait longer to try again
+ * with the next probe.
+ */
+
+#ifndef EVENT2_DNS_H_INCLUDED_
+#define EVENT2_DNS_H_INCLUDED_
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For integer types. */
+#include <event2/util.h>
+
+/** Error codes 0-5 are as described in RFC 1035. */
+#define DNS_ERR_NONE 0
+/** The name server was unable to interpret the query */
+#define DNS_ERR_FORMAT 1
+/** The name server was unable to process this query due to a problem with the
+ * name server */
+#define DNS_ERR_SERVERFAILED 2
+/** The domain name does not exist */
+#define DNS_ERR_NOTEXIST 3
+/** The name server does not support the requested kind of query */
+#define DNS_ERR_NOTIMPL 4
+/** The name server refuses to reform the specified operation for policy
+ * reasons */
+#define DNS_ERR_REFUSED 5
+/** The reply was truncated or ill-formatted */
+#define DNS_ERR_TRUNCATED 65
+/** An unknown error occurred */
+#define DNS_ERR_UNKNOWN 66
+/** Communication with the server timed out */
+#define DNS_ERR_TIMEOUT 67
+/** The request was canceled because the DNS subsystem was shut down. */
+#define DNS_ERR_SHUTDOWN 68
+/** The request was canceled via a call to evdns_cancel_request */
+#define DNS_ERR_CANCEL 69
+/** There were no answers and no error condition in the DNS packet.
+ * This can happen when you ask for an address that exists, but a record
+ * type that doesn't. */
+#define DNS_ERR_NODATA 70
+
+#define DNS_IPv4_A 1
+#define DNS_PTR 2
+#define DNS_IPv6_AAAA 3
+
+#define DNS_QUERY_NO_SEARCH 1
+
+/* Allow searching */
+#define DNS_OPTION_SEARCH 1
+/* Parse "nameserver" and add default if no such section */
+#define DNS_OPTION_NAMESERVERS 2
+/* Parse additional options like:
+ * - timeout:
+ * - getaddrinfo-allow-skew:
+ * - max-timeouts:
+ * - max-inflight:
+ * - attempts:
+ * - randomize-case:
+ * - initial-probe-timeout:
+ */
+#define DNS_OPTION_MISC 4
+/* Load hosts file (i.e. "/etc/hosts") */
+#define DNS_OPTION_HOSTSFILE 8
+/**
+ * All above:
+ * - DNS_OPTION_SEARCH
+ * - DNS_OPTION_NAMESERVERS
+ * - DNS_OPTION_MISC
+ * - DNS_OPTION_HOSTSFILE
+ */
+#define DNS_OPTIONS_ALL (    \
+    DNS_OPTION_SEARCH      | \
+    DNS_OPTION_NAMESERVERS | \
+    DNS_OPTION_MISC        | \
+    DNS_OPTION_HOSTSFILE   | \
+    0                        \
+)
+/* Do not "default" nameserver (i.e. "127.0.0.1:53") if there is no nameservers
+ * in resolv.conf, (iff DNS_OPTION_NAMESERVERS is set) */
+#define DNS_OPTION_NAMESERVERS_NO_DEFAULT 16
+
+/* Obsolete name for DNS_QUERY_NO_SEARCH */
+#define DNS_NO_SEARCH DNS_QUERY_NO_SEARCH
+
+/**
+ * The callback that contains the results from a lookup.
+ * - result is one of the DNS_ERR_* values (DNS_ERR_NONE for success)
+ * - type is either DNS_IPv4_A or DNS_PTR or DNS_IPv6_AAAA
+ * - count contains the number of addresses of form type
+ * - ttl is the number of seconds the resolution may be cached for.
+ * - addresses needs to be cast according to type.  It will be an array of
+ *   4-byte sequences for ipv4, or an array of 16-byte sequences for ipv6,
+ *   or a nul-terminated string for PTR.
+ */
+typedef void (*evdns_callback_type) (int result, char type, int count, int ttl, void *addresses, void *arg);
+
+struct evdns_base;
+struct event_base;
+
+/** Flag for evdns_base_new: process resolv.conf.  */
+#define EVDNS_BASE_INITIALIZE_NAMESERVERS 1
+/** Flag for evdns_base_new: Do not prevent the libevent event loop from
+ * exiting when we have no active dns requests. */
+#define EVDNS_BASE_DISABLE_WHEN_INACTIVE 0x8000
+/** Flag for evdns_base_new: If EVDNS_BASE_INITIALIZE_NAMESERVERS isset, do not
+ * add default nameserver if there are no nameservers in resolv.conf
+ * @see DNS_OPTION_NAMESERVERS_NO_DEFAULT */
+#define EVDNS_BASE_NAMESERVERS_NO_DEFAULT 0x10000
+
+/**
+  Initialize the asynchronous DNS library.
+
+  This function initializes support for non-blocking name resolution by
+  calling evdns_resolv_conf_parse() on UNIX and
+  evdns_config_windows_nameservers() on Windows.
+
+  @param event_base the event base to associate the dns client with
+  @param flags any of EVDNS_BASE_INITIALIZE_NAMESERVERS|
+    EVDNS_BASE_DISABLE_WHEN_INACTIVE|EVDNS_BASE_NAMESERVERS_NO_DEFAULT
+  @return evdns_base object if successful, or NULL if an error occurred.
+  @see evdns_base_free()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_base * evdns_base_new(struct event_base *event_base, int initialize_nameservers);
+
+
+/**
+  Shut down the asynchronous DNS resolver and terminate all active requests.
+
+  If the 'fail_requests' option is enabled, all active requests will return
+  an empty result with the error flag set to DNS_ERR_SHUTDOWN. Otherwise,
+  the requests will be silently discarded.
+
+  @param evdns_base the evdns base to free
+  @param fail_requests if zero, active requests will be aborted; if non-zero,
+		active requests will return DNS_ERR_SHUTDOWN.
+  @see evdns_base_new()
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_base_free(struct evdns_base *base, int fail_requests);
+
+/**
+   Remove all hosts entries that have been loaded into the event_base via
+   evdns_base_load_hosts or via event_base_resolv_conf_parse.
+
+   @param evdns_base the evdns base to remove outdated host addresses from
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_base_clear_host_addresses(struct evdns_base *base);
+
+/**
+  Convert a DNS error code to a string.
+
+  @param err the DNS error code
+  @return a string containing an explanation of the error code
+*/
+EVENT2_EXPORT_SYMBOL
+const char *evdns_err_to_string(int err);
+
+
+/**
+  Add a nameserver.
+
+  The address should be an IPv4 address in network byte order.
+  The type of address is chosen so that it matches in_addr.s_addr.
+
+  @param base the evdns_base to which to add the name server
+  @param address an IP address in network byte order
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_base_nameserver_ip_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_nameserver_add(struct evdns_base *base,
+    unsigned long int address);
+
+/**
+  Get the number of configured nameservers.
+
+  This returns the number of configured nameservers (not necessarily the
+  number of running nameservers).  This is useful for double-checking
+  whether our calls to the various nameserver configuration functions
+  have been successful.
+
+  @param base the evdns_base to which to apply this operation
+  @return the number of configured nameservers
+  @see evdns_base_nameserver_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_count_nameservers(struct evdns_base *base);
+
+/**
+  Remove all configured nameservers, and suspend all pending resolves.
+
+  Resolves will not necessarily be re-attempted until evdns_base_resume() is called.
+
+  @param base the evdns_base to which to apply this operation
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_base_resume()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_clear_nameservers_and_suspend(struct evdns_base *base);
+
+
+/**
+  Resume normal operation and continue any suspended resolve requests.
+
+  Re-attempt resolves left in limbo after an earlier call to
+  evdns_base_clear_nameservers_and_suspend().
+
+  @param base the evdns_base to which to apply this operation
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_base_clear_nameservers_and_suspend()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_resume(struct evdns_base *base);
+
+/**
+  Add a nameserver by string address.
+
+  This function parses a n IPv4 or IPv6 address from a string and adds it as a
+  nameserver.  It supports the following formats:
+  - [IPv6Address]:port
+  - [IPv6Address]
+  - IPv6Address
+  - IPv4Address:port
+  - IPv4Address
+
+  If no port is specified, it defaults to 53.
+
+  @param base the evdns_base to which to apply this operation
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_base_nameserver_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_nameserver_ip_add(struct evdns_base *base,
+    const char *ip_as_string);
+
+/**
+   Add a nameserver by sockaddr.
+ **/
+EVENT2_EXPORT_SYMBOL
+int
+evdns_base_nameserver_sockaddr_add(struct evdns_base *base,
+    const struct sockaddr *sa, ev_socklen_t len, unsigned flags);
+
+struct evdns_request;
+
+/**
+  Lookup an A record for a given name.
+
+  @param base the evdns_base to which to apply this operation
+  @param name a DNS hostname
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return an evdns_request object if successful, or NULL if an error occurred.
+  @see evdns_resolve_ipv6(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6(), evdns_cancel_request()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_request *evdns_base_resolve_ipv4(struct evdns_base *base, const char *name, int flags, evdns_callback_type callback, void *ptr);
+
+/**
+  Lookup an AAAA record for a given name.
+
+  @param base the evdns_base to which to apply this operation
+  @param name a DNS hostname
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return an evdns_request object if successful, or NULL if an error occurred.
+  @see evdns_resolve_ipv4(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6(), evdns_cancel_request()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_request *evdns_base_resolve_ipv6(struct evdns_base *base, const char *name, int flags, evdns_callback_type callback, void *ptr);
+
+struct in_addr;
+struct in6_addr;
+
+/**
+  Lookup a PTR record for a given IP address.
+
+  @param base the evdns_base to which to apply this operation
+  @param in an IPv4 address
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return an evdns_request object if successful, or NULL if an error occurred.
+  @see evdns_resolve_reverse_ipv6(), evdns_cancel_request()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_request *evdns_base_resolve_reverse(struct evdns_base *base, const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr);
+
+
+/**
+  Lookup a PTR record for a given IPv6 address.
+
+  @param base the evdns_base to which to apply this operation
+  @param in an IPv6 address
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return an evdns_request object if successful, or NULL if an error occurred.
+  @see evdns_resolve_reverse_ipv6(), evdns_cancel_request()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_request *evdns_base_resolve_reverse_ipv6(struct evdns_base *base, const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr);
+
+/**
+  Cancels a pending DNS resolution request.
+
+  @param base the evdns_base that was used to make the request
+  @param req the evdns_request that was returned by calling a resolve function
+  @see evdns_base_resolve_ipv4(), evdns_base_resolve_ipv6, evdns_base_resolve_reverse
+*/
+EVENT2_EXPORT_SYMBOL
+void evdns_cancel_request(struct evdns_base *base, struct evdns_request *req);
+
+/**
+  Set the value of a configuration option.
+
+  The currently available configuration options are:
+
+    ndots, timeout, max-timeouts, max-inflight, attempts, randomize-case,
+    bind-to, initial-probe-timeout, getaddrinfo-allow-skew,
+    so-rcvbuf, so-sndbuf.
+
+  In versions before Libevent 2.0.3-alpha, the option name needed to end with
+  a colon.
+
+  @param base the evdns_base to which to apply this operation
+  @param option the name of the configuration option to be modified
+  @param val the value to be set
+  @return 0 if successful, or -1 if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_set_option(struct evdns_base *base, const char *option, const char *val);
+
+
+/**
+  Parse a resolv.conf file.
+
+  The 'flags' parameter determines what information is parsed from the
+  resolv.conf file. See the man page for resolv.conf for the format of this
+  file.
+
+  The following directives are not parsed from the file: sortlist, rotate,
+  no-check-names, inet6, debug.
+
+  If this function encounters an error, the possible return values are: 1 =
+  failed to open file, 2 = failed to stat file, 3 = file too large, 4 = out of
+  memory, 5 = short read from file, 6 = no nameservers listed in the file
+
+  @param base the evdns_base to which to apply this operation
+  @param flags any of DNS_OPTION_NAMESERVERS|DNS_OPTION_SEARCH|DNS_OPTION_MISC|
+    DNS_OPTION_HOSTSFILE|DNS_OPTIONS_ALL|DNS_OPTION_NAMESERVERS_NO_DEFAULT
+  @param filename the path to the resolv.conf file
+  @return 0 if successful, or various positive error codes if an error
+    occurred (see above)
+  @see resolv.conf(3), evdns_config_windows_nameservers()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_resolv_conf_parse(struct evdns_base *base, int flags, const char *const filename);
+
+/**
+   Load an /etc/hosts-style file from 'hosts_fname' into 'base'.
+
+   If hosts_fname is NULL, add minimal entries for localhost, and nothing
+   else.
+
+   Note that only evdns_getaddrinfo uses the /etc/hosts entries.
+
+   This function does not replace previously loaded hosts entries; to do that,
+   call evdns_base_clear_host_addresses first.
+
+   Return 0 on success, negative on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+int evdns_base_load_hosts(struct evdns_base *base, const char *hosts_fname);
+
+#if defined(EVENT_IN_DOXYGEN_) || defined(_WIN32)
+/**
+  Obtain nameserver information using the Windows API.
+
+  Attempt to configure a set of nameservers based on platform settings on
+  a win32 host.  Preferentially tries to use GetNetworkParams; if that fails,
+  looks in the registry.
+
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resolv_conf_parse()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_config_windows_nameservers(struct evdns_base *);
+#define EVDNS_BASE_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED
+#endif
+
+
+/**
+  Clear the list of search domains.
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_base_search_clear(struct evdns_base *base);
+
+
+/**
+  Add a domain to the list of search domains
+
+  @param domain the domain to be added to the search list
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_base_search_add(struct evdns_base *base, const char *domain);
+
+
+/**
+  Set the 'ndots' parameter for searches.
+
+  Sets the number of dots which, when found in a name, causes
+  the first query to be without any search domain.
+
+  @param ndots the new ndots parameter
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_base_search_ndots_set(struct evdns_base *base, const int ndots);
+
+/**
+  A callback that is invoked when a log message is generated
+
+  @param is_warning indicates if the log message is a 'warning'
+  @param msg the content of the log message
+ */
+typedef void (*evdns_debug_log_fn_type)(int is_warning, const char *msg);
+
+
+/**
+  Set the callback function to handle DNS log messages.  If this
+  callback is not set, evdns log messages are handled with the regular
+  Libevent logging system.
+
+  @param fn the callback to be invoked when a log message is generated
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_set_log_fn(evdns_debug_log_fn_type fn);
+
+/**
+   Set a callback that will be invoked to generate transaction IDs.  By
+   default, we pick transaction IDs based on the current clock time, which
+   is bad for security.
+
+   @param fn the new callback, or NULL to use the default.
+
+   NOTE: This function has no effect in Libevent 2.0.4-alpha and later,
+   since Libevent now provides its own secure RNG.
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_set_transaction_id_fn(ev_uint16_t (*fn)(void));
+
+/**
+   Set a callback used to generate random bytes.  By default, we use
+   the same function as passed to evdns_set_transaction_id_fn to generate
+   bytes two at a time.  If a function is provided here, it's also used
+   to generate transaction IDs.
+
+   NOTE: This function has no effect in Libevent 2.0.4-alpha and later,
+   since Libevent now provides its own secure RNG.
+*/
+EVENT2_EXPORT_SYMBOL
+void evdns_set_random_bytes_fn(void (*fn)(char *, size_t));
+
+/*
+ * Functions used to implement a DNS server.
+ */
+
+struct evdns_server_request;
+struct evdns_server_question;
+
+/**
+   A callback to implement a DNS server.  The callback function receives a DNS
+   request.  It should then optionally add a number of answers to the reply
+   using the evdns_server_request_add_*_reply functions, before calling either
+   evdns_server_request_respond to send the reply back, or
+   evdns_server_request_drop to decline to answer the request.
+
+   @param req A newly received request
+   @param user_data A pointer that was passed to
+      evdns_add_server_port_with_base().
+ */
+typedef void (*evdns_request_callback_fn_type)(struct evdns_server_request *, void *);
+#define EVDNS_ANSWER_SECTION 0
+#define EVDNS_AUTHORITY_SECTION 1
+#define EVDNS_ADDITIONAL_SECTION 2
+
+#define EVDNS_TYPE_A	   1
+#define EVDNS_TYPE_NS	   2
+#define EVDNS_TYPE_CNAME   5
+#define EVDNS_TYPE_SOA	   6
+#define EVDNS_TYPE_PTR	  12
+#define EVDNS_TYPE_MX	  15
+#define EVDNS_TYPE_TXT	  16
+#define EVDNS_TYPE_AAAA	  28
+
+#define EVDNS_QTYPE_AXFR 252
+#define EVDNS_QTYPE_ALL	 255
+
+#define EVDNS_CLASS_INET   1
+
+/* flags that can be set in answers; as part of the err parameter */
+#define EVDNS_FLAGS_AA	0x400
+#define EVDNS_FLAGS_RD	0x080
+
+/** Create a new DNS server port.
+
+    @param base The event base to handle events for the server port.
+    @param socket A UDP socket to accept DNS requests.
+    @param flags Always 0 for now.
+    @param callback A function to invoke whenever we get a DNS request
+      on the socket.
+    @param user_data Data to pass to the callback.
+    @return an evdns_server_port structure for this server port or NULL if
+      an error occurred.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_server_port *evdns_add_server_port_with_base(struct event_base *base, evutil_socket_t socket, int flags, evdns_request_callback_fn_type callback, void *user_data);
+/** Close down a DNS server port, and free associated structures. */
+EVENT2_EXPORT_SYMBOL
+void evdns_close_server_port(struct evdns_server_port *port);
+
+/** Sets some flags in a reply we're building.
+    Allows setting of the AA or RD flags
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_server_request_set_flags(struct evdns_server_request *req, int flags);
+
+/* Functions to add an answer to an in-progress DNS reply.
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int dns_class, int ttl, int datalen, int is_name, const char *data);
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl);
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl);
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl);
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);
+
+/**
+   Send back a response to a DNS request, and free the request structure.
+*/
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_respond(struct evdns_server_request *req, int err);
+/**
+   Free a DNS request without sending back a reply.
+*/
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_drop(struct evdns_server_request *req);
+struct sockaddr;
+/**
+    Get the address that made a DNS request.
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_server_request_get_requesting_addr(struct evdns_server_request *req, struct sockaddr *sa, int addr_len);
+
+/** Callback for evdns_getaddrinfo. */
+typedef void (*evdns_getaddrinfo_cb)(int result, struct evutil_addrinfo *res, void *arg);
+
+struct evdns_base;
+struct evdns_getaddrinfo_request;
+/** Make a non-blocking getaddrinfo request using the dns_base in 'dns_base'.
+ *
+ * If we can answer the request immediately (with an error or not!), then we
+ * invoke cb immediately and return NULL.  Otherwise we return
+ * an evdns_getaddrinfo_request and invoke cb later.
+ *
+ * When the callback is invoked, we pass as its first argument the error code
+ * that getaddrinfo would return (or 0 for no error).  As its second argument,
+ * we pass the evutil_addrinfo structures we found (or NULL on error).  We
+ * pass 'arg' as the third argument.
+ *
+ * Limitations:
+ *
+ * - The AI_V4MAPPED and AI_ALL flags are not currently implemented.
+ * - For ai_socktype, we only handle SOCKTYPE_STREAM, SOCKTYPE_UDP, and 0.
+ * - For ai_protocol, we only handle IPPROTO_TCP, IPPROTO_UDP, and 0.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_getaddrinfo_request *evdns_getaddrinfo(
+    struct evdns_base *dns_base,
+    const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in,
+    evdns_getaddrinfo_cb cb, void *arg);
+
+/* Cancel an in-progress evdns_getaddrinfo.  This MUST NOT be called after the
+ * getaddrinfo's callback has been invoked.  The resolves will be canceled,
+ * and the callback will be invoked with the error EVUTIL_EAI_CANCEL. */
+EVENT2_EXPORT_SYMBOL
+void evdns_getaddrinfo_cancel(struct evdns_getaddrinfo_request *req);
+
+/**
+   Retrieve the address of the 'idx'th configured nameserver.
+
+   @param base The evdns_base to examine.
+   @param idx The index of the nameserver to get the address of.
+   @param sa A location to receive the server's address.
+   @param len The number of bytes available at sa.
+
+   @return the number of bytes written into sa on success.  On failure, returns
+     -1 if idx is greater than the number of configured nameservers, or a
+     value greater than 'len' if len was not high enough.
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_base_get_nameserver_addr(struct evdns_base *base, int idx,
+    struct sockaddr *sa, ev_socklen_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* !EVENT2_DNS_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/dns_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/dns_compat.h
new file mode 100644
index 000000000000..a58c4b29375e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/dns_compat.h
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_DNS_COMPAT_H_INCLUDED_
+#define EVENT2_DNS_COMPAT_H_INCLUDED_
+
+/** @file event2/dns_compat.h
+
+  Potentially non-threadsafe versions of the functions in dns.h: provided
+  only for backwards compatibility.
+
+
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+#include <event2/visibility.h>
+
+/**
+  Initialize the asynchronous DNS library.
+
+  This function initializes support for non-blocking name resolution by
+  calling evdns_resolv_conf_parse() on UNIX and
+  evdns_config_windows_nameservers() on Windows.
+
+  @deprecated This function is deprecated because it always uses the current
+    event base, and is easily confused by multiple calls to event_init(), and
+    so is not safe for multithreaded use.  Additionally, it allocates a global
+    structure that only one thread can use. The replacement is
+    evdns_base_new().
+
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_shutdown()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_init(void);
+
+struct evdns_base;
+/**
+   Return the global evdns_base created by event_init() and used by the other
+   deprecated functions.
+
+   @deprecated This function is deprecated because use of the global
+     evdns_base is error-prone.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evdns_base *evdns_get_global_base(void);
+
+/**
+  Shut down the asynchronous DNS resolver and terminate all active requests.
+
+  If the 'fail_requests' option is enabled, all active requests will return
+  an empty result with the error flag set to DNS_ERR_SHUTDOWN. Otherwise,
+  the requests will be silently discarded.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_shutdown().
+
+  @param fail_requests if zero, active requests will be aborted; if non-zero,
+		active requests will return DNS_ERR_SHUTDOWN.
+  @see evdns_init()
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_shutdown(int fail_requests);
+
+/**
+  Add a nameserver.
+
+  The address should be an IPv4 address in network byte order.
+  The type of address is chosen so that it matches in_addr.s_addr.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_nameserver_add().
+
+  @param address an IP address in network byte order
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_nameserver_ip_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_nameserver_add(unsigned long int address);
+
+/**
+  Get the number of configured nameservers.
+
+  This returns the number of configured nameservers (not necessarily the
+  number of running nameservers).  This is useful for double-checking
+  whether our calls to the various nameserver configuration functions
+  have been successful.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_count_nameservers().
+
+  @return the number of configured nameservers
+  @see evdns_nameserver_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_count_nameservers(void);
+
+/**
+  Remove all configured nameservers, and suspend all pending resolves.
+
+  Resolves will not necessarily be re-attempted until evdns_resume() is called.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_clear_nameservers_and_suspend().
+
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resume()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_clear_nameservers_and_suspend(void);
+
+/**
+  Resume normal operation and continue any suspended resolve requests.
+
+  Re-attempt resolves left in limbo after an earlier call to
+  evdns_clear_nameservers_and_suspend().
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_resume().
+
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_clear_nameservers_and_suspend()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resume(void);
+
+/**
+  Add a nameserver.
+
+  This wraps the evdns_nameserver_add() function by parsing a string as an IP
+  address and adds it as a nameserver.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_nameserver_ip_add().
+
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_nameserver_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_nameserver_ip_add(const char *ip_as_string);
+
+/**
+  Lookup an A record for a given name.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_resolve_ipv4().
+
+  @param name a DNS hostname
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resolve_ipv6(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resolve_ipv4(const char *name, int flags, evdns_callback_type callback, void *ptr);
+
+/**
+  Lookup an AAAA record for a given name.
+
+  @param name a DNS hostname
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resolve_ipv4(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resolve_ipv6(const char *name, int flags, evdns_callback_type callback, void *ptr);
+
+struct in_addr;
+struct in6_addr;
+
+/**
+  Lookup a PTR record for a given IP address.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_resolve_reverse().
+
+  @param in an IPv4 address
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resolve_reverse_ipv6()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr);
+
+/**
+  Lookup a PTR record for a given IPv6 address.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_resolve_reverse_ipv6().
+
+  @param in an IPv6 address
+  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
+  @param callback a callback function to invoke when the request is completed
+  @param ptr an argument to pass to the callback function
+  @return 0 if successful, or -1 if an error occurred
+  @see evdns_resolve_reverse_ipv6()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr);
+
+/**
+  Set the value of a configuration option.
+
+  The currently available configuration options are:
+
+    ndots, timeout, max-timeouts, max-inflight, and attempts
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_set_option().
+
+  @param option the name of the configuration option to be modified
+  @param val the value to be set
+  @param flags Ignored.
+  @return 0 if successful, or -1 if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_set_option(const char *option, const char *val, int flags);
+
+/**
+  Parse a resolv.conf file.
+
+  The 'flags' parameter determines what information is parsed from the
+  resolv.conf file. See the man page for resolv.conf for the format of this
+  file.
+
+  The following directives are not parsed from the file: sortlist, rotate,
+  no-check-names, inet6, debug.
+
+  If this function encounters an error, the possible return values are: 1 =
+  failed to open file, 2 = failed to stat file, 3 = file too large, 4 = out of
+  memory, 5 = short read from file, 6 = no nameservers listed in the file
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_resolv_conf_parse().
+
+  @param flags any of DNS_OPTION_NAMESERVERS|DNS_OPTION_SEARCH|DNS_OPTION_MISC|
+    DNS_OPTIONS_ALL
+  @param filename the path to the resolv.conf file
+  @return 0 if successful, or various positive error codes if an error
+    occurred (see above)
+  @see resolv.conf(3), evdns_config_windows_nameservers()
+ */
+EVENT2_EXPORT_SYMBOL
+int evdns_resolv_conf_parse(int flags, const char *const filename);
+
+/**
+  Clear the list of search domains.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_search_clear().
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_search_clear(void);
+
+/**
+  Add a domain to the list of search domains
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_search_add().
+
+  @param domain the domain to be added to the search list
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_search_add(const char *domain);
+
+/**
+  Set the 'ndots' parameter for searches.
+
+  Sets the number of dots which, when found in a name, causes
+  the first query to be without any search domain.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which evdns_base it applies to.  The recommended
+    function is evdns_base_search_ndots_set().
+
+  @param ndots the new ndots parameter
+ */
+EVENT2_EXPORT_SYMBOL
+void evdns_search_ndots_set(const int ndots);
+
+/**
+   As evdns_server_new_with_base.
+
+  @deprecated This function is deprecated because it does not allow the
+    caller to specify which even_base it uses.  The recommended
+    function is evdns_add_server_port_with_base().
+
+*/
+EVENT2_EXPORT_SYMBOL
+struct evdns_server_port *
+evdns_add_server_port(evutil_socket_t socket, int flags,
+	evdns_request_callback_fn_type callback, void *user_data);
+
+#ifdef _WIN32
+EVENT2_EXPORT_SYMBOL
+int evdns_config_windows_nameservers(void);
+#define EVDNS_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_COMPAT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/dns_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/dns_struct.h
new file mode 100644
index 000000000000..593a8a70b649
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/dns_struct.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_DNS_STRUCT_H_INCLUDED_
+#define EVENT2_DNS_STRUCT_H_INCLUDED_
+
+/** @file event2/dns_struct.h
+
+  Data structures for dns.  Using these structures may hurt forward
+  compatibility with later versions of Libevent: be careful!
+
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/*
+ * Structures used to implement a DNS server.
+ */
+
+struct evdns_server_request {
+	int flags;
+	int nquestions;
+	struct evdns_server_question **questions;
+};
+struct evdns_server_question {
+	int type;
+#ifdef __cplusplus
+	int dns_question_class;
+#else
+	/* You should refer to this field as "dns_question_class".  The
+	 * name "class" works in C for backward compatibility, and will be
+	 * removed in a future version. (1.5 or later). */
+	int class;
+#define dns_question_class class
+#endif
+	char name[1];
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_DNS_STRUCT_H_INCLUDED_ */
+
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/event.h b/extra/libevent/libevent-2.1.11-stable/include/event2/event.h
new file mode 100644
index 000000000000..a6b6144a92be
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/event.h
@@ -0,0 +1,1672 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_EVENT_H_INCLUDED_
+#define EVENT2_EVENT_H_INCLUDED_
+
+/**
+   @mainpage
+
+  @section intro Introduction
+
+  Libevent is an event notification library for developing scalable network
+  servers.  The Libevent API provides a mechanism to execute a callback
+  function when a specific event occurs on a file descriptor or after a
+  timeout has been reached. Furthermore, Libevent also support callbacks due
+  to signals or regular timeouts.
+
+  Libevent is meant to replace the event loop found in event driven network
+  servers. An application just needs to call event_base_dispatch() and then add or
+  remove events dynamically without having to change the event loop.
+
+
+  Currently, Libevent supports /dev/poll, kqueue(2), select(2), poll(2),
+  epoll(4), and evports. The internal event mechanism is completely
+  independent of the exposed event API, and a simple update of Libevent can
+  provide new functionality without having to redesign the applications. As a
+  result, Libevent allows for portable application development and provides
+  the most scalable event notification mechanism available on an operating
+  system.  Libevent can also be used for multithreaded programs.  Libevent
+  should compile on Linux, *BSD, Mac OS X, Solaris and, Windows.
+
+  @section usage Standard usage
+
+  Every program that uses Libevent must include the <event2/event.h>
+  header, and pass the -levent flag to the linker.  (You can instead link
+  -levent_core if you only want the main event and buffered IO-based code,
+  and don't want to link any protocol code.)
+
+  @section setup Library setup
+
+  Before you call any other Libevent functions, you need to set up the
+  library.  If you're going to use Libevent from multiple threads in a
+  multithreaded application, you need to initialize thread support --
+  typically by using evthread_use_pthreads() or
+  evthread_use_windows_threads().  See <event2/thread.h> for more
+  information.
+
+  This is also the point where you can replace Libevent's memory
+  management functions with event_set_mem_functions, and enable debug mode
+  with event_enable_debug_mode().
+
+  @section base Creating an event base
+
+  Next, you need to create an event_base structure, using event_base_new()
+  or event_base_new_with_config().  The event_base is responsible for
+  keeping track of which events are "pending" (that is to say, being
+  watched to see if they become active) and which events are "active".
+  Every event is associated with a single event_base.
+
+  @section event Event notification
+
+  For each file descriptor that you wish to monitor, you must create an
+  event structure with event_new().  (You may also declare an event
+  structure and call event_assign() to initialize the members of the
+  structure.)  To enable notification, you add the structure to the list
+  of monitored events by calling event_add().  The event structure must
+  remain allocated as long as it is active, so it should generally be
+  allocated on the heap.
+
+  @section loop Dispatching events.
+
+  Finally, you call event_base_dispatch() to loop and dispatch events.
+  You can also use event_base_loop() for more fine-grained control.
+
+  Currently, only one thread can be dispatching a given event_base at a
+  time.  If you want to run events in multiple threads at once, you can
+  either have a single event_base whose events add work to a work queue,
+  or you can create multiple event_base objects.
+
+  @section bufferevent I/O Buffers
+
+  Libevent provides a buffered I/O abstraction on top of the regular event
+  callbacks. This abstraction is called a bufferevent. A bufferevent
+  provides input and output buffers that get filled and drained
+  automatically. The user of a buffered event no longer deals directly
+  with the I/O, but instead is reading from input and writing to output
+  buffers.
+
+  Once initialized via bufferevent_socket_new(), the bufferevent structure
+  can be used repeatedly with bufferevent_enable() and
+  bufferevent_disable().  Instead of reading and writing directly to a
+  socket, you would call bufferevent_read() and bufferevent_write().
+
+  When read enabled the bufferevent will try to read from the file descriptor
+  and call the read callback. The write callback is executed whenever the
+  output buffer is drained below the write low watermark, which is 0 by
+  default.
+
+  See <event2/bufferevent*.h> for more information.
+
+  @section timers Timers
+
+  Libevent can also be used to create timers that invoke a callback after a
+  certain amount of time has expired. The evtimer_new() macro returns
+  an event struct to use as a timer. To activate the timer, call
+  evtimer_add(). Timers can be deactivated by calling evtimer_del().
+  (These macros are thin wrappers around event_new(), event_add(),
+  and event_del(); you can also use those instead.)
+
+  @section evdns Asynchronous DNS resolution
+
+  Libevent provides an asynchronous DNS resolver that should be used instead
+  of the standard DNS resolver functions.  See the <event2/dns.h>
+  functions for more detail.
+
+  @section evhttp Event-driven HTTP servers
+
+  Libevent provides a very simple event-driven HTTP server that can be
+  embedded in your program and used to service HTTP requests.
+
+  To use this capability, you need to include the <event2/http.h> header in your
+  program.  See that header for more information.
+
+  @section evrpc A framework for RPC servers and clients
+
+  Libevent provides a framework for creating RPC servers and clients.  It
+  takes care of marshaling and unmarshaling all data structures.
+
+  @section api API Reference
+
+  To browse the complete documentation of the libevent API, click on any of
+  the following links.
+
+  event2/event.h
+  The primary libevent header
+
+  event2/thread.h
+  Functions for use by multithreaded programs
+
+  event2/buffer.h and event2/bufferevent.h
+  Buffer management for network reading and writing
+
+  event2/util.h
+  Utility functions for portable nonblocking network code
+
+  event2/dns.h
+  Asynchronous DNS resolution
+
+  event2/http.h
+  An embedded libevent-based HTTP server
+
+  event2/rpc.h
+  A framework for creating RPC servers and clients
+
+ */
+
+/** @file event2/event.h
+
+  Core functions for waiting for and receiving events, and using event bases.
+*/
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <stdio.h>
+
+/* For int types. */
+#include <event2/util.h>
+
+/**
+ * Structure to hold information and state for a Libevent dispatch loop.
+ *
+ * The event_base lies at the center of Libevent; every application will
+ * have one.  It keeps track of all pending and active events, and
+ * notifies your application of the active ones.
+ *
+ * This is an opaque structure; you can allocate one using
+ * event_base_new() or event_base_new_with_config().
+ *
+ * @see event_base_new(), event_base_free(), event_base_loop(),
+ *    event_base_new_with_config()
+ */
+struct event_base
+#ifdef EVENT_IN_DOXYGEN_
+{/*Empty body so that doxygen will generate documentation here.*/}
+#endif
+;
+
+/**
+ * @struct event
+ *
+ * Structure to represent a single event.
+ *
+ * An event can have some underlying condition it represents: a socket
+ * becoming readable or writeable (or both), or a signal becoming raised.
+ * (An event that represents no underlying condition is still useful: you
+ * can use one to implement a timer, or to communicate between threads.)
+ *
+ * Generally, you can create events with event_new(), then make them
+ * pending with event_add().  As your event_base runs, it will run the
+ * callbacks of an events whose conditions are triggered.  When you no
+ * longer want the event, free it with event_free().
+ *
+ * In more depth:
+ *
+ * An event may be "pending" (one whose condition we are watching),
+ * "active" (one whose condition has triggered and whose callback is about
+ * to run), neither, or both.  Events come into existence via
+ * event_assign() or event_new(), and are then neither active nor pending.
+ *
+ * To make an event pending, pass it to event_add().  When doing so, you
+ * can also set a timeout for the event.
+ *
+ * Events become active during an event_base_loop() call when either their
+ * condition has triggered, or when their timeout has elapsed.  You can
+ * also activate an event manually using event_active().  The even_base
+ * loop will run the callbacks of active events; after it has done so, it
+ * marks them as no longer active.
+ *
+ * You can make an event non-pending by passing it to event_del().  This
+ * also makes the event non-active.
+ *
+ * Events can be "persistent" or "non-persistent".  A non-persistent event
+ * becomes non-pending as soon as it is triggered: thus, it only runs at
+ * most once per call to event_add().  A persistent event remains pending
+ * even when it becomes active: you'll need to event_del() it manually in
+ * order to make it non-pending.  When a persistent event with a timeout
+ * becomes active, its timeout is reset: this means you can use persistent
+ * events to implement periodic timeouts.
+ *
+ * This should be treated as an opaque structure; you should never read or
+ * write any of its fields directly.  For backward compatibility with old
+ * code, it is defined in the event2/event_struct.h header; including this
+ * header may make your code incompatible with other versions of Libevent.
+ *
+ * @see event_new(), event_free(), event_assign(), event_get_assignment(),
+ *    event_add(), event_del(), event_active(), event_pending(),
+ *    event_get_fd(), event_get_base(), event_get_events(),
+ *    event_get_callback(), event_get_callback_arg(),
+ *    event_priority_set()
+ */
+struct event
+#ifdef EVENT_IN_DOXYGEN_
+{/*Empty body so that doxygen will generate documentation here.*/}
+#endif
+;
+
+/**
+ * Configuration for an event_base.
+ *
+ * There are many options that can be used to alter the behavior and
+ * implementation of an event_base.  To avoid having to pass them all in a
+ * complex many-argument constructor, we provide an abstract data type
+ * where you set up configuration information before passing it to
+ * event_base_new_with_config().
+ *
+ * @see event_config_new(), event_config_free(), event_base_new_with_config(),
+ *   event_config_avoid_method(), event_config_require_features(),
+ *   event_config_set_flag(), event_config_set_num_cpus_hint()
+ */
+struct event_config
+#ifdef EVENT_IN_DOXYGEN_
+{/*Empty body so that doxygen will generate documentation here.*/}
+#endif
+;
+
+/**
+ * Enable some relatively expensive debugging checks in Libevent that
+ * would normally be turned off.  Generally, these checks cause code that
+ * would otherwise crash mysteriously to fail earlier with an assertion
+ * failure.  Note that this method MUST be called before any events or
+ * event_bases have been created.
+ *
+ * Debug mode can currently catch the following errors:
+ *    An event is re-assigned while it is added
+ *    Any function is called on a non-assigned event
+ *
+ * Note that debugging mode uses memory to track every event that has been
+ * initialized (via event_assign, event_set, or event_new) but not yet
+ * released (via event_free or event_debug_unassign).  If you want to use
+ * debug mode, and you find yourself running out of memory, you will need
+ * to use event_debug_unassign to explicitly stop tracking events that
+ * are no longer considered set-up.
+ *
+ * @see event_debug_unassign()
+ */
+EVENT2_EXPORT_SYMBOL
+void event_enable_debug_mode(void);
+
+/**
+ * When debugging mode is enabled, informs Libevent that an event should no
+ * longer be considered as assigned. When debugging mode is not enabled, does
+ * nothing.
+ *
+ * This function must only be called on a non-added event.
+ *
+ * @see event_enable_debug_mode()
+ */
+EVENT2_EXPORT_SYMBOL
+void event_debug_unassign(struct event *);
+
+/**
+ * Create and return a new event_base to use with the rest of Libevent.
+ *
+ * @return a new event_base on success, or NULL on failure.
+ *
+ * @see event_base_free(), event_base_new_with_config()
+ */
+EVENT2_EXPORT_SYMBOL
+struct event_base *event_base_new(void);
+
+/**
+  Reinitialize the event base after a fork
+
+  Some event mechanisms do not survive across fork.   The event base needs
+  to be reinitialized with the event_reinit() function.
+
+  @param base the event base that needs to be re-initialized
+  @return 0 if successful, or -1 if some events could not be re-added.
+  @see event_base_new()
+*/
+EVENT2_EXPORT_SYMBOL
+int event_reinit(struct event_base *base);
+
+/**
+   Event dispatching loop
+
+  This loop will run the event base until either there are no more pending or
+  active, or until something calls event_base_loopbreak() or
+  event_base_loopexit().
+
+  @param base the event_base structure returned by event_base_new() or
+     event_base_new_with_config()
+  @return 0 if successful, -1 if an error occurred, or 1 if we exited because
+     no events were pending or active.
+  @see event_base_loop()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_dispatch(struct event_base *);
+
+/**
+ Get the kernel event notification mechanism used by Libevent.
+
+ @param eb the event_base structure returned by event_base_new()
+ @return a string identifying the kernel event mechanism (kqueue, epoll, etc.)
+ */
+EVENT2_EXPORT_SYMBOL
+const char *event_base_get_method(const struct event_base *);
+
+/**
+   Gets all event notification mechanisms supported by Libevent.
+
+   This functions returns the event mechanism in order preferred by
+   Libevent.  Note that this list will include all backends that
+   Libevent has compiled-in support for, and will not necessarily check
+   your OS to see whether it has the required resources.
+
+   @return an array with pointers to the names of support methods.
+     The end of the array is indicated by a NULL pointer.  If an
+     error is encountered NULL is returned.
+*/
+EVENT2_EXPORT_SYMBOL
+const char **event_get_supported_methods(void);
+
+/** Query the current monotonic time from a the timer for a struct
+ * event_base.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_gettime_monotonic(struct event_base *base, struct timeval *tp);
+
+/**
+   @name event type flag
+
+   Flags to pass to event_base_get_num_events() to specify the kinds of events
+   we want to aggregate counts for
+*/
+/**@{*/
+/** count the number of active events, which have been triggered.*/
+#define EVENT_BASE_COUNT_ACTIVE                1U
+/** count the number of virtual events, which is used to represent an internal
+ * condition, other than a pending event, that keeps the loop from exiting. */
+#define EVENT_BASE_COUNT_VIRTUAL       2U
+/** count the number of events which have been added to event base, including
+ * internal events. */
+#define EVENT_BASE_COUNT_ADDED         4U
+/**@}*/
+
+/**
+   Gets the number of events in event_base, as specified in the flags.
+
+   Since event base has some internal events added to make some of its
+   functionalities work, EVENT_BASE_COUNT_ADDED may return more than the
+   number of events you added using event_add().
+
+   If you pass EVENT_BASE_COUNT_ACTIVE and EVENT_BASE_COUNT_ADDED together, an
+   active event will be counted twice. However, this might not be the case in
+   future libevent versions.  The return value is an indication of the work
+   load, but the user shouldn't rely on the exact value as this may change in
+   the future.
+
+   @param eb the event_base structure returned by event_base_new()
+   @param flags a bitwise combination of the kinds of events to aggregate
+       counts for
+   @return the number of events specified in the flags
+*/
+EVENT2_EXPORT_SYMBOL
+int event_base_get_num_events(struct event_base *, unsigned int);
+
+/**
+  Get the maximum number of events in a given event_base as specified in the
+  flags.
+
+  @param eb the event_base structure returned by event_base_new()
+  @param flags a bitwise combination of the kinds of events to aggregate
+         counts for
+  @param clear option used to reset the maximum count.
+  @return the number of events specified in the flags
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_get_max_events(struct event_base *, unsigned int, int);
+
+/**
+   Allocates a new event configuration object.
+
+   The event configuration object can be used to change the behavior of
+   an event base.
+
+   @return an event_config object that can be used to store configuration, or
+     NULL if an error is encountered.
+   @see event_base_new_with_config(), event_config_free(), event_config
+*/
+EVENT2_EXPORT_SYMBOL
+struct event_config *event_config_new(void);
+
+/**
+   Deallocates all memory associated with an event configuration object
+
+   @param cfg the event configuration object to be freed.
+*/
+EVENT2_EXPORT_SYMBOL
+void event_config_free(struct event_config *cfg);
+
+/**
+   Enters an event method that should be avoided into the configuration.
+
+   This can be used to avoid event mechanisms that do not support certain
+   file descriptor types, or for debugging to avoid certain event
+   mechanisms.  An application can make use of multiple event bases to
+   accommodate incompatible file descriptor types.
+
+   @param cfg the event configuration object
+   @param method the name of the event method to avoid
+   @return 0 on success, -1 on failure.
+*/
+EVENT2_EXPORT_SYMBOL
+int event_config_avoid_method(struct event_config *cfg, const char *method);
+
+/**
+   A flag used to describe which features an event_base (must) provide.
+
+   Because of OS limitations, not every Libevent backend supports every
+   possible feature.  You can use this type with
+   event_config_require_features() to tell Libevent to only proceed if your
+   event_base implements a given feature, and you can receive this type from
+   event_base_get_features() to see which features are available.
+*/
+enum event_method_feature {
+    /** Require an event method that allows edge-triggered events with EV_ET. */
+    EV_FEATURE_ET = 0x01,
+    /** Require an event method where having one event triggered among
+     * many is [approximately] an O(1) operation. This excludes (for
+     * example) select and poll, which are approximately O(N) for N
+     * equal to the total number of possible events. */
+    EV_FEATURE_O1 = 0x02,
+    /** Require an event method that allows file descriptors as well as
+     * sockets. */
+    EV_FEATURE_FDS = 0x04,
+    /** Require an event method that allows you to use EV_CLOSED to detect
+     * connection close without the necessity of reading all the pending data.
+     *
+     * Methods that do support EV_CLOSED may not be able to provide support on
+     * all kernel versions.
+     **/
+    EV_FEATURE_EARLY_CLOSE = 0x08
+};
+
+/**
+   A flag passed to event_config_set_flag().
+
+    These flags change the behavior of an allocated event_base.
+
+    @see event_config_set_flag(), event_base_new_with_config(),
+       event_method_feature
+ */
+enum event_base_config_flag {
+	/** Do not allocate a lock for the event base, even if we have
+	    locking set up.
+
+	    Setting this option will make it unsafe and nonfunctional to call
+	    functions on the base concurrently from multiple threads.
+	*/
+	EVENT_BASE_FLAG_NOLOCK = 0x01,
+	/** Do not check the EVENT_* environment variables when configuring
+	    an event_base  */
+	EVENT_BASE_FLAG_IGNORE_ENV = 0x02,
+	/** Windows only: enable the IOCP dispatcher at startup
+
+	    If this flag is set then bufferevent_socket_new() and
+	    evconn_listener_new() will use IOCP-backed implementations
+	    instead of the usual select-based one on Windows.
+	 */
+	EVENT_BASE_FLAG_STARTUP_IOCP = 0x04,
+	/** Instead of checking the current time every time the event loop is
+	    ready to run timeout callbacks, check after each timeout callback.
+	 */
+	EVENT_BASE_FLAG_NO_CACHE_TIME = 0x08,
+
+	/** If we are using the epoll backend, this flag says that it is
+	    safe to use Libevent's internal change-list code to batch up
+	    adds and deletes in order to try to do as few syscalls as
+	    possible.  Setting this flag can make your code run faster, but
+	    it may trigger a Linux bug: it is not safe to use this flag
+	    if you have any fds cloned by dup() or its variants.  Doing so
+	    will produce strange and hard-to-diagnose bugs.
+
+	    This flag can also be activated by setting the
+	    EVENT_EPOLL_USE_CHANGELIST environment variable.
+
+	    This flag has no effect if you wind up using a backend other than
+	    epoll.
+	 */
+	EVENT_BASE_FLAG_EPOLL_USE_CHANGELIST = 0x10,
+
+	/** Ordinarily, Libevent implements its time and timeout code using
+	    the fastest monotonic timer that we have.  If this flag is set,
+	    however, we use less efficient more precise timer, assuming one is
+	    present.
+	 */
+	EVENT_BASE_FLAG_PRECISE_TIMER = 0x20
+};
+
+/**
+   Return a bitmask of the features implemented by an event base.  This
+   will be a bitwise OR of one or more of the values of
+   event_method_feature
+
+   @see event_method_feature
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_get_features(const struct event_base *base);
+
+/**
+   Enters a required event method feature that the application demands.
+
+   Note that not every feature or combination of features is supported
+   on every platform.  Code that requests features should be prepared
+   to handle the case where event_base_new_with_config() returns NULL, as in:
+   <pre>
+     event_config_require_features(cfg, EV_FEATURE_ET);
+     base = event_base_new_with_config(cfg);
+     if (base == NULL) {
+       // We can't get edge-triggered behavior here.
+       event_config_require_features(cfg, 0);
+       base = event_base_new_with_config(cfg);
+     }
+   </pre>
+
+   @param cfg the event configuration object
+   @param feature a bitfield of one or more event_method_feature values.
+          Replaces values from previous calls to this function.
+   @return 0 on success, -1 on failure.
+   @see event_method_feature, event_base_new_with_config()
+*/
+EVENT2_EXPORT_SYMBOL
+int event_config_require_features(struct event_config *cfg, int feature);
+
+/**
+ * Sets one or more flags to configure what parts of the eventual event_base
+ * will be initialized, and how they'll work.
+ *
+ * @see event_base_config_flags, event_base_new_with_config()
+ **/
+EVENT2_EXPORT_SYMBOL
+int event_config_set_flag(struct event_config *cfg, int flag);
+
+/**
+ * Records a hint for the number of CPUs in the system. This is used for
+ * tuning thread pools, etc, for optimal performance.  In Libevent 2.0,
+ * it is only on Windows, and only when IOCP is in use.
+ *
+ * @param cfg the event configuration object
+ * @param cpus the number of cpus
+ * @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_config_set_num_cpus_hint(struct event_config *cfg, int cpus);
+
+/**
+ * Record an interval and/or a number of callbacks after which the event base
+ * should check for new events.  By default, the event base will run as many
+ * events are as activated at the highest activated priority before checking
+ * for new events.  If you configure it by setting max_interval, it will check
+ * the time after each callback, and not allow more than max_interval to
+ * elapse before checking for new events.  If you configure it by setting
+ * max_callbacks to a value >= 0, it will run no more than max_callbacks
+ * callbacks before checking for new events.
+ *
+ * This option can decrease the latency of high-priority events, and
+ * avoid priority inversions where multiple low-priority events keep us from
+ * polling for high-priority events, but at the expense of slightly decreasing
+ * the throughput.  Use it with caution!
+ *
+ * @param cfg The event_base configuration object.
+ * @param max_interval An interval after which Libevent should stop running
+ *     callbacks and check for more events, or NULL if there should be
+ *     no such interval.
+ * @param max_callbacks A number of callbacks after which Libevent should
+ *     stop running callbacks and check for more events, or -1 if there
+ *     should be no such limit.
+ * @param min_priority A priority below which max_interval and max_callbacks
+ *     should not be enforced.  If this is set to 0, they are enforced
+ *     for events of every priority; if it's set to 1, they're enforced
+ *     for events of priority 1 and above, and so on.
+ * @return 0 on success, -1 on failure.
+ **/
+EVENT2_EXPORT_SYMBOL
+int event_config_set_max_dispatch_interval(struct event_config *cfg,
+    const struct timeval *max_interval, int max_callbacks,
+    int min_priority);
+
+/**
+  Initialize the event API.
+
+  Use event_base_new_with_config() to initialize a new event base, taking
+  the specified configuration under consideration.  The configuration object
+  can currently be used to avoid certain event notification mechanisms.
+
+  @param cfg the event configuration object
+  @return an initialized event_base that can be used to registering events,
+     or NULL if no event base can be created with the requested event_config.
+  @see event_base_new(), event_base_free(), event_init(), event_assign()
+*/
+EVENT2_EXPORT_SYMBOL
+struct event_base *event_base_new_with_config(const struct event_config *);
+
+/**
+  Deallocate all memory associated with an event_base, and free the base.
+
+  Note that this function will not close any fds or free any memory passed
+  to event_new as the argument to callback.
+
+  If there are any pending finalizer callbacks, this function will invoke
+  them.
+
+  @param eb an event_base to be freed
+ */
+EVENT2_EXPORT_SYMBOL
+void event_base_free(struct event_base *);
+
+/**
+   As event_base_free, but do not run finalizers.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_base_free_nofinalize(struct event_base *);
+
+/** @name Log severities
+ */
+/**@{*/
+#define EVENT_LOG_DEBUG 0
+#define EVENT_LOG_MSG   1
+#define EVENT_LOG_WARN  2
+#define EVENT_LOG_ERR   3
+/**@}*/
+
+/* Obsolete names: these are deprecated, but older programs might use them.
+ * They violate the reserved-identifier namespace. */
+#define _EVENT_LOG_DEBUG EVENT_LOG_DEBUG
+#define _EVENT_LOG_MSG EVENT_LOG_MSG
+#define _EVENT_LOG_WARN EVENT_LOG_WARN
+#define _EVENT_LOG_ERR EVENT_LOG_ERR
+
+/**
+  A callback function used to intercept Libevent's log messages.
+
+  @see event_set_log_callback
+ */
+typedef void (*event_log_cb)(int severity, const char *msg);
+/**
+  Redirect Libevent's log messages.
+
+  @param cb a function taking two arguments: an integer severity between
+     EVENT_LOG_DEBUG and EVENT_LOG_ERR, and a string.  If cb is NULL,
+	 then the default log is used.
+
+  NOTE: The function you provide *must not* call any other libevent
+  functionality.  Doing so can produce undefined behavior.
+  */
+EVENT2_EXPORT_SYMBOL
+void event_set_log_callback(event_log_cb cb);
+
+/**
+   A function to be called if Libevent encounters a fatal internal error.
+
+   @see event_set_fatal_callback
+ */
+typedef void (*event_fatal_cb)(int err);
+
+/**
+ Override Libevent's behavior in the event of a fatal internal error.
+
+ By default, Libevent will call exit(1) if a programming error makes it
+ impossible to continue correct operation.  This function allows you to supply
+ another callback instead.  Note that if the function is ever invoked,
+ something is wrong with your program, or with Libevent: any subsequent calls
+ to Libevent may result in undefined behavior.
+
+ Libevent will (almost) always log an EVENT_LOG_ERR message before calling
+ this function; look at the last log message to see why Libevent has died.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_set_fatal_callback(event_fatal_cb cb);
+
+#define EVENT_DBG_ALL 0xffffffffu
+#define EVENT_DBG_NONE 0
+
+/**
+ Turn on debugging logs and have them sent to the default log handler.
+
+ This is a global setting; if you are going to call it, you must call this
+ before any calls that create an event-base.  You must call it before any
+ multithreaded use of Libevent.
+
+ Debug logs are verbose.
+
+ @param which Controls which debug messages are turned on.  This option is
+   unused for now; for forward compatibility, you must pass in the constant
+   "EVENT_DBG_ALL" to turn debugging logs on, or "EVENT_DBG_NONE" to turn
+   debugging logs off.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_enable_debug_logging(ev_uint32_t which);
+
+/**
+  Associate a different event base with an event.
+
+  The event to be associated must not be currently active or pending.
+
+  @param eb the event base
+  @param ev the event
+  @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_set(struct event_base *, struct event *);
+
+/** @name Loop flags
+
+    These flags control the behavior of event_base_loop().
+ */
+/**@{*/
+/** Block until we have an active event, then exit once all active events
+ * have had their callbacks run. */
+#define EVLOOP_ONCE	0x01
+/** Do not block: see which events are ready now, run the callbacks
+ * of the highest-priority ones, then exit. */
+#define EVLOOP_NONBLOCK	0x02
+/** Do not exit the loop because we have no pending events.  Instead, keep
+ * running until event_base_loopexit() or event_base_loopbreak() makes us
+ * stop.
+ */
+#define EVLOOP_NO_EXIT_ON_EMPTY 0x04
+/**@}*/
+
+/**
+  Wait for events to become active, and run their callbacks.
+
+  This is a more flexible version of event_base_dispatch().
+
+  By default, this loop will run the event base until either there are no more
+  pending or active events, or until something calls event_base_loopbreak() or
+  event_base_loopexit().  You can override this behavior with the 'flags'
+  argument.
+
+  @param eb the event_base structure returned by event_base_new() or
+     event_base_new_with_config()
+  @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
+  @return 0 if successful, -1 if an error occurred, or 1 if we exited because
+     no events were pending or active.
+  @see event_base_loopexit(), event_base_dispatch(), EVLOOP_ONCE,
+     EVLOOP_NONBLOCK
+  */
+EVENT2_EXPORT_SYMBOL
+int event_base_loop(struct event_base *, int);
+
+/**
+  Exit the event loop after the specified time
+
+  The next event_base_loop() iteration after the given timer expires will
+  complete normally (handling all queued events) then exit without
+  blocking for events again.
+
+  Subsequent invocations of event_base_loop() will proceed normally.
+
+  @param eb the event_base structure returned by event_init()
+  @param tv the amount of time after which the loop should terminate,
+    or NULL to exit after running all currently active events.
+  @return 0 if successful, or -1 if an error occurred
+  @see event_base_loopbreak()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_loopexit(struct event_base *, const struct timeval *);
+
+/**
+  Abort the active event_base_loop() immediately.
+
+  event_base_loop() will abort the loop after the next event is completed;
+  event_base_loopbreak() is typically invoked from this event's callback.
+  This behavior is analogous to the "break;" statement.
+
+  Subsequent invocations of event_base_loop() will proceed normally.
+
+  @param eb the event_base structure returned by event_init()
+  @return 0 if successful, or -1 if an error occurred
+  @see event_base_loopexit()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_loopbreak(struct event_base *);
+
+/**
+  Tell the active event_base_loop() to scan for new events immediately.
+
+  Calling this function makes the currently active event_base_loop()
+  start the loop over again (scanning for new events) after the current
+  event callback finishes.  If the event loop is not running, this
+  function has no effect.
+
+  event_base_loopbreak() is typically invoked from this event's callback.
+  This behavior is analogous to the "continue;" statement.
+
+  Subsequent invocations of event loop will proceed normally.
+
+  @param eb the event_base structure returned by event_init()
+  @return 0 if successful, or -1 if an error occurred
+  @see event_base_loopbreak()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_loopcontinue(struct event_base *);
+
+/**
+  Checks if the event loop was told to exit by event_base_loopexit().
+
+  This function will return true for an event_base at every point after
+  event_loopexit() is called, until the event loop is next entered.
+
+  @param eb the event_base structure returned by event_init()
+  @return true if event_base_loopexit() was called on this event base,
+    or 0 otherwise
+  @see event_base_loopexit()
+  @see event_base_got_break()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_got_exit(struct event_base *);
+
+/**
+  Checks if the event loop was told to abort immediately by event_base_loopbreak().
+
+  This function will return true for an event_base at every point after
+  event_base_loopbreak() is called, until the event loop is next entered.
+
+  @param eb the event_base structure returned by event_init()
+  @return true if event_base_loopbreak() was called on this event base,
+    or 0 otherwise
+  @see event_base_loopbreak()
+  @see event_base_got_exit()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_got_break(struct event_base *);
+
+/**
+ * @name event flags
+ *
+ * Flags to pass to event_new(), event_assign(), event_pending(), and
+ * anything else with an argument of the form "short events"
+ */
+/**@{*/
+/** Indicates that a timeout has occurred.  It's not necessary to pass
+ * this flag to event_for new()/event_assign() to get a timeout. */
+#define EV_TIMEOUT	0x01
+/** Wait for a socket or FD to become readable */
+#define EV_READ		0x02
+/** Wait for a socket or FD to become writeable */
+#define EV_WRITE	0x04
+/** Wait for a POSIX signal to be raised*/
+#define EV_SIGNAL	0x08
+/**
+ * Persistent event: won't get removed automatically when activated.
+ *
+ * When a persistent event with a timeout becomes activated, its timeout
+ * is reset to 0.
+ */
+#define EV_PERSIST	0x10
+/** Select edge-triggered behavior, if supported by the backend. */
+#define EV_ET		0x20
+/**
+ * If this option is provided, then event_del() will not block in one thread
+ * while waiting for the event callback to complete in another thread.
+ *
+ * To use this option safely, you may need to use event_finalize() or
+ * event_free_finalize() in order to safely tear down an event in a
+ * multithreaded application.  See those functions for more information.
+ **/
+#define EV_FINALIZE     0x40
+/**
+ * Detects connection close events.  You can use this to detect when a
+ * connection has been closed, without having to read all the pending data
+ * from a connection.
+ *
+ * Not all backends support EV_CLOSED.  To detect or require it, use the
+ * feature flag EV_FEATURE_EARLY_CLOSE.
+ **/
+#define EV_CLOSED	0x80
+/**@}*/
+
+/**
+   @name evtimer_* macros
+
+   Aliases for working with one-shot timer events
+   If you need EV_PERSIST timer use event_*() functions.
+ */
+/**@{*/
+#define evtimer_assign(ev, b, cb, arg) \
+	event_assign((ev), (b), -1, 0, (cb), (arg))
+#define evtimer_new(b, cb, arg)		event_new((b), -1, 0, (cb), (arg))
+#define evtimer_add(ev, tv)		event_add((ev), (tv))
+#define evtimer_del(ev)			event_del(ev)
+#define evtimer_pending(ev, tv)		event_pending((ev), EV_TIMEOUT, (tv))
+#define evtimer_initialized(ev)		event_initialized(ev)
+/**@}*/
+
+/**
+   @name evsignal_* macros
+
+   Aliases for working with signal events
+ */
+/**@{*/
+#define evsignal_add(ev, tv)		event_add((ev), (tv))
+#define evsignal_assign(ev, b, x, cb, arg)			\
+	event_assign((ev), (b), (x), EV_SIGNAL|EV_PERSIST, cb, (arg))
+#define evsignal_new(b, x, cb, arg)				\
+	event_new((b), (x), EV_SIGNAL|EV_PERSIST, (cb), (arg))
+#define evsignal_del(ev)		event_del(ev)
+#define evsignal_pending(ev, tv)	event_pending((ev), EV_SIGNAL, (tv))
+#define evsignal_initialized(ev)	event_initialized(ev)
+/**@}*/
+
+/**
+   @name evuser_* macros
+
+   Aliases for working with user-triggered events
+   If you need EV_PERSIST event use event_*() functions.
+ */
+/**@{*/
+#define evuser_new(b, cb, arg)		event_new((b), -1, 0, (cb), (arg))
+#define evuser_del(ev)			event_del(ev)
+#define evuser_pending(ev, tv)		event_pending((ev), 0, (tv))
+#define evuser_initialized(ev)		event_initialized(ev)
+#define evuser_trigger(ev)		event_active((ev), 0, 0)
+/**@}*/
+
+/**
+   A callback function for an event.
+
+   It receives three arguments:
+
+   @param fd An fd or signal
+   @param events One or more EV_* flags
+   @param arg A user-supplied argument.
+
+   @see event_new()
+ */
+typedef void (*event_callback_fn)(evutil_socket_t, short, void *);
+
+/**
+  Return a value used to specify that the event itself must be used as the callback argument.
+
+  The function event_new() takes a callback argument which is passed
+  to the event's callback function. To specify that the argument to be
+  passed to the callback function is the event that event_new() returns,
+  pass in the return value of event_self_cbarg() as the callback argument
+  for event_new().
+
+  For example:
+  <pre>
+      struct event *ev = event_new(base, sock, events, callback, %event_self_cbarg());
+  </pre>
+
+  For consistency with event_new(), it is possible to pass the return value
+  of this function as the callback argument for event_assign() &ndash; this
+  achieves the same result as passing the event in directly.
+
+  @return a value to be passed as the callback argument to event_new() or
+  event_assign().
+  @see event_new(), event_assign()
+ */
+EVENT2_EXPORT_SYMBOL
+void *event_self_cbarg(void);
+
+/**
+  Allocate and assign a new event structure, ready to be added.
+
+  The function event_new() returns a new event that can be used in
+  future calls to event_add() and event_del().  The fd and events
+  arguments determine which conditions will trigger the event; the
+  callback and callback_arg arguments tell Libevent what to do when the
+  event becomes active.
+
+  If events contains one of EV_READ, EV_WRITE, or EV_READ|EV_WRITE, then
+  fd is a file descriptor or socket that should get monitored for
+  readiness to read, readiness to write, or readiness for either operation
+  (respectively).  If events contains EV_SIGNAL, then fd is a signal
+  number to wait for.  If events contains none of those flags, then the
+  event can be triggered only by a timeout or by manual activation with
+  event_active(): In this case, fd must be -1.
+
+  The EV_PERSIST flag can also be passed in the events argument: it makes
+  event_add() persistent until event_del() is called.
+
+  The EV_ET flag is compatible with EV_READ and EV_WRITE, and supported
+  only by certain backends.  It tells Libevent to use edge-triggered
+  events.
+
+  The EV_TIMEOUT flag has no effect here.
+
+  It is okay to have multiple events all listening on the same fds; but
+  they must either all be edge-triggered, or all not be edge triggered.
+
+  When the event becomes active, the event loop will run the provided
+  callback function, with three arguments.  The first will be the provided
+  fd value.  The second will be a bitfield of the events that triggered:
+  EV_READ, EV_WRITE, or EV_SIGNAL.  Here the EV_TIMEOUT flag indicates
+  that a timeout occurred, and EV_ET indicates that an edge-triggered
+  event occurred.  The third event will be the callback_arg pointer that
+  you provide.
+
+  @param base the event base to which the event should be attached.
+  @param fd the file descriptor or signal to be monitored, or -1.
+  @param events desired events to monitor: bitfield of EV_READ, EV_WRITE,
+      EV_SIGNAL, EV_PERSIST, EV_ET.
+  @param callback callback function to be invoked when the event occurs
+  @param callback_arg an argument to be passed to the callback function
+
+  @return a newly allocated struct event that must later be freed with
+    event_free() or NULL if an error occurred.
+  @see event_free(), event_add(), event_del(), event_assign()
+ */
+EVENT2_EXPORT_SYMBOL
+struct event *event_new(struct event_base *, evutil_socket_t, short, event_callback_fn, void *);
+
+
+/**
+  Prepare a new, already-allocated event structure to be added.
+
+  The function event_assign() prepares the event structure ev to be used
+  in future calls to event_add() and event_del().  Unlike event_new(), it
+  doesn't allocate memory itself: it requires that you have already
+  allocated a struct event, probably on the heap.  Doing this will
+  typically make your code depend on the size of the event structure, and
+  thereby create incompatibility with future versions of Libevent.
+
+  The easiest way to avoid this problem is just to use event_new() and
+  event_free() instead.
+
+  A slightly harder way to future-proof your code is to use
+  event_get_struct_event_size() to determine the required size of an event
+  at runtime.
+
+  Note that it is NOT safe to call this function on an event that is
+  active or pending.  Doing so WILL corrupt internal data structures in
+  Libevent, and lead to strange, hard-to-diagnose bugs.  You _can_ use
+  event_assign to change an existing event, but only if it is not active
+  or pending!
+
+  The arguments for this function, and the behavior of the events that it
+  makes, are as for event_new().
+
+  @param ev an event struct to be modified
+  @param base the event base to which ev should be attached.
+  @param fd the file descriptor to be monitored
+  @param events desired events to monitor; can be EV_READ and/or EV_WRITE
+  @param callback callback function to be invoked when the event occurs
+  @param callback_arg an argument to be passed to the callback function
+
+  @return 0 if success, or -1 on invalid arguments.
+
+  @see event_new(), event_add(), event_del(), event_base_once(),
+    event_get_struct_event_size()
+  */
+EVENT2_EXPORT_SYMBOL
+int event_assign(struct event *, struct event_base *, evutil_socket_t, short, event_callback_fn, void *);
+
+/**
+   Deallocate a struct event * returned by event_new().
+
+   If the event is pending or active, this function makes it non-pending
+   and non-active first.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_free(struct event *);
+
+/**
+ * Callback type for event_finalize and event_free_finalize().
+ **/
+typedef void (*event_finalize_callback_fn)(struct event *, void *);
+/**
+   @name Finalization functions
+
+   These functions are used to safely tear down an event in a multithreaded
+   application.  If you construct your events with EV_FINALIZE to avoid
+   deadlocks, you will need a way to remove an event in the certainty that
+   it will definitely not be running its callback when you deallocate it
+   and its callback argument.
+
+   To do this, call one of event_finalize() or event_free_finalize with
+   0 for its first argument, the event to tear down as its second argument,
+   and a callback function as its third argument.  The callback will be
+   invoked as part of the event loop, with the event's priority.
+
+   After you call a finalizer function, event_add() and event_active() will
+   no longer work on the event, and event_del() will produce a no-op. You
+   must not try to change the event's fields with event_assign() or
+   event_set() while the finalize callback is in progress.  Once the
+   callback has been invoked, you should treat the event structure as
+   containing uninitialized memory.
+
+   The event_free_finalize() function frees the event after it's finalized;
+   event_finalize() does not.
+
+   A finalizer callback must not make events pending or active.  It must not
+   add events, activate events, or attempt to "resuscitate" the event being
+   finalized in any way.
+
+   @return 0 on success, -1 on failure.
+ */
+/**@{*/
+EVENT2_EXPORT_SYMBOL
+int event_finalize(unsigned, struct event *, event_finalize_callback_fn);
+EVENT2_EXPORT_SYMBOL
+int event_free_finalize(unsigned, struct event *, event_finalize_callback_fn);
+/**@}*/
+
+/**
+  Schedule a one-time event
+
+  The function event_base_once() is similar to event_new().  However, it
+  schedules a callback to be called exactly once, and does not require the
+  caller to prepare an event structure.
+
+  Note that in Libevent 2.0 and earlier, if the event is never triggered, the
+  internal memory used to hold it will never be freed.  In Libevent 2.1,
+  the internal memory will get freed by event_base_free() if the event
+  is never triggered.  The 'arg' value, however, will not get freed in either
+  case--you'll need to free that on your own if you want it to go away.
+
+  @param base an event_base
+  @param fd a file descriptor to monitor, or -1 for no fd.
+  @param events event(s) to monitor; can be any of EV_READ |
+         EV_WRITE, or EV_TIMEOUT
+  @param callback callback function to be invoked when the event occurs
+  @param arg an argument to be passed to the callback function
+  @param timeout the maximum amount of time to wait for the event. NULL
+         makes an EV_READ/EV_WRITE event make forever; NULL makes an
+        EV_TIMEOUT event success immediately.
+  @return 0 if successful, or -1 if an error occurred
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_once(struct event_base *, evutil_socket_t, short, event_callback_fn, void *, const struct timeval *);
+
+/**
+  Add an event to the set of pending events.
+
+  The function event_add() schedules the execution of the event 'ev' when the
+  condition specified by event_assign() or event_new() occurs, or when the time
+  specified in timeout has elapsed.  If a timeout is NULL, no timeout
+  occurs and the function will only be
+  called if a matching event occurs.  The event in the
+  ev argument must be already initialized by event_assign() or event_new()
+  and may not be used
+  in calls to event_assign() until it is no longer pending.
+
+  If the event in the ev argument already has a scheduled timeout, calling
+  event_add() replaces the old timeout with the new one if tv is non-NULL.
+
+  @param ev an event struct initialized via event_assign() or event_new()
+  @param timeout the maximum amount of time to wait for the event, or NULL
+         to wait forever
+  @return 0 if successful, or -1 if an error occurred
+  @see event_del(), event_assign(), event_new()
+  */
+EVENT2_EXPORT_SYMBOL
+int event_add(struct event *ev, const struct timeval *timeout);
+
+/**
+   Remove a timer from a pending event without removing the event itself.
+
+   If the event has a scheduled timeout, this function unschedules it but
+   leaves the event otherwise pending.
+
+   @param ev an event struct initialized via event_assign() or event_new()
+   @return 0 on success, or -1 if an error occurred.
+*/
+EVENT2_EXPORT_SYMBOL
+int event_remove_timer(struct event *ev);
+
+/**
+  Remove an event from the set of monitored events.
+
+  The function event_del() will cancel the event in the argument ev.  If the
+  event has already executed or has never been added the call will have no
+  effect.
+
+  @param ev an event struct to be removed from the working set
+  @return 0 if successful, or -1 if an error occurred
+  @see event_add()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_del(struct event *);
+
+/**
+   As event_del(), but never blocks while the event's callback is running
+   in another thread, even if the event was constructed without the
+   EV_FINALIZE flag.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_del_noblock(struct event *ev);
+/**
+   As event_del(), but always blocks while the event's callback is running
+   in another thread, even if the event was constructed with the
+   EV_FINALIZE flag.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_del_block(struct event *ev);
+
+/**
+  Make an event active.
+
+  You can use this function on a pending or a non-pending event to make it
+  active, so that its callback will be run by event_base_dispatch() or
+  event_base_loop().
+
+  One common use in multithreaded programs is to wake the thread running
+  event_base_loop() from another thread.
+
+  @param ev an event to make active.
+  @param res a set of flags to pass to the event's callback.
+  @param ncalls an obsolete argument: this is ignored.
+ **/
+EVENT2_EXPORT_SYMBOL
+void event_active(struct event *ev, int res, short ncalls);
+
+/**
+  Checks if a specific event is pending or scheduled.
+
+  @param ev an event struct previously passed to event_add()
+  @param events the requested event type; any of EV_TIMEOUT|EV_READ|
+         EV_WRITE|EV_SIGNAL
+  @param tv if this field is not NULL, and the event has a timeout,
+         this field is set to hold the time at which the timeout will
+	 expire.
+
+  @return true if the event is pending on any of the events in 'what', (that
+  is to say, it has been added), or 0 if the event is not added.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_pending(const struct event *ev, short events, struct timeval *tv);
+
+/**
+   If called from within the callback for an event, returns that event.
+
+   The behavior of this function is not defined when called from outside the
+   callback function for an event.
+ */
+EVENT2_EXPORT_SYMBOL
+struct event *event_base_get_running_event(struct event_base *base);
+
+/**
+  Test if an event structure might be initialized.
+
+  The event_initialized() function can be used to check if an event has been
+  initialized.
+
+  Warning: This function is only useful for distinguishing a zeroed-out
+    piece of memory from an initialized event, it can easily be confused by
+    uninitialized memory.  Thus, it should ONLY be used to distinguish an
+    initialized event from zero.
+
+  @param ev an event structure to be tested
+  @return 1 if the structure might be initialized, or 0 if it has not been
+          initialized
+ */
+EVENT2_EXPORT_SYMBOL
+int event_initialized(const struct event *ev);
+
+/**
+   Get the signal number assigned to a signal event
+*/
+#define event_get_signal(ev) ((int)event_get_fd(ev))
+
+/**
+   Get the socket or signal assigned to an event, or -1 if the event has
+   no socket.
+*/
+EVENT2_EXPORT_SYMBOL
+evutil_socket_t event_get_fd(const struct event *ev);
+
+/**
+   Get the event_base associated with an event.
+*/
+EVENT2_EXPORT_SYMBOL
+struct event_base *event_get_base(const struct event *ev);
+
+/**
+   Return the events (EV_READ, EV_WRITE, etc) assigned to an event.
+*/
+EVENT2_EXPORT_SYMBOL
+short event_get_events(const struct event *ev);
+
+/**
+   Return the callback assigned to an event.
+*/
+EVENT2_EXPORT_SYMBOL
+event_callback_fn event_get_callback(const struct event *ev);
+
+/**
+   Return the callback argument assigned to an event.
+*/
+EVENT2_EXPORT_SYMBOL
+void *event_get_callback_arg(const struct event *ev);
+
+/**
+   Return the priority of an event.
+   @see event_priority_init(), event_get_priority()
+*/
+EVENT2_EXPORT_SYMBOL
+int event_get_priority(const struct event *ev);
+
+/**
+   Extract _all_ of arguments given to construct a given event.  The
+   event_base is copied into *base_out, the fd is copied into *fd_out, and so
+   on.
+
+   If any of the "_out" arguments is NULL, it will be ignored.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_get_assignment(const struct event *event,
+    struct event_base **base_out, evutil_socket_t *fd_out, short *events_out,
+    event_callback_fn *callback_out, void **arg_out);
+
+/**
+   Return the size of struct event that the Libevent library was compiled
+   with.
+
+   This will be NO GREATER than sizeof(struct event) if you're running with
+   the same version of Libevent that your application was built with, but
+   otherwise might not.
+
+   Note that it might be SMALLER than sizeof(struct event) if some future
+   version of Libevent adds extra padding to the end of struct event.
+   We might do this to help ensure ABI-compatibility between different
+   versions of Libevent.
+ */
+EVENT2_EXPORT_SYMBOL
+size_t event_get_struct_event_size(void);
+
+/**
+   Get the Libevent version.
+
+   Note that this will give you the version of the library that you're
+   currently linked against, not the version of the headers that you've
+   compiled against.
+
+   @return a string containing the version number of Libevent
+*/
+EVENT2_EXPORT_SYMBOL
+const char *event_get_version(void);
+
+/**
+   Return a numeric representation of Libevent's version.
+
+   Note that this will give you the version of the library that you're
+   currently linked against, not the version of the headers you've used to
+   compile.
+
+   The format uses one byte each for the major, minor, and patchlevel parts of
+   the version number.  The low-order byte is unused.  For example, version
+   2.0.1-alpha has a numeric representation of 0x02000100
+*/
+EVENT2_EXPORT_SYMBOL
+ev_uint32_t event_get_version_number(void);
+
+/** As event_get_version, but gives the version of Libevent's headers. */
+#define LIBEVENT_VERSION EVENT__VERSION
+/** As event_get_version_number, but gives the version number of Libevent's
+ * headers. */
+#define LIBEVENT_VERSION_NUMBER EVENT__NUMERIC_VERSION
+
+/** Largest number of priorities that Libevent can support. */
+#define EVENT_MAX_PRIORITIES 256
+/**
+  Set the number of different event priorities
+
+  By default Libevent schedules all active events with the same priority.
+  However, some time it is desirable to process some events with a higher
+  priority than others.  For that reason, Libevent supports strict priority
+  queues.  Active events with a lower priority are always processed before
+  events with a higher priority.
+
+  The number of different priorities can be set initially with the
+  event_base_priority_init() function.  This function should be called
+  before the first call to event_base_dispatch().  The
+  event_priority_set() function can be used to assign a priority to an
+  event.  By default, Libevent assigns the middle priority to all events
+  unless their priority is explicitly set.
+
+  Note that urgent-priority events can starve less-urgent events: after
+  running all urgent-priority callbacks, Libevent checks for more urgent
+  events again, before running less-urgent events.  Less-urgent events
+  will not have their callbacks run until there are no events more urgent
+  than them that want to be active.
+
+  @param eb the event_base structure returned by event_base_new()
+  @param npriorities the maximum number of priorities
+  @return 0 if successful, or -1 if an error occurred
+  @see event_priority_set()
+ */
+EVENT2_EXPORT_SYMBOL
+int	event_base_priority_init(struct event_base *, int);
+
+/**
+  Get the number of different event priorities.
+
+  @param eb the event_base structure returned by event_base_new()
+  @return Number of different event priorities
+  @see event_base_priority_init()
+*/
+EVENT2_EXPORT_SYMBOL
+int	event_base_get_npriorities(struct event_base *eb);
+
+/**
+  Assign a priority to an event.
+
+  @param ev an event struct
+  @param priority the new priority to be assigned
+  @return 0 if successful, or -1 if an error occurred
+  @see event_priority_init(), event_get_priority()
+  */
+EVENT2_EXPORT_SYMBOL
+int	event_priority_set(struct event *, int);
+
+/**
+   Prepare an event_base to use a large number of timeouts with the same
+   duration.
+
+   Libevent's default scheduling algorithm is optimized for having a large
+   number of timeouts with their durations more or less randomly
+   distributed.  But if you have a large number of timeouts that all have
+   the same duration (for example, if you have a large number of
+   connections that all have a 10-second timeout), then you can improve
+   Libevent's performance by telling Libevent about it.
+
+   To do this, call this function with the common duration.  It will return a
+   pointer to a different, opaque timeout value.  (Don't depend on its actual
+   contents!)  When you use this timeout value in event_add(), Libevent will
+   schedule the event more efficiently.
+
+   (This optimization probably will not be worthwhile until you have thousands
+   or tens of thousands of events with the same timeout.)
+ */
+EVENT2_EXPORT_SYMBOL
+const struct timeval *event_base_init_common_timeout(struct event_base *base,
+    const struct timeval *duration);
+
+#if !defined(EVENT__DISABLE_MM_REPLACEMENT) || defined(EVENT_IN_DOXYGEN_)
+/**
+ Override the functions that Libevent uses for memory management.
+
+ Usually, Libevent uses the standard libc functions malloc, realloc, and
+ free to allocate memory.  Passing replacements for those functions to
+ event_set_mem_functions() overrides this behavior.
+
+ Note that all memory returned from Libevent will be allocated by the
+ replacement functions rather than by malloc() and realloc().  Thus, if you
+ have replaced those functions, it will not be appropriate to free() memory
+ that you get from Libevent.  Instead, you must use the free_fn replacement
+ that you provided.
+
+ Note also that if you are going to call this function, you should do so
+ before any call to any Libevent function that does allocation.
+ Otherwise, those functions will allocate their memory using malloc(), but
+ then later free it using your provided free_fn.
+
+ @param malloc_fn A replacement for malloc.
+ @param realloc_fn A replacement for realloc
+ @param free_fn A replacement for free.
+ **/
+EVENT2_EXPORT_SYMBOL
+void event_set_mem_functions(
+	void *(*malloc_fn)(size_t sz),
+	void *(*realloc_fn)(void *ptr, size_t sz),
+	void (*free_fn)(void *ptr));
+/** This definition is present if Libevent was built with support for
+    event_set_mem_functions() */
+#define EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
+#endif
+
+/**
+   Writes a human-readable description of all inserted and/or active
+   events to a provided stdio stream.
+
+   This is intended for debugging; its format is not guaranteed to be the same
+   between libevent versions.
+
+   @param base An event_base on which to scan the events.
+   @param output A stdio file to write on.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_base_dump_events(struct event_base *, FILE *);
+
+
+/**
+   Activates all pending events for the given fd and event mask.
+
+   This function activates pending events only.  Events which have not been
+   added will not become active.
+
+   @param base the event_base on which to activate the events.
+   @param fd An fd to active events on.
+   @param events One or more of EV_{READ,WRITE,TIMEOUT}.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_base_active_by_fd(struct event_base *base, evutil_socket_t fd, short events);
+
+/**
+   Activates all pending signals with a given signal number
+
+   This function activates pending events only.  Events which have not been
+   added will not become active.
+
+   @param base the event_base on which to activate the events.
+   @param fd The signal to active events on.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_base_active_by_signal(struct event_base *base, int sig);
+
+/**
+ * Callback for iterating events in an event base via event_base_foreach_event
+ */
+typedef int (*event_base_foreach_event_cb)(const struct event_base *, const struct event *, void *);
+
+/**
+   Iterate over all added or active events events in an event loop, and invoke
+   a given callback on each one.
+
+   The callback must not call any function that modifies the event base, that
+   modifies any event in the event base, or that adds or removes any event to
+   the event base.  Doing so is unsupported and will lead to undefined
+   behavior -- likely, to crashes.
+
+   event_base_foreach_event() holds a lock on the event_base() for the whole
+   time it's running: slow callbacks are not advisable.
+
+   Note that Libevent adds some events of its own to make pieces of its
+   functionality work.  You must not assume that the only events you'll
+   encounter will be the ones you added yourself.
+
+   The callback function must return 0 to continue iteration, or some other
+   integer to stop iterating.
+
+   @param base An event_base on which to scan the events.
+   @param fn   A callback function to receive the events.
+   @param arg  An argument passed to the callback function.
+   @return 0 if we iterated over every event, or the value returned by the
+      callback function if the loop exited early.
+*/
+EVENT2_EXPORT_SYMBOL
+int event_base_foreach_event(struct event_base *base, event_base_foreach_event_cb fn, void *arg);
+
+
+/** Sets 'tv' to the current time (as returned by gettimeofday()),
+    looking at the cached value in 'base' if possible, and calling
+    gettimeofday() or clock_gettime() as appropriate if there is no
+    cached time.
+
+    Generally, this value will only be cached while actually
+    processing event callbacks, and may be very inaccurate if your
+    callbacks take a long time to execute.
+
+    Returns 0 on success, negative on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_gettimeofday_cached(struct event_base *base,
+    struct timeval *tv);
+
+/** Update cached_tv in the 'base' to the current time
+ *
+ * You can use this function is useful for selectively increasing
+ * the accuracy of the cached time value in 'base' during callbacks
+ * that take a long time to execute.
+ *
+ * This function has no effect if the base is currently not in its
+ * event loop, or if timeval caching is disabled via
+ * EVENT_BASE_FLAG_NO_CACHE_TIME.
+ *
+ * @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int event_base_update_cache_time(struct event_base *base);
+
+/** Release up all globally-allocated resources allocated by Libevent.
+
+    This function does not free developer-controlled resources like
+    event_bases, events, bufferevents, listeners, and so on.  It only releases
+    resources like global locks that there is no other way to free.
+
+    It is not actually necessary to call this function before exit: every
+    resource that it frees would be released anyway on exit.  It mainly exists
+    so that resource-leak debugging tools don't see Libevent as holding
+    resources at exit.
+
+    You should only call this function when no other Libevent functions will
+    be invoked -- e.g., when cleanly exiting a program.
+ */
+EVENT2_EXPORT_SYMBOL
+void libevent_global_shutdown(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/event_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/event_compat.h
new file mode 100644
index 000000000000..5110175a1b91
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/event_compat.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_EVENT_COMPAT_H_INCLUDED_
+#define EVENT2_EVENT_COMPAT_H_INCLUDED_
+
+/** @file event2/event_compat.h
+
+  Potentially non-threadsafe versions of the functions in event.h: provided
+  only for backwards compatibility.
+
+  In the oldest versions of Libevent, event_base was not a first-class
+  structure.  Instead, there was a single event base that every function
+  manipulated.  Later, when separate event bases were added, the old functions
+  that didn't take an event_base argument needed to work by manipulating the
+  "current" event base.  This could lead to thread-safety issues, and obscure,
+  hard-to-diagnose bugs.
+
+  @deprecated All functions in this file are by definition deprecated.
+ */
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/**
+  Initialize the event API.
+
+  The event API needs to be initialized with event_init() before it can be
+  used.  Sets the global current base that gets used for events that have no
+  base associated with them.
+
+  @deprecated This function is deprecated because it replaces the "current"
+    event_base, and is totally unsafe for multithreaded use.  The replacement
+    is event_base_new().
+
+  @see event_base_set(), event_base_new()
+ */
+EVENT2_EXPORT_SYMBOL
+struct event_base *event_init(void);
+
+/**
+  Loop to process events.
+
+  Like event_base_dispatch(), but uses the "current" base.
+
+  @deprecated This function is deprecated because it is easily confused by
+    multiple calls to event_init(), and because it is not safe for
+    multithreaded use.  The replacement is event_base_dispatch().
+
+  @see event_base_dispatch(), event_init()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_dispatch(void);
+
+/**
+  Handle events.
+
+  This function behaves like event_base_loop(), but uses the "current" base
+
+  @deprecated This function is deprecated because it uses the event base from
+    the last call to event_init, and is therefore not safe for multithreaded
+    use.  The replacement is event_base_loop().
+
+  @see event_base_loop(), event_init()
+*/
+EVENT2_EXPORT_SYMBOL
+int event_loop(int);
+
+
+/**
+  Exit the event loop after the specified time.
+
+  This function behaves like event_base_loopexit(), except that it uses the
+  "current" base.
+
+  @deprecated This function is deprecated because it uses the event base from
+    the last call to event_init, and is therefore not safe for multithreaded
+    use.  The replacement is event_base_loopexit().
+
+  @see event_init, event_base_loopexit()
+  */
+EVENT2_EXPORT_SYMBOL
+int event_loopexit(const struct timeval *);
+
+
+/**
+  Abort the active event_loop() immediately.
+
+  This function behaves like event_base_loopbreakt(), except that it uses the
+  "current" base.
+
+  @deprecated This function is deprecated because it uses the event base from
+    the last call to event_init, and is therefore not safe for multithreaded
+    use.  The replacement is event_base_loopbreak().
+
+  @see event_base_loopbreak(), event_init()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_loopbreak(void);
+
+/**
+  Schedule a one-time event to occur.
+
+  @deprecated This function is obsolete, and has been replaced by
+    event_base_once(). Its use is deprecated because it relies on the
+    "current" base configured by event_init().
+
+  @see event_base_once()
+ */
+EVENT2_EXPORT_SYMBOL
+int event_once(evutil_socket_t , short,
+    void (*)(evutil_socket_t, short, void *), void *, const struct timeval *);
+
+
+/**
+  Get the kernel event notification mechanism used by Libevent.
+
+  @deprecated This function is obsolete, and has been replaced by
+    event_base_get_method(). Its use is deprecated because it relies on the
+    "current" base configured by event_init().
+
+  @see event_base_get_method()
+ */
+EVENT2_EXPORT_SYMBOL
+const char *event_get_method(void);
+
+
+/**
+  Set the number of different event priorities.
+
+  @deprecated This function is deprecated because it is easily confused by
+    multiple calls to event_init(), and because it is not safe for
+    multithreaded use.  The replacement is event_base_priority_init().
+
+  @see event_base_priority_init()
+ */
+EVENT2_EXPORT_SYMBOL
+int	event_priority_init(int);
+
+/**
+  Prepare an event structure to be added.
+
+  @deprecated event_set() is not recommended for new code, because it requires
+     a subsequent call to event_base_set() to be safe under most circumstances.
+     Use event_assign() or event_new() instead.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_set(struct event *, evutil_socket_t, short, void (*)(evutil_socket_t, short, void *), void *);
+
+#define evtimer_set(ev, cb, arg)	event_set((ev), -1, 0, (cb), (arg))
+#define evsignal_set(ev, x, cb, arg)	\
+	event_set((ev), (x), EV_SIGNAL|EV_PERSIST, (cb), (arg))
+
+
+/**
+   @name timeout_* macros
+
+   @deprecated These macros are deprecated because their naming is inconsistent
+     with the rest of Libevent.  Use the evtimer_* macros instead.
+   @{
+ */
+#define timeout_add(ev, tv)		event_add((ev), (tv))
+#define timeout_set(ev, cb, arg)	event_set((ev), -1, 0, (cb), (arg))
+#define timeout_del(ev)			event_del(ev)
+#define timeout_pending(ev, tv)		event_pending((ev), EV_TIMEOUT, (tv))
+#define timeout_initialized(ev)		event_initialized(ev)
+/**@}*/
+
+/**
+   @name signal_* macros
+
+   @deprecated These macros are deprecated because their naming is inconsistent
+     with the rest of Libevent.  Use the evsignal_* macros instead.
+   @{
+ */
+#define signal_add(ev, tv)		event_add((ev), (tv))
+#define signal_set(ev, x, cb, arg)				\
+	event_set((ev), (x), EV_SIGNAL|EV_PERSIST, (cb), (arg))
+#define signal_del(ev)			event_del(ev)
+#define signal_pending(ev, tv)		event_pending((ev), EV_SIGNAL, (tv))
+#define signal_initialized(ev)		event_initialized(ev)
+/**@}*/
+
+#ifndef EVENT_FD
+/* These macros are obsolete; use event_get_fd and event_get_signal instead. */
+#define EVENT_FD(ev)		((int)event_get_fd(ev))
+#define EVENT_SIGNAL(ev)	event_get_signal(ev)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_COMPAT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/event_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/event_struct.h
new file mode 100644
index 000000000000..1c8b71b6b0df
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/event_struct.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_EVENT_STRUCT_H_INCLUDED_
+#define EVENT2_EVENT_STRUCT_H_INCLUDED_
+
+/** @file event2/event_struct.h
+
+  Structures used by event.h.  Using these structures directly WILL harm
+  forward compatibility: be careful.
+
+  No field declared in this file should be used directly in user code.  Except
+  for historical reasons, these fields would not be exposed at all.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/* For evkeyvalq */
+#include <event2/keyvalq_struct.h>
+
+#define EVLIST_TIMEOUT	    0x01
+#define EVLIST_INSERTED	    0x02
+#define EVLIST_SIGNAL	    0x04
+#define EVLIST_ACTIVE	    0x08
+#define EVLIST_INTERNAL	    0x10
+#define EVLIST_ACTIVE_LATER 0x20
+#define EVLIST_FINALIZING   0x40
+#define EVLIST_INIT	    0x80
+
+#define EVLIST_ALL          0xff
+
+/* Fix so that people don't have to run with <sys/queue.h> */
+#ifndef TAILQ_ENTRY
+#define EVENT_DEFINED_TQENTRY_
+#define TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+}
+#endif /* !TAILQ_ENTRY */
+
+#ifndef TAILQ_HEAD
+#define EVENT_DEFINED_TQHEAD_
+#define TAILQ_HEAD(name, type)			\
+struct name {					\
+	struct type *tqh_first;			\
+	struct type **tqh_last;			\
+}
+#endif
+
+/* Fix so that people don't have to run with <sys/queue.h> */
+#ifndef LIST_ENTRY
+#define EVENT_DEFINED_LISTENTRY_
+#define LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+#endif /* !LIST_ENTRY */
+
+#ifndef LIST_HEAD
+#define EVENT_DEFINED_LISTHEAD_
+#define LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;  /* first element */			\
+	}
+#endif /* !LIST_HEAD */
+
+struct event;
+
+struct event_callback {
+	TAILQ_ENTRY(event_callback) evcb_active_next;
+	short evcb_flags;
+	ev_uint8_t evcb_pri;	/* smaller numbers are higher priority */
+	ev_uint8_t evcb_closure;
+	/* allows us to adopt for different types of events */
+        union {
+		void (*evcb_callback)(evutil_socket_t, short, void *);
+		void (*evcb_selfcb)(struct event_callback *, void *);
+		void (*evcb_evfinalize)(struct event *, void *);
+		void (*evcb_cbfinalize)(struct event_callback *, void *);
+	} evcb_cb_union;
+	void *evcb_arg;
+};
+
+struct event_base;
+struct event {
+	struct event_callback ev_evcallback;
+
+	/* for managing timeouts */
+	union {
+		TAILQ_ENTRY(event) ev_next_with_common_timeout;
+		int min_heap_idx;
+	} ev_timeout_pos;
+	evutil_socket_t ev_fd;
+
+	struct event_base *ev_base;
+
+	union {
+		/* used for io events */
+		struct {
+			LIST_ENTRY (event) ev_io_next;
+			struct timeval ev_timeout;
+		} ev_io;
+
+		/* used by signal events */
+		struct {
+			LIST_ENTRY (event) ev_signal_next;
+			short ev_ncalls;
+			/* Allows deletes in callback */
+			short *ev_pncalls;
+		} ev_signal;
+	} ev_;
+
+	short ev_events;
+	short ev_res;		/* result passed to event callback */
+	struct timeval ev_timeout;
+};
+
+TAILQ_HEAD (event_list, event);
+
+#ifdef EVENT_DEFINED_TQENTRY_
+#undef TAILQ_ENTRY
+#endif
+
+#ifdef EVENT_DEFINED_TQHEAD_
+#undef TAILQ_HEAD
+#endif
+
+LIST_HEAD (event_dlist, event); 
+
+#ifdef EVENT_DEFINED_LISTENTRY_
+#undef LIST_ENTRY
+#endif
+
+#ifdef EVENT_DEFINED_LISTHEAD_
+#undef LIST_HEAD
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_STRUCT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/http.h b/extra/libevent/libevent-2.1.11-stable/include/event2/http.h
new file mode 100644
index 000000000000..2a41303ede0e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/http.h
@@ -0,0 +1,1192 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_HTTP_H_INCLUDED_
+#define EVENT2_HTTP_H_INCLUDED_
+
+/* For int types. */
+#include <event2/util.h>
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* In case we haven't included the right headers yet. */
+struct evbuffer;
+struct event_base;
+struct bufferevent;
+struct evhttp_connection;
+
+/** @file event2/http.h
+ *
+ * Basic support for HTTP serving.
+ *
+ * As Libevent is a library for dealing with event notification and most
+ * interesting applications are networked today, I have often found the
+ * need to write HTTP code.  The following prototypes and definitions provide
+ * an application with a minimal interface for making HTTP requests and for
+ * creating a very simple HTTP server.
+ */
+
+/* Response codes */
+#define HTTP_OK			200	/**< request completed ok */
+#define HTTP_NOCONTENT		204	/**< request does not have content */
+#define HTTP_MOVEPERM		301	/**< the uri moved permanently */
+#define HTTP_MOVETEMP		302	/**< the uri moved temporarily */
+#define HTTP_NOTMODIFIED	304	/**< page was not modified from last */
+#define HTTP_BADREQUEST		400	/**< invalid http request was made */
+#define HTTP_NOTFOUND		404	/**< could not find content for uri */
+#define HTTP_BADMETHOD		405 	/**< method not allowed for this uri */
+#define HTTP_ENTITYTOOLARGE	413	/**<  */
+#define HTTP_EXPECTATIONFAILED	417	/**< we can't handle this expectation */
+#define HTTP_INTERNAL           500     /**< internal error */
+#define HTTP_NOTIMPLEMENTED     501     /**< not implemented */
+#define HTTP_SERVUNAVAIL	503	/**< the server is not available */
+
+struct evhttp;
+struct evhttp_request;
+struct evkeyvalq;
+struct evhttp_bound_socket;
+struct evconnlistener;
+struct evdns_base;
+
+/**
+ * Create a new HTTP server.
+ *
+ * @param base (optional) the event base to receive the HTTP events
+ * @return a pointer to a newly initialized evhttp server structure or NULL
+ *   on error
+ * @see evhttp_free()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp *evhttp_new(struct event_base *base);
+
+/**
+ * Binds an HTTP server on the specified address and port.
+ *
+ * Can be called multiple times to bind the same http server
+ * to multiple different ports.
+ *
+ * @param http a pointer to an evhttp object
+ * @param address a string containing the IP address to listen(2) on
+ * @param port the port number to listen on
+ * @return 0 on success, -1 on failure.
+ * @see evhttp_accept_socket()
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_bind_socket(struct evhttp *http, const char *address, ev_uint16_t port);
+
+/**
+ * Like evhttp_bind_socket(), but returns a handle for referencing the socket.
+ *
+ * The returned pointer is not valid after \a http is freed.
+ *
+ * @param http a pointer to an evhttp object
+ * @param address a string containing the IP address to listen(2) on
+ * @param port the port number to listen on
+ * @return Handle for the socket on success, NULL on failure.
+ * @see evhttp_bind_socket(), evhttp_del_accept_socket()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_bound_socket *evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port);
+
+/**
+ * Makes an HTTP server accept connections on the specified socket.
+ *
+ * This may be useful to create a socket and then fork multiple instances
+ * of an http server, or when a socket has been communicated via file
+ * descriptor passing in situations where an http servers does not have
+ * permissions to bind to a low-numbered port.
+ *
+ * Can be called multiple times to have the http server listen to
+ * multiple different sockets.
+ *
+ * @param http a pointer to an evhttp object
+ * @param fd a socket fd that is ready for accepting connections
+ * @return 0 on success, -1 on failure.
+ * @see evhttp_bind_socket()
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_accept_socket(struct evhttp *http, evutil_socket_t fd);
+
+/**
+ * Like evhttp_accept_socket(), but returns a handle for referencing the socket.
+ *
+ * The returned pointer is not valid after \a http is freed.
+ *
+ * @param http a pointer to an evhttp object
+ * @param fd a socket fd that is ready for accepting connections
+ * @return Handle for the socket on success, NULL on failure.
+ * @see evhttp_accept_socket(), evhttp_del_accept_socket()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_bound_socket *evhttp_accept_socket_with_handle(struct evhttp *http, evutil_socket_t fd);
+
+/**
+ * The most low-level evhttp_bind/accept method: takes an evconnlistener, and
+ * returns an evhttp_bound_socket.  The listener will be freed when the bound
+ * socket is freed.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_bound_socket *evhttp_bind_listener(struct evhttp *http, struct evconnlistener *listener);
+
+/**
+ * Return the listener used to implement a bound socket.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evconnlistener *evhttp_bound_socket_get_listener(struct evhttp_bound_socket *bound);
+
+typedef void evhttp_bound_socket_foreach_fn(struct evhttp_bound_socket *, void *);
+/**
+ * Applies the function specified in the first argument to all
+ * evhttp_bound_sockets associated with "http". The user must not
+ * attempt to free or remove any connections, sockets or listeners
+ * in the callback "function".
+ *
+ * @param http pointer to an evhttp object
+ * @param function function to apply to every bound socket
+ * @param argument pointer value passed to function for every socket iterated
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_foreach_bound_socket(struct evhttp *http, evhttp_bound_socket_foreach_fn *function, void *argument);
+
+/**
+ * Makes an HTTP server stop accepting connections on the specified socket
+ *
+ * This may be useful when a socket has been sent via file descriptor passing
+ * and is no longer needed by the current process.
+ *
+ * If you created this bound socket with evhttp_bind_socket_with_handle or
+ * evhttp_accept_socket_with_handle, this function closes the fd you provided.
+ * If you created this bound socket with evhttp_bind_listener, this function
+ * frees the listener you provided.
+ *
+ * \a bound_socket is an invalid pointer after this call returns.
+ *
+ * @param http a pointer to an evhttp object
+ * @param bound_socket a handle returned by evhttp_{bind,accept}_socket_with_handle
+ * @see evhttp_bind_socket_with_handle(), evhttp_accept_socket_with_handle()
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_del_accept_socket(struct evhttp *http, struct evhttp_bound_socket *bound_socket);
+
+/**
+ * Get the raw file descriptor referenced by an evhttp_bound_socket.
+ *
+ * @param bound_socket a handle returned by evhttp_{bind,accept}_socket_with_handle
+ * @return the file descriptor used by the bound socket
+ * @see evhttp_bind_socket_with_handle(), evhttp_accept_socket_with_handle()
+ */
+EVENT2_EXPORT_SYMBOL
+evutil_socket_t evhttp_bound_socket_get_fd(struct evhttp_bound_socket *bound_socket);
+
+/**
+ * Free the previously created HTTP server.
+ *
+ * Works only if no requests are currently being served.
+ *
+ * @param http the evhttp server object to be freed
+ * @see evhttp_start()
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_free(struct evhttp* http);
+
+/** XXX Document. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_max_headers_size(struct evhttp* http, ev_ssize_t max_headers_size);
+/** XXX Document. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_max_body_size(struct evhttp* http, ev_ssize_t max_body_size);
+
+/**
+  Set the value to use for the Content-Type header when none was provided. If
+  the content type string is NULL, the Content-Type header will not be
+  automatically added.
+
+  @param http the http server on which to set the default content type
+  @param content_type the value for the Content-Type header
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_default_content_type(struct evhttp *http,
+	const char *content_type);
+
+/**
+  Sets the what HTTP methods are supported in requests accepted by this
+  server, and passed to user callbacks.
+
+  If not supported they will generate a "405 Method not allowed" response.
+
+  By default this includes the following methods: GET, POST, HEAD, PUT, DELETE
+
+  @param http the http server on which to set the methods
+  @param methods bit mask constructed from evhttp_cmd_type values
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_allowed_methods(struct evhttp* http, ev_uint16_t methods);
+
+/**
+   Set a callback for a specified URI
+
+   @param http the http sever on which to set the callback
+   @param path the path for which to invoke the callback
+   @param cb the callback function that gets invoked on requesting path
+   @param cb_arg an additional context argument for the callback
+   @return 0 on success, -1 if the callback existed already, -2 on failure
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_set_cb(struct evhttp *http, const char *path,
+    void (*cb)(struct evhttp_request *, void *), void *cb_arg);
+
+/** Removes the callback for a specified URI */
+EVENT2_EXPORT_SYMBOL
+int evhttp_del_cb(struct evhttp *, const char *);
+
+/**
+    Set a callback for all requests that are not caught by specific callbacks
+
+    Invokes the specified callback for all requests that do not match any of
+    the previously specified request paths.  This is catchall for requests not
+    specifically configured with evhttp_set_cb().
+
+    @param http the evhttp server object for which to set the callback
+    @param cb the callback to invoke for any unmatched requests
+    @param arg an context argument for the callback
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_gencb(struct evhttp *http,
+    void (*cb)(struct evhttp_request *, void *), void *arg);
+
+/**
+   Set a callback used to create new bufferevents for connections
+   to a given evhttp object.
+
+   You can use this to override the default bufferevent type -- for example,
+   to make this evhttp object use SSL bufferevents rather than unencrypted
+   ones.
+
+   New bufferevents must be allocated with no fd set on them.
+
+   @param http the evhttp server object for which to set the callback
+   @param cb the callback to invoke for incoming connections
+   @param arg an context argument for the callback
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_bevcb(struct evhttp *http,
+    struct bufferevent *(*cb)(struct event_base *, void *), void *arg);
+
+/**
+   Adds a virtual host to the http server.
+
+   A virtual host is a newly initialized evhttp object that has request
+   callbacks set on it via evhttp_set_cb() or evhttp_set_gencb().  It
+   most not have any listing sockets associated with it.
+
+   If the virtual host has not been removed by the time that evhttp_free()
+   is called on the main http server, it will be automatically freed, too.
+
+   It is possible to have hierarchical vhosts.  For example: A vhost
+   with the pattern *.example.com may have other vhosts with patterns
+   foo.example.com and bar.example.com associated with it.
+
+   @param http the evhttp object to which to add a virtual host
+   @param pattern the glob pattern against which the hostname is matched.
+     The match is case insensitive and follows otherwise regular shell
+     matching.
+   @param vhost the virtual host to add the regular http server.
+   @return 0 on success, -1 on failure
+   @see evhttp_remove_virtual_host()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_add_virtual_host(struct evhttp* http, const char *pattern,
+    struct evhttp* vhost);
+
+/**
+   Removes a virtual host from the http server.
+
+   @param http the evhttp object from which to remove the virtual host
+   @param vhost the virtual host to remove from the regular http server.
+   @return 0 on success, -1 on failure
+   @see evhttp_add_virtual_host()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_remove_virtual_host(struct evhttp* http, struct evhttp* vhost);
+
+/**
+   Add a server alias to an http object. The http object can be a virtual
+   host or the main server.
+
+   @param http the evhttp object
+   @param alias the alias to add
+   @see evhttp_add_remove_alias()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_add_server_alias(struct evhttp *http, const char *alias);
+
+/**
+   Remove a server alias from an http object.
+
+   @param http the evhttp object
+   @param alias the alias to remove
+   @see evhttp_add_server_alias()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_remove_server_alias(struct evhttp *http, const char *alias);
+
+/**
+ * Set the timeout for an HTTP request.
+ *
+ * @param http an evhttp object
+ * @param timeout_in_secs the timeout, in seconds
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_timeout(struct evhttp *http, int timeout_in_secs);
+
+/**
+ * Set the timeout for an HTTP request.
+ *
+ * @param http an evhttp object
+ * @param tv the timeout, or NULL
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_set_timeout_tv(struct evhttp *http, const struct timeval* tv);
+
+/* Read all the clients body, and only after this respond with an error if the
+ * clients body exceed max_body_size */
+#define EVHTTP_SERVER_LINGERING_CLOSE	0x0001
+/**
+ * Set connection flags for HTTP server.
+ *
+ * @see EVHTTP_SERVER_*
+ * @return 0 on success, otherwise non zero (for example if flag doesn't
+ * supported).
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_set_flags(struct evhttp *http, int flags);
+
+/* Request/Response functionality */
+
+/**
+ * Send an HTML error message to the client.
+ *
+ * @param req a request object
+ * @param error the HTTP error code
+ * @param reason a brief explanation of the error.  If this is NULL, we'll
+ *    just use the standard meaning of the error code.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_error(struct evhttp_request *req, int error,
+    const char *reason);
+
+/**
+ * Send an HTML reply to the client.
+ *
+ * The body of the reply consists of the data in databuf.  After calling
+ * evhttp_send_reply() databuf will be empty, but the buffer is still
+ * owned by the caller and needs to be deallocated by the caller if
+ * necessary.
+ *
+ * @param req a request object
+ * @param code the HTTP response code to send
+ * @param reason a brief message to send with the response code
+ * @param databuf the body of the response
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_reply(struct evhttp_request *req, int code,
+    const char *reason, struct evbuffer *databuf);
+
+/* Low-level response interface, for streaming/chunked replies */
+
+/**
+   Initiate a reply that uses Transfer-Encoding chunked.
+
+   This allows the caller to stream the reply back to the client and is
+   useful when either not all of the reply data is immediately available
+   or when sending very large replies.
+
+   The caller needs to supply data chunks with evhttp_send_reply_chunk()
+   and complete the reply by calling evhttp_send_reply_end().
+
+   @param req a request object
+   @param code the HTTP response code to send
+   @param reason a brief message to send with the response code
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_reply_start(struct evhttp_request *req, int code,
+    const char *reason);
+
+/**
+   Send another data chunk as part of an ongoing chunked reply.
+
+   The reply chunk consists of the data in databuf.  After calling
+   evhttp_send_reply_chunk() databuf will be empty, but the buffer is
+   still owned by the caller and needs to be deallocated by the caller
+   if necessary.
+
+   @param req a request object
+   @param databuf the data chunk to send as part of the reply.
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_reply_chunk(struct evhttp_request *req,
+    struct evbuffer *databuf);
+
+/**
+   Send another data chunk as part of an ongoing chunked reply.
+
+   The reply chunk consists of the data in databuf.  After calling
+   evhttp_send_reply_chunk() databuf will be empty, but the buffer is
+   still owned by the caller and needs to be deallocated by the caller
+   if necessary.
+
+   @param req a request object
+   @param databuf the data chunk to send as part of the reply.
+   @param cb callback funcion
+   @param call back's argument.
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_reply_chunk_with_cb(struct evhttp_request *, struct evbuffer *,
+    void (*cb)(struct evhttp_connection *, void *), void *arg);
+
+/**
+   Complete a chunked reply, freeing the request as appropriate.
+
+   @param req a request object
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_send_reply_end(struct evhttp_request *req);
+
+/*
+ * Interfaces for making requests
+ */
+
+/** The different request types supported by evhttp.  These are as specified
+ * in RFC2616, except for PATCH which is specified by RFC5789.
+ *
+ * By default, only some of these methods are accepted and passed to user
+ * callbacks; use evhttp_set_allowed_methods() to change which methods
+ * are allowed.
+ */
+enum evhttp_cmd_type {
+	EVHTTP_REQ_GET     = 1 << 0,
+	EVHTTP_REQ_POST    = 1 << 1,
+	EVHTTP_REQ_HEAD    = 1 << 2,
+	EVHTTP_REQ_PUT     = 1 << 3,
+	EVHTTP_REQ_DELETE  = 1 << 4,
+	EVHTTP_REQ_OPTIONS = 1 << 5,
+	EVHTTP_REQ_TRACE   = 1 << 6,
+	EVHTTP_REQ_CONNECT = 1 << 7,
+	EVHTTP_REQ_PATCH   = 1 << 8
+};
+
+/** a request object can represent either a request or a reply */
+enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE };
+
+/**
+ * Create and return a connection object that can be used to for making HTTP
+ * requests.  The connection object tries to resolve address and establish the
+ * connection when it is given an http request object.
+ *
+ * @param base the event_base to use for handling the connection
+ * @param dnsbase the dns_base to use for resolving host names; if not
+ *     specified host name resolution will block.
+ * @param bev a bufferevent to use for connecting to the server; if NULL, a
+ *     socket-based bufferevent will be created.  This buffrevent will be freed
+ *     when the connection closes.  It must have no fd set on it.
+ * @param address the address to which to connect
+ * @param port the port to connect to
+ * @return an evhttp_connection object that can be used for making requests or
+ *   NULL on error
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_connection *evhttp_connection_base_bufferevent_new(
+	struct event_base *base, struct evdns_base *dnsbase, struct bufferevent* bev, const char *address, ev_uint16_t port);
+
+/**
+ * Return the bufferevent that an evhttp_connection is using.
+ */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent* evhttp_connection_get_bufferevent(struct evhttp_connection *evcon);
+
+/**
+ * Return the HTTP server associated with this connection, or NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp *evhttp_connection_get_server(struct evhttp_connection *evcon);
+
+/**
+ * Creates a new request object that needs to be filled in with the request
+ * parameters.  The callback is executed when the request completed or an
+ * error occurred.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_request *evhttp_request_new(
+	void (*cb)(struct evhttp_request *, void *), void *arg);
+
+/**
+ * Enable delivery of chunks to requestor.
+ * @param cb will be called after every read of data with the same argument
+ *           as the completion callback. Will never be called on an empty
+ *           response. May drain the input buffer; it will be drained
+ *           automatically on return.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_set_chunked_cb(struct evhttp_request *,
+    void (*cb)(struct evhttp_request *, void *));
+
+/**
+ * Register callback for additional parsing of request headers.
+ * @param cb will be called after receiving and parsing the full header.
+ * It allows analyzing the header and possibly closing the connection
+ * by returning a value < 0.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_set_header_cb(struct evhttp_request *,
+    int (*cb)(struct evhttp_request *, void *));
+
+/**
+ * The different error types supported by evhttp
+ *
+ * @see evhttp_request_set_error_cb()
+ */
+enum evhttp_request_error {
+  /**
+   * Timeout reached, also @see evhttp_connection_set_timeout()
+   */
+  EVREQ_HTTP_TIMEOUT,
+  /**
+   * EOF reached
+   */
+  EVREQ_HTTP_EOF,
+  /**
+   * Error while reading header, or invalid header
+   */
+  EVREQ_HTTP_INVALID_HEADER,
+  /**
+   * Error encountered while reading or writing
+   */
+  EVREQ_HTTP_BUFFER_ERROR,
+  /**
+   * The evhttp_cancel_request() called on this request.
+   */
+  EVREQ_HTTP_REQUEST_CANCEL,
+  /**
+   * Body is greater then evhttp_connection_set_max_body_size()
+   */
+  EVREQ_HTTP_DATA_TOO_LONG
+};
+/**
+ * Set a callback for errors
+ * @see evhttp_request_error for error types.
+ *
+ * On error, both the error callback and the regular callback will be called,
+ * error callback is called before the regular callback.
+ **/
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_set_error_cb(struct evhttp_request *,
+    void (*)(enum evhttp_request_error, void *));
+
+/**
+ * Set a callback to be called on request completion of evhttp_send_* function.
+ *
+ * The callback function will be called on the completion of the request after
+ * the output data has been written and before the evhttp_request object
+ * is destroyed. This can be useful for tracking resources associated with a
+ * request (ex: timing metrics).
+ *
+ * @param req a request object
+ * @param cb callback function that will be called on request completion
+ * @param cb_arg an additional context argument for the callback
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_set_on_complete_cb(struct evhttp_request *req,
+    void (*cb)(struct evhttp_request *, void *), void *cb_arg);
+
+/** Frees the request object and removes associated events. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_free(struct evhttp_request *req);
+
+/**
+ * Create and return a connection object that can be used to for making HTTP
+ * requests.  The connection object tries to resolve address and establish the
+ * connection when it is given an http request object.
+ *
+ * @param base the event_base to use for handling the connection
+ * @param dnsbase the dns_base to use for resolving host names; if not
+ *     specified host name resolution will block.
+ * @param address the address to which to connect
+ * @param port the port to connect to
+ * @return an evhttp_connection object that can be used for making requests or
+ *   NULL on error
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_connection *evhttp_connection_base_new(
+	struct event_base *base, struct evdns_base *dnsbase,
+	const char *address, ev_uint16_t port);
+
+/**
+ * Set family hint for DNS requests.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_family(struct evhttp_connection *evcon,
+	int family);
+
+/* reuse connection address on retry */
+#define EVHTTP_CON_REUSE_CONNECTED_ADDR	0x0008
+/* Try to read error, since server may already send and close
+ * connection, but if at that time we have some data to send then we
+ * can send get EPIPE and fail, while we can read that HTTP error. */
+#define EVHTTP_CON_READ_ON_WRITE_ERROR	0x0010
+/* @see EVHTTP_SERVER_LINGERING_CLOSE */
+#define EVHTTP_CON_LINGERING_CLOSE	0x0020
+/* Padding for public flags, @see EVHTTP_CON_* in http-internal.h */
+#define EVHTTP_CON_PUBLIC_FLAGS_END	0x100000
+/**
+ * Set connection flags.
+ *
+ * @see EVHTTP_CON_*
+ * @return 0 on success, otherwise non zero (for example if flag doesn't
+ * supported).
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_connection_set_flags(struct evhttp_connection *evcon,
+	int flags);
+
+/** Takes ownership of the request object
+ *
+ * Can be used in a request callback to keep onto the request until
+ * evhttp_request_free() is explicitly called by the user.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_request_own(struct evhttp_request *req);
+
+/** Returns 1 if the request is owned by the user */
+EVENT2_EXPORT_SYMBOL
+int evhttp_request_is_owned(struct evhttp_request *req);
+
+/**
+ * Returns the connection object associated with the request or NULL
+ *
+ * The user needs to either free the request explicitly or call
+ * evhttp_send_reply_end().
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_connection *evhttp_request_get_connection(struct evhttp_request *req);
+
+/**
+ * Returns the underlying event_base for this connection
+ */
+EVENT2_EXPORT_SYMBOL
+struct event_base *evhttp_connection_get_base(struct evhttp_connection *req);
+
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_max_headers_size(struct evhttp_connection *evcon,
+    ev_ssize_t new_max_headers_size);
+
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_max_body_size(struct evhttp_connection* evcon,
+    ev_ssize_t new_max_body_size);
+
+/** Frees an http connection */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_free(struct evhttp_connection *evcon);
+
+/** Disowns a given connection object
+ *
+ * Can be used to tell libevent to free the connection object after
+ * the last request has completed or failed.
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_free_on_completion(struct evhttp_connection *evcon);
+
+/** sets the ip address from which http connections are made */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_local_address(struct evhttp_connection *evcon,
+    const char *address);
+
+/** sets the local port from which http connections are made */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_local_port(struct evhttp_connection *evcon,
+    ev_uint16_t port);
+
+/** Sets the timeout in seconds for events related to this connection */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_timeout(struct evhttp_connection *evcon,
+    int timeout_in_secs);
+
+/** Sets the timeout for events related to this connection.  Takes a struct
+ * timeval. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_timeout_tv(struct evhttp_connection *evcon,
+    const struct timeval *tv);
+
+/** Sets the delay before retrying requests on this connection. This is only
+ * used if evhttp_connection_set_retries is used to make the number of retries
+ * at least one. Each retry after the first is twice as long as the one before
+ * it. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_initial_retry_tv(struct evhttp_connection *evcon,
+    const struct timeval *tv);
+
+/** Sets the retry limit for this connection - -1 repeats indefinitely */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_retries(struct evhttp_connection *evcon,
+    int retry_max);
+
+/** Set a callback for connection close. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_closecb(struct evhttp_connection *evcon,
+    void (*)(struct evhttp_connection *, void *), void *);
+
+/** Get the remote address and port associated with this connection. */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_get_peer(struct evhttp_connection *evcon,
+    char **address, ev_uint16_t *port);
+
+/** Get the remote address associated with this connection.
+ * extracted from getpeername() OR from nameserver.
+ *
+ * @return NULL if getpeername() return non success,
+ * or connection is not connected,
+ * otherwise it return pointer to struct sockaddr_storage */
+EVENT2_EXPORT_SYMBOL
+const struct sockaddr*
+evhttp_connection_get_addr(struct evhttp_connection *evcon);
+
+/**
+    Make an HTTP request over the specified connection.
+
+    The connection gets ownership of the request.  On failure, the
+    request object is no longer valid as it has been freed.
+
+    @param evcon the evhttp_connection object over which to send the request
+    @param req the previously created and configured request object
+    @param type the request type EVHTTP_REQ_GET, EVHTTP_REQ_POST, etc.
+    @param uri the URI associated with the request
+    @return 0 on success, -1 on failure
+    @see evhttp_cancel_request()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_make_request(struct evhttp_connection *evcon,
+    struct evhttp_request *req,
+    enum evhttp_cmd_type type, const char *uri);
+
+/**
+   Cancels a pending HTTP request.
+
+   Cancels an ongoing HTTP request.  The callback associated with this request
+   is not executed and the request object is freed.  If the request is
+   currently being processed, e.g. it is ongoing, the corresponding
+   evhttp_connection object is going to get reset.
+
+   A request cannot be canceled if its callback has executed already. A request
+   may be canceled reentrantly from its chunked callback.
+
+   @param req the evhttp_request to cancel; req becomes invalid after this call.
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_cancel_request(struct evhttp_request *req);
+
+/**
+ * A structure to hold a parsed URI or Relative-Ref conforming to RFC3986.
+ */
+struct evhttp_uri;
+
+/** Returns the request URI */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_request_get_uri(const struct evhttp_request *req);
+/** Returns the request URI (parsed) */
+EVENT2_EXPORT_SYMBOL
+const struct evhttp_uri *evhttp_request_get_evhttp_uri(const struct evhttp_request *req);
+/** Returns the request command */
+EVENT2_EXPORT_SYMBOL
+enum evhttp_cmd_type evhttp_request_get_command(const struct evhttp_request *req);
+
+EVENT2_EXPORT_SYMBOL
+int evhttp_request_get_response_code(const struct evhttp_request *req);
+EVENT2_EXPORT_SYMBOL
+const char * evhttp_request_get_response_code_line(const struct evhttp_request *req);
+
+/** Returns the input headers */
+EVENT2_EXPORT_SYMBOL
+struct evkeyvalq *evhttp_request_get_input_headers(struct evhttp_request *req);
+/** Returns the output headers */
+EVENT2_EXPORT_SYMBOL
+struct evkeyvalq *evhttp_request_get_output_headers(struct evhttp_request *req);
+/** Returns the input buffer */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *evhttp_request_get_input_buffer(struct evhttp_request *req);
+/** Returns the output buffer */
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *evhttp_request_get_output_buffer(struct evhttp_request *req);
+/** Returns the host associated with the request. If a client sends an absolute
+    URI, the host part of that is preferred. Otherwise, the input headers are
+    searched for a Host: header. NULL is returned if no absolute URI or Host:
+    header is provided. */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_request_get_host(struct evhttp_request *req);
+
+/* Interfaces for dealing with HTTP headers */
+
+/**
+   Finds the value belonging to a header.
+
+   @param headers the evkeyvalq object in which to find the header
+   @param key the name of the header to find
+   @returns a pointer to the value for the header or NULL if the header
+     could not be found.
+   @see evhttp_add_header(), evhttp_remove_header()
+*/
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_find_header(const struct evkeyvalq *headers,
+    const char *key);
+
+/**
+   Removes a header from a list of existing headers.
+
+   @param headers the evkeyvalq object from which to remove a header
+   @param key the name of the header to remove
+   @returns 0 if the header was removed, -1  otherwise.
+   @see evhttp_find_header(), evhttp_add_header()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_remove_header(struct evkeyvalq *headers, const char *key);
+
+/**
+   Adds a header to a list of existing headers.
+
+   @param headers the evkeyvalq object to which to add a header
+   @param key the name of the header
+   @param value the value belonging to the header
+   @returns 0 on success, -1  otherwise.
+   @see evhttp_find_header(), evhttp_clear_headers()
+*/
+EVENT2_EXPORT_SYMBOL
+int evhttp_add_header(struct evkeyvalq *headers, const char *key, const char *value);
+
+/**
+   Removes all headers from the header list.
+
+   @param headers the evkeyvalq object from which to remove all headers
+*/
+EVENT2_EXPORT_SYMBOL
+void evhttp_clear_headers(struct evkeyvalq *headers);
+
+/* Miscellaneous utility functions */
+
+
+/**
+   Helper function to encode a string for inclusion in a URI.  All
+   characters are replaced by their hex-escaped (%22) equivalents,
+   except for characters explicitly unreserved by RFC3986 -- that is,
+   ASCII alphanumeric characters, hyphen, dot, underscore, and tilde.
+
+   The returned string must be freed by the caller.
+
+   @param str an unencoded string
+   @return a newly allocated URI-encoded string or NULL on failure
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_encode_uri(const char *str);
+
+/**
+   As evhttp_encode_uri, but if 'size' is nonnegative, treat the string
+   as being 'size' bytes long.  This allows you to encode strings that
+   may contain 0-valued bytes.
+
+   The returned string must be freed by the caller.
+
+   @param str an unencoded string
+   @param size the length of the string to encode, or -1 if the string
+      is NUL-terminated
+   @param space_to_plus if true, space characters in 'str' are encoded
+      as +, not %20.
+   @return a newly allocate URI-encoded string, or NULL on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_uriencode(const char *str, ev_ssize_t size, int space_to_plus);
+
+/**
+  Helper function to sort of decode a URI-encoded string.  Unlike
+  evhttp_uridecode, it decodes all plus characters that appear
+  _after_ the first question mark character, but no plusses that occur
+  before.  This is not a good way to decode URIs in whole or in part.
+
+  The returned string must be freed by the caller
+
+  @deprecated  This function is deprecated; you probably want to use
+     evhttp_uridecode instead.
+
+  @param uri an encoded URI
+  @return a newly allocated unencoded URI or NULL on failure
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_decode_uri(const char *uri);
+
+/**
+  Helper function to decode a URI-escaped string or HTTP parameter.
+
+  If 'decode_plus' is 1, then we decode the string as an HTTP parameter
+  value, and convert all plus ('+') characters to spaces.  If
+  'decode_plus' is 0, we leave all plus characters unchanged.
+
+  The returned string must be freed by the caller.
+
+  @param uri a URI-encode encoded URI
+  @param decode_plus determines whether we convert '+' to space.
+  @param size_out if size_out is not NULL, *size_out is set to the size of the
+     returned string
+  @return a newly allocated unencoded URI or NULL on failure
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_uridecode(const char *uri, int decode_plus,
+    size_t *size_out);
+
+/**
+   Helper function to parse out arguments in a query.
+
+   Parsing a URI like
+
+      http://foo.com/?q=test&s=some+thing
+
+   will result in two entries in the key value queue.
+
+   The first entry is: key="q", value="test"
+   The second entry is: key="s", value="some thing"
+
+   @deprecated This function is deprecated as of Libevent 2.0.9.  Use
+     evhttp_uri_parse and evhttp_parse_query_str instead.
+
+   @param uri the request URI
+   @param headers the head of the evkeyval queue
+   @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_parse_query(const char *uri, struct evkeyvalq *headers);
+
+/**
+   Helper function to parse out arguments from the query portion of an
+   HTTP URI.
+
+   Parsing a query string like
+
+     q=test&s=some+thing
+
+   will result in two entries in the key value queue.
+
+   The first entry is: key="q", value="test"
+   The second entry is: key="s", value="some thing"
+
+   @param query_parse the query portion of the URI
+   @param headers the head of the evkeyval queue
+   @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evhttp_parse_query_str(const char *uri, struct evkeyvalq *headers);
+
+/**
+ * Escape HTML character entities in a string.
+ *
+ * Replaces <, >, ", ' and & with &lt;, &gt;, &quot;,
+ * &#039; and &amp; correspondingly.
+ *
+ * The returned string needs to be freed by the caller.
+ *
+ * @param html an unescaped HTML string
+ * @return an escaped HTML string or NULL on error
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_htmlescape(const char *html);
+
+/**
+ * Return a new empty evhttp_uri with no fields set.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_uri *evhttp_uri_new(void);
+
+/**
+ * Changes the flags set on a given URI.  See EVHTTP_URI_* for
+ * a list of flags.
+ **/
+EVENT2_EXPORT_SYMBOL
+void evhttp_uri_set_flags(struct evhttp_uri *uri, unsigned flags);
+
+/** Return the scheme of an evhttp_uri, or NULL if there is no scheme has
+ * been set and the evhttp_uri contains a Relative-Ref. */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_scheme(const struct evhttp_uri *uri);
+/**
+ * Return the userinfo part of an evhttp_uri, or NULL if it has no userinfo
+ * set.
+ */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_userinfo(const struct evhttp_uri *uri);
+/**
+ * Return the host part of an evhttp_uri, or NULL if it has no host set.
+ * The host may either be a regular hostname (conforming to the RFC 3986
+ * "regname" production), or an IPv4 address, or the empty string, or a
+ * bracketed IPv6 address, or a bracketed 'IP-Future' address.
+ *
+ * Note that having a NULL host means that the URI has no authority
+ * section, but having an empty-string host means that the URI has an
+ * authority section with no host part.  For example,
+ * "mailto:user@example.com" has a host of NULL, but "file:///etc/motd"
+ * has a host of "".
+ */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_host(const struct evhttp_uri *uri);
+/** Return the port part of an evhttp_uri, or -1 if there is no port set. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_get_port(const struct evhttp_uri *uri);
+/** Return the path part of an evhttp_uri, or NULL if it has no path set */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_path(const struct evhttp_uri *uri);
+/** Return the query part of an evhttp_uri (excluding the leading "?"), or
+ * NULL if it has no query set */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_query(const struct evhttp_uri *uri);
+/** Return the fragment part of an evhttp_uri (excluding the leading "#"),
+ * or NULL if it has no fragment set */
+EVENT2_EXPORT_SYMBOL
+const char *evhttp_uri_get_fragment(const struct evhttp_uri *uri);
+
+/** Set the scheme of an evhttp_uri, or clear the scheme if scheme==NULL.
+ * Returns 0 on success, -1 if scheme is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_scheme(struct evhttp_uri *uri, const char *scheme);
+/** Set the userinfo of an evhttp_uri, or clear the userinfo if userinfo==NULL.
+ * Returns 0 on success, -1 if userinfo is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_userinfo(struct evhttp_uri *uri, const char *userinfo);
+/** Set the host of an evhttp_uri, or clear the host if host==NULL.
+ * Returns 0 on success, -1 if host is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_host(struct evhttp_uri *uri, const char *host);
+/** Set the port of an evhttp_uri, or clear the port if port==-1.
+ * Returns 0 on success, -1 if port is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_port(struct evhttp_uri *uri, int port);
+/** Set the path of an evhttp_uri, or clear the path if path==NULL.
+ * Returns 0 on success, -1 if path is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_path(struct evhttp_uri *uri, const char *path);
+/** Set the query of an evhttp_uri, or clear the query if query==NULL.
+ * The query should not include a leading "?".
+ * Returns 0 on success, -1 if query is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_query(struct evhttp_uri *uri, const char *query);
+/** Set the fragment of an evhttp_uri, or clear the fragment if fragment==NULL.
+ * The fragment should not include a leading "#".
+ * Returns 0 on success, -1 if fragment is not well-formed. */
+EVENT2_EXPORT_SYMBOL
+int evhttp_uri_set_fragment(struct evhttp_uri *uri, const char *fragment);
+
+/**
+ * Helper function to parse a URI-Reference as specified by RFC3986.
+ *
+ * This function matches the URI-Reference production from RFC3986,
+ * which includes both URIs like
+ *
+ *    scheme://[[userinfo]@]foo.com[:port]]/[path][?query][#fragment]
+ *
+ *  and relative-refs like
+ *
+ *    [path][?query][#fragment]
+ *
+ * Any optional elements portions not present in the original URI are
+ * left set to NULL in the resulting evhttp_uri.  If no port is
+ * specified, the port is set to -1.
+ *
+ * Note that no decoding is performed on percent-escaped characters in
+ * the string; if you want to parse them, use evhttp_uridecode or
+ * evhttp_parse_query_str as appropriate.
+ *
+ * Note also that most URI schemes will have additional constraints that
+ * this function does not know about, and cannot check.  For example,
+ * mailto://www.example.com/cgi-bin/fortune.pl is not a reasonable
+ * mailto url, http://www.example.com:99999/ is not a reasonable HTTP
+ * URL, and ftp:username@example.com is not a reasonable FTP URL.
+ * Nevertheless, all of these URLs conform to RFC3986, and this function
+ * accepts all of them as valid.
+ *
+ * @param source_uri the request URI
+ * @param flags Zero or more EVHTTP_URI_* flags to affect the behavior
+ *              of the parser.
+ * @return uri container to hold parsed data, or NULL if there is error
+ * @see evhttp_uri_free()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_uri *evhttp_uri_parse_with_flags(const char *source_uri,
+    unsigned flags);
+
+/** Tolerate URIs that do not conform to RFC3986.
+ *
+ * Unfortunately, some HTTP clients generate URIs that, according to RFC3986,
+ * are not conformant URIs.  If you need to support these URIs, you can
+ * do so by passing this flag to evhttp_uri_parse_with_flags.
+ *
+ * Currently, these changes are:
+ * <ul>
+ *   <li> Nonconformant URIs are allowed to contain otherwise unreasonable
+ *        characters in their path, query, and fragment components.
+ * </ul>
+ */
+#define EVHTTP_URI_NONCONFORMANT 0x01
+
+/** Alias for evhttp_uri_parse_with_flags(source_uri, 0) */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_uri *evhttp_uri_parse(const char *source_uri);
+
+/**
+ * Free all memory allocated for a parsed uri.  Only use this for URIs
+ * generated by evhttp_uri_parse.
+ *
+ * @param uri container with parsed data
+ * @see evhttp_uri_parse()
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_uri_free(struct evhttp_uri *uri);
+
+/**
+ * Join together the uri parts from parsed data to form a URI-Reference.
+ *
+ * Note that no escaping of reserved characters is done on the members
+ * of the evhttp_uri, so the generated string might not be a valid URI
+ * unless the members of evhttp_uri are themselves valid.
+ *
+ * @param uri container with parsed data
+ * @param buf destination buffer
+ * @param limit destination buffer size
+ * @return an joined uri as string or NULL on error
+ * @see evhttp_uri_parse()
+ */
+EVENT2_EXPORT_SYMBOL
+char *evhttp_uri_join(struct evhttp_uri *uri, char *buf, size_t limit);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_HTTP_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/http_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/http_compat.h
new file mode 100644
index 000000000000..794a581083e4
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/http_compat.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_HTTP_COMPAT_H_INCLUDED_
+#define EVENT2_HTTP_COMPAT_H_INCLUDED_
+
+/** @file event2/http_compat.h
+
+  Potentially non-threadsafe versions of the functions in http.h: provided
+  only for backwards compatibility.
+
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/**
+ * Start an HTTP server on the specified address and port
+ *
+ * @deprecated It does not allow an event base to be specified
+ *
+ * @param address the address to which the HTTP server should be bound
+ * @param port the port number on which the HTTP server should listen
+ * @return a pointer to a newly initialized evhttp server structure
+ *   or NULL on error
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp *evhttp_start(const char *address, ev_uint16_t port);
+
+/**
+ * A connection object that can be used to for making HTTP requests.  The
+ * connection object tries to establish the connection when it is given an
+ * http request object.
+ *
+ * @deprecated It does not allow an event base to be specified
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_connection *evhttp_connection_new(
+	const char *address, ev_uint16_t port);
+
+/**
+ * Associates an event base with the connection - can only be called
+ * on a freshly created connection object that has not been used yet.
+ *
+ * @deprecated XXXX Why?
+ */
+EVENT2_EXPORT_SYMBOL
+void evhttp_connection_set_base(struct evhttp_connection *evcon,
+    struct event_base *base);
+
+
+/** Returns the request URI */
+#define evhttp_request_uri evhttp_request_get_uri
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_COMPAT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/http_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/http_struct.h
new file mode 100644
index 000000000000..4bf5b1ff60f5
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/http_struct.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_HTTP_STRUCT_H_INCLUDED_
+#define EVENT2_HTTP_STRUCT_H_INCLUDED_
+
+/** @file event2/http_struct.h
+
+  Data structures for http.  Using these structures may hurt forward
+  compatibility with later versions of Libevent: be careful!
+
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+/**
+ * the request structure that a server receives.
+ * WARNING: expect this structure to change.  I will try to provide
+ * reasonable accessors.
+ */
+struct evhttp_request {
+#if defined(TAILQ_ENTRY)
+	TAILQ_ENTRY(evhttp_request) next;
+#else
+struct {
+	struct evhttp_request *tqe_next;
+	struct evhttp_request **tqe_prev;
+}       next;
+#endif
+
+	/* the connection object that this request belongs to */
+	struct evhttp_connection *evcon;
+	int flags;
+/** The request obj owns the evhttp connection and needs to free it */
+#define EVHTTP_REQ_OWN_CONNECTION	0x0001
+/** Request was made via a proxy */
+#define EVHTTP_PROXY_REQUEST		0x0002
+/** The request object is owned by the user; the user must free it */
+#define EVHTTP_USER_OWNED		0x0004
+/** The request will be used again upstack; freeing must be deferred */
+#define EVHTTP_REQ_DEFER_FREE		0x0008
+/** The request should be freed upstack */
+#define EVHTTP_REQ_NEEDS_FREE		0x0010
+
+	struct evkeyvalq *input_headers;
+	struct evkeyvalq *output_headers;
+
+	/* address of the remote host and the port connection came from */
+	char *remote_host;
+	ev_uint16_t remote_port;
+
+	/* cache of the hostname for evhttp_request_get_host */
+	char *host_cache;
+
+	enum evhttp_request_kind kind;
+	enum evhttp_cmd_type type;
+
+	size_t headers_size;
+	size_t body_size;
+
+	char *uri;			/* uri after HTTP request was parsed */
+	struct evhttp_uri *uri_elems;	/* uri elements */
+
+	char major;			/* HTTP Major number */
+	char minor;			/* HTTP Minor number */
+
+	int response_code;		/* HTTP Response code */
+	char *response_code_line;	/* Readable response */
+
+	struct evbuffer *input_buffer;	/* read data */
+	ev_int64_t ntoread;
+	unsigned chunked:1,		/* a chunked request */
+	    userdone:1;			/* the user has sent all data */
+
+	struct evbuffer *output_buffer;	/* outgoing post or data */
+
+	/* Callback */
+	void (*cb)(struct evhttp_request *, void *);
+	void *cb_arg;
+
+	/*
+	 * Chunked data callback - call for each completed chunk if
+	 * specified.  If not specified, all the data is delivered via
+	 * the regular callback.
+	 */
+	void (*chunk_cb)(struct evhttp_request *, void *);
+
+	/*
+	 * Callback added for forked-daapd so they can collect ICY
+	 * (shoutcast) metadata from the http header. If return
+	 * int is negative the connection will be closed.
+	 */
+	int (*header_cb)(struct evhttp_request *, void *);
+
+	/*
+	 * Error callback - called when error is occured.
+	 * @see evhttp_request_error for error types.
+	 *
+	 * @see evhttp_request_set_error_cb()
+	 */
+	void (*error_cb)(enum evhttp_request_error, void *);
+
+	/*
+	 * Send complete callback - called when the request is actually
+	 * sent and completed.
+	 */
+	void (*on_complete_cb)(struct evhttp_request *, void *);
+	void *on_complete_cb_arg;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_HTTP_STRUCT_H_INCLUDED_ */
+
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/keyvalq_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/keyvalq_struct.h
new file mode 100644
index 000000000000..bffa54b3a766
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/keyvalq_struct.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_KEYVALQ_STRUCT_H_INCLUDED_
+#define EVENT2_KEYVALQ_STRUCT_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Fix so that people don't have to run with <sys/queue.h> */
+/* XXXX This code is duplicated with event_struct.h */
+#ifndef TAILQ_ENTRY
+#define EVENT_DEFINED_TQENTRY_
+#define TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+}
+#endif /* !TAILQ_ENTRY */
+
+#ifndef TAILQ_HEAD
+#define EVENT_DEFINED_TQHEAD_
+#define TAILQ_HEAD(name, type)			\
+struct name {					\
+	struct type *tqh_first;			\
+	struct type **tqh_last;			\
+}
+#endif
+
+/*
+ * Key-Value pairs.  Can be used for HTTP headers but also for
+ * query argument parsing.
+ */
+struct evkeyval {
+	TAILQ_ENTRY(evkeyval) next;
+
+	char *key;
+	char *value;
+};
+
+TAILQ_HEAD (evkeyvalq, evkeyval);
+
+/* XXXX This code is duplicated with event_struct.h */
+#ifdef EVENT_DEFINED_TQENTRY_
+#undef TAILQ_ENTRY
+#endif
+
+#ifdef EVENT_DEFINED_TQHEAD_
+#undef TAILQ_HEAD
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/listener.h b/extra/libevent/libevent-2.1.11-stable/include/event2/listener.h
new file mode 100644
index 000000000000..789a27c2aacc
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/listener.h
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_LISTENER_H_INCLUDED_
+#define EVENT2_LISTENER_H_INCLUDED_
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event.h>
+
+struct sockaddr;
+struct evconnlistener;
+
+/**
+   A callback that we invoke when a listener has a new connection.
+
+   @param listener The evconnlistener
+   @param fd The new file descriptor
+   @param addr The source address of the connection
+   @param socklen The length of addr
+   @param user_arg the pointer passed to evconnlistener_new()
+ */
+typedef void (*evconnlistener_cb)(struct evconnlistener *, evutil_socket_t, struct sockaddr *, int socklen, void *);
+
+/**
+   A callback that we invoke when a listener encounters a non-retriable error.
+
+   @param listener The evconnlistener
+   @param user_arg the pointer passed to evconnlistener_new()
+ */
+typedef void (*evconnlistener_errorcb)(struct evconnlistener *, void *);
+
+/** Flag: Indicates that we should not make incoming sockets nonblocking
+ * before passing them to the callback. */
+#define LEV_OPT_LEAVE_SOCKETS_BLOCKING	(1u<<0)
+/** Flag: Indicates that freeing the listener should close the underlying
+ * socket. */
+#define LEV_OPT_CLOSE_ON_FREE		(1u<<1)
+/** Flag: Indicates that we should set the close-on-exec flag, if possible */
+#define LEV_OPT_CLOSE_ON_EXEC		(1u<<2)
+/** Flag: Indicates that we should disable the timeout (if any) between when
+ * this socket is closed and when we can listen again on the same port. */
+#define LEV_OPT_REUSEABLE		(1u<<3)
+/** Flag: Indicates that the listener should be locked so it's safe to use
+ * from multiple threadcs at once. */
+#define LEV_OPT_THREADSAFE		(1u<<4)
+/** Flag: Indicates that the listener should be created in disabled
+ * state. Use evconnlistener_enable() to enable it later. */
+#define LEV_OPT_DISABLED		(1u<<5)
+/** Flag: Indicates that the listener should defer accept() until data is
+ * available, if possible.  Ignored on platforms that do not support this.
+ *
+ * This option can help performance for protocols where the client transmits
+ * immediately after connecting.  Do not use this option if your protocol
+ * _doesn't_ start out with the client transmitting data, since in that case
+ * this option will sometimes cause the kernel to never tell you about the
+ * connection.
+ *
+ * This option is only supported by evconnlistener_new_bind(): it can't
+ * work with evconnlistener_new_fd(), since the listener needs to be told
+ * to use the option before it is actually bound.
+ */
+#define LEV_OPT_DEFERRED_ACCEPT		(1u<<6)
+/** Flag: Indicates that we ask to allow multiple servers (processes or
+ * threads) to bind to the same port if they each set the option. 
+ * 
+ * SO_REUSEPORT is what most people would expect SO_REUSEADDR to be, however
+ * SO_REUSEPORT does not imply SO_REUSEADDR.
+ *
+ * This is only available on Linux and kernel 3.9+
+ */
+#define LEV_OPT_REUSEABLE_PORT		(1u<<7)
+/** Flag: Indicates that the listener wants to work only in IPv6 socket.
+ *
+ * According to RFC3493 and most Linux distributions, default value is to
+ * work in IPv4-mapped mode. If there is a requirement to bind same port
+ * on same ip addresses but different handlers for both IPv4 and IPv6,
+ * it is required to set IPV6_V6ONLY socket option to be sure that the
+ * code works as expected without affected by bindv6only sysctl setting in
+ * system.
+ *
+ * This socket option also supported by Windows.
+ */
+#define LEV_OPT_BIND_IPV6ONLY		(1u<<8)
+
+/**
+   Allocate a new evconnlistener object to listen for incoming TCP connections
+   on a given file descriptor.
+
+   @param base The event base to associate the listener with.
+   @param cb A callback to be invoked when a new connection arrives.  If the
+      callback is NULL, the listener will be treated as disabled until the
+      callback is set.
+   @param ptr A user-supplied pointer to give to the callback.
+   @param flags Any number of LEV_OPT_* flags
+   @param backlog Passed to the listen() call to determine the length of the
+      acceptable connection backlog.  Set to -1 for a reasonable default.
+      Set to 0 if the socket is already listening.
+   @param fd The file descriptor to listen on.  It must be a nonblocking
+      file descriptor, and it should already be bound to an appropriate
+      port and address.
+*/
+EVENT2_EXPORT_SYMBOL
+struct evconnlistener *evconnlistener_new(struct event_base *base,
+    evconnlistener_cb cb, void *ptr, unsigned flags, int backlog,
+    evutil_socket_t fd);
+/**
+   Allocate a new evconnlistener object to listen for incoming TCP connections
+   on a given address.
+
+   @param base The event base to associate the listener with.
+   @param cb A callback to be invoked when a new connection arrives. If the
+      callback is NULL, the listener will be treated as disabled until the
+      callback is set.
+   @param ptr A user-supplied pointer to give to the callback.
+   @param flags Any number of LEV_OPT_* flags
+   @param backlog Passed to the listen() call to determine the length of the
+      acceptable connection backlog.  Set to -1 for a reasonable default.
+   @param addr The address to listen for connections on.
+   @param socklen The length of the address.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evconnlistener *evconnlistener_new_bind(struct event_base *base,
+    evconnlistener_cb cb, void *ptr, unsigned flags, int backlog,
+    const struct sockaddr *sa, int socklen);
+/**
+   Disable and deallocate an evconnlistener.
+ */
+EVENT2_EXPORT_SYMBOL
+void evconnlistener_free(struct evconnlistener *lev);
+/**
+   Re-enable an evconnlistener that has been disabled.
+ */
+EVENT2_EXPORT_SYMBOL
+int evconnlistener_enable(struct evconnlistener *lev);
+/**
+   Stop listening for connections on an evconnlistener.
+ */
+EVENT2_EXPORT_SYMBOL
+int evconnlistener_disable(struct evconnlistener *lev);
+
+/** Return an evconnlistener's associated event_base. */
+EVENT2_EXPORT_SYMBOL
+struct event_base *evconnlistener_get_base(struct evconnlistener *lev);
+
+/** Return the socket that an evconnlistner is listening on. */
+EVENT2_EXPORT_SYMBOL
+evutil_socket_t evconnlistener_get_fd(struct evconnlistener *lev);
+
+/** Change the callback on the listener to cb and its user_data to arg.
+ */
+EVENT2_EXPORT_SYMBOL
+void evconnlistener_set_cb(struct evconnlistener *lev,
+    evconnlistener_cb cb, void *arg);
+
+/** Set an evconnlistener's error callback. */
+EVENT2_EXPORT_SYMBOL
+void evconnlistener_set_error_cb(struct evconnlistener *lev,
+    evconnlistener_errorcb errorcb);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/rpc.h b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc.h
new file mode 100644
index 000000000000..1bc31d57117e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc.h
@@ -0,0 +1,626 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_RPC_H_INCLUDED_
+#define EVENT2_RPC_H_INCLUDED_
+
+/* For int types. */
+#include <event2/util.h>
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @file rpc.h
+ *
+ * This header files provides basic support for an RPC server and client.
+ *
+ * To support RPCs in a server, every supported RPC command needs to be
+ * defined and registered.
+ *
+ * EVRPC_HEADER(SendCommand, Request, Reply);
+ *
+ *  SendCommand is the name of the RPC command.
+ *  Request is the name of a structure generated by event_rpcgen.py.
+ *    It contains all parameters relating to the SendCommand RPC.  The
+ *    server needs to fill in the Reply structure.
+ *  Reply is the name of a structure generated by event_rpcgen.py.  It
+ *    contains the answer to the RPC.
+ *
+ * To register an RPC with an HTTP server, you need to first create an RPC
+ * base with:
+ *
+ *   struct evrpc_base *base = evrpc_init(http);
+ *
+ * A specific RPC can then be registered with
+ *
+ * EVRPC_REGISTER(base, SendCommand, Request, Reply,  FunctionCB, arg);
+ *
+ * when the server receives an appropriately formatted RPC, the user callback
+ * is invoked.   The callback needs to fill in the reply structure.
+ *
+ * void FunctionCB(EVRPC_STRUCT(SendCommand)* rpc, void *arg);
+ *
+ * To send the reply, call EVRPC_REQUEST_DONE(rpc);
+ *
+ * See the regression test for an example.
+ */
+
+/**
+   Determines if the member has been set in the message
+
+   @param msg the message to inspect
+   @param member the member variable to test for presences
+   @return 1 if it's present or 0 otherwise.
+*/
+#define EVTAG_HAS(msg, member) \
+	((msg)->member##_set == 1)
+
+#ifndef EVENT2_RPC_COMPAT_H_INCLUDED_
+
+/**
+   Assigns a value to the member in the message.
+
+   @param msg the message to which to assign a value
+   @param member the name of the member variable
+   @param value the value to assign
+*/
+#define EVTAG_ASSIGN(msg, member, value) \
+	(*(msg)->base->member##_assign)((msg), (value))
+/**
+   Assigns a value to the member in the message.
+
+   @param msg the message to which to assign a value
+   @param member the name of the member variable
+   @param value the value to assign
+   @param len the length of the value
+*/
+#define EVTAG_ASSIGN_WITH_LEN(msg, member, value, len)	\
+	(*(msg)->base->member##_assign)((msg), (value), (len))
+/**
+   Returns the value for a member.
+
+   @param msg the message from which to get the value
+   @param member the name of the member variable
+   @param pvalue a pointer to the variable to hold the value
+   @return 0 on success, -1 otherwise.
+*/
+#define EVTAG_GET(msg, member, pvalue) \
+	(*(msg)->base->member##_get)((msg), (pvalue))
+/**
+   Returns the value for a member.
+
+   @param msg the message from which to get the value
+   @param member the name of the member variable
+   @param pvalue a pointer to the variable to hold the value
+   @param plen a pointer to the length of the value
+   @return 0 on success, -1 otherwise.
+*/
+#define EVTAG_GET_WITH_LEN(msg, member, pvalue, plen)	\
+	(*(msg)->base->member##_get)((msg), (pvalue), (plen))
+
+#endif  /* EVENT2_RPC_COMPAT_H_INCLUDED_ */
+
+/**
+   Adds a value to an array.
+*/
+#define EVTAG_ARRAY_ADD_VALUE(msg, member, value) \
+	(*(msg)->base->member##_add)((msg), (value))
+/**
+   Allocates a new entry in the array and returns it.
+*/
+#define EVTAG_ARRAY_ADD(msg, member) \
+	(*(msg)->base->member##_add)(msg)
+/**
+   Gets a variable at the specified offset from the array.
+*/
+#define EVTAG_ARRAY_GET(msg, member, offset, pvalue)	\
+	(*(msg)->base->member##_get)((msg), (offset), (pvalue))
+/**
+   Returns the number of entries in the array.
+*/
+#define EVTAG_ARRAY_LEN(msg, member) ((msg)->member##_length)
+
+
+struct evbuffer;
+struct event_base;
+struct evrpc_req_generic;
+struct evrpc_request_wrapper;
+struct evrpc;
+
+/** The type of a specific RPC Message
+ *
+ * @param rpcname the name of the RPC message
+ */
+#define EVRPC_STRUCT(rpcname) struct evrpc_req__##rpcname
+
+struct evhttp_request;
+struct evrpc_status;
+struct evrpc_hook_meta;
+
+/** Creates the definitions and prototypes for an RPC
+ *
+ * You need to use EVRPC_HEADER to create structures and function prototypes
+ * needed by the server and client implementation.  The structures have to be
+ * defined in an .rpc file and converted to source code via event_rpcgen.py
+ *
+ * @param rpcname the name of the RPC
+ * @param reqstruct the name of the RPC request structure
+ * @param replystruct the name of the RPC reply structure
+ * @see EVRPC_GENERATE()
+ */
+#define EVRPC_HEADER(rpcname, reqstruct, rplystruct) \
+EVRPC_STRUCT(rpcname) {	\
+	struct evrpc_hook_meta *hook_meta; \
+	struct reqstruct* request; \
+	struct rplystruct* reply; \
+	struct evrpc* rpc; \
+	struct evhttp_request* http_req; \
+	struct evbuffer* rpc_data; \
+};								     \
+EVENT2_EXPORT_SYMBOL \
+int evrpc_send_request_##rpcname(struct evrpc_pool *, \
+    struct reqstruct *, struct rplystruct *, \
+    void (*)(struct evrpc_status *, \
+	struct reqstruct *, struct rplystruct *, void *cbarg),	\
+    void *);
+
+struct evrpc_pool;
+
+/** use EVRPC_GENERATE instead */
+EVENT2_EXPORT_SYMBOL
+struct evrpc_request_wrapper *evrpc_make_request_ctx(
+	struct evrpc_pool *pool, void *request, void *reply,
+	const char *rpcname,
+	void (*req_marshal)(struct evbuffer*, void *),
+	void (*rpl_clear)(void *),
+	int (*rpl_unmarshal)(void *, struct evbuffer *),
+	void (*cb)(struct evrpc_status *, void *, void *, void *),
+	void *cbarg);
+
+/** Creates a context structure that contains rpc specific information.
+ *
+ * EVRPC_MAKE_CTX is used to populate a RPC specific context that
+ * contains information about marshaling the RPC data types.
+ *
+ * @param rpcname the name of the RPC
+ * @param reqstruct the name of the RPC request structure
+ * @param replystruct the name of the RPC reply structure
+ * @param pool the evrpc_pool over which to make the request
+ * @param request a pointer to the RPC request structure object
+ * @param reply a pointer to the RPC reply structure object
+ * @param cb the callback function to call when the RPC has completed
+ * @param cbarg the argument to supply to the callback
+ */
+#define EVRPC_MAKE_CTX(rpcname, reqstruct, rplystruct, \
+    pool, request, reply, cb, cbarg)					\
+	evrpc_make_request_ctx(pool, request, reply,			\
+	    #rpcname,							\
+	    (void (*)(struct evbuffer *, void *))reqstruct##_marshal,	\
+	    (void (*)(void *))rplystruct##_clear,			\
+	    (int (*)(void *, struct evbuffer *))rplystruct##_unmarshal, \
+	    (void (*)(struct evrpc_status *, void *, void *, void *))cb, \
+	    cbarg)
+
+/** Generates the code for receiving and sending an RPC message
+ *
+ * EVRPC_GENERATE is used to create the code corresponding to sending
+ * and receiving a particular RPC message
+ *
+ * @param rpcname the name of the RPC
+ * @param reqstruct the name of the RPC request structure
+ * @param replystruct the name of the RPC reply structure
+ * @see EVRPC_HEADER()
+ */
+#define EVRPC_GENERATE(rpcname, reqstruct, rplystruct)			\
+	int evrpc_send_request_##rpcname(struct evrpc_pool *pool,	\
+	    struct reqstruct *request, struct rplystruct *reply,	\
+	    void (*cb)(struct evrpc_status *,				\
+		struct reqstruct *, struct rplystruct *, void *cbarg),	\
+	    void *cbarg) {						\
+	return evrpc_send_request_generic(pool, request, reply,	\
+	    (void (*)(struct evrpc_status *, void *, void *, void *))cb, \
+	    cbarg,							\
+	    #rpcname,							\
+	    (void (*)(struct evbuffer *, void *))reqstruct##_marshal,	\
+	    (void (*)(void *))rplystruct##_clear,			\
+	    (int (*)(void *, struct evbuffer *))rplystruct##_unmarshal); \
+}
+
+/** Provides access to the HTTP request object underlying an RPC
+ *
+ * Access to the underlying http object; can be used to look at headers or
+ * for getting the remote ip address
+ *
+ * @param rpc_req the rpc request structure provided to the server callback
+ * @return an struct evhttp_request object that can be inspected for
+ * HTTP headers or sender information.
+ */
+#define EVRPC_REQUEST_HTTP(rpc_req) (rpc_req)->http_req
+
+/** completes the server response to an rpc request */
+EVENT2_EXPORT_SYMBOL
+void evrpc_request_done(struct evrpc_req_generic *req);
+
+/** accessors for request and reply */
+EVENT2_EXPORT_SYMBOL
+void *evrpc_get_request(struct evrpc_req_generic *req);
+EVENT2_EXPORT_SYMBOL
+void *evrpc_get_reply(struct evrpc_req_generic *req);
+
+/** Creates the reply to an RPC request
+ *
+ * EVRPC_REQUEST_DONE is used to answer a request; the reply is expected
+ * to have been filled in.  The request and reply pointers become invalid
+ * after this call has finished.
+ *
+ * @param rpc_req the rpc request structure provided to the server callback
+ */
+#define EVRPC_REQUEST_DONE(rpc_req) do { \
+  struct evrpc_req_generic *req_ = (struct evrpc_req_generic *)(rpc_req); \
+  evrpc_request_done(req_);					\
+} while (0)
+
+
+struct evrpc_base;
+struct evhttp;
+
+/* functions to start up the rpc system */
+
+/** Creates a new rpc base from which RPC requests can be received
+ *
+ * @param server a pointer to an existing HTTP server
+ * @return a newly allocated evrpc_base struct or NULL if an error occurred
+ * @see evrpc_free()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evrpc_base *evrpc_init(struct evhttp *server);
+
+/**
+ * Frees the evrpc base
+ *
+ * For now, you are responsible for making sure that no rpcs are ongoing.
+ *
+ * @param base the evrpc_base object to be freed
+ * @see evrpc_init
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_free(struct evrpc_base *base);
+
+/** register RPCs with the HTTP Server
+ *
+ * registers a new RPC with the HTTP server, each RPC needs to have
+ * a unique name under which it can be identified.
+ *
+ * @param base the evrpc_base structure in which the RPC should be
+ *   registered.
+ * @param name the name of the RPC
+ * @param request the name of the RPC request structure
+ * @param reply the name of the RPC reply structure
+ * @param callback the callback that should be invoked when the RPC
+ * is received.  The callback has the following prototype
+ *   void (*callback)(EVRPC_STRUCT(Message)* rpc, void *arg)
+ * @param cbarg an additional parameter that can be passed to the callback.
+ *   The parameter can be used to carry around state.
+ */
+#define EVRPC_REGISTER(base, name, request, reply, callback, cbarg)	\
+	evrpc_register_generic(base, #name,				\
+	    (void (*)(struct evrpc_req_generic *, void *))callback, cbarg, \
+	    (void *(*)(void *))request##_new_with_arg, NULL,		\
+	    (void (*)(void *))request##_free,				\
+	    (int (*)(void *, struct evbuffer *))request##_unmarshal,	\
+	    (void *(*)(void *))reply##_new_with_arg, NULL,		\
+	    (void (*)(void *))reply##_free, \
+	    (int (*)(void *))reply##_complete, \
+	    (void (*)(struct evbuffer *, void *))reply##_marshal)
+
+/**
+   Low level function for registering an RPC with a server.
+
+   Use EVRPC_REGISTER() instead.
+
+   @see EVRPC_REGISTER()
+*/
+EVENT2_EXPORT_SYMBOL
+int evrpc_register_rpc(struct evrpc_base *, struct evrpc *,
+    void (*)(struct evrpc_req_generic*, void *), void *);
+
+/**
+ * Unregisters an already registered RPC
+ *
+ * @param base the evrpc_base object from which to unregister an RPC
+ * @param name the name of the rpc to unregister
+ * @return -1 on error or 0 when successful.
+ * @see EVRPC_REGISTER()
+ */
+#define EVRPC_UNREGISTER(base, name) evrpc_unregister_rpc((base), #name)
+
+EVENT2_EXPORT_SYMBOL
+int evrpc_unregister_rpc(struct evrpc_base *base, const char *name);
+
+/*
+ * Client-side RPC support
+ */
+
+struct evhttp_connection;
+struct evrpc_status;
+
+/** launches an RPC and sends it to the server
+ *
+ * EVRPC_MAKE_REQUEST() is used by the client to send an RPC to the server.
+ *
+ * @param name the name of the RPC
+ * @param pool the evrpc_pool that contains the connection objects over which
+ *   the request should be sent.
+ * @param request a pointer to the RPC request structure - it contains the
+ *   data to be sent to the server.
+ * @param reply a pointer to the RPC reply structure.  It is going to be filled
+ *   if the request was answered successfully
+ * @param cb the callback to invoke when the RPC request has been answered
+ * @param cbarg an additional argument to be passed to the client
+ * @return 0 on success, -1 on failure
+ */
+#define EVRPC_MAKE_REQUEST(name, pool, request, reply, cb, cbarg)	\
+	evrpc_send_request_##name((pool), (request), (reply), (cb), (cbarg))
+
+/**
+   Makes an RPC request based on the provided context.
+
+   This is a low-level function and should not be used directly
+   unless a custom context object is provided.  Use EVRPC_MAKE_REQUEST()
+   instead.
+
+   @param ctx a context from EVRPC_MAKE_CTX()
+   @returns 0 on success, -1 otherwise.
+   @see EVRPC_MAKE_REQUEST(), EVRPC_MAKE_CTX()
+*/
+EVENT2_EXPORT_SYMBOL
+int evrpc_make_request(struct evrpc_request_wrapper *ctx);
+
+/** creates an rpc connection pool
+ *
+ * a pool has a number of connections associated with it.
+ * rpc requests are always made via a pool.
+ *
+ * @param base a pointer to an struct event_based object; can be left NULL
+ *   in singled-threaded applications
+ * @return a newly allocated struct evrpc_pool object or NULL if an error
+ *   occurred
+ * @see evrpc_pool_free()
+ */
+EVENT2_EXPORT_SYMBOL
+struct evrpc_pool *evrpc_pool_new(struct event_base *base);
+/** frees an rpc connection pool
+ *
+ * @param pool a pointer to an evrpc_pool allocated via evrpc_pool_new()
+ * @see evrpc_pool_new()
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_pool_free(struct evrpc_pool *pool);
+
+/**
+ * Adds a connection over which rpc can be dispatched to the pool.
+ *
+ * The connection object must have been newly created.
+ *
+ * @param pool the pool to which to add the connection
+ * @param evcon the connection to add to the pool.
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_pool_add_connection(struct evrpc_pool *pool,
+    struct evhttp_connection *evcon);
+
+/**
+ * Removes a connection from the pool.
+ *
+ * The connection object must have been newly created.
+ *
+ * @param pool the pool from which to remove the connection
+ * @param evcon the connection to remove from the pool.
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_pool_remove_connection(struct evrpc_pool *pool,
+    struct evhttp_connection *evcon);
+
+/**
+ * Sets the timeout in secs after which a request has to complete.  The
+ * RPC is completely aborted if it does not complete by then.  Setting
+ * the timeout to 0 means that it never timeouts and can be used to
+ * implement callback type RPCs.
+ *
+ * Any connection already in the pool will be updated with the new
+ * timeout.  Connections added to the pool after set_timeout has be
+ * called receive the pool timeout only if no timeout has been set
+ * for the connection itself.
+ *
+ * @param pool a pointer to a struct evrpc_pool object
+ * @param timeout_in_secs the number of seconds after which a request should
+ *   timeout and a failure be returned to the callback.
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_pool_set_timeout(struct evrpc_pool *pool, int timeout_in_secs);
+
+/**
+ * Hooks for changing the input and output of RPCs; this can be used to
+ * implement compression, authentication, encryption, ...
+ */
+
+enum EVRPC_HOOK_TYPE {
+	EVRPC_INPUT,		/**< apply the function to an input hook */
+	EVRPC_OUTPUT		/**< apply the function to an output hook */
+};
+
+#ifndef _WIN32
+/** Deprecated alias for EVRPC_INPUT.  Not available on windows, where it
+ * conflicts with platform headers. */
+#define INPUT EVRPC_INPUT
+/** Deprecated alias for EVRPC_OUTPUT.  Not available on windows, where it
+ * conflicts with platform headers. */
+#define OUTPUT EVRPC_OUTPUT
+#endif
+
+/**
+ * Return value from hook processing functions
+ */
+
+enum EVRPC_HOOK_RESULT {
+	EVRPC_TERMINATE = -1,	/**< indicates the rpc should be terminated */
+	EVRPC_CONTINUE = 0,	/**< continue processing the rpc */
+	EVRPC_PAUSE = 1		/**< pause processing request until resumed */
+};
+
+/** adds a processing hook to either an rpc base or rpc pool
+ *
+ * If a hook returns TERMINATE, the processing is aborted. On CONTINUE,
+ * the request is immediately processed after the hook returns.  If the
+ * hook returns PAUSE, request processing stops until evrpc_resume_request()
+ * has been called.
+ *
+ * The add functions return handles that can be used for removing hooks.
+ *
+ * @param vbase a pointer to either struct evrpc_base or struct evrpc_pool
+ * @param hook_type either INPUT or OUTPUT
+ * @param cb the callback to call when the hook is activated
+ * @param cb_arg an additional argument for the callback
+ * @return a handle to the hook so it can be removed later
+ * @see evrpc_remove_hook()
+ */
+EVENT2_EXPORT_SYMBOL
+void *evrpc_add_hook(void *vbase,
+    enum EVRPC_HOOK_TYPE hook_type,
+    int (*cb)(void *, struct evhttp_request *, struct evbuffer *, void *),
+    void *cb_arg);
+
+/** removes a previously added hook
+ *
+ * @param vbase a pointer to either struct evrpc_base or struct evrpc_pool
+ * @param hook_type either INPUT or OUTPUT
+ * @param handle a handle returned by evrpc_add_hook()
+ * @return 1 on success or 0 on failure
+ * @see evrpc_add_hook()
+ */
+EVENT2_EXPORT_SYMBOL
+int evrpc_remove_hook(void *vbase,
+    enum EVRPC_HOOK_TYPE hook_type,
+    void *handle);
+
+/** resume a paused request
+ *
+ * @param vbase a pointer to either struct evrpc_base or struct evrpc_pool
+ * @param ctx the context pointer provided to the original hook call
+ */
+EVENT2_EXPORT_SYMBOL
+int evrpc_resume_request(void *vbase, void *ctx, enum EVRPC_HOOK_RESULT res);
+
+/** adds meta data to request
+ *
+ * evrpc_hook_add_meta() allows hooks to add meta data to a request. for
+ * a client request, the meta data can be inserted by an outgoing request hook
+ * and retrieved by the incoming request hook.
+ *
+ * @param ctx the context provided to the hook call
+ * @param key a NUL-terminated c-string
+ * @param data the data to be associated with the key
+ * @param data_size the size of the data
+ */
+EVENT2_EXPORT_SYMBOL
+void evrpc_hook_add_meta(void *ctx, const char *key,
+    const void *data, size_t data_size);
+
+/** retrieves meta data previously associated
+ *
+ * evrpc_hook_find_meta() can be used to retrieve meta data associated to a
+ * request by a previous hook.
+ * @param ctx the context provided to the hook call
+ * @param key a NUL-terminated c-string
+ * @param data pointer to a data pointer that will contain the retrieved data
+ * @param data_size pointer to the size of the data
+ * @return 0 on success or -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evrpc_hook_find_meta(void *ctx, const char *key,
+    void **data, size_t *data_size);
+
+/**
+ * returns the connection object associated with the request
+ *
+ * @param ctx the context provided to the hook call
+ * @return a pointer to the evhttp_connection object or NULL if an error
+ *   occurred
+ */
+EVENT2_EXPORT_SYMBOL
+struct evhttp_connection *evrpc_hook_get_connection(void *ctx);
+
+/**
+   Function for sending a generic RPC request.
+
+   Do not call this function directly, use EVRPC_MAKE_REQUEST() instead.
+
+   @see EVRPC_MAKE_REQUEST()
+ */
+EVENT2_EXPORT_SYMBOL
+int evrpc_send_request_generic(struct evrpc_pool *pool,
+    void *request, void *reply,
+    void (*cb)(struct evrpc_status *, void *, void *, void *),
+    void *cb_arg,
+    const char *rpcname,
+    void (*req_marshal)(struct evbuffer *, void *),
+    void (*rpl_clear)(void *),
+    int (*rpl_unmarshal)(void *, struct evbuffer *));
+
+/**
+   Function for registering a generic RPC with the RPC base.
+
+   Do not call this function directly, use EVRPC_REGISTER() instead.
+
+   @see EVRPC_REGISTER()
+ */
+EVENT2_EXPORT_SYMBOL
+int evrpc_register_generic(struct evrpc_base *base, const char *name,
+    void (*callback)(struct evrpc_req_generic *, void *), void *cbarg,
+    void *(*req_new)(void *), void *req_new_arg, void (*req_free)(void *),
+    int (*req_unmarshal)(void *, struct evbuffer *),
+    void *(*rpl_new)(void *), void *rpl_new_arg, void (*rpl_free)(void *),
+    int (*rpl_complete)(void *),
+    void (*rpl_marshal)(struct evbuffer *, void *));
+
+/** accessors for obscure and undocumented functionality */
+EVENT2_EXPORT_SYMBOL
+struct evrpc_pool* evrpc_request_get_pool(struct evrpc_request_wrapper *ctx);
+EVENT2_EXPORT_SYMBOL
+void evrpc_request_set_pool(struct evrpc_request_wrapper *ctx,
+    struct evrpc_pool *pool);
+EVENT2_EXPORT_SYMBOL
+void evrpc_request_set_cb(struct evrpc_request_wrapper *ctx,
+    void (*cb)(struct evrpc_status*, void *request, void *reply, void *arg),
+    void *cb_arg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_RPC_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_compat.h
new file mode 100644
index 000000000000..8d8334d25f9d
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_compat.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_RPC_COMPAT_H_INCLUDED_
+#define EVENT2_RPC_COMPAT_H_INCLUDED_
+
+/** @file event2/rpc_compat.h
+
+  Deprecated versions of the functions in rpc.h: provided only for
+  backwards compatibility.
+
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** backwards compatible accessors that work only with gcc */
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+
+#undef EVTAG_ASSIGN
+#undef EVTAG_GET
+#undef EVTAG_ADD
+
+#define EVTAG_ASSIGN(msg, member, args...) \
+	(*(msg)->base->member##_assign)(msg, ## args)
+#define EVTAG_GET(msg, member, args...) \
+	(*(msg)->base->member##_get)(msg, ## args)
+#define EVTAG_ADD(msg, member, args...) \
+	(*(msg)->base->member##_add)(msg, ## args)
+#endif
+#define EVTAG_LEN(msg, member) ((msg)->member##_length)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_EVENT_COMPAT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_struct.h b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_struct.h
new file mode 100644
index 000000000000..f3cb460aed41
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/rpc_struct.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_RPC_STRUCT_H_INCLUDED_
+#define EVENT2_RPC_STRUCT_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @file event2/rpc_struct.h
+
+  Structures used by rpc.h.  Using these structures directly may harm
+  forward compatibility: be careful!
+
+ */
+
+/* Fix so that people don't have to run with <sys/queue.h> */
+#ifndef TAILQ_ENTRY
+#define EVENT_DEFINED_TQENTRY_
+#define TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+}
+#endif /* !TAILQ_ENTRY */
+
+/**
+ * provides information about the completed RPC request.
+ */
+struct evrpc_status {
+#define EVRPC_STATUS_ERR_NONE		0
+#define EVRPC_STATUS_ERR_TIMEOUT	1
+#define EVRPC_STATUS_ERR_BADPAYLOAD	2
+#define EVRPC_STATUS_ERR_UNSTARTED	3
+#define EVRPC_STATUS_ERR_HOOKABORTED	4
+	int error;
+
+	/* for looking at headers or other information */
+	struct evhttp_request *http_req;
+};
+
+/* the structure below needs to be synchronized with evrpc_req_generic */
+
+/* Encapsulates a request */
+struct evrpc {
+	TAILQ_ENTRY(evrpc) next;
+
+	/* the URI at which the request handler lives */
+	const char* uri;
+
+	/* creates a new request structure */
+	void *(*request_new)(void *);
+	void *request_new_arg;
+
+	/* frees the request structure */
+	void (*request_free)(void *);
+
+	/* unmarshals the buffer into the proper request structure */
+	int (*request_unmarshal)(void *, struct evbuffer *);
+
+	/* creates a new reply structure */
+	void *(*reply_new)(void *);
+	void *reply_new_arg;
+
+	/* frees the reply structure */
+	void (*reply_free)(void *);
+
+	/* verifies that the reply is valid */
+	int (*reply_complete)(void *);
+
+	/* marshals the reply into a buffer */
+	void (*reply_marshal)(struct evbuffer*, void *);
+
+	/* the callback invoked for each received rpc */
+	void (*cb)(struct evrpc_req_generic *, void *);
+	void *cb_arg;
+
+	/* reference for further configuration */
+	struct evrpc_base *base;
+};
+
+#ifdef EVENT_DEFINED_TQENTRY_
+#undef TAILQ_ENTRY
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_RPC_STRUCT_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/tag.h b/extra/libevent/libevent-2.1.11-stable/include/event2/tag.h
new file mode 100644
index 000000000000..2f73bfc00e93
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/tag.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_TAG_H_INCLUDED_
+#define EVENT2_TAG_H_INCLUDED_
+
+/** @file event2/tag.h
+
+  Helper functions for reading and writing tagged data onto buffers.
+
+ */
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* For int types. */
+#include <event2/util.h>
+
+struct evbuffer;
+
+/*
+ * Marshaling tagged data - We assume that all tags are inserted in their
+ * numeric order - so that unknown tags will always be higher than the
+ * known ones - and we can just ignore the end of an event buffer.
+ */
+
+EVENT2_EXPORT_SYMBOL
+void evtag_init(void);
+
+/**
+   Unmarshals the header and returns the length of the payload
+
+   @param evbuf the buffer from which to unmarshal data
+   @param ptag a pointer in which the tag id is being stored
+   @returns -1 on failure or the number of bytes in the remaining payload.
+*/
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_header(struct evbuffer *evbuf, ev_uint32_t *ptag);
+
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal(struct evbuffer *evbuf, ev_uint32_t tag, const void *data,
+    ev_uint32_t len);
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal_buffer(struct evbuffer *evbuf, ev_uint32_t tag,
+    struct evbuffer *data);
+
+/**
+  Encode an integer and store it in an evbuffer.
+
+  We encode integers by nybbles; the first nibble contains the number
+  of significant nibbles - 1;  this allows us to encode up to 64-bit
+  integers.  This function is byte-order independent.
+
+  @param evbuf evbuffer to store the encoded number
+  @param number a 32-bit integer
+ */
+EVENT2_EXPORT_SYMBOL
+void evtag_encode_int(struct evbuffer *evbuf, ev_uint32_t number);
+EVENT2_EXPORT_SYMBOL
+void evtag_encode_int64(struct evbuffer *evbuf, ev_uint64_t number);
+
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal_int(struct evbuffer *evbuf, ev_uint32_t tag,
+    ev_uint32_t integer);
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal_int64(struct evbuffer *evbuf, ev_uint32_t tag,
+    ev_uint64_t integer);
+
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal_string(struct evbuffer *buf, ev_uint32_t tag,
+    const char *string);
+
+EVENT2_EXPORT_SYMBOL
+void evtag_marshal_timeval(struct evbuffer *evbuf, ev_uint32_t tag,
+    struct timeval *tv);
+
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal(struct evbuffer *src, ev_uint32_t *ptag,
+    struct evbuffer *dst);
+EVENT2_EXPORT_SYMBOL
+int evtag_peek(struct evbuffer *evbuf, ev_uint32_t *ptag);
+EVENT2_EXPORT_SYMBOL
+int evtag_peek_length(struct evbuffer *evbuf, ev_uint32_t *plength);
+EVENT2_EXPORT_SYMBOL
+int evtag_payload_length(struct evbuffer *evbuf, ev_uint32_t *plength);
+EVENT2_EXPORT_SYMBOL
+int evtag_consume(struct evbuffer *evbuf);
+
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_int(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    ev_uint32_t *pinteger);
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_int64(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    ev_uint64_t *pinteger);
+
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_fixed(struct evbuffer *src, ev_uint32_t need_tag,
+    void *data, size_t len);
+
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_string(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    char **pstring);
+
+EVENT2_EXPORT_SYMBOL
+int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev_uint32_t need_tag,
+    struct timeval *ptv);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_TAG_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/tag_compat.h b/extra/libevent/libevent-2.1.11-stable/include/event2/tag_compat.h
new file mode 100644
index 000000000000..a276c0d35b6e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/tag_compat.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_TAG_COMPAT_H_INCLUDED_
+#define EVENT2_TAG_COMPAT_H_INCLUDED_
+
+/** @file event2/tag_compat.h
+
+    Obsolete/deprecated functions from tag.h; provided only for backwards
+    compatibility.
+ */
+
+/**
+   @name Misnamed functions
+
+   @deprecated These macros are deprecated because their names don't follow
+     Libevent's naming conventions.  Use evtag_encode_int and
+     evtag_encode_int64 instead.
+
+   @{
+*/
+#define encode_int(evbuf, number) evtag_encode_int((evbuf), (number))
+#define encode_int64(evbuf, number) evtag_encode_int64((evbuf), (number))
+/**@}*/
+
+#endif /* EVENT2_TAG_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/thread.h b/extra/libevent/libevent-2.1.11-stable/include/event2/thread.h
new file mode 100644
index 000000000000..b51998631b7a
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/thread.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_THREAD_H_INCLUDED_
+#define EVENT2_THREAD_H_INCLUDED_
+
+/** @file event2/thread.h
+
+  Functions for multi-threaded applications using Libevent.
+
+  When using a multi-threaded application in which multiple threads
+  add and delete events from a single event base, Libevent needs to
+  lock its data structures.
+
+  Like the memory-management function hooks, all of the threading functions
+  _must_ be set up before an event_base is created if you want the base to
+  use them.
+
+  Most programs will either be using Windows threads or Posix threads.  You
+  can configure Libevent to use one of these event_use_windows_threads() or
+  event_use_pthreads() respectively.  If you're using another threading
+  library, you'll need to configure threading functions manually using
+  evthread_set_lock_callbacks() and evthread_set_condition_callbacks().
+
+ */
+
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+
+/**
+   @name Flags passed to lock functions
+
+   @{
+*/
+/** A flag passed to a locking callback when the lock was allocated as a
+ * read-write lock, and we want to acquire or release the lock for writing. */
+#define EVTHREAD_WRITE	0x04
+/** A flag passed to a locking callback when the lock was allocated as a
+ * read-write lock, and we want to acquire or release the lock for reading. */
+#define EVTHREAD_READ	0x08
+/** A flag passed to a locking callback when we don't want to block waiting
+ * for the lock; if we can't get the lock immediately, we will instead
+ * return nonzero from the locking callback. */
+#define EVTHREAD_TRY    0x10
+/**@}*/
+
+#if !defined(EVENT__DISABLE_THREAD_SUPPORT) || defined(EVENT_IN_DOXYGEN_)
+
+#define EVTHREAD_LOCK_API_VERSION 1
+
+/**
+   @name Types of locks
+
+   @{*/
+/** A recursive lock is one that can be acquired multiple times at once by the
+ * same thread.  No other process can allocate the lock until the thread that
+ * has been holding it has unlocked it as many times as it locked it. */
+#define EVTHREAD_LOCKTYPE_RECURSIVE 1
+/* A read-write lock is one that allows multiple simultaneous readers, but
+ * where any one writer excludes all other writers and readers. */
+#define EVTHREAD_LOCKTYPE_READWRITE 2
+/**@}*/
+
+/** This structure describes the interface a threading library uses for
+ * locking.   It's used to tell evthread_set_lock_callbacks() how to use
+ * locking on this platform.
+ */
+struct evthread_lock_callbacks {
+	/** The current version of the locking API.  Set this to
+	 * EVTHREAD_LOCK_API_VERSION */
+	int lock_api_version;
+	/** Which kinds of locks does this version of the locking API
+	 * support?  A bitfield of EVTHREAD_LOCKTYPE_RECURSIVE and
+	 * EVTHREAD_LOCKTYPE_READWRITE.
+	 *
+	 * (Note that RECURSIVE locks are currently mandatory, and
+	 * READWRITE locks are not currently used.)
+	 **/
+	unsigned supported_locktypes;
+	/** Function to allocate and initialize new lock of type 'locktype'.
+	 * Returns NULL on failure. */
+	void *(*alloc)(unsigned locktype);
+	/** Funtion to release all storage held in 'lock', which was created
+	 * with type 'locktype'. */
+	void (*free)(void *lock, unsigned locktype);
+	/** Acquire an already-allocated lock at 'lock' with mode 'mode'.
+	 * Returns 0 on success, and nonzero on failure. */
+	int (*lock)(unsigned mode, void *lock);
+	/** Release a lock at 'lock' using mode 'mode'.  Returns 0 on success,
+	 * and nonzero on failure. */
+	int (*unlock)(unsigned mode, void *lock);
+};
+
+/** Sets a group of functions that Libevent should use for locking.
+ * For full information on the required callback API, see the
+ * documentation for the individual members of evthread_lock_callbacks.
+ *
+ * Note that if you're using Windows or the Pthreads threading library, you
+ * probably shouldn't call this function; instead, use
+ * evthread_use_windows_threads() or evthread_use_posix_threads() if you can.
+ */
+EVENT2_EXPORT_SYMBOL
+int evthread_set_lock_callbacks(const struct evthread_lock_callbacks *);
+
+#define EVTHREAD_CONDITION_API_VERSION 1
+
+struct timeval;
+
+/** This structure describes the interface a threading library uses for
+ * condition variables.  It's used to tell evthread_set_condition_callbacks
+ * how to use locking on this platform.
+ */
+struct evthread_condition_callbacks {
+	/** The current version of the conditions API.  Set this to
+	 * EVTHREAD_CONDITION_API_VERSION */
+	int condition_api_version;
+	/** Function to allocate and initialize a new condition variable.
+	 * Returns the condition variable on success, and NULL on failure.
+	 * The 'condtype' argument will be 0 with this API version.
+	 */
+	void *(*alloc_condition)(unsigned condtype);
+	/** Function to free a condition variable. */
+	void (*free_condition)(void *cond);
+	/** Function to signal a condition variable.  If 'broadcast' is 1, all
+	 * threads waiting on 'cond' should be woken; otherwise, only on one
+	 * thread is worken.  Should return 0 on success, -1 on failure.
+	 * This function will only be called while holding the associated
+	 * lock for the condition.
+	 */
+	int (*signal_condition)(void *cond, int broadcast);
+	/** Function to wait for a condition variable.  The lock 'lock'
+	 * will be held when this function is called; should be released
+	 * while waiting for the condition to be come signalled, and
+	 * should be held again when this function returns.
+	 * If timeout is provided, it is interval of seconds to wait for
+	 * the event to become signalled; if it is NULL, the function
+	 * should wait indefinitely.
+	 *
+	 * The function should return -1 on error; 0 if the condition
+	 * was signalled, or 1 on a timeout. */
+	int (*wait_condition)(void *cond, void *lock,
+	    const struct timeval *timeout);
+};
+
+/** Sets a group of functions that Libevent should use for condition variables.
+ * For full information on the required callback API, see the
+ * documentation for the individual members of evthread_condition_callbacks.
+ *
+ * Note that if you're using Windows or the Pthreads threading library, you
+ * probably shouldn't call this function; instead, use
+ * evthread_use_windows_threads() or evthread_use_pthreads() if you can.
+ */
+EVENT2_EXPORT_SYMBOL
+int evthread_set_condition_callbacks(
+	const struct evthread_condition_callbacks *);
+
+/**
+   Sets the function for determining the thread id.
+
+   @param base the event base for which to set the id function
+   @param id_fn the identify function Libevent should invoke to
+     determine the identity of a thread.
+*/
+EVENT2_EXPORT_SYMBOL
+void evthread_set_id_callback(
+    unsigned long (*id_fn)(void));
+
+#if (defined(_WIN32) && !defined(EVENT__DISABLE_THREAD_SUPPORT)) || defined(EVENT_IN_DOXYGEN_)
+/** Sets up Libevent for use with Windows builtin locking and thread ID
+    functions.  Unavailable if Libevent is not built for Windows.
+
+    @return 0 on success, -1 on failure. */
+EVENT2_EXPORT_SYMBOL
+int evthread_use_windows_threads(void);
+/**
+   Defined if Libevent was built with support for evthread_use_windows_threads()
+*/
+#define EVTHREAD_USE_WINDOWS_THREADS_IMPLEMENTED 1
+#endif
+
+#if defined(EVENT__HAVE_PTHREADS) || defined(EVENT_IN_DOXYGEN_)
+/** Sets up Libevent for use with Pthreads locking and thread ID functions.
+    Unavailable if Libevent is not build for use with pthreads.  Requires
+    libraries to link against Libevent_pthreads as well as Libevent.
+
+    @return 0 on success, -1 on failure. */
+EVENT2_EXPORT_SYMBOL
+int evthread_use_pthreads(void);
+/** Defined if Libevent was built with support for evthread_use_pthreads() */
+#define EVTHREAD_USE_PTHREADS_IMPLEMENTED 1
+
+#endif
+
+/** Enable debugging wrappers around the current lock callbacks.  If Libevent
+ * makes one of several common locking errors, exit with an assertion failure.
+ *
+ * If you're going to call this function, you must do so before any locks are
+ * allocated.
+ **/
+EVENT2_EXPORT_SYMBOL
+void evthread_enable_lock_debugging(void);
+
+/* Old (misspelled) version: This is deprecated; use
+ * evthread_enable_log_debugging instead. */
+EVENT2_EXPORT_SYMBOL
+void evthread_enable_lock_debuging(void);
+
+#endif /* EVENT__DISABLE_THREAD_SUPPORT */
+
+struct event_base;
+/** Make sure it's safe to tell an event base to wake up from another thread
+    or a signal handler.
+
+    You shouldn't need to call this by hand; configuring the base with thread
+    support should be necessary and sufficient.
+
+    @return 0 on success, -1 on failure.
+ */
+EVENT2_EXPORT_SYMBOL
+int evthread_make_base_notifiable(struct event_base *base);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT2_THREAD_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/util.h b/extra/libevent/libevent-2.1.11-stable/include/event2/util.h
new file mode 100644
index 000000000000..e6df62899f16
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/util.h
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_UTIL_H_INCLUDED_
+#define EVENT2_UTIL_H_INCLUDED_
+
+/** @file event2/util.h
+
+  Common convenience functions for cross-platform portability and
+  related socket manipulations.
+
+ */
+#include <event2/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <event2/event-config.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef EVENT__HAVE_STDINT_H
+#include <stdint.h>
+#elif defined(EVENT__HAVE_INTTYPES_H)
+#include <inttypes.h>
+#endif
+#ifdef EVENT__HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef EVENT__HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef _MSC_VER
+#include <BaseTsd.h>
+#endif
+#include <stdarg.h>
+#ifdef EVENT__HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef _WIN32
+#include <winsock2.h>
+#ifdef EVENT__HAVE_GETADDRINFO
+/* for EAI_* definitions. */
+#include <ws2tcpip.h>
+#endif
+#else
+#ifdef EVENT__HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <sys/socket.h>
+#endif
+
+#include <time.h>
+
+/* Some openbsd autoconf versions get the name of this macro wrong. */
+#if defined(EVENT__SIZEOF_VOID__) && !defined(EVENT__SIZEOF_VOID_P)
+#define EVENT__SIZEOF_VOID_P EVENT__SIZEOF_VOID__
+#endif
+
+/**
+ * @name Standard integer types.
+ *
+ * Integer type definitions for types that are supposed to be defined in the
+ * C99-specified stdint.h.  Shamefully, some platforms do not include
+ * stdint.h, so we need to replace it.  (If you are on a platform like this,
+ * your C headers are now over 10 years out of date.  You should bug them to
+ * do something about this.)
+ *
+ * We define:
+ *
+ * <dl>
+ *   <dt>ev_uint64_t, ev_uint32_t, ev_uint16_t, ev_uint8_t</dt>
+ *      <dd>unsigned integer types of exactly 64, 32, 16, and 8 bits
+ *          respectively.</dd>
+ *    <dt>ev_int64_t, ev_int32_t, ev_int16_t, ev_int8_t</dt>
+ *      <dd>signed integer types of exactly 64, 32, 16, and 8 bits
+ *          respectively.</dd>
+ *    <dt>ev_uintptr_t, ev_intptr_t</dt>
+ *      <dd>unsigned/signed integers large enough
+ *      to hold a pointer without loss of bits.</dd>
+ *    <dt>ev_ssize_t</dt>
+ *      <dd>A signed type of the same size as size_t</dd>
+ *    <dt>ev_off_t</dt>
+ *      <dd>A signed type typically used to represent offsets within a
+ *      (potentially large) file</dd>
+ *
+ * @{
+ */
+#ifdef EVENT__HAVE_UINT64_T
+#define ev_uint64_t uint64_t
+#define ev_int64_t int64_t
+#elif defined(_WIN32)
+#define ev_uint64_t unsigned __int64
+#define ev_int64_t signed __int64
+#elif EVENT__SIZEOF_LONG_LONG == 8
+#define ev_uint64_t unsigned long long
+#define ev_int64_t long long
+#elif EVENT__SIZEOF_LONG == 8
+#define ev_uint64_t unsigned long
+#define ev_int64_t long
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_uint64_t ...
+#define ev_int64_t ...
+#else
+#error "No way to define ev_uint64_t"
+#endif
+
+#ifdef EVENT__HAVE_UINT32_T
+#define ev_uint32_t uint32_t
+#define ev_int32_t int32_t
+#elif defined(_WIN32)
+#define ev_uint32_t unsigned int
+#define ev_int32_t signed int
+#elif EVENT__SIZEOF_LONG == 4
+#define ev_uint32_t unsigned long
+#define ev_int32_t signed long
+#elif EVENT__SIZEOF_INT == 4
+#define ev_uint32_t unsigned int
+#define ev_int32_t signed int
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_uint32_t ...
+#define ev_int32_t ...
+#else
+#error "No way to define ev_uint32_t"
+#endif
+
+#ifdef EVENT__HAVE_UINT16_T
+#define ev_uint16_t uint16_t
+#define ev_int16_t  int16_t
+#elif defined(_WIN32)
+#define ev_uint16_t unsigned short
+#define ev_int16_t  signed short
+#elif EVENT__SIZEOF_INT == 2
+#define ev_uint16_t unsigned int
+#define ev_int16_t  signed int
+#elif EVENT__SIZEOF_SHORT == 2
+#define ev_uint16_t unsigned short
+#define ev_int16_t  signed short
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_uint16_t ...
+#define ev_int16_t ...
+#else
+#error "No way to define ev_uint16_t"
+#endif
+
+#ifdef EVENT__HAVE_UINT8_T
+#define ev_uint8_t uint8_t
+#define ev_int8_t int8_t
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_uint8_t ...
+#define ev_int8_t ...
+#else
+#define ev_uint8_t unsigned char
+#define ev_int8_t signed char
+#endif
+
+#ifdef EVENT__HAVE_UINTPTR_T
+#define ev_uintptr_t uintptr_t
+#define ev_intptr_t intptr_t
+#elif EVENT__SIZEOF_VOID_P <= 4
+#define ev_uintptr_t ev_uint32_t
+#define ev_intptr_t ev_int32_t
+#elif EVENT__SIZEOF_VOID_P <= 8
+#define ev_uintptr_t ev_uint64_t
+#define ev_intptr_t ev_int64_t
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_uintptr_t ...
+#define ev_intptr_t ...
+#else
+#error "No way to define ev_uintptr_t"
+#endif
+
+#ifdef EVENT__ssize_t
+#define ev_ssize_t EVENT__ssize_t
+#else
+#define ev_ssize_t ssize_t
+#endif
+
+/* Note that we define ev_off_t based on the compile-time size of off_t that
+ * we used to build Libevent, and not based on the current size of off_t.
+ * (For example, we don't define ev_off_t to off_t.).  We do this because
+ * some systems let you build your software with different off_t sizes
+ * at runtime, and so putting in any dependency on off_t would risk API
+ * mismatch.
+ */
+#ifdef _WIN32
+#define ev_off_t ev_int64_t
+#elif EVENT__SIZEOF_OFF_T == 8
+#define ev_off_t ev_int64_t
+#elif EVENT__SIZEOF_OFF_T == 4
+#define ev_off_t ev_int32_t
+#elif defined(EVENT_IN_DOXYGEN_)
+#define ev_off_t ...
+#else
+#define ev_off_t off_t
+#endif
+/**@}*/
+
+/* Limits for integer types.
+
+   We're making two assumptions here:
+     - The compiler does constant folding properly.
+     - The platform does signed arithmetic in two's complement.
+*/
+
+/**
+   @name Limits for integer types
+
+   These macros hold the largest or smallest values possible for the
+   ev_[u]int*_t types.
+
+   @{
+*/
+#ifndef EVENT__HAVE_STDINT_H
+#define EV_UINT64_MAX ((((ev_uint64_t)0xffffffffUL) << 32) | 0xffffffffUL)
+#define EV_INT64_MAX  ((((ev_int64_t) 0x7fffffffL) << 32) | 0xffffffffL)
+#define EV_INT64_MIN  ((-EV_INT64_MAX) - 1)
+#define EV_UINT32_MAX ((ev_uint32_t)0xffffffffUL)
+#define EV_INT32_MAX  ((ev_int32_t) 0x7fffffffL)
+#define EV_INT32_MIN  ((-EV_INT32_MAX) - 1)
+#define EV_UINT16_MAX ((ev_uint16_t)0xffffUL)
+#define EV_INT16_MAX  ((ev_int16_t) 0x7fffL)
+#define EV_INT16_MIN  ((-EV_INT16_MAX) - 1)
+#define EV_UINT8_MAX  255
+#define EV_INT8_MAX   127
+#define EV_INT8_MIN   ((-EV_INT8_MAX) - 1)
+#else
+#define EV_UINT64_MAX UINT64_MAX
+#define EV_INT64_MAX  INT64_MAX
+#define EV_INT64_MIN  INT64_MIN
+#define EV_UINT32_MAX UINT32_MAX
+#define EV_INT32_MAX  INT32_MAX
+#define EV_INT32_MIN  INT32_MIN
+#define EV_UINT16_MAX UINT16_MAX
+#define EV_INT16_MIN  INT16_MIN
+#define EV_INT16_MAX  INT16_MAX
+#define EV_UINT8_MAX  UINT8_MAX
+#define EV_INT8_MAX   INT8_MAX
+#define EV_INT8_MIN   INT8_MIN
+/** @} */
+#endif
+
+
+/**
+   @name Limits for SIZE_T and SSIZE_T
+
+   @{
+*/
+#if EVENT__SIZEOF_SIZE_T == 8
+#define EV_SIZE_MAX EV_UINT64_MAX
+#define EV_SSIZE_MAX EV_INT64_MAX
+#elif EVENT__SIZEOF_SIZE_T == 4
+#define EV_SIZE_MAX EV_UINT32_MAX
+#define EV_SSIZE_MAX EV_INT32_MAX
+#elif defined(EVENT_IN_DOXYGEN_)
+#define EV_SIZE_MAX ...
+#define EV_SSIZE_MAX ...
+#else
+#error "No way to define SIZE_MAX"
+#endif
+
+#define EV_SSIZE_MIN ((-EV_SSIZE_MAX) - 1)
+/**@}*/
+
+#ifdef _WIN32
+#define ev_socklen_t int
+#elif defined(EVENT__socklen_t)
+#define ev_socklen_t EVENT__socklen_t
+#else
+#define ev_socklen_t socklen_t
+#endif
+
+#ifdef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
+#if !defined(EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY) \
+ && !defined(ss_family)
+#define ss_family __ss_family
+#endif
+#endif
+
+/**
+ * A type wide enough to hold the output of "socket()" or "accept()".  On
+ * Windows, this is an intptr_t; elsewhere, it is an int. */
+#ifdef _WIN32
+#define evutil_socket_t intptr_t
+#else
+#define evutil_socket_t int
+#endif
+
+/**
+ * Structure to hold information about a monotonic timer
+ *
+ * Use this with evutil_configure_monotonic_time() and
+ * evutil_gettime_monotonic().
+ *
+ * This is an opaque structure; you can allocate one using
+ * evutil_monotonic_timer_new().
+ *
+ * @see evutil_monotonic_timer_new(), evutil_monotonic_timer_free(),
+ * evutil_configure_monotonic_time(), evutil_gettime_monotonic()
+ */
+struct evutil_monotonic_timer
+#ifdef EVENT_IN_DOXYGEN_
+{/*Empty body so that doxygen will generate documentation here.*/}
+#endif
+;
+
+#define EV_MONOT_PRECISE  1
+#define EV_MONOT_FALLBACK 2
+
+/** Format a date string using RFC 1123 format (used in HTTP).
+ * If `tm` is NULL, current system's time will be used.
+ * The number of characters written will be returned.
+ * One should check if the return value is smaller than `datelen` to check if
+ * the result is truncated or not.
+ */
+EVENT2_EXPORT_SYMBOL int
+evutil_date_rfc1123(char *date, const size_t datelen, const struct tm *tm);
+
+/** Allocate a new struct evutil_monotonic_timer for use with the
+ * evutil_configure_monotonic_time() and evutil_gettime_monotonic()
+ * functions.  You must configure the timer with
+ * evutil_configure_monotonic_time() before using it.
+ */
+EVENT2_EXPORT_SYMBOL
+struct evutil_monotonic_timer * evutil_monotonic_timer_new(void);
+
+/** Free a struct evutil_monotonic_timer that was allocated using
+ * evutil_monotonic_timer_new().
+ */
+EVENT2_EXPORT_SYMBOL
+void evutil_monotonic_timer_free(struct evutil_monotonic_timer *timer);
+
+/** Set up a struct evutil_monotonic_timer; flags can include
+ * EV_MONOT_PRECISE and EV_MONOT_FALLBACK.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_configure_monotonic_time(struct evutil_monotonic_timer *timer,
+                                    int flags);
+
+/** Query the current monotonic time from a struct evutil_monotonic_timer
+ * previously configured with evutil_configure_monotonic_time().  Monotonic
+ * time is guaranteed never to run in reverse, but is not necessarily epoch-
+ * based, or relative to any other definite point.  Use it to make reliable
+ * measurements of elapsed time between events even when the system time
+ * may be changed.
+ *
+ * It is not safe to use this funtion on the same timer from multiple
+ * threads.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_gettime_monotonic(struct evutil_monotonic_timer *timer,
+                             struct timeval *tp);
+
+/** Create two new sockets that are connected to each other.
+
+    On Unix, this simply calls socketpair().  On Windows, it uses the
+    loopback network interface on 127.0.0.1, and only
+    AF_INET,SOCK_STREAM are supported.
+
+    (This may fail on some Windows hosts where firewall software has cleverly
+    decided to keep 127.0.0.1 from talking to itself.)
+
+    Parameters and return values are as for socketpair()
+*/
+EVENT2_EXPORT_SYMBOL
+int evutil_socketpair(int d, int type, int protocol, evutil_socket_t sv[2]);
+/** Do platform-specific operations as needed to make a socket nonblocking.
+
+    @param sock The socket to make nonblocking
+    @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_socket_nonblocking(evutil_socket_t sock);
+
+/** Do platform-specific operations to make a listener socket reusable.
+
+    Specifically, we want to make sure that another program will be able
+    to bind this address right after we've closed the listener.
+
+    This differs from Windows's interpretation of "reusable", which
+    allows multiple listeners to bind the same address at the same time.
+
+    @param sock The socket to make reusable
+    @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_listen_socket_reuseable(evutil_socket_t sock);
+
+/** Do platform-specific operations to make a listener port reusable.
+
+    Specifically, we want to make sure that multiple programs which also
+    set the same socket option will be able to bind, listen at the same time.
+
+    This is a feature available only to Linux 3.9+
+
+    @param sock The socket to make reusable
+    @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_listen_socket_reuseable_port(evutil_socket_t sock);
+
+/** Set ipv6 only bind socket option to make listener work only in ipv6 sockets.
+
+    According to RFC3493 and most Linux distributions, default value for the
+    sockets is to work in IPv4-mapped mode. In IPv4-mapped mode, it is not possible
+    to bind same port from different IPv4 and IPv6 handlers.
+
+    @param sock The socket to make in ipv6only working mode
+    @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_listen_socket_ipv6only(evutil_socket_t sock);
+
+/** Do platform-specific operations as needed to close a socket upon a
+    successful execution of one of the exec*() functions.
+
+    @param sock The socket to be closed
+    @return 0 on success, -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_socket_closeonexec(evutil_socket_t sock);
+
+/** Do the platform-specific call needed to close a socket returned from
+    socket() or accept().
+
+    @param sock The socket to be closed
+    @return 0 on success (whether the operation is supported or not),
+            -1 on failure
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_closesocket(evutil_socket_t sock);
+#define EVUTIL_CLOSESOCKET(s) evutil_closesocket(s)
+
+/** Do platform-specific operations, if possible, to make a tcp listener
+ *  socket defer accept()s until there is data to read.
+ *  
+ *  Not all platforms support this.  You don't want to do this for every
+ *  listener socket: only the ones that implement a protocol where the
+ *  client transmits before the server needs to respond.
+ *
+ *  @param sock The listening socket to to make deferred
+ *  @return 0 on success (whether the operation is supported or not),
+ *       -1 on failure
+*/ 
+EVENT2_EXPORT_SYMBOL
+int evutil_make_tcp_listen_socket_deferred(evutil_socket_t sock);
+
+#ifdef _WIN32
+/** Return the most recent socket error.  Not idempotent on all platforms. */
+#define EVUTIL_SOCKET_ERROR() WSAGetLastError()
+/** Replace the most recent socket error with errcode */
+#define EVUTIL_SET_SOCKET_ERROR(errcode)		\
+	do { WSASetLastError(errcode); } while (0)
+/** Return the most recent socket error to occur on sock. */
+EVENT2_EXPORT_SYMBOL
+int evutil_socket_geterror(evutil_socket_t sock);
+/** Convert a socket error to a string. */
+EVENT2_EXPORT_SYMBOL
+const char *evutil_socket_error_to_string(int errcode);
+#define EVUTIL_INVALID_SOCKET INVALID_SOCKET
+#elif defined(EVENT_IN_DOXYGEN_)
+/**
+   @name Socket error functions
+
+   These functions are needed for making programs compatible between
+   Windows and Unix-like platforms.
+
+   You see, Winsock handles socket errors differently from the rest of
+   the world.  Elsewhere, a socket error is like any other error and is
+   stored in errno.  But winsock functions require you to retrieve the
+   error with a special function, and don't let you use strerror for
+   the error codes.  And handling EWOULDBLOCK is ... different.
+
+   @{
+*/
+/** Return the most recent socket error.  Not idempotent on all platforms. */
+#define EVUTIL_SOCKET_ERROR() ...
+/** Replace the most recent socket error with errcode */
+#define EVUTIL_SET_SOCKET_ERROR(errcode) ...
+/** Return the most recent socket error to occur on sock. */
+#define evutil_socket_geterror(sock) ...
+/** Convert a socket error to a string. */
+#define evutil_socket_error_to_string(errcode) ...
+#define EVUTIL_INVALID_SOCKET -1
+/**@}*/
+#else /** !EVENT_IN_DOXYGEN_ && !_WIN32 */
+#define EVUTIL_SOCKET_ERROR() (errno)
+#define EVUTIL_SET_SOCKET_ERROR(errcode)		\
+		do { errno = (errcode); } while (0)
+#define evutil_socket_geterror(sock) (errno)
+#define evutil_socket_error_to_string(errcode) (strerror(errcode))
+#define EVUTIL_INVALID_SOCKET -1
+#endif /** !_WIN32 */
+
+
+/**
+ * @name Manipulation macros for struct timeval.
+ *
+ * We define replacements
+ * for timeradd, timersub, timerclear, timercmp, and timerisset.
+ *
+ * @{
+ */
+#ifdef EVENT__HAVE_TIMERADD
+#define evutil_timeradd(tvp, uvp, vvp) timeradd((tvp), (uvp), (vvp))
+#define evutil_timersub(tvp, uvp, vvp) timersub((tvp), (uvp), (vvp))
+#else
+#define evutil_timeradd(tvp, uvp, vvp)					\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;       \
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#define	evutil_timersub(tvp, uvp, vvp)					\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+#endif /* !EVENT__HAVE_TIMERADD */
+
+#ifdef EVENT__HAVE_TIMERCLEAR
+#define evutil_timerclear(tvp) timerclear(tvp)
+#else
+#define	evutil_timerclear(tvp)	(tvp)->tv_sec = (tvp)->tv_usec = 0
+#endif
+/**@}*/
+
+/** Return true iff the tvp is related to uvp according to the relational
+ * operator cmp.  Recognized values for cmp are ==, <=, <, >=, and >. */
+#define	evutil_timercmp(tvp, uvp, cmp)					\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+	 ((tvp)->tv_usec cmp (uvp)->tv_usec) :				\
+	 ((tvp)->tv_sec cmp (uvp)->tv_sec))
+
+#ifdef EVENT__HAVE_TIMERISSET
+#define evutil_timerisset(tvp) timerisset(tvp)
+#else
+#define	evutil_timerisset(tvp)	((tvp)->tv_sec || (tvp)->tv_usec)
+#endif
+
+/** Replacement for offsetof on platforms that don't define it. */
+#ifdef offsetof
+#define evutil_offsetof(type, field) offsetof(type, field)
+#else
+#define evutil_offsetof(type, field) ((off_t)(&((type *)0)->field))
+#endif
+
+/* big-int related functions */
+/** Parse a 64-bit value from a string.  Arguments are as for strtol. */
+EVENT2_EXPORT_SYMBOL
+ev_int64_t evutil_strtoll(const char *s, char **endptr, int base);
+
+/** Replacement for gettimeofday on platforms that lack it. */
+#ifdef EVENT__HAVE_GETTIMEOFDAY
+#define evutil_gettimeofday(tv, tz) gettimeofday((tv), (tz))
+#else
+struct timezone;
+EVENT2_EXPORT_SYMBOL
+int evutil_gettimeofday(struct timeval *tv, struct timezone *tz);
+#endif
+
+/** Replacement for snprintf to get consistent behavior on platforms for
+    which the return value of snprintf does not conform to C99.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_snprintf(char *buf, size_t buflen, const char *format, ...)
+#ifdef __GNUC__
+	__attribute__((format(printf, 3, 4)))
+#endif
+;
+/** Replacement for vsnprintf to get consistent behavior on platforms for
+    which the return value of snprintf does not conform to C99.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
+#ifdef __GNUC__
+	__attribute__((format(printf, 3, 0)))
+#endif
+;
+
+/** Replacement for inet_ntop for platforms which lack it. */
+EVENT2_EXPORT_SYMBOL
+const char *evutil_inet_ntop(int af, const void *src, char *dst, size_t len);
+/** Replacement for inet_pton for platforms which lack it. */
+EVENT2_EXPORT_SYMBOL
+int evutil_inet_pton(int af, const char *src, void *dst);
+struct sockaddr;
+
+/** Parse an IPv4 or IPv6 address, with optional port, from a string.
+
+    Recognized formats are:
+    - [IPv6Address]:port
+    - [IPv6Address]
+    - IPv6Address
+    - IPv4Address:port
+    - IPv4Address
+
+    If no port is specified, the port in the output is set to 0.
+
+    @param str The string to parse.
+    @param out A struct sockaddr to hold the result.  This should probably be
+       a struct sockaddr_storage.
+    @param outlen A pointer to the number of bytes that that 'out' can safely
+       hold.  Set to the number of bytes used in 'out' on success.
+    @return -1 if the address is not well-formed, if the port is out of range,
+       or if out is not large enough to hold the result.  Otherwise returns
+       0 on success.
+*/
+EVENT2_EXPORT_SYMBOL
+int evutil_parse_sockaddr_port(const char *str, struct sockaddr *out, int *outlen);
+
+/** Compare two sockaddrs; return 0 if they are equal, or less than 0 if sa1
+ * preceeds sa2, or greater than 0 if sa1 follows sa2.  If include_port is
+ * true, consider the port as well as the address.  Only implemented for
+ * AF_INET and AF_INET6 addresses. The ordering is not guaranteed to remain
+ * the same between Libevent versions. */
+EVENT2_EXPORT_SYMBOL
+int evutil_sockaddr_cmp(const struct sockaddr *sa1, const struct sockaddr *sa2,
+    int include_port);
+
+/** As strcasecmp, but always compares the characters in locale-independent
+    ASCII.  That's useful if you're handling data in ASCII-based protocols.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_ascii_strcasecmp(const char *str1, const char *str2);
+/** As strncasecmp, but always compares the characters in locale-independent
+    ASCII.  That's useful if you're handling data in ASCII-based protocols.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_ascii_strncasecmp(const char *str1, const char *str2, size_t n);
+
+/* Here we define evutil_addrinfo to the native addrinfo type, or redefine it
+ * if this system has no getaddrinfo(). */
+#ifdef EVENT__HAVE_STRUCT_ADDRINFO
+#define evutil_addrinfo addrinfo
+#else
+/** A definition of struct addrinfo for systems that lack it.
+
+    (This is just an alias for struct addrinfo if the system defines
+    struct addrinfo.)
+*/
+struct evutil_addrinfo {
+	int     ai_flags;     /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+	int     ai_family;    /* PF_xxx */
+	int     ai_socktype;  /* SOCK_xxx */
+	int     ai_protocol;  /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+	size_t  ai_addrlen;   /* length of ai_addr */
+	char   *ai_canonname; /* canonical name for nodename */
+	struct sockaddr  *ai_addr; /* binary address */
+	struct evutil_addrinfo  *ai_next; /* next structure in linked list */
+};
+#endif
+/** @name evutil_getaddrinfo() error codes
+
+    These values are possible error codes for evutil_getaddrinfo() and
+    related functions.
+
+    @{
+*/
+#if defined(EAI_ADDRFAMILY) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_ADDRFAMILY EAI_ADDRFAMILY
+#else
+#define EVUTIL_EAI_ADDRFAMILY -901
+#endif
+#if defined(EAI_AGAIN) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_AGAIN EAI_AGAIN
+#else
+#define EVUTIL_EAI_AGAIN -902
+#endif
+#if defined(EAI_BADFLAGS) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_BADFLAGS EAI_BADFLAGS
+#else
+#define EVUTIL_EAI_BADFLAGS -903
+#endif
+#if defined(EAI_FAIL) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_FAIL EAI_FAIL
+#else
+#define EVUTIL_EAI_FAIL -904
+#endif
+#if defined(EAI_FAMILY) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_FAMILY EAI_FAMILY
+#else
+#define EVUTIL_EAI_FAMILY -905
+#endif
+#if defined(EAI_MEMORY) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_MEMORY EAI_MEMORY
+#else
+#define EVUTIL_EAI_MEMORY -906
+#endif
+/* This test is a bit complicated, since some MS SDKs decide to
+ * remove NODATA or redefine it to be the same as NONAME, in a
+ * fun interpretation of RFC 2553 and RFC 3493. */
+#if defined(EAI_NODATA) && defined(EVENT__HAVE_GETADDRINFO) && (!defined(EAI_NONAME) || EAI_NODATA != EAI_NONAME)
+#define EVUTIL_EAI_NODATA EAI_NODATA
+#else
+#define EVUTIL_EAI_NODATA -907
+#endif
+#if defined(EAI_NONAME) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_NONAME EAI_NONAME
+#else
+#define EVUTIL_EAI_NONAME -908
+#endif
+#if defined(EAI_SERVICE) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_SERVICE EAI_SERVICE
+#else
+#define EVUTIL_EAI_SERVICE -909
+#endif
+#if defined(EAI_SOCKTYPE) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_SOCKTYPE EAI_SOCKTYPE
+#else
+#define EVUTIL_EAI_SOCKTYPE -910
+#endif
+#if defined(EAI_SYSTEM) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_EAI_SYSTEM EAI_SYSTEM
+#else
+#define EVUTIL_EAI_SYSTEM -911
+#endif
+
+#define EVUTIL_EAI_CANCEL -90001
+
+#if defined(AI_PASSIVE) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_PASSIVE AI_PASSIVE
+#else
+#define EVUTIL_AI_PASSIVE 0x1000
+#endif
+#if defined(AI_CANONNAME) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_CANONNAME AI_CANONNAME
+#else
+#define EVUTIL_AI_CANONNAME 0x2000
+#endif
+#if defined(AI_NUMERICHOST) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_NUMERICHOST AI_NUMERICHOST
+#else
+#define EVUTIL_AI_NUMERICHOST 0x4000
+#endif
+#if defined(AI_NUMERICSERV) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_NUMERICSERV AI_NUMERICSERV
+#else
+#define EVUTIL_AI_NUMERICSERV 0x8000
+#endif
+#if defined(AI_V4MAPPED) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_V4MAPPED AI_V4MAPPED
+#else
+#define EVUTIL_AI_V4MAPPED 0x10000
+#endif
+#if defined(AI_ALL) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_ALL AI_ALL
+#else
+#define EVUTIL_AI_ALL 0x20000
+#endif
+#if defined(AI_ADDRCONFIG) && defined(EVENT__HAVE_GETADDRINFO)
+#define EVUTIL_AI_ADDRCONFIG AI_ADDRCONFIG
+#else
+#define EVUTIL_AI_ADDRCONFIG 0x40000
+#endif
+/**@}*/
+
+struct evutil_addrinfo;
+/**
+ * This function clones getaddrinfo for systems that don't have it.  For full
+ * details, see RFC 3493, section 6.1.
+ *
+ * Limitations:
+ * - When the system has no getaddrinfo, we fall back to gethostbyname_r or
+ *   gethostbyname, with their attendant issues.
+ * - The AI_V4MAPPED and AI_ALL flags are not currently implemented.
+ *
+ * For a nonblocking variant, see evdns_getaddrinfo.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_getaddrinfo(const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in, struct evutil_addrinfo **res);
+
+/** Release storage allocated by evutil_getaddrinfo or evdns_getaddrinfo. */
+EVENT2_EXPORT_SYMBOL
+void evutil_freeaddrinfo(struct evutil_addrinfo *ai);
+
+EVENT2_EXPORT_SYMBOL
+const char *evutil_gai_strerror(int err);
+
+/** Generate n bytes of secure pseudorandom data, and store them in buf.
+ *
+ * Current versions of Libevent use an ARC4-based random number generator,
+ * seeded using the platform's entropy source (/dev/urandom on Unix-like
+ * systems; CryptGenRandom on Windows).  This is not actually as secure as it
+ * should be: ARC4 is a pretty lousy cipher, and the current implementation
+ * provides only rudimentary prediction- and backtracking-resistance.  Don't
+ * use this for serious cryptographic applications.
+ */
+EVENT2_EXPORT_SYMBOL
+void evutil_secure_rng_get_bytes(void *buf, size_t n);
+
+/**
+ * Seed the secure random number generator if needed, and return 0 on
+ * success or -1 on failure.
+ *
+ * It is okay to call this function more than once; it will still return
+ * 0 if the RNG has been successfully seeded and -1 if it can't be
+ * seeded.
+ *
+ * Ordinarily you don't need to call this function from your own code;
+ * Libevent will seed the RNG itself the first time it needs good random
+ * numbers.  You only need to call it if (a) you want to double-check
+ * that one of the seeding methods did succeed, or (b) you plan to drop
+ * the capability to seed (by chrooting, or dropping capabilities, or
+ * whatever), and you want to make sure that seeding happens before your
+ * program loses the ability to do it.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_secure_rng_init(void);
+
+/**
+ * Set a filename to use in place of /dev/urandom for seeding the secure
+ * PRNG. Return 0 on success, -1 on failure.
+ *
+ * Call this function BEFORE calling any other initialization or RNG
+ * functions.
+ *
+ * (This string will _NOT_ be copied internally. Do not free it while any
+ * user of the secure RNG might be running. Don't pass anything other than a
+ * real /dev/...random device file here, or you might lose security.)
+ *
+ * This API is unstable, and might change in a future libevent version.
+ */
+EVENT2_EXPORT_SYMBOL
+int evutil_secure_rng_set_urandom_device_file(char *fname);
+
+#if !defined(EVENT__HAVE_ARC4RANDOM) || defined(EVENT__HAVE_ARC4RANDOM_ADDRANDOM)
+/** Seed the random number generator with extra random bytes.
+
+    You should almost never need to call this function; it should be
+    sufficient to invoke evutil_secure_rng_init(), or let Libevent take
+    care of calling evutil_secure_rng_init() on its own.
+
+    If you call this function as a _replacement_ for the regular
+    entropy sources, then you need to be sure that your input
+    contains a fairly large amount of strong entropy.  Doing so is
+    notoriously hard: most people who try get it wrong.  Watch out!
+
+    @param dat a buffer full of a strong source of random numbers
+    @param datlen the number of bytes to read from datlen
+ */
+EVENT2_EXPORT_SYMBOL
+void evutil_secure_rng_add_bytes(const char *dat, size_t datlen);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT1_EVUTIL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/event2/visibility.h b/extra/libevent/libevent-2.1.11-stable/include/event2/visibility.h
new file mode 100644
index 000000000000..006bbf06d80f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/event2/visibility.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT2_VISIBILITY_H_INCLUDED_
+#define EVENT2_VISIBILITY_H_INCLUDED_
+
+#include <event2/event-config.h>
+
+#if defined(event_shared_EXPORTS) || \
+    defined(event_extra_shared_EXPORTS) || \
+    defined(event_core_shared_EXPORTS) || \
+    defined(event_pthreads_shared_EXPORTS) || \
+    defined(event_openssl_shared_EXPORTS)
+
+# if defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#  define EVENT2_EXPORT_SYMBOL __global
+# elif defined __GNUC__
+#  define EVENT2_EXPORT_SYMBOL __attribute__ ((visibility("default")))
+# elif defined(_MSC_VER)
+#  define EVENT2_EXPORT_SYMBOL __declspec(dllexport)
+# else
+#  define EVENT2_EXPORT_SYMBOL /* unknown compiler */
+# endif
+
+#else /* event_*_EXPORTS */
+
+# define EVENT2_EXPORT_SYMBOL
+
+#endif /* event_*_EXPORTS */
+
+/** We need to dllimport event_debug_logging_mask_ into event_extra */
+#if defined(_MSC_VER)
+# if defined(event_core_shared_EXPORTS) /** from core export */
+#  define EVENT2_CORE_EXPORT_SYMBOL __declspec(dllexport)
+# elif defined(event_extra_shared_EXPORTS) || /** from extra import */ \
+       defined(EVENT_VISIBILITY_WANT_DLLIMPORT)
+#  define EVENT2_CORE_EXPORT_SYMBOL __declspec(dllimport)
+# endif
+#endif /* _MSC_VER */
+#if !defined(EVENT2_CORE_EXPORT_SYMBOL)
+# define EVENT2_CORE_EXPORT_SYMBOL EVENT2_EXPORT_SYMBOL
+#endif
+
+#endif /* EVENT2_VISIBILITY_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/evhttp.h b/extra/libevent/libevent-2.1.11-stable/include/evhttp.h
new file mode 100644
index 000000000000..549bc9b14a3c
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/evhttp.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT1_EVHTTP_H_INCLUDED_
+#define EVENT1_EVHTTP_H_INCLUDED_
+
+/** @file evhttp.h
+
+  An http implementation subsystem for Libevent.
+
+  The <evhttp.h> header is deprecated in Libevent 2.0 and later; please
+  use <event2/http.h> instead.  Depending on what functionality you
+  need, you may also want to include more of the other <event2/...>
+  headers.
+ */
+
+#include <event.h>
+#include <event2/http.h>
+#include <event2/http_struct.h>
+#include <event2/http_compat.h>
+
+#endif /* EVENT1_EVHTTP_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/evrpc.h b/extra/libevent/libevent-2.1.11-stable/include/evrpc.h
new file mode 100644
index 000000000000..7e986f7dabbc
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/evrpc.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT1_EVRPC_H_INCLUDED_
+#define EVENT1_EVRPC_H_INCLUDED_
+
+/** @file evrpc.h
+
+  An RPC system for Libevent.
+
+  The <evrpc.h> header is deprecated in Libevent 2.0 and later; please
+  use <event2/rpc.h> instead.  Depending on what functionality you
+  need, you may also want to include more of the other <event2/...>
+  headers.
+ */
+
+#include <event.h>
+#include <event2/rpc.h>
+#include <event2/rpc_struct.h>
+#include <event2/rpc_compat.h>
+
+#endif /* EVENT1_EVRPC_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/evutil.h b/extra/libevent/libevent-2.1.11-stable/include/evutil.h
new file mode 100644
index 000000000000..12c137d74506
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/evutil.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef EVENT1_EVUTIL_H_INCLUDED_
+#define EVENT1_EVUTIL_H_INCLUDED_
+
+/** @file evutil.h
+
+  Utility and compatibility functions for Libevent.
+
+  The <evutil.h> header is deprecated in Libevent 2.0 and later; please
+  use <event2/util.h> instead.
+*/
+
+#include <event2/util.h>
+
+#endif /* EVENT1_EVUTIL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/include/include.am b/extra/libevent/libevent-2.1.11-stable/include/include.am
new file mode 100644
index 000000000000..aaa2042af1f6
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/include/include.am
@@ -0,0 +1,49 @@
+# include/include.am for libevent
+# Copyright 2000-2007 Niels Provos
+# Copyright 2007-2012 Niels Provos and Nick Mathewson
+#
+# See LICENSE for copying information.
+
+include_event2dir = $(includedir)/event2
+
+EVENT2_EXPORT = \
+	include/event2/buffer.h \
+	include/event2/buffer_compat.h \
+	include/event2/bufferevent.h \
+	include/event2/bufferevent_compat.h \
+	include/event2/bufferevent_struct.h \
+	include/event2/dns.h \
+	include/event2/dns_compat.h \
+	include/event2/dns_struct.h \
+	include/event2/event.h \
+	include/event2/event_compat.h \
+	include/event2/event_struct.h \
+	include/event2/http.h \
+	include/event2/http_compat.h \
+	include/event2/http_struct.h \
+	include/event2/keyvalq_struct.h \
+	include/event2/listener.h \
+	include/event2/rpc.h \
+	include/event2/rpc_compat.h \
+	include/event2/rpc_struct.h \
+	include/event2/tag.h \
+	include/event2/tag_compat.h \
+	include/event2/thread.h \
+	include/event2/util.h \
+	include/event2/visibility.h
+
+if OPENSSL
+EVENT2_EXPORT += include/event2/bufferevent_ssl.h
+endif
+
+## Without the nobase_ prefixing, Automake would strip "include/event2/" from
+## the source header filename to derive the installed header filename.
+## With nobase_ the installed path is $(includedir)/include/event2/ev*.h.
+
+if INSTALL_LIBEVENT
+include_event2_HEADERS =	$(EVENT2_EXPORT)
+nodist_include_event2_HEADERS = include/event2/event-config.h
+else
+noinst_HEADERS +=		$(EVENT2_EXPORT)
+nodist_noinst_HEADERS =		include/event2/event-config.h
+endif
diff --git a/extra/libevent/libevent-2.1.11-stable/iocp-internal.h b/extra/libevent/libevent-2.1.11-stable/iocp-internal.h
new file mode 100644
index 000000000000..21e0e0af6807
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/iocp-internal.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#ifndef IOCP_INTERNAL_H_INCLUDED_
+#define IOCP_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct event_overlapped;
+struct event_iocp_port;
+struct evbuffer;
+typedef void (*iocp_callback)(struct event_overlapped *, ev_uintptr_t, ev_ssize_t, int success);
+
+/* This whole file is actually win32 only. We wrap the structures in a win32
+ * ifdef so that we can test-compile code that uses these interfaces on
+ * non-win32 platforms. */
+#ifdef _WIN32
+
+/**
+   Internal use only.  Wraps an OVERLAPPED that we're using for libevent
+   functionality.  Whenever an event_iocp_port gets an event for a given
+   OVERLAPPED*, it upcasts the pointer to an event_overlapped, and calls the
+   iocp_callback function with the event_overlapped, the iocp key, and the
+   number of bytes transferred as arguments.
+ */
+struct event_overlapped {
+	OVERLAPPED overlapped;
+	iocp_callback cb;
+};
+
+/* Mingw's headers don't define LPFN_ACCEPTEX. */
+
+typedef BOOL (WINAPI *AcceptExPtr)(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED);
+typedef BOOL (WINAPI *ConnectExPtr)(SOCKET, const struct sockaddr *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED);
+typedef void (WINAPI *GetAcceptExSockaddrsPtr)(PVOID, DWORD, DWORD, DWORD, LPSOCKADDR *, LPINT, LPSOCKADDR *, LPINT);
+
+/** Internal use only. Holds pointers to functions that only some versions of
+    Windows provide.
+ */
+struct win32_extension_fns {
+	AcceptExPtr AcceptEx;
+	ConnectExPtr ConnectEx;
+	GetAcceptExSockaddrsPtr GetAcceptExSockaddrs;
+};
+
+/**
+    Internal use only. Stores a Windows IO Completion port, along with
+    related data.
+ */
+struct event_iocp_port {
+	/** The port itself */
+	HANDLE port;
+	/* A lock to cover internal structures. */
+	CRITICAL_SECTION lock;
+	/** Number of threads ever open on the port. */
+	short n_threads;
+	/** True iff we're shutting down all the threads on this port */
+	short shutdown;
+	/** How often the threads on this port check for shutdown and other
+	 * conditions */
+	long ms;
+	/* The threads that are waiting for events. */
+	HANDLE *threads;
+	/** Number of threads currently open on this port. */
+	short n_live_threads;
+	/** A semaphore to signal when we are done shutting down. */
+	HANDLE *shutdownSemaphore;
+};
+
+EVENT2_EXPORT_SYMBOL
+const struct win32_extension_fns *event_get_win32_extension_fns_(void);
+#else
+/* Dummy definition so we can test-compile more things on unix. */
+struct event_overlapped {
+	iocp_callback cb;
+};
+#endif
+
+/** Initialize the fields in an event_overlapped.
+
+    @param overlapped The struct event_overlapped to initialize
+    @param cb The callback that should be invoked once the IO operation has
+	finished.
+ */
+EVENT2_EXPORT_SYMBOL
+void event_overlapped_init_(struct event_overlapped *, iocp_callback cb);
+
+/** Allocate and return a new evbuffer that supports overlapped IO on a given
+    socket.  The socket must be associated with an IO completion port using
+    event_iocp_port_associate_.
+*/
+EVENT2_EXPORT_SYMBOL
+struct evbuffer *evbuffer_overlapped_new_(evutil_socket_t fd);
+
+/** XXXX Document (nickm) */
+evutil_socket_t evbuffer_overlapped_get_fd_(struct evbuffer *buf);
+
+void evbuffer_overlapped_set_fd_(struct evbuffer *buf, evutil_socket_t fd);
+
+/** Start reading data onto the end of an overlapped evbuffer.
+
+    An evbuffer can only have one read pending at a time.  While the read
+    is in progress, no other data may be added to the end of the buffer.
+    The buffer must be created with event_overlapped_init_().
+    evbuffer_commit_read_() must be called in the completion callback.
+
+    @param buf The buffer to read onto
+    @param n The number of bytes to try to read.
+    @param ol Overlapped object with associated completion callback.
+    @return 0 on success, -1 on error.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_launch_read_(struct evbuffer *buf, size_t n, struct event_overlapped *ol);
+
+/** Start writing data from the start of an evbuffer.
+
+    An evbuffer can only have one write pending at a time.  While the write is
+    in progress, no other data may be removed from the front of the buffer.
+    The buffer must be created with event_overlapped_init_().
+    evbuffer_commit_write_() must be called in the completion callback.
+
+    @param buf The buffer to read onto
+    @param n The number of bytes to try to read.
+    @param ol Overlapped object with associated completion callback.
+    @return 0 on success, -1 on error.
+ */
+EVENT2_EXPORT_SYMBOL
+int evbuffer_launch_write_(struct evbuffer *buf, ev_ssize_t n, struct event_overlapped *ol);
+
+/** XXX document */
+EVENT2_EXPORT_SYMBOL
+void evbuffer_commit_read_(struct evbuffer *, ev_ssize_t);
+EVENT2_EXPORT_SYMBOL
+void evbuffer_commit_write_(struct evbuffer *, ev_ssize_t);
+
+/** Create an IOCP, and launch its worker threads.  Internal use only.
+
+    This interface is unstable, and will change.
+ */
+EVENT2_EXPORT_SYMBOL
+struct event_iocp_port *event_iocp_port_launch_(int n_cpus);
+
+/** Associate a file descriptor with an iocp, such that overlapped IO on the
+    fd will happen on one of the iocp's worker threads.
+*/
+EVENT2_EXPORT_SYMBOL
+int event_iocp_port_associate_(struct event_iocp_port *port, evutil_socket_t fd,
+    ev_uintptr_t key);
+
+/** Tell all threads serving an iocp to stop.  Wait for up to waitMsec for all
+    the threads to finish whatever they're doing.  If waitMsec is -1, wait
+    as long as required.  If all the threads are done, free the port and return
+    0. Otherwise, return -1.  If you get a -1 return value, it is safe to call
+    this function again.
+*/
+EVENT2_EXPORT_SYMBOL
+int event_iocp_shutdown_(struct event_iocp_port *port, long waitMsec);
+
+/* FIXME document. */
+EVENT2_EXPORT_SYMBOL
+int event_iocp_activate_overlapped_(struct event_iocp_port *port,
+    struct event_overlapped *o,
+    ev_uintptr_t key, ev_uint32_t n_bytes);
+
+struct event_base;
+/* FIXME document. */
+EVENT2_EXPORT_SYMBOL
+struct event_iocp_port *event_base_get_iocp_(struct event_base *base);
+
+/* FIXME document. */
+EVENT2_EXPORT_SYMBOL
+int event_base_start_iocp_(struct event_base *base, int n_cpus);
+void event_base_stop_iocp_(struct event_base *base);
+
+/* FIXME document. */
+EVENT2_EXPORT_SYMBOL
+struct bufferevent *bufferevent_async_new_(struct event_base *base,
+    evutil_socket_t fd, int options);
+
+/* FIXME document. */
+void bufferevent_async_set_connected_(struct bufferevent *bev);
+int bufferevent_async_can_connect_(struct bufferevent *bev);
+int bufferevent_async_connect_(struct bufferevent *bev, evutil_socket_t fd,
+	const struct sockaddr *sa, int socklen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/ipv6-internal.h b/extra/libevent/libevent-2.1.11-stable/ipv6-internal.h
new file mode 100644
index 000000000000..0c207377b8da
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ipv6-internal.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/* Internal use only: Fake IPv6 structures and values on platforms that
+ * do not have them */
+
+#ifndef IPV6_INTERNAL_H_INCLUDED_
+#define IPV6_INTERNAL_H_INCLUDED_
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include "event2/util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @file ipv6-internal.h
+ *
+ * Replacement types and functions for platforms that don't support ipv6
+ * properly.
+ */
+
+#ifndef EVENT__HAVE_STRUCT_IN6_ADDR
+struct in6_addr {
+	ev_uint8_t s6_addr[16];
+};
+#endif
+
+#ifndef EVENT__HAVE_SA_FAMILY_T
+typedef int sa_family_t;
+#endif
+
+#ifndef EVENT__HAVE_STRUCT_SOCKADDR_IN6
+struct sockaddr_in6 {
+	/* This will fail if we find a struct sockaddr that doesn't have
+	 * sa_family as the first element. */
+	sa_family_t sin6_family;
+	ev_uint16_t sin6_port;
+	struct in6_addr sin6_addr;
+};
+#endif
+
+#ifndef AF_INET6
+#define AF_INET6 3333
+#endif
+#ifndef PF_INET6
+#define PF_INET6 AF_INET6
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/kqueue-internal.h b/extra/libevent/libevent-2.1.11-stable/kqueue-internal.h
new file mode 100644
index 000000000000..02c5a3606cad
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/kqueue-internal.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef KQUEUE_INTERNAL_H_INCLUDED_
+#define KQUEUE_INTERNAL_H_INCLUDED_
+
+/** Notification function, used to tell an event base to wake up from another
+ * thread.  Only works when event_kq_add_notify_event_() has previously been
+ * called successfully on that base. */
+int event_kq_notify_base_(struct event_base *base);
+
+/** Prepare a kqueue-using event base to receive notifications via an internal
+ * EVFILT_USER event.  Return 0 on sucess, -1 on failure.
+ */
+int event_kq_add_notify_event_(struct event_base *base);
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/kqueue.c b/extra/libevent/libevent-2.1.11-stable/kqueue.c
new file mode 100644
index 000000000000..d08f512ce4b6
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/kqueue.c
@@ -0,0 +1,577 @@
+/*	$OpenBSD: kqueue.c,v 1.5 2002/07/10 14:41:31 art Exp $	*/
+
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_KQUEUE
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <sys/event.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#ifdef EVENT__HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/* Some platforms apparently define the udata field of struct kevent as
+ * intptr_t, whereas others define it as void*.  There doesn't seem to be an
+ * easy way to tell them apart via autoconf, so we need to use OS macros. */
+#if defined(EVENT__HAVE_INTTYPES_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__darwin__) && !defined(__APPLE__) && !defined(__CloudABI__)
+#define PTR_TO_UDATA(x)	((intptr_t)(x))
+#define INT_TO_UDATA(x) ((intptr_t)(x))
+#else
+#define PTR_TO_UDATA(x)	(x)
+#define INT_TO_UDATA(x) ((void*)(x))
+#endif
+
+#include "event-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "event2/thread.h"
+#include "event2/util.h"
+#include "evthread-internal.h"
+#include "changelist-internal.h"
+
+#include "kqueue-internal.h"
+
+#define NEVENT		64
+
+struct kqop {
+	struct kevent *changes;
+	int changes_size;
+
+	struct kevent *events;
+	int events_size;
+	int kq;
+	int notify_event_added;
+	pid_t pid;
+};
+
+static void kqop_free(struct kqop *kqop);
+
+static void *kq_init(struct event_base *);
+static int kq_sig_add(struct event_base *, int, short, short, void *);
+static int kq_sig_del(struct event_base *, int, short, short, void *);
+static int kq_dispatch(struct event_base *, struct timeval *);
+static void kq_dealloc(struct event_base *);
+
+const struct eventop kqops = {
+	"kqueue",
+	kq_init,
+	event_changelist_add_,
+	event_changelist_del_,
+	kq_dispatch,
+	kq_dealloc,
+	1 /* need reinit */,
+    EV_FEATURE_ET|EV_FEATURE_O1|EV_FEATURE_FDS,
+	EVENT_CHANGELIST_FDINFO_SIZE
+};
+
+static const struct eventop kqsigops = {
+	"kqueue_signal",
+	NULL,
+	kq_sig_add,
+	kq_sig_del,
+	NULL,
+	NULL,
+	1 /* need reinit */,
+	0,
+	0
+};
+
+static void *
+kq_init(struct event_base *base)
+{
+	int kq = -1;
+	struct kqop *kqueueop = NULL;
+
+	if (!(kqueueop = mm_calloc(1, sizeof(struct kqop))))
+		return (NULL);
+
+/* Initialize the kernel queue */
+
+	if ((kq = kqueue()) == -1) {
+		event_warn("kqueue");
+		goto err;
+	}
+
+	kqueueop->kq = kq;
+
+	kqueueop->pid = getpid();
+
+	/* Initialize fields */
+	kqueueop->changes = mm_calloc(NEVENT, sizeof(struct kevent));
+	if (kqueueop->changes == NULL)
+		goto err;
+	kqueueop->events = mm_calloc(NEVENT, sizeof(struct kevent));
+	if (kqueueop->events == NULL)
+		goto err;
+	kqueueop->events_size = kqueueop->changes_size = NEVENT;
+
+	/* Check for Mac OS X kqueue bug. */
+	memset(&kqueueop->changes[0], 0, sizeof kqueueop->changes[0]);
+	kqueueop->changes[0].ident = -1;
+	kqueueop->changes[0].filter = EVFILT_READ;
+	kqueueop->changes[0].flags = EV_ADD;
+	/*
+	 * If kqueue works, then kevent will succeed, and it will
+	 * stick an error in events[0].  If kqueue is broken, then
+	 * kevent will fail.
+	 */
+	if (kevent(kq,
+		kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 ||
+	    (int)kqueueop->events[0].ident != -1 ||
+	    !(kqueueop->events[0].flags & EV_ERROR)) {
+		event_warn("%s: detected broken kqueue; not using.", __func__);
+		goto err;
+	}
+
+	base->evsigsel = &kqsigops;
+
+	return (kqueueop);
+err:
+	if (kqueueop)
+		kqop_free(kqueueop);
+
+	return (NULL);
+}
+
+#define ADD_UDATA 0x30303
+
+static void
+kq_setup_kevent(struct kevent *out, evutil_socket_t fd, int filter, short change)
+{
+	memset(out, 0, sizeof(struct kevent));
+	out->ident = fd;
+	out->filter = filter;
+
+	if (change & EV_CHANGE_ADD) {
+		out->flags = EV_ADD;
+		/* We set a magic number here so that we can tell 'add'
+		 * errors from 'del' errors. */
+		out->udata = INT_TO_UDATA(ADD_UDATA);
+		if (change & EV_ET)
+			out->flags |= EV_CLEAR;
+#ifdef NOTE_EOF
+		/* Make it behave like select() and poll() */
+		if (filter == EVFILT_READ)
+			out->fflags = NOTE_EOF;
+#endif
+	} else {
+		EVUTIL_ASSERT(change & EV_CHANGE_DEL);
+		out->flags = EV_DELETE;
+	}
+}
+
+static int
+kq_build_changes_list(const struct event_changelist *changelist,
+    struct kqop *kqop)
+{
+	int i;
+	int n_changes = 0;
+
+	for (i = 0; i < changelist->n_changes; ++i) {
+		struct event_change *in_ch = &changelist->changes[i];
+		struct kevent *out_ch;
+		if (n_changes >= kqop->changes_size - 1) {
+			int newsize;
+			struct kevent *newchanges;
+
+			if (kqop->changes_size > INT_MAX / 2 ||
+			    (size_t)kqop->changes_size * 2 > EV_SIZE_MAX /
+			    sizeof(struct kevent)) {
+				event_warnx("%s: int overflow", __func__);
+				return (-1);
+			}
+
+			newsize = kqop->changes_size * 2;
+			newchanges = mm_realloc(kqop->changes,
+			    newsize * sizeof(struct kevent));
+			if (newchanges == NULL) {
+				event_warn("%s: realloc", __func__);
+				return (-1);
+			}
+			kqop->changes = newchanges;
+			kqop->changes_size = newsize;
+		}
+		if (in_ch->read_change) {
+			out_ch = &kqop->changes[n_changes++];
+			kq_setup_kevent(out_ch, in_ch->fd, EVFILT_READ,
+			    in_ch->read_change);
+		}
+		if (in_ch->write_change) {
+			out_ch = &kqop->changes[n_changes++];
+			kq_setup_kevent(out_ch, in_ch->fd, EVFILT_WRITE,
+			    in_ch->write_change);
+		}
+	}
+	return n_changes;
+}
+
+static int
+kq_grow_events(struct kqop *kqop, size_t new_size)
+{
+	struct kevent *newresult;
+
+	newresult = mm_realloc(kqop->events,
+	    new_size * sizeof(struct kevent));
+
+	if (newresult) {
+		kqop->events = newresult;
+		kqop->events_size = new_size;
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+static int
+kq_dispatch(struct event_base *base, struct timeval *tv)
+{
+	struct kqop *kqop = base->evbase;
+	struct kevent *events = kqop->events;
+	struct kevent *changes;
+	struct timespec ts, *ts_p = NULL;
+	int i, n_changes, res;
+
+	if (tv != NULL) {
+		ts.tv_sec = tv->tv_sec;
+		ts.tv_nsec = tv->tv_usec * 1000;
+		ts_p = &ts;
+	}
+
+	/* Build "changes" from "base->changes" */
+	EVUTIL_ASSERT(kqop->changes);
+	n_changes = kq_build_changes_list(&base->changelist, kqop);
+	if (n_changes < 0)
+		return -1;
+
+	event_changelist_remove_all_(&base->changelist, base);
+
+	/* steal the changes array in case some broken code tries to call
+	 * dispatch twice at once. */
+	changes = kqop->changes;
+	kqop->changes = NULL;
+
+	/* Make sure that 'events' is at least as long as the list of changes:
+	 * otherwise errors in the changes can get reported as a -1 return
+	 * value from kevent() rather than as EV_ERROR events in the events
+	 * array.
+	 *
+	 * (We could instead handle -1 return values from kevent() by
+	 * retrying with a smaller changes array or a larger events array,
+	 * but this approach seems less risky for now.)
+	 */
+	if (kqop->events_size < n_changes) {
+		int new_size = kqop->events_size;
+		do {
+			new_size *= 2;
+		} while (new_size < n_changes);
+
+		kq_grow_events(kqop, new_size);
+		events = kqop->events;
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = kevent(kqop->kq, changes, n_changes,
+	    events, kqop->events_size, ts_p);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	EVUTIL_ASSERT(kqop->changes == NULL);
+	kqop->changes = changes;
+
+	if (res == -1) {
+		if (errno != EINTR) {
+			event_warn("kevent");
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	event_debug(("%s: kevent reports %d", __func__, res));
+
+	for (i = 0; i < res; i++) {
+		int which = 0;
+
+		if (events[i].flags & EV_ERROR) {
+			switch (events[i].data) {
+
+			/* Can occur on delete if we are not currently
+			 * watching any events on this fd.  That can
+			 * happen when the fd was closed and another
+			 * file was opened with that fd. */
+			case ENOENT:
+			/* Can occur for reasons not fully understood
+			 * on FreeBSD. */
+			case EINVAL:
+				continue;
+#if defined(__FreeBSD__)
+			/*
+			 * This currently occurs if an FD is closed
+			 * before the EV_DELETE makes it out via kevent().
+			 * The FreeBSD capabilities code sees the blank
+			 * capability set and rejects the request to
+			 * modify an event.
+			 *
+			 * To be strictly correct - when an FD is closed,
+			 * all the registered events are also removed.
+			 * Queuing EV_DELETE to a closed FD is wrong.
+			 * The event(s) should just be deleted from
+			 * the pending changelist.
+			 */
+			case ENOTCAPABLE:
+				continue;
+#endif
+
+			/* Can occur on a delete if the fd is closed. */
+			case EBADF:
+				/* XXXX On NetBSD, we can also get EBADF if we
+				 * try to add the write side of a pipe, but
+				 * the read side has already been closed.
+				 * Other BSDs call this situation 'EPIPE'. It
+				 * would be good if we had a way to report
+				 * this situation. */
+				continue;
+			/* These two can occur on an add if the fd was one side
+			 * of a pipe, and the other side was closed. */
+			case EPERM:
+			case EPIPE:
+				/* Report read events, if we're listening for
+				 * them, so that the user can learn about any
+				 * add errors.  (If the operation was a
+				 * delete, then udata should be cleared.) */
+				if (events[i].udata) {
+					/* The operation was an add:
+					 * report the error as a read. */
+					which |= EV_READ;
+					break;
+				} else {
+					/* The operation was a del:
+					 * report nothing. */
+					continue;
+				}
+
+			/* Other errors shouldn't occur. */
+			default:
+				errno = events[i].data;
+				return (-1);
+			}
+		} else if (events[i].filter == EVFILT_READ) {
+			which |= EV_READ;
+		} else if (events[i].filter == EVFILT_WRITE) {
+			which |= EV_WRITE;
+		} else if (events[i].filter == EVFILT_SIGNAL) {
+			which |= EV_SIGNAL;
+#ifdef EVFILT_USER
+		} else if (events[i].filter == EVFILT_USER) {
+			base->is_notify_pending = 0;
+#endif
+		}
+
+		if (!which)
+			continue;
+
+		if (events[i].filter == EVFILT_SIGNAL) {
+			evmap_signal_active_(base, events[i].ident, 1);
+		} else {
+			evmap_io_active_(base, events[i].ident, which | EV_ET);
+		}
+	}
+
+	if (res == kqop->events_size) {
+		/* We used all the events space that we have. Maybe we should
+		   make it bigger. */
+		kq_grow_events(kqop, kqop->events_size * 2);
+	}
+
+	return (0);
+}
+
+static void
+kqop_free(struct kqop *kqop)
+{
+	if (kqop->changes)
+		mm_free(kqop->changes);
+	if (kqop->events)
+		mm_free(kqop->events);
+	if (kqop->kq >= 0 && kqop->pid == getpid())
+		close(kqop->kq);
+	memset(kqop, 0, sizeof(struct kqop));
+	mm_free(kqop);
+}
+
+static void
+kq_dealloc(struct event_base *base)
+{
+	struct kqop *kqop = base->evbase;
+	evsig_dealloc_(base);
+	kqop_free(kqop);
+}
+
+/* signal handling */
+static int
+kq_sig_add(struct event_base *base, int nsignal, short old, short events, void *p)
+{
+	struct kqop *kqop = base->evbase;
+	struct kevent kev;
+	struct timespec timeout = { 0, 0 };
+	(void)p;
+
+	EVUTIL_ASSERT(nsignal >= 0 && nsignal < NSIG);
+
+	memset(&kev, 0, sizeof(kev));
+	kev.ident = nsignal;
+	kev.filter = EVFILT_SIGNAL;
+	kev.flags = EV_ADD;
+
+	/* Be ready for the signal if it is sent any
+	 * time between now and the next call to
+	 * kq_dispatch. */
+	if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1)
+		return (-1);
+
+        /* We can set the handler for most signals to SIG_IGN and
+         * still have them reported to us in the queue.  However,
+         * if the handler for SIGCHLD is SIG_IGN, the system reaps
+         * zombie processes for us, and we don't get any notification.
+         * This appears to be the only signal with this quirk. */
+	if (evsig_set_handler_(base, nsignal,
+                               nsignal == SIGCHLD ? SIG_DFL : SIG_IGN) == -1)
+		return (-1);
+
+	return (0);
+}
+
+static int
+kq_sig_del(struct event_base *base, int nsignal, short old, short events, void *p)
+{
+	struct kqop *kqop = base->evbase;
+	struct kevent kev;
+
+	struct timespec timeout = { 0, 0 };
+	(void)p;
+
+	EVUTIL_ASSERT(nsignal >= 0 && nsignal < NSIG);
+
+	memset(&kev, 0, sizeof(kev));
+	kev.ident = nsignal;
+	kev.filter = EVFILT_SIGNAL;
+	kev.flags = EV_DELETE;
+
+	/* Because we insert signal events
+	 * immediately, we need to delete them
+	 * immediately, too */
+	if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1)
+		return (-1);
+
+	if (evsig_restore_handler_(base, nsignal) == -1)
+		return (-1);
+
+	return (0);
+}
+
+
+/* OSX 10.6 and FreeBSD 8.1 add support for EVFILT_USER, which we can use
+ * to wake up the event loop from another thread. */
+
+/* Magic number we use for our filter ID. */
+#define NOTIFY_IDENT 42
+
+int
+event_kq_add_notify_event_(struct event_base *base)
+{
+	struct kqop *kqop = base->evbase;
+#if defined(EVFILT_USER) && defined(NOTE_TRIGGER)
+	struct kevent kev;
+	struct timespec timeout = { 0, 0 };
+#endif
+
+	if (kqop->notify_event_added)
+		return 0;
+
+#if defined(EVFILT_USER) && defined(NOTE_TRIGGER)
+	memset(&kev, 0, sizeof(kev));
+	kev.ident = NOTIFY_IDENT;
+	kev.filter = EVFILT_USER;
+	kev.flags = EV_ADD | EV_CLEAR;
+
+	if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1) {
+		event_warn("kevent: adding EVFILT_USER event");
+		return -1;
+	}
+
+	kqop->notify_event_added = 1;
+
+	return 0;
+#else
+	return -1;
+#endif
+}
+
+int
+event_kq_notify_base_(struct event_base *base)
+{
+	struct kqop *kqop = base->evbase;
+#if defined(EVFILT_USER) && defined(NOTE_TRIGGER)
+	struct kevent kev;
+	struct timespec timeout = { 0, 0 };
+#endif
+	if (! kqop->notify_event_added)
+		return -1;
+
+#if defined(EVFILT_USER) && defined(NOTE_TRIGGER)
+	memset(&kev, 0, sizeof(kev));
+	kev.ident = NOTIFY_IDENT;
+	kev.filter = EVFILT_USER;
+	kev.fflags = NOTE_TRIGGER;
+
+	if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1) {
+		event_warn("kevent: triggering EVFILT_USER event");
+		return -1;
+	}
+
+	return 0;
+#else
+	return -1;
+#endif
+}
+
+#endif /* EVENT__HAVE_KQUEUE */
diff --git a/extra/libevent/libevent-2.1.11-stable/libevent.pc.in b/extra/libevent/libevent-2.1.11-stable/libevent.pc.in
new file mode 100644
index 000000000000..7030884eebd0
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/libevent.pc.in
@@ -0,0 +1,16 @@
+#libevent pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libevent
+Description: libevent is an asynchronous notification event loop library
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -levent
+Libs.private: @LIBS@
+Cflags: -I${includedir}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/libevent_core.pc.in b/extra/libevent/libevent-2.1.11-stable/libevent_core.pc.in
new file mode 100644
index 000000000000..98ab1efe7fcb
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/libevent_core.pc.in
@@ -0,0 +1,16 @@
+#libevent pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libevent_core
+Description: libevent_core
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -levent_core
+Libs.private: @LIBS@
+Cflags: -I${includedir}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/libevent_extra.pc.in b/extra/libevent/libevent-2.1.11-stable/libevent_extra.pc.in
new file mode 100644
index 000000000000..b9633998d08e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/libevent_extra.pc.in
@@ -0,0 +1,16 @@
+#libevent pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libevent_extra
+Description: libevent_extra
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -levent_extra
+Libs.private: @LIBS@
+Cflags: -I${includedir}
+
diff --git a/extra/libevent/libevent-2.1.11-stable/libevent_openssl.pc.in b/extra/libevent/libevent-2.1.11-stable/libevent_openssl.pc.in
new file mode 100644
index 000000000000..a65d1e066800
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/libevent_openssl.pc.in
@@ -0,0 +1,16 @@
+#libevent pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libevent_openssl
+Description: libevent_openssl adds openssl-based TLS support to libevent
+Version: @VERSION@
+Requires: libevent
+Conflicts:
+Libs: -L${libdir} -levent_openssl
+Libs.private: @LIBS@ @OPENSSL_LIBS@
+Cflags: -I${includedir} @OPENSSL_INCS@
+
diff --git a/extra/libevent/libevent-2.1.11-stable/libevent_pthreads.pc.in b/extra/libevent/libevent-2.1.11-stable/libevent_pthreads.pc.in
new file mode 100644
index 000000000000..9bc2392b342e
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/libevent_pthreads.pc.in
@@ -0,0 +1,16 @@
+#libevent pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libevent_pthreads
+Description: libevent_pthreads adds pthreads-based threading support to libevent
+Version: @VERSION@
+Requires: libevent
+Conflicts:
+Libs: -L${libdir} -levent_pthreads
+Libs.private: @LIBS@ @PTHREAD_LIBS@
+Cflags: -I${includedir} @PTHREAD_CFLAGS@
+
diff --git a/extra/libevent/libevent-2.1.11-stable/listener.c b/extra/libevent/libevent-2.1.11-stable/listener.c
new file mode 100644
index 000000000000..f5c00c9c0e30
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/listener.c
@@ -0,0 +1,899 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifdef _WIN32
+#ifndef _WIN32_WINNT
+/* Minimum required for InitializeCriticalSectionAndSpinCount */
+#define _WIN32_WINNT 0x0403
+#endif
+#include <winsock2.h>
+#include <winerror.h>
+#include <ws2tcpip.h>
+#include <mswsock.h>
+#endif
+#include <errno.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "event2/listener.h"
+#include "event2/util.h"
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "mm-internal.h"
+#include "util-internal.h"
+#include "log-internal.h"
+#include "evthread-internal.h"
+#ifdef _WIN32
+#include "iocp-internal.h"
+#include "defer-internal.h"
+#include "event-internal.h"
+#endif
+
+struct evconnlistener_ops {
+	int (*enable)(struct evconnlistener *);
+	int (*disable)(struct evconnlistener *);
+	void (*destroy)(struct evconnlistener *);
+	void (*shutdown)(struct evconnlistener *);
+	evutil_socket_t (*getfd)(struct evconnlistener *);
+	struct event_base *(*getbase)(struct evconnlistener *);
+};
+
+struct evconnlistener {
+	const struct evconnlistener_ops *ops;
+	void *lock;
+	evconnlistener_cb cb;
+	evconnlistener_errorcb errorcb;
+	void *user_data;
+	unsigned flags;
+	short refcnt;
+	int accept4_flags;
+	unsigned enabled : 1;
+};
+
+struct evconnlistener_event {
+	struct evconnlistener base;
+	struct event listener;
+};
+
+#ifdef _WIN32
+struct evconnlistener_iocp {
+	struct evconnlistener base;
+	evutil_socket_t fd;
+	struct event_base *event_base;
+	struct event_iocp_port *port;
+	short n_accepting;
+	unsigned shutting_down : 1;
+	unsigned event_added : 1;
+	struct accepting_socket **accepting;
+};
+#endif
+
+#define LOCK(listener) EVLOCK_LOCK((listener)->lock, 0)
+#define UNLOCK(listener) EVLOCK_UNLOCK((listener)->lock, 0)
+
+struct evconnlistener *
+evconnlistener_new_async(struct event_base *base,
+    evconnlistener_cb cb, void *ptr, unsigned flags, int backlog,
+    evutil_socket_t fd); /* XXXX export this? */
+
+static int event_listener_enable(struct evconnlistener *);
+static int event_listener_disable(struct evconnlistener *);
+static void event_listener_destroy(struct evconnlistener *);
+static evutil_socket_t event_listener_getfd(struct evconnlistener *);
+static struct event_base *event_listener_getbase(struct evconnlistener *);
+
+#if 0
+static void
+listener_incref_and_lock(struct evconnlistener *listener)
+{
+	LOCK(listener);
+	++listener->refcnt;
+}
+#endif
+
+static int
+listener_decref_and_unlock(struct evconnlistener *listener)
+{
+	int refcnt = --listener->refcnt;
+	if (refcnt == 0) {
+		listener->ops->destroy(listener);
+		UNLOCK(listener);
+		EVTHREAD_FREE_LOCK(listener->lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+		mm_free(listener);
+		return 1;
+	} else {
+		UNLOCK(listener);
+		return 0;
+	}
+}
+
+static const struct evconnlistener_ops evconnlistener_event_ops = {
+	event_listener_enable,
+	event_listener_disable,
+	event_listener_destroy,
+	NULL, /* shutdown */
+	event_listener_getfd,
+	event_listener_getbase
+};
+
+static void listener_read_cb(evutil_socket_t, short, void *);
+
+struct evconnlistener *
+evconnlistener_new(struct event_base *base,
+    evconnlistener_cb cb, void *ptr, unsigned flags, int backlog,
+    evutil_socket_t fd)
+{
+	struct evconnlistener_event *lev;
+
+#ifdef _WIN32
+	if (base && event_base_get_iocp_(base)) {
+		const struct win32_extension_fns *ext =
+			event_get_win32_extension_fns_();
+		if (ext->AcceptEx && ext->GetAcceptExSockaddrs)
+			return evconnlistener_new_async(base, cb, ptr, flags,
+				backlog, fd);
+	}
+#endif
+
+	if (backlog > 0) {
+		if (listen(fd, backlog) < 0)
+			return NULL;
+	} else if (backlog < 0) {
+		if (listen(fd, 128) < 0)
+			return NULL;
+	}
+
+	lev = mm_calloc(1, sizeof(struct evconnlistener_event));
+	if (!lev)
+		return NULL;
+
+	lev->base.ops = &evconnlistener_event_ops;
+	lev->base.cb = cb;
+	lev->base.user_data = ptr;
+	lev->base.flags = flags;
+	lev->base.refcnt = 1;
+
+	lev->base.accept4_flags = 0;
+	if (!(flags & LEV_OPT_LEAVE_SOCKETS_BLOCKING))
+		lev->base.accept4_flags |= EVUTIL_SOCK_NONBLOCK;
+	if (flags & LEV_OPT_CLOSE_ON_EXEC)
+		lev->base.accept4_flags |= EVUTIL_SOCK_CLOEXEC;
+
+	if (flags & LEV_OPT_THREADSAFE) {
+		EVTHREAD_ALLOC_LOCK(lev->base.lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+	}
+
+	event_assign(&lev->listener, base, fd, EV_READ|EV_PERSIST,
+	    listener_read_cb, lev);
+
+	if (!(flags & LEV_OPT_DISABLED))
+	    evconnlistener_enable(&lev->base);
+
+	return &lev->base;
+}
+
+struct evconnlistener *
+evconnlistener_new_bind(struct event_base *base, evconnlistener_cb cb,
+    void *ptr, unsigned flags, int backlog, const struct sockaddr *sa,
+    int socklen)
+{
+	struct evconnlistener *listener;
+	evutil_socket_t fd;
+	int on = 1;
+	int family = sa ? sa->sa_family : AF_UNSPEC;
+	int socktype = SOCK_STREAM | EVUTIL_SOCK_NONBLOCK;
+
+	if (backlog == 0)
+		return NULL;
+
+	if (flags & LEV_OPT_CLOSE_ON_EXEC)
+		socktype |= EVUTIL_SOCK_CLOEXEC;
+
+	fd = evutil_socket_(family, socktype, 0);
+	if (fd == -1)
+		return NULL;
+
+	if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void*)&on, sizeof(on))<0)
+		goto err;
+
+	if (flags & LEV_OPT_REUSEABLE) {
+		if (evutil_make_listen_socket_reuseable(fd) < 0)
+			goto err;
+	}
+
+	if (flags & LEV_OPT_REUSEABLE_PORT) {
+		if (evutil_make_listen_socket_reuseable_port(fd) < 0)
+			goto err;
+	}
+
+	if (flags & LEV_OPT_DEFERRED_ACCEPT) {
+		if (evutil_make_tcp_listen_socket_deferred(fd) < 0)
+			goto err;
+	}
+
+	if (flags & LEV_OPT_BIND_IPV6ONLY) {
+		if (evutil_make_listen_socket_ipv6only(fd) < 0)
+			goto err;
+	}
+
+	if (sa) {
+		if (bind(fd, sa, socklen)<0)
+			goto err;
+	}
+
+	listener = evconnlistener_new(base, cb, ptr, flags, backlog, fd);
+	if (!listener)
+		goto err;
+
+	return listener;
+err:
+	evutil_closesocket(fd);
+	return NULL;
+}
+
+void
+evconnlistener_free(struct evconnlistener *lev)
+{
+	LOCK(lev);
+	lev->cb = NULL;
+	lev->errorcb = NULL;
+	if (lev->ops->shutdown)
+		lev->ops->shutdown(lev);
+	listener_decref_and_unlock(lev);
+}
+
+static void
+event_listener_destroy(struct evconnlistener *lev)
+{
+	struct evconnlistener_event *lev_e =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_event, base);
+
+	event_del(&lev_e->listener);
+	if (lev->flags & LEV_OPT_CLOSE_ON_FREE)
+		evutil_closesocket(event_get_fd(&lev_e->listener));
+	event_debug_unassign(&lev_e->listener);
+}
+
+int
+evconnlistener_enable(struct evconnlistener *lev)
+{
+	int r;
+	LOCK(lev);
+	lev->enabled = 1;
+	if (lev->cb)
+		r = lev->ops->enable(lev);
+	else
+		r = 0;
+	UNLOCK(lev);
+	return r;
+}
+
+int
+evconnlistener_disable(struct evconnlistener *lev)
+{
+	int r;
+	LOCK(lev);
+	lev->enabled = 0;
+	r = lev->ops->disable(lev);
+	UNLOCK(lev);
+	return r;
+}
+
+static int
+event_listener_enable(struct evconnlistener *lev)
+{
+	struct evconnlistener_event *lev_e =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_event, base);
+	return event_add(&lev_e->listener, NULL);
+}
+
+static int
+event_listener_disable(struct evconnlistener *lev)
+{
+	struct evconnlistener_event *lev_e =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_event, base);
+	return event_del(&lev_e->listener);
+}
+
+evutil_socket_t
+evconnlistener_get_fd(struct evconnlistener *lev)
+{
+	evutil_socket_t fd;
+	LOCK(lev);
+	fd = lev->ops->getfd(lev);
+	UNLOCK(lev);
+	return fd;
+}
+
+static evutil_socket_t
+event_listener_getfd(struct evconnlistener *lev)
+{
+	struct evconnlistener_event *lev_e =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_event, base);
+	return event_get_fd(&lev_e->listener);
+}
+
+struct event_base *
+evconnlistener_get_base(struct evconnlistener *lev)
+{
+	struct event_base *base;
+	LOCK(lev);
+	base = lev->ops->getbase(lev);
+	UNLOCK(lev);
+	return base;
+}
+
+static struct event_base *
+event_listener_getbase(struct evconnlistener *lev)
+{
+	struct evconnlistener_event *lev_e =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_event, base);
+	return event_get_base(&lev_e->listener);
+}
+
+void
+evconnlistener_set_cb(struct evconnlistener *lev,
+    evconnlistener_cb cb, void *arg)
+{
+	int enable = 0;
+	LOCK(lev);
+	if (lev->enabled && !lev->cb)
+		enable = 1;
+	lev->cb = cb;
+	lev->user_data = arg;
+	if (enable)
+		evconnlistener_enable(lev);
+	UNLOCK(lev);
+}
+
+void
+evconnlistener_set_error_cb(struct evconnlistener *lev,
+    evconnlistener_errorcb errorcb)
+{
+	LOCK(lev);
+	lev->errorcb = errorcb;
+	UNLOCK(lev);
+}
+
+static void
+listener_read_cb(evutil_socket_t fd, short what, void *p)
+{
+	struct evconnlistener *lev = p;
+	int err;
+	evconnlistener_cb cb;
+	evconnlistener_errorcb errorcb;
+	void *user_data;
+	LOCK(lev);
+	while (1) {
+		struct sockaddr_storage ss;
+		ev_socklen_t socklen = sizeof(ss);
+		evutil_socket_t new_fd = evutil_accept4_(fd, (struct sockaddr*)&ss, &socklen, lev->accept4_flags);
+		if (new_fd < 0)
+			break;
+		if (socklen == 0) {
+			/* This can happen with some older linux kernels in
+			 * response to nmap. */
+			evutil_closesocket(new_fd);
+			continue;
+		}
+
+		if (lev->cb == NULL) {
+			evutil_closesocket(new_fd);
+			UNLOCK(lev);
+			return;
+		}
+		++lev->refcnt;
+		cb = lev->cb;
+		user_data = lev->user_data;
+		UNLOCK(lev);
+		cb(lev, new_fd, (struct sockaddr*)&ss, (int)socklen,
+		    user_data);
+		LOCK(lev);
+		if (lev->refcnt == 1) {
+			int freed = listener_decref_and_unlock(lev);
+			EVUTIL_ASSERT(freed);
+			return;
+		}
+		--lev->refcnt;
+		if (!lev->enabled) {
+			/* the callback could have disabled the listener */
+			UNLOCK(lev);
+			return;
+		}
+	}
+	err = evutil_socket_geterror(fd);
+	if (EVUTIL_ERR_ACCEPT_RETRIABLE(err)) {
+		UNLOCK(lev);
+		return;
+	}
+	if (lev->errorcb != NULL) {
+		++lev->refcnt;
+		errorcb = lev->errorcb;
+		user_data = lev->user_data;
+		UNLOCK(lev);
+		errorcb(lev, user_data);
+		LOCK(lev);
+		listener_decref_and_unlock(lev);
+	} else {
+		event_sock_warn(fd, "Error from accept() call");
+		UNLOCK(lev);
+	}
+}
+
+#ifdef _WIN32
+struct accepting_socket {
+	CRITICAL_SECTION lock;
+	struct event_overlapped overlapped;
+	SOCKET s;
+	int error;
+	struct event_callback deferred;
+	struct evconnlistener_iocp *lev;
+	ev_uint8_t buflen;
+	ev_uint8_t family;
+	unsigned free_on_cb:1;
+	char addrbuf[1];
+};
+
+static void accepted_socket_cb(struct event_overlapped *o, ev_uintptr_t key,
+    ev_ssize_t n, int ok);
+static void accepted_socket_invoke_user_cb(struct event_callback *cb, void *arg);
+
+static void
+iocp_listener_event_add(struct evconnlistener_iocp *lev)
+{
+	if (lev->event_added)
+		return;
+
+	lev->event_added = 1;
+	event_base_add_virtual_(lev->event_base);
+}
+
+static void
+iocp_listener_event_del(struct evconnlistener_iocp *lev)
+{
+	if (!lev->event_added)
+		return;
+
+	lev->event_added = 0;
+	event_base_del_virtual_(lev->event_base);
+}
+
+static struct accepting_socket *
+new_accepting_socket(struct evconnlistener_iocp *lev, int family)
+{
+	struct accepting_socket *res;
+	int addrlen;
+	int buflen;
+
+	if (family == AF_INET)
+		addrlen = sizeof(struct sockaddr_in);
+	else if (family == AF_INET6)
+		addrlen = sizeof(struct sockaddr_in6);
+	else
+		return NULL;
+	buflen = (addrlen+16)*2;
+
+	res = mm_calloc(1,sizeof(struct accepting_socket)-1+buflen);
+	if (!res)
+		return NULL;
+
+	event_overlapped_init_(&res->overlapped, accepted_socket_cb);
+	res->s = EVUTIL_INVALID_SOCKET;
+	res->lev = lev;
+	res->buflen = buflen;
+	res->family = family;
+
+	event_deferred_cb_init_(&res->deferred,
+	    event_base_get_npriorities(lev->event_base) / 2,
+	    accepted_socket_invoke_user_cb, res);
+
+	InitializeCriticalSectionAndSpinCount(&res->lock, 1000);
+
+	return res;
+}
+
+static void
+free_and_unlock_accepting_socket(struct accepting_socket *as)
+{
+	/* requires lock. */
+	if (as->s != EVUTIL_INVALID_SOCKET)
+		closesocket(as->s);
+
+	LeaveCriticalSection(&as->lock);
+	DeleteCriticalSection(&as->lock);
+	mm_free(as);
+}
+
+static int
+start_accepting(struct accepting_socket *as)
+{
+	/* requires lock */
+	const struct win32_extension_fns *ext = event_get_win32_extension_fns_();
+	DWORD pending = 0;
+	SOCKET s = socket(as->family, SOCK_STREAM, 0);
+	int error = 0;
+
+	if (!as->lev->base.enabled)
+		return 0;
+
+	if (s == EVUTIL_INVALID_SOCKET) {
+		error = WSAGetLastError();
+		goto report_err;
+	}
+
+	/* XXXX It turns out we need to do this again later.  Does this call
+	 * have any effect? */
+	setsockopt(s, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
+	    (char *)&as->lev->fd, sizeof(&as->lev->fd));
+
+	if (!(as->lev->base.flags & LEV_OPT_LEAVE_SOCKETS_BLOCKING))
+		evutil_make_socket_nonblocking(s);
+
+	if (event_iocp_port_associate_(as->lev->port, s, 1) < 0) {
+		closesocket(s);
+		return -1;
+	}
+
+	as->s = s;
+
+	if (ext->AcceptEx(as->lev->fd, s, as->addrbuf, 0,
+		as->buflen/2, as->buflen/2, &pending, &as->overlapped.overlapped))
+	{
+		/* Immediate success! */
+		accepted_socket_cb(&as->overlapped, 1, 0, 1);
+	} else {
+		error = WSAGetLastError();
+		if (error != ERROR_IO_PENDING) {
+			goto report_err;
+		}
+	}
+
+	return 0;
+
+report_err:
+	as->error = error;
+	event_deferred_cb_schedule_(
+		as->lev->event_base,
+		&as->deferred);
+	return 0;
+}
+
+static void
+stop_accepting(struct accepting_socket *as)
+{
+	/* requires lock. */
+	SOCKET s = as->s;
+	as->s = EVUTIL_INVALID_SOCKET;
+	closesocket(s);
+}
+
+static void
+accepted_socket_invoke_user_cb(struct event_callback *dcb, void *arg)
+{
+	struct accepting_socket *as = arg;
+
+	struct sockaddr *sa_local=NULL, *sa_remote=NULL;
+	int socklen_local=0, socklen_remote=0;
+	const struct win32_extension_fns *ext = event_get_win32_extension_fns_();
+	struct evconnlistener *lev = &as->lev->base;
+	evutil_socket_t sock=-1;
+	void *data;
+	evconnlistener_cb cb=NULL;
+	evconnlistener_errorcb errorcb=NULL;
+	int error;
+
+	EVUTIL_ASSERT(ext->GetAcceptExSockaddrs);
+
+	LOCK(lev);
+	EnterCriticalSection(&as->lock);
+	if (as->free_on_cb) {
+		free_and_unlock_accepting_socket(as);
+		listener_decref_and_unlock(lev);
+		return;
+	}
+
+	++lev->refcnt;
+
+	error = as->error;
+	if (error) {
+		as->error = 0;
+		errorcb = lev->errorcb;
+	} else {
+		ext->GetAcceptExSockaddrs(
+			as->addrbuf, 0, as->buflen/2, as->buflen/2,
+			&sa_local, &socklen_local, &sa_remote,
+			&socklen_remote);
+		sock = as->s;
+		cb = lev->cb;
+		as->s = EVUTIL_INVALID_SOCKET;
+
+		/* We need to call this so getsockname, getpeername, and
+		 * shutdown work correctly on the accepted socket. */
+		/* XXXX handle error? */
+		setsockopt(sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
+		    (char *)&as->lev->fd, sizeof(&as->lev->fd));
+	}
+	data = lev->user_data;
+
+	LeaveCriticalSection(&as->lock);
+	UNLOCK(lev);
+
+	if (errorcb) {
+		WSASetLastError(error);
+		errorcb(lev, data);
+	} else if (cb) {
+		cb(lev, sock, sa_remote, socklen_remote, data);
+	}
+
+	LOCK(lev);
+	if (listener_decref_and_unlock(lev))
+		return;
+
+	EnterCriticalSection(&as->lock);
+	start_accepting(as);
+	LeaveCriticalSection(&as->lock);
+}
+
+static void
+accepted_socket_cb(struct event_overlapped *o, ev_uintptr_t key, ev_ssize_t n, int ok)
+{
+	struct accepting_socket *as =
+	    EVUTIL_UPCAST(o, struct accepting_socket, overlapped);
+
+	LOCK(&as->lev->base);
+	EnterCriticalSection(&as->lock);
+	if (ok) {
+		/* XXXX Don't do this if some EV_MT flag is set. */
+		event_deferred_cb_schedule_(
+			as->lev->event_base,
+			&as->deferred);
+		LeaveCriticalSection(&as->lock);
+	} else if (as->free_on_cb) {
+		struct evconnlistener *lev = &as->lev->base;
+		free_and_unlock_accepting_socket(as);
+		listener_decref_and_unlock(lev);
+		return;
+	} else if (as->s == EVUTIL_INVALID_SOCKET) {
+		/* This is okay; we were disabled by iocp_listener_disable. */
+		LeaveCriticalSection(&as->lock);
+	} else {
+		/* Some error on accept that we couldn't actually handle. */
+		BOOL ok;
+		DWORD transfer = 0, flags=0;
+		event_sock_warn(as->s, "Unexpected error on AcceptEx");
+		ok = WSAGetOverlappedResult(as->s, &o->overlapped,
+		    &transfer, FALSE, &flags);
+		if (ok) {
+			/* well, that was confusing! */
+			as->error = 1;
+		} else {
+			as->error = WSAGetLastError();
+		}
+		event_deferred_cb_schedule_(
+			as->lev->event_base,
+			&as->deferred);
+		LeaveCriticalSection(&as->lock);
+	}
+	UNLOCK(&as->lev->base);
+}
+
+static int
+iocp_listener_enable(struct evconnlistener *lev)
+{
+	int i;
+	struct evconnlistener_iocp *lev_iocp =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_iocp, base);
+
+	LOCK(lev);
+	iocp_listener_event_add(lev_iocp);
+	for (i = 0; i < lev_iocp->n_accepting; ++i) {
+		struct accepting_socket *as = lev_iocp->accepting[i];
+		if (!as)
+			continue;
+		EnterCriticalSection(&as->lock);
+		if (!as->free_on_cb && as->s == EVUTIL_INVALID_SOCKET)
+			start_accepting(as);
+		LeaveCriticalSection(&as->lock);
+	}
+	UNLOCK(lev);
+	return 0;
+}
+
+static int
+iocp_listener_disable_impl(struct evconnlistener *lev, int shutdown)
+{
+	int i;
+	struct evconnlistener_iocp *lev_iocp =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_iocp, base);
+
+	LOCK(lev);
+	iocp_listener_event_del(lev_iocp);
+	for (i = 0; i < lev_iocp->n_accepting; ++i) {
+		struct accepting_socket *as = lev_iocp->accepting[i];
+		if (!as)
+			continue;
+		EnterCriticalSection(&as->lock);
+		if (!as->free_on_cb && as->s != EVUTIL_INVALID_SOCKET) {
+			if (shutdown)
+				as->free_on_cb = 1;
+			stop_accepting(as);
+		}
+		LeaveCriticalSection(&as->lock);
+	}
+
+	if (shutdown && lev->flags & LEV_OPT_CLOSE_ON_FREE)
+		evutil_closesocket(lev_iocp->fd);
+
+	UNLOCK(lev);
+	return 0;
+}
+
+static int
+iocp_listener_disable(struct evconnlistener *lev)
+{
+	return iocp_listener_disable_impl(lev,0);
+}
+
+static void
+iocp_listener_destroy(struct evconnlistener *lev)
+{
+	struct evconnlistener_iocp *lev_iocp =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_iocp, base);
+
+	if (! lev_iocp->shutting_down) {
+		lev_iocp->shutting_down = 1;
+		iocp_listener_disable_impl(lev,1);
+	}
+
+}
+
+static evutil_socket_t
+iocp_listener_getfd(struct evconnlistener *lev)
+{
+	struct evconnlistener_iocp *lev_iocp =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_iocp, base);
+	return lev_iocp->fd;
+}
+static struct event_base *
+iocp_listener_getbase(struct evconnlistener *lev)
+{
+	struct evconnlistener_iocp *lev_iocp =
+	    EVUTIL_UPCAST(lev, struct evconnlistener_iocp, base);
+	return lev_iocp->event_base;
+}
+
+static const struct evconnlistener_ops evconnlistener_iocp_ops = {
+	iocp_listener_enable,
+	iocp_listener_disable,
+	iocp_listener_destroy,
+	iocp_listener_destroy, /* shutdown */
+	iocp_listener_getfd,
+	iocp_listener_getbase
+};
+
+/* XXX define some way to override this. */
+#define N_SOCKETS_PER_LISTENER 4
+
+struct evconnlistener *
+evconnlistener_new_async(struct event_base *base,
+    evconnlistener_cb cb, void *ptr, unsigned flags, int backlog,
+    evutil_socket_t fd)
+{
+	struct sockaddr_storage ss;
+	int socklen = sizeof(ss);
+	struct evconnlistener_iocp *lev;
+	int i;
+
+	flags |= LEV_OPT_THREADSAFE;
+
+	if (!base || !event_base_get_iocp_(base))
+		goto err;
+
+	/* XXXX duplicate code */
+	if (backlog > 0) {
+		if (listen(fd, backlog) < 0)
+			goto err;
+	} else if (backlog < 0) {
+		if (listen(fd, 128) < 0)
+			goto err;
+	}
+	if (getsockname(fd, (struct sockaddr*)&ss, &socklen)) {
+		event_sock_warn(fd, "getsockname");
+		goto err;
+	}
+	lev = mm_calloc(1, sizeof(struct evconnlistener_iocp));
+	if (!lev) {
+		event_warn("calloc");
+		goto err;
+	}
+	lev->base.ops = &evconnlistener_iocp_ops;
+	lev->base.cb = cb;
+	lev->base.user_data = ptr;
+	lev->base.flags = flags;
+	lev->base.refcnt = 1;
+	lev->base.enabled = 1;
+
+	lev->port = event_base_get_iocp_(base);
+	lev->fd = fd;
+	lev->event_base = base;
+
+
+	if (event_iocp_port_associate_(lev->port, fd, 1) < 0)
+		goto err_free_lev;
+
+	EVTHREAD_ALLOC_LOCK(lev->base.lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+
+	lev->n_accepting = N_SOCKETS_PER_LISTENER;
+	lev->accepting = mm_calloc(lev->n_accepting,
+	    sizeof(struct accepting_socket *));
+	if (!lev->accepting) {
+		event_warn("calloc");
+		goto err_delete_lock;
+	}
+	for (i = 0; i < lev->n_accepting; ++i) {
+		lev->accepting[i] = new_accepting_socket(lev, ss.ss_family);
+		if (!lev->accepting[i]) {
+			event_warnx("Couldn't create accepting socket");
+			goto err_free_accepting;
+		}
+		if (cb && start_accepting(lev->accepting[i]) < 0) {
+			event_warnx("Couldn't start accepting on socket");
+			EnterCriticalSection(&lev->accepting[i]->lock);
+			free_and_unlock_accepting_socket(lev->accepting[i]);
+			goto err_free_accepting;
+		}
+		++lev->base.refcnt;
+	}
+
+	iocp_listener_event_add(lev);
+
+	return &lev->base;
+
+err_free_accepting:
+	mm_free(lev->accepting);
+	/* XXXX free the other elements. */
+err_delete_lock:
+	EVTHREAD_FREE_LOCK(lev->base.lock, EVTHREAD_LOCKTYPE_RECURSIVE);
+err_free_lev:
+	mm_free(lev);
+err:
+	/* Don't close the fd, it is caller's responsibility. */
+	return NULL;
+}
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/log-internal.h b/extra/libevent/libevent-2.1.11-stable/log-internal.h
new file mode 100644
index 000000000000..2c31608b25be
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/log-internal.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef LOG_INTERNAL_H_INCLUDED_
+#define LOG_INTERNAL_H_INCLUDED_
+
+#include "event2/util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __GNUC__
+#define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
+#define EV_NORETURN __attribute__((noreturn))
+#else
+#define EV_CHECK_FMT(a,b)
+#define EV_NORETURN
+#endif
+
+#define EVENT_ERR_ABORT_ ((int)0xdeaddead)
+
+#if !defined(EVENT__DISABLE_DEBUG_MODE) || defined(USE_DEBUG)
+#define EVENT_DEBUG_LOGGING_ENABLED
+#endif
+
+#ifdef EVENT_DEBUG_LOGGING_ENABLED
+EVENT2_CORE_EXPORT_SYMBOL extern ev_uint32_t event_debug_logging_mask_;
+#define event_debug_get_logging_mask_() (event_debug_logging_mask_)
+#else
+#define event_debug_get_logging_mask_() (0)
+#endif
+
+EVENT2_EXPORT_SYMBOL
+void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3) EV_NORETURN;
+EVENT2_EXPORT_SYMBOL
+void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2);
+EVENT2_EXPORT_SYMBOL
+void event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...) EV_CHECK_FMT(3,4) EV_NORETURN;
+EVENT2_EXPORT_SYMBOL
+void event_sock_warn(evutil_socket_t sock, const char *fmt, ...) EV_CHECK_FMT(2,3);
+EVENT2_EXPORT_SYMBOL
+void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3) EV_NORETURN;
+EVENT2_EXPORT_SYMBOL
+void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2);
+EVENT2_EXPORT_SYMBOL
+void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2);
+EVENT2_EXPORT_SYMBOL
+void event_debugx_(const char *fmt, ...) EV_CHECK_FMT(1,2);
+
+EVENT2_EXPORT_SYMBOL
+void event_logv_(int severity, const char *errstr, const char *fmt, va_list ap)
+	EV_CHECK_FMT(3,0);
+
+#ifdef EVENT_DEBUG_LOGGING_ENABLED
+#define event_debug(x) do {			\
+	if (event_debug_get_logging_mask_()) {	\
+		event_debugx_ x;		\
+	}					\
+	} while (0)
+#else
+#define event_debug(x) ((void)0)
+#endif
+
+#undef EV_CHECK_FMT
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LOG_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/log.c b/extra/libevent/libevent-2.1.11-stable/log.c
new file mode 100644
index 000000000000..a9debb864e4f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/log.c
@@ -0,0 +1,244 @@
+/*	$OpenBSD: err.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
+
+/*
+ * log.c
+ *
+ * Based on err.c, which was adapted from OpenBSD libc *err* *warn* code.
+ *
+ * Copyright (c) 2005-2012 Niels Provos and Nick Mathewson
+ *
+ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+ *
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include "event2/event.h"
+#include "event2/util.h"
+
+#include "log-internal.h"
+
+static void event_log(int severity, const char *msg);
+static void event_exit(int errcode) EV_NORETURN;
+
+static event_fatal_cb fatal_fn = NULL;
+
+#ifdef EVENT_DEBUG_LOGGING_ENABLED
+#ifdef USE_DEBUG
+#define DEFAULT_MASK EVENT_DBG_ALL
+#else
+#define DEFAULT_MASK 0
+#endif
+
+EVENT2_EXPORT_SYMBOL ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
+#endif /* EVENT_DEBUG_LOGGING_ENABLED */
+
+void
+event_enable_debug_logging(ev_uint32_t which)
+{
+#ifdef EVENT_DEBUG_LOGGING_ENABLED
+	event_debug_logging_mask_ = which;
+#endif
+}
+
+void
+event_set_fatal_callback(event_fatal_cb cb)
+{
+	fatal_fn = cb;
+}
+
+static void
+event_exit(int errcode)
+{
+	if (fatal_fn) {
+		fatal_fn(errcode);
+		exit(errcode); /* should never be reached */
+	} else if (errcode == EVENT_ERR_ABORT_)
+		abort();
+	else
+		exit(errcode);
+}
+
+void
+event_err(int eval, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_ERR, strerror(errno), fmt, ap);
+	va_end(ap);
+	event_exit(eval);
+}
+
+void
+event_warn(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_WARN, strerror(errno), fmt, ap);
+	va_end(ap);
+}
+
+void
+event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...)
+{
+	va_list ap;
+	int err = evutil_socket_geterror(sock);
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_ERR, evutil_socket_error_to_string(err), fmt, ap);
+	va_end(ap);
+	event_exit(eval);
+}
+
+void
+event_sock_warn(evutil_socket_t sock, const char *fmt, ...)
+{
+	va_list ap;
+	int err = evutil_socket_geterror(sock);
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_WARN, evutil_socket_error_to_string(err), fmt, ap);
+	va_end(ap);
+}
+
+void
+event_errx(int eval, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_ERR, NULL, fmt, ap);
+	va_end(ap);
+	event_exit(eval);
+}
+
+void
+event_warnx(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_WARN, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void
+event_msgx(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_MSG, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void
+event_debugx_(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	event_logv_(EVENT_LOG_DEBUG, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void
+event_logv_(int severity, const char *errstr, const char *fmt, va_list ap)
+{
+	char buf[1024];
+	size_t len;
+
+	if (severity == EVENT_LOG_DEBUG && !event_debug_get_logging_mask_())
+		return;
+
+	if (fmt != NULL)
+		evutil_vsnprintf(buf, sizeof(buf), fmt, ap);
+	else
+		buf[0] = '\0';
+
+	if (errstr) {
+		len = strlen(buf);
+		if (len < sizeof(buf) - 3) {
+			evutil_snprintf(buf + len, sizeof(buf) - len, ": %s", errstr);
+		}
+	}
+
+	event_log(severity, buf);
+}
+
+static event_log_cb log_fn = NULL;
+
+void
+event_set_log_callback(event_log_cb cb)
+{
+	log_fn = cb;
+}
+
+static void
+event_log(int severity, const char *msg)
+{
+	if (log_fn)
+		log_fn(severity, msg);
+	else {
+		const char *severity_str;
+		switch (severity) {
+		case EVENT_LOG_DEBUG:
+			severity_str = "debug";
+			break;
+		case EVENT_LOG_MSG:
+			severity_str = "msg";
+			break;
+		case EVENT_LOG_WARN:
+			severity_str = "warn";
+			break;
+		case EVENT_LOG_ERR:
+			severity_str = "err";
+			break;
+		default:
+			severity_str = "???";
+			break;
+		}
+		(void)fprintf(stderr, "[%s] %s\n", severity_str, msg);
+	}
+}
diff --git a/extra/libevent/libevent-2.1.11-stable/minheap-internal.h b/extra/libevent/libevent-2.1.11-stable/minheap-internal.h
new file mode 100644
index 000000000000..b3a0eb1fb589
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/minheap-internal.h
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef MINHEAP_INTERNAL_H_INCLUDED_
+#define MINHEAP_INTERNAL_H_INCLUDED_
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event2/util.h"
+#include "util-internal.h"
+#include "mm-internal.h"
+
+typedef struct min_heap
+{
+	struct event** p;
+	unsigned n, a;
+} min_heap_t;
+
+static inline void	     min_heap_ctor_(min_heap_t* s);
+static inline void	     min_heap_dtor_(min_heap_t* s);
+static inline void	     min_heap_elem_init_(struct event* e);
+static inline int	     min_heap_elt_is_top_(const struct event *e);
+static inline int	     min_heap_empty_(min_heap_t* s);
+static inline unsigned	     min_heap_size_(min_heap_t* s);
+static inline struct event*  min_heap_top_(min_heap_t* s);
+static inline int	     min_heap_reserve_(min_heap_t* s, unsigned n);
+static inline int	     min_heap_push_(min_heap_t* s, struct event* e);
+static inline struct event*  min_heap_pop_(min_heap_t* s);
+static inline int	     min_heap_adjust_(min_heap_t *s, struct event* e);
+static inline int	     min_heap_erase_(min_heap_t* s, struct event* e);
+static inline void	     min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e);
+static inline void	     min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e);
+static inline void	     min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e);
+
+#define min_heap_elem_greater(a, b) \
+	(evutil_timercmp(&(a)->ev_timeout, &(b)->ev_timeout, >))
+
+void min_heap_ctor_(min_heap_t* s) { s->p = 0; s->n = 0; s->a = 0; }
+void min_heap_dtor_(min_heap_t* s) { if (s->p) mm_free(s->p); }
+void min_heap_elem_init_(struct event* e) { e->ev_timeout_pos.min_heap_idx = -1; }
+int min_heap_empty_(min_heap_t* s) { return 0u == s->n; }
+unsigned min_heap_size_(min_heap_t* s) { return s->n; }
+struct event* min_heap_top_(min_heap_t* s) { return s->n ? *s->p : 0; }
+
+int min_heap_push_(min_heap_t* s, struct event* e)
+{
+	if (s->n == UINT32_MAX || min_heap_reserve_(s, s->n + 1))
+		return -1;
+	min_heap_shift_up_(s, s->n++, e);
+	return 0;
+}
+
+struct event* min_heap_pop_(min_heap_t* s)
+{
+	if (s->n)
+	{
+		struct event* e = *s->p;
+		min_heap_shift_down_(s, 0u, s->p[--s->n]);
+		e->ev_timeout_pos.min_heap_idx = -1;
+		return e;
+	}
+	return 0;
+}
+
+int min_heap_elt_is_top_(const struct event *e)
+{
+	return e->ev_timeout_pos.min_heap_idx == 0;
+}
+
+int min_heap_erase_(min_heap_t* s, struct event* e)
+{
+	if (-1 != e->ev_timeout_pos.min_heap_idx)
+	{
+		struct event *last = s->p[--s->n];
+		unsigned parent = (e->ev_timeout_pos.min_heap_idx - 1) / 2;
+		/* we replace e with the last element in the heap.  We might need to
+		   shift it upward if it is less than its parent, or downward if it is
+		   greater than one or both its children. Since the children are known
+		   to be less than the parent, it can't need to shift both up and
+		   down. */
+		if (e->ev_timeout_pos.min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], last))
+			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, last);
+		else
+			min_heap_shift_down_(s, e->ev_timeout_pos.min_heap_idx, last);
+		e->ev_timeout_pos.min_heap_idx = -1;
+		return 0;
+	}
+	return -1;
+}
+
+int min_heap_adjust_(min_heap_t *s, struct event *e)
+{
+	if (-1 == e->ev_timeout_pos.min_heap_idx) {
+		return min_heap_push_(s, e);
+	} else {
+		unsigned parent = (e->ev_timeout_pos.min_heap_idx - 1) / 2;
+		/* The position of e has changed; we shift it up or down
+		 * as needed.  We can't need to do both. */
+		if (e->ev_timeout_pos.min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], e))
+			min_heap_shift_up_unconditional_(s, e->ev_timeout_pos.min_heap_idx, e);
+		else
+			min_heap_shift_down_(s, e->ev_timeout_pos.min_heap_idx, e);
+		return 0;
+	}
+}
+
+int min_heap_reserve_(min_heap_t* s, unsigned n)
+{
+	if (s->a < n)
+	{
+		struct event** p;
+		unsigned a = s->a ? s->a * 2 : 8;
+		if (a < n)
+			a = n;
+#if (SIZE_MAX == UINT32_MAX)
+		if (a > SIZE_MAX / sizeof *p)
+			return -1;
+#endif
+		if (!(p = (struct event**)mm_realloc(s->p, a * sizeof *p)))
+			return -1;
+		s->p = p;
+		s->a = a;
+	}
+	return 0;
+}
+
+void min_heap_shift_up_unconditional_(min_heap_t* s, unsigned hole_index, struct event* e)
+{
+    unsigned parent = (hole_index - 1) / 2;
+    do
+    {
+	(s->p[hole_index] = s->p[parent])->ev_timeout_pos.min_heap_idx = hole_index;
+	hole_index = parent;
+	parent = (hole_index - 1) / 2;
+    } while (hole_index && min_heap_elem_greater(s->p[parent], e));
+    (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index;
+}
+
+void min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e)
+{
+    unsigned parent = (hole_index - 1) / 2;
+    while (hole_index && min_heap_elem_greater(s->p[parent], e))
+    {
+	(s->p[hole_index] = s->p[parent])->ev_timeout_pos.min_heap_idx = hole_index;
+	hole_index = parent;
+	parent = (hole_index - 1) / 2;
+    }
+    (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index;
+}
+
+void min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e)
+{
+    unsigned min_child = 2 * (hole_index + 1);
+    while (min_child <= s->n)
+	{
+	min_child -= min_child == s->n || min_heap_elem_greater(s->p[min_child], s->p[min_child - 1]);
+	if (!(min_heap_elem_greater(e, s->p[min_child])))
+	    break;
+	(s->p[hole_index] = s->p[min_child])->ev_timeout_pos.min_heap_idx = hole_index;
+	hole_index = min_child;
+	min_child = 2 * (hole_index + 1);
+	}
+    (s->p[hole_index] = e)->ev_timeout_pos.min_heap_idx = hole_index;
+}
+
+#endif /* MINHEAP_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/mm-internal.h b/extra/libevent/libevent-2.1.11-stable/mm-internal.h
new file mode 100644
index 000000000000..7a95c9956120
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/mm-internal.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef MM_INTERNAL_H_INCLUDED_
+#define MM_INTERNAL_H_INCLUDED_
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef EVENT__DISABLE_MM_REPLACEMENT
+/* Internal use only: Memory allocation functions. We give them nice short
+ * mm_names for our own use, but make sure that the symbols have longer names
+ * so they don't conflict with other libraries (like, say, libmm). */
+
+/** Allocate uninitialized memory.
+ *
+ * @return On success, return a pointer to sz newly allocated bytes.
+ *     On failure, set errno to ENOMEM and return NULL.
+ *     If the argument sz is 0, simply return NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+void *event_mm_malloc_(size_t sz);
+
+/** Allocate memory initialized to zero.
+ *
+ * @return On success, return a pointer to (count * size) newly allocated
+ *     bytes, initialized to zero.
+ *     On failure, or if the product would result in an integer overflow,
+ *     set errno to ENOMEM and return NULL.
+ *     If either arguments are 0, simply return NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+void *event_mm_calloc_(size_t count, size_t size);
+
+/** Duplicate a string.
+ *
+ * @return On success, return a pointer to a newly allocated duplicate
+ *     of a string.
+ *     Set errno to ENOMEM and return NULL if a memory allocation error
+ *     occurs (or would occur) in the process.
+ *     If the argument str is NULL, set errno to EINVAL and return NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+char *event_mm_strdup_(const char *str);
+
+EVENT2_EXPORT_SYMBOL
+void *event_mm_realloc_(void *p, size_t sz);
+EVENT2_EXPORT_SYMBOL
+void event_mm_free_(void *p);
+#define mm_malloc(sz) event_mm_malloc_(sz)
+#define mm_calloc(count, size) event_mm_calloc_((count), (size))
+#define mm_strdup(s) event_mm_strdup_(s)
+#define mm_realloc(p, sz) event_mm_realloc_((p), (sz))
+#define mm_free(p) event_mm_free_(p)
+#else
+#define mm_malloc(sz) malloc(sz)
+#define mm_calloc(n, sz) calloc((n), (sz))
+#define mm_strdup(s) strdup(s)
+#define mm_realloc(p, sz) realloc((p), (sz))
+#define mm_free(p) free(p)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/openssl-compat.h b/extra/libevent/libevent-2.1.11-stable/openssl-compat.h
new file mode 100644
index 000000000000..5d91ac6402d8
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/openssl-compat.h
@@ -0,0 +1,44 @@
+#ifndef OPENSSL_COMPAT_H
+#define OPENSSL_COMPAT_H
+
+#include <openssl/bio.h>
+#include "util-internal.h"
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+
+static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
+{
+	BIO_METHOD *biom = calloc(1, sizeof(BIO_METHOD));
+
+	if (biom != NULL) {
+		biom->type = type;
+		biom->name = name;
+	}
+	return biom;
+}
+
+#define BIO_meth_set_write(b, f) (b)->bwrite = (f)
+#define BIO_meth_set_read(b, f) (b)->bread = (f)
+#define BIO_meth_set_puts(b, f) (b)->bputs = (f)
+#define BIO_meth_set_ctrl(b, f) (b)->ctrl = (f)
+#define BIO_meth_set_create(b, f) (b)->create = (f)
+#define BIO_meth_set_destroy(b, f) (b)->destroy = (f)
+
+#define BIO_set_init(b, val) (b)->init = (val)
+#define BIO_set_data(b, val) (b)->ptr = (val)
+#define BIO_set_shutdown(b, val) (b)->shutdown = (val)
+#define BIO_get_init(b) (b)->init
+#define BIO_get_data(b) (b)->ptr
+#define BIO_get_shutdown(b) (b)->shutdown
+
+#define TLS_method SSLv23_method
+
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
+
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+#define BIO_get_init(b) (b)->init
+#endif
+
+#endif /* OPENSSL_COMPAT_H */
diff --git a/extra/libevent/libevent-2.1.11-stable/poll.c b/extra/libevent/libevent-2.1.11-stable/poll.c
new file mode 100644
index 000000000000..fe4407117770
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/poll.c
@@ -0,0 +1,341 @@
+/*	$OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
+
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_POLL
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <poll.h>
+#include <signal.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "event-internal.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "event2/thread.h"
+#include "evthread-internal.h"
+#include "time-internal.h"
+
+struct pollidx {
+	int idxplus1;
+};
+
+struct pollop {
+	int event_count;		/* Highest number alloc */
+	int nfds;			/* Highest number used */
+	int realloc_copy;		/* True iff we must realloc
+					 * event_set_copy */
+	struct pollfd *event_set;
+	struct pollfd *event_set_copy;
+};
+
+static void *poll_init(struct event_base *);
+static int poll_add(struct event_base *, int, short old, short events, void *idx);
+static int poll_del(struct event_base *, int, short old, short events, void *idx);
+static int poll_dispatch(struct event_base *, struct timeval *);
+static void poll_dealloc(struct event_base *);
+
+const struct eventop pollops = {
+	"poll",
+	poll_init,
+	poll_add,
+	poll_del,
+	poll_dispatch,
+	poll_dealloc,
+	0, /* doesn't need_reinit */
+	EV_FEATURE_FDS,
+	sizeof(struct pollidx),
+};
+
+static void *
+poll_init(struct event_base *base)
+{
+	struct pollop *pollop;
+
+	if (!(pollop = mm_calloc(1, sizeof(struct pollop))))
+		return (NULL);
+
+	evsig_init_(base);
+
+	evutil_weakrand_seed_(&base->weakrand_seed, 0);
+
+	return (pollop);
+}
+
+#ifdef CHECK_INVARIANTS
+static void
+poll_check_ok(struct pollop *pop)
+{
+	int i, idx;
+	struct event *ev;
+
+	for (i = 0; i < pop->fd_count; ++i) {
+		idx = pop->idxplus1_by_fd[i]-1;
+		if (idx < 0)
+			continue;
+		EVUTIL_ASSERT(pop->event_set[idx].fd == i);
+	}
+	for (i = 0; i < pop->nfds; ++i) {
+		struct pollfd *pfd = &pop->event_set[i];
+		EVUTIL_ASSERT(pop->idxplus1_by_fd[pfd->fd] == i+1);
+	}
+}
+#else
+#define poll_check_ok(pop)
+#endif
+
+static int
+poll_dispatch(struct event_base *base, struct timeval *tv)
+{
+	int res, i, j, nfds;
+	long msec = -1;
+	struct pollop *pop = base->evbase;
+	struct pollfd *event_set;
+
+	poll_check_ok(pop);
+
+	nfds = pop->nfds;
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (base->th_base_lock) {
+		/* If we're using this backend in a multithreaded setting,
+		 * then we need to work on a copy of event_set, so that we can
+		 * let other threads modify the main event_set while we're
+		 * polling. If we're not multithreaded, then we'll skip the
+		 * copy step here to save memory and time. */
+		if (pop->realloc_copy) {
+			struct pollfd *tmp = mm_realloc(pop->event_set_copy,
+			    pop->event_count * sizeof(struct pollfd));
+			if (tmp == NULL) {
+				event_warn("realloc");
+				return -1;
+			}
+			pop->event_set_copy = tmp;
+			pop->realloc_copy = 0;
+		}
+		memcpy(pop->event_set_copy, pop->event_set,
+		    sizeof(struct pollfd)*nfds);
+		event_set = pop->event_set_copy;
+	} else {
+		event_set = pop->event_set;
+	}
+#else
+	event_set = pop->event_set;
+#endif
+
+	if (tv != NULL) {
+		msec = evutil_tv_to_msec_(tv);
+		if (msec < 0 || msec > INT_MAX)
+			msec = INT_MAX;
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = poll(event_set, nfds, msec);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	if (res == -1) {
+		if (errno != EINTR) {
+			event_warn("poll");
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	event_debug(("%s: poll reports %d", __func__, res));
+
+	if (res == 0 || nfds == 0)
+		return (0);
+
+	i = evutil_weakrand_range_(&base->weakrand_seed, nfds);
+	for (j = 0; j < nfds; j++) {
+		int what;
+		if (++i == nfds)
+			i = 0;
+		what = event_set[i].revents;
+		if (!what)
+			continue;
+
+		res = 0;
+
+		/* If the file gets closed notify */
+		if (what & (POLLHUP|POLLERR|POLLNVAL))
+			what |= POLLIN|POLLOUT;
+		if (what & POLLIN)
+			res |= EV_READ;
+		if (what & POLLOUT)
+			res |= EV_WRITE;
+		if (res == 0)
+			continue;
+
+		evmap_io_active_(base, event_set[i].fd, res);
+	}
+
+	return (0);
+}
+
+static int
+poll_add(struct event_base *base, int fd, short old, short events, void *idx_)
+{
+	struct pollop *pop = base->evbase;
+	struct pollfd *pfd = NULL;
+	struct pollidx *idx = idx_;
+	int i;
+
+	EVUTIL_ASSERT((events & EV_SIGNAL) == 0);
+	if (!(events & (EV_READ|EV_WRITE)))
+		return (0);
+
+	poll_check_ok(pop);
+	if (pop->nfds + 1 >= pop->event_count) {
+		struct pollfd *tmp_event_set;
+		int tmp_event_count;
+
+		if (pop->event_count < 32)
+			tmp_event_count = 32;
+		else
+			tmp_event_count = pop->event_count * 2;
+
+		/* We need more file descriptors */
+		tmp_event_set = mm_realloc(pop->event_set,
+				 tmp_event_count * sizeof(struct pollfd));
+		if (tmp_event_set == NULL) {
+			event_warn("realloc");
+			return (-1);
+		}
+		pop->event_set = tmp_event_set;
+
+		pop->event_count = tmp_event_count;
+		pop->realloc_copy = 1;
+	}
+
+	i = idx->idxplus1 - 1;
+
+	if (i >= 0) {
+		pfd = &pop->event_set[i];
+	} else {
+		i = pop->nfds++;
+		pfd = &pop->event_set[i];
+		pfd->events = 0;
+		pfd->fd = fd;
+		idx->idxplus1 = i + 1;
+	}
+
+	pfd->revents = 0;
+	if (events & EV_WRITE)
+		pfd->events |= POLLOUT;
+	if (events & EV_READ)
+		pfd->events |= POLLIN;
+	poll_check_ok(pop);
+
+	return (0);
+}
+
+/*
+ * Nothing to be done here.
+ */
+
+static int
+poll_del(struct event_base *base, int fd, short old, short events, void *idx_)
+{
+	struct pollop *pop = base->evbase;
+	struct pollfd *pfd = NULL;
+	struct pollidx *idx = idx_;
+	int i;
+
+	EVUTIL_ASSERT((events & EV_SIGNAL) == 0);
+	if (!(events & (EV_READ|EV_WRITE)))
+		return (0);
+
+	poll_check_ok(pop);
+	i = idx->idxplus1 - 1;
+	if (i < 0)
+		return (-1);
+
+	/* Do we still want to read or write? */
+	pfd = &pop->event_set[i];
+	if (events & EV_READ)
+		pfd->events &= ~POLLIN;
+	if (events & EV_WRITE)
+		pfd->events &= ~POLLOUT;
+	poll_check_ok(pop);
+	if (pfd->events)
+		/* Another event cares about that fd. */
+		return (0);
+
+	/* Okay, so we aren't interested in that fd anymore. */
+	idx->idxplus1 = 0;
+
+	--pop->nfds;
+	if (i != pop->nfds) {
+		/*
+		 * Shift the last pollfd down into the now-unoccupied
+		 * position.
+		 */
+		memcpy(&pop->event_set[i], &pop->event_set[pop->nfds],
+		       sizeof(struct pollfd));
+		idx = evmap_io_get_fdinfo_(&base->io, pop->event_set[i].fd);
+		EVUTIL_ASSERT(idx);
+		EVUTIL_ASSERT(idx->idxplus1 == pop->nfds + 1);
+		idx->idxplus1 = i + 1;
+	}
+
+	poll_check_ok(pop);
+	return (0);
+}
+
+static void
+poll_dealloc(struct event_base *base)
+{
+	struct pollop *pop = base->evbase;
+
+	evsig_dealloc_(base);
+	if (pop->event_set)
+		mm_free(pop->event_set);
+	if (pop->event_set_copy)
+		mm_free(pop->event_set_copy);
+
+	memset(pop, 0, sizeof(struct pollop));
+	mm_free(pop);
+}
+
+#endif /* EVENT__HAVE_POLL */
diff --git a/extra/libevent/libevent-2.1.11-stable/ratelim-internal.h b/extra/libevent/libevent-2.1.11-stable/ratelim-internal.h
new file mode 100644
index 000000000000..6cc1cdde2c87
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/ratelim-internal.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef RATELIM_INTERNAL_H_INCLUDED_
+#define RATELIM_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/util.h"
+
+/** A token bucket is an internal structure that tracks how many bytes we are
+ * currently willing to read or write on a given bufferevent or group of
+ * bufferevents */
+struct ev_token_bucket {
+	/** How many bytes are we willing to read or write right now? These
+	 * values are signed so that we can do "defecit spending" */
+	ev_ssize_t read_limit, write_limit;
+	/** When was this bucket last updated?  Measured in abstract 'ticks'
+	 * relative to the token bucket configuration. */
+	ev_uint32_t last_updated;
+};
+
+/** Configuration info for a token bucket or set of token buckets. */
+struct ev_token_bucket_cfg {
+	/** How many bytes are we willing to read on average per tick? */
+	size_t read_rate;
+	/** How many bytes are we willing to read at most in any one tick? */
+	size_t read_maximum;
+	/** How many bytes are we willing to write on average per tick? */
+	size_t write_rate;
+	/** How many bytes are we willing to write at most in any one tick? */
+	size_t write_maximum;
+
+	/* How long is a tick?  Note that fractions of a millisecond are
+	 * ignored. */
+	struct timeval tick_timeout;
+
+	/* How long is a tick, in milliseconds?  Derived from tick_timeout. */
+	unsigned msec_per_tick;
+};
+
+/** The current tick is 'current_tick': add bytes to 'bucket' as specified in
+ * 'cfg'. */
+int ev_token_bucket_update_(struct ev_token_bucket *bucket,
+    const struct ev_token_bucket_cfg *cfg,
+    ev_uint32_t current_tick);
+
+/** In which tick does 'tv' fall according to 'cfg'?  Note that ticks can
+ * overflow easily; your code needs to handle this. */
+ev_uint32_t ev_token_bucket_get_tick_(const struct timeval *tv,
+    const struct ev_token_bucket_cfg *cfg);
+
+/** Adjust 'bucket' to respect 'cfg', and note that it was last updated in
+ * 'current_tick'.  If 'reinitialize' is true, we are changing the
+ * configuration of 'bucket'; otherwise, we are setting it up for the first
+ * time.
+ */
+int ev_token_bucket_init_(struct ev_token_bucket *bucket,
+    const struct ev_token_bucket_cfg *cfg,
+    ev_uint32_t current_tick,
+    int reinitialize);
+
+int bufferevent_remove_from_rate_limit_group_internal_(struct bufferevent *bev,
+    int unsuspend);
+
+/** Decrease the read limit of 'b' by 'n' bytes */
+#define ev_token_bucket_decrement_read(b,n)	\
+	do {					\
+		(b)->read_limit -= (n);		\
+	} while (0)
+/** Decrease the write limit of 'b' by 'n' bytes */
+#define ev_token_bucket_decrement_write(b,n)	\
+	do {					\
+		(b)->write_limit -= (n);	\
+	} while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/select.c b/extra/libevent/libevent-2.1.11-stable/select.c
new file mode 100644
index 000000000000..8ae53cc11ec5
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/select.c
@@ -0,0 +1,346 @@
+/*	$OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
+
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_SELECT
+
+#ifdef __APPLE__
+/* Apple wants us to define this if we might ever pass more than
+ * FD_SETSIZE bits to select(). */
+#define _DARWIN_UNLIMITED_SELECT
+#endif
+
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef EVENT__HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#include <sys/queue.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "event-internal.h"
+#include "evsignal-internal.h"
+#include "event2/thread.h"
+#include "evthread-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+
+#ifndef EVENT__HAVE_FD_MASK
+/* This type is mandatory, but Android doesn't define it. */
+typedef unsigned long fd_mask;
+#endif
+
+#ifndef NFDBITS
+#define NFDBITS (sizeof(fd_mask)*8)
+#endif
+
+/* Divide positive x by y, rounding up. */
+#define DIV_ROUNDUP(x, y)   (((x)+((y)-1))/(y))
+
+/* How many bytes to allocate for N fds? */
+#define SELECT_ALLOC_SIZE(n) \
+	(DIV_ROUNDUP(n, NFDBITS) * sizeof(fd_mask))
+
+struct selectop {
+	int event_fds;		/* Highest fd in fd set */
+	int event_fdsz;
+	int resize_out_sets;
+	fd_set *event_readset_in;
+	fd_set *event_writeset_in;
+	fd_set *event_readset_out;
+	fd_set *event_writeset_out;
+};
+
+static void *select_init(struct event_base *);
+static int select_add(struct event_base *, int, short old, short events, void*);
+static int select_del(struct event_base *, int, short old, short events, void*);
+static int select_dispatch(struct event_base *, struct timeval *);
+static void select_dealloc(struct event_base *);
+
+const struct eventop selectops = {
+	"select",
+	select_init,
+	select_add,
+	select_del,
+	select_dispatch,
+	select_dealloc,
+	0, /* doesn't need reinit. */
+	EV_FEATURE_FDS,
+	0,
+};
+
+static int select_resize(struct selectop *sop, int fdsz);
+static void select_free_selectop(struct selectop *sop);
+
+static void *
+select_init(struct event_base *base)
+{
+	struct selectop *sop;
+
+	if (!(sop = mm_calloc(1, sizeof(struct selectop))))
+		return (NULL);
+
+	if (select_resize(sop, SELECT_ALLOC_SIZE(32 + 1))) {
+		select_free_selectop(sop);
+		return (NULL);
+	}
+
+	evsig_init_(base);
+
+	evutil_weakrand_seed_(&base->weakrand_seed, 0);
+
+	return (sop);
+}
+
+#ifdef CHECK_INVARIANTS
+static void
+check_selectop(struct selectop *sop)
+{
+	/* nothing to be done here */
+}
+#else
+#define check_selectop(sop) do { (void) sop; } while (0)
+#endif
+
+static int
+select_dispatch(struct event_base *base, struct timeval *tv)
+{
+	int res=0, i, j, nfds;
+	struct selectop *sop = base->evbase;
+
+	check_selectop(sop);
+	if (sop->resize_out_sets) {
+		fd_set *readset_out=NULL, *writeset_out=NULL;
+		size_t sz = sop->event_fdsz;
+		if (!(readset_out = mm_realloc(sop->event_readset_out, sz)))
+			return (-1);
+		sop->event_readset_out = readset_out;
+		if (!(writeset_out = mm_realloc(sop->event_writeset_out, sz))) {
+			/* We don't free readset_out here, since it was
+			 * already successfully reallocated. The next time
+			 * we call select_dispatch, the realloc will be a
+			 * no-op. */
+			return (-1);
+		}
+		sop->event_writeset_out = writeset_out;
+		sop->resize_out_sets = 0;
+	}
+
+	memcpy(sop->event_readset_out, sop->event_readset_in,
+	       sop->event_fdsz);
+	memcpy(sop->event_writeset_out, sop->event_writeset_in,
+	       sop->event_fdsz);
+
+	nfds = sop->event_fds+1;
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = select(nfds, sop->event_readset_out,
+	    sop->event_writeset_out, NULL, tv);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	check_selectop(sop);
+
+	if (res == -1) {
+		if (errno != EINTR) {
+			event_warn("select");
+			return (-1);
+		}
+
+		return (0);
+	}
+
+	event_debug(("%s: select reports %d", __func__, res));
+
+	check_selectop(sop);
+	i = evutil_weakrand_range_(&base->weakrand_seed, nfds);
+	for (j = 0; j < nfds; ++j) {
+		if (++i >= nfds)
+			i = 0;
+		res = 0;
+		if (FD_ISSET(i, sop->event_readset_out))
+			res |= EV_READ;
+		if (FD_ISSET(i, sop->event_writeset_out))
+			res |= EV_WRITE;
+
+		if (res == 0)
+			continue;
+
+		evmap_io_active_(base, i, res);
+	}
+	check_selectop(sop);
+
+	return (0);
+}
+
+static int
+select_resize(struct selectop *sop, int fdsz)
+{
+	fd_set *readset_in = NULL;
+	fd_set *writeset_in = NULL;
+
+	if (sop->event_readset_in)
+		check_selectop(sop);
+
+	if ((readset_in = mm_realloc(sop->event_readset_in, fdsz)) == NULL)
+		goto error;
+	sop->event_readset_in = readset_in;
+	if ((writeset_in = mm_realloc(sop->event_writeset_in, fdsz)) == NULL) {
+		/* Note that this will leave event_readset_in expanded.
+		 * That's okay; we wouldn't want to free it, since that would
+		 * change the semantics of select_resize from "expand the
+		 * readset_in and writeset_in, or return -1" to "expand the
+		 * *set_in members, or trash them and return -1."
+		 */
+		goto error;
+	}
+	sop->event_writeset_in = writeset_in;
+	sop->resize_out_sets = 1;
+
+	memset((char *)sop->event_readset_in + sop->event_fdsz, 0,
+	    fdsz - sop->event_fdsz);
+	memset((char *)sop->event_writeset_in + sop->event_fdsz, 0,
+	    fdsz - sop->event_fdsz);
+
+	sop->event_fdsz = fdsz;
+	check_selectop(sop);
+
+	return (0);
+
+ error:
+	event_warn("malloc");
+	return (-1);
+}
+
+
+static int
+select_add(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct selectop *sop = base->evbase;
+	(void) p;
+
+	EVUTIL_ASSERT((events & EV_SIGNAL) == 0);
+	check_selectop(sop);
+	/*
+	 * Keep track of the highest fd, so that we can calculate the size
+	 * of the fd_sets for select(2)
+	 */
+	if (sop->event_fds < fd) {
+		int fdsz = sop->event_fdsz;
+
+		if (fdsz < (int)sizeof(fd_mask))
+			fdsz = (int)sizeof(fd_mask);
+
+		/* In theory we should worry about overflow here.  In
+		 * reality, though, the highest fd on a unixy system will
+		 * not overflow here. XXXX */
+		while (fdsz < (int) SELECT_ALLOC_SIZE(fd + 1))
+			fdsz *= 2;
+
+		if (fdsz != sop->event_fdsz) {
+			if (select_resize(sop, fdsz)) {
+				check_selectop(sop);
+				return (-1);
+			}
+		}
+
+		sop->event_fds = fd;
+	}
+
+	if (events & EV_READ)
+		FD_SET(fd, sop->event_readset_in);
+	if (events & EV_WRITE)
+		FD_SET(fd, sop->event_writeset_in);
+	check_selectop(sop);
+
+	return (0);
+}
+
+/*
+ * Nothing to be done here.
+ */
+
+static int
+select_del(struct event_base *base, int fd, short old, short events, void *p)
+{
+	struct selectop *sop = base->evbase;
+	(void)p;
+
+	EVUTIL_ASSERT((events & EV_SIGNAL) == 0);
+	check_selectop(sop);
+
+	if (sop->event_fds < fd) {
+		check_selectop(sop);
+		return (0);
+	}
+
+	if (events & EV_READ)
+		FD_CLR(fd, sop->event_readset_in);
+
+	if (events & EV_WRITE)
+		FD_CLR(fd, sop->event_writeset_in);
+
+	check_selectop(sop);
+	return (0);
+}
+
+static void
+select_free_selectop(struct selectop *sop)
+{
+	if (sop->event_readset_in)
+		mm_free(sop->event_readset_in);
+	if (sop->event_writeset_in)
+		mm_free(sop->event_writeset_in);
+	if (sop->event_readset_out)
+		mm_free(sop->event_readset_out);
+	if (sop->event_writeset_out)
+		mm_free(sop->event_writeset_out);
+
+	memset(sop, 0, sizeof(struct selectop));
+	mm_free(sop);
+}
+
+static void
+select_dealloc(struct event_base *base)
+{
+	evsig_dealloc_(base);
+
+	select_free_selectop(base->evbase);
+}
+
+#endif /* EVENT__HAVE_SELECT */
diff --git a/extra/libevent/libevent-2.1.11-stable/signal.c b/extra/libevent/libevent-2.1.11-stable/signal.c
new file mode 100644
index 000000000000..89f5fc171763
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/signal.c
@@ -0,0 +1,481 @@
+/*	$OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
+
+/*
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+#include <sys/types.h>
+#ifdef EVENT__HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef EVENT__HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifdef EVENT__HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#include "event2/event.h"
+#include "event2/event_struct.h"
+#include "event-internal.h"
+#include "event2/util.h"
+#include "evsignal-internal.h"
+#include "log-internal.h"
+#include "evmap-internal.h"
+#include "evthread-internal.h"
+
+/*
+  signal.c
+
+  This is the signal-handling implementation we use for backends that don't
+  have a better way to do signal handling.  It uses sigaction() or signal()
+  to set a signal handler, and a socket pair to tell the event base when
+
+  Note that I said "the event base" : only one event base can be set up to use
+  this at a time.  For historical reasons and backward compatibility, if you
+  add an event for a signal to event_base A, then add an event for a signal
+  (any signal!) to event_base B, event_base B will get informed about the
+  signal, but event_base A won't.
+
+  It would be neat to change this behavior in some future version of Libevent.
+  kqueue already does something far more sensible.  We can make all backends
+  on Linux do a reasonable thing using signalfd.
+*/
+
+#ifndef _WIN32
+/* Windows wants us to call our signal handlers as __cdecl.  Nobody else
+ * expects you to do anything crazy like this. */
+#ifndef __cdecl
+#define __cdecl
+#endif
+#endif
+
+static int evsig_add(struct event_base *, evutil_socket_t, short, short, void *);
+static int evsig_del(struct event_base *, evutil_socket_t, short, short, void *);
+
+static const struct eventop evsigops = {
+	"signal",
+	NULL,
+	evsig_add,
+	evsig_del,
+	NULL,
+	NULL,
+	0, 0, 0
+};
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+/* Lock for evsig_base and evsig_base_n_signals_added fields. */
+static void *evsig_base_lock = NULL;
+#endif
+/* The event base that's currently getting informed about signals. */
+static struct event_base *evsig_base = NULL;
+/* A copy of evsig_base->sigev_n_signals_added. */
+static int evsig_base_n_signals_added = 0;
+static evutil_socket_t evsig_base_fd = -1;
+
+static void __cdecl evsig_handler(int sig);
+
+#define EVSIGBASE_LOCK() EVLOCK_LOCK(evsig_base_lock, 0)
+#define EVSIGBASE_UNLOCK() EVLOCK_UNLOCK(evsig_base_lock, 0)
+
+void
+evsig_set_base_(struct event_base *base)
+{
+	EVSIGBASE_LOCK();
+	evsig_base = base;
+	evsig_base_n_signals_added = base->sig.ev_n_signals_added;
+	evsig_base_fd = base->sig.ev_signal_pair[1];
+	EVSIGBASE_UNLOCK();
+}
+
+/* Callback for when the signal handler write a byte to our signaling socket */
+static void
+evsig_cb(evutil_socket_t fd, short what, void *arg)
+{
+	static char signals[1024];
+	ev_ssize_t n;
+	int i;
+	int ncaught[NSIG];
+	struct event_base *base;
+
+	base = arg;
+
+	memset(&ncaught, 0, sizeof(ncaught));
+
+	while (1) {
+#ifdef _WIN32
+		n = recv(fd, signals, sizeof(signals), 0);
+#else
+		n = read(fd, signals, sizeof(signals));
+#endif
+		if (n == -1) {
+			int err = evutil_socket_geterror(fd);
+			if (! EVUTIL_ERR_RW_RETRIABLE(err))
+				event_sock_err(1, fd, "%s: recv", __func__);
+			break;
+		} else if (n == 0) {
+			/* XXX warn? */
+			break;
+		}
+		for (i = 0; i < n; ++i) {
+			ev_uint8_t sig = signals[i];
+			if (sig < NSIG)
+				ncaught[sig]++;
+		}
+	}
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+	for (i = 0; i < NSIG; ++i) {
+		if (ncaught[i])
+			evmap_signal_active_(base, i, ncaught[i]);
+	}
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+}
+
+int
+evsig_init_(struct event_base *base)
+{
+	/*
+	 * Our signal handler is going to write to one end of the socket
+	 * pair to wake up our event loop.  The event loop then scans for
+	 * signals that got delivered.
+	 */
+	if (evutil_make_internal_pipe_(base->sig.ev_signal_pair) == -1) {
+#ifdef _WIN32
+		/* Make this nonfatal on win32, where sometimes people
+		   have localhost firewalled. */
+		event_sock_warn(-1, "%s: socketpair", __func__);
+#else
+		event_sock_err(1, -1, "%s: socketpair", __func__);
+#endif
+		return -1;
+	}
+
+	if (base->sig.sh_old) {
+		mm_free(base->sig.sh_old);
+	}
+	base->sig.sh_old = NULL;
+	base->sig.sh_old_max = 0;
+
+	event_assign(&base->sig.ev_signal, base, base->sig.ev_signal_pair[0],
+		EV_READ | EV_PERSIST, evsig_cb, base);
+
+	base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
+	event_priority_set(&base->sig.ev_signal, 0);
+
+	base->evsigsel = &evsigops;
+
+	return 0;
+}
+
+/* Helper: set the signal handler for evsignal to handler in base, so that
+ * we can restore the original handler when we clear the current one. */
+int
+evsig_set_handler_(struct event_base *base,
+    int evsignal, void (__cdecl *handler)(int))
+{
+#ifdef EVENT__HAVE_SIGACTION
+	struct sigaction sa;
+#else
+	ev_sighandler_t sh;
+#endif
+	struct evsig_info *sig = &base->sig;
+	void *p;
+
+	/*
+	 * resize saved signal handler array up to the highest signal number.
+	 * a dynamic array is used to keep footprint on the low side.
+	 */
+	if (evsignal >= sig->sh_old_max) {
+		int new_max = evsignal + 1;
+		event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing",
+			    __func__, evsignal, sig->sh_old_max));
+		p = mm_realloc(sig->sh_old, new_max * sizeof(*sig->sh_old));
+		if (p == NULL) {
+			event_warn("realloc");
+			return (-1);
+		}
+
+		memset((char *)p + sig->sh_old_max * sizeof(*sig->sh_old),
+		    0, (new_max - sig->sh_old_max) * sizeof(*sig->sh_old));
+
+		sig->sh_old_max = new_max;
+		sig->sh_old = p;
+	}
+
+	/* allocate space for previous handler out of dynamic array */
+	sig->sh_old[evsignal] = mm_malloc(sizeof *sig->sh_old[evsignal]);
+	if (sig->sh_old[evsignal] == NULL) {
+		event_warn("malloc");
+		return (-1);
+	}
+
+	/* save previous handler and setup new handler */
+#ifdef EVENT__HAVE_SIGACTION
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = handler;
+	sa.sa_flags |= SA_RESTART;
+	sigfillset(&sa.sa_mask);
+
+	if (sigaction(evsignal, &sa, sig->sh_old[evsignal]) == -1) {
+		event_warn("sigaction");
+		mm_free(sig->sh_old[evsignal]);
+		sig->sh_old[evsignal] = NULL;
+		return (-1);
+	}
+#else
+	if ((sh = signal(evsignal, handler)) == SIG_ERR) {
+		event_warn("signal");
+		mm_free(sig->sh_old[evsignal]);
+		sig->sh_old[evsignal] = NULL;
+		return (-1);
+	}
+	*sig->sh_old[evsignal] = sh;
+#endif
+
+	return (0);
+}
+
+static int
+evsig_add(struct event_base *base, evutil_socket_t evsignal, short old, short events, void *p)
+{
+	struct evsig_info *sig = &base->sig;
+	(void)p;
+
+	EVUTIL_ASSERT(evsignal >= 0 && evsignal < NSIG);
+
+	/* catch signals if they happen quickly */
+	EVSIGBASE_LOCK();
+	if (evsig_base != base && evsig_base_n_signals_added) {
+		event_warnx("Added a signal to event base %p with signals "
+		    "already added to event_base %p.  Only one can have "
+		    "signals at a time with the %s backend.  The base with "
+		    "the most recently added signal or the most recent "
+		    "event_base_loop() call gets preference; do "
+		    "not rely on this behavior in future Libevent versions.",
+		    base, evsig_base, base->evsel->name);
+	}
+	evsig_base = base;
+	evsig_base_n_signals_added = ++sig->ev_n_signals_added;
+	evsig_base_fd = base->sig.ev_signal_pair[1];
+	EVSIGBASE_UNLOCK();
+
+	event_debug(("%s: %d: changing signal handler", __func__, (int)evsignal));
+	if (evsig_set_handler_(base, (int)evsignal, evsig_handler) == -1) {
+		goto err;
+	}
+
+
+	if (!sig->ev_signal_added) {
+		if (event_add_nolock_(&sig->ev_signal, NULL, 0))
+			goto err;
+		sig->ev_signal_added = 1;
+	}
+
+	return (0);
+
+err:
+	EVSIGBASE_LOCK();
+	--evsig_base_n_signals_added;
+	--sig->ev_n_signals_added;
+	EVSIGBASE_UNLOCK();
+	return (-1);
+}
+
+int
+evsig_restore_handler_(struct event_base *base, int evsignal)
+{
+	int ret = 0;
+	struct evsig_info *sig = &base->sig;
+#ifdef EVENT__HAVE_SIGACTION
+	struct sigaction *sh;
+#else
+	ev_sighandler_t *sh;
+#endif
+
+	if (evsignal >= sig->sh_old_max) {
+		/* Can't actually restore. */
+		/* XXXX.*/
+		return 0;
+	}
+
+	/* restore previous handler */
+	sh = sig->sh_old[evsignal];
+	sig->sh_old[evsignal] = NULL;
+#ifdef EVENT__HAVE_SIGACTION
+	if (sigaction(evsignal, sh, NULL) == -1) {
+		event_warn("sigaction");
+		ret = -1;
+	}
+#else
+	if (signal(evsignal, *sh) == SIG_ERR) {
+		event_warn("signal");
+		ret = -1;
+	}
+#endif
+
+	mm_free(sh);
+
+	return ret;
+}
+
+static int
+evsig_del(struct event_base *base, evutil_socket_t evsignal, short old, short events, void *p)
+{
+	EVUTIL_ASSERT(evsignal >= 0 && evsignal < NSIG);
+
+	event_debug(("%s: "EV_SOCK_FMT": restoring signal handler",
+		__func__, EV_SOCK_ARG(evsignal)));
+
+	EVSIGBASE_LOCK();
+	--evsig_base_n_signals_added;
+	--base->sig.ev_n_signals_added;
+	EVSIGBASE_UNLOCK();
+
+	return (evsig_restore_handler_(base, (int)evsignal));
+}
+
+static void __cdecl
+evsig_handler(int sig)
+{
+	int save_errno = errno;
+#ifdef _WIN32
+	int socket_errno = EVUTIL_SOCKET_ERROR();
+#endif
+	ev_uint8_t msg;
+
+	if (evsig_base == NULL) {
+		event_warnx(
+			"%s: received signal %d, but have no base configured",
+			__func__, sig);
+		return;
+	}
+
+#ifndef EVENT__HAVE_SIGACTION
+	signal(sig, evsig_handler);
+#endif
+
+	/* Wake up our notification mechanism */
+	msg = sig;
+#ifdef _WIN32
+	send(evsig_base_fd, (char*)&msg, 1, 0);
+#else
+	{
+		int r = write(evsig_base_fd, (char*)&msg, 1);
+		(void)r; /* Suppress 'unused return value' and 'unused var' */
+	}
+#endif
+	errno = save_errno;
+#ifdef _WIN32
+	EVUTIL_SET_SOCKET_ERROR(socket_errno);
+#endif
+}
+
+void
+evsig_dealloc_(struct event_base *base)
+{
+	int i = 0;
+	if (base->sig.ev_signal_added) {
+		event_del(&base->sig.ev_signal);
+		base->sig.ev_signal_added = 0;
+	}
+	/* debug event is created in evsig_init_/event_assign even when
+	 * ev_signal_added == 0, so unassign is required */
+	event_debug_unassign(&base->sig.ev_signal);
+
+	for (i = 0; i < NSIG; ++i) {
+		if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL)
+			evsig_restore_handler_(base, i);
+	}
+	EVSIGBASE_LOCK();
+	if (base == evsig_base) {
+		evsig_base = NULL;
+		evsig_base_n_signals_added = 0;
+		evsig_base_fd = -1;
+	}
+	EVSIGBASE_UNLOCK();
+
+	if (base->sig.ev_signal_pair[0] != -1) {
+		evutil_closesocket(base->sig.ev_signal_pair[0]);
+		base->sig.ev_signal_pair[0] = -1;
+	}
+	if (base->sig.ev_signal_pair[1] != -1) {
+		evutil_closesocket(base->sig.ev_signal_pair[1]);
+		base->sig.ev_signal_pair[1] = -1;
+	}
+	base->sig.sh_old_max = 0;
+
+	/* per index frees are handled in evsig_del() */
+	if (base->sig.sh_old) {
+		mm_free(base->sig.sh_old);
+		base->sig.sh_old = NULL;
+	}
+}
+
+static void
+evsig_free_globals_locks(void)
+{
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+	if (evsig_base_lock != NULL) {
+		EVTHREAD_FREE_LOCK(evsig_base_lock, 0);
+		evsig_base_lock = NULL;
+	}
+#endif
+	return;
+}
+
+void
+evsig_free_globals_(void)
+{
+	evsig_free_globals_locks();
+}
+
+#ifndef EVENT__DISABLE_THREAD_SUPPORT
+int
+evsig_global_setup_locks_(const int enable_locks)
+{
+	EVTHREAD_SETUP_GLOBAL_LOCK(evsig_base_lock, 0);
+	return 0;
+}
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/strlcpy-internal.h b/extra/libevent/libevent-2.1.11-stable/strlcpy-internal.h
new file mode 100644
index 000000000000..4151d601d0b1
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/strlcpy-internal.h
@@ -0,0 +1,24 @@
+#ifndef STRLCPY_INTERNAL_H_INCLUDED_
+#define STRLCPY_INTERNAL_H_INCLUDED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "event2/event-config.h"
+#include "event2/visibility.h"
+#include "evconfig-private.h"
+
+#ifndef EVENT__HAVE_STRLCPY
+#include <string.h>
+EVENT2_EXPORT_SYMBOL
+size_t event_strlcpy_(char *dst, const char *src, size_t siz);
+#define strlcpy event_strlcpy_
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/extra/libevent/libevent-2.1.11-stable/strlcpy.c b/extra/libevent/libevent-2.1.11-stable/strlcpy.c
new file mode 100644
index 000000000000..3876475f5a6f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/strlcpy.c
@@ -0,0 +1,75 @@
+/*	$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <sys/types.h>
+
+#ifndef EVENT__HAVE_STRLCPY
+#include "strlcpy-internal.h"
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+event_strlcpy_(dst, src, siz)
+	char *dst;
+	const char *src;
+	size_t siz;
+{
+	register char *d = dst;
+	register const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return (s - src - 1);	/* count does not include NUL */
+}
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/time-internal.h b/extra/libevent/libevent-2.1.11-stable/time-internal.h
new file mode 100644
index 000000000000..e79e6a528dee
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/time-internal.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef TIME_INTERNAL_H_INCLUDED_
+#define TIME_INTERNAL_H_INCLUDED_
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef EVENT__HAVE_MACH_MACH_TIME_H
+/* For mach_timebase_info */
+#include <mach/mach_time.h>
+#endif
+
+#include <time.h>
+
+#include "event2/util.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(EVENT__HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
+#define HAVE_POSIX_MONOTONIC
+#elif defined(EVENT__HAVE_MACH_ABSOLUTE_TIME)
+#define HAVE_MACH_MONOTONIC
+#elif defined(_WIN32)
+#define HAVE_WIN32_MONOTONIC
+#else
+#define HAVE_FALLBACK_MONOTONIC
+#endif
+
+long evutil_tv_to_msec_(const struct timeval *tv);
+EVENT2_EXPORT_SYMBOL
+void evutil_usleep_(const struct timeval *tv);
+
+#ifdef _WIN32
+typedef ULONGLONG (WINAPI *ev_GetTickCount_func)(void);
+#endif
+
+struct evutil_monotonic_timer {
+
+#ifdef HAVE_MACH_MONOTONIC
+	struct mach_timebase_info mach_timebase_units;
+#endif
+
+#ifdef HAVE_POSIX_MONOTONIC
+	int monotonic_clock;
+#endif
+
+#ifdef HAVE_WIN32_MONOTONIC
+	ev_GetTickCount_func GetTickCount64_fn;
+	ev_GetTickCount_func GetTickCount_fn;
+	ev_uint64_t last_tick_count;
+	ev_uint64_t adjust_tick_count;
+
+	ev_uint64_t first_tick;
+	ev_uint64_t first_counter;
+	double usec_per_count;
+	int use_performance_counter;
+#endif
+
+	struct timeval adjust_monotonic_clock;
+	struct timeval last_time;
+};
+
+EVENT2_EXPORT_SYMBOL
+int evutil_configure_monotonic_time_(struct evutil_monotonic_timer *mt,
+    int flags);
+EVENT2_EXPORT_SYMBOL
+int evutil_gettime_monotonic_(struct evutil_monotonic_timer *mt, struct timeval *tv);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EVENT_INTERNAL_H_INCLUDED_ */
diff --git a/extra/libevent/libevent-2.1.11-stable/util-internal.h b/extra/libevent/libevent-2.1.11-stable/util-internal.h
new file mode 100644
index 000000000000..ae0302ba4a68
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/util-internal.h
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef UTIL_INTERNAL_H_INCLUDED_
+#define UTIL_INTERNAL_H_INCLUDED_
+
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#include <errno.h>
+
+/* For EVUTIL_ASSERT */
+#include "log-internal.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef EVENT__HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef EVENT__HAVE_SYS_EVENTFD_H
+#include <sys/eventfd.h>
+#endif
+#include "event2/util.h"
+
+#include "time-internal.h"
+#include "ipv6-internal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* __has_attribute() wrapper */
+#ifdef __has_attribute
+# define EVUTIL_HAS_ATTRIBUTE __has_attribute
+#endif
+/** clang 3 __has_attribute misbehaves in some versions */
+#if defined(__clang__) && __clang__ == 1
+# if defined(__apple_build_version__)
+#  if __clang_major__ <= 6
+#   undef EVUTIL_HAS_ATTRIBUTE
+#  endif
+# else /* !__apple_build_version__ */
+#  if __clang_major__ == 3 && __clang_minor__ >= 2 && __clang_minor__ <= 5
+#   undef EVUTIL_HAS_ATTRIBUTE
+#  endif
+# endif /* __apple_build_version__ */
+#endif /*\ defined(__clang__) && __clang__ == 1 */
+#ifndef EVUTIL_HAS_ATTRIBUTE
+# define EVUTIL_HAS_ATTRIBUTE(x) 0
+#endif
+
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# undef EVUTIL_HAS_ATTRIBUTE
+# define EVUTIL_HAS_ATTRIBUTE(x) 0
+#endif
+
+/* If we need magic to say "inline", get it for free internally. */
+#ifdef EVENT__inline
+#define inline EVENT__inline
+#endif
+
+/* Define to appropriate substitute if compiler doesnt have __func__ */
+#if defined(EVENT__HAVE___func__)
+# ifndef __func__
+#  define __func__ __func__
+# endif
+#elif defined(EVENT__HAVE___FUNCTION__)
+# define __func__ __FUNCTION__
+#else
+# define __func__ __FILE__
+#endif
+
+/* A good no-op to use in macro definitions. */
+#define EVUTIL_NIL_STMT_ ((void)0)
+/* A no-op that tricks the compiler into thinking a condition is used while
+ * definitely not making any code for it.  Used to compile out asserts while
+ * avoiding "unused variable" warnings.  The "!" forces the compiler to
+ * do the sizeof() on an int, in case "condition" is a bitfield value.
+ */
+#define EVUTIL_NIL_CONDITION_(condition) do { \
+	(void)sizeof(!(condition));  \
+} while(0)
+
+/* Internal use only: macros to match patterns of error codes in a
+   cross-platform way.  We need these macros because of two historical
+   reasons: first, nonblocking IO functions are generally written to give an
+   error on the "blocked now, try later" case, so sometimes an error from a
+   read, write, connect, or accept means "no error; just wait for more
+   data," and we need to look at the error code.  Second, Windows defines
+   a different set of error codes for sockets. */
+
+#ifndef _WIN32
+
+#if EAGAIN == EWOULDBLOCK
+#define EVUTIL_ERR_IS_EAGAIN(e) \
+	((e) == EAGAIN)
+#else
+#define EVUTIL_ERR_IS_EAGAIN(e) \
+	((e) == EAGAIN || (e) == EWOULDBLOCK)
+#endif
+
+/* True iff e is an error that means a read/write operation can be retried. */
+#define EVUTIL_ERR_RW_RETRIABLE(e)				\
+	((e) == EINTR || EVUTIL_ERR_IS_EAGAIN(e))
+/* True iff e is an error that means an connect can be retried. */
+#define EVUTIL_ERR_CONNECT_RETRIABLE(e)			\
+	((e) == EINTR || (e) == EINPROGRESS)
+/* True iff e is an error that means a accept can be retried. */
+#define EVUTIL_ERR_ACCEPT_RETRIABLE(e)			\
+	((e) == EINTR || EVUTIL_ERR_IS_EAGAIN(e) || (e) == ECONNABORTED)
+
+/* True iff e is an error that means the connection was refused */
+#define EVUTIL_ERR_CONNECT_REFUSED(e)					\
+	((e) == ECONNREFUSED)
+
+#else
+/* Win32 */
+
+#define EVUTIL_ERR_IS_EAGAIN(e) \
+	((e) == WSAEWOULDBLOCK || (e) == EAGAIN)
+
+#define EVUTIL_ERR_RW_RETRIABLE(e)					\
+	((e) == WSAEWOULDBLOCK ||					\
+	    (e) == WSAEINTR)
+
+#define EVUTIL_ERR_CONNECT_RETRIABLE(e)					\
+	((e) == WSAEWOULDBLOCK ||					\
+	    (e) == WSAEINTR ||						\
+	    (e) == WSAEINPROGRESS ||					\
+	    (e) == WSAEINVAL)
+
+#define EVUTIL_ERR_ACCEPT_RETRIABLE(e)			\
+	EVUTIL_ERR_RW_RETRIABLE(e)
+
+#define EVUTIL_ERR_CONNECT_REFUSED(e)					\
+	((e) == WSAECONNREFUSED)
+
+#endif
+
+/* Arguments for shutdown() */
+#ifdef SHUT_RD
+#define EVUTIL_SHUT_RD SHUT_RD
+#else
+#define EVUTIL_SHUT_RD 0
+#endif
+#ifdef SHUT_WR
+#define EVUTIL_SHUT_WR SHUT_WR
+#else
+#define EVUTIL_SHUT_WR 1 /* SD_SEND */
+#endif
+#ifdef SHUT_BOTH
+#define EVUTIL_SHUT_BOTH SHUT_BOTH
+#else
+#define EVUTIL_SHUT_BOTH 2
+#endif
+
+/* Helper: Verify that all the elements in 'dlist' are internally consistent.
+ * Checks for circular lists and bad prev/next pointers.
+ *
+ * Example usage:
+ *    EVUTIL_ASSERT_LIST_OK(eventlist, event, ev_next);
+ */
+#define EVUTIL_ASSERT_LIST_OK(dlist, type, field) do {			\
+		struct type *elm1, *elm2, **nextp;			\
+		if (LIST_EMPTY((dlist)))				\
+			break;						\
+									\
+		/* Check list for circularity using Floyd's */		\
+		/* 'Tortoise and Hare' algorithm */			\
+		elm1 = LIST_FIRST((dlist));				\
+		elm2 = LIST_NEXT(elm1, field);				\
+		while (elm1 && elm2) {					\
+			EVUTIL_ASSERT(elm1 != elm2);			\
+			elm1 = LIST_NEXT(elm1, field);			\
+			elm2 = LIST_NEXT(elm2, field);			\
+			if (!elm2)					\
+				break;					\
+			EVUTIL_ASSERT(elm1 != elm2);			\
+			elm2 = LIST_NEXT(elm2, field);			\
+		}							\
+									\
+		/* Now check next and prev pointers for consistency. */ \
+		nextp = &LIST_FIRST((dlist));				\
+		elm1 = LIST_FIRST((dlist));				\
+		while (elm1) {						\
+			EVUTIL_ASSERT(*nextp == elm1);			\
+			EVUTIL_ASSERT(nextp == elm1->field.le_prev);	\
+			nextp = &LIST_NEXT(elm1, field);		\
+			elm1 = *nextp;					\
+		}							\
+	} while (0)
+
+/* Helper: Verify that all the elements in a TAILQ are internally consistent.
+ * Checks for circular lists and bad prev/next pointers.
+ *
+ * Example usage:
+ *    EVUTIL_ASSERT_TAILQ_OK(activelist, event, ev_active_next);
+ */
+#define EVUTIL_ASSERT_TAILQ_OK(tailq, type, field) do {			\
+		struct type *elm1, *elm2, **nextp;			\
+		if (TAILQ_EMPTY((tailq)))				\
+			break;						\
+									\
+		/* Check list for circularity using Floyd's */		\
+		/* 'Tortoise and Hare' algorithm */			\
+		elm1 = TAILQ_FIRST((tailq));				\
+		elm2 = TAILQ_NEXT(elm1, field);				\
+		while (elm1 && elm2) {					\
+			EVUTIL_ASSERT(elm1 != elm2);			\
+			elm1 = TAILQ_NEXT(elm1, field);			\
+			elm2 = TAILQ_NEXT(elm2, field);			\
+			if (!elm2)					\
+				break;					\
+			EVUTIL_ASSERT(elm1 != elm2);			\
+			elm2 = TAILQ_NEXT(elm2, field);			\
+		}							\
+									\
+		/* Now check next and prev pointers for consistency. */ \
+		nextp = &TAILQ_FIRST((tailq));				\
+		elm1 = TAILQ_FIRST((tailq));				\
+		while (elm1) {						\
+			EVUTIL_ASSERT(*nextp == elm1);			\
+			EVUTIL_ASSERT(nextp == elm1->field.tqe_prev);	\
+			nextp = &TAILQ_NEXT(elm1, field);		\
+			elm1 = *nextp;					\
+		}							\
+		EVUTIL_ASSERT(nextp == (tailq)->tqh_last);		\
+	} while (0)
+
+/* Locale-independent replacements for some ctypes functions.  Use these
+ * when you care about ASCII's notion of character types, because you are about
+ * to send those types onto the wire.
+ */
+EVENT2_EXPORT_SYMBOL
+int EVUTIL_ISALPHA_(char c);
+EVENT2_EXPORT_SYMBOL
+int EVUTIL_ISALNUM_(char c);
+int EVUTIL_ISSPACE_(char c);
+EVENT2_EXPORT_SYMBOL
+int EVUTIL_ISDIGIT_(char c);
+EVENT2_EXPORT_SYMBOL
+int EVUTIL_ISXDIGIT_(char c);
+int EVUTIL_ISPRINT_(char c);
+int EVUTIL_ISLOWER_(char c);
+int EVUTIL_ISUPPER_(char c);
+EVENT2_EXPORT_SYMBOL
+char EVUTIL_TOUPPER_(char c);
+EVENT2_EXPORT_SYMBOL
+char EVUTIL_TOLOWER_(char c);
+
+/** Remove all trailing horizontal whitespace (space or tab) from the end of a
+ * string */
+EVENT2_EXPORT_SYMBOL
+void evutil_rtrim_lws_(char *);
+
+
+/** Helper macro.  If we know that a given pointer points to a field in a
+    structure, return a pointer to the structure itself.  Used to implement
+    our half-baked C OO.  Example:
+
+    struct subtype {
+	int x;
+	struct supertype common;
+	int y;
+    };
+    ...
+    void fn(struct supertype *super) {
+	struct subtype *sub = EVUTIL_UPCAST(super, struct subtype, common);
+	...
+    }
+ */
+#define EVUTIL_UPCAST(ptr, type, field)				\
+	((type *)(((char*)(ptr)) - evutil_offsetof(type, field)))
+
+/* As open(pathname, flags, mode), except that the file is always opened with
+ * the close-on-exec flag set. (And the mode argument is mandatory.)
+ */
+int evutil_open_closeonexec_(const char *pathname, int flags, unsigned mode);
+
+EVENT2_EXPORT_SYMBOL
+int evutil_read_file_(const char *filename, char **content_out, size_t *len_out,
+    int is_binary);
+
+EVENT2_EXPORT_SYMBOL
+int evutil_socket_connect_(evutil_socket_t *fd_ptr, const struct sockaddr *sa, int socklen);
+
+int evutil_socket_finished_connecting_(evutil_socket_t fd);
+
+EVENT2_EXPORT_SYMBOL
+int evutil_ersatz_socketpair_(int, int , int, evutil_socket_t[]);
+
+int evutil_resolve_(int family, const char *hostname, struct sockaddr *sa,
+    ev_socklen_t *socklen, int port);
+
+const char *evutil_getenv_(const char *name);
+
+/* Structure to hold the state of our weak random number generator.
+ */
+struct evutil_weakrand_state {
+	ev_uint32_t seed;
+};
+
+#define EVUTIL_WEAKRAND_MAX EV_INT32_MAX
+
+/* Initialize the state of a week random number generator based on 'seed'.  If
+ * the seed is 0, construct a new seed based on not-very-strong platform
+ * entropy, like the PID and the time of day.
+ *
+ * This function, and the other evutil_weakrand* functions, are meant for
+ * speed, not security or statistical strength.  If you need a RNG which an
+ * attacker can't predict, or which passes strong statistical tests, use the
+ * evutil_secure_rng* functions instead.
+ */
+EVENT2_EXPORT_SYMBOL
+ev_uint32_t evutil_weakrand_seed_(struct evutil_weakrand_state *state, ev_uint32_t seed);
+/* Return a pseudorandom value between 0 and EVUTIL_WEAKRAND_MAX inclusive.
+ * Updates the state in 'seed' as needed -- this value must be protected by a
+ * lock.
+ */
+EVENT2_EXPORT_SYMBOL
+ev_int32_t evutil_weakrand_(struct evutil_weakrand_state *seed);
+/* Return a pseudorandom value x such that 0 <= x < top. top must be no more
+ * than EVUTIL_WEAKRAND_MAX. Updates the state in 'seed' as needed -- this
+ * value must be proteced by a lock */
+EVENT2_EXPORT_SYMBOL
+ev_int32_t evutil_weakrand_range_(struct evutil_weakrand_state *seed, ev_int32_t top);
+
+/* Evaluates to the same boolean value as 'p', and hints to the compiler that
+ * we expect this value to be false. */
+#if defined(__GNUC__) && __GNUC__ >= 3         /* gcc 3.0 or later */
+#define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0)
+#else
+#define EVUTIL_UNLIKELY(p) (p)
+#endif
+
+#if EVUTIL_HAS_ATTRIBUTE(fallthrough)
+#define EVUTIL_FALLTHROUGH __attribute__((fallthrough))
+#else
+#define EVUTIL_FALLTHROUGH /* fallthrough */
+#endif
+
+/* Replacement for assert() that calls event_errx on failure. */
+#ifdef NDEBUG
+#define EVUTIL_ASSERT(cond) EVUTIL_NIL_CONDITION_(cond)
+#define EVUTIL_FAILURE_CHECK(cond) 0
+#else
+#define EVUTIL_ASSERT(cond)						\
+	do {								\
+		if (EVUTIL_UNLIKELY(!(cond))) {				\
+			event_errx(EVENT_ERR_ABORT_,			\
+			    "%s:%d: Assertion %s failed in %s",		\
+			    __FILE__,__LINE__,#cond,__func__);		\
+			/* In case a user-supplied handler tries to */	\
+			/* return control to us, log and abort here. */	\
+			(void)fprintf(stderr,				\
+			    "%s:%d: Assertion %s failed in %s",		\
+			    __FILE__,__LINE__,#cond,__func__);		\
+			abort();					\
+		}							\
+	} while (0)
+#define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond)
+#endif
+
+#ifndef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE
+/* Replacement for sockaddr storage that we can use internally on platforms
+ * that lack it.  It is not space-efficient, but neither is sockaddr_storage.
+ */
+struct sockaddr_storage {
+	union {
+		struct sockaddr ss_sa;
+		struct sockaddr_in ss_sin;
+		struct sockaddr_in6 ss_sin6;
+		char ss_padding[128];
+	} ss_union;
+};
+#define ss_family ss_union.ss_sa.sa_family
+#endif
+
+/* Internal addrinfo error code.  This one is returned from only from
+ * evutil_getaddrinfo_common_, when we are sure that we'll have to hit a DNS
+ * server. */
+#define EVUTIL_EAI_NEED_RESOLVE      -90002
+
+struct evdns_base;
+struct evdns_getaddrinfo_request;
+typedef struct evdns_getaddrinfo_request* (*evdns_getaddrinfo_fn)(
+    struct evdns_base *base,
+    const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in,
+    void (*cb)(int, struct evutil_addrinfo *, void *), void *arg);
+EVENT2_EXPORT_SYMBOL
+void evutil_set_evdns_getaddrinfo_fn_(evdns_getaddrinfo_fn fn);
+typedef void (*evdns_getaddrinfo_cancel_fn)(
+    struct evdns_getaddrinfo_request *req);
+EVENT2_EXPORT_SYMBOL
+void evutil_set_evdns_getaddrinfo_cancel_fn_(evdns_getaddrinfo_cancel_fn fn);
+
+EVENT2_EXPORT_SYMBOL
+struct evutil_addrinfo *evutil_new_addrinfo_(struct sockaddr *sa,
+    ev_socklen_t socklen, const struct evutil_addrinfo *hints);
+EVENT2_EXPORT_SYMBOL
+struct evutil_addrinfo *evutil_addrinfo_append_(struct evutil_addrinfo *first,
+    struct evutil_addrinfo *append);
+EVENT2_EXPORT_SYMBOL
+void evutil_adjust_hints_for_addrconfig_(struct evutil_addrinfo *hints);
+EVENT2_EXPORT_SYMBOL
+int evutil_getaddrinfo_common_(const char *nodename, const char *servname,
+    struct evutil_addrinfo *hints, struct evutil_addrinfo **res, int *portnum);
+
+struct evdns_getaddrinfo_request *evutil_getaddrinfo_async_(
+    struct evdns_base *dns_base,
+    const char *nodename, const char *servname,
+    const struct evutil_addrinfo *hints_in,
+    void (*cb)(int, struct evutil_addrinfo *, void *), void *arg);
+void evutil_getaddrinfo_cancel_async_(struct evdns_getaddrinfo_request *data);
+
+/** Return true iff sa is a looback address. (That is, it is 127.0.0.1/8, or
+ * ::1). */
+EVENT2_EXPORT_SYMBOL
+int evutil_sockaddr_is_loopback_(const struct sockaddr *sa);
+
+
+/**
+    Formats a sockaddr sa into a string buffer of size outlen stored in out.
+    Returns a pointer to out.  Always writes something into out, so it's safe
+    to use the output of this function without checking it for NULL.
+ */
+EVENT2_EXPORT_SYMBOL
+const char *evutil_format_sockaddr_port_(const struct sockaddr *sa, char *out, size_t outlen);
+
+int evutil_hex_char_to_int_(char c);
+
+
+void evutil_free_secure_rng_globals_(void);
+void evutil_free_globals_(void);
+
+#ifdef _WIN32
+EVENT2_EXPORT_SYMBOL
+HMODULE evutil_load_windows_system_library_(const TCHAR *library_name);
+#endif
+
+#ifndef EV_SIZE_FMT
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
+#define EV_U64_FMT "%I64u"
+#define EV_I64_FMT "%I64d"
+#define EV_I64_ARG(x) ((__int64)(x))
+#define EV_U64_ARG(x) ((unsigned __int64)(x))
+#else
+#define EV_U64_FMT "%llu"
+#define EV_I64_FMT "%lld"
+#define EV_I64_ARG(x) ((long long)(x))
+#define EV_U64_ARG(x) ((unsigned long long)(x))
+#endif
+#endif
+
+#ifdef _WIN32
+#define EV_SOCK_FMT EV_I64_FMT
+#define EV_SOCK_ARG(x) EV_I64_ARG((x))
+#else
+#define EV_SOCK_FMT "%d"
+#define EV_SOCK_ARG(x) (x)
+#endif
+
+#if defined(__STDC__) && defined(__STDC_VERSION__) && !defined(__MINGW64_VERSION_MAJOR)
+#if (__STDC_VERSION__ >= 199901L)
+#define EV_SIZE_FMT "%zu"
+#define EV_SSIZE_FMT "%zd"
+#define EV_SIZE_ARG(x) (x)
+#define EV_SSIZE_ARG(x) (x)
+#endif
+#endif
+
+#ifndef EV_SIZE_FMT
+#if (EVENT__SIZEOF_SIZE_T <= EVENT__SIZEOF_LONG)
+#define EV_SIZE_FMT "%lu"
+#define EV_SSIZE_FMT "%ld"
+#define EV_SIZE_ARG(x) ((unsigned long)(x))
+#define EV_SSIZE_ARG(x) ((long)(x))
+#else
+#define EV_SIZE_FMT EV_U64_FMT
+#define EV_SSIZE_FMT EV_I64_FMT
+#define EV_SIZE_ARG(x) EV_U64_ARG(x)
+#define EV_SSIZE_ARG(x) EV_I64_ARG(x)
+#endif
+#endif
+
+EVENT2_EXPORT_SYMBOL
+evutil_socket_t evutil_socket_(int domain, int type, int protocol);
+evutil_socket_t evutil_accept4_(evutil_socket_t sockfd, struct sockaddr *addr,
+    ev_socklen_t *addrlen, int flags);
+
+    /* used by one of the test programs.. */
+EVENT2_EXPORT_SYMBOL
+int evutil_make_internal_pipe_(evutil_socket_t fd[2]);
+evutil_socket_t evutil_eventfd_(unsigned initval, int flags);
+
+#ifdef SOCK_NONBLOCK
+#define EVUTIL_SOCK_NONBLOCK SOCK_NONBLOCK
+#else
+#define EVUTIL_SOCK_NONBLOCK 0x4000000
+#endif
+#ifdef SOCK_CLOEXEC
+#define EVUTIL_SOCK_CLOEXEC SOCK_CLOEXEC
+#else
+#define EVUTIL_SOCK_CLOEXEC 0x80000000
+#endif
+#ifdef EFD_NONBLOCK
+#define EVUTIL_EFD_NONBLOCK EFD_NONBLOCK
+#else
+#define EVUTIL_EFD_NONBLOCK 0x4000
+#endif
+#ifdef EFD_CLOEXEC
+#define EVUTIL_EFD_CLOEXEC EFD_CLOEXEC
+#else
+#define EVUTIL_EFD_CLOEXEC 0x8000
+#endif
+
+void evutil_memclear_(void *mem, size_t len);
+
+struct in_addr;
+struct in6_addr;
+
+/* This is a any, loopback, link-local, multicast */
+EVENT2_EXPORT_SYMBOL
+int evutil_v4addr_is_local_(const struct in_addr *in);
+/* This is a reserved, ipv4compat, ipv4map, loopback,
+ * link-local, multicast, or unspecified address. */
+EVENT2_EXPORT_SYMBOL
+int evutil_v6addr_is_local_(const struct in6_addr *in);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/extra/libevent/libevent-2.1.11-stable/whatsnew-2.0.txt b/extra/libevent/libevent-2.1.11-stable/whatsnew-2.0.txt
new file mode 100644
index 000000000000..3561fcb94c6f
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/whatsnew-2.0.txt
@@ -0,0 +1,609 @@
+What's New In Libevent 2.0 so far:
+
+1. Meta-issues
+
+1.1. About this document
+
+  This document describes the key differences between Libevent 1.4 and
+  Libevent 2.0, from a user's point of view.  It was most recently
+  updated based on features in git master as of August 2010.
+
+  NOTE: I am very sure that I missed some thing on this list.  Caveat
+  haxxor.
+
+1.2. Better documentation
+
+  There is now a book-in-progress that explains how to use Libevent and its
+  growing pile of APIs.  As of this writing, it covers everything except the
+  http and rpc code.  Check out the latest draft at
+  http://www.wangafu.net/~nickm/libevent-book/ .
+
+2. New and Improved Event APIs
+
+  Many APIs are improved, refactored, or deprecated in Libevent 2.0.
+
+  COMPATIBILITY:
+
+  Nearly all existing code that worked with Libevent 1.4 should still
+  work correctly with Libevent 2.0.  However, if you are writing new code,
+  or if you want to port old code, we strongly recommend using the new APIs
+  and avoiding deprecated APIs as much as possible.
+
+  Binaries linked against Libevent 1.4 will need to be recompiled to link
+  against Libevent 2.0.  This is nothing new; we have never been good at
+  preserving binary compatibility between releases.  We'll try harder in the
+  future, though: see 2.1 below.
+
+2.1. New header layout for improved forward-compatibility
+
+  Libevent 2.0 has a new header layout to make it easier for programmers to
+  write good, well-supported libevent code.  The new headers are divided
+  into three types.
+
+  There are *regular headers*, like event2/event.h.  These headers contain
+  the functions that most programmers will want to use.
+
+  There are *backward compatibility headers*, like event2/event_compat.h.
+  These headers contain declarations for deprecated functions from older
+  versions of Libevent.  Documentation in these headers should suggest what's
+  wrong with the old functions, and what functions you want to start using
+  instead of the old ones.  Some of these functions might be removed in a
+  future release.  New programs should generally not include these headers.
+
+  Finally, there are *structure headers*, like event2/event_struct.h.
+  These headers contain definitions of some structures that Libevent has
+  historically exposed.  Exposing them caused problems in the past,
+  since programs that were compiled to work with one version of Libevent
+  would often stop working with another version that changed the size or
+  layout of some object.  We've moving them into separate headers so
+  that programmers can know that their code is not depending on any
+  unstable aspect of the Libvent ABI.  New programs should generally not
+  include these headers unless they really know what they are doing, are
+  willing to rebuild their software whenever they want to link it
+  against a new version of Libevent, and are willing to risk their code
+  breaking if and when data structures change.
+
+  Functionality that once was located in event.h is now more subdivided.
+  The core event logic is now in event2/event.h.  The "evbuffer" functions
+  for low-level buffer manipulation are in event2/buffer.h.  The
+  "bufferevent" functions for higher-level buffered IO are in
+  event2/bufferevent.h.
+
+  COMPATIBILITY:
+
+  All of the old headers (event.h, evdns.h, evhttp.h, evrpc.h, and
+  evutil.h) will continue to work by including the corresponding new
+  headers.  Old code should not be broken by this change.
+
+2.2. New thread-safe, binary-compatible, harder-to-mess-up APIs
+
+  Some aspects of the historical Libevent API have encouraged
+  non-threadsafe code, or forced code built against one version of Libevent
+  to no longer build with another.  The problems with now-deprecated APIs
+  fell into two categories:
+
+     1) Dependence on the "current" event_base.  In an application with
+        multiple event_bases, Libevent previously had a notion of the
+        "current" event_base.  New events were linked to this base, and
+        the caller needed to explicitly reattach them to another base.
+        This was horribly error-prone.
+
+        Functions like "event_set" that worked with the "current" event_base
+        are now deprecated but still available (see 2.1).  There are new
+        functions like "event_assign" that take an explicit event_base
+        argument when setting up a structure.  Using these functions will help
+        prevent errors in your applications, and to be more threadsafe.
+
+     2) Structure dependence.  Applications needed to allocate 'struct
+        event' themselves, since there was no function in Libevent to do it
+        for them.  But since the size and contents of struct event can
+        change between libevent versions, this created binary-compatibility
+        nightmares.  All structures of this kind are now isolated in
+        _struct.h header (see 2.1), and there are new allocate-and-
+        initialize functions you can use instead of the old initialize-only
+        functions.  For example, instead of malloc and event_set, you
+        can use event_new().
+
+        (For people who do really want to allocate a struct event on the
+        stack, or put one inside another structure, you can still use
+        event2/event_compat.h.)
+
+   So in the case where old code would look like this:
+
+      #include <event.h>
+      ...
+      struct event *ev = malloc(sizeof(struct event));
+      /* This call will cause a buffer overrun if you compile with one version
+         of Libevent and link dynamically against another. */
+      event_set(ev, fd, EV_READ, cb, NULL);
+      /* If you forget this call, your code will break in hard-to-diagnose
+         ways in the presence of multiple event bases. */
+      event_set_base(ev, base);
+
+   New code will look more like this:
+
+     #include <event2/event.h>
+     ...
+     struct event *ev;
+     ev = event_new(base, fd, EV_READ, cb, NULL);
+
+2.3. Overrideable allocation functions
+
+  If you want to override the allocation functions used by libevent
+  (for example, to use a specialized allocator, or debug memory
+  issues, or so on), you can replace them by calling
+  event_set_mem_functions.  It takes replacements for malloc(),
+  free(), and realloc().
+
+  If you're going to use this facility, you need to call it _before_
+  Libevent does any memory allocation; otherwise, Libevent may allocate some
+  memory with malloc(), and free it with the free() function you provide.
+
+  You can disable this feature when you are building Libevent by passing
+  the --disable-malloc-replacement argument to configure.
+
+2.4. Configurable event_base creation
+
+  Older versions of Libevent would always got the fastest backend
+  available, unless you reconfigured their behavior with the environment
+  variables EVENT_NOSELECT, EVENT_NOPOLL, and so forth.  This was annoying
+  to programmers who wanted to pick a backend explicitly without messing
+  with the environment.
+
+  Also, despite our best efforts, not every backend supports every
+  operation we might like.  Some features (like edge-triggered events, or
+  working with non-socket file descriptors) only work with some operating
+  systems' fast backends.  Previously, programmers who cared about this
+  needed to know which backends supported what.  This tended to get quite
+  ungainly.
+
+  There is now an API to choose backends, either by name or by feature.
+  Here is an example:
+
+      struct event_config_t *config;
+      struct event_base *base;
+
+      /* Create a new configuration object. */
+      config = event_config_new();
+      /* We don't want to use the "select" method. */
+      event_config_avoid_method(config, "select");
+      /* We want a method that can work with non-socket file descriptors */
+      event_config_require_features(config, EV_FEATURE_FDS);
+
+      base = event_base_new_with_config(config);
+      if (!base) {
+         /* There is no backend method that does what we want. */
+         exit(1);
+      }
+      event_config_free(config);
+
+  Supported features are documented in event2/event.h
+
+2.5. Socket is now an abstract type
+
+  All APIs that formerly accepted int as a socket type now accept
+  "evutil_socket_t".  On Unix, this is just an alias for "int" as
+  before.  On Windows, however, it's an alias for SOCKET, which can
+  be wider than int on 64-bit platforms.
+
+2.6. Timeouts and persistent events work together.
+
+  Previously, it wasn't useful to set a timeout on a persistent event:
+  the timeout would trigger once, and never again.  This is not what
+  applications tend to want.  Instead, applications tend to want every
+  triggering of the event to re-set the timeout.  So now, if you set
+  up an event like this:
+       struct event *ev;
+       struct timeval tv;
+       ev = event_new(base, fd, EV_READ|EV_PERSIST, cb, NULL);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+       event_add(ev, &tv);
+
+  The callback 'cb' will be invoked whenever fd is ready to read, OR whenever
+  a second has passed since the last invocation of cb.
+
+2.7. Multiple events allowed per fd
+
+  Older versions of Libevent allowed at most one EV_READ event and at most
+  one EV_WRITE event per socket, per event base.  This restriction is no
+  longer present.
+
+2.8. evthread_* functions for thread-safe structures.
+
+  Libevent structures can now be built with locking support.  This code
+  makes it safe to add, remove, and activate events on an event base from a
+  different thread.  (Previously, if you wanted to write multithreaded code
+  with Libevent, you could only an event_base or its events in one thread at
+  a time.)
+
+  If you want threading support and you're using pthreads, you can just
+  call evthread_use_pthreads().  (You'll need to link against the
+  libevent_pthreads library in addition to libevent_core.  These functions are
+  not in libevent_core.)
+
+  If you want threading support and you're using Windows, you can just
+  call evthread_use_windows_threads().
+
+  If you are using some locking system besides Windows and pthreads, You
+  can enable this on a per-event-base level by writing functions to
+  implement mutexes, conditions, and thread IDs, and passing them to
+  evthread_set_lock_callbacks and related functions in event2/thread.h.
+
+  Once locking functions are enabled, every new event_base is created with a
+  lock.  You can prevent a single event_base from being built with a lock
+  disabled by using the EVENT_BASE_FLAG_NOLOCK flag in its
+  event_config.  If an event_base is created with a lock, it is safe to call
+  event_del, event_add, and event_active on its events from any thread.  The
+  event callbacks themselves are still all executed from the thread running
+  the event loop.
+
+  To make an evbuffer or a bufferevent object threadsafe, call its
+  *_enable_locking() function.
+
+  The HTTP api is not currently threadsafe.
+
+  To build Libevent with threading support disabled, pass
+  --disable-thread-support to the configure script.
+
+2.9. Edge-triggered events on some backends.
+
+  With some backends, it's now possible to add the EV_ET flag to an event
+  in order to request that the event's semantics be edge-triggered.  Right
+  now, epoll and kqueue support this.
+
+  The corresponding event_config feature is EV_FEATURE_ET; see 2.4 for more
+  information.
+
+2.10. Better support for huge numbers of timeouts
+
+  The heap-based priority queue timer implementation for Libevent 1.4 is good
+  for randomly distributed timeouts, but suboptimal if you have huge numbers
+  of timeouts that all expire in the same amount of time after their
+  creation.  The new event_base_init_common_timeout() logic lets you signal
+  that a given timeout interval will be very common, and should use a linked
+  list implementation instead of a priority queue.
+
+2.11. Improved debugging support
+
+  It's been pretty easy to forget to delete all your events before you
+  re-initialize them, or otherwise put Libevent in an internally inconsistent
+  state.  You can tell libevent to catch these and other common errors with
+  the new event_enable_debug_mode() call.  Just invoke it before you do
+  any calls to other libevent functions, and it'll catch many common
+  event-level errors in your code.
+
+2.12. Functions to access all event fields
+
+  So that you don't have to access the struct event fields directly, Libevent
+  now provides accessor functions to retrieve everything from an event that
+  you set during event_new() or event_assign().
+
+3. Backend-specific and performance improvements.
+
+3.1. Change-minimization on O(1) backends
+
+  With previous versions of Libevent, if you called event_del() and
+  event_add() repeatedly on a single event between trips to the backend's
+  dispatch function, the backend might wind up making unnecessary calls or
+  passing unnecessary data to the kernel.  The new backend logic batches up
+  redundant adds and deletes, and performs no more operations than necessary
+  at the kernel level.
+
+  This logic is on for the kqueue backend, and available (but off by
+  default) for the epoll backend.  To turn it on for the epoll backend,
+  set the EVENT_BASE_FLAG_EPOLL_USE_CHANGELIST flag in the
+  event_base_cofig, or set the EVENT_EPOLL_USE_CHANGELIST environment
+  variable.  Doing this with epoll may result in weird bugs if you give
+  any fds closed by dup() or its variants.
+
+3.2. Improved notification on Linux
+
+  When we need to wake the event loop up from another thread, we use
+  an epollfd to do so, instead of a socketpair.  This is supposed to be
+  faster.
+
+3.3. Windows: better support for everything
+
+  Bufferevents on Windows can use a new mechanism (off-by-default; see below)
+  to send their data via Windows overlapped IO and get their notifications
+  via the IOCP API.  This should be much faster than using event-based
+  notification.
+
+  Other functions throughout the code have been fixed to work more
+  consistently with Windows.  Libevent now builds on Windows using either
+  mingw, or using MSVC (with nmake).  Libevent works fine with UNICODE
+  defined, or not.
+
+  Data structures are a little smarter: our lookups from socket to pending
+  event are now done with O(1) hash tables rather than O(lg n) red-black
+  trees.
+
+  Unfortunately, the main Windows backend is still select()-based: from
+  testing the IOCP backends on the mailing list, it seems that there isn't
+  actually a way to tell for certain whether a socket is writable with IOCP.
+  Libevent 2.1 may add a multithreaded WaitForMultipleEvents-based
+  backend for better performance with many inactive sockets and better
+  integration with Windows events.
+
+4. Improvements to evbuffers
+
+  Libevent has long had an "evbuffer" implementation to wrap access to an
+  input or output memory buffer.  In previous versions, the implementation
+  was very inefficient and lacked some desirable features.  We've made many
+  improvements in Libevent 2.0.
+
+4.1. Chunked-memory internal representation
+
+  Previously, each evbuffer was a huge chunk of memory.  When we ran out of
+  space in an evbuffer, we used realloc() to grow the chunk of memory.  When
+  data was misaligned, we used memmove to move the data back to the front
+  of the buffer.
+
+  Needless to say, this is a terrible interface for networked IO.
+
+  Now, evbuffers are implemented as a linked list of memory chunks, like
+  most Unix kernels use for network IO.  (See Linux's skbuf interfaces,
+  or *BSD's mbufs).  Data is added at the end of the linked list and
+  removed from the front, so that we don't ever need realloc huge chunks
+  or memmove the whole buffer contents.
+
+  To avoid excessive calls to read and write, we use the readv/writev
+  interfaces (or WSASend/WSARecv on Windows) to do IO on multiple chunks at
+  once with a single system call.
+
+  COMPATIBILITY NOTE:
+  The evbuffer struct is no longer exposed in a header.  The code here is
+  too volatile to expose an official evbuffer structure, and there was never
+  any means provided to create an evbuffer except via evbuffer_new which
+  heap-allocated the buffer.
+
+  If you need access to the whole buffer as a linear chunk of memory, the
+  EVBUFFER_DATA() function still works.  Watch out, though: it needs to copy
+  the buffer's contents in a linear chunk before you can use it.
+
+4.2. More flexible readline support
+
+  The old evbuffer_readline() function (which accepted any sequence of
+  CR and LF characters as a newline, and which couldn't handle lines
+  containing NUL characters), is now deprecated.  The preferred
+  function is evbuffer_readln(), which supports a variety of
+  line-ending styles, and which can return the number of characters in
+  the line returned.
+
+  You can also call evbuffer_search_eol() to find the end of a line
+  in an evbuffer without ever extracting the line.
+
+4.3. Support for file-based IO in evbuffers.
+
+  You can now add chunks of a file into a evbuffer, and Libevent will have
+  your OS use mapped-memory functionality, sendfile, or splice to transfer
+  the data without ever copying it to userspace.  On OSs where this is not
+  supported, Libevent just loads the data.
+
+  There are probably some bugs remaining in this code.  On some platforms
+  (like Windows), it just reads the relevant parts of the file into RAM.
+
+4.4. Support for zero-copy ("scatter/gather") writes in evbuffers.
+
+  You can add a piece of memory to an evbuffer without copying it.
+  Instead, Libevent adds a new element to the evbuffer's linked list of
+  chunks with a pointer to the memory you supplied.  You can do this
+  either with a reference-counted chunk (via evbuffer_add_reference), or
+  by asking Libevent for a pointer to its internal vectors (via
+  evbuffer_reserve_space or evbuffer_peek()).
+
+4.5. Multiple callbacks per evbuffer
+
+  Previously, you could only have one callback active on an evbuffer at a
+  time.  In practice, this meant that if one part of Libevent was using an
+  evbuffer callback to notice when an internal evbuffer was reading or
+  writing data, you couldn't have your own callback on that evbuffer.
+
+  Now, you can now use the evbuffer_add_cb() function to add a callback that
+  does not interfere with any other callbacks.
+
+  The evbuffer_setcb() function is now deprecated.
+
+4.6. New callback interface
+
+  Previously, evbuffer callbacks were invoked with the old size of the
+  buffer and the new size of the buffer.  This interface could not capture
+  operations that simultaneously filled _and_ drained a buffer, or handle
+  cases where we needed to postpone callbacks until multiple operations were
+  complete.
+
+  Callbacks that are set with evbuffer_setcb still use the old API.
+  Callbacks added with evbuffer_add_cb() use a new interface that takes a
+  pointer to a struct holding the total number of bytes drained read and the
+  total number of bytes written.  See event2/buffer.h for full details.
+
+4.7. Misc new evbuffer features
+
+   You can use evbuffer_remove() to move a given number of bytes from one
+   buffer to another.
+
+   The evbuffer_search() function lets you search for repeated instances of
+   a pattern inside an evbuffer.
+
+   You can use evbuffer_freeze() to temporarily suspend drains from or adds
+   to a given evbuffer.  This is useful for code that exposes an evbuffer as
+   part of its public API, but wants users to treat it as a pure source or
+   sink.
+
+   There's an evbuffer_copyout() that looks at the data at the start of an
+   evbuffer without doing a drain.
+
+   You can have an evbuffer defer all of its callbacks, so that rather than
+   being invoked immediately when the evbuffer's length changes, they are
+   invoked from within the event_loop.  This is useful when you have a
+   complex set of callbacks that can change the length of other evbuffers,
+   and you want to avoid having them recurse and overflow your stack.
+
+5. Bufferevents improvements
+
+   Libevent has long included a "bufferevents" structure and related
+   functions that were useful for generic buffered IO on a TCP connection.
+   This is what Libevent uses for its HTTP implementation.  In addition to
+   the improvements that they get for free from the underlying evbuffer
+   implementation above, there are many new features in Libevent 2.0's
+   evbuffers.
+
+5.1. New OO implementations
+
+   The "bufferevent" structure is now an abstract base type with multiple
+   implementations.  This should not break existing code, which always
+   allocated bufferevents with bufferevent_new().
+
+   Current implementations of the bufferevent interface are described below.
+
+5.2. bufferevent_socket_new() replaces bufferevent_new()
+
+   Since bufferevents that use a socket are not the only kind,
+   bufferevent_new() is now deprecated.  Use bufferevent_socket_new()
+   instead.
+
+5.3. Filtered bufferevent IO
+
+   You can use bufferevent_filter_new() to create a bufferevent that wraps
+   around another bufferevent and transforms data it is sending and
+   receiving.  See test/regress_zlib.c for a toy example that uses zlib to
+   compress data before sending it over a bufferevent.
+
+5.3. Linked pairs of bufferevents
+
+   You can use bufferevent_pair_new() to produce two linked
+   bufferevents.  This is like using socketpair, but doesn't require
+   system-calls.
+
+5.4. SSL support for bufferevents with OpenSSL
+
+   There is now a bufferevent type that supports SSL/TLS using the
+   OpenSSL library.  The code for this is build in a separate
+   library, libevent_openssl, so that your programs don't need to
+   link against OpenSSL unless they actually want SSL support.
+
+   There are two ways to construct one of these bufferevents, both
+   declared in <event2/bufferevent_ssl.h>.  If you want to wrap an
+   SSL layer around an existing bufferevent, you would call the
+   bufferevent_openssl_filter_new() function.  If you want to do SSL
+   on a socket directly, call bufferevent_openssl_socket_new().
+
+5.5. IOCP support for bufferevents on Windows
+
+   There is now a bufferevents backend that supports IOCP on Windows.
+   Supposedly, this will eventually make Windows IO much faster for
+   programs using bufferevents.  We'll have to see; the code is not
+   currently optimized at all.  To try it out, call the
+   event_base_start_iocp() method on an event_base before contructing
+   bufferevents.
+
+   This is tricky code; there are probably some bugs hiding here.
+
+5.6. Improved connect support for bufferevents.
+
+   You can now create a bufferevent that is not yet connected to any
+   host, and tell it to connect, either by address or by hostname.
+
+   The functions to do this are bufferevent_socket_connect and
+   bufferevent_socket_connect_hostname.
+
+5.7. Rate-limiting for bufferevents
+
+   If you need to limit the number of bytes read/written by a single
+   bufferevent, or by a group of them, you can do this with a new set of
+   bufferevent rate-limiting calls.
+
+6. Other improvements
+
+6.1. DNS improvements
+
+6.1.1. DNS: IPv6 nameservers
+
+   The evdns code now lets you have nameservers whose addresses are IPv6.
+
+6.1.2. DNS: Better security
+
+   Libevent 2.0 tries harder to resist DNS answer-sniping attacks than
+   earlier versions of evdns.  See comments in the code for full details.
+
+   Notably, evdns now supports the "0x20 hack" to make it harder to
+   impersonate a DNS server.  Additionally, Libevent now uses a strong
+   internal RNG to generate DNS transaction IDs, so you don't need to supply
+   your own.
+
+6.1.3. DNS: Getaddrinfo support
+
+   There's now an asynchronous getaddrinfo clone, evdns_getaddrinfo(),
+   to make the results of the evdns functions more usable.  It doesn't
+   support every feature of a typical platform getaddrinfo() yet, but it
+   is quite close.
+
+   There is also a blocking evutil_getaddrinfo() declared in
+   event2/util.h, to provide a getaddrinfo() implementation for
+   platforms that don't have one, and smooth over the differences in
+   various platforms implementations of RFC3493.
+
+   Bufferevents provide bufferevent_connect_hostname(), which combines
+   the name lookup and connect operations.
+
+6.1.4. DNS: No more evdns globals
+
+   Like an event base, evdns operations are now supposed to use an evdns_base
+   argument.  This makes them easier to wrap for other (more OO) languages,
+   and easier to control the lifetime of.  The old evdns functions will
+   still, of course, continue working.
+
+6.2. Listener support
+
+   You can now more easily automate setting up a bound socket to listen for
+   TCP connections.  Just use the evconnlistener_*() functions in the
+   event2/listener.h header.
+
+   The listener code supports IOCP on Windows if available.
+
+6.3. Secure RNG support
+
+   Network code very frequently needs a secure, hard-to-predict random number
+   generator.  Some operating systems provide a good C implementation of one;
+   others do not.  Libevent 2.0 now provides a consistent implementation
+   based on the arc4random code originally from OpenBSD.  Libevent (and you)
+   can use the evutil_secure_rng_*() functions to access a fairly secure
+   random stream of bytes.
+
+6.4. HTTP
+
+   The evhttp uriencoding and uridecoding APIs have updated versions
+   that behave more correctly, and can handle strings with internal NULs.
+
+   The evhttp query parsing and URI parsing logic can now detect errors
+   more usefully.  Moreover, we include an actual URI parsing function
+   (evhttp_uri_parse()) to correctly parse URIs, so as to discourage
+   people from rolling their own ad-hoc parsing functions.
+
+   There are now accessor functions for the useful fields of struct http
+   and friends; it shouldn't be necessary to access them directly any
+   more.
+
+   Libevent now lets you declare support for all specified HTTP methods,
+   including OPTIONS, PATCH, and so on.  The default list is unchanged.
+
+   Numerous evhttp bugs also got fixed.
+
+7. Infrastructure improvements
+
+7.1. Better unit test framework
+
+   We now use a unit test framework that Nick wrote called "tinytest".
+   The main benefit from Libevent's point of view is that tests which
+   might mess with global state can all run each in their own
+   subprocess.  This way, when there's a bug that makes one unit test
+   crash or mess up global state, it doesn't affect any others.
+
+7.2. Better unit tests
+
+   Despite all the code we've added, our unit tests are much better than
+   before.  Right now, iterating over the different backends on various
+   platforms, I'm getting between 78% and 81% test coverage, compared
+   with less than 45% test coverage in Libevent 1.4.
+
diff --git a/extra/libevent/libevent-2.1.11-stable/whatsnew-2.1.txt b/extra/libevent/libevent-2.1.11-stable/whatsnew-2.1.txt
new file mode 100644
index 000000000000..c1f4df8f7878
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/whatsnew-2.1.txt
@@ -0,0 +1,768 @@
+                         What's new in Libevent 2.1
+                             Nick Mathewson
+
+0. Before we start
+
+0.1. About this document
+
+  This document describes the key differences between Libevent 2.0 and
+  Libevent 2.1, from a user's point of view.  It's a work in progress.
+
+  For better documentation about libevent, see the links at
+  http://libevent.org/
+
+  Libevent 2.1 would not be possible without the generous help of
+  numerous volunteers.  For a list of who did what in Libevent 2.1,
+  please see the ChangeLog!
+
+  NOTE: I am very sure that I missed some thing on this list.  Caveat
+  haxxor.
+
+0.2. Where to get help
+
+  Try looking at the other documentation too.  All of the header files
+  have documentation in the doxygen format; this gets turned into nice
+  HTML and linked to from the libevent.org website.
+
+  There is a work-in-progress book with reference manual at
+  http://www.wangafu.net/~nickm/libevent-book/ .
+
+  You can ask questions on the #libevent IRC channel at irc.oftc.net or
+  on the mailing list at libevent-users@freehaven.net.  The mailing list
+  is subscribers-only, so you will need to subscribe before you post.
+
+0.3. Compatibility
+
+  Our source-compatibility policy is that correct code (that is to say,
+  code that uses public interfaces of Libevent and relies only on their
+  documented behavior) should have forward source compatibility: any
+  such code that worked with a previous version of Libevent should work
+  with this version too.
+
+  We don't try to do binary compatibility except within stable release
+  series, so binaries linked against any version of Libevent 2.0 will
+  probably need to be recompiled against Libevent 2.1.4-alpha if you
+  want to use it.  It is probable that we'll break binary compatibility
+  again before Libevent 2.1 is stable.
+
+1. New APIs and features
+
+1.1. New ways to build libevent
+
+  We now provide an --enable-gcc-hardening configure option to turn on
+  GCC features designed for increased code security.
+
+  There is also an --enable-silent-rules configure option to make
+  compilation run more quietly with automake 1.11 or later.
+
+  You no longer need to use the --enable-gcc-warnings option to turn on
+  all of the GCC warnings that Libevent uses.  The only change from
+  using that option now is to turn warnings into errors.
+
+  For IDE users, files that are not supposed to be built are now
+  surrounded with appropriate #ifdef lines to keep your IDE from getting
+  upset.
+
+  There is now an alternative cmake-based build process; cmake users
+  should see the relevant sections in the README.
+
+
+1.2. New functions for events and the event loop
+
+  If you're running Libevent with multiple event priorities, you might
+  want to make sure that Libevent checks for new events frequently, so
+  that time-consuming or numerous low-priority events don't keep it from
+  checking for new high-priority events.  You can now use the
+  event_config_set_max_dispatch_interval() interface to ensure that the
+  loop checks for new events either every N microseconds, every M
+  callbacks, or both.
+
+  When configuring an event base, you can now choose whether you want
+  timers to be more efficient, or more precise.  (This only has effect
+  on Linux for now.)  Timers are efficient by default: to select more
+  precise timers, use the EVENT_BASE_FLAG_PRECISE_TIMER flag when
+  constructing the event_config, or set the EVENT_PRECISE_TIMER
+  environment variable to a non-empty string.
+
+  There is an EVLOOP_NO_EXIT_ON_EMPTY flag that tells event_base_loop()
+  to keep looping even when there are no pending events.  (Ordinarily,
+  event_base_loop() will exit as soon as no events are pending.)
+
+  Past versions of Libevent have been annoying to use with some
+  memory-leak-checking tools, because Libevent allocated some global
+  singletons but provided no means to free them.  There is now a
+  function, libevent_global_shutdown(), that you can use to free all
+  globally held resources before exiting, so that your leak-check tools
+  don't complain.  (Note: this function doesn't free non-global things
+  like events, bufferevents, and so on; and it doesn't free anything
+  that wouldn't otherwise get cleaned up by the operating system when
+  your process exit()s.  If you aren't using a leak-checking tool, there
+  is not much reason to call libevent_global_shutdown().)
+
+  There is a new event_base_get_npriorities() function to return the
+  number of priorities set in the event base.
+
+  Libevent 2.0 added an event_new() function to construct a new struct
+  event on the heap.  Unfortunately, with event_new(), there was no
+  equivalent for:
+
+         struct event ev;
+         event_assign(&ev, base, fd, EV_READ, callback, &ev);
+
+  In other words, there was no easy way for event_new() to set up an
+  event so that the event itself would be its callback argument.
+  Libevent 2.1 lets you do this by passing "event_self_cbarg()" as the
+  callback argument:
+
+         struct event *evp;
+         evp = event_new(base, fd, EV_READ, callback,
+         event_self_cbarg());
+
+  There's also a new event_base_get_running_event() function you can
+  call from within a Libevent callback to get a pointer to the current
+  event.  This should never be strictly necessary, but it's sometimes
+  convenient.
+
+  The event_base_once() function used to leak some memory if the event
+  that it added was never actually triggered.  Now, its memory is
+  tracked in the event_base and freed when the event_base is freed.
+  Note however that Libevent doesn't know how to free any information
+  passed as the callback argument to event_base_once is still something
+  you'll might need a way to de-allocate yourself.
+
+  There is an event_get_priority() function to return an event's
+  priority.
+
+  By analogy to event_base_loopbreak(), there is now an
+  event_base_loopcontinue() that tells Libevent to stop processing
+  active event callbacks, and re-scan for new events right away.
+
+  There's a function, event_base_foreach_event(), that can iterate over
+  every event currently pending or active on an event base, and invoke a
+  user-supplied callback on each. The callback must not alter the events
+  or add or remove anything to the event base.
+
+  We now have an event_remove_timer() function to remove the timeout on
+  an event while leaving its socket and/or signal triggers unchanged.
+  (If we were designing the API from scratch, this would be the behavior
+  of "event_add(ev, NULL)" on an already-added event with a timeout. But
+  that's a no-op in past versions of Libevent, and we don't want to
+  break compatibility.)
+
+  You can use the new event_base_get_num_events() function to find the
+  number of events active or pending on an event_base. To find the
+  largest number of events that there have been since the last call, use
+  event_base_get_max_events().
+
+  You can now activate all the events waiting for a given fd or signal
+  using the event_base_active_by_fd() and event_base_active_by_signal()
+  APIs.
+
+  On backends that support it (currently epoll), there is now an
+  EV_CLOSED flag that programs can use to detect when a socket has
+  closed without having to read all the bytes until receiving an EOF.
+
+1.3. Event finalization
+
+1.3.1. Why event finalization?
+
+  Libevent 2.1 now supports an API for safely "finalizing" events that
+  might be running in multiple threads, and provides a way to slightly
+  change the semantics of event_del() to prevent deadlocks in
+  multithreaded programs.
+
+  To motivate this feature, consider the following code, in the context
+  of a mulithreaded Libevent application:
+
+        struct connection *conn = event_get_callback_arg(ev);
+        event_del(ev);
+        connection_free(conn);
+
+  Suppose that the event's callback might be running in another thread,
+  and using the value of "conn" concurrently.  We wouldn't want to
+  execute the connection_free() call until "conn" is no longer in use.
+  How can we make this code safe?
+
+  Libevent 2.0 answered that question by saying that the event_del()
+  call should block if the event's callback is running in another
+  thread.  That way, we can be sure that event_del() has canceled the
+  callback (if the callback hadn't started running yet), or has waited
+  for the callback to finish.
+
+  But now suppose that the data structure is protected by a lock, and we
+  have the following code:
+
+        void check_disable(struct connection *connection) {
+            lock(connection);
+            if (should_stop_reading(connection))
+                    event_del(connection->read_event);
+            unlock(connection);
+        }
+
+  What happens when we call check_disable() from a callback and from
+  another thread?  Let's say that the other thread gets the lock
+  first.  If it decides to call event_del(), it will wait for the
+  callback to finish.  But meanwhile, the callback will be waiting for
+  the lock on the connection.  Since each threads is waiting for the
+  other one to release a resource, the program will deadlock.
+
+  This bug showed up in multithreaded bufferevent programs in 2.1,
+  particularly when freeing bufferevents.  (For more information, see
+  the "Deadlock when calling bufferevent_free from an other thread"
+  thread on libevent-users starting on 6 August 2012 and running through
+  February of 2013.  You might also like to read my earlier writeup at
+  http://archives.seul.org/libevent/users/Feb-2012/msg00053.html and
+  the ensuing discussion.)
+
+1.3.2. The EV_FINALIZE flag and avoiding deadlock
+
+  To prevent the deadlock condition described above, Libevent
+  2.1.3-alpha adds a new flag, "EV_FINALIZE".  You can pass it to
+  event_new() and event_assign() along with EV_READ, EV_WRITE, and the
+  other event flags.
+
+  When an event is constructed with the EV_FINALIZE flag, event_del()
+  will not block on that event, even when the event's callback is
+  running in another thread.  By using EV_FINALIZE, you are therefore
+  promising not to use the "event_del(ev); free(event_get_callback_arg(ev));"
+  pattern, but rather to use one of the finalization functions below to
+  clean up the event.
+
+  EV_FINALIZE has no effect on a single-threaded program, or on a
+  program where events are only used from one thread.
+
+
+  There are also two new variants of event_del() that you can use for
+  more fine-grained control:
+     event_del_noblock(ev)
+     event_del_block(ev)
+  The event_del_noblock() function will never block, even if the event
+  callback is running in another thread and doesn't have the EV_FINALIZE
+  flag.  The event_del_block() function will _always_ block if the event
+  callback is running in another thread, even if the event _does_ have
+  the EV_FINALIZE flag.
+
+  [A future version of Libevent may have a way to make the EV_FINALIZE
+  flag the default.]
+
+1.3.3. Safely finalizing events
+
+  To safely tear down an event that may be running, Libevent 2.1.3-alpha
+  introduces event_finalize() and event_free_finalize(). You call them
+  on an event, and provide a finalizer callback to be run on the event
+  and its callback argument once the event is definitely no longer
+  running.
+
+  With event_free_finalize(), the event is also freed once the finalizer
+  callback has been invoked.
+
+  A finalized event cannot be re-added or activated.  The finalizer
+  callback must not add events, activate events, or attempt to
+  "resucitate" the event being finalized in any way.
+
+  If any finalizer callbacks are pending as the event_base is being
+  freed, they will be invoked.  You can override this behavior with the
+  new function event_base_free_nofinalize().
+
+1.4. New debugging features
+
+  You can now turn on debug logs at runtime using a new function,
+  event_enable_debug_logging().
+
+  The event_enable_lock_debugging() function is now spelled correctly.
+  You can still use the old "event_enable_lock_debuging" name, though,
+  so your old programs shouldnt' break.
+
+  There's also been some work done to try to make the debugging logs
+  more generally useful.
+
+1.5. New evbuffer functions
+
+  In Libevent 2.0, we introduced evbuffer_add_file() to add an entire
+  file's contents to an evbuffer, and then send them using sendfile() or
+  mmap() as appropriate.  This API had some drawbacks, however.
+  Notably, it created one mapping or fd for every instance of the same
+  file added to any evbuffer.  Also, adding a file to an evbuffer could
+  make that buffer unusable with SSL bufferevents, filtering
+  bufferevents, and any code that tried to read the contents of the
+  evbuffer.
+
+  Libevent 2.1 adds a new evbuffer_file_segment API to solve these
+  problems.  Now, you can use evbuffer_file_segment_new() to construct a
+  file-segment object, and evbuffer_add_file_segment() to insert it (or
+  part of it) into an evbuffer.  These segments avoid creating redundant
+  maps or fds.  Better still, the code is smart enough (when the OS
+  supports sendfile) to map the file when that's necessary, and use
+  sendfile() otherwise.
+
+  File segments can receive callback functions that are invoked when the
+  file segments are freed.
+
+  The evbuffer_ptr interface has been extended so that an evbuffer_ptr
+  can now yield a point just after the end of the buffer.  This makes
+  many algorithms simpler to implement.
+
+  There's a new evbuffer_add_buffer() interface that you can use to add
+  one buffer to another nondestructively.  When you say
+  evbuffer_add_buffer_reference(outbuf, inbuf), outbuf now contains a
+  reference to the contents of inbuf.
+
+  To aid in adding data in bulk while minimizing evbuffer calls, there
+  is an evbuffer_add_iovec() function.
+
+  There's a new evbuffer_copyout_from() variant function to enable
+  copying data nondestructively from the middle of a buffer.
+
+  evbuffer_readln() now supports an EVBUFFER_EOL_NUL argument to fetch
+  NUL-terminated strings from buffers.
+
+  There's a new evbuffer_set_flags()/evbuffer_clear_flags() that you can use to
+  set EVBUFFER_FLAG_DRAINS_TO_FD.
+
+1.6. New functions and features: bufferevents
+
+  You can now use the bufferevent_getcb() function to find out a
+  bufferevent's callbacks.  Previously, there was no supported way to do
+  that.
+
+  The largest chunk readable or writeable in a single bufferevent
+  callback is no longer hardcoded; it's now configurable with
+  the new functions bufferevent_set_max_single_read() and
+  bufferevent_set_max_single_write().
+
+  For consistency, OpenSSL bufferevents now make sure to always set one
+  of BEV_EVENT_READING or BEV_EVENT_WRITING when invoking an event
+  callback.
+
+  Calling bufferevent_set_timeouts(bev, NULL, NULL) now removes the
+  timeouts from socket and ssl bufferevents correctly.
+
+  You can find the priority at which a bufferevent runs with
+  bufferevent_get_priority().
+
+  The function bufferevent_get_token_bucket_cfg() can retrieve the
+  rate-limit settings for a bufferevent; bufferevent_getwatermark() can
+  return a bufferevent's current watermark settings.
+
+  You can manually trigger a bufferevent's callbacks via
+  bufferevent_trigger() and bufferevent_trigger_event().
+
+  Also you can manually increment/decrement reference for bufferevent with
+  bufferevent_incref()/bufferevent_decref(), it is useful in situations where a
+  user may reference the bufferevent somewhere else.
+
+  Now bufferevent_openssl supports "dirty" shutdown (when the peer closes the
+  TCP connection before closing the SSL channel), see
+  bufferevent_openssl_get_allow_dirty_shutdown() and
+  bufferevent_openssl_set_allow_dirty_shutdown().
+
+  And also libevent supports openssl 1.1.
+
+1.7. New functions and features: evdns
+
+  The previous evdns interface used an "open a test UDP socket" trick in
+  order to detect IPv6 support.  This was a hack, since it would
+  sometimes badly confuse people's firewall software, even though no
+  packets were sent.  The current evdns interface-detection code uses
+  the appropriate OS functions to see which interfaces are configured.
+
+  The evdns_base_new() function now has multiple possible values for its
+  second (flags) argument.  Using 1 and 0 have their old meanings, though the
+  1 flag now has a symbolic name of EVDNS_BASE_INITIALIZE_NAMESERVERS.
+  A second flag is now supported too: the EVDNS_BASE_DISABLE_WHEN_INACTIVE
+  flag, which tells the evdns_base that it should not prevent Libevent from
+  exiting while it has no DNS requests in progress.
+
+  There is a new evdns_base_clear_host_addresses() function to remove
+  all the /etc/hosts addresses registered with an evdns instance.
+
+  Also there is evdns_base_get_nameserver_addr() for retrieve the address of
+  the 'idx'th configured nameserver.
+
+1.8. New functions and features: evconnlistener
+
+  Libevent 2.1 adds the following evconnlistener flags:
+
+    LEV_OPT_DEFERRED_ACCEPT -- Tells the OS that it doesn't need to
+    report sockets as having arrived until the initiator has sent some
+    data too.  This can greatly improve performance with protocols like
+    HTTP where the client always speaks first.  On operating systems
+    that don't support this functionality, this option has no effect.
+
+    LEV_OPT_REUSEABLE_PORT -- Indicates that we ask to allow multiple servers
+    to bind to the same port if they each set the option Ionly on Linux and
+    >=3.9)
+
+    LEV_OPT_DISABLED -- Creates an evconnlistener in the disabled (not
+    listening) state.
+
+  Libevent 2.1 changes the behavior of the LEV_OPT_CLOSE_ON_EXEC
+  flag.  Previously, it would apply to the listener sockets, but not to
+  the accepted sockets themselves.  That's almost never what you want.
+  Now, it applies both to the listener and the accepted sockets.
+
+1.9. New functions and features: evhttp
+
+  **********************************************************************
+  NOTE: The evhttp module will eventually be deprecated in favor of Mark
+  Ellzey's libevhtp library.  Don't worry -- this won't happen until
+  libevhtp provides every feature that evhttp does, and provides a
+  compatible interface that applications can use to migrate.
+  **********************************************************************
+
+  Previously, you could only set evhttp timeouts in increments of one
+  second.  Now, you can use evhttp_set_timeout_tv() and
+  evhttp_connection_set_timeout_tv() to configure
+  microsecond-granularity timeouts.
+
+  Also there is evhttp_connection_set_initial_retry_tv() to change initial
+  retry timeout.
+
+  There are a new pair of functions: evhttp_set_bevcb() and
+  evhttp_connection_base_bufferevent_new(), that you can use to
+  configure which bufferevents will be used for incoming and outgoing
+  http connections respectively.  These functions, combined with SSL
+  bufferevents, should enable HTTPS support.
+
+  There's a new evhttp_foreach_bound_socket() function to iterate over
+  every listener on an evhttp object.
+
+  Whitespace between lines in headers is now folded into a single space;
+  whitespace at the end of a header is now removed.
+
+  The socket errno value is now preserved when invoking an http error
+  callback.
+
+  There's a new kind of request callback for errors; you can set it with
+  evhttp_request_set_error_cb(). It gets called when there's a request error,
+  and actually reports the error code and lets you figure out which request
+  failed.
+
+  You can navigate from an evhttp_connection back to its evhttp with the
+  new evhttp_connection_get_server() function.
+
+  You can override the default HTTP Content-Type with the new
+  evhttp_set_default_content_type() function
+
+  There's a new evhttp_connection_get_addr() API to return the peer
+  address of an evhttp_connection.
+
+  The new evhttp_send_reply_chunk_with_cb() is a variant of
+  evhttp_send_reply_chunk() with a callback to be invoked when the
+  chunk is sent.
+
+  The evhttp_request_set_header_cb() facility adds a callback to be
+  invoked while parsing headers.
+
+  The evhttp_request_set_on_complete_cb() facility adds a callback to be
+  invoked on request completion.
+
+  You can add linger-close for http server by passing
+  EVHTTP_SERVER_LINGERING_CLOSE to evhttp_set_flags(), with this flag server
+  read all the clients body, and only after this respond with an error if the
+  clients body exceed max_body_size (since some clients cannot read response
+  otherwise).
+
+  The evhttp_connection_set_family() can bypass family hint to evdns.
+
+  There are some flags available for connections, which can be installed with
+  evhttp_connection_set_flags():
+  - EVHTTP_CON_REUSE_CONNECTED_ADDR -- reuse connection address on retry (avoid
+    extra DNS request).
+  - EVHTTP_CON_READ_ON_WRITE_ERROR - try read error, since server may already
+    close the connection.
+
+  The evhttp_connection_free_on_completion() can be used to tell libevent to
+  free the connection object after the last request has completed or failed.
+
+  There is evhttp_request_get_response_code_line() if
+  evhttp_request_get_response_code() is not enough for you.
+
+  There are *evhttp_uri_parse_with_flags() that accepts
+  EVHTTP_URI_NONCONFORMANT to tolerate URIs that do not conform to RFC3986.
+  The evhttp_uri_set_flags() can changes the flags on URI.
+
+1.10. New functions and features: evutil
+
+  There's a function "evutil_secure_rng_set_urandom_device_file()" that
+  you can use to override the default file that Libevent uses to seed
+  its (sort-of) secure RNG.
+
+  The evutil_date_rfc1123() returns date in RFC1123
+
+  There are new API to work with monotonic timer -- monotonic time is
+  guaranteed never to run in reverse, but is not necessarily epoch-based. Use
+  it to make reliable measurements of elapsed time between events even when the
+  system time may be changed:
+  - evutil_monotonic_timer_new()/evutil_monotonic_timer_free()
+  - evutil_configure_monotonic_time()
+  - evutil_gettime_monotonic()
+
+  Use evutil_make_listen_socket_reuseable_port() to set SO_REUSEPORT (linux >=
+  3.9)
+
+  The evutil_make_tcp_listen_socket_deferred() can make a tcp listener socket
+  defer accept()s until there is data to read (TCP_DEFER_ACCEPT).
+
+2. Cross-platform performance improvements
+
+2.1. Better data structures
+
+  We replaced several users of the sys/queue.h "TAILQ" data structure
+  with the "LIST" data structure.  Because this data type doesn't
+  require FIFO access, it requires fewer pointer checks and
+  manipulations to keep it in line.
+
+  All previous versions of Libevent have kept every pending (added)
+  event in an "eventqueue" data structure.  Starting in Libevent 2.0,
+  however, this structure became redundant: every pending timeout event
+  is stored in the timeout heap or in one of the common_timeout queues,
+  and every pending fd or signal event is stored in an evmap.  Libevent
+  2.1 removes this data structure, and thereby saves all of the code
+  that we'd been using to keep it updated.
+
+2.2. Faster activations and timeouts
+
+  It's a common pattern in older code to use event_base_once() with a
+  0-second timeout to ensure that a callback will get run 'as soon as
+  possible' in the current iteration of the Libevent loop.  We optimize
+  this case by calling event_active() directly, and bypassing the
+  timeout pool.  (People who are using this pattern should also consider
+  using event_active() themselves.)
+
+  Libevent 2.0 would wake up a polling event loop whenever the first
+  timeout in the event loop was adjusted--whether it had become earlier
+  or later.  We now only notify the event loop when a change causes the
+  expiration time to become _sooner_ than it would have been otherwise.
+
+  The timeout heap code is now optimized to perform fewer comparisons
+  and shifts when changing or removing a timeout.
+
+  Instead of checking for a wall-clock time jump every time we call
+  clock_gettime(), we now check only every 5 seconds.  This should save
+  a huge number of gettimeofday() calls.
+
+2.3. Microoptimizations
+
+  Internal event list maintainance no longer use the antipattern where
+  we have one function with multiple totally independent behaviors
+  depending on an argument:
+      #define OP1 1
+      #define OP2 2
+      #define OP3 3
+      void func(int operation, struct event *ev) {
+        switch (op) {
+          ...
+        }
+      }
+  Instead, these functions are now split into separate functions for
+  each operation:
+      void func_op1(struct event *ev) { ... }
+      void func_op2(struct event *ev) { ... }
+      void func_op3(struct event *ev) { ... }
+
+  This produces better code generation and inlining decisions on some
+  compilers, and makes the code easier to read and check.
+
+2.4. Evbuffer performance improvements
+
+  The EVBUFFER_EOL_CRLF line-ending type is now much faster, thanks to
+  smart optimizations.
+
+2.5. HTTP performance improvements
+
+   o Performance tweak to evhttp_parse_request_line. (aee1a97 Mark Ellzey)
+   o Add missing break to evhttp_parse_request_line (0fcc536)
+
+2.6. Coarse timers by default on Linux
+
+  Due to limitations of the epoll interface, Libevent programs using epoll
+  have not previously been able to wait for timeouts with accuracy smaller
+  than 1 millisecond.  But Libevent had been using CLOCK_MONOTONIC for
+  timekeeping on Linux, which is needlessly expensive: CLOCK_MONOTONIC_COARSE
+  has approximately the resolution corresponding to epoll, and is much faster
+  to invoke than CLOCK_MONOTONIC.
+
+  To disable coarse timers, and get a more plausible precision, use the
+  new EVENT_BASE_FLAG_PRECISE_TIMER flag when setting up your event base.
+
+3. Backend/OS-specific improvements
+
+3.1. Linux-specific improvements
+
+  The logic for deciding which arguements to use with epoll_ctl() is now
+  a table-driven lookup, rather than the previous pile of cascading
+  branches.  This should minimize epoll_ctl() calls and make the epoll
+  code run a little faster on change-heavy loads.
+
+  Libevent now takes advantage of Linux's support for enhanced APIs
+  (e.g., SOCK_CLOEXEC, SOCK_NONBLOCK, accept4, pipe2) that allow us to
+  simultaneously create a socket, make it nonblocking, and make it
+  close-on-exec.  This should save syscalls throughout our codebase, and
+  avoid race-conditions if an exec() occurs after a socket is socket is
+  created but before we can make it close-on-execute on it.
+
+3.2. Windows-specific improvements
+
+  We now use GetSystemTimeAsFileTime to implement gettimeofday.  It's
+  significantly faster and more accurate than our old ftime()-based approach.
+
+3.3. Improvements in the solaris evport backend.
+
+  The evport backend has been updated to use many of the infrastructure
+  improvements from Libevent 2.0.  Notably, it keeps track of per-fd
+  information using the evmap infrastructure, and removes a number of
+  linear scans over recently-added events.  This last change makes it
+  efficient to receive many more events per evport_getn() call, thereby
+  reducing evport overhead in general.
+
+3.4. OSX backend improvements
+
+  The OSX select backend doesn't like to have more than a certain number
+  of fds set unless an "unlimited select" option has been set.
+  Therefore, we now set it.
+
+3.5. Monotonic clocks on even more platforms
+
+  Libevent previously used a monotonic clock for its internal timekeeping
+  only on platforms supporting the POSIX clock_gettime() interface. Now,
+  Libevent has support for monotonic clocks on OSX and Windows too, and a
+  fallback implementation for systems without monotonic clocks that will at
+  least keep time running forwards.
+
+  Using monotonic timers makes Libevent more resilient to changes in the
+  system time, as can happen in small amounts due to clock adjustments from
+  NTP, or in large amounts due to users who move their system clocks all over
+  the timeline in order to keep nagware from nagging them.
+
+3.6. Faster cross-thread notification on kqueue
+
+  When a thread other than the one in which the main event loop is
+  running needs to wake the thread running the main event loop, Libevent
+  usually writes to a socketpair in order to force the main event loop
+  to wake up.  On Linux, we've been able to use eventfd() instead.  Now
+  on BSD and OSX systems (any anywhere else that has kqueue with the
+  EVFILT_USER extension), we can use EVFILT_USER to wake up the main
+  thread from kqueue.  This should be a tiny bit faster than the
+  previous approach.
+
+4. Infrastructure improvements
+
+4.1. Faster tests
+
+  I've spent some time to try to make the unit tests run faster in
+  Libevent 2.1.  Nearly all of this was a matter of searching slow tests
+  for unreasonably long timeouts, and cutting them down to reasonably
+  long delays, though on one or two cases I actually had to parallelize
+  an operation or improve an algorithm.
+
+  On my desktop, a full "make verify" run of Libevent 2.0.18-stable
+  requires about 218 seconds.  Libevent 2.1.1-alpha cuts this down to
+  about 78 seconds.
+
+  Faster unit tests are great, since they let programmers test their
+  changes without losing their train of thought.
+
+4.2. Finicky tests are now off-by-default
+
+  The Tinytest unit testing framework now supports optional tests, and
+  Libevent uses them.  By default, Libevent's unit testing framework
+  does not run tests that require a working network, and does not run
+  tests that tend to fail on heavily loaded systems because of timing
+  issues.  To re-enable all tests, run ./test/regress using the "@all"
+  alias.
+
+4.3. Modernized use of autotools
+
+  Our autotools-based build system has been updated to build without
+  warnings on recent autoconf/automake versions.
+
+  Libevent's autotools makefiles are no longer recursive.  This allows
+  make to use the maximum possible parallelism to do the minimally
+  necessary amount of work.  See Peter Miller's "Recursive Make
+  Considered Harmful" at http://miller.emu.id.au/pmiller/books/rmch/ for
+  more information here.
+
+  We now use the "quiet build" option to suppress distracting messages
+  about which commandlines are running.  You can get them back with
+  "make V=1".
+
+4.4. Portability
+
+  Libevent now uses large-file support internally on platforms where it
+  matters.  You shouldn't need to set _LARGEFILE or OFFSET_BITS or
+  anything magic before including the Libevent headers, either, since
+  Libevent now sets the size of ev_off_t to the size of off_t that it
+  received at compile time, not to some (possibly different) size based
+  on current macro definitions when your program is building.
+
+  We now also use the Autoconf AC_USE_SYSTEM_EXTENSIONS mechanism to
+  enable per-system macros needed to enable not-on-by-default features.
+  Unlike the rest of the autoconf macros, we output these to an
+  internal-use-only evconfig-private.h header, since their names need to
+  survive unmangled.  This lets us build correctly on more platforms,
+  and avoid inconsistencies when some files define _GNU_SOURCE and
+  others don't.
+
+  Libevent now tries to detect OpenSSL via pkg-config.
+
+4.5. Standards conformance
+
+  Previous Libevent versions had no consistent convention for internal
+  vs external identifiers, and used identifiers starting with the "_"
+  character throughout the codebase.  That's no good, since the C
+  standard says that identifiers beginning with _ are reserved.  I'm not
+  aware of having any collisions with system identifiers, but it's best
+  to fix these things before they cause trouble.
+
+  We now avoid all use of the _identifiers in the Libevent source code.
+  These changes were made *mainly* through the use of automated scripts,
+  so there shouldn't be any mistakes, but you never know.
+
+  As an exception, the names _EVENT_LOG_DEBUG, _EVENT_LOG_MSG_,
+  _EVENT_LOG_WARN, and _EVENT_LOG_ERR are still exposed in event.h: they
+  are now deprecated, but to support older code, they will need to stay
+  around for a while.  New code should use EVENT_LOG_DEBUG,
+  EVENT_LOG_MSG, EVENT_LOG_WARN, and EVENT_LOG_ERR instead.
+
+4.6. Event and callback refactoring
+
+  As a simplification and optimization to Libevent's "deferred callback"
+  logic (introduced in 2.0 to avoid callback recursion), Libevent now
+  treats all of its deferrable callback types using the same logic it
+  uses for active events.  Now deferred events no longer cause priority
+  inversion, no longer require special code to cancel them, and so on.
+
+  Regular events and deferred callbacks now both descend from an
+  internal light-weight event_callback supertype, and both support
+  priorities and take part in the other anti-priority-inversion
+  mechanisms in Libevent.
+
+  To avoid starvation from callback recursion (which was the reason we
+  introduced "deferred callbacks" in the first place) the implementation
+  now allows an event callback to be scheduled as "active later":
+  instead of running in the current iteration of the event loop, it runs
+  in the next one.
+
+5. Testing
+
+  Libevent's test coverage level is more or less unchanged since before:
+  we still have over 80% line coverage in our tests on Linux, FreeBSD, NetBSD,
+  Windows, OSX.
+  There are some under-tested modules, though: we need to fix those.
+
+  And now we have CI:
+  - https://travis-ci.org/libevent/libevent
+  - https://ci.appveyor.com/project/nmathewson/libevent
+
+  And code coverage:
+  - https://coveralls.io/github/libevent/libevent
+
+  Plus there is vagrant boxes if you what to test it on more OS'es then
+  travis-ci allows, and there is a wrapper (in python) that will parse logs and
+  provide report:
+  - https://github.com/libevent/libevent-extras/blob/master/tools/vagrant-tests.py
+
+6. Contributing
+
+  From now we have contributing guide and checkpatch.sh.
diff --git a/extra/libevent/libevent-2.1.11-stable/win32select.c b/extra/libevent/libevent-2.1.11-stable/win32select.c
new file mode 100644
index 000000000000..0ddfe4b499af
--- /dev/null
+++ b/extra/libevent/libevent-2.1.11-stable/win32select.c
@@ -0,0 +1,390 @@
+/*
+ * Copyright 2007-2012 Niels Provos and Nick Mathewson
+ * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
+ * Copyright 2003 Michael A. Davis <mike@datanerds.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include "event2/event-config.h"
+#include "evconfig-private.h"
+
+#ifdef _WIN32
+
+#include <winsock2.h>
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "event2/util.h"
+#include "util-internal.h"
+#include "log-internal.h"
+#include "event2/event.h"
+#include "event-internal.h"
+#include "evmap-internal.h"
+#include "event2/thread.h"
+#include "evthread-internal.h"
+#include "time-internal.h"
+
+#define XFREE(ptr) do { if (ptr) mm_free(ptr); } while (0)
+
+extern struct event_list timequeue;
+extern struct event_list addqueue;
+
+struct win_fd_set {
+	unsigned int fd_count;
+	SOCKET fd_array[1];
+};
+
+/* MSDN says this is required to handle SIGFPE */
+volatile double SIGFPE_REQ = 0.0f;
+
+struct idx_info {
+	int read_pos_plus1;
+	int write_pos_plus1;
+};
+
+struct win32op {
+	unsigned num_fds_in_fd_sets;
+	int resize_out_sets;
+	struct win_fd_set *readset_in;
+	struct win_fd_set *writeset_in;
+	struct win_fd_set *readset_out;
+	struct win_fd_set *writeset_out;
+	struct win_fd_set *exset_out;
+	unsigned signals_are_broken : 1;
+};
+
+static void *win32_init(struct event_base *);
+static int win32_add(struct event_base *, evutil_socket_t, short old, short events, void *idx_);
+static int win32_del(struct event_base *, evutil_socket_t, short old, short events, void *idx_);
+static int win32_dispatch(struct event_base *base, struct timeval *);
+static void win32_dealloc(struct event_base *);
+
+struct eventop win32ops = {
+	"win32",
+	win32_init,
+	win32_add,
+	win32_del,
+	win32_dispatch,
+	win32_dealloc,
+	0, /* doesn't need reinit */
+	0, /* No features supported. */
+	sizeof(struct idx_info),
+};
+
+#define FD_SET_ALLOC_SIZE(n) ((sizeof(struct win_fd_set) + ((n)-1)*sizeof(SOCKET)))
+
+static int
+grow_fd_sets(struct win32op *op, unsigned new_num_fds)
+{
+	size_t size;
+
+	EVUTIL_ASSERT(new_num_fds >= op->readset_in->fd_count &&
+	       new_num_fds >= op->writeset_in->fd_count);
+	EVUTIL_ASSERT(new_num_fds >= 1);
+
+	size = FD_SET_ALLOC_SIZE(new_num_fds);
+	if (!(op->readset_in = mm_realloc(op->readset_in, size)))
+		return (-1);
+	if (!(op->writeset_in = mm_realloc(op->writeset_in, size)))
+		return (-1);
+	op->resize_out_sets = 1;
+	op->num_fds_in_fd_sets = new_num_fds;
+	return (0);
+}
+
+static int
+do_fd_set(struct win32op *op, struct idx_info *ent, evutil_socket_t s, int read)
+{
+	struct win_fd_set *set = read ? op->readset_in : op->writeset_in;
+	if (read) {
+		if (ent->read_pos_plus1 > 0)
+			return (0);
+	} else {
+		if (ent->write_pos_plus1 > 0)
+			return (0);
+	}
+	if (set->fd_count == op->num_fds_in_fd_sets) {
+		if (grow_fd_sets(op, op->num_fds_in_fd_sets*2))
+			return (-1);
+		/* set pointer will have changed and needs reiniting! */
+		set = read ? op->readset_in : op->writeset_in;
+	}
+	set->fd_array[set->fd_count] = s;
+	if (read)
+		ent->read_pos_plus1 = set->fd_count+1;
+	else
+		ent->write_pos_plus1 = set->fd_count+1;
+	return (set->fd_count++);
+}
+
+static int
+do_fd_clear(struct event_base *base,
+			struct win32op *op, struct idx_info *ent, int read)
+{
+	int i;
+	struct win_fd_set *set = read ? op->readset_in : op->writeset_in;
+	if (read) {
+		i = ent->read_pos_plus1 - 1;
+		ent->read_pos_plus1 = 0;
+	} else {
+		i = ent->write_pos_plus1 - 1;
+		ent->write_pos_plus1 = 0;
+	}
+	if (i < 0)
+		return (0);
+	if (--set->fd_count != (unsigned)i) {
+		struct idx_info *ent2;
+		SOCKET s2;
+		s2 = set->fd_array[i] = set->fd_array[set->fd_count];
+
+		ent2 = evmap_io_get_fdinfo_(&base->io, s2);
+
+		if (!ent2) /* This indicates a bug. */
+			return (0);
+		if (read)
+			ent2->read_pos_plus1 = i+1;
+		else
+			ent2->write_pos_plus1 = i+1;
+	}
+	return (0);
+}
+
+#define NEVENT 32
+void *
+win32_init(struct event_base *base)
+{
+	struct win32op *winop;
+	size_t size;
+	if (!(winop = mm_calloc(1, sizeof(struct win32op))))
+		return NULL;
+	winop->num_fds_in_fd_sets = NEVENT;
+	size = FD_SET_ALLOC_SIZE(NEVENT);
+	if (!(winop->readset_in = mm_malloc(size)))
+		goto err;
+	if (!(winop->writeset_in = mm_malloc(size)))
+		goto err;
+	if (!(winop->readset_out = mm_malloc(size)))
+		goto err;
+	if (!(winop->writeset_out = mm_malloc(size)))
+		goto err;
+	if (!(winop->exset_out = mm_malloc(size)))
+		goto err;
+	winop->readset_in->fd_count = winop->writeset_in->fd_count = 0;
+	winop->readset_out->fd_count = winop->writeset_out->fd_count
+		= winop->exset_out->fd_count = 0;
+
+	if (evsig_init_(base) < 0)
+		winop->signals_are_broken = 1;
+
+	evutil_weakrand_seed_(&base->weakrand_seed, 0);
+
+	return (winop);
+ err:
+	XFREE(winop->readset_in);
+	XFREE(winop->writeset_in);
+	XFREE(winop->readset_out);
+	XFREE(winop->writeset_out);
+	XFREE(winop->exset_out);
+	XFREE(winop);
+	return (NULL);
+}
+
+int
+win32_add(struct event_base *base, evutil_socket_t fd,
+			 short old, short events, void *idx_)
+{
+	struct win32op *win32op = base->evbase;
+	struct idx_info *idx = idx_;
+
+	if ((events & EV_SIGNAL) && win32op->signals_are_broken)
+		return (-1);
+
+	if (!(events & (EV_READ|EV_WRITE)))
+		return (0);
+
+	event_debug(("%s: adding event for %d", __func__, (int)fd));
+	if (events & EV_READ) {
+		if (do_fd_set(win32op, idx, fd, 1)<0)
+			return (-1);
+	}
+	if (events & EV_WRITE) {
+		if (do_fd_set(win32op, idx, fd, 0)<0)
+			return (-1);
+	}
+	return (0);
+}
+
+int
+win32_del(struct event_base *base, evutil_socket_t fd, short old, short events,
+		  void *idx_)
+{
+	struct win32op *win32op = base->evbase;
+	struct idx_info *idx = idx_;
+
+	event_debug(("%s: Removing event for "EV_SOCK_FMT,
+		__func__, EV_SOCK_ARG(fd)));
+	if (events & EV_READ)
+		do_fd_clear(base, win32op, idx, 1);
+	if (events & EV_WRITE)
+		do_fd_clear(base, win32op, idx, 0);
+
+	return 0;
+}
+
+static void
+fd_set_copy(struct win_fd_set *out, const struct win_fd_set *in)
+{
+	out->fd_count = in->fd_count;
+	memcpy(out->fd_array, in->fd_array, in->fd_count * (sizeof(SOCKET)));
+}
+
+/*
+  static void dump_fd_set(struct win_fd_set *s)
+  {
+  unsigned int i;
+  printf("[ ");
+  for(i=0;i<s->fd_count;++i)
+  printf("%d ",(int)s->fd_array[i]);
+  printf("]\n");
+  }
+*/
+
+int
+win32_dispatch(struct event_base *base, struct timeval *tv)
+{
+	struct win32op *win32op = base->evbase;
+	int res = 0;
+	unsigned j, i;
+	int fd_count;
+	SOCKET s;
+
+	if (win32op->resize_out_sets) {
+		size_t size = FD_SET_ALLOC_SIZE(win32op->num_fds_in_fd_sets);
+		if (!(win32op->readset_out = mm_realloc(win32op->readset_out, size)))
+			return (-1);
+		if (!(win32op->exset_out = mm_realloc(win32op->exset_out, size)))
+			return (-1);
+		if (!(win32op->writeset_out = mm_realloc(win32op->writeset_out, size)))
+			return (-1);
+		win32op->resize_out_sets = 0;
+	}
+
+	fd_set_copy(win32op->readset_out, win32op->readset_in);
+	fd_set_copy(win32op->exset_out, win32op->writeset_in);
+	fd_set_copy(win32op->writeset_out, win32op->writeset_in);
+
+	fd_count =
+	    (win32op->readset_out->fd_count > win32op->writeset_out->fd_count) ?
+	    win32op->readset_out->fd_count : win32op->writeset_out->fd_count;
+
+	if (!fd_count) {
+		long msec = tv ? evutil_tv_to_msec_(tv) : LONG_MAX;
+		/* Sleep's DWORD argument is unsigned long */
+		if (msec < 0)
+			msec = LONG_MAX;
+		/* Windows doesn't like you to call select() with no sockets */
+		Sleep(msec);
+		return (0);
+	}
+
+	EVBASE_RELEASE_LOCK(base, th_base_lock);
+
+	res = select(fd_count,
+		     (struct fd_set*)win32op->readset_out,
+		     (struct fd_set*)win32op->writeset_out,
+		     (struct fd_set*)win32op->exset_out, tv);
+
+	EVBASE_ACQUIRE_LOCK(base, th_base_lock);
+
+	event_debug(("%s: select returned %d", __func__, res));
+
+	if (res <= 0) {
+		event_debug(("%s: %s", __func__,
+		    evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())));
+		return res;
+	}
+
+	if (win32op->readset_out->fd_count) {
+		i = evutil_weakrand_range_(&base->weakrand_seed,
+		    win32op->readset_out->fd_count);
+		for (j=0; j<win32op->readset_out->fd_count; ++j) {
+			if (++i >= win32op->readset_out->fd_count)
+				i = 0;
+			s = win32op->readset_out->fd_array[i];
+			evmap_io_active_(base, s, EV_READ);
+		}
+	}
+	if (win32op->exset_out->fd_count) {
+		i = evutil_weakrand_range_(&base->weakrand_seed,
+		    win32op->exset_out->fd_count);
+		for (j=0; j<win32op->exset_out->fd_count; ++j) {
+			if (++i >= win32op->exset_out->fd_count)
+				i = 0;
+			s = win32op->exset_out->fd_array[i];
+			evmap_io_active_(base, s, EV_WRITE);
+		}
+	}
+	if (win32op->writeset_out->fd_count) {
+		SOCKET s;
+		i = evutil_weakrand_range_(&base->weakrand_seed,
+		    win32op->writeset_out->fd_count);
+		for (j=0; j<win32op->writeset_out->fd_count; ++j) {
+			if (++i >= win32op->writeset_out->fd_count)
+				i = 0;
+			s = win32op->writeset_out->fd_array[i];
+			evmap_io_active_(base, s, EV_WRITE);
+		}
+	}
+	return (0);
+}
+
+void
+win32_dealloc(struct event_base *base)
+{
+	struct win32op *win32op = base->evbase;
+
+	evsig_dealloc_(base);
+	if (win32op->readset_in)
+		mm_free(win32op->readset_in);
+	if (win32op->writeset_in)
+		mm_free(win32op->writeset_in);
+	if (win32op->readset_out)
+		mm_free(win32op->readset_out);
+	if (win32op->writeset_out)
+		mm_free(win32op->writeset_out);
+	if (win32op->exset_out)
+		mm_free(win32op->exset_out);
+	/* XXXXX free the tree. */
+
+	memset(win32op, 0, sizeof(*win32op));
+	mm_free(win32op);
+}
+
+#endif
diff --git a/extra/lz4/LICENSE b/extra/lz4/LICENSE
deleted file mode 100644
index 552349d382f3..000000000000
--- a/extra/lz4/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-LZ4 Library
-Copyright (c) 2011-2014, Yann Collet
-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.
-
-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 HOLDER 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.
diff --git a/extra/lz4/lz4-1.9.4/LICENSE b/extra/lz4/lz4-1.9.4/LICENSE
new file mode 100644
index 000000000000..1b84cc30f036
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/LICENSE
@@ -0,0 +1,12 @@
+This repository uses 2 different licenses :
+- all files in the `lib` directory use a BSD 2-Clause license
+- all other files use a GPLv2 license, unless explicitly stated otherwise
+
+Relevant license is reminded at the top of each source file,
+and with presence of COPYING or LICENSE file in associated directories.
+
+This model is selected to emphasize that
+files in the `lib` directory are designed to be included into 3rd party applications,
+while all other files, in `programs`, `tests` or `examples`,
+are intended to be used "as is", as part of their intended scenarios,
+with no intention to support 3rd party integration use cases.
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4.c b/extra/lz4/lz4-1.9.4/lib/lz4.c
new file mode 100644
index 000000000000..654bfdf32f96
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4.c
@@ -0,0 +1,2722 @@
+/*
+   LZ4 - Fast LZ compression algorithm
+   Copyright (C) 2011-2020, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+    - LZ4 homepage : http://www.lz4.org
+    - LZ4 source repository : https://github.com/lz4/lz4
+*/
+
+/*-************************************
+*  Tuning parameters
+**************************************/
+/*
+ * LZ4_HEAPMODE :
+ * Select how default compression functions will allocate memory for their hash table,
+ * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()).
+ */
+#ifndef LZ4_HEAPMODE
+#  define LZ4_HEAPMODE 0
+#endif
+
+/*
+ * LZ4_ACCELERATION_DEFAULT :
+ * Select "acceleration" for LZ4_compress_fast() when parameter value <= 0
+ */
+#define LZ4_ACCELERATION_DEFAULT 1
+/*
+ * LZ4_ACCELERATION_MAX :
+ * Any "acceleration" value higher than this threshold
+ * get treated as LZ4_ACCELERATION_MAX instead (fix #876)
+ */
+#define LZ4_ACCELERATION_MAX 65537
+
+
+/*-************************************
+*  CPU Feature Detection
+**************************************/
+/* LZ4_FORCE_MEMORY_ACCESS
+ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
+ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
+ * The below switch allow to select different access method for improved performance.
+ * Method 0 (default) : use `memcpy()`. Safe and portable.
+ * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
+ *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
+ * Method 2 : direct access. This method is portable but violate C standard.
+ *            It can generate buggy code on targets which assembly generation depends on alignment.
+ *            But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
+ * See https://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
+ * Prefer these methods in priority order (0 > 1 > 2)
+ */
+#ifndef LZ4_FORCE_MEMORY_ACCESS   /* can be defined externally */
+#  if defined(__GNUC__) && \
+  ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) \
+  || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
+#    define LZ4_FORCE_MEMORY_ACCESS 2
+#  elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || defined(__GNUC__)
+#    define LZ4_FORCE_MEMORY_ACCESS 1
+#  endif
+#endif
+
+/*
+ * LZ4_FORCE_SW_BITCOUNT
+ * Define this parameter if your target system or compiler does not support hardware bit count
+ */
+#if defined(_MSC_VER) && defined(_WIN32_WCE)   /* Visual Studio for WinCE doesn't support Hardware bit count */
+#  undef  LZ4_FORCE_SW_BITCOUNT  /* avoid double def */
+#  define LZ4_FORCE_SW_BITCOUNT
+#endif
+
+
+
+/*-************************************
+*  Dependency
+**************************************/
+/*
+ * LZ4_SRC_INCLUDED:
+ * Amalgamation flag, whether lz4.c is included
+ */
+#ifndef LZ4_SRC_INCLUDED
+#  define LZ4_SRC_INCLUDED 1
+#endif
+
+#ifndef LZ4_STATIC_LINKING_ONLY
+#define LZ4_STATIC_LINKING_ONLY
+#endif
+
+#ifndef LZ4_DISABLE_DEPRECATE_WARNINGS
+#define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to LZ4_decompress_safe_withPrefix64k */
+#endif
+
+#define LZ4_STATIC_LINKING_ONLY  /* LZ4_DISTANCE_MAX */
+#include "lz4.h"
+/* see also "memory routines" below */
+
+
+/*-************************************
+*  Compiler Options
+**************************************/
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)  /* Visual Studio 2005+ */
+#  include <intrin.h>               /* only present in VS2005+ */
+#  pragma warning(disable : 4127)   /* disable: C4127: conditional expression is constant */
+#  pragma warning(disable : 6237)   /* disable: C6237: conditional expression is always 0 */
+#endif  /* _MSC_VER */
+
+#ifndef LZ4_FORCE_INLINE
+#  ifdef _MSC_VER    /* Visual Studio */
+#    define LZ4_FORCE_INLINE static __forceinline
+#  else
+#    if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
+#      ifdef __GNUC__
+#        define LZ4_FORCE_INLINE static inline __attribute__((always_inline))
+#      else
+#        define LZ4_FORCE_INLINE static inline
+#      endif
+#    else
+#      define LZ4_FORCE_INLINE static
+#    endif /* __STDC_VERSION__ */
+#  endif  /* _MSC_VER */
+#endif /* LZ4_FORCE_INLINE */
+
+/* LZ4_FORCE_O2 and LZ4_FORCE_INLINE
+ * gcc on ppc64le generates an unrolled SIMDized loop for LZ4_wildCopy8,
+ * together with a simple 8-byte copy loop as a fall-back path.
+ * However, this optimization hurts the decompression speed by >30%,
+ * because the execution does not go to the optimized loop
+ * for typical compressible data, and all of the preamble checks
+ * before going to the fall-back path become useless overhead.
+ * This optimization happens only with the -O3 flag, and -O2 generates
+ * a simple 8-byte copy loop.
+ * With gcc on ppc64le, all of the LZ4_decompress_* and LZ4_wildCopy8
+ * functions are annotated with __attribute__((optimize("O2"))),
+ * and also LZ4_wildCopy8 is forcibly inlined, so that the O2 attribute
+ * of LZ4_wildCopy8 does not affect the compression speed.
+ */
+#if defined(__PPC64__) && defined(__LITTLE_ENDIAN__) && defined(__GNUC__) && !defined(__clang__)
+#  define LZ4_FORCE_O2  __attribute__((optimize("O2")))
+#  undef LZ4_FORCE_INLINE
+#  define LZ4_FORCE_INLINE  static __inline __attribute__((optimize("O2"),always_inline))
+#else
+#  define LZ4_FORCE_O2
+#endif
+
+#if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__)
+#  define expect(expr,value)    (__builtin_expect ((expr),(value)) )
+#else
+#  define expect(expr,value)    (expr)
+#endif
+
+#ifndef likely
+#define likely(expr)     expect((expr) != 0, 1)
+#endif
+#ifndef unlikely
+#define unlikely(expr)   expect((expr) != 0, 0)
+#endif
+
+/* Should the alignment test prove unreliable, for some reason,
+ * it can be disabled by setting LZ4_ALIGN_TEST to 0 */
+#ifndef LZ4_ALIGN_TEST  /* can be externally provided */
+# define LZ4_ALIGN_TEST 1
+#endif
+
+
+/*-************************************
+*  Memory routines
+**************************************/
+
+/*! LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION :
+ *  Disable relatively high-level LZ4/HC functions that use dynamic memory
+ *  allocation functions (malloc(), calloc(), free()).
+ *
+ *  Note that this is a compile-time switch. And since it disables
+ *  public/stable LZ4 v1 API functions, we don't recommend using this
+ *  symbol to generate a library for distribution.
+ *
+ *  The following public functions are removed when this symbol is defined.
+ *  - lz4   : LZ4_createStream, LZ4_freeStream,
+ *            LZ4_createStreamDecode, LZ4_freeStreamDecode, LZ4_create (deprecated)
+ *  - lz4hc : LZ4_createStreamHC, LZ4_freeStreamHC,
+ *            LZ4_createHC (deprecated), LZ4_freeHC  (deprecated)
+ *  - lz4frame, lz4file : All LZ4F_* functions
+ */
+#if defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+#  define ALLOC(s)          lz4_error_memory_allocation_is_disabled
+#  define ALLOC_AND_ZERO(s) lz4_error_memory_allocation_is_disabled
+#  define FREEMEM(p)        lz4_error_memory_allocation_is_disabled
+#elif defined(LZ4_USER_MEMORY_FUNCTIONS)
+/* memory management functions can be customized by user project.
+ * Below functions must exist somewhere in the Project
+ * and be available at link time */
+void* LZ4_malloc(size_t s);
+void* LZ4_calloc(size_t n, size_t s);
+void  LZ4_free(void* p);
+# define ALLOC(s)          LZ4_malloc(s)
+# define ALLOC_AND_ZERO(s) LZ4_calloc(1,s)
+# define FREEMEM(p)        LZ4_free(p)
+#else
+# include <stdlib.h>   /* malloc, calloc, free */
+# define ALLOC(s)          malloc(s)
+# define ALLOC_AND_ZERO(s) calloc(1,s)
+# define FREEMEM(p)        free(p)
+#endif
+
+#if ! LZ4_FREESTANDING
+#  include <string.h>   /* memset, memcpy */
+#endif
+#if !defined(LZ4_memset)
+#  define LZ4_memset(p,v,s) memset((p),(v),(s))
+#endif
+#define MEM_INIT(p,v,s)   LZ4_memset((p),(v),(s))
+
+
+/*-************************************
+*  Common Constants
+**************************************/
+#define MINMATCH 4
+
+#define WILDCOPYLENGTH 8
+#define LASTLITERALS   5   /* see ../doc/lz4_Block_format.md#parsing-restrictions */
+#define MFLIMIT       12   /* see ../doc/lz4_Block_format.md#parsing-restrictions */
+#define MATCH_SAFEGUARD_DISTANCE  ((2*WILDCOPYLENGTH) - MINMATCH)   /* ensure it's possible to write 2 x wildcopyLength without overflowing output buffer */
+#define FASTLOOP_SAFE_DISTANCE 64
+static const int LZ4_minLength = (MFLIMIT+1);
+
+#define KB *(1 <<10)
+#define MB *(1 <<20)
+#define GB *(1U<<30)
+
+#define LZ4_DISTANCE_ABSOLUTE_MAX 65535
+#if (LZ4_DISTANCE_MAX > LZ4_DISTANCE_ABSOLUTE_MAX)   /* max supported by LZ4 format */
+#  error "LZ4_DISTANCE_MAX is too big : must be <= 65535"
+#endif
+
+#define ML_BITS  4
+#define ML_MASK  ((1U<<ML_BITS)-1)
+#define RUN_BITS (8-ML_BITS)
+#define RUN_MASK ((1U<<RUN_BITS)-1)
+
+
+/*-************************************
+*  Error detection
+**************************************/
+#if defined(LZ4_DEBUG) && (LZ4_DEBUG>=1)
+#  include <assert.h>
+#else
+#  ifndef assert
+#    define assert(condition) ((void)0)
+#  endif
+#endif
+
+#define LZ4_STATIC_ASSERT(c)   { enum { LZ4_static_assert = 1/(int)(!!(c)) }; }   /* use after variable declarations */
+
+#if defined(LZ4_DEBUG) && (LZ4_DEBUG>=2)
+#  include <stdio.h>
+   static int g_debuglog_enable = 1;
+#  define DEBUGLOG(l, ...) {                          \
+        if ((g_debuglog_enable) && (l<=LZ4_DEBUG)) {  \
+            fprintf(stderr, __FILE__ ": ");           \
+            fprintf(stderr, __VA_ARGS__);             \
+            fprintf(stderr, " \n");                   \
+    }   }
+#else
+#  define DEBUGLOG(l, ...) {}    /* disabled */
+#endif
+
+static int LZ4_isAligned(const void* ptr, size_t alignment)
+{
+    return ((size_t)ptr & (alignment -1)) == 0;
+}
+
+
+/*-************************************
+*  Types
+**************************************/
+#include <limits.h>
+#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+# include <stdint.h>
+  typedef  uint8_t BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
+  typedef uintptr_t uptrval;
+#else
+# if UINT_MAX != 4294967295UL
+#   error "LZ4 code (when not C++ or C99) assumes that sizeof(int) == 4"
+# endif
+  typedef unsigned char       BYTE;
+  typedef unsigned short      U16;
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+  typedef unsigned long long  U64;
+  typedef size_t              uptrval;   /* generally true, except OpenVMS-64 */
+#endif
+
+#if defined(__x86_64__)
+  typedef U64    reg_t;   /* 64-bits in x32 mode */
+#else
+  typedef size_t reg_t;   /* 32-bits in x32 mode */
+#endif
+
+typedef enum {
+    notLimited = 0,
+    limitedOutput = 1,
+    fillOutput = 2
+} limitedOutput_directive;
+
+
+/*-************************************
+*  Reading and writing into memory
+**************************************/
+
+/**
+ * LZ4 relies on memcpy with a constant size being inlined. In freestanding
+ * environments, the compiler can't assume the implementation of memcpy() is
+ * standard compliant, so it can't apply its specialized memcpy() inlining
+ * logic. When possible, use __builtin_memcpy() to tell the compiler to analyze
+ * memcpy() as if it were standard compliant, so it can inline it in freestanding
+ * environments. This is needed when decompressing the Linux Kernel, for example.
+ */
+#if !defined(LZ4_memcpy)
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define LZ4_memcpy(dst, src, size) __builtin_memcpy(dst, src, size)
+#  else
+#    define LZ4_memcpy(dst, src, size) memcpy(dst, src, size)
+#  endif
+#endif
+
+#if !defined(LZ4_memmove)
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define LZ4_memmove __builtin_memmove
+#  else
+#    define LZ4_memmove memmove
+#  endif
+#endif
+
+static unsigned LZ4_isLittleEndian(void)
+{
+    const union { U32 u; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental */
+    return one.c[0];
+}
+
+
+#if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==2)
+/* lie to the compiler about data alignment; use with caution */
+
+static U16 LZ4_read16(const void* memPtr) { return *(const U16*) memPtr; }
+static U32 LZ4_read32(const void* memPtr) { return *(const U32*) memPtr; }
+static reg_t LZ4_read_ARCH(const void* memPtr) { return *(const reg_t*) memPtr; }
+
+static void LZ4_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
+static void LZ4_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; }
+
+#elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==1)
+
+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
+/* currently only defined for gcc and icc */
+typedef union { U16 u16; U32 u32; reg_t uArch; } __attribute__((packed)) LZ4_unalign;
+
+static U16 LZ4_read16(const void* ptr) { return ((const LZ4_unalign*)ptr)->u16; }
+static U32 LZ4_read32(const void* ptr) { return ((const LZ4_unalign*)ptr)->u32; }
+static reg_t LZ4_read_ARCH(const void* ptr) { return ((const LZ4_unalign*)ptr)->uArch; }
+
+static void LZ4_write16(void* memPtr, U16 value) { ((LZ4_unalign*)memPtr)->u16 = value; }
+static void LZ4_write32(void* memPtr, U32 value) { ((LZ4_unalign*)memPtr)->u32 = value; }
+
+#else  /* safe and portable access using memcpy() */
+
+static U16 LZ4_read16(const void* memPtr)
+{
+    U16 val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+static U32 LZ4_read32(const void* memPtr)
+{
+    U32 val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+static reg_t LZ4_read_ARCH(const void* memPtr)
+{
+    reg_t val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val;
+}
+
+static void LZ4_write16(void* memPtr, U16 value)
+{
+    LZ4_memcpy(memPtr, &value, sizeof(value));
+}
+
+static void LZ4_write32(void* memPtr, U32 value)
+{
+    LZ4_memcpy(memPtr, &value, sizeof(value));
+}
+
+#endif /* LZ4_FORCE_MEMORY_ACCESS */
+
+
+static U16 LZ4_readLE16(const void* memPtr)
+{
+    if (LZ4_isLittleEndian()) {
+        return LZ4_read16(memPtr);
+    } else {
+        const BYTE* p = (const BYTE*)memPtr;
+        return (U16)((U16)p[0] + (p[1]<<8));
+    }
+}
+
+static void LZ4_writeLE16(void* memPtr, U16 value)
+{
+    if (LZ4_isLittleEndian()) {
+        LZ4_write16(memPtr, value);
+    } else {
+        BYTE* p = (BYTE*)memPtr;
+        p[0] = (BYTE) value;
+        p[1] = (BYTE)(value>>8);
+    }
+}
+
+/* customized variant of memcpy, which can overwrite up to 8 bytes beyond dstEnd */
+LZ4_FORCE_INLINE
+void LZ4_wildCopy8(void* dstPtr, const void* srcPtr, void* dstEnd)
+{
+    BYTE* d = (BYTE*)dstPtr;
+    const BYTE* s = (const BYTE*)srcPtr;
+    BYTE* const e = (BYTE*)dstEnd;
+
+    do { LZ4_memcpy(d,s,8); d+=8; s+=8; } while (d<e);
+}
+
+static const unsigned inc32table[8] = {0, 1, 2,  1,  0,  4, 4, 4};
+static const int      dec64table[8] = {0, 0, 0, -1, -4,  1, 2, 3};
+
+
+#ifndef LZ4_FAST_DEC_LOOP
+#  if defined __i386__ || defined _M_IX86 || defined __x86_64__ || defined _M_X64
+#    define LZ4_FAST_DEC_LOOP 1
+#  elif defined(__aarch64__) && defined(__APPLE__)
+#    define LZ4_FAST_DEC_LOOP 1
+#  elif defined(__aarch64__) && !defined(__clang__)
+     /* On non-Apple aarch64, we disable this optimization for clang because
+      * on certain mobile chipsets, performance is reduced with clang. For
+      * more information refer to https://github.com/lz4/lz4/pull/707 */
+#    define LZ4_FAST_DEC_LOOP 1
+#  else
+#    define LZ4_FAST_DEC_LOOP 0
+#  endif
+#endif
+
+#if LZ4_FAST_DEC_LOOP
+
+LZ4_FORCE_INLINE void
+LZ4_memcpy_using_offset_base(BYTE* dstPtr, const BYTE* srcPtr, BYTE* dstEnd, const size_t offset)
+{
+    assert(srcPtr + offset == dstPtr);
+    if (offset < 8) {
+        LZ4_write32(dstPtr, 0);   /* silence an msan warning when offset==0 */
+        dstPtr[0] = srcPtr[0];
+        dstPtr[1] = srcPtr[1];
+        dstPtr[2] = srcPtr[2];
+        dstPtr[3] = srcPtr[3];
+        srcPtr += inc32table[offset];
+        LZ4_memcpy(dstPtr+4, srcPtr, 4);
+        srcPtr -= dec64table[offset];
+        dstPtr += 8;
+    } else {
+        LZ4_memcpy(dstPtr, srcPtr, 8);
+        dstPtr += 8;
+        srcPtr += 8;
+    }
+
+    LZ4_wildCopy8(dstPtr, srcPtr, dstEnd);
+}
+
+/* customized variant of memcpy, which can overwrite up to 32 bytes beyond dstEnd
+ * this version copies two times 16 bytes (instead of one time 32 bytes)
+ * because it must be compatible with offsets >= 16. */
+LZ4_FORCE_INLINE void
+LZ4_wildCopy32(void* dstPtr, const void* srcPtr, void* dstEnd)
+{
+    BYTE* d = (BYTE*)dstPtr;
+    const BYTE* s = (const BYTE*)srcPtr;
+    BYTE* const e = (BYTE*)dstEnd;
+
+    do { LZ4_memcpy(d,s,16); LZ4_memcpy(d+16,s+16,16); d+=32; s+=32; } while (d<e);
+}
+
+/* LZ4_memcpy_using_offset()  presumes :
+ * - dstEnd >= dstPtr + MINMATCH
+ * - there is at least 8 bytes available to write after dstEnd */
+LZ4_FORCE_INLINE void
+LZ4_memcpy_using_offset(BYTE* dstPtr, const BYTE* srcPtr, BYTE* dstEnd, const size_t offset)
+{
+    BYTE v[8];
+
+    assert(dstEnd >= dstPtr + MINMATCH);
+
+    switch(offset) {
+    case 1:
+        MEM_INIT(v, *srcPtr, 8);
+        break;
+    case 2:
+        LZ4_memcpy(v, srcPtr, 2);
+        LZ4_memcpy(&v[2], srcPtr, 2);
+#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier */
+#  pragma warning(push)
+#  pragma warning(disable : 6385) /* warning C6385: Reading invalid data from 'v'. */
+#endif
+        LZ4_memcpy(&v[4], v, 4);
+#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier */
+#  pragma warning(pop)
+#endif
+        break;
+    case 4:
+        LZ4_memcpy(v, srcPtr, 4);
+        LZ4_memcpy(&v[4], srcPtr, 4);
+        break;
+    default:
+        LZ4_memcpy_using_offset_base(dstPtr, srcPtr, dstEnd, offset);
+        return;
+    }
+
+    LZ4_memcpy(dstPtr, v, 8);
+    dstPtr += 8;
+    while (dstPtr < dstEnd) {
+        LZ4_memcpy(dstPtr, v, 8);
+        dstPtr += 8;
+    }
+}
+#endif
+
+
+/*-************************************
+*  Common functions
+**************************************/
+static unsigned LZ4_NbCommonBytes (reg_t val)
+{
+    assert(val != 0);
+    if (LZ4_isLittleEndian()) {
+        if (sizeof(val) == 8) {
+#       if defined(_MSC_VER) && (_MSC_VER >= 1800) && (defined(_M_AMD64) && !defined(_M_ARM64EC)) && !defined(LZ4_FORCE_SW_BITCOUNT)
+/*-*************************************************************************************************
+* ARM64EC is a Microsoft-designed ARM64 ABI compatible with AMD64 applications on ARM64 Windows 11.
+* The ARM64EC ABI does not support AVX/AVX2/AVX512 instructions, nor their relevant intrinsics
+* including _tzcnt_u64. Therefore, we need to neuter the _tzcnt_u64 code path for ARM64EC.
+****************************************************************************************************/
+#         if defined(__clang__) && (__clang_major__ < 10)
+            /* Avoid undefined clang-cl intrinsics issue.
+             * See https://github.com/lz4/lz4/pull/1017 for details. */
+            return (unsigned)__builtin_ia32_tzcnt_u64(val) >> 3;
+#         else
+            /* x64 CPUS without BMI support interpret `TZCNT` as `REP BSF` */
+            return (unsigned)_tzcnt_u64(val) >> 3;
+#         endif
+#       elif defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r = 0;
+            _BitScanForward64(&r, (U64)val);
+            return (unsigned)r >> 3;
+#       elif (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \
+                            ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \
+                                        !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (unsigned)__builtin_ctzll((U64)val) >> 3;
+#       else
+            const U64 m = 0x0101010101010101ULL;
+            val ^= val - 1;
+            return (unsigned)(((U64)((val & (m - 1)) * m)) >> 56);
+#       endif
+        } else /* 32 bits */ {
+#       if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r;
+            _BitScanForward(&r, (U32)val);
+            return (unsigned)r >> 3;
+#       elif (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \
+                            ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \
+                        !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (unsigned)__builtin_ctz((U32)val) >> 3;
+#       else
+            const U32 m = 0x01010101;
+            return (unsigned)((((val - 1) ^ val) & (m - 1)) * m) >> 24;
+#       endif
+        }
+    } else   /* Big Endian CPU */ {
+        if (sizeof(val)==8) {
+#       if (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \
+                            ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \
+                        !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (unsigned)__builtin_clzll((U64)val) >> 3;
+#       else
+#if 1
+            /* this method is probably faster,
+             * but adds a 128 bytes lookup table */
+            static const unsigned char ctz7_tab[128] = {
+                7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+                4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+            };
+            U64 const mask = 0x0101010101010101ULL;
+            U64 const t = (((val >> 8) - mask) | val) & mask;
+            return ctz7_tab[(t * 0x0080402010080402ULL) >> 57];
+#else
+            /* this method doesn't consume memory space like the previous one,
+             * but it contains several branches,
+             * that may end up slowing execution */
+            static const U32 by32 = sizeof(val)*4;  /* 32 on 64 bits (goal), 16 on 32 bits.
+            Just to avoid some static analyzer complaining about shift by 32 on 32-bits target.
+            Note that this code path is never triggered in 32-bits mode. */
+            unsigned r;
+            if (!(val>>by32)) { r=4; } else { r=0; val>>=by32; }
+            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
+            r += (!val);
+            return r;
+#endif
+#       endif
+        } else /* 32 bits */ {
+#       if (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \
+                            ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \
+                                        !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (unsigned)__builtin_clz((U32)val) >> 3;
+#       else
+            val >>= 8;
+            val = ((((val + 0x00FFFF00) | 0x00FFFFFF) + val) |
+              (val + 0x00FF0000)) >> 24;
+            return (unsigned)val ^ 3;
+#       endif
+        }
+    }
+}
+
+
+#define STEPSIZE sizeof(reg_t)
+LZ4_FORCE_INLINE
+unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit)
+{
+    const BYTE* const pStart = pIn;
+
+    if (likely(pIn < pInLimit-(STEPSIZE-1))) {
+        reg_t const diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn);
+        if (!diff) {
+            pIn+=STEPSIZE; pMatch+=STEPSIZE;
+        } else {
+            return LZ4_NbCommonBytes(diff);
+    }   }
+
+    while (likely(pIn < pInLimit-(STEPSIZE-1))) {
+        reg_t const diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn);
+        if (!diff) { pIn+=STEPSIZE; pMatch+=STEPSIZE; continue; }
+        pIn += LZ4_NbCommonBytes(diff);
+        return (unsigned)(pIn - pStart);
+    }
+
+    if ((STEPSIZE==8) && (pIn<(pInLimit-3)) && (LZ4_read32(pMatch) == LZ4_read32(pIn))) { pIn+=4; pMatch+=4; }
+    if ((pIn<(pInLimit-1)) && (LZ4_read16(pMatch) == LZ4_read16(pIn))) { pIn+=2; pMatch+=2; }
+    if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
+    return (unsigned)(pIn - pStart);
+}
+
+
+#ifndef LZ4_COMMONDEFS_ONLY
+/*-************************************
+*  Local Constants
+**************************************/
+static const int LZ4_64Klimit = ((64 KB) + (MFLIMIT-1));
+static const U32 LZ4_skipTrigger = 6;  /* Increase this value ==> compression run slower on incompressible data */
+
+
+/*-************************************
+*  Local Structures and types
+**************************************/
+typedef enum { clearedTable = 0, byPtr, byU32, byU16 } tableType_t;
+
+/**
+ * This enum distinguishes several different modes of accessing previous
+ * content in the stream.
+ *
+ * - noDict        : There is no preceding content.
+ * - withPrefix64k : Table entries up to ctx->dictSize before the current blob
+ *                   blob being compressed are valid and refer to the preceding
+ *                   content (of length ctx->dictSize), which is available
+ *                   contiguously preceding in memory the content currently
+ *                   being compressed.
+ * - usingExtDict  : Like withPrefix64k, but the preceding content is somewhere
+ *                   else in memory, starting at ctx->dictionary with length
+ *                   ctx->dictSize.
+ * - usingDictCtx  : Everything concerning the preceding content is
+ *                   in a separate context, pointed to by ctx->dictCtx.
+ *                   ctx->dictionary, ctx->dictSize, and table entries
+ *                   in the current context that refer to positions
+ *                   preceding the beginning of the current compression are
+ *                   ignored. Instead, ctx->dictCtx->dictionary and ctx->dictCtx
+ *                   ->dictSize describe the location and size of the preceding
+ *                   content, and matches are found by looking in the ctx
+ *                   ->dictCtx->hashTable.
+ */
+typedef enum { noDict = 0, withPrefix64k, usingExtDict, usingDictCtx } dict_directive;
+typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive;
+
+
+/*-************************************
+*  Local Utils
+**************************************/
+int LZ4_versionNumber (void) { return LZ4_VERSION_NUMBER; }
+const char* LZ4_versionString(void) { return LZ4_VERSION_STRING; }
+int LZ4_compressBound(int isize)  { return LZ4_COMPRESSBOUND(isize); }
+int LZ4_sizeofState(void) { return sizeof(LZ4_stream_t); }
+
+
+/*-****************************************
+*  Internal Definitions, used only in Tests
+*******************************************/
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int srcSize);
+
+int LZ4_decompress_safe_forceExtDict(const char* source, char* dest,
+                                     int compressedSize, int maxOutputSize,
+                                     const void* dictStart, size_t dictSize);
+int LZ4_decompress_safe_partial_forceExtDict(const char* source, char* dest,
+                                     int compressedSize, int targetOutputSize, int dstCapacity,
+                                     const void* dictStart, size_t dictSize);
+#if defined (__cplusplus)
+}
+#endif
+
+/*-******************************
+*  Compression functions
+********************************/
+LZ4_FORCE_INLINE U32 LZ4_hash4(U32 sequence, tableType_t const tableType)
+{
+    if (tableType == byU16)
+        return ((sequence * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1)));
+    else
+        return ((sequence * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG));
+}
+
+LZ4_FORCE_INLINE U32 LZ4_hash5(U64 sequence, tableType_t const tableType)
+{
+    const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG+1 : LZ4_HASHLOG;
+    if (LZ4_isLittleEndian()) {
+        const U64 prime5bytes = 889523592379ULL;
+        return (U32)(((sequence << 24) * prime5bytes) >> (64 - hashLog));
+    } else {
+        const U64 prime8bytes = 11400714785074694791ULL;
+        return (U32)(((sequence >> 24) * prime8bytes) >> (64 - hashLog));
+    }
+}
+
+LZ4_FORCE_INLINE U32 LZ4_hashPosition(const void* const p, tableType_t const tableType)
+{
+    if ((sizeof(reg_t)==8) && (tableType != byU16)) return LZ4_hash5(LZ4_read_ARCH(p), tableType);
+    return LZ4_hash4(LZ4_read32(p), tableType);
+}
+
+LZ4_FORCE_INLINE void LZ4_clearHash(U32 h, void* tableBase, tableType_t const tableType)
+{
+    switch (tableType)
+    {
+    default: /* fallthrough */
+    case clearedTable: { /* illegal! */ assert(0); return; }
+    case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = NULL; return; }
+    case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = 0; return; }
+    case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = 0; return; }
+    }
+}
+
+LZ4_FORCE_INLINE void LZ4_putIndexOnHash(U32 idx, U32 h, void* tableBase, tableType_t const tableType)
+{
+    switch (tableType)
+    {
+    default: /* fallthrough */
+    case clearedTable: /* fallthrough */
+    case byPtr: { /* illegal! */ assert(0); return; }
+    case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = idx; return; }
+    case byU16: { U16* hashTable = (U16*) tableBase; assert(idx < 65536); hashTable[h] = (U16)idx; return; }
+    }
+}
+
+LZ4_FORCE_INLINE void LZ4_putPositionOnHash(const BYTE* p, U32 h,
+                                  void* tableBase, tableType_t const tableType,
+                            const BYTE* srcBase)
+{
+    switch (tableType)
+    {
+    case clearedTable: { /* illegal! */ assert(0); return; }
+    case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = p; return; }
+    case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); return; }
+    case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); return; }
+    }
+}
+
+LZ4_FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
+{
+    U32 const h = LZ4_hashPosition(p, tableType);
+    LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase);
+}
+
+/* LZ4_getIndexOnHash() :
+ * Index of match position registered in hash table.
+ * hash position must be calculated by using base+index, or dictBase+index.
+ * Assumption 1 : only valid if tableType == byU32 or byU16.
+ * Assumption 2 : h is presumed valid (within limits of hash table)
+ */
+LZ4_FORCE_INLINE U32 LZ4_getIndexOnHash(U32 h, const void* tableBase, tableType_t tableType)
+{
+    LZ4_STATIC_ASSERT(LZ4_MEMORY_USAGE > 2);
+    if (tableType == byU32) {
+        const U32* const hashTable = (const U32*) tableBase;
+        assert(h < (1U << (LZ4_MEMORY_USAGE-2)));
+        return hashTable[h];
+    }
+    if (tableType == byU16) {
+        const U16* const hashTable = (const U16*) tableBase;
+        assert(h < (1U << (LZ4_MEMORY_USAGE-1)));
+        return hashTable[h];
+    }
+    assert(0); return 0;  /* forbidden case */
+}
+
+static const BYTE* LZ4_getPositionOnHash(U32 h, const void* tableBase, tableType_t tableType, const BYTE* srcBase)
+{
+    if (tableType == byPtr) { const BYTE* const* hashTable = (const BYTE* const*) tableBase; return hashTable[h]; }
+    if (tableType == byU32) { const U32* const hashTable = (const U32*) tableBase; return hashTable[h] + srcBase; }
+    { const U16* const hashTable = (const U16*) tableBase; return hashTable[h] + srcBase; }   /* default, to ensure a return */
+}
+
+LZ4_FORCE_INLINE const BYTE*
+LZ4_getPosition(const BYTE* p,
+                const void* tableBase, tableType_t tableType,
+                const BYTE* srcBase)
+{
+    U32 const h = LZ4_hashPosition(p, tableType);
+    return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase);
+}
+
+LZ4_FORCE_INLINE void
+LZ4_prepareTable(LZ4_stream_t_internal* const cctx,
+           const int inputSize,
+           const tableType_t tableType) {
+    /* If the table hasn't been used, it's guaranteed to be zeroed out, and is
+     * therefore safe to use no matter what mode we're in. Otherwise, we figure
+     * out if it's safe to leave as is or whether it needs to be reset.
+     */
+    if ((tableType_t)cctx->tableType != clearedTable) {
+        assert(inputSize >= 0);
+        if ((tableType_t)cctx->tableType != tableType
+          || ((tableType == byU16) && cctx->currentOffset + (unsigned)inputSize >= 0xFFFFU)
+          || ((tableType == byU32) && cctx->currentOffset > 1 GB)
+          || tableType == byPtr
+          || inputSize >= 4 KB)
+        {
+            DEBUGLOG(4, "LZ4_prepareTable: Resetting table in %p", cctx);
+            MEM_INIT(cctx->hashTable, 0, LZ4_HASHTABLESIZE);
+            cctx->currentOffset = 0;
+            cctx->tableType = (U32)clearedTable;
+        } else {
+            DEBUGLOG(4, "LZ4_prepareTable: Re-use hash table (no reset)");
+        }
+    }
+
+    /* Adding a gap, so all previous entries are > LZ4_DISTANCE_MAX back,
+     * is faster than compressing without a gap.
+     * However, compressing with currentOffset == 0 is faster still,
+     * so we preserve that case.
+     */
+    if (cctx->currentOffset != 0 && tableType == byU32) {
+        DEBUGLOG(5, "LZ4_prepareTable: adding 64KB to currentOffset");
+        cctx->currentOffset += 64 KB;
+    }
+
+    /* Finally, clear history */
+    cctx->dictCtx = NULL;
+    cctx->dictionary = NULL;
+    cctx->dictSize = 0;
+}
+
+/** LZ4_compress_generic() :
+ *  inlined, to ensure branches are decided at compilation time.
+ *  Presumed already validated at this stage:
+ *  - source != NULL
+ *  - inputSize > 0
+ */
+LZ4_FORCE_INLINE int LZ4_compress_generic_validated(
+                 LZ4_stream_t_internal* const cctx,
+                 const char* const source,
+                 char* const dest,
+                 const int inputSize,
+                 int*  inputConsumed, /* only written when outputDirective == fillOutput */
+                 const int maxOutputSize,
+                 const limitedOutput_directive outputDirective,
+                 const tableType_t tableType,
+                 const dict_directive dictDirective,
+                 const dictIssue_directive dictIssue,
+                 const int acceleration)
+{
+    int result;
+    const BYTE* ip = (const BYTE*) source;
+
+    U32 const startIndex = cctx->currentOffset;
+    const BYTE* base = (const BYTE*) source - startIndex;
+    const BYTE* lowLimit;
+
+    const LZ4_stream_t_internal* dictCtx = (const LZ4_stream_t_internal*) cctx->dictCtx;
+    const BYTE* const dictionary =
+        dictDirective == usingDictCtx ? dictCtx->dictionary : cctx->dictionary;
+    const U32 dictSize =
+        dictDirective == usingDictCtx ? dictCtx->dictSize : cctx->dictSize;
+    const U32 dictDelta = (dictDirective == usingDictCtx) ? startIndex - dictCtx->currentOffset : 0;   /* make indexes in dictCtx comparable with index in current context */
+
+    int const maybe_extMem = (dictDirective == usingExtDict) || (dictDirective == usingDictCtx);
+    U32 const prefixIdxLimit = startIndex - dictSize;   /* used when dictDirective == dictSmall */
+    const BYTE* const dictEnd = dictionary ? dictionary + dictSize : dictionary;
+    const BYTE* anchor = (const BYTE*) source;
+    const BYTE* const iend = ip + inputSize;
+    const BYTE* const mflimitPlusOne = iend - MFLIMIT + 1;
+    const BYTE* const matchlimit = iend - LASTLITERALS;
+
+    /* the dictCtx currentOffset is indexed on the start of the dictionary,
+     * while a dictionary in the current context precedes the currentOffset */
+    const BYTE* dictBase = (dictionary == NULL) ? NULL :
+                           (dictDirective == usingDictCtx) ?
+                            dictionary + dictSize - dictCtx->currentOffset :
+                            dictionary + dictSize - startIndex;
+
+    BYTE* op = (BYTE*) dest;
+    BYTE* const olimit = op + maxOutputSize;
+
+    U32 offset = 0;
+    U32 forwardH;
+
+    DEBUGLOG(5, "LZ4_compress_generic_validated: srcSize=%i, tableType=%u", inputSize, tableType);
+    assert(ip != NULL);
+    /* If init conditions are not met, we don't have to mark stream
+     * as having dirty context, since no action was taken yet */
+    if (outputDirective == fillOutput && maxOutputSize < 1) { return 0; } /* Impossible to store anything */
+    if ((tableType == byU16) && (inputSize>=LZ4_64Klimit)) { return 0; }  /* Size too large (not within 64K limit) */
+    if (tableType==byPtr) assert(dictDirective==noDict);      /* only supported use case with byPtr */
+    assert(acceleration >= 1);
+
+    lowLimit = (const BYTE*)source - (dictDirective == withPrefix64k ? dictSize : 0);
+
+    /* Update context state */
+    if (dictDirective == usingDictCtx) {
+        /* Subsequent linked blocks can't use the dictionary. */
+        /* Instead, they use the block we just compressed. */
+        cctx->dictCtx = NULL;
+        cctx->dictSize = (U32)inputSize;
+    } else {
+        cctx->dictSize += (U32)inputSize;
+    }
+    cctx->currentOffset += (U32)inputSize;
+    cctx->tableType = (U32)tableType;
+
+    if (inputSize<LZ4_minLength) goto _last_literals;        /* Input too small, no compression (all literals) */
+
+    /* First Byte */
+    LZ4_putPosition(ip, cctx->hashTable, tableType, base);
+    ip++; forwardH = LZ4_hashPosition(ip, tableType);
+
+    /* Main Loop */
+    for ( ; ; ) {
+        const BYTE* match;
+        BYTE* token;
+        const BYTE* filledIp;
+
+        /* Find a match */
+        if (tableType == byPtr) {
+            const BYTE* forwardIp = ip;
+            int step = 1;
+            int searchMatchNb = acceleration << LZ4_skipTrigger;
+            do {
+                U32 const h = forwardH;
+                ip = forwardIp;
+                forwardIp += step;
+                step = (searchMatchNb++ >> LZ4_skipTrigger);
+
+                if (unlikely(forwardIp > mflimitPlusOne)) goto _last_literals;
+                assert(ip < mflimitPlusOne);
+
+                match = LZ4_getPositionOnHash(h, cctx->hashTable, tableType, base);
+                forwardH = LZ4_hashPosition(forwardIp, tableType);
+                LZ4_putPositionOnHash(ip, h, cctx->hashTable, tableType, base);
+
+            } while ( (match+LZ4_DISTANCE_MAX < ip)
+                   || (LZ4_read32(match) != LZ4_read32(ip)) );
+
+        } else {   /* byU32, byU16 */
+
+            const BYTE* forwardIp = ip;
+            int step = 1;
+            int searchMatchNb = acceleration << LZ4_skipTrigger;
+            do {
+                U32 const h = forwardH;
+                U32 const current = (U32)(forwardIp - base);
+                U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType);
+                assert(matchIndex <= current);
+                assert(forwardIp - base < (ptrdiff_t)(2 GB - 1));
+                ip = forwardIp;
+                forwardIp += step;
+                step = (searchMatchNb++ >> LZ4_skipTrigger);
+
+                if (unlikely(forwardIp > mflimitPlusOne)) goto _last_literals;
+                assert(ip < mflimitPlusOne);
+
+                if (dictDirective == usingDictCtx) {
+                    if (matchIndex < startIndex) {
+                        /* there was no match, try the dictionary */
+                        assert(tableType == byU32);
+                        matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32);
+                        match = dictBase + matchIndex;
+                        matchIndex += dictDelta;   /* make dictCtx index comparable with current context */
+                        lowLimit = dictionary;
+                    } else {
+                        match = base + matchIndex;
+                        lowLimit = (const BYTE*)source;
+                    }
+                } else if (dictDirective == usingExtDict) {
+                    if (matchIndex < startIndex) {
+                        DEBUGLOG(7, "extDict candidate: matchIndex=%5u  <  startIndex=%5u", matchIndex, startIndex);
+                        assert(startIndex - matchIndex >= MINMATCH);
+                        assert(dictBase);
+                        match = dictBase + matchIndex;
+                        lowLimit = dictionary;
+                    } else {
+                        match = base + matchIndex;
+                        lowLimit = (const BYTE*)source;
+                    }
+                } else {   /* single continuous memory segment */
+                    match = base + matchIndex;
+                }
+                forwardH = LZ4_hashPosition(forwardIp, tableType);
+                LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType);
+
+                DEBUGLOG(7, "candidate at pos=%u  (offset=%u \n", matchIndex, current - matchIndex);
+                if ((dictIssue == dictSmall) && (matchIndex < prefixIdxLimit)) { continue; }    /* match outside of valid area */
+                assert(matchIndex < current);
+                if ( ((tableType != byU16) || (LZ4_DISTANCE_MAX < LZ4_DISTANCE_ABSOLUTE_MAX))
+                  && (matchIndex+LZ4_DISTANCE_MAX < current)) {
+                    continue;
+                } /* too far */
+                assert((current - matchIndex) <= LZ4_DISTANCE_MAX);  /* match now expected within distance */
+
+                if (LZ4_read32(match) == LZ4_read32(ip)) {
+                    if (maybe_extMem) offset = current - matchIndex;
+                    break;   /* match found */
+                }
+
+            } while(1);
+        }
+
+        /* Catch up */
+        filledIp = ip;
+        while (((ip>anchor) & (match > lowLimit)) && (unlikely(ip[-1]==match[-1]))) { ip--; match--; }
+
+        /* Encode Literals */
+        {   unsigned const litLength = (unsigned)(ip - anchor);
+            token = op++;
+            if ((outputDirective == limitedOutput) &&  /* Check output buffer overflow */
+                (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit)) ) {
+                return 0;   /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */
+            }
+            if ((outputDirective == fillOutput) &&
+                (unlikely(op + (litLength+240)/255 /* litlen */ + litLength /* literals */ + 2 /* offset */ + 1 /* token */ + MFLIMIT - MINMATCH /* min last literals so last match is <= end - MFLIMIT */ > olimit))) {
+                op--;
+                goto _last_literals;
+            }
+            if (litLength >= RUN_MASK) {
+                int len = (int)(litLength - RUN_MASK);
+                *token = (RUN_MASK<<ML_BITS);
+                for(; len >= 255 ; len-=255) *op++ = 255;
+                *op++ = (BYTE)len;
+            }
+            else *token = (BYTE)(litLength<<ML_BITS);
+
+            /* Copy Literals */
+            LZ4_wildCopy8(op, anchor, op+litLength);
+            op+=litLength;
+            DEBUGLOG(6, "seq.start:%i, literals=%u, match.start:%i",
+                        (int)(anchor-(const BYTE*)source), litLength, (int)(ip-(const BYTE*)source));
+        }
+
+_next_match:
+        /* at this stage, the following variables must be correctly set :
+         * - ip : at start of LZ operation
+         * - match : at start of previous pattern occurrence; can be within current prefix, or within extDict
+         * - offset : if maybe_ext_memSegment==1 (constant)
+         * - lowLimit : must be == dictionary to mean "match is within extDict"; must be == source otherwise
+         * - token and *token : position to write 4-bits for match length; higher 4-bits for literal length supposed already written
+         */
+
+        if ((outputDirective == fillOutput) &&
+            (op + 2 /* offset */ + 1 /* token */ + MFLIMIT - MINMATCH /* min last literals so last match is <= end - MFLIMIT */ > olimit)) {
+            /* the match was too close to the end, rewind and go to last literals */
+            op = token;
+            goto _last_literals;
+        }
+
+        /* Encode Offset */
+        if (maybe_extMem) {   /* static test */
+            DEBUGLOG(6, "             with offset=%u  (ext if > %i)", offset, (int)(ip - (const BYTE*)source));
+            assert(offset <= LZ4_DISTANCE_MAX && offset > 0);
+            LZ4_writeLE16(op, (U16)offset); op+=2;
+        } else  {
+            DEBUGLOG(6, "             with offset=%u  (same segment)", (U32)(ip - match));
+            assert(ip-match <= LZ4_DISTANCE_MAX);
+            LZ4_writeLE16(op, (U16)(ip - match)); op+=2;
+        }
+
+        /* Encode MatchLength */
+        {   unsigned matchCode;
+
+            if ( (dictDirective==usingExtDict || dictDirective==usingDictCtx)
+              && (lowLimit==dictionary) /* match within extDict */ ) {
+                const BYTE* limit = ip + (dictEnd-match);
+                assert(dictEnd > match);
+                if (limit > matchlimit) limit = matchlimit;
+                matchCode = LZ4_count(ip+MINMATCH, match+MINMATCH, limit);
+                ip += (size_t)matchCode + MINMATCH;
+                if (ip==limit) {
+                    unsigned const more = LZ4_count(limit, (const BYTE*)source, matchlimit);
+                    matchCode += more;
+                    ip += more;
+                }
+                DEBUGLOG(6, "             with matchLength=%u starting in extDict", matchCode+MINMATCH);
+            } else {
+                matchCode = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit);
+                ip += (size_t)matchCode + MINMATCH;
+                DEBUGLOG(6, "             with matchLength=%u", matchCode+MINMATCH);
+            }
+
+            if ((outputDirective) &&    /* Check output buffer overflow */
+                (unlikely(op + (1 + LASTLITERALS) + (matchCode+240)/255 > olimit)) ) {
+                if (outputDirective == fillOutput) {
+                    /* Match description too long : reduce it */
+                    U32 newMatchCode = 15 /* in token */ - 1 /* to avoid needing a zero byte */ + ((U32)(olimit - op) - 1 - LASTLITERALS) * 255;
+                    ip -= matchCode - newMatchCode;
+                    assert(newMatchCode < matchCode);
+                    matchCode = newMatchCode;
+                    if (unlikely(ip <= filledIp)) {
+                        /* We have already filled up to filledIp so if ip ends up less than filledIp
+                         * we have positions in the hash table beyond the current position. This is
+                         * a problem if we reuse the hash table. So we have to remove these positions
+                         * from the hash table.
+                         */
+                        const BYTE* ptr;
+                        DEBUGLOG(5, "Clearing %u positions", (U32)(filledIp - ip));
+                        for (ptr = ip; ptr <= filledIp; ++ptr) {
+                            U32 const h = LZ4_hashPosition(ptr, tableType);
+                            LZ4_clearHash(h, cctx->hashTable, tableType);
+                        }
+                    }
+                } else {
+                    assert(outputDirective == limitedOutput);
+                    return 0;   /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */
+                }
+            }
+            if (matchCode >= ML_MASK) {
+                *token += ML_MASK;
+                matchCode -= ML_MASK;
+                LZ4_write32(op, 0xFFFFFFFF);
+                while (matchCode >= 4*255) {
+                    op+=4;
+                    LZ4_write32(op, 0xFFFFFFFF);
+                    matchCode -= 4*255;
+                }
+                op += matchCode / 255;
+                *op++ = (BYTE)(matchCode % 255);
+            } else
+                *token += (BYTE)(matchCode);
+        }
+        /* Ensure we have enough space for the last literals. */
+        assert(!(outputDirective == fillOutput && op + 1 + LASTLITERALS > olimit));
+
+        anchor = ip;
+
+        /* Test end of chunk */
+        if (ip >= mflimitPlusOne) break;
+
+        /* Fill table */
+        LZ4_putPosition(ip-2, cctx->hashTable, tableType, base);
+
+        /* Test next position */
+        if (tableType == byPtr) {
+
+            match = LZ4_getPosition(ip, cctx->hashTable, tableType, base);
+            LZ4_putPosition(ip, cctx->hashTable, tableType, base);
+            if ( (match+LZ4_DISTANCE_MAX >= ip)
+              && (LZ4_read32(match) == LZ4_read32(ip)) )
+            { token=op++; *token=0; goto _next_match; }
+
+        } else {   /* byU32, byU16 */
+
+            U32 const h = LZ4_hashPosition(ip, tableType);
+            U32 const current = (U32)(ip-base);
+            U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType);
+            assert(matchIndex < current);
+            if (dictDirective == usingDictCtx) {
+                if (matchIndex < startIndex) {
+                    /* there was no match, try the dictionary */
+                    matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32);
+                    match = dictBase + matchIndex;
+                    lowLimit = dictionary;   /* required for match length counter */
+                    matchIndex += dictDelta;
+                } else {
+                    match = base + matchIndex;
+                    lowLimit = (const BYTE*)source;  /* required for match length counter */
+                }
+            } else if (dictDirective==usingExtDict) {
+                if (matchIndex < startIndex) {
+                    assert(dictBase);
+                    match = dictBase + matchIndex;
+                    lowLimit = dictionary;   /* required for match length counter */
+                } else {
+                    match = base + matchIndex;
+                    lowLimit = (const BYTE*)source;   /* required for match length counter */
+                }
+            } else {   /* single memory segment */
+                match = base + matchIndex;
+            }
+            LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType);
+            assert(matchIndex < current);
+            if ( ((dictIssue==dictSmall) ? (matchIndex >= prefixIdxLimit) : 1)
+              && (((tableType==byU16) && (LZ4_DISTANCE_MAX == LZ4_DISTANCE_ABSOLUTE_MAX)) ? 1 : (matchIndex+LZ4_DISTANCE_MAX >= current))
+              && (LZ4_read32(match) == LZ4_read32(ip)) ) {
+                token=op++;
+                *token=0;
+                if (maybe_extMem) offset = current - matchIndex;
+                DEBUGLOG(6, "seq.start:%i, literals=%u, match.start:%i",
+                            (int)(anchor-(const BYTE*)source), 0, (int)(ip-(const BYTE*)source));
+                goto _next_match;
+            }
+        }
+
+        /* Prepare next loop */
+        forwardH = LZ4_hashPosition(++ip, tableType);
+
+    }
+
+_last_literals:
+    /* Encode Last Literals */
+    {   size_t lastRun = (size_t)(iend - anchor);
+        if ( (outputDirective) &&  /* Check output buffer overflow */
+            (op + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > olimit)) {
+            if (outputDirective == fillOutput) {
+                /* adapt lastRun to fill 'dst' */
+                assert(olimit >= op);
+                lastRun  = (size_t)(olimit-op) - 1/*token*/;
+                lastRun -= (lastRun + 256 - RUN_MASK) / 256;  /*additional length tokens*/
+            } else {
+                assert(outputDirective == limitedOutput);
+                return 0;   /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */
+            }
+        }
+        DEBUGLOG(6, "Final literal run : %i literals", (int)lastRun);
+        if (lastRun >= RUN_MASK) {
+            size_t accumulator = lastRun - RUN_MASK;
+            *op++ = RUN_MASK << ML_BITS;
+            for(; accumulator >= 255 ; accumulator-=255) *op++ = 255;
+            *op++ = (BYTE) accumulator;
+        } else {
+            *op++ = (BYTE)(lastRun<<ML_BITS);
+        }
+        LZ4_memcpy(op, anchor, lastRun);
+        ip = anchor + lastRun;
+        op += lastRun;
+    }
+
+    if (outputDirective == fillOutput) {
+        *inputConsumed = (int) (((const char*)ip)-source);
+    }
+    result = (int)(((char*)op) - dest);
+    assert(result > 0);
+    DEBUGLOG(5, "LZ4_compress_generic: compressed %i bytes into %i bytes", inputSize, result);
+    return result;
+}
+
+/** LZ4_compress_generic() :
+ *  inlined, to ensure branches are decided at compilation time;
+ *  takes care of src == (NULL, 0)
+ *  and forward the rest to LZ4_compress_generic_validated */
+LZ4_FORCE_INLINE int LZ4_compress_generic(
+                 LZ4_stream_t_internal* const cctx,
+                 const char* const src,
+                 char* const dst,
+                 const int srcSize,
+                 int *inputConsumed, /* only written when outputDirective == fillOutput */
+                 const int dstCapacity,
+                 const limitedOutput_directive outputDirective,
+                 const tableType_t tableType,
+                 const dict_directive dictDirective,
+                 const dictIssue_directive dictIssue,
+                 const int acceleration)
+{
+    DEBUGLOG(5, "LZ4_compress_generic: srcSize=%i, dstCapacity=%i",
+                srcSize, dstCapacity);
+
+    if ((U32)srcSize > (U32)LZ4_MAX_INPUT_SIZE) { return 0; }  /* Unsupported srcSize, too large (or negative) */
+    if (srcSize == 0) {   /* src == NULL supported if srcSize == 0 */
+        if (outputDirective != notLimited && dstCapacity <= 0) return 0;  /* no output, can't write anything */
+        DEBUGLOG(5, "Generating an empty block");
+        assert(outputDirective == notLimited || dstCapacity >= 1);
+        assert(dst != NULL);
+        dst[0] = 0;
+        if (outputDirective == fillOutput) {
+            assert (inputConsumed != NULL);
+            *inputConsumed = 0;
+        }
+        return 1;
+    }
+    assert(src != NULL);
+
+    return LZ4_compress_generic_validated(cctx, src, dst, srcSize,
+                inputConsumed, /* only written into if outputDirective == fillOutput */
+                dstCapacity, outputDirective,
+                tableType, dictDirective, dictIssue, acceleration);
+}
+
+
+int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+    LZ4_stream_t_internal* const ctx = & LZ4_initStream(state, sizeof(LZ4_stream_t)) -> internal_donotuse;
+    assert(ctx != NULL);
+    if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT;
+    if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX;
+    if (maxOutputSize >= LZ4_compressBound(inputSize)) {
+        if (inputSize < LZ4_64Klimit) {
+            return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, byU16, noDict, noDictIssue, acceleration);
+        } else {
+            const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32;
+            return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration);
+        }
+    } else {
+        if (inputSize < LZ4_64Klimit) {
+            return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, byU16, noDict, noDictIssue, acceleration);
+        } else {
+            const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32;
+            return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, noDict, noDictIssue, acceleration);
+        }
+    }
+}
+
+/**
+ * LZ4_compress_fast_extState_fastReset() :
+ * A variant of LZ4_compress_fast_extState().
+ *
+ * Using this variant avoids an expensive initialization step. It is only safe
+ * to call if the state buffer is known to be correctly initialized already
+ * (see comment in lz4.h on LZ4_resetStream_fast() for a definition of
+ * "correctly initialized").
+ */
+int LZ4_compress_fast_extState_fastReset(void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration)
+{
+    LZ4_stream_t_internal* ctx = &((LZ4_stream_t*)state)->internal_donotuse;
+    if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT;
+    if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX;
+
+    if (dstCapacity >= LZ4_compressBound(srcSize)) {
+        if (srcSize < LZ4_64Klimit) {
+            const tableType_t tableType = byU16;
+            LZ4_prepareTable(ctx, srcSize, tableType);
+            if (ctx->currentOffset) {
+                return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, dictSmall, acceleration);
+            } else {
+                return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration);
+            }
+        } else {
+            const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32;
+            LZ4_prepareTable(ctx, srcSize, tableType);
+            return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration);
+        }
+    } else {
+        if (srcSize < LZ4_64Klimit) {
+            const tableType_t tableType = byU16;
+            LZ4_prepareTable(ctx, srcSize, tableType);
+            if (ctx->currentOffset) {
+                return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, dictSmall, acceleration);
+            } else {
+                return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, noDictIssue, acceleration);
+            }
+        } else {
+            const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32;
+            LZ4_prepareTable(ctx, srcSize, tableType);
+            return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, noDictIssue, acceleration);
+        }
+    }
+}
+
+
+int LZ4_compress_fast(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+    int result;
+#if (LZ4_HEAPMODE)
+    LZ4_stream_t* ctxPtr = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
+    if (ctxPtr == NULL) return 0;
+#else
+    LZ4_stream_t ctx;
+    LZ4_stream_t* const ctxPtr = &ctx;
+#endif
+    result = LZ4_compress_fast_extState(ctxPtr, source, dest, inputSize, maxOutputSize, acceleration);
+
+#if (LZ4_HEAPMODE)
+    FREEMEM(ctxPtr);
+#endif
+    return result;
+}
+
+
+int LZ4_compress_default(const char* src, char* dst, int srcSize, int maxOutputSize)
+{
+    return LZ4_compress_fast(src, dst, srcSize, maxOutputSize, 1);
+}
+
+
+/* Note!: This function leaves the stream in an unclean/broken state!
+ * It is not safe to subsequently use the same state with a _fastReset() or
+ * _continue() call without resetting it. */
+static int LZ4_compress_destSize_extState (LZ4_stream_t* state, const char* src, char* dst, int* srcSizePtr, int targetDstSize)
+{
+    void* const s = LZ4_initStream(state, sizeof (*state));
+    assert(s != NULL); (void)s;
+
+    if (targetDstSize >= LZ4_compressBound(*srcSizePtr)) {  /* compression success is guaranteed */
+        return LZ4_compress_fast_extState(state, src, dst, *srcSizePtr, targetDstSize, 1);
+    } else {
+        if (*srcSizePtr < LZ4_64Klimit) {
+            return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, srcSizePtr, targetDstSize, fillOutput, byU16, noDict, noDictIssue, 1);
+        } else {
+            tableType_t const addrMode = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32;
+            return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, srcSizePtr, targetDstSize, fillOutput, addrMode, noDict, noDictIssue, 1);
+    }   }
+}
+
+
+int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targetDstSize)
+{
+#if (LZ4_HEAPMODE)
+    LZ4_stream_t* ctx = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
+    if (ctx == NULL) return 0;
+#else
+    LZ4_stream_t ctxBody;
+    LZ4_stream_t* ctx = &ctxBody;
+#endif
+
+    int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize);
+
+#if (LZ4_HEAPMODE)
+    FREEMEM(ctx);
+#endif
+    return result;
+}
+
+
+
+/*-******************************
+*  Streaming functions
+********************************/
+
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4_stream_t* LZ4_createStream(void)
+{
+    LZ4_stream_t* const lz4s = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t));
+    LZ4_STATIC_ASSERT(sizeof(LZ4_stream_t) >= sizeof(LZ4_stream_t_internal));
+    DEBUGLOG(4, "LZ4_createStream %p", lz4s);
+    if (lz4s == NULL) return NULL;
+    LZ4_initStream(lz4s, sizeof(*lz4s));
+    return lz4s;
+}
+#endif
+
+static size_t LZ4_stream_t_alignment(void)
+{
+#if LZ4_ALIGN_TEST
+    typedef struct { char c; LZ4_stream_t t; } t_a;
+    return sizeof(t_a) - sizeof(LZ4_stream_t);
+#else
+    return 1;  /* effectively disabled */
+#endif
+}
+
+LZ4_stream_t* LZ4_initStream (void* buffer, size_t size)
+{
+    DEBUGLOG(5, "LZ4_initStream");
+    if (buffer == NULL) { return NULL; }
+    if (size < sizeof(LZ4_stream_t)) { return NULL; }
+    if (!LZ4_isAligned(buffer, LZ4_stream_t_alignment())) return NULL;
+    MEM_INIT(buffer, 0, sizeof(LZ4_stream_t_internal));
+    return (LZ4_stream_t*)buffer;
+}
+
+/* resetStream is now deprecated,
+ * prefer initStream() which is more general */
+void LZ4_resetStream (LZ4_stream_t* LZ4_stream)
+{
+    DEBUGLOG(5, "LZ4_resetStream (ctx:%p)", LZ4_stream);
+    MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t_internal));
+}
+
+void LZ4_resetStream_fast(LZ4_stream_t* ctx) {
+    LZ4_prepareTable(&(ctx->internal_donotuse), 0, byU32);
+}
+
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+int LZ4_freeStream (LZ4_stream_t* LZ4_stream)
+{
+    if (!LZ4_stream) return 0;   /* support free on NULL */
+    DEBUGLOG(5, "LZ4_freeStream %p", LZ4_stream);
+    FREEMEM(LZ4_stream);
+    return (0);
+}
+#endif
+
+
+#define HASH_UNIT sizeof(reg_t)
+int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize)
+{
+    LZ4_stream_t_internal* dict = &LZ4_dict->internal_donotuse;
+    const tableType_t tableType = byU32;
+    const BYTE* p = (const BYTE*)dictionary;
+    const BYTE* const dictEnd = p + dictSize;
+    const BYTE* base;
+
+    DEBUGLOG(4, "LZ4_loadDict (%i bytes from %p into %p)", dictSize, dictionary, LZ4_dict);
+
+    /* It's necessary to reset the context,
+     * and not just continue it with prepareTable()
+     * to avoid any risk of generating overflowing matchIndex
+     * when compressing using this dictionary */
+    LZ4_resetStream(LZ4_dict);
+
+    /* We always increment the offset by 64 KB, since, if the dict is longer,
+     * we truncate it to the last 64k, and if it's shorter, we still want to
+     * advance by a whole window length so we can provide the guarantee that
+     * there are only valid offsets in the window, which allows an optimization
+     * in LZ4_compress_fast_continue() where it uses noDictIssue even when the
+     * dictionary isn't a full 64k. */
+    dict->currentOffset += 64 KB;
+
+    if (dictSize < (int)HASH_UNIT) {
+        return 0;
+    }
+
+    if ((dictEnd - p) > 64 KB) p = dictEnd - 64 KB;
+    base = dictEnd - dict->currentOffset;
+    dict->dictionary = p;
+    dict->dictSize = (U32)(dictEnd - p);
+    dict->tableType = (U32)tableType;
+
+    while (p <= dictEnd-HASH_UNIT) {
+        LZ4_putPosition(p, dict->hashTable, tableType, base);
+        p+=3;
+    }
+
+    return (int)dict->dictSize;
+}
+
+void LZ4_attach_dictionary(LZ4_stream_t* workingStream, const LZ4_stream_t* dictionaryStream)
+{
+    const LZ4_stream_t_internal* dictCtx = (dictionaryStream == NULL) ? NULL :
+        &(dictionaryStream->internal_donotuse);
+
+    DEBUGLOG(4, "LZ4_attach_dictionary (%p, %p, size %u)",
+             workingStream, dictionaryStream,
+             dictCtx != NULL ? dictCtx->dictSize : 0);
+
+    if (dictCtx != NULL) {
+        /* If the current offset is zero, we will never look in the
+         * external dictionary context, since there is no value a table
+         * entry can take that indicate a miss. In that case, we need
+         * to bump the offset to something non-zero.
+         */
+        if (workingStream->internal_donotuse.currentOffset == 0) {
+            workingStream->internal_donotuse.currentOffset = 64 KB;
+        }
+
+        /* Don't actually attach an empty dictionary.
+         */
+        if (dictCtx->dictSize == 0) {
+            dictCtx = NULL;
+        }
+    }
+    workingStream->internal_donotuse.dictCtx = dictCtx;
+}
+
+
+static void LZ4_renormDictT(LZ4_stream_t_internal* LZ4_dict, int nextSize)
+{
+    assert(nextSize >= 0);
+    if (LZ4_dict->currentOffset + (unsigned)nextSize > 0x80000000) {   /* potential ptrdiff_t overflow (32-bits mode) */
+        /* rescale hash table */
+        U32 const delta = LZ4_dict->currentOffset - 64 KB;
+        const BYTE* dictEnd = LZ4_dict->dictionary + LZ4_dict->dictSize;
+        int i;
+        DEBUGLOG(4, "LZ4_renormDictT");
+        for (i=0; i<LZ4_HASH_SIZE_U32; i++) {
+            if (LZ4_dict->hashTable[i] < delta) LZ4_dict->hashTable[i]=0;
+            else LZ4_dict->hashTable[i] -= delta;
+        }
+        LZ4_dict->currentOffset = 64 KB;
+        if (LZ4_dict->dictSize > 64 KB) LZ4_dict->dictSize = 64 KB;
+        LZ4_dict->dictionary = dictEnd - LZ4_dict->dictSize;
+    }
+}
+
+
+int LZ4_compress_fast_continue (LZ4_stream_t* LZ4_stream,
+                                const char* source, char* dest,
+                                int inputSize, int maxOutputSize,
+                                int acceleration)
+{
+    const tableType_t tableType = byU32;
+    LZ4_stream_t_internal* const streamPtr = &LZ4_stream->internal_donotuse;
+    const char* dictEnd = streamPtr->dictSize ? (const char*)streamPtr->dictionary + streamPtr->dictSize : NULL;
+
+    DEBUGLOG(5, "LZ4_compress_fast_continue (inputSize=%i, dictSize=%u)", inputSize, streamPtr->dictSize);
+
+    LZ4_renormDictT(streamPtr, inputSize);   /* fix index overflow */
+    if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT;
+    if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX;
+
+    /* invalidate tiny dictionaries */
+    if ( (streamPtr->dictSize < 4)     /* tiny dictionary : not enough for a hash */
+      && (dictEnd != source)           /* prefix mode */
+      && (inputSize > 0)               /* tolerance : don't lose history, in case next invocation would use prefix mode */
+      && (streamPtr->dictCtx == NULL)  /* usingDictCtx */
+      ) {
+        DEBUGLOG(5, "LZ4_compress_fast_continue: dictSize(%u) at addr:%p is too small", streamPtr->dictSize, streamPtr->dictionary);
+        /* remove dictionary existence from history, to employ faster prefix mode */
+        streamPtr->dictSize = 0;
+        streamPtr->dictionary = (const BYTE*)source;
+        dictEnd = source;
+    }
+
+    /* Check overlapping input/dictionary space */
+    {   const char* const sourceEnd = source + inputSize;
+        if ((sourceEnd > (const char*)streamPtr->dictionary) && (sourceEnd < dictEnd)) {
+            streamPtr->dictSize = (U32)(dictEnd - sourceEnd);
+            if (streamPtr->dictSize > 64 KB) streamPtr->dictSize = 64 KB;
+            if (streamPtr->dictSize < 4) streamPtr->dictSize = 0;
+            streamPtr->dictionary = (const BYTE*)dictEnd - streamPtr->dictSize;
+        }
+    }
+
+    /* prefix mode : source data follows dictionary */
+    if (dictEnd == source) {
+        if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset))
+            return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, withPrefix64k, dictSmall, acceleration);
+        else
+            return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, withPrefix64k, noDictIssue, acceleration);
+    }
+
+    /* external dictionary mode */
+    {   int result;
+        if (streamPtr->dictCtx) {
+            /* We depend here on the fact that dictCtx'es (produced by
+             * LZ4_loadDict) guarantee that their tables contain no references
+             * to offsets between dictCtx->currentOffset - 64 KB and
+             * dictCtx->currentOffset - dictCtx->dictSize. This makes it safe
+             * to use noDictIssue even when the dict isn't a full 64 KB.
+             */
+            if (inputSize > 4 KB) {
+                /* For compressing large blobs, it is faster to pay the setup
+                 * cost to copy the dictionary's tables into the active context,
+                 * so that the compression loop is only looking into one table.
+                 */
+                LZ4_memcpy(streamPtr, streamPtr->dictCtx, sizeof(*streamPtr));
+                result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, noDictIssue, acceleration);
+            } else {
+                result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingDictCtx, noDictIssue, acceleration);
+            }
+        } else {  /* small data <= 4 KB */
+            if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) {
+                result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, dictSmall, acceleration);
+            } else {
+                result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, noDictIssue, acceleration);
+            }
+        }
+        streamPtr->dictionary = (const BYTE*)source;
+        streamPtr->dictSize = (U32)inputSize;
+        return result;
+    }
+}
+
+
+/* Hidden debug function, to force-test external dictionary mode */
+int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int srcSize)
+{
+    LZ4_stream_t_internal* streamPtr = &LZ4_dict->internal_donotuse;
+    int result;
+
+    LZ4_renormDictT(streamPtr, srcSize);
+
+    if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) {
+        result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, usingExtDict, dictSmall, 1);
+    } else {
+        result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, usingExtDict, noDictIssue, 1);
+    }
+
+    streamPtr->dictionary = (const BYTE*)source;
+    streamPtr->dictSize = (U32)srcSize;
+
+    return result;
+}
+
+
+/*! LZ4_saveDict() :
+ *  If previously compressed data block is not guaranteed to remain available at its memory location,
+ *  save it into a safer place (char* safeBuffer).
+ *  Note : no need to call LZ4_loadDict() afterwards, dictionary is immediately usable,
+ *         one can therefore call LZ4_compress_fast_continue() right after.
+ * @return : saved dictionary size in bytes (necessarily <= dictSize), or 0 if error.
+ */
+int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int dictSize)
+{
+    LZ4_stream_t_internal* const dict = &LZ4_dict->internal_donotuse;
+
+    DEBUGLOG(5, "LZ4_saveDict : dictSize=%i, safeBuffer=%p", dictSize, safeBuffer);
+
+    if ((U32)dictSize > 64 KB) { dictSize = 64 KB; } /* useless to define a dictionary > 64 KB */
+    if ((U32)dictSize > dict->dictSize) { dictSize = (int)dict->dictSize; }
+
+    if (safeBuffer == NULL) assert(dictSize == 0);
+    if (dictSize > 0) {
+        const BYTE* const previousDictEnd = dict->dictionary + dict->dictSize;
+        assert(dict->dictionary);
+        LZ4_memmove(safeBuffer, previousDictEnd - dictSize, (size_t)dictSize);
+    }
+
+    dict->dictionary = (const BYTE*)safeBuffer;
+    dict->dictSize = (U32)dictSize;
+
+    return dictSize;
+}
+
+
+
+/*-*******************************
+ *  Decompression functions
+ ********************************/
+
+typedef enum { decode_full_block = 0, partial_decode = 1 } earlyEnd_directive;
+
+#undef MIN
+#define MIN(a,b)    ( (a) < (b) ? (a) : (b) )
+
+
+/* variant for decompress_unsafe()
+ * does not know end of input
+ * presumes input is well formed
+ * note : will consume at least one byte */
+size_t read_long_length_no_check(const BYTE** pp)
+{
+    size_t b, l = 0;
+    do { b = **pp; (*pp)++; l += b; } while (b==255);
+    DEBUGLOG(6, "read_long_length_no_check: +length=%zu using %zu input bytes", l, l/255 + 1)
+    return l;
+}
+
+/* core decoder variant for LZ4_decompress_fast*()
+ * for legacy support only : these entry points are deprecated.
+ * - Presumes input is correctly formed (no defense vs malformed inputs)
+ * - Does not know input size (presume input buffer is "large enough")
+ * - Decompress a full block (only)
+ * @return : nb of bytes read from input.
+ * Note : this variant is not optimized for speed, just for maintenance.
+ *        the goal is to remove support of decompress_fast*() variants by v2.0
+**/
+LZ4_FORCE_INLINE int
+LZ4_decompress_unsafe_generic(
+                 const BYTE* const istart,
+                 BYTE* const ostart,
+                 int decompressedSize,
+
+                 size_t prefixSize,
+                 const BYTE* const dictStart,  /* only if dict==usingExtDict */
+                 const size_t dictSize         /* note: =0 if dictStart==NULL */
+                 )
+{
+    const BYTE* ip = istart;
+    BYTE* op = (BYTE*)ostart;
+    BYTE* const oend = ostart + decompressedSize;
+    const BYTE* const prefixStart = ostart - prefixSize;
+
+    DEBUGLOG(5, "LZ4_decompress_unsafe_generic");
+    if (dictStart == NULL) assert(dictSize == 0);
+
+    while (1) {
+        /* start new sequence */
+        unsigned token = *ip++;
+
+        /* literals */
+        {   size_t ll = token >> ML_BITS;
+            if (ll==15) {
+                /* long literal length */
+                ll += read_long_length_no_check(&ip);
+            }
+            if ((size_t)(oend-op) < ll) return -1; /* output buffer overflow */
+            LZ4_memmove(op, ip, ll); /* support in-place decompression */
+            op += ll;
+            ip += ll;
+            if ((size_t)(oend-op) < MFLIMIT) {
+                if (op==oend) break;  /* end of block */
+                DEBUGLOG(5, "invalid: literals end at distance %zi from end of block", oend-op);
+                /* incorrect end of block :
+                 * last match must start at least MFLIMIT==12 bytes before end of output block */
+                return -1;
+        }   }
+
+        /* match */
+        {   size_t ml = token & 15;
+            size_t const offset = LZ4_readLE16(ip);
+            ip+=2;
+
+            if (ml==15) {
+                /* long literal length */
+                ml += read_long_length_no_check(&ip);
+            }
+            ml += MINMATCH;
+
+            if ((size_t)(oend-op) < ml) return -1; /* output buffer overflow */
+
+            {   const BYTE* match = op - offset;
+
+                /* out of range */
+                if (offset > (size_t)(op - prefixStart) + dictSize) {
+                    DEBUGLOG(6, "offset out of range");
+                    return -1;
+                }
+
+                /* check special case : extDict */
+                if (offset > (size_t)(op - prefixStart)) {
+                    /* extDict scenario */
+                    const BYTE* const dictEnd = dictStart + dictSize;
+                    const BYTE* extMatch = dictEnd - (offset - (size_t)(op-prefixStart));
+                    size_t const extml = (size_t)(dictEnd - extMatch);
+                    if (extml > ml) {
+                        /* match entirely within extDict */
+                        LZ4_memmove(op, extMatch, ml);
+                        op += ml;
+                        ml = 0;
+                    } else {
+                        /* match split between extDict & prefix */
+                        LZ4_memmove(op, extMatch, extml);
+                        op += extml;
+                        ml -= extml;
+                    }
+                    match = prefixStart;
+                }
+
+                /* match copy - slow variant, supporting overlap copy */
+                {   size_t u;
+                    for (u=0; u<ml; u++) {
+                        op[u] = match[u];
+            }   }   }
+            op += ml;
+            if ((size_t)(oend-op) < LASTLITERALS) {
+                DEBUGLOG(5, "invalid: match ends at distance %zi from end of block", oend-op);
+                /* incorrect end of block :
+                 * last match must stop at least LASTLITERALS==5 bytes before end of output block */
+                return -1;
+            }
+        } /* match */
+    } /* main loop */
+    return (int)(ip - istart);
+}
+
+
+/* Read the variable-length literal or match length.
+ *
+ * @ip : input pointer
+ * @ilimit : position after which if length is not decoded, the input is necessarily corrupted.
+ * @initial_check - check ip >= ipmax before start of loop.  Returns initial_error if so.
+ * @error (output) - error code.  Must be set to 0 before call.
+**/
+typedef size_t Rvl_t;
+static const Rvl_t rvl_error = (Rvl_t)(-1);
+LZ4_FORCE_INLINE Rvl_t
+read_variable_length(const BYTE** ip, const BYTE* ilimit,
+                     int initial_check)
+{
+    Rvl_t s, length = 0;
+    assert(ip != NULL);
+    assert(*ip !=  NULL);
+    assert(ilimit != NULL);
+    if (initial_check && unlikely((*ip) >= ilimit)) {    /* read limit reached */
+        return rvl_error;
+    }
+    do {
+        s = **ip;
+        (*ip)++;
+        length += s;
+        if (unlikely((*ip) > ilimit)) {    /* read limit reached */
+            return rvl_error;
+        }
+        /* accumulator overflow detection (32-bit mode only) */
+        if ((sizeof(length)<8) && unlikely(length > ((Rvl_t)(-1)/2)) ) {
+            return rvl_error;
+        }
+    } while (s==255);
+
+    return length;
+}
+
+/*! LZ4_decompress_generic() :
+ *  This generic decompression function covers all use cases.
+ *  It shall be instantiated several times, using different sets of directives.
+ *  Note that it is important for performance that this function really get inlined,
+ *  in order to remove useless branches during compilation optimization.
+ */
+LZ4_FORCE_INLINE int
+LZ4_decompress_generic(
+                 const char* const src,
+                 char* const dst,
+                 int srcSize,
+                 int outputSize,         /* If endOnInput==endOnInputSize, this value is `dstCapacity` */
+
+                 earlyEnd_directive partialDecoding,  /* full, partial */
+                 dict_directive dict,                 /* noDict, withPrefix64k, usingExtDict */
+                 const BYTE* const lowPrefix,  /* always <= dst, == dst when no prefix */
+                 const BYTE* const dictStart,  /* only if dict==usingExtDict */
+                 const size_t dictSize         /* note : = 0 if noDict */
+                 )
+{
+    if ((src == NULL) || (outputSize < 0)) { return -1; }
+
+    {   const BYTE* ip = (const BYTE*) src;
+        const BYTE* const iend = ip + srcSize;
+
+        BYTE* op = (BYTE*) dst;
+        BYTE* const oend = op + outputSize;
+        BYTE* cpy;
+
+        const BYTE* const dictEnd = (dictStart == NULL) ? NULL : dictStart + dictSize;
+
+        const int checkOffset = (dictSize < (int)(64 KB));
+
+
+        /* Set up the "end" pointers for the shortcut. */
+        const BYTE* const shortiend = iend - 14 /*maxLL*/ - 2 /*offset*/;
+        const BYTE* const shortoend = oend - 14 /*maxLL*/ - 18 /*maxML*/;
+
+        const BYTE* match;
+        size_t offset;
+        unsigned token;
+        size_t length;
+
+
+        DEBUGLOG(5, "LZ4_decompress_generic (srcSize:%i, dstSize:%i)", srcSize, outputSize);
+
+        /* Special cases */
+        assert(lowPrefix <= op);
+        if (unlikely(outputSize==0)) {
+            /* Empty output buffer */
+            if (partialDecoding) return 0;
+            return ((srcSize==1) && (*ip==0)) ? 0 : -1;
+        }
+        if (unlikely(srcSize==0)) { return -1; }
+
+    /* LZ4_FAST_DEC_LOOP:
+     * designed for modern OoO performance cpus,
+     * where copying reliably 32-bytes is preferable to an unpredictable branch.
+     * note : fast loop may show a regression for some client arm chips. */
+#if LZ4_FAST_DEC_LOOP
+        if ((oend - op) < FASTLOOP_SAFE_DISTANCE) {
+            DEBUGLOG(6, "skip fast decode loop");
+            goto safe_decode;
+        }
+
+        /* Fast loop : decode sequences as long as output < oend-FASTLOOP_SAFE_DISTANCE */
+        while (1) {
+            /* Main fastloop assertion: We can always wildcopy FASTLOOP_SAFE_DISTANCE */
+            assert(oend - op >= FASTLOOP_SAFE_DISTANCE);
+            assert(ip < iend);
+            token = *ip++;
+            length = token >> ML_BITS;  /* literal length */
+
+            /* decode literal length */
+            if (length == RUN_MASK) {
+                size_t const addl = read_variable_length(&ip, iend-RUN_MASK, 1);
+                if (addl == rvl_error) { goto _output_error; }
+                length += addl;
+                if (unlikely((uptrval)(op)+length<(uptrval)(op))) { goto _output_error; } /* overflow detection */
+                if (unlikely((uptrval)(ip)+length<(uptrval)(ip))) { goto _output_error; } /* overflow detection */
+
+                /* copy literals */
+                cpy = op+length;
+                LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH);
+                if ((cpy>oend-32) || (ip+length>iend-32)) { goto safe_literal_copy; }
+                LZ4_wildCopy32(op, ip, cpy);
+                ip += length; op = cpy;
+            } else {
+                cpy = op+length;
+                DEBUGLOG(7, "copy %u bytes in a 16-bytes stripe", (unsigned)length);
+                /* We don't need to check oend, since we check it once for each loop below */
+                if (ip > iend-(16 + 1/*max lit + offset + nextToken*/)) { goto safe_literal_copy; }
+                /* Literals can only be <= 14, but hope compilers optimize better when copy by a register size */
+                LZ4_memcpy(op, ip, 16);
+                ip += length; op = cpy;
+            }
+
+            /* get offset */
+            offset = LZ4_readLE16(ip); ip+=2;
+            match = op - offset;
+            assert(match <= op);  /* overflow check */
+
+            /* get matchlength */
+            length = token & ML_MASK;
+
+            if (length == ML_MASK) {
+                size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0);
+                if (addl == rvl_error) { goto _output_error; }
+                length += addl;
+                length += MINMATCH;
+                if (unlikely((uptrval)(op)+length<(uptrval)op)) { goto _output_error; } /* overflow detection */
+                if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) { goto _output_error; } /* Error : offset outside buffers */
+                if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) {
+                    goto safe_match_copy;
+                }
+            } else {
+                length += MINMATCH;
+                if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) {
+                    goto safe_match_copy;
+                }
+
+                /* Fastpath check: skip LZ4_wildCopy32 when true */
+                if ((dict == withPrefix64k) || (match >= lowPrefix)) {
+                    if (offset >= 8) {
+                        assert(match >= lowPrefix);
+                        assert(match <= op);
+                        assert(op + 18 <= oend);
+
+                        LZ4_memcpy(op, match, 8);
+                        LZ4_memcpy(op+8, match+8, 8);
+                        LZ4_memcpy(op+16, match+16, 2);
+                        op += length;
+                        continue;
+            }   }   }
+
+            if (checkOffset && (unlikely(match + dictSize < lowPrefix))) { goto _output_error; } /* Error : offset outside buffers */
+            /* match starting within external dictionary */
+            if ((dict==usingExtDict) && (match < lowPrefix)) {
+                assert(dictEnd != NULL);
+                if (unlikely(op+length > oend-LASTLITERALS)) {
+                    if (partialDecoding) {
+                        DEBUGLOG(7, "partialDecoding: dictionary match, close to dstEnd");
+                        length = MIN(length, (size_t)(oend-op));
+                    } else {
+                        goto _output_error;  /* end-of-block condition violated */
+                }   }
+
+                if (length <= (size_t)(lowPrefix-match)) {
+                    /* match fits entirely within external dictionary : just copy */
+                    LZ4_memmove(op, dictEnd - (lowPrefix-match), length);
+                    op += length;
+                } else {
+                    /* match stretches into both external dictionary and current block */
+                    size_t const copySize = (size_t)(lowPrefix - match);
+                    size_t const restSize = length - copySize;
+                    LZ4_memcpy(op, dictEnd - copySize, copySize);
+                    op += copySize;
+                    if (restSize > (size_t)(op - lowPrefix)) {  /* overlap copy */
+                        BYTE* const endOfMatch = op + restSize;
+                        const BYTE* copyFrom = lowPrefix;
+                        while (op < endOfMatch) { *op++ = *copyFrom++; }
+                    } else {
+                        LZ4_memcpy(op, lowPrefix, restSize);
+                        op += restSize;
+                }   }
+                continue;
+            }
+
+            /* copy match within block */
+            cpy = op + length;
+
+            assert((op <= oend) && (oend-op >= 32));
+            if (unlikely(offset<16)) {
+                LZ4_memcpy_using_offset(op, match, cpy, offset);
+            } else {
+                LZ4_wildCopy32(op, match, cpy);
+            }
+
+            op = cpy;   /* wildcopy correction */
+        }
+    safe_decode:
+#endif
+
+        /* Main Loop : decode remaining sequences where output < FASTLOOP_SAFE_DISTANCE */
+        while (1) {
+            assert(ip < iend);
+            token = *ip++;
+            length = token >> ML_BITS;  /* literal length */
+
+            /* A two-stage shortcut for the most common case:
+             * 1) If the literal length is 0..14, and there is enough space,
+             * enter the shortcut and copy 16 bytes on behalf of the literals
+             * (in the fast mode, only 8 bytes can be safely copied this way).
+             * 2) Further if the match length is 4..18, copy 18 bytes in a similar
+             * manner; but we ensure that there's enough space in the output for
+             * those 18 bytes earlier, upon entering the shortcut (in other words,
+             * there is a combined check for both stages).
+             */
+            if ( (length != RUN_MASK)
+                /* strictly "less than" on input, to re-enter the loop with at least one byte */
+              && likely((ip < shortiend) & (op <= shortoend)) ) {
+                /* Copy the literals */
+                LZ4_memcpy(op, ip, 16);
+                op += length; ip += length;
+
+                /* The second stage: prepare for match copying, decode full info.
+                 * If it doesn't work out, the info won't be wasted. */
+                length = token & ML_MASK; /* match length */
+                offset = LZ4_readLE16(ip); ip += 2;
+                match = op - offset;
+                assert(match <= op); /* check overflow */
+
+                /* Do not deal with overlapping matches. */
+                if ( (length != ML_MASK)
+                  && (offset >= 8)
+                  && (dict==withPrefix64k || match >= lowPrefix) ) {
+                    /* Copy the match. */
+                    LZ4_memcpy(op + 0, match + 0, 8);
+                    LZ4_memcpy(op + 8, match + 8, 8);
+                    LZ4_memcpy(op +16, match +16, 2);
+                    op += length + MINMATCH;
+                    /* Both stages worked, load the next token. */
+                    continue;
+                }
+
+                /* The second stage didn't work out, but the info is ready.
+                 * Propel it right to the point of match copying. */
+                goto _copy_match;
+            }
+
+            /* decode literal length */
+            if (length == RUN_MASK) {
+                size_t const addl = read_variable_length(&ip, iend-RUN_MASK, 1);
+                if (addl == rvl_error) { goto _output_error; }
+                length += addl;
+                if (unlikely((uptrval)(op)+length<(uptrval)(op))) { goto _output_error; } /* overflow detection */
+                if (unlikely((uptrval)(ip)+length<(uptrval)(ip))) { goto _output_error; } /* overflow detection */
+            }
+
+            /* copy literals */
+            cpy = op+length;
+#if LZ4_FAST_DEC_LOOP
+        safe_literal_copy:
+#endif
+            LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH);
+            if ((cpy>oend-MFLIMIT) || (ip+length>iend-(2+1+LASTLITERALS))) {
+                /* We've either hit the input parsing restriction or the output parsing restriction.
+                 * In the normal scenario, decoding a full block, it must be the last sequence,
+                 * otherwise it's an error (invalid input or dimensions).
+                 * In partialDecoding scenario, it's necessary to ensure there is no buffer overflow.
+                 */
+                if (partialDecoding) {
+                    /* Since we are partial decoding we may be in this block because of the output parsing
+                     * restriction, which is not valid since the output buffer is allowed to be undersized.
+                     */
+                    DEBUGLOG(7, "partialDecoding: copying literals, close to input or output end")
+                    DEBUGLOG(7, "partialDecoding: literal length = %u", (unsigned)length);
+                    DEBUGLOG(7, "partialDecoding: remaining space in dstBuffer : %i", (int)(oend - op));
+                    DEBUGLOG(7, "partialDecoding: remaining space in srcBuffer : %i", (int)(iend - ip));
+                    /* Finishing in the middle of a literals segment,
+                     * due to lack of input.
+                     */
+                    if (ip+length > iend) {
+                        length = (size_t)(iend-ip);
+                        cpy = op + length;
+                    }
+                    /* Finishing in the middle of a literals segment,
+                     * due to lack of output space.
+                     */
+                    if (cpy > oend) {
+                        cpy = oend;
+                        assert(op<=oend);
+                        length = (size_t)(oend-op);
+                    }
+                } else {
+                     /* We must be on the last sequence (or invalid) because of the parsing limitations
+                      * so check that we exactly consume the input and don't overrun the output buffer.
+                      */
+                    if ((ip+length != iend) || (cpy > oend)) {
+                        DEBUGLOG(6, "should have been last run of literals")
+                        DEBUGLOG(6, "ip(%p) + length(%i) = %p != iend (%p)", ip, (int)length, ip+length, iend);
+                        DEBUGLOG(6, "or cpy(%p) > oend(%p)", cpy, oend);
+                        goto _output_error;
+                    }
+                }
+                LZ4_memmove(op, ip, length);  /* supports overlapping memory regions, for in-place decompression scenarios */
+                ip += length;
+                op += length;
+                /* Necessarily EOF when !partialDecoding.
+                 * When partialDecoding, it is EOF if we've either
+                 * filled the output buffer or
+                 * can't proceed with reading an offset for following match.
+                 */
+                if (!partialDecoding || (cpy == oend) || (ip >= (iend-2))) {
+                    break;
+                }
+            } else {
+                LZ4_wildCopy8(op, ip, cpy);   /* can overwrite up to 8 bytes beyond cpy */
+                ip += length; op = cpy;
+            }
+
+            /* get offset */
+            offset = LZ4_readLE16(ip); ip+=2;
+            match = op - offset;
+
+            /* get matchlength */
+            length = token & ML_MASK;
+
+    _copy_match:
+            if (length == ML_MASK) {
+                size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0);
+                if (addl == rvl_error) { goto _output_error; }
+                length += addl;
+                if (unlikely((uptrval)(op)+length<(uptrval)op)) goto _output_error;   /* overflow detection */
+            }
+            length += MINMATCH;
+
+#if LZ4_FAST_DEC_LOOP
+        safe_match_copy:
+#endif
+            if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) goto _output_error;   /* Error : offset outside buffers */
+            /* match starting within external dictionary */
+            if ((dict==usingExtDict) && (match < lowPrefix)) {
+                assert(dictEnd != NULL);
+                if (unlikely(op+length > oend-LASTLITERALS)) {
+                    if (partialDecoding) length = MIN(length, (size_t)(oend-op));
+                    else goto _output_error;   /* doesn't respect parsing restriction */
+                }
+
+                if (length <= (size_t)(lowPrefix-match)) {
+                    /* match fits entirely within external dictionary : just copy */
+                    LZ4_memmove(op, dictEnd - (lowPrefix-match), length);
+                    op += length;
+                } else {
+                    /* match stretches into both external dictionary and current block */
+                    size_t const copySize = (size_t)(lowPrefix - match);
+                    size_t const restSize = length - copySize;
+                    LZ4_memcpy(op, dictEnd - copySize, copySize);
+                    op += copySize;
+                    if (restSize > (size_t)(op - lowPrefix)) {  /* overlap copy */
+                        BYTE* const endOfMatch = op + restSize;
+                        const BYTE* copyFrom = lowPrefix;
+                        while (op < endOfMatch) *op++ = *copyFrom++;
+                    } else {
+                        LZ4_memcpy(op, lowPrefix, restSize);
+                        op += restSize;
+                }   }
+                continue;
+            }
+            assert(match >= lowPrefix);
+
+            /* copy match within block */
+            cpy = op + length;
+
+            /* partialDecoding : may end anywhere within the block */
+            assert(op<=oend);
+            if (partialDecoding && (cpy > oend-MATCH_SAFEGUARD_DISTANCE)) {
+                size_t const mlen = MIN(length, (size_t)(oend-op));
+                const BYTE* const matchEnd = match + mlen;
+                BYTE* const copyEnd = op + mlen;
+                if (matchEnd > op) {   /* overlap copy */
+                    while (op < copyEnd) { *op++ = *match++; }
+                } else {
+                    LZ4_memcpy(op, match, mlen);
+                }
+                op = copyEnd;
+                if (op == oend) { break; }
+                continue;
+            }
+
+            if (unlikely(offset<8)) {
+                LZ4_write32(op, 0);   /* silence msan warning when offset==0 */
+                op[0] = match[0];
+                op[1] = match[1];
+                op[2] = match[2];
+                op[3] = match[3];
+                match += inc32table[offset];
+                LZ4_memcpy(op+4, match, 4);
+                match -= dec64table[offset];
+            } else {
+                LZ4_memcpy(op, match, 8);
+                match += 8;
+            }
+            op += 8;
+
+            if (unlikely(cpy > oend-MATCH_SAFEGUARD_DISTANCE)) {
+                BYTE* const oCopyLimit = oend - (WILDCOPYLENGTH-1);
+                if (cpy > oend-LASTLITERALS) { goto _output_error; } /* Error : last LASTLITERALS bytes must be literals (uncompressed) */
+                if (op < oCopyLimit) {
+                    LZ4_wildCopy8(op, match, oCopyLimit);
+                    match += oCopyLimit - op;
+                    op = oCopyLimit;
+                }
+                while (op < cpy) { *op++ = *match++; }
+            } else {
+                LZ4_memcpy(op, match, 8);
+                if (length > 16)  { LZ4_wildCopy8(op+8, match+8, cpy); }
+            }
+            op = cpy;   /* wildcopy correction */
+        }
+
+        /* end of decoding */
+        DEBUGLOG(5, "decoded %i bytes", (int) (((char*)op)-dst));
+        return (int) (((char*)op)-dst);     /* Nb of output bytes decoded */
+
+        /* Overflow error detected */
+    _output_error:
+        return (int) (-(((const char*)ip)-src))-1;
+    }
+}
+
+
+/*===== Instantiate the API decoding functions. =====*/
+
+LZ4_FORCE_O2
+int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize,
+                                  decode_full_block, noDict,
+                                  (BYTE*)dest, NULL, 0);
+}
+
+LZ4_FORCE_O2
+int LZ4_decompress_safe_partial(const char* src, char* dst, int compressedSize, int targetOutputSize, int dstCapacity)
+{
+    dstCapacity = MIN(targetOutputSize, dstCapacity);
+    return LZ4_decompress_generic(src, dst, compressedSize, dstCapacity,
+                                  partial_decode,
+                                  noDict, (BYTE*)dst, NULL, 0);
+}
+
+LZ4_FORCE_O2
+int LZ4_decompress_fast(const char* source, char* dest, int originalSize)
+{
+    DEBUGLOG(5, "LZ4_decompress_fast");
+    return LZ4_decompress_unsafe_generic(
+                (const BYTE*)source, (BYTE*)dest, originalSize,
+                0, NULL, 0);
+}
+
+/*===== Instantiate a few more decoding cases, used more than once. =====*/
+
+LZ4_FORCE_O2 /* Exported, an obsolete API function. */
+int LZ4_decompress_safe_withPrefix64k(const char* source, char* dest, int compressedSize, int maxOutputSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                  decode_full_block, withPrefix64k,
+                                  (BYTE*)dest - 64 KB, NULL, 0);
+}
+
+LZ4_FORCE_O2
+static int LZ4_decompress_safe_partial_withPrefix64k(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity)
+{
+    dstCapacity = MIN(targetOutputSize, dstCapacity);
+    return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity,
+                                  partial_decode, withPrefix64k,
+                                  (BYTE*)dest - 64 KB, NULL, 0);
+}
+
+/* Another obsolete API function, paired with the previous one. */
+int LZ4_decompress_fast_withPrefix64k(const char* source, char* dest, int originalSize)
+{
+    return LZ4_decompress_unsafe_generic(
+                (const BYTE*)source, (BYTE*)dest, originalSize,
+                64 KB, NULL, 0);
+}
+
+LZ4_FORCE_O2
+static int LZ4_decompress_safe_withSmallPrefix(const char* source, char* dest, int compressedSize, int maxOutputSize,
+                                               size_t prefixSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                  decode_full_block, noDict,
+                                  (BYTE*)dest-prefixSize, NULL, 0);
+}
+
+LZ4_FORCE_O2
+static int LZ4_decompress_safe_partial_withSmallPrefix(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity,
+                                               size_t prefixSize)
+{
+    dstCapacity = MIN(targetOutputSize, dstCapacity);
+    return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity,
+                                  partial_decode, noDict,
+                                  (BYTE*)dest-prefixSize, NULL, 0);
+}
+
+LZ4_FORCE_O2
+int LZ4_decompress_safe_forceExtDict(const char* source, char* dest,
+                                     int compressedSize, int maxOutputSize,
+                                     const void* dictStart, size_t dictSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                  decode_full_block, usingExtDict,
+                                  (BYTE*)dest, (const BYTE*)dictStart, dictSize);
+}
+
+LZ4_FORCE_O2
+int LZ4_decompress_safe_partial_forceExtDict(const char* source, char* dest,
+                                     int compressedSize, int targetOutputSize, int dstCapacity,
+                                     const void* dictStart, size_t dictSize)
+{
+    dstCapacity = MIN(targetOutputSize, dstCapacity);
+    return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity,
+                                  partial_decode, usingExtDict,
+                                  (BYTE*)dest, (const BYTE*)dictStart, dictSize);
+}
+
+LZ4_FORCE_O2
+static int LZ4_decompress_fast_extDict(const char* source, char* dest, int originalSize,
+                                       const void* dictStart, size_t dictSize)
+{
+    return LZ4_decompress_unsafe_generic(
+                (const BYTE*)source, (BYTE*)dest, originalSize,
+                0, (const BYTE*)dictStart, dictSize);
+}
+
+/* The "double dictionary" mode, for use with e.g. ring buffers: the first part
+ * of the dictionary is passed as prefix, and the second via dictStart + dictSize.
+ * These routines are used only once, in LZ4_decompress_*_continue().
+ */
+LZ4_FORCE_INLINE
+int LZ4_decompress_safe_doubleDict(const char* source, char* dest, int compressedSize, int maxOutputSize,
+                                   size_t prefixSize, const void* dictStart, size_t dictSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                  decode_full_block, usingExtDict,
+                                  (BYTE*)dest-prefixSize, (const BYTE*)dictStart, dictSize);
+}
+
+/*===== streaming decompression functions =====*/
+
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4_streamDecode_t* LZ4_createStreamDecode(void)
+{
+    LZ4_STATIC_ASSERT(sizeof(LZ4_streamDecode_t) >= sizeof(LZ4_streamDecode_t_internal));
+    return (LZ4_streamDecode_t*) ALLOC_AND_ZERO(sizeof(LZ4_streamDecode_t));
+}
+
+int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream)
+{
+    if (LZ4_stream == NULL) { return 0; }  /* support free on NULL */
+    FREEMEM(LZ4_stream);
+    return 0;
+}
+#endif
+
+/*! LZ4_setStreamDecode() :
+ *  Use this function to instruct where to find the dictionary.
+ *  This function is not necessary if previous data is still available where it was decoded.
+ *  Loading a size of 0 is allowed (same effect as no dictionary).
+ * @return : 1 if OK, 0 if error
+ */
+int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize)
+{
+    LZ4_streamDecode_t_internal* lz4sd = &LZ4_streamDecode->internal_donotuse;
+    lz4sd->prefixSize = (size_t)dictSize;
+    if (dictSize) {
+        assert(dictionary != NULL);
+        lz4sd->prefixEnd = (const BYTE*) dictionary + dictSize;
+    } else {
+        lz4sd->prefixEnd = (const BYTE*) dictionary;
+    }
+    lz4sd->externalDict = NULL;
+    lz4sd->extDictSize  = 0;
+    return 1;
+}
+
+/*! LZ4_decoderRingBufferSize() :
+ *  when setting a ring buffer for streaming decompression (optional scenario),
+ *  provides the minimum size of this ring buffer
+ *  to be compatible with any source respecting maxBlockSize condition.
+ *  Note : in a ring buffer scenario,
+ *  blocks are presumed decompressed next to each other.
+ *  When not enough space remains for next block (remainingSize < maxBlockSize),
+ *  decoding resumes from beginning of ring buffer.
+ * @return : minimum ring buffer size,
+ *           or 0 if there is an error (invalid maxBlockSize).
+ */
+int LZ4_decoderRingBufferSize(int maxBlockSize)
+{
+    if (maxBlockSize < 0) return 0;
+    if (maxBlockSize > LZ4_MAX_INPUT_SIZE) return 0;
+    if (maxBlockSize < 16) maxBlockSize = 16;
+    return LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize);
+}
+
+/*
+*_continue() :
+    These decoding functions allow decompression of multiple blocks in "streaming" mode.
+    Previously decoded blocks must still be available at the memory position where they were decoded.
+    If it's not possible, save the relevant part of decoded data into a safe buffer,
+    and indicate where it stands using LZ4_setStreamDecode()
+*/
+LZ4_FORCE_O2
+int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize)
+{
+    LZ4_streamDecode_t_internal* lz4sd = &LZ4_streamDecode->internal_donotuse;
+    int result;
+
+    if (lz4sd->prefixSize == 0) {
+        /* The first call, no dictionary yet. */
+        assert(lz4sd->extDictSize == 0);
+        result = LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = (size_t)result;
+        lz4sd->prefixEnd = (BYTE*)dest + result;
+    } else if (lz4sd->prefixEnd == (BYTE*)dest) {
+        /* They're rolling the current segment. */
+        if (lz4sd->prefixSize >= 64 KB - 1)
+            result = LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize);
+        else if (lz4sd->extDictSize == 0)
+            result = LZ4_decompress_safe_withSmallPrefix(source, dest, compressedSize, maxOutputSize,
+                                                         lz4sd->prefixSize);
+        else
+            result = LZ4_decompress_safe_doubleDict(source, dest, compressedSize, maxOutputSize,
+                                                    lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize += (size_t)result;
+        lz4sd->prefixEnd  += result;
+    } else {
+        /* The buffer wraps around, or they're switching to another buffer. */
+        lz4sd->extDictSize = lz4sd->prefixSize;
+        lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize;
+        result = LZ4_decompress_safe_forceExtDict(source, dest, compressedSize, maxOutputSize,
+                                                  lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = (size_t)result;
+        lz4sd->prefixEnd  = (BYTE*)dest + result;
+    }
+
+    return result;
+}
+
+LZ4_FORCE_O2 int
+LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode,
+                        const char* source, char* dest, int originalSize)
+{
+    LZ4_streamDecode_t_internal* const lz4sd =
+        (assert(LZ4_streamDecode!=NULL), &LZ4_streamDecode->internal_donotuse);
+    int result;
+
+    DEBUGLOG(5, "LZ4_decompress_fast_continue (toDecodeSize=%i)", originalSize);
+    assert(originalSize >= 0);
+
+    if (lz4sd->prefixSize == 0) {
+        DEBUGLOG(5, "first invocation : no prefix nor extDict");
+        assert(lz4sd->extDictSize == 0);
+        result = LZ4_decompress_fast(source, dest, originalSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = (size_t)originalSize;
+        lz4sd->prefixEnd = (BYTE*)dest + originalSize;
+    } else if (lz4sd->prefixEnd == (BYTE*)dest) {
+        DEBUGLOG(5, "continue using existing prefix");
+        result = LZ4_decompress_unsafe_generic(
+                        (const BYTE*)source, (BYTE*)dest, originalSize,
+                        lz4sd->prefixSize,
+                        lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize += (size_t)originalSize;
+        lz4sd->prefixEnd  += originalSize;
+    } else {
+        DEBUGLOG(5, "prefix becomes extDict");
+        lz4sd->extDictSize = lz4sd->prefixSize;
+        lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize;
+        result = LZ4_decompress_fast_extDict(source, dest, originalSize,
+                                             lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = (size_t)originalSize;
+        lz4sd->prefixEnd  = (BYTE*)dest + originalSize;
+    }
+
+    return result;
+}
+
+
+/*
+Advanced decoding functions :
+*_usingDict() :
+    These decoding functions work the same as "_continue" ones,
+    the dictionary must be explicitly provided within parameters
+*/
+
+int LZ4_decompress_safe_usingDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
+{
+    if (dictSize==0)
+        return LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize);
+    if (dictStart+dictSize == dest) {
+        if (dictSize >= 64 KB - 1) {
+            return LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize);
+        }
+        assert(dictSize >= 0);
+        return LZ4_decompress_safe_withSmallPrefix(source, dest, compressedSize, maxOutputSize, (size_t)dictSize);
+    }
+    assert(dictSize >= 0);
+    return LZ4_decompress_safe_forceExtDict(source, dest, compressedSize, maxOutputSize, dictStart, (size_t)dictSize);
+}
+
+int LZ4_decompress_safe_partial_usingDict(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity, const char* dictStart, int dictSize)
+{
+    if (dictSize==0)
+        return LZ4_decompress_safe_partial(source, dest, compressedSize, targetOutputSize, dstCapacity);
+    if (dictStart+dictSize == dest) {
+        if (dictSize >= 64 KB - 1) {
+            return LZ4_decompress_safe_partial_withPrefix64k(source, dest, compressedSize, targetOutputSize, dstCapacity);
+        }
+        assert(dictSize >= 0);
+        return LZ4_decompress_safe_partial_withSmallPrefix(source, dest, compressedSize, targetOutputSize, dstCapacity, (size_t)dictSize);
+    }
+    assert(dictSize >= 0);
+    return LZ4_decompress_safe_partial_forceExtDict(source, dest, compressedSize, targetOutputSize, dstCapacity, dictStart, (size_t)dictSize);
+}
+
+int LZ4_decompress_fast_usingDict(const char* source, char* dest, int originalSize, const char* dictStart, int dictSize)
+{
+    if (dictSize==0 || dictStart+dictSize == dest)
+        return LZ4_decompress_unsafe_generic(
+                        (const BYTE*)source, (BYTE*)dest, originalSize,
+                        (size_t)dictSize, NULL, 0);
+    assert(dictSize >= 0);
+    return LZ4_decompress_fast_extDict(source, dest, originalSize, dictStart, (size_t)dictSize);
+}
+
+
+/*=*************************************************
+*  Obsolete Functions
+***************************************************/
+/* obsolete compression functions */
+int LZ4_compress_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize)
+{
+    return LZ4_compress_default(source, dest, inputSize, maxOutputSize);
+}
+int LZ4_compress(const char* src, char* dest, int srcSize)
+{
+    return LZ4_compress_default(src, dest, srcSize, LZ4_compressBound(srcSize));
+}
+int LZ4_compress_limitedOutput_withState (void* state, const char* src, char* dst, int srcSize, int dstSize)
+{
+    return LZ4_compress_fast_extState(state, src, dst, srcSize, dstSize, 1);
+}
+int LZ4_compress_withState (void* state, const char* src, char* dst, int srcSize)
+{
+    return LZ4_compress_fast_extState(state, src, dst, srcSize, LZ4_compressBound(srcSize), 1);
+}
+int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_stream, const char* src, char* dst, int srcSize, int dstCapacity)
+{
+    return LZ4_compress_fast_continue(LZ4_stream, src, dst, srcSize, dstCapacity, 1);
+}
+int LZ4_compress_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize)
+{
+    return LZ4_compress_fast_continue(LZ4_stream, source, dest, inputSize, LZ4_compressBound(inputSize), 1);
+}
+
+/*
+These decompression functions are deprecated and should no longer be used.
+They are only provided here for compatibility with older user programs.
+- LZ4_uncompress is totally equivalent to LZ4_decompress_fast
+- LZ4_uncompress_unknownOutputSize is totally equivalent to LZ4_decompress_safe
+*/
+int LZ4_uncompress (const char* source, char* dest, int outputSize)
+{
+    return LZ4_decompress_fast(source, dest, outputSize);
+}
+int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize)
+{
+    return LZ4_decompress_safe(source, dest, isize, maxOutputSize);
+}
+
+/* Obsolete Streaming functions */
+
+int LZ4_sizeofStreamState(void) { return sizeof(LZ4_stream_t); }
+
+int LZ4_resetStreamState(void* state, char* inputBuffer)
+{
+    (void)inputBuffer;
+    LZ4_resetStream((LZ4_stream_t*)state);
+    return 0;
+}
+
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+void* LZ4_create (char* inputBuffer)
+{
+    (void)inputBuffer;
+    return LZ4_createStream();
+}
+#endif
+
+char* LZ4_slideInputBuffer (void* state)
+{
+    /* avoid const char * -> char * conversion warning */
+    return (char *)(uptrval)((LZ4_stream_t*)state)->internal_donotuse.dictionary;
+}
+
+#endif   /* LZ4_COMMONDEFS_ONLY */
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4.h b/extra/lz4/lz4-1.9.4/lib/lz4.h
new file mode 100644
index 000000000000..491c6087c417
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4.h
@@ -0,0 +1,842 @@
+/*
+ *  LZ4 - Fast LZ compression algorithm
+ *  Header File
+ *  Copyright (C) 2011-2020, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+    - LZ4 homepage : http://www.lz4.org
+    - LZ4 source repository : https://github.com/lz4/lz4
+*/
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef LZ4_H_2983827168210
+#define LZ4_H_2983827168210
+
+/* --- Dependency --- */
+#include <stddef.h>   /* size_t */
+
+
+/**
+  Introduction
+
+  LZ4 is lossless compression algorithm, providing compression speed >500 MB/s per core,
+  scalable with multi-cores CPU. It features an extremely fast decoder, with speed in
+  multiple GB/s per core, typically reaching RAM speed limits on multi-core systems.
+
+  The LZ4 compression library provides in-memory compression and decompression functions.
+  It gives full buffer control to user.
+  Compression can be done in:
+    - a single step (described as Simple Functions)
+    - a single step, reusing a context (described in Advanced Functions)
+    - unbounded multiple steps (described as Streaming compression)
+
+  lz4.h generates and decodes LZ4-compressed blocks (doc/lz4_Block_format.md).
+  Decompressing such a compressed block requires additional metadata.
+  Exact metadata depends on exact decompression function.
+  For the typical case of LZ4_decompress_safe(),
+  metadata includes block's compressed size, and maximum bound of decompressed size.
+  Each application is free to encode and pass such metadata in whichever way it wants.
+
+  lz4.h only handle blocks, it can not generate Frames.
+
+  Blocks are different from Frames (doc/lz4_Frame_format.md).
+  Frames bundle both blocks and metadata in a specified manner.
+  Embedding metadata is required for compressed data to be self-contained and portable.
+  Frame format is delivered through a companion API, declared in lz4frame.h.
+  The `lz4` CLI can only manage frames.
+*/
+
+/*^***************************************************************
+*  Export parameters
+*****************************************************************/
+/*
+*  LZ4_DLL_EXPORT :
+*  Enable exporting of functions when building a Windows DLL
+*  LZ4LIB_VISIBILITY :
+*  Control library symbols visibility.
+*/
+#ifndef LZ4LIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define LZ4LIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define LZ4LIB_VISIBILITY
+#  endif
+#endif
+#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1)
+#  define LZ4LIB_API __declspec(dllexport) LZ4LIB_VISIBILITY
+#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)
+#  define LZ4LIB_API __declspec(dllimport) LZ4LIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#else
+#  define LZ4LIB_API LZ4LIB_VISIBILITY
+#endif
+
+/*! LZ4_FREESTANDING :
+ *  When this macro is set to 1, it enables "freestanding mode" that is
+ *  suitable for typical freestanding environment which doesn't support
+ *  standard C library.
+ *
+ *  - LZ4_FREESTANDING is a compile-time switch.
+ *  - It requires the following macros to be defined:
+ *    LZ4_memcpy, LZ4_memmove, LZ4_memset.
+ *  - It only enables LZ4/HC functions which don't use heap.
+ *    All LZ4F_* functions are not supported.
+ *  - See tests/freestanding.c to check its basic setup.
+ */
+#if defined(LZ4_FREESTANDING) && (LZ4_FREESTANDING == 1)
+#  define LZ4_HEAPMODE 0
+#  define LZ4HC_HEAPMODE 0
+#  define LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION 1
+#  if !defined(LZ4_memcpy)
+#    error "LZ4_FREESTANDING requires macro 'LZ4_memcpy'."
+#  endif
+#  if !defined(LZ4_memset)
+#    error "LZ4_FREESTANDING requires macro 'LZ4_memset'."
+#  endif
+#  if !defined(LZ4_memmove)
+#    error "LZ4_FREESTANDING requires macro 'LZ4_memmove'."
+#  endif
+#elif ! defined(LZ4_FREESTANDING)
+#  define LZ4_FREESTANDING 0
+#endif
+
+
+/*------   Version   ------*/
+#define LZ4_VERSION_MAJOR    1    /* for breaking interface changes  */
+#define LZ4_VERSION_MINOR    9    /* for new (non-breaking) interface capabilities */
+#define LZ4_VERSION_RELEASE  4    /* for tweaks, bug-fixes, or development */
+
+#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
+
+#define LZ4_LIB_VERSION LZ4_VERSION_MAJOR.LZ4_VERSION_MINOR.LZ4_VERSION_RELEASE
+#define LZ4_QUOTE(str) #str
+#define LZ4_EXPAND_AND_QUOTE(str) LZ4_QUOTE(str)
+#define LZ4_VERSION_STRING LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION)  /* requires v1.7.3+ */
+
+LZ4LIB_API int LZ4_versionNumber (void);  /**< library version number; useful to check dll version; requires v1.3.0+ */
+LZ4LIB_API const char* LZ4_versionString (void);   /**< library version string; useful to check dll version; requires v1.7.5+ */
+
+
+/*-************************************
+*  Tuning parameter
+**************************************/
+#define LZ4_MEMORY_USAGE_MIN 10
+#define LZ4_MEMORY_USAGE_DEFAULT 14
+#define LZ4_MEMORY_USAGE_MAX 20
+
+/*!
+ * LZ4_MEMORY_USAGE :
+ * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; )
+ * Increasing memory usage improves compression ratio, at the cost of speed.
+ * Reduced memory usage may improve speed at the cost of ratio, thanks to better cache locality.
+ * Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache
+ */
+#ifndef LZ4_MEMORY_USAGE
+# define LZ4_MEMORY_USAGE LZ4_MEMORY_USAGE_DEFAULT
+#endif
+
+#if (LZ4_MEMORY_USAGE < LZ4_MEMORY_USAGE_MIN)
+#  error "LZ4_MEMORY_USAGE is too small !"
+#endif
+
+#if (LZ4_MEMORY_USAGE > LZ4_MEMORY_USAGE_MAX)
+#  error "LZ4_MEMORY_USAGE is too large !"
+#endif
+
+/*-************************************
+*  Simple Functions
+**************************************/
+/*! LZ4_compress_default() :
+ *  Compresses 'srcSize' bytes from buffer 'src'
+ *  into already allocated 'dst' buffer of size 'dstCapacity'.
+ *  Compression is guaranteed to succeed if 'dstCapacity' >= LZ4_compressBound(srcSize).
+ *  It also runs faster, so it's a recommended setting.
+ *  If the function cannot compress 'src' into a more limited 'dst' budget,
+ *  compression stops *immediately*, and the function result is zero.
+ *  In which case, 'dst' content is undefined (invalid).
+ *      srcSize : max supported value is LZ4_MAX_INPUT_SIZE.
+ *      dstCapacity : size of buffer 'dst' (which must be already allocated)
+ *     @return  : the number of bytes written into buffer 'dst' (necessarily <= dstCapacity)
+ *                or 0 if compression fails
+ * Note : This function is protected against buffer overflow scenarios (never writes outside 'dst' buffer, nor read outside 'source' buffer).
+ */
+LZ4LIB_API int LZ4_compress_default(const char* src, char* dst, int srcSize, int dstCapacity);
+
+/*! LZ4_decompress_safe() :
+ *  compressedSize : is the exact complete size of the compressed block.
+ *  dstCapacity : is the size of destination buffer (which must be already allocated), presumed an upper bound of decompressed size.
+ * @return : the number of bytes decompressed into destination buffer (necessarily <= dstCapacity)
+ *           If destination buffer is not large enough, decoding will stop and output an error code (negative value).
+ *           If the source stream is detected malformed, the function will stop decoding and return a negative result.
+ * Note 1 : This function is protected against malicious data packets :
+ *          it will never writes outside 'dst' buffer, nor read outside 'source' buffer,
+ *          even if the compressed block is maliciously modified to order the decoder to do these actions.
+ *          In such case, the decoder stops immediately, and considers the compressed block malformed.
+ * Note 2 : compressedSize and dstCapacity must be provided to the function, the compressed block does not contain them.
+ *          The implementation is free to send / store / derive this information in whichever way is most beneficial.
+ *          If there is a need for a different format which bundles together both compressed data and its metadata, consider looking at lz4frame.h instead.
+ */
+LZ4LIB_API int LZ4_decompress_safe (const char* src, char* dst, int compressedSize, int dstCapacity);
+
+
+/*-************************************
+*  Advanced Functions
+**************************************/
+#define LZ4_MAX_INPUT_SIZE        0x7E000000   /* 2 113 929 216 bytes */
+#define LZ4_COMPRESSBOUND(isize)  ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16)
+
+/*! LZ4_compressBound() :
+    Provides the maximum size that LZ4 compression may output in a "worst case" scenario (input data not compressible)
+    This function is primarily useful for memory allocation purposes (destination buffer size).
+    Macro LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack memory allocation for example).
+    Note that LZ4_compress_default() compresses faster when dstCapacity is >= LZ4_compressBound(srcSize)
+        inputSize  : max supported value is LZ4_MAX_INPUT_SIZE
+        return : maximum output size in a "worst case" scenario
+              or 0, if input size is incorrect (too large or negative)
+*/
+LZ4LIB_API int LZ4_compressBound(int inputSize);
+
+/*! LZ4_compress_fast() :
+    Same as LZ4_compress_default(), but allows selection of "acceleration" factor.
+    The larger the acceleration value, the faster the algorithm, but also the lesser the compression.
+    It's a trade-off. It can be fine tuned, with each successive value providing roughly +~3% to speed.
+    An acceleration value of "1" is the same as regular LZ4_compress_default()
+    Values <= 0 will be replaced by LZ4_ACCELERATION_DEFAULT (currently == 1, see lz4.c).
+    Values > LZ4_ACCELERATION_MAX will be replaced by LZ4_ACCELERATION_MAX (currently == 65537, see lz4.c).
+*/
+LZ4LIB_API int LZ4_compress_fast (const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+
+/*! LZ4_compress_fast_extState() :
+ *  Same as LZ4_compress_fast(), using an externally allocated memory space for its state.
+ *  Use LZ4_sizeofState() to know how much memory must be allocated,
+ *  and allocate it on 8-bytes boundaries (using `malloc()` typically).
+ *  Then, provide this buffer as `void* state` to compression function.
+ */
+LZ4LIB_API int LZ4_sizeofState(void);
+LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+
+/*! LZ4_compress_destSize() :
+ *  Reverse the logic : compresses as much data as possible from 'src' buffer
+ *  into already allocated buffer 'dst', of size >= 'targetDestSize'.
+ *  This function either compresses the entire 'src' content into 'dst' if it's large enough,
+ *  or fill 'dst' buffer completely with as much data as possible from 'src'.
+ *  note: acceleration parameter is fixed to "default".
+ *
+ * *srcSizePtr : will be modified to indicate how many bytes where read from 'src' to fill 'dst'.
+ *               New value is necessarily <= input value.
+ * @return : Nb bytes written into 'dst' (necessarily <= targetDestSize)
+ *           or 0 if compression fails.
+ *
+ * Note : from v1.8.2 to v1.9.1, this function had a bug (fixed un v1.9.2+):
+ *        the produced compressed content could, in specific circumstances,
+ *        require to be decompressed into a destination buffer larger
+ *        by at least 1 byte than the content to decompress.
+ *        If an application uses `LZ4_compress_destSize()`,
+ *        it's highly recommended to update liblz4 to v1.9.2 or better.
+ *        If this can't be done or ensured,
+ *        the receiving decompression function should provide
+ *        a dstCapacity which is > decompressedSize, by at least 1 byte.
+ *        See https://github.com/lz4/lz4/issues/859 for details
+ */
+LZ4LIB_API int LZ4_compress_destSize (const char* src, char* dst, int* srcSizePtr, int targetDstSize);
+
+
+/*! LZ4_decompress_safe_partial() :
+ *  Decompress an LZ4 compressed block, of size 'srcSize' at position 'src',
+ *  into destination buffer 'dst' of size 'dstCapacity'.
+ *  Up to 'targetOutputSize' bytes will be decoded.
+ *  The function stops decoding on reaching this objective.
+ *  This can be useful to boost performance
+ *  whenever only the beginning of a block is required.
+ *
+ * @return : the number of bytes decoded in `dst` (necessarily <= targetOutputSize)
+ *           If source stream is detected malformed, function returns a negative result.
+ *
+ *  Note 1 : @return can be < targetOutputSize, if compressed block contains less data.
+ *
+ *  Note 2 : targetOutputSize must be <= dstCapacity
+ *
+ *  Note 3 : this function effectively stops decoding on reaching targetOutputSize,
+ *           so dstCapacity is kind of redundant.
+ *           This is because in older versions of this function,
+ *           decoding operation would still write complete sequences.
+ *           Therefore, there was no guarantee that it would stop writing at exactly targetOutputSize,
+ *           it could write more bytes, though only up to dstCapacity.
+ *           Some "margin" used to be required for this operation to work properly.
+ *           Thankfully, this is no longer necessary.
+ *           The function nonetheless keeps the same signature, in an effort to preserve API compatibility.
+ *
+ *  Note 4 : If srcSize is the exact size of the block,
+ *           then targetOutputSize can be any value,
+ *           including larger than the block's decompressed size.
+ *           The function will, at most, generate block's decompressed size.
+ *
+ *  Note 5 : If srcSize is _larger_ than block's compressed size,
+ *           then targetOutputSize **MUST** be <= block's decompressed size.
+ *           Otherwise, *silent corruption will occur*.
+ */
+LZ4LIB_API int LZ4_decompress_safe_partial (const char* src, char* dst, int srcSize, int targetOutputSize, int dstCapacity);
+
+
+/*-*********************************************
+*  Streaming Compression Functions
+***********************************************/
+typedef union LZ4_stream_u LZ4_stream_t;  /* incomplete type (defined later) */
+
+/**
+ Note about RC_INVOKED
+
+ - RC_INVOKED is predefined symbol of rc.exe (the resource compiler which is part of MSVC/Visual Studio).
+   https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros
+
+ - Since rc.exe is a legacy compiler, it truncates long symbol (> 30 chars)
+   and reports warning "RC4011: identifier truncated".
+
+ - To eliminate the warning, we surround long preprocessor symbol with
+   "#if !defined(RC_INVOKED) ... #endif" block that means
+   "skip this block when rc.exe is trying to read it".
+*/
+#if !defined(RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros */
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4LIB_API LZ4_stream_t* LZ4_createStream(void);
+LZ4LIB_API int           LZ4_freeStream (LZ4_stream_t* streamPtr);
+#endif /* !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) */
+#endif
+
+/*! LZ4_resetStream_fast() : v1.9.0+
+ *  Use this to prepare an LZ4_stream_t for a new chain of dependent blocks
+ *  (e.g., LZ4_compress_fast_continue()).
+ *
+ *  An LZ4_stream_t must be initialized once before usage.
+ *  This is automatically done when created by LZ4_createStream().
+ *  However, should the LZ4_stream_t be simply declared on stack (for example),
+ *  it's necessary to initialize it first, using LZ4_initStream().
+ *
+ *  After init, start any new stream with LZ4_resetStream_fast().
+ *  A same LZ4_stream_t can be re-used multiple times consecutively
+ *  and compress multiple streams,
+ *  provided that it starts each new stream with LZ4_resetStream_fast().
+ *
+ *  LZ4_resetStream_fast() is much faster than LZ4_initStream(),
+ *  but is not compatible with memory regions containing garbage data.
+ *
+ *  Note: it's only useful to call LZ4_resetStream_fast()
+ *        in the context of streaming compression.
+ *        The *extState* functions perform their own resets.
+ *        Invoking LZ4_resetStream_fast() before is redundant, and even counterproductive.
+ */
+LZ4LIB_API void LZ4_resetStream_fast (LZ4_stream_t* streamPtr);
+
+/*! LZ4_loadDict() :
+ *  Use this function to reference a static dictionary into LZ4_stream_t.
+ *  The dictionary must remain available during compression.
+ *  LZ4_loadDict() triggers a reset, so any previous data will be forgotten.
+ *  The same dictionary will have to be loaded on decompression side for successful decoding.
+ *  Dictionary are useful for better compression of small data (KB range).
+ *  While LZ4 accept any input as dictionary,
+ *  results are generally better when using Zstandard's Dictionary Builder.
+ *  Loading a size of 0 is allowed, and is the same as reset.
+ * @return : loaded dictionary size, in bytes (necessarily <= 64 KB)
+ */
+LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize);
+
+/*! LZ4_compress_fast_continue() :
+ *  Compress 'src' content using data from previously compressed blocks, for better compression ratio.
+ * 'dst' buffer must be already allocated.
+ *  If dstCapacity >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster.
+ *
+ * @return : size of compressed block
+ *           or 0 if there is an error (typically, cannot fit into 'dst').
+ *
+ *  Note 1 : Each invocation to LZ4_compress_fast_continue() generates a new block.
+ *           Each block has precise boundaries.
+ *           Each block must be decompressed separately, calling LZ4_decompress_*() with relevant metadata.
+ *           It's not possible to append blocks together and expect a single invocation of LZ4_decompress_*() to decompress them together.
+ *
+ *  Note 2 : The previous 64KB of source data is __assumed__ to remain present, unmodified, at same address in memory !
+ *
+ *  Note 3 : When input is structured as a double-buffer, each buffer can have any size, including < 64 KB.
+ *           Make sure that buffers are separated, by at least one byte.
+ *           This construction ensures that each block only depends on previous block.
+ *
+ *  Note 4 : If input buffer is a ring-buffer, it can have any size, including < 64 KB.
+ *
+ *  Note 5 : After an error, the stream status is undefined (invalid), it can only be reset or freed.
+ */
+LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+/*! LZ4_saveDict() :
+ *  If last 64KB data cannot be guaranteed to remain available at its current memory location,
+ *  save it into a safer place (char* safeBuffer).
+ *  This is schematically equivalent to a memcpy() followed by LZ4_loadDict(),
+ *  but is much faster, because LZ4_saveDict() doesn't need to rebuild tables.
+ * @return : saved dictionary size in bytes (necessarily <= maxDictSize), or 0 if error.
+ */
+LZ4LIB_API int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int maxDictSize);
+
+
+/*-**********************************************
+*  Streaming Decompression Functions
+*  Bufferless synchronous API
+************************************************/
+typedef union LZ4_streamDecode_u LZ4_streamDecode_t;   /* tracking context */
+
+/*! LZ4_createStreamDecode() and LZ4_freeStreamDecode() :
+ *  creation / destruction of streaming decompression tracking context.
+ *  A tracking context can be re-used multiple times.
+ */
+#if !defined(RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros */
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4LIB_API LZ4_streamDecode_t* LZ4_createStreamDecode(void);
+LZ4LIB_API int                 LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
+#endif /* !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) */
+#endif
+
+/*! LZ4_setStreamDecode() :
+ *  An LZ4_streamDecode_t context can be allocated once and re-used multiple times.
+ *  Use this function to start decompression of a new stream of blocks.
+ *  A dictionary can optionally be set. Use NULL or size 0 for a reset order.
+ *  Dictionary is presumed stable : it must remain accessible and unmodified during next decompression.
+ * @return : 1 if OK, 0 if error
+ */
+LZ4LIB_API int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize);
+
+/*! LZ4_decoderRingBufferSize() : v1.8.2+
+ *  Note : in a ring buffer scenario (optional),
+ *  blocks are presumed decompressed next to each other
+ *  up to the moment there is not enough remaining space for next block (remainingSize < maxBlockSize),
+ *  at which stage it resumes from beginning of ring buffer.
+ *  When setting such a ring buffer for streaming decompression,
+ *  provides the minimum size of this ring buffer
+ *  to be compatible with any source respecting maxBlockSize condition.
+ * @return : minimum ring buffer size,
+ *           or 0 if there is an error (invalid maxBlockSize).
+ */
+LZ4LIB_API int LZ4_decoderRingBufferSize(int maxBlockSize);
+#define LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize) (65536 + 14 + (maxBlockSize))  /* for static allocation; maxBlockSize presumed valid */
+
+/*! LZ4_decompress_*_continue() :
+ *  These decoding functions allow decompression of consecutive blocks in "streaming" mode.
+ *  A block is an unsplittable entity, it must be presented entirely to a decompression function.
+ *  Decompression functions only accepts one block at a time.
+ *  The last 64KB of previously decoded data *must* remain available and unmodified at the memory position where they were decoded.
+ *  If less than 64KB of data has been decoded, all the data must be present.
+ *
+ *  Special : if decompression side sets a ring buffer, it must respect one of the following conditions :
+ *  - Decompression buffer size is _at least_ LZ4_decoderRingBufferSize(maxBlockSize).
+ *    maxBlockSize is the maximum size of any single block. It can have any value > 16 bytes.
+ *    In which case, encoding and decoding buffers do not need to be synchronized.
+ *    Actually, data can be produced by any source compliant with LZ4 format specification, and respecting maxBlockSize.
+ *  - Synchronized mode :
+ *    Decompression buffer size is _exactly_ the same as compression buffer size,
+ *    and follows exactly same update rule (block boundaries at same positions),
+ *    and decoding function is provided with exact decompressed size of each block (exception for last block of the stream),
+ *    _then_ decoding & encoding ring buffer can have any size, including small ones ( < 64 KB).
+ *  - Decompression buffer is larger than encoding buffer, by a minimum of maxBlockSize more bytes.
+ *    In which case, encoding and decoding buffers do not need to be synchronized,
+ *    and encoding ring buffer can have any size, including small ones ( < 64 KB).
+ *
+ *  Whenever these conditions are not possible,
+ *  save the last 64KB of decoded data into a safe buffer where it can't be modified during decompression,
+ *  then indicate where this data is saved using LZ4_setStreamDecode(), before decompressing next block.
+*/
+LZ4LIB_API int
+LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode,
+                        const char* src, char* dst,
+                        int srcSize, int dstCapacity);
+
+
+/*! LZ4_decompress_*_usingDict() :
+ *  These decoding functions work the same as
+ *  a combination of LZ4_setStreamDecode() followed by LZ4_decompress_*_continue()
+ *  They are stand-alone, and don't need an LZ4_streamDecode_t structure.
+ *  Dictionary is presumed stable : it must remain accessible and unmodified during decompression.
+ *  Performance tip : Decompression speed can be substantially increased
+ *                    when dst == dictStart + dictSize.
+ */
+LZ4LIB_API int
+LZ4_decompress_safe_usingDict(const char* src, char* dst,
+                              int srcSize, int dstCapacity,
+                              const char* dictStart, int dictSize);
+
+LZ4LIB_API int
+LZ4_decompress_safe_partial_usingDict(const char* src, char* dst,
+                                      int compressedSize,
+                                      int targetOutputSize, int maxOutputSize,
+                                      const char* dictStart, int dictSize);
+
+#endif /* LZ4_H_2983827168210 */
+
+
+/*^*************************************
+ * !!!!!!   STATIC LINKING ONLY   !!!!!!
+ ***************************************/
+
+/*-****************************************************************************
+ * Experimental section
+ *
+ * Symbols declared in this section must be considered unstable. Their
+ * signatures or semantics may change, or they may be removed altogether in the
+ * future. They are therefore only safe to depend on when the caller is
+ * statically linked against the library.
+ *
+ * To protect against unsafe usage, not only are the declarations guarded,
+ * the definitions are hidden by default
+ * when building LZ4 as a shared/dynamic library.
+ *
+ * In order to access these declarations,
+ * define LZ4_STATIC_LINKING_ONLY in your application
+ * before including LZ4's headers.
+ *
+ * In order to make their implementations accessible dynamically, you must
+ * define LZ4_PUBLISH_STATIC_FUNCTIONS when building the LZ4 library.
+ ******************************************************************************/
+
+#ifdef LZ4_STATIC_LINKING_ONLY
+
+#ifndef LZ4_STATIC_3504398509
+#define LZ4_STATIC_3504398509
+
+#ifdef LZ4_PUBLISH_STATIC_FUNCTIONS
+#define LZ4LIB_STATIC_API LZ4LIB_API
+#else
+#define LZ4LIB_STATIC_API
+#endif
+
+
+/*! LZ4_compress_fast_extState_fastReset() :
+ *  A variant of LZ4_compress_fast_extState().
+ *
+ *  Using this variant avoids an expensive initialization step.
+ *  It is only safe to call if the state buffer is known to be correctly initialized already
+ *  (see above comment on LZ4_resetStream_fast() for a definition of "correctly initialized").
+ *  From a high level, the difference is that
+ *  this function initializes the provided state with a call to something like LZ4_resetStream_fast()
+ *  while LZ4_compress_fast_extState() starts with a call to LZ4_resetStream().
+ */
+LZ4LIB_STATIC_API int LZ4_compress_fast_extState_fastReset (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration);
+
+/*! LZ4_attach_dictionary() :
+ *  This is an experimental API that allows
+ *  efficient use of a static dictionary many times.
+ *
+ *  Rather than re-loading the dictionary buffer into a working context before
+ *  each compression, or copying a pre-loaded dictionary's LZ4_stream_t into a
+ *  working LZ4_stream_t, this function introduces a no-copy setup mechanism,
+ *  in which the working stream references the dictionary stream in-place.
+ *
+ *  Several assumptions are made about the state of the dictionary stream.
+ *  Currently, only streams which have been prepared by LZ4_loadDict() should
+ *  be expected to work.
+ *
+ *  Alternatively, the provided dictionaryStream may be NULL,
+ *  in which case any existing dictionary stream is unset.
+ *
+ *  If a dictionary is provided, it replaces any pre-existing stream history.
+ *  The dictionary contents are the only history that can be referenced and
+ *  logically immediately precede the data compressed in the first subsequent
+ *  compression call.
+ *
+ *  The dictionary will only remain attached to the working stream through the
+ *  first compression call, at the end of which it is cleared. The dictionary
+ *  stream (and source buffer) must remain in-place / accessible / unchanged
+ *  through the completion of the first compression call on the stream.
+ */
+LZ4LIB_STATIC_API void
+LZ4_attach_dictionary(LZ4_stream_t* workingStream,
+                const LZ4_stream_t* dictionaryStream);
+
+
+/*! In-place compression and decompression
+ *
+ * It's possible to have input and output sharing the same buffer,
+ * for highly constrained memory environments.
+ * In both cases, it requires input to lay at the end of the buffer,
+ * and decompression to start at beginning of the buffer.
+ * Buffer size must feature some margin, hence be larger than final size.
+ *
+ * |<------------------------buffer--------------------------------->|
+ *                             |<-----------compressed data--------->|
+ * |<-----------decompressed size------------------>|
+ *                                                  |<----margin---->|
+ *
+ * This technique is more useful for decompression,
+ * since decompressed size is typically larger,
+ * and margin is short.
+ *
+ * In-place decompression will work inside any buffer
+ * which size is >= LZ4_DECOMPRESS_INPLACE_BUFFER_SIZE(decompressedSize).
+ * This presumes that decompressedSize > compressedSize.
+ * Otherwise, it means compression actually expanded data,
+ * and it would be more efficient to store such data with a flag indicating it's not compressed.
+ * This can happen when data is not compressible (already compressed, or encrypted).
+ *
+ * For in-place compression, margin is larger, as it must be able to cope with both
+ * history preservation, requiring input data to remain unmodified up to LZ4_DISTANCE_MAX,
+ * and data expansion, which can happen when input is not compressible.
+ * As a consequence, buffer size requirements are much higher,
+ * and memory savings offered by in-place compression are more limited.
+ *
+ * There are ways to limit this cost for compression :
+ * - Reduce history size, by modifying LZ4_DISTANCE_MAX.
+ *   Note that it is a compile-time constant, so all compressions will apply this limit.
+ *   Lower values will reduce compression ratio, except when input_size < LZ4_DISTANCE_MAX,
+ *   so it's a reasonable trick when inputs are known to be small.
+ * - Require the compressor to deliver a "maximum compressed size".
+ *   This is the `dstCapacity` parameter in `LZ4_compress*()`.
+ *   When this size is < LZ4_COMPRESSBOUND(inputSize), then compression can fail,
+ *   in which case, the return code will be 0 (zero).
+ *   The caller must be ready for these cases to happen,
+ *   and typically design a backup scheme to send data uncompressed.
+ * The combination of both techniques can significantly reduce
+ * the amount of margin required for in-place compression.
+ *
+ * In-place compression can work in any buffer
+ * which size is >= (maxCompressedSize)
+ * with maxCompressedSize == LZ4_COMPRESSBOUND(srcSize) for guaranteed compression success.
+ * LZ4_COMPRESS_INPLACE_BUFFER_SIZE() depends on both maxCompressedSize and LZ4_DISTANCE_MAX,
+ * so it's possible to reduce memory requirements by playing with them.
+ */
+
+#define LZ4_DECOMPRESS_INPLACE_MARGIN(compressedSize)          (((compressedSize) >> 8) + 32)
+#define LZ4_DECOMPRESS_INPLACE_BUFFER_SIZE(decompressedSize)   ((decompressedSize) + LZ4_DECOMPRESS_INPLACE_MARGIN(decompressedSize))  /**< note: presumes that compressedSize < decompressedSize. note2: margin is overestimated a bit, since it could use compressedSize instead */
+
+#ifndef LZ4_DISTANCE_MAX   /* history window size; can be user-defined at compile time */
+#  define LZ4_DISTANCE_MAX 65535   /* set to maximum value by default */
+#endif
+
+#define LZ4_COMPRESS_INPLACE_MARGIN                           (LZ4_DISTANCE_MAX + 32)   /* LZ4_DISTANCE_MAX can be safely replaced by srcSize when it's smaller */
+#define LZ4_COMPRESS_INPLACE_BUFFER_SIZE(maxCompressedSize)   ((maxCompressedSize) + LZ4_COMPRESS_INPLACE_MARGIN)  /**< maxCompressedSize is generally LZ4_COMPRESSBOUND(inputSize), but can be set to any lower value, with the risk that compression can fail (return code 0(zero)) */
+
+#endif   /* LZ4_STATIC_3504398509 */
+#endif   /* LZ4_STATIC_LINKING_ONLY */
+
+
+
+#ifndef LZ4_H_98237428734687
+#define LZ4_H_98237428734687
+
+/*-************************************************************
+ *  Private Definitions
+ **************************************************************
+ * Do not use these definitions directly.
+ * They are only exposed to allow static allocation of `LZ4_stream_t` and `LZ4_streamDecode_t`.
+ * Accessing members will expose user code to API and/or ABI break in future versions of the library.
+ **************************************************************/
+#define LZ4_HASHLOG   (LZ4_MEMORY_USAGE-2)
+#define LZ4_HASHTABLESIZE (1 << LZ4_MEMORY_USAGE)
+#define LZ4_HASH_SIZE_U32 (1 << LZ4_HASHLOG)       /* required as macro for static allocation */
+
+#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+# include <stdint.h>
+  typedef  int8_t  LZ4_i8;
+  typedef uint8_t  LZ4_byte;
+  typedef uint16_t LZ4_u16;
+  typedef uint32_t LZ4_u32;
+#else
+  typedef   signed char  LZ4_i8;
+  typedef unsigned char  LZ4_byte;
+  typedef unsigned short LZ4_u16;
+  typedef unsigned int   LZ4_u32;
+#endif
+
+/*! LZ4_stream_t :
+ *  Never ever use below internal definitions directly !
+ *  These definitions are not API/ABI safe, and may change in future versions.
+ *  If you need static allocation, declare or allocate an LZ4_stream_t object.
+**/
+
+typedef struct LZ4_stream_t_internal LZ4_stream_t_internal;
+struct LZ4_stream_t_internal {
+    LZ4_u32 hashTable[LZ4_HASH_SIZE_U32];
+    const LZ4_byte* dictionary;
+    const LZ4_stream_t_internal* dictCtx;
+    LZ4_u32 currentOffset;
+    LZ4_u32 tableType;
+    LZ4_u32 dictSize;
+    /* Implicit padding to ensure structure is aligned */
+};
+
+#define LZ4_STREAM_MINSIZE  ((1UL << LZ4_MEMORY_USAGE) + 32)  /* static size, for inter-version compatibility */
+union LZ4_stream_u {
+    char minStateSize[LZ4_STREAM_MINSIZE];
+    LZ4_stream_t_internal internal_donotuse;
+}; /* previously typedef'd to LZ4_stream_t */
+
+
+/*! LZ4_initStream() : v1.9.0+
+ *  An LZ4_stream_t structure must be initialized at least once.
+ *  This is automatically done when invoking LZ4_createStream(),
+ *  but it's not when the structure is simply declared on stack (for example).
+ *
+ *  Use LZ4_initStream() to properly initialize a newly declared LZ4_stream_t.
+ *  It can also initialize any arbitrary buffer of sufficient size,
+ *  and will @return a pointer of proper type upon initialization.
+ *
+ *  Note : initialization fails if size and alignment conditions are not respected.
+ *         In which case, the function will @return NULL.
+ *  Note2: An LZ4_stream_t structure guarantees correct alignment and size.
+ *  Note3: Before v1.9.0, use LZ4_resetStream() instead
+**/
+LZ4LIB_API LZ4_stream_t* LZ4_initStream (void* buffer, size_t size);
+
+
+/*! LZ4_streamDecode_t :
+ *  Never ever use below internal definitions directly !
+ *  These definitions are not API/ABI safe, and may change in future versions.
+ *  If you need static allocation, declare or allocate an LZ4_streamDecode_t object.
+**/
+typedef struct {
+    const LZ4_byte* externalDict;
+    const LZ4_byte* prefixEnd;
+    size_t extDictSize;
+    size_t prefixSize;
+} LZ4_streamDecode_t_internal;
+
+#define LZ4_STREAMDECODE_MINSIZE 32
+union LZ4_streamDecode_u {
+    char minStateSize[LZ4_STREAMDECODE_MINSIZE];
+    LZ4_streamDecode_t_internal internal_donotuse;
+} ;   /* previously typedef'd to LZ4_streamDecode_t */
+
+
+
+/*-************************************
+*  Obsolete Functions
+**************************************/
+
+/*! Deprecation warnings
+ *
+ *  Deprecated functions make the compiler generate a warning when invoked.
+ *  This is meant to invite users to update their source code.
+ *  Should deprecation warnings be a problem, it is generally possible to disable them,
+ *  typically with -Wno-deprecated-declarations for gcc
+ *  or _CRT_SECURE_NO_WARNINGS in Visual.
+ *
+ *  Another method is to define LZ4_DISABLE_DEPRECATE_WARNINGS
+ *  before including the header file.
+ */
+#ifdef LZ4_DISABLE_DEPRECATE_WARNINGS
+#  define LZ4_DEPRECATED(message)   /* disable deprecation warnings */
+#else
+#  if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
+#    define LZ4_DEPRECATED(message) [[deprecated(message)]]
+#  elif defined(_MSC_VER)
+#    define LZ4_DEPRECATED(message) __declspec(deprecated(message))
+#  elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 45))
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
+#  elif defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 31)
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated))
+#  else
+#    pragma message("WARNING: LZ4_DEPRECATED needs custom implementation for this compiler")
+#    define LZ4_DEPRECATED(message)   /* disabled */
+#  endif
+#endif /* LZ4_DISABLE_DEPRECATE_WARNINGS */
+
+/*! Obsolete compression functions (since v1.7.3) */
+LZ4_DEPRECATED("use LZ4_compress_default() instead")       LZ4LIB_API int LZ4_compress               (const char* src, char* dest, int srcSize);
+LZ4_DEPRECATED("use LZ4_compress_default() instead")       LZ4LIB_API int LZ4_compress_limitedOutput (const char* src, char* dest, int srcSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_withState               (void* state, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_continue                (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_limitedOutput_continue  (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
+
+/*! Obsolete decompression functions (since v1.8.0) */
+LZ4_DEPRECATED("use LZ4_decompress_fast() instead") LZ4LIB_API int LZ4_uncompress (const char* source, char* dest, int outputSize);
+LZ4_DEPRECATED("use LZ4_decompress_safe() instead") LZ4LIB_API int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize);
+
+/* Obsolete streaming functions (since v1.7.0)
+ * degraded functionality; do not use!
+ *
+ * In order to perform streaming compression, these functions depended on data
+ * that is no longer tracked in the state. They have been preserved as well as
+ * possible: using them will still produce a correct output. However, they don't
+ * actually retain any history between compression calls. The compression ratio
+ * achieved will therefore be no better than compressing each chunk
+ * independently.
+ */
+LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API void* LZ4_create (char* inputBuffer);
+LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API int   LZ4_sizeofStreamState(void);
+LZ4_DEPRECATED("Use LZ4_resetStream() instead")  LZ4LIB_API int   LZ4_resetStreamState(void* state, char* inputBuffer);
+LZ4_DEPRECATED("Use LZ4_saveDict() instead")     LZ4LIB_API char* LZ4_slideInputBuffer (void* state);
+
+/*! Obsolete streaming decoding functions (since v1.7.0) */
+LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead") LZ4LIB_API int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);
+LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") LZ4LIB_API int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);
+
+/*! Obsolete LZ4_decompress_fast variants (since v1.9.0) :
+ *  These functions used to be faster than LZ4_decompress_safe(),
+ *  but this is no longer the case. They are now slower.
+ *  This is because LZ4_decompress_fast() doesn't know the input size,
+ *  and therefore must progress more cautiously into the input buffer to not read beyond the end of block.
+ *  On top of that `LZ4_decompress_fast()` is not protected vs malformed or malicious inputs, making it a security liability.
+ *  As a consequence, LZ4_decompress_fast() is strongly discouraged, and deprecated.
+ *
+ *  The last remaining LZ4_decompress_fast() specificity is that
+ *  it can decompress a block without knowing its compressed size.
+ *  Such functionality can be achieved in a more secure manner
+ *  by employing LZ4_decompress_safe_partial().
+ *
+ *  Parameters:
+ *  originalSize : is the uncompressed size to regenerate.
+ *                 `dst` must be already allocated, its size must be >= 'originalSize' bytes.
+ * @return : number of bytes read from source buffer (== compressed size).
+ *           The function expects to finish at block's end exactly.
+ *           If the source stream is detected malformed, the function stops decoding and returns a negative result.
+ *  note : LZ4_decompress_fast*() requires originalSize. Thanks to this information, it never writes past the output buffer.
+ *         However, since it doesn't know its 'src' size, it may read an unknown amount of input, past input buffer bounds.
+ *         Also, since match offsets are not validated, match reads from 'src' may underflow too.
+ *         These issues never happen if input (compressed) data is correct.
+ *         But they may happen if input data is invalid (error or intentional tampering).
+ *         As a consequence, use these functions in trusted environments with trusted data **only**.
+ */
+LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe() instead")
+LZ4LIB_API int LZ4_decompress_fast (const char* src, char* dst, int originalSize);
+LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe_continue() instead")
+LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int originalSize);
+LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe_usingDict() instead")
+LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int originalSize, const char* dictStart, int dictSize);
+
+/*! LZ4_resetStream() :
+ *  An LZ4_stream_t structure must be initialized at least once.
+ *  This is done with LZ4_initStream(), or LZ4_resetStream().
+ *  Consider switching to LZ4_initStream(),
+ *  invoking LZ4_resetStream() will trigger deprecation warnings in the future.
+ */
+LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* streamPtr);
+
+
+#endif /* LZ4_H_98237428734687 */
+
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4file.c b/extra/lz4/lz4-1.9.4/lib/lz4file.c
new file mode 100644
index 000000000000..eaf9b1704d2b
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4file.c
@@ -0,0 +1,311 @@
+/*
+ * LZ4 file library
+ * Copyright (C) 2022, Xiaomi Inc.
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You can contact the author at :
+ * - LZ4 homepage : http://www.lz4.org
+ * - LZ4 source repository : https://github.com/lz4/lz4
+ */
+#include <stdlib.h>
+#include <string.h>
+#include "lz4.h"
+#include "lz4file.h"
+
+struct LZ4_readFile_s {
+  LZ4F_dctx* dctxPtr;
+  FILE* fp;
+  LZ4_byte* srcBuf;
+  size_t srcBufNext;
+  size_t srcBufSize;
+  size_t srcBufMaxSize;
+};
+
+struct LZ4_writeFile_s {
+  LZ4F_cctx* cctxPtr;
+  FILE* fp;
+  LZ4_byte* dstBuf;
+  size_t maxWriteSize;
+  size_t dstBufMaxSize;
+  LZ4F_errorCode_t errCode;
+};
+
+LZ4F_errorCode_t LZ4F_readOpen(LZ4_readFile_t** lz4fRead, FILE* fp)
+{
+  char buf[LZ4F_HEADER_SIZE_MAX];
+  size_t consumedSize;
+  LZ4F_errorCode_t ret;
+  LZ4F_frameInfo_t info;
+
+  if (fp == NULL || lz4fRead == NULL) {
+    return -LZ4F_ERROR_GENERIC;
+  }
+
+  *lz4fRead = (LZ4_readFile_t*)calloc(1, sizeof(LZ4_readFile_t));
+  if (*lz4fRead == NULL) {
+    return -LZ4F_ERROR_allocation_failed;
+  }
+
+  ret = LZ4F_createDecompressionContext(&(*lz4fRead)->dctxPtr, LZ4F_getVersion());
+  if (LZ4F_isError(ret)) {
+    free(*lz4fRead);
+    return ret;
+  }
+
+  (*lz4fRead)->fp = fp;
+  consumedSize = fread(buf, 1, sizeof(buf), (*lz4fRead)->fp);
+  if (consumedSize != sizeof(buf)) {
+    free(*lz4fRead);
+    return -LZ4F_ERROR_GENERIC;
+  }
+
+  ret = LZ4F_getFrameInfo((*lz4fRead)->dctxPtr, &info, buf, &consumedSize);
+  if (LZ4F_isError(ret)) {
+      LZ4F_freeDecompressionContext((*lz4fRead)->dctxPtr);
+      free(*lz4fRead);
+      return ret;
+    }
+
+  switch (info.blockSizeID) {
+    case LZ4F_default :
+    case LZ4F_max64KB :
+      (*lz4fRead)->srcBufMaxSize = 64 * 1024;
+      break;
+    case LZ4F_max256KB:
+      (*lz4fRead)->srcBufMaxSize = 256 * 1024;
+      break;
+    case LZ4F_max1MB:
+      (*lz4fRead)->srcBufMaxSize = 1 * 1024 * 1024;
+      break;
+    case LZ4F_max4MB:
+      (*lz4fRead)->srcBufMaxSize = 4 * 1024 * 1024;
+      break;
+    default:
+      LZ4F_freeDecompressionContext((*lz4fRead)->dctxPtr);
+      free(*lz4fRead);
+      return -LZ4F_ERROR_maxBlockSize_invalid;
+  }
+
+  (*lz4fRead)->srcBuf = (LZ4_byte*)malloc((*lz4fRead)->srcBufMaxSize);
+  if ((*lz4fRead)->srcBuf == NULL) {
+    LZ4F_freeDecompressionContext((*lz4fRead)->dctxPtr);
+    free(lz4fRead);
+    return -LZ4F_ERROR_allocation_failed;
+  }
+
+  (*lz4fRead)->srcBufSize = sizeof(buf) - consumedSize;
+  memcpy((*lz4fRead)->srcBuf, buf + consumedSize, (*lz4fRead)->srcBufSize);
+
+  return ret;
+}
+
+size_t LZ4F_read(LZ4_readFile_t* lz4fRead, void* buf, size_t size)
+{
+  LZ4_byte* p = (LZ4_byte*)buf;
+  size_t next = 0;
+
+  if (lz4fRead == NULL || buf == NULL)
+    return -LZ4F_ERROR_GENERIC;
+
+  while (next < size) {
+    size_t srcsize = lz4fRead->srcBufSize - lz4fRead->srcBufNext;
+    size_t dstsize = size - next;
+    size_t ret;
+
+    if (srcsize == 0) {
+      ret = fread(lz4fRead->srcBuf, 1, lz4fRead->srcBufMaxSize, lz4fRead->fp);
+      if (ret > 0) {
+        lz4fRead->srcBufSize = ret;
+        srcsize = lz4fRead->srcBufSize;
+        lz4fRead->srcBufNext = 0;
+      }
+      else if (ret == 0) {
+        break;
+      }
+      else {
+        return -LZ4F_ERROR_GENERIC;
+      }
+    }
+
+    ret = LZ4F_decompress(lz4fRead->dctxPtr,
+                          p, &dstsize,
+                          lz4fRead->srcBuf + lz4fRead->srcBufNext,
+                          &srcsize,
+                          NULL);
+    if (LZ4F_isError(ret)) {
+        return ret;
+    }
+
+    lz4fRead->srcBufNext += srcsize;
+    next += dstsize;
+    p += dstsize;
+  }
+
+  return next;
+}
+
+LZ4F_errorCode_t LZ4F_readClose(LZ4_readFile_t* lz4fRead)
+{
+  if (lz4fRead == NULL)
+    return -LZ4F_ERROR_GENERIC;
+  LZ4F_freeDecompressionContext(lz4fRead->dctxPtr);
+  free(lz4fRead->srcBuf);
+  free(lz4fRead);
+  return LZ4F_OK_NoError;
+}
+
+LZ4F_errorCode_t LZ4F_writeOpen(LZ4_writeFile_t** lz4fWrite, FILE* fp, const LZ4F_preferences_t* prefsPtr)
+{
+  LZ4_byte buf[LZ4F_HEADER_SIZE_MAX];
+  size_t ret;
+
+  if (fp == NULL || lz4fWrite == NULL)
+    return -LZ4F_ERROR_GENERIC;
+
+  *lz4fWrite = (LZ4_writeFile_t*)malloc(sizeof(LZ4_writeFile_t));
+  if (*lz4fWrite == NULL) {
+    return -LZ4F_ERROR_allocation_failed;
+  }
+  if (prefsPtr != NULL) {
+    switch (prefsPtr->frameInfo.blockSizeID) {
+      case LZ4F_default :
+      case LZ4F_max64KB :
+        (*lz4fWrite)->maxWriteSize = 64 * 1024;
+        break;
+      case LZ4F_max256KB:
+        (*lz4fWrite)->maxWriteSize = 256 * 1024;
+        break;
+      case LZ4F_max1MB:
+        (*lz4fWrite)->maxWriteSize = 1 * 1024 * 1024;
+        break;
+      case LZ4F_max4MB:
+        (*lz4fWrite)->maxWriteSize = 4 * 1024 * 1024;
+        break;
+      default:
+        free(lz4fWrite);
+        return -LZ4F_ERROR_maxBlockSize_invalid;
+      }
+    } else {
+      (*lz4fWrite)->maxWriteSize = 64 * 1024;
+    }
+
+  (*lz4fWrite)->dstBufMaxSize = LZ4F_compressBound((*lz4fWrite)->maxWriteSize, prefsPtr);
+  (*lz4fWrite)->dstBuf = (LZ4_byte*)malloc((*lz4fWrite)->dstBufMaxSize);
+  if ((*lz4fWrite)->dstBuf == NULL) {
+    free(*lz4fWrite);
+    return -LZ4F_ERROR_allocation_failed;
+  }
+
+  ret = LZ4F_createCompressionContext(&(*lz4fWrite)->cctxPtr, LZ4F_getVersion());
+  if (LZ4F_isError(ret)) {
+      free((*lz4fWrite)->dstBuf);
+      free(*lz4fWrite);
+      return ret;
+  }
+
+  ret = LZ4F_compressBegin((*lz4fWrite)->cctxPtr, buf, LZ4F_HEADER_SIZE_MAX, prefsPtr);
+  if (LZ4F_isError(ret)) {
+      LZ4F_freeCompressionContext((*lz4fWrite)->cctxPtr);
+      free((*lz4fWrite)->dstBuf);
+      free(*lz4fWrite);
+      return ret;
+  }
+
+  if (ret != fwrite(buf, 1, ret, fp)) {
+    LZ4F_freeCompressionContext((*lz4fWrite)->cctxPtr);
+    free((*lz4fWrite)->dstBuf);
+    free(*lz4fWrite);
+    return -LZ4F_ERROR_GENERIC;
+  }
+
+  (*lz4fWrite)->fp = fp;
+  (*lz4fWrite)->errCode = LZ4F_OK_NoError;
+  return LZ4F_OK_NoError;
+}
+
+size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, void* buf, size_t size)
+{
+  LZ4_byte* p = (LZ4_byte*)buf;
+  size_t remain = size;
+  size_t chunk;
+  size_t ret;
+
+  if (lz4fWrite == NULL || buf == NULL)
+    return -LZ4F_ERROR_GENERIC;
+  while (remain) {
+    if (remain > lz4fWrite->maxWriteSize)
+      chunk = lz4fWrite->maxWriteSize;
+    else
+      chunk = remain;
+
+    ret = LZ4F_compressUpdate(lz4fWrite->cctxPtr,
+                              lz4fWrite->dstBuf, lz4fWrite->dstBufMaxSize,
+                              p, chunk,
+                              NULL);
+    if (LZ4F_isError(ret)) {
+      lz4fWrite->errCode = ret;
+      return ret;
+    }
+
+    if(ret != fwrite(lz4fWrite->dstBuf, 1, ret, lz4fWrite->fp)) {
+      lz4fWrite->errCode = -LZ4F_ERROR_GENERIC;
+      return -LZ4F_ERROR_GENERIC;
+    }
+
+    p += chunk;
+    remain -= chunk;
+  }
+
+  return size;
+}
+
+LZ4F_errorCode_t LZ4F_writeClose(LZ4_writeFile_t* lz4fWrite)
+{
+  LZ4F_errorCode_t ret = LZ4F_OK_NoError;
+
+  if (lz4fWrite == NULL)
+    return -LZ4F_ERROR_GENERIC;
+
+  if (lz4fWrite->errCode == LZ4F_OK_NoError) {
+    ret =  LZ4F_compressEnd(lz4fWrite->cctxPtr,
+                            lz4fWrite->dstBuf, lz4fWrite->dstBufMaxSize,
+                            NULL);
+    if (LZ4F_isError(ret)) {
+      goto out;
+    }
+
+    if (ret != fwrite(lz4fWrite->dstBuf, 1, ret, lz4fWrite->fp)) {
+      ret = -LZ4F_ERROR_GENERIC;
+    }
+  }
+
+out:
+  LZ4F_freeCompressionContext(lz4fWrite->cctxPtr);
+  free(lz4fWrite->dstBuf);
+  free(lz4fWrite);
+  return ret;
+}
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4file.h b/extra/lz4/lz4-1.9.4/lib/lz4file.h
new file mode 100644
index 000000000000..5527130720fb
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4file.h
@@ -0,0 +1,93 @@
+/*
+   LZ4 file library
+   Header File
+   Copyright (C) 2022, Xiaomi Inc.
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/lz4/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#ifndef LZ4FILE_H
+#define LZ4FILE_H
+
+#include <stdio.h>
+#include "lz4frame_static.h"
+
+typedef struct LZ4_readFile_s LZ4_readFile_t;
+typedef struct LZ4_writeFile_s LZ4_writeFile_t;
+
+/*! LZ4F_readOpen() :
+ * Set read lz4file handle.
+ * `lz4f` will set a lz4file handle.
+ * `fp` must be the return value of the lz4 file opened by fopen.
+ */
+LZ4FLIB_STATIC_API LZ4F_errorCode_t LZ4F_readOpen(LZ4_readFile_t** lz4fRead, FILE* fp);
+
+/*! LZ4F_read() :
+ * Read lz4file content to buffer.
+ * `lz4f` must use LZ4_readOpen to set first.
+ * `buf` read data buffer.
+ * `size` read data buffer size.
+ */
+LZ4FLIB_STATIC_API size_t LZ4F_read(LZ4_readFile_t* lz4fRead, void* buf, size_t size);
+
+/*! LZ4F_readClose() :
+ * Close lz4file handle.
+ * `lz4f` must use LZ4_readOpen to set first.
+ */
+LZ4FLIB_STATIC_API LZ4F_errorCode_t LZ4F_readClose(LZ4_readFile_t* lz4fRead);
+
+/*! LZ4F_writeOpen() :
+ * Set write lz4file handle.
+ * `lz4f` will set a lz4file handle.
+ * `fp` must be the return value of the lz4 file opened by fopen.
+ */
+LZ4FLIB_STATIC_API LZ4F_errorCode_t LZ4F_writeOpen(LZ4_writeFile_t** lz4fWrite, FILE* fp, const LZ4F_preferences_t* prefsPtr);
+
+/*! LZ4F_write() :
+ * Write buffer to lz4file.
+ * `lz4f` must use LZ4F_writeOpen to set first.
+ * `buf` write data buffer.
+ * `size` write data buffer size.
+ */
+LZ4FLIB_STATIC_API size_t LZ4F_write(LZ4_writeFile_t* lz4fWrite, void* buf, size_t size);
+
+/*! LZ4F_writeClose() :
+ * Close lz4file handle.
+ * `lz4f` must use LZ4F_writeOpen to set first.
+ */
+LZ4FLIB_STATIC_API LZ4F_errorCode_t LZ4F_writeClose(LZ4_writeFile_t* lz4fWrite);
+
+#endif /* LZ4FILE_H */
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4frame.c b/extra/lz4/lz4-1.9.4/lib/lz4frame.c
new file mode 100644
index 000000000000..174f9ae4f217
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4frame.c
@@ -0,0 +1,2078 @@
+/*
+ * LZ4 auto-framing library
+ * Copyright (C) 2011-2016, Yann Collet.
+ *
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You can contact the author at :
+ * - LZ4 homepage : http://www.lz4.org
+ * - LZ4 source repository : https://github.com/lz4/lz4
+ */
+
+/* LZ4F is a stand-alone API to create LZ4-compressed Frames
+ * in full conformance with specification v1.6.1 .
+ * This library rely upon memory management capabilities (malloc, free)
+ * provided either by <stdlib.h>,
+ * or redirected towards another library of user's choice
+ * (see Memory Routines below).
+ */
+
+
+/*-************************************
+*  Compiler Options
+**************************************/
+#ifdef _MSC_VER    /* Visual Studio */
+#  pragma warning(disable : 4127)   /* disable: C4127: conditional expression is constant */
+#endif
+
+
+/*-************************************
+*  Tuning parameters
+**************************************/
+/*
+ * LZ4F_HEAPMODE :
+ * Select how default compression functions will allocate memory for their hash table,
+ * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()).
+ */
+#ifndef LZ4F_HEAPMODE
+#  define LZ4F_HEAPMODE 0
+#endif
+
+
+/*-************************************
+*  Library declarations
+**************************************/
+#define LZ4F_STATIC_LINKING_ONLY
+#include "lz4frame.h"
+#define LZ4_STATIC_LINKING_ONLY
+#include "lz4.h"
+#define LZ4_HC_STATIC_LINKING_ONLY
+#include "lz4hc.h"
+#define XXH_STATIC_LINKING_ONLY
+#include "xxhash.h"
+
+
+/*-************************************
+*  Memory routines
+**************************************/
+/*
+ * User may redirect invocations of
+ * malloc(), calloc() and free()
+ * towards another library or solution of their choice
+ * by modifying below section.
+**/
+
+#include <string.h>   /* memset, memcpy, memmove */
+#ifndef LZ4_SRC_INCLUDED  /* avoid redefinition when sources are coalesced */
+#  define MEM_INIT(p,v,s)   memset((p),(v),(s))
+#endif
+
+#ifndef LZ4_SRC_INCLUDED   /* avoid redefinition when sources are coalesced */
+#  include <stdlib.h>   /* malloc, calloc, free */
+#  define ALLOC(s)          malloc(s)
+#  define ALLOC_AND_ZERO(s) calloc(1,(s))
+#  define FREEMEM(p)        free(p)
+#endif
+
+static void* LZ4F_calloc(size_t s, LZ4F_CustomMem cmem)
+{
+    /* custom calloc defined : use it */
+    if (cmem.customCalloc != NULL) {
+        return cmem.customCalloc(cmem.opaqueState, s);
+    }
+    /* nothing defined : use default <stdlib.h>'s calloc() */
+    if (cmem.customAlloc == NULL) {
+        return ALLOC_AND_ZERO(s);
+    }
+    /* only custom alloc defined : use it, and combine it with memset() */
+    {   void* const p = cmem.customAlloc(cmem.opaqueState, s);
+        if (p != NULL) MEM_INIT(p, 0, s);
+        return p;
+}   }
+
+static void* LZ4F_malloc(size_t s, LZ4F_CustomMem cmem)
+{
+    /* custom malloc defined : use it */
+    if (cmem.customAlloc != NULL) {
+        return cmem.customAlloc(cmem.opaqueState, s);
+    }
+    /* nothing defined : use default <stdlib.h>'s malloc() */
+    return ALLOC(s);
+}
+
+static void LZ4F_free(void* p, LZ4F_CustomMem cmem)
+{
+    /* custom malloc defined : use it */
+    if (cmem.customFree != NULL) {
+        cmem.customFree(cmem.opaqueState, p);
+        return;
+    }
+    /* nothing defined : use default <stdlib.h>'s free() */
+    FREEMEM(p);
+}
+
+
+/*-************************************
+*  Debug
+**************************************/
+#if defined(LZ4_DEBUG) && (LZ4_DEBUG>=1)
+#  include <assert.h>
+#else
+#  ifndef assert
+#    define assert(condition) ((void)0)
+#  endif
+#endif
+
+#define LZ4F_STATIC_ASSERT(c)    { enum { LZ4F_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
+
+#if defined(LZ4_DEBUG) && (LZ4_DEBUG>=2) && !defined(DEBUGLOG)
+#  include <stdio.h>
+static int g_debuglog_enable = 1;
+#  define DEBUGLOG(l, ...) {                                  \
+                if ((g_debuglog_enable) && (l<=LZ4_DEBUG)) {  \
+                    fprintf(stderr, __FILE__ ": ");           \
+                    fprintf(stderr, __VA_ARGS__);             \
+                    fprintf(stderr, " \n");                   \
+            }   }
+#else
+#  define DEBUGLOG(l, ...)      {}    /* disabled */
+#endif
+
+
+/*-************************************
+*  Basic Types
+**************************************/
+#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+# include <stdint.h>
+  typedef  uint8_t BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
+#else
+  typedef unsigned char       BYTE;
+  typedef unsigned short      U16;
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+  typedef unsigned long long  U64;
+#endif
+
+
+/* unoptimized version; solves endianness & alignment issues */
+static U32 LZ4F_readLE32 (const void* src)
+{
+    const BYTE* const srcPtr = (const BYTE*)src;
+    U32 value32 = srcPtr[0];
+    value32 += ((U32)srcPtr[1])<< 8;
+    value32 += ((U32)srcPtr[2])<<16;
+    value32 += ((U32)srcPtr[3])<<24;
+    return value32;
+}
+
+static void LZ4F_writeLE32 (void* dst, U32 value32)
+{
+    BYTE* const dstPtr = (BYTE*)dst;
+    dstPtr[0] = (BYTE)value32;
+    dstPtr[1] = (BYTE)(value32 >> 8);
+    dstPtr[2] = (BYTE)(value32 >> 16);
+    dstPtr[3] = (BYTE)(value32 >> 24);
+}
+
+static U64 LZ4F_readLE64 (const void* src)
+{
+    const BYTE* const srcPtr = (const BYTE*)src;
+    U64 value64 = srcPtr[0];
+    value64 += ((U64)srcPtr[1]<<8);
+    value64 += ((U64)srcPtr[2]<<16);
+    value64 += ((U64)srcPtr[3]<<24);
+    value64 += ((U64)srcPtr[4]<<32);
+    value64 += ((U64)srcPtr[5]<<40);
+    value64 += ((U64)srcPtr[6]<<48);
+    value64 += ((U64)srcPtr[7]<<56);
+    return value64;
+}
+
+static void LZ4F_writeLE64 (void* dst, U64 value64)
+{
+    BYTE* const dstPtr = (BYTE*)dst;
+    dstPtr[0] = (BYTE)value64;
+    dstPtr[1] = (BYTE)(value64 >> 8);
+    dstPtr[2] = (BYTE)(value64 >> 16);
+    dstPtr[3] = (BYTE)(value64 >> 24);
+    dstPtr[4] = (BYTE)(value64 >> 32);
+    dstPtr[5] = (BYTE)(value64 >> 40);
+    dstPtr[6] = (BYTE)(value64 >> 48);
+    dstPtr[7] = (BYTE)(value64 >> 56);
+}
+
+
+/*-************************************
+*  Constants
+**************************************/
+#ifndef LZ4_SRC_INCLUDED   /* avoid double definition */
+#  define KB *(1<<10)
+#  define MB *(1<<20)
+#  define GB *(1<<30)
+#endif
+
+#define _1BIT  0x01
+#define _2BITS 0x03
+#define _3BITS 0x07
+#define _4BITS 0x0F
+#define _8BITS 0xFF
+
+#define LZ4F_BLOCKUNCOMPRESSED_FLAG 0x80000000U
+#define LZ4F_BLOCKSIZEID_DEFAULT LZ4F_max64KB
+
+static const size_t minFHSize = LZ4F_HEADER_SIZE_MIN;   /*  7 */
+static const size_t maxFHSize = LZ4F_HEADER_SIZE_MAX;   /* 19 */
+static const size_t BHSize = LZ4F_BLOCK_HEADER_SIZE;  /* block header : size, and compress flag */
+static const size_t BFSize = LZ4F_BLOCK_CHECKSUM_SIZE;  /* block footer : checksum (optional) */
+
+
+/*-************************************
+*  Structures and local types
+**************************************/
+
+typedef enum { LZ4B_COMPRESSED, LZ4B_UNCOMPRESSED} LZ4F_blockCompression_t;
+
+typedef struct LZ4F_cctx_s
+{
+    LZ4F_CustomMem cmem;
+    LZ4F_preferences_t prefs;
+    U32    version;
+    U32    cStage;
+    const LZ4F_CDict* cdict;
+    size_t maxBlockSize;
+    size_t maxBufferSize;
+    BYTE*  tmpBuff;    /* internal buffer, for streaming */
+    BYTE*  tmpIn;      /* starting position of data compress within internal buffer (>= tmpBuff) */
+    size_t tmpInSize;  /* amount of data to compress after tmpIn */
+    U64    totalInSize;
+    XXH32_state_t xxh;
+    void*  lz4CtxPtr;
+    U16    lz4CtxAlloc; /* sized for: 0 = none, 1 = lz4 ctx, 2 = lz4hc ctx */
+    U16    lz4CtxState; /* in use as: 0 = none, 1 = lz4 ctx, 2 = lz4hc ctx */
+    LZ4F_blockCompression_t  blockCompression;
+} LZ4F_cctx_t;
+
+
+/*-************************************
+*  Error management
+**************************************/
+#define LZ4F_GENERATE_STRING(STRING) #STRING,
+static const char* LZ4F_errorStrings[] = { LZ4F_LIST_ERRORS(LZ4F_GENERATE_STRING) };
+
+
+unsigned LZ4F_isError(LZ4F_errorCode_t code)
+{
+    return (code > (LZ4F_errorCode_t)(-LZ4F_ERROR_maxCode));
+}
+
+const char* LZ4F_getErrorName(LZ4F_errorCode_t code)
+{
+    static const char* codeError = "Unspecified error code";
+    if (LZ4F_isError(code)) return LZ4F_errorStrings[-(int)(code)];
+    return codeError;
+}
+
+LZ4F_errorCodes LZ4F_getErrorCode(size_t functionResult)
+{
+    if (!LZ4F_isError(functionResult)) return LZ4F_OK_NoError;
+    return (LZ4F_errorCodes)(-(ptrdiff_t)functionResult);
+}
+
+static LZ4F_errorCode_t LZ4F_returnErrorCode(LZ4F_errorCodes code)
+{
+    /* A compilation error here means sizeof(ptrdiff_t) is not large enough */
+    LZ4F_STATIC_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t));
+    return (LZ4F_errorCode_t)-(ptrdiff_t)code;
+}
+
+#define RETURN_ERROR(e) return LZ4F_returnErrorCode(LZ4F_ERROR_ ## e)
+
+#define RETURN_ERROR_IF(c,e) if (c) RETURN_ERROR(e)
+
+#define FORWARD_IF_ERROR(r)  if (LZ4F_isError(r)) return (r)
+
+unsigned LZ4F_getVersion(void) { return LZ4F_VERSION; }
+
+int LZ4F_compressionLevel_max(void) { return LZ4HC_CLEVEL_MAX; }
+
+size_t LZ4F_getBlockSize(LZ4F_blockSizeID_t blockSizeID)
+{
+    static const size_t blockSizes[4] = { 64 KB, 256 KB, 1 MB, 4 MB };
+
+    if (blockSizeID == 0) blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
+    if (blockSizeID < LZ4F_max64KB || blockSizeID > LZ4F_max4MB)
+        RETURN_ERROR(maxBlockSize_invalid);
+    {   int const blockSizeIdx = (int)blockSizeID - (int)LZ4F_max64KB;
+        return blockSizes[blockSizeIdx];
+}   }
+
+/*-************************************
+*  Private functions
+**************************************/
+#define MIN(a,b)   ( (a) < (b) ? (a) : (b) )
+
+static BYTE LZ4F_headerChecksum (const void* header, size_t length)
+{
+    U32 const xxh = XXH32(header, length, 0);
+    return (BYTE)(xxh >> 8);
+}
+
+
+/*-************************************
+*  Simple-pass compression functions
+**************************************/
+static LZ4F_blockSizeID_t LZ4F_optimalBSID(const LZ4F_blockSizeID_t requestedBSID,
+                                           const size_t srcSize)
+{
+    LZ4F_blockSizeID_t proposedBSID = LZ4F_max64KB;
+    size_t maxBlockSize = 64 KB;
+    while (requestedBSID > proposedBSID) {
+        if (srcSize <= maxBlockSize)
+            return proposedBSID;
+        proposedBSID = (LZ4F_blockSizeID_t)((int)proposedBSID + 1);
+        maxBlockSize <<= 2;
+    }
+    return requestedBSID;
+}
+
+/*! LZ4F_compressBound_internal() :
+ *  Provides dstCapacity given a srcSize to guarantee operation success in worst case situations.
+ *  prefsPtr is optional : if NULL is provided, preferences will be set to cover worst case scenario.
+ * @return is always the same for a srcSize and prefsPtr, so it can be relied upon to size reusable buffers.
+ *  When srcSize==0, LZ4F_compressBound() provides an upper bound for LZ4F_flush() and LZ4F_compressEnd() operations.
+ */
+static size_t LZ4F_compressBound_internal(size_t srcSize,
+                                    const LZ4F_preferences_t* preferencesPtr,
+                                          size_t alreadyBuffered)
+{
+    LZ4F_preferences_t prefsNull = LZ4F_INIT_PREFERENCES;
+    prefsNull.frameInfo.contentChecksumFlag = LZ4F_contentChecksumEnabled;   /* worst case */
+    prefsNull.frameInfo.blockChecksumFlag = LZ4F_blockChecksumEnabled;   /* worst case */
+    {   const LZ4F_preferences_t* const prefsPtr = (preferencesPtr==NULL) ? &prefsNull : preferencesPtr;
+        U32 const flush = prefsPtr->autoFlush | (srcSize==0);
+        LZ4F_blockSizeID_t const blockID = prefsPtr->frameInfo.blockSizeID;
+        size_t const blockSize = LZ4F_getBlockSize(blockID);
+        size_t const maxBuffered = blockSize - 1;
+        size_t const bufferedSize = MIN(alreadyBuffered, maxBuffered);
+        size_t const maxSrcSize = srcSize + bufferedSize;
+        unsigned const nbFullBlocks = (unsigned)(maxSrcSize / blockSize);
+        size_t const partialBlockSize = maxSrcSize & (blockSize-1);
+        size_t const lastBlockSize = flush ? partialBlockSize : 0;
+        unsigned const nbBlocks = nbFullBlocks + (lastBlockSize>0);
+
+        size_t const blockCRCSize = BFSize * prefsPtr->frameInfo.blockChecksumFlag;
+        size_t const frameEnd = BHSize + (prefsPtr->frameInfo.contentChecksumFlag*BFSize);
+
+        return ((BHSize + blockCRCSize) * nbBlocks) +
+               (blockSize * nbFullBlocks) + lastBlockSize + frameEnd;
+    }
+}
+
+size_t LZ4F_compressFrameBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr)
+{
+    LZ4F_preferences_t prefs;
+    size_t const headerSize = maxFHSize;      /* max header size, including optional fields */
+
+    if (preferencesPtr!=NULL) prefs = *preferencesPtr;
+    else MEM_INIT(&prefs, 0, sizeof(prefs));
+    prefs.autoFlush = 1;
+
+    return headerSize + LZ4F_compressBound_internal(srcSize, &prefs, 0);;
+}
+
+
+/*! LZ4F_compressFrame_usingCDict() :
+ *  Compress srcBuffer using a dictionary, in a single step.
+ *  cdict can be NULL, in which case, no dictionary is used.
+ *  dstBuffer MUST be >= LZ4F_compressFrameBound(srcSize, preferencesPtr).
+ *  The LZ4F_preferences_t structure is optional : you may provide NULL as argument,
+ *  however, it's the only way to provide a dictID, so it's not recommended.
+ * @return : number of bytes written into dstBuffer,
+ *           or an error code if it fails (can be tested using LZ4F_isError())
+ */
+size_t LZ4F_compressFrame_usingCDict(LZ4F_cctx* cctx,
+                                     void* dstBuffer, size_t dstCapacity,
+                               const void* srcBuffer, size_t srcSize,
+                               const LZ4F_CDict* cdict,
+                               const LZ4F_preferences_t* preferencesPtr)
+{
+    LZ4F_preferences_t prefs;
+    LZ4F_compressOptions_t options;
+    BYTE* const dstStart = (BYTE*) dstBuffer;
+    BYTE* dstPtr = dstStart;
+    BYTE* const dstEnd = dstStart + dstCapacity;
+
+    if (preferencesPtr!=NULL)
+        prefs = *preferencesPtr;
+    else
+        MEM_INIT(&prefs, 0, sizeof(prefs));
+    if (prefs.frameInfo.contentSize != 0)
+        prefs.frameInfo.contentSize = (U64)srcSize;   /* auto-correct content size if selected (!=0) */
+
+    prefs.frameInfo.blockSizeID = LZ4F_optimalBSID(prefs.frameInfo.blockSizeID, srcSize);
+    prefs.autoFlush = 1;
+    if (srcSize <= LZ4F_getBlockSize(prefs.frameInfo.blockSizeID))
+        prefs.frameInfo.blockMode = LZ4F_blockIndependent;   /* only one block => no need for inter-block link */
+
+    MEM_INIT(&options, 0, sizeof(options));
+    options.stableSrc = 1;
+
+    RETURN_ERROR_IF(dstCapacity < LZ4F_compressFrameBound(srcSize, &prefs), dstMaxSize_tooSmall);
+
+    { size_t const headerSize = LZ4F_compressBegin_usingCDict(cctx, dstBuffer, dstCapacity, cdict, &prefs);  /* write header */
+      FORWARD_IF_ERROR(headerSize);
+      dstPtr += headerSize;   /* header size */ }
+
+    assert(dstEnd >= dstPtr);
+    { size_t const cSize = LZ4F_compressUpdate(cctx, dstPtr, (size_t)(dstEnd-dstPtr), srcBuffer, srcSize, &options);
+      FORWARD_IF_ERROR(cSize);
+      dstPtr += cSize; }
+
+    assert(dstEnd >= dstPtr);
+    { size_t const tailSize = LZ4F_compressEnd(cctx, dstPtr, (size_t)(dstEnd-dstPtr), &options);   /* flush last block, and generate suffix */
+      FORWARD_IF_ERROR(tailSize);
+      dstPtr += tailSize; }
+
+    assert(dstEnd >= dstStart);
+    return (size_t)(dstPtr - dstStart);
+}
+
+
+/*! LZ4F_compressFrame() :
+ *  Compress an entire srcBuffer into a valid LZ4 frame, in a single step.
+ *  dstBuffer MUST be >= LZ4F_compressFrameBound(srcSize, preferencesPtr).
+ *  The LZ4F_preferences_t structure is optional : you can provide NULL as argument. All preferences will be set to default.
+ * @return : number of bytes written into dstBuffer.
+ *           or an error code if it fails (can be tested using LZ4F_isError())
+ */
+size_t LZ4F_compressFrame(void* dstBuffer, size_t dstCapacity,
+                    const void* srcBuffer, size_t srcSize,
+                    const LZ4F_preferences_t* preferencesPtr)
+{
+    size_t result;
+#if (LZ4F_HEAPMODE)
+    LZ4F_cctx_t* cctxPtr;
+    result = LZ4F_createCompressionContext(&cctxPtr, LZ4F_VERSION);
+    FORWARD_IF_ERROR(result);
+#else
+    LZ4F_cctx_t cctx;
+    LZ4_stream_t lz4ctx;
+    LZ4F_cctx_t* const cctxPtr = &cctx;
+
+    MEM_INIT(&cctx, 0, sizeof(cctx));
+    cctx.version = LZ4F_VERSION;
+    cctx.maxBufferSize = 5 MB;   /* mess with real buffer size to prevent dynamic allocation; works only because autoflush==1 & stableSrc==1 */
+    if ( preferencesPtr == NULL
+      || preferencesPtr->compressionLevel < LZ4HC_CLEVEL_MIN ) {
+        LZ4_initStream(&lz4ctx, sizeof(lz4ctx));
+        cctxPtr->lz4CtxPtr = &lz4ctx;
+        cctxPtr->lz4CtxAlloc = 1;
+        cctxPtr->lz4CtxState = 1;
+    }
+#endif
+    DEBUGLOG(4, "LZ4F_compressFrame");
+
+    result = LZ4F_compressFrame_usingCDict(cctxPtr, dstBuffer, dstCapacity,
+                                           srcBuffer, srcSize,
+                                           NULL, preferencesPtr);
+
+#if (LZ4F_HEAPMODE)
+    LZ4F_freeCompressionContext(cctxPtr);
+#else
+    if ( preferencesPtr != NULL
+      && preferencesPtr->compressionLevel >= LZ4HC_CLEVEL_MIN ) {
+        LZ4F_free(cctxPtr->lz4CtxPtr, cctxPtr->cmem);
+    }
+#endif
+    return result;
+}
+
+
+/*-***************************************************
+*   Dictionary compression
+*****************************************************/
+
+struct LZ4F_CDict_s {
+    LZ4F_CustomMem cmem;
+    void* dictContent;
+    LZ4_stream_t* fastCtx;
+    LZ4_streamHC_t* HCCtx;
+}; /* typedef'd to LZ4F_CDict within lz4frame_static.h */
+
+LZ4F_CDict*
+LZ4F_createCDict_advanced(LZ4F_CustomMem cmem, const void* dictBuffer, size_t dictSize)
+{
+    const char* dictStart = (const char*)dictBuffer;
+    LZ4F_CDict* const cdict = (LZ4F_CDict*)LZ4F_malloc(sizeof(*cdict), cmem);
+    DEBUGLOG(4, "LZ4F_createCDict_advanced");
+    if (!cdict) return NULL;
+    cdict->cmem = cmem;
+    if (dictSize > 64 KB) {
+        dictStart += dictSize - 64 KB;
+        dictSize = 64 KB;
+    }
+    cdict->dictContent = LZ4F_malloc(dictSize, cmem);
+    cdict->fastCtx = (LZ4_stream_t*)LZ4F_malloc(sizeof(LZ4_stream_t), cmem);
+    if (cdict->fastCtx)
+        LZ4_initStream(cdict->fastCtx, sizeof(LZ4_stream_t));
+    cdict->HCCtx = (LZ4_streamHC_t*)LZ4F_malloc(sizeof(LZ4_streamHC_t), cmem);
+    if (cdict->HCCtx)
+        LZ4_initStream(cdict->HCCtx, sizeof(LZ4_streamHC_t));
+    if (!cdict->dictContent || !cdict->fastCtx || !cdict->HCCtx) {
+        LZ4F_freeCDict(cdict);
+        return NULL;
+    }
+    memcpy(cdict->dictContent, dictStart, dictSize);
+    LZ4_loadDict (cdict->fastCtx, (const char*)cdict->dictContent, (int)dictSize);
+    LZ4_setCompressionLevel(cdict->HCCtx, LZ4HC_CLEVEL_DEFAULT);
+    LZ4_loadDictHC(cdict->HCCtx, (const char*)cdict->dictContent, (int)dictSize);
+    return cdict;
+}
+
+/*! LZ4F_createCDict() :
+ *  When compressing multiple messages / blocks with the same dictionary, it's recommended to load it just once.
+ *  LZ4F_createCDict() will create a digested dictionary, ready to start future compression operations without startup delay.
+ *  LZ4F_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only.
+ * @dictBuffer can be released after LZ4F_CDict creation, since its content is copied within CDict
+ * @return : digested dictionary for compression, or NULL if failed */
+LZ4F_CDict* LZ4F_createCDict(const void* dictBuffer, size_t dictSize)
+{
+    DEBUGLOG(4, "LZ4F_createCDict");
+    return LZ4F_createCDict_advanced(LZ4F_defaultCMem, dictBuffer, dictSize);
+}
+
+void LZ4F_freeCDict(LZ4F_CDict* cdict)
+{
+    if (cdict==NULL) return;  /* support free on NULL */
+    LZ4F_free(cdict->dictContent, cdict->cmem);
+    LZ4F_free(cdict->fastCtx, cdict->cmem);
+    LZ4F_free(cdict->HCCtx, cdict->cmem);
+    LZ4F_free(cdict, cdict->cmem);
+}
+
+
+/*-*********************************
+*  Advanced compression functions
+***********************************/
+
+LZ4F_cctx*
+LZ4F_createCompressionContext_advanced(LZ4F_CustomMem customMem, unsigned version)
+{
+    LZ4F_cctx* const cctxPtr =
+        (LZ4F_cctx*)LZ4F_calloc(sizeof(LZ4F_cctx), customMem);
+    if (cctxPtr==NULL) return NULL;
+
+    cctxPtr->cmem = customMem;
+    cctxPtr->version = version;
+    cctxPtr->cStage = 0;   /* Uninitialized. Next stage : init cctx */
+
+    return cctxPtr;
+}
+
+/*! LZ4F_createCompressionContext() :
+ *  The first thing to do is to create a compressionContext object, which will be used in all compression operations.
+ *  This is achieved using LZ4F_createCompressionContext(), which takes as argument a version and an LZ4F_preferences_t structure.
+ *  The version provided MUST be LZ4F_VERSION. It is intended to track potential incompatible differences between different binaries.
+ *  The function will provide a pointer to an allocated LZ4F_compressionContext_t object.
+ *  If the result LZ4F_errorCode_t is not OK_NoError, there was an error during context creation.
+ *  Object can release its memory using LZ4F_freeCompressionContext();
+**/
+LZ4F_errorCode_t
+LZ4F_createCompressionContext(LZ4F_cctx** LZ4F_compressionContextPtr, unsigned version)
+{
+    assert(LZ4F_compressionContextPtr != NULL); /* considered a violation of narrow contract */
+    /* in case it nonetheless happen in production */
+    RETURN_ERROR_IF(LZ4F_compressionContextPtr == NULL, parameter_null);
+
+    *LZ4F_compressionContextPtr = LZ4F_createCompressionContext_advanced(LZ4F_defaultCMem, version);
+    RETURN_ERROR_IF(*LZ4F_compressionContextPtr==NULL, allocation_failed);
+    return LZ4F_OK_NoError;
+}
+
+
+LZ4F_errorCode_t LZ4F_freeCompressionContext(LZ4F_cctx* cctxPtr)
+{
+    if (cctxPtr != NULL) {  /* support free on NULL */
+       LZ4F_free(cctxPtr->lz4CtxPtr, cctxPtr->cmem);  /* note: LZ4_streamHC_t and LZ4_stream_t are simple POD types */
+       LZ4F_free(cctxPtr->tmpBuff, cctxPtr->cmem);
+       LZ4F_free(cctxPtr, cctxPtr->cmem);
+    }
+    return LZ4F_OK_NoError;
+}
+
+
+/**
+ * This function prepares the internal LZ4(HC) stream for a new compression,
+ * resetting the context and attaching the dictionary, if there is one.
+ *
+ * It needs to be called at the beginning of each independent compression
+ * stream (i.e., at the beginning of a frame in blockLinked mode, or at the
+ * beginning of each block in blockIndependent mode).
+ */
+static void LZ4F_initStream(void* ctx,
+                            const LZ4F_CDict* cdict,
+                            int level,
+                            LZ4F_blockMode_t blockMode) {
+    if (level < LZ4HC_CLEVEL_MIN) {
+        if (cdict != NULL || blockMode == LZ4F_blockLinked) {
+            /* In these cases, we will call LZ4_compress_fast_continue(),
+             * which needs an already reset context. Otherwise, we'll call a
+             * one-shot API. The non-continued APIs internally perform their own
+             * resets at the beginning of their calls, where they know what
+             * tableType they need the context to be in. So in that case this
+             * would be misguided / wasted work. */
+            LZ4_resetStream_fast((LZ4_stream_t*)ctx);
+        }
+        LZ4_attach_dictionary((LZ4_stream_t *)ctx, cdict ? cdict->fastCtx : NULL);
+    } else {
+        LZ4_resetStreamHC_fast((LZ4_streamHC_t*)ctx, level);
+        LZ4_attach_HC_dictionary((LZ4_streamHC_t *)ctx, cdict ? cdict->HCCtx : NULL);
+    }
+}
+
+static int ctxTypeID_to_size(int ctxTypeID) {
+    switch(ctxTypeID) {
+    case 1:
+        return LZ4_sizeofState();
+    case 2:
+        return LZ4_sizeofStateHC();
+    default:
+        return 0;
+    }
+}
+
+/*! LZ4F_compressBegin_usingCDict() :
+ *  init streaming compression AND writes frame header into @dstBuffer.
+ * @dstCapacity must be >= LZ4F_HEADER_SIZE_MAX bytes.
+ * @return : number of bytes written into @dstBuffer for the header
+ *           or an error code (can be tested using LZ4F_isError())
+ */
+size_t LZ4F_compressBegin_usingCDict(LZ4F_cctx* cctxPtr,
+                          void* dstBuffer, size_t dstCapacity,
+                          const LZ4F_CDict* cdict,
+                          const LZ4F_preferences_t* preferencesPtr)
+{
+    LZ4F_preferences_t const prefNull = LZ4F_INIT_PREFERENCES;
+    BYTE* const dstStart = (BYTE*)dstBuffer;
+    BYTE* dstPtr = dstStart;
+
+    RETURN_ERROR_IF(dstCapacity < maxFHSize, dstMaxSize_tooSmall);
+    if (preferencesPtr == NULL) preferencesPtr = &prefNull;
+    cctxPtr->prefs = *preferencesPtr;
+
+    /* cctx Management */
+    {   U16 const ctxTypeID = (cctxPtr->prefs.compressionLevel < LZ4HC_CLEVEL_MIN) ? 1 : 2;
+        int requiredSize = ctxTypeID_to_size(ctxTypeID);
+        int allocatedSize = ctxTypeID_to_size(cctxPtr->lz4CtxAlloc);
+        if (allocatedSize < requiredSize) {
+            /* not enough space allocated */
+            LZ4F_free(cctxPtr->lz4CtxPtr, cctxPtr->cmem);
+            if (cctxPtr->prefs.compressionLevel < LZ4HC_CLEVEL_MIN) {
+                /* must take ownership of memory allocation,
+                 * in order to respect custom allocator contract */
+                cctxPtr->lz4CtxPtr = LZ4F_malloc(sizeof(LZ4_stream_t), cctxPtr->cmem);
+                if (cctxPtr->lz4CtxPtr)
+                    LZ4_initStream(cctxPtr->lz4CtxPtr, sizeof(LZ4_stream_t));
+            } else {
+                cctxPtr->lz4CtxPtr = LZ4F_malloc(sizeof(LZ4_streamHC_t), cctxPtr->cmem);
+                if (cctxPtr->lz4CtxPtr)
+                    LZ4_initStreamHC(cctxPtr->lz4CtxPtr, sizeof(LZ4_streamHC_t));
+            }
+            RETURN_ERROR_IF(cctxPtr->lz4CtxPtr == NULL, allocation_failed);
+            cctxPtr->lz4CtxAlloc = ctxTypeID;
+            cctxPtr->lz4CtxState = ctxTypeID;
+        } else if (cctxPtr->lz4CtxState != ctxTypeID) {
+            /* otherwise, a sufficient buffer is already allocated,
+             * but we need to reset it to the correct context type */
+            if (cctxPtr->prefs.compressionLevel < LZ4HC_CLEVEL_MIN) {
+                LZ4_initStream((LZ4_stream_t*)cctxPtr->lz4CtxPtr, sizeof(LZ4_stream_t));
+            } else {
+                LZ4_initStreamHC((LZ4_streamHC_t*)cctxPtr->lz4CtxPtr, sizeof(LZ4_streamHC_t));
+                LZ4_setCompressionLevel((LZ4_streamHC_t*)cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel);
+            }
+            cctxPtr->lz4CtxState = ctxTypeID;
+    }   }
+
+    /* Buffer Management */
+    if (cctxPtr->prefs.frameInfo.blockSizeID == 0)
+        cctxPtr->prefs.frameInfo.blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
+    cctxPtr->maxBlockSize = LZ4F_getBlockSize(cctxPtr->prefs.frameInfo.blockSizeID);
+
+    {   size_t const requiredBuffSize = preferencesPtr->autoFlush ?
+                ((cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked) ? 64 KB : 0) :  /* only needs past data up to window size */
+                cctxPtr->maxBlockSize + ((cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked) ? 128 KB : 0);
+
+        if (cctxPtr->maxBufferSize < requiredBuffSize) {
+            cctxPtr->maxBufferSize = 0;
+            LZ4F_free(cctxPtr->tmpBuff, cctxPtr->cmem);
+            cctxPtr->tmpBuff = (BYTE*)LZ4F_calloc(requiredBuffSize, cctxPtr->cmem);
+            RETURN_ERROR_IF(cctxPtr->tmpBuff == NULL, allocation_failed);
+            cctxPtr->maxBufferSize = requiredBuffSize;
+    }   }
+    cctxPtr->tmpIn = cctxPtr->tmpBuff;
+    cctxPtr->tmpInSize = 0;
+    (void)XXH32_reset(&(cctxPtr->xxh), 0);
+
+    /* context init */
+    cctxPtr->cdict = cdict;
+    if (cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked) {
+        /* frame init only for blockLinked : blockIndependent will be init at each block */
+        LZ4F_initStream(cctxPtr->lz4CtxPtr, cdict, cctxPtr->prefs.compressionLevel, LZ4F_blockLinked);
+    }
+    if (preferencesPtr->compressionLevel >= LZ4HC_CLEVEL_MIN) {
+        LZ4_favorDecompressionSpeed((LZ4_streamHC_t*)cctxPtr->lz4CtxPtr, (int)preferencesPtr->favorDecSpeed);
+    }
+
+    /* Magic Number */
+    LZ4F_writeLE32(dstPtr, LZ4F_MAGICNUMBER);
+    dstPtr += 4;
+    {   BYTE* const headerStart = dstPtr;
+
+        /* FLG Byte */
+        *dstPtr++ = (BYTE)(((1 & _2BITS) << 6)    /* Version('01') */
+            + ((cctxPtr->prefs.frameInfo.blockMode & _1BIT ) << 5)
+            + ((cctxPtr->prefs.frameInfo.blockChecksumFlag & _1BIT ) << 4)
+            + ((unsigned)(cctxPtr->prefs.frameInfo.contentSize > 0) << 3)
+            + ((cctxPtr->prefs.frameInfo.contentChecksumFlag & _1BIT ) << 2)
+            +  (cctxPtr->prefs.frameInfo.dictID > 0) );
+        /* BD Byte */
+        *dstPtr++ = (BYTE)((cctxPtr->prefs.frameInfo.blockSizeID & _3BITS) << 4);
+        /* Optional Frame content size field */
+        if (cctxPtr->prefs.frameInfo.contentSize) {
+            LZ4F_writeLE64(dstPtr, cctxPtr->prefs.frameInfo.contentSize);
+            dstPtr += 8;
+            cctxPtr->totalInSize = 0;
+        }
+        /* Optional dictionary ID field */
+        if (cctxPtr->prefs.frameInfo.dictID) {
+            LZ4F_writeLE32(dstPtr, cctxPtr->prefs.frameInfo.dictID);
+            dstPtr += 4;
+        }
+        /* Header CRC Byte */
+        *dstPtr = LZ4F_headerChecksum(headerStart, (size_t)(dstPtr - headerStart));
+        dstPtr++;
+    }
+
+    cctxPtr->cStage = 1;   /* header written, now request input data block */
+    return (size_t)(dstPtr - dstStart);
+}
+
+
+/*! LZ4F_compressBegin() :
+ *  init streaming compression AND writes frame header into @dstBuffer.
+ * @dstCapacity must be >= LZ4F_HEADER_SIZE_MAX bytes.
+ * @preferencesPtr can be NULL, in which case default parameters are selected.
+ * @return : number of bytes written into dstBuffer for the header
+ *        or an error code (can be tested using LZ4F_isError())
+ */
+size_t LZ4F_compressBegin(LZ4F_cctx* cctxPtr,
+                          void* dstBuffer, size_t dstCapacity,
+                          const LZ4F_preferences_t* preferencesPtr)
+{
+    return LZ4F_compressBegin_usingCDict(cctxPtr, dstBuffer, dstCapacity,
+                                         NULL, preferencesPtr);
+}
+
+
+/*  LZ4F_compressBound() :
+ * @return minimum capacity of dstBuffer for a given srcSize to handle worst case scenario.
+ *  LZ4F_preferences_t structure is optional : if NULL, preferences will be set to cover worst case scenario.
+ *  This function cannot fail.
+ */
+size_t LZ4F_compressBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr)
+{
+    if (preferencesPtr && preferencesPtr->autoFlush) {
+        return LZ4F_compressBound_internal(srcSize, preferencesPtr, 0);
+    }
+    return LZ4F_compressBound_internal(srcSize, preferencesPtr, (size_t)-1);
+}
+
+
+typedef int (*compressFunc_t)(void* ctx, const char* src, char* dst, int srcSize, int dstSize, int level, const LZ4F_CDict* cdict);
+
+
+/*! LZ4F_makeBlock():
+ *  compress a single block, add header and optional checksum.
+ *  assumption : dst buffer capacity is >= BHSize + srcSize + crcSize
+ */
+static size_t LZ4F_makeBlock(void* dst,
+                       const void* src, size_t srcSize,
+                             compressFunc_t compress, void* lz4ctx, int level,
+                       const LZ4F_CDict* cdict,
+                             LZ4F_blockChecksum_t crcFlag)
+{
+    BYTE* const cSizePtr = (BYTE*)dst;
+    U32 cSize;
+    assert(compress != NULL);
+    cSize = (U32)compress(lz4ctx, (const char*)src, (char*)(cSizePtr+BHSize),
+                          (int)(srcSize), (int)(srcSize-1),
+                          level, cdict);
+
+    if (cSize == 0 || cSize >= srcSize) {
+        cSize = (U32)srcSize;
+        LZ4F_writeLE32(cSizePtr, cSize | LZ4F_BLOCKUNCOMPRESSED_FLAG);
+        memcpy(cSizePtr+BHSize, src, srcSize);
+    } else {
+        LZ4F_writeLE32(cSizePtr, cSize);
+    }
+    if (crcFlag) {
+        U32 const crc32 = XXH32(cSizePtr+BHSize, cSize, 0);  /* checksum of compressed data */
+        LZ4F_writeLE32(cSizePtr+BHSize+cSize, crc32);
+    }
+    return BHSize + cSize + ((U32)crcFlag)*BFSize;
+}
+
+
+static int LZ4F_compressBlock(void* ctx, const char* src, char* dst, int srcSize, int dstCapacity, int level, const LZ4F_CDict* cdict)
+{
+    int const acceleration = (level < 0) ? -level + 1 : 1;
+    DEBUGLOG(5, "LZ4F_compressBlock (srcSize=%i)", srcSize);
+    LZ4F_initStream(ctx, cdict, level, LZ4F_blockIndependent);
+    if (cdict) {
+        return LZ4_compress_fast_continue((LZ4_stream_t*)ctx, src, dst, srcSize, dstCapacity, acceleration);
+    } else {
+        return LZ4_compress_fast_extState_fastReset(ctx, src, dst, srcSize, dstCapacity, acceleration);
+    }
+}
+
+static int LZ4F_compressBlock_continue(void* ctx, const char* src, char* dst, int srcSize, int dstCapacity, int level, const LZ4F_CDict* cdict)
+{
+    int const acceleration = (level < 0) ? -level + 1 : 1;
+    (void)cdict; /* init once at beginning of frame */
+    DEBUGLOG(5, "LZ4F_compressBlock_continue (srcSize=%i)", srcSize);
+    return LZ4_compress_fast_continue((LZ4_stream_t*)ctx, src, dst, srcSize, dstCapacity, acceleration);
+}
+
+static int LZ4F_compressBlockHC(void* ctx, const char* src, char* dst, int srcSize, int dstCapacity, int level, const LZ4F_CDict* cdict)
+{
+    LZ4F_initStream(ctx, cdict, level, LZ4F_blockIndependent);
+    if (cdict) {
+        return LZ4_compress_HC_continue((LZ4_streamHC_t*)ctx, src, dst, srcSize, dstCapacity);
+    }
+    return LZ4_compress_HC_extStateHC_fastReset(ctx, src, dst, srcSize, dstCapacity, level);
+}
+
+static int LZ4F_compressBlockHC_continue(void* ctx, const char* src, char* dst, int srcSize, int dstCapacity, int level, const LZ4F_CDict* cdict)
+{
+    (void)level; (void)cdict; /* init once at beginning of frame */
+    return LZ4_compress_HC_continue((LZ4_streamHC_t*)ctx, src, dst, srcSize, dstCapacity);
+}
+
+static int LZ4F_doNotCompressBlock(void* ctx, const char* src, char* dst, int srcSize, int dstCapacity, int level, const LZ4F_CDict* cdict)
+{
+    (void)ctx; (void)src; (void)dst; (void)srcSize; (void)dstCapacity; (void)level; (void)cdict;
+    return 0;
+}
+
+static compressFunc_t LZ4F_selectCompression(LZ4F_blockMode_t blockMode, int level, LZ4F_blockCompression_t  compressMode)
+{
+    if (compressMode == LZ4B_UNCOMPRESSED) return LZ4F_doNotCompressBlock;
+    if (level < LZ4HC_CLEVEL_MIN) {
+        if (blockMode == LZ4F_blockIndependent) return LZ4F_compressBlock;
+        return LZ4F_compressBlock_continue;
+    }
+    if (blockMode == LZ4F_blockIndependent) return LZ4F_compressBlockHC;
+    return LZ4F_compressBlockHC_continue;
+}
+
+/* Save history (up to 64KB) into @tmpBuff */
+static int LZ4F_localSaveDict(LZ4F_cctx_t* cctxPtr)
+{
+    if (cctxPtr->prefs.compressionLevel < LZ4HC_CLEVEL_MIN)
+        return LZ4_saveDict ((LZ4_stream_t*)(cctxPtr->lz4CtxPtr), (char*)(cctxPtr->tmpBuff), 64 KB);
+    return LZ4_saveDictHC ((LZ4_streamHC_t*)(cctxPtr->lz4CtxPtr), (char*)(cctxPtr->tmpBuff), 64 KB);
+}
+
+typedef enum { notDone, fromTmpBuffer, fromSrcBuffer } LZ4F_lastBlockStatus;
+
+static const LZ4F_compressOptions_t k_cOptionsNull = { 0, { 0, 0, 0 } };
+
+
+ /*! LZ4F_compressUpdateImpl() :
+ *  LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
+ *  When successful, the function always entirely consumes @srcBuffer.
+ *  src data is either buffered or compressed into @dstBuffer.
+ *  If the block compression does not match the compression of the previous block, the old data is flushed
+ *  and operations continue with the new compression mode.
+ * @dstCapacity MUST be >= LZ4F_compressBound(srcSize, preferencesPtr) when block compression is turned on.
+ * @compressOptionsPtr is optional : provide NULL to mean "default".
+ * @return : the number of bytes written into dstBuffer. It can be zero, meaning input data was just buffered.
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ *  After an error, the state is left in a UB state, and must be re-initialized.
+ */
+static size_t LZ4F_compressUpdateImpl(LZ4F_cctx* cctxPtr,
+                     void* dstBuffer, size_t dstCapacity,
+                     const void* srcBuffer, size_t srcSize,
+                     const LZ4F_compressOptions_t* compressOptionsPtr,
+                     LZ4F_blockCompression_t blockCompression)
+  {
+    size_t const blockSize = cctxPtr->maxBlockSize;
+    const BYTE* srcPtr = (const BYTE*)srcBuffer;
+    const BYTE* const srcEnd = srcPtr + srcSize;
+    BYTE* const dstStart = (BYTE*)dstBuffer;
+    BYTE* dstPtr = dstStart;
+    LZ4F_lastBlockStatus lastBlockCompressed = notDone;
+    compressFunc_t const compress = LZ4F_selectCompression(cctxPtr->prefs.frameInfo.blockMode, cctxPtr->prefs.compressionLevel, blockCompression);
+    size_t bytesWritten;
+    DEBUGLOG(4, "LZ4F_compressUpdate (srcSize=%zu)", srcSize);
+
+    RETURN_ERROR_IF(cctxPtr->cStage != 1, compressionState_uninitialized);   /* state must be initialized and waiting for next block */
+    if (dstCapacity < LZ4F_compressBound_internal(srcSize, &(cctxPtr->prefs), cctxPtr->tmpInSize))
+        RETURN_ERROR(dstMaxSize_tooSmall);
+
+    if (blockCompression == LZ4B_UNCOMPRESSED && dstCapacity < srcSize)
+        RETURN_ERROR(dstMaxSize_tooSmall);
+
+    /* flush currently written block, to continue with new block compression */
+    if (cctxPtr->blockCompression != blockCompression) {
+        bytesWritten = LZ4F_flush(cctxPtr, dstBuffer, dstCapacity, compressOptionsPtr);
+        dstPtr += bytesWritten;
+        cctxPtr->blockCompression = blockCompression;
+    }
+
+    if (compressOptionsPtr == NULL) compressOptionsPtr = &k_cOptionsNull;
+
+    /* complete tmp buffer */
+    if (cctxPtr->tmpInSize > 0) {   /* some data already within tmp buffer */
+        size_t const sizeToCopy = blockSize - cctxPtr->tmpInSize;
+        assert(blockSize > cctxPtr->tmpInSize);
+        if (sizeToCopy > srcSize) {
+            /* add src to tmpIn buffer */
+            memcpy(cctxPtr->tmpIn + cctxPtr->tmpInSize, srcBuffer, srcSize);
+            srcPtr = srcEnd;
+            cctxPtr->tmpInSize += srcSize;
+            /* still needs some CRC */
+        } else {
+            /* complete tmpIn block and then compress it */
+            lastBlockCompressed = fromTmpBuffer;
+            memcpy(cctxPtr->tmpIn + cctxPtr->tmpInSize, srcBuffer, sizeToCopy);
+            srcPtr += sizeToCopy;
+
+            dstPtr += LZ4F_makeBlock(dstPtr,
+                                     cctxPtr->tmpIn, blockSize,
+                                     compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel,
+                                     cctxPtr->cdict,
+                                     cctxPtr->prefs.frameInfo.blockChecksumFlag);
+            if (cctxPtr->prefs.frameInfo.blockMode==LZ4F_blockLinked) cctxPtr->tmpIn += blockSize;
+            cctxPtr->tmpInSize = 0;
+    }   }
+
+    while ((size_t)(srcEnd - srcPtr) >= blockSize) {
+        /* compress full blocks */
+        lastBlockCompressed = fromSrcBuffer;
+        dstPtr += LZ4F_makeBlock(dstPtr,
+                                 srcPtr, blockSize,
+                                 compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel,
+                                 cctxPtr->cdict,
+                                 cctxPtr->prefs.frameInfo.blockChecksumFlag);
+        srcPtr += blockSize;
+    }
+
+    if ((cctxPtr->prefs.autoFlush) && (srcPtr < srcEnd)) {
+        /* autoFlush : remaining input (< blockSize) is compressed */
+        lastBlockCompressed = fromSrcBuffer;
+        dstPtr += LZ4F_makeBlock(dstPtr,
+                                 srcPtr, (size_t)(srcEnd - srcPtr),
+                                 compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel,
+                                 cctxPtr->cdict,
+                                 cctxPtr->prefs.frameInfo.blockChecksumFlag);
+        srcPtr = srcEnd;
+    }
+
+    /* preserve dictionary within @tmpBuff whenever necessary */
+    if ((cctxPtr->prefs.frameInfo.blockMode==LZ4F_blockLinked) && (lastBlockCompressed==fromSrcBuffer)) {
+        /* linked blocks are only supported in compressed mode, see LZ4F_uncompressedUpdate */
+        assert(blockCompression == LZ4B_COMPRESSED);
+        if (compressOptionsPtr->stableSrc) {
+            cctxPtr->tmpIn = cctxPtr->tmpBuff;  /* src is stable : dictionary remains in src across invocations */
+        } else {
+            int const realDictSize = LZ4F_localSaveDict(cctxPtr);
+            assert(0 <= realDictSize && realDictSize <= 64 KB);
+            cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
+        }
+    }
+
+    /* keep tmpIn within limits */
+    if (!(cctxPtr->prefs.autoFlush)  /* no autoflush : there may be some data left within internal buffer */
+      && (cctxPtr->tmpIn + blockSize) > (cctxPtr->tmpBuff + cctxPtr->maxBufferSize) )  /* not enough room to store next block */
+    {
+        /* only preserve 64KB within internal buffer. Ensures there is enough room for next block.
+         * note: this situation necessarily implies lastBlockCompressed==fromTmpBuffer */
+        int const realDictSize = LZ4F_localSaveDict(cctxPtr);
+        cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
+        assert((cctxPtr->tmpIn + blockSize) <= (cctxPtr->tmpBuff + cctxPtr->maxBufferSize));
+    }
+
+    /* some input data left, necessarily < blockSize */
+    if (srcPtr < srcEnd) {
+        /* fill tmp buffer */
+        size_t const sizeToCopy = (size_t)(srcEnd - srcPtr);
+        memcpy(cctxPtr->tmpIn, srcPtr, sizeToCopy);
+        cctxPtr->tmpInSize = sizeToCopy;
+    }
+
+    if (cctxPtr->prefs.frameInfo.contentChecksumFlag == LZ4F_contentChecksumEnabled)
+        (void)XXH32_update(&(cctxPtr->xxh), srcBuffer, srcSize);
+
+    cctxPtr->totalInSize += srcSize;
+    return (size_t)(dstPtr - dstStart);
+}
+
+/*! LZ4F_compressUpdate() :
+ *  LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
+ *  When successful, the function always entirely consumes @srcBuffer.
+ *  src data is either buffered or compressed into @dstBuffer.
+ *  If previously an uncompressed block was written, buffered data is flushed
+ *  before appending compressed data is continued.
+ * @dstCapacity MUST be >= LZ4F_compressBound(srcSize, preferencesPtr).
+ * @compressOptionsPtr is optional : provide NULL to mean "default".
+ * @return : the number of bytes written into dstBuffer. It can be zero, meaning input data was just buffered.
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ *  After an error, the state is left in a UB state, and must be re-initialized.
+ */
+size_t LZ4F_compressUpdate(LZ4F_cctx* cctxPtr,
+                           void* dstBuffer, size_t dstCapacity,
+                     const void* srcBuffer, size_t srcSize,
+                     const LZ4F_compressOptions_t* compressOptionsPtr)
+{
+     return LZ4F_compressUpdateImpl(cctxPtr,
+                                   dstBuffer, dstCapacity,
+                                   srcBuffer, srcSize,
+                                   compressOptionsPtr, LZ4B_COMPRESSED);
+}
+
+/*! LZ4F_compressUpdate() :
+ *  LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
+ *  When successful, the function always entirely consumes @srcBuffer.
+ *  src data is either buffered or compressed into @dstBuffer.
+ *  If previously an uncompressed block was written, buffered data is flushed
+ *  before appending compressed data is continued.
+ *  This is only supported when LZ4F_blockIndependent is used
+ * @dstCapacity MUST be >= LZ4F_compressBound(srcSize, preferencesPtr).
+ * @compressOptionsPtr is optional : provide NULL to mean "default".
+ * @return : the number of bytes written into dstBuffer. It can be zero, meaning input data was just buffered.
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ *  After an error, the state is left in a UB state, and must be re-initialized.
+ */
+size_t LZ4F_uncompressedUpdate(LZ4F_cctx* cctxPtr,
+                               void* dstBuffer, size_t dstCapacity,
+                         const void* srcBuffer, size_t srcSize,
+                         const LZ4F_compressOptions_t* compressOptionsPtr) {
+    RETURN_ERROR_IF(cctxPtr->prefs.frameInfo.blockMode != LZ4F_blockIndependent, blockMode_invalid);
+    return LZ4F_compressUpdateImpl(cctxPtr,
+                                   dstBuffer, dstCapacity,
+                                   srcBuffer, srcSize,
+                                   compressOptionsPtr, LZ4B_UNCOMPRESSED);
+}
+
+
+/*! LZ4F_flush() :
+ *  When compressed data must be sent immediately, without waiting for a block to be filled,
+ *  invoke LZ4_flush(), which will immediately compress any remaining data stored within LZ4F_cctx.
+ *  The result of the function is the number of bytes written into dstBuffer.
+ *  It can be zero, this means there was no data left within LZ4F_cctx.
+ *  The function outputs an error code if it fails (can be tested using LZ4F_isError())
+ *  LZ4F_compressOptions_t* is optional. NULL is a valid argument.
+ */
+size_t LZ4F_flush(LZ4F_cctx* cctxPtr,
+                  void* dstBuffer, size_t dstCapacity,
+            const LZ4F_compressOptions_t* compressOptionsPtr)
+{
+    BYTE* const dstStart = (BYTE*)dstBuffer;
+    BYTE* dstPtr = dstStart;
+    compressFunc_t compress;
+
+    if (cctxPtr->tmpInSize == 0) return 0;   /* nothing to flush */
+    RETURN_ERROR_IF(cctxPtr->cStage != 1, compressionState_uninitialized);
+    RETURN_ERROR_IF(dstCapacity < (cctxPtr->tmpInSize + BHSize + BFSize), dstMaxSize_tooSmall);
+    (void)compressOptionsPtr;   /* not useful (yet) */
+
+    /* select compression function */
+    compress = LZ4F_selectCompression(cctxPtr->prefs.frameInfo.blockMode, cctxPtr->prefs.compressionLevel, cctxPtr->blockCompression);
+
+    /* compress tmp buffer */
+    dstPtr += LZ4F_makeBlock(dstPtr,
+                             cctxPtr->tmpIn, cctxPtr->tmpInSize,
+                             compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel,
+                             cctxPtr->cdict,
+                             cctxPtr->prefs.frameInfo.blockChecksumFlag);
+    assert(((void)"flush overflows dstBuffer!", (size_t)(dstPtr - dstStart) <= dstCapacity));
+
+    if (cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked)
+        cctxPtr->tmpIn += cctxPtr->tmpInSize;
+    cctxPtr->tmpInSize = 0;
+
+    /* keep tmpIn within limits */
+    if ((cctxPtr->tmpIn + cctxPtr->maxBlockSize) > (cctxPtr->tmpBuff + cctxPtr->maxBufferSize)) {  /* necessarily LZ4F_blockLinked */
+        int const realDictSize = LZ4F_localSaveDict(cctxPtr);
+        cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
+    }
+
+    return (size_t)(dstPtr - dstStart);
+}
+
+
+/*! LZ4F_compressEnd() :
+ *  When you want to properly finish the compressed frame, just call LZ4F_compressEnd().
+ *  It will flush whatever data remained within compressionContext (like LZ4_flush())
+ *  but also properly finalize the frame, with an endMark and an (optional) checksum.
+ *  LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
+ * @return: the number of bytes written into dstBuffer (necessarily >= 4 (endMark size))
+ *       or an error code if it fails (can be tested using LZ4F_isError())
+ *  The context can then be used again to compress a new frame, starting with LZ4F_compressBegin().
+ */
+size_t LZ4F_compressEnd(LZ4F_cctx* cctxPtr,
+                        void* dstBuffer, size_t dstCapacity,
+                  const LZ4F_compressOptions_t* compressOptionsPtr)
+{
+    BYTE* const dstStart = (BYTE*)dstBuffer;
+    BYTE* dstPtr = dstStart;
+
+    size_t const flushSize = LZ4F_flush(cctxPtr, dstBuffer, dstCapacity, compressOptionsPtr);
+    DEBUGLOG(5,"LZ4F_compressEnd: dstCapacity=%u", (unsigned)dstCapacity);
+    FORWARD_IF_ERROR(flushSize);
+    dstPtr += flushSize;
+
+    assert(flushSize <= dstCapacity);
+    dstCapacity -= flushSize;
+
+    RETURN_ERROR_IF(dstCapacity < 4, dstMaxSize_tooSmall);
+    LZ4F_writeLE32(dstPtr, 0);
+    dstPtr += 4;   /* endMark */
+
+    if (cctxPtr->prefs.frameInfo.contentChecksumFlag == LZ4F_contentChecksumEnabled) {
+        U32 const xxh = XXH32_digest(&(cctxPtr->xxh));
+        RETURN_ERROR_IF(dstCapacity < 8, dstMaxSize_tooSmall);
+        DEBUGLOG(5,"Writing 32-bit content checksum");
+        LZ4F_writeLE32(dstPtr, xxh);
+        dstPtr+=4;   /* content Checksum */
+    }
+
+    cctxPtr->cStage = 0;   /* state is now re-usable (with identical preferences) */
+    cctxPtr->maxBufferSize = 0;  /* reuse HC context */
+
+    if (cctxPtr->prefs.frameInfo.contentSize) {
+        if (cctxPtr->prefs.frameInfo.contentSize != cctxPtr->totalInSize)
+            RETURN_ERROR(frameSize_wrong);
+    }
+
+    return (size_t)(dstPtr - dstStart);
+}
+
+
+/*-***************************************************
+*   Frame Decompression
+*****************************************************/
+
+typedef enum {
+    dstage_getFrameHeader=0, dstage_storeFrameHeader,
+    dstage_init,
+    dstage_getBlockHeader, dstage_storeBlockHeader,
+    dstage_copyDirect, dstage_getBlockChecksum,
+    dstage_getCBlock, dstage_storeCBlock,
+    dstage_flushOut,
+    dstage_getSuffix, dstage_storeSuffix,
+    dstage_getSFrameSize, dstage_storeSFrameSize,
+    dstage_skipSkippable
+} dStage_t;
+
+struct LZ4F_dctx_s {
+    LZ4F_CustomMem cmem;
+    LZ4F_frameInfo_t frameInfo;
+    U32    version;
+    dStage_t dStage;
+    U64    frameRemainingSize;
+    size_t maxBlockSize;
+    size_t maxBufferSize;
+    BYTE*  tmpIn;
+    size_t tmpInSize;
+    size_t tmpInTarget;
+    BYTE*  tmpOutBuffer;
+    const BYTE* dict;
+    size_t dictSize;
+    BYTE*  tmpOut;
+    size_t tmpOutSize;
+    size_t tmpOutStart;
+    XXH32_state_t xxh;
+    XXH32_state_t blockChecksum;
+    int    skipChecksum;
+    BYTE   header[LZ4F_HEADER_SIZE_MAX];
+};  /* typedef'd to LZ4F_dctx in lz4frame.h */
+
+
+LZ4F_dctx* LZ4F_createDecompressionContext_advanced(LZ4F_CustomMem customMem, unsigned version)
+{
+    LZ4F_dctx* const dctx = (LZ4F_dctx*)LZ4F_calloc(sizeof(LZ4F_dctx), customMem);
+    if (dctx == NULL) return NULL;
+
+    dctx->cmem = customMem;
+    dctx->version = version;
+    return dctx;
+}
+
+/*! LZ4F_createDecompressionContext() :
+ *  Create a decompressionContext object, which will track all decompression operations.
+ *  Provides a pointer to a fully allocated and initialized LZ4F_decompressionContext object.
+ *  Object can later be released using LZ4F_freeDecompressionContext().
+ * @return : if != 0, there was an error during context creation.
+ */
+LZ4F_errorCode_t
+LZ4F_createDecompressionContext(LZ4F_dctx** LZ4F_decompressionContextPtr, unsigned versionNumber)
+{
+    assert(LZ4F_decompressionContextPtr != NULL);  /* violation of narrow contract */
+    RETURN_ERROR_IF(LZ4F_decompressionContextPtr == NULL, parameter_null);  /* in case it nonetheless happen in production */
+
+    *LZ4F_decompressionContextPtr = LZ4F_createDecompressionContext_advanced(LZ4F_defaultCMem, versionNumber);
+    if (*LZ4F_decompressionContextPtr == NULL) {  /* failed allocation */
+        RETURN_ERROR(allocation_failed);
+    }
+    return LZ4F_OK_NoError;
+}
+
+LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_dctx* dctx)
+{
+    LZ4F_errorCode_t result = LZ4F_OK_NoError;
+    if (dctx != NULL) {   /* can accept NULL input, like free() */
+      result = (LZ4F_errorCode_t)dctx->dStage;
+      LZ4F_free(dctx->tmpIn, dctx->cmem);
+      LZ4F_free(dctx->tmpOutBuffer, dctx->cmem);
+      LZ4F_free(dctx, dctx->cmem);
+    }
+    return result;
+}
+
+
+/*==---   Streaming Decompression operations   ---==*/
+
+void LZ4F_resetDecompressionContext(LZ4F_dctx* dctx)
+{
+    dctx->dStage = dstage_getFrameHeader;
+    dctx->dict = NULL;
+    dctx->dictSize = 0;
+    dctx->skipChecksum = 0;
+}
+
+
+/*! LZ4F_decodeHeader() :
+ *  input   : `src` points at the **beginning of the frame**
+ *  output  : set internal values of dctx, such as
+ *            dctx->frameInfo and dctx->dStage.
+ *            Also allocates internal buffers.
+ *  @return : nb Bytes read from src (necessarily <= srcSize)
+ *            or an error code (testable with LZ4F_isError())
+ */
+static size_t LZ4F_decodeHeader(LZ4F_dctx* dctx, const void* src, size_t srcSize)
+{
+    unsigned blockMode, blockChecksumFlag, contentSizeFlag, contentChecksumFlag, dictIDFlag, blockSizeID;
+    size_t frameHeaderSize;
+    const BYTE* srcPtr = (const BYTE*)src;
+
+    DEBUGLOG(5, "LZ4F_decodeHeader");
+    /* need to decode header to get frameInfo */
+    RETURN_ERROR_IF(srcSize < minFHSize, frameHeader_incomplete);   /* minimal frame header size */
+    MEM_INIT(&(dctx->frameInfo), 0, sizeof(dctx->frameInfo));
+
+    /* special case : skippable frames */
+    if ((LZ4F_readLE32(srcPtr) & 0xFFFFFFF0U) == LZ4F_MAGIC_SKIPPABLE_START) {
+        dctx->frameInfo.frameType = LZ4F_skippableFrame;
+        if (src == (void*)(dctx->header)) {
+            dctx->tmpInSize = srcSize;
+            dctx->tmpInTarget = 8;
+            dctx->dStage = dstage_storeSFrameSize;
+            return srcSize;
+        } else {
+            dctx->dStage = dstage_getSFrameSize;
+            return 4;
+    }   }
+
+    /* control magic number */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    if (LZ4F_readLE32(srcPtr) != LZ4F_MAGICNUMBER) {
+        DEBUGLOG(4, "frame header error : unknown magic number");
+        RETURN_ERROR(frameType_unknown);
+    }
+#endif
+    dctx->frameInfo.frameType = LZ4F_frame;
+
+    /* Flags */
+    {   U32 const FLG = srcPtr[4];
+        U32 const version = (FLG>>6) & _2BITS;
+        blockChecksumFlag = (FLG>>4) & _1BIT;
+        blockMode = (FLG>>5) & _1BIT;
+        contentSizeFlag = (FLG>>3) & _1BIT;
+        contentChecksumFlag = (FLG>>2) & _1BIT;
+        dictIDFlag = FLG & _1BIT;
+        /* validate */
+        if (((FLG>>1)&_1BIT) != 0) RETURN_ERROR(reservedFlag_set); /* Reserved bit */
+        if (version != 1) RETURN_ERROR(headerVersion_wrong);       /* Version Number, only supported value */
+    }
+
+    /* Frame Header Size */
+    frameHeaderSize = minFHSize + (contentSizeFlag?8:0) + (dictIDFlag?4:0);
+
+    if (srcSize < frameHeaderSize) {
+        /* not enough input to fully decode frame header */
+        if (srcPtr != dctx->header)
+            memcpy(dctx->header, srcPtr, srcSize);
+        dctx->tmpInSize = srcSize;
+        dctx->tmpInTarget = frameHeaderSize;
+        dctx->dStage = dstage_storeFrameHeader;
+        return srcSize;
+    }
+
+    {   U32 const BD = srcPtr[5];
+        blockSizeID = (BD>>4) & _3BITS;
+        /* validate */
+        if (((BD>>7)&_1BIT) != 0) RETURN_ERROR(reservedFlag_set);   /* Reserved bit */
+        if (blockSizeID < 4) RETURN_ERROR(maxBlockSize_invalid);    /* 4-7 only supported values for the time being */
+        if (((BD>>0)&_4BITS) != 0) RETURN_ERROR(reservedFlag_set);  /* Reserved bits */
+    }
+
+    /* check header */
+    assert(frameHeaderSize > 5);
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    {   BYTE const HC = LZ4F_headerChecksum(srcPtr+4, frameHeaderSize-5);
+        RETURN_ERROR_IF(HC != srcPtr[frameHeaderSize-1], headerChecksum_invalid);
+    }
+#endif
+
+    /* save */
+    dctx->frameInfo.blockMode = (LZ4F_blockMode_t)blockMode;
+    dctx->frameInfo.blockChecksumFlag = (LZ4F_blockChecksum_t)blockChecksumFlag;
+    dctx->frameInfo.contentChecksumFlag = (LZ4F_contentChecksum_t)contentChecksumFlag;
+    dctx->frameInfo.blockSizeID = (LZ4F_blockSizeID_t)blockSizeID;
+    dctx->maxBlockSize = LZ4F_getBlockSize((LZ4F_blockSizeID_t)blockSizeID);
+    if (contentSizeFlag)
+        dctx->frameRemainingSize = dctx->frameInfo.contentSize = LZ4F_readLE64(srcPtr+6);
+    if (dictIDFlag)
+        dctx->frameInfo.dictID = LZ4F_readLE32(srcPtr + frameHeaderSize - 5);
+
+    dctx->dStage = dstage_init;
+
+    return frameHeaderSize;
+}
+
+
+/*! LZ4F_headerSize() :
+ * @return : size of frame header
+ *           or an error code, which can be tested using LZ4F_isError()
+ */
+size_t LZ4F_headerSize(const void* src, size_t srcSize)
+{
+    RETURN_ERROR_IF(src == NULL, srcPtr_wrong);
+
+    /* minimal srcSize to determine header size */
+    if (srcSize < LZ4F_MIN_SIZE_TO_KNOW_HEADER_LENGTH)
+        RETURN_ERROR(frameHeader_incomplete);
+
+    /* special case : skippable frames */
+    if ((LZ4F_readLE32(src) & 0xFFFFFFF0U) == LZ4F_MAGIC_SKIPPABLE_START)
+        return 8;
+
+    /* control magic number */
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    if (LZ4F_readLE32(src) != LZ4F_MAGICNUMBER)
+        RETURN_ERROR(frameType_unknown);
+#endif
+
+    /* Frame Header Size */
+    {   BYTE const FLG = ((const BYTE*)src)[4];
+        U32 const contentSizeFlag = (FLG>>3) & _1BIT;
+        U32 const dictIDFlag = FLG & _1BIT;
+        return minFHSize + (contentSizeFlag?8:0) + (dictIDFlag?4:0);
+    }
+}
+
+/*! LZ4F_getFrameInfo() :
+ *  This function extracts frame parameters (max blockSize, frame checksum, etc.).
+ *  Usage is optional. Objective is to provide relevant information for allocation purposes.
+ *  This function works in 2 situations :
+ *   - At the beginning of a new frame, in which case it will decode this information from `srcBuffer`, and start the decoding process.
+ *     Amount of input data provided must be large enough to successfully decode the frame header.
+ *     A header size is variable, but is guaranteed to be <= LZ4F_HEADER_SIZE_MAX bytes. It's possible to provide more input data than this minimum.
+ *   - After decoding has been started. In which case, no input is read, frame parameters are extracted from dctx.
+ *  The number of bytes consumed from srcBuffer will be updated within *srcSizePtr (necessarily <= original value).
+ *  Decompression must resume from (srcBuffer + *srcSizePtr).
+ * @return : an hint about how many srcSize bytes LZ4F_decompress() expects for next call,
+ *           or an error code which can be tested using LZ4F_isError()
+ *  note 1 : in case of error, dctx is not modified. Decoding operations can resume from where they stopped.
+ *  note 2 : frame parameters are *copied into* an already allocated LZ4F_frameInfo_t structure.
+ */
+LZ4F_errorCode_t LZ4F_getFrameInfo(LZ4F_dctx* dctx,
+                                   LZ4F_frameInfo_t* frameInfoPtr,
+                             const void* srcBuffer, size_t* srcSizePtr)
+{
+    LZ4F_STATIC_ASSERT(dstage_getFrameHeader < dstage_storeFrameHeader);
+    if (dctx->dStage > dstage_storeFrameHeader) {
+        /* frameInfo already decoded */
+        size_t o=0, i=0;
+        *srcSizePtr = 0;
+        *frameInfoPtr = dctx->frameInfo;
+        /* returns : recommended nb of bytes for LZ4F_decompress() */
+        return LZ4F_decompress(dctx, NULL, &o, NULL, &i, NULL);
+    } else {
+        if (dctx->dStage == dstage_storeFrameHeader) {
+            /* frame decoding already started, in the middle of header => automatic fail */
+            *srcSizePtr = 0;
+            RETURN_ERROR(frameDecoding_alreadyStarted);
+        } else {
+            size_t const hSize = LZ4F_headerSize(srcBuffer, *srcSizePtr);
+            if (LZ4F_isError(hSize)) { *srcSizePtr=0; return hSize; }
+            if (*srcSizePtr < hSize) {
+                *srcSizePtr=0;
+                RETURN_ERROR(frameHeader_incomplete);
+            }
+
+            {   size_t decodeResult = LZ4F_decodeHeader(dctx, srcBuffer, hSize);
+                if (LZ4F_isError(decodeResult)) {
+                    *srcSizePtr = 0;
+                } else {
+                    *srcSizePtr = decodeResult;
+                    decodeResult = BHSize;   /* block header size */
+                }
+                *frameInfoPtr = dctx->frameInfo;
+                return decodeResult;
+    }   }   }
+}
+
+
+/* LZ4F_updateDict() :
+ * only used for LZ4F_blockLinked mode
+ * Condition : @dstPtr != NULL
+ */
+static void LZ4F_updateDict(LZ4F_dctx* dctx,
+                      const BYTE* dstPtr, size_t dstSize, const BYTE* dstBufferStart,
+                      unsigned withinTmp)
+{
+    assert(dstPtr != NULL);
+    if (dctx->dictSize==0) dctx->dict = (const BYTE*)dstPtr;  /* will lead to prefix mode */
+    assert(dctx->dict != NULL);
+
+    if (dctx->dict + dctx->dictSize == dstPtr) {  /* prefix mode, everything within dstBuffer */
+        dctx->dictSize += dstSize;
+        return;
+    }
+
+    assert(dstPtr >= dstBufferStart);
+    if ((size_t)(dstPtr - dstBufferStart) + dstSize >= 64 KB) {  /* history in dstBuffer becomes large enough to become dictionary */
+        dctx->dict = (const BYTE*)dstBufferStart;
+        dctx->dictSize = (size_t)(dstPtr - dstBufferStart) + dstSize;
+        return;
+    }
+
+    assert(dstSize < 64 KB);   /* if dstSize >= 64 KB, dictionary would be set into dstBuffer directly */
+
+    /* dstBuffer does not contain whole useful history (64 KB), so it must be saved within tmpOutBuffer */
+    assert(dctx->tmpOutBuffer != NULL);
+
+    if (withinTmp && (dctx->dict == dctx->tmpOutBuffer)) {   /* continue history within tmpOutBuffer */
+        /* withinTmp expectation : content of [dstPtr,dstSize] is same as [dict+dictSize,dstSize], so we just extend it */
+        assert(dctx->dict + dctx->dictSize == dctx->tmpOut + dctx->tmpOutStart);
+        dctx->dictSize += dstSize;
+        return;
+    }
+
+    if (withinTmp) { /* copy relevant dict portion in front of tmpOut within tmpOutBuffer */
+        size_t const preserveSize = (size_t)(dctx->tmpOut - dctx->tmpOutBuffer);
+        size_t copySize = 64 KB - dctx->tmpOutSize;
+        const BYTE* const oldDictEnd = dctx->dict + dctx->dictSize - dctx->tmpOutStart;
+        if (dctx->tmpOutSize > 64 KB) copySize = 0;
+        if (copySize > preserveSize) copySize = preserveSize;
+
+        memcpy(dctx->tmpOutBuffer + preserveSize - copySize, oldDictEnd - copySize, copySize);
+
+        dctx->dict = dctx->tmpOutBuffer;
+        dctx->dictSize = preserveSize + dctx->tmpOutStart + dstSize;
+        return;
+    }
+
+    if (dctx->dict == dctx->tmpOutBuffer) {    /* copy dst into tmp to complete dict */
+        if (dctx->dictSize + dstSize > dctx->maxBufferSize) {  /* tmp buffer not large enough */
+            size_t const preserveSize = 64 KB - dstSize;
+            memcpy(dctx->tmpOutBuffer, dctx->dict + dctx->dictSize - preserveSize, preserveSize);
+            dctx->dictSize = preserveSize;
+        }
+        memcpy(dctx->tmpOutBuffer + dctx->dictSize, dstPtr, dstSize);
+        dctx->dictSize += dstSize;
+        return;
+    }
+
+    /* join dict & dest into tmp */
+    {   size_t preserveSize = 64 KB - dstSize;
+        if (preserveSize > dctx->dictSize) preserveSize = dctx->dictSize;
+        memcpy(dctx->tmpOutBuffer, dctx->dict + dctx->dictSize - preserveSize, preserveSize);
+        memcpy(dctx->tmpOutBuffer + preserveSize, dstPtr, dstSize);
+        dctx->dict = dctx->tmpOutBuffer;
+        dctx->dictSize = preserveSize + dstSize;
+    }
+}
+
+
+/*! LZ4F_decompress() :
+ *  Call this function repetitively to regenerate compressed data in srcBuffer.
+ *  The function will attempt to decode up to *srcSizePtr bytes from srcBuffer
+ *  into dstBuffer of capacity *dstSizePtr.
+ *
+ *  The number of bytes regenerated into dstBuffer will be provided within *dstSizePtr (necessarily <= original value).
+ *
+ *  The number of bytes effectively read from srcBuffer will be provided within *srcSizePtr (necessarily <= original value).
+ *  If number of bytes read is < number of bytes provided, then decompression operation is not complete.
+ *  Remaining data will have to be presented again in a subsequent invocation.
+ *
+ *  The function result is an hint of the better srcSize to use for next call to LZ4F_decompress.
+ *  Schematically, it's the size of the current (or remaining) compressed block + header of next block.
+ *  Respecting the hint provides a small boost to performance, since it allows less buffer shuffling.
+ *  Note that this is just a hint, and it's always possible to any srcSize value.
+ *  When a frame is fully decoded, @return will be 0.
+ *  If decompression failed, @return is an error code which can be tested using LZ4F_isError().
+ */
+size_t LZ4F_decompress(LZ4F_dctx* dctx,
+                       void* dstBuffer, size_t* dstSizePtr,
+                       const void* srcBuffer, size_t* srcSizePtr,
+                       const LZ4F_decompressOptions_t* decompressOptionsPtr)
+{
+    LZ4F_decompressOptions_t optionsNull;
+    const BYTE* const srcStart = (const BYTE*)srcBuffer;
+    const BYTE* const srcEnd = srcStart + *srcSizePtr;
+    const BYTE* srcPtr = srcStart;
+    BYTE* const dstStart = (BYTE*)dstBuffer;
+    BYTE* const dstEnd = dstStart ? dstStart + *dstSizePtr : NULL;
+    BYTE* dstPtr = dstStart;
+    const BYTE* selectedIn = NULL;
+    unsigned doAnotherStage = 1;
+    size_t nextSrcSizeHint = 1;
+
+
+    DEBUGLOG(5, "LZ4F_decompress : %p,%u => %p,%u",
+            srcBuffer, (unsigned)*srcSizePtr, dstBuffer, (unsigned)*dstSizePtr);
+    if (dstBuffer == NULL) assert(*dstSizePtr == 0);
+    MEM_INIT(&optionsNull, 0, sizeof(optionsNull));
+    if (decompressOptionsPtr==NULL) decompressOptionsPtr = &optionsNull;
+    *srcSizePtr = 0;
+    *dstSizePtr = 0;
+    assert(dctx != NULL);
+    dctx->skipChecksum |= (decompressOptionsPtr->skipChecksums != 0); /* once set, disable for the remainder of the frame */
+
+    /* behaves as a state machine */
+
+    while (doAnotherStage) {
+
+        switch(dctx->dStage)
+        {
+
+        case dstage_getFrameHeader:
+            DEBUGLOG(6, "dstage_getFrameHeader");
+            if ((size_t)(srcEnd-srcPtr) >= maxFHSize) {  /* enough to decode - shortcut */
+                size_t const hSize = LZ4F_decodeHeader(dctx, srcPtr, (size_t)(srcEnd-srcPtr));  /* will update dStage appropriately */
+                FORWARD_IF_ERROR(hSize);
+                srcPtr += hSize;
+                break;
+            }
+            dctx->tmpInSize = 0;
+            if (srcEnd-srcPtr == 0) return minFHSize;   /* 0-size input */
+            dctx->tmpInTarget = minFHSize;   /* minimum size to decode header */
+            dctx->dStage = dstage_storeFrameHeader;
+            /* fall-through */
+
+        case dstage_storeFrameHeader:
+            DEBUGLOG(6, "dstage_storeFrameHeader");
+            {   size_t const sizeToCopy = MIN(dctx->tmpInTarget - dctx->tmpInSize, (size_t)(srcEnd - srcPtr));
+                memcpy(dctx->header + dctx->tmpInSize, srcPtr, sizeToCopy);
+                dctx->tmpInSize += sizeToCopy;
+                srcPtr += sizeToCopy;
+            }
+            if (dctx->tmpInSize < dctx->tmpInTarget) {
+                nextSrcSizeHint = (dctx->tmpInTarget - dctx->tmpInSize) + BHSize;   /* rest of header + nextBlockHeader */
+                doAnotherStage = 0;   /* not enough src data, ask for some more */
+                break;
+            }
+            FORWARD_IF_ERROR( LZ4F_decodeHeader(dctx, dctx->header, dctx->tmpInTarget) ); /* will update dStage appropriately */
+            break;
+
+        case dstage_init:
+            DEBUGLOG(6, "dstage_init");
+            if (dctx->frameInfo.contentChecksumFlag) (void)XXH32_reset(&(dctx->xxh), 0);
+            /* internal buffers allocation */
+            {   size_t const bufferNeeded = dctx->maxBlockSize
+                    + ((dctx->frameInfo.blockMode==LZ4F_blockLinked) ? 128 KB : 0);
+                if (bufferNeeded > dctx->maxBufferSize) {   /* tmp buffers too small */
+                    dctx->maxBufferSize = 0;   /* ensure allocation will be re-attempted on next entry*/
+                    LZ4F_free(dctx->tmpIn, dctx->cmem);
+                    dctx->tmpIn = (BYTE*)LZ4F_malloc(dctx->maxBlockSize + BFSize /* block checksum */, dctx->cmem);
+                    RETURN_ERROR_IF(dctx->tmpIn == NULL, allocation_failed);
+                    LZ4F_free(dctx->tmpOutBuffer, dctx->cmem);
+                    dctx->tmpOutBuffer= (BYTE*)LZ4F_malloc(bufferNeeded, dctx->cmem);
+                    RETURN_ERROR_IF(dctx->tmpOutBuffer== NULL, allocation_failed);
+                    dctx->maxBufferSize = bufferNeeded;
+            }   }
+            dctx->tmpInSize = 0;
+            dctx->tmpInTarget = 0;
+            dctx->tmpOut = dctx->tmpOutBuffer;
+            dctx->tmpOutStart = 0;
+            dctx->tmpOutSize = 0;
+
+            dctx->dStage = dstage_getBlockHeader;
+            /* fall-through */
+
+        case dstage_getBlockHeader:
+            if ((size_t)(srcEnd - srcPtr) >= BHSize) {
+                selectedIn = srcPtr;
+                srcPtr += BHSize;
+            } else {
+                /* not enough input to read cBlockSize field */
+                dctx->tmpInSize = 0;
+                dctx->dStage = dstage_storeBlockHeader;
+            }
+
+            if (dctx->dStage == dstage_storeBlockHeader)   /* can be skipped */
+        case dstage_storeBlockHeader:
+            {   size_t const remainingInput = (size_t)(srcEnd - srcPtr);
+                size_t const wantedData = BHSize - dctx->tmpInSize;
+                size_t const sizeToCopy = MIN(wantedData, remainingInput);
+                memcpy(dctx->tmpIn + dctx->tmpInSize, srcPtr, sizeToCopy);
+                srcPtr += sizeToCopy;
+                dctx->tmpInSize += sizeToCopy;
+
+                if (dctx->tmpInSize < BHSize) {   /* not enough input for cBlockSize */
+                    nextSrcSizeHint = BHSize - dctx->tmpInSize;
+                    doAnotherStage  = 0;
+                    break;
+                }
+                selectedIn = dctx->tmpIn;
+            }   /* if (dctx->dStage == dstage_storeBlockHeader) */
+
+        /* decode block header */
+            {   U32 const blockHeader = LZ4F_readLE32(selectedIn);
+                size_t const nextCBlockSize = blockHeader & 0x7FFFFFFFU;
+                size_t const crcSize = dctx->frameInfo.blockChecksumFlag * BFSize;
+                if (blockHeader==0) {  /* frameEnd signal, no more block */
+                    DEBUGLOG(5, "end of frame");
+                    dctx->dStage = dstage_getSuffix;
+                    break;
+                }
+                if (nextCBlockSize > dctx->maxBlockSize) {
+                    RETURN_ERROR(maxBlockSize_invalid);
+                }
+                if (blockHeader & LZ4F_BLOCKUNCOMPRESSED_FLAG) {
+                    /* next block is uncompressed */
+                    dctx->tmpInTarget = nextCBlockSize;
+                    DEBUGLOG(5, "next block is uncompressed (size %u)", (U32)nextCBlockSize);
+                    if (dctx->frameInfo.blockChecksumFlag) {
+                        (void)XXH32_reset(&dctx->blockChecksum, 0);
+                    }
+                    dctx->dStage = dstage_copyDirect;
+                    break;
+                }
+                /* next block is a compressed block */
+                dctx->tmpInTarget = nextCBlockSize + crcSize;
+                dctx->dStage = dstage_getCBlock;
+                if (dstPtr==dstEnd || srcPtr==srcEnd) {
+                    nextSrcSizeHint = BHSize + nextCBlockSize + crcSize;
+                    doAnotherStage = 0;
+                }
+                break;
+            }
+
+        case dstage_copyDirect:   /* uncompressed block */
+            DEBUGLOG(6, "dstage_copyDirect");
+            {   size_t sizeToCopy;
+                if (dstPtr == NULL) {
+                    sizeToCopy = 0;
+                } else {
+                    size_t const minBuffSize = MIN((size_t)(srcEnd-srcPtr), (size_t)(dstEnd-dstPtr));
+                    sizeToCopy = MIN(dctx->tmpInTarget, minBuffSize);
+                    memcpy(dstPtr, srcPtr, sizeToCopy);
+                    if (!dctx->skipChecksum) {
+                        if (dctx->frameInfo.blockChecksumFlag) {
+                            (void)XXH32_update(&dctx->blockChecksum, srcPtr, sizeToCopy);
+                        }
+                        if (dctx->frameInfo.contentChecksumFlag)
+                            (void)XXH32_update(&dctx->xxh, srcPtr, sizeToCopy);
+                    }
+                    if (dctx->frameInfo.contentSize)
+                        dctx->frameRemainingSize -= sizeToCopy;
+
+                    /* history management (linked blocks only)*/
+                    if (dctx->frameInfo.blockMode == LZ4F_blockLinked) {
+                        LZ4F_updateDict(dctx, dstPtr, sizeToCopy, dstStart, 0);
+                }   }
+
+                srcPtr += sizeToCopy;
+                dstPtr += sizeToCopy;
+                if (sizeToCopy == dctx->tmpInTarget) {   /* all done */
+                    if (dctx->frameInfo.blockChecksumFlag) {
+                        dctx->tmpInSize = 0;
+                        dctx->dStage = dstage_getBlockChecksum;
+                    } else
+                        dctx->dStage = dstage_getBlockHeader;  /* new block */
+                    break;
+                }
+                dctx->tmpInTarget -= sizeToCopy;  /* need to copy more */
+            }
+            nextSrcSizeHint = dctx->tmpInTarget +
+                            +(dctx->frameInfo.blockChecksumFlag ? BFSize : 0)
+                            + BHSize /* next header size */;
+            doAnotherStage = 0;
+            break;
+
+        /* check block checksum for recently transferred uncompressed block */
+        case dstage_getBlockChecksum:
+            DEBUGLOG(6, "dstage_getBlockChecksum");
+            {   const void* crcSrc;
+                if ((srcEnd-srcPtr >= 4) && (dctx->tmpInSize==0)) {
+                    crcSrc = srcPtr;
+                    srcPtr += 4;
+                } else {
+                    size_t const stillToCopy = 4 - dctx->tmpInSize;
+                    size_t const sizeToCopy = MIN(stillToCopy, (size_t)(srcEnd-srcPtr));
+                    memcpy(dctx->header + dctx->tmpInSize, srcPtr, sizeToCopy);
+                    dctx->tmpInSize += sizeToCopy;
+                    srcPtr += sizeToCopy;
+                    if (dctx->tmpInSize < 4) {  /* all input consumed */
+                        doAnotherStage = 0;
+                        break;
+                    }
+                    crcSrc = dctx->header;
+                }
+                if (!dctx->skipChecksum) {
+                    U32 const readCRC = LZ4F_readLE32(crcSrc);
+                    U32 const calcCRC = XXH32_digest(&dctx->blockChecksum);
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+                    DEBUGLOG(6, "compare block checksum");
+                    if (readCRC != calcCRC) {
+                        DEBUGLOG(4, "incorrect block checksum: %08X != %08X",
+                                readCRC, calcCRC);
+                        RETURN_ERROR(blockChecksum_invalid);
+                    }
+#else
+                    (void)readCRC;
+                    (void)calcCRC;
+#endif
+            }   }
+            dctx->dStage = dstage_getBlockHeader;  /* new block */
+            break;
+
+        case dstage_getCBlock:
+            DEBUGLOG(6, "dstage_getCBlock");
+            if ((size_t)(srcEnd-srcPtr) < dctx->tmpInTarget) {
+                dctx->tmpInSize = 0;
+                dctx->dStage = dstage_storeCBlock;
+                break;
+            }
+            /* input large enough to read full block directly */
+            selectedIn = srcPtr;
+            srcPtr += dctx->tmpInTarget;
+
+            if (0)  /* always jump over next block */
+        case dstage_storeCBlock:
+            {   size_t const wantedData = dctx->tmpInTarget - dctx->tmpInSize;
+                size_t const inputLeft = (size_t)(srcEnd-srcPtr);
+                size_t const sizeToCopy = MIN(wantedData, inputLeft);
+                memcpy(dctx->tmpIn + dctx->tmpInSize, srcPtr, sizeToCopy);
+                dctx->tmpInSize += sizeToCopy;
+                srcPtr += sizeToCopy;
+                if (dctx->tmpInSize < dctx->tmpInTarget) { /* need more input */
+                    nextSrcSizeHint = (dctx->tmpInTarget - dctx->tmpInSize)
+                                    + (dctx->frameInfo.blockChecksumFlag ? BFSize : 0)
+                                    + BHSize /* next header size */;
+                    doAnotherStage = 0;
+                    break;
+                }
+                selectedIn = dctx->tmpIn;
+            }
+
+            /* At this stage, input is large enough to decode a block */
+
+            /* First, decode and control block checksum if it exists */
+            if (dctx->frameInfo.blockChecksumFlag) {
+                assert(dctx->tmpInTarget >= 4);
+                dctx->tmpInTarget -= 4;
+                assert(selectedIn != NULL);  /* selectedIn is defined at this stage (either srcPtr, or dctx->tmpIn) */
+                {   U32 const readBlockCrc = LZ4F_readLE32(selectedIn + dctx->tmpInTarget);
+                    U32 const calcBlockCrc = XXH32(selectedIn, dctx->tmpInTarget, 0);
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+                    RETURN_ERROR_IF(readBlockCrc != calcBlockCrc, blockChecksum_invalid);
+#else
+                    (void)readBlockCrc;
+                    (void)calcBlockCrc;
+#endif
+            }   }
+
+            /* decode directly into destination buffer if there is enough room */
+            if ( ((size_t)(dstEnd-dstPtr) >= dctx->maxBlockSize)
+                 /* unless the dictionary is stored in tmpOut:
+                  * in which case it's faster to decode within tmpOut
+                  * to benefit from prefix speedup */
+              && !(dctx->dict!= NULL && (const BYTE*)dctx->dict + dctx->dictSize == dctx->tmpOut) )
+            {
+                const char* dict = (const char*)dctx->dict;
+                size_t dictSize = dctx->dictSize;
+                int decodedSize;
+                assert(dstPtr != NULL);
+                if (dict && dictSize > 1 GB) {
+                    /* overflow control : dctx->dictSize is an int, avoid truncation / sign issues */
+                    dict += dictSize - 64 KB;
+                    dictSize = 64 KB;
+                }
+                decodedSize = LZ4_decompress_safe_usingDict(
+                        (const char*)selectedIn, (char*)dstPtr,
+                        (int)dctx->tmpInTarget, (int)dctx->maxBlockSize,
+                        dict, (int)dictSize);
+                RETURN_ERROR_IF(decodedSize < 0, decompressionFailed);
+                if ((dctx->frameInfo.contentChecksumFlag) && (!dctx->skipChecksum))
+                    XXH32_update(&(dctx->xxh), dstPtr, (size_t)decodedSize);
+                if (dctx->frameInfo.contentSize)
+                    dctx->frameRemainingSize -= (size_t)decodedSize;
+
+                /* dictionary management */
+                if (dctx->frameInfo.blockMode==LZ4F_blockLinked) {
+                    LZ4F_updateDict(dctx, dstPtr, (size_t)decodedSize, dstStart, 0);
+                }
+
+                dstPtr += decodedSize;
+                dctx->dStage = dstage_getBlockHeader;  /* end of block, let's get another one */
+                break;
+            }
+
+            /* not enough place into dst : decode into tmpOut */
+
+            /* manage dictionary */
+            if (dctx->frameInfo.blockMode == LZ4F_blockLinked) {
+                if (dctx->dict == dctx->tmpOutBuffer) {
+                    /* truncate dictionary to 64 KB if too big */
+                    if (dctx->dictSize > 128 KB) {
+                        memcpy(dctx->tmpOutBuffer, dctx->dict + dctx->dictSize - 64 KB, 64 KB);
+                        dctx->dictSize = 64 KB;
+                    }
+                    dctx->tmpOut = dctx->tmpOutBuffer + dctx->dictSize;
+                } else {  /* dict not within tmpOut */
+                    size_t const reservedDictSpace = MIN(dctx->dictSize, 64 KB);
+                    dctx->tmpOut = dctx->tmpOutBuffer + reservedDictSpace;
+            }   }
+
+            /* Decode block into tmpOut */
+            {   const char* dict = (const char*)dctx->dict;
+                size_t dictSize = dctx->dictSize;
+                int decodedSize;
+                if (dict && dictSize > 1 GB) {
+                    /* the dictSize param is an int, avoid truncation / sign issues */
+                    dict += dictSize - 64 KB;
+                    dictSize = 64 KB;
+                }
+                decodedSize = LZ4_decompress_safe_usingDict(
+                        (const char*)selectedIn, (char*)dctx->tmpOut,
+                        (int)dctx->tmpInTarget, (int)dctx->maxBlockSize,
+                        dict, (int)dictSize);
+                RETURN_ERROR_IF(decodedSize < 0, decompressionFailed);
+                if (dctx->frameInfo.contentChecksumFlag && !dctx->skipChecksum)
+                    XXH32_update(&(dctx->xxh), dctx->tmpOut, (size_t)decodedSize);
+                if (dctx->frameInfo.contentSize)
+                    dctx->frameRemainingSize -= (size_t)decodedSize;
+                dctx->tmpOutSize = (size_t)decodedSize;
+                dctx->tmpOutStart = 0;
+                dctx->dStage = dstage_flushOut;
+            }
+            /* fall-through */
+
+        case dstage_flushOut:  /* flush decoded data from tmpOut to dstBuffer */
+            DEBUGLOG(6, "dstage_flushOut");
+            if (dstPtr != NULL) {
+                size_t const sizeToCopy = MIN(dctx->tmpOutSize - dctx->tmpOutStart, (size_t)(dstEnd-dstPtr));
+                memcpy(dstPtr, dctx->tmpOut + dctx->tmpOutStart, sizeToCopy);
+
+                /* dictionary management */
+                if (dctx->frameInfo.blockMode == LZ4F_blockLinked)
+                    LZ4F_updateDict(dctx, dstPtr, sizeToCopy, dstStart, 1 /*withinTmp*/);
+
+                dctx->tmpOutStart += sizeToCopy;
+                dstPtr += sizeToCopy;
+            }
+            if (dctx->tmpOutStart == dctx->tmpOutSize) { /* all flushed */
+                dctx->dStage = dstage_getBlockHeader;  /* get next block */
+                break;
+            }
+            /* could not flush everything : stop there, just request a block header */
+            doAnotherStage = 0;
+            nextSrcSizeHint = BHSize;
+            break;
+
+        case dstage_getSuffix:
+            RETURN_ERROR_IF(dctx->frameRemainingSize, frameSize_wrong);   /* incorrect frame size decoded */
+            if (!dctx->frameInfo.contentChecksumFlag) {  /* no checksum, frame is completed */
+                nextSrcSizeHint = 0;
+                LZ4F_resetDecompressionContext(dctx);
+                doAnotherStage = 0;
+                break;
+            }
+            if ((srcEnd - srcPtr) < 4) {  /* not enough size for entire CRC */
+                dctx->tmpInSize = 0;
+                dctx->dStage = dstage_storeSuffix;
+            } else {
+                selectedIn = srcPtr;
+                srcPtr += 4;
+            }
+
+            if (dctx->dStage == dstage_storeSuffix)   /* can be skipped */
+        case dstage_storeSuffix:
+            {   size_t const remainingInput = (size_t)(srcEnd - srcPtr);
+                size_t const wantedData = 4 - dctx->tmpInSize;
+                size_t const sizeToCopy = MIN(wantedData, remainingInput);
+                memcpy(dctx->tmpIn + dctx->tmpInSize, srcPtr, sizeToCopy);
+                srcPtr += sizeToCopy;
+                dctx->tmpInSize += sizeToCopy;
+                if (dctx->tmpInSize < 4) { /* not enough input to read complete suffix */
+                    nextSrcSizeHint = 4 - dctx->tmpInSize;
+                    doAnotherStage=0;
+                    break;
+                }
+                selectedIn = dctx->tmpIn;
+            }   /* if (dctx->dStage == dstage_storeSuffix) */
+
+        /* case dstage_checkSuffix: */   /* no direct entry, avoid initialization risks */
+            if (!dctx->skipChecksum) {
+                U32 const readCRC = LZ4F_readLE32(selectedIn);
+                U32 const resultCRC = XXH32_digest(&(dctx->xxh));
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+                RETURN_ERROR_IF(readCRC != resultCRC, contentChecksum_invalid);
+#else
+                (void)readCRC;
+                (void)resultCRC;
+#endif
+            }
+            nextSrcSizeHint = 0;
+            LZ4F_resetDecompressionContext(dctx);
+            doAnotherStage = 0;
+            break;
+
+        case dstage_getSFrameSize:
+            if ((srcEnd - srcPtr) >= 4) {
+                selectedIn = srcPtr;
+                srcPtr += 4;
+            } else {
+                /* not enough input to read cBlockSize field */
+                dctx->tmpInSize = 4;
+                dctx->tmpInTarget = 8;
+                dctx->dStage = dstage_storeSFrameSize;
+            }
+
+            if (dctx->dStage == dstage_storeSFrameSize)
+        case dstage_storeSFrameSize:
+            {   size_t const sizeToCopy = MIN(dctx->tmpInTarget - dctx->tmpInSize,
+                                             (size_t)(srcEnd - srcPtr) );
+                memcpy(dctx->header + dctx->tmpInSize, srcPtr, sizeToCopy);
+                srcPtr += sizeToCopy;
+                dctx->tmpInSize += sizeToCopy;
+                if (dctx->tmpInSize < dctx->tmpInTarget) {
+                    /* not enough input to get full sBlockSize; wait for more */
+                    nextSrcSizeHint = dctx->tmpInTarget - dctx->tmpInSize;
+                    doAnotherStage = 0;
+                    break;
+                }
+                selectedIn = dctx->header + 4;
+            }   /* if (dctx->dStage == dstage_storeSFrameSize) */
+
+        /* case dstage_decodeSFrameSize: */   /* no direct entry */
+            {   size_t const SFrameSize = LZ4F_readLE32(selectedIn);
+                dctx->frameInfo.contentSize = SFrameSize;
+                dctx->tmpInTarget = SFrameSize;
+                dctx->dStage = dstage_skipSkippable;
+                break;
+            }
+
+        case dstage_skipSkippable:
+            {   size_t const skipSize = MIN(dctx->tmpInTarget, (size_t)(srcEnd-srcPtr));
+                srcPtr += skipSize;
+                dctx->tmpInTarget -= skipSize;
+                doAnotherStage = 0;
+                nextSrcSizeHint = dctx->tmpInTarget;
+                if (nextSrcSizeHint) break;  /* still more to skip */
+                /* frame fully skipped : prepare context for a new frame */
+                LZ4F_resetDecompressionContext(dctx);
+                break;
+            }
+        }   /* switch (dctx->dStage) */
+    }   /* while (doAnotherStage) */
+
+    /* preserve history within tmpOut whenever necessary */
+    LZ4F_STATIC_ASSERT((unsigned)dstage_init == 2);
+    if ( (dctx->frameInfo.blockMode==LZ4F_blockLinked)  /* next block will use up to 64KB from previous ones */
+      && (dctx->dict != dctx->tmpOutBuffer)             /* dictionary is not already within tmp */
+      && (dctx->dict != NULL)                           /* dictionary exists */
+      && (!decompressOptionsPtr->stableDst)             /* cannot rely on dst data to remain there for next call */
+      && ((unsigned)(dctx->dStage)-2 < (unsigned)(dstage_getSuffix)-2) )  /* valid stages : [init ... getSuffix[ */
+    {
+        if (dctx->dStage == dstage_flushOut) {
+            size_t const preserveSize = (size_t)(dctx->tmpOut - dctx->tmpOutBuffer);
+            size_t copySize = 64 KB - dctx->tmpOutSize;
+            const BYTE* oldDictEnd = dctx->dict + dctx->dictSize - dctx->tmpOutStart;
+            if (dctx->tmpOutSize > 64 KB) copySize = 0;
+            if (copySize > preserveSize) copySize = preserveSize;
+            assert(dctx->tmpOutBuffer != NULL);
+
+            memcpy(dctx->tmpOutBuffer + preserveSize - copySize, oldDictEnd - copySize, copySize);
+
+            dctx->dict = dctx->tmpOutBuffer;
+            dctx->dictSize = preserveSize + dctx->tmpOutStart;
+        } else {
+            const BYTE* const oldDictEnd = dctx->dict + dctx->dictSize;
+            size_t const newDictSize = MIN(dctx->dictSize, 64 KB);
+
+            memcpy(dctx->tmpOutBuffer, oldDictEnd - newDictSize, newDictSize);
+
+            dctx->dict = dctx->tmpOutBuffer;
+            dctx->dictSize = newDictSize;
+            dctx->tmpOut = dctx->tmpOutBuffer + newDictSize;
+        }
+    }
+
+    *srcSizePtr = (size_t)(srcPtr - srcStart);
+    *dstSizePtr = (size_t)(dstPtr - dstStart);
+    return nextSrcSizeHint;
+}
+
+/*! LZ4F_decompress_usingDict() :
+ *  Same as LZ4F_decompress(), using a predefined dictionary.
+ *  Dictionary is used "in place", without any preprocessing.
+ *  It must remain accessible throughout the entire frame decoding.
+ */
+size_t LZ4F_decompress_usingDict(LZ4F_dctx* dctx,
+                       void* dstBuffer, size_t* dstSizePtr,
+                       const void* srcBuffer, size_t* srcSizePtr,
+                       const void* dict, size_t dictSize,
+                       const LZ4F_decompressOptions_t* decompressOptionsPtr)
+{
+    if (dctx->dStage <= dstage_init) {
+        dctx->dict = (const BYTE*)dict;
+        dctx->dictSize = dictSize;
+    }
+    return LZ4F_decompress(dctx, dstBuffer, dstSizePtr,
+                           srcBuffer, srcSizePtr,
+                           decompressOptionsPtr);
+}
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4frame.h b/extra/lz4/lz4-1.9.4/lib/lz4frame.h
new file mode 100644
index 000000000000..1bdf6c4fcba5
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4frame.h
@@ -0,0 +1,692 @@
+/*
+   LZ4F - LZ4-Frame library
+   Header File
+   Copyright (C) 2011-2020, Yann Collet.
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/lz4/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+
+/* LZ4F is a stand-alone API able to create and decode LZ4 frames
+ * conformant with specification v1.6.1 in doc/lz4_Frame_format.md .
+ * Generated frames are compatible with `lz4` CLI.
+ *
+ * LZ4F also offers streaming capabilities.
+ *
+ * lz4.h is not required when using lz4frame.h,
+ * except to extract common constants such as LZ4_VERSION_NUMBER.
+ * */
+
+#ifndef LZ4F_H_09782039843
+#define LZ4F_H_09782039843
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/* ---   Dependency   --- */
+#include <stddef.h>   /* size_t */
+
+
+/**
+ * Introduction
+ *
+ * lz4frame.h implements LZ4 frame specification: see doc/lz4_Frame_format.md .
+ * LZ4 Frames are compatible with `lz4` CLI,
+ * and designed to be interoperable with any system.
+**/
+
+/*-***************************************************************
+ *  Compiler specifics
+ *****************************************************************/
+/*  LZ4_DLL_EXPORT :
+ *  Enable exporting of functions when building a Windows DLL
+ *  LZ4FLIB_VISIBILITY :
+ *  Control library symbols visibility.
+ */
+#ifndef LZ4FLIB_VISIBILITY
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#    define LZ4FLIB_VISIBILITY __attribute__ ((visibility ("default")))
+#  else
+#    define LZ4FLIB_VISIBILITY
+#  endif
+#endif
+#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1)
+#  define LZ4FLIB_API __declspec(dllexport) LZ4FLIB_VISIBILITY
+#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)
+#  define LZ4FLIB_API __declspec(dllimport) LZ4FLIB_VISIBILITY
+#else
+#  define LZ4FLIB_API LZ4FLIB_VISIBILITY
+#endif
+
+#ifdef LZ4F_DISABLE_DEPRECATE_WARNINGS
+#  define LZ4F_DEPRECATE(x) x
+#else
+#  if defined(_MSC_VER)
+#    define LZ4F_DEPRECATE(x) x   /* __declspec(deprecated) x - only works with C++ */
+#  elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
+#    define LZ4F_DEPRECATE(x) x __attribute__((deprecated))
+#  else
+#    define LZ4F_DEPRECATE(x) x   /* no deprecation warning for this compiler */
+#  endif
+#endif
+
+
+/*-************************************
+ *  Error management
+ **************************************/
+typedef size_t LZ4F_errorCode_t;
+
+LZ4FLIB_API unsigned    LZ4F_isError(LZ4F_errorCode_t code);   /**< tells when a function result is an error code */
+LZ4FLIB_API const char* LZ4F_getErrorName(LZ4F_errorCode_t code);   /**< return error code string; for debugging */
+
+
+/*-************************************
+ *  Frame compression types
+ ************************************* */
+/* #define LZ4F_ENABLE_OBSOLETE_ENUMS   // uncomment to enable obsolete enums */
+#ifdef LZ4F_ENABLE_OBSOLETE_ENUMS
+#  define LZ4F_OBSOLETE_ENUM(x) , LZ4F_DEPRECATE(x) = LZ4F_##x
+#else
+#  define LZ4F_OBSOLETE_ENUM(x)
+#endif
+
+/* The larger the block size, the (slightly) better the compression ratio,
+ * though there are diminishing returns.
+ * Larger blocks also increase memory usage on both compression and decompression sides.
+ */
+typedef enum {
+    LZ4F_default=0,
+    LZ4F_max64KB=4,
+    LZ4F_max256KB=5,
+    LZ4F_max1MB=6,
+    LZ4F_max4MB=7
+    LZ4F_OBSOLETE_ENUM(max64KB)
+    LZ4F_OBSOLETE_ENUM(max256KB)
+    LZ4F_OBSOLETE_ENUM(max1MB)
+    LZ4F_OBSOLETE_ENUM(max4MB)
+} LZ4F_blockSizeID_t;
+
+/* Linked blocks sharply reduce inefficiencies when using small blocks,
+ * they compress better.
+ * However, some LZ4 decoders are only compatible with independent blocks */
+typedef enum {
+    LZ4F_blockLinked=0,
+    LZ4F_blockIndependent
+    LZ4F_OBSOLETE_ENUM(blockLinked)
+    LZ4F_OBSOLETE_ENUM(blockIndependent)
+} LZ4F_blockMode_t;
+
+typedef enum {
+    LZ4F_noContentChecksum=0,
+    LZ4F_contentChecksumEnabled
+    LZ4F_OBSOLETE_ENUM(noContentChecksum)
+    LZ4F_OBSOLETE_ENUM(contentChecksumEnabled)
+} LZ4F_contentChecksum_t;
+
+typedef enum {
+    LZ4F_noBlockChecksum=0,
+    LZ4F_blockChecksumEnabled
+} LZ4F_blockChecksum_t;
+
+typedef enum {
+    LZ4F_frame=0,
+    LZ4F_skippableFrame
+    LZ4F_OBSOLETE_ENUM(skippableFrame)
+} LZ4F_frameType_t;
+
+#ifdef LZ4F_ENABLE_OBSOLETE_ENUMS
+typedef LZ4F_blockSizeID_t blockSizeID_t;
+typedef LZ4F_blockMode_t blockMode_t;
+typedef LZ4F_frameType_t frameType_t;
+typedef LZ4F_contentChecksum_t contentChecksum_t;
+#endif
+
+/*! LZ4F_frameInfo_t :
+ *  makes it possible to set or read frame parameters.
+ *  Structure must be first init to 0, using memset() or LZ4F_INIT_FRAMEINFO,
+ *  setting all parameters to default.
+ *  It's then possible to update selectively some parameters */
+typedef struct {
+  LZ4F_blockSizeID_t     blockSizeID;         /* max64KB, max256KB, max1MB, max4MB; 0 == default */
+  LZ4F_blockMode_t       blockMode;           /* LZ4F_blockLinked, LZ4F_blockIndependent; 0 == default */
+  LZ4F_contentChecksum_t contentChecksumFlag; /* 1: frame terminated with 32-bit checksum of decompressed data; 0: disabled (default) */
+  LZ4F_frameType_t       frameType;           /* read-only field : LZ4F_frame or LZ4F_skippableFrame */
+  unsigned long long     contentSize;         /* Size of uncompressed content ; 0 == unknown */
+  unsigned               dictID;              /* Dictionary ID, sent by compressor to help decoder select correct dictionary; 0 == no dictID provided */
+  LZ4F_blockChecksum_t   blockChecksumFlag;   /* 1: each block followed by a checksum of block's compressed data; 0: disabled (default) */
+} LZ4F_frameInfo_t;
+
+#define LZ4F_INIT_FRAMEINFO   { LZ4F_default, LZ4F_blockLinked, LZ4F_noContentChecksum, LZ4F_frame, 0ULL, 0U, LZ4F_noBlockChecksum }    /* v1.8.3+ */
+
+/*! LZ4F_preferences_t :
+ *  makes it possible to supply advanced compression instructions to streaming interface.
+ *  Structure must be first init to 0, using memset() or LZ4F_INIT_PREFERENCES,
+ *  setting all parameters to default.
+ *  All reserved fields must be set to zero. */
+typedef struct {
+  LZ4F_frameInfo_t frameInfo;
+  int      compressionLevel;    /* 0: default (fast mode); values > LZ4HC_CLEVEL_MAX count as LZ4HC_CLEVEL_MAX; values < 0 trigger "fast acceleration" */
+  unsigned autoFlush;           /* 1: always flush; reduces usage of internal buffers */
+  unsigned favorDecSpeed;       /* 1: parser favors decompression speed vs compression ratio. Only works for high compression modes (>= LZ4HC_CLEVEL_OPT_MIN) */  /* v1.8.2+ */
+  unsigned reserved[3];         /* must be zero for forward compatibility */
+} LZ4F_preferences_t;
+
+#define LZ4F_INIT_PREFERENCES   { LZ4F_INIT_FRAMEINFO, 0, 0u, 0u, { 0u, 0u, 0u } }    /* v1.8.3+ */
+
+
+/*-*********************************
+*  Simple compression function
+***********************************/
+
+LZ4FLIB_API int LZ4F_compressionLevel_max(void);   /* v1.8.0+ */
+
+/*! LZ4F_compressFrameBound() :
+ *  Returns the maximum possible compressed size with LZ4F_compressFrame() given srcSize and preferences.
+ * `preferencesPtr` is optional. It can be replaced by NULL, in which case, the function will assume default preferences.
+ *  Note : this result is only usable with LZ4F_compressFrame().
+ *         It may also be relevant to LZ4F_compressUpdate() _only if_ no flush() operation is ever performed.
+ */
+LZ4FLIB_API size_t LZ4F_compressFrameBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr);
+
+/*! LZ4F_compressFrame() :
+ *  Compress an entire srcBuffer into a valid LZ4 frame.
+ *  dstCapacity MUST be >= LZ4F_compressFrameBound(srcSize, preferencesPtr).
+ *  The LZ4F_preferences_t structure is optional : you can provide NULL as argument. All preferences will be set to default.
+ * @return : number of bytes written into dstBuffer.
+ *           or an error code if it fails (can be tested using LZ4F_isError())
+ */
+LZ4FLIB_API size_t LZ4F_compressFrame(void* dstBuffer, size_t dstCapacity,
+                                const void* srcBuffer, size_t srcSize,
+                                const LZ4F_preferences_t* preferencesPtr);
+
+
+/*-***********************************
+*  Advanced compression functions
+*************************************/
+typedef struct LZ4F_cctx_s LZ4F_cctx;   /* incomplete type */
+typedef LZ4F_cctx* LZ4F_compressionContext_t;  /* for compatibility with older APIs, prefer using LZ4F_cctx */
+
+typedef struct {
+  unsigned stableSrc;    /* 1 == src content will remain present on future calls to LZ4F_compress(); skip copying src content within tmp buffer */
+  unsigned reserved[3];
+} LZ4F_compressOptions_t;
+
+/*---   Resource Management   ---*/
+
+#define LZ4F_VERSION 100    /* This number can be used to check for an incompatible API breaking change */
+LZ4FLIB_API unsigned LZ4F_getVersion(void);
+
+/*! LZ4F_createCompressionContext() :
+ *  The first thing to do is to create a compressionContext object,
+ *  which will keep track of operation state during streaming compression.
+ *  This is achieved using LZ4F_createCompressionContext(), which takes as argument a version,
+ *  and a pointer to LZ4F_cctx*, to write the resulting pointer into.
+ *  @version provided MUST be LZ4F_VERSION. It is intended to track potential version mismatch, notably when using DLL.
+ *  The function provides a pointer to a fully allocated LZ4F_cctx object.
+ *  @cctxPtr MUST be != NULL.
+ *  If @return != zero, context creation failed.
+ *  A created compression context can be employed multiple times for consecutive streaming operations.
+ *  Once all streaming compression jobs are completed,
+ *  the state object can be released using LZ4F_freeCompressionContext().
+ *  Note1 : LZ4F_freeCompressionContext() is always successful. Its return value can be ignored.
+ *  Note2 : LZ4F_freeCompressionContext() works fine with NULL input pointers (do nothing).
+**/
+LZ4FLIB_API LZ4F_errorCode_t LZ4F_createCompressionContext(LZ4F_cctx** cctxPtr, unsigned version);
+LZ4FLIB_API LZ4F_errorCode_t LZ4F_freeCompressionContext(LZ4F_cctx* cctx);
+
+
+/*----    Compression    ----*/
+
+#define LZ4F_HEADER_SIZE_MIN  7   /* LZ4 Frame header size can vary, depending on selected parameters */
+#define LZ4F_HEADER_SIZE_MAX 19
+
+/* Size in bytes of a block header in little-endian format. Highest bit indicates if block data is uncompressed */
+#define LZ4F_BLOCK_HEADER_SIZE 4
+
+/* Size in bytes of a block checksum footer in little-endian format. */
+#define LZ4F_BLOCK_CHECKSUM_SIZE 4
+
+/* Size in bytes of the content checksum. */
+#define LZ4F_CONTENT_CHECKSUM_SIZE 4
+
+/*! LZ4F_compressBegin() :
+ *  will write the frame header into dstBuffer.
+ *  dstCapacity must be >= LZ4F_HEADER_SIZE_MAX bytes.
+ * `prefsPtr` is optional : you can provide NULL as argument, all preferences will then be set to default.
+ * @return : number of bytes written into dstBuffer for the header
+ *           or an error code (which can be tested using LZ4F_isError())
+ */
+LZ4FLIB_API size_t LZ4F_compressBegin(LZ4F_cctx* cctx,
+                                      void* dstBuffer, size_t dstCapacity,
+                                      const LZ4F_preferences_t* prefsPtr);
+
+/*! LZ4F_compressBound() :
+ *  Provides minimum dstCapacity required to guarantee success of
+ *  LZ4F_compressUpdate(), given a srcSize and preferences, for a worst case scenario.
+ *  When srcSize==0, LZ4F_compressBound() provides an upper bound for LZ4F_flush() and LZ4F_compressEnd() instead.
+ *  Note that the result is only valid for a single invocation of LZ4F_compressUpdate().
+ *  When invoking LZ4F_compressUpdate() multiple times,
+ *  if the output buffer is gradually filled up instead of emptied and re-used from its start,
+ *  one must check if there is enough remaining capacity before each invocation, using LZ4F_compressBound().
+ * @return is always the same for a srcSize and prefsPtr.
+ *  prefsPtr is optional : when NULL is provided, preferences will be set to cover worst case scenario.
+ *  tech details :
+ * @return if automatic flushing is not enabled, includes the possibility that internal buffer might already be filled by up to (blockSize-1) bytes.
+ *  It also includes frame footer (ending + checksum), since it might be generated by LZ4F_compressEnd().
+ * @return doesn't include frame header, as it was already generated by LZ4F_compressBegin().
+ */
+LZ4FLIB_API size_t LZ4F_compressBound(size_t srcSize, const LZ4F_preferences_t* prefsPtr);
+
+/*! LZ4F_compressUpdate() :
+ *  LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
+ *  Important rule: dstCapacity MUST be large enough to ensure operation success even in worst case situations.
+ *  This value is provided by LZ4F_compressBound().
+ *  If this condition is not respected, LZ4F_compress() will fail (result is an errorCode).
+ *  After an error, the state is left in a UB state, and must be re-initialized or freed.
+ *  If previously an uncompressed block was written, buffered data is flushed
+ *  before appending compressed data is continued.
+ * `cOptPtr` is optional : NULL can be provided, in which case all options are set to default.
+ * @return : number of bytes written into `dstBuffer` (it can be zero, meaning input data was just buffered).
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ */
+LZ4FLIB_API size_t LZ4F_compressUpdate(LZ4F_cctx* cctx,
+                                       void* dstBuffer, size_t dstCapacity,
+                                 const void* srcBuffer, size_t srcSize,
+                                 const LZ4F_compressOptions_t* cOptPtr);
+
+/*! LZ4F_flush() :
+ *  When data must be generated and sent immediately, without waiting for a block to be completely filled,
+ *  it's possible to call LZ4_flush(). It will immediately compress any data buffered within cctx.
+ * `dstCapacity` must be large enough to ensure the operation will be successful.
+ * `cOptPtr` is optional : it's possible to provide NULL, all options will be set to default.
+ * @return : nb of bytes written into dstBuffer (can be zero, when there is no data stored within cctx)
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ *  Note : LZ4F_flush() is guaranteed to be successful when dstCapacity >= LZ4F_compressBound(0, prefsPtr).
+ */
+LZ4FLIB_API size_t LZ4F_flush(LZ4F_cctx* cctx,
+                              void* dstBuffer, size_t dstCapacity,
+                        const LZ4F_compressOptions_t* cOptPtr);
+
+/*! LZ4F_compressEnd() :
+ *  To properly finish an LZ4 frame, invoke LZ4F_compressEnd().
+ *  It will flush whatever data remained within `cctx` (like LZ4_flush())
+ *  and properly finalize the frame, with an endMark and a checksum.
+ * `cOptPtr` is optional : NULL can be provided, in which case all options will be set to default.
+ * @return : nb of bytes written into dstBuffer, necessarily >= 4 (endMark),
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ *  Note : LZ4F_compressEnd() is guaranteed to be successful when dstCapacity >= LZ4F_compressBound(0, prefsPtr).
+ *  A successful call to LZ4F_compressEnd() makes `cctx` available again for another compression task.
+ */
+LZ4FLIB_API size_t LZ4F_compressEnd(LZ4F_cctx* cctx,
+                                    void* dstBuffer, size_t dstCapacity,
+                              const LZ4F_compressOptions_t* cOptPtr);
+
+
+/*-*********************************
+*  Decompression functions
+***********************************/
+typedef struct LZ4F_dctx_s LZ4F_dctx;   /* incomplete type */
+typedef LZ4F_dctx* LZ4F_decompressionContext_t;   /* compatibility with previous API versions */
+
+typedef struct {
+  unsigned stableDst;     /* pledges that last 64KB decompressed data will remain available unmodified between invocations.
+                           * This optimization skips storage operations in tmp buffers. */
+  unsigned skipChecksums; /* disable checksum calculation and verification, even when one is present in frame, to save CPU time.
+                           * Setting this option to 1 once disables all checksums for the rest of the frame. */
+  unsigned reserved1;     /* must be set to zero for forward compatibility */
+  unsigned reserved0;     /* idem */
+} LZ4F_decompressOptions_t;
+
+
+/* Resource management */
+
+/*! LZ4F_createDecompressionContext() :
+ *  Create an LZ4F_dctx object, to track all decompression operations.
+ *  @version provided MUST be LZ4F_VERSION.
+ *  @dctxPtr MUST be valid.
+ *  The function fills @dctxPtr with the value of a pointer to an allocated and initialized LZ4F_dctx object.
+ *  The @return is an errorCode, which can be tested using LZ4F_isError().
+ *  dctx memory can be released using LZ4F_freeDecompressionContext();
+ *  Result of LZ4F_freeDecompressionContext() indicates current state of decompressionContext when being released.
+ *  That is, it should be == 0 if decompression has been completed fully and correctly.
+ */
+LZ4FLIB_API LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_dctx** dctxPtr, unsigned version);
+LZ4FLIB_API LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_dctx* dctx);
+
+
+/*-***********************************
+*  Streaming decompression functions
+*************************************/
+
+#define LZ4F_MAGICNUMBER 0x184D2204U
+#define LZ4F_MAGIC_SKIPPABLE_START 0x184D2A50U
+#define LZ4F_MIN_SIZE_TO_KNOW_HEADER_LENGTH 5
+
+/*! LZ4F_headerSize() : v1.9.0+
+ *  Provide the header size of a frame starting at `src`.
+ * `srcSize` must be >= LZ4F_MIN_SIZE_TO_KNOW_HEADER_LENGTH,
+ *  which is enough to decode the header length.
+ * @return : size of frame header
+ *           or an error code, which can be tested using LZ4F_isError()
+ *  note : Frame header size is variable, but is guaranteed to be
+ *         >= LZ4F_HEADER_SIZE_MIN bytes, and <= LZ4F_HEADER_SIZE_MAX bytes.
+ */
+LZ4FLIB_API size_t LZ4F_headerSize(const void* src, size_t srcSize);
+
+/*! LZ4F_getFrameInfo() :
+ *  This function extracts frame parameters (max blockSize, dictID, etc.).
+ *  Its usage is optional: user can also invoke LZ4F_decompress() directly.
+ *
+ *  Extracted information will fill an existing LZ4F_frameInfo_t structure.
+ *  This can be useful for allocation and dictionary identification purposes.
+ *
+ *  LZ4F_getFrameInfo() can work in the following situations :
+ *
+ *  1) At the beginning of a new frame, before any invocation of LZ4F_decompress().
+ *     It will decode header from `srcBuffer`,
+ *     consuming the header and starting the decoding process.
+ *
+ *     Input size must be large enough to contain the full frame header.
+ *     Frame header size can be known beforehand by LZ4F_headerSize().
+ *     Frame header size is variable, but is guaranteed to be >= LZ4F_HEADER_SIZE_MIN bytes,
+ *     and not more than <= LZ4F_HEADER_SIZE_MAX bytes.
+ *     Hence, blindly providing LZ4F_HEADER_SIZE_MAX bytes or more will always work.
+ *     It's allowed to provide more input data than the header size,
+ *     LZ4F_getFrameInfo() will only consume the header.
+ *
+ *     If input size is not large enough,
+ *     aka if it's smaller than header size,
+ *     function will fail and return an error code.
+ *
+ *  2) After decoding has been started,
+ *     it's possible to invoke LZ4F_getFrameInfo() anytime
+ *     to extract already decoded frame parameters stored within dctx.
+ *
+ *     Note that, if decoding has barely started,
+ *     and not yet read enough information to decode the header,
+ *     LZ4F_getFrameInfo() will fail.
+ *
+ *  The number of bytes consumed from srcBuffer will be updated in *srcSizePtr (necessarily <= original value).
+ *  LZ4F_getFrameInfo() only consumes bytes when decoding has not yet started,
+ *  and when decoding the header has been successful.
+ *  Decompression must then resume from (srcBuffer + *srcSizePtr).
+ *
+ * @return : a hint about how many srcSize bytes LZ4F_decompress() expects for next call,
+ *           or an error code which can be tested using LZ4F_isError().
+ *  note 1 : in case of error, dctx is not modified. Decoding operation can resume from beginning safely.
+ *  note 2 : frame parameters are *copied into* an already allocated LZ4F_frameInfo_t structure.
+ */
+LZ4FLIB_API size_t
+LZ4F_getFrameInfo(LZ4F_dctx* dctx,
+                  LZ4F_frameInfo_t* frameInfoPtr,
+            const void* srcBuffer, size_t* srcSizePtr);
+
+/*! LZ4F_decompress() :
+ *  Call this function repetitively to regenerate data compressed in `srcBuffer`.
+ *
+ *  The function requires a valid dctx state.
+ *  It will read up to *srcSizePtr bytes from srcBuffer,
+ *  and decompress data into dstBuffer, of capacity *dstSizePtr.
+ *
+ *  The nb of bytes consumed from srcBuffer will be written into *srcSizePtr (necessarily <= original value).
+ *  The nb of bytes decompressed into dstBuffer will be written into *dstSizePtr (necessarily <= original value).
+ *
+ *  The function does not necessarily read all input bytes, so always check value in *srcSizePtr.
+ *  Unconsumed source data must be presented again in subsequent invocations.
+ *
+ * `dstBuffer` can freely change between each consecutive function invocation.
+ * `dstBuffer` content will be overwritten.
+ *
+ * @return : an hint of how many `srcSize` bytes LZ4F_decompress() expects for next call.
+ *  Schematically, it's the size of the current (or remaining) compressed block + header of next block.
+ *  Respecting the hint provides some small speed benefit, because it skips intermediate buffers.
+ *  This is just a hint though, it's always possible to provide any srcSize.
+ *
+ *  When a frame is fully decoded, @return will be 0 (no more data expected).
+ *  When provided with more bytes than necessary to decode a frame,
+ *  LZ4F_decompress() will stop reading exactly at end of current frame, and @return 0.
+ *
+ *  If decompression failed, @return is an error code, which can be tested using LZ4F_isError().
+ *  After a decompression error, the `dctx` context is not resumable.
+ *  Use LZ4F_resetDecompressionContext() to return to clean state.
+ *
+ *  After a frame is fully decoded, dctx can be used again to decompress another frame.
+ */
+LZ4FLIB_API size_t
+LZ4F_decompress(LZ4F_dctx* dctx,
+                void* dstBuffer, size_t* dstSizePtr,
+          const void* srcBuffer, size_t* srcSizePtr,
+          const LZ4F_decompressOptions_t* dOptPtr);
+
+
+/*! LZ4F_resetDecompressionContext() : added in v1.8.0
+ *  In case of an error, the context is left in "undefined" state.
+ *  In which case, it's necessary to reset it, before re-using it.
+ *  This method can also be used to abruptly stop any unfinished decompression,
+ *  and start a new one using same context resources. */
+LZ4FLIB_API void LZ4F_resetDecompressionContext(LZ4F_dctx* dctx);   /* always successful */
+
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif  /* LZ4F_H_09782039843 */
+
+#if defined(LZ4F_STATIC_LINKING_ONLY) && !defined(LZ4F_H_STATIC_09782039843)
+#define LZ4F_H_STATIC_09782039843
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/* These declarations are not stable and may change in the future.
+ * They are therefore only safe to depend on
+ * when the caller is statically linked against the library.
+ * To access their declarations, define LZ4F_STATIC_LINKING_ONLY.
+ *
+ * By default, these symbols aren't published into shared/dynamic libraries.
+ * You can override this behavior and force them to be published
+ * by defining LZ4F_PUBLISH_STATIC_FUNCTIONS.
+ * Use at your own risk.
+ */
+#ifdef LZ4F_PUBLISH_STATIC_FUNCTIONS
+# define LZ4FLIB_STATIC_API LZ4FLIB_API
+#else
+# define LZ4FLIB_STATIC_API
+#endif
+
+
+/* ---   Error List   --- */
+#define LZ4F_LIST_ERRORS(ITEM) \
+        ITEM(OK_NoError) \
+        ITEM(ERROR_GENERIC) \
+        ITEM(ERROR_maxBlockSize_invalid) \
+        ITEM(ERROR_blockMode_invalid) \
+        ITEM(ERROR_contentChecksumFlag_invalid) \
+        ITEM(ERROR_compressionLevel_invalid) \
+        ITEM(ERROR_headerVersion_wrong) \
+        ITEM(ERROR_blockChecksum_invalid) \
+        ITEM(ERROR_reservedFlag_set) \
+        ITEM(ERROR_allocation_failed) \
+        ITEM(ERROR_srcSize_tooLarge) \
+        ITEM(ERROR_dstMaxSize_tooSmall) \
+        ITEM(ERROR_frameHeader_incomplete) \
+        ITEM(ERROR_frameType_unknown) \
+        ITEM(ERROR_frameSize_wrong) \
+        ITEM(ERROR_srcPtr_wrong) \
+        ITEM(ERROR_decompressionFailed) \
+        ITEM(ERROR_headerChecksum_invalid) \
+        ITEM(ERROR_contentChecksum_invalid) \
+        ITEM(ERROR_frameDecoding_alreadyStarted) \
+        ITEM(ERROR_compressionState_uninitialized) \
+        ITEM(ERROR_parameter_null) \
+        ITEM(ERROR_maxCode)
+
+#define LZ4F_GENERATE_ENUM(ENUM) LZ4F_##ENUM,
+
+/* enum list is exposed, to handle specific errors */
+typedef enum { LZ4F_LIST_ERRORS(LZ4F_GENERATE_ENUM)
+              _LZ4F_dummy_error_enum_for_c89_never_used } LZ4F_errorCodes;
+
+LZ4FLIB_STATIC_API LZ4F_errorCodes LZ4F_getErrorCode(size_t functionResult);
+
+
+/*! LZ4F_getBlockSize() :
+ *  Return, in scalar format (size_t),
+ *  the maximum block size associated with blockSizeID.
+**/
+LZ4FLIB_STATIC_API size_t LZ4F_getBlockSize(LZ4F_blockSizeID_t blockSizeID);
+
+/*! LZ4F_uncompressedUpdate() :
+ *  LZ4F_uncompressedUpdate() can be called repetitively to add as much data uncompressed data as necessary.
+ *  Important rule: dstCapacity MUST be large enough to store the entire source buffer as
+ *  no compression is done for this operation
+ *  If this condition is not respected, LZ4F_uncompressedUpdate() will fail (result is an errorCode).
+ *  After an error, the state is left in a UB state, and must be re-initialized or freed.
+ *  If previously a compressed block was written, buffered data is flushed
+ *  before appending uncompressed data is continued.
+ *  This is only supported when LZ4F_blockIndependent is used
+ * `cOptPtr` is optional : NULL can be provided, in which case all options are set to default.
+ * @return : number of bytes written into `dstBuffer` (it can be zero, meaning input data was just buffered).
+ *           or an error code if it fails (which can be tested using LZ4F_isError())
+ */
+LZ4FLIB_STATIC_API size_t
+LZ4F_uncompressedUpdate(LZ4F_cctx* cctx,
+                        void* dstBuffer, size_t dstCapacity,
+                  const void* srcBuffer, size_t srcSize,
+                  const LZ4F_compressOptions_t* cOptPtr);
+
+/**********************************
+ *  Bulk processing dictionary API
+ *********************************/
+
+/* A Dictionary is useful for the compression of small messages (KB range).
+ * It dramatically improves compression efficiency.
+ *
+ * LZ4 can ingest any input as dictionary, though only the last 64 KB are useful.
+ * Best results are generally achieved by using Zstandard's Dictionary Builder
+ * to generate a high-quality dictionary from a set of samples.
+ *
+ * Loading a dictionary has a cost, since it involves construction of tables.
+ * The Bulk processing dictionary API makes it possible to share this cost
+ * over an arbitrary number of compression jobs, even concurrently,
+ * markedly improving compression latency for these cases.
+ *
+ * The same dictionary will have to be used on the decompression side
+ * for decoding to be successful.
+ * To help identify the correct dictionary at decoding stage,
+ * the frame header allows optional embedding of a dictID field.
+ */
+typedef struct LZ4F_CDict_s LZ4F_CDict;
+
+/*! LZ4_createCDict() :
+ *  When compressing multiple messages / blocks using the same dictionary, it's recommended to load it just once.
+ *  LZ4_createCDict() will create a digested dictionary, ready to start future compression operations without startup delay.
+ *  LZ4_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only.
+ * `dictBuffer` can be released after LZ4_CDict creation, since its content is copied within CDict */
+LZ4FLIB_STATIC_API LZ4F_CDict* LZ4F_createCDict(const void* dictBuffer, size_t dictSize);
+LZ4FLIB_STATIC_API void        LZ4F_freeCDict(LZ4F_CDict* CDict);
+
+
+/*! LZ4_compressFrame_usingCDict() :
+ *  Compress an entire srcBuffer into a valid LZ4 frame using a digested Dictionary.
+ *  cctx must point to a context created by LZ4F_createCompressionContext().
+ *  If cdict==NULL, compress without a dictionary.
+ *  dstBuffer MUST be >= LZ4F_compressFrameBound(srcSize, preferencesPtr).
+ *  If this condition is not respected, function will fail (@return an errorCode).
+ *  The LZ4F_preferences_t structure is optional : you may provide NULL as argument,
+ *  but it's not recommended, as it's the only way to provide dictID in the frame header.
+ * @return : number of bytes written into dstBuffer.
+ *           or an error code if it fails (can be tested using LZ4F_isError()) */
+LZ4FLIB_STATIC_API size_t
+LZ4F_compressFrame_usingCDict(LZ4F_cctx* cctx,
+                              void* dst, size_t dstCapacity,
+                        const void* src, size_t srcSize,
+                        const LZ4F_CDict* cdict,
+                        const LZ4F_preferences_t* preferencesPtr);
+
+
+/*! LZ4F_compressBegin_usingCDict() :
+ *  Inits streaming dictionary compression, and writes the frame header into dstBuffer.
+ *  dstCapacity must be >= LZ4F_HEADER_SIZE_MAX bytes.
+ * `prefsPtr` is optional : you may provide NULL as argument,
+ *  however, it's the only way to provide dictID in the frame header.
+ * @return : number of bytes written into dstBuffer for the header,
+ *           or an error code (which can be tested using LZ4F_isError()) */
+LZ4FLIB_STATIC_API size_t
+LZ4F_compressBegin_usingCDict(LZ4F_cctx* cctx,
+                              void* dstBuffer, size_t dstCapacity,
+                        const LZ4F_CDict* cdict,
+                        const LZ4F_preferences_t* prefsPtr);
+
+
+/*! LZ4F_decompress_usingDict() :
+ *  Same as LZ4F_decompress(), using a predefined dictionary.
+ *  Dictionary is used "in place", without any preprocessing.
+**  It must remain accessible throughout the entire frame decoding. */
+LZ4FLIB_STATIC_API size_t
+LZ4F_decompress_usingDict(LZ4F_dctx* dctxPtr,
+                          void* dstBuffer, size_t* dstSizePtr,
+                    const void* srcBuffer, size_t* srcSizePtr,
+                    const void* dict, size_t dictSize,
+                    const LZ4F_decompressOptions_t* decompressOptionsPtr);
+
+
+/*! Custom memory allocation :
+ *  These prototypes make it possible to pass custom allocation/free functions.
+ *  LZ4F_customMem is provided at state creation time, using LZ4F_create*_advanced() listed below.
+ *  All allocation/free operations will be completed using these custom variants instead of regular <stdlib.h> ones.
+ */
+typedef void* (*LZ4F_AllocFunction) (void* opaqueState, size_t size);
+typedef void* (*LZ4F_CallocFunction) (void* opaqueState, size_t size);
+typedef void  (*LZ4F_FreeFunction) (void* opaqueState, void* address);
+typedef struct {
+    LZ4F_AllocFunction customAlloc;
+    LZ4F_CallocFunction customCalloc; /* optional; when not defined, uses customAlloc + memset */
+    LZ4F_FreeFunction customFree;
+    void* opaqueState;
+} LZ4F_CustomMem;
+static
+#ifdef __GNUC__
+__attribute__((__unused__))
+#endif
+LZ4F_CustomMem const LZ4F_defaultCMem = { NULL, NULL, NULL, NULL };  /**< this constant defers to stdlib's functions */
+
+LZ4FLIB_STATIC_API LZ4F_cctx* LZ4F_createCompressionContext_advanced(LZ4F_CustomMem customMem, unsigned version);
+LZ4FLIB_STATIC_API LZ4F_dctx* LZ4F_createDecompressionContext_advanced(LZ4F_CustomMem customMem, unsigned version);
+LZ4FLIB_STATIC_API LZ4F_CDict* LZ4F_createCDict_advanced(LZ4F_CustomMem customMem, const void* dictBuffer, size_t dictSize);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif  /* defined(LZ4F_STATIC_LINKING_ONLY) && !defined(LZ4F_H_STATIC_09782039843) */
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4frame_static.h b/extra/lz4/lz4-1.9.4/lib/lz4frame_static.h
new file mode 100644
index 000000000000..2b44a63155be
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4frame_static.h
@@ -0,0 +1,47 @@
+/*
+   LZ4 auto-framing library
+   Header File for static linking only
+   Copyright (C) 2011-2020, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/lz4/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+
+#ifndef LZ4FRAME_STATIC_H_0398209384
+#define LZ4FRAME_STATIC_H_0398209384
+
+/* The declarations that formerly were made here have been merged into
+ * lz4frame.h, protected by the LZ4F_STATIC_LINKING_ONLY macro. Going forward,
+ * it is recommended to simply include that header directly.
+ */
+
+#define LZ4F_STATIC_LINKING_ONLY
+#include "lz4frame.h"
+
+#endif /* LZ4FRAME_STATIC_H_0398209384 */
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4hc.c b/extra/lz4/lz4-1.9.4/lib/lz4hc.c
new file mode 100644
index 000000000000..b21ad6bb5994
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4hc.c
@@ -0,0 +1,1631 @@
+/*
+    LZ4 HC - High Compression Mode of LZ4
+    Copyright (C) 2011-2020, Yann Collet.
+
+    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+    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.
+
+    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.
+
+    You can contact the author at :
+       - LZ4 source repository : https://github.com/lz4/lz4
+       - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+/* note : lz4hc is not an independent module, it requires lz4.h/lz4.c for proper compilation */
+
+
+/* *************************************
+*  Tuning Parameter
+***************************************/
+
+/*! HEAPMODE :
+ *  Select how default compression function will allocate workplace memory,
+ *  in stack (0:fastest), or in heap (1:requires malloc()).
+ *  Since workplace is rather large, heap mode is recommended.
+**/
+#ifndef LZ4HC_HEAPMODE
+#  define LZ4HC_HEAPMODE 1
+#endif
+
+
+/*===    Dependency    ===*/
+#define LZ4_HC_STATIC_LINKING_ONLY
+#include "lz4hc.h"
+
+
+/*===   Common definitions   ===*/
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+#if defined (__clang__)
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+#define LZ4_COMMONDEFS_ONLY
+#ifndef LZ4_SRC_INCLUDED
+#include "lz4.c"   /* LZ4_count, constants, mem */
+#endif
+
+
+/*===   Enums   ===*/
+typedef enum { noDictCtx, usingDictCtxHc } dictCtx_directive;
+
+
+/*===   Constants   ===*/
+#define OPTIMAL_ML (int)((ML_MASK-1)+MINMATCH)
+#define LZ4_OPT_NUM   (1<<12)
+
+
+/*===   Macros   ===*/
+#define MIN(a,b)   ( (a) < (b) ? (a) : (b) )
+#define MAX(a,b)   ( (a) > (b) ? (a) : (b) )
+#define HASH_FUNCTION(i)         (((i) * 2654435761U) >> ((MINMATCH*8)-LZ4HC_HASH_LOG))
+#define DELTANEXTMAXD(p)         chainTable[(p) & LZ4HC_MAXD_MASK]    /* flexible, LZ4HC_MAXD dependent */
+#define DELTANEXTU16(table, pos) table[(U16)(pos)]   /* faster */
+/* Make fields passed to, and updated by LZ4HC_encodeSequence explicit */
+#define UPDATABLE(ip, op, anchor) &ip, &op, &anchor
+
+static U32 LZ4HC_hashPtr(const void* ptr) { return HASH_FUNCTION(LZ4_read32(ptr)); }
+
+
+/**************************************
+*  HC Compression
+**************************************/
+static void LZ4HC_clearTables (LZ4HC_CCtx_internal* hc4)
+{
+    MEM_INIT(hc4->hashTable, 0, sizeof(hc4->hashTable));
+    MEM_INIT(hc4->chainTable, 0xFF, sizeof(hc4->chainTable));
+}
+
+static void LZ4HC_init_internal (LZ4HC_CCtx_internal* hc4, const BYTE* start)
+{
+    size_t const bufferSize = (size_t)(hc4->end - hc4->prefixStart);
+    size_t newStartingOffset = bufferSize + hc4->dictLimit;
+    assert(newStartingOffset >= bufferSize);  /* check overflow */
+    if (newStartingOffset > 1 GB) {
+        LZ4HC_clearTables(hc4);
+        newStartingOffset = 0;
+    }
+    newStartingOffset += 64 KB;
+    hc4->nextToUpdate = (U32)newStartingOffset;
+    hc4->prefixStart = start;
+    hc4->end = start;
+    hc4->dictStart = start;
+    hc4->dictLimit = (U32)newStartingOffset;
+    hc4->lowLimit = (U32)newStartingOffset;
+}
+
+
+/* Update chains up to ip (excluded) */
+LZ4_FORCE_INLINE void LZ4HC_Insert (LZ4HC_CCtx_internal* hc4, const BYTE* ip)
+{
+    U16* const chainTable = hc4->chainTable;
+    U32* const hashTable  = hc4->hashTable;
+    const BYTE* const prefixPtr = hc4->prefixStart;
+    U32 const prefixIdx = hc4->dictLimit;
+    U32 const target = (U32)(ip - prefixPtr) + prefixIdx;
+    U32 idx = hc4->nextToUpdate;
+    assert(ip >= prefixPtr);
+    assert(target >= prefixIdx);
+
+    while (idx < target) {
+        U32 const h = LZ4HC_hashPtr(prefixPtr+idx-prefixIdx);
+        size_t delta = idx - hashTable[h];
+        if (delta>LZ4_DISTANCE_MAX) delta = LZ4_DISTANCE_MAX;
+        DELTANEXTU16(chainTable, idx) = (U16)delta;
+        hashTable[h] = idx;
+        idx++;
+    }
+
+    hc4->nextToUpdate = target;
+}
+
+/** LZ4HC_countBack() :
+ * @return : negative value, nb of common bytes before ip/match */
+LZ4_FORCE_INLINE
+int LZ4HC_countBack(const BYTE* const ip, const BYTE* const match,
+                    const BYTE* const iMin, const BYTE* const mMin)
+{
+    int back = 0;
+    int const min = (int)MAX(iMin - ip, mMin - match);
+    assert(min <= 0);
+    assert(ip >= iMin); assert((size_t)(ip-iMin) < (1U<<31));
+    assert(match >= mMin); assert((size_t)(match - mMin) < (1U<<31));
+    while ( (back > min)
+         && (ip[back-1] == match[back-1]) )
+            back--;
+    return back;
+}
+
+#if defined(_MSC_VER)
+#  define LZ4HC_rotl32(x,r) _rotl(x,r)
+#else
+#  define LZ4HC_rotl32(x,r) ((x << r) | (x >> (32 - r)))
+#endif
+
+
+static U32 LZ4HC_rotatePattern(size_t const rotate, U32 const pattern)
+{
+    size_t const bitsToRotate = (rotate & (sizeof(pattern) - 1)) << 3;
+    if (bitsToRotate == 0) return pattern;
+    return LZ4HC_rotl32(pattern, (int)bitsToRotate);
+}
+
+/* LZ4HC_countPattern() :
+ * pattern32 must be a sample of repetitive pattern of length 1, 2 or 4 (but not 3!) */
+static unsigned
+LZ4HC_countPattern(const BYTE* ip, const BYTE* const iEnd, U32 const pattern32)
+{
+    const BYTE* const iStart = ip;
+    reg_t const pattern = (sizeof(pattern)==8) ?
+        (reg_t)pattern32 + (((reg_t)pattern32) << (sizeof(pattern)*4)) : pattern32;
+
+    while (likely(ip < iEnd-(sizeof(pattern)-1))) {
+        reg_t const diff = LZ4_read_ARCH(ip) ^ pattern;
+        if (!diff) { ip+=sizeof(pattern); continue; }
+        ip += LZ4_NbCommonBytes(diff);
+        return (unsigned)(ip - iStart);
+    }
+
+    if (LZ4_isLittleEndian()) {
+        reg_t patternByte = pattern;
+        while ((ip<iEnd) && (*ip == (BYTE)patternByte)) {
+            ip++; patternByte >>= 8;
+        }
+    } else {  /* big endian */
+        U32 bitOffset = (sizeof(pattern)*8) - 8;
+        while (ip < iEnd) {
+            BYTE const byte = (BYTE)(pattern >> bitOffset);
+            if (*ip != byte) break;
+            ip ++; bitOffset -= 8;
+    }   }
+
+    return (unsigned)(ip - iStart);
+}
+
+/* LZ4HC_reverseCountPattern() :
+ * pattern must be a sample of repetitive pattern of length 1, 2 or 4 (but not 3!)
+ * read using natural platform endianness */
+static unsigned
+LZ4HC_reverseCountPattern(const BYTE* ip, const BYTE* const iLow, U32 pattern)
+{
+    const BYTE* const iStart = ip;
+
+    while (likely(ip >= iLow+4)) {
+        if (LZ4_read32(ip-4) != pattern) break;
+        ip -= 4;
+    }
+    {   const BYTE* bytePtr = (const BYTE*)(&pattern) + 3; /* works for any endianness */
+        while (likely(ip>iLow)) {
+            if (ip[-1] != *bytePtr) break;
+            ip--; bytePtr--;
+    }   }
+    return (unsigned)(iStart - ip);
+}
+
+/* LZ4HC_protectDictEnd() :
+ * Checks if the match is in the last 3 bytes of the dictionary, so reading the
+ * 4 byte MINMATCH would overflow.
+ * @returns true if the match index is okay.
+ */
+static int LZ4HC_protectDictEnd(U32 const dictLimit, U32 const matchIndex)
+{
+    return ((U32)((dictLimit - 1) - matchIndex) >= 3);
+}
+
+typedef enum { rep_untested, rep_not, rep_confirmed } repeat_state_e;
+typedef enum { favorCompressionRatio=0, favorDecompressionSpeed } HCfavor_e;
+
+LZ4_FORCE_INLINE int
+LZ4HC_InsertAndGetWiderMatch (
+        LZ4HC_CCtx_internal* const hc4,
+        const BYTE* const ip,
+        const BYTE* const iLowLimit, const BYTE* const iHighLimit,
+        int longest,
+        const BYTE** matchpos,
+        const BYTE** startpos,
+        const int maxNbAttempts,
+        const int patternAnalysis, const int chainSwap,
+        const dictCtx_directive dict,
+        const HCfavor_e favorDecSpeed)
+{
+    U16* const chainTable = hc4->chainTable;
+    U32* const HashTable = hc4->hashTable;
+    const LZ4HC_CCtx_internal * const dictCtx = hc4->dictCtx;
+    const BYTE* const prefixPtr = hc4->prefixStart;
+    const U32 prefixIdx = hc4->dictLimit;
+    const U32 ipIndex = (U32)(ip - prefixPtr) + prefixIdx;
+    const int withinStartDistance = (hc4->lowLimit + (LZ4_DISTANCE_MAX + 1) > ipIndex);
+    const U32 lowestMatchIndex = (withinStartDistance) ? hc4->lowLimit : ipIndex - LZ4_DISTANCE_MAX;
+    const BYTE* const dictStart = hc4->dictStart;
+    const U32 dictIdx = hc4->lowLimit;
+    const BYTE* const dictEnd = dictStart + prefixIdx - dictIdx;
+    int const lookBackLength = (int)(ip-iLowLimit);
+    int nbAttempts = maxNbAttempts;
+    U32 matchChainPos = 0;
+    U32 const pattern = LZ4_read32(ip);
+    U32 matchIndex;
+    repeat_state_e repeat = rep_untested;
+    size_t srcPatternLength = 0;
+
+    DEBUGLOG(7, "LZ4HC_InsertAndGetWiderMatch");
+    /* First Match */
+    LZ4HC_Insert(hc4, ip);
+    matchIndex = HashTable[LZ4HC_hashPtr(ip)];
+    DEBUGLOG(7, "First match at index %u / %u (lowestMatchIndex)",
+                matchIndex, lowestMatchIndex);
+
+    while ((matchIndex>=lowestMatchIndex) && (nbAttempts>0)) {
+        int matchLength=0;
+        nbAttempts--;
+        assert(matchIndex < ipIndex);
+        if (favorDecSpeed && (ipIndex - matchIndex < 8)) {
+            /* do nothing */
+        } else if (matchIndex >= prefixIdx) {   /* within current Prefix */
+            const BYTE* const matchPtr = prefixPtr + matchIndex - prefixIdx;
+            assert(matchPtr < ip);
+            assert(longest >= 1);
+            if (LZ4_read16(iLowLimit + longest - 1) == LZ4_read16(matchPtr - lookBackLength + longest - 1)) {
+                if (LZ4_read32(matchPtr) == pattern) {
+                    int const back = lookBackLength ? LZ4HC_countBack(ip, matchPtr, iLowLimit, prefixPtr) : 0;
+                    matchLength = MINMATCH + (int)LZ4_count(ip+MINMATCH, matchPtr+MINMATCH, iHighLimit);
+                    matchLength -= back;
+                    if (matchLength > longest) {
+                        longest = matchLength;
+                        *matchpos = matchPtr + back;
+                        *startpos = ip + back;
+            }   }   }
+        } else {   /* lowestMatchIndex <= matchIndex < dictLimit */
+            const BYTE* const matchPtr = dictStart + (matchIndex - dictIdx);
+            assert(matchIndex >= dictIdx);
+            if ( likely(matchIndex <= prefixIdx - 4)
+              && (LZ4_read32(matchPtr) == pattern) ) {
+                int back = 0;
+                const BYTE* vLimit = ip + (prefixIdx - matchIndex);
+                if (vLimit > iHighLimit) vLimit = iHighLimit;
+                matchLength = (int)LZ4_count(ip+MINMATCH, matchPtr+MINMATCH, vLimit) + MINMATCH;
+                if ((ip+matchLength == vLimit) && (vLimit < iHighLimit))
+                    matchLength += LZ4_count(ip+matchLength, prefixPtr, iHighLimit);
+                back = lookBackLength ? LZ4HC_countBack(ip, matchPtr, iLowLimit, dictStart) : 0;
+                matchLength -= back;
+                if (matchLength > longest) {
+                    longest = matchLength;
+                    *matchpos = prefixPtr - prefixIdx + matchIndex + back;   /* virtual pos, relative to ip, to retrieve offset */
+                    *startpos = ip + back;
+        }   }   }
+
+        if (chainSwap && matchLength==longest) {   /* better match => select a better chain */
+            assert(lookBackLength==0);   /* search forward only */
+            if (matchIndex + (U32)longest <= ipIndex) {
+                int const kTrigger = 4;
+                U32 distanceToNextMatch = 1;
+                int const end = longest - MINMATCH + 1;
+                int step = 1;
+                int accel = 1 << kTrigger;
+                int pos;
+                for (pos = 0; pos < end; pos += step) {
+                    U32 const candidateDist = DELTANEXTU16(chainTable, matchIndex + (U32)pos);
+                    step = (accel++ >> kTrigger);
+                    if (candidateDist > distanceToNextMatch) {
+                        distanceToNextMatch = candidateDist;
+                        matchChainPos = (U32)pos;
+                        accel = 1 << kTrigger;
+                }   }
+                if (distanceToNextMatch > 1) {
+                    if (distanceToNextMatch > matchIndex) break;   /* avoid overflow */
+                    matchIndex -= distanceToNextMatch;
+                    continue;
+        }   }   }
+
+        {   U32 const distNextMatch = DELTANEXTU16(chainTable, matchIndex);
+            if (patternAnalysis && distNextMatch==1 && matchChainPos==0) {
+                U32 const matchCandidateIdx = matchIndex-1;
+                /* may be a repeated pattern */
+                if (repeat == rep_untested) {
+                    if ( ((pattern & 0xFFFF) == (pattern >> 16))
+                      &  ((pattern & 0xFF)   == (pattern >> 24)) ) {
+                        repeat = rep_confirmed;
+                        srcPatternLength = LZ4HC_countPattern(ip+sizeof(pattern), iHighLimit, pattern) + sizeof(pattern);
+                    } else {
+                        repeat = rep_not;
+                }   }
+                if ( (repeat == rep_confirmed) && (matchCandidateIdx >= lowestMatchIndex)
+                  && LZ4HC_protectDictEnd(prefixIdx, matchCandidateIdx) ) {
+                    const int extDict = matchCandidateIdx < prefixIdx;
+                    const BYTE* const matchPtr = (extDict ? dictStart - dictIdx : prefixPtr - prefixIdx) + matchCandidateIdx;
+                    if (LZ4_read32(matchPtr) == pattern) {  /* good candidate */
+                        const BYTE* const iLimit = extDict ? dictEnd : iHighLimit;
+                        size_t forwardPatternLength = LZ4HC_countPattern(matchPtr+sizeof(pattern), iLimit, pattern) + sizeof(pattern);
+                        if (extDict && matchPtr + forwardPatternLength == iLimit) {
+                            U32 const rotatedPattern = LZ4HC_rotatePattern(forwardPatternLength, pattern);
+                            forwardPatternLength += LZ4HC_countPattern(prefixPtr, iHighLimit, rotatedPattern);
+                        }
+                        {   const BYTE* const lowestMatchPtr = extDict ? dictStart : prefixPtr;
+                            size_t backLength = LZ4HC_reverseCountPattern(matchPtr, lowestMatchPtr, pattern);
+                            size_t currentSegmentLength;
+                            if (!extDict
+                              && matchPtr - backLength == prefixPtr
+                              && dictIdx < prefixIdx) {
+                                U32 const rotatedPattern = LZ4HC_rotatePattern((U32)(-(int)backLength), pattern);
+                                backLength += LZ4HC_reverseCountPattern(dictEnd, dictStart, rotatedPattern);
+                            }
+                            /* Limit backLength not go further than lowestMatchIndex */
+                            backLength = matchCandidateIdx - MAX(matchCandidateIdx - (U32)backLength, lowestMatchIndex);
+                            assert(matchCandidateIdx - backLength >= lowestMatchIndex);
+                            currentSegmentLength = backLength + forwardPatternLength;
+                            /* Adjust to end of pattern if the source pattern fits, otherwise the beginning of the pattern */
+                            if ( (currentSegmentLength >= srcPatternLength)   /* current pattern segment large enough to contain full srcPatternLength */
+                              && (forwardPatternLength <= srcPatternLength) ) { /* haven't reached this position yet */
+                                U32 const newMatchIndex = matchCandidateIdx + (U32)forwardPatternLength - (U32)srcPatternLength;  /* best position, full pattern, might be followed by more match */
+                                if (LZ4HC_protectDictEnd(prefixIdx, newMatchIndex))
+                                    matchIndex = newMatchIndex;
+                                else {
+                                    /* Can only happen if started in the prefix */
+                                    assert(newMatchIndex >= prefixIdx - 3 && newMatchIndex < prefixIdx && !extDict);
+                                    matchIndex = prefixIdx;
+                                }
+                            } else {
+                                U32 const newMatchIndex = matchCandidateIdx - (U32)backLength;   /* farthest position in current segment, will find a match of length currentSegmentLength + maybe some back */
+                                if (!LZ4HC_protectDictEnd(prefixIdx, newMatchIndex)) {
+                                    assert(newMatchIndex >= prefixIdx - 3 && newMatchIndex < prefixIdx && !extDict);
+                                    matchIndex = prefixIdx;
+                                } else {
+                                    matchIndex = newMatchIndex;
+                                    if (lookBackLength==0) {  /* no back possible */
+                                        size_t const maxML = MIN(currentSegmentLength, srcPatternLength);
+                                        if ((size_t)longest < maxML) {
+                                            assert(prefixPtr - prefixIdx + matchIndex != ip);
+                                            if ((size_t)(ip - prefixPtr) + prefixIdx - matchIndex > LZ4_DISTANCE_MAX) break;
+                                            assert(maxML < 2 GB);
+                                            longest = (int)maxML;
+                                            *matchpos = prefixPtr - prefixIdx + matchIndex;   /* virtual pos, relative to ip, to retrieve offset */
+                                            *startpos = ip;
+                                        }
+                                        {   U32 const distToNextPattern = DELTANEXTU16(chainTable, matchIndex);
+                                            if (distToNextPattern > matchIndex) break;  /* avoid overflow */
+                                            matchIndex -= distToNextPattern;
+                        }   }   }   }   }
+                        continue;
+                }   }
+        }   }   /* PA optimization */
+
+        /* follow current chain */
+        matchIndex -= DELTANEXTU16(chainTable, matchIndex + matchChainPos);
+
+    }  /* while ((matchIndex>=lowestMatchIndex) && (nbAttempts)) */
+
+    if ( dict == usingDictCtxHc
+      && nbAttempts > 0
+      && ipIndex - lowestMatchIndex < LZ4_DISTANCE_MAX) {
+        size_t const dictEndOffset = (size_t)(dictCtx->end - dictCtx->prefixStart) + dictCtx->dictLimit;
+        U32 dictMatchIndex = dictCtx->hashTable[LZ4HC_hashPtr(ip)];
+        assert(dictEndOffset <= 1 GB);
+        matchIndex = dictMatchIndex + lowestMatchIndex - (U32)dictEndOffset;
+        while (ipIndex - matchIndex <= LZ4_DISTANCE_MAX && nbAttempts--) {
+            const BYTE* const matchPtr = dictCtx->prefixStart - dictCtx->dictLimit + dictMatchIndex;
+
+            if (LZ4_read32(matchPtr) == pattern) {
+                int mlt;
+                int back = 0;
+                const BYTE* vLimit = ip + (dictEndOffset - dictMatchIndex);
+                if (vLimit > iHighLimit) vLimit = iHighLimit;
+                mlt = (int)LZ4_count(ip+MINMATCH, matchPtr+MINMATCH, vLimit) + MINMATCH;
+                back = lookBackLength ? LZ4HC_countBack(ip, matchPtr, iLowLimit, dictCtx->prefixStart) : 0;
+                mlt -= back;
+                if (mlt > longest) {
+                    longest = mlt;
+                    *matchpos = prefixPtr - prefixIdx + matchIndex + back;
+                    *startpos = ip + back;
+            }   }
+
+            {   U32 const nextOffset = DELTANEXTU16(dictCtx->chainTable, dictMatchIndex);
+                dictMatchIndex -= nextOffset;
+                matchIndex -= nextOffset;
+    }   }   }
+
+    return longest;
+}
+
+LZ4_FORCE_INLINE int
+LZ4HC_InsertAndFindBestMatch(LZ4HC_CCtx_internal* const hc4,   /* Index table will be updated */
+                       const BYTE* const ip, const BYTE* const iLimit,
+                       const BYTE** matchpos,
+                       const int maxNbAttempts,
+                       const int patternAnalysis,
+                       const dictCtx_directive dict)
+{
+    const BYTE* uselessPtr = ip;
+    /* note : LZ4HC_InsertAndGetWiderMatch() is able to modify the starting position of a match (*startpos),
+     * but this won't be the case here, as we define iLowLimit==ip,
+     * so LZ4HC_InsertAndGetWiderMatch() won't be allowed to search past ip */
+    return LZ4HC_InsertAndGetWiderMatch(hc4, ip, ip, iLimit, MINMATCH-1, matchpos, &uselessPtr, maxNbAttempts, patternAnalysis, 0 /*chainSwap*/, dict, favorCompressionRatio);
+}
+
+/* LZ4HC_encodeSequence() :
+ * @return : 0 if ok,
+ *           1 if buffer issue detected */
+LZ4_FORCE_INLINE int LZ4HC_encodeSequence (
+    const BYTE** _ip,
+    BYTE** _op,
+    const BYTE** _anchor,
+    int matchLength,
+    const BYTE* const match,
+    limitedOutput_directive limit,
+    BYTE* oend)
+{
+#define ip      (*_ip)
+#define op      (*_op)
+#define anchor  (*_anchor)
+
+    size_t length;
+    BYTE* const token = op++;
+
+#if defined(LZ4_DEBUG) && (LZ4_DEBUG >= 6)
+    static const BYTE* start = NULL;
+    static U32 totalCost = 0;
+    U32 const pos = (start==NULL) ? 0 : (U32)(anchor - start);
+    U32 const ll = (U32)(ip - anchor);
+    U32 const llAdd = (ll>=15) ? ((ll-15) / 255) + 1 : 0;
+    U32 const mlAdd = (matchLength>=19) ? ((matchLength-19) / 255) + 1 : 0;
+    U32 const cost = 1 + llAdd + ll + 2 + mlAdd;
+    if (start==NULL) start = anchor;  /* only works for single segment */
+    /* g_debuglog_enable = (pos >= 2228) & (pos <= 2262); */
+    DEBUGLOG(6, "pos:%7u -- literals:%4u, match:%4i, offset:%5u, cost:%4u + %5u",
+                pos,
+                (U32)(ip - anchor), matchLength, (U32)(ip-match),
+                cost, totalCost);
+    totalCost += cost;
+#endif
+
+    /* Encode Literal length */
+    length = (size_t)(ip - anchor);
+    LZ4_STATIC_ASSERT(notLimited == 0);
+    /* Check output limit */
+    if (limit && ((op + (length / 255) + length + (2 + 1 + LASTLITERALS)) > oend)) {
+        DEBUGLOG(6, "Not enough room to write %i literals (%i bytes remaining)",
+                (int)length, (int)(oend - op));
+        return 1;
+    }
+    if (length >= RUN_MASK) {
+        size_t len = length - RUN_MASK;
+        *token = (RUN_MASK << ML_BITS);
+        for(; len >= 255 ; len -= 255) *op++ = 255;
+        *op++ = (BYTE)len;
+    } else {
+        *token = (BYTE)(length << ML_BITS);
+    }
+
+    /* Copy Literals */
+    LZ4_wildCopy8(op, anchor, op + length);
+    op += length;
+
+    /* Encode Offset */
+    assert( (ip - match) <= LZ4_DISTANCE_MAX );   /* note : consider providing offset as a value, rather than as a pointer difference */
+    LZ4_writeLE16(op, (U16)(ip - match)); op += 2;
+
+    /* Encode MatchLength */
+    assert(matchLength >= MINMATCH);
+    length = (size_t)matchLength - MINMATCH;
+    if (limit && (op + (length / 255) + (1 + LASTLITERALS) > oend)) {
+        DEBUGLOG(6, "Not enough room to write match length");
+        return 1;   /* Check output limit */
+    }
+    if (length >= ML_MASK) {
+        *token += ML_MASK;
+        length -= ML_MASK;
+        for(; length >= 510 ; length -= 510) { *op++ = 255; *op++ = 255; }
+        if (length >= 255) { length -= 255; *op++ = 255; }
+        *op++ = (BYTE)length;
+    } else {
+        *token += (BYTE)(length);
+    }
+
+    /* Prepare next loop */
+    ip += matchLength;
+    anchor = ip;
+
+    return 0;
+}
+#undef ip
+#undef op
+#undef anchor
+
+LZ4_FORCE_INLINE int LZ4HC_compress_hashChain (
+    LZ4HC_CCtx_internal* const ctx,
+    const char* const source,
+    char* const dest,
+    int* srcSizePtr,
+    int const maxOutputSize,
+    int maxNbAttempts,
+    const limitedOutput_directive limit,
+    const dictCtx_directive dict
+    )
+{
+    const int inputSize = *srcSizePtr;
+    const int patternAnalysis = (maxNbAttempts > 128);   /* levels 9+ */
+
+    const BYTE* ip = (const BYTE*) source;
+    const BYTE* anchor = ip;
+    const BYTE* const iend = ip + inputSize;
+    const BYTE* const mflimit = iend - MFLIMIT;
+    const BYTE* const matchlimit = (iend - LASTLITERALS);
+
+    BYTE* optr = (BYTE*) dest;
+    BYTE* op = (BYTE*) dest;
+    BYTE* oend = op + maxOutputSize;
+
+    int   ml0, ml, ml2, ml3;
+    const BYTE* start0;
+    const BYTE* ref0;
+    const BYTE* ref = NULL;
+    const BYTE* start2 = NULL;
+    const BYTE* ref2 = NULL;
+    const BYTE* start3 = NULL;
+    const BYTE* ref3 = NULL;
+
+    /* init */
+    *srcSizePtr = 0;
+    if (limit == fillOutput) oend -= LASTLITERALS;                  /* Hack for support LZ4 format restriction */
+    if (inputSize < LZ4_minLength) goto _last_literals;             /* Input too small, no compression (all literals) */
+
+    /* Main Loop */
+    while (ip <= mflimit) {
+        ml = LZ4HC_InsertAndFindBestMatch(ctx, ip, matchlimit, &ref, maxNbAttempts, patternAnalysis, dict);
+        if (ml<MINMATCH) { ip++; continue; }
+
+        /* saved, in case we would skip too much */
+        start0 = ip; ref0 = ref; ml0 = ml;
+
+_Search2:
+        if (ip+ml <= mflimit) {
+            ml2 = LZ4HC_InsertAndGetWiderMatch(ctx,
+                            ip + ml - 2, ip + 0, matchlimit, ml, &ref2, &start2,
+                            maxNbAttempts, patternAnalysis, 0, dict, favorCompressionRatio);
+        } else {
+            ml2 = ml;
+        }
+
+        if (ml2 == ml) { /* No better match => encode ML1 */
+            optr = op;
+            if (LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ref, limit, oend)) goto _dest_overflow;
+            continue;
+        }
+
+        if (start0 < ip) {   /* first match was skipped at least once */
+            if (start2 < ip + ml0) {  /* squeezing ML1 between ML0(original ML1) and ML2 */
+                ip = start0; ref = ref0; ml = ml0;  /* restore initial ML1 */
+        }   }
+
+        /* Here, start0==ip */
+        if ((start2 - ip) < 3) {  /* First Match too small : removed */
+            ml = ml2;
+            ip = start2;
+            ref =ref2;
+            goto _Search2;
+        }
+
+_Search3:
+        /* At this stage, we have :
+        *  ml2 > ml1, and
+        *  ip1+3 <= ip2 (usually < ip1+ml1) */
+        if ((start2 - ip) < OPTIMAL_ML) {
+            int correction;
+            int new_ml = ml;
+            if (new_ml > OPTIMAL_ML) new_ml = OPTIMAL_ML;
+            if (ip+new_ml > start2 + ml2 - MINMATCH) new_ml = (int)(start2 - ip) + ml2 - MINMATCH;
+            correction = new_ml - (int)(start2 - ip);
+            if (correction > 0) {
+                start2 += correction;
+                ref2 += correction;
+                ml2 -= correction;
+            }
+        }
+        /* Now, we have start2 = ip+new_ml, with new_ml = min(ml, OPTIMAL_ML=18) */
+
+        if (start2 + ml2 <= mflimit) {
+            ml3 = LZ4HC_InsertAndGetWiderMatch(ctx,
+                            start2 + ml2 - 3, start2, matchlimit, ml2, &ref3, &start3,
+                            maxNbAttempts, patternAnalysis, 0, dict, favorCompressionRatio);
+        } else {
+            ml3 = ml2;
+        }
+
+        if (ml3 == ml2) {  /* No better match => encode ML1 and ML2 */
+            /* ip & ref are known; Now for ml */
+            if (start2 < ip+ml)  ml = (int)(start2 - ip);
+            /* Now, encode 2 sequences */
+            optr = op;
+            if (LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ref, limit, oend)) goto _dest_overflow;
+            ip = start2;
+            optr = op;
+            if (LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml2, ref2, limit, oend)) {
+                ml  = ml2;
+                ref = ref2;
+                goto _dest_overflow;
+            }
+            continue;
+        }
+
+        if (start3 < ip+ml+3) {  /* Not enough space for match 2 : remove it */
+            if (start3 >= (ip+ml)) {  /* can write Seq1 immediately ==> Seq2 is removed, so Seq3 becomes Seq1 */
+                if (start2 < ip+ml) {
+                    int correction = (int)(ip+ml - start2);
+                    start2 += correction;
+                    ref2 += correction;
+                    ml2 -= correction;
+                    if (ml2 < MINMATCH) {
+                        start2 = start3;
+                        ref2 = ref3;
+                        ml2 = ml3;
+                    }
+                }
+
+                optr = op;
+                if (LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ref, limit, oend)) goto _dest_overflow;
+                ip  = start3;
+                ref = ref3;
+                ml  = ml3;
+
+                start0 = start2;
+                ref0 = ref2;
+                ml0 = ml2;
+                goto _Search2;
+            }
+
+            start2 = start3;
+            ref2 = ref3;
+            ml2 = ml3;
+            goto _Search3;
+        }
+
+        /*
+        * OK, now we have 3 ascending matches;
+        * let's write the first one ML1.
+        * ip & ref are known; Now decide ml.
+        */
+        if (start2 < ip+ml) {
+            if ((start2 - ip) < OPTIMAL_ML) {
+                int correction;
+                if (ml > OPTIMAL_ML) ml = OPTIMAL_ML;
+                if (ip + ml > start2 + ml2 - MINMATCH) ml = (int)(start2 - ip) + ml2 - MINMATCH;
+                correction = ml - (int)(start2 - ip);
+                if (correction > 0) {
+                    start2 += correction;
+                    ref2 += correction;
+                    ml2 -= correction;
+                }
+            } else {
+                ml = (int)(start2 - ip);
+            }
+        }
+        optr = op;
+        if (LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ref, limit, oend)) goto _dest_overflow;
+
+        /* ML2 becomes ML1 */
+        ip = start2; ref = ref2; ml = ml2;
+
+        /* ML3 becomes ML2 */
+        start2 = start3; ref2 = ref3; ml2 = ml3;
+
+        /* let's find a new ML3 */
+        goto _Search3;
+    }
+
+_last_literals:
+    /* Encode Last Literals */
+    {   size_t lastRunSize = (size_t)(iend - anchor);  /* literals */
+        size_t llAdd = (lastRunSize + 255 - RUN_MASK) / 255;
+        size_t const totalSize = 1 + llAdd + lastRunSize;
+        if (limit == fillOutput) oend += LASTLITERALS;  /* restore correct value */
+        if (limit && (op + totalSize > oend)) {
+            if (limit == limitedOutput) return 0;
+            /* adapt lastRunSize to fill 'dest' */
+            lastRunSize  = (size_t)(oend - op) - 1 /*token*/;
+            llAdd = (lastRunSize + 256 - RUN_MASK) / 256;
+            lastRunSize -= llAdd;
+        }
+        DEBUGLOG(6, "Final literal run : %i literals", (int)lastRunSize);
+        ip = anchor + lastRunSize;  /* can be != iend if limit==fillOutput */
+
+        if (lastRunSize >= RUN_MASK) {
+            size_t accumulator = lastRunSize - RUN_MASK;
+            *op++ = (RUN_MASK << ML_BITS);
+            for(; accumulator >= 255 ; accumulator -= 255) *op++ = 255;
+            *op++ = (BYTE) accumulator;
+        } else {
+            *op++ = (BYTE)(lastRunSize << ML_BITS);
+        }
+        LZ4_memcpy(op, anchor, lastRunSize);
+        op += lastRunSize;
+    }
+
+    /* End */
+    *srcSizePtr = (int) (((const char*)ip) - source);
+    return (int) (((char*)op)-dest);
+
+_dest_overflow:
+    if (limit == fillOutput) {
+        /* Assumption : ip, anchor, ml and ref must be set correctly */
+        size_t const ll = (size_t)(ip - anchor);
+        size_t const ll_addbytes = (ll + 240) / 255;
+        size_t const ll_totalCost = 1 + ll_addbytes + ll;
+        BYTE* const maxLitPos = oend - 3; /* 2 for offset, 1 for token */
+        DEBUGLOG(6, "Last sequence overflowing");
+        op = optr;  /* restore correct out pointer */
+        if (op + ll_totalCost <= maxLitPos) {
+            /* ll validated; now adjust match length */
+            size_t const bytesLeftForMl = (size_t)(maxLitPos - (op+ll_totalCost));
+            size_t const maxMlSize = MINMATCH + (ML_MASK-1) + (bytesLeftForMl * 255);
+            assert(maxMlSize < INT_MAX); assert(ml >= 0);
+            if ((size_t)ml > maxMlSize) ml = (int)maxMlSize;
+            if ((oend + LASTLITERALS) - (op + ll_totalCost + 2) - 1 + ml >= MFLIMIT) {
+                LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ref, notLimited, oend);
+        }   }
+        goto _last_literals;
+    }
+    /* compression failed */
+    return 0;
+}
+
+
+static int LZ4HC_compress_optimal( LZ4HC_CCtx_internal* ctx,
+    const char* const source, char* dst,
+    int* srcSizePtr, int dstCapacity,
+    int const nbSearches, size_t sufficient_len,
+    const limitedOutput_directive limit, int const fullUpdate,
+    const dictCtx_directive dict,
+    const HCfavor_e favorDecSpeed);
+
+
+LZ4_FORCE_INLINE int LZ4HC_compress_generic_internal (
+    LZ4HC_CCtx_internal* const ctx,
+    const char* const src,
+    char* const dst,
+    int* const srcSizePtr,
+    int const dstCapacity,
+    int cLevel,
+    const limitedOutput_directive limit,
+    const dictCtx_directive dict
+    )
+{
+    typedef enum { lz4hc, lz4opt } lz4hc_strat_e;
+    typedef struct {
+        lz4hc_strat_e strat;
+        int nbSearches;
+        U32 targetLength;
+    } cParams_t;
+    static const cParams_t clTable[LZ4HC_CLEVEL_MAX+1] = {
+        { lz4hc,     2, 16 },  /* 0, unused */
+        { lz4hc,     2, 16 },  /* 1, unused */
+        { lz4hc,     2, 16 },  /* 2, unused */
+        { lz4hc,     4, 16 },  /* 3 */
+        { lz4hc,     8, 16 },  /* 4 */
+        { lz4hc,    16, 16 },  /* 5 */
+        { lz4hc,    32, 16 },  /* 6 */
+        { lz4hc,    64, 16 },  /* 7 */
+        { lz4hc,   128, 16 },  /* 8 */
+        { lz4hc,   256, 16 },  /* 9 */
+        { lz4opt,   96, 64 },  /*10==LZ4HC_CLEVEL_OPT_MIN*/
+        { lz4opt,  512,128 },  /*11 */
+        { lz4opt,16384,LZ4_OPT_NUM },  /* 12==LZ4HC_CLEVEL_MAX */
+    };
+
+    DEBUGLOG(4, "LZ4HC_compress_generic(ctx=%p, src=%p, srcSize=%d, limit=%d)",
+                ctx, src, *srcSizePtr, limit);
+
+    if (limit == fillOutput && dstCapacity < 1) return 0;   /* Impossible to store anything */
+    if ((U32)*srcSizePtr > (U32)LZ4_MAX_INPUT_SIZE) return 0;    /* Unsupported input size (too large or negative) */
+
+    ctx->end += *srcSizePtr;
+    if (cLevel < 1) cLevel = LZ4HC_CLEVEL_DEFAULT;   /* note : convention is different from lz4frame, maybe something to review */
+    cLevel = MIN(LZ4HC_CLEVEL_MAX, cLevel);
+    {   cParams_t const cParam = clTable[cLevel];
+        HCfavor_e const favor = ctx->favorDecSpeed ? favorDecompressionSpeed : favorCompressionRatio;
+        int result;
+
+        if (cParam.strat == lz4hc) {
+            result = LZ4HC_compress_hashChain(ctx,
+                                src, dst, srcSizePtr, dstCapacity,
+                                cParam.nbSearches, limit, dict);
+        } else {
+            assert(cParam.strat == lz4opt);
+            result = LZ4HC_compress_optimal(ctx,
+                                src, dst, srcSizePtr, dstCapacity,
+                                cParam.nbSearches, cParam.targetLength, limit,
+                                cLevel == LZ4HC_CLEVEL_MAX,   /* ultra mode */
+                                dict, favor);
+        }
+        if (result <= 0) ctx->dirty = 1;
+        return result;
+    }
+}
+
+static void LZ4HC_setExternalDict(LZ4HC_CCtx_internal* ctxPtr, const BYTE* newBlock);
+
+static int
+LZ4HC_compress_generic_noDictCtx (
+        LZ4HC_CCtx_internal* const ctx,
+        const char* const src,
+        char* const dst,
+        int* const srcSizePtr,
+        int const dstCapacity,
+        int cLevel,
+        limitedOutput_directive limit
+        )
+{
+    assert(ctx->dictCtx == NULL);
+    return LZ4HC_compress_generic_internal(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit, noDictCtx);
+}
+
+static int
+LZ4HC_compress_generic_dictCtx (
+        LZ4HC_CCtx_internal* const ctx,
+        const char* const src,
+        char* const dst,
+        int* const srcSizePtr,
+        int const dstCapacity,
+        int cLevel,
+        limitedOutput_directive limit
+        )
+{
+    const size_t position = (size_t)(ctx->end - ctx->prefixStart) + (ctx->dictLimit - ctx->lowLimit);
+    assert(ctx->dictCtx != NULL);
+    if (position >= 64 KB) {
+        ctx->dictCtx = NULL;
+        return LZ4HC_compress_generic_noDictCtx(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit);
+    } else if (position == 0 && *srcSizePtr > 4 KB) {
+        LZ4_memcpy(ctx, ctx->dictCtx, sizeof(LZ4HC_CCtx_internal));
+        LZ4HC_setExternalDict(ctx, (const BYTE *)src);
+        ctx->compressionLevel = (short)cLevel;
+        return LZ4HC_compress_generic_noDictCtx(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit);
+    } else {
+        return LZ4HC_compress_generic_internal(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit, usingDictCtxHc);
+    }
+}
+
+static int
+LZ4HC_compress_generic (
+        LZ4HC_CCtx_internal* const ctx,
+        const char* const src,
+        char* const dst,
+        int* const srcSizePtr,
+        int const dstCapacity,
+        int cLevel,
+        limitedOutput_directive limit
+        )
+{
+    if (ctx->dictCtx == NULL) {
+        return LZ4HC_compress_generic_noDictCtx(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit);
+    } else {
+        return LZ4HC_compress_generic_dictCtx(ctx, src, dst, srcSizePtr, dstCapacity, cLevel, limit);
+    }
+}
+
+
+int LZ4_sizeofStateHC(void) { return (int)sizeof(LZ4_streamHC_t); }
+
+static size_t LZ4_streamHC_t_alignment(void)
+{
+#if LZ4_ALIGN_TEST
+    typedef struct { char c; LZ4_streamHC_t t; } t_a;
+    return sizeof(t_a) - sizeof(LZ4_streamHC_t);
+#else
+    return 1;  /* effectively disabled */
+#endif
+}
+
+/* state is presumed correctly initialized,
+ * in which case its size and alignment have already been validate */
+int LZ4_compress_HC_extStateHC_fastReset (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int compressionLevel)
+{
+    LZ4HC_CCtx_internal* const ctx = &((LZ4_streamHC_t*)state)->internal_donotuse;
+    if (!LZ4_isAligned(state, LZ4_streamHC_t_alignment())) return 0;
+    LZ4_resetStreamHC_fast((LZ4_streamHC_t*)state, compressionLevel);
+    LZ4HC_init_internal (ctx, (const BYTE*)src);
+    if (dstCapacity < LZ4_compressBound(srcSize))
+        return LZ4HC_compress_generic (ctx, src, dst, &srcSize, dstCapacity, compressionLevel, limitedOutput);
+    else
+        return LZ4HC_compress_generic (ctx, src, dst, &srcSize, dstCapacity, compressionLevel, notLimited);
+}
+
+int LZ4_compress_HC_extStateHC (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int compressionLevel)
+{
+    LZ4_streamHC_t* const ctx = LZ4_initStreamHC(state, sizeof(*ctx));
+    if (ctx==NULL) return 0;   /* init failure */
+    return LZ4_compress_HC_extStateHC_fastReset(state, src, dst, srcSize, dstCapacity, compressionLevel);
+}
+
+int LZ4_compress_HC(const char* src, char* dst, int srcSize, int dstCapacity, int compressionLevel)
+{
+    int cSize;
+#if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
+    LZ4_streamHC_t* const statePtr = (LZ4_streamHC_t*)ALLOC(sizeof(LZ4_streamHC_t));
+    if (statePtr==NULL) return 0;
+#else
+    LZ4_streamHC_t state;
+    LZ4_streamHC_t* const statePtr = &state;
+#endif
+    cSize = LZ4_compress_HC_extStateHC(statePtr, src, dst, srcSize, dstCapacity, compressionLevel);
+#if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
+    FREEMEM(statePtr);
+#endif
+    return cSize;
+}
+
+/* state is presumed sized correctly (>= sizeof(LZ4_streamHC_t)) */
+int LZ4_compress_HC_destSize(void* state, const char* source, char* dest, int* sourceSizePtr, int targetDestSize, int cLevel)
+{
+    LZ4_streamHC_t* const ctx = LZ4_initStreamHC(state, sizeof(*ctx));
+    if (ctx==NULL) return 0;   /* init failure */
+    LZ4HC_init_internal(&ctx->internal_donotuse, (const BYTE*) source);
+    LZ4_setCompressionLevel(ctx, cLevel);
+    return LZ4HC_compress_generic(&ctx->internal_donotuse, source, dest, sourceSizePtr, targetDestSize, cLevel, fillOutput);
+}
+
+
+
+/**************************************
+*  Streaming Functions
+**************************************/
+/* allocation */
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4_streamHC_t* LZ4_createStreamHC(void)
+{
+    LZ4_streamHC_t* const state =
+        (LZ4_streamHC_t*)ALLOC_AND_ZERO(sizeof(LZ4_streamHC_t));
+    if (state == NULL) return NULL;
+    LZ4_setCompressionLevel(state, LZ4HC_CLEVEL_DEFAULT);
+    return state;
+}
+
+int LZ4_freeStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr)
+{
+    DEBUGLOG(4, "LZ4_freeStreamHC(%p)", LZ4_streamHCPtr);
+    if (!LZ4_streamHCPtr) return 0;  /* support free on NULL */
+    FREEMEM(LZ4_streamHCPtr);
+    return 0;
+}
+#endif
+
+
+LZ4_streamHC_t* LZ4_initStreamHC (void* buffer, size_t size)
+{
+    LZ4_streamHC_t* const LZ4_streamHCPtr = (LZ4_streamHC_t*)buffer;
+    DEBUGLOG(4, "LZ4_initStreamHC(%p, %u)", buffer, (unsigned)size);
+    /* check conditions */
+    if (buffer == NULL) return NULL;
+    if (size < sizeof(LZ4_streamHC_t)) return NULL;
+    if (!LZ4_isAligned(buffer, LZ4_streamHC_t_alignment())) return NULL;
+    /* init */
+    { LZ4HC_CCtx_internal* const hcstate = &(LZ4_streamHCPtr->internal_donotuse);
+      MEM_INIT(hcstate, 0, sizeof(*hcstate)); }
+    LZ4_setCompressionLevel(LZ4_streamHCPtr, LZ4HC_CLEVEL_DEFAULT);
+    return LZ4_streamHCPtr;
+}
+
+/* just a stub */
+void LZ4_resetStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel)
+{
+    LZ4_initStreamHC(LZ4_streamHCPtr, sizeof(*LZ4_streamHCPtr));
+    LZ4_setCompressionLevel(LZ4_streamHCPtr, compressionLevel);
+}
+
+void LZ4_resetStreamHC_fast (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel)
+{
+    DEBUGLOG(4, "LZ4_resetStreamHC_fast(%p, %d)", LZ4_streamHCPtr, compressionLevel);
+    if (LZ4_streamHCPtr->internal_donotuse.dirty) {
+        LZ4_initStreamHC(LZ4_streamHCPtr, sizeof(*LZ4_streamHCPtr));
+    } else {
+        /* preserve end - prefixStart : can trigger clearTable's threshold */
+        if (LZ4_streamHCPtr->internal_donotuse.end != NULL) {
+            LZ4_streamHCPtr->internal_donotuse.end -= (uptrval)LZ4_streamHCPtr->internal_donotuse.prefixStart;
+        } else {
+            assert(LZ4_streamHCPtr->internal_donotuse.prefixStart == NULL);
+        }
+        LZ4_streamHCPtr->internal_donotuse.prefixStart = NULL;
+        LZ4_streamHCPtr->internal_donotuse.dictCtx = NULL;
+    }
+    LZ4_setCompressionLevel(LZ4_streamHCPtr, compressionLevel);
+}
+
+void LZ4_setCompressionLevel(LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel)
+{
+    DEBUGLOG(5, "LZ4_setCompressionLevel(%p, %d)", LZ4_streamHCPtr, compressionLevel);
+    if (compressionLevel < 1) compressionLevel = LZ4HC_CLEVEL_DEFAULT;
+    if (compressionLevel > LZ4HC_CLEVEL_MAX) compressionLevel = LZ4HC_CLEVEL_MAX;
+    LZ4_streamHCPtr->internal_donotuse.compressionLevel = (short)compressionLevel;
+}
+
+void LZ4_favorDecompressionSpeed(LZ4_streamHC_t* LZ4_streamHCPtr, int favor)
+{
+    LZ4_streamHCPtr->internal_donotuse.favorDecSpeed = (favor!=0);
+}
+
+/* LZ4_loadDictHC() :
+ * LZ4_streamHCPtr is presumed properly initialized */
+int LZ4_loadDictHC (LZ4_streamHC_t* LZ4_streamHCPtr,
+              const char* dictionary, int dictSize)
+{
+    LZ4HC_CCtx_internal* const ctxPtr = &LZ4_streamHCPtr->internal_donotuse;
+    DEBUGLOG(4, "LZ4_loadDictHC(ctx:%p, dict:%p, dictSize:%d)", LZ4_streamHCPtr, dictionary, dictSize);
+    assert(LZ4_streamHCPtr != NULL);
+    if (dictSize > 64 KB) {
+        dictionary += (size_t)dictSize - 64 KB;
+        dictSize = 64 KB;
+    }
+    /* need a full initialization, there are bad side-effects when using resetFast() */
+    {   int const cLevel = ctxPtr->compressionLevel;
+        LZ4_initStreamHC(LZ4_streamHCPtr, sizeof(*LZ4_streamHCPtr));
+        LZ4_setCompressionLevel(LZ4_streamHCPtr, cLevel);
+    }
+    LZ4HC_init_internal (ctxPtr, (const BYTE*)dictionary);
+    ctxPtr->end = (const BYTE*)dictionary + dictSize;
+    if (dictSize >= 4) LZ4HC_Insert (ctxPtr, ctxPtr->end-3);
+    return dictSize;
+}
+
+void LZ4_attach_HC_dictionary(LZ4_streamHC_t *working_stream, const LZ4_streamHC_t *dictionary_stream) {
+    working_stream->internal_donotuse.dictCtx = dictionary_stream != NULL ? &(dictionary_stream->internal_donotuse) : NULL;
+}
+
+/* compression */
+
+static void LZ4HC_setExternalDict(LZ4HC_CCtx_internal* ctxPtr, const BYTE* newBlock)
+{
+    DEBUGLOG(4, "LZ4HC_setExternalDict(%p, %p)", ctxPtr, newBlock);
+    if (ctxPtr->end >= ctxPtr->prefixStart + 4)
+        LZ4HC_Insert (ctxPtr, ctxPtr->end-3);   /* Referencing remaining dictionary content */
+
+    /* Only one memory segment for extDict, so any previous extDict is lost at this stage */
+    ctxPtr->lowLimit  = ctxPtr->dictLimit;
+    ctxPtr->dictStart  = ctxPtr->prefixStart;
+    ctxPtr->dictLimit += (U32)(ctxPtr->end - ctxPtr->prefixStart);
+    ctxPtr->prefixStart = newBlock;
+    ctxPtr->end  = newBlock;
+    ctxPtr->nextToUpdate = ctxPtr->dictLimit;   /* match referencing will resume from there */
+
+    /* cannot reference an extDict and a dictCtx at the same time */
+    ctxPtr->dictCtx = NULL;
+}
+
+static int
+LZ4_compressHC_continue_generic (LZ4_streamHC_t* LZ4_streamHCPtr,
+                                 const char* src, char* dst,
+                                 int* srcSizePtr, int dstCapacity,
+                                 limitedOutput_directive limit)
+{
+    LZ4HC_CCtx_internal* const ctxPtr = &LZ4_streamHCPtr->internal_donotuse;
+    DEBUGLOG(5, "LZ4_compressHC_continue_generic(ctx=%p, src=%p, srcSize=%d, limit=%d)",
+                LZ4_streamHCPtr, src, *srcSizePtr, limit);
+    assert(ctxPtr != NULL);
+    /* auto-init if forgotten */
+    if (ctxPtr->prefixStart == NULL) LZ4HC_init_internal (ctxPtr, (const BYTE*) src);
+
+    /* Check overflow */
+    if ((size_t)(ctxPtr->end - ctxPtr->prefixStart) + ctxPtr->dictLimit > 2 GB) {
+        size_t dictSize = (size_t)(ctxPtr->end - ctxPtr->prefixStart);
+        if (dictSize > 64 KB) dictSize = 64 KB;
+        LZ4_loadDictHC(LZ4_streamHCPtr, (const char*)(ctxPtr->end) - dictSize, (int)dictSize);
+    }
+
+    /* Check if blocks follow each other */
+    if ((const BYTE*)src != ctxPtr->end)
+        LZ4HC_setExternalDict(ctxPtr, (const BYTE*)src);
+
+    /* Check overlapping input/dictionary space */
+    {   const BYTE* sourceEnd = (const BYTE*) src + *srcSizePtr;
+        const BYTE* const dictBegin = ctxPtr->dictStart;
+        const BYTE* const dictEnd   = ctxPtr->dictStart + (ctxPtr->dictLimit - ctxPtr->lowLimit);
+        if ((sourceEnd > dictBegin) && ((const BYTE*)src < dictEnd)) {
+            if (sourceEnd > dictEnd) sourceEnd = dictEnd;
+            ctxPtr->lowLimit += (U32)(sourceEnd - ctxPtr->dictStart);
+            ctxPtr->dictStart += (U32)(sourceEnd - ctxPtr->dictStart);
+            if (ctxPtr->dictLimit - ctxPtr->lowLimit < 4) {
+                ctxPtr->lowLimit = ctxPtr->dictLimit;
+                ctxPtr->dictStart = ctxPtr->prefixStart;
+    }   }   }
+
+    return LZ4HC_compress_generic (ctxPtr, src, dst, srcSizePtr, dstCapacity, ctxPtr->compressionLevel, limit);
+}
+
+int LZ4_compress_HC_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* src, char* dst, int srcSize, int dstCapacity)
+{
+    if (dstCapacity < LZ4_compressBound(srcSize))
+        return LZ4_compressHC_continue_generic (LZ4_streamHCPtr, src, dst, &srcSize, dstCapacity, limitedOutput);
+    else
+        return LZ4_compressHC_continue_generic (LZ4_streamHCPtr, src, dst, &srcSize, dstCapacity, notLimited);
+}
+
+int LZ4_compress_HC_continue_destSize (LZ4_streamHC_t* LZ4_streamHCPtr, const char* src, char* dst, int* srcSizePtr, int targetDestSize)
+{
+    return LZ4_compressHC_continue_generic(LZ4_streamHCPtr, src, dst, srcSizePtr, targetDestSize, fillOutput);
+}
+
+
+
+/* LZ4_saveDictHC :
+ * save history content
+ * into a user-provided buffer
+ * which is then used to continue compression
+ */
+int LZ4_saveDictHC (LZ4_streamHC_t* LZ4_streamHCPtr, char* safeBuffer, int dictSize)
+{
+    LZ4HC_CCtx_internal* const streamPtr = &LZ4_streamHCPtr->internal_donotuse;
+    int const prefixSize = (int)(streamPtr->end - streamPtr->prefixStart);
+    DEBUGLOG(5, "LZ4_saveDictHC(%p, %p, %d)", LZ4_streamHCPtr, safeBuffer, dictSize);
+    assert(prefixSize >= 0);
+    if (dictSize > 64 KB) dictSize = 64 KB;
+    if (dictSize < 4) dictSize = 0;
+    if (dictSize > prefixSize) dictSize = prefixSize;
+    if (safeBuffer == NULL) assert(dictSize == 0);
+    if (dictSize > 0)
+        LZ4_memmove(safeBuffer, streamPtr->end - dictSize, dictSize);
+    {   U32 const endIndex = (U32)(streamPtr->end - streamPtr->prefixStart) + streamPtr->dictLimit;
+        streamPtr->end = (const BYTE*)safeBuffer + dictSize;
+        streamPtr->prefixStart = streamPtr->end - dictSize;
+        streamPtr->dictLimit = endIndex - (U32)dictSize;
+        streamPtr->lowLimit = endIndex - (U32)dictSize;
+        streamPtr->dictStart = streamPtr->prefixStart;
+        if (streamPtr->nextToUpdate < streamPtr->dictLimit)
+            streamPtr->nextToUpdate = streamPtr->dictLimit;
+    }
+    return dictSize;
+}
+
+
+/***************************************************
+*  Deprecated Functions
+***************************************************/
+
+/* These functions currently generate deprecation warnings */
+
+/* Wrappers for deprecated compression functions */
+int LZ4_compressHC(const char* src, char* dst, int srcSize) { return LZ4_compress_HC (src, dst, srcSize, LZ4_compressBound(srcSize), 0); }
+int LZ4_compressHC_limitedOutput(const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC(src, dst, srcSize, maxDstSize, 0); }
+int LZ4_compressHC2(const char* src, char* dst, int srcSize, int cLevel) { return LZ4_compress_HC (src, dst, srcSize, LZ4_compressBound(srcSize), cLevel); }
+int LZ4_compressHC2_limitedOutput(const char* src, char* dst, int srcSize, int maxDstSize, int cLevel) { return LZ4_compress_HC(src, dst, srcSize, maxDstSize, cLevel); }
+int LZ4_compressHC_withStateHC (void* state, const char* src, char* dst, int srcSize) { return LZ4_compress_HC_extStateHC (state, src, dst, srcSize, LZ4_compressBound(srcSize), 0); }
+int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC_extStateHC (state, src, dst, srcSize, maxDstSize, 0); }
+int LZ4_compressHC2_withStateHC (void* state, const char* src, char* dst, int srcSize, int cLevel) { return LZ4_compress_HC_extStateHC(state, src, dst, srcSize, LZ4_compressBound(srcSize), cLevel); }
+int LZ4_compressHC2_limitedOutput_withStateHC (void* state, const char* src, char* dst, int srcSize, int maxDstSize, int cLevel) { return LZ4_compress_HC_extStateHC(state, src, dst, srcSize, maxDstSize, cLevel); }
+int LZ4_compressHC_continue (LZ4_streamHC_t* ctx, const char* src, char* dst, int srcSize) { return LZ4_compress_HC_continue (ctx, src, dst, srcSize, LZ4_compressBound(srcSize)); }
+int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* ctx, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC_continue (ctx, src, dst, srcSize, maxDstSize); }
+
+
+/* Deprecated streaming functions */
+int LZ4_sizeofStreamStateHC(void) { return sizeof(LZ4_streamHC_t); }
+
+/* state is presumed correctly sized, aka >= sizeof(LZ4_streamHC_t)
+ * @return : 0 on success, !=0 if error */
+int LZ4_resetStreamStateHC(void* state, char* inputBuffer)
+{
+    LZ4_streamHC_t* const hc4 = LZ4_initStreamHC(state, sizeof(*hc4));
+    if (hc4 == NULL) return 1;   /* init failed */
+    LZ4HC_init_internal (&hc4->internal_donotuse, (const BYTE*)inputBuffer);
+    return 0;
+}
+
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+void* LZ4_createHC (const char* inputBuffer)
+{
+    LZ4_streamHC_t* const hc4 = LZ4_createStreamHC();
+    if (hc4 == NULL) return NULL;   /* not enough memory */
+    LZ4HC_init_internal (&hc4->internal_donotuse, (const BYTE*)inputBuffer);
+    return hc4;
+}
+
+int LZ4_freeHC (void* LZ4HC_Data)
+{
+    if (!LZ4HC_Data) return 0;  /* support free on NULL */
+    FREEMEM(LZ4HC_Data);
+    return 0;
+}
+#endif
+
+int LZ4_compressHC2_continue (void* LZ4HC_Data, const char* src, char* dst, int srcSize, int cLevel)
+{
+    return LZ4HC_compress_generic (&((LZ4_streamHC_t*)LZ4HC_Data)->internal_donotuse, src, dst, &srcSize, 0, cLevel, notLimited);
+}
+
+int LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* src, char* dst, int srcSize, int dstCapacity, int cLevel)
+{
+    return LZ4HC_compress_generic (&((LZ4_streamHC_t*)LZ4HC_Data)->internal_donotuse, src, dst, &srcSize, dstCapacity, cLevel, limitedOutput);
+}
+
+char* LZ4_slideInputBufferHC(void* LZ4HC_Data)
+{
+    LZ4_streamHC_t* const ctx = (LZ4_streamHC_t*)LZ4HC_Data;
+    const BYTE* bufferStart = ctx->internal_donotuse.prefixStart - ctx->internal_donotuse.dictLimit + ctx->internal_donotuse.lowLimit;
+    LZ4_resetStreamHC_fast(ctx, ctx->internal_donotuse.compressionLevel);
+    /* avoid const char * -> char * conversion warning :( */
+    return (char*)(uptrval)bufferStart;
+}
+
+
+/* ================================================
+ *  LZ4 Optimal parser (levels [LZ4HC_CLEVEL_OPT_MIN - LZ4HC_CLEVEL_MAX])
+ * ===============================================*/
+typedef struct {
+    int price;
+    int off;
+    int mlen;
+    int litlen;
+} LZ4HC_optimal_t;
+
+/* price in bytes */
+LZ4_FORCE_INLINE int LZ4HC_literalsPrice(int const litlen)
+{
+    int price = litlen;
+    assert(litlen >= 0);
+    if (litlen >= (int)RUN_MASK)
+        price += 1 + ((litlen-(int)RUN_MASK) / 255);
+    return price;
+}
+
+
+/* requires mlen >= MINMATCH */
+LZ4_FORCE_INLINE int LZ4HC_sequencePrice(int litlen, int mlen)
+{
+    int price = 1 + 2 ; /* token + 16-bit offset */
+    assert(litlen >= 0);
+    assert(mlen >= MINMATCH);
+
+    price += LZ4HC_literalsPrice(litlen);
+
+    if (mlen >= (int)(ML_MASK+MINMATCH))
+        price += 1 + ((mlen-(int)(ML_MASK+MINMATCH)) / 255);
+
+    return price;
+}
+
+
+typedef struct {
+    int off;
+    int len;
+} LZ4HC_match_t;
+
+LZ4_FORCE_INLINE LZ4HC_match_t
+LZ4HC_FindLongerMatch(LZ4HC_CCtx_internal* const ctx,
+                      const BYTE* ip, const BYTE* const iHighLimit,
+                      int minLen, int nbSearches,
+                      const dictCtx_directive dict,
+                      const HCfavor_e favorDecSpeed)
+{
+    LZ4HC_match_t match = { 0 , 0 };
+    const BYTE* matchPtr = NULL;
+    /* note : LZ4HC_InsertAndGetWiderMatch() is able to modify the starting position of a match (*startpos),
+     * but this won't be the case here, as we define iLowLimit==ip,
+     * so LZ4HC_InsertAndGetWiderMatch() won't be allowed to search past ip */
+    int matchLength = LZ4HC_InsertAndGetWiderMatch(ctx, ip, ip, iHighLimit, minLen, &matchPtr, &ip, nbSearches, 1 /*patternAnalysis*/, 1 /*chainSwap*/, dict, favorDecSpeed);
+    if (matchLength <= minLen) return match;
+    if (favorDecSpeed) {
+        if ((matchLength>18) & (matchLength<=36)) matchLength=18;   /* favor shortcut */
+    }
+    match.len = matchLength;
+    match.off = (int)(ip-matchPtr);
+    return match;
+}
+
+
+static int LZ4HC_compress_optimal ( LZ4HC_CCtx_internal* ctx,
+                                    const char* const source,
+                                    char* dst,
+                                    int* srcSizePtr,
+                                    int dstCapacity,
+                                    int const nbSearches,
+                                    size_t sufficient_len,
+                                    const limitedOutput_directive limit,
+                                    int const fullUpdate,
+                                    const dictCtx_directive dict,
+                                    const HCfavor_e favorDecSpeed)
+{
+    int retval = 0;
+#define TRAILING_LITERALS 3
+#if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
+    LZ4HC_optimal_t* const opt = (LZ4HC_optimal_t*)ALLOC(sizeof(LZ4HC_optimal_t) * (LZ4_OPT_NUM + TRAILING_LITERALS));
+#else
+    LZ4HC_optimal_t opt[LZ4_OPT_NUM + TRAILING_LITERALS];   /* ~64 KB, which is a bit large for stack... */
+#endif
+
+    const BYTE* ip = (const BYTE*) source;
+    const BYTE* anchor = ip;
+    const BYTE* const iend = ip + *srcSizePtr;
+    const BYTE* const mflimit = iend - MFLIMIT;
+    const BYTE* const matchlimit = iend - LASTLITERALS;
+    BYTE* op = (BYTE*) dst;
+    BYTE* opSaved = (BYTE*) dst;
+    BYTE* oend = op + dstCapacity;
+    int ovml = MINMATCH;  /* overflow - last sequence */
+    const BYTE* ovref = NULL;
+
+    /* init */
+#if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
+    if (opt == NULL) goto _return_label;
+#endif
+    DEBUGLOG(5, "LZ4HC_compress_optimal(dst=%p, dstCapa=%u)", dst, (unsigned)dstCapacity);
+    *srcSizePtr = 0;
+    if (limit == fillOutput) oend -= LASTLITERALS;   /* Hack for support LZ4 format restriction */
+    if (sufficient_len >= LZ4_OPT_NUM) sufficient_len = LZ4_OPT_NUM-1;
+
+    /* Main Loop */
+    while (ip <= mflimit) {
+         int const llen = (int)(ip - anchor);
+         int best_mlen, best_off;
+         int cur, last_match_pos = 0;
+
+         LZ4HC_match_t const firstMatch = LZ4HC_FindLongerMatch(ctx, ip, matchlimit, MINMATCH-1, nbSearches, dict, favorDecSpeed);
+         if (firstMatch.len==0) { ip++; continue; }
+
+         if ((size_t)firstMatch.len > sufficient_len) {
+             /* good enough solution : immediate encoding */
+             int const firstML = firstMatch.len;
+             const BYTE* const matchPos = ip - firstMatch.off;
+             opSaved = op;
+             if ( LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), firstML, matchPos, limit, oend) ) {  /* updates ip, op and anchor */
+                 ovml = firstML;
+                 ovref = matchPos;
+                 goto _dest_overflow;
+             }
+             continue;
+         }
+
+         /* set prices for first positions (literals) */
+         {   int rPos;
+             for (rPos = 0 ; rPos < MINMATCH ; rPos++) {
+                 int const cost = LZ4HC_literalsPrice(llen + rPos);
+                 opt[rPos].mlen = 1;
+                 opt[rPos].off = 0;
+                 opt[rPos].litlen = llen + rPos;
+                 opt[rPos].price = cost;
+                 DEBUGLOG(7, "rPos:%3i => price:%3i (litlen=%i) -- initial setup",
+                             rPos, cost, opt[rPos].litlen);
+         }   }
+         /* set prices using initial match */
+         {   int mlen = MINMATCH;
+             int const matchML = firstMatch.len;   /* necessarily < sufficient_len < LZ4_OPT_NUM */
+             int const offset = firstMatch.off;
+             assert(matchML < LZ4_OPT_NUM);
+             for ( ; mlen <= matchML ; mlen++) {
+                 int const cost = LZ4HC_sequencePrice(llen, mlen);
+                 opt[mlen].mlen = mlen;
+                 opt[mlen].off = offset;
+                 opt[mlen].litlen = llen;
+                 opt[mlen].price = cost;
+                 DEBUGLOG(7, "rPos:%3i => price:%3i (matchlen=%i) -- initial setup",
+                             mlen, cost, mlen);
+         }   }
+         last_match_pos = firstMatch.len;
+         {   int addLit;
+             for (addLit = 1; addLit <= TRAILING_LITERALS; addLit ++) {
+                 opt[last_match_pos+addLit].mlen = 1; /* literal */
+                 opt[last_match_pos+addLit].off = 0;
+                 opt[last_match_pos+addLit].litlen = addLit;
+                 opt[last_match_pos+addLit].price = opt[last_match_pos].price + LZ4HC_literalsPrice(addLit);
+                 DEBUGLOG(7, "rPos:%3i => price:%3i (litlen=%i) -- initial setup",
+                             last_match_pos+addLit, opt[last_match_pos+addLit].price, addLit);
+         }   }
+
+         /* check further positions */
+         for (cur = 1; cur < last_match_pos; cur++) {
+             const BYTE* const curPtr = ip + cur;
+             LZ4HC_match_t newMatch;
+
+             if (curPtr > mflimit) break;
+             DEBUGLOG(7, "rPos:%u[%u] vs [%u]%u",
+                     cur, opt[cur].price, opt[cur+1].price, cur+1);
+             if (fullUpdate) {
+                 /* not useful to search here if next position has same (or lower) cost */
+                 if ( (opt[cur+1].price <= opt[cur].price)
+                   /* in some cases, next position has same cost, but cost rises sharply after, so a small match would still be beneficial */
+                   && (opt[cur+MINMATCH].price < opt[cur].price + 3/*min seq price*/) )
+                     continue;
+             } else {
+                 /* not useful to search here if next position has same (or lower) cost */
+                 if (opt[cur+1].price <= opt[cur].price) continue;
+             }
+
+             DEBUGLOG(7, "search at rPos:%u", cur);
+             if (fullUpdate)
+                 newMatch = LZ4HC_FindLongerMatch(ctx, curPtr, matchlimit, MINMATCH-1, nbSearches, dict, favorDecSpeed);
+             else
+                 /* only test matches of minimum length; slightly faster, but misses a few bytes */
+                 newMatch = LZ4HC_FindLongerMatch(ctx, curPtr, matchlimit, last_match_pos - cur, nbSearches, dict, favorDecSpeed);
+             if (!newMatch.len) continue;
+
+             if ( ((size_t)newMatch.len > sufficient_len)
+               || (newMatch.len + cur >= LZ4_OPT_NUM) ) {
+                 /* immediate encoding */
+                 best_mlen = newMatch.len;
+                 best_off = newMatch.off;
+                 last_match_pos = cur + 1;
+                 goto encode;
+             }
+
+             /* before match : set price with literals at beginning */
+             {   int const baseLitlen = opt[cur].litlen;
+                 int litlen;
+                 for (litlen = 1; litlen < MINMATCH; litlen++) {
+                     int const price = opt[cur].price - LZ4HC_literalsPrice(baseLitlen) + LZ4HC_literalsPrice(baseLitlen+litlen);
+                     int const pos = cur + litlen;
+                     if (price < opt[pos].price) {
+                         opt[pos].mlen = 1; /* literal */
+                         opt[pos].off = 0;
+                         opt[pos].litlen = baseLitlen+litlen;
+                         opt[pos].price = price;
+                         DEBUGLOG(7, "rPos:%3i => price:%3i (litlen=%i)",
+                                     pos, price, opt[pos].litlen);
+             }   }   }
+
+             /* set prices using match at position = cur */
+             {   int const matchML = newMatch.len;
+                 int ml = MINMATCH;
+
+                 assert(cur + newMatch.len < LZ4_OPT_NUM);
+                 for ( ; ml <= matchML ; ml++) {
+                     int const pos = cur + ml;
+                     int const offset = newMatch.off;
+                     int price;
+                     int ll;
+                     DEBUGLOG(7, "testing price rPos %i (last_match_pos=%i)",
+                                 pos, last_match_pos);
+                     if (opt[cur].mlen == 1) {
+                         ll = opt[cur].litlen;
+                         price = ((cur > ll) ? opt[cur - ll].price : 0)
+                               + LZ4HC_sequencePrice(ll, ml);
+                     } else {
+                         ll = 0;
+                         price = opt[cur].price + LZ4HC_sequencePrice(0, ml);
+                     }
+
+                    assert((U32)favorDecSpeed <= 1);
+                     if (pos > last_match_pos+TRAILING_LITERALS
+                      || price <= opt[pos].price - (int)favorDecSpeed) {
+                         DEBUGLOG(7, "rPos:%3i => price:%3i (matchlen=%i)",
+                                     pos, price, ml);
+                         assert(pos < LZ4_OPT_NUM);
+                         if ( (ml == matchML)  /* last pos of last match */
+                           && (last_match_pos < pos) )
+                             last_match_pos = pos;
+                         opt[pos].mlen = ml;
+                         opt[pos].off = offset;
+                         opt[pos].litlen = ll;
+                         opt[pos].price = price;
+             }   }   }
+             /* complete following positions with literals */
+             {   int addLit;
+                 for (addLit = 1; addLit <= TRAILING_LITERALS; addLit ++) {
+                     opt[last_match_pos+addLit].mlen = 1; /* literal */
+                     opt[last_match_pos+addLit].off = 0;
+                     opt[last_match_pos+addLit].litlen = addLit;
+                     opt[last_match_pos+addLit].price = opt[last_match_pos].price + LZ4HC_literalsPrice(addLit);
+                     DEBUGLOG(7, "rPos:%3i => price:%3i (litlen=%i)", last_match_pos+addLit, opt[last_match_pos+addLit].price, addLit);
+             }   }
+         }  /* for (cur = 1; cur <= last_match_pos; cur++) */
+
+         assert(last_match_pos < LZ4_OPT_NUM + TRAILING_LITERALS);
+         best_mlen = opt[last_match_pos].mlen;
+         best_off = opt[last_match_pos].off;
+         cur = last_match_pos - best_mlen;
+
+encode: /* cur, last_match_pos, best_mlen, best_off must be set */
+         assert(cur < LZ4_OPT_NUM);
+         assert(last_match_pos >= 1);  /* == 1 when only one candidate */
+         DEBUGLOG(6, "reverse traversal, looking for shortest path (last_match_pos=%i)", last_match_pos);
+         {   int candidate_pos = cur;
+             int selected_matchLength = best_mlen;
+             int selected_offset = best_off;
+             while (1) {  /* from end to beginning */
+                 int const next_matchLength = opt[candidate_pos].mlen;  /* can be 1, means literal */
+                 int const next_offset = opt[candidate_pos].off;
+                 DEBUGLOG(7, "pos %i: sequence length %i", candidate_pos, selected_matchLength);
+                 opt[candidate_pos].mlen = selected_matchLength;
+                 opt[candidate_pos].off = selected_offset;
+                 selected_matchLength = next_matchLength;
+                 selected_offset = next_offset;
+                 if (next_matchLength > candidate_pos) break; /* last match elected, first match to encode */
+                 assert(next_matchLength > 0);  /* can be 1, means literal */
+                 candidate_pos -= next_matchLength;
+         }   }
+
+         /* encode all recorded sequences in order */
+         {   int rPos = 0;  /* relative position (to ip) */
+             while (rPos < last_match_pos) {
+                 int const ml = opt[rPos].mlen;
+                 int const offset = opt[rPos].off;
+                 if (ml == 1) { ip++; rPos++; continue; }  /* literal; note: can end up with several literals, in which case, skip them */
+                 rPos += ml;
+                 assert(ml >= MINMATCH);
+                 assert((offset >= 1) && (offset <= LZ4_DISTANCE_MAX));
+                 opSaved = op;
+                 if ( LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ml, ip - offset, limit, oend) ) {  /* updates ip, op and anchor */
+                     ovml = ml;
+                     ovref = ip - offset;
+                     goto _dest_overflow;
+         }   }   }
+     }  /* while (ip <= mflimit) */
+
+_last_literals:
+     /* Encode Last Literals */
+     {   size_t lastRunSize = (size_t)(iend - anchor);  /* literals */
+         size_t llAdd = (lastRunSize + 255 - RUN_MASK) / 255;
+         size_t const totalSize = 1 + llAdd + lastRunSize;
+         if (limit == fillOutput) oend += LASTLITERALS;  /* restore correct value */
+         if (limit && (op + totalSize > oend)) {
+             if (limit == limitedOutput) { /* Check output limit */
+                retval = 0;
+                goto _return_label;
+             }
+             /* adapt lastRunSize to fill 'dst' */
+             lastRunSize  = (size_t)(oend - op) - 1 /*token*/;
+             llAdd = (lastRunSize + 256 - RUN_MASK) / 256;
+             lastRunSize -= llAdd;
+         }
+         DEBUGLOG(6, "Final literal run : %i literals", (int)lastRunSize);
+         ip = anchor + lastRunSize; /* can be != iend if limit==fillOutput */
+
+         if (lastRunSize >= RUN_MASK) {
+             size_t accumulator = lastRunSize - RUN_MASK;
+             *op++ = (RUN_MASK << ML_BITS);
+             for(; accumulator >= 255 ; accumulator -= 255) *op++ = 255;
+             *op++ = (BYTE) accumulator;
+         } else {
+             *op++ = (BYTE)(lastRunSize << ML_BITS);
+         }
+         LZ4_memcpy(op, anchor, lastRunSize);
+         op += lastRunSize;
+     }
+
+     /* End */
+     *srcSizePtr = (int) (((const char*)ip) - source);
+     retval = (int) ((char*)op-dst);
+     goto _return_label;
+
+_dest_overflow:
+if (limit == fillOutput) {
+     /* Assumption : ip, anchor, ovml and ovref must be set correctly */
+     size_t const ll = (size_t)(ip - anchor);
+     size_t const ll_addbytes = (ll + 240) / 255;
+     size_t const ll_totalCost = 1 + ll_addbytes + ll;
+     BYTE* const maxLitPos = oend - 3; /* 2 for offset, 1 for token */
+     DEBUGLOG(6, "Last sequence overflowing (only %i bytes remaining)", (int)(oend-1-opSaved));
+     op = opSaved;  /* restore correct out pointer */
+     if (op + ll_totalCost <= maxLitPos) {
+         /* ll validated; now adjust match length */
+         size_t const bytesLeftForMl = (size_t)(maxLitPos - (op+ll_totalCost));
+         size_t const maxMlSize = MINMATCH + (ML_MASK-1) + (bytesLeftForMl * 255);
+         assert(maxMlSize < INT_MAX); assert(ovml >= 0);
+         if ((size_t)ovml > maxMlSize) ovml = (int)maxMlSize;
+         if ((oend + LASTLITERALS) - (op + ll_totalCost + 2) - 1 + ovml >= MFLIMIT) {
+             DEBUGLOG(6, "Space to end : %i + ml (%i)", (int)((oend + LASTLITERALS) - (op + ll_totalCost + 2) - 1), ovml);
+             DEBUGLOG(6, "Before : ip = %p, anchor = %p", ip, anchor);
+             LZ4HC_encodeSequence(UPDATABLE(ip, op, anchor), ovml, ovref, notLimited, oend);
+             DEBUGLOG(6, "After : ip = %p, anchor = %p", ip, anchor);
+     }   }
+     goto _last_literals;
+}
+_return_label:
+#if defined(LZ4HC_HEAPMODE) && LZ4HC_HEAPMODE==1
+     FREEMEM(opt);
+#endif
+     return retval;
+}
diff --git a/extra/lz4/lz4-1.9.4/lib/lz4hc.h b/extra/lz4/lz4-1.9.4/lib/lz4hc.h
new file mode 100644
index 000000000000..e937acfefd85
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/lz4hc.h
@@ -0,0 +1,413 @@
+/*
+   LZ4 HC - High Compression Mode of LZ4
+   Header File
+   Copyright (C) 2011-2020, Yann Collet.
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/lz4/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+#ifndef LZ4_HC_H_19834876238432
+#define LZ4_HC_H_19834876238432
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/* --- Dependency --- */
+/* note : lz4hc requires lz4.h/lz4.c for compilation */
+#include "lz4.h"   /* stddef, LZ4LIB_API, LZ4_DEPRECATED */
+
+
+/* --- Useful constants --- */
+#define LZ4HC_CLEVEL_MIN         3
+#define LZ4HC_CLEVEL_DEFAULT     9
+#define LZ4HC_CLEVEL_OPT_MIN    10
+#define LZ4HC_CLEVEL_MAX        12
+
+
+/*-************************************
+ *  Block Compression
+ **************************************/
+/*! LZ4_compress_HC() :
+ *  Compress data from `src` into `dst`, using the powerful but slower "HC" algorithm.
+ * `dst` must be already allocated.
+ *  Compression is guaranteed to succeed if `dstCapacity >= LZ4_compressBound(srcSize)` (see "lz4.h")
+ *  Max supported `srcSize` value is LZ4_MAX_INPUT_SIZE (see "lz4.h")
+ * `compressionLevel` : any value between 1 and LZ4HC_CLEVEL_MAX will work.
+ *                      Values > LZ4HC_CLEVEL_MAX behave the same as LZ4HC_CLEVEL_MAX.
+ * @return : the number of bytes written into 'dst'
+ *           or 0 if compression fails.
+ */
+LZ4LIB_API int LZ4_compress_HC (const char* src, char* dst, int srcSize, int dstCapacity, int compressionLevel);
+
+
+/* Note :
+ *   Decompression functions are provided within "lz4.h" (BSD license)
+ */
+
+
+/*! LZ4_compress_HC_extStateHC() :
+ *  Same as LZ4_compress_HC(), but using an externally allocated memory segment for `state`.
+ * `state` size is provided by LZ4_sizeofStateHC().
+ *  Memory segment must be aligned on 8-bytes boundaries (which a normal malloc() should do properly).
+ */
+LZ4LIB_API int LZ4_sizeofStateHC(void);
+LZ4LIB_API int LZ4_compress_HC_extStateHC(void* stateHC, const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel);
+
+
+/*! LZ4_compress_HC_destSize() : v1.9.0+
+ *  Will compress as much data as possible from `src`
+ *  to fit into `targetDstSize` budget.
+ *  Result is provided in 2 parts :
+ * @return : the number of bytes written into 'dst' (necessarily <= targetDstSize)
+ *           or 0 if compression fails.
+ * `srcSizePtr` : on success, *srcSizePtr is updated to indicate how much bytes were read from `src`
+ */
+LZ4LIB_API int LZ4_compress_HC_destSize(void* stateHC,
+                                  const char* src, char* dst,
+                                        int* srcSizePtr, int targetDstSize,
+                                        int compressionLevel);
+
+
+/*-************************************
+ *  Streaming Compression
+ *  Bufferless synchronous API
+ **************************************/
+ typedef union LZ4_streamHC_u LZ4_streamHC_t;   /* incomplete type (defined later) */
+
+/*! LZ4_createStreamHC() and LZ4_freeStreamHC() :
+ *  These functions create and release memory for LZ4 HC streaming state.
+ *  Newly created states are automatically initialized.
+ *  A same state can be used multiple times consecutively,
+ *  starting with LZ4_resetStreamHC_fast() to start a new stream of blocks.
+ */
+LZ4LIB_API LZ4_streamHC_t* LZ4_createStreamHC(void);
+LZ4LIB_API int             LZ4_freeStreamHC (LZ4_streamHC_t* streamHCPtr);
+
+/*
+  These functions compress data in successive blocks of any size,
+  using previous blocks as dictionary, to improve compression ratio.
+  One key assumption is that previous blocks (up to 64 KB) remain read-accessible while compressing next blocks.
+  There is an exception for ring buffers, which can be smaller than 64 KB.
+  Ring-buffer scenario is automatically detected and handled within LZ4_compress_HC_continue().
+
+  Before starting compression, state must be allocated and properly initialized.
+  LZ4_createStreamHC() does both, though compression level is set to LZ4HC_CLEVEL_DEFAULT.
+
+  Selecting the compression level can be done with LZ4_resetStreamHC_fast() (starts a new stream)
+  or LZ4_setCompressionLevel() (anytime, between blocks in the same stream) (experimental).
+  LZ4_resetStreamHC_fast() only works on states which have been properly initialized at least once,
+  which is automatically the case when state is created using LZ4_createStreamHC().
+
+  After reset, a first "fictional block" can be designated as initial dictionary,
+  using LZ4_loadDictHC() (Optional).
+
+  Invoke LZ4_compress_HC_continue() to compress each successive block.
+  The number of blocks is unlimited.
+  Previous input blocks, including initial dictionary when present,
+  must remain accessible and unmodified during compression.
+
+  It's allowed to update compression level anytime between blocks,
+  using LZ4_setCompressionLevel() (experimental).
+
+  'dst' buffer should be sized to handle worst case scenarios
+  (see LZ4_compressBound(), it ensures compression success).
+  In case of failure, the API does not guarantee recovery,
+  so the state _must_ be reset.
+  To ensure compression success
+  whenever `dst` buffer size cannot be made >= LZ4_compressBound(),
+  consider using LZ4_compress_HC_continue_destSize().
+
+  Whenever previous input blocks can't be preserved unmodified in-place during compression of next blocks,
+  it's possible to copy the last blocks into a more stable memory space, using LZ4_saveDictHC().
+  Return value of LZ4_saveDictHC() is the size of dictionary effectively saved into 'safeBuffer' (<= 64 KB)
+
+  After completing a streaming compression,
+  it's possible to start a new stream of blocks, using the same LZ4_streamHC_t state,
+  just by resetting it, using LZ4_resetStreamHC_fast().
+*/
+
+LZ4LIB_API void LZ4_resetStreamHC_fast(LZ4_streamHC_t* streamHCPtr, int compressionLevel);   /* v1.9.0+ */
+LZ4LIB_API int  LZ4_loadDictHC (LZ4_streamHC_t* streamHCPtr, const char* dictionary, int dictSize);
+
+LZ4LIB_API int LZ4_compress_HC_continue (LZ4_streamHC_t* streamHCPtr,
+                                   const char* src, char* dst,
+                                         int srcSize, int maxDstSize);
+
+/*! LZ4_compress_HC_continue_destSize() : v1.9.0+
+ *  Similar to LZ4_compress_HC_continue(),
+ *  but will read as much data as possible from `src`
+ *  to fit into `targetDstSize` budget.
+ *  Result is provided into 2 parts :
+ * @return : the number of bytes written into 'dst' (necessarily <= targetDstSize)
+ *           or 0 if compression fails.
+ * `srcSizePtr` : on success, *srcSizePtr will be updated to indicate how much bytes were read from `src`.
+ *           Note that this function may not consume the entire input.
+ */
+LZ4LIB_API int LZ4_compress_HC_continue_destSize(LZ4_streamHC_t* LZ4_streamHCPtr,
+                                           const char* src, char* dst,
+                                                 int* srcSizePtr, int targetDstSize);
+
+LZ4LIB_API int LZ4_saveDictHC (LZ4_streamHC_t* streamHCPtr, char* safeBuffer, int maxDictSize);
+
+
+
+/*^**********************************************
+ * !!!!!!   STATIC LINKING ONLY   !!!!!!
+ ***********************************************/
+
+/*-******************************************************************
+ * PRIVATE DEFINITIONS :
+ * Do not use these definitions directly.
+ * They are merely exposed to allow static allocation of `LZ4_streamHC_t`.
+ * Declare an `LZ4_streamHC_t` directly, rather than any type below.
+ * Even then, only do so in the context of static linking, as definitions may change between versions.
+ ********************************************************************/
+
+#define LZ4HC_DICTIONARY_LOGSIZE 16
+#define LZ4HC_MAXD (1<<LZ4HC_DICTIONARY_LOGSIZE)
+#define LZ4HC_MAXD_MASK (LZ4HC_MAXD - 1)
+
+#define LZ4HC_HASH_LOG 15
+#define LZ4HC_HASHTABLESIZE (1 << LZ4HC_HASH_LOG)
+#define LZ4HC_HASH_MASK (LZ4HC_HASHTABLESIZE - 1)
+
+
+/* Never ever use these definitions directly !
+ * Declare or allocate an LZ4_streamHC_t instead.
+**/
+typedef struct LZ4HC_CCtx_internal LZ4HC_CCtx_internal;
+struct LZ4HC_CCtx_internal
+{
+    LZ4_u32   hashTable[LZ4HC_HASHTABLESIZE];
+    LZ4_u16   chainTable[LZ4HC_MAXD];
+    const LZ4_byte* end;       /* next block here to continue on current prefix */
+    const LZ4_byte* prefixStart;  /* Indexes relative to this position */
+    const LZ4_byte* dictStart; /* alternate reference for extDict */
+    LZ4_u32   dictLimit;       /* below that point, need extDict */
+    LZ4_u32   lowLimit;        /* below that point, no more dict */
+    LZ4_u32   nextToUpdate;    /* index from which to continue dictionary update */
+    short     compressionLevel;
+    LZ4_i8    favorDecSpeed;   /* favor decompression speed if this flag set,
+                                  otherwise, favor compression ratio */
+    LZ4_i8    dirty;           /* stream has to be fully reset if this flag is set */
+    const LZ4HC_CCtx_internal* dictCtx;
+};
+
+#define LZ4_STREAMHC_MINSIZE  262200  /* static size, for inter-version compatibility */
+union LZ4_streamHC_u {
+    char minStateSize[LZ4_STREAMHC_MINSIZE];
+    LZ4HC_CCtx_internal internal_donotuse;
+}; /* previously typedef'd to LZ4_streamHC_t */
+
+/* LZ4_streamHC_t :
+ * This structure allows static allocation of LZ4 HC streaming state.
+ * This can be used to allocate statically on stack, or as part of a larger structure.
+ *
+ * Such state **must** be initialized using LZ4_initStreamHC() before first use.
+ *
+ * Note that invoking LZ4_initStreamHC() is not required when
+ * the state was created using LZ4_createStreamHC() (which is recommended).
+ * Using the normal builder, a newly created state is automatically initialized.
+ *
+ * Static allocation shall only be used in combination with static linking.
+ */
+
+/* LZ4_initStreamHC() : v1.9.0+
+ * Required before first use of a statically allocated LZ4_streamHC_t.
+ * Before v1.9.0 : use LZ4_resetStreamHC() instead
+ */
+LZ4LIB_API LZ4_streamHC_t* LZ4_initStreamHC(void* buffer, size_t size);
+
+
+/*-************************************
+*  Deprecated Functions
+**************************************/
+/* see lz4.h LZ4_DISABLE_DEPRECATE_WARNINGS to turn off deprecation warnings */
+
+/* deprecated compression functions */
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC               (const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2              (const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_withStateHC               (void* state, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_withStateHC              (void* state, const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_extStateHC() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_withStateHC(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_continue               (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
+
+/* Obsolete streaming functions; degraded functionality; do not use!
+ *
+ * In order to perform streaming compression, these functions depended on data
+ * that is no longer tracked in the state. They have been preserved as well as
+ * possible: using them will still produce a correct output. However, use of
+ * LZ4_slideInputBufferHC() will truncate the history of the stream, rather
+ * than preserve a window-sized chunk of history.
+ */
+#if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION)
+LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API void* LZ4_createHC (const char* inputBuffer);
+LZ4_DEPRECATED("use LZ4_freeStreamHC() instead") LZ4LIB_API   int   LZ4_freeHC (void* LZ4HC_Data);
+#endif
+LZ4_DEPRECATED("use LZ4_saveDictHC() instead") LZ4LIB_API     char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_continue               (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") LZ4LIB_API int LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
+LZ4_DEPRECATED("use LZ4_createStreamHC() instead") LZ4LIB_API int   LZ4_sizeofStreamStateHC(void);
+LZ4_DEPRECATED("use LZ4_initStreamHC() instead") LZ4LIB_API  int   LZ4_resetStreamStateHC(void* state, char* inputBuffer);
+
+
+/* LZ4_resetStreamHC() is now replaced by LZ4_initStreamHC().
+ * The intention is to emphasize the difference with LZ4_resetStreamHC_fast(),
+ * which is now the recommended function to start a new stream of blocks,
+ * but cannot be used to initialize a memory segment containing arbitrary garbage data.
+ *
+ * It is recommended to switch to LZ4_initStreamHC().
+ * LZ4_resetStreamHC() will generate deprecation warnings in a future version.
+ */
+LZ4LIB_API void LZ4_resetStreamHC (LZ4_streamHC_t* streamHCPtr, int compressionLevel);
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* LZ4_HC_H_19834876238432 */
+
+
+/*-**************************************************
+ * !!!!!     STATIC LINKING ONLY     !!!!!
+ * Following definitions are considered experimental.
+ * They should not be linked from DLL,
+ * as there is no guarantee of API stability yet.
+ * Prototypes will be promoted to "stable" status
+ * after successful usage in real-life scenarios.
+ ***************************************************/
+#ifdef LZ4_HC_STATIC_LINKING_ONLY   /* protection macro */
+#ifndef LZ4_HC_SLO_098092834
+#define LZ4_HC_SLO_098092834
+
+#define LZ4_STATIC_LINKING_ONLY   /* LZ4LIB_STATIC_API */
+#include "lz4.h"
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*! LZ4_setCompressionLevel() : v1.8.0+ (experimental)
+ *  It's possible to change compression level
+ *  between successive invocations of LZ4_compress_HC_continue*()
+ *  for dynamic adaptation.
+ */
+LZ4LIB_STATIC_API void LZ4_setCompressionLevel(
+    LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
+
+/*! LZ4_favorDecompressionSpeed() : v1.8.2+ (experimental)
+ *  Opt. Parser will favor decompression speed over compression ratio.
+ *  Only applicable to levels >= LZ4HC_CLEVEL_OPT_MIN.
+ */
+LZ4LIB_STATIC_API void LZ4_favorDecompressionSpeed(
+    LZ4_streamHC_t* LZ4_streamHCPtr, int favor);
+
+/*! LZ4_resetStreamHC_fast() : v1.9.0+
+ *  When an LZ4_streamHC_t is known to be in a internally coherent state,
+ *  it can often be prepared for a new compression with almost no work, only
+ *  sometimes falling back to the full, expensive reset that is always required
+ *  when the stream is in an indeterminate state (i.e., the reset performed by
+ *  LZ4_resetStreamHC()).
+ *
+ *  LZ4_streamHCs are guaranteed to be in a valid state when:
+ *  - returned from LZ4_createStreamHC()
+ *  - reset by LZ4_resetStreamHC()
+ *  - memset(stream, 0, sizeof(LZ4_streamHC_t))
+ *  - the stream was in a valid state and was reset by LZ4_resetStreamHC_fast()
+ *  - the stream was in a valid state and was then used in any compression call
+ *    that returned success
+ *  - the stream was in an indeterminate state and was used in a compression
+ *    call that fully reset the state (LZ4_compress_HC_extStateHC()) and that
+ *    returned success
+ *
+ *  Note:
+ *  A stream that was last used in a compression call that returned an error
+ *  may be passed to this function. However, it will be fully reset, which will
+ *  clear any existing history and settings from the context.
+ */
+LZ4LIB_STATIC_API void LZ4_resetStreamHC_fast(
+    LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
+
+/*! LZ4_compress_HC_extStateHC_fastReset() :
+ *  A variant of LZ4_compress_HC_extStateHC().
+ *
+ *  Using this variant avoids an expensive initialization step. It is only safe
+ *  to call if the state buffer is known to be correctly initialized already
+ *  (see above comment on LZ4_resetStreamHC_fast() for a definition of
+ *  "correctly initialized"). From a high level, the difference is that this
+ *  function initializes the provided state with a call to
+ *  LZ4_resetStreamHC_fast() while LZ4_compress_HC_extStateHC() starts with a
+ *  call to LZ4_resetStreamHC().
+ */
+LZ4LIB_STATIC_API int LZ4_compress_HC_extStateHC_fastReset (
+    void* state,
+    const char* src, char* dst,
+    int srcSize, int dstCapacity,
+    int compressionLevel);
+
+/*! LZ4_attach_HC_dictionary() :
+ *  This is an experimental API that allows for the efficient use of a
+ *  static dictionary many times.
+ *
+ *  Rather than re-loading the dictionary buffer into a working context before
+ *  each compression, or copying a pre-loaded dictionary's LZ4_streamHC_t into a
+ *  working LZ4_streamHC_t, this function introduces a no-copy setup mechanism,
+ *  in which the working stream references the dictionary stream in-place.
+ *
+ *  Several assumptions are made about the state of the dictionary stream.
+ *  Currently, only streams which have been prepared by LZ4_loadDictHC() should
+ *  be expected to work.
+ *
+ *  Alternatively, the provided dictionary stream pointer may be NULL, in which
+ *  case any existing dictionary stream is unset.
+ *
+ *  A dictionary should only be attached to a stream without any history (i.e.,
+ *  a stream that has just been reset).
+ *
+ *  The dictionary will remain attached to the working stream only for the
+ *  current stream session. Calls to LZ4_resetStreamHC(_fast) will remove the
+ *  dictionary context association from the working stream. The dictionary
+ *  stream (and source buffer) must remain in-place / accessible / unchanged
+ *  through the lifetime of the stream session.
+ */
+LZ4LIB_STATIC_API void LZ4_attach_HC_dictionary(
+          LZ4_streamHC_t *working_stream,
+    const LZ4_streamHC_t *dictionary_stream);
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif   /* LZ4_HC_SLO_098092834 */
+#endif   /* LZ4_HC_STATIC_LINKING_ONLY */
diff --git a/extra/lz4/lz4-1.9.4/lib/xxhash.c b/extra/lz4/lz4-1.9.4/lib/xxhash.c
new file mode 100644
index 000000000000..ff28749e3164
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/xxhash.c
@@ -0,0 +1,1030 @@
+/*
+*  xxHash - Fast Hash algorithm
+*  Copyright (C) 2012-2016, Yann Collet
+*
+*  BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+*
+*  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.
+*
+*  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.
+*
+*  You can contact the author at :
+*  - xxHash homepage: http://www.xxhash.com
+*  - xxHash source repository : https://github.com/Cyan4973/xxHash
+*/
+
+
+/* *************************************
+*  Tuning parameters
+***************************************/
+/*!XXH_FORCE_MEMORY_ACCESS :
+ * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
+ * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
+ * The below switch allow to select different access method for improved performance.
+ * Method 0 (default) : use `memcpy()`. Safe and portable.
+ * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
+ *            This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
+ * Method 2 : direct access. This method doesn't depend on compiler but violate C standard.
+ *            It can generate buggy code on targets which do not support unaligned memory accesses.
+ *            But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
+ * See http://stackoverflow.com/a/32095106/646947 for details.
+ * Prefer these methods in priority order (0 > 1 > 2)
+ */
+#ifndef XXH_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
+#  if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+                        || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
+                        || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) )
+#    define XXH_FORCE_MEMORY_ACCESS 2
+#  elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
+  (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
+                    || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
+                    || defined(__ARM_ARCH_7S__) ))
+#    define XXH_FORCE_MEMORY_ACCESS 1
+#  endif
+#endif
+
+/*!XXH_ACCEPT_NULL_INPUT_POINTER :
+ * If input pointer is NULL, xxHash default behavior is to dereference it, triggering a segfault.
+ * When this macro is enabled, xxHash actively checks input for null pointer.
+ * It it is, result for null input pointers is the same as a null-length input.
+ */
+#ifndef XXH_ACCEPT_NULL_INPUT_POINTER   /* can be defined externally */
+#  define XXH_ACCEPT_NULL_INPUT_POINTER 0
+#endif
+
+/*!XXH_FORCE_NATIVE_FORMAT :
+ * By default, xxHash library provides endian-independent Hash values, based on little-endian convention.
+ * Results are therefore identical for little-endian and big-endian CPU.
+ * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
+ * Should endian-independence be of no importance for your application, you may set the #define below to 1,
+ * to improve speed for Big-endian CPU.
+ * This option has no impact on Little_Endian CPU.
+ */
+#ifndef XXH_FORCE_NATIVE_FORMAT   /* can be defined externally */
+#  define XXH_FORCE_NATIVE_FORMAT 0
+#endif
+
+/*!XXH_FORCE_ALIGN_CHECK :
+ * This is a minor performance trick, only useful with lots of very small keys.
+ * It means : check for aligned/unaligned input.
+ * The check costs one initial branch per hash;
+ * set it to 0 when the input is guaranteed to be aligned,
+ * or when alignment doesn't matter for performance.
+ */
+#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
+#  if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+#    define XXH_FORCE_ALIGN_CHECK 0
+#  else
+#    define XXH_FORCE_ALIGN_CHECK 1
+#  endif
+#endif
+
+
+/* *************************************
+*  Includes & Memory related functions
+***************************************/
+/*! Modify the local functions below should you wish to use some other memory routines
+*   for malloc(), free() */
+#include <stdlib.h>
+static void* XXH_malloc(size_t s) { return malloc(s); }
+static void  XXH_free  (void* p)  { free(p); }
+/*! and for memcpy() */
+#include <string.h>
+static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
+
+#include <assert.h>   /* assert */
+
+#define XXH_STATIC_LINKING_ONLY
+#include "xxhash.h"
+
+
+/* *************************************
+*  Compiler Specific Options
+***************************************/
+#ifdef _MSC_VER    /* Visual Studio */
+#  pragma warning(disable : 4127)      /* disable: C4127: conditional expression is constant */
+#  define FORCE_INLINE static __forceinline
+#else
+#  if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
+#    ifdef __GNUC__
+#      define FORCE_INLINE static inline __attribute__((always_inline))
+#    else
+#      define FORCE_INLINE static inline
+#    endif
+#  else
+#    define FORCE_INLINE static
+#  endif /* __STDC_VERSION__ */
+#endif
+
+
+/* *************************************
+*  Basic Types
+***************************************/
+#ifndef MEM_MODULE
+# if !defined (__VMS) \
+  && (defined (__cplusplus) \
+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#   include <stdint.h>
+    typedef uint8_t  BYTE;
+    typedef uint16_t U16;
+    typedef uint32_t U32;
+# else
+    typedef unsigned char      BYTE;
+    typedef unsigned short     U16;
+    typedef unsigned int       U32;
+# endif
+#endif
+
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
+
+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
+static U32 XXH_read32(const void* memPtr) { return *(const U32*) memPtr; }
+
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
+
+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
+/* currently only defined for gcc and icc */
+typedef union { U32 u32; } __attribute__((packed)) unalign;
+static U32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
+
+#else
+
+/* portable and safe solution. Generally efficient.
+ * see : http://stackoverflow.com/a/32095106/646947
+ */
+static U32 XXH_read32(const void* memPtr)
+{
+    U32 val;
+    memcpy(&val, memPtr, sizeof(val));
+    return val;
+}
+
+#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
+
+
+/* ****************************************
+*  Compiler-specific Functions and Macros
+******************************************/
+#define XXH_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
+#if defined(_MSC_VER)
+#  define XXH_rotl32(x,r) _rotl(x,r)
+#  define XXH_rotl64(x,r) _rotl64(x,r)
+#else
+#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
+#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
+#endif
+
+#if defined(_MSC_VER)     /* Visual Studio */
+#  define XXH_swap32 _byteswap_ulong
+#elif XXH_GCC_VERSION >= 403
+#  define XXH_swap32 __builtin_bswap32
+#else
+static U32 XXH_swap32 (U32 x)
+{
+    return  ((x << 24) & 0xff000000 ) |
+            ((x <<  8) & 0x00ff0000 ) |
+            ((x >>  8) & 0x0000ff00 ) |
+            ((x >> 24) & 0x000000ff );
+}
+#endif
+
+
+/* *************************************
+*  Architecture Macros
+***************************************/
+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
+
+/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
+#ifndef XXH_CPU_LITTLE_ENDIAN
+static int XXH_isLittleEndian(void)
+{
+    const union { U32 u; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
+    return one.c[0];
+}
+#   define XXH_CPU_LITTLE_ENDIAN   XXH_isLittleEndian()
+#endif
+
+
+/* ***************************
+*  Memory reads
+*****************************/
+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
+
+FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
+    else
+        return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);
+}
+
+FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
+}
+
+static U32 XXH_readBE32(const void* ptr)
+{
+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
+}
+
+
+/* *************************************
+*  Macros
+***************************************/
+#define XXH_STATIC_ASSERT(c)  { enum { XXH_sa = 1/(int)(!!(c)) }; }  /* use after variable declarations */
+XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
+
+
+/* *******************************************************************
+*  32-bit hash functions
+*********************************************************************/
+static const U32 PRIME32_1 = 2654435761U;
+static const U32 PRIME32_2 = 2246822519U;
+static const U32 PRIME32_3 = 3266489917U;
+static const U32 PRIME32_4 =  668265263U;
+static const U32 PRIME32_5 =  374761393U;
+
+static U32 XXH32_round(U32 seed, U32 input)
+{
+    seed += input * PRIME32_2;
+    seed  = XXH_rotl32(seed, 13);
+    seed *= PRIME32_1;
+    return seed;
+}
+
+/* mix all bits */
+static U32 XXH32_avalanche(U32 h32)
+{
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+    return(h32);
+}
+
+#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
+
+static U32
+XXH32_finalize(U32 h32, const void* ptr, size_t len,
+                XXH_endianess endian, XXH_alignment align)
+
+{
+    const BYTE* p = (const BYTE*)ptr;
+
+#define PROCESS1               \
+    h32 += (*p++) * PRIME32_5; \
+    h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
+
+#define PROCESS4                         \
+    h32 += XXH_get32bits(p) * PRIME32_3; \
+    p+=4;                                \
+    h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
+
+    switch(len&15)  /* or switch(bEnd - p) */
+    {
+      case 12:      PROCESS4;
+                    /* fallthrough */
+      case 8:       PROCESS4;
+                    /* fallthrough */
+      case 4:       PROCESS4;
+                    return XXH32_avalanche(h32);
+
+      case 13:      PROCESS4;
+                    /* fallthrough */
+      case 9:       PROCESS4;
+                    /* fallthrough */
+      case 5:       PROCESS4;
+                    PROCESS1;
+                    return XXH32_avalanche(h32);
+
+      case 14:      PROCESS4;
+                    /* fallthrough */
+      case 10:      PROCESS4;
+                    /* fallthrough */
+      case 6:       PROCESS4;
+                    PROCESS1;
+                    PROCESS1;
+                    return XXH32_avalanche(h32);
+
+      case 15:      PROCESS4;
+                    /* fallthrough */
+      case 11:      PROCESS4;
+                    /* fallthrough */
+      case 7:       PROCESS4;
+                    /* fallthrough */
+      case 3:       PROCESS1;
+                    /* fallthrough */
+      case 2:       PROCESS1;
+                    /* fallthrough */
+      case 1:       PROCESS1;
+                    /* fallthrough */
+      case 0:       return XXH32_avalanche(h32);
+    }
+    assert(0);
+    return h32;   /* reaching this point is deemed impossible */
+}
+
+
+FORCE_INLINE U32
+XXH32_endian_align(const void* input, size_t len, U32 seed,
+                    XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U32 h32;
+
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+    if (p==NULL) {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)16;
+    }
+#endif
+
+    if (len>=16) {
+        const BYTE* const limit = bEnd - 15;
+        U32 v1 = seed + PRIME32_1 + PRIME32_2;
+        U32 v2 = seed + PRIME32_2;
+        U32 v3 = seed + 0;
+        U32 v4 = seed - PRIME32_1;
+
+        do {
+            v1 = XXH32_round(v1, XXH_get32bits(p)); p+=4;
+            v2 = XXH32_round(v2, XXH_get32bits(p)); p+=4;
+            v3 = XXH32_round(v3, XXH_get32bits(p)); p+=4;
+            v4 = XXH32_round(v4, XXH_get32bits(p)); p+=4;
+        } while (p < limit);
+
+        h32 = XXH_rotl32(v1, 1)  + XXH_rotl32(v2, 7)
+            + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
+    } else {
+        h32  = seed + PRIME32_5;
+    }
+
+    h32 += (U32)len;
+
+    return XXH32_finalize(h32, p, len&15, endian, align);
+}
+
+
+XXH_PUBLIC_API unsigned int XXH32 (const void* input, size_t len, unsigned int seed)
+{
+#if 0
+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+    XXH32_state_t state;
+    XXH32_reset(&state, seed);
+    XXH32_update(&state, input, len);
+    return XXH32_digest(&state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if (XXH_FORCE_ALIGN_CHECK) {
+        if ((((size_t)input) & 3) == 0) {   /* Input is 4-bytes aligned, leverage the speed benefit */
+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+                return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+            else
+                return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }   }
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+
+
+/*======   Hash streaming   ======*/
+
+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
+{
+    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState)
+{
+    memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, unsigned int seed)
+{
+    XXH32_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
+    memset(&state, 0, sizeof(state));
+    state.v1 = seed + PRIME32_1 + PRIME32_2;
+    state.v2 = seed + PRIME32_2;
+    state.v3 = seed + 0;
+    state.v4 = seed - PRIME32_1;
+    /* do not write into reserved, planned to be removed in a future version */
+    memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
+    return XXH_OK;
+}
+
+
+FORCE_INLINE XXH_errorcode
+XXH32_update_endian(XXH32_state_t* state, const void* input, size_t len, XXH_endianess endian)
+{
+    if (input==NULL)
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+        return XXH_OK;
+#else
+        return XXH_ERROR;
+#endif
+
+    {   const BYTE* p = (const BYTE*)input;
+        const BYTE* const bEnd = p + len;
+
+        state->total_len_32 += (unsigned)len;
+        state->large_len |= (len>=16) | (state->total_len_32>=16);
+
+        if (state->memsize + len < 16)  {   /* fill in tmp buffer */
+            XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
+            state->memsize += (unsigned)len;
+            return XXH_OK;
+        }
+
+        if (state->memsize) {   /* some data left from previous update */
+            XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
+            {   const U32* p32 = state->mem32;
+                state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
+                state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
+                state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;
+                state->v4 = XXH32_round(state->v4, XXH_readLE32(p32, endian));
+            }
+            p += 16-state->memsize;
+            state->memsize = 0;
+        }
+
+        if (p <= bEnd-16) {
+            const BYTE* const limit = bEnd - 16;
+            U32 v1 = state->v1;
+            U32 v2 = state->v2;
+            U32 v3 = state->v3;
+            U32 v4 = state->v4;
+
+            do {
+                v1 = XXH32_round(v1, XXH_readLE32(p, endian)); p+=4;
+                v2 = XXH32_round(v2, XXH_readLE32(p, endian)); p+=4;
+                v3 = XXH32_round(v3, XXH_readLE32(p, endian)); p+=4;
+                v4 = XXH32_round(v4, XXH_readLE32(p, endian)); p+=4;
+            } while (p<=limit);
+
+            state->v1 = v1;
+            state->v2 = v2;
+            state->v3 = v3;
+            state->v4 = v4;
+        }
+
+        if (p < bEnd) {
+            XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
+            state->memsize = (unsigned)(bEnd-p);
+        }
+    }
+
+    return XXH_OK;
+}
+
+
+XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+FORCE_INLINE U32
+XXH32_digest_endian (const XXH32_state_t* state, XXH_endianess endian)
+{
+    U32 h32;
+
+    if (state->large_len) {
+        h32 = XXH_rotl32(state->v1, 1)
+            + XXH_rotl32(state->v2, 7)
+            + XXH_rotl32(state->v3, 12)
+            + XXH_rotl32(state->v4, 18);
+    } else {
+        h32 = state->v3 /* == seed */ + PRIME32_5;
+    }
+
+    h32 += state->total_len_32;
+
+    return XXH32_finalize(h32, state->mem32, state->memsize, endian, XXH_aligned);
+}
+
+
+XXH_PUBLIC_API unsigned int XXH32_digest (const XXH32_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH32_digest_endian(state_in, XXH_bigEndian);
+}
+
+
+/*======   Canonical representation   ======*/
+
+/*! Default XXH result types are basic unsigned 32 and 64 bits.
+*   The canonical representation follows human-readable write convention, aka big-endian (large digits first).
+*   These functions allow transformation of hash result into and from its canonical format.
+*   This way, hash values can be written into a file or buffer, remaining comparable across different systems.
+*/
+
+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
+    memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
+{
+    return XXH_readBE32(src);
+}
+
+
+#ifndef XXH_NO_LONG_LONG
+
+/* *******************************************************************
+*  64-bit hash functions
+*********************************************************************/
+
+/*======   Memory access   ======*/
+
+#ifndef MEM_MODULE
+# define MEM_MODULE
+# if !defined (__VMS) \
+  && (defined (__cplusplus) \
+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#   include <stdint.h>
+    typedef uint64_t U64;
+# else
+    /* if compiler doesn't support unsigned long long, replace by another 64-bit type */
+    typedef unsigned long long U64;
+# endif
+#endif
+
+
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
+
+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
+static U64 XXH_read64(const void* memPtr) { return *(const U64*) memPtr; }
+
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
+
+/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
+/* currently only defined for gcc and icc */
+typedef union { U32 u32; U64 u64; } __attribute__((packed)) unalign64;
+static U64 XXH_read64(const void* ptr) { return ((const unalign64*)ptr)->u64; }
+
+#else
+
+/* portable and safe solution. Generally efficient.
+ * see : http://stackoverflow.com/a/32095106/646947
+ */
+
+static U64 XXH_read64(const void* memPtr)
+{
+    U64 val;
+    memcpy(&val, memPtr, sizeof(val));
+    return val;
+}
+
+#endif   /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
+
+#if defined(_MSC_VER)     /* Visual Studio */
+#  define XXH_swap64 _byteswap_uint64
+#elif XXH_GCC_VERSION >= 403
+#  define XXH_swap64 __builtin_bswap64
+#else
+static U64 XXH_swap64 (U64 x)
+{
+    return  ((x << 56) & 0xff00000000000000ULL) |
+            ((x << 40) & 0x00ff000000000000ULL) |
+            ((x << 24) & 0x0000ff0000000000ULL) |
+            ((x << 8)  & 0x000000ff00000000ULL) |
+            ((x >> 8)  & 0x00000000ff000000ULL) |
+            ((x >> 24) & 0x0000000000ff0000ULL) |
+            ((x >> 40) & 0x000000000000ff00ULL) |
+            ((x >> 56) & 0x00000000000000ffULL);
+}
+#endif
+
+FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
+    else
+        return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);
+}
+
+FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
+{
+    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
+}
+
+static U64 XXH_readBE64(const void* ptr)
+{
+    return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
+}
+
+
+/*======   xxh64   ======*/
+
+static const U64 PRIME64_1 = 11400714785074694791ULL;
+static const U64 PRIME64_2 = 14029467366897019727ULL;
+static const U64 PRIME64_3 =  1609587929392839161ULL;
+static const U64 PRIME64_4 =  9650029242287828579ULL;
+static const U64 PRIME64_5 =  2870177450012600261ULL;
+
+static U64 XXH64_round(U64 acc, U64 input)
+{
+    acc += input * PRIME64_2;
+    acc  = XXH_rotl64(acc, 31);
+    acc *= PRIME64_1;
+    return acc;
+}
+
+static U64 XXH64_mergeRound(U64 acc, U64 val)
+{
+    val  = XXH64_round(0, val);
+    acc ^= val;
+    acc  = acc * PRIME64_1 + PRIME64_4;
+    return acc;
+}
+
+static U64 XXH64_avalanche(U64 h64)
+{
+    h64 ^= h64 >> 33;
+    h64 *= PRIME64_2;
+    h64 ^= h64 >> 29;
+    h64 *= PRIME64_3;
+    h64 ^= h64 >> 32;
+    return h64;
+}
+
+
+#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
+
+static U64
+XXH64_finalize(U64 h64, const void* ptr, size_t len,
+               XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)ptr;
+
+#define PROCESS1_64            \
+    h64 ^= (*p++) * PRIME64_5; \
+    h64 = XXH_rotl64(h64, 11) * PRIME64_1;
+
+#define PROCESS4_64          \
+    h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1; \
+    p+=4;                    \
+    h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+
+#define PROCESS8_64 {        \
+    U64 const k1 = XXH64_round(0, XXH_get64bits(p)); \
+    p+=8;                    \
+    h64 ^= k1;               \
+    h64  = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4; \
+}
+
+    switch(len&31) {
+      case 24: PROCESS8_64;
+                    /* fallthrough */
+      case 16: PROCESS8_64;
+                    /* fallthrough */
+      case  8: PROCESS8_64;
+               return XXH64_avalanche(h64);
+
+      case 28: PROCESS8_64;
+                    /* fallthrough */
+      case 20: PROCESS8_64;
+                    /* fallthrough */
+      case 12: PROCESS8_64;
+                    /* fallthrough */
+      case  4: PROCESS4_64;
+               return XXH64_avalanche(h64);
+
+      case 25: PROCESS8_64;
+                    /* fallthrough */
+      case 17: PROCESS8_64;
+                    /* fallthrough */
+      case  9: PROCESS8_64;
+               PROCESS1_64;
+               return XXH64_avalanche(h64);
+
+      case 29: PROCESS8_64;
+                    /* fallthrough */
+      case 21: PROCESS8_64;
+                    /* fallthrough */
+      case 13: PROCESS8_64;
+                    /* fallthrough */
+      case  5: PROCESS4_64;
+               PROCESS1_64;
+               return XXH64_avalanche(h64);
+
+      case 26: PROCESS8_64;
+                    /* fallthrough */
+      case 18: PROCESS8_64;
+                    /* fallthrough */
+      case 10: PROCESS8_64;
+               PROCESS1_64;
+               PROCESS1_64;
+               return XXH64_avalanche(h64);
+
+      case 30: PROCESS8_64;
+                    /* fallthrough */
+      case 22: PROCESS8_64;
+                    /* fallthrough */
+      case 14: PROCESS8_64;
+                    /* fallthrough */
+      case  6: PROCESS4_64;
+               PROCESS1_64;
+               PROCESS1_64;
+               return XXH64_avalanche(h64);
+
+      case 27: PROCESS8_64;
+                    /* fallthrough */
+      case 19: PROCESS8_64;
+                    /* fallthrough */
+      case 11: PROCESS8_64;
+               PROCESS1_64;
+               PROCESS1_64;
+               PROCESS1_64;
+               return XXH64_avalanche(h64);
+
+      case 31: PROCESS8_64;
+                    /* fallthrough */
+      case 23: PROCESS8_64;
+                    /* fallthrough */
+      case 15: PROCESS8_64;
+                    /* fallthrough */
+      case  7: PROCESS4_64;
+                    /* fallthrough */
+      case  3: PROCESS1_64;
+                    /* fallthrough */
+      case  2: PROCESS1_64;
+                    /* fallthrough */
+      case  1: PROCESS1_64;
+                    /* fallthrough */
+      case  0: return XXH64_avalanche(h64);
+    }
+
+    /* impossible to reach */
+    assert(0);
+    return 0;  /* unreachable, but some compilers complain without it */
+}
+
+FORCE_INLINE U64
+XXH64_endian_align(const void* input, size_t len, U64 seed,
+                XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U64 h64;
+
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+    if (p==NULL) {
+        len=0;
+        bEnd=p=(const BYTE*)(size_t)32;
+    }
+#endif
+
+    if (len>=32) {
+        const BYTE* const limit = bEnd - 32;
+        U64 v1 = seed + PRIME64_1 + PRIME64_2;
+        U64 v2 = seed + PRIME64_2;
+        U64 v3 = seed + 0;
+        U64 v4 = seed - PRIME64_1;
+
+        do {
+            v1 = XXH64_round(v1, XXH_get64bits(p)); p+=8;
+            v2 = XXH64_round(v2, XXH_get64bits(p)); p+=8;
+            v3 = XXH64_round(v3, XXH_get64bits(p)); p+=8;
+            v4 = XXH64_round(v4, XXH_get64bits(p)); p+=8;
+        } while (p<=limit);
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+        h64 = XXH64_mergeRound(h64, v1);
+        h64 = XXH64_mergeRound(h64, v2);
+        h64 = XXH64_mergeRound(h64, v3);
+        h64 = XXH64_mergeRound(h64, v4);
+
+    } else {
+        h64  = seed + PRIME64_5;
+    }
+
+    h64 += (U64) len;
+
+    return XXH64_finalize(h64, p, len, endian, align);
+}
+
+
+XXH_PUBLIC_API unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
+{
+#if 0
+    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+    XXH64_state_t state;
+    XXH64_reset(&state, seed);
+    XXH64_update(&state, input, len);
+    return XXH64_digest(&state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if (XXH_FORCE_ALIGN_CHECK) {
+        if ((((size_t)input) & 7)==0) {  /* Input is aligned, let's leverage the speed advantage */
+            if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+                return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+            else
+                return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }   }
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+/*======   Hash Streaming   ======*/
+
+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
+{
+    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
+{
+    XXH_free(statePtr);
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState)
+{
+    memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, unsigned long long seed)
+{
+    XXH64_state_t state;   /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
+    memset(&state, 0, sizeof(state));
+    state.v1 = seed + PRIME64_1 + PRIME64_2;
+    state.v2 = seed + PRIME64_2;
+    state.v3 = seed + 0;
+    state.v4 = seed - PRIME64_1;
+     /* do not write into reserved, planned to be removed in a future version */
+    memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
+    return XXH_OK;
+}
+
+FORCE_INLINE XXH_errorcode
+XXH64_update_endian (XXH64_state_t* state, const void* input, size_t len, XXH_endianess endian)
+{
+    if (input==NULL)
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+        return XXH_OK;
+#else
+        return XXH_ERROR;
+#endif
+
+    {   const BYTE* p = (const BYTE*)input;
+        const BYTE* const bEnd = p + len;
+
+        state->total_len += len;
+
+        if (state->memsize + len < 32) {  /* fill in tmp buffer */
+            XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
+            state->memsize += (U32)len;
+            return XXH_OK;
+        }
+
+        if (state->memsize) {   /* tmp buffer is full */
+            XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
+            state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0, endian));
+            state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1, endian));
+            state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2, endian));
+            state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3, endian));
+            p += 32-state->memsize;
+            state->memsize = 0;
+        }
+
+        if (p+32 <= bEnd) {
+            const BYTE* const limit = bEnd - 32;
+            U64 v1 = state->v1;
+            U64 v2 = state->v2;
+            U64 v3 = state->v3;
+            U64 v4 = state->v4;
+
+            do {
+                v1 = XXH64_round(v1, XXH_readLE64(p, endian)); p+=8;
+                v2 = XXH64_round(v2, XXH_readLE64(p, endian)); p+=8;
+                v3 = XXH64_round(v3, XXH_readLE64(p, endian)); p+=8;
+                v4 = XXH64_round(v4, XXH_readLE64(p, endian)); p+=8;
+            } while (p<=limit);
+
+            state->v1 = v1;
+            state->v2 = v2;
+            state->v3 = v3;
+            state->v4 = v4;
+        }
+
+        if (p < bEnd) {
+            XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
+            state->memsize = (unsigned)(bEnd-p);
+        }
+    }
+
+    return XXH_OK;
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state, XXH_endianess endian)
+{
+    U64 h64;
+
+    if (state->total_len >= 32) {
+        U64 const v1 = state->v1;
+        U64 const v2 = state->v2;
+        U64 const v3 = state->v3;
+        U64 const v4 = state->v4;
+
+        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+        h64 = XXH64_mergeRound(h64, v1);
+        h64 = XXH64_mergeRound(h64, v2);
+        h64 = XXH64_mergeRound(h64, v3);
+        h64 = XXH64_mergeRound(h64, v4);
+    } else {
+        h64  = state->v3 /*seed*/ + PRIME64_5;
+    }
+
+    h64 += (U64) state->total_len;
+
+    return XXH64_finalize(h64, state->mem64, (size_t)state->total_len, endian, XXH_aligned);
+}
+
+XXH_PUBLIC_API unsigned long long XXH64_digest (const XXH64_state_t* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH64_digest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH64_digest_endian(state_in, XXH_bigEndian);
+}
+
+
+/*====== Canonical representation   ======*/
+
+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
+{
+    XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
+    if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
+    memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
+{
+    return XXH_readBE64(src);
+}
+
+#endif  /* XXH_NO_LONG_LONG */
diff --git a/extra/lz4/lz4-1.9.4/lib/xxhash.h b/extra/lz4/lz4-1.9.4/lib/xxhash.h
new file mode 100644
index 000000000000..d6bad943358d
--- /dev/null
+++ b/extra/lz4/lz4-1.9.4/lib/xxhash.h
@@ -0,0 +1,328 @@
+/*
+   xxHash - Extremely Fast Hash algorithm
+   Header File
+   Copyright (C) 2012-2016, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   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.
+
+   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.
+
+   You can contact the author at :
+   - xxHash source repository : https://github.com/Cyan4973/xxHash
+*/
+
+/* Notice extracted from xxHash homepage :
+
+xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
+It also successfully passes all tests from the SMHasher suite.
+
+Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
+
+Name            Speed       Q.Score   Author
+xxHash          5.4 GB/s     10
+CrapWow         3.2 GB/s      2       Andrew
+MumurHash 3a    2.7 GB/s     10       Austin Appleby
+SpookyHash      2.0 GB/s     10       Bob Jenkins
+SBox            1.4 GB/s      9       Bret Mulvey
+Lookup3         1.2 GB/s      9       Bob Jenkins
+SuperFastHash   1.2 GB/s      1       Paul Hsieh
+CityHash64      1.05 GB/s    10       Pike & Alakuijala
+FNV             0.55 GB/s     5       Fowler, Noll, Vo
+CRC32           0.43 GB/s     9
+MD5-32          0.33 GB/s    10       Ronald L. Rivest
+SHA1-32         0.28 GB/s    10
+
+Q.Score is a measure of quality of the hash function.
+It depends on successfully passing SMHasher test set.
+10 is a perfect score.
+
+A 64-bit version, named XXH64, is available since r35.
+It offers much better speed, but for 64-bit applications only.
+Name     Speed on 64 bits    Speed on 32 bits
+XXH64       13.8 GB/s            1.9 GB/s
+XXH32        6.8 GB/s            6.0 GB/s
+*/
+
+#ifndef XXHASH_H_5627135585666179
+#define XXHASH_H_5627135585666179 1
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+
+/* ****************************
+*  Definitions
+******************************/
+#include <stddef.h>   /* size_t */
+typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
+
+
+/* ****************************
+ *  API modifier
+ ******************************/
+/** XXH_INLINE_ALL (and XXH_PRIVATE_API)
+ *  This is useful to include xxhash functions in `static` mode
+ *  in order to inline them, and remove their symbol from the public list.
+ *  Inlining can offer dramatic performance improvement on small keys.
+ *  Methodology :
+ *     #define XXH_INLINE_ALL
+ *     #include "xxhash.h"
+ * `xxhash.c` is automatically included.
+ *  It's not useful to compile and link it as a separate module.
+ */
+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
+#  ifndef XXH_STATIC_LINKING_ONLY
+#    define XXH_STATIC_LINKING_ONLY
+#  endif
+#  if defined(__GNUC__)
+#    define XXH_PUBLIC_API static __inline __attribute__((unused))
+#  elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
+#    define XXH_PUBLIC_API static inline
+#  elif defined(_MSC_VER)
+#    define XXH_PUBLIC_API static __inline
+#  else
+     /* this version may generate warnings for unused static functions */
+#    define XXH_PUBLIC_API static
+#  endif
+#else
+#  define XXH_PUBLIC_API   /* do nothing */
+#endif /* XXH_INLINE_ALL || XXH_PRIVATE_API */
+
+/*! XXH_NAMESPACE, aka Namespace Emulation :
+ *
+ * If you want to include _and expose_ xxHash functions from within your own library,
+ * but also want to avoid symbol collisions with other libraries which may also include xxHash,
+ *
+ * you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
+ * with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
+ *
+ * Note that no change is required within the calling program as long as it includes `xxhash.h` :
+ * regular symbol name will be automatically translated by this header.
+ */
+#ifdef XXH_NAMESPACE
+#  define XXH_CAT(A,B) A##B
+#  define XXH_NAME2(A,B) XXH_CAT(A,B)
+#  define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber)
+#  define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32)
+#  define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState)
+#  define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState)
+#  define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset)
+#  define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update)
+#  define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest)
+#  define XXH32_copyState XXH_NAME2(XXH_NAMESPACE, XXH32_copyState)
+#  define XXH32_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH32_canonicalFromHash)
+#  define XXH32_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH32_hashFromCanonical)
+#  define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64)
+#  define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState)
+#  define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState)
+#  define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset)
+#  define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update)
+#  define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest)
+#  define XXH64_copyState XXH_NAME2(XXH_NAMESPACE, XXH64_copyState)
+#  define XXH64_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH64_canonicalFromHash)
+#  define XXH64_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH64_hashFromCanonical)
+#endif
+
+
+/* *************************************
+*  Version
+***************************************/
+#define XXH_VERSION_MAJOR    0
+#define XXH_VERSION_MINOR    6
+#define XXH_VERSION_RELEASE  5
+#define XXH_VERSION_NUMBER  (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE)
+XXH_PUBLIC_API unsigned XXH_versionNumber (void);
+
+
+/*-**********************************************************************
+*  32-bit hash
+************************************************************************/
+typedef unsigned int XXH32_hash_t;
+
+/*! XXH32() :
+    Calculate the 32-bit hash of sequence "length" bytes stored at memory address "input".
+    The memory between input & input+length must be valid (allocated and read-accessible).
+    "seed" can be used to alter the result predictably.
+    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s */
+XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed);
+
+/*======   Streaming   ======*/
+typedef struct XXH32_state_s XXH32_state_t;   /* incomplete type */
+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void);
+XXH_PUBLIC_API XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dst_state, const XXH32_state_t* src_state);
+
+XXH_PUBLIC_API XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned int seed);
+XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
+XXH_PUBLIC_API XXH32_hash_t  XXH32_digest (const XXH32_state_t* statePtr);
+
+/*
+ * Streaming functions generate the xxHash of an input provided in multiple segments.
+ * Note that, for small input, they are slower than single-call functions, due to state management.
+ * For small inputs, prefer `XXH32()` and `XXH64()`, which are better optimized.
+ *
+ * XXH state must first be allocated, using XXH*_createState() .
+ *
+ * Start a new hash by initializing state with a seed, using XXH*_reset().
+ *
+ * Then, feed the hash state by calling XXH*_update() as many times as necessary.
+ * The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
+ *
+ * Finally, a hash value can be produced anytime, by using XXH*_digest().
+ * This function returns the nn-bits hash as an int or long long.
+ *
+ * It's still possible to continue inserting input into the hash state after a digest,
+ * and generate some new hashes later on, by calling again XXH*_digest().
+ *
+ * When done, free XXH state space if it was allocated dynamically.
+ */
+
+/*======   Canonical representation   ======*/
+
+typedef struct { unsigned char digest[4]; } XXH32_canonical_t;
+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash);
+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src);
+
+/* Default result type for XXH functions are primitive unsigned 32 and 64 bits.
+ * The canonical representation uses human-readable write convention, aka big-endian (large digits first).
+ * These functions allow transformation of hash result into and from its canonical format.
+ * This way, hash values can be written into a file / memory, and remain comparable on different systems and programs.
+ */
+
+
+#ifndef XXH_NO_LONG_LONG
+/*-**********************************************************************
+*  64-bit hash
+************************************************************************/
+typedef unsigned long long XXH64_hash_t;
+
+/*! XXH64() :
+    Calculate the 64-bit hash of sequence of length "len" stored at memory address "input".
+    "seed" can be used to alter the result predictably.
+    This function runs faster on 64-bit systems, but slower on 32-bit systems (see benchmark).
+*/
+XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
+
+/*======   Streaming   ======*/
+typedef struct XXH64_state_s XXH64_state_t;   /* incomplete type */
+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void);
+XXH_PUBLIC_API XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dst_state, const XXH64_state_t* src_state);
+
+XXH_PUBLIC_API XXH_errorcode XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
+XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
+XXH_PUBLIC_API XXH64_hash_t  XXH64_digest (const XXH64_state_t* statePtr);
+
+/*======   Canonical representation   ======*/
+typedef struct { unsigned char digest[8]; } XXH64_canonical_t;
+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash);
+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src);
+#endif  /* XXH_NO_LONG_LONG */
+
+
+
+#ifdef XXH_STATIC_LINKING_ONLY
+
+/* ================================================================================================
+   This section contains declarations which are not guaranteed to remain stable.
+   They may change in future versions, becoming incompatible with a different version of the library.
+   These declarations should only be used with static linking.
+   Never use them in association with dynamic linking !
+=================================================================================================== */
+
+/* These definitions are only present to allow
+ * static allocation of XXH state, on stack or in a struct for example.
+ * Never **ever** use members directly. */
+
+#if !defined (__VMS) \
+  && (defined (__cplusplus) \
+  || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+#   include <stdint.h>
+
+struct XXH32_state_s {
+   uint32_t total_len_32;
+   uint32_t large_len;
+   uint32_t v1;
+   uint32_t v2;
+   uint32_t v3;
+   uint32_t v4;
+   uint32_t mem32[4];
+   uint32_t memsize;
+   uint32_t reserved;   /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH32_state_t */
+
+struct XXH64_state_s {
+   uint64_t total_len;
+   uint64_t v1;
+   uint64_t v2;
+   uint64_t v3;
+   uint64_t v4;
+   uint64_t mem64[4];
+   uint32_t memsize;
+   uint32_t reserved[2];          /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH64_state_t */
+
+# else
+
+struct XXH32_state_s {
+   unsigned total_len_32;
+   unsigned large_len;
+   unsigned v1;
+   unsigned v2;
+   unsigned v3;
+   unsigned v4;
+   unsigned mem32[4];
+   unsigned memsize;
+   unsigned reserved;   /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH32_state_t */
+
+#   ifndef XXH_NO_LONG_LONG  /* remove 64-bit support */
+struct XXH64_state_s {
+   unsigned long long total_len;
+   unsigned long long v1;
+   unsigned long long v2;
+   unsigned long long v3;
+   unsigned long long v4;
+   unsigned long long mem64[4];
+   unsigned memsize;
+   unsigned reserved[2];     /* never read nor write, might be removed in a future version */
+};   /* typedef'd to XXH64_state_t */
+#    endif
+
+# endif
+
+
+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
+#  include "xxhash.c"   /* include xxhash function bodies as `static`, for inlining */
+#endif
+
+#endif /* XXH_STATIC_LINKING_ONLY */
+
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif /* XXHASH_H_5627135585666179 */
diff --git a/extra/lz4/lz4.c b/extra/lz4/lz4.c
deleted file mode 100644
index 08cf6b5cd72b..000000000000
--- a/extra/lz4/lz4.c
+++ /dev/null
@@ -1,1516 +0,0 @@
-/*
-   LZ4 - Fast LZ compression algorithm
-   Copyright (C) 2011-2015, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - LZ4 source repository : https://github.com/Cyan4973/lz4
-   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-
-
-/**************************************
-*  Tuning parameters
-**************************************/
-/*
- * HEAPMODE :
- * Select how default compression functions will allocate memory for their hash table,
- * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()).
- */
-#define HEAPMODE 0
-
-/*
- * ACCELERATION_DEFAULT :
- * Select "acceleration" for LZ4_compress_fast() when parameter value <= 0
- */
-#define ACCELERATION_DEFAULT 1
-
-
-/**************************************
-*  CPU Feature Detection
-**************************************/
-/*
- * LZ4_FORCE_SW_BITCOUNT
- * Define this parameter if your target system or compiler does not support hardware bit count
- */
-#if defined(_MSC_VER) && defined(_WIN32_WCE)   /* Visual Studio for Windows CE does not support Hardware bit count */
-#  define LZ4_FORCE_SW_BITCOUNT
-#endif
-
-
-/**************************************
-*  Includes
-**************************************/
-#include "lz4.h"
-
-
-/**************************************
-*  Compiler Options
-**************************************/
-#ifdef _MSC_VER    /* Visual Studio */
-#  define FORCE_INLINE static __forceinline
-#  include <intrin.h>
-#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
-#  pragma warning(disable : 4293)        /* disable: C4293: too large shift (32-bits) */
-#else
-#  if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
-#    if defined(__GNUC__) || defined(__clang__)
-#      define FORCE_INLINE static inline __attribute__((always_inline))
-#    else
-#      define FORCE_INLINE static inline
-#    endif
-#  else
-#    define FORCE_INLINE static
-#  endif   /* __STDC_VERSION__ */
-#endif  /* _MSC_VER */
-
-/* LZ4_GCC_VERSION is defined into lz4.h */
-#if (LZ4_GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
-#  define expect(expr,value)    (__builtin_expect ((expr),(value)) )
-#else
-#  define expect(expr,value)    (expr)
-#endif
-
-#define likely(expr)     expect((expr) != 0, 1)
-#define unlikely(expr)   expect((expr) != 0, 0)
-
-
-/**************************************
-*  Memory routines
-**************************************/
-#include <stdlib.h>   /* malloc, calloc, free */
-#define ALLOCATOR(n,s) calloc(n,s)
-#define FREEMEM        free
-#include <string.h>   /* memset, memcpy */
-#define MEM_INIT       memset
-
-
-/**************************************
-*  Basic Types
-**************************************/
-#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
-# include <stdint.h>
-  typedef  uint8_t BYTE;
-  typedef uint16_t U16;
-  typedef uint32_t U32;
-  typedef  int32_t S32;
-  typedef uint64_t U64;
-#else
-  typedef unsigned char       BYTE;
-  typedef unsigned short      U16;
-  typedef unsigned int        U32;
-  typedef   signed int        S32;
-  typedef unsigned long long  U64;
-#endif
-
-
-/**************************************
-*  Reading and writing into memory
-**************************************/
-#define STEPSIZE sizeof(size_t)
-
-static unsigned LZ4_64bits(void) { return sizeof(void*)==8; }
-
-static unsigned LZ4_isLittleEndian(void)
-{
-    const union { U32 i; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
-    return one.c[0];
-}
-
-
-static U16 LZ4_read16(const void* memPtr)
-{
-    U16 val16;
-    memcpy(&val16, memPtr, 2);
-    return val16;
-}
-
-static U16 LZ4_readLE16(const void* memPtr)
-{
-    if (LZ4_isLittleEndian())
-    {
-        return LZ4_read16(memPtr);
-    }
-    else
-    {
-        const BYTE* p = (const BYTE*)memPtr;
-        return (U16)((U16)p[0] + (p[1]<<8));
-    }
-}
-
-static void LZ4_writeLE16(void* memPtr, U16 value)
-{
-    if (LZ4_isLittleEndian())
-    {
-        memcpy(memPtr, &value, 2);
-    }
-    else
-    {
-        BYTE* p = (BYTE*)memPtr;
-        p[0] = (BYTE) value;
-        p[1] = (BYTE)(value>>8);
-    }
-}
-
-static U32 LZ4_read32(const void* memPtr)
-{
-    U32 val32;
-    memcpy(&val32, memPtr, 4);
-    return val32;
-}
-
-static U64 LZ4_read64(const void* memPtr)
-{
-    U64 val64;
-    memcpy(&val64, memPtr, 8);
-    return val64;
-}
-
-static size_t LZ4_read_ARCH(const void* p)
-{
-    if (LZ4_64bits())
-        return (size_t)LZ4_read64(p);
-    else
-        return (size_t)LZ4_read32(p);
-}
-
-
-static void LZ4_copy4(void* dstPtr, const void* srcPtr) { memcpy(dstPtr, srcPtr, 4); }
-
-static void LZ4_copy8(void* dstPtr, const void* srcPtr) { memcpy(dstPtr, srcPtr, 8); }
-
-/* customized version of memcpy, which may overwrite up to 7 bytes beyond dstEnd */
-static void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd)
-{
-    BYTE* d = (BYTE*)dstPtr;
-    const BYTE* s = (const BYTE*)srcPtr;
-    BYTE* e = (BYTE*)dstEnd;
-    do { LZ4_copy8(d,s); d+=8; s+=8; } while (d<e);
-}
-
-
-/**************************************
-*  Common Constants
-**************************************/
-#define MINMATCH 4
-
-#define COPYLENGTH 8
-#define LASTLITERALS 5
-#define MFLIMIT (COPYLENGTH+MINMATCH)
-static const int LZ4_minLength = (MFLIMIT+1);
-
-#define KB *(1 <<10)
-#define MB *(1 <<20)
-#define GB *(1U<<30)
-
-#define MAXD_LOG 16
-#define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
-
-#define ML_BITS  4
-#define ML_MASK  ((1U<<ML_BITS)-1)
-#define RUN_BITS (8-ML_BITS)
-#define RUN_MASK ((1U<<RUN_BITS)-1)
-
-
-/**************************************
-*  Common Utils
-**************************************/
-#define LZ4_STATIC_ASSERT(c)    { enum { LZ4_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
-
-
-/**************************************
-*  Common functions
-**************************************/
-static unsigned LZ4_NbCommonBytes (register size_t val)
-{
-    if (LZ4_isLittleEndian())
-    {
-        if (LZ4_64bits())
-        {
-#       if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            unsigned long r = 0;
-            _BitScanForward64( &r, (U64)val );
-            return (int)(r>>3);
-#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            return (__builtin_ctzll((U64)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
-            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
-#       endif
-        }
-        else /* 32 bits */
-        {
-#       if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            unsigned long r;
-            _BitScanForward( &r, (U32)val );
-            return (int)(r>>3);
-#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            return (__builtin_ctz((U32)val) >> 3);
-#       else
-            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
-            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
-#       endif
-        }
-    }
-    else   /* Big Endian CPU */
-    {
-        if (LZ4_64bits())
-        {
-#       if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            unsigned long r = 0;
-            _BitScanReverse64( &r, val );
-            return (unsigned)(r>>3);
-#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            return (__builtin_clzll((U64)val) >> 3);
-#       else
-            unsigned r;
-            if (!(val>>32)) { r=4; } else { r=0; val>>=32; }
-            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-        }
-        else /* 32 bits */
-        {
-#       if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            unsigned long r = 0;
-            _BitScanReverse( &r, (unsigned long)val );
-            return (unsigned)(r>>3);
-#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
-            return (__builtin_clz((U32)val) >> 3);
-#       else
-            unsigned r;
-            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
-            r += (!val);
-            return r;
-#       endif
-        }
-    }
-}
-
-static unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit)
-{
-    const BYTE* const pStart = pIn;
-
-    while (likely(pIn<pInLimit-(STEPSIZE-1)))
-    {
-        size_t diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn);
-        if (!diff) { pIn+=STEPSIZE; pMatch+=STEPSIZE; continue; }
-        pIn += LZ4_NbCommonBytes(diff);
-        return (unsigned)(pIn - pStart);
-    }
-
-    if (LZ4_64bits()) if ((pIn<(pInLimit-3)) && (LZ4_read32(pMatch) == LZ4_read32(pIn))) { pIn+=4; pMatch+=4; }
-    if ((pIn<(pInLimit-1)) && (LZ4_read16(pMatch) == LZ4_read16(pIn))) { pIn+=2; pMatch+=2; }
-    if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
-    return (unsigned)(pIn - pStart);
-}
-
-
-#ifndef LZ4_COMMONDEFS_ONLY
-/**************************************
-*  Local Constants
-**************************************/
-#define LZ4_HASHLOG   (LZ4_MEMORY_USAGE-2)
-#define HASHTABLESIZE (1 << LZ4_MEMORY_USAGE)
-#define HASH_SIZE_U32 (1 << LZ4_HASHLOG)       /* required as macro for static allocation */
-
-static const int LZ4_64Klimit = ((64 KB) + (MFLIMIT-1));
-static const U32 LZ4_skipTrigger = 6;  /* Increase this value ==> compression run slower on incompressible data */
-
-
-/**************************************
-*  Local Structures and types
-**************************************/
-typedef struct {
-    U32 hashTable[HASH_SIZE_U32];
-    U32 currentOffset;
-    U32 initCheck;
-    const BYTE* dictionary;
-    BYTE* bufferStart;   /* obsolete, used for slideInputBuffer */
-    U32 dictSize;
-} LZ4_stream_t_internal;
-
-typedef enum { notLimited = 0, limitedOutput = 1 } limitedOutput_directive;
-typedef enum { byPtr, byU32, byU16 } tableType_t;
-
-typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive;
-typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive;
-
-typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive;
-typedef enum { full = 0, partial = 1 } earlyEnd_directive;
-
-
-/**************************************
-*  Local Utils
-**************************************/
-int LZ4_versionNumber (void) { return LZ4_VERSION_NUMBER; }
-int LZ4_compressBound(int isize)  { return LZ4_COMPRESSBOUND(isize); }
-int LZ4_sizeofState() { return LZ4_STREAMSIZE; }
-
-
-
-/********************************
-*  Compression functions
-********************************/
-
-static U32 LZ4_hashSequence(U32 sequence, tableType_t const tableType)
-{
-    if (tableType == byU16)
-        return (((sequence) * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1)));
-    else
-        return (((sequence) * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG));
-}
-
-static const U64 prime5bytes = 889523592379ULL;
-static U32 LZ4_hashSequence64(size_t sequence, tableType_t const tableType)
-{
-    const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG+1 : LZ4_HASHLOG;
-    const U32 hashMask = (1<<hashLog) - 1;
-    return ((sequence * prime5bytes) >> (40 - hashLog)) & hashMask;
-}
-
-static U32 LZ4_hashSequenceT(size_t sequence, tableType_t const tableType)
-{
-    if (LZ4_64bits())
-        return LZ4_hashSequence64(sequence, tableType);
-    return LZ4_hashSequence((U32)sequence, tableType);
-}
-
-static U32 LZ4_hashPosition(const void* p, tableType_t tableType) { return LZ4_hashSequenceT(LZ4_read_ARCH(p), tableType); }
-
-static void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t const tableType, const BYTE* srcBase)
-{
-    switch (tableType)
-    {
-    case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = p; return; }
-    case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); return; }
-    case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); return; }
-    }
-}
-
-static void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-    U32 h = LZ4_hashPosition(p, tableType);
-    LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase);
-}
-
-static const BYTE* LZ4_getPositionOnHash(U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-    if (tableType == byPtr) { const BYTE** hashTable = (const BYTE**) tableBase; return hashTable[h]; }
-    if (tableType == byU32) { U32* hashTable = (U32*) tableBase; return hashTable[h] + srcBase; }
-    { U16* hashTable = (U16*) tableBase; return hashTable[h] + srcBase; }   /* default, to ensure a return */
-}
-
-static const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-    U32 h = LZ4_hashPosition(p, tableType);
-    return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase);
-}
-
-FORCE_INLINE int LZ4_compress_generic(
-                 void* const ctx,
-                 const char* const source,
-                 char* const dest,
-                 const int inputSize,
-                 const int maxOutputSize,
-                 const limitedOutput_directive outputLimited,
-                 const tableType_t tableType,
-                 const dict_directive dict,
-                 const dictIssue_directive dictIssue,
-                 const U32 acceleration)
-{
-    LZ4_stream_t_internal* const dictPtr = (LZ4_stream_t_internal*)ctx;
-
-    const BYTE* ip = (const BYTE*) source;
-    const BYTE* base;
-    const BYTE* lowLimit;
-    const BYTE* const lowRefLimit = ip - dictPtr->dictSize;
-    const BYTE* const dictionary = dictPtr->dictionary;
-    const BYTE* const dictEnd = dictionary + dictPtr->dictSize;
-    const size_t dictDelta = dictEnd - (const BYTE*)source;
-    const BYTE* anchor = (const BYTE*) source;
-    const BYTE* const iend = ip + inputSize;
-    const BYTE* const mflimit = iend - MFLIMIT;
-    const BYTE* const matchlimit = iend - LASTLITERALS;
-
-    BYTE* op = (BYTE*) dest;
-    BYTE* const olimit = op + maxOutputSize;
-
-    U32 forwardH;
-    size_t refDelta=0;
-
-    /* Init conditions */
-    if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0;   /* Unsupported input size, too large (or negative) */
-    switch(dict)
-    {
-    case noDict:
-    default:
-        base = (const BYTE*)source;
-        lowLimit = (const BYTE*)source;
-        break;
-    case withPrefix64k:
-        base = (const BYTE*)source - dictPtr->currentOffset;
-        lowLimit = (const BYTE*)source - dictPtr->dictSize;
-        break;
-    case usingExtDict:
-        base = (const BYTE*)source - dictPtr->currentOffset;
-        lowLimit = (const BYTE*)source;
-        break;
-    }
-    if ((tableType == byU16) && (inputSize>=LZ4_64Klimit)) return 0;   /* Size too large (not within 64K limit) */
-    if (inputSize<LZ4_minLength) goto _last_literals;                  /* Input too small, no compression (all literals) */
-
-    /* First Byte */
-    LZ4_putPosition(ip, ctx, tableType, base);
-    ip++; forwardH = LZ4_hashPosition(ip, tableType);
-
-    /* Main Loop */
-    for ( ; ; )
-    {
-        const BYTE* match;
-        BYTE* token;
-        {
-            const BYTE* forwardIp = ip;
-            unsigned step = 1;
-            unsigned searchMatchNb = acceleration << LZ4_skipTrigger;
-
-            /* Find a match */
-            do {
-                U32 h = forwardH;
-                ip = forwardIp;
-                forwardIp += step;
-                step = (searchMatchNb++ >> LZ4_skipTrigger);
-
-                if (unlikely(forwardIp > mflimit)) goto _last_literals;
-
-                match = LZ4_getPositionOnHash(h, ctx, tableType, base);
-                if (dict==usingExtDict)
-                {
-                    if (match<(const BYTE*)source)
-                    {
-                        refDelta = dictDelta;
-                        lowLimit = dictionary;
-                    }
-                    else
-                    {
-                        refDelta = 0;
-                        lowLimit = (const BYTE*)source;
-                    }
-                }
-                forwardH = LZ4_hashPosition(forwardIp, tableType);
-                LZ4_putPositionOnHash(ip, h, ctx, tableType, base);
-
-            } while ( ((dictIssue==dictSmall) ? (match < lowRefLimit) : 0)
-                || ((tableType==byU16) ? 0 : (match + MAX_DISTANCE < ip))
-                || (LZ4_read32(match+refDelta) != LZ4_read32(ip)) );
-        }
-
-        /* Catch up */
-        while ((ip>anchor) && (match+refDelta > lowLimit) && (unlikely(ip[-1]==match[refDelta-1]))) { ip--; match--; }
-
-        {
-            /* Encode Literal length */
-            unsigned litLength = (unsigned)(ip - anchor);
-            token = op++;
-            if ((outputLimited) && (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit)))
-                return 0;   /* Check output limit */
-            if (litLength>=RUN_MASK)
-            {
-                int len = (int)litLength-RUN_MASK;
-                *token=(RUN_MASK<<ML_BITS);
-                for(; len >= 255 ; len-=255) *op++ = 255;
-                *op++ = (BYTE)len;
-            }
-            else *token = (BYTE)(litLength<<ML_BITS);
-
-            /* Copy Literals */
-            LZ4_wildCopy(op, anchor, op+litLength);
-            op+=litLength;
-        }
-
-_next_match:
-        /* Encode Offset */
-        LZ4_writeLE16(op, (U16)(ip-match)); op+=2;
-
-        /* Encode MatchLength */
-        {
-            unsigned matchLength;
-
-            if ((dict==usingExtDict) && (lowLimit==dictionary))
-            {
-                const BYTE* limit;
-                match += refDelta;
-                limit = ip + (dictEnd-match);
-                if (limit > matchlimit) limit = matchlimit;
-                matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, limit);
-                ip += MINMATCH + matchLength;
-                if (ip==limit)
-                {
-                    unsigned more = LZ4_count(ip, (const BYTE*)source, matchlimit);
-                    matchLength += more;
-                    ip += more;
-                }
-            }
-            else
-            {
-                matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit);
-                ip += MINMATCH + matchLength;
-            }
-
-            if ((outputLimited) && (unlikely(op + (1 + LASTLITERALS) + (matchLength>>8) > olimit)))
-                return 0;    /* Check output limit */
-            if (matchLength>=ML_MASK)
-            {
-                *token += ML_MASK;
-                matchLength -= ML_MASK;
-                for (; matchLength >= 510 ; matchLength-=510) { *op++ = 255; *op++ = 255; }
-                if (matchLength >= 255) { matchLength-=255; *op++ = 255; }
-                *op++ = (BYTE)matchLength;
-            }
-            else *token += (BYTE)(matchLength);
-        }
-
-        anchor = ip;
-
-        /* Test end of chunk */
-        if (ip > mflimit) break;
-
-        /* Fill table */
-        LZ4_putPosition(ip-2, ctx, tableType, base);
-
-        /* Test next position */
-        match = LZ4_getPosition(ip, ctx, tableType, base);
-        if (dict==usingExtDict)
-        {
-            if (match<(const BYTE*)source)
-            {
-                refDelta = dictDelta;
-                lowLimit = dictionary;
-            }
-            else
-            {
-                refDelta = 0;
-                lowLimit = (const BYTE*)source;
-            }
-        }
-        LZ4_putPosition(ip, ctx, tableType, base);
-        if ( ((dictIssue==dictSmall) ? (match>=lowRefLimit) : 1)
-            && (match+MAX_DISTANCE>=ip)
-            && (LZ4_read32(match+refDelta)==LZ4_read32(ip)) )
-        { token=op++; *token=0; goto _next_match; }
-
-        /* Prepare next loop */
-        forwardH = LZ4_hashPosition(++ip, tableType);
-    }
-
-_last_literals:
-    /* Encode Last Literals */
-    {
-        const size_t lastRun = (size_t)(iend - anchor);
-        if ((outputLimited) && ((op - (BYTE*)dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize))
-            return 0;   /* Check output limit */
-        if (lastRun >= RUN_MASK)
-        {
-            size_t accumulator = lastRun - RUN_MASK;
-            *op++ = RUN_MASK << ML_BITS;
-            for(; accumulator >= 255 ; accumulator-=255) *op++ = 255;
-            *op++ = (BYTE) accumulator;
-        }
-        else
-        {
-            *op++ = (BYTE)(lastRun<<ML_BITS);
-        }
-        memcpy(op, anchor, lastRun);
-        op += lastRun;
-    }
-
-    /* End */
-    return (int) (((char*)op)-dest);
-}
-
-
-int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-    LZ4_resetStream((LZ4_stream_t*)state);
-    if (acceleration < 1) acceleration = ACCELERATION_DEFAULT;
-
-    if (maxOutputSize >= LZ4_compressBound(inputSize))
-    {
-        if (inputSize < LZ4_64Klimit)
-            return LZ4_compress_generic(state, source, dest, inputSize, 0, notLimited, byU16,                        noDict, noDictIssue, acceleration);
-        else
-            return LZ4_compress_generic(state, source, dest, inputSize, 0, notLimited, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
-    }
-    else
-    {
-        if (inputSize < LZ4_64Klimit)
-            return LZ4_compress_generic(state, source, dest, inputSize, maxOutputSize, limitedOutput, byU16,                        noDict, noDictIssue, acceleration);
-        else
-            return LZ4_compress_generic(state, source, dest, inputSize, maxOutputSize, limitedOutput, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
-    }
-}
-
-
-int LZ4_compress_fast(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-#if (HEAPMODE)
-    void* ctxPtr = ALLOCATOR(1, sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
-#else
-    LZ4_stream_t ctx;
-    void* ctxPtr = &ctx;
-#endif
-
-    int result = LZ4_compress_fast_extState(ctxPtr, source, dest, inputSize, maxOutputSize, acceleration);
-
-#if (HEAPMODE)
-    FREEMEM(ctxPtr);
-#endif
-    return result;
-}
-
-
-int LZ4_compress_default(const char* source, char* dest, int inputSize, int maxOutputSize)
-{
-    return LZ4_compress_fast(source, dest, inputSize, maxOutputSize, 1);
-}
-
-
-/* hidden debug function */
-/* strangely enough, gcc generates faster code when this function is uncommented, even if unused */
-int LZ4_compress_fast_force(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-    LZ4_stream_t ctx;
-
-    LZ4_resetStream(&ctx);
-
-    if (inputSize < LZ4_64Klimit)
-        return LZ4_compress_generic(&ctx, source, dest, inputSize, maxOutputSize, limitedOutput, byU16,                        noDict, noDictIssue, acceleration);
-    else
-        return LZ4_compress_generic(&ctx, source, dest, inputSize, maxOutputSize, limitedOutput, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
-}
-
-
-/********************************
-*  destSize variant
-********************************/
-
-static int LZ4_compress_destSize_generic(
-                       void* const ctx,
-                 const char* const src,
-                       char* const dst,
-                       int*  const srcSizePtr,
-                 const int targetDstSize,
-                 const tableType_t tableType)
-{
-    const BYTE* ip = (const BYTE*) src;
-    const BYTE* base = (const BYTE*) src;
-    const BYTE* lowLimit = (const BYTE*) src;
-    const BYTE* anchor = ip;
-    const BYTE* const iend = ip + *srcSizePtr;
-    const BYTE* const mflimit = iend - MFLIMIT;
-    const BYTE* const matchlimit = iend - LASTLITERALS;
-
-    BYTE* op = (BYTE*) dst;
-    BYTE* const oend = op + targetDstSize;
-    BYTE* const oMaxLit = op + targetDstSize - 2 /* offset */ - 8 /* because 8+MINMATCH==MFLIMIT */ - 1 /* token */;
-    BYTE* const oMaxMatch = op + targetDstSize - (LASTLITERALS + 1 /* token */);
-    BYTE* const oMaxSeq = oMaxLit - 1 /* token */;
-
-    U32 forwardH;
-
-
-    /* Init conditions */
-    if (targetDstSize < 1) return 0;                                     /* Impossible to store anything */
-    if ((U32)*srcSizePtr > (U32)LZ4_MAX_INPUT_SIZE) return 0;            /* Unsupported input size, too large (or negative) */
-    if ((tableType == byU16) && (*srcSizePtr>=LZ4_64Klimit)) return 0;   /* Size too large (not within 64K limit) */
-    if (*srcSizePtr<LZ4_minLength) goto _last_literals;                  /* Input too small, no compression (all literals) */
-
-    /* First Byte */
-    *srcSizePtr = 0;
-    LZ4_putPosition(ip, ctx, tableType, base);
-    ip++; forwardH = LZ4_hashPosition(ip, tableType);
-
-    /* Main Loop */
-    for ( ; ; )
-    {
-        const BYTE* match;
-        BYTE* token;
-        {
-            const BYTE* forwardIp = ip;
-            unsigned step = 1;
-            unsigned searchMatchNb = 1 << LZ4_skipTrigger;
-
-            /* Find a match */
-            do {
-                U32 h = forwardH;
-                ip = forwardIp;
-                forwardIp += step;
-                step = (searchMatchNb++ >> LZ4_skipTrigger);
-
-                if (unlikely(forwardIp > mflimit))
-                    goto _last_literals;
-
-                match = LZ4_getPositionOnHash(h, ctx, tableType, base);
-                forwardH = LZ4_hashPosition(forwardIp, tableType);
-                LZ4_putPositionOnHash(ip, h, ctx, tableType, base);
-
-            } while ( ((tableType==byU16) ? 0 : (match + MAX_DISTANCE < ip))
-                || (LZ4_read32(match) != LZ4_read32(ip)) );
-        }
-
-        /* Catch up */
-        while ((ip>anchor) && (match > lowLimit) && (unlikely(ip[-1]==match[-1]))) { ip--; match--; }
-
-        {
-            /* Encode Literal length */
-            unsigned litLength = (unsigned)(ip - anchor);
-            token = op++;
-            if (op + ((litLength+240)/255) + litLength > oMaxLit)
-            {
-                /* Not enough space for a last match */
-                op--;
-                goto _last_literals;
-            }
-            if (litLength>=RUN_MASK)
-            {
-                unsigned len = litLength - RUN_MASK;
-                *token=(RUN_MASK<<ML_BITS);
-                for(; len >= 255 ; len-=255) *op++ = 255;
-                *op++ = (BYTE)len;
-            }
-            else *token = (BYTE)(litLength<<ML_BITS);
-
-            /* Copy Literals */
-            LZ4_wildCopy(op, anchor, op+litLength);
-            op += litLength;
-        }
-
-_next_match:
-        /* Encode Offset */
-        LZ4_writeLE16(op, (U16)(ip-match)); op+=2;
-
-        /* Encode MatchLength */
-        {
-            size_t matchLength;
-
-            matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit);
-
-            if (op + ((matchLength+240)/255) > oMaxMatch)
-            {
-                /* Match description too long : reduce it */
-                matchLength = (15-1) + (oMaxMatch-op) * 255;
-            }
-            //printf("offset %5i, matchLength%5i \n", (int)(ip-match), matchLength + MINMATCH);
-            ip += MINMATCH + matchLength;
-
-            if (matchLength>=ML_MASK)
-            {
-                *token += ML_MASK;
-                matchLength -= ML_MASK;
-                while (matchLength >= 255) { matchLength-=255; *op++ = 255; }
-                *op++ = (BYTE)matchLength;
-            }
-            else *token += (BYTE)(matchLength);
-        }
-
-        anchor = ip;
-
-        /* Test end of block */
-        if (ip > mflimit) break;
-        if (op > oMaxSeq) break;
-
-        /* Fill table */
-        LZ4_putPosition(ip-2, ctx, tableType, base);
-
-        /* Test next position */
-        match = LZ4_getPosition(ip, ctx, tableType, base);
-        LZ4_putPosition(ip, ctx, tableType, base);
-        if ( (match+MAX_DISTANCE>=ip)
-            && (LZ4_read32(match)==LZ4_read32(ip)) )
-        { token=op++; *token=0; goto _next_match; }
-
-        /* Prepare next loop */
-        forwardH = LZ4_hashPosition(++ip, tableType);
-    }
-
-_last_literals:
-    /* Encode Last Literals */
-    {
-        size_t lastRunSize = (size_t)(iend - anchor);
-        if (op + 1 /* token */ + ((lastRunSize+240)/255) /* litLength */ + lastRunSize /* literals */ > oend)
-        {
-            /* adapt lastRunSize to fill 'dst' */
-            lastRunSize  = (oend-op) - 1;
-            lastRunSize -= (lastRunSize+240)/255;
-        }
-        ip = anchor + lastRunSize;
-
-        if (lastRunSize >= RUN_MASK)
-        {
-            size_t accumulator = lastRunSize - RUN_MASK;
-            *op++ = RUN_MASK << ML_BITS;
-            for(; accumulator >= 255 ; accumulator-=255) *op++ = 255;
-            *op++ = (BYTE) accumulator;
-        }
-        else
-        {
-            *op++ = (BYTE)(lastRunSize<<ML_BITS);
-        }
-        memcpy(op, anchor, lastRunSize);
-        op += lastRunSize;
-    }
-
-    /* End */
-    *srcSizePtr = (int) (((const char*)ip)-src);
-    return (int) (((char*)op)-dst);
-}
-
-
-static int LZ4_compress_destSize_extState (void* state, const char* src, char* dst, int* srcSizePtr, int targetDstSize)
-{
-    LZ4_resetStream((LZ4_stream_t*)state);
-
-    if (targetDstSize >= LZ4_compressBound(*srcSizePtr))   /* compression success is guaranteed */
-    {
-        return LZ4_compress_fast_extState(state, src, dst, *srcSizePtr, targetDstSize, 1);
-    }
-    else
-    {
-        if (*srcSizePtr < LZ4_64Klimit)
-            return LZ4_compress_destSize_generic(state, src, dst, srcSizePtr, targetDstSize, byU16);
-        else
-            return LZ4_compress_destSize_generic(state, src, dst, srcSizePtr, targetDstSize, LZ4_64bits() ? byU32 : byPtr);
-    }
-}
-
-
-int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targetDstSize)
-{
-#if (HEAPMODE)
-    void* ctx = ALLOCATOR(1, sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
-#else
-    LZ4_stream_t ctxBody;
-    void* ctx = &ctxBody;
-#endif
-
-    int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize);
-
-#if (HEAPMODE)
-    FREEMEM(ctx);
-#endif
-    return result;
-}
-
-
-
-/********************************
-*  Streaming functions
-********************************/
-
-LZ4_stream_t* LZ4_createStream(void)
-{
-    LZ4_stream_t* lz4s = (LZ4_stream_t*)ALLOCATOR(8, LZ4_STREAMSIZE_U64);
-    LZ4_STATIC_ASSERT(LZ4_STREAMSIZE >= sizeof(LZ4_stream_t_internal));    /* A compilation error here means LZ4_STREAMSIZE is not large enough */
-    LZ4_resetStream(lz4s);
-    return lz4s;
-}
-
-void LZ4_resetStream (LZ4_stream_t* LZ4_stream)
-{
-    MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t));
-}
-
-int LZ4_freeStream (LZ4_stream_t* LZ4_stream)
-{
-    FREEMEM(LZ4_stream);
-    return (0);
-}
-
-
-#define HASH_UNIT sizeof(size_t)
-int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize)
-{
-    LZ4_stream_t_internal* dict = (LZ4_stream_t_internal*) LZ4_dict;
-    const BYTE* p = (const BYTE*)dictionary;
-    const BYTE* const dictEnd = p + dictSize;
-    const BYTE* base;
-
-    if ((dict->initCheck) || (dict->currentOffset > 1 GB))  /* Uninitialized structure, or reuse overflow */
-        LZ4_resetStream(LZ4_dict);
-
-    if (dictSize < (int)HASH_UNIT)
-    {
-        dict->dictionary = NULL;
-        dict->dictSize = 0;
-        return 0;
-    }
-
-    if ((dictEnd - p) > 64 KB) p = dictEnd - 64 KB;
-    dict->currentOffset += 64 KB;
-    base = p - dict->currentOffset;
-    dict->dictionary = p;
-    dict->dictSize = (U32)(dictEnd - p);
-    dict->currentOffset += dict->dictSize;
-
-    while (p <= dictEnd-HASH_UNIT)
-    {
-        LZ4_putPosition(p, dict->hashTable, byU32, base);
-        p+=3;
-    }
-
-    return dict->dictSize;
-}
-
-
-static void LZ4_renormDictT(LZ4_stream_t_internal* LZ4_dict, const BYTE* src)
-{
-    if ((LZ4_dict->currentOffset > 0x80000000) ||
-        ((size_t)LZ4_dict->currentOffset > (size_t)src))   /* address space overflow */
-    {
-        /* rescale hash table */
-        U32 delta = LZ4_dict->currentOffset - 64 KB;
-        const BYTE* dictEnd = LZ4_dict->dictionary + LZ4_dict->dictSize;
-        int i;
-        for (i=0; i<HASH_SIZE_U32; i++)
-        {
-            if (LZ4_dict->hashTable[i] < delta) LZ4_dict->hashTable[i]=0;
-            else LZ4_dict->hashTable[i] -= delta;
-        }
-        LZ4_dict->currentOffset = 64 KB;
-        if (LZ4_dict->dictSize > 64 KB) LZ4_dict->dictSize = 64 KB;
-        LZ4_dict->dictionary = dictEnd - LZ4_dict->dictSize;
-    }
-}
-
-
-int LZ4_compress_fast_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-    LZ4_stream_t_internal* streamPtr = (LZ4_stream_t_internal*)LZ4_stream;
-    const BYTE* const dictEnd = streamPtr->dictionary + streamPtr->dictSize;
-
-    const BYTE* smallest = (const BYTE*) source;
-    if (streamPtr->initCheck) return 0;   /* Uninitialized structure detected */
-    if ((streamPtr->dictSize>0) && (smallest>dictEnd)) smallest = dictEnd;
-    LZ4_renormDictT(streamPtr, smallest);
-    if (acceleration < 1) acceleration = ACCELERATION_DEFAULT;
-
-    /* Check overlapping input/dictionary space */
-    {
-        const BYTE* sourceEnd = (const BYTE*) source + inputSize;
-        if ((sourceEnd > streamPtr->dictionary) && (sourceEnd < dictEnd))
-        {
-            streamPtr->dictSize = (U32)(dictEnd - sourceEnd);
-            if (streamPtr->dictSize > 64 KB) streamPtr->dictSize = 64 KB;
-            if (streamPtr->dictSize < 4) streamPtr->dictSize = 0;
-            streamPtr->dictionary = dictEnd - streamPtr->dictSize;
-        }
-    }
-
-    /* prefix mode : source data follows dictionary */
-    if (dictEnd == (const BYTE*)source)
-    {
-        int result;
-        if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset))
-            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, withPrefix64k, dictSmall, acceleration);
-        else
-            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, withPrefix64k, noDictIssue, acceleration);
-        streamPtr->dictSize += (U32)inputSize;
-        streamPtr->currentOffset += (U32)inputSize;
-        return result;
-    }
-
-    /* external dictionary mode */
-    {
-        int result;
-        if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset))
-            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, usingExtDict, dictSmall, acceleration);
-        else
-            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, usingExtDict, noDictIssue, acceleration);
-        streamPtr->dictionary = (const BYTE*)source;
-        streamPtr->dictSize = (U32)inputSize;
-        streamPtr->currentOffset += (U32)inputSize;
-        return result;
-    }
-}
-
-
-/* Hidden debug function, to force external dictionary mode */
-int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int inputSize)
-{
-    LZ4_stream_t_internal* streamPtr = (LZ4_stream_t_internal*)LZ4_dict;
-    int result;
-    const BYTE* const dictEnd = streamPtr->dictionary + streamPtr->dictSize;
-
-    const BYTE* smallest = dictEnd;
-    if (smallest > (const BYTE*) source) smallest = (const BYTE*) source;
-    LZ4_renormDictT((LZ4_stream_t_internal*)LZ4_dict, smallest);
-
-    result = LZ4_compress_generic(LZ4_dict, source, dest, inputSize, 0, notLimited, byU32, usingExtDict, noDictIssue, 1);
-
-    streamPtr->dictionary = (const BYTE*)source;
-    streamPtr->dictSize = (U32)inputSize;
-    streamPtr->currentOffset += (U32)inputSize;
-
-    return result;
-}
-
-
-int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int dictSize)
-{
-    LZ4_stream_t_internal* dict = (LZ4_stream_t_internal*) LZ4_dict;
-    const BYTE* previousDictEnd = dict->dictionary + dict->dictSize;
-
-    if ((U32)dictSize > 64 KB) dictSize = 64 KB;   /* useless to define a dictionary > 64 KB */
-    if ((U32)dictSize > dict->dictSize) dictSize = dict->dictSize;
-
-    memmove(safeBuffer, previousDictEnd - dictSize, dictSize);
-
-    dict->dictionary = (const BYTE*)safeBuffer;
-    dict->dictSize = (U32)dictSize;
-
-    return dictSize;
-}
-
-
-
-/*******************************
-*  Decompression functions
-*******************************/
-/*
- * This generic decompression function cover all use cases.
- * It shall be instantiated several times, using different sets of directives
- * Note that it is essential this generic function is really inlined,
- * in order to remove useless branches during compilation optimization.
- */
-FORCE_INLINE int LZ4_decompress_generic(
-                 const char* const source,
-                 char* const dest,
-                 int inputSize,
-                 int outputSize,         /* If endOnInput==endOnInputSize, this value is the max size of Output Buffer. */
-
-                 int endOnInput,         /* endOnOutputSize, endOnInputSize */
-                 int partialDecoding,    /* full, partial */
-                 int targetOutputSize,   /* only used if partialDecoding==partial */
-                 int dict,               /* noDict, withPrefix64k, usingExtDict */
-                 const BYTE* const lowPrefix,  /* == dest if dict == noDict */
-                 const BYTE* const dictStart,  /* only if dict==usingExtDict */
-                 const size_t dictSize         /* note : = 0 if noDict */
-                 )
-{
-    /* Local Variables */
-    const BYTE* ip = (const BYTE*) source;
-    const BYTE* const iend = ip + inputSize;
-
-    BYTE* op = (BYTE*) dest;
-    BYTE* const oend = op + outputSize;
-    BYTE* cpy;
-    BYTE* oexit = op + targetOutputSize;
-    const BYTE* const lowLimit = lowPrefix - dictSize;
-
-    const BYTE* const dictEnd = (const BYTE*)dictStart + dictSize;
-    const size_t dec32table[] = {4, 1, 2, 1, 4, 4, 4, 4};
-    const size_t dec64table[] = {0, 0, 0, (size_t)-1, 0, 1, 2, 3};
-
-    const int safeDecode = (endOnInput==endOnInputSize);
-    const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
-
-
-    /* Special cases */
-    if ((partialDecoding) && (oexit> oend-MFLIMIT)) oexit = oend-MFLIMIT;                         /* targetOutputSize too high => decode everything */
-    if ((endOnInput) && (unlikely(outputSize==0))) return ((inputSize==1) && (*ip==0)) ? 0 : -1;  /* Empty output buffer */
-    if ((!endOnInput) && (unlikely(outputSize==0))) return (*ip==0?1:-1);
-
-
-    /* Main Loop */
-    while (1)
-    {
-        unsigned token;
-        size_t length;
-        const BYTE* match;
-
-        /* get literal length */
-        token = *ip++;
-        if ((length=(token>>ML_BITS)) == RUN_MASK)
-        {
-            unsigned s;
-            do
-            {
-                s = *ip++;
-                length += s;
-            }
-            while (likely((endOnInput)?ip<iend-RUN_MASK:1) && (s==255));
-            if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)(op))) goto _output_error;   /* overflow detection */
-            if ((safeDecode) && unlikely((size_t)(ip+length)<(size_t)(ip))) goto _output_error;   /* overflow detection */
-        }
-
-        /* copy literals */
-        cpy = op+length;
-        if (((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) )
-            || ((!endOnInput) && (cpy>oend-COPYLENGTH)))
-        {
-            if (partialDecoding)
-            {
-                if (cpy > oend) goto _output_error;                           /* Error : write attempt beyond end of output buffer */
-                if ((endOnInput) && (ip+length > iend)) goto _output_error;   /* Error : read attempt beyond end of input buffer */
-            }
-            else
-            {
-                if ((!endOnInput) && (cpy != oend)) goto _output_error;       /* Error : block decoding must stop exactly there */
-                if ((endOnInput) && ((ip+length != iend) || (cpy > oend))) goto _output_error;   /* Error : input must be consumed */
-            }
-            memcpy(op, ip, length);
-            ip += length;
-            op += length;
-            break;     /* Necessarily EOF, due to parsing restrictions */
-        }
-        LZ4_wildCopy(op, ip, cpy);
-        ip += length; op = cpy;
-
-        /* get offset */
-        match = cpy - LZ4_readLE16(ip); ip+=2;
-        if ((checkOffset) && (unlikely(match < lowLimit))) goto _output_error;   /* Error : offset outside destination buffer */
-
-        /* get matchlength */
-        length = token & ML_MASK;
-        if (length == ML_MASK)
-        {
-            unsigned s;
-            do
-            {
-                if ((endOnInput) && (ip > iend-LASTLITERALS)) goto _output_error;
-                s = *ip++;
-                length += s;
-            } while (s==255);
-            if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)op)) goto _output_error;   /* overflow detection */
-        }
-        length += MINMATCH;
-
-        /* check external dictionary */
-        if ((dict==usingExtDict) && (match < lowPrefix))
-        {
-            if (unlikely(op+length > oend-LASTLITERALS)) goto _output_error;   /* doesn't respect parsing restriction */
-
-            if (length <= (size_t)(lowPrefix-match))
-            {
-                /* match can be copied as a single segment from external dictionary */
-                match = dictEnd - (lowPrefix-match);
-                memmove(op, match, length); op += length;
-            }
-            else
-            {
-                /* match encompass external dictionary and current segment */
-                size_t copySize = (size_t)(lowPrefix-match);
-                memcpy(op, dictEnd - copySize, copySize);
-                op += copySize;
-                copySize = length - copySize;
-                if (copySize > (size_t)(op-lowPrefix))   /* overlap within current segment */
-                {
-                    BYTE* const endOfMatch = op + copySize;
-                    const BYTE* copyFrom = lowPrefix;
-                    while (op < endOfMatch) *op++ = *copyFrom++;
-                }
-                else
-                {
-                    memcpy(op, lowPrefix, copySize);
-                    op += copySize;
-                }
-            }
-            continue;
-        }
-
-        /* copy repeated sequence */
-        cpy = op + length;
-        if (unlikely((op-match)<8))
-        {
-            const size_t dec64 = dec64table[op-match];
-            op[0] = match[0];
-            op[1] = match[1];
-            op[2] = match[2];
-            op[3] = match[3];
-            match += dec32table[op-match];
-            LZ4_copy4(op+4, match);
-            op += 8; match -= dec64;
-        } else { LZ4_copy8(op, match); op+=8; match+=8; }
-
-        if (unlikely(cpy>oend-12))
-        {
-            if (cpy > oend-LASTLITERALS) goto _output_error;    /* Error : last LASTLITERALS bytes must be literals */
-            if (op < oend-8)
-            {
-                LZ4_wildCopy(op, match, oend-8);
-                match += (oend-8) - op;
-                op = oend-8;
-            }
-            while (op<cpy) *op++ = *match++;
-        }
-        else
-            LZ4_wildCopy(op, match, cpy);
-        op=cpy;   /* correction */
-    }
-
-    /* end of decoding */
-    if (endOnInput)
-       return (int) (((char*)op)-dest);     /* Nb of output bytes decoded */
-    else
-       return (int) (((const char*)ip)-source);   /* Nb of input bytes read */
-
-    /* Overflow error detected */
-_output_error:
-    return (int) (-(((const char*)ip)-source))-1;
-}
-
-
-int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize)
-{
-    return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, full, 0, noDict, (BYTE*)dest, NULL, 0);
-}
-
-int LZ4_decompress_safe_partial(const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize)
-{
-    return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, partial, targetOutputSize, noDict, (BYTE*)dest, NULL, 0);
-}
-
-int LZ4_decompress_fast(const char* source, char* dest, int originalSize)
-{
-    return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)(dest - 64 KB), NULL, 64 KB);
-}
-
-
-/* streaming decompression functions */
-
-typedef struct
-{
-    const BYTE* externalDict;
-    size_t extDictSize;
-    const BYTE* prefixEnd;
-    size_t prefixSize;
-} LZ4_streamDecode_t_internal;
-
-/*
- * If you prefer dynamic allocation methods,
- * LZ4_createStreamDecode()
- * provides a pointer (void*) towards an initialized LZ4_streamDecode_t structure.
- */
-LZ4_streamDecode_t* LZ4_createStreamDecode(void)
-{
-    LZ4_streamDecode_t* lz4s = (LZ4_streamDecode_t*) ALLOCATOR(1, sizeof(LZ4_streamDecode_t));
-    return lz4s;
-}
-
-int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream)
-{
-    FREEMEM(LZ4_stream);
-    return 0;
-}
-
-/*
- * LZ4_setStreamDecode
- * Use this function to instruct where to find the dictionary
- * This function is not necessary if previous data is still available where it was decoded.
- * Loading a size of 0 is allowed (same effect as no dictionary).
- * Return : 1 if OK, 0 if error
- */
-int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize)
-{
-    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
-    lz4sd->prefixSize = (size_t) dictSize;
-    lz4sd->prefixEnd = (const BYTE*) dictionary + dictSize;
-    lz4sd->externalDict = NULL;
-    lz4sd->extDictSize  = 0;
-    return 1;
-}
-
-/*
-*_continue() :
-    These decoding functions allow decompression of multiple blocks in "streaming" mode.
-    Previously decoded blocks must still be available at the memory position where they were decoded.
-    If it's not possible, save the relevant part of decoded data into a safe buffer,
-    and indicate where it stands using LZ4_setStreamDecode()
-*/
-int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize)
-{
-    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
-    int result;
-
-    if (lz4sd->prefixEnd == (BYTE*)dest)
-    {
-        result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
-                                        endOnInputSize, full, 0,
-                                        usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
-        if (result <= 0) return result;
-        lz4sd->prefixSize += result;
-        lz4sd->prefixEnd  += result;
-    }
-    else
-    {
-        lz4sd->extDictSize = lz4sd->prefixSize;
-        lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize;
-        result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
-                                        endOnInputSize, full, 0,
-                                        usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
-        if (result <= 0) return result;
-        lz4sd->prefixSize = result;
-        lz4sd->prefixEnd  = (BYTE*)dest + result;
-    }
-
-    return result;
-}
-
-int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize)
-{
-    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
-    int result;
-
-    if (lz4sd->prefixEnd == (BYTE*)dest)
-    {
-        result = LZ4_decompress_generic(source, dest, 0, originalSize,
-                                        endOnOutputSize, full, 0,
-                                        usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
-        if (result <= 0) return result;
-        lz4sd->prefixSize += originalSize;
-        lz4sd->prefixEnd  += originalSize;
-    }
-    else
-    {
-        lz4sd->extDictSize = lz4sd->prefixSize;
-        lz4sd->externalDict = (BYTE*)dest - lz4sd->extDictSize;
-        result = LZ4_decompress_generic(source, dest, 0, originalSize,
-                                        endOnOutputSize, full, 0,
-                                        usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
-        if (result <= 0) return result;
-        lz4sd->prefixSize = originalSize;
-        lz4sd->prefixEnd  = (BYTE*)dest + originalSize;
-    }
-
-    return result;
-}
-
-
-/*
-Advanced decoding functions :
-*_usingDict() :
-    These decoding functions work the same as "_continue" ones,
-    the dictionary must be explicitly provided within parameters
-*/
-
-FORCE_INLINE int LZ4_decompress_usingDict_generic(const char* source, char* dest, int compressedSize, int maxOutputSize, int safe, const char* dictStart, int dictSize)
-{
-    if (dictSize==0)
-        return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest, NULL, 0);
-    if (dictStart+dictSize == dest)
-    {
-        if (dictSize >= (int)(64 KB - 1))
-            return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, withPrefix64k, (BYTE*)dest-64 KB, NULL, 0);
-        return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest-dictSize, NULL, 0);
-    }
-    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, usingExtDict, (BYTE*)dest, (const BYTE*)dictStart, dictSize);
-}
-
-int LZ4_decompress_safe_usingDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
-{
-    return LZ4_decompress_usingDict_generic(source, dest, compressedSize, maxOutputSize, 1, dictStart, dictSize);
-}
-
-int LZ4_decompress_fast_usingDict(const char* source, char* dest, int originalSize, const char* dictStart, int dictSize)
-{
-    return LZ4_decompress_usingDict_generic(source, dest, 0, originalSize, 0, dictStart, dictSize);
-}
-
-/* debug function */
-int LZ4_decompress_safe_forceExtDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
-{
-    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, (BYTE*)dest, (const BYTE*)dictStart, dictSize);
-}
-
-
-/***************************************************
-*  Obsolete Functions
-***************************************************/
-/* obsolete compression functions */
-int LZ4_compress_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize) { return LZ4_compress_default(source, dest, inputSize, maxOutputSize); }
-int LZ4_compress(const char* source, char* dest, int inputSize) { return LZ4_compress_default(source, dest, inputSize, LZ4_compressBound(inputSize)); }
-int LZ4_compress_limitedOutput_withState (void* state, const char* src, char* dst, int srcSize, int dstSize) { return LZ4_compress_fast_extState(state, src, dst, srcSize, dstSize, 1); }
-int LZ4_compress_withState (void* state, const char* src, char* dst, int srcSize) { return LZ4_compress_fast_extState(state, src, dst, srcSize, LZ4_compressBound(srcSize), 1); }
-int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_stream, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_fast_continue(LZ4_stream, src, dst, srcSize, maxDstSize, 1); }
-int LZ4_compress_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize) { return LZ4_compress_fast_continue(LZ4_stream, source, dest, inputSize, LZ4_compressBound(inputSize), 1); }
-
-/*
-These function names are deprecated and should no longer be used.
-They are only provided here for compatibility with older user programs.
-- LZ4_uncompress is totally equivalent to LZ4_decompress_fast
-- LZ4_uncompress_unknownOutputSize is totally equivalent to LZ4_decompress_safe
-*/
-int LZ4_uncompress (const char* source, char* dest, int outputSize) { return LZ4_decompress_fast(source, dest, outputSize); }
-int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize) { return LZ4_decompress_safe(source, dest, isize, maxOutputSize); }
-
-
-/* Obsolete Streaming functions */
-
-int LZ4_sizeofStreamState() { return LZ4_STREAMSIZE; }
-
-static void LZ4_init(LZ4_stream_t_internal* lz4ds, BYTE* base)
-{
-    MEM_INIT(lz4ds, 0, LZ4_STREAMSIZE);
-    lz4ds->bufferStart = base;
-}
-
-int LZ4_resetStreamState(void* state, char* inputBuffer)
-{
-    if ((((size_t)state) & 3) != 0) return 1;   /* Error : pointer is not aligned on 4-bytes boundary */
-    LZ4_init((LZ4_stream_t_internal*)state, (BYTE*)inputBuffer);
-    return 0;
-}
-
-void* LZ4_create (char* inputBuffer)
-{
-    void* lz4ds = ALLOCATOR(8, LZ4_STREAMSIZE_U64);
-    LZ4_init ((LZ4_stream_t_internal*)lz4ds, (BYTE*)inputBuffer);
-    return lz4ds;
-}
-
-char* LZ4_slideInputBuffer (void* LZ4_Data)
-{
-    LZ4_stream_t_internal* ctx = (LZ4_stream_t_internal*)LZ4_Data;
-    int dictSize = LZ4_saveDict((LZ4_stream_t*)LZ4_Data, (char*)ctx->bufferStart, 64 KB);
-    return (char*)(ctx->bufferStart + dictSize);
-}
-
-/* Obsolete streaming decompression functions */
-
-int LZ4_decompress_safe_withPrefix64k(const char* source, char* dest, int compressedSize, int maxOutputSize)
-{
-    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
-}
-
-int LZ4_decompress_fast_withPrefix64k(const char* source, char* dest, int originalSize)
-{
-    return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
-}
-
-#endif   /* LZ4_COMMONDEFS_ONLY */
-
diff --git a/extra/lz4/lz4.h b/extra/lz4/lz4.h
deleted file mode 100644
index 3e7400225612..000000000000
--- a/extra/lz4/lz4.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
-   LZ4 - Fast LZ compression algorithm
-   Header File
-   Copyright (C) 2011-2015, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - LZ4 source repository : https://github.com/Cyan4973/lz4
-   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-#pragma once
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/*
- * lz4.h provides block compression functions, and gives full buffer control to programmer.
- * If you need to generate inter-operable compressed data (respecting LZ4 frame specification),
- * and can let the library handle its own memory, please use lz4frame.h instead.
-*/
-
-/**************************************
-*  Version
-**************************************/
-#define LZ4_VERSION_MAJOR    1    /* for breaking interface changes  */
-#define LZ4_VERSION_MINOR    7    /* for new (non-breaking) interface capabilities */
-#define LZ4_VERSION_RELEASE  1    /* for tweaks, bug-fixes, or development */
-#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
-int LZ4_versionNumber (void);
-
-/**************************************
-*  Tuning parameter
-**************************************/
-/*
- * LZ4_MEMORY_USAGE :
- * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.)
- * Increasing memory usage improves compression ratio
- * Reduced memory usage can improve speed, due to cache effect
- * Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache
- */
-#define LZ4_MEMORY_USAGE 14
-
-
-/**************************************
-*  Simple Functions
-**************************************/
-
-int LZ4_compress_default(const char* source, char* dest, int sourceSize, int maxDestSize);
-int LZ4_decompress_safe (const char* source, char* dest, int compressedSize, int maxDecompressedSize);
-
-/*
-LZ4_compress_default() :
-    Compresses 'sourceSize' bytes from buffer 'source'
-    into already allocated 'dest' buffer of size 'maxDestSize'.
-    Compression is guaranteed to succeed if 'maxDestSize' >= LZ4_compressBound(sourceSize).
-    It also runs faster, so it's a recommended setting.
-    If the function cannot compress 'source' into a more limited 'dest' budget,
-    compression stops *immediately*, and the function result is zero.
-    As a consequence, 'dest' content is not valid.
-    This function never writes outside 'dest' buffer, nor read outside 'source' buffer.
-        sourceSize  : Max supported value is LZ4_MAX_INPUT_VALUE
-        maxDestSize : full or partial size of buffer 'dest' (which must be already allocated)
-        return : the number of bytes written into buffer 'dest' (necessarily <= maxOutputSize)
-              or 0 if compression fails
-
-LZ4_decompress_safe() :
-    compressedSize : is the precise full size of the compressed block.
-    maxDecompressedSize : is the size of destination buffer, which must be already allocated.
-    return : the number of bytes decompressed into destination buffer (necessarily <= maxDecompressedSize)
-             If destination buffer is not large enough, decoding will stop and output an error code (<0).
-             If the source stream is detected malformed, the function will stop decoding and return a negative result.
-             This function is protected against buffer overflow exploits, including malicious data packets.
-             It never writes outside output buffer, nor reads outside input buffer.
-*/
-
-
-/**************************************
-*  Advanced Functions
-**************************************/
-#define LZ4_MAX_INPUT_SIZE        0x7E000000   /* 2 113 929 216 bytes */
-#define LZ4_COMPRESSBOUND(isize)  ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16)
-
-/*
-LZ4_compressBound() :
-    Provides the maximum size that LZ4 compression may output in a "worst case" scenario (input data not compressible)
-    This function is primarily useful for memory allocation purposes (destination buffer size).
-    Macro LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack memory allocation for example).
-    Note that LZ4_compress_default() compress faster when dest buffer size is >= LZ4_compressBound(srcSize)
-        inputSize  : max supported value is LZ4_MAX_INPUT_SIZE
-        return : maximum output size in a "worst case" scenario
-              or 0, if input size is too large ( > LZ4_MAX_INPUT_SIZE)
-*/
-int LZ4_compressBound(int inputSize);
-
-/*
-LZ4_compress_fast() :
-    Same as LZ4_compress_default(), but allows to select an "acceleration" factor.
-    The larger the acceleration value, the faster the algorithm, but also the lesser the compression.
-    It's a trade-off. It can be fine tuned, with each successive value providing roughly +~3% to speed.
-    An acceleration value of "1" is the same as regular LZ4_compress_default()
-    Values <= 0 will be replaced by ACCELERATION_DEFAULT (see lz4.c), which is 1.
-*/
-int LZ4_compress_fast (const char* source, char* dest, int sourceSize, int maxDestSize, int acceleration);
-
-
-/*
-LZ4_compress_fast_extState() :
-    Same compression function, just using an externally allocated memory space to store compression state.
-    Use LZ4_sizeofState() to know how much memory must be allocated,
-    and allocate it on 8-bytes boundaries (using malloc() typically).
-    Then, provide it as 'void* state' to compression function.
-*/
-int LZ4_sizeofState(void);
-int LZ4_compress_fast_extState (void* state, const char* source, char* dest, int inputSize, int maxDestSize, int acceleration);
-
-
-/*
-LZ4_compress_destSize() :
-    Reverse the logic, by compressing as much data as possible from 'source' buffer
-    into already allocated buffer 'dest' of size 'targetDestSize'.
-    This function either compresses the entire 'source' content into 'dest' if it's large enough,
-    or fill 'dest' buffer completely with as much data as possible from 'source'.
-        *sourceSizePtr : will be modified to indicate how many bytes where read from 'source' to fill 'dest'.
-                         New value is necessarily <= old value.
-        return : Nb bytes written into 'dest' (necessarily <= targetDestSize)
-              or 0 if compression fails
-*/
-int LZ4_compress_destSize (const char* source, char* dest, int* sourceSizePtr, int targetDestSize);
-
-
-/*
-LZ4_decompress_fast() :
-    originalSize : is the original and therefore uncompressed size
-    return : the number of bytes read from the source buffer (in other words, the compressed size)
-             If the source stream is detected malformed, the function will stop decoding and return a negative result.
-             Destination buffer must be already allocated. Its size must be a minimum of 'originalSize' bytes.
-    note : This function fully respect memory boundaries for properly formed compressed data.
-           It is a bit faster than LZ4_decompress_safe().
-           However, it does not provide any protection against intentionally modified data stream (malicious input).
-           Use this function in trusted environment only (data to decode comes from a trusted source).
-*/
-int LZ4_decompress_fast (const char* source, char* dest, int originalSize);
-
-/*
-LZ4_decompress_safe_partial() :
-    This function decompress a compressed block of size 'compressedSize' at position 'source'
-    into destination buffer 'dest' of size 'maxDecompressedSize'.
-    The function tries to stop decompressing operation as soon as 'targetOutputSize' has been reached,
-    reducing decompression time.
-    return : the number of bytes decoded in the destination buffer (necessarily <= maxDecompressedSize)
-       Note : this number can be < 'targetOutputSize' should the compressed block to decode be smaller.
-             Always control how many bytes were decoded.
-             If the source stream is detected malformed, the function will stop decoding and return a negative result.
-             This function never writes outside of output buffer, and never reads outside of input buffer. It is therefore protected against malicious data packets
-*/
-int LZ4_decompress_safe_partial (const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize);
-
-
-/***********************************************
-*  Streaming Compression Functions
-***********************************************/
-#define LZ4_STREAMSIZE_U64 ((1 << (LZ4_MEMORY_USAGE-3)) + 4)
-#define LZ4_STREAMSIZE     (LZ4_STREAMSIZE_U64 * sizeof(long long))
-/*
- * LZ4_stream_t
- * information structure to track an LZ4 stream.
- * important : init this structure content before first use !
- * note : only allocated directly the structure if you are statically linking LZ4
- *        If you are using liblz4 as a DLL, please use below construction methods instead.
- */
-typedef struct { long long table[LZ4_STREAMSIZE_U64]; } LZ4_stream_t;
-
-/*
- * LZ4_resetStream
- * Use this function to init an allocated LZ4_stream_t structure
- */
-void LZ4_resetStream (LZ4_stream_t* streamPtr);
-
-/*
- * LZ4_createStream will allocate and initialize an LZ4_stream_t structure
- * LZ4_freeStream releases its memory.
- * In the context of a DLL (liblz4), please use these methods rather than the static struct.
- * They are more future proof, in case of a change of LZ4_stream_t size.
- */
-LZ4_stream_t* LZ4_createStream(void);
-int           LZ4_freeStream (LZ4_stream_t* streamPtr);
-
-/*
- * LZ4_loadDict
- * Use this function to load a static dictionary into LZ4_stream.
- * Any previous data will be forgotten, only 'dictionary' will remain in memory.
- * Loading a size of 0 is allowed.
- * Return : dictionary size, in bytes (necessarily <= 64 KB)
- */
-int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize);
-
-/*
- * LZ4_compress_fast_continue
- * Compress buffer content 'src', using data from previously compressed blocks as dictionary to improve compression ratio.
- * Important : Previous data blocks are assumed to still be present and unmodified !
- * 'dst' buffer must be already allocated.
- * If maxDstSize >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster.
- * If not, and if compressed data cannot fit into 'dst' buffer size, compression stops, and function returns a zero.
- */
-int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int maxDstSize, int acceleration);
-
-/*
- * LZ4_saveDict
- * If previously compressed data block is not guaranteed to remain available at its memory location
- * save it into a safer place (char* safeBuffer)
- * Note : you don't need to call LZ4_loadDict() afterwards,
- *        dictionary is immediately usable, you can therefore call LZ4_compress_fast_continue()
- * Return : saved dictionary size in bytes (necessarily <= dictSize), or 0 if error
- */
-int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int dictSize);
-
-
-/************************************************
-*  Streaming Decompression Functions
-************************************************/
-
-#define LZ4_STREAMDECODESIZE_U64  4
-#define LZ4_STREAMDECODESIZE     (LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
-typedef struct { unsigned long long table[LZ4_STREAMDECODESIZE_U64]; } LZ4_streamDecode_t;
-/*
- * LZ4_streamDecode_t
- * information structure to track an LZ4 stream.
- * init this structure content using LZ4_setStreamDecode or memset() before first use !
- *
- * In the context of a DLL (liblz4) please prefer usage of construction methods below.
- * They are more future proof, in case of a change of LZ4_streamDecode_t size in the future.
- * LZ4_createStreamDecode will allocate and initialize an LZ4_streamDecode_t structure
- * LZ4_freeStreamDecode releases its memory.
- */
-LZ4_streamDecode_t* LZ4_createStreamDecode(void);
-int                 LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
-
-/*
- * LZ4_setStreamDecode
- * Use this function to instruct where to find the dictionary.
- * Setting a size of 0 is allowed (same effect as reset).
- * Return : 1 if OK, 0 if error
- */
-int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize);
-
-/*
-*_continue() :
-    These decoding functions allow decompression of multiple blocks in "streaming" mode.
-    Previously decoded blocks *must* remain available at the memory position where they were decoded (up to 64 KB)
-    In the case of a ring buffers, decoding buffer must be either :
-    - Exactly same size as encoding buffer, with same update rule (block boundaries at same positions)
-      In which case, the decoding & encoding ring buffer can have any size, including very small ones ( < 64 KB).
-    - Larger than encoding buffer, by a minimum of maxBlockSize more bytes.
-      maxBlockSize is implementation dependent. It's the maximum size you intend to compress into a single block.
-      In which case, encoding and decoding buffers do not need to be synchronized,
-      and encoding ring buffer can have any size, including small ones ( < 64 KB).
-    - _At least_ 64 KB + 8 bytes + maxBlockSize.
-      In which case, encoding and decoding buffers do not need to be synchronized,
-      and encoding ring buffer can have any size, including larger than decoding buffer.
-    Whenever these conditions are not possible, save the last 64KB of decoded data into a safe buffer,
-    and indicate where it is saved using LZ4_setStreamDecode()
-*/
-int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxDecompressedSize);
-int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize);
-
-
-/*
-Advanced decoding functions :
-*_usingDict() :
-    These decoding functions work the same as
-    a combination of LZ4_setStreamDecode() followed by LZ4_decompress_x_continue()
-    They are stand-alone. They don't need nor update an LZ4_streamDecode_t structure.
-*/
-int LZ4_decompress_safe_usingDict (const char* source, char* dest, int compressedSize, int maxDecompressedSize, const char* dictStart, int dictSize);
-int LZ4_decompress_fast_usingDict (const char* source, char* dest, int originalSize, const char* dictStart, int dictSize);
-
-
-
-/**************************************
-*  Obsolete Functions
-**************************************/
-/* Deprecate Warnings */
-/* Should these warnings messages be a problem,
-   it is generally possible to disable them,
-   with -Wno-deprecated-declarations for gcc
-   or _CRT_SECURE_NO_WARNINGS in Visual for example.
-   You can also define LZ4_DEPRECATE_WARNING_DEFBLOCK. */
-#ifndef LZ4_DEPRECATE_WARNING_DEFBLOCK
-#  define LZ4_DEPRECATE_WARNING_DEFBLOCK
-#  define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#  if (LZ4_GCC_VERSION >= 405) || defined(__clang__)
-#    define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
-#  elif (LZ4_GCC_VERSION >= 301)
-#    define LZ4_DEPRECATED(message) __attribute__((deprecated))
-#  elif defined(_MSC_VER)
-#    define LZ4_DEPRECATED(message) __declspec(deprecated(message))
-#  else
-#    pragma message("WARNING: You need to implement LZ4_DEPRECATED for this compiler")
-#    define LZ4_DEPRECATED(message)
-#  endif
-#endif /* LZ4_DEPRECATE_WARNING_DEFBLOCK */
-
-/* Obsolete compression functions */
-/* These functions are planned to start generate warnings by r131 approximately */
-int LZ4_compress               (const char* source, char* dest, int sourceSize);
-int LZ4_compress_limitedOutput (const char* source, char* dest, int sourceSize, int maxOutputSize);
-int LZ4_compress_withState               (void* state, const char* source, char* dest, int inputSize);
-int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
-int LZ4_compress_continue                (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);
-int LZ4_compress_limitedOutput_continue  (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
-
-/* Obsolete decompression functions */
-/* These function names are completely deprecated and must no longer be used.
-   They are only provided here for compatibility with older programs.
-    - LZ4_uncompress is the same as LZ4_decompress_fast
-    - LZ4_uncompress_unknownOutputSize is the same as LZ4_decompress_safe
-   These function prototypes are now disabled; uncomment them only if you really need them.
-   It is highly recommended to stop using these prototypes and migrate to maintained ones */
-/* int LZ4_uncompress (const char* source, char* dest, int outputSize); */
-/* int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize); */
-
-/* Obsolete streaming functions; use new streaming interface whenever possible */
-LZ4_DEPRECATED("use LZ4_createStream() instead") void* LZ4_create (char* inputBuffer);
-LZ4_DEPRECATED("use LZ4_createStream() instead") int   LZ4_sizeofStreamState(void);
-LZ4_DEPRECATED("use LZ4_resetStream() instead")  int   LZ4_resetStreamState(void* state, char* inputBuffer);
-LZ4_DEPRECATED("use LZ4_saveDict() instead")     char* LZ4_slideInputBuffer (void* state);
-
-/* Obsolete streaming decoding functions */
-LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead") int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);
-LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);
-
-
-#if defined (__cplusplus)
-}
-#endif
diff --git a/extra/lz4/lz4frame.c b/extra/lz4/lz4frame.c
deleted file mode 100644
index fc2984140ddf..000000000000
--- a/extra/lz4/lz4frame.c
+++ /dev/null
@@ -1,1480 +0,0 @@
-/*
-LZ4 auto-framing library
-Copyright (C) 2011-2015, Yann Collet.
-
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-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.
-
-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.
-
-You can contact the author at :
-- LZ4 source repository : https://github.com/Cyan4973/lz4
-- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-
-/* LZ4F is a stand-alone API to create LZ4-compressed Frames
-*  in full conformance with specification v1.5.0
-*  All related operations, including memory management, are handled by the library.
-* */
-
-
-/**************************************
-*  Compiler Options
-**************************************/
-#ifdef _MSC_VER    /* Visual Studio */
-#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
-#endif
-
-
-/**************************************
-*  Memory routines
-**************************************/
-#include <stdlib.h>   /* malloc, calloc, free */
-#define ALLOCATOR(s)   calloc(1,s)
-#define FREEMEM        free
-#include <string.h>   /* memset, memcpy, memmove */
-#define MEM_INIT       memset
-
-
-/**************************************
-*  Includes
-**************************************/
-#include "lz4frame_static.h"
-#include "lz4.h"
-#include "lz4hc.h"
-#include "xxhash.h"
-
-
-/**************************************
-*  Basic Types
-**************************************/
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
-# include <stdint.h>
-typedef  uint8_t BYTE;
-typedef uint16_t U16;
-typedef uint32_t U32;
-typedef  int32_t S32;
-typedef uint64_t U64;
-#else
-typedef unsigned char       BYTE;
-typedef unsigned short      U16;
-typedef unsigned int        U32;
-typedef   signed int        S32;
-typedef unsigned long long  U64;
-#endif
-
-
-/**************************************
-*  Constants
-**************************************/
-#define KB *(1<<10)
-#define MB *(1<<20)
-#define GB *(1<<30)
-
-#define _1BIT  0x01
-#define _2BITS 0x03
-#define _3BITS 0x07
-#define _4BITS 0x0F
-#define _8BITS 0xFF
-
-#define LZ4F_MAGIC_SKIPPABLE_START 0x184D2A50U
-#define LZ4F_MAGICNUMBER 0x184D2204U
-#define LZ4F_BLOCKUNCOMPRESSED_FLAG 0x80000000U
-#define LZ4F_BLOCKSIZEID_DEFAULT LZ4F_max64KB
-
-static const size_t minFHSize = 7;
-static const size_t maxFHSize = 15;
-static const size_t BHSize = 4;
-static const int    minHClevel = 3;
-
-
-/**************************************
-*  Structures and local types
-**************************************/
-typedef struct LZ4F_cctx_s
-{
-    LZ4F_preferences_t prefs;
-    U32    version;
-    U32    cStage;
-    size_t maxBlockSize;
-    size_t maxBufferSize;
-    BYTE*  tmpBuff;
-    BYTE*  tmpIn;
-    size_t tmpInSize;
-    U64    totalInSize;
-    XXH32_state_t xxh;
-    void*  lz4CtxPtr;
-    U32    lz4CtxLevel;     /* 0: unallocated;  1: LZ4_stream_t;  3: LZ4_streamHC_t */
-} LZ4F_cctx_t;
-
-typedef struct LZ4F_dctx_s
-{
-    LZ4F_frameInfo_t frameInfo;
-    U32    version;
-    U32    dStage;
-    U64    frameRemainingSize;
-    size_t maxBlockSize;
-    size_t maxBufferSize;
-    const BYTE* srcExpect;
-    BYTE*  tmpIn;
-    size_t tmpInSize;
-    size_t tmpInTarget;
-    BYTE*  tmpOutBuffer;
-    const BYTE*  dict;
-    size_t dictSize;
-    BYTE*  tmpOut;
-    size_t tmpOutSize;
-    size_t tmpOutStart;
-    XXH32_state_t xxh;
-    BYTE   header[16];
-} LZ4F_dctx_t;
-
-
-/**************************************
-*  Error management
-**************************************/
-#define LZ4F_GENERATE_STRING(STRING) #STRING,
-static const char* LZ4F_errorStrings[] = { LZ4F_LIST_ERRORS(LZ4F_GENERATE_STRING) };
-
-
-unsigned LZ4F_isError(LZ4F_errorCode_t code)
-{
-    return (code > (LZ4F_errorCode_t)(-LZ4F_ERROR_maxCode));
-}
-
-const char* LZ4F_getErrorName(LZ4F_errorCode_t code)
-{
-    static const char* codeError = "Unspecified error code";
-    if (LZ4F_isError(code)) return LZ4F_errorStrings[-(int)(code)];
-    return codeError;
-}
-
-
-/**************************************
-*  Private functions
-**************************************/
-static size_t LZ4F_getBlockSize(unsigned blockSizeID)
-{
-    static const size_t blockSizes[4] = { 64 KB, 256 KB, 1 MB, 4 MB };
-
-    if (blockSizeID == 0) blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
-    blockSizeID -= 4;
-    if (blockSizeID > 3) return (size_t)-LZ4F_ERROR_maxBlockSize_invalid;
-    return blockSizes[blockSizeID];
-}
-
-
-/* unoptimized version; solves endianess & alignment issues */
-static U32 LZ4F_readLE32 (const BYTE* srcPtr)
-{
-    U32 value32 = srcPtr[0];
-    value32 += (srcPtr[1]<<8);
-    value32 += (srcPtr[2]<<16);
-    value32 += ((U32)srcPtr[3])<<24;
-    return value32;
-}
-
-static void LZ4F_writeLE32 (BYTE* dstPtr, U32 value32)
-{
-    dstPtr[0] = (BYTE)value32;
-    dstPtr[1] = (BYTE)(value32 >> 8);
-    dstPtr[2] = (BYTE)(value32 >> 16);
-    dstPtr[3] = (BYTE)(value32 >> 24);
-}
-
-static U64 LZ4F_readLE64 (const BYTE* srcPtr)
-{
-    U64 value64 = srcPtr[0];
-    value64 += ((U64)srcPtr[1]<<8);
-    value64 += ((U64)srcPtr[2]<<16);
-    value64 += ((U64)srcPtr[3]<<24);
-    value64 += ((U64)srcPtr[4]<<32);
-    value64 += ((U64)srcPtr[5]<<40);
-    value64 += ((U64)srcPtr[6]<<48);
-    value64 += ((U64)srcPtr[7]<<56);
-    return value64;
-}
-
-static void LZ4F_writeLE64 (BYTE* dstPtr, U64 value64)
-{
-    dstPtr[0] = (BYTE)value64;
-    dstPtr[1] = (BYTE)(value64 >> 8);
-    dstPtr[2] = (BYTE)(value64 >> 16);
-    dstPtr[3] = (BYTE)(value64 >> 24);
-    dstPtr[4] = (BYTE)(value64 >> 32);
-    dstPtr[5] = (BYTE)(value64 >> 40);
-    dstPtr[6] = (BYTE)(value64 >> 48);
-    dstPtr[7] = (BYTE)(value64 >> 56);
-}
-
-
-static BYTE LZ4F_headerChecksum (const void* header, size_t length)
-{
-    U32 xxh = XXH32(header, length, 0);
-    return (BYTE)(xxh >> 8);
-}
-
-
-/**************************************
-*  Simple compression functions
-**************************************/
-static LZ4F_blockSizeID_t LZ4F_optimalBSID(const LZ4F_blockSizeID_t requestedBSID, const size_t srcSize)
-{
-    LZ4F_blockSizeID_t proposedBSID = LZ4F_max64KB;
-    size_t maxBlockSize = 64 KB;
-    while (requestedBSID > proposedBSID)
-    {
-        if (srcSize <= maxBlockSize)
-            return proposedBSID;
-        proposedBSID = (LZ4F_blockSizeID_t)((int)proposedBSID + 1);
-        maxBlockSize <<= 2;
-    }
-    return requestedBSID;
-}
-
-
-size_t LZ4F_compressFrameBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr)
-{
-    LZ4F_preferences_t prefs;
-    size_t headerSize;
-    size_t streamSize;
-
-    if (preferencesPtr!=NULL) prefs = *preferencesPtr;
-    else memset(&prefs, 0, sizeof(prefs));
-
-    prefs.frameInfo.blockSizeID = LZ4F_optimalBSID(prefs.frameInfo.blockSizeID, srcSize);
-    prefs.autoFlush = 1;
-
-    headerSize = maxFHSize;      /* header size, including magic number and frame content size*/
-    streamSize = LZ4F_compressBound(srcSize, &prefs);
-
-    return headerSize + streamSize;
-}
-
-
-/* LZ4F_compressFrame()
-* Compress an entire srcBuffer into a valid LZ4 frame, as defined by specification v1.5.0, in a single step.
-* The most important rule is that dstBuffer MUST be large enough (dstMaxSize) to ensure compression completion even in worst case.
-* You can get the minimum value of dstMaxSize by using LZ4F_compressFrameBound()
-* If this condition is not respected, LZ4F_compressFrame() will fail (result is an errorCode)
-* The LZ4F_preferences_t structure is optional : you can provide NULL as argument. All preferences will then be set to default.
-* The result of the function is the number of bytes written into dstBuffer.
-* The function outputs an error code if it fails (can be tested using LZ4F_isError())
-*/
-size_t LZ4F_compressFrame(void* dstBuffer, size_t dstMaxSize, const void* srcBuffer, size_t srcSize, const LZ4F_preferences_t* preferencesPtr)
-{
-    LZ4F_cctx_t cctxI;
-    LZ4_stream_t lz4ctx;
-    LZ4F_preferences_t prefs;
-    LZ4F_compressOptions_t options;
-    LZ4F_errorCode_t errorCode;
-    BYTE* const dstStart = (BYTE*) dstBuffer;
-    BYTE* dstPtr = dstStart;
-    BYTE* const dstEnd = dstStart + dstMaxSize;
-
-    memset(&cctxI, 0, sizeof(cctxI));   /* works because no allocation */
-    memset(&options, 0, sizeof(options));
-
-    cctxI.version = LZ4F_VERSION;
-    cctxI.maxBufferSize = 5 MB;   /* mess with real buffer size to prevent allocation; works because autoflush==1 & stableSrc==1 */
-
-    if (preferencesPtr!=NULL)
-        prefs = *preferencesPtr;
-    else
-        memset(&prefs, 0, sizeof(prefs));
-    if (prefs.frameInfo.contentSize != 0)
-        prefs.frameInfo.contentSize = (U64)srcSize;   /* auto-correct content size if selected (!=0) */
-
-    if (prefs.compressionLevel < (int)minHClevel)
-    {
-        cctxI.lz4CtxPtr = &lz4ctx;
-        cctxI.lz4CtxLevel = 1;
-    }
-
-    prefs.frameInfo.blockSizeID = LZ4F_optimalBSID(prefs.frameInfo.blockSizeID, srcSize);
-    prefs.autoFlush = 1;
-    if (srcSize <= LZ4F_getBlockSize(prefs.frameInfo.blockSizeID))
-        prefs.frameInfo.blockMode = LZ4F_blockIndependent;   /* no need for linked blocks */
-
-    options.stableSrc = 1;
-
-    if (dstMaxSize < LZ4F_compressFrameBound(srcSize, &prefs))
-        return (size_t)-LZ4F_ERROR_dstMaxSize_tooSmall;
-
-    errorCode = LZ4F_compressBegin(&cctxI, dstBuffer, dstMaxSize, &prefs);  /* write header */
-    if (LZ4F_isError(errorCode)) return errorCode;
-    dstPtr += errorCode;   /* header size */
-
-    errorCode = LZ4F_compressUpdate(&cctxI, dstPtr, dstEnd-dstPtr, srcBuffer, srcSize, &options);
-    if (LZ4F_isError(errorCode)) return errorCode;
-    dstPtr += errorCode;
-
-    errorCode = LZ4F_compressEnd(&cctxI, dstPtr, dstEnd-dstPtr, &options);   /* flush last block, and generate suffix */
-    if (LZ4F_isError(errorCode)) return errorCode;
-    dstPtr += errorCode;
-
-    if (prefs.compressionLevel >= (int)minHClevel)   /* no allocation necessary with lz4 fast */
-        FREEMEM(cctxI.lz4CtxPtr);
-
-    return (dstPtr - dstStart);
-}
-
-
-/***********************************
-*  Advanced compression functions
-***********************************/
-
-/* LZ4F_createCompressionContext() :
-* The first thing to do is to create a compressionContext object, which will be used in all compression operations.
-* This is achieved using LZ4F_createCompressionContext(), which takes as argument a version and an LZ4F_preferences_t structure.
-* The version provided MUST be LZ4F_VERSION. It is intended to track potential version differences between different binaries.
-* The function will provide a pointer to an allocated LZ4F_compressionContext_t object.
-* If the result LZ4F_errorCode_t is not OK_NoError, there was an error during context creation.
-* Object can release its memory using LZ4F_freeCompressionContext();
-*/
-LZ4F_errorCode_t LZ4F_createCompressionContext(LZ4F_compressionContext_t* LZ4F_compressionContextPtr, unsigned version)
-{
-    LZ4F_cctx_t* cctxPtr;
-
-    cctxPtr = (LZ4F_cctx_t*)ALLOCATOR(sizeof(LZ4F_cctx_t));
-    if (cctxPtr==NULL) return (LZ4F_errorCode_t)(-LZ4F_ERROR_allocation_failed);
-
-    cctxPtr->version = version;
-    cctxPtr->cStage = 0;   /* Next stage : write header */
-
-    *LZ4F_compressionContextPtr = (LZ4F_compressionContext_t)cctxPtr;
-
-    return LZ4F_OK_NoError;
-}
-
-
-LZ4F_errorCode_t LZ4F_freeCompressionContext(LZ4F_compressionContext_t LZ4F_compressionContext)
-{
-    LZ4F_cctx_t* cctxPtr = (LZ4F_cctx_t*)LZ4F_compressionContext;
-
-    if (cctxPtr != NULL)   /* null pointers can be safely provided to this function, like free() */
-    {
-       FREEMEM(cctxPtr->lz4CtxPtr);
-       FREEMEM(cctxPtr->tmpBuff);
-       FREEMEM(LZ4F_compressionContext);
-    }
-
-    return LZ4F_OK_NoError;
-}
-
-
-/* LZ4F_compressBegin() :
-* will write the frame header into dstBuffer.
-* dstBuffer must be large enough to accommodate a header (dstMaxSize). Maximum header size is LZ4F_MAXHEADERFRAME_SIZE bytes.
-* The result of the function is the number of bytes written into dstBuffer for the header
-* or an error code (can be tested using LZ4F_isError())
-*/
-size_t LZ4F_compressBegin(LZ4F_compressionContext_t compressionContext, void* dstBuffer, size_t dstMaxSize, const LZ4F_preferences_t* preferencesPtr)
-{
-    LZ4F_preferences_t prefNull;
-    LZ4F_cctx_t* cctxPtr = (LZ4F_cctx_t*)compressionContext;
-    BYTE* const dstStart = (BYTE*)dstBuffer;
-    BYTE* dstPtr = dstStart;
-    BYTE* headerStart;
-    size_t requiredBuffSize;
-
-    if (dstMaxSize < maxFHSize) return (size_t)-LZ4F_ERROR_dstMaxSize_tooSmall;
-    if (cctxPtr->cStage != 0) return (size_t)-LZ4F_ERROR_GENERIC;
-    memset(&prefNull, 0, sizeof(prefNull));
-    if (preferencesPtr == NULL) preferencesPtr = &prefNull;
-    cctxPtr->prefs = *preferencesPtr;
-
-    /* ctx Management */
-    {
-        U32 tableID = (cctxPtr->prefs.compressionLevel < minHClevel) ? 1 : 2;  /* 0:nothing ; 1:LZ4 table ; 2:HC tables */
-        if (cctxPtr->lz4CtxLevel < tableID)
-        {
-            FREEMEM(cctxPtr->lz4CtxPtr);
-            if (cctxPtr->prefs.compressionLevel < minHClevel)
-                cctxPtr->lz4CtxPtr = (void*)LZ4_createStream();
-            else
-                cctxPtr->lz4CtxPtr = (void*)LZ4_createStreamHC();
-            cctxPtr->lz4CtxLevel = tableID;
-        }
-    }
-
-    /* Buffer Management */
-    if (cctxPtr->prefs.frameInfo.blockSizeID == 0) cctxPtr->prefs.frameInfo.blockSizeID = LZ4F_BLOCKSIZEID_DEFAULT;
-    cctxPtr->maxBlockSize = LZ4F_getBlockSize(cctxPtr->prefs.frameInfo.blockSizeID);
-
-    requiredBuffSize = cctxPtr->maxBlockSize + ((cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked) * 128 KB);
-    if (preferencesPtr->autoFlush)
-        requiredBuffSize = (cctxPtr->prefs.frameInfo.blockMode == LZ4F_blockLinked) * 64 KB;   /* just needs dict */
-
-    if (cctxPtr->maxBufferSize < requiredBuffSize)
-    {
-        cctxPtr->maxBufferSize = requiredBuffSize;
-        FREEMEM(cctxPtr->tmpBuff);
-        cctxPtr->tmpBuff = (BYTE*)ALLOCATOR(requiredBuffSize);
-        if (cctxPtr->tmpBuff == NULL) return (size_t)-LZ4F_ERROR_allocation_failed;
-    }
-    cctxPtr->tmpIn = cctxPtr->tmpBuff;
-    cctxPtr->tmpInSize = 0;
-    XXH32_reset(&(cctxPtr->xxh), 0);
-    if (cctxPtr->prefs.compressionLevel < minHClevel)
-        LZ4_resetStream((LZ4_stream_t*)(cctxPtr->lz4CtxPtr));
-    else
-        LZ4_resetStreamHC((LZ4_streamHC_t*)(cctxPtr->lz4CtxPtr), cctxPtr->prefs.compressionLevel);
-
-    /* Magic Number */
-    LZ4F_writeLE32(dstPtr, LZ4F_MAGICNUMBER);
-    dstPtr += 4;
-    headerStart = dstPtr;
-
-    /* FLG Byte */
-    *dstPtr++ = (BYTE)(((1 & _2BITS) << 6)    /* Version('01') */
-        + ((cctxPtr->prefs.frameInfo.blockMode & _1BIT ) << 5)    /* Block mode */
-        + ((cctxPtr->prefs.frameInfo.contentChecksumFlag & _1BIT ) << 2)   /* Frame checksum */
-        + ((cctxPtr->prefs.frameInfo.contentSize > 0) << 3));   /* Frame content size */
-    /* BD Byte */
-    *dstPtr++ = (BYTE)((cctxPtr->prefs.frameInfo.blockSizeID & _3BITS) << 4);
-    /* Optional Frame content size field */
-    if (cctxPtr->prefs.frameInfo.contentSize)
-    {
-        LZ4F_writeLE64(dstPtr, cctxPtr->prefs.frameInfo.contentSize);
-        dstPtr += 8;
-        cctxPtr->totalInSize = 0;
-    }
-    /* CRC Byte */
-    *dstPtr = LZ4F_headerChecksum(headerStart, dstPtr - headerStart);
-    dstPtr++;
-
-    cctxPtr->cStage = 1;   /* header written, now request input data block */
-
-    return (dstPtr - dstStart);
-}
-
-
-/* LZ4F_compressBound() : gives the size of Dst buffer given a srcSize to handle worst case situations.
-*                        The LZ4F_frameInfo_t structure is optional :
-*                        you can provide NULL as argument, preferences will then be set to cover worst case situations.
-* */
-size_t LZ4F_compressBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr)
-{
-    LZ4F_preferences_t prefsNull;
-    memset(&prefsNull, 0, sizeof(prefsNull));
-    prefsNull.frameInfo.contentChecksumFlag = LZ4F_contentChecksumEnabled;   /* worst case */
-    {
-        const LZ4F_preferences_t* prefsPtr = (preferencesPtr==NULL) ? &prefsNull : preferencesPtr;
-        LZ4F_blockSizeID_t bid = prefsPtr->frameInfo.blockSizeID;
-        size_t blockSize = LZ4F_getBlockSize(bid);
-        unsigned nbBlocks = (unsigned)(srcSize / blockSize) + 1;
-        size_t lastBlockSize = prefsPtr->autoFlush ? srcSize % blockSize : blockSize;
-        size_t blockInfo = 4;   /* default, without block CRC option */
-        size_t frameEnd = 4 + (prefsPtr->frameInfo.contentChecksumFlag*4);
-
-        return (blockInfo * nbBlocks) + (blockSize * (nbBlocks-1)) + lastBlockSize + frameEnd;;
-    }
-}
-
-
-typedef int (*compressFunc_t)(void* ctx, const char* src, char* dst, int srcSize, int dstSize, int level);
-
-static size_t LZ4F_compressBlock(void* dst, const void* src, size_t srcSize, compressFunc_t compress, void* lz4ctx, int level)
-{
-    /* compress one block */
-    BYTE* cSizePtr = (BYTE*)dst;
-    U32 cSize;
-    cSize = (U32)compress(lz4ctx, (const char*)src, (char*)(cSizePtr+4), (int)(srcSize), (int)(srcSize-1), level);
-    LZ4F_writeLE32(cSizePtr, cSize);
-    if (cSize == 0)   /* compression failed */
-    {
-        cSize = (U32)srcSize;
-        LZ4F_writeLE32(cSizePtr, cSize + LZ4F_BLOCKUNCOMPRESSED_FLAG);
-        memcpy(cSizePtr+4, src, srcSize);
-    }
-    return cSize + 4;
-}
-
-
-static int LZ4F_localLZ4_compress_limitedOutput_withState(void* ctx, const char* src, char* dst, int srcSize, int dstSize, int level)
-{
-    (void) level;
-    return LZ4_compress_limitedOutput_withState(ctx, src, dst, srcSize, dstSize);
-}
-
-static int LZ4F_localLZ4_compress_limitedOutput_continue(void* ctx, const char* src, char* dst, int srcSize, int dstSize, int level)
-{
-    (void) level;
-    return LZ4_compress_limitedOutput_continue((LZ4_stream_t*)ctx, src, dst, srcSize, dstSize);
-}
-
-static int LZ4F_localLZ4_compressHC_limitedOutput_continue(void* ctx, const char* src, char* dst, int srcSize, int dstSize, int level)
-{
-    (void) level;
-    return LZ4_compress_HC_continue((LZ4_streamHC_t*)ctx, src, dst, srcSize, dstSize);
-}
-
-static compressFunc_t LZ4F_selectCompression(LZ4F_blockMode_t blockMode, int level)
-{
-    if (level < minHClevel)
-    {
-        if (blockMode == LZ4F_blockIndependent) return LZ4F_localLZ4_compress_limitedOutput_withState;
-        return LZ4F_localLZ4_compress_limitedOutput_continue;
-    }
-    if (blockMode == LZ4F_blockIndependent) return LZ4_compress_HC_extStateHC;
-    return LZ4F_localLZ4_compressHC_limitedOutput_continue;
-}
-
-static int LZ4F_localSaveDict(LZ4F_cctx_t* cctxPtr)
-{
-    if (cctxPtr->prefs.compressionLevel < minHClevel)
-        return LZ4_saveDict ((LZ4_stream_t*)(cctxPtr->lz4CtxPtr), (char*)(cctxPtr->tmpBuff), 64 KB);
-    return LZ4_saveDictHC ((LZ4_streamHC_t*)(cctxPtr->lz4CtxPtr), (char*)(cctxPtr->tmpBuff), 64 KB);
-}
-
-typedef enum { notDone, fromTmpBuffer, fromSrcBuffer } LZ4F_lastBlockStatus;
-
-/* LZ4F_compressUpdate()
-* LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
-* The most important rule is that dstBuffer MUST be large enough (dstMaxSize) to ensure compression completion even in worst case.
-* If this condition is not respected, LZ4F_compress() will fail (result is an errorCode)
-* You can get the minimum value of dstMaxSize by using LZ4F_compressBound()
-* The LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
-* The result of the function is the number of bytes written into dstBuffer : it can be zero, meaning input data was just buffered.
-* The function outputs an error code if it fails (can be tested using LZ4F_isError())
-*/
-size_t LZ4F_compressUpdate(LZ4F_compressionContext_t compressionContext, void* dstBuffer, size_t dstMaxSize, const void* srcBuffer, size_t srcSize, const LZ4F_compressOptions_t* compressOptionsPtr)
-{
-    LZ4F_compressOptions_t cOptionsNull;
-    LZ4F_cctx_t* cctxPtr = (LZ4F_cctx_t*)compressionContext;
-    size_t blockSize = cctxPtr->maxBlockSize;
-    const BYTE* srcPtr = (const BYTE*)srcBuffer;
-    const BYTE* const srcEnd = srcPtr + srcSize;
-    BYTE* const dstStart = (BYTE*)dstBuffer;
-    BYTE* dstPtr = dstStart;
-    LZ4F_lastBlockStatus lastBlockCompressed = notDone;
-    compressFunc_t compress;
-
-
-    if (cctxPtr->cStage != 1) return (size_t)-LZ4F_ERROR_GENERIC;
-    if (dstMaxSize < LZ4F_compressBound(srcSize, &(cctxPtr->prefs))) return (size_t)-LZ4F_ERROR_dstMaxSize_tooSmall;
-    memset(&cOptionsNull, 0, sizeof(cOptionsNull));
-    if (compressOptionsPtr == NULL) compressOptionsPtr = &cOptionsNull;
-
-    /* select compression function */
-    compress = LZ4F_selectCompression(cctxPtr->prefs.frameInfo.blockMode, cctxPtr->prefs.compressionLevel);
-
-    /* complete tmp buffer */
-    if (cctxPtr->tmpInSize > 0)   /* some data already within tmp buffer */
-    {
-        size_t sizeToCopy = blockSize - cctxPtr->tmpInSize;
-        if (sizeToCopy > srcSize)
-        {
-            /* add src to tmpIn buffer */
-            memcpy(cctxPtr->tmpIn + cctxPtr->tmpInSize, srcBuffer, srcSize);
-            srcPtr = srcEnd;
-            cctxPtr->tmpInSize += srcSize;
-            /* still needs some CRC */
-        }
-        else
-        {
-            /* complete tmpIn block and then compress it */
-            lastBlockCompressed = fromTmpBuffer;
-            memcpy(cctxPtr->tmpIn + cctxPtr->tmpInSize, srcBuffer, sizeToCopy);
-            srcPtr += sizeToCopy;
-
-            dstPtr += LZ4F_compressBlock(dstPtr, cctxPtr->tmpIn, blockSize, compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel);
-
-            if (cctxPtr->prefs.frameInfo.blockMode==LZ4F_blockLinked) cctxPtr->tmpIn += blockSize;
-            cctxPtr->tmpInSize = 0;
-        }
-    }
-
-    while ((size_t)(srcEnd - srcPtr) >= blockSize)
-    {
-        /* compress full block */
-        lastBlockCompressed = fromSrcBuffer;
-        dstPtr += LZ4F_compressBlock(dstPtr, srcPtr, blockSize, compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel);
-        srcPtr += blockSize;
-    }
-
-    if ((cctxPtr->prefs.autoFlush) && (srcPtr < srcEnd))
-    {
-        /* compress remaining input < blockSize */
-        lastBlockCompressed = fromSrcBuffer;
-        dstPtr += LZ4F_compressBlock(dstPtr, srcPtr, srcEnd - srcPtr, compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel);
-        srcPtr  = srcEnd;
-    }
-
-    /* preserve dictionary if necessary */
-    if ((cctxPtr->prefs.frameInfo.blockMode==LZ4F_blockLinked) && (lastBlockCompressed==fromSrcBuffer))
-    {
-        if (compressOptionsPtr->stableSrc)
-        {
-            cctxPtr->tmpIn = cctxPtr->tmpBuff;
-        }
-        else
-        {
-            int realDictSize = LZ4F_localSaveDict(cctxPtr);
-            if (realDictSize==0) return (size_t)-LZ4F_ERROR_GENERIC;
-            cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
-        }
-    }
-
-    /* keep tmpIn within limits */
-    if ((cctxPtr->tmpIn + blockSize) > (cctxPtr->tmpBuff + cctxPtr->maxBufferSize)   /* necessarily LZ4F_blockLinked && lastBlockCompressed==fromTmpBuffer */
-        && !(cctxPtr->prefs.autoFlush))
-    {
-        int realDictSize = LZ4F_localSaveDict(cctxPtr);
-        cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
-    }
-
-    /* some input data left, necessarily < blockSize */
-    if (srcPtr < srcEnd)
-    {
-        /* fill tmp buffer */
-        size_t sizeToCopy = srcEnd - srcPtr;
-        memcpy(cctxPtr->tmpIn, srcPtr, sizeToCopy);
-        cctxPtr->tmpInSize = sizeToCopy;
-    }
-
-    if (cctxPtr->prefs.frameInfo.contentChecksumFlag == LZ4F_contentChecksumEnabled)
-        XXH32_update(&(cctxPtr->xxh), srcBuffer, srcSize);
-
-    cctxPtr->totalInSize += srcSize;
-    return dstPtr - dstStart;
-}
-
-
-/* LZ4F_flush()
-* Should you need to create compressed data immediately, without waiting for a block to be filled,
-* you can call LZ4_flush(), which will immediately compress any remaining data stored within compressionContext.
-* The result of the function is the number of bytes written into dstBuffer
-* (it can be zero, this means there was no data left within compressionContext)
-* The function outputs an error code if it fails (can be tested using LZ4F_isError())
-* The LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
-*/
-size_t LZ4F_flush(LZ4F_compressionContext_t compressionContext, void* dstBuffer, size_t dstMaxSize, const LZ4F_compressOptions_t* compressOptionsPtr)
-{
-    LZ4F_cctx_t* cctxPtr = (LZ4F_cctx_t*)compressionContext;
-    BYTE* const dstStart = (BYTE*)dstBuffer;
-    BYTE* dstPtr = dstStart;
-    compressFunc_t compress;
-
-
-    if (cctxPtr->tmpInSize == 0) return 0;   /* nothing to flush */
-    if (cctxPtr->cStage != 1) return (size_t)-LZ4F_ERROR_GENERIC;
-    if (dstMaxSize < (cctxPtr->tmpInSize + 8)) return (size_t)-LZ4F_ERROR_dstMaxSize_tooSmall;   /* +8 : block header(4) + block checksum(4) */
-    (void)compressOptionsPtr;   /* not yet useful */
-
-    /* select compression function */
-    compress = LZ4F_selectCompression(cctxPtr->prefs.frameInfo.blockMode, cctxPtr->prefs.compressionLevel);
-
-    /* compress tmp buffer */
-    dstPtr += LZ4F_compressBlock(dstPtr, cctxPtr->tmpIn, cctxPtr->tmpInSize, compress, cctxPtr->lz4CtxPtr, cctxPtr->prefs.compressionLevel);
-    if (cctxPtr->prefs.frameInfo.blockMode==LZ4F_blockLinked) cctxPtr->tmpIn += cctxPtr->tmpInSize;
-    cctxPtr->tmpInSize = 0;
-
-    /* keep tmpIn within limits */
-    if ((cctxPtr->tmpIn + cctxPtr->maxBlockSize) > (cctxPtr->tmpBuff + cctxPtr->maxBufferSize))   /* necessarily LZ4F_blockLinked */
-    {
-        int realDictSize = LZ4F_localSaveDict(cctxPtr);
-        cctxPtr->tmpIn = cctxPtr->tmpBuff + realDictSize;
-    }
-
-    return dstPtr - dstStart;
-}
-
-
-/* LZ4F_compressEnd()
-* When you want to properly finish the compressed frame, just call LZ4F_compressEnd().
-* It will flush whatever data remained within compressionContext (like LZ4_flush())
-* but also properly finalize the frame, with an endMark and a checksum.
-* The result of the function is the number of bytes written into dstBuffer (necessarily >= 4 (endMark size))
-* The function outputs an error code if it fails (can be tested using LZ4F_isError())
-* The LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
-* compressionContext can then be used again, starting with LZ4F_compressBegin(). The preferences will remain the same.
-*/
-size_t LZ4F_compressEnd(LZ4F_compressionContext_t compressionContext, void* dstBuffer, size_t dstMaxSize, const LZ4F_compressOptions_t* compressOptionsPtr)
-{
-    LZ4F_cctx_t* cctxPtr = (LZ4F_cctx_t*)compressionContext;
-    BYTE* const dstStart = (BYTE*)dstBuffer;
-    BYTE* dstPtr = dstStart;
-    size_t errorCode;
-
-    errorCode = LZ4F_flush(compressionContext, dstBuffer, dstMaxSize, compressOptionsPtr);
-    if (LZ4F_isError(errorCode)) return errorCode;
-    dstPtr += errorCode;
-
-    LZ4F_writeLE32(dstPtr, 0);
-    dstPtr+=4;   /* endMark */
-
-    if (cctxPtr->prefs.frameInfo.contentChecksumFlag == LZ4F_contentChecksumEnabled)
-    {
-        U32 xxh = XXH32_digest(&(cctxPtr->xxh));
-        LZ4F_writeLE32(dstPtr, xxh);
-        dstPtr+=4;   /* content Checksum */
-    }
-
-    cctxPtr->cStage = 0;   /* state is now re-usable (with identical preferences) */
-
-    if (cctxPtr->prefs.frameInfo.contentSize)
-    {
-        if (cctxPtr->prefs.frameInfo.contentSize != cctxPtr->totalInSize)
-            return (size_t)-LZ4F_ERROR_frameSize_wrong;
-    }
-
-    return dstPtr - dstStart;
-}
-
-
-/**********************************
-*  Decompression functions
-**********************************/
-
-/* Resource management */
-
-/* LZ4F_createDecompressionContext() :
-* The first thing to do is to create a decompressionContext object, which will be used in all decompression operations.
-* This is achieved using LZ4F_createDecompressionContext().
-* The function will provide a pointer to a fully allocated and initialized LZ4F_decompressionContext object.
-* If the result LZ4F_errorCode_t is not zero, there was an error during context creation.
-* Object can release its memory using LZ4F_freeDecompressionContext();
-*/
-LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_decompressionContext_t* LZ4F_decompressionContextPtr, unsigned versionNumber)
-{
-    LZ4F_dctx_t* dctxPtr;
-
-    dctxPtr = (LZ4F_dctx_t*)ALLOCATOR(sizeof(LZ4F_dctx_t));
-    if (dctxPtr==NULL) return (LZ4F_errorCode_t)-LZ4F_ERROR_GENERIC;
-
-    dctxPtr->version = versionNumber;
-    *LZ4F_decompressionContextPtr = (LZ4F_decompressionContext_t)dctxPtr;
-    return LZ4F_OK_NoError;
-}
-
-LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_decompressionContext_t LZ4F_decompressionContext)
-{
-    LZ4F_errorCode_t result = LZ4F_OK_NoError;
-    LZ4F_dctx_t* dctxPtr = (LZ4F_dctx_t*)LZ4F_decompressionContext;
-    if (dctxPtr != NULL)   /* can accept NULL input, like free() */
-    {
-      result = (LZ4F_errorCode_t)dctxPtr->dStage;
-      FREEMEM(dctxPtr->tmpIn);
-      FREEMEM(dctxPtr->tmpOutBuffer);
-      FREEMEM(dctxPtr);
-    }
-    return result;
-}
-
-
-/* ******************************************************************** */
-/* ********************* Decompression ******************************** */
-/* ******************************************************************** */
-
-typedef enum { dstage_getHeader=0, dstage_storeHeader,
-    dstage_getCBlockSize, dstage_storeCBlockSize,
-    dstage_copyDirect,
-    dstage_getCBlock, dstage_storeCBlock,
-    dstage_decodeCBlock, dstage_decodeCBlock_intoDst,
-    dstage_decodeCBlock_intoTmp, dstage_flushOut,
-    dstage_getSuffix, dstage_storeSuffix,
-    dstage_getSFrameSize, dstage_storeSFrameSize,
-    dstage_skipSkippable
-} dStage_t;
-
-
-/* LZ4F_decodeHeader
-   return : nb Bytes read from srcVoidPtr (necessarily <= srcSize)
-            or an error code (testable with LZ4F_isError())
-   output : set internal values of dctx, such as
-            dctxPtr->frameInfo and dctxPtr->dStage.
-   input  : srcVoidPtr points at the **beginning of the frame**
-*/
-static size_t LZ4F_decodeHeader(LZ4F_dctx_t* dctxPtr, const void* srcVoidPtr, size_t srcSize)
-{
-    BYTE FLG, BD, HC;
-    unsigned version, blockMode, blockChecksumFlag, contentSizeFlag, contentChecksumFlag, blockSizeID;
-    size_t bufferNeeded;
-    size_t frameHeaderSize;
-    const BYTE* srcPtr = (const BYTE*)srcVoidPtr;
-
-    /* need to decode header to get frameInfo */
-    if (srcSize < minFHSize) return (size_t)-LZ4F_ERROR_frameHeader_incomplete;   /* minimal frame header size */
-    memset(&(dctxPtr->frameInfo), 0, sizeof(dctxPtr->frameInfo));
-
-    /* special case : skippable frames */
-    if ((LZ4F_readLE32(srcPtr) & 0xFFFFFFF0U) == LZ4F_MAGIC_SKIPPABLE_START)
-    {
-        dctxPtr->frameInfo.frameType = LZ4F_skippableFrame;
-        if (srcVoidPtr == (void*)(dctxPtr->header))
-        {
-            dctxPtr->tmpInSize = srcSize;
-            dctxPtr->tmpInTarget = 8;
-            dctxPtr->dStage = dstage_storeSFrameSize;
-            return srcSize;
-        }
-        else
-        {
-            dctxPtr->dStage = dstage_getSFrameSize;
-            return 4;
-        }
-    }
-
-    /* control magic number */
-    if (LZ4F_readLE32(srcPtr) != LZ4F_MAGICNUMBER) return (size_t)-LZ4F_ERROR_frameType_unknown;
-    dctxPtr->frameInfo.frameType = LZ4F_frame;
-
-    /* Flags */
-    FLG = srcPtr[4];
-    version = (FLG>>6) & _2BITS;
-    blockMode = (FLG>>5) & _1BIT;
-    blockChecksumFlag = (FLG>>4) & _1BIT;
-    contentSizeFlag = (FLG>>3) & _1BIT;
-    contentChecksumFlag = (FLG>>2) & _1BIT;
-
-    /* Frame Header Size */
-    frameHeaderSize = contentSizeFlag ? maxFHSize : minFHSize;
-
-    if (srcSize < frameHeaderSize)
-    {
-        /* not enough input to fully decode frame header */
-        if (srcPtr != dctxPtr->header)
-            memcpy(dctxPtr->header, srcPtr, srcSize);
-        dctxPtr->tmpInSize = srcSize;
-        dctxPtr->tmpInTarget = frameHeaderSize;
-        dctxPtr->dStage = dstage_storeHeader;
-        return srcSize;
-    }
-
-    BD = srcPtr[5];
-    blockSizeID = (BD>>4) & _3BITS;
-
-    /* validate */
-    if (version != 1) return (size_t)-LZ4F_ERROR_headerVersion_wrong;        /* Version Number, only supported value */
-    if (blockChecksumFlag != 0) return (size_t)-LZ4F_ERROR_blockChecksum_unsupported; /* Not supported for the time being */
-    if (((FLG>>0)&_2BITS) != 0) return (size_t)-LZ4F_ERROR_reservedFlag_set; /* Reserved bits */
-    if (((BD>>7)&_1BIT) != 0) return (size_t)-LZ4F_ERROR_reservedFlag_set;   /* Reserved bit */
-    if (blockSizeID < 4) return (size_t)-LZ4F_ERROR_maxBlockSize_invalid;    /* 4-7 only supported values for the time being */
-    if (((BD>>0)&_4BITS) != 0) return (size_t)-LZ4F_ERROR_reservedFlag_set;  /* Reserved bits */
-
-    /* check */
-    HC = LZ4F_headerChecksum(srcPtr+4, frameHeaderSize-5);
-    if (HC != srcPtr[frameHeaderSize-1]) return (size_t)-LZ4F_ERROR_headerChecksum_invalid;   /* Bad header checksum error */
-
-    /* save */
-    dctxPtr->frameInfo.blockMode = (LZ4F_blockMode_t)blockMode;
-    dctxPtr->frameInfo.contentChecksumFlag = (LZ4F_contentChecksum_t)contentChecksumFlag;
-    dctxPtr->frameInfo.blockSizeID = (LZ4F_blockSizeID_t)blockSizeID;
-    dctxPtr->maxBlockSize = LZ4F_getBlockSize(blockSizeID);
-    if (contentSizeFlag)
-        dctxPtr->frameRemainingSize = dctxPtr->frameInfo.contentSize = LZ4F_readLE64(srcPtr+6);
-
-    /* init */
-    if (contentChecksumFlag) XXH32_reset(&(dctxPtr->xxh), 0);
-
-    /* alloc */
-    bufferNeeded = dctxPtr->maxBlockSize + ((dctxPtr->frameInfo.blockMode==LZ4F_blockLinked) * 128 KB);
-    if (bufferNeeded > dctxPtr->maxBufferSize)   /* tmp buffers too small */
-    {
-        FREEMEM(dctxPtr->tmpIn);
-        FREEMEM(dctxPtr->tmpOutBuffer);
-        dctxPtr->maxBufferSize = bufferNeeded;
-        dctxPtr->tmpIn = (BYTE*)ALLOCATOR(dctxPtr->maxBlockSize);
-        if (dctxPtr->tmpIn == NULL) return (size_t)-LZ4F_ERROR_GENERIC;
-        dctxPtr->tmpOutBuffer= (BYTE*)ALLOCATOR(dctxPtr->maxBufferSize);
-        if (dctxPtr->tmpOutBuffer== NULL) return (size_t)-LZ4F_ERROR_GENERIC;
-    }
-    dctxPtr->tmpInSize = 0;
-    dctxPtr->tmpInTarget = 0;
-    dctxPtr->dict = dctxPtr->tmpOutBuffer;
-    dctxPtr->dictSize = 0;
-    dctxPtr->tmpOut = dctxPtr->tmpOutBuffer;
-    dctxPtr->tmpOutStart = 0;
-    dctxPtr->tmpOutSize = 0;
-
-    dctxPtr->dStage = dstage_getCBlockSize;
-
-    return frameHeaderSize;
-}
-
-
-/* LZ4F_getFrameInfo()
-* This function decodes frame header information, such as blockSize.
-* It is optional : you could start by calling directly LZ4F_decompress() instead.
-* The objective is to extract header information without starting decompression, typically for allocation purposes.
-* LZ4F_getFrameInfo() can also be used *after* starting decompression, on a valid LZ4F_decompressionContext_t.
-* The number of bytes read from srcBuffer will be provided within *srcSizePtr (necessarily <= original value).
-* You are expected to resume decompression from where it stopped (srcBuffer + *srcSizePtr)
-* The function result is an hint of the better srcSize to use for next call to LZ4F_decompress,
-* or an error code which can be tested using LZ4F_isError().
-*/
-LZ4F_errorCode_t LZ4F_getFrameInfo(LZ4F_decompressionContext_t dCtx, LZ4F_frameInfo_t* frameInfoPtr,
-                                   const void* srcBuffer, size_t* srcSizePtr)
-{
-    LZ4F_dctx_t* dctxPtr = (LZ4F_dctx_t*)dCtx;
-
-    if (dctxPtr->dStage > dstage_storeHeader)   /* note : requires dstage_* header related to be at beginning of enum */
-    {
-        size_t o=0, i=0;
-        /* frameInfo already decoded */
-        *srcSizePtr = 0;
-        *frameInfoPtr = dctxPtr->frameInfo;
-        return LZ4F_decompress(dCtx, NULL, &o, NULL, &i, NULL);
-    }
-    else
-    {
-        size_t o=0;
-        size_t nextSrcSize = LZ4F_decompress(dCtx, NULL, &o, srcBuffer, srcSizePtr, NULL);
-        if (dctxPtr->dStage <= dstage_storeHeader)   /* note : requires dstage_* header related to be at beginning of enum */
-            return (size_t)-LZ4F_ERROR_frameHeader_incomplete;
-        *frameInfoPtr = dctxPtr->frameInfo;
-        return nextSrcSize;
-    }
-}
-
-
-/* trivial redirector, for common prototype */
-static int LZ4F_decompress_safe (const char* source, char* dest, int compressedSize, int maxDecompressedSize, const char* dictStart, int dictSize)
-{
-    (void)dictStart; (void)dictSize;
-    return LZ4_decompress_safe (source, dest, compressedSize, maxDecompressedSize);
-}
-
-
-static void LZ4F_updateDict(LZ4F_dctx_t* dctxPtr, const BYTE* dstPtr, size_t dstSize, const BYTE* dstPtr0, unsigned withinTmp)
-{
-    if (dctxPtr->dictSize==0)
-        dctxPtr->dict = (const BYTE*)dstPtr;   /* priority to dictionary continuity */
-
-    if (dctxPtr->dict + dctxPtr->dictSize == dstPtr)   /* dictionary continuity */
-    {
-        dctxPtr->dictSize += dstSize;
-        return;
-    }
-
-    if (dstPtr - dstPtr0 + dstSize >= 64 KB)   /* dstBuffer large enough to become dictionary */
-    {
-        dctxPtr->dict = (const BYTE*)dstPtr0;
-        dctxPtr->dictSize = dstPtr - dstPtr0 + dstSize;
-        return;
-    }
-
-    if ((withinTmp) && (dctxPtr->dict == dctxPtr->tmpOutBuffer))
-    {
-        /* assumption : dctxPtr->dict + dctxPtr->dictSize == dctxPtr->tmpOut + dctxPtr->tmpOutStart */
-        dctxPtr->dictSize += dstSize;
-        return;
-    }
-
-    if (withinTmp) /* copy relevant dict portion in front of tmpOut within tmpOutBuffer */
-    {
-        size_t preserveSize = dctxPtr->tmpOut - dctxPtr->tmpOutBuffer;
-        size_t copySize = 64 KB - dctxPtr->tmpOutSize;
-        const BYTE* oldDictEnd = dctxPtr->dict + dctxPtr->dictSize - dctxPtr->tmpOutStart;
-        if (dctxPtr->tmpOutSize > 64 KB) copySize = 0;
-        if (copySize > preserveSize) copySize = preserveSize;
-
-        memcpy(dctxPtr->tmpOutBuffer + preserveSize - copySize, oldDictEnd - copySize, copySize);
-
-        dctxPtr->dict = dctxPtr->tmpOutBuffer;
-        dctxPtr->dictSize = preserveSize + dctxPtr->tmpOutStart + dstSize;
-        return;
-    }
-
-    if (dctxPtr->dict == dctxPtr->tmpOutBuffer)     /* copy dst into tmp to complete dict */
-    {
-        if (dctxPtr->dictSize + dstSize > dctxPtr->maxBufferSize)   /* tmp buffer not large enough */
-        {
-            size_t preserveSize = 64 KB - dstSize;   /* note : dstSize < 64 KB */
-            memcpy(dctxPtr->tmpOutBuffer, dctxPtr->dict + dctxPtr->dictSize - preserveSize, preserveSize);
-            dctxPtr->dictSize = preserveSize;
-        }
-        memcpy(dctxPtr->tmpOutBuffer + dctxPtr->dictSize, dstPtr, dstSize);
-        dctxPtr->dictSize += dstSize;
-        return;
-    }
-
-    /* join dict & dest into tmp */
-    {
-        size_t preserveSize = 64 KB - dstSize;   /* note : dstSize < 64 KB */
-        if (preserveSize > dctxPtr->dictSize) preserveSize = dctxPtr->dictSize;
-        memcpy(dctxPtr->tmpOutBuffer, dctxPtr->dict + dctxPtr->dictSize - preserveSize, preserveSize);
-        memcpy(dctxPtr->tmpOutBuffer + preserveSize, dstPtr, dstSize);
-        dctxPtr->dict = dctxPtr->tmpOutBuffer;
-        dctxPtr->dictSize = preserveSize + dstSize;
-    }
-}
-
-
-
-/* LZ4F_decompress()
-* Call this function repetitively to regenerate data compressed within srcBuffer.
-* The function will attempt to decode *srcSizePtr from srcBuffer, into dstBuffer of maximum size *dstSizePtr.
-*
-* The number of bytes regenerated into dstBuffer will be provided within *dstSizePtr (necessarily <= original value).
-*
-* The number of bytes effectively read from srcBuffer will be provided within *srcSizePtr (necessarily <= original value).
-* If the number of bytes read is < number of bytes provided, then the decompression operation is not complete.
-* You will have to call it again, continuing from where it stopped.
-*
-* The function result is an hint of the better srcSize to use for next call to LZ4F_decompress.
-* Basically, it's the size of the current (or remaining) compressed block + header of next block.
-* Respecting the hint provides some boost to performance, since it allows less buffer shuffling.
-* Note that this is just a hint, you can always provide any srcSize you want.
-* When a frame is fully decoded, the function result will be 0.
-* If decompression failed, function result is an error code which can be tested using LZ4F_isError().
-*/
-size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
-                       void* dstBuffer, size_t* dstSizePtr,
-                       const void* srcBuffer, size_t* srcSizePtr,
-                       const LZ4F_decompressOptions_t* decompressOptionsPtr)
-{
-    LZ4F_dctx_t* dctxPtr = (LZ4F_dctx_t*)decompressionContext;
-    LZ4F_decompressOptions_t optionsNull;
-    const BYTE* const srcStart = (const BYTE*)srcBuffer;
-    const BYTE* const srcEnd = srcStart + *srcSizePtr;
-    const BYTE* srcPtr = srcStart;
-    BYTE* const dstStart = (BYTE*)dstBuffer;
-    BYTE* const dstEnd = dstStart + *dstSizePtr;
-    BYTE* dstPtr = dstStart;
-    const BYTE* selectedIn = NULL;
-    unsigned doAnotherStage = 1;
-    size_t nextSrcSizeHint = 1;
-
-
-    memset(&optionsNull, 0, sizeof(optionsNull));
-    if (decompressOptionsPtr==NULL) decompressOptionsPtr = &optionsNull;
-    *srcSizePtr = 0;
-    *dstSizePtr = 0;
-
-    /* expect to continue decoding src buffer where it left previously */
-    if (dctxPtr->srcExpect != NULL)
-    {
-        if (srcStart != dctxPtr->srcExpect) return (size_t)-LZ4F_ERROR_srcPtr_wrong;
-    }
-
-    /* programmed as a state machine */
-
-    while (doAnotherStage)
-    {
-
-        switch(dctxPtr->dStage)
-        {
-
-        case dstage_getHeader:
-            {
-                if ((size_t)(srcEnd-srcPtr) >= maxFHSize)   /* enough to decode - shortcut */
-                {
-                    LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, srcPtr, srcEnd-srcPtr);
-                    if (LZ4F_isError(errorCode)) return errorCode;
-                    srcPtr += errorCode;
-                    break;
-                }
-                dctxPtr->tmpInSize = 0;
-                dctxPtr->tmpInTarget = minFHSize;   /* minimum to attempt decode */
-                dctxPtr->dStage = dstage_storeHeader;
-            }
-            // Fall through.
-
-        case dstage_storeHeader:
-            {
-                size_t sizeToCopy = dctxPtr->tmpInTarget - dctxPtr->tmpInSize;
-                if (sizeToCopy > (size_t)(srcEnd - srcPtr)) sizeToCopy =  srcEnd - srcPtr;
-                memcpy(dctxPtr->header + dctxPtr->tmpInSize, srcPtr, sizeToCopy);
-                dctxPtr->tmpInSize += sizeToCopy;
-                srcPtr += sizeToCopy;
-                if (dctxPtr->tmpInSize < dctxPtr->tmpInTarget)
-                {
-                    nextSrcSizeHint = (dctxPtr->tmpInTarget - dctxPtr->tmpInSize) + BHSize;   /* rest of header + nextBlockHeader */
-                    doAnotherStage = 0;   /* not enough src data, ask for some more */
-                    break;
-                }
-                {
-                    LZ4F_errorCode_t errorCode = LZ4F_decodeHeader(dctxPtr, dctxPtr->header, dctxPtr->tmpInTarget);
-                    if (LZ4F_isError(errorCode)) return errorCode;
-                }
-                break;
-            }
-
-        case dstage_getCBlockSize:
-            {
-                if ((size_t)(srcEnd - srcPtr) >= BHSize)
-                {
-                    selectedIn = srcPtr;
-                    srcPtr += BHSize;
-                }
-                else
-                {
-                /* not enough input to read cBlockSize field */
-                    dctxPtr->tmpInSize = 0;
-                    dctxPtr->dStage = dstage_storeCBlockSize;
-                }
-            }
-
-            if (dctxPtr->dStage == dstage_storeCBlockSize)
-        case dstage_storeCBlockSize:
-            {
-                size_t sizeToCopy = BHSize - dctxPtr->tmpInSize;
-                if (sizeToCopy > (size_t)(srcEnd - srcPtr)) sizeToCopy = srcEnd - srcPtr;
-                memcpy(dctxPtr->tmpIn + dctxPtr->tmpInSize, srcPtr, sizeToCopy);
-                srcPtr += sizeToCopy;
-                dctxPtr->tmpInSize += sizeToCopy;
-                if (dctxPtr->tmpInSize < BHSize) /* not enough input to get full cBlockSize; wait for more */
-                {
-                    nextSrcSizeHint = BHSize - dctxPtr->tmpInSize;
-                    doAnotherStage  = 0;
-                    break;
-                }
-                selectedIn = dctxPtr->tmpIn;
-            }
-
-        /* case dstage_decodeCBlockSize: */   /* no more direct access, to prevent scan-build warning */
-            {
-                size_t nextCBlockSize = LZ4F_readLE32(selectedIn) & 0x7FFFFFFFU;
-                if (nextCBlockSize==0)   /* frameEnd signal, no more CBlock */
-                {
-                    dctxPtr->dStage = dstage_getSuffix;
-                    break;
-                }
-                if (nextCBlockSize > dctxPtr->maxBlockSize) return (size_t)-LZ4F_ERROR_GENERIC;   /* invalid cBlockSize */
-                dctxPtr->tmpInTarget = nextCBlockSize;
-                if (LZ4F_readLE32(selectedIn) & LZ4F_BLOCKUNCOMPRESSED_FLAG)
-                {
-                    dctxPtr->dStage = dstage_copyDirect;
-                    break;
-                }
-                dctxPtr->dStage = dstage_getCBlock;
-                if (dstPtr==dstEnd)
-                {
-                    nextSrcSizeHint = nextCBlockSize + BHSize;
-                    doAnotherStage = 0;
-                }
-                break;
-            }
-
-        case dstage_copyDirect:   /* uncompressed block */
-            {
-                size_t sizeToCopy = dctxPtr->tmpInTarget;
-                if ((size_t)(srcEnd-srcPtr) < sizeToCopy) sizeToCopy = srcEnd - srcPtr;  /* not enough input to read full block */
-                if ((size_t)(dstEnd-dstPtr) < sizeToCopy) sizeToCopy = dstEnd - dstPtr;
-                memcpy(dstPtr, srcPtr, sizeToCopy);
-                if (dctxPtr->frameInfo.contentChecksumFlag) XXH32_update(&(dctxPtr->xxh), srcPtr, sizeToCopy);
-                if (dctxPtr->frameInfo.contentSize) dctxPtr->frameRemainingSize -= sizeToCopy;
-
-                /* dictionary management */
-                if (dctxPtr->frameInfo.blockMode==LZ4F_blockLinked)
-                    LZ4F_updateDict(dctxPtr, dstPtr, sizeToCopy, dstStart, 0);
-
-                srcPtr += sizeToCopy;
-                dstPtr += sizeToCopy;
-                if (sizeToCopy == dctxPtr->tmpInTarget)   /* all copied */
-                {
-                    dctxPtr->dStage = dstage_getCBlockSize;
-                    break;
-                }
-                dctxPtr->tmpInTarget -= sizeToCopy;   /* still need to copy more */
-                nextSrcSizeHint = dctxPtr->tmpInTarget + BHSize;
-                doAnotherStage = 0;
-                break;
-            }
-
-        case dstage_getCBlock:   /* entry from dstage_decodeCBlockSize */
-            {
-                if ((size_t)(srcEnd-srcPtr) < dctxPtr->tmpInTarget)
-                {
-                    dctxPtr->tmpInSize = 0;
-                    dctxPtr->dStage = dstage_storeCBlock;
-                    break;
-                }
-                selectedIn = srcPtr;
-                srcPtr += dctxPtr->tmpInTarget;
-                dctxPtr->dStage = dstage_decodeCBlock;
-                break;
-            }
-
-        case dstage_storeCBlock:
-            {
-                size_t sizeToCopy = dctxPtr->tmpInTarget - dctxPtr->tmpInSize;
-                if (sizeToCopy > (size_t)(srcEnd-srcPtr)) sizeToCopy = srcEnd-srcPtr;
-                memcpy(dctxPtr->tmpIn + dctxPtr->tmpInSize, srcPtr, sizeToCopy);
-                dctxPtr->tmpInSize += sizeToCopy;
-                srcPtr += sizeToCopy;
-                if (dctxPtr->tmpInSize < dctxPtr->tmpInTarget)  /* need more input */
-                {
-                    nextSrcSizeHint = (dctxPtr->tmpInTarget - dctxPtr->tmpInSize) + BHSize;
-                    doAnotherStage=0;
-                    break;
-                }
-                selectedIn = dctxPtr->tmpIn;
-                dctxPtr->dStage = dstage_decodeCBlock;
-                break;
-            }
-
-        case dstage_decodeCBlock:
-            {
-                if ((size_t)(dstEnd-dstPtr) < dctxPtr->maxBlockSize)   /* not enough place into dst : decode into tmpOut */
-                    dctxPtr->dStage = dstage_decodeCBlock_intoTmp;
-                else
-                    dctxPtr->dStage = dstage_decodeCBlock_intoDst;
-                break;
-            }
-
-        case dstage_decodeCBlock_intoDst:
-            {
-                int (*decoder)(const char*, char*, int, int, const char*, int);
-                int decodedSize;
-
-                if (dctxPtr->frameInfo.blockMode == LZ4F_blockLinked)
-                    decoder = LZ4_decompress_safe_usingDict;
-                else
-                    decoder = LZ4F_decompress_safe;
-
-                decodedSize = decoder((const char*)selectedIn, (char*)dstPtr, (int)dctxPtr->tmpInTarget, (int)dctxPtr->maxBlockSize, (const char*)dctxPtr->dict, (int)dctxPtr->dictSize);
-                if (decodedSize < 0) return (size_t)-LZ4F_ERROR_GENERIC;   /* decompression failed */
-                if (dctxPtr->frameInfo.contentChecksumFlag) XXH32_update(&(dctxPtr->xxh), dstPtr, decodedSize);
-                if (dctxPtr->frameInfo.contentSize) dctxPtr->frameRemainingSize -= decodedSize;
-
-                /* dictionary management */
-                if (dctxPtr->frameInfo.blockMode==LZ4F_blockLinked)
-                    LZ4F_updateDict(dctxPtr, dstPtr, decodedSize, dstStart, 0);
-
-                dstPtr += decodedSize;
-                dctxPtr->dStage = dstage_getCBlockSize;
-                break;
-            }
-
-        case dstage_decodeCBlock_intoTmp:
-            {
-                /* not enough place into dst : decode into tmpOut */
-                int (*decoder)(const char*, char*, int, int, const char*, int);
-                int decodedSize;
-
-                if (dctxPtr->frameInfo.blockMode == LZ4F_blockLinked)
-                    decoder = LZ4_decompress_safe_usingDict;
-                else
-                    decoder = LZ4F_decompress_safe;
-
-                /* ensure enough place for tmpOut */
-                if (dctxPtr->frameInfo.blockMode == LZ4F_blockLinked)
-                {
-                    if (dctxPtr->dict == dctxPtr->tmpOutBuffer)
-                    {
-                        if (dctxPtr->dictSize > 128 KB)
-                        {
-                            memcpy(dctxPtr->tmpOutBuffer, dctxPtr->dict + dctxPtr->dictSize - 64 KB, 64 KB);
-                            dctxPtr->dictSize = 64 KB;
-                        }
-                        dctxPtr->tmpOut = dctxPtr->tmpOutBuffer + dctxPtr->dictSize;
-                    }
-                    else   /* dict not within tmp */
-                    {
-                        size_t reservedDictSpace = dctxPtr->dictSize;
-                        if (reservedDictSpace > 64 KB) reservedDictSpace = 64 KB;
-                        dctxPtr->tmpOut = dctxPtr->tmpOutBuffer + reservedDictSpace;
-                    }
-                }
-
-                /* Decode */
-                decodedSize = decoder((const char*)selectedIn, (char*)dctxPtr->tmpOut, (int)dctxPtr->tmpInTarget, (int)dctxPtr->maxBlockSize, (const char*)dctxPtr->dict, (int)dctxPtr->dictSize);
-                if (decodedSize < 0) return (size_t)-LZ4F_ERROR_decompressionFailed;   /* decompression failed */
-                if (dctxPtr->frameInfo.contentChecksumFlag) XXH32_update(&(dctxPtr->xxh), dctxPtr->tmpOut, decodedSize);
-                if (dctxPtr->frameInfo.contentSize) dctxPtr->frameRemainingSize -= decodedSize;
-                dctxPtr->tmpOutSize = decodedSize;
-                dctxPtr->tmpOutStart = 0;
-                dctxPtr->dStage = dstage_flushOut;
-                break;
-            }
-
-        case dstage_flushOut:  /* flush decoded data from tmpOut to dstBuffer */
-            {
-                size_t sizeToCopy = dctxPtr->tmpOutSize - dctxPtr->tmpOutStart;
-                if (sizeToCopy > (size_t)(dstEnd-dstPtr)) sizeToCopy = dstEnd-dstPtr;
-                memcpy(dstPtr, dctxPtr->tmpOut + dctxPtr->tmpOutStart, sizeToCopy);
-
-                /* dictionary management */
-                if (dctxPtr->frameInfo.blockMode==LZ4F_blockLinked)
-                    LZ4F_updateDict(dctxPtr, dstPtr, sizeToCopy, dstStart, 1);
-
-                dctxPtr->tmpOutStart += sizeToCopy;
-                dstPtr += sizeToCopy;
-
-                /* end of flush ? */
-                if (dctxPtr->tmpOutStart == dctxPtr->tmpOutSize)
-                {
-                    dctxPtr->dStage = dstage_getCBlockSize;
-                    break;
-                }
-                nextSrcSizeHint = BHSize;
-                doAnotherStage = 0;   /* still some data to flush */
-                break;
-            }
-
-        case dstage_getSuffix:
-            {
-                size_t suffixSize = dctxPtr->frameInfo.contentChecksumFlag * 4;
-                if (dctxPtr->frameRemainingSize) return (size_t)-LZ4F_ERROR_frameSize_wrong;   /* incorrect frame size decoded */
-                if (suffixSize == 0)   /* frame completed */
-                {
-                    nextSrcSizeHint = 0;
-                    dctxPtr->dStage = dstage_getHeader;
-                    doAnotherStage = 0;
-                    break;
-                }
-                if ((srcEnd - srcPtr) < 4)   /* not enough size for entire CRC */
-                {
-                    dctxPtr->tmpInSize = 0;
-                    dctxPtr->dStage = dstage_storeSuffix;
-                }
-                else
-                {
-                    selectedIn = srcPtr;
-                    srcPtr += 4;
-                }
-            }
-
-            if (dctxPtr->dStage == dstage_storeSuffix)
-        case dstage_storeSuffix:
-            {
-                size_t sizeToCopy = 4 - dctxPtr->tmpInSize;
-                if (sizeToCopy > (size_t)(srcEnd - srcPtr)) sizeToCopy = srcEnd - srcPtr;
-                memcpy(dctxPtr->tmpIn + dctxPtr->tmpInSize, srcPtr, sizeToCopy);
-                srcPtr += sizeToCopy;
-                dctxPtr->tmpInSize += sizeToCopy;
-                if (dctxPtr->tmpInSize < 4)  /* not enough input to read complete suffix */
-                {
-                    nextSrcSizeHint = 4 - dctxPtr->tmpInSize;
-                    doAnotherStage=0;
-                    break;
-                }
-                selectedIn = dctxPtr->tmpIn;
-            }
-
-        /* case dstage_checkSuffix: */   /* no direct call, to avoid scan-build warning */
-            {
-                U32 readCRC = LZ4F_readLE32(selectedIn);
-                U32 resultCRC = XXH32_digest(&(dctxPtr->xxh));
-                if (readCRC != resultCRC) return (size_t)-LZ4F_ERROR_contentChecksum_invalid;
-                nextSrcSizeHint = 0;
-                dctxPtr->dStage = dstage_getHeader;
-                doAnotherStage = 0;
-                break;
-            }
-
-        case dstage_getSFrameSize:
-            {
-                if ((srcEnd - srcPtr) >= 4)
-                {
-                    selectedIn = srcPtr;
-                    srcPtr += 4;
-                }
-                else
-                {
-                /* not enough input to read cBlockSize field */
-                    dctxPtr->tmpInSize = 4;
-                    dctxPtr->tmpInTarget = 8;
-                    dctxPtr->dStage = dstage_storeSFrameSize;
-                }
-            }
-
-            if (dctxPtr->dStage == dstage_storeSFrameSize)
-        case dstage_storeSFrameSize:
-            {
-                size_t sizeToCopy = dctxPtr->tmpInTarget - dctxPtr->tmpInSize;
-                if (sizeToCopy > (size_t)(srcEnd - srcPtr)) sizeToCopy = srcEnd - srcPtr;
-                memcpy(dctxPtr->header + dctxPtr->tmpInSize, srcPtr, sizeToCopy);
-                srcPtr += sizeToCopy;
-                dctxPtr->tmpInSize += sizeToCopy;
-                if (dctxPtr->tmpInSize < dctxPtr->tmpInTarget) /* not enough input to get full sBlockSize; wait for more */
-                {
-                    nextSrcSizeHint = dctxPtr->tmpInTarget - dctxPtr->tmpInSize;
-                    doAnotherStage = 0;
-                    break;
-                }
-                selectedIn = dctxPtr->header + 4;
-            }
-
-        /* case dstage_decodeSFrameSize: */   /* no direct access */
-            {
-                size_t SFrameSize = LZ4F_readLE32(selectedIn);
-                dctxPtr->frameInfo.contentSize = SFrameSize;
-                dctxPtr->tmpInTarget = SFrameSize;
-                dctxPtr->dStage = dstage_skipSkippable;
-                break;
-            }
-
-        case dstage_skipSkippable:
-            {
-                size_t skipSize = dctxPtr->tmpInTarget;
-                if (skipSize > (size_t)(srcEnd-srcPtr)) skipSize = srcEnd-srcPtr;
-                srcPtr += skipSize;
-                dctxPtr->tmpInTarget -= skipSize;
-                doAnotherStage = 0;
-                nextSrcSizeHint = dctxPtr->tmpInTarget;
-                if (nextSrcSizeHint) break;
-                dctxPtr->dStage = dstage_getHeader;
-                break;
-            }
-        }
-    }
-
-    /* preserve dictionary within tmp if necessary */
-    if ( (dctxPtr->frameInfo.blockMode==LZ4F_blockLinked)
-        &&(dctxPtr->dict != dctxPtr->tmpOutBuffer)
-        &&(!decompressOptionsPtr->stableDst)
-        &&((unsigned)(dctxPtr->dStage-1) < (unsigned)(dstage_getSuffix-1))
-        )
-    {
-        if (dctxPtr->dStage == dstage_flushOut)
-        {
-            size_t preserveSize = dctxPtr->tmpOut - dctxPtr->tmpOutBuffer;
-            size_t copySize = 64 KB - dctxPtr->tmpOutSize;
-            const BYTE* oldDictEnd = dctxPtr->dict + dctxPtr->dictSize - dctxPtr->tmpOutStart;
-            if (dctxPtr->tmpOutSize > 64 KB) copySize = 0;
-            if (copySize > preserveSize) copySize = preserveSize;
-
-            memcpy(dctxPtr->tmpOutBuffer + preserveSize - copySize, oldDictEnd - copySize, copySize);
-
-            dctxPtr->dict = dctxPtr->tmpOutBuffer;
-            dctxPtr->dictSize = preserveSize + dctxPtr->tmpOutStart;
-        }
-        else
-        {
-            size_t newDictSize = dctxPtr->dictSize;
-            const BYTE* oldDictEnd = dctxPtr->dict + dctxPtr->dictSize;
-            if ((newDictSize) > 64 KB) newDictSize = 64 KB;
-
-            memcpy(dctxPtr->tmpOutBuffer, oldDictEnd - newDictSize, newDictSize);
-
-            dctxPtr->dict = dctxPtr->tmpOutBuffer;
-            dctxPtr->dictSize = newDictSize;
-            dctxPtr->tmpOut = dctxPtr->tmpOutBuffer + newDictSize;
-        }
-    }
-
-    /* require function to be called again from position where it stopped */
-    if (srcPtr<srcEnd)
-        dctxPtr->srcExpect = srcPtr;
-    else
-        dctxPtr->srcExpect = NULL;
-
-    *srcSizePtr = (srcPtr - srcStart);
-    *dstSizePtr = (dstPtr - dstStart);
-    return nextSrcSizeHint;
-}
diff --git a/extra/lz4/lz4frame.h b/extra/lz4/lz4frame.h
deleted file mode 100644
index 05fbc5fab7dd..000000000000
--- a/extra/lz4/lz4frame.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-   LZ4 auto-framing library
-   Header File
-   Copyright (C) 2011-2015, Yann Collet.
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - LZ4 source repository : https://github.com/Cyan4973/lz4
-   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-
-/* LZ4F is a stand-alone API to create LZ4-compressed frames
- * fully conformant to specification v1.5.1.
- * All related operations, including memory management, are handled by the library.
- * You don't need lz4.h when using lz4frame.h.
- * */
-
-#pragma once
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/**************************************
-*  Includes
-**************************************/
-#include <stddef.h>   /* size_t */
-
-
-/**************************************
- * Error management
- * ************************************/
-typedef size_t LZ4F_errorCode_t;
-
-unsigned    LZ4F_isError(LZ4F_errorCode_t code);
-const char* LZ4F_getErrorName(LZ4F_errorCode_t code);   /* return error code string; useful for debugging */
-
-
-/**************************************
- * Frame compression types
- * ************************************/
-//#define LZ4F_DISABLE_OBSOLETE_ENUMS
-#ifndef LZ4F_DISABLE_OBSOLETE_ENUMS
-#  define LZ4F_OBSOLETE_ENUM(x) ,x
-#else
-#  define LZ4F_OBSOLETE_ENUM(x)
-#endif
-
-typedef enum {
-    LZ4F_default=0,
-    LZ4F_max64KB=4,
-    LZ4F_max256KB=5,
-    LZ4F_max1MB=6,
-    LZ4F_max4MB=7
-    LZ4F_OBSOLETE_ENUM(max64KB = LZ4F_max64KB)
-    LZ4F_OBSOLETE_ENUM(max256KB = LZ4F_max256KB)
-    LZ4F_OBSOLETE_ENUM(max1MB = LZ4F_max1MB)
-    LZ4F_OBSOLETE_ENUM(max4MB = LZ4F_max4MB)
-} LZ4F_blockSizeID_t;
-
-typedef enum {
-    LZ4F_blockLinked=0,
-    LZ4F_blockIndependent
-    LZ4F_OBSOLETE_ENUM(blockLinked = LZ4F_blockLinked)
-    LZ4F_OBSOLETE_ENUM(blockIndependent = LZ4F_blockIndependent)
-} LZ4F_blockMode_t;
-
-typedef enum {
-    LZ4F_noContentChecksum=0,
-    LZ4F_contentChecksumEnabled
-    LZ4F_OBSOLETE_ENUM(noContentChecksum = LZ4F_noContentChecksum)
-    LZ4F_OBSOLETE_ENUM(contentChecksumEnabled = LZ4F_contentChecksumEnabled)
-} LZ4F_contentChecksum_t;
-
-typedef enum {
-    LZ4F_frame=0,
-    LZ4F_skippableFrame
-    LZ4F_OBSOLETE_ENUM(skippableFrame = LZ4F_skippableFrame)
-} LZ4F_frameType_t;
-
-#ifndef LZ4F_DISABLE_OBSOLETE_ENUMS
-typedef LZ4F_blockSizeID_t blockSizeID_t;
-typedef LZ4F_blockMode_t blockMode_t;
-typedef LZ4F_frameType_t frameType_t;
-typedef LZ4F_contentChecksum_t contentChecksum_t;
-#endif
-
-typedef struct {
-  LZ4F_blockSizeID_t     blockSizeID;           /* max64KB, max256KB, max1MB, max4MB ; 0 == default */
-  LZ4F_blockMode_t       blockMode;             /* blockLinked, blockIndependent ; 0 == default */
-  LZ4F_contentChecksum_t contentChecksumFlag;   /* noContentChecksum, contentChecksumEnabled ; 0 == default  */
-  LZ4F_frameType_t       frameType;             /* LZ4F_frame, skippableFrame ; 0 == default */
-  unsigned long long     contentSize;           /* Size of uncompressed (original) content ; 0 == unknown */
-  unsigned               reserved[2];           /* must be zero for forward compatibility */
-} LZ4F_frameInfo_t;
-
-typedef struct {
-  LZ4F_frameInfo_t frameInfo;
-  int      compressionLevel;       /* 0 == default (fast mode); values above 16 count as 16; values below 0 count as 0 */
-  unsigned autoFlush;              /* 1 == always flush (reduce need for tmp buffer) */
-  unsigned reserved[4];            /* must be zero for forward compatibility */
-} LZ4F_preferences_t;
-
-
-/***********************************
- * Simple compression function
- * *********************************/
-size_t LZ4F_compressFrameBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr);
-
-size_t LZ4F_compressFrame(void* dstBuffer, size_t dstMaxSize, const void* srcBuffer, size_t srcSize, const LZ4F_preferences_t* preferencesPtr);
-/* LZ4F_compressFrame()
- * Compress an entire srcBuffer into a valid LZ4 frame, as defined by specification v1.5.1
- * The most important rule is that dstBuffer MUST be large enough (dstMaxSize) to ensure compression completion even in worst case.
- * You can get the minimum value of dstMaxSize by using LZ4F_compressFrameBound()
- * If this condition is not respected, LZ4F_compressFrame() will fail (result is an errorCode)
- * The LZ4F_preferences_t structure is optional : you can provide NULL as argument. All preferences will be set to default.
- * The result of the function is the number of bytes written into dstBuffer.
- * The function outputs an error code if it fails (can be tested using LZ4F_isError())
- */
-
-
-
-/**********************************
-*  Advanced compression functions
-**********************************/
-typedef struct LZ4F_cctx_s* LZ4F_compressionContext_t;   /* must be aligned on 8-bytes */
-
-typedef struct {
-  unsigned stableSrc;    /* 1 == src content will remain available on future calls to LZ4F_compress(); avoid saving src content within tmp buffer as future dictionary */
-  unsigned reserved[3];
-} LZ4F_compressOptions_t;
-
-/* Resource Management */
-
-#define LZ4F_VERSION 100
-LZ4F_errorCode_t LZ4F_createCompressionContext(LZ4F_compressionContext_t* cctxPtr, unsigned version);
-LZ4F_errorCode_t LZ4F_freeCompressionContext(LZ4F_compressionContext_t cctx);
-/* LZ4F_createCompressionContext() :
- * The first thing to do is to create a compressionContext object, which will be used in all compression operations.
- * This is achieved using LZ4F_createCompressionContext(), which takes as argument a version and an LZ4F_preferences_t structure.
- * The version provided MUST be LZ4F_VERSION. It is intended to track potential version differences between different binaries.
- * The function will provide a pointer to a fully allocated LZ4F_compressionContext_t object.
- * If the result LZ4F_errorCode_t is not zero, there was an error during context creation.
- * Object can release its memory using LZ4F_freeCompressionContext();
- */
-
-
-/* Compression */
-
-size_t LZ4F_compressBegin(LZ4F_compressionContext_t cctx, void* dstBuffer, size_t dstMaxSize, const LZ4F_preferences_t* prefsPtr);
-/* LZ4F_compressBegin() :
- * will write the frame header into dstBuffer.
- * dstBuffer must be large enough to accommodate a header (dstMaxSize). Maximum header size is 15 bytes.
- * The LZ4F_preferences_t structure is optional : you can provide NULL as argument, all preferences will then be set to default.
- * The result of the function is the number of bytes written into dstBuffer for the header
- * or an error code (can be tested using LZ4F_isError())
- */
-
-size_t LZ4F_compressBound(size_t srcSize, const LZ4F_preferences_t* prefsPtr);
-/* LZ4F_compressBound() :
- * Provides the minimum size of Dst buffer given srcSize to handle worst case situations.
- * Different preferences can produce different results.
- * prefsPtr is optional : you can provide NULL as argument, all preferences will then be set to cover worst case.
- * This function includes frame termination cost (4 bytes, or 8 if frame checksum is enabled)
- */
-
-size_t LZ4F_compressUpdate(LZ4F_compressionContext_t cctx, void* dstBuffer, size_t dstMaxSize, const void* srcBuffer, size_t srcSize, const LZ4F_compressOptions_t* cOptPtr);
-/* LZ4F_compressUpdate()
- * LZ4F_compressUpdate() can be called repetitively to compress as much data as necessary.
- * The most important rule is that dstBuffer MUST be large enough (dstMaxSize) to ensure compression completion even in worst case.
- * You can get the minimum value of dstMaxSize by using LZ4F_compressBound().
- * If this condition is not respected, LZ4F_compress() will fail (result is an errorCode).
- * LZ4F_compressUpdate() doesn't guarantee error recovery, so you have to reset compression context when an error occurs.
- * The LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
- * The result of the function is the number of bytes written into dstBuffer : it can be zero, meaning input data was just buffered.
- * The function outputs an error code if it fails (can be tested using LZ4F_isError())
- */
-
-size_t LZ4F_flush(LZ4F_compressionContext_t cctx, void* dstBuffer, size_t dstMaxSize, const LZ4F_compressOptions_t* cOptPtr);
-/* LZ4F_flush()
- * Should you need to generate compressed data immediately, without waiting for the current block to be filled,
- * you can call LZ4_flush(), which will immediately compress any remaining data buffered within cctx.
- * Note that dstMaxSize must be large enough to ensure the operation will be successful.
- * LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
- * The result of the function is the number of bytes written into dstBuffer
- * (it can be zero, this means there was no data left within cctx)
- * The function outputs an error code if it fails (can be tested using LZ4F_isError())
- */
-
-size_t LZ4F_compressEnd(LZ4F_compressionContext_t cctx, void* dstBuffer, size_t dstMaxSize, const LZ4F_compressOptions_t* cOptPtr);
-/* LZ4F_compressEnd()
- * When you want to properly finish the compressed frame, just call LZ4F_compressEnd().
- * It will flush whatever data remained within compressionContext (like LZ4_flush())
- * but also properly finalize the frame, with an endMark and a checksum.
- * The result of the function is the number of bytes written into dstBuffer (necessarily >= 4 (endMark), or 8 if optional frame checksum is enabled)
- * The function outputs an error code if it fails (can be tested using LZ4F_isError())
- * The LZ4F_compressOptions_t structure is optional : you can provide NULL as argument.
- * A successful call to LZ4F_compressEnd() makes cctx available again for next compression task.
- */
-
-
-/***********************************
-*  Decompression functions
-***********************************/
-
-typedef struct LZ4F_dctx_s* LZ4F_decompressionContext_t;   /* must be aligned on 8-bytes */
-
-typedef struct {
-  unsigned stableDst;       /* guarantee that decompressed data will still be there on next function calls (avoid storage into tmp buffers) */
-  unsigned reserved[3];
-} LZ4F_decompressOptions_t;
-
-
-/* Resource management */
-
-LZ4F_errorCode_t LZ4F_createDecompressionContext(LZ4F_decompressionContext_t* dctxPtr, unsigned version);
-LZ4F_errorCode_t LZ4F_freeDecompressionContext(LZ4F_decompressionContext_t dctx);
-/* LZ4F_createDecompressionContext() :
- * The first thing to do is to create an LZ4F_decompressionContext_t object, which will be used in all decompression operations.
- * This is achieved using LZ4F_createDecompressionContext().
- * The version provided MUST be LZ4F_VERSION. It is intended to track potential breaking differences between different versions.
- * The function will provide a pointer to a fully allocated and initialized LZ4F_decompressionContext_t object.
- * The result is an errorCode, which can be tested using LZ4F_isError().
- * dctx memory can be released using LZ4F_freeDecompressionContext();
- * The result of LZ4F_freeDecompressionContext() is indicative of the current state of decompressionContext when being released.
- * That is, it should be == 0 if decompression has been completed fully and correctly.
- */
-
-
-/* Decompression */
-
-size_t LZ4F_getFrameInfo(LZ4F_decompressionContext_t dctx,
-                         LZ4F_frameInfo_t* frameInfoPtr,
-                         const void* srcBuffer, size_t* srcSizePtr);
-/* LZ4F_getFrameInfo()
- * This function decodes frame header information (such as max blockSize, frame checksum, etc.).
- * Its usage is optional : you can start by calling directly LZ4F_decompress() instead.
- * The objective is to extract frame header information, typically for allocation purposes.
- * LZ4F_getFrameInfo() can also be used anytime *after* starting decompression, on any valid LZ4F_decompressionContext_t.
- * The result is *copied* into an existing LZ4F_frameInfo_t structure which must be already allocated.
- * The number of bytes read from srcBuffer will be provided within *srcSizePtr (necessarily <= original value).
- * The function result is an hint of how many srcSize bytes LZ4F_decompress() expects for next call,
- *                        or an error code which can be tested using LZ4F_isError()
- *                        (typically, when there is not enough src bytes to fully decode the frame header)
- * You are expected to resume decompression from where it stopped (srcBuffer + *srcSizePtr)
- */
-
-size_t LZ4F_decompress(LZ4F_decompressionContext_t dctx,
-                       void* dstBuffer, size_t* dstSizePtr,
-                       const void* srcBuffer, size_t* srcSizePtr,
-                       const LZ4F_decompressOptions_t* dOptPtr);
-/* LZ4F_decompress()
- * Call this function repetitively to regenerate data compressed within srcBuffer.
- * The function will attempt to decode *srcSizePtr bytes from srcBuffer, into dstBuffer of maximum size *dstSizePtr.
- *
- * The number of bytes regenerated into dstBuffer will be provided within *dstSizePtr (necessarily <= original value).
- *
- * The number of bytes read from srcBuffer will be provided within *srcSizePtr (necessarily <= original value).
- * If number of bytes read is < number of bytes provided, then decompression operation is not completed.
- * It typically happens when dstBuffer is not large enough to contain all decoded data.
- * LZ4F_decompress() must be called again, starting from where it stopped (srcBuffer + *srcSizePtr)
- * The function will check this condition, and refuse to continue if it is not respected.
- *
- * dstBuffer is supposed to be flushed between each call to the function, since its content will be overwritten.
- * dst arguments can be changed at will with each consecutive call to the function.
- *
- * The function result is an hint of how many srcSize bytes LZ4F_decompress() expects for next call.
- * Schematically, it's the size of the current (or remaining) compressed block + header of next block.
- * Respecting the hint provides some boost to performance, since it does skip intermediate buffers.
- * This is just a hint, you can always provide any srcSize you want.
- * When a frame is fully decoded, the function result will be 0 (no more data expected).
- * If decompression failed, function result is an error code, which can be tested using LZ4F_isError().
- *
- * After a frame is fully decoded, dctx can be used again to decompress another frame.
- */
-
-
-#if defined (__cplusplus)
-}
-#endif
diff --git a/extra/lz4/lz4frame_static.h b/extra/lz4/lz4frame_static.h
deleted file mode 100644
index 0d909753b987..000000000000
--- a/extra/lz4/lz4frame_static.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   LZ4 auto-framing library
-   Header File for static linking only
-   Copyright (C) 2011-2015, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - LZ4 source repository : https://github.com/Cyan4973/lz4
-   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-
-#pragma once
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/* lz4frame_static.h should be used solely in the context of static linking.
- * It contains definitions which may still change overtime.
- * Never use it in the context of DLL linking.
- * */
-
-
-/**************************************
-*  Includes
-**************************************/
-#include "lz4frame.h"
-
-
-/**************************************
- * Error management
- * ************************************/
-#define LZ4F_LIST_ERRORS(ITEM) \
-        ITEM(OK_NoError) ITEM(ERROR_GENERIC) \
-        ITEM(ERROR_maxBlockSize_invalid) ITEM(ERROR_blockMode_invalid) ITEM(ERROR_contentChecksumFlag_invalid) \
-        ITEM(ERROR_compressionLevel_invalid) \
-        ITEM(ERROR_headerVersion_wrong) ITEM(ERROR_blockChecksum_unsupported) ITEM(ERROR_reservedFlag_set) \
-        ITEM(ERROR_allocation_failed) \
-        ITEM(ERROR_srcSize_tooLarge) ITEM(ERROR_dstMaxSize_tooSmall) \
-        ITEM(ERROR_frameHeader_incomplete) ITEM(ERROR_frameType_unknown) ITEM(ERROR_frameSize_wrong) \
-        ITEM(ERROR_srcPtr_wrong) \
-        ITEM(ERROR_decompressionFailed) \
-        ITEM(ERROR_headerChecksum_invalid) ITEM(ERROR_contentChecksum_invalid) \
-        ITEM(ERROR_maxCode)
-
-//#define LZ4F_DISABLE_OLD_ENUMS
-#ifndef LZ4F_DISABLE_OLD_ENUMS
-#define LZ4F_GENERATE_ENUM(ENUM) LZ4F_##ENUM, ENUM = LZ4F_##ENUM,
-#else
-#define LZ4F_GENERATE_ENUM(ENUM) LZ4F_##ENUM,
-#endif
-typedef enum { LZ4F_LIST_ERRORS(LZ4F_GENERATE_ENUM) } LZ4F_errorCodes;  /* enum is exposed, to handle specific errors; compare function result to -enum value */
-
-
-#if defined (__cplusplus)
-}
-#endif
diff --git a/extra/lz4/lz4hc.c b/extra/lz4/lz4hc.c
deleted file mode 100644
index bbe7a9d2d7eb..000000000000
--- a/extra/lz4/lz4hc.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
-    LZ4 HC - High Compression Mode of LZ4
-    Copyright (C) 2011-2015, Yann Collet.
-
-    BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-    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.
-
-    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.
-
-    You can contact the author at :
-       - LZ4 source repository : https://github.com/Cyan4973/lz4
-       - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-
-
-
-/**************************************
-*  Tuning Parameter
-**************************************/
-static const int LZ4HC_compressionLevel_default = 9;
-
-
-/**************************************
-*  Includes
-**************************************/
-#include "lz4hc.h"
-
-
-/**************************************
-*  Local Compiler Options
-**************************************/
-#if defined(__GNUC__)
-#  pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-#if defined (__clang__)
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-
-/**************************************
-*  Common LZ4 definition
-**************************************/
-#define LZ4_COMMONDEFS_ONLY
-#include "lz4.c"
-
-
-/**************************************
-*  Local Constants
-**************************************/
-#define DICTIONARY_LOGSIZE 16
-#define MAXD (1<<DICTIONARY_LOGSIZE)
-#define MAXD_MASK (MAXD - 1)
-
-#define HASH_LOG (DICTIONARY_LOGSIZE-1)
-#define HASHTABLESIZE (1 << HASH_LOG)
-#define HASH_MASK (HASHTABLESIZE - 1)
-
-#define OPTIMAL_ML (int)((ML_MASK-1)+MINMATCH)
-
-static const int g_maxCompressionLevel = 16;
-
-
-/**************************************
-*  Local Types
-**************************************/
-typedef struct
-{
-    U32   hashTable[HASHTABLESIZE];
-    U16   chainTable[MAXD];
-    const BYTE* end;        /* next block here to continue on current prefix */
-    const BYTE* base;       /* All index relative to this position */
-    const BYTE* dictBase;   /* alternate base for extDict */
-    BYTE* inputBuffer;      /* deprecated */
-    U32   dictLimit;        /* below that point, need extDict */
-    U32   lowLimit;         /* below that point, no more dict */
-    U32   nextToUpdate;     /* index from which to continue dictionary update */
-    U32   compressionLevel;
-} LZ4HC_Data_Structure;
-
-
-/**************************************
-*  Local Macros
-**************************************/
-#define HASH_FUNCTION(i)       (((i) * 2654435761U) >> ((MINMATCH*8)-HASH_LOG))
-//#define DELTANEXTU16(p)        chainTable[(p) & MAXD_MASK]   /* flexible, MAXD dependent */
-#define DELTANEXTU16(p)        chainTable[(U16)(p)]   /* faster */
-
-static U32 LZ4HC_hashPtr(const void* ptr) { return HASH_FUNCTION(LZ4_read32(ptr)); }
-
-
-
-/**************************************
-*  HC Compression
-**************************************/
-static void LZ4HC_init (LZ4HC_Data_Structure* hc4, const BYTE* start)
-{
-    MEM_INIT((void*)hc4->hashTable, 0, sizeof(hc4->hashTable));
-    MEM_INIT(hc4->chainTable, 0xFF, sizeof(hc4->chainTable));
-    hc4->nextToUpdate = 64 KB;
-    hc4->base = start - 64 KB;
-    hc4->end = start;
-    hc4->dictBase = start - 64 KB;
-    hc4->dictLimit = 64 KB;
-    hc4->lowLimit = 64 KB;
-}
-
-
-/* Update chains up to ip (excluded) */
-FORCE_INLINE void LZ4HC_Insert (LZ4HC_Data_Structure* hc4, const BYTE* ip)
-{
-    U16* chainTable = hc4->chainTable;
-    U32* HashTable  = hc4->hashTable;
-    const BYTE* const base = hc4->base;
-    const U32 target = (U32)(ip - base);
-    U32 idx = hc4->nextToUpdate;
-
-    while(idx < target)
-    {
-        U32 h = LZ4HC_hashPtr(base+idx);
-        size_t delta = idx - HashTable[h];
-        if (delta>MAX_DISTANCE) delta = MAX_DISTANCE;
-        DELTANEXTU16(idx) = (U16)delta;
-        HashTable[h] = idx;
-        idx++;
-    }
-
-    hc4->nextToUpdate = target;
-}
-
-
-FORCE_INLINE int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4,   /* Index table will be updated */
-                                               const BYTE* ip, const BYTE* const iLimit,
-                                               const BYTE** matchpos,
-                                               const int maxNbAttempts)
-{
-    U16* const chainTable = hc4->chainTable;
-    U32* const HashTable = hc4->hashTable;
-    const BYTE* const base = hc4->base;
-    const BYTE* const dictBase = hc4->dictBase;
-    const U32 dictLimit = hc4->dictLimit;
-    const U32 lowLimit = (hc4->lowLimit + 64 KB > (U32)(ip-base)) ? hc4->lowLimit : (U32)(ip - base) - (64 KB - 1);
-    U32 matchIndex;
-    const BYTE* match;
-    int nbAttempts=maxNbAttempts;
-    size_t ml=0;
-
-    /* HC4 match finder */
-    LZ4HC_Insert(hc4, ip);
-    matchIndex = HashTable[LZ4HC_hashPtr(ip)];
-
-    while ((matchIndex>=lowLimit) && (nbAttempts))
-    {
-        nbAttempts--;
-        if (matchIndex >= dictLimit)
-        {
-            match = base + matchIndex;
-            if (*(match+ml) == *(ip+ml)
-                && (LZ4_read32(match) == LZ4_read32(ip)))
-            {
-                size_t mlt = LZ4_count(ip+MINMATCH, match+MINMATCH, iLimit) + MINMATCH;
-                if (mlt > ml) { ml = mlt; *matchpos = match; }
-            }
-        }
-        else
-        {
-            match = dictBase + matchIndex;
-            if (LZ4_read32(match) == LZ4_read32(ip))
-            {
-                size_t mlt;
-                const BYTE* vLimit = ip + (dictLimit - matchIndex);
-                if (vLimit > iLimit) vLimit = iLimit;
-                mlt = LZ4_count(ip+MINMATCH, match+MINMATCH, vLimit) + MINMATCH;
-                if ((ip+mlt == vLimit) && (vLimit < iLimit))
-                    mlt += LZ4_count(ip+mlt, base+dictLimit, iLimit);
-                if (mlt > ml) { ml = mlt; *matchpos = base + matchIndex; }   /* virtual matchpos */
-            }
-        }
-        matchIndex -= DELTANEXTU16(matchIndex);
-    }
-
-    return (int)ml;
-}
-
-
-FORCE_INLINE int LZ4HC_InsertAndGetWiderMatch (
-    LZ4HC_Data_Structure* hc4,
-    const BYTE* const ip,
-    const BYTE* const iLowLimit,
-    const BYTE* const iHighLimit,
-    int longest,
-    const BYTE** matchpos,
-    const BYTE** startpos,
-    const int maxNbAttempts)
-{
-    U16* const chainTable = hc4->chainTable;
-    U32* const HashTable = hc4->hashTable;
-    const BYTE* const base = hc4->base;
-    const U32 dictLimit = hc4->dictLimit;
-    const BYTE* const lowPrefixPtr = base + dictLimit;
-    const U32 lowLimit = (hc4->lowLimit + 64 KB > (U32)(ip-base)) ? hc4->lowLimit : (U32)(ip - base) - (64 KB - 1);
-    const BYTE* const dictBase = hc4->dictBase;
-    U32   matchIndex;
-    int nbAttempts = maxNbAttempts;
-    int delta = (int)(ip-iLowLimit);
-
-
-    /* First Match */
-    LZ4HC_Insert(hc4, ip);
-    matchIndex = HashTable[LZ4HC_hashPtr(ip)];
-
-    while ((matchIndex>=lowLimit) && (nbAttempts))
-    {
-        nbAttempts--;
-        if (matchIndex >= dictLimit)
-        {
-            const BYTE* matchPtr = base + matchIndex;
-            if (*(iLowLimit + longest) == *(matchPtr - delta + longest))
-                if (LZ4_read32(matchPtr) == LZ4_read32(ip))
-                {
-                    int mlt = MINMATCH + LZ4_count(ip+MINMATCH, matchPtr+MINMATCH, iHighLimit);
-                    int back = 0;
-
-                    while ((ip+back>iLowLimit)
-                           && (matchPtr+back > lowPrefixPtr)
-                           && (ip[back-1] == matchPtr[back-1]))
-                            back--;
-
-                    mlt -= back;
-
-                    if (mlt > longest)
-                    {
-                        longest = (int)mlt;
-                        *matchpos = matchPtr+back;
-                        *startpos = ip+back;
-                    }
-                }
-        }
-        else
-        {
-            const BYTE* matchPtr = dictBase + matchIndex;
-            if (LZ4_read32(matchPtr) == LZ4_read32(ip))
-            {
-                size_t mlt;
-                int back=0;
-                const BYTE* vLimit = ip + (dictLimit - matchIndex);
-                if (vLimit > iHighLimit) vLimit = iHighLimit;
-                mlt = LZ4_count(ip+MINMATCH, matchPtr+MINMATCH, vLimit) + MINMATCH;
-                if ((ip+mlt == vLimit) && (vLimit < iHighLimit))
-                    mlt += LZ4_count(ip+mlt, base+dictLimit, iHighLimit);
-                while ((ip+back > iLowLimit) && (matchIndex+back > lowLimit) && (ip[back-1] == matchPtr[back-1])) back--;
-                mlt -= back;
-                if ((int)mlt > longest) { longest = (int)mlt; *matchpos = base + matchIndex + back; *startpos = ip+back; }
-            }
-        }
-        matchIndex -= DELTANEXTU16(matchIndex);
-    }
-
-    return longest;
-}
-
-
-typedef enum { noLimit = 0, limitedOutput = 1 } limitedOutput_directive;
-
-#define LZ4HC_DEBUG 0
-#if LZ4HC_DEBUG
-static unsigned debug = 0;
-#endif
-
-FORCE_INLINE int LZ4HC_encodeSequence (
-    const BYTE** ip,
-    BYTE** op,
-    const BYTE** anchor,
-    int matchLength,
-    const BYTE* const match,
-    limitedOutput_directive limitedOutputBuffer,
-    BYTE* oend)
-{
-    int length;
-    BYTE* token;
-
-#if LZ4HC_DEBUG
-    if (debug) printf("literal : %u  --  match : %u  --  offset : %u\n", (U32)(*ip - *anchor), (U32)matchLength, (U32)(*ip-match));
-#endif
-
-    /* Encode Literal length */
-    length = (int)(*ip - *anchor);
-    token = (*op)++;
-    if ((limitedOutputBuffer) && ((*op + (length>>8) + length + (2 + 1 + LASTLITERALS)) > oend)) return 1;   /* Check output limit */
-    if (length>=(int)RUN_MASK) { int len; *token=(RUN_MASK<<ML_BITS); len = length-RUN_MASK; for(; len > 254 ; len-=255) *(*op)++ = 255;  *(*op)++ = (BYTE)len; }
-    else *token = (BYTE)(length<<ML_BITS);
-
-    /* Copy Literals */
-    LZ4_wildCopy(*op, *anchor, (*op) + length);
-    *op += length;
-
-    /* Encode Offset */
-    LZ4_writeLE16(*op, (U16)(*ip-match)); *op += 2;
-
-    /* Encode MatchLength */
-    length = (int)(matchLength-MINMATCH);
-    if ((limitedOutputBuffer) && (*op + (length>>8) + (1 + LASTLITERALS) > oend)) return 1;   /* Check output limit */
-    if (length>=(int)ML_MASK) { *token+=ML_MASK; length-=ML_MASK; for(; length > 509 ; length-=510) { *(*op)++ = 255; *(*op)++ = 255; } if (length > 254) { length-=255; *(*op)++ = 255; } *(*op)++ = (BYTE)length; }
-    else *token += (BYTE)(length);
-
-    /* Prepare next loop */
-    *ip += matchLength;
-    *anchor = *ip;
-
-    return 0;
-}
-
-
-static int LZ4HC_compress_generic (
-    void* ctxvoid,
-    const char* source,
-    char* dest,
-    int inputSize,
-    int maxOutputSize,
-    int compressionLevel,
-    limitedOutput_directive limit
-    )
-{
-    LZ4HC_Data_Structure* ctx = (LZ4HC_Data_Structure*) ctxvoid;
-    const BYTE* ip = (const BYTE*) source;
-    const BYTE* anchor = ip;
-    const BYTE* const iend = ip + inputSize;
-    const BYTE* const mflimit = iend - MFLIMIT;
-    const BYTE* const matchlimit = (iend - LASTLITERALS);
-
-    BYTE* op = (BYTE*) dest;
-    BYTE* const oend = op + maxOutputSize;
-
-    unsigned maxNbAttempts;
-    int   ml, ml2, ml3, ml0;
-    const BYTE* ref=NULL;
-    const BYTE* start2=NULL;
-    const BYTE* ref2=NULL;
-    const BYTE* start3=NULL;
-    const BYTE* ref3=NULL;
-    const BYTE* start0;
-    const BYTE* ref0;
-
-
-    /* init */
-    if (compressionLevel > g_maxCompressionLevel) compressionLevel = g_maxCompressionLevel;
-    if (compressionLevel < 1) compressionLevel = LZ4HC_compressionLevel_default;
-    maxNbAttempts = 1 << (compressionLevel-1);
-    ctx->end += inputSize;
-
-    ip++;
-
-    /* Main Loop */
-    while (ip < mflimit)
-    {
-        ml = LZ4HC_InsertAndFindBestMatch (ctx, ip, matchlimit, (&ref), maxNbAttempts);
-        if (!ml) { ip++; continue; }
-
-        /* saved, in case we would skip too much */
-        start0 = ip;
-        ref0 = ref;
-        ml0 = ml;
-
-_Search2:
-        if (ip+ml < mflimit)
-            ml2 = LZ4HC_InsertAndGetWiderMatch(ctx, ip + ml - 2, ip + 1, matchlimit, ml, &ref2, &start2, maxNbAttempts);
-        else ml2 = ml;
-
-        if (ml2 == ml)  /* No better match */
-        {
-            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
-            continue;
-        }
-
-        if (start0 < ip)
-        {
-            if (start2 < ip + ml0)   /* empirical */
-            {
-                ip = start0;
-                ref = ref0;
-                ml = ml0;
-            }
-        }
-
-        /* Here, start0==ip */
-        if ((start2 - ip) < 3)   /* First Match too small : removed */
-        {
-            ml = ml2;
-            ip = start2;
-            ref =ref2;
-            goto _Search2;
-        }
-
-_Search3:
-        /*
-        * Currently we have :
-        * ml2 > ml1, and
-        * ip1+3 <= ip2 (usually < ip1+ml1)
-        */
-        if ((start2 - ip) < OPTIMAL_ML)
-        {
-            int correction;
-            int new_ml = ml;
-            if (new_ml > OPTIMAL_ML) new_ml = OPTIMAL_ML;
-            if (ip+new_ml > start2 + ml2 - MINMATCH) new_ml = (int)(start2 - ip) + ml2 - MINMATCH;
-            correction = new_ml - (int)(start2 - ip);
-            if (correction > 0)
-            {
-                start2 += correction;
-                ref2 += correction;
-                ml2 -= correction;
-            }
-        }
-        /* Now, we have start2 = ip+new_ml, with new_ml = min(ml, OPTIMAL_ML=18) */
-
-        if (start2 + ml2 < mflimit)
-            ml3 = LZ4HC_InsertAndGetWiderMatch(ctx, start2 + ml2 - 3, start2, matchlimit, ml2, &ref3, &start3, maxNbAttempts);
-        else ml3 = ml2;
-
-        if (ml3 == ml2) /* No better match : 2 sequences to encode */
-        {
-            /* ip & ref are known; Now for ml */
-            if (start2 < ip+ml)  ml = (int)(start2 - ip);
-            /* Now, encode 2 sequences */
-            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
-            ip = start2;
-            if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml2, ref2, limit, oend)) return 0;
-            continue;
-        }
-
-        if (start3 < ip+ml+3) /* Not enough space for match 2 : remove it */
-        {
-            if (start3 >= (ip+ml)) /* can write Seq1 immediately ==> Seq2 is removed, so Seq3 becomes Seq1 */
-            {
-                if (start2 < ip+ml)
-                {
-                    int correction = (int)(ip+ml - start2);
-                    start2 += correction;
-                    ref2 += correction;
-                    ml2 -= correction;
-                    if (ml2 < MINMATCH)
-                    {
-                        start2 = start3;
-                        ref2 = ref3;
-                        ml2 = ml3;
-                    }
-                }
-
-                if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
-                ip  = start3;
-                ref = ref3;
-                ml  = ml3;
-
-                start0 = start2;
-                ref0 = ref2;
-                ml0 = ml2;
-                goto _Search2;
-            }
-
-            start2 = start3;
-            ref2 = ref3;
-            ml2 = ml3;
-            goto _Search3;
-        }
-
-        /*
-        * OK, now we have 3 ascending matches; let's write at least the first one
-        * ip & ref are known; Now for ml
-        */
-        if (start2 < ip+ml)
-        {
-            if ((start2 - ip) < (int)ML_MASK)
-            {
-                int correction;
-                if (ml > OPTIMAL_ML) ml = OPTIMAL_ML;
-                if (ip + ml > start2 + ml2 - MINMATCH) ml = (int)(start2 - ip) + ml2 - MINMATCH;
-                correction = ml - (int)(start2 - ip);
-                if (correction > 0)
-                {
-                    start2 += correction;
-                    ref2 += correction;
-                    ml2 -= correction;
-                }
-            }
-            else
-            {
-                ml = (int)(start2 - ip);
-            }
-        }
-        if (LZ4HC_encodeSequence(&ip, &op, &anchor, ml, ref, limit, oend)) return 0;
-
-        ip = start2;
-        ref = ref2;
-        ml = ml2;
-
-        start2 = start3;
-        ref2 = ref3;
-        ml2 = ml3;
-
-        goto _Search3;
-    }
-
-    /* Encode Last Literals */
-    {
-        int lastRun = (int)(iend - anchor);
-        if ((limit) && (((char*)op - dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize)) return 0;  /* Check output limit */
-        if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun > 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }
-        else *op++ = (BYTE)(lastRun<<ML_BITS);
-        memcpy(op, anchor, iend - anchor);
-        op += iend-anchor;
-    }
-
-    /* End */
-    return (int) (((char*)op)-dest);
-}
-
-
-int LZ4_sizeofStateHC(void) { return sizeof(LZ4HC_Data_Structure); }
-
-int LZ4_compress_HC_extStateHC (void* state, const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel)
-{
-    if (((size_t)(state)&(sizeof(void*)-1)) != 0) return 0;   /* Error : state is not aligned for pointers (32 or 64 bits) */
-    LZ4HC_init ((LZ4HC_Data_Structure*)state, (const BYTE*)src);
-    if (maxDstSize < LZ4_compressBound(srcSize))
-        return LZ4HC_compress_generic (state, src, dst, srcSize, maxDstSize, compressionLevel, limitedOutput);
-    else
-        return LZ4HC_compress_generic (state, src, dst, srcSize, maxDstSize, compressionLevel, noLimit);
-}
-
-int LZ4_compress_HC(const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel)
-{
-    LZ4HC_Data_Structure state;
-    return LZ4_compress_HC_extStateHC(&state, src, dst, srcSize, maxDstSize, compressionLevel);
-}
-
-
-
-/**************************************
-*  Streaming Functions
-**************************************/
-/* allocation */
-LZ4_streamHC_t* LZ4_createStreamHC(void) { return (LZ4_streamHC_t*)malloc(sizeof(LZ4_streamHC_t)); }
-int             LZ4_freeStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr) { free(LZ4_streamHCPtr); return 0; }
-
-
-/* initialization */
-void LZ4_resetStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel)
-{
-    LZ4_STATIC_ASSERT(sizeof(LZ4HC_Data_Structure) <= sizeof(LZ4_streamHC_t));   /* if compilation fails here, LZ4_STREAMHCSIZE must be increased */
-    ((LZ4HC_Data_Structure*)LZ4_streamHCPtr)->base = NULL;
-    ((LZ4HC_Data_Structure*)LZ4_streamHCPtr)->compressionLevel = (unsigned)compressionLevel;
-}
-
-int LZ4_loadDictHC (LZ4_streamHC_t* LZ4_streamHCPtr, const char* dictionary, int dictSize)
-{
-    LZ4HC_Data_Structure* ctxPtr = (LZ4HC_Data_Structure*) LZ4_streamHCPtr;
-    if (dictSize > 64 KB)
-    {
-        dictionary += dictSize - 64 KB;
-        dictSize = 64 KB;
-    }
-    LZ4HC_init (ctxPtr, (const BYTE*)dictionary);
-    if (dictSize >= 4) LZ4HC_Insert (ctxPtr, (const BYTE*)dictionary +(dictSize-3));
-    ctxPtr->end = (const BYTE*)dictionary + dictSize;
-    return dictSize;
-}
-
-
-/* compression */
-
-static void LZ4HC_setExternalDict(LZ4HC_Data_Structure* ctxPtr, const BYTE* newBlock)
-{
-    if (ctxPtr->end >= ctxPtr->base + 4)
-        LZ4HC_Insert (ctxPtr, ctxPtr->end-3);   /* Referencing remaining dictionary content */
-    /* Only one memory segment for extDict, so any previous extDict is lost at this stage */
-    ctxPtr->lowLimit  = ctxPtr->dictLimit;
-    ctxPtr->dictLimit = (U32)(ctxPtr->end - ctxPtr->base);
-    ctxPtr->dictBase  = ctxPtr->base;
-    ctxPtr->base = newBlock - ctxPtr->dictLimit;
-    ctxPtr->end  = newBlock;
-    ctxPtr->nextToUpdate = ctxPtr->dictLimit;   /* match referencing will resume from there */
-}
-
-static int LZ4_compressHC_continue_generic (LZ4HC_Data_Structure* ctxPtr,
-                                            const char* source, char* dest,
-                                            int inputSize, int maxOutputSize, limitedOutput_directive limit)
-{
-    /* auto-init if forgotten */
-    if (ctxPtr->base == NULL)
-        LZ4HC_init (ctxPtr, (const BYTE*) source);
-
-    /* Check overflow */
-    if ((size_t)(ctxPtr->end - ctxPtr->base) > 2 GB)
-    {
-        size_t dictSize = (size_t)(ctxPtr->end - ctxPtr->base) - ctxPtr->dictLimit;
-        if (dictSize > 64 KB) dictSize = 64 KB;
-
-        LZ4_loadDictHC((LZ4_streamHC_t*)ctxPtr, (const char*)(ctxPtr->end) - dictSize, (int)dictSize);
-    }
-
-    /* Check if blocks follow each other */
-    if ((const BYTE*)source != ctxPtr->end)
-        LZ4HC_setExternalDict(ctxPtr, (const BYTE*)source);
-
-    /* Check overlapping input/dictionary space */
-    {
-        const BYTE* sourceEnd = (const BYTE*) source + inputSize;
-        const BYTE* dictBegin = ctxPtr->dictBase + ctxPtr->lowLimit;
-        const BYTE* dictEnd   = ctxPtr->dictBase + ctxPtr->dictLimit;
-        if ((sourceEnd > dictBegin) && ((const BYTE*)source < dictEnd))
-        {
-            if (sourceEnd > dictEnd) sourceEnd = dictEnd;
-            ctxPtr->lowLimit = (U32)(sourceEnd - ctxPtr->dictBase);
-            if (ctxPtr->dictLimit - ctxPtr->lowLimit < 4) ctxPtr->lowLimit = ctxPtr->dictLimit;
-        }
-    }
-
-    return LZ4HC_compress_generic (ctxPtr, source, dest, inputSize, maxOutputSize, ctxPtr->compressionLevel, limit);
-}
-
-int LZ4_compress_HC_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize, int maxOutputSize)
-{
-    if (maxOutputSize < LZ4_compressBound(inputSize))
-        return LZ4_compressHC_continue_generic ((LZ4HC_Data_Structure*)LZ4_streamHCPtr, source, dest, inputSize, maxOutputSize, limitedOutput);
-    else
-        return LZ4_compressHC_continue_generic ((LZ4HC_Data_Structure*)LZ4_streamHCPtr, source, dest, inputSize, maxOutputSize, noLimit);
-}
-
-
-/* dictionary saving */
-
-int LZ4_saveDictHC (LZ4_streamHC_t* LZ4_streamHCPtr, char* safeBuffer, int dictSize)
-{
-    LZ4HC_Data_Structure* streamPtr = (LZ4HC_Data_Structure*)LZ4_streamHCPtr;
-    int prefixSize = (int)(streamPtr->end - (streamPtr->base + streamPtr->dictLimit));
-    if (dictSize > 64 KB) dictSize = 64 KB;
-    if (dictSize < 4) dictSize = 0;
-    if (dictSize > prefixSize) dictSize = prefixSize;
-    memmove(safeBuffer, streamPtr->end - dictSize, dictSize);
-    {
-        U32 endIndex = (U32)(streamPtr->end - streamPtr->base);
-        streamPtr->end = (const BYTE*)safeBuffer + dictSize;
-        streamPtr->base = streamPtr->end - endIndex;
-        streamPtr->dictLimit = endIndex - dictSize;
-        streamPtr->lowLimit = endIndex - dictSize;
-        if (streamPtr->nextToUpdate < streamPtr->dictLimit) streamPtr->nextToUpdate = streamPtr->dictLimit;
-    }
-    return dictSize;
-}
-
-
-/***********************************
-*  Deprecated Functions
-***********************************/
-/* Deprecated compression functions */
-/* These functions are planned to start generate warnings by r131 approximately */
-int LZ4_compressHC(const char* src, char* dst, int srcSize) { return LZ4_compress_HC (src, dst, srcSize, LZ4_compressBound(srcSize), 0); }
-int LZ4_compressHC_limitedOutput(const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC(src, dst, srcSize, maxDstSize, 0); }
-int LZ4_compressHC2(const char* src, char* dst, int srcSize, int cLevel) { return LZ4_compress_HC (src, dst, srcSize, LZ4_compressBound(srcSize), cLevel); }
-int LZ4_compressHC2_limitedOutput(const char* src, char* dst, int srcSize, int maxDstSize, int cLevel) { return LZ4_compress_HC(src, dst, srcSize, maxDstSize, cLevel); }
-int LZ4_compressHC_withStateHC (void* state, const char* src, char* dst, int srcSize) { return LZ4_compress_HC_extStateHC (state, src, dst, srcSize, LZ4_compressBound(srcSize), 0); }
-int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC_extStateHC (state, src, dst, srcSize, maxDstSize, 0); }
-int LZ4_compressHC2_withStateHC (void* state, const char* src, char* dst, int srcSize, int cLevel) { return LZ4_compress_HC_extStateHC(state, src, dst, srcSize, LZ4_compressBound(srcSize), cLevel); }
-int LZ4_compressHC2_limitedOutput_withStateHC (void* state, const char* src, char* dst, int srcSize, int maxDstSize, int cLevel) { return LZ4_compress_HC_extStateHC(state, src, dst, srcSize, maxDstSize, cLevel); }
-int LZ4_compressHC_continue (LZ4_streamHC_t* ctx, const char* src, char* dst, int srcSize) { return LZ4_compress_HC_continue (ctx, src, dst, srcSize, LZ4_compressBound(srcSize)); }
-int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* ctx, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_HC_continue (ctx, src, dst, srcSize, maxDstSize); }
-
-
-/* Deprecated streaming functions */
-/* These functions currently generate deprecation warnings */
-int LZ4_sizeofStreamStateHC(void) { return LZ4_STREAMHCSIZE; }
-
-int LZ4_resetStreamStateHC(void* state, char* inputBuffer)
-{
-    if ((((size_t)state) & (sizeof(void*)-1)) != 0) return 1;   /* Error : pointer is not aligned for pointer (32 or 64 bits) */
-    LZ4HC_init((LZ4HC_Data_Structure*)state, (const BYTE*)inputBuffer);
-    ((LZ4HC_Data_Structure*)state)->inputBuffer = (BYTE*)inputBuffer;
-    return 0;
-}
-
-void* LZ4_createHC (char* inputBuffer)
-{
-    void* hc4 = ALLOCATOR(1, sizeof(LZ4HC_Data_Structure));
-    if (hc4 == NULL) return NULL;   /* not enough memory */
-    LZ4HC_init ((LZ4HC_Data_Structure*)hc4, (const BYTE*)inputBuffer);
-    ((LZ4HC_Data_Structure*)hc4)->inputBuffer = (BYTE*)inputBuffer;
-    return hc4;
-}
-
-int LZ4_freeHC (void* LZ4HC_Data)
-{
-    FREEMEM(LZ4HC_Data);
-    return (0);
-}
-
-int LZ4_compressHC2_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel)
-{
-    return LZ4HC_compress_generic (LZ4HC_Data, source, dest, inputSize, 0, compressionLevel, noLimit);
-}
-
-int LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel)
-{
-    return LZ4HC_compress_generic (LZ4HC_Data, source, dest, inputSize, maxOutputSize, compressionLevel, limitedOutput);
-}
-
-char* LZ4_slideInputBufferHC(void* LZ4HC_Data)
-{
-    LZ4HC_Data_Structure* hc4 = (LZ4HC_Data_Structure*)LZ4HC_Data;
-    int dictSize = LZ4_saveDictHC((LZ4_streamHC_t*)LZ4HC_Data, (char*)(hc4->inputBuffer), 64 KB);
-    return (char*)(hc4->inputBuffer + dictSize);
-}
diff --git a/extra/lz4/lz4hc.h b/extra/lz4/lz4hc.h
deleted file mode 100644
index 431f7c87c863..000000000000
--- a/extra/lz4/lz4hc.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-   LZ4 HC - High Compression Mode of LZ4
-   Header File
-   Copyright (C) 2011-2015, Yann Collet.
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - LZ4 source repository : https://github.com/Cyan4973/lz4
-   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
-*/
-#pragma once
-
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-/*****************************
-*  Includes
-*****************************/
-#include <stddef.h>   /* size_t */
-
-
-/**************************************
-*  Block Compression
-**************************************/
-int LZ4_compress_HC (const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel);
-/*
-LZ4_compress_HC :
-    Destination buffer 'dst' must be already allocated.
-    Compression completion is guaranteed if 'dst' buffer is sized to handle worst circumstances (data not compressible)
-    Worst size evaluation is provided by function LZ4_compressBound() (see "lz4.h")
-      srcSize  : Max supported value is LZ4_MAX_INPUT_SIZE (see "lz4.h")
-      compressionLevel : Recommended values are between 4 and 9, although any value between 0 and 16 will work.
-                         0 means "use default value" (see lz4hc.c).
-                         Values >16 behave the same as 16.
-      return : the number of bytes written into buffer 'dst'
-            or 0 if compression fails.
-*/
-
-
-/* Note :
-   Decompression functions are provided within LZ4 source code (see "lz4.h") (BSD license)
-*/
-
-
-int LZ4_sizeofStateHC(void);
-int LZ4_compress_HC_extStateHC(void* state, const char* src, char* dst, int srcSize, int maxDstSize, int compressionLevel);
-/*
-LZ4_compress_HC_extStateHC() :
-   Use this function if you prefer to manually allocate memory for compression tables.
-   To know how much memory must be allocated for the compression tables, use :
-      int LZ4_sizeofStateHC();
-
-   Allocated memory must be aligned on 8-bytes boundaries (which a normal malloc() will do properly).
-
-   The allocated memory can then be provided to the compression functions using 'void* state' parameter.
-   LZ4_compress_HC_extStateHC() is equivalent to previously described function.
-   It just uses externally allocated memory for stateHC.
-*/
-
-
-/**************************************
-*  Streaming Compression
-**************************************/
-#define LZ4_STREAMHCSIZE        262192
-#define LZ4_STREAMHCSIZE_SIZET (LZ4_STREAMHCSIZE / sizeof(size_t))
-typedef struct { size_t table[LZ4_STREAMHCSIZE_SIZET]; } LZ4_streamHC_t;
-/*
-  LZ4_streamHC_t
-  This structure allows static allocation of LZ4 HC streaming state.
-  State must then be initialized using LZ4_resetStreamHC() before first use.
-
-  Static allocation should only be used in combination with static linking.
-  If you want to use LZ4 as a DLL, please use construction functions below, which are future-proof.
-*/
-
-
-LZ4_streamHC_t* LZ4_createStreamHC(void);
-int             LZ4_freeStreamHC (LZ4_streamHC_t* streamHCPtr);
-/*
-  These functions create and release memory for LZ4 HC streaming state.
-  Newly created states are already initialized.
-  Existing state space can be re-used anytime using LZ4_resetStreamHC().
-  If you use LZ4 as a DLL, use these functions instead of static structure allocation,
-  to avoid size mismatch between different versions.
-*/
-
-void LZ4_resetStreamHC (LZ4_streamHC_t* streamHCPtr, int compressionLevel);
-int  LZ4_loadDictHC (LZ4_streamHC_t* streamHCPtr, const char* dictionary, int dictSize);
-
-int LZ4_compress_HC_continue (LZ4_streamHC_t* streamHCPtr, const char* src, char* dst, int srcSize, int maxDstSize);
-
-int LZ4_saveDictHC (LZ4_streamHC_t* streamHCPtr, char* safeBuffer, int maxDictSize);
-
-/*
-  These functions compress data in successive blocks of any size, using previous blocks as dictionary.
-  One key assumption is that previous blocks (up to 64 KB) remain read-accessible while compressing next blocks.
-  There is an exception for ring buffers, which can be smaller 64 KB.
-  Such case is automatically detected and correctly handled by LZ4_compress_HC_continue().
-
-  Before starting compression, state must be properly initialized, using LZ4_resetStreamHC().
-  A first "fictional block" can then be designated as initial dictionary, using LZ4_loadDictHC() (Optional).
-
-  Then, use LZ4_compress_HC_continue() to compress each successive block.
-  It works like LZ4_compress_HC(), but use previous memory blocks as dictionary to improve compression.
-  Previous memory blocks (including initial dictionary when present) must remain accessible and unmodified during compression.
-  As a reminder, size 'dst' buffer to handle worst cases, using LZ4_compressBound(), to ensure success of compression operation.
-
-  If, for any reason, previous data blocks can't be preserved unmodified in memory during next compression block,
-  you must save it to a safer memory space, using LZ4_saveDictHC().
-  Return value of LZ4_saveDictHC() is the size of dictionary effectively saved into 'safeBuffer'.
-*/
-
-
-
-/**************************************
-*  Deprecated Functions
-**************************************/
-/* Deprecate Warnings */
-/* Should these warnings messages be a problem,
-   it is generally possible to disable them,
-   with -Wno-deprecated-declarations for gcc
-   or _CRT_SECURE_NO_WARNINGS in Visual for example.
-   You can also define LZ4_DEPRECATE_WARNING_DEFBLOCK. */
-#ifndef LZ4_DEPRECATE_WARNING_DEFBLOCK
-#  define LZ4_DEPRECATE_WARNING_DEFBLOCK
-#  define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#  if (LZ4_GCC_VERSION >= 405) || defined(__clang__)
-#    define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
-#  elif (LZ4_GCC_VERSION >= 301)
-#    define LZ4_DEPRECATED(message) __attribute__((deprecated))
-#  elif defined(_MSC_VER)
-#    define LZ4_DEPRECATED(message) __declspec(deprecated(message))
-#  else
-#    pragma message("WARNING: You need to implement LZ4_DEPRECATED for this compiler")
-#    define LZ4_DEPRECATED(message)
-#  endif
-#endif // LZ4_DEPRECATE_WARNING_DEFBLOCK
-
-/* compression functions */
-/* these functions are planned to trigger warning messages by r131 approximately */
-int LZ4_compressHC                (const char* source, char* dest, int inputSize);
-int LZ4_compressHC_limitedOutput  (const char* source, char* dest, int inputSize, int maxOutputSize);
-int LZ4_compressHC2               (const char* source, char* dest, int inputSize, int compressionLevel);
-int LZ4_compressHC2_limitedOutput (const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-int LZ4_compressHC_withStateHC               (void* state, const char* source, char* dest, int inputSize);
-int LZ4_compressHC_limitedOutput_withStateHC (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
-int LZ4_compressHC2_withStateHC              (void* state, const char* source, char* dest, int inputSize, int compressionLevel);
-int LZ4_compressHC2_limitedOutput_withStateHC(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-int LZ4_compressHC_continue               (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize);
-int LZ4_compressHC_limitedOutput_continue (LZ4_streamHC_t* LZ4_streamHCPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
-
-/* Streaming functions following the older model; should no longer be used */
-LZ4_DEPRECATED("use LZ4_createStreamHC() instead") void* LZ4_createHC (char* inputBuffer);
-LZ4_DEPRECATED("use LZ4_saveDictHC() instead")     char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
-LZ4_DEPRECATED("use LZ4_freeStreamHC() instead")   int   LZ4_freeHC (void* LZ4HC_Data);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") int   LZ4_compressHC2_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_compress_HC_continue() instead") int   LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
-LZ4_DEPRECATED("use LZ4_createStreamHC() instead") int   LZ4_sizeofStreamStateHC(void);
-LZ4_DEPRECATED("use LZ4_resetStreamHC() instead")  int   LZ4_resetStreamStateHC(void* state, char* inputBuffer);
-
-
-#if defined (__cplusplus)
-}
-#endif
diff --git a/extra/lz4/my_xxhash.h b/extra/lz4/my_xxhash.h
index 699c1b592775..39c3ece24069 100644
--- a/extra/lz4/my_xxhash.h
+++ b/extra/lz4/my_xxhash.h
@@ -2,16 +2,23 @@
 #define MY_XXHASH_H_INCLUDED
 
 /*
-  Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/extra/lz4/xxhash.c b/extra/lz4/xxhash.c
deleted file mode 100644
index e6fb8f149a58..000000000000
--- a/extra/lz4/xxhash.c
+++ /dev/null
@@ -1,915 +0,0 @@
-/*
-xxHash - Fast Hash algorithm
-Copyright (C) 2012-2015, Yann Collet
-
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-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.
-
-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.
-
-You can contact the author at :
-- xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-
-/**************************************
-*  Tuning parameters
-**************************************/
-/* Unaligned memory access is automatically enabled for "common" CPU, such as x86.
- * For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected.
- * If you know your target CPU supports unaligned memory access, you want to force this option manually to improve performance.
- * You can also enable this parameter if you know your input data will always be aligned (boundaries of 4, for U32).
- */
-#if defined(__ARM_FEATURE_UNALIGNED) || defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
-#  define XXH_USE_UNALIGNED_ACCESS 1
-#endif
-
-/* XXH_ACCEPT_NULL_INPUT_POINTER :
- * If the input pointer is a null pointer, xxHash default behavior is to trigger a memory access error, since it is a bad pointer.
- * When this option is enabled, xxHash output for null input pointers will be the same as a null-length input.
- * By default, this option is disabled. To enable it, uncomment below define :
- */
-/* #define XXH_ACCEPT_NULL_INPUT_POINTER 1 */
-
-/* XXH_FORCE_NATIVE_FORMAT :
- * By default, xxHash library provides endian-independant Hash values, based on little-endian convention.
- * Results are therefore identical for little-endian and big-endian CPU.
- * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
- * Should endian-independance be of no importance for your application, you may set the #define below to 1.
- * It will improve speed for Big-endian CPU.
- * This option has no impact on Little_Endian CPU.
- */
-#define XXH_FORCE_NATIVE_FORMAT 0
-
-
-/**************************************
-*  Compiler Specific Options
-***************************************/
-#ifdef _MSC_VER    /* Visual Studio */
-#  pragma warning(disable : 4127)      /* disable: C4127: conditional expression is constant */
-#  define FORCE_INLINE static __forceinline
-#else
-#  if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
-#    ifdef __GNUC__
-#      define FORCE_INLINE static inline __attribute__((always_inline))
-#    else
-#      define FORCE_INLINE static inline
-#    endif
-#  else
-#    define FORCE_INLINE static
-#  endif /* __STDC_VERSION__ */
-#endif
-
-
-/**************************************
-*  Includes & Memory related functions
-***************************************/
-#include "xxhash.h"
-/* Modify the local functions below should you wish to use some other memory routines */
-/* for malloc(), free() */
-#include <stdlib.h>
-static void* XXH_malloc(size_t s) { return malloc(s); }
-static void  XXH_free  (void* p)  { free(p); }
-/* for memcpy() */
-#include <string.h>
-static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
-
-
-/**************************************
-*  Basic Types
-***************************************/
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
-# include <stdint.h>
-  typedef uint8_t  BYTE;
-  typedef uint16_t U16;
-  typedef uint32_t U32;
-  typedef  int32_t S32;
-  typedef uint64_t U64;
-#else
-  typedef unsigned char      BYTE;
-  typedef unsigned short     U16;
-  typedef unsigned int       U32;
-  typedef   signed int       S32;
-  typedef unsigned long long U64;
-#endif
-
-static U32 XXH_read32(const void* memPtr)
-{
-    U32 val32;
-    memcpy(&val32, memPtr, 4);
-    return val32;
-}
-
-static U64 XXH_read64(const void* memPtr)
-{
-    U64 val64;
-    memcpy(&val64, memPtr, 8);
-    return val64;
-}
-
-
-
-/******************************************
-*  Compiler-specific Functions and Macros
-******************************************/
-#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-
-/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
-#if defined(_MSC_VER)
-#  define XXH_rotl32(x,r) _rotl(x,r)
-#  define XXH_rotl64(x,r) _rotl64(x,r)
-#else
-#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
-#  define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r)))
-#endif
-
-#if defined(_MSC_VER)     /* Visual Studio */
-#  define XXH_swap32 _byteswap_ulong
-#  define XXH_swap64 _byteswap_uint64
-#elif GCC_VERSION >= 403
-#  define XXH_swap32 __builtin_bswap32
-#  define XXH_swap64 __builtin_bswap64
-#else
-static U32 XXH_swap32 (U32 x)
-{
-    return  ((x << 24) & 0xff000000 ) |
-            ((x <<  8) & 0x00ff0000 ) |
-            ((x >>  8) & 0x0000ff00 ) |
-            ((x >> 24) & 0x000000ff );
-}
-static U64 XXH_swap64 (U64 x)
-{
-    return  ((x << 56) & 0xff00000000000000ULL) |
-            ((x << 40) & 0x00ff000000000000ULL) |
-            ((x << 24) & 0x0000ff0000000000ULL) |
-            ((x << 8)  & 0x000000ff00000000ULL) |
-            ((x >> 8)  & 0x00000000ff000000ULL) |
-            ((x >> 24) & 0x0000000000ff0000ULL) |
-            ((x >> 40) & 0x000000000000ff00ULL) |
-            ((x >> 56) & 0x00000000000000ffULL);
-}
-#endif
-
-
-/***************************************
-*  Architecture Macros
-***************************************/
-typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
-#ifndef XXH_CPU_LITTLE_ENDIAN   /* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example using a compiler switch */
-static const int one = 1;
-#   define XXH_CPU_LITTLE_ENDIAN   (*(const char*)(&one))
-#endif
-
-
-/*****************************
-*  Memory reads
-*****************************/
-typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
-
-FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
-{
-    if (align==XXH_unaligned)
-        return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
-    else
-        return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);
-}
-
-FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)
-{
-    return XXH_readLE32_align(ptr, endian, XXH_unaligned);
-}
-
-FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)
-{
-    if (align==XXH_unaligned)
-        return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
-    else
-        return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);
-}
-
-FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)
-{
-    return XXH_readLE64_align(ptr, endian, XXH_unaligned);
-}
-
-
-/***************************************
-*  Macros
-***************************************/
-#define XXH_STATIC_ASSERT(c)   { enum { XXH_static_assert = 1/(!!(c)) }; }    /* use only *after* variable declarations */
-
-
-/***************************************
-*  Constants
-***************************************/
-#define PRIME32_1   2654435761U
-#define PRIME32_2   2246822519U
-#define PRIME32_3   3266489917U
-#define PRIME32_4    668265263U
-#define PRIME32_5    374761393U
-
-#define PRIME64_1 11400714785074694791ULL
-#define PRIME64_2 14029467366897019727ULL
-#define PRIME64_3  1609587929392839161ULL
-#define PRIME64_4  9650029242287828579ULL
-#define PRIME64_5  2870177450012600261ULL
-
-
-/*****************************
-*  Simple Hash Functions
-*****************************/
-FORCE_INLINE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianess endian, XXH_alignment align)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* bEnd = p + len;
-    U32 h32;
-#define XXH_get32bits(p) XXH_readLE32_align(p, endian, align)
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (p==NULL)
-    {
-        len=0;
-        bEnd=p=(const BYTE*)(size_t)16;
-    }
-#endif
-
-    if (len>=16)
-    {
-        const BYTE* const limit = bEnd - 16;
-        U32 v1 = seed + PRIME32_1 + PRIME32_2;
-        U32 v2 = seed + PRIME32_2;
-        U32 v3 = seed + 0;
-        U32 v4 = seed - PRIME32_1;
-
-        do
-        {
-            v1 += XXH_get32bits(p) * PRIME32_2;
-            v1 = XXH_rotl32(v1, 13);
-            v1 *= PRIME32_1;
-            p+=4;
-            v2 += XXH_get32bits(p) * PRIME32_2;
-            v2 = XXH_rotl32(v2, 13);
-            v2 *= PRIME32_1;
-            p+=4;
-            v3 += XXH_get32bits(p) * PRIME32_2;
-            v3 = XXH_rotl32(v3, 13);
-            v3 *= PRIME32_1;
-            p+=4;
-            v4 += XXH_get32bits(p) * PRIME32_2;
-            v4 = XXH_rotl32(v4, 13);
-            v4 *= PRIME32_1;
-            p+=4;
-        }
-        while (p<=limit);
-
-        h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
-    }
-    else
-    {
-        h32  = seed + PRIME32_5;
-    }
-
-    h32 += (U32) len;
-
-    while (p+4<=bEnd)
-    {
-        h32 += XXH_get32bits(p) * PRIME32_3;
-        h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
-        p+=4;
-    }
-
-    while (p<bEnd)
-    {
-        h32 += (*p) * PRIME32_5;
-        h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
-        p++;
-    }
-
-    h32 ^= h32 >> 15;
-    h32 *= PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= PRIME32_3;
-    h32 ^= h32 >> 16;
-
-    return h32;
-}
-
-
-unsigned XXH32 (const void* input, size_t len, unsigned seed)
-{
-#if 0
-    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
-    XXH32_state_t state;
-    XXH32_reset(&state, seed);
-    XXH32_update(&state, input, len);
-    return XXH32_digest(&state);
-#else
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-#  if !defined(XXH_USE_UNALIGNED_ACCESS)
-    if ((((size_t)input) & 3) == 0)   /* Input is 4-bytes aligned, leverage the speed benefit */
-    {
-        if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-            return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
-        else
-            return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
-    }
-#  endif
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
-    else
-        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
-#endif
-}
-
-FORCE_INLINE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianess endian, XXH_alignment align)
-{
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* bEnd = p + len;
-    U64 h64;
-#define XXH_get64bits(p) XXH_readLE64_align(p, endian, align)
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (p==NULL)
-    {
-        len=0;
-        bEnd=p=(const BYTE*)(size_t)32;
-    }
-#endif
-
-    if (len>=32)
-    {
-        const BYTE* const limit = bEnd - 32;
-        U64 v1 = seed + PRIME64_1 + PRIME64_2;
-        U64 v2 = seed + PRIME64_2;
-        U64 v3 = seed + 0;
-        U64 v4 = seed - PRIME64_1;
-
-        do
-        {
-            v1 += XXH_get64bits(p) * PRIME64_2;
-            p+=8;
-            v1 = XXH_rotl64(v1, 31);
-            v1 *= PRIME64_1;
-            v2 += XXH_get64bits(p) * PRIME64_2;
-            p+=8;
-            v2 = XXH_rotl64(v2, 31);
-            v2 *= PRIME64_1;
-            v3 += XXH_get64bits(p) * PRIME64_2;
-            p+=8;
-            v3 = XXH_rotl64(v3, 31);
-            v3 *= PRIME64_1;
-            v4 += XXH_get64bits(p) * PRIME64_2;
-            p+=8;
-            v4 = XXH_rotl64(v4, 31);
-            v4 *= PRIME64_1;
-        }
-        while (p<=limit);
-
-        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
-
-        v1 *= PRIME64_2;
-        v1 = XXH_rotl64(v1, 31);
-        v1 *= PRIME64_1;
-        h64 ^= v1;
-        h64 = h64 * PRIME64_1 + PRIME64_4;
-
-        v2 *= PRIME64_2;
-        v2 = XXH_rotl64(v2, 31);
-        v2 *= PRIME64_1;
-        h64 ^= v2;
-        h64 = h64 * PRIME64_1 + PRIME64_4;
-
-        v3 *= PRIME64_2;
-        v3 = XXH_rotl64(v3, 31);
-        v3 *= PRIME64_1;
-        h64 ^= v3;
-        h64 = h64 * PRIME64_1 + PRIME64_4;
-
-        v4 *= PRIME64_2;
-        v4 = XXH_rotl64(v4, 31);
-        v4 *= PRIME64_1;
-        h64 ^= v4;
-        h64 = h64 * PRIME64_1 + PRIME64_4;
-    }
-    else
-    {
-        h64  = seed + PRIME64_5;
-    }
-
-    h64 += (U64) len;
-
-    while (p+8<=bEnd)
-    {
-        U64 k1 = XXH_get64bits(p);
-        k1 *= PRIME64_2;
-        k1 = XXH_rotl64(k1,31);
-        k1 *= PRIME64_1;
-        h64 ^= k1;
-        h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
-        p+=8;
-    }
-
-    if (p+4<=bEnd)
-    {
-        h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1;
-        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
-        p+=4;
-    }
-
-    while (p<bEnd)
-    {
-        h64 ^= (*p) * PRIME64_5;
-        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
-        p++;
-    }
-
-    h64 ^= h64 >> 33;
-    h64 *= PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= PRIME64_3;
-    h64 ^= h64 >> 32;
-
-    return h64;
-}
-
-
-unsigned long long XXH64 (const void* input, size_t len, unsigned long long seed)
-{
-#if 0
-    /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
-    XXH64_state_t state;
-    XXH64_reset(&state, seed);
-    XXH64_update(&state, input, len);
-    return XXH64_digest(&state);
-#else
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-#  if !defined(XXH_USE_UNALIGNED_ACCESS)
-    if ((((size_t)input) & 7)==0)   /* Input is aligned, let's leverage the speed advantage */
-    {
-        if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-            return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
-        else
-            return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
-    }
-#  endif
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
-    else
-        return XXH64_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
-#endif
-}
-
-/****************************************************
-*  Advanced Hash Functions
-****************************************************/
-
-/*** Allocation ***/
-typedef struct
-{
-    U64 total_len;
-    U32 seed;
-    U32 v1;
-    U32 v2;
-    U32 v3;
-    U32 v4;
-    U32 mem32[4];   /* defined as U32 for alignment */
-    U32 memsize;
-} XXH_istate32_t;
-
-typedef struct
-{
-    U64 total_len;
-    U64 seed;
-    U64 v1;
-    U64 v2;
-    U64 v3;
-    U64 v4;
-    U64 mem64[4];   /* defined as U64 for alignment */
-    U32 memsize;
-} XXH_istate64_t;
-
-
-XXH32_state_t* XXH32_createState(void)
-{
-    XXH_STATIC_ASSERT(sizeof(XXH32_state_t) >= sizeof(XXH_istate32_t));   /* A compilation error here means XXH32_state_t is not large enough */
-    return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
-}
-XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
-{
-    XXH_free(statePtr);
-    return XXH_OK;
-}
-
-XXH64_state_t* XXH64_createState(void)
-{
-    XXH_STATIC_ASSERT(sizeof(XXH64_state_t) >= sizeof(XXH_istate64_t));   /* A compilation error here means XXH64_state_t is not large enough */
-    return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
-}
-XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
-{
-    XXH_free(statePtr);
-    return XXH_OK;
-}
-
-
-/*** Hash feed ***/
-
-XXH_errorcode XXH32_reset(XXH32_state_t* state_in, U32 seed)
-{
-    XXH_istate32_t* state = (XXH_istate32_t*) state_in;
-    state->seed = seed;
-    state->v1 = seed + PRIME32_1 + PRIME32_2;
-    state->v2 = seed + PRIME32_2;
-    state->v3 = seed + 0;
-    state->v4 = seed - PRIME32_1;
-    state->total_len = 0;
-    state->memsize = 0;
-    return XXH_OK;
-}
-
-XXH_errorcode XXH64_reset(XXH64_state_t* state_in, unsigned long long seed)
-{
-    XXH_istate64_t* state = (XXH_istate64_t*) state_in;
-    state->seed = seed;
-    state->v1 = seed + PRIME64_1 + PRIME64_2;
-    state->v2 = seed + PRIME64_2;
-    state->v3 = seed + 0;
-    state->v4 = seed - PRIME64_1;
-    state->total_len = 0;
-    state->memsize = 0;
-    return XXH_OK;
-}
-
-
-FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state_in, const void* input, size_t len, XXH_endianess endian)
-{
-    XXH_istate32_t* state = (XXH_istate32_t *) state_in;
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* const bEnd = p + len;
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (input==NULL) return XXH_ERROR;
-#endif
-
-    state->total_len += len;
-
-    if (state->memsize + len < 16)   /* fill in tmp buffer */
-    {
-        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, len);
-        state->memsize += (U32)len;
-        return XXH_OK;
-    }
-
-    if (state->memsize)   /* some data left from previous update */
-    {
-        XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
-        {
-            const U32* p32 = state->mem32;
-            state->v1 += XXH_readLE32(p32, endian) * PRIME32_2;
-            state->v1 = XXH_rotl32(state->v1, 13);
-            state->v1 *= PRIME32_1;
-            p32++;
-            state->v2 += XXH_readLE32(p32, endian) * PRIME32_2;
-            state->v2 = XXH_rotl32(state->v2, 13);
-            state->v2 *= PRIME32_1;
-            p32++;
-            state->v3 += XXH_readLE32(p32, endian) * PRIME32_2;
-            state->v3 = XXH_rotl32(state->v3, 13);
-            state->v3 *= PRIME32_1;
-            p32++;
-            state->v4 += XXH_readLE32(p32, endian) * PRIME32_2;
-            state->v4 = XXH_rotl32(state->v4, 13);
-            state->v4 *= PRIME32_1;
-            p32++;
-        }
-        p += 16-state->memsize;
-        state->memsize = 0;
-    }
-
-    if (p <= bEnd-16)
-    {
-        const BYTE* const limit = bEnd - 16;
-        U32 v1 = state->v1;
-        U32 v2 = state->v2;
-        U32 v3 = state->v3;
-        U32 v4 = state->v4;
-
-        do
-        {
-            v1 += XXH_readLE32(p, endian) * PRIME32_2;
-            v1 = XXH_rotl32(v1, 13);
-            v1 *= PRIME32_1;
-            p+=4;
-            v2 += XXH_readLE32(p, endian) * PRIME32_2;
-            v2 = XXH_rotl32(v2, 13);
-            v2 *= PRIME32_1;
-            p+=4;
-            v3 += XXH_readLE32(p, endian) * PRIME32_2;
-            v3 = XXH_rotl32(v3, 13);
-            v3 *= PRIME32_1;
-            p+=4;
-            v4 += XXH_readLE32(p, endian) * PRIME32_2;
-            v4 = XXH_rotl32(v4, 13);
-            v4 *= PRIME32_1;
-            p+=4;
-        }
-        while (p<=limit);
-
-        state->v1 = v1;
-        state->v2 = v2;
-        state->v3 = v3;
-        state->v4 = v4;
-    }
-
-    if (p < bEnd)
-    {
-        XXH_memcpy(state->mem32, p, bEnd-p);
-        state->memsize = (int)(bEnd-p);
-    }
-
-    return XXH_OK;
-}
-
-XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
-    else
-        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
-}
-
-
-
-FORCE_INLINE U32 XXH32_digest_endian (const XXH32_state_t* state_in, XXH_endianess endian)
-{
-    const XXH_istate32_t* state = (const XXH_istate32_t*) state_in;
-    const BYTE * p = (const BYTE*)state->mem32;
-    const BYTE* bEnd = (const BYTE*)(state->mem32) + state->memsize;
-    U32 h32;
-
-    if (state->total_len >= 16)
-    {
-        h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18);
-    }
-    else
-    {
-        h32  = state->seed + PRIME32_5;
-    }
-
-    h32 += (U32) state->total_len;
-
-    while (p+4<=bEnd)
-    {
-        h32 += XXH_readLE32(p, endian) * PRIME32_3;
-        h32  = XXH_rotl32(h32, 17) * PRIME32_4;
-        p+=4;
-    }
-
-    while (p<bEnd)
-    {
-        h32 += (*p) * PRIME32_5;
-        h32 = XXH_rotl32(h32, 11) * PRIME32_1;
-        p++;
-    }
-
-    h32 ^= h32 >> 15;
-    h32 *= PRIME32_2;
-    h32 ^= h32 >> 13;
-    h32 *= PRIME32_3;
-    h32 ^= h32 >> 16;
-
-    return h32;
-}
-
-
-U32 XXH32_digest (const XXH32_state_t* state_in)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH32_digest_endian(state_in, XXH_littleEndian);
-    else
-        return XXH32_digest_endian(state_in, XXH_bigEndian);
-}
-
-
-FORCE_INLINE XXH_errorcode XXH64_update_endian (XXH64_state_t* state_in, const void* input, size_t len, XXH_endianess endian)
-{
-    XXH_istate64_t * state = (XXH_istate64_t *) state_in;
-    const BYTE* p = (const BYTE*)input;
-    const BYTE* const bEnd = p + len;
-
-#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
-    if (input==NULL) return XXH_ERROR;
-#endif
-
-    state->total_len += len;
-
-    if (state->memsize + len < 32)   /* fill in tmp buffer */
-    {
-        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
-        state->memsize += (U32)len;
-        return XXH_OK;
-    }
-
-    if (state->memsize)   /* some data left from previous update */
-    {
-        XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, 32-state->memsize);
-        {
-            const U64* p64 = state->mem64;
-            state->v1 += XXH_readLE64(p64, endian) * PRIME64_2;
-            state->v1 = XXH_rotl64(state->v1, 31);
-            state->v1 *= PRIME64_1;
-            p64++;
-            state->v2 += XXH_readLE64(p64, endian) * PRIME64_2;
-            state->v2 = XXH_rotl64(state->v2, 31);
-            state->v2 *= PRIME64_1;
-            p64++;
-            state->v3 += XXH_readLE64(p64, endian) * PRIME64_2;
-            state->v3 = XXH_rotl64(state->v3, 31);
-            state->v3 *= PRIME64_1;
-            p64++;
-            state->v4 += XXH_readLE64(p64, endian) * PRIME64_2;
-            state->v4 = XXH_rotl64(state->v4, 31);
-            state->v4 *= PRIME64_1;
-            p64++;
-        }
-        p += 32-state->memsize;
-        state->memsize = 0;
-    }
-
-    if (p+32 <= bEnd)
-    {
-        const BYTE* const limit = bEnd - 32;
-        U64 v1 = state->v1;
-        U64 v2 = state->v2;
-        U64 v3 = state->v3;
-        U64 v4 = state->v4;
-
-        do
-        {
-            v1 += XXH_readLE64(p, endian) * PRIME64_2;
-            v1 = XXH_rotl64(v1, 31);
-            v1 *= PRIME64_1;
-            p+=8;
-            v2 += XXH_readLE64(p, endian) * PRIME64_2;
-            v2 = XXH_rotl64(v2, 31);
-            v2 *= PRIME64_1;
-            p+=8;
-            v3 += XXH_readLE64(p, endian) * PRIME64_2;
-            v3 = XXH_rotl64(v3, 31);
-            v3 *= PRIME64_1;
-            p+=8;
-            v4 += XXH_readLE64(p, endian) * PRIME64_2;
-            v4 = XXH_rotl64(v4, 31);
-            v4 *= PRIME64_1;
-            p+=8;
-        }
-        while (p<=limit);
-
-        state->v1 = v1;
-        state->v2 = v2;
-        state->v3 = v3;
-        state->v4 = v4;
-    }
-
-    if (p < bEnd)
-    {
-        XXH_memcpy(state->mem64, p, bEnd-p);
-        state->memsize = (int)(bEnd-p);
-    }
-
-    return XXH_OK;
-}
-
-XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_update_endian(state_in, input, len, XXH_littleEndian);
-    else
-        return XXH64_update_endian(state_in, input, len, XXH_bigEndian);
-}
-
-
-
-FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state_in, XXH_endianess endian)
-{
-    const XXH_istate64_t * state = (const XXH_istate64_t *) state_in;
-    const BYTE * p = (const BYTE*)state->mem64;
-    const BYTE* bEnd = (const BYTE*)state->mem64 + state->memsize;
-    U64 h64;
-
-    if (state->total_len >= 32)
-    {
-        U64 v1 = state->v1;
-        U64 v2 = state->v2;
-        U64 v3 = state->v3;
-        U64 v4 = state->v4;
-
-        h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
-
-        v1 *= PRIME64_2;
-        v1 = XXH_rotl64(v1, 31);
-        v1 *= PRIME64_1;
-        h64 ^= v1;
-        h64 = h64*PRIME64_1 + PRIME64_4;
-
-        v2 *= PRIME64_2;
-        v2 = XXH_rotl64(v2, 31);
-        v2 *= PRIME64_1;
-        h64 ^= v2;
-        h64 = h64*PRIME64_1 + PRIME64_4;
-
-        v3 *= PRIME64_2;
-        v3 = XXH_rotl64(v3, 31);
-        v3 *= PRIME64_1;
-        h64 ^= v3;
-        h64 = h64*PRIME64_1 + PRIME64_4;
-
-        v4 *= PRIME64_2;
-        v4 = XXH_rotl64(v4, 31);
-        v4 *= PRIME64_1;
-        h64 ^= v4;
-        h64 = h64*PRIME64_1 + PRIME64_4;
-    }
-    else
-    {
-        h64  = state->seed + PRIME64_5;
-    }
-
-    h64 += (U64) state->total_len;
-
-    while (p+8<=bEnd)
-    {
-        U64 k1 = XXH_readLE64(p, endian);
-        k1 *= PRIME64_2;
-        k1 = XXH_rotl64(k1,31);
-        k1 *= PRIME64_1;
-        h64 ^= k1;
-        h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4;
-        p+=8;
-    }
-
-    if (p+4<=bEnd)
-    {
-        h64 ^= (U64)(XXH_readLE32(p, endian)) * PRIME64_1;
-        h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
-        p+=4;
-    }
-
-    while (p<bEnd)
-    {
-        h64 ^= (*p) * PRIME64_5;
-        h64 = XXH_rotl64(h64, 11) * PRIME64_1;
-        p++;
-    }
-
-    h64 ^= h64 >> 33;
-    h64 *= PRIME64_2;
-    h64 ^= h64 >> 29;
-    h64 *= PRIME64_3;
-    h64 ^= h64 >> 32;
-
-    return h64;
-}
-
-
-unsigned long long XXH64_digest (const XXH64_state_t* state_in)
-{
-    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
-
-    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
-        return XXH64_digest_endian(state_in, XXH_littleEndian);
-    else
-        return XXH64_digest_endian(state_in, XXH_bigEndian);
-}
-
-
diff --git a/extra/lz4/xxhash.h b/extra/lz4/xxhash.h
deleted file mode 100644
index c60aa61571c5..000000000000
--- a/extra/lz4/xxhash.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-   xxHash - Extremely Fast Hash algorithm
-   Header File
-   Copyright (C) 2012-2015, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   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.
-
-   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.
-
-   You can contact the author at :
-   - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-/* Notice extracted from xxHash homepage :
-
-xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
-It also successfully passes all tests from the SMHasher suite.
-
-Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
-
-Name            Speed       Q.Score   Author
-xxHash          5.4 GB/s     10
-CrapWow         3.2 GB/s      2       Andrew
-MumurHash 3a    2.7 GB/s     10       Austin Appleby
-SpookyHash      2.0 GB/s     10       Bob Jenkins
-SBox            1.4 GB/s      9       Bret Mulvey
-Lookup3         1.2 GB/s      9       Bob Jenkins
-SuperFastHash   1.2 GB/s      1       Paul Hsieh
-CityHash64      1.05 GB/s    10       Pike & Alakuijala
-FNV             0.55 GB/s     5       Fowler, Noll, Vo
-CRC32           0.43 GB/s     9
-MD5-32          0.33 GB/s    10       Ronald L. Rivest
-SHA1-32         0.28 GB/s    10
-
-Q.Score is a measure of quality of the hash function.
-It depends on successfully passing SMHasher test set.
-10 is a perfect score.
-
-A 64-bits version, named XXH64, is available since r35.
-It offers much better speed, but for 64-bits applications only.
-Name     Speed on 64 bits    Speed on 32 bits
-XXH64       13.8 GB/s            1.9 GB/s
-XXH32        6.8 GB/s            6.0 GB/s
-*/
-
-#pragma once
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
-
-/*****************************
-*  Definitions
-*****************************/
-#include <stddef.h>   /* size_t */
-typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
-
-
-/*****************************
-*  Namespace Emulation
-*****************************/
-/* Motivations :
-
-If you need to include xxHash into your library,
-but wish to avoid xxHash symbols to be present on your library interface
-in an effort to avoid potential name collision if another library also includes xxHash,
-
-you can use XXH_NAMESPACE, which will automatically prefix any symbol from xxHash
-with the value of XXH_NAMESPACE (so avoid to keep it NULL, and avoid numeric values).
-
-Note that no change is required within the calling program :
-it can still call xxHash functions using their regular name.
-They will be automatically translated by this header.
-*/
-#ifdef XXH_NAMESPACE
-#  define XXH_CAT(A,B) A##B
-#  define XXH_NAME2(A,B) XXH_CAT(A,B)
-#  define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32)
-#  define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64)
-#  define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState)
-#  define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState)
-#  define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState)
-#  define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState)
-#  define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset)
-#  define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset)
-#  define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update)
-#  define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update)
-#  define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest)
-#  define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest)
-#endif
-
-
-/*****************************
-*  Simple Hash Functions
-*****************************/
-
-unsigned int       XXH32 (const void* input, size_t length, unsigned seed);
-unsigned long long XXH64 (const void* input, size_t length, unsigned long long seed);
-
-/*
-XXH32() :
-    Calculate the 32-bits hash of sequence "length" bytes stored at memory address "input".
-    The memory between input & input+length must be valid (allocated and read-accessible).
-    "seed" can be used to alter the result predictably.
-    This function successfully passes all SMHasher tests.
-    Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s
-XXH64() :
-    Calculate the 64-bits hash of sequence of length "len" stored at memory address "input".
-    Faster on 64-bits systems. Slower on 32-bits systems.
-*/
-
-
-
-/*****************************
-*  Advanced Hash Functions
-*****************************/
-typedef struct { long long ll[ 6]; } XXH32_state_t;
-typedef struct { long long ll[11]; } XXH64_state_t;
-
-/*
-These structures allow static allocation of XXH states.
-States must then be initialized using XXHnn_reset() before first use.
-
-If you prefer dynamic allocation, please refer to functions below.
-*/
-
-XXH32_state_t* XXH32_createState(void);
-XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
-
-XXH64_state_t* XXH64_createState(void);
-XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
-
-/*
-These functions create and release memory for XXH state.
-States must then be initialized using XXHnn_reset() before first use.
-*/
-
-
-XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned seed);
-XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
-unsigned int  XXH32_digest (const XXH32_state_t* statePtr);
-
-XXH_errorcode      XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
-XXH_errorcode      XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
-unsigned long long XXH64_digest (const XXH64_state_t* statePtr);
-
-/*
-These functions calculate the xxHash of an input provided in multiple smaller packets,
-as opposed to an input provided as a single block.
-
-XXH state space must first be allocated, using either static or dynamic method provided above.
-
-Start a new hash by initializing state with a seed, using XXHnn_reset().
-
-Then, feed the hash state by calling XXHnn_update() as many times as necessary.
-Obviously, input must be valid, meaning allocated and read accessible.
-The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
-
-Finally, you can produce a hash anytime, by using XXHnn_digest().
-This function returns the final nn-bits hash.
-You can nonetheless continue feeding the hash state with more input,
-and therefore get some new hashes, by calling again XXHnn_digest().
-
-When you are done, don't forget to free XXH state space, using typically XXHnn_freeState().
-*/
-
-
-#if defined (__cplusplus)
-}
-#endif
diff --git a/extra/lz4_decompress.cc b/extra/lz4_decompress.cc
index 49665013fea4..8155620fa024 100644
--- a/extra/lz4_decompress.cc
+++ b/extra/lz4_decompress.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,7 +25,7 @@
 #include <my_global.h>
 #include <welcome_copyright_notice.h>
 
-#include "lz4/lz4frame.h"
+#include "lz4frame.h"
 #include <string.h>
 
 static void usage()
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index b0ea748ccb7d..4f1e8712a3bc 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -1,15 +1,22 @@
 
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +64,7 @@ static struct my_option my_long_options[] =
    "extension (e.g., .ini or .cnf) will be added",
    &config_file, &config_file, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit",
    0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
diff --git a/extra/perror.c b/extra/perror.c
index df0aa5984c2e..d99c51647c7d 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/extra/protobuf/CMakeLists.txt b/extra/protobuf/CMakeLists.txt
index 7c7e97e32e51..b0bee874ebd0 100644
--- a/extra/protobuf/CMakeLists.txt
+++ b/extra/protobuf/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -28,7 +35,15 @@
 
 SET(PROTOBUF_MSVC_DISABLED_WARNINGS "/wd4018 /wd4005 /wd4244 /wd4267 /wd4065")
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 # Turn off some warning flags when compiling protobuf
+MY_CHECK_CXX_COMPILER_FLAG("-Wno-deprecated-declarations"
+  HAVE_NO_DEPRECATED_DECLARATIONS)
+IF(HAVE_NO_DEPRECATED_DECLARATIONS)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ENDIF()
+
 MY_CHECK_CXX_COMPILER_FLAG("-Wno-sign-compare" HAVE_NO_SIGN_COMPARE)
 IF(HAVE_NO_SIGN_COMPARE)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
@@ -71,7 +86,6 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/protobuf-2.6.1/src
-  ${ZLIB_INCLUDE_DIR}
 )
 
 SET(PROTO_SRC_DIR
diff --git a/extra/protobuf/protobuf-2.6.1/test-driver b/extra/protobuf/protobuf-2.6.1/test-driver
index d30605660a06..42f023dd18e5 100755
--- a/extra/protobuf/protobuf-2.6.1/test-driver
+++ b/extra/protobuf/protobuf-2.6.1/test-driver
@@ -6,14 +6,20 @@ scriptversion=2013-07-13.22; # UTC
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/extra/rapidjson/CMakeLists.txt b/extra/rapidjson/CMakeLists.txt
deleted file mode 100644
index 4cde7e2a7cc2..000000000000
--- a/extra/rapidjson/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
-
-PROJECT(RapidJSON CXX)
-
-set(LIB_MAJOR_VERSION "0")
-set(LIB_MINOR_VERSION "12")
-set(LIB_PATCH_VERSION "0")
-set(LIB_VERSION_STRING "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION}")
-
-# compile in release with debug info mode by default
-SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build Type")
-
-# Build all binaries in a separate directory
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." ON)
-option(RAPIDJSON_BUILD_EXAMPLES "Build rapidjson examples." ON)
-option(RAPIDJSON_BUILD_TESTS "Build rapidjson perftests and unittests." ON)
-
-option(RAPIDJSON_HAS_STDSTRING "" OFF)
-if(RAPIDJSON_HAS_STDSTRING)
-    add_definitions(-DRAPIDJSON_HAS_STDSTRING)
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
-endif()
-
-#add extra search paths for libraries and includes
-SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
-SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
-SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
-
-IF(UNIX OR CYGWIN)
-    SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}")
-ELSEIF(WIN32)
-    SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake")
-ENDIF()
-SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in")
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
-
-if(RAPIDJSON_BUILD_DOC)
-    add_subdirectory(doc)
-endif()
-
-add_custom_target(travis_doc)
-add_custom_command(TARGET travis_doc
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/travis-doxygen.sh)
-
-if(RAPIDJSON_BUILD_EXAMPLES)
-    add_subdirectory(example)
-endif()
-
-if(RAPIDJSON_BUILD_TESTS)
-    if(MSVC11)
-        # required for VS2012 due to missing support for variadic templates
-        add_definitions(-D_VARIADIC_MAX=10)
-    endif(MSVC11)
-    add_subdirectory(test)
-    include(CTest)
-endif()
-
-# pkg-config
-IF (UNIX OR CYGWIN)
-  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
-                  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-                  @ONLY)
-  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-      DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
-      COMPONENT pkgconfig)
-ENDIF()
-
-install(FILES readme.md
-        DESTINATION "${DOC_INSTALL_DIR}"
-        COMPONENT doc)
-
-install(DIRECTORY include/rapidjson
-    DESTINATION "${INCLUDE_INSTALL_DIR}"
-    COMPONENT dev)
-
-install(DIRECTORY example/
-    DESTINATION "${DOC_INSTALL_DIR}/examples"
-    COMPONENT examples)
-
-# Provide config and version files to be used by other applications
-# ===============================
-
-export(PACKAGE ${PROJECT_NAME})
-
-# cmake-modules
-CONFIGURE_FILE(${PROJECT_NAME}Config.cmake.in
-    ${PROJECT_NAME}Config.cmake
-    @ONLY)
-CONFIGURE_FILE(${PROJECT_NAME}ConfigVersion.cmake.in
-    ${PROJECT_NAME}ConfigVersion.cmake
-    @ONLY)
-INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    DESTINATION "${CMAKE_INSTALL_DIR}"
-    COMPONENT dev)
diff --git a/extra/rapidjson/CMakeModules/FindGTestSrc.cmake b/extra/rapidjson/CMakeModules/FindGTestSrc.cmake
deleted file mode 100644
index 89f132e5a5e4..000000000000
--- a/extra/rapidjson/CMakeModules/FindGTestSrc.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-SET(GTEST_SEARCH_PATH 
-    "${GTEST_SOURCE_DIR}"
-    "${CMAKE_SOURCE_DIR}/thirdparty/gtest")
-
-IF(UNIX)
-    LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest")
-ENDIF()
-
-FIND_PATH(GTEST_SOURCE_DIR
-    NAMES CMakeLists.txt src/gtest_main.cc
-    PATHS ${GTEST_SEARCH_PATH})
-
-# Debian installs gtest include directory in /usr/include, thus need to look
-# for include directory separately from source directory.
-FIND_PATH(GTEST_INCLUDE_DIR
-    NAMES gtest/gtest.h
-    PATH_SUFFIXES include
-    PATHS ${GTEST_SEARCH_PATH})
-
-find_package_handle_standard_args(GTestSrc DEFAULT_MSG
-    GTEST_SOURCE_DIR
-    GTEST_INCLUDE_DIR)
diff --git a/extra/rapidjson/RapidJSON.pc.in b/extra/rapidjson/RapidJSON.pc.in
deleted file mode 100644
index 7467f9779b88..000000000000
--- a/extra/rapidjson/RapidJSON.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: @PROJECT_NAME@
-Description: A fast JSON parser/generator for C++ with both SAX/DOM style API
-Version: @LIB_VERSION_STRING@
-URL: https://github.com/miloyip/rapidjson
-Cflags: -I${includedir}
diff --git a/extra/rapidjson/RapidJSONConfig.cmake.in b/extra/rapidjson/RapidJSONConfig.cmake.in
deleted file mode 100644
index 9fa12186ab6e..000000000000
--- a/extra/rapidjson/RapidJSONConfig.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-get_filename_component(RAPIDJSON_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(RAPIDJSON_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@")
-message(STATUS "RapidJSON found. Headers: ${RAPIDJSON_INCLUDE_DIRS}")
diff --git a/extra/rapidjson/RapidJSONConfigVersion.cmake.in b/extra/rapidjson/RapidJSONConfigVersion.cmake.in
deleted file mode 100644
index 25741fc09761..000000000000
--- a/extra/rapidjson/RapidJSONConfigVersion.cmake.in
+++ /dev/null
@@ -1,10 +0,0 @@
-SET(PACKAGE_VERSION "@LIB_VERSION_STRING@")
-
-IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_EXACT "true")
-ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_COMPATIBLE "true")
-ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_UNSUITABLE "true")
-ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
diff --git a/extra/rapidjson/appveyor.yml b/extra/rapidjson/appveyor.yml
deleted file mode 100644
index d1a910896e06..000000000000
--- a/extra/rapidjson/appveyor.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: 0.12.{build}
-
-configuration:
-- Debug
-- Release
-
-environment:
-  matrix:
-  - VS_VERSION: 11
-    VS_PLATFORM: win32
-  - VS_VERSION: 11
-    VS_PLATFORM: x64
-  - VS_VERSION: 12
-    VS_PLATFORM: win32
-  - VS_VERSION: 12
-    VS_PLATFORM: x64
-
-before_build:
-- git submodule update --init --recursive
-- cmake -H. -BBuild/VS -G "Visual Studio %VS_VERSION%" -DCMAKE_GENERATOR_PLATFORM=%VS_PLATFORM% -DBUILD_SHARED_LIBS=true -Wno-dev
-
-build:
-  project: Build\VS\RapidJSON.sln
-  parallel: true
-  verbosity: minimal
-
-test_script:
-- cd Build\VS && if %CONFIGURATION%==Debug (ctest --verbose -E perftest --build-config %CONFIGURATION%) else (ctest --verbose --build-config %CONFIGURATION%)
diff --git a/extra/rapidjson/bin/data/glossary.json b/extra/rapidjson/bin/data/glossary.json
deleted file mode 100644
index d5ca56d19505..000000000000
--- a/extra/rapidjson/bin/data/glossary.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/data/menu.json b/extra/rapidjson/bin/data/menu.json
deleted file mode 100644
index acdf930ea5fd..000000000000
--- a/extra/rapidjson/bin/data/menu.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/data/readme.txt b/extra/rapidjson/bin/data/readme.txt
deleted file mode 100644
index c53bfb8b7265..000000000000
--- a/extra/rapidjson/bin/data/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sample.json is obtained from http://code.google.com/p/json-test-suite/downloads/detail?name=sample.zip
diff --git a/extra/rapidjson/bin/data/sample.json b/extra/rapidjson/bin/data/sample.json
deleted file mode 100644
index 30930e765dc6..000000000000
--- a/extra/rapidjson/bin/data/sample.json
+++ /dev/null
@@ -1,3315 +0,0 @@
-{
- "a": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- },
- "key": "6.908319653520691E8",
- "z": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- }
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/data/webapp.json b/extra/rapidjson/bin/data/webapp.json
deleted file mode 100644
index d540b57f0df6..000000000000
--- a/extra/rapidjson/bin/data/webapp.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{"web-app": {
-  "servlet": [   
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
- 
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/data/widget.json b/extra/rapidjson/bin/data/widget.json
deleted file mode 100644
index 0449493a6448..000000000000
--- a/extra/rapidjson/bin/data/widget.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": { 
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/encodings/utf16be.json b/extra/rapidjson/bin/encodings/utf16be.json
deleted file mode 100644
index e46dbfb9ddc4..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf16be.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf16bebom.json b/extra/rapidjson/bin/encodings/utf16bebom.json
deleted file mode 100644
index 1e27ece50e41..000000000000
--- a/extra/rapidjson/bin/encodings/utf16bebom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/encodings/utf16le.json b/extra/rapidjson/bin/encodings/utf16le.json
deleted file mode 100644
index 92d504530cda..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf16le.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf16lebom.json b/extra/rapidjson/bin/encodings/utf16lebom.json
deleted file mode 100644
index 1e27ece50e41..000000000000
--- a/extra/rapidjson/bin/encodings/utf16lebom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/encodings/utf32be.json b/extra/rapidjson/bin/encodings/utf32be.json
deleted file mode 100644
index 9cbb522279da..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf32be.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf32bebom.json b/extra/rapidjson/bin/encodings/utf32bebom.json
deleted file mode 100644
index bde6a99ab431..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf32bebom.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf32le.json b/extra/rapidjson/bin/encodings/utf32le.json
deleted file mode 100644
index b00f290a64f1..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf32le.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf32lebom.json b/extra/rapidjson/bin/encodings/utf32lebom.json
deleted file mode 100644
index d3db39bf732c..000000000000
Binary files a/extra/rapidjson/bin/encodings/utf32lebom.json and /dev/null differ
diff --git a/extra/rapidjson/bin/encodings/utf8.json b/extra/rapidjson/bin/encodings/utf8.json
deleted file mode 100644
index 1e27ece50e41..000000000000
--- a/extra/rapidjson/bin/encodings/utf8.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/encodings/utf8bom.json b/extra/rapidjson/bin/encodings/utf8bom.json
deleted file mode 100644
index 1e27ece50e41..000000000000
--- a/extra/rapidjson/bin/encodings/utf8bom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail1.json b/extra/rapidjson/bin/jsonchecker/fail1.json
deleted file mode 100644
index 6216b865f102..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail1.json
+++ /dev/null
@@ -1 +0,0 @@
-"A JSON payload should be an object or array, not a string."
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail10.json b/extra/rapidjson/bin/jsonchecker/fail10.json
deleted file mode 100644
index 5d8c0047bd52..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail11.json b/extra/rapidjson/bin/jsonchecker/fail11.json
deleted file mode 100644
index 76eb95b4583c..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail11.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail12.json b/extra/rapidjson/bin/jsonchecker/fail12.json
deleted file mode 100644
index 77580a4522d8..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail12.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal invocation": alert()}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail13.json b/extra/rapidjson/bin/jsonchecker/fail13.json
deleted file mode 100644
index 379406b59bdb..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail13.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail14.json b/extra/rapidjson/bin/jsonchecker/fail14.json
deleted file mode 100644
index 0ed366b38a34..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail14.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail15.json b/extra/rapidjson/bin/jsonchecker/fail15.json
deleted file mode 100644
index fc8376b605da..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail15.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail16.json b/extra/rapidjson/bin/jsonchecker/fail16.json
deleted file mode 100644
index 3fe21d4b5324..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail16.json
+++ /dev/null
@@ -1 +0,0 @@
-[\naked]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail17.json b/extra/rapidjson/bin/jsonchecker/fail17.json
deleted file mode 100644
index 62b9214aeda6..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail17.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail18.json b/extra/rapidjson/bin/jsonchecker/fail18.json
deleted file mode 100644
index edac92716f18..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail18.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail19.json b/extra/rapidjson/bin/jsonchecker/fail19.json
deleted file mode 100644
index 3b9c46fa9a29..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail19.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Missing colon" null}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail2.json b/extra/rapidjson/bin/jsonchecker/fail2.json
deleted file mode 100644
index 6b7c11e5a565..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail2.json
+++ /dev/null
@@ -1 +0,0 @@
-["Unclosed array"
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail20.json b/extra/rapidjson/bin/jsonchecker/fail20.json
deleted file mode 100644
index 27c1af3e72ee..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Double colon":: null}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail21.json b/extra/rapidjson/bin/jsonchecker/fail21.json
deleted file mode 100644
index 62474573b216..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail21.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead of colon", null}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail22.json b/extra/rapidjson/bin/jsonchecker/fail22.json
deleted file mode 100644
index a7752581bcf7..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail22.json
+++ /dev/null
@@ -1 +0,0 @@
-["Colon instead of comma": false]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail23.json b/extra/rapidjson/bin/jsonchecker/fail23.json
deleted file mode 100644
index 494add1ca190..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail23.json
+++ /dev/null
@@ -1 +0,0 @@
-["Bad value", truth]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail24.json b/extra/rapidjson/bin/jsonchecker/fail24.json
deleted file mode 100644
index caff239bfc36..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail24.json
+++ /dev/null
@@ -1 +0,0 @@
-['single quote']
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail25.json b/extra/rapidjson/bin/jsonchecker/fail25.json
deleted file mode 100644
index 8b7ad23e0103..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail25.json
+++ /dev/null
@@ -1 +0,0 @@
-["	tab	character	in	string	"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail26.json b/extra/rapidjson/bin/jsonchecker/fail26.json
deleted file mode 100644
index 845d26a6a543..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail26.json
+++ /dev/null
@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail27.json b/extra/rapidjson/bin/jsonchecker/fail27.json
deleted file mode 100644
index 6b01a2ca4a97..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail27.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line
-break"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail28.json b/extra/rapidjson/bin/jsonchecker/fail28.json
deleted file mode 100644
index 621a0101c664..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail28.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line\
-break"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail29.json b/extra/rapidjson/bin/jsonchecker/fail29.json
deleted file mode 100644
index 47ec421bb624..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail29.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail3.json b/extra/rapidjson/bin/jsonchecker/fail3.json
deleted file mode 100644
index 168c81eb7853..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail3.json
+++ /dev/null
@@ -1 +0,0 @@
-{unquoted_key: "keys must be quoted"}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail30.json b/extra/rapidjson/bin/jsonchecker/fail30.json
deleted file mode 100644
index 8ab0bc4b8b2c..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail30.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail31.json b/extra/rapidjson/bin/jsonchecker/fail31.json
deleted file mode 100644
index 1cce602b518f..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail31.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+-1]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail32.json b/extra/rapidjson/bin/jsonchecker/fail32.json
deleted file mode 100644
index 45cba7396ff7..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail32.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead if closing brace": true,
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail33.json b/extra/rapidjson/bin/jsonchecker/fail33.json
deleted file mode 100644
index ca5eb19dc97f..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail33.json
+++ /dev/null
@@ -1 +0,0 @@
-["mismatch"}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail4.json b/extra/rapidjson/bin/jsonchecker/fail4.json
deleted file mode 100644
index 9de168bf34e2..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail4.json
+++ /dev/null
@@ -1 +0,0 @@
-["extra comma",]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail5.json b/extra/rapidjson/bin/jsonchecker/fail5.json
deleted file mode 100644
index ddf3ce3d2409..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail5.json
+++ /dev/null
@@ -1 +0,0 @@
-["double extra comma",,]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail6.json b/extra/rapidjson/bin/jsonchecker/fail6.json
deleted file mode 100644
index ed91580e1b1c..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail6.json
+++ /dev/null
@@ -1 +0,0 @@
-[   , "<-- missing value"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail7.json b/extra/rapidjson/bin/jsonchecker/fail7.json
deleted file mode 100644
index 8a96af3e4ee6..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail7.json
+++ /dev/null
@@ -1 +0,0 @@
-["Comma after the close"],
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail8.json b/extra/rapidjson/bin/jsonchecker/fail8.json
deleted file mode 100644
index b28479c6ecb2..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail8.json
+++ /dev/null
@@ -1 +0,0 @@
-["Extra close"]]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/fail9.json b/extra/rapidjson/bin/jsonchecker/fail9.json
deleted file mode 100644
index 5815574f363e..000000000000
--- a/extra/rapidjson/bin/jsonchecker/fail9.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra comma": true,}
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/pass1.json b/extra/rapidjson/bin/jsonchecker/pass1.json
deleted file mode 100644
index 70e268543692..000000000000
--- a/extra/rapidjson/bin/jsonchecker/pass1.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "0123456789": "digit",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.json.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/pass2.json b/extra/rapidjson/bin/jsonchecker/pass2.json
deleted file mode 100644
index d3c63c7ad845..000000000000
--- a/extra/rapidjson/bin/jsonchecker/pass2.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/extra/rapidjson/bin/jsonchecker/pass3.json b/extra/rapidjson/bin/jsonchecker/pass3.json
deleted file mode 100644
index 4528d51f1ac6..000000000000
--- a/extra/rapidjson/bin/jsonchecker/pass3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
diff --git a/extra/rapidjson/bin/jsonchecker/readme.txt b/extra/rapidjson/bin/jsonchecker/readme.txt
deleted file mode 100644
index 321d89d998ed..000000000000
--- a/extra/rapidjson/bin/jsonchecker/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Test suite from http://json.org/JSON_checker/.
-
-If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
diff --git a/extra/rapidjson/doc/CMakeLists.txt b/extra/rapidjson/doc/CMakeLists.txt
deleted file mode 100644
index 685a00e8224b..000000000000
--- a/extra/rapidjson/doc/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-find_package(Doxygen)
-
-IF(NOT DOXYGEN_FOUND)
-    MESSAGE(STATUS "No Doxygen found. Documentation won't be built")
-ELSE()
-    file(GLOB SOURCES ${CMAKE_SOURCE_DIR}/include/*)
-    file(GLOB MARKDOWN_DOC ${CMAKE_SOURCE_DIR}/doc/*.md)
-    list(APPEND MARKDOWN_DOC ${CMAKE_SOURCE_DIR}/readme.md)
-
-    CONFIGURE_FILE(Doxyfile.in Doxyfile @ONLY)
-
-    add_custom_command(OUTPUT html
-        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/html
-        DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-
-    add_custom_target(doc ALL DEPENDS html)
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-        DESTINATION ${DOC_INSTALL_DIR}
-        COMPONENT doc)
-ENDIF()
diff --git a/extra/rapidjson/doc/Doxyfile.in b/extra/rapidjson/doc/Doxyfile.in
deleted file mode 100644
index 69201431a84b..000000000000
--- a/extra/rapidjson/doc/Doxyfile.in
+++ /dev/null
@@ -1,2366 +0,0 @@
-# Doxyfile 1.8.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = RapidJSON
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = YES
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       = $(RAPIDJSON_SECTIONS)
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = readme.md \
-                         include/rapidjson/rapidjson.h \
-                         include/ \
-                         doc/features.md \
-                         doc/tutorial.md \
-                         doc/stream.md \
-                         doc/encoding.md \
-                         doc/dom.md \
-                         doc/sax.md \
-                         doc/performance.md \
-                         doc/internals.md \
-                         doc/faq.md
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.inc \
-                         *.md
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = ./include/rapidjson/msinttypes/
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = internal
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             = ./doc
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = readme.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = ./doc/misc/header.html
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = ./doc/misc/footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = ./doc/misc/doxygenextra.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = \
-	RAPIDJSON_DOXYGEN_RUNNING \
-	RAPIDJSON_NAMESPACE_BEGIN="namespace rapidjson {" \
-	RAPIDJSON_NAMESPACE_END="}" \
-	RAPIDJSON_REMOVEFPTR_(x)=x \
-	RAPIDJSON_ENABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype" \
-	RAPIDJSON_DISABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype"
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      = \
-	RAPIDJSON_NOEXCEPT
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/extra/rapidjson/doc/diagram/insituparsing.dot b/extra/rapidjson/doc/diagram/insituparsing.dot
deleted file mode 100644
index eca0e3854f4f..000000000000
--- a/extra/rapidjson/doc/diagram/insituparsing.dot
+++ /dev/null
@@ -1,65 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		oldjson [label="\{|\"|m|s|g|\"|:|\"|H|e|l|l|o|\\|n|W|o|r|l|d|!|\"|,|\"|\\|u|0|0|7|3|t|a|r|s|\"|:|1|0|\}", xlabel="Before Parsing"]
-		//newjson [label="\{|\"|<a>m|s|g|\\0|:|\"|<b>H|e|l|l|o|\\n|W|o|r|l|d|!|\\0|\"|,|\"|<c>s|t|a|r|s|\\0|t|a|r|s|:|1|0|\}", xlabel="After Parsing"]
-		newjson [shape=plaintext, label=<
-<table BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="2"><tr>
-<td>{</td>
-<td>"</td><td port="a">m</td><td>s</td><td>g</td><td bgcolor="yellow">\\0</td>
-<td>:</td>
-<td>"</td><td port="b">H</td><td>e</td><td>l</td><td>l</td><td>o</td><td bgcolor="yellow">\\n</td><td bgcolor="yellow">W</td><td bgcolor="yellow">o</td><td bgcolor="yellow">r</td><td bgcolor="yellow">l</td><td bgcolor="yellow">d</td><td bgcolor="yellow">!</td><td bgcolor="yellow">\\0</td><td>"</td>
-<td>,</td>
-<td>"</td><td port="c" bgcolor="yellow">s</td><td bgcolor="yellow">t</td><td bgcolor="yellow">a</td><td bgcolor="yellow">r</td><td bgcolor="yellow">s</td><td bgcolor="yellow">\\0</td><td>t</td><td>a</td><td>r</td><td>s</td>
-<td>:</td>
-<td>1</td><td>0</td>
-<td>}</td>
-</tr></table>
->, xlabel="After Parsing"]
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document by In situ Parsing"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			msg [label="{string|<a>}", fillcolor=5]
-			helloworld [label="{string|<a>}", fillcolor=5]
-			stars [label="{string|<a>}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-	}
-
-	oldjson -> root [label=" ParseInsitu()" lhead="cluster1"]
-	edge [arrowhead=vee]
-	root -> { msg; stars }
-
-	edge [arrowhead="none"]
-	msg  -> helloworld
-	stars -> ten
-
-	{
-		edge [arrowhead=vee, arrowtail=dot, arrowsize=0.5, dir=both, tailclip=false]
-		msg:a:c -> newjson:a
-		helloworld:a:c -> newjson:b
-		stars:a:c -> newjson:c
-	}
-
-	//oldjson -> newjson [style=invis]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/insituparsing.png b/extra/rapidjson/doc/diagram/insituparsing.png
deleted file mode 100644
index 27b2572d9567..000000000000
Binary files a/extra/rapidjson/doc/diagram/insituparsing.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.dot b/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
deleted file mode 100644
index 82ebfe1f095f..000000000000
--- a/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
+++ /dev/null
@@ -1,62 +0,0 @@
-digraph {
-    fontname="Inconsolata, Consolas"
-    fontsize=10
-    margin="0,0"
-    penwidth=0.0
-    
-    node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-    edge [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-
-    node [shape = doublecircle]; Start; Finish;
-    node [shape = box; style = "rounded, filled"; fillcolor=white ];
-
-    Start -> ArrayInitial [label=" ["];
-    Start -> ObjectInitial [label=" {"];
-
-    subgraph clusterArray {
-        margin="10,10"
-        style=filled
-        fillcolor=gray95
-        label = "Array"
-        
-        ArrayInitial; Element; ElementDelimiter; ArrayFinish;
-    }
-
-    subgraph clusterObject {
-        margin="10,10"
-        style=filled
-        fillcolor=gray95
-        label = "Object"
-
-        ObjectInitial; MemberKey; KeyValueDelimiter; MemberValue; MemberDelimiter; ObjectFinish;
-    }
-
-    ArrayInitial -> ArrayInitial [label="["];
-    ArrayInitial -> ArrayFinish [label=" ]"];
-    ArrayInitial -> ObjectInitial [label="{", constraint=false];
-    ArrayInitial -> Element [label="string\nfalse\ntrue\nnull\nnumber"];
-
-    Element -> ArrayFinish [label="]"];
-    Element -> ElementDelimiter [label=","];
-
-    ElementDelimiter -> ArrayInitial [label=" ["];
-    ElementDelimiter -> ObjectInitial [label="{"];
-    ElementDelimiter -> Element [label="string\nfalse\ntrue\nnull\nnumber"];
-
-    ObjectInitial -> ObjectFinish [label=" }"];
-    ObjectInitial -> MemberKey [label=" string "];
-
-    MemberKey -> KeyValueDelimiter [label=":"];
-
-    KeyValueDelimiter -> ArrayInitial [label="["];
-    KeyValueDelimiter -> ObjectInitial [label=" {"];
-    KeyValueDelimiter -> MemberValue [label=" string\n false\n true\n null\n number"];
-
-    MemberValue -> ObjectFinish [label="}"];
-    MemberValue -> MemberDelimiter [label=","];
-
-    MemberDelimiter -> MemberKey [label=" string "];
-
-    ArrayFinish -> Finish;
-    ObjectFinish -> Finish;
-}
diff --git a/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.png b/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.png
deleted file mode 100644
index 656f8e70331b..000000000000
Binary files a/extra/rapidjson/doc/diagram/iterative-parser-states-diagram.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/move1.dot b/extra/rapidjson/doc/diagram/move1.dot
deleted file mode 100644
index a7c1464ad06c..000000000000
--- a/extra/rapidjson/doc/diagram/move1.dot
+++ /dev/null
@@ -1,47 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		{
-			rank = same
-			b1 [label="{b:number|456}", fillcolor=6]
-			a1 [label="{a:number|123}", fillcolor=6]
-		}
-
-		a1 -> b1 [style="dashed", label="Move", dir=back]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		{
-			rank = same
-			b2 [label="{b:null|}", fillcolor=1]
-			a2 [label="{a:number|456}", fillcolor=6]
-		}
-		a2 -> b2 [style=invis, dir=back]
-	}
-	b1 -> b2 [style=invis]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/move1.png b/extra/rapidjson/doc/diagram/move1.png
deleted file mode 100644
index bf4938dfecb9..000000000000
Binary files a/extra/rapidjson/doc/diagram/move1.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/move2.dot b/extra/rapidjson/doc/diagram/move2.dot
deleted file mode 100644
index 7037ea6cbb29..000000000000
--- a/extra/rapidjson/doc/diagram/move2.dot
+++ /dev/null
@@ -1,62 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before Copying (Hypothetic)"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c1 [label="{contact:array|}", fillcolor=4]
-		c11 [label="{|}"]
-		c12 [label="{|}"]
-		c13 [shape="none", label="...", style="solid"]
-		o1 [label="{o:object|}", fillcolor=3]
-		ghost [label="{o:object|}", style=invis]
-
-		c1 -> o1 [style="dashed", label="AddMember", constraint=false]
-
-		edge [arrowhead=vee]
-		c1 -> { c11; c12; c13 }
-		o1 -> ghost [style=invis]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After Copying (Hypothetic)"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c2 [label="{contact:array|}", fillcolor=4]
-		c3 [label="{array|}", fillcolor=4]
-		c21 [label="{|}"]
-		c22 [label="{|}"]
-		c23 [shape=none, label="...", style="solid"]
-		o2 [label="{o:object|}", fillcolor=3]
-		cs [label="{string|\"contact\"}", fillcolor=5]
-		c31 [label="{|}"]
-		c32 [label="{|}"]
-		c33 [shape="none", label="...", style="solid"]
-
-		edge [arrowhead=vee]
-		c2 -> { c21; c22; c23 }
-		o2 -> cs
-		cs -> c3 [arrowhead=none]
-		c3 -> { c31; c32; c33 }
-	}
-	ghost -> o2 [style=invis]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/move2.png b/extra/rapidjson/doc/diagram/move2.png
deleted file mode 100644
index 1d1f0bf53215..000000000000
Binary files a/extra/rapidjson/doc/diagram/move2.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/move3.dot b/extra/rapidjson/doc/diagram/move3.dot
deleted file mode 100644
index c197b99df591..000000000000
--- a/extra/rapidjson/doc/diagram/move3.dot
+++ /dev/null
@@ -1,60 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	forcelabels=true
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before Moving"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c1 [label="{contact:array|}", fillcolor=4]
-		c11 [label="{|}"]
-		c12 [label="{|}"]
-		c13 [shape=none, label="...", style="solid"]
-		o1 [label="{o:object|}", fillcolor=3]
-		ghost [label="{o:object|}", style=invis]
-
-		c1 -> o1 [style="dashed", constraint=false, label="AddMember"]
-
-		edge [arrowhead=vee]
-		c1 -> { c11; c12; c13 }
-		o1 -> ghost [style=invis]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After Moving"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c2 [label="{contact:null|}", fillcolor=1]
-		c3 [label="{array|}", fillcolor=4]
-		c21 [label="{|}"]
-		c22 [label="{|}"]
-		c23 [shape="none", label="...", style="solid"]
-		o2 [label="{o:object|}", fillcolor=3]
-		cs [label="{string|\"contact\"}", fillcolor=5]
-		c2 -> o2 [style="dashed", constraint=false, label="AddMember", style=invis]
-
-		edge [arrowhead=vee]
-		c3 -> { c21; c22; c23 }
-		o2 -> cs
-		cs -> c3 [arrowhead=none]
-	}
-	ghost -> o2 [style=invis]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/move3.png b/extra/rapidjson/doc/diagram/move3.png
deleted file mode 100644
index a52ad46de7ae..000000000000
Binary files a/extra/rapidjson/doc/diagram/move3.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/normalparsing.dot b/extra/rapidjson/doc/diagram/normalparsing.dot
deleted file mode 100644
index b15941ba0fc7..000000000000
--- a/extra/rapidjson/doc/diagram/normalparsing.dot
+++ /dev/null
@@ -1,56 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		normaljson [label="\{|\"|m|s|g|\"|:|\"|H|e|l|l|o|\\|n|W|o|r|l|d|!|\"|,|\"|\\|u|0|0|7|3|t|a|r|s\"|:|1|0|\}"]
-
-		{
-			rank = same
-			msgstring  [label="m|s|g|\\0"]
-			helloworldstring  [label="H|e|l|l|o|\\n|W|o|r|l|d|!|\\0"]
-			starsstring [label="s|t|a|r|s\\0"]
-		}
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document by Normal Parsing"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			msg [label="{string|<a>}", fillcolor=5]
-			helloworld [label="{string|<a>}", fillcolor=5]
-			stars [label="{string|<a>}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-	}
-
-	normaljson -> root [label=" Parse()" lhead="cluster1"]
-	edge [arrowhead=vee]
-	root -> { msg; stars }
-
-	edge [arrowhead="none"]
-	msg  -> helloworld
-	stars -> ten
-
-	edge [arrowhead=vee, arrowtail=dot, arrowsize=0.5, dir=both, tailclip=false]
-	msg:a:c -> msgstring:w
-	helloworld:a:c -> helloworldstring:w
-	stars:a:c -> starsstring:w
-
-	msgstring -> helloworldstring -> starsstring [style=invis]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/normalparsing.png b/extra/rapidjson/doc/diagram/normalparsing.png
deleted file mode 100644
index 7e9ff7df87d1..000000000000
Binary files a/extra/rapidjson/doc/diagram/normalparsing.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/simpledom.dot b/extra/rapidjson/doc/diagram/simpledom.dot
deleted file mode 100644
index 28f017abfd43..000000000000
--- a/extra/rapidjson/doc/diagram/simpledom.dot
+++ /dev/null
@@ -1,54 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		srcjson [label="\{|p|r|o|j|e|c|t|\"|:|\"|r|a|p|i|d|j|s|o|n|\"|,|\"|s|t|a|r|s|\"|:|1|0|\}"]
-		dstjson [label="\{|p|r|o|j|e|c|t|\"|:|\"|r|a|p|i|d|j|s|o|n|\"|,|\"|s|t|a|r|s|\"|:|1|1|\}"]
-	}
-
-	{
-		node [shape="box", style="filled", fillcolor="gray95"]
-		Document2 [label="(Modified) Document"]
-		Writer
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			project [label="{string|\"project\"}", fillcolor=5]
-			rapidjson [label="{string|\"rapidjson\"}", fillcolor=5]
-			stars [label="{string|\"stars\"}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-
-		edge [arrowhead=vee]
-		root -> { project; stars }
-
-		edge [arrowhead="none"]
-		project -> rapidjson
-		stars -> ten
-	}
-
-	srcjson -> root [label=" Parse()", lhead="cluster1"]
-
-	ten -> Document2 [label=" Increase \"stars\"", ltail="cluster1" ]
-	Document2  -> Writer [label=" Traverse DOM by Accept()"]
-	Writer -> dstjson [label=" Output to StringBuffer"]
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/simpledom.png b/extra/rapidjson/doc/diagram/simpledom.png
deleted file mode 100644
index 2443eeb54531..000000000000
Binary files a/extra/rapidjson/doc/diagram/simpledom.png and /dev/null differ
diff --git a/extra/rapidjson/doc/diagram/tutorial.dot b/extra/rapidjson/doc/diagram/tutorial.dot
deleted file mode 100644
index 138ddc381d4f..000000000000
--- a/extra/rapidjson/doc/diagram/tutorial.dot
+++ /dev/null
@@ -1,58 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			hello [label="{string|\"hello\"}", fillcolor=5]
-			t [label="{string|\"t\"}", fillcolor=5]
-			f [label="{string|\"f\"}", fillcolor=5]
-			n [label="{string|\"n\"}", fillcolor=5]
-			i [label="{string|\"i\"}", fillcolor=5]
-			pi [label="{string|\"pi\"}", fillcolor=5]
-			a [label="{string|\"a\"}", fillcolor=5]
-
-			world [label="{string|\"world\"}", fillcolor=5]
-			true [label="{true|}", fillcolor=7]
-			false [label="{false|}", fillcolor=2]
-			null [label="{null|}", fillcolor=1]
-			i1 [label="{number|123}", fillcolor=6]
-			pi1 [label="{number|3.1416}", fillcolor=6]
-			array [label="{array|size=4}", fillcolor=4]
-
-			a1 [label="{number|1}", fillcolor=6]
-			a2 [label="{number|2}", fillcolor=6]
-			a3 [label="{number|3}", fillcolor=6]
-			a4 [label="{number|4}", fillcolor=6]
-		}
-
-		edge [arrowhead=vee]
-		root -> { hello; t; f; n; i; pi; a }		
-		array -> { a1; a2; a3; a4 }
-
-		edge [arrowhead=none]
-		hello -> world
-		t -> true
-		f -> false
-		n -> null
-		i -> i1
-		pi -> pi1
-		a -> array
-	}
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/diagram/tutorial.png b/extra/rapidjson/doc/diagram/tutorial.png
deleted file mode 100644
index a2b0b54761d7..000000000000
Binary files a/extra/rapidjson/doc/diagram/tutorial.png and /dev/null differ
diff --git a/extra/rapidjson/doc/dom.md b/extra/rapidjson/doc/dom.md
deleted file mode 100644
index 33a4db362814..000000000000
--- a/extra/rapidjson/doc/dom.md
+++ /dev/null
@@ -1,272 +0,0 @@
-# DOM
-
-Document Object Model(DOM) is an in-memory representation of JSON for query and manipulation. The basic usage of DOM is described in [Tutorial](doc/tutorial.md). This section will describe some details and more advanced usages.
-
-[TOC]
-
-# Template {#Template}
-
-In the tutorial,  `Value` and `Document` was used. Similarly to `std::string`, these are actually `typedef` of template classes:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericValue {
-    // ...
-};
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-    // ...
-};
-
-typedef GenericValue<UTF8<> > Value;
-typedef GenericDocument<UTF8<> > Document;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-User can customize these template parameters.
-
-## Encoding {#Encoding}
-
-The `Encoding` parameter specifies the encoding of JSON String value in memory. Possible options are `UTF8`, `UTF16`, `UTF32`. Note that, these 3 types are also template class. `UTF8<>` is `UTF8<char>`, which means using char to store the characters. You may refer to [Encoding](doc/encoding.md) for details.
-
-Suppose a Windows application would query localization strings stored in JSON files. Unicode-enabled functions in Windows use UTF-16 (wide character) encoding. No matter what encoding was used in JSON files, we can store the strings in UTF-16 in memory.
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-
-FILE* fp = fopen("localization.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // wraps bis into eis
-
-WDocument d;
-d.ParseStream<0, AutoUTF<unsigned> >(eis);
-
-const WValue locale(L"ja"); // Japanese
-
-MessageBoxW(hWnd, d[locale].GetString(), L"Test", MB_OK);
-~~~~~~~~~~
-
-## Allocator {#Allocator}
-
-The `Allocator` defines which allocator class is used when allocating/deallocating memory for `Document`/`Value`. `Document` owns, or references to an `Allocator` instance. On the other hand, `Value` does not do so, in order to reduce memory consumption.
-
-The default allocator used in `GenericDocument` is `MemoryPoolAllocator`. This allocator actually allocate memory sequentially, and cannot deallocate one by one. This is very suitable when parsing a JSON to generate a DOM tree.
-
-Another allocator is `CrtAllocator`, of which CRT is short for C RunTime library. This allocator simply calls the standard `malloc()`/`realloc()`/`free()`. When there is a lot of add and remove operations, this allocator may be preferred. But this allocator is far less efficient than `MemoryPoolAllocator`.
-
-# Parsing {#Parsing}
-
-`Document` provides several functions for parsing. In below, (1) is the fundamental function, while the others are helpers which call (1).
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-// (1) Fundamental
-template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (2) Using the same Encoding for stream
-template <unsigned parseFlags, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (3) Using default parse flags
-template <typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (4) In situ parsing
-template <unsigned parseFlags, typename SourceEncoding>
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (5) In situ parsing, using same Encoding for stream
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (6) In situ parsing, using default parse flags
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (7) Normal parsing of a string
-template <unsigned parseFlags, typename SourceEncoding>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (8) Normal parsing of a string, using same Encoding for stream
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (9) Normal parsing of a string, using default parse flags
-GenericDocument& GenericDocument::Parse(const Ch* str);
-~~~~~~~~~~
-
-The examples of [tutorial](doc/tutorial.md) uses (9) for normal parsing of string. The examples of [stream](doc/stream.md) uses the first three. *In situ* parsing will be described soon.
-
-The `parseFlags` are combination of the following bit-flags:
-
-Parse flags                   | Meaning
-------------------------------|-----------------------------------
-`kParseNoFlags`               | No flag is set.
-`kParseDefaultFlags`          | Default parse flags. It is equal to macro `RAPIDJSON_PARSE_DEFAULT_FLAGS`, which is defined as `kParseNoFlags`.
-`kParseInsituFlag`            | In-situ(destructive) parsing.
-`kParseValidateEncodingFlag`  | Validate encoding of JSON strings.
-`kParseIterativeFlag`         | Iterative(constant complexity in terms of function call stack size) parsing.
-`kParseStopWhenDoneFlag`      | After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate `kParseErrorDocumentRootNotSingular` error. Using this flag for parsing multiple JSONs in the same stream.
-`kParseFullPrecisionFlag`     | Parse number in full precision (slower). If this flag is not set, the normal precision (faster) is used. Normal precision has maximum 3 [ULP](http://en.wikipedia.org/wiki/Unit_in_the_last_place) error.
-
-By using a non-type template parameter, instead of a function parameter, C++ compiler can generate code which is optimized for specified combinations, improving speed, and reducing code size (if only using a single specialization). The downside is the flags needed to be determined in compile-time.
-
-The `SourceEncoding` parameter defines what encoding is in the stream. This can be differed to the `Encoding` of the `Document`. See [Transcoding and Validation](#TranscodingAndValidation) section for details.
-
-And the `InputStream` is type of input stream.
-
-## Parse Error {#ParseError}
-
-When the parse processing succeeded, the `Document` contains the parse results. When there is an error, the original DOM is *unchanged*. And the error state of parsing can be obtained by `bool HasParseError()`,  `ParseErrorCode GetParseError()` and `size_t GetParseOffet()`.
-
-Parse Error Code                            | Description
---------------------------------------------|---------------------------------------------------
-`kParseErrorNone`                           | No error.
-`kParseErrorDocumentEmpty`                  | The document is empty.
-`kParseErrorDocumentRootNotSingular`        | The document root must not follow by other values.
-`kParseErrorValueInvalid`                   | Invalid value.
-`kParseErrorObjectMissName`                 | Missing a name for object member.
-`kParseErrorObjectMissColon`                | Missing a colon after a name of object member.
-`kParseErrorObjectMissCommaOrCurlyBracket`  | Missing a comma or `}` after an object member.
-`kParseErrorArrayMissCommaOrSquareBracket`  | Missing a comma or `]` after an array element.
-`kParseErrorStringUnicodeEscapeInvalidHex`  | Incorrect hex digit after `\\u` escape in string.
-`kParseErrorStringUnicodeSurrogateInvalid`  | The surrogate pair in string is invalid.
-`kParseErrorStringEscapeInvalid`            | Invalid escape character in string.
-`kParseErrorStringMissQuotationMark`        | Missing a closing quotation mark in string.
-`kParseErrorStringInvalidEncoding`          | Invalid encoding in string.
-`kParseErrorNumberTooBig`                   | Number too big to be stored in `double`.
-`kParseErrorNumberMissFraction`             | Miss fraction part in number.
-`kParseErrorNumberMissExponent`             | Miss exponent in number.
-
-The offset of error is defined as the character number from beginning of stream. Currently RapidJSON does not keep track of line number.
-
-To get an error message, RapidJSON provided a English messages in `rapidjson/error/en.h`. User can customize it for other locales, or use a custom localization system.
-
-Here shows an example of parse error handling.
-
-~~~~~~~~~~cpp
-// TODO: example
-~~~~~~~~~~
-
-## In Situ Parsing {#InSituParsing}
-
-From [Wikipedia](http://en.wikipedia.org/wiki/In_situ):
-
-> *In situ* ... is a Latin phrase that translates literally to "on site" or "in position". It means "locally", "on site", "on the premises" or "in place" to describe an event where it takes place, and is used in many different contexts.
-> ...
-> (In computer science) An algorithm is said to be an in situ algorithm, or in-place algorithm, if the extra amount of memory required to execute the algorithm is O(1), that is, does not exceed a constant no matter how large the input. For example, heapsort is an in situ sorting algorithm.
-
-In normal parsing process, a large overhead is to decode JSON strings and copy them to other buffers. *In situ* parsing decodes those JSON string at the place where it is stored. It is possible in JSON because the decoded string is always shorter than the one in JSON. In this context, decoding a JSON string means to process the escapes, such as `"\n"`, `"\u1234"`, etc., and add a null terminator (`'\0'`)at the end of string.
-
-The following diagrams compare normal and *in situ* parsing. The JSON string values contain pointers to the decoded string.
-
-![normal parsing](diagram/normalparsing.png)
-
-In normal parsing, the decoded string are copied to freshly allocated buffers. `"\\n"` (2 characters) is decoded as `"\n"` (1 character). `"\\u0073"` (6 characters) is decoded as "s" (1 character).
-
-![instiu parsing](diagram/insituparsing.png)
-
-*In situ* parsing just modified the original JSON. Updated characters are highlighted in the diagram. If the JSON string does not contain escape character, such as `"msg"`, the parsing process merely replace the closing double quotation mark with a null character.
-
-Since *in situ* parsing modify the input, the parsing API needs `char*` instead of `const char*`.
-
-~~~~~~~~~~cpp
-// Read whole file into a buffer
-FILE* fp = fopen("test.json", "r");
-fseek(fp, 0, SEEK_END);
-size_t filesize = (size_t)ftell(fp);
-fseek(fp, 0, SEEK_SET);
-char* buffer = (char*)malloc(filesize + 1);
-size_t readLength = fread(buffer, 1, filesize, fp);
-buffer[readLength] = '\0';
-fclose(fp);
-
-// In situ parsing the buffer into d, buffer will also be modified
-Document d;
-d.ParseInsitu(buffer);
-
-// Query/manipulate the DOM here...
-
-free(buffer);
-// Note: At this point, d may have dangling pointers pointed to the deallocated buffer.
-~~~~~~~~~~
-
-The JSON strings are marked as constant-string. But they may not be really "constant". The life cycle of it depends on the JSON buffer.
-
-In situ parsing minimizes allocation overheads and memory copying. Generally this improves cache coherence, which is an important factor of performance in modern computer.
-
-There are some limitations of *in situ* parsing:
-
-1. The whole JSON is in memory.
-2. The source encoding in stream and target encoding in document must be the same.
-3. The buffer need to be retained until the document is no longer used.
-4. If the DOM need to be used for long period after parsing, and there are few JSON strings in the DOM, retaining the buffer may be a memory waste.
-
-*In situ* parsing is mostly suitable for short-term JSON that only need to be processed once, and then be released from memory. In practice, these situation is very common, for example, deserializing JSON to C++ objects, processing web requests represented in JSON, etc.
-
-## Transcoding and Validation {#TranscodingAndValidation}
-
-RapidJSON supports conversion between Unicode formats (officially termed UCS Transformation Format) internally. During DOM parsing, the source encoding of the stream can be different from the encoding of the DOM. For example, the source stream contains a UTF-8 JSON, while the DOM is using UTF-16 encoding. There is an example code in [EncodedInputStream](doc/stream.md#EncodedInputStream).
-
-When writing a JSON from DOM to output stream, transcoding can also be used. An example is in [EncodedOutputStream](stream.md##EncodedOutputStream).
-
-During transcoding, the source string is decoded to into Unicode code points, and then the code points are encoded in the target format. During decoding, it will validate the byte sequence in the source string. If it is not a valid sequence, the parser will be stopped with `kParseErrorStringInvalidEncoding` error.
-
-When the source encoding of stream is the same as encoding of DOM, by default, the parser will *not* validate the sequence. User may use `kParseValidateEncodingFlag` to force validation.
-
-# Techniques {#Techniques}
-
-Some techniques about using DOM API is discussed here.
-
-## DOM as SAX Event Publisher
-
-In RapidJSON, stringifying a DOM with `Writer` may be look a little bit weired.
-
-~~~~~~~~~~cpp
-// ...
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-~~~~~~~~~~
-
-Actually, `Value::Accept()` is responsible for publishing SAX events about the value to the handler. With this design, `Value` and `Writer` are decoupled. `Value` can generate SAX events, and `Writer` can handle those events.
-
-User may create customer handlers for transforming the DOM into other formats. For example, a handler which converts the DOM into XML.
-
-~~~~~~~~~~cpp
-// TODO: example
-~~~~~~~~~~
-
-For more about SAX events and handler, please refer to [SAX](doc/sax.md).
-
-## User Buffer {#UserBuffer}
-
-Some applications may try to avoid memory allocations whenever possible.
-
-`MemoryPoolAllocator` can support this by letting user to provide a buffer. The buffer can be on the program stack, or a "scratch buffer" which is statically allocated (a static/global array) for storing temporary data.
-
-`MemoryPoolAllocator` will use the user buffer to satisfy allocations. When the user buffer is used up, it will allocate a chunk of memory from the base allocator (by default the `CrtAllocator`).
-
-Here is an example of using stack memory.
-
-~~~~~~~~~~cpp
-char buffer[1024];
-MemoryPoolAllocator allocator(buffer, sizeof(buffer));
-
-Document d(&allocator);
-d.Parse(json);
-~~~~~~~~~~
-
-If the total size of allocation is less than 1024 during parsing, this code does not invoke any heap allocation (via `new` or `malloc()`) at all.
-
-User can query the current memory consumption in bytes via `MemoryPoolAllocator::Size()`. And then user can determine a suitable size of user buffer.
diff --git a/extra/rapidjson/doc/encoding.md b/extra/rapidjson/doc/encoding.md
deleted file mode 100644
index 4d7ca7bc5bc1..000000000000
--- a/extra/rapidjson/doc/encoding.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Encoding
-
-According to [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf),
-
-> (in Introduction) JSON text is a sequence of Unicode code points.
-
-The earlier [RFC4627](http://www.ietf.org/rfc/rfc4627.txt) stated that,
-
-> (in §3) JSON text SHALL be encoded in Unicode.  The default encoding is UTF-8.
-
-> (in §6) JSON may be represented using UTF-8, UTF-16, or UTF-32. When JSON is written in UTF-8, JSON is 8bit compatible.  When JSON is written in UTF-16 or UTF-32, the binary content-transfer-encoding must be used.
-
-RapidJSON supports various encodings. It can also validate the encodings of JSON, and transconding JSON among encodings. All these features are implemented internally, without the need for external libraries (e.g. [ICU](http://site.icu-project.org/)).
-
-[TOC]
-
-# Unicode {#Unicode}
-From [Unicode's official website](http://www.unicode.org/standard/WhatIsUnicode.html):
-> Unicode provides a unique number for every character, 
-> no matter what the platform,
-> no matter what the program,
-> no matter what the language.
-
-Those unique numbers are called code points, which is in the range `0x0` to `0x10FFFF`.
-
-## Unicode Transformation Format {#UTF}
-
-There are various encodings for storing Unicode code points. These are called Unicode Transformation Format (UTF). RapidJSON supports the most commonly used UTFs, including
-
-* UTF-8: 8-bit variable-width encoding. It maps a code point to 1–4 bytes.
-* UTF-16: 16-bit variable-width encoding. It maps a code point to 1–2 16-bit code units (i.e., 2–4 bytes).
-* UTF-32: 32-bit fixed-width encoding. It directly maps a code point to a single 32-bit code unit (i.e. 4 bytes).
-
-For UTF-16 and UTF-32, the byte order (endianness) does matter. Within computer memory, they are often stored in the computer's endianness. However, when it is stored in file or transferred over network, we need to state the byte order of the byte sequence, either little-endian (LE) or big-endian (BE). 
-
-RapidJSON provide these encodings via the structs in `rapidjson/encodings.h`:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename CharType = char>
-struct UTF8;
-
-template<typename CharType = wchar_t>
-struct UTF16;
-
-template<typename CharType = wchar_t>
-struct UTF16LE;
-
-template<typename CharType = wchar_t>
-struct UTF16BE;
-
-template<typename CharType = unsigned>
-struct UTF32;
-
-template<typename CharType = unsigned>
-struct UTF32LE;
-
-template<typename CharType = unsigned>
-struct UTF32BE;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-For processing text in memory, we normally use `UTF8`, `UTF16` or `UTF32`. For processing text via I/O, we may use `UTF8`, `UTF16LE`, `UTF16BE`, `UTF32LE` or `UTF32BE`.
-
-When using the DOM-style API, the `Encoding` template parameter in `GenericValue<Encoding>` and `GenericDocument<Encoding>` indicates the encoding to be used to represent JSON string in memory. So normally we will use `UTF8`, `UTF16` or `UTF32` for this template parameter. The choice depends on operating systems and other libraries that the application is using. For example, Windows API represents Unicode characters in UTF-16, while most Linux distributions and applications prefer UTF-8.
-
-Example of UTF-16 DOM declaration:
-
-~~~~~~~~~~cpp
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-~~~~~~~~~~
-
-For a detail example, please check the example in [DOM's Encoding](doc/stream.md#Encoding) section.
-
-## Character Type {#CharacterType}
-
-As shown in the declaration, each encoding has a `CharType` template parameter. Actually, it may be a little bit confusing, but each `CharType` stores a code unit, not a character (code point). As mentioned in previous section, a code point may be encoded to 1–4 code units for UTF-8.
-
-For `UTF16(LE|BE)`, `UTF32(LE|BE)`, the `CharType` must be integer type of at least 2 and 4 bytes  respectively.
-
-Note that C++11 introduces `char16_t` and `char32_t`, which can be used for `UTF16` and `UTF32` respectively.
-
-## AutoUTF {#AutoUTF}
-
-Previous encodings are statically bound in compile-time. In other words, user must know exactly which encodings will be used in the memory or streams. However, sometimes we may need to read/write files of different encodings. The encoding needed to be decided in runtime.
-
-`AutoUTF` is an encoding designed for this purpose. It chooses which encoding to be used according to the input or output stream. Currently, it should be used with `EncodedInputStream` and `EncodedOutputStream`.
-
-## ASCII {#ASCII}
-
-Although the JSON standards did not mention about [ASCII](http://en.wikipedia.org/wiki/ASCII), sometimes we would like to write 7-bit ASCII JSON for applications that cannot handle UTF-8. Since any JSON can represent unicode characters in escaped sequence `\uXXXX`, JSON can always be encoded in ASCII.
-
-Here is an example for writing a UTF-8 DOM into ASCII:
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-Document d; // UTF8<>
-// ...
-StringBuffer buffer;
-Writer<StringBuffer, Document::EncodingType, ASCII<> > writer(buffer);
-d.Accept(writer);
-std::cout << buffer.GetString();
-~~~~~~~~~~
-
-ASCII can be used in input stream. If the input stream contains bytes with values above 127, it will cause `kParseErrorStringInvalidEncoding` error.
-
-ASCII *cannot* be used in memory (encoding of `Document` or target encoding of `Reader`), as it cannot represent Unicode code points.
-
-# Validation & Transcoding {#ValidationTranscoding}
-
-When RapidJSON parses a JSON, it can validate the input JSON, whether it is a valid sequence of a specified encoding. This option can be turned on by adding `kParseValidateEncodingFlag` in `parseFlags` template parameter.
-
-If the input encoding and output encoding is different, `Reader` and `Writer` will automatically transcode (convert) the text. In this case, `kParseValidateEncodingFlag` is not necessary, as it must decode the input sequence. And if the sequence was unable to be decoded, it must be invalid.
-
-## Transcoder {#Transcoder}
-
-Although the encoding functions in RapidJSON are designed for JSON parsing/generation, user may abuse them for transcoding of non-JSON strings.
-
-Here is an example for transcoding a string from UTF-8 to UTF-16:
-
-~~~~~~~~~~cpp
-#include "rapidjson/encodings.h"
-
-using namespace rapidjson;
-
-const char* s = "..."; // UTF-8 string
-StringStream source(s);
-GenericStringBuffer<UTF16<> > target;
-
-bool hasError = false;
-while (source.Peak() != '\0')
-    if (!Transcoder::Transcode<UTF8<>, UTF16<> >(source, target)) {
-        hasError = true;
-        break;
-    }
-
-if (!hasError) {
-    const wchar_t* t = target.GetString();
-    // ...
-}
-~~~~~~~~~~
-
-You may also use `AutoUTF` and the associated streams for setting source/target encoding in runtime.
diff --git a/extra/rapidjson/doc/faq.md b/extra/rapidjson/doc/faq.md
deleted file mode 100644
index d18705591603..000000000000
--- a/extra/rapidjson/doc/faq.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# FAQ
-
-## General
-
-1. What is RapidJSON?
-
-   RapidJSON is a C++ library for parsing and generating JSON. You may check all [features](doc/features.md) of it.
-
-2. Why is RapidJSON named so?
-
-   It is inspired by [RapidXML](http://rapidxml.sourceforge.net/), which is a fast XML DOM parser.
-
-3. Is RapidJSON similar to RapidXML?
-
-   RapidJSON borrowed some designs of RapidXML, including *in situ* parsing, header-only library. But the two APIs are completely different. Also RapidJSON provide many features that are not in RapidXML.
-
-4. Is RapidJSON free?
-
-   Yes, it is free under MIT license. It can be used in commercial applications. Please check the details in [license.txt](https://github.com/miloyip/rapidjson/blob/master/license.txt).
-
-5. Is RapidJSON small? What are its dependencies? 
-
-   Yes. A simple executable which parses a JSON and prints its statistics is less than 30KB on Windows.
-
-   RapidJSON depends on C++ standard library only.
-
-6. How to install RapidJSON?
-
-   Check [Installation section](http://miloyip.github.io/rapidjson/).
-
-7. Can RapidJSON run on my platform?
-
-   RapidJSON has been tested in many combinations of operating systems, compilers and CPU architecture by the community. But we cannot ensure that it can be run on your particular platform. Building and running the unit test suite will give you the answer.
-
-8. Does RapidJSON support C++03? C++11?
-
-   RapidJSON was firstly implemented for C++03. Later it added optional support of some C++11 features (e.g., move constructor, `noexcept`). RapidJSON shall be compatible with C++03 or C++11 compliant compilers.
-
-9. Does RapidJSON really work in real applications?
-
-   Yes. It is deployed in both client and server real applications. A community member reported that RapidJSON in their system parses 50 million JSONs daily.
-
-10. How RapidJSON is tested?
-
-   RapidJSON contains a unit test suite for automatic testing. [Travis](https://travis-ci.org/miloyip/rapidjson/) will compile and run the unit test suite for all modifications. The test process also uses Valgrind to detect memory leaks.
-
-11. Is RapidJSON well documented?
-
-   RapidJSON provides [user guide and API documentationn](http://miloyip.github.io/rapidjson/index.html).
-
-12. Are there alternatives?
-
-   Yes, there are a lot alternatives. For example, [nativejson-benchmark](https://github.com/miloyip/nativejson-benchmark) has a listing of open-source C/C++ JSON libraries. [json.org](http://www.json.org/) also has a list.
-
-## JSON
-
-1. What is JSON?
-
-   JSON (JavaScript Object Notation) is a lightweight data-interchange format. It uses human readable text format. More details of JSON can be referred to [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) and [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm).
-
-2. What are applications of JSON?
-
-   JSON are commonly used in web applications for transferring structured data. It is also used as a file format for data persistence.
-
-2. Does RapidJSON conform to the JSON standard?
-
-   Yes. RapidJSON is fully compliance with [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) and [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm). It can handle corner cases, such as supporting null character and surrogate pairs in JSON strings.
-
-3. Does RapidJSON support relaxed syntax?
-
-   Currently no. RapidJSON only support the strict standardized format. Support on related syntax is under discussion in this [issue](https://github.com/miloyip/rapidjson/issues/36).
-
-## DOM and SAX
-
-1. What is DOM style API?
-
-   Document Object Model (DOM) is an in-memory representation of JSON for query and manipulation.
-
-2. What is SAX style API?
-
-   SAX is an event-driven API for parsing and generation.
-
-3. Should I choose DOM or SAX?
-
-   DOM is easy for query and manipulation. SAX is very fast and memory-saving but often more difficult to be applied.
-
-4. What is *in situ* parsing?
-
-   *in situ* parsing decodes the JSON strings directly into the input JSON. This is an optimization which can reduce memory consumption and improve performance, but the input JSON will be modified. Check [in-situ parsing](http://miloyip.github.io/rapidjson/md_doc_dom.html#InSituParsing) for details.
-
-5. When does parsing generate an error?
-
-   The parser generates an error when the input JSON contains invalid syntax, or a value can not be represented (a number is too big), or the handler of parsers terminate the parsing. Check [parse error](http://miloyip.github.io/rapidjson/md_doc_dom.html#ParseError) for details.
-
-6. What error information is provided? 
-
-   The error is stored in `ParseResult`, which includes the error code and offset (number of characters from the beginning of JSON). The error code can be translated into human-readable error message.
-
-7. Why not just using `double` to represent JSON number?
-
-   Some applications use 64-bit unsigned/signed integers. And these integers cannot be converted into `double` without loss of precision. So the parsers detects whether a JSON number is convertible to different types of integers and/or `double`.
-
-## Document/Value (DOM)
-
-1. What is move semantics? Why?
-2. How to copy a value?
-3. Why do I need to provide the length of string?
-4. Why do I need to provide allocator in many DOM manipulation API?
-5. Does it convert between numerical types?
-
-## Reader/Writer (SAX)
-
-1. Why not just `printf` a JSON? Why need a `Writer`? 
-2. Why can't I parse a JSON which is just a number?
-3. Can I pause the parsing process and resume it later?
-
-## Unicode
-
-1. Does it support UTF-8, UTF-16 and other format?
-2. Can it validate the encoding?
-3. What is surrogate pair? Does RapidJSON support it?
-4. Can it handle '\u0000' (null character) in JSON string?
-5. Can I output '\uxxxx' for all non-ASCII character?
-
-## Stream
-
-1. I have a big JSON file. Should I load the whole file to memory?
-2. Can I parse JSON while it is streamed from network?
-3. I don't know what format will the JSON be. How to handle them?
-4. What is BOM? How RapidJSON handle it?
-5. Why little/big endian is related?
-
-## Performance
-
-1. Is RapidJSON really fast?
-2. Why is it fast?
-3. What is SIMD? How it is applied in RapidJSON?
-4. Does it consume a lot of memory?
-5. What is the purpose of being high performance?
-
-## Gossip
-
-1. Who are the developers of RapidJSON?
-2. Why do you develop RapidJSON?
-3. Why there is a long empty period of development?
-4. Why did the repository move from Google Code to GitHub?
diff --git a/extra/rapidjson/doc/features.md b/extra/rapidjson/doc/features.md
deleted file mode 100644
index 15de2597293a..000000000000
--- a/extra/rapidjson/doc/features.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Features
-
-## General
-
-* Cross-platform
- * Compilers: Visual Studio, gcc, clang, etc.
- * Architectures: x86, x64, ARM, etc.
- * Operating systems: Windows, Mac OS X, Linux, iOS, Android, etc.
-* Easy installation
- * Header files only library. Just copy the headers to your project.
-* Self-contained, minimal dependences
- * No STL, BOOST, etc.
- * Only included `<cstdio>`, `<cstdlib>`, `<cstring>`, `<inttypes.h>`, `<new>`, `<stdint.h>`. 
-* Without C++ exception, RTTI
-* High performance
- * Use template and inline functions to reduce function call overheads.
- * Internal optimized Grisu2 and floating point parsing implementations.
- * Optional SSE2/SSE4.1 support.
-
-## Standard compliance
-
-* RapidJSON should be fully RFC4627/ECMA-404 compliance.
-* Support Unicode surrogate.
-* Support null character (`"\u0000"`)
- * For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
-
-## Unicode
-
-* Support UTF-8, UTF-16, UTF-32 encodings, including little endian and big endian.
- * These encodings are used in input/output streams and in-memory representation.
-* Support automatic detection of encodings in input stream.
-* Support transcoding between encodings internally.
- * For example, you can read a UTF-8 file and let RapidJSON transcode the JSON strings into UTF-16 in the DOM.
-* Support encoding validation internally.
- * For example, you can read a UTF-8 file, and let RapidJSON check whether all JSON strings are valid UTF-8 byte sequence.
-* Support custom character types.
- * By default the character types are `char` for UTF8, `wchar_t` for UTF16, `uint32_t` for UTF32.
-* Support custom encodings.
-
-## API styles
-
-* SAX (Simple API for XML) style API
- * Similar to [SAX](http://en.wikipedia.org/wiki/Simple_API_for_XML), RapidJSON provides a event sequential access parser API (`rapidjson::GenericReader`). It also provides a generator API (`rapidjson::Writer`) which consumes the same set of events.
-* DOM (Document Object Model) style API
- * Similar to [DOM](http://en.wikipedia.org/wiki/Document_Object_Model) for HTML/XML, RapidJSON can parse JSON into a DOM representation (`rapidjson::GenericDocument`), for easy manipulation, and finally stringify back to JSON if needed.
- * The DOM style API (`rapidjson::GenericDocument`) is actually implemented with SAX style API (`rapidjson::GenericReader`). SAX is faster but sometimes DOM is easier. Users can pick their choices according to scenarios.
-
-## Parsing
-
-* Recursive (default) and iterative parser
- * Recursive parser is faster but prone to stack overflow in extreme cases.
- * Iterative parser use custom stack to keep parsing state.
-* Support *in situ* parsing.
- * Parse JSON string values in-place at the source JSON, and then the DOM points to addresses of those strings.
- * Faster than convention parsing: no allocation for strings, no copy (if string does not contain escapes), cache-friendly.
-* Support 32-bit/64-bit signed/unsigned integer and `double` for JSON number type.
-* Support parsing multiple JSONs in input stream (`kParseStopWhenDoneFlag`).
-* Error Handling
- * Support comprehensive error code if parsing failed.
- * Support error message localization.
-
-## DOM (Document)
-
-* RapidJSON checks range of numerical values for conversions.
-* Optimization for string literal
- * Only store pointer instead of copying
-* Optimization for "short" strings
- * Store short string in `Value` internally without additional allocation.
- * For UTF-8 string: maximum 11 characters in 32-bit, 15 characters in 64-bit.
-* Optionally support `std::string` (define `RAPIDJSON_HAS_STDSTRING=1`)
-
-## Generation
-
-* Support `rapidjson::PrettyWriter` for adding newlines and indentations.
-
-## Stream
-
-* Support `rapidjson::GenericStringBuffer` for storing the output JSON as string.
-* Support `rapidjson::FileReadStream` and `rapidjson::FileWriteStream` for input/output `FILE` object.
-* Support custom streams.
-
-## Memory
-
-* Minimize memory overheads for DOM.
- * Each JSON value occupies exactly 16/20 bytes for most 32/64-bit machines (excluding text string).
-* Support fast default allocator.
- * A stack-based allocator (allocate sequentially, prohibit to free individual allocations, suitable for parsing).
- * User can provide a pre-allocated buffer. (Possible to parse a number of JSONs without any CRT allocation)
-* Support standard CRT(C-runtime) allocator.
-* Support custom allocators.
-
-## Miscellaneous
-
-* Some C++11 support (optional)
- * Rvalue reference
- * `noexcept` specifier
diff --git a/extra/rapidjson/doc/internals.md b/extra/rapidjson/doc/internals.md
deleted file mode 100644
index da60825cbd38..000000000000
--- a/extra/rapidjson/doc/internals.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Internals
-
-This section records some design and implementation details.
-
-[TOC]
-
-# Value {#Value}
-
-## Data Layout {#DataLayout}
-
-## Flags {#Flags}
-
-# Allocator {#Allocator}
-
-## MemoryPoolAllocator {#MemoryPoolAllocator}
-
-# Parsing Optimization {#ParsingOptimization}
-
-## Skip Whitespace with SIMD {#SkipwhitespaceWithSIMD}
-
-## Pow10() {#Pow10}
-
-## Local Stream Copy {#LocalStreamCopy}
-
-# Parser {#Parser}
-
-## Iterative Parser {#IterativeParser}
-
-The iterative parser is a recursive descent LL(1) parser
-implemented in a non-recursive manner.
-
-### Grammar {#IterativeParserGrammar}
-
-The grammar used for this parser is based on strict JSON syntax:
-~~~~~~~~~~
-S -> array | object
-array -> [ values ]
-object -> { members }
-values -> non-empty-values | ε
-non-empty-values -> value addition-values
-addition-values -> ε | , non-empty-values
-members -> non-empty-members | ε
-non-empty-members -> member addition-members
-addition-members -> ε | , non-empty-members
-member -> STRING : value
-value -> STRING | NUMBER | NULL | BOOLEAN | object | array
-~~~~~~~~~~
-
-Note that left factoring is applied to non-terminals `values` and `members`
-to make the grammar be LL(1).
-
-### Parsing Table {#IterativeParserParsingTable}
-
-Based on the grammar, we can construct the FIRST and FOLLOW set.
-
-The FIRST set of non-terminals is listed below:
-
-|    NON-TERMINAL   |               FIRST              |
-|:-----------------:|:--------------------------------:|
-|       array       |                 [                |
-|       object      |                 {                |
-|       values      | ε STRING NUMBER NULL BOOLEAN { [ |
-|  addition-values  |              ε COMMA             |
-|      members      |             ε STRING             |
-|  addition-members |              ε COMMA             |
-|       member      |              STRING              |
-|       value       |  STRING NUMBER NULL BOOLEAN { [  |
-|         S         |                [ {               |
-| non-empty-members |              STRING              |
-|  non-empty-values |  STRING NUMBER NULL BOOLEAN { [  |
-
-The FOLLOW set is listed below:
-
-|    NON-TERMINAL   |  FOLLOW |
-|:-----------------:|:-------:|
-|         S         |    $    |
-|       array       | , $ } ] |
-|       object      | , $ } ] |
-|       values      |    ]    |
-|  non-empty-values |    ]    |
-|  addition-values  |    ]    |
-|      members      |    }    |
-| non-empty-members |    }    |
-|  addition-members |    }    |
-|       member      |   , }   |
-|       value       |  , } ]  |
-
-Finally the parsing table can be constructed from FIRST and FOLLOW set:
-
-|    NON-TERMINAL   |           [           |           {           |          ,          | : | ] | } |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-|:-----------------:|:---------------------:|:---------------------:|:-------------------:|:-:|:-:|:-:|:-----------------------:|:---------------------:|:---------------------:|:---------------------:|
-|         S         |         array         |         object        |                     |   |   |   |                         |                       |                       |                       |
-|       array       |       [ values ]      |                       |                     |   |   |   |                         |                       |                       |                       |
-|       object      |                       |      { members }      |                     |   |   |   |                         |                       |                       |                       |
-|       values      |    non-empty-values   |    non-empty-values   |                     |   | ε |   |     non-empty-values    |    non-empty-values   |    non-empty-values   |    non-empty-values   |
-|  non-empty-values | value addition-values | value addition-values |                     |   |   |   |  value addition-values  | value addition-values | value addition-values | value addition-values |
-|  addition-values  |                       |                       |  , non-empty-values |   | ε |   |                         |                       |                       |                       |
-|      members      |                       |                       |                     |   |   | ε |    non-empty-members    |                       |                       |                       |
-| non-empty-members |                       |                       |                     |   |   |   | member addition-members |                       |                       |                       |
-|  addition-members |                       |                       | , non-empty-members |   |   | ε |                         |                       |                       |                       |
-|       member      |                       |                       |                     |   |   |   |      STRING : value     |                       |                       |                       |
-|       value       |         array         |         object        |                     |   |   |   |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-
-There is a great [tool](http://hackingoff.com/compilers/predict-first-follow-set) for above grammar analysis.
-
-### Implementation {#IterativeParserImplementation}
-
-Based on the parsing table, a direct(or conventional) implementation
-that pushes the production body in reverse order
-while generating a production could work.
-
-In RapidJSON, several modifications(or adaptations to current design) are made to a direct implementation.
-
-First, the parsing table is encoded in a state machine in RapidJSON.
-States are constructed by the head and body of production.
-State transitions are constructed by production rules.
-Besides, extra states are added for productions involved with `array` and `object`.
-In this way the generation of array values or object members would be a single state transition,
-rather than several pop/push operations in the direct implementation.
-This also makes the estimation of stack size more easier.
-
-The state diagram is shown as follows:
-
-![State Diagram](diagram/iterative-parser-states-diagram.png)
-
-Second, the iterative parser also keeps track of array's value count and object's member count
-in its internal stack, which may be different from a conventional implementation.
diff --git a/extra/rapidjson/doc/logo/rapidjson.png b/extra/rapidjson/doc/logo/rapidjson.png
deleted file mode 100644
index b3b2f80ccb9c..000000000000
Binary files a/extra/rapidjson/doc/logo/rapidjson.png and /dev/null differ
diff --git a/extra/rapidjson/doc/logo/rapidjson.svg b/extra/rapidjson/doc/logo/rapidjson.svg
deleted file mode 100644
index 9708d5a06f33..000000000000
--- a/extra/rapidjson/doc/logo/rapidjson.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="217.15039"
-   height="60.831055"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rapidjson.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3801">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3803" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3805" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3807"
-       x1="81.25"
-       y1="52.737183"
-       x2="122.25"
-       y2="52.737183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2378503,0,0,1.1662045,-226.99279,64.427324)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3935"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4768835,0,0,2.2904698,246.48785,81.630301)"
-       x1="81.25"
-       y1="52.737183"
-       x2="115.96579"
-       y2="48.439766" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2378503,0,0,1.1662045,-226.99279,-10.072676)"
-       x1="81.25"
-       y1="52.737183"
-       x2="122.25"
-       y2="52.737183" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="207.8959"
-     inkscape:cy="-3.2283687"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     fit-margin-top="10"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-39.132812,-38.772339)">
-    <text
-       sodipodi:linespacing="125%"
-       id="text3939"
-       y="79.862183"
-       x="147.5"
-       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Microsoft JhengHei;-inkscape-font-specification:Microsoft JhengHei"
-       xml:space="preserve"><tspan
-         style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata"
-         y="79.862183"
-         x="147.5"
-         id="tspan3941"
-         sodipodi:role="line"><tspan
-           id="tspan3943"
-           style="font-size:42px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Segoe UI;-inkscape-font-specification:Segoe UI Oblique">Rapid</tspan><tspan
-           id="tspan3945"
-           style="font-weight:bold;-inkscape-font-specification:Inconsolata Bold">JSON</tspan></tspan></text>
-  </g>
-</svg>
diff --git a/extra/rapidjson/doc/misc/DoxygenLayout.xml b/extra/rapidjson/doc/misc/DoxygenLayout.xml
deleted file mode 100644
index b7c958665b43..000000000000
--- a/extra/rapidjson/doc/misc/DoxygenLayout.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.7 -->
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
-    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
-      <tab type="hierarchy" visible="yes" title="" intro=""/>
-      <tab type="classmembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="yes" title="" intro=""/>  
-  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <services title=""/>
-      <interfaces title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <services title=""/>
-      <interfaces title=""/>
-      <constructors title=""/>
-      <functions title=""/>
-      <related title=""/>
-      <variables title=""/>
-      <properties title=""/>
-      <events title=""/>
-    </memberdef>
-    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-  </directory>
-</doxygenlayout>
diff --git a/extra/rapidjson/doc/misc/doxygenextra.css b/extra/rapidjson/doc/misc/doxygenextra.css
deleted file mode 100644
index 8cc943f53df3..000000000000
--- a/extra/rapidjson/doc/misc/doxygenextra.css
+++ /dev/null
@@ -1,260 +0,0 @@
-body code {
-	margin: 0;
-	border: 1px solid #ddd;
-	background-color: #f8f8f8;
-	border-radius: 3px;
-	padding: 0;
-}
-
-a {
-	color: #4183c4;
-}
-
-a.el {
-	font-weight: normal;
-}
-
-body, table, div, p, dl {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 15px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 25.5px;
-}
-
-body {
-	background-color: #eee;
-}
-
-div.header {
-	background-image: none;
-	background-color: white;
-	margin: 0px;
-	border: 0px;
-}
-
-div.headertitle {
-	width: 858px;
-	margin: 30px;
-	padding: 0px;
-}
-
-div.toc {
-	background-color: #f8f8f8;
-	border-color: #ddd;
-	margin-right: 10px;
-	margin-left: 20px;
-}
-div.toc h3 {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 18px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-}
-div.toc li {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 12px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-}
-
-.title {
-	font-size: 2.5em;
-	line-height: 63.75px;
-	border-bottom: 1px solid #ddd;
-	margin-bottom: 15px;
-	margin-left: 0px;
-	margin-right: 0px;
-	margin-top: 0px;
-}
-
-body h1 {
-	font-size: 2em;
-	line-height: 1.7;
-	border-bottom: 1px solid #eee;
-	margin: 1em 0 15px;
-	padding: 0;
-	overflow: hidden;
-}
-
-body h2 {
-	font-size: 1.5em;
-	line-height: 1.7;
-	margin: 1em 0 15px;
-	padding: 0;
-}
-
-pre.fragment {
-	font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-	font-size: 13px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 19px;
-}
-
-table.doxtable th {
-	background-color: #f8f8f8;
-	color: #333333;
-	font-size: 15px;
-}
-
-table.doxtable td, table.doxtable th {
-	border: 1px solid #ddd;
-}
-
-#doc-content {
-	background-color: #fff;
-	width: 918px;
-	height: auto !important;
-}
-
-div.contents {
-	width: 858px;
-	margin: 30px;
-}
-
-div.line {
-	font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-	font-size: 13px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 19px;	
-}
-
-tt, code, pre {
-	font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-	font-size: 12px;
-}
-
-div.fragment {
-	background-color: #f8f8f8;
-	border: 1px solid #ddd;
-	font-size: 13px;
-	line-height: 19px;
-	overflow: auto;
-	padding: 6px 10px;
-	border-radius: 3px;
-}
-
-#topbanner {
-	position: fixed;
-	margin: 15px;
-	z-index: 101;
-}
-
-#projectname
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 38px;
-	font-weight: bold;
-	line-height: 63.75px;
-	margin: 0px;
-	padding: 2px 0px;
-}
-    
-#projectbrief
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 16px;
-	line-height: 22.4px;
-	margin: 0px 0px 13px 0px;
-	padding: 2px;
-}
-
-/* side bar and search */
-
-#side-nav
-{
-	padding: 10px 0px 20px 20px;
-	border-top: 60px solid #2980b9;
-	background-color: #343131;
-	width: 250px !important;
-	position: fixed
-}
-
-#nav-tree
-{
-	background-color: transparent;
-	background-image: none;
-	height: 100% !important;
-}
-
-#nav-tree .label
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	line-height: 25.5px;	
-	font-size: 15px;
-}
-
-#nav-tree
-{
-	color: #b3b3b3;
-}
-
-#nav-tree .selected {
-	background-image: none;
-}
-
-#nav-tree a
-{
-	color: #b3b3b3;
-}
-
-#github
-{
-	position: fixed;
-	left: auto;
-	right: auto;
-	width: 250px;
-}
-
-#MSearchBox
-{
-	margin: 20px;
-	left: 40px;
-	right: auto;
-	position: fixed;
-	width: 180px;
-}
-
-#MSearchField
-{
-	width: 121px;
-}
-
-#MSearchResultsWindow
-{
-	left: 45px !important;
-}
-
-#nav-sync
-{
-	display: none;
-}
-
-.ui-resizable .ui-resizable-handle
-{
-	width: 0px;
-}
-
-#nav-path
-{
-	display: none;
-}
-
-/* external link icon */
-div.contents a[href ^= "http"]:after {
-     content: " " url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=);
-}
-
-.githublogo {
-	content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RERCMUIwOUY4NkNFMTFFM0FBNTJFRTMzNTJEMUJDNDYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RERCMUIwOUU4NkNFMTFFM0FBNTJFRTMzNTJEMUJDNDYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU1MTc4QTJBOTlBMDExRTI5QTE1QkMxMDQ2QTg5MDREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU1MTc4QTJCOTlBMDExRTI5QTE1QkMxMDQ2QTg5MDREIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+jUqS1wAAApVJREFUeNq0l89rE1EQx3e3gVJoSPzZeNEWPKgHoa0HBak0iHiy/4C3WvDmoZ56qJ7txVsPQu8qlqqHIhRKJZceesmhioQEfxTEtsoSpdJg1u/ABJ7Pmc1m8zLwgWTmzcw3L+/te+tHUeQltONgCkyCi2AEDHLsJ6iBMlgHL8FeoqokoA2j4CloRMmtwTmj7erHBXPgCWhG6a3JNXKdCiDl1cidVbXZkJoXQRi5t5BrxwoY71FzU8S4JuAIqFkJ2+BFSlEh525b/hr3+k/AklDkNsf6wTT4yv46KIMNpsy+iMdMc47HNWxbsgVcUn7FmLAzzoFAWDsBx+wVP6bUpp5ewI+DOeUx0Wd9D8F70BTGNjkWtqnhmT1JQAHcUgZd8Lo3rQb1LAT8eJVUfgGvHQigGp+V2Z0iAUUl8QH47kAA1XioxIo+bRN8OG8F/oBjwv+Z1nJgX5jpdzQDw0LCjsPmrcW7I/iHScCAEDj03FtD8A0EyuChHgg4KTlJQF3wZ7WELppnBX+dBFSVpJsOBWi1qiRgSwnOgoyD5hmuJdkWCVhTgnTvW3AgYIFrSbZGh0UW/Io5Vp+DQoK7o80pztWMemZbgxeNwCNwDbw1fIfgGZjhU6xPaJgBV8BdsMw5cbZoHsenwYFxkZzl83xTSKTiviCAfCsJLysH3POfC8m8NegyGAGfLP/VmGmfSChgXroR0RSWjEFv2J/nG84cuKFMf4sTCZqXuJd4KaXFVjEG3+tw4eXbNK/YC9oXXs3O8NY8y99L4BXY5cvLY/Bb2VZ58EOJVcB18DHJq9lRsKr8inyKGVjlmh29mtHs3AHfuhCwy1vXT/Nu2GKQt+UHsGdctyX6eQyNvc+5sfX9Dl7Pe2J/BRgAl2CpwmrsHR0AAAAASUVORK5CYII=);
-}
\ No newline at end of file
diff --git a/extra/rapidjson/doc/misc/footer.html b/extra/rapidjson/doc/misc/footer.html
deleted file mode 100644
index 0984145eb48d..000000000000
--- a/extra/rapidjson/doc/misc/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- HTML footer for doxygen 1.8.7-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
diff --git a/extra/rapidjson/doc/misc/header.html b/extra/rapidjson/doc/misc/header.html
deleted file mode 100644
index 2dbe72146588..000000000000
--- a/extra/rapidjson/doc/misc/header.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- HTML header for doxygen 1.8.7-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="http://github.com/$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="http://github.com/$relpath^jquery.js"></script>
-<script type="text/javascript" src="http://github.com/$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="http://github.com/$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="topbanner"><a href="https://github.com/miloyip/rapidjson" title="RapidJSON GitHub"><i class="githublogo"></i></a></div>
-$searchbox
-<!--END TITLEAREA-->
-<!-- end header part -->
diff --git a/extra/rapidjson/doc/performance.md b/extra/rapidjson/doc/performance.md
deleted file mode 100644
index 333e50f05b0d..000000000000
--- a/extra/rapidjson/doc/performance.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Performance
-
-The old performance article for RapidJSON 0.1 is provided [here](https://code.google.com/p/rapidjson/wiki/Performance).
-
-The (third-party) performance tests have been removed from this repository
-and are now part of a dedicated [native JSON benchmark collection] [1].
-
-This file will be updated with a summary of benchmarking results based on
-the above benchmark collection in the future.
-
-[1]: https://github.com/miloyip/nativejson-benchmark
-
-Additionally, you may refer to the following third-party benchmarks.
-
-## Third-party benchmarks
-
-* [Basic benchmarks for miscellaneous C++ JSON parsers and generators](https://github.com/mloskot/json_benchmark) by Mateusz Loskot (Jun 2013)
- * [casablanca](https://casablanca.codeplex.com/)
- * [json_spirit](https://github.com/cierelabs/json_spirit)
- * [jsoncpp](http://jsoncpp.sourceforge.net/)
- * [libjson](http://sourceforge.net/projects/libjson/)
- * [rapidjson](https://github.com/miloyip/rapidjson/)
- * [QJsonDocument](http://qt-project.org/doc/qt-5.0/qtcore/qjsondocument.html)
- 
-* [JSON Parser Benchmarking](http://chadaustin.me/2013/01/json-parser-benchmarking/) by Chad Austin (Jan 2013)
- * [sajson](https://github.com/chadaustin/sajson)
- * [rapidjson](https://github.com/miloyip/rapidjson/)
- * [vjson](https://code.google.com/p/vjson/)
- * [YAJL](http://lloyd.github.com/yajl/)
- * [Jansson](http://www.digip.org/jansson/)
diff --git a/extra/rapidjson/doc/sax.md b/extra/rapidjson/doc/sax.md
deleted file mode 100644
index 9a6d81480316..000000000000
--- a/extra/rapidjson/doc/sax.md
+++ /dev/null
@@ -1,475 +0,0 @@
-# SAX
-
-The term "SAX" originated from [Simple API for XML](http://en.wikipedia.org/wiki/Simple_API_for_XML). We borrowed this term for JSON parsing and generation.
-
-In RapidJSON, `Reader` (typedef of `GenericReader<...>`) is the SAX-style parser for JSON, and `Writer` (typedef of `GenericWriter<...>`) is the SAX-style generator for JSON.
-
-[TOC]
-
-# Reader {#Reader}
-
-`Reader` parses a JSON from a stream. While it reads characters from the stream, it analyze the characters according to the syntax of JSON, and publish events to a handler.
-
-For example, here is a JSON.
-
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-While a `Reader` parses this JSON, it publishes the following events to the handler sequentially:
-
-~~~~~~~~~~
-StartObject()
-Key("hello", 5, true)
-String("world", 5, true)
-Key("t", 1, true)
-Bool(true)
-Key("f", 1, true)
-Bool(false)
-Key("n", 1, true)
-Null()
-Key("i")
-UInt(123)
-Key("pi")
-Double(3.1416)
-Key("a")
-StartArray()
-Uint(1)
-Uint(2)
-Uint(3)
-Uint(4)
-EndArray(4)
-EndObject(7)
-~~~~~~~~~~
-
-These events can be easily matched with the JSON, except some event parameters need further explanation. Let's see the `simplereader` example which produces exactly the same output as above:
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-struct MyHandler {
-    bool Null() { cout << "Null()" << endl; return true; }
-    bool Bool(bool b) { cout << "Bool(" << boolalpha << b << ")" << endl; return true; }
-    bool Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-    bool Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-    bool Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-    bool Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-    bool Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
-    bool String(const char* str, SizeType length, bool copy) { 
-        cout << "String(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool StartObject() { cout << "StartObject()" << endl; return true; }
-    bool Key(const char* str, SizeType length, bool copy) { 
-        cout << "Key(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool EndObject(SizeType memberCount) { cout << "EndObject(" << memberCount << ")" << endl; return true; }
-    bool StartArray() { cout << "StartArray()" << endl; return true; }
-    bool EndArray(SizeType elementCount) { cout << "EndArray(" << elementCount << ")" << endl; return true; }
-};
-
-void main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.Parse(ss, handler);
-}
-~~~~~~~~~~
-
-Note that, RapidJSON uses template to statically bind the `Reader` type and the handler type, instead of using class with virtual functions. This paradigm can improve the performance by inlining functions.
-
-## Handler {#Handler}
-
-As the previous example showed, user needs to implement a handler, which consumes the events (function calls) from `Reader`. The handler must contain the following member functions.
-
-~~~~~~~~~~cpp
-class Handler {
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-~~~~~~~~~~
-
-`Null()` is called when the `Reader` encounters a JSON null value.
-
-`Bool(bool)` is called when the `Reader` encounters a JSON true or false value.
-
-When the `Reader` encounters a JSON number, it chooses a suitable C++ type mapping. And then it calls *one* function out of `Int(int)`, `Uint(unsigned)`, `Int64(int64_t)`, `Uint64(uint64_t)` and `Double(double)`.
-
-`String(const char* str, SizeType length, bool copy)` is called when the `Reader` encounters a string. The first parameter is pointer to the string. The second parameter is the length of the string (excluding the null terminator). Note that RapidJSON supports null character `'\0'` inside a string. If such situation happens, `strlen(str) < length`. The last `copy` indicates whether the handler needs to make a copy of the string. For normal parsing, `copy = true`. Only when *insitu* parsing is used, `copy = false`. And beware that, the character type depends on the target encoding, which will be explained later.
-
-When the `Reader` encounters the beginning of an object, it calls `StartObject()`. An object in JSON is a set of name-value pairs. If the object contains members it first calls `Key()` for the name of member, and then calls functions depending on the type of the value. These calls of name-value pairs repeats until calling `EndObject(SizeType memberCount)`. Note that the `memberCount` parameter is just an aid for the handler, user may not need this parameter.
-
-Array is similar to object but simpler. At the beginning of an array, the `Reader` calls `BeginArary()`. If there is elements, it calls functions according to the types of element. Similarly, in the last call `EndArray(SizeType elementCount)`, the parameter `elementCount` is just an aid for the handler.
-
-Every handler functions returns a `bool`. Normally it should returns `true`. If the handler encounters an error, it can return `false` to notify event publisher to stop further processing.
-
-For example, when we parse a JSON with `Reader` and the handler detected that the JSON does not conform to the required schema, then the handler can return `false` and let the `Reader` stop further parsing. And the `Reader` will be in error state with error code `kParseErrorTermination`.
-
-## GenericReader {#GenericReader}
-
-As mentioned before, `Reader` is a typedef of a template class `GenericReader`:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename SourceEncoding, typename TargetEncoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericReader {
-    // ...
-};
-
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-The `Reader` uses UTF-8 as both source and target encoding. The source encoding means the encoding in the JSON stream. The target encoding means the encoding of the `str` parameter in `String()` calls. For example, to parse a UTF-8 stream and outputs UTF-16 string events, you can define a reader by:
-
-~~~~~~~~~~cpp
-GenericReader<UTF8<>, UTF16<> > reader;
-~~~~~~~~~~
-
-Note that, the default character type of `UTF16` is `wchar_t`. So this `reader`needs to call `String(const wchar_t*, SizeType, bool)` of the handler.
-
-The third template parameter `Allocator` is the allocator type for internal data structure (actually a stack).
-
-## Parsing {#Parsing}
-
-The one and only one function of `Reader` is to parse JSON. 
-
-~~~~~~~~~~cpp
-template <unsigned parseFlags, typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-
-// with parseFlags = kDefaultParseFlags
-template <typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-~~~~~~~~~~
-
-If an error occurs during parsing, it will return `false`. User can also calls `bool HasParseEror()`, `ParseErrorCode GetParseErrorCode()` and `size_t GetErrorOffset()` to obtain the error states. Actually `Document` uses these `Reader` functions to obtain parse errors. Please refer to [DOM](doc/dom.md) for details about parse error.
-
-# Writer {#Writer}
-
-`Reader` converts (parses) JSON into events. `Writer` does exactly the opposite. It converts events into JSON. 
-
-`Writer` is very easy to use. If your application only need to converts some data into JSON, it may be a good choice to use `Writer` directly, instead of building a `Document` and then stringifying it with a `Writer`.
-
-In `simplewriter` example, we do exactly the reverse of `simplereader`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-void main() {
-    StringBuffer s;
-    Writer<StringBuffer> writer(s);
-    
-    writer.StartObject();
-    writer.Key("hello");
-    writer.String("world");
-    writer.Key("t");
-    writer.Bool(true);
-    writer.Key("f");
-    writer.Bool(false);
-    writer.Key("n");
-    writer.Null();
-    writer.Key("i");
-    writer.Uint(123);
-    writer.Key("pi");
-    writer.Double(3.1416);
-    writer.Key("a");
-    writer.StartArray();
-    for (unsigned i = 0; i < 4; i++)
-        writer.Uint(i);
-    writer.EndArray();
-    writer.EndObject();
-
-    cout << s.GetString() << endl;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{"hello":"world","t":true,"f":false,"n":null,"i":123,"pi":3.1416,"a":[0,1,2,3]}
-~~~~~~~~~~
-
-There are two `String()` and `Key()` overloads. One is the same as defined in handler concept with 3 parameters. It can handle string with null characters. Another one is the simpler version used in the above example.
-
-Note that, the example code does not pass any parameters in `EndArray()` and `EndObject()`. An `SizeType` can be passed but it will be simply ignored by `Writer`.
-
-You may doubt that, why not just using `sprintf()` or `std::stringstream` to build a JSON?
-
-There are various reasons:
-1. `Writer` must output a well-formed JSON. If there is incorrect event sequence (e.g. `Int()` just after `StartObject()`), it generates assertion fail in debug mode.
-2. `Writer::String()` can handle string escaping (e.g. converting code point `U+000A` to `\n`) and Unicode transcoding.
-3. `Writer` handles number output consistently.
-4. `Writer` implements the event handler concept. It can be used to handle events from `Reader`, `Document` or other event publisher.
-5. `Writer` can be optimized for different platforms.
-
-Anyway, using `Writer` API is even simpler than generating a JSON by ad hoc methods.
-
-## Template {#WriterTemplate}
-
-`Writer` has a minor design difference to `Reader`. `Writer` is a template class, not a typedef. There is no `GenericWriter`. The following is the declaration.
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = CrtAllocator<> >
-class Writer {
-public:
-    Writer(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth)
-// ...
-};
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-The `OutputStream` template parameter is the type of output stream. It cannot be deduced and must be specified by user.
-
-The `SourceEncoding` template parameter specifies the encoding to be used in `String(const Ch*, ...)`.
-
-The `TargetEncoding` template parameter specifies the encoding in the output stream.
-
-The last one, `Allocator` is the type of allocator, which is used for allocating internal data structure (a stack).
-
-Besides, the constructor of `Writer` has a `levelDepth` parameter. This parameter affects the initial memory allocated for storing information per hierarchy level.
-
-## PrettyWriter {#PrettyWriter}
-
-While the output of `Writer` is the most condensed JSON without white-spaces, suitable for network transfer or storage, it is not easily readable by human.
-
-Therefore, RapidJSON provides a `PrettyWriter`, which adds indentation and line feeds in the output.
-
-The usage of `PrettyWriter` is exactly the same as `Writer`, expect that `PrettyWriter` provides a `SetIndent(Ch indentChar, unsigned indentCharCount)` function. The default is 4 spaces.
-
-## Completeness and Reset {#CompletenessReset}
-
-A `Writer` can only output a single JSON, which can be any JSON type at the root. Once the singular event for root (e.g. `String()`), or the last matching `EndObject()` or `EndArray()` event, is handled, the output JSON is well-formed and complete. User can detect this state by calling `Writer::IsComplete()`.
-
-When a JSON is complete, the `Writer` cannot accept any new events. Otherwise the output will be invalid (i.e. having more than one root). To reuse the `Writer` object, user can call `Writer::Reset(OutputStream& os)` to reset all internal states of the `Writer` with a new output stream.
-
-# Techniques {#Techniques}
-
-## Parsing JSON to Custom Data Structure {#CustomDataStructure}
-
-`Document`'s parsing capability is completely based on `Reader`. Actually `Document` is a handler which receives events from a reader to build a DOM during parsing.
-
-User may uses `Reader` to build other data structures directly. This eliminates building of DOM, thus reducing memory and improving performance.
-
-In the following `messagereader` example, `ParseMessages()` parses a JSON which should be an object with key-string pairs.
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/error/en.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-using namespace std;
-using namespace rapidjson;
-
-typedef map<string, string> MessageMap;
-
-struct MessageHandler
-    : public BaseReaderHandler<UTF8<>, MessageHandler> {
-    MessageHandler() : state_(kExpectObjectStart) {
-    }
-
-    bool StartObject() {
-        switch (state_) {
-        case kExpectObjectStart:
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        switch (state_) {
-        case kExpectNameOrObjectEnd:
-            name_ = string(str, length);
-            state_ = kExpectValue;
-            return true;
-        case kExpectValue:
-            messages_.insert(MessageMap::value_type(name_, string(str, length)));
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool EndObject(SizeType) { return state_ == kExpectNameOrObjectEnd; }
-
-    bool Default() { return false; } // All other events are invalid.
-
-    MessageMap messages_;
-    enum State {
-        kExpectObjectStart,
-        kExpectNameOrObjectEnd,
-        kExpectValue,
-    }state_;
-    std::string name_;
-};
-
-void ParseMessages(const char* json, MessageMap& messages) {
-    Reader reader;
-    MessageHandler handler;
-    StringStream ss(json);
-    if (reader.Parse(ss, handler))
-        messages.swap(handler.messages_);   // Only change it if success.
-    else {
-        ParseErrorCode e = reader.GetParseErrorCode();
-        size_t o = reader.GetErrorOffset();
-        cout << "Error: " << GetParseError_En(e) << endl;;
-        cout << " at offset " << o << " near '" << string(json).substr(o, 10) << "...'" << endl;
-    }
-}
-
-int main() {
-    MessageMap messages;
-
-    const char* json1 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\" }";
-    cout << json1 << endl;
-    ParseMessages(json1, messages);
-
-    for (MessageMap::const_iterator itr = messages.begin(); itr != messages.end(); ++itr)
-        cout << itr->first << ": " << itr->second << endl;
-
-    cout << endl << "Parse a JSON with invalid schema." << endl;
-    const char* json2 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"foo\" : {} }";
-    cout << json2 << endl;
-    ParseMessages(json2, messages);
-
-    return 0;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{ "greeting" : "Hello!", "farewell" : "bye-bye!" }
-farewell: bye-bye!
-greeting: Hello!
-
-Parse a JSON with invalid schema.
-{ "greeting" : "Hello!", "farewell" : "bye-bye!", "foo" : {} }
-Error: Terminate parsing due to Handler error.
- at offset 59 near '} }...'
-~~~~~~~~~~
-
-The first JSON (`json1`) was successfully parsed into `MessageMap`. Since `MessageMap` is a `std::map`, the printing order are sorted by the key. This order is different from the JSON's order.
-
-In the second JSON (`json2`), `foo`'s value is an empty object. As it is an object, `MessageHandler::StartObject()` will be called. However, at that moment `state_ = kExpectValue`, so that function returns `false` and cause the parsing process be terminated. The error code is `kParseErrorTermination`.
-
-## Filtering of JSON {#Filtering}
-
-As mentioned earlier, `Writer` can handle the events published by `Reader`. `condense` example simply set a `Writer` as handler of a `Reader`, so it can remove all white-spaces in JSON. `pretty` example uses the same relationship, but replacing `Writer` by `PrettyWriter`. So `pretty` can be used to reformat a JSON with indentation and line feed.
-
-Actually, we can add intermediate layer(s) to filter the contents of JSON via these SAX-style API. For example, `capitalize` example capitalize all strings in a JSON.
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <vector>
-#include <cctype>
-
-using namespace rapidjson;
-
-template<typename OutputHandler>
-struct CapitalizeFilter {
-    CapitalizeFilter(OutputHandler& out) : out_(out), buffer_() {
-    }
-
-    bool Null() { return out_.Null(); }
-    bool Bool(bool b) { return out_.Bool(b); }
-    bool Int(int i) { return out_.Int(i); }
-    bool Uint(unsigned u) { return out_.Uint(u); }
-    bool Int64(int64_t i) { return out_.Int64(i); }
-    bool Uint64(uint64_t u) { return out_.Uint64(u); }
-    bool Double(double d) { return out_.Double(d); }
-    bool String(const char* str, SizeType length, bool) { 
-        buffer_.clear();
-        for (SizeType i = 0; i < length; i++)
-            buffer_.push_back(std::toupper(str[i]));
-        return out_.String(&buffer_.front(), length, true); // true = output handler need to copy the string
-    }
-    bool StartObject() { return out_.StartObject(); }
-    bool Key(const char* str, SizeType length, bool copy) { return String(str, length, copy); }
-    bool EndObject(SizeType memberCount) { return out_.EndObject(memberCount); }
-    bool StartArray() { return out_.StartArray(); }
-    bool EndArray(SizeType elementCount) { return out_.EndArray(elementCount); }
-
-    OutputHandler& out_;
-    std::vector<char> buffer_;
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    CapitalizeFilter<Writer<FileWriteStream> > filter(writer);
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
-~~~~~~~~~~
-
-Note that, it is incorrect to simply capitalize the JSON as a string. For example:
-~~~~~~~~~~
-["Hello\nWorld"]
-~~~~~~~~~~
-
-Simply capitalizing the whole JSON would contain incorrect escape character:
-~~~~~~~~~~
-["HELLO\NWORLD"]
-~~~~~~~~~~
-
-The correct result by `capitalize`:
-~~~~~~~~~~
-["HELLO\nWORLD"]
-~~~~~~~~~~
-
-More complicated filters can be developed. However, since SAX-style API can only provide information about a single event at a time, user may need to book-keeping the contextual information (e.g. the path from root value, storage of other related values). Some processing may be easier to be implemented in DOM than SAX.
diff --git a/extra/rapidjson/doc/stream.md b/extra/rapidjson/doc/stream.md
deleted file mode 100644
index 94bc10de8a5c..000000000000
--- a/extra/rapidjson/doc/stream.md
+++ /dev/null
@@ -1,374 +0,0 @@
-# Stream
-
-In RapidJSON, `rapidjson::Stream` is a concept for reading/writing JSON. Here we first show how to use streams provided. And then see how to create a custom stream.
-
-[TOC]
-
-# Memory Streams {#MemoryStreams}
-
-Memory streams store JSON in memory.
-
-## StringStream (Input) {#StringStream}
-
-`StringStream` is the most basic input stream. It represents a complete, read-only JSON stored in memory. It is defined in `rapidjson/rapidjson.h`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h" // will include "rapidjson/rapidjson.h"
-
-using namespace rapidjson;
-
-// ...
-const char json[] = "[1, 2, 3, 4]";
-StringStream s(json);
-
-Document d;
-d.ParseStream(s);
-~~~~~~~~~~
-
-Since this is very common usage, `Document::Parse(const char*)` is provided to do exactly the same as above:
-
-~~~~~~~~~~cpp
-// ...
-const char json[] = "[1, 2, 3, 4]";
-Document d;
-d.Parse(json);
-~~~~~~~~~~
-
-Note that, `StringStream` is a typedef of `GenericStringStream<UTF8<> >`, user may use another encodings to represent the character set of the stream.
-
-## StringBuffer (Output) {#StringBuffer}
-
-`StringBuffer` is a simple output stream. It allocates a memory buffer for writing the whole JSON. Use `GetString()` to obtain the buffer.
-
-~~~~~~~~~~cpp
-#include "rapidjson/stringbuffer.h"
-
-StringBuffer buffer;
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-
-const char* output = buffer.GetString();
-~~~~~~~~~~
-
-When the buffer is full, it will increases the capacity automatically. The default capacity is 256 characters (256 bytes for UTF8, 512 bytes for UTF16, etc.). User can provide an allocator and a initial capacity.
-
-~~~~~~~~~~cpp
-StringBuffer buffer1(0, 1024); // Use its allocator, initial size = 1024
-StringBuffer buffer2(allocator, 1024);
-~~~~~~~~~~
-
-By default, `StringBuffer` will instantiate an internal allocator.
-
-Similarly, `StringBuffer` is a typedef of `GenericStringBuffer<UTF8<> >`.
-
-# File Streams {#FileStreams}
-
-When parsing a JSON from file, you may read the whole JSON into memory and use ``StringStream`` above.
-
-However, if the JSON is big, or memory is limited, you can use `FileReadStream`. It only read a part of JSON from file into buffer, and then let the part be parsed. If it runs out of characters in the buffer, it will read the next part from file.
-
-## FileReadStream (Input) {#FileReadStream}
-
-`FileReadStream` reads the file via a `FILE` pointer. And user need to provide a buffer.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filereadstream.h"
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("big.json", "rb"); // non-Windows use "r"
-
-char readBuffer[65536];
-FileReadStream is(fp, readBuffer, sizeof(readBuffer));
-
-Document d;
-d.ParseStream(is);
-
-fclose(fp);
-~~~~~~~~~~
-
-Different from string streams, `FileReadStream` is byte stream. It does not handle encodings. If the file is not UTF-8, the byte stream can be wrapped in a `EncodedInputStream`. It will be discussed very soon.
-
-Apart from reading file, user can also use `FileReadStream` to read `stdin`.
-
-## FileWriteStream (Output) {#FileWriteStream}
-
-`FileWriteStream` is buffered output stream. Its usage is very similar to `FileReadStream`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"
-#include <cstdio>
-
-using namespace rapidjson;
-
-Document d;
-d.Parse(json);
-// ...
-
-FILE* fp = fopen("output.json", "wb"); // non-Windows use "w"
-
-char writeBuffer[65536];
-FileWriteStream os(fp, writeBuffer, sizeof(writeBuffer));
-
-Writer<FileWriteStream> writer(os);
-d.Accept(writer);
-
-fclose(fp);
-~~~~~~~~~~
-
-It can also directs the output to `stdout`.
-
-# Encoded Streams {#EncodedStreams}
-
-Encoded streams do not contain JSON itself, but they wrap byte streams to provide basic encoding/decoding function.
-
-As mentioned above, UTF-8 byte streams can be read directly. However, UTF-16 and UTF-32 have endian issue. To handle endian correctly, it needs to convert bytes into characters (e.g. `wchar_t` for UTF-16) while reading, and characters into bytes while writing.
-
-Besides, it also need to handle [byte order mark (BOM)](http://en.wikipedia.org/wiki/Byte_order_mark). When reading from a byte stream, it is needed to detect or just consume the BOM if exists. When writing to a byte stream, it can optionally write BOM.
-
-If the encoding of stream is known in compile-time, you may use `EncodedInputStream` and `EncodedOutputStream`. If the stream can be UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE JSON, and it is only known in runtime, you may use `AutoUTFInputStream` and `AutoUTFOutputStream`. These streams are defined in `rapidjson/encodedstream.h`.
-
-Note that, these encoded streams can be applied to streams other than file. For example, you may have a file in memory, or a custom byte stream, be wrapped in encoded streams.
-
-## EncodedInputStream {#EncodedInputStream}
-
-`EncodedInputStream` has two template parameters. The first one is a `Encoding` class, such as `UTF8`, `UTF16LE`, defined in `rapidjson/encodings.h`. The second one is the class of stream to be wrapped.
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // EncodedInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("utf16le.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-EncodedInputStream<UTF16LE<>, FileReadStream> eis(bis);  // wraps bis into eis
-
-Document d; // Document is GenericDocument<UTF8<> > 
-d.ParseStream<0, UTF16LE<> >(eis);  // Parses UTF-16LE file into UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-## EncodedOutputStream {#EncodedOutputStream}
-
-`EncodedOutputStream` is similar but it has a `bool putBOM` parameter in the constructor, controlling whether to write BOM into output byte stream.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"  // FileWriteStream
-#include "rapidjson/encodedstream.h"    // EncodedOutputStream
-#include <cstdio>
-
-Document d;         // Document is GenericDocument<UTF8<> > 
-// ...
-
-FILE* fp = fopen("output_utf32le.json", "wb"); // non-Windows use "w"
-
-char writeBuffer[256];
-FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-typedef EncodedOutputStream<UTF32LE<>, FileWriteStream> OutputStream;
-OutputStream eos(bos, true);   // Write BOM
-
-Writer<OutputStream, UTF32LE<>, UTF8<>> writer(eos);
-d.Accept(writer);   // This generates UTF32-LE file from UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-## AutoUTFInputStream {#AutoUTFInputStream}
-
-Sometimes an application may want to handle all supported JSON encoding. `AutoUTFInputStream` will detection encoding by BOM first. If BOM is unavailable, it will use  characteristics of valid JSON to make detection. If neither method success, it falls back to the UTF type provided in constructor.
-
-Since the characters (code units) may be 8-bit, 16-bit or 32-bit. `AutoUTFInputStream` requires a character type which can hold at least 32-bit. We may use `unsigned`, as in the template parameter:
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // AutoUTFInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("any.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // wraps bis into eis
-
-Document d;         // Document is GenericDocument<UTF8<> > 
-d.ParseStream<0, AutoUTF<unsigned> >(eis); // This parses any UTF file into UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-When specifying the encoding of stream, uses `AutoUTF<CharType>` as in `ParseStream()` above.
-
-You can obtain the type of UTF via `UTFType GetType()`. And check whether a BOM is found by `HasBOM()`
-
-## AutoUTFOutputStream {#AutoUTFOutputStream}
-
-Similarly, to choose encoding for output during runtime, we can use `AutoUTFOutputStream`. This class is not automatic *per se*. You need to specify the UTF type and whether to write BOM in runtime.
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-void WriteJSONFile(FILE* fp, UTFType type, bool putBOM, const Document& d) {
-    char writeBuffer[256];
-    FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-    typedef AutoUTFOutputStream<unsigned, FileWriteStream> OutputStream;
-    OutputStream eos(bos, type, putBOM);
-    
-    Writer<OutputStream, UTF8<>, AutoUTF<> > writer;
-    d.Accept(writer);
-}
-~~~~~~~~~~
-
-`AutoUTFInputStream` and `AutoUTFOutputStream` is more convenient than `EncodedInputStream` and `EncodedOutputStream`. They just incur a little bit runtime overheads.
-
-# Custom Stream {#CustomStream}
-
-In addition to memory/file streams, user can create their own stream classes which fits RapidJSON's API. For example, you may create network stream, stream from compressed file, etc.
-
-RapidJSON combines different types using templates. A class containing all required interface can be a stream. The Stream interface is defined in comments of `rapidjson/rapidjson.h`:
-
-~~~~~~~~~~cpp
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-~~~~~~~~~~
-
-For input stream, they must implement `Peek()`, `Take()` and `Tell()`.
-For output stream, they must implement `Put()` and `Flush()`. 
-There are two special interface, `PutBegin()` and `PutEnd()`, which are only for *in situ* parsing. Normal streams do not implement them. However, if the interface is not needed for a particular stream, it is still need to a dummy implementation, otherwise will generate compilation error.
-
-## Example: istream wrapper {#ExampleIStreamWrapper}
-
-The following example is a wrapper of `std::istream`, which only implements 3 functions.
-
-~~~~~~~~~~cpp
-class IStreamWrapper {
-public:
-    typedef char Ch;
-
-    IStreamWrapper(std::istream& is) : is_(is) {
-    }
-
-    Ch Peek() const { // 1
-        int c = is_.peek();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    Ch Take() { // 2
-        int c = is_.get();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    size_t Tell() const { return (size_t)is_.tellg(); } // 3
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch) { assert(false); }
-    void Flush() { assert(false); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    IStreamWrapper(const IStreamWrapper&);
-    IStreamWrapper& operator=(const IStreamWrapper&);
-
-    std::istream& is_;
-};
-~~~~~~~~~~
-
-User can use it to wrap instances of `std::stringstream`, `std::ifstream`.
-
-~~~~~~~~~~cpp
-const char* json = "[1,2,3,4]";
-std::stringstream ss(json);
-IStreamWrapper is(ss);
-
-Document d;
-d.Parse(is);
-~~~~~~~~~~
-
-Note that, this implementation may not be as efficient as RapidJSON's memory or file streams, due to internal overheads of the standard library.
-
-## Example: ostream wrapper {#ExampleOStreamWrapper}
-
-The following example is a wrapper of `std::istream`, which only implements 2 functions.
-
-~~~~~~~~~~cpp
-class OStreamWrapper {
-public:
-    typedef char Ch;
-
-    OStreamWrapper(std::ostream& os) : os_(os) {
-    }
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const {  }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }                  // 1
-    void Flush() { os_.flush(); }                   // 2
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    OStreamWrapper(const OStreamWrapper&);
-    OStreamWrapper& operator=(const OStreamWrapper&);
-
-    std::ostream& os_;
-};
-~~~~~~~~~~
-
-User can use it to wrap instances of `std::stringstream`, `std::ofstream`.
-
-~~~~~~~~~~cpp
-Document d;
-// ...
-
-std::stringstream ss;
-OSStreamWrapper os(ss);
-
-Writer<OStreamWrapper> writer(os);
-d.Accept(writer);
-~~~~~~~~~~
-
-Note that, this implementation may not be as efficient as RapidJSON's memory or file streams, due to internal overheads of the standard library.
-
-# Summary {#Summary}
-
-This section describes stream classes available in RapidJSON. Memory streams are simple. File stream can reduce the memory required during JSON parsing and generation, if the JSON is stored in file system. Encoded streams converts between byte streams and character streams. Finally, user may create custom streams using a simple interface.
diff --git a/extra/rapidjson/doc/tutorial.md b/extra/rapidjson/doc/tutorial.md
deleted file mode 100644
index 811833d3c5b0..000000000000
--- a/extra/rapidjson/doc/tutorial.md
+++ /dev/null
@@ -1,515 +0,0 @@
-# Tutorial
-
-This tutorial introduces the basics of the Document Object Model(DOM) API.
-
-As shown in [Usage at a glance](@ref index), a JSON can be parsed into DOM, and then the DOM can be queried and modified easily, and finally be converted back to JSON.
-
-[TOC]
-
-# Value & Document {#ValueDocument}
-
-Each JSON value is stored in a type called `Value`. A `Document`, representing the DOM, contains the root `Value` of the DOM tree. All public types and functions of RapidJSON are defined in the `rapidjson` namespace.
-
-# Query Value {#QueryValue}
-
-In this section, we will use excerpt of `example/tutorial/tutorial.cpp`.
-
-Assumes we have a JSON stored in a C string (`const char* json`):
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-Parse it into a `Document`:
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-// ...
-Document document;
-document.Parse(json);
-~~~~~~~~~~
-
-The JSON is now parsed into `document` as a *DOM tree*:
-
-![DOM in the tutorial](diagram/tutorial.png)
-
-Since the update to RFC 7159, the root of a conforming JSON document can be any JSON value.  In earlier RFC 4627, only objects or arrays were allowed as root values. In this case, the root is an object.
-~~~~~~~~~~cpp
-assert(document.IsObject());
-~~~~~~~~~~
-
-Let's query whether a `"hello"` member exists in the root object. Since a `Value` can contain different types of value, we may need to verify its type and use suitable API to obtain the value. In this example, `"hello"` member associates with a JSON string.
-~~~~~~~~~~cpp
-assert(document.HasMember("hello"));
-assert(document["hello"].IsString());
-printf("hello = %s\n", document["hello"].GetString());
-~~~~~~~~~~
-
-~~~~~~~~~~
-world
-~~~~~~~~~~
-
-JSON true/false values are represented as `bool`.
-~~~~~~~~~~cpp
-assert(document["t"].IsBool());
-printf("t = %s\n", document["t"].GetBool() ? "true" : "false");
-~~~~~~~~~~
-
-~~~~~~~~~~
-true
-~~~~~~~~~~
-
-JSON null can be queryed by `IsNull()`.
-~~~~~~~~~~cpp
-printf("n = %s\n", document["n"].IsNull() ? "null" : "?");
-~~~~~~~~~~
-
-~~~~~~~~~~
-null
-~~~~~~~~~~
-
-JSON number type represents all numeric values. However, C++ needs more specific type for manipulation.
-
-~~~~~~~~~~cpp
-assert(document["i"].IsNumber());
-
-// In this case, IsUint()/IsInt64()/IsUInt64() also return true.
-assert(document["i"].IsInt());          
-printf("i = %d\n", document["i"].GetInt());
-// Alternative (int)document["i"]
-
-assert(document["pi"].IsNumber());
-assert(document["pi"].IsDouble());
-printf("pi = %g\n", document["pi"].GetDouble());
-~~~~~~~~~~
-
-~~~~~~~~~~
-i = 123
-pi = 3.1416
-~~~~~~~~~~
-
-JSON array contains a number of elements.
-~~~~~~~~~~cpp
-// Using a reference for consecutive access is handy and faster.
-const Value& a = document["a"];
-assert(a.IsArray());
-for (SizeType i = 0; i < a.Size(); i++) // Uses SizeType instead of size_t
-        printf("a[%d] = %d\n", i, a[i].GetInt());
-~~~~~~~~~~
-
-~~~~~~~~~~
-a[0] = 1
-a[1] = 2
-a[2] = 3
-a[3] = 4
-~~~~~~~~~~
-
-Note that, RapidJSON does not automatically convert values between JSON types. If a value is a string, it is invalid to call `GetInt()`, for example. In debug mode it will fail an assertion. In release mode, the behavior is undefined.
-
-In the following, details about querying individual types are discussed.
-
-## Query Array {#QueryArray}
-
-By default, `SizeType` is typedef of `unsigned`. In most systems, array is limited to store up to 2^32-1 elements.
-
-You may access the elements in array by integer literal, for example, `a[0]`, `a[1]`, `a[2]`.
-
-Array is similar to `std::vector`, instead of using indices, you may also use iterator to access all the elements.
-~~~~~~~~~~cpp
-for (Value::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-    printf("%d ", itr->GetInt());
-~~~~~~~~~~
-
-And other familiar query functions:
-* `SizeType Capacity() const`
-* `bool Empty() const`
-
-## Query Object {#QueryObject}
-
-Similar to array, we can access all object members by iterator:
-
-~~~~~~~~~~cpp
-static const char* kTypeNames[] = 
-    { "Null", "False", "True", "Object", "Array", "String", "Number" };
-
-for (Value::ConstMemberIterator itr = document.MemberBegin();
-    itr != document.MemberEnd(); ++itr)
-{
-    printf("Type of member %s is %s\n",
-        itr->name.GetString(), kTypeNames[itr->value.GetType()]);
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-Type of member hello is String
-Type of member t is True
-Type of member f is False
-Type of member n is Null
-Type of member i is Number
-Type of member pi is Number
-Type of member a is Array
-~~~~~~~~~~
-
-Note that, when `operator[](const char*)` cannot find the member, it will fail an assertion.
-
-If we are unsure whether a member exists, we need to call `HasMember()` before calling `operator[](const char*)`. However, this incurs two lookup. A better way is to call `FindMember()`, which can check the existence of member and obtain its value at once:
-
-~~~~~~~~~~cpp
-Value::ConstMemberIterator itr = document.FindMember("hello");
-if (itr != document.MemberEnd())
-    printf("%s %s\n", itr->value.GetString());
-~~~~~~~~~~
-
-## Querying Number {#QueryNumber}
-
-JSON provide a single numerical type called Number. Number can be integer or real numbers. RFC 4627 says the range of Number is specified by parser.
-
-As C++ provides several integer and floating point number types, the DOM tries to handle these with widest possible range and good performance.
-
-When a Number is parsed, it is stored in the DOM as either one of the following type:
-
-Type       | Description
------------|---------------------------------------
-`unsigned` | 32-bit unsigned integer
-`int`      | 32-bit signed integer
-`uint64_t` | 64-bit unsigned integer
-`int64_t`  | 64-bit signed integer
-`double`   | 64-bit double precision floating point
-
-When querying a number, you can check whether the number can be obtained as target type:
-
-Checking          | Obtaining
-------------------|---------------------
-`bool IsNumber()` | N/A
-`bool IsUint()`   | `unsigned GetUint()`
-`bool IsInt()`    | `int GetInt()`
-`bool IsUint64()` | `uint64_t GetUint()`
-`bool IsInt64()`  | `int64_t GetInt64()`
-`bool IsDouble()` | `double GetDouble()`
-
-Note that, an integer value may be obtained in various ways without conversion. For example, A value `x` containing 123 will make `x.IsInt() == x.IsUint() == x.IsInt64() == x.IsUint64() == true`. But a value `y` containing -3000000000 will only makes `x.IsInt64() == true`.
-
-When obtaining the numeric values, `GetDouble()` will convert internal integer representation to a `double`. Note that, `int` and `unsigned` can be safely convert to `double`, but `int64_t` and `uint64_t` may lose precision (since mantissa of `double` is only 52-bits).
-
-## Query String {#QueryString}
-
-In addition to `GetString()`, the `Value` class also contains `GetStringLength()`. Here explains why.
-
-According to RFC 4627, JSON strings can contain Unicode character `U+0000`, which must be escaped as `"\u0000"`. The problem is that, C/C++ often uses null-terminated string, which treats ``\0'` as the terminator symbol.
-
-To conform RFC 4627, RapidJSON supports string containing `U+0000`. If you need to handle this, you can use `GetStringLength()` API to obtain the correct length of string.
-
-For example, after parsing a the following JSON to `Document d`:
-
-~~~~~~~~~~js
-{ "s" :  "a\u0000b" }
-~~~~~~~~~~
-The correct length of the value `"a\u0000b"` is 3. But `strlen()` returns 1.
-
-`GetStringLength()` can also improve performance, as user may often need to call `strlen()` for allocating buffer.
-
-Besides, `std::string` also support a constructor:
-
-~~~~~~~~~~cpp
-string(const char* s, size_t count);
-~~~~~~~~~~
-
-which accepts the length of string as parameter. This constructor supports storing null character within the string, and should also provide better performance.
-
-## Comparing values
-
-You can use `==` and `!=` to compare values. Two values are equal if and only if they are have same type and contents. You can also compare values with primitive types. Here is an example.
-
-~~~~~~~~~~cpp
-if (document["hello"] == document["n"]) /*...*/;    // Compare values
-if (document["hello"] == "world") /*...*/;          // Compare value with literal string
-if (document["i"] != 123) /*...*/;                  // Compare with integers
-if (document["pi"] != 3.14) /*...*/;                // Compare with double.
-~~~~~~~~~~
-
-Array/object compares their elements/members in order. They are equal if and only if their whole subtrees are equal.
-
-Note that, currently if an object contains duplicated named member, comparing equality with any object is always `false`.
-
-# Create/Modify Values {#CreateModifyValues}
-
-There are several ways to create values. After a DOM tree is created and/or modified, it can be saved as JSON again using `Writer`.
-
-## Change Value Type {#ChangeValueType}
-When creating a Value or Document by default constructor, its type is Null. To change its type, call `SetXXX()` or assignment operator, for example:
-
-~~~~~~~~~~cpp
-Document d; // Null
-d.SetObject();
-
-Value v;    // Null
-v.SetInt(10);
-v = 10;     // Shortcut, same as above
-~~~~~~~~~~
-
-### Overloaded Constructors
-There are also overloaded constructors for several types:
-
-~~~~~~~~~~cpp
-Value b(true);    // calls Value(bool)
-Value i(-123);    // calls Value(int)
-Value u(123u);    // calls Value(unsigned)
-Value d(1.5);     // calls Value(double)
-~~~~~~~~~~
-
-To create empty object or array, you may use `SetObject()`/`SetArray()` after default constructor, or using the `Value(Type)` in one shot:
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-Value a(kArrayType);
-~~~~~~~~~~
-
-## Move Semantics {#MoveSemantics}
-
-A very special decision during design of RapidJSON is that, assignment of value does not copy the source value to destination value. Instead, the value from source is moved to the destination. For example,
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b(456);
-b = a;         // a becomes a Null value, b becomes number 123.
-~~~~~~~~~~
-
-![Assignment with move semantics.](diagram/move1.png)
-
-Why? What is the advantage of this semantics?
-
-The simple answer is performance. For fixed size JSON types (Number, True, False, Null), copying them is fast and easy. However, For variable size JSON types (String, Array, Object), copying them will incur a lot of overheads. And these overheads are often unnoticed. Especially when we need to create temporary object, copy it to another variable, and then destruct it.
-
-For example, if normal *copy* semantics was used:
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // adding elements to contacts array.
-    // ...
-    o.AddMember("contacts", contacts);  // deep clone contacts (may be with lots of allocations)
-    // destruct contacts.
-}
-~~~~~~~~~~
-
-![Copy semantics makes a lots of copy operations.](diagram/move2.png)
-
-The object `o` needs to allocate a buffer of same size as contacts, makes a deep clone of it, and then finally contacts is destructed. This will incur a lot of unnecessary allocations/deallocations and memory copying.
-
-There are solutions to prevent actual copying these data, such as reference counting and garbage collection(GC).
-
-To make RapidJSON simple and fast, we chose to use *move* semantics for assignment. It is similar to `std::auto_ptr` which transfer ownership during assignment. Move is much faster and simpler, it just destructs the original value, `memcpy()` the source to destination, and finally sets the source as Null type.
-
-So, with move semantics, the above example becomes:
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // adding elements to contacts array.
-    o.AddMember("contacts", contacts);  // just memcpy() of contacts itself to the value of new member (16 bytes)
-    // contacts became Null here. Its destruction is trivial.
-}
-~~~~~~~~~~
-
-![Move semantics makes no copying.](diagram/move3.png)
-
-This is called move assignment operator in C++11. As RapidJSON supports C++03, it adopts move semantics using assignment operator, and all other modifying function like `AddMember()`, `PushBack()`.
-
-### Move semantics and temporary values {#TemporaryValues}
-
-Sometimes, it is convenient to construct a Value in place, before passing it to one of the "moving" functions, like `PushBack()` or `AddMember()`.  As temporary objects can't be converted to proper Value references, the convenience function `Move()` is available:
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-// a.PushBack(Value(42), allocator);       // will not compile
-a.PushBack(Value().SetInt(42), allocator); // fluent API
-a.PushBack(Value(42).Move(), allocator);   // same as above
-~~~~~~~~~~
-
-## Create String {#CreateString}
-RapidJSON provide two strategies for storing string.
-
-1. copy-string: allocates a buffer, and then copy the source data into it.
-2. const-string: simply store a pointer of string.
-
-Copy-string is always safe because it owns a copy of the data. Const-string can be used for storing string literal, and in-situ parsing which we will mentioned in Document section.
-
-To make memory allocation customizable, RapidJSON requires user to pass an instance of allocator, whenever an operation may require allocation. This design is needed to prevent storing a allocator (or Document) pointer per Value.
-
-Therefore, when we assign a copy-string, we call this overloaded `SetString()` with allocator:
-
-~~~~~~~~~~cpp
-Document document;
-Value author;
-char buffer[10];
-int len = sprintf(buffer, "%s %s", "Milo", "Yip"); // dynamically created string.
-author.SetString(buffer, len, document.GetAllocator());
-memset(buffer, 0, sizeof(buffer));
-// author.GetString() still contains "Milo Yip" after buffer is destroyed
-~~~~~~~~~~
-
-In this example, we get the allocator from a `Document` instance. This is a common idiom when using RapidJSON. But you may use other instances of allocator.
-
-Besides, the above `SetString()` requires length. This can handle null characters within a string. There is another `SetString()` overloaded function without the length parameter. And it assumes the input is null-terminated and calls a `strlen()`-like function to obtain the length.
-
-Finally, for string literal or string with safe life-cycle can use const-string version of `SetString()`, which lacks allocator parameter.  For string literals (or constant character arrays), simply passing the literal as parameter is safe and efficient:
-
-~~~~~~~~~~cpp
-Value s;
-s.SetString("rapidjson");    // can contain null character, length derived at compile time
-s = "rapidjson";             // shortcut, same as above
-~~~~~~~~~~
-
-For character pointer, the RapidJSON requires to mark it as safe before using it without copying. This can be achieved by using the `StringRef` function:
-
-~~~~~~~~~cpp
-const char * cstr = getenv("USER");
-size_t cstr_len = ...;                 // in case length is available
-Value s;
-// s.SetString(cstr);                  // will not compile
-s.SetString(StringRef(cstr));          // ok, assume safe lifetime, null-terminated
-s = StringRef(cstr);                   // shortcut, same as above
-s.SetString(StringRef(cstr,cstr_len)); // faster, can contain null character
-s = StringRef(cstr,cstr_len);          // shortcut, same as above
-
-~~~~~~~~~
-
-## Modify Array {#ModifyArray}
-Value with array type provides similar APIs as `std::vector`.
-
-* `Clear()`
-* `Reserve(SizeType, Allocator&)`
-* `Value& PushBack(Value&, Allocator&)`
-* `template <typename T> GenericValue& PushBack(T, Allocator&)`
-* `Value& PopBack()`
-* `ValueIterator Erase(ConstValueIterator pos)`
-* `ValueIterator Erase(ConstValueIterator first, ConstValueIterator last)`
-
-Note that, `Reserve(...)` and `PushBack(...)` may allocate memory for the array elements, therefore require an allocator.
-
-Here is an example of `PushBack()`:
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-
-for (int i = 5; i <= 10; i++)
-    a.PushBack(i, allocator);   // allocator is needed for potential realloc().
-
-// Fluent interface
-a.PushBack("Lua", allocator).PushBack("Mio", allocator);
-~~~~~~~~~~
-
-Differs from STL, `PushBack()`/`PopBack()` returns the array reference itself. This is called _fluent interface_.
-
-If you want to add a non-constant string or a string without sufficient lifetime (see [Create String](#CreateString)) to the array, you need to create a string Value by using the copy-string API.  To avoid the need for an intermediate variable, you can use a [temporary value](#TemporaryValues) in place:
-
-~~~~~~~~~~cpp
-// in-place Value parameter
-contact.PushBack(Value("copy", document.GetAllocator()).Move(), // copy string
-                 document.GetAllocator());
-
-// explicit parameters
-Value val("key", document.GetAllocator()); // copy string
-contact.PushBack(val, document.GetAllocator());
-~~~~~~~~~~
-
-## Modify Object {#ModifyObject}
-Object is a collection of key-value pairs (members). Each key must be a string value. To modify an object, either add or remove members. THe following APIs are for adding members:
-
-* `Value& AddMember(Value&, Value&, Allocator& allocator)`
-* `Value& AddMember(StringRefType, Value&, Allocator&)`
-* `template <typename T> Value& AddMember(StringRefType, T value, Allocator&)`
-
-Here is an example.
-
-~~~~~~~~~~cpp
-Value contact(kObject);
-contact.AddMember("name", "Milo", document.GetAllocator());
-contact.AddMember("married", true, document.GetAllocator());
-~~~~~~~~~~
-
-The name parameter with `StringRefType` is similar to the interface of `SetString` function for string values. These overloads are used to avoid the need for copying the `name` string, as constant key names are very common in JSON objects.
-
-If you need to create a name from a non-constant string or a string without sufficient lifetime (see [Create String](#CreateString)), you need to create a string Value by using the copy-string API.  To avoid the need for an intermediate variable, you can use a [temporary value](#TemporaryValues) in place:
-
-~~~~~~~~~~cpp
-// in-place Value parameter
-contact.AddMember(Value("copy", document.GetAllocator()).Move(), // copy string
-                  Value().Move(),                                // null value
-                  document.GetAllocator());
-
-// explicit parameters
-Value key("key", document.GetAllocator()); // copy string name
-Value val(42);                             // some value
-contact.AddMember(key, val, document.GetAllocator());
-~~~~~~~~~~
-
-For removing members, there are several choices: 
-
-* `bool RemoveMember(const Ch* name)`: Remove a member by search its name (linear time complexity).
-* `bool RemoveMember(const Value& name)`: same as above but `name` is a Value.
-* `MemberIterator RemoveMember(MemberIterator)`: Remove a member by iterator (_constant_ time complexity).
-* `MemberIterator EraseMember(MemberIterator)`: similar to the above but it preserves order of members (linear time complexity).
-* `MemberIterator EraseMember(MemberIterator first, MemberIterator last)`: remove a range of members, preserves order (linear time complexity).
-
-`MemberIterator RemoveMember(MemberIterator)` uses a "move-last" trick to achieve constant time complexity. Basically the member at iterator is destructed, and then the last element is moved to that position. So the order of the remaining members are changed.
-
-## Deep Copy Value {#DeepCopyValue}
-If we really need to copy a DOM tree, we can use two APIs for deep copy: constructor with allocator, and `CopyFrom()`.
-
-~~~~~~~~~~cpp
-Document d;
-Document::AllocatorType& a = d.GetAllocator();
-Value v1("foo");
-// Value v2(v1); // not allowed
-
-Value v2(v1, a);                      // make a copy
-assert(v1.IsString());                // v1 untouched
-d.SetArray().PushBack(v1, a).PushBack(v2, a);
-assert(v1.IsNull() && v2.IsNull());   // both moved to d
-
-v2.CopyFrom(d, a);                    // copy whole document to v2
-assert(d.IsArray() && d.Size() == 2); // d untouched
-v1.SetObject().AddMember("array", v2, a);
-d.PushBack(v1, a);
-~~~~~~~~~~
-
-## Swap Values {#SwapValues}
-
-`Swap()` is also provided.
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b("Hello");
-a.Swap(b);
-assert(a.IsString());
-assert(b.IsInt());
-~~~~~~~~~~
-
-Swapping two DOM trees is fast (constant time), despite the complexity of the trees.
-
-# What's next {#WhatsNext}
-
-This tutorial shows the basics of DOM tree query and manipulation. There are several important concepts in RapidJSON:
-
-1. [Streams](doc/stream.md) are channels for reading/writing JSON, which can be a in-memory string, or file stream, etc. User can also create their streams.
-2. [Encoding](doc/encoding.md) defines which character encoding is used in streams and memory. RapidJSON also provide Unicode conversion/validation internally.
-3. [DOM](doc/dom.md)'s basics are already covered in this tutorial. Uncover more advanced features such as *in situ* parsing, other parsing options and advanced usages.
-4. [SAX](doc/sax.md) is the foundation of parsing/generating facility in RapidJSON. Learn how to use `Reader`/`Writer` to implement even faster applications. Also try `PrettyWriter` to format the JSON.
-5. [Performance](doc/performance.md) shows some in-house and third-party benchmarks.
-6. [Internals](doc/internals.md) describes some internal designs and techniques of RapidJSON.
-
-You may also refer to the [FAQ](doc/faq.md), API documentation, examples and unit tests.
diff --git a/extra/rapidjson/example/CMakeLists.txt b/extra/rapidjson/example/CMakeLists.txt
deleted file mode 100644
index 64632127ad0f..000000000000
--- a/extra/rapidjson/example/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2011 Milo Yip (miloyip@gmail.com)
-# Copyright (c) 2013 Rafal Jeczalik (rjeczalik@gmail.com)
-# Distributed under the MIT License (see license.txt file)
-
-set(EXAMPLES
-    capitalize
-    condense
-    messagereader
-    pretty
-    prettyauto
-    serialize
-    simpledom
-    simplereader
-    simplewriter
-    tutorial)
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
-endif()
-
-foreach (example ${EXAMPLES})
-    add_executable(${example} ${example}/${example}.cpp)
-endforeach()
-
-add_custom_target(examples ALL DEPENDS ${EXAMPLES})
diff --git a/extra/rapidjson/example/capitalize/capitalize.cpp b/extra/rapidjson/example/capitalize/capitalize.cpp
deleted file mode 100644
index dd94d243814b..000000000000
--- a/extra/rapidjson/example/capitalize/capitalize.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// JSON condenser exmaple
-
-// This example parses JSON from stdin with validation, 
-// and re-output the JSON content to stdout with all string capitalized, and without whitespace.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <vector>
-#include <cctype>
-
-using namespace rapidjson;
-
-template<typename OutputHandler>
-struct CapitalizeFilter {
-    CapitalizeFilter(OutputHandler& out) : out_(out), buffer_() {}
-
-    bool Null() { return out_.Null(); }
-    bool Bool(bool b) { return out_.Bool(b); }
-    bool Int(int i) { return out_.Int(i); }
-    bool Uint(unsigned u) { return out_.Uint(u); }
-    bool Int64(int64_t i) { return out_.Int64(i); }
-    bool Uint64(uint64_t u) { return out_.Uint64(u); }
-    bool Double(double d) { return out_.Double(d); }
-    bool String(const char* str, SizeType length, bool) { 
-        buffer_.clear();
-        for (SizeType i = 0; i < length; i++)
-            buffer_.push_back(std::toupper(str[i]));
-        return out_.String(&buffer_.front(), length, true); // true = output handler need to copy the string
-    }
-    bool StartObject() { return out_.StartObject(); }
-    bool Key(const char* str, SizeType length, bool copy) { return String(str, length, copy); }
-    bool EndObject(SizeType memberCount) { return out_.EndObject(memberCount); }
-    bool StartArray() { return out_.StartArray(); }
-    bool EndArray(SizeType elementCount) { return out_.EndArray(elementCount); }
-
-    OutputHandler& out_;
-    std::vector<char> buffer_;
-
-private:
-    CapitalizeFilter(const CapitalizeFilter&);
-    CapitalizeFilter& operator=(const CapitalizeFilter&);
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    CapitalizeFilter<Writer<FileWriteStream> > filter(writer);
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/condense/condense.cpp b/extra/rapidjson/example/condense/condense.cpp
deleted file mode 100644
index bee5261d68c5..000000000000
--- a/extra/rapidjson/example/condense/condense.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// JSON condenser exmaple
-
-// This example parses JSON text from stdin with validation, 
-// and re-output the JSON content to stdout without whitespace.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    if (!reader.Parse(is, writer)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/messagereader/messagereader.cpp b/extra/rapidjson/example/messagereader/messagereader.cpp
deleted file mode 100644
index 436af8523244..000000000000
--- a/extra/rapidjson/example/messagereader/messagereader.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Reading a message JSON with Reader (SAX-style API).
-// The JSON should be an object with key-string pairs.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/error/en.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-using namespace std;
-using namespace rapidjson;
-
-typedef map<string, string> MessageMap;
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-struct MessageHandler
-    : public BaseReaderHandler<UTF8<>, MessageHandler> {
-    MessageHandler() : messages_(), state_(kExpectObjectStart), name_() {}
-
-    bool StartObject() {
-        switch (state_) {
-        case kExpectObjectStart:
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        switch (state_) {
-        case kExpectNameOrObjectEnd:
-            name_ = string(str, length);
-            state_ = kExpectValue;
-            return true;
-        case kExpectValue:
-            messages_.insert(MessageMap::value_type(name_, string(str, length)));
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool EndObject(SizeType) { return state_ == kExpectNameOrObjectEnd; }
-
-    bool Default() { return false; } // All other events are invalid.
-
-    MessageMap messages_;
-    enum State {
-        kExpectObjectStart,
-        kExpectNameOrObjectEnd,
-        kExpectValue,
-    }state_;
-    std::string name_;
-};
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_POP
-#endif
-
-void ParseMessages(const char* json, MessageMap& messages) {
-    Reader reader;
-    MessageHandler handler;
-    StringStream ss(json);
-    if (reader.Parse(ss, handler))
-        messages.swap(handler.messages_);   // Only change it if success.
-    else {
-        ParseErrorCode e = reader.GetParseErrorCode();
-        size_t o = reader.GetErrorOffset();
-        cout << "Error: " << GetParseError_En(e) << endl;;
-        cout << " at offset " << o << " near '" << string(json).substr(o, 10) << "...'" << endl;
-    }
-}
-
-int main() {
-    MessageMap messages;
-
-    const char* json1 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\" }";
-    cout << json1 << endl;
-    ParseMessages(json1, messages);
-
-    for (MessageMap::const_iterator itr = messages.begin(); itr != messages.end(); ++itr)
-        cout << itr->first << ": " << itr->second << endl;
-
-    cout << endl << "Parse a JSON with invalid schema." << endl;
-    const char* json2 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"foo\" : {} }";
-    cout << json2 << endl;
-    ParseMessages(json2, messages);
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/pretty/pretty.cpp b/extra/rapidjson/example/pretty/pretty.cpp
deleted file mode 100644
index 81ca3413185b..000000000000
--- a/extra/rapidjson/example/pretty/pretty.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// JSON pretty formatting example
-// This example can only handle UTF-8. For handling other encodings, see prettyauto example.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-    // Prepare reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    PrettyWriter<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    if (!reader.Parse<kParseValidateEncodingFlag>(is, writer)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/prettyauto/prettyauto.cpp b/extra/rapidjson/example/prettyauto/prettyauto.cpp
deleted file mode 100644
index 1699a10dd6e7..000000000000
--- a/extra/rapidjson/example/prettyauto/prettyauto.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// JSON pretty formatting example
-// This example can handle UTF-8/UTF-16LE/UTF-16BE/UTF-32LE/UTF-32BE.
-// The input firstly convert to UTF8, and then write to the original encoding with pretty formatting.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"    // NEW
-#include "rapidjson/error/en.h"
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-#ifdef _WIN32
-    // Prevent Windows converting between CR+LF and LF
-    _setmode(_fileno(stdin), _O_BINARY);    // NEW
-    _setmode(_fileno(stdout), _O_BINARY);   // NEW
-#endif
-
-    // Prepare reader and input stream.
-    //Reader reader;
-    GenericReader<AutoUTF<unsigned>, UTF8<> > reader;       // CHANGED
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-    AutoUTFInputStream<unsigned, FileReadStream> eis(is);   // NEW
-
-    // Prepare writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-
-#if 1
-    // Use the same Encoding of the input. Also use BOM according to input.
-    typedef AutoUTFOutputStream<unsigned, FileWriteStream> OutputStream;    // NEW
-    OutputStream eos(os, eis.GetType(), eis.HasBOM());                      // NEW
-    PrettyWriter<OutputStream, UTF8<>, AutoUTF<unsigned> > writer(eos);     // CHANGED
-#else
-    // You may also use static bound encoding type, such as output to UTF-16LE with BOM
-    typedef EncodedOutputStream<UTF16LE<>,FileWriteStream> OutputStream;    // NEW
-    OutputStream eos(os, true);                                             // NEW
-    PrettyWriter<OutputStream, UTF8<>, UTF16LE<> > writer(eos);             // CHANGED
-#endif
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    //if (!reader.Parse<kParseValidateEncodingFlag>(is, writer)) {
-    if (!reader.Parse<kParseValidateEncodingFlag>(eis, writer)) {   // CHANGED
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/serialize/serialize.cpp b/extra/rapidjson/example/serialize/serialize.cpp
deleted file mode 100644
index 2625e866bae8..000000000000
--- a/extra/rapidjson/example/serialize/serialize.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// Serialize example
-// This example shows writing JSON string with writer directly.
-
-#include "rapidjson/prettywriter.h" // for stringify JSON
-#include "rapidjson/filestream.h"   // wrapper of C stream for prettywriter as output
-#include <cstdio>
-#include <string>
-#include <vector>
-
-using namespace rapidjson;
-
-class Person {
-public:
-    Person(const std::string& name, unsigned age) : name_(name), age_(age) {}
-    virtual ~Person();
-
-protected:
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        // This base class just write out name-value pairs, without wrapping within an object.
-        writer.String("name");
-#ifdef RAPIDJSON_HAS_STDSTRING
-        writer.String(name_);
-#else
-        writer.String(name_.c_str(), (SizeType)name_.length()); // Supplying length of string is faster.
-#endif
-        writer.String("age");
-        writer.Uint(age_);
-    }
-
-private:
-    std::string name_;
-    unsigned age_;
-};
-
-Person::~Person() {
-}
-
-class Education {
-public:
-    Education(const std::string& school, double GPA) : school_(school), GPA_(GPA) {}
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-        
-        writer.String("school");
-#ifdef RAPIDJSON_HAS_STDSTRING
-        writer.String(school_);
-#else
-        writer.String(school_.c_str(), (SizeType)school_.length());
-#endif
-
-        writer.String("GPA");
-        writer.Double(GPA_);
-
-        writer.EndObject();
-    }
-
-private:
-    std::string school_;
-    double GPA_;
-};
-
-class Dependent : public Person {
-public:
-    Dependent(const std::string& name, unsigned age, Education* education = 0) : Person(name, age), education_(education) {}
-    Dependent(const Dependent& rhs) : Person(rhs), education_(0) { education_ = (rhs.education_ == 0) ? 0 : new Education(*rhs.education_); }
-    virtual ~Dependent();
-
-    Dependent& operator=(const Dependent& rhs) {
-        if (this == &rhs)
-            return *this;
-        delete education_;
-        education_ = (rhs.education_ == 0) ? 0 : new Education(*rhs.education_);
-        return *this;
-    }
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-
-        Person::Serialize(writer);
-
-        writer.String("education");
-        if (education_)
-            education_->Serialize(writer);
-        else
-            writer.Null();
-
-        writer.EndObject();
-    }
-
-private:
-
-    Education *education_;
-};
-
-Dependent::~Dependent() {
-    delete education_; 
-}
-
-class Employee : public Person {
-public:
-    Employee(const std::string& name, unsigned age, bool married) : Person(name, age), dependents_(), married_(married) {}
-    virtual ~Employee();
-
-    void AddDependent(const Dependent& dependent) {
-        dependents_.push_back(dependent);
-    }
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-
-        Person::Serialize(writer);
-
-        writer.String("married");
-        writer.Bool(married_);
-
-        writer.String(("dependents"));
-        writer.StartArray();
-        for (std::vector<Dependent>::const_iterator dependentItr = dependents_.begin(); dependentItr != dependents_.end(); ++dependentItr)
-            dependentItr->Serialize(writer);
-        writer.EndArray();
-
-        writer.EndObject();
-    }
-
-private:
-    std::vector<Dependent> dependents_;
-    bool married_;
-};
-
-Employee::~Employee() {
-}
-
-int main(int, char*[]) {
-    std::vector<Employee> employees;
-
-    employees.push_back(Employee("Milo YIP", 34, true));
-    employees.back().AddDependent(Dependent("Lua YIP", 3, new Education("Happy Kindergarten", 3.5)));
-    employees.back().AddDependent(Dependent("Mio YIP", 1));
-
-    employees.push_back(Employee("Percy TSE", 30, false));
-
-    FileStream s(stdout);
-    PrettyWriter<FileStream> writer(s);     // Can also use Writer for condensed formatting
-
-    writer.StartArray();
-    for (std::vector<Employee>::const_iterator employeeItr = employees.begin(); employeeItr != employees.end(); ++employeeItr)
-        employeeItr->Serialize(writer);
-    writer.EndArray();
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/simpledom/simpledom.cpp b/extra/rapidjson/example/simpledom/simpledom.cpp
deleted file mode 100644
index 80384199a92a..000000000000
--- a/extra/rapidjson/example/simpledom/simpledom.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// JSON simple example
-// This example does not handle errors.
-
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-
-int main() {
-    // 1. Parse a JSON string into DOM.
-    const char* json = "{\"project\":\"rapidjson\",\"stars\":10}";
-    Document d;
-    d.Parse(json);
-
-    // 2. Modify it by DOM.
-    Value& s = d["stars"];
-    s.SetInt(s.GetInt() + 1);
-
-    // 3. Stringify the DOM
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    d.Accept(writer);
-
-    // Output {"project":"rapidjson","stars":11}
-    std::cout << buffer.GetString() << std::endl;
-    return 0;
-}
diff --git a/extra/rapidjson/example/simplereader/simplereader.cpp b/extra/rapidjson/example/simplereader/simplereader.cpp
deleted file mode 100644
index edbdb6352c59..000000000000
--- a/extra/rapidjson/example/simplereader/simplereader.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "rapidjson/reader.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-struct MyHandler {
-    bool Null() { cout << "Null()" << endl; return true; }
-    bool Bool(bool b) { cout << "Bool(" << boolalpha << b << ")" << endl; return true; }
-    bool Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-    bool Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-    bool Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-    bool Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-    bool Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
-    bool String(const char* str, SizeType length, bool copy) { 
-        cout << "String(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool StartObject() { cout << "StartObject()" << endl; return true; }
-    bool Key(const char* str, SizeType length, bool copy) {
-        cout << "Key(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool EndObject(SizeType memberCount) { cout << "EndObject(" << memberCount << ")" << endl; return true; }
-    bool StartArray() { cout << "StartArray()" << endl; return true; }
-    bool EndArray(SizeType elementCount) { cout << "EndArray(" << elementCount << ")" << endl; return true; }
-};
-
-int main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.Parse(ss, handler);
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/simplewriter/simplewriter.cpp b/extra/rapidjson/example/simplewriter/simplewriter.cpp
deleted file mode 100644
index f8891504bc8c..000000000000
--- a/extra/rapidjson/example/simplewriter/simplewriter.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-int main() {
-    StringBuffer s;
-    Writer<StringBuffer> writer(s);
-    
-    writer.StartObject();
-    writer.String("hello");
-    writer.String("world");
-    writer.String("t");
-    writer.Bool(true);
-    writer.String("f");
-    writer.Bool(false);
-    writer.String("n");
-    writer.Null();
-    writer.String("i");
-    writer.Uint(123);
-    writer.String("pi");
-    writer.Double(3.1416);
-    writer.String("a");
-    writer.StartArray();
-    for (unsigned i = 0; i < 4; i++)
-        writer.Uint(i);
-    writer.EndArray();
-    writer.EndObject();
-
-    cout << s.GetString() << endl;
-
-    return 0;
-}
diff --git a/extra/rapidjson/example/tutorial/tutorial.cpp b/extra/rapidjson/example/tutorial/tutorial.cpp
deleted file mode 100644
index 388ac6c76f86..000000000000
--- a/extra/rapidjson/example/tutorial/tutorial.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Hello World example
-// This example shows basic usage of DOM-style API.
-
-#include "rapidjson/document.h"     // rapidjson's DOM-style API
-#include "rapidjson/prettywriter.h" // for stringify JSON
-#include "rapidjson/filestream.h"   // wrapper of C stream for prettywriter as output
-#include <cstdio>
-
-using namespace rapidjson;
-using namespace std;
-
-int main(int, char*[]) {
-    ////////////////////////////////////////////////////////////////////////////
-    // 1. Parse a JSON text string to a document.
-
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-    printf("Original JSON:\n %s\n", json);
-
-    Document document;  // Default template parameter uses UTF8 and MemoryPoolAllocator.
-
-#if 0
-    // "normal" parsing, decode strings to new buffers. Can use other input stream via ParseStream().
-    if (document.Parse(json).HasParseError())
-        return 1;
-#else
-    // In-situ parsing, decode strings directly in the source string. Source must be string.
-    {
-        char buffer[sizeof(json)];
-        memcpy(buffer, json, sizeof(json));
-        if (document.ParseInsitu(buffer).HasParseError())
-            return 1;
-    }
-#endif
-
-    printf("\nParsing to document succeeded.\n");
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 2. Access values in document. 
-
-    printf("\nAccess values in document:\n");
-    assert(document.IsObject());    // Document is a JSON value represents the root of DOM. Root can be either an object or array.
-
-    assert(document.HasMember("hello"));
-    assert(document["hello"].IsString());
-    printf("hello = %s\n", document["hello"].GetString());
-
-    // Since version 0.2, you can use single lookup to check the existing of member and its value:
-    Value::MemberIterator hello = document.FindMember("hello");
-    assert(hello != document.MemberEnd());
-    assert(hello->value.IsString());
-    assert(strcmp("world", hello->value.GetString()) == 0);
-    (void)hello;
-
-    assert(document["t"].IsBool());     // JSON true/false are bool. Can also uses more specific function IsTrue().
-    printf("t = %s\n", document["t"].GetBool() ? "true" : "false");
-
-    assert(document["f"].IsBool());
-    printf("f = %s\n", document["f"].GetBool() ? "true" : "false");
-
-    printf("n = %s\n", document["n"].IsNull() ? "null" : "?");
-
-    assert(document["i"].IsNumber());   // Number is a JSON type, but C++ needs more specific type.
-    assert(document["i"].IsInt());      // In this case, IsUint()/IsInt64()/IsUInt64() also return true.
-    printf("i = %d\n", document["i"].GetInt()); // Alternative (int)document["i"]
-
-    assert(document["pi"].IsNumber());
-    assert(document["pi"].IsDouble());
-    printf("pi = %g\n", document["pi"].GetDouble());
-
-    {
-        const Value& a = document["a"]; // Using a reference for consecutive access is handy and faster.
-        assert(a.IsArray());
-        for (SizeType i = 0; i < a.Size(); i++) // rapidjson uses SizeType instead of size_t.
-            printf("a[%d] = %d\n", i, a[i].GetInt());
-        
-        int y = a[0].GetInt();
-        (void)y;
-
-        // Iterating array with iterators
-        printf("a = ");
-        for (Value::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-            printf("%d ", itr->GetInt());
-        printf("\n");
-    }
-
-    // Iterating object members
-    static const char* kTypeNames[] = { "Null", "False", "True", "Object", "Array", "String", "Number" };
-    for (Value::ConstMemberIterator itr = document.MemberBegin(); itr != document.MemberEnd(); ++itr)
-        printf("Type of member %s is %s\n", itr->name.GetString(), kTypeNames[itr->value.GetType()]);
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 3. Modify values in document.
-
-    // Change i to a bigger number
-    {
-        uint64_t f20 = 1;   // compute factorial of 20
-        for (uint64_t j = 1; j <= 20; j++)
-            f20 *= j;
-        document["i"] = f20;    // Alternate form: document["i"].SetUint64(f20)
-        assert(!document["i"].IsInt()); // No longer can be cast as int or uint.
-    }
-
-    // Adding values to array.
-    {
-        Value& a = document["a"];   // This time we uses non-const reference.
-        Document::AllocatorType& allocator = document.GetAllocator();
-        for (int i = 5; i <= 10; i++)
-            a.PushBack(i, allocator);   // May look a bit strange, allocator is needed for potentially realloc. We normally uses the document's.
-
-        // Fluent API
-        a.PushBack("Lua", allocator).PushBack("Mio", allocator);
-    }
-
-    // Making string values.
-
-    // This version of SetString() just store the pointer to the string.
-    // So it is for literal and string that exists within value's life-cycle.
-    {
-        document["hello"] = "rapidjson";    // This will invoke strlen()
-        // Faster version:
-        // document["hello"].SetString("rapidjson", 9);
-    }
-
-    // This version of SetString() needs an allocator, which means it will allocate a new buffer and copy the the string into the buffer.
-    Value author;
-    {
-        char buffer[10];
-        int len = sprintf(buffer, "%s %s", "Milo", "Yip");  // synthetic example of dynamically created string.
-
-        author.SetString(buffer, static_cast<size_t>(len), document.GetAllocator());
-        // Shorter but slower version:
-        // document["hello"].SetString(buffer, document.GetAllocator());
-
-        // Constructor version: 
-        // Value author(buffer, len, document.GetAllocator());
-        // Value author(buffer, document.GetAllocator());
-        memset(buffer, 0, sizeof(buffer)); // For demonstration purpose.
-    }
-    // Variable 'buffer' is unusable now but 'author' has already made a copy.
-    document.AddMember("author", author, document.GetAllocator());
-
-    assert(author.IsNull());        // Move semantic for assignment. After this variable is assigned as a member, the variable becomes null.
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 4. Stringify JSON
-
-    printf("\nModified JSON with reformatting:\n");
-    FileStream f(stdout);
-    PrettyWriter<FileStream> writer(f);
-    document.Accept(writer);    // Accept() traverses the DOM and generates Handler events.
-
-    return 0;
-}
diff --git a/extra/rapidjson/include/rapidjson/allocators.h b/extra/rapidjson/include/rapidjson/allocators.h
index 0bd2d2895aec..cc67c8971323 100644
--- a/extra/rapidjson/include/rapidjson/allocators.h
+++ b/extra/rapidjson/include/rapidjson/allocators.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_ALLOCATORS_H_
 #define RAPIDJSON_ALLOCATORS_H_
@@ -58,6 +52,19 @@ concept Allocator {
 \endcode
 */
 
+
+/*! \def RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY
+    \ingroup RAPIDJSON_CONFIG
+    \brief User-defined kDefaultChunkCapacity definition.
+
+    User can define this as any \c size that is a power of 2.
+*/
+
+#ifndef RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY
+#define RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY (64 * 1024)
+#endif
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // CrtAllocator
 
@@ -68,8 +75,20 @@ concept Allocator {
 class CrtAllocator {
 public:
     static const bool kNeedFree = true;
-    void* Malloc(size_t size) { return std::malloc(size); }
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) { (void)originalSize; return std::realloc(originalPtr, newSize); }
+    void* Malloc(size_t size) { 
+        if (size) //  behavior of malloc(0) is implementation defined.
+            return std::malloc(size);
+        else
+            return NULL; // standardize to returning NULL.
+    }
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        (void)originalSize;
+        if (newSize == 0) {
+            std::free(originalPtr);
+            return NULL;
+        }
+        return std::realloc(originalPtr, newSize);
+    }
     static void Free(void *ptr) { std::free(ptr); }
 };
 
@@ -137,11 +156,13 @@ class MemoryPoolAllocator {
 
     //! Deallocates all memory chunks, excluding the user-supplied buffer.
     void Clear() {
-        while(chunkHead_ != 0 && chunkHead_ != userBuffer_) {
+        while (chunkHead_ && chunkHead_ != userBuffer_) {
             ChunkHeader* next = chunkHead_->next;
             baseAllocator_->Free(chunkHead_);
             chunkHead_ = next;
         }
+        if (chunkHead_ && chunkHead_ == userBuffer_)
+            chunkHead_->size = 0; // Clear user buffer
     }
 
     //! Computes the total capacity of allocated memory chunks.
@@ -166,11 +187,15 @@ class MemoryPoolAllocator {
 
     //! Allocates a memory block. (concept Allocator)
     void* Malloc(size_t size) {
+        if (!size)
+            return NULL;
+
         size = RAPIDJSON_ALIGN(size);
         if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
-            AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size);
+            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
+                return NULL;
 
-        void *buffer = reinterpret_cast<char *>(chunkHead_ + 1) + chunkHead_->size;
+        void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
         chunkHead_->size += size;
         return buffer;
     }
@@ -180,14 +205,19 @@ class MemoryPoolAllocator {
         if (originalPtr == 0)
             return Malloc(newSize);
 
+        if (newSize == 0)
+            return NULL;
+
+        originalSize = RAPIDJSON_ALIGN(originalSize);
+        newSize = RAPIDJSON_ALIGN(newSize);
+
         // Do not shrink if new size is smaller than original
         if (originalSize >= newSize)
             return originalPtr;
 
         // Simply expand it if it is the last allocation and there is sufficient space
-        if (originalPtr == (char *)(chunkHead_ + 1) + chunkHead_->size - originalSize) {
+        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
             size_t increment = static_cast<size_t>(newSize - originalSize);
-            increment = RAPIDJSON_ALIGN(increment);
             if (chunkHead_->size + increment <= chunkHead_->capacity) {
                 chunkHead_->size += increment;
                 return originalPtr;
@@ -195,9 +225,13 @@ class MemoryPoolAllocator {
         }
 
         // Realloc process: allocate and copy memory, do not free original buffer.
-        void* newBuffer = Malloc(newSize);
-        RAPIDJSON_ASSERT(newBuffer != 0);   // Do not handle out-of-memory explicitly.
-        return std::memcpy(newBuffer, originalPtr, originalSize);
+        if (void* newBuffer = Malloc(newSize)) {
+            if (originalSize)
+                std::memcpy(newBuffer, originalPtr, originalSize);
+            return newBuffer;
+        }
+        else
+            return NULL;
     }
 
     //! Frees a memory block (concept Allocator)
@@ -211,18 +245,23 @@ class MemoryPoolAllocator {
 
     //! Creates a new chunk.
     /*! \param capacity Capacity of the chunk in bytes.
+        \return true if success.
     */
-    void AddChunk(size_t capacity) {
+    bool AddChunk(size_t capacity) {
         if (!baseAllocator_)
-            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator());
-        ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(sizeof(ChunkHeader) + capacity));
-        chunk->capacity = capacity;
-        chunk->size = 0;
-        chunk->next = chunkHead_;
-        chunkHead_ =  chunk;
+            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
+        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
+            chunk->capacity = capacity;
+            chunk->size = 0;
+            chunk->next = chunkHead_;
+            chunkHead_ =  chunk;
+            return true;
+        }
+        else
+            return false;
     }
 
-    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
+    static const int kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
 
     //! Chunk header for perpending to each chunk.
     /*! Chunks are stored as a singly linked list.
diff --git a/extra/rapidjson/include/rapidjson/cursorstreamwrapper.h b/extra/rapidjson/include/rapidjson/cursorstreamwrapper.h
new file mode 100644
index 000000000000..52c11a7c01d7
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/cursorstreamwrapper.h
@@ -0,0 +1,78 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_CURSORSTREAMWRAPPER_H_
+#define RAPIDJSON_CURSORSTREAMWRAPPER_H_
+
+#include "stream.h"
+
+#if defined(__GNUC__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+RAPIDJSON_DIAG_OFF(4512)  // assignment operator could not be generated
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+
+//! Cursor stream wrapper for counting line and column number if error exists.
+/*!
+    \tparam InputStream     Any stream that implements Stream Concept
+*/
+template <typename InputStream, typename Encoding = UTF8<> >
+class CursorStreamWrapper : public GenericStreamWrapper<InputStream, Encoding> {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    CursorStreamWrapper(InputStream& is):
+        GenericStreamWrapper<InputStream, Encoding>(is), line_(1), col_(0) {}
+
+    // counting line and column number
+    Ch Take() {
+        Ch ch = this->is_.Take();
+        if(ch == '\n') {
+            line_ ++;
+            col_ = 0;
+        } else {
+            col_ ++;
+        }
+        return ch;
+    }
+
+    //! Get the error line number, if error exists.
+    size_t GetLine() const { return line_; }
+    //! Get the error column number, if error exists.
+    size_t GetColumn() const { return col_; }
+
+private:
+    size_t line_;   //!< Current Line
+    size_t col_;    //!< Current Column
+};
+
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+RAPIDJSON_DIAG_POP
+#endif
+
+#if defined(__GNUC__)
+RAPIDJSON_DIAG_POP
+#endif
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_CURSORSTREAMWRAPPER_H_
diff --git a/extra/rapidjson/include/rapidjson/document.h b/extra/rapidjson/include/rapidjson/document.h
index e6afc5fa6523..dbd66c7bec01 100644
--- a/extra/rapidjson/include/rapidjson/document.h
+++ b/extra/rapidjson/include/rapidjson/document.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_DOCUMENT_H_
 #define RAPIDJSON_DOCUMENT_H_
@@ -26,40 +20,27 @@
 #include "reader.h"
 #include "internal/meta.h"
 #include "internal/strfunc.h"
+#include "memorystream.h"
+#include "encodedstream.h"
 #include <new>      // placement new
+#include <limits>
 
-#ifdef _MSC_VER
 RAPIDJSON_DIAG_PUSH
+#ifdef __clang__
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(switch-enum)
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#elif defined(_MSC_VER)
 RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-#elif defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_HAS_STDSTRING
-
-#ifndef RAPIDJSON_HAS_STDSTRING
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
-#else
-#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
+RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
 #endif
-/*! \def RAPIDJSON_HAS_STDSTRING
-    \ingroup RAPIDJSON_CONFIG
-    \brief Enable RapidJSON support for \c std::string
-
-    By defining this preprocessor symbol to \c 1, several convenience functions for using
-    \ref rapidjson::GenericValue with \c std::string are enabled, especially
-    for construction and comparison.
 
-    \hideinitializer
-*/
-#include <string>
-#endif // RAPIDJSON_HAS_STDSTRING
+#ifdef __GNUC__
+RAPIDJSON_DIAG_OFF(effc++)
+#endif // __GNUC__
 
 #ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-#include <iterator> // std::iterator, std::random_access_iterator_tag
+#include <iterator> // std::random_access_iterator_tag
 #endif
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
@@ -72,6 +53,9 @@ RAPIDJSON_NAMESPACE_BEGIN
 template <typename Encoding, typename Allocator>
 class GenericValue;
 
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
 //! Name-value pair in a JSON object value.
 /*!
     This class was internal to GenericValue. It used to be a inner struct.
@@ -79,9 +63,45 @@ class GenericValue;
     https://code.google.com/p/rapidjson/issues/detail?id=64
 */
 template <typename Encoding, typename Allocator> 
-struct GenericMember { 
+class GenericMember {
+public:
     GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
     GenericValue<Encoding, Allocator> value;    //!< value of member.
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move constructor in C++11
+    GenericMember(GenericMember&& rhs) RAPIDJSON_NOEXCEPT
+        : name(std::move(rhs.name)),
+          value(std::move(rhs.value))
+    {
+    }
+
+    //! Move assignment in C++11
+    GenericMember& operator=(GenericMember&& rhs) RAPIDJSON_NOEXCEPT {
+        return *this = static_cast<GenericMember&>(rhs);
+    }
+#endif
+
+    //! Assignment with move semantics.
+    /*! \param rhs Source of the assignment. Its name and value will become a null value after assignment.
+    */
+    GenericMember& operator=(GenericMember& rhs) RAPIDJSON_NOEXCEPT {
+        if (RAPIDJSON_LIKELY(this != &rhs)) {
+            name = rhs.name;
+            value = rhs.value;
+        }
+        return *this;
+    }
+
+    // swap() for std::sort() and other potential use in STL.
+    friend inline void swap(GenericMember& a, GenericMember& b) RAPIDJSON_NOEXCEPT {
+        a.name.Swap(b.name);
+        a.value.Swap(b.value);
+    }
+
+private:
+    //! Copy constructor is not permitted.
+    GenericMember(const GenericMember& rhs);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -109,16 +129,13 @@ struct GenericMember {
     \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
  */
 template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator
-    : public std::iterator<std::random_access_iterator_tag
-        , typename internal::MaybeAddConst<Const,GenericMember<Encoding,Allocator> >::Type> {
+class GenericMemberIterator {
 
     friend class GenericValue<Encoding,Allocator>;
     template <bool, typename, typename> friend class GenericMemberIterator;
 
     typedef GenericMember<Encoding,Allocator> PlainType;
     typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef std::iterator<std::random_access_iterator_tag,ValueType> BaseType;
 
 public:
     //! Iterator type itself
@@ -128,12 +145,21 @@ class GenericMemberIterator
     //! Non-constant iterator type
     typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
 
+    /** \name std::iterator_traits support */
+    //@{
+    typedef ValueType      value_type;
+    typedef ValueType *    pointer;
+    typedef ValueType &    reference;
+    typedef std::ptrdiff_t difference_type;
+    typedef std::random_access_iterator_tag iterator_category;
+    //@}
+
     //! Pointer to (const) GenericMember
-    typedef typename BaseType::pointer         Pointer;
+    typedef pointer         Pointer;
     //! Reference to (const) GenericMember
-    typedef typename BaseType::reference       Reference;
+    typedef reference       Reference;
     //! Signed integer type (e.g. \c ptrdiff_t)
-    typedef typename BaseType::difference_type DifferenceType;
+    typedef difference_type DifferenceType;
 
     //! Default constructor (singular value)
     /*! Creates an iterator pointing to no element.
@@ -158,6 +184,7 @@ class GenericMemberIterator
             Otherwise, the copy constructor is implicitly defined.
     */
     GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
+    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
 
     //! @name stepping
     //@{
@@ -208,17 +235,17 @@ class GenericMemberIterator
 // class-based member iterator implementation disabled, use plain pointers
 
 template <bool Const, typename Encoding, typename Allocator>
-struct GenericMemberIterator;
+class GenericMemberIterator;
 
 //! non-const GenericMemberIterator
 template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<false,Encoding,Allocator> {
+class GenericMemberIterator<false,Encoding,Allocator> {
     //! use plain pointer as iterator type
     typedef GenericMember<Encoding,Allocator>* Iterator;
 };
 //! const GenericMemberIterator
 template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<true,Encoding,Allocator> {
+class GenericMemberIterator<true,Encoding,Allocator> {
     //! use plain const pointer as iterator type
     typedef const GenericMember<Encoding,Allocator>* Iterator;
 };
@@ -260,6 +287,7 @@ struct GenericStringRef {
     typedef CharType Ch; //!< character type of the string
 
     //! Create string reference from \c const character array
+#ifndef __clang__ // -Wdocumentation
     /*!
         This constructor implicitly creates a constant string reference from
         a \c const character array.  It has better performance than
@@ -282,11 +310,13 @@ struct GenericStringRef {
             In such cases, the referenced string should be \b copied to the
             GenericValue instead.
      */
+#endif
     template<SizeType N>
     GenericStringRef(const CharType (&str)[N]) RAPIDJSON_NOEXCEPT
         : s(str), length(N-1) {}
 
     //! Explicitly create string reference from \c const character pointer
+#ifndef __clang__ // -Wdocumentation
     /*!
         This constructor can be used to \b explicitly  create a reference to
         a constant string pointer.
@@ -305,18 +335,23 @@ struct GenericStringRef {
             In such cases, the referenced string should be \b copied to the
             GenericValue instead.
      */
+#endif
     explicit GenericStringRef(const CharType* str)
-        : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != NULL); }
+        : s(str), length(NotNullStrLen(str)) {}
 
     //! Create constant string reference from pointer and length
+#ifndef __clang__ // -Wdocumentation
     /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
         \param len length of the string, excluding the trailing NULL terminator
 
         \post \ref s == str && \ref length == len
         \note Constant complexity.
      */
+#endif
     GenericStringRef(const CharType* str, SizeType len)
-        : s(str), length(len) { RAPIDJSON_ASSERT(s != NULL); }
+        : s(RAPIDJSON_LIKELY(str) ? str : emptyString), length(len) { RAPIDJSON_ASSERT(str != 0 || len == 0u); }
+
+    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
 
     //! implicit conversion to plain CharType pointer
     operator const Ch *() const { return s; }
@@ -325,13 +360,24 @@ struct GenericStringRef {
     const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
 
 private:
-    //! Disallow copy-assignment
-    GenericStringRef operator=(const GenericStringRef&);
+    SizeType NotNullStrLen(const CharType* str) {
+        RAPIDJSON_ASSERT(str != 0);
+        return internal::StrLen(str);
+    }
+
+    /// Empty string - used when passing in a NULL pointer
+    static const Ch emptyString[];
+
     //! Disallow construction from non-const array
     template<SizeType N>
     GenericStringRef(CharType (&str)[N]) /* = delete */;
+    //! Copy assignment operator not permitted - immutable type
+    GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
 };
 
+template<typename CharType>
+const CharType GenericStringRef<CharType>::emptyString[] = { CharType() };
+
 //! Mark a character pointer as constant string
 /*! Mark a plain character pointer as a "string literal".  This function
     can be used to avoid copying a character string to be referenced as a
@@ -346,7 +392,7 @@ struct GenericStringRef {
 */
 template<typename CharType>
 inline GenericStringRef<CharType> StringRef(const CharType* str) {
-    return GenericStringRef<CharType>(str, internal::StrLen(str));
+    return GenericStringRef<CharType>(str);
 }
 
 //! Mark a character pointer as constant string
@@ -404,6 +450,147 @@ template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
 
 } // namespace internal
 
+///////////////////////////////////////////////////////////////////////////////
+// TypeHelper
+
+namespace internal {
+
+template <typename ValueType, typename T>
+struct TypeHelper {};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, bool> {
+    static bool Is(const ValueType& v) { return v.IsBool(); }
+    static bool Get(const ValueType& v) { return v.GetBool(); }
+    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
+    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int> {
+    static bool Is(const ValueType& v) { return v.IsInt(); }
+    static int Get(const ValueType& v) { return v.GetInt(); }
+    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
+    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, unsigned> {
+    static bool Is(const ValueType& v) { return v.IsUint(); }
+    static unsigned Get(const ValueType& v) { return v.GetUint(); }
+    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
+    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
+};
+
+#ifdef _MSC_VER
+RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
+template<typename ValueType>
+struct TypeHelper<ValueType, long> {
+    static bool Is(const ValueType& v) { return v.IsInt(); }
+    static long Get(const ValueType& v) { return v.GetInt(); }
+    static ValueType& Set(ValueType& v, long data) { return v.SetInt(data); }
+    static ValueType& Set(ValueType& v, long data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
+};
+
+RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
+template<typename ValueType>
+struct TypeHelper<ValueType, unsigned long> {
+    static bool Is(const ValueType& v) { return v.IsUint(); }
+    static unsigned long Get(const ValueType& v) { return v.GetUint(); }
+    static ValueType& Set(ValueType& v, unsigned long data) { return v.SetUint(data); }
+    static ValueType& Set(ValueType& v, unsigned long data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
+};
+#endif
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int64_t> {
+    static bool Is(const ValueType& v) { return v.IsInt64(); }
+    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
+    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
+    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, uint64_t> {
+    static bool Is(const ValueType& v) { return v.IsUint64(); }
+    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
+    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
+    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, double> {
+    static bool Is(const ValueType& v) { return v.IsDouble(); }
+    static double Get(const ValueType& v) { return v.GetDouble(); }
+    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
+    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, float> {
+    static bool Is(const ValueType& v) { return v.IsFloat(); }
+    static float Get(const ValueType& v) { return v.GetFloat(); }
+    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
+    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, const typename ValueType::Ch*> {
+    typedef const typename ValueType::Ch* StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return v.GetString(); }
+    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
+    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+
+#if RAPIDJSON_HAS_STDSTRING
+template<typename ValueType> 
+struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
+    typedef std::basic_string<typename ValueType::Ch> StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return StringType(v.GetString(), v.GetStringLength()); }
+    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+#endif
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Array> {
+    typedef typename ValueType::Array ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(ValueType& v) { return v.GetArray(); }
+    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstArray> {
+    typedef typename ValueType::ConstArray ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Object> {
+    typedef typename ValueType::Object ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(ValueType& v) { return v.GetObject(); }
+    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { return v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstObject> {
+    typedef typename ValueType::ConstObject ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
+};
+
+} // namespace internal
+
+// Forward declarations
+template <bool, typename> class GenericArray;
+template <bool, typename> class GenericObject;
+
 ///////////////////////////////////////////////////////////////////////////////
 // GenericValue
 
@@ -430,17 +617,22 @@ class GenericValue {
     typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
     typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
     typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
+    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
+    typedef GenericArray<false, ValueType> Array;
+    typedef GenericArray<true, ValueType> ConstArray;
+    typedef GenericObject<false, ValueType> Object;
+    typedef GenericObject<true, ValueType> ConstObject;
 
     //!@name Constructors and destructor.
     //@{
 
     //! Default constructor creates a null value.
-    GenericValue() RAPIDJSON_NOEXCEPT : data_(), flags_(kNullFlag) {}
+    GenericValue() RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
     //! Move constructor in C++11
-    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_), flags_(rhs.flags_) {
-        rhs.flags_ = kNullFlag; // give up contents
+    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
+        rhs.data_.f.flags = kNullFlag; // give up contents
     }
 #endif
 
@@ -448,6 +640,16 @@ class GenericValue {
     //! Copy constructor is not permitted.
     GenericValue(const GenericValue& rhs);
 
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Moving from a GenericDocument is not permitted.
+    template <typename StackAllocator>
+    GenericValue(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
+
+    //! Move assignment from a GenericDocument is not permitted.
+    template <typename StackAllocator>
+    GenericValue& operator=(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
+#endif
+
 public:
 
     //! Constructor with JSON value type.
@@ -455,13 +657,13 @@ class GenericValue {
         \param type Type of the value.
         \note Default content for number is zero.
     */
-    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_(), flags_() {
-        static const unsigned defaultFlags[7] = {
+    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_() {
+        static const uint16_t defaultFlags[] = {
             kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
             kNumberAnyFlag
         };
-        RAPIDJSON_ASSERT(type <= kNumberType);
-        flags_ = defaultFlags[type];
+        RAPIDJSON_NOEXCEPT_ASSERT(type >= kNullType && type <= kNumberType);
+        data_.f.flags = defaultFlags[type];
 
         // Use ShortString to store empty string.
         if (type == kStringType)
@@ -473,10 +675,50 @@ class GenericValue {
         \tparam SourceAllocator allocator of \c rhs
         \param rhs Value to copy from (read-only)
         \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
+        \param copyConstStrings Force copying of constant strings (e.g. referencing an in-situ buffer)
         \see CopyFrom()
     */
-    template< typename SourceAllocator >
-    GenericValue(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator & allocator);
+    template <typename SourceAllocator>
+    GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings = false) {
+        switch (rhs.GetType()) {
+        case kObjectType: {
+                SizeType count = rhs.data_.o.size;
+                Member* lm = reinterpret_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
+                const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer();
+                for (SizeType i = 0; i < count; i++) {
+                    new (&lm[i].name) GenericValue(rm[i].name, allocator, copyConstStrings);
+                    new (&lm[i].value) GenericValue(rm[i].value, allocator, copyConstStrings);
+                }
+                data_.f.flags = kObjectFlag;
+                data_.o.size = data_.o.capacity = count;
+                SetMembersPointer(lm);
+            }
+            break;
+        case kArrayType: {
+                SizeType count = rhs.data_.a.size;
+                GenericValue* le = reinterpret_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
+                const GenericValue<Encoding,SourceAllocator>* re = rhs.GetElementsPointer();
+                for (SizeType i = 0; i < count; i++)
+                    new (&le[i]) GenericValue(re[i], allocator, copyConstStrings);
+                data_.f.flags = kArrayFlag;
+                data_.a.size = data_.a.capacity = count;
+                SetElementsPointer(le);
+            }
+            break;
+        case kStringType:
+            if (rhs.data_.f.flags == kConstStringFlag && !copyConstStrings) {
+                data_.f.flags = rhs.data_.f.flags;
+                data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+            }
+            else
+                SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
+            break;
+        default:
+            data_.f.flags = rhs.data_.f.flags;
+            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+            break;
+        }
+    }
 
     //! Constructor for boolean value.
     /*! \param b Boolean value
@@ -486,96 +728,125 @@ class GenericValue {
      */
 #ifndef RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
     template <typename T>
-    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<T,bool>))) RAPIDJSON_NOEXCEPT
+    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) RAPIDJSON_NOEXCEPT  // See #472
 #else
     explicit GenericValue(bool b) RAPIDJSON_NOEXCEPT
 #endif
-        : data_(), flags_(b ? kTrueFlag : kFalseFlag) {
+        : data_() {
             // safe-guard against failing SFINAE
             RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
+            data_.f.flags = b ? kTrueFlag : kFalseFlag;
     }
 
     //! Constructor for int value.
-    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberIntFlag) {
+    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.i64 = i;
-        if (i >= 0)
-            flags_ |= kUintFlag | kUint64Flag;
+        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
     }
 
     //! Constructor for unsigned value.
-    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
+    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.u64 = u; 
-        if (!(u & 0x80000000))
-            flags_ |= kIntFlag | kInt64Flag;
+        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
     }
 
     //! Constructor for int64_t value.
-    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) {
+    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.i64 = i64;
+        data_.f.flags = kNumberInt64Flag;
         if (i64 >= 0) {
-            flags_ |= kNumberUint64Flag;
+            data_.f.flags |= kNumberUint64Flag;
             if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-                flags_ |= kUintFlag;
+                data_.f.flags |= kUintFlag;
             if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-                flags_ |= kIntFlag;
+                data_.f.flags |= kIntFlag;
         }
         else if (i64 >= static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            flags_ |= kIntFlag;
+            data_.f.flags |= kIntFlag;
     }
 
     //! Constructor for uint64_t value.
-    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) {
+    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.u64 = u64;
+        data_.f.flags = kNumberUint64Flag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
-            flags_ |= kInt64Flag;
+            data_.f.flags |= kInt64Flag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-            flags_ |= kUintFlag;
+            data_.f.flags |= kUintFlag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            flags_ |= kIntFlag;
+            data_.f.flags |= kIntFlag;
     }
 
     //! Constructor for double value.
-    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberDoubleFlag) { data_.n.d = d; }
+    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
+
+    //! Constructor for float value.
+    explicit GenericValue(float f) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = static_cast<double>(f); data_.f.flags = kNumberDoubleFlag; }
 
     //! Constructor for constant string (i.e. do not make a copy of string)
-    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(StringRef(s, length)); }
+    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
 
     //! Constructor for constant string (i.e. do not make a copy of string)
-    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(s); }
+    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
 
     //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s, length), allocator); }
+    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
 
     //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch*s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
+    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
 
 #if RAPIDJSON_HAS_STDSTRING
     //! Constructor for copy-string from a string object (i.e. do make a copy of string)
     /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
      */
-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
+    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
 #endif
 
+    //! Constructor for Array.
+    /*!
+        \param a An array obtained by \c GetArray().
+        \note \c Array is always pass-by-value.
+        \note the source array is moved into this value and the sourec array becomes empty.
+    */
+    GenericValue(Array a) RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
+        a.value_.data_ = Data();
+        a.value_.data_.f.flags = kArrayFlag;
+    }
+
+    //! Constructor for Object.
+    /*!
+        \param o An object obtained by \c GetObject().
+        \note \c Object is always pass-by-value.
+        \note the source object is moved into this value and the sourec object becomes empty.
+    */
+    GenericValue(Object o) RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
+        o.value_.data_ = Data();
+        o.value_.data_.f.flags = kObjectFlag;
+    }
+
     //! Destructor.
     /*! Need to destruct elements of array, members of object, or copy-string.
     */
     ~GenericValue() {
         if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
-            switch(flags_) {
+            switch(data_.f.flags) {
             case kArrayFlag:
-                for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
-                    v->~GenericValue();
-                Allocator::Free(data_.a.elements);
+                {
+                    GenericValue* e = GetElementsPointer();
+                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
+                        v->~GenericValue();
+                    Allocator::Free(e);
+                }
                 break;
 
             case kObjectFlag:
                 for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
                     m->~Member();
-                Allocator::Free(data_.o.members);
+                Allocator::Free(GetMembersPointer());
                 break;
 
             case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(data_.s.str));
+                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
                 break;
 
             default:
@@ -593,9 +864,10 @@ class GenericValue {
     /*! \param rhs Source of the assignment. It will become a null value after assignment.
     */
     GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
-        RAPIDJSON_ASSERT(this != &rhs);
-        this->~GenericValue();
-        RawAssign(rhs);
+        if (RAPIDJSON_LIKELY(this != &rhs)) {
+            this->~GenericValue();
+            RawAssign(rhs);
+        }
         return *this;
     }
 
@@ -640,12 +912,13 @@ class GenericValue {
         \tparam SourceAllocator Allocator type of \c rhs
         \param rhs Value to copy from (read-only)
         \param allocator Allocator to use for copying
+        \param copyConstStrings Force copying of constant strings (e.g. referencing an in-situ buffer)
      */
     template <typename SourceAllocator>
-    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator) {
-        RAPIDJSON_ASSERT((void*)this != (void const*)&rhs);
+    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings = false) {
+        RAPIDJSON_ASSERT(static_cast<void*>(this) != static_cast<void const*>(&rhs));
         this->~GenericValue();
-        new (this) GenericValue(rhs, allocator);
+        new (this) GenericValue(rhs, allocator, copyConstStrings);
         return *this;
     }
 
@@ -662,6 +935,20 @@ class GenericValue {
         return *this;
     }
 
+    //! free-standing swap function helper
+    /*!
+        Helper function to enable support for common swap implementation pattern based on \c std::swap:
+        \code
+        void swap(MyClass& a, MyClass& b) {
+            using std::swap;
+            swap(a.value, b.value);
+            // ...
+        }
+        \endcode
+        \see Swap()
+     */
+    friend inline void swap(GenericValue& a, GenericValue& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
+
     //! Prepare Value for move semantics
     /*! \return *this */
     GenericValue& Move() RAPIDJSON_NOEXCEPT { return *this; }
@@ -672,7 +959,7 @@ class GenericValue {
     //! Equal-to operator
     /*!
         \note If an object contains duplicated named member, comparing equality with any object is always \c false.
-        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
+        \note Complexity is quadratic in Object's member number and linear for the rest (number of all values in the subtree and total lengths of all strings).
     */
     template <typename SourceAllocator>
     bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
@@ -703,12 +990,15 @@ class GenericValue {
             return StringEqual(rhs);
 
         case kNumberType:
-            if (IsDouble() || rhs.IsDouble())
-                return GetDouble() == rhs.GetDouble(); // May convert one operand from integer to double.
+            if (IsDouble() || rhs.IsDouble()) {
+                double a = GetDouble();     // May convert from integer to double.
+                double b = rhs.GetDouble(); // Ditto
+                return a >= b && a <= b;    // Prevent -Wfloat-equal
+            }
             else
                 return data_.n.u64 == rhs.data_.n.u64;
 
-        default: // kTrueType, kFalseType, kNullType
+        default:
             return true;
         }
     }
@@ -756,20 +1046,58 @@ class GenericValue {
     //!@name Type
     //@{
 
-    Type GetType()  const { return static_cast<Type>(flags_ & kTypeMask); }
-    bool IsNull()   const { return flags_ == kNullFlag; }
-    bool IsFalse()  const { return flags_ == kFalseFlag; }
-    bool IsTrue()   const { return flags_ == kTrueFlag; }
-    bool IsBool()   const { return (flags_ & kBoolFlag) != 0; }
-    bool IsObject() const { return flags_ == kObjectFlag; }
-    bool IsArray()  const { return flags_ == kArrayFlag; }
-    bool IsNumber() const { return (flags_ & kNumberFlag) != 0; }
-    bool IsInt()    const { return (flags_ & kIntFlag) != 0; }
-    bool IsUint()   const { return (flags_ & kUintFlag) != 0; }
-    bool IsInt64()  const { return (flags_ & kInt64Flag) != 0; }
-    bool IsUint64() const { return (flags_ & kUint64Flag) != 0; }
-    bool IsDouble() const { return (flags_ & kDoubleFlag) != 0; }
-    bool IsString() const { return (flags_ & kStringFlag) != 0; }
+    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
+    bool IsNull()   const { return data_.f.flags == kNullFlag; }
+    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
+    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
+    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
+    bool IsObject() const { return data_.f.flags == kObjectFlag; }
+    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
+    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
+    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
+    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
+    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
+    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
+    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
+    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
+
+    // Checks whether a number can be losslessly converted to a double.
+    bool IsLosslessDouble() const {
+        if (!IsNumber()) return false;
+        if (IsUint64()) {
+            uint64_t u = GetUint64();
+            volatile double d = static_cast<double>(u);
+            return (d >= 0.0)
+                && (d < static_cast<double>((std::numeric_limits<uint64_t>::max)()))
+                && (u == static_cast<uint64_t>(d));
+        }
+        if (IsInt64()) {
+            int64_t i = GetInt64();
+            volatile double d = static_cast<double>(i);
+            return (d >= static_cast<double>((std::numeric_limits<int64_t>::min)()))
+                && (d < static_cast<double>((std::numeric_limits<int64_t>::max)()))
+                && (i == static_cast<int64_t>(d));
+        }
+        return true; // double, int, uint are always lossless
+    }
+
+    // Checks whether a number is a float (possible lossy).
+    bool IsFloat() const  {
+        if ((data_.f.flags & kDoubleFlag) == 0)
+            return false;
+        double d = GetDouble();
+        return d >= -3.4028234e38 && d <= 3.4028234e38;
+    }
+    // Checks whether a number can be losslessly converted to a float.
+    bool IsLosslessFloat() const {
+        if (!IsNumber()) return false;
+        double a = GetDouble();
+        if (a < static_cast<double>(-(std::numeric_limits<float>::max)())
+                || a > static_cast<double>((std::numeric_limits<float>::max)()))
+            return false;
+        double b = static_cast<double>(static_cast<float>(a));
+        return a >= b && a <= b;    // Prevent -Wfloat-equal
+    }
 
     //@}
 
@@ -783,7 +1111,7 @@ class GenericValue {
     //!@name Bool
     //@{
 
-    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return flags_ == kTrueFlag; }
+    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
     //!< Set boolean value
     /*! \post IsBool() == true */
     GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
@@ -800,6 +1128,9 @@ class GenericValue {
     //! Get the number of members in the object.
     SizeType MemberCount() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
 
+    //! Get the capacity of object.
+    SizeType MemberCapacity() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.capacity; }
+
     //! Check whether the object is empty.
     bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
 
@@ -836,25 +1167,52 @@ class GenericValue {
             return member->value;
         else {
             RAPIDJSON_ASSERT(false);    // see above note
-            static GenericValue NullValue;
-            return NullValue;
+
+            // This will generate -Wexit-time-destructors in clang
+            // static GenericValue NullValue;
+            // return NullValue;
+
+            // Use static buffer and placement-new to prevent destruction
+            static char buffer[sizeof(GenericValue)];
+            return *new (buffer) GenericValue();
         }
     }
     template <typename SourceAllocator>
     const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
 
+#if RAPIDJSON_HAS_STDSTRING
+    //! Get a value from an object associated with name (string object).
+    GenericValue& operator[](const std::basic_string<Ch>& name) { return (*this)[GenericValue(StringRef(name))]; }
+    const GenericValue& operator[](const std::basic_string<Ch>& name) const { return (*this)[GenericValue(StringRef(name))]; }
+#endif
+
     //! Const member iterator
     /*! \pre IsObject() == true */
-    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members); }
+    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
     //! Const \em past-the-end member iterator
     /*! \pre IsObject() == true */
-    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members + data_.o.size); }
+    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
     //! Member iterator
     /*! \pre IsObject() == true */
-    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members); }
+    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
     //! \em Past-the-end member iterator
     /*! \pre IsObject() == true */
-    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members + data_.o.size); }
+    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
+
+    //! Request the object to have enough capacity to store members.
+    /*! \param newCapacity  The capacity that the object at least need to have.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \note Linear time complexity.
+    */
+    GenericValue& MemberReserve(SizeType newCapacity, Allocator &allocator) {
+        RAPIDJSON_ASSERT(IsObject());
+        if (newCapacity > data_.o.capacity) {
+            SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), data_.o.capacity * sizeof(Member), newCapacity * sizeof(Member))));
+            data_.o.capacity = newCapacity;
+        }
+        return *this;
+    }
 
     //! Check whether a member exists in the object.
     /*!
@@ -866,6 +1224,18 @@ class GenericValue {
     */
     bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
 
+#if RAPIDJSON_HAS_STDSTRING
+    //! Check whether a member exists in the object with string object.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Whether a member with that name exists.
+        \note It is better to use FindMember() directly if you need the obtain the value as well.
+        \note Linear time complexity.
+    */
+    bool HasMember(const std::basic_string<Ch>& name) const { return FindMember(name) != MemberEnd(); }
+#endif
+
     //! Check whether a member exists in the object with GenericValue name.
     /*!
         This version is faster because it does not need a StrLen(). It can also handle string with null character.
@@ -922,6 +1292,18 @@ class GenericValue {
     }
     template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
 
+#if RAPIDJSON_HAS_STDSTRING
+    //! Find member by string object name.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Iterator to member, if it exists.
+            Otherwise returns \ref MemberEnd().
+    */
+    MemberIterator FindMember(const std::basic_string<Ch>& name) { return FindMember(GenericValue(StringRef(name))); }
+    ConstMemberIterator FindMember(const std::basic_string<Ch>& name) const { return FindMember(GenericValue(StringRef(name))); }
+#endif
+
     //! Add a member (name-value pair) to the object.
     /*! \param name A string value as name of member.
         \param value Value of any type.
@@ -936,20 +1318,12 @@ class GenericValue {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(name.IsString());
 
-        Object& o = data_.o;
-        if (o.size >= o.capacity) {
-            if (o.capacity == 0) {
-                o.capacity = kDefaultObjectCapacity;
-                o.members = reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member)));
-            }
-            else {
-                SizeType oldCapacity = o.capacity;
-                o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
-                o.members = reinterpret_cast<Member*>(allocator.Realloc(o.members, oldCapacity * sizeof(Member), o.capacity * sizeof(Member)));
-            }
-        }
-        o.members[o.size].name.RawAssign(name);
-        o.members[o.size].value.RawAssign(value);
+        ObjectData& o = data_.o;
+        if (o.size >= o.capacity)
+            MemberReserve(o.capacity == 0 ? kDefaultObjectCapacity : (o.capacity + (o.capacity + 1) / 2), allocator);
+        Member* members = GetMembersPointer();
+        members[o.size].name.RawAssign(name);
+        members[o.size].value.RawAssign(value);
         o.size++;
         return *this;
     }
@@ -968,6 +1342,22 @@ class GenericValue {
         return AddMember(name, v, allocator);
     }
 
+#if RAPIDJSON_HAS_STDSTRING
+    //! Add a string object as member (name-value pair) to the object.
+    /*! \param name A string value as name of member.
+        \param value constant string reference as value of member.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(GenericValue& name, std::basic_string<Ch>& value, Allocator& allocator) {
+        GenericValue v(value, allocator);
+        return AddMember(name, v, allocator);
+    }
+#endif
+
     //! Add any primitive value as member (name-value pair) to the object.
     /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
         \param name A string value as name of member.
@@ -1086,6 +1476,10 @@ class GenericValue {
         return RemoveMember(n);
     }
 
+#if RAPIDJSON_HAS_STDSTRING
+    bool RemoveMember(const std::basic_string<Ch>& name) { return RemoveMember(GenericValue(StringRef(name))); }
+#endif
+
     template <typename SourceAllocator>
     bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
         MemberIterator m = FindMember(name);
@@ -1108,18 +1502,14 @@ class GenericValue {
     MemberIterator RemoveMember(MemberIterator m) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(data_.o.members != 0);
+        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
         RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
 
-        MemberIterator last(data_.o.members + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last) {
-            // Move the last one to this place
-            *m = *last;
-        }
-        else {
-            // Only one left, just destroy
-            m->~Member();
-        }
+        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
+        if (data_.o.size > 1 && m != last)
+            *m = *last; // Move the last one to this place
+        else
+            m->~Member(); // Only one left, just destroy
         --data_.o.size;
         return m;
     }
@@ -1149,7 +1539,7 @@ class GenericValue {
     MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(data_.o.members != 0);
+        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
         RAPIDJSON_ASSERT(first >= MemberBegin());
         RAPIDJSON_ASSERT(first <= last);
         RAPIDJSON_ASSERT(last <= MemberEnd());
@@ -1157,11 +1547,39 @@ class GenericValue {
         MemberIterator pos = MemberBegin() + (first - MemberBegin());
         for (MemberIterator itr = pos; itr != last; ++itr)
             itr->~Member();
-        std::memmove(&*pos, &*last, (MemberEnd() - last) * sizeof(Member));
-        data_.o.size -= (last - first);
+        std::memmove(static_cast<void*>(&*pos), &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
+        data_.o.size -= static_cast<SizeType>(last - first);
         return pos;
     }
 
+    //! Erase a member in object by its name.
+    /*! \param name Name of member to be removed.
+        \return Whether the member existed.
+        \note Linear time complexity.
+    */
+    bool EraseMember(const Ch* name) {
+        GenericValue n(StringRef(name));
+        return EraseMember(n);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    bool EraseMember(const std::basic_string<Ch>& name) { return EraseMember(GenericValue(StringRef(name))); }
+#endif
+
+    template <typename SourceAllocator>
+    bool EraseMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        MemberIterator m = FindMember(name);
+        if (m != MemberEnd()) {
+            EraseMember(m);
+            return true;
+        }
+        else
+            return false;
+    }
+
+    Object GetObject() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
+    ConstObject GetObject() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
+
     //@}
 
     //!@name Array
@@ -1169,7 +1587,7 @@ class GenericValue {
 
     //! Set this value as an empty array.
     /*! \post IsArray == true */
-    GenericValue& SetArray() {  this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
+    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
 
     //! Get the number of elements in array.
     SizeType Size() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
@@ -1186,8 +1604,9 @@ class GenericValue {
     */
     void Clear() {
         RAPIDJSON_ASSERT(IsArray()); 
-        for (SizeType i = 0; i < data_.a.size; ++i)
-            data_.a.elements[i].~GenericValue();
+        GenericValue* e = GetElementsPointer();
+        for (GenericValue* v = e; v != e + data_.a.size; ++v)
+            v->~GenericValue();
         data_.a.size = 0;
     }
 
@@ -1199,16 +1618,16 @@ class GenericValue {
     GenericValue& operator[](SizeType index) {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(index < data_.a.size);
-        return data_.a.elements[index];
+        return GetElementsPointer()[index];
     }
     const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
 
     //! Element iterator
     /*! \pre IsArray() == true */
-    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements; }
+    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
     //! \em Past-the-end element iterator
     /*! \pre IsArray() == true */
-    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements + data_.a.size; }
+    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
     //! Constant element iterator
     /*! \pre IsArray() == true */
     ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
@@ -1225,7 +1644,7 @@ class GenericValue {
     GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
         RAPIDJSON_ASSERT(IsArray());
         if (newCapacity > data_.a.capacity) {
-            data_.a.elements = (GenericValue*)allocator.Realloc(data_.a.elements, data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue));
+            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
             data_.a.capacity = newCapacity;
         }
         return *this;
@@ -1245,7 +1664,7 @@ class GenericValue {
         RAPIDJSON_ASSERT(IsArray());
         if (data_.a.size >= data_.a.capacity)
             Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
-        data_.a.elements[data_.a.size++].RawAssign(value);
+        GetElementsPointer()[data_.a.size++].RawAssign(value);
         return *this;
     }
 
@@ -1299,7 +1718,7 @@ class GenericValue {
     GenericValue& PopBack() {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(!Empty());
-        data_.a.elements[--data_.a.size].~GenericValue();
+        GetElementsPointer()[--data_.a.size].~GenericValue();
         return *this;
     }
 
@@ -1325,35 +1744,48 @@ class GenericValue {
     ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(data_.a.size > 0);
-        RAPIDJSON_ASSERT(data_.a.elements != 0);
+        RAPIDJSON_ASSERT(GetElementsPointer() != 0);
         RAPIDJSON_ASSERT(first >= Begin());
         RAPIDJSON_ASSERT(first <= last);
         RAPIDJSON_ASSERT(last <= End());
         ValueIterator pos = Begin() + (first - Begin());
         for (ValueIterator itr = pos; itr != last; ++itr)
-            itr->~GenericValue();       
-        std::memmove(pos, last, (End() - last) * sizeof(GenericValue));
-        data_.a.size -= (last - first);
+            itr->~GenericValue();
+        std::memmove(static_cast<void*>(pos), last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
+        data_.a.size -= static_cast<SizeType>(last - first);
         return pos;
     }
 
+    Array GetArray() { RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
+    ConstArray GetArray() const { RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
+
     //@}
 
     //!@name Number
     //@{
 
-    int GetInt() const          { RAPIDJSON_ASSERT(flags_ & kIntFlag);   return data_.n.i.i;   }
-    unsigned GetUint() const    { RAPIDJSON_ASSERT(flags_ & kUintFlag);  return data_.n.u.u;   }
-    int64_t GetInt64() const    { RAPIDJSON_ASSERT(flags_ & kInt64Flag); return data_.n.i64; }
-    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(flags_ & kUint64Flag); return data_.n.u64; }
+    int GetInt() const          { RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
+    unsigned GetUint() const    { RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
+    int64_t GetInt64() const    { RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
+    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
 
+    //! Get the value as double type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
+    */
     double GetDouble() const {
         RAPIDJSON_ASSERT(IsNumber());
-        if ((flags_ & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
-        if ((flags_ & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
-        if ((flags_ & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
-        if ((flags_ & kInt64Flag) != 0)                 return (double)data_.n.i64; // int64_t -> double (may lose precision)
-        RAPIDJSON_ASSERT((flags_ & kUint64Flag) != 0);  return (double)data_.n.u64; // uint64_t -> double (may lose precision)
+        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
+        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
+        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
+        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
+        RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
+    }
+
+    //! Get the value as float type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
+    */
+    float GetFloat() const {
+        return static_cast<float>(GetDouble());
     }
 
     GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
@@ -1361,18 +1793,19 @@ class GenericValue {
     GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
     GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
     GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
+    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(static_cast<double>(f)); return *this; }
 
     //@}
 
     //!@name String
     //@{
 
-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? data_.ss.str : data_.s.str); }
+    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
 
     //! Get the length of string.
     /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
     */
-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
+    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
 
     //! Set this value as a string without copying source string.
     /*! This version has better performance with supplied length, and also support string containing null character.
@@ -1399,7 +1832,7 @@ class GenericValue {
         \return The value itself for fluent API.
         \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
     */
-    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(StringRef(s, length), allocator); return *this; }
+    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { return SetString(StringRef(s, length), allocator); }
 
     //! Set this value as a string by copying from source string.
     /*! \param s source string. 
@@ -1407,7 +1840,15 @@ class GenericValue {
         \return The value itself for fluent API.
         \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
     */
-    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(s, internal::StrLen(s), allocator); }
+    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(StringRef(s), allocator); }
+
+    //! Set this value as a string by copying from source string.
+    /*! \param s source string reference
+        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() != s.s && strcmp(GetString(),s) == 0 && GetStringLength() == length
+    */
+    GenericValue& SetString(StringRefType s, Allocator& allocator) { this->~GenericValue(); SetStringRaw(s, allocator); return *this; }
 
 #if RAPIDJSON_HAS_STDSTRING
     //! Set this value as a string by copying from source string.
@@ -1417,11 +1858,35 @@ class GenericValue {
         \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
         \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
     */
-    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(s.data(), s.size(), allocator); }
+    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(StringRef(s), allocator); }
 #endif
 
     //@}
 
+    //!@name Array
+    //@{
+
+    //! Templated version for checking whether this value is type T.
+    /*!
+        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
+    */
+    template <typename T>
+    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
+
+    template <typename T>
+    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template <typename T>
+    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template<typename T>
+    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
+
+    template<typename T>
+    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
+
+    //@}
+
     //! Generate events of this value to a Handler.
     /*! This function adopts the GoF visitor pattern.
         Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
@@ -1437,39 +1902,36 @@ class GenericValue {
         case kTrueType:     return handler.Bool(true);
 
         case kObjectType:
-            if (!handler.StartObject())
+            if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
                 return false;
             for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
                 RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
-                if (!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.flags_ & kCopyFlag) != 0))
+                if (RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
                     return false;
-                if (!m->value.Accept(handler))
+                if (RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
                     return false;
             }
             return handler.EndObject(data_.o.size);
 
         case kArrayType:
-            if (!handler.StartArray())
+            if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
                 return false;
-            for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
-                if (!v->Accept(handler))
+            for (const GenericValue* v = Begin(); v != End(); ++v)
+                if (RAPIDJSON_UNLIKELY(!v->Accept(handler)))
                     return false;
             return handler.EndArray(data_.a.size);
     
         case kStringType:
-            return handler.String(GetString(), GetStringLength(), (flags_ & kCopyFlag) != 0);
+            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
     
-        case kNumberType:
-            if (IsInt())            return handler.Int(data_.n.i.i);
+        default:
+            RAPIDJSON_ASSERT(GetType() == kNumberType);
+            if (IsDouble())         return handler.Double(data_.n.d);
+            else if (IsInt())       return handler.Int(data_.n.i.i);
             else if (IsUint())      return handler.Uint(data_.n.u.u);
             else if (IsInt64())     return handler.Int64(data_.n.i64);
-            else if (IsUint64())    return handler.Uint64(data_.n.u64);
-            else                    return handler.Double(data_.n.d);
-    
-        default:
-            RAPIDJSON_ASSERT(false);
+            else                    return handler.Uint64(data_.n.u64);
         }
-        return false;
     }
 
 private:
@@ -1477,16 +1939,16 @@ class GenericValue {
     template <typename, typename, typename> friend class GenericDocument;
 
     enum {
-        kBoolFlag = 0x100,
-        kNumberFlag = 0x200,
-        kIntFlag = 0x400,
-        kUintFlag = 0x800,
-        kInt64Flag = 0x1000,
-        kUint64Flag = 0x2000,
-        kDoubleFlag = 0x4000,
-        kStringFlag = 0x100000,
-        kCopyFlag = 0x200000,
-        kInlineStrFlag = 0x400000,
+        kBoolFlag       = 0x0008,
+        kNumberFlag     = 0x0010,
+        kIntFlag        = 0x0020,
+        kUintFlag       = 0x0040,
+        kInt64Flag      = 0x0080,
+        kUint64Flag     = 0x0100,
+        kDoubleFlag     = 0x0200,
+        kStringFlag     = 0x0400,
+        kCopyFlag       = 0x0800,
+        kInlineStrFlag  = 0x1000,
 
         // Initial flags of different types.
         kNullFlag = kNullType,
@@ -1504,16 +1966,27 @@ class GenericValue {
         kObjectFlag = kObjectType,
         kArrayFlag = kArrayType,
 
-        kTypeMask = 0xFF    // bitwise-and with mask of 0xFF can be optimized by compiler
+        kTypeMask = 0x07
     };
 
     static const SizeType kDefaultArrayCapacity = 16;
     static const SizeType kDefaultObjectCapacity = 16;
 
+    struct Flag {
+#if RAPIDJSON_48BITPOINTER_OPTIMIZATION
+        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
+#elif RAPIDJSON_64BIT
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
+#else
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
+#endif
+        uint16_t flags;
+    };
+
     struct String {
-        const Ch* str;
         SizeType length;
-        unsigned hashcode;  //!< reserved
+        SizeType hashcode;  //!< reserved
+        const Ch* str;
     };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
     // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
@@ -1522,15 +1995,15 @@ class GenericValue {
     // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
     // the string terminator as well. For getting the string length back from that value just use
     // "MaxSize - str[LenPos]".
-    // This allows to store 11-chars strings in 32-bit mode and 15-chars strings in 64-bit mode
-    // inline (for `UTF8`-encoded strings).
+    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
+    // 13-chars strings for RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
     struct ShortString {
-        enum { MaxChars = sizeof(String) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
+        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
         Ch str[MaxChars];
 
-        inline static bool Usable(SizeType len) { return            (MaxSize >= len); }
-        inline void     SetLength(SizeType len) { str[LenPos] = (Ch)(MaxSize -  len); }
-        inline SizeType GetLength() const       { return  (SizeType)(MaxSize -  str[LenPos]); }
+        inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
+        inline void     SetLength(SizeType len) { str[LenPos] = static_cast<Ch>(MaxSize -  len); }
+        inline SizeType GetLength() const       { return  static_cast<SizeType>(MaxSize -  str[LenPos]); }
     };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
     // By using proper binary layout, retrieval of different integer types do not need conversions.
@@ -1559,61 +2032,79 @@ class GenericValue {
         double d;
     };  // 8 bytes
 
-    struct Object {
-        Member* members;
+    struct ObjectData {
         SizeType size;
         SizeType capacity;
+        Member* members;
     };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
-    struct Array {
-        GenericValue* elements;
+    struct ArrayData {
         SizeType size;
         SizeType capacity;
+        GenericValue* elements;
     };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
     union Data {
         String s;
         ShortString ss;
         Number n;
-        Object o;
-        Array a;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+        ObjectData o;
+        ArrayData a;
+        Flag f;
+    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+    RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
+    RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
+    RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
+    RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
+    RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return RAPIDJSON_GETPOINTER(Member, data_.o.members); }
+    RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
 
     // Initialize this value as array with initial data, without calling destructor.
     void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
-        flags_ = kArrayFlag;
-        data_.a.elements = (GenericValue*)allocator.Malloc(count * sizeof(GenericValue));
-        std::memcpy(data_.a.elements, values, count * sizeof(GenericValue));
+        data_.f.flags = kArrayFlag;
+        if (count) {
+            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
+            SetElementsPointer(e);
+            std::memcpy(static_cast<void*>(e), values, count * sizeof(GenericValue));
+        }
+        else
+            SetElementsPointer(0);
         data_.a.size = data_.a.capacity = count;
     }
 
     //! Initialize this value as object with initial data, without calling destructor.
     void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
-        flags_ = kObjectFlag;
-        data_.o.members = (Member*)allocator.Malloc(count * sizeof(Member));
-        std::memcpy(data_.o.members, members, count * sizeof(Member));
+        data_.f.flags = kObjectFlag;
+        if (count) {
+            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
+            SetMembersPointer(m);
+            std::memcpy(static_cast<void*>(m), members, count * sizeof(Member));
+        }
+        else
+            SetMembersPointer(0);
         data_.o.size = data_.o.capacity = count;
     }
 
     //! Initialize this value as constant string, without calling destructor.
     void SetStringRaw(StringRefType s) RAPIDJSON_NOEXCEPT {
-        flags_ = kConstStringFlag;
-        data_.s.str = s;
+        data_.f.flags = kConstStringFlag;
+        SetStringPointer(s);
         data_.s.length = s.length;
     }
 
     //! Initialize this value as copy string with initial data, without calling destructor.
     void SetStringRaw(StringRefType s, Allocator& allocator) {
-        Ch* str = NULL;
-        if(ShortString::Usable(s.length)) {
-            flags_ = kShortStringFlag;
+        Ch* str = 0;
+        if (ShortString::Usable(s.length)) {
+            data_.f.flags = kShortStringFlag;
             data_.ss.SetLength(s.length);
             str = data_.ss.str;
         } else {
-            flags_ = kCopyStringFlag;
+            data_.f.flags = kCopyStringFlag;
             data_.s.length = s.length;
-            str = (Ch *)allocator.Malloc((s.length + 1) * sizeof(Ch));
-            data_.s.str = str;
+            str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
+            SetStringPointer(str);
         }
         std::memcpy(str, s, s.length * sizeof(Ch));
         str[s.length] = '\0';
@@ -1622,8 +2113,8 @@ class GenericValue {
     //! Assignment without calling destructor
     void RawAssign(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
         data_ = rhs.data_;
-        flags_ = rhs.flags_;
-        rhs.flags_ = kNullFlag;
+        // data_.f.flags = rhs.data_.f.flags;
+        rhs.data_.f.flags = kNullFlag;
     }
 
     template <typename SourceAllocator>
@@ -1643,7 +2134,6 @@ class GenericValue {
     }
 
     Data data_;
-    unsigned flags_;
 };
 
 //! GenericValue with UTF8 encoding
@@ -1668,7 +2158,22 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
 
     //! Constructor
-    /*! \param allocator        Optional allocator for allocating memory.
+    /*! Creates an empty document of specified type.
+        \param type             Mandatory type of object to create.
+        \param allocator        Optional allocator for allocating memory.
+        \param stackCapacity    Optional initial capacity of stack in bytes.
+        \param stackAllocator   Optional allocator for allocating memory for stack.
+    */
+    explicit GenericDocument(Type type, Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) :
+        GenericValue<Encoding, Allocator>(type),  allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
+    {
+        if (!allocator_)
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
+    }
+
+    //! Constructor
+    /*! Creates an empty document which type is Null. 
+        \param allocator        Optional allocator for allocating memory.
         \param stackCapacity    Optional initial capacity of stack in bytes.
         \param stackAllocator   Optional allocator for allocating memory for stack.
     */
@@ -1676,13 +2181,13 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
         allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
     {
         if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
     }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
     //! Move constructor in C++11
     GenericDocument(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
-        : ValueType(std::move(rhs)),
+        : ValueType(std::forward<ValueType>(rhs)), // explicit cast to avoid prohibited move from Document
           allocator_(rhs.allocator_),
           ownAllocator_(rhs.ownAllocator_),
           stack_(std::move(rhs.stack_)),
@@ -1722,6 +2227,54 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     }
 #endif
 
+    //! Exchange the contents of this document with those of another.
+    /*!
+        \param rhs Another document.
+        \note Constant complexity.
+        \see GenericValue::Swap
+    */
+    GenericDocument& Swap(GenericDocument& rhs) RAPIDJSON_NOEXCEPT {
+        ValueType::Swap(rhs);
+        stack_.Swap(rhs.stack_);
+        internal::Swap(allocator_, rhs.allocator_);
+        internal::Swap(ownAllocator_, rhs.ownAllocator_);
+        internal::Swap(parseResult_, rhs.parseResult_);
+        return *this;
+    }
+
+    // Allow Swap with ValueType.
+    // Refer to Effective C++ 3rd Edition/Item 33: Avoid hiding inherited names.
+    using ValueType::Swap;
+
+    //! free-standing swap function helper
+    /*!
+        Helper function to enable support for common swap implementation pattern based on \c std::swap:
+        \code
+        void swap(MyClass& a, MyClass& b) {
+            using std::swap;
+            swap(a.doc, b.doc);
+            // ...
+        }
+        \endcode
+        \see Swap()
+     */
+    friend inline void swap(GenericDocument& a, GenericDocument& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
+
+    //! Populate this document by a generator which produces SAX events.
+    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
+        \param g Generator functor which sends SAX events to the parameter.
+        \return The document itself for fluent API.
+    */
+    template <typename Generator>
+    GenericDocument& Populate(Generator& g) {
+        ClearStackOnExit scope(*this);
+        if (g(*this)) {
+            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
+            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
+        }
+        return *this;
+    }
+
     //!@name Parse from stream
     //!@{
 
@@ -1734,13 +2287,13 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     */
     template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
     GenericDocument& ParseStream(InputStream& is) {
-        ValueType::SetNull(); // Remove existing root if exist
-        GenericReader<SourceEncoding, Encoding, Allocator> reader(&GetAllocator());
+        GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
+            stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
         ClearStackOnExit scope(*this);
         parseResult_ = reader.template Parse<parseFlags>(is, *this);
         if (parseResult_) {
             RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            this->RawAssign(*stack_.template Pop<ValueType>(1));    // Add this-> to prevent issue 13.
+            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
         }
         return *this;
     }
@@ -1753,7 +2306,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     */
     template <unsigned parseFlags, typename InputStream>
     GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<parseFlags,Encoding,InputStream>(is);
+        return ParseStream<parseFlags, Encoding, InputStream>(is);
     }
 
     //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
@@ -1770,18 +2323,6 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     //!@name Parse in-place from mutable string
     //!@{
 
-    //! Parse JSON text from a mutable string (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam SourceEncoding Transcoding from input Encoding
-        \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& ParseInsitu(Ch* str) {
-        GenericInsituStringStream<Encoding> s(str);
-        return ParseStream<parseFlags | kParseInsituFlag, SourceEncoding>(s);
-    }
-
     //! Parse JSON text from a mutable string
     /*! \tparam parseFlags Combination of \ref ParseFlag.
         \param str Mutable zero-terminated string to be parsed.
@@ -1789,7 +2330,8 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     */
     template <unsigned parseFlags>
     GenericDocument& ParseInsitu(Ch* str) {
-        return ParseInsitu<parseFlags, Encoding>(str);
+        GenericInsituStringStream<Encoding> s(str);
+        return ParseStream<parseFlags | kParseInsituFlag>(s);
     }
 
     //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
@@ -1797,7 +2339,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
         \return The document itself for fluent API.
     */
     GenericDocument& ParseInsitu(Ch* str) {
-        return ParseInsitu<kParseDefaultFlags, Encoding>(str);
+        return ParseInsitu<kParseDefaultFlags>(str);
     }
     //!@}
 
@@ -1810,7 +2352,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
         \param str Read-only zero-terminated string to be parsed.
     */
     template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const Ch* str) {
+    GenericDocument& Parse(const typename SourceEncoding::Ch* str) {
         RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
         GenericStringStream<SourceEncoding> s(str);
         return ParseStream<parseFlags, SourceEncoding>(s);
@@ -1831,12 +2373,48 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     GenericDocument& Parse(const Ch* str) {
         return Parse<kParseDefaultFlags>(str);
     }
+
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
+        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
+        MemoryStream ms(reinterpret_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
+        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
+        ParseStream<parseFlags, SourceEncoding>(is);
+        return *this;
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<parseFlags, Encoding>(str, length);
+    }
+    
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<kParseDefaultFlags>(str, length);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
+        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
+        return Parse<parseFlags, SourceEncoding>(str.c_str());
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<parseFlags, Encoding>(str.c_str());
+    }
+
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<kParseDefaultFlags>(str);
+    }
+#endif // RAPIDJSON_HAS_STDSTRING    
+
     //!@}
 
     //!@name Handling parse errors
     //!@{
 
-    //! Whether a parse error has occured in the last parsing.
+    //! Whether a parse error has occurred in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
 
     //! Get the \ref ParseErrorCode of last parsing.
@@ -1845,10 +2423,26 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     //! Get the position of last parsing error in input, 0 otherwise.
     size_t GetErrorOffset() const { return parseResult_.Offset(); }
 
+    //! Implicit conversion to get the last parse result
+#ifndef __clang // -Wdocumentation
+    /*! \return \ref ParseResult of the last parse operation
+
+        \code
+          Document doc;
+          ParseResult ok = doc.Parse(json);
+          if (!ok)
+            printf( "JSON parse error: %s (%u)\n", GetParseError_En(ok.Code()), ok.Offset());
+        \endcode
+     */
+#endif
+    operator ParseResult() const { return parseResult_; }
     //!@}
 
     //! Get the allocator of this document.
-    Allocator& GetAllocator() { return *allocator_; }
+    Allocator& GetAllocator() {
+        RAPIDJSON_ASSERT(allocator_);
+        return *allocator_;
+    }
 
     //! Get the capacity of stack in bytes.
     size_t GetStackCapacity() const { return stack_.GetCapacity(); }
@@ -1865,9 +2459,10 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     };
 
     // callers of the following private Handler functions
-    template <typename,typename,typename> friend class GenericReader; // for parsing
+    // template <typename,typename,typename> friend class GenericReader; // for parsing
     template <typename, typename> friend class GenericValue; // for deep copying
 
+public:
     // Implementation of Handler
     bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
     bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
@@ -1877,6 +2472,14 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
     bool Double(double d, bool is_int = false) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
 
+    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
+        if (copy) 
+            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
+        else
+            new (stack_.template Push<ValueType>()) ValueType(str, length);
+        return true;
+    }
+
     bool String(const Ch* str, SizeType length, bool copy) { 
         if (copy) 
             new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
@@ -1891,7 +2494,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
 
     bool EndObject(SizeType memberCount) {
         typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
-        stack_.template Top<ValueType>()->SetObjectRaw(members, (SizeType)memberCount, GetAllocator());
+        stack_.template Top<ValueType>()->SetObjectRaw(members, memberCount, GetAllocator());
         return true;
     }
 
@@ -1932,38 +2535,148 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
 //! GenericDocument with UTF8 encoding
 typedef GenericDocument<UTF8<> > Document;
 
-// defined here due to the dependency on GenericDocument
-template <typename Encoding, typename Allocator>
-template <typename SourceAllocator>
-inline
-GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
-{
-    switch (rhs.GetType()) {
-    case kObjectType:
-    case kArrayType: { // perform deep copy via SAX Handler
-            GenericDocument<Encoding,Allocator> d(&allocator);
-            rhs.Accept(d);
-            RawAssign(*d.stack_.template Pop<GenericValue>(1));
-        }
-        break;
-    case kStringType:
-        if (rhs.flags_ == kConstStringFlag) {
-            flags_ = rhs.flags_;
-            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-        } else {
-            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
-        }
-        break;
-    default: // kNumberType, kTrueType, kFalseType, kNullType
-        flags_ = rhs.flags_;
-        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-    }
-}
+//! Helper class for accessing Value of array type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetArray().
+    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericArray {
+public:
+    typedef GenericArray<true, ValueT> ConstArray;
+    typedef GenericArray<false, ValueT> Array;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
+    typedef const ValueT* ConstValueIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
+    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericArray() {}
+
+    SizeType Size() const { return value_.Size(); }
+    SizeType Capacity() const { return value_.Capacity(); }
+    bool Empty() const { return value_.Empty(); }
+    void Clear() const { value_.Clear(); }
+    ValueType& operator[](SizeType index) const {  return value_[index]; }
+    ValueIterator Begin() const { return value_.Begin(); }
+    ValueIterator End() const { return value_.End(); }
+    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
+    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    GenericArray PopBack() const { value_.PopBack(); return *this; }
+    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
+    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
+
+#if RAPIDJSON_HAS_CXX11_RANGE_FOR
+    ValueIterator begin() const { return value_.Begin(); }
+    ValueIterator end() const { return value_.End(); }
+#endif
 
-RAPIDJSON_NAMESPACE_END
+private:
+    GenericArray();
+    GenericArray(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
 
-#if defined(_MSC_VER) || defined(__GNUC__)
-RAPIDJSON_DIAG_POP
+//! Helper class for accessing Value of object type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetObject().
+    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericObject {
+public:
+    typedef GenericObject<true, ValueT> ConstObject;
+    typedef GenericObject<false, ValueT> Object;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
+    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename ValueType::Ch Ch;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
+    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericObject() {}
+
+    SizeType MemberCount() const { return value_.MemberCount(); }
+    SizeType MemberCapacity() const { return value_.MemberCapacity(); }
+    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
+    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
+    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
+#if RAPIDJSON_HAS_STDSTRING
+    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
+#endif
+    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
+    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
+    GenericObject MemberReserve(SizeType newCapacity, AllocatorType &allocator) const { value_.MemberReserve(newCapacity, allocator); return *this; }
+    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
+#endif
+    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
+    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
+    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
+#endif
+    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if RAPIDJSON_HAS_STDSTRING
+    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    void RemoveAllMembers() { value_.RemoveAllMembers(); }
+    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
+#endif
+    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
+    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
+    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
+    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
+    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
 #endif
+    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
+
+#if RAPIDJSON_HAS_CXX11_RANGE_FOR
+    MemberIterator begin() const { return value_.MemberBegin(); }
+    MemberIterator end() const { return value_.MemberEnd(); }
+#endif
+
+private:
+    GenericObject();
+    GenericObject(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
+
+RAPIDJSON_NAMESPACE_END
+RAPIDJSON_DIAG_POP
 
 #endif // RAPIDJSON_DOCUMENT_H_
diff --git a/extra/rapidjson/include/rapidjson/encodedstream.h b/extra/rapidjson/include/rapidjson/encodedstream.h
index ee8caa05fe82..223601c0599b 100644
--- a/extra/rapidjson/include/rapidjson/encodedstream.h
+++ b/extra/rapidjson/include/rapidjson/encodedstream.h
@@ -1,33 +1,33 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_ENCODEDSTREAM_H_
 #define RAPIDJSON_ENCODEDSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
+#include "memorystream.h"
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
 #endif
 
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 //! Input byte stream wrapper with a statically bound encoding.
@@ -63,10 +63,38 @@ class EncodedInputStream {
     Ch current_;
 };
 
+//! Specialized for UTF8 MemoryStream.
+template <>
+class EncodedInputStream<UTF8<>, MemoryStream> {
+public:
+    typedef UTF8<>::Ch Ch;
+
+    EncodedInputStream(MemoryStream& is) : is_(is) {
+        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
+    }
+    Ch Peek() const { return is_.Peek(); }
+    Ch Take() { return is_.Take(); }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) {}
+    void Flush() {} 
+    Ch* PutBegin() { return 0; }
+    size_t PutEnd(Ch*) { return 0; }
+
+    MemoryStream& is_;
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+};
+
 //! Output byte stream wrapper with statically bound encoding.
 /*!
     \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam InputByteStream Type of input byte stream. For example, FileWriteStream.
+    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
 */
 template <typename Encoding, typename OutputByteStream>
 class EncodedOutputStream {
@@ -83,8 +111,8 @@ class EncodedOutputStream {
     void Flush() { os_.Flush(); }
 
     // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); }
-    Ch Take() { RAPIDJSON_ASSERT(false);  }
+    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
     size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
     Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
     size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
@@ -115,6 +143,7 @@ class AutoUTFInputStream {
         \param type UTF encoding type if it is not detected from the stream.
     */
     AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
         DetectType();
         static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
         takeFunc_ = f[type_];
@@ -147,11 +176,11 @@ class AutoUTFInputStream {
         // FF FE        UTF-16LE
         // EF BB BF     UTF-8
 
-        const unsigned char* c = (const unsigned char *)is_->Peek4();
+        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
         if (!c)
             return;
 
-        unsigned bom = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
+        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
         hasBOM_ = false;
         if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
         else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
@@ -171,7 +200,7 @@ class AutoUTFInputStream {
         // xx xx xx xx  UTF-8
 
         if (!hasBOM_) {
-            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
+            int pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
             switch (pattern) {
             case 0x08: type_ = kUTF32BE; break;
             case 0x0A: type_ = kUTF16BE; break;
@@ -183,21 +212,8 @@ class AutoUTFInputStream {
         }
 
         // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        switch (type_) {
-        case kUTF8:
-            // Do nothing
-            break;
-        case kUTF16LE:
-        case kUTF16BE:
-            RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-            break;
-        case kUTF32LE:
-        case kUTF32BE:
-            RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-            break;
-        default:
-            RAPIDJSON_ASSERT(false);    // Invalid type
-        }
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
     }
 
     typedef Ch (*TakeFunc)(InputByteStream& is);
@@ -211,7 +227,7 @@ class AutoUTFInputStream {
 //! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
 /*!
     \tparam CharType Type of character for writing.
-    \tparam InputByteStream type of output byte stream to be wrapped.
+    \tparam OutputByteStream type of output byte stream to be wrapped.
 */
 template <typename CharType, typename OutputByteStream>
 class AutoUTFOutputStream {
@@ -226,22 +242,11 @@ class AutoUTFOutputStream {
         \param putBOM Whether to write BOM at the beginning of the stream.
     */
     AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
-        // RUntime check whether the size of character type is sufficient. It only perform checks with assertion.
-        switch (type_) {
-        case kUTF16LE:
-        case kUTF16BE:
-            RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-            break;
-        case kUTF32LE:
-        case kUTF32BE:
-            RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-            break;
-        case kUTF8:
-            // Do nothing
-            break;
-        default:
-            RAPIDJSON_ASSERT(false);    // Invalid UTFType
-        }
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
 
         static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
         putFunc_ = f[type_];
@@ -256,8 +261,8 @@ class AutoUTFOutputStream {
     void Flush() { os_->Flush(); } 
 
     // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); }
-    Ch Take() { RAPIDJSON_ASSERT(false); }
+    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
     size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
     Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
     size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
@@ -283,6 +288,10 @@ class AutoUTFOutputStream {
 
 RAPIDJSON_NAMESPACE_END
 
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
 #ifdef __GNUC__
 RAPIDJSON_DIAG_POP
 #endif
diff --git a/extra/rapidjson/include/rapidjson/encodings.h b/extra/rapidjson/include/rapidjson/encodings.h
index 71595f70c831..0b2446795015 100644
--- a/extra/rapidjson/include/rapidjson/encodings.h
+++ b/extra/rapidjson/include/rapidjson/encodings.h
@@ -1,35 +1,30 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_ENCODINGS_H_
 #define RAPIDJSON_ENCODINGS_H_
 
 #include "rapidjson.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
 RAPIDJSON_DIAG_OFF(4702)  // unreachable code
 #elif defined(__GNUC__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(overflow)
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -125,59 +120,85 @@ struct UTF8 {
         }
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | ((unsigned char)c & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        Ch c = is.Take();
+#define RAPIDJSON_COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
+#define RAPIDJSON_TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define RAPIDJSON_TAIL() RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x70)
+        typename InputStream::Ch c = is.Take();
         if (!(c & 0x80)) {
-            *codepoint = (unsigned char)c;
+            *codepoint = static_cast<unsigned char>(c);
             return true;
         }
 
-        unsigned char type = GetRange((unsigned char)c);
-        *codepoint = (0xFF >> type) & (unsigned char)c;
+        unsigned char type = GetRange(static_cast<unsigned char>(c));
+        if (type >= 32) {
+            *codepoint = 0;
+        } else {
+            *codepoint = (0xFFu >> type) & static_cast<unsigned char>(c);
+        }
         bool result = true;
         switch (type) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        case 2: RAPIDJSON_TAIL(); return result;
+        case 3: RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 4: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x50); RAPIDJSON_TAIL(); return result;
+        case 5: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x10); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 6: RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 10: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x20); RAPIDJSON_TAIL(); return result;
+        case 11: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x60); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
         default: return false;
         }
-#undef COPY
-#undef TRANS
-#undef TAIL
+#undef RAPIDJSON_COPY
+#undef RAPIDJSON_TRANS
+#undef RAPIDJSON_TAIL
     }
 
     template <typename InputStream, typename OutputStream>
     static bool Validate(InputStream& is, OutputStream& os) {
-#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
+#define RAPIDJSON_COPY() os.Put(c = is.Take())
+#define RAPIDJSON_TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define RAPIDJSON_TAIL() RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x70)
         Ch c;
-        COPY();
+        RAPIDJSON_COPY();
         if (!(c & 0x80))
             return true;
 
         bool result = true;
-        switch (GetRange((unsigned char)c)) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        switch (GetRange(static_cast<unsigned char>(c))) {
+        case 2: RAPIDJSON_TAIL(); return result;
+        case 3: RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 4: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x50); RAPIDJSON_TAIL(); return result;
+        case 5: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x10); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 6: RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
+        case 10: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x20); RAPIDJSON_TAIL(); return result;
+        case 11: RAPIDJSON_COPY(); RAPIDJSON_TRANS(0x60); RAPIDJSON_TAIL(); RAPIDJSON_TAIL(); return result;
         default: return false;
         }
-#undef COPY
-#undef TRANS
-#undef TAIL
+#undef RAPIDJSON_COPY
+#undef RAPIDJSON_TRANS
+#undef RAPIDJSON_TAIL
     }
 
     static unsigned char GetRange(unsigned char c) {
@@ -201,12 +222,12 @@ struct UTF8 {
     template <typename InputByteStream>
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        Ch c = Take(is);
-        if ((unsigned char)c != 0xEFu) return c;
+        typename InputByteStream::Ch c = Take(is);
+        if (static_cast<unsigned char>(c) != 0xEFu) return c;
         c = is.Take();
-        if ((unsigned char)c != 0xBBu) return c;
+        if (static_cast<unsigned char>(c) != 0xBBu) return c;
         c = is.Take();
-        if ((unsigned char)c != 0xBFu) return c;
+        if (static_cast<unsigned char>(c) != 0xBFu) return c;
         c = is.Take();
         return c;
     }
@@ -214,13 +235,15 @@ struct UTF8 {
     template <typename InputByteStream>
     static Ch Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return is.Take();
+        return static_cast<Ch>(is.Take());
     }
 
     template <typename OutputByteStream>
     static void PutBOM(OutputByteStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(0xEFu); os.Put(0xBBu); os.Put(0xBFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
     }
 
     template <typename OutputByteStream>
@@ -260,22 +283,38 @@ struct UTF16 {
             RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
             unsigned v = codepoint - 0x10000;
             os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            os.Put((v & 0x3FF) | 0xDC00);
+            os.Put(static_cast<typename OutputStream::Ch>((v & 0x3FF) | 0xDC00));
+        }
+    }
+
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v & 0x3FF) | 0xDC00));
         }
     }
 
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        Ch c = is.Take();
+        typename InputStream::Ch c = is.Take();
         if (c < 0xD800 || c > 0xDFFF) {
-            *codepoint = c;
+            *codepoint = static_cast<unsigned>(c);
             return true;
         }
         else if (c <= 0xDBFF) {
-            *codepoint = (c & 0x3FF) << 10;
+            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
             c = is.Take();
-            *codepoint |= (c & 0x3FF);
+            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
             *codepoint += 0x10000;
             return c >= 0xDC00 && c <= 0xDFFF;
         }
@@ -286,8 +325,8 @@ struct UTF16 {
     static bool Validate(InputStream& is, OutputStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        Ch c;
-        os.Put(c = is.Take());
+        typename InputStream::Ch c;
+        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
         if (c < 0xD800 || c > 0xDFFF)
             return true;
         else if (c <= 0xDBFF) {
@@ -305,28 +344,29 @@ struct UTF16LE : UTF16<CharType> {
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
         CharType c = Take(is);
-        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
     }
 
     template <typename InputByteStream>
     static CharType Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = (unsigned char)is.Take();
-        c |= (unsigned char)is.Take() << 8;
-        return c;
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        return static_cast<CharType>(c);
     }
 
     template <typename OutputByteStream>
     static void PutBOM(OutputByteStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(0xFFu); os.Put(0xFEu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
     }
 
     template <typename OutputByteStream>
     static void Put(OutputByteStream& os, CharType c) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(c & 0xFFu);
-        os.Put((c >> 8) & 0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
     }
 };
 
@@ -337,28 +377,29 @@ struct UTF16BE : UTF16<CharType> {
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
         CharType c = Take(is);
-        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
     }
 
     template <typename InputByteStream>
     static CharType Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = (unsigned char)is.Take() << 8;
-        c |= (unsigned char)is.Take();
-        return c;
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
+        return static_cast<CharType>(c);
     }
 
     template <typename OutputByteStream>
     static void PutBOM(OutputByteStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(0xFEu); os.Put(0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
     }
 
     template <typename OutputByteStream>
     static void Put(OutputByteStream& os, CharType c) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put((c >> 8) & 0xFFu);
-        os.Put(c & 0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
     }
 };
 
@@ -387,6 +428,13 @@ struct UTF32 {
         os.Put(codepoint);
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        PutUnsafe(os, codepoint);
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
@@ -411,32 +459,35 @@ struct UTF32LE : UTF32<CharType> {
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
         CharType c = Take(is);
-        return (unsigned)c == 0x0000FEFFu ? Take(is) : c;
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
     }
 
     template <typename InputByteStream>
     static CharType Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = (unsigned char)is.Take();
-        c |= (unsigned char)is.Take() << 8;
-        c |= (unsigned char)is.Take() << 16;
-        c |= (unsigned char)is.Take() << 24;
-        return c;
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        return static_cast<CharType>(c);
     }
 
     template <typename OutputByteStream>
     static void PutBOM(OutputByteStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(0xFFu); os.Put(0xFEu); os.Put(0x00u); os.Put(0x00u);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
     }
 
     template <typename OutputByteStream>
     static void Put(OutputByteStream& os, CharType c) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(c & 0xFFu);
-        os.Put((c >> 8) & 0xFFu);
-        os.Put((c >> 16) & 0xFFu);
-        os.Put((c >> 24) & 0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
     }
 };
 
@@ -447,32 +498,35 @@ struct UTF32BE : UTF32<CharType> {
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
         CharType c = Take(is);
-        return (unsigned)c == 0x0000FEFFu ? Take(is) : c; 
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
     }
 
     template <typename InputByteStream>
     static CharType Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = (unsigned char)is.Take() << 24;
-        c |= (unsigned char)is.Take() << 16;
-        c |= (unsigned char)is.Take() << 8;
-        c |= (unsigned char)is.Take();
-        return c;
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
+        return static_cast<CharType>(c);
     }
 
     template <typename OutputByteStream>
     static void PutBOM(OutputByteStream& os) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(0x00u); os.Put(0x00u); os.Put(0xFEu); os.Put(0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
     }
 
     template <typename OutputByteStream>
     static void Put(OutputByteStream& os, CharType c) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put((c >> 24) & 0xFFu);
-        os.Put((c >> 16) & 0xFFu);
-        os.Put((c >> 8) & 0xFFu);
-        os.Put(c & 0xFFu);
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
     }
 };
 
@@ -496,31 +550,37 @@ struct ASCII {
         os.Put(static_cast<Ch>(codepoint & 0xFF));
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
-        unsigned char c = static_cast<unsigned char>(is.Take());
+        uint8_t c = static_cast<uint8_t>(is.Take());
         *codepoint = c;
         return c <= 0X7F;
     }
 
     template <typename InputStream, typename OutputStream>
     static bool Validate(InputStream& is, OutputStream& os) {
-        unsigned char c = is.Take();
-        os.Put(c);
+        uint8_t c = static_cast<uint8_t>(is.Take());
+        os.Put(static_cast<typename OutputStream::Ch>(c));
         return c <= 0x7F;
     }
 
     template <typename InputByteStream>
     static CharType TakeBOM(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        Ch c = Take(is);
-        return c;
+        uint8_t c = static_cast<uint8_t>(Take(is));
+        return static_cast<Ch>(c);
     }
 
     template <typename InputByteStream>
     static Ch Take(InputByteStream& is) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return is.Take();
+        return static_cast<Ch>(is.Take());
     }
 
     template <typename OutputByteStream>
@@ -560,21 +620,28 @@ struct AutoUTF {
 #define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
 
     template<typename OutputStream>
-    RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
+    static RAPIDJSON_FORCEINLINE void Encode(OutputStream& os, unsigned codepoint) {
         typedef void (*EncodeFunc)(OutputStream&, unsigned);
         static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
         (*f[os.GetType()])(os, codepoint);
     }
 
+    template<typename OutputStream>
+    static RAPIDJSON_FORCEINLINE void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
     template <typename InputStream>
-    RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
+    static RAPIDJSON_FORCEINLINE bool Decode(InputStream& is, unsigned* codepoint) {
         typedef bool (*DecodeFunc)(InputStream&, unsigned*);
         static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
         return (*f[is.GetType()])(is, codepoint);
     }
 
     template <typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
         typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
         static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
         return (*f[is.GetType()])(is, os);
@@ -591,7 +658,7 @@ template<typename SourceEncoding, typename TargetEncoding>
 struct Transcoder {
     //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
     template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+    static RAPIDJSON_FORCEINLINE bool Transcode(InputStream& is, OutputStream& os) {
         unsigned codepoint;
         if (!SourceEncoding::Decode(is, &codepoint))
             return false;
@@ -599,31 +666,50 @@ struct Transcoder {
         return true;
     }
 
+    template<typename InputStream, typename OutputStream>
+    static RAPIDJSON_FORCEINLINE bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::EncodeUnsafe(os, codepoint);
+        return true;
+    }
+
     //! Validate one Unicode codepoint from an encoded stream.
     template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
         return Transcode(is, os);   // Since source/target encoding is different, must transcode.
     }
 };
 
+// Forward declaration.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
+
 //! Specialization of Transcoder with same source and target encoding.
 template<typename Encoding>
 struct Transcoder<Encoding, Encoding> {
     template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+    static RAPIDJSON_FORCEINLINE bool Transcode(InputStream& is, OutputStream& os) {
         os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
         return true;
     }
     
     template<typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+    static RAPIDJSON_FORCEINLINE bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
         return Encoding::Validate(is, os);  // source/target encoding are the same
     }
 };
 
 RAPIDJSON_NAMESPACE_END
 
-#if defined(__GNUC__) || defined(_MSV_VER)
+#if defined(__GNUC__) || (defined(_MSC_VER) && !defined(__clang__))
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/extra/rapidjson/include/rapidjson/error/en.h b/extra/rapidjson/include/rapidjson/error/en.h
index 01711833e1ef..2db838bff239 100644
--- a/extra/rapidjson/include/rapidjson/error/en.h
+++ b/extra/rapidjson/include/rapidjson/error/en.h
@@ -1,28 +1,28 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
-#ifndef RAPIDJSON_ERROR_EN_H__
-#define RAPIDJSON_ERROR_EN_H__
+#ifndef RAPIDJSON_ERROR_EN_H_
+#define RAPIDJSON_ERROR_EN_H_
 
 #include "error.h"
 
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(switch-enum)
+RAPIDJSON_DIAG_OFF(covered-switch-default)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 //! Maps error code of parsing into error message.
@@ -38,7 +38,7 @@ inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErro
         case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
 
         case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
-        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not follow by other values.");
+        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
     
         case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
     
@@ -61,11 +61,14 @@ inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErro
         case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
         case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
 
-        default:
-            return RAPIDJSON_ERROR_STRING("Unknown error.");
+        default:                                        return RAPIDJSON_ERROR_STRING("Unknown error.");
     }
 }
 
 RAPIDJSON_NAMESPACE_END
 
-#endif // RAPIDJSON_ERROR_EN_H__
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ERROR_EN_H_
diff --git a/extra/rapidjson/include/rapidjson/error/error.h b/extra/rapidjson/include/rapidjson/error/error.h
index 729142ab14fa..9311d2f03bff 100644
--- a/extra/rapidjson/include/rapidjson/error/error.h
+++ b/extra/rapidjson/include/rapidjson/error/error.h
@@ -1,25 +1,26 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
-#ifndef RAPIDJSON_ERROR_ERROR_H__
-#define RAPIDJSON_ERROR_ERROR_H__
+#ifndef RAPIDJSON_ERROR_ERROR_H_
+#define RAPIDJSON_ERROR_ERROR_H_
+
+#include "../rapidjson.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
 
 /*! \file error.h */
 
@@ -103,7 +104,9 @@ enum ParseErrorCode {
     \see GenericReader::Parse, GenericDocument::Parse
 */
 struct ParseResult {
-
+    //!! Unspecified boolean type
+    typedef bool (ParseResult::*BooleanType)() const;
+public:
     //! Default constructor, no error.
     ParseResult() : code_(kParseErrorNone), offset_(0) {}
     //! Constructor to set an error.
@@ -114,8 +117,8 @@ struct ParseResult {
     //! Get the error offset, if \ref IsError(), 0 otherwise.
     size_t Offset() const { return offset_; }
 
-    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
-    operator bool() const { return !IsError(); }
+    //! Explicit conversion to \c bool, returns \c true, iff !\ref IsError().
+    operator BooleanType() const { return !IsError() ? &ParseResult::IsError : NULL; }
     //! Whether the result is an error.
     bool IsError() const { return code_ != kParseErrorNone; }
 
@@ -123,6 +126,10 @@ struct ParseResult {
     bool operator==(ParseErrorCode code) const { return code_ == code; }
     friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
 
+    bool operator!=(const ParseResult& that) const { return !(*this == that); }
+    bool operator!=(ParseErrorCode code) const { return !(*this == code); }
+    friend bool operator!=(ParseErrorCode code, const ParseResult & err) { return err != code; }
+
     //! Reset error code.
     void Clear() { Set(kParseErrorNone); }
     //! Update error code and offset.
@@ -147,4 +154,8 @@ typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
 
 RAPIDJSON_NAMESPACE_END
 
-#endif // RAPIDJSON_ERROR_ERROR_H__
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ERROR_ERROR_H_
diff --git a/extra/rapidjson/include/rapidjson/filereadstream.h b/extra/rapidjson/include/rapidjson/filereadstream.h
index 5af9be579db7..6b343707ade0 100644
--- a/extra/rapidjson/include/rapidjson/filereadstream.h
+++ b/extra/rapidjson/include/rapidjson/filereadstream.h
@@ -1,29 +1,30 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_FILEREADSTREAM_H_
 #define RAPIDJSON_FILEREADSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include <cstdio>
 
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(unreachable-code)
+RAPIDJSON_DIAG_OFF(missing-noreturn)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 //! File byte stream for input using fread().
@@ -58,7 +59,7 @@ class FileReadStream {
 
     // For encoding detection only.
     const Ch* Peek4() const {
-        return (current_ + 4 <= bufferLast_) ? current_ : 0;
+        return (current_ + 4 - !eof_ <= bufferLast_) ? current_ : 0;
     }
 
 private:
@@ -67,7 +68,7 @@ class FileReadStream {
             ++current_;
         else if (!eof_) {
             count_ += readCount_;
-            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
+            readCount_ = std::fread(buffer_, 1, bufferSize_, fp_);
             bufferLast_ = buffer_ + readCount_ - 1;
             current_ = buffer_;
 
@@ -91,4 +92,8 @@ class FileReadStream {
 
 RAPIDJSON_NAMESPACE_END
 
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_FILESTREAM_H_
diff --git a/extra/rapidjson/include/rapidjson/filestream.h b/extra/rapidjson/include/rapidjson/filestream.h
deleted file mode 100644
index a370c60570f5..000000000000
--- a/extra/rapidjson/include/rapidjson/filestream.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef RAPIDJSON_FILESTREAM_H_
-#define RAPIDJSON_FILESTREAM_H_
-
-#include "rapidjson.h"
-#include <cstdio>
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! (Deprecated) Wrapper of C file stream for input or output.
-/*!
-    This simple wrapper does not check the validity of the stream.
-    \note implements Stream concept
-    \note deprecated: This was only for basic testing in version 0.1, it is found that the performance is very low by using fgetc(). Use FileReadStream instead.
-*/
-class FileStream {
-public:
-    typedef char Ch;    //!< Character type. Only support char.
-
-    FileStream(std::FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); }
-    char Peek() const { return current_; }
-    char Take() { char c = current_; Read(); return c; }
-    size_t Tell() const { return count_; }
-    void Put(char c) { fputc(c, fp_); }
-    void Flush() { fflush(fp_); }
-
-    // Not implemented
-    char* PutBegin() { return 0; }
-    size_t PutEnd(char*) { return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    FileStream(const FileStream&);
-    FileStream& operator=(const FileStream&);
-
-    void Read() {
-        RAPIDJSON_ASSERT(fp_ != 0);
-        int c = fgetc(fp_);
-        if (c != EOF) {
-            current_ = (char)c;
-            count_++;
-        }
-        else if (current_ != '\0')
-            current_ = '\0';
-    }
-
-    std::FILE* fp_;
-    char current_;
-    size_t count_;
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/extra/rapidjson/include/rapidjson/filewritestream.h b/extra/rapidjson/include/rapidjson/filewritestream.h
index 4352c8f172f4..8b48fee197c4 100644
--- a/extra/rapidjson/include/rapidjson/filewritestream.h
+++ b/extra/rapidjson/include/rapidjson/filewritestream.h
@@ -1,32 +1,31 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_FILEWRITESTREAM_H_
 #define RAPIDJSON_FILEWRITESTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include <cstdio>
 
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(unreachable-code)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
-//! Wrapper of C file stream for input using fread().
+//! Wrapper of C file stream for output using fwrite().
 /*!
     \note implements Stream concept
 */
@@ -63,7 +62,11 @@ class FileWriteStream {
 
     void Flush() {
         if (current_ != buffer_) {
-            fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+            size_t result = std::fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+            if (result < static_cast<size_t>(current_ - buffer_)) {
+                // failure deliberately ignored at this time
+                // added to avoid warn_unused_result build errors
+            }
             current_ = buffer_;
         }
     }
@@ -94,4 +97,8 @@ inline void PutN(FileWriteStream& stream, char c, size_t n) {
 
 RAPIDJSON_NAMESPACE_END
 
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_FILESTREAM_H_
diff --git a/extra/rapidjson/include/rapidjson/fwd.h b/extra/rapidjson/include/rapidjson/fwd.h
new file mode 100644
index 000000000000..b74a2b819868
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/fwd.h
@@ -0,0 +1,151 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FWD_H_
+#define RAPIDJSON_FWD_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+// encodings.h
+
+template<typename CharType> struct UTF8;
+template<typename CharType> struct UTF16;
+template<typename CharType> struct UTF16BE;
+template<typename CharType> struct UTF16LE;
+template<typename CharType> struct UTF32;
+template<typename CharType> struct UTF32BE;
+template<typename CharType> struct UTF32LE;
+template<typename CharType> struct ASCII;
+template<typename CharType> struct AutoUTF;
+
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder;
+
+// allocators.h
+
+class CrtAllocator;
+
+template <typename BaseAllocator>
+class MemoryPoolAllocator;
+
+// stream.h
+
+template <typename Encoding>
+struct GenericStringStream;
+
+typedef GenericStringStream<UTF8<char> > StringStream;
+
+template <typename Encoding>
+struct GenericInsituStringStream;
+
+typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
+
+// stringbuffer.h
+
+template <typename Encoding, typename Allocator>
+class GenericStringBuffer;
+
+typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
+
+// filereadstream.h
+
+class FileReadStream;
+
+// filewritestream.h
+
+class FileWriteStream;
+
+// memorybuffer.h
+
+template <typename Allocator>
+struct GenericMemoryBuffer;
+
+typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
+
+// memorystream.h
+
+struct MemoryStream;
+
+// reader.h
+
+template<typename Encoding, typename Derived>
+struct BaseReaderHandler;
+
+template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
+class GenericReader;
+
+typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
+
+// writer.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class Writer;
+
+// prettywriter.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class PrettyWriter;
+
+// document.h
+
+template <typename Encoding, typename Allocator> 
+class GenericMember;
+
+template <bool Const, typename Encoding, typename Allocator>
+class GenericMemberIterator;
+
+template<typename CharType>
+struct GenericStringRef;
+
+template <typename Encoding, typename Allocator> 
+class GenericValue;
+
+typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
+
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
+typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
+
+// pointer.h
+
+template <typename ValueType, typename Allocator>
+class GenericPointer;
+
+typedef GenericPointer<Value, CrtAllocator> Pointer;
+
+// schema.h
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider;
+
+template <typename ValueT, typename Allocator>
+class GenericSchemaDocument;
+
+typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler,
+    typename StateAllocator>
+class GenericSchemaValidator;
+
+typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/extra/rapidjson/include/rapidjson/internal/biginteger.h b/extra/rapidjson/include/rapidjson/internal/biginteger.h
index 3e97920df523..a31c8a88d6eb 100644
--- a/extra/rapidjson/include/rapidjson/internal/biginteger.h
+++ b/extra/rapidjson/include/rapidjson/internal/biginteger.h
@@ -1,30 +1,25 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_BIGINTEGER_H_
 #define RAPIDJSON_BIGINTEGER_H_
 
 #include "../rapidjson.h"
 
-#if defined(_MSC_VER) && defined(_M_AMD64)
+#if defined(_MSC_VER) && !__INTEL_COMPILER && defined(_M_AMD64)
 #include <intrin.h> // for _umul128
+#pragma intrinsic(_umul128)
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -56,7 +51,16 @@ class BigInteger {
         if (length > 0)
             AppendDecimal64(decimals + i, decimals + i + length);
     }
-
+    
+    BigInteger& operator=(const BigInteger &rhs)
+    {
+        if (this != &rhs) {
+            count_ = rhs.count_;
+            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+        }
+        return *this;
+    }
+    
     BigInteger& operator=(uint64_t u) {
         digits_[0] = u;            
         count_ = 1;
@@ -103,7 +107,7 @@ class BigInteger {
         if (u == 1) return *this;
         if (*this == 1) return *this = u;
 
-        uint32_t k = 0;
+        uint64_t k = 0;
         for (size_t i = 0; i < count_; i++) {
             const uint64_t c = digits_[i] >> 32;
             const uint64_t d = digits_[i] & 0xFFFFFFFF;
@@ -129,7 +133,7 @@ class BigInteger {
         RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
 
         if (interShift == 0) {
-            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
+            std::memmove(digits_ + offset, digits_, count_ * sizeof(Type));
             count_ += offset;
         }
         else {
@@ -178,13 +182,10 @@ class BigInteger {
     }
 
     // Compute absolute difference of this and rhs.
-    // Return false if this < rhs
+    // Assume this != rhs
     bool Difference(const BigInteger& rhs, BigInteger* out) const {
         int cmp = Compare(rhs);
-        if (cmp == 0) {
-            *out = BigInteger(0);
-            return false;
-        }
+        RAPIDJSON_ASSERT(cmp != 0);
         const BigInteger *a, *b;  // Makes a > b
         bool ret;
         if (cmp < 0) { a = &rhs; b = this; ret = true; }
@@ -239,7 +240,7 @@ class BigInteger {
         uint64_t r = 0;
         for (const char* p = begin; p != end; ++p) {
             RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
-            r = r * 10 + (*p - '0');
+            r = r * 10u + static_cast<unsigned>(*p - '0');
         }
         return r;
     }
@@ -252,9 +253,10 @@ class BigInteger {
             (*outHigh)++;
         return low;
 #elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        unsigned __int128 p = static_cast<unsigned __int128>(a) * static_cast<unsigned __int128>(b);
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
         p += k;
-        *outHigh = p >> 64;
+        *outHigh = static_cast<uint64_t>(p >> 64);
         return static_cast<uint64_t>(p);
 #else
         const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
@@ -274,12 +276,6 @@ class BigInteger {
 #endif
     }
 
-    static Type FullAdd(Type a, Type b, bool inCarry, bool* outCarry) {
-        Type c = a + b + (inCarry ? 1 : 0);
-        *outCarry = c < a;
-        return c;
-    }
-
     static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
     static const size_t kCapacity = kBitCount / sizeof(Type);
     static const size_t kTypeBit = sizeof(Type) * 8;
diff --git a/extra/rapidjson/include/rapidjson/internal/clzll.h b/extra/rapidjson/include/rapidjson/internal/clzll.h
new file mode 100644
index 000000000000..abe44dfc5663
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/internal/clzll.h
@@ -0,0 +1,72 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_CLZLL_H_
+#define RAPIDJSON_CLZLL_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER)
+#include <intrin.h>
+#if defined(_WIN64)
+#pragma intrinsic(_BitScanReverse64)
+#else
+#pragma intrinsic(_BitScanReverse)
+#endif
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#if (defined(__GNUC__) && __GNUC__ >= 4) || RAPIDJSON_HAS_BUILTIN(__builtin_clzll)
+#define RAPIDJSON_CLZLL __builtin_clzll
+#else
+
+inline uint32_t clzll(uint64_t x) {
+    // Passing 0 to __builtin_clzll is UB in GCC and results in an
+    // infinite loop in the software implementation.
+    RAPIDJSON_ASSERT(x != 0);
+
+#if defined(_MSC_VER)
+    unsigned long r = 0;
+#if defined(_WIN64)
+    _BitScanReverse64(&r, x);
+#else
+    // Scan the high 32 bits.
+    if (_BitScanReverse(&r, static_cast<uint32_t>(x >> 32)))
+        return 63 - (r + 32);
+
+    // Scan the low 32 bits.
+    _BitScanReverse(&r, static_cast<uint32_t>(x & 0xFFFFFFFF));
+#endif // _WIN64
+
+    return 63 - r;
+#else
+    uint32_t r;
+    while (!(x & (static_cast<uint64_t>(1) << 63))) {
+        x <<= 1;
+        ++r;
+    }
+
+    return r;
+#endif // _MSC_VER
+}
+
+#define RAPIDJSON_CLZLL RAPIDJSON_NAMESPACE::internal::clzll
+#endif // (defined(__GNUC__) && __GNUC__ >= 4) || RAPIDJSON_HAS_BUILTIN(__builtin_clzll)
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_CLZLL_H_
\ No newline at end of file
diff --git a/extra/rapidjson/include/rapidjson/internal/diyfp.h b/extra/rapidjson/include/rapidjson/internal/diyfp.h
index 174b9facfb0f..f46059a0f05c 100644
--- a/extra/rapidjson/include/rapidjson/internal/diyfp.h
+++ b/extra/rapidjson/include/rapidjson/internal/diyfp.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
 
 // This is a C++ header-only implementation of Grisu2 algorithm from the publication:
 // Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
@@ -25,11 +19,13 @@
 #ifndef RAPIDJSON_DIYFP_H_
 #define RAPIDJSON_DIYFP_H_
 
-#if defined(_MSC_VER)
+#include "../rapidjson.h"
+#include "clzll.h"
+#include <limits>
+
+#if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__INTEL_COMPILER)
 #include <intrin.h>
-#if defined(_M_AMD64)
-#pragma intrinsic(_BitScanReverse64)
-#endif
+#pragma intrinsic(_umul128)
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
@@ -40,8 +36,13 @@ RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
 #endif
 
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
 struct DiyFp {
-    DiyFp() {}
+    DiyFp() : f(), e() {}
 
     DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
 
@@ -51,12 +52,12 @@ struct DiyFp {
             uint64_t u64;
         } u = { d };
 
-        int biased_e = (u.u64 & kDpExponentMask) >> kDpSignificandSize;
+        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
         uint64_t significand = (u.u64 & kDpSignificandMask);
         if (biased_e != 0) {
             f = significand + kDpHiddenBit;
             e = biased_e - kDpExponentBias;
-        } 
+        }
         else {
             f = significand;
             e = kDpMinExponent + 1;
@@ -75,8 +76,9 @@ struct DiyFp {
             h++;
         return DiyFp(h, e + rhs.e + 64);
 #elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        unsigned __int128 p = static_cast<unsigned __int128>(f) * static_cast<unsigned __int128>(rhs.f);
-        uint64_t h = p >> 64;
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
+        uint64_t h = static_cast<uint64_t>(p >> 64);
         uint64_t l = static_cast<uint64_t>(p);
         if (l & (uint64_t(1) << 63)) // rounding
             h++;
@@ -98,21 +100,8 @@ struct DiyFp {
     }
 
     DiyFp Normalize() const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        unsigned long index;
-        _BitScanReverse64(&index, f);
-        return DiyFp(f << (63 - index), e - (63 - index));
-#elif defined(__GNUC__) && __GNUC__ >= 4
-        int s = __builtin_clzll(f);
+        int s = static_cast<int>(RAPIDJSON_CLZLL(f));
         return DiyFp(f << s, e - s);
-#else
-        DiyFp res = *this;
-        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        return res;
-#endif
     }
 
     DiyFp NormalizeBoundary() const {
@@ -140,25 +129,18 @@ struct DiyFp {
             double d;
             uint64_t u64;
         }u;
-        uint64_t significand = f;
-        int exponent = e;
-        while (significand > kDpHiddenBit + kDpSignificandMask) {
-            significand >>= 1;
-            exponent++;
-        }
-        while (exponent > kDpDenormalExponent && (significand & kDpHiddenBit) == 0) {
-            significand <<= 1;
-            exponent--;
+        RAPIDJSON_ASSERT(f <= kDpHiddenBit + kDpSignificandMask);
+        if (e < kDpDenormalExponent) {
+            // Underflow.
+            return 0.0;
         }
-        if (exponent >= kDpMaxExponent) {
-            u.u64 = kDpExponentMask;    // Infinity
-            return u.d;
+        if (e >= kDpMaxExponent) {
+            // Overflow.
+            return std::numeric_limits<double>::infinity();
         }
-        else if (exponent < kDpDenormalExponent)
-            return 0.0;
-        const uint64_t be = (exponent == kDpDenormalExponent && (significand & kDpHiddenBit) == 0) ? 0 : 
-            static_cast<uint64_t>(exponent + kDpExponentBias);
-        u.u64 = (significand & kDpSignificandMask) | (be << kDpSignificandSize);
+        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 :
+            static_cast<uint64_t>(e + kDpExponentBias);
+        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
         return u.d;
     }
 
@@ -235,15 +217,16 @@ inline DiyFp GetCachedPowerByIndex(size_t index) {
         641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
         907,   933,   960,   986,  1013,  1039,  1066
     };
+    RAPIDJSON_ASSERT(index < 87);
     return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
 }
-    
+
 inline DiyFp GetCachedPower(int e, int* K) {
 
     //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
     double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
     int k = static_cast<int>(dk);
-    if (k != dk)
+    if (dk - k > 0.0)
         k++;
 
     unsigned index = static_cast<unsigned>((k >> 3) + 1);
@@ -253,15 +236,21 @@ inline DiyFp GetCachedPower(int e, int* K) {
 }
 
 inline DiyFp GetCachedPower10(int exp, int *outExp) {
-     unsigned index = (exp + 348) / 8;
-     *outExp = -348 + index * 8;
-     return GetCachedPowerByIndex(index);
- }
+    RAPIDJSON_ASSERT(exp >= -348);
+    unsigned index = static_cast<unsigned>(exp + 348) / 8u;
+    *outExp = -348 + static_cast<int>(index) * 8;
+    return GetCachedPowerByIndex(index);
+}
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_POP
 #endif
 
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 
diff --git a/extra/rapidjson/include/rapidjson/internal/dtoa.h b/extra/rapidjson/include/rapidjson/internal/dtoa.h
index c0fa2b89085c..bf2e9b2e59a4 100644
--- a/extra/rapidjson/include/rapidjson/internal/dtoa.h
+++ b/extra/rapidjson/include/rapidjson/internal/dtoa.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 // This is a C++ header-only implementation of Grisu2 algorithm from the publication:
 // Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
@@ -27,6 +21,7 @@
 
 #include "itoa.h" // GetDigitsLut()
 #include "diyfp.h"
+#include "ieee754.h"
 
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
@@ -34,6 +29,7 @@ namespace internal {
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
 #endif
 
 inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
@@ -45,7 +41,7 @@ inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uin
     }
 }
 
-inline unsigned CountDecimalDigit32(uint32_t n) {
+inline int CountDecimalDigit32(uint32_t n) {
     // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
     if (n < 10) return 1;
     if (n < 100) return 2;
@@ -55,8 +51,10 @@ inline unsigned CountDecimalDigit32(uint32_t n) {
     if (n < 1000000) return 6;
     if (n < 10000000) return 7;
     if (n < 100000000) return 8;
-    if (n < 1000000000) return 9;
-    return 10;
+    // Will not reach 10 digits in DigitGen()
+    //if (n < 1000000000) return 9;
+    //return 10;
+    return 9;
 }
 
 inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
@@ -65,13 +63,12 @@ inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buff
     const DiyFp wp_w = Mp - W;
     uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
     uint64_t p2 = Mp.f & (one.f - 1);
-    int kappa = CountDecimalDigit32(p1);
+    int kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
     *len = 0;
 
     while (kappa > 0) {
-        uint32_t d;
+        uint32_t d = 0;
         switch (kappa) {
-            case 10: d = p1 / 1000000000; p1 %= 1000000000; break;
             case  9: d = p1 /  100000000; p1 %=  100000000; break;
             case  8: d = p1 /   10000000; p1 %=   10000000; break;
             case  7: d = p1 /    1000000; p1 %=    1000000; break;
@@ -81,14 +78,7 @@ inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buff
             case  3: d = p1 /        100; p1 %=        100; break;
             case  2: d = p1 /         10; p1 %=         10; break;
             case  1: d = p1;              p1 =           0; break;
-            default: 
-#if defined(_MSC_VER)
-                __assume(0);
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-                __builtin_unreachable();
-#else
-                d = 0;
-#endif
+            default:;
         }
         if (d || *len)
             buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
@@ -112,7 +102,8 @@ inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buff
         kappa--;
         if (p2 < delta) {
             *K += kappa;
-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * kPow10[-kappa]);
+            int index = -kappa;
+            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[index] : 0));
             return;
         }
     }
@@ -156,10 +147,10 @@ inline char* WriteExponent(int K, char* buffer) {
     return buffer;
 }
 
-inline char* Prettify(char* buffer, int length, int k) {
+inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
     const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
 
-    if (length <= kk && kk <= 21) {
+    if (0 <= k && kk <= 21) {
         // 1234e7 -> 12340000000
         for (int i = length; i < kk; i++)
             buffer[i] = '0';
@@ -169,19 +160,44 @@ inline char* Prettify(char* buffer, int length, int k) {
     }
     else if (0 < kk && kk <= 21) {
         // 1234e-2 -> 12.34
-        std::memmove(&buffer[kk + 1], &buffer[kk], length - kk);
+        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
         buffer[kk] = '.';
-        return &buffer[length + 1];
+        if (0 > k + maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[kk + 2]; // Reserve one zero
+        }
+        else
+            return &buffer[length + 1];
     }
     else if (-6 < kk && kk <= 0) {
         // 1234e-6 -> 0.001234
         const int offset = 2 - kk;
-        std::memmove(&buffer[offset], &buffer[0], length);
+        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
         buffer[0] = '0';
         buffer[1] = '.';
         for (int i = 2; i < offset; i++)
             buffer[i] = '0';
-        return &buffer[length + offset];
+        if (length - kk > maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = maxDecimalPlaces + 1; i > 2; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[3]; // Reserve one zero
+        }
+        else
+            return &buffer[length + offset];
+    }
+    else if (kk < -maxDecimalPlaces) {
+        // Truncate to zero
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
     }
     else if (length == 1) {
         // 1e30
@@ -190,15 +206,19 @@ inline char* Prettify(char* buffer, int length, int k) {
     }
     else {
         // 1234e30 -> 1.234e33
-        std::memmove(&buffer[2], &buffer[1], length - 1);
+        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
         buffer[1] = '.';
         buffer[length + 1] = 'e';
         return WriteExponent(kk - 1, &buffer[0 + length + 2]);
     }
 }
 
-inline char* dtoa(double value, char* buffer) {
-    if (value == 0) {
+inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
+    RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
+    Double d(value);
+    if (d.IsZero()) {
+        if (d.Sign())
+            *buffer++ = '-';     // -0.0, Issue #289
         buffer[0] = '0';
         buffer[1] = '.';
         buffer[2] = '0';
@@ -211,7 +231,7 @@ inline char* dtoa(double value, char* buffer) {
         }
         int length, K;
         Grisu2(value, buffer, &length, &K);
-        return Prettify(buffer, length, K);
+        return Prettify(buffer, length, K, maxDecimalPlaces);
     }
 }
 
diff --git a/extra/rapidjson/include/rapidjson/internal/ieee754.h b/extra/rapidjson/include/rapidjson/internal/ieee754.h
index ab65cc9a8207..c2684ba2a35f 100644
--- a/extra/rapidjson/include/rapidjson/internal/ieee754.h
+++ b/extra/rapidjson/include/rapidjson/internal/ieee754.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_IEEE754_
 #define RAPIDJSON_IEEE754_
@@ -29,38 +23,32 @@ namespace internal {
 class Double {
 public:
     Double() {}
-    Double(double d) : d(d) {}
-    Double(uint64_t u) : u(u) {}
+    Double(double d) : d_(d) {}
+    Double(uint64_t u) : u_(u) {}
 
-    double Value() const { return d; }
-    uint64_t Uint64Value() const { return u; }
+    double Value() const { return d_; }
+    uint64_t Uint64Value() const { return u_; }
 
     double NextPositiveDouble() const {
         RAPIDJSON_ASSERT(!Sign());
-        return Double(u + 1).Value();
+        return Double(u_ + 1).Value();
     }
 
-    double PreviousPositiveDouble() const {
-        RAPIDJSON_ASSERT(!Sign());
-        if (d == 0.0)
-            return 0.0;
-        else
-            return Double(u - 1).Value();
-    }
-
-    bool Sign() const { return (u & kSignMask) != 0; }
-    uint64_t Significand() const { return u & kSignificandMask; }
-    int Exponent() const { return ((u & kExponentMask) >> kSignificandSize) - kExponentBias; }
+    bool Sign() const { return (u_ & kSignMask) != 0; }
+    uint64_t Significand() const { return u_ & kSignificandMask; }
+    int Exponent() const { return static_cast<int>(((u_ & kExponentMask) >> kSignificandSize) - kExponentBias); }
 
-    bool IsNan() const { return (u & kExponentMask) == kExponentMask && Significand() != 0; }
-    bool IsInf() const { return (u & kExponentMask) == kExponentMask && Significand() == 0; }
-    bool IsNormal() const { return (u & kExponentMask) != 0 || Significand() == 0; }
+    bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
+    bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
+    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
+    bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
+    bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
 
     uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
     int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
-    uint64_t ToBias() const { return (u & kSignMask) ? ~u + 1 : u | kSignMask; }
+    uint64_t ToBias() const { return (u_ & kSignMask) ? ~u_ + 1 : u_ | kSignMask; }
 
-    static unsigned EffectiveSignificandSize(int order) {
+    static int EffectiveSignificandSize(int order) {
         if (order >= -1021)
             return 53;
         else if (order <= -1074)
@@ -79,8 +67,8 @@ class Double {
     static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
 
     union {
-        double d;
-        uint64_t u;
+        double d_;
+        uint64_t u_;
     };
 };
 
diff --git a/extra/rapidjson/include/rapidjson/internal/itoa.h b/extra/rapidjson/include/rapidjson/internal/itoa.h
index 3684f07363f6..9b1c45cc1b4a 100644
--- a/extra/rapidjson/include/rapidjson/internal/itoa.h
+++ b/extra/rapidjson/include/rapidjson/internal/itoa.h
@@ -1,26 +1,22 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_ITOA_
 #define RAPIDJSON_ITOA_
 
+#include "../rapidjson.h"
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
@@ -41,12 +37,14 @@ inline const char* GetDigitsLut() {
 }
 
 inline char* u32toa(uint32_t value, char* buffer) {
+    RAPIDJSON_ASSERT(buffer != 0);
+
     const char* cDigitsLut = GetDigitsLut();
 
     if (value < 10000) {
         const uint32_t d1 = (value / 100) << 1;
         const uint32_t d2 = (value % 100) << 1;
-        
+
         if (value >= 1000)
             *buffer++ = cDigitsLut[d1];
         if (value >= 100)
@@ -59,13 +57,13 @@ inline char* u32toa(uint32_t value, char* buffer) {
         // value = bbbbcccc
         const uint32_t b = value / 10000;
         const uint32_t c = value % 10000;
-        
+
         const uint32_t d1 = (b / 100) << 1;
         const uint32_t d2 = (b % 100) << 1;
-        
+
         const uint32_t d3 = (c / 100) << 1;
         const uint32_t d4 = (c % 100) << 1;
-        
+
         if (value >= 10000000)
             *buffer++ = cDigitsLut[d1];
         if (value >= 1000000)
@@ -73,7 +71,7 @@ inline char* u32toa(uint32_t value, char* buffer) {
         if (value >= 100000)
             *buffer++ = cDigitsLut[d2];
         *buffer++ = cDigitsLut[d2 + 1];
-        
+
         *buffer++ = cDigitsLut[d3];
         *buffer++ = cDigitsLut[d3 + 1];
         *buffer++ = cDigitsLut[d4];
@@ -81,10 +79,10 @@ inline char* u32toa(uint32_t value, char* buffer) {
     }
     else {
         // value = aabbbbcccc in decimal
-        
+
         const uint32_t a = value / 100000000; // 1 to 42
         value %= 100000000;
-        
+
         if (a >= 10) {
             const unsigned i = a << 1;
             *buffer++ = cDigitsLut[i];
@@ -95,13 +93,13 @@ inline char* u32toa(uint32_t value, char* buffer) {
 
         const uint32_t b = value / 10000; // 0 to 9999
         const uint32_t c = value % 10000; // 0 to 9999
-        
+
         const uint32_t d1 = (b / 100) << 1;
         const uint32_t d2 = (b % 100) << 1;
-        
+
         const uint32_t d3 = (c / 100) << 1;
         const uint32_t d4 = (c % 100) << 1;
-        
+
         *buffer++ = cDigitsLut[d1];
         *buffer++ = cDigitsLut[d1 + 1];
         *buffer++ = cDigitsLut[d2];
@@ -115,15 +113,18 @@ inline char* u32toa(uint32_t value, char* buffer) {
 }
 
 inline char* i32toa(int32_t value, char* buffer) {
+    RAPIDJSON_ASSERT(buffer != 0);
+    uint32_t u = static_cast<uint32_t>(value);
     if (value < 0) {
         *buffer++ = '-';
-        value = -value;
+        u = ~u + 1;
     }
 
-    return u32toa(static_cast<uint32_t>(value), buffer);
+    return u32toa(u, buffer);
 }
 
 inline char* u64toa(uint64_t value, char* buffer) {
+    RAPIDJSON_ASSERT(buffer != 0);
     const char* cDigitsLut = GetDigitsLut();
     const uint64_t  kTen8 = 100000000;
     const uint64_t  kTen9 = kTen8 * 10;
@@ -134,13 +135,13 @@ inline char* u64toa(uint64_t value, char* buffer) {
     const uint64_t kTen14 = kTen8 * 1000000;
     const uint64_t kTen15 = kTen8 * 10000000;
     const uint64_t kTen16 = kTen8 * kTen8;
-    
+
     if (value < kTen8) {
         uint32_t v = static_cast<uint32_t>(value);
         if (v < 10000) {
             const uint32_t d1 = (v / 100) << 1;
             const uint32_t d2 = (v % 100) << 1;
-            
+
             if (v >= 1000)
                 *buffer++ = cDigitsLut[d1];
             if (v >= 100)
@@ -153,13 +154,13 @@ inline char* u64toa(uint64_t value, char* buffer) {
             // value = bbbbcccc
             const uint32_t b = v / 10000;
             const uint32_t c = v % 10000;
-            
+
             const uint32_t d1 = (b / 100) << 1;
             const uint32_t d2 = (b % 100) << 1;
-            
+
             const uint32_t d3 = (c / 100) << 1;
             const uint32_t d4 = (c % 100) << 1;
-            
+
             if (value >= 10000000)
                 *buffer++ = cDigitsLut[d1];
             if (value >= 1000000)
@@ -167,7 +168,7 @@ inline char* u64toa(uint64_t value, char* buffer) {
             if (value >= 100000)
                 *buffer++ = cDigitsLut[d2];
             *buffer++ = cDigitsLut[d2 + 1];
-            
+
             *buffer++ = cDigitsLut[d3];
             *buffer++ = cDigitsLut[d3 + 1];
             *buffer++ = cDigitsLut[d4];
@@ -177,22 +178,22 @@ inline char* u64toa(uint64_t value, char* buffer) {
     else if (value < kTen16) {
         const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
         const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
+
         const uint32_t b0 = v0 / 10000;
         const uint32_t c0 = v0 % 10000;
-        
+
         const uint32_t d1 = (b0 / 100) << 1;
         const uint32_t d2 = (b0 % 100) << 1;
-        
+
         const uint32_t d3 = (c0 / 100) << 1;
         const uint32_t d4 = (c0 % 100) << 1;
 
         const uint32_t b1 = v1 / 10000;
         const uint32_t c1 = v1 % 10000;
-        
+
         const uint32_t d5 = (b1 / 100) << 1;
         const uint32_t d6 = (b1 % 100) << 1;
-        
+
         const uint32_t d7 = (c1 / 100) << 1;
         const uint32_t d8 = (c1 % 100) << 1;
 
@@ -210,9 +211,8 @@ inline char* u64toa(uint64_t value, char* buffer) {
             *buffer++ = cDigitsLut[d3 + 1];
         if (value >= kTen9)
             *buffer++ = cDigitsLut[d4];
-        if (value >= kTen8)
-            *buffer++ = cDigitsLut[d4 + 1];
-        
+
+        *buffer++ = cDigitsLut[d4 + 1];
         *buffer++ = cDigitsLut[d5];
         *buffer++ = cDigitsLut[d5 + 1];
         *buffer++ = cDigitsLut[d6];
@@ -225,7 +225,7 @@ inline char* u64toa(uint64_t value, char* buffer) {
     else {
         const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
         value %= kTen16;
-        
+
         if (a < 10)
             *buffer++ = static_cast<char>('0' + static_cast<char>(a));
         else if (a < 100) {
@@ -235,7 +235,7 @@ inline char* u64toa(uint64_t value, char* buffer) {
         }
         else if (a < 1000) {
             *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
-            
+
             const uint32_t i = (a % 100) << 1;
             *buffer++ = cDigitsLut[i];
             *buffer++ = cDigitsLut[i + 1];
@@ -248,28 +248,28 @@ inline char* u64toa(uint64_t value, char* buffer) {
             *buffer++ = cDigitsLut[j];
             *buffer++ = cDigitsLut[j + 1];
         }
-        
+
         const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
         const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
+
         const uint32_t b0 = v0 / 10000;
         const uint32_t c0 = v0 % 10000;
-        
+
         const uint32_t d1 = (b0 / 100) << 1;
         const uint32_t d2 = (b0 % 100) << 1;
-        
+
         const uint32_t d3 = (c0 / 100) << 1;
         const uint32_t d4 = (c0 % 100) << 1;
-        
+
         const uint32_t b1 = v1 / 10000;
         const uint32_t c1 = v1 % 10000;
-        
+
         const uint32_t d5 = (b1 / 100) << 1;
         const uint32_t d6 = (b1 % 100) << 1;
-        
+
         const uint32_t d7 = (c1 / 100) << 1;
         const uint32_t d8 = (c1 % 100) << 1;
-        
+
         *buffer++ = cDigitsLut[d1];
         *buffer++ = cDigitsLut[d1 + 1];
         *buffer++ = cDigitsLut[d2];
@@ -287,17 +287,19 @@ inline char* u64toa(uint64_t value, char* buffer) {
         *buffer++ = cDigitsLut[d8];
         *buffer++ = cDigitsLut[d8 + 1];
     }
-    
+
     return buffer;
 }
 
 inline char* i64toa(int64_t value, char* buffer) {
+    RAPIDJSON_ASSERT(buffer != 0);
+    uint64_t u = static_cast<uint64_t>(value);
     if (value < 0) {
         *buffer++ = '-';
-        value = -value;
+        u = ~u + 1;
     }
 
-    return u64toa(static_cast<uint64_t>(value), buffer);
+    return u64toa(u, buffer);
 }
 
 } // namespace internal
diff --git a/extra/rapidjson/include/rapidjson/internal/meta.h b/extra/rapidjson/include/rapidjson/internal/meta.h
index c33f607d5853..d401edf85150 100644
--- a/extra/rapidjson/include/rapidjson/internal/meta.h
+++ b/extra/rapidjson/include/rapidjson/internal/meta.h
@@ -1,35 +1,28 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_INTERNAL_META_H_
 #define RAPIDJSON_INTERNAL_META_H_
 
-#ifndef RAPIDJSON_RAPIDJSON_H_
-#error <rapidjson.h> not yet included. Do not include this file directly.
-#endif
+#include "../rapidjson.h"
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
 #endif
-#if defined(_MSC_VER)
+
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(6334)
 #endif
@@ -182,7 +175,11 @@ template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type;
 RAPIDJSON_NAMESPACE_END
 //@endcond
 
-#if defined(__GNUC__) || defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __GNUC__
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/extra/rapidjson/include/rapidjson/internal/pow10.h b/extra/rapidjson/include/rapidjson/internal/pow10.h
index 91cf6478ba2a..02f475d705fc 100644
--- a/extra/rapidjson/include/rapidjson/internal/pow10.h
+++ b/extra/rapidjson/include/rapidjson/internal/pow10.h
@@ -1,26 +1,22 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_POW10_
 #define RAPIDJSON_POW10_
 
+#include "../rapidjson.h"
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
diff --git a/extra/rapidjson/include/rapidjson/internal/regex.h b/extra/rapidjson/include/rapidjson/internal/regex.h
new file mode 100644
index 000000000000..af7e06de5168
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/internal/regex.h
@@ -0,0 +1,739 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_REGEX_H_
+#define RAPIDJSON_INTERNAL_REGEX_H_
+
+#include "../allocators.h"
+#include "../stream.h"
+#include "stack.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(switch-enum)
+#elif defined(_MSC_VER)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifndef RAPIDJSON_REGEX_VERBOSE
+#define RAPIDJSON_REGEX_VERBOSE 0
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+///////////////////////////////////////////////////////////////////////////////
+// DecodedStream
+
+template <typename SourceStream, typename Encoding>
+class DecodedStream {
+public:
+    DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
+    unsigned Peek() { return codepoint_; }
+    unsigned Take() {
+        unsigned c = codepoint_;
+        if (c) // No further decoding when '\0'
+            Decode();
+        return c;
+    }
+
+private:
+    void Decode() {
+        if (!Encoding::Decode(ss_, &codepoint_))
+            codepoint_ = 0;
+    }
+
+    SourceStream& ss_;
+    unsigned codepoint_;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericRegex
+
+static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
+static const SizeType kRegexInvalidRange = ~SizeType(0);
+
+template <typename Encoding, typename Allocator>
+class GenericRegexSearch;
+
+//! Regular expression engine with subset of ECMAscript grammar.
+/*!
+    Supported regular expression syntax:
+    - \c ab     Concatenation
+    - \c a|b    Alternation
+    - \c a?     Zero or one
+    - \c a*     Zero or more
+    - \c a+     One or more
+    - \c a{3}   Exactly 3 times
+    - \c a{3,}  At least 3 times
+    - \c a{3,5} 3 to 5 times
+    - \c (ab)   Grouping
+    - \c ^a     At the beginning
+    - \c a$     At the end
+    - \c .      Any character
+    - \c [abc]  Character classes
+    - \c [a-c]  Character class range
+    - \c [a-z0-9_] Character class combination
+    - \c [^abc] Negated character classes
+    - \c [^a-c] Negated character class range
+    - \c [\b]   Backspace (U+0008)
+    - \c \\| \\\\ ...  Escape characters
+    - \c \\f Form feed (U+000C)
+    - \c \\n Line feed (U+000A)
+    - \c \\r Carriage return (U+000D)
+    - \c \\t Tab (U+0009)
+    - \c \\v Vertical tab (U+000B)
+
+    \note This is a Thompson NFA engine, implemented with reference to 
+        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
+        https://swtch.com/~rsc/regexp/regexp1.html 
+*/
+template <typename Encoding, typename Allocator = CrtAllocator>
+class GenericRegex {
+public:
+    typedef Encoding EncodingType;
+    typedef typename Encoding::Ch Ch;
+    template <typename, typename> friend class GenericRegexSearch;
+
+    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
+        ownAllocator_(allocator ? 0 : RAPIDJSON_NEW(Allocator)()), allocator_(allocator ? allocator : ownAllocator_), 
+        states_(allocator_, 256), ranges_(allocator_, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
+        anchorBegin_(), anchorEnd_()
+    {
+        GenericStringStream<Encoding> ss(source);
+        DecodedStream<GenericStringStream<Encoding>, Encoding> ds(ss);
+        Parse(ds);
+    }
+
+    ~GenericRegex()
+    {
+        RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    bool IsValid() const {
+        return root_ != kRegexInvalidState;
+    }
+
+private:
+    enum Operator {
+        kZeroOrOne,
+        kZeroOrMore,
+        kOneOrMore,
+        kConcatenation,
+        kAlternation,
+        kLeftParenthesis
+    };
+
+    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
+    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
+    static const unsigned kRangeNegationFlag = 0x80000000;
+
+    struct Range {
+        unsigned start; // 
+        unsigned end;
+        SizeType next;
+    };
+
+    struct State {
+        SizeType out;     //!< Equals to kInvalid for matching state
+        SizeType out1;    //!< Equals to non-kInvalid for split
+        SizeType rangeStart;
+        unsigned codepoint;
+    };
+
+    struct Frag {
+        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
+        SizeType start;
+        SizeType out; //!< link-list of all output states
+        SizeType minIndex;
+    };
+
+    State& GetState(SizeType index) {
+        RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    const State& GetState(SizeType index) const {
+        RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    Range& GetRange(SizeType index) {
+        RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    const Range& GetRange(SizeType index) const {
+        RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    template <typename InputStream>
+    void Parse(DecodedStream<InputStream, Encoding>& ds) {
+        Stack<Allocator> operandStack(allocator_, 256);    // Frag
+        Stack<Allocator> operatorStack(allocator_, 256);   // Operator
+        Stack<Allocator> atomCountStack(allocator_, 256);  // unsigned (Atom per parenthesis)
+
+        *atomCountStack.template Push<unsigned>() = 0;
+
+        unsigned codepoint;
+        while (ds.Peek() != 0) {
+            switch (codepoint = ds.Take()) {
+                case '^':
+                    anchorBegin_ = true;
+                    break;
+
+                case '$':
+                    anchorEnd_ = true;
+                    break;
+
+                case '|':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    *operatorStack.template Push<Operator>() = kAlternation;
+                    *atomCountStack.template Top<unsigned>() = 0;
+                    break;
+
+                case '(':
+                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
+                    *atomCountStack.template Push<unsigned>() = 0;
+                    break;
+
+                case ')':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    if (operatorStack.Empty())
+                        return;
+                    operatorStack.template Pop<Operator>(1);
+                    atomCountStack.template Pop<unsigned>(1);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '?':
+                    if (!Eval(operandStack, kZeroOrOne))
+                        return;
+                    break;
+
+                case '*':
+                    if (!Eval(operandStack, kZeroOrMore))
+                        return;
+                    break;
+
+                case '+':
+                    if (!Eval(operandStack, kOneOrMore))
+                        return;
+                    break;
+
+                case '{':
+                    {
+                        unsigned n, m;
+                        if (!ParseUnsigned(ds, &n))
+                            return;
+
+                        if (ds.Peek() == ',') {
+                            ds.Take();
+                            if (ds.Peek() == '}')
+                                m = kInfinityQuantifier;
+                            else if (!ParseUnsigned(ds, &m) || m < n)
+                                return;
+                        }
+                        else
+                            m = n;
+
+                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
+                            return;
+                        ds.Take();
+                    }
+                    break;
+
+                case '.':
+                    PushOperand(operandStack, kAnyCharacterClass);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '[':
+                    {
+                        SizeType range;
+                        if (!ParseRange(ds, &range))
+                            return;
+                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
+                        GetState(s).rangeStart = range;
+                        *operandStack.template Push<Frag>() = Frag(s, s, s);
+                    }
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '\\': // Escape character
+                    if (!CharacterEscape(ds, &codepoint))
+                        return; // Unsupported escape character
+                    // fall through to default
+                    RAPIDJSON_DELIBERATE_FALLTHROUGH;
+
+                default: // Pattern character
+                    PushOperand(operandStack, codepoint);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+            }
+        }
+
+        while (!operatorStack.Empty())
+            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                return;
+
+        // Link the operand to matching state.
+        if (operandStack.GetSize() == sizeof(Frag)) {
+            Frag* e = operandStack.template Pop<Frag>(1);
+            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
+            root_ = e->start;
+
+#if RAPIDJSON_REGEX_VERBOSE
+            printf("root: %d\n", root_);
+            for (SizeType i = 0; i < stateCount_ ; i++) {
+                State& s = GetState(i);
+                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
+            }
+            printf("\n");
+#endif
+        }
+    }
+
+    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
+        State* s = states_.template Push<State>();
+        s->out = out;
+        s->out1 = out1;
+        s->codepoint = codepoint;
+        s->rangeStart = kRegexInvalidRange;
+        return stateCount_++;
+    }
+
+    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
+        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
+        *operandStack.template Push<Frag>() = Frag(s, s, s);
+    }
+
+    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
+        if (*atomCountStack.template Top<unsigned>())
+            *operatorStack.template Push<Operator>() = kConcatenation;
+        (*atomCountStack.template Top<unsigned>())++;
+    }
+
+    SizeType Append(SizeType l1, SizeType l2) {
+        SizeType old = l1;
+        while (GetState(l1).out != kRegexInvalidState)
+            l1 = GetState(l1).out;
+        GetState(l1).out = l2;
+        return old;
+    }
+
+    void Patch(SizeType l, SizeType s) {
+        for (SizeType next; l != kRegexInvalidState; l = next) {
+            next = GetState(l).out;
+            GetState(l).out = s;
+        }
+    }
+
+    bool Eval(Stack<Allocator>& operandStack, Operator op) {
+        switch (op) {
+            case kConcatenation:
+                RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag) * 2);
+                {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    Patch(e1.out, e2.start);
+                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
+                }
+                return true;
+
+            case kAlternation:
+                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(e1.start, e2.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
+                    return true;
+                }
+                return false;
+
+            case kZeroOrOne:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
+                    return true;
+                }
+                return false;
+
+            case kZeroOrMore:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
+                    return true;
+                }
+                return false;
+
+            case kOneOrMore:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
+                    return true;
+                }
+                return false;
+
+            default: 
+                // syntax error (e.g. unclosed kLeftParenthesis)
+                return false;
+        }
+    }
+
+    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
+        RAPIDJSON_ASSERT(n <= m);
+        RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag));
+
+        if (n == 0) {
+            if (m == 0)                             // a{0} not support
+                return false;
+            else if (m == kInfinityQuantifier)
+                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
+            else {
+                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
+            }
+            return true;
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
+            CloneTopOperand(operandStack);
+
+        if (m == kInfinityQuantifier)
+            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
+        else if (m > n) {
+            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
+            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
+            for (unsigned i = n; i < m - 1; i++)
+                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
+            for (unsigned i = n; i < m; i++)
+                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)
+            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
+
+        return true;
+    }
+
+    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
+
+    void CloneTopOperand(Stack<Allocator>& operandStack) {
+        const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
+        SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
+        State* s = states_.template Push<State>(count);
+        memcpy(s, &GetState(src.minIndex), count * sizeof(State));
+        for (SizeType j = 0; j < count; j++) {
+            if (s[j].out != kRegexInvalidState)
+                s[j].out += count;
+            if (s[j].out1 != kRegexInvalidState)
+                s[j].out1 += count;
+        }
+        *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
+        stateCount_ += count;
+    }
+
+    template <typename InputStream>
+    bool ParseUnsigned(DecodedStream<InputStream, Encoding>& ds, unsigned* u) {
+        unsigned r = 0;
+        if (ds.Peek() < '0' || ds.Peek() > '9')
+            return false;
+        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
+            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
+                return false; // overflow
+            r = r * 10 + (ds.Take() - '0');
+        }
+        *u = r;
+        return true;
+    }
+
+    template <typename InputStream>
+    bool ParseRange(DecodedStream<InputStream, Encoding>& ds, SizeType* range) {
+        bool isBegin = true;
+        bool negate = false;
+        int step = 0;
+        SizeType start = kRegexInvalidRange;
+        SizeType current = kRegexInvalidRange;
+        unsigned codepoint;
+        while ((codepoint = ds.Take()) != 0) {
+            if (isBegin) {
+                isBegin = false;
+                if (codepoint == '^') {
+                    negate = true;
+                    continue;
+                }
+            }
+
+            switch (codepoint) {
+            case ']':
+                if (start == kRegexInvalidRange)
+                    return false;   // Error: nothing inside []
+                if (step == 2) { // Add trailing '-'
+                    SizeType r = NewRange('-');
+                    RAPIDJSON_ASSERT(current != kRegexInvalidRange);
+                    GetRange(current).next = r;
+                }
+                if (negate)
+                    GetRange(start).start |= kRangeNegationFlag;
+                *range = start;
+                return true;
+
+            case '\\':
+                if (ds.Peek() == 'b') {
+                    ds.Take();
+                    codepoint = 0x0008; // Escape backspace character
+                }
+                else if (!CharacterEscape(ds, &codepoint))
+                    return false;
+                // fall through to default
+                RAPIDJSON_DELIBERATE_FALLTHROUGH;
+
+            default:
+                switch (step) {
+                case 1:
+                    if (codepoint == '-') {
+                        step++;
+                        break;
+                    }
+                    // fall through to step 0 for other characters
+                    RAPIDJSON_DELIBERATE_FALLTHROUGH;
+
+                case 0:
+                    {
+                        SizeType r = NewRange(codepoint);
+                        if (current != kRegexInvalidRange)
+                            GetRange(current).next = r;
+                        if (start == kRegexInvalidRange)
+                            start = r;
+                        current = r;
+                    }
+                    step = 1;
+                    break;
+
+                default:
+                    RAPIDJSON_ASSERT(step == 2);
+                    GetRange(current).end = codepoint;
+                    step = 0;
+                }
+            }
+        }
+        return false;
+    }
+    
+    SizeType NewRange(unsigned codepoint) {
+        Range* r = ranges_.template Push<Range>();
+        r->start = r->end = codepoint;
+        r->next = kRegexInvalidRange;
+        return rangeCount_++;
+    }
+
+    template <typename InputStream>
+    bool CharacterEscape(DecodedStream<InputStream, Encoding>& ds, unsigned* escapedCodepoint) {
+        unsigned codepoint;
+        switch (codepoint = ds.Take()) {
+            case '^':
+            case '$':
+            case '|':
+            case '(':
+            case ')':
+            case '?':
+            case '*':
+            case '+':
+            case '.':
+            case '[':
+            case ']':
+            case '{':
+            case '}':
+            case '\\':
+                *escapedCodepoint = codepoint; return true;
+            case 'f': *escapedCodepoint = 0x000C; return true;
+            case 'n': *escapedCodepoint = 0x000A; return true;
+            case 'r': *escapedCodepoint = 0x000D; return true;
+            case 't': *escapedCodepoint = 0x0009; return true;
+            case 'v': *escapedCodepoint = 0x000B; return true;
+            default:
+                return false; // Unsupported escape character
+        }
+    }
+
+    Allocator* ownAllocator_;
+    Allocator* allocator_;
+    Stack<Allocator> states_;
+    Stack<Allocator> ranges_;
+    SizeType root_;
+    SizeType stateCount_;
+    SizeType rangeCount_;
+
+    static const unsigned kInfinityQuantifier = ~0u;
+
+    // For SearchWithAnchoring()
+    bool anchorBegin_;
+    bool anchorEnd_;
+};
+
+template <typename RegexType, typename Allocator = CrtAllocator>
+class GenericRegexSearch {
+public:
+    typedef typename RegexType::EncodingType Encoding;
+    typedef typename Encoding::Ch Ch;
+
+    GenericRegexSearch(const RegexType& regex, Allocator* allocator = 0) : 
+        regex_(regex), allocator_(allocator), ownAllocator_(0),
+        state0_(allocator, 0), state1_(allocator, 0), stateSet_()
+    {
+        RAPIDJSON_ASSERT(regex_.IsValid());
+        if (!allocator_)
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
+        stateSet_ = static_cast<unsigned*>(allocator_->Malloc(GetStateSetSize()));
+        state0_.template Reserve<SizeType>(regex_.stateCount_);
+        state1_.template Reserve<SizeType>(regex_.stateCount_);
+    }
+
+    ~GenericRegexSearch() {
+        Allocator::Free(stateSet_);
+        RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    template <typename InputStream>
+    bool Match(InputStream& is) {
+        return SearchWithAnchoring(is, true, true);
+    }
+
+    bool Match(const Ch* s) {
+        GenericStringStream<Encoding> is(s);
+        return Match(is);
+    }
+
+    template <typename InputStream>
+    bool Search(InputStream& is) {
+        return SearchWithAnchoring(is, regex_.anchorBegin_, regex_.anchorEnd_);
+    }
+
+    bool Search(const Ch* s) {
+        GenericStringStream<Encoding> is(s);
+        return Search(is);
+    }
+
+private:
+    typedef typename RegexType::State State;
+    typedef typename RegexType::Range Range;
+
+    template <typename InputStream>
+    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) {
+        DecodedStream<InputStream, Encoding> ds(is);
+
+        state0_.Clear();
+        Stack<Allocator> *current = &state0_, *next = &state1_;
+        const size_t stateSetSize = GetStateSetSize();
+        std::memset(stateSet_, 0, stateSetSize);
+
+        bool matched = AddState(*current, regex_.root_);
+        unsigned codepoint;
+        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
+            std::memset(stateSet_, 0, stateSetSize);
+            next->Clear();
+            matched = false;
+            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
+                const State& sr = regex_.GetState(*s);
+                if (sr.codepoint == codepoint ||
+                    sr.codepoint == RegexType::kAnyCharacterClass || 
+                    (sr.codepoint == RegexType::kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
+                {
+                    matched = AddState(*next, sr.out) || matched;
+                    if (!anchorEnd && matched)
+                        return true;
+                }
+                if (!anchorBegin)
+                    AddState(*next, regex_.root_);
+            }
+            internal::Swap(current, next);
+        }
+
+        return matched;
+    }
+
+    size_t GetStateSetSize() const {
+        return (regex_.stateCount_ + 31) / 32 * 4;
+    }
+
+    // Return whether the added states is a match state
+    bool AddState(Stack<Allocator>& l, SizeType index) {
+        RAPIDJSON_ASSERT(index != kRegexInvalidState);
+
+        const State& s = regex_.GetState(index);
+        if (s.out1 != kRegexInvalidState) { // Split
+            bool matched = AddState(l, s.out);
+            return AddState(l, s.out1) || matched;
+        }
+        else if (!(stateSet_[index >> 5] & (1u << (index & 31)))) {
+            stateSet_[index >> 5] |= (1u << (index & 31));
+            *l.template PushUnsafe<SizeType>() = index;
+        }
+        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
+    }
+
+    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
+        bool yes = (regex_.GetRange(rangeIndex).start & RegexType::kRangeNegationFlag) == 0;
+        while (rangeIndex != kRegexInvalidRange) {
+            const Range& r = regex_.GetRange(rangeIndex);
+            if (codepoint >= (r.start & ~RegexType::kRangeNegationFlag) && codepoint <= r.end)
+                return yes;
+            rangeIndex = r.next;
+        }
+        return !yes;
+    }
+
+    const RegexType& regex_;
+    Allocator* allocator_;
+    Allocator* ownAllocator_;
+    Stack<Allocator> state0_;
+    Stack<Allocator> state1_;
+    uint32_t* stateSet_;
+};
+
+typedef GenericRegex<UTF8<> > Regex;
+typedef GenericRegexSearch<Regex> RegexSearch;
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+#if defined(__clang__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_INTERNAL_REGEX_H_
diff --git a/extra/rapidjson/include/rapidjson/internal/stack.h b/extra/rapidjson/include/rapidjson/internal/stack.h
index 62ae7aa80445..45dca6a8b09e 100644
--- a/extra/rapidjson/include/rapidjson/internal/stack.h
+++ b/extra/rapidjson/include/rapidjson/internal/stack.h
@@ -1,26 +1,29 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_INTERNAL_STACK_H_
 #define RAPIDJSON_INTERNAL_STACK_H_
 
+#include "../allocators.h"
+#include "swap.h"
+#include <cstddef>
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
@@ -36,7 +39,6 @@ class Stack {
     // Optimization note: Do not allocate memory for stack_ in constructor.
     // Do it lazily when first Push() -> Expand() -> Resize().
     Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
-        RAPIDJSON_ASSERT(stackCapacity > 0);
     }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
@@ -85,12 +87,21 @@ class Stack {
     }
 #endif
 
+    void Swap(Stack& rhs) RAPIDJSON_NOEXCEPT {
+        internal::Swap(allocator_, rhs.allocator_);
+        internal::Swap(ownAllocator_, rhs.ownAllocator_);
+        internal::Swap(stack_, rhs.stack_);
+        internal::Swap(stackTop_, rhs.stackTop_);
+        internal::Swap(stackEnd_, rhs.stackEnd_);
+        internal::Swap(initialCapacity_, rhs.initialCapacity_);
+    }
+
     void Clear() { stackTop_ = stack_; }
 
     void ShrinkToFit() { 
         if (Empty()) {
             // If the stack is empty, completely deallocate the memory.
-            Allocator::Free(stack_);
+            Allocator::Free(stack_); // NOLINT (+clang-analyzer-unix.Malloc)
             stack_ = 0;
             stackTop_ = 0;
             stackEnd_ = 0;
@@ -102,11 +113,22 @@ class Stack {
     // Optimization note: try to minimize the size of this function for force inline.
     // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
     template<typename T>
-    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+    RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
          // Expand the stack if needed
-        if (stackTop_ + sizeof(T) * count >= stackEnd_)
+        if (RAPIDJSON_UNLIKELY(static_cast<std::ptrdiff_t>(sizeof(T) * count) > (stackEnd_ - stackTop_)))
             Expand<T>(count);
+    }
 
+    template<typename T>
+    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+        Reserve<T>(count);
+        return PushUnsafe<T>(count);
+    }
+
+    template<typename T>
+    RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
+        RAPIDJSON_ASSERT(stackTop_);
+        RAPIDJSON_ASSERT(static_cast<std::ptrdiff_t>(sizeof(T) * count) <= (stackEnd_ - stackTop_));
         T* ret = reinterpret_cast<T*>(stackTop_);
         stackTop_ += sizeof(T) * count;
         return ret;
@@ -126,9 +148,32 @@ class Stack {
     }
 
     template<typename T>
-    T* Bottom() { return (T*)stack_; }
+    const T* Top() const {
+        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
+        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
+    }
+
+    template<typename T>
+    T* End() { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
+    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
+    T* Bottom() { return reinterpret_cast<T*>(stack_); }
+
+    template<typename T>
+    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
+
+    bool HasAllocator() const {
+        return allocator_ != 0;
+    }
+
+    Allocator& GetAllocator() {
+        RAPIDJSON_ASSERT(allocator_);
+        return *allocator_;
+    }
 
-    Allocator& GetAllocator() { return *allocator_; }
     bool Empty() const { return stackTop_ == stack_; }
     size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
     size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
@@ -140,7 +185,7 @@ class Stack {
         size_t newCapacity;
         if (stack_ == 0) {
             if (!allocator_)
-                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
+                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
             newCapacity = initialCapacity_;
         } else {
             newCapacity = GetCapacity();
@@ -155,7 +200,7 @@ class Stack {
 
     void Resize(size_t newCapacity) {
         const size_t size = GetSize();  // Backup the current size
-        stack_ = (char*)allocator_->Realloc(stack_, GetCapacity(), newCapacity);
+        stack_ = static_cast<char*>(allocator_->Realloc(stack_, GetCapacity(), newCapacity));
         stackTop_ = stack_ + size;
         stackEnd_ = stack_ + newCapacity;
     }
@@ -180,4 +225,8 @@ class Stack {
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_STACK_H_
diff --git a/extra/rapidjson/include/rapidjson/internal/strfunc.h b/extra/rapidjson/include/rapidjson/internal/strfunc.h
index 734adc36dcb3..226439a76736 100644
--- a/extra/rapidjson/include/rapidjson/internal/strfunc.h
+++ b/extra/rapidjson/include/rapidjson/internal/strfunc.h
@@ -1,26 +1,23 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
 #define RAPIDJSON_INTERNAL_STRFUNC_H_
 
+#include "../stream.h"
+#include <cwchar>
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
@@ -32,11 +29,40 @@ namespace internal {
 */
 template <typename Ch>
 inline SizeType StrLen(const Ch* s) {
+    RAPIDJSON_ASSERT(s != 0);
     const Ch* p = s;
     while (*p) ++p;
     return SizeType(p - s);
 }
 
+template <>
+inline SizeType StrLen(const char* s) {
+    return SizeType(std::strlen(s));
+}
+
+template <>
+inline SizeType StrLen(const wchar_t* s) {
+    return SizeType(std::wcslen(s));
+}
+
+//! Returns number of code points in a encoded string.
+template<typename Encoding>
+bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
+    RAPIDJSON_ASSERT(s != 0);
+    RAPIDJSON_ASSERT(outCount != 0);
+    GenericStringStream<Encoding> is(s);
+    const typename Encoding::Ch* end = s + length;
+    SizeType count = 0;
+    while (is.src_ < end) {
+        unsigned codepoint;
+        if (!Encoding::Decode(is, &codepoint))
+            return false;
+        count++;
+    }
+    *outCount = count;
+    return true;
+}
+
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 
diff --git a/extra/rapidjson/include/rapidjson/internal/strtod.h b/extra/rapidjson/include/rapidjson/internal/strtod.h
index 1fc6050eeb44..dfca22b65ac0 100644
--- a/extra/rapidjson/include/rapidjson/internal/strtod.h
+++ b/extra/rapidjson/include/rapidjson/internal/strtod.h
@@ -1,31 +1,26 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_STRTOD_
 #define RAPIDJSON_STRTOD_
 
-#include "../rapidjson.h"
 #include "ieee754.h"
 #include "biginteger.h"
 #include "diyfp.h"
 #include "pow10.h"
+#include <climits>
+#include <limits>
 
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
@@ -58,7 +53,7 @@ inline T Min3(T a, T b, T c) {
     return m;
 }
 
-inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp, bool* adjustToNegative) {
+inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
     const Double db(b);
     const uint64_t bInt = db.IntegerSignificand();
     const int bExp = db.IntegerExponent();
@@ -101,28 +96,18 @@ inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp, bool* adj
     hS_Exp2 -= common_Exp2;
 
     BigInteger dS = d;
-    dS.MultiplyPow5(dS_Exp5) <<= dS_Exp2;
+    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<unsigned>(dS_Exp2);
 
     BigInteger bS(bInt);
-    bS.MultiplyPow5(bS_Exp5) <<= bS_Exp2;
+    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<unsigned>(bS_Exp2);
 
     BigInteger hS(1);
-    hS.MultiplyPow5(hS_Exp5) <<= hS_Exp2;
+    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<unsigned>(hS_Exp2);
 
     BigInteger delta(0);
-    *adjustToNegative = dS.Difference(bS, &delta);
-
-    int cmp = delta.Compare(hS);
-    // If delta is within 1/2 ULP, check for special case when significand is power of two.
-    // In this case, need to compare with 1/2h in the lower bound.
-    if (cmp < 0 && *adjustToNegative && // within and dS < bS
-        db.IsNormal() && (bInt & (bInt - 1)) == 0 && // Power of 2
-        db.Uint64Value() != RAPIDJSON_UINT64_C2(0x00100000, 0x00000000)) // minimum normal number must not do this
-    {
-        delta <<= 1;
-        return delta.Compare(hS);
-    }
-    return cmp;
+    dS.Difference(bS, &delta);
+
+    return delta.Compare(hS);
 }
 
 inline bool StrtodFast(double d, int p, double* result) {
@@ -143,46 +128,46 @@ inline bool StrtodFast(double d, int p, double* result) {
 }
 
 // Compute an approximation and see if it is within 1/2 ULP
-inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
+inline bool StrtodDiyFp(const char* decimals, int dLen, int dExp, double* result) {
     uint64_t significand = 0;
-    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
-    for (; i < length; i++) {
+    int i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
+    for (; i < dLen; i++) {
         if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
             (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
             break;
-        significand = significand * 10 + (decimals[i] - '0');
+        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
     }
     
-    if (i < length && decimals[i] >= '5') // Rounding
+    if (i < dLen && decimals[i] >= '5') // Rounding
         significand++;
 
-    size_t remaining = length - i;
-    const unsigned kUlpShift = 3;
-    const unsigned kUlp = 1 << kUlpShift;
-    int error = (remaining == 0) ? 0 : kUlp / 2;
+    int remaining = dLen - i;
+    const int kUlpShift = 3;
+    const int kUlp = 1 << kUlpShift;
+    int64_t error = (remaining == 0) ? 0 : kUlp / 2;
 
     DiyFp v(significand, 0);
     v = v.Normalize();
     error <<= -v.e;
 
-    const int dExp = (int)decimalPosition - (int)i + exp;
+    dExp += remaining;
 
     int actualExp;
     DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
     if (actualExp != dExp) {
         static const DiyFp kPow10[] = {
-            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
-            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
-            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
-            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
-            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
-            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
-            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
+            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 0x00000000), -60),  // 10^1
+            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 0x00000000), -57),  // 10^2
+            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 0x00000000), -54),  // 10^3
+            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), -50),  // 10^4
+            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 0x00000000), -47),  // 10^5
+            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 0x00000000), -44),  // 10^6
+            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 0x00000000), -40)   // 10^7
         };
-        int adjustment = dExp - actualExp - 1;
-        RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
-        v = v * kPow10[adjustment];
-        if (length + adjustment > 19) // has more digits than decimal digits in 64-bit
+        int adjustment = dExp - actualExp;
+        RAPIDJSON_ASSERT(adjustment >= 1 && adjustment < 8);
+        v = v * kPow10[adjustment - 1];
+        if (dLen + adjustment > 19) // has more digits than decimal digits in 64-bit
             error += kUlp / 2;
     }
 
@@ -194,10 +179,10 @@ inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosit
     v = v.Normalize();
     error <<= oldExp - v.e;
 
-    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
-    unsigned precisionSize = 64 - effectiveSignificandSize;
+    const int effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
+    int precisionSize = 64 - effectiveSignificandSize;
     if (precisionSize + kUlpShift >= 64) {
-        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
+        int scaleExp = (precisionSize + kUlpShift) - 63;
         v.f >>= scaleExp;
         v.e += scaleExp; 
         error = (error >> scaleExp) + 1 + kUlp;
@@ -207,76 +192,96 @@ inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosit
     DiyFp rounded(v.f >> precisionSize, v.e + precisionSize);
     const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
     const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
-    if (precisionBits >= halfWay + error)
+    if (precisionBits >= halfWay + static_cast<unsigned>(error)) {
         rounded.f++;
+        if (rounded.f & (DiyFp::kDpHiddenBit << 1)) { // rounding overflows mantissa (issue #340)
+            rounded.f >>= 1;
+            rounded.e++;
+        }
+    }
 
     *result = rounded.ToDouble();
 
-    return halfWay - error >= precisionBits || precisionBits >= halfWay + error;
+    return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
 }
 
-inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    const BigInteger dInt(decimals, length);
-    const int dExp = (int)decimalPosition - (int)length + exp;
+inline double StrtodBigInteger(double approx, const char* decimals, int dLen, int dExp) {
+    RAPIDJSON_ASSERT(dLen >= 0);
+    const BigInteger dInt(decimals, static_cast<unsigned>(dLen));
     Double a(approx);
-    for (int i = 0; i < 10; i++) {
-        bool adjustToNegative;
-        int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp, &adjustToNegative);
-        if (cmp < 0)
-            return a.Value();  // within half ULP
-        else if (cmp == 0) {
-            // Round towards even
-            if (a.Significand() & 1)
-                return adjustToNegative ? a.PreviousPositiveDouble() : a.NextPositiveDouble();
-            else
-                return a.Value();
-        }
-        else // adjustment
-            a = adjustToNegative ? a.PreviousPositiveDouble() : a.NextPositiveDouble();
+    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
+    if (cmp < 0)
+        return a.Value();  // within half ULP
+    else if (cmp == 0) {
+        // Round towards even
+        if (a.Significand() & 1)
+            return a.NextPositiveDouble();
+        else
+            return a.Value();
     }
-
-    // This should not happen, but in case there is really a bug, break the infinite-loop
-    return a.Value();
+    else // adjustment
+        return a.NextPositiveDouble();
 }
 
 inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
     RAPIDJSON_ASSERT(d >= 0.0);
     RAPIDJSON_ASSERT(length >= 1);
 
-    double result;
+    double result = 0.0;
     if (StrtodFast(d, p, &result))
         return result;
 
+    RAPIDJSON_ASSERT(length <= INT_MAX);
+    int dLen = static_cast<int>(length);
+
+    RAPIDJSON_ASSERT(length >= decimalPosition);
+    RAPIDJSON_ASSERT(length - decimalPosition <= INT_MAX);
+    int dExpAdjust = static_cast<int>(length - decimalPosition);
+
+    RAPIDJSON_ASSERT(exp >= INT_MIN + dExpAdjust);
+    int dExp = exp - dExpAdjust;
+
+    // Make sure length+dExp does not overflow
+    RAPIDJSON_ASSERT(dExp <= INT_MAX - dLen);
+
     // Trim leading zeros
-    while (*decimals == '0' && length > 1) {
-        length--;
+    while (dLen > 0 && *decimals == '0') {
+        dLen--;
         decimals++;
-        decimalPosition--;
     }
 
     // Trim trailing zeros
-    while (decimals[length - 1] == '0' && length > 1) {
-        length--;
-        decimalPosition--;
-        exp++;
+    while (dLen > 0 && decimals[dLen - 1] == '0') {
+        dLen--;
+        dExp++;
+    }
+
+    if (dLen == 0) { // Buffer only contains zeros.
+        return 0.0;
     }
 
     // Trim right-most digits
-    const int kMaxDecimalDigit = 780;
-    if ((int)length > kMaxDecimalDigit) {
-        exp += (int(length) - kMaxDecimalDigit);
-        length = kMaxDecimalDigit;
+    const int kMaxDecimalDigit = 767 + 1;
+    if (dLen > kMaxDecimalDigit) {
+        dExp += dLen - kMaxDecimalDigit;
+        dLen = kMaxDecimalDigit;
     }
 
-    // If too small, underflow to zero
-    if (int(length) + exp < -324)
+    // If too small, underflow to zero.
+    // Any x <= 10^-324 is interpreted as zero.
+    if (dLen + dExp <= -324)
         return 0.0;
 
-    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
+    // If too large, overflow to infinity.
+    // Any x >= 10^309 is interpreted as +infinity.
+    if (dLen + dExp > 309)
+        return std::numeric_limits<double>::infinity();
+
+    if (StrtodDiyFp(decimals, dLen, dExp, &result))
         return result;
 
     // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
-    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
+    return StrtodBigInteger(result, decimals, dLen, dExp);
 }
 
 } // namespace internal
diff --git a/extra/rapidjson/include/rapidjson/internal/swap.h b/extra/rapidjson/include/rapidjson/internal/swap.h
new file mode 100644
index 000000000000..666e49f97b68
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/internal/swap.h
@@ -0,0 +1,46 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_SWAP_H_
+#define RAPIDJSON_INTERNAL_SWAP_H_
+
+#include "../rapidjson.h"
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Custom swap() to avoid dependency on C++ <algorithm> header
+/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
+    \note This has the same semantics as std::swap().
+*/
+template <typename T>
+inline void Swap(T& a, T& b) RAPIDJSON_NOEXCEPT {
+    T tmp = a;
+        a = b;
+        b = tmp;
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_INTERNAL_SWAP_H_
diff --git a/extra/rapidjson/include/rapidjson/istreamwrapper.h b/extra/rapidjson/include/rapidjson/istreamwrapper.h
new file mode 100644
index 000000000000..c4950b9dcf82
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/istreamwrapper.h
@@ -0,0 +1,128 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ISTREAMWRAPPER_H_
+#define RAPIDJSON_ISTREAMWRAPPER_H_
+
+#include "stream.h"
+#include <iosfwd>
+#include <ios>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#elif defined(_MSC_VER)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::istringstream
+    - \c std::stringstream
+    - \c std::wistringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wifstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_istream.
+*/
+   
+template <typename StreamType>
+class BasicIStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+
+    //! Constructor.
+    /*!
+        \param stream stream opened for read.
+    */
+    BasicIStreamWrapper(StreamType &stream) : stream_(stream), buffer_(peekBuffer_), bufferSize_(4), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+        Read();
+    }
+
+    //! Constructor.
+    /*!
+        \param stream stream opened for read.
+        \param buffer user-supplied buffer.
+        \param bufferSize size of buffer in bytes. Must >=4 bytes.
+    */
+    BasicIStreamWrapper(StreamType &stream, char* buffer, size_t bufferSize) : stream_(stream), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+        RAPIDJSON_ASSERT(bufferSize >= 4);
+        Read();
+    }
+
+    Ch Peek() const { return *current_; }
+    Ch Take() { Ch c = *current_; Read(); return c; }
+    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return (current_ + 4 - !eof_ <= bufferLast_) ? current_ : 0;
+    }
+
+private:
+    BasicIStreamWrapper();
+    BasicIStreamWrapper(const BasicIStreamWrapper&);
+    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
+
+    void Read() {
+        if (current_ < bufferLast_)
+            ++current_;
+        else if (!eof_) {
+            count_ += readCount_;
+            readCount_ = bufferSize_;
+            bufferLast_ = buffer_ + readCount_ - 1;
+            current_ = buffer_;
+
+            if (!stream_.read(buffer_, static_cast<std::streamsize>(bufferSize_))) {
+                readCount_ = static_cast<size_t>(stream_.gcount());
+                *(bufferLast_ = buffer_ + readCount_) = '\0';
+                eof_ = true;
+            }
+        }
+    }
+
+    StreamType &stream_;
+    Ch peekBuffer_[4], *buffer_;
+    size_t bufferSize_;
+    Ch *bufferLast_;
+    Ch *current_;
+    size_t readCount_;
+    size_t count_;  //!< Number of characters read
+    bool eof_;
+};
+
+typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
+typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
+
+#if defined(__clang__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ISTREAMWRAPPER_H_
diff --git a/extra/rapidjson/include/rapidjson/memorybuffer.h b/extra/rapidjson/include/rapidjson/memorybuffer.h
index 95c68a38710e..39bee1dec1c0 100644
--- a/extra/rapidjson/include/rapidjson/memorybuffer.h
+++ b/extra/rapidjson/include/rapidjson/memorybuffer.h
@@ -1,27 +1,21 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_MEMORYBUFFER_H_
 #define RAPIDJSON_MEMORYBUFFER_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include "internal/stack.h"
 
 RAPIDJSON_NAMESPACE_BEGIN
diff --git a/extra/rapidjson/include/rapidjson/memorystream.h b/extra/rapidjson/include/rapidjson/memorystream.h
index f994a12fc47f..1d71d8a4f0e0 100644
--- a/extra/rapidjson/include/rapidjson/memorystream.h
+++ b/extra/rapidjson/include/rapidjson/memorystream.h
@@ -1,27 +1,27 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_MEMORYSTREAM_H_
 #define RAPIDJSON_MEMORYSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(unreachable-code)
+RAPIDJSON_DIAG_OFF(missing-noreturn)
+#endif
 
 RAPIDJSON_NAMESPACE_BEGIN
 
@@ -42,8 +42,8 @@ struct MemoryStream {
 
     MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
 
-    Ch Peek() const { return (src_ == end_) ? '\0' : *src_; }
-    Ch Take() { return (src_ == end_) ? '\0' : *src_++; }
+    Ch Peek() const { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
+    Ch Take() { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
     size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
 
     Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
@@ -64,4 +64,8 @@ struct MemoryStream {
 
 RAPIDJSON_NAMESPACE_END
 
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_MEMORYBUFFER_H_
diff --git a/extra/rapidjson/include/rapidjson/msinttypes/inttypes.h b/extra/rapidjson/include/rapidjson/msinttypes/inttypes.h
index af713c9adf54..18111286bf55 100644
--- a/extra/rapidjson/include/rapidjson/msinttypes/inttypes.h
+++ b/extra/rapidjson/include/rapidjson/msinttypes/inttypes.h
@@ -30,6 +30,10 @@
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
 #ifndef _MSC_VER // [
 #error "Use this header only with Microsoft Visual C++ compilers!"
 #endif // _MSC_VER ]
diff --git a/extra/rapidjson/include/rapidjson/msinttypes/stdint.h b/extra/rapidjson/include/rapidjson/msinttypes/stdint.h
index bbad95af1599..3d4477b9a024 100644
--- a/extra/rapidjson/include/rapidjson/msinttypes/stdint.h
+++ b/extra/rapidjson/include/rapidjson/msinttypes/stdint.h
@@ -30,6 +30,10 @@
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
 #ifndef _MSC_VER // [
 #error "Use this header only with Microsoft Visual C++ compilers!"
 #endif // _MSC_VER ]
@@ -85,14 +89,14 @@
 #include <limits.h>
 
 // For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
+// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler would give many errors like this:
 //   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(_M_ARM)
 extern "C" {
 #endif
 #  include <wchar.h>
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(_M_ARM)
 }
 #endif
 
diff --git a/extra/rapidjson/include/rapidjson/ostreamwrapper.h b/extra/rapidjson/include/rapidjson/ostreamwrapper.h
new file mode 100644
index 000000000000..6f4667c08ad7
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/ostreamwrapper.h
@@ -0,0 +1,81 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_OSTREAMWRAPPER_H_
+#define RAPIDJSON_OSTREAMWRAPPER_H_
+
+#include "stream.h"
+#include <iosfwd>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::ostringstream
+    - \c std::stringstream
+    - \c std::wpstringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wofstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_ostream.
+*/
+   
+template <typename StreamType>
+class BasicOStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
+
+    void Put(Ch c) {
+        stream_.put(c);
+    }
+
+    void Flush() {
+        stream_.flush();
+    }
+
+    // Not implemented
+    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    BasicOStreamWrapper(const BasicOStreamWrapper&);
+    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
+
+    StreamType& stream_;
+};
+
+typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
+typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_OSTREAMWRAPPER_H_
diff --git a/extra/rapidjson/include/rapidjson/pointer.h b/extra/rapidjson/include/rapidjson/pointer.h
new file mode 100644
index 000000000000..b8143b638039
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/pointer.h
@@ -0,0 +1,1415 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_POINTER_H_
+#define RAPIDJSON_POINTER_H_
+
+#include "document.h"
+#include "internal/itoa.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(switch-enum)
+#elif defined(_MSC_VER)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
+
+//! Error code of parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
+*/
+enum PointerParseErrorCode {
+    kPointerParseErrorNone = 0,                     //!< The parse is successful
+
+    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
+    kPointerParseErrorInvalidEscape,                //!< Invalid escape
+    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
+    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericPointer
+
+//! Represents a JSON Pointer. Use Pointer for UTF8 encoding and default allocator.
+/*!
+    This class implements RFC 6901 "JavaScript Object Notation (JSON) Pointer" 
+    (https://tools.ietf.org/html/rfc6901).
+
+    A JSON pointer is for identifying a specific value in a JSON document
+    (GenericDocument). It can simplify coding of DOM tree manipulation, because it
+    can access multiple-level depth of DOM tree with single API call.
+
+    After it parses a string representation (e.g. "/foo/0" or URI fragment 
+    representation (e.g. "#/foo/0") into its internal representation (tokens),
+    it can be used to resolve a specific value in multiple documents, or sub-tree 
+    of documents.
+
+    Contrary to GenericValue, Pointer can be copy constructed and copy assigned.
+    Apart from assignment, a Pointer cannot be modified after construction.
+
+    Although Pointer is very convenient, please aware that constructing Pointer
+    involves parsing and dynamic memory allocation. A special constructor with user-
+    supplied tokens eliminates these.
+
+    GenericPointer depends on GenericDocument and GenericValue.
+    
+    \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
+    \tparam Allocator The allocator type for allocating memory for internal representation.
+    
+    \note GenericPointer uses same encoding of ValueType.
+    However, Allocator of GenericPointer is independent of Allocator of Value.
+*/
+template <typename ValueType, typename Allocator = CrtAllocator>
+class GenericPointer {
+public:
+    typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
+    typedef typename ValueType::Ch Ch;                      //!< Character type from Value
+
+    //! A token is the basic units of internal representation.
+    /*!
+        A JSON pointer string representation "/foo/123" is parsed to two tokens: 
+        "foo" and 123. 123 will be represented in both numeric form and string form.
+        They are resolved according to the actual value type (object or array).
+
+        For token that are not numbers, or the numeric value is out of bound
+        (greater than limits of SizeType), they are only treated as string form
+        (i.e. the token's index will be equal to kPointerInvalidIndex).
+
+        This struct is public so that user can create a Pointer without parsing and 
+        allocation, using a special constructor.
+    */
+    struct Token {
+        const Ch* name;             //!< Name of the token. It has null character at the end but it can contain null character.
+        SizeType length;            //!< Length of the name.
+        SizeType index;             //!< A valid array index, if it is not equal to kPointerInvalidIndex.
+    };
+
+    //!@name Constructors and destructor.
+    //@{
+
+    //! Default constructor.
+    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
+
+    //! Constructor that parses a string or URI fragment representation.
+    /*!
+        \param source A null-terminated, string or URI fragment representation of JSON pointer.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+    */
+    explicit GenericPointer(const Ch* source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source, internal::StrLen(source));
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    //! Constructor that parses a string or URI fragment representation.
+    /*!
+        \param source A string or URI fragment representation of JSON pointer.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
+    */
+    explicit GenericPointer(const std::basic_string<Ch>& source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source.c_str(), source.size());
+    }
+#endif
+
+    //! Constructor that parses a string or URI fragment representation, with length of the source string.
+    /*!
+        \param source A string or URI fragment representation of JSON pointer.
+        \param length Length of source.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+        \note Slightly faster than the overload without length.
+    */
+    GenericPointer(const Ch* source, size_t length, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source, length);
+    }
+
+    //! Constructor with user-supplied tokens.
+    /*!
+        This constructor let user supplies const array of tokens.
+        This prevents the parsing process and eliminates allocation.
+        This is preferred for memory constrained environments.
+
+        \param tokens An constant array of tokens representing the JSON pointer.
+        \param tokenCount Number of tokens.
+
+        \b Example
+        \code
+        #define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
+        #define INDEX(i) { #i, sizeof(#i) - 1, i }
+
+        static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
+        static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
+        // Equivalent to static const Pointer p("/foo/123");
+
+        #undef NAME
+        #undef INDEX
+        \endcode
+    */
+    GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
+
+    //! Copy constructor.
+    GenericPointer(const GenericPointer& rhs) : allocator_(rhs.allocator_), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        *this = rhs;
+    }
+
+    //! Copy constructor.
+    GenericPointer(const GenericPointer& rhs, Allocator* allocator) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        *this = rhs;
+    }
+
+    //! Destructor.
+    ~GenericPointer() {
+        if (nameBuffer_)    // If user-supplied tokens constructor is used, nameBuffer_ is nullptr and tokens_ are not deallocated.
+            Allocator::Free(tokens_);
+        RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    //! Assignment operator.
+    GenericPointer& operator=(const GenericPointer& rhs) {
+        if (this != &rhs) {
+            // Do not delete ownAllcator
+            if (nameBuffer_)
+                Allocator::Free(tokens_);
+
+            tokenCount_ = rhs.tokenCount_;
+            parseErrorOffset_ = rhs.parseErrorOffset_;
+            parseErrorCode_ = rhs.parseErrorCode_;
+
+            if (rhs.nameBuffer_)
+                CopyFromRaw(rhs); // Normally parsed tokens.
+            else {
+                tokens_ = rhs.tokens_; // User supplied const tokens.
+                nameBuffer_ = 0;
+            }
+        }
+        return *this;
+    }
+
+    //! Swap the content of this pointer with an other.
+    /*!
+        \param other The pointer to swap with.
+        \note Constant complexity.
+    */
+    GenericPointer& Swap(GenericPointer& other) RAPIDJSON_NOEXCEPT {
+        internal::Swap(allocator_, other.allocator_);
+        internal::Swap(ownAllocator_, other.ownAllocator_);
+        internal::Swap(nameBuffer_, other.nameBuffer_);
+        internal::Swap(tokens_, other.tokens_);
+        internal::Swap(tokenCount_, other.tokenCount_);
+        internal::Swap(parseErrorOffset_, other.parseErrorOffset_);
+        internal::Swap(parseErrorCode_, other.parseErrorCode_);
+        return *this;
+    }
+
+    //! free-standing swap function helper
+    /*!
+        Helper function to enable support for common swap implementation pattern based on \c std::swap:
+        \code
+        void swap(MyClass& a, MyClass& b) {
+            using std::swap;
+            swap(a.pointer, b.pointer);
+            // ...
+        }
+        \endcode
+        \see Swap()
+     */
+    friend inline void swap(GenericPointer& a, GenericPointer& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
+
+    //@}
+
+    //!@name Append token
+    //@{
+
+    //! Append a token and return a new Pointer
+    /*!
+        \param token Token to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
+        GenericPointer r;
+        r.allocator_ = allocator;
+        Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
+        std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
+        r.tokens_[tokenCount_].name = p;
+        r.tokens_[tokenCount_].length = token.length;
+        r.tokens_[tokenCount_].index = token.index;
+        return r;
+    }
+
+    //! Append a name token with length, and return a new Pointer
+    /*!
+        \param name Name to be appended.
+        \param length Length of name.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const Ch* name, SizeType length, Allocator* allocator = 0) const {
+        Token token = { name, length, kPointerInvalidIndex };
+        return Append(token, allocator);
+    }
+
+    //! Append a name token without length, and return a new Pointer
+    /*!
+        \param name Name (const Ch*) to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    template <typename T>
+    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >), (GenericPointer))
+    Append(T* name, Allocator* allocator = 0) const {
+        return Append(name, internal::StrLen(name), allocator);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    //! Append a name token, and return a new Pointer
+    /*!
+        \param name Name to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const std::basic_string<Ch>& name, Allocator* allocator = 0) const {
+        return Append(name.c_str(), static_cast<SizeType>(name.size()), allocator);
+    }
+#endif
+
+    //! Append a index token, and return a new Pointer
+    /*!
+        \param index Index to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(SizeType index, Allocator* allocator = 0) const {
+        char buffer[21];
+        char* end = sizeof(SizeType) == 4 ? internal::u32toa(index, buffer) : internal::u64toa(index, buffer);
+        SizeType length = static_cast<SizeType>(end - buffer);
+        buffer[length] = '\0';
+
+        if (sizeof(Ch) == 1) {
+            Token token = { reinterpret_cast<Ch*>(buffer), length, index };
+            return Append(token, allocator);
+        }
+        else {
+            Ch name[21];
+            for (size_t i = 0; i <= length; i++)
+                name[i] = static_cast<Ch>(buffer[i]);
+            Token token = { name, length, index };
+            return Append(token, allocator);
+        }
+    }
+
+    //! Append a token by value, and return a new Pointer
+    /*!
+        \param token token to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const ValueType& token, Allocator* allocator = 0) const {
+        if (token.IsString())
+            return Append(token.GetString(), token.GetStringLength(), allocator);
+        else {
+            RAPIDJSON_ASSERT(token.IsUint64());
+            RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
+            return Append(static_cast<SizeType>(token.GetUint64()), allocator);
+        }
+    }
+
+    //!@name Handling Parse Error
+    //@{
+
+    //! Check whether this is a valid pointer.
+    bool IsValid() const { return parseErrorCode_ == kPointerParseErrorNone; }
+
+    //! Get the parsing error offset in code unit.
+    size_t GetParseErrorOffset() const { return parseErrorOffset_; }
+
+    //! Get the parsing error code.
+    PointerParseErrorCode GetParseErrorCode() const { return parseErrorCode_; }
+
+    //@}
+
+    //! Get the allocator of this pointer.
+    Allocator& GetAllocator() { return *allocator_; }
+
+    //!@name Tokens
+    //@{
+
+    //! Get the token array (const version only).
+    const Token* GetTokens() const { return tokens_; }
+
+    //! Get the number of tokens.
+    size_t GetTokenCount() const { return tokenCount_; }
+
+    //@}
+
+    //!@name Equality/inequality operators
+    //@{
+
+    //! Equality operator.
+    /*!
+        \note When any pointers are invalid, always returns false.
+    */
+    bool operator==(const GenericPointer& rhs) const {
+        if (!IsValid() || !rhs.IsValid() || tokenCount_ != rhs.tokenCount_)
+            return false;
+
+        for (size_t i = 0; i < tokenCount_; i++) {
+            if (tokens_[i].index != rhs.tokens_[i].index ||
+                tokens_[i].length != rhs.tokens_[i].length || 
+                (tokens_[i].length != 0 && std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch)* tokens_[i].length) != 0))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    //! Inequality operator.
+    /*!
+        \note When any pointers are invalid, always returns true.
+    */
+    bool operator!=(const GenericPointer& rhs) const { return !(*this == rhs); }
+
+    //! Less than operator.
+    /*!
+        \note Invalid pointers are always greater than valid ones.
+    */
+    bool operator<(const GenericPointer& rhs) const {
+        if (!IsValid())
+            return false;
+        if (!rhs.IsValid())
+            return true;
+
+        if (tokenCount_ != rhs.tokenCount_)
+            return tokenCount_ < rhs.tokenCount_;
+
+        for (size_t i = 0; i < tokenCount_; i++) {
+            if (tokens_[i].index != rhs.tokens_[i].index)
+                return tokens_[i].index < rhs.tokens_[i].index;
+
+            if (tokens_[i].length != rhs.tokens_[i].length)
+                return tokens_[i].length < rhs.tokens_[i].length;
+
+            if (int cmp = std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch) * tokens_[i].length))
+                return cmp < 0;
+        }
+
+        return false;
+    }
+
+    //@}
+
+    //!@name Stringify
+    //@{
+
+    //! Stringify the pointer into string representation.
+    /*!
+        \tparam OutputStream Type of output stream.
+        \param os The output stream.
+    */
+    template<typename OutputStream>
+    bool Stringify(OutputStream& os) const {
+        return Stringify<false, OutputStream>(os);
+    }
+
+    //! Stringify the pointer into URI fragment representation.
+    /*!
+        \tparam OutputStream Type of output stream.
+        \param os The output stream.
+    */
+    template<typename OutputStream>
+    bool StringifyUriFragment(OutputStream& os) const {
+        return Stringify<true, OutputStream>(os);
+    }
+
+    //@}
+
+    //!@name Create value
+    //@{
+
+    //! Create a value in a subtree.
+    /*!
+        If the value is not exist, it creates all parent values and a JSON Null value.
+        So it always succeed and return the newly created or existing value.
+
+        Remind that it may change types of parents according to tokens, so it 
+        potentially removes previously stored values. For example, if a document 
+        was an array, and "/foo" is used to create a value, then the document 
+        will be changed to an object, and all existing array elements are lost.
+
+        \param root Root value of a DOM subtree to be resolved. It can be any value other than document root.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
+        \return The resolved newly created (a JSON Null value), or already exists value.
+    */
+    ValueType& Create(ValueType& root, typename ValueType::AllocatorType& allocator, bool* alreadyExist = 0) const {
+        RAPIDJSON_ASSERT(IsValid());
+        ValueType* v = &root;
+        bool exist = true;
+        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            if (v->IsArray() && t->name[0] == '-' && t->length == 1) {
+                v->PushBack(ValueType().Move(), allocator);
+                v = &((*v)[v->Size() - 1]);
+                exist = false;
+            }
+            else {
+                if (t->index == kPointerInvalidIndex) { // must be object name
+                    if (!v->IsObject())
+                        v->SetObject(); // Change to Object
+                }
+                else { // object name or array index
+                    if (!v->IsArray() && !v->IsObject())
+                        v->SetArray(); // Change to Array
+                }
+
+                if (v->IsArray()) {
+                    if (t->index >= v->Size()) {
+                        v->Reserve(t->index + 1, allocator);
+                        while (t->index >= v->Size())
+                            v->PushBack(ValueType().Move(), allocator);
+                        exist = false;
+                    }
+                    v = &((*v)[t->index]);
+                }
+                else {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericValue<EncodingType>(GenericStringRef<Ch>(t->name, t->length)));
+                    if (m == v->MemberEnd()) {
+                        v->AddMember(ValueType(t->name, t->length, allocator).Move(), ValueType().Move(), allocator);
+                        m = v->MemberEnd();
+                        v = &(--m)->value; // Assumes AddMember() appends at the end
+                        exist = false;
+                    }
+                    else
+                        v = &m->value;
+                }
+            }
+        }
+
+        if (alreadyExist)
+            *alreadyExist = exist;
+
+        return *v;
+    }
+
+    //! Creates a value in a document.
+    /*!
+        \param document A document to be resolved.
+        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
+        \return The resolved newly created, or already exists value.
+    */
+    template <typename stackAllocator>
+    ValueType& Create(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, bool* alreadyExist = 0) const {
+        return Create(document, document.GetAllocator(), alreadyExist);
+    }
+
+    //@}
+
+    //!@name Query value
+    //@{
+
+    //! Query a value in a subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
+        \return Pointer to the value if it can be resolved. Otherwise null.
+
+        \note
+        There are only 3 situations when a value cannot be resolved:
+        1. A value in the path is not an array nor object.
+        2. An object value does not contain the token.
+        3. A token is out of range of an array value.
+
+        Use unresolvedTokenIndex to retrieve the token index.
+    */
+    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
+        RAPIDJSON_ASSERT(IsValid());
+        ValueType* v = &root;
+        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            switch (v->GetType()) {
+            case kObjectType:
+                {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericValue<EncodingType>(GenericStringRef<Ch>(t->name, t->length)));
+                    if (m == v->MemberEnd())
+                        break;
+                    v = &m->value;
+                }
+                continue;
+            case kArrayType:
+                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
+                    break;
+                v = &((*v)[t->index]);
+                continue;
+            default:
+                break;
+            }
+
+            // Error: unresolved token
+            if (unresolvedTokenIndex)
+                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
+            return 0;
+        }
+        return v;
+    }
+
+    //! Query a const value in a const subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \return Pointer to the value if it can be resolved. Otherwise null.
+    */
+    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
+        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
+    }
+
+    //@}
+
+    //!@name Query a value with default
+    //@{
+
+    //! Query a value in a subtree with default value.
+    /*!
+        Similar to Get(), but if the specified value do not exists, it creates all parents and clone the default value.
+        So that this function always succeed.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param defaultValue Default value to be cloned if the value was not exists.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& GetWithDefault(ValueType& root, const ValueType& defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        ValueType& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.CopyFrom(defaultValue, allocator);
+    }
+
+    //! Query a value in a subtree with default null-terminated string.
+    ValueType& GetWithDefault(ValueType& root, const Ch* defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        ValueType& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.SetString(defaultValue, allocator);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    //! Query a value in a subtree with default std::basic_string.
+    ValueType& GetWithDefault(ValueType& root, const std::basic_string<Ch>& defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        ValueType& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.SetString(defaultValue, allocator);
+    }
+#endif
+
+    //! Query a value in a subtree with default primitive value.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T>
+    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    GetWithDefault(ValueType& root, T defaultValue, typename ValueType::AllocatorType& allocator) const {
+        return GetWithDefault(root, ValueType(defaultValue).Move(), allocator);
+    }
+
+    //! Query a value in a document with default value.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+
+    //! Query a value in a document with default null-terminated string.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+    
+#if RAPIDJSON_HAS_STDSTRING
+    //! Query a value in a document with default std::basic_string.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+#endif
+
+    //! Query a value in a document with default primitive value.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T, typename stackAllocator>
+    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+
+    //@}
+
+    //!@name Set a value
+    //@{
+
+    //! Set a value in a subtree, with move semantics.
+    /*!
+        It creates all parents if they are not exist or types are different to the tokens.
+        So this function always succeeds but potentially remove existing values.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param value Value to be set.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& Set(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = value;
+    }
+
+    //! Set a value in a subtree, with copy semantics.
+    ValueType& Set(ValueType& root, const ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator).CopyFrom(value, allocator);
+    }
+
+    //! Set a null-terminated string in a subtree.
+    ValueType& Set(ValueType& root, const Ch* value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value, allocator).Move();
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    //! Set a std::basic_string in a subtree.
+    ValueType& Set(ValueType& root, const std::basic_string<Ch>& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value, allocator).Move();
+    }
+#endif
+
+    //! Set a primitive value in a subtree.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T>
+    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    Set(ValueType& root, T value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value).Move();
+    }
+
+    //! Set a value in a document, with move semantics.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
+        return Create(document) = value;
+    }
+
+    //! Set a value in a document, with copy semantics.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& value) const {
+        return Create(document).CopyFrom(value, document.GetAllocator());
+    }
+
+    //! Set a null-terminated string in a document.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* value) const {
+        return Create(document) = ValueType(value, document.GetAllocator()).Move();
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    //! Sets a std::basic_string in a document.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& value) const {
+        return Create(document) = ValueType(value, document.GetAllocator()).Move();
+    }
+#endif
+
+    //! Set a primitive value in a document.
+    /*!
+    \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T, typename stackAllocator>
+    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+        Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T value) const {
+            return Create(document) = value;
+    }
+
+    //@}
+
+    //!@name Swap a value
+    //@{
+
+    //! Swap a value with a value in a subtree.
+    /*!
+        It creates all parents if they are not exist or types are different to the tokens.
+        So this function always succeeds but potentially remove existing values.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param value Value to be swapped.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& Swap(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator).Swap(value);
+    }
+
+    //! Swap a value with a value in a document.
+    template <typename stackAllocator>
+    ValueType& Swap(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
+        return Create(document).Swap(value);
+    }
+
+    //@}
+
+    //! Erase a value in a subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \return Whether the resolved value is found and erased.
+
+        \note Erasing with an empty pointer \c Pointer(""), i.e. the root, always fail and return false.
+    */
+    bool Erase(ValueType& root) const {
+        RAPIDJSON_ASSERT(IsValid());
+        if (tokenCount_ == 0) // Cannot erase the root
+            return false;
+
+        ValueType* v = &root;
+        const Token* last = tokens_ + (tokenCount_ - 1);
+        for (const Token *t = tokens_; t != last; ++t) {
+            switch (v->GetType()) {
+            case kObjectType:
+                {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericValue<EncodingType>(GenericStringRef<Ch>(t->name, t->length)));
+                    if (m == v->MemberEnd())
+                        return false;
+                    v = &m->value;
+                }
+                break;
+            case kArrayType:
+                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
+                    return false;
+                v = &((*v)[t->index]);
+                break;
+            default:
+                return false;
+            }
+        }
+
+        switch (v->GetType()) {
+        case kObjectType:
+            return v->EraseMember(GenericStringRef<Ch>(last->name, last->length));
+        case kArrayType:
+            if (last->index == kPointerInvalidIndex || last->index >= v->Size())
+                return false;
+            v->Erase(v->Begin() + last->index);
+            return true;
+        default:
+            return false;
+        }
+    }
+
+private:
+    //! Clone the content from rhs to this.
+    /*!
+        \param rhs Source pointer.
+        \param extraToken Extra tokens to be allocated.
+        \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
+        \return Start of non-occupied name buffer, for storing extra names.
+    */
+    Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
+        if (!allocator_) // allocator is independently owned.
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
+
+        size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
+        for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
+            nameBufferSize += t->length;
+
+        tokenCount_ = rhs.tokenCount_ + extraToken;
+        tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + (nameBufferSize + extraNameBufferSize) * sizeof(Ch)));
+        nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
+        if (rhs.tokenCount_ > 0) {
+            std::memcpy(tokens_, rhs.tokens_, rhs.tokenCount_ * sizeof(Token));
+        }
+        if (nameBufferSize > 0) {
+            std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
+        }
+
+        // Adjust pointers to name buffer
+        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
+        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
+            t->name += diff;
+
+        return nameBuffer_ + nameBufferSize;
+    }
+
+    //! Check whether a character should be percent-encoded.
+    /*!
+        According to RFC 3986 2.3 Unreserved Characters.
+        \param c The character (code unit) to be tested.
+    */
+    bool NeedPercentEncode(Ch c) const {
+        return !((c >= '0' && c <= '9') || (c >= 'A' && c <='Z') || (c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '_' || c =='~');
+    }
+
+    //! Parse a JSON String or its URI fragment representation into tokens.
+#ifndef __clang__ // -Wdocumentation
+    /*!
+        \param source Either a JSON Pointer string, or its URI fragment representation. Not need to be null terminated.
+        \param length Length of the source string.
+        \note Source cannot be JSON String Representation of JSON Pointer, e.g. In "/\u0000", \u0000 will not be unescaped.
+    */
+#endif
+    void Parse(const Ch* source, size_t length) {
+        RAPIDJSON_ASSERT(source != NULL);
+        RAPIDJSON_ASSERT(nameBuffer_ == 0);
+        RAPIDJSON_ASSERT(tokens_ == 0);
+
+        // Create own allocator if user did not supply.
+        if (!allocator_)
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
+
+        // Count number of '/' as tokenCount
+        tokenCount_ = 0;
+        for (const Ch* s = source; s != source + length; s++) 
+            if (*s == '/')
+                tokenCount_++;
+
+        Token* token = tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + length * sizeof(Ch)));
+        Ch* name = nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
+        size_t i = 0;
+
+        // Detect if it is a URI fragment
+        bool uriFragment = false;
+        if (source[i] == '#') {
+            uriFragment = true;
+            i++;
+        }
+
+        if (i != length && source[i] != '/') {
+            parseErrorCode_ = kPointerParseErrorTokenMustBeginWithSolidus;
+            goto error;
+        }
+
+        while (i < length) {
+            RAPIDJSON_ASSERT(source[i] == '/');
+            i++; // consumes '/'
+
+            token->name = name;
+            bool isNumber = true;
+
+            while (i < length && source[i] != '/') {
+                Ch c = source[i];
+                if (uriFragment) {
+                    // Decoding percent-encoding for URI fragment
+                    if (c == '%') {
+                        PercentDecodeStream is(&source[i], source + length);
+                        GenericInsituStringStream<EncodingType> os(name);
+                        Ch* begin = os.PutBegin();
+                        if (!Transcoder<UTF8<>, EncodingType>().Validate(is, os) || !is.IsValid()) {
+                            parseErrorCode_ = kPointerParseErrorInvalidPercentEncoding;
+                            goto error;
+                        }
+                        size_t len = os.PutEnd(begin);
+                        i += is.Tell() - 1;
+                        if (len == 1)
+                            c = *name;
+                        else {
+                            name += len;
+                            isNumber = false;
+                            i++;
+                            continue;
+                        }
+                    }
+                    else if (NeedPercentEncode(c)) {
+                        parseErrorCode_ = kPointerParseErrorCharacterMustPercentEncode;
+                        goto error;
+                    }
+                }
+
+                i++;
+                
+                // Escaping "~0" -> '~', "~1" -> '/'
+                if (c == '~') {
+                    if (i < length) {
+                        c = source[i];
+                        if (c == '0')       c = '~';
+                        else if (c == '1')  c = '/';
+                        else {
+                            parseErrorCode_ = kPointerParseErrorInvalidEscape;
+                            goto error;
+                        }
+                        i++;
+                    }
+                    else {
+                        parseErrorCode_ = kPointerParseErrorInvalidEscape;
+                        goto error;
+                    }
+                }
+
+                // First check for index: all of characters are digit
+                if (c < '0' || c > '9')
+                    isNumber = false;
+
+                *name++ = c;
+            }
+            token->length = static_cast<SizeType>(name - token->name);
+            if (token->length == 0)
+                isNumber = false;
+            *name++ = '\0'; // Null terminator
+
+            // Second check for index: more than one digit cannot have leading zero
+            if (isNumber && token->length > 1 && token->name[0] == '0')
+                isNumber = false;
+
+            // String to SizeType conversion
+            SizeType n = 0;
+            if (isNumber) {
+                for (size_t j = 0; j < token->length; j++) {
+                    SizeType m = n * 10 + static_cast<SizeType>(token->name[j] - '0');
+                    if (m < n) {   // overflow detection
+                        isNumber = false;
+                        break;
+                    }
+                    n = m;
+                }
+            }
+
+            token->index = isNumber ? n : kPointerInvalidIndex;
+            token++;
+        }
+
+        RAPIDJSON_ASSERT(name <= nameBuffer_ + length); // Should not overflow buffer
+        parseErrorCode_ = kPointerParseErrorNone;
+        return;
+
+    error:
+        Allocator::Free(tokens_);
+        nameBuffer_ = 0;
+        tokens_ = 0;
+        tokenCount_ = 0;
+        parseErrorOffset_ = i;
+        return;
+    }
+
+    //! Stringify to string or URI fragment representation.
+    /*!
+        \tparam uriFragment True for stringifying to URI fragment representation. False for string representation.
+        \tparam OutputStream type of output stream.
+        \param os The output stream.
+    */
+    template<bool uriFragment, typename OutputStream>
+    bool Stringify(OutputStream& os) const {
+        RAPIDJSON_ASSERT(IsValid());
+
+        if (uriFragment)
+            os.Put('#');
+
+        for (Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            os.Put('/');
+            for (size_t j = 0; j < t->length; j++) {
+                Ch c = t->name[j];
+                if (c == '~') {
+                    os.Put('~');
+                    os.Put('0');
+                }
+                else if (c == '/') {
+                    os.Put('~');
+                    os.Put('1');
+                }
+                else if (uriFragment && NeedPercentEncode(c)) { 
+                    // Transcode to UTF8 sequence
+                    GenericStringStream<typename ValueType::EncodingType> source(&t->name[j]);
+                    PercentEncodeStream<OutputStream> target(os);
+                    if (!Transcoder<EncodingType, UTF8<> >().Validate(source, target))
+                        return false;
+                    j += source.Tell() - 1;
+                }
+                else
+                    os.Put(c);
+            }
+        }
+        return true;
+    }
+
+    //! A helper stream for decoding a percent-encoded sequence into code unit.
+    /*!
+        This stream decodes %XY triplet into code unit (0-255).
+        If it encounters invalid characters, it sets output code unit as 0 and 
+        mark invalid, and to be checked by IsValid().
+    */
+    class PercentDecodeStream {
+    public:
+        typedef typename ValueType::Ch Ch;
+
+        //! Constructor
+        /*!
+            \param source Start of the stream
+            \param end Past-the-end of the stream.
+        */
+        PercentDecodeStream(const Ch* source, const Ch* end) : src_(source), head_(source), end_(end), valid_(true) {}
+
+        Ch Take() {
+            if (*src_ != '%' || src_ + 3 > end_) { // %XY triplet
+                valid_ = false;
+                return 0;
+            }
+            src_++;
+            Ch c = 0;
+            for (int j = 0; j < 2; j++) {
+                c = static_cast<Ch>(c << 4);
+                Ch h = *src_;
+                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
+                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
+                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
+                else {
+                    valid_ = false;
+                    return 0;
+                }
+                src_++;
+            }
+            return c;
+        }
+
+        size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+        bool IsValid() const { return valid_; }
+
+    private:
+        const Ch* src_;     //!< Current read position.
+        const Ch* head_;    //!< Original head of the string.
+        const Ch* end_;     //!< Past-the-end position.
+        bool valid_;        //!< Whether the parsing is valid.
+    };
+
+    //! A helper stream to encode character (UTF-8 code unit) into percent-encoded sequence.
+    template <typename OutputStream>
+    class PercentEncodeStream {
+    public:
+        PercentEncodeStream(OutputStream& os) : os_(os) {}
+        void Put(char c) { // UTF-8 must be byte
+            unsigned char u = static_cast<unsigned char>(c);
+            static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+            os_.Put('%');
+            os_.Put(static_cast<typename OutputStream::Ch>(hexDigits[u >> 4]));
+            os_.Put(static_cast<typename OutputStream::Ch>(hexDigits[u & 15]));
+        }
+    private:
+        OutputStream& os_;
+    };
+
+    Allocator* allocator_;                  //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
+    Allocator* ownAllocator_;               //!< Allocator owned by this Pointer.
+    Ch* nameBuffer_;                        //!< A buffer containing all names in tokens.
+    Token* tokens_;                         //!< A list of tokens.
+    size_t tokenCount_;                     //!< Number of tokens in tokens_.
+    size_t parseErrorOffset_;               //!< Offset in code unit when parsing fail.
+    PointerParseErrorCode parseErrorCode_;  //!< Parsing error code.
+};
+
+//! GenericPointer for Value (UTF-8, default allocator).
+typedef GenericPointer<Value> Pointer;
+
+//!@name Helper functions for GenericPointer
+//@{
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& CreateValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::AllocatorType& a) {
+    return pointer.Create(root, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& CreateValueByPointer(T& root, const CharType(&source)[N], typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Create(root, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer) {
+    return pointer.Create(document);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const CharType(&source)[N]) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Create(document);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
+}
+
+template <typename T>
+const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+#endif
+
+template <typename T, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+#endif
+
+template <typename T, typename CharType, size_t N, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+GetValueByPointerWithDefault(T& root, const CharType(&source)[N], T2 defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+#endif
+
+template <typename DocumentType, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+#endif
+
+template <typename DocumentType, typename CharType, size_t N, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], T2 defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+#endif
+
+template <typename T, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::Ch* value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+#endif
+
+template <typename T, typename CharType, size_t N, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+SetValueByPointer(T& root, const CharType(&source)[N], T2 value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* value) {
+    return pointer.Set(document, value);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& value) {
+    return pointer.Set(document, value);
+}
+#endif
+
+template <typename DocumentType, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+#if RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+#endif
+
+template <typename DocumentType, typename CharType, size_t N, typename T2>
+RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+SetValueByPointer(DocumentType& document, const CharType(&source)[N], T2 value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& SwapValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Swap(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SwapValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Swap(root, value, a);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
+    return pointer.Swap(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Swap(document, value);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+bool EraseValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
+    return pointer.Erase(root);
+}
+
+template <typename T, typename CharType, size_t N>
+bool EraseValueByPointer(T& root, const CharType(&source)[N]) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Erase(root);
+}
+
+//@}
+
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_POINTER_H_
diff --git a/extra/rapidjson/include/rapidjson/prettywriter.h b/extra/rapidjson/include/rapidjson/prettywriter.h
index 47026dff63cd..fe21863d90a5 100644
--- a/extra/rapidjson/include/rapidjson/prettywriter.h
+++ b/extra/rapidjson/include/rapidjson/prettywriter.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_PRETTYWRITER_H_
 #define RAPIDJSON_PRETTYWRITER_H_
@@ -28,19 +22,32 @@ RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
 #endif
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
+//! Combination of PrettyWriter format flags.
+/*! \see PrettyWriter::SetFormatOptions
+ */
+enum PrettyFormatOptions {
+    kFormatDefault = 0,         //!< Default pretty formatting.
+    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
+};
+
 //! Writer with indentation and spacing.
 /*!
-    \tparam OutputStream Type of ouptut os.
+    \tparam OutputStream Type of output os.
     \tparam SourceEncoding Encoding of source string.
     \tparam TargetEncoding Encoding of output stream.
     \tparam StackAllocator Type of allocator for allocating memory of stack.
 */
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> {
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
+class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
 public:
-    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
+    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Base;
     typedef typename Base::Ch Ch;
 
     //! Constructor
@@ -48,8 +55,17 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         \param allocator User supplied allocator. If it is null, it will create a private one.
         \param levelDepth Initial capacity of stack.
     */
-    PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
+    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
+
+
+    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    PrettyWriter(PrettyWriter&& rhs) :
+        Base(std::forward<PrettyWriter>(rhs)), indentChar_(rhs.indentChar_), indentCharCount_(rhs.indentCharCount_), formatOptions_(rhs.formatOptions_) {}
+#endif
 
     //! Set custom indentation.
     /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
@@ -63,28 +79,44 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         return *this;
     }
 
+    //! Set pretty writer formatting options.
+    /*! \param options Formatting options.
+    */
+    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
+        formatOptions_ = options;
+        return *this;
+    }
+
     /*! @name Implementation of Handler
         \see Handler
     */
     //@{
 
-    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
-    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
-    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
-    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
-    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
-    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
-    bool Double(double d, bool is_int = false)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
+    bool Null()                 { PrettyPrefix(kNullType);   return Base::EndValue(Base::WriteNull()); }
+    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::EndValue(Base::WriteBool(b)); }
+    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteInt(i)); }
+    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteUint(u)); }
+    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteInt64(i64)); }
+    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteUint64(u64));  }
+    bool Double(double d, bool is_int = false)       { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteDouble(d)); }
+
+    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
+        (void)copy;
+        PrettyPrefix(kNumberType);
+        return Base::EndValue(Base::WriteString(str, length));
+    }
 
     bool String(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         PrettyPrefix(kStringType);
-        return Base::WriteString(str, length);
+        return Base::EndValue(Base::WriteString(str, length));
     }
 
 #if RAPIDJSON_HAS_STDSTRING
     bool String(const std::basic_string<Ch>& str) {
-      return String(str.data(), SizeType(str.size()));
+        return String(str.data(), SizeType(str.size()));
     }
 #endif
 
@@ -95,21 +127,30 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
     }
 
     bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
+
+#if RAPIDJSON_HAS_STDSTRING
+    bool Key(const std::basic_string<Ch>& str) {
+        return Key(str.data(), SizeType(str.size()));
+    }
+#endif
 	
     bool EndObject(SizeType memberCount = 0) {
         (void)memberCount;
-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
+        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level)); // not inside an Object
+        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray); // currently inside an Array, not Object
+        RAPIDJSON_ASSERT(0 == Base::level_stack_.template Top<typename Base::Level>()->valueCount % 2); // Object has a Key without a Value
+       
         bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
 
         if (!empty) {
             Base::os_->Put('\n');
             WriteIndent();
         }
-        if (!Base::WriteEndObject())
-            return false;
+        bool ret = Base::EndValue(Base::WriteEndObject());
+        (void)ret;
+        RAPIDJSON_ASSERT(ret == true);
         if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
+            Base::Flush();
         return true;
     }
 
@@ -125,14 +166,15 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
         bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
 
-        if (!empty) {
+        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
             Base::os_->Put('\n');
             WriteIndent();
         }
-        if (!Base::WriteEndArray())
-            return false;
+        bool ret = Base::EndValue(Base::WriteEndArray());
+        (void)ret;
+        RAPIDJSON_ASSERT(ret == true);
         if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
+            Base::Flush();
         return true;
     }
 
@@ -146,6 +188,22 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
     bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
 
     //@}
+
+    //! Write a raw JSON value.
+    /*!
+        For user to write a stringified JSON as a value.
+
+        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
+        \param length Length of the json.
+        \param type Type of the root of json.
+        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
+    */
+    bool RawValue(const Ch* json, size_t length, Type type) {
+        RAPIDJSON_ASSERT(json != 0);
+        PrettyPrefix(type);
+        return Base::EndValue(Base::WriteRawValue(json, length));
+    }
+
 protected:
     void PrettyPrefix(Type type) {
         (void)type;
@@ -155,11 +213,14 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
             if (level->inArray) {
                 if (level->valueCount > 0) {
                     Base::os_->Put(','); // add comma if it is not the first element in array
-                    Base::os_->Put('\n');
+                    if (formatOptions_ & kFormatSingleLineArray)
+                        Base::os_->Put(' ');
                 }
-                else
+
+                if (!(formatOptions_ & kFormatSingleLineArray)) {
                     Base::os_->Put('\n');
-                WriteIndent();
+                    WriteIndent();
+                }
             }
             else {  // in object
                 if (level->valueCount > 0) {
@@ -190,11 +251,12 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
 
     void WriteIndent()  {
         size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
-        PutN(*Base::os_, indentChar_, count);
+        PutN(*Base::os_, static_cast<typename OutputStream::Ch>(indentChar_), count);
     }
 
     Ch indentChar_;
     unsigned indentCharCount_;
+    PrettyFormatOptions formatOptions_;
 
 private:
     // Prohibit copy constructor & assignment operator.
@@ -204,6 +266,10 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
 
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #ifdef __GNUC__
 RAPIDJSON_DIAG_POP
 #endif
diff --git a/extra/rapidjson/include/rapidjson/rapidjson.h b/extra/rapidjson/include/rapidjson/rapidjson.h
index e9bfdba28e0c..329ce92be89d 100644
--- a/extra/rapidjson/include/rapidjson/rapidjson.h
+++ b/extra/rapidjson/include/rapidjson/rapidjson.h
@@ -1,32 +1,23 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_RAPIDJSON_H_
 #define RAPIDJSON_RAPIDJSON_H_
 
-// Copyright (c) 2011 Milo Yip (miloyip@gmail.com)
-// Version 0.1
-
 /*!\file rapidjson.h
     \brief common definitions and configuration
-
+    
     \see RAPIDJSON_CONFIG
  */
 
@@ -35,7 +26,7 @@
 
     Some RapidJSON features are configurable to adapt the library to a wide
     variety of platforms, environments and usage scenarios.  Most of the
-    features can be configured in terms of overriden or predefined
+    features can be configured in terms of overridden or predefined
     preprocessor macros at compile-time.
 
     Some additional customization is available in the \ref RAPIDJSON_ERRORS APIs.
@@ -48,6 +39,45 @@
 #include <cstdlib>  // malloc(), realloc(), free(), size_t
 #include <cstring>  // memset(), memcpy(), memmove(), memcmp()
 
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_VERSION_STRING
+//
+// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
+//
+
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+// token stringification
+#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
+#define RAPIDJSON_DO_STRINGIFY(x) #x
+
+// token concatenation
+#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
+#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
+#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
+//!@endcond
+
+/*! \def RAPIDJSON_MAJOR_VERSION
+    \ingroup RAPIDJSON_CONFIG
+    \brief Major version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_MINOR_VERSION
+    \ingroup RAPIDJSON_CONFIG
+    \brief Minor version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_PATCH_VERSION
+    \ingroup RAPIDJSON_CONFIG
+    \brief Patch version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_VERSION_STRING
+    \ingroup RAPIDJSON_CONFIG
+    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
+*/
+#define RAPIDJSON_MAJOR_VERSION 1
+#define RAPIDJSON_MINOR_VERSION 1
+#define RAPIDJSON_PATCH_VERSION 0
+#define RAPIDJSON_VERSION_STRING \
+    RAPIDJSON_STRINGIFY(RAPIDJSON_MAJOR_VERSION.RAPIDJSON_MINOR_VERSION.RAPIDJSON_PATCH_VERSION)
+
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_NAMESPACE_(BEGIN|END)
 /*! \def RAPIDJSON_NAMESPACE
@@ -94,6 +124,31 @@
 #define RAPIDJSON_NAMESPACE_END }
 #endif
 
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_HAS_STDSTRING
+
+#ifndef RAPIDJSON_HAS_STDSTRING
+#ifdef RAPIDJSON_DOXYGEN_RUNNING
+#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
+#else
+#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
+#endif
+/*! \def RAPIDJSON_HAS_STDSTRING
+    \ingroup RAPIDJSON_CONFIG
+    \brief Enable RapidJSON support for \c std::string
+
+    By defining this preprocessor symbol to \c 1, several convenience functions for using
+    \ref rapidjson::GenericValue with \c std::string are enabled, especially
+    for construction and comparison.
+
+    \hideinitializer
+*/
+#endif // !defined(RAPIDJSON_HAS_STDSTRING)
+
+#if RAPIDJSON_HAS_STDSTRING
+#include <string>
+#endif // RAPIDJSON_HAS_STDSTRING
+
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_NO_INT64DEFINE
 
@@ -109,7 +164,7 @@
 */
 #ifndef RAPIDJSON_NO_INT64DEFINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
 #include "msinttypes/stdint.h"
 #include "msinttypes/inttypes.h"
 #else
@@ -128,9 +183,9 @@
 
 #ifndef RAPIDJSON_FORCEINLINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && defined(NDEBUG)
 #define RAPIDJSON_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
 #define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
 #else
 #define RAPIDJSON_FORCEINLINE
@@ -164,7 +219,7 @@
 #    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
 #    else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
+#      error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.
 #    endif // __BYTE_ORDER__
 // Detect with GLIBC's endian.h
 #  elif defined(__GLIBC__)
@@ -174,7 +229,7 @@
 #    elif (__BYTE_ORDER == __BIG_ENDIAN)
 #      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
 #    else
-#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
+#      error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.
 #   endif // __GLIBC__
 // Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
 #  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
@@ -186,10 +241,12 @@
 #    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
 #  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
 #    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
+#  elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64))
+#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
 #  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
 #    define RAPIDJSON_ENDIAN
 #  else
-#    error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.   
+#    error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.   
 #  endif
 #endif // RAPIDJSON_ENDIAN
 
@@ -198,7 +255,7 @@
 
 //! Whether using 64-bit architecture
 #ifndef RAPIDJSON_64BIT
-#if defined(__LP64__) || defined(_WIN64)
+#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
 #define RAPIDJSON_64BIT 1
 #else
 #define RAPIDJSON_64BIT 0
@@ -212,11 +269,11 @@
 /*! \ingroup RAPIDJSON_CONFIG
     \param x pointer to align
 
-    Some machines require strict data alignment. Currently the default uses 4 bytes
-    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.,
+    Some machines require strict data alignment. The default is 8 bytes.
+    User can customize by defining the RAPIDJSON_ALIGN function macro.
 */
 #ifndef RAPIDJSON_ALIGN
-#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
+#define RAPIDJSON_ALIGN(x) (((x) + static_cast<size_t>(7u)) & ~static_cast<size_t>(7u))
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -233,17 +290,47 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
+// RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+//! Use only lower 48-bit address for some pointers.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+
+    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
+    The higher 16-bit can be used for storing other data.
+    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
+*/
+#ifndef RAPIDJSON_48BITPOINTER_OPTIMIZATION
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
+#else
+#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
+#endif
+#endif // RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+#if RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
+#if RAPIDJSON_64BIT != 1
+#error RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when RAPIDJSON_64BIT=1
+#endif
+#define RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
+#define RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
+#else
+#define RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
+#define RAPIDJSON_GETPOINTER(type, p) (p)
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_NEON/RAPIDJSON_SIMD
 
 /*! \def RAPIDJSON_SIMD
     \ingroup RAPIDJSON_CONFIG
-    \brief Enable SSE2/SSE4.2 optimization.
+    \brief Enable SSE2/SSE4.2/Neon optimization.
 
     RapidJSON supports optimized implementations for some parsing operations
-    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
-    processors.
+    based on the SSE2, SSE4.2 or NEon SIMD extensions on modern Intel
+    or ARM compatible processors.
 
-    To enable these optimizations, two different symbols can be defined;
+    To enable these optimizations, three different symbols can be defined;
     \code
     // Enable SSE2 optimization.
     #define RAPIDJSON_SSE2
@@ -252,13 +339,17 @@
     #define RAPIDJSON_SSE42
     \endcode
 
-    \c RAPIDJSON_SSE42 takes precedence, if both are defined.
+    // Enable ARM Neon optimization.
+    #define RAPIDJSON_NEON
+    \endcode
+
+    \c RAPIDJSON_SSE42 takes precedence over SSE2, if both are defined.
 
     If any of these symbols is defined, RapidJSON defines the macro
     \c RAPIDJSON_SIMD to indicate the availability of the optimized code.
 */
 #if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42) \
-    || defined(RAPIDJSON_DOXYGEN_RUNNING)
+    || defined(RAPIDJSON_NEON) || defined(RAPIDJSON_DOXYGEN_RUNNING)
 #define RAPIDJSON_SIMD
 #endif
 
@@ -318,25 +409,33 @@ RAPIDJSON_NAMESPACE_END
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_STATIC_ASSERT
 
-// Adopt from boost
+// Prefer C++11 static_assert, if available
+#ifndef RAPIDJSON_STATIC_ASSERT
+#if __cplusplus >= 201103L || ( defined(_MSC_VER) && _MSC_VER >= 1800 )
+#define RAPIDJSON_STATIC_ASSERT(x) \
+   static_assert(x, RAPIDJSON_STRINGIFY(x))
+#endif // C++11
+#endif // RAPIDJSON_STATIC_ASSERT
+
+// Adopt C++03 implementation from boost
 #ifndef RAPIDJSON_STATIC_ASSERT
+#ifndef __clang__
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#endif
 RAPIDJSON_NAMESPACE_BEGIN
 template <bool x> struct STATIC_ASSERTION_FAILURE;
 template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-template<int x> struct StaticAssertTest {};
+template <size_t x> struct StaticAssertTest {};
 RAPIDJSON_NAMESPACE_END
 
-#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
-#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
-#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
-
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
 #else
 #define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
 #endif
+#ifndef __clang__
 //!@endcond
+#endif
 
 /*! \def RAPIDJSON_STATIC_ASSERT
     \brief (Internal) macro to check for conditions at compile-time
@@ -347,6 +446,35 @@ RAPIDJSON_NAMESPACE_END
     typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \
       sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
     RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
+#endif // RAPIDJSON_STATIC_ASSERT
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_LIKELY, RAPIDJSON_UNLIKELY
+
+//! Compiler branching hint for expression with high probability to be true.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+    \param x Boolean expression likely to be true.
+*/
+#ifndef RAPIDJSON_LIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
+#else
+#define RAPIDJSON_LIKELY(x) (x)
+#endif
+#endif
+
+//! Compiler branching hint for expression with low probability to be true.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+    \param x Boolean expression unlikely to be true.
+*/
+#ifndef RAPIDJSON_UNLIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define RAPIDJSON_UNLIKELY(x) (x)
+#endif
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -362,9 +490,11 @@ RAPIDJSON_NAMESPACE_END
 #define RAPIDJSON_VERSION_CODE(x,y,z) \
   (((x)*100000) + ((y)*100) + (z))
 
-// token stringification
-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
-#define RAPIDJSON_DO_STRINGIFY(x) #x
+#if defined(__has_builtin)
+#define RAPIDJSON_HAS_BUILTIN(x) __has_builtin(x)
+#else
+#define RAPIDJSON_HAS_BUILTIN(x) 0
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
@@ -413,9 +543,15 @@ RAPIDJSON_NAMESPACE_END
 
 #ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
 #if defined(__clang__)
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS __has_feature(cxx_rvalue_references)
+#if __has_feature(cxx_rvalue_references) && \
+    (defined(_MSC_VER) || defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#else
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
+#endif
 #elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1600)
+      (defined(_MSC_VER) && _MSC_VER >= 1600) || \
+      (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140 && defined(__GXX_EXPERIMENTAL_CXX0X__))
 
 #define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
 #else
@@ -426,8 +562,9 @@ RAPIDJSON_NAMESPACE_END
 #ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
 #if defined(__clang__)
 #define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
-//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
+#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+    (defined(_MSC_VER) && _MSC_VER >= 1900) || \
+    (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140 && defined(__GXX_EXPERIMENTAL_CXX0X__))
 #define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
 #else
 #define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
@@ -441,17 +578,73 @@ RAPIDJSON_NAMESPACE_END
 
 // no automatic detection, yet
 #ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
+#if (defined(_MSC_VER) && _MSC_VER >= 1700)
+#define RAPIDJSON_HAS_CXX11_TYPETRAITS 1
+#else
 #define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
 #endif
+#endif
+
+#ifndef RAPIDJSON_HAS_CXX11_RANGE_FOR
+#if defined(__clang__)
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
+#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+      (defined(_MSC_VER) && _MSC_VER >= 1700) || \
+      (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140 && defined(__GXX_EXPERIMENTAL_CXX0X__))
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
+#else
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR 0
+#endif
+#endif // RAPIDJSON_HAS_CXX11_RANGE_FOR
+
+///////////////////////////////////////////////////////////////////////////////
+// C++17 features
+
+#if defined(__has_cpp_attribute)
+# if __has_cpp_attribute(fallthrough)
+#  define RAPIDJSON_DELIBERATE_FALLTHROUGH [[fallthrough]]
+# else
+#  define RAPIDJSON_DELIBERATE_FALLTHROUGH
+# endif
+#else
+# define RAPIDJSON_DELIBERATE_FALLTHROUGH
+#endif
 
 //!@endcond
 
+//! Assertion (in non-throwing contexts).
+ /*! \ingroup RAPIDJSON_CONFIG
+    Some functions provide a \c noexcept guarantee, if the compiler supports it.
+    In these cases, the \ref RAPIDJSON_ASSERT macro cannot be overridden to
+    throw an exception.  This macro adds a separate customization point for
+    such cases.
+
+    Defaults to C \c assert() (as \ref RAPIDJSON_ASSERT), if \c noexcept is
+    supported, and to \ref RAPIDJSON_ASSERT otherwise.
+ */
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_NOEXCEPT_ASSERT
+
+#ifndef RAPIDJSON_NOEXCEPT_ASSERT
+#ifdef RAPIDJSON_ASSERT_THROWS
+#if RAPIDJSON_HAS_CXX11_NOEXCEPT
+#define RAPIDJSON_NOEXCEPT_ASSERT(x)
+#else
+#include <cassert>
+#define RAPIDJSON_NOEXCEPT_ASSERT(x) assert(x)
+#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
+#else
+#define RAPIDJSON_NOEXCEPT_ASSERT(x) RAPIDJSON_ASSERT(x)
+#endif // RAPIDJSON_ASSERT_THROWS
+#endif // RAPIDJSON_NOEXCEPT_ASSERT
+
 ///////////////////////////////////////////////////////////////////////////////
 // new/delete
 
 #ifndef RAPIDJSON_NEW
 ///! customization point for global \c new
-#define RAPIDJSON_NEW(x) new x
+#define RAPIDJSON_NEW(TypeName) new TypeName
 #endif
 #ifndef RAPIDJSON_DELETE
 ///! customization point for global \c delete
@@ -459,10 +652,7 @@ RAPIDJSON_NAMESPACE_END
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
-// Allocators and Encodings
-
-#include "allocators.h"
-#include "encodings.h"
+// Type
 
 /*! \namespace rapidjson
     \brief main RapidJSON namespace
@@ -470,148 +660,6 @@ RAPIDJSON_NAMESPACE_END
 */
 RAPIDJSON_NAMESPACE_BEGIN
 
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-    \brief Concept for reading and writing characters.
-
-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-    For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-\endcode
-*/
-
-//! Provides additional information for stream.
-/*!
-    By using traits pattern, this type provides a default configuration for stream.
-    For custom stream, this type can be specialized for other configuration.
-    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
-*/
-template<typename Stream>
-struct StreamTraits {
-    //! Whether to make local copy of stream for optimization during parsing.
-    /*!
-        By default, for safety, streams do not use local copy optimization.
-        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
-    */
-    enum { copyOptimization = 0 };
-};
-
-//! Put N copies of a character to a stream.
-template<typename Stream, typename Ch>
-inline void PutN(Stream& stream, Ch c, size_t n) {
-    for (size_t i = 0; i < n; i++)
-        stream.Put(c);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// StringStream
-
-//! Read-only string stream.
-/*! \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! String stream with UTF8 encoding.
-typedef GenericStringStream<UTF8<> > StringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// InsituStringStream
-
-//! A read-write string stream.
-/*! This string stream is particularly designed for in-situ parsing.
-    \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericInsituStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
-
-    // Read
-    Ch Peek() { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() { return static_cast<size_t>(src_ - head_); }
-
-    // Write
-    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
-
-    Ch* PutBegin() { return dst_ = src_; }
-    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
-    void Flush() {}
-
-    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
-    void Pop(size_t count) { dst_ -= count; }
-
-    Ch* src_;
-    Ch* dst_;
-    Ch* head_;
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericInsituStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! Insitu string stream with UTF8 encoding.
-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// Type
-
 //! Type of JSON value
 enum Type {
     kNullType = 0,      //!< null
diff --git a/extra/rapidjson/include/rapidjson/reader.h b/extra/rapidjson/include/rapidjson/reader.h
index 64a9977898b3..28d03d1c434d 100644
--- a/extra/rapidjson/include/rapidjson/reader.h
+++ b/extra/rapidjson/include/rapidjson/reader.h
@@ -1,33 +1,30 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_READER_H_
 #define RAPIDJSON_READER_H_
 
 /*! \file reader.h */
 
-#include "rapidjson.h"
-#include "encodings.h"
+#include "allocators.h"
+#include "stream.h"
+#include "encodedstream.h"
+#include "internal/clzll.h"
 #include "internal/meta.h"
 #include "internal/stack.h"
 #include "internal/strtod.h"
+#include <limits>
 
 #if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
 #include <intrin.h>
@@ -37,9 +34,16 @@
 #include <nmmintrin.h>
 #elif defined(RAPIDJSON_SSE2)
 #include <emmintrin.h>
+#elif defined(RAPIDJSON_NEON)
+#include <arm_neon.h>
 #endif
 
-#ifdef _MSC_VER
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(old-style-cast)
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(switch-enum)
+#elif defined(_MSC_VER)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
 RAPIDJSON_DIAG_OFF(4702)  // unreachable code
@@ -55,7 +59,7 @@ RAPIDJSON_DIAG_OFF(effc++)
 #ifndef RAPIDJSON_PARSE_ERROR_EARLY_RETURN
 #define RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
     RAPIDJSON_MULTILINEMACRO_BEGIN \
-    if (HasParseError()) { return value; } \
+    if (RAPIDJSON_UNLIKELY(HasParseError())) { return value; } \
     RAPIDJSON_MULTILINEMACRO_END
 #endif
 #define RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
@@ -126,7 +130,7 @@ RAPIDJSON_NAMESPACE_BEGIN
 ///////////////////////////////////////////////////////////////////////////////
 // ParseFlag
 
-/*! \def RAPIDJSON_PARSE_DEFAULT_FLAGS 
+/*! \def RAPIDJSON_PARSE_DEFAULT_FLAGS
     \ingroup RAPIDJSON_CONFIG
     \brief User-defined kParseDefaultFlags definition.
 
@@ -146,6 +150,10 @@ enum ParseFlag {
     kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
     kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
     kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
+    kParseCommentsFlag = 32,        //!< Allow one-line (//) and multi-line (/**/) comments.
+    kParseNumbersAsStringsFlag = 64,    //!< Parse all numbers (ints/doubles) as strings.
+    kParseTrailingCommasFlag = 128, //!< Allow trailing commas at the end of objects and arrays.
+    kParseNanAndInfFlag = 256,      //!< Allow parsing NaN, Inf, Infinity, -Inf and -Infinity as doubles.
     kParseDefaultFlags = RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining RAPIDJSON_PARSE_DEFAULT_FLAGS
 };
 
@@ -154,7 +162,7 @@ enum ParseFlag {
 
 /*! \class rapidjson::Handler
     \brief Concept for receiving events from GenericReader upon parsing.
-    The functions return true if no error occurs. If they return false, 
+    The functions return true if no error occurs. If they return false,
     the event publisher should terminate the process.
 \code
 concept Handler {
@@ -167,6 +175,8 @@ concept Handler {
     bool Int64(int64_t i);
     bool Uint64(uint64_t i);
     bool Double(double d);
+    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
+    bool RawNumber(const Ch* str, SizeType length, bool copy);
     bool String(const Ch* str, SizeType length, bool copy);
     bool StartObject();
     bool Key(const Ch* str, SizeType length, bool copy);
@@ -197,6 +207,8 @@ struct BaseReaderHandler {
     bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
     bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
     bool Double(double, bool is_int = false) { return static_cast<Override&>(*this).Default(); }
+    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
+    bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
     bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
     bool StartObject() { return static_cast<Override&>(*this).Default(); }
     bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
@@ -254,35 +266,103 @@ void SkipWhitespace(InputStream& is) {
     internal::StreamLocalCopy<InputStream> copy(is);
     InputStream& s(copy.s);
 
-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
+    typename InputStream::Ch c;
+    while ((c = s.Peek()) == ' ' || c == '\n' || c == '\r' || c == '\t')
         s.Take();
 }
 
+inline const char* SkipWhitespace(const char* p, const char* end) {
+    while (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    return p;
+}
+
 #ifdef RAPIDJSON_SSE42
 //! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
 inline const char *SkipWhitespace_SIMD(const char* p) {
-	// Fast return for single non-whitespace
-	if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-		++p;
-	else
-		return p;
-
-	// 16-byte align to the next boundary
-	const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
-	while (p != nextAligned)
-		if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-			++p;
-		else
-			return p;
+    // Fast return for single non-whitespace
+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+        ++p;
+    else
+        return p;
+
+    // 16-byte align to the next boundary
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    while (p != nextAligned)
+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+            ++p;
+        else
+            return p;
 
     // The rest of string using SIMD
-	static const char whitespace[16] = " \n\r\t";
-	const __m128i w = _mm_load_si128((const __m128i *)&whitespace[0]);
+    static const char whitespace[16] = " \n\r\t";
+    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
+
+    for (;; p += 16) {
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        const int r = _mm_cmpistri(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT | _SIDD_NEGATIVE_POLARITY);
+        if (r != 16)    // some of characters is non-whitespace
+            return p + r;
+    }
+}
+
+inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
+    // Fast return for single non-whitespace
+    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    else
+        return p;
+
+    // The middle of string using SIMD
+    static const char whitespace[16] = " \n\r\t";
+    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
+
+    for (; p <= end - 16; p += 16) {
+        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
+        const int r = _mm_cmpistri(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT | _SIDD_NEGATIVE_POLARITY);
+        if (r != 16)    // some of characters is non-whitespace
+            return p + r;
+    }
+
+    return SkipWhitespace(p, end);
+}
+
+#elif defined(RAPIDJSON_SSE2)
+
+//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
+inline const char *SkipWhitespace_SIMD(const char* p) {
+    // Fast return for single non-whitespace
+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+        ++p;
+    else
+        return p;
+
+    // 16-byte align to the next boundary
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    while (p != nextAligned)
+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+            ++p;
+        else
+            return p;
+
+    // The rest of string
+    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
+    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
+    #undef C16
+
+    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
+    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
+    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
+    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
 
     for (;; p += 16) {
-        const __m128i s = _mm_load_si128((const __m128i *)p);
-        const unsigned r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
-        if (r != 0) {   // some of characters is non-whitespace
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        __m128i x = _mm_cmpeq_epi8(s, w0);
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
+        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
+        if (r != 0) {   // some of characters may be non-whitespace
 #ifdef _MSC_VER         // Find the index of first non-whitespace
             unsigned long offset;
             _BitScanForward(&offset, r);
@@ -294,43 +374,30 @@ inline const char *SkipWhitespace_SIMD(const char* p) {
     }
 }
 
-#elif defined(RAPIDJSON_SSE2)
-
-//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-	// Fast return for single non-whitespace
-	if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-		++p;
-	else
-		return p;
-
-    // 16-byte align to the next boundary
-	const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & ~15);
-	while (p != nextAligned)
-		if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-			++p;
-		else
-			return p;
+inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
+    // Fast return for single non-whitespace
+    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    else
+        return p;
 
     // The rest of string
-	static const char whitespaces[4][17] = {
-		"                ",
-		"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
-		"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r",
-		"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"};
+    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
+    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
+    #undef C16
 
-		const __m128i w0 = _mm_loadu_si128((const __m128i *)&whitespaces[0][0]);
-		const __m128i w1 = _mm_loadu_si128((const __m128i *)&whitespaces[1][0]);
-		const __m128i w2 = _mm_loadu_si128((const __m128i *)&whitespaces[2][0]);
-		const __m128i w3 = _mm_loadu_si128((const __m128i *)&whitespaces[3][0]);
+    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
+    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
+    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
+    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
 
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128((const __m128i *)p);
+    for (; p <= end - 16; p += 16) {
+        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
         __m128i x = _mm_cmpeq_epi8(s, w0);
         x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
         x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
         x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = (unsigned short)~_mm_movemask_epi8(x);
+        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
         if (r != 0) {   // some of characters may be non-whitespace
 #ifdef _MSC_VER         // Find the index of first non-whitespace
             unsigned long offset;
@@ -341,13 +408,100 @@ inline const char *SkipWhitespace_SIMD(const char* p) {
 #endif
         }
     }
+
+    return SkipWhitespace(p, end);
 }
 
-#endif // RAPIDJSON_SSE2
+#elif defined(RAPIDJSON_NEON)
+
+//! Skip whitespace with ARM Neon instructions, testing 16 8-byte characters at once.
+inline const char *SkipWhitespace_SIMD(const char* p) {
+    // Fast return for single non-whitespace
+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+        ++p;
+    else
+        return p;
+
+    // 16-byte align to the next boundary
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    while (p != nextAligned)
+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+            ++p;
+        else
+            return p;
+
+    const uint8x16_t w0 = vmovq_n_u8(' ');
+    const uint8x16_t w1 = vmovq_n_u8('\n');
+    const uint8x16_t w2 = vmovq_n_u8('\r');
+    const uint8x16_t w3 = vmovq_n_u8('\t');
+
+    for (;; p += 16) {
+        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
+        uint8x16_t x = vceqq_u8(s, w0);
+        x = vorrq_u8(x, vceqq_u8(s, w1));
+        x = vorrq_u8(x, vceqq_u8(s, w2));
+        x = vorrq_u8(x, vceqq_u8(s, w3));
+
+        x = vmvnq_u8(x);                       // Negate
+        x = vrev64q_u8(x);                     // Rev in 64
+        uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+        uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+        if (low == 0) {
+            if (high != 0) {
+                uint32_t lz = RAPIDJSON_CLZLL(high);
+                return p + 8 + (lz >> 3);
+            }
+        } else {
+            uint32_t lz = RAPIDJSON_CLZLL(low);
+            return p + (lz >> 3);
+        }
+    }
+}
+
+inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
+    // Fast return for single non-whitespace
+    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    else
+        return p;
+
+    const uint8x16_t w0 = vmovq_n_u8(' ');
+    const uint8x16_t w1 = vmovq_n_u8('\n');
+    const uint8x16_t w2 = vmovq_n_u8('\r');
+    const uint8x16_t w3 = vmovq_n_u8('\t');
+
+    for (; p <= end - 16; p += 16) {
+        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
+        uint8x16_t x = vceqq_u8(s, w0);
+        x = vorrq_u8(x, vceqq_u8(s, w1));
+        x = vorrq_u8(x, vceqq_u8(s, w2));
+        x = vorrq_u8(x, vceqq_u8(s, w3));
+
+        x = vmvnq_u8(x);                       // Negate
+        x = vrev64q_u8(x);                     // Rev in 64
+        uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+        uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+        if (low == 0) {
+            if (high != 0) {
+                uint32_t lz = RAPIDJSON_CLZLL(high);
+                return p + 8 + (lz >> 3);
+            }
+        } else {
+            uint32_t lz = RAPIDJSON_CLZLL(low);
+            return p + (lz >> 3);
+        }
+    }
+
+    return SkipWhitespace(p, end);
+}
+
+#endif // RAPIDJSON_NEON
 
 #ifdef RAPIDJSON_SIMD
 //! Template function specialization for InsituStringStream
-template<> inline void SkipWhitespace(InsituStringStream& is) { 
+template<> inline void SkipWhitespace(InsituStringStream& is) {
     is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
 }
 
@@ -355,23 +509,27 @@ template<> inline void SkipWhitespace(InsituStringStream& is) {
 template<> inline void SkipWhitespace(StringStream& is) {
     is.src_ = SkipWhitespace_SIMD(is.src_);
 }
+
+template<> inline void SkipWhitespace(EncodedInputStream<UTF8<>, MemoryStream>& is) {
+    is.is_.src_ = SkipWhitespace_SIMD(is.is_.src_, is.is_.end_);
+}
 #endif // RAPIDJSON_SIMD
 
 ///////////////////////////////////////////////////////////////////////////////
 // GenericReader
 
 //! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
-/*! GenericReader parses JSON text from a stream, and send events synchronously to an 
+/*! GenericReader parses JSON text from a stream, and send events synchronously to an
     object implementing Handler concept.
 
-    It needs to allocate a stack for storing a single decoded string during 
+    It needs to allocate a stack for storing a single decoded string during
     non-destructive parsing.
 
-    For in-situ parsing, the decoded string is directly written to the source 
+    For in-situ parsing, the decoded string is directly written to the source
     text string, no temporary buffer is required.
 
     A GenericReader object can be reused for parsing multiple JSON text.
-    
+
     \tparam SourceEncoding Encoding of the input stream.
     \tparam TargetEncoding Encoding of the parse output.
     \tparam StackAllocator Allocator type for stack.
@@ -385,7 +543,8 @@ class GenericReader {
     /*! \param stackAllocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
         \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
     */
-    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) : stack_(stackAllocator, stackCapacity), parseResult_() {}
+    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) :
+        stack_(stackAllocator, stackCapacity), parseResult_(), state_(IterativeParsingStartState) {}
 
     //! Parse JSON text.
     /*! \tparam parseFlags Combination of \ref ParseFlag.
@@ -404,9 +563,10 @@ class GenericReader {
 
         ClearStackOnExit scope(*this);
 
-        SkipWhitespace(is);
+        SkipWhitespaceAndComments<parseFlags>(is);
+        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
 
-        if (is.Peek() == '\0') {
+        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0')) {
             RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
         }
@@ -415,9 +575,10 @@ class GenericReader {
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
 
             if (!(parseFlags & kParseStopWhenDoneFlag)) {
-                SkipWhitespace(is);
+                SkipWhitespaceAndComments<parseFlags>(is);
+                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
 
-                if (is.Peek() != '\0') {
+                if (RAPIDJSON_UNLIKELY(is.Peek() != '\0')) {
                     RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
                     RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
                 }
@@ -439,9 +600,86 @@ class GenericReader {
         return Parse<kParseDefaultFlags>(is, handler);
     }
 
-    //! Whether a parse error has occured in the last parsing.
+    //! Initialize JSON text token-by-token parsing
+    /*!
+     */
+    void IterativeParseInit() {
+        parseResult_.Clear();
+        state_ = IterativeParsingStartState;
+    }
+
+    //! Parse one token from JSON text
+    /*! \tparam InputStream Type of input stream, implementing Stream concept
+        \tparam Handler Type of handler, implementing Handler concept.
+        \param is Input stream to be parsed.
+        \param handler The handler to receive events.
+        \return Whether the parsing is successful.
+     */
+    template <unsigned parseFlags, typename InputStream, typename Handler>
+    bool IterativeParseNext(InputStream& is, Handler& handler) {
+        while (RAPIDJSON_LIKELY(is.Peek() != '\0')) {
+            SkipWhitespaceAndComments<parseFlags>(is);
+
+            Token t = Tokenize(is.Peek());
+            IterativeParsingState n = Predict(state_, t);
+            IterativeParsingState d = Transit<parseFlags>(state_, t, n, is, handler);
+
+            // If we've finished or hit an error...
+            if (RAPIDJSON_UNLIKELY(IsIterativeParsingCompleteState(d))) {
+                // Report errors.
+                if (d == IterativeParsingErrorState) {
+                    HandleError(state_, is);
+                    return false;
+                }
+
+                // Transition to the finish state.
+                RAPIDJSON_ASSERT(d == IterativeParsingFinishState);
+                state_ = d;
+
+                // If StopWhenDone is not set...
+                if (!(parseFlags & kParseStopWhenDoneFlag)) {
+                    // ... and extra non-whitespace data is found...
+                    SkipWhitespaceAndComments<parseFlags>(is);
+                    if (is.Peek() != '\0') {
+                        // ... this is considered an error.
+                        HandleError(state_, is);
+                        return false;
+                    }
+                }
+
+                // Success! We are done!
+                return true;
+            }
+
+            // Transition to the new state.
+            state_ = d;
+
+            // If we parsed anything other than a delimiter, we invoked the handler, so we can return true now.
+            if (!IsIterativeParsingDelimiterState(n))
+                return true;
+        }
+
+        // We reached the end of file.
+        stack_.Clear();
+
+        if (state_ != IterativeParsingFinishState) {
+            HandleError(state_, is);
+            return false;
+        }
+
+        return true;
+    }
+
+    //! Check if token-by-token parsing JSON text is complete
+    /*! \return Whether the JSON has been fully decoded.
+     */
+    RAPIDJSON_FORCEINLINE bool IterativeParseComplete() const {
+        return IsIterativeParsingCompleteState(state_);
+    }
+
+    //! Whether a parse error has occurred in the last parsing.
     bool HasParseError() const { return parseResult_.IsError(); }
-    
+
     //! Get the \ref ParseErrorCode of last parsing.
     ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
 
@@ -468,52 +706,98 @@ class GenericReader {
         ClearStackOnExit& operator=(const ClearStackOnExit&);
     };
 
+    template<unsigned parseFlags, typename InputStream>
+    void SkipWhitespaceAndComments(InputStream& is) {
+        SkipWhitespace(is);
+
+        if (parseFlags & kParseCommentsFlag) {
+            while (RAPIDJSON_UNLIKELY(Consume(is, '/'))) {
+                if (Consume(is, '*')) {
+                    while (true) {
+                        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0'))
+                            RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
+                        else if (Consume(is, '*')) {
+                            if (Consume(is, '/'))
+                                break;
+                        }
+                        else
+                            is.Take();
+                    }
+                }
+                else if (RAPIDJSON_LIKELY(Consume(is, '/')))
+                    while (is.Peek() != '\0' && is.Take() != '\n') {}
+                else
+                    RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
+
+                SkipWhitespace(is);
+            }
+        }
+    }
+
     // Parse object: { string : value, ... }
     template<unsigned parseFlags, typename InputStream, typename Handler>
     void ParseObject(InputStream& is, Handler& handler) {
         RAPIDJSON_ASSERT(is.Peek() == '{');
         is.Take();  // Skip '{'
-        
-        if (!handler.StartObject())
+
+        if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
             RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
 
-        SkipWhitespace(is);
+        SkipWhitespaceAndComments<parseFlags>(is);
+        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
-        if (is.Peek() == '}') {
-            is.Take();
-            if (!handler.EndObject(0))  // empty object
+        if (Consume(is, '}')) {
+            if (RAPIDJSON_UNLIKELY(!handler.EndObject(0)))  // empty object
                 RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
             return;
         }
 
         for (SizeType memberCount = 0;;) {
-            if (is.Peek() != '"')
+            if (RAPIDJSON_UNLIKELY(is.Peek() != '"'))
                 RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
 
             ParseString<parseFlags>(is, handler, true);
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
-            SkipWhitespace(is);
+            SkipWhitespaceAndComments<parseFlags>(is);
+            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
-            if (is.Take() != ':')
+            if (RAPIDJSON_UNLIKELY(!Consume(is, ':')))
                 RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
 
-            SkipWhitespace(is);
+            SkipWhitespaceAndComments<parseFlags>(is);
+            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
             ParseValue<parseFlags>(is, handler);
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
-            SkipWhitespace(is);
+            SkipWhitespaceAndComments<parseFlags>(is);
+            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
             ++memberCount;
 
-            switch (is.Take()) {
-                case ',': SkipWhitespace(is); break;
-                case '}': 
-                    if (!handler.EndObject(memberCount))
+            switch (is.Peek()) {
+                case ',':
+                    is.Take();
+                    SkipWhitespaceAndComments<parseFlags>(is);
+                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+                    break;
+                case '}':
+                    is.Take();
+                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
+                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    return;
+                default:
+                    RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); break; // This useless break is only for making warning and coverage happy
+            }
+
+            if (parseFlags & kParseTrailingCommasFlag) {
+                if (is.Peek() == '}') {
+                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
                         RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    is.Take();
                     return;
-                default:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell());
+                }
             }
         }
     }
@@ -523,15 +807,15 @@ class GenericReader {
     void ParseArray(InputStream& is, Handler& handler) {
         RAPIDJSON_ASSERT(is.Peek() == '[');
         is.Take();  // Skip '['
-        
-        if (!handler.StartArray())
+
+        if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
             RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        
-        SkipWhitespace(is);
 
-        if (is.Peek() == ']') {
-            is.Take();
-            if (!handler.EndArray(0)) // empty array
+        SkipWhitespaceAndComments<parseFlags>(is);
+        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+        if (Consume(is, ']')) {
+            if (RAPIDJSON_UNLIKELY(!handler.EndArray(0))) // empty array
                 RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
             return;
         }
@@ -541,15 +825,28 @@ class GenericReader {
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
             ++elementCount;
-            SkipWhitespace(is);
+            SkipWhitespaceAndComments<parseFlags>(is);
+            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
 
-            switch (is.Take()) {
-                case ',': SkipWhitespace(is); break;
-                case ']': 
-                    if (!handler.EndArray(elementCount))
+            if (Consume(is, ',')) {
+                SkipWhitespaceAndComments<parseFlags>(is);
+                RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+            }
+            else if (Consume(is, ']')) {
+                if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
+                    RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                return;
+            }
+            else
+                RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
+
+            if (parseFlags & kParseTrailingCommasFlag) {
+                if (is.Peek() == ']') {
+                    if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
                         RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    is.Take();
                     return;
-                default:  RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
+                }
             }
         }
     }
@@ -559,12 +856,12 @@ class GenericReader {
         RAPIDJSON_ASSERT(is.Peek() == 'n');
         is.Take();
 
-        if (is.Take() == 'u' && is.Take() == 'l' && is.Take() == 'l') {
-            if (!handler.Null())
+        if (RAPIDJSON_LIKELY(Consume(is, 'u') && Consume(is, 'l') && Consume(is, 'l'))) {
+            if (RAPIDJSON_UNLIKELY(!handler.Null()))
                 RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
         }
         else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
+            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
     }
 
     template<unsigned parseFlags, typename InputStream, typename Handler>
@@ -572,12 +869,12 @@ class GenericReader {
         RAPIDJSON_ASSERT(is.Peek() == 't');
         is.Take();
 
-        if (is.Take() == 'r' && is.Take() == 'u' && is.Take() == 'e') {
-            if (!handler.Bool(true))
+        if (RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
+            if (RAPIDJSON_UNLIKELY(!handler.Bool(true)))
                 RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
         }
         else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
+            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
     }
 
     template<unsigned parseFlags, typename InputStream, typename Handler>
@@ -585,20 +882,30 @@ class GenericReader {
         RAPIDJSON_ASSERT(is.Peek() == 'f');
         is.Take();
 
-        if (is.Take() == 'a' && is.Take() == 'l' && is.Take() == 's' && is.Take() == 'e') {
-            if (!handler.Bool(false))
+        if (RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
+            if (RAPIDJSON_UNLIKELY(!handler.Bool(false)))
                 RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
         }
         else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell() - 1);
+            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
     }
 
-    // Helper function to parse four hexidecimal digits in \uXXXX in ParseString().
     template<typename InputStream>
-    unsigned ParseHex4(InputStream& is) {
+    RAPIDJSON_FORCEINLINE static bool Consume(InputStream& is, typename InputStream::Ch expect) {
+        if (RAPIDJSON_LIKELY(is.Peek() == expect)) {
+            is.Take();
+            return true;
+        }
+        else
+            return false;
+    }
+
+    // Helper function to parse four hexadecimal digits in \uXXXX in ParseString().
+    template<typename InputStream>
+    unsigned ParseHex4(InputStream& is, size_t escapeOffset) {
         unsigned codepoint = 0;
         for (int i = 0; i < 4; i++) {
-            Ch c = is.Take();
+            Ch c = is.Peek();
             codepoint <<= 4;
             codepoint += static_cast<unsigned>(c);
             if (c >= '0' && c <= '9')
@@ -608,9 +915,10 @@ class GenericReader {
             else if (c >= 'a' && c <= 'f')
                 codepoint -= 'a' - 10;
             else {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, is.Tell() - 1);
+                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, escapeOffset);
                 RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
             }
+            is.Take();
         }
         return codepoint;
     }
@@ -625,7 +933,14 @@ class GenericReader {
             *stack_.template Push<Ch>() = c;
             ++length_;
         }
+
+        RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
+            length_ += count;
+            return stack_.template Push<Ch>(count);
+        }
+
         size_t Length() const { return length_; }
+
         Ch* Pop() {
             return stack_.template Pop<Ch>(length_);
         }
@@ -644,6 +959,9 @@ class GenericReader {
         internal::StreamLocalCopy<InputStream> copy(is);
         InputStream& s(copy.s);
 
+        RAPIDJSON_ASSERT(s.Peek() == '\"');
+        s.Take();  // Skip '\"'
+
         bool success = false;
         if (parseFlags & kParseInsituFlag) {
             typename InputStream::Ch *head = s.PutBegin();
@@ -651,7 +969,7 @@ class GenericReader {
             RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
             size_t length = s.PutEnd(head) - 1;
             RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-            const typename TargetEncoding::Ch* const str = (typename TargetEncoding::Ch*)head;
+            const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
             success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
         }
         else {
@@ -662,7 +980,7 @@ class GenericReader {
             const typename TargetEncoding::Ch* const str = stackStream.Pop();
             success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
         }
-        if (!success)
+        if (RAPIDJSON_UNLIKELY(!success))
             RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
     }
 
@@ -673,74 +991,421 @@ class GenericReader {
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
 #define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
         static const char escape[256] = {
-            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/', 
-            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0, 
-            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0, 
-            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/',
+            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0,
+            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0,
+            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
         };
 #undef Z16
 //!@endcond
 
-        RAPIDJSON_ASSERT(is.Peek() == '\"');
-        is.Take();  // Skip '\"'
-
         for (;;) {
+            // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation.
+            if (!(parseFlags & kParseValidateEncodingFlag))
+                ScanCopyUnescapedString(is, os);
+
             Ch c = is.Peek();
-            if (c == '\\') {    // Escape
+            if (RAPIDJSON_UNLIKELY(c == '\\')) {    // Escape
+                size_t escapeOffset = is.Tell();    // For invalid escaping, report the initial '\\' as error offset
                 is.Take();
-                Ch e = is.Take();
-                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && escape[(unsigned char)e]) {
-                    os.Put(escape[(unsigned char)e]);
+                Ch e = is.Peek();
+                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && RAPIDJSON_LIKELY(escape[static_cast<unsigned char>(e)])) {
+                    is.Take();
+                    os.Put(static_cast<typename TEncoding::Ch>(escape[static_cast<unsigned char>(e)]));
                 }
-                else if (e == 'u') {    // Unicode
-                    unsigned codepoint = ParseHex4(is);
+                else if (RAPIDJSON_LIKELY(e == 'u')) {    // Unicode
+                    is.Take();
+                    unsigned codepoint = ParseHex4(is, escapeOffset);
                     RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    if (codepoint >= 0xD800 && codepoint <= 0xDBFF) {
+                    if (RAPIDJSON_UNLIKELY(codepoint >= 0xD800 && codepoint <= 0xDBFF)) {
                         // Handle UTF-16 surrogate pair
-                        if (is.Take() != '\\' || is.Take() != 'u')
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, is.Tell() - 2);
-                        unsigned codepoint2 = ParseHex4(is);
+                        if (RAPIDJSON_UNLIKELY(!Consume(is, '\\') || !Consume(is, 'u')))
+                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
+                        unsigned codepoint2 = ParseHex4(is, escapeOffset);
                         RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                        if (codepoint2 < 0xDC00 || codepoint2 > 0xDFFF)
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, is.Tell() - 2);
+                        if (RAPIDJSON_UNLIKELY(codepoint2 < 0xDC00 || codepoint2 > 0xDFFF))
+                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
                         codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
                     }
                     TEncoding::Encode(os, codepoint);
                 }
                 else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell() - 1);
+                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, escapeOffset);
             }
-            else if (c == '"') {    // Closing double quote
+            else if (RAPIDJSON_UNLIKELY(c == '"')) {    // Closing double quote
                 is.Take();
                 os.Put('\0');   // null-terminate the string
                 return;
             }
-            else if (c == '\0')
-                RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell() - 1);
-            else if ((unsigned)c < 0x20) // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
-                RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell() - 1);
-            else {
-                if (parseFlags & kParseValidateEncodingFlag ? 
-                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) : 
-                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))
+            else if (RAPIDJSON_UNLIKELY(static_cast<unsigned>(c) < 0x20)) { // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
+                if (c == '\0')
+                    RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
+                else
                     RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, is.Tell());
             }
+            else {
+                size_t offset = is.Tell();
+                if (RAPIDJSON_UNLIKELY((parseFlags & kParseValidateEncodingFlag ?
+                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) :
+                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))))
+                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, offset);
+            }
         }
     }
 
-    template<typename InputStream, bool backup>
+    template<typename InputStream, typename OutputStream>
+    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InputStream&, OutputStream&) {
+            // Do nothing for generic version
+    }
+
+#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
+    // StringStream -> StackStream<char>
+    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
+        const char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                return;
+            }
+            else
+                os.Put(*p++);
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16]  = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                SizeType length;
+    #ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+    #else
+                length = static_cast<SizeType>(__builtin_ffs(r) - 1);
+    #endif
+                if (length != 0) {
+                    char* q = reinterpret_cast<char*>(os.Push(length));
+                    for (size_t i = 0; i < length; i++)
+                        q[i] = p[i];
+
+                    p += length;
+                }
+                break;
+            }
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);
+        }
+
+        is.src_ = p;
+    }
+
+    // InsituStringStream -> InsituStringStream
+    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
+        RAPIDJSON_ASSERT(&is == &os);
+        (void)os;
+
+        if (is.src_ == is.dst_) {
+            SkipUnescapedString(is);
+            return;
+        }
+
+        char* p = is.src_;
+        char *q = is.dst_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                is.dst_ = q;
+                return;
+            }
+            else
+                *q++ = *p++;
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16] = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16, q += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                size_t length;
+#ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+#else
+                length = static_cast<size_t>(__builtin_ffs(r) - 1);
+#endif
+                for (const char* pend = p + length; p != pend; )
+                    *q++ = *p++;
+                break;
+            }
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(q), s);
+        }
+
+        is.src_ = p;
+        is.dst_ = q;
+    }
+
+    // When read/write pointers are the same for insitu stream, just skip unescaped characters
+    static RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
+        RAPIDJSON_ASSERT(is.src_ == is.dst_);
+        char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        for (; p != nextAligned; p++)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = is.dst_ = p;
+                return;
+            }
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16] = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                size_t length;
+#ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+#else
+                length = static_cast<size_t>(__builtin_ffs(r) - 1);
+#endif
+                p += length;
+                break;
+            }
+        }
+
+        is.src_ = is.dst_ = p;
+    }
+#elif defined(RAPIDJSON_NEON)
+    // StringStream -> StackStream<char>
+    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
+        const char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                return;
+            }
+            else
+                os.Put(*p++);
+
+        // The rest of string using SIMD
+        const uint8x16_t s0 = vmovq_n_u8('"');
+        const uint8x16_t s1 = vmovq_n_u8('\\');
+        const uint8x16_t s2 = vmovq_n_u8('\b');
+        const uint8x16_t s3 = vmovq_n_u8(32);
+
+        for (;; p += 16) {
+            const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
+            uint8x16_t x = vceqq_u8(s, s0);
+            x = vorrq_u8(x, vceqq_u8(s, s1));
+            x = vorrq_u8(x, vceqq_u8(s, s2));
+            x = vorrq_u8(x, vcltq_u8(s, s3));
+
+            x = vrev64q_u8(x);                     // Rev in 64
+            uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+            uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+            SizeType length = 0;
+            bool escaped = false;
+            if (low == 0) {
+                if (high != 0) {
+                    uint32_t lz = RAPIDJSON_CLZLL(high);
+                    length = 8 + (lz >> 3);
+                    escaped = true;
+                }
+            } else {
+                uint32_t lz = RAPIDJSON_CLZLL(low);
+                length = lz >> 3;
+                escaped = true;
+            }
+            if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
+                if (length != 0) {
+                    char* q = reinterpret_cast<char*>(os.Push(length));
+                    for (size_t i = 0; i < length; i++)
+                        q[i] = p[i];
+
+                    p += length;
+                }
+                break;
+            }
+            vst1q_u8(reinterpret_cast<uint8_t *>(os.Push(16)), s);
+        }
+
+        is.src_ = p;
+    }
+
+    // InsituStringStream -> InsituStringStream
+    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
+        RAPIDJSON_ASSERT(&is == &os);
+        (void)os;
+
+        if (is.src_ == is.dst_) {
+            SkipUnescapedString(is);
+            return;
+        }
+
+        char* p = is.src_;
+        char *q = is.dst_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                is.dst_ = q;
+                return;
+            }
+            else
+                *q++ = *p++;
+
+        // The rest of string using SIMD
+        const uint8x16_t s0 = vmovq_n_u8('"');
+        const uint8x16_t s1 = vmovq_n_u8('\\');
+        const uint8x16_t s2 = vmovq_n_u8('\b');
+        const uint8x16_t s3 = vmovq_n_u8(32);
+
+        for (;; p += 16, q += 16) {
+            const uint8x16_t s = vld1q_u8(reinterpret_cast<uint8_t *>(p));
+            uint8x16_t x = vceqq_u8(s, s0);
+            x = vorrq_u8(x, vceqq_u8(s, s1));
+            x = vorrq_u8(x, vceqq_u8(s, s2));
+            x = vorrq_u8(x, vcltq_u8(s, s3));
+
+            x = vrev64q_u8(x);                     // Rev in 64
+            uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+            uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+            SizeType length = 0;
+            bool escaped = false;
+            if (low == 0) {
+                if (high != 0) {
+                    uint32_t lz = RAPIDJSON_CLZLL(high);
+                    length = 8 + (lz >> 3);
+                    escaped = true;
+                }
+            } else {
+                uint32_t lz = RAPIDJSON_CLZLL(low);
+                length = lz >> 3;
+                escaped = true;
+            }
+            if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
+                for (const char* pend = p + length; p != pend; ) {
+                    *q++ = *p++;
+                }
+                break;
+            }
+            vst1q_u8(reinterpret_cast<uint8_t *>(q), s);
+        }
+
+        is.src_ = p;
+        is.dst_ = q;
+    }
+
+    // When read/write pointers are the same for insitu stream, just skip unescaped characters
+    static RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
+        RAPIDJSON_ASSERT(is.src_ == is.dst_);
+        char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        for (; p != nextAligned; p++)
+            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = is.dst_ = p;
+                return;
+            }
+
+        // The rest of string using SIMD
+        const uint8x16_t s0 = vmovq_n_u8('"');
+        const uint8x16_t s1 = vmovq_n_u8('\\');
+        const uint8x16_t s2 = vmovq_n_u8('\b');
+        const uint8x16_t s3 = vmovq_n_u8(32);
+
+        for (;; p += 16) {
+            const uint8x16_t s = vld1q_u8(reinterpret_cast<uint8_t *>(p));
+            uint8x16_t x = vceqq_u8(s, s0);
+            x = vorrq_u8(x, vceqq_u8(s, s1));
+            x = vorrq_u8(x, vceqq_u8(s, s2));
+            x = vorrq_u8(x, vcltq_u8(s, s3));
+
+            x = vrev64q_u8(x);                     // Rev in 64
+            uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+            uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+            if (low == 0) {
+                if (high != 0) {
+                    uint32_t lz = RAPIDJSON_CLZLL(high);
+                    p += 8 + (lz >> 3);
+                    break;
+                }
+            } else {
+                uint32_t lz = RAPIDJSON_CLZLL(low);
+                p += lz >> 3;
+                break;
+            }
+        }
+
+        is.src_ = is.dst_ = p;
+    }
+#endif // RAPIDJSON_NEON
+
+    template<typename InputStream, bool backup, bool pushOnTake>
     class NumberStream;
 
     template<typename InputStream>
-    class NumberStream<InputStream, false> {
+    class NumberStream<InputStream, false, false> {
     public:
+        typedef typename InputStream::Ch Ch;
+
         NumberStream(GenericReader& reader, InputStream& s) : is(s) { (void)reader;  }
-        ~NumberStream() {}
 
         RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
         RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
         RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
+        RAPIDJSON_FORCEINLINE void Push(char) {}
+
         size_t Tell() { return is.Tell(); }
         size_t Length() { return 0; }
         const char* Pop() { return 0; }
@@ -752,17 +1417,20 @@ class GenericReader {
     };
 
     template<typename InputStream>
-    class NumberStream<InputStream, true> : public NumberStream<InputStream, false> {
-        typedef NumberStream<InputStream, false> Base;
+    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
+        typedef NumberStream<InputStream, false, false> Base;
     public:
-        NumberStream(GenericReader& reader, InputStream& is) : NumberStream<InputStream, false>(reader, is), stackStream(reader.stack_) {}
-        ~NumberStream() {}
+        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
 
         RAPIDJSON_FORCEINLINE Ch TakePush() {
-            stackStream.Put((char)Base::is.Peek());
+            stackStream.Put(static_cast<char>(Base::is.Peek()));
             return Base::is.Take();
         }
 
+        RAPIDJSON_FORCEINLINE void Push(char c) {
+            stackStream.Put(c);
+        }
+
         size_t Length() { return stackStream.Length(); }
 
         const char* Pop() {
@@ -774,34 +1442,48 @@ class GenericReader {
         StackStream<char> stackStream;
     };
 
+    template<typename InputStream>
+    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
+        typedef NumberStream<InputStream, true, false> Base;
+    public:
+        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+
+        RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
+    };
+
     template<unsigned parseFlags, typename InputStream, typename Handler>
     void ParseNumber(InputStream& is, Handler& handler) {
         internal::StreamLocalCopy<InputStream> copy(is);
-        NumberStream<InputStream, (parseFlags & kParseFullPrecisionFlag) != 0> s(*this, copy.s);
+        NumberStream<InputStream,
+            ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
+                ((parseFlags & kParseInsituFlag) == 0) :
+                ((parseFlags & kParseFullPrecisionFlag) != 0),
+            (parseFlags & kParseNumbersAsStringsFlag) != 0 &&
+                (parseFlags & kParseInsituFlag) == 0> s(*this, copy.s);
+
+        size_t startOffset = s.Tell();
+        double d = 0.0;
+        bool useNanOrInf = false;
 
         // Parse minus
-        bool minus = false;
-        if (s.Peek() == '-') {
-            minus = true;
-            s.Take();
-        }
+        bool minus = Consume(s, '-');
 
         // Parse int: zero / ( digit1-9 *DIGIT )
         unsigned i = 0;
         uint64_t i64 = 0;
         bool use64bit = false;
         int significandDigit = 0;
-        if (s.Peek() == '0') {
+        if (RAPIDJSON_UNLIKELY(s.Peek() == '0')) {
             i = 0;
             s.TakePush();
         }
-        else if (s.Peek() >= '1' && s.Peek() <= '9') {
+        else if (RAPIDJSON_LIKELY(s.Peek() >= '1' && s.Peek() <= '9')) {
             i = static_cast<unsigned>(s.TakePush() - '0');
 
             if (minus)
-                while (s.Peek() >= '0' && s.Peek() <= '9') {
-                    if (i >= 214748364) { // 2^31 = 2147483648
-                        if (i != 214748364 || s.Peek() > '8') {
+                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (RAPIDJSON_UNLIKELY(i >= 214748364)) { // 2^31 = 2147483648
+                        if (RAPIDJSON_LIKELY(i != 214748364 || s.Peek() > '8')) {
                             i64 = i;
                             use64bit = true;
                             break;
@@ -811,9 +1493,9 @@ class GenericReader {
                     significandDigit++;
                 }
             else
-                while (s.Peek() >= '0' && s.Peek() <= '9') {
-                    if (i >= 429496729) { // 2^32 - 1 = 4294967295
-                        if (i != 429496729 || s.Peek() > '5') {
+                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (RAPIDJSON_UNLIKELY(i >= 429496729)) { // 2^32 - 1 = 4294967295
+                        if (RAPIDJSON_LIKELY(i != 429496729 || s.Peek() > '5')) {
                             i64 = i;
                             use64bit = true;
                             break;
@@ -823,18 +1505,41 @@ class GenericReader {
                     significandDigit++;
                 }
         }
+        // Parse NaN or Infinity here
+        else if ((parseFlags & kParseNanAndInfFlag) && RAPIDJSON_LIKELY((s.Peek() == 'I' || s.Peek() == 'N'))) {
+            if (Consume(s, 'N')) {
+                if (Consume(s, 'a') && Consume(s, 'N')) {
+                    d = std::numeric_limits<double>::quiet_NaN();
+                    useNanOrInf = true;
+                }
+            }
+            else if (RAPIDJSON_LIKELY(Consume(s, 'I'))) {
+                if (Consume(s, 'n') && Consume(s, 'f')) {
+                    d = (minus ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
+                    useNanOrInf = true;
+
+                    if (RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n')
+                                                                && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y')))) {
+                        RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
+                    }
+                }
+            }
+
+            if (RAPIDJSON_UNLIKELY(!useNanOrInf)) {
+                RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
+            }
+        }
         else
             RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
 
         // Parse 64bit int
         bool useDouble = false;
-        double d = 0.0;
         if (use64bit) {
-            if (minus) 
-                while (s.Peek() >= '0' && s.Peek() <= '9') {                    
-                     if (i64 >= RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC)) // 2^63 = 9223372036854775808
-                        if (i64 != RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8') {
-                            d = i64;
+            if (minus)
+                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                     if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC))) // 2^63 = 9223372036854775808
+                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8')) {
+                            d = static_cast<double>(i64);
                             useDouble = true;
                             break;
                         }
@@ -842,10 +1547,10 @@ class GenericReader {
                     significandDigit++;
                 }
             else
-                while (s.Peek() >= '0' && s.Peek() <= '9') {                    
-                    if (i64 >= RAPIDJSON_UINT64_C2(0x19999999, 0x99999999)) // 2^64 - 1 = 18446744073709551615
-                        if (i64 != RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5') {
-                            d = i64;
+                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x19999999, 0x99999999))) // 2^64 - 1 = 18446744073709551615
+                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5')) {
+                            d = static_cast<double>(i64);
                             useDouble = true;
                             break;
                         }
@@ -856,9 +1561,7 @@ class GenericReader {
 
         // Force double for big integer
         if (useDouble) {
-            while (s.Peek() >= '0' && s.Peek() <= '9') {
-                if (d >= 1.7976931348623157e307) // DBL_MAX / 10.0
-                    RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, s.Tell());
+            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
                 d = d * 10 + (s.TakePush() - '0');
             }
         }
@@ -866,11 +1569,10 @@ class GenericReader {
         // Parse frac = decimal-point 1*DIGIT
         int expFrac = 0;
         size_t decimalPosition;
-        if (s.Peek() == '.') {
-            s.Take();
+        if (Consume(s, '.')) {
             decimalPosition = s.Length();
 
-            if (!(s.Peek() >= '0' && s.Peek() <= '9'))
+            if (RAPIDJSON_UNLIKELY(!(s.Peek() >= '0' && s.Peek() <= '9')))
                 RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
 
             if (!useDouble) {
@@ -878,8 +1580,8 @@ class GenericReader {
                 // Use i64 to store significand in 64-bit architecture
                 if (!use64bit)
                     i64 = i;
-        
-                while (s.Peek() >= '0' && s.Peek() <= '9') {
+
+                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
                     if (i64 > RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
                         break;
                     else {
@@ -890,19 +1592,19 @@ class GenericReader {
                     }
                 }
 
-                d = (double)i64;
+                d = static_cast<double>(i64);
 #else
                 // Use double to store significand in 32-bit architecture
-                d = use64bit ? (double)i64 : (double)i;
+                d = static_cast<double>(use64bit ? i64 : i);
 #endif
                 useDouble = true;
             }
 
-            while (s.Peek() >= '0' && s.Peek() <= '9') {
+            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
                 if (significandDigit < 17) {
                     d = d * 10.0 + (s.TakePush() - '0');
                     --expFrac;
-                    if (d != 0.0)
+                    if (RAPIDJSON_LIKELY(d > 0.0))
                         significandDigit++;
                 }
                 else
@@ -914,38 +1616,44 @@ class GenericReader {
 
         // Parse exp = e [ minus / plus ] 1*DIGIT
         int exp = 0;
-        if (s.Peek() == 'e' || s.Peek() == 'E') {
+        if (Consume(s, 'e') || Consume(s, 'E')) {
             if (!useDouble) {
-                d = use64bit ? i64 : i;
+                d = static_cast<double>(use64bit ? i64 : i);
                 useDouble = true;
             }
-            s.Take();
 
             bool expMinus = false;
-            if (s.Peek() == '+')
-                s.Take();
-            else if (s.Peek() == '-') {
-                s.Take();
+            if (Consume(s, '+'))
+                ;
+            else if (Consume(s, '-'))
                 expMinus = true;
-            }
 
-            if (s.Peek() >= '0' && s.Peek() <= '9') {
-                exp = s.Take() - '0';
+            if (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                exp = static_cast<int>(s.Take() - '0');
                 if (expMinus) {
-                    while (s.Peek() >= '0' && s.Peek() <= '9') {
-                        exp = exp * 10 + (s.Take() - '0');
-                        if (exp >= 214748364) {                         // Issue #313: prevent overflow exponent
-                            while (s.Peek() >= '0' && s.Peek() <= '9')  // Consume the rest of exponent
+                    // (exp + expFrac) must not underflow int => we're detecting when -exp gets
+                    // dangerously close to INT_MIN (a pessimistic next digit 9 would push it into
+                    // underflow territory):
+                    //
+                    //        -(exp * 10 + 9) + expFrac >= INT_MIN
+                    //   <=>  exp <= (expFrac - INT_MIN - 9) / 10
+                    RAPIDJSON_ASSERT(expFrac <= 0);
+                    int maxExp = (expFrac + 2147483639) / 10;
+
+                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
+                        if (RAPIDJSON_UNLIKELY(exp > maxExp)) {
+                            while (RAPIDJSON_UNLIKELY(s.Peek() >= '0' && s.Peek() <= '9'))  // Consume the rest of exponent
                                 s.Take();
                         }
                     }
                 }
                 else {  // positive exp
                     int maxExp = 308 - expFrac;
-                    while (s.Peek() >= '0' && s.Peek() <= '9') {
-                        exp = exp * 10 + (s.Take() - '0');
-                        if (exp > maxExp)
-                            RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, s.Tell());
+                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
+                        if (RAPIDJSON_UNLIKELY(exp > maxExp))
+                            RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
                     }
                 }
             }
@@ -958,38 +1666,73 @@ class GenericReader {
 
         // Finish parsing, call event according to the type of number.
         bool cont = true;
-        size_t length = s.Length();
-        const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
-
-        if (useDouble) {
-            int p = exp + expFrac;
-            if (parseFlags & kParseFullPrecisionFlag)
-                d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
-            else
-                d = internal::StrtodNormalPrecision(d, p);
 
-            cont = handler.Double(minus ? -d : d);
-        }
-        else {
-            if (use64bit) {
-                if (minus)
-                    cont = handler.Int64(-(int64_t)i64);
-                else
-                    cont = handler.Uint64(i64);
+        if (parseFlags & kParseNumbersAsStringsFlag) {
+            if (parseFlags & kParseInsituFlag) {
+                s.Pop();  // Pop stack no matter if it will be used or not.
+                typename InputStream::Ch* head = is.PutBegin();
+                const size_t length = s.Tell() - startOffset;
+                RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
+                // unable to insert the \0 character here, it will erase the comma after this number
+                const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
+                cont = handler.RawNumber(str, SizeType(length), false);
             }
             else {
-                if (minus) {
-                    if (i == 0)
-                        cont = handler.Double(-(double)i, true);
-                    else
-                        cont = handler.Int(-(int)i);
+                SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
+                StringStream srcStream(s.Pop());
+                StackStream<typename TargetEncoding::Ch> dstStream(stack_);
+                while (numCharsToCopy--) {
+                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
                 }
-                else
-                    cont = handler.Uint(i);
+                dstStream.Put('\0');
+                const typename TargetEncoding::Ch* str = dstStream.Pop();
+                const SizeType length = static_cast<SizeType>(dstStream.Length()) - 1;
+                cont = handler.RawNumber(str, SizeType(length), true);
             }
         }
-        if (!cont)
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
+        else {
+           size_t length = s.Length();
+           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
+
+           if (useDouble) {
+               int p = exp + expFrac;
+               if (parseFlags & kParseFullPrecisionFlag)
+                   d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
+               else
+                   d = internal::StrtodNormalPrecision(d, p);
+
+               // Use > max, instead of == inf, to fix bogus warning -Wfloat-equal
+               if (d > (std::numeric_limits<double>::max)()) {
+                   // Overflow
+                   // TODO: internal::StrtodX should report overflow (or underflow)
+                   RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
+               }
+
+               cont = handler.Double(minus ? -d : d);
+           }
+           else if (useNanOrInf) {
+               cont = handler.Double(d);
+           }
+           else {
+               if (use64bit) {
+                   if (minus)
+                       cont = handler.Int64(static_cast<int64_t>(~i64 + 1));
+                   else
+                       cont = handler.Uint64(i64);
+               }
+               else {
+                   if (minus)
+                        if (i == 0)
+                            cont = handler.Double(-static_cast<double>(i), true);
+                        else
+                            cont = handler.Int(static_cast<int32_t>(~i + 1));
+                   else
+                       cont = handler.Uint(i);
+               }
+           }
+        }
+        if (RAPIDJSON_UNLIKELY(!cont))
+            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, startOffset);
     }
 
     // Parse any JSON value
@@ -1002,7 +1745,10 @@ class GenericReader {
             case '"': ParseString<parseFlags>(is, handler); break;
             case '{': ParseObject<parseFlags>(is, handler); break;
             case '[': ParseArray <parseFlags>(is, handler); break;
-            default : ParseNumber<parseFlags>(is, handler);
+            default :
+                      ParseNumber<parseFlags>(is, handler);
+                      break;
+
         }
     }
 
@@ -1010,27 +1756,29 @@ class GenericReader {
 
     // States
     enum IterativeParsingState {
-        IterativeParsingStartState = 0,
-        IterativeParsingFinishState,
-        IterativeParsingErrorState,
+        IterativeParsingFinishState = 0, // sink states at top
+        IterativeParsingErrorState,      // sink states at top
+        IterativeParsingStartState,
 
         // Object states
         IterativeParsingObjectInitialState,
         IterativeParsingMemberKeyState,
-        IterativeParsingKeyValueDelimiterState,
         IterativeParsingMemberValueState,
-        IterativeParsingMemberDelimiterState,
         IterativeParsingObjectFinishState,
 
         // Array states
         IterativeParsingArrayInitialState,
         IterativeParsingElementState,
-        IterativeParsingElementDelimiterState,
         IterativeParsingArrayFinishState,
 
         // Single value state
         IterativeParsingValueState,
 
+        // Delimiter states (at bottom)
+        IterativeParsingElementDelimiterState,
+        IterativeParsingMemberDelimiterState,
+        IterativeParsingKeyValueDelimiterState,
+
         cIterativeParsingStateCount
     };
 
@@ -1054,7 +1802,7 @@ class GenericReader {
         kTokenCount
     };
 
-    RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) {
+    RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) const {
 
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
 #define N NumberToken
@@ -1074,16 +1822,28 @@ class GenericReader {
 #undef N
 #undef N16
 //!@endcond
-        
-        if (sizeof(Ch) == 1 || unsigned(c) < 256)
-            return (Token)tokenMap[(unsigned char)c];
+
+        if (sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256)
+            return static_cast<Token>(tokenMap[static_cast<unsigned char>(c)]);
         else
             return NumberToken;
     }
 
-    RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) {
+    RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) const {
         // current state x one lookahead token -> new state
         static const char G[cIterativeParsingStateCount][kTokenCount] = {
+            // Finish(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // Error(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
             // Start
             {
                 IterativeParsingArrayInitialState,  // Left bracket
@@ -1098,18 +1858,6 @@ class GenericReader {
                 IterativeParsingValueState,         // Null
                 IterativeParsingValueState          // Number
             },
-            // Finish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Error(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
             // ObjectInitial
             {
                 IterativeParsingErrorState,         // Left bracket
@@ -1138,20 +1886,6 @@ class GenericReader {
                 IterativeParsingErrorState,             // Null
                 IterativeParsingErrorState              // Number
             },
-            // KeyValueDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingMemberValueState,       // String
-                IterativeParsingMemberValueState,       // False
-                IterativeParsingMemberValueState,       // True
-                IterativeParsingMemberValueState,       // Null
-                IterativeParsingMemberValueState        // Number
-            },
             // MemberValue
             {
                 IterativeParsingErrorState,             // Left bracket
@@ -1166,20 +1900,6 @@ class GenericReader {
                 IterativeParsingErrorState,             // Null
                 IterativeParsingErrorState              // Number
             },
-            // MemberDelimiter
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingErrorState,         // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
             // ObjectFinish(sink state)
             {
                 IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
@@ -1214,10 +1934,22 @@ class GenericReader {
                 IterativeParsingErrorState,             // Null
                 IterativeParsingErrorState              // Number
             },
+            // ArrayFinish(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // Single Value (sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
             // ElementDelimiter
             {
                 IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingErrorState,             // Right bracket
+                IterativeParsingArrayFinishState,       // Right bracket
                 IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
                 IterativeParsingErrorState,             // Right curly bracket
                 IterativeParsingErrorState,             // Comma
@@ -1228,35 +1960,46 @@ class GenericReader {
                 IterativeParsingElementState,           // Null
                 IterativeParsingElementState            // Number
             },
-            // ArrayFinish(sink state)
+            // MemberDelimiter
             {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
+                IterativeParsingErrorState,         // Left bracket
+                IterativeParsingErrorState,         // Right bracket
+                IterativeParsingErrorState,         // Left curly bracket
+                IterativeParsingObjectFinishState,  // Right curly bracket
+                IterativeParsingErrorState,         // Comma
+                IterativeParsingErrorState,         // Colon
+                IterativeParsingMemberKeyState,     // String
+                IterativeParsingErrorState,         // False
+                IterativeParsingErrorState,         // True
+                IterativeParsingErrorState,         // Null
+                IterativeParsingErrorState          // Number
             },
-            // Single Value (sink state)
+            // KeyValueDelimiter
             {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            }
+                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
+                IterativeParsingErrorState,             // Right bracket
+                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingErrorState,             // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingMemberValueState,       // String
+                IterativeParsingMemberValueState,       // False
+                IterativeParsingMemberValueState,       // True
+                IterativeParsingMemberValueState,       // Null
+                IterativeParsingMemberValueState        // Number
+            },
         }; // End of G
 
-        return (IterativeParsingState)G[state][token];
+        return static_cast<IterativeParsingState>(G[state][token]);
     }
 
     // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
     // May return a new state on state pop.
     template <unsigned parseFlags, typename InputStream, typename Handler>
     RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
-        switch (dst) {
-        case IterativeParsingStartState:
-            RAPIDJSON_ASSERT(false);
-            return IterativeParsingErrorState;
-
-        case IterativeParsingFinishState:
-            return dst;
+        (void)token;
 
+        switch (dst) {
         case IterativeParsingErrorState:
             return dst;
 
@@ -1295,12 +2038,9 @@ class GenericReader {
                 return dst;
 
         case IterativeParsingKeyValueDelimiterState:
-            if (token == ColonToken) {
-                is.Take();
-                return dst;
-            }
-            else
-                return IterativeParsingErrorState;
+            RAPIDJSON_ASSERT(token == ColonToken);
+            is.Take();
+            return dst;
 
         case IterativeParsingMemberValueState:
             // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
@@ -1327,6 +2067,11 @@ class GenericReader {
 
         case IterativeParsingObjectFinishState:
         {
+            // Transit from delimiter is only allowed when trailing commas are enabled
+            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingMemberDelimiterState) {
+                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorObjectMissName, is.Tell());
+                return IterativeParsingErrorState;
+            }
             // Get member count.
             SizeType c = *stack_.template Pop<SizeType>(1);
             // If the object is not empty, count the last member.
@@ -1352,6 +2097,11 @@ class GenericReader {
 
         case IterativeParsingArrayFinishState:
         {
+            // Transit from delimiter is only allowed when trailing commas are enabled
+            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingElementDelimiterState) {
+                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorValueInvalid, is.Tell());
+                return IterativeParsingErrorState;
+            }
             // Get element count.
             SizeType c = *stack_.template Pop<SizeType>(1);
             // If the array is not empty, count the last element.
@@ -1375,17 +2125,25 @@ class GenericReader {
             }
         }
 
-        case IterativeParsingValueState:
+        default:
+            // This branch is for IterativeParsingValueState actually.
+            // Use `default:` rather than
+            // `case IterativeParsingValueState:` is for code coverage.
+
+            // The IterativeParsingStartState is not enumerated in this switch-case.
+            // It is impossible for that case. And it can be caught by following assertion.
+
+            // The IterativeParsingFinishState is not enumerated in this switch-case either.
+            // It is a "derivative" state which cannot triggered from Predict() directly.
+            // Therefore it cannot happen here. And it can be caught by following assertion.
+            RAPIDJSON_ASSERT(dst == IterativeParsingValueState);
+
             // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
             ParseValue<parseFlags>(is, handler);
             if (HasParseError()) {
                 return IterativeParsingErrorState;
             }
             return IterativeParsingFinishState;
-
-        default:
-            RAPIDJSON_ASSERT(false);
-            return IterativeParsingErrorState;
         }
     }
 
@@ -1395,17 +2153,27 @@ class GenericReader {
             // Error flag has been set.
             return;
         }
-        
+
         switch (src) {
-        case IterativeParsingStartState:            RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell());
-        case IterativeParsingFinishState:           RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell());
+        case IterativeParsingStartState:            RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell()); return;
+        case IterativeParsingFinishState:           RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell()); return;
         case IterativeParsingObjectInitialState:
-        case IterativeParsingMemberDelimiterState:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
-        case IterativeParsingMemberKeyState:        RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
-        case IterativeParsingMemberValueState:      RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell());
-        case IterativeParsingElementState:          RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
-        default:                                    RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-        }       
+        case IterativeParsingMemberDelimiterState:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell()); return;
+        case IterativeParsingMemberKeyState:        RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
+        case IterativeParsingMemberValueState:      RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
+        case IterativeParsingKeyValueDelimiterState:
+        case IterativeParsingArrayInitialState:
+        case IterativeParsingElementDelimiterState: RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell()); return;
+        default: RAPIDJSON_ASSERT(src == IterativeParsingElementState); RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
+        }
+    }
+
+    RAPIDJSON_FORCEINLINE bool IsIterativeParsingDelimiterState(IterativeParsingState s) const {
+        return s >= IterativeParsingElementDelimiterState;
+    }
+
+    RAPIDJSON_FORCEINLINE bool IsIterativeParsingCompleteState(IterativeParsingState s) const {
+        return s <= IterativeParsingErrorState;
     }
 
     template <unsigned parseFlags, typename InputStream, typename Handler>
@@ -1414,7 +2182,8 @@ class GenericReader {
         ClearStackOnExit scope(*this);
         IterativeParsingState state = IterativeParsingStartState;
 
-        SkipWhitespace(is);
+        SkipWhitespaceAndComments<parseFlags>(is);
+        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
         while (is.Peek() != '\0') {
             Token t = Tokenize(is.Peek());
             IterativeParsingState n = Predict(state, t);
@@ -1431,7 +2200,8 @@ class GenericReader {
             if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
                 break;
 
-            SkipWhitespace(is);
+            SkipWhitespaceAndComments<parseFlags>(is);
+            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
         }
 
         // Handle the end of file.
@@ -1444,6 +2214,7 @@ class GenericReader {
     static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
     internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
     ParseResult parseResult_;
+    IterativeParsingState state_;
 }; // class GenericReader
 
 //! Reader with UTF8 encoding and default allocator.
@@ -1451,11 +2222,12 @@ typedef GenericReader<UTF8<>, UTF8<> > Reader;
 
 RAPIDJSON_NAMESPACE_END
 
-#ifdef __GNUC__
+#if defined(__clang__) || defined(_MSC_VER)
 RAPIDJSON_DIAG_POP
 #endif
 
-#ifdef _MSC_VER
+
+#ifdef __GNUC__
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/extra/rapidjson/include/rapidjson/schema.h b/extra/rapidjson/include/rapidjson/schema.h
new file mode 100644
index 000000000000..fc39d06c5fb6
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/schema.h
@@ -0,0 +1,2496 @@
+// Tencent is pleased to support the open source community by making RapidJSON available->
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License-> You may obtain a copy of the License at
+//
+// http://opensource->org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied-> See the License for the 
+// specific language governing permissions and limitations under the License->
+
+#ifndef RAPIDJSON_SCHEMA_H_
+#define RAPIDJSON_SCHEMA_H_
+
+#include "document.h"
+#include "pointer.h"
+#include "stringbuffer.h"
+#include <cmath> // abs, floor
+
+#if !defined(RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
+#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
+#else
+#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
+#endif
+
+#if !RAPIDJSON_SCHEMA_USE_INTERNALREGEX && defined(RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
+#define RAPIDJSON_SCHEMA_USE_STDREGEX 1
+#else
+#define RAPIDJSON_SCHEMA_USE_STDREGEX 0
+#endif
+
+#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+#include "internal/regex.h"
+#elif RAPIDJSON_SCHEMA_USE_STDREGEX
+#include <regex>
+#endif
+
+#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX || RAPIDJSON_SCHEMA_USE_STDREGEX
+#define RAPIDJSON_SCHEMA_HAS_REGEX 1
+#else
+#define RAPIDJSON_SCHEMA_HAS_REGEX 0
+#endif
+
+#ifndef RAPIDJSON_SCHEMA_VERBOSE
+#define RAPIDJSON_SCHEMA_VERBOSE 0
+#endif
+
+#if RAPIDJSON_SCHEMA_VERBOSE
+#include "stringbuffer.h"
+#endif
+
+RAPIDJSON_DIAG_PUSH
+
+#if defined(__GNUC__)
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+RAPIDJSON_DIAG_OFF(weak-vtables)
+RAPIDJSON_DIAG_OFF(exit-time-destructors)
+RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
+RAPIDJSON_DIAG_OFF(variadic-macros)
+#elif defined(_MSC_VER)
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Verbose Utilities
+
+#if RAPIDJSON_SCHEMA_VERBOSE
+
+namespace internal {
+
+inline void PrintInvalidKeyword(const char* keyword) {
+    printf("Fail keyword: %s\n", keyword);
+}
+
+inline void PrintInvalidKeyword(const wchar_t* keyword) {
+    wprintf(L"Fail keyword: %ls\n", keyword);
+}
+
+inline void PrintInvalidDocument(const char* document) {
+    printf("Fail document: %s\n\n", document);
+}
+
+inline void PrintInvalidDocument(const wchar_t* document) {
+    wprintf(L"Fail document: %ls\n\n", document);
+}
+
+inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
+    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
+}
+
+inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
+    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
+}
+
+} // namespace internal
+
+#endif // RAPIDJSON_SCHEMA_VERBOSE
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_INVALID_KEYWORD_RETURN
+
+#if RAPIDJSON_SCHEMA_VERBOSE
+#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
+#else
+#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
+#endif
+
+#define RAPIDJSON_INVALID_KEYWORD_RETURN(keyword)\
+RAPIDJSON_MULTILINEMACRO_BEGIN\
+    context.invalidKeyword = keyword.GetString();\
+    RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword.GetString());\
+    return false;\
+RAPIDJSON_MULTILINEMACRO_END
+
+///////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+
+template <typename ValueType, typename Allocator>
+class GenericSchemaDocument;
+
+namespace internal {
+
+template <typename SchemaDocumentType>
+class Schema;
+
+///////////////////////////////////////////////////////////////////////////////
+// ISchemaValidator
+
+class ISchemaValidator {
+public:
+    virtual ~ISchemaValidator() {}
+    virtual bool IsValid() const = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// ISchemaStateFactory
+
+template <typename SchemaType>
+class ISchemaStateFactory {
+public:
+    virtual ~ISchemaStateFactory() {}
+    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType&) = 0;
+    virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0;
+    virtual void* CreateHasher() = 0;
+    virtual uint64_t GetHashCode(void* hasher) = 0;
+    virtual void DestroryHasher(void* hasher) = 0;
+    virtual void* MallocState(size_t size) = 0;
+    virtual void FreeState(void* p) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// IValidationErrorHandler
+
+template <typename SchemaType>
+class IValidationErrorHandler {
+public:
+    typedef typename SchemaType::Ch Ch;
+    typedef typename SchemaType::SValue SValue;
+
+    virtual ~IValidationErrorHandler() {}
+
+    virtual void NotMultipleOf(int64_t actual, const SValue& expected) = 0;
+    virtual void NotMultipleOf(uint64_t actual, const SValue& expected) = 0;
+    virtual void NotMultipleOf(double actual, const SValue& expected) = 0;
+    virtual void AboveMaximum(int64_t actual, const SValue& expected, bool exclusive) = 0;
+    virtual void AboveMaximum(uint64_t actual, const SValue& expected, bool exclusive) = 0;
+    virtual void AboveMaximum(double actual, const SValue& expected, bool exclusive) = 0;
+    virtual void BelowMinimum(int64_t actual, const SValue& expected, bool exclusive) = 0;
+    virtual void BelowMinimum(uint64_t actual, const SValue& expected, bool exclusive) = 0;
+    virtual void BelowMinimum(double actual, const SValue& expected, bool exclusive) = 0;
+
+    virtual void TooLong(const Ch* str, SizeType length, SizeType expected) = 0;
+    virtual void TooShort(const Ch* str, SizeType length, SizeType expected) = 0;
+    virtual void DoesNotMatch(const Ch* str, SizeType length) = 0;
+
+    virtual void DisallowedItem(SizeType index) = 0;
+    virtual void TooFewItems(SizeType actualCount, SizeType expectedCount) = 0;
+    virtual void TooManyItems(SizeType actualCount, SizeType expectedCount) = 0;
+    virtual void DuplicateItems(SizeType index1, SizeType index2) = 0;
+
+    virtual void TooManyProperties(SizeType actualCount, SizeType expectedCount) = 0;
+    virtual void TooFewProperties(SizeType actualCount, SizeType expectedCount) = 0;
+    virtual void StartMissingProperties() = 0;
+    virtual void AddMissingProperty(const SValue& name) = 0;
+    virtual bool EndMissingProperties() = 0;
+    virtual void PropertyViolations(ISchemaValidator** subvalidators, SizeType count) = 0;
+    virtual void DisallowedProperty(const Ch* name, SizeType length) = 0;
+
+    virtual void StartDependencyErrors() = 0;
+    virtual void StartMissingDependentProperties() = 0;
+    virtual void AddMissingDependentProperty(const SValue& targetName) = 0;
+    virtual void EndMissingDependentProperties(const SValue& sourceName) = 0;
+    virtual void AddDependencySchemaError(const SValue& souceName, ISchemaValidator* subvalidator) = 0;
+    virtual bool EndDependencyErrors() = 0;
+
+    virtual void DisallowedValue() = 0;
+    virtual void StartDisallowedType() = 0;
+    virtual void AddExpectedType(const typename SchemaType::ValueType& expectedType) = 0;
+    virtual void EndDisallowedType(const typename SchemaType::ValueType& actualType) = 0;
+    virtual void NotAllOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+    virtual void NoneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+    virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+    virtual void Disallowed() = 0;
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Hasher
+
+// For comparison of compound value
+template<typename Encoding, typename Allocator>
+class Hasher {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    Hasher(Allocator* allocator = 0, size_t stackCapacity = kDefaultSize) : stack_(allocator, stackCapacity) {}
+
+    bool Null() { return WriteType(kNullType); }
+    bool Bool(bool b) { return WriteType(b ? kTrueType : kFalseType); }
+    bool Int(int i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
+    bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
+    bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
+    bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
+    bool Double(double d) { 
+        Number n; 
+        if (d < 0) n.u.i = static_cast<int64_t>(d);
+        else       n.u.u = static_cast<uint64_t>(d); 
+        n.d = d;
+        return WriteNumber(n);
+    }
+
+    bool RawNumber(const Ch* str, SizeType len, bool) {
+        WriteBuffer(kNumberType, str, len * sizeof(Ch));
+        return true;
+    }
+
+    bool String(const Ch* str, SizeType len, bool) {
+        WriteBuffer(kStringType, str, len * sizeof(Ch));
+        return true;
+    }
+
+    bool StartObject() { return true; }
+    bool Key(const Ch* str, SizeType len, bool copy) { return String(str, len, copy); }
+    bool EndObject(SizeType memberCount) { 
+        uint64_t h = Hash(0, kObjectType);
+        uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
+        for (SizeType i = 0; i < memberCount; i++)
+            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+    
+    bool StartArray() { return true; }
+    bool EndArray(SizeType elementCount) { 
+        uint64_t h = Hash(0, kArrayType);
+        uint64_t* e = stack_.template Pop<uint64_t>(elementCount);
+        for (SizeType i = 0; i < elementCount; i++)
+            h = Hash(h, e[i]); // Use hash to achieve element order sensitive
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+
+    bool IsValid() const { return stack_.GetSize() == sizeof(uint64_t); }
+
+    uint64_t GetHashCode() const {
+        RAPIDJSON_ASSERT(IsValid());
+        return *stack_.template Top<uint64_t>();
+    }
+
+private:
+    static const size_t kDefaultSize = 256;
+    struct Number {
+        union U {
+            uint64_t u;
+            int64_t i;
+        }u;
+        double d;
+    };
+
+    bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
+    
+    bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }
+    
+    bool WriteBuffer(Type type, const void* data, size_t len) {
+        // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
+        uint64_t h = Hash(RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
+        const unsigned char* d = static_cast<const unsigned char*>(data);
+        for (size_t i = 0; i < len; i++)
+            h = Hash(h, d[i]);
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+
+    static uint64_t Hash(uint64_t h, uint64_t d) {
+        static const uint64_t kPrime = RAPIDJSON_UINT64_C2(0x00000100, 0x000001b3);
+        h ^= d;
+        h *= kPrime;
+        return h;
+    }
+
+    Stack<Allocator> stack_;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// SchemaValidationContext
+
+template <typename SchemaDocumentType>
+struct SchemaValidationContext {
+    typedef Schema<SchemaDocumentType> SchemaType;
+    typedef ISchemaStateFactory<SchemaType> SchemaValidatorFactoryType;
+    typedef IValidationErrorHandler<SchemaType> ErrorHandlerType;
+    typedef typename SchemaType::ValueType ValueType;
+    typedef typename ValueType::Ch Ch;
+
+    enum PatternValidatorType {
+        kPatternValidatorOnly,
+        kPatternValidatorWithProperty,
+        kPatternValidatorWithAdditionalProperty
+    };
+
+    SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s) :
+        factory(f),
+        error_handler(eh),
+        schema(s),
+        valueSchema(),
+        invalidKeyword(),
+        hasher(),
+        arrayElementHashCodes(),
+        validators(),
+        validatorCount(),
+        patternPropertiesValidators(),
+        patternPropertiesValidatorCount(),
+        patternPropertiesSchemas(),
+        patternPropertiesSchemaCount(),
+        valuePatternValidatorType(kPatternValidatorOnly),
+        propertyExist(),
+        inArray(false),
+        valueUniqueness(false),
+        arrayUniqueness(false)
+    {
+    }
+
+    ~SchemaValidationContext() {
+        if (hasher)
+            factory.DestroryHasher(hasher);
+        if (validators) {
+            for (SizeType i = 0; i < validatorCount; i++)
+                factory.DestroySchemaValidator(validators[i]);
+            factory.FreeState(validators);
+        }
+        if (patternPropertiesValidators) {
+            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
+                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+            factory.FreeState(patternPropertiesValidators);
+        }
+        if (patternPropertiesSchemas)
+            factory.FreeState(patternPropertiesSchemas);
+        if (propertyExist)
+            factory.FreeState(propertyExist);
+    }
+
+    SchemaValidatorFactoryType& factory;
+    ErrorHandlerType& error_handler;
+    const SchemaType* schema;
+    const SchemaType* valueSchema;
+    const Ch* invalidKeyword;
+    void* hasher; // Only validator access
+    void* arrayElementHashCodes; // Only validator access this
+    ISchemaValidator** validators;
+    SizeType validatorCount;
+    ISchemaValidator** patternPropertiesValidators;
+    SizeType patternPropertiesValidatorCount;
+    const SchemaType** patternPropertiesSchemas;
+    SizeType patternPropertiesSchemaCount;
+    PatternValidatorType valuePatternValidatorType;
+    PatternValidatorType objectPatternValidatorType;
+    SizeType arrayElementIndex;
+    bool* propertyExist;
+    bool inArray;
+    bool valueUniqueness;
+    bool arrayUniqueness;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Schema
+
+template <typename SchemaDocumentType>
+class Schema {
+public:
+    typedef typename SchemaDocumentType::ValueType ValueType;
+    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename EncodingType::Ch Ch;
+    typedef SchemaValidationContext<SchemaDocumentType> Context;
+    typedef Schema<SchemaDocumentType> SchemaType;
+    typedef GenericValue<EncodingType, AllocatorType> SValue;
+    typedef IValidationErrorHandler<Schema> ErrorHandler;
+    friend class GenericSchemaDocument<ValueType, AllocatorType>;
+
+    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
+        allocator_(allocator),
+        uri_(schemaDocument->GetURI(), *allocator),
+        pointer_(p, allocator),
+        typeless_(schemaDocument->GetTypeless()),
+        enum_(),
+        enumCount_(),
+        not_(),
+        type_((1 << kTotalSchemaType) - 1), // typeless
+        validatorCount_(),
+        notValidatorIndex_(),
+        properties_(),
+        additionalPropertiesSchema_(),
+        patternProperties_(),
+        patternPropertyCount_(),
+        propertyCount_(),
+        minProperties_(),
+        maxProperties_(SizeType(~0)),
+        additionalProperties_(true),
+        hasDependencies_(),
+        hasRequired_(),
+        hasSchemaDependencies_(),
+        additionalItemsSchema_(),
+        itemsList_(),
+        itemsTuple_(),
+        itemsTupleCount_(),
+        minItems_(),
+        maxItems_(SizeType(~0)),
+        additionalItems_(true),
+        uniqueItems_(false),
+        pattern_(),
+        minLength_(0),
+        maxLength_(~SizeType(0)),
+        exclusiveMinimum_(false),
+        exclusiveMaximum_(false),
+        defaultValueLength_(0)
+    {
+        typedef typename ValueType::ConstValueIterator ConstValueIterator;
+        typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
+
+        if (!value.IsObject())
+            return;
+
+        if (const ValueType* v = GetMember(value, GetTypeString())) {
+            type_ = 0;
+            if (v->IsString())
+                AddType(*v);
+            else if (v->IsArray())
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr)
+                    AddType(*itr);
+        }
+
+        if (const ValueType* v = GetMember(value, GetEnumString()))
+            if (v->IsArray() && v->Size() > 0) {
+                enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
+                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
+                    char buffer[256u + 24];
+                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
+                    EnumHasherType h(&hasherAllocator, 256);
+                    itr->Accept(h);
+                    enum_[enumCount_++] = h.GetHashCode();
+                }
+            }
+
+        if (schemaDocument) {
+            AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
+            AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
+            AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
+        }
+
+        if (const ValueType* v = GetMember(value, GetNotString())) {
+            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
+            notValidatorIndex_ = validatorCount_;
+            validatorCount_++;
+        }
+
+        // Object
+
+        const ValueType* properties = GetMember(value, GetPropertiesString());
+        const ValueType* required = GetMember(value, GetRequiredString());
+        const ValueType* dependencies = GetMember(value, GetDependenciesString());
+        {
+            // Gather properties from properties/required/dependencies
+            SValue allProperties(kArrayType);
+
+            if (properties && properties->IsObject())
+                for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
+                    AddUniqueElement(allProperties, itr->name);
+            
+            if (required && required->IsArray())
+                for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
+                    if (itr->IsString())
+                        AddUniqueElement(allProperties, *itr);
+
+            if (dependencies && dependencies->IsObject())
+                for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
+                    AddUniqueElement(allProperties, itr->name);
+                    if (itr->value.IsArray())
+                        for (ConstValueIterator i = itr->value.Begin(); i != itr->value.End(); ++i)
+                            if (i->IsString())
+                                AddUniqueElement(allProperties, *i);
+                }
+
+            if (allProperties.Size() > 0) {
+                propertyCount_ = allProperties.Size();
+                properties_ = static_cast<Property*>(allocator_->Malloc(sizeof(Property) * propertyCount_));
+                for (SizeType i = 0; i < propertyCount_; i++) {
+                    new (&properties_[i]) Property();
+                    properties_[i].name = allProperties[i];
+                    properties_[i].schema = typeless_;
+                }
+            }
+        }
+
+        if (properties && properties->IsObject()) {
+            PointerType q = p.Append(GetPropertiesString(), allocator_);
+            for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
+                SizeType index;
+                if (FindPropertyIndex(itr->name, &index))
+                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
+            }
+        }
+
+        if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
+            PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
+            patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
+            patternPropertyCount_ = 0;
+
+            for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
+                new (&patternProperties_[patternPropertyCount_]) PatternProperty();
+                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
+                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
+                patternPropertyCount_++;
+            }
+        }
+
+        if (required && required->IsArray())
+            for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
+                if (itr->IsString()) {
+                    SizeType index;
+                    if (FindPropertyIndex(*itr, &index)) {
+                        properties_[index].required = true;
+                        hasRequired_ = true;
+                    }
+                }
+
+        if (dependencies && dependencies->IsObject()) {
+            PointerType q = p.Append(GetDependenciesString(), allocator_);
+            hasDependencies_ = true;
+            for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
+                SizeType sourceIndex;
+                if (FindPropertyIndex(itr->name, &sourceIndex)) {
+                    if (itr->value.IsArray()) {
+                        properties_[sourceIndex].dependencies = static_cast<bool*>(allocator_->Malloc(sizeof(bool) * propertyCount_));
+                        std::memset(properties_[sourceIndex].dependencies, 0, sizeof(bool)* propertyCount_);
+                        for (ConstValueIterator targetItr = itr->value.Begin(); targetItr != itr->value.End(); ++targetItr) {
+                            SizeType targetIndex;
+                            if (FindPropertyIndex(*targetItr, &targetIndex))
+                                properties_[sourceIndex].dependencies[targetIndex] = true;
+                        }
+                    }
+                    else if (itr->value.IsObject()) {
+                        hasSchemaDependencies_ = true;
+                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
+                        properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
+                        validatorCount_++;
+                    }
+                }
+            }
+        }
+
+        if (const ValueType* v = GetMember(value, GetAdditionalPropertiesString())) {
+            if (v->IsBool())
+                additionalProperties_ = v->GetBool();
+            else if (v->IsObject())
+                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
+        }
+
+        AssignIfExist(minProperties_, value, GetMinPropertiesString());
+        AssignIfExist(maxProperties_, value, GetMaxPropertiesString());
+
+        // Array
+        if (const ValueType* v = GetMember(value, GetItemsString())) {
+            PointerType q = p.Append(GetItemsString(), allocator_);
+            if (v->IsObject()) // List validation
+                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
+            else if (v->IsArray()) { // Tuple validation
+                itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
+                SizeType index = 0;
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
+                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
+            }
+        }
+
+        AssignIfExist(minItems_, value, GetMinItemsString());
+        AssignIfExist(maxItems_, value, GetMaxItemsString());
+
+        if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
+            if (v->IsBool())
+                additionalItems_ = v->GetBool();
+            else if (v->IsObject())
+                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
+        }
+
+        AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
+
+        // String
+        AssignIfExist(minLength_, value, GetMinLengthString());
+        AssignIfExist(maxLength_, value, GetMaxLengthString());
+
+        if (const ValueType* v = GetMember(value, GetPatternString()))
+            pattern_ = CreatePattern(*v);
+
+        // Number
+        if (const ValueType* v = GetMember(value, GetMinimumString()))
+            if (v->IsNumber())
+                minimum_.CopyFrom(*v, *allocator_);
+
+        if (const ValueType* v = GetMember(value, GetMaximumString()))
+            if (v->IsNumber())
+                maximum_.CopyFrom(*v, *allocator_);
+
+        AssignIfExist(exclusiveMinimum_, value, GetExclusiveMinimumString());
+        AssignIfExist(exclusiveMaximum_, value, GetExclusiveMaximumString());
+
+        if (const ValueType* v = GetMember(value, GetMultipleOfString()))
+            if (v->IsNumber() && v->GetDouble() > 0.0)
+                multipleOf_.CopyFrom(*v, *allocator_);
+
+        // Default
+        if (const ValueType* v = GetMember(value, GetDefaultValueString()))
+            if (v->IsString())
+                defaultValueLength_ = v->GetStringLength();
+
+    }
+
+    ~Schema() {
+        AllocatorType::Free(enum_);
+        if (properties_) {
+            for (SizeType i = 0; i < propertyCount_; i++)
+                properties_[i].~Property();
+            AllocatorType::Free(properties_);
+        }
+        if (patternProperties_) {
+            for (SizeType i = 0; i < patternPropertyCount_; i++)
+                patternProperties_[i].~PatternProperty();
+            AllocatorType::Free(patternProperties_);
+        }
+        AllocatorType::Free(itemsTuple_);
+#if RAPIDJSON_SCHEMA_HAS_REGEX
+        if (pattern_) {
+            pattern_->~RegexType();
+            AllocatorType::Free(pattern_);
+        }
+#endif
+    }
+
+    const SValue& GetURI() const {
+        return uri_;
+    }
+
+    const PointerType& GetPointer() const {
+        return pointer_;
+    }
+
+    bool BeginValue(Context& context) const {
+        if (context.inArray) {
+            if (uniqueItems_)
+                context.valueUniqueness = true;
+
+            if (itemsList_)
+                context.valueSchema = itemsList_;
+            else if (itemsTuple_) {
+                if (context.arrayElementIndex < itemsTupleCount_)
+                    context.valueSchema = itemsTuple_[context.arrayElementIndex];
+                else if (additionalItemsSchema_)
+                    context.valueSchema = additionalItemsSchema_;
+                else if (additionalItems_)
+                    context.valueSchema = typeless_;
+                else {
+                    context.error_handler.DisallowedItem(context.arrayElementIndex);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetItemsString());
+                }
+            }
+            else
+                context.valueSchema = typeless_;
+
+            context.arrayElementIndex++;
+        }
+        return true;
+    }
+
+    RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
+        if (context.patternPropertiesValidatorCount > 0) {
+            bool otherValid = false;
+            SizeType count = context.patternPropertiesValidatorCount;
+            if (context.objectPatternValidatorType != Context::kPatternValidatorOnly)
+                otherValid = context.patternPropertiesValidators[--count]->IsValid();
+
+            bool patternValid = true;
+            for (SizeType i = 0; i < count; i++)
+                if (!context.patternPropertiesValidators[i]->IsValid()) {
+                    patternValid = false;
+                    break;
+                }
+
+            if (context.objectPatternValidatorType == Context::kPatternValidatorOnly) {
+                if (!patternValid) {
+                    context.error_handler.PropertyViolations(context.patternPropertiesValidators, count);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+                }
+            }
+            else if (context.objectPatternValidatorType == Context::kPatternValidatorWithProperty) {
+                if (!patternValid || !otherValid) {
+                    context.error_handler.PropertyViolations(context.patternPropertiesValidators, count + 1);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+                }
+            }
+            else if (!patternValid && !otherValid) { // kPatternValidatorWithAdditionalProperty)
+                context.error_handler.PropertyViolations(context.patternPropertiesValidators, count + 1);
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+            }
+        }
+
+        if (enum_) {
+            const uint64_t h = context.factory.GetHashCode(context.hasher);
+            for (SizeType i = 0; i < enumCount_; i++)
+                if (enum_[i] == h)
+                    goto foundEnum;
+            context.error_handler.DisallowedValue();
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetEnumString());
+            foundEnum:;
+        }
+
+        if (allOf_.schemas)
+            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
+                if (!context.validators[i]->IsValid()) {
+                    context.error_handler.NotAllOf(&context.validators[allOf_.begin], allOf_.count);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetAllOfString());
+                }
+        
+        if (anyOf_.schemas) {
+            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
+                if (context.validators[i]->IsValid())
+                    goto foundAny;
+            context.error_handler.NoneOf(&context.validators[anyOf_.begin], anyOf_.count);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAnyOfString());
+            foundAny:;
+        }
+
+        if (oneOf_.schemas) {
+            bool oneValid = false;
+            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
+                if (context.validators[i]->IsValid()) {
+                    if (oneValid) {
+                        context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
+                        RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
+                    } else
+                        oneValid = true;
+                }
+            if (!oneValid) {
+                context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
+            }
+        }
+
+        if (not_ && context.validators[notValidatorIndex_]->IsValid()) {
+            context.error_handler.Disallowed();
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetNotString());
+        }
+
+        return true;
+    }
+
+    bool Null(Context& context) const {
+        if (!(type_ & (1 << kNullSchemaType))) {
+            DisallowedType(context, GetNullString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+        return CreateParallelValidator(context);
+    }
+    
+    bool Bool(Context& context, bool) const {
+        if (!(type_ & (1 << kBooleanSchemaType))) {
+            DisallowedType(context, GetBooleanString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+        return CreateParallelValidator(context);
+    }
+
+    bool Int(Context& context, int i) const {
+        if (!CheckInt(context, i))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Uint(Context& context, unsigned u) const {
+        if (!CheckUint(context, u))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Int64(Context& context, int64_t i) const {
+        if (!CheckInt(context, i))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Uint64(Context& context, uint64_t u) const {
+        if (!CheckUint(context, u))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Double(Context& context, double d) const {
+        if (!(type_ & (1 << kNumberSchemaType))) {
+            DisallowedType(context, GetNumberString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        if (!minimum_.IsNull() && !CheckDoubleMinimum(context, d))
+            return false;
+
+        if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
+            return false;
+        
+        if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
+            return false;
+        
+        return CreateParallelValidator(context);
+    }
+    
+    bool String(Context& context, const Ch* str, SizeType length, bool) const {
+        if (!(type_ & (1 << kStringSchemaType))) {
+            DisallowedType(context, GetStringString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        if (minLength_ != 0 || maxLength_ != SizeType(~0)) {
+            SizeType count;
+            if (internal::CountStringCodePoint<EncodingType>(str, length, &count)) {
+                if (count < minLength_) {
+                    context.error_handler.TooShort(str, length, minLength_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinLengthString());
+                }
+                if (count > maxLength_) {
+                    context.error_handler.TooLong(str, length, maxLength_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxLengthString());
+                }
+            }
+        }
+
+        if (pattern_ && !IsPatternMatch(pattern_, str, length)) {
+            context.error_handler.DoesNotMatch(str, length);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternString());
+        }
+
+        return CreateParallelValidator(context);
+    }
+
+    bool StartObject(Context& context) const {
+        if (!(type_ & (1 << kObjectSchemaType))) {
+            DisallowedType(context, GetObjectString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        if (hasDependencies_ || hasRequired_) {
+            context.propertyExist = static_cast<bool*>(context.factory.MallocState(sizeof(bool) * propertyCount_));
+            std::memset(context.propertyExist, 0, sizeof(bool) * propertyCount_);
+        }
+
+        if (patternProperties_) { // pre-allocate schema array
+            SizeType count = patternPropertyCount_ + 1; // extra for valuePatternValidatorType
+            context.patternPropertiesSchemas = static_cast<const SchemaType**>(context.factory.MallocState(sizeof(const SchemaType*) * count));
+            context.patternPropertiesSchemaCount = 0;
+            std::memset(context.patternPropertiesSchemas, 0, sizeof(SchemaType*) * count);
+        }
+
+        return CreateParallelValidator(context);
+    }
+    
+    bool Key(Context& context, const Ch* str, SizeType len, bool) const {
+        if (patternProperties_) {
+            context.patternPropertiesSchemaCount = 0;
+            for (SizeType i = 0; i < patternPropertyCount_; i++)
+                if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len)) {
+                    context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
+                    context.valueSchema = typeless_;
+                }
+        }
+
+        SizeType index  = 0;
+        if (FindPropertyIndex(ValueType(str, len).Move(), &index)) {
+            if (context.patternPropertiesSchemaCount > 0) {
+                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = properties_[index].schema;
+                context.valueSchema = typeless_;
+                context.valuePatternValidatorType = Context::kPatternValidatorWithProperty;
+            }
+            else
+                context.valueSchema = properties_[index].schema;
+
+            if (context.propertyExist)
+                context.propertyExist[index] = true;
+
+            return true;
+        }
+
+        if (additionalPropertiesSchema_) {
+            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
+                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
+                context.valueSchema = typeless_;
+                context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
+            }
+            else
+                context.valueSchema = additionalPropertiesSchema_;
+            return true;
+        }
+        else if (additionalProperties_) {
+            context.valueSchema = typeless_;
+            return true;
+        }
+
+        if (context.patternPropertiesSchemaCount == 0) { // patternProperties are not additional properties
+            context.error_handler.DisallowedProperty(str, len);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAdditionalPropertiesString());
+        }
+
+        return true;
+    }
+
+    bool EndObject(Context& context, SizeType memberCount) const {
+        if (hasRequired_) {
+            context.error_handler.StartMissingProperties();
+            for (SizeType index = 0; index < propertyCount_; index++)
+                if (properties_[index].required && !context.propertyExist[index])
+                    if (properties_[index].schema->defaultValueLength_ == 0 )
+                        context.error_handler.AddMissingProperty(properties_[index].name);
+            if (context.error_handler.EndMissingProperties())
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetRequiredString());
+        }
+
+        if (memberCount < minProperties_) {
+            context.error_handler.TooFewProperties(memberCount, minProperties_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinPropertiesString());
+        }
+
+        if (memberCount > maxProperties_) {
+            context.error_handler.TooManyProperties(memberCount, maxProperties_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxPropertiesString());
+        }
+
+        if (hasDependencies_) {
+            context.error_handler.StartDependencyErrors();
+            for (SizeType sourceIndex = 0; sourceIndex < propertyCount_; sourceIndex++) {
+                const Property& source = properties_[sourceIndex];
+                if (context.propertyExist[sourceIndex]) {
+                    if (source.dependencies) {
+                        context.error_handler.StartMissingDependentProperties();
+                        for (SizeType targetIndex = 0; targetIndex < propertyCount_; targetIndex++)
+                            if (source.dependencies[targetIndex] && !context.propertyExist[targetIndex])
+                                context.error_handler.AddMissingDependentProperty(properties_[targetIndex].name);
+                        context.error_handler.EndMissingDependentProperties(source.name);
+                    }
+                    else if (source.dependenciesSchema) {
+                        ISchemaValidator* dependenciesValidator = context.validators[source.dependenciesValidatorIndex];
+                        if (!dependenciesValidator->IsValid())
+                            context.error_handler.AddDependencySchemaError(source.name, dependenciesValidator);
+                    }
+                }
+            }
+            if (context.error_handler.EndDependencyErrors())
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
+        }
+
+        return true;
+    }
+
+    bool StartArray(Context& context) const {
+        if (!(type_ & (1 << kArraySchemaType))) {
+            DisallowedType(context, GetArrayString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        context.arrayElementIndex = 0;
+        context.inArray = true;
+
+        return CreateParallelValidator(context);
+    }
+
+    bool EndArray(Context& context, SizeType elementCount) const {
+        context.inArray = false;
+        
+        if (elementCount < minItems_) {
+            context.error_handler.TooFewItems(elementCount, minItems_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinItemsString());
+        }
+        
+        if (elementCount > maxItems_) {
+            context.error_handler.TooManyItems(elementCount, maxItems_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxItemsString());
+        }
+
+        return true;
+    }
+
+    // Generate functions for string literal according to Ch
+#define RAPIDJSON_STRING_(name, ...) \
+    static const ValueType& Get##name##String() {\
+        static const Ch s[] = { __VA_ARGS__, '\0' };\
+        static const ValueType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1));\
+        return v;\
+    }
+
+    RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
+    RAPIDJSON_STRING_(Boolean, 'b', 'o', 'o', 'l', 'e', 'a', 'n')
+    RAPIDJSON_STRING_(Object, 'o', 'b', 'j', 'e', 'c', 't')
+    RAPIDJSON_STRING_(Array, 'a', 'r', 'r', 'a', 'y')
+    RAPIDJSON_STRING_(String, 's', 't', 'r', 'i', 'n', 'g')
+    RAPIDJSON_STRING_(Number, 'n', 'u', 'm', 'b', 'e', 'r')
+    RAPIDJSON_STRING_(Integer, 'i', 'n', 't', 'e', 'g', 'e', 'r')
+    RAPIDJSON_STRING_(Type, 't', 'y', 'p', 'e')
+    RAPIDJSON_STRING_(Enum, 'e', 'n', 'u', 'm')
+    RAPIDJSON_STRING_(AllOf, 'a', 'l', 'l', 'O', 'f')
+    RAPIDJSON_STRING_(AnyOf, 'a', 'n', 'y', 'O', 'f')
+    RAPIDJSON_STRING_(OneOf, 'o', 'n', 'e', 'O', 'f')
+    RAPIDJSON_STRING_(Not, 'n', 'o', 't')
+    RAPIDJSON_STRING_(Properties, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    RAPIDJSON_STRING_(Required, 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd')
+    RAPIDJSON_STRING_(Dependencies, 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'i', 'e', 's')
+    RAPIDJSON_STRING_(PatternProperties, 'p', 'a', 't', 't', 'e', 'r', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    RAPIDJSON_STRING_(AdditionalProperties, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    RAPIDJSON_STRING_(MinProperties, 'm', 'i', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    RAPIDJSON_STRING_(MaxProperties, 'm', 'a', 'x', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    RAPIDJSON_STRING_(Items, 'i', 't', 'e', 'm', 's')
+    RAPIDJSON_STRING_(MinItems, 'm', 'i', 'n', 'I', 't', 'e', 'm', 's')
+    RAPIDJSON_STRING_(MaxItems, 'm', 'a', 'x', 'I', 't', 'e', 'm', 's')
+    RAPIDJSON_STRING_(AdditionalItems, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'I', 't', 'e', 'm', 's')
+    RAPIDJSON_STRING_(UniqueItems, 'u', 'n', 'i', 'q', 'u', 'e', 'I', 't', 'e', 'm', 's')
+    RAPIDJSON_STRING_(MinLength, 'm', 'i', 'n', 'L', 'e', 'n', 'g', 't', 'h')
+    RAPIDJSON_STRING_(MaxLength, 'm', 'a', 'x', 'L', 'e', 'n', 'g', 't', 'h')
+    RAPIDJSON_STRING_(Pattern, 'p', 'a', 't', 't', 'e', 'r', 'n')
+    RAPIDJSON_STRING_(Minimum, 'm', 'i', 'n', 'i', 'm', 'u', 'm')
+    RAPIDJSON_STRING_(Maximum, 'm', 'a', 'x', 'i', 'm', 'u', 'm')
+    RAPIDJSON_STRING_(ExclusiveMinimum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm')
+    RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
+    RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
+    RAPIDJSON_STRING_(DefaultValue, 'd', 'e', 'f', 'a', 'u', 'l', 't')
+
+#undef RAPIDJSON_STRING_
+
+private:
+    enum SchemaValueType {
+        kNullSchemaType,
+        kBooleanSchemaType,
+        kObjectSchemaType,
+        kArraySchemaType,
+        kStringSchemaType,
+        kNumberSchemaType,
+        kIntegerSchemaType,
+        kTotalSchemaType
+    };
+
+#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+        typedef internal::GenericRegex<EncodingType, AllocatorType> RegexType;
+#elif RAPIDJSON_SCHEMA_USE_STDREGEX
+        typedef std::basic_regex<Ch> RegexType;
+#else
+        typedef char RegexType;
+#endif
+
+    struct SchemaArray {
+        SchemaArray() : schemas(), count() {}
+        ~SchemaArray() { AllocatorType::Free(schemas); }
+        const SchemaType** schemas;
+        SizeType begin; // begin index of context.validators
+        SizeType count;
+    };
+
+    template <typename V1, typename V2>
+    void AddUniqueElement(V1& a, const V2& v) {
+        for (typename V1::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
+            if (*itr == v)
+                return;
+        V1 c(v, *allocator_);
+        a.PushBack(c, *allocator_);
+    }
+
+    static const ValueType* GetMember(const ValueType& value, const ValueType& name) {
+        typename ValueType::ConstMemberIterator itr = value.FindMember(name);
+        return itr != value.MemberEnd() ? &(itr->value) : 0;
+    }
+
+    static void AssignIfExist(bool& out, const ValueType& value, const ValueType& name) {
+        if (const ValueType* v = GetMember(value, name))
+            if (v->IsBool())
+                out = v->GetBool();
+    }
+
+    static void AssignIfExist(SizeType& out, const ValueType& value, const ValueType& name) {
+        if (const ValueType* v = GetMember(value, name))
+            if (v->IsUint64() && v->GetUint64() <= SizeType(~0))
+                out = static_cast<SizeType>(v->GetUint64());
+    }
+
+    void AssignIfExist(SchemaArray& out, SchemaDocumentType& schemaDocument, const PointerType& p, const ValueType& value, const ValueType& name, const ValueType& document) {
+        if (const ValueType* v = GetMember(value, name)) {
+            if (v->IsArray() && v->Size() > 0) {
+                PointerType q = p.Append(name, allocator_);
+                out.count = v->Size();
+                out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
+                memset(out.schemas, 0, sizeof(Schema*)* out.count);
+                for (SizeType i = 0; i < out.count; i++)
+                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
+                out.begin = validatorCount_;
+                validatorCount_ += out.count;
+            }
+        }
+    }
+
+#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType& value) {
+        if (value.IsString()) {
+            RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), allocator_);
+            if (!r->IsValid()) {
+                r->~RegexType();
+                AllocatorType::Free(r);
+                r = 0;
+            }
+            return r;
+        }
+        return 0;
+    }
+
+    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
+        GenericRegexSearch<RegexType> rs(*pattern);
+        return rs.Search(str);
+    }
+#elif RAPIDJSON_SCHEMA_USE_STDREGEX
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType& value) {
+        if (value.IsString()) {
+            RegexType *r = static_cast<RegexType*>(allocator_->Malloc(sizeof(RegexType)));
+            try {
+                return new (r) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
+            }
+            catch (const std::regex_error&) {
+                AllocatorType::Free(r);
+            }
+        }
+        return 0;
+    }
+
+    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType length) {
+        std::match_results<const Ch*> r;
+        return std::regex_search(str, str + length, r, *pattern);
+    }
+#else
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType&) { return 0; }
+
+    static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
+#endif // RAPIDJSON_SCHEMA_USE_STDREGEX
+
+    void AddType(const ValueType& type) {
+        if      (type == GetNullString()   ) type_ |= 1 << kNullSchemaType;
+        else if (type == GetBooleanString()) type_ |= 1 << kBooleanSchemaType;
+        else if (type == GetObjectString() ) type_ |= 1 << kObjectSchemaType;
+        else if (type == GetArrayString()  ) type_ |= 1 << kArraySchemaType;
+        else if (type == GetStringString() ) type_ |= 1 << kStringSchemaType;
+        else if (type == GetIntegerString()) type_ |= 1 << kIntegerSchemaType;
+        else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
+    }
+
+    bool CreateParallelValidator(Context& context) const {
+        if (enum_ || context.arrayUniqueness)
+            context.hasher = context.factory.CreateHasher();
+
+        if (validatorCount_) {
+            RAPIDJSON_ASSERT(context.validators == 0);
+            context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
+            context.validatorCount = validatorCount_;
+
+            if (allOf_.schemas)
+                CreateSchemaValidators(context, allOf_);
+
+            if (anyOf_.schemas)
+                CreateSchemaValidators(context, anyOf_);
+            
+            if (oneOf_.schemas)
+                CreateSchemaValidators(context, oneOf_);
+            
+            if (not_)
+                context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_);
+            
+            if (hasSchemaDependencies_) {
+                for (SizeType i = 0; i < propertyCount_; i++)
+                    if (properties_[i].dependenciesSchema)
+                        context.validators[properties_[i].dependenciesValidatorIndex] = context.factory.CreateSchemaValidator(*properties_[i].dependenciesSchema);
+            }
+        }
+
+        return true;
+    }
+
+    void CreateSchemaValidators(Context& context, const SchemaArray& schemas) const {
+        for (SizeType i = 0; i < schemas.count; i++)
+            context.validators[schemas.begin + i] = context.factory.CreateSchemaValidator(*schemas.schemas[i]);
+    }
+
+    // O(n)
+    bool FindPropertyIndex(const ValueType& name, SizeType* outIndex) const {
+        SizeType len = name.GetStringLength();
+        const Ch* str = name.GetString();
+        for (SizeType index = 0; index < propertyCount_; index++)
+            if (properties_[index].name.GetStringLength() == len && 
+                (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
+            {
+                *outIndex = index;
+                return true;
+            }
+        return false;
+    }
+
+    bool CheckInt(Context& context, int64_t i) const {
+        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
+            DisallowedType(context, GetIntegerString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        if (!minimum_.IsNull()) {
+            if (minimum_.IsInt64()) {
+                if (exclusiveMinimum_ ? i <= minimum_.GetInt64() : i < minimum_.GetInt64()) {
+                    context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+                }
+            }
+            else if (minimum_.IsUint64()) {
+                context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString()); // i <= max(int64_t) < minimum.GetUint64()
+            }
+            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!maximum_.IsNull()) {
+            if (maximum_.IsInt64()) {
+                if (exclusiveMaximum_ ? i >= maximum_.GetInt64() : i > maximum_.GetInt64()) {
+                    context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+                }
+            }
+            else if (maximum_.IsUint64()) { }
+                /* do nothing */ // i <= max(int64_t) < maximum_.GetUint64()
+            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!multipleOf_.IsNull()) {
+            if (multipleOf_.IsUint64()) {
+                if (static_cast<uint64_t>(i >= 0 ? i : -i) % multipleOf_.GetUint64() != 0) {
+                    context.error_handler.NotMultipleOf(i, multipleOf_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+                }
+            }
+            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
+                return false;
+        }
+
+        return true;
+    }
+
+    bool CheckUint(Context& context, uint64_t i) const {
+        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
+            DisallowedType(context, GetIntegerString());
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        }
+
+        if (!minimum_.IsNull()) {
+            if (minimum_.IsUint64()) {
+                if (exclusiveMinimum_ ? i <= minimum_.GetUint64() : i < minimum_.GetUint64()) {
+                    context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+                }
+            }
+            else if (minimum_.IsInt64())
+                /* do nothing */; // i >= 0 > minimum.Getint64()
+            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!maximum_.IsNull()) {
+            if (maximum_.IsUint64()) {
+                if (exclusiveMaximum_ ? i >= maximum_.GetUint64() : i > maximum_.GetUint64()) {
+                    context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+                }
+            }
+            else if (maximum_.IsInt64()) {
+                context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
+                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString()); // i >= 0 > maximum_
+            }
+            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!multipleOf_.IsNull()) {
+            if (multipleOf_.IsUint64()) {
+                if (i % multipleOf_.GetUint64() != 0) {
+                    context.error_handler.NotMultipleOf(i, multipleOf_);
+                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+                }
+            }
+            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
+                return false;
+        }
+
+        return true;
+    }
+
+    bool CheckDoubleMinimum(Context& context, double d) const {
+        if (exclusiveMinimum_ ? d <= minimum_.GetDouble() : d < minimum_.GetDouble()) {
+            context.error_handler.BelowMinimum(d, minimum_, exclusiveMinimum_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+        }
+        return true;
+    }
+
+    bool CheckDoubleMaximum(Context& context, double d) const {
+        if (exclusiveMaximum_ ? d >= maximum_.GetDouble() : d > maximum_.GetDouble()) {
+            context.error_handler.AboveMaximum(d, maximum_, exclusiveMaximum_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+        }
+        return true;
+    }
+
+    bool CheckDoubleMultipleOf(Context& context, double d) const {
+        double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
+        double q = std::floor(a / b);
+        double r = a - q * b;
+        if (r > 0.0) {
+            context.error_handler.NotMultipleOf(d, multipleOf_);
+            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+        }
+        return true;
+    }
+
+    void DisallowedType(Context& context, const ValueType& actualType) const {
+        ErrorHandler& eh = context.error_handler;
+        eh.StartDisallowedType();
+
+        if (type_ & (1 << kNullSchemaType)) eh.AddExpectedType(GetNullString());
+        if (type_ & (1 << kBooleanSchemaType)) eh.AddExpectedType(GetBooleanString());
+        if (type_ & (1 << kObjectSchemaType)) eh.AddExpectedType(GetObjectString());
+        if (type_ & (1 << kArraySchemaType)) eh.AddExpectedType(GetArrayString());
+        if (type_ & (1 << kStringSchemaType)) eh.AddExpectedType(GetStringString());
+
+        if (type_ & (1 << kNumberSchemaType)) eh.AddExpectedType(GetNumberString());
+        else if (type_ & (1 << kIntegerSchemaType)) eh.AddExpectedType(GetIntegerString());
+
+        eh.EndDisallowedType(actualType);
+    }
+
+    struct Property {
+        Property() : schema(), dependenciesSchema(), dependenciesValidatorIndex(), dependencies(), required(false) {}
+        ~Property() { AllocatorType::Free(dependencies); }
+        SValue name;
+        const SchemaType* schema;
+        const SchemaType* dependenciesSchema;
+        SizeType dependenciesValidatorIndex;
+        bool* dependencies;
+        bool required;
+    };
+
+    struct PatternProperty {
+        PatternProperty() : schema(), pattern() {}
+        ~PatternProperty() { 
+            if (pattern) {
+                pattern->~RegexType();
+                AllocatorType::Free(pattern);
+            }
+        }
+        const SchemaType* schema;
+        RegexType* pattern;
+    };
+
+    AllocatorType* allocator_;
+    SValue uri_;
+    PointerType pointer_;
+    const SchemaType* typeless_;
+    uint64_t* enum_;
+    SizeType enumCount_;
+    SchemaArray allOf_;
+    SchemaArray anyOf_;
+    SchemaArray oneOf_;
+    const SchemaType* not_;
+    unsigned type_; // bitmask of kSchemaType
+    SizeType validatorCount_;
+    SizeType notValidatorIndex_;
+
+    Property* properties_;
+    const SchemaType* additionalPropertiesSchema_;
+    PatternProperty* patternProperties_;
+    SizeType patternPropertyCount_;
+    SizeType propertyCount_;
+    SizeType minProperties_;
+    SizeType maxProperties_;
+    bool additionalProperties_;
+    bool hasDependencies_;
+    bool hasRequired_;
+    bool hasSchemaDependencies_;
+
+    const SchemaType* additionalItemsSchema_;
+    const SchemaType* itemsList_;
+    const SchemaType** itemsTuple_;
+    SizeType itemsTupleCount_;
+    SizeType minItems_;
+    SizeType maxItems_;
+    bool additionalItems_;
+    bool uniqueItems_;
+
+    RegexType* pattern_;
+    SizeType minLength_;
+    SizeType maxLength_;
+
+    SValue minimum_;
+    SValue maximum_;
+    SValue multipleOf_;
+    bool exclusiveMinimum_;
+    bool exclusiveMaximum_;
+    
+    SizeType defaultValueLength_;
+};
+
+template<typename Stack, typename Ch>
+struct TokenHelper {
+    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
+        *documentStack.template Push<Ch>() = '/';
+        char buffer[21];
+        size_t length = static_cast<size_t>((sizeof(SizeType) == 4 ? u32toa(index, buffer) : u64toa(index, buffer)) - buffer);
+        for (size_t i = 0; i < length; i++)
+            *documentStack.template Push<Ch>() = static_cast<Ch>(buffer[i]);
+    }
+};
+
+// Partial specialized version for char to prevent buffer copying.
+template <typename Stack>
+struct TokenHelper<Stack, char> {
+    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
+        if (sizeof(SizeType) == 4) {
+            char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
+            *buffer++ = '/';
+            const char* end = internal::u32toa(index, buffer);
+             documentStack.template Pop<char>(static_cast<size_t>(10 - (end - buffer)));
+        }
+        else {
+            char *buffer = documentStack.template Push<char>(1 + 20); // '/' + uint64
+            *buffer++ = '/';
+            const char* end = internal::u64toa(index, buffer);
+            documentStack.template Pop<char>(static_cast<size_t>(20 - (end - buffer)));
+        }
+    }
+};
+
+} // namespace internal
+
+///////////////////////////////////////////////////////////////////////////////
+// IGenericRemoteSchemaDocumentProvider
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider {
+public:
+    typedef typename SchemaDocumentType::Ch Ch;
+
+    virtual ~IGenericRemoteSchemaDocumentProvider() {}
+    virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericSchemaDocument
+
+//! JSON schema document.
+/*!
+    A JSON schema document is a compiled version of a JSON schema.
+    It is basically a tree of internal::Schema.
+
+    \note This is an immutable class (i.e. its instance cannot be modified after construction).
+    \tparam ValueT Type of JSON value (e.g. \c Value ), which also determine the encoding.
+    \tparam Allocator Allocator type for allocating memory of this document.
+*/
+template <typename ValueT, typename Allocator = CrtAllocator>
+class GenericSchemaDocument {
+public:
+    typedef ValueT ValueType;
+    typedef IGenericRemoteSchemaDocumentProvider<GenericSchemaDocument> IRemoteSchemaDocumentProviderType;
+    typedef Allocator AllocatorType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename EncodingType::Ch Ch;
+    typedef internal::Schema<GenericSchemaDocument> SchemaType;
+    typedef GenericPointer<ValueType, Allocator> PointerType;
+    typedef GenericValue<EncodingType, Allocator> URIType;
+    friend class internal::Schema<GenericSchemaDocument>;
+    template <typename, typename, typename>
+    friend class GenericSchemaValidator;
+
+    //! Constructor.
+    /*!
+        Compile a JSON document into schema document.
+
+        \param document A JSON document as source.
+        \param uri The base URI of this schema document for purposes of violation reporting.
+        \param uriLength Length of \c name, in code points.
+        \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
+        \param allocator An optional allocator instance for allocating memory. Can be null.
+    */
+    explicit GenericSchemaDocument(const ValueType& document, const Ch* uri = 0, SizeType uriLength = 0,
+        IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
+        remoteProvider_(remoteProvider),
+        allocator_(allocator),
+        ownAllocator_(),
+        root_(),
+        typeless_(),
+        schemaMap_(allocator, kInitialSchemaMapSize),
+        schemaRef_(allocator, kInitialSchemaRefSize)
+    {
+        if (!allocator_)
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
+
+        Ch noUri[1] = {0};
+        uri_.SetString(uri ? uri : noUri, uriLength, *allocator_);
+
+        typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
+        new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_);
+
+        // Generate root schema, it will call CreateSchema() to create sub-schemas,
+        // And call AddRefSchema() if there are $ref.
+        CreateSchemaRecursive(&root_, PointerType(), document, document);
+
+        // Resolve $ref
+        while (!schemaRef_.Empty()) {
+            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
+            if (const SchemaType* s = GetSchema(refEntry->target)) {
+                if (refEntry->schema)
+                    *refEntry->schema = s;
+
+                // Create entry in map if not exist
+                if (!GetSchema(refEntry->source)) {
+                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
+                }
+            }
+            else if (refEntry->schema)
+                *refEntry->schema = typeless_;
+
+            refEntry->~SchemaRefEntry();
+        }
+
+        RAPIDJSON_ASSERT(root_ != 0);
+
+        schemaRef_.ShrinkToFit(); // Deallocate all memory for ref
+    }
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move constructor in C++11
+    GenericSchemaDocument(GenericSchemaDocument&& rhs) RAPIDJSON_NOEXCEPT :
+        remoteProvider_(rhs.remoteProvider_),
+        allocator_(rhs.allocator_),
+        ownAllocator_(rhs.ownAllocator_),
+        root_(rhs.root_),
+        typeless_(rhs.typeless_),
+        schemaMap_(std::move(rhs.schemaMap_)),
+        schemaRef_(std::move(rhs.schemaRef_)),
+        uri_(std::move(rhs.uri_))
+    {
+        rhs.remoteProvider_ = 0;
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+        rhs.typeless_ = 0;
+    }
+#endif
+
+    //! Destructor
+    ~GenericSchemaDocument() {
+        while (!schemaMap_.Empty())
+            schemaMap_.template Pop<SchemaEntry>(1)->~SchemaEntry();
+
+        if (typeless_) {
+            typeless_->~SchemaType();
+            Allocator::Free(typeless_);
+        }
+
+        RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    const URIType& GetURI() const { return uri_; }
+
+    //! Get the root schema.
+    const SchemaType& GetRoot() const { return *root_; }
+
+private:
+    //! Prohibit copying
+    GenericSchemaDocument(const GenericSchemaDocument&);
+    //! Prohibit assignment
+    GenericSchemaDocument& operator=(const GenericSchemaDocument&);
+
+    struct SchemaRefEntry {
+        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
+        PointerType source;
+        PointerType target;
+        const SchemaType** schema;
+    };
+
+    struct SchemaEntry {
+        SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
+        ~SchemaEntry() {
+            if (owned) {
+                schema->~SchemaType();
+                Allocator::Free(schema);
+            }
+        }
+        PointerType pointer;
+        SchemaType* schema;
+        bool owned;
+    };
+
+    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
+        if (schema)
+            *schema = typeless_;
+
+        if (v.GetType() == kObjectType) {
+            const SchemaType* s = GetSchema(pointer);
+            if (!s)
+                CreateSchema(schema, pointer, v, document);
+
+            for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
+                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
+        }
+        else if (v.GetType() == kArrayType)
+            for (SizeType i = 0; i < v.Size(); i++)
+                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
+    }
+
+    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
+        RAPIDJSON_ASSERT(pointer.IsValid());
+        if (v.IsObject()) {
+            if (!HandleRefSchema(pointer, schema, v, document)) {
+                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
+                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
+                if (schema)
+                    *schema = s;
+            }
+        }
+    }
+
+    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
+        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
+        static const ValueType kRefValue(kRefString, 4);
+
+        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
+        if (itr == v.MemberEnd())
+            return false;
+
+        if (itr->value.IsString()) {
+            SizeType len = itr->value.GetStringLength();
+            if (len > 0) {
+                const Ch* s = itr->value.GetString();
+                SizeType i = 0;
+                while (i < len && s[i] != '#') // Find the first #
+                    i++;
+
+                if (i > 0) { // Remote reference, resolve immediately
+                    if (remoteProvider_) {
+                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i)) {
+                            PointerType pointer(&s[i], len - i, allocator_);
+                            if (pointer.IsValid()) {
+                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
+                                    if (schema)
+                                        *schema = sc;
+                                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(source, const_cast<SchemaType*>(sc), false, allocator_);
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (s[i] == '#') { // Local reference, defer resolution
+                    PointerType pointer(&s[i], len - i, allocator_);
+                    if (pointer.IsValid()) {
+                        if (const ValueType* nv = pointer.Get(document))
+                            if (HandleRefSchema(source, schema, *nv, document))
+                                return true;
+
+                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    const SchemaType* GetSchema(const PointerType& pointer) const {
+        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
+            if (pointer == target->pointer)
+                return target->schema;
+        return 0;
+    }
+
+    PointerType GetPointer(const SchemaType* schema) const {
+        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
+            if (schema == target->schema)
+                return target->pointer;
+        return PointerType();
+    }
+
+    const SchemaType* GetTypeless() const { return typeless_; }
+
+    static const size_t kInitialSchemaMapSize = 64;
+    static const size_t kInitialSchemaRefSize = 64;
+
+    IRemoteSchemaDocumentProviderType* remoteProvider_;
+    Allocator *allocator_;
+    Allocator *ownAllocator_;
+    const SchemaType* root_;                //!< Root schema.
+    SchemaType* typeless_;
+    internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
+    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
+    URIType uri_;
+};
+
+//! GenericSchemaDocument using Value type.
+typedef GenericSchemaDocument<Value> SchemaDocument;
+//! IGenericRemoteSchemaDocumentProvider using SchemaDocument.
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericSchemaValidator
+
+//! JSON Schema Validator.
+/*!
+    A SAX style JSON schema validator.
+    It uses a \c GenericSchemaDocument to validate SAX events.
+    It delegates the incoming SAX events to an output handler.
+    The default output handler does nothing.
+    It can be reused multiple times by calling \c Reset().
+
+    \tparam SchemaDocumentType Type of schema document.
+    \tparam OutputHandler Type of output handler. Default handler does nothing.
+    \tparam StateAllocator Allocator for storing the internal validation states.
+*/
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler = BaseReaderHandler<typename SchemaDocumentType::SchemaType::EncodingType>,
+    typename StateAllocator = CrtAllocator>
+class GenericSchemaValidator :
+    public internal::ISchemaStateFactory<typename SchemaDocumentType::SchemaType>, 
+    public internal::ISchemaValidator,
+    public internal::IValidationErrorHandler<typename SchemaDocumentType::SchemaType>
+{
+public:
+    typedef typename SchemaDocumentType::SchemaType SchemaType;
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename SchemaType::EncodingType EncodingType;
+    typedef typename SchemaType::SValue SValue;
+    typedef typename EncodingType::Ch Ch;
+    typedef GenericStringRef<Ch> StringRefType;
+    typedef GenericValue<EncodingType, StateAllocator> ValueType;
+
+    //! Constructor without output handler.
+    /*!
+        \param schemaDocument The schema document to conform to.
+        \param allocator Optional allocator for storing internal validation states.
+        \param schemaStackCapacity Optional initial capacity of schema path stack.
+        \param documentStackCapacity Optional initial capacity of document path stack.
+    */
+    GenericSchemaValidator(
+        const SchemaDocumentType& schemaDocument,
+        StateAllocator* allocator = 0, 
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(schemaDocument.GetRoot()),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        outputHandler_(0),
+        error_(kObjectType),
+        currentError_(),
+        missingDependents_(),
+        valid_(true)
+#if RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(0)
+#endif
+    {
+    }
+
+    //! Constructor with output handler.
+    /*!
+        \param schemaDocument The schema document to conform to.
+        \param allocator Optional allocator for storing internal validation states.
+        \param schemaStackCapacity Optional initial capacity of schema path stack.
+        \param documentStackCapacity Optional initial capacity of document path stack.
+    */
+    GenericSchemaValidator(
+        const SchemaDocumentType& schemaDocument,
+        OutputHandler& outputHandler,
+        StateAllocator* allocator = 0, 
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(schemaDocument.GetRoot()),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        outputHandler_(&outputHandler),
+        error_(kObjectType),
+        currentError_(),
+        missingDependents_(),
+        valid_(true)
+#if RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(0)
+#endif
+    {
+    }
+
+    //! Destructor.
+    ~GenericSchemaValidator() {
+        Reset();
+        RAPIDJSON_DELETE(ownStateAllocator_);
+    }
+
+    //! Reset the internal states.
+    void Reset() {
+        while (!schemaStack_.Empty())
+            PopSchema();
+        documentStack_.Clear();
+        error_.SetObject();
+        currentError_.SetNull();
+        missingDependents_.SetNull();
+        valid_ = true;
+    }
+
+    //! Checks whether the current state is valid.
+    // Implementation of ISchemaValidator
+    virtual bool IsValid() const { return valid_; }
+
+    //! Gets the error object.
+    ValueType& GetError() { return error_; }
+    const ValueType& GetError() const { return error_; }
+
+    //! Gets the JSON pointer pointed to the invalid schema.
+    PointerType GetInvalidSchemaPointer() const {
+        return schemaStack_.Empty() ? PointerType() : CurrentSchema().GetPointer();
+    }
+
+    //! Gets the keyword of invalid schema.
+    const Ch* GetInvalidSchemaKeyword() const {
+        return schemaStack_.Empty() ? 0 : CurrentContext().invalidKeyword;
+    }
+
+    //! Gets the JSON pointer pointed to the invalid value.
+    PointerType GetInvalidDocumentPointer() const {
+        if (documentStack_.Empty()) {
+            return PointerType();
+        }
+        else {
+            return PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
+        }
+    }
+
+    void NotMultipleOf(int64_t actual, const SValue& expected) {
+        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
+    }
+    void NotMultipleOf(uint64_t actual, const SValue& expected) {
+        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
+    }
+    void NotMultipleOf(double actual, const SValue& expected) {
+        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
+    }
+    void AboveMaximum(int64_t actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
+    }
+    void AboveMaximum(uint64_t actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
+    }
+    void AboveMaximum(double actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
+    }
+    void BelowMinimum(int64_t actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
+    }
+    void BelowMinimum(uint64_t actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
+    }
+    void BelowMinimum(double actual, const SValue& expected, bool exclusive) {
+        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
+            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
+    }
+
+    void TooLong(const Ch* str, SizeType length, SizeType expected) {
+        AddNumberError(SchemaType::GetMaxLengthString(),
+            ValueType(str, length, GetStateAllocator()).Move(), SValue(expected).Move());
+    }
+    void TooShort(const Ch* str, SizeType length, SizeType expected) {
+        AddNumberError(SchemaType::GetMinLengthString(),
+            ValueType(str, length, GetStateAllocator()).Move(), SValue(expected).Move());
+    }
+    void DoesNotMatch(const Ch* str, SizeType length) {
+        currentError_.SetObject();
+        currentError_.AddMember(GetActualString(), ValueType(str, length, GetStateAllocator()).Move(), GetStateAllocator());
+        AddCurrentError(SchemaType::GetPatternString());
+    }
+
+    void DisallowedItem(SizeType index) {
+        currentError_.SetObject();
+        currentError_.AddMember(GetDisallowedString(), ValueType(index).Move(), GetStateAllocator());
+        AddCurrentError(SchemaType::GetAdditionalItemsString(), true);
+    }
+    void TooFewItems(SizeType actualCount, SizeType expectedCount) {
+        AddNumberError(SchemaType::GetMinItemsString(),
+            ValueType(actualCount).Move(), SValue(expectedCount).Move());
+    }
+    void TooManyItems(SizeType actualCount, SizeType expectedCount) {
+        AddNumberError(SchemaType::GetMaxItemsString(),
+            ValueType(actualCount).Move(), SValue(expectedCount).Move());
+    }
+    void DuplicateItems(SizeType index1, SizeType index2) {
+        ValueType duplicates(kArrayType);
+        duplicates.PushBack(index1, GetStateAllocator());
+        duplicates.PushBack(index2, GetStateAllocator());
+        currentError_.SetObject();
+        currentError_.AddMember(GetDuplicatesString(), duplicates, GetStateAllocator());
+        AddCurrentError(SchemaType::GetUniqueItemsString(), true);
+    }
+
+    void TooManyProperties(SizeType actualCount, SizeType expectedCount) {
+        AddNumberError(SchemaType::GetMaxPropertiesString(),
+            ValueType(actualCount).Move(), SValue(expectedCount).Move());
+    }
+    void TooFewProperties(SizeType actualCount, SizeType expectedCount) {
+        AddNumberError(SchemaType::GetMinPropertiesString(),
+            ValueType(actualCount).Move(), SValue(expectedCount).Move());
+    }
+    void StartMissingProperties() {
+        currentError_.SetArray();
+    }
+    void AddMissingProperty(const SValue& name) {
+        currentError_.PushBack(ValueType(name, GetStateAllocator()).Move(), GetStateAllocator());
+    }
+    bool EndMissingProperties() {
+        if (currentError_.Empty())
+            return false;
+        ValueType error(kObjectType);
+        error.AddMember(GetMissingString(), currentError_, GetStateAllocator());
+        currentError_ = error;
+        AddCurrentError(SchemaType::GetRequiredString());
+        return true;
+    }
+    void PropertyViolations(ISchemaValidator** subvalidators, SizeType count) {
+        for (SizeType i = 0; i < count; ++i)
+            MergeError(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError());
+    }
+    void DisallowedProperty(const Ch* name, SizeType length) {
+        currentError_.SetObject();
+        currentError_.AddMember(GetDisallowedString(), ValueType(name, length, GetStateAllocator()).Move(), GetStateAllocator());
+        AddCurrentError(SchemaType::GetAdditionalPropertiesString(), true);
+    }
+
+    void StartDependencyErrors() {
+        currentError_.SetObject();
+    }
+    void StartMissingDependentProperties() {
+        missingDependents_.SetArray();
+    }
+    void AddMissingDependentProperty(const SValue& targetName) {
+        missingDependents_.PushBack(ValueType(targetName, GetStateAllocator()).Move(), GetStateAllocator());
+    }
+    void EndMissingDependentProperties(const SValue& sourceName) {
+        if (!missingDependents_.Empty())
+            currentError_.AddMember(ValueType(sourceName, GetStateAllocator()).Move(),
+                missingDependents_, GetStateAllocator());
+    }
+    void AddDependencySchemaError(const SValue& sourceName, ISchemaValidator* subvalidator) {
+        currentError_.AddMember(ValueType(sourceName, GetStateAllocator()).Move(),
+            static_cast<GenericSchemaValidator*>(subvalidator)->GetError(), GetStateAllocator());
+    }
+    bool EndDependencyErrors() {
+        if (currentError_.ObjectEmpty())
+            return false;
+        ValueType error(kObjectType);
+        error.AddMember(GetErrorsString(), currentError_, GetStateAllocator());
+        currentError_ = error;
+        AddCurrentError(SchemaType::GetDependenciesString());
+        return true;
+    }
+
+    void DisallowedValue() {
+        currentError_.SetObject();
+        AddCurrentError(SchemaType::GetEnumString());
+    }
+    void StartDisallowedType() {
+        currentError_.SetArray();
+    }
+    void AddExpectedType(const typename SchemaType::ValueType& expectedType) {
+        currentError_.PushBack(ValueType(expectedType, GetStateAllocator()).Move(), GetStateAllocator());
+    }
+    void EndDisallowedType(const typename SchemaType::ValueType& actualType) {
+        ValueType error(kObjectType);
+        error.AddMember(GetExpectedString(), currentError_, GetStateAllocator());
+        error.AddMember(GetActualString(), ValueType(actualType, GetStateAllocator()).Move(), GetStateAllocator());
+        currentError_ = error;
+        AddCurrentError(SchemaType::GetTypeString());
+    }
+    void NotAllOf(ISchemaValidator** subvalidators, SizeType count) {
+        for (SizeType i = 0; i < count; ++i) {
+            MergeError(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError());
+        }
+    }
+    void NoneOf(ISchemaValidator** subvalidators, SizeType count) {
+        AddErrorArray(SchemaType::GetAnyOfString(), subvalidators, count);
+    }
+    void NotOneOf(ISchemaValidator** subvalidators, SizeType count) {
+        AddErrorArray(SchemaType::GetOneOfString(), subvalidators, count);
+    }
+    void Disallowed() {
+        currentError_.SetObject();
+        AddCurrentError(SchemaType::GetNotString());
+    }
+
+#define RAPIDJSON_STRING_(name, ...) \
+    static const StringRefType& Get##name##String() {\
+        static const Ch s[] = { __VA_ARGS__, '\0' };\
+        static const StringRefType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1)); \
+        return v;\
+    }
+
+    RAPIDJSON_STRING_(InstanceRef, 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'R', 'e', 'f')
+    RAPIDJSON_STRING_(SchemaRef, 's', 'c', 'h', 'e', 'm', 'a', 'R', 'e', 'f')
+    RAPIDJSON_STRING_(Expected, 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd')
+    RAPIDJSON_STRING_(Actual, 'a', 'c', 't', 'u', 'a', 'l')
+    RAPIDJSON_STRING_(Disallowed, 'd', 'i', 's', 'a', 'l', 'l', 'o', 'w', 'e', 'd')
+    RAPIDJSON_STRING_(Missing, 'm', 'i', 's', 's', 'i', 'n', 'g')
+    RAPIDJSON_STRING_(Errors, 'e', 'r', 'r', 'o', 'r', 's')
+    RAPIDJSON_STRING_(Duplicates, 'd', 'u', 'p', 'l', 'i', 'c', 'a', 't', 'e', 's')
+
+#undef RAPIDJSON_STRING_
+
+#if RAPIDJSON_SCHEMA_VERBOSE
+#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
+RAPIDJSON_MULTILINEMACRO_BEGIN\
+    *documentStack_.template Push<Ch>() = '\0';\
+    documentStack_.template Pop<Ch>(1);\
+    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
+RAPIDJSON_MULTILINEMACRO_END
+#else
+#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
+#endif
+
+#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
+    if (!valid_) return false; \
+    if (!BeginValue() || !CurrentSchema().method arg1) {\
+        RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
+        return valid_ = false;\
+    }
+
+#define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
+    for (Context* context = schemaStack_.template Bottom<Context>(); context != schemaStack_.template End<Context>(); context++) {\
+        if (context->hasher)\
+            static_cast<HasherType*>(context->hasher)->method arg2;\
+        if (context->validators)\
+            for (SizeType i_ = 0; i_ < context->validatorCount; i_++)\
+                static_cast<GenericSchemaValidator*>(context->validators[i_])->method arg2;\
+        if (context->patternPropertiesValidators)\
+            for (SizeType i_ = 0; i_ < context->patternPropertiesValidatorCount; i_++)\
+                static_cast<GenericSchemaValidator*>(context->patternPropertiesValidators[i_])->method arg2;\
+    }
+
+#define RAPIDJSON_SCHEMA_HANDLE_END_(method, arg2)\
+    return valid_ = EndValue() && (!outputHandler_ || outputHandler_->method arg2)
+
+#define RAPIDJSON_SCHEMA_HANDLE_VALUE_(method, arg1, arg2) \
+    RAPIDJSON_SCHEMA_HANDLE_BEGIN_   (method, arg1);\
+    RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2);\
+    RAPIDJSON_SCHEMA_HANDLE_END_     (method, arg2)
+
+    bool Null()             { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Null,   (CurrentContext()), ( )); }
+    bool Bool(bool b)       { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Bool,   (CurrentContext(), b), (b)); }
+    bool Int(int i)         { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int,    (CurrentContext(), i), (i)); }
+    bool Uint(unsigned u)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint,   (CurrentContext(), u), (u)); }
+    bool Int64(int64_t i)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int64,  (CurrentContext(), i), (i)); }
+    bool Uint64(uint64_t u) { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint64, (CurrentContext(), u), (u)); }
+    bool Double(double d)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Double, (CurrentContext(), d), (d)); }
+    bool RawNumber(const Ch* str, SizeType length, bool copy)
+                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
+    bool String(const Ch* str, SizeType length, bool copy)
+                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
+
+    bool StartObject() {
+        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
+        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
+        return valid_ = !outputHandler_ || outputHandler_->StartObject();
+    }
+    
+    bool Key(const Ch* str, SizeType len, bool copy) {
+        if (!valid_) return false;
+        AppendToken(str, len);
+        if (!CurrentSchema().Key(CurrentContext(), str, len, copy)) return valid_ = false;
+        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
+        return valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+    }
+    
+    bool EndObject(SizeType memberCount) { 
+        if (!valid_) return false;
+        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
+        if (!CurrentSchema().EndObject(CurrentContext(), memberCount)) return valid_ = false;
+        RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
+    }
+
+    bool StartArray() {
+        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
+        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
+        return valid_ = !outputHandler_ || outputHandler_->StartArray();
+    }
+    
+    bool EndArray(SizeType elementCount) {
+        if (!valid_) return false;
+        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
+        if (!CurrentSchema().EndArray(CurrentContext(), elementCount)) return valid_ = false;
+        RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
+    }
+
+#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
+#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
+#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
+#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
+
+    // Implementation of ISchemaStateFactory<SchemaType>
+    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root) {
+        return new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root, documentStack_.template Bottom<char>(), documentStack_.GetSize(),
+#if RAPIDJSON_SCHEMA_VERBOSE
+        depth_ + 1,
+#endif
+        &GetStateAllocator());
+    }
+
+    virtual void DestroySchemaValidator(ISchemaValidator* validator) {
+        GenericSchemaValidator* v = static_cast<GenericSchemaValidator*>(validator);
+        v->~GenericSchemaValidator();
+        StateAllocator::Free(v);
+    }
+
+    virtual void* CreateHasher() {
+        return new (GetStateAllocator().Malloc(sizeof(HasherType))) HasherType(&GetStateAllocator());
+    }
+
+    virtual uint64_t GetHashCode(void* hasher) {
+        return static_cast<HasherType*>(hasher)->GetHashCode();
+    }
+
+    virtual void DestroryHasher(void* hasher) {
+        HasherType* h = static_cast<HasherType*>(hasher);
+        h->~HasherType();
+        StateAllocator::Free(h);
+    }
+
+    virtual void* MallocState(size_t size) {
+        return GetStateAllocator().Malloc(size);
+    }
+
+    virtual void FreeState(void* p) {
+        StateAllocator::Free(p);
+    }
+
+private:
+    typedef typename SchemaType::Context Context;
+    typedef GenericValue<UTF8<>, StateAllocator> HashCodeArray;
+    typedef internal::Hasher<EncodingType, StateAllocator> HasherType;
+
+    GenericSchemaValidator( 
+        const SchemaDocumentType& schemaDocument,
+        const SchemaType& root,
+        const char* basePath, size_t basePathSize,
+#if RAPIDJSON_SCHEMA_VERBOSE
+        unsigned depth,
+#endif
+        StateAllocator* allocator = 0,
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(root),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        outputHandler_(0),
+        error_(kObjectType),
+        currentError_(),
+        missingDependents_(),
+        valid_(true)
+#if RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(depth)
+#endif
+    {
+        if (basePath && basePathSize)
+            memcpy(documentStack_.template Push<char>(basePathSize), basePath, basePathSize);
+    }
+
+    StateAllocator& GetStateAllocator() {
+        if (!stateAllocator_)
+            stateAllocator_ = ownStateAllocator_ = RAPIDJSON_NEW(StateAllocator)();
+        return *stateAllocator_;
+    }
+
+    bool BeginValue() {
+        if (schemaStack_.Empty())
+            PushSchema(root_);
+        else {
+            if (CurrentContext().inArray)
+                internal::TokenHelper<internal::Stack<StateAllocator>, Ch>::AppendIndexToken(documentStack_, CurrentContext().arrayElementIndex);
+
+            if (!CurrentSchema().BeginValue(CurrentContext()))
+                return false;
+
+            SizeType count = CurrentContext().patternPropertiesSchemaCount;
+            const SchemaType** sa = CurrentContext().patternPropertiesSchemas;
+            typename Context::PatternValidatorType patternValidatorType = CurrentContext().valuePatternValidatorType;
+            bool valueUniqueness = CurrentContext().valueUniqueness;
+            RAPIDJSON_ASSERT(CurrentContext().valueSchema);
+            PushSchema(*CurrentContext().valueSchema);
+
+            if (count > 0) {
+                CurrentContext().objectPatternValidatorType = patternValidatorType;
+                ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
+                SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
+                va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
+                for (SizeType i = 0; i < count; i++)
+                    va[validatorCount++] = CreateSchemaValidator(*sa[i]);
+            }
+
+            CurrentContext().arrayUniqueness = valueUniqueness;
+        }
+        return true;
+    }
+
+    bool EndValue() {
+        if (!CurrentSchema().EndValue(CurrentContext()))
+            return false;
+
+#if RAPIDJSON_SCHEMA_VERBOSE
+        GenericStringBuffer<EncodingType> sb;
+        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
+
+        *documentStack_.template Push<Ch>() = '\0';
+        documentStack_.template Pop<Ch>(1);
+        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
+#endif
+
+        uint64_t h = CurrentContext().arrayUniqueness ? static_cast<HasherType*>(CurrentContext().hasher)->GetHashCode() : 0;
+        
+        PopSchema();
+
+        if (!schemaStack_.Empty()) {
+            Context& context = CurrentContext();
+            if (context.valueUniqueness) {
+                HashCodeArray* a = static_cast<HashCodeArray*>(context.arrayElementHashCodes);
+                if (!a)
+                    CurrentContext().arrayElementHashCodes = a = new (GetStateAllocator().Malloc(sizeof(HashCodeArray))) HashCodeArray(kArrayType);
+                for (typename HashCodeArray::ConstValueIterator itr = a->Begin(); itr != a->End(); ++itr)
+                    if (itr->GetUint64() == h) {
+                        DuplicateItems(static_cast<SizeType>(itr - a->Begin()), a->Size());
+                        RAPIDJSON_INVALID_KEYWORD_RETURN(SchemaType::GetUniqueItemsString());
+                    }
+                a->PushBack(h, GetStateAllocator());
+            }
+        }
+
+        // Remove the last token of document pointer
+        while (!documentStack_.Empty() && *documentStack_.template Pop<Ch>(1) != '/')
+            ;
+
+        return true;
+    }
+
+    void AppendToken(const Ch* str, SizeType len) {
+        documentStack_.template Reserve<Ch>(1 + len * 2); // worst case all characters are escaped as two characters
+        *documentStack_.template PushUnsafe<Ch>() = '/';
+        for (SizeType i = 0; i < len; i++) {
+            if (str[i] == '~') {
+                *documentStack_.template PushUnsafe<Ch>() = '~';
+                *documentStack_.template PushUnsafe<Ch>() = '0';
+            }
+            else if (str[i] == '/') {
+                *documentStack_.template PushUnsafe<Ch>() = '~';
+                *documentStack_.template PushUnsafe<Ch>() = '1';
+            }
+            else
+                *documentStack_.template PushUnsafe<Ch>() = str[i];
+        }
+    }
+
+    RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema); }
+    
+    RAPIDJSON_FORCEINLINE void PopSchema() {
+        Context* c = schemaStack_.template Pop<Context>(1);
+        if (HashCodeArray* a = static_cast<HashCodeArray*>(c->arrayElementHashCodes)) {
+            a->~HashCodeArray();
+            StateAllocator::Free(a);
+        }
+        c->~Context();
+    }
+
+    void AddErrorLocation(ValueType& result, bool parent) {
+        GenericStringBuffer<EncodingType> sb;
+        PointerType instancePointer = GetInvalidDocumentPointer();
+        ((parent && instancePointer.GetTokenCount() > 0)
+            ? PointerType(instancePointer.GetTokens(), instancePointer.GetTokenCount() - 1)
+            : instancePointer).StringifyUriFragment(sb);
+        ValueType instanceRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)),
+            GetStateAllocator());
+        result.AddMember(GetInstanceRefString(), instanceRef, GetStateAllocator());
+        sb.Clear();
+        memcpy(sb.Push(CurrentSchema().GetURI().GetStringLength()),
+            CurrentSchema().GetURI().GetString(),
+            CurrentSchema().GetURI().GetStringLength() * sizeof(Ch));
+        GetInvalidSchemaPointer().StringifyUriFragment(sb);
+        ValueType schemaRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)),
+            GetStateAllocator());
+        result.AddMember(GetSchemaRefString(), schemaRef, GetStateAllocator());
+    }
+
+    void AddError(ValueType& keyword, ValueType& error) {
+        typename ValueType::MemberIterator member = error_.FindMember(keyword);
+        if (member == error_.MemberEnd())
+            error_.AddMember(keyword, error, GetStateAllocator());
+        else {
+            if (member->value.IsObject()) {
+                ValueType errors(kArrayType);
+                errors.PushBack(member->value, GetStateAllocator());
+                member->value = errors;
+            }
+            member->value.PushBack(error, GetStateAllocator());
+        }
+    }
+
+    void AddCurrentError(const typename SchemaType::ValueType& keyword, bool parent = false) {
+        AddErrorLocation(currentError_, parent);
+        AddError(ValueType(keyword, GetStateAllocator(), false).Move(), currentError_);
+    }
+
+    void MergeError(ValueType& other) {
+        for (typename ValueType::MemberIterator it = other.MemberBegin(), end = other.MemberEnd(); it != end; ++it) {
+            AddError(it->name, it->value);
+        }
+    }
+
+    void AddNumberError(const typename SchemaType::ValueType& keyword, ValueType& actual, const SValue& expected,
+        const typename SchemaType::ValueType& (*exclusive)() = 0) {
+        currentError_.SetObject();
+        currentError_.AddMember(GetActualString(), actual, GetStateAllocator());
+        currentError_.AddMember(GetExpectedString(), ValueType(expected, GetStateAllocator()).Move(), GetStateAllocator());
+        if (exclusive)
+            currentError_.AddMember(ValueType(exclusive(), GetStateAllocator()).Move(), true, GetStateAllocator());
+        AddCurrentError(keyword);
+    }
+
+    void AddErrorArray(const typename SchemaType::ValueType& keyword,
+        ISchemaValidator** subvalidators, SizeType count) {
+        ValueType errors(kArrayType);
+        for (SizeType i = 0; i < count; ++i)
+            errors.PushBack(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError(), GetStateAllocator());
+        currentError_.SetObject();
+        currentError_.AddMember(GetErrorsString(), errors, GetStateAllocator());
+        AddCurrentError(keyword);
+    }
+
+    const SchemaType& CurrentSchema() const { return *schemaStack_.template Top<Context>()->schema; }
+    Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
+    const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
+
+    static const size_t kDefaultSchemaStackCapacity = 1024;
+    static const size_t kDefaultDocumentStackCapacity = 256;
+    const SchemaDocumentType* schemaDocument_;
+    const SchemaType& root_;
+    StateAllocator* stateAllocator_;
+    StateAllocator* ownStateAllocator_;
+    internal::Stack<StateAllocator> schemaStack_;    //!< stack to store the current path of schema (BaseSchemaType *)
+    internal::Stack<StateAllocator> documentStack_;  //!< stack to store the current path of validating document (Ch)
+    OutputHandler* outputHandler_;
+    ValueType error_;
+    ValueType currentError_;
+    ValueType missingDependents_;
+    bool valid_;
+#if RAPIDJSON_SCHEMA_VERBOSE
+    unsigned depth_;
+#endif
+};
+
+typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
+
+///////////////////////////////////////////////////////////////////////////////
+// SchemaValidatingReader
+
+//! A helper class for parsing with validation.
+/*!
+    This helper class is a functor, designed as a parameter of \ref GenericDocument::Populate().
+
+    \tparam parseFlags Combination of \ref ParseFlag.
+    \tparam InputStream Type of input stream, implementing Stream concept.
+    \tparam SourceEncoding Encoding of the input stream.
+    \tparam SchemaDocumentType Type of schema document.
+    \tparam StackAllocator Allocator type for stack.
+*/
+template <
+    unsigned parseFlags,
+    typename InputStream,
+    typename SourceEncoding,
+    typename SchemaDocumentType = SchemaDocument,
+    typename StackAllocator = CrtAllocator>
+class SchemaValidatingReader {
+public:
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename InputStream::Ch Ch;
+    typedef GenericValue<SourceEncoding, StackAllocator> ValueType;
+
+    //! Constructor
+    /*!
+        \param is Input stream.
+        \param sd Schema document.
+    */
+    SchemaValidatingReader(InputStream& is, const SchemaDocumentType& sd) : is_(is), sd_(sd), invalidSchemaKeyword_(), error_(kObjectType), isValid_(true) {}
+
+    template <typename Handler>
+    bool operator()(Handler& handler) {
+        GenericReader<SourceEncoding, typename SchemaDocumentType::EncodingType, StackAllocator> reader;
+        GenericSchemaValidator<SchemaDocumentType, Handler> validator(sd_, handler);
+        parseResult_ = reader.template Parse<parseFlags>(is_, validator);
+
+        isValid_ = validator.IsValid();
+        if (isValid_) {
+            invalidSchemaPointer_ = PointerType();
+            invalidSchemaKeyword_ = 0;
+            invalidDocumentPointer_ = PointerType();
+            error_.SetObject();
+        }
+        else {
+            invalidSchemaPointer_ = validator.GetInvalidSchemaPointer();
+            invalidSchemaKeyword_ = validator.GetInvalidSchemaKeyword();
+            invalidDocumentPointer_ = validator.GetInvalidDocumentPointer();
+            error_.CopyFrom(validator.GetError(), allocator_);
+        }
+
+        return parseResult_;
+    }
+
+    const ParseResult& GetParseResult() const { return parseResult_; }
+    bool IsValid() const { return isValid_; }
+    const PointerType& GetInvalidSchemaPointer() const { return invalidSchemaPointer_; }
+    const Ch* GetInvalidSchemaKeyword() const { return invalidSchemaKeyword_; }
+    const PointerType& GetInvalidDocumentPointer() const { return invalidDocumentPointer_; }
+    const ValueType& GetError() const { return error_; }
+
+private:
+    InputStream& is_;
+    const SchemaDocumentType& sd_;
+
+    ParseResult parseResult_;
+    PointerType invalidSchemaPointer_;
+    const Ch* invalidSchemaKeyword_;
+    PointerType invalidDocumentPointer_;
+    StackAllocator allocator_;
+    ValueType error_;
+    bool isValid_;
+};
+
+RAPIDJSON_NAMESPACE_END
+RAPIDJSON_DIAG_POP
+
+#endif // RAPIDJSON_SCHEMA_H_
diff --git a/extra/rapidjson/include/rapidjson/stream.h b/extra/rapidjson/include/rapidjson/stream.h
new file mode 100644
index 000000000000..7f2643e48142
--- /dev/null
+++ b/extra/rapidjson/include/rapidjson/stream.h
@@ -0,0 +1,223 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#include "rapidjson.h"
+
+#ifndef RAPIDJSON_STREAM_H_
+#define RAPIDJSON_STREAM_H_
+
+#include "encodings.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+//  Stream
+
+/*! \class rapidjson::Stream
+    \brief Concept for reading and writing characters.
+
+    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
+
+    For write-only stream, only need to implement Put() and Flush().
+
+\code
+concept Stream {
+    typename Ch;    //!< Character type of the stream.
+
+    //! Read the current character from stream without moving the read cursor.
+    Ch Peek() const;
+
+    //! Read the current character from stream and moving the read cursor to next character.
+    Ch Take();
+
+    //! Get the current read cursor.
+    //! \return Number of characters read from start.
+    size_t Tell();
+
+    //! Begin writing operation at the current read pointer.
+    //! \return The begin writer pointer.
+    Ch* PutBegin();
+
+    //! Write a character.
+    void Put(Ch c);
+
+    //! Flush the buffer.
+    void Flush();
+
+    //! End the writing operation.
+    //! \param begin The begin write pointer returned by PutBegin().
+    //! \return Number of characters written.
+    size_t PutEnd(Ch* begin);
+}
+\endcode
+*/
+
+//! Provides additional information for stream.
+/*!
+    By using traits pattern, this type provides a default configuration for stream.
+    For custom stream, this type can be specialized for other configuration.
+    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
+*/
+template<typename Stream>
+struct StreamTraits {
+    //! Whether to make local copy of stream for optimization during parsing.
+    /*!
+        By default, for safety, streams do not use local copy optimization.
+        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
+    */
+    enum { copyOptimization = 0 };
+};
+
+//! Reserve n characters for writing to a stream.
+template<typename Stream>
+inline void PutReserve(Stream& stream, size_t count) {
+    (void)stream;
+    (void)count;
+}
+
+//! Write character to a stream, presuming buffer is reserved.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c) {
+    stream.Put(c);
+}
+
+//! Put N copies of a character to a stream.
+template<typename Stream, typename Ch>
+inline void PutN(Stream& stream, Ch c, size_t n) {
+    PutReserve(stream, n);
+    for (size_t i = 0; i < n; i++)
+        PutUnsafe(stream, c);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericStreamWrapper
+
+//! A Stream Wrapper
+/*! \tThis string stream is a wrapper for any stream by just forwarding any
+    \treceived message to the origin stream.
+    \note implements Stream concept
+*/
+
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+RAPIDJSON_DIAG_OFF(4512)  // assignment operator could not be generated
+#endif
+
+template <typename InputStream, typename Encoding = UTF8<> >
+class GenericStreamWrapper {
+public:
+    typedef typename Encoding::Ch Ch;
+    GenericStreamWrapper(InputStream& is): is_(is) {}
+
+    Ch Peek() const { return is_.Peek(); }
+    Ch Take() { return is_.Take(); }
+    size_t Tell() { return is_.Tell(); }
+    Ch* PutBegin() { return is_.PutBegin(); }
+    void Put(Ch ch) { is_.Put(ch); }
+    void Flush() { is_.Flush(); }
+    size_t PutEnd(Ch* ch) { return is_.PutEnd(ch); }
+
+    // wrapper for MemoryStream
+    const Ch* Peek4() const { return is_.Peek4(); }
+
+    // wrapper for AutoUTFInputStream
+    UTFType GetType() const { return is_.GetType(); }
+    bool HasBOM() const { return is_.HasBOM(); }
+
+protected:
+    InputStream& is_;
+};
+
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+RAPIDJSON_DIAG_POP
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// StringStream
+
+//! Read-only string stream.
+/*! \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
+
+    Ch Peek() const { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    const Ch* src_;     //!< Current read position.
+    const Ch* head_;    //!< Original head of the string.
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! String stream with UTF8 encoding.
+typedef GenericStringStream<UTF8<> > StringStream;
+
+///////////////////////////////////////////////////////////////////////////////
+// InsituStringStream
+
+//! A read-write string stream.
+/*! This string stream is particularly designed for in-situ parsing.
+    \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericInsituStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
+
+    // Read
+    Ch Peek() { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() { return static_cast<size_t>(src_ - head_); }
+
+    // Write
+    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
+
+    Ch* PutBegin() { return dst_ = src_; }
+    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
+    void Flush() {}
+
+    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
+    void Pop(size_t count) { dst_ -= count; }
+
+    Ch* src_;
+    Ch* dst_;
+    Ch* head_;
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericInsituStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! Insitu string stream with UTF8 encoding.
+typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_STREAM_H_
diff --git a/extra/rapidjson/include/rapidjson/stringbuffer.h b/extra/rapidjson/include/rapidjson/stringbuffer.h
index 009a5181320c..4e38b82c3d98 100644
--- a/extra/rapidjson/include/rapidjson/stringbuffer.h
+++ b/extra/rapidjson/include/rapidjson/stringbuffer.h
@@ -1,27 +1,22 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_STRINGBUFFER_H_
 #define RAPIDJSON_STRINGBUFFER_H_
 
-#include "rapidjson.h"
+#include "stream.h"
+#include "internal/stack.h"
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
 #include <utility> // std::move
@@ -29,6 +24,11 @@
 
 #include "internal/stack.h"
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 //! Represents an in-memory output stream.
@@ -54,6 +54,7 @@ class GenericStringBuffer {
 #endif
 
     void Put(Ch c) { *stack_.template Push<Ch>() = c; }
+    void PutUnsafe(Ch c) { *stack_.template PushUnsafe<Ch>() = c; }
     void Flush() {}
 
     void Clear() { stack_.Clear(); }
@@ -63,7 +64,10 @@ class GenericStringBuffer {
         stack_.ShrinkToFit();
         stack_.template Pop<Ch>(1);
     }
+
+    void Reserve(size_t count) { stack_.template Reserve<Ch>(count); }
     Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
+    Ch* PushUnsafe(size_t count) { return stack_.template PushUnsafe<Ch>(count); }
     void Pop(size_t count) { stack_.template Pop<Ch>(count); }
 
     const Ch* GetString() const {
@@ -74,8 +78,12 @@ class GenericStringBuffer {
         return stack_.template Bottom<Ch>();
     }
 
+    //! Get the size of string in bytes in the string buffer.
     size_t GetSize() const { return stack_.GetSize(); }
 
+    //! Get the length of string in Ch in the string buffer.
+    size_t GetLength() const { return stack_.GetSize() / sizeof(Ch); }
+
     static const size_t kDefaultCapacity = 256;
     mutable internal::Stack<Allocator> stack_;
 
@@ -88,6 +96,16 @@ class GenericStringBuffer {
 //! String buffer with UTF8 encoding
 typedef GenericStringBuffer<UTF8<> > StringBuffer;
 
+template<typename Encoding, typename Allocator>
+inline void PutReserve(GenericStringBuffer<Encoding, Allocator>& stream, size_t count) {
+    stream.Reserve(count);
+}
+
+template<typename Encoding, typename Allocator>
+inline void PutUnsafe(GenericStringBuffer<Encoding, Allocator>& stream, typename Encoding::Ch c) {
+    stream.PutUnsafe(c);
+}
+
 //! Implement specialized version of PutN() with memset() for better performance.
 template<>
 inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
@@ -96,4 +114,8 @@ inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
 
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_STRINGBUFFER_H_
diff --git a/extra/rapidjson/include/rapidjson/writer.h b/extra/rapidjson/include/rapidjson/writer.h
index 66f6ef2eb1bb..0d093d4fa6ae 100644
--- a/extra/rapidjson/include/rapidjson/writer.h
+++ b/extra/rapidjson/include/rapidjson/writer.h
@@ -1,27 +1,23 @@
-// Copyright (C) 2011 Milo Yip
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+// http://opensource.org/licenses/MIT
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
 
 #ifndef RAPIDJSON_WRITER_H_
 #define RAPIDJSON_WRITER_H_
 
-#include "rapidjson.h"
+#include "stream.h"
+#include "internal/clzll.h"
+#include "internal/meta.h"
 #include "internal/stack.h"
 #include "internal/strfunc.h"
 #include "internal/dtoa.h"
@@ -29,17 +25,51 @@
 #include "stringbuffer.h"
 #include <new>      // placement new
 
-#if RAPIDJSON_HAS_STDSTRING
-#include <string>
+#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
+#include <intrin.h>
+#pragma intrinsic(_BitScanForward)
+#endif
+#ifdef RAPIDJSON_SSE42
+#include <nmmintrin.h>
+#elif defined(RAPIDJSON_SSE2)
+#include <emmintrin.h>
+#elif defined(RAPIDJSON_NEON)
+#include <arm_neon.h>
 #endif
 
-#ifdef _MSC_VER
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(unreachable-code)
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#elif defined(_MSC_VER)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
 #endif
 
 RAPIDJSON_NAMESPACE_BEGIN
 
+///////////////////////////////////////////////////////////////////////////////
+// WriteFlag
+
+/*! \def RAPIDJSON_WRITE_DEFAULT_FLAGS 
+    \ingroup RAPIDJSON_CONFIG
+    \brief User-defined kWriteDefaultFlags definition.
+
+    User can define this as any \c WriteFlag combinations.
+*/
+#ifndef RAPIDJSON_WRITE_DEFAULT_FLAGS
+#define RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNoFlags
+#endif
+
+//! Combination of writeFlags
+enum WriteFlag {
+    kWriteNoFlags = 0,              //!< No flags are set.
+    kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
+    kWriteNanAndInfFlag = 2,        //!< Allow writing of Infinity, -Infinity and NaN.
+    kWriteDefaultFlags = RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining RAPIDJSON_WRITE_DEFAULT_FLAGS
+};
+
 //! JSON writer
 /*! Writer implements the concept Handler.
     It generates JSON text by events to an output os.
@@ -56,11 +86,13 @@ RAPIDJSON_NAMESPACE_BEGIN
     \tparam StackAllocator Type of allocator for allocating memory of stack.
     \note implements Handler concept
 */
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
 class Writer {
 public:
     typedef typename SourceEncoding::Ch Ch;
 
+    static const int kDefaultMaxDecimalPlaces = 324;
+
     //! Constructor
     /*! \param os Output stream.
         \param stackAllocator User supplied allocator. If it is null, it will create a private one.
@@ -68,11 +100,18 @@ class Writer {
     */
     explicit
     Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
-        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
+        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
 
     explicit
     Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
-        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
+        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    Writer(Writer&& rhs) :
+        os_(rhs.os_), level_stack_(std::move(rhs.level_stack_)), maxDecimalPlaces_(rhs.maxDecimalPlaces_), hasRoot_(rhs.hasRoot_) {
+        rhs.os_ = 0;
+    }
+#endif
 
     //! Reset the writer with a new stream.
     /*!
@@ -106,34 +145,71 @@ class Writer {
         return hasRoot_ && level_stack_.Empty();
     }
 
+    int GetMaxDecimalPlaces() const {
+        return maxDecimalPlaces_;
+    }
+
+    //! Sets the maximum number of decimal places for double output.
+    /*!
+        This setting truncates the output with specified number of decimal places.
+
+        For example, 
+
+        \code
+        writer.SetMaxDecimalPlaces(3);
+        writer.StartArray();
+        writer.Double(0.12345);                 // "0.123"
+        writer.Double(0.0001);                  // "0.0"
+        writer.Double(1.234567890123456e30);    // "1.234567890123456e30" (do not truncate significand for positive exponent)
+        writer.Double(1.23e-4);                 // "0.0"                  (do truncate significand for negative exponent)
+        writer.EndArray();
+        \endcode
+
+        The default setting does not truncate any decimal places. You can restore to this setting by calling
+        \code
+        writer.SetMaxDecimalPlaces(Writer::kDefaultMaxDecimalPlaces);
+        \endcode
+    */
+    void SetMaxDecimalPlaces(int maxDecimalPlaces) {
+        maxDecimalPlaces_ = maxDecimalPlaces;
+    }
+
     /*!@name Implementation of Handler
         \see Handler
     */
     //@{
 
-    bool Null()                 { Prefix(kNullType);   return WriteNull(); }
-    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return WriteBool(b); }
-    bool Int(int i)             { Prefix(kNumberType); return WriteInt(i); }
-    bool Uint(unsigned u)       { Prefix(kNumberType); return WriteUint(u); }
-    bool Int64(int64_t i64)     { Prefix(kNumberType); return WriteInt64(i64); }
-    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return WriteUint64(u64); }
+    bool Null()                 { Prefix(kNullType);   return EndValue(WriteNull()); }
+    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return EndValue(WriteBool(b)); }
+    bool Int(int i)             { Prefix(kNumberType); return EndValue(WriteInt(i)); }
+    bool Uint(unsigned u)       { Prefix(kNumberType); return EndValue(WriteUint(u)); }
+    bool Int64(int64_t i64)     { Prefix(kNumberType); return EndValue(WriteInt64(i64)); }
+    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return EndValue(WriteUint64(u64)); }
 
     //! Writes the given \c double value to the stream
     /*!
         \param d The value to be written.
         \return Whether it is succeed.
     */
-    bool Double(double d, bool is_int = false)       { Prefix(kNumberType); return WriteDouble(d); }
+    bool Double(double d, bool is_int = false)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
+
+    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
+        (void)copy;
+        Prefix(kNumberType);
+        return EndValue(WriteString(str, length));
+    }
 
     bool String(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         Prefix(kStringType);
-        return WriteString(str, length);
+        return EndValue(WriteString(str, length));
     }
 
 #if RAPIDJSON_HAS_STDSTRING
     bool String(const std::basic_string<Ch>& str) {
-      return String(str.data(), SizeType(str.size()));
+        return String(str.data(), SizeType(str.size()));
     }
 #endif
 
@@ -144,16 +220,21 @@ class Writer {
     }
 
     bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-	
+
+#if RAPIDJSON_HAS_STDSTRING
+    bool Key(const std::basic_string<Ch>& str)
+    {
+      return Key(str.data(), SizeType(str.size()));
+    }
+#endif
+
     bool EndObject(SizeType memberCount = 0) {
         (void)memberCount;
-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
+        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level)); // not inside an Object
+        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray); // currently inside an Array, not Object
+        RAPIDJSON_ASSERT(0 == level_stack_.template Top<Level>()->valueCount % 2); // Object has a Key without a Value
         level_stack_.template Pop<Level>(1);
-        bool ret = WriteEndObject();
-        if (level_stack_.Empty())   // end of json text
-            os_->Flush();
-        return ret;
+        return EndValue(WriteEndObject());
     }
 
     bool StartArray() {
@@ -167,10 +248,7 @@ class Writer {
         RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
         RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
         level_stack_.template Pop<Level>(1);
-        bool ret = WriteEndArray();
-        if (level_stack_.Empty())   // end of json text
-            os_->Flush();
-        return ret;
+        return EndValue(WriteEndArray());
     }
     //@}
 
@@ -178,11 +256,33 @@ class Writer {
     //@{
 
     //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
+    bool String(const Ch* const& str) { return String(str, internal::StrLen(str)); }
+    bool Key(const Ch* const& str) { return Key(str, internal::StrLen(str)); }
+    
     //@}
 
+    //! Write a raw JSON value.
+    /*!
+        For user to write a stringified JSON as a value.
+
+        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
+        \param length Length of the json.
+        \param type Type of the root of json.
+    */
+    bool RawValue(const Ch* json, size_t length, Type type) {
+        RAPIDJSON_ASSERT(json != 0);
+        Prefix(type);
+        return EndValue(WriteRawValue(json, length));
+    }
+
+    //! Flush the output stream.
+    /*!
+        Allows the user to flush the output stream immediately.
+     */
+    void Flush() {
+        os_->Flush();
+    }
+
 protected:
     //! Information for each nested level
     struct Level {
@@ -194,15 +294,18 @@ class Writer {
     static const size_t kDefaultLevelDepth = 32;
 
     bool WriteNull()  {
-        os_->Put('n'); os_->Put('u'); os_->Put('l'); os_->Put('l'); return true;
+        PutReserve(*os_, 4);
+        PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
     }
 
     bool WriteBool(bool b)  {
         if (b) {
-            os_->Put('t'); os_->Put('r'); os_->Put('u'); os_->Put('e');
+            PutReserve(*os_, 4);
+            PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'r'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'e');
         }
         else {
-            os_->Put('f'); os_->Put('a'); os_->Put('l'); os_->Put('s'); os_->Put('e');
+            PutReserve(*os_, 5);
+            PutUnsafe(*os_, 'f'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 's'); PutUnsafe(*os_, 'e');
         }
         return true;
     }
@@ -210,45 +313,69 @@ class Writer {
     bool WriteInt(int i) {
         char buffer[11];
         const char* end = internal::i32toa(i, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
         for (const char* p = buffer; p != end; ++p)
-            os_->Put(*p);
+            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
         return true;
     }
 
     bool WriteUint(unsigned u) {
         char buffer[10];
         const char* end = internal::u32toa(u, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
         for (const char* p = buffer; p != end; ++p)
-            os_->Put(*p);
+            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
         return true;
     }
 
     bool WriteInt64(int64_t i64) {
         char buffer[21];
         const char* end = internal::i64toa(i64, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
         for (const char* p = buffer; p != end; ++p)
-            os_->Put(*p);
+            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
         return true;
     }
 
     bool WriteUint64(uint64_t u64) {
         char buffer[20];
         char* end = internal::u64toa(u64, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
         for (char* p = buffer; p != end; ++p)
-            os_->Put(*p);
+            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
         return true;
     }
 
     bool WriteDouble(double d) {
+        if (internal::Double(d).IsNanOrInf()) {
+            if (!(writeFlags & kWriteNanAndInfFlag))
+                return false;
+            if (internal::Double(d).IsNan()) {
+                PutReserve(*os_, 3);
+                PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
+                return true;
+            }
+            if (internal::Double(d).Sign()) {
+                PutReserve(*os_, 9);
+                PutUnsafe(*os_, '-');
+            }
+            else
+                PutReserve(*os_, 8);
+            PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
+            PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
+            return true;
+        }
+
         char buffer[25];
-        char* end = internal::dtoa(d, buffer);
+        char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
         for (char* p = buffer; p != end; ++p)
-            os_->Put(*p);
+            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
         return true;
     }
 
     bool WriteString(const Ch* str, SizeType length)  {
-        static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        static const typename OutputStream::Ch hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
         static const char escape[256] = {
 #define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
             //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
@@ -261,68 +388,91 @@ class Writer {
 #undef Z16
         };
 
-        os_->Put('\"');
+        if (TargetEncoding::supportUnicode)
+            PutReserve(*os_, 2 + length * 6); // "\uxxxx..."
+        else
+            PutReserve(*os_, 2 + length * 12);  // "\uxxxx\uyyyy..."
+
+        PutUnsafe(*os_, '\"');
         GenericStringStream<SourceEncoding> is(str);
-        while (is.Tell() < length) {
+        while (ScanWriteUnescapedString(is, length)) {
             const Ch c = is.Peek();
-            if (!TargetEncoding::supportUnicode && (unsigned)c >= 0x80) {
+            if (!TargetEncoding::supportUnicode && static_cast<unsigned>(c) >= 0x80) {
                 // Unicode escaping
                 unsigned codepoint;
-                if (!SourceEncoding::Decode(is, &codepoint))
+                if (RAPIDJSON_UNLIKELY(!SourceEncoding::Decode(is, &codepoint)))
                     return false;
-                os_->Put('\\');
-                os_->Put('u');
+                PutUnsafe(*os_, '\\');
+                PutUnsafe(*os_, 'u');
                 if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
-                    os_->Put(hexDigits[(codepoint >> 12) & 15]);
-                    os_->Put(hexDigits[(codepoint >>  8) & 15]);
-                    os_->Put(hexDigits[(codepoint >>  4) & 15]);
-                    os_->Put(hexDigits[(codepoint      ) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint      ) & 15]);
                 }
-                else if (codepoint >= 0x010000 && codepoint <= 0x10FFFF)    {
+                else {
+                    RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
                     // Surrogate pair
                     unsigned s = codepoint - 0x010000;
                     unsigned lead = (s >> 10) + 0xD800;
                     unsigned trail = (s & 0x3FF) + 0xDC00;
-                    os_->Put(hexDigits[(lead >> 12) & 15]);
-                    os_->Put(hexDigits[(lead >>  8) & 15]);
-                    os_->Put(hexDigits[(lead >>  4) & 15]);
-                    os_->Put(hexDigits[(lead      ) & 15]);
-                    os_->Put('\\');
-                    os_->Put('u');
-                    os_->Put(hexDigits[(trail >> 12) & 15]);
-                    os_->Put(hexDigits[(trail >>  8) & 15]);
-                    os_->Put(hexDigits[(trail >>  4) & 15]);
-                    os_->Put(hexDigits[(trail      ) & 15]);                    
+                    PutUnsafe(*os_, hexDigits[(lead >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead      ) & 15]);
+                    PutUnsafe(*os_, '\\');
+                    PutUnsafe(*os_, 'u');
+                    PutUnsafe(*os_, hexDigits[(trail >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail      ) & 15]);                    
                 }
-                else
-                    return false;   // invalid code point
             }
-            else if ((sizeof(Ch) == 1 || (unsigned)c < 256) && escape[(unsigned char)c])  {
+            else if ((sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256) && RAPIDJSON_UNLIKELY(escape[static_cast<unsigned char>(c)]))  {
                 is.Take();
-                os_->Put('\\');
-                os_->Put(escape[(unsigned char)c]);
-                if (escape[(unsigned char)c] == 'u') {
-                    os_->Put('0');
-                    os_->Put('0');
-                    os_->Put(hexDigits[(unsigned char)c >> 4]);
-                    os_->Put(hexDigits[(unsigned char)c & 0xF]);
+                PutUnsafe(*os_, '\\');
+                PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(escape[static_cast<unsigned char>(c)]));
+                if (escape[static_cast<unsigned char>(c)] == 'u') {
+                    PutUnsafe(*os_, '0');
+                    PutUnsafe(*os_, '0');
+                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) >> 4]);
+                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) & 0xF]);
                 }
             }
-            else
-                Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, *os_);
+            else if (RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
+                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
+                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
+                return false;
         }
-        os_->Put('\"');
+        PutUnsafe(*os_, '\"');
         return true;
     }
 
+    bool ScanWriteUnescapedString(GenericStringStream<SourceEncoding>& is, size_t length) {
+        return RAPIDJSON_LIKELY(is.Tell() < length);
+    }
+
     bool WriteStartObject() { os_->Put('{'); return true; }
     bool WriteEndObject()   { os_->Put('}'); return true; }
     bool WriteStartArray()  { os_->Put('['); return true; }
     bool WriteEndArray()    { os_->Put(']'); return true; }
 
+    bool WriteRawValue(const Ch* json, size_t length) {
+        PutReserve(*os_, length);
+        GenericStringStream<SourceEncoding> is(json);
+        while (RAPIDJSON_LIKELY(is.Tell() < length)) {
+            RAPIDJSON_ASSERT(is.Peek() != '\0');
+            if (RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
+                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
+                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
+                return false;
+        }
+        return true;
+    }
+
     void Prefix(Type type) {
         (void)type;
-        if (level_stack_.GetSize() != 0) { // this value is not at root
+        if (RAPIDJSON_LIKELY(level_stack_.GetSize() != 0)) { // this value is not at root
             Level* level = level_stack_.template Top<Level>();
             if (level->valueCount > 0) {
                 if (level->inArray) 
@@ -340,8 +490,16 @@ class Writer {
         }
     }
 
+    // Flush the value if it is the top level one.
+    bool EndValue(bool ret) {
+        if (RAPIDJSON_UNLIKELY(level_stack_.Empty()))   // end of json text
+            Flush();
+        return ret;
+    }
+
     OutputStream* os_;
     internal::Stack<StackAllocator> level_stack_;
+    int maxDecimalPlaces_;
     bool hasRoot_;
 
 private:
@@ -356,7 +514,7 @@ template<>
 inline bool Writer<StringBuffer>::WriteInt(int i) {
     char *buffer = os_->Push(11);
     const char* end = internal::i32toa(i, buffer);
-    os_->Pop(11 - (end - buffer));
+    os_->Pop(static_cast<size_t>(11 - (end - buffer)));
     return true;
 }
 
@@ -364,7 +522,7 @@ template<>
 inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
     char *buffer = os_->Push(10);
     const char* end = internal::u32toa(u, buffer);
-    os_->Pop(10 - (end - buffer));
+    os_->Pop(static_cast<size_t>(10 - (end - buffer)));
     return true;
 }
 
@@ -372,7 +530,7 @@ template<>
 inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
     char *buffer = os_->Push(21);
     const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(21 - (end - buffer));
+    os_->Pop(static_cast<size_t>(21 - (end - buffer)));
     return true;
 }
 
@@ -380,21 +538,172 @@ template<>
 inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
     char *buffer = os_->Push(20);
     const char* end = internal::u64toa(u, buffer);
-    os_->Pop(20 - (end - buffer));
+    os_->Pop(static_cast<size_t>(20 - (end - buffer)));
     return true;
 }
 
 template<>
 inline bool Writer<StringBuffer>::WriteDouble(double d) {
+    if (internal::Double(d).IsNanOrInf()) {
+        // Note: This code path can only be reached if (RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
+        if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
+            return false;
+        if (internal::Double(d).IsNan()) {
+            PutReserve(*os_, 3);
+            PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
+            return true;
+        }
+        if (internal::Double(d).Sign()) {
+            PutReserve(*os_, 9);
+            PutUnsafe(*os_, '-');
+        }
+        else
+            PutReserve(*os_, 8);
+        PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
+        PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
+        return true;
+    }
+    
     char *buffer = os_->Push(25);
-    char* end = internal::dtoa(d, buffer);
-    os_->Pop(25 - (end - buffer));
+    char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
+    os_->Pop(static_cast<size_t>(25 - (end - buffer)));
     return true;
 }
 
+#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
+template<>
+inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
+    if (length < 16)
+        return RAPIDJSON_LIKELY(is.Tell() < length);
+
+    if (!RAPIDJSON_LIKELY(is.Tell() < length))
+        return false;
+
+    const char* p = is.src_;
+    const char* end = is.head_ + length;
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
+    if (nextAligned > end)
+        return true;
+
+    while (p != nextAligned)
+        if (*p < 0x20 || *p == '\"' || *p == '\\') {
+            is.src_ = p;
+            return RAPIDJSON_LIKELY(is.Tell() < length);
+        }
+        else
+            os_->PutUnsafe(*p++);
+
+    // The rest of string using SIMD
+    static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+    static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+    static const char space[16]  = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
+    const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+    const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+    const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+    for (; p != endAligned; p += 16) {
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+        const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+        const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
+        const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+        unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+        if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+            SizeType len;
+#ifdef _MSC_VER         // Find the index of first escaped
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            len = offset;
+#else
+            len = static_cast<SizeType>(__builtin_ffs(r) - 1);
+#endif
+            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
+            for (size_t i = 0; i < len; i++)
+                q[i] = p[i];
+
+            p += len;
+            break;
+        }
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(os_->PushUnsafe(16)), s);
+    }
+
+    is.src_ = p;
+    return RAPIDJSON_LIKELY(is.Tell() < length);
+}
+#elif defined(RAPIDJSON_NEON)
+template<>
+inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
+    if (length < 16)
+        return RAPIDJSON_LIKELY(is.Tell() < length);
+
+    if (!RAPIDJSON_LIKELY(is.Tell() < length))
+        return false;
+
+    const char* p = is.src_;
+    const char* end = is.head_ + length;
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
+    if (nextAligned > end)
+        return true;
+
+    while (p != nextAligned)
+        if (*p < 0x20 || *p == '\"' || *p == '\\') {
+            is.src_ = p;
+            return RAPIDJSON_LIKELY(is.Tell() < length);
+        }
+        else
+            os_->PutUnsafe(*p++);
+
+    // The rest of string using SIMD
+    const uint8x16_t s0 = vmovq_n_u8('"');
+    const uint8x16_t s1 = vmovq_n_u8('\\');
+    const uint8x16_t s2 = vmovq_n_u8('\b');
+    const uint8x16_t s3 = vmovq_n_u8(32);
+
+    for (; p != endAligned; p += 16) {
+        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
+        uint8x16_t x = vceqq_u8(s, s0);
+        x = vorrq_u8(x, vceqq_u8(s, s1));
+        x = vorrq_u8(x, vceqq_u8(s, s2));
+        x = vorrq_u8(x, vcltq_u8(s, s3));
+
+        x = vrev64q_u8(x);                     // Rev in 64
+        uint64_t low = vgetq_lane_u64(vreinterpretq_u64_u8(x), 0);   // extract
+        uint64_t high = vgetq_lane_u64(vreinterpretq_u64_u8(x), 1);  // extract
+
+        SizeType len = 0;
+        bool escaped = false;
+        if (low == 0) {
+            if (high != 0) {
+                uint32_t lz = RAPIDJSON_CLZLL(high);
+                len = 8 + (lz >> 3);
+                escaped = true;
+            }
+        } else {
+            uint32_t lz = RAPIDJSON_CLZLL(low);
+            len = lz >> 3;
+            escaped = true;
+        }
+        if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
+            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
+            for (size_t i = 0; i < len; i++)
+                q[i] = p[i];
+
+            p += len;
+            break;
+        }
+        vst1q_u8(reinterpret_cast<uint8_t *>(os_->PushUnsafe(16)), s);
+    }
+
+    is.src_ = p;
+    return RAPIDJSON_LIKELY(is.Tell() < length);
+}
+#endif // RAPIDJSON_NEON
+
 RAPIDJSON_NAMESPACE_END
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__clang__)
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/extra/rapidjson/license.txt b/extra/rapidjson/license.txt
deleted file mode 100644
index 03d97d163edb..000000000000
--- a/extra/rapidjson/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011 Milo Yip
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/extra/rapidjson/readme.md b/extra/rapidjson/readme.md
deleted file mode 100644
index 72abc8bcdccc..000000000000
--- a/extra/rapidjson/readme.md
+++ /dev/null
@@ -1,119 +0,0 @@
-![](doc/logo/rapidjson.png)
-## A fast JSON parser/generator for C++ with both SAX/DOM style API 
-
-Copyright (c) 2011-2014 Milo Yip (miloyip@gmail.com)
-
-* [RapidJSON GitHub](https://github.com/miloyip/rapidjson/)
-* [RapidJSON Documentation](http://miloyip.github.io/rapidjson/)
-
-## Build status
-
-| [Linux][lin-link] | [Windows][win-link] |
-| :---------------: | :-----------------: |
-| ![lin-badge]      | ![win-badge]        |
-
-[lin-badge]: https://travis-ci.org/miloyip/rapidjson.png "Travis build status"
-[lin-link]:  https://travis-ci.org/miloyip/rapidjson "Travis build status"
-[win-badge]: https://ci.appveyor.com/api/projects/status/u658dcuwxo14a8m9/branch/master?svg=true "AppVeyor build status"
-[win-link]:  https://ci.appveyor.com/project/miloyip/rapidjson/branch/master "AppVeyor build status"
-
-## Introduction
-
-RapidJSON is a JSON parser and generator for C++. It was inspired by [RapidXml](http://rapidxml.sourceforge.net/).
-
-* RapidJSON is small but complete. It supports both SAX and DOM style API. The SAX parser is only a half thousand lines of code.
-
-* RapidJSON is fast. Its performance can be comparable to `strlen()`. It also optionally supports SSE2/SSE4.1 for acceleration.
-
-* RapidJSON is self-contained. It does not depend on external libraries such as BOOST. It even does not depend on STL.
-
-* RapidJSON is memory friendly. Each JSON value occupies exactly 16/20 bytes for most 32/64-bit machines (excluding text string). By default it uses a fast memory allocator, and the parser allocates memory compactly during parsing.
-
-* RapidJSON is Unicode friendly. It supports UTF-8, UTF-16, UTF-32 (LE & BE), and their detection, validation and transcoding internally. For example, you can read a UTF-8 file and let RapidJSON transcode the JSON strings into UTF-16 in the DOM. It also supports surrogates and "\u0000" (null character).
-
-More features can be read [here](doc/features.md).
-
-JSON(JavaScript Object Notation) is a light-weight data exchange format. RapidJSON should be in fully compliance with RFC7159/ECMA-404. More information about JSON can be obtained at
-* [Introducing JSON](http://json.org/)
-* [RFC7159: The JavaScript Object Notation (JSON) Data Interchange Format](http://www.ietf.org/rfc/rfc7159.txt)
-* [Standard ECMA-404: The JSON Data Interchange Format](http://www.ecma-international.org/publications/standards/Ecma-404.htm)
-
-## Compatibility
-
-RapidJSON is cross-platform. Some platform/compiler combinations which have been tested are shown as follows.
-* Visual C++ 2008/2010/2013 on Windows (32/64-bit)
-* GNU C++ 3.8.x on Cygwin
-* Clang 3.4 on Mac OS X (32/64-bit) and iOS
-* Clang 3.4 on Android NDK
-
-Users can build and run the unit tests on their platform/compiler.
-
-## Installation
-
-RapidJSON is a header-only C++ library. Just copy the `include/rapidjson` folder to system or project's include path.
-
-RapidJSON uses following software as its dependencies:
-* [CMake](http://www.cmake.org) as a general build tool
-* (optional)[Doxygen](http://www.doxygen.org) to build documentation
-* (optional)[googletest](https://code.google.com/p/googletest/) for unit and performance testing
-
-To generate user documentation and run tests please proceed with the steps below:
-
-1. Execute `git submodule update --init` to get the files of thirdparty submodules (google test).
-2. Create directory called `build` in rapidjson source directory.
-3. Change to `build` directory and run `cmake ..` command to configure your build. Windows users can do the same with cmake-gui application.
-4. On Windows, build the solution found in the build directory. On Linux, run `make` from the build directory.
-
-On successfull build you will find compiled test and example binaries in `bin`
-directory. The generated documentation will be available in `doc/html`
-directory of the build tree. To run tests after finished build please run `make
-test` or `ctest` from your build tree. You can get detailed output using `ctest
--V` command.
-
-It is possible to install library system-wide by running `make install` command
-from the build tree with administrative privileges. This will install all files
-according to system preferences.  Once RapidJSON is installed, it is possible
-to use it from other CMake projects by adding `find_package(RapidJSON)` line to
-your CMakeLists.txt.
-
-## Usage at a glance
-
-This simple example parses a JSON string into a document (DOM), make a simple modification of the DOM, and finally stringify the DOM to a JSON string.
-
-~~~~~~~~~~cpp
-// rapidjson/example/simpledom/simpledom.cpp`
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-
-int main() {
-    // 1. Parse a JSON string into DOM.
-    const char* json = "{\"project\":\"rapidjson\",\"stars\":10}";
-    Document d;
-    d.Parse(json);
-
-    // 2. Modify it by DOM.
-    Value& s = d["stars"];
-    s.SetInt(s.GetInt() + 1);
-
-    // 3. Stringify the DOM
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    d.Accept(writer);
-
-    // Output {"project":"rapidjson","stars":11}
-    std::cout << buffer.GetString() << std::endl;
-    return 0;
-}
-~~~~~~~~~~
-
-Note that this example did not handle potential errors.
-
-The following diagram shows the process.
-
-![simpledom](doc/diagram/simpledom.png)
-
-More [examples](https://github.com/miloyip/rapidjson/tree/master/example) are available.
diff --git a/extra/rapidjson/test/CMakeLists.txt b/extra/rapidjson/test/CMakeLists.txt
deleted file mode 100644
index c698af4fe3fa..000000000000
--- a/extra/rapidjson/test/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-find_package(GTestSrc)
-
-IF(GTESTSRC_FOUND)
-    enable_testing()
-
-    if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
-        set(gtest_disable_pthreads ON)
-        set(gtest_force_shared_crt ON)
-    endif()
-
-    add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
-    include_directories(${GTEST_INCLUDE_DIR})
-
-    set(TEST_LIBRARIES gtest gtest_main)
-
-    add_custom_target(tests ALL)
-    add_subdirectory(perftest)
-    add_subdirectory(unittest)
-
-ENDIF(GTESTSRC_FOUND)
diff --git a/extra/rapidjson/test/perftest/CMakeLists.txt b/extra/rapidjson/test/perftest/CMakeLists.txt
deleted file mode 100644
index 4121bf9fa4b5..000000000000
--- a/extra/rapidjson/test/perftest/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(PERFTEST_SOURCES
-    misctest.cpp
-    perftest.cpp
-    platformtest.cpp
-    rapidjsontest.cpp)
-
-add_executable(perftest ${PERFTEST_SOURCES})
-target_link_libraries(perftest ${TEST_LIBRARIES})
-
-add_dependencies(tests perftest)
-
-IF(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug"))
-add_test(NAME perftest
-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perftest
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-ENDIF()
diff --git a/extra/rapidjson/test/perftest/misctest.cpp b/extra/rapidjson/test/perftest/misctest.cpp
deleted file mode 100644
index 6cae7e9119bd..000000000000
--- a/extra/rapidjson/test/perftest/misctest.cpp
+++ /dev/null
@@ -1,980 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "perftest.h"
-
-#if TEST_MISC
-
-#define __STDC_FORMAT_MACROS
-#include "rapidjson/stringbuffer.h"
-
-#define protected public
-#include "rapidjson/writer.h"
-#undef private
-
-class Misc : public PerfTest {
-};
-
-// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#define UTF8_ACCEPT 0
-#define UTF8_REJECT 12
-
-static const unsigned char utf8d[] = {
-    // The first part of the table maps bytes to character classes that
-    // to reduce the size of the transition table and create bitmasks.
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-
-    // The second part is a transition table that maps a combination
-    // of a state of the automaton and a character class to a state.
-    0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-    12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-    12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-    12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-    12,36,12,12,12,12,12,12,12,12,12,12, 
-};
-
-static unsigned inline decode(unsigned* state, unsigned* codep, unsigned byte) {
-    unsigned type = utf8d[byte];
-
-    *codep = (*state != UTF8_ACCEPT) ?
-        (byte & 0x3fu) | (*codep << 6) :
-    (0xff >> type) & (byte);
-
-    *state = utf8d[256 + *state + type];
-    return *state;
-}
-
-static bool IsUTF8(unsigned char* s) {
-    unsigned codepoint, state = 0;
-
-    while (*s)
-        decode(&state, &codepoint, *s++);
-
-    return state == UTF8_ACCEPT;
-}
-
-TEST_F(Misc, Hoehrmann_IsUTF8) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        EXPECT_TRUE(IsUTF8((unsigned char*)json_));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// CountDecimalDigit: Count number of decimal places
-
-inline unsigned CountDecimalDigit_naive(unsigned n) {
-    unsigned count = 1;
-    while (n >= 10) {
-        n /= 10;
-        count++;
-    }
-    return count;
-}
-
-inline unsigned CountDecimalDigit_enroll4(unsigned n) {
-    unsigned count = 1;
-    while (n >= 10000) {
-        n /= 10000u;
-        count += 4;
-    }
-    if (n < 10) return count;
-    if (n < 100) return count + 1;
-    if (n < 1000) return count + 2;
-    return count + 3;
-}
-
-inline unsigned CountDecimalDigit64_enroll4(uint64_t n) {
-    unsigned count = 1;
-    while (n >= 10000) {
-        n /= 10000u;
-        count += 4;
-    }
-    if (n < 10) return count;
-    if (n < 100) return count + 1;
-    if (n < 1000) return count + 2;
-    return count + 3;
-}
-
-inline unsigned CountDecimalDigit_fast(unsigned n) {
-    static const uint32_t powers_of_10[] = {
-        0,
-        10,
-        100,
-        1000,
-        10000,
-        100000,
-        1000000,
-        10000000,
-        100000000,
-        1000000000
-    };
-
-#if defined(_M_IX86) || defined(_M_X64)
-    unsigned long i = 0;
-    _BitScanReverse(&i, n | 1);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(__GNUC__)
-    uint32_t t = (32 - __builtin_clz(n | 1)) * 1233 >> 12;
-#else
-#error
-#endif
-    return t - (n < powers_of_10[t]) + 1;
-}
-
-inline unsigned CountDecimalDigit64_fast(uint64_t n) {
-    static const uint64_t powers_of_10[] = {
-        0,
-        10,
-        100,
-        1000,
-        10000,
-        100000,
-        1000000,
-        10000000,
-        100000000,
-        1000000000,
-        10000000000,
-        100000000000,
-        1000000000000,
-        10000000000000,
-        100000000000000,
-        1000000000000000,
-        10000000000000000,
-        100000000000000000,
-        1000000000000000000,
-        10000000000000000000U
-    };
-
-#if defined(_M_IX86)
-    uint64_t m = n | 1;
-    unsigned long i = 0;
-    if (_BitScanReverse(&i, m >> 32))
-        i += 32;
-    else
-        _BitScanReverse(&i, m & 0xFFFFFFFF);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(_M_X64)
-    unsigned long i = 0;
-    _BitScanReverse64(&i, n | 1);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(__GNUC__)
-    uint32_t t = (64 - __builtin_clzll(n | 1)) * 1233 >> 12;
-#else
-#error
-#endif
-
-    return t - (n < powers_of_10[t]) + 1;
-}
-
-#if 0
-// Exhaustive, very slow
-TEST_F(Misc, CountDecimalDigit_Verify) {
-    unsigned i = 0;
-    do {
-        if (i % (65536 * 256) == 0)
-            printf("%u\n", i);
-        ASSERT_EQ(CountDecimalDigit_enroll4(i), CountDecimalDigit_fast(i));
-        i++;
-    } while (i != 0);
-}
-
-static const unsigned kDigits10Trial = 1000000000u;
-TEST_F(Misc, CountDecimalDigit_naive) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_naive(i);
-    printf("%u\n", sum);
-}
-
-TEST_F(Misc, CountDecimalDigit_enroll4) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_enroll4(i);
-    printf("%u\n", sum);
-}
-
-TEST_F(Misc, CountDecimalDigit_fast) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_fast(i);
-    printf("%u\n", sum);
-}
-#endif
-
-TEST_F(Misc, CountDecimalDigit64_VerifyFast) {
-    uint64_t i = 1, j;
-    do {
-        //printf("%" PRIu64 "\n", i);
-        ASSERT_EQ(CountDecimalDigit64_enroll4(i), CountDecimalDigit64_fast(i));
-        j = i;
-        i *= 3;
-    } while (j < i);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// integer-to-string conversion
-
-// https://gist.github.com/anonymous/7179097
-static const int randval[] ={
-     936116,  369532,  453755,  -72860,  209713,  268347,  435278, -360266, -416287, -182064,
-    -644712,  944969,  640463, -366588,  471577,  -69401, -744294, -505829,  923883,  831785,
-    -601136, -636767, -437054,  591718,  100758,  231907, -719038,  973540, -605220,  506659,
-    -871653,  462533,  764843, -919138,  404305, -630931, -288711, -751454, -173726, -718208,
-     432689, -281157,  360737,  659827,   19174, -376450,  769984, -858198,  439127,  734703,
-    -683426,       7,  386135,  186997, -643900, -744422, -604708, -629545,   42313, -933592,
-    -635566,  182308,  439024, -367219,  -73924, -516649,  421935, -470515,  413507,  -78952,
-    -427917, -561158,  737176,   94538,  572322,  405217,  709266, -357278, -908099, -425447,
-     601119,  750712, -862285, -177869,  900102,  384877,  157859, -641680,  503738, -702558,
-     278225,  463290,  268378, -212840,  580090,  347346, -473985, -950968, -114547, -839893,
-    -738032, -789424,  409540,  493495,  432099,  119755,  905004, -174834,  338266,  234298,
-      74641, -965136, -754593,  685273,  466924,  920560,  385062,  796402,  -67229,  994864,
-     376974,  299869, -647540, -128724,  469890, -163167, -547803, -743363,  486463, -621028,
-     612288,   27459, -514224,  126342,  -66612,  803409, -777155, -336453, -284002,  472451,
-     342390, -163630,  908356, -456147, -825607,  268092, -974715,  287227,  227890, -524101,
-     616370, -782456,  922098, -624001, -813690,  171605, -192962,  796151,  707183,  -95696,
-     -23163, -721260,  508892,  430715,  791331,  482048, -996102,  863274,  275406,   -8279,
-    -556239, -902076,  268647, -818565,  260069, -798232, -172924, -566311, -806503, -885992,
-     813969,  -78468,  956632,  304288,  494867, -508784,  381751,  151264,  762953,   76352,
-     594902,  375424,  271700, -743062,  390176,  924237,  772574,  676610,  435752, -153847,
-       3959, -971937, -294181, -538049, -344620, -170136,   19120, -703157,  868152, -657961,
-    -818631,  219015, -872729, -940001, -956570,  880727, -345910,  942913, -942271, -788115,
-     225294,  701108, -517736, -416071,  281940,  488730,  942698,  711494,  838382, -892302,
-    -533028,  103052,  528823,  901515,  949577,  159364,  718227, -241814, -733661, -462928,
-    -495829,  165170,  513580, -629188, -509571, -459083,  198437,   77198, -644612,  811276,
-    -422298, -860842,  -52584,  920369,  686424, -530667, -243476,   49763,  345866, -411960,
-    -114863,  470810, -302860,  683007, -509080,       2, -174981, -772163,  -48697,  447770,
-    -268246,  213268,  269215,   78810, -236340, -639140, -864323,  505113, -986569, -325215,
-     541859,  163070, -819998, -645161, -583336,  573414,  696417, -132375,       3, -294501,
-     320435,  682591,  840008,  351740,  426951,  609354,  898154, -943254,  227321, -859793,
-    -727993,   44137, -497965, -782239,   14955, -746080, -243366,    9837, -233083,  606507,
-    -995864, -615287, -994307,  602715,  770771, -315040,  610860,  446102, -307120,  710728,
-    -590392, -230474, -762625, -637525,  134963, -202700, -766902, -985541,  218163,  682009,
-     926051,  525156,  -61195,  403211, -810098,  245539, -431733,  179998, -806533,  745943,
-     447597,  131973, -187130,  826019,  286107, -937230, -577419,   20254,  681802, -340500,
-     323080,  266283, -667617,  309656,  416386,  611863,  759991, -534257,  523112, -634892,
-    -169913, -204905, -909867, -882185, -944908,  741811, -717675,  967007, -317396,  407230,
-    -412805,  792905,  994873,  744793, -456797,  713493,  355232,  116900, -945199,  880539,
-     342505, -580824, -262273,  982968, -349497, -735488,  311767, -455191,  570918,  389734,
-    -958386,   10262,  -99267,  155481,  304210,  204724,  704367, -144893, -233664, -671441,
-     896849,  408613,  762236,  322697,  981321,  688476,   13663, -970704, -379507,  896412,
-     977084,  348869,  875948,  341348,  318710,  512081,    6163,  669044,  833295,  811883,
-     708756, -802534, -536057,  608413, -389625, -694603,  541106, -110037,  720322, -540581,
-     645420,   32980,   62442,  510157, -981870,  -87093, -325960, -500494, -718291,  -67889,
-     991501,  374804,  769026, -978869,  294747,  714623,  413327, -199164,  671368,  804789,
-    -362507,  798196, -170790, -568895, -869379,   62020, -316693, -837793,  644994,  -39341,
-    -417504, -243068, -957756,   99072,  622234, -739992,  225668,    8863, -505910,   82483,
-    -559244,  241572,    1315,  -36175,  -54990,  376813,     -11,  162647, -688204, -486163,
-     -54934, -197470,  744223, -762707,  732540,  996618,  351561, -445933, -898491,  486531,
-     456151,   15276,  290186, -817110,  -52995,  313046, -452533,  -96267,   94470, -500176,
-    -818026, -398071, -810548, -143325, -819741,    1338, -897676, -101577, -855445,   37309,
-     285742,  953804, -777927, -926962, -811217, -936744, -952245, -802300, -490188, -964953,
-    -552279,  329142, -570048, -505756,  682898, -381089,  -14352,  175138,  152390, -582268,
-    -485137,  717035,  805329,  239572, -730409,  209643, -184403, -385864,  675086,  819648,
-     629058, -527109, -488666, -171981,  532788,  552441,  174666,  984921,  766514,  758787,
-     716309,  338801, -978004, -412163,  876079, -734212,  789557, -160491, -522719,   56644,
-       -991, -286038,  -53983,  663740,  809812,  919889, -717502, -137704,  220511,  184396,
-    -825740, -588447,  430870,  124309,  135956,  558662, -307087, -788055, -451328,  812260,
-     931601,  324347, -482989, -117858, -278861,  189068, -172774,  929057,  293787,  198161,
-    -342386,  -47173,  906555, -759955,  -12779,  777604,  -97869,  899320,  927486,  -25284,
-    -848550,  259450, -485856,  -17820,      88,  171400,  235492, -326783, -340793,  886886,
-     112428, -246280,    5979,  648444, -114982,  991013,  -56489,   -9497,  419706,  632820,
-    -341664,  393926, -848977,  -22538,  257307,  773731, -905319,  491153,  734883, -868212,
-    -951053,  644458, -580758,  764735,  584316,  297077,   28852, -397710, -953669,  201772,
-     879050, -198237, -588468,  448102, -116837,  770007, -231812,  642906, -582166, -885828,
-          9,  305082, -996577,  303559,   75008, -772956, -447960,  599825, -295552,  870739,
-    -386278, -950300,  485359, -457081,  629461, -850276,  550496, -451755, -620841,  -11766,
-    -950137,  832337,   28711, -273398, -507197,   91921, -271360, -705991, -753220, -388968,
-     967945,  340434, -320883, -662793, -554617, -574568,  477946,   -6148, -129519,  689217,
-     920020, -656315, -974523, -212525,   80921, -612532,  645096,  545655,  655713, -591631,
-    -307385, -816688, -618823, -113713,  526430,  673063,  735916, -809095, -850417,  639004,
-     432281, -388185,  270708,  860146,  -39902, -786157, -258180, -246169, -966720, -264957,
-     548072, -306010,  -57367, -635665,  933824,   70553, -989936, -488741,   72411, -452509,
-     529831,  956277,  449019, -577850, -360986, -803418,   48833,  296073,  203430,  609591,
-     715483,  470964,  658106, -718254,  -96424,  790163,  334739,  181070, -373578,       5,
-    -435088,  329841,  330939, -256602,  394355,  912412,  231910,  927278, -661933,  788539,
-    -769664, -893274,  -96856,  298205,  901043, -608122, -527430,  183618, -553963,  -35246,
-    -393924,  948832, -483198,  594501,   35460, -407007,   93494, -336881, -634072,  984205,
-    -812161,  944664,  -31062,  753872,  823933,  -69566,   50445,  290147,   85134,   34706,
-     551902,  405202, -991246,  -84642,  154341,  316432, -695101, -651588,   -5030,  137564,
-    -294665,  332541,  528307,  -90572, -344923,  523766, -758498, -968047,  339028,  494578,
-     593129, -725773,   31834, -718406, -208638,  159665,   -2043,  673344, -442767,   75816,
-     755442,  769257, -158730, -410272,  691688,  589550, -878398, -184121,  460679,  346312,
-     294163, -544602,  653308,  254167, -276979,   52073, -892684,  887653,  -41222,  983065,
-     -68258, -408799,  -99069, -674069, -863635,  -32890,  622757, -743862,   40872,   -4837,
-    -967228,  522370, -903951, -818669,  524459,  514702,  925801,   20007, -299229,  579348,
-     626021,  430089,  348139, -562692, -607728, -130606, -928451, -424793, -458647, -448892,
-    -312230,  143337,  109746,  880042, -339658, -785614,  938995,  540916,  118429,  661351,
-    -402967,  404729,  -40918, -976535,  743230,  713110,  440182, -381314, -499252,   74613,
-     193652,  912717,  491323,  583633,  324691,  459397,  281253,  195540,   -2764, -888651,
-     892449,  132663, -478373, -430002, -314551,  527826,  247165,  557966,  554778,  481531,
-    -946634,  431685, -769059, -348371,  174046,  184597, -354867,  584422,  227390, -850397,
-    -542924, -849093, -737769,  325359,  736314,  269101,  767940,  674809,   81413, -447458,
-     445076,  189072,  906218,  502688, -718476, -863827, -731381,  100660,  623249,  710008,
-     572060,  922203,  685740,   55096,  263394, -243695, -353910, -516788,  388471,  455165,
-     844103, -643772,  363976,  268875, -899450,  104470,  104029, -238874, -274659,  732969,
-    -676443,  953291, -916289, -861849, -242344,  958083, -479593, -970395,  799831,  277841,
-    -243236, -283462, -201510,  166263, -259105, -575706,  878926,  891064,  895297,  655262,
-     -34807, -809833,  -89281,  342585,  554920,       1,  902141, -333425,  139703,  852318,
-    -618438,  329498, -932596, -692836, -513372,  733656, -523411,   85779,  500478, -682697,
-    -502836,  138776,  156341, -420037, -557964, -556378,  710993,  -50383, -877159,  916334,
-     132996,  583516, -603392, -111615,  -12288, -780214,  476780,  123327,  137607,  519956,
-     745837,   17358, -158581,  -53490
-};
-static const size_t randvalCount = sizeof(randval) / sizeof(randval[0]);
-static const size_t kItoaTrialCount = 10000;
-
-static const char digits[201] =
-"0001020304050607080910111213141516171819"
-"2021222324252627282930313233343536373839"
-"4041424344454647484950515253545556575859"
-"6061626364656667686970717273747576777879"
-"8081828384858687888990919293949596979899";
-
-// Prevent code being optimized out
-//#define OUTPUT_LENGTH(length) printf("", length)
-#define OUTPUT_LENGTH(length) printf("%u\n", (unsigned)length)
-
-template<typename OutputStream>
-class Writer1 {
-public:
-    Writer1() : os_() {}
-    Writer1(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char *p = buffer;
-        do {
-            *p++ = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char *p = buffer;
-        do {
-            *p++ = char(u64 % 10) + '0';
-            u64 /= 10;
-        } while (u64 > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    OutputStream* os_;
-};
-
-template<>
-bool Writer1<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    char buffer[10];
-    char* p = buffer;
-    do {
-        *p++ = char(u % 10) + '0';
-        u /= 10;
-    } while (u > 0);
-
-    char* d = os_->Push(p - buffer);
-    do {
-        --p;
-        *d++ = *p;
-    } while (p != buffer);
-    return true;
-}
-
-// Using digits LUT to reduce divsion/modulo
-template<typename OutputStream>
-class Writer2 {
-public:
-    Writer2() : os_() {}
-    Writer2(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char* p = buffer;
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u < 10)
-            *p++ = char(u) + '0';
-        else {
-            const unsigned i = u << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* p = buffer;
-        while (u64 >= 100) {
-            const unsigned i = static_cast<unsigned>(u64 % 100) << 1;
-            u64 /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u64 < 10)
-            *p++ = char(u64) + '0';
-        else {
-            const unsigned i = static_cast<unsigned>(u64) << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    OutputStream* os_;
-};
-
-// First pass to count digits
-template<typename OutputStream>
-class Writer3 {
-public:
-    Writer3() : os_() {}
-    Writer3(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char *p = buffer;
-        do {
-            *p++ = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char *p = buffer;
-        do {
-            *p++ = char(u64 % 10) + '0';
-            u64 /= 10;
-        } while (u64 > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    void WriteUintReverse(char* d, unsigned u) {
-        do {
-            *--d = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-    }
-
-    void WriteUint64Reverse(char* d, uint64_t u) {
-        do {
-            *--d = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-    }
-
-    OutputStream* os_;
-};
-
-template<>
-inline bool Writer3<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::InsituStringStream>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::StringBuffer>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::InsituStringStream>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-// Using digits LUT to reduce divsion/modulo, two passes
-template<typename OutputStream>
-class Writer4 {
-public:
-    Writer4() : os_() {}
-    Writer4(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char* p = buffer;
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u < 10)
-            *p++ = char(u) + '0';
-        else {
-            const unsigned i = u << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* p = buffer;
-        while (u64 >= 100) {
-            const unsigned i = static_cast<unsigned>(u64 % 100) << 1;
-            u64 /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u64 < 10)
-            *p++ = char(u64) + '0';
-        else {
-            const unsigned i = static_cast<unsigned>(u64) << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    void WriteUintReverse(char* d, unsigned u) {
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-        if (u < 10) {
-            *--d = char(u) + '0';
-        }
-        else {
-            const unsigned i = u << 1;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-    }
-
-    void WriteUint64Reverse(char* d, uint64_t u) {
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-        if (u < 10) {
-            *--d = char(u) + '0';
-        }
-        else {
-            const unsigned i = u << 1;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-    }
-
-    OutputStream* os_;
-};
-
-template<>
-inline bool Writer4<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::InsituStringStream>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::StringBuffer>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::InsituStringStream>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template <typename Writer>
-void itoa_Writer_StringBufferVerify() {
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-    for (int j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        sprintf(buffer, "%d", randval[j]);
-        writer.WriteInt(randval[j]);
-        ASSERT_STREQ(buffer, sb.GetString());
-        sb.Clear();
-    }
-}
-
-template <typename Writer>
-void itoa_Writer_InsituStringStreamVerify() {
-    Writer writer;
-    for (int j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        sprintf(buffer, "%d", randval[j]);
-        char buffer2[32];
-        rapidjson::InsituStringStream ss(buffer2);
-        writer.Reset(ss);
-        char* begin = ss.PutBegin();
-        writer.WriteInt(randval[j]);
-        ss.Put('\0');
-        ss.PutEnd(begin);
-        ASSERT_STREQ(buffer, buffer2);
-    }
-}
-
-template <typename Writer>
-void itoa_Writer_StringBuffer() {
-    size_t length = 0;
-
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            writer.WriteInt(randval[j]);
-            length += sb.GetSize();
-            sb.Clear();
-        }
-    }
-    OUTPUT_LENGTH(length);
-}
-
-template <typename Writer>
-void itoa_Writer_InsituStringStream() {
-    size_t length = 0;
-
-    char buffer[32];
-    Writer writer;
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            rapidjson::InsituStringStream ss(buffer);
-            writer.Reset(ss);
-            char* begin = ss.PutBegin();
-            writer.WriteInt(randval[j]);
-            length += ss.PutEnd(begin);
-        }
-    }
-    OUTPUT_LENGTH(length);
-};
-
-template <typename Writer>
-void itoa64_Writer_StringBufferVerify() {
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        int64_t x = randval[j] * randval[j];
-        sprintf(buffer, "%" PRIi64, x);
-        writer.WriteInt64(x);
-        ASSERT_STREQ(buffer, sb.GetString());
-        sb.Clear();
-    }
-}
-
-template <typename Writer>
-void itoa64_Writer_InsituStringStreamVerify() {
-    Writer writer;
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        int64_t x = randval[j] * randval[j];
-        sprintf(buffer, "%" PRIi64, x);
-        char buffer2[32];
-        rapidjson::InsituStringStream ss(buffer2);
-        writer.Reset(ss);
-        char* begin = ss.PutBegin();
-        writer.WriteInt64(x);
-        ss.Put('\0');
-        ss.PutEnd(begin);
-        ASSERT_STREQ(buffer, buffer2);
-    }
-}
-
-template <typename Writer>
-void itoa64_Writer_StringBuffer() {
-    size_t length = 0;
-
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            writer.WriteInt64(randval[j] * randval[j]);
-            length += sb.GetSize();
-            sb.Clear();
-        }
-    }
-    OUTPUT_LENGTH(length);
-}
-
-template <typename Writer>
-void itoa64_Writer_InsituStringStream() {
-    size_t length = 0;
-
-    char buffer[32];
-    Writer writer;
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            rapidjson::InsituStringStream ss(buffer);
-            writer.Reset(ss);
-            char* begin = ss.PutBegin();
-            writer.WriteInt64(randval[j] * randval[j]);
-            length += ss.PutEnd(begin);
-        }
-    }
-    OUTPUT_LENGTH(length);
-};
-
-// Full specialization for InsituStringStream to prevent memory copying 
-// (normally we will not use InsituStringStream for writing, just for testing)
-
-namespace rapidjson {
-
-template<>
-bool rapidjson::Writer<InsituStringStream>::WriteInt(int i) {
-    char *buffer = os_->Push(11);
-    const char* end = internal::i32toa(i, buffer);
-    os_->Pop(11 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteUint(unsigned u) {
-    char *buffer = os_->Push(10);
-    const char* end = internal::u32toa(u, buffer);
-    os_->Pop(10 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteInt64(int64_t i64) {
-    char *buffer = os_->Push(21);
-    const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(21 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteUint64(uint64_t u) {
-    char *buffer = os_->Push(20);
-    const char* end = internal::u64toa(u, buffer);
-    os_->Pop(20 - (end - buffer));
-    return true;
-}
-
-} // namespace rapidjson
-
-TEST_F(Misc, itoa_Writer_StringBufferVerify) { itoa_Writer_StringBufferVerify<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer1_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer2_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer3_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer4_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer1_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer2_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer3_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer4_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer4<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer_StringBuffer) { itoa_Writer_StringBuffer<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer1_StringBuffer) { itoa_Writer_StringBuffer<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer2_StringBuffer) { itoa_Writer_StringBuffer<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer3_StringBuffer) { itoa_Writer_StringBuffer<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer4_StringBuffer) { itoa_Writer_StringBuffer<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer_InsituStringStream) { itoa_Writer_InsituStringStream<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer1_InsituStringStream) { itoa_Writer_InsituStringStream<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer2_InsituStringStream) { itoa_Writer_InsituStringStream<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer3_InsituStringStream) { itoa_Writer_InsituStringStream<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer4_InsituStringStream) { itoa_Writer_InsituStringStream<Writer4<rapidjson::InsituStringStream> >(); }
-
-TEST_F(Misc, itoa64_Writer_StringBufferVerify) { itoa64_Writer_StringBufferVerify<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer1_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer2_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer3_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer4_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer1_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer2_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer3_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer4_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer4<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer_StringBuffer) { itoa64_Writer_StringBuffer<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer1_StringBuffer) { itoa64_Writer_StringBuffer<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer2_StringBuffer) { itoa64_Writer_StringBuffer<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer3_StringBuffer) { itoa64_Writer_StringBuffer<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer4_StringBuffer) { itoa64_Writer_StringBuffer<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer_InsituStringStream) { itoa64_Writer_InsituStringStream<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer1_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer2_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer3_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer4_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer4<rapidjson::InsituStringStream> >(); }
-
-#endif // TEST_MISC
diff --git a/extra/rapidjson/test/perftest/perftest.cpp b/extra/rapidjson/test/perftest/perftest.cpp
deleted file mode 100644
index 70f5c9d8a3f6..000000000000
--- a/extra/rapidjson/test/perftest/perftest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "perftest.h"
-
-int main(int argc, char **argv) {
-#if _MSC_VER
-    _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
-    //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
-#endif
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/extra/rapidjson/test/perftest/perftest.h b/extra/rapidjson/test/perftest/perftest.h
deleted file mode 100644
index fe9bb2796836..000000000000
--- a/extra/rapidjson/test/perftest/perftest.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef PERFTEST_H_
-#define PERFTEST_H_
-
-#define TEST_RAPIDJSON  1
-#define TEST_PLATFORM   0
-#define TEST_MISC       0
-
-#define TEST_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-// __SSE2__ and __SSE4_2__ are recognized by gcc, clang, and the Intel compiler.
-// We use -march=native with gmake to enable -msse2 and -msse4.2, if supported.
-#if defined(__SSE4_2__)
-#  define RAPIDJSON_SSE42
-#elif defined(__SSE2__)
-#  define RAPIDJSON_SSE2
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Google Test
-
-#ifdef __cplusplus
-
-// gtest indirectly included inttypes.h, without __STDC_CONSTANT_MACROS.
-#ifndef __STDC_CONSTANT_MACROS
-#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-#if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
-#include "gtest/gtest.h"
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#pragma warning(disable : 4996) // 'function': was declared deprecated
-#endif
-
-//! Base class for all performance tests
-class PerfTest : public ::testing::Test {
-public:
-    PerfTest() : filename_(), json_(), length_(), whitespace_(), whitespace_length_() {}
-
-    virtual void SetUp() {
-        FILE *fp = fopen(filename_ = "data/sample.json", "rb");
-        if (!fp) 
-            fp = fopen(filename_ = "../../bin/data/sample.json", "rb");
-        ASSERT_TRUE(fp != 0);
-
-        fseek(fp, 0, SEEK_END);
-        length_ = (size_t)ftell(fp);
-        fseek(fp, 0, SEEK_SET);
-        json_ = (char*)malloc(length_ + 1);
-        ASSERT_EQ(length_, fread(json_, 1, length_, fp));
-        json_[length_] = '\0';
-        fclose(fp);
-
-        // whitespace test
-        whitespace_length_ = 1024 * 1024;
-        whitespace_ = (char *)malloc(whitespace_length_  + 4);
-        char *p = whitespace_;
-        for (size_t i = 0; i < whitespace_length_; i += 4) {
-            *p++ = ' ';
-            *p++ = '\n';
-            *p++ = '\r';
-            *p++ = '\t';
-        }
-        *p++ = '[';
-        *p++ = '0';
-        *p++ = ']';
-        *p++ = '\0';
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        free(whitespace_);
-        json_ = 0;
-        whitespace_ = 0;
-    }
-
-private:
-    PerfTest(const PerfTest&);
-    PerfTest& operator=(const PerfTest&);
-
-protected:
-    const char* filename_;
-    char *json_;
-    size_t length_;
-    char *whitespace_;
-    size_t whitespace_length_;
-
-    static const size_t kTrialCount = 1000;
-};
-
-#endif // __cplusplus
-
-#endif // PERFTEST_H_
diff --git a/extra/rapidjson/test/perftest/platformtest.cpp b/extra/rapidjson/test/perftest/platformtest.cpp
deleted file mode 100644
index ea808a052dbc..000000000000
--- a/extra/rapidjson/test/perftest/platformtest.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "perftest.h"
-
-// This file is for giving the performance characteristics of the platform (compiler/OS/CPU).
-
-#if TEST_PLATFORM
-
-#include <cmath>
-#include <fcntl.h>
-
-// Windows
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-// UNIX
-#if defined(unix) || defined(__unix__) || defined(__unix)
-#include <unistd.h>
-#ifdef _POSIX_MAPPED_FILES
-#include <sys/mman.h>
-#endif
-#endif
-
-class Platform : public PerfTest {
-public:
-    virtual void SetUp() {
-        PerfTest::SetUp();
-
-        // temp buffer for testing
-        temp_ = (char *)malloc(length_ + 1);
-        memcpy(temp_, json_, length_);
-        checkSum_ = CheckSum();
-    }
-
-    char CheckSum() {
-        char c = 0;
-        for (size_t i = 0; i < length_; ++i)
-            c += temp_[i];
-        return c;
-    }
-
-    virtual void TearDown() {
-        PerfTest::TearDown();
-        free(temp_);
-    }
-
-protected:
-    char *temp_;
-    char checkSum_;
-};
-
-TEST_F(Platform, CheckSum) {
-    for (int i = 0; i < kTrialCount; i++)
-        EXPECT_EQ(checkSum_, CheckSum());
-}
-
-TEST_F(Platform, strlen) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strlen(json_);
-        EXPECT_EQ(length_, l);
-    }
-}
-
-TEST_F(Platform, memcmp) {
-    for (int i = 0; i < kTrialCount; i++) {
-        EXPECT_EQ(0, memcmp(temp_, json_, length_));
-    }
-}
-
-TEST_F(Platform, pow) {
-    double sum = 0;
-    for (int i = 0; i < kTrialCount * kTrialCount; i++)
-        sum += pow(10.0, i & 255);
-    EXPECT_GT(sum, 0.0);
-}
-
-TEST_F(Platform, Whitespace_strlen) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strlen(whitespace_);
-        EXPECT_GT(l, whitespace_length_);
-    }       
-}
-
-TEST_F(Platform, Whitespace_strspn) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strspn(whitespace_, " \n\r\t");
-        EXPECT_EQ(whitespace_length_, l);
-    }       
-}
-
-TEST_F(Platform, fread) {
-    for (int i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        ASSERT_EQ(length_, fread(temp_, 1, length_, fp));
-        EXPECT_EQ(checkSum_, CheckSum());
-        fclose(fp);
-    }
-}
-
-#ifdef _MSC_VER
-TEST_F(Platform, read) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = _open(filename_, _O_BINARY | _O_RDONLY);
-        ASSERT_NE(-1, fd);
-        ASSERT_EQ(length_, _read(fd, temp_, length_));
-        EXPECT_EQ(checkSum_, CheckSum());
-        _close(fd);
-    }
-}
-#else
-TEST_F(Platform, read) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = open(filename_, O_RDONLY);
-        ASSERT_NE(-1, fd);
-        ASSERT_EQ(length_, read(fd, temp_, length_));
-        EXPECT_EQ(checkSum_, CheckSum());
-        close(fd);
-    }
-}
-#endif
-
-#ifdef _WIN32
-TEST_F(Platform, MapViewOfFile) {
-    for (int i = 0; i < kTrialCount; i++) {
-        HANDLE file = CreateFile(filename_, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-        ASSERT_NE(INVALID_HANDLE_VALUE, file);
-        HANDLE mapObject = CreateFileMapping(file, NULL, PAGE_READONLY, 0, length_, NULL);
-        ASSERT_NE(INVALID_HANDLE_VALUE, mapObject);
-        void *p = MapViewOfFile(mapObject, FILE_MAP_READ, 0, 0, length_);
-        ASSERT_TRUE(p != NULL);
-        EXPECT_EQ(checkSum_, CheckSum());
-        ASSERT_TRUE(UnmapViewOfFile(p) == TRUE);
-        ASSERT_TRUE(CloseHandle(mapObject) == TRUE);
-        ASSERT_TRUE(CloseHandle(file) == TRUE);
-    }
-}
-#endif
-
-#ifdef _POSIX_MAPPED_FILES
-TEST_F(Platform, mmap) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = open(filename_, O_RDONLY);
-        ASSERT_NE(-1, fd);
-        void *p = mmap(NULL, length_, PROT_READ, MAP_PRIVATE, fd, 0);
-        ASSERT_TRUE(p != NULL);
-        EXPECT_EQ(checkSum_, CheckSum());
-        munmap(p, length_);
-        close(fd);
-    }
-}
-#endif
-
-#endif // TEST_PLATFORM
diff --git a/extra/rapidjson/test/perftest/rapidjsontest.cpp b/extra/rapidjson/test/perftest/rapidjsontest.cpp
deleted file mode 100644
index ec0ae453d461..000000000000
--- a/extra/rapidjson/test/perftest/rapidjsontest.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "perftest.h"
-
-#if TEST_RAPIDJSON
-
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filestream.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/memorystream.h"
-
-#ifdef RAPIDJSON_SSE2
-#define SIMD_SUFFIX(name) name##_SSE2
-#elif defined(RAPIDJSON_SSE42)
-#define SIMD_SUFFIX(name) name##_SSE42
-#else
-#define SIMD_SUFFIX(name) name
-#endif
-
-using namespace rapidjson;
-
-class RapidJson : public PerfTest {
-public:
-    RapidJson() : temp_(), doc_() {}
-
-    virtual void SetUp() {
-        PerfTest::SetUp();
-
-        // temp buffer for insitu parsing.
-        temp_ = (char *)malloc(length_ + 1);
-
-        // Parse as a document
-        EXPECT_FALSE(doc_.Parse(json_).IsNull());
-    }
-
-    virtual void TearDown() {
-        PerfTest::TearDown();
-        free(temp_);
-    }
-
-private:
-    RapidJson(const RapidJson&);
-    RapidJson& operator=(const RapidJson&);
-
-protected:
-    char *temp_;
-    Document doc_;
-};
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseInsitu_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseInsitu_DummyHandler_ValidateEncoding)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_FullPrecision)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseFullPrecisionFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterative_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseIterativeFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterativeInsitu_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseIterativeFlag|kParseInsituFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_ValidateEncoding)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseValidateEncodingFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseInsitu_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        Document doc;
-        doc.ParseInsitu(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseIterativeInsitu_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        Document doc;
-        doc.ParseInsitu<kParseIterativeFlag>(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParse_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse(json_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseIterative_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse<kParseIterativeFlag>(json_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParse_CrtAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        GenericDocument<UTF8<>, CrtAllocator> doc;
-        doc.Parse(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseEncodedInputStream_MemoryStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        MemoryStream ms(json_, length_);
-        EncodedInputStream<UTF8<>, MemoryStream> is(ms);
-        Document doc;
-        doc.ParseStream<0, UTF8<> >(is);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseAutoUTFInputStream_MemoryStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        MemoryStream ms(json_, length_);
-        AutoUTFInputStream<unsigned, MemoryStream> is(ms);
-        Document doc;
-        doc.ParseStream<0, AutoUTF<unsigned> >(is);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-template<typename T>
-size_t Traverse(const T& value) {
-    size_t count = 1;
-    switch(value.GetType()) {
-        case kObjectType:
-            for (typename T::ConstMemberIterator itr = value.MemberBegin(); itr != value.MemberEnd(); ++itr) {
-                count++;    // name
-                count += Traverse(itr->value);
-            }
-            break;
-
-        case kArrayType:
-            for (typename T::ConstValueIterator itr = value.Begin(); itr != value.End(); ++itr)
-                count += Traverse(*itr);
-            break;
-
-        default:
-            // Do nothing.
-            break;
-    }
-    return count;
-}
-
-TEST_F(RapidJson, DocumentTraverse) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        size_t count = Traverse(doc_);
-        EXPECT_EQ(4339u, count);
-        //if (i == 0)
-        //  std::cout << count << std::endl;
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-struct ValueCounter : public BaseReaderHandler<> {
-    ValueCounter() : count_(1) {}   // root
-
-    bool EndObject(SizeType memberCount) { count_ += memberCount * 2; return true; }
-    bool EndArray(SizeType elementCount) { count_ += elementCount; return true; }
-
-    SizeType count_;
-};
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-TEST_F(RapidJson, DocumentAccept) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        ValueCounter counter;
-        doc_.Accept(counter);
-        EXPECT_EQ(4339u, counter.count_);
-    }
-}
-
-struct NullStream {
-    NullStream() /*: length_(0)*/ {}
-    void Put(char) { /*++length_;*/ }
-    void Flush() {}
-    //size_t length_;
-};
-
-TEST_F(RapidJson, Writer_NullStream) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        NullStream s;
-        Writer<NullStream> writer(s);
-        doc_.Accept(writer);
-        //if (i == 0)
-        //  std::cout << s.length_ << std::endl;
-    }
-}
-
-TEST_F(RapidJson, Writer_StringBuffer) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringBuffer s(0, 1024 * 1024);
-        Writer<StringBuffer> writer(s);
-        doc_.Accept(writer);
-        const char* str = s.GetString();
-        (void)str;
-        //if (i == 0)
-        //  std::cout << strlen(str) << std::endl;
-    }
-}
-
-TEST_F(RapidJson, PrettyWriter_StringBuffer) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringBuffer s(0, 2048 * 1024);
-        PrettyWriter<StringBuffer> writer(s);
-        writer.SetIndent(' ', 1);
-        doc_.Accept(writer);
-        const char* str = s.GetString();
-        (void)str;
-        //if (i == 0)
-        //  std::cout << strlen(str) << std::endl;
-    }
-}
-
-TEST_F(RapidJson, internal_Pow10) {
-    double sum = 0;
-    for (size_t i = 0; i < kTrialCount * kTrialCount; i++)
-        sum += internal::Pow10(int(i & 255));
-    EXPECT_GT(sum, 0.0);
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(Whitespace)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        ASSERT_TRUE(doc.Parse(whitespace_).IsArray());
-    }       
-}
-
-TEST_F(RapidJson, UTF8_Validate) {
-    NullStream os;
-
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream is(json_);
-        bool result = true;
-        while (is.Peek() != '\0')
-            result &= UTF8<>::Validate(is, os);
-        EXPECT_TRUE(result);
-    }
-}
-
-// Deprecated.
-//TEST_F(RapidJson, FileStream_Read) {
-//  for (size_t i = 0; i < kTrialCount; i++) {
-//      FILE *fp = fopen(filename_, "rb");
-//      FileStream s(fp);
-//      while (s.Take() != '\0')
-//          ;
-//      fclose(fp);
-//  }
-//}
-
-TEST_F(RapidJson, FileReadStream) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        char buffer[65536];
-        FileReadStream s(fp, buffer, sizeof(buffer));
-        while (s.Take() != '\0')
-            ;
-        fclose(fp);
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_FileReadStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        char buffer[65536];
-        FileReadStream s(fp, buffer, sizeof(buffer));
-        BaseReaderHandler<> h;
-        Reader reader;
-        reader.Parse(s, h);
-        fclose(fp);
-    }
-}
-
-#endif // TEST_RAPIDJSON
diff --git a/extra/rapidjson/test/unittest/CMakeLists.txt b/extra/rapidjson/test/unittest/CMakeLists.txt
deleted file mode 100644
index 5e4a3e9d522b..000000000000
--- a/extra/rapidjson/test/unittest/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-set(UNITTEST_SOURCES
-    bigintegertest.cpp
-    documenttest.cpp
-    encodedstreamtest.cpp
-    encodingstest.cpp
-    filestreamtest.cpp
-    jsoncheckertest.cpp
-    namespacetest.cpp
-    readertest.cpp
-    stringbuffertest.cpp
-    strtodtest.cpp
-    unittest.cpp
-    valuetest.cpp
-    writertest.cpp)
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Weffc++ -Wswitch-default")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Weffc++ -Wswitch-default")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
-endif()
-
-add_library(namespacetest STATIC namespacetest.cpp)
-
-add_executable(unittest ${UNITTEST_SOURCES})
-target_link_libraries(unittest ${TEST_LIBRARIES} namespacetest)
-
-add_dependencies(tests unittest)
-
-add_test(NAME unittest
-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
-if(NOT MSVC)
-    add_test(NAME valgrind_unittest
-        COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        add_test(NAME symbol_check
-        COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-endif(NOT MSVC)
diff --git a/extra/rapidjson/test/unittest/bigintegertest.cpp b/extra/rapidjson/test/unittest/bigintegertest.cpp
deleted file mode 100644
index e7b3b8f9496d..000000000000
--- a/extra/rapidjson/test/unittest/bigintegertest.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-#include "rapidjson/internal/biginteger.h"
-
-using namespace rapidjson::internal;
-
-#define BIGINTEGER_LITERAL(s) BigInteger(s, sizeof(s) - 1)
-
-static const BigInteger kZero(0);
-static const BigInteger kOne(1);
-static const BigInteger kUint64Max = BIGINTEGER_LITERAL("18446744073709551615");
-static const BigInteger kTwo64 = BIGINTEGER_LITERAL("18446744073709551616");
-
-TEST(BigInteger, Constructor) {
-    EXPECT_TRUE(kZero.IsZero());
-    EXPECT_TRUE(kZero == kZero);
-    EXPECT_TRUE(kZero == BIGINTEGER_LITERAL("0"));
-    EXPECT_TRUE(kZero == BIGINTEGER_LITERAL("00"));
-
-    const BigInteger a(123);
-    EXPECT_TRUE(a == a);
-    EXPECT_TRUE(a == BIGINTEGER_LITERAL("123"));
-    EXPECT_TRUE(a == BIGINTEGER_LITERAL("0123"));
-
-    EXPECT_EQ(2u, kTwo64.GetCount());
-    EXPECT_EQ(0u, kTwo64.GetDigit(0));
-    EXPECT_EQ(1u, kTwo64.GetDigit(1));
-}
-
-TEST(BigInteger, AddUint64) {
-    BigInteger a = kZero;
-    a += 0u;
-    EXPECT_TRUE(kZero == a);
-
-    a += 1u;
-    EXPECT_TRUE(kOne == a);
-
-    a += 1u;
-    EXPECT_TRUE(BigInteger(2) == a);
-
-    EXPECT_TRUE(BigInteger(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF)) == kUint64Max);
-    BigInteger b = kUint64Max;
-    b += 1u;
-    EXPECT_TRUE(kTwo64 == b);
-    b += RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("36893488147419103231") == b);
-}
-
-TEST(BigInteger, MultiplyUint64) {
-    BigInteger a = kZero;
-    a *= static_cast <uint64_t>(0);
-    EXPECT_TRUE(kZero == a);
-    a *= static_cast <uint64_t>(123);
-    EXPECT_TRUE(kZero == a);
-
-    BigInteger b = kOne;
-    b *= static_cast<uint64_t>(1);
-    EXPECT_TRUE(kOne == b);
-    b *= static_cast<uint64_t>(0);
-    EXPECT_TRUE(kZero == b);
-
-    BigInteger c(123);
-    c *= static_cast<uint64_t>(456u);
-    EXPECT_TRUE(BigInteger(123u * 456u) == c);
-    c *= RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("1034640981606221330982120") == c);
-    c *= RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("19085757395861596536664473018420572782123800") == c);
-}
-
-TEST(BigInteger, MultiplyUint32) {
-    BigInteger a = kZero;
-    a *= static_cast <uint32_t>(0);
-    EXPECT_TRUE(kZero == a);
-    a *= static_cast <uint32_t>(123);
-    EXPECT_TRUE(kZero == a);
-
-    BigInteger b = kOne;
-    b *= static_cast<uint32_t>(1);
-    EXPECT_TRUE(kOne == b);
-    b *= static_cast<uint32_t>(0);
-    EXPECT_TRUE(kZero == b);
-
-    BigInteger c(123);
-    c *= static_cast<uint32_t>(456u);
-    EXPECT_TRUE(BigInteger(123u * 456u) == c);
-    c *= 0xFFFFFFFFu;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("240896125641960") == c);
-    c *= 0xFFFFFFFFu;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("1034640981124429079698200") == c);
-}
-
-TEST(BigInteger, LeftShift) {
-    BigInteger a = kZero;
-    a <<= 1;
-    EXPECT_TRUE(kZero == a);
-    a <<= 64;
-    EXPECT_TRUE(kZero == a);
-
-    a = BigInteger(123);
-    a <<= 0;
-    EXPECT_TRUE(BigInteger(123) == a);
-    a <<= 1;
-    EXPECT_TRUE(BigInteger(246) == a);
-    a <<= 64;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("4537899042132549697536") == a);
-    a <<= 99;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("2876235222267216943024851750785644982682875244576768") == a);
-}
-
-TEST(BigInteger, Compare) {
-    EXPECT_EQ(0, kZero.Compare(kZero));
-    EXPECT_EQ(1, kOne.Compare(kZero));
-    EXPECT_EQ(-1, kZero.Compare(kOne));
-    EXPECT_EQ(0, kUint64Max.Compare(kUint64Max));
-    EXPECT_EQ(0, kTwo64.Compare(kTwo64));
-    EXPECT_EQ(-1, kUint64Max.Compare(kTwo64));
-    EXPECT_EQ(1, kTwo64.Compare(kUint64Max));
-}
diff --git a/extra/rapidjson/test/unittest/documenttest.cpp b/extra/rapidjson/test/unittest/documenttest.cpp
deleted file mode 100644
index 8a63e613424e..000000000000
--- a/extra/rapidjson/test/unittest/documenttest.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-#include <sstream>
-
-using namespace rapidjson;
-
-template <typename Allocator, typename StackAllocator>
-void ParseTest() {
-    typedef GenericDocument<UTF8<>, Allocator, StackAllocator> DocumentType;
-    typedef typename DocumentType::ValueType ValueType;
-    DocumentType doc;
-
-    doc.Parse(" { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ");
-
-    EXPECT_TRUE(doc.IsObject());
-
-    EXPECT_TRUE(doc.HasMember("hello"));
-    const ValueType& hello = doc["hello"];
-    EXPECT_TRUE(hello.IsString());
-    EXPECT_STREQ("world", hello.GetString());
-
-    EXPECT_TRUE(doc.HasMember("t"));
-    const ValueType& t = doc["t"];
-    EXPECT_TRUE(t.IsTrue());
-
-    EXPECT_TRUE(doc.HasMember("f"));
-    const ValueType& f = doc["f"];
-    EXPECT_TRUE(f.IsFalse());
-
-    EXPECT_TRUE(doc.HasMember("n"));
-    const ValueType& n = doc["n"];
-    EXPECT_TRUE(n.IsNull());
-
-    EXPECT_TRUE(doc.HasMember("i"));
-    const ValueType& i = doc["i"];
-    EXPECT_TRUE(i.IsNumber());
-    EXPECT_EQ(123, i.GetInt());
-
-    EXPECT_TRUE(doc.HasMember("pi"));
-    const ValueType& pi = doc["pi"];
-    EXPECT_TRUE(pi.IsNumber());
-    EXPECT_EQ(3.1416, pi.GetDouble());
-
-    EXPECT_TRUE(doc.HasMember("a"));
-    const ValueType& a = doc["a"];
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(4u, a.Size());
-    for (SizeType i = 0; i < 4; i++)
-        EXPECT_EQ(i + 1, a[i].GetUint());
-}
-
-TEST(Document, Parse) {
-    ParseTest<MemoryPoolAllocator<>, CrtAllocator>();
-    ParseTest<MemoryPoolAllocator<>, MemoryPoolAllocator<> >();
-    ParseTest<CrtAllocator, MemoryPoolAllocator<> >();
-    ParseTest<CrtAllocator, CrtAllocator>();
-}
-
-static FILE* OpenEncodedFile(const char* filename) {
-    char buffer[1024];
-    sprintf(buffer, "encodings/%s", filename);
-    FILE *fp = fopen(buffer, "rb");
-    if (!fp) {
-        sprintf(buffer, "../../bin/encodings/%s", filename);
-        fp = fopen(buffer, "rb");
-    }
-    return fp;
-}
-
-TEST(Document, ParseStream_EncodedInputStream) {
-    // UTF8 -> UTF16
-    FILE* fp = OpenEncodedFile("utf8.json");
-    char buffer[256];
-    FileReadStream bis(fp, buffer, sizeof(buffer));
-    EncodedInputStream<UTF8<>, FileReadStream> eis(bis);
-
-    GenericDocument<UTF16<> > d;
-    d.ParseStream<0, UTF8<> >(eis);
-    EXPECT_FALSE(d.HasParseError());
-
-    fclose(fp);
-
-    wchar_t expected[] = L"I can eat glass and it doesn't hurt me.";
-    GenericValue<UTF16<> >& v = d[L"en"];
-    EXPECT_TRUE(v.IsString());
-    EXPECT_EQ(sizeof(expected) / sizeof(wchar_t) - 1, v.GetStringLength());
-    EXPECT_EQ(0, StrCmp(expected, v.GetString()));
-
-    // UTF16 -> UTF8 in memory
-    StringBuffer bos;
-    typedef EncodedOutputStream<UTF8<>, StringBuffer> OutputStream;
-    OutputStream eos(bos, false);   // Not writing BOM
-    Writer<OutputStream, UTF16<>, UTF8<> > writer(eos);
-    d.Accept(writer);
-
-    {
-        // Condense the original file and compare.
-        FILE *fp = OpenEncodedFile("utf8.json");
-        FileReadStream is(fp, buffer, sizeof(buffer));
-        Reader reader;
-        StringBuffer bos2;
-        Writer<StringBuffer> writer(bos2);
-        reader.Parse(is, writer);
-
-        EXPECT_EQ(bos.GetSize(), bos2.GetSize());
-        EXPECT_EQ(0, memcmp(bos.GetString(), bos2.GetString(), bos2.GetSize()));
-    }
-}
-
-TEST(Document, ParseStream_AutoUTFInputStream) {
-    // Any -> UTF8
-    FILE* fp = OpenEncodedFile("utf32be.json");
-    char buffer[256];
-    FileReadStream bis(fp, buffer, sizeof(buffer));
-    AutoUTFInputStream<unsigned, FileReadStream> eis(bis);
-
-    Document d;
-    d.ParseStream<0, AutoUTF<unsigned> >(eis);
-    EXPECT_FALSE(d.HasParseError());
-
-    fclose(fp);
-
-    char expected[] = "I can eat glass and it doesn't hurt me.";
-    Value& v = d["en"];
-    EXPECT_TRUE(v.IsString());
-    EXPECT_EQ(sizeof(expected) - 1, v.GetStringLength());
-    EXPECT_EQ(0, StrCmp(expected, v.GetString()));
-
-    // UTF8 -> UTF8 in memory
-    StringBuffer bos;
-    Writer<StringBuffer> writer(bos);
-    d.Accept(writer);
-
-    {
-        // Condense the original file and compare.
-        FILE *fp = OpenEncodedFile("utf8.json");
-        FileReadStream is(fp, buffer, sizeof(buffer));
-        Reader reader;
-        StringBuffer bos2;
-        Writer<StringBuffer> writer(bos2);
-        reader.Parse(is, writer);
-
-        EXPECT_EQ(bos.GetSize(), bos2.GetSize());
-        EXPECT_EQ(0, memcmp(bos.GetString(), bos2.GetString(), bos2.GetSize()));
-    }
-}
-
-TEST(Document, Swap) {
-    Document d1;
-    Document::AllocatorType& a = d1.GetAllocator();
-
-    d1.SetArray().PushBack(1, a).PushBack(2, a);
-
-    Value o;
-    o.SetObject().AddMember("a", 1, a);
-
-    // Swap between Document and Value
-    d1.Swap(o);
-    EXPECT_TRUE(d1.IsObject());
-    EXPECT_TRUE(o.IsArray());
-
-    // Swap between Document and Document
-    Document d2;
-    d2.SetArray().PushBack(3, a);
-    d1.Swap(d2);
-    EXPECT_TRUE(d1.IsArray());
-    EXPECT_TRUE(d2.IsObject());
-}
-
-// This should be slow due to assignment in inner-loop.
-struct OutputStringStream : public std::ostringstream {
-    typedef char Ch;
-
-    void Put(char c) {
-        put(c);
-    }
-    void Flush() {}
-};
-
-TEST(Document, AcceptWriter) {
-    Document doc;
-    doc.Parse(" { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ");
-
-    OutputStringStream os;
-    Writer<OutputStringStream> writer(os);
-    doc.Accept(writer);
-
-    EXPECT_EQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3,4]}", os.str());
-}
-
-// Issue 226: Value of string type should not point to NULL
-TEST(Document, AssertAcceptInvalidNameType) {
-    Document doc;
-    doc.SetObject();
-    doc.AddMember("a", 0, doc.GetAllocator());
-    doc.FindMember("a")->name.SetNull(); // Change name to non-string type.
-
-    OutputStringStream os;
-    Writer<OutputStringStream> writer(os);
-    ASSERT_THROW(doc.Accept(writer), AssertException);
-}
-
-// Issue 44:    SetStringRaw doesn't work with wchar_t
-TEST(Document, UTF16_Document) {
-    GenericDocument< UTF16<> > json;
-    json.Parse<kParseValidateEncodingFlag>(L"[{\"created_at\":\"Wed Oct 30 17:13:20 +0000 2012\"}]");
-
-    ASSERT_TRUE(json.IsArray());
-    GenericValue< UTF16<> >& v = json[0];
-    ASSERT_TRUE(v.IsObject());
-
-    GenericValue< UTF16<> >& s = v[L"created_at"];
-    ASSERT_TRUE(s.IsString());
-
-    EXPECT_EQ(0, wcscmp(L"Wed Oct 30 17:13:20 +0000 2012", s.GetString()));
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#include <type_traits>
-
-TEST(Document, Traits) {
-    static_assert(std::is_constructible<Document>::value, "");
-    static_assert(std::is_default_constructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<Document>::value, "");
-#endif
-    static_assert(std::is_move_constructible<Document>::value, "");
-
-    static_assert(!std::is_nothrow_constructible<Document>::value, "");
-    static_assert(!std::is_nothrow_default_constructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_nothrow_copy_constructible<Document>::value, "");
-    static_assert(std::is_nothrow_move_constructible<Document>::value, "");
-#endif
-
-    static_assert(std::is_assignable<Document,Document>::value, "");
-#ifndef _MSC_VER
-  static_assert(!std::is_copy_assignable<Document>::value, "");
-#endif
-    static_assert(std::is_move_assignable<Document>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_assignable<Document, Document>::value, "");
-#endif
-    static_assert(!std::is_nothrow_copy_assignable<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_move_assignable<Document>::value, "");
-#endif
-
-    static_assert( std::is_destructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<Document>::value, "");
-#endif
-}
-
-template <typename Allocator>
-struct DocumentMove: public ::testing::Test {
-};
-
-typedef ::testing::Types< CrtAllocator, MemoryPoolAllocator<> > MoveAllocatorTypes;
-TYPED_TEST_CASE(DocumentMove, MoveAllocatorTypes);
-
-TYPED_TEST(DocumentMove, MoveConstructor) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> Document;
-    Allocator allocator;
-
-    Document a(&allocator);
-    a.Parse("[\"one\", \"two\", \"three\"]");
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(3u, a.Size());
-    EXPECT_EQ(&a.GetAllocator(), &allocator);
-
-    // Document b(a); // does not compile (!is_copy_constructible)
-    Document b(std::move(a));
-    EXPECT_TRUE(a.IsNull());
-    EXPECT_TRUE(b.IsArray());
-    EXPECT_EQ(3u, b.Size());
-    EXPECT_EQ(&a.GetAllocator(), (void*)0);
-    EXPECT_EQ(&b.GetAllocator(), &allocator);
-
-    b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(b.IsObject());
-    EXPECT_EQ(2u, b.MemberCount());
-
-    // Document c = a; // does not compile (!is_copy_constructible)
-    Document c = std::move(b);
-    EXPECT_TRUE(b.IsNull());
-    EXPECT_TRUE(c.IsObject());
-    EXPECT_EQ(2u, c.MemberCount());
-    EXPECT_EQ(&b.GetAllocator(), (void*)0);
-    EXPECT_EQ(&c.GetAllocator(), &allocator);
-}
-
-TYPED_TEST(DocumentMove, MoveConstructorParseError) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> Document;
-
-    ParseResult noError;
-    Document a;
-    a.Parse("{ 4 = 4]");
-    ParseResult error(a.GetParseError(), a.GetErrorOffset());
-    EXPECT_TRUE(a.HasParseError());
-    EXPECT_NE(error.Code(), noError.Code());
-    EXPECT_NE(error.Offset(), noError.Offset());
-
-    Document b(std::move(a));
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(b.HasParseError());
-    EXPECT_EQ(a.GetParseError(), noError.Code());
-    EXPECT_EQ(b.GetParseError(), error.Code());
-    EXPECT_EQ(a.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(b.GetErrorOffset(), error.Offset());
-
-    Document c(std::move(b));
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(c.HasParseError());
-    EXPECT_EQ(b.GetParseError(), noError.Code());
-    EXPECT_EQ(c.GetParseError(), error.Code());
-    EXPECT_EQ(b.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(c.GetErrorOffset(), error.Offset());
-}
-
-// This test does not properly use parsing, just for testing.
-// It must call ClearStack() explicitly to prevent memory leak.
-// But here we cannot as ClearStack() is private.
-#if 0
-TYPED_TEST(DocumentMove, MoveConstructorStack) {
-    typedef TypeParam Allocator;
-    typedef UTF8<> Encoding;
-    typedef GenericDocument<Encoding, Allocator> Document;
-
-    Document a;
-    size_t defaultCapacity = a.GetStackCapacity();
-
-    // Trick Document into getting GetStackCapacity() to return non-zero
-    typedef GenericReader<Encoding, Encoding, Allocator> Reader;
-    Reader reader(&a.GetAllocator());
-    GenericStringStream<Encoding> is("[\"one\", \"two\", \"three\"]");
-    reader.template Parse<kParseDefaultFlags>(is, a);
-    size_t capacity = a.GetStackCapacity();
-    EXPECT_GT(capacity, 0u);
-
-    Document b(std::move(a));
-    EXPECT_EQ(a.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(b.GetStackCapacity(), capacity);
-
-    Document c = std::move(b);
-    EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(c.GetStackCapacity(), capacity);
-}
-#endif
-
-TYPED_TEST(DocumentMove, MoveAssignment) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> Document;
-    Allocator allocator;
-
-    Document a(&allocator);
-    a.Parse("[\"one\", \"two\", \"three\"]");
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(3u, a.Size());
-    EXPECT_EQ(&a.GetAllocator(), &allocator);
-
-    // Document b; b = a; // does not compile (!is_copy_assignable)
-    Document b;
-    b = std::move(a);
-    EXPECT_TRUE(a.IsNull());
-    EXPECT_TRUE(b.IsArray());
-    EXPECT_EQ(3u, b.Size());
-    EXPECT_EQ(&a.GetAllocator(), (void*)0);
-    EXPECT_EQ(&b.GetAllocator(), &allocator);
-
-    b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(b.IsObject());
-    EXPECT_EQ(2u, b.MemberCount());
-
-    // Document c; c = a; // does not compile (see static_assert)
-    Document c;
-    c = std::move(b);
-    EXPECT_TRUE(b.IsNull());
-    EXPECT_TRUE(c.IsObject());
-    EXPECT_EQ(2u, c.MemberCount());
-    EXPECT_EQ(&b.GetAllocator(), (void*)0);
-    EXPECT_EQ(&c.GetAllocator(), &allocator);
-}
-
-TYPED_TEST(DocumentMove, MoveAssignmentParseError) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> Document;
-
-    ParseResult noError;
-    Document a;
-    a.Parse("{ 4 = 4]");
-    ParseResult error(a.GetParseError(), a.GetErrorOffset());
-    EXPECT_TRUE(a.HasParseError());
-    EXPECT_NE(error.Code(), noError.Code());
-    EXPECT_NE(error.Offset(), noError.Offset());
-
-    Document b;
-    b = std::move(a);
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(b.HasParseError());
-    EXPECT_EQ(a.GetParseError(), noError.Code());
-    EXPECT_EQ(b.GetParseError(), error.Code());
-    EXPECT_EQ(a.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(b.GetErrorOffset(), error.Offset());
-
-    Document c;
-    c = std::move(b);
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(c.HasParseError());
-    EXPECT_EQ(b.GetParseError(), noError.Code());
-    EXPECT_EQ(c.GetParseError(), error.Code());
-    EXPECT_EQ(b.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(c.GetErrorOffset(), error.Offset());
-}
-
-// This test does not properly use parsing, just for testing.
-// It must call ClearStack() explicitly to prevent memory leak.
-// But here we cannot as ClearStack() is private.
-#if 0
-TYPED_TEST(DocumentMove, MoveAssignmentStack) {
-    typedef TypeParam Allocator;
-    typedef UTF8<> Encoding;
-    typedef GenericDocument<Encoding, Allocator> Document;
-
-    Document a;
-    size_t defaultCapacity = a.GetStackCapacity();
-
-    // Trick Document into getting GetStackCapacity() to return non-zero
-    typedef GenericReader<Encoding, Encoding, Allocator> Reader;
-    Reader reader(&a.GetAllocator());
-    GenericStringStream<Encoding> is("[\"one\", \"two\", \"three\"]");
-    reader.template Parse<kParseDefaultFlags>(is, a);
-    size_t capacity = a.GetStackCapacity();
-    EXPECT_GT(capacity, 0u);
-
-    Document b;
-    b = std::move(a);
-    EXPECT_EQ(a.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(b.GetStackCapacity(), capacity);
-
-    Document c;
-    c = std::move(b);
-    EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(c.GetStackCapacity(), capacity);
-}
-#endif
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-// Issue 22: Memory corruption via operator=
-// Fixed by making unimplemented assignment operator private.
-//TEST(Document, Assignment) {
-//  Document d1;
-//  Document d2;
-//  d1 = d2;
-//}
diff --git a/extra/rapidjson/test/unittest/encodedstreamtest.cpp b/extra/rapidjson/test/unittest/encodedstreamtest.cpp
deleted file mode 100644
index fab963a47089..000000000000
--- a/extra/rapidjson/test/unittest/encodedstreamtest.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/memorystream.h"
-#include "rapidjson/memorybuffer.h"
-
-using namespace rapidjson;
-
-class EncodedStreamTest : public ::testing::Test {
-public:
-    EncodedStreamTest() : json_(), length_() {}
-
-    virtual void SetUp() {
-        json_ = ReadFile("utf8.json", true, &length_);
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        json_ = 0;
-    }
-
-private:
-    EncodedStreamTest(const EncodedStreamTest&);
-    EncodedStreamTest& operator=(const EncodedStreamTest&);
-    
-protected:
-    static FILE* Open(const char* filename) {
-        char buffer[1024];
-        sprintf(buffer, "encodings/%s", filename);
-        FILE *fp = fopen(buffer, "rb");
-        if (!fp) {
-            sprintf(buffer, "../../bin/encodings/%s", filename);
-            fp = fopen(buffer, "rb");
-        }
-        return fp;
-    }
-
-    static char *ReadFile(const char* filename, bool appendPath, size_t* outLength) {
-        FILE *fp = appendPath ? Open(filename) : fopen(filename, "rb");
-
-        if (!fp) {
-            *outLength = 0;
-            return 0;
-        }
-
-        fseek(fp, 0, SEEK_END);
-        *outLength = (size_t)ftell(fp);
-        fseek(fp, 0, SEEK_SET);
-        char* buffer = (char*)malloc(*outLength + 1);
-        size_t readLength = fread(buffer, 1, *outLength, fp);
-        buffer[readLength] = '\0';
-        fclose(fp);
-        return buffer;
-    }
-
-    template <typename FileEncoding, typename MemoryEncoding>
-    void TestEncodedInputStream(const char* filename) {
-        // Test FileReadStream
-        {
-            char buffer[16];
-            FILE *fp = Open(filename);
-            ASSERT_TRUE(fp != 0);
-            FileReadStream fs(fp, buffer, sizeof(buffer));
-            EncodedInputStream<FileEncoding, FileReadStream> eis(fs);
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(MemoryEncoding::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            fclose(fp);
-        }
-
-        // Test MemoryStream
-        {
-            size_t size;
-            char* data = ReadFile(filename, true, &size);
-            MemoryStream ms(data, size);
-            EncodedInputStream<FileEncoding, MemoryStream> eis(ms);
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(MemoryEncoding::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            free(data);
-        }
-    }
-
-    void TestAutoUTFInputStream(const char *filename) {
-        // Test FileReadStream
-        {
-            char buffer[16];
-            FILE *fp = Open(filename);
-            ASSERT_TRUE(fp != 0);
-            FileReadStream fs(fp, buffer, sizeof(buffer));
-            AutoUTFInputStream<unsigned, FileReadStream> eis(fs);
-            StringStream s(json_);
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(AutoUTF<unsigned>::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            fclose(fp);
-        }
-
-        // Test MemoryStream
-        {
-            size_t size;
-            char* data = ReadFile(filename, true, &size);
-            MemoryStream ms(data, size);
-            AutoUTFInputStream<unsigned, MemoryStream> eis(ms);
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(AutoUTF<unsigned>::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            free(data);
-        }
-    }
-
-    template <typename FileEncoding, typename MemoryEncoding>
-    void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) {
-        // Test FileWriteStream
-        {
-            char filename[L_tmpnam];
-            FILE* fp = TempFile(filename);
-            char buffer[16];
-            FileWriteStream os(fp, buffer, sizeof(buffer));
-            EncodedOutputStream<FileEncoding, FileWriteStream> eos(os, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, MemoryEncoding>::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            fclose(fp);
-            EXPECT_TRUE(CompareFile(filename, expectedFilename));
-            remove(filename);
-        }
-
-        // Test MemoryBuffer
-        {
-            MemoryBuffer mb;
-            EncodedOutputStream<FileEncoding, MemoryBuffer> eos(mb, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, MemoryEncoding>::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            EXPECT_TRUE(CompareBufferFile(mb.GetBuffer(), mb.GetSize(), expectedFilename));
-        }
-    }
-
-    void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) {
-        // Test FileWriteStream
-        {
-            char filename[L_tmpnam];
-            FILE* fp = TempFile(filename);
-
-            char buffer[16];
-            FileWriteStream os(fp, buffer, sizeof(buffer));
-            AutoUTFOutputStream<unsigned, FileWriteStream> eos(os, type, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, AutoUTF<unsigned> >::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            fclose(fp);
-            EXPECT_TRUE(CompareFile(filename, expectedFilename));
-            remove(filename);
-        }
-
-        // Test MemoryBuffer
-        {
-            MemoryBuffer mb;
-            AutoUTFOutputStream<unsigned, MemoryBuffer> eos(mb, type, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, AutoUTF<unsigned> >::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            EXPECT_TRUE(CompareBufferFile(mb.GetBuffer(), mb.GetSize(), expectedFilename));
-        }
-    }
-
-    bool CompareFile(const char* filename, const char* expectedFilename) {
-        size_t actualLength, expectedLength;
-        char* actualBuffer = ReadFile(filename, false, &actualLength);
-        char* expectedBuffer = ReadFile(expectedFilename, true, &expectedLength);
-        bool ret = (expectedLength == actualLength) && memcmp(expectedBuffer, actualBuffer, actualLength) == 0;
-        free(actualBuffer);
-        free(expectedBuffer);
-        return ret;
-    }
-
-    bool CompareBufferFile(const char* actualBuffer, size_t actualLength, const char* expectedFilename) {
-        size_t expectedLength;
-        char* expectedBuffer = ReadFile(expectedFilename, true, &expectedLength);
-        bool ret = (expectedLength == actualLength) && memcmp(expectedBuffer, actualBuffer, actualLength) == 0;
-        free(expectedBuffer);
-        return ret;
-    }
-
-    char *json_;
-    size_t length_;
-};
-
-TEST_F(EncodedStreamTest, EncodedInputStream) {
-    TestEncodedInputStream<UTF8<>,    UTF8<>  >("utf8.json");
-    TestEncodedInputStream<UTF8<>,    UTF8<>  >("utf8bom.json");
-    TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16le.json");
-    TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16lebom.json");
-    TestEncodedInputStream<UTF16BE<>, UTF16<> >("utf16be.json");
-    TestEncodedInputStream<UTF16BE<>, UTF16<> >("utf16bebom.json");
-    TestEncodedInputStream<UTF32LE<>, UTF32<> >("utf32le.json");
-    TestEncodedInputStream<UTF32LE<>, UTF32<> >("utf32lebom.json");
-    TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32be.json");
-    TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32bebom.json");
-}
-
-TEST_F(EncodedStreamTest, AutoUTFInputStream) {
-    TestAutoUTFInputStream("utf8.json");
-    TestAutoUTFInputStream("utf8bom.json");
-    TestAutoUTFInputStream("utf16le.json");
-    TestAutoUTFInputStream("utf16lebom.json");
-    TestAutoUTFInputStream("utf16be.json");
-    TestAutoUTFInputStream("utf16bebom.json");
-    TestAutoUTFInputStream("utf32le.json");
-    TestAutoUTFInputStream("utf32lebom.json");
-    TestAutoUTFInputStream("utf32be.json");
-    TestAutoUTFInputStream("utf32bebom.json");
-}
-
-TEST_F(EncodedStreamTest, EncodedOutputStream) {
-    TestEncodedOutputStream<UTF8<>,     UTF8<>  >("utf8.json",      false);
-    TestEncodedOutputStream<UTF8<>,     UTF8<>  >("utf8bom.json",   true);
-    TestEncodedOutputStream<UTF16LE<>,  UTF16<> >("utf16le.json",   false);
-    TestEncodedOutputStream<UTF16LE<>,  UTF16<> >("utf16lebom.json",true);
-    TestEncodedOutputStream<UTF16BE<>,  UTF16<> >("utf16be.json",   false);
-    TestEncodedOutputStream<UTF16BE<>,  UTF16<> >("utf16bebom.json",true);
-    TestEncodedOutputStream<UTF32LE<>,  UTF32<> >("utf32le.json",   false);
-    TestEncodedOutputStream<UTF32LE<>,  UTF32<> >("utf32lebom.json",true);
-    TestEncodedOutputStream<UTF32BE<>,  UTF32<> >("utf32be.json",   false);
-    TestEncodedOutputStream<UTF32BE<>,  UTF32<> >("utf32bebom.json",true);
-}
-
-TEST_F(EncodedStreamTest, AutoUTFOutputStream) {
-    TestAutoUTFOutputStream(kUTF8,      false,  "utf8.json");
-    TestAutoUTFOutputStream(kUTF8,      true,   "utf8bom.json");
-    TestAutoUTFOutputStream(kUTF16LE,   false,  "utf16le.json");
-    TestAutoUTFOutputStream(kUTF16LE,   true,   "utf16lebom.json");
-    TestAutoUTFOutputStream(kUTF16BE,   false,  "utf16be.json");
-    TestAutoUTFOutputStream(kUTF16BE,   true,   "utf16bebom.json");
-    TestAutoUTFOutputStream(kUTF32LE,   false,  "utf32le.json");
-    TestAutoUTFOutputStream(kUTF32LE,   true,   "utf32lebom.json");
-    TestAutoUTFOutputStream(kUTF32BE,   false,  "utf32be.json");
-    TestAutoUTFOutputStream(kUTF32BE,   true,   "utf32bebom.json");
-}
diff --git a/extra/rapidjson/test/unittest/encodingstest.cpp b/extra/rapidjson/test/unittest/encodingstest.cpp
deleted file mode 100644
index fd43a0c4eec3..000000000000
--- a/extra/rapidjson/test/unittest/encodingstest.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-
-using namespace rapidjson;
-
-// Verification of encoders/decoders with Hoehrmann's UTF8 decoder
-
-// http://www.unicode.org/Public/UNIDATA/Blocks.txt
-static const unsigned kCodepointRanges[] = {
-    0x0000,     0x007F,     // Basic Latin
-    0x0080,     0x00FF,     // Latin-1 Supplement
-    0x0100,     0x017F,     // Latin Extended-A
-    0x0180,     0x024F,     // Latin Extended-B
-    0x0250,     0x02AF,     // IPA Extensions
-    0x02B0,     0x02FF,     // Spacing Modifier Letters
-    0x0300,     0x036F,     // Combining Diacritical Marks
-    0x0370,     0x03FF,     // Greek and Coptic
-    0x0400,     0x04FF,     // Cyrillic
-    0x0500,     0x052F,     // Cyrillic Supplement
-    0x0530,     0x058F,     // Armenian
-    0x0590,     0x05FF,     // Hebrew
-    0x0600,     0x06FF,     // Arabic
-    0x0700,     0x074F,     // Syriac
-    0x0750,     0x077F,     // Arabic Supplement
-    0x0780,     0x07BF,     // Thaana
-    0x07C0,     0x07FF,     // NKo
-    0x0800,     0x083F,     // Samaritan
-    0x0840,     0x085F,     // Mandaic
-    0x0900,     0x097F,     // Devanagari
-    0x0980,     0x09FF,     // Bengali
-    0x0A00,     0x0A7F,     // Gurmukhi
-    0x0A80,     0x0AFF,     // Gujarati
-    0x0B00,     0x0B7F,     // Oriya
-    0x0B80,     0x0BFF,     // Tamil
-    0x0C00,     0x0C7F,     // Telugu
-    0x0C80,     0x0CFF,     // Kannada
-    0x0D00,     0x0D7F,     // Malayalam
-    0x0D80,     0x0DFF,     // Sinhala
-    0x0E00,     0x0E7F,     // Thai
-    0x0E80,     0x0EFF,     // Lao
-    0x0F00,     0x0FFF,     // Tibetan
-    0x1000,     0x109F,     // Myanmar
-    0x10A0,     0x10FF,     // Georgian
-    0x1100,     0x11FF,     // Hangul Jamo
-    0x1200,     0x137F,     // Ethiopic
-    0x1380,     0x139F,     // Ethiopic Supplement
-    0x13A0,     0x13FF,     // Cherokee
-    0x1400,     0x167F,     // Unified Canadian Aboriginal Syllabics
-    0x1680,     0x169F,     // Ogham
-    0x16A0,     0x16FF,     // Runic
-    0x1700,     0x171F,     // Tagalog
-    0x1720,     0x173F,     // Hanunoo
-    0x1740,     0x175F,     // Buhid
-    0x1760,     0x177F,     // Tagbanwa
-    0x1780,     0x17FF,     // Khmer
-    0x1800,     0x18AF,     // Mongolian
-    0x18B0,     0x18FF,     // Unified Canadian Aboriginal Syllabics Extended
-    0x1900,     0x194F,     // Limbu
-    0x1950,     0x197F,     // Tai Le
-    0x1980,     0x19DF,     // New Tai Lue
-    0x19E0,     0x19FF,     // Khmer Symbols
-    0x1A00,     0x1A1F,     // Buginese
-    0x1A20,     0x1AAF,     // Tai Tham
-    0x1B00,     0x1B7F,     // Balinese
-    0x1B80,     0x1BBF,     // Sundanese
-    0x1BC0,     0x1BFF,     // Batak
-    0x1C00,     0x1C4F,     // Lepcha
-    0x1C50,     0x1C7F,     // Ol Chiki
-    0x1CD0,     0x1CFF,     // Vedic Extensions
-    0x1D00,     0x1D7F,     // Phonetic Extensions
-    0x1D80,     0x1DBF,     // Phonetic Extensions Supplement
-    0x1DC0,     0x1DFF,     // Combining Diacritical Marks Supplement
-    0x1E00,     0x1EFF,     // Latin Extended Additional
-    0x1F00,     0x1FFF,     // Greek Extended
-    0x2000,     0x206F,     // General Punctuation
-    0x2070,     0x209F,     // Superscripts and Subscripts
-    0x20A0,     0x20CF,     // Currency Symbols
-    0x20D0,     0x20FF,     // Combining Diacritical Marks for Symbols
-    0x2100,     0x214F,     // Letterlike Symbols
-    0x2150,     0x218F,     // Number Forms
-    0x2190,     0x21FF,     // Arrows
-    0x2200,     0x22FF,     // Mathematical Operators
-    0x2300,     0x23FF,     // Miscellaneous Technical
-    0x2400,     0x243F,     // Control Pictures
-    0x2440,     0x245F,     // Optical Character Recognition
-    0x2460,     0x24FF,     // Enclosed Alphanumerics
-    0x2500,     0x257F,     // Box Drawing
-    0x2580,     0x259F,     // Block Elements
-    0x25A0,     0x25FF,     // Geometric Shapes
-    0x2600,     0x26FF,     // Miscellaneous Symbols
-    0x2700,     0x27BF,     // Dingbats
-    0x27C0,     0x27EF,     // Miscellaneous Mathematical Symbols-A
-    0x27F0,     0x27FF,     // Supplemental Arrows-A
-    0x2800,     0x28FF,     // Braille Patterns
-    0x2900,     0x297F,     // Supplemental Arrows-B
-    0x2980,     0x29FF,     // Miscellaneous Mathematical Symbols-B
-    0x2A00,     0x2AFF,     // Supplemental Mathematical Operators
-    0x2B00,     0x2BFF,     // Miscellaneous Symbols and Arrows
-    0x2C00,     0x2C5F,     // Glagolitic
-    0x2C60,     0x2C7F,     // Latin Extended-C
-    0x2C80,     0x2CFF,     // Coptic
-    0x2D00,     0x2D2F,     // Georgian Supplement
-    0x2D30,     0x2D7F,     // Tifinagh
-    0x2D80,     0x2DDF,     // Ethiopic Extended
-    0x2DE0,     0x2DFF,     // Cyrillic Extended-A
-    0x2E00,     0x2E7F,     // Supplemental Punctuation
-    0x2E80,     0x2EFF,     // CJK Radicals Supplement
-    0x2F00,     0x2FDF,     // Kangxi Radicals
-    0x2FF0,     0x2FFF,     // Ideographic Description Characters
-    0x3000,     0x303F,     // CJK Symbols and Punctuation
-    0x3040,     0x309F,     // Hiragana
-    0x30A0,     0x30FF,     // Katakana
-    0x3100,     0x312F,     // Bopomofo
-    0x3130,     0x318F,     // Hangul Compatibility Jamo
-    0x3190,     0x319F,     // Kanbun
-    0x31A0,     0x31BF,     // Bopomofo Extended
-    0x31C0,     0x31EF,     // CJK Strokes
-    0x31F0,     0x31FF,     // Katakana Phonetic Extensions
-    0x3200,     0x32FF,     // Enclosed CJK Letters and Months
-    0x3300,     0x33FF,     // CJK Compatibility
-    0x3400,     0x4DBF,     // CJK Unified Ideographs Extension A
-    0x4DC0,     0x4DFF,     // Yijing Hexagram Symbols
-    0x4E00,     0x9FFF,     // CJK Unified Ideographs
-    0xA000,     0xA48F,     // Yi Syllables
-    0xA490,     0xA4CF,     // Yi Radicals
-    0xA4D0,     0xA4FF,     // Lisu
-    0xA500,     0xA63F,     // Vai
-    0xA640,     0xA69F,     // Cyrillic Extended-B
-    0xA6A0,     0xA6FF,     // Bamum
-    0xA700,     0xA71F,     // Modifier Tone Letters
-    0xA720,     0xA7FF,     // Latin Extended-D
-    0xA800,     0xA82F,     // Syloti Nagri
-    0xA830,     0xA83F,     // Common Indic Number Forms
-    0xA840,     0xA87F,     // Phags-pa
-    0xA880,     0xA8DF,     // Saurashtra
-    0xA8E0,     0xA8FF,     // Devanagari Extended
-    0xA900,     0xA92F,     // Kayah Li
-    0xA930,     0xA95F,     // Rejang
-    0xA960,     0xA97F,     // Hangul Jamo Extended-A
-    0xA980,     0xA9DF,     // Javanese
-    0xAA00,     0xAA5F,     // Cham
-    0xAA60,     0xAA7F,     // Myanmar Extended-A
-    0xAA80,     0xAADF,     // Tai Viet
-    0xAB00,     0xAB2F,     // Ethiopic Extended-A
-    0xABC0,     0xABFF,     // Meetei Mayek
-    0xAC00,     0xD7AF,     // Hangul Syllables
-    0xD7B0,     0xD7FF,     // Hangul Jamo Extended-B
-    //0xD800,       0xDB7F,     // High Surrogates
-    //0xDB80,       0xDBFF,     // High Private Use Surrogates
-    //0xDC00,       0xDFFF,     // Low Surrogates
-    0xE000,     0xF8FF,     // Private Use Area
-    0xF900,     0xFAFF,     // CJK Compatibility Ideographs
-    0xFB00,     0xFB4F,     // Alphabetic Presentation Forms
-    0xFB50,     0xFDFF,     // Arabic Presentation Forms-A
-    0xFE00,     0xFE0F,     // Variation Selectors
-    0xFE10,     0xFE1F,     // Vertical Forms
-    0xFE20,     0xFE2F,     // Combining Half Marks
-    0xFE30,     0xFE4F,     // CJK Compatibility Forms
-    0xFE50,     0xFE6F,     // Small Form Variants
-    0xFE70,     0xFEFF,     // Arabic Presentation Forms-B
-    0xFF00,     0xFFEF,     // Halfwidth and Fullwidth Forms
-    0xFFF0,     0xFFFF,     // Specials
-    0x10000,    0x1007F,    // Linear B Syllabary
-    0x10080,    0x100FF,    // Linear B Ideograms
-    0x10100,    0x1013F,    // Aegean Numbers
-    0x10140,    0x1018F,    // Ancient Greek Numbers
-    0x10190,    0x101CF,    // Ancient Symbols
-    0x101D0,    0x101FF,    // Phaistos Disc
-    0x10280,    0x1029F,    // Lycian
-    0x102A0,    0x102DF,    // Carian
-    0x10300,    0x1032F,    // Old Italic
-    0x10330,    0x1034F,    // Gothic
-    0x10380,    0x1039F,    // Ugaritic
-    0x103A0,    0x103DF,    // Old Persian
-    0x10400,    0x1044F,    // Deseret
-    0x10450,    0x1047F,    // Shavian
-    0x10480,    0x104AF,    // Osmanya
-    0x10800,    0x1083F,    // Cypriot Syllabary
-    0x10840,    0x1085F,    // Imperial Aramaic
-    0x10900,    0x1091F,    // Phoenician
-    0x10920,    0x1093F,    // Lydian
-    0x10A00,    0x10A5F,    // Kharoshthi
-    0x10A60,    0x10A7F,    // Old South Arabian
-    0x10B00,    0x10B3F,    // Avestan
-    0x10B40,    0x10B5F,    // Inscriptional Parthian
-    0x10B60,    0x10B7F,    // Inscriptional Pahlavi
-    0x10C00,    0x10C4F,    // Old Turkic
-    0x10E60,    0x10E7F,    // Rumi Numeral Symbols
-    0x11000,    0x1107F,    // Brahmi
-    0x11080,    0x110CF,    // Kaithi
-    0x12000,    0x123FF,    // Cuneiform
-    0x12400,    0x1247F,    // Cuneiform Numbers and Punctuation
-    0x13000,    0x1342F,    // Egyptian Hieroglyphs
-    0x16800,    0x16A3F,    // Bamum Supplement
-    0x1B000,    0x1B0FF,    // Kana Supplement
-    0x1D000,    0x1D0FF,    // Byzantine Musical Symbols
-    0x1D100,    0x1D1FF,    // Musical Symbols
-    0x1D200,    0x1D24F,    // Ancient Greek Musical Notation
-    0x1D300,    0x1D35F,    // Tai Xuan Jing Symbols
-    0x1D360,    0x1D37F,    // Counting Rod Numerals
-    0x1D400,    0x1D7FF,    // Mathematical Alphanumeric Symbols
-    0x1F000,    0x1F02F,    // Mahjong Tiles
-    0x1F030,    0x1F09F,    // Domino Tiles
-    0x1F0A0,    0x1F0FF,    // Playing Cards
-    0x1F100,    0x1F1FF,    // Enclosed Alphanumeric Supplement
-    0x1F200,    0x1F2FF,    // Enclosed Ideographic Supplement
-    0x1F300,    0x1F5FF,    // Miscellaneous Symbols And Pictographs
-    0x1F600,    0x1F64F,    // Emoticons
-    0x1F680,    0x1F6FF,    // Transport And Map Symbols
-    0x1F700,    0x1F77F,    // Alchemical Symbols
-    0x20000,    0x2A6DF,    // CJK Unified Ideographs Extension B
-    0x2A700,    0x2B73F,    // CJK Unified Ideographs Extension C
-    0x2B740,    0x2B81F,    // CJK Unified Ideographs Extension D
-    0x2F800,    0x2FA1F,    // CJK Compatibility Ideographs Supplement
-    0xE0000,    0xE007F,    // Tags
-    0xE0100,    0xE01EF,    // Variation Selectors Supplement
-    0xF0000,    0xFFFFF,    // Supplementary Private Use Area-A
-    0x100000,   0x10FFFF,   // Supplementary Private Use Area-B
-    0xFFFFFFFF
-};
-
-// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#define UTF8_ACCEPT 0u
-#define UTF8_REJECT 12u
-
-static const unsigned char utf8d[] = {
-    // The first part of the table maps bytes to character classes that
-    // to reduce the size of the transition table and create bitmasks.
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-
-    // The second part is a transition table that maps a combination
-    // of a state of the automaton and a character class to a state.
-    0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-    12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-    12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-    12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-    12,36,12,12,12,12,12,12,12,12,12,12, 
-};
-
-static unsigned inline decode(unsigned* state, unsigned* codep, unsigned byte) {
-    unsigned type = utf8d[byte];
-
-    *codep = (*state != UTF8_ACCEPT) ?
-        (byte & 0x3fu) | (*codep << 6) :
-    (0xff >> type) & (byte);
-
-    *state = utf8d[256 + *state + type];
-    return *state;
-}
-
-//static bool IsUTF8(unsigned char* s) {
-//  unsigned codepoint, state = 0;
-//
-//  while (*s)
-//      decode(&state, &codepoint, *s++);
-//
-//  return state == UTF8_ACCEPT;
-//}
-
-TEST(EncodingsTest, UTF8) {
-    StringBuffer os, os2;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF8<>::Encode(os, codepoint);
-            const char* encodedStr = os.GetString();
-
-            // Decode with Hoehrmann
-            {
-                unsigned decodedCodepoint = 0;
-                unsigned state = 0;
-
-                unsigned decodedCount = 0;
-                for (const char* s = encodedStr; *s; ++s)
-                    if (!decode(&state, &decodedCodepoint, (unsigned char)*s)) {
-                        EXPECT_EQ(codepoint, decodedCodepoint);
-                        decodedCount++;
-                    }
-
-                if (*encodedStr)                // This decoder cannot handle U+0000
-                    EXPECT_EQ(1u, decodedCount);    // Should only contain one code point
-
-                EXPECT_EQ(UTF8_ACCEPT, state);
-                if (UTF8_ACCEPT != state)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Decode
-            {
-                StringStream is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF8<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                StringStream is(encodedStr);
-                os2.Clear();
-                bool result = UTF8<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
-
-TEST(EncodingsTest, UTF16) {
-    GenericStringBuffer<UTF16<> > os, os2;
-    GenericStringBuffer<UTF8<> > utf8os;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF16<>::Encode(os, codepoint);
-            const UTF16<>::Ch* encodedStr = os.GetString();
-
-            // Encode with Hoehrmann's code
-            if (codepoint != 0) // cannot handle U+0000
-            {
-                // encode with UTF8<> first
-                utf8os.Clear();
-                UTF8<>::Encode(utf8os, codepoint);
-
-                // transcode from UTF8 to UTF16 with Hoehrmann's code
-                unsigned decodedCodepoint = 0;
-                unsigned state = 0;
-                UTF16<>::Ch buffer[3], *p = &buffer[0];
-                for (const char* s = utf8os.GetString(); *s; ++s) {
-                    if (!decode(&state, &decodedCodepoint, (unsigned char)*s))
-                        break;
-                }
-
-                if (codepoint <= 0xFFFF)
-                    *p++ = static_cast<UTF16<>::Ch>(decodedCodepoint);
-                else {
-                    // Encode code points above U+FFFF as surrogate pair.
-                    *p++ = static_cast<UTF16<>::Ch>(0xD7C0 + (decodedCodepoint >> 10));
-                    *p++ = static_cast<UTF16<>::Ch>(0xDC00 + (decodedCodepoint & 0x3FF));
-                }
-                *p++ = '\0';
-
-                EXPECT_EQ(0, StrCmp(buffer, encodedStr));
-            }
-
-            // Decode
-            {
-                GenericStringStream<UTF16<> > is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF16<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);         
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                GenericStringStream<UTF16<> > is(encodedStr);
-                os2.Clear();
-                bool result = UTF16<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
-
-TEST(EncodingsTest, UTF32) {
-    GenericStringBuffer<UTF32<> > os, os2;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF32<>::Encode(os, codepoint);
-            const UTF32<>::Ch* encodedStr = os.GetString();
-
-            // Decode
-            {
-                GenericStringStream<UTF32<> > is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF32<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);         
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                GenericStringStream<UTF32<> > is(encodedStr);
-                os2.Clear();
-                bool result = UTF32<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
diff --git a/extra/rapidjson/test/unittest/filestreamtest.cpp b/extra/rapidjson/test/unittest/filestreamtest.cpp
deleted file mode 100644
index 8a16bf0220b3..000000000000
--- a/extra/rapidjson/test/unittest/filestreamtest.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/filestream.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-
-using namespace rapidjson;
-
-class FileStreamTest : public ::testing::Test {
-public:
-    FileStreamTest() : filename_(), json_(), length_() {}
-
-    virtual void SetUp() {
-        FILE *fp = fopen(filename_ = "data/sample.json", "rb");
-        if (!fp) 
-            fp = fopen(filename_ = "../../bin/data/sample.json", "rb");
-        ASSERT_TRUE(fp != 0);
-
-        fseek(fp, 0, SEEK_END);
-        length_ = (size_t)ftell(fp);
-        fseek(fp, 0, SEEK_SET);
-        json_ = (char*)malloc(length_ + 1);
-        size_t readLength = fread(json_, 1, length_, fp);
-        json_[readLength] = '\0';
-        fclose(fp);
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        json_ = 0;
-    }
-
-private:
-    FileStreamTest(const FileStreamTest&);
-    FileStreamTest& operator=(const FileStreamTest&);
-    
-protected:
-    const char* filename_;
-    char *json_;
-    size_t length_;
-};
-
-// Deprecated
-//TEST_F(FileStreamTest, FileStream_Read) {
-//  FILE *fp = fopen(filename_, "rb");
-//  ASSERT_TRUE(fp != 0);
-//  FileStream s(fp);
-//
-//  for (size_t i = 0; i < length_; i++) {
-//      EXPECT_EQ(json_[i], s.Peek());
-//      EXPECT_EQ(json_[i], s.Peek());  // 2nd time should be the same
-//      EXPECT_EQ(json_[i], s.Take());
-//  }
-//
-//  EXPECT_EQ(length_, s.Tell());
-//  EXPECT_EQ('\0', s.Peek());
-//
-//  fclose(fp);
-//}
-
-TEST_F(FileStreamTest, FileReadStream) {
-    FILE *fp = fopen(filename_, "rb");
-    ASSERT_TRUE(fp != 0);
-    char buffer[65536];
-    FileReadStream s(fp, buffer, sizeof(buffer));
-
-    for (size_t i = 0; i < length_; i++) {
-        EXPECT_EQ(json_[i], s.Peek());
-        EXPECT_EQ(json_[i], s.Peek());  // 2nd time should be the same
-        EXPECT_EQ(json_[i], s.Take());
-    }
-
-    EXPECT_EQ(length_, s.Tell());
-    EXPECT_EQ('\0', s.Peek());
-
-    fclose(fp);
-}
-
-TEST_F(FileStreamTest, FileWriteStream) {
-    char filename[L_tmpnam];
-    FILE* fp = TempFile(filename);
-
-    char buffer[65536];
-    FileWriteStream os(fp, buffer, sizeof(buffer));
-    for (size_t i = 0; i < length_; i++)
-        os.Put(json_[i]);
-    os.Flush();
-    fclose(fp);
-
-    // Read it back to verify
-    fp = fopen(filename, "rb");
-    FileReadStream is(fp, buffer, sizeof(buffer));
-
-    for (size_t i = 0; i < length_; i++)
-        EXPECT_EQ(json_[i], is.Take());
-
-    EXPECT_EQ(length_, is.Tell());
-    fclose(fp);
-
-    //std::cout << filename << std::endl;
-    remove(filename);
-}
diff --git a/extra/rapidjson/test/unittest/jsoncheckertest.cpp b/extra/rapidjson/test/unittest/jsoncheckertest.cpp
deleted file mode 100644
index a43d3550a4ad..000000000000
--- a/extra/rapidjson/test/unittest/jsoncheckertest.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-static char* ReadFile(const char* filename, size_t& length) {
-    FILE *fp = fopen(filename, "rb");
-    if (!fp)
-        fp = fopen(filename, "rb");
-    if (!fp)
-        return 0;
-
-    fseek(fp, 0, SEEK_END);
-    length = (size_t)ftell(fp);
-    fseek(fp, 0, SEEK_SET);
-    char* json = (char*)malloc(length + 1);
-    size_t readLength = fread(json, 1, length, fp);
-    json[readLength] = '\0';
-    fclose(fp);
-    return json;
-}
-
-TEST(JsonChecker, Reader) {
-    char filename[256];
-
-    // jsonchecker/failXX.json
-    for (int i = 1; i <= 33; i++) {
-        if (i == 1) // fail1.json is valid in rapidjson, which has no limitation on type of root element (RFC 7159).
-            continue;
-        if (i == 18)    // fail18.json is valid in rapidjson, which has no limitation on depth of nesting.
-            continue;
-
-        sprintf(filename, "jsonchecker/fail%d.json", i);
-        size_t length;
-        char* json = ReadFile(filename, length);
-        if (!json) {
-            sprintf(filename, "../../bin/jsonchecker/fail%d.json", i);
-            json = ReadFile(filename, length);
-            if (!json) {
-                printf("jsonchecker file %s not found", filename);
-                ADD_FAILURE();
-                continue;
-            }
-        }
-
-        GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
-        document.Parse((const char*)json);
-        EXPECT_TRUE(document.HasParseError());
-
-        document.Parse<kParseIterativeFlag>((const char*)json);
-        EXPECT_TRUE(document.HasParseError());
-
-        free(json);
-    }
-
-    // passX.json
-    for (int i = 1; i <= 3; i++) {
-        sprintf(filename, "jsonchecker/pass%d.json", i);
-        size_t length;
-        char* json = ReadFile(filename, length);
-        if (!json) {
-            sprintf(filename, "../../bin/jsonchecker/pass%d.json", i);
-            json = ReadFile(filename, length);
-            if (!json) {
-                printf("jsonchecker file %s not found", filename);
-                continue;
-            }
-        }
-
-        GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
-        document.Parse((const char*)json);
-        EXPECT_FALSE(document.HasParseError());
-
-        document.Parse<kParseIterativeFlag>((const char*)json);
-        EXPECT_FALSE(document.HasParseError());
-
-        free(json);
-    }
-}
diff --git a/extra/rapidjson/test/unittest/namespacetest.cpp b/extra/rapidjson/test/unittest/namespacetest.cpp
deleted file mode 100644
index 483d3b7d47b3..000000000000
--- a/extra/rapidjson/test/unittest/namespacetest.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-// test another instantiation of RapidJSON in a different namespace 
-
-#define RAPIDJSON_NAMESPACE my::rapid::json
-#define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapid { namespace json {
-#define RAPIDJSON_NAMESPACE_END } } }
-
-// include lots of RapidJSON files
-
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-
-static const char json[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3,4]}";
-
-TEST(NamespaceTest,Using) {
-    using namespace RAPIDJSON_NAMESPACE;
-    typedef GenericDocument<UTF8<>, CrtAllocator> DocumentType;
-    DocumentType doc;
-
-    doc.Parse(json);
-    EXPECT_TRUE(!doc.HasParseError());
-}
-
-TEST(NamespaceTest,Direct) {
-    typedef RAPIDJSON_NAMESPACE::Document Document;
-    typedef RAPIDJSON_NAMESPACE::Reader Reader;
-    typedef RAPIDJSON_NAMESPACE::StringStream StringStream;
-    typedef RAPIDJSON_NAMESPACE::StringBuffer StringBuffer;
-    typedef RAPIDJSON_NAMESPACE::Writer<StringBuffer> WriterType;
-
-    StringStream s(json);
-    StringBuffer buffer;
-    WriterType writer(buffer);
-    buffer.ShrinkToFit();
-    Reader reader;
-    reader.Parse(s, writer);
-
-    EXPECT_STREQ(json, buffer.GetString());
-    EXPECT_EQ(sizeof(json)-1, buffer.GetSize());
-    EXPECT_TRUE(writer.IsComplete());
-
-    Document doc;
-    doc.Parse(buffer.GetString());
-    EXPECT_TRUE(!doc.HasParseError());
-
-    buffer.Clear();
-    writer.Reset(buffer);
-    doc.Accept(writer);
-    EXPECT_STREQ(json, buffer.GetString());
-    EXPECT_TRUE(writer.IsComplete());
-}
diff --git a/extra/rapidjson/test/unittest/readertest.cpp b/extra/rapidjson/test/unittest/readertest.cpp
deleted file mode 100644
index 426e16bb6572..000000000000
--- a/extra/rapidjson/test/unittest/readertest.cpp
+++ /dev/null
@@ -1,1173 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-#include "rapidjson/reader.h"
-#include "rapidjson/internal/dtoa.h"
-#include "rapidjson/internal/itoa.h"
-#include "rapidjson/memorystream.h"
-
-using namespace rapidjson;
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-template<bool expect>
-struct ParseBoolHandler : BaseReaderHandler<UTF8<>, ParseBoolHandler<expect> > {
-    ParseBoolHandler() : step_(0) {}
-    bool Default() { ADD_FAILURE(); return false; }
-    // gcc 4.8.x generates warning in EXPECT_EQ(bool, bool) on this gtest version.
-    // Workaround with EXPECT_TRUE().
-    bool Bool(bool b) { /*EXPECT_EQ(expect, b); */EXPECT_TRUE(expect == b);  ++step_; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseTrue) {
-    StringStream s("true");
-    ParseBoolHandler<true> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(1u, h.step_);
-}
-
-TEST(Reader, ParseFalse) {
-    StringStream s("false");
-    ParseBoolHandler<false> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(1u, h.step_);
-}
-
-struct ParseIntHandler : BaseReaderHandler<UTF8<>, ParseIntHandler> {
-    ParseIntHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Int(int i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    int actual_;
-};
-
-struct ParseUintHandler : BaseReaderHandler<UTF8<>, ParseUintHandler> {
-    ParseUintHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint(unsigned i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    unsigned actual_;
-};
-
-struct ParseInt64Handler : BaseReaderHandler<UTF8<>, ParseInt64Handler> {
-    ParseInt64Handler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Int64(int64_t i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    int64_t actual_;
-};
-
-struct ParseUint64Handler : BaseReaderHandler<UTF8<>, ParseUint64Handler> {
-    ParseUint64Handler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint64(uint64_t i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    uint64_t actual_;
-};
-
-struct ParseDoubleHandler : BaseReaderHandler<UTF8<>, ParseDoubleHandler> {
-    ParseDoubleHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Double(double d) { actual_ = d; step_++; return true; }
-
-    unsigned step_;
-    double actual_;
-};
-
-TEST(Reader, ParseNumber_Integer) {
-#define TEST_INTEGER(Handler, str, x) \
-    { \
-        StringStream s(str); \
-        Handler h; \
-        Reader reader; \
-        reader.Parse(s, h); \
-        EXPECT_EQ(1u, h.step_); \
-        EXPECT_EQ(x, h.actual_); \
-    }
-
-    TEST_INTEGER(ParseUintHandler, "0", 0u);
-    TEST_INTEGER(ParseUintHandler, "123", 123u);
-    TEST_INTEGER(ParseUintHandler, "2147483648", 2147483648u);       // 2^31 - 1 (cannot be stored in int)
-    TEST_INTEGER(ParseUintHandler, "4294967295", 4294967295u);
-
-    TEST_INTEGER(ParseIntHandler, "-123", -123);
-    TEST_INTEGER(ParseIntHandler, "-2147483648", static_cast<int32_t>(0x80000000));     // -2^31 (min of int)
-
-    TEST_INTEGER(ParseUint64Handler, "4294967296", RAPIDJSON_UINT64_C2(1, 0));   // 2^32 (max of unsigned + 1, force to use uint64_t)
-    TEST_INTEGER(ParseUint64Handler, "18446744073709551615", RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF));   // 2^64 - 1 (max of uint64_t)
-
-    TEST_INTEGER(ParseInt64Handler, "-2147483649", static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x7FFFFFFF)));   // -2^31 -1 (min of int - 1, force to use int64_t)
-    TEST_INTEGER(ParseInt64Handler, "-9223372036854775808", static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)));       // -2^63 (min of int64_t)
-
-    // Random test for uint32_t/int32_t
-    {
-        union {
-            uint32_t u;
-            int32_t i;
-        }u;
-        Random r;
-
-        for (unsigned i = 0; i < 100000; i++) {
-            u.u = r();
-
-            char buffer[32];
-            *internal::u32toa(u.u, buffer) = '\0';
-            TEST_INTEGER(ParseUintHandler, buffer, u.u);
-
-            if (u.i < 0) {
-                *internal::i32toa(u.i, buffer) = '\0';
-                TEST_INTEGER(ParseIntHandler, buffer, u.i);
-            }
-        }
-    }
-
-    // Random test for uint64_t/int64_t
-    {
-        union {
-            uint64_t u;
-            int64_t i;
-        }u;
-        Random r;
-
-        for (unsigned i = 0; i < 100000; i++) {
-            u.u = uint64_t(r()) << 32;
-            u.u |= r();
-
-            char buffer[32];
-            if (u.u >= 4294967296ULL) {
-                *internal::u64toa(u.u, buffer) = '\0';
-                TEST_INTEGER(ParseUint64Handler, buffer, u.u);
-            }
-
-            if (u.i <= -2147483649LL) {
-                *internal::i64toa(u.i, buffer) = '\0';
-                TEST_INTEGER(ParseInt64Handler, buffer, u.i);
-            }
-        }
-    }
-#undef TEST_INTEGER
-}
-
-template<bool fullPrecision>
-static void TestParseDouble() {
-#define TEST_DOUBLE(fullPrecision, str, x) \
-    { \
-        StringStream s(str); \
-        ParseDoubleHandler h; \
-        Reader reader; \
-        ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code()); \
-        EXPECT_EQ(1u, h.step_); \
-        if (fullPrecision) { \
-            EXPECT_EQ(x, h.actual_); \
-            if (x != h.actual_) \
-            printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", str, h.actual_, x); \
-        } \
-        else \
-            EXPECT_DOUBLE_EQ(x, h.actual_); \
-    }
-    
-    TEST_DOUBLE(fullPrecision, "0.0", 0.0);
-    TEST_DOUBLE(fullPrecision, "1.0", 1.0);
-    TEST_DOUBLE(fullPrecision, "-1.0", -1.0);
-    TEST_DOUBLE(fullPrecision, "1.5", 1.5);
-    TEST_DOUBLE(fullPrecision, "-1.5", -1.5);
-    TEST_DOUBLE(fullPrecision, "3.1416", 3.1416);
-    TEST_DOUBLE(fullPrecision, "1E10", 1E10);
-    TEST_DOUBLE(fullPrecision, "1e10", 1e10);
-    TEST_DOUBLE(fullPrecision, "1E+10", 1E+10);
-    TEST_DOUBLE(fullPrecision, "1E-10", 1E-10);
-    TEST_DOUBLE(fullPrecision, "-1E10", -1E10);
-    TEST_DOUBLE(fullPrecision, "-1e10", -1e10);
-    TEST_DOUBLE(fullPrecision, "-1E+10", -1E+10);
-    TEST_DOUBLE(fullPrecision, "-1E-10", -1E-10);
-    TEST_DOUBLE(fullPrecision, "1.234E+10", 1.234E+10);
-    TEST_DOUBLE(fullPrecision, "1.234E-10", 1.234E-10);
-    TEST_DOUBLE(fullPrecision, "1.79769e+308", 1.79769e+308);
-    TEST_DOUBLE(fullPrecision, "2.22507e-308", 2.22507e-308);
-    TEST_DOUBLE(fullPrecision, "-1.79769e+308", -1.79769e+308);
-    TEST_DOUBLE(fullPrecision, "-2.22507e-308", -2.22507e-308);
-    TEST_DOUBLE(fullPrecision, "4.9406564584124654e-324", 4.9406564584124654e-324); // minimum denormal
-    TEST_DOUBLE(fullPrecision, "2.2250738585072009e-308", 2.2250738585072009e-308); // Max subnormal double
-    TEST_DOUBLE(fullPrecision, "2.2250738585072014e-308", 2.2250738585072014e-308); // Min normal positive double
-    TEST_DOUBLE(fullPrecision, "1.7976931348623157e+308", 1.7976931348623157e+308); // Max double
-    TEST_DOUBLE(fullPrecision, "1e-10000", 0.0);                                   // must underflow
-    TEST_DOUBLE(fullPrecision, "18446744073709551616", 18446744073709551616.0);    // 2^64 (max of uint64_t + 1, force to use double)
-    TEST_DOUBLE(fullPrecision, "-9223372036854775809", -9223372036854775809.0);    // -2^63 - 1(min of int64_t + 1, force to use double)
-    TEST_DOUBLE(fullPrecision, "0.9868011474609375", 0.9868011474609375);          // https://github.com/miloyip/rapidjson/issues/120
-    TEST_DOUBLE(fullPrecision, "123e34", 123e34);                                  // Fast Path Cases In Disguise
-    TEST_DOUBLE(fullPrecision, "45913141877270640000.0", 45913141877270640000.0);
-    TEST_DOUBLE(fullPrecision, "2.2250738585072011e-308", 2.2250738585072011e-308); // http://www.exploringbinary.com/php-hangs-on-numeric-value-2-2250738585072011e-308/
-
-    // Since
-    // abs((2^-1022 - 2^-1074) - 2.2250738585072012e-308) = 3.109754131239141401123495768877590405345064751974375599... �� 10^-324
-    // abs((2^-1022) - 2.2250738585072012e-308) = 1.830902327173324040642192159804623318305533274168872044... �� 10 ^ -324
-    // So 2.2250738585072012e-308 should round to 2^-1022 = 2.2250738585072014e-308
-    TEST_DOUBLE(fullPrecision, "2.2250738585072012e-308", 2.2250738585072014e-308); // http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
-
-    // More closer to normal/subnormal boundary
-    // boundary = 2^-1022 - 2^-1075 = 2.225073858507201136057409796709131975934819546351645648... �� 10^-308
-    TEST_DOUBLE(fullPrecision, "2.22507385850720113605740979670913197593481954635164564e-308", 2.2250738585072009e-308);
-    TEST_DOUBLE(fullPrecision, "2.22507385850720113605740979670913197593481954635164565e-308", 2.2250738585072014e-308);
-
-    // 1.0 is in (1.0 - 2^-54, 1.0 + 2^-53)
-    // 1.0 - 2^-54 = 0.999999999999999944488848768742172978818416595458984375
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984375", 1.0); // round to even
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984374", 0.99999999999999989); // previous double
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984376", 1.0); // next double
-    // 1.0 + 2^-53 = 1.00000000000000011102230246251565404236316680908203125
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203125", 1.0); // round to even
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203124", 1.0); // previous double
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203126", 1.00000000000000022); // next double
-
-    {
-        char n1e308[310];   // '1' followed by 308 '0'
-        n1e308[0] = '1';
-        for (int i = 1; i < 309; i++)
-            n1e308[i] = '0';
-        n1e308[309] = '\0';
-        TEST_DOUBLE(fullPrecision, n1e308, 1E308);
-    }
-
-#if 0 // Very slow
-    static const unsigned count = 10000000;
-    // Random test for double
-    {
-        Random r;
-
-        for (unsigned i = 0; i < count; i++) {
-            internal::Double d;
-            do {
-                // Need to call r() in two statements for cross-platform coherent sequence.
-                uint64_t u = uint64_t(r()) << 32;
-                u |= uint64_t(r());
-                d = internal::Double(u);
-            } while (d.IsNan() || d.IsInf()/* || !d.IsNormal()*/);  // Also work for subnormal now
-
-            char buffer[32];
-            *internal::dtoa(d.Value(), buffer) = '\0';
-            TEST_DOUBLE(fullPrecision, buffer, d.Value());
-        }
-    }
-#endif
-
-#undef TEST_DOUBLE
-}
-
-TEST(Reader, ParseNumber_NormalPrecisionDouble) {
-    TestParseDouble<false>();
-}
-
-TEST(Reader, ParseNumber_FullPrecisionDouble) {
-    TestParseDouble<true>();
-}
-
-TEST(Reader, ParseNumber_NormalPrecisionError) {
-    static unsigned count = 1000000;
-    Random r;
-
-    double ulpSum = 0.0;
-    double ulpMax = 0.0;
-    for (unsigned i = 0; i < count; i++) {
-        internal::Double e, a;
-        do {
-            // Need to call r() in two statements for cross-platform coherent sequence.
-            uint64_t u = uint64_t(r()) << 32;
-            u |= uint64_t(r());
-            e = u;
-        } while (e.IsNan() || e.IsInf() || !e.IsNormal());
-
-        char buffer[32];
-        *internal::dtoa(e.Value(), buffer) = '\0';
-
-        StringStream s(buffer);
-        ParseDoubleHandler h;
-        Reader reader;
-        ASSERT_EQ(kParseErrorNone, reader.Parse(s, h).Code());
-        EXPECT_EQ(1u, h.step_);
-
-        a = h.actual_;
-        uint64_t bias1 = e.ToBias();
-        uint64_t bias2 = a.ToBias();
-        double ulp = bias1 >= bias2 ? bias1 - bias2 : bias2 - bias1;
-        ulpMax = std::max(ulpMax, ulp);
-        ulpSum += ulp;
-    }
-    printf("ULP Average = %g, Max = %g \n", ulpSum / count, ulpMax);
-}
-
-TEST(Reader, ParseNumber_Error) {
-#define TEST_NUMBER_ERROR(errorCode, str) \
-    { \
-        char buffer[1001]; \
-        sprintf(buffer, "%s", str); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        Reader reader; \
-        EXPECT_FALSE(reader.Parse(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-    }
-
-    // Number too big to be stored in double.
-    {
-        char n1e309[311];   // '1' followed by 309 '0'
-        n1e309[0] = '1';
-        for (int i = 1; i < 310; i++)
-            n1e309[i] = '0';
-        n1e309[310] = '\0';
-        TEST_NUMBER_ERROR(kParseErrorNumberTooBig, n1e309);
-    }
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e309");
-
-    // Miss fraction part in number.
-    TEST_NUMBER_ERROR(kParseErrorNumberMissFraction, "1.");
-    TEST_NUMBER_ERROR(kParseErrorNumberMissFraction, "1.a");
-
-    // Miss exponent in number.
-    TEST_NUMBER_ERROR(kParseErrorNumberMissExponent, "1e");
-    TEST_NUMBER_ERROR(kParseErrorNumberMissExponent, "1e_");
-
-#undef TEST_NUMBER_ERROR
-}
-
-template <typename Encoding>
-struct ParseStringHandler : BaseReaderHandler<Encoding, ParseStringHandler<Encoding> > {
-    ParseStringHandler() : str_(0), length_(0), copy_() {}
-    ~ParseStringHandler() { EXPECT_TRUE(str_ != 0); if (copy_) free(const_cast<typename Encoding::Ch*>(str_)); }
-    
-    ParseStringHandler(const ParseStringHandler&);
-    ParseStringHandler& operator=(const ParseStringHandler&);
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool String(const typename Encoding::Ch* str, size_t length, bool copy) { 
-        EXPECT_EQ(0, str_);
-        if (copy) {
-            str_ = (typename Encoding::Ch*)malloc((length + 1) * sizeof(typename Encoding::Ch));
-            memcpy(const_cast<typename Encoding::Ch*>(str_), str, (length + 1) * sizeof(typename Encoding::Ch));
-        }
-        else
-            str_ = str;
-        length_ = length; 
-        copy_ = copy;
-        return true;
-    }
-
-    const typename Encoding::Ch* str_;
-    size_t length_;
-    bool copy_;
-};
-
-TEST(Reader, ParseString) {
-#define TEST_STRING(Encoding, e, x) \
-    { \
-        Encoding::Ch* buffer = StrDup(x); \
-        GenericInsituStringStream<Encoding> is(buffer); \
-        ParseStringHandler<Encoding> h; \
-        GenericReader<Encoding, Encoding> reader; \
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag>(is, h); \
-        EXPECT_EQ(0, StrCmp<Encoding::Ch>(e, h.str_)); \
-        EXPECT_EQ(StrLen(e), h.length_); \
-        free(buffer); \
-        GenericStringStream<Encoding> s(x); \
-        ParseStringHandler<Encoding> h2; \
-        GenericReader<Encoding, Encoding> reader2; \
-        reader2.Parse(s, h2); \
-        EXPECT_EQ(0, StrCmp<Encoding::Ch>(e, h2.str_)); \
-        EXPECT_EQ(StrLen(e), h2.length_); \
-    }
-
-    // String constant L"\xXX" can only specify character code in bytes, which is not endianness-neutral. 
-    // And old compiler does not support u"" and U"" string literal. So here specify string literal by array of Ch.
-    // In addition, GCC 4.8 generates -Wnarrowing warnings when character code >= 128 are assigned to signed integer types.
-    // Therefore, utype is added for declaring unsigned array, and then cast it to Encoding::Ch.
-#define ARRAY(...) { __VA_ARGS__ }
-#define TEST_STRINGARRAY(Encoding, utype, array, x) \
-    { \
-        static const utype ue[] = array; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        TEST_STRING(Encoding, e, x); \
-    }
-
-#define TEST_STRINGARRAY2(Encoding, utype, earray, xarray) \
-    { \
-        static const utype ue[] = earray; \
-        static const utype xe[] = xarray; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        static const Encoding::Ch* x = reinterpret_cast<const Encoding::Ch *>(&xe[0]); \
-        TEST_STRING(Encoding, e, x); \
-    }
-
-    TEST_STRING(UTF8<>, "", "\"\"");
-    TEST_STRING(UTF8<>, "Hello", "\"Hello\"");
-    TEST_STRING(UTF8<>, "Hello\nWorld", "\"Hello\\nWorld\"");
-    TEST_STRING(UTF8<>, "\"\\/\b\f\n\r\t", "\"\\\"\\\\/\\b\\f\\n\\r\\t\"");
-    TEST_STRING(UTF8<>, "\x24", "\"\\u0024\"");         // Dollar sign U+0024
-    TEST_STRING(UTF8<>, "\xC2\xA2", "\"\\u00A2\"");     // Cents sign U+00A2
-    TEST_STRING(UTF8<>, "\xE2\x82\xAC", "\"\\u20AC\""); // Euro sign U+20AC
-    TEST_STRING(UTF8<>, "\xF0\x9D\x84\x9E", "\"\\uD834\\uDD1E\"");  // G clef sign U+1D11E
-
-    // UTF16
-    TEST_STRING(UTF16<>, L"", L"\"\"");
-    TEST_STRING(UTF16<>, L"Hello", L"\"Hello\"");
-    TEST_STRING(UTF16<>, L"Hello\nWorld", L"\"Hello\\nWorld\"");
-    TEST_STRING(UTF16<>, L"\"\\/\b\f\n\r\t", L"\"\\\"\\\\/\\b\\f\\n\\r\\t\"");
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x0024, 0x0000), L"\"\\u0024\"");
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x00A2, 0x0000), L"\"\\u00A2\"");  // Cents sign U+00A2
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x20AC, 0x0000), L"\"\\u20AC\"");  // Euro sign U+20AC
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0xD834, 0xDD1E, 0x0000), L"\"\\uD834\\uDD1E\"");   // G clef sign U+1D11E
-
-    // UTF32
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('\0'), ARRAY('\"', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('H', 'e', 'l', 'l', 'o', '\0'), ARRAY('\"', 'H', 'e', 'l', 'l', 'o', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('H', 'e', 'l', 'l', 'o', '\n', 'W', 'o', 'r', 'l', 'd', '\0'), ARRAY('\"', 'H', 'e', 'l', 'l', 'o', '\\', 'n', 'W', 'o', 'r', 'l', 'd', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('\"', '\\', '/', '\b', '\f', '\n', '\r', '\t', '\0'), ARRAY('\"', '\\', '\"', '\\', '\\', '/', '\\', 'b', '\\', 'f', '\\', 'n', '\\', 'r', '\\', 't', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x00024, 0x0000), ARRAY('\"', '\\', 'u', '0', '0', '2', '4', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x000A2, 0x0000), ARRAY('\"', '\\', 'u', '0', '0', 'A', '2', '\"', '\0'));   // Cents sign U+00A2
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x020AC, 0x0000), ARRAY('\"', '\\', 'u', '2', '0', 'A', 'C', '\"', '\0'));   // Euro sign U+20AC
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x1D11E, 0x0000), ARRAY('\"', '\\', 'u', 'D', '8', '3', '4', '\\', 'u', 'D', 'D', '1', 'E', '\"', '\0'));    // G clef sign U+1D11E
-
-#undef TEST_STRINGARRAY
-#undef ARRAY
-#undef TEST_STRING
-
-    // Support of null character in string
-    {
-        StringStream s("\"Hello\\u0000World\"");
-        const char e[] = "Hello\0World";
-        ParseStringHandler<UTF8<> > h;
-        Reader reader;
-        reader.Parse(s, h);
-        EXPECT_EQ(0, memcmp(e, h.str_, h.length_ + 1));
-        EXPECT_EQ(11u, h.length_);
-    }
-}
-
-TEST(Reader, ParseString_Transcoding) {
-    const char* x = "\"Hello\"";
-    const wchar_t* e = L"Hello";
-    GenericStringStream<UTF8<> > is(x);
-    GenericReader<UTF8<>, UTF16<> > reader;
-    ParseStringHandler<UTF16<> > h;
-    reader.Parse(is, h);
-    EXPECT_EQ(0, StrCmp<UTF16<>::Ch>(e, h.str_));
-    EXPECT_EQ(StrLen(e), h.length_);
-}
-
-TEST(Reader, ParseString_NonDestructive) {
-    StringStream s("\"Hello\\nWorld\"");
-    ParseStringHandler<UTF8<> > h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(0, StrCmp("Hello\nWorld", h.str_));
-    EXPECT_EQ(11u, h.length_);
-}
-
-ParseErrorCode TestString(const char* str) {
-    StringStream s(str);
-    BaseReaderHandler<> h;
-    Reader reader;
-    reader.Parse<kParseValidateEncodingFlag>(s, h);
-    return reader.GetParseErrorCode();
-}
-
-TEST(Reader, ParseString_Error) {
-#define TEST_STRING_ERROR(errorCode, str)\
-        EXPECT_EQ(errorCode, TestString(str))
-
-#define ARRAY(...) { __VA_ARGS__ }
-#define TEST_STRINGENCODING_ERROR(Encoding, utype, array) \
-    { \
-        static const utype ue[] = array; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        EXPECT_EQ(kParseErrorStringInvalidEncoding, TestString(e));\
-    }
-
-    // Invalid escape character in string.
-    TEST_STRING_ERROR(kParseErrorStringEscapeInvalid, "[\"\\a\"]");
-
-    // Incorrect hex digit after \\u escape in string.
-    TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uABCG\"]");
-
-    // The surrogate pair in string is invalid.
-    TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800X\"]");
-    TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800\\uFFFF\"]");
-
-    // Missing a closing quotation mark in string.
-    TEST_STRING_ERROR(kParseErrorStringMissQuotationMark, "[\"Test]");
-
-    // http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-
-    // 3  Malformed sequences 
-
-    // 3.1 Unexpected continuation bytes
-    {
-         char e[] = { '[', '\"', 0, '\"', ']', '\0' };
-         for (unsigned char c = 0x80u; c <= 0xBFu; c++) {
-            e[2] = c;
-            ParseErrorCode error = TestString(e);
-            EXPECT_EQ(kParseErrorStringInvalidEncoding, error);
-            if (error != kParseErrorStringInvalidEncoding)
-                std::cout << (unsigned)(unsigned char)c << std::endl;
-         }
-    }
-
-    // 3.2 Lonely start characters, 3.5 Impossible bytes
-    {
-        char e[] = { '[', '\"', 0, ' ', '\"', ']', '\0' };
-        for (unsigned c = 0xC0u; c <= 0xFFu; c++) {
-            e[2] = (char)c;
-            TEST_STRING_ERROR(kParseErrorStringInvalidEncoding, e);
-        }
-    }
-
-    // 4  Overlong sequences 
-
-    // 4.1  Examples of an overlong ASCII character
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xC0u, 0xAFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x80u, 0xAFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x80u, 0x80u, 0xAFu, '\"', ']', '\0'));
-
-    // 4.2  Maximum overlong sequences 
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xC1u, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x9Fu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x8Fu, 0xBFu, 0xBFu, '\"', ']', '\0'));
-
-    // 4.3  Overlong representation of the NUL character 
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xC0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x80u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x80u, 0x80u, 0x80u, '\"', ']', '\0'));
-
-    // 5  Illegal code positions
-
-    // 5.1 Single UTF-16 surrogates
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xA0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xADu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xAEu, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xAFu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xB0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xBEu, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xBFu, 0xBFu, '\"', ']', '\0'));
-
-#undef ARRAY
-#undef TEST_STRINGARRAY_ERROR
-}
-
-template <unsigned count>
-struct ParseArrayHandler : BaseReaderHandler<UTF8<>, ParseArrayHandler<count> > {
-    ParseArrayHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint(unsigned i) { EXPECT_EQ(step_, i); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndArray(SizeType) { step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseEmptyArray) {
-    char *json = StrDup("[ ] ");
-    InsituStringStream s(json);
-    ParseArrayHandler<0> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(2u, h.step_);
-    free(json);
-}
-
-TEST(Reader, ParseArray) {
-    char *json = StrDup("[1, 2, 3, 4]");
-    InsituStringStream s(json);
-    ParseArrayHandler<4> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(6u, h.step_);
-    free(json);
-}
-
-TEST(Reader, ParseArray_Error) {
-#define TEST_ARRAY_ERROR(errorCode, str) \
-    { \
-        char buffer[1001]; \
-        strncpy(buffer, str, 1000); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        GenericReader<UTF8<>, UTF8<>, CrtAllocator> reader; \
-        EXPECT_FALSE(reader.Parse(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-    }
-
-    // Missing a comma or ']' after an array element.
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1");
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1}");
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1 2]");
-
-#undef TEST_ARRAY_ERROR
-}
-
-struct ParseObjectHandler : BaseReaderHandler<UTF8<>, ParseObjectHandler> {
-    ParseObjectHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Null() { EXPECT_EQ(8u, step_); step_++; return true; }
-    bool Bool(bool b) { 
-        switch(step_) {
-            case 4: EXPECT_TRUE(b); step_++; return true;
-            case 6: EXPECT_FALSE(b); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool Int(int i) { 
-        switch(step_) {
-            case 10: EXPECT_EQ(123, i); step_++; return true;
-            case 15: EXPECT_EQ(1, i); step_++; return true;
-            case 16: EXPECT_EQ(2, i); step_++; return true;
-            case 17: EXPECT_EQ(3, i); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool Uint(unsigned i) { return Int(i); }
-    bool Double(double d) { EXPECT_EQ(12u, step_); EXPECT_EQ(3.1416, d); step_++; return true; }
-    bool String(const char* str, size_t, bool) { 
-        switch(step_) {
-            case 1: EXPECT_STREQ("hello", str); step_++; return true;
-            case 2: EXPECT_STREQ("world", str); step_++; return true;
-            case 3: EXPECT_STREQ("t", str); step_++; return true;
-            case 5: EXPECT_STREQ("f", str); step_++; return true;
-            case 7: EXPECT_STREQ("n", str); step_++; return true;
-            case 9: EXPECT_STREQ("i", str); step_++; return true;
-            case 11: EXPECT_STREQ("pi", str); step_++; return true;
-            case 13: EXPECT_STREQ("a", str); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType memberCount) { EXPECT_EQ(19u, step_); EXPECT_EQ(7u, memberCount); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(14u, step_); step_++; return true; }
-    bool EndArray(SizeType elementCount) { EXPECT_EQ(18u, step_); EXPECT_EQ(3u, elementCount); step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseObject) {
-    const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ";
-
-    // Insitu
-    {
-        char* json2 = StrDup(json);
-        InsituStringStream s(json2);
-        ParseObjectHandler h;
-        Reader reader;
-        reader.Parse<kParseInsituFlag>(s, h);
-        EXPECT_EQ(20u, h.step_);
-        free(json2);
-    }
-
-    // Normal
-    {
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        reader.Parse(s, h);
-        EXPECT_EQ(20u, h.step_);
-    }
-}
-
-struct ParseEmptyObjectHandler : BaseReaderHandler<UTF8<>, ParseEmptyObjectHandler> {
-    ParseEmptyObjectHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType) { EXPECT_EQ(1u, step_); step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, Parse_EmptyObject) {
-    StringStream s("{ } ");
-    ParseEmptyObjectHandler h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(2u, h.step_);
-}
-
-struct ParseMultipleRootHandler : BaseReaderHandler<UTF8<>, ParseMultipleRootHandler> {
-    ParseMultipleRootHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType) { EXPECT_EQ(1u, step_); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(2u, step_); step_++; return true; }
-    bool EndArray(SizeType) { EXPECT_EQ(3u, step_); step_++; return true; }
-
-    unsigned step_;
-};
-
-template <unsigned parseFlags>
-void TestMultipleRoot() {
-    StringStream s("{}[] a");
-    ParseMultipleRootHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<parseFlags>(s, h));
-    EXPECT_EQ(2u, h.step_);
-    EXPECT_TRUE(reader.Parse<parseFlags>(s, h));
-    EXPECT_EQ(4u, h.step_);
-    EXPECT_EQ(' ', s.Take());
-    EXPECT_EQ('a', s.Take());
-}
-
-TEST(Reader, Parse_MultipleRoot) {
-    TestMultipleRoot<kParseStopWhenDoneFlag>();
-}
-
-TEST(Reader, ParseIterative_MultipleRoot) {
-    TestMultipleRoot<kParseIterativeFlag | kParseStopWhenDoneFlag>();
-}
-
-template <unsigned parseFlags>
-void TestInsituMultipleRoot() {
-    char* buffer = strdup("{}[] a");
-    InsituStringStream s(buffer);
-    ParseMultipleRootHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseInsituFlag | parseFlags>(s, h));
-    EXPECT_EQ(2u, h.step_);
-    EXPECT_TRUE(reader.Parse<kParseInsituFlag | parseFlags>(s, h));
-    EXPECT_EQ(4u, h.step_);
-    EXPECT_EQ(' ', s.Take());
-    EXPECT_EQ('a', s.Take());
-    free(buffer);
-}
-
-TEST(Reader, ParseInsitu_MultipleRoot) {
-    TestInsituMultipleRoot<kParseStopWhenDoneFlag>();
-}
-
-TEST(Reader, ParseInsituIterative_MultipleRoot) {
-    TestInsituMultipleRoot<kParseIterativeFlag | kParseStopWhenDoneFlag>();
-}
-
-#define TEST_ERROR(errorCode, str) \
-    { \
-        char buffer[1001]; \
-        strncpy(buffer, str, 1000); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        Reader reader; \
-        EXPECT_FALSE(reader.Parse(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-    }
-
-TEST(Reader, ParseDocument_Error) {
-    // The document is empty.
-    TEST_ERROR(kParseErrorDocumentEmpty, "");
-    TEST_ERROR(kParseErrorDocumentEmpty, " ");
-    TEST_ERROR(kParseErrorDocumentEmpty, " \n");
-
-    // The document root must not follow by other values.
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "[] 0");
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "{} 0");
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "null []");
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "0 {}");
-}
-
-TEST(Reader, ParseValue_Error) {
-    // Invalid value.
-    TEST_ERROR(kParseErrorValueInvalid, "nulL");
-    TEST_ERROR(kParseErrorValueInvalid, "truE");
-    TEST_ERROR(kParseErrorValueInvalid, "falsE");
-    TEST_ERROR(kParseErrorValueInvalid, "a]");
-    TEST_ERROR(kParseErrorValueInvalid, ".1");
-}
-
-TEST(Reader, ParseObject_Error) {
-    // Missing a name for object member.
-    TEST_ERROR(kParseErrorObjectMissName, "{1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{null:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{true:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{false:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{1:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{[]:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{{}:1}");
-    TEST_ERROR(kParseErrorObjectMissName, "{xyz:1}");
-
-    // Missing a colon after a name of object member.
-    TEST_ERROR(kParseErrorObjectMissColon, "{\"a\" 1}");
-    TEST_ERROR(kParseErrorObjectMissColon, "{\"a\",1}");
-
-    // Must be a comma or '}' after an object member
-    TEST_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, "{\"a\":1]");
-
-    // This tests that MemoryStream is checking the length in Peek().
-    {
-        MemoryStream ms("{\"a\"", 1);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_FALSE(reader.Parse<kParseStopWhenDoneFlag>(ms, h));
-        EXPECT_EQ(kParseErrorObjectMissName, reader.GetParseErrorCode());
-    }
-}
-
-#undef TEST_ERROR
-
-TEST(Reader, SkipWhitespace) {
-    StringStream ss(" A \t\tB\n \n\nC\r\r \rD \t\n\r E");
-    const char* expected = "ABCDE";
-    for (size_t i = 0; i < 5; i++) {
-        SkipWhitespace(ss);
-        EXPECT_EQ(expected[i], ss.Take());
-    }
-}
-
-// Test implementing a stream without copy stream optimization.
-// Clone from GenericStringStream except that copy constructor is disabled.
-template <typename Encoding>
-class CustomStringStream {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    CustomStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    CustomStringStream(const CustomStringStream&);
-    CustomStringStream& operator=(const CustomStringStream&);
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-// If the following code is compiled, it should generate compilation error as predicted.
-// Because CustomStringStream<> is not copyable via making copy constructor private.
-#if 0
-namespace rapidjson {
-
-template <typename Encoding>
-struct StreamTraits<CustomStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-} // namespace rapidjson
-#endif 
-
-TEST(Reader, CustomStringStream) {
-    const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ";
-    CustomStringStream<UTF8<char> > s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(20u, h.step_);
-}
-
-#include <sstream>
-
-class IStreamWrapper {
-public:
-    typedef char Ch;
-
-    IStreamWrapper(std::istream& is) : is_(is) {}
-
-    Ch Peek() const {
-        int c = is_.peek();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    Ch Take() { 
-        int c = is_.get();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    size_t Tell() const { return (size_t)is_.tellg(); }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch) { assert(false); }
-    void Flush() { assert(false); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    IStreamWrapper(const IStreamWrapper&);
-    IStreamWrapper& operator=(const IStreamWrapper&);
-
-    std::istream& is_;
-};
-
-TEST(Reader, Parse_IStreamWrapper_StringStream) {
-    const char* json = "[1,2,3,4]";
-
-    std::stringstream ss(json);
-    IStreamWrapper is(ss);
-
-    Reader reader;
-    ParseArrayHandler<4> h;
-    reader.Parse(is, h);
-    EXPECT_FALSE(reader.HasParseError());   
-}
-
-// Test iterative parsing.
-
-#define TESTERRORHANDLING(text, errorCode, offset)\
-{\
-    StringStream json(text); \
-    BaseReaderHandler<> handler; \
-    Reader reader; \
-    reader.Parse<kParseIterativeFlag>(json, handler); \
-    EXPECT_TRUE(reader.HasParseError()); \
-    EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \
-    EXPECT_EQ(offset, reader.GetErrorOffset()); \
-}
-
-TEST(Reader, IterativeParsing_ErrorHandling) {
-    TESTERRORHANDLING("{\"a\": a}", kParseErrorValueInvalid, 6u);
-
-    TESTERRORHANDLING("", kParseErrorDocumentEmpty, 0u);
-    TESTERRORHANDLING("{}{}", kParseErrorDocumentRootNotSingular, 2u);
-
-    TESTERRORHANDLING("{1}", kParseErrorObjectMissName, 1u);
-    TESTERRORHANDLING("{\"a\", 1}", kParseErrorObjectMissColon, 4u);
-    TESTERRORHANDLING("{\"a\"}", kParseErrorObjectMissColon, 4u);
-    TESTERRORHANDLING("{\"a\": 1", kParseErrorObjectMissCommaOrCurlyBracket, 7u);
-    TESTERRORHANDLING("[1 2 3]", kParseErrorArrayMissCommaOrSquareBracket, 3u);
-}
-
-template<typename Encoding = UTF8<> >
-struct IterativeParsingReaderHandler {
-    typedef typename Encoding::Ch Ch;
-
-    const static int LOG_NULL = -1;
-    const static int LOG_BOOL = -2;
-    const static int LOG_INT = -3;
-    const static int LOG_UINT = -4;
-    const static int LOG_INT64 = -5;
-    const static int LOG_UINT64 = -6;
-    const static int LOG_DOUBLE = -7;
-    const static int LOG_STRING = -8;
-    const static int LOG_STARTOBJECT = -9;
-    const static int LOG_KEY = -10;
-    const static int LOG_ENDOBJECT = -11;
-    const static int LOG_STARTARRAY = -12;
-    const static int LOG_ENDARRAY = -13;
-
-    const static size_t LogCapacity = 256;
-    int Logs[LogCapacity];
-    size_t LogCount;
-
-    IterativeParsingReaderHandler() : LogCount(0) {
-    }
-
-    bool Null() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_NULL; return true; }
-
-    bool Bool(bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_BOOL; return true; }
-
-    bool Int(int) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT; return true; }
-
-    bool Uint(unsigned) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT; return true; }
-
-    bool Int64(int64_t) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT64; return true; }
-
-    bool Uint64(uint64_t) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_UINT64; return true; }
-
-    bool Double(double) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_DOUBLE; return true; }
-
-    bool String(const Ch*, SizeType, bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STRING; return true; }
-
-    bool StartObject() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STARTOBJECT; return true; }
-
-    bool Key (const Ch*, SizeType, bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_KEY; return true; }
-	
-    bool EndObject(SizeType c) {
-        RAPIDJSON_ASSERT(LogCount < LogCapacity);
-        Logs[LogCount++] = LOG_ENDOBJECT;
-        Logs[LogCount++] = (int)c;
-        return true;
-    }
-
-    bool StartArray() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STARTARRAY; return true; }
-
-    bool EndArray(SizeType c) {
-        RAPIDJSON_ASSERT(LogCount < LogCapacity);
-        Logs[LogCount++] = LOG_ENDARRAY;
-        Logs[LogCount++] = (int)c;
-        return true;
-    }
-};
-
-TEST(Reader, IterativeParsing_General) {
-    {
-        StringStream is("[1, {\"k\": [1, 2]}, null, false, true, \"string\", 1.2]");
-        Reader reader;
-        IterativeParsingReaderHandler<> handler;
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_FALSE(r.IsError());
-        EXPECT_FALSE(reader.HasParseError());
-
-        int e[] = {
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_KEY,
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_INT,
-            handler.LOG_ENDARRAY, 2,
-            handler.LOG_ENDOBJECT, 1,
-            handler.LOG_NULL,
-            handler.LOG_BOOL,
-            handler.LOG_BOOL,
-            handler.LOG_STRING,
-            handler.LOG_DOUBLE,
-            handler.LOG_ENDARRAY, 7
-        };
-
-        EXPECT_EQ(sizeof(e) / sizeof(int), handler.LogCount);
-
-        for (size_t i = 0; i < handler.LogCount; ++i) {
-            EXPECT_EQ(e[i], handler.Logs[i]) << "i = " << i;
-        }
-    }
-}
-
-TEST(Reader, IterativeParsing_Count) {
-    {
-        StringStream is("[{}, {\"k\": 1}, [1], []]");
-        Reader reader;
-        IterativeParsingReaderHandler<> handler;
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_FALSE(r.IsError());
-        EXPECT_FALSE(reader.HasParseError());
-
-        int e[] = {
-            handler.LOG_STARTARRAY,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_ENDOBJECT, 0,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_KEY,
-            handler.LOG_INT,
-            handler.LOG_ENDOBJECT, 1,
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_ENDARRAY, 1,
-            handler.LOG_STARTARRAY,
-            handler.LOG_ENDARRAY, 0,
-            handler.LOG_ENDARRAY, 4
-        };
-
-        EXPECT_EQ(sizeof(e) / sizeof(int), handler.LogCount);
-
-        for (size_t i = 0; i < handler.LogCount; ++i) {
-            EXPECT_EQ(e[i], handler.Logs[i]) << "i = " << i;
-        }
-    }
-}
-
-// Test iterative parsing on kParseErrorTermination.
-struct HandlerTerminateAtStartObject : public IterativeParsingReaderHandler<> {
-    bool StartObject() { return false; }
-};
-
-struct HandlerTerminateAtStartArray : public IterativeParsingReaderHandler<> {
-    bool StartArray() { return false; }
-};
-
-struct HandlerTerminateAtEndObject : public IterativeParsingReaderHandler<> {
-    bool EndObject(SizeType) { return false; }
-};
-
-struct HandlerTerminateAtEndArray : public IterativeParsingReaderHandler<> {
-    bool EndArray(SizeType) { return false; }
-};
-
-TEST(Reader, IterativeParsing_ShortCircuit) {
-    {
-        HandlerTerminateAtStartObject handler;
-        Reader reader;
-        StringStream is("[1, {}]");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(4u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtStartArray handler;
-        Reader reader;
-        StringStream is("{\"a\": []}");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(6u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtEndObject handler;
-        Reader reader;
-        StringStream is("[1, {}]");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(5u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtEndArray handler;
-        Reader reader;
-        StringStream is("{\"a\": []}");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(7u, r.Offset());
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/extra/rapidjson/test/unittest/stringbuffertest.cpp b/extra/rapidjson/test/unittest/stringbuffertest.cpp
deleted file mode 100644
index 24a29cbe98b3..000000000000
--- a/extra/rapidjson/test/unittest/stringbuffertest.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-
-using namespace rapidjson;
-
-TEST(StringBuffer, InitialSize) {
-    StringBuffer buffer;
-    EXPECT_EQ(0u, buffer.GetSize());
-    EXPECT_STREQ("", buffer.GetString());
-}
-
-TEST(StringBuffer, Put) {
-    StringBuffer buffer;
-    buffer.Put('A');
-
-    EXPECT_EQ(1u, buffer.GetSize());
-    EXPECT_STREQ("A", buffer.GetString());
-}
-
-TEST(StringBuffer, Clear) {
-    StringBuffer buffer;
-    buffer.Put('A');
-    buffer.Put('B');
-    buffer.Put('C');
-    buffer.Clear();
-
-    EXPECT_EQ(0u, buffer.GetSize());
-    EXPECT_STREQ("", buffer.GetString());
-}
-
-TEST(StringBuffer, Push) {
-    StringBuffer buffer;
-    buffer.Push(5);
-
-    EXPECT_EQ(5u, buffer.GetSize());
-}
-
-TEST(StringBuffer, Pop) {
-    StringBuffer buffer;
-    buffer.Put('A');
-    buffer.Put('B');
-    buffer.Put('C');
-    buffer.Put('D');
-    buffer.Put('E');
-    buffer.Pop(3);
-
-    EXPECT_EQ(2u, buffer.GetSize());
-    EXPECT_STREQ("AB", buffer.GetString());
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#include <type_traits>
-
-TEST(StringBuffer, Traits) {
-    static_assert( std::is_constructible<StringBuffer>::value, "");
-    static_assert( std::is_default_constructible<StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<StringBuffer>::value, "");
-#endif
-    static_assert( std::is_move_constructible<StringBuffer>::value, "");
-
-    static_assert(!std::is_nothrow_constructible<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_default_constructible<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_copy_constructible<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_move_constructible<StringBuffer>::value, "");
-
-    static_assert( std::is_assignable<StringBuffer,StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_assignable<StringBuffer>::value, "");
-#endif
-    static_assert( std::is_move_assignable<StringBuffer>::value, "");
-
-    static_assert(!std::is_nothrow_assignable<StringBuffer,StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_copy_assignable<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_move_assignable<StringBuffer>::value, "");
-
-    static_assert( std::is_destructible<StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<StringBuffer>::value, "");
-#endif
-}
-
-TEST(StringBuffer, MoveConstructor) {
-    StringBuffer x;
-    x.Put('A');
-    x.Put('B');
-    x.Put('C');
-    x.Put('D');
-
-    EXPECT_EQ(4u, x.GetSize());
-    EXPECT_STREQ("ABCD", x.GetString());
-
-    // StringBuffer y(x); // does not compile (!is_copy_constructible)
-    StringBuffer y(std::move(x));
-    EXPECT_EQ(0u, x.GetSize());
-    EXPECT_EQ(4u, y.GetSize());
-    EXPECT_STREQ("ABCD", y.GetString());
-
-    // StringBuffer z = y; // does not compile (!is_copy_assignable)
-    StringBuffer z = std::move(y);
-    EXPECT_EQ(0u, y.GetSize());
-    EXPECT_EQ(4u, z.GetSize());
-    EXPECT_STREQ("ABCD", z.GetString());
-}
-
-TEST(StringBuffer, MoveAssignment) {
-    StringBuffer x;
-    x.Put('A');
-    x.Put('B');
-    x.Put('C');
-    x.Put('D');
-
-    EXPECT_EQ(4u, x.GetSize());
-    EXPECT_STREQ("ABCD", x.GetString());
-
-    StringBuffer y;
-    // y = x; // does not compile (!is_copy_assignable)
-    y = std::move(x);
-    EXPECT_EQ(0u, x.GetSize());
-    EXPECT_EQ(4u, y.GetSize());
-    EXPECT_STREQ("ABCD", y.GetString());
-}
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
diff --git a/extra/rapidjson/test/unittest/strtodtest.cpp b/extra/rapidjson/test/unittest/strtodtest.cpp
deleted file mode 100644
index d8849be6dd96..000000000000
--- a/extra/rapidjson/test/unittest/strtodtest.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-#include "rapidjson/internal/strtod.h"
-
-#define BIGINTEGER_LITERAL(s) BigInteger(s, sizeof(s) - 1)
-
-using namespace rapidjson::internal;
-
-TEST(Strtod, CheckApproximationCase) {
-    static const int kSignificandSize = 52;
-    static const int kExponentBias = 0x3FF;
-    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    // http://www.exploringbinary.com/using-integers-to-check-a-floating-point-approximation/
-    // Let b = 0x1.465a72e467d88p-149
-    //       = 5741268244528520 x 2^-201
-    union {
-        double d;
-        uint64_t u;
-    }u;
-    u.u = 0x465a72e467d88 | ((static_cast<uint64_t>(-149 + kExponentBias)) << kSignificandSize);
-    const double b = u.d;
-    const uint64_t bInt = (u.u & kSignificandMask) | kHiddenBit;
-    const int bExp = ((u.u & kExponentMask) >> kSignificandSize) - kExponentBias - kSignificandSize;
-    EXPECT_DOUBLE_EQ(1.7864e-45, b);
-    EXPECT_EQ(RAPIDJSON_UINT64_C2(0x001465a7, 0x2e467d88), bInt);
-    EXPECT_EQ(-201, bExp);
-
-    // Let d = 17864 x 10-49
-    const char dInt[] = "17864";
-    const int dExp = -49;
-
-    // Let h = 2^(bExp-1)
-    const int hExp = bExp - 1;
-    EXPECT_EQ(-202, hExp);
-
-    int dS_Exp2 = 0;
-    int dS_Exp5 = 0;
-    int bS_Exp2 = 0;
-    int bS_Exp5 = 0;
-    int hS_Exp2 = 0;
-    int hS_Exp5 = 0;
-
-    // Adjust for decimal exponent
-    if (dExp >= 0) {
-        dS_Exp2 += dExp;
-        dS_Exp5 += dExp;
-    }
-    else {
-        bS_Exp2 -= dExp;
-        bS_Exp5 -= dExp;
-        hS_Exp2 -= dExp;
-        hS_Exp5 -= dExp;
-    }
-
-    // Adjust for binary exponent
-    if (bExp >= 0)
-        bS_Exp2 += bExp;
-    else {
-        dS_Exp2 -= bExp;
-        hS_Exp2 -= bExp;
-    }
-
-    // Adjust for half ulp exponent
-    if (hExp >= 0)
-        hS_Exp2 += hExp;
-    else {
-        dS_Exp2 -= hExp;
-        bS_Exp2 -= hExp;
-    }
-
-    // Remove common power of two factor from all three scaled values
-    int common_Exp2 = std::min(dS_Exp2, std::min(bS_Exp2, hS_Exp2));
-    dS_Exp2 -= common_Exp2;
-    bS_Exp2 -= common_Exp2;
-    hS_Exp2 -= common_Exp2;
-
-    EXPECT_EQ(153, dS_Exp2);
-    EXPECT_EQ(0, dS_Exp5);
-    EXPECT_EQ(1, bS_Exp2);
-    EXPECT_EQ(49, bS_Exp5);
-    EXPECT_EQ(0, hS_Exp2);
-    EXPECT_EQ(49, hS_Exp5);
-
-    BigInteger dS = BIGINTEGER_LITERAL(dInt);
-    dS.MultiplyPow5(dS_Exp5) <<= dS_Exp2;
-
-    BigInteger bS(bInt);
-    bS.MultiplyPow5(bS_Exp5) <<= bS_Exp2;
-
-    BigInteger hS(1);
-    hS.MultiplyPow5(hS_Exp5) <<= hS_Exp2;
-
-    EXPECT_TRUE(BIGINTEGER_LITERAL("203970822259994138521801764465966248930731085529088") == dS);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("203970822259994122305215569213032722473144531250000") == bS);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("17763568394002504646778106689453125") == hS);
-
-    EXPECT_EQ(1, dS.Compare(bS));
-    
-    BigInteger delta(0);
-    EXPECT_FALSE(dS.Difference(bS, &delta));
-    EXPECT_TRUE(BIGINTEGER_LITERAL("16216586195252933526457586554279088") == delta);
-    EXPECT_TRUE(bS.Difference(dS, &delta));
-    EXPECT_TRUE(BIGINTEGER_LITERAL("16216586195252933526457586554279088") == delta);
-
-    EXPECT_EQ(-1, delta.Compare(hS));
-}
diff --git a/extra/rapidjson/test/unittest/unittest.cpp b/extra/rapidjson/test/unittest/unittest.cpp
deleted file mode 100644
index 1691d0445612..000000000000
--- a/extra/rapidjson/test/unittest/unittest.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-int main(int argc, char **argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-
-#if _MSC_VER
-    _CrtMemState memoryState = { 0 };
-    _CrtMemCheckpoint(&memoryState);
-    //_CrtSetBreakAlloc(X);
-    //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
-#endif
-
-    int ret = RUN_ALL_TESTS();
-
-#if _MSC_VER
-    // Current gtest constantly leak 2 blocks at exit
-    _CrtMemDumpAllObjectsSince(&memoryState);
-#endif
-    return ret;
-}
diff --git a/extra/rapidjson/test/unittest/unittest.h b/extra/rapidjson/test/unittest/unittest.h
deleted file mode 100644
index 05d8cf26f43c..000000000000
--- a/extra/rapidjson/test/unittest/unittest.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef UNITTEST_H_
-#define UNITTEST_H_
-
-
-// gtest indirectly included inttypes.h, without __STDC_CONSTANT_MACROS.
-#ifndef __STDC_CONSTANT_MACROS
-#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
-#endif
-
-#ifdef _MSC_VER
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#pragma warning(disable : 4996) // 'function': was declared deprecated
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-#if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
-#include "gtest/gtest.h"
-#include <stdexcept>
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic pop
-#endif
-
-template <typename Ch>
-inline unsigned StrLen(const Ch* s) {
-    const Ch* p = s;
-    while (*p) p++;
-    return unsigned(p - s);
-}
-
-template<typename Ch>
-inline int StrCmp(const Ch* s1, const Ch* s2) {
-    while(*s1 && (*s1 == *s2)) { s1++; s2++; }
-    return (unsigned)*s1 < (unsigned)*s2 ? -1 : (unsigned)*s1 > (unsigned)*s2;
-}
-
-template <typename Ch>
-inline Ch* StrDup(const Ch* str) {
-    size_t bufferSize = sizeof(Ch) * (StrLen(str) + 1);
-    Ch* buffer = (Ch*)malloc(bufferSize);
-    memcpy(buffer, str, bufferSize);
-    return buffer;
-}
-
-inline FILE* TempFile(char *filename) {
-#if _MSC_VER
-    filename = tmpnam(filename);
-
-    // For Visual Studio, tmpnam() adds a backslash in front. Remove it.
-    if (filename[0] == '\\')
-        for (int i = 0; filename[i] != '\0'; i++)
-            filename[i] = filename[i + 1];
-        
-    return fopen(filename, "wb");
-#else
-    strcpy(filename, "/tmp/fileXXXXXX");
-    int fd = mkstemp(filename);
-    return fdopen(fd, "w");
-#endif
-}
-
-// Use exception for catching assert
-#if _MSC_VER
-#pragma warning(disable : 4127)
-#endif
-
-class AssertException : public std::logic_error {
-public:
-    AssertException(const char* w) : std::logic_error(w) {}
-};
-
-#define RAPIDJSON_ASSERT(x) if (!(x)) throw AssertException(RAPIDJSON_STRINGIFY(x))
-
-class Random {
-public:
-    Random(unsigned seed = 0) : mSeed(seed) {}
-
-    unsigned operator()() {
-        mSeed = 214013 * mSeed + 2531011;
-        return mSeed;
-    }
-
-private:
-    unsigned mSeed;
-};
-
-#endif // UNITTEST_H_
diff --git a/extra/rapidjson/test/unittest/valuetest.cpp b/extra/rapidjson/test/unittest/valuetest.cpp
deleted file mode 100644
index e66c2fd13c44..000000000000
--- a/extra/rapidjson/test/unittest/valuetest.cpp
+++ /dev/null
@@ -1,1239 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-#include "rapidjson/document.h"
-#include <algorithm>
-
-using namespace rapidjson;
-
-TEST(Value, DefaultConstructor) {
-    Value x;
-    EXPECT_EQ(kNullType, x.GetType());
-    EXPECT_TRUE(x.IsNull());
-
-    //std::cout << "sizeof(Value): " << sizeof(x) << std::endl;
-}
-
-// Should not pass compilation
-//TEST(Value, copy_constructor) {
-//  Value x(1234);
-//  Value y = x;
-//}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#include <type_traits>
-
-TEST(Value, Traits) {
-    typedef GenericValue<UTF8<>, CrtAllocator> Value;
-    static_assert(std::is_constructible<Value>::value, "");
-    static_assert(std::is_default_constructible<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<Value>::value, "");
-#endif
-    static_assert(std::is_move_constructible<Value>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_constructible<Value>::value, "");
-    static_assert(std::is_nothrow_default_constructible<Value>::value, "");
-    static_assert(!std::is_nothrow_copy_constructible<Value>::value, "");
-    static_assert(std::is_nothrow_move_constructible<Value>::value, "");
-#endif
-
-    static_assert(std::is_assignable<Value,Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_assignable<Value>::value, "");
-#endif
-    static_assert(std::is_move_assignable<Value>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_assignable<Value, Value>::value, "");
-#endif
-    static_assert(!std::is_nothrow_copy_assignable<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_move_assignable<Value>::value, "");
-#endif
-
-    static_assert(std::is_destructible<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<Value>::value, "");
-#endif
-}
-
-TEST(Value, MoveConstructor) {
-    typedef GenericValue<UTF8<>, CrtAllocator> Value;
-    Value::AllocatorType allocator;
-
-    Value x((Value(kArrayType)));
-    x.Reserve(4u, allocator);
-    x.PushBack(1, allocator).PushBack(2, allocator).PushBack(3, allocator).PushBack(4, allocator);
-    EXPECT_TRUE(x.IsArray());
-    EXPECT_EQ(4u, x.Size());
-
-    // Value y(x); // does not compile (!is_copy_constructible)
-    Value y(std::move(x));
-    EXPECT_TRUE(x.IsNull());
-    EXPECT_TRUE(y.IsArray());
-    EXPECT_EQ(4u, y.Size());
-
-    // Value z = y; // does not compile (!is_copy_assignable)
-    Value z = std::move(y);
-    EXPECT_TRUE(y.IsNull());
-    EXPECT_TRUE(z.IsArray());
-    EXPECT_EQ(4u, z.Size());
-}
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-TEST(Value, AssignmentOperator) {
-    Value x(1234);
-    Value y;
-    y = x;
-    EXPECT_TRUE(x.IsNull());    // move semantic
-    EXPECT_EQ(1234, y.GetInt());
-
-    y = 5678;
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(5678, y.GetInt());
-
-    x = "Hello";
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ(x.GetString(),"Hello");
-
-    y = StringRef(x.GetString(),x.GetStringLength());
-    EXPECT_TRUE(y.IsString());
-    EXPECT_EQ(y.GetString(),x.GetString());
-    EXPECT_EQ(y.GetStringLength(),x.GetStringLength());
-
-    static char mstr[] = "mutable";
-    // y = mstr; // should not compile
-    y = StringRef(mstr);
-    EXPECT_TRUE(y.IsString());
-    EXPECT_EQ(y.GetString(),mstr);
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // C++11 move assignment
-    x = Value("World");
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ("World", x.GetString());
-
-    x = std::move(y);
-    EXPECT_TRUE(y.IsNull());
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-
-    y = std::move(Value().SetInt(1234));
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(1234, y);
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-}
-
-template <typename A, typename B> 
-void TestEqual(const A& a, const B& b) {
-    EXPECT_TRUE (a == b);
-    EXPECT_FALSE(a != b);
-    EXPECT_TRUE (b == a);
-    EXPECT_FALSE(b != a);
-}
-
-template <typename A, typename B> 
-void TestUnequal(const A& a, const B& b) {
-    EXPECT_FALSE(a == b);
-    EXPECT_TRUE (a != b);
-    EXPECT_FALSE(b == a);
-    EXPECT_TRUE (b != a);
-}
-
-TEST(Value, EqualtoOperator) {
-    Value::AllocatorType allocator;
-    Value x(kObjectType);
-    x.AddMember("hello", "world", allocator)
-        .AddMember("t", Value(true).Move(), allocator)
-        .AddMember("f", Value(false).Move(), allocator)
-        .AddMember("n", Value(kNullType).Move(), allocator)
-        .AddMember("i", 123, allocator)
-        .AddMember("pi", 3.14, allocator)
-        .AddMember("a", Value(kArrayType).Move().PushBack(1, allocator).PushBack(2, allocator).PushBack(3, allocator), allocator);
-
-    // Test templated operator==() and operator!=()
-    TestEqual(x["hello"], "world");
-    const char* cc = "world";
-    TestEqual(x["hello"], cc);
-    char* c = strdup("world");
-    TestEqual(x["hello"], c);
-    free(c);
-
-    TestEqual(x["t"], true);
-    TestEqual(x["f"], false);
-    TestEqual(x["i"], 123);
-    TestEqual(x["pi"], 3.14);
-
-    // Test operator==() (including different allocators)
-    CrtAllocator crtAllocator;
-    GenericValue<UTF8<>, CrtAllocator> y;
-    GenericDocument<UTF8<>, CrtAllocator> z(&crtAllocator);
-    y.CopyFrom(x, crtAllocator);
-    z.CopyFrom(y, z.GetAllocator());
-    TestEqual(x, y);
-    TestEqual(y, z);
-    TestEqual(z, x);
-
-    // Swapping member order should be fine.
-    EXPECT_TRUE(y.RemoveMember("t"));
-    TestUnequal(x, y);
-    TestUnequal(z, y);
-    EXPECT_TRUE(z.RemoveMember("t"));
-    TestUnequal(x, z);
-    TestEqual(y, z);
-    y.AddMember("t", true, crtAllocator);
-    z.AddMember("t", true, z.GetAllocator());
-    TestEqual(x, y);
-    TestEqual(y, z);
-    TestEqual(z, x);
-
-    // Issue #129: compare Uint64
-    x.SetUint64(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFF0));
-    y.SetUint64(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF));
-    TestUnequal(x, y);
-}
-
-template <typename Value>
-void TestCopyFrom() {
-    typename Value::AllocatorType a;
-    Value v1(1234);
-    Value v2(v1, a); // deep copy constructor
-    EXPECT_TRUE(v1.GetType() == v2.GetType());
-    EXPECT_EQ(v1.GetInt(), v2.GetInt());
-
-    v1.SetString("foo");
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v1.GetType() == v2.GetType());
-    EXPECT_STREQ(v1.GetString(), v2.GetString());
-    EXPECT_EQ(v1.GetString(), v2.GetString()); // string NOT copied
-
-    v1.SetArray().PushBack(1234, a);
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v2.IsArray());
-    EXPECT_EQ(v1.Size(), v2.Size());
-
-    v1.PushBack(Value().SetString("foo", a), a); // push string copy
-    EXPECT_TRUE(v1.Size() != v2.Size());
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v1.Size() == v2.Size());
-    EXPECT_STREQ(v1[1].GetString(), v2[1].GetString());
-    EXPECT_NE(v1[1].GetString(), v2[1].GetString()); // string got copied
-}
-
-TEST(Value, CopyFrom) {
-    TestCopyFrom<Value>();
-    TestCopyFrom<GenericValue<UTF8<>, CrtAllocator> >();
-}
-
-TEST(Value, Swap) {
-    Value v1(1234);
-    Value v2(kObjectType);
-
-    EXPECT_EQ(&v1, &v1.Swap(v2));
-    EXPECT_TRUE(v1.IsObject());
-    EXPECT_TRUE(v2.IsInt());
-    EXPECT_EQ(1234, v2.GetInt());
-}
-
-TEST(Value, Null) {
-    // Default constructor
-    Value x;
-    EXPECT_EQ(kNullType, x.GetType());
-    EXPECT_TRUE(x.IsNull());
-
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kNullType);
-    EXPECT_TRUE(y.IsNull());
-
-    // SetNull();
-    Value z(true);
-    z.SetNull();
-    EXPECT_TRUE(z.IsNull());
-}
-
-TEST(Value, True) {
-    // Constructor with bool
-    Value x(true);
-    EXPECT_EQ(kTrueType, x.GetType());
-    EXPECT_TRUE(x.GetBool());
-    EXPECT_TRUE(x.IsBool());
-    EXPECT_TRUE(x.IsTrue());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kTrueType);
-    EXPECT_TRUE(y.IsTrue());
-
-    // SetBool()
-    Value z;
-    z.SetBool(true);
-    EXPECT_TRUE(z.IsTrue());
-}
-
-TEST(Value, False) {
-    // Constructor with bool
-    Value x(false);
-    EXPECT_EQ(kFalseType, x.GetType());
-    EXPECT_TRUE(x.IsBool());
-    EXPECT_TRUE(x.IsFalse());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.GetBool());
-    //EXPECT_FALSE((bool)x);
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kFalseType);
-    EXPECT_TRUE(y.IsFalse());
-
-    // SetBool()
-    Value z;
-    z.SetBool(false);
-    EXPECT_TRUE(z.IsFalse());
-}
-
-TEST(Value, Int) {
-    // Constructor with int
-    Value x(1234);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_EQ(1234, x.GetDouble());
-    //EXPECT_EQ(1234, (int)x);
-    //EXPECT_EQ(1234, (unsigned)x);
-    //EXPECT_EQ(1234, (int64_t)x);
-    //EXPECT_EQ(1234, (uint64_t)x);
-    //EXPECT_EQ(1234, (double)x);
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    Value nx(-1234);
-    EXPECT_EQ(-1234, nx.GetInt());
-    EXPECT_EQ(-1234, nx.GetInt64());
-    EXPECT_TRUE(nx.IsInt());
-    EXPECT_TRUE(nx.IsInt64());
-    EXPECT_FALSE(nx.IsUint());
-    EXPECT_FALSE(nx.IsUint64());
-
-    // Constructor with type
-    Value y(kNumberType);
-    EXPECT_TRUE(y.IsNumber());
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(0, y.GetInt());
-
-    // SetInt()
-    Value z;
-    z.SetInt(1234);
-    EXPECT_EQ(1234, z.GetInt());
-
-    // operator=(int)
-    z = 5678;
-    EXPECT_EQ(5678, z.GetInt());
-}
-
-TEST(Value, Uint) {
-    // Constructor with int
-    Value x(1234u);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-    EXPECT_EQ(1234.0, x.GetDouble());   // Number can always be cast as double but !IsDouble().
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetUint()
-    Value z;
-    z.SetUint(1234);
-    EXPECT_EQ(1234u, z.GetUint());
-
-    // operator=(unsigned)
-    z = 5678u;
-    EXPECT_EQ(5678u, z.GetUint());
-
-    z = 2147483648u;    // 2^31, cannot cast as int
-    EXPECT_EQ(2147483648u, z.GetUint());
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsInt64());   // Issue 41: Incorrect parsing of unsigned int number types
-}
-
-TEST(Value, Int64) {
-    // Constructor with int
-    Value x(int64_t(1234LL));
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    Value nx(int64_t(-1234LL));
-    EXPECT_EQ(-1234, nx.GetInt());
-    EXPECT_EQ(-1234, nx.GetInt64());
-    EXPECT_TRUE(nx.IsInt());
-    EXPECT_TRUE(nx.IsInt64());
-    EXPECT_FALSE(nx.IsUint());
-    EXPECT_FALSE(nx.IsUint64());
-
-    // SetInt64()
-    Value z;
-    z.SetInt64(1234);
-    EXPECT_EQ(1234, z.GetInt64());
-
-    z.SetInt64(2147483648LL);   // 2^31, cannot cast as int
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsUint());
-
-    z.SetInt64(4294967296LL);   // 2^32, cannot cast as uint
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_FALSE(z.IsUint());
-}
-
-TEST(Value, Uint64) {
-    // Constructor with int
-    Value x(uint64_t(1234LL));
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetUint64()
-    Value z;
-    z.SetUint64(1234);
-    EXPECT_EQ(1234u, z.GetUint64());
-
-    z.SetUint64(2147483648LL);  // 2^31, cannot cast as int
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsUint());
-    EXPECT_TRUE(z.IsInt64());
-
-    z.SetUint64(4294967296LL);  // 2^32, cannot cast as uint
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_FALSE(z.IsUint());
-    EXPECT_TRUE(z.IsInt64());
-
-    z.SetUint64(9223372036854775808uLL);    // 2^63 cannot cast as int64
-    EXPECT_FALSE(z.IsInt64());
-
-    // Issue 48
-    EXPECT_EQ(9223372036854775808uLL, z.GetUint64());
-}
-
-TEST(Value, Double) {
-    // Constructor with double
-    Value x(12.34);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(12.34, x.GetDouble());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsDouble());
-
-    EXPECT_FALSE(x.IsInt());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetDouble()
-    Value z;
-    z.SetDouble(12.34);
-    EXPECT_EQ(12.34, z.GetDouble());
-
-    z = 56.78;
-    EXPECT_EQ(56.78, z.GetDouble());
-}
-
-TEST(Value, String) {
-    // Construction with const string
-    Value x("Hello", 5); // literal
-    EXPECT_EQ(kStringType, x.GetType());
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ("Hello", x.GetString());
-    EXPECT_EQ(5u, x.GetStringLength());
-
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    static const char cstr[] = "World"; // const array
-    Value(cstr).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), cstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(cstr)-1);
-
-    static char mstr[] = "Howdy"; // non-const array
-    // Value(mstr).Swap(x); // should not compile
-    Value(StringRef(mstr)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(mstr)-1);
-    strncpy(mstr,"Hello", sizeof(mstr));
-    EXPECT_STREQ(x.GetString(), "Hello");
-
-    const char* pstr = cstr;
-    //Value(pstr).Swap(x); // should not compile
-    Value(StringRef(pstr)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), cstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(cstr)-1);
-
-    char* mpstr = mstr;
-    Value(StringRef(mpstr,sizeof(mstr)-1)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-    EXPECT_EQ(x.GetStringLength(), 5u);
-    EXPECT_STREQ(x.GetString(), "Hello");
-
-    // Constructor with copy string
-    MemoryPoolAllocator<> allocator;
-    Value c(x.GetString(), x.GetStringLength(), allocator);
-    EXPECT_NE(x.GetString(), c.GetString());
-    EXPECT_EQ(x.GetStringLength(), c.GetStringLength());
-    EXPECT_STREQ(x.GetString(), c.GetString());
-    //x.SetString("World");
-    x.SetString("World", 5);
-    EXPECT_STREQ("Hello", c.GetString());
-    EXPECT_EQ(5u, c.GetStringLength());
-
-    // Constructor with type
-    Value y(kStringType);
-    EXPECT_TRUE(y.IsString());
-    EXPECT_STREQ("", y.GetString());    // Empty string should be "" instead of 0 (issue 226)
-    EXPECT_EQ(0u, y.GetStringLength());
-
-    // SetConsttring()
-    Value z;
-    z.SetString("Hello");
-    EXPECT_TRUE(x.IsString());
-    z.SetString("Hello", 5);
-    EXPECT_STREQ("Hello", z.GetString());
-    EXPECT_STREQ("Hello", z.GetString());
-    EXPECT_EQ(5u, z.GetStringLength());
-
-    z.SetString("Hello");
-    EXPECT_TRUE(z.IsString());
-    EXPECT_STREQ("Hello", z.GetString());
-
-    //z.SetString(mstr); // should not compile
-    //z.SetString(pstr); // should not compile
-    z.SetString(StringRef(mstr));
-    EXPECT_TRUE(z.IsString());
-    EXPECT_STREQ(z.GetString(), mstr);
-
-    z.SetString(cstr);
-    EXPECT_TRUE(z.IsString());
-    EXPECT_EQ(cstr, z.GetString());
-
-    z = cstr;
-    EXPECT_TRUE(z.IsString());
-    EXPECT_EQ(cstr, z.GetString());
-
-    // SetString()
-    char s[] = "World";
-    Value w;
-    w.SetString(s, (SizeType)strlen(s), allocator);
-    s[0] = '\0';
-    EXPECT_STREQ("World", w.GetString());
-    EXPECT_EQ(5u, w.GetStringLength());
-
-#if RAPIDJSON_HAS_STDSTRING
-    {
-        std::string str = "Hello World";
-        str[5] = '\0';
-        EXPECT_STREQ(str.data(),"Hello"); // embedded '\0'
-        EXPECT_EQ(str.size(), 11u);
-
-        // no copy
-        Value vs0(StringRef(str));
-        EXPECT_TRUE(vs0.IsString());
-        EXPECT_EQ(vs0.GetString(), str.data());
-        EXPECT_EQ(vs0.GetStringLength(), str.size());
-        TestEqual(vs0, str);
-
-        // do copy
-        Value vs1(str, allocator);
-        EXPECT_TRUE(vs1.IsString());
-        EXPECT_NE(vs1.GetString(), str.data());
-        EXPECT_NE(vs1.GetString(), str); // not equal due to embedded '\0'
-        EXPECT_EQ(vs1.GetStringLength(), str.size());
-        TestEqual(vs1, str);
-
-        // SetString
-        str = "World";
-        vs0.SetNull().SetString(str, allocator);
-        EXPECT_TRUE(vs0.IsString());
-        EXPECT_STREQ(vs0.GetString(), str.c_str());
-        EXPECT_EQ(vs0.GetStringLength(), str.size());
-        TestEqual(str, vs0);
-        TestUnequal(str, vs1);
-
-        // vs1 = str; // should not compile
-        vs1 = StringRef(str);
-        TestEqual(str, vs1);
-        TestEqual(vs0, vs1);
-    }
-#endif // RAPIDJSON_HAS_STDSTRING
-}
-
-// Issue 226: Value of string type should not point to NULL
-TEST(Value, SetStringNullException) {
-    Value v;
-    EXPECT_THROW(v.SetString(0, 0), AssertException);
-}
-
-TEST(Value, Array) {
-    Value x(kArrayType);
-    const Value& y = x;
-    Value::AllocatorType allocator;
-
-    EXPECT_EQ(kArrayType, x.GetType());
-    EXPECT_TRUE(x.IsArray());
-    EXPECT_TRUE(x.Empty());
-    EXPECT_EQ(0u, x.Size());
-    EXPECT_TRUE(y.IsArray());
-    EXPECT_TRUE(y.Empty());
-    EXPECT_EQ(0u, y.Size());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-
-    // PushBack()
-    Value v;
-    x.PushBack(v, allocator);
-    v.SetBool(true);
-    x.PushBack(v, allocator);
-    v.SetBool(false);
-    x.PushBack(v, allocator);
-    v.SetInt(123);
-    x.PushBack(v, allocator);
-    //x.PushBack((const char*)"foo", allocator); // should not compile
-    x.PushBack("foo", allocator);
-
-    EXPECT_FALSE(x.Empty());
-    EXPECT_EQ(5u, x.Size());
-    EXPECT_FALSE(y.Empty());
-    EXPECT_EQ(5u, y.Size());
-    EXPECT_TRUE(x[SizeType(0)].IsNull());
-    EXPECT_TRUE(x[1].IsTrue());
-    EXPECT_TRUE(x[2].IsFalse());
-    EXPECT_TRUE(x[3].IsInt());
-    EXPECT_EQ(123, x[3].GetInt());
-    EXPECT_TRUE(y[SizeType(0)].IsNull());
-    EXPECT_TRUE(y[1].IsTrue());
-    EXPECT_TRUE(y[2].IsFalse());
-    EXPECT_TRUE(y[3].IsInt());
-    EXPECT_EQ(123, y[3].GetInt());
-    EXPECT_TRUE(y[4].IsString());
-    EXPECT_STREQ("foo", y[4].GetString());
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // PushBack(GenericValue&&, Allocator&);
-    {
-        Value y(kArrayType);
-        y.PushBack(Value(true), allocator);
-        y.PushBack(std::move(Value(kArrayType).PushBack(Value(1), allocator).PushBack("foo", allocator)), allocator);
-        EXPECT_EQ(2u, y.Size());
-        EXPECT_TRUE(y[0].IsTrue());
-        EXPECT_TRUE(y[1].IsArray());
-        EXPECT_EQ(2u, y[1].Size());
-        EXPECT_TRUE(y[1][0].IsInt());
-        EXPECT_TRUE(y[1][1].IsString());
-    }
-#endif
-
-    // iterator
-    Value::ValueIterator itr = x.Begin();
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsNull());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsTrue());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsFalse());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsInt());
-    EXPECT_EQ(123, itr->GetInt());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsString());
-    EXPECT_STREQ("foo", itr->GetString());
-
-    // const iterator
-    Value::ConstValueIterator citr = y.Begin();
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsNull());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsTrue());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsFalse());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsInt());
-    EXPECT_EQ(123, citr->GetInt());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsString());
-    EXPECT_STREQ("foo", citr->GetString());
-
-    // PopBack()
-    x.PopBack();
-    EXPECT_EQ(4u, x.Size());
-    EXPECT_TRUE(y[SizeType(0)].IsNull());
-    EXPECT_TRUE(y[1].IsTrue());
-    EXPECT_TRUE(y[2].IsFalse());
-    EXPECT_TRUE(y[3].IsInt());
-
-    // Clear()
-    x.Clear();
-    EXPECT_TRUE(x.Empty());
-    EXPECT_EQ(0u, x.Size());
-    EXPECT_TRUE(y.Empty());
-    EXPECT_EQ(0u, y.Size());
-
-    // Erase(ValueIterator)
-
-    // Use array of array to ensure removed elements' destructor is called.
-    // [[0],[1],[2],...]
-    for (int i = 0; i < 10; i++)
-        x.PushBack(Value(kArrayType).PushBack(i, allocator).Move(), allocator);
-
-    // Erase the first
-    itr = x.Erase(x.Begin());
-    EXPECT_EQ(x.Begin(), itr);
-    EXPECT_EQ(9u, x.Size());
-    for (int i = 0; i < 9; i++)
-        EXPECT_EQ(i + 1, x[i][0].GetInt());
-
-    // Ease the last
-    itr = x.Erase(x.End() - 1);
-    EXPECT_EQ(x.End(), itr);
-    EXPECT_EQ(8u, x.Size());
-    for (int i = 0; i < 8; i++)
-        EXPECT_EQ(i + 1, x[i][0].GetInt());
-
-    // Erase the middle
-    itr = x.Erase(x.Begin() + 4);
-    EXPECT_EQ(x.Begin() + 4, itr);
-    EXPECT_EQ(7u, x.Size());
-    for (int i = 0; i < 4; i++)
-        EXPECT_EQ(i + 1, x[i][0].GetInt());
-    for (int i = 4; i < 7; i++)
-        EXPECT_EQ(i + 2, x[i][0].GetInt());
-
-    // Erase(ValueIterator, ValueIterator)
-    // Exhaustive test with all 0 <= first < n, first <= last <= n cases
-    const unsigned n = 10;
-    for (unsigned first = 0; first < n; first++) {
-        for (unsigned last = first; last <= n; last++) {
-            x.Clear();
-            for (unsigned i = 0; i < n; i++)
-                x.PushBack(Value(kArrayType).PushBack(i, allocator).Move(), allocator);
-            
-            itr = x.Erase(x.Begin() + first, x.Begin() + last);
-            if (last == n)
-                EXPECT_EQ(x.End(), itr);
-            else
-                EXPECT_EQ(x.Begin() + first, itr);
-
-            size_t removeCount = last - first;
-            EXPECT_EQ(n - removeCount, x.Size());
-            for (unsigned i = 0; i < first; i++)
-                EXPECT_EQ(i, x[i][0].GetUint());
-            for (unsigned i = first; i < n - removeCount; i++)
-                EXPECT_EQ(i + removeCount, x[i][0].GetUint());
-        }
-    }
-
-    // Working in gcc without C++11, but VS2013 cannot compile. To be diagnosed.
-    // http://en.wikipedia.org/wiki/Erase-remove_idiom
-    x.Clear();
-    for (int i = 0; i < 10; i++)
-        if (i % 2 == 0)
-            x.PushBack(i, allocator);
-        else
-            x.PushBack(Value(kNullType).Move(), allocator);
-
-    const Value null(kNullType);
-    x.Erase(std::remove(x.Begin(), x.End(), null), x.End());
-    EXPECT_EQ(5u, x.Size());
-    for (int i = 0; i < 5; i++)
-        EXPECT_EQ(i * 2, x[i]);
-
-    // SetArray()
-    Value z;
-    z.SetArray();
-    EXPECT_TRUE(z.IsArray());
-    EXPECT_TRUE(z.Empty());
-}
-
-TEST(Value, Object) {
-    Value x(kObjectType);
-    const Value& y = x; // const version
-    Value::AllocatorType allocator;
-
-    EXPECT_EQ(kObjectType, x.GetType());
-    EXPECT_TRUE(x.IsObject());
-    EXPECT_TRUE(x.ObjectEmpty());
-    EXPECT_EQ(0u, x.MemberCount());
-    EXPECT_EQ(kObjectType, y.GetType());
-    EXPECT_TRUE(y.IsObject());
-    EXPECT_TRUE(y.ObjectEmpty());
-    EXPECT_EQ(0u, y.MemberCount());
-
-    // AddMember()
-    x.AddMember("A", "Apple", allocator);
-    EXPECT_FALSE(x.ObjectEmpty());
-    EXPECT_EQ(1u, x.MemberCount());
-
-    Value value("Banana", 6);
-    x.AddMember("B", "Banana", allocator);
-    EXPECT_EQ(2u, x.MemberCount());
-
-    // AddMember<T>(StringRefType, T, Allocator)
-    {
-        Value o(kObjectType);
-        o.AddMember("true", true, allocator);
-        o.AddMember("false", false, allocator);
-        o.AddMember("int", -1, allocator);
-        o.AddMember("uint", 1u, allocator);
-        o.AddMember("int64", INT64_C(-4294967296), allocator);
-        o.AddMember("uint64", UINT64_C(4294967296), allocator);
-        o.AddMember("double", 3.14, allocator);
-        o.AddMember("string", "Jelly", allocator);
-
-        EXPECT_TRUE(o["true"].GetBool());
-        EXPECT_FALSE(o["false"].GetBool());
-        EXPECT_EQ(-1, o["int"].GetInt());
-        EXPECT_EQ(1u, o["uint"].GetUint());
-        EXPECT_EQ(INT64_C(-4294967296), o["int64"].GetInt64());
-        EXPECT_EQ(UINT64_C(4294967296), o["uint64"].GetUint64());
-        EXPECT_STREQ("Jelly",o["string"].GetString());
-        EXPECT_EQ(8u, o.MemberCount());
-    }
-
-    // AddMember<T>(Value&, T, Allocator)
-    {
-        Value o(kObjectType);
-
-        Value n("s");
-        o.AddMember(n, "string", allocator);
-        EXPECT_EQ(1u, o.MemberCount());
-
-        Value count("#");
-        o.AddMember(count, o.MemberCount(), allocator);
-        EXPECT_EQ(2u, o.MemberCount());
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // AddMember(GenericValue&&, ...) variants
-    {
-        Value o(kObjectType);
-        o.AddMember(Value("true"), Value(true), allocator);
-        o.AddMember(Value("false"), Value(false).Move(), allocator);    // value is lvalue ref
-        o.AddMember(Value("int").Move(), Value(-1), allocator);         // name is lvalue ref
-        o.AddMember("uint", std::move(Value().SetUint(1u)), allocator); // name is literal, value is rvalue
-        EXPECT_TRUE(o["true"].GetBool());
-        EXPECT_FALSE(o["false"].GetBool());
-        EXPECT_EQ(-1, o["int"].GetInt());
-        EXPECT_EQ(1u, o["uint"].GetUint());
-        EXPECT_EQ(4u, o.MemberCount());
-    }
-#endif
-
-    // Tests a member with null character
-    Value name;
-    const Value C0D("C\0D", 3);
-    name.SetString(C0D.GetString(), 3);
-    value.SetString("CherryD", 7);
-    x.AddMember(name, value, allocator);
-
-    // HasMember()
-    EXPECT_TRUE(x.HasMember("A"));
-    EXPECT_TRUE(x.HasMember("B"));
-    EXPECT_TRUE(y.HasMember("A"));
-    EXPECT_TRUE(y.HasMember("B"));
-
-    name.SetString("C\0D");
-    EXPECT_TRUE(x.HasMember(name));
-    EXPECT_TRUE(y.HasMember(name));
-
-    GenericValue<UTF8<>, CrtAllocator> othername("A");
-    EXPECT_TRUE(x.HasMember(othername));
-    EXPECT_TRUE(y.HasMember(othername));
-    othername.SetString("C\0D");
-    EXPECT_TRUE(x.HasMember(othername));
-    EXPECT_TRUE(y.HasMember(othername));
-
-    // operator[]
-    EXPECT_STREQ("Apple", x["A"].GetString());
-    EXPECT_STREQ("Banana", x["B"].GetString());
-    EXPECT_STREQ("CherryD", x[C0D].GetString());
-    EXPECT_STREQ("CherryD", x[othername].GetString());
-
-    // const operator[]
-    EXPECT_STREQ("Apple", y["A"].GetString());
-    EXPECT_STREQ("Banana", y["B"].GetString());
-    EXPECT_STREQ("CherryD", y[C0D].GetString());
-
-    // member iterator
-    Value::MemberIterator itr = x.MemberBegin(); 
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_STREQ("A", itr->name.GetString());
-    EXPECT_STREQ("Apple", itr->value.GetString());
-    ++itr;
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_STREQ("B", itr->name.GetString());
-    EXPECT_STREQ("Banana", itr->value.GetString());
-    ++itr;
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_TRUE(memcmp(itr->name.GetString(), "C\0D", 4) == 0);
-    EXPECT_STREQ("CherryD", itr->value.GetString());
-    ++itr;
-    EXPECT_FALSE(itr != x.MemberEnd());
-
-    // const member iterator
-    Value::ConstMemberIterator citr = y.MemberBegin(); 
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_STREQ("A", citr->name.GetString());
-    EXPECT_STREQ("Apple", citr->value.GetString());
-    ++citr;
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_STREQ("B", citr->name.GetString());
-    EXPECT_STREQ("Banana", citr->value.GetString());
-    ++citr;
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_TRUE(memcmp(citr->name.GetString(), "C\0D", 4) == 0);
-    EXPECT_STREQ("CherryD", citr->value.GetString());
-    ++citr;
-    EXPECT_FALSE(citr != y.MemberEnd());
-
-    // member iterator conversions/relations
-    itr  = x.MemberBegin();
-    citr = x.MemberBegin(); // const conversion
-    TestEqual(itr, citr);
-    EXPECT_TRUE(itr < x.MemberEnd());
-    EXPECT_FALSE(itr > y.MemberEnd());
-    EXPECT_TRUE(citr < x.MemberEnd());
-    EXPECT_FALSE(citr > y.MemberEnd());
-    ++citr;
-    TestUnequal(itr, citr);
-    EXPECT_FALSE(itr < itr);
-    EXPECT_TRUE(itr < citr);
-    EXPECT_FALSE(itr > itr);
-    EXPECT_TRUE(citr > itr);
-    EXPECT_EQ(1, citr - x.MemberBegin());
-    EXPECT_EQ(0, itr - y.MemberBegin());
-    itr += citr - x.MemberBegin();
-    EXPECT_EQ(1, itr - y.MemberBegin());
-    TestEqual(citr, itr);
-    EXPECT_TRUE(itr <= citr);
-    EXPECT_TRUE(citr <= itr);
-    itr++;
-    EXPECT_TRUE(itr >= citr);
-    EXPECT_FALSE(citr >= itr);
-
-    // RemoveMember()
-    x.RemoveMember("A");
-    EXPECT_FALSE(x.HasMember("A"));
-
-    x.RemoveMember("B");
-    EXPECT_FALSE(x.HasMember("B"));
-
-    x.RemoveMember(othername);
-    EXPECT_FALSE(x.HasMember(name));
-
-    EXPECT_TRUE(x.MemberBegin() == x.MemberEnd());
-
-    // EraseMember(ConstMemberIterator)
-
-    // Use array members to ensure removed elements' destructor is called.
-    // { "a": [0], "b": [1],[2],...]
-    const char keys[][2] = { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j" };
-    for (int i = 0; i < 10; i++)
-        x.AddMember(keys[i], Value(kArrayType).PushBack(i, allocator), allocator);
-
-    // MemberCount, iterator difference
-    EXPECT_EQ(x.MemberCount(), SizeType(x.MemberEnd() - x.MemberBegin()));
-
-    // Erase the first
-    itr = x.EraseMember(x.MemberBegin());
-    EXPECT_FALSE(x.HasMember(keys[0]));
-    EXPECT_EQ(x.MemberBegin(), itr);
-    EXPECT_EQ(9u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        int i = (itr - x.MemberBegin()) + 1;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // Erase the last
-    itr = x.EraseMember(x.MemberEnd() - 1);
-    EXPECT_FALSE(x.HasMember(keys[9]));
-    EXPECT_EQ(x.MemberEnd(), itr);
-    EXPECT_EQ(8u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        int i = (itr - x.MemberBegin()) + 1;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // Erase the middle
-    itr = x.EraseMember(x.MemberBegin() + 4);
-    EXPECT_FALSE(x.HasMember(keys[5]));
-    EXPECT_EQ(x.MemberBegin() + 4, itr);
-    EXPECT_EQ(7u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        int i = (itr - x.MemberBegin());
-        i += (i<4) ? 1 : 2;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // EraseMember(ConstMemberIterator, ConstMemberIterator)
-    // Exhaustive test with all 0 <= first < n, first <= last <= n cases
-    const unsigned n = 10;
-    for (unsigned first = 0; first < n; first++) {
-        for (unsigned last = first; last <= n; last++) {
-            Value(kObjectType).Swap(x);
-            for (unsigned i = 0; i < n; i++)
-                x.AddMember(keys[i], Value(kArrayType).PushBack(i, allocator), allocator);
-
-            itr = x.EraseMember(x.MemberBegin() + first, x.MemberBegin() + last);
-            if (last == n)
-                EXPECT_EQ(x.MemberEnd(), itr);
-            else
-                EXPECT_EQ(x.MemberBegin() + first, itr);
-
-            size_t removeCount = last - first;
-            EXPECT_EQ(n - removeCount, x.MemberCount());
-            for (unsigned i = 0; i < first; i++)
-                EXPECT_EQ(i, x[keys[i]][0].GetUint());
-            for (unsigned i = first; i < n - removeCount; i++)
-                EXPECT_EQ(i + removeCount, x[keys[i+removeCount]][0].GetUint());
-        }
-    }
-
-    // RemoveAllMembers()
-    x.RemoveAllMembers();
-    EXPECT_TRUE(x.ObjectEmpty());
-    EXPECT_EQ(0u, x.MemberCount());
-
-    // SetObject()
-    Value z;
-    z.SetObject();
-    EXPECT_TRUE(z.IsObject());
-}
-
-TEST(Value, BigNestedArray) {
-    MemoryPoolAllocator<> allocator;
-    Value x(kArrayType);
-    static const SizeType  n = 200;
-
-    for (SizeType i = 0; i < n; i++) {
-        Value y(kArrayType);
-        for (SizeType  j = 0; j < n; j++) {
-            Value number((int)(i * n + j));
-            y.PushBack(number, allocator);
-        }
-        x.PushBack(y, allocator);
-    }
-
-    for (SizeType i = 0; i < n; i++)
-        for (SizeType j = 0; j < n; j++) {
-            EXPECT_TRUE(x[i][j].IsInt());
-            EXPECT_EQ((int)(i * n + j), x[i][j].GetInt());
-        }
-}
-
-TEST(Value, BigNestedObject) {
-    MemoryPoolAllocator<> allocator;
-    Value x(kObjectType);
-    static const SizeType n = 200;
-
-    for (SizeType i = 0; i < n; i++) {
-        char name1[10];
-        sprintf(name1, "%d", i);
-
-        // Value name(name1); // should not compile
-        Value name(name1, (SizeType)strlen(name1), allocator);
-        Value object(kObjectType);
-
-        for (SizeType j = 0; j < n; j++) {
-            char name2[10];
-            sprintf(name2, "%d", j);
-
-            Value name(name2, (SizeType)strlen(name2), allocator);
-            Value number((int)(i * n + j));
-            object.AddMember(name, number, allocator);
-        }
-
-        // x.AddMember(name1, object, allocator); // should not compile
-        x.AddMember(name, object, allocator);
-    }
-
-    for (SizeType i = 0; i < n; i++) {
-        char name1[10];
-        sprintf(name1, "%d", i);
-        
-        for (SizeType j = 0; j < n; j++) {
-            char name2[10];
-            sprintf(name2, "%d", j);
-            x[name1];
-            EXPECT_EQ((int)(i * n + j), x[name1][name2].GetInt());
-        }
-    }
-}
-
-// Issue 18: Error removing last element of object
-// http://code.google.com/p/rapidjson/issues/detail?id=18
-TEST(Value, RemoveLastElement) {
-    rapidjson::Document doc;
-    rapidjson::Document::AllocatorType& allocator = doc.GetAllocator();
-    rapidjson::Value objVal(rapidjson::kObjectType);        
-    objVal.AddMember("var1", 123, allocator);       
-    objVal.AddMember("var2", "444", allocator);
-    objVal.AddMember("var3", 555, allocator);
-    EXPECT_TRUE(objVal.HasMember("var3"));
-    objVal.RemoveMember("var3");    // Assertion here in r61
-    EXPECT_FALSE(objVal.HasMember("var3"));
-}
-
-// Issue 38:    Segmentation fault with CrtAllocator
-TEST(Document, CrtAllocator) {
-    typedef GenericValue<UTF8<>, CrtAllocator> V;
-
-    V::AllocatorType allocator;
-    V o(kObjectType);
-    o.AddMember("x", 1, allocator); // Should not call destructor on uninitialized name/value of newly allocated members.
-
-    V a(kArrayType);
-    a.PushBack(1, allocator);   // Should not call destructor on uninitialized Value of newly allocated elements.
-}
-
-static void TestShortStringOptimization(const char* str) {
-    const rapidjson::SizeType len = (rapidjson::SizeType)strlen(str);
-	
-    rapidjson::Document doc;
-    rapidjson::Value val;
-    val.SetString(str, len, doc.GetAllocator());
-	
-	EXPECT_EQ(val.GetStringLength(), len);
-	EXPECT_STREQ(val.GetString(), str);
-}
-
-TEST(Value, AllocateShortString) {
-	TestShortStringOptimization("");                 // edge case: empty string
-	TestShortStringOptimization("12345678");         // regular case for short strings: 8 chars
-	TestShortStringOptimization("12345678901");      // edge case: 11 chars in 32-bit mode (=> short string)
-	TestShortStringOptimization("123456789012");     // edge case: 12 chars in 32-bit mode (=> regular string)
-	TestShortStringOptimization("123456789012345");  // edge case: 15 chars in 64-bit mode (=> short string)
-	TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
-}
diff --git a/extra/rapidjson/test/unittest/writertest.cpp b/extra/rapidjson/test/unittest/writertest.cpp
deleted file mode 100644
index 69d25165ceb8..000000000000
--- a/extra/rapidjson/test/unittest/writertest.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright (C) 2011 Milo Yip
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include "unittest.h"
-
-#include "rapidjson/document.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-
-using namespace rapidjson;
-
-TEST(Writer, Compact) {
-    StringStream s("{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ");
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    buffer.ShrinkToFit();
-    Reader reader;
-    reader.Parse<0>(s, writer);
-    EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3]}", buffer.GetString());
-    EXPECT_EQ(77u, buffer.GetSize());
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-// json -> parse -> writer -> json
-#define TEST_ROUNDTRIP(json) \
-    { \
-        StringStream s(json); \
-        StringBuffer buffer; \
-        Writer<StringBuffer> writer(buffer); \
-        Reader reader; \
-        reader.Parse<0>(s, writer); \
-        EXPECT_STREQ(json, buffer.GetString()); \
-        EXPECT_TRUE(writer.IsComplete()); \
-    }
-
-TEST(Writer, Root) {
-    TEST_ROUNDTRIP("null");
-    TEST_ROUNDTRIP("true");
-    TEST_ROUNDTRIP("false");
-    TEST_ROUNDTRIP("0");
-    TEST_ROUNDTRIP("\"foo\"");
-    TEST_ROUNDTRIP("[]");
-    TEST_ROUNDTRIP("{}");
-}
-
-TEST(Writer, Int) {
-    TEST_ROUNDTRIP("[-1]");
-    TEST_ROUNDTRIP("[-123]");
-    TEST_ROUNDTRIP("[-2147483648]");
-}
-
-TEST(Writer, UInt) {
-    TEST_ROUNDTRIP("[0]");
-    TEST_ROUNDTRIP("[1]");
-    TEST_ROUNDTRIP("[123]");
-    TEST_ROUNDTRIP("[2147483647]");
-    TEST_ROUNDTRIP("[4294967295]");
-}
-
-TEST(Writer, Int64) {
-    TEST_ROUNDTRIP("[-1234567890123456789]");
-    TEST_ROUNDTRIP("[-9223372036854775808]");
-}
-
-TEST(Writer, Uint64) {
-    TEST_ROUNDTRIP("[1234567890123456789]");
-    TEST_ROUNDTRIP("[9223372036854775807]");
-}
-
-TEST(Writer, String) {
-    TEST_ROUNDTRIP("[\"Hello\"]");
-    TEST_ROUNDTRIP("[\"Hello\\u0000World\"]");
-    TEST_ROUNDTRIP("[\"\\\"\\\\/\\b\\f\\n\\r\\t\"]");
-}
-
-TEST(Writer, Double) {
-    TEST_ROUNDTRIP("[1.2345,1.2345678,0.123456789012,1234567.8]");
-
-}
-
-TEST(Writer, Transcode) {
-    const char json[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3],\"dollar\":\"\x24\",\"cents\":\"\xC2\xA2\",\"euro\":\"\xE2\x82\xAC\",\"gclef\":\"\xF0\x9D\x84\x9E\"}";
-
-    // UTF8 -> UTF16 -> UTF8
-    {
-        StringStream s(json);
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF16<>, UTF8<> > writer(buffer);
-        GenericReader<UTF8<>, UTF16<> > reader;
-        reader.Parse(s, writer);
-        EXPECT_STREQ(json, buffer.GetString());
-    }
-
-    // UTF8 -> UTF8 -> ASCII -> UTF8 -> UTF8
-    {
-        StringStream s(json);
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF8<>, ASCII<> > writer(buffer);
-        Reader reader;
-        reader.Parse(s, writer);
-
-        StringBuffer buffer2;
-        Writer<StringBuffer> writer2(buffer2);
-        GenericReader<ASCII<>, UTF8<> > reader2;
-        StringStream s2(buffer.GetString());
-        reader2.Parse(s2, writer2);
-
-        EXPECT_STREQ(json, buffer2.GetString());
-    }
-}
-
-#include <sstream>
-
-class OStreamWrapper {
-public:
-    typedef char Ch;
-
-    OStreamWrapper(std::ostream& os) : os_(os) {}
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const { return 0; }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }
-    void Flush() { os_.flush(); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    OStreamWrapper(const OStreamWrapper&);
-    OStreamWrapper& operator=(const OStreamWrapper&);
-
-    std::ostream& os_;
-};
-
-TEST(Writer, OStreamWrapper) {
-    StringStream s("{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ");
-    
-    std::stringstream ss;
-    OStreamWrapper os(ss);
-    
-    Writer<OStreamWrapper> writer(os);
-
-    Reader reader;
-    reader.Parse<0>(s, writer);
-    
-    std::string actual = ss.str();
-    EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3]}", actual.c_str());
-}
-
-TEST(Writer, AssertRootMayBeAnyValue) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        EXPECT_TRUE(x);\
-    }
-    T(writer.Bool(false));
-    T(writer.Bool(true));
-    T(writer.Null());
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.String("foo"));
-#undef T
-}
-
-TEST(Writer, AssertIncorrectObjectLevel) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    writer.EndObject();
-    ASSERT_THROW(writer.EndObject(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectArrayLevel) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartArray();
-    writer.EndArray();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectEndObject) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectEndArray) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertObjectKeyNotString) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        writer.StartObject();\
-        ASSERT_THROW(x, AssertException); \
-    }
-    T(writer.Bool(false));
-    T(writer.Bool(true));
-    T(writer.Null());
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.StartObject());
-    T(writer.StartArray());
-#undef T
-}
-
-TEST(Writer, AssertMultipleRoot) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-
-    writer.StartObject();
-    writer.EndObject();
-    ASSERT_THROW(writer.StartObject(), AssertException);
-
-    writer.Reset(buffer);
-    writer.Null();
-    ASSERT_THROW(writer.Int(0), AssertException);
-
-    writer.Reset(buffer);
-    writer.String("foo");
-    ASSERT_THROW(writer.StartArray(), AssertException);
-
-    writer.Reset(buffer);
-    writer.StartArray();
-    writer.EndArray();
-    //ASSERT_THROW(writer.Double(3.14), AssertException);
-}
-
-TEST(Writer, RootObjectIsComplete) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.StartObject();
-    EXPECT_FALSE(writer.IsComplete());
-    writer.String("foo");
-    EXPECT_FALSE(writer.IsComplete());
-    writer.Int(1);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-TEST(Writer, RootArrayIsComplete) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.StartArray();
-    EXPECT_FALSE(writer.IsComplete());
-    writer.String("foo");
-    EXPECT_FALSE(writer.IsComplete());
-    writer.Int(1);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.EndArray();
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-TEST(Writer, RootValueIsComplete) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        EXPECT_FALSE(writer.IsComplete()); \
-        x; \
-        EXPECT_TRUE(writer.IsComplete()); \
-    }
-    T(writer.Null());
-    T(writer.Bool(true));
-    T(writer.Bool(false));
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.String(""));
-#undef T
-}
diff --git a/extra/rapidjson/travis-doxygen.sh b/extra/rapidjson/travis-doxygen.sh
deleted file mode 100644
index 0e715a79e7be..000000000000
--- a/extra/rapidjson/travis-doxygen.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-# Update Doxygen documentation after push to 'master'.
-# Author: @pah
-
-set -e
-
-DOXYGEN_VER=doxygen-1.8.7
-DOXYGEN_TAR=${DOXYGEN_VER}.linux.bin.tar.gz
-DOXYGEN_URL="http://ftp.stack.nl/pub/users/dimitri/$%7BDOXYGEN_TAR%7D"
-DOXYGEN_BIN="/usr/local/bin/doxygen"
-
-: ${GITHUB_REPO:="miloyip/rapidjson"}
-GITHUB_HOST="github.com"
-GITHUB_CLONE="git://${GITHUB_HOST}/${GITHUB_REPO}"
-GITHUB_URL="https://${github_host}/$%7BGITHUB_PUSH-$%7BGITHUB_REPO%7D%7D"
-
-# if not set, ignore password
-#GIT_ASKPASS="${TRAVIS_BUILD_DIR}/gh_ignore_askpass.sh"
-
-skip() {
-	echo "$@" 1>&2
-	echo "Exiting..." 1>&2
-	exit 0
-}
-
-abort() {
-	echo "Error: $@" 1>&2
-	echo "Exiting..." 1>&2
-	exit 1
-}
-
-# TRAVIS_BUILD_DIR not set, exiting
-[ -d "${TRAVIS_BUILD_DIR-/nonexistent}" ] || \
-	abort '${TRAVIS_BUILD_DIR} not set or nonexistent.'
-
-# check for pull-requests
-[ "${TRAVIS_PULL_REQUEST}" = "false" ] || \
-	skip "Not running Doxygen for pull-requests."
-
-# check for branch name
-[ "${TRAVIS_BRANCH}" = "master" ] || \
-	skip "Running Doxygen only for updates on 'master' branch (current: ${TRAVIS_BRANCH})."
-
-# check for job number
-[ "${TRAVIS_JOB_NUMBER}" = "${TRAVIS_BUILD_NUMBER}.1" ] || \
-	skip "Running Doxygen only on first job of build ${TRAVIS_BUILD_NUMBER} (current: ${TRAVIS_JOB_NUMBER})."
-
-# install doxygen binary distribution
-doxygen_install()
-{
-	wget -O - "${DOXYGEN_URL}" | \
-		tar xz -C ${TMPDIR-/tmp} ${DOXYGEN_VER}/bin/doxygen
-    export PATH="${TMPDIR-/tmp}/${DOXYGEN_VER}/bin:$PATH"
-}
-
-doxygen_run()
-{
-	cd "${TRAVIS_BUILD_DIR}";
-	doxygen ${TRAVIS_BUILD_DIR}/build/doc/Doxyfile;
-}
-
-gh_pages_prepare()
-{
-	cd "${TRAVIS_BUILD_DIR}/build/doc";
-	[ ! -d "html" ] || \
-		abort "Doxygen target directory already exists."
-	git --version
-	git clone --single-branch -b gh-pages "${GITHUB_CLONE}" html
-	cd html
-	# setup git config (with defaults)
-	git config user.name "${GIT_NAME-travis}"
-	git config user.email "${GIT_EMAIL-"travis@localhost"}"
-	# clean working dir
-	rm -f .git/index
-	git clean -df
-}
-
-gh_pages_commit() {
-	cd "${TRAVIS_BUILD_DIR}/build/doc/html";
-	git add --all;
-	git diff-index --quiet HEAD || git commit -m "Automatic doxygen build";
-}
-
-gh_setup_askpass() {
-	cat > ${GIT_ASKPASS} <<EOF
-#!/bin/bash
-echo
-exit 0
-EOF
-	chmod a+x "$GIT_ASKPASS"
-}
-
-gh_pages_push() {
-	# check for secure variables
-	[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] || \
-		skip "Secure variables not available, not updating GitHub pages."
-	# check for GitHub access token
-	[ "${GH_TOKEN+set}" = set ] || \
-		skip "GitHub access token not available, not updating GitHub pages."
-	[ "${#GH_TOKEN}" -eq 40 ] || \
-		abort "GitHub token invalid: found ${#GH_TOKEN} characters, expected 40."
-
-	cd "${TRAVIS_BUILD_DIR}/build/doc/html";
-	# setup credentials (hide in "set -x" mode)
-	git remote set-url --push origin "${GITHUB_URL}"
-	git config credential.helper 'store'
-	# ( set +x ; git config credential.username "${GH_TOKEN}" )
-	( set +x ; [ -f ${HOME}/.git-credentials ] || \
-			( echo "https://$%7BGH_TOKEN%7D@${github_host}/" > ${HOME}/.git-credentials ; \
-			 chmod go-rw ${HOME}/.git-credentials ) )
-	# push to GitHub
-	git push origin gh-pages
-}
-
-doxygen_install
-gh_pages_prepare
-doxygen_run
-gh_pages_commit
-gh_pages_push
-
diff --git a/extra/replace.c b/extra/replace.c
index 7e064007c976..c6836e0bbf0e 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -1,15 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/extra/resolve_stack_dump.cc b/extra/resolve_stack_dump.cc
index 05ca4ea2a98f..0818b761f326 100644
--- a/extra/resolve_stack_dump.cc
+++ b/extra/resolve_stack_dump.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -334,6 +341,10 @@ static void do_resolve()
 
 int main(int argc, char** argv)
 {
+
+  fprintf(stderr, "Warning: resolve_stack_dump is deprecated and will be removed in a future "
+	          "version.\n");
+
   MY_INIT(argv[0]);
   parse_args(argc, argv);
   open_files();
diff --git a/extra/resolveip.c b/extra/resolveip.c
index 89b8a6faa391..e848f5068dc3 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -117,6 +124,9 @@ int main(int argc, char **argv)
   char *ip,**q;
   int error=0;
 
+  fprintf(stderr, "Warning: resolveip is deprecated and will be removed in a future "
+	           "version.\n");
+
   MY_INIT(argv[0]);
 
   if (get_options(&argc,&argv))
diff --git a/extra/yassl/AUTHORS b/extra/yassl/AUTHORS
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
deleted file mode 100644
index 742014308f37..000000000000
--- a/extra/yassl/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}/extra/yassl/include
- ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
- ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
-
-ADD_DEFINITIONS(${SSL_DEFINES})
-
-# rename get_tty_password to avoid collisions with the main binary
-ADD_DEFINITIONS(-Dget_tty_password_ext=yassl_mysql_get_tty_password_ext)
-ADD_DEFINITIONS(-Dget_tty_password=yassl_mysql_get_tty_password)
-
-
-MY_CHECK_CXX_COMPILER_FLAG("-Wno-unused-const-variable" HAVE_NO_UNUSED_CONST_VAR)
-
-IF(CMAKE_GENERATOR MATCHES "Xcode" AND HAVE_NO_UNUSED_CONST_VAR)
-  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-  ADD_COMPILE_FLAGS(
-    src/yassl_int.cpp
-    src/socket_wrapper.cpp
-    COMPILE_FLAGS -Wno-unused-const-variable)
-ENDIF()
-
-SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
-				src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
-				src/yassl_imp.cpp src/yassl_int.cpp
-                                ../../client/get_password.c )
-
-ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/extra/yassl/COPYING b/extra/yassl/COPYING
deleted file mode 100644
index 845980af4a43..000000000000
--- a/extra/yassl/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/extra/yassl/ChangeLog b/extra/yassl/ChangeLog
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/extra/yassl/FLOSS-EXCEPTIONS b/extra/yassl/FLOSS-EXCEPTIONS
deleted file mode 100644
index 47f86ff65f23..000000000000
--- a/extra/yassl/FLOSS-EXCEPTIONS
+++ /dev/null
@@ -1,121 +0,0 @@
-yaSSL FLOSS License Exception
-****************************************
-
-Version 0.2, 31 August 2006
-
-The Sawtooth Consulting Ltd. Exception for Free/Libre and Open Source
-Software-only Applications Using yaSSL Libraries (the "FLOSS Exception").
-
-*Exception Intent*
-
-We want specified Free/Libre and Open Source Software ("FLOSS")
-applications to be able to use specified GPL-licensed yaSSL
-libraries (the "Program") despite the fact that not all FLOSS
-licenses are compatible with version 2 of the GNU General Public
-License (the "GPL").
-
-*Legal Terms and Conditions*
-
-As a special exception to the terms and conditions of version 2.0 of
-the GPL:
-
-  1.     You are free to distribute a Derivative Work that is formed
-     entirely from the Program and one or more works (each, a "FLOSS
-     Work") licensed under one or more of the licenses listed below
-     in section 1, as long as:
-
-       1.      You obey the GPL in all respects for the Program and the
-          Derivative Work, except for identifiable sections of the
-          Derivative Work which are not derived from the Program,
-          and which can reasonably be considered independent and
-          separate works in themselves,
-
-       2.      all identifiable sections of the Derivative Work which
-          are not derived from the Program, and which can reasonably be
-          considered independent and separate works in themselves,
-
-             *       i
-
-               are distributed subject to one of the FLOSS licenses
-               listed below, and
-
-             *       ii
-
-               the object code or executable form of those sections are
-               accompanied by the complete corresponding machine-readable
-               source code for those sections on the same medium and under
-               the same FLOSS license as the corresponding object code or
-               executable forms of those sections, and
-
-
-       3.      any works which are aggregated with the Program or with
-          a Derivative Work on a volume of a storage or distribution
-          medium in accordance with the GPL, can reasonably be considered
-          independent and separate works in themselves which are not
-          derivatives of either the Program, a Derivative Work or a FLOSS
-          Work.
-
-
-     If the above conditions are not met, then the Program may only be
-     copied, modified, distributed or used under the terms and
-     conditions of the GPL or another valid licensing option from
-     Sawtooth Consulting Ltd.
-
-  2.     FLOSS License List
-
-     *License name*                            *Version(s)/Copyright Date*
-     Academic Free License                              2.0
-     Apache Software License                            1.0/1.1/2.0
-     Apple Public Source License                        2.0
-     Artistic license                                   From Perl 5.8.0
-     BSD license                                        "July 22 1999"
-     Common Development and Distribution License (CDDL) 1.0
-     Common Public License                              1.0
-     GNU Library or "Lesser" General Public             2.0/2.1
-     License (LGPL)                           
-     Jabber Open Source License                         1.0
-     MIT license                                        -
-     Mozilla Public License (MPL)                       1.0/1.1
-     Open Software License                              2.0
-     PHP License                                        3.0
-     Python license (CNRI Python License)               -
-     Python Software Foundation License                 2.1.1
-     Sleepycat License                                  "1999"
-     University of Illinois/NCSA Open Source License    -
-     W3C License                                        "2001"
-     X11 License                                        "2001"
-     Zlib/libpng License                                -
-     Zope Public License                                2.0
-
-     Due to the many variants of some of the above licenses, we require
-     that any version follow the 2003 version of the Free Software
-     Foundation's Free Software Definition
-     (http://www.gnu.org/philosophy/free-sw.html
-     (http://www.gnu.org/philosophy/free-sw.html))    or version 1.9 of
-     the Open Source Definition by the Open Source    Initiative
-     (http://www.opensource.org/docs/definition.php
-     (http://www.opensource.org/docs/definition.php)).
-
-  3.     Definitions
-
-       1.      Terms used, but not defined, herein shall have the
-          meaning provided in the GPL.
-
-       2.      Derivative Work means a derivative work under copyright
-          law.
-
-
-  4.     Applicability This FLOSS Exception applies to all Programs that
-     contain a notice placed by Sawtooth Consulting Ltd. saying that the
-     Program may be distributed under the terms of this FLOSS Exception.
-     If you create or distribute a work which is a Derivative Work of
-     both the Program and any other work licensed under the GPL, then
-     this FLOSS Exception is not available for that work; thus, you
-     must remove the FLOSS Exception notice from that work and
-     comply with the GPL in all respects, including by retaining all
-     GPL notices. You may choose to redistribute a copy of the
-     Program exclusively under the terms of the GPL by removing the
-     FLOSS Exception notice from that copy of the Program, provided
-     that the copy has never been modified by you or any third party.
-
-
diff --git a/extra/yassl/INSTALL b/extra/yassl/INSTALL
deleted file mode 100644
index 5458714e1e2c..000000000000
--- a/extra/yassl/INSTALL
+++ /dev/null
@@ -1,234 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/extra/yassl/NEWS b/extra/yassl/NEWS
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/extra/yassl/README b/extra/yassl/README
deleted file mode 100644
index de1bf5132aa2..000000000000
--- a/extra/yassl/README
+++ /dev/null
@@ -1,786 +0,0 @@
-*** Note, Please read ***
-
-yaSSL takes a different approach to certificate verification than OpenSSL does.
-The default policy for the client is to verify the server, this means that if
-you don't load CAs to verify the server you'll get a connect error, unable to 
-verify.  It you want to mimic OpenSSL behavior of not verifying the server and
-reducing security you can do this by calling:
-
-SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
-
-before calling SSL_new();
-
-*** end Note ***
-
-yaSSL Release notes, version 2.4.4 (8/8/2017)
-    This release of yaSSL fixes an interop issue. A fix for detecting cipher
-    suites with non leading zeros is included as yaSSL only supports cipher
-    suites with leading zeros.  Thanks for the report from Security Innovation
-    and Oracle.
-
-    Users interoping with other SSL stacks should update.
-
-yaSSL Release notes, version 2.4.2 (9/22/2016)
-    This release of yaSSL fixes a medium security vulnerability. A fix for
-    potential AES side channel leaks is included that a local user monitoring
-    the same CPU core cache could exploit.  VM users, hyper-threading users,
-    and users where potential attackers have access to the CPU cache will need
-    to update if they utilize AES.
-
-    DSA padding fixes for unusual sizes is included as well.  Users with DSA
-    certficiates should update.
-
-yaSSL Release notes, version 2.4.0 (5/20/2016)
-    This release of yaSSL fixes the OpenSSL compatibility function
-    SSL_CTX_load_verify_locations() when using the path directory to allow
-    unlimited path sizes.  Minor Windows build fixes are included.
-    No high level security fixes in this version but we always recommend
-    updating.
-
-
-yaSSL Release notes, version 2.3.9b (2/03/2016)
-    This release of yaSSL fixes the OpenSSL compatibility function
-    X509_NAME_get_index_by_NID() to use the actual index of the common name
-    instead of searching on the format prefix.  Thanks for the report from
-    yashwant.sahu@oracle.com  .  Anyone using this function should update.
-
-yaSSL Release notes, version 2.3.9 (12/01/2015)
-    This release of yaSSL fixes two client side Diffie-Hellman problems.
-    yaSSL was only handling the cases of zero or one leading zeros for the key
-    agreement instead of potentially any number.  This caused about 1 in 50,000
-    connections to fail when using DHE cipher suites.  The second problem was
-    the case where a server would send a public value shorter than the prime
-    value, causing about 1 in 128 client connections to fail, and also
-    caused the yaSSL client to read off the end of memory.  All client side
-    DHE cipher suite users should update.
-    Thanks to Adam Langely (agl@imperialviolet.org) for the detailed report!
-
-yaSSL Release notes, version 2.3.8 (9/17/2015)
-    This release of yaSSL fixes a high security vulnerability.  All users
-    SHOULD update.  If using yaSSL for TLS on the server side with private
-    RSA keys allowing ephemeral key exchange you MUST update and regenerate
-    the RSA private keys.  This report is detailed in:
-    https://people.redhat.com/~fweimer/rsa-crt-leaks.pdf
-    yaSSL now detects RSA signature faults and returns an error.
-
-yaSSL Patch notes, version 2.3.7e (6/26/2015)
-    This release of yaSSL includes a fix for Date less than comparison.
-    Previously yaSSL would return true on less than comparisons if the Dates
-    were equal. Reported by Oracle. No security problem, but if a cert was
-    generated right now, a server started using it in the same second, and a
-    client tried to verify it in the same second it would report not yet valid.
-
-yaSSL Patch notes, version 2.3.7d (6/22/2015)
-    This release of yaSSL includes a fix for input_buffer set_current with
-    index 0.  SSL_peek() at front of waiting data could trigger.  Robert
-    Golebiowski of Oracle identified and suggested a fix, thanks!
-
-yaSSL Patch notes, version 2.3.7c (6/12/2015)
-    This release of yaSSL does certificate DATE comparisons to the second
-    instead of to the minute, helpful when using freshly generated certs.
-    Though keep in mind that time sync differences could still show up.
-
-yaSSL Patch notes, version 2.3.7b (3/18/2015)
-    This release of yaSSL fixes a potential crash with corrupted private keys.
-    Also detects bad keys earlier for user.
-
-yaSSL Release notes, version 2.3.7 (12/10/2014)
-    This release of yaSSL fixes the potential to process duplicate handshake
-    messages by explicitly marking/checking received handshake messages.
-
-yaSSL Release notes, version 2.3.6 (11/25/2014)
-
-    This release of yaSSL fixes some valgrind warnings/errors including
-    uninitialized reads and off by one index errors induced from fuzzing
-    the handshake.  These were reported by Oracle. 
-
-yaSSL Release notes, version 2.3.5 (9/29/2014)
-
-    This release of yaSSL fixes an RSA Padding check vulnerability reported by
-    Intel Security Advanced Threat Research team
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-yaSSL Release notes, version 2.3.4 (8/15/2014)
-
-    This release of yaSSL adds checking to the input_buffer class itself.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-yaSSL Release notes, version 2.3.2 (7/25/2014)
-
-    This release of yaSSL updates test certs.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.3.0 (12/5/2013)
-
-    This release of yaSSL updates asm for newer GCC versions.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.2.3 (4/23/2013)
-
-    This release of yaSSL updates the test certificates as they were expired
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.2.2d (2/5/2013)
-
-    This release of yaSSL contains countermeasuers for the Lucky 13 TLS 1.1
-    CBC timing padding attack identified by Nadhem AlFardan and Kenneth Paterson
-    see: http://www.isg.rhul.ac.uk/tls/
-
-    It also adds SHA2 certificate verification and better checks for malicious
-    input.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.2.2 (7/5/2012)
-
-    This release of yaSSL contains bug fixes and more security checks around
-    malicious certificates.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.1.2 (9/2/2011)
-
-    This release of yaSSL contains bug fixes, better non-blocking support with
-    SSL_write, and OpenSSL RSA public key format support.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 2.0.0 (7/6/2010)
-
-    This release of yaSSL contains bug fixes, new testing certs,
-    and a security patch for a potential heap overflow on forged application
-    data processing.  Vulnerability discovered by Matthieu Bonetti from VUPEN
-    Security http://www.vupen.com.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.9.9 (1/26/2010)
-
-    This release of yaSSL contains bug fixes, the removal of assert() s and
-    a security patch for a buffer overflow possibility in certificate name
-    processing. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.9.8 (10/14/09)
-
-    This release of yaSSL contains bug fixes and adds new stream ciphers
-    Rabbit and HC-128
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.9.6 (11/13/08)
-
-    This release of yaSSL contains bug fixes, adds autconf shared library
-    support and has better server suite detection based on certficate and
-    private key.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.9.2 (9/24/08)
-
-    This release of yaSSL contains bug fixes and improved certificate verify
-    callback support. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.8.8 (5/7/08)
-
-    This release of yaSSL contains bug fixes, and better socket handling. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.8.6 (1/31/08)
-
-    This release of yaSSL contains bug fixes, and fixes security problems
-    associated with using SSL 2.0 client hellos and improper input handling.
-    Please upgrade to this version if you are using a previous one. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.7.5 (10/15/07)
-
-    This release of yaSSL contains bug fixes, adds MSVC 2005 project support,
-    GCC 4.2 support, IPV6 support and test, and new test certificates. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.7.2 (8/20/07)
-
-    This release of yaSSL contains bug fixes and adds initial OpenVPN support.
-    Just configure at this point and beginning of build. 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.6.8 (4/16/07)
-
-    This release of yaSSL contains bug fixes and adds SHA-256, SHA-512, SHA-224,
-    and SHA-384.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-
-*****************yaSSL Release notes, version 1.6.0 (2/22/07)
-
-    This release of yaSSL contains bug fixes, portability enhancements, and
-    better X509 support.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0 and note in 1.5.8.
-
-*****************yaSSL Release notes, version 1.5.8 (1/10/07)
-
-    This release of yaSSL contains bug fixes, portability enhancements, and
-    support for GCC 4.1.1 and vs2005 sp1.
-
-
-
-    Since yaSSL now supports zlib, as does libcurl, the libcurl build test can
-    fail if yaSSL is built with zlib support since the zlib library isn't 
-    passed.  You can do two things to fix this: 
-
-        1) build yaSSL w/o zlib --without-zlib
-        2) or add flags to curl configure LDFLAGS="-lm -lz"
-
-
-
-*****************yaSSL Release notes, version 1.5.0 (11/09/06)
-
-    This release of yaSSL contains bug fixes, portability enhancements,
-    and full TLS 1.1 support.  Use the functions:
-
-        SSL_METHOD *TLSv1_1_server_method(void);
-        SSL_METHOD *TLSv1_1_client_method(void);
-    
-    or the SSLv23 versions (even though yaSSL doesn't support SSL 2.0 the v23
-    means to pick the highest of SSL 3.0, TLS 1.0, or TLS 1.1).
-
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0.
-
-
-
-****************yaSSL Release notes, version 1.4.5 (10/15/06)
-
-
-    This release of yaSSL contains bug fixes, portability enhancements,
-    zlib compression support, removal of assembly instructions at runtime if
-    not supported, and initial TLS 1.1 support.
-
-
-    Compression Notes:  yaSSL uses zlib for compression and the compression
-    should only be used if yaSSL is at both ends because the implementation
-    details aren't yet standard.  If you'd like to turn compression on use
-    the SSL_set_compression() function on the client before calling
-    SSL_connect().  If both the client and server were built with zlib support
-    then the connection will use compression.  If the client isn't built with
-    support then SSL_set_compression() will return an error (-1).
-
-    To build yaSSL with zlib support on Unix simply have zlib support on your
-    system and configure will find it if it's in the standard locations.  If
-    it's somewhere else use the option ./configure --with-zlib=DIR.  If you'd
-    like to disable compression support in yaSSL use ./configure --without-zlib.
-
-    To build yaSSL with zlib support on Windows:
-
-        1) download zlib from http://www.zlib.net/
-        2) follow the instructions in zlib from projects/visualc6/README.txt
-           for how to add the zlib project into the yaSSL workspace noting that
-           you'll need to add configuration support for "Win32 Debug" and
-           "Win32 Release" in note 3 under "To use:". 
-        3) define HAVE_LIBZ when building yaSSL
-
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0.
-
-
-********************yaSSL Release notes, version 1.4.0 (08/13/06)
-
-
-    This release of yaSSL contains bug fixes, portability enhancements,
-    nonblocking connect and accept, better OpenSSL error mapping, and 
-    certificate caching for session resumption.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0.
-
-
-********************yaSSL Release notes, version 1.3.7 (06/26/06)
-
-
-    This release of yaSSL contains bug fixes, portability enhancements,
-    and libcurl 7.15.4 support (any newer versions may not build). 
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0.
-
-
-********************yaSSL Release notes, version 1.3.5 (06/01/06)
-
-
-    This release of yaSSL contains bug fixes, portability enhancements,
-    better libcurl support, and improved non-blocking I/O.
-
-See normal  build instructions below under 1.0.6.
-See libcurl build instructions below under 1.3.0.
-
-
-********************yaSSL Release notes, version 1.3.0 (04/26/06)
-
-
-    This release of yaSSL contains minor bug fixes, portability enhancements,
-    and libcurl support.
-
-See normal build instructions below under 1.0.6.
-
-
---To build for libcurl on Linux, Solaris, *BSD, Mac OS X, or Cygwin:
-
-  To build for libcurl the library needs to be built without C++ globals since
-  the linker will be called in a C context, also libcurl configure will expect
-  OpenSSL library names so some symbolic links are created.
-
-    ./configure --enable-pure-c
-    make
-    make openssl-links
-
-    (then go to your libcurl home and tell libcurl about yaSSL build dir)
-    ./configure --with-ssl=/yaSSL-BuildDir LDFLAGS=-lm
-    make
-
-
---To build for libcurl on Win32:
-
-    Simply add the yaSSL project as a dependency to libcurl, add 
-    yaSSL-Home\include and yaSSL-Home\include\openssl to the include list, and
-    define USE_SSLEAY and USE_OPENSSL
-
-    please email todd@yassl.com if you have any questions.
-    
-
-*******************yaSSL Release notes, version 1.2.2 (03/27/06)
-
-
-    This release of yaSSL contains minor bug fixes and portability enhancements.
-
-See build instructions below under 1.0.6:
-
-
-
-*******************yaSSL Release notes, version 1.2.0
-
-
-    This release of yaSSL contains minor bug fixes, portability enhancements,
-    Diffie-Hellman compatibility fixes for other servers and client,
-    optimization improvements, and x86 ASM changes.
-
-See build instructions below under 1.0.6:
-
-
-
-*****************yaSSL Release notes, version 1.1.5
-
-    This release of yaSSL contains minor bug fixes, portability enhancements,
-    and user requested changes including the ability to add all certificates in
-    a directory, more robust socket handling, no new overloading unless
-    requested, and an SSL_VERIFY_NONE option.
-
-
-See build instructions below under 1.0.6:
-
-
-
-******************yaSSL Release notes, version 1.0.6
-
-This release of yaSSL contains minor bug fixes, portability enhancements,
-x86 assembly for ARC4, SHA, MD5, and RIPEMD, --enable-ia32-asm configure
-option, and a security patch for certificate chain processing.
-
---To build on Linux, Solaris, *BSD, Mac OS X, or Cygwin:
-
-    ./configure
-    make
-
-    run testsuite from yaSSL-Home/testsuite to test the build
-
-to make a release build:
-
-    ./configure --disable-debug
-    make
-
-    run testsuite from yaSSL-Home/testsuite to test the build
-
-
---To build on Win32
-
-Choose (Re)Build All from the project workspace
-
-run Debug\testsuite.exe from yaSSL-Home\testsuite to test the build
-
-
-
-***************** yaSSL Release notes, version 1.0.5
-
-This release of yaSSL contains minor bug fixes, portability enhancements,
-x86 assembly for AES, 3DES, BLOWFISH, and TWOFISH, --without-debug configure
-option, and --enable-kernel-mode configure option for using TaoCrypt with
-kernel modules.
-
---To build on Linux, Solaris, *BSD, Mac OS X, or Cygwin:
-
-    ./configure
-    make
-
-    run testsuite from yaSSL-Home/testsuite to test the build
-
-to make a release build:
-
-    ./configure --without-debug
-    make
-
-    run testsuite from yaSSL-Home/testsuite to test the build
-
-
---To build on Win32
-
-Choose (Re)Build All from the project workspace
-
-run Debug\testsuite.exe from yaSSL-Home\testsuite to test the build
-
-
-******************yaSSL Release notes, version 1.0.1
-
-This release of yaSSL contains minor bug fixes, portability enhancements,
-GCC 3.4.4 support, MSVC 2003 support, and more documentation.
-
-Please see build instructions in the release notes for 0.9.6 below.
-
-
-******************yaSSL Release notes, version 1.0
-
-This release of yaSSL contains minor bug fixes, portability enhancements,
-GCC 4.0 support, testsuite, improvements, and API additions.
-
-Please see build instructions in the release notes for 0.9.6 below.
-
-
-******************yaSSL Release notes, version 0.9.9
-
-This release of yaSSL contains minor bug fixes, portability enchancements,
-MSVC 7 support, memory improvements, and API additions.
-
-Please see build instructions in the release notes for 0.9.6 below.
-
-
-******************yaSSL Release notes, version 0.9.8
-
-This release of yaSSL contains minor bug fixes and portability enchancements.
-
-Please see build instructions in the release notes for 0.9.6 below.
-
-
-******************yaSSL Release notes, version 0.9.6
-
-This release of yaSSL contains minor bug fixes, removal of STL support, and
-removal of exceptions and rtti so that the library can be linked without the
-std c++ library.
-
---To build on Linux, Solaris, FreeBSD, Mac OS X, or Cygwin
-
-./configure
-make
-
-run testsuite from yaSSL-Home/testsuite to test the build
-
-
---To build on Win32
-
-Choose (Re)Build All from the project workspace
-
-run Debug\testsuite.exe from yaSSL-Home\testsuite to test the build
-
-
-
-******************yaSSL Release notes, version 0.9.2
-
-This release of yaSSL contains minor bug fixes, expanded certificate
-verification and chaining, and improved documentation.
-
-Please see build instructions in release notes 0.3.0.
-
-
-
-******************yaSSL Release notes, version 0.9.0
-
-This release of yaSSL contains minor bug fixes, client verification handling,
-hex and base64 encoing/decoding, and an improved test suite.
-
-Please see build instructions in release notes 0.3.0.
-
-
-******************yaSSL Release notes, version 0.8.0
-
-This release of yaSSL contains minor bug fixes, and initial porting effort to
-64bit, BigEndian, and more UNIX systems.
-
-Please see build instructions in release notes 0.3.0.
-
-
-******************yaSSL Release notes, version 0.6.0
-
-This release of yaSSL contains minor bug fixes, source cleanup, and binary beta
-(1) of the yaSSL libraries.
-
-Please see build instructions in release notes 0.3.0.
-
-
-
-******************yaSSL Release notes, version 0.5.0
-
-This release of yaSSL contains minor bug fixes, full session resumption
-support, and initial testing suite support.
-
-
-
-Please see build instructions in release notes 0.3.0.
-
-
-
-******************yaSSL Release notes, version 0.4.0
-
-This release of yaSSL contains minor bug fixes, an optional memory tracker,
-an echo client and server with input/output redirection for load testing, 
-and initial session caching support. 
-
-
-Please see build instructions in release notes 0.3.0.
-
-
-******************yaSSL Release notes, version 0.3.5
-
-This release of yaSSL contains minor bug fixes and extensions to the crypto
-library including a full test suite.
-
-
-*******************yaSSL Release notes, version 0.3.0
-
-This release of yaSSL contains minor bug fixes and extensions to the crypto
-library including AES and an improved random number generator.  GNU autoconf
-and automake are now used to simplify the build process on Linux.
-
-*** Linux Build process
-
-./configure
-make
-
-*** Windows Build process
-
-open the yassl workspace and build the project
-
-
-*******************yaSSL Release notes, version 0.2.9
-
-This release of yaSSL contains minor bug fixes and extensions to the crypto
-library.
-
-See the notes at the bottom of this page for build instructions.
-
-
-*******************yaSSL Release notes, version 0.2.5
-
-This release of yaSSL contains minor bug fixes and a beta binary of the yaSSL
-libraries for win32 and linux.
-
-See the notes at the bottom of this page for build instructions.
-
-
-
-*******************yaSSL Release notes, version 0.2.0
-
-This release of yaSSL contains minor bug fixes and initial alternate crypto
-functionality. 
-
-*** Complete Build ***
-
-See the notes in Readme.txt for build instructions.
-
-*** Update Build ***
-
-If you have already done a complete build of yaSSL as described in the release
-0.0.1 - 0.1.0 notes and downloaded the update to 0.2.0, place the update file
-yassl-update-0.2.0.tar.gz in the yaSSL home directory and issue the command:
-
-gzip -cd yassl-update-0.2.0.tar.gz | tar xvf -
-
-to update the previous release.
-
-Then issue the make command on linux or rebuild the yaSSL project on Windows. 
-
-*******************yaSSL Release notes, version 0.1.0
-
-This release of yaSSL contains minor bug fixes, full client and server TLSv1
-support including full ephemeral Diffie-Hellman support, SSL type RSA and DSS
-signing and verification, and initial stunnel 4.05 build support.
-
-
-
-*********************yaSSL Release notes, version 0.0.3
-
-The third release of yaSSL contains minor bug fixes, client certificate
-enhancements, and initial ephemeral Diffie-Hellman integration:
-
-
-
-*********************
-
-yaSSL Release notes, version 0.0.2
-
-The second release of yaSSL contains minor bug fixes, client certificate
-enhancements, session resumption, and improved TLS support including:
-
-- HMAC for MD5 and SHA-1
-- PRF (pseudo random function)
-- Master Secret and Key derivation routines
-- Record Authentication codes
-- Finish verify data check
-
-Once ephemeral RSA and DH are added yaSSL will be fully complaint with TLS.
-
-
-
-**********************
-
-yassl Release notes, version 0.0.1
-
-The first release of yassl supports normal RSA mode SSLv3 connections with
-support for SHA-1 and MD5 digests.  Ciphers include DES, 3DES, and RC4.
-
-yassl uses the CryptoPP library for cryptography, the source is available at
-www.cryptopp.com .
-
-yassl uses CML (the Certificate Management Library) for x509 support.  More
-features will be in future versions.  The CML source is available for download
-from www.digitalnet.com/knowledge/cml_home.htm .
-
-The next release of yassl will support the 3 lesser-used SSL connection modes;
-HandShake resumption, Ephemeral RSA (or DH), and Client Authentication as well
-as full support for TLS.  Backwards support for SSLv2 is not planned at this
-time.
-
-
-**********************
-
-Building yassl on linux:
-
-use the ./buildall script to build everything.
-
-buildall will configure and build CML, CryptoPP, and yassl.  Testing was 
-preformed with gcc version 3.3.2 on kernel 2.4.22.
-
-
-**********************
-
-Building yassl on Windows:
-
-Testing was preformed on Windows 2000 with Visual C++ 6 sp5.
-
-1) decompress esnacc_r16.tgz in place, see buildall for syntax if unsure
-
-2) decompress smp_r23.tgz in place
-
-3) unzip cryptopp51/crypto51.zip in place
-
-4) Build SNACC (part of CML) using snacc_builds.dsw in the SNACC directory
-
-5) Build SMP (part of CMP) using smp.dsw in the smp directory
-
-6) Build yassl using yassl.dsw
-
-
-**********************
-
-examples, server and client:
-
-Please see the server and client examples in both versions to see how to link
-to yassl and the support libraries.  On linux do 'make server' and 'make
-client' to build them. On Windows you will find the example projects in the
-main workspace, yassl.dsw.
-
-The example server and client are compatible with openssl.
-
-
-**********************
-
-Building yassl into mysql on linux:
-
-Testing was done using mysql version 4.0.17.
-
-alter openssl_libs in the configure file, line 21056. Change '-lssl -lcrypto'
-to '-lyassl -lcryptopp -lcmapi -lcmlasn -lctil -lc++asn1'.
-
-see build/config_command for the configure command used to configure mysql
-please change /home/touska/ to the relevant directory of course.
-
-add yassl/lib to the LD_LIBRARY_PATH because libmysql/conf_to_src does not
-use the ssl lib directory though it does use the ssl libraries.
-
-make
-
-make install
-
-
-*********************
-
-License:  yassl is currently under the GPL, please see license information
-in the source and include files.
-
-
-*********************
-
-Contact: please send comments or questions to Todd A Ouska at todd@yassl.com
-and/or Larry Stefonic at larry@yassl.com.
-
-
-
diff --git a/extra/yassl/certs/ca-cert.pem b/extra/yassl/certs/ca-cert.pem
deleted file mode 100644
index 8b34ea43dd2d..000000000000
--- a/extra/yassl/certs/ca-cert.pem
+++ /dev/null
@@ -1,87 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            b7:b6:90:33:66:1b:6b:23
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Validity
-            Not Before: Aug 11 20:07:37 2016 GMT
-            Not After : May  8 20:07:37 2019 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
-                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
-                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
-                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
-                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
-                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
-                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
-                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
-                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
-                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
-                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
-                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
-                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
-                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
-                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
-                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
-                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
-                    36:79
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-            X509v3 Authority Key Identifier: 
-                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-                serial:B7:B6:90:33:66:1B:6B:23
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         0e:93:48:44:4a:72:96:60:71:25:82:a9:2c:ca:60:5b:f2:88:
-         3e:cf:11:74:5a:11:4a:dc:d9:d8:f6:58:2c:05:d3:56:d9:e9:
-         8f:37:ef:8e:3e:3b:ff:22:36:00:ca:d8:e2:96:3f:a7:d1:ed:
-         1f:de:7a:b0:d7:8f:36:bd:41:55:1e:d4:b9:86:3b:87:25:69:
-         35:60:48:d6:e4:5a:94:ce:a2:fa:70:38:36:c4:85:b4:4b:23:
-         fe:71:9e:2f:db:06:c7:b5:9c:21:f0:3e:7c:eb:91:f8:5c:09:
-         fd:84:43:a4:b3:4e:04:0c:22:31:71:6a:48:c8:ab:bb:e8:ce:
-         fa:67:15:1a:3a:82:98:43:33:b5:0e:1f:1e:89:f8:37:de:1b:
-         e6:b5:a0:f4:a2:8b:b7:1c:90:ba:98:6d:94:21:08:80:5d:f3:
-         bf:66:ad:c9:72:28:7a:6a:48:ee:cf:63:69:31:8c:c5:8e:66:
-         da:4b:78:65:e8:03:3a:4b:f8:cc:42:54:d3:52:5c:2d:04:ae:
-         26:87:e1:7e:40:cb:45:41:16:4b:6e:a3:2e:4a:76:bd:29:7f:
-         1c:53:37:06:ad:e9:5b:6a:d6:b7:4e:94:a2:7c:e8:ac:4e:a6:
-         50:3e:2b:32:9e:68:42:1b:e4:59:67:61:ea:c7:9a:51:9c:1c:
-         55:a3:77:76
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIJALe2kDNmG2sjMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
-A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
-dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
-Fw0xNjA4MTEyMDA3MzdaFw0xOTA1MDgyMDA3MzdaMIGUMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
-dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
-LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
-mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
-i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
-XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
-/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
-/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
-+TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
-J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
-aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
-MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAt7aQM2YbayMwDAYD
-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADpNIREpylmBxJYKpLMpgW/KI
-Ps8RdFoRStzZ2PZYLAXTVtnpjzfvjj47/yI2AMrY4pY/p9HtH956sNePNr1BVR7U
-uYY7hyVpNWBI1uRalM6i+nA4NsSFtEsj/nGeL9sGx7WcIfA+fOuR+FwJ/YRDpLNO
-BAwiMXFqSMiru+jO+mcVGjqCmEMztQ4fHon4N94b5rWg9KKLtxyQuphtlCEIgF3z
-v2atyXIoempI7s9jaTGMxY5m2kt4ZegDOkv4zEJU01JcLQSuJofhfkDLRUEWS26j
-Lkp2vSl/HFM3Bq3pW2rWt06UonzorE6mUD4rMp5oQhvkWWdh6seaUZwcVaN3dg==
------END CERTIFICATE-----
diff --git a/extra/yassl/certs/ca-key.pem b/extra/yassl/certs/ca-key.pem
deleted file mode 100644
index 774feba05486..000000000000
--- a/extra/yassl/certs/ca-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvwzKLRSyHoRCW804H0ryTXUQ8bY1n9/KfQOY06zeA2buKvHY
-sH1uB1QLEJghTYDLEiDnzE/eRX3Jcncy6sqQu2lSEAMvqPOVxfGLYlYb72dvpBBB
-la0Km+OlwLDScHZQMFuo6AgsfO2nonqNOCkcrMft8nyVsJWCfUlcOM13Je+9gHVT
-lDw9ymNbnxW10x0TLxnRPNt2Osy4fcnlwtfaQG/YIdxzG0ItU5z+Gvx9q3o2P5je
-hHwFZ85qFDiHqfGMtWjLaH9xICv1oGP1Vi+jJtK3b7FaF9c4mQj+k1hv/sMTSQgW
-C6dNZwBSMWcjTpjtUUUduQTZC+zYKLNLve02eQIDAQABAoIBAD1uTmAahH+dhXzh
-Swd84NaZKt6d+TY0DncOPgjqT+UGJtT2OPffDQ8cLgai9CponGNy4zXmBJGRtcGx
-pFSs18b7QaDWdW+9C06/sVLoX0kmmFZHx97p6jxgAb8o3DG/SV+TSYd6gVuWS03K
-XDhPt+Gy08ch2jwShwfkG9xD7OjsVGHn9u2mCy7134J/xh9hGZykgznfIYWJb3ev
-hhUyCKJaCyZh+3AMypw4fbwi7uujqBYA+YqAHgCEqEpB+IQDZy8jWy+baybDBzSU
-owM7ctWfcuCtzDSrvcfV9SYwhQ8wIzlS/zzLmSFNiKWr7mK5x+C7R4fBac9z8zC+
-zjkEnOUCgYEA4XZFgFm200nfCu8S1g/wt8sqN7+n+LVN9TE1reSjlKHb8ZattQVk
-hYP8G1spqr74Jj92fq0c8MvXJrQbBY5Whn4IYiHBhtZHeT63XaTGOtexdCD2UJdB
-BFPtPybWb5H6aCbsKtya8efc+3PweUMbIaNZBGNSB8nX5tEbXV6W+lMCgYEA2O1O
-ZGFrkQxhAbUPu0RnUx7cB8Qkfp5shCORDOQSBBZNeJjMlj0gTg9Fmrb4s5MNsqIb
-KfImecjF0nh+XnPy13Bhu0DOYQX+aR6CKeYUuKHnltAjPwWTAPLhTX7tt5Zs9/Dk
-0c8BmE/cdFSqbV5aQTH+/5q2oAXdqRBU+GvQqoMCgYAh0wSKROtQt3xmv4cr5ihO
-6oPi6TXh8hFH/6H1/J8t5TqB/AEDb1OtVCe2Uu7lVtETq+GzD3WQCoS0ocCMDNae
-RrorPrUx7WO7pNUNj3LN0R4mNeu+G3L9mzm0h7cT9eqDRZOYuo/kSsy0TKh/CLpB
-SahJKD1ePcHONwDL+SzdUQKBgQChV58+udavg22DP4/70NyozgMJI7GhG2PKxElW
-NSvRLmVglQVVmRE1/dXfRMeliHJfsoJRqHFFkzbPXB9hUQwFgOivxXu6XiLjPHXD
-hAVVbdY6LYSJkzPLONqqMQXNzmwt3VXTVwvwpTVqsK4xukOWygDHS+MZEkPTQvpv
-6oDA0QKBgQC524kgNCdwYjTqXyViEvOdgb9I7poOwY0Q/2WanS0aipRayMClpYRh
-ntQkue+pncl3C8dwZj26yFTf0jPh9X/5J2G+V0Xdt0UXJPUj5DgOkSfu4yDYFMiU
-R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/client-cert.der b/extra/yassl/certs/client-cert.der
deleted file mode 100644
index 293985adb974..000000000000
Binary files a/extra/yassl/certs/client-cert.der and /dev/null differ
diff --git a/extra/yassl/certs/client-cert.pem b/extra/yassl/certs/client-cert.pem
deleted file mode 100644
index 9262ad60991d..000000000000
--- a/extra/yassl/certs/client-cert.pem
+++ /dev/null
@@ -1,88 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            b9:bc:90:ed:ad:aa:0a:8c
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=wolfSSL_2048, OU=Programming-2048, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Validity
-            Not Before: Aug 11 20:07:37 2016 GMT
-            Not After : May  8 20:07:37 2019 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL_2048, OU=Programming-2048, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
-                    2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
-                    32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
-                    68:a2:8b:67:bb:a1:75:c8:36:2c:4a:d2:1b:f7:8b:
-                    ba:cf:0d:f9:ef:ec:f1:81:1e:7b:9b:03:47:9a:bf:
-                    65:cc:7f:65:24:69:a6:e8:14:89:5b:e4:34:f7:c5:
-                    b0:14:93:f5:67:7b:3a:7a:78:e1:01:56:56:91:a6:
-                    13:42:8d:d2:3c:40:9c:4c:ef:d1:86:df:37:51:1b:
-                    0c:a1:3b:f5:f1:a3:4a:35:e4:e1:ce:96:df:1b:7e:
-                    bf:4e:97:d0:10:e8:a8:08:30:81:af:20:0b:43:14:
-                    c5:74:67:b4:32:82:6f:8d:86:c2:88:40:99:36:83:
-                    ba:1e:40:72:22:17:d7:52:65:24:73:b0:ce:ef:19:
-                    cd:ae:ff:78:6c:7b:c0:12:03:d4:4e:72:0d:50:6d:
-                    3b:a3:3b:a3:99:5e:9d:c8:d9:0c:85:b3:d9:8a:d9:
-                    54:26:db:6d:fa:ac:bb:ff:25:4c:c4:d1:79:f4:71:
-                    d3:86:40:18:13:b0:63:b5:72:4e:30:c4:97:84:86:
-                    2d:56:2f:d7:15:f7:7f:c0:ae:f5:fc:5b:e5:fb:a1:
-                    ba:d3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
-            X509v3 Authority Key Identifier: 
-                keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
-                DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL_2048/OU=Programming-2048/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-                serial:B9:BC:90:ED:AD:AA:0A:8C
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         33:85:08:b4:58:0e:a2:00:03:74:de:77:fb:d1:2b:76:9c:97:
-         90:20:21:a2:e8:2e:22:50:26:04:76:ba:5b:47:79:e5:52:f7:
-         c4:0d:79:ff:62:3f:05:7c:c3:08:6c:e0:b7:81:d0:ce:c6:c9:
-         46:b9:8e:4b:5f:56:79:4b:13:b6:d1:6b:66:4b:ce:00:0d:e3:
-         76:5e:fb:cb:b5:5d:12:31:05:f1:bb:39:f6:86:90:ca:92:56:
-         a4:a0:75:21:b6:1d:4c:96:c3:45:eb:5a:91:94:32:d3:59:b8:
-         c9:73:1f:03:a9:81:63:e0:43:c0:1e:c8:65:be:3b:a7:53:c3:
-         44:ff:b3:fb:47:84:a8:b6:9d:00:d5:6b:ae:87:f8:bb:35:b2:
-         6c:66:0b:11:ee:6f:fe:12:ed:59:79:f1:3e:f2:d3:61:27:8b:
-         95:7e:99:75:8d:a4:9f:34:85:f1:25:4d:48:1e:9b:6b:70:f6:
-         66:cc:56:b1:a3:02:52:8a:7c:aa:af:07:da:97:c6:0c:a5:8f:
-         ed:cb:f5:d8:04:5d:97:0a:5d:5a:2b:49:f5:bd:93:e5:23:9b:
-         99:b5:0c:ff:0c:7e:38:82:b2:6e:ab:8a:c9:a7:45:ab:d6:d7:
-         93:35:70:07:7e:c8:3d:a5:fe:33:8f:d9:85:c0:c7:5a:02:e4:
-         7c:d6:35:9e
------BEGIN CERTIFICATE-----
-MIIEyjCCA7KgAwIBAgIJALm8kO2tqgqMMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEVMBMG
-A1UECgwMd29sZlNTTF8yMDQ4MRkwFwYDVQQLDBBQcm9ncmFtbWluZy0yMDQ4MRgw
-FgYDVQQDDA93d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29s
-ZnNzbC5jb20wHhcNMTYwODExMjAwNzM3WhcNMTkwNTA4MjAwNzM3WjCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xFTAT
-BgNVBAoMDHdvbGZTU0xfMjA0ODEZMBcGA1UECwwQUHJvZ3JhbW1pbmctMjA0ODEY
-MBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdv
-bGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwwPRK/45
-pDJFO1PIhCsqfHSavaoqUgdH1qY2sgcyjtC6aXvGw0Se1IFI/S1oootnu6F1yDYs
-StIb94u6zw357+zxgR57mwNHmr9lzH9lJGmm6BSJW+Q098WwFJP1Z3s6enjhAVZW
-kaYTQo3SPECcTO/Rht83URsMoTv18aNKNeThzpbfG36/TpfQEOioCDCBryALQxTF
-dGe0MoJvjYbCiECZNoO6HkByIhfXUmUkc7DO7xnNrv94bHvAEgPUTnINUG07ozuj
-mV6dyNkMhbPZitlUJttt+qy7/yVMxNF59HHThkAYE7BjtXJOMMSXhIYtVi/XFfd/
-wK71/Fvl+6G60wIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFDPYRWbXaIcYflQNcCeR
-xybXhWXAMIHTBgNVHSMEgcswgciAFDPYRWbXaIcYflQNcCeRxybXhWXAoYGkpIGh
-MIGeMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96
-ZW1hbjEVMBMGA1UECgwMd29sZlNTTF8yMDQ4MRkwFwYDVQQLDBBQcm9ncmFtbWlu
-Zy0yMDQ4MRgwFgYDVQQDDA93d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEW
-EGluZm9Ad29sZnNzbC5jb22CCQC5vJDtraoKjDAMBgNVHRMEBTADAQH/MA0GCSqG
-SIb3DQEBCwUAA4IBAQAzhQi0WA6iAAN03nf70St2nJeQICGi6C4iUCYEdrpbR3nl
-UvfEDXn/Yj8FfMMIbOC3gdDOxslGuY5LX1Z5SxO20WtmS84ADeN2XvvLtV0SMQXx
-uzn2hpDKklakoHUhth1MlsNF61qRlDLTWbjJcx8DqYFj4EPAHshlvjunU8NE/7P7
-R4Sotp0A1Wuuh/i7NbJsZgsR7m/+Eu1ZefE+8tNhJ4uVfpl1jaSfNIXxJU1IHptr
-cPZmzFaxowJSinyqrwfal8YMpY/ty/XYBF2XCl1aK0n1vZPlI5uZtQz/DH44grJu
-q4rJp0Wr1teTNXAHfsg9pf4zj9mFwMdaAuR81jWe
------END CERTIFICATE-----
diff --git a/extra/yassl/certs/client-key.der b/extra/yassl/certs/client-key.der
deleted file mode 100644
index 94dc253a2bd2..000000000000
Binary files a/extra/yassl/certs/client-key.der and /dev/null differ
diff --git a/extra/yassl/certs/client-key.pem b/extra/yassl/certs/client-key.pem
deleted file mode 100644
index c4e7ad22c095..000000000000
--- a/extra/yassl/certs/client-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwwPRK/45pDJFO1PIhCsqfHSavaoqUgdH1qY2sgcyjtC6aXvG
-w0Se1IFI/S1oootnu6F1yDYsStIb94u6zw357+zxgR57mwNHmr9lzH9lJGmm6BSJ
-W+Q098WwFJP1Z3s6enjhAVZWkaYTQo3SPECcTO/Rht83URsMoTv18aNKNeThzpbf
-G36/TpfQEOioCDCBryALQxTFdGe0MoJvjYbCiECZNoO6HkByIhfXUmUkc7DO7xnN
-rv94bHvAEgPUTnINUG07ozujmV6dyNkMhbPZitlUJttt+qy7/yVMxNF59HHThkAY
-E7BjtXJOMMSXhIYtVi/XFfd/wK71/Fvl+6G60wIDAQABAoIBAQCi5thfEHFkCJ4u
-bdFtHoXSCrGMR84sUWqgEp5T3pFMHW3qWXvyd6rZxtmKq9jhFuRjJv+1bBNZuOOl
-yHIXLgyfb+VZP3ZvSbERwlouFikN3reO3EDVou7gHqH0vpfbhmOWFM2YCWAtMHac
-PM3miO5HknkLWgDiXl8RfH35CLcgBokqXf0AqyLh8LO8JKleJg4fAC3+IZpTW23T
-K6uUgmhDNtj2L8Yi/LVBXQ0zYOqkfX7oS1WRVtNcV48flBcvqt7pnqj0z4pMjqDk
-VnOyz0+GxWk88yQgi1yWDPprEjuaZ8HfxpaypdWSDZsJQmgkEEXUUOQXOUjQNYuU
-bRHej8pZAoGBAOokp/lpM+lx3FJ9iCEoL0neunIW6cxHeogNlFeEWBY6gbA/os+m
-bB6wBikAj+d3dqzbysfZXps/JpBSrvw4kAAUu7QPWJTnL2p+HE9BIdQxWR9OihqN
-p1dsItjl9H4yphDLZKVVA4emJwWMw9e2J7JNujDaR49U0z2LhI2UmFilAoGBANU4
-G8OPxZMMRwtvNZLFsI1GyJIYj/WACvfvof6AubUqusoYsF2lB9CTjdicBBzUYo6m
-JoEB/86KKmM0NUCqbYDeiSNqV02ebq2TTlaQC22dc4sMric93k7wqsVseGdslFKc
-N2dsLe+7r9+mkDzER8+Nlp6YqbSfxaZQ3LPw+3QXAoGAXoMJYr26fKK/QnT1fBzS
-ackEDYV+Pj0kEsMYe/Mp818OdmxZdeRBhGmdMvPNIquwNbpKsjzl2Vi2Yk9d3uWe
-CspTsiz3nrNrClt5ZexukU6SIPb8/Bbt03YM4ux/smkTa3gOWkZktF63JaBadTpL
-78c8Pvf9JrggxJkKmnO+wxkCgYEAukSTFKw0GTtfkWCs97TWgQU2UVM96GXcry7c
-YT7Jfbh/h/A7mwOCKTfOck4R1bHBDAegmZFKjX/sec/xObXphexi99p9vGRNIjwO
-8tZR9YfYmcARIF0PKf1b4q7ZHNkhVm38hNBf7RAVHBgh58Q9S9fQnmqVzyLJA3ue
-42AB/C8CgYAR0EvPG2e5nxB1R4ZlrjHCxjCsWQZQ2Q+1cAb38NPIYnyo2m72IT/T
-f1/qiqs/2Spe81HSwjA34y2jdQ0eTSE01VdwXIm/cuxKbmjVzRh0M06MOkWP5pZA
-62P5GYY6Ud2JS7Dz+Z9dKJU4vjWrylznk1M0oUVdEzllQkahn831vw==
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/client-keyEnc.pem b/extra/yassl/certs/client-keyEnc.pem
deleted file mode 100644
index 0097c0760a56..000000000000
--- a/extra/yassl/certs/client-keyEnc.pem
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,BDE979D13CCC0ABD
-
-N7yz2JV13EmQ7MZPL5wamid5+G1V1gp8FKqMemAC5JDxonS/W9oViMLUcxbfPTDx
-FznKdYSVTIQ7vv3ofmDG4MEyV/2C568N2kdtAw+jTfrZFN+IU9CI+W+In/nacirF
-02sAcvDMofustnooKNOO7/iyb5+3vRvEt5vSSRQn5WuSQ9sUKjuzoLs/lbf7fyAt
-4NeqfI3rYBZXxiUOLITOGXzGNRuFoY+o2uDCfelLAJ8uhiVG6ME3LeJEo1dT5lZ8
-CSJOLPasKg0iG4V7olM4j9FvAfZr48RRsSfUen756Jo2HpI4bad8LKhFYIdNs2Au
-WwKLmjpo6QB9hBmRshR04rEXPdrgTqLBExCE08PyaGYnWU8ggWritCeBzDQFj/n4
-sI+NO0Mymuvg98e5RpO52lg3Xnqv9RIK3guLFOmI6aEHC0PS4WwOEQ==
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/client-keyEnc3.pem b/extra/yassl/certs/client-keyEnc3.pem
deleted file mode 100644
index 0097c0760a56..000000000000
--- a/extra/yassl/certs/client-keyEnc3.pem
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,BDE979D13CCC0ABD
-
-N7yz2JV13EmQ7MZPL5wamid5+G1V1gp8FKqMemAC5JDxonS/W9oViMLUcxbfPTDx
-FznKdYSVTIQ7vv3ofmDG4MEyV/2C568N2kdtAw+jTfrZFN+IU9CI+W+In/nacirF
-02sAcvDMofustnooKNOO7/iyb5+3vRvEt5vSSRQn5WuSQ9sUKjuzoLs/lbf7fyAt
-4NeqfI3rYBZXxiUOLITOGXzGNRuFoY+o2uDCfelLAJ8uhiVG6ME3LeJEo1dT5lZ8
-CSJOLPasKg0iG4V7olM4j9FvAfZr48RRsSfUen756Jo2HpI4bad8LKhFYIdNs2Au
-WwKLmjpo6QB9hBmRshR04rEXPdrgTqLBExCE08PyaGYnWU8ggWritCeBzDQFj/n4
-sI+NO0Mymuvg98e5RpO52lg3Xnqv9RIK3guLFOmI6aEHC0PS4WwOEQ==
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/dh1024.dat b/extra/yassl/certs/dh1024.dat
deleted file mode 100644
index 86a955182783..000000000000
--- a/extra/yassl/certs/dh1024.dat
+++ /dev/null
@@ -1 +0,0 @@
-30818702818100DA9A18547FF03B385CC16508C173A7EF4EB61CB40EF8FEF3B31F145051676166BCDC3FE6B799FC394D08C26385F9413F896E09117E46209D6923602683CEA100924A6EE695281775C619DAA94EA8CB3691B4275B0183F1D39639EBC92995FE645D6C1BC28D409E585549BBD2C5DCDD6C208B04EADD8B7A6D997F72CBAD88390F020102
\ No newline at end of file
diff --git a/extra/yassl/certs/dsa-cert.pem b/extra/yassl/certs/dsa-cert.pem
deleted file mode 100644
index 10794cbee731..000000000000
--- a/extra/yassl/certs/dsa-cert.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCA2+gAwIBAgIJAK1zRM7YFcNjMAkGByqGSM44BAMwgZAxCzAJBgNVBAYT
-AlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQK
-DAd3b2xmU1NMMRAwDgYDVQQLDAd0ZXN0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
-bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTYwOTIy
-MjEyMzA0WhcNMjIwMzE1MjEyMzA0WjCBkDELMAkGA1UEBhMCVVMxDzANBgNVBAgM
-Bk9yZWdvbjERMA8GA1UEBwwIUG9ydGxhbmQxEDAOBgNVBAoMB3dvbGZTU0wxEDAO
-BgNVBAsMB3Rlc3RpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
-SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCAbgwggEsBgcqhkjOOAQBMIIBHwKB
-gQC9Ue5KMuCKx+rG4epwxFFDzyoH4ccSwlglXsRdvqswDRK/oQvTNNNoWiVxTn3k
-vQ8qDlhWy9KjGTrqr/ttgmh56FFpe6tz4yTgCNyR9D+eGclD7lNfdPUc4E3SA6ef
-opG6+ymI55bS+9xUFTG402UCrYSKT59zI2HBfuI6dltsxQIVAJHJ7WDQ+jBn/nmM
-yCQzdi+0qJx1AoGBAJJacRK36s5yGY1b6qhxWqvpoAC+SfEKylZnYWGYf2PM+Iwo
-6AgPKEw6BSsX+7Nmc4Gjyr4JWhComKi6onPamO/A2CbMM0DCxb47BeLBWfqWAgXV
-j0CODT4MQos5yugnviR/YpEgbzLxvrXr469lKWsAyB19/gFmGmQWcCgAwGm6A4GF
-AAKBgQCdy2PPch8r0P07EOs5WG6L425P6IJ3bDKj3TVLy+Ebj04CT/3Gmgw2tFye
-2pOgO0yfkIXizcDl6GT2CQuBBhUgwF6WJ4hoW1iK1UwhnupZmQ358eNFl0tJJN5v
-wx2gtNxJSwIsm8VRscqqFH2092b9ScH7VjLoqhx+bgA4XV7l1aNQME4wHQYDVR0O
-BBYEFCCY5ONeqOL/KqR/SwbV5Ufb/IHHMB8GA1UdIwQYMBaAFCCY5ONeqOL/KqR/
-SwbV5Ufb/IHHMAwGA1UdEwQFMAMBAf8wCQYHKoZIzjgEAwMvADAsAhQRYSCVN/Ge
-agV3mffU3qNZ92fI0QIUPH7Jp+iASI7U1ocaYDc10qXGaGY=
------END CERTIFICATE-----
diff --git a/extra/yassl/certs/dsa1024.der b/extra/yassl/certs/dsa1024.der
deleted file mode 100644
index db880d514803..000000000000
Binary files a/extra/yassl/certs/dsa1024.der and /dev/null differ
diff --git a/extra/yassl/certs/dsa1024.pem b/extra/yassl/certs/dsa1024.pem
deleted file mode 100644
index 5478ebfc2b2e..000000000000
--- a/extra/yassl/certs/dsa1024.pem
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQC9Ue5KMuCKx+rG4epwxFFDzyoH4ccSwlglXsRdvqswDRK/oQvT
-NNNoWiVxTn3kvQ8qDlhWy9KjGTrqr/ttgmh56FFpe6tz4yTgCNyR9D+eGclD7lNf
-dPUc4E3SA6efopG6+ymI55bS+9xUFTG402UCrYSKT59zI2HBfuI6dltsxQIVAJHJ
-7WDQ+jBn/nmMyCQzdi+0qJx1AoGBAJJacRK36s5yGY1b6qhxWqvpoAC+SfEKylZn
-YWGYf2PM+Iwo6AgPKEw6BSsX+7Nmc4Gjyr4JWhComKi6onPamO/A2CbMM0DCxb47
-BeLBWfqWAgXVj0CODT4MQos5yugnviR/YpEgbzLxvrXr469lKWsAyB19/gFmGmQW
-cCgAwGm6AoGBAJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caa
-DDa0XJ7ak6A7TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WX
-S0kk3m/DHaC03ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVAhQ01VXa
-Rr8IPem35lKghVKnq/kGQw==
------END DSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/server-cert.pem b/extra/yassl/certs/server-cert.pem
deleted file mode 100644
index 5504c822fae5..000000000000
--- a/extra/yassl/certs/server-cert.pem
+++ /dev/null
@@ -1,173 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Validity
-            Not Before: Aug 11 20:07:37 2016 GMT
-            Not After : May  8 20:07:37 2019 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
-                    01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
-                    f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
-                    f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
-                    64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
-                    86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
-                    4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
-                    34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
-                    8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
-                    40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
-                    dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
-                    e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
-                    64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
-                    c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
-                    ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
-                    b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
-                    a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
-                    ad:d7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
-            X509v3 Authority Key Identifier: 
-                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-                serial:B7:B6:90:33:66:1B:6B:23
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         51:fe:2a:df:07:7e:43:ca:66:8d:15:c4:2b:db:57:b2:06:6d:
-         0d:90:66:ff:a5:24:9c:14:ef:81:f2:a4:ab:99:a9:6a:49:20:
-         a5:d2:71:e7:1c:3c:99:07:c7:47:fc:e8:96:b4:f5:42:30:ce:
-         39:01:4b:d1:c2:e8:bc:95:84:87:ce:55:5d:97:9f:cf:78:f3:
-         56:9b:a5:08:6d:ac:f6:a5:5c:c4:ef:3e:2a:39:a6:48:26:29:
-         7b:2d:e0:cd:a6:8c:57:48:0b:bb:31:32:c2:bf:d9:43:4c:47:
-         25:18:81:a8:c9:33:82:41:9b:ba:61:86:d7:84:93:17:24:25:
-         36:ca:4d:63:6b:4f:95:79:d8:60:e0:1e:f5:ac:c1:8a:a1:b1:
-         7e:85:8e:87:20:2f:08:31:ad:5e:c6:4a:c8:61:f4:9e:07:1e:
-         a2:22:ed:73:7c:85:ee:fa:62:dc:50:36:aa:fd:c7:9d:aa:18:
-         04:fb:ea:cc:2c:68:9b:b3:a9:c2:96:d8:c1:cc:5a:7e:f7:0d:
-         9e:08:e0:9d:29:8b:84:46:8f:d3:91:6a:b5:b8:7a:5c:cc:4f:
-         55:01:b8:9a:48:a0:94:43:ca:25:47:52:0a:f7:f4:be:b0:d1:
-         71:6d:a5:52:4a:65:50:b2:ad:4e:1d:e0:6c:01:d8:fb:43:80:
-         e6:e4:0c:37
------BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIBATANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh
-d3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
-bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTYwODEx
-MjAwNzM3WhcNMTkwNTA4MjAwNzM3WjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgM
-B01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xEDAOBgNVBAoMB3dvbGZTU0wxEDAO
-BgNVBAsMB1N1cHBvcnQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
-SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hn
-f/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/X
-GQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bM
-QLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq
-0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ
-6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEAAaOB/DCB+TAdBgNVHQ4EFgQU
-sxEyyZKYhOLJ+NA7bgNCyh8OjjwwgckGA1UdIwSBwTCBvoAUJ45nEXTDJh0/7TNj
-s6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5h
-MRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290aDETMBEGA1UECwwK
-Q29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcN
-AQkBFhBpbmZvQHdvbGZzc2wuY29tggkAt7aQM2YbayMwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQsFAAOCAQEAUf4q3wd+Q8pmjRXEK9tXsgZtDZBm/6UknBTvgfKk
-q5mpakkgpdJx5xw8mQfHR/zolrT1QjDOOQFL0cLovJWEh85VXZefz3jzVpulCG2s
-9qVcxO8+KjmmSCYpey3gzaaMV0gLuzEywr/ZQ0xHJRiBqMkzgkGbumGG14STFyQl
-NspNY2tPlXnYYOAe9azBiqGxfoWOhyAvCDGtXsZKyGH0ngceoiLtc3yF7vpi3FA2
-qv3HnaoYBPvqzCxom7OpwpbYwcxafvcNngjgnSmLhEaP05Fqtbh6XMxPVQG4mkig
-lEPKJUdSCvf0vrDRcW2lUkplULKtTh3gbAHY+0OA5uQMNw==
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            b7:b6:90:33:66:1b:6b:23
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Validity
-            Not Before: Aug 11 20:07:37 2016 GMT
-            Not After : May  8 20:07:37 2019 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
-                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
-                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
-                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
-                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
-                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
-                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
-                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
-                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
-                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
-                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
-                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
-                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
-                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
-                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
-                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
-                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
-                    36:79
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-            X509v3 Authority Key Identifier: 
-                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
-                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
-                serial:B7:B6:90:33:66:1B:6B:23
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         0e:93:48:44:4a:72:96:60:71:25:82:a9:2c:ca:60:5b:f2:88:
-         3e:cf:11:74:5a:11:4a:dc:d9:d8:f6:58:2c:05:d3:56:d9:e9:
-         8f:37:ef:8e:3e:3b:ff:22:36:00:ca:d8:e2:96:3f:a7:d1:ed:
-         1f:de:7a:b0:d7:8f:36:bd:41:55:1e:d4:b9:86:3b:87:25:69:
-         35:60:48:d6:e4:5a:94:ce:a2:fa:70:38:36:c4:85:b4:4b:23:
-         fe:71:9e:2f:db:06:c7:b5:9c:21:f0:3e:7c:eb:91:f8:5c:09:
-         fd:84:43:a4:b3:4e:04:0c:22:31:71:6a:48:c8:ab:bb:e8:ce:
-         fa:67:15:1a:3a:82:98:43:33:b5:0e:1f:1e:89:f8:37:de:1b:
-         e6:b5:a0:f4:a2:8b:b7:1c:90:ba:98:6d:94:21:08:80:5d:f3:
-         bf:66:ad:c9:72:28:7a:6a:48:ee:cf:63:69:31:8c:c5:8e:66:
-         da:4b:78:65:e8:03:3a:4b:f8:cc:42:54:d3:52:5c:2d:04:ae:
-         26:87:e1:7e:40:cb:45:41:16:4b:6e:a3:2e:4a:76:bd:29:7f:
-         1c:53:37:06:ad:e9:5b:6a:d6:b7:4e:94:a2:7c:e8:ac:4e:a6:
-         50:3e:2b:32:9e:68:42:1b:e4:59:67:61:ea:c7:9a:51:9c:1c:
-         55:a3:77:76
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIJALe2kDNmG2sjMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
-A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
-dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
-Fw0xNjA4MTEyMDA3MzdaFw0xOTA1MDgyMDA3MzdaMIGUMQswCQYDVQQGEwJVUzEQ
-MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
-dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
-LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
-mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
-i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
-XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
-/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
-/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
-+TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
-J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
-aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
-MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAt7aQM2YbayMwDAYD
-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADpNIREpylmBxJYKpLMpgW/KI
-Ps8RdFoRStzZ2PZYLAXTVtnpjzfvjj47/yI2AMrY4pY/p9HtH956sNePNr1BVR7U
-uYY7hyVpNWBI1uRalM6i+nA4NsSFtEsj/nGeL9sGx7WcIfA+fOuR+FwJ/YRDpLNO
-BAwiMXFqSMiru+jO+mcVGjqCmEMztQ4fHon4N94b5rWg9KKLtxyQuphtlCEIgF3z
-v2atyXIoempI7s9jaTGMxY5m2kt4ZegDOkv4zEJU01JcLQSuJofhfkDLRUEWS26j
-Lkp2vSl/HFM3Bq3pW2rWt06UonzorE6mUD4rMp5oQhvkWWdh6seaUZwcVaN3dg==
------END CERTIFICATE-----
diff --git a/extra/yassl/certs/server-key.pem b/extra/yassl/certs/server-key.pem
deleted file mode 100644
index d1627f4d4a73..000000000000
--- a/extra/yassl/certs/server-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAwJUI4VdB8nFtt9JFQScBZcZFrvK8JDC4lc4vTtb2HIi8fJ/7
-qGd//lycUXX3isoH5zUvj+G9e8AvfKtkqBf8yl17uuAh5XIuby6G2JVz2qwbU7lf
-P9cZDSVP4WNjUYsLZD+tQ7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDj
-xsxAtGmjRjNph27Euxem8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTSELlk
-wyrQoZZKvOHUGlvHoMDBY3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlC
-Qgnp2Ai8MyCzWCKnquvE4eZhg8XSlt/Z0E+t1wIDAQABAoIBAQCa0DQPUmIFUAHv
-n+1kbsLE2hryhNeSEEiSxOlq64t1bMZ5OPLJckqGZFSVd8vDmp231B2kAMieTuTd
-x7pnFsF0vKnWlI8rMBr77d8hBSPZSjm9mGtlmrjcxH3upkMVLj2+HSJgKnMw1T7Y
-oqyGQy7E9WReP4l1DxHYUSVOn9iqo85gs+KK2X4b8GTKmlsFC1uqy+XjP24yIgXz
-0PrvdFKB4l90073/MYNFdfpjepcu1rYZxpIm5CgGUFAOeC6peA0Ul7QS2DFAq6EB
-QcIw+AdfFuRhd9Jg8p+N6PS662PeKpeB70xs5lU0USsoNPRTHMRYCj+7r7X3SoVD
-LTzxWFiBAoGBAPIsVHY5I2PJEDK3k62vvhl1loFk5rW4iUJB0W3QHBv4G6xpyzY8
-ZH3c9Bm4w2CxV0hfUk9ZOlV/MsAZQ1A/rs5vF/MOn0DKTq0VO8l56cBZOHNwnAp8
-yTpIMqfYSXUKhcLC/RVz2pkJKmmanwpxv7AEpox6Wm9IWlQ7xrFTF9/nAoGBAMuT
-3ncVXbdcXHzYkKmYLdZpDmOzo9ymzItqpKISjI57SCyySzfcBhh96v52odSh6T8N
-zRtfr1+elltbD6F8r7ObkNtXczrtsCNErkFPHwdCEyNMy/r0FKTV9542fFufqDzB
-hV900jkt/9CE3/uzIHoumxeu5roLrl9TpFLtG8SRAoGBAOyY2rvV/vlSSn0CVUlv
-VW5SL4SjK7OGYrNU0mNS2uOIdqDvixWl0xgUcndex6MEH54ZYrUbG57D8rUy+UzB
-qusMJn3UX0pRXKRFBnBEp1bA1CIUdp7YY1CJkNPiv4GVkjFBhzkaQwsYpVMfORpf
-H0O8h2rfbtMiAP4imHBOGhkpAoGBAIpBVihRnl/Ungs7mKNU8mxW1KrpaTOFJAza
-1AwtxL9PAmk4fNTm3Ezt1xYRwz4A58MmwFEC3rt1nG9WnHrzju/PisUr0toGakTJ
-c/5umYf4W77xfOZltU9s8MnF/xbKixsX4lg9ojerAby/QM5TjI7t7+5ZneBj5nxe
-9Y5L8TvBAoGATUX5QIzFW/QqGoq08hysa+kMVja3TnKW1eWK0uL/8fEYEz2GCbjY
-dqfJHHFSlDBD4PF4dP1hG0wJzOZoKnGtHN9DvFbbpaS+NXCkXs9P/ABVmTo9I89n
-WvUi+LUp0EQR6zUuRr79jhiyX6i/GTKh9dwD5nyaHwx8qbAOITc78bA=
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/server-keyEnc.pem b/extra/yassl/certs/server-keyEnc.pem
deleted file mode 100644
index e5ab57d4c9e5..000000000000
--- a/extra/yassl/certs/server-keyEnc.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,136C7D8A69656668
-
-jvNTyPaztxPIoAzbdmZnD0Zw2+60tMxNc0GMHNmeOyG25aHP/dT+TWiKFpFVkkkY
-uoCIhYUyw7gmpw+CnRJwWd+ans4nrvAjwy5oWJvarvsyUpjqvnPoIlAqd+d4TDKN
-eESzcI76+gHdisAtCrQD+fGqgTZhli5TgDbnpasL/QnY2qDlutvakkVw7gPXe156
-2Phy8WN+efr65J6wt3K/dj7Datl9u4JeHQK81gYyWBVX+EagEjPGDzkFQCj9Z0q7
-8K3iB5GW1JAqJS0IfZPB40AnSTF/n1TL1SN3qfU3l7hTGNrx9o7580bgDEoAR7pI
-F8eZlS15KHtZmh11AnU1KTKZ6kmgnNqeMTGMN6N0ct2wMKW1dV87eTDlF0oiR2ol
-XwtFgKmrIjfpmzkdWjbJmWnGMjD56KdiFZga/ZyKMsPrVoYLgfJEpn36iQspfygx
-HCGNTf0PjIsjEWU0WyQiF86t+c45W3wNFsv/AxVyfMl+su02yrd6u2ecuQDir3Cs
-b2k8IKtQgVe/NIpEWLKuiHG5oedIPPQyDYK5uq+gHxCGeOoKnWlsWFEHZRiza4X5
-tbgTrJB8Sw0ENWrvVGGmQZN4pSImlsMwzQ2qik5CQ00N1b3+56/obn0z75I3bUSb
-tC5g8DRjl6oclAenNgh/MYMT287y5W2dD4npxHcekX4O3J2CDXNfg4vV2j5GRxtg
-LVJdYE2p7bpYePCDHrYng8b9ubBprx0CrEnkIvvtUjzNPf6VDL0+MBKl+XgR2/nz
-iRqTuZnlGGOyM+KYDwXpgwfs/HfvFGksxTAlO/40GkGh+WGPaIoNyCK0SgQKhyb4
-JIkR0vd2/yLg3lWMJrGwh7A0Gm07Z/781oURP3uWd+PaCOgGcd5ipcAjcEyuxNly
-AthipWqmQWUcbf6Z2N9j3OA22Hv2Uzk8HSfi9VOZtL9svdEEZ0NnOekJgnc6stQp
-bXiknlK/T5WdrWxSyCfgUq68Vf6DFfIRAVuFdJ3WHT2wVXHrDfft6D+Ne/XCxPoE
-8zGmkyusaph33UHQ1oNyUbLbwcDCDSmOo8gYoedD3IwxtMA3wJRugomqosItwV8X
-vkgmcy8eSE/+gZUxJEN2gnLcfKFhCkC80J6oFhmoDD6vuUnPHcFdKZgVPw2rzPk5
-Vb1kX+gpORplYmKpq1vz/ujscL4T0TmYLz02hkIS4edpW55ncTTv7JWefpRiTB1J
-RB3td3me4htqR+YIDWJ+emrOmqsCG2WvpAS+MTw2mj1jYk9LL/ZYobTjSCEWmuwT
-yVK6m303irR7HQDauxhslRFgoK21w63viOyj5NKIU1gQtaAANGDxcgORC1XLjjgt
-oNutSQA+7P42vfHSHK4cnTBXl6V32H/GyVpdHQOZqSrqIjgLmUZodSmRPROxosZF
-a46B1O7m/rJFxkiKW4vod+/WqjoE0Hhfrb8rRrkRjzGeCqqSSnQ3vrunVkvF8hlA
-b6FOv4ZBJL4piC1GKH+rscqke9NEiDqXN8C3iYz86jbck/Ha21yUS8T3X7N52sg+
-B3AmOGnLK6BebYeto9vZxQjacChJZSixSxLV+l9/nVQ0+mW42azHdzk0ru59TGAj
------END RSA PRIVATE KEY-----
diff --git a/extra/yassl/certs/taoCert.txt b/extra/yassl/certs/taoCert.txt
deleted file mode 100644
index f1132c0b5b83..000000000000
--- a/extra/yassl/certs/taoCert.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-***** Create a self signed cert ************
-
-1) openssl genrsa 512 > client-key.pem
-
-2) openssl req -new -x509 -nodes -md5 -days 1000 -key client-key.pem > client-cert.pem
-
--- adding metadata to beginning
-
-3) openssl x509 -in client-cert.pem -text > tmp.pem
-
-4) mv tmp.pem client-cert.pem
-
-
-***** Create a CA, signing authority **********
-
-same as self signed, use ca prefix instead of client
-
-
-***** Create a cert signed by CA **************
-
-1) openssl req -newkey rsa:512 -md5 -days 1000 -nodes -keyout server-key.pem > server-req.pem
-
-2) copy ca-key.pem ca-cert.srl   (why ????)
-
-3) openssl x509 -req -in server-req.pem -days 1000 -md5 -CA ca-cert.pem -CAkey ca-key.pem -set_serial 01 > server-cert.pem
-
-
-
-***** To create a dsa cert ********************
-
-1) openssl dsaparam 512 > dsa512.param       # creates group params
-
-2) openssl gendsa dsa512.param > dsa512.pem  # creates private key
-
-3) openssl req -new -x509 -nodes -days 1000 -key dsa512.pem > dsa-cert.pem 
-
-
-
-
-***** To convert from PEM to DER **************
-
-a) openssl x509 -in cert.pem -inform PEM -out cert.der -outform DER
-
-to convert rsa private PEM to DER :
-
-b) openssl rsa -in key.pem -outform DER -out key.der
-
-
-**** To encrypt rsa key already in pem **********
-
-a) openssl rsa <server-key.pem.bak -des >server-keyEnc.pem
-
-note location of des, pass = yassl123
-
-
-*** To make a public key from a private key ******
-
-
-openssl rsa -in 1024rsa.priv -pubout -out 1024rsa.pub
-
-
diff --git a/extra/yassl/examples/client/client.cpp b/extra/yassl/examples/client/client.cpp
deleted file mode 100644
index 102ed61734c9..000000000000
--- a/extra/yassl/examples/client/client.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* client.cpp  */
-
-// takes an optional command line argument of cipher list to make scripting
-// easier
-
-
-#include "../../testsuite/test.hpp"
-
-//#define TEST_RESUME
-
-
-void ClientError(SSL_CTX* ctx, SSL* ssl, SOCKET_T& sockfd, const char* msg)
-{
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-    tcp_close(sockfd);
-    err_sys(msg);
-}
-
-
-#ifdef NON_BLOCKING
-    void NonBlockingSSL_Connect(SSL* ssl, SSL_CTX* ctx, SOCKET_T& sockfd)
-    {
-        int ret = SSL_connect(ssl);
-        int err = SSL_get_error(ssl, 0);
-        while (ret != SSL_SUCCESS && (err == SSL_ERROR_WANT_READ ||
-                                      err == SSL_ERROR_WANT_WRITE)) {
-            if (err == SSL_ERROR_WANT_READ)
-                printf("... client would read block\n");
-            else
-                printf("... client would write block\n");
-            #ifdef _WIN32
-                Sleep(1000);
-            #else
-                sleep(1);
-            #endif
-            ret = SSL_connect(ssl);
-            err = SSL_get_error(ssl, 0);
-        }
-        if (ret != SSL_SUCCESS)
-            ClientError(ctx, ssl, sockfd, "SSL_connect failed");
-    }
-#endif
-
-
-void client_test(void* args)
-{
-#ifdef _WIN32
-    WSADATA wsd;
-    WSAStartup(0x0002, &wsd);
-#endif
-
-    SOCKET_T sockfd = 0;
-    int      argc = 0;
-    char**   argv = 0;
-
-    set_args(argc, argv, *static_cast<func_args*>(args));
-    tcp_connect(sockfd);
-#ifdef NON_BLOCKING
-    tcp_set_nonblocking(sockfd);
-#endif
-    SSL_METHOD* method = TLSv1_client_method();
-    SSL_CTX*    ctx = SSL_CTX_new(method);
-
-    set_certs(ctx);
-    if (argc >= 2) {
-        printf("setting cipher list to %s\n", argv[1]);
-        if (SSL_CTX_set_cipher_list(ctx, argv[1]) != SSL_SUCCESS) {
-            ClientError(ctx, NULL, sockfd, "set_cipher_list error\n");
-        }
-    }
-    SSL* ssl = SSL_new(ctx);
-
-    SSL_set_fd(ssl, sockfd);
-
-
-#ifdef NON_BLOCKING
-    NonBlockingSSL_Connect(ssl, ctx, sockfd);
-#else
-    // if you get an error here see note at top of README
-    if (SSL_connect(ssl) != SSL_SUCCESS)   
-        ClientError(ctx, ssl, sockfd, "SSL_connect failed");
-#endif
-    showPeer(ssl);
-
-    const char* cipher = 0;
-    int index = 0;
-    char list[1024];
-    strncpy(list, "cipherlist", 11);
-    while ( (cipher = SSL_get_cipher_list(ssl, index++)) ) {
-        strncat(list, ":", 2);
-        strncat(list, cipher, strlen(cipher) + 1);
-    }
-    printf("%s\n", list);
-    printf("Using Cipher Suite: %s\n", SSL_get_cipher(ssl));
-
-    char msg[] = "hello yassl!";
-    if (SSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))
-        ClientError(ctx, ssl, sockfd, "SSL_write failed");
-
-    char reply[1024];
-    int input = SSL_read(ssl, reply, sizeof(reply));
-    if (input > 0) {
-        reply[input] = 0;
-        printf("Server response: %s\n", reply);
-    }
-
-#ifdef TEST_RESUME
-    SSL_SESSION* session   = SSL_get_session(ssl);
-    SSL*         sslResume = SSL_new(ctx);
-#endif
-
-    SSL_shutdown(ssl);
-    SSL_free(ssl);
-    tcp_close(sockfd);
-
-#ifdef TEST_RESUME
-    tcp_connect(sockfd);
-    SSL_set_fd(sslResume, sockfd);
-    SSL_set_session(sslResume, session);
-
-    if (SSL_connect(sslResume) != SSL_SUCCESS)
-        ClientError(ctx, sslResume, sockfd, "SSL_resume failed");
-    showPeer(sslResume);
-
-    if (SSL_write(sslResume, msg, sizeof(msg)) != sizeof(msg))
-        ClientError(ctx, sslResume, sockfd, "SSL_write failed");
-
-    input = SSL_read(sslResume, reply, sizeof(reply));
-    if (input > 0) {
-        reply[input] = 0;
-        printf("Server response: %s\n", reply);
-    }
-
-    SSL_shutdown(sslResume);
-    SSL_free(sslResume);
-    tcp_close(sockfd);
-#endif // TEST_RESUME
-
-    SSL_CTX_free(ctx);
-    ((func_args*)args)->return_code = 0;
-}
-
-
-#ifndef NO_MAIN_DRIVER
-
-    int main(int argc, char** argv)
-    {
-        func_args args;
-
-        args.argc = argc;
-        args.argv = argv;
-
-        client_test(&args);
-        yaSSL_CleanUp();
-
-        return args.return_code;
-    }
-
-#endif // NO_MAIN_DRIVER
-
diff --git a/extra/yassl/examples/client/client.dsp b/extra/yassl/examples/client/client.dsp
deleted file mode 100644
index 1caa585dadb6..000000000000
--- a/extra/yassl/examples/client/client.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=client - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "client.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "..\..\taocrypt\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\taocrypt\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/examples/echoclient/echoclient.cpp b/extra/yassl/examples/echoclient/echoclient.cpp
deleted file mode 100644
index fabcfbec29ef..000000000000
--- a/extra/yassl/examples/echoclient/echoclient.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* echoclient.cpp  */
-
-#include "../../testsuite/test.hpp"
-
-
-void EchoClientError(SSL_CTX* ctx, SSL* ssl, SOCKET_T& sockfd, const char* msg)
-{
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-    tcp_close(sockfd);
-    err_sys(msg);
-}
-
-
-void echoclient_test(void* args)
-{
-#ifdef _WIN32
-    WSADATA wsd;
-    WSAStartup(0x0002, &wsd);
-#endif
-
-    SOCKET_T sockfd = 0;
-    int      argc = 0;
-    char**   argv = 0;
-
-    FILE* fin  = stdin;
-    FILE* fout = stdout;
-
-    bool inCreated  = false;
-    bool outCreated = false;
-
-    set_args(argc, argv, *static_cast<func_args*>(args));
-    if (argc >= 2) {
-        fin  = fopen(argv[1], "r"); 
-        inCreated = true;
-    }
-    if (argc >= 3) {
-        fout = fopen(argv[2], "w");
-        outCreated = true;
-    }
-
-    if (!fin)  err_sys("can't open input file");
-    if (!fout) err_sys("can't open output file");
-
-    tcp_connect(sockfd);
-
-    SSL_METHOD* method = SSLv23_client_method();
-    SSL_CTX*    ctx = SSL_CTX_new(method);
-    set_certs(ctx);
-    SSL*        ssl = SSL_new(ctx);
-
-    SSL_set_fd(ssl, sockfd);
-
-    if (SSL_connect(ssl) != SSL_SUCCESS)
-        EchoClientError(ctx, ssl, sockfd, "SSL_connect failed");
-
-    char send[1024];
-    char reply[1024];
-
-    while (fgets(send, sizeof(send), fin)) {
-
-        int sendSz = (int)strlen(send) + 1;
-        if (SSL_write(ssl, send, sendSz) != sendSz)
-            EchoClientError(ctx, ssl, sockfd, "SSL_write failed");
-
-        if (strncmp(send, "quit", 4) == 0) {
-            fputs("sending server shutdown command: quit!\n", fout);
-            break;
-        }
-
-        if (SSL_read(ssl, reply, sizeof(reply)) > 0)
-            fputs(reply, fout);
-    }
-
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-    tcp_close(sockfd);
-
-    fflush(fout);
-    if (inCreated)  fclose(fin);
-    if (outCreated) fclose(fout);
-
-    ((func_args*)args)->return_code = 0;
-}
-
-
-#ifndef NO_MAIN_DRIVER
-
-    int main(int argc, char** argv)
-    {
-        func_args args;
-
-        args.argc = argc;
-        args.argv = argv;
-
-        echoclient_test(&args);
-        yaSSL_CleanUp();
-
-        return args.return_code;
-    }
-
-#endif // NO_MAIN_DRIVER
diff --git a/extra/yassl/examples/echoclient/echoclient.dsp b/extra/yassl/examples/echoclient/echoclient.dsp
deleted file mode 100644
index 52052c6dc44e..000000000000
--- a/extra/yassl/examples/echoclient/echoclient.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="echoclient" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=echoclient - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "echoclient.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "echoclient.mak" CFG="echoclient - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "echoclient - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "echoclient - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "echoclient - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "..\..\include" /I "..\..\taocrypt\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "echoclient - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\taocrypt\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "echoclient - Win32 Release"
-# Name "echoclient - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\echoclient.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/examples/echoclient/input b/extra/yassl/examples/echoclient/input
deleted file mode 100644
index 438a592852c2..000000000000
--- a/extra/yassl/examples/echoclient/input
+++ /dev/null
@@ -1,93 +0,0 @@
-/* echoclient.cpp  */
-
-#include "openssl/ssl.h"  /* openssl compatibility test */
-#include <stdio.h>
-#include <stdlib.h>
-
-
-#ifdef WIN32
-    #include <winsock2.h>
-#else
-    #include <string.h>
-    #include <unistd.h>
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-    #include <sys/ioctl.h>
-    #include <sys/time.h>
-    #include <sys/types.h>
-    #include <sys/socket.h>
-#endif /* WIN32 */
-
-
-void err_sys(const char* msg)
-{
-    fputs("yassl client error: ", stderr);
-    fputs(msg, stderr);
-    exit(EXIT_FAILURE);
-}
-
-const char* loopback  = "127.0.0.1";
-const short yasslPort = 11111;
-
-using namespace yaSSL;
-
-
-int main(int argc, char** argv)
-{
-#ifdef WIN32
-    WSADATA wsd;
-    WSAStartup(0x0002, &wsd);
-    int sockfd;
-#else
-    unsigned int sockfd;
-#endif /* WIN32  */
-
-    FILE* fin  = stdin;
-    FILE* fout = stdout;
-
-    if (argc >= 2) fin  = fopen(argv[1], "r");
-    if (argc >= 3) fout = fopen(argv[2], "w");
-
-    if (!fin)  err_sys("can't open input file");
-    if (!fout) err_sys("can't open output file");
-
-    sockfd = socket(AF_INET, SOCK_STREAM, 0);
-    sockaddr_in servaddr;
-    memset(&servaddr, 0, sizeof(servaddr));
-    servaddr.sin_family = AF_INET;
-
-    servaddr.sin_port = htons(yasslPort);
-    servaddr.sin_addr.s_addr = inet_addr(loopback);
-    if (connect(sockfd, (const sockaddr*)&servaddr, sizeof(servaddr)) != 0)
-        err_sys("tcp connect failed");
-
-    SSL_METHOD* method = TLSv1_client_method();
-    SSL_CTX*    ctx = SSL_CTX_new(method);
-    SSL*        ssl = SSL_new(ctx);
-
-    SSL_set_fd(ssl, sockfd);
-    if (SSL_connect(ssl) != SSL_SUCCESS) err_sys("SSL_connect failed");
-
-    char send[1024];
-    char reply[1024];
- 
-    while (fgets(send, sizeof(send), fin)) {
-
-        int sendSz = strlen(send) + 1;
-        if (SSL_write(ssl, send, sendSz) != sendSz)
-            err_sys("SSL_write failed");
-
-        if (strncmp(send, "quit", 4) == 0) {
-            fputs("sending server shutdown command: quit!", fout);
-            break;
-        }
-
-        if (SSL_read(ssl, reply, sizeof(reply)) > 0) 
-            fputs(reply, fout);
-    }
-
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-
-    return 0;
-}
diff --git a/extra/yassl/examples/echoclient/quit b/extra/yassl/examples/echoclient/quit
deleted file mode 100644
index 3db49b3ad126..000000000000
--- a/extra/yassl/examples/echoclient/quit
+++ /dev/null
@@ -1,2 +0,0 @@
-quit
-
diff --git a/extra/yassl/examples/echoserver/echoserver.cpp b/extra/yassl/examples/echoserver/echoserver.cpp
deleted file mode 100644
index 82696568ace0..000000000000
--- a/extra/yassl/examples/echoserver/echoserver.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* echoserver.cpp */
-
-#include "../../testsuite/test.hpp"
-
-
-#ifndef NO_MAIN_DRIVER
-    #define ECHO_OUT
-
-    THREAD_RETURN YASSL_API echoserver_test(void*);
-    int main(int argc, char** argv)
-    {
-        func_args args;
-
-        args.argc = argc;
-        args.argv = argv;
-
-        echoserver_test(&args);
-        yaSSL_CleanUp();
-
-        return args.return_code;
-    }
-
-#endif // NO_MAIN_DRIVER
-
-
-
-void EchoError(SSL_CTX* ctx, SSL* ssl, SOCKET_T& s1, SOCKET_T& s2,
-               const char* msg)
-{
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-    tcp_close(s1);
-    tcp_close(s2);
-    err_sys(msg);
-}
-
-
-THREAD_RETURN YASSL_API echoserver_test(void* args)
-{
-#ifdef _WIN32
-    WSADATA wsd;
-    WSAStartup(0x0002, &wsd);
-#endif
-
-    SOCKET_T sockfd = 0;
-    int      argc = 0;
-    char**   argv = 0;
-
-    set_args(argc, argv, *static_cast<func_args*>(args));
-
-#ifdef ECHO_OUT
-    FILE* fout = stdout;
-    if (argc >= 2) fout = fopen(argv[1], "w");
-    if (!fout) err_sys("can't open output file");
-#endif
-
-    tcp_listen(sockfd);
-
-    SSL_METHOD* method = SSLv23_server_method();
-    SSL_CTX*    ctx    = SSL_CTX_new(method);
-
-    set_serverCerts(ctx);
-    DH* dh = set_tmpDH(ctx);
-
-    bool shutdown(false);
-
-#if defined(_POSIX_THREADS) && defined(NO_MAIN_DRIVER)
-    // signal ready to tcp_accept
-    func_args& server_args = *((func_args*)args);
-    tcp_ready& ready = *server_args.signal_;
-    pthread_mutex_lock(&ready.mutex_);
-    ready.ready_ = true;
-    pthread_cond_signal(&ready.cond_);
-    pthread_mutex_unlock(&ready.mutex_);
-#endif
-
-    while (!shutdown) {
-        SOCKADDR_IN_T client;
-        socklen_t   client_len = sizeof(client);
-        SOCKET_T    clientfd   = accept(sockfd, (sockaddr*)&client,
-                                      (ACCEPT_THIRD_T)&client_len);
-        if (clientfd == (SOCKET_T) -1) {
-            SSL_CTX_free(ctx);
-            tcp_close(sockfd);
-            err_sys("tcp accept failed");
-        }
-
-        SSL* ssl = SSL_new(ctx);
-        SSL_set_fd(ssl, clientfd);
-        if (SSL_accept(ssl) != SSL_SUCCESS) {
-            printf("SSL_accept failed\n");
-            SSL_free(ssl);
-            tcp_close(clientfd);
-            continue; 
-        }
-       
-        char command[1024];
-        int echoSz(0);
-        while ( (echoSz = SSL_read(ssl, command, sizeof(command))) > 0) {
-
-            if ( strncmp(command, "quit", 4) == 0) {
-                printf("client sent quit command: shutting down!\n");
-                shutdown = true;
-                break;
-            }
-            else if ( strncmp(command, "GET", 3) == 0) {
-                char type[]   = "HTTP/1.0 200 ok\r\nContent-type:"
-                                " text/html\r\n\r\n";
-                char header[] = "<html><body BGCOLOR=\"#ffffff\">\n<pre>\n";
-                char body[]   = "greetings from yaSSL\n";
-                char footer[] = "</body></html>\r\n\r\n";
-
-                strncpy(command, type, sizeof(type));
-                echoSz = sizeof(type) - 1;
-
-                strncpy(&command[echoSz], header, sizeof(header));
-                echoSz += sizeof(header) - 1;
-                strncpy(&command[echoSz], body, sizeof(body));
-                echoSz += sizeof(body) - 1;
-                strncpy(&command[echoSz], footer, sizeof(footer));
-                echoSz += sizeof(footer);
-
-                if (SSL_write(ssl, command, echoSz) != echoSz)
-                    EchoError(ctx, ssl, sockfd, clientfd, "SSL_write failed");
-               
-                break;
-            }
-            command[echoSz] = 0;
-
-        #ifdef ECHO_OUT
-            fputs(command, fout);
-        #endif
-
-            if (SSL_write(ssl, command, echoSz) != echoSz)
-                EchoError(ctx, ssl, sockfd, clientfd, "SSL_write failed");
-        }
-        SSL_shutdown(ssl);
-        SSL_free(ssl);
-        tcp_close(clientfd);
-    }
-
-    tcp_close(sockfd);
-
-    DH_free(dh);
-    SSL_CTX_free(ctx);
-
-    ((func_args*)args)->return_code = 0;
-    return 0;
-}
diff --git a/extra/yassl/examples/echoserver/echoserver.dsp b/extra/yassl/examples/echoserver/echoserver.dsp
deleted file mode 100644
index 21a965b013cc..000000000000
--- a/extra/yassl/examples/echoserver/echoserver.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="echoserver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=echoserver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "echoserver.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "echoserver.mak" CFG="echoserver - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "echoserver - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "echoserver - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "echoserver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "..\..\include" /I "..\..\taocrypt\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "echoserver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\taocrypt\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "echoserver - Win32 Release"
-# Name "echoserver - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\echoserver.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/examples/server/server.cpp b/extra/yassl/examples/server/server.cpp
deleted file mode 100644
index 1540f6d3689f..000000000000
--- a/extra/yassl/examples/server/server.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* server.cpp */
-
-// takes 2 optional command line argument to make scripting
-// if the first  command line argument is 'n' client auth is disabled
-// if the second command line argument is 'd' DSA certs are used instead of RSA
-
-#include "../../testsuite/test.hpp"
-
-
-void ServerError(SSL_CTX* ctx, SSL* ssl, SOCKET_T& sockfd, const char* msg)
-{
-    SSL_CTX_free(ctx);
-    SSL_free(ssl);
-    tcp_close(sockfd);
-    err_sys(msg);
-}
-
-
-#ifdef NON_BLOCKING
-    void NonBlockingSSL_Accept(SSL* ssl, SSL_CTX* ctx, SOCKET_T& clientfd)
-    {
-        int ret = SSL_accept(ssl);
-        int err = SSL_get_error(ssl, 0);
-        while (ret != SSL_SUCCESS && (err == SSL_ERROR_WANT_READ ||
-                                      err == SSL_ERROR_WANT_WRITE)) {
-            if (err == SSL_ERROR_WANT_READ)
-                printf("... server would read block\n");
-            else
-                printf("... server would write block\n");
-            #ifdef _WIN32
-                Sleep(1000);
-            #else
-                sleep(1);
-            #endif
-            ret = SSL_accept(ssl);
-            err = SSL_get_error(ssl, 0);
-        }
-        if (ret != SSL_SUCCESS)
-            ServerError(ctx, ssl, clientfd, "SSL_accept failed");
-    }
-#endif
-
-
-THREAD_RETURN YASSL_API server_test(void* args)
-{
-#ifdef _WIN32
-    WSADATA wsd;
-    WSAStartup(0x0002, &wsd);
-#endif
-
-    SOCKET_T sockfd   = 0;
-    SOCKET_T clientfd = 0;
-    int      argc     = 0;
-    char**   argv     = 0;
-
-    set_args(argc, argv, *static_cast<func_args*>(args));
-#ifdef SERVER_READY_FILE
-    set_file_ready("server_ready", *static_cast<func_args*>(args));
-#endif
-    tcp_accept(sockfd, clientfd, *static_cast<func_args*>(args));
-
-    tcp_close(sockfd);
-
-    SSL_METHOD* method = TLSv1_server_method();
-    SSL_CTX*    ctx = SSL_CTX_new(method);
-
-    //SSL_CTX_set_cipher_list(ctx, "RC4-SHA:RC4-MD5");
-    
-    // should we disable client auth
-    if (argc >= 2 && argv[1][0] == 'n')
-        printf("disabling client auth\n");
-    else
-        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
-
-    // are we using DSA certs
-    if (argc >= 3 && argv[2][0] == 'd') {
-        printf("using DSA certs\n");
-        set_dsaServerCerts(ctx);
-    }
-    else {
-        set_serverCerts(ctx);
-    }
-    DH* dh = set_tmpDH(ctx);
-
-    SSL* ssl = SSL_new(ctx);
-    SSL_set_fd(ssl, clientfd);
-
-#ifdef NON_BLOCKING
-    NonBlockingSSL_Accept(ssl, ctx, clientfd);
-#else
-    if (SSL_accept(ssl) != SSL_SUCCESS)
-        ServerError(ctx, ssl, clientfd, "SSL_accept failed");
-#endif
-     
-    showPeer(ssl);
-    printf("Using Cipher Suite: %s\n", SSL_get_cipher(ssl));
-
-    char command[1024];
-    int input = SSL_read(ssl, command, sizeof(command));
-    if (input > 0) {
-        command[input] = 0;
-        printf("First client command: %s\n", command);
-    }
-
-    char msg[] = "I hear you, fa shizzle!";
-    if (SSL_write(ssl, msg, sizeof(msg)) != sizeof(msg))
-        ServerError(ctx, ssl, clientfd, "SSL_write failed");
-
-    DH_free(dh);
-    SSL_CTX_free(ctx);
-    SSL_shutdown(ssl);
-    SSL_free(ssl);
-
-    tcp_close(clientfd);
-
-    ((func_args*)args)->return_code = 0;
-    return 0;
-}
-
-
-#ifndef NO_MAIN_DRIVER
-
-    int main(int argc, char** argv)
-    {
-        func_args args;
-
-        args.argc = argc;
-        args.argv = argv;
-
-        server_test(&args);
-        yaSSL_CleanUp();
-
-        return args.return_code;
-    }
-
-#endif // NO_MAIN_DRIVER
-
diff --git a/extra/yassl/examples/server/server.dsp b/extra/yassl/examples/server/server.dsp
deleted file mode 100644
index 9c797c54dfe1..000000000000
--- a/extra/yassl/examples/server/server.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=server - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "server.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "..\..\include" /I "..\..\taocrypt\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\taocrypt\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\server.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/include/buffer.hpp b/extra/yassl/include/buffer.hpp
deleted file mode 100644
index 77d2ed8193ca..000000000000
--- a/extra/yassl/include/buffer.hpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL buffer header defines input and output buffers to simulate streaming
- * with SSL types and sockets
- */
-
-#ifndef yaSSL_BUFFER_HPP
-#define yaSSL_BUFFER_HPP
-
-#include <assert.h>             // assert
-#include "yassl_types.hpp"      // ysDelete
-#include "memory.hpp"           // mySTL::auto_ptr
-#include STL_ALGORITHM_FILE
-
-
-namespace STL = STL_NAMESPACE;
-
-
-#ifdef _MSC_VER
-    // disable truncated debug symbols
-    #pragma warning(disable:4786)
-#endif
-
-
-namespace yaSSL {
-
-typedef unsigned char byte;
-typedef unsigned int  uint;
-const uint AUTO = 0xFEEDBEEF;
-
-
-
-struct NoCheck {
-    int check(uint, uint);
-};
-
-struct Check {
-    int check(uint, uint);
-};
-
-/* input_buffer operates like a smart c style array with a checking option, 
- * meant to be read from through [] with AUTO index or read().
- * Should only write to at/near construction with assign() or raw (e.g., recv)
- * followed by add_size with the number of elements added by raw write.
- *
- * Not using vector because need checked []access, offset, and the ability to
- * write to the buffer bulk wise and have the correct size
- */
-
-class input_buffer : public Check {
-    uint   size_;                // number of elements in buffer
-    uint   current_;             // current offset position in buffer
-    byte*  buffer_;              // storage for buffer
-    byte*  end_;                 // end of storage marker
-    int    error_;               // error number
-    byte   zero_;                // for returning const reference to zero byte
-public:
-    input_buffer();
-
-    explicit input_buffer(uint s);
-                          
-    // with assign
-    input_buffer(uint s, const byte* t, uint len);
-    
-    ~input_buffer();
-
-    // users can pass defualt zero length buffer and then allocate
-    void allocate(uint s);
-
-    // for passing to raw writing functions at beginning, then use add_size
-    byte* get_buffer() const;
-
-    // after a raw write user can set new size
-    // if you know the size before the write use assign()
-    void add_size(uint i);
-
-    uint get_capacity()  const;
-
-    uint get_current()   const;
-
-    uint get_size()      const;
-
-    uint get_remaining() const;
-
-    int  get_error()     const;
-
-    void set_error();
-
-    void set_current(uint i);
-
-    // read only access through [], advance current
-    // user passes in AUTO index for ease of use
-    const byte& operator[](uint i);
-    
-    // end of input test
-    bool eof();
-
-    // peek ahead
-    byte peek();
-
-    // write function, should use at/near construction
-    void assign(const byte* t, uint s);
-    
-    // use read to query input, adjusts current
-    void read(byte* dst, uint length);
-
-private:
-    input_buffer(const input_buffer&);              // hide copy
-    input_buffer& operator=(const input_buffer&);   // and assign
-};
-
-
-/* output_buffer operates like a smart c style array with a checking option.
- * Meant to be written to through [] with AUTO index or write().
- * Size (current) counter increases when written to. Can be constructed with 
- * zero length buffer but be sure to allocate before first use. 
- * Don't use add write for a couple bytes, use [] instead, way less overhead.
- * 
- * Not using vector because need checked []access and the ability to
- * write to the buffer bulk wise and retain correct size
- */
-class output_buffer : public NoCheck {
-    uint    current_;                // current offset and elements in buffer
-    byte*   buffer_;                 // storage for buffer
-    byte*   end_;                    // end of storage marker
-public:
-    // default
-    output_buffer();
-
-    // with allocate
-    explicit output_buffer(uint s);
-
-    // with assign
-    output_buffer(uint s, const byte* t, uint len);
-
-    ~output_buffer();
-
-    uint get_size() const;
-
-    uint get_capacity() const;
-
-    void set_current(uint c);
-
-    // users can pass defualt zero length buffer and then allocate
-    void allocate(uint s);
-
-    // for passing to reading functions when finished
-    const byte* get_buffer() const;
-
-    // allow write access through [], update current
-    // user passes in AUTO as index for ease of use
-    byte& operator[](uint i);
-    
-    // end of output test
-    bool eof();
-
-    void write(const byte* t, uint s);
-
-private:
-    output_buffer(const output_buffer&);              // hide copy
-    output_buffer& operator=(const output_buffer&);   // and assign
-};
-
-
-
-
-// turn delete an incomplete type into comipler error instead of warning
-template <typename T>
-inline void checked_delete(T* p)
-{
-    typedef char complete_type[sizeof(T) ? 1 : -1];
-    (void)sizeof(complete_type);
-    ysDelete(p);
-}
-
-
-// checked delete functor increases effeciency, no indirection on function call
-// sets pointer to zero so safe for std conatiners
-struct del_ptr_zero
-{
-    template <typename T>
-    void operator()(T*& p) const
-    {
-        T* tmp = 0;
-        STL::swap(tmp, p);
-        checked_delete(tmp); 
-    }
-};
-
-
-
-} // naemspace
-
-#endif // yaSSL_BUUFER_HPP
diff --git a/extra/yassl/include/cert_wrapper.hpp b/extra/yassl/include/cert_wrapper.hpp
deleted file mode 100644
index 8e3393b49258..000000000000
--- a/extra/yassl/include/cert_wrapper.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
- */
-
-
-/*  The certificate wrapper header defines certificate management functions
- *
- */
-
-
-#ifndef yaSSL_CERT_WRAPPER_HPP
-#define yaSSL_CERT_WRAPPER_HPP
-
-#ifdef _MSC_VER
-    // disable truncated debug symbols
-    #pragma warning(disable:4786)
-#endif
-
-
-#include "yassl_types.hpp"  // SignatureAlgorithm
-#include "buffer.hpp"       // input_buffer
-#include "asn.hpp"          // SignerList
-#include "openssl/ssl.h"    // internal and external use
-#include STL_LIST_FILE
-#include STL_ALGORITHM_FILE
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace yaSSL {
-   
-typedef unsigned char opaque;
-class X509;                     // forward openSSL type
-
-using TaoCrypt::SignerList;
-
-// an x509 version 3 certificate
-class x509 {
-    uint    length_;
-    opaque* buffer_;
-public:
-    explicit x509(uint sz);
-    ~x509();
-
-    uint          get_length() const;
-    const opaque* get_buffer() const;
-    opaque*       use_buffer();
-
-    x509(const x509&);
-    x509& operator=(const x509&);
-private:
-    void Swap(x509&);
-};
-
-
-// Certificate Manager keeps a list of the cert chain and public key
-class CertManager {
-    typedef STL::list<x509*> CertList;
-
-    CertList     list_;                 // self      
-    input_buffer privateKey_;
-
-    CertList     peerList_;             // peer
-    input_buffer peerPublicKey_;
-    X509*        peerX509_;             // peer's openSSL X509
-    X509*        selfX509_;             // our own openSSL X509
-
-    SignatureAlgorithm keyType_;        // self   key type
-    SignatureAlgorithm peerKeyType_;    // peer's key type
-
-    SignerList   signers_;              // decoded CA keys and names
-                                        //    plus verified chained certs
-    bool verifyPeer_;
-    bool verifyNone_;                   // no error if verify fails
-    bool failNoCert_;
-    bool sendVerify_;
-    bool sendBlankCert_;
-    VerifyCallback verifyCallback_;     // user verify callback
-public:
-    CertManager();
-    ~CertManager();
-
-    void AddPeerCert(x509* x);      // take ownership
-    void CopySelfCert(const x509* x);
-    int  CopyCaCert(const x509* x);
-    int  Validate();
-
-    int SetPrivateKey(const x509&);
-
-    const x509*        get_cert()        const;
-    const opaque*      get_peerKey()     const;
-    const opaque*      get_privateKey()  const;
-          X509*        get_peerX509()    const;
-          X509*        get_selfX509()    const;
-    SignatureAlgorithm get_keyType()     const;
-    SignatureAlgorithm get_peerKeyType() const;
-
-    uint get_peerKeyLength()       const;
-    uint get_privateKeyLength()    const;
-
-    bool verifyPeer() const;
-    bool verifyNone() const;
-    bool failNoCert() const;
-    bool sendVerify() const;
-    bool sendBlankCert() const;
-
-    void setVerifyPeer();
-    void setVerifyNone();
-    void setFailNoCert();
-    void setSendVerify();
-    void setSendBlankCert();
-    void setPeerX509(X509*);
-    void setVerifyCallback(VerifyCallback);
-private:
-    CertManager(const CertManager&);            // hide copy
-    CertManager& operator=(const CertManager&); // and assigin
-};
-
-
-} // naemspace
-
-#endif // yaSSL_CERT_WRAPPER_HPP
diff --git a/extra/yassl/include/crypto_wrapper.hpp b/extra/yassl/include/crypto_wrapper.hpp
deleted file mode 100644
index c0395cb27e3f..000000000000
--- a/extra/yassl/include/crypto_wrapper.hpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/*  The crypto wrapper header is used to define policies for the cipher 
- *  components used by SSL.  There are 3 policies to consider:
- *
- *  1) MAC, the Message Authentication Code used for each Message
- *  2) Bulk Cipher, the Cipher used to encrypt/decrypt each Message
- *  3) Atuhentication, the Digitial Signing/Verifiaction scheme used
- *
- *  This header doesn't rely on a specific crypto libraries internals,
- *  only the implementation should.
- */
-
-
-#ifndef yaSSL_CRYPTO_WRAPPER_HPP
-#define yaSSL_CRYPTO_WRAPPER_HPP
-
-#include "yassl_types.hpp"
-#include <stdio.h>   // FILE
-
-
-namespace yaSSL {
-
-
-// Digest policy should implement a get_digest, update, and get sizes for pad
-// and  digest
-struct Digest : public virtual_base {
-    virtual void   get_digest(byte*) = 0;
-    virtual void   get_digest(byte*, const byte*, unsigned int) = 0;
-    virtual void   update(const byte*, unsigned int) = 0;
-    virtual uint   get_digestSize() const = 0;
-    virtual uint   get_padSize() const = 0;
-    virtual ~Digest() {}
-};
-
-
-// For use with NULL Digests
-struct NO_MAC : public Digest {
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-};
-
-
-// MD5 Digest
-class MD5 : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    MD5();
-    ~MD5();
-    MD5(const MD5&);
-    MD5& operator=(const MD5&);
-private:
-    struct MD5Impl;
-    MD5Impl* pimpl_;
-};
-
-
-// SHA-1 Digest
-class SHA : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    SHA();
-    ~SHA();
-    SHA(const SHA&);
-    SHA& operator=(const SHA&);
-private:
-    struct SHAImpl;
-    SHAImpl* pimpl_;
-
-};
-
-
-// RIPEMD-160 Digest
-class RMD : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    RMD();
-    ~RMD();
-    RMD(const RMD&);
-    RMD& operator=(const RMD&);
-private:
-    struct RMDImpl;
-    RMDImpl* pimpl_;
-
-};
-
-
-// HMAC_MD5
-class HMAC_MD5 : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    HMAC_MD5(const byte*, unsigned int);
-    ~HMAC_MD5();
-private:
-    struct HMAC_MD5Impl;
-    HMAC_MD5Impl* pimpl_;
-
-    HMAC_MD5(const HMAC_MD5&);
-    HMAC_MD5& operator=(const HMAC_MD5&);
-};
-
-
-// HMAC_SHA-1
-class HMAC_SHA : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    HMAC_SHA(const byte*, unsigned int);
-    ~HMAC_SHA();
-private:
-    struct HMAC_SHAImpl;
-    HMAC_SHAImpl* pimpl_;
-
-    HMAC_SHA(const HMAC_SHA&);
-    HMAC_SHA& operator=(const HMAC_SHA&);
-};
-
-
-// HMAC_RMD
-class HMAC_RMD : public Digest {
-public:
-    void   get_digest(byte*);
-    void   get_digest(byte*, const byte*, unsigned int);
-    void   update(const byte*, unsigned int);
-    uint   get_digestSize() const;
-    uint   get_padSize()    const;
-    HMAC_RMD(const byte*, unsigned int);
-    ~HMAC_RMD();
-private:
-    struct HMAC_RMDImpl;
-    HMAC_RMDImpl* pimpl_;
-
-    HMAC_RMD(const HMAC_RMD&);
-    HMAC_RMD& operator=(const HMAC_RMD&);
-};
-
-
-// BulkCipher policy should implement encrypt, decrypt, get block size, 
-// and set keys for encrypt and decrypt
-struct BulkCipher : public virtual_base {
-    virtual void   encrypt(byte*, const byte*, unsigned int) = 0;
-    virtual void   decrypt(byte*, const byte*, unsigned int) = 0;
-    virtual void   set_encryptKey(const byte*, const byte* = 0) = 0;
-    virtual void   set_decryptKey(const byte*, const byte* = 0) = 0;
-    virtual uint   get_blockSize() const = 0;
-    virtual int    get_keySize()   const = 0;
-    virtual int    get_ivSize()    const = 0;
-    virtual ~BulkCipher() {}
-};
-
-
-// For use with NULL Ciphers
-struct NO_Cipher : public BulkCipher {
-    void   encrypt(byte*, const byte*, unsigned int) {}
-    void   decrypt(byte*, const byte*, unsigned int) {}
-    void   set_encryptKey(const byte*, const byte*)  {}
-    void   set_decryptKey(const byte*, const byte*)  {}
-    uint   get_blockSize() const { return 0; }
-    int    get_keySize()   const { return 0; }
-    int    get_ivSize()    const { return 0; }
-};
-
-
-// SSLv3 and TLSv1 always use DES in CBC mode so IV is required
-class DES : public BulkCipher {
-public:
-    void   encrypt(byte*, const byte*, unsigned int);
-    void   decrypt(byte*, const byte*, unsigned int);
-    void   set_encryptKey(const byte*, const byte*);
-    void   set_decryptKey(const byte*, const byte*);
-    uint   get_blockSize() const { return DES_BLOCK; }
-    int    get_keySize()   const { return DES_KEY_SZ; }
-    int    get_ivSize()    const { return DES_IV_SZ; }
-    DES();
-    ~DES();
-private:
-    struct DESImpl;
-    DESImpl* pimpl_;
-
-    DES(const DES&);                // hide copy
-    DES& operator=(const DES&);     // & assign
-};
-
-
-// 3DES Encrypt-Decrypt-Encrypt in CBC mode
-class DES_EDE : public BulkCipher {
-public:
-    void   encrypt(byte*, const byte*, unsigned int);
-    void   decrypt(byte*, const byte*, unsigned int);
-    void   set_encryptKey(const byte*, const byte*);
-    void   set_decryptKey(const byte*, const byte*);
-    uint   get_blockSize() const { return DES_BLOCK; }
-    int    get_keySize()   const { return DES_EDE_KEY_SZ; }
-    int    get_ivSize()    const { return DES_IV_SZ; }
-    DES_EDE();
-    ~DES_EDE();
-private:
-    struct DES_EDEImpl;
-    DES_EDEImpl* pimpl_;
-
-    DES_EDE(const DES_EDE&);            // hide copy
-    DES_EDE& operator=(const DES_EDE&); // & assign
-};
-
-
-// Alledged RC4
-class RC4 : public BulkCipher {
-public:
-    void encrypt(byte*, const byte*, unsigned int);
-    void decrypt(byte*, const byte*, unsigned int);
-    void set_encryptKey(const byte*, const byte*);
-    void set_decryptKey(const byte*, const byte*);
-    uint get_blockSize() const { return 0; }
-    int  get_keySize()   const { return RC4_KEY_SZ; }
-    int  get_ivSize()    const { return 0; }
-    RC4();
-    ~RC4();
-private:
-    struct RC4Impl;
-    RC4Impl* pimpl_;
-
-    RC4(const RC4&);             // hide copy
-    RC4& operator=(const RC4&);  // & assign
-};
-
-
-// AES
-class AES : public BulkCipher {
-public:
-    void encrypt(byte*, const byte*, unsigned int);
-    void decrypt(byte*, const byte*, unsigned int);
-    void set_encryptKey(const byte*, const byte*);
-    void set_decryptKey(const byte*, const byte*);
-    uint get_blockSize() const { return AES_BLOCK_SZ; }
-    int  get_keySize()   const;
-    int  get_ivSize()    const { return AES_IV_SZ; }
-    explicit AES(unsigned int = AES_128_KEY_SZ);
-    ~AES();
-private:
-    struct AESImpl;
-    AESImpl* pimpl_;
-
-    AES(const AES&);             // hide copy
-    AES& operator=(const AES&);  // & assign
-};
-
-
-// Random number generator
-class RandomPool {
-public:
-    void Fill(opaque* dst, uint sz) const;
-    RandomPool();
-    ~RandomPool();
-
-    int GetError() const;
-
-    friend class RSA;
-    friend class DSS;
-    friend class DiffieHellman;
-private:
-    struct RandomImpl;
-    RandomImpl* pimpl_;
-
-    RandomPool(const RandomPool&);              // hide copy
-    RandomPool& operator=(const RandomPool&);   // & assign
-};
-
-
-// Authentication policy should implement sign, and verify
-struct Auth : public virtual_base {
-    virtual void sign(byte*, const byte*, unsigned int, const RandomPool&) = 0;
-    virtual bool verify(const byte*, unsigned int, const byte*,
-                        unsigned int) = 0;
-    virtual uint get_signatureLength() const = 0;
-    virtual ~Auth() {}
-};
-
-
-// For use with NULL Authentication schemes
-struct NO_Auth : public Auth {
-    void   sign(byte*, const byte*, unsigned int, const RandomPool&) {}
-    bool   verify(const byte*, unsigned int, const byte*, unsigned int) 
-                    { return true; }
-};
-
-
-// Digitial Signature Standard scheme
-class DSS : public Auth {
-public:
-    void sign(byte*, const byte*, unsigned int, const RandomPool&);
-    bool verify(const byte*, unsigned int, const byte*, unsigned int);
-    uint get_signatureLength() const;
-    DSS(const byte*, unsigned int, bool publicKey = true);
-    ~DSS();
-private:
-    struct DSSImpl;
-    DSSImpl* pimpl_;
-
-    DSS(const DSS&);
-    DSS& operator=(const DSS&);
-};
-
-
-// RSA Authentication and exchange
-class RSA : public Auth {
-public:
-    void   sign(byte*, const byte*, unsigned int, const RandomPool&);
-    bool   verify(const byte*, unsigned int, const byte*, unsigned int);
-    void   encrypt(byte*, const byte*, unsigned int, const RandomPool&);
-    void   decrypt(byte*, const byte*, unsigned int, const RandomPool&);
-    uint   get_signatureLength() const;
-    uint   get_cipherLength() const;
-    RSA(const byte*, unsigned int, bool publicKey = true);
-    ~RSA();
-private:
-    struct RSAImpl;
-    RSAImpl* pimpl_;
-
-    RSA(const RSA&);            // hide copy
-    RSA& operator=(const RSA&); // & assing
-};
-
-
-class Integer;
-
-// Diffie-Hellman agreement
-// hide for now TODO: figure out a way to give access to C clients p and g args
-class DiffieHellman  {
-public:
-    DiffieHellman(const byte*, unsigned int, const byte*, unsigned int,
-                  const byte*, unsigned int, const RandomPool& random);
-    //DiffieHellman(const char*, const RandomPool&);
-    DiffieHellman(const Integer&, const Integer&, const RandomPool&);
-    ~DiffieHellman();
-
-    DiffieHellman(const DiffieHellman&);  
-    DiffieHellman& operator=(const DiffieHellman&);
-
-    uint        get_agreedKeyLength() const;
-    const byte* get_agreedKey()       const;
-    uint        get_publicKeyLength() const;
-    const byte* get_publicKey()       const;
-    void        makeAgreement(const byte*, unsigned int);
-
-    void        set_sizes(int&, int&, int&) const;
-    void        get_parms(byte*, byte*, byte*) const;
-private:
-    struct DHImpl;
-    DHImpl* pimpl_;
-};
-
-
-// Lagrge Integer
-class Integer {
-public:
-    Integer();
-    ~Integer();
-
-    Integer(const Integer&);
-    Integer& operator=(const Integer&);
-
-    void assign(const byte*, unsigned int);
-
-    friend class DiffieHellman;
-private:
-    struct IntegerImpl;
-    IntegerImpl* pimpl_;
-};
-
-
-class x509;
-
-
-struct EncryptedInfo {
-    enum { IV_SZ = 32, NAME_SZ = 80 };
-    char  name[NAME_SZ]; // max one line
-    byte  iv[IV_SZ];     // in base16 rep
-    uint  ivSz;
-    bool  set;
-
-    EncryptedInfo() : ivSz(0), set(false) {}
-};
-
-x509* PemToDer(FILE*, CertType, EncryptedInfo* info = 0);
-
-
-} // naemspace
-
-#endif  // yaSSL_CRYPTO_WRAPPER_HPP
diff --git a/extra/yassl/include/factory.hpp b/extra/yassl/include/factory.hpp
deleted file mode 100644
index dd6532f7792f..000000000000
--- a/extra/yassl/include/factory.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  The factory header defines an Object Factory, used by SSL message and
- *  handshake types.
- *
- *  See Desgin Pattern in GoF and Alexandrescu's chapter in Modern C++ Design,
- *  page 208
- */
-
-
-
-#ifndef yaSSL_FACTORY_HPP
-#define yaSSL_FACTORY_HPP
-
-#include STL_VECTOR_FILE
-#include STL_PAIR_FILE
-
-
-namespace STL = STL_NAMESPACE;
-
-
-
-
-
-namespace yaSSL {
-
-
-// Factory uses its callback map to create objects by id,
-// returning an abstract base pointer
-template<class    AbstractProduct, 
-         typename IdentifierType = int, 
-         typename ProductCreator = AbstractProduct* (*)()
-        >
-class Factory {                                             
-    typedef STL::pair<IdentifierType, ProductCreator> CallBack;
-    typedef STL::vector<CallBack> CallBackVector;
-
-    CallBackVector callbacks_;
-public:
-    // pass function pointer to register all callbacks upon creation
-    explicit Factory(void (*init)(Factory<AbstractProduct, IdentifierType,
-                                  ProductCreator>&))
-    { 
-        init(*this); 
-    }
-
-    // reserve place in vector before registering, used by init funcion
-    void Reserve(size_t sz)
-    {
-        callbacks_.reserve(sz);
-    }
-
-    // register callback
-    void Register(const IdentifierType& id, ProductCreator pc)
-    {
-        callbacks_.push_back(STL::make_pair(id, pc));
-    }
-
-    // THE Creator, returns a new object of the proper type or 0
-    AbstractProduct* CreateObject(const IdentifierType& id) const
-    {
-        typedef typename STL::vector<CallBack>::const_iterator cIter;
-        
-        cIter first = callbacks_.begin();
-        cIter last  = callbacks_.end();
-
-        while (first != last) {
-            if (first->first == id)
-                break;
-            ++first;
-        }
-
-        if (first == callbacks_.end())
-            return 0;
-        return (first->second)();
-    }
-private:
-    Factory(const Factory&);            // hide copy
-    Factory& operator=(const Factory&); // and assign
-};
-
-
-} // naemspace
-
-#endif // yaSSL_FACTORY_HPP
diff --git a/extra/yassl/include/handshake.hpp b/extra/yassl/include/handshake.hpp
deleted file mode 100644
index 0c9949a95e7e..000000000000
--- a/extra/yassl/include/handshake.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* The handshake header declares function prototypes for creating and reading
- * the various handshake messages.
- */
-
-
-
-#ifndef yaSSL_HANDSHAKE_HPP
-#define yaSSL_HANDSHAKE_HPP
-
-#include "yassl_types.hpp"
-
-
-namespace yaSSL {
-
-// forward decls
-class  SSL;
-class  Finished;
-class  Data;
-class  Alert;
-struct Hashes;
-
-enum BufferOutput { buffered, unbuffered };
-
-void sendClientHello(SSL&);
-void sendServerHello(SSL&, BufferOutput = buffered);
-void sendServerHelloDone(SSL&, BufferOutput = buffered);
-void sendClientKeyExchange(SSL&, BufferOutput = buffered);
-void sendServerKeyExchange(SSL&, BufferOutput = buffered);
-void sendChangeCipher(SSL&, BufferOutput = buffered);
-void sendFinished(SSL&, ConnectionEnd, BufferOutput = buffered);
-void sendCertificate(SSL&, BufferOutput = buffered);
-void sendCertificateRequest(SSL&, BufferOutput = buffered);
-void sendCertificateVerify(SSL&, BufferOutput = buffered);
-int  sendData(SSL&, const void*, int);
-int  sendAlert(SSL& ssl, const Alert& alert);
-
-int  receiveData(SSL&, Data&, bool peek = false); 
-void processReply(SSL&);
-
-void buildFinished(SSL&, Finished&, const opaque*);
-void build_certHashes(SSL&, Hashes&);
-
-void hmac(SSL&, byte*, const byte*, uint, ContentType, bool verify = false);
-void TLS_hmac(SSL&, byte*, const byte*, uint, ContentType,
-              bool verify = false);
-void PRF(byte* digest, uint digLen, const byte* secret, uint secLen,
-         const byte* label, uint labLen, const byte* seed, uint seedLen);
-
-} // naemspace
-
-#endif // yaSSL_HANDSHAKE_HPP
diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp
deleted file mode 100644
index 5273f92f151c..000000000000
--- a/extra/yassl/include/lock.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* lock.hpp provides an os specific Lock, locks mutex on entry and unlocks
- * automatically upon exit, no-ops provided for Single Threaded
-*/
-
-#ifndef yaSSL_LOCK_HPP
-#define yaSSL_LOCK_HPP
-
-/*
-  Visual Studio Source Annotations header (sourceannotations.h) fails
-  to compile if outside of the global namespace.
-*/
-#ifdef MULTI_THREADED
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#endif
-
-namespace yaSSL {
-
-
-#ifdef MULTI_THREADED
-    #ifdef _WIN32
-        #include <windows.h>
-
-        class Mutex {
-            CRITICAL_SECTION cs_;
-        public:
-            Mutex();
-            ~Mutex();
-
-            class Lock;
-            friend class Lock;
-    
-            class Lock {
-                Mutex& mutex_;
-            public:
-                explicit Lock(Mutex& lm);
-                ~Lock();
-            };
-        };
-    #else  // _WIN32
-        #include <pthread.h>
-
-        class Mutex {
-            pthread_mutex_t mutex_;
-        public:
-
-            Mutex();
-            ~Mutex();
-
-            class Lock;
-            friend class Lock;
-
-            class Lock {
-                Mutex& mutex_;
-            public:
-                explicit Lock(Mutex& lm);
-                ~Lock();
-            };
-        };
-
-    #endif // _WIN32
-#else  // MULTI_THREADED (WE'RE SINGLE)
-
-    class Mutex {
-    public:
-        class Lock {
-        public:
-            explicit Lock(Mutex&) {}
-        };
-    };
-
-#endif // MULTI_THREADED
-
-
-
-} // namespace
-#endif // yaSSL_LOCK_HPP
diff --git a/extra/yassl/include/log.hpp b/extra/yassl/include/log.hpp
deleted file mode 100644
index 2651d0716549..000000000000
--- a/extra/yassl/include/log.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL log interface
- *
- */
-
-#ifndef yaSSL_LOG_HPP
-#define yaSSL_LOG_HPP
-
-#include "socket_wrapper.hpp"
-
-#ifdef YASSL_LOG
-#include <stdio.h>
-#endif
-
-namespace yaSSL {
-
-typedef unsigned int uint;
-
-
-// Debug logger
-class Log {
-#ifdef YASSL_LOG
-    FILE* log_;
-#endif
-public:
-    explicit Log(const char* str = "yaSSL.log");
-    ~Log();
-
-    void Trace(const char*);
-    void ShowTCP(socket_t, bool ended = false);
-    void ShowData(uint, bool sent = false);
-};
-
-
-} // naemspace
-
-#endif // yaSSL_LOG_HPP
diff --git a/extra/yassl/include/openssl/crypto.h b/extra/yassl/include/openssl/crypto.h
deleted file mode 100644
index fc2971ab0802..000000000000
--- a/extra/yassl/include/openssl/crypto.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/* crypto.h for openSSL */
-
-#ifndef yaSSL_crypto_h__
-#define yaSSL_crypto_h__
-
-#ifdef YASSL_PREFIX
-#include "prefix_crypto.h"
-#endif
-
-const char* SSLeay_version(int type);
-
-#define SSLEAY_NUMBER_DEFINED
-#define SSLEAY_VERSION 0x0900L
-#define SSLEAY_VERSION_NUMBER SSLEAY_VERSION
-
-
-#endif /* yaSSL_crypto_h__ */
-
diff --git a/extra/yassl/include/openssl/des.h b/extra/yassl/include/openssl/des.h
deleted file mode 100644
index f7394b65634c..000000000000
--- a/extra/yassl/include/openssl/des.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2005 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* des.h  for openssl */
diff --git a/extra/yassl/include/openssl/des_old.h b/extra/yassl/include/openssl/des_old.h
deleted file mode 100644
index b6e2e3e969a9..000000000000
--- a/extra/yassl/include/openssl/des_old.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* des_old.h  for openvn */
diff --git a/extra/yassl/include/openssl/engine.h b/extra/yassl/include/openssl/engine.h
deleted file mode 100644
index 15ddcd146405..000000000000
--- a/extra/yassl/include/openssl/engine.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* engine.h for libcurl */
-
-#undef HAVE_OPENSSL_ENGINE_H
-
-
diff --git a/extra/yassl/include/openssl/err.h b/extra/yassl/include/openssl/err.h
deleted file mode 100644
index 948474296faf..000000000000
--- a/extra/yassl/include/openssl/err.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-   Copyright (C) 2005, 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* err.h for openssl */
-
-#ifndef yaSSL_err_h__
-#define yaSSL_err_h__
-
-
-
-#endif /* yaSSL_err_h__ */
diff --git a/extra/yassl/include/openssl/evp.h b/extra/yassl/include/openssl/evp.h
deleted file mode 100644
index 6aa7335dabc5..000000000000
--- a/extra/yassl/include/openssl/evp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-   Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* evp.h for openSSL */
-
-#ifndef SSLEAY_NUMBER_DEFINED
-#define SSLEAY_NUMBER_DEFINED
-
-/* for OpenVPN */
-#define SSLEAY_VERSION_NUMBER 0x0090700f
-
-
-#endif /* SSLEAY_NUMBER_DEFINED */
diff --git a/extra/yassl/include/openssl/generate_prefix_files.pl b/extra/yassl/include/openssl/generate_prefix_files.pl
deleted file mode 100755
index eb3536c46082..000000000000
--- a/extra/yassl/include/openssl/generate_prefix_files.pl
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2006 MySQL AB
-# Use is subject to license terms
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-#
-# This script generates defines for all functions
-# in yassl/include/openssl/ so they are renamed to
-# ya<old_function_name>. Hopefully that is unique enough.
-#
-# The script is to be run manually when we import
-# a new version of yaSSL
-#
-
-
-
-# Find all functions in "input" and add macros
-# to prefix/rename them into "output
-sub generate_prefix($$)
-{
-  my $input= shift;
-  my $output= shift;
-  open(IN, $input)
-      or die("Can't open input file $input: $!");
-  open(OUT, ">", $output)
-    or mtr_error("Can't open output file $output: $!");
-
-  while (<IN>)
-  {
-    chomp;
-
-    if ( /typedef/ )
-    {
-      next;
-    }
-
-    if ( /^\s*[a-zA-Z0-9*_ ]+\s+\*?([_a-zA-Z0-9]+)\s*\(/ )
-    {
-      print OUT "#define $1 ya$1\n";
-    }
-  }
-
-  close OUT;
-  close IN;
-}
-
-generate_prefix("ssl.h", "prefix_ssl.h");
-generate_prefix("crypto.h", "prefix_crypto.h");
-
diff --git a/extra/yassl/include/openssl/hmac.h b/extra/yassl/include/openssl/hmac.h
deleted file mode 100644
index 5da6644e1de1..000000000000
--- a/extra/yassl/include/openssl/hmac.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* hmac.h  for openvpn */
diff --git a/extra/yassl/include/openssl/lhash.h b/extra/yassl/include/openssl/lhash.h
deleted file mode 100644
index 6d64df7d9d2c..000000000000
--- a/extra/yassl/include/openssl/lhash.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-   Copyright (C) 2005 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* lhash.h for openSSL */
-
diff --git a/extra/yassl/include/openssl/md4.h b/extra/yassl/include/openssl/md4.h
deleted file mode 100644
index 8a864993c9c5..000000000000
--- a/extra/yassl/include/openssl/md4.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* md4.h for libcurl */
diff --git a/extra/yassl/include/openssl/md5.h b/extra/yassl/include/openssl/md5.h
deleted file mode 100644
index b54ebcd910e5..000000000000
--- a/extra/yassl/include/openssl/md5.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-   Copyright (C) 2005, 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* md5.h for openssl */
-
-#include "ssl.h"   /* in there for now */
-
diff --git a/extra/yassl/include/openssl/objects.h b/extra/yassl/include/openssl/objects.h
deleted file mode 100644
index ed2c02945272..000000000000
--- a/extra/yassl/include/openssl/objects.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* objects.h  for openvpn */
diff --git a/extra/yassl/include/openssl/opensslv.h b/extra/yassl/include/openssl/opensslv.h
deleted file mode 100644
index 88b9ca6d26de..000000000000
--- a/extra/yassl/include/openssl/opensslv.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Copyright (C) 2005 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* opensslv.h compatibility */
-
-#ifndef yaSSL_opensslv_h__
-#define yaSSL_opensslv_h__
-
-
-/* api version compatibility */
-#define OPENSSL_VERSION_NUMBER 0x0090700f
-
-
-#endif /* yaSSLopensslv_h__ */
-
diff --git a/extra/yassl/include/openssl/pem.h b/extra/yassl/include/openssl/pem.h
deleted file mode 100644
index c467e461d7fb..000000000000
--- a/extra/yassl/include/openssl/pem.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* pem.h  for libcurl */
diff --git a/extra/yassl/include/openssl/pkcs12.h b/extra/yassl/include/openssl/pkcs12.h
deleted file mode 100644
index c3f8ee679681..000000000000
--- a/extra/yassl/include/openssl/pkcs12.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* pkcs12.h for libcurl */
-
-
-#undef HAVE_OPENSSL_PKCS12_H
-
diff --git a/extra/yassl/include/openssl/prefix_crypto.h b/extra/yassl/include/openssl/prefix_crypto.h
deleted file mode 100644
index 895dd51a23f1..000000000000
--- a/extra/yassl/include/openssl/prefix_crypto.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-#define SSLeay_version yaSSLeay_version
diff --git a/extra/yassl/include/openssl/prefix_ssl.h b/extra/yassl/include/openssl/prefix_ssl.h
deleted file mode 100644
index 806f103b1e22..000000000000
--- a/extra/yassl/include/openssl/prefix_ssl.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-#define Copyright yaCopyright
-#define yaSSL_CleanUp yayaSSL_CleanUp
-#define BN_bin2bn yaBN_bin2bn
-#define DH_new yaDH_new
-#define DH_free yaDH_free
-#define RSA_free yaRSA_free
-#define RSA_generate_key yaRSA_generate_key
-#define X509_free yaX509_free
-#define X509_STORE_CTX_get_current_cert yaX509_STORE_CTX_get_current_cert
-#define X509_STORE_CTX_get_error yaX509_STORE_CTX_get_error
-#define X509_STORE_CTX_get_error_depth yaX509_STORE_CTX_get_error_depth
-#define X509_NAME_oneline yaX509_NAME_oneline
-#define X509_get_issuer_name yaX509_get_issuer_name
-#define X509_get_subject_name yaX509_get_subject_name
-#define X509_verify_cert_error_string yaX509_verify_cert_error_string
-#define X509_LOOKUP_add_dir yaX509_LOOKUP_add_dir
-#define X509_LOOKUP_load_file yaX509_LOOKUP_load_file
-#define X509_LOOKUP_hash_dir yaX509_LOOKUP_hash_dir
-#define X509_LOOKUP_file yaX509_LOOKUP_file
-#define X509_STORE_add_lookup yaX509_STORE_add_lookup
-#define X509_STORE_new yaX509_STORE_new
-#define X509_STORE_get_by_subject yaX509_STORE_get_by_subject
-#define ERR_get_error_line_data yaERR_get_error_line_data
-#define ERR_print_errors_fp yaERR_print_errors_fp
-#define ERR_error_string yaERR_error_string
-#define ERR_remove_state yaERR_remove_state
-#define ERR_get_error yaERR_get_error
-#define ERR_peek_error yaERR_peek_error
-#define ERR_GET_REASON yaERR_GET_REASON
-#define SSL_CTX_new yaSSL_CTX_new
-#define SSL_new yaSSL_new
-#define SSL_set_fd yaSSL_set_fd
-#define SSL_get_fd yaSSL_get_fd
-#define SSL_connect yaSSL_connect
-#define SSL_write yaSSL_write
-#define SSL_read yaSSL_read
-#define SSL_accept yaSSL_accept
-#define SSL_CTX_free yaSSL_CTX_free
-#define SSL_free yaSSL_free
-#define SSL_clear yaSSL_clear
-#define SSL_shutdown yaSSL_shutdown
-#define SSL_set_connect_state yaSSL_set_connect_state
-#define SSL_set_accept_state yaSSL_set_accept_state
-#define SSL_do_handshake yaSSL_do_handshake
-#define SSL_get_cipher yaSSL_get_cipher
-#define SSL_get_cipher_name yaSSL_get_cipher_name
-#define SSL_get_shared_ciphers yaSSL_get_shared_ciphers
-#define SSL_get_cipher_list yaSSL_get_cipher_list
-#define SSL_get_version yaSSL_get_version
-#define SSLeay_version yaSSLeay_version
-#define SSL_get_error yaSSL_get_error
-#define SSL_load_error_strings yaSSL_load_error_strings
-#define SSL_set_session yaSSL_set_session
-#define SSL_get_session yaSSL_get_session
-#define SSL_flush_sessions yaSSL_flush_sessions
-#define SSL_SESSION_set_timeout yaSSL_SESSION_set_timeout
-#define SSL_CTX_set_session_cache_mode yaSSL_CTX_set_session_cache_mode
-#define SSL_get_peer_certificate yaSSL_get_peer_certificate
-#define SSL_get_verify_result yaSSL_get_verify_result
-#define SSL_CTX_set_verify yaSSL_CTX_set_verify
-#define SSL_CTX_load_verify_locations yaSSL_CTX_load_verify_locations
-#define SSL_CTX_set_default_verify_paths yaSSL_CTX_set_default_verify_paths
-#define SSL_CTX_check_private_key yaSSL_CTX_check_private_key
-#define SSL_CTX_set_session_id_context yaSSL_CTX_set_session_id_context
-#define SSL_CTX_set_tmp_rsa_callback yaSSL_CTX_set_tmp_rsa_callback
-#define SSL_CTX_set_options yaSSL_CTX_set_options
-#define SSL_CTX_set_session_cache_mode yaSSL_CTX_set_session_cache_mode
-#define SSL_CTX_set_timeout yaSSL_CTX_set_timeout
-#define SSL_CTX_use_certificate_chain_file yaSSL_CTX_use_certificate_chain_file
-#define SSL_CTX_set_default_passwd_cb yaSSL_CTX_set_default_passwd_cb
-#define SSL_CTX_use_RSAPrivateKey_file yaSSL_CTX_use_RSAPrivateKey_file
-#define SSL_CTX_set_info_callback yaSSL_CTX_set_info_callback
-#define SSL_CTX_sess_accept yaSSL_CTX_sess_accept
-#define SSL_CTX_sess_connect yaSSL_CTX_sess_connect
-#define SSL_CTX_sess_accept_good yaSSL_CTX_sess_accept_good
-#define SSL_CTX_sess_connect_good yaSSL_CTX_sess_connect_good
-#define SSL_CTX_sess_accept_renegotiate yaSSL_CTX_sess_accept_renegotiate
-#define SSL_CTX_sess_connect_renegotiate yaSSL_CTX_sess_connect_renegotiate
-#define SSL_CTX_sess_hits yaSSL_CTX_sess_hits
-#define SSL_CTX_sess_cb_hits yaSSL_CTX_sess_cb_hits
-#define SSL_CTX_sess_cache_full yaSSL_CTX_sess_cache_full
-#define SSL_CTX_sess_misses yaSSL_CTX_sess_misses
-#define SSL_CTX_sess_timeouts yaSSL_CTX_sess_timeouts
-#define SSL_CTX_sess_number yaSSL_CTX_sess_number
-#define SSL_CTX_sess_get_cache_size yaSSL_CTX_sess_get_cache_size
-#define SSL_CTX_get_verify_mode yaSSL_CTX_get_verify_mode
-#define SSL_get_verify_mode yaSSL_get_verify_mode
-#define SSL_CTX_get_verify_depth yaSSL_CTX_get_verify_depth
-#define SSL_get_verify_depth yaSSL_get_verify_depth
-#define SSL_get_default_timeout yaSSL_get_default_timeout
-#define SSL_CTX_get_session_cache_mode yaSSL_CTX_get_session_cache_mode
-#define SSL_session_reused yaSSL_session_reused
-#define SSL_set_rfd yaSSL_set_rfd
-#define SSL_set_wfd yaSSL_set_wfd
-#define SSL_set_shutdown yaSSL_set_shutdown
-#define SSL_set_quiet_shutdown yaSSL_set_quiet_shutdown
-#define SSL_get_quiet_shutdown yaSSL_get_quiet_shutdown
-#define SSL_want_read yaSSL_want_read
-#define SSL_want_write yaSSL_want_write
-#define SSL_pending yaSSL_pending
-#define SSLv3_method yaSSLv3_method
-#define SSLv3_server_method yaSSLv3_server_method
-#define SSLv3_client_method yaSSLv3_client_method
-#define TLSv1_server_method yaTLSv1_server_method
-#define TLSv1_client_method yaTLSv1_client_method
-#define TLSv1_1_server_method yaTLSv1_1_server_method
-#define TLSv1_1_client_method yaTLSv1_1_client_method
-#define SSLv23_server_method yaSSLv23_server_method
-#define SSL_CTX_use_certificate_file yaSSL_CTX_use_certificate_file
-#define SSL_CTX_use_PrivateKey_file yaSSL_CTX_use_PrivateKey_file
-#define SSL_CTX_set_cipher_list yaSSL_CTX_set_cipher_list
-#define SSL_CTX_sess_set_cache_size yaSSL_CTX_sess_set_cache_size
-#define SSL_CTX_set_tmp_dh yaSSL_CTX_set_tmp_dh
-#define OpenSSL_add_all_algorithms yaOpenSSL_add_all_algorithms
-#define SSL_library_init yaSSL_library_init
-#define SSLeay_add_ssl_algorithms yaSSLeay_add_ssl_algorithms
-#define SSL_get_current_cipher yaSSL_get_current_cipher
-#define SSL_CIPHER_description yaSSL_CIPHER_description
-#define SSL_alert_type_string_long yaSSL_alert_type_string_long
-#define SSL_alert_desc_string_long yaSSL_alert_desc_string_long
-#define SSL_state_string_long yaSSL_state_string_long
-#define EVP_md5 yaEVP_md5
-#define EVP_des_ede3_cbc yaEVP_des_ede3_cbc
-#define EVP_BytesToKey yaEVP_BytesToKey
-#define DES_set_key_unchecked yaDES_set_key_unchecked
-#define DES_ede3_cbc_encrypt yaDES_ede3_cbc_encrypt
-#define RAND_screen yaRAND_screen
-#define RAND_file_name yaRAND_file_name
-#define RAND_write_file yaRAND_write_file
-#define RAND_load_file yaRAND_load_file
-#define RAND_status yaRAND_status
-#define RAND_bytes yaRAND_bytes
-#define DES_set_key yaDES_set_key
-#define DES_set_odd_parity yaDES_set_odd_parity
-#define DES_ecb_encrypt yaDES_ecb_encrypt
-#define SSL_CTX_set_default_passwd_cb_userdata yaSSL_CTX_set_default_passwd_cb_userdata
-#define SSL_SESSION_free yaSSL_SESSION_free
-#define SSL_peek yaSSL_peek
-#define SSL_get_certificate yaSSL_get_certificate
-#define SSL_get_privatekey yaSSL_get_privatekey
-#define X509_get_pubkey yaX509_get_pubkey
-#define EVP_PKEY_copy_parameters yaEVP_PKEY_copy_parameters
-#define EVP_PKEY_free yaEVP_PKEY_free
-#define ERR_error_string_n yaERR_error_string_n
-#define ERR_free_strings yaERR_free_strings
-#define EVP_cleanup yaEVP_cleanup
-#define X509_get_ext_d2i yaX509_get_ext_d2i
-#define GENERAL_NAMES_free yaGENERAL_NAMES_free
-#define sk_GENERAL_NAME_num yask_GENERAL_NAME_num
-#define sk_GENERAL_NAME_value yask_GENERAL_NAME_value
-#define ASN1_STRING_data yaASN1_STRING_data
-#define ASN1_STRING_length yaASN1_STRING_length
-#define ASN1_STRING_type yaASN1_STRING_type
-#define X509_NAME_get_index_by_NID yaX509_NAME_get_index_by_NID
-#define X509_NAME_ENTRY_get_data yaX509_NAME_ENTRY_get_data
-#define X509_NAME_get_entry yaX509_NAME_get_entry
-#define ASN1_STRING_to_UTF8 yaASN1_STRING_to_UTF8
-#define SSLv23_client_method yaSSLv23_client_method
-#define SSLv2_client_method yaSSLv2_client_method
-#define SSL_get1_session yaSSL_get1_session
-#define X509_get_notBefore yaX509_get_notBefore
-#define X509_get_notAfter yaX509_get_notAfter
-#define yaSSL_ASN1_TIME_to_string ya_SSL_ASN1_TIME_to_string
-#define MD4_Init yaMD4_Init
-#define MD4_Update yaMD4_Update
-#define MD4_Final yaMD4_Final
-#define MD5_Init yaMD5_Init
-#define MD5_Update yaMD5_Update
-#define MD5_Final yaMD5_Final
-#define SSL_set_compression yaSSL_set_compression
-#define PEM_read_X509 yaSSL_PEM_read_X509
diff --git a/extra/yassl/include/openssl/rand.h b/extra/yassl/include/openssl/rand.h
deleted file mode 100644
index 9e0cedf3e865..000000000000
--- a/extra/yassl/include/openssl/rand.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-   Copyright (C) 2005 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* rand.h for openSSL */
-
diff --git a/extra/yassl/include/openssl/rsa.h b/extra/yassl/include/openssl/rsa.h
deleted file mode 100644
index 95305a84ba59..000000000000
--- a/extra/yassl/include/openssl/rsa.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-   Copyright (C) 2005, 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* rsa.h for openSSL */
-
-
-#ifndef yaSSL_rsa_h__
-#define yaSSL_rsa_h__
-
-enum { RSA_F4 = 1 };
-
-
-#endif /* yaSSL_rsa_h__ */
diff --git a/extra/yassl/include/openssl/sha.h b/extra/yassl/include/openssl/sha.h
deleted file mode 100644
index 5b7c6bd238a8..000000000000
--- a/extra/yassl/include/openssl/sha.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* sha.h  for openvpn */
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
deleted file mode 100644
index 10fa4913b7e7..000000000000
--- a/extra/yassl/include/openssl/ssl.h
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
- */
-
-/*  ssl.h defines openssl compatibility layer 
- *
- */
-
-
-
-#ifndef yaSSL_openssl_h__
-#define yaSSL_openssl_h__
-
-#ifdef YASSL_PREFIX
-#include "prefix_ssl.h"
-#endif
-
-#include <stdio.h>    /* ERR_print fp */
-#include "opensslv.h" /* for version number */
-#include "rsa.h"
-
-
-#define YASSL_VERSION "2.4.4"
-
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
- void yaSSL_CleanUp();   /* call once at end of application use to
-                            free static singleton memory holders,
-                            not a leak per se, but helpful when
-                            looking for them                      */
-
-#if defined(__cplusplus)
-} // extern
-#endif
-
-#if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)
-namespace yaSSL {
-extern "C" {
-#endif
-
-#undef X509_NAME   /* wincrypt.h clash */
-
-#if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)
-    class SSL;
-    class SSL_SESSION;
-    class SSL_METHOD;
-    class SSL_CTX;
-    class SSL_CIPHER;
-
-    class RSA;
-
-    class X509;
-    class X509_NAME;
-#else
-    typedef struct SSL          SSL;          
-    typedef struct SSL_SESSION  SSL_SESSION;
-    typedef struct SSL_METHOD   SSL_METHOD;
-    typedef struct SSL_CTX      SSL_CTX;
-    typedef struct SSL_CIPHER   SSL_CIPHER;
-
-    typedef struct RSA RSA;
-
-    typedef struct X509       X509;
-    typedef struct X509_NAME  X509_NAME;
-#endif
-
-
-/* Big Number stuff, different file? */
-typedef struct BIGNUM BIGNUM;
-
-BIGNUM *BN_bin2bn(const unsigned char*, int, BIGNUM*);
-
-
-/* Diffie-Hellman stuff, different file? */
-/* mySQL deferences to set group parameters */
-typedef struct DH {
-    BIGNUM* p;
-    BIGNUM* g;
-} DH;
-
-DH*  DH_new(void);
-void DH_free(DH*);
-
-/* RSA stuff */
-
-void RSA_free(RSA*);
-RSA* RSA_generate_key(int, unsigned long, void(*)(int, int, void*), void*);
-
-
-/* X509 stuff, different file? */
-
-/* because mySQL dereferences to use error and current_cert, even after calling
- * get functions for local references */
-typedef struct X509_STORE_CTX {
-    int   error;
-    int   error_depth;
-    X509* current_cert;
-} X509_STORE_CTX;
-
-
-typedef struct X509_STORE         X509_STORE;
-typedef struct X509_LOOKUP        X509_LOOKUP;
-typedef struct X509_OBJECT { char c; } X509_OBJECT;
-typedef struct X509_CRL           X509_CRL;
-typedef struct X509_REVOKED       X509_REVOKED;
-typedef struct X509_LOOKUP_METHOD X509_LOOKUP_METHOD;
-
-
-void X509_free(X509*);
-
-
-/* bio stuff */
-typedef struct BIO BIO;
-
-/* ASN stuff */
-
-
-
-X509* X509_STORE_CTX_get_current_cert(X509_STORE_CTX*);
-int   X509_STORE_CTX_get_error(X509_STORE_CTX*);
-int   X509_STORE_CTX_get_error_depth(X509_STORE_CTX*);
-
-char*       X509_NAME_oneline(X509_NAME*, char*, int);
-X509_NAME*  X509_get_issuer_name(X509*);
-X509_NAME*  X509_get_subject_name(X509*);
-const char* X509_verify_cert_error_string(long);
-
-int                 X509_LOOKUP_add_dir(X509_LOOKUP*, const char*, long);
-int                 X509_LOOKUP_load_file(X509_LOOKUP*, const char*, long);
-X509_LOOKUP_METHOD* X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD* X509_LOOKUP_file(void);
-
-X509_LOOKUP* X509_STORE_add_lookup(X509_STORE*, X509_LOOKUP_METHOD*);
-X509_STORE*  X509_STORE_new(void);
-int          X509_STORE_get_by_subject(X509_STORE_CTX*, int, X509_NAME*,
-                                       X509_OBJECT*);
-
-
-
-
-enum { /* X509 Constants */
-    X509_V_OK                                 =  0,
-    X509_V_ERR_CERT_CHAIN_TOO_LONG            =  1,
-    X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT      =  2,
-    X509_V_ERR_CERT_NOT_YET_VALID             =  3,
-    X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD =  4,
-    X509_V_ERR_CERT_HAS_EXPIRED               =  5,
-    X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD  =  6,
-    X509_FILETYPE_PEM                         =  7,
-    X509_LU_X509                              =  8,
-    X509_LU_CRL                               =  9,
-    X509_V_ERR_CRL_SIGNATURE_FAILURE          = 10,
-    X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD = 11,
-    X509_V_ERR_CRL_HAS_EXPIRED                = 12,
-    X509_V_ERR_CERT_REVOKED                   = 13,
-    X509_V_FLAG_CRL_CHECK                     = 14,
-    X509_V_FLAG_CRL_CHECK_ALL                 = 15
-};
-
-
-/* Error stuff, could move to yassl_error */
-unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *);
-void          ERR_print_errors_fp(FILE*);
-char*         ERR_error_string(unsigned long,char*);
-void          ERR_remove_state(unsigned long);
-unsigned long ERR_get_error(void);
-unsigned long ERR_peek_error(void);
-int           ERR_GET_REASON(int);
-
-
-enum {  /* ERR Constants */
-    ERR_TXT_STRING = 1,
-    EVP_R_BAD_DECRYPT = 2
-};
-
-/*
-  Allow type used by SSL_set_fd to be changed, default to int
-  in order to be compatible with OpenSSL
- */
-#ifndef YASSL_SOCKET_T_DEFINED
-typedef int YASSL_SOCKET_T;
-#endif
-
-SSL_CTX* SSL_CTX_new(SSL_METHOD*);
-SSL* SSL_new(SSL_CTX*);
-int  SSL_set_fd (SSL*, YASSL_SOCKET_T);
-YASSL_SOCKET_T SSL_get_fd(const SSL*);
-int  SSL_connect(SSL*);                    /* if you get an error from connect
-                                              see note at top of README       */
-int  SSL_write(SSL*, const void*, int);
-int  SSL_read(SSL*, void*, int);
-int  SSL_accept(SSL*);
-void SSL_CTX_free(SSL_CTX*);
-void SSL_free(SSL*);
-int  SSL_clear(SSL*);
-int  SSL_shutdown(SSL*);
-
-void SSL_set_connect_state(SSL*);
-void SSL_set_accept_state(SSL*);
-int  SSL_do_handshake(SSL*);
-
-const char* SSL_get_cipher(SSL*);
-const char* SSL_get_cipher_name(SSL*);	           /* uses SSL_get_cipher */
-char*       SSL_get_shared_ciphers(SSL*, char*, int);
-const char* SSL_get_cipher_list(SSL*, int);
-const char* SSL_get_version(SSL*);
-const char* SSLeay_version(int);
-
-int  SSL_get_error(SSL*, int);
-void SSL_load_error_strings(void);
-
-int          SSL_set_session(SSL *ssl, SSL_SESSION *session);
-SSL_SESSION* SSL_get_session(SSL* ssl);
-void         SSL_flush_sessions(SSL_CTX *ctx, long tm);
-long         SSL_SESSION_set_timeout(SSL_SESSION*, long);
-long         SSL_CTX_set_session_cache_mode(SSL_CTX* ctx, long mode);
-X509*        SSL_get_peer_certificate(SSL*);
-long         SSL_get_verify_result(SSL*);
-
-
-typedef int (*VerifyCallback)(int, X509_STORE_CTX*);
-typedef int (*pem_password_cb)(char*, int, int, void*);
-int default_password_callback(char * buffer, int size_arg, int rwflag,
-                              void * u);
-
-void SSL_CTX_set_verify(SSL_CTX*, int, VerifyCallback verify_callback);
-int  SSL_CTX_load_verify_locations(SSL_CTX*, const char*, const char*);
-int  SSL_CTX_set_default_verify_paths(SSL_CTX*);
-int  SSL_CTX_check_private_key(SSL_CTX*);
-int  SSL_CTX_set_session_id_context(SSL_CTX*, const unsigned char*,
-                                    unsigned int);
-
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX*, RSA*(*)(SSL*, int, int));
-long SSL_CTX_set_options(SSL_CTX*, long);
-long SSL_CTX_set_session_cache_mode(SSL_CTX*, long);
-long SSL_CTX_set_timeout(SSL_CTX*, long);
-int  SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*);
-void SSL_CTX_set_default_passwd_cb(SSL_CTX*, pem_password_cb);
-int  SSL_CTX_use_RSAPrivateKey_file(SSL_CTX*, const char*, int);
-void SSL_CTX_set_info_callback(SSL_CTX*, void (*)());
-
-long SSL_CTX_sess_accept(SSL_CTX*);
-long SSL_CTX_sess_connect(SSL_CTX*);
-long SSL_CTX_sess_accept_good(SSL_CTX*);
-long SSL_CTX_sess_connect_good(SSL_CTX*);
-long SSL_CTX_sess_accept_renegotiate(SSL_CTX*);
-long SSL_CTX_sess_connect_renegotiate(SSL_CTX*);
-long SSL_CTX_sess_hits(SSL_CTX*);
-long SSL_CTX_sess_cb_hits(SSL_CTX*);
-long SSL_CTX_sess_cache_full(SSL_CTX*);
-long SSL_CTX_sess_misses(SSL_CTX*);
-long SSL_CTX_sess_timeouts(SSL_CTX*);
-long SSL_CTX_sess_number(SSL_CTX*);
-long SSL_CTX_sess_get_cache_size(SSL_CTX*);
-
-int SSL_CTX_get_verify_mode(SSL_CTX*);
-int SSL_get_verify_mode(SSL*);
-int SSL_CTX_get_verify_depth(SSL_CTX*);
-int SSL_get_verify_depth(SSL*);
-
-long SSL_get_default_timeout(SSL*);
-long SSL_CTX_get_session_cache_mode(SSL_CTX*);
-int  SSL_session_reused(SSL*);
-
-int  SSL_set_rfd(SSL*, int);
-int  SSL_set_wfd(SSL*, int);
-void SSL_set_shutdown(SSL*, int);
-void SSL_set_quiet_shutdown(SSL *ssl,int mode);
-int SSL_get_quiet_shutdown(SSL *ssl);
-
-int SSL_want_read(SSL*);
-int SSL_want_write(SSL*);
-
-int SSL_pending(SSL*);
-
-
-enum { /* ssl Constants */
-    SSL_WOULD_BLOCK     = -8,
-    SSL_BAD_STAT        = -7,
-    SSL_BAD_PATH        = -6,
-    SSL_BAD_FILETYPE    = -5,
-    SSL_BAD_FILE        = -4,
-    SSL_NOT_IMPLEMENTED = -3,
-    SSL_UNKNOWN         = -2,
-    SSL_FATAL_ERROR     = -1,
-    SSL_NORMAL_SHUTDOWN =  0,
-    SSL_ERROR_NONE      =  0,   /* for most functions */
-    SSL_FAILURE         =  0,   /* for some functions */
-    SSL_SUCCESS	        =  1,
-
-    SSL_FILETYPE_ASN1    = 10,
-    SSL_FILETYPE_PEM     = 11,
-    SSL_FILETYPE_DEFAULT = 10, /* ASN1 */
-
-    SSL_VERIFY_NONE                 = 0,
-    SSL_VERIFY_PEER                 = 1,
-    SSL_VERIFY_FAIL_IF_NO_PEER_CERT = 2,
-    SSL_VERIFY_CLIENT_ONCE          = 4,
-
-    SSL_SESS_CACHE_OFF                = 30,
-    SSL_SESS_CACHE_CLIENT             = 31,
-    SSL_SESS_CACHE_SERVER             = 32,
-    SSL_SESS_CACHE_BOTH               = 33,
-    SSL_SESS_CACHE_NO_AUTO_CLEAR      = 34,
-    SSL_SESS_CACHE_NO_INTERNAL_LOOKUP = 35,
-
-    SSL_OP_MICROSOFT_SESS_ID_BUG            = 50,
-    SSL_OP_NETSCAPE_CHALLENGE_BUG           = 51,
-    SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG = 52,
-    SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG      = 53,
-    SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER       = 54,
-    SSL_OP_MSIE_SSLV2_RSA_PADDING           = 55,
-    SSL_OP_SSLEAY_080_CLIENT_DH_BUG         = 56,
-    SSL_OP_TLS_D5_BUG                       = 57,
-    SSL_OP_TLS_BLOCK_PADDING_BUG            = 58,
-    SSL_OP_TLS_ROLLBACK_BUG                 = 59,
-    SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS      = 60,
-    SSL_OP_ALL                              = 61,
-    SSL_OP_SINGLE_DH_USE                    = 62,
-    SSL_OP_EPHEMERAL_RSA                    = 63,
-    SSL_OP_PKCS1_CHECK_1                    = 67,
-    SSL_OP_PKCS1_CHECK_2                    = 68,
-    SSL_OP_NETSCAPE_CA_DN_BUG               = 69,
-    SSL_OP_NON_EXPORT_FIRST                 = 70,
-    SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG  = 71,
-
-    SSL_ERROR_WANT_READ        = 80,
-    SSL_ERROR_WANT_WRITE       = 81,
-    SSL_ERROR_SYSCALL          = 82,
-    SSL_ERROR_WANT_X509_LOOKUP = 83,
-    SSL_ERROR_ZERO_RETURN      = 84,
-    SSL_ERROR_SSL              = 85,
-
-    SSL_ST_CONNECT        = 90,
-    SSL_ST_ACCEPT         = 91,
-    SSL_CB_LOOP           = 92,
-    SSL_SENT_SHUTDOWN     = 93,
-    SSL_RECEIVED_SHUTDOWN = 94,
-    SSL_CB_ALERT          = 95,
-    SSL_CB_READ           = 96,
-    SSL_CB_HANDSHAKE_DONE = 97,
-
-    SSL_OP_NO_SSLv2                         = 128,
-    SSL_OP_NO_SSLv3                         = 256,
-    SSL_OP_NO_TLSv1                         = 512,
-    SSL_OP_NO_TLSv1_1                       = 1024,
-};
-
-
-SSL_METHOD *SSLv3_method(void);
-SSL_METHOD *SSLv3_server_method(void);
-SSL_METHOD *SSLv3_client_method(void);
-SSL_METHOD *TLSv1_server_method(void);
-SSL_METHOD *TLSv1_client_method(void);
-SSL_METHOD *TLSv1_1_server_method(void);
-SSL_METHOD *TLSv1_1_client_method(void);
-SSL_METHOD *SSLv23_server_method(void);
-
-int SSL_CTX_use_certificate_file(SSL_CTX*, const char*, int);
-int SSL_CTX_use_PrivateKey_file(SSL_CTX*, const char*, int);
-int SSL_CTX_set_cipher_list(SSL_CTX*, const char*);
-
-long SSL_CTX_sess_set_cache_size(SSL_CTX*, long);
-long SSL_CTX_set_tmp_dh(SSL_CTX*, DH*);
-
-void OpenSSL_add_all_algorithms(void);
-int  SSL_library_init();
-int  SSLeay_add_ssl_algorithms(void);
-
-
-SSL_CIPHER* SSL_get_current_cipher(SSL*);
-char*       SSL_CIPHER_description(SSL_CIPHER*, char*, int);
-
-
-char* SSL_alert_type_string_long(int);
-char* SSL_alert_desc_string_long(int);
-char* SSL_state_string_long(SSL*);
-
-X509* PEM_read_X509(FILE *fp, X509 *x, pem_password_cb cb, void *u);
-/* EVP stuff, des and md5, different file? */
-typedef char EVP_MD;
-
-typedef char EVP_CIPHER;
-
-typedef struct EVP_PKEY EVP_PKEY;
-
-typedef unsigned char DES_cblock[8];
-typedef const  DES_cblock const_DES_cblock;
-typedef DES_cblock DES_key_schedule;
-                                                          
-enum {
-    DES_ENCRYPT = 1,
-    DES_DECRYPT = 0
-};
-                                                             
-const EVP_MD*     EVP_md5(void);
-const EVP_CIPHER* EVP_des_ede3_cbc(void);
-
-typedef unsigned char opaque;
-
-int EVP_BytesToKey(const EVP_CIPHER*, const EVP_MD*, const opaque*,
-                   const opaque*, int, int, opaque*, opaque*);
-
-void DES_set_key_unchecked(const_DES_cblock*, DES_key_schedule*);
-void DES_ede3_cbc_encrypt(const opaque*, opaque*, long, DES_key_schedule*,
-                        DES_key_schedule*, DES_key_schedule*, DES_cblock*, int);
-
-
-/* RAND stuff */
-void        RAND_screen(void);
-const char* RAND_file_name(char*, size_t);
-int         RAND_write_file(const char*);
-int         RAND_load_file(const char*, long);
-
-
-/* for libcurl */
-int  RAND_status(void);
-int  RAND_bytes(unsigned char* buf, int num);
-
-int  DES_set_key(const_DES_cblock*, DES_key_schedule*);
-void DES_set_odd_parity(DES_cblock*);
-void DES_ecb_encrypt(DES_cblock*, DES_cblock*, DES_key_schedule*, int);
-
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX*, void* userdata);
-void SSL_SESSION_free(SSL_SESSION* session);
-int  SSL_peek(SSL* ssl, void* buf, int num);
-
-X509*     SSL_get_certificate(SSL* ssl);
-EVP_PKEY* SSL_get_privatekey(SSL* ssl);
-EVP_PKEY* X509_get_pubkey(X509* x);
-
-int  EVP_PKEY_copy_parameters(EVP_PKEY* to, const EVP_PKEY* from);
-void EVP_PKEY_free(EVP_PKEY* pkey);
-void ERR_error_string_n(unsigned long e, char *buf, size_t len);
-void ERR_free_strings(void);
-void EVP_cleanup(void);
-
-void* X509_get_ext_d2i(X509* x, int nid, int* crit, int* idx);
-
-#define GEN_IPADD 7
-#define NID_subject_alt_name 85
-#define STACK_OF(x) x
-
-
-/* defined here because libcurl dereferences */
-typedef struct ASN1_STRING {
-    int type;
-    int length;
-    unsigned char* data;
-} ASN1_STRING;
-
-
-typedef struct GENERAL_NAME {
-    int type;
-    union {
-        ASN1_STRING* ia5;
-    } d;
-} GENERAL_NAME;
-
-void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *x);
-
-int           sk_GENERAL_NAME_num(STACK_OF(GENERAL_NAME) *x);
-GENERAL_NAME* sk_GENERAL_NAME_value(STACK_OF(GENERAL_NAME) *x, int i);
-
-
-unsigned char* ASN1_STRING_data(ASN1_STRING* x);
-int            ASN1_STRING_length(ASN1_STRING* x);
-int            ASN1_STRING_type(ASN1_STRING *x);
-
-typedef ASN1_STRING X509_NAME_ENTRY;
-
-int X509_NAME_get_index_by_NID(X509_NAME* name,int nid, int lastpos);
-
-ASN1_STRING* X509_NAME_ENTRY_get_data(X509_NAME_ENTRY* ne);
-X509_NAME_ENTRY* X509_NAME_get_entry(X509_NAME* name, int loc);
-
-#define OPENSSL_malloc(x) malloc(x)
-#define OPENSSL_free(x)   free(x)
-
-int ASN1_STRING_to_UTF8(unsigned char** out, ASN1_STRING* in);
-
-SSL_METHOD* SSLv23_client_method(void);  /* doesn't actually roll back */
-SSL_METHOD* SSLv2_client_method(void);   /* will never work, no v 2    */
-
-
-SSL_SESSION* SSL_get1_session(SSL* ssl);  /* what's ref count */
-
-
-#define CRYPTO_free(x) free(x)
-#define ASN1_TIME ASN1_STRING
-
-ASN1_TIME* X509_get_notBefore(X509* x);
-ASN1_TIME* X509_get_notAfter(X509* x);
-
-
-#define ASN1_UTCTIME ASN1_STRING
-#define NID_commonName    13
-#define V_ASN1_UTF8STRING 12
-#define GEN_DNS            2
-
-#define CERTFICATE_ERROR 0x14090086  /* SSLv3 error */
-
-
-typedef struct MD4_CTX {
-    int buffer[32];      /* big enough to hold, check size in Init */
-} MD4_CTX;
-
-void MD4_Init(MD4_CTX*);
-void MD4_Update(MD4_CTX*, const void*, unsigned long);
-void MD4_Final(unsigned char*, MD4_CTX*);
-
-
-typedef struct MD5_CTX {
-    int buffer[32];       /* big enough to hold, check size in Init */
-} MD5_CTX;
-
-void MD5_Init(MD5_CTX*);
-void MD5_Update(MD5_CTX*, const void*, unsigned long);
-void MD5_Final(unsigned char*, MD5_CTX*);
-
-#define MD5_DIGEST_LENGTH 16
-
-
-#define SSL_DEFAULT_CIPHER_LIST ""   /* default all */
-
-
-/* yaSSL extensions */
-int SSL_set_compression(SSL*);   /* turn on yaSSL zlib compression */
-char *yaSSL_ASN1_TIME_to_string(ASN1_TIME *time, char *buf, size_t len);
-
-#include "transport_types.h"
-
-/*
-  Set functions for yaSSL to use in order to send and receive data.
-
-  These hooks are offered in order to enable non-blocking I/O. If
-  not set, yaSSL defaults to using send() and recv().
-
-  @todo Remove hooks and accompanying code when yaSSL is fixed.
-*/
-void yaSSL_transport_set_ptr(SSL *, void *);
-void yaSSL_transport_set_recv_function(SSL *, yaSSL_recv_func_t);
-void yaSSL_transport_set_send_function(SSL *, yaSSL_send_func_t);
-
-#if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)
-}      /* namespace  */
-}      /* extern "C" */
-#endif
-
-
-#endif /* yaSSL_openssl_h__ */
diff --git a/extra/yassl/include/openssl/transport_types.h b/extra/yassl/include/openssl/transport_types.h
deleted file mode 100644
index 5a9d234e6fdc..000000000000
--- a/extra/yassl/include/openssl/transport_types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301  USA.
-*/
-
-#ifndef yaSSL_transport_types_h__
-#define yaSSL_transport_types_h__
-
-/* Type of transport functions used for sending and receiving data. */
-typedef long (*yaSSL_recv_func_t) (void *, void *, size_t);
-typedef long (*yaSSL_send_func_t) (void *, const void *, size_t);
-
-#endif
diff --git a/extra/yassl/include/openssl/x509.h b/extra/yassl/include/openssl/x509.h
deleted file mode 100644
index 74eb83eb13f7..000000000000
--- a/extra/yassl/include/openssl/x509.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* x509.h  for libcurl */
diff --git a/extra/yassl/include/openssl/x509v3.h b/extra/yassl/include/openssl/x509v3.h
deleted file mode 100644
index b48e9b485d4e..000000000000
--- a/extra/yassl/include/openssl/x509v3.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   Copyright (C) 2006 MySQL AB
-   Use is subject to license terms
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* x509v3.h  for libcurl */
diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp
deleted file mode 100644
index ec3ab6fcdad1..000000000000
--- a/extra/yassl/include/socket_wrapper.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
- */
-
-
-/* The socket wrapper header defines a Socket class that hides the differences
- * between Berkely style sockets and Windows sockets, allowing transparent TCP
- * access.
- */
-
-
-#ifndef yaSSL_SOCKET_WRAPPER_HPP
-#define yaSSL_SOCKET_WRAPPER_HPP
-
-
-#ifdef _WIN32
-    #include <winsock2.h>
-#else 
-    #include <sys/time.h>
-    #include <sys/types.h>
-    #include <sys/socket.h>
-    #include <unistd.h>
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-#endif
-
-
-namespace yaSSL {
-
-typedef unsigned int uint;
-
-#ifdef _WIN32
-    typedef SOCKET socket_t;
-#else
-    typedef int socket_t;
-    const socket_t INVALID_SOCKET = -1;
-    const int SD_RECEIVE   = 0;
-    const int SD_SEND      = 1;
-    const int SD_BOTH      = 2;
-    const int SOCKET_ERROR = -1;
-#endif
-
-  extern "C" {
-    #include "openssl/transport_types.h"
-  }
-
-typedef unsigned char byte;
-
-
-// Wraps Windows Sockets and BSD Sockets
-class Socket {
-    socket_t socket_;                    // underlying socket descriptor
-    bool     wouldBlock_;                // if non-blocking data, for last read 
-    bool     nonBlocking_;               // is option set
-    void     *ptr_;                      // Argument to transport function
-    yaSSL_send_func_t send_func_;        // Function to send data
-    yaSSL_recv_func_t recv_func_;        // Function to receive data
-public:
-    explicit Socket(socket_t s = INVALID_SOCKET);
-    ~Socket();
-
-    void     set_fd(socket_t s);
-    uint     get_ready() const;
-    socket_t get_fd()    const;
-
-    void set_transport_ptr(void *ptr);
-    void set_transport_recv_function(yaSSL_recv_func_t recv_func);
-    void set_transport_send_function(yaSSL_send_func_t send_func);
-
-    uint send(const byte* buf, unsigned int len, unsigned int& sent);
-    uint receive(byte* buf, unsigned int len);
-
-    bool wait();
-    bool WouldBlock() const;
-    bool IsNonBlocking() const;
-
-    void closeSocket();
-    void shutDown(int how = SD_SEND);
-
-    static int  get_lastError();
-    static void set_lastError(int error);
-private:
-    Socket(const Socket&);              // hide copy
-    Socket& operator= (const Socket&);  // and assign
-};
-
-
-} // naemspace
-
-#endif // yaSSL_SOCKET_WRAPPER_HPP
diff --git a/extra/yassl/include/timer.hpp b/extra/yassl/include/timer.hpp
deleted file mode 100644
index 0d99603be869..000000000000
--- a/extra/yassl/include/timer.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* timer.hpp provides a high res and low res timers
- *
-*/
-
-
-#ifndef yaSSL_TIMER_HPP
-#define yaSSL_TIMER_HPP
-
-namespace yaSSL {
-
-typedef double       timer_d;
-typedef unsigned int uint;
-
-
-
-timer_d timer();
-uint    lowResTimer();
-
-
-
-} // namespace
-#endif // yaSSL_TIMER_HPP
diff --git a/extra/yassl/include/yassl.hpp b/extra/yassl/include/yassl.hpp
deleted file mode 100644
index 081d6538f0bf..000000000000
--- a/extra/yassl/include/yassl.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL externel header defines yaSSL API
- */
-
-
-#ifndef yaSSL_EXT_HPP
-#define yaSSL_EXT_HPP
-
-
-namespace yaSSL {
-
-
-#ifdef _WIN32
-    typedef unsigned int SOCKET_T;
-#else
-    typedef int          SOCKET_T;
-#endif
-
-
-class Client {
-public:
-    Client();
-    ~Client();
-
-    // basics
-    int Connect(SOCKET_T);
-    int Write(const void*, int);
-    int Read(void*, int);
-
-    // options
-    void SetCA(const char*);
-    void SetCert(const char*);
-    void SetKey(const char*);
-private:
-    struct ClientImpl;
-    ClientImpl* pimpl_;
-
-    Client(const Client&);              // hide copy
-    Client& operator=(const Client&);   // and assign  
-};
-
-
-class Server {
-public:
-    Server();
-    ~Server();
-
-    // basics
-    int Accept(SOCKET_T);
-    int Write(const void*, int);
-    int Read(void*, int);
-
-    // options
-    void SetCA(const char*);
-    void SetCert(const char*);
-    void SetKey(const char*);
-private:
-    struct ServerImpl;
-    ServerImpl* pimpl_;
-
-    Server(const Server&);              // hide copy
-    Server& operator=(const Server&);   // and assign
-};
-
-
-} // namespace yaSSL
-#endif // yaSSL_EXT_HPP
diff --git a/extra/yassl/include/yassl_error.hpp b/extra/yassl/include/yassl_error.hpp
deleted file mode 100644
index d63244dca90e..000000000000
--- a/extra/yassl/include/yassl_error.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL error header defines error codes and an exception class
- */
-
-#ifndef yaSSL_ERROR_HPP
-#define yaSSL_ERROR_HPP
-
-
-
-namespace yaSSL {
-
-
-enum YasslError {
-    no_error            = 0,
-
-    // 10 - 47 from AlertDescription, 0 also close_notify
-
-    range_error         = 101,
-    realloc_error       = 102,
-    factory_error       = 103,
-    unknown_cipher      = 104,
-    prefix_error        = 105,
-    record_layer        = 106,
-    handshake_layer     = 107,
-    out_of_order        = 108,
-    bad_input           = 109,
-    match_error         = 110,
-    no_key_file         = 111,
-    verify_error        = 112,
-    send_error          = 113,
-    receive_error       = 114,
-    certificate_error   = 115,
-    privateKey_error    = 116,
-    badVersion_error    = 117,
-    compress_error      = 118,
-    decompress_error    = 119,
-    pms_version_error   = 120,
-    sanityCipher_error  = 121,
-    rsaSignFault_error  = 122
-
-    // !!!! add error message to .cpp !!!!
-
-    // 1000+ from TaoCrypt error.hpp
-
-};
-
-
-enum Library { yaSSL_Lib = 0, CryptoLib, SocketLib };
-enum { MAX_ERROR_SZ = 80 };
-
-void SetErrorString(YasslError, char*);
-
-/* remove for now, if go back to exceptions use this wrapper
-// Base class for all yaSSL exceptions
-class Error : public mySTL::runtime_error {
-    YasslError  error_;
-    Library     lib_;
-public:
-    explicit Error(const char* s = "", YasslError e = no_error,
-                   Library l = yaSSL_Lib);
-
-    YasslError  get_number() const;
-    Library     get_lib()    const;
-};
-*/
-
-
-} // naemspace
-
-#endif // yaSSL_ERROR_HPP
diff --git a/extra/yassl/include/yassl_imp.hpp b/extra/yassl/include/yassl_imp.hpp
deleted file mode 100644
index a952da0d3d9a..000000000000
--- a/extra/yassl/include/yassl_imp.hpp
+++ /dev/null
@@ -1,748 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  yaSSL implementation header defines all strucutres from the SSL.v3 
- *  specification "draft-freier-ssl-version3-02.txt"
- *  all page citations refer to this document unless otherwise noted.
- */
-
-
-#ifndef yaSSL_IMP_HPP
-#define yaSSL_IMP_HPP
-
-#ifdef _MSC_VER
-    // disable truncated debug symbols
-    #pragma warning(disable:4786)
-#endif
-
-#include "yassl_types.hpp"
-#include "factory.hpp"
-#include STL_LIST_FILE
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace yaSSL {
-
-
-class SSL;              // forward decls
-class input_buffer;
-class output_buffer;
-
-
-struct ProtocolVersion {
-    uint8 major_;
-    uint8 minor_;     // major and minor SSL/TLS version numbers
-
-    ProtocolVersion(uint8 maj = 3, uint8 min = 0);
-};
-
-
-// Record Layer Header for PlainText, Compressed, and CipherText
-struct RecordLayerHeader {
-    ContentType     type_;
-    ProtocolVersion version_;
-    uint16          length_;             // should not exceed 2^14
-};
-
-
-// base for all messages
-struct Message : public virtual_base {
-    virtual input_buffer& set(input_buffer&) =0;   
-    virtual output_buffer& get(output_buffer&) const =0;
-
-    virtual void Process(input_buffer&, SSL&) =0;
-    virtual ContentType get_type() const =0;
-    virtual uint16      get_length() const =0;
-
-    virtual ~Message() {}
-};
-
-
-class ChangeCipherSpec : public Message {
-    CipherChoice type_;
-public:
-    ChangeCipherSpec();
-
-    friend input_buffer& operator>>(input_buffer&, ChangeCipherSpec&);
-    friend output_buffer& operator<<(output_buffer&, const ChangeCipherSpec&);
-
-    input_buffer& set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    ContentType get_type()   const;
-    uint16      get_length() const;
-    void Process(input_buffer&, SSL&);
-private:
-    ChangeCipherSpec(const ChangeCipherSpec&);            // hide copy
-    ChangeCipherSpec& operator=(const ChangeCipherSpec&); // and assign
-};
-
-
-
-class Alert : public Message {
-    AlertLevel       level_;
-    AlertDescription description_;
-public:
-    Alert() {}
-    Alert(AlertLevel al, AlertDescription ad);
-
-    ContentType get_type()   const;
-    uint16      get_length() const;
-    void Process(input_buffer&, SSL&);
-
-    friend input_buffer& operator>>(input_buffer&, Alert&);
-    friend output_buffer& operator<<(output_buffer&, const Alert&);
-   
-    input_buffer& set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-private:
-    Alert(const Alert&);            // hide copy
-    Alert& operator=(const Alert&); // and assign
-};
-
-
-class Data : public Message {
-    uint16        length_;
-    opaque*       buffer_;         // read  buffer used by fillData input
-    const opaque* write_buffer_;   // write buffer used by output operator
-public:
-    Data();
-    Data(uint16 len, opaque* b);
-
-    friend output_buffer& operator<<(output_buffer&, const Data&);
-
-    input_buffer& set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    ContentType   get_type()     const;
-    uint16        get_length()   const;
-    void          set_length(uint16 l);
-    opaque*       set_buffer();
-    void          SetData(uint16, const opaque*);
-    void Process(input_buffer&, SSL&);
-private:
-    Data(const Data&);            // hide copy
-    Data& operator=(const Data&); // and assign
-};
-
-
-uint32 c24to32(const uint24);       // forward form internal header
-void   c32to24(uint32, uint24&);
-
-
-// HandShake header, same for each message type from page 20/21
-class HandShakeHeader : public Message {
-    HandShakeType      type_;
-    uint24             length_;      // length of message
-public:
-    HandShakeHeader() {}
-
-    ContentType   get_type()   const;
-    uint16        get_length() const;
-    HandShakeType get_handshakeType() const;
-    void Process(input_buffer&, SSL&);
-
-    void set_type(HandShakeType hst);
-    void set_length(uint32 u32);
-
-    friend input_buffer& operator>>(input_buffer&, HandShakeHeader&);
-    friend output_buffer& operator<<(output_buffer&, const HandShakeHeader&);
-
-    input_buffer& set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-private:
-    HandShakeHeader(const HandShakeHeader&);            // hide copy
-    HandShakeHeader& operator=(const HandShakeHeader&); // and assign
-};
-
-
-// Base Class for all handshake messages
-class HandShakeBase : public virtual_base {
-    int     length_;
-public:
-    int     get_length() const;
-    void    set_length(int);
-
-    // for building buffer's type field
-    virtual HandShakeType get_type() const =0;                
-
-    // handles dispactch of proper >>
-    virtual input_buffer&  set(input_buffer& in) =0;
-    virtual output_buffer& get(output_buffer& out) const =0;
-
-    virtual void Process(input_buffer&, SSL&) =0;
-
-    virtual ~HandShakeBase() {}
-};
-
-
-struct HelloRequest : public HandShakeBase {
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    void Process(input_buffer&, SSL&);
-
-    HandShakeType get_type() const;
-};
-
-
-// The Client's Hello Message from page 23
-class ClientHello : public HandShakeBase {
-    ProtocolVersion     client_version_;
-    Random              random_;
-    uint8               id_len_;                         // session id length
-    opaque              session_id_[ID_LEN];
-    uint16              suite_len_;                      // cipher suite length
-    opaque              cipher_suites_[MAX_SUITE_SZ];
-    uint8               comp_len_;                       // compression length
-    CompressionMethod   compression_methods_;  
-public:
-    friend input_buffer&  operator>>(input_buffer&, ClientHello&);
-    friend output_buffer& operator<<(output_buffer&, const ClientHello&);
-  
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    HandShakeType  get_type() const;
-    void Process(input_buffer&, SSL&);
-
-    const opaque* get_random() const;
-    friend void buildClientHello(SSL&, ClientHello&);
-    friend void ProcessOldClientHello(input_buffer& input, SSL& ssl);
-
-    ClientHello();
-    ClientHello(ProtocolVersion pv, bool useCompression);
-private:
-    ClientHello(const ClientHello&);            // hide copy
-    ClientHello& operator=(const ClientHello&); // and assign
-};
-
-
-
-// The Server's Hello Message from page 24
-class ServerHello : public HandShakeBase {
-    ProtocolVersion     server_version_;
-    Random              random_;
-    uint8               id_len_;                 // session id length
-    opaque              session_id_[ID_LEN];
-    opaque              cipher_suite_[SUITE_LEN];
-    CompressionMethod   compression_method_;
-public:
-    ServerHello(ProtocolVersion pv, bool useCompression);
-    ServerHello();
-          
-    friend input_buffer&  operator>>(input_buffer&, ServerHello&);
-    friend output_buffer& operator<<(output_buffer&, const ServerHello&);
-   
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    HandShakeType  get_type() const;
-    void Process(input_buffer&, SSL&);
-
-    const opaque* get_random() const;
-    friend void buildServerHello(SSL&, ServerHello&);
-private:
-    ServerHello(const ServerHello&);            // hide copy
-    ServerHello& operator=(const ServerHello&); // and assign
-};
-
-
-class x509;  
-
-// Certificate could be a chain
-class Certificate : public HandShakeBase {
-    const x509* cert_;
-public:
-    Certificate();
-    explicit Certificate(const x509* cert); 
-    friend output_buffer& operator<<(output_buffer&, const Certificate&);
-
-    const opaque* get_buffer() const;
-  
-    // Process handles input, needs SSL
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    HandShakeType get_type() const;
-    void Process(input_buffer&, SSL&);
-private:
-    Certificate(const Certificate&);            // hide copy
-    Certificate& operator=(const Certificate&); // and assign
-};
-
-
-
-// RSA Public Key
-struct ServerRSAParams {
-    opaque* rsa_modulus_;
-    opaque* rsa_exponent_;
-};
-
-
-// Ephemeral Diffie-Hellman Parameters
-class ServerDHParams {
-    int pSz_;
-    int gSz_;
-    int pubSz_;
-    opaque* p_;
-    opaque* g_;
-    opaque* Ys_;
-public:
-    ServerDHParams();
-    ~ServerDHParams();
-
-    int get_pSize()   const;
-    int get_gSize()   const;
-    int get_pubSize() const;
-
-    const opaque* get_p()   const;
-    const opaque* get_g()   const;
-    const opaque* get_pub() const;
-
-    opaque* alloc_p(int sz);
-    opaque* alloc_g(int sz);
-    opaque* alloc_pub(int sz);
-private:
-    ServerDHParams(const ServerDHParams&);            // hide copy
-    ServerDHParams& operator=(const ServerDHParams&); // and assign
-};
-
-
-struct ServerKeyBase : public virtual_base {
-    virtual ~ServerKeyBase() {}
-    virtual void build(SSL&) {}
-    virtual void read(SSL&, input_buffer&) {}
-    virtual int  get_length() const;     
-    virtual opaque* get_serverKey() const;
-};
-
-
-// Server random number for FORTEZZA KEA
-struct Fortezza_Server : public ServerKeyBase {
-    opaque r_s_[FORTEZZA_MAX];
-};
-
-
-struct SignatureBase : public virtual_base {
-    virtual ~SignatureBase() {}
-};
-
-struct anonymous_sa : public SignatureBase {};
-
-
-struct Hashes {
-    uint8 md5_[MD5_LEN];
-    uint8 sha_[SHA_LEN];
-};
-    
-
-struct rsa_sa : public SignatureBase {
-    Hashes hashes_;
-};
-
-
-struct dsa_sa : public SignatureBase {
-    uint8 sha_[SHA_LEN];
-};
-
-
-// Server's Diffie-Hellman exchange
-class DH_Server : public ServerKeyBase {
-    ServerDHParams  parms_;
-    opaque*         signature_;
-
-    int             length_;                // total length of message
-    opaque*         keyMessage_;            // total exchange message
-public:
-    DH_Server();
-    ~DH_Server();
-
-    void build(SSL&);
-    void read(SSL&, input_buffer&);
-    int  get_length() const;
-    opaque* get_serverKey() const;
-private:
-    DH_Server(const DH_Server&);            // hide copy
-    DH_Server& operator=(const DH_Server&); // and assign
-};
-
-
-// Server's RSA exchange
-struct RSA_Server : public ServerKeyBase {
-    ServerRSAParams params_;
-    opaque*         signature_;   // signed rsa_sa hashes
-};
-
-
-class ServerKeyExchange : public HandShakeBase {
-    ServerKeyBase* server_key_;
-public:
-    explicit ServerKeyExchange(SSL&);
-    ServerKeyExchange();
-    ~ServerKeyExchange();
-
-    void createKey(SSL&);
-    void build(SSL& ssl);
-   
-    const opaque* getKey()       const;
-    int           getKeyLength() const;
-
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    friend output_buffer& operator<<(output_buffer&, const ServerKeyExchange&);
-
-    void Process(input_buffer&, SSL&);
-    HandShakeType get_type() const;
-private:
-    ServerKeyExchange(const ServerKeyExchange&);            // hide copy
-    ServerKeyExchange& operator=(const ServerKeyExchange&); // and assign
-};
-
-
-
-class CertificateRequest : public HandShakeBase  {
-    ClientCertificateType         certificate_types_[CERT_TYPES];
-    int                           typeTotal_;
-    STL::list<DistinguishedName>  certificate_authorities_;
-public:
-    CertificateRequest();
-    ~CertificateRequest();
-
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    friend input_buffer&  operator>>(input_buffer&, CertificateRequest&);
-    friend output_buffer& operator<<(output_buffer&,
-                                     const CertificateRequest&);
-
-    void Process(input_buffer&, SSL&);
-    HandShakeType get_type() const;
-
-    void Build();
-private:
-    CertificateRequest(const CertificateRequest&);              // hide copy
-    CertificateRequest& operator=(const CertificateRequest&);   // and assign
-};
-
-
-struct ServerHelloDone : public HandShakeBase {
-    ServerHelloDone();
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    void Process(input_buffer& input, SSL& ssl);
-
-    HandShakeType get_type() const;
-};
-
-
-struct PreMasterSecret {
-    opaque  random_[SECRET_LEN];     // first two bytes Protocol Version
-};
-
-
-struct ClientKeyBase : public virtual_base {
-    virtual ~ClientKeyBase() {}
-    virtual void build(SSL&) {}
-    virtual void read(SSL&, input_buffer&) {}
-    virtual int  get_length() const;
-    virtual opaque* get_clientKey() const;
-};
-
-
-class EncryptedPreMasterSecret : public ClientKeyBase {
-    opaque* secret_;
-    int     length_;
-public:
-    EncryptedPreMasterSecret();
-    ~EncryptedPreMasterSecret();
-
-    void    build(SSL&);
-    void    read(SSL&, input_buffer&);
-    int     get_length()    const;
-    opaque* get_clientKey() const;
-    void    alloc(int sz);
-private:
-    // hide copy and assign
-    EncryptedPreMasterSecret(const EncryptedPreMasterSecret&);           
-    EncryptedPreMasterSecret& operator=(const EncryptedPreMasterSecret&);
-};
-
-
-// Fortezza Key Parameters from page 29
-// hard code lengths cause only used here
-struct FortezzaKeys : public ClientKeyBase {
-    opaque  y_c_                      [128];    // client's Yc, public value
-    opaque  r_c_                      [128];    // client's Rc
-    opaque  y_signature_              [40];     // DSS signed public key
-    opaque  wrapped_client_write_key_ [12];     // wrapped by the TEK
-    opaque  wrapped_server_write_key_ [12];     // wrapped by the TEK
-    opaque  client_write_iv_          [24];      
-    opaque  server_write_iv_          [24];
-    opaque  master_secret_iv_         [24];     // IV used to encrypt preMaster
-    opaque  encrypted_preMasterSecret_[48];     // random & crypted by the TEK
-};
-
-
-
-// Diffie-Hellman public key from page 40/41
-class  ClientDiffieHellmanPublic : public ClientKeyBase {
-    PublicValueEncoding public_value_encoding_;
-    int     length_;    // includes two byte length for message
-    opaque* Yc_;        // length + Yc_
-    // dh_Yc only if explicit, otherwise sent in certificate
-    enum { KEY_OFFSET = 2 };
-public:
-    ClientDiffieHellmanPublic();
-    ~ClientDiffieHellmanPublic();
-
-    void    build(SSL&);
-    void    read(SSL&, input_buffer&);
-    int     get_length()    const;
-    opaque* get_clientKey() const;
-    void    alloc(int sz, bool offset = false);
-private:
-    // hide copy and assign
-    ClientDiffieHellmanPublic(const ClientDiffieHellmanPublic&);
-    ClientDiffieHellmanPublic& operator=(const ClientDiffieHellmanPublic&);
-};
-
-
-class ClientKeyExchange : public HandShakeBase {
-    ClientKeyBase*  client_key_;
-public:
-    explicit ClientKeyExchange(SSL& ssl);
-    ClientKeyExchange();
-    ~ClientKeyExchange();
-
-    void createKey(SSL&);
-    void build(SSL& ssl);
-   
-    const opaque* getKey()       const;
-    int           getKeyLength() const;
-
-    friend output_buffer& operator<<(output_buffer&, const ClientKeyExchange&);
-   
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    HandShakeType  get_type() const;
-    void Process(input_buffer&, SSL&);
-private:
-    ClientKeyExchange(const ClientKeyExchange&);            // hide copy
-    ClientKeyExchange& operator=(const ClientKeyExchange&); // and assign
-};
-
-
-class CertificateVerify : public HandShakeBase {
-    Hashes             hashes_;
-    byte*              signature_;  // owns
-public:
-    CertificateVerify();
-    ~CertificateVerify();
-
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    friend input_buffer&  operator>>(input_buffer&, CertificateVerify&);
-    friend output_buffer& operator<<(output_buffer&, const CertificateVerify&);
-
-    void Process(input_buffer&, SSL&);
-    HandShakeType get_type() const;
-
-    void Build(SSL&);
-private:
-    CertificateVerify(const CertificateVerify&);              // hide copy
-    CertificateVerify& operator=(const CertificateVerify&);   // and assign
-};
-
-
-class Finished : public HandShakeBase {
-    Hashes hashes_;
-public:
-    Finished();
-
-    uint8* set_md5();
-    uint8* set_sha();
-
-    friend input_buffer& operator>>(input_buffer&, Finished&);
-    friend output_buffer& operator<<(output_buffer&, const Finished&);
-
-    input_buffer&  set(input_buffer& in);
-    output_buffer& get(output_buffer& out) const;
-
-    void Process(input_buffer&, SSL&);
-
-    HandShakeType get_type() const;
-private:
-    Finished(const Finished&);            // hide copy
-    Finished& operator=(const Finished&); // and assign
-};
-
-
-class RandomPool;  // forward for connection
-
-
-// SSL Connection defined on page 11
-struct Connection {
-    opaque          *pre_master_secret_;
-    opaque          master_secret_[SECRET_LEN];
-    opaque          client_random_[RAN_LEN];
-    opaque          server_random_[RAN_LEN];
-    opaque          sessionID_[ID_LEN];
-    opaque          client_write_MAC_secret_[SHA_LEN]; // sha  is max size
-    opaque          server_write_MAC_secret_[SHA_LEN];
-    opaque          client_write_key_[AES_256_KEY_SZ]; // aes 256bit is max sz
-    opaque          server_write_key_[AES_256_KEY_SZ];
-    opaque          client_write_IV_[AES_IV_SZ];       // aes is max size
-    opaque          server_write_IV_[AES_IV_SZ];
-    uint32          sequence_number_;
-    uint32          peer_sequence_number_;
-    uint32          pre_secret_len_;                   // pre master length
-    bool            send_server_key_;                  // server key exchange?
-    bool            master_clean_;                     // master secret clean?
-    bool            TLS_;                              // TLSv1 or greater
-    bool            TLSv1_1_;                          // TLSv1.1 or greater
-    bool            sessionID_Set_;                    // do we have a session
-    bool            compression_;                      // zlib compression?
-    ProtocolVersion version_;                          // negotiated version
-    ProtocolVersion chVersion_;                        // client hello version
-    RandomPool&     random_;
-
-    Connection(ProtocolVersion v, RandomPool& ran);
-    ~Connection();
-
-    void AllocPreSecret(uint sz);
-    void CleanPreMaster();
-    void CleanMaster();
-    void TurnOffTLS();
-    void TurnOffTLS1_1();
-private:
-    Connection(const Connection&);              // hide copy
-    Connection& operator=(const Connection&);   // and assign
-};
-
-
-struct Ciphers;   // forward
-
-
-// TLSv1 Security Spec, defined on page 56 of RFC 2246
-struct Parameters {
-    ConnectionEnd        entity_;
-    BulkCipherAlgorithm  bulk_cipher_algorithm_;
-    CipherType           cipher_type_;
-    uint8                key_size_;
-    uint8                iv_size_;
-    IsExportable         is_exportable_;
-    MACAlgorithm         mac_algorithm_;
-    uint8                hash_size_;
-    CompressionMethod    compression_algorithm_;
-    KeyExchangeAlgorithm kea_;                        // yassl additions
-    SignatureAlgorithm   sig_algo_;                   // signature auth type
-    SignatureAlgorithm   verify_algo_;                // cert verify auth type
-    bool                 pending_;                  
-    bool                 resumable_;                  // new conns by session
-    uint16               encrypt_size_;               // current msg encrypt sz
-    Cipher               suite_[SUITE_LEN];           // choosen suite
-    uint8                suites_size_;
-    Cipher               suites_[MAX_SUITE_SZ];
-    char                 cipher_name_[MAX_SUITE_NAME];
-    char                 cipher_list_[MAX_CIPHERS][MAX_SUITE_NAME];
-    bool                 removeDH_;                   // for server's later use
-
-    Parameters(ConnectionEnd, const Ciphers&, ProtocolVersion, bool haveDH);
-
-    void SetSuites(ProtocolVersion pv, bool removeDH = false,
-                   bool removeRSA = false, bool removeDSA = false);
-    void SetCipherNames();
-private:
-    Parameters(const Parameters&);              // hide copy
-    Parameters& operator=(const Parameters&);   // and assing
-};
-
-
-input_buffer&  operator>>(input_buffer&,  RecordLayerHeader&);
-output_buffer& operator<<(output_buffer&, const RecordLayerHeader&);
-
-input_buffer&  operator>>(input_buffer&,  Message&);
-output_buffer& operator<<(output_buffer&, const Message&);
-
-input_buffer&  operator>>(input_buffer&,  HandShakeBase&);
-output_buffer& operator<<(output_buffer&, const HandShakeBase&);
-
-
-// Message Factory definition
-// uses the ContentType enumeration for unique id
-typedef Factory<Message> MessageFactory;
-void    InitMessageFactory(MessageFactory&);     // registers derived classes
-
-// HandShake Factory definition
-// uses the HandShakeType enumeration for unique id
-typedef Factory<HandShakeBase> HandShakeFactory;  
-void    InitHandShakeFactory(HandShakeFactory&); // registers derived classes
-
-// ServerKey Factory definition
-// uses KeyExchangeAlgorithm enumeration for unique  id
-typedef Factory<ServerKeyBase> ServerKeyFactory;
-void    InitServerKeyFactory(ServerKeyFactory&);
-
-// ClientKey Factory definition
-// uses KeyExchangeAlgorithm enumeration for unique  id
-typedef Factory<ClientKeyBase> ClientKeyFactory;
-void    InitClientKeyFactory(ClientKeyFactory&);
-
-
-// Message Creators
-Message* CreateHandShake();
-Message* CreateCipherSpec();
-Message* CreateAlert();
-Message* CreateData();
-
-
-// HandShake Creators
-HandShakeBase* CreateCertificate();
-HandShakeBase* CreateHelloRequest();
-HandShakeBase* CreateClientHello();
-HandShakeBase* CreateServerHello();
-HandShakeBase* CreateServerKeyExchange();
-HandShakeBase* CreateCertificateRequest();
-HandShakeBase* CreateServerHelloDone();
-HandShakeBase* CreateClientKeyExchange();
-HandShakeBase* CreateCertificateVerify();
-HandShakeBase* CreateFinished();
-
-
-// ServerKey Exchange Creators
-ServerKeyBase* CreateRSAServerKEA();
-ServerKeyBase* CreateDHServerKEA();
-ServerKeyBase* CreateFortezzaServerKEA();
-
-// ClientKey Exchange Creators
-ClientKeyBase* CreateRSAClient();
-ClientKeyBase* CreateDHClient();
-ClientKeyBase* CreateFortezzaClient();
-
-
-
-} // naemspace
-
-#endif // yaSSL_IMP_HPP
diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp
deleted file mode 100644
index 240cf9420ba0..000000000000
--- a/extra/yassl/include/yassl_int.hpp
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL internal header defines SSL supporting types not specified in the
- * draft along with type conversion functions and openssl compatibility
- */
-
-
-#ifndef yaSSL_INT_HPP
-#define yaSSL_INT_HPP
-
-#include "yassl_imp.hpp"
-#include "yassl_error.hpp"
-#include "crypto_wrapper.hpp"
-#include "cert_wrapper.hpp"
-#include "log.hpp"
-#include "lock.hpp"
-#include "openssl/ssl.h"  // ASN1_STRING and DH
-
-// Check if _POSIX_THREADS should be forced
-#if !defined(_POSIX_THREADS) && defined(__hpux)
-// HPUX does not define _POSIX_THREADS as it's not _fully_ implemented
-#define _POSIX_THREADS
-#endif
-
-#ifdef _POSIX_THREADS
-    #include <pthread.h>
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace yaSSL {
-
-
-// State Machine for Record Layer Protocol
-enum RecordLayerState {
-    recordNotReady = 0,         // fatal error, no more processing
-    recordReady
-};
-
-
-// State Machine for HandShake Protocol
-enum HandShakeState {
-    handShakeNotReady = 0,      // fatal error, no more processing
-    preHandshake,               // initial state
-    inHandshake,                // handshake started
-    handShakeReady              // handshake done
-};
-
-
-// client input HandShake state, use if HandShakeState == inHandShake
-enum ClientState {
-    serverNull = 0,
-    serverHelloComplete,
-    serverCertComplete,
-    serverKeyExchangeComplete,
-    serverHelloDoneComplete,
-    serverFinishedComplete	
-};
-
-
-// server input HandShake state, use if HandShakeState == inHandShake
-enum ServerState {
-    clientNull = 0,
-    clientHelloComplete,
-    clientKeyExchangeComplete,
-    clientFinishedComplete        
-};
-
-
-// client connect state for nonblocking restart
-enum ConnectState {
-    CONNECT_BEGIN = 0,
-    CLIENT_HELLO_SENT,
-    FIRST_REPLY_DONE,
-    FINISHED_DONE,
-    SECOND_REPLY_DONE
-};
-
-
-// server accpet state for nonblocking restart
-enum AcceptState {
-    ACCEPT_BEGIN = 0,
-    ACCEPT_FIRST_REPLY_DONE,
-    SERVER_HELLO_DONE,
-    ACCEPT_SECOND_REPLY_DONE,
-    ACCEPT_FINISHED_DONE,
-    ACCEPT_THIRD_REPLY_DONE
-};
-
-
-// track received messages to explicitly disallow duplicate messages
-struct RecvdMessages {
-    uint8 gotClientHello_;
-    uint8 gotServerHello_;
-    uint8 gotCert_;
-    uint8 gotServerKeyExchange_;
-    uint8 gotCertRequest_;
-    uint8 gotServerHelloDone_;
-    uint8 gotCertVerify_;
-    uint8 gotClientKeyExchange_;
-    uint8 gotFinished_;
-    RecvdMessages() : gotClientHello_(0), gotServerHello_(0), gotCert_(0),
-                      gotServerKeyExchange_(0), gotCertRequest_(0),
-                      gotServerHelloDone_(0), gotCertVerify_(0),
-                      gotClientKeyExchange_(0), gotFinished_(0)
-                    {} 
-};
-
-
-// combines all states
-class States {
-    RecordLayerState recordLayer_;
-    HandShakeState   handshakeLayer_;
-    ClientState      clientState_;
-    ServerState      serverState_;
-    ConnectState     connectState_;
-    AcceptState      acceptState_;
-    RecvdMessages    recvdMessages_;
-    char             errorString_[MAX_ERROR_SZ];
-    YasslError       what_;
-public:
-    States();
-
-    const RecordLayerState& getRecord()    const;
-    const HandShakeState&   getHandShake() const;
-    const ClientState&      getClient()    const;
-    const ServerState&      getServer()    const;
-    const ConnectState&     GetConnect()   const;
-    const AcceptState&      GetAccept()    const;
-    const char*             getString()    const;
-          YasslError        What()         const;
-
-    RecordLayerState& useRecord();
-    HandShakeState&   useHandShake();
-    ClientState&      useClient();
-    ServerState&      useServer();
-    ConnectState&     UseConnect();
-    AcceptState&      UseAccept();
-    char*             useString();
-    void              SetError(YasslError);
-    int               SetMessageRecvd(HandShakeType);
-private:
-    States(const States&);              // hide copy
-    States& operator=(const States&);   // and assign
-};
-
-
-// holds all factories
-class sslFactory {
-    MessageFactory      messageFactory_;        // creates new messages by type
-    HandShakeFactory    handShakeFactory_;      // creates new handshake types
-    ServerKeyFactory    serverKeyFactory_;      // creates new server key types
-    ClientKeyFactory    clientKeyFactory_;      // creates new client key types
-
-    sslFactory();                               // only GetSSL_Factory creates
-public:
-    const MessageFactory&   getMessage()   const;
-    const HandShakeFactory& getHandShake() const;
-    const ServerKeyFactory& getServerKey() const;
-    const ClientKeyFactory& getClientKey() const;
-
-    friend sslFactory& GetSSL_Factory();        // singleton creator
-private:
-    sslFactory(const sslFactory&);              // hide copy
-    sslFactory& operator=(const sslFactory&);   // and assign   
-};
-
-
-#undef X509_NAME  // wincrypt.h clash
-
-// openSSL X509 names
-class X509_NAME {
-    char*       name_;
-    size_t      sz_;
-    int         cnPosition_;   // start of common name, -1 is none
-    int         cnLen_;        // length of above
-    ASN1_STRING entry_;
-public:
-    X509_NAME(const char*, size_t sz, int pos, int len);
-    ~X509_NAME();
-
-    const char*  GetName() const;
-    ASN1_STRING* GetEntry(int i);
-    size_t       GetLength() const;
-    int          GetCnPosition() const { return cnPosition_; }
-    int          GetCnLength()   const { return cnLen_; }
-
-private:
-    X509_NAME(const X509_NAME&);                // hide copy
-    X509_NAME& operator=(const X509_NAME&);     // and assign
-};
-
-
-class StringHolder {
-    ASN1_STRING  asnString_;
-public:
-    StringHolder(const char* str, int sz, byte type= 0);
-    ~StringHolder();
-
-    ASN1_STRING* GetString();
-private:
-    StringHolder(const StringHolder&);                // hide copy
-    StringHolder& operator=(const StringHolder&);     // and assign
-};
-
-
-// openSSL X509
-class X509 {
-    X509_NAME issuer_;
-    X509_NAME subject_;
-    StringHolder beforeDate_;   // not valid before
-    StringHolder afterDate_;    // not valid after
-public:
-    X509(const char* i, size_t, const char* s, size_t,
-         ASN1_STRING *b, ASN1_STRING *a, int, int, int, int);
-    ~X509() {}
-
-    X509_NAME* GetIssuer();
-    X509_NAME* GetSubject();
-
-    ASN1_STRING* GetBefore();
-    ASN1_STRING* GetAfter();
-
-private:
-    X509(const X509&);              // hide copy
-    X509& operator=(const X509&);   // and assign
-};
-
-
-// openSSL bignum
-struct BIGNUM {
-    /*
-      gcc 2.96 fix: because of two Integer classes (yaSSL::Integer and
-      TaoCrypt::Integer), we need to explicitly state the namespace
-      here to let gcc 2.96 deduce the correct type.
-    */
-    yaSSL::Integer int_;
-    void assign(const byte* b, uint s) { int_.assign(b,s); }
-};
-
-
-// openSSL session
-class SSL_SESSION {
-    opaque      sessionID_[ID_LEN];
-    opaque      master_secret_[SECRET_LEN];
-    Cipher      suite_[SUITE_LEN];
-    uint        bornOn_;                        // create time in seconds
-    uint        timeout_;                       // timeout in seconds
-    RandomPool& random_;                        // will clean master secret
-    X509*       peerX509_;
-public:
-    explicit SSL_SESSION(RandomPool&);
-    SSL_SESSION(const SSL&, RandomPool&);
-    ~SSL_SESSION();
-
-    const opaque* GetID()       const;
-    const opaque* GetSecret()   const;
-    const Cipher* GetSuite()    const;
-          uint    GetBornOn()   const;
-          uint    GetTimeOut()  const;
-          X509*   GetPeerX509() const;
-          void    SetTimeOut(uint);
-
-    SSL_SESSION& operator=(const SSL_SESSION&); // allow assign for resumption
-private:
-    SSL_SESSION(const SSL_SESSION&);            // hide copy
-
-    void CopyX509(X509*);
-};
-
-
-// holds all sessions
-class Sessions {
-    STL::list<SSL_SESSION*> list_;
-    RandomPool random_;                 // for session cleaning
-    Mutex      mutex_;                  // no-op for single threaded
-    int        count_;                  // flush counter
-
-    Sessions() : count_(0) {}           // only GetSessions can create
-public: 
-    SSL_SESSION* lookup(const opaque*, SSL_SESSION* copy = 0);
-    void         add(const SSL&);
-    void         remove(const opaque*);
-    void         Flush();
-
-    ~Sessions();
-
-    friend void Session_initialize();
-    friend Sessions& GetSessions(); // singleton creator
-private:
-    Sessions(const Sessions&);              // hide copy
-    Sessions& operator=(const Sessions&);   // and assign
-};
-
-
-#ifdef _POSIX_THREADS
-    typedef pthread_t THREAD_ID_T;
-#else
-    typedef DWORD     THREAD_ID_T;
-#endif
-
-// thread error data
-struct ThreadError {
-    THREAD_ID_T threadID_;
-    int         errorID_;
-};
-
-
-// holds all errors
-class Errors {
-    STL::list<ThreadError> list_;
-    Mutex                  mutex_;
-
-    Errors() {}                         // only GetErrors can create
-public:
-    int  Lookup(bool peek);             // self lookup
-    void Add(int);              
-    void Remove();                      // remove self
-
-    ~Errors() {}
-
-    friend Errors& GetErrors(); // singleton creator
-private:
-    Errors(const Errors&);              // hide copy
-    Errors& operator=(const Errors);    // and assign
-};
-
-
-Sessions&   GetSessions();      // forward singletons
-sslFactory& GetSSL_Factory();
-Errors&     GetErrors();
-
-
-// openSSL method and context types
-class SSL_METHOD {
-    ProtocolVersion version_;
-    ConnectionEnd   side_;
-    bool            verifyPeer_;    // request or send certificate
-    bool            verifyNone_;    // whether to verify certificate
-    bool            failNoCert_;
-    bool            multipleProtocol_;  // for SSLv23 compatibility
-public:
-    SSL_METHOD(ConnectionEnd ce, ProtocolVersion pv,
-               bool multipleProtocol = false);
-
-    ProtocolVersion getVersion() const;
-    ConnectionEnd   getSide()    const;
-
-    void setVerifyPeer();
-    void setVerifyNone();
-    void setFailNoCert();
-
-    bool verifyPeer() const;
-    bool verifyNone() const;
-    bool failNoCert() const;
-    bool multipleProtocol() const;
-private:
-    SSL_METHOD(const SSL_METHOD&);              // hide copy
-    SSL_METHOD& operator=(const SSL_METHOD&);   // and assign
-};
-
-
-struct Ciphers {
-    bool        setSuites_;             // user set suites from default
-    byte        suites_[MAX_SUITE_SZ];  // new suites
-    int         suiteSz_;               // suite length in bytes
-
-    Ciphers() : setSuites_(false), suiteSz_(0) {}
-};
-
-
-struct DH;  // forward
-
-
-// save for SSL construction
-struct DH_Parms {
-    Integer p_;
-    Integer g_;
-    bool set_;   // if set by user
-
-    DH_Parms() : set_(false) {}
-};
-
-
-enum StatsField { 
-    Accept, Connect, AcceptGood, ConnectGood, AcceptRenegotiate,
-    ConnectRenegotiate, Hits, CbHits, CacheFull, Misses, Timeouts, Number,
-    GetCacheSize, VerifyMode, VerifyDepth 
-};
-
-
-// SSL stats
-struct Stats {
-    long accept_;
-    long connect_;
-    long acceptGood_;
-    long connectGood_;
-    long acceptRenegotiate_;
-    long connectRenegotiate_;
-
-    long hits_;
-    long cbHits_;
-    long cacheFull_;
-    long misses_;
-    long timeouts_;
-    long number_;
-    long getCacheSize_;
-
-    int verifyMode_;
-    int verifyDepth_;
-public:
-    Stats() : accept_(0), connect_(0), acceptGood_(0), connectGood_(0),
-        acceptRenegotiate_(0), connectRenegotiate_(0), hits_(0), cbHits_(0),
-        cacheFull_(0), misses_(0), timeouts_(0), number_(0), getCacheSize_(0),
-        verifyMode_(0), verifyDepth_(0)
-    {}
-private:
-    Stats(const Stats&);            // hide copy
-    Stats& operator=(const Stats&); // and assign
-};
-
-
-// the SSL context
-class SSL_CTX {
-public:
-    typedef STL::list<x509*> CertList;
-private:
-    SSL_METHOD*     method_;
-    x509*           certificate_;
-    x509*           privateKey_;
-    CertList        caList_;
-    Ciphers         ciphers_;
-    DH_Parms        dhParms_;
-    pem_password_cb passwordCb_;
-    void*           userData_;
-    bool            sessionCacheOff_;
-    bool            sessionCacheFlushOff_;
-    Stats           stats_;
-    Mutex           mutex_;         // for Stats
-    VerifyCallback  verifyCallback_;
-public:
-    explicit SSL_CTX(SSL_METHOD* meth);
-    ~SSL_CTX();
-
-    const x509*       getCert()       const;
-    const x509*       getKey()        const;
-    const SSL_METHOD* getMethod()     const;
-    const Ciphers&    GetCiphers()    const;
-    const DH_Parms&   GetDH_Parms()   const;
-    const Stats&      GetStats()      const;
-    VerifyCallback    getVerifyCallback() const;
-    pem_password_cb   GetPasswordCb() const;
-          void*       GetUserData()   const;
-          bool        GetSessionCacheOff()      const;
-          bool        GetSessionCacheFlushOff() const;
-
-    void setVerifyPeer();
-    void setVerifyNone();
-    void setFailNoCert();
-    void setVerifyCallback(VerifyCallback);
-    bool SetCipherList(const char*);
-    bool SetDH(const DH&);
-    void SetPasswordCb(pem_password_cb cb);
-    void SetUserData(void*);
-    void SetSessionCacheOff();
-    void SetSessionCacheFlushOff();
-    void SetMethod(SSL_METHOD* meth);
-    void            IncrementStats(StatsField);
-    void            AddCA(x509* ca);
-    const CertList& GetCA_List() const;
-
-    friend int read_file(SSL_CTX*, const char*, int, CertType);
-private:
-    SSL_CTX(const SSL_CTX&);            // hide copy
-    SSL_CTX& operator=(const SSL_CTX&); // and assign
-};
-
-
-// holds all cryptographic types
-class Crypto {
-    Digest*             digest_;                // agreed upon digest
-    BulkCipher*         cipher_;                // agreed upon cipher
-    DiffieHellman*      dh_;                    // dh parms
-    RandomPool          random_;                // random number generator
-    CertManager         cert_;                  // manages certificates
-public:
-    explicit Crypto();
-    ~Crypto();
-
-    const Digest&        get_digest()      const;
-    const BulkCipher&    get_cipher()      const;
-    const DiffieHellman& get_dh()          const;
-    const RandomPool&    get_random()      const;
-    const CertManager&   get_certManager() const;
-          
-    Digest&        use_digest();
-    BulkCipher&    use_cipher();
-    DiffieHellman& use_dh();
-    RandomPool&    use_random();
-    CertManager&   use_certManager();
-
-    void SetDH(DiffieHellman*);
-    void SetDH(const DH_Parms&);
-    void setDigest(Digest*);
-    void setCipher(BulkCipher*);
-
-    bool DhSet();
-private:
-    Crypto(const Crypto&);              // hide copy
-    Crypto& operator=(const Crypto&);   // and assign
-};
-
-
-// holds all handshake and verify hashes
-class sslHashes {
-    MD5       md5HandShake_;          // md5 handshake hash
-    SHA       shaHandShake_;          // sha handshake hash
-    Finished  verify_;                // peer's verify hash
-    Hashes    certVerify_;            // peer's cert verify hash
-public:
-    sslHashes() {}
-
-    const MD5&      get_MD5()        const;
-    const SHA&      get_SHA()        const;
-    const Finished& get_verify()     const;
-    const Hashes&   get_certVerify() const;
-
-    MD5&      use_MD5();
-    SHA&      use_SHA();
-    Finished& use_verify();
-    Hashes&   use_certVerify();
-private:
-    sslHashes(const sslHashes&);             // hide copy
-    sslHashes& operator=(const sslHashes&); // and assign
-};
-
-
-// holds input and output buffers
-class Buffers {
-public: 
-    typedef STL::list<input_buffer*>  inputList;
-    typedef STL::list<output_buffer*> outputList;
-    int prevSent;     // previous plain text bytes sent when got WANT_WRITE
-    int plainSz;      // plain text bytes in buffer to send when got WANT_WRITE 
-private:
-    inputList      dataList_;             // list of users app data / handshake
-    outputList     handShakeList_;        // buffered handshake msgs
-    input_buffer*  rawInput_;             // buffered raw input yet to process
-    output_buffer* output_;               // WANT_WRITE buffered output 
-public:
-    Buffers();
-    ~Buffers();
-
-    const inputList&  getData()      const;
-    const outputList& getHandShake() const;
-
-    inputList&  useData();
-    outputList& useHandShake();
-
-    void           SetRawInput(input_buffer*);  // takes ownership
-    input_buffer*  TakeRawInput();              // takes ownership 
-    void           SetOutput(output_buffer*);   // takes ownership
-    output_buffer* TakeOutput();                // takes ownership 
-private:
-    Buffers(const Buffers&);             // hide copy
-    Buffers& operator=(const Buffers&);  // and assign   
-};
-
-
-// wraps security parameters
-class Security {
-    Connection    conn_;                          // connection information
-    Parameters    parms_;                         // may be pending
-    SSL_SESSION   resumeSession_;                 // if resuming
-    SSL_CTX*      ctx_;                           // context used to init
-    bool          resuming_;                      // trying to resume
-public:
-    Security(ProtocolVersion, RandomPool&, ConnectionEnd, const Ciphers&,
-             SSL_CTX*, bool);
-
-    const SSL_CTX*     GetContext()     const;
-    const Connection&  get_connection() const;
-    const Parameters&  get_parms()      const;
-    const SSL_SESSION& get_resume()     const;
-          bool         get_resuming()   const;
-
-    Connection&  use_connection();
-    Parameters&  use_parms();
-    SSL_SESSION& use_resume();
-
-    void set_resuming(bool b);
-private:
-    Security(const Security&);              // hide copy
-    Security& operator=(const Security&);   // and assign
-};
-
-
-// THE SSL type
-class SSL {
-    Crypto              crypto_;                // agreed crypto agents
-    Security            secure_;                // Connection and Session parms
-    States              states_;                // Record and HandShake states
-    sslHashes           hashes_;                // handshake, finished hashes
-    Socket              socket_;                // socket wrapper
-    Buffers             buffers_;               // buffered handshakes and data
-    Log                 log_;                   // logger
-    bool                quietShutdown_;
-
-    // optimization variables
-    bool                has_data_;              // buffered data ready?
-public:
-    SSL(SSL_CTX* ctx);
-
-    // gets and uses
-    const Crypto&     getCrypto()   const;
-    const Security&   getSecurity() const;
-    const States&     getStates()   const;
-    const sslHashes&  getHashes()   const;
-    const sslFactory& getFactory()  const;
-    const Socket&     getSocket()   const;
-          YasslError  GetError()    const;
-          bool        GetMultiProtocol() const;
-          bool        CompressionOn()    const;
-
-    Crypto&    useCrypto();
-    Security&  useSecurity();
-    States&    useStates();
-    sslHashes& useHashes();
-    Socket&    useSocket();
-    Log&       useLog();
-    Buffers&   useBuffers();
-
-    bool       HasData() const;
-    bool       GetQuietShutdown() const;
-
-    // sets
-    void set_pending(Cipher suite);
-    void set_random(const opaque*, ConnectionEnd);
-    void set_sessionID(const opaque*);
-    void set_session(SSL_SESSION*);
-    void set_preMaster(const opaque*, uint);
-    void set_masterSecret(const opaque*);
-    void SetError(YasslError);
-    int  SetCompression();
-    void UnSetCompression();
-    void SetQuietShutdown(bool mode);
-
-    // helpers
-    bool isTLS() const;
-    bool isTLSv1_1() const;
-    void order_error();
-    void makeMasterSecret();
-    void makeTLSMasterSecret();
-    void addData(input_buffer* data);
-    void fillData(Data&);
-    void PeekData(Data&);
-    void addBuffer(output_buffer* b);
-    void flushBuffer();
-    void verifyState(const RecordLayerHeader&);
-    void verifyState(const HandShakeHeader&);
-    void verifyState(ClientState);
-    void verifyState(ServerState);
-    void verfiyHandShakeComplete();
-    void matchSuite(const opaque*, uint length);
-    void deriveKeys();
-    void deriveTLSKeys();
-    void Send(const byte*, uint);
-    void SendWriteBuffered();
-
-    uint bufferedData();
-    uint get_SEQIncrement(bool);
-
-    const  byte*  get_macSecret(bool);
-private:
-    void storeKeys(const opaque*);
-    void setKeys();
-    void verifyClientState(HandShakeType);
-    void verifyServerState(HandShakeType);
-
-    SSL(const SSL&);                    // hide copy
-    const SSL& operator=(const SSL&);   // and assign
-};
-
-
-// compression
-int Compress(const byte*, int, input_buffer&);
-int DeCompress(input_buffer&, int, input_buffer&);
-
-
-// conversion functions
-void c32to24(uint32, uint24&);
-void c24to32(const uint24, uint32&);
-
-uint32 c24to32(const uint24);
-
-void ato16(const opaque*, uint16&);
-void ato24(const opaque*, uint24&);
-
-void c16toa(uint16, opaque*);
-void c24toa(const uint24, opaque*);
-void c32toa(uint32 u32, opaque*);
-
-
-} // naemspace
-
-#endif // yaSSL_INT_HPP
diff --git a/extra/yassl/include/yassl_types.hpp b/extra/yassl/include/yassl_types.hpp
deleted file mode 100644
index 129661c58ed2..000000000000
--- a/extra/yassl/include/yassl_types.hpp
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  yaSSL types  header defines all constants, enums, and typedefs
- *  from the SSL.v3 specification "draft-freier-ssl-version3-02.txt"
- */
-
-
-#ifndef yaSSL_TYPES_HPP
-#define yaSSL_TYPES_HPP
-
-#include <stddef.h>
-#include "type_traits.hpp"
-
-
-#ifdef _MSC_VER
-    // disable conversion warning
-    // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
-    #pragma warning(disable:4244 4996)
-#endif
-
-
-#ifdef _MSC_VER
-    // disable conversion warning
-    // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
-    #pragma warning(disable:4244 4996)
-#endif
-
-
-namespace yaSSL {
-
-#define YASSL_LIB
-
-
-#ifdef YASSL_PURE_C
-
-    // library allocation
-    struct new_t {};      // yaSSL New type
-    extern new_t ys;      // pass in parameter
-
-    } // namespace yaSSL
-
-    void* operator new  (size_t, yaSSL::new_t);
-    void* operator new[](size_t, yaSSL::new_t);
-
-    void operator delete  (void*, yaSSL::new_t);
-    void operator delete[](void*, yaSSL::new_t);
-
-
-    namespace yaSSL {
-
-
-    template<typename T>
-    void ysDelete(T* ptr)
-    {
-        if (ptr) ptr->~T();
-        ::operator delete(ptr, yaSSL::ys);
-    }
-
-    template<typename T>
-    void ysArrayDelete(T* ptr)
-    {
-        // can't do array placement destruction since not tracking size in
-        // allocation, only allow builtins to use array placement since they
-        // don't need destructors called
-        typedef char builtin[TaoCrypt::IsFundamentalType<T>::Yes ? 1 : -1];
-        (void)sizeof(builtin);
-
-        ::operator delete[](ptr, yaSSL::ys);
-    }
-
-    #define NEW_YS new (yaSSL::ys)
-
-    // to resolve compiler generated operator delete on base classes with
-    // virtual destructors (when on stack)
-    class virtual_base {
-    public:
-        static void operator delete(void*) { }
-    };
-
-
-#else   // YASSL_PURE_C
-
-
-    template<typename T>
-    void ysDelete(T* ptr)
-    {
-        delete ptr;
-    }
-
-    template<typename T>
-    void ysArrayDelete(T* ptr)
-    {
-        delete[] ptr;
-    }
-
-    #define NEW_YS new
-
-    class virtual_base {};
-
-
-
-#endif // YASSL_PURE_C
-
-
-typedef unsigned char  uint8;
-typedef unsigned short uint16;
-typedef unsigned int   uint32;
-typedef uint8          uint24[3];
-typedef uint32         uint64[2];
-
-typedef uint8  opaque;
-typedef opaque byte;
-
-typedef unsigned int uint;
-
-
-#ifdef USE_SYS_STL
-    // use system STL
-    #define STL_VECTOR_FILE    <vector>
-    #define STL_LIST_FILE      <list>
-    #define STL_ALGORITHM_FILE <algorithm>
-    #define STL_MEMORY_FILE    <memory>
-    #define STL_PAIR_FILE      <utility>
-    
-    #define STL_NAMESPACE       std
-#else
-    // use mySTL
-    #define STL_VECTOR_FILE    "vector.hpp"
-    #define STL_LIST_FILE      "list.hpp"
-    #define STL_ALGORITHM_FILE "algorithm.hpp"
-    #define STL_MEMORY_FILE    "memory.hpp"
-    #define STL_PAIR_FILE      "pair.hpp"
-
-    #define STL_NAMESPACE       mySTL
-#endif
-
-
-#ifdef min
-    #undef min
-#endif 
-
-template <typename T>
-T min(T a, T b)
-{
-    return a < b ? a : b;
-}
-
-
- 
-// all length constants in bytes
-const int ID_LEN            =  32;  // session id length
-const int SUITE_LEN         =   2;  // cipher suite length
-const int SECRET_LEN        =  48;  // pre RSA and all master secret length
-const int MASTER_ROUNDS     =   3;  // master secret derivation rounds
-const int RAN_LEN           =  32;  // client and server random length
-const int MAC_BLOCK_SZ      =  64;  // MAC block size, & padding
-const int MD5_LEN           =  16;  // MD5 digest length
-const int SHA_LEN           =  20;  // SHA digest length
-const int RMD_LEN           =  20;  // RIPEMD-160 digest length
-const int PREFIX            =   3;  // up to 3 prefix letters for secret rounds
-const int KEY_PREFIX        =   7;  // up to 7 prefix letters for key rounds
-const int FORTEZZA_MAX      = 128;  // Maximum Fortezza Key length
-const int MAX_SUITE_SZ      = 128;  // 64 max suites * sizeof(suite)
-const int MAX_SUITE_NAME    =  48;  // max length of suite name
-const int MAX_CIPHERS       =  32;  // max supported ciphers for cipher list
-const int SIZEOF_ENUM       =   1;  // SSL considers an enum 1 byte, not 4
-const int SIZEOF_SENDER     =   4;  // Sender constant, for finished generation
-const int PAD_MD5           =  48;  // pad length 1 and 2 for md5 finished
-const int PAD_SHA           =  40;  // should be 44, specd wrong by netscape
-const int PAD_RMD           =  44;  // pad length for RIPEMD-160, some use 40??
-const int CERT_HEADER       =   3;  // always use 3 bytes for certificate
-const int CERT_TYPES        =   7;  // certificate request types
-const int REQUEST_HEADER    =   2;  // request uses 2 bytes
-const int VERIFY_HEADER     =   2;  // verify length field
-const int MIN_CERT_TYPES    =   1;  // minimum certificate request types
-const int MIN_DIS_NAMES     =   3;  // minimum distinguished names
-const int MIN_DIS_SIZE      =   1;  // minimum distinguished name size
-const int RECORD_HEADER     =   5;  // type + version + length(2)
-const int HANDSHAKE_HEADER  =   4;  // type + length(3)
-const int FINISHED_SZ       = MD5_LEN + SHA_LEN; // sizeof finished data
-const int TLS_FINISHED_SZ   =  12;  // TLS verify data size
-const int SEQ_SZ            =   8;  // 64 bit sequence number
-const int LENGTH_SZ         =   2;  // length field for HMAC, data only
-const int VERSION_SZ        = SIZEOF_ENUM * 2;  // SSL/TLS length of version
-const int DES_KEY_SZ        =   8;  // DES Key length
-const int DES_EDE_KEY_SZ    =  24;  // DES EDE Key length
-const int DES_BLOCK         =   8;  // DES is always fixed block size 8
-const int DES_IV_SZ         = DES_BLOCK;    // Init Vector length for DES
-const int RC4_KEY_SZ        =  16;  // RC4 Key length
-const int AES_128_KEY_SZ    =  16;  // AES 128bit Key length
-const int AES_192_KEY_SZ    =  24;  // AES 192bit Key length
-const int AES_256_KEY_SZ    =  32;  // AES 256bit Key length
-const int AES_BLOCK_SZ      =  16;  // AES 128bit block size, rfc 3268
-const int AES_IV_SZ         = AES_BLOCK_SZ; // AES Init Vector length
-const int DSS_SIG_SZ        =  40;  // two 20 byte high byte first Integers
-const int DSS_ENCODED_EXTRA =   6;  // seqID + len(1) + (intID + len(1)) * 2
-const int EVP_SALT_SZ       =   8;
-const int MASTER_LABEL_SZ   =  13;  // TLS master secret label size
-const int KEY_LABEL_SZ      =  13;  // TLS key block expansion size
-const int FINISHED_LABEL_SZ =  15;  // TLS finished lable length
-const int SEED_LEN          = RAN_LEN * 2; // TLS seed, client + server random
-const int DEFAULT_TIMEOUT   = 500;  // Default Session timeout in seconds
-const int MAX_RECORD_SIZE   = 16384; // 2^14, max size by standard
-const int COMPRESS_EXTRA    = 1024;  // extra compression possible addition
-const int SESSION_FLUSH_COUNT = 256;  // when to flush session cache
-const int MAX_PAD_SIZE        = 256;  // max TLS padding size
-const int COMPRESS_CONSTANT   =  13;  // compression calculation constant
-const int COMPRESS_UPPER      =  55;  // compression calculation numerator
-const int COMPRESS_LOWER      =  64;  // compression calculation denominator
-const int COMPRESS_DUMMY_SIZE =  64;  // compression dummy round size 
-
-typedef uint8 Cipher;             // first byte is always 0x00 for SSLv3 & TLS
-
-typedef opaque Random[RAN_LEN];
-
-typedef opaque* DistinguishedName;
-
-typedef bool IsExportable;
-
-
-enum CompressionMethod { no_compression = 0, zlib = 221 };
-
-enum CipherType { stream, block };
-
-enum CipherChoice { change_cipher_spec_choice = 1 };
-
-enum PublicValueEncoding { implicit_encoding, explicit_encoding };
-
-enum ConnectionEnd { server_end, client_end };
-
-enum AlertLevel { warning = 1, fatal = 2 };
-
-
-
-// Record Layer Header identifier from page 12
-enum ContentType {
-    no_type            = 0,
-    change_cipher_spec = 20, 
-    alert              = 21, 
-    handshake          = 22, 
-    application_data   = 23 
-};
-
-
-// HandShake Layer Header identifier from page 20
-enum HandShakeType {
-    no_shake            = -1,
-    hello_request       = 0, 
-    client_hello        = 1, 
-    server_hello        = 2,
-    certificate         = 11, 
-    server_key_exchange = 12,
-    certificate_request = 13, 
-    server_hello_done   = 14,
-    certificate_verify  = 15, 
-    client_key_exchange = 16,
-    finished            = 20
-};
-
-
-// Valid Alert types from page 16/17
-enum AlertDescription {
-    close_notify            = 0,
-    unexpected_message      = 10,
-    bad_record_mac          = 20,
-    decompression_failure   = 30,
-    handshake_failure       = 40,
-    no_certificate          = 41,
-    bad_certificate         = 42,
-    unsupported_certificate = 43,
-    certificate_revoked     = 44,
-    certificate_expired     = 45,
-    certificate_unknown     = 46,
-    illegal_parameter       = 47
-};
-
-
-// Supported Key Exchange Protocols
-enum KeyExchangeAlgorithm { 
-    no_kea = 0,
-    rsa_kea, 
-    diffie_hellman_kea, 
-    fortezza_kea 
-};
-
-
-// Supported Authentication Schemes
-enum SignatureAlgorithm { 
-    anonymous_sa_algo = 0, 
-    rsa_sa_algo, 
-    dsa_sa_algo 
-};
-
-
-// Valid client certificate request types from page 27
-enum ClientCertificateType {    
-    rsa_sign            = 1, 
-    dss_sign            = 2,
-    rsa_fixed_dh        = 3,
-    dss_fixed_dh        = 4,
-    rsa_ephemeral_dh    = 5,
-    dss_ephemeral_dh    = 6,
-    fortezza_kea_cert   = 20
-};
-
-
-// Supported Ciphers from page 43
-enum BulkCipherAlgorithm { 
-    cipher_null,
-    rc4,
-    rc2,
-    des,
-    triple_des,             // leading 3 (3des) not valid identifier
-    des40,
-    idea,
-    aes
-};
-
-
-// Supported Message Authentication Codes from page 43
-enum MACAlgorithm { 
-    no_mac,
-    md5,
-    sha,
-    rmd
-};
-
-
-// Certificate file Type
-enum CertType { Cert = 0, PrivateKey, CA };
-
-
-// all Cipher Suites from pages 41/42
-const Cipher SSL_NULL_WITH_NULL_NULL                =  0; // { 0x00, 0x00 }
-const Cipher SSL_RSA_WITH_NULL_MD5                  =  1; // { 0x00, 0x01 }
-const Cipher SSL_RSA_WITH_NULL_SHA                  =  2; // { 0x00, 0x02 }
-const Cipher SSL_RSA_EXPORT_WITH_RC4_40_MD5         =  3; // { 0x00, 0x03 }
-const Cipher SSL_RSA_WITH_RC4_128_MD5               =  4; // { 0x00, 0x04 }
-const Cipher SSL_RSA_WITH_RC4_128_SHA               =  5; // { 0x00, 0x05 }
-const Cipher SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5     =  6; // { 0x00, 0x06 }
-const Cipher SSL_RSA_WITH_IDEA_CBC_SHA              =  7; // { 0x00, 0x07 }
-const Cipher SSL_RSA_EXPORT_WITH_DES40_CBC_SHA      =  8; // { 0x00, 0x08 }
-const Cipher SSL_RSA_WITH_DES_CBC_SHA               =  9; // { 0x00, 0x09 }
-const Cipher SSL_RSA_WITH_3DES_EDE_CBC_SHA          = 10; // { 0x00, 0x0A }
-const Cipher SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA   = 11; // { 0x00, 0x0B }
-const Cipher SSL_DH_DSS_WITH_DES_CBC_SHA            = 12; // { 0x00, 0x0C }
-const Cipher SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA       = 13; // { 0x00, 0x0D }
-const Cipher SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA   = 14; // { 0x00, 0x0E }
-const Cipher SSL_DH_RSA_WITH_DES_CBC_SHA            = 15; // { 0x00, 0x0F }
-const Cipher SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA       = 16; // { 0x00, 0x10 }
-const Cipher SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA  = 17; // { 0x00, 0x11 }
-const Cipher SSL_DHE_DSS_WITH_DES_CBC_SHA           = 18; // { 0x00, 0x12 }
-const Cipher SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA      = 19; // { 0x00, 0x13 }
-const Cipher SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA  = 20; // { 0x00, 0x14 }
-const Cipher SSL_DHE_RSA_WITH_DES_CBC_SHA           = 21; // { 0x00, 0x15 }
-const Cipher SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA      = 22; // { 0x00, 0x16 }
-const Cipher SSL_DH_anon_EXPORT_WITH_RC4_40_MD5     = 23; // { 0x00, 0x17 }
-const Cipher SSL_DH_anon_WITH_RC4_128_MD5           = 24; // { 0x00, 0x18 }
-const Cipher SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA  = 25; // { 0x00, 0x19 }
-const Cipher SSL_DH_anon_WITH_DES_CBC_SHA           = 26; // { 0x00, 0x1A }
-const Cipher SSL_DH_anon_WITH_3DES_EDE_CBC_SHA      = 27; // { 0x00, 0x1B }
-const Cipher SSL_FORTEZZA_KEA_WITH_NULL_SHA         = 28; // { 0x00, 0x1C }
-const Cipher SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA = 29; // { 0x00, 0x1D }
-const Cipher SSL_FORTEZZA_KEA_WITH_RC4_128_SHA      = 30; // { 0x00, 0x1E }
-
-// .. to 0x2B uses Kerberos Authentication
-
-
-// TLS AES extensions
-const Cipher TLS_RSA_WITH_AES_128_CBC_SHA      = 47; // { 0x00, 0x2F }
-const Cipher TLS_DH_DSS_WITH_AES_128_CBC_SHA   = 48; // { 0x00, 0x30 }
-const Cipher TLS_DH_RSA_WITH_AES_128_CBC_SHA   = 49; // { 0x00, 0x31 }
-const Cipher TLS_DHE_DSS_WITH_AES_128_CBC_SHA  = 50; // { 0x00, 0x32 }
-const Cipher TLS_DHE_RSA_WITH_AES_128_CBC_SHA  = 51; // { 0x00, 0x33 }
-const Cipher TLS_DH_anon_WITH_AES_128_CBC_SHA  = 52; // { 0x00, 0x34 }
-
-const Cipher TLS_RSA_WITH_AES_256_CBC_SHA      = 53; // { 0x00, 0x35 }
-const Cipher TLS_DH_DSS_WITH_AES_256_CBC_SHA   = 54; // { 0x00, 0x36 }
-const Cipher TLS_DH_RSA_WITH_AES_256_CBC_SHA   = 55; // { 0x00, 0x37 }
-const Cipher TLS_DHE_DSS_WITH_AES_256_CBC_SHA  = 56; // { 0x00, 0x38 }
-const Cipher TLS_DHE_RSA_WITH_AES_256_CBC_SHA  = 57; // { 0x00, 0x39 }
-const Cipher TLS_DH_anon_WITH_AES_256_CBC_SHA  = 58; // { 0x00, 0x3A }
-
-
-// OpenPGP extensions
-
-const Cipher TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160 = 114; // { 0x00, 0x72 };
-const Cipher TLS_DHE_DSS_WITH_AES_128_CBC_RMD160  = 115; // { 0x00, 0x73 };
-const Cipher TLS_DHE_DSS_WITH_AES_256_CBC_RMD160  = 116; // { 0x00, 0x74 };
-const Cipher TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160 = 119; // { 0x00, 0x77 };
-const Cipher TLS_DHE_RSA_WITH_AES_128_CBC_RMD160  = 120; // { 0x00, 0x78 };
-const Cipher TLS_DHE_RSA_WITH_AES_256_CBC_RMD160  = 121; // { 0x00, 0x79 };
-const Cipher TLS_RSA_WITH_3DES_EDE_CBC_RMD160     = 124; // { 0x00, 0x7C };
-const Cipher TLS_RSA_WITH_AES_128_CBC_RMD160      = 125; // { 0x00, 0x7D };
-const Cipher TLS_RSA_WITH_AES_256_CBC_RMD160      = 126; // { 0x00, 0x7E };
-
-
-const char* const null_str = "";
-
-const char* const cipher_names[128] =
-{
-    null_str, // SSL_NULL_WITH_NULL_NULL                =  0
-    null_str, // SSL_RSA_WITH_NULL_MD5                  =  1
-    null_str, // SSL_RSA_WITH_NULL_SHA                  =  2
-    null_str, // SSL_RSA_EXPORT_WITH_RC4_40_MD5         =  3
-    "RC4-MD5",  // SSL_RSA_WITH_RC4_128_MD5               =  4
-    "RC4-SHA",  // SSL_RSA_WITH_RC4_128_SHA               =  5
-    null_str, // SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5     =  6
-    null_str, // SSL_RSA_WITH_IDEA_CBC_SHA              =  7
-    null_str, // SSL_RSA_EXPORT_WITH_DES40_CBC_SHA      =  8
-    "DES-CBC-SHA",  // SSL_RSA_WITH_DES_CBC_SHA               =  9
-    "DES-CBC3-SHA", // SSL_RSA_WITH_3DES_EDE_CBC_SHA          = 10
-
-    null_str, // SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA   = 11
-    null_str, // SSL_DH_DSS_WITH_DES_CBC_SHA            = 12
-    null_str, // SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA       = 13
-    null_str, // SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA   = 14
-    null_str, // SSL_DH_RSA_WITH_DES_CBC_SHA            = 15
-    null_str, // SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA       = 16
-    null_str, // SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA  = 17
-    "EDH-DSS-DES-CBC-SHA",  // SSL_DHE_DSS_WITH_DES_CBC_SHA           = 18
-    "EDH-DSS-DES-CBC3-SHA", // SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA      = 19
-    null_str, // SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA  = 20
-
-    "EDH-RSA-DES-CBC-SHA",  // SSL_DHE_RSA_WITH_DES_CBC_SHA           = 21
-    "EDH-RSA-DES-CBC3-SHA", // SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA      = 22
-    null_str, // SSL_DH_anon_EXPORT_WITH_RC4_40_MD5     = 23
-    null_str, // SSL_DH_anon_WITH_RC4_128_MD5           = 24
-    null_str, // SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA  = 25
-    null_str, // SSL_DH_anon_WITH_DES_CBC_SHA           = 26
-    null_str, // SSL_DH_anon_WITH_3DES_EDE_CBC_SHA      = 27
-    null_str, // SSL_FORTEZZA_KEA_WITH_NULL_SHA         = 28
-    null_str, // SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA = 29
-    null_str, // SSL_FORTEZZA_KEA_WITH_RC4_128_SHA      = 30
-
-    null_str, null_str, null_str, null_str, null_str, // 31 - 35
-    null_str, null_str, null_str, null_str, null_str, // 36 - 40
-    null_str, null_str, null_str, null_str, null_str, // 41 - 45
-    null_str, // 46
-
-    // TLS AES extensions
-    "AES128-SHA", // TLS_RSA_WITH_AES_128_CBC_SHA      = 47
-    null_str, // TLS_DH_DSS_WITH_AES_128_CBC_SHA   = 48
-    null_str, // TLS_DH_RSA_WITH_AES_128_CBC_SHA   = 49
-    "DHE-DSS-AES128-SHA", // TLS_DHE_DSS_WITH_AES_128_CBC_SHA  = 50
-    "DHE-RSA-AES128-SHA", // TLS_DHE_RSA_WITH_AES_128_CBC_SHA  = 51
-    null_str, // TLS_DH_anon_WITH_AES_128_CBC_SHA  = 52
-
-    "AES256-SHA", // TLS_RSA_WITH_AES_256_CBC_SHA      = 53
-    null_str, // TLS_DH_DSS_WITH_AES_256_CBC_SHA   = 54
-    null_str, // TLS_DH_RSA_WITH_AES_256_CBC_SHA   = 55
-    "DHE-DSS-AES256-SHA", // TLS_DHE_DSS_WITH_AES_256_CBC_SHA  = 56
-    "DHE-RSA-AES256-SHA", // TLS_DHE_RSA_WITH_AES_256_CBC_SHA  = 57
-    null_str, // TLS_DH_anon_WITH_AES_256_CBC_SHA  = 58
-    
-    null_str, // 59
-    null_str, // 60
-    null_str, null_str, null_str, null_str, null_str, // 61 - 65
-    null_str, null_str, null_str, null_str, null_str, // 66 - 70
-    null_str, null_str, null_str, null_str, null_str, // 71 - 75
-    null_str, null_str, null_str, null_str, null_str, // 76 - 80
-    null_str, null_str, null_str, null_str, null_str, // 81 - 85
-    null_str, null_str, null_str, null_str, null_str, // 86 - 90
-    null_str, null_str, null_str, null_str, null_str, // 91 - 95
-    null_str, null_str, null_str, null_str, null_str, // 96 - 100
-    null_str, null_str, null_str, null_str, null_str, // 101 - 105
-    null_str, null_str, null_str, null_str, null_str, // 106 - 110
-    null_str, null_str, null_str,                     // 111 - 113
-
-    "DHE-DSS-DES-CBC3-RMD", //  TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160 = 114
-    "DHE-DSS-AES128-RMD",   //  TLS_DHE_DSS_WITH_AES_128_CBC_RMD160  = 115
-    "DHE-DSS-AES256-RMD",   //  TLS_DHE_DSS_WITH_AES_256_CBC_RMD160  = 116
-    null_str, // 117
-    null_str, // 118
-    "DHE-RSA-DES-CBC3-RMD", //  TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160 = 119
-    "DHE-RSA-AES128-RMD",   //  TLS_DHE_RSA_WITH_AES_128_CBC_RMD160  = 120
-    "DHE-RSA-AES256-RMD",   //  TLS_DHE_RSA_WITH_AES_256_CBC_RMD160  = 121
-    null_str, // 122
-    null_str, // 123
-    "DES-CBC3-RMD", //  TLS_RSA_WITH_3DES_EDE_CBC_RMD160     = 124
-    "AES128-RMD",   //  TLS_RSA_WITH_AES_128_CBC_RMD160      = 125
-    "AES256-RMD",   //  TLS_RSA_WITH_AES_256_CBC_RMD160      = 126
-    null_str // 127
-};
-
-// fill with MD5 pad size since biggest required
-const opaque PAD1[PAD_MD5] =  { 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-                                0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-                                0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-                                0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-                                0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-                                0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36
-                              };
-const opaque PAD2[PAD_MD5] =  { 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
-                                0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
-                                0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
-                                0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
-                                0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
-                                0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c
-                              };
-
-const opaque client[SIZEOF_SENDER] = { 0x43, 0x4C, 0x4E, 0x54 };
-const opaque server[SIZEOF_SENDER] = { 0x53, 0x52, 0x56, 0x52 };
-
-const opaque tls_client[FINISHED_LABEL_SZ + 1] = "client finished";
-const opaque tls_server[FINISHED_LABEL_SZ + 1] = "server finished";
-
-const opaque master_label[MASTER_LABEL_SZ + 1] = "master secret";
-const opaque key_label   [KEY_LABEL_SZ + 1]    = "key expansion";
-
-
-} // naemspace
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-/*
-  gcc 2.96 bails out because of two declarations of byte: yaSSL::byte and
-  TaoCrypt::byte. TODO: define global types.hpp and move the declaration of
-  'byte' there.
-*/
-using yaSSL::byte;
-#endif
-
-
-#endif // yaSSL_TYPES_HPP
diff --git a/extra/yassl/lib/dummy b/extra/yassl/lib/dummy
deleted file mode 100644
index 85c1efd587fd..000000000000
--- a/extra/yassl/lib/dummy
+++ /dev/null
@@ -1 +0,0 @@
-// this is a dummy file
diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp
deleted file mode 100644
index 954fdb52837e..000000000000
--- a/extra/yassl/src/buffer.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL buffer header implements input/output buffers to simulate streaming
- * with SSL types and sockets
- */
-
-
-// First include (the generated) my_config.h, to get correct platform defines.
-#include "my_config.h"
-#include <string.h>             // memcpy
-#include "runtime.hpp"
-#include "buffer.hpp"
-#include "yassl_types.hpp"
-
-namespace yaSSL {
-
-
-
-
-/* return 0 on check success, always true for NoCheck policy */
-int NoCheck::check(uint, uint) 
-{
-    return 0;
-}
-
-/* return 0 on check success */
-int Check::check(uint i, uint max) 
-{
-    if (i < max)
-        return 0;
-
-    return -1;
-}
-
-
-/* input_buffer operates like a smart c style array with a checking option, 
- * meant to be read from through [] with AUTO index or read().
- * Should only write to at/near construction with assign() or raw (e.g., recv)
- * followed by add_size with the number of elements added by raw write.
- *
- * Not using vector because need checked []access, offset, and the ability to
- * write to the buffer bulk wise and have the correct size
- */
-
-
-input_buffer::input_buffer() 
-    : size_(0), current_(0), buffer_(0), end_(0), error_(0), zero_(0)
-{}
-
-
-input_buffer::input_buffer(uint s) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
-      error_(0), zero_(0)
-{}
-
-
-// with assign
-input_buffer::input_buffer(uint s, const byte* t, uint len) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
-      error_(0), zero_(0)
-{ 
-    assign(t, len); 
-}
-
-
-input_buffer::~input_buffer() 
-{ 
-    ysArrayDelete(buffer_); 
-}
-
-
-// users can pass defualt zero length buffer and then allocate
-void input_buffer::allocate(uint s) 
-{ 
-    if (error_ == 0) {
-        buffer_ = NEW_YS byte[s];
-        end_ = buffer_ + s;
-    }
-}
-
-
-// for passing to raw writing functions at beginning, then use add_size
-byte* input_buffer::get_buffer() const 
-{ 
-    return buffer_; 
-}
-
-
-// after a raw write user can set NEW_YS size
-// if you know the size before the write use assign()
-void input_buffer::add_size(uint i) 
-{ 
-    if (error_ == 0 && check(size_ + i-1, get_capacity()) == 0)
-        size_ += i;
-    else
-        error_ = -1;
-}
-
-
-uint input_buffer::get_capacity()  const 
-{ 
-    if (error_ == 0)
-        return end_ - buffer_;
-
-    return 0;
-}
-
-
-uint input_buffer::get_current()   const 
-{ 
-    if (error_ == 0)
-        return current_;
-
-    return 0;
-}
-
-
-uint input_buffer::get_size()      const 
-{ 
-    if (error_ == 0)
-        return size_;
-
-    return 0;
-}
-
-
-uint input_buffer::get_remaining() const 
-{ 
-    if (error_ == 0)
-        return size_ - current_;
-
-    return 0;
-}
-
-
-int input_buffer::get_error() const 
-{ 
-    return error_;
-}
-
-
-void input_buffer::set_error()
-{ 
-    error_ = -1;
-}
-
-
-void input_buffer::set_current(uint i) 
-{
-    if (error_ == 0 && check(i ? i - 1 : 0, size_) == 0)
-        current_ = i;
-    else
-        error_ = -1;
-}
-
-
-// read only access through [], advance current
-// user passes in AUTO index for ease of use
-const byte& input_buffer::operator[](uint i) 
-{
-    if (error_ == 0 && check(current_, size_) == 0)
-        return buffer_[current_++];
-
-    error_ = -1;
-    return zero_;
-}
-
-
-// end of input test
-bool input_buffer::eof() 
-{ 
-    if (error_ != 0)
-        return true;
-
-    return current_ >= size_; 
-}
-
-
-// peek ahead
-byte input_buffer::peek()
-{
-    if (error_ == 0 && check(current_, size_) == 0)
-        return buffer_[current_];
-
-    error_ = -1;
-    return 0;
-}
-
-
-// write function, should use at/near construction
-void input_buffer::assign(const byte* t, uint s)
-{
-    if (t && error_ == 0 && check(current_, get_capacity()) == 0) {
-        add_size(s);
-        if (error_ == 0) {
-            memcpy(&buffer_[current_], t, s);
-            return;  // success
-        }
-    }
-
-    error_ = -1;
-}
-
-
-// use read to query input, adjusts current
-void input_buffer::read(byte* dst, uint length)
-{
-    if (dst && error_ == 0 && check(current_ + length - 1, size_) == 0) {
-        memcpy(dst, &buffer_[current_], length);
-        current_ += length;
-    } else {
-        error_ = -1;
-    }
-}
-
-
-
-/* output_buffer operates like a smart c style array with a checking option.
- * Meant to be written to through [] with AUTO index or write().
- * Size (current) counter increases when written to. Can be constructed with 
- * zero length buffer but be sure to allocate before first use. 
- * Don't use add write for a couple bytes, use [] instead, way less overhead.
- * 
- * Not using vector because need checked []access and the ability to
- * write to the buffer bulk wise and retain correct size
- */
-
-
-output_buffer::output_buffer() 
-    : current_(0), buffer_(0), end_(0) 
-{}
-
-
-// with allocate
-output_buffer::output_buffer(uint s) 
-    : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) 
-{}
-
-
-// with assign
-output_buffer::output_buffer(uint s, const byte* t, uint len) 
-    : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_+ s) 
-{ 
-    write(t, len); 
-}
-
-
-output_buffer::~output_buffer() 
-{ 
-    ysArrayDelete(buffer_); 
-}
-
-
-uint output_buffer::get_size() const 
-{ 
-    return current_; 
-}
-
-
-uint output_buffer::get_capacity() const 
-{ 
-    return (uint) (end_ - buffer_); 
-}
-
-
-void output_buffer::set_current(uint c) 
-{ 
-    check(c, get_capacity()); 
-    current_ = c; 
-}
-
-
-// users can pass defualt zero length buffer and then allocate
-void output_buffer::allocate(uint s) 
-{ 
-    buffer_ = NEW_YS byte[s]; end_ = buffer_ + s; 
-}
-
-
-// for passing to reading functions when finished
-const byte* output_buffer::get_buffer() const 
-{ 
-    return buffer_; 
-}
-
-
-// allow write access through [], update current
-// user passes in AUTO as index for ease of use
-byte& output_buffer::operator[](uint i) 
-{
-    check(current_, get_capacity());
-    return buffer_[current_++];
-}
-
-
-// end of output test
-bool output_buffer::eof() 
-{ 
-    return current_ >= get_capacity(); 
-}
-
-
-void output_buffer::write(const byte* t, uint s)
-{
-    check(current_ + s - 1, get_capacity()); 
-    memcpy(&buffer_[current_], t, s);
-    current_ += s;
-}
-
-
-
-} // naemspace
-
diff --git a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp
deleted file mode 100644
index 1092e428351b..000000000000
--- a/extra/yassl/src/cert_wrapper.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/*  The certificate wrapper source implements certificate management functions
- *
- */
-
-#include "runtime.hpp"
-#include "cert_wrapper.hpp"
-#include "yassl_int.hpp"
-#include "error.hpp"
-
-#if defined(USE_CML_LIB)
-    #include "cmapi_cpp.h"
-#else
-    #include "asn.hpp"
-    #include "file.hpp"
-#endif // USE_CML_LIB
-
-
-namespace yaSSL {
-
-
-x509::x509(uint sz) : length_(sz), buffer_(NEW_YS opaque[sz]) 
-{
-}
-
-
-x509::~x509() 
-{ 
-    ysArrayDelete(buffer_); 
-}
-
-
-x509::x509(const x509& that) : length_(that.length_),
-                               buffer_(NEW_YS opaque[length_])
-{
-    memcpy(buffer_, that.buffer_, length_);
-}
-
-
-void x509::Swap(x509& that)
-{
-    STL::swap(length_, that.length_);
-    STL::swap(buffer_, that.buffer_);
-}
-
-
-x509& x509::operator=(const x509& that)
-{
-    x509 temp(that);
-    Swap(temp);
-    return *this;
-}
-
-
-uint x509::get_length() const
-{ 
-    return length_; 
-}
-
-
-const opaque* x509::get_buffer() const
-{ 
-    return buffer_; 
-}
-
-
-opaque* x509::use_buffer()
-{ 
-    return buffer_; 
-}
-
-
-//CertManager
-CertManager::CertManager()
-    : peerX509_(0), selfX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
-      sendVerify_(false), sendBlankCert_(false), verifyCallback_(0)
-{}
-
-
-CertManager::~CertManager()
-{
-    ysDelete(peerX509_);
-    ysDelete(selfX509_);
-
-    STL::for_each(signers_.begin(), signers_.end(), del_ptr_zero()) ;
-
-    STL::for_each(peerList_.begin(), peerList_.end(), del_ptr_zero()) ;
-
-    STL::for_each(list_.begin(), list_.end(), del_ptr_zero()) ;
-}
-
-
-bool CertManager::verifyPeer() const
-{
-    return verifyPeer_;
-}
-
-
-bool CertManager::verifyNone() const
-{
-    return verifyNone_;
-}
-
-
-bool CertManager::failNoCert() const
-{
-    return failNoCert_;
-}
-
-
-bool CertManager::sendVerify() const
-{
-    return sendVerify_;
-}
-
-
-void CertManager::setVerifyPeer()
-{
-    verifyPeer_ = true;
-}
-
-
-void CertManager::setVerifyNone()
-{
-    verifyNone_ = true;
-}
-
-bool CertManager::sendBlankCert() const
-{
-  return sendBlankCert_;
-}
-
-
-void CertManager::setFailNoCert()
-{
-    failNoCert_ = true;
-}
-
-
-void CertManager::setSendVerify()
-{
-    sendVerify_ = true;
-}
-
-void CertManager::setSendBlankCert()
-{
-  sendBlankCert_ = true;
-}
-
-
-void CertManager::setVerifyCallback(VerifyCallback vc)
-{
-    verifyCallback_ = vc;
-}
-
-
-void CertManager::AddPeerCert(x509* x)
-{ 
-    peerList_.push_back(x);  // take ownership
-}
-
-
-void CertManager::CopySelfCert(const x509* x)
-{
-    if (x)
-        list_.push_back(NEW_YS x509(*x));
-}
-
-
-// add to signers
-int CertManager::CopyCaCert(const x509* x)
-{
-    TaoCrypt::Source source(x->get_buffer(), x->get_length());
-    TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_,
-                               TaoCrypt::CertDecoder::CA);
-
-    if (!cert.GetError().What()) {
-        const TaoCrypt::PublicKey& key = cert.GetPublicKey();
-        signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(),
-                                        cert.GetCommonName(), cert.GetHash()));
-    }
-    // just don't add, not an error return cert.GetError().What();
-    return 0;
-}
-
-
-const x509* CertManager::get_cert() const
-{ 
-    return list_.front();
-}
-
-
-const opaque* CertManager::get_peerKey() const
-{ 
-    return peerPublicKey_.get_buffer();
-}
-
-
-X509* CertManager::get_peerX509() const
-{
-    return peerX509_;
-}
-
-
-X509* CertManager::get_selfX509() const
-{
-    return selfX509_;
-}
-
-
-SignatureAlgorithm CertManager::get_peerKeyType() const
-{
-    return peerKeyType_;
-}
-
-
-SignatureAlgorithm CertManager::get_keyType() const
-{
-    return keyType_;
-}
-
-
-uint CertManager::get_peerKeyLength() const
-{ 
-    return peerPublicKey_.get_size();
-}
-
-
-const opaque* CertManager::get_privateKey() const
-{ 
-    return privateKey_.get_buffer();
-}
-
-
-uint CertManager::get_privateKeyLength() const
-{ 
-    return privateKey_.get_size();
-}
-
-
-// Validate the peer's certificate list, from root to peer (last to first)
-int CertManager::Validate()
-{
-    CertList::reverse_iterator last = peerList_.rbegin();
-    size_t count = peerList_.size();
-
-    while ( count > 1 ) {
-        TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
-        TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_);
-
-        if (int err = cert.GetError().What())
-            return err;
-
-        const TaoCrypt::PublicKey& key = cert.GetPublicKey();
-        signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(),
-                                        cert.GetCommonName(), cert.GetHash()));
-        ++last;
-        --count;
-    }
-
-    if (count) {
-        // peer's is at the front
-        TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length());
-        TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_);
-
-        int err = cert.GetError().What();
-        if ( err && err != TaoCrypt::SIG_OTHER_E)
-            return err;
-
-        uint sz = cert.GetPublicKey().size();
-        peerPublicKey_.allocate(sz);
-        peerPublicKey_.assign(cert.GetPublicKey().GetKey(), sz);
-
-        if (cert.GetKeyType() == TaoCrypt::RSAk)
-            peerKeyType_ = rsa_sa_algo;
-        else
-            peerKeyType_ = dsa_sa_algo;
-
-        size_t iSz = strlen(cert.GetIssuer()) + 1;
-        size_t sSz = strlen(cert.GetCommonName()) + 1;
-        ASN1_STRING beforeDate, afterDate;
-        beforeDate.data= (unsigned char *) cert.GetBeforeDate();
-        beforeDate.type= cert.GetBeforeDateType();
-        beforeDate.length= strlen((char *) beforeDate.data) + 1;
-        afterDate.data= (unsigned char *) cert.GetAfterDate();
-        afterDate.type= cert.GetAfterDateType();
-        afterDate.length= strlen((char *) afterDate.data) + 1;
-        peerX509_ = NEW_YS X509(cert.GetIssuer(), iSz, cert.GetCommonName(),
-                                sSz, &beforeDate, &afterDate,
-                                cert.GetIssuerCnStart(), cert.GetIssuerCnLength(),
-                                cert.GetSubjectCnStart(), cert.GetSubjectCnLength()
-                                );
-
-        if (err == TaoCrypt::SIG_OTHER_E && verifyCallback_) {
-            X509_STORE_CTX store;
-            store.error = err;
-            store.error_depth = static_cast<int>(count) - 1;
-            store.current_cert = peerX509_;
-
-            int ok = verifyCallback_(0, &store);
-            if (ok) return 0;
-        }
-
-        if (err == TaoCrypt::SIG_OTHER_E) return err;
-    }
-    return 0;
-}
-
-
-// Set the private key
-int CertManager::SetPrivateKey(const x509& key)
-{
-    privateKey_.allocate(key.get_length());
-    privateKey_.assign(key.get_buffer(), key.get_length());
-
-    // set key type
-    if (x509* cert = list_.front()) {
-        TaoCrypt::Source source(cert->get_buffer(), cert->get_length());
-        TaoCrypt::CertDecoder cd(source, false);
-        cd.DecodeToKey();
-        if (int err = cd.GetError().What())
-            return err;
-        if (cd.GetKeyType() == TaoCrypt::RSAk)
-            keyType_ = rsa_sa_algo;
-        else
-            keyType_ = dsa_sa_algo;
-
-        size_t iSz = strlen(cd.GetIssuer()) + 1;
-        size_t sSz = strlen(cd.GetCommonName()) + 1;
-        ASN1_STRING beforeDate, afterDate;
-        beforeDate.data= (unsigned char *) cd.GetBeforeDate();
-        beforeDate.type= cd.GetBeforeDateType();
-        beforeDate.length= strlen((char *) beforeDate.data) + 1;
-        afterDate.data= (unsigned char *) cd.GetAfterDate();
-        afterDate.type= cd.GetAfterDateType();
-        afterDate.length= strlen((char *) afterDate.data) + 1;
-        selfX509_ = NEW_YS X509(cd.GetIssuer(), iSz, cd.GetCommonName(),
-                                sSz, &beforeDate, &afterDate,
-                                cd.GetIssuerCnStart(), cd.GetIssuerCnLength(),
-                                cd.GetSubjectCnStart(), cd.GetSubjectCnLength());
-    }
-    return 0;
-}
-
-
-// Store OpenSSL type peer's cert
-void CertManager::setPeerX509(X509* x)
-{
-    if (x == 0) return;
-
-    X509_NAME* issuer   = x->GetIssuer();
-    X509_NAME* subject  = x->GetSubject();
-    ASN1_STRING* before = x->GetBefore();
-    ASN1_STRING* after  = x->GetAfter();
-
-    peerX509_ = NEW_YS X509(issuer->GetName(), issuer->GetLength(),
-        subject->GetName(), subject->GetLength(), before, after,
-        issuer->GetCnPosition(), issuer->GetCnLength(),
-        subject->GetCnPosition(), subject->GetCnLength());
-}
-
-
-#if defined(USE_CML_LIB)
-
-// Get the peer's certificate, extract and save public key
-void CertManager::SetPeerKey()
-{
-    // first cert is the peer's
-    x509* main = peerList_.front();
-
-    Bytes_struct cert;
-    cert.num  = main->get_length();
-    cert.data = main->set_buffer();
-
-    CML::Certificate cm(cert);
-    const CML::ASN::Cert& raw = cm.base();
-    CTIL::CSM_Buffer key = raw.pubKeyInfo.key;
-
-    uint sz;
-    opaque* key_buffer = reinterpret_cast<opaque*>(key.Get(sz));
-    peerPublicKey_.allocate(sz);
-    peerPublicKey_.assign(key_buffer, sz);
-}
-
-
-#endif // USE_CML_LIB
-
-
-
-} // namespace
diff --git a/extra/yassl/src/crypto_wrapper.cpp b/extra/yassl/src/crypto_wrapper.cpp
deleted file mode 100644
index 12f956e6cbd4..000000000000
--- a/extra/yassl/src/crypto_wrapper.cpp
+++ /dev/null
@@ -1,1016 +0,0 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
-
-/*  The crypto wrapper source implements the policies for the cipher
- *  components used by SSL.
- *
- *  The implementation relies on a specfic library, taoCrypt.
- */
-
-#if !defined(USE_CRYPTOPP_LIB)
-
-#include "runtime.hpp"
-#include "crypto_wrapper.hpp"
-#include "cert_wrapper.hpp"
-
-#include "md5.hpp"
-#include "sha.hpp"
-#include "ripemd.hpp"
-#include "hmac.hpp"
-#include "modes.hpp"
-#include "des.hpp"
-#include "arc4.hpp"
-#include "aes.hpp"
-#include "rsa.hpp"
-#include "dsa.hpp"
-#include "dh.hpp"
-#include "random.hpp"
-#include "file.hpp"
-#include "coding.hpp"
-
-
-namespace yaSSL {
-
-
-// MD5 Implementation
-struct MD5::MD5Impl {
-    TaoCrypt::MD5 md5_;
-    MD5Impl() {}
-    explicit MD5Impl(const TaoCrypt::MD5& md5) : md5_(md5) {}
-};
-
-
-MD5::MD5() : pimpl_(NEW_YS MD5Impl) {}
-
-
-MD5::~MD5() { ysDelete(pimpl_); }
-
-
-MD5::MD5(const MD5& that) : Digest(), pimpl_(NEW_YS 
-                                             MD5Impl(that.pimpl_->md5_)) {}
-
-
-MD5& MD5::operator=(const MD5& that)
-{
-    pimpl_->md5_ = that.pimpl_->md5_;
-    return *this;
-}
-
-
-uint MD5::get_digestSize() const
-{
-    return MD5_LEN;
-}
-
-
-uint MD5::get_padSize() const
-{
-    return PAD_MD5;
-}
-
-
-// Fill out with MD5 digest from in that is sz bytes, out must be >= digest sz
-void MD5::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->md5_.Update(in, sz);
-    pimpl_->md5_.Final(out);
-}
-
-// Fill out with MD5 digest from previous updates
-void MD5::get_digest(byte* out)
-{
-    pimpl_->md5_.Final(out);
-}
-
-
-// Update the current digest
-void MD5::update(const byte* in, unsigned int sz)
-{
-    pimpl_->md5_.Update(in, sz);
-}
-
-
-// SHA Implementation
-struct SHA::SHAImpl {
-    TaoCrypt::SHA sha_;
-    SHAImpl() {}
-    explicit SHAImpl(const TaoCrypt::SHA& sha) : sha_(sha) {}
-};
-
-
-SHA::SHA() : pimpl_(NEW_YS SHAImpl) {}
-
-
-SHA::~SHA() { ysDelete(pimpl_); }
-
-
-SHA::SHA(const SHA& that) : Digest(), pimpl_(NEW_YS SHAImpl(that.pimpl_->sha_)) {}
-
-SHA& SHA::operator=(const SHA& that)
-{
-    pimpl_->sha_ = that.pimpl_->sha_;
-    return *this;
-}
-
-
-uint SHA::get_digestSize() const
-{
-    return SHA_LEN;
-}
-
-
-uint SHA::get_padSize() const
-{
-    return PAD_SHA;
-}
-
-
-// Fill out with SHA digest from in that is sz bytes, out must be >= digest sz
-void SHA::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->sha_.Update(in, sz);
-    pimpl_->sha_.Final(out);
-}
-
-
-// Fill out with SHA digest from previous updates
-void SHA::get_digest(byte* out)
-{
-    pimpl_->sha_.Final(out);
-}
-
-
-// Update the current digest
-void SHA::update(const byte* in, unsigned int sz)
-{
-    pimpl_->sha_.Update(in, sz);
-}
-
-
-// RMD-160 Implementation
-struct RMD::RMDImpl {
-    TaoCrypt::RIPEMD160 rmd_;
-    RMDImpl() {}
-    explicit RMDImpl(const TaoCrypt::RIPEMD160& rmd) : rmd_(rmd) {}
-};
-
-
-RMD::RMD() : pimpl_(NEW_YS RMDImpl) {}
-
-
-RMD::~RMD() { ysDelete(pimpl_); }
-
-
-RMD::RMD(const RMD& that) : Digest(), pimpl_(NEW_YS RMDImpl(that.pimpl_->rmd_)) {}
-
-RMD& RMD::operator=(const RMD& that)
-{
-    pimpl_->rmd_ = that.pimpl_->rmd_;
-    return *this;
-}
-
-
-uint RMD::get_digestSize() const
-{
-    return RMD_LEN;
-}
-
-
-uint RMD::get_padSize() const
-{
-    return PAD_RMD;
-}
-
-
-// Fill out with RMD digest from in that is sz bytes, out must be >= digest sz
-void RMD::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->rmd_.Update(in, sz);
-    pimpl_->rmd_.Final(out);
-}
-
-
-// Fill out with RMD digest from previous updates
-void RMD::get_digest(byte* out)
-{
-    pimpl_->rmd_.Final(out);
-}
-
-
-// Update the current digest
-void RMD::update(const byte* in, unsigned int sz)
-{
-    pimpl_->rmd_.Update(in, sz);
-}
-
-
-// HMAC_MD5 Implementation
-struct HMAC_MD5::HMAC_MD5Impl {
-    TaoCrypt::HMAC<TaoCrypt::MD5> mac_;
-    HMAC_MD5Impl() {}
-};
-
-
-HMAC_MD5::HMAC_MD5(const byte* secret, unsigned int len) 
-    : pimpl_(NEW_YS HMAC_MD5Impl) 
-{
-    pimpl_->mac_.SetKey(secret, len);
-}
-
-
-HMAC_MD5::~HMAC_MD5() { ysDelete(pimpl_); }
-
-
-uint HMAC_MD5::get_digestSize() const
-{
-    return MD5_LEN;
-}
-
-
-uint HMAC_MD5::get_padSize() const
-{
-    return PAD_MD5;
-}
-
-
-// Fill out with MD5 digest from in that is sz bytes, out must be >= digest sz
-void HMAC_MD5::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-    pimpl_->mac_.Final(out);
-}
-
-// Fill out with MD5 digest from previous updates
-void HMAC_MD5::get_digest(byte* out)
-{
-    pimpl_->mac_.Final(out);
-}
-
-
-// Update the current digest
-void HMAC_MD5::update(const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-}
-
-
-// HMAC_SHA Implementation
-struct HMAC_SHA::HMAC_SHAImpl {
-    TaoCrypt::HMAC<TaoCrypt::SHA> mac_;
-    HMAC_SHAImpl() {}
-};
-
-
-HMAC_SHA::HMAC_SHA(const byte* secret, unsigned int len) 
-    : pimpl_(NEW_YS HMAC_SHAImpl) 
-{
-    pimpl_->mac_.SetKey(secret, len);
-}
-
-
-HMAC_SHA::~HMAC_SHA() { ysDelete(pimpl_); }
-
-
-uint HMAC_SHA::get_digestSize() const
-{
-    return SHA_LEN;
-}
-
-
-uint HMAC_SHA::get_padSize() const
-{
-    return PAD_SHA;
-}
-
-
-// Fill out with SHA digest from in that is sz bytes, out must be >= digest sz
-void HMAC_SHA::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-    pimpl_->mac_.Final(out);
-}
-
-// Fill out with SHA digest from previous updates
-void HMAC_SHA::get_digest(byte* out)
-{
-    pimpl_->mac_.Final(out);
-}
-
-
-// Update the current digest
-void HMAC_SHA::update(const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-}
-
-
-
-// HMAC_RMD Implementation
-struct HMAC_RMD::HMAC_RMDImpl {
-    TaoCrypt::HMAC<TaoCrypt::RIPEMD160> mac_;
-    HMAC_RMDImpl() {}
-};
-
-
-HMAC_RMD::HMAC_RMD(const byte* secret, unsigned int len) 
-    : pimpl_(NEW_YS HMAC_RMDImpl) 
-{
-    pimpl_->mac_.SetKey(secret, len);
-}
-
-
-HMAC_RMD::~HMAC_RMD() { ysDelete(pimpl_); }
-
-
-uint HMAC_RMD::get_digestSize() const
-{
-    return RMD_LEN;
-}
-
-
-uint HMAC_RMD::get_padSize() const
-{
-    return PAD_RMD;
-}
-
-
-// Fill out with RMD digest from in that is sz bytes, out must be >= digest sz
-void HMAC_RMD::get_digest(byte* out, const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-    pimpl_->mac_.Final(out);
-}
-
-// Fill out with RMD digest from previous updates
-void HMAC_RMD::get_digest(byte* out)
-{
-    pimpl_->mac_.Final(out);
-}
-
-
-// Update the current digest
-void HMAC_RMD::update(const byte* in, unsigned int sz)
-{
-    pimpl_->mac_.Update(in, sz);
-}
-
-
-struct DES::DESImpl {
-    TaoCrypt::DES_CBC_Encryption encryption;
-    TaoCrypt::DES_CBC_Decryption decryption;
-};
-
-
-DES::DES() : pimpl_(NEW_YS DESImpl) {}
-
-DES::~DES() { ysDelete(pimpl_); }
-
-
-void DES::set_encryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->encryption.SetKey(k, DES_KEY_SZ, iv);
-}
-
-
-void DES::set_decryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->decryption.SetKey(k, DES_KEY_SZ, iv);
-}
-
-// DES encrypt plain of length sz into cipher
-void DES::encrypt(byte* cipher, const byte* plain, unsigned int sz)
-{
-    pimpl_->encryption.Process(cipher, plain, sz);
-}
-
-
-// DES decrypt cipher of length sz into plain
-void DES::decrypt(byte* plain, const byte* cipher, unsigned int sz)
-{
-    pimpl_->decryption.Process(plain, cipher, sz);
-}
-
-
-struct DES_EDE::DES_EDEImpl {
-    TaoCrypt::DES_EDE3_CBC_Encryption encryption;
-    TaoCrypt::DES_EDE3_CBC_Decryption decryption;
-};
-
-
-DES_EDE::DES_EDE() : pimpl_(NEW_YS DES_EDEImpl) {}
-
-DES_EDE::~DES_EDE() { ysDelete(pimpl_); }
-
-
-void DES_EDE::set_encryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->encryption.SetKey(k, DES_EDE_KEY_SZ, iv);
-}
-
-
-void DES_EDE::set_decryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->decryption.SetKey(k, DES_EDE_KEY_SZ, iv);
-}
-
-
-// 3DES encrypt plain of length sz into cipher
-void DES_EDE::encrypt(byte* cipher, const byte* plain, unsigned int sz)
-{
-    pimpl_->encryption.Process(cipher, plain, sz);
-}
-
-
-// 3DES decrypt cipher of length sz into plain
-void DES_EDE::decrypt(byte* plain, const byte* cipher, unsigned int sz)
-{
-    pimpl_->decryption.Process(plain, cipher, sz);
-}
-
-
-// Implementation of alledged RC4
-struct RC4::RC4Impl {
-    TaoCrypt::ARC4::Encryption encryption;
-    TaoCrypt::ARC4::Decryption decryption;
-};
-
-
-RC4::RC4() : pimpl_(NEW_YS RC4Impl) {}
-
-RC4::~RC4() { ysDelete(pimpl_); }
-
-
-void RC4::set_encryptKey(const byte* k, const byte*)
-{
-    pimpl_->encryption.SetKey(k, RC4_KEY_SZ);
-}
-
-
-void RC4::set_decryptKey(const byte* k, const byte*)
-{
-    pimpl_->decryption.SetKey(k, RC4_KEY_SZ);
-}
-
-
-// RC4 encrypt plain of length sz into cipher
-void RC4::encrypt(byte* cipher, const byte* plain, unsigned int sz)
-{
-    pimpl_->encryption.Process(cipher, plain, sz);
-}
-
-
-// RC4 decrypt cipher of length sz into plain
-void RC4::decrypt(byte* plain, const byte* cipher, unsigned int sz)
-{
-    pimpl_->decryption.Process(plain, cipher, sz);
-}
-
-
-
-// Implementation of AES
-struct AES::AESImpl {
-    TaoCrypt::AES_CBC_Encryption encryption;
-    TaoCrypt::AES_CBC_Decryption decryption;
-    unsigned int keySz_;
-
-    AESImpl(unsigned int ks) : keySz_(ks) {}
-};
-
-
-AES::AES(unsigned int ks) : pimpl_(NEW_YS AESImpl(ks)) {}
-
-AES::~AES() { ysDelete(pimpl_); }
-
-
-int AES::get_keySize() const
-{
-    return pimpl_->keySz_;
-}
-
-
-void AES::set_encryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->encryption.SetKey(k, pimpl_->keySz_, iv);
-}
-
-
-void AES::set_decryptKey(const byte* k, const byte* iv)
-{
-    pimpl_->decryption.SetKey(k, pimpl_->keySz_, iv);
-}
-
-
-// AES encrypt plain of length sz into cipher
-void AES::encrypt(byte* cipher, const byte* plain, unsigned int sz)
-{
-    pimpl_->encryption.Process(cipher, plain, sz);
-}
-
-
-// AES decrypt cipher of length sz into plain
-void AES::decrypt(byte* plain, const byte* cipher, unsigned int sz)
-{
-    pimpl_->decryption.Process(plain, cipher, sz);
-}
-
-
-struct RandomPool::RandomImpl {
-    TaoCrypt::RandomNumberGenerator RNG_;
-};
-
-RandomPool::RandomPool() : pimpl_(NEW_YS RandomImpl) {}
-
-RandomPool::~RandomPool() { ysDelete(pimpl_); }
-
-int RandomPool::GetError() const
-{
-    return pimpl_->RNG_.GetError(); 
-}
-
-void RandomPool::Fill(opaque* dst, uint sz) const
-{
-    pimpl_->RNG_.GenerateBlock(dst, sz);
-}
-
-
-// Implementation of DSS Authentication
-struct DSS::DSSImpl {
-    void SetPublic (const byte*, unsigned int);
-    void SetPrivate(const byte*, unsigned int);
-    TaoCrypt::DSA_PublicKey publicKey_;
-    TaoCrypt::DSA_PrivateKey privateKey_;
-};
-
-
-// Decode and store the public key
-void DSS::DSSImpl::SetPublic(const byte* key, unsigned int sz)
-{
-    TaoCrypt::Source source(key, sz);
-    publicKey_.Initialize(source);
-}
-
-
-// Decode and store the public key
-void DSS::DSSImpl::SetPrivate(const byte* key, unsigned int sz)
-{
-    TaoCrypt::Source source(key, sz);
-    privateKey_.Initialize(source);
-    publicKey_ = TaoCrypt::DSA_PublicKey(privateKey_);
-
-}
-
-
-// Set public or private key
-DSS::DSS(const byte* key, unsigned int sz, bool publicKey) 
-    : pimpl_(NEW_YS DSSImpl)
-{
-    if (publicKey) 
-        pimpl_->SetPublic(key, sz);
-    else
-        pimpl_->SetPrivate(key, sz);
-}
-
-
-DSS::~DSS()
-{
-    ysDelete(pimpl_);
-}
-
-
-uint DSS::get_signatureLength() const
-{
-    return pimpl_->publicKey_.SignatureLength();
-}
-
-
-// DSS Sign message of length sz into sig
-void DSS::sign(byte* sig,  const byte* sha_digest, unsigned int /* shaSz */,
-               const RandomPool& random)
-{
-    using namespace TaoCrypt;
-
-    DSA_Signer signer(pimpl_->privateKey_);
-    signer.Sign(sha_digest, sig, random.pimpl_->RNG_);
-}
-
-
-// DSS Verify message of length sz against sig, is it correct?
-bool DSS::verify(const byte* sha_digest, unsigned int /* shaSz */,
-                 const byte* sig, unsigned int /* sigSz */)
-{
-    using namespace TaoCrypt;
-
-    DSA_Verifier ver(pimpl_->publicKey_);
-    return ver.Verify(sha_digest, sig);
-}
-
-
-// Implementation of RSA key interface
-struct RSA::RSAImpl {
-    void SetPublic (const byte*, unsigned int);
-    void SetPrivate(const byte*, unsigned int);
-    TaoCrypt::RSA_PublicKey publicKey_;
-    TaoCrypt::RSA_PrivateKey privateKey_;
-};
-
-
-// Decode and store the public key
-void RSA::RSAImpl::SetPublic(const byte* key, unsigned int sz)
-{
-    TaoCrypt::Source source(key, sz);
-    publicKey_.Initialize(source);
-}
-
-
-// Decode and store the private key
-void RSA::RSAImpl::SetPrivate(const byte* key, unsigned int sz)
-{
-    TaoCrypt::Source source(key, sz);
-    privateKey_.Initialize(source);
-    publicKey_ = TaoCrypt::RSA_PublicKey(privateKey_);
-}
-
-
-// Set public or private key
-RSA::RSA(const byte* key, unsigned int sz, bool publicKey) 
-    : pimpl_(NEW_YS RSAImpl)
-{
-    if (publicKey) 
-        pimpl_->SetPublic(key, sz);
-    else
-        pimpl_->SetPrivate(key, sz);
-}
-
-RSA::~RSA()
-{
-    ysDelete(pimpl_);
-}
-
-
-// get cipher text length, varies on key size
-unsigned int RSA::get_cipherLength() const
-{
-    return pimpl_->publicKey_.FixedCiphertextLength();
-}
-
-
-// get signautre length, varies on key size
-unsigned int RSA::get_signatureLength() const
-{
-    return get_cipherLength();
-}
-
-
-// RSA Sign message of length sz into sig
-void RSA::sign(byte* sig,  const byte* message, unsigned int sz,
-               const RandomPool& random)
-{
-    TaoCrypt::RSAES_Decryptor dec(pimpl_->privateKey_);
-    dec.SSL_Sign(message, sz, sig, random.pimpl_->RNG_);
-}
-
-
-// RSA Verify message of length sz against sig
-bool RSA::verify(const byte* message, unsigned int sz, const byte* sig,
-                 unsigned int)
-{
-    TaoCrypt::RSAES_Encryptor enc(pimpl_->publicKey_);
-    return enc.SSL_Verify(message, sz, sig);
-}
-
-
-// RSA public encrypt plain of length sz into cipher
-void RSA::encrypt(byte* cipher, const byte* plain, unsigned int sz,
-                  const RandomPool& random)
-{
-  
-    TaoCrypt::RSAES_Encryptor enc(pimpl_->publicKey_);
-    enc.Encrypt(plain, sz, cipher, random.pimpl_->RNG_);
-}
-
-
-// RSA private decrypt cipher of length sz into plain
-void RSA::decrypt(byte* plain, const byte* cipher, unsigned int sz,
-                  const RandomPool& random)
-{
-    TaoCrypt::RSAES_Decryptor dec(pimpl_->privateKey_);
-    dec.Decrypt(cipher, sz, plain, random.pimpl_->RNG_);
-}
-
-
-struct Integer::IntegerImpl {
-    TaoCrypt::Integer int_;
-
-    IntegerImpl() {}
-    explicit IntegerImpl(const TaoCrypt::Integer& i) : int_(i) {}
-};
-
-Integer::Integer() : pimpl_(NEW_YS IntegerImpl) {}
-
-Integer::~Integer() { ysDelete(pimpl_); }
-
-
-
-Integer::Integer(const Integer& other) : pimpl_(NEW_YS 
-                                               IntegerImpl(other.pimpl_->int_))
-{}
-
-
-Integer& Integer::operator=(const Integer& that)
-{
-    pimpl_->int_ = that.pimpl_->int_;
-
-    return *this;
-}
-
-
-void Integer::assign(const byte* num, unsigned int sz)
-{
-    pimpl_->int_ = TaoCrypt::Integer(num, sz);
-}
-
-
-struct DiffieHellman::DHImpl {
-    TaoCrypt::DH                     dh_;
-    TaoCrypt::RandomNumberGenerator& ranPool_;
-    byte* publicKey_;
-    byte* privateKey_;
-    byte* agreedKey_;
-    uint  pubKeyLength_;
-
-    DHImpl(TaoCrypt::RandomNumberGenerator& r) : ranPool_(r), publicKey_(0),
-                              privateKey_(0), agreedKey_(0), pubKeyLength_(0) {}
-    ~DHImpl() 
-    {   
-        ysArrayDelete(agreedKey_); 
-        ysArrayDelete(privateKey_); 
-        ysArrayDelete(publicKey_);
-    }
-
-    DHImpl(const DHImpl& that) : dh_(that.dh_), ranPool_(that.ranPool_),
-                  publicKey_(0), privateKey_(0), agreedKey_(0), pubKeyLength_(0)
-    {
-        uint length = dh_.GetByteLength();
-        AllocKeys(length, length, length);
-    }
-
-    void AllocKeys(unsigned int pubSz, unsigned int privSz, unsigned int agrSz)
-    {
-        publicKey_  = NEW_YS byte[pubSz];
-        privateKey_ = NEW_YS byte[privSz];
-        agreedKey_  = NEW_YS byte[agrSz];
-    }
-};
-
-
-
-/*
-// server Side DH, server's view
-DiffieHellman::DiffieHellman(const char* file, const RandomPool& random)
-    : pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
-{
-    using namespace TaoCrypt;
-    Source source;
-    FileSource(file, source);
-    if (source.size() == 0)
-        return; // TODO add error state, and force check
-    HexDecoder hd(source);
-
-    pimpl_->dh_.Initialize(source);
-
-    uint length = pimpl_->dh_.GetByteLength();
-
-    pimpl_->AllocKeys(length, length, length);
-    pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
-                                                  pimpl_->publicKey_);
-}
-*/
-
-
-// server Side DH, client's view
-DiffieHellman::DiffieHellman(const byte* p, unsigned int pSz, const byte* g,
-                             unsigned int gSz, const byte* pub,
-                             unsigned int pubSz, const RandomPool& random)
-    : pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
-{
-    using TaoCrypt::Integer;
-
-    pimpl_->dh_.Initialize(Integer(p, pSz).Ref(), Integer(g, gSz).Ref());
-    pimpl_->publicKey_ = NEW_YS opaque[pimpl_->pubKeyLength_ = pubSz];
-    memcpy(pimpl_->publicKey_, pub, pubSz);
-}
-
-
-// Server Side DH, server's view
-DiffieHellman::DiffieHellman(const Integer& p, const Integer& g,
-                             const RandomPool& random)
-: pimpl_(NEW_YS DHImpl(random.pimpl_->RNG_))
-{
-    using TaoCrypt::Integer;
-
-    pimpl_->dh_.Initialize(p.pimpl_->int_, g.pimpl_->int_);
-
-    uint length = pimpl_->dh_.GetByteLength();
-
-    pimpl_->AllocKeys(length, length, length);
-    pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
-                                                  pimpl_->publicKey_);
-}
-
-DiffieHellman::~DiffieHellman() { ysDelete(pimpl_); }
-
-
-// Client side and view, use server that for p and g
-DiffieHellman::DiffieHellman(const DiffieHellman& that) 
-    : pimpl_(NEW_YS DHImpl(*that.pimpl_))
-{   
-    pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
-                                                  pimpl_->publicKey_);
-}
-
-
-DiffieHellman& DiffieHellman::operator=(const DiffieHellman& that)
-{
-    pimpl_->dh_ = that.pimpl_->dh_;
-    pimpl_->dh_.GenerateKeyPair(pimpl_->ranPool_, pimpl_->privateKey_,
-                                                  pimpl_->publicKey_);
-    return *this;
-}
-
-
-void DiffieHellman::makeAgreement(const byte* other, unsigned int otherSz)
-{
-    pimpl_->dh_.Agree(pimpl_->agreedKey_, pimpl_->privateKey_, other, otherSz); 
-}
-
-
-uint DiffieHellman::get_agreedKeyLength() const
-{
-    return pimpl_->dh_.GetByteLength();
-}
-
-
-const byte* DiffieHellman::get_agreedKey() const
-{
-    return pimpl_->agreedKey_;
-}
-
-uint DiffieHellman::get_publicKeyLength() const
-{
-    return pimpl_->pubKeyLength_;
-}
-
-const byte* DiffieHellman::get_publicKey() const
-{
-    return pimpl_->publicKey_;
-}
-
-
-void DiffieHellman::set_sizes(int& pSz, int& gSz, int& pubSz) const
-{
-    using TaoCrypt::Integer;
-    Integer p = pimpl_->dh_.GetP();
-    Integer g = pimpl_->dh_.GetG();
-
-    pSz   = p.ByteCount();
-    gSz   = g.ByteCount();
-    pubSz = pimpl_->dh_.GetByteLength();
-}
-
-
-void DiffieHellman::get_parms(byte* bp, byte* bg, byte* bpub) const
-{
-    using TaoCrypt::Integer;
-    Integer p = pimpl_->dh_.GetP();
-    Integer g = pimpl_->dh_.GetG();
-
-    p.Encode(bp, p.ByteCount());
-    g.Encode(bg, g.ByteCount());
-    memcpy(bpub, pimpl_->publicKey_, pimpl_->dh_.GetByteLength());
-}
-
-
-// convert PEM file to DER x509 type
-x509* PemToDer(FILE* file, CertType type, EncryptedInfo* info)
-{
-    using namespace TaoCrypt;
-
-    char header[80];
-    char footer[80];
-
-    if (type == Cert) {
-        strncpy(header, "-----BEGIN CERTIFICATE-----", sizeof(header));
-        strncpy(footer, "-----END CERTIFICATE-----", sizeof(footer));
-    } else {
-        strncpy(header, "-----BEGIN RSA PRIVATE KEY-----", sizeof(header));
-        strncpy(footer, "-----END RSA PRIVATE KEY-----", sizeof(header));
-    }
-
-    long begin = -1;
-    long end   = 0;
-    bool foundEnd = false;
-
-    char line[80];
-
-    while(fgets(line, sizeof(line), file))
-        if (strncmp(header, line, strlen(header)) == 0) {
-            begin = ftell(file);
-            break;
-        }
-
-    // remove encrypted header if there
-    if (fgets(line, sizeof(line), file)) {
-        char encHeader[] = "Proc-Type";
-        if (strncmp(encHeader, line, strlen(encHeader)) == 0 &&
-            fgets(line,sizeof(line), file)) {
-
-            char* start  = strstr(line, "DES");
-            char* finish = strstr(line, ",");
-            if (!start)
-                start    = strstr(line, "AES");
-
-            if (!info) return 0;
-
-            if ( start && finish && (start < finish)) {
-                memcpy(info->name, start, finish - start);
-                info->name[finish - start] = 0;
-                memcpy(info->iv, finish + 1, sizeof(info->iv));
-
-                char* newline = strstr(line, "\r");
-                if (!newline) newline = strstr(line, "\n");
-                if (newline && (newline > finish)) {
-                    info->ivSz = newline - (finish + 1);
-                    info->set = true;
-                }
-            }
-            begin = ftell(file);
-            if (fgets(line,sizeof(line), file)) // get blank line
-              begin = ftell(file);
-        }
-          
-    }
-
-    while(fgets(line, sizeof(line), file))
-        if (strncmp(footer, line, strlen(footer)) == 0) {
-            foundEnd = true;
-            break;
-        }
-        else
-            end = ftell(file);
-
-    if (begin == -1 || !foundEnd)
-        return 0;
-
-    input_buffer tmp(end - begin);
-    fseek(file, begin, SEEK_SET);
-    size_t bytes = fread(tmp.get_buffer(), end - begin, 1, file);
-    if (bytes != 1)
-        return 0;
-    
-    Source der(tmp.get_buffer(), end - begin);
-    Base64Decoder b64Dec(der);
-
-    uint sz = der.size();
-    mySTL::auto_ptr<x509> x(NEW_YS x509(sz));
-    memcpy(x->use_buffer(), der.get_buffer(), sz);
-
-    return x.release();
-}
-
-
-} // namespace
-
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-namespace yaSSL {
-template void ysDelete<DiffieHellman::DHImpl>(DiffieHellman::DHImpl*);
-template void ysDelete<Integer::IntegerImpl>(Integer::IntegerImpl*);
-template void ysDelete<RSA::RSAImpl>(RSA::RSAImpl*);
-template void ysDelete<DSS::DSSImpl>(DSS::DSSImpl*);
-template void ysDelete<RandomPool::RandomImpl>(RandomPool::RandomImpl*);
-template void ysDelete<AES::AESImpl>(AES::AESImpl*);
-template void ysDelete<RC4::RC4Impl>(RC4::RC4Impl*);
-template void ysDelete<DES_EDE::DES_EDEImpl>(DES_EDE::DES_EDEImpl*);
-template void ysDelete<DES::DESImpl>(DES::DESImpl*);
-template void ysDelete<HMAC_RMD::HMAC_RMDImpl>(HMAC_RMD::HMAC_RMDImpl*);
-template void ysDelete<HMAC_SHA::HMAC_SHAImpl>(HMAC_SHA::HMAC_SHAImpl*);
-template void ysDelete<HMAC_MD5::HMAC_MD5Impl>(HMAC_MD5::HMAC_MD5Impl*);
-template void ysDelete<RMD::RMDImpl>(RMD::RMDImpl*);
-template void ysDelete<SHA::SHAImpl>(SHA::SHAImpl*);
-template void ysDelete<MD5::MD5Impl>(MD5::MD5Impl*);
-}
-#endif // HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-
-#endif // !USE_CRYPTOPP_LIB
diff --git a/extra/yassl/src/dummy.cpp b/extra/yassl/src/dummy.cpp
deleted file mode 100644
index 19b7fe887cd6..000000000000
--- a/extra/yassl/src/dummy.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
-  To make libtool always use a C++ linker when compiling with yaSSL we need
-  to add a dummy C++ file to the source list.
-*/
diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp
deleted file mode 100644
index 91cc4077827b..000000000000
--- a/extra/yassl/src/handshake.cpp
+++ /dev/null
@@ -1,1190 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* The handshake source implements functions for creating and reading
- * the various handshake messages.
- */
-
-
-
-#include "runtime.hpp"
-#include "handshake.hpp"
-#include "yassl_int.hpp"
-
-
-namespace yaSSL {
-
-
-
-// Build a client hello message from cipher suites and compression method
-void buildClientHello(SSL& ssl, ClientHello& hello)
-{
-    // store for pre master secret
-    ssl.useSecurity().use_connection().chVersion_ = hello.client_version_;
-
-    ssl.getCrypto().get_random().Fill(hello.random_, RAN_LEN);
-    if (ssl.getSecurity().get_resuming()) {
-        hello.id_len_ = ID_LEN;
-        memcpy(hello.session_id_, ssl.getSecurity().get_resume().GetID(),
-               ID_LEN);
-    }
-    else 
-        hello.id_len_ = 0;
-    hello.suite_len_ = ssl.getSecurity().get_parms().suites_size_;
-    memcpy(hello.cipher_suites_, ssl.getSecurity().get_parms().suites_,
-           hello.suite_len_);
-    hello.comp_len_ = 1;
-
-    hello.set_length(sizeof(ProtocolVersion) +
-                     RAN_LEN +
-                     hello.id_len_    + sizeof(hello.id_len_) +
-                     hello.suite_len_ + sizeof(hello.suite_len_) +
-                     hello.comp_len_  + sizeof(hello.comp_len_));
-}
-
-
-// Build a server hello message
-void buildServerHello(SSL& ssl, ServerHello& hello)
-{
-    if (ssl.getSecurity().get_resuming()) {
-        memcpy(hello.random_,ssl.getSecurity().get_connection().server_random_,
-               RAN_LEN);
-        memcpy(hello.session_id_, ssl.getSecurity().get_resume().GetID(),
-               ID_LEN);
-    }
-    else {
-        ssl.getCrypto().get_random().Fill(hello.random_, RAN_LEN);
-        ssl.getCrypto().get_random().Fill(hello.session_id_, ID_LEN);
-    }
-    hello.id_len_ = ID_LEN;
-    ssl.set_sessionID(hello.session_id_);
-
-    hello.cipher_suite_[0] = ssl.getSecurity().get_parms().suite_[0];
-    hello.cipher_suite_[1] = ssl.getSecurity().get_parms().suite_[1];
-    hello.compression_method_ = hello.compression_method_;
-
-    hello.set_length(sizeof(ProtocolVersion) + RAN_LEN + ID_LEN +
-                     sizeof(hello.id_len_) + SUITE_LEN + SIZEOF_ENUM);
-}
-
-
-// add handshake from buffer into md5 and sha hashes, use handshake header
-void hashHandShake(SSL& ssl, const input_buffer& input, uint sz)
-{
-    const opaque* buffer = input.get_buffer() + input.get_current() - 
-                           HANDSHAKE_HEADER;
-    sz += HANDSHAKE_HEADER;
-    ssl.useHashes().use_MD5().update(buffer, sz);
-    ssl.useHashes().use_SHA().update(buffer, sz);
-}
-
-
-// locals
-namespace {
-
-// Write a plaintext record to buffer
-void buildOutput(output_buffer& buffer, const RecordLayerHeader& rlHdr, 
-                 const Message& msg)
-{
-    buffer.allocate(RECORD_HEADER + rlHdr.length_);
-    buffer << rlHdr << msg;
-}
-
-
-// Write a plaintext record to buffer
-void buildOutput(output_buffer& buffer, const RecordLayerHeader& rlHdr, 
-                 const HandShakeHeader& hsHdr, const HandShakeBase& shake)
-{
-    buffer.allocate(RECORD_HEADER + rlHdr.length_);
-    buffer << rlHdr << hsHdr << shake;
-}
-
-
-// Build Record Layer header for Message without handshake header
-void buildHeader(SSL& ssl, RecordLayerHeader& rlHeader, const Message& msg)
-{
-    ProtocolVersion pv = ssl.getSecurity().get_connection().version_;
-    rlHeader.type_ = msg.get_type();
-    rlHeader.version_.major_ = pv.major_;
-    rlHeader.version_.minor_ = pv.minor_;
-    rlHeader.length_ = msg.get_length();
-}
-
-
-// Build HandShake and RecordLayer Headers for handshake output
-void buildHeaders(SSL& ssl, HandShakeHeader& hsHeader,
-                  RecordLayerHeader& rlHeader, const HandShakeBase& shake)
-{
-    int sz = shake.get_length();
-
-    hsHeader.set_type(shake.get_type());
-    hsHeader.set_length(sz);
-
-    ProtocolVersion pv = ssl.getSecurity().get_connection().version_;
-    rlHeader.type_ = handshake;
-    rlHeader.version_.major_ = pv.major_;
-    rlHeader.version_.minor_ = pv.minor_;
-    rlHeader.length_ = sz + HANDSHAKE_HEADER;
-}
-
-
-// add handshake from buffer into md5 and sha hashes, exclude record header
-void hashHandShake(SSL& ssl, const output_buffer& output, bool removeIV = false)
-{
-    uint sz = output.get_size() - RECORD_HEADER;
-
-    const opaque* buffer = output.get_buffer() + RECORD_HEADER;
-
-    if (removeIV) {  // TLSv1_1 IV
-        uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
-        sz     -= blockSz;
-        buffer += blockSz;
-    }
-
-    ssl.useHashes().use_MD5().update(buffer, sz);
-    ssl.useHashes().use_SHA().update(buffer, sz);
-}
-
-
-// calculate MD5 hash for finished
-void buildMD5(SSL& ssl, Finished& fin, const opaque* sender)
-{
-
-    opaque md5_result[MD5_LEN];
-    opaque md5_inner[SIZEOF_SENDER + SECRET_LEN + PAD_MD5];
-    opaque md5_outer[SECRET_LEN + PAD_MD5 + MD5_LEN];
-
-    const opaque* master_secret = 
-        ssl.getSecurity().get_connection().master_secret_;
-
-    // make md5 inner
-    memcpy(md5_inner, sender, SIZEOF_SENDER);
-    memcpy(&md5_inner[SIZEOF_SENDER], master_secret, SECRET_LEN);
-    memcpy(&md5_inner[SIZEOF_SENDER + SECRET_LEN], PAD1, PAD_MD5);
-
-    ssl.useHashes().use_MD5().get_digest(md5_result, md5_inner,
-                                         sizeof(md5_inner));
-
-    // make md5 outer
-    memcpy(md5_outer, master_secret, SECRET_LEN);
-    memcpy(&md5_outer[SECRET_LEN], PAD2, PAD_MD5);
-    memcpy(&md5_outer[SECRET_LEN + PAD_MD5], md5_result, MD5_LEN);
-
-    ssl.useHashes().use_MD5().get_digest(fin.set_md5(), md5_outer,
-                                         sizeof(md5_outer));
-}
-
-
-// calculate SHA hash for finished
-void buildSHA(SSL& ssl, Finished& fin, const opaque* sender)
-{
-    
-    opaque sha_result[SHA_LEN];
-    opaque sha_inner[SIZEOF_SENDER + SECRET_LEN + PAD_SHA];
-    opaque sha_outer[SECRET_LEN + PAD_SHA + SHA_LEN];
-
-    const opaque* master_secret = 
-        ssl.getSecurity().get_connection().master_secret_;
-
-     // make sha inner
-    memcpy(sha_inner, sender, SIZEOF_SENDER);
-    memcpy(&sha_inner[SIZEOF_SENDER], master_secret, SECRET_LEN);
-    memcpy(&sha_inner[SIZEOF_SENDER + SECRET_LEN], PAD1, PAD_SHA);
-
-    ssl.useHashes().use_SHA().get_digest(sha_result, sha_inner,
-                                         sizeof(sha_inner));
-
-    // make sha outer
-    memcpy(sha_outer, master_secret, SECRET_LEN);
-    memcpy(&sha_outer[SECRET_LEN], PAD2, PAD_SHA);
-    memcpy(&sha_outer[SECRET_LEN + PAD_SHA], sha_result, SHA_LEN);
-
-    ssl.useHashes().use_SHA().get_digest(fin.set_sha(), sha_outer,
-                                         sizeof(sha_outer));
-}
-
-
-// sanity checks on encrypted message size
-static int sanity_check_message(SSL& ssl, uint msgSz)
-{
-    uint minSz = 0;
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-        uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
-        if (msgSz % blockSz)
-            return -1;
-
-        minSz = ssl.getSecurity().get_parms().hash_size_ + 1;  // pad byte too
-        if (blockSz > minSz)
-            minSz = blockSz;
-
-        if (ssl.isTLSv1_1())
-            minSz += blockSz;   // explicit IV
-    }
-    else {      // stream
-        minSz = ssl.getSecurity().get_parms().hash_size_;
-    }
-
-    if (msgSz < minSz)
-        return -1;
-
-    return 0;
-}
-
-
-// decrypt input message in place, store size in case needed later
-void decrypt_message(SSL& ssl, input_buffer& input, uint sz)
-{
-    input_buffer plain(sz);
-    opaque*      cipher = input.get_buffer() + input.get_current();
-
-    if (sanity_check_message(ssl, sz) != 0) {
-        ssl.SetError(sanityCipher_error);
-        return;
-    }
-
-    ssl.useCrypto().use_cipher().decrypt(plain.get_buffer(), cipher, sz);
-    memcpy(cipher, plain.get_buffer(), sz);
-    ssl.useSecurity().use_parms().encrypt_size_ = sz;
-
-    if (ssl.isTLSv1_1())  // IV
-        input.set_current(input.get_current() +
-              ssl.getCrypto().get_cipher().get_blockSize());
-}
-
-
-// output operator for input_buffer
-output_buffer& operator<<(output_buffer& output, const input_buffer& input)
-{
-    output.write(input.get_buffer(), input.get_size());
-    return output;
-}
-
-
-// write headers, handshake hash, mac, pad, and encrypt
-void cipherFinished(SSL& ssl, Finished& fin, output_buffer& output)
-{
-    uint digestSz = ssl.getCrypto().get_digest().get_digestSize();
-    uint finishedSz = ssl.isTLS() ? TLS_FINISHED_SZ : FINISHED_SZ;
-    uint sz  = RECORD_HEADER + HANDSHAKE_HEADER + finishedSz + digestSz;
-    uint pad = 0;
-    uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-        if (ssl.isTLSv1_1())
-            sz += blockSz;            // IV
-        sz += 1;       // pad byte
-        pad = (sz - RECORD_HEADER) % blockSz;
-        pad = blockSz - pad;
-        sz += pad;
-    }
-
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    buildHeaders(ssl, hsHeader, rlHeader, fin);
-    rlHeader.length_ = sz - RECORD_HEADER;   // record header includes mac
-                                             // and pad, hanshake doesn't
-    input_buffer iv;
-    if (ssl.isTLSv1_1() && ssl.getSecurity().get_parms().cipher_type_== block){
-        iv.allocate(blockSz);
-        ssl.getCrypto().get_random().Fill(iv.get_buffer(), blockSz);
-        iv.add_size(blockSz);
-    }
-    uint ivSz = iv.get_size();
-    output.allocate(sz);
-    output << rlHeader << iv << hsHeader << fin;
-    
-    hashHandShake(ssl, output, ssl.isTLSv1_1() ? true : false);
-    opaque digest[SHA_LEN];                  // max size
-    if (ssl.isTLS())
-        TLS_hmac(ssl, digest, output.get_buffer() + RECORD_HEADER + ivSz,
-                 output.get_size() - RECORD_HEADER - ivSz, handshake);
-    else
-        hmac(ssl, digest, output.get_buffer() + RECORD_HEADER,
-             output.get_size() - RECORD_HEADER, handshake);
-    output.write(digest, digestSz);
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block)
-        for (uint i = 0; i <= pad; i++) output[AUTO] = pad;   // pad byte gets
-                                                              // pad value too
-    input_buffer cipher(rlHeader.length_);
-    ssl.useCrypto().use_cipher().encrypt(cipher.get_buffer(),
-       output.get_buffer() + RECORD_HEADER, output.get_size() - RECORD_HEADER);
-    output.set_current(RECORD_HEADER);
-    output.write(cipher.get_buffer(), cipher.get_capacity());
-}
-
-
-// build an encrypted data or alert message for output
-void buildMessage(SSL& ssl, output_buffer& output, const Message& msg)
-{
-    uint digestSz = ssl.getCrypto().get_digest().get_digestSize();
-    uint sz  = RECORD_HEADER + msg.get_length() + digestSz;                
-    uint pad = 0;
-    uint blockSz = ssl.getCrypto().get_cipher().get_blockSize();
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-        if (ssl.isTLSv1_1())  // IV
-            sz += blockSz;
-        sz += 1;       // pad byte
-        pad = (sz - RECORD_HEADER) % blockSz;
-        pad = blockSz - pad;
-        sz += pad;
-    }
-
-    RecordLayerHeader rlHeader;
-    buildHeader(ssl, rlHeader, msg);
-    rlHeader.length_ = sz - RECORD_HEADER;   // record header includes mac
-                                             // and pad, hanshake doesn't
-    input_buffer iv;
-    if (ssl.isTLSv1_1() && ssl.getSecurity().get_parms().cipher_type_== block){
-        iv.allocate(blockSz);
-        ssl.getCrypto().get_random().Fill(iv.get_buffer(), blockSz);
-        iv.add_size(blockSz);
-    }
-    
-    uint ivSz = iv.get_size();
-    output.allocate(sz);
-    output << rlHeader << iv << msg;
-    
-    opaque digest[SHA_LEN];                  // max size
-    if (ssl.isTLS())
-        TLS_hmac(ssl, digest, output.get_buffer() + RECORD_HEADER + ivSz,
-                 output.get_size() - RECORD_HEADER - ivSz, msg.get_type());
-    else
-        hmac(ssl, digest, output.get_buffer() + RECORD_HEADER,
-             output.get_size() - RECORD_HEADER, msg.get_type());
-    output.write(digest, digestSz);
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block)
-        for (uint i = 0; i <= pad; i++) output[AUTO] = pad; // pad byte gets
-                                                              // pad value too
-    input_buffer cipher(rlHeader.length_);
-    ssl.useCrypto().use_cipher().encrypt(cipher.get_buffer(),
-       output.get_buffer() + RECORD_HEADER, output.get_size() - RECORD_HEADER);
-    output.set_current(RECORD_HEADER);
-    output.write(cipher.get_buffer(), cipher.get_capacity());
-}
-
-
-// build alert message
-void buildAlert(SSL& ssl, output_buffer& output, const Alert& alert)
-{
-    if (ssl.getSecurity().get_parms().pending_ == false) // encrypted
-        buildMessage(ssl, output, alert);
-    else {
-        RecordLayerHeader rlHeader;
-        buildHeader(ssl, rlHeader, alert);
-        buildOutput(output, rlHeader, alert);
-    }
-}
-
-
-// build TLS finished message
-void buildFinishedTLS(SSL& ssl, Finished& fin, const opaque* sender) 
-{
-    opaque handshake_hash[FINISHED_SZ];
-
-    ssl.useHashes().use_MD5().get_digest(handshake_hash);
-    ssl.useHashes().use_SHA().get_digest(&handshake_hash[MD5_LEN]);
-
-    const opaque* side;
-    if ( strncmp((const char*)sender, (const char*)client, SIZEOF_SENDER) == 0)
-        side = tls_client;
-    else
-        side = tls_server;
-
-    PRF(fin.set_md5(), TLS_FINISHED_SZ, 
-        ssl.getSecurity().get_connection().master_secret_, SECRET_LEN, 
-        side, FINISHED_LABEL_SZ, 
-        handshake_hash, FINISHED_SZ);
-
-    fin.set_length(TLS_FINISHED_SZ);  // shorter length for TLS
-}
-
-
-// compute p_hash for MD5 or SHA-1 for TLSv1 PRF
-void p_hash(output_buffer& result, const output_buffer& secret,
-            const output_buffer& seed, MACAlgorithm hash)
-{
-    uint   len = hash == md5 ? MD5_LEN : SHA_LEN;
-    uint   times = result.get_capacity() / len;
-    uint   lastLen = result.get_capacity() % len;
-    opaque previous[SHA_LEN];  // max size
-    opaque current[SHA_LEN];   // max size
-    mySTL::auto_ptr<Digest> hmac;
-
-    if (lastLen) times += 1;
-
-    if (hash == md5)
-        hmac.reset(NEW_YS HMAC_MD5(secret.get_buffer(), secret.get_size()));
-    else
-        hmac.reset(NEW_YS HMAC_SHA(secret.get_buffer(), secret.get_size()));
-                                                                   // A0 = seed
-    hmac->get_digest(previous, seed.get_buffer(), seed.get_size());// A1
-    uint lastTime = times - 1;
-
-    for (uint i = 0; i < times; i++) {
-        hmac->update(previous, len);  
-        hmac->get_digest(current, seed.get_buffer(), seed.get_size());
-
-        if (lastLen && (i == lastTime))
-            result.write(current, lastLen);
-        else {
-            result.write(current, len);
-            //memcpy(previous, current, len);
-            hmac->get_digest(previous, previous, len);
-        }
-    }
-}
-
-
-// calculate XOR for TLSv1 PRF
-void get_xor(byte *digest, uint digLen, output_buffer& md5,
-             output_buffer& sha)
-{
-    for (uint i = 0; i < digLen; i++) 
-        digest[i] = md5[AUTO] ^ sha[AUTO];
-}
-
-
-// build MD5 part of certificate verify
-void buildMD5_CertVerify(SSL& ssl, byte* digest)
-{
-    opaque md5_result[MD5_LEN];
-    opaque md5_inner[SECRET_LEN + PAD_MD5];
-    opaque md5_outer[SECRET_LEN + PAD_MD5 + MD5_LEN];
-
-    const opaque* master_secret = 
-        ssl.getSecurity().get_connection().master_secret_;
-
-    // make md5 inner
-    memcpy(md5_inner, master_secret, SECRET_LEN);
-    memcpy(&md5_inner[SECRET_LEN], PAD1, PAD_MD5);
-
-    ssl.useHashes().use_MD5().get_digest(md5_result, md5_inner,
-                                         sizeof(md5_inner));
-
-    // make md5 outer
-    memcpy(md5_outer, master_secret, SECRET_LEN);
-    memcpy(&md5_outer[SECRET_LEN], PAD2, PAD_MD5);
-    memcpy(&md5_outer[SECRET_LEN + PAD_MD5], md5_result, MD5_LEN);
-
-    ssl.useHashes().use_MD5().get_digest(digest, md5_outer, sizeof(md5_outer));
-}
-
-
-// build SHA part of certificate verify
-void buildSHA_CertVerify(SSL& ssl, byte* digest)
-{
-    opaque sha_result[SHA_LEN];
-    opaque sha_inner[SECRET_LEN + PAD_SHA];
-    opaque sha_outer[SECRET_LEN + PAD_SHA + SHA_LEN];
-
-    const opaque* master_secret = 
-        ssl.getSecurity().get_connection().master_secret_;
-
-     // make sha inner
-    memcpy(sha_inner, master_secret, SECRET_LEN);
-    memcpy(&sha_inner[SECRET_LEN], PAD1, PAD_SHA);
-
-    ssl.useHashes().use_SHA().get_digest(sha_result, sha_inner,
-                                         sizeof(sha_inner));
-
-    // make sha outer
-    memcpy(sha_outer, master_secret, SECRET_LEN);
-    memcpy(&sha_outer[SECRET_LEN], PAD2, PAD_SHA);
-    memcpy(&sha_outer[SECRET_LEN + PAD_SHA], sha_result, SHA_LEN);
-
-    ssl.useHashes().use_SHA().get_digest(digest, sha_outer, sizeof(sha_outer));
-}
-
-
-} // namespace for locals
-
-
-// some clients still send sslv2 client hello
-void ProcessOldClientHello(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error() || input.get_remaining() < 2) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    byte b0 = input[AUTO];
-    byte b1 = input[AUTO];
-
-    uint16 sz = ((b0 & 0x7f) << 8) | b1;
-
-    if (sz > input.get_remaining()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // hashHandShake manually
-    const opaque* buffer = input.get_buffer() + input.get_current();
-    ssl.useHashes().use_MD5().update(buffer, sz);
-    ssl.useHashes().use_SHA().update(buffer, sz);
-
-    b1 = input[AUTO];  // does this value mean client_hello?
-
-    ClientHello ch;
-    ch.client_version_.major_ = input[AUTO];
-    ch.client_version_.minor_ = input[AUTO];
-
-    byte len[2];
-
-    len[0] = input[AUTO];
-    len[1] = input[AUTO];
-    ato16(len, ch.suite_len_);
-
-    len[0] = input[AUTO];
-    len[1] = input[AUTO];
-    uint16 sessionLen;
-    ato16(len, sessionLen);
-    ch.id_len_ = sessionLen;
-
-    len[0] = input[AUTO];
-    len[1] = input[AUTO];
-    uint16 randomLen;
-    ato16(len, randomLen);
-
-    if (input.get_error() || ch.suite_len_ > MAX_SUITE_SZ ||
-                             ch.suite_len_ > input.get_remaining() ||
-                             sessionLen > ID_LEN || randomLen > RAN_LEN) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    int j = 0;
-    for (uint16 i = 0; i < ch.suite_len_; i += 3) {    
-        byte first = input[AUTO];
-        if (first)  // sslv2 type
-            input.read(len, SUITE_LEN); // skip
-        else {
-            input.read(&ch.cipher_suites_[j], SUITE_LEN);
-            j += SUITE_LEN;
-        }
-    }
-    ch.suite_len_ = j;
-
-    if (ch.id_len_)
-        input.read(ch.session_id_, ch.id_len_);   // id_len_ from sessionLen
-
-    if (randomLen < RAN_LEN)
-        memset(ch.random_, 0, RAN_LEN - randomLen);
-    input.read(&ch.random_[RAN_LEN - randomLen], randomLen);
- 
-    ch.Process(input, ssl);
-}
-
-
-// Build a finished message, see 7.6.9
-void buildFinished(SSL& ssl, Finished& fin, const opaque* sender) 
-{
-    // store current states, building requires get_digest which resets state
-    MD5 md5(ssl.getHashes().get_MD5());
-    SHA sha(ssl.getHashes().get_SHA());
-
-    if (ssl.isTLS())
-        buildFinishedTLS(ssl, fin, sender);
-    else {
-        buildMD5(ssl, fin, sender);
-        buildSHA(ssl, fin, sender);
-    }
-
-    // restore
-    ssl.useHashes().use_MD5() = md5;
-    ssl.useHashes().use_SHA() = sha;
-}
-
-
-/* compute SSLv3 HMAC into digest see
- * buffer is of sz size and includes HandShake Header but not a Record Header
- * verify means to check peers hmac
-*/
-void hmac(SSL& ssl, byte* digest, const byte* buffer, uint sz,
-          ContentType content, bool verify)
-{
-    Digest& mac = ssl.useCrypto().use_digest();
-    opaque inner[SHA_LEN + PAD_MD5 + SEQ_SZ + SIZEOF_ENUM + LENGTH_SZ];
-    opaque outer[SHA_LEN + PAD_MD5 + SHA_LEN]; 
-    opaque result[SHA_LEN];                              // max possible sizes
-    uint digestSz = mac.get_digestSize();              // actual sizes
-    uint padSz    = mac.get_padSize();
-    uint innerSz  = digestSz + padSz + SEQ_SZ + SIZEOF_ENUM + LENGTH_SZ;
-    uint outerSz  = digestSz + padSz + digestSz;
-
-    // data
-    const opaque* mac_secret = ssl.get_macSecret(verify);
-    opaque seq[SEQ_SZ] = { 0x00, 0x00, 0x00, 0x00 };
-    opaque length[LENGTH_SZ];
-    c16toa(sz, length);
-    c32toa(ssl.get_SEQIncrement(verify), &seq[sizeof(uint32)]);
-
-    // make inner
-    memcpy(inner, mac_secret, digestSz);
-    memcpy(&inner[digestSz], PAD1, padSz);
-    memcpy(&inner[digestSz + padSz], seq, SEQ_SZ);
-    inner[digestSz + padSz + SEQ_SZ] = content;
-    memcpy(&inner[digestSz + padSz + SEQ_SZ + SIZEOF_ENUM], length, LENGTH_SZ);
-
-    mac.update(inner, innerSz);
-    mac.get_digest(result, buffer, sz);      // append content buffer
-
-    // make outer
-    memcpy(outer, mac_secret, digestSz);
-    memcpy(&outer[digestSz], PAD2, padSz);
-    memcpy(&outer[digestSz + padSz], result, digestSz);
-
-    mac.get_digest(digest, outer, outerSz);
-}
-
-
-// TLS type HAMC
-void TLS_hmac(SSL& ssl, byte* digest, const byte* buffer, uint sz,
-              ContentType content, bool verify)
-{
-    mySTL::auto_ptr<Digest> hmac;
-    opaque seq[SEQ_SZ] = { 0x00, 0x00, 0x00, 0x00 };
-    opaque length[LENGTH_SZ];
-    opaque inner[SIZEOF_ENUM + VERSION_SZ + LENGTH_SZ]; // type + version + len
-
-    c16toa(sz, length);
-    c32toa(ssl.get_SEQIncrement(verify), &seq[sizeof(uint32)]);
-
-    MACAlgorithm algo = ssl.getSecurity().get_parms().mac_algorithm_;
-
-    if (algo == sha)
-        hmac.reset(NEW_YS HMAC_SHA(ssl.get_macSecret(verify), SHA_LEN));
-    else if (algo == rmd)
-        hmac.reset(NEW_YS HMAC_RMD(ssl.get_macSecret(verify), RMD_LEN));
-    else
-        hmac.reset(NEW_YS HMAC_MD5(ssl.get_macSecret(verify), MD5_LEN));
-    
-    hmac->update(seq, SEQ_SZ);                                       // seq_num
-    inner[0] = content;                                              // type
-    inner[SIZEOF_ENUM] = ssl.getSecurity().get_connection().version_.major_;  
-    inner[SIZEOF_ENUM + SIZEOF_ENUM] = 
-        ssl.getSecurity().get_connection().version_.minor_;          // version
-    memcpy(&inner[SIZEOF_ENUM + VERSION_SZ], length, LENGTH_SZ);     // length
-    hmac->update(inner, sizeof(inner));
-    hmac->get_digest(digest, buffer, sz);                            // content
-}
-
-
-// compute TLSv1 PRF (pseudo random function using HMAC)
-void PRF(byte* digest, uint digLen, const byte* secret, uint secLen,
-         const byte* label, uint labLen, const byte* seed, uint seedLen)
-{
-    uint half = (secLen + 1) / 2;
-
-    output_buffer md5_half(half);
-    output_buffer sha_half(half);
-    output_buffer labelSeed(labLen + seedLen);
-
-    md5_half.write(secret, half);
-    sha_half.write(secret + half - secLen % 2, half);
-    labelSeed.write(label, labLen);
-    labelSeed.write(seed, seedLen);
-
-    output_buffer md5_result(digLen);
-    output_buffer sha_result(digLen);
-
-    p_hash(md5_result, md5_half, labelSeed, md5);
-    p_hash(sha_result, sha_half, labelSeed, sha);
-
-    md5_result.set_current(0);
-    sha_result.set_current(0);
-    get_xor(digest, digLen, md5_result, sha_result);
-}
-
-
-// build certificate hashes
-void build_certHashes(SSL& ssl, Hashes& hashes)
-{
-    // store current states, building requires get_digest which resets state
-    MD5 md5(ssl.getHashes().get_MD5());
-    SHA sha(ssl.getHashes().get_SHA());
-
-    if (ssl.isTLS()) {
-        ssl.useHashes().use_MD5().get_digest(hashes.md5_);
-        ssl.useHashes().use_SHA().get_digest(hashes.sha_);
-    }
-    else {
-        buildMD5_CertVerify(ssl, hashes.md5_);
-        buildSHA_CertVerify(ssl, hashes.sha_);
-    }
-
-    // restore
-    ssl.useHashes().use_MD5() = md5;
-    ssl.useHashes().use_SHA() = sha;
-}
-
-
-
-// do process input requests, return 0 is done, 1 is call again to complete
-int DoProcessReply(SSL& ssl)
-{
-    uint ready = ssl.getSocket().get_ready();
-    if (!ready)
-      ready= 64;
-
-    // add buffered data if its there
-    input_buffer* buffered = ssl.useBuffers().TakeRawInput();
-    uint buffSz = buffered ? buffered->get_size() : 0;
-    input_buffer buffer(buffSz + ready);
-    if (buffSz) {
-        buffer.assign(buffered->get_buffer(), buffSz);
-        ysDelete(buffered);
-        buffered = 0;
-    }
-
-    // add new data
-    uint read  = ssl.useSocket().receive(buffer.get_buffer() + buffSz, ready);
-    if (read == static_cast<uint>(-1)) {
-        ssl.SetError(receive_error);
-        return 0;
-    } else if (read == 0)
-        return 1;
-
-    buffer.add_size(read);
-    uint offset = 0;
-    const MessageFactory& mf = ssl.getFactory().getMessage();
-
-    // old style sslv2 client hello?
-    if (ssl.getSecurity().get_parms().entity_ == server_end &&
-                  ssl.getStates().getServer() == clientNull) 
-        if (buffer.peek() != handshake) {
-            ProcessOldClientHello(buffer, ssl);
-            if (ssl.GetError())
-                return 0;
-        }
-
-    while(!buffer.eof()) {
-        // each record
-        RecordLayerHeader hdr;
-        bool              needHdr = false;
-
-        if (static_cast<uint>(RECORD_HEADER) > buffer.get_remaining())
-            needHdr = true;
-        else {
-            buffer >> hdr;
-            ssl.verifyState(hdr);
-        }
-
-        if (ssl.GetError())
-            return 0;
-
-        // make sure we have enough input in buffer to process this record
-        if (needHdr || hdr.length_ > buffer.get_remaining()) {
-            // put header in front for next time processing
-            uint extra = needHdr ? 0 : RECORD_HEADER;
-            uint sz = buffer.get_remaining() + extra;
-            ssl.useBuffers().SetRawInput(NEW_YS input_buffer(sz,
-                      buffer.get_buffer() + buffer.get_current() - extra, sz));
-            return 1;
-        }
-
-        while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
-            // each message in record, can be more than 1 if not encrypted
-            if (ssl.GetError())
-                return 0;
-
-            if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
-                // sanity check for malicious/corrupted/illegal input
-                if (buffer.get_remaining() < hdr.length_) {
-                    ssl.SetError(bad_input);
-                    return 0;
-                }
-                decrypt_message(ssl, buffer, hdr.length_);
-                if (ssl.GetError())
-                    return 0;
-            }
-                
-            mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_));
-            if (!msg.get()) {
-                ssl.SetError(factory_error);
-                return 0;
-            }
-            buffer >> *msg;
-            msg->Process(buffer, ssl);
-            if (ssl.GetError())
-                return 0;
-        }
-        offset += hdr.length_ + RECORD_HEADER;
-    }
-    return 0;
-}
-
-
-// process input requests
-void processReply(SSL& ssl)
-{
-    if (ssl.GetError()) return;
-  
-    if (DoProcessReply(ssl)) {
-        // didn't complete process
-        if (!ssl.getSocket().IsNonBlocking()) {
-            // keep trying now, blocking ok
-            while (!ssl.GetError())
-                if (DoProcessReply(ssl) == 0) break;
-        }
-        else
-            // user will have try again later, non blocking
-            ssl.SetError(YasslError(SSL_ERROR_WANT_READ));
-    }
-}
-
-
-// send client_hello, no buffering
-void sendClientHello(SSL& ssl)
-{
-    ssl.verifyState(serverNull);
-    if (ssl.GetError()) return;
-
-    ClientHello       ch(ssl.getSecurity().get_connection().version_,
-                         ssl.getSecurity().get_connection().compression_);
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    output_buffer     out;
-
-    buildClientHello(ssl, ch);
-    ssl.set_random(ch.get_random(), client_end);
-    buildHeaders(ssl, hsHeader, rlHeader, ch);
-    buildOutput(out, rlHeader, hsHeader, ch);
-    hashHandShake(ssl, out);
-
-    ssl.Send(out.get_buffer(), out.get_size());
-}
-
-
-// send client key exchange
-void sendClientKeyExchange(SSL& ssl, BufferOutput buffer)
-{
-    ssl.verifyState(serverHelloDoneComplete);
-    if (ssl.GetError()) return;
-
-    ClientKeyExchange ck(ssl);
-    ck.build(ssl);
-    ssl.makeMasterSecret();
-
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-    buildHeaders(ssl, hsHeader, rlHeader, ck);
-    buildOutput(*out.get(), rlHeader, hsHeader, ck);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send server key exchange
-void sendServerKeyExchange(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-    ServerKeyExchange sk(ssl);
-    sk.build(ssl);
-    if (ssl.GetError()) return;
-
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-    buildHeaders(ssl, hsHeader, rlHeader, sk);
-    buildOutput(*out.get(), rlHeader, hsHeader, sk);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send change cipher
-void sendChangeCipher(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.getSecurity().get_parms().entity_ == server_end) {
-        if (ssl.getSecurity().get_resuming())
-            ssl.verifyState(clientKeyExchangeComplete);
-        else
-            ssl.verifyState(clientFinishedComplete);
-    }
-    if (ssl.GetError()) return;
-
-    ChangeCipherSpec ccs;
-    RecordLayerHeader rlHeader;
-    buildHeader(ssl, rlHeader, ccs);
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-    buildOutput(*out.get(), rlHeader, ccs);
-   
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send finished
-void sendFinished(SSL& ssl, ConnectionEnd side, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-
-    Finished fin;
-    buildFinished(ssl, fin, side == client_end ? client : server);
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-    cipherFinished(ssl, fin, *out.get());                   // hashes handshake
-
-    if (ssl.getSecurity().get_resuming()) {
-        if (side == server_end)
-            buildFinished(ssl, ssl.useHashes().use_verify(), client); // client
-    }
-    else {
-        if (!ssl.getSecurity().GetContext()->GetSessionCacheOff())
-            GetSessions().add(ssl);  // store session
-        if (side == client_end)
-            buildFinished(ssl, ssl.useHashes().use_verify(), server); // server
-    }   
-    ssl.useSecurity().use_connection().CleanMaster();
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send data
-int sendData(SSL& ssl, const void* buffer, int sz)
-{
-    int sent = 0;
-
-    if (ssl.GetError() == YasslError(SSL_ERROR_WANT_READ))
-        ssl.SetError(no_error);
-
-    if (ssl.GetError() == YasslError(SSL_ERROR_WANT_WRITE)) {
-        ssl.SetError(no_error);
-        ssl.SendWriteBuffered();
-        if (!ssl.GetError()) {
-            // advance sent to prvevious sent + plain size just sent
-            sent = ssl.useBuffers().prevSent + ssl.useBuffers().plainSz;
-        }
-    }
-
-    ssl.verfiyHandShakeComplete();
-    if (ssl.GetError()) return -1;
-
-    for (;;) {
-        int len = min(sz - sent, MAX_RECORD_SIZE);
-        output_buffer out;
-        input_buffer tmp;
-
-        Data data;
-
-        if (sent == sz) break;
-
-        if (ssl.CompressionOn()) {
-            if (Compress(static_cast<const opaque*>(buffer) + sent, len,
-                         tmp) == -1) {
-                ssl.SetError(compress_error);
-                return -1;
-            }
-            data.SetData(tmp.get_size(), tmp.get_buffer());
-        }
-        else
-            data.SetData(len, static_cast<const opaque*>(buffer) + sent);
-
-        buildMessage(ssl, out, data);
-        ssl.Send(out.get_buffer(), out.get_size());
-
-        if (ssl.GetError()) {
-            if (ssl.GetError() == YasslError(SSL_ERROR_WANT_WRITE)) {
-                ssl.useBuffers().plainSz  = len;
-                ssl.useBuffers().prevSent = sent;
-            }
-            return -1;
-        }
-        sent += len;
-    }
-    ssl.useLog().ShowData(sent, true);
-    return sent;
-}
-
-
-// send alert
-int sendAlert(SSL& ssl, const Alert& alert)
-{
-    output_buffer out;
-    buildAlert(ssl, out, alert);
-    ssl.Send(out.get_buffer(), out.get_size());
-
-    return alert.get_length();
-}
-
-
-// process input data
-int receiveData(SSL& ssl, Data& data, bool peek)
-{
-    if (ssl.GetError() == YasslError(SSL_ERROR_WANT_READ))
-        ssl.SetError(no_error);
-
-    ssl.verfiyHandShakeComplete();
-    if (ssl.GetError()) return -1;
-
-    if (!ssl.HasData())
-        processReply(ssl);
-
-    if (peek)
-        ssl.PeekData(data);
-    else
-        ssl.fillData(data);
-
-    ssl.useLog().ShowData(data.get_length());
-    if (ssl.GetError()) return -1;
-
-    if (data.get_length() == 0 && ssl.getSocket().WouldBlock()) {
-        ssl.SetError(YasslError(SSL_ERROR_WANT_READ));
-        return SSL_WOULD_BLOCK;
-    }
-    return data.get_length(); 
-}
-
-
-// send server hello
-void sendServerHello(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.getSecurity().get_resuming())
-        ssl.verifyState(clientKeyExchangeComplete);
-    else
-        ssl.verifyState(clientHelloComplete);
-    if (ssl.GetError()) return;
-
-    ServerHello       sh(ssl.getSecurity().get_connection().version_,
-                         ssl.getSecurity().get_connection().compression_);
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-
-    buildServerHello(ssl, sh);
-    ssl.set_random(sh.get_random(), server_end);
-    buildHeaders(ssl, hsHeader, rlHeader, sh);
-    buildOutput(*out.get(), rlHeader, hsHeader, sh);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send server hello done
-void sendServerHelloDone(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-
-    ServerHelloDone   shd;
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-
-    buildHeaders(ssl, hsHeader, rlHeader, shd);
-    buildOutput(*out.get(), rlHeader, hsHeader, shd);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send certificate
-void sendCertificate(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-
-    Certificate       cert(ssl.getCrypto().get_certManager().get_cert());
-    RecordLayerHeader rlHeader;
-    HandShakeHeader   hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-
-    buildHeaders(ssl, hsHeader, rlHeader, cert);
-    buildOutput(*out.get(), rlHeader, hsHeader, cert);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send certificate request
-void sendCertificateRequest(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-
-    CertificateRequest request;
-    request.Build();
-    RecordLayerHeader  rlHeader;
-    HandShakeHeader    hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-
-    buildHeaders(ssl, hsHeader, rlHeader, request);
-    buildOutput(*out.get(), rlHeader, hsHeader, request);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-// send certificate verify
-void sendCertificateVerify(SSL& ssl, BufferOutput buffer)
-{
-    if (ssl.GetError()) return;
-
-    if(ssl.getCrypto().get_certManager().sendBlankCert()) return;
-
-    CertificateVerify  verify;
-    verify.Build(ssl);
-    if (ssl.GetError()) return;
-
-    RecordLayerHeader  rlHeader;
-    HandShakeHeader    hsHeader;
-    mySTL::auto_ptr<output_buffer> out(NEW_YS output_buffer);
-
-    buildHeaders(ssl, hsHeader, rlHeader, verify);
-    buildOutput(*out.get(), rlHeader, hsHeader, verify);
-    hashHandShake(ssl, *out.get());
-
-    if (buffer == buffered)
-        ssl.addBuffer(out.release());
-    else
-        ssl.Send(out->get_buffer(), out->get_size());
-}
-
-
-} // namespace
diff --git a/extra/yassl/src/lock.cpp b/extra/yassl/src/lock.cpp
deleted file mode 100644
index c74ea1c6b764..000000000000
--- a/extra/yassl/src/lock.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  Locking functions
- */
-
-#include "runtime.hpp"
-#include "lock.hpp"
-
-
-namespace yaSSL {
-
-
-#ifdef MULTI_THREADED
-    #ifdef _WIN32
-        
-        Mutex::Mutex()
-        {
-            InitializeCriticalSection(&cs_);
-        }
-
-
-        Mutex::~Mutex()
-        {
-            DeleteCriticalSection(&cs_);
-        }
-
-            
-        Mutex::Lock::Lock(Mutex& lm) : mutex_(lm)
-        {
-            EnterCriticalSection(&mutex_.cs_); 
-        }
-
-
-        Mutex::Lock::~Lock()
-        {
-            LeaveCriticalSection(&mutex_.cs_); 
-        }
-            
-    #else  // _WIN32
-        
-        Mutex::Mutex()
-        {
-            pthread_mutex_init(&mutex_, 0);
-        }
-
-
-        Mutex::~Mutex()
-        {
-            pthread_mutex_destroy(&mutex_);
-        }
-
-
-        Mutex::Lock::Lock(Mutex& lm) : mutex_(lm)
-        {
-            pthread_mutex_lock(&mutex_.mutex_); 
-        }
-
-
-        Mutex::Lock::~Lock()
-        {
-            pthread_mutex_unlock(&mutex_.mutex_); 
-        }
-         
-
-    #endif // _WIN32
-#endif // MULTI_THREADED
-
-
-
-} // namespace yaSSL
-
diff --git a/extra/yassl/src/log.cpp b/extra/yassl/src/log.cpp
deleted file mode 100644
index 2f112ac35f96..000000000000
--- a/extra/yassl/src/log.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  Debug logging functions
- */
-
-
-#include "runtime.hpp"
-#include "log.hpp"
-
-#ifdef YASSL_LOG
-    #include <time.h>
-    #include <stdio.h>
-    #include <string.h>
-#endif
-
-
-
-namespace yaSSL {
-
-
-#ifdef YASSL_LOG
-
-    enum { MAX_MSG = 81 };
-
-    Log::Log(const char* str)
-    {
-        log_ = fopen(str, "w");
-        Trace("********** Logger Attached **********");
-    }
-
-
-    Log::~Log()
-    {
-        Trace("********** Logger Detached **********");
-        fclose(log_);
-    }
-
-
-    // Trace a message
-    void Log::Trace(const char* str)
-    {
-        if (!log_) return;
-
-        time_t clicks = time(0);
-        char   timeStr[32];
-
-        memset(timeStr, 0, sizeof(timeStr));
-        // get rid of newline
-        strncpy(timeStr, ctime(&clicks), sizeof(timeStr));
-        unsigned int len = strlen(timeStr);
-        timeStr[len - 1] = 0;
-
-        char msg[MAX_MSG];
-
-        strncpy(msg, timeStr, sizeof(timeStr));
-        strncat(msg, ":", 1);
-        strncat(msg, str, MAX_MSG - sizeof(timeStr) - 2);
-        strncat(msg, "\n", 1);
-        msg[MAX_MSG - 1] = 0;
-
-        fputs(msg, log_);
-    }
-
-
-    #if defined(_WIN32) || defined(__MACH__) || defined(__hpux__)
-        typedef int socklen_t;
-    #endif
-
-
-    // write tcp address
-    void Log::ShowTCP(socket_t fd, bool ended)
-    {
-        sockaddr_in peeraddr;
-        socklen_t   len = sizeof(peeraddr);
-        if (getpeername(fd, (sockaddr*)&peeraddr, &len) != 0)
-            return;
-
-        const char* p = reinterpret_cast<const char*>(&peeraddr.sin_addr);
-        char msg[MAX_MSG];
-        char number[16];
-    
-        if (ended)
-            strncpy(msg, "yaSSL conn DONE  w/ peer ", 26);
-        else
-            strncpy(msg, "yaSSL conn BEGUN w/ peer ", 26);
-        for (int i = 0; i < 4; ++i) {
-            sprintf(number, "%u", static_cast<unsigned short>(p[i]));
-            strncat(msg, number, 8);
-            if (i < 3)
-                strncat(msg, ".", 1);
-        }
-        strncat(msg, " port ", 8);
-        sprintf(number, "%d", htons(peeraddr.sin_port));
-        strncat(msg, number, 8);
-
-        msg[MAX_MSG - 1] = 0;
-        Trace(msg);
-    }
-
-
-    // log processed data
-    void Log::ShowData(uint bytes, bool sent)
-    {
-        char msg[MAX_MSG];
-        char number[16];
-
-        if (sent)
-            strncpy(msg, "Sent     ", 10); 
-        else
-            strncpy(msg, "Received ", 10);
-        sprintf(number, "%u", bytes);
-        strncat(msg, number, 8);
-        strncat(msg, " bytes of application data", 27);
-
-        msg[MAX_MSG - 1] = 0;
-        Trace(msg);
-    }
-
-
-#else // no YASSL_LOG
-
-
-    Log::Log(const char*) {}
-    Log::~Log() {}
-    void Log::Trace(const char*) {}
-    void Log::ShowTCP(socket_t, bool) {}
-    void Log::ShowData(uint, bool) {}
-
-
-#endif // YASSL_LOG
-} // namespace
diff --git a/extra/yassl/src/make.bat b/extra/yassl/src/make.bat
deleted file mode 100644
index e47307acf003..000000000000
--- a/extra/yassl/src/make.bat
+++ /dev/null
@@ -1,42 +0,0 @@
-REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-REM quick and dirty build file for testing different MSDEVs
-setlocal 
-
-set myFLAGS= /I../include /I../taocrypt/mySTL /I../taocrypt/include /W3 /c /ZI
-
-cl %myFLAGS% buffer.cpp
-cl %myFLAGS% cert_wrapper.cpp
-cl %myFLAGS% crypto_wrapper.cpp
-cl %myFLAGS% handshake.cpp
-
-cl %myFLAGS% lock.cpp
-cl %myFLAGS% log.cpp
-cl %myFLAGS% socket_wrapper.cpp
-cl %myFLAGS% ssl.cpp
-
-cl %myFLAGS% template_instnt.cpp
-cl %myFLAGS% timer.cpp
-cl %myFLAGS% yassl.cpp
-cl %myFLAGS% yassl_error.cpp
-
-cl %myFLAGS% yassl_imp.cpp
-cl %myFLAGS% yassl_int.cpp
-
-link.exe -lib /out:yassl.lib buffer.obj cert_wrapper.obj crypto_wrapper.obj handshake.obj lock.obj log.obj socket_wrapper.obj ssl.obj template_instnt.obj timer.obj yassl.obj yassl_error.obj yassl_imp.obj yassl_int.obj
-
-
-
diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp
deleted file mode 100644
index a23c1c12e298..000000000000
--- a/extra/yassl/src/socket_wrapper.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* The socket wrapper source implements a Socket class that hides the 
- * differences between Berkely style sockets and Windows sockets, allowing 
- * transparent TCP access.
- */
-
-
-#include "runtime.hpp"
-#include "socket_wrapper.hpp"
-
-#ifndef _WIN32
-    #include <errno.h>
-    #include <netdb.h>
-    #include <unistd.h>
-    #include <arpa/inet.h>
-    #include <netinet/in.h>
-    #include <sys/ioctl.h>
-    #include <string.h>
-    #include <fcntl.h>
-#endif // _WIN32
-
-#if defined(__sun) || defined(__SCO_VERSION__)
-    #include <sys/filio.h>
-#endif
-
-#ifdef _WIN32
-    const int SOCKET_EINVAL = WSAEINVAL;
-    const int SOCKET_EWOULDBLOCK = WSAEWOULDBLOCK;
-    const int SOCKET_EAGAIN = WSAEWOULDBLOCK;
-#else
-    const int SOCKET_EINVAL = EINVAL;
-    const int SOCKET_EWOULDBLOCK = EWOULDBLOCK;
-    const int SOCKET_EAGAIN = EAGAIN;
-#endif // _WIN32
-
-
-namespace {
-
-
-extern "C" long system_recv(void *ptr, void *buf, size_t count)
-{
-  yaSSL::socket_t *socket = (yaSSL::socket_t *) ptr;
-  return ::recv(*socket, reinterpret_cast<char *>(buf), count, 0);
-}
-
-
-extern "C" long system_send(void *ptr, const void *buf, size_t count)
-{
-  yaSSL::socket_t *socket = (yaSSL::socket_t *) ptr;
-  return ::send(*socket, reinterpret_cast<const char *>(buf), count, 0);
-}
-
-
-}
-
-
-namespace yaSSL {
-
-
-Socket::Socket(socket_t s) 
-    : socket_(s), wouldBlock_(false), nonBlocking_(false),
-      ptr_(&socket_), send_func_(system_send), recv_func_(system_recv)
-{}
-
-
-void Socket::set_fd(socket_t s)
-{
-    socket_ = s;
-}
-
-
-socket_t Socket::get_fd() const
-{
-    return socket_;
-}
-
-
-Socket::~Socket()
-{
-    // don't close automatically now
-}
-
-
-void Socket::closeSocket()
-{
-    if (socket_ != INVALID_SOCKET) {
-#ifdef _WIN32
-        closesocket(socket_);
-#else
-        close(socket_);
-#endif
-        socket_ = INVALID_SOCKET;
-    }
-}
-
-
-uint Socket::get_ready() const
-{
-#ifdef _WIN32
-    unsigned long ready = 0;
-    ioctlsocket(socket_, FIONREAD, &ready);
-#else
-    /*
-       64-bit Solaris requires the variable passed to
-       FIONREAD be a 32-bit value.
-    */
-    unsigned int ready = 0;
-    ioctl(socket_, FIONREAD, &ready);
-#endif
-
-    return ready;
-}
-
-
-void Socket::set_transport_ptr(void *ptr)
-{
-  ptr_ = ptr;
-}
-
-
-void Socket::set_transport_recv_function(yaSSL_recv_func_t recv_func)
-{
-  recv_func_ = recv_func;
-}
-
-
-void Socket::set_transport_send_function(yaSSL_send_func_t send_func)
-{
-  send_func_ = send_func;
-}
-
-
-uint Socket::send(const byte* buf, unsigned int sz, unsigned int& written)
-{
-    const byte* pos = buf;
-    const byte* end = pos + sz;
-
-    wouldBlock_ = false;
-
-    /* Remove send()/recv() hooks once non-blocking send is implemented. */
-    while (pos != end) {
-        int sent = send_func_(ptr_, pos, static_cast<int>(end - pos));
-        if (sent == -1) {
-            if (get_lastError() == SOCKET_EWOULDBLOCK || 
-                get_lastError() == SOCKET_EAGAIN) {
-                wouldBlock_  = true; // would have blocked this time only
-                nonBlocking_ = true; // nonblocking, win32 only way to tell 
-                return 0;
-            }
-            return static_cast<uint>(-1);
-        }
-        pos += sent;
-        written += sent;
-    }
-
-    return sz;
-}
-
-
-uint Socket::receive(byte* buf, unsigned int sz)
-{
-    wouldBlock_ = false;
-
-    int recvd = recv_func_(ptr_, buf, sz);
-
-    // idea to seperate error from would block by arnetheduck@gmail.com
-    if (recvd == -1) {
-        if (get_lastError() == SOCKET_EWOULDBLOCK || 
-            get_lastError() == SOCKET_EAGAIN) {
-            wouldBlock_  = true; // would have blocked this time only
-            nonBlocking_ = true; // socket nonblocking, win32 only way to tell
-            return 0;
-        }
-    }
-    else if (recvd == 0)
-        return static_cast<uint>(-1);
-
-    return recvd;
-}
-
-
-void Socket::shutDown(int how)
-{
-    shutdown(socket_, how);
-}
-
-
-int Socket::get_lastError()
-{
-#ifdef _WIN32
-    return WSAGetLastError();
-#else
-    return errno;
-#endif
-}
-
-
-bool Socket::WouldBlock() const
-{
-    return wouldBlock_;
-}
-
-
-bool Socket::IsNonBlocking() const
-{
-    return nonBlocking_;
-}
-
-
-void Socket::set_lastError(int errorCode)
-{
-#ifdef _WIN32
-    WSASetLastError(errorCode);
-#else
-    errno = errorCode;
-#endif
-}
-
-
-} // namespace
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
deleted file mode 100644
index 39244a01b927..000000000000
--- a/extra/yassl/src/ssl.cpp
+++ /dev/null
@@ -1,1883 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  SSL source implements all openssl compatibility API functions
- *
- *  TODO: notes are mostly api additions to allow compilation with mysql
- *  they don't affect normal modes but should be provided for completeness
-
- *  stunnel functions at end of file
- */
-
-
-
-/*  see man pages for function descriptions */
-
-#include "runtime.hpp"
-#include "openssl/ssl.h"
-#include "handshake.hpp"
-#include "yassl_int.hpp"
-#include "md5.hpp"              // for TaoCrypt MD5 size assert
-#include "md4.hpp"              // for TaoCrypt MD4 size assert
-#include "file.hpp"             // for TaoCrypt Source
-#include "coding.hpp"           // HexDecoder
-#include "helpers.hpp"          // for placement new hack
-#include "rsa.hpp"              // for TaoCrypt RSA key decode
-#include "dsa.hpp"              // for TaoCrypt DSA key decode
-#include <stdio.h>
-
-#ifdef _WIN32
-    #include <windows.h>    // FindFirstFile etc..
-#else
-    #include <sys/types.h>  // file helper
-    #include <sys/stat.h>   // stat
-    #include <dirent.h>     // opendir
-#endif
-
-
-namespace yaSSL {
-
-
-
-int read_file(SSL_CTX* ctx, const char* file, int format, CertType type)
-{
-    int ret = SSL_SUCCESS;
-
-    if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM)
-        return SSL_BAD_FILETYPE;
-
-    if (file == NULL || !file[0])
-      return SSL_BAD_FILE;
-
-    FILE* input = fopen(file, "rb");
-    if (!input)
-        return SSL_BAD_FILE;
-
-    if (type == CA) {
-        // may have a bunch of CAs
-        x509* ptr;
-        while ( (ptr = PemToDer(input, Cert)) )
-            ctx->AddCA(ptr);
-
-        if (!feof(input)) {
-            fclose(input);
-            return SSL_BAD_FILE;
-        }
-    }
-    else {
-        x509*& x = (type == Cert) ? ctx->certificate_ : ctx->privateKey_;
-
-        if (format == SSL_FILETYPE_ASN1) {
-            fseek(input, 0, SEEK_END);
-            long sz = ftell(input);
-            rewind(input);
-            x = NEW_YS x509(sz); // takes ownership
-            size_t bytes = fread(x->use_buffer(), sz, 1, input);
-            if (bytes != 1) {
-                fclose(input);
-                return SSL_BAD_FILE;
-            }
-        }
-        else {
-            EncryptedInfo info;
-            x = PemToDer(input, type, &info);
-            if (!x) {
-                fclose(input);
-                return SSL_BAD_FILE;
-            }
-            if (info.set) {
-                // decrypt
-                char password[80];
-                pem_password_cb cb = ctx->GetPasswordCb();
-                if (!cb) {
-                    fclose(input);
-                    return SSL_BAD_FILE;
-                }
-                int passwordSz = cb(password, sizeof(password), 0,
-                                    ctx->GetUserData());
-                byte key[AES_256_KEY_SZ];  // max sizes
-                byte iv[AES_IV_SZ];
-                
-                // use file's salt for key derivation, but not real iv
-                TaoCrypt::Source source(info.iv, info.ivSz);
-                TaoCrypt::HexDecoder dec(source);
-                memcpy(info.iv, source.get_buffer(), min((uint)sizeof(info.iv),
-                                                         source.size()));
-                EVP_BytesToKey(info.name, "MD5", info.iv, (byte*)password,
-                               passwordSz, 1, key, iv);
-
-                mySTL::auto_ptr<BulkCipher> cipher;
-                if (strncmp(info.name, "DES-CBC", 7) == 0)
-                    cipher.reset(NEW_YS DES);
-                else if (strncmp(info.name, "DES-EDE3-CBC", 13) == 0)
-                    cipher.reset(NEW_YS DES_EDE);
-                else if (strncmp(info.name, "AES-128-CBC", 13) == 0)
-                    cipher.reset(NEW_YS AES(AES_128_KEY_SZ));
-                else if (strncmp(info.name, "AES-192-CBC", 13) == 0)
-                    cipher.reset(NEW_YS AES(AES_192_KEY_SZ));
-                else if (strncmp(info.name, "AES-256-CBC", 13) == 0)
-                    cipher.reset(NEW_YS AES(AES_256_KEY_SZ));
-                else {
-                    fclose(input);
-                    return SSL_BAD_FILE;
-                }
-                cipher->set_decryptKey(key, info.iv);
-                mySTL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));   
-                cipher->decrypt(newx->use_buffer(), x->get_buffer(),
-                                x->get_length());
-                ysDelete(x);
-                x = newx.release();
-            }
-        }
-    }
-
-    if (type == PrivateKey && ctx->privateKey_) {
-        // see if key is valid early
-        TaoCrypt::Source rsaSource(ctx->privateKey_->get_buffer(),
-                                   ctx->privateKey_->get_length());
-        TaoCrypt::RSA_PrivateKey rsaKey;
-        rsaKey.Initialize(rsaSource);
-
-        if (rsaSource.GetError().What()) {
-            // rsa failed see if DSA works
-
-            TaoCrypt::Source dsaSource(ctx->privateKey_->get_buffer(),
-                                       ctx->privateKey_->get_length());
-            TaoCrypt::DSA_PrivateKey dsaKey;
-            dsaKey.Initialize(dsaSource);
-
-            if (dsaSource.GetError().What()) {
-                // neither worked
-                ret = SSL_FAILURE;
-            }
-        }
-    }
-
-    fclose(input);
-    return ret;
-}
-
-
-extern "C" {
-
-
-SSL_METHOD* SSLv3_method()
-{
-    return SSLv3_client_method();
-}
-
-
-SSL_METHOD* SSLv3_server_method()
-{
-    return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,0));
-}
-
-
-SSL_METHOD* SSLv3_client_method()
-{
-    return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,0));
-}
-
-
-SSL_METHOD* TLSv1_server_method()
-{
-    return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,1));
-}
-
-
-SSL_METHOD* TLSv1_client_method()
-{
-    return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,1));
-}
-
-
-SSL_METHOD* TLSv1_1_server_method()
-{
-    return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,2));
-}
-
-
-SSL_METHOD* TLSv1_1_client_method()
-{
-    return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,2));
-}
-
-
-SSL_METHOD* SSLv23_server_method()
-{
-    // compatibility only, no version 2 support, but does SSL 3 and TLS 1
-    return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,2), true);
-}
-
-
-SSL_METHOD* SSLv23_client_method()
-{
-    // compatibility only, no version 2 support, but does SSL 3 and TLS 1
-    // though it sends TLS1 hello not SSLv2 so SSLv3 only servers will decline
-    // TODO: maybe add support to send SSLv2 hello ???
-    return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,2), true);
-}
-
-
-SSL_CTX* SSL_CTX_new(SSL_METHOD* method)
-{
-    return NEW_YS SSL_CTX(method);
-}
-
-
-void SSL_CTX_free(SSL_CTX* ctx)
-{
-    ysDelete(ctx);
-}
-
-
-SSL* SSL_new(SSL_CTX* ctx)
-{
-    return NEW_YS SSL(ctx);
-}
-
-
-void SSL_free(SSL* ssl)
-{
-    ysDelete(ssl);
-}
-
-
-int SSL_set_fd(SSL* ssl, YASSL_SOCKET_T fd)
-{
-    ssl->useSocket().set_fd(fd);
-    return SSL_SUCCESS;
-}
-
-
-YASSL_SOCKET_T SSL_get_fd(const SSL* ssl)
-{
-    return ssl->getSocket().get_fd();
-}
-
-
-// if you get an error from connect see note at top of README
-int SSL_connect(SSL* ssl)
-{
-    if (ssl->GetError() == YasslError(SSL_ERROR_WANT_READ))
-        ssl->SetError(no_error);
-
-    if (ssl->GetError() == YasslError(SSL_ERROR_WANT_WRITE)) {
-    
-        ssl->SetError(no_error);
-        ssl->SendWriteBuffered();
-        if (!ssl->GetError())
-            ssl->useStates().UseConnect() =
-                             ConnectState(ssl->getStates().GetConnect() + 1);
-    }
-
-    ClientState neededState;
-
-    switch (ssl->getStates().GetConnect()) {
-
-    case CONNECT_BEGIN :
-        sendClientHello(*ssl);
-        if (!ssl->GetError())
-            ssl->useStates().UseConnect() = CLIENT_HELLO_SENT;
-
-    case CLIENT_HELLO_SENT :
-        neededState = ssl->getSecurity().get_resuming() ?
-                      serverFinishedComplete : serverHelloDoneComplete;
-        while (ssl->getStates().getClient() < neededState) {
-            if (ssl->GetError()) break;
-            processReply(*ssl);
-            // if resumption failed, reset needed state 
-            if (neededState == serverFinishedComplete)
-                if (!ssl->getSecurity().get_resuming())
-                    neededState = serverHelloDoneComplete;
-        }
-        if (!ssl->GetError())
-            ssl->useStates().UseConnect() = FIRST_REPLY_DONE;
-
-    case FIRST_REPLY_DONE :
-        if(ssl->getCrypto().get_certManager().sendVerify())
-            sendCertificate(*ssl);
-
-        if (!ssl->getSecurity().get_resuming())
-            sendClientKeyExchange(*ssl);
-
-        if(ssl->getCrypto().get_certManager().sendVerify())
-            sendCertificateVerify(*ssl);
-
-        sendChangeCipher(*ssl);
-        sendFinished(*ssl, client_end);
-        ssl->flushBuffer();
-
-        if (!ssl->GetError())
-            ssl->useStates().UseConnect() = FINISHED_DONE;
-
-    case FINISHED_DONE :
-        if (!ssl->getSecurity().get_resuming())
-            while (ssl->getStates().getClient() < serverFinishedComplete) {
-                if (ssl->GetError()) break;
-                processReply(*ssl);
-            }
-        if (!ssl->GetError())
-            ssl->useStates().UseConnect() = SECOND_REPLY_DONE;
-
-    case SECOND_REPLY_DONE :
-        ssl->verifyState(serverFinishedComplete);
-        ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
-
-        if (ssl->GetError()) {
-            GetErrors().Add(ssl->GetError());
-            return SSL_FATAL_ERROR;
-        }   
-        return SSL_SUCCESS;
-
-    default :
-        return SSL_FATAL_ERROR; // unkown state
-    }
-}
-
-
-int SSL_write(SSL* ssl, const void* buffer, int sz)
-{
-    return sendData(*ssl, buffer, sz);
-}
-
-
-int SSL_read(SSL* ssl, void* buffer, int sz)
-{
-    Data data(min(sz, MAX_RECORD_SIZE), static_cast<opaque*>(buffer));
-    return receiveData(*ssl, data);
-}
-
-
-int SSL_accept(SSL* ssl)
-{
-    if (ssl->GetError() == YasslError(SSL_ERROR_WANT_READ))
-        ssl->SetError(no_error);
-
-    if (ssl->GetError() == YasslError(SSL_ERROR_WANT_WRITE)) {
-    
-        ssl->SetError(no_error);
-        ssl->SendWriteBuffered();
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() =
-                             AcceptState(ssl->getStates().GetAccept() + 1);
-    }
-
-    switch (ssl->getStates().GetAccept()) {
-
-    case ACCEPT_BEGIN :
-        processReply(*ssl);
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() = ACCEPT_FIRST_REPLY_DONE;
-
-    case ACCEPT_FIRST_REPLY_DONE :
-        sendServerHello(*ssl);
-
-        if (!ssl->getSecurity().get_resuming()) {
-            sendCertificate(*ssl);
-
-            if (ssl->getSecurity().get_connection().send_server_key_)
-                sendServerKeyExchange(*ssl);
-
-            if(ssl->getCrypto().get_certManager().verifyPeer())
-                sendCertificateRequest(*ssl);
-
-            sendServerHelloDone(*ssl);
-            ssl->flushBuffer();
-        }
-      
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() = SERVER_HELLO_DONE;
-
-    case SERVER_HELLO_DONE :
-        if (!ssl->getSecurity().get_resuming()) {
-            while (ssl->getStates().getServer() < clientFinishedComplete) {
-                if (ssl->GetError()) break;
-                processReply(*ssl);
-            }
-        }
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() = ACCEPT_SECOND_REPLY_DONE;
-
-    case ACCEPT_SECOND_REPLY_DONE :
-        sendChangeCipher(*ssl);
-        sendFinished(*ssl, server_end);
-        ssl->flushBuffer();
-
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() = ACCEPT_FINISHED_DONE;
-
-    case ACCEPT_FINISHED_DONE :
-        if (ssl->getSecurity().get_resuming()) {
-            while (ssl->getStates().getServer() < clientFinishedComplete) {
-                if (ssl->GetError()) break;
-                processReply(*ssl);
-            }
-        }
-        if (!ssl->GetError())
-            ssl->useStates().UseAccept() = ACCEPT_THIRD_REPLY_DONE;
-
-    case ACCEPT_THIRD_REPLY_DONE :
-        ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
-
-        if (ssl->GetError()) {
-            GetErrors().Add(ssl->GetError());
-            return SSL_FATAL_ERROR;
-        }
-        return SSL_SUCCESS;
-
-    default:
-        return SSL_FATAL_ERROR; // unknown state
-    }
-}
-
-
-int SSL_do_handshake(SSL* ssl)
-{
-    if (ssl->getSecurity().get_parms().entity_ == client_end)
-        return SSL_connect(ssl);
-    else
-        return SSL_accept(ssl);
-}
-
-
-int SSL_clear(SSL* ssl)
-{
-    GetErrors().Remove();
-
-    return SSL_SUCCESS;
-}
-
-
-int SSL_shutdown(SSL* ssl)
-{
-    if (!ssl->GetQuietShutdown()) {
-      Alert alert(warning, close_notify);
-      sendAlert(*ssl, alert);
-    }
-    ssl->useLog().ShowTCP(ssl->getSocket().get_fd(), true);
-
-    GetErrors().Remove();
-
-    return SSL_SUCCESS;
-}
-
-
-void SSL_set_quiet_shutdown(SSL *ssl,int mode)
-{
-    ssl->SetQuietShutdown(mode != 0);
-}
-
-
-int SSL_get_quiet_shutdown(SSL *ssl)
-{
-    return ssl->GetQuietShutdown();
-}
-
-
-/* on by default but allow user to turn off */
-long SSL_CTX_set_session_cache_mode(SSL_CTX* ctx, long mode)
-{
-    if (mode == SSL_SESS_CACHE_OFF)
-        ctx->SetSessionCacheOff();
-
-    if (mode == SSL_SESS_CACHE_NO_AUTO_CLEAR)
-        ctx->SetSessionCacheFlushOff();
-
-    return SSL_SUCCESS;
-}
-
-
-SSL_SESSION* SSL_get_session(SSL* ssl)
-{
-    if (ssl->getSecurity().GetContext()->GetSessionCacheOff())
-        return 0;
-
-    return GetSessions().lookup(
-        ssl->getSecurity().get_connection().sessionID_);
-}
-
-
-int SSL_set_session(SSL* ssl, SSL_SESSION* session)
-{
-    if (ssl->getSecurity().GetContext()->GetSessionCacheOff())
-        return SSL_FAILURE;
-
-    ssl->set_session(session);
-    return SSL_SUCCESS;
-}
-
-
-int SSL_session_reused(SSL* ssl)
-{
-    return ssl->getSecurity().get_resuming();
-}
-
-
-long SSL_SESSION_set_timeout(SSL_SESSION* sess, long t)
-{
-    if (!sess)
-        return SSL_ERROR_NONE;
-
-    sess->SetTimeOut(t);
-    return SSL_SUCCESS;
-}
-
-
-long SSL_get_default_timeout(SSL* /*ssl*/)
-{
-    return DEFAULT_TIMEOUT;
-}
-
-
-void SSL_flush_sessions(SSL_CTX *ctx, long /* tm */)
-{
-    if (ctx->GetSessionCacheOff())
-        return;
-
-    GetSessions().Flush();
-}
-
-
-const char* SSL_get_cipher_name(SSL* ssl)
-{ 
-    return SSL_get_cipher(ssl); 
-}
-
-
-const char* SSL_get_cipher(SSL* ssl)
-{
-    return ssl->getSecurity().get_parms().cipher_name_;
-}
-
-
-// SSLv2 only, not implemented
-char* SSL_get_shared_ciphers(SSL* /*ssl*/, char* buf, int len)
-{
-    return strncpy(buf, "Not Implemented, SSLv2 only", len);
-}
-
-
-const char* SSL_get_cipher_list(SSL* ssl, int priority)
-{
-    if (priority < 0 || priority >= MAX_CIPHERS)
-        return 0;
-
-    if (ssl->getSecurity().get_parms().cipher_list_[priority][0])
-        return ssl->getSecurity().get_parms().cipher_list_[priority];
-
-    return 0;
-}
-
-
-int SSL_CTX_set_cipher_list(SSL_CTX* ctx, const char* list)
-{
-    if (ctx->SetCipherList(list))
-        return SSL_SUCCESS;
-    else
-        return SSL_FAILURE;
-}
-
-
-const char* SSL_get_version(SSL* ssl)
-{
-    static const char* version3 =  "SSLv3";
-    static const char* version31 = "TLSv1";
-    static const char* version32 = "TLSv1.1";
-
-    if (ssl->isTLSv1_1())
-      return version32;
-    else if(ssl->isTLS())
-      return version31;
-    else
-      return version3;
-}
-
-const char* SSLeay_version(int)
-{
-    static const char* version = "SSLeay yaSSL compatibility";
-    return version;
-}
-
-
-int SSL_get_error(SSL* ssl, int /*previous*/)
-{
-    return ssl->getStates().What();
-}
-
-
-
-/* turn on yaSSL zlib compression
-   returns 0 for success, else error (not built in)
-   only need to turn on for client, becuase server on by default if built in
-   but calling for server will tell you whether it's available or not
-*/
-int SSL_set_compression(SSL* ssl)   /* Chad didn't rename to ya~ because it is prob. bug. */
-{
-    return ssl->SetCompression();
-}
-
-
-
-X509* X509_Copy(X509 *x)
-{
-    if (x == 0) return NULL;
-
-    X509_NAME* issuer   = x->GetIssuer();
-    X509_NAME* subject  = x->GetSubject();
-    ASN1_TIME* before = x->GetBefore();
-    ASN1_TIME* after  = x->GetAfter();
-
-    X509 *newX509 = NEW_YS X509(issuer->GetName(), issuer->GetLength(),
-        subject->GetName(), subject->GetLength(),
-        before, after,
-        issuer->GetCnPosition(), issuer->GetCnLength(),
-        subject->GetCnPosition(), subject->GetCnLength());
-
-    return newX509;
-}
-
-X509* SSL_get_peer_certificate(SSL* ssl)
-{
-    return X509_Copy(ssl->getCrypto().get_certManager().get_peerX509());
-}
-
-
-void X509_free(X509* x)
-{
-    ysDelete(x);
-}
-
-
-X509* X509_STORE_CTX_get_current_cert(X509_STORE_CTX* ctx)
-{
-    return ctx->current_cert;
-}
-
-
-int X509_STORE_CTX_get_error(X509_STORE_CTX* ctx)
-{
-    return ctx->error;
-}
-
-
-int X509_STORE_CTX_get_error_depth(X509_STORE_CTX* ctx)
-{
-    return ctx->error_depth;
-}
-
-X509* PEM_read_X509(FILE *fp, X509 *x,
-                    pem_password_cb cb,
-                    void *u)
-{
-  if (fp == NULL)
-    return NULL;
-
-  // Get x509 handle and encryption information
-  x509* ptr = PemToDer(fp, Cert);
-  if (!ptr)
-      return NULL;
-
-  // Now decode x509 object.
-  TaoCrypt::SignerList signers;
-  TaoCrypt::Source source(ptr->get_buffer(), ptr->get_length());
-  TaoCrypt::CertDecoder cert(source, true, &signers, true, TaoCrypt::CertDecoder::CA);
-
-  if (cert.GetError().What()) {
-      ysDelete(ptr);
-      return NULL;
-  }
-
-  // Ok. Now create X509 object.
-  size_t iSz = strlen(cert.GetIssuer()) + 1;
-  size_t sSz = strlen(cert.GetCommonName()) + 1;
-  ASN1_STRING beforeDate, afterDate;
-  beforeDate.data = (unsigned char *) cert.GetBeforeDate();
-  beforeDate.type = cert.GetBeforeDateType();
-  beforeDate.length = strlen((char *) beforeDate.data) + 1;
-  afterDate.data = (unsigned char *) cert.GetAfterDate();
-  afterDate.type = cert.GetAfterDateType();
-  afterDate.length = strlen((char *) afterDate.data) + 1;
-
-  X509 *thisX509 = NEW_YS X509(cert.GetIssuer(), iSz, cert.GetCommonName(),
-                               sSz, &beforeDate, &afterDate,
-                               cert.GetIssuerCnStart(), cert.GetIssuerCnLength(),
-                               cert.GetSubjectCnStart(), cert.GetSubjectCnLength());
-
-
-  ysDelete(ptr);
-  return thisX509;
-}
-
-// copy name into buffer, at most sz bytes, if buffer is null
-// will malloc buffer, caller responsible for freeing
-char* X509_NAME_oneline(X509_NAME* name, char* buffer, int sz)
-{
-    if (!name->GetName()) return buffer;
-
-    int len    = (int)strlen(name->GetName()) + 1;
-    int copySz = min(len, sz);
-
-    if (!buffer) {
-        buffer = (char*)malloc(len);
-        if (!buffer) return buffer;
-        copySz = len;
-    }
-
-    if (copySz == 0)
-        return buffer;
-
-    memcpy(buffer, name->GetName(), copySz - 1);
-    buffer[copySz - 1] = 0;
-
-    return buffer;
-}
-
-
-X509_NAME* X509_get_issuer_name(X509* x)
-{
-    return  x->GetIssuer();
-}
-
-
-X509_NAME* X509_get_subject_name(X509* x)
-{
-    return x->GetSubject();
-}
-
-
-void SSL_load_error_strings()   // compatibility only 
-{}
-
-
-void SSL_set_connect_state(SSL*)
-{
-    // already a client by default
-}
-
-
-void SSL_set_accept_state(SSL* ssl)
-{
-    ssl->useSecurity().use_parms().entity_ = server_end;
-}
-
-
-long SSL_get_verify_result(SSL*)
-{
-    // won't get here if not OK
-    return X509_V_OK;
-}
-
-
-long SSL_CTX_sess_set_cache_size(SSL_CTX* /*ctx*/, long /*sz*/)
-{
-    // unlimited size, can't set for now
-    return 0;
-}
-
-
-long SSL_CTX_get_session_cache_mode(SSL_CTX*)
-{
-    // always 0, unlimited size for now
-    return 0;
-}
-
-
-long SSL_CTX_set_tmp_dh(SSL_CTX* ctx, DH* dh)
-{
-    if (ctx->SetDH(*dh))
-        return SSL_SUCCESS;
-    else
-        return SSL_FAILURE;
-}
-
-
-int SSL_CTX_use_certificate_file(SSL_CTX* ctx, const char* file, int format)
-{
-    return read_file(ctx, file, format, Cert);
-}
-
-
-int SSL_CTX_use_PrivateKey_file(SSL_CTX* ctx, const char* file, int format)
-{
-    return read_file(ctx, file, format, PrivateKey);
-}
-
-
-void SSL_CTX_set_verify(SSL_CTX* ctx, int mode, VerifyCallback vc)
-{
-    if (mode & SSL_VERIFY_PEER)
-        ctx->setVerifyPeer();
-
-    if (mode == SSL_VERIFY_NONE)
-        ctx->setVerifyNone();
-
-    if (mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
-        ctx->setFailNoCert();
-
-    ctx->setVerifyCallback(vc);
-}
-
-
-int SSL_CTX_load_verify_locations(SSL_CTX* ctx, const char* file,
-                                  const char* path)
-{
-    int       ret = SSL_FAILURE;
-    const int HALF_PATH = 128;
-
-    if (file) ret = read_file(ctx, file, SSL_FILETYPE_PEM, CA);
-
-    if (ret == SSL_SUCCESS && path) {
-        // call read_file for each reqular file in path
-#ifdef _WIN32
-
-        WIN32_FIND_DATA FindFileData;
-        HANDLE hFind;
-
-        const int DELIMITER_SZ      = 2;
-        const int DELIMITER_STAR_SZ = 3;
-        int pathSz = (int)strlen(path);
-        int nameSz = pathSz + DELIMITER_STAR_SZ + 1; // plus 1 for terminator
-        char* name = NEW_YS char[nameSz];  // directory specification
-        memset(name, 0, nameSz);
-        strncpy(name, path, nameSz - DELIMITER_STAR_SZ - 1);
-        strncat(name, "\\*", DELIMITER_STAR_SZ);
-
-        hFind = FindFirstFile(name, &FindFileData);
-        if (hFind == INVALID_HANDLE_VALUE) {
-            ysArrayDelete(name);
-            return SSL_BAD_PATH;
-        }
-
-        do {
-            if (!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-                int curSz = (int)strlen(FindFileData.cFileName);
-                if (pathSz + curSz + DELIMITER_SZ + 1 > nameSz) {
-                    ysArrayDelete(name);
-                    // plus 1 for terminator
-                    nameSz = pathSz + curSz + DELIMITER_SZ + 1;
-                    name = NEW_YS char[nameSz];
-                }
-                memset(name, 0, nameSz);
-                strncpy(name, path, nameSz - curSz - DELIMITER_SZ - 1);
-                strncat(name, "\\", DELIMITER_SZ);
-                strncat(name, FindFileData.cFileName,
-                                            nameSz - pathSz - DELIMITER_SZ - 1);
-                ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
-            }
-        } while (ret == SSL_SUCCESS && FindNextFile(hFind, &FindFileData));
-
-        ysArrayDelete(name);
-        FindClose(hFind);
-
-#else   // _WIN32
-        DIR* dir = opendir(path);
-        if (!dir) return SSL_BAD_PATH;
-
-        struct dirent* entry;
-        struct stat    buf;
-        const int DELIMITER_SZ = 1;
-        int pathSz = (int)strlen(path);
-        int nameSz = pathSz + DELIMITER_SZ + 1; //plus 1 for null terminator
-        char* name = NEW_YS char[nameSz];  // directory specification
-
-        while (ret == SSL_SUCCESS && (entry = readdir(dir))) {
-            int curSz = (int)strlen(entry->d_name);
-            if (pathSz + curSz + DELIMITER_SZ + 1 > nameSz) {
-                ysArrayDelete(name);
-                nameSz = pathSz + DELIMITER_SZ + curSz + 1;
-                name = NEW_YS char[nameSz];
-            }
-            memset(name, 0, nameSz);
-            strncpy(name, path, nameSz - curSz - 1);
-            strncat(name, "/",  DELIMITER_SZ);
-            strncat(name, entry->d_name, nameSz - pathSz - DELIMITER_SZ - 1);
-
-            if (stat(name, &buf) < 0) {
-                ysArrayDelete(name);
-                closedir(dir);
-                return SSL_BAD_STAT;
-            }
-     
-            if (S_ISREG(buf.st_mode))
-                ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
-        }
-
-        ysArrayDelete(name);
-        closedir(dir);
-
-#endif
-    }
-
-    return ret;
-}
-
-
-int SSL_CTX_set_default_verify_paths(SSL_CTX* /*ctx*/)
-{
-    // TODO: figure out way to set/store default path, then call load_verify
-    return SSL_NOT_IMPLEMENTED;
-}
-
-
-int SSL_CTX_set_session_id_context(SSL_CTX*, const unsigned char*,
-                                    unsigned int)
-{
-    // No application specific context needed for yaSSL
-    return SSL_SUCCESS;
-}
-
-
-int SSL_CTX_check_private_key(SSL_CTX* /*ctx*/)
-{
-    // TODO: check private against public for RSA match
-    return SSL_NOT_IMPLEMENTED;
-}
-
-
-// TODO: all session stats
-long SSL_CTX_sess_accept(SSL_CTX* ctx)
-{
-    return ctx->GetStats().accept_;
-}
-
-
-long SSL_CTX_sess_connect(SSL_CTX* ctx)
-{
-    return ctx->GetStats().connect_;
-}
-
-
-long SSL_CTX_sess_accept_good(SSL_CTX* ctx)
-{
-    return ctx->GetStats().acceptGood_;
-}
-
-
-long SSL_CTX_sess_connect_good(SSL_CTX* ctx)
-{
-    return ctx->GetStats().connectGood_;
-}
-
-
-long SSL_CTX_sess_accept_renegotiate(SSL_CTX* ctx)
-{
-    return ctx->GetStats().acceptRenegotiate_;
-}
-
-
-long SSL_CTX_sess_connect_renegotiate(SSL_CTX* ctx)
-{
-    return ctx->GetStats().connectRenegotiate_;
-}
-
-
-long SSL_CTX_sess_hits(SSL_CTX* ctx)
-{
-    return ctx->GetStats().hits_;
-}
-
-
-long SSL_CTX_sess_cb_hits(SSL_CTX* ctx)
-{
-    return ctx->GetStats().cbHits_;
-}
-
-
-long SSL_CTX_sess_cache_full(SSL_CTX* ctx)
-{
-    return ctx->GetStats().cacheFull_;
-}
-
-
-long SSL_CTX_sess_misses(SSL_CTX* ctx)
-{
-    return ctx->GetStats().misses_;
-}
-
-
-long SSL_CTX_sess_timeouts(SSL_CTX* ctx)
-{
-    return ctx->GetStats().timeouts_;
-}
-
-
-long SSL_CTX_sess_number(SSL_CTX* ctx)
-{
-    return ctx->GetStats().number_;
-}
-
-
-long SSL_CTX_sess_get_cache_size(SSL_CTX* ctx)
-{
-    return ctx->GetStats().getCacheSize_;
-}
-// end session stats TODO:
-
-
-int SSL_CTX_get_verify_mode(SSL_CTX* ctx)
-{
-    return ctx->GetStats().verifyMode_;
-}
-
-
-int SSL_get_verify_mode(SSL* ssl)
-{
-    return ssl->getSecurity().GetContext()->GetStats().verifyMode_;
-}
-
-
-int SSL_CTX_get_verify_depth(SSL_CTX* ctx)
-{
-    return ctx->GetStats().verifyDepth_;
-}
-
-
-int SSL_get_verify_depth(SSL* ssl)
-{
-    return ssl->getSecurity().GetContext()->GetStats().verifyDepth_;
-}
-
-
-long SSL_CTX_set_options(SSL_CTX* ctx, long options)
-{
-    ProtocolVersion pv= ctx->getMethod()->getVersion();
-    bool multi_proto= ctx->getMethod()->multipleProtocol();
-    unsigned long ssl_ctx_mask= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1;
-
-    do
-    {
-      if (options == 0)
-       break;
-      // only TLSv1.1
-      if ((options & ssl_ctx_mask) == ssl_ctx_mask)
-      {
-        pv.minor_= 2;
-        multi_proto= false;
-        break;
-      }
-      // only TLSv1
-      ssl_ctx_mask= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_1;
-      if((options & ssl_ctx_mask) == ssl_ctx_mask)
-      {
-        pv.minor_= 1;
-        multi_proto= false;
-        break;
-      }
-      // TLSv1.1 and TLSv1
-      ssl_ctx_mask= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-      if((options & ssl_ctx_mask) == ssl_ctx_mask)
-      {
-        pv.minor_= 2;
-        multi_proto= true;
-        break;
-      }
-    }while(0);
-
-    SSL_METHOD *meth= NEW_YS SSL_METHOD(ctx->getMethod()->getSide(), ProtocolVersion(3,pv.minor_), multi_proto);
-    ctx->SetMethod(meth);
-    return SSL_SUCCESS;
-}
-
-
-void SSL_CTX_set_info_callback(SSL_CTX*, void (*)())
-{
-    // TDOD:
-}
-
-
-void OpenSSL_add_all_algorithms()  // compatibility only
-{}
-
-
-int SSL_library_init()  // compatiblity only
-{
-    return 1;
-}
-
-
-DH* DH_new(void)
-{
-    DH* dh = NEW_YS DH;
-    if (dh)
-        dh->p = dh->g = 0;
-    return dh;
-}
-
-
-void DH_free(DH* dh)
-{
-    ysDelete(dh->g);
-    ysDelete(dh->p);
-    ysDelete(dh);
-}
-
-
-// convert positive big-endian num of length sz into retVal, which may need to 
-// be created
-BIGNUM* BN_bin2bn(const unsigned char* num, int sz, BIGNUM* retVal)
-{
-    bool created = false;
-    mySTL::auto_ptr<BIGNUM> bn;
-
-    if (!retVal) {
-        created = true;
-        bn.reset(NEW_YS BIGNUM);
-        retVal = bn.get();
-    }
-
-    retVal->assign(num, sz);
-
-    if (created)
-        return bn.release();
-    else
-        return retVal;
-}
-
-
-unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *)
-{
-    //return SSL_NOT_IMPLEMENTED;
-    return 0;
-}
-
-
-void ERR_print_errors_fp(FILE* /*fp*/)
-{
-    // need ssl access to implement TODO:
-    //fprintf(fp, "%s", ssl.get_states().errorString_.c_str());
-}
-
-
-char* ERR_error_string(unsigned long errNumber, char* buffer)
-{
-  static char* msg = (char*)"Please supply a buffer for error string";
-
-    if (buffer) {
-        SetErrorString(YasslError(errNumber), buffer);
-        return buffer;
-    }
-
-    return msg;
-}
-
-
-const char* X509_verify_cert_error_string(long /* error */)
-{
-    // TODO:
-    static const char* msg = "Not Implemented";
-    return msg;
-}
-
-
-const EVP_MD* EVP_md5(void)
-{
-    static const char* type = "MD5";
-    return type;
-}
-
-
-const EVP_CIPHER* EVP_des_ede3_cbc(void)
-{
-    static const char* type = "DES-EDE3-CBC";
-    return type;
-}
-
-
-int EVP_BytesToKey(const EVP_CIPHER* type, const EVP_MD* md, const byte* salt,
-                   const byte* data, int sz, int count, byte* key, byte* iv)
-{
-    // only support MD5 for now
-    if (strncmp(md, "MD5", 3)) return 0;
-
-    int keyLen = 0;
-    int ivLen  = 0;
-
-    // only support CBC DES and AES for now
-    if (strncmp(type, "DES-CBC", 7) == 0) {
-        keyLen = DES_KEY_SZ;
-        ivLen  = DES_IV_SZ;
-    }
-    else if (strncmp(type, "DES-EDE3-CBC", 12) == 0) {
-        keyLen = DES_EDE_KEY_SZ;
-        ivLen  = DES_IV_SZ;
-    }
-    else if (strncmp(type, "AES-128-CBC", 11) == 0) {
-        keyLen = AES_128_KEY_SZ;
-        ivLen  = AES_IV_SZ;
-    }
-    else if (strncmp(type, "AES-192-CBC", 11) == 0) {
-        keyLen = AES_192_KEY_SZ;
-        ivLen  = AES_IV_SZ;
-    }
-    else if (strncmp(type, "AES-256-CBC", 11) == 0) {
-        keyLen = AES_256_KEY_SZ;
-        ivLen  = AES_IV_SZ;
-    }
-    else
-        return 0;
-
-    yaSSL::MD5 myMD;
-    uint digestSz = myMD.get_digestSize();
-    byte digest[SHA_LEN];                   // max size
-
-    int keyLeft   = keyLen;
-    int ivLeft    = ivLen;
-    int keyOutput = 0;
-
-    while (keyOutput < (keyLen + ivLen)) {
-        int digestLeft = digestSz;
-        // D_(i - 1)
-        if (keyOutput)                      // first time D_0 is empty
-            myMD.update(digest, digestSz);
-        // data
-        myMD.update(data, sz);
-        // salt
-        if (salt)
-            myMD.update(salt, EVP_SALT_SZ);
-        myMD.get_digest(digest);
-        // count
-        for (int j = 1; j < count; j++) {
-            myMD.update(digest, digestSz);
-            myMD.get_digest(digest);
-        }
-
-        if (keyLeft) {
-            int store = min(keyLeft, static_cast<int>(digestSz));
-            memcpy(&key[keyLen - keyLeft], digest, store);
-
-            keyOutput  += store;
-            keyLeft    -= store;
-            digestLeft -= store;
-        }
-
-        if (ivLeft && digestLeft) {
-            int store = min(ivLeft, digestLeft);
-            memcpy(&iv[ivLen - ivLeft], &digest[digestSz - digestLeft], store);
-
-            keyOutput += store;
-            ivLeft    -= store;
-        }
-    }
-    return keyOutput;
-}
-
-
-
-void DES_set_key_unchecked(const_DES_cblock* key, DES_key_schedule* schedule)
-{
-    memcpy(schedule, key, sizeof(const_DES_cblock));
-}
-
-
-void DES_ede3_cbc_encrypt(const byte* input, byte* output, long sz,
-                          DES_key_schedule* ks1, DES_key_schedule* ks2,
-                          DES_key_schedule* ks3, DES_cblock* ivec, int enc)
-{
-    DES_EDE des;
-    byte key[DES_EDE_KEY_SZ];
-
-    memcpy(key, *ks1, DES_BLOCK);
-    memcpy(&key[DES_BLOCK], *ks2, DES_BLOCK);
-    memcpy(&key[DES_BLOCK * 2], *ks3, DES_BLOCK);
-
-    if (enc) {
-        des.set_encryptKey(key, *ivec);
-        des.encrypt(output, input, sz);
-    }
-    else {
-        des.set_decryptKey(key, *ivec);
-        des.decrypt(output, input, sz);
-    }
-}
-
-
-// functions for libcurl
-int RAND_status()
-{
-    return 1;  /* TaoCrypt provides enough seed */
-}
-
-
-int DES_set_key(const_DES_cblock* key, DES_key_schedule* schedule)
-{
-    memcpy(schedule, key, sizeof(const_DES_cblock));
-    return 1;
-}
-
-
-void DES_set_odd_parity(DES_cblock* key)
-{
-    // not needed now for TaoCrypt
-}
-
-
-void DES_ecb_encrypt(DES_cblock* input, DES_cblock* output,
-                     DES_key_schedule* key, int enc)
-{
-    DES  des;
-
-    if (enc) {
-        des.set_encryptKey(*key, 0);
-        des.encrypt(*output, *input, DES_BLOCK);
-    }
-    else {
-        des.set_decryptKey(*key, 0);
-        des.decrypt(*output, *input, DES_BLOCK);
-    }
-}
-
-
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX* ctx, void* userdata)
-{
-    ctx->SetUserData(userdata);
-}
-
-
-X509* SSL_get_certificate(SSL* ssl)
-{
-    return ssl->getCrypto().get_certManager().get_selfX509();
-}
-
-
-EVP_PKEY* SSL_get_privatekey(SSL* ssl)
-{
-    // only called, not used
-    return 0;
-}
-
-
-void SSL_SESSION_free(SSL_SESSION* session)
-{
-    // managed by singleton
-}
-
-
-
-EVP_PKEY* X509_get_pubkey(X509* x)
-{
-    // called, not used though
-    return 0;
-}
-
-
-int EVP_PKEY_copy_parameters(EVP_PKEY* to, const EVP_PKEY* from)
-{
-    // called, not used though
-    return 0;
-}
-
-
-void EVP_PKEY_free(EVP_PKEY* pkey)
-{
-    // never allocated from above
-}
-
-
-void ERR_error_string_n(unsigned long e, char *buf, size_t len)
-{
-    if (len) ERR_error_string(e, buf);
-}
-
-
-void ERR_free_strings(void)
-{
-    // handled internally
-}
-
-
-void EVP_cleanup(void)
-{
-    // nothing to do yet
-}
-
-
-ASN1_TIME* X509_get_notBefore(X509* x)
-{
-    if (x) return x->GetBefore();
-    return 0;
-}
-
-
-ASN1_TIME* X509_get_notAfter(X509* x)
-{
-    if (x) return x->GetAfter();
-    return 0;
-}
-
-
-SSL_METHOD* SSLv2_client_method(void)   /* will never work, no v 2    */
-{
-    return 0;
-}
-
-
-SSL_SESSION* SSL_get1_session(SSL* ssl)  /* what's ref count */
-{
-    return SSL_get_session(ssl);
-}
-
-
-void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *x)
-{
-    // no extension names supported yet
-}
-
-
-int sk_GENERAL_NAME_num(STACK_OF(GENERAL_NAME) *x)
-{
-    // no extension names supported yet
-    return 0;
-}
-
-
-GENERAL_NAME* sk_GENERAL_NAME_value(STACK_OF(GENERAL_NAME) *x, int i)
-{
-    // no extension names supported yet
-    return 0;
-}
-
-
-unsigned char* ASN1_STRING_data(ASN1_STRING* x)
-{
-    if (x) return x->data;
-    return 0;
-}
-
-
-int ASN1_STRING_length(ASN1_STRING* x)
-{
-    if (x) return x->length;
-    return 0;
-}
-
-
-int ASN1_STRING_type(ASN1_STRING *x)
-{
-    if (x) return x->type;
-    return 0;
-}
-
-
-int X509_NAME_get_index_by_NID(X509_NAME* name,int nid, int lastpos)
-{
-    int idx = -1;  // not found
-    int cnPos = -1;
-
-    switch (nid) {
-    case NID_commonName:
-         cnPos = name->GetCnPosition();
-         if (lastpos < cnPos)
-           idx = cnPos;
-         break;
-    }
-
-    return idx;
-}
-
-
-ASN1_STRING* X509_NAME_ENTRY_get_data(X509_NAME_ENTRY* ne)
-{
-    // the same in yaSSL
-    return ne;
-}
-
-
-X509_NAME_ENTRY* X509_NAME_get_entry(X509_NAME* name, int loc)
-{
-    return name->GetEntry(loc);
-}
-
-
-// already formatted, caller responsible for freeing *out
-int ASN1_STRING_to_UTF8(unsigned char** out, ASN1_STRING* in)
-{
-    if (!in) return 0;
-
-    *out = (unsigned char*)malloc(in->length + 1);
-    if (*out) {
-        memcpy(*out, in->data, in->length);
-        (*out)[in->length] = 0;
-    }
-    return in->length;
-}
-
-
-void* X509_get_ext_d2i(X509* x, int nid, int* crit, int* idx)
-{
-    // no extensions supported yet
-    return 0;
-}
-
-
-void MD4_Init(MD4_CTX* md4)
-{
-    // make sure we have a big enough buffer
-    typedef char ok[sizeof(md4->buffer) >= sizeof(TaoCrypt::MD4) ? 1 : -1];
-    (void) sizeof(ok);
-
-    // using TaoCrypt since no dynamic memory allocated
-    // and no destructor will be called
-    new (reinterpret_cast<yassl_pointer>(md4->buffer)) TaoCrypt::MD4();
-}
-
-
-void MD4_Update(MD4_CTX* md4, const void* data, unsigned long sz)
-{
-    reinterpret_cast<TaoCrypt::MD4*>(md4->buffer)->Update(
-                static_cast<const byte*>(data), static_cast<unsigned int>(sz));
-}
-
-
-void MD4_Final(unsigned char* hash, MD4_CTX* md4)
-{
-    reinterpret_cast<TaoCrypt::MD4*>(md4->buffer)->Final(hash);
-}
-
-
-void MD5_Init(MD5_CTX* md5)
-{
-    // make sure we have a big enough buffer
-    typedef char ok[sizeof(md5->buffer) >= sizeof(TaoCrypt::MD5) ? 1 : -1];
-    (void) sizeof(ok);
-
-    // using TaoCrypt since no dynamic memory allocated
-    // and no destructor will be called
-    new (reinterpret_cast<yassl_pointer>(md5->buffer)) TaoCrypt::MD5();
-}
-
-
-void MD5_Update(MD5_CTX* md5, const void* data, unsigned long sz)
-{
-    reinterpret_cast<TaoCrypt::MD5*>(md5->buffer)->Update(
-                static_cast<const byte*>(data), static_cast<unsigned int>(sz));
-}
-
-
-void MD5_Final(unsigned char* hash, MD5_CTX* md5)
-{
-    reinterpret_cast<TaoCrypt::MD5*>(md5->buffer)->Final(hash);
-}
-
-
-int RAND_bytes(unsigned char* buf, int num)
-{
-    RandomPool ran;
-
-    if (ran.GetError()) return 0;
-
-    ran.Fill(buf, num);
-    return 1;
-}
-
-
-int SSL_peek(SSL* ssl, void* buffer, int sz)
-{
-    Data data(min(sz, MAX_RECORD_SIZE), static_cast<opaque*>(buffer));
-    return receiveData(*ssl, data, true);
-}
-
-
-int SSL_pending(SSL* ssl)
-{
-    // Just in case there's pending data that hasn't been processed yet...
-    char c;
-    SSL_peek(ssl, &c, 1);
-    
-    return ssl->bufferedData();
-}
-
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX* ctx, pem_password_cb cb)
-{
-    ctx->SetPasswordCb(cb);
-}
-
-
-int SSLeay_add_ssl_algorithms()  // compatibility only
-{
-    return 1;
-}
-
-
-void ERR_remove_state(unsigned long)
-{
-    GetErrors().Remove();
-}
-
-
-int ERR_GET_REASON(int l)
-{
-    return l & 0xfff;
-}
-
-
-unsigned long err_helper(bool peek = false)
-{
-    int ysError = GetErrors().Lookup(peek);
-
-    // translate cert error for libcurl, it uses OpenSSL hex code
-    switch (ysError) {
-    case TaoCrypt::SIG_OTHER_E:
-        return CERTFICATE_ERROR;
-        break;
-    default :
-        return 0;
-    }
-
-    return 0;  // shut up compiler
-}
-
-
-unsigned long ERR_peek_error()
-{
-    return err_helper(true);
-}
-
-
-unsigned long ERR_get_error()
-{
-    return err_helper();
-}
-
-
-    // functions for stunnel
-
-    void RAND_screen()
-    {
-        // TODO:
-    }
-
-
-    const char* RAND_file_name(char*, size_t)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    int RAND_write_file(const char*)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    int RAND_load_file(const char*, long)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    void RSA_free(RSA*)
-    {
-        // TODO:
-    }
-
-
-    RSA* RSA_generate_key(int, unsigned long, void(*)(int, int, void*), void*)
-    {
-        //  TODO:
-        return 0;
-    }
-
-
-    int X509_LOOKUP_add_dir(X509_LOOKUP*, const char*, long)
-    {
-        // TODO:
-        return SSL_SUCCESS;
-    }
-
-
-    int X509_LOOKUP_load_file(X509_LOOKUP*, const char*, long)
-    {
-        // TODO:
-        return SSL_SUCCESS;
-    }
-
-
-    X509_LOOKUP_METHOD* X509_LOOKUP_hash_dir(void)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    X509_LOOKUP_METHOD* X509_LOOKUP_file(void)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    X509_LOOKUP* X509_STORE_add_lookup(X509_STORE*, X509_LOOKUP_METHOD*)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    int X509_STORE_get_by_subject(X509_STORE_CTX*, int, X509_NAME*, X509_OBJECT*)
-    {
-        // TODO:
-        return SSL_SUCCESS;
-    }
-
-
-    X509_STORE* X509_STORE_new(void)
-    {
-        // TODO:
-        return 0;
-    }
-
-    char* SSL_alert_type_string_long(int)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    char* SSL_alert_desc_string_long(int)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    char* SSL_state_string_long(SSL*)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    void SSL_CTX_set_tmp_rsa_callback(SSL_CTX*, RSA*(*)(SSL*, int, int))
-    {
-        // TDOD:
-    }
-
-
-    long SSL_CTX_set_timeout(SSL_CTX*, long)
-    {
-        // TDOD:
-        return SSL_SUCCESS;
-    }
-
-
-    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-    {
-        // TDOD:
-        return SSL_SUCCESS;
-    }
-
-
-    int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX*, const char*, int)
-    {
-        // TDOD:
-        return SSL_SUCCESS;
-    }
-
-
-    int SSL_set_rfd(SSL*, int)
-    {
-        return SSL_SUCCESS; // TODO:
-    }
-
-
-    int SSL_set_wfd(SSL*, int)
-    {
-        return SSL_SUCCESS; // TODO:
-    }
-
-
-    int SSL_want_read(SSL*)
-    {
-        return 0; // TODO:
-    }
-
-
-    int SSL_want_write(SSL*)
-    {
-        return 0; // TODO:
-    }
-
-
-    void SSL_set_shutdown(SSL*, int)
-    {
-        // TODO:
-    }
-
-
-    SSL_CIPHER* SSL_get_current_cipher(SSL*)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-    char* SSL_CIPHER_description(SSL_CIPHER*, char*, int)
-    {
-        // TODO:
-        return 0;
-    }
-
-
-
-    // end stunnel needs
-
-    char *yaSSL_ASN1_TIME_to_string(ASN1_TIME *time, char *buf, size_t len)
-    {
-      tm t;
-      static const char *month_names[12]=
-      {
-        "Jan","Feb","Mar","Apr","May","Jun",
-        "Jul","Aug","Sep","Oct","Nov","Dec"
-      };
-
-      TaoCrypt::ASN1_TIME_extract(time->data, time->type, &t);
-#ifdef _WIN32
-      _snprintf(buf, len, "%s %2d %02d:%02d:%02d %d GMT",
-#else
-      snprintf(buf, len, "%s %2d %02d:%02d:%02d %d GMT",
-#endif
-               month_names[t.tm_mon], t.tm_mday, t.tm_hour, t.tm_min, 
-               t.tm_sec, t.tm_year + 1900);
-      return buf;
-    }
-
-
-    void yaSSL_transport_set_ptr(SSL *ssl, void *ptr)
-    {
-      ssl->useSocket().set_transport_ptr(ptr);
-    }
-
-
-    void yaSSL_transport_set_recv_function(SSL *ssl, yaSSL_recv_func_t func)
-    {
-      ssl->useSocket().set_transport_recv_function(func);
-    }
-
-
-    void yaSSL_transport_set_send_function(SSL *ssl, yaSSL_send_func_t func)
-    {
-      ssl->useSocket().set_transport_send_function(func);
-    }
-
-} // extern "C"
-} // namespace
diff --git a/extra/yassl/src/template_instnt.cpp b/extra/yassl/src/template_instnt.cpp
deleted file mode 100644
index 618b73f40518..000000000000
--- a/extra/yassl/src/template_instnt.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/*  Explicit template instantiation requests 
- */
-
-
-#include "runtime.hpp"
-#include "handshake.hpp"
-#include "yassl_int.hpp"
-#include "crypto_wrapper.hpp"
-#include "hmac.hpp"
-#include "md5.hpp"
-#include "sha.hpp"
-#include "ripemd.hpp"
-#include "openssl/ssl.h"
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-
-namespace mySTL {
-template class list<unsigned char*>;
-template yaSSL::del_ptr_zero for_each(mySTL::list<unsigned char*>::iterator, mySTL::list<unsigned char*>::iterator, yaSSL::del_ptr_zero);
-template pair<int, yaSSL::Message* (*)()>* uninit_copy<mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*>(mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*);
-template pair<int, yaSSL::HandShakeBase* (*)()>* uninit_copy<mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*, mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*>(mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*, mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*, mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*);
-template void destroy<mySTL::pair<int, yaSSL::Message* (*)()>*>(mySTL::pair<int, yaSSL::Message* (*)()>*, mySTL::pair<int, yaSSL::Message* (*)()>*);
-template void destroy<mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*>(mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*, mySTL::pair<int, yaSSL::HandShakeBase* (*)()>*);
-template pair<int, yaSSL::ServerKeyBase* (*)()>* uninit_copy<mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*>(mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*);
-template void destroy<mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*>(mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ServerKeyBase* (*)()>*);
-template pair<int, yaSSL::ClientKeyBase* (*)()>* uninit_copy<mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*>(mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*);
-template class list<TaoCrypt::Signer*>;
-template class list<yaSSL::SSL_SESSION*>;
-template class list<yaSSL::input_buffer*>;
-template class list<yaSSL::output_buffer*>;
-template class list<yaSSL::x509*>;
-template class list<yaSSL::Digest*>;
-template class list<yaSSL::BulkCipher*>;
-template void destroy<mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*>(mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*, mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*);
-template yaSSL::del_ptr_zero for_each<mySTL::list<TaoCrypt::Signer*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<TaoCrypt::Signer*>::iterator, mySTL::list<TaoCrypt::Signer*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::SSL_SESSION*>::iterator, mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::input_buffer*>::iterator, mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::output_buffer*>::iterator, mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::x509*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::x509*>::iterator, mySTL::list<yaSSL::x509*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::Digest*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::Digest*>::iterator, mySTL::list<yaSSL::Digest*>::iterator, yaSSL::del_ptr_zero);
-template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::BulkCipher*>::iterator, yaSSL::del_ptr_zero>(mySTL::list<yaSSL::BulkCipher*>::iterator, mySTL::list<yaSSL::BulkCipher*>::iterator, yaSSL::del_ptr_zero);
-template bool list<yaSSL::ThreadError>::erase(list<yaSSL::ThreadError>::iterator);
-template void list<yaSSL::ThreadError>::push_back(yaSSL::ThreadError);
-template void list<yaSSL::ThreadError>::pop_front();
-template void list<yaSSL::ThreadError>::pop_back();
-template list<yaSSL::ThreadError>::~list();
-template pair<int, yaSSL::Message* (*)()>* GetArrayMemory<pair<int, yaSSL::Message* (*)()> >(size_t);
-template void FreeArrayMemory<pair<int, yaSSL::Message* (*)()> >(pair<int, yaSSL::Message* (*)()>*);
-template pair<int, yaSSL::HandShakeBase* (*)()>* GetArrayMemory<pair<int, yaSSL::HandShakeBase* (*)()> >(size_t);
-template void FreeArrayMemory<pair<int, yaSSL::HandShakeBase* (*)()> >(pair<int, yaSSL::HandShakeBase* (*)()>*);
-template pair<int, yaSSL::ServerKeyBase* (*)()>* GetArrayMemory<pair<int, yaSSL::ServerKeyBase* (*)()> >(size_t);
-template void FreeArrayMemory<pair<int, yaSSL::ServerKeyBase* (*)()> >(pair<int, yaSSL::ServerKeyBase* (*)()>*);
-template pair<int, yaSSL::ClientKeyBase* (*)()>* GetArrayMemory<pair<int, yaSSL::ClientKeyBase* (*)()> >(size_t);
-template void FreeArrayMemory<pair<int, yaSSL::ClientKeyBase* (*)()> >(pair<int, yaSSL::ClientKeyBase* (*)()>*);
-}
-
-namespace yaSSL {
-template void ysDelete<SSL_CTX>(yaSSL::SSL_CTX*);
-template void ysDelete<SSL>(yaSSL::SSL*);
-template void ysDelete<BIGNUM>(yaSSL::BIGNUM*);
-template void ysDelete<unsigned char>(unsigned char*);
-template void ysDelete<DH>(yaSSL::DH*);
-template void ysDelete<TaoCrypt::Signer>(TaoCrypt::Signer*);
-template void ysDelete<SSL_SESSION>(yaSSL::SSL_SESSION*);
-template void ysDelete<input_buffer>(input_buffer*);
-template void ysDelete<output_buffer>(output_buffer*);
-template void ysDelete<x509>(x509*);
-template void ysDelete<Auth>(Auth*);
-template void ysDelete<HandShakeBase>(HandShakeBase*);
-template void ysDelete<ServerKeyBase>(ServerKeyBase*);
-template void ysDelete<ClientKeyBase>(ClientKeyBase*);
-template void ysDelete<SSL_METHOD>(SSL_METHOD*);
-template void ysDelete<DiffieHellman>(DiffieHellman*);
-template void ysDelete<BulkCipher>(BulkCipher*);
-template void ysDelete<Digest>(Digest*);
-template void ysDelete<X509>(X509*);
-template void ysDelete<Message>(Message*);
-template void ysDelete<sslFactory>(sslFactory*);
-template void ysDelete<Sessions>(Sessions*);
-template void ysDelete<Errors>(Errors*);
-template void ysArrayDelete<unsigned char>(unsigned char*);
-template void ysArrayDelete<char>(char*);
-
-template int min<int>(int, int);
-template uint16 min<uint16>(uint16, uint16);
-template unsigned int min<unsigned int>(unsigned int, unsigned int);
-template unsigned long min<unsigned long>(unsigned long, unsigned long);
-}
-
-#endif // HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-
diff --git a/extra/yassl/src/timer.cpp b/extra/yassl/src/timer.cpp
deleted file mode 100644
index a1b9063e12b7..000000000000
--- a/extra/yassl/src/timer.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* timer.cpp implements a high res and low res timer
- *
-*/
-
-#include "runtime.hpp"
-#include "timer.hpp"
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/time.h>
-#endif
-
-namespace yaSSL {
-
-#ifdef _WIN32
-
-    timer_d timer()
-    {
-        static bool          init(false);
-        static LARGE_INTEGER freq;
-    
-        if (!init) {
-            QueryPerformanceFrequency(&freq);
-            init = true;
-        }
-
-        LARGE_INTEGER count;
-        QueryPerformanceCounter(&count);
-
-        return static_cast<double>(count.QuadPart) / freq.QuadPart;
-    }
-
-
-    uint lowResTimer()
-    {
-        return static_cast<uint>(timer());
-    }
-
-#else // _WIN32
-
-    timer_d timer()
-    {
-        struct timeval tv;
-        gettimeofday(&tv, 0);
-
-        return static_cast<double>(tv.tv_sec) 
-             + static_cast<double>(tv.tv_usec) / 1000000;
-    }
-
-
-    uint lowResTimer()
-    {
-        struct timeval tv;
-        gettimeofday(&tv, 0);
-
-        return tv.tv_sec; 
-    }
-
-
-#endif // _WIN32
-} // namespace yaSSL
diff --git a/extra/yassl/src/yassl.cpp b/extra/yassl/src/yassl.cpp
deleted file mode 100644
index b6b9a87e09ad..000000000000
--- a/extra/yassl/src/yassl.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL implements external API
- */
-
-#include "runtime.hpp"
-#include "yassl.hpp"
-#include "yassl_int.hpp"
-#include "handshake.hpp"
-#include <stdio.h>
-
-#include "openssl/ssl.h"  // get rid of this
-
-
-
-namespace yaSSL {
-
-
-
-struct Base {
-    SSL_METHOD* method_;
-    SSL_CTX*    ctx_;
-    SSL*        ssl_;
-
-    char*       ca_;
-    char*       cert_;
-    char*       key_;
-
-    DH*         dh_;
-
-    Base() : method_(0), ctx_(0), ssl_(0), ca_(0), cert_(0), key_(0), dh_(0)
-    {}
-
-    ~Base()
-    {
-        if (dh_) DH_free(dh_);
-        delete[] key_;
-        delete[] cert_;
-        delete[] ca_;
-        SSL_CTX_free(ctx_);   // frees method_ too
-        SSL_free(ssl_);
-    }
-};
-
-
-void SetDH(Base&);
-
-void SetUpBase(Base& base, ConnectionEnd end, SOCKET_T s)
-{
-    base.method_ = new SSL_METHOD(end, ProtocolVersion(3,1));
-    base.ctx_ =    new SSL_CTX(base.method_);
-
-    if (base.ca_)
-        if (SSL_CTX_load_verify_locations(base.ctx_,
-            base.ca_, 0) != SSL_SUCCESS) throw(0);
-    if (base.cert_)
-        if (SSL_CTX_use_certificate_file(base.ctx_,
-            base.cert_, SSL_FILETYPE_PEM) != SSL_SUCCESS) throw(0);
-    if (base.key_)
-        if (SSL_CTX_use_PrivateKey_file(base.ctx_, base.key_,
-            SSL_FILETYPE_PEM) != SSL_SUCCESS) throw(0);
-
-    if (end == server_end) SetDH(base);
-
-    base.ssl_ = new SSL(base.ctx_);
-    base.ssl_->useSocket().set_fd(s);
-}
-
-
-void SetDH(Base& base)
-{
-    static unsigned char dh512_p[] =
-    {
-      0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
-      0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
-      0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
-      0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
-      0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
-      0x47,0x74,0xE8,0x33,
-    };
-
-    static unsigned char dh512_g[] =
-    {
-      0x02,
-    };
-
-    if ( (base.dh_ = DH_new()) ) {
-        base.dh_->p = BN_bin2bn(dh512_p, sizeof(dh512_p), 0);
-        base.dh_->g = BN_bin2bn(dh512_g, sizeof(dh512_g), 0);
-    }
-    if (!base.dh_->p || !base.dh_->g) {
-        DH_free(base.dh_);
-        base.dh_ = 0;
-    }
-    SSL_CTX_set_tmp_dh(base.ctx_, base.dh_);
-}
-
-
-void NewCopy(char*& dst, const char* src)
-{
-    size_t len = strlen(src) + 1;
-    dst = new char[len];
-
-    strncpy(dst, src, len);
-}
-
-
-// Client Implementation
-struct Client::ClientImpl {
-    Base base_;
-};
-
-
-Client::Client() : pimpl_(new ClientImpl)
-{}
-
-
-Client::~Client() { delete pimpl_; }
-
-
-int Client::Connect(SOCKET_T s)
-{
-    SetUpBase(pimpl_->base_, client_end, s);
-    return SSL_connect(pimpl_->base_.ssl_);
-}
-
-
-int Client::Write(const void* buffer, int sz)
-{
-    return sendData(*pimpl_->base_.ssl_, buffer, sz);
-}
-
-
-int Client::Read(void* buffer, int sz)
-{
-    Data data(min(sz, MAX_RECORD_SIZE), static_cast<opaque*>(buffer));
-    return receiveData(*pimpl_->base_.ssl_, data);
-}
-
-
-void Client::SetCA(const char* name)
-{
-    NewCopy(pimpl_->base_.ca_, name);
-}
-
-
-void Client::SetCert(const char* name)
-{
-    NewCopy(pimpl_->base_.cert_, name);
-}
-
-
-void Client::SetKey(const char* name)
-{
-    NewCopy(pimpl_->base_.key_, name);
-}
-
-
-
-// Server Implementation
-struct Server::ServerImpl {
-    Base base_;
-};
-
-
-Server::Server() : pimpl_(new ServerImpl)
-{}
-
-
-Server::~Server() { delete pimpl_; }
-
-
-int Server::Accept(SOCKET_T s)
-{
-    SetUpBase(pimpl_->base_, server_end, s);
-    return SSL_accept(pimpl_->base_.ssl_);
-}
-
-
-int Server::Write(const void* buffer, int sz)
-{
-    return sendData(*pimpl_->base_.ssl_, buffer, sz);
-}
-
-
-int Server::Read(void* buffer, int sz)
-{
-    Data data(min(sz, MAX_RECORD_SIZE), static_cast<opaque*>(buffer));
-    return receiveData(*pimpl_->base_.ssl_, data);
-}
-
-
-void Server::SetCA(const char* name)
-{
-    NewCopy(pimpl_->base_.ca_, name);
-}
-
-
-void Server::SetCert(const char* name)
-{
-    NewCopy(pimpl_->base_.cert_, name);
-}
-
-
-void Server::SetKey(const char* name)
-{
-    NewCopy(pimpl_->base_.key_, name);
-}
-
-
-
-} // namespace yaSSL
diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp
deleted file mode 100644
index 5169b7dd5d0f..000000000000
--- a/extra/yassl/src/yassl_error.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* yaSSL error implements and an exception class
- */
-
-#include "runtime.hpp"
-#include "yassl_error.hpp"
-#include "error.hpp"        // TaoCrypt error numbers
-#include "openssl/ssl.h"    // SSL_ERROR_WANT_READ
-#include <string.h>         // strncpy
-
-#ifdef _MSC_VER
-    // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
-    #pragma warning(disable: 4996)
-#endif
-
-namespace yaSSL {
-
-
-/* may bring back in future
-Error::Error(const char* s, YasslError e, Library l) 
-    : mySTL::runtime_error(s), error_(e), lib_(l) 
-{
-}
-
-
-YasslError Error::get_number() const
-{
-    return error_;
-}
-
-
-Library Error::get_lib() const
-{
-
-    return lib_;
-}
-*/
-
-
-void SetErrorString(YasslError error, char* buffer)
-{
-    using namespace TaoCrypt;
-    const int max = MAX_ERROR_SZ;  // shorthand
-    int localError = error;        // errors from a few enums 
-
-    switch (localError) {
-
-        // yaSSL proper errors
-    case range_error :
-        strncpy(buffer, "buffer index error, out of range", max);
-        break; 
-
-    case realloc_error :
-        strncpy(buffer, "trying to realloc a fixed buffer", max);
-        break; 
-
-    case factory_error : 
-        strncpy(buffer, "unknown factory create request", max);
-        break; 
-
-    case unknown_cipher :
-        strncpy(buffer, "trying to use an unknown cipher", max);
-        break; 
-
-    case prefix_error : 
-        strncpy(buffer, "bad master secret derivation, prefix too big", max);
-        break; 
-
-    case record_layer : 
-        strncpy(buffer, "record layer not ready yet", max);
-        break; 
-        
-    case handshake_layer :
-        strncpy(buffer, "handshake layer not ready yet", max);
-        break; 
-
-    case out_of_order :
-        strncpy(buffer, "handshake message received in wrong order", max);
-        break; 
-
-    case bad_input : 
-        strncpy(buffer, "bad cipher suite input", max);
-        break; 
-
-    case match_error :
-        strncpy(buffer, "unable to match a supported cipher suite", max);
-        break; 
-
-    case no_key_file : 
-        strncpy(buffer, "the server needs a private key file", max);
-        break; 
-
-    case verify_error :
-        strncpy(buffer, "unable to verify peer checksum", max);
-        break; 
-
-    case send_error :
-        strncpy(buffer, "socket layer send error", max);
-        break; 
-
-    case receive_error :
-        strncpy(buffer, "socket layer receive error", max);
-        break; 
-
-    case certificate_error :
-        strncpy(buffer, "unable to proccess cerificate", max);
-        break;
-
-    case privateKey_error :
-        strncpy(buffer, "unable to proccess private key, bad format", max);
-        break;
-
-    case badVersion_error :
-        strncpy(buffer, "protocol version mismatch", max);
-        break;
-
-    case compress_error :
-        strncpy(buffer, "compression error", max);
-        break;
-
-    case decompress_error :
-        strncpy(buffer, "decompression error", max);
-        break;
-
-    case pms_version_error :
-        strncpy(buffer, "bad PreMasterSecret version error", max);
-        break;
-
-    case sanityCipher_error :
-        strncpy(buffer, "sanity check on cipher text size error", max);
-        break;
-
-    case rsaSignFault_error:
-        strncpy(buffer, "rsa signature fault error", max);
-        break;
-
-        // openssl errors
-    case SSL_ERROR_WANT_READ :
-        strncpy(buffer, "the read operation would block", max);
-        break;
-
-    case SSL_ERROR_WANT_WRITE :
-        strncpy(buffer, "the write operation would block", max);
-        break;
-
-    case CERTFICATE_ERROR :
-        strncpy(buffer, "Unable to verify certificate", max);
-        break;
-
-        // TaoCrypt errors
-    case NO_ERROR_E :
-        strncpy(buffer, "not in error state", max);
-        break;
-
-    case WINCRYPT_E :
-        strncpy(buffer, "bad wincrypt acquire", max);
-        break;
-
-    case CRYPTGEN_E :
-        strncpy(buffer, "CryptGenRandom error", max);
-        break;
-
-    case OPEN_RAN_E :
-        strncpy(buffer, "unable to use random device", max);
-        break;
-
-    case READ_RAN_E :
-        strncpy(buffer, "unable to use random device", max);
-        break;
-
-    case INTEGER_E :
-        strncpy(buffer, "ASN: bad DER Integer Header", max);
-        break;
-
-    case SEQUENCE_E :
-        strncpy(buffer, "ASN: bad Sequence Header", max);
-        break;
-
-    case SET_E :
-        strncpy(buffer, "ASN: bad Set Header", max);
-        break;
-
-    case VERSION_E :
-        strncpy(buffer, "ASN: version length not 1", max);
-        break;
-
-    case SIG_OID_E :
-        strncpy(buffer, "ASN: signature OID mismatch", max);
-        break;
-
-    case BIT_STR_E :
-        strncpy(buffer, "ASN: bad BitString Header", max);
-        break;
-
-    case UNKNOWN_OID_E :
-        strncpy(buffer, "ASN: unknown key OID type", max);
-        break;
-
-    case OBJECT_ID_E :
-        strncpy(buffer, "ASN: bad Ojbect ID Header", max);
-        break;
-
-    case TAG_NULL_E :
-        strncpy(buffer, "ASN: expected TAG NULL", max);
-        break;
-
-    case EXPECT_0_E :
-        strncpy(buffer, "ASN: expected 0", max);
-        break;
-
-    case OCTET_STR_E :
-        strncpy(buffer, "ASN: bad Octet String Header", max);
-        break;
-
-    case TIME_E :
-        strncpy(buffer, "ASN: bad TIME", max);
-        break;
-
-    case DATE_SZ_E :
-        strncpy(buffer, "ASN: bad Date Size", max);
-        break;
-
-    case SIG_LEN_E :
-        strncpy(buffer, "ASN: bad Signature Length", max);
-        break;
-
-    case UNKOWN_SIG_E :
-        strncpy(buffer, "ASN: unknown signature OID", max);
-        break;
-
-    case UNKOWN_HASH_E :
-        strncpy(buffer, "ASN: unknown hash OID", max);
-        break;
-
-    case DSA_SZ_E :
-        strncpy(buffer, "ASN: bad DSA r or s size", max);
-        break;
-
-    case BEFORE_DATE_E :
-        strncpy(buffer, "ASN: before date in the future", max);
-        break;
-
-    case AFTER_DATE_E :
-        strncpy(buffer, "ASN: after date in the past", max);
-        break;
-
-    case SIG_CONFIRM_E :
-        strncpy(buffer, "ASN: bad self signature confirmation", max);
-        break;
-
-    case SIG_OTHER_E :
-        strncpy(buffer, "ASN: bad other signature confirmation", max);
-        break;
-
-    case CONTENT_E :
-        strncpy(buffer, "bad content processing", max);
-        break;
-
-    case PEM_E :
-        strncpy(buffer, "bad PEM format processing", max);
-        break;
-
-    default :
-        strncpy(buffer, "unknown error number", max);
-    }
-}
-
-
-
-}  // namespace yaSSL
diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp
deleted file mode 100644
index ea09777dcd44..000000000000
--- a/extra/yassl/src/yassl_imp.cpp
+++ /dev/null
@@ -1,2642 +0,0 @@
-/*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/*  yaSSL source implements all SSL.v3 secification structures.
- */
-
-#include "runtime.hpp"
-#include "yassl_int.hpp"
-#include "handshake.hpp"
-
-#include "asn.hpp"  // provide crypto wrapper??
-
-
-
-namespace yaSSL {
-
-
-namespace { // locals
-
-bool isTLS(ProtocolVersion pv)
-{
-    if (pv.major_ >= 3 && pv.minor_ >= 1)
-        return true;
-
-    return false;
-}
-
-
-}  // namespace (locals)
-
-
-void hashHandShake(SSL&, const input_buffer&, uint);
-
-
-ProtocolVersion::ProtocolVersion(uint8 maj, uint8 min) 
-    : major_(maj), minor_(min) 
-{}
-
-
-// construct key exchange with known ssl parms
-void ClientKeyExchange::createKey(SSL& ssl)
-{
-    const ClientKeyFactory& ckf = ssl.getFactory().getClientKey();
-    client_key_ = ckf.CreateObject(ssl.getSecurity().get_parms().kea_);
-
-    if (!client_key_)
-        ssl.SetError(factory_error);
-}
-
-
-// construct key exchange with known ssl parms
-void ServerKeyExchange::createKey(SSL& ssl)
-{
-    const ServerKeyFactory& skf = ssl.getFactory().getServerKey();
-    server_key_ = skf.CreateObject(ssl.getSecurity().get_parms().kea_);
-
-    if (!server_key_)
-        ssl.SetError(factory_error);
-}
-
-
-// build/set PreMaster secret and encrypt, client side
-void EncryptedPreMasterSecret::build(SSL& ssl)
-{
-    opaque tmp[SECRET_LEN];
-    memset(tmp, 0, sizeof(tmp));
-    ssl.getCrypto().get_random().Fill(tmp, SECRET_LEN);
-    ProtocolVersion pv = ssl.getSecurity().get_connection().chVersion_;
-    tmp[0] = pv.major_;
-    tmp[1] = pv.minor_;
-    ssl.set_preMaster(tmp, SECRET_LEN);
-
-    const CertManager& cert = ssl.getCrypto().get_certManager();
-    RSA rsa(cert.get_peerKey(), cert.get_peerKeyLength());
-    bool tls = ssl.isTLS();     // if TLS, put length for encrypted data
-    alloc(rsa.get_cipherLength() + (tls ? 2 : 0));
-    byte* holder = secret_;
-    if (tls) {
-        byte len[2];
-        c16toa(rsa.get_cipherLength(), len);
-        memcpy(secret_, len, sizeof(len));
-        holder += 2;
-    }
-    rsa.encrypt(holder, tmp, SECRET_LEN, ssl.getCrypto().get_random());
-}
-
-
-// build/set premaster and Client Public key, client side
-void ClientDiffieHellmanPublic::build(SSL& ssl)
-{
-    DiffieHellman& dhServer = ssl.useCrypto().use_dh();
-    DiffieHellman  dhClient(dhServer);
-
-    uint keyLength = dhClient.get_agreedKeyLength(); // pub and agree same
-
-    alloc(keyLength, true);
-    dhClient.makeAgreement(dhServer.get_publicKey(),
-                           dhServer.get_publicKeyLength());
-    c16toa(keyLength, Yc_);
-    memcpy(Yc_ + KEY_OFFSET, dhClient.get_publicKey(), keyLength);
-
-    ssl.set_preMaster(dhClient.get_agreedKey(), keyLength);
-}
-
-
-// build server exhange, server side
-void DH_Server::build(SSL& ssl)
-{
-    DiffieHellman& dhServer = ssl.useCrypto().use_dh();
-
-    int pSz, gSz, pubSz;
-    dhServer.set_sizes(pSz, gSz, pubSz);
-    dhServer.get_parms(parms_.alloc_p(pSz), parms_.alloc_g(gSz),
-                       parms_.alloc_pub(pubSz));
-
-    short sigSz = 0;
-    mySTL::auto_ptr<Auth> auth;
-    const CertManager& cert = ssl.getCrypto().get_certManager();
-    
-    if (ssl.getSecurity().get_parms().sig_algo_ == rsa_sa_algo) {
-        if (cert.get_keyType() != rsa_sa_algo) {
-            ssl.SetError(privateKey_error);
-            return;
-        }
-        auth.reset(NEW_YS RSA(cert.get_privateKey(),
-                   cert.get_privateKeyLength(), false));
-    }
-    else {
-        if (cert.get_keyType() != dsa_sa_algo) {
-            ssl.SetError(privateKey_error);
-            return;
-        }
-        auth.reset(NEW_YS DSS(cert.get_privateKey(),
-                   cert.get_privateKeyLength(), false));
-        sigSz += DSS_ENCODED_EXTRA;
-    }
-    
-    sigSz += auth->get_signatureLength();
-    if (!sigSz) {
-        ssl.SetError(privateKey_error);
-        return;
-    }
-
-    length_ = 8; // pLen + gLen + YsLen + SigLen
-    length_ += pSz + gSz + pubSz + sigSz;
-
-    output_buffer tmp(length_);
-    byte len[2];
-    // P
-    c16toa(pSz, len);
-    tmp.write(len, sizeof(len));
-    tmp.write(parms_.get_p(), pSz);
-    // G
-    c16toa(gSz, len);
-    tmp.write(len, sizeof(len));
-    tmp.write(parms_.get_g(), gSz);
-    // Ys
-    c16toa(pubSz, len);
-    tmp.write(len, sizeof(len));
-    tmp.write(parms_.get_pub(), pubSz);
-
-    // Sig
-    byte hash[FINISHED_SZ];
-    MD5  md5;
-    SHA  sha;
-    signature_ = NEW_YS byte[sigSz];
-
-    const Connection& conn = ssl.getSecurity().get_connection();
-    // md5
-    md5.update(conn.client_random_, RAN_LEN);
-    md5.update(conn.server_random_, RAN_LEN);
-    md5.update(tmp.get_buffer(), tmp.get_size());
-    md5.get_digest(hash);
-
-    // sha
-    sha.update(conn.client_random_, RAN_LEN);
-    sha.update(conn.server_random_, RAN_LEN);
-    sha.update(tmp.get_buffer(), tmp.get_size());
-    sha.get_digest(&hash[MD5_LEN]);
-
-    if (ssl.getSecurity().get_parms().sig_algo_ == rsa_sa_algo) {
-        auth->sign(signature_, hash, sizeof(hash),
-                   ssl.getCrypto().get_random());
-        // check for rsa signautre fault
-        if (!auth->verify(hash, sizeof(hash), signature_,
-                                              auth->get_signatureLength())) {
-            ssl.SetError(rsaSignFault_error);
-            return;
-        }
-    }
-    else {
-        auth->sign(signature_, &hash[MD5_LEN], SHA_LEN,
-                   ssl.getCrypto().get_random());
-        byte encoded[DSS_SIG_SZ + DSS_ENCODED_EXTRA];
-        TaoCrypt::EncodeDSA_Signature(signature_, encoded);
-        memcpy(signature_, encoded, sizeof(encoded));
-    }
-
-    c16toa(sigSz, len);
-    tmp.write(len, sizeof(len));
-    tmp.write(signature_, sigSz);
-
-    // key message
-    keyMessage_ = NEW_YS opaque[length_];
-    memcpy(keyMessage_, tmp.get_buffer(), tmp.get_size());
-}
-
-
-// read PreMaster secret and decrypt, server side
-void EncryptedPreMasterSecret::read(SSL& ssl, input_buffer& input)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    const CertManager& cert = ssl.getCrypto().get_certManager();
-    RSA rsa(cert.get_privateKey(), cert.get_privateKeyLength(), false);
-    uint16 cipherLen = rsa.get_cipherLength();
-    if (ssl.isTLS()) {
-        byte len[2];
-        len[0] = input[AUTO];
-        len[1] = input[AUTO];
-        ato16(len, cipherLen);
-    }
-    alloc(cipherLen);
-    input.read(secret_, length_);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    opaque preMasterSecret[SECRET_LEN];
-    memset(preMasterSecret, 0, sizeof(preMasterSecret));
-    rsa.decrypt(preMasterSecret, secret_, length_, 
-                ssl.getCrypto().get_random());
-
-    ProtocolVersion pv = ssl.getSecurity().get_connection().chVersion_;
-    if (pv.major_ != preMasterSecret[0] || pv.minor_ != preMasterSecret[1])
-        ssl.SetError(pms_version_error); // continue deriving for timing attack
-
-    ssl.set_preMaster(preMasterSecret, SECRET_LEN);
-    ssl.makeMasterSecret();
-}
-
-
-EncryptedPreMasterSecret::EncryptedPreMasterSecret()
-    : secret_(0), length_(0)
-{}
-
-
-EncryptedPreMasterSecret::~EncryptedPreMasterSecret()
-{
-    ysArrayDelete(secret_);
-}
-
-
-int EncryptedPreMasterSecret::get_length() const
-{
-    return length_;
-}
-
-
-opaque* EncryptedPreMasterSecret::get_clientKey() const
-{
-    return secret_;
-}
-
-
-void EncryptedPreMasterSecret::alloc(int sz)
-{
-    length_ = sz;
-    secret_ = NEW_YS opaque[sz];
-}
-
-
-// read client's public key, server side
-void ClientDiffieHellmanPublic::read(SSL& ssl, input_buffer& input)
-{
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    DiffieHellman& dh = ssl.useCrypto().use_dh();
-
-    uint16 keyLength;
-    byte tmp[2];
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, keyLength);
-
-    if (keyLength < dh.get_agreedKeyLength()/2) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    alloc(keyLength);
-    input.read(Yc_, keyLength);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    dh.makeAgreement(Yc_, keyLength); 
-
-    ssl.set_preMaster(dh.get_agreedKey(), dh.get_agreedKeyLength());
-    ssl.makeMasterSecret();
-}
-
-
-ClientDiffieHellmanPublic::ClientDiffieHellmanPublic()
-    : length_(0), Yc_(0)
-{}
-
-
-ClientDiffieHellmanPublic::~ClientDiffieHellmanPublic()
-{
-    ysArrayDelete(Yc_);
-}
-
-
-int ClientDiffieHellmanPublic::get_length() const
-{
-    return length_;
-}
-
-
-opaque* ClientDiffieHellmanPublic::get_clientKey() const
-{
-    return Yc_;
-}
-
-
-void ClientDiffieHellmanPublic::alloc(int sz, bool offset) 
-{
-    length_ = sz + (offset ? KEY_OFFSET : 0); 
-    Yc_ = NEW_YS opaque[length_];
-}
-
-
-// read server's p, g, public key and sig, client side
-void DH_Server::read(SSL& ssl, input_buffer& input)
-{
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    uint16 length, messageTotal = 6; // pSz + gSz + pubSz
-    byte tmp[2];
-
-    // p
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, length);
-    messageTotal += length;
-
-    input.read(parms_.alloc_p(length), length);
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // g
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, length);
-    messageTotal += length;
-
-    input.read(parms_.alloc_g(length), length);
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // pub
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, length);
-    messageTotal += length;
-
-    input.read(parms_.alloc_pub(length), length);
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // save message for hash verify
-    input_buffer message(messageTotal);
-    input.set_current(input.get_current() - messageTotal);
-    input.read(message.get_buffer(), messageTotal);
-    message.add_size(messageTotal);
-    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // signature
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, length);
-
-    if (length == 0) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    signature_ = NEW_YS byte[length];
-    input.read(signature_, length);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // verify signature
-    byte hash[FINISHED_SZ];
-    MD5  md5;
-    SHA  sha;
-
-    const Connection& conn = ssl.getSecurity().get_connection();
-    // md5
-    md5.update(conn.client_random_, RAN_LEN);
-    md5.update(conn.server_random_, RAN_LEN);
-    md5.update(message.get_buffer(), message.get_size());
-    md5.get_digest(hash);
-
-    // sha
-    sha.update(conn.client_random_, RAN_LEN);
-    sha.update(conn.server_random_, RAN_LEN);
-    sha.update(message.get_buffer(), message.get_size());
-    sha.get_digest(&hash[MD5_LEN]);
-
-    const CertManager& cert = ssl.getCrypto().get_certManager();
-    
-    if (ssl.getSecurity().get_parms().sig_algo_ == rsa_sa_algo) {
-        RSA rsa(cert.get_peerKey(), cert.get_peerKeyLength());
-        if (!rsa.verify(hash, sizeof(hash), signature_, length))
-            ssl.SetError(verify_error);
-    }
-    else {
-        byte decodedSig[DSS_SIG_SZ];
-        length = TaoCrypt::DecodeDSA_Signature(decodedSig, signature_, length);
-        
-        DSS dss(cert.get_peerKey(), cert.get_peerKeyLength());
-        if (!dss.verify(&hash[MD5_LEN], SHA_LEN, decodedSig, length))
-            ssl.SetError(verify_error);
-    }
-
-    // save input
-    ssl.useCrypto().SetDH(NEW_YS DiffieHellman(parms_.get_p(),
-               parms_.get_pSize(), parms_.get_g(), parms_.get_gSize(),
-               parms_.get_pub(), parms_.get_pubSize(),
-               ssl.getCrypto().get_random()));
-}
-
-
-DH_Server::DH_Server()
-    : signature_(0), length_(0), keyMessage_(0)
-{}
-
-
-DH_Server::~DH_Server()
-{
-    ysArrayDelete(keyMessage_);
-    ysArrayDelete(signature_);
-}
-
-
-int DH_Server::get_length() const
-{
-    return length_;
-}
-
-
-opaque* DH_Server::get_serverKey() const
-{
-    return keyMessage_;
-}
-
-
-// set available suites
-Parameters::Parameters(ConnectionEnd ce, const Ciphers& ciphers, 
-                       ProtocolVersion pv, bool haveDH) : entity_(ce)
-{
-    pending_ = true;	// suite not set yet
-    strncpy(cipher_name_, "NONE", 5);
-
-    removeDH_ = !haveDH;   // only use on server side for set suites
-
-    if (ciphers.setSuites_) {   // use user set list
-        suites_size_ = ciphers.suiteSz_;
-        memcpy(suites_, ciphers.suites_, ciphers.suiteSz_);
-        SetCipherNames();
-    }
-    else 
-        SetSuites(pv, ce == server_end && removeDH_);  // defaults
-
-}
-
-
-void Parameters::SetSuites(ProtocolVersion pv, bool removeDH, bool removeRSA,
-                           bool removeDSA)
-{
-    int i = 0;
-    // available suites, best first
-    // when adding more, make sure cipher_names is updated and
-    //      MAX_CIPHERS is big enough
-
-    if (isTLS(pv)) {
-        if (!removeDH) {
-            if (!removeRSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-            }
-            if (!removeDSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
-            }
-        }
-        if (!removeRSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = TLS_RSA_WITH_AES_256_CBC_SHA;
-        }
-        if (!removeDH) {
-            if (!removeRSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-            }
-            if (!removeDSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_DSS_WITH_AES_128_CBC_SHA;
-            }
-        }
-        if (!removeRSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = TLS_RSA_WITH_AES_128_CBC_SHA;
-            suites_[i++] = 0x00;
-            suites_[i++] = TLS_RSA_WITH_AES_256_CBC_RMD160;
-            suites_[i++] = 0x00;
-            suites_[i++] = TLS_RSA_WITH_AES_128_CBC_RMD160;
-            suites_[i++] = 0x00;
-            suites_[i++] = TLS_RSA_WITH_3DES_EDE_CBC_RMD160;
-        }
-        if (!removeDH) {
-            if (!removeRSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_RSA_WITH_AES_256_CBC_RMD160;
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_RSA_WITH_AES_128_CBC_RMD160;
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160;
-            }
-            if (!removeDSA) {
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_DSS_WITH_AES_256_CBC_RMD160;
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_DSS_WITH_AES_128_CBC_RMD160;
-                suites_[i++] = 0x00;
-                suites_[i++] = TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160;
-            }
-        }
-    }
-
-    if (!removeRSA) {
-        suites_[i++] = 0x00;
-        suites_[i++] = SSL_RSA_WITH_RC4_128_SHA;  
-        suites_[i++] = 0x00;
-        suites_[i++] = SSL_RSA_WITH_RC4_128_MD5;
-
-        suites_[i++] = 0x00;
-        suites_[i++] = SSL_RSA_WITH_3DES_EDE_CBC_SHA;
-        suites_[i++] = 0x00;
-        suites_[i++] = SSL_RSA_WITH_DES_CBC_SHA;
-    }
-    if (!removeDH) {
-        if (!removeRSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA;
-        }
-        if (!removeDSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA;
-        }
-        if (!removeRSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = SSL_DHE_RSA_WITH_DES_CBC_SHA;
-        }
-        if (!removeDSA) {
-            suites_[i++] = 0x00;
-            suites_[i++] = SSL_DHE_DSS_WITH_DES_CBC_SHA;
-        }
-    }
-
-    suites_size_ = i;
-
-    SetCipherNames();
-}
-
-
-void Parameters::SetCipherNames()
-{
-    const int suites = suites_size_ / 2;
-    int pos = 0;
-
-    for (int j = 0; j < suites; j++) {
-        int index = suites_[j*2 + 1];  // every other suite is suite id
-        size_t len = strlen(cipher_names[index]) + 1;
-        strncpy(cipher_list_[pos++], cipher_names[index], len);
-    }
-    cipher_list_[pos][0] = 0;
-}
-
-
-// input operator for RecordLayerHeader, adjust stream
-input_buffer& operator>>(input_buffer& input, RecordLayerHeader& hdr)
-{
-    hdr.type_ = ContentType(input[AUTO]);
-    hdr.version_.major_ = input[AUTO];
-    hdr.version_.minor_ = input[AUTO];
-
-    // length
-    byte tmp[2];
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, hdr.length_);
-
-    return input;
-}
-
-
-// output operator for RecordLayerHeader
-output_buffer& operator<<(output_buffer& output, const RecordLayerHeader& hdr)
-{
-    output[AUTO] = hdr.type_;
-    output[AUTO] = hdr.version_.major_;
-    output[AUTO] = hdr.version_.minor_;
-    
-    // length
-    byte tmp[2];
-    c16toa(hdr.length_, tmp);
-    output[AUTO] = tmp[0];
-    output[AUTO] = tmp[1];
-
-    return output;
-}
-
-
-// virtual input operator for Messages
-input_buffer& operator>>(input_buffer& input, Message& msg)
-{
-    return msg.set(input);
-}
-
-// virtual output operator for Messages
-output_buffer& operator<<(output_buffer& output, const Message& msg)
-{
-    return msg.get(output);
-}
-
-
-// input operator for HandShakeHeader
-input_buffer& operator>>(input_buffer& input, HandShakeHeader& hs)
-{
-    hs.type_ = HandShakeType(input[AUTO]);
-
-    hs.length_[0] = input[AUTO];
-    hs.length_[1] = input[AUTO];
-    hs.length_[2] = input[AUTO];
-    
-    return input;
-}
-
-
-// output operator for HandShakeHeader
-output_buffer& operator<<(output_buffer& output, const HandShakeHeader& hdr)
-{
-    output[AUTO] = hdr.type_;
-    output.write(hdr.length_, sizeof(hdr.length_));
-    return output;
-}
-
-
-// HandShake Header Processing function
-void HandShakeHeader::Process(input_buffer& input, SSL& ssl)
-{
-    ssl.verifyState(*this);
-    if (ssl.GetError()) return;
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    const HandShakeFactory& hsf = ssl.getFactory().getHandShake();
-    mySTL::auto_ptr<HandShakeBase> hs(hsf.CreateObject(type_));
-    if (!hs.get()) {
-        ssl.SetError(factory_error);
-        return;
-    }
-
-    uint len = c24to32(length_);
-    if (len > input.get_remaining()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    hashHandShake(ssl, input, len);
-
-    hs->set_length(len);
-    input >> *hs;
-    hs->Process(input, ssl);
-}
-
-
-ContentType HandShakeHeader::get_type() const
-{
-    return handshake;
-}
-
-
-uint16 HandShakeHeader::get_length() const
-{
-    return c24to32(length_);
-}
-
-
-HandShakeType HandShakeHeader::get_handshakeType() const
-{
-    return type_;
-}
-
-
-void HandShakeHeader::set_type(HandShakeType hst)
-{
-    type_ = hst;
-}
-
-
-void HandShakeHeader::set_length(uint32 u32)
-{
-    c32to24(u32, length_);
-}
-
-
-input_buffer& HandShakeHeader::set(input_buffer& in)
-{
-    return in >> *this;
-}
-
-
-output_buffer& HandShakeHeader::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-
-int HandShakeBase::get_length() const
-{
-    return length_;
-}
-
-
-void HandShakeBase::set_length(int l)
-{
-    length_ = l;
-}
-
-
-// for building buffer's type field
-HandShakeType HandShakeBase::get_type() const
-{
-    return no_shake;
-}
-
-
-input_buffer& HandShakeBase::set(input_buffer& in)
-{
-    return in;
-}
-
- 
-output_buffer& HandShakeBase::get(output_buffer& out) const
-{
-    return out;
-}
-
-
-void HandShakeBase::Process(input_buffer&, SSL&) 
-{}
-
-
-input_buffer& HelloRequest::set(input_buffer& in)
-{
-    return in;
-}
-
-
-output_buffer& HelloRequest::get(output_buffer& out) const
-{
-    return out;
-}
-
-
-void HelloRequest::Process(input_buffer&, SSL&)
-{}
-
-
-HandShakeType HelloRequest::get_type() const
-{
-    return hello_request;
-}
-
-
-// input operator for CipherSpec
-input_buffer& operator>>(input_buffer& input, ChangeCipherSpec& cs)
-{
-    cs.type_ = CipherChoice(input[AUTO]);
-    return input; 
-}
-
-// output operator for CipherSpec
-output_buffer& operator<<(output_buffer& output, const ChangeCipherSpec& cs)
-{
-    output[AUTO] = cs.type_;
-    return output;
-}
-
-
-ChangeCipherSpec::ChangeCipherSpec() 
-    : type_(change_cipher_spec_choice)
-{}
-
-
-input_buffer& ChangeCipherSpec::set(input_buffer& in)
-{
-    return in >> *this;
-}
-
-
-output_buffer& ChangeCipherSpec::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-ContentType ChangeCipherSpec::get_type() const
-{
-    return change_cipher_spec;
-}
-
-
-uint16 ChangeCipherSpec::get_length() const
-{
-    return SIZEOF_ENUM;
-}
-
-
-// CipherSpec processing handler
-void ChangeCipherSpec::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // detect duplicate change_cipher
-    if (ssl.getSecurity().get_parms().pending_ == false) {
-        ssl.order_error();
-        return;
-    }
-
-    ssl.useSecurity().use_parms().pending_ = false;
-    if (ssl.getSecurity().get_resuming()) {
-        if (ssl.getSecurity().get_parms().entity_ == client_end)
-            buildFinished(ssl, ssl.useHashes().use_verify(), server); // server
-    }
-    else if (ssl.getSecurity().get_parms().entity_ == server_end)
-        buildFinished(ssl, ssl.useHashes().use_verify(), client);     // client
-}
-
-
-Alert::Alert(AlertLevel al, AlertDescription ad)
-    : level_(al), description_(ad)
-{}
-
-
-ContentType Alert::get_type() const
-{
-    return alert;
-}
-
-
-uint16 Alert::get_length() const
-{
-    return SIZEOF_ENUM * 2;
-}
-
-
-input_buffer& Alert::set(input_buffer& in)
-{
-    return in >> *this;
-}
-
-
-output_buffer& Alert::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-// input operator for Alert
-input_buffer& operator>>(input_buffer& input, Alert& a)
-{
-    a.level_ = AlertLevel(input[AUTO]);
-    a.description_ = AlertDescription(input[AUTO]);
- 
-    return input;
-}
-
-
-// output operator for Alert
-output_buffer& operator<<(output_buffer& output, const Alert& a)
-{
-    output[AUTO] = a.level_;
-    output[AUTO] = a.description_;
-    return output;
-}
-
-
-// Alert processing handler
-void Alert::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    if (ssl.getSecurity().get_parms().pending_ == false)  { // encrypted alert
-        int            aSz = get_length();  // alert size already read on input
-        opaque         verify[SHA_LEN];
-        const  opaque* data = input.get_buffer() + input.get_current() - aSz;
-
-        if (ssl.isTLS())
-            TLS_hmac(ssl, verify, data, aSz, alert, true);
-        else
-            hmac(ssl, verify, data, aSz, alert, true);
-
-        // read mac and skip fill
-        int    digestSz = ssl.getCrypto().get_digest().get_digestSize();
-        opaque mac[SHA_LEN];
-        input.read(mac, digestSz);
-
-        if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-            int    ivExtra = 0;
-            opaque fill;
-
-            if (ssl.isTLSv1_1())
-                ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
-            int padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
-                        aSz - digestSz;
-            for (int i = 0; i < padSz; i++) 
-                fill = input[AUTO];
-        }
-
-        if (input.get_error()) {
-            ssl.SetError(bad_input);
-            return;
-        }
-
-        // verify
-        if (memcmp(mac, verify, digestSz)) {
-            ssl.SetError(verify_error);
-            return;
-        }
-    }
-    if (level_ == fatal) {
-        ssl.useStates().useRecord()    = recordNotReady;
-        ssl.useStates().useHandShake() = handShakeNotReady;
-        ssl.SetError(YasslError(description_));
-    }
-}
-
-
-Data::Data()
-    : length_(0), buffer_(0), write_buffer_(0)
-{}
-
-
-Data::Data(uint16 len, opaque* b)
-    : length_(len), buffer_(b), write_buffer_(0)
-{}
-
-
-void Data::SetData(uint16 len, const opaque* buffer)
-{
-    length_ = len;
-    write_buffer_ = buffer;
-}
-
-input_buffer& Data::set(input_buffer& in)
-{
-    return in;
-}
-
-
-output_buffer& Data::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-ContentType Data::get_type() const
-{
-    return application_data;
-}
-
-
-uint16 Data::get_length() const
-{
-    return length_;
-}
-
-
-void Data::set_length(uint16 l)
-{
-    length_ = l;
-}
-
-
-opaque* Data::set_buffer()
-{
-    return buffer_;
-}
-
-
-// output operator for Data
-output_buffer& operator<<(output_buffer& output, const Data& data)
-{
-    output.write(data.write_buffer_, data.length_);
-    return output;
-}
-
-
-// check all bytes for equality 
-static int constant_compare(const byte* a, const byte* b, int len)
-{
-    int good = 0;
-    int bad  = 0;
-
-    for (int i = 0; i < len; i++) {
-        if (a[i] == b[i])
-            good++;
-        else
-            bad++;
-    }
-
-    if (good == len)
-        return 0;
-    else
-        return 0 - bad;  // failure
-}
-
-
-// check bytes for pad value
-static int pad_check(const byte* input, byte pad, int len)
-{
-    int good = 0;
-    int bad  = 0;
-
-    for (int i = 0; i < len; i++) {
-        if (input[i] == pad)
-            good++;
-        else
-            bad++;
-    }
-
-    if (good == len)
-        return 0;
-    else
-        return 0 - bad;  // failure
-}
-
-
-// get number of compression rounds
-static inline int get_rounds(int pLen, int padLen, int t)
-{
-    int  roundL1 = 1;  // round ups 
-    int  roundL2 = 1;
-
-    int L1 = COMPRESS_CONSTANT + pLen - t;
-    int L2 = COMPRESS_CONSTANT + pLen - padLen - 1 - t;
-
-    L1 -= COMPRESS_UPPER;
-    L2 -= COMPRESS_UPPER;
-
-    if ( (L1 % COMPRESS_LOWER) == 0)
-        roundL1 = 0;
-    if ( (L2 % COMPRESS_LOWER) == 0)
-        roundL2 = 0;
-
-    L1 /= COMPRESS_LOWER;
-    L2 /= COMPRESS_LOWER;
-
-    L1 += roundL1;
-    L2 += roundL2;
-
-    return L1 - L2;
-}
-
-
-// do compression rounds on dummy data
-static inline void compress_rounds(SSL& ssl, int rounds, const byte* dummy)
-{
-    if (rounds) {
-        Digest* digest = NULL;
-
-        MACAlgorithm ma = ssl.getSecurity().get_parms().mac_algorithm_;
-        if (ma == sha) 
-            digest = NEW_YS SHA;
-        else if (ma == md5)
-            digest = NEW_YS MD5;
-        else if (ma == rmd)
-            digest = NEW_YS RMD;
-        else
-            return;
-
-        for (int i = 0; i < rounds; i++)
-            digest->update(dummy, COMPRESS_LOWER);
-
-        ysDelete(digest);    
-    }
-}
-
-
-// timing resistant pad verification
-static int timing_verify(SSL& ssl, const byte* input, int padLen, int t,
-                         int pLen)
-{
-    byte verify[SHA_LEN];
-    byte dummy[MAX_PAD_SIZE];
-
-    memset(dummy, 1, sizeof(dummy));
-
-    if ( (t + padLen + 1) > pLen) {
-        pad_check(dummy, (byte)padLen, MAX_PAD_SIZE);
-        if (ssl.isTLS())
-            TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
-        else
-            hmac(ssl, verify, input, pLen - t, application_data, 1);
-        constant_compare(verify, input + pLen - t, t);
-
-        return -1;
-    }
-
-    if (pad_check(input + pLen - (padLen + 1), (byte)padLen, padLen + 1) != 0) {
-        pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
-        if (ssl.isTLS())
-            TLS_hmac(ssl, verify, input, pLen - t, application_data, 1);
-        else
-            hmac(ssl, verify, input, pLen - t, application_data, 1);
-        constant_compare(verify, input + pLen - t, t);
-
-        return -1;
-    }
-
-    pad_check(dummy, (byte)padLen, MAX_PAD_SIZE - padLen - 1);
-    if (ssl.isTLS())
-        TLS_hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data,1);
-    else
-        hmac(ssl, verify, input, pLen - padLen - 1 - t, application_data, 1);
-
-    compress_rounds(ssl, get_rounds(pLen, padLen, t), dummy);
-
-    if (constant_compare(verify, input + (pLen - padLen - 1 - t), t) != 0)
-        return -1;
-
-    return 0;
-}
-
-
-// Process handler for Data
-void Data::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
-    int pad   = 0, padSz = 0;
-    int ivExtra = 0;
-    int digestSz = ssl.getCrypto().get_digest().get_digestSize();
-    const byte* rawData = input.get_buffer() + input.get_current();
-    opaque verify[SHA_LEN];
-
-    if (ssl.getSecurity().get_parms().cipher_type_ == block) {
-        if (ssl.isTLSv1_1())  // IV
-            ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
-        pad = *(input.get_buffer() + input.get_current() + msgSz -ivExtra - 1);
-        padSz = 1;
-
-        if (ssl.isTLS()) {
-            if (timing_verify(ssl, rawData, pad,digestSz, msgSz-ivExtra) != 0) {
-                ssl.SetError(verify_error);
-                return;
-            }
-        }
-        else {   // SSLv3, some don't do this padding right
-            int sz3 = msgSz - digestSz - pad - 1; 
-            hmac(ssl, verify, rawData, sz3, application_data, true);
-            if (constant_compare(verify, rawData + sz3, digestSz) != 0) {
-                ssl.SetError(verify_error);
-                return;
-            }
-        } 
-    }
-    else {  // stream
-        int streamSz = msgSz - digestSz; 
-        if (ssl.isTLS())
-            TLS_hmac(ssl, verify, rawData, streamSz, application_data, true);
-        else
-            hmac(ssl, verify, rawData, streamSz, application_data, true);
-        if (constant_compare(verify, rawData + streamSz, digestSz) != 0) {
-            ssl.SetError(verify_error);
-            return;
-        }
-    }
-
-    int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
-
-    if (dataSz < 0 || dataSz > (MAX_RECORD_SIZE + COMPRESS_EXTRA)) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // read data
-    if (dataSz) {                               // could be compressed
-        if (ssl.CompressionOn()) {
-            input_buffer tmp;
-            if (DeCompress(input, dataSz, tmp) == -1) {
-                ssl.SetError(decompress_error);
-                return;
-            }
-            ssl.addData(NEW_YS input_buffer(tmp.get_size(),
-                                            tmp.get_buffer(), tmp.get_size()));
-        }
-        else {
-            input_buffer* data;
-            ssl.addData(data = NEW_YS input_buffer(dataSz));
-            input.read(data->get_buffer(), dataSz);
-            data->add_size(dataSz);
-        }
-    }
-
-    // advance past mac and fill
-    input.set_current(input.get_current() + digestSz + pad + padSz);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-}
-
-
-// virtual input operator for HandShakes
-input_buffer& operator>>(input_buffer& input, HandShakeBase& hs)
-{
-    return hs.set(input);
-}
-
-
-// virtual output operator for HandShakes
-output_buffer& operator<<(output_buffer& output, const HandShakeBase& hs)
-{
-    return hs.get(output);
-}
-
-
-Certificate::Certificate(const x509* cert) : cert_(cert) 
-{
-    if (cert)
-      set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
-    else
-      set_length(CERT_HEADER); // total blank cert size, just list header
-}
-
-
-const opaque* Certificate::get_buffer() const
-{
-    if (cert_)
-      return cert_->get_buffer();
-
-    return NULL;
-}
-
-
-// output operator for Certificate
-output_buffer& operator<<(output_buffer& output, const Certificate& cert)
-{
-    uint sz = cert.get_length();
-    opaque tmp[CERT_HEADER];
-
-    if ((int)sz > CERT_HEADER)
-      sz -= 2 * CERT_HEADER;  // actual cert, not including headers
-    else {
-      sz = 0;                 // blank cert case
-      c32to24(sz, tmp);
-      output.write(tmp, CERT_HEADER);
-
-      return output;
-    }
-
-    c32to24(sz + CERT_HEADER, tmp);
-    output.write(tmp, CERT_HEADER);
-    c32to24(sz, tmp);
-    output.write(tmp, CERT_HEADER);
-    output.write(cert.get_buffer(), sz);
-
-    return output;
-}
-
-
-// certificate processing handler
-void Certificate::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    CertManager& cm = ssl.useCrypto().use_certManager();
-  
-    uint32 list_sz;
-    byte   tmp[3];
-
-    if (input.get_remaining() < sizeof(tmp)) {
-        ssl.SetError(YasslError(bad_input));
-        return;
-    }
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    tmp[2] = input[AUTO];
-    c24to32(tmp, list_sz);
-
-    if (list_sz > (uint)MAX_RECORD_SIZE) { // sanity check
-        ssl.SetError(YasslError(bad_input));
-        return;
-    }
-    
-    while (list_sz) {
-        // cert size
-        uint32 cert_sz;
-
-        if (input.get_remaining() < sizeof(tmp)) {
-            ssl.SetError(YasslError(bad_input));
-            return;
-        }
-        tmp[0] = input[AUTO];
-        tmp[1] = input[AUTO];
-        tmp[2] = input[AUTO];
-        c24to32(tmp, cert_sz);
-        
-        if (cert_sz > (uint)MAX_RECORD_SIZE || input.get_remaining() < cert_sz){
-            ssl.SetError(YasslError(bad_input));
-            return;
-        }
-        if (cert_sz) {
-          x509* myCert;
-          cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
-          input.read(myCert->use_buffer(), myCert->get_length());
-        }
-
-        list_sz -= cert_sz + CERT_HEADER;
-    }
-    if (int err = cm.Validate())
-        ssl.SetError(YasslError(err));
-    else if (ssl.getSecurity().get_parms().entity_ == client_end)
-        ssl.useStates().useClient() = serverCertComplete;
-}
-
-
-Certificate::Certificate()
-    : cert_(0)
-{}
-
-
-input_buffer& Certificate::set(input_buffer& in)
-{
-    return in;
-}
-
-
-output_buffer& Certificate::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType Certificate::get_type() const
-{
-    return certificate;
-}
-
-
-ServerDHParams::ServerDHParams()
-    : pSz_(0), gSz_(0), pubSz_(0), p_(0), g_(0), Ys_(0)
-{}
-
-
-ServerDHParams::~ServerDHParams()
-{
-    ysArrayDelete(Ys_);
-    ysArrayDelete(g_);
-    ysArrayDelete(p_);
-}
-
-
-int ServerDHParams::get_pSize() const
-{
-    return pSz_;
-}
-
-
-int ServerDHParams::get_gSize() const
-{
-    return gSz_;
-}
-
-
-int ServerDHParams::get_pubSize() const
-{
-    return pubSz_;
-}
-
-
-const opaque* ServerDHParams::get_p() const
-{
-    return p_;
-}
-
-
-const opaque* ServerDHParams::get_g() const
-{
-    return g_;
-}
-
-
-const opaque* ServerDHParams::get_pub() const
-{
-    return Ys_;
-}
-
-
-opaque* ServerDHParams::alloc_p(int sz)
-{
-    p_ = NEW_YS opaque[pSz_ = sz];
-    return p_;
-}
-
-
-opaque* ServerDHParams::alloc_g(int sz)
-{
-    g_ = NEW_YS opaque[gSz_ = sz];
-    return g_;
-}
-
-
-opaque* ServerDHParams::alloc_pub(int sz)
-{
-    Ys_ = NEW_YS opaque[pubSz_ = sz];
-    return Ys_;
-}
-
-
-int ServerKeyBase::get_length() const
-{
-    return 0;
-}
-
-
-opaque* ServerKeyBase::get_serverKey() const
-{
-    return 0;
-}
-
-
-// input operator for ServerHello
-input_buffer& operator>>(input_buffer& input, ServerHello& hello)
-{ 
-    // Protocol
-    hello.server_version_.major_ = input[AUTO];
-    hello.server_version_.minor_ = input[AUTO];
-   
-    // Random
-    input.read(hello.random_, RAN_LEN);
-    
-    // Session
-    hello.id_len_ = input[AUTO];
-    if (hello.id_len_ > ID_LEN) {
-        input.set_error(); 
-        return input;
-    }
-    if (hello.id_len_)
-        input.read(hello.session_id_, hello.id_len_);
- 
-    // Suites
-    hello.cipher_suite_[0] = input[AUTO];
-    hello.cipher_suite_[1] = input[AUTO];
-   
-    // Compression
-    hello.compression_method_ = CompressionMethod(input[AUTO]);
-
-    return input;
-}
-
-
-// output operator for ServerHello
-output_buffer& operator<<(output_buffer& output, const ServerHello& hello)
-{
-    // Protocol
-    output[AUTO] = hello.server_version_.major_;
-    output[AUTO] = hello.server_version_.minor_;
-
-    // Random
-    output.write(hello.random_, RAN_LEN);
-
-    // Session
-    output[AUTO] = hello.id_len_;
-    output.write(hello.session_id_, ID_LEN);
-
-    // Suites
-    output[AUTO] = hello.cipher_suite_[0];
-    output[AUTO] = hello.cipher_suite_[1];
-
-    // Compression
-    output[AUTO] = hello.compression_method_;
-
-    return output;
-}
-
-
-// Server Hello processing handler
-void ServerHello::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    if (ssl.GetMultiProtocol()) {   // SSLv23 support
-        if (ssl.isTLS() && server_version_.minor_ < 1)
-            // downgrade to SSLv3
-            ssl.useSecurity().use_connection().TurnOffTLS();
-        else if (ssl.isTLSv1_1() && server_version_.minor_ == 1)
-            // downdrage to TLSv1
-            ssl.useSecurity().use_connection().TurnOffTLS1_1();
-    }
-    else if (ssl.isTLSv1_1() && server_version_.minor_ < 2) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    else if (ssl.isTLS() && server_version_.minor_ < 1) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    else if (!ssl.isTLS() && (server_version_.major_ == 3 &&
-                              server_version_.minor_ >= 1)) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    if (cipher_suite_[0] != 0x00) {
-        ssl.SetError(unknown_cipher);
-        return;
-    }
-    ssl.set_pending(cipher_suite_[1]);
-    ssl.set_random(random_, server_end);
-    if (id_len_)
-        ssl.set_sessionID(session_id_);
-    else
-        ssl.useSecurity().use_connection().sessionID_Set_ = false;
-
-    if (ssl.getSecurity().get_resuming()) {
-        if (memcmp(session_id_, ssl.getSecurity().get_resume().GetID(),
-                   ID_LEN) == 0) {
-            ssl.set_masterSecret(ssl.getSecurity().get_resume().GetSecret());
-            if (ssl.isTLS())
-                ssl.deriveTLSKeys();
-            else
-                ssl.deriveKeys();
-            ssl.useStates().useClient() = serverHelloDoneComplete;
-            return;
-        }
-        else {
-            ssl.useSecurity().set_resuming(false);
-            ssl.useLog().Trace("server denied resumption");
-        }
-    }
-
-    if (ssl.CompressionOn() && !compression_method_)
-        ssl.UnSetCompression(); // server isn't supporting yaSSL zlib request
-
-    ssl.useStates().useClient() = serverHelloComplete;
-}
-
-
-ServerHello::ServerHello()
-{
-    memset(random_, 0, RAN_LEN);
-    memset(session_id_, 0, ID_LEN);
-}
-
-
-ServerHello::ServerHello(ProtocolVersion pv, bool useCompression)
-    : server_version_(pv),
-      compression_method_(useCompression ? zlib : no_compression)
-{
-    memset(random_, 0, RAN_LEN);
-    memset(session_id_, 0, ID_LEN);
-}
-
-
-input_buffer& ServerHello::set(input_buffer& in)
-{
-    return in  >> *this;
-}
-
-
-output_buffer& ServerHello::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType ServerHello::get_type() const
-{
-    return server_hello;
-}
-
-
-const opaque* ServerHello::get_random() const
-{
-    return random_;
-}
-
-
-// Server Hello Done processing handler
-void ServerHelloDone::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    ssl.useStates().useClient() = serverHelloDoneComplete;
-}
-
-
-ServerHelloDone::ServerHelloDone()
-{
-    set_length(0);
-}
-
-
-input_buffer& ServerHelloDone::set(input_buffer& in)
-{
-    return in;
-}
-
-
-output_buffer& ServerHelloDone::get(output_buffer& out) const
-{
-    return out;
-}
-
-
-HandShakeType ServerHelloDone::get_type() const
-{
-    return server_hello_done;
-}
-
-
-int ClientKeyBase::get_length() const
-{
-    return 0;
-}
-
-
-opaque* ClientKeyBase::get_clientKey() const
-{
-    return 0;
-}
-
-
-// input operator for Client Hello
-input_buffer& operator>>(input_buffer& input, ClientHello& hello)
-{
-    uint begin = input.get_current();  // could have extensions at end
-
-    // Protocol
-    hello.client_version_.major_ = input[AUTO];
-    hello.client_version_.minor_ = input[AUTO];
-
-    // Random
-    input.read(hello.random_, RAN_LEN);
-
-    // Session
-    hello.id_len_ = input[AUTO];
-    if (hello.id_len_) input.read(hello.session_id_, ID_LEN);
-    
-    // Suites
-    byte   tmp[2];
-    uint16 len;
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    ato16(tmp, len);
-
-    hello.suite_len_ = min(len, static_cast<uint16>(MAX_SUITE_SZ));
-    input.read(hello.cipher_suites_, hello.suite_len_);
-    if (len > hello.suite_len_)  // ignore extra suites
-        input.set_current(input.get_current() + len - hello.suite_len_);
-
-    // Compression
-    hello.comp_len_ = input[AUTO];
-    hello.compression_methods_ = no_compression;
-    while (hello.comp_len_--) {
-        CompressionMethod cm = CompressionMethod(input[AUTO]);
-        if (cm == zlib)
-            hello.compression_methods_ = zlib;
-    }
-
-    uint read = input.get_current() - begin;
-    uint expected = hello.get_length();
-
-    // ignore client hello extensions for now
-    if (read < expected)
-        input.set_current(input.get_current() + expected - read);
-
-    return input;
-}
-
-
-// output operaotr for Client Hello
-output_buffer& operator<<(output_buffer& output, const ClientHello& hello)
-{ 
-    // Protocol
-    output[AUTO] = hello.client_version_.major_;
-    output[AUTO] = hello.client_version_.minor_;
-
-    // Random
-    output.write(hello.random_, RAN_LEN);
-
-    // Session
-    output[AUTO] = hello.id_len_;
-    if (hello.id_len_) output.write(hello.session_id_, ID_LEN);
-
-    // Suites
-    byte tmp[2];
-    c16toa(hello.suite_len_, tmp);
-    output[AUTO] = tmp[0];
-    output[AUTO] = tmp[1];
-    output.write(hello.cipher_suites_, hello.suite_len_);
-  
-    // Compression
-    output[AUTO] = hello.comp_len_;
-    output[AUTO] = hello.compression_methods_;
-
-    return output;
-}
-
-
-// Client Hello processing handler
-void ClientHello::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // store version for pre master secret
-    ssl.useSecurity().use_connection().chVersion_ = client_version_;
-
-    if (client_version_.major_ != 3) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    if (ssl.GetMultiProtocol()) {   // SSLv23 support
-        if (ssl.isTLS() && client_version_.minor_ < 1) {
-            // downgrade to SSLv3
-            ssl.useSecurity().use_connection().TurnOffTLS();
-            
-            ProtocolVersion pv = ssl.getSecurity().get_connection().version_;
-            bool removeDH  = ssl.getSecurity().get_parms().removeDH_;
-            bool removeRSA = false;
-            bool removeDSA = false;
-            
-            const CertManager& cm = ssl.getCrypto().get_certManager();
-            if (cm.get_keyType() == rsa_sa_algo)
-                removeDSA = true;
-            else
-                removeRSA = true;
-            
-            // reset w/ SSL suites
-            ssl.useSecurity().use_parms().SetSuites(pv, removeDH, removeRSA,
-                                                    removeDSA);
-        }
-        else if (ssl.isTLSv1_1() && client_version_.minor_ == 1)
-            // downgrade to TLSv1, but use same suites
-            ssl.useSecurity().use_connection().TurnOffTLS1_1();
-    }
-    else if (ssl.isTLSv1_1() && client_version_.minor_ < 2) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    else if (ssl.isTLS() && client_version_.minor_ < 1) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-    else if (!ssl.isTLS() && client_version_.minor_ >= 1) {
-        ssl.SetError(badVersion_error);
-        return;
-    }
-
-    ssl.set_random(random_, client_end);
-
-    while (id_len_) {  // trying to resume
-        SSL_SESSION* session = 0;
-        if (!ssl.getSecurity().GetContext()->GetSessionCacheOff())
-            session = GetSessions().lookup(session_id_);
-        if (!session)  {
-            ssl.useLog().Trace("session lookup failed");
-            break;
-        }
-        ssl.set_session(session);
-        ssl.useSecurity().set_resuming(true);
-        ssl.matchSuite(session->GetSuite(), SUITE_LEN);
-        if (ssl.GetError()) return;
-        ssl.set_pending(ssl.getSecurity().get_parms().suite_[1]);
-        ssl.set_masterSecret(session->GetSecret());
-
-        opaque serverRandom[RAN_LEN];
-        ssl.getCrypto().get_random().Fill(serverRandom, sizeof(serverRandom));
-        ssl.set_random(serverRandom, server_end);
-        if (ssl.isTLS())
-            ssl.deriveTLSKeys();
-        else
-            ssl.deriveKeys();
-        ssl.useStates().useServer() = clientKeyExchangeComplete;
-        return;
-    }
-    ssl.matchSuite(cipher_suites_, suite_len_);
-    if (ssl.GetError()) return;
-    ssl.set_pending(ssl.getSecurity().get_parms().suite_[1]);
-
-    if (compression_methods_ == zlib)
-        ssl.SetCompression();
-
-    ssl.useStates().useServer() = clientHelloComplete;
-}
-
-
-input_buffer& ClientHello::set(input_buffer& in)
-{
-    return in  >> *this;
-}
-
-
-output_buffer& ClientHello::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType ClientHello::get_type() const
-{
-    return client_hello;
-}
-
-
-const opaque* ClientHello::get_random() const
-{
-    return random_;
-}
-
-
-ClientHello::ClientHello()
-{
-    memset(random_, 0, RAN_LEN);
-}
-
-
-ClientHello::ClientHello(ProtocolVersion pv, bool useCompression)
-    : client_version_(pv),
-      compression_methods_(useCompression ? zlib : no_compression)
-{
-    memset(random_, 0, RAN_LEN);
-}
-
-
-// output operator for ServerKeyExchange
-output_buffer& operator<<(output_buffer& output, const ServerKeyExchange& sk)
-{
-    output.write(sk.getKey(), sk.getKeyLength());
-    return output;
-}
-
-
-// Server Key Exchange processing handler
-void ServerKeyExchange::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    createKey(ssl);
-    if (ssl.GetError()) return;
-    server_key_->read(ssl, input);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    ssl.useStates().useClient() = serverKeyExchangeComplete;
-}
-
-
-ServerKeyExchange::ServerKeyExchange(SSL& ssl)
-{
-    createKey(ssl);
-}
-
-
-ServerKeyExchange::ServerKeyExchange()
-    : server_key_(0)
-{}
-
-
-ServerKeyExchange::~ServerKeyExchange()
-{
-    ysDelete(server_key_);
-}
-
-
-void ServerKeyExchange::build(SSL& ssl) 
-{ 
-    server_key_->build(ssl); 
-    set_length(server_key_->get_length());
-}
-
-
-const opaque* ServerKeyExchange::getKey() const
-{
-    return server_key_->get_serverKey();
-}
-
-
-int ServerKeyExchange::getKeyLength() const
-{
-    return server_key_->get_length();
-}
-
-
-input_buffer& ServerKeyExchange::set(input_buffer& in)
-{
-    return in;      // process does
-}
-
-
-output_buffer& ServerKeyExchange::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType ServerKeyExchange::get_type() const
-{
-    return server_key_exchange;
-}
-
-
-// CertificateRequest 
-CertificateRequest::CertificateRequest()
-    : typeTotal_(0)
-{
-    memset(certificate_types_, 0, sizeof(certificate_types_));
-}
-
-
-CertificateRequest::~CertificateRequest()
-{
-
-    STL::for_each(certificate_authorities_.begin(),
-                  certificate_authorities_.end(),
-                  del_ptr_zero()) ;
-}
-
-
-void CertificateRequest::Build()
-{
-    certificate_types_[0] = rsa_sign;
-    certificate_types_[1] = dss_sign;
-
-    typeTotal_ = 2;
-
-    uint16 authCount = 0;
-    uint16 authSz = 0;
-  
-    for (int j = 0; j < authCount; j++) {
-        int sz = REQUEST_HEADER + MIN_DIS_SIZE;
-        DistinguishedName dn;
-        certificate_authorities_.push_back(dn = NEW_YS byte[sz]);
-
-        opaque tmp[REQUEST_HEADER];
-        c16toa(MIN_DIS_SIZE, tmp);
-        memcpy(dn, tmp, sizeof(tmp));
-  
-        // fill w/ junk for now
-        memcpy(dn, tmp, MIN_DIS_SIZE);
-        authSz += sz;
-    }
-
-    set_length(SIZEOF_ENUM + typeTotal_ + REQUEST_HEADER + authSz);
-}
-
-
-input_buffer& CertificateRequest::set(input_buffer& in)
-{
-    return in >> *this;
-}
-
-
-output_buffer& CertificateRequest::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-// input operator for CertificateRequest
-input_buffer& operator>>(input_buffer& input, CertificateRequest& request)
-{
-    // types
-    request.typeTotal_ = input[AUTO];
-    if (request.typeTotal_ > CERT_TYPES) {
-        input.set_error();
-        return input;
-    }
-    for (int i = 0; i < request.typeTotal_; i++)
-        request.certificate_types_[i] = ClientCertificateType(input[AUTO]);
-
-    byte tmp[2];
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-    uint16 sz;
-    ato16(tmp, sz);
-
-    // authorities
-    while (sz) {
-        uint16 dnSz;
-        tmp[0] = input[AUTO];
-        tmp[1] = input[AUTO];
-        ato16(tmp, dnSz);
-       
-        input.set_current(input.get_current() + dnSz);
-
-        sz -= dnSz + REQUEST_HEADER;
-
-        if (input.get_error())
-            break;
-    }
-
-    return input;
-}
-
-
-// output operator for CertificateRequest
-output_buffer& operator<<(output_buffer& output,
-                          const CertificateRequest& request)
-{
-    // types
-    output[AUTO] = request.typeTotal_;
-    for (int i = 0; i < request.typeTotal_; i++)
-        output[AUTO] = request.certificate_types_[i];
-
-    // authorities
-    opaque tmp[REQUEST_HEADER];
-    c16toa(request.get_length() - SIZEOF_ENUM -
-           request.typeTotal_ - REQUEST_HEADER, tmp);
-    output.write(tmp, sizeof(tmp));
-
-    STL::list<DistinguishedName>::const_iterator first =
-                                    request.certificate_authorities_.begin();
-    STL::list<DistinguishedName>::const_iterator last =
-                                    request.certificate_authorities_.end();
-    while (first != last) {
-        uint16 sz;
-        ato16(*first, sz);
-        output.write(*first, sz + REQUEST_HEADER);
-
-        ++first;
-    }
-
-    return output;
-}
-
-
-// CertificateRequest processing handler
-void CertificateRequest::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    CertManager& cm = ssl.useCrypto().use_certManager();
-
-    cm.setSendVerify();
-    if (cm.get_cert() == NULL || cm.get_privateKey() == NULL)
-      cm.setSendBlankCert();  // send blank cert, OpenSSL requires now
-}
-
-
-HandShakeType CertificateRequest::get_type() const
-{
-    return certificate_request;
-}
-
-
-// CertificateVerify 
-CertificateVerify::CertificateVerify() : signature_(0)
-{}
-
-
-CertificateVerify::~CertificateVerify()
-{
-    ysArrayDelete(signature_);
-}
-
-
-void CertificateVerify::Build(SSL& ssl)
-{
-    build_certHashes(ssl, hashes_);
-
-    uint16 sz = 0;
-    byte   len[VERIFY_HEADER];
-    mySTL::auto_array<byte> sig;
-
-    // sign
-    const CertManager& cert = ssl.getCrypto().get_certManager();
-    if (cert.get_keyType() == rsa_sa_algo) {
-        RSA rsa(cert.get_privateKey(), cert.get_privateKeyLength(), false);
-
-        sz = rsa.get_cipherLength() + VERIFY_HEADER;
-        sig.reset(NEW_YS byte[sz]);
-
-        c16toa(sz - VERIFY_HEADER, len);
-        memcpy(sig.get(), len, VERIFY_HEADER);
-        rsa.sign(sig.get() + VERIFY_HEADER, hashes_.md5_, sizeof(Hashes),
-                 ssl.getCrypto().get_random());
-        // check for rsa signautre fault
-        if (!rsa.verify(hashes_.md5_, sizeof(Hashes), sig.get() + VERIFY_HEADER,
-                                                      rsa.get_cipherLength())) {
-            ssl.SetError(rsaSignFault_error);
-            return;
-        }
-    }
-    else {  // DSA
-        DSS dss(cert.get_privateKey(), cert.get_privateKeyLength(), false);
-
-        sz = DSS_SIG_SZ + DSS_ENCODED_EXTRA + VERIFY_HEADER;
-        sig.reset(NEW_YS byte[sz]);
-
-        c16toa(sz - VERIFY_HEADER, len);
-        memcpy(sig.get(), len, VERIFY_HEADER);
-        dss.sign(sig.get() + VERIFY_HEADER, hashes_.sha_, SHA_LEN,
-                 ssl.getCrypto().get_random());
-
-        byte encoded[DSS_SIG_SZ + DSS_ENCODED_EXTRA];
-        TaoCrypt::EncodeDSA_Signature(sig.get() + VERIFY_HEADER, encoded);
-        memcpy(sig.get() + VERIFY_HEADER, encoded, sizeof(encoded));
-    }
-    set_length(sz);
-    signature_ = sig.release();
-}
-
-
-input_buffer& CertificateVerify::set(input_buffer& in)
-{
-    return in >> *this;
-}
-
-
-output_buffer& CertificateVerify::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-// input operator for CertificateVerify
-input_buffer& operator>>(input_buffer& input, CertificateVerify& request)
-{
-    byte tmp[VERIFY_HEADER];
-    tmp[0] = input[AUTO];
-    tmp[1] = input[AUTO];
-
-    uint16 sz = 0;
-    ato16(tmp, sz);
-    request.set_length(sz);
-
-    if (sz == 0) {
-        input.set_error();
-        return input;
-    }
-
-    request.signature_ = NEW_YS byte[sz];
-    input.read(request.signature_, sz);
-
-    return input;
-}
-
-
-// output operator for CertificateVerify
-output_buffer& operator<<(output_buffer& output,
-                          const CertificateVerify& verify)
-{
-    output.write(verify.signature_, verify.get_length());
-
-    return output;
-}
-
-
-// CertificateVerify processing handler
-void CertificateVerify::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    const Hashes&      hashVerify = ssl.getHashes().get_certVerify();
-    const CertManager& cert       = ssl.getCrypto().get_certManager();
-
-    if (cert.get_peerKeyType() == rsa_sa_algo) {
-        RSA rsa(cert.get_peerKey(), cert.get_peerKeyLength());
-
-        if (!rsa.verify(hashVerify.md5_, sizeof(hashVerify), signature_,
-                        get_length()))
-            ssl.SetError(verify_error);
-    }
-    else { // DSA
-        byte decodedSig[DSS_SIG_SZ];
-        TaoCrypt::DecodeDSA_Signature(decodedSig, signature_, get_length());
-        
-        DSS dss(cert.get_peerKey(), cert.get_peerKeyLength());
-        if (!dss.verify(hashVerify.sha_, SHA_LEN, decodedSig, get_length()))
-            ssl.SetError(verify_error);
-    }
-}
-
-
-HandShakeType CertificateVerify::get_type() const
-{
-    return certificate_verify;
-}
-
-
-// output operator for ClientKeyExchange
-output_buffer& operator<<(output_buffer& output, const ClientKeyExchange& ck)
-{
-    output.write(ck.getKey(), ck.getKeyLength());
-    return output;
-}
-
-
-// Client Key Exchange processing handler
-void ClientKeyExchange::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    createKey(ssl);
-    if (ssl.GetError()) return;
-    client_key_->read(ssl, input);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    if (ssl.getCrypto().get_certManager().verifyPeer())
-        build_certHashes(ssl, ssl.useHashes().use_certVerify());
-
-    ssl.useStates().useServer() = clientKeyExchangeComplete;
-}
-
-
-ClientKeyExchange::ClientKeyExchange(SSL& ssl)
-{
-    createKey(ssl);
-}
-
-
-ClientKeyExchange::ClientKeyExchange()
-    : client_key_(0)
-{}
-
-
-ClientKeyExchange::~ClientKeyExchange()
-{
-    ysDelete(client_key_);
-}
-
-
-void ClientKeyExchange::build(SSL& ssl) 
-{ 
-    client_key_->build(ssl); 
-    set_length(client_key_->get_length());
-}
-
-const opaque* ClientKeyExchange::getKey() const
-{
-    return client_key_->get_clientKey();
-}
-
-
-int ClientKeyExchange::getKeyLength() const
-{
-    return client_key_->get_length();
-}
-
-
-input_buffer& ClientKeyExchange::set(input_buffer& in)
-{
-    return in;
-}
-
-
-output_buffer& ClientKeyExchange::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType ClientKeyExchange::get_type() const
-{
-    return client_key_exchange;
-}
-
-
-// input operator for Finished
-input_buffer& operator>>(input_buffer& input, Finished&)
-{
-    /*  do in process */
-
-    return input; 
-}
-
-// output operator for Finished
-output_buffer& operator<<(output_buffer& output, const Finished& fin)
-{
-    if (fin.get_length() == FINISHED_SZ) {
-        output.write(fin.hashes_.md5_, MD5_LEN);
-        output.write(fin.hashes_.sha_, SHA_LEN);
-    }
-    else    // TLS_FINISHED_SZ
-        output.write(fin.hashes_.md5_, TLS_FINISHED_SZ);
-
-    return output;
-}
-
-
-// Finished processing handler
-void Finished::Process(input_buffer& input, SSL& ssl)
-{
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-    // verify hashes
-    const  Finished& verify = ssl.getHashes().get_verify();
-    uint finishedSz = ssl.isTLS() ? TLS_FINISHED_SZ : FINISHED_SZ;
-    
-    input.read(hashes_.md5_, finishedSz);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    if (memcmp(&hashes_, &verify.hashes_, finishedSz)) {
-        ssl.SetError(verify_error);
-        return;
-    }
-
-    // read verify mac
-    opaque verifyMAC[SHA_LEN];
-    uint macSz = finishedSz + HANDSHAKE_HEADER;
-
-    if (ssl.isTLS())
-        TLS_hmac(ssl, verifyMAC, input.get_buffer() + input.get_current()
-                 - macSz, macSz, handshake, true);
-    else
-        hmac(ssl, verifyMAC, input.get_buffer() + input.get_current() - macSz,
-             macSz, handshake, true);
-
-    // read mac and fill
-    opaque mac[SHA_LEN];   // max size
-    int    digestSz = ssl.getCrypto().get_digest().get_digestSize();
-    input.read(mac, digestSz);
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    uint ivExtra = 0;
-    if (ssl.getSecurity().get_parms().cipher_type_ == block)
-        if (ssl.isTLSv1_1())
-            ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
-
-    opaque fill;
-    int    padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
-                     HANDSHAKE_HEADER - finishedSz - digestSz;
-    for (int i = 0; i < padSz; i++) 
-        fill = input[AUTO];
-    if (input.get_error()) {
-        ssl.SetError(bad_input);
-        return;
-    }
-
-    // verify mac
-    if (memcmp(mac, verifyMAC, digestSz)) {
-        ssl.SetError(verify_error);
-        return;
-    }
-
-    // update states
-    ssl.useStates().useHandShake() = handShakeReady;
-    if (ssl.getSecurity().get_parms().entity_ == client_end)
-        ssl.useStates().useClient() = serverFinishedComplete;
-    else
-        ssl.useStates().useServer() = clientFinishedComplete;
-}
-
-
-Finished::Finished()
-{
-    set_length(FINISHED_SZ);
-}
-
-
-uint8* Finished::set_md5()
-{
-    return hashes_.md5_;
-}
-
-
-uint8* Finished::set_sha()
-{
-    return hashes_.sha_;
-}
-
-
-input_buffer& Finished::set(input_buffer& in)
-{
-    return in  >> *this;
-}
-
-
-output_buffer& Finished::get(output_buffer& out) const
-{
-    return out << *this;
-}
-
-
-HandShakeType Finished::get_type() const
-{
-    return finished;
-}
-
-
-void clean(volatile opaque* p, uint sz, RandomPool& ran)
-{
-    uint i(0);
-
-    for (i = 0; i < sz; ++i)
-        p[i] = 0;
-
-    ran.Fill(const_cast<opaque*>(p), sz);
-
-    for (i = 0; i < sz; ++i)
-        p[i] = 0;
-}
-
-
-
-Connection::Connection(ProtocolVersion v, RandomPool& ran)
-    : pre_master_secret_(0), sequence_number_(0), peer_sequence_number_(0),
-      pre_secret_len_(0), send_server_key_(false), master_clean_(false),
-      TLS_(v.major_ >= 3 && v.minor_ >= 1),
-      TLSv1_1_(v.major_ >= 3 && v.minor_ >= 2), compression_(false),
-      version_(v), random_(ran)
-{
-    memset(sessionID_, 0, sizeof(sessionID_));
-}
-
-
-Connection::~Connection() 
-{ 
-    CleanMaster(); CleanPreMaster(); ysArrayDelete(pre_master_secret_);
-}
-
-
-void Connection::AllocPreSecret(uint sz) 
-{ 
-    pre_master_secret_ = NEW_YS opaque[pre_secret_len_ = sz];
-}
-
-
-void Connection::TurnOffTLS()
-{
-    TLS_ = false;
-    version_.minor_ = 0;
-}
-
-
-void Connection::TurnOffTLS1_1()
-{
-    TLSv1_1_ = false;
-    version_.minor_ = 1;
-}
-
-
-// wipeout master secret
-void Connection::CleanMaster()
-{
-    if (!master_clean_) {
-        volatile opaque* p = master_secret_;
-        clean(p, SECRET_LEN, random_);
-        master_clean_ = true;
-    }
-}
-
-
-// wipeout pre master secret
-void Connection::CleanPreMaster()
-{
-    if (pre_master_secret_) {
-        volatile opaque* p = pre_master_secret_;
-        clean(p, pre_secret_len_, random_);
-
-        ysArrayDelete(pre_master_secret_);
-        pre_master_secret_ = 0;
-    }
-}
-
-
-// Create functions for message factory
-Message* CreateCipherSpec() { return NEW_YS ChangeCipherSpec; }
-Message* CreateAlert()      { return NEW_YS Alert; }
-Message* CreateHandShake()  { return NEW_YS HandShakeHeader; }
-Message* CreateData()       { return NEW_YS Data; }
-
-// Create functions for handshake factory
-HandShakeBase* CreateHelloRequest()       { return NEW_YS HelloRequest; }
-HandShakeBase* CreateClientHello()        { return NEW_YS ClientHello; }
-HandShakeBase* CreateServerHello()        { return NEW_YS ServerHello; }
-HandShakeBase* CreateCertificate()        { return NEW_YS Certificate; }
-HandShakeBase* CreateServerKeyExchange()  { return NEW_YS ServerKeyExchange;}
-HandShakeBase* CreateCertificateRequest() { return NEW_YS 
-                                                    CertificateRequest; }
-HandShakeBase* CreateServerHelloDone()    { return NEW_YS ServerHelloDone; }
-HandShakeBase* CreateCertificateVerify()  { return NEW_YS CertificateVerify;}
-HandShakeBase* CreateClientKeyExchange()  { return NEW_YS ClientKeyExchange;}
-HandShakeBase* CreateFinished()           { return NEW_YS Finished; }
-
-// Create functions for server key exchange factory
-ServerKeyBase* CreateRSAServerKEA()       { return NEW_YS RSA_Server; }
-ServerKeyBase* CreateDHServerKEA()        { return NEW_YS DH_Server; }
-ServerKeyBase* CreateFortezzaServerKEA()  { return NEW_YS Fortezza_Server; }
-
-// Create functions for client key exchange factory
-ClientKeyBase* CreateRSAClient()      { return NEW_YS 
-                                                EncryptedPreMasterSecret; }
-ClientKeyBase* CreateDHClient()       { return NEW_YS 
-                                                ClientDiffieHellmanPublic; }
-ClientKeyBase* CreateFortezzaClient() { return NEW_YS FortezzaKeys; }
-
-
-// Constructor calls this to Register compile time callbacks
-void InitMessageFactory(MessageFactory& mf)
-{
-    mf.Reserve(4);
-    mf.Register(alert, CreateAlert);
-    mf.Register(change_cipher_spec, CreateCipherSpec);
-    mf.Register(handshake, CreateHandShake);
-    mf.Register(application_data, CreateData);
-}
-
-
-// Constructor calls this to Register compile time callbacks
-void InitHandShakeFactory(HandShakeFactory& hsf)
-{
-    hsf.Reserve(10);
-    hsf.Register(hello_request, CreateHelloRequest);
-    hsf.Register(client_hello, CreateClientHello);
-    hsf.Register(server_hello, CreateServerHello);
-    hsf.Register(certificate, CreateCertificate);
-    hsf.Register(server_key_exchange, CreateServerKeyExchange);
-    hsf.Register(certificate_request, CreateCertificateRequest);
-    hsf.Register(server_hello_done, CreateServerHelloDone);
-    hsf.Register(certificate_verify, CreateCertificateVerify);
-    hsf.Register(client_key_exchange, CreateClientKeyExchange);
-    hsf.Register(finished, CreateFinished);
-}
-
-
-// Constructor calls this to Register compile time callbacks
-void InitServerKeyFactory(ServerKeyFactory& skf)
-{
-    skf.Reserve(3);
-    skf.Register(rsa_kea, CreateRSAServerKEA);
-    skf.Register(diffie_hellman_kea, CreateDHServerKEA);
-    skf.Register(fortezza_kea, CreateFortezzaServerKEA);
-}
-
-
-// Constructor calls this to Register compile time callbacks
-void InitClientKeyFactory(ClientKeyFactory& ckf)
-{
-    ckf.Reserve(3);
-    ckf.Register(rsa_kea, CreateRSAClient);
-    ckf.Register(diffie_hellman_kea, CreateDHClient);
-    ckf.Register(fortezza_kea, CreateFortezzaClient);
-}
-
-
-} // namespace
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
deleted file mode 100644
index a39965ced960..000000000000
--- a/extra/yassl/src/yassl_int.cpp
+++ /dev/null
@@ -1,2826 +0,0 @@
-/* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
-
-/* yaSSL internal source implements SSL supporting types not specified in the
- * draft along with type conversion functions.
- */
-
-// First include (the generated) my_config.h, to get correct platform defines.
-#include "my_config.h"
-#ifdef _WIN32
-#include<Windows.h>
-#else
-#include <pthread.h>
-#endif
-
-#include "runtime.hpp"
-#include "yassl_int.hpp"
-#include "handshake.hpp"
-#include "timer.hpp"
-
-#ifdef HAVE_LIBZ
-    #include "zlib.h"
-#endif
-
-
-#ifdef YASSL_PURE_C
-
-    void* operator new(size_t sz, yaSSL::new_t)
-    {
-        void* ptr = malloc(sz ? sz : 1);
-        if (!ptr) abort();
-
-        return ptr;
-    }
-
-
-    void operator delete(void* ptr, yaSSL::new_t)
-    {
-        if (ptr) free(ptr);
-    }
-
-
-    void* operator new[](size_t sz, yaSSL::new_t nt)
-    {
-        return ::operator new(sz, nt);
-    }
-
-
-    void operator delete[](void* ptr, yaSSL::new_t nt)
-    {
-        ::operator delete(ptr, nt);
-    }
-
-    namespace yaSSL {
-
-        new_t ys;   // for yaSSL library new
-
-    }
-
-#endif // YASSL_PURE_C
-
-/* for the definition of get_tty_password() */
-#include <mysql/get_password.h>
-
-namespace yaSSL {
-
-
-
-
-
-
-// convert a 32 bit integer into a 24 bit one
-void c32to24(uint32 u32, uint24& u24)
-{
-    u24[0] = (u32 >> 16) & 0xff;
-    u24[1] = (u32 >>  8) & 0xff;
-    u24[2] =  u32 & 0xff;
-}
-
-
-// convert a 24 bit integer into a 32 bit one
-void c24to32(const uint24 u24, uint32& u32)
-{
-    u32 = 0;
-    u32 = (u24[0] << 16) | (u24[1] << 8) | u24[2];
-}
-
-
-// convert with return for ease of use
-uint32 c24to32(const uint24 u24)
-{
-    uint32 ret;
-    c24to32(u24, ret);
-
-    return ret;
-}
-
-
-// using a for opaque since underlying type is unsgined char and o is not a
-// good leading identifier
-
-// convert opaque to 16 bit integer
-void ato16(const opaque* c, uint16& u16)
-{
-    u16 = 0;
-    u16 = (c[0] << 8) | (c[1]);
-}
-
-
-// convert (copy) opaque to 24 bit integer
-void ato24(const opaque* c, uint24& u24)
-{
-    u24[0] = c[0];
-    u24[1] = c[1];
-    u24[2] = c[2];
-}
-
-
-// convert 16 bit integer to opaque
-void c16toa(uint16 u16, opaque* c)
-{
-    c[0] = (u16 >> 8) & 0xff;
-    c[1] =  u16 & 0xff;
-}
-
-
-// convert 24 bit integer to opaque
-void c24toa(const uint24 u24, opaque* c)
-{
-    c[0] =  u24[0]; 
-    c[1] =  u24[1];
-    c[2] =  u24[2];
-}
-
-
-// convert 32 bit integer to opaque
-void c32toa(uint32 u32, opaque* c)
-{
-    c[0] = (u32 >> 24) & 0xff;
-    c[1] = (u32 >> 16) & 0xff;
-    c[2] = (u32 >>  8) & 0xff;
-    c[3] =  u32 & 0xff;
-}
-
-
-States::States() : recordLayer_(recordReady), handshakeLayer_(preHandshake),
-           clientState_(serverNull),  serverState_(clientNull),
-           connectState_(CONNECT_BEGIN), acceptState_(ACCEPT_BEGIN),
-           what_(no_error) {}
-
-const RecordLayerState& States::getRecord() const 
-{
-    return recordLayer_;
-}
-
-
-const HandShakeState& States::getHandShake() const
-{
-    return handshakeLayer_;
-}
-
-
-const ClientState& States::getClient() const
-{
-    return clientState_;
-}
-
-
-const ServerState& States::getServer() const
-{
-    return serverState_;
-}
-
-
-const ConnectState& States::GetConnect() const
-{
-    return connectState_;
-}
-
-
-const AcceptState& States::GetAccept() const
-{
-    return acceptState_;
-}
-
-
-const char* States::getString() const
-{
-    return errorString_;
-}
-
-
-YasslError States::What() const
-{
-    return what_;
-}
-
-
-RecordLayerState& States::useRecord()
-{
-    return recordLayer_;
-}
-
-
-HandShakeState& States::useHandShake()
-{
-    return handshakeLayer_;
-}
-
-
-ClientState& States::useClient()
-{
-    return clientState_;
-}
-
-
-ServerState& States::useServer()
-{
-    return serverState_;
-}
-
-
-ConnectState& States::UseConnect()
-{
-    return connectState_;
-}
-
-
-AcceptState& States::UseAccept()
-{
-    return acceptState_;
-}
-
-
-char* States::useString()
-{
-    return errorString_;
-}
-
-
-void States::SetError(YasslError ye)
-{
-    what_ = ye;
-}
-
-
-// mark message recvd, check for duplicates, return 0 on success
-int States::SetMessageRecvd(HandShakeType hst)
-{
-    switch (hst) {
-        case hello_request:
-            break;  // could send more than one
-
-        case client_hello:
-            if (recvdMessages_.gotClientHello_)
-                return -1;
-            recvdMessages_.gotClientHello_ = 1;
-            break;
-
-        case server_hello:
-            if (recvdMessages_.gotServerHello_)
-                return -1;
-            recvdMessages_.gotServerHello_ = 1;
-            break;
-
-        case certificate:
-            if (recvdMessages_.gotCert_)
-                return -1;
-            recvdMessages_.gotCert_ = 1;
-            break;
-
-        case server_key_exchange:
-            if (recvdMessages_.gotServerKeyExchange_)
-                return -1;
-            recvdMessages_.gotServerKeyExchange_ = 1;
-            break;
-
-        case certificate_request:
-            if (recvdMessages_.gotCertRequest_)
-                return -1;
-            recvdMessages_.gotCertRequest_ = 1;
-            break;
-
-        case server_hello_done:
-            if (recvdMessages_.gotServerHelloDone_)
-                return -1;
-            recvdMessages_.gotServerHelloDone_ = 1;
-            break;
-
-        case certificate_verify:
-            if (recvdMessages_.gotCertVerify_)
-                return -1;
-            recvdMessages_.gotCertVerify_ = 1;
-            break;
-
-        case client_key_exchange:
-            if (recvdMessages_.gotClientKeyExchange_)
-                return -1;
-            recvdMessages_.gotClientKeyExchange_ = 1;
-            break;
-
-        case finished:
-            if (recvdMessages_.gotFinished_)
-                return -1;
-            recvdMessages_.gotFinished_ = 1;
-            break;
-
-
-        default:
-            return -1;
-
-    }
-
-    return 0;
-}
-
-
-sslFactory::sslFactory() :           
-        messageFactory_(InitMessageFactory),
-        handShakeFactory_(InitHandShakeFactory),
-        serverKeyFactory_(InitServerKeyFactory),
-        clientKeyFactory_(InitClientKeyFactory) 
-{}
-
-
-const MessageFactory& sslFactory::getMessage() const
-{
-    return messageFactory_;
-}
-
-
-const HandShakeFactory& sslFactory::getHandShake() const
-{
-    return handShakeFactory_;
-}
-
-
-const ServerKeyFactory& sslFactory::getServerKey() const
-{
-    return serverKeyFactory_;
-}
-
-
-const ClientKeyFactory& sslFactory::getClientKey() const
-{
-    return clientKeyFactory_;
-}
-
-
-// extract context parameters and store
-SSL::SSL(SSL_CTX* ctx) 
-    : secure_(ctx->getMethod()->getVersion(), crypto_.use_random(),
-              ctx->getMethod()->getSide(), ctx->GetCiphers(), ctx,
-              ctx->GetDH_Parms().set_), quietShutdown_(false), has_data_(false)
-{
-    if (int err = crypto_.get_random().GetError()) {
-        SetError(YasslError(err));
-        return;
-    }
-
-    CertManager& cm = crypto_.use_certManager();
-    cm.CopySelfCert(ctx->getCert());
-
-    bool serverSide = secure_.use_parms().entity_ == server_end;
-
-    if (ctx->getKey()) {
-        if (int err = cm.SetPrivateKey(*ctx->getKey())) {
-            SetError(YasslError(err));
-            return;
-        }
-        else if (serverSide && !(ctx->GetCiphers().setSuites_)) {
-            // remove RSA or DSA suites depending on cert key type
-            ProtocolVersion pv = secure_.get_connection().version_;
-            
-            bool removeDH  = secure_.use_parms().removeDH_;
-            bool removeRSA = false;
-            bool removeDSA = false;
-            
-            if (cm.get_keyType() == rsa_sa_algo)
-                removeDSA = true;
-            else
-                removeRSA = true;
-            secure_.use_parms().SetSuites(pv, removeDH, removeRSA, removeDSA);
-        }
-    }
-    else if (serverSide) {
-        SetError(no_key_file);
-        return;
-    }
-
-    if (ctx->getMethod()->verifyPeer())
-        cm.setVerifyPeer();
-    if (ctx->getMethod()->verifyNone())
-        cm.setVerifyNone();
-    if (ctx->getMethod()->failNoCert())
-        cm.setFailNoCert();
-    cm.setVerifyCallback(ctx->getVerifyCallback());
-
-    if (serverSide)
-        crypto_.SetDH(ctx->GetDH_Parms());
-
-    const SSL_CTX::CertList& ca = ctx->GetCA_List();
-    SSL_CTX::CertList::const_iterator first(ca.begin());
-    SSL_CTX::CertList::const_iterator last(ca.end());
-
-    while (first != last) {
-        if (int err = cm.CopyCaCert(*first)) {
-            SetError(YasslError(err));
-            return;
-        }
-        ++first;
-    }
-}
-
-
-// store pending security parameters from Server Hello
-void SSL::set_pending(Cipher suite)
-{
-    Parameters& parms = secure_.use_parms();
-
-    switch (suite) {
-
-    case TLS_RSA_WITH_AES_256_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_RSA_WITH_AES_128_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_RSA_WITH_3DES_EDE_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_3DES_EDE_CBC_SHA]
-                , MAX_SUITE_NAME);
-        break;
-
-    case SSL_RSA_WITH_DES_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES);
-        strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_DES_CBC_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_RSA_WITH_RC4_128_SHA:
-        parms.bulk_cipher_algorithm_ = rc4;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = RC4_KEY_SZ;
-        parms.iv_size_   = 0;
-        parms.cipher_type_ = stream;
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS RC4);
-        strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_RSA_WITH_RC4_128_MD5:
-        parms.bulk_cipher_algorithm_ = rc4;
-        parms.mac_algorithm_         = md5;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = MD5_LEN;
-        parms.key_size_  = RC4_KEY_SZ;
-        parms.iv_size_   = 0;
-        parms.cipher_type_ = stream;
-        crypto_.setDigest(NEW_YS MD5);
-        crypto_.setCipher(NEW_YS RC4);
-        strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_MD5],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_DHE_RSA_WITH_DES_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES);
-        strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_DES_CBC_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_,
-              cipher_names[SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_,
-               cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_,
-               cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case SSL_DHE_DSS_WITH_DES_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES);
-        strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_DES_CBC_SHA],
-                MAX_SUITE_NAME);
-        break;
-
-    case SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_,
-              cipher_names[SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_,
-               cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = sha;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = SHA_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS SHA);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_,
-               cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME);
-        break;
-
-    case TLS_RSA_WITH_AES_256_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_RSA_WITH_AES_256_CBC_RMD160], MAX_SUITE_NAME);
-        break;
-
-    case TLS_RSA_WITH_AES_128_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_RSA_WITH_AES_128_CBC_RMD160], MAX_SUITE_NAME);
-        break;
-
-    case TLS_RSA_WITH_3DES_EDE_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = rsa_kea;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_,
-               cipher_names[TLS_RSA_WITH_3DES_EDE_CBC_RMD160], MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_RSA_WITH_AES_256_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_RSA_WITH_AES_128_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = rsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = triple_des;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = DES_EDE_KEY_SZ;
-        parms.iv_size_   = DES_IV_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS DES_EDE);
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_DSS_WITH_AES_256_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_256_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ));
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    case TLS_DHE_DSS_WITH_AES_128_CBC_RMD160:
-        parms.bulk_cipher_algorithm_ = aes;
-        parms.mac_algorithm_         = rmd;
-        parms.kea_                   = diffie_hellman_kea;
-        parms.sig_algo_              = dsa_sa_algo;
-        parms.hash_size_ = RMD_LEN;
-        parms.key_size_  = AES_128_KEY_SZ;
-        parms.iv_size_   = AES_BLOCK_SZ;
-        parms.cipher_type_ = block;
-        secure_.use_connection().send_server_key_  = true; // eph
-        crypto_.setDigest(NEW_YS RMD);
-        crypto_.setCipher(NEW_YS AES);
-        strncpy(parms.cipher_name_,
-                cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_RMD160],
-                MAX_SUITE_NAME);
-        break;
-
-    default:
-        SetError(unknown_cipher);
-    }
-}
-
-#ifdef _WIN32
-typedef volatile LONG yassl_pthread_once_t;
-#define YASSL_PTHREAD_ONCE_INIT  0
-#define YASSL_PTHREAD_ONCE_INPROGRESS 1
-#define YASSL_PTHREAD_ONCE_DONE 2
-
-int yassl_pthread_once(yassl_pthread_once_t *once_control,
-    void (*init_routine)(void))
-{
-  LONG state;
-
-  /*
-    Do "dirty" read to find out if initialization is already done, to
-    save an interlocked operation in common case. Memory barriers are ensured by 
-    Visual C++ volatile implementation.
-  */
-  if (*once_control == YASSL_PTHREAD_ONCE_DONE)
-    return 0;
-
-  state= InterlockedCompareExchange(once_control, YASSL_PTHREAD_ONCE_INPROGRESS,
-                                        YASSL_PTHREAD_ONCE_INIT);
-
-  switch(state)
-  {
-  case YASSL_PTHREAD_ONCE_INIT:
-    /* This is initializer thread */
-    (*init_routine)();
-    *once_control= YASSL_PTHREAD_ONCE_DONE;
-    break;
-
-  case YASSL_PTHREAD_ONCE_INPROGRESS:
-    /* init_routine in progress. Wait for its completion */
-    while(*once_control == YASSL_PTHREAD_ONCE_INPROGRESS)
-    {
-      Sleep(1);
-    }
-    break;
-  case YASSL_PTHREAD_ONCE_DONE:
-    /* Nothing to do */
-    break;
-  }
-  return 0;
-}
-#else
-#define yassl_pthread_once_t pthread_once_t
-#if defined(PTHREAD_ONCE_INITIALIZER)
-#define YASSL_PTHREAD_ONCE_INIT PTHREAD_ONCE_INITIALIZER
-#else
-#define YASSL_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#endif
-#define yassl_pthread_once(C,F) pthread_once(C,F)
-#endif // _WIN32
-
-// store peer's random
-void SSL::set_random(const opaque* random, ConnectionEnd sender)
-{
-    if (sender == client_end)
-        memcpy(secure_.use_connection().client_random_, random, RAN_LEN);
-    else
-        memcpy(secure_.use_connection().server_random_, random, RAN_LEN);
-}
-
-
-// store client pre master secret
-void SSL::set_preMaster(const opaque* pre, uint sz)
-{
-    uint i(0);  // trim leading zeros
-    uint fullSz(sz);
-
-    while (i++ < fullSz && *pre == 0) {
-        sz--;
-        pre++;
-    }
-
-    if (sz == 0) {
-        SetError(bad_input);
-        return;
-    }
-
-    secure_.use_connection().AllocPreSecret(sz);
-    memcpy(secure_.use_connection().pre_master_secret_, pre, sz);
-}
-
-
-// set yaSSL zlib type compression
-int SSL::SetCompression()
-{
-#ifdef HAVE_LIBZ
-    secure_.use_connection().compression_ = true;
-    return 0;
-#else
-    return -1;  // not built in
-#endif
-}
-
-
-// unset yaSSL zlib type compression
-void SSL::UnSetCompression()
-{
-    secure_.use_connection().compression_ = false;
-}
-
-
-// is yaSSL zlib compression on
-bool SSL::CompressionOn() const
-{
-    return secure_.get_connection().compression_;
-}
-
-
-// store master secret
-void SSL::set_masterSecret(const opaque* sec)
-{
-    memcpy(secure_.use_connection().master_secret_, sec, SECRET_LEN);
-}
-
-// store server issued id
-void SSL::set_sessionID(const opaque* sessionID)
-{
-    memcpy(secure_.use_connection().sessionID_, sessionID, ID_LEN);
-    secure_.use_connection().sessionID_Set_ = true;
-}
-
-
-// store error 
-void SSL::SetError(YasslError ye)
-{
-    states_.SetError(ye);
-    //strncpy(states_.useString(), e.what(), mySTL::named_exception::NAME_SIZE);
-    // TODO: add string here
-}
-
-
-// set the quiet shutdown mode (close_nofiy not sent or received on shutdown)
-void SSL::SetQuietShutdown(bool mode)
-{
-  quietShutdown_ = mode;
-}
-
-
-Buffers& SSL::useBuffers()
-{
-    return buffers_;
-}
-
-
-// locals
-namespace {
-
-// DeriveKeys and MasterSecret helper sets prefix letters
-static bool setPrefix(opaque* sha_input, int i)
-{
-    switch (i) {
-    case 0:
-        memcpy(sha_input, "A", 1);
-        break;
-    case 1:
-        memcpy(sha_input, "BB", 2);
-        break;
-    case 2:
-        memcpy(sha_input, "CCC", 3);
-        break;
-    case 3:
-        memcpy(sha_input, "DDDD", 4);
-        break;
-    case 4:
-        memcpy(sha_input, "EEEEE", 5);
-        break;
-    case 5:
-        memcpy(sha_input, "FFFFFF", 6);
-        break;
-    case 6:
-        memcpy(sha_input, "GGGGGGG", 7);
-        break;
-    default:
-        return false;  // prefix_error
-    }
-    return true;
-}
-
-
-const char handshake_order[] = "Out of order HandShake Message!";
-
-
-} // namespcae for locals
-
-
-void SSL::order_error()
-{
-    SetError(out_of_order);
-}
-
-
-// Create and store the master secret see page 32, 6.1
-void SSL::makeMasterSecret()
-{
-    if (GetError()) return;
-
-    if (isTLS())
-        makeTLSMasterSecret();
-    else {
-        opaque sha_output[SHA_LEN];
-
-        const uint& preSz = secure_.get_connection().pre_secret_len_;
-        output_buffer md5_input(preSz + SHA_LEN);
-        output_buffer sha_input(PREFIX + preSz + 2 * RAN_LEN);
-
-        MD5 md5;
-        SHA sha;
-
-        md5_input.write(secure_.get_connection().pre_master_secret_, preSz);
-
-        for (int i = 0; i < MASTER_ROUNDS; ++i) {
-            opaque prefix[PREFIX];
-            if (!setPrefix(prefix, i)) {
-                SetError(prefix_error);
-                return;
-            }
-
-            sha_input.set_current(0);
-            sha_input.write(prefix, i + 1);
-
-            sha_input.write(secure_.get_connection().pre_master_secret_,preSz);
-            sha_input.write(secure_.get_connection().client_random_, RAN_LEN);
-            sha_input.write(secure_.get_connection().server_random_, RAN_LEN);
-            sha.get_digest(sha_output, sha_input.get_buffer(),
-                           sha_input.get_size());
-
-            md5_input.set_current(preSz);
-            md5_input.write(sha_output, SHA_LEN);
-            md5.get_digest(&secure_.use_connection().master_secret_[i*MD5_LEN],
-                           md5_input.get_buffer(), md5_input.get_size());
-        }
-        deriveKeys();
-    }
-    secure_.use_connection().CleanPreMaster();
-}
-
-
-// create TLSv1 master secret
-void SSL::makeTLSMasterSecret()
-{
-    opaque seed[SEED_LEN];
-    
-    memcpy(seed, secure_.get_connection().client_random_, RAN_LEN);
-    memcpy(&seed[RAN_LEN], secure_.get_connection().server_random_, RAN_LEN);
-
-    PRF(secure_.use_connection().master_secret_, SECRET_LEN,
-        secure_.get_connection().pre_master_secret_,
-        secure_.get_connection().pre_secret_len_,
-        master_label, MASTER_LABEL_SZ, 
-        seed, SEED_LEN);
-
-    deriveTLSKeys();
-}
-
-
-// derive mac, write, and iv keys for server and client, see page 34, 6.2.2
-void SSL::deriveKeys()
-{
-    int length = 2 * secure_.get_parms().hash_size_ + 
-                 2 * secure_.get_parms().key_size_  +
-                 2 * secure_.get_parms().iv_size_;
-    int rounds = (length + MD5_LEN - 1 ) / MD5_LEN;
-    input_buffer key_data(rounds * MD5_LEN);
-
-    opaque sha_output[SHA_LEN];
-    opaque md5_input[SECRET_LEN + SHA_LEN];
-    opaque sha_input[KEY_PREFIX + SECRET_LEN + 2 * RAN_LEN];
-  
-    MD5 md5;
-    SHA sha;
-
-    memcpy(md5_input, secure_.get_connection().master_secret_, SECRET_LEN);
-
-    for (int i = 0; i < rounds; ++i) {
-        int j = i + 1;
-        if (!setPrefix(sha_input, i)) {
-            SetError(prefix_error);
-            return;
-        }
-
-        memcpy(&sha_input[j], secure_.get_connection().master_secret_,
-               SECRET_LEN);
-        memcpy(&sha_input[j+SECRET_LEN],
-               secure_.get_connection().server_random_, RAN_LEN);
-        memcpy(&sha_input[j + SECRET_LEN + RAN_LEN],
-               secure_.get_connection().client_random_, RAN_LEN);
-        sha.get_digest(sha_output, sha_input,
-                       sizeof(sha_input) - KEY_PREFIX + j);
-
-        memcpy(&md5_input[SECRET_LEN], sha_output, SHA_LEN);
-        md5.get_digest(key_data.get_buffer() + i * MD5_LEN,
-                       md5_input, sizeof(md5_input));
-    }
-    storeKeys(key_data.get_buffer());
-}
-
-
-// derive mac, write, and iv keys for server and client
-void SSL::deriveTLSKeys()
-{
-    int length = 2 * secure_.get_parms().hash_size_ + 
-                 2 * secure_.get_parms().key_size_  +
-                 2 * secure_.get_parms().iv_size_;
-    opaque       seed[SEED_LEN];
-    input_buffer key_data(length);
-
-    memcpy(seed, secure_.get_connection().server_random_, RAN_LEN);
-    memcpy(&seed[RAN_LEN], secure_.get_connection().client_random_, RAN_LEN);
-
-    PRF(key_data.get_buffer(), length, secure_.get_connection().master_secret_,
-        SECRET_LEN, key_label, KEY_LABEL_SZ, seed, SEED_LEN);
-
-    storeKeys(key_data.get_buffer());
-}
-
-
-// store mac, write, and iv keys for client and server
-void SSL::storeKeys(const opaque* key_data)
-{
-    int sz = secure_.get_parms().hash_size_;
-    memcpy(secure_.use_connection().client_write_MAC_secret_, key_data, sz);
-    int i = sz;
-    memcpy(secure_.use_connection().server_write_MAC_secret_,&key_data[i], sz);
-    i += sz;
-
-    sz = secure_.get_parms().key_size_;
-    memcpy(secure_.use_connection().client_write_key_, &key_data[i], sz);
-    i += sz;
-    memcpy(secure_.use_connection().server_write_key_, &key_data[i], sz);
-    i += sz;
-
-    sz = secure_.get_parms().iv_size_;
-    memcpy(secure_.use_connection().client_write_IV_, &key_data[i], sz);
-    i += sz;
-    memcpy(secure_.use_connection().server_write_IV_, &key_data[i], sz);
-
-    setKeys();
-}
-
-
-// set encrypt/decrypt keys and ivs
-void SSL::setKeys()
-{
-    Connection& conn = secure_.use_connection();
-
-    if (secure_.get_parms().entity_ == client_end) {
-        crypto_.use_cipher().set_encryptKey(conn.client_write_key_, 
-                                            conn.client_write_IV_);
-        crypto_.use_cipher().set_decryptKey(conn.server_write_key_,
-                                            conn.server_write_IV_);
-    }
-    else {
-        crypto_.use_cipher().set_encryptKey(conn.server_write_key_,
-                                            conn.server_write_IV_);
-        crypto_.use_cipher().set_decryptKey(conn.client_write_key_,
-                                            conn.client_write_IV_);
-    }
-}
-
-
-
-// local functors
-namespace yassl_int_cpp_local1 {  // for explicit templates
-
-struct SumData {
-    uint total_;
-    SumData() : total_(0) {}
-    void operator()(input_buffer* data) { total_ += data->get_remaining(); }
-};
-
-
-struct SumBuffer {
-    uint total_;
-    SumBuffer() : total_(0) {}
-    void operator()(output_buffer* buffer) { total_ += buffer->get_size(); }
-};
-
-} // namespace for locals
-using namespace yassl_int_cpp_local1;
-
-
-uint SSL::bufferedData()
-{
-    return STL::for_each(buffers_.getData().begin(),buffers_.getData().end(),
-                           SumData()).total_;
-}
-
-
-// use input buffer to fill data
-void SSL::fillData(Data& data)
-{
-    if (GetError()) return;
-    uint dataSz   = data.get_length();        // input, data size to fill
-    size_t elements = buffers_.getData().size();
-
-    data.set_length(0);                         // output, actual data filled
-    dataSz = min(dataSz, bufferedData());
-
-    for (size_t i = 0; i < elements; i++) {
-        input_buffer* front = buffers_.getData().front();
-        uint frontSz = front->get_remaining();
-        uint readSz  = min(dataSz - data.get_length(), frontSz);
-
-        front->read(data.set_buffer() + data.get_length(), readSz);
-        data.set_length(data.get_length() + readSz);
-
-        if (readSz == frontSz) {
-            buffers_.useData().pop_front();
-            ysDelete(front);
-        }
-        if (data.get_length() == dataSz)
-            break;
-    }
-    
-    if (buffers_.getData().size() == 0) has_data_ = false;  // none left
-}
-
-
-// like Fill but keep data in buffer
-void SSL::PeekData(Data& data)
-{
-    if (GetError()) return;
-    uint   dataSz   = data.get_length();        // input, data size to fill
-    size_t elements = buffers_.getData().size();
-
-    data.set_length(0);                         // output, actual data filled
-    dataSz = min(dataSz, bufferedData());
-
-    Buffers::inputList::iterator front = buffers_.useData().begin();
-
-    while (elements) {
-        uint frontSz = (*front)->get_remaining();
-        uint readSz  = min(dataSz - data.get_length(), frontSz);
-        uint before  = (*front)->get_current();
-
-        (*front)->read(data.set_buffer() + data.get_length(), readSz);
-        data.set_length(data.get_length() + readSz);
-        (*front)->set_current(before);
-
-        if (data.get_length() == dataSz)
-            break;
-
-        elements--;
-        front++;
-    }
-}
-
-
-// flush output buffer
-void SSL::flushBuffer()
-{
-    if (GetError()) return;
-
-    uint sz = STL::for_each(buffers_.getHandShake().begin(),
-                            buffers_.getHandShake().end(),
-                            SumBuffer()).total_;
-    output_buffer out(sz);
-    size_t elements = buffers_.getHandShake().size();
-
-    for (size_t i = 0; i < elements; i++) {
-        output_buffer* front = buffers_.getHandShake().front();
-        out.write(front->get_buffer(), front->get_size());
-
-        buffers_.useHandShake().pop_front();
-        ysDelete(front);
-    }
-    Send(out.get_buffer(), out.get_size());
-}
-
-
-void SSL::Send(const byte* buffer, uint sz)
-{
-    unsigned int sent = 0;
-
-    if (socket_.send(buffer, sz, sent) != sz) {
-        if (socket_.WouldBlock()) {
-            buffers_.SetOutput(NEW_YS output_buffer(sz - sent, buffer + sent,
-                                                    sz - sent));
-            SetError(YasslError(SSL_ERROR_WANT_WRITE));
-        }
-        else
-            SetError(send_error);
-    }
-}
-
-
-void SSL::SendWriteBuffered()
-{
-    output_buffer* out = buffers_.TakeOutput();
-
-    if (out) {
-        mySTL::auto_ptr<output_buffer> tmp(out);
-        Send(out->get_buffer(), out->get_size());
-    }
-}
-
-
-// get sequence number, if verify get peer's
-uint SSL::get_SEQIncrement(bool verify) 
-{ 
-    if (verify)
-        return secure_.use_connection().peer_sequence_number_++; 
-    else
-        return secure_.use_connection().sequence_number_++; 
-}
-
-
-const byte* SSL::get_macSecret(bool verify)
-{
-    if ( (secure_.get_parms().entity_ == client_end && !verify) ||
-         (secure_.get_parms().entity_ == server_end &&  verify) )
-        return secure_.get_connection().client_write_MAC_secret_;
-    else
-        return secure_.get_connection().server_write_MAC_secret_;
-}
-
-
-void SSL::verifyState(const RecordLayerHeader& rlHeader)
-{
-    if (GetError()) return;
-
-    if (rlHeader.version_.major_ != 3 || rlHeader.version_.minor_ > 2) {
-        SetError(badVersion_error);
-        return;
-    }
-
-    if (states_.getRecord() == recordNotReady || 
-            (rlHeader.type_ == application_data &&        // data and handshake
-             states_.getHandShake() != handShakeReady) )  // isn't complete yet
-              SetError(record_layer);
-}
-
-
-void SSL::verifyState(const HandShakeHeader& hsHeader)
-{
-    if (GetError()) return;
-
-    if (states_.getHandShake() == handShakeNotReady) {
-        SetError(handshake_layer);
-        return;
-    }
-
-    if (states_.SetMessageRecvd(hsHeader.get_handshakeType()) != 0) {
-        order_error();
-        return;
-    }
-
-    if (secure_.get_parms().entity_ == client_end)
-        verifyClientState(hsHeader.get_handshakeType());
-    else
-        verifyServerState(hsHeader.get_handshakeType());
-}
-
-
-void SSL::verifyState(ClientState cs)
-{
-    if (GetError()) return;
-    if (states_.getClient() != cs) order_error();
-}
-
-
-void SSL::verifyState(ServerState ss)
-{
-    if (GetError()) return;
-    if (states_.getServer() != ss) order_error();
-}
-
-
-void SSL::verfiyHandShakeComplete()
-{
-    if (GetError()) return;
-    if (states_.getHandShake() != handShakeReady) order_error();
-}
-
-
-void SSL::verifyClientState(HandShakeType hsType)
-{
-    if (GetError()) return;
-
-    switch(hsType) {
-    case server_hello :
-        if (states_.getClient() != serverNull)
-            order_error();
-        break;
-    case certificate :
-        if (states_.getClient() != serverHelloComplete)
-            order_error();
-        break;
-    case server_key_exchange :
-        if (states_.getClient() != serverCertComplete)
-            order_error();
-        break;
-    case certificate_request :
-        if (states_.getClient() != serverCertComplete &&
-            states_.getClient() != serverKeyExchangeComplete)
-            order_error();
-        break;
-    case server_hello_done :
-        if (states_.getClient() != serverCertComplete &&
-            states_.getClient() != serverKeyExchangeComplete)
-            order_error();
-        break;
-    case finished :
-        if (states_.getClient() != serverHelloDoneComplete || 
-            secure_.get_parms().pending_)    // no change
-                order_error();          // cipher yet
-        break;
-    default :
-        order_error();
-    };
-}
-
-
-void SSL::verifyServerState(HandShakeType hsType)
-{
-    if (GetError()) return;
-
-    switch(hsType) {
-    case client_hello :
-        if (states_.getServer() != clientNull)
-            order_error();
-        break;
-    case certificate :
-        if (states_.getServer() != clientHelloComplete)
-            order_error();
-        break;
-    case client_key_exchange :
-        if (states_.getServer() != clientHelloComplete)
-            order_error();
-        break;
-    case certificate_verify :
-        if (states_.getServer() != clientKeyExchangeComplete)
-            order_error();
-        break;
-    case finished :
-        if (states_.getServer() != clientKeyExchangeComplete || 
-            secure_.get_parms().pending_)    // no change
-                order_error();               // cipher yet
-        break;
-    default :
-        order_error();
-    };
-}
-
-
-// try to find a suite match
-void SSL::matchSuite(const opaque* peer, uint length)
-{
-    if (length == 0 || (length % 2) != 0) {
-        SetError(bad_input);
-        return;
-    }
-
-    // start with best, if a match we are good, Ciphers are at odd index
-    // since all SSL and TLS ciphers have 0x00 first byte
-    for (uint i = 1; i < secure_.get_parms().suites_size_; i += 2)
-        for (uint j = 0; (j + 1) < length; j+= 2) {
-            if (peer[j] != 0x00) {
-                continue; // only 0x00 first byte supported
-            }
-
-            if (secure_.use_parms().suites_[i] == peer[j + 1]) {
-                secure_.use_parms().suite_[0] = 0x00;
-                secure_.use_parms().suite_[1] = peer[j + 1];
-                return;
-            }
-        }
-
-    SetError(match_error);
-}
-
-
-void SSL::set_session(SSL_SESSION* s) 
-{
-    if (getSecurity().GetContext()->GetSessionCacheOff())
-        return;
-
-    if (s && GetSessions().lookup(s->GetID(), &secure_.use_resume())) {
-        secure_.set_resuming(true);
-        crypto_.use_certManager().setPeerX509(s->GetPeerX509());
-    }
-}
-
-
-const Crypto& SSL::getCrypto() const
-{
-    return crypto_;
-}
-
-
-const Security& SSL::getSecurity() const
-{
-    return secure_;
-}
-
-
-const States& SSL::getStates() const
-{
-    return states_;
-}
-
-
-const sslHashes& SSL::getHashes() const
-{
-    return hashes_;
-}
-
-
-const sslFactory& SSL::getFactory() const
-{
-    return GetSSL_Factory();
-}
-
-
-const Socket& SSL::getSocket() const
-{
-    return socket_;
-}
-
-
-YasslError SSL::GetError() const
-{
-    return states_.What();
-}
-
-
-bool SSL::GetQuietShutdown() const
-{
-    return quietShutdown_;
-}
-
-
-bool SSL::GetMultiProtocol() const
-{
-    return secure_.GetContext()->getMethod()->multipleProtocol();
-}
-
-
-Crypto& SSL::useCrypto()
-{
-    return crypto_;
-}
-
-
-Security& SSL::useSecurity()
-{
-    return secure_;
-}
-
-
-States& SSL::useStates()
-{
-    return states_;
-}
-
-
-sslHashes& SSL::useHashes()
-{
-    return hashes_;
-}
-
-
-Socket& SSL::useSocket()
-{
-    return socket_;
-}
-
-
-Log& SSL::useLog()
-{
-    return log_;
-}
-
-
-bool SSL::isTLS() const
-{
-    return secure_.get_connection().TLS_;
-}
-
-
-bool SSL::isTLSv1_1() const
-{
-    return secure_.get_connection().TLSv1_1_;
-}
-
-
-// is there buffered data available, optimization to remove iteration on buffer
-bool SSL::HasData() const
-{ 
-    return has_data_;
-}
-
-
-void SSL::addData(input_buffer* data)
-{
-    buffers_.useData().push_back(data);
-    if (!has_data_) has_data_ = true;
-}
-
-
-void SSL::addBuffer(output_buffer* b)
-{
-    buffers_.useHandShake().push_back(b);
-}
-
-
-void SSL_SESSION::CopyX509(X509* x)
-{
-    if (x == 0) return;
-
-    X509_NAME* issuer   = x->GetIssuer();
-    X509_NAME* subject  = x->GetSubject();
-    ASN1_TIME* before = x->GetBefore();
-    ASN1_TIME* after  = x->GetAfter();
-
-    peerX509_ = NEW_YS X509(issuer->GetName(), issuer->GetLength(),
-        subject->GetName(), subject->GetLength(),
-        before, after,
-        issuer->GetCnPosition(), issuer->GetCnLength(),
-        subject->GetCnPosition(), subject->GetCnLength());
-}
-
-
-// store connection parameters
-SSL_SESSION::SSL_SESSION(const SSL& ssl, RandomPool& ran) 
-    : timeout_(DEFAULT_TIMEOUT), random_(ran), peerX509_(0)
-{
-    const Connection& conn = ssl.getSecurity().get_connection();
-
-    memcpy(sessionID_, conn.sessionID_, ID_LEN);
-    memcpy(master_secret_, conn.master_secret_, SECRET_LEN);
-    memcpy(suite_, ssl.getSecurity().get_parms().suite_, SUITE_LEN);
-
-    bornOn_ = lowResTimer();
-
-    CopyX509(ssl.getCrypto().get_certManager().get_peerX509());
-}
-
-
-// for resumption copy in ssl::parameters
-SSL_SESSION::SSL_SESSION(RandomPool& ran) 
-    : bornOn_(0), timeout_(0), random_(ran), peerX509_(0)
-{
-    memset(sessionID_, 0, ID_LEN);
-    memset(master_secret_, 0, SECRET_LEN);
-    memset(suite_, 0, SUITE_LEN);
-}
-
-
-SSL_SESSION& SSL_SESSION::operator=(const SSL_SESSION& that)
-{
-    memcpy(sessionID_, that.sessionID_, ID_LEN);
-    memcpy(master_secret_, that.master_secret_, SECRET_LEN);
-    memcpy(suite_, that.suite_, SUITE_LEN);
-    
-    bornOn_  = that.bornOn_;
-    timeout_ = that.timeout_;
-
-    if (peerX509_) {
-        ysDelete(peerX509_);
-        peerX509_ = 0;
-    }
-    CopyX509(that.peerX509_);
-
-    return *this;
-}
-
-
-const opaque* SSL_SESSION::GetID() const
-{
-    return sessionID_;
-}
-
-
-const opaque* SSL_SESSION::GetSecret() const
-{
-    return master_secret_;
-}
-
-
-const Cipher* SSL_SESSION::GetSuite() const
-{
-    return suite_;
-}
-
-
-X509* SSL_SESSION::GetPeerX509() const
-{
-    return peerX509_;
-}
-
-
-uint SSL_SESSION::GetBornOn() const
-{
-    return bornOn_;
-}
-
-
-uint SSL_SESSION::GetTimeOut() const
-{
-    return timeout_;
-}
-
-
-void SSL_SESSION::SetTimeOut(uint t)
-{
-    timeout_ = t;
-}
-
-
-extern void clean(volatile opaque*, uint, RandomPool&);
-
-
-// clean up secret data
-SSL_SESSION::~SSL_SESSION()
-{
-    volatile opaque* p = master_secret_;
-    clean(p, SECRET_LEN, random_);
-
-    ysDelete(peerX509_);
-}
-
-
-static Sessions* sessionsInstance = 0;
-static yassl_pthread_once_t session_created= YASSL_PTHREAD_ONCE_INIT;
-
-void Session_initialize()
-{
-    sessionsInstance = NEW_YS Sessions;
-}
-
-extern "C"
-{
-  static void c_session_initialize() { Session_initialize(); }
-}
-
-
-Sessions& GetSessions()
-{
-    yassl_pthread_once(&session_created, c_session_initialize);
-    return *sessionsInstance;
-}
-
-
-static sslFactory* sslFactoryInstance = 0;
-
-sslFactory& GetSSL_Factory()
-{  
-    if (!sslFactoryInstance)
-        sslFactoryInstance = NEW_YS sslFactory;
-    return *sslFactoryInstance;
-}
-
-
-static Errors* errorsInstance = 0;
-
-Errors& GetErrors()
-{
-    if (!errorsInstance)
-        errorsInstance = NEW_YS Errors;
-    return *errorsInstance;
-}
-
-
-typedef Mutex::Lock Lock;
-
-
- 
-void Sessions::add(const SSL& ssl) 
-{
-    if (ssl.getSecurity().get_connection().sessionID_Set_) {
-        Lock guard(mutex_);
-        list_.push_back(NEW_YS SSL_SESSION(ssl, random_));
-        count_++;
-    }
-
-    if (count_ > SESSION_FLUSH_COUNT)
-        if (!ssl.getSecurity().GetContext()->GetSessionCacheFlushOff())
-            Flush();
-}
-
-
-Sessions::~Sessions() 
-{ 
-    STL::for_each(list_.begin(), list_.end(), del_ptr_zero()); 
-}
-
-
-// locals
-namespace yassl_int_cpp_local2 { // for explicit templates
-
-typedef STL::list<SSL_SESSION*>::iterator sess_iterator;
-typedef STL::list<ThreadError>::iterator  thr_iterator;
-
-struct sess_match {
-    const opaque* id_;
-    explicit sess_match(const opaque* p) : id_(p) {}
-
-    bool operator()(SSL_SESSION* sess)
-    {
-        if ( memcmp(sess->GetID(), id_, ID_LEN) == 0)
-            return true;
-        return false;
-    }
-};
-
-
-THREAD_ID_T GetSelf()
-{
-#ifndef _POSIX_THREADS
-    return GetCurrentThreadId();
-#else
-    return pthread_self();
-#endif
-}
-
-struct thr_match {
-    THREAD_ID_T id_;
-    explicit thr_match() : id_(GetSelf()) {}
-
-    bool operator()(ThreadError thr)
-    {
-        if (thr.threadID_ == id_)
-            return true;
-        return false;
-    }
-};
-
-
-} // local namespace
-using namespace yassl_int_cpp_local2;
-
-
-// lookup session by id, return a copy if space provided
-SSL_SESSION* Sessions::lookup(const opaque* id, SSL_SESSION* copy)
-{
-    Lock guard(mutex_);
-    sess_iterator find = STL::find_if(list_.begin(), list_.end(),
-                                        sess_match(id));
-    if (find != list_.end()) {
-        uint current = lowResTimer();
-        if ( ((*find)->GetBornOn() + (*find)->GetTimeOut()) < current) {
-            del_ptr_zero()(*find);
-            list_.erase(find);
-            return 0;
-        }
-        if (copy)
-            *copy = *(*find);
-        return *find;
-    }
-    return 0;
-}
-
-
-// remove a session by id
-void Sessions::remove(const opaque* id)
-{
-    Lock guard(mutex_);
-    sess_iterator find = STL::find_if(list_.begin(), list_.end(),
-                                        sess_match(id));
-    if (find != list_.end()) {
-        del_ptr_zero()(*find);
-        list_.erase(find);
-    }
-}
-
-
-// flush expired sessions from cache 
-void Sessions::Flush()
-{
-    Lock guard(mutex_);
-    sess_iterator next = list_.begin();
-    uint current = lowResTimer();
-
-    while (next != list_.end()) {
-        sess_iterator si = next;
-        ++next;
-        if ( ((*si)->GetBornOn() + (*si)->GetTimeOut()) < current) {
-            del_ptr_zero()(*si);
-            list_.erase(si);
-        }
-    }
-    count_ = 0;  // reset flush counter
-}
-
-
-// remove a self thread error
-void Errors::Remove()
-{
-    Lock guard(mutex_);
-    thr_iterator find = STL::find_if(list_.begin(), list_.end(),
-                                       thr_match());
-    if (find != list_.end())
-        list_.erase(find);
-}
-
-
-// lookup self error code
-int Errors::Lookup(bool peek)
-{
-    Lock guard(mutex_);
-    thr_iterator find = STL::find_if(list_.begin(), list_.end(),
-                                       thr_match());
-    if (find != list_.end()) {
-        int ret = find->errorID_;
-        if (!peek)
-            list_.erase(find);
-        return ret;
-    }
-    else
-        return 0;
-}
-
-
-// add a new error code for self
-void Errors::Add(int error)
-{
-    ThreadError add;
-    add.errorID_  = error;
-    add.threadID_ = GetSelf();
-
-    Remove();   // may have old error
-
-    Lock guard(mutex_);
-    list_.push_back(add);
-}
-
-
-SSL_METHOD::SSL_METHOD(ConnectionEnd ce, ProtocolVersion pv, bool multiProto) 
-    : version_(pv), side_(ce), verifyPeer_(false), verifyNone_(false),
-      failNoCert_(false), multipleProtocol_(multiProto)
-{}
-
-
-ProtocolVersion SSL_METHOD::getVersion() const
-{
-    return version_;
-}
-
-
-ConnectionEnd SSL_METHOD::getSide() const
-{
-    return side_;
-}
-
-
-void SSL_METHOD::setVerifyPeer()
-{
-    verifyPeer_ = true;
-}
-
-
-void SSL_METHOD::setVerifyNone()
-{
-    verifyNone_ = true;
-}
-
-
-void SSL_METHOD::setFailNoCert()
-{
-    failNoCert_ = true;
-}
-
-
-bool SSL_METHOD::verifyPeer() const
-{
-    return verifyPeer_;
-}
-
-
-bool SSL_METHOD::verifyNone() const
-{
-    return verifyNone_;
-}
-
-
-bool SSL_METHOD::failNoCert() const
-{
-    return failNoCert_;
-}
-
-
-bool SSL_METHOD::multipleProtocol() const
-{
-    return multipleProtocol_;
-}
-
-
-/** Implement a my_strdup replacement, so we can reuse get_password() */
-extern "C" char *yassl_mysql_strdup(const char *from, int)
-{
-  return from ? strdup(from) : NULL;
-}
-
-
-extern "C"
-{
-int
-default_password_callback(char * buffer, int size_arg, int rwflag,
-                          void * /* unused: callback_data */)
-{
-  char *passwd;
-  size_t passwd_len, size= (size_t) size_arg;
-
-  passwd= ::yassl_mysql_get_tty_password_ext("Enter PEM pass phrase:", 
-                                             yassl_mysql_strdup);
-
-  if (!passwd)
-    return 0;
-
-  passwd_len= strlen(passwd);
-
-  if (!passwd_len)
-    return 0;
-
-  if (size > 0)
-  {
-    size_t result_len= size - 1 > passwd_len ? 
-      passwd_len : size - 1;
-    memcpy(buffer, passwd, result_len);
-    buffer[result_len]= 0;
-  }
-  free(passwd);
-  return passwd_len;
-}
-}
-
-SSL_CTX::SSL_CTX(SSL_METHOD* meth) 
-    : method_(meth), certificate_(0), privateKey_(0), 
-      passwordCb_(default_password_callback),
-      userData_(0), sessionCacheOff_(false), sessionCacheFlushOff_(false),
-      verifyCallback_(0)
-{}
-
-
-SSL_CTX::~SSL_CTX()
-{
-    ysDelete(method_);
-    ysDelete(certificate_);
-    ysDelete(privateKey_);
-
-    STL::for_each(caList_.begin(), caList_.end(), del_ptr_zero());
-}
-
-
-void SSL_CTX::AddCA(x509* ca)
-{
-    caList_.push_back(ca);
-}
-
-
-const SSL_CTX::CertList& 
-SSL_CTX::GetCA_List() const
-{
-    return caList_;
-}
-
-
-VerifyCallback SSL_CTX::getVerifyCallback() const
-{
-    return verifyCallback_;
-}
-
-
-const x509* SSL_CTX::getCert() const
-{
-    return certificate_;
-}
-
-
-const x509* SSL_CTX::getKey() const
-{
-    return privateKey_;
-}
-
-
-const SSL_METHOD* SSL_CTX::getMethod() const
-{
-    return method_;
-}
-
-
-const Ciphers& SSL_CTX::GetCiphers() const
-{
-    return ciphers_;
-}
-
-
-const DH_Parms& SSL_CTX::GetDH_Parms() const
-{
-    return dhParms_;
-}
-
-
-const Stats& SSL_CTX::GetStats() const
-{
-    return stats_;
-}
-
-
-pem_password_cb SSL_CTX::GetPasswordCb() const
-{
-    return passwordCb_;
-}
-
-
-void SSL_CTX::SetPasswordCb(pem_password_cb cb)
-{
-    passwordCb_ = cb;
-}
-
-
-void* SSL_CTX::GetUserData() const
-{
-    return userData_;
-}
-
-
-bool SSL_CTX::GetSessionCacheOff() const
-{
-    return sessionCacheOff_;
-}
-
-
-bool SSL_CTX::GetSessionCacheFlushOff() const
-{
-    return sessionCacheFlushOff_;
-}
-
-
-void SSL_CTX::SetUserData(void* data)
-{
-    userData_ = data;
-}
-
-
-void SSL_CTX::SetSessionCacheOff()
-{
-    sessionCacheOff_ = true;
-}
-
-
-void SSL_CTX::SetMethod(SSL_METHOD* meth)
-{
-    if(method_)
-      ysDelete(method_);
-    method_=  meth;
-}
-
-
-void SSL_CTX::SetSessionCacheFlushOff()
-{
-    sessionCacheFlushOff_ = true;
-}
-
-
-void SSL_CTX::setVerifyPeer()
-{
-    method_->setVerifyPeer();
-}
-
-
-void SSL_CTX::setVerifyNone()
-{
-    method_->setVerifyNone();
-}
-
-
-void SSL_CTX::setFailNoCert()
-{
-    method_->setFailNoCert();
-}
-
-
-void SSL_CTX::setVerifyCallback(VerifyCallback vc)
-{
-    verifyCallback_ = vc;
-}
-
-
-bool SSL_CTX::SetDH(const DH& dh)
-{
-    dhParms_.p_ = dh.p->int_;
-    dhParms_.g_ = dh.g->int_;
-
-    return dhParms_.set_ = true;
-}
-
-
-bool SSL_CTX::SetCipherList(const char* list)
-{
-    if (!list)
-        return false;
-
-    bool ret = false;
-    char name[MAX_SUITE_NAME];
-
-    char  needle[] = ":";
-    char* haystack = const_cast<char*>(list);
-    char* prev;
-
-    const int suiteSz = sizeof(cipher_names) / sizeof(cipher_names[0]);
-    int idx = 0;
-
-    for(;;) {
-        size_t len;
-        prev = haystack;
-        haystack = strstr(haystack, needle);
-
-        if (!haystack)    // last cipher
-            len = min(sizeof(name), strlen(prev));
-        else
-            len = min(sizeof(name), (size_t)(haystack - prev));
-
-        strncpy(name, prev, len);
-        name[(len == sizeof(name)) ? len - 1 : len] = 0;
-
-        for (int i = 0; i < suiteSz; i++)
-            if (strncmp(name, cipher_names[i], sizeof(name)) == 0) {
-
-                ciphers_.suites_[idx++] = 0x00;  // first byte always zero
-                ciphers_.suites_[idx++] = i;
-
-                if (!ret) ret = true;   // found at least one
-                break;
-            }
-        if (!haystack) break;
-        haystack++;
-    }
-
-    if (ret) {
-        ciphers_.setSuites_ = true;
-        ciphers_.suiteSz_ = idx;
-    }
-
-    return ret;
-}
-
-
-void SSL_CTX::IncrementStats(StatsField fd)
-{
-
-    Lock guard(mutex_);
-    
-    switch (fd) {
-
-	case Accept:
-        ++stats_.accept_;
-        break;
-
-    case Connect:
-        ++stats_.connect_;
-        break;
-
-    case AcceptGood:
-        ++stats_.acceptGood_;
-        break;
-
-    case ConnectGood:
-        ++stats_.connectGood_;
-        break;
-
-    case AcceptRenegotiate:
-        ++stats_.acceptRenegotiate_;
-        break;
-
-    case ConnectRenegotiate:
-        ++stats_.connectRenegotiate_;
-        break;
-
-    case Hits:
-        ++stats_.hits_;
-        break;
-
-    case CbHits:
-        ++stats_.cbHits_;
-        break;
-
-    case CacheFull:
-        ++stats_.cacheFull_;
-        break;
-
-    case Misses:
-        ++stats_.misses_;
-        break;
-
-    case Timeouts:
-        ++stats_.timeouts_;
-        break;
-
-    case Number:
-        ++stats_.number_;
-        break;
-
-    case GetCacheSize:
-        ++stats_.getCacheSize_;
-        break;
-
-    case VerifyMode:
-        ++stats_.verifyMode_;
-        break;
-
-    case VerifyDepth:
-        ++stats_.verifyDepth_;
-        break;
-
-    default:
-        break;
-    }
-}
-
-
-Crypto::Crypto() 
-    : digest_(0), cipher_(0), dh_(0) 
-{}
-
-
-Crypto::~Crypto()
-{
-    ysDelete(dh_);
-    ysDelete(cipher_);
-    ysDelete(digest_);
-}
-
-
-const Digest& Crypto::get_digest() const
-{
-    return *digest_;
-}
-
-
-const BulkCipher& Crypto::get_cipher() const
-{
-    return *cipher_;
-}
-
-
-const DiffieHellman& Crypto::get_dh() const
-{
-    return *dh_;
-}
-
-
-const RandomPool& Crypto::get_random() const
-{
-    return random_;
-}
-
-
-const CertManager& Crypto::get_certManager() const
-{
-    return cert_;
-}
-
-
-      
-Digest& Crypto::use_digest()
-{
-    return *digest_;
-}
-
-
-BulkCipher& Crypto::use_cipher()
-{
-    return *cipher_;
-}
-
-
-DiffieHellman& Crypto::use_dh()
-{
-    return *dh_;
-}
-
-
-RandomPool& Crypto::use_random()
-{
-    return random_;
-}
-
-
-CertManager& Crypto::use_certManager()
-{
-    return cert_;
-}
-
-
-
-void Crypto::SetDH(DiffieHellman* dh)
-{
-    dh_ = dh;
-}
-
-
-void Crypto::SetDH(const DH_Parms& dh)
-{
-    if (dh.set_)
-        dh_ = NEW_YS DiffieHellman(dh.p_, dh.g_, random_);
-}
-
-
-bool Crypto::DhSet()
-{
-    return dh_ != 0;
-}
-
-
-void Crypto::setDigest(Digest* digest)
-{
-    digest_ = digest;
-}
-
-
-void Crypto::setCipher(BulkCipher* c)
-{
-    cipher_ = c;
-}
-
-
-const MD5& sslHashes::get_MD5() const
-{
-    return md5HandShake_;
-}
-
-
-const SHA& sslHashes::get_SHA() const
-{
-    return shaHandShake_;
-}
-
-
-const Finished& sslHashes::get_verify() const
-{
-    return verify_;
-}
-
-
-const Hashes& sslHashes::get_certVerify() const
-{
-    return certVerify_;
-}
-
-
-MD5& sslHashes::use_MD5(){
-    return md5HandShake_;
-}
-
-
-SHA& sslHashes::use_SHA()
-{
-    return shaHandShake_;
-}
-
-
-Finished& sslHashes::use_verify()
-{
-    return verify_;
-}
-
-
-Hashes& sslHashes::use_certVerify()
-{
-    return certVerify_;
-}
-
-
-Buffers::Buffers() : prevSent(0), plainSz(0), rawInput_(0), output_(0)
-{}
-
-
-Buffers::~Buffers()
-{
-    STL::for_each(handShakeList_.begin(), handShakeList_.end(),
-                  del_ptr_zero()) ;
-    STL::for_each(dataList_.begin(), dataList_.end(),
-                  del_ptr_zero()) ;
-    ysDelete(rawInput_);
-    ysDelete(output_);
-}
-
-
-void Buffers::SetOutput(output_buffer* ob)
-{
-    output_ = ob;
-}
-
-
-void Buffers::SetRawInput(input_buffer* ib)
-{
-    rawInput_ = ib;
-}
-
-
-input_buffer* Buffers::TakeRawInput()
-{
-    input_buffer* ret = rawInput_;
-    rawInput_ = 0;
-
-    return ret;
-}
-
-
-output_buffer* Buffers::TakeOutput()
-{
-    output_buffer* ret = output_;
-    output_ = 0;
-
-    return ret;
-}
-
-
-const Buffers::inputList& Buffers::getData() const
-{
-    return dataList_;
-}
-
-
-const Buffers::outputList& Buffers::getHandShake() const
-{
-    return handShakeList_;
-}
-
-
-Buffers::inputList& Buffers::useData()
-{
-    return dataList_;
-}
-
-
-Buffers::outputList& Buffers::useHandShake()
-{
-    return handShakeList_;
-}
-
-
-Security::Security(ProtocolVersion pv, RandomPool& ran, ConnectionEnd ce,
-                   const Ciphers& ciphers, SSL_CTX* ctx, bool haveDH)
-   : conn_(pv, ran), parms_(ce, ciphers, pv, haveDH), resumeSession_(ran),
-     ctx_(ctx), resuming_(false)
-{}
-
-
-const Connection& Security::get_connection() const
-{
-    return conn_;
-}
-
-
-const SSL_CTX* Security::GetContext() const
-{
-    return ctx_;
-}
-
-
-const Parameters& Security::get_parms() const
-{
-    return parms_;
-}
-
-
-const SSL_SESSION& Security::get_resume() const
-{
-    return resumeSession_;
-}
-
-
-bool Security::get_resuming() const
-{
-    return resuming_;
-}
-
-
-Connection& Security::use_connection()
-{
-    return conn_;
-}
-
-
-Parameters& Security::use_parms()
-{
-    return parms_;
-}
-
-
-SSL_SESSION& Security::use_resume()
-{
-    return resumeSession_;
-}
-
-
-void Security::set_resuming(bool b)
-{
-    resuming_ = b;
-}
-
-
-X509_NAME::X509_NAME(const char* n, size_t sz, int pos, int len)
-    : name_(0), sz_(sz), cnPosition_(pos), cnLen_(len)
-{
-    if (sz) {
-        name_ = NEW_YS char[sz];
-        memcpy(name_, n, sz);
-    }
-    entry_.data = 0;
-}
-
-
-X509_NAME::~X509_NAME()
-{
-    ysArrayDelete(name_);
-    ysArrayDelete(entry_.data);
-}
-
-
-const char* X509_NAME::GetName() const
-{
-    return name_;
-}
-
-
-size_t X509_NAME::GetLength() const
-{
-    return sz_;
-}
-
-
-X509::X509(const char* i, size_t iSz, const char* s, size_t sSz,
-           ASN1_STRING *b, ASN1_STRING *a,
-           int issPos, int issLen,
-           int subPos, int subLen)
-    : issuer_(i, iSz, issPos, issLen), subject_(s, sSz, subPos, subLen),
-      beforeDate_((char *) b->data, b->length, b->type),
-      afterDate_((char *) a->data, a->length, a->type)
-{}
-
-
-X509_NAME* X509::GetIssuer()
-{
-    return &issuer_;
-}
-
-
-X509_NAME* X509::GetSubject()
-{
-    return &subject_;
-}
-
-
-ASN1_TIME* X509::GetBefore()
-{
-    return beforeDate_.GetString();
-}
-
-
-ASN1_TIME* X509::GetAfter()
-{
-    return afterDate_.GetString();
-}
-
-
-ASN1_STRING* X509_NAME::GetEntry(int i)
-{
-    if (i < 0 || i >= int(sz_))
-        return 0;
-
-    if (i != cnPosition_ || cnLen_ <= 0)   // only entry currently supported
-        return 0;
-
-    if (cnLen_ > int(sz_-i))   // make sure there's room in read buffer
-        return 0;
-
-    if (entry_.data)
-        ysArrayDelete(entry_.data);
-    entry_.data = NEW_YS byte[cnLen_+1];       // max size;
-
-    memcpy(entry_.data, &name_[i], cnLen_);
-    entry_.data[cnLen_] = 0;
-    entry_.length = cnLen_;
-    entry_.type = 0;
-    return &entry_;
-}
-
-
-StringHolder::StringHolder(const char* str, int sz, byte type)
-{
-    asnString_.length = sz;
-    asnString_.data = NEW_YS byte[sz + 1];
-    memcpy(asnString_.data, str, sz);
-    asnString_.type = type;
-}
-
-
-StringHolder::~StringHolder()
-{
-    ysArrayDelete(asnString_.data);
-}
-
-
-ASN1_STRING* StringHolder::GetString()
-{
-    return &asnString_;
-}
-
-
-#ifdef HAVE_LIBZ
-
-    void* myAlloc(void* /* opaque */, unsigned int item, unsigned int size)
-    {
-        return NEW_YS unsigned char[item * size];
-    }
-
-
-    void myFree(void* /* opaque */, void* memory)
-    {
-        unsigned char* ptr = static_cast<unsigned char*>(memory);
-        yaSSL::ysArrayDelete(ptr);
-    }
-
-
-    // put size in front of compressed data
-    int Compress(const byte* in, int sz, input_buffer& buffer)
-    {
-        byte     tmp[LENGTH_SZ];
-        z_stream c_stream; /* compression stream */
-
-        buffer.allocate(sz + sizeof(uint16) + COMPRESS_EXTRA);
-
-        c_stream.zalloc = myAlloc;
-        c_stream.zfree  = myFree;
-        c_stream.opaque = (voidpf)0;
-
-        c_stream.next_in   = const_cast<byte*>(in);
-        c_stream.avail_in  = sz;
-        c_stream.next_out  = buffer.get_buffer() + sizeof(tmp);
-        c_stream.avail_out = buffer.get_capacity() - sizeof(tmp);
-
-        if (deflateInit(&c_stream, 8) != Z_OK) return -1;
-        int err = deflate(&c_stream, Z_FINISH);
-        deflateEnd(&c_stream);
-        if (err != Z_OK && err != Z_STREAM_END) return -1;
-
-        c16toa(sz, tmp);
-        memcpy(buffer.get_buffer(), tmp, sizeof(tmp));
-        buffer.add_size(c_stream.total_out + sizeof(tmp));
-
-        return 0;
-    }
-
-
-    // get uncompressed size in front
-    int DeCompress(input_buffer& in, int sz, input_buffer& out)
-    {
-        byte tmp[LENGTH_SZ];
-   
-        tmp[0] = in[AUTO]; 
-        tmp[1] = in[AUTO]; 
-
-        uint16 len;
-        ato16(tmp, len);
-
-        out.allocate(len);
-
-        z_stream d_stream; /* decompression stream */
-
-        d_stream.zalloc = myAlloc;
-        d_stream.zfree  = myFree;
-        d_stream.opaque = (voidpf)0;
-
-        d_stream.next_in   = in.get_buffer() + in.get_current();
-        d_stream.avail_in  = sz - sizeof(tmp);
-        d_stream.next_out  = out.get_buffer();
-        d_stream.avail_out = out.get_capacity();
-
-        if (inflateInit(&d_stream) != Z_OK) return -1;
-        int err = inflate(&d_stream, Z_FINISH);
-        inflateEnd(&d_stream);
-        if (err != Z_OK && err != Z_STREAM_END) return -1;
-
-        out.add_size(d_stream.total_out);
-        in.set_current(in.get_current() + sz - sizeof(tmp));
-
-        return 0;
-    }
-
-
-#else  // LIBZ
-
-    // these versions should never get called
-    int Compress(const byte* in, int sz, input_buffer& buffer)
-    {
-        return -1;
-    } 
-
-
-    int DeCompress(input_buffer& in, int sz, input_buffer& out)
-    {
-        return -1;
-    } 
-
-
-#endif // LIBZ
-
-
-} // namespace
-
-
-
-extern "C" void yaSSL_CleanUp()
-{
-    TaoCrypt::CleanUp();
-    yaSSL::ysDelete(yaSSL::sslFactoryInstance);
-    yaSSL::ysDelete(yaSSL::sessionsInstance);
-    yaSSL::ysDelete(yaSSL::errorsInstance);
-
-    // In case user calls more than once, prevent seg fault
-    yaSSL::sslFactoryInstance = 0;
-    yaSSL::sessionsInstance = 0;
-    yaSSL::errorsInstance = 0;
-}
-
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-namespace mySTL {
-template yaSSL::yassl_int_cpp_local1::SumData for_each<mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumData>(mySTL::list<yaSSL::input_buffer*>::iterator, mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumData);
-template yaSSL::yassl_int_cpp_local1::SumBuffer for_each<mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumBuffer>(mySTL::list<yaSSL::output_buffer*>::iterator, mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::yassl_int_cpp_local1::SumBuffer);
-template mySTL::list<yaSSL::SSL_SESSION*>::iterator find_if<mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::yassl_int_cpp_local2::sess_match>(mySTL::list<yaSSL::SSL_SESSION*>::iterator, mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::yassl_int_cpp_local2::sess_match);
-template mySTL::list<yaSSL::ThreadError>::iterator find_if<mySTL::list<yaSSL::ThreadError>::iterator, yaSSL::yassl_int_cpp_local2::thr_match>(mySTL::list<yaSSL::ThreadError>::iterator, mySTL::list<yaSSL::ThreadError>::iterator, yaSSL::yassl_int_cpp_local2::thr_match);
-}
-#endif
-
diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
deleted file mode 100644
index 3d3d1d5575cd..000000000000
--- a/extra/yassl/taocrypt/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include)
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-ADD_DEFINITIONS(${SSL_DEFINES})
-SET(TAOCRYPT_SOURCES		src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 
-				src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp 
-				src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp 
-				src/rabbit.cpp src/hc128.cpp
-				include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp 
-				include/coding.hpp include/des.hpp include/dh.hpp include/dsa.hpp include/dsa.hpp
-				include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp 
-				include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp
-				include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp
-				include/rabbit.hpp include/hc128.hpp)
-
-IF(HAVE_EXPLICIT_TEMPLATE_INSTANTIATION)
-  SET(TAOCRYPT_SOURCES ${TAOCRYPT_SOURCES} src/template_instnt.cpp)
-ENDIF()
-
-ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/extra/yassl/taocrypt/COPYING b/extra/yassl/taocrypt/COPYING
deleted file mode 100644
index 845980af4a43..000000000000
--- a/extra/yassl/taocrypt/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/extra/yassl/taocrypt/README b/extra/yassl/taocrypt/README
deleted file mode 100644
index bd786b7ce54e..000000000000
--- a/extra/yassl/taocrypt/README
+++ /dev/null
@@ -1,48 +0,0 @@
-TaoCrypt release 0.9.2   02/5/2007
-
-
-This release includes bug fixes, portability enhancements, and some 
-optimiations.
-
-See 0.9.0 for build instructions.
-
-
-
-
-******************TaoCrypt release 0.9.0   09/18/2006
-
-This is the first release of TaoCrypt, it was previously only included with
-yaSSL. TaoCrypt is highly portable and fast, its features include:
-
-One way hash functions: SHA-1, MD2, MD4, MD5, RIPEMD-160
-Message authentication codes: HMAC
-Block Ciphers: DES, Triple-DES, AES, Blowfish, Twofish
-Stream Ciphers: ARC4
-Public Key Crypto: RSA, DSA, Diffie-Hellman
-Password based key derivation: PBKDF2 from PKCS #5
-Pseudo Random Number Generators
-Large Integer Support
-Base 16/64 encoding/decoding
-DER encoding/decoding
-X.509 processing
-SSE2 and ia32 asm for the right processors and compilers
-
-
-To build on Unix
-
-    ./configure
-    make
-
-    To test the build, from the ./test directory run ./test
-
-
-On Windows
-
-    Open the taocrypt project workspace
-    Choose (Re)Build All
-
-    To test the build, run the test executable
-
-
-Please send any questions or comments to todd@yassl.com.
-
diff --git a/extra/yassl/taocrypt/benchmark/benchmark.cpp b/extra/yassl/taocrypt/benchmark/benchmark.cpp
deleted file mode 100644
index 1051b2a4a202..000000000000
--- a/extra/yassl/taocrypt/benchmark/benchmark.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-// benchmark.cpp
-// TaoCrypt benchmark
-
-#include <string.h>
-#include <stdio.h>
-
-#include "runtime.hpp"
-#include "des.hpp"
-#include "aes.hpp"
-#include "twofish.hpp"
-#include "blowfish.hpp"
-#include "arc4.hpp"
-#include "md5.hpp"
-#include "sha.hpp"
-#include "ripemd.hpp"
-#include "rsa.hpp"
-#include "dh.hpp"
-#include "dsa.hpp"
-
-
-using namespace TaoCrypt;
-
-void bench_aes(bool show);
-void bench_des();
-void bench_blowfish();
-void bench_twofish();
-void bench_arc4();
-
-void bench_md5();
-void bench_sha();
-void bench_ripemd();
-
-void bench_rsa();
-void bench_dh();
-void bench_dsa();
-
-double current_time();
-
-
-
-
-int main(int argc, char** argv)
-{
-    bench_aes(false);
-    bench_aes(true);
-    bench_blowfish();
-    bench_twofish();
-    bench_arc4();
-    bench_des();
-    
-    printf("\n");
-
-    bench_md5();
-    bench_sha();
-    bench_ripemd();
-
-    printf("\n");
-    
-    bench_rsa();
-    bench_dh();
-    bench_dsa();
-
-    return 0;
-}
-
-const int megs = 5;  // how much to test
-
-const byte key[] = 
-{
-    0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
-    0xfe,0xde,0xba,0x98,0x76,0x54,0x32,0x10,
-    0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67
-};
-
-const byte iv[] = 
-{
-    0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef,
-    0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-    0x11,0x21,0x31,0x41,0x51,0x61,0x71,0x81
-    
-};
-
-
-byte plain [1024*1024];
-byte cipher[1024*1024];
-
-
-void bench_des()
-{
-    DES_EDE3_CBC_Encryption enc;
-    enc.SetKey(key, 16, iv);
-
-    double start = current_time();
-
-    for(int i = 0; i < megs; i++)
-        enc.Process(plain, cipher, sizeof(plain));
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("3DES     %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-
-void bench_aes(bool show)
-{
-    AES_CBC_Encryption enc;
-    enc.SetKey(key, 16, iv);
-
-    double start = current_time();
- 
-    for(int i = 0; i < megs; i++)
-        enc.Process(plain, cipher, sizeof(plain));
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    if (show)
-        printf("AES      %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                                 persec);
-}
-
-
-void bench_twofish()
-{
-    Twofish_CBC_Encryption enc;
-    enc.SetKey(key, 16, iv);
-
-    double start = current_time();
-
-    for(int i = 0; i < megs; i++)
-        enc.Process(plain, cipher, sizeof(plain));
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("Twofish  %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                            persec);
-
-}
-
-
-void bench_blowfish()
-{
-    Blowfish_CBC_Encryption enc;
-    enc.SetKey(key, 16, iv);
-
-    double start = current_time();
-
-    for(int i = 0; i < megs; i++)
-        enc.Process(plain, cipher, sizeof(plain));
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("Blowfish %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-
-void bench_arc4()
-{
-    ARC4 enc;
-    enc.SetKey(key, 16);
-
-    double start = current_time();
-
-    for(int i = 0; i < megs; i++)
-        enc.Process(cipher, plain, sizeof(plain));
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("ARC4     %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-
-void bench_md5()
-{
-    MD5 hash;
-    byte digest[MD5::DIGEST_SIZE];
-
-    double start = current_time();
-
-    
-    for(int i = 0; i < megs; i++)
-        hash.Update(plain, sizeof(plain));
-   
-    hash.Final(digest);
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("MD5      %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-
-void bench_sha()
-{
-    SHA hash;
-    byte digest[SHA::DIGEST_SIZE];
-
-    double start = current_time();
-
-    
-    for(int i = 0; i < megs; i++)
-        hash.Update(plain, sizeof(plain));
-   
-    hash.Final(digest);
-
-    /*
-    for(int i = 0; i < megs; i++)
-        hash.AsmTransform(plain, 16384);
-    */
-
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("SHA      %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-
-void bench_ripemd()
-{
-    RIPEMD160 hash;
-    byte digest[RIPEMD160::DIGEST_SIZE];
-
-    double start = current_time();
-
-    
-    for(int i = 0; i < megs; i++)
-        hash.Update(plain, sizeof(plain));
-   
-    hash.Final(digest);
-
-    double total = current_time() - start;
-
-    double persec = 1 / total * megs;
-
-    printf("RIPEMD   %d megs took %5.3f seconds, %6.2f MB/s\n", megs, total,
-                                                             persec);
-}
-
-RandomNumberGenerator rng;
-
-void bench_rsa()
-{
-    const int times = 100;
-
-    Source source;
-    FileSource("./rsa1024.der", source);
-
-    if (source.size() == 0) {
-        printf("can't find ./rsa1024.der\n");
-        return;
-    }
-    RSA_PrivateKey priv(source);
-    RSAES_Encryptor enc(priv);
-
-    byte      message[] = "Everyone gets Friday off.";
-    byte      cipher[128];  // for 1024 bit
-    byte      plain[128];   // for 1024 bit
-    const int len = (word32)strlen((char*)message);
-    
-    int i;    
-    double start = current_time();
-
-    for (i = 0; i < times; i++)
-        enc.Encrypt(message, len, cipher, rng);
-
-    double total = current_time() - start;
-    double each  = total / times;   // per second
-    double milliEach = each * 1000; // milliseconds
-
-    printf("RSA 1024 encryption took %6.2f milliseconds, avg over %d" 
-           " iterations\n", milliEach, times);
-
-    RSAES_Decryptor dec(priv);
-
-    start = current_time();
-
-    for (i = 0; i < times; i++)
-        dec.Decrypt(cipher, 128, plain, rng);
-
-    total = current_time() - start;
-    each  = total / times;   // per second
-    milliEach = each * 1000; // milliseconds
-
-    printf("RSA 1024 decryption took %6.2f milliseconds, avg over %d" 
-           " iterations\n", milliEach, times);
-}
-
-
-void bench_dh()
-{
-    const int times = 100;
-
-    Source source;
-    FileSource("./dh1024.der", source);
-
-    if (source.size() == 0) {
-        printf("can't find ./dh1024.der\n");
-        return;
-    }
-    DH dh(source);
-
-    byte      pub[128];    // for 1024 bit
-    byte      priv[128];   // for 1024 bit
-    
-    int i;    
-    double start = current_time();
-
-    for (i = 0; i < times; i++)
-        dh.GenerateKeyPair(rng, priv, pub);
-
-    double total = current_time() - start;
-    double each  = total / times;   // per second
-    double milliEach = each * 1000; // milliseconds
-
-    printf("DH  1024 key generation  %6.2f milliseconds, avg over %d" 
-           " iterations\n", milliEach, times);
-
-    DH dh2(dh); 
-    byte      pub2[128];    // for 1024 bit
-    byte      priv2[128];   // for 1024 bit
-    dh2.GenerateKeyPair(rng, priv2, pub2);
-    unsigned char key[256];
-
-    start = current_time();
-
-    for (i = 0; i < times; i++)
-        dh.Agree(key, priv, pub2);
-
-    total = current_time() - start;
-    each  = total / times;      // per second
-    milliEach = each * 1000;   //  in milliseconds
-
-    printf("DH  1024 key agreement   %6.2f milliseconds, avg over %d"
-           " iterations\n", milliEach, times);
-}
-
-void bench_dsa()
-{
-    const int times = 100;
-
-    Source source;
-    FileSource("./dsa1024.der", source);
-
-    if (source.size() == 0) {
-        printf("can't find ./dsa1024.der\n");
-        return;
-    }
-
-    DSA_PrivateKey key(source);
-    DSA_Signer signer(key);
-
-    SHA sha;
-    byte digest[SHA::DIGEST_SIZE];
-    byte signature[40];
-    const char msg[] = "this is the message";
-    sha.Update((byte*)msg, sizeof(msg));
-    sha.Final(digest);
-    
-    int i;    
-    double start = current_time();
-
-    for (i = 0; i < times; i++)
-        signer.Sign(digest, signature, rng); 
-
-    double total = current_time() - start;
-    double each  = total / times;   // per second
-    double milliEach = each * 1000; // milliseconds
-
-    printf("DSA 1024 sign   took     %6.2f milliseconds, avg over %d" 
-           " iterations\n", milliEach, times);
-
-    DSA_Verifier verifier(key);
-
-    start = current_time();
-
-    for (i = 0; i < times; i++)
-        verifier.Verify(digest, signature); 
-
-    total = current_time() - start;
-    each  = total / times;      // per second
-    milliEach = each * 1000;   //  in milliseconds
-
-    printf("DSA 1024 verify took     %6.2f milliseconds, avg over %d"
-           " iterations\n", milliEach, times);
-}
-
-
-
-#ifdef _WIN32
-
-    #define WIN32_LEAN_AND_MEAN
-    #include <windows.h>
-
-    double current_time()
-    {
-        static bool          init(false);
-        static LARGE_INTEGER freq;
-    
-        if (!init) {
-            QueryPerformanceFrequency(&freq);
-            init = true;
-        }
-
-        LARGE_INTEGER count;
-        QueryPerformanceCounter(&count);
-
-        return static_cast<double>(count.QuadPart) / freq.QuadPart;
-    }
-
-#else
-
-    #include <sys/time.h>
-
-    double current_time()
-    {
-        struct timeval tv;
-        gettimeofday(&tv, 0);
-
-        return static_cast<double>(tv.tv_sec) 
-             + static_cast<double>(tv.tv_usec) / 1000000;
-    }
-
-#endif // _WIN32
diff --git a/extra/yassl/taocrypt/benchmark/benchmark.dsp b/extra/yassl/taocrypt/benchmark/benchmark.dsp
deleted file mode 100644
index 449299a1c8db..000000000000
--- a/extra/yassl/taocrypt/benchmark/benchmark.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="benchmark" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=benchmark - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "benchmark.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "benchmark.mak" CFG="benchmark - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "benchmark - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "benchmark - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "benchmark - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "benchmark___Win32_Release"
-# PROP BASE Intermediate_Dir "benchmark___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\mySTL" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "benchmark - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "benchmark___Win32_Debug"
-# PROP BASE Intermediate_Dir "benchmark___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\mySTL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "benchmark - Win32 Release"
-# Name "benchmark - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\benchmark.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/taocrypt/benchmark/dh1024.der b/extra/yassl/taocrypt/benchmark/dh1024.der
deleted file mode 100644
index 1a85d90f3f73..000000000000
Binary files a/extra/yassl/taocrypt/benchmark/dh1024.der and /dev/null differ
diff --git a/extra/yassl/taocrypt/benchmark/dsa1024.der b/extra/yassl/taocrypt/benchmark/dsa1024.der
deleted file mode 100644
index 1fcb37fad6a8..000000000000
Binary files a/extra/yassl/taocrypt/benchmark/dsa1024.der and /dev/null differ
diff --git a/extra/yassl/taocrypt/benchmark/make.bat b/extra/yassl/taocrypt/benchmark/make.bat
deleted file mode 100644
index 7998a113ff1a..000000000000
--- a/extra/yassl/taocrypt/benchmark/make.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-REM quick and dirty build file for testing different MSDEVs
-setlocal 
-
-set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2
-
-cl %myFLAGS% benchmark.cpp
-
-link.exe  /out:benchmark.exe ../src/taocrypt.lib benchmark.obj advapi32.lib
-
diff --git a/extra/yassl/taocrypt/benchmark/rsa1024.der b/extra/yassl/taocrypt/benchmark/rsa1024.der
deleted file mode 100644
index 8fc918144723..000000000000
Binary files a/extra/yassl/taocrypt/benchmark/rsa1024.der and /dev/null differ
diff --git a/extra/yassl/taocrypt/certs/dh1024.dat b/extra/yassl/taocrypt/certs/dh1024.dat
deleted file mode 100644
index 86a955182783..000000000000
--- a/extra/yassl/taocrypt/certs/dh1024.dat
+++ /dev/null
@@ -1 +0,0 @@
-30818702818100DA9A18547FF03B385CC16508C173A7EF4EB61CB40EF8FEF3B31F145051676166BCDC3FE6B799FC394D08C26385F9413F896E09117E46209D6923602683CEA100924A6EE695281775C619DAA94EA8CB3691B4275B0183F1D39639EBC92995FE645D6C1BC28D409E585549BBD2C5DCDD6C208B04EADD8B7A6D997F72CBAD88390F020102
\ No newline at end of file
diff --git a/extra/yassl/taocrypt/include/aes.hpp b/extra/yassl/taocrypt/include/aes.hpp
deleted file mode 100644
index bccf6e73fc72..000000000000
--- a/extra/yassl/taocrypt/include/aes.hpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* aes.hpp defines AES
-*/
-
-
-#ifndef TAO_CRYPT_AES_HPP
-#define TAO_CRYPT_AES_HPP
-
-#include "misc.hpp"
-#include "modes.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_AES_ASM
-#endif
-
-
-
-namespace TaoCrypt {
-
-
-enum { AES_BLOCK_SIZE = 16 };
-
-
-// AES encryption and decryption, see FIPS-197
-class AES : public Mode_BASE {
-public:
-    enum { BLOCK_SIZE = AES_BLOCK_SIZE };
-
-    AES(CipherDir DIR, Mode MODE)
-        : Mode_BASE(BLOCK_SIZE, DIR, MODE) {}
-
-#ifdef DO_AES_ASM
-    void Process(byte*, const byte*, word32);
-#endif
-    void SetKey(const byte* key, word32 sz, CipherDir fake = ENCRYPTION);
-    void SetIV(const byte* iv) { memcpy(r_, iv, BLOCK_SIZE); }
-private:
-    static const word32 rcon_[];
-
-    word32      rounds_;
-    word32      key_[60];                        // max size
-
-    static const word32 Te[5][256];
-    static const word32 Td[5][256];
-    static const byte   CTd4[256];
-
-    static const word32* Te0;
-    static const word32* Te1;
-    static const word32* Te2;
-    static const word32* Te3;
-    static const word32* Te4;
-
-    static const word32* Td0;
-    static const word32* Td1;
-    static const word32* Td2;
-    static const word32* Td3;
-    static const word32* Td4;
-
-    void encrypt(const byte*, const byte*, byte*) const;
-    void AsmEncrypt(const byte*, byte*, void*) const;
-    void decrypt(const byte*, const byte*, byte*) const;
-    void AsmDecrypt(const byte*, byte*, void*) const;
-
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    word32 PreFetchTe() const;
-    word32 PreFetchTd() const;
-    word32 PreFetchCTd4() const;
-
-    AES(const AES&);            // hide copy
-    AES& operator=(const AES&); // and assign
-};
-
-
-#if defined(__x86_64__) || defined(_M_X64) || \
-           (defined(__ILP32__) && (__ILP32__ >= 1))
-    #define TC_CACHE_LINE_SZ 64
-#else
-    /* default cache line size */
-    #define TC_CACHE_LINE_SZ 32
-#endif
-
-inline word32 AES::PreFetchTe() const
-{
-    word32 x = 0;
-
-    /* 4 tables of 256 entries */
-    for (int i = 0; i < 4; i++) {
-        /* each entry is 4 bytes */
-        for (int j = 0; j < 256; j += TC_CACHE_LINE_SZ/4) {
-            x &= Te[i][j];
-        }
-    }
-
-    return x;
-}
-
-
-inline word32 AES::PreFetchTd() const
-{
-    word32 x = 0;
-
-    /* 4 tables of 256 entries */
-    for (int i = 0; i < 4; i++) {
-        /* each entry is 4 bytes */
-        for (int j = 0; j < 256; j += TC_CACHE_LINE_SZ/4) {
-            x &= Td[i][j];
-        }
-    }
-
-    return x;
-}
-
-
-inline word32 AES::PreFetchCTd4() const
-{
-    word32 x = 0;
-    int i;
-
-    for (i = 0; i < 256; i += TC_CACHE_LINE_SZ) {
-        x &= CTd4[i];
-    }
-
-    return x;
-}
-
-
-typedef BlockCipher<ENCRYPTION, AES, ECB> AES_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, AES, ECB> AES_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, AES, CBC> AES_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, AES, CBC> AES_CBC_Decryption;
-
-
-} // naemspace
-
-#endif // TAO_CRYPT_AES_HPP
diff --git a/extra/yassl/taocrypt/include/algebra.hpp b/extra/yassl/taocrypt/include/algebra.hpp
deleted file mode 100644
index 5ce7038b7fbc..000000000000
--- a/extra/yassl/taocrypt/include/algebra.hpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's algebra.h from CryptoPP */
-
-#ifndef TAO_CRYPT_ALGEBRA_HPP
-#define TAO_CRYPT_ALGEBRA_HPP
-
-#include "integer.hpp"
-
-namespace TaoCrypt {
-
-
-// "const Element&" returned by member functions are references
-// to internal data members. Since each object may have only
-// one such data member for holding results, the following code
-// will produce incorrect results:
-// abcd = group.Add(group.Add(a,b), group.Add(c,d));
-// But this should be fine:
-// abcd = group.Add(a, group.Add(b, group.Add(c,d));
-
-// Abstract Group
-class TAOCRYPT_NO_VTABLE AbstractGroup : public virtual_base
-{
-public:
-    typedef Integer Element;
-
-    virtual ~AbstractGroup() {}
-
-    virtual bool Equal(const Element &a, const Element &b) const =0;
-    virtual const Element& Identity() const =0;
-    virtual const Element& Add(const Element &a, const Element &b) const =0;
-    virtual const Element& Inverse(const Element &a) const =0;
-    virtual bool InversionIsFast() const {return false;}
-
-    virtual const Element& Double(const Element &a) const;
-    virtual const Element& Subtract(const Element &a, const Element &b) const;
-    virtual Element& Accumulate(Element &a, const Element &b) const;
-    virtual Element& Reduce(Element &a, const Element &b) const;
-
-    virtual Element ScalarMultiply(const Element &a, const Integer &e) const;
-    virtual Element CascadeScalarMultiply(const Element &x, const Integer &e1,
-                                    const Element &y, const Integer &e2) const;
-
-    virtual void SimultaneousMultiply(Element *results, const Element &base,
-                  const Integer *exponents, unsigned int exponentsCount) const;
-};
-
-// Abstract Ring
-class TAOCRYPT_NO_VTABLE AbstractRing : public AbstractGroup
-{
-public:
-    typedef Integer Element;
-
-    AbstractRing() : AbstractGroup() {m_mg.m_pRing = this;}
-    AbstractRing(const AbstractRing &source) : AbstractGroup()
-                                                {m_mg.m_pRing = this;}
-    AbstractRing& operator=(const AbstractRing &source) {return *this;}
-
-    virtual bool IsUnit(const Element &a) const =0;
-    virtual const Element& MultiplicativeIdentity() const =0;
-    virtual const Element& Multiply(const Element&, const Element&) const =0;
-    virtual const Element& MultiplicativeInverse(const Element &a) const =0;
-
-    virtual const Element& Square(const Element &a) const;
-    virtual const Element& Divide(const Element &a, const Element &b) const;
-
-    virtual Element Exponentiate(const Element &a, const Integer &e) const;
-    virtual Element CascadeExponentiate(const Element &x, const Integer &e1,
-                                    const Element &y, const Integer &e2) const;
-
-    virtual void SimultaneousExponentiate(Element *results, const Element&,
-                  const Integer *exponents, unsigned int exponentsCount) const;
-
-    virtual const AbstractGroup& MultiplicativeGroup() const
-        {return m_mg;}
-
-private:
-    class MultiplicativeGroupT : public AbstractGroup
-    {
-    public:
-        const AbstractRing& GetRing() const
-            {return *m_pRing;}
-
-        bool Equal(const Element &a, const Element &b) const
-            {return GetRing().Equal(a, b);}
-
-        const Element& Identity() const
-            {return GetRing().MultiplicativeIdentity();}
-
-        const Element& Add(const Element &a, const Element &b) const
-            {return GetRing().Multiply(a, b);}
-
-        Element& Accumulate(Element &a, const Element &b) const
-            {return a = GetRing().Multiply(a, b);}
-
-        const Element& Inverse(const Element &a) const
-            {return GetRing().MultiplicativeInverse(a);}
-
-        const Element& Subtract(const Element &a, const Element &b) const
-            {return GetRing().Divide(a, b);}
-
-        Element& Reduce(Element &a, const Element &b) const
-            {return a = GetRing().Divide(a, b);}
-
-        const Element& Double(const Element &a) const
-            {return GetRing().Square(a);}
-
-        Element ScalarMultiply(const Element &a, const Integer &e) const
-            {return GetRing().Exponentiate(a, e);}
-
-        Element CascadeScalarMultiply(const Element &x, const Integer &e1,
-                                     const Element &y, const Integer &e2) const
-            {return GetRing().CascadeExponentiate(x, e1, y, e2);}
-
-        void SimultaneousMultiply(Element *results, const Element &base,
-                   const Integer *exponents, unsigned int exponentsCount) const
-            {GetRing().SimultaneousExponentiate(results, base, exponents,
-                                                exponentsCount);}
-
-        const AbstractRing* m_pRing;
-    };
-
-    MultiplicativeGroupT m_mg;
-};
-
-
-// Abstract Euclidean Domain
-class TAOCRYPT_NO_VTABLE AbstractEuclideanDomain
-    : public AbstractRing
-{
-public:
-    typedef Integer Element;
-
-    virtual void DivisionAlgorithm(Element &r, Element &q, const Element &a,
-                                   const Element &d) const =0;
-
-    virtual const Element& Mod(const Element &a, const Element &b) const =0;
-    virtual const Element& Gcd(const Element &a, const Element &b) const;
-
-protected:
-    mutable Element result;
-};
-
-
-// EuclideanDomainOf
-class EuclideanDomainOf : public AbstractEuclideanDomain
-{
-public:
-    typedef Integer Element;
-
-    EuclideanDomainOf() {}
-
-    bool Equal(const Element &a, const Element &b) const
-        {return a==b;}
-
-    const Element& Identity() const
-        {return Element::Zero();}
-
-    const Element& Add(const Element &a, const Element &b) const
-        {return result = a+b;}
-
-    Element& Accumulate(Element &a, const Element &b) const
-        {return a+=b;}
-
-    const Element& Inverse(const Element &a) const
-        {return result = -a;}
-
-    const Element& Subtract(const Element &a, const Element &b) const
-        {return result = a-b;}
-
-    Element& Reduce(Element &a, const Element &b) const
-        {return a-=b;}
-
-    const Element& Double(const Element &a) const
-        {return result = a.Doubled();}
-
-    const Element& MultiplicativeIdentity() const
-        {return Element::One();}
-
-    const Element& Multiply(const Element &a, const Element &b) const
-        {return result = a*b;}
-
-    const Element& Square(const Element &a) const
-        {return result = a.Squared();}
-
-    bool IsUnit(const Element &a) const
-        {return a.IsUnit();}
-
-    const Element& MultiplicativeInverse(const Element &a) const
-        {return result = a.MultiplicativeInverse();}
-
-    const Element& Divide(const Element &a, const Element &b) const
-        {return result = a/b;}
-
-    const Element& Mod(const Element &a, const Element &b) const
-        {return result = a%b;}
-
-    void DivisionAlgorithm(Element &r, Element &q, const Element &a,
-                           const Element &d) const
-        {Element::Divide(r, q, a, d);}
-
-private:
-    mutable Element result;
-};
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_ALGEBRA_HPP
diff --git a/extra/yassl/taocrypt/include/arc4.hpp b/extra/yassl/taocrypt/include/arc4.hpp
deleted file mode 100644
index be64ba43972f..000000000000
--- a/extra/yassl/taocrypt/include/arc4.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* arc4.hpp defines ARC4
-*/
-
-
-#ifndef TAO_CRYPT_ARC4_HPP
-#define TAO_CRYPT_ARC4_HPP
-
-#include "misc.hpp"
-
-namespace TaoCrypt {
-
-
-// ARC4 encryption and decryption
-class ARC4 {
-public:
-    enum { STATE_SIZE = 256 };
-
-    typedef ARC4 Encryption;
-    typedef ARC4 Decryption;
-
-    ARC4() {}
-
-    void Process(byte*, const byte*, word32);
-    void SetKey(const byte*, word32);
-private:
-    byte x_;
-    byte y_;
-    byte state_[STATE_SIZE];
-
-    ARC4(const ARC4&);                  // hide copy
-    const ARC4 operator=(const ARC4&);  // and assign
-
-    void AsmProcess(byte*, const byte*, word32);
-};
-
-} // namespace
-
-
-#endif // TAO_CRYPT_ARC4_HPP
-
diff --git a/extra/yassl/taocrypt/include/asn.hpp b/extra/yassl/taocrypt/include/asn.hpp
deleted file mode 100644
index 28c7c8f582ed..000000000000
--- a/extra/yassl/taocrypt/include/asn.hpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* asn.hpp provides ASN1 BER, PublicKey, and x509v3 decoding 
-*/
-
-
-#ifndef TAO_CRYPT_ASN_HPP
-#define TAO_CRYPT_ASN_HPP
-
-
-#include <time.h>
-#include "misc.hpp"
-#include "block.hpp"
-#include "error.hpp"
-#ifdef USE_SYS_STL
-    #include <list>
-#else
-    #include "list.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace TaoCrypt {
-
-// these tags and flags are not complete
-enum ASNTag
-{
-    BOOLEAN             = 0x01,
-    INTEGER             = 0x02,
-    BIT_STRING          = 0x03,
-    OCTET_STRING        = 0x04,
-    TAG_NULL            = 0x05,
-    OBJECT_IDENTIFIER   = 0x06,
-    OBJECT_DESCRIPTOR   = 0x07,
-    EXTERNAL            = 0x08,
-    REAL                = 0x09,
-    ENUMERATED          = 0x0a,
-    UTF8_STRING         = 0x0c,
-    SEQUENCE            = 0x10,
-    SET                 = 0x11,
-    NUMERIC_STRING      = 0x12,
-    PRINTABLE_STRING    = 0x13,
-    T61_STRING          = 0x14,
-    VIDEOTEXT_STRING    = 0x15,
-    IA5_STRING          = 0x16,
-    UTC_TIME            = 0x17,
-    GENERALIZED_TIME    = 0x18,
-    GRAPHIC_STRING      = 0x19,
-    VISIBLE_STRING      = 0x1a,
-    GENERAL_STRING      = 0x1b,
-    LONG_LENGTH         = 0x80
-};
-
-enum ASNIdFlag
-{
-    UNIVERSAL           = 0x00,
-    DATA                = 0x01,
-    HEADER              = 0x02,
-    CONSTRUCTED         = 0x20,
-    APPLICATION         = 0x40,
-    CONTEXT_SPECIFIC    = 0x80,
-    PRIVATE             = 0xc0
-};
-
-
-enum DNTags
-{
-    COMMON_NAME         = 0x03,  // CN
-    SUR_NAME            = 0x04,  // SN
-    COUNTRY_NAME        = 0x06,  // C
-    LOCALITY_NAME       = 0x07,  // L
-    STATE_NAME          = 0x08,  // ST
-    ORG_NAME            = 0x0a,  // O
-    ORGUNIT_NAME        = 0x0b   // OU
-};
-
-
-enum PCKS12_Tags
-{
-    /* DATA                      = 1, */ // from ASN1
-    SIGNED_DATA               = 2,
-    ENVELOPED_DATA            = 3,
-    SIGNED_AND_ENVELOPED_DATA = 4,
-    DIGESTED_DATA             = 5,
-    ENCRYPTED_DATA            = 6
-};
-
-
-enum Constants
-{
-    MIN_DATE_SZ   = 13,
-    MAX_DATE_SZ   = 16,
-    MAX_ALGO_SZ   = 16,
-    MAX_LENGTH_SZ =  5,    
-    MAX_SEQ_SZ    =  5,    // enum(seq|con) + length(4)
-    MAX_ALGO_SIZE =  9,
-    MAX_DIGEST_SZ = 69,    // SHA512 + enum(Bit or Octet) + length(4)
-    DSA_SIG_SZ    = 40,
-    ASN_NAME_MAX  = 512    // max total of all included names
-};
-
-
-class Source;
-class RSA_PublicKey;
-class RSA_PrivateKey;
-class DSA_PublicKey;
-class DSA_PrivateKey;
-class Integer;
-class DH;
-
-
-// General BER decoding
-class BER_Decoder : public virtual_base {
-protected:
-    Source& source_;
-public:
-    explicit BER_Decoder(Source& s) : source_(s) {}
-    virtual ~BER_Decoder() {}
-
-    Integer& GetInteger(Integer&);
-    word32   GetSequence();
-    word32   GetSet();
-    word32   GetVersion();
-    word32   GetExplicitVersion();
-
-    Error GetError();
-private:
-    virtual void ReadHeader() = 0;
-
-    BER_Decoder(const BER_Decoder&);            // hide copy
-    BER_Decoder& operator=(const BER_Decoder&); // and assign
-};
-
-
-// RSA Private Key BER Decoder
-class RSA_Private_Decoder : public BER_Decoder {
-public:
-    explicit RSA_Private_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode(RSA_PrivateKey&);
-private:
-    void ReadHeader();
-};
-
-
-// RSA Public Key BER Decoder
-class RSA_Public_Decoder : public BER_Decoder {
-public:
-    explicit RSA_Public_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode(RSA_PublicKey&);
-private:
-    void ReadHeader();
-    void ReadHeaderOpenSSL();
-};
-
-
-// DSA Private Key BER Decoder
-class DSA_Private_Decoder : public BER_Decoder {
-public:
-    explicit DSA_Private_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode(DSA_PrivateKey&);
-private:
-    void ReadHeader();
-};
-
-
-// DSA Public Key BER Decoder
-class DSA_Public_Decoder : public BER_Decoder {
-public:
-    explicit DSA_Public_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode(DSA_PublicKey&);
-private:
-    void ReadHeader();
-};
-
-
-// DH Key BER Decoder
-class DH_Decoder : public BER_Decoder {
-public:
-    explicit DH_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode(DH&);
-private:
-    void ReadHeader();
-};
-
-
-// PKCS12 BER Decoder
-class PKCS12_Decoder : public BER_Decoder {
-public:
-    explicit PKCS12_Decoder(Source& s) : BER_Decoder(s) {}
-    void Decode();
-private:
-    void ReadHeader();
-};
-
-
-// General PublicKey
-class PublicKey {
-    byte*  key_;
-    word32 sz_;
-public:
-    explicit PublicKey(const byte* k = 0, word32 s = 0);
-    ~PublicKey() { tcArrayDelete(key_); }
-
-    const byte* GetKey() const { return key_; }
-    word32      size()   const { return sz_; }
-
-    void SetKey(const byte*);
-    void SetSize(word32 s);
-
-    void AddToEnd(const byte*, word32);
-private:
-    PublicKey(const PublicKey&);            // hide copy
-    PublicKey& operator=(const PublicKey&); // and assign
-};
-
-
-enum { SHA_SIZE = 20 };
-
-
-// A Signing Authority
-class Signer {
-    PublicKey key_;
-    char      name_[ASN_NAME_MAX];
-    byte      hash_[SHA_SIZE];
-public:
-    Signer(const byte* k, word32 kSz, const char* n, const byte* h);
-    ~Signer();
-
-    const PublicKey& GetPublicKey()  const { return key_; }
-    const char*      GetName()       const { return name_; }
-    const byte*      GetHash()       const { return hash_; }
-
-private:
-    Signer(const Signer&);              // hide copy
-    Signer& operator=(const Signer&);   // and assign
-};
-
-
-typedef STL::list<Signer*> SignerList;
-
-
-enum ContentType { HUH = 651 };
-enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
-                SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
-                SHA256wDSA = 416 };
-enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414, SHA384h = 415,
-                SHA512h = 416 };
-enum KeyType  { DSAk = 515, RSAk = 645 };     // sums of algo OID
-
-
-// an x509v Certificate BER Decoder
-class CertDecoder : public BER_Decoder {
-public:
-    enum DateType { BEFORE, AFTER };   
-    enum NameType { ISSUER, SUBJECT };
-    enum CertType { CA, USER };
-
-    explicit CertDecoder(Source&, bool decode = true, SignerList* sl = 0,
-                         bool noVerify = false, CertType ct = USER);
-    ~CertDecoder();
-
-    const PublicKey& GetPublicKey()  const { return key_; }
-    KeyType          GetKeyType()    const { return KeyType(keyOID_); }
-    const char*      GetIssuer()     const { return issuer_; }
-    const char*      GetCommonName() const { return subject_; }
-    const byte*      GetHash()       const { return subjectHash_; }
-    const char*      GetBeforeDate() const { return beforeDate_; }
-    byte             GetBeforeDateType() const { return beforeDateType_; }
-    const char*      GetAfterDate()  const { return afterDate_; }
-    byte             GetAfterDateType() const { return afterDateType_; }
-    int              GetSubjectCnStart()  const { return subCnPos_; }
-    int              GetIssuerCnStart()   const { return issCnPos_; }
-    int              GetSubjectCnLength() const { return subCnLen_; }
-    int              GetIssuerCnLength()  const { return issCnLen_; }
-    void DecodeToKey();
-private:
-    PublicKey key_;
-    word32    certBegin_;               // offset to start of cert
-    word32    sigIndex_;                // offset to start of signature
-    word32    sigLength_;               // length of signature
-    word32    signatureOID_;            // sum of algorithm object id
-    word32    keyOID_;                  // sum of key algo  object id
-    int       subCnPos_;                // subject common name start, -1 is none
-    int       subCnLen_;                // length of above
-    int       issCnPos_;                // issuer common name start, -1 is none
-    int       issCnLen_;                // length of above
-    byte      subjectHash_[SHA_SIZE];   // hash of all Names
-    byte      issuerHash_[SHA_SIZE];    // hash of all Names
-    byte*     signature_;
-    char      issuer_[ASN_NAME_MAX];    // Names
-    char      subject_[ASN_NAME_MAX];   // Names
-    char      beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
-    byte      beforeDateType_;            // beforeDate time type
-    char      afterDate_[MAX_DATE_SZ+1];  // valid after date, +null term
-    byte      afterDateType_;             // afterDate time type
-    bool      verify_;                    // Default to yes, but could be off
-
-    void   ReadHeader();
-    void   Decode(SignerList*, CertType);
-    void   StoreKey();
-    void   AddDSA();
-    bool   ValidateSelfSignature();
-    bool   ValidateSignature(SignerList*);
-    bool   ConfirmSignature(Source&);
-    void   GetKey();
-    char*  AddTag(char*, const char*, const char*, word32, word32);
-    void   GetName(NameType);
-    void   GetValidity();
-    void   GetDate(DateType);
-    void   GetCompareHash(const byte*, word32, byte*, word32);
-    word32 GetAlgoId();
-    word32 GetSignature();
-    word32 GetDigest();
-};
-
-
-word32 GetLength(Source&);
-
-word32 SetLength(word32, byte*);
-word32 SetSequence(word32, byte*);
-
-word32 EncodeDSA_Signature(const byte* signature, byte* output);
-word32 EncodeDSA_Signature(const Integer& r, const Integer& s, byte* output);
-word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz);
-
-
-// General DER encoding
-class DER_Encoder : public virtual_base {
-public:
-    DER_Encoder() {}
-    virtual ~DER_Encoder() {}
-
-    word32 SetAlgoID(HashType, byte*);
-
-    Error  GetError() const { return error_; }
-private:
-    //virtual void WriteHeader() = 0;
-    Error error_;
-
-    DER_Encoder(const DER_Encoder&);            // hide copy
-    DER_Encoder& operator=(const DER_Encoder&); // and assign
-};
-
-
-
-class Signature_Encoder : public DER_Encoder {
-    const byte* digest_;
-    word32      digestSz_;
-    SigType     digestOID_;
-public:
-    explicit Signature_Encoder(const byte*, word32, HashType, Source&);
-
-private:
-    void   WriteHeader();
-    word32 SetDigest(const byte*, word32, byte*);
-
-    Signature_Encoder(const Signature_Encoder&);            // hide copy
-    Signature_Encoder& operator=(const Signature_Encoder&); // and assign
-};
-
-
-// Get Cert in PEM format from BEGIN to END
-int GetCert(Source&);
-
-// Get Cert in PEM format from pkcs12 file
-int GetPKCS_Cert(const char* password, Source&);
-
-bool ASN1_TIME_extract(const unsigned char* date, unsigned char format,
-                       tm *parsed_time);
-
-} // namespace
-
-
-#endif // TAO_CRYPT_ASN_HPP
diff --git a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp
deleted file mode 100644
index 4f58c82ffcc7..000000000000
--- a/extra/yassl/taocrypt/include/block.hpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* block.hpp provides word and byte blocks with configurable allocators
-*/
-
-
-#ifndef TAO_CRYPT_BLOCK_HPP
-#define TAO_CRYPT_BLOCK_HPP
-
-#include "misc.hpp"
-#include <string.h>         // memcpy
-#include <stddef.h>         // ptrdiff_t
-
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace TaoCrypt {
-
-
-// a Base class for Allocators
-template<class T>
-class AllocatorBase
-{
-public:
-    typedef T         value_type;
-    typedef size_t    size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T*        pointer;
-    typedef const T*  const_pointer;
-    typedef T&        reference;
-    typedef const T&  const_reference;
-
-    pointer       address(reference r) const {return (&r);}
-    const_pointer address(const_reference r) const {return (&r); }
-    void          construct(pointer p, const T& val) {new (p) T(val);}
-    void          destroy(pointer p) {p->~T();}
-    size_type     max_size() const {return ~size_type(0)/sizeof(T);}
-protected:
-};
-
-
-// General purpose realloc
-template<typename T, class A>
-typename A::pointer StdReallocate(A& a, T* p, typename A::size_type oldSize,
-                                  typename A::size_type newSize, bool preserve)
-{
-    if (oldSize == newSize)
-        return p;
-
-    if (preserve) {
-        A b = A();
-        typename A::pointer newPointer = b.allocate(newSize, 0);
-        memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize));
-        a.deallocate(p, oldSize);
-        STL::swap(a, b);
-        return newPointer;
-    }
-    else {
-        a.deallocate(p, oldSize);
-        return a.allocate(newSize, 0);
-    }
-}
-
-
-// Allocator that zeros out memory on deletion
-template <class T>
-class AllocatorWithCleanup : public AllocatorBase<T>
-{
-public:
-    typedef typename AllocatorBase<T>::pointer   pointer;
-    typedef typename AllocatorBase<T>::size_type size_type;
-
-    pointer allocate(size_type n, const void* = 0)
-    {
-        if (n > this->max_size())
-            return 0;
-        if (n == 0)
-            return 0;
-        return NEW_TC T[n];
-    }
-
-    void deallocate(void* p, size_type n)
-    {
-        memset(p, 0, n * sizeof(T));
-        tcArrayDelete((T*)p);
-    }
-
-    pointer reallocate(T* p, size_type oldSize, size_type newSize,
-                       bool preserve)
-    {
-        return StdReallocate(*this, p, oldSize, newSize, preserve);
-    }
-
-    // VS.NET STL enforces the policy of "All STL-compliant allocators have to
-    // provide a template class member called rebind".
-    template <class U> struct rebind { typedef AllocatorWithCleanup<U> other;};
-};
-
-
-// Block class template
-template<typename T, class A = AllocatorWithCleanup<T> >
-class Block {
-public:
-    explicit Block(word32 s = 0) : sz_(s), buffer_(allocator_.allocate(sz_)) 
-                    { CleanNew(sz_); }
-
-    Block(const T* buff, word32 s) : sz_(s), buffer_(allocator_.allocate(sz_))
-        { memcpy(buffer_, buff, sz_ * sizeof(T)); }
-
-    Block(const Block& that) : sz_(that.sz_), buffer_(allocator_.allocate(sz_))
-        { memcpy(buffer_, that.buffer_, sz_ * sizeof(T)); }
-
-    Block& operator=(const Block& that) {
-        Block tmp(that);
-        Swap(tmp);
-        return *this;
-    }
-
-    T& operator[] (word32 i) { return buffer_[i]; }
-    const T& operator[] (word32 i) const { return buffer_[i]; }
-
-    T* operator+ (word32 i) { return buffer_ + i; }
-    const T* operator+ (word32 i) const { return buffer_ + i; }
-
-    word32 size() const { return sz_; }
-
-    T* get_buffer() const { return buffer_; }
-    T* begin()      const { return get_buffer(); }
-
-    void CleanGrow(word32 newSize)
-    {
-        if (newSize > sz_) {
-            buffer_ = allocator_.reallocate(buffer_, sz_, newSize, true);
-            memset(buffer_ + sz_, 0, (newSize - sz_) * sizeof(T));
-            sz_ = newSize;
-        }
-    }
-
-    void CleanNew(word32 newSize)
-    {
-        New(newSize);
-        memset(buffer_, 0, sz_ * sizeof(T));
-    }
-
-    void New(word32 newSize)
-    {
-        buffer_ = allocator_.reallocate(buffer_, sz_, newSize, false);
-        sz_ = newSize;
-    }
-
-    void resize(word32 newSize)
-    {
-        buffer_ = allocator_.reallocate(buffer_, sz_, newSize, true);
-        sz_ = newSize;
-    }
-
-    void Swap(Block& other) {
-        STL::swap(sz_, other.sz_);
-        STL::swap(buffer_, other.buffer_);
-        STL::swap(allocator_, other.allocator_);
-    }
-
-    ~Block() { allocator_.deallocate(buffer_, sz_); }
-private:
-    A      allocator_;
-    word32 sz_;     // size in Ts
-    T*     buffer_;
-};
-
-
-typedef Block<byte>   ByteBlock;
-typedef Block<word>   WordBlock;
-typedef Block<word32> Word32Block;
-
-
-} // namespace
-
-#endif // TAO_CRYPT_BLOCK_HPP
diff --git a/extra/yassl/taocrypt/include/blowfish.hpp b/extra/yassl/taocrypt/include/blowfish.hpp
deleted file mode 100644
index 1f8d05892348..000000000000
--- a/extra/yassl/taocrypt/include/blowfish.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* blowfish.hpp defines Blowfish
-*/
-
-
-#ifndef TAO_CRYPT_BLOWFISH_HPP
-#define TAO_CRYPT_BLOWFISH_HPP
-
-#include "misc.hpp"
-#include "modes.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_BLOWFISH_ASM
-#endif
-
-
-namespace TaoCrypt {
-
-enum { BLOWFISH_BLOCK_SIZE = 8 };
-
-
-// Blowfish encryption and decryption, see 
-class Blowfish : public Mode_BASE {
-public:
-    enum { BLOCK_SIZE = BLOWFISH_BLOCK_SIZE, ROUNDS = 16 };
-
-    Blowfish(CipherDir DIR, Mode MODE)
-        : Mode_BASE(BLOCK_SIZE, DIR, MODE), sbox_(pbox_ + ROUNDS + 2) {}
-
-#ifdef DO_BLOWFISH_ASM
-    void Process(byte*, const byte*, word32);
-#endif
-    void SetKey(const byte* key, word32 sz, CipherDir fake = ENCRYPTION);
-    void SetIV(const byte* iv) { memcpy(r_, iv, BLOCK_SIZE); }
-private:
-    static const word32 p_init_[ROUNDS + 2];
-    static const word32 s_init_[4 * 256];
-
-    word32 pbox_[ROUNDS + 2 + 4 * 256];
-    word32* sbox_;
-
-    void crypt_block(const word32 in[2], word32 out[2]) const;
-    void AsmProcess(const byte* in, byte* out) const;
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    Blowfish(const Blowfish&);            // hide copy
-    Blowfish& operator=(const Blowfish&); // and assign
-};
-
-
-typedef BlockCipher<ENCRYPTION, Blowfish, ECB> Blowfish_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, Blowfish, ECB> Blowfish_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, Blowfish, CBC> Blowfish_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, Blowfish, CBC> Blowfish_CBC_Decryption;
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_BLOWFISH_HPP
-
diff --git a/extra/yassl/taocrypt/include/coding.hpp b/extra/yassl/taocrypt/include/coding.hpp
deleted file mode 100644
index 61ac99357b3d..000000000000
--- a/extra/yassl/taocrypt/include/coding.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* coding.hpp defines hex and base64 encoding/decoing
-*/
-
-#ifndef TAO_CRYPT_CODING_HPP
-#define TAO_CRYPT_CODING_HPP
-
-#include "misc.hpp"
-#include "block.hpp"
-
-namespace TaoCrypt {
-
-class Source;
-
-
-// Hex Encoding, see RFC 3548
-class HexEncoder {
-    ByteBlock encoded_;
-    Source&     plain_;
-public:
-    explicit HexEncoder(Source& s) : plain_(s) { Encode(); }
-private:
-    void Encode();
-
-    HexEncoder(const HexEncoder&);              // hide copy
-    HexEncoder& operator=(const HexEncoder&);   // and assign
-};
-
-
-// Hex Decoding, see RFC 3548
-class HexDecoder {
-    ByteBlock decoded_;
-    Source&     coded_;
-public:
-    explicit HexDecoder(Source& s) : coded_(s) { Decode(); }
-private:
-    void Decode();
-
-    HexDecoder(const HexDecoder&);              // hide copy
-    HexDecoder& operator=(const HexDecoder&);   // and assign
-};
-
-
-// Base 64 encoding, see RFC 3548
-class Base64Encoder {
-    ByteBlock encoded_;
-    Source&     plain_;
-public:
-    explicit Base64Encoder(Source& s) : plain_(s) { Encode(); }
-private:
-    void Encode();
-
-    Base64Encoder(const Base64Encoder&);              // hide copy
-    Base64Encoder& operator=(const Base64Encoder&);   // and assign
-};
-
-
-// Base 64 decoding, see RFC 3548
-class Base64Decoder {
-    ByteBlock decoded_;
-    Source&     coded_;
-public:
-    explicit Base64Decoder(Source& s) : coded_(s) { Decode(); }
-private:
-    void Decode();
-
-    Base64Decoder(const Base64Decoder&);              // hide copy
-    Base64Decoder& operator=(const Base64Decoder&);   // and assign
-};
-
-
-}  // namespace
-
-#endif // TAO_CRYPT_CODING_HPP
diff --git a/extra/yassl/taocrypt/include/des.hpp b/extra/yassl/taocrypt/include/des.hpp
deleted file mode 100644
index d88e9ef2f467..000000000000
--- a/extra/yassl/taocrypt/include/des.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* des.hpp defines DES, DES_EDE2, and DES_EDE3
-   see FIPS 46-2 and FIPS 81
-*/
-
-
-#ifndef TAO_CRYPT_DES_HPP
-#define TAO_CRYPT_DES_HPP
-
-#include "misc.hpp"
-#include "modes.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_DES_ASM
-#endif
-
-
-namespace TaoCrypt {
-
-
-enum { DES_BLOCK_SIZE = 8, DES_KEY_SIZE = 32 };
-
-
-class BasicDES {
-public:
-    void SetKey(const byte*, word32, CipherDir dir);
-    void RawProcessBlock(word32&, word32&) const;
-protected:
-    word32 k_[DES_KEY_SIZE];
-};
-
-
-// DES 
-class DES : public Mode_BASE, public BasicDES {
-public:
-    DES(CipherDir DIR, Mode MODE) 
-        : Mode_BASE(DES_BLOCK_SIZE, DIR, MODE) {}
-
-private:
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    DES(const DES&);              // hide copy
-    DES& operator=(const DES&);   // and assign
-};
-
-
-// DES_EDE2
-class DES_EDE2 : public Mode_BASE {
-public:
-    DES_EDE2(CipherDir DIR, Mode MODE) 
-        : Mode_BASE(DES_BLOCK_SIZE, DIR, MODE) {}
-
-    void SetKey(const byte*, word32, CipherDir dir);
-private:
-    BasicDES  des1_;
-    BasicDES  des2_;
-
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    DES_EDE2(const DES_EDE2&);              // hide copy
-    DES_EDE2& operator=(const DES_EDE2&);   // and assign
-};
-
-
-
-// DES_EDE3
-class DES_EDE3 : public Mode_BASE {
-public:
-    DES_EDE3(CipherDir DIR, Mode MODE)
-        : Mode_BASE(DES_BLOCK_SIZE, DIR, MODE) {}
-
-    void SetKey(const byte*, word32, CipherDir dir);
-    void SetIV(const byte* iv) { memcpy(r_, iv, DES_BLOCK_SIZE); }
-#ifdef DO_DES_ASM
-    void Process(byte*, const byte*, word32);
-#endif
-private:
-    BasicDES  des1_;
-    BasicDES  des2_;
-    BasicDES  des3_;
-
-    void AsmProcess(const byte* in, byte* out, void* box) const;
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    DES_EDE3(const DES_EDE3&);              // hide copy
-    DES_EDE3& operator=(const DES_EDE3&);   // and assign
-};
-
-
-typedef BlockCipher<ENCRYPTION, DES, ECB> DES_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, DES, ECB> DES_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, DES, CBC> DES_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, DES, CBC> DES_CBC_Decryption;
-
-typedef BlockCipher<ENCRYPTION, DES_EDE2, ECB> DES_EDE2_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, DES_EDE2, ECB> DES_EDE2_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, DES_EDE2, CBC> DES_EDE2_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, DES_EDE2, CBC> DES_EDE2_CBC_Decryption;
-
-typedef BlockCipher<ENCRYPTION, DES_EDE3, ECB> DES_EDE3_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, DES_EDE3, ECB> DES_EDE3_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, DES_EDE3, CBC> DES_EDE3_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, DES_EDE3, CBC> DES_EDE3_CBC_Decryption;
-
-
-} // namespace
-
-
-#endif // TAO_CRYPT_DES_HPP
diff --git a/extra/yassl/taocrypt/include/dh.hpp b/extra/yassl/taocrypt/include/dh.hpp
deleted file mode 100644
index bdb90ddaeb12..000000000000
--- a/extra/yassl/taocrypt/include/dh.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* dh.hpp provides Diffie-Hellman support
-*/
-
-
-#ifndef TAO_CRYPT_DH_HPP
-#define TAO_CRYPT_DH_HPP
-
-#include "misc.hpp"
-#include "integer.hpp"
-
-namespace TaoCrypt {
-
-
-class Source;
-
-
-// Diffie-Hellman
-class DH {
-public:
-    DH() {}
-    DH(Integer& p, Integer& g) : p_(p), g_(g) {}
-    explicit DH(Source&);
-
-    DH(const DH& that) : p_(that.p_), g_(that.g_) {}
-    DH& operator=(const DH& that) 
-    {
-        DH tmp(that);
-        Swap(tmp);
-        return *this;
-    }
-
-    void Swap(DH& other)
-    {
-        p_.Swap(other.p_);
-        g_.Swap(other.g_);
-    }
-
-    void Initialize(Source&);
-    void Initialize(Integer& p, Integer& g)
-    {
-        SetP(p);
-        SetG(g);
-    }
-
-    void GenerateKeyPair(RandomNumberGenerator&, byte*, byte*);
-    void Agree(byte*, const byte*, const byte*, word32 otherSz = 0);
-
-    void SetP(const Integer& p) { p_ = p; }
-    void SetG(const Integer& g) { g_ = g; }
-
-    Integer& GetP() { return p_; }
-    Integer& GetG() { return g_; }
-
-    // for p and agree
-    word32 GetByteLength() const { return p_.ByteCount(); }
-private:
-    // group parms
-    Integer p_;
-    Integer g_;
-
-    void GeneratePrivate(RandomNumberGenerator&, byte*);
-    void GeneratePublic(const byte*, byte*);    
-};
-
-
-} // namespace
-
-#endif // TAO_CRYPT_DH_HPP
diff --git a/extra/yassl/taocrypt/include/dsa.hpp b/extra/yassl/taocrypt/include/dsa.hpp
deleted file mode 100644
index d7f81c2747b1..000000000000
--- a/extra/yassl/taocrypt/include/dsa.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* dsa.hpp provides Digitial Signautre Algorithm see FIPS 186-2
-*/
-
-#ifndef TAO_CRYPT_DSA_HPP
-#define TAO_CRYPT_DSA_HPP
-
-#include "integer.hpp"
-
-
-namespace TaoCrypt {
-
-class Source;
-
-
-class DSA_PublicKey {
-protected:
-    Integer p_;
-    Integer q_;
-    Integer g_;
-    Integer y_;
-public:
-    DSA_PublicKey() {}
-    explicit DSA_PublicKey(Source&);
-
-    void Initialize(Source&);
-    void Initialize(const Integer& p, const Integer& q, const Integer& g,
-                    const Integer& y);
-    
-    const Integer& GetModulus() const;
-    const Integer& GetSubGroupOrder() const;
-    const Integer& GetSubGroupGenerator() const;
-    const Integer& GetPublicPart() const;
-
-    void SetModulus(const Integer&);
-    void SetSubGroupOrder(const Integer&);
-    void SetSubGroupGenerator(const Integer&);
-    void SetPublicPart(const Integer&);
-
-    word32 SignatureLength() const;
- 
-    DSA_PublicKey(const DSA_PublicKey&);
-    DSA_PublicKey& operator=(const DSA_PublicKey&);
-
-    void Swap(DSA_PublicKey& other);
-};
-
-
-
-class DSA_PrivateKey : public DSA_PublicKey {
-    Integer x_;
-public:
-    DSA_PrivateKey() {}
-    explicit DSA_PrivateKey(Source&);
-
-    void Initialize(Source&);
-    void Initialize(const Integer& p, const Integer& q, const Integer& g,
-                    const Integer& y, const Integer& x);
-    
-    const Integer& GetPrivatePart() const;
-
-    void SetPrivatePart(const Integer&);
-private:
-    DSA_PrivateKey(const DSA_PrivateKey&);            // hide copy
-    DSA_PrivateKey& operator=(const DSA_PrivateKey&); // and assign
-};
-
-
-
-class DSA_Signer {
-    const DSA_PrivateKey& key_;
-    Integer               r_;
-    Integer               s_;
-public:
-    explicit DSA_Signer(const DSA_PrivateKey&);
-
-    word32 Sign(const byte* sha_digest, byte* sig, RandomNumberGenerator&);
-
-    const Integer& GetR() const;
-    const Integer& GetS() const;
-private:
-    DSA_Signer(const DSA_Signer&);      // hide copy
-    DSA_Signer& operator=(DSA_Signer&); // and assign
-};
-
-
-class DSA_Verifier {
-    const DSA_PublicKey& key_;
-    Integer              r_;
-    Integer              s_;
-public:
-    explicit DSA_Verifier(const DSA_PublicKey&);
-
-    bool Verify(const byte* sha_digest, const byte* sig);
-
-    const Integer& GetR() const;
-    const Integer& GetS() const;
-private:
-    DSA_Verifier(const DSA_Verifier&);              // hide copy
-    DSA_Verifier& operator=(const DSA_Verifier&);   // and assign
-};
-
-
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_DSA_HPP
diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp
deleted file mode 100644
index cb2130d4843d..000000000000
--- a/extra/yassl/taocrypt/include/error.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* error.hpp provides a taocrypt error numbers
- *
- */
-
-
-#ifndef TAO_CRYPT_ERROR_HPP
-#define TAO_CRYPT_ERROR_HPP
-
-
-namespace TaoCrypt {
-
-
-enum ErrorNumber {
-
-NO_ERROR_E   =    0, // "not in error state"
-
-// RandomNumberGenerator
-WINCRYPT_E      = 1001, // "bad wincrypt acquire"
-CRYPTGEN_E      = 1002, // "CryptGenRandom error"
-OPEN_RAN_E      = 1003, // "open /dev/urandom error"
-READ_RAN_E      = 1004, // "read /dev/urandom error"
-
-// Integer
-INTEGER_E       = 1010, // "bad DER Integer Header"
-
-
-// ASN.1
-SEQUENCE_E      = 1020, // "bad Sequence Header"
-SET_E           = 1021, // "bad Set Header"
-VERSION_E       = 1022, // "version length not 1"
-SIG_OID_E       = 1023, // "signature OID mismatch"
-BIT_STR_E       = 1024, // "bad BitString Header"
-UNKNOWN_OID_E   = 1025, // "unknown key OID type"
-OBJECT_ID_E     = 1026, // "bad Ojbect ID Header"
-TAG_NULL_E      = 1027, // "expected TAG NULL"
-EXPECT_0_E      = 1028, // "expected 0"
-OCTET_STR_E     = 1029, // "bad Octet String Header"
-TIME_E          = 1030, // "bad TIME"
-
-DATE_SZ_E       = 1031, // "bad Date Size"
-SIG_LEN_E       = 1032, // "bad Signature Length"
-UNKOWN_SIG_E    = 1033, // "unknown signature OID"
-UNKOWN_HASH_E   = 1034, // "unknown hash OID"
-DSA_SZ_E        = 1035, // "bad DSA r or s size"
-BEFORE_DATE_E   = 1036, // "before date in the future"
-AFTER_DATE_E    = 1037, // "after date in the past"
-SIG_CONFIRM_E   = 1038, // "bad self  signature confirmation"
-SIG_OTHER_E     = 1039, // "bad other signature confirmation"
-
-CONTENT_E       = 1040, // "bad content processing"
-PEM_E           = 1041  // "bad pem format error"
-
-    //  add error string to yassl/src/yassl_error.cpp !!! 
-};
-
-
-struct Error {
-    ErrorNumber  what_;    // description number, 0 for no error
-
-    explicit Error(ErrorNumber w = NO_ERROR_E) : what_(w) {}
-
-    ErrorNumber What()            const  { return what_; }
-    void        SetError(ErrorNumber w)  { what_ = w; }
-};
-
-
-
-} // namespace TaoCrypt
-
-#endif // TAO_CRYPT_ERROR_HPP
diff --git a/extra/yassl/taocrypt/include/file.hpp b/extra/yassl/taocrypt/include/file.hpp
deleted file mode 100644
index 9851a001a2c5..000000000000
--- a/extra/yassl/taocrypt/include/file.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* file.hpp provies File Sources and Sinks
-*/
-
-
-#ifndef TAO_CRYPT_FILE_HPP
-#define TAO_CRYPT_FILE_HPP
-
-#include "misc.hpp"
-#include "block.hpp"
-#include "error.hpp"
-#include <stdio.h>
-
-namespace TaoCrypt {
-
-
-class Source {
-    ByteBlock buffer_;
-    word32    current_;
-    Error     error_;
-public:
-    explicit Source(word32 sz = 0) : buffer_(sz), current_(0) {}
-    Source(const byte* b, word32 sz) : buffer_(b, sz), current_(0) {}
-
-    word32 remaining()         { if (GetError().What()) return 0;
-                                 else return buffer_.size() - current_; } 
-    word32 size() const        { return buffer_.size(); }
-    void   grow(word32 sz)     { buffer_.CleanGrow(sz); }
-
-    bool IsLeft(word32 sz) { if (remaining() >= sz) return true;
-                             else { SetError(CONTENT_E); return false; } }
-   
-    const byte*  get_buffer()  const { return buffer_.get_buffer(); }
-    const byte*  get_current() const { return &buffer_[current_]; }
-    word32       get_index()   const { return current_; }
-    void         set_index(word32 i) { if (i < size()) current_ = i; }
-
-    byte operator[] (word32 i) { current_ = i; return next(); }
-    byte next() { if (IsLeft(1)) return buffer_[current_++]; else return 0; }
-    byte prev() { if (current_)  return buffer_[--current_]; else return 0; }
-
-    void add(const byte* data, word32 len)
-    {
-        if (IsLeft(len)) {
-            memcpy(buffer_.get_buffer() + current_, data, len);
-            current_ += len;
-        }
-    }
-
-    void advance(word32 i) { if (IsLeft(i)) current_ += i; }
-    void reset(ByteBlock&);
-
-    Error  GetError()              { return error_; }
-    void   SetError(ErrorNumber w) { error_.SetError(w); }
-
-    friend class FileSource;  // for get()
-
-    Source(const Source& that)
-        : buffer_(that.buffer_), current_(that.current_) {}
-
-    Source& operator=(const Source& that)
-    {
-        Source tmp(that);
-        Swap(tmp);
-        return *this;
-    }
-
-    void Swap(Source& other) 
-    {
-        buffer_.Swap(other.buffer_);
-        STL::swap(current_, other.current_);
-    }
-
-};
-
-
-// File Source
-class FileSource {
-    FILE* file_;
-public:
-    FileSource(const char* fname, Source& source);
-    ~FileSource();
-   
-    word32   size(bool use_current = false);
-private:
-    word32   get(Source&);
-    word32   size_left();                     
-
-    FileSource(const FileSource&);            // hide
-    FileSource& operator=(const FileSource&); // hide
-};
-
-
-// File Sink
-class FileSink {
-    FILE* file_;
-public:
-    FileSink(const char* fname, Source& source);
-    ~FileSink();
-
-    word32 size(bool use_current = false);
-private:
-    void put(Source&);
-
-    FileSink(const FileSink&);            // hide
-    FileSink& operator=(const FileSink&); // hide
-};
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_FILE_HPP
diff --git a/extra/yassl/taocrypt/include/hash.hpp b/extra/yassl/taocrypt/include/hash.hpp
deleted file mode 100644
index 4d2f7dd35a1b..000000000000
--- a/extra/yassl/taocrypt/include/hash.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* hash.hpp provides a base for digest types
-*/
-
-
-#ifndef TAO_CRYPT_HASH_HPP
-#define TAO_CRYPT_HASH_HPP
-
-#include "misc.hpp"
-
-namespace TaoCrypt {
-
-
-// HASH
-class HASH : public virtual_base {
-public:
-    virtual ~HASH() {}
-
-    virtual void Update(const byte*, word32) = 0;
-    virtual void Final(byte*)                = 0;
-
-    virtual void Init() = 0;
-
-    virtual word32 getBlockSize()  const = 0;
-    virtual word32 getDigestSize() const = 0;
-};
-
-
-// HASH with Transform
-class HASHwithTransform : public HASH {
-public:
-    HASHwithTransform(word32 digSz, word32 buffSz);
-    virtual ~HASHwithTransform() {}
-    virtual ByteOrder getByteOrder()  const = 0;
-    virtual word32    getPadSize()    const = 0;
-
-    virtual void Update(const byte*, word32);
-    virtual void Final(byte*);
-
-    word32  GetBitCountLo() const { return  loLen_ << 3; }
-    word32  GetBitCountHi() const { return (loLen_ >> (8*sizeof(loLen_) - 3)) +
-                                           (hiLen_ << 3); } 
-    enum { MaxDigestSz = 8, MaxBufferSz = 64 };
-protected:
-    typedef word32 HashLengthType;
-    word32          buffLen_;   // in bytes
-    HashLengthType  loLen_;     // length in bytes
-    HashLengthType  hiLen_;     // length in bytes
-    word32          digest_[MaxDigestSz];
-    word32          buffer_[MaxBufferSz / sizeof(word32)];
-
-    virtual void Transform() = 0;
-
-    void AddLength(word32);
-};
-
-
-#ifdef WORD64_AVAILABLE
-
-// 64-bit HASH with Transform
-class HASH64withTransform : public HASH {
-public:
-    HASH64withTransform(word32 digSz, word32 buffSz);
-    virtual ~HASH64withTransform() {}
-    virtual ByteOrder getByteOrder()  const = 0;
-    virtual word32    getPadSize()    const = 0;
-
-    virtual void Update(const byte*, word32);
-    virtual void Final(byte*);
-
-    word32  GetBitCountLo() const { return  loLen_ << 3; }
-    word32  GetBitCountHi() const { return (loLen_ >> (8*sizeof(loLen_) - 3)) +
-                                           (hiLen_ << 3); } 
-    enum { MaxDigestSz = 8, MaxBufferSz = 128 };
-protected:
-    typedef word32 HashLengthType;
-    word32          buffLen_;   // in bytes
-    HashLengthType  loLen_;     // length in bytes
-    HashLengthType  hiLen_;     // length in bytes
-    word64          digest_[MaxDigestSz];
-    word64          buffer_[MaxBufferSz / sizeof(word64)];
-
-    virtual void Transform() = 0;
-
-    void AddLength(word32);
-};
-
-#endif // WORD64_AVAILABLE
-
-
-} // namespace
-
-#endif // TAO_CRYPT_HASH_HPP
diff --git a/extra/yassl/taocrypt/include/hc128.hpp b/extra/yassl/taocrypt/include/hc128.hpp
deleted file mode 100644
index 69e9d638b7b9..000000000000
--- a/extra/yassl/taocrypt/include/hc128.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* hc128.hpp defines HC128
-*/
-
-
-#ifndef TAO_CRYPT_HC128_HPP
-#define TAO_CRYPT_HC128_HPP
-
-#include "misc.hpp"
-
-namespace TaoCrypt {
-
-
-// HC128 encryption and decryption
-class HC128 {
-public:
-
-    typedef HC128 Encryption;
-    typedef HC128 Decryption;
-
-
-    HC128() {}
-
-    void Process(byte*, const byte*, word32);
-    void SetKey(const byte*, const byte*);
-private:
-    word32 T_[1024];             /* P[i] = T[i];  Q[i] = T[1024 + i ]; */
-    word32 X_[16];
-    word32 Y_[16];
-    word32 counter1024_;         /* counter1024 = i mod 1024 at the ith step */
-    word32 key_[8];
-    word32 iv_[8];
-
-    void SetIV(const byte*);
-    void GenerateKeystream(word32*);
-    void SetupUpdate();
-
-    HC128(const HC128&);                  // hide copy
-    const HC128 operator=(const HC128&);  // and assign
-};
-
-} // namespace
-
-
-#endif // TAO_CRYPT_HC128_HPP
-
diff --git a/extra/yassl/taocrypt/include/hmac.hpp b/extra/yassl/taocrypt/include/hmac.hpp
deleted file mode 100644
index 4df081b84c93..000000000000
--- a/extra/yassl/taocrypt/include/hmac.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* hamc.hpp implements HMAC, see RFC 2104
-*/
-
-
-#ifndef TAO_CRYPT_HMAC_HPP
-#define TAO_CRYPT_HMAC_HPP
-
-#include "hash.hpp"
-
-namespace TaoCrypt {
-
-
-// HMAC class template
-template <class T>
-class HMAC {
-public:
-    enum { IPAD = 0x36, OPAD = 0x5C };
-
-    HMAC() : ipad_(reinterpret_cast<byte*>(&ip_)), 
-             opad_(reinterpret_cast<byte*>(&op_)),
-             innerHash_(reinterpret_cast<byte*>(&innerH_)) 
-    { 
-        Init(); 
-    }
-    void Update(const byte*, word32);
-    void Final(byte*);
-    void Init();
-
-    void SetKey(const byte*, word32);
-private:
-    byte* ipad_;
-    byte* opad_;
-    byte* innerHash_;
-    bool  innerHashKeyed_;
-    T     mac_;
-
-    // MSVC 6 HACK, gives compiler error if calculated in array
-    enum { HMAC_BSIZE = T::BLOCK_SIZE  / sizeof(word32),
-           HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };
-
-    word32 ip_[HMAC_BSIZE];          // align ipad_ on word32
-    word32 op_[HMAC_BSIZE];          // align opad_ on word32
-    word32 innerH_[HMAC_DSIZE];      // align innerHash_ on word32
-
-    void KeyInnerHash();
-
-    HMAC(const HMAC&);
-    HMAC& operator= (const HMAC&);
-};
-
-
-// Setup
-template <class T>
-void HMAC<T>::Init()
-{
-    mac_.Init();
-    innerHashKeyed_ = false;
-}
-
-
-// Key generation
-template <class T>
-void HMAC<T>::SetKey(const byte* key, word32 length)
-{
-    Init();
-
-    if (length <= T::BLOCK_SIZE)
-        memcpy(ipad_, key, length);
-    else {
-        mac_.Update(key, length);
-        mac_.Final(ipad_);
-        length = T::DIGEST_SIZE;
-    }
-    memset(ipad_ + length, 0, T::BLOCK_SIZE - length);
-
-    for (word32 i = 0; i < T::BLOCK_SIZE; i++) {
-        opad_[i] = ipad_[i] ^ OPAD;
-        ipad_[i] ^= IPAD;
-    }
-}
-
-
-// Inner Key Hash
-template <class T>
-void HMAC<T>::KeyInnerHash()
-{
-    mac_.Update(ipad_, T::BLOCK_SIZE);
-    innerHashKeyed_ = true;
-}
-
-
-// Update
-template <class T>
-void HMAC<T>::Update(const byte* msg, word32 length)
-{
-    if (!innerHashKeyed_)
-        KeyInnerHash();
-    mac_.Update(msg, length);
-}
-
-
-// Final
-template <class T>
-void HMAC<T>::Final(byte* hash)
-{
-    if (!innerHashKeyed_)
-        KeyInnerHash();
-    mac_.Final(innerHash_);
-
-    mac_.Update(opad_, T::BLOCK_SIZE);
-    mac_.Update(innerHash_, T::DIGEST_SIZE);
-    mac_.Final(hash);
-
-    innerHashKeyed_ = false;
-}
-
-
-} // namespace
-
-#endif // TAO_CRYPT_HMAC_HPP
diff --git a/extra/yassl/taocrypt/include/integer.hpp b/extra/yassl/taocrypt/include/integer.hpp
deleted file mode 100644
index 05fe189fd585..000000000000
--- a/extra/yassl/taocrypt/include/integer.hpp
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's integer.h from CryptoPP */
-
-
-#ifndef TAO_CRYPT_INTEGER_HPP
-#define TAO_CRYPT_INTEGER_HPP
-
-
-#ifdef _MSC_VER
-    // 4250: dominance
-    // 4660: explicitly instantiating a class already implicitly instantiated
-    // 4661: no suitable definition provided for explicit template request
-    // 4786: identifer was truncated in debug information
-    // 4355: 'this' : used in base member initializer list
-#   pragma warning(disable: 4250 4660 4661 4786 4355)
-#endif
-
-
-#include "misc.hpp"
-#include "block.hpp"
-#include "random.hpp"
-#include "file.hpp"
-#include <string.h>
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-    #if defined(__GNUC__) && (__GNUC__ >= 4)
-        // GCC 4 or greater optimizes too much inline on recursive for bigint, 
-        // -O3 just as fast without asm here anyway
-        #undef TAOCRYPT_X86ASM_AVAILABLE
-    #endif
-#endif
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-
-#ifdef _M_IX86
-    #if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || \
-      (defined(__ICL) && (__ICL >= 500))
-        #define SSE2_INTRINSICS_AVAILABLE
-        #define TAOCRYPT_MM_MALLOC_AVAILABLE
-    #elif defined(_MSC_VER)
-        // _mm_free seems to be the only way to tell if the Processor Pack is
-        //installed or not
-        #include <malloc.h>
-        #if defined(_mm_free)
-            #define SSE2_INTRINSICS_AVAILABLE
-            #define TAOCRYPT_MM_MALLOC_AVAILABLE
-        #endif
-    #endif
-#endif
-
-// SSE2 intrinsics work in GCC 3.3 or later
-#if defined(__SSE2__) && (__GNUC__ == 4 || __GNUC_MAJOR__ > 3 ||  \
-                          __GNUC_MINOR__ > 2)
-    #define SSE2_INTRINSICS_AVAILABLE
-#endif
-
-#endif  // X86ASM
-
-
-
-
-namespace TaoCrypt {
-
-#if defined(SSE2_INTRINSICS_AVAILABLE)
-
-    // Allocator handling proper alignment
-    template <class T>
-    class AlignedAllocator : public AllocatorBase<T>
-    {
-    public:
-        typedef typename AllocatorBase<T>::pointer   pointer;
-        typedef typename AllocatorBase<T>::size_type size_type;
-
-        pointer allocate(size_type n, const void* = 0);
-        void deallocate(void* p, size_type n);
-        pointer reallocate(T* p, size_type oldSize, size_type newSize,
-                           bool preserve)
-        {
-            return StdReallocate(*this, p, oldSize, newSize, preserve);
-        }
-
-    #if !(defined(TAOCRYPT_MALLOC_ALIGNMENT_IS_16) || \
-        defined(TAOCRYPT_MEMALIGN_AVAILABLE) || \
-        defined(TAOCRYPT_MM_MALLOC_AVAILABLE))
-    #define TAOCRYPT_NO_ALIGNED_ALLOC
-        AlignedAllocator() : m_pBlock(0) {}
-    protected:
-        void *m_pBlock;
-    #endif
-    };
-
-    typedef Block<word, AlignedAllocator<word> > AlignedWordBlock;
-#else
-    typedef WordBlock AlignedWordBlock;
-#endif
-
-
-
-#ifdef _WIN32
-    #undef max // avoid name clash
-#endif
-// general MAX
-template<typename T> inline
-const T& max(const T& a, const T& b)
-{
-    return a > b ? a : b;
-}
-
-
-// Large Integer class
-class Integer {
-public:
-        enum Sign {POSITIVE = 0, NEGATIVE = 1 };
-        enum Signedness { UNSIGNED, SIGNED };
-        enum RandomNumberType { ANY, PRIME };
-
-        class DivideByZero {};
-
-        Integer();
-        Integer(const Integer& t);
-        Integer(signed long value);
-        Integer(Sign s, word highWord, word lowWord);
-
-        // BER Decode Source
-        explicit Integer(Source&);
-
-        Integer(const byte* encodedInteger, unsigned int byteCount,
-                Signedness s = UNSIGNED);
-
-        ~Integer() {}
-      
-        static const Integer& Zero();
-        static const Integer& One();
-
-        Integer& Ref() { return *this; }
-
-        Integer(RandomNumberGenerator& rng, const Integer& min,
-                const Integer& max);
-
-        static Integer Power2(unsigned int e);
-
-        unsigned int MinEncodedSize(Signedness = UNSIGNED) const;
-        unsigned int Encode(byte* output, unsigned int outputLen,
-                            Signedness = UNSIGNED) const;
-
-        void Decode(const byte* input, unsigned int inputLen,
-                    Signedness = UNSIGNED);
-        void Decode(Source&);
-
-        bool  IsConvertableToLong() const;
-        signed long ConvertToLong() const;
-
-        unsigned int BitCount() const;
-        unsigned int ByteCount() const;
-        unsigned int WordCount() const;
-
-        bool GetBit(unsigned int i) const;
-        byte GetByte(unsigned int i) const;
-        unsigned long GetBits(unsigned int i, unsigned int n) const;
-
-        bool IsZero()      const { return !*this; }
-        bool NotZero()     const { return !IsZero(); }
-        bool IsNegative()  const { return sign_ == NEGATIVE; }
-        bool NotNegative() const { return !IsNegative(); }
-        bool IsPositive()  const { return NotNegative() && NotZero(); }
-        bool NotPositive() const { return !IsPositive(); }
-        bool IsEven()      const { return GetBit(0) == 0; }
-        bool IsOdd()       const { return GetBit(0) == 1; }
-
-        Integer&  operator=(const Integer& t);
-        Integer&  operator+=(const Integer& t);
-        Integer&  operator-=(const Integer& t);
-        Integer&  operator*=(const Integer& t)	{ return *this = Times(t); }
-        Integer&  operator/=(const Integer& t)	
-                        { return *this = DividedBy(t);}
-        Integer&  operator%=(const Integer& t)	{ return *this = Modulo(t); }
-        Integer&  operator/=(word t)  { return *this = DividedBy(t); }
-        Integer&  operator%=(word t)  { return *this = Modulo(t); }
-        Integer&  operator<<=(unsigned int);
-        Integer&  operator>>=(unsigned int);
-
-     
-        void Randomize(RandomNumberGenerator &rng, unsigned int bitcount);
-        void Randomize(RandomNumberGenerator &rng, const Integer &min,
-                       const Integer &max);
-
-        void SetBit(unsigned int n, bool value = 1);
-        void SetByte(unsigned int n, byte value);
-
-        void Negate();		
-        void SetPositive() { sign_ = POSITIVE; }
-        void SetNegative() { if (!!(*this)) sign_ = NEGATIVE; }
-        void Swap(Integer& a);
-
-        bool	    operator!() const;
-        Integer     operator+() const {return *this;}
-        Integer     operator-() const;
-        Integer&    operator++();
-        Integer&    operator--();
-        Integer     operator++(int) 
-            { Integer temp = *this; ++*this; return temp; }
-        Integer     operator--(int) 
-            { Integer temp = *this; --*this; return temp; }
-
-        int Compare(const Integer& a) const;
-
-        Integer Plus(const Integer &b) const;
-        Integer Minus(const Integer &b) const;
-        Integer Times(const Integer &b) const;
-        Integer DividedBy(const Integer &b) const;
-        Integer Modulo(const Integer &b) const;
-        Integer DividedBy(word b) const;
-        word    Modulo(word b) const;
-
-        Integer operator>>(unsigned int n) const { return Integer(*this)>>=n; }
-        Integer operator<<(unsigned int n) const { return Integer(*this)<<=n; }
-
-        Integer AbsoluteValue() const;
-        Integer Doubled() const { return Plus(*this); }
-        Integer Squared() const { return Times(*this); }
-        Integer SquareRoot() const;
-
-        bool    IsSquare() const;
-        bool    IsUnit() const;
-
-        Integer MultiplicativeInverse() const;
-
-        friend Integer a_times_b_mod_c(const Integer& x, const Integer& y,
-                                       const Integer& m);
-        friend Integer a_exp_b_mod_c(const Integer& x, const Integer& e,
-                                     const Integer& m);
-
-        static void Divide(Integer& r, Integer& q, const Integer& a,
-                           const Integer& d);
-        static void Divide(word& r, Integer& q, const Integer& a, word d);
-        static void DivideByPowerOf2(Integer& r, Integer& q, const Integer& a,
-                                     unsigned int n);
-        static Integer Gcd(const Integer& a, const Integer& n);
-
-        Integer InverseMod(const Integer& n) const;
-        word InverseMod(word n) const;
-
-private:
-    friend class ModularArithmetic;
-    friend class MontgomeryRepresentation;
-
-    Integer(word value, unsigned int length);
-    int PositiveCompare(const Integer& t) const;
-
-    friend void PositiveAdd(Integer& sum, const Integer& a, const Integer& b);
-    friend void PositiveSubtract(Integer& diff, const Integer& a,
-                                 const Integer& b);
-    friend void PositiveMultiply(Integer& product, const Integer& a,
-                                 const Integer& b);
-    friend void PositiveDivide(Integer& remainder, Integer& quotient, const
-                               Integer& dividend, const Integer& divisor);
-    AlignedWordBlock reg_;
-    Sign             sign_;
-};
-
-inline bool operator==(const Integer& a, const Integer& b) 
-                        {return a.Compare(b)==0;}
-inline bool operator!=(const Integer& a, const Integer& b) 
-                        {return a.Compare(b)!=0;}
-inline bool operator> (const Integer& a, const Integer& b) 
-                        {return a.Compare(b)> 0;}
-inline bool operator>=(const Integer& a, const Integer& b) 
-                        {return a.Compare(b)>=0;}
-inline bool operator< (const Integer& a, const Integer& b) 
-                        {return a.Compare(b)< 0;}
-inline bool operator<=(const Integer& a, const Integer& b) 
-                        {return a.Compare(b)<=0;}
-
-inline Integer operator+(const Integer &a, const Integer &b) 
-                        {return a.Plus(b);}
-inline Integer operator-(const Integer &a, const Integer &b) 
-                        {return a.Minus(b);}
-inline Integer operator*(const Integer &a, const Integer &b) 
-                        {return a.Times(b);}
-inline Integer operator/(const Integer &a, const Integer &b) 
-                        {return a.DividedBy(b);}
-inline Integer operator%(const Integer &a, const Integer &b) 
-                        {return a.Modulo(b);}
-inline Integer operator/(const Integer &a, word b) {return a.DividedBy(b);}
-inline word    operator%(const Integer &a, word b) {return a.Modulo(b);}
-
-inline void swap(Integer &a, Integer &b)
-{
-    a.Swap(b);
-}
-
-
-Integer CRT(const Integer& xp, const Integer& p, const Integer& xq,
-            const Integer& q,  const Integer& u);
-
-inline Integer ModularExponentiation(const Integer& a, const Integer& e,
-                                     const Integer& m)
-{
-    return a_exp_b_mod_c(a, e, m);
-}
-
-Integer ModularRoot(const Integer& a, const Integer& dp, const Integer& dq,
-                    const Integer& p, const Integer& q,  const Integer& u);
-
-
-
-}   // namespace
-
-#endif // TAO_CRYPT_INTEGER_HPP
diff --git a/extra/yassl/taocrypt/include/kernelc.hpp b/extra/yassl/taocrypt/include/kernelc.hpp
deleted file mode 100644
index 0840b3f2740f..000000000000
--- a/extra/yassl/taocrypt/include/kernelc.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* kernelc.hpp provides support for C std lib when compiled in kernel mode
-*/
-
-#ifndef TAOCRYPT_KERNELC_HPP
-#define TAOCRYPT_KERNELC_HPP
-
-#include <linux/types.h>   // get right size_t
-
-// system functions that c++ doesn't like headers for 
-
-extern "C" void* memcpy(void*, const void*, size_t);
-extern "C" void* memset(void*, int, size_t);
-extern "C" void  printk(char *fmt, ...);
-
-
-#endif // TAOCRYPT_KERNELC_HPP
diff --git a/extra/yassl/taocrypt/include/md2.hpp b/extra/yassl/taocrypt/include/md2.hpp
deleted file mode 100644
index 5c2b1416b52e..000000000000
--- a/extra/yassl/taocrypt/include/md2.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* md2.hpp provides MD2 digest support, see RFC 1319
-*/
-
-#ifndef TAO_CRYPT_MD2_HPP
-#define TAO_CRYPT_MD2_HPP
-
-
-#include "hash.hpp"
-#include "block.hpp"
-
-
-namespace TaoCrypt {
-
-
-// MD2 digest
-class MD2 : public HASH {
-public:
-    enum { BLOCK_SIZE = 16, DIGEST_SIZE = 16, PAD_SIZE = 16, X_SIZE = 48 };
-    MD2();
-
-    word32 getBlockSize()  const { return BLOCK_SIZE; }
-    word32 getDigestSize() const { return DIGEST_SIZE; }
-
-    void Update(const byte*, word32);
-    void Final(byte*);
-
-    void Init();
-    void Swap(MD2&);
-private:
-    ByteBlock X_, C_, buffer_;
-    word32    count_;           // bytes % PAD_SIZE
-
-    MD2(const MD2&);
-    MD2& operator=(const MD2&);
-};
-
-inline void swap(MD2& a, MD2& b)
-{
-    a.Swap(b);
-}
-
-
-} // namespace
-
-#endif // TAO_CRYPT_MD2_HPP
-
diff --git a/extra/yassl/taocrypt/include/md4.hpp b/extra/yassl/taocrypt/include/md4.hpp
deleted file mode 100644
index 424c744eccf3..000000000000
--- a/extra/yassl/taocrypt/include/md4.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* md4.hpp provides MD4 digest support
- * WANRING: MD4 is considered insecure, only use if you have to, e.g., yaSSL
- * libcurl supports needs this for NTLM authentication
-*/
-
-#ifndef TAO_CRYPT_MD4_HPP
-#define TAO_CRYPT_MD4_HPP
-
-#include "hash.hpp"
-
-namespace TaoCrypt {
-
-
-// MD4 digest
-class MD4 : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 16, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = LittleEndianOrder };   // in Bytes
-    MD4() : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE) 
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    MD4(const MD4&);
-    MD4& operator= (const MD4&);
-
-    void Init();
-    void Swap(MD4&);
-private:
-    void Transform();
-};
-
-inline void swap(MD4& a, MD4& b)
-{
-    a.Swap(b);
-}
-
-
-} // namespace
-
-#endif // TAO_CRYPT_MD4_HPP
-
diff --git a/extra/yassl/taocrypt/include/md5.hpp b/extra/yassl/taocrypt/include/md5.hpp
deleted file mode 100644
index fce37bd55164..000000000000
--- a/extra/yassl/taocrypt/include/md5.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* md5.hpp provides MD5 digest support, see RFC 1321
-*/
-
-#ifndef TAO_CRYPT_MD5_HPP
-#define TAO_CRYPT_MD5_HPP
-
-#include "hash.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_MD5_ASM
-#endif
-
-namespace TaoCrypt {
-
-
-// MD5 digest
-class MD5 : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 16, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = LittleEndianOrder };   // in Bytes
-    MD5() : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE) 
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    MD5(const MD5&);
-    MD5& operator= (const MD5&);
-
-#ifdef DO_MD5_ASM
-    void Update(const byte*, word32);
-#endif
-
-    void Init();
-    void Swap(MD5&);
-private:
-    void Transform();
-    void AsmTransform(const byte* data, word32 times);
-};
-
-inline void swap(MD5& a, MD5& b)
-{
-    a.Swap(b);
-}
-
-
-} // namespace
-
-#endif // TAO_CRYPT_MD5_HPP
-
diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp
deleted file mode 100644
index 18f13e783c6e..000000000000
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's misc.h from CryptoPP */
-
-#ifndef TAO_CRYPT_MISC_HPP
-#define TAO_CRYPT_MISC_HPP
-
-
-#if !defined(DO_TAOCRYPT_KERNEL_MODE)
-    #include <stdlib.h>
-    #include <string.h>
-#else
-    #include "kernelc.hpp"
-#endif
-
-#include "types.hpp"
-#include "type_traits.hpp"
-
-
-
-namespace TaoCrypt {
-
-
-// Delete static singleton holders
-void CleanUp();
-
-
-#ifdef YASSL_PURE_C
-
-    // library allocation
-    struct new_t {};      // TaoCrypt New type
-    extern new_t tc;      // pass in parameter
-
-    } // namespace TaoCrypt
-
-    void* operator new  (size_t, TaoCrypt::new_t);
-    void* operator new[](size_t, TaoCrypt::new_t);
-
-    void operator delete  (void*, TaoCrypt::new_t);
-    void operator delete[](void*, TaoCrypt::new_t);
-
-
-    namespace TaoCrypt {
-
-    template<typename T>
-    void tcDelete(T* ptr)
-    {
-        if (ptr) ptr->~T();
-        ::operator delete(ptr, TaoCrypt::tc);
-    }
-
-    template<typename T>
-    void tcArrayDelete(T* ptr)
-    {
-        // can't do array placement destruction since not tracking size in
-        // allocation, only allow builtins to use array placement since they
-        // don't need destructors called
-        typedef char builtin[IsFundamentalType<T>::Yes ? 1 : -1];
-        (void)sizeof(builtin);
-
-        ::operator delete[](ptr, TaoCrypt::tc);
-    }
-
-    #define NEW_TC new (TaoCrypt::tc)
-
-
-    // to resolve compiler generated operator delete on base classes with
-    // virtual destructors (when on stack)
-    class virtual_base {
-    public:
-        static void operator delete(void*) { }
-    };
-
-#else // YASSL_PURE_C
-
-
-    template<typename T>
-    void tcDelete(T* ptr)
-    {
-        delete ptr;
-    }
-
-    template<typename T>
-    void tcArrayDelete(T* ptr)
-    {
-        delete[] ptr;
-    }
-
-    #define NEW_TC new
-
-    class virtual_base {};
-   
- 
-#endif // YASSL_PURE_C
-
-
-#if defined(_MSC_VER) || defined(__BCPLUSPLUS__)
-	#define INTEL_INTRINSICS
-	#define FAST_ROTATE
-#elif defined(__MWERKS__) && TARGET_CPU_PPC
-	#define PPC_INTRINSICS
-	#define FAST_ROTATE
-#elif defined(__GNUC__) && defined(__i386__)
-        // GCC does peephole optimizations which should result in using rotate
-        // instructions
-	#define FAST_ROTATE
-#endif
-
-
-// no gas on these systems ?, disable for now
-#if defined(__sun__)
-    #undef  TAOCRYPT_DISABLE_X86ASM
-    #define TAOCRYPT_DISABLE_X86ASM
-#endif
-
-// icc problem with -03 and integer, disable for now
-#if defined(__INTEL_COMPILER)
-    #undef  TAOCRYPT_DISABLE_X86ASM
-    #define TAOCRYPT_DISABLE_X86ASM
-#endif
-
-// indpedent of build system, unless ia32 asm is enabled disable it
-#if !defined(TAOCRYPT_ENABLE_X86ASM)
-    #undef  TAOCRYPT_DISABLE_X86ASM
-    #define TAOCRYPT_DISABLE_X86ASM
-#endif
-
-// Turn on ia32 ASM for Big Integer
-// CodeWarrior defines _MSC_VER
-#if !defined(TAOCRYPT_DISABLE_X86ASM) && ((defined(_MSC_VER) && \
-   !defined(__MWERKS__) && defined(_M_IX86)) || \
-   (defined(__GNUC__) && defined(__i386__)))
-    #define TAOCRYPT_X86ASM_AVAILABLE
-#endif
-
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-    bool HaveCpuId();
-    bool IsPentium();
-    void CpuId(word32 input, word32 *output);
-
-    extern bool isMMX;
-#endif
-
-
-
-
-// Turn on ia32 ASM for Ciphers and Message Digests
-// Seperate define since these are more complex, use member offsets
-// and user may want to turn off while leaving Big Integer optos on 
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && !defined(DISABLE_TAO_ASM)
-    #define TAO_ASM
-#endif
-
-
-//  Extra word in older vtable implementations, for ASM member offset
-#if defined(__GNUC__) && __GNUC__ < 3
-    #define OLD_GCC_OFFSET
-#endif
-
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#	define TAOCRYPT_MALLOC_ALIGNMENT_IS_16
-#endif
-
-#if defined(__linux__) || defined(__sun__)
-#	define TAOCRYPT_MEMALIGN_AVAILABLE
-#endif
-
-
-#if defined(_WIN32)
-    #define TAOCRYPT_WIN32_AVAILABLE
-#endif
-
-#if defined(__unix__) || defined(__MACH__)
-    #define TAOCRYPT_UNIX_AVAILABLE
-#endif
-
-
-// VC60 workaround: it doesn't allow typename in some places
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    #define CPP_TYPENAME
-#else
-    #define CPP_TYPENAME typename
-#endif
-
-
-#ifdef _MSC_VER
-    #define TAOCRYPT_NO_VTABLE __declspec(novtable)
-#else
-    #define TAOCRYPT_NO_VTABLE
-#endif
-
-
-#ifdef USE_SYS_STL
-    // use system STL
-    #define STL_NAMESPACE       std
-#else
-    // use mySTL
-    #define STL_NAMESPACE       mySTL
-#endif
-
-
-// ***************** DLL related ********************
-
-#ifdef TAOCRYPT_WIN32_AVAILABLE
-
-#ifdef TAOCRYPT_EXPORTS
-    #define TAOCRYPT_IS_DLL
-    #define TAOCRYPT_DLL __declspec(dllexport)
-#elif defined(TAOCRYPT_IMPORTS)
-    #define TAOCRYPT_IS_DLL
-    #define TAOCRYPT_DLL __declspec(dllimport)
-#else
-    #define TAOCRYPT_DLL
-#endif  // EXPORTS
-
-#define TAOCRYPT_API __stdcall
-#define TAOCRYPT_CDECL __cdecl
-
-#else	// TAOCRYPT_WIN32_AVAILABLE
-
-#define TAOCRYPT_DLL
-#define TAOCRYPT_API
-#define TAOCRYPT_CDECL
-
-#endif	// TAOCRYPT_WIN32_AVAILABLE
-
-
-// ****************** tempalte stuff *******************
-
-
-#if defined(TAOCRYPT_MANUALLY_INSTANTIATE_TEMPLATES) && \
-  !defined(TAOCRYPT_IMPORTS)
-    #define TAOCRYPT_DLL_TEMPLATE_CLASS template class TAOCRYPT_DLL
-#elif defined(__MWERKS__)
-    #define TAOCRYPT_DLL_TEMPLATE_CLASS extern class TAOCRYPT_DLL
-#else
-    #define TAOCRYPT_DLL_TEMPLATE_CLASS extern template class TAOCRYPT_DLL
-#endif
-
-
-#if defined(TAOCRYPT_MANUALLY_INSTANTIATE_TEMPLATES) && \
-  !defined(TAOCRYPT_EXPORTS)
-    #define TAOCRYPT_STATIC_TEMPLATE_CLASS template class
-#elif defined(__MWERKS__)
-    #define TAOCRYPT_STATIC_TEMPLATE_CLASS extern class
-#else
-    #define TAOCRYPT_STATIC_TEMPLATE_CLASS extern template class
-#endif
-
-
-// ************** compile-time assertion ***************
-
-template <bool b>
-struct CompileAssert
-{
-	static char dummy[2*b-1];
-};
-
-#define TAOCRYPT_COMPILE_ASSERT(assertion) \
-    TAOCRYPT_COMPILE_ASSERT_INSTANCE(assertion, __LINE__)
-
-#if defined(TAOCRYPT_EXPORTS) || defined(TAOCRYPT_IMPORTS)
-    #define TAOCRYPT_COMPILE_ASSERT_INSTANCE(assertion, instance)
-#else
-    #define TAOCRYPT_COMPILE_ASSERT_INSTANCE(assertion, instance) \
-    (void)sizeof(CompileAssert<(assertion)>)
-#endif
-
-#define TAOCRYPT_ASSERT_JOIN(X, Y) TAOCRYPT_DO_ASSERT_JOIN(X, Y)
-
-#define TAOCRYPT_DO_ASSERT_JOIN(X, Y) X##Y
-
-
-/***************  helpers  *****************************/
-
-inline unsigned int BitsToBytes(unsigned int bitCount)
-{
-    return ((bitCount+7)/(8));
-}
-
-inline unsigned int BytesToWords(unsigned int byteCount)
-{
-    return ((byteCount+WORD_SIZE-1)/WORD_SIZE);
-}
-
-inline unsigned int BitsToWords(unsigned int bitCount)
-{
-    return ((bitCount+WORD_BITS-1)/(WORD_BITS));
-}
-
-inline void CopyWords(word* r, const word* a, word32 n)
-{
-    for (word32 i = 0; i < n; i++)
-        r[i] = a[i];
-}
-
-inline unsigned int CountWords(const word* X, unsigned int N)
-{
-    while (N && X[N-1]==0)
-        N--;
-    return N;
-}
-
-inline void SetWords(word* r, word a, unsigned int n)
-{
-    for (unsigned int i=0; i<n; i++)
-        r[i] = a;
-}
-
-enum ByteOrder { LittleEndianOrder = 0, BigEndianOrder = 1 };
-enum CipherDir {ENCRYPTION,	DECRYPTION};
-
-inline CipherDir ReverseDir(CipherDir dir)
-{
-    return (dir == ENCRYPTION) ? DECRYPTION : ENCRYPTION;
-}
-
-template <typename ENUM_TYPE, int VALUE>
-struct EnumToType
-{
-    static ENUM_TYPE ToEnum() { return (ENUM_TYPE)VALUE; }
-};
-
-typedef EnumToType<ByteOrder, LittleEndianOrder> LittleEndian;
-typedef EnumToType<ByteOrder, BigEndianOrder>    BigEndian;
-
-
-#ifndef BIG_ENDIAN_ORDER
-    typedef LittleEndian HostByteOrder;
-#else
-    typedef BigEndian    HostByteOrder;
-#endif
-
-inline ByteOrder GetHostByteOrder()
-{
-    return HostByteOrder::ToEnum();
-}
-
-inline bool HostByteOrderIs(ByteOrder order)
-{
-    return order == GetHostByteOrder();
-}
-
-
-void xorbuf(byte*, const byte*, unsigned int);
-
-
-template <class T>
-inline bool IsPowerOf2(T n)
-{
-    return n > 0 && (n & (n-1)) == 0;
-}
-
-template <class T1, class T2>
-inline T2 ModPowerOf2(T1 a, T2 b)
-{
-    return T2(a) & (b-1);
-}
-
-template <class T>
-inline T RoundDownToMultipleOf(T n, T m)
-{
-    return n - (IsPowerOf2(m) ? ModPowerOf2(n, m) : (n%m));
-}
-
-template <class T>
-inline T RoundUpToMultipleOf(T n, T m)
-{
-    return RoundDownToMultipleOf(n+m-1, m);
-}
-
-template <class T>
-inline unsigned int GetAlignment(T* dummy = 0)	// VC60 workaround
-{
-#if (_MSC_VER >= 1300)
-    return __alignof(T);
-#elif defined(__GNUC__)
-    return __alignof__(T);
-#else
-    return sizeof(T);
-#endif
-}
-
-inline bool IsAlignedOn(const void* p, unsigned int alignment)
-{
-    return IsPowerOf2(alignment) ? ModPowerOf2((size_t)p, alignment) == 0
-        : (size_t)p % alignment == 0;
-}
-
-template <class T>
-inline bool IsAligned(const void* p, T* dummy = 0)	// VC60 workaround
-{
-    return IsAlignedOn(p, GetAlignment<T>());
-}
-
-
-template <class T> inline T rotlFixed(T x, unsigned int y)
-{
-    return (x<<y) | (x>>(sizeof(T)*8-y));
-}
-
-template <class T> inline T rotrFixed(T x, unsigned int y)
-{
-    return (x>>y) | (x<<(sizeof(T)*8-y));
-}
-
-#ifdef INTEL_INTRINSICS
-
-#pragma intrinsic(_lrotl, _lrotr)
-
-template<> inline word32 rotlFixed(word32 x, word32 y)
-{
-    return y ? _lrotl(x, y) : x;
-}
-
-template<> inline word32 rotrFixed(word32 x, word32 y)
-{
-    return y ? _lrotr(x, y) : x;
-}
-
-#endif // INTEL_INTRINSICS
-
-#ifdef min
-#undef min
-#endif 
-
-
-template <class T>
-inline const T& min(const T& a, const T& b)
-{
-    return a < b ? a : b;
-}
-
-
-inline word32 ByteReverse(word32 value)
-{
-#ifdef PPC_INTRINSICS
-    // PPC: load reverse indexed instruction
-    return (word32)__lwbrx(&value,0);
-#elif defined(FAST_ROTATE)
-    // 5 instructions with rotate instruction, 9 without
-    return (rotrFixed(value, 8U) & 0xff00ff00) |
-           (rotlFixed(value, 8U) & 0x00ff00ff);
-#else
-    // 6 instructions with rotate instruction, 8 without
-    value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8);
-    return rotlFixed(value, 16U);
-#endif
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-inline word64 ByteReverse(word64 value)
-{
-#ifdef TAOCRYPT_SLOW_WORD64
-	return (word64(ByteReverse(word32(value))) << 32) | 
-                   ByteReverse(word32(value>>32));
-#else
-	value = ((value & W64LIT(0xFF00FF00FF00FF00)) >> 8) |
-            ((value & W64LIT(0x00FF00FF00FF00FF)) << 8);
-	value = ((value & W64LIT(0xFFFF0000FFFF0000)) >> 16) |
-            ((value & W64LIT(0x0000FFFF0000FFFF)) << 16);
-	return rotlFixed(value, 32U);
-#endif
-}
-
-#endif // WORD64_AVAILABLE
-
-
-template <typename T>
-inline void ByteReverse(T* out, const T* in, word32 byteCount)
-{
-    word32 count = byteCount/sizeof(T);
-    for (word32 i=0; i<count; i++)
-        out[i] = ByteReverse(in[i]);
-}
-
-inline void ByteReverse(byte* out, const byte* in, word32 byteCount)
-{
-    word32* o       = reinterpret_cast<word32*>(out);
-    const word32* i = reinterpret_cast<const word32*>(in);
-    ByteReverse(o, i, byteCount);
-}
-
-
-template <class T>
-inline T ByteReverseIf(T value, ByteOrder order)
-{
-    return HostByteOrderIs(order) ? value : ByteReverse(value);
-}
-
-
-template <typename T>
-inline void ByteReverseIf(T* out, const T* in, word32 bc, ByteOrder order)
-{
-    if (!HostByteOrderIs(order)) 
-        ByteReverse(out, in, bc);
-    else if (out != in)
-        memcpy(out, in, bc);
-}
-
-
-
-// do Asm Reverse is host is Little and x86asm 
-#ifdef LITTLE_ENDIAN_ORDER
-    #ifdef TAOCRYPT_X86ASM_AVAILABLE
-        #define LittleReverse AsmReverse
-    #else
-        #define LittleReverse ByteReverse
-    #endif
-#else
-    #define LittleReverse
-#endif
-
-
-// do Asm Reverse is host is Big and x86asm 
-#ifdef BIG_ENDIAN_ORDER
-    #ifdef TAOCRYPT_X86ASM_AVAILABLE
-        #define BigReverse AsmReverse
-    #else
-        #define BigReverse ByteReverse
-    #endif
-#else
-    #define BigReverse
-#endif
-
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-
-    // faster than rotate, use bswap
-
-    inline word32 AsmReverse(word32 wd)
-    {
-    #ifdef __GNUC__
-        __asm__ 
-        (
-            "bswap %1"
-            : "=r"(wd)
-            : "0"(wd)
-        );
-    #else
-        __asm 
-        {
-            mov   eax, wd
-            bswap eax
-            mov   wd, eax
-        }
-    #endif
-        return wd;
-    }
-
-#endif 
-
-
-template <class T>
-inline void GetUserKey(ByteOrder order, T* out, word32 outlen, const byte* in,
-                       word32 inlen)
-{
-    const unsigned int U = sizeof(T);
-    memcpy(out, in, inlen);
-    memset((byte *)out+inlen, 0, outlen*U-inlen);
-    ByteReverseIf(out, out, RoundUpToMultipleOf(inlen, U), order);
-}
-
-
-#ifdef _MSC_VER
-    // disable conversion warning
-    // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
-    #pragma warning(disable:4244 4996)
-#endif
-
-
-inline byte UnalignedGetWordNonTemplate(ByteOrder order, const byte *block,
-                                        byte*)
-{
-    return block[0];
-}
-
-inline word16 UnalignedGetWordNonTemplate(ByteOrder order, const byte* block,
-                                          word16*)
-{
-    return (order == BigEndianOrder)
-        ? block[1] | (block[0] << 8)
-        : block[0] | (block[1] << 8);
-}
-
-inline word32 UnalignedGetWordNonTemplate(ByteOrder order, const byte* block,
-                                          word32*)
-{
-    return (order == BigEndianOrder)
-        ? word32(block[3]) | (word32(block[2]) << 8) | (word32(block[1]) << 16)
-            | (word32(block[0]) << 24)
-        : word32(block[0]) | (word32(block[1]) << 8) | (word32(block[2]) << 16)
-            | (word32(block[3]) << 24);
-}
-
-template <class T>
-inline T UnalignedGetWord(ByteOrder order, const byte *block, T* dummy = 0)
-{
-    return UnalignedGetWordNonTemplate(order, block, dummy);
-}
-
-inline void UnalignedPutWord(ByteOrder order, byte *block, byte value,
-                             const byte *xorBlock = 0)
-{
-    block[0] = xorBlock ? (value ^ xorBlock[0]) : value;
-}
-
-#define GETBYTE(x, y) (unsigned int)byte((x)>>(8*(y)))
-
-inline void UnalignedPutWord(ByteOrder order, byte *block, word16 value,
-                             const byte *xorBlock = 0)
-{
-    if (order == BigEndianOrder)
-    {
-        block[0] = GETBYTE(value, 1);
-        block[1] = GETBYTE(value, 0);
-    }
-    else
-    {
-        block[0] = GETBYTE(value, 0);
-        block[1] = GETBYTE(value, 1);
-    }
-
-    if (xorBlock)
-    {
-        block[0] ^= xorBlock[0];
-        block[1] ^= xorBlock[1];
-    }
-}
-
-inline void UnalignedPutWord(ByteOrder order, byte* block, word32 value,
-                             const byte* xorBlock = 0)
-{
-    if (order == BigEndianOrder)
-    {
-        block[0] = GETBYTE(value, 3);
-        block[1] = GETBYTE(value, 2);
-        block[2] = GETBYTE(value, 1);
-        block[3] = GETBYTE(value, 0);
-    }
-    else
-    {
-        block[0] = GETBYTE(value, 0);
-        block[1] = GETBYTE(value, 1);
-        block[2] = GETBYTE(value, 2);
-        block[3] = GETBYTE(value, 3);
-    }
-
-    if (xorBlock)
-    {
-        block[0] ^= xorBlock[0];
-        block[1] ^= xorBlock[1];
-        block[2] ^= xorBlock[2];
-        block[3] ^= xorBlock[3];
-    }
-}
-
-
-template <class T>
-inline T GetWord(bool assumeAligned, ByteOrder order, const byte *block)
-{
-    if (assumeAligned)
-        return ByteReverseIf(*reinterpret_cast<const T *>(block), order);
-    else
-        return UnalignedGetWord<T>(order, block);
-}
-
-template <class T>
-inline void GetWord(bool assumeAligned, ByteOrder order, T &result,
-                    const byte *block)
-{
-    result = GetWord<T>(assumeAligned, order, block);
-}
-
-template <class T>
-inline void PutWord(bool assumeAligned, ByteOrder order, byte* block, T value,
-                    const byte *xorBlock = 0)
-{
-    if (assumeAligned)
-    {
-        if (xorBlock)
-            *reinterpret_cast<T *>(block) = ByteReverseIf(value, order) 
-                ^ *reinterpret_cast<const T *>(xorBlock);
-        else
-            *reinterpret_cast<T *>(block) = ByteReverseIf(value, order);
-    }
-    else
-        UnalignedPutWord(order, block, value, xorBlock);
-}
-
-template <class T, class B, bool A=true>
-class GetBlock
-{
-public:
-    GetBlock(const void *block)
-        : m_block((const byte *)block) {}
-
-    template <class U>
-    inline GetBlock<T, B, A> & operator()(U &x)
-    {
-        TAOCRYPT_COMPILE_ASSERT(sizeof(U) >= sizeof(T));
-        x = GetWord<T>(A, B::ToEnum(), m_block);
-        m_block += sizeof(T);
-        return *this;
-    }
-
-private:
-    const byte *m_block;
-};
-
-template <class T, class B, bool A = true>
-class PutBlock
-{
-public:
-    PutBlock(const void *xorBlock, void *block)
-        : m_xorBlock((const byte *)xorBlock), m_block((byte *)block) {}
-
-    template <class U>
-    inline PutBlock<T, B, A> & operator()(U x)
-    {
-        PutWord(A, B::ToEnum(), m_block, (T)x, m_xorBlock);
-        m_block += sizeof(T);
-        if (m_xorBlock)
-            m_xorBlock += sizeof(T);
-        return *this;
-    }
-
-private:
-    const byte *m_xorBlock;
-    byte *m_block;
-};
-
-/*
-  XXX MYSQL: Setting A (assumeAligned) to false,
-  keeping it true might trigger segfault on SPARC.
-*/
-template <class T, class B, bool A= false>
-struct BlockGetAndPut
-{
-    // function needed because of C++ grammatical ambiguity between
-    // expression-statements and declarations
-    static inline GetBlock<T, B, A> Get(const void *block) 
-        {return GetBlock<T, B, A>(block);}
-    typedef PutBlock<T, B, A> Put;
-};
-
-
-
-template <bool overflow> struct SafeShifter;
-
-template<> struct SafeShifter<true>
-{
-    template <class T>
-    static inline T RightShift(T value, unsigned int bits)
-    {
-        return 0;
-    }
-
-    template <class T>
-    static inline T LeftShift(T value, unsigned int bits)
-    {
-        return 0;
-    }
-};
-
-template<> struct SafeShifter<false>
-{
-    template <class T>
-    static inline T RightShift(T value, unsigned int bits)
-    {
-        return value >> bits;
-    }
-
-    template <class T>
-    static inline T LeftShift(T value, unsigned int bits)
-    {
-        return value << bits;
-    }
-};
-
-template <unsigned int bits, class T>
-inline T SafeRightShift(T value)
-{
-    return SafeShifter<(bits>=(8*sizeof(T)))>::RightShift(value, bits);
-}
-
-template <unsigned int bits, class T>
-inline T SafeLeftShift(T value)
-{
-    return SafeShifter<(bits>=(8*sizeof(T)))>::LeftShift(value, bits);
-}
-
-
-inline
-word ShiftWordsLeftByBits(word* r, unsigned int n, unsigned int shiftBits)
-{
-    word u, carry=0;
-    if (shiftBits)
-        for (unsigned int i=0; i<n; i++)
-        {
-            u = r[i];
-            r[i] = (u << shiftBits) | carry;
-            carry = u >> (WORD_BITS-shiftBits);
-        }
-    return carry;
-}
-
-
-inline
-word ShiftWordsRightByBits(word* r, unsigned int n, unsigned int shiftBits)
-{
-    word u, carry=0;
-    if (shiftBits)
-        for (int i=n-1; i>=0; i--)
-        {
-            u = r[i];
-            r[i] = (u >> shiftBits) | carry;
-            carry = u << (WORD_BITS-shiftBits);
-        }
-    return carry;
-}
-
-
-inline
-void ShiftWordsLeftByWords(word* r, unsigned int n, unsigned int shiftWords)
-{
-    shiftWords = min(shiftWords, n);
-    if (shiftWords)
-    {
-        for (unsigned int i=n-1; i>=shiftWords; i--)
-            r[i] = r[i-shiftWords];
-        SetWords(r, 0, shiftWords);
-    }
-}
-
-
-inline
-void ShiftWordsRightByWords(word* r, unsigned int n, unsigned int shiftWords)
-{
-    shiftWords = min(shiftWords, n);
-    if (shiftWords)
-    {
-        for (unsigned int i=0; i+shiftWords<n; i++)
-            r[i] = r[i+shiftWords];
-        SetWords(r+n-shiftWords, 0, shiftWords);
-    }
-}
-
-
-template <class T1, class T2>
-inline T1 SaturatingSubtract(T1 a, T2 b)
-{
-    TAOCRYPT_COMPILE_ASSERT_INSTANCE(T1(-1)>0, 0);  // T1 is unsigned type
-    TAOCRYPT_COMPILE_ASSERT_INSTANCE(T2(-1)>0, 1);  // T2 is unsigned type
-    return T1((a > b) ? (a - b) : 0);
-}
-
-
-// declares
-unsigned int  BytePrecision(word value);
-unsigned int  BitPrecision(word);
-word Crop(word value, unsigned int size);
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_MISC_HPP
diff --git a/extra/yassl/taocrypt/include/modarith.hpp b/extra/yassl/taocrypt/include/modarith.hpp
deleted file mode 100644
index 5ac3f67ab3ec..000000000000
--- a/extra/yassl/taocrypt/include/modarith.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* based on Wei Dai's modarith.h from CryptoPP */
-
-
-#ifndef TAO_CRYPT_MODARITH_HPP
-#define TAO_CRYPT_MODARITH_HPP
-
-#include "misc.hpp"
-#include "algebra.hpp"
-
-namespace TaoCrypt {
-
-
-// ModularArithmetic
-class ModularArithmetic : public AbstractRing
-{
-public:
-
-    typedef int RandomizationParameter;
-    typedef Integer Element;
-
-    ModularArithmetic(const Integer &modulus = Integer::One())
-        : modulus(modulus), result((word)0, modulus.reg_.size()) {}
-
-    ModularArithmetic(const ModularArithmetic &ma)
-        : AbstractRing(),
-        modulus(ma.modulus), result((word)0, modulus.reg_.size()) {}
-
-    const Integer& GetModulus() const {return modulus;}
-    void SetModulus(const Integer &newModulus) 
-    {   
-        modulus = newModulus;
-        result.reg_.resize(modulus.reg_.size());
-    }
-
-    virtual bool IsMontgomeryRepresentation() const {return false;}
-
-    virtual Integer ConvertIn(const Integer &a) const
-        {return a%modulus;}
-
-    virtual Integer ConvertOut(const Integer &a) const
-        {return a;}
-
-    const Integer& Half(const Integer &a) const;
-
-    bool Equal(const Integer &a, const Integer &b) const
-        {return a==b;}
-
-    const Integer& Identity() const
-        {return Integer::Zero();}
-
-    const Integer& Add(const Integer &a, const Integer &b) const;
-
-    Integer& Accumulate(Integer &a, const Integer &b) const;
-
-    const Integer& Inverse(const Integer &a) const;
-
-    const Integer& Subtract(const Integer &a, const Integer &b) const;
-
-    Integer& Reduce(Integer &a, const Integer &b) const;
-
-    const Integer& Double(const Integer &a) const
-        {return Add(a, a);}
-
-    const Integer& MultiplicativeIdentity() const
-        {return Integer::One();}
-
-    const Integer& Multiply(const Integer &a, const Integer &b) const
-        {return result1 = a*b%modulus;}
-
-    const Integer& Square(const Integer &a) const
-        {return result1 = a.Squared()%modulus;}
-
-    bool IsUnit(const Integer &a) const
-        {return Integer::Gcd(a, modulus).IsUnit();}
-
-    const Integer& MultiplicativeInverse(const Integer &a) const
-        {return result1 = a.InverseMod(modulus);}
-
-    const Integer& Divide(const Integer &a, const Integer &b) const
-        {return Multiply(a, MultiplicativeInverse(b));}
-
-    Integer CascadeExponentiate(const Integer &x, const Integer &e1,
-                                const Integer &y, const Integer &e2) const;
-
-    void SimultaneousExponentiate(Element *results, const Element &base,
-                  const Integer *exponents, unsigned int exponentsCount) const;
-
-    unsigned int MaxElementBitLength() const
-        {return (modulus-1).BitCount();}
-
-    unsigned int MaxElementByteLength() const
-        {return (modulus-1).ByteCount();}
-
-
-    static const RandomizationParameter DefaultRandomizationParameter;
-
-protected:
-    Integer modulus;
-    mutable Integer result, result1;
-
-};
-
-
-
-//! do modular arithmetics in Montgomery representation for increased speed
-class MontgomeryRepresentation : public ModularArithmetic
-{
-public:
-    MontgomeryRepresentation(const Integer &modulus);	// modulus must be odd
-
-    bool IsMontgomeryRepresentation() const {return true;}
-
-    Integer ConvertIn(const Integer &a) const
-        {return (a<<(WORD_BITS*modulus.reg_.size()))%modulus;}
-
-    Integer ConvertOut(const Integer &a) const;
-
-    const Integer& MultiplicativeIdentity() const
-     {return result1 = Integer::Power2(WORD_BITS*modulus.reg_.size())%modulus;}
-
-    const Integer& Multiply(const Integer &a, const Integer &b) const;
-
-    const Integer& Square(const Integer &a) const;
-
-    const Integer& MultiplicativeInverse(const Integer &a) const;
-
-    Integer CascadeExponentiate(const Integer &x, const Integer &e1,
-                                const Integer &y, const Integer &e2) const
-        {return AbstractRing::CascadeExponentiate(x, e1, y, e2);}
-
-    void SimultaneousExponentiate(Element *results, const Element &base,
-            const Integer *exponents, unsigned int exponentsCount) const
-        {AbstractRing::SimultaneousExponentiate(results, base,
-                                                exponents, exponentsCount);}
-
-private:
-    Integer u;
-    mutable AlignedWordBlock workspace;
-};
-
-
-
-
-} // namespace
-
-#endif // TAO_CRYPT_MODARITH_HPP
diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp
deleted file mode 100644
index bfe8c6ec5d45..000000000000
--- a/extra/yassl/taocrypt/include/modes.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* modes.hpp provides ECB and CBC modes for block cipher encryption/decryption
-*/
-
-
-#ifndef TAO_CRYPT_MODES_HPP
-#define TAO_CRYPT_MODES_HPP
-
-#include "misc.hpp"
-
-namespace TaoCrypt {
-
-
-enum Mode { ECB, CBC };
-
-
-
-// BlockCipher abstraction
-template<CipherDir DIR, class T, Mode MODE>
-class BlockCipher {
-public:
-    BlockCipher() : cipher_(DIR, MODE) {}
-
-    void Process(byte* c, const byte* p, word32 sz) 
-            { cipher_.Process(c, p, sz); }
-    void SetKey(const byte* k, word32 sz)   
-            { cipher_.SetKey(k, sz, DIR); }
-    void SetKey(const byte* k, word32 sz, const byte* iv)   
-            { cipher_.SetKey(k, sz, DIR); cipher_.SetIV(iv); }
-private:
-    T cipher_;
-
-    BlockCipher(const BlockCipher&);            // hide copy
-    BlockCipher& operator=(const BlockCipher&); // and assign
-};
-
-
-// Mode Base for block ciphers, static size
-class Mode_BASE : public virtual_base {
-public:
-    enum { MaxBlockSz = 16 };
-
-    explicit Mode_BASE(int sz, CipherDir dir, Mode mode) 
-        : blockSz_(sz), reg_(reinterpret_cast<byte*>(r_)),
-          tmp_(reinterpret_cast<byte*>(t_)), dir_(dir), mode_(mode)
-    {}
-    virtual ~Mode_BASE() {}
-
-    virtual void Process(byte*, const byte*, word32);
-
-    void SetIV(const byte* iv) { memcpy(reg_, iv, blockSz_); }
-protected:
-    int   blockSz_;
-    byte* reg_;
-    byte* tmp_;
-
-    word32 r_[MaxBlockSz / sizeof(word32)];  // align reg_ on word32
-    word32 t_[MaxBlockSz / sizeof(word32)];  // align tmp_ on word32
-
-    CipherDir dir_;
-    Mode      mode_;
-
-    void ECB_Process(byte*, const byte*, word32);
-    void CBC_Encrypt(byte*, const byte*, word32);
-    void CBC_Decrypt(byte*, const byte*, word32);
-
-    Mode_BASE(const Mode_BASE&);            // hide copy
-    Mode_BASE& operator=(const Mode_BASE&); // and assign
-
-private:
-    virtual void ProcessAndXorBlock(const byte*, const byte*, byte*) const = 0;
-};
-
-
-inline void Mode_BASE::Process(byte* out, const byte* in, word32 sz)
-{
-    if (mode_ == ECB)
-        ECB_Process(out, in, sz);
-    else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
-            CBC_Encrypt(out, in, sz);
-        else
-            CBC_Decrypt(out, in, sz);
-    }
-}
-
-
-// ECB Process blocks
-inline void Mode_BASE::ECB_Process(byte* out, const byte* in, word32 sz)
-{
-    word32 blocks = sz / blockSz_;
-
-    while (blocks--) {
-        ProcessAndXorBlock(in, 0, out);
-        out += blockSz_;
-        in  += blockSz_;
-    }
-}
-
-
-// CBC Encrypt
-inline void Mode_BASE::CBC_Encrypt(byte* out, const byte* in, word32 sz)
-{
-    word32 blocks = sz / blockSz_;
-
-    while (blocks--) {
-        xorbuf(reg_, in, blockSz_);
-        ProcessAndXorBlock(reg_, 0, reg_);
-        memcpy(out, reg_, blockSz_);
-        out += blockSz_;
-        in  += blockSz_;
-    }
-}
-
-
-// CBC Decrypt
-inline void Mode_BASE::CBC_Decrypt(byte* out, const byte* in, word32 sz)
-{
-    word32 blocks = sz / blockSz_;
-    byte   hold[MaxBlockSz];
-
-    while (blocks--) {
-        memcpy(tmp_, in, blockSz_);
-        ProcessAndXorBlock(tmp_, 0, out);
-        xorbuf(out,  reg_, blockSz_);
-        memcpy(hold, reg_,   blockSz_); // swap reg_ and tmp_
-        memcpy(reg_,   tmp_, blockSz_);
-        memcpy(tmp_, hold, blockSz_);
-        out += blockSz_;
-        in  += blockSz_;
-    }
-}
-
-
-} // namespace
-
-#endif  // TAO_CRYPT_MODES_HPP
diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp
deleted file mode 100644
index cf4dff5cee6a..000000000000
--- a/extra/yassl/taocrypt/include/pwdbased.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* pwdbased.hpp defines PBKDF2 from PKCS #5
-*/
-
-
-#ifndef TAO_CRYPT_PWDBASED_HPP
-#define TAO_CRYPT_PWDBASED_HPP
-
-#include <string.h>
-#include "misc.hpp"
-#include "block.hpp"
-#include "hmac.hpp"
-
-namespace TaoCrypt {
-
-
-// From PKCS #5, T must be type suitable for HMAC<T> 
-template <class T>
-class PBKDF2_HMAC {
-public:
-    word32 MaxDerivedKeyLength() const { return 0xFFFFFFFFU;} // avoid overflow
-
-    word32 DeriveKey(byte* derived, word32 dLen, const byte* pwd, word32 pLen,
-                     const byte* salt, word32 sLen, word32 iterations) const;
-}; 
-
-
-
-template <class T>
-word32 PBKDF2_HMAC<T>::DeriveKey(byte* derived, word32 dLen, const byte* pwd,
-                                 word32 pLen, const byte* salt, word32 sLen,
-                                 word32 iterations) const
-{
-	if (dLen > MaxDerivedKeyLength())
-        return 0;
-
-    ByteBlock buffer(T::DIGEST_SIZE);
-	HMAC<T>   hmac;
-
-    hmac.SetKey(pwd, pLen);
-
-	word32 i = 1;
-
-	while (dLen > 0) {
-		hmac.Update(salt, sLen);
-		word32 j;
-		for (j = 0; j < 4; j++) {
-			byte b = i >> ((3-j)*8);
-			hmac.Update(&b, 1);
-		}
-		hmac.Final(buffer.get_buffer());
-
-		word32 segmentLen = min(dLen, buffer.size());
-		memcpy(derived, buffer.get_buffer(), segmentLen);
-
-		for (j = 1; j < iterations; j++) {
-			hmac.Update(buffer.get_buffer(), buffer.size());
-            hmac.Final(buffer.get_buffer());
-			xorbuf(derived, buffer.get_buffer(), segmentLen);
-		}
-		derived += segmentLen;
-		dLen    -= segmentLen;
-		i++;
-	}
-	return iterations;
-}
-
-
-
-
-} // naemspace
-
-#endif // TAO_CRYPT_PWDBASED_HPP
diff --git a/extra/yassl/taocrypt/include/rabbit.hpp b/extra/yassl/taocrypt/include/rabbit.hpp
deleted file mode 100644
index d3ec9479d368..000000000000
--- a/extra/yassl/taocrypt/include/rabbit.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* rabbit.hpp defines Rabbit
-*/
-
-
-#ifndef TAO_CRYPT_RABBIT_HPP
-#define TAO_CRYPT_RABBIT_HPP
-
-#include "misc.hpp"
-
-namespace TaoCrypt {
-
-
-// Rabbit encryption and decryption
-class Rabbit {
-public:
-
-    typedef Rabbit Encryption;
-    typedef Rabbit Decryption;
-
-    enum RabbitCtx { Master = 0, Work = 1 };
-
-    Rabbit() {}
-
-    void Process(byte*, const byte*, word32);
-    void SetKey(const byte*, const byte*);
-private:
-    struct Ctx {
-        word32 x[8];
-        word32 c[8];
-        word32 carry;
-    };
-
-    Ctx masterCtx_;
-    Ctx workCtx_;
-
-    void NextState(RabbitCtx);
-    void SetIV(const byte*);
-
-    Rabbit(const Rabbit&);                  // hide copy
-    const Rabbit operator=(const Rabbit&);  // and assign
-};
-
-} // namespace
-
-
-#endif // TAO_CRYPT_RABBIT_HPP
-
diff --git a/extra/yassl/taocrypt/include/random.hpp b/extra/yassl/taocrypt/include/random.hpp
deleted file mode 100644
index 70c4c0eb12f8..000000000000
--- a/extra/yassl/taocrypt/include/random.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* random.hpp provides a crypto secure Random Number Generator using an OS
-   specific seed
-*/
-
-
-#ifndef TAO_CRYPT_RANDOM_HPP
-#define TAO_CRYPT_RANDOM_HPP
-
-#include "arc4.hpp"
-#include "error.hpp"
-
-namespace TaoCrypt {
-
-
-// OS specific seeder
-class OS_Seed {
-public:
-    OS_Seed();
-    ~OS_Seed();
-
-    void   GenerateSeed(byte*, word32 sz);
-    Error  GetError() const { return error_; }
-private:
-#if defined(_WIN32)
-    #if defined(_WIN64)
-        typedef unsigned __int64 ProviderHandle;
-        // type HCRYPTPROV, avoid #include <windows.h>
-    #else
-        typedef unsigned long ProviderHandle;
-    #endif
-    ProviderHandle handle_;
-#else
-    int fd_;
-#endif
-    Error error_;
-
-    OS_Seed(const OS_Seed&);              // hide copy
-    OS_Seed& operator=(const OS_Seed&);   // hide assign
-};
-
-
-// secure Random Nnumber Generator
-class RandomNumberGenerator {
-public:
-    RandomNumberGenerator();
-    ~RandomNumberGenerator() {}
-
-    void GenerateBlock(byte*, word32 sz);
-    byte GenerateByte();
-
-    ErrorNumber GetError() const { return seed_.GetError().What(); }
-private:
-    OS_Seed seed_;
-    ARC4    cipher_;
-
-    RandomNumberGenerator(const RandomNumberGenerator&);           // hide copy
-    RandomNumberGenerator operator=(const RandomNumberGenerator&); // && assign
-};
-
-
-
-
-}  // namespace
-
-#endif // TAO_CRYPT_RANDOM_HPP
-
diff --git a/extra/yassl/taocrypt/include/ripemd.hpp b/extra/yassl/taocrypt/include/ripemd.hpp
deleted file mode 100644
index 5fb8aa8d2b45..000000000000
--- a/extra/yassl/taocrypt/include/ripemd.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* ripemd.hpp provides RIPEMD digest support
-*/
-
-#ifndef TAO_CRYPT_RIPEMD_HPP
-#define TAO_CRYPT_RIPEMD_HPP
-
-#include "hash.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_RIPEMD_ASM
-#endif
-
-namespace TaoCrypt {
-
-
-// RIPEMD160 digest
-class RIPEMD160 : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 20, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = LittleEndianOrder };   // in Bytes
-    RIPEMD160() : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    RIPEMD160(const RIPEMD160&);
-    RIPEMD160& operator= (const RIPEMD160&);
-
-#ifdef DO_RIPEMD_ASM
-    void Update(const byte*, word32);
-#endif
-    void Init();
-    void Swap(RIPEMD160&);
-private:
-    void Transform();
-    void AsmTransform(const byte* data, word32 times);
-};
-
-inline void swap(RIPEMD160& a, RIPEMD160& b)
-{
-    a.Swap(b);
-}
-
-
-} // namespace
-
-#endif // TAO_CRYPT_RIPEMD_HPP
-
diff --git a/extra/yassl/taocrypt/include/rsa.hpp b/extra/yassl/taocrypt/include/rsa.hpp
deleted file mode 100644
index ee3e378a69f0..000000000000
--- a/extra/yassl/taocrypt/include/rsa.hpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* rsa.hpp provides RSA ES encrypt/decrypt, SSL (block type 1) sign and verify
-*/
-
-#ifndef TAO_CRYPT_RSA_HPP
-#define TAO_CRYPT_RSA_HPP
-
-#include "integer.hpp"
-#include "random.hpp"
-
-
-namespace TaoCrypt {
-
-class Source;
-
-
-// Public Key Length helper
-class PK_Lengths {
-    const Integer& image_;
-public:
-    explicit PK_Lengths(const Integer& i) : image_(i) {}
-
-    word32 PaddedBlockBitLength()  const {return image_.BitCount() - 1;}
-    word32 PaddedBlockByteLength() const 
-                {return BitsToBytes(PaddedBlockBitLength());}
-
-    word32 FixedCiphertextLength()   const {return image_.ByteCount();}
-    word32 FixedMaxPlaintextLength() const 
-                {return SaturatingSubtract(PaddedBlockBitLength() / 8, 10U); }
-};
-
-
-// RSA Public Key
-class RSA_PublicKey {
-protected:
-    Integer n_;
-    Integer e_;
-public:
-    RSA_PublicKey() {}
-    explicit RSA_PublicKey(Source&);
-
-    void Initialize(const Integer& n, const Integer& e) {n_ = n; e_ = e;}
-    void Initialize(Source&);
-
-    Integer ApplyFunction(const Integer& x) const;
-
-    const Integer& GetModulus() const {return n_;}
-    const Integer& GetPublicExponent() const {return e_;}
-
-    void SetModulus(const Integer& n) {n_ = n;}
-    void SetPublicExponent(const Integer& e) {e_ = e;}
-
-    word32 FixedCiphertextLength()
-    {
-        return PK_Lengths(n_).FixedCiphertextLength();
-    }
-
-    RSA_PublicKey(const RSA_PublicKey& other) : n_(other.n_), e_(other.e_) {}
-    RSA_PublicKey& operator=(const RSA_PublicKey& that)
-    {
-        RSA_PublicKey tmp(that);
-        Swap(tmp);
-        return *this;
-    }
-
-    void Swap(RSA_PublicKey& other)
-    {
-        n_.Swap(other.n_);
-        e_.Swap(other.e_);
-    }
-};
-
-
-// RSA Private Key
-class RSA_PrivateKey : public RSA_PublicKey {
-    Integer d_;
-    Integer p_;
-    Integer q_;
-    Integer dp_;
-    Integer dq_;
-    Integer u_;
-public:
-    RSA_PrivateKey() {}
-    explicit RSA_PrivateKey(Source&);
-
-    void Initialize(const Integer& n,  const Integer& e, const Integer& d,
-                    const Integer& p,  const Integer& q, const Integer& dp, 
-                    const Integer& dq, const Integer& u)
-        {n_ = n; e_ = e; d_ = d; p_ = p; q_ = q; dp_ = dp; dq_ = dq; u_ = u;}
-    void Initialize(Source&);
-
-    Integer CalculateInverse(RandomNumberGenerator&, const Integer&) const;
-
-    const Integer& GetPrime1() const {return p_;}
-    const Integer& GetPrime2() const {return q_;}
-    const Integer& GetPrivateExponent() const {return d_;}
-    const Integer& GetModPrime1PrivateExponent() const {return dp_;}
-    const Integer& GetModPrime2PrivateExponent() const {return dq_;}
-    const Integer& GetMultiplicativeInverseOfPrime2ModPrime1() const 
-                   {return u_;}
-
-    void SetPrime1(const Integer& p) {p_ = p;}
-    void SetPrime2(const Integer& q) {q_ = q;}
-    void SetPrivateExponent(const Integer& d) {d_ = d;}
-    void SetModPrime1PrivateExponent(const Integer& dp) {dp_ = dp;}
-    void SetModPrime2PrivateExponent(const Integer& dq) {dq_ = dq;}
-    void SetMultiplicativeInverseOfPrime2ModPrime1(const Integer& u) {u_ = u;}
-private:
-    RSA_PrivateKey(const RSA_PrivateKey&);              // hide copy
-    RSA_PrivateKey& operator=(const RSA_PrivateKey&);   // and assign
-};
-
-
-// block type 2 padding
-class RSA_BlockType2  {
-public:
-    void   Pad(const byte*, word32, byte*, word32,
-               RandomNumberGenerator&) const;
-    word32 UnPad(const byte*, word32, byte*) const;
-};
-
-
-// block type 1 padding
-class RSA_BlockType1  {
-public:
-    void   Pad(const byte*, word32, byte*, word32, 
-               RandomNumberGenerator&) const;
-    word32 UnPad(const byte*, word32, byte*) const;
-};
-
-
-// RSA Encryptor, can use any padding
-template<class Pad = RSA_BlockType2>
-class RSA_Encryptor {
-    const RSA_PublicKey& key_;
-    Pad                  padding_;
-public:
-    explicit RSA_Encryptor(const RSA_PublicKey& k) : key_(k) {}
-
-    void Encrypt(const byte*, word32, byte*, RandomNumberGenerator&);
-    bool SSL_Verify(const byte* msg, word32 sz, const byte* sig);
-};
-
-
-// RSA Decryptor, can use any padding
-template<class Pad = RSA_BlockType2>
-class RSA_Decryptor {
-    const RSA_PrivateKey& key_;
-    Pad                   padding_;
-public:
-    explicit RSA_Decryptor(const RSA_PrivateKey& k) : key_(k) {}
-
-    word32 Decrypt(const byte*, word32, byte*, RandomNumberGenerator&);
-    void   SSL_Sign(const byte*, word32, byte*, RandomNumberGenerator&);
-};
-
-
-// Public Encrypt
-template<class Pad>
-void RSA_Encryptor<Pad>::Encrypt(const byte* plain, word32 sz, byte* cipher,
-                                 RandomNumberGenerator& rng)
-{
-    PK_Lengths lengths(key_.GetModulus());
-    if (sz > lengths.FixedMaxPlaintextLength())
-        return;
-
-    ByteBlock paddedBlock(lengths.PaddedBlockByteLength());
-    padding_.Pad(plain, sz, paddedBlock.get_buffer(),
-                 lengths.PaddedBlockBitLength(), rng);
-
-    key_.ApplyFunction(Integer(paddedBlock.get_buffer(), paddedBlock.size())).
-        Encode(cipher, lengths.FixedCiphertextLength());
-}
-
-
-// Private Decrypt
-template<class Pad>
-word32 RSA_Decryptor<Pad>::Decrypt(const byte* cipher, word32 sz, byte* plain,
-                                   RandomNumberGenerator& rng)
-{
-    PK_Lengths lengths(key_.GetModulus());
-
-    if (sz != lengths.FixedCiphertextLength())
-        return 0;
-       
-    ByteBlock paddedBlock(lengths.PaddedBlockByteLength());
-    Integer x = key_.CalculateInverse(rng, Integer(cipher,
-                                      lengths.FixedCiphertextLength()).Ref());
-    if (x.ByteCount() > paddedBlock.size())
-        x = Integer::Zero();	// don't return false, prevents timing attack
-    x.Encode(paddedBlock.get_buffer(), paddedBlock.size());
-    return padding_.UnPad(paddedBlock.get_buffer(),
-                          lengths.PaddedBlockBitLength(), plain);
-}
-
-
-// Private SSL type (block 1) Encrypt
-template<class Pad>
-void RSA_Decryptor<Pad>::SSL_Sign(const byte* message, word32 sz, byte* sig,
-                                  RandomNumberGenerator& rng)
-{
-    RSA_PublicKey inverse;
-    inverse.Initialize(key_.GetModulus(), key_.GetPrivateExponent());
-    RSA_Encryptor<RSA_BlockType1> enc(inverse); // SSL Type
-    enc.Encrypt(message, sz, sig, rng);
-}
-
-
-word32 SSL_Decrypt(const RSA_PublicKey& key, const byte* sig, byte* plain);
-
-
-// Public SSL type (block 1) Decrypt
-template<class Pad>
-bool RSA_Encryptor<Pad>::SSL_Verify(const byte* message, word32 sz,
-                                    const byte* sig)
-{
-    ByteBlock plain(PK_Lengths(key_.GetModulus()).FixedMaxPlaintextLength());
-    if (SSL_Decrypt(key_, sig, plain.get_buffer()) != sz)
-        return false;   // not right justified or bad padding
-
-    if ( (memcmp(plain.get_buffer(), message, sz)) == 0)
-        return true;
-    return false;
-}
-
-
-typedef RSA_Encryptor<> RSAES_Encryptor;
-typedef RSA_Decryptor<> RSAES_Decryptor;
-
-
-} // namespace
-
-#endif // TAO_CRYPT_RSA_HPP
diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp
deleted file mode 100644
index c984287d32af..000000000000
--- a/extra/yassl/taocrypt/include/runtime.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* runtime.hpp provides C++ runtime support functions when building a pure C
- * version of yaSSL, user must define YASSL_PURE_C
-*/
-
-
-
-#ifndef yaSSL_NEW_HPP
-#define yaSSL_NEW_HPP
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef YASSL_PURE_C
-
-#ifdef __sun
- 
-
-// Handler for pure virtual functions
-namespace __Crun {
-    void pure_error(void);
-} // namespace __Crun
-
-#endif // __sun
-
-
-#if defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-
-#if __GNUC__ > 2
-
-extern "C" {
-#if defined(DO_TAOCRYPT_KERNEL_MODE)
-    #include "kernelc.hpp"
-#endif
-    int __cxa_pure_virtual () __attribute__ ((weak));
-} // extern "C"
-
-#endif // __GNUC__ > 2
-#endif // compiler check
-#endif // YASSL_PURE_C
-#endif // yaSSL_NEW_HPP
-
diff --git a/extra/yassl/taocrypt/include/sha.hpp b/extra/yassl/taocrypt/include/sha.hpp
deleted file mode 100644
index cf6d0d09a1d1..000000000000
--- a/extra/yassl/taocrypt/include/sha.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* sha.hpp provides SHA-1 digests, see RFC 3174
-*/
-
-#ifndef TAO_CRYPT_SHA_HPP
-#define TAO_CRYPT_SHA_HPP
-
-#include "hash.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_SHA_ASM
-#endif
-
-namespace TaoCrypt {
-
-
-// SHA-1 digest
-class SHA : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 20, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = BigEndianOrder};   // in Bytes
-    SHA() : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-#ifdef DO_SHA_ASM
-    void Update(const byte* data, word32 len);
-#endif
-    void Init();
-
-    SHA(const SHA&);
-    SHA& operator= (const SHA&);
-
-    void Swap(SHA&);
-private:
-    void Transform();
-    void AsmTransform(const byte* data, word32 times);
-};
-
-
-inline void swap(SHA& a, SHA& b)
-{
-    a.Swap(b);
-}
-
-// SHA-256 digest
-class SHA256 : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 32, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = BigEndianOrder};   // in Bytes
-    SHA256() : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    void Init();
-
-    SHA256(const SHA256&);
-    SHA256& operator= (const SHA256&);
-
-    void Swap(SHA256&);
-private:
-    void Transform();
-};
-
-
-// SHA-224 digest
-class SHA224 : public HASHwithTransform {
-public:
-    enum { BLOCK_SIZE = 64, DIGEST_SIZE = 28, PAD_SIZE = 56,
-           TAO_BYTE_ORDER = BigEndianOrder};   // in Bytes
-    SHA224() : HASHwithTransform(SHA256::DIGEST_SIZE /sizeof(word32),BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    void Init();
-
-    SHA224(const SHA224&);
-    SHA224& operator= (const SHA224&);
-
-    void Swap(SHA224&);
-private:
-    void Transform();
-};
-
-
-#ifdef WORD64_AVAILABLE
-
-// SHA-512 digest
-class SHA512 : public HASH64withTransform {
-public:
-    enum { BLOCK_SIZE = 128, DIGEST_SIZE = 64, PAD_SIZE = 112,
-           TAO_BYTE_ORDER = BigEndianOrder};   // in Bytes
-    SHA512() : HASH64withTransform(DIGEST_SIZE / sizeof(word64), BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    void Init();
-
-    SHA512(const SHA512&);
-    SHA512& operator= (const SHA512&);
-
-    void Swap(SHA512&);
-private:
-    void Transform();
-};
-
-
-// SHA-384 digest
-class SHA384 : public HASH64withTransform {
-public:
-    enum { BLOCK_SIZE = 128, DIGEST_SIZE = 48, PAD_SIZE = 112,
-           TAO_BYTE_ORDER = BigEndianOrder};   // in Bytes
-    SHA384() : HASH64withTransform(SHA512::DIGEST_SIZE/ sizeof(word64),
-                                   BLOCK_SIZE)
-                { Init(); }
-    ByteOrder getByteOrder()  const { return ByteOrder(TAO_BYTE_ORDER); }
-    word32    getBlockSize()  const { return BLOCK_SIZE; }
-    word32    getDigestSize() const { return DIGEST_SIZE; }
-    word32    getPadSize()    const { return PAD_SIZE; }
-
-    void Init();
-
-    SHA384(const SHA384&);
-    SHA384& operator= (const SHA384&);
-
-    void Swap(SHA384&);
-private:
-    void Transform();
-};
-
-enum { MAX_SHA2_DIGEST_SIZE = 64 };   // SHA512
-
-#else
-
-enum { MAX_SHA2_DIGEST_SIZE = 32 };   // SHA256
-
-#endif // WORD64_AVAILABLE
-
-
-} // namespace
-
-
-#endif // TAO_CRYPT_SHA_HPP
-
diff --git a/extra/yassl/taocrypt/include/twofish.hpp b/extra/yassl/taocrypt/include/twofish.hpp
deleted file mode 100644
index eeb9b6aba06b..000000000000
--- a/extra/yassl/taocrypt/include/twofish.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* twofish.hpp defines Twofish
-*/
-
-
-#ifndef TAO_CRYPT_TWOFISH_HPP
-#define TAO_CRYPT_TWOFISH_HPP
-
-#include "misc.hpp"
-#include "modes.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_TWOFISH_ASM
-#endif
-
-namespace TaoCrypt {
-
-enum { TWOFISH_BLOCK_SIZE = 16 };
-
-
-// Twofish encryption and decryption, see 
-class Twofish : public Mode_BASE {
-public:
-    enum { BLOCK_SIZE = TWOFISH_BLOCK_SIZE };
-
-    Twofish(CipherDir DIR, Mode MODE)
-        : Mode_BASE(BLOCK_SIZE, DIR, MODE) {}
-
-#ifdef DO_TWOFISH_ASM
-    void Process(byte*, const byte*, word32);
-#endif
-    void SetKey(const byte* key, word32 sz, CipherDir fake = ENCRYPTION);
-    void SetIV(const byte* iv) { memcpy(r_, iv, BLOCK_SIZE); }
-private:
-	static const byte     q_[2][256];
-	static const word32 mds_[4][256];
-
-	word32 k_[40];
-	word32 s_[4][256];
-
-	static word32 h0(word32 x, const word32 *key, unsigned int kLen);
-	static word32 h(word32 x, const word32 *key, unsigned int kLen);
-
-    void ProcessAndXorBlock(const byte*, const byte*, byte*) const;
-
-    void encrypt(const byte*, const byte*, byte*) const;
-    void decrypt(const byte*, const byte*, byte*) const;
-
-    void AsmEncrypt(const byte* inBlock, byte* outBlock) const;
-    void AsmDecrypt(const byte* inBlock, byte* outBlock) const;
-
-    Twofish(const Twofish&);            // hide copy
-    Twofish& operator=(const Twofish&); // and assign
-};
-
-
-typedef BlockCipher<ENCRYPTION, Twofish, ECB> Twofish_ECB_Encryption;
-typedef BlockCipher<DECRYPTION, Twofish, ECB> Twofish_ECB_Decryption;
-
-typedef BlockCipher<ENCRYPTION, Twofish, CBC> Twofish_CBC_Encryption;
-typedef BlockCipher<DECRYPTION, Twofish, CBC> Twofish_CBC_Decryption;
-
-
-
-} // naemspace
-
-#endif // TAO_CRYPT_TWOFISH_HPP
-
diff --git a/extra/yassl/taocrypt/include/type_traits.hpp b/extra/yassl/taocrypt/include/type_traits.hpp
deleted file mode 100644
index 8c6fe53bbb82..000000000000
--- a/extra/yassl/taocrypt/include/type_traits.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* type_traits defines fundamental types
- * see discussion in C++ Templates, $19.1
-*/
-
-
-#ifndef TAO_CRYPT_TYPE_TRAITS_HPP
-#define TAO_CRYPT_TYPE_TRAITS_HPP
-
-#include "types.hpp"
-
-namespace TaoCrypt {
-
-
-// primary template: in general T is not a fundamental type
-
-template <typename T>
-class IsFundamentalType {
-    public:
-        enum { Yes = 0, No = 1 };
-};
-
-
-// macro to specialize for fundamental types
-#define MK_FUNDAMENTAL_TYPE(T)                  \
-    template<> class IsFundamentalType<T> {     \
-        public:                                 \
-            enum { Yes = 1, No = 0 };           \
-    };
-
-
-MK_FUNDAMENTAL_TYPE(void)
-
-MK_FUNDAMENTAL_TYPE(bool)
-MK_FUNDAMENTAL_TYPE(         char)
-MK_FUNDAMENTAL_TYPE(signed   char)
-MK_FUNDAMENTAL_TYPE(unsigned char)
-
-MK_FUNDAMENTAL_TYPE(signed   short)
-MK_FUNDAMENTAL_TYPE(unsigned short)
-MK_FUNDAMENTAL_TYPE(signed   int)
-MK_FUNDAMENTAL_TYPE(unsigned int)
-MK_FUNDAMENTAL_TYPE(signed   long)
-MK_FUNDAMENTAL_TYPE(unsigned long)
-
-MK_FUNDAMENTAL_TYPE(float)
-MK_FUNDAMENTAL_TYPE(     double)
-MK_FUNDAMENTAL_TYPE(long double)
-
-#if defined(WORD64_AVAILABLE) && defined(WORD64_IS_DISTINCT_TYPE)
-    MK_FUNDAMENTAL_TYPE(word64)
-#endif
-
-
-#undef MK_FUNDAMENTAL_TYPE
-
-
-} // namespace
-
-#endif // TAO_CRYPT_TYPE_TRAITS_HPP
diff --git a/extra/yassl/taocrypt/include/types.hpp b/extra/yassl/taocrypt/include/types.hpp
deleted file mode 100644
index 67ea2609a269..000000000000
--- a/extra/yassl/taocrypt/include/types.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's misc.h from CryptoPP, basic crypt types */
-
-
-#ifndef TAO_CRYPT_TYPES_HPP
-#define TAO_CRYPT_TYPES_HPP
-
-#ifdef HAVE_CONFIG_H
-    #include "config.h"
-#endif
-
-namespace TaoCrypt {
-
-
-#if defined(WORDS_BIGENDIAN) || (defined(__MWERKS__) && !defined(__INTEL__))
-    #define BIG_ENDIAN_ORDER
-#endif
-
-#ifndef BIG_ENDIAN_ORDER
-    #define LITTLE_ENDIAN_ORDER
-#endif
-
-
-typedef unsigned char  byte;
-typedef unsigned short word16;
-typedef unsigned int   word32;
-
-#if defined(_MSC_VER) || defined(__BCPLUSPLUS__)
-    #define WORD64_AVAILABLE
-    #define WORD64_IS_DISTINCT_TYPE
-    typedef unsigned __int64 word64;
-    #define W64LIT(x) x##ui64
-#elif SIZEOF_LONG == 8
-    #define WORD64_AVAILABLE
-    typedef unsigned long word64;
-    #define W64LIT(x) x##LL
-#elif SIZEOF_LONG_LONG == 8 
-    #define WORD64_AVAILABLE
-    #define WORD64_IS_DISTINCT_TYPE
-    typedef unsigned long long word64;
-    #define W64LIT(x) x##LL
-#endif
-
-
-// compilers we've found 64-bit multiply insructions for
-#if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX)
-    #if !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #define HAVE_64_MULTIPLY
-    #endif
-#endif
-
-    
-#if defined(HAVE_64_MULTIPLY) && (defined(__ia64__) \
-    || defined(_ARCH_PPC64) || defined(__mips64)  || defined(__x86_64__) \
-    || defined(_M_X64) || defined(_M_IA64)) 
-// These platforms have 64-bit CPU registers. Unfortunately most C++ compilers
-// don't allow any way to access the 64-bit by 64-bit multiply instruction
-// without using assembly, so in order to use word64 as word, the assembly
-// instruction must be defined in Dword::Multiply().
-    typedef word32 hword;
-    typedef word64 word;
-#else
-    #define TAOCRYPT_NATIVE_DWORD_AVAILABLE
-    #ifdef WORD64_AVAILABLE
-        #define TAOCRYPT_SLOW_WORD64
-        typedef word16 hword;
-        typedef word32 word;
-        typedef word64 dword;
-    #else
-        typedef byte   hword;
-        typedef word16 word;
-        typedef word32 dword;
-    #endif
-#endif
-
-const word32 WORD_SIZE = sizeof(word);
-const word32 WORD_BITS = WORD_SIZE * 8;
-
-
-}  // namespace
-
-#endif // TAO_CRYPT_TYPES_HPP
diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp
deleted file mode 100644
index 83be9644b2f6..000000000000
--- a/extra/yassl/taocrypt/mySTL/algorithm.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL algorithm implements max, min, for_each, swap, find_if, copy,
- * copy_backward, fill
- */
-
-#ifndef mySTL_ALGORITHM_HPP
-#define mySTL_ALGORITHM_HPP
-
-
-namespace mySTL {
-
-
-template<typename T>
-inline const T& max(const T& a, const T&b)
-{
-    return a < b ? b : a;
-}
-
-
-template<typename T>
-inline const T& min(const T& a, const T&b)
-{
-    return b < a ? b : a;
-}
-
-
-template<typename InIter, typename Func>
-Func for_each(InIter first, InIter last, Func op)
-{
-    while (first != last) {
-        op(*first);
-        ++first;
-    }
-    return op;
-}
-
-
-template<typename T>
-inline void swap(T& a, T& b)
-{
-    T tmp = a;
-    a = b;
-    b = tmp;
-}
-
-
-template<typename InIter, typename Pred>
-InIter find_if(InIter first, InIter last, Pred pred)
-{
-    while (first != last && !pred(*first))
-        ++first;
-    return first;
-}
-
-
-template<typename InputIter, typename OutputIter>
-inline OutputIter copy(InputIter first, InputIter last, OutputIter place)
-{
-    while (first != last) {
-        *place = *first;
-        ++first;
-        ++place;
-    }
-    return place;
-}
-
-
-template<typename InputIter, typename OutputIter>
-inline OutputIter 
-copy_backward(InputIter first, InputIter last, OutputIter place)
-{
-    while (first != last)
-        *--place = *--last;
-    return place;
-}
-
-
-template<typename InputIter, typename T>
-void fill(InputIter first, InputIter last, const T& v)
-{
-    while (first != last) {
-        *first = v;
-        ++first;
-    }
-}
-
-
-}  // namespace mySTL
-
-#endif // mySTL_ALGORITHM_HPP
diff --git a/extra/yassl/taocrypt/mySTL/helpers.hpp b/extra/yassl/taocrypt/mySTL/helpers.hpp
deleted file mode 100644
index fc6e89d2dbfd..000000000000
--- a/extra/yassl/taocrypt/mySTL/helpers.hpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL helpers implements misc constructs for vector and list
- *
- */
-
-#ifndef mySTL_HELPERS_HPP
-#define mySTL_HELPERS_HPP
-
-#include <stdlib.h>
-#ifdef _MSC_VER
-    #include <new>
-#endif
-
-/*
-      Workaround for the lack of operator new(size_t, void*)
-      in IBM VA C++ 6.0
-      Also used as a workaround to avoid including <new>
-*/
-    struct Dummy {};
-
-    inline void* operator new(size_t size, Dummy* d) 
-    { 
-        return static_cast<void*>(d);
-    }
-
-    // for compilers that want matching delete
-    inline void operator delete(void* ptr, Dummy* d) 
-    { 
-    }
-
-    typedef Dummy* yassl_pointer;
-
-namespace mySTL {
-
-
-template <typename T, typename T2>
-inline void construct(T* p, const T2& value)
-{
-    new (reinterpret_cast<yassl_pointer>(p)) T(value);
-}
-
-
-template <typename T>
-inline void construct(T* p)
-{
-    new (reinterpret_cast<yassl_pointer>(p)) T();
-}
-
-
-template <typename T>
-inline void destroy(T* p)
-{
-    p->~T();
-}
-
-
-template <typename Iter>
-void destroy(Iter first, Iter last)
-{
-    while (first != last) {
-        destroy(&*first);
-        ++first;
-    }
-}
-
-
-template <typename Iter, typename PlaceIter>
-PlaceIter uninit_copy(Iter first, Iter last, PlaceIter place)
-{
-    while (first != last) {
-        construct(&*place, *first);
-        ++first;
-        ++place;
-    }
-    return place;
-}
-
-
-template <typename PlaceIter, typename Size, typename T>
-PlaceIter uninit_fill_n(PlaceIter place, Size n, const T& value)
-{
-    while (n) {
-        construct(&*place, value);
-        --n;
-        ++place;
-    }
-    return place;
-}
-
-
-template <typename T>
-T* GetArrayMemory(size_t items)
-{
-    unsigned char* ret;
-
-    #ifdef YASSL_LIB
-        ret = NEW_YS unsigned char[sizeof(T) * items];
-    #else
-        ret = NEW_TC unsigned char[sizeof(T) * items];
-    #endif
-
-    return reinterpret_cast<T*>(ret);
-}
-
-
-template <typename T>
-void FreeArrayMemory(T* ptr)
-{
-    unsigned char* p = reinterpret_cast<unsigned char*>(ptr);
-
-    #ifdef YASSL_LIB
-        yaSSL::ysArrayDelete(p);
-    #else
-        TaoCrypt::tcArrayDelete(p);
-    #endif
-}
-
-
-
-inline void* GetMemory(size_t bytes)
-{
-    return GetArrayMemory<unsigned char>(bytes);
-}
-
-
-inline void FreeMemory(void* ptr)
-{
-    FreeArrayMemory(ptr);
-}
-
-
-
-} // namespace mySTL
-
-#endif // mySTL_HELPERS_HPP
diff --git a/extra/yassl/taocrypt/mySTL/list.hpp b/extra/yassl/taocrypt/mySTL/list.hpp
deleted file mode 100644
index df03e0ae131f..000000000000
--- a/extra/yassl/taocrypt/mySTL/list.hpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL list implements a simple list
- *
- */
-
-#ifndef mySTL_LIST_HPP
-#define mySTL_LIST_HPP
-
-
-#include "helpers.hpp"
-
-
-namespace mySTL {
-
-
-
-template<typename T> 
-class list {
-
-#ifdef __SUNPRO_CC
-/*
-   Sun Forte 7 C++ v. 5.4 needs class 'node' public to be visible to
-   the nested class 'iterator' (a non-standard behaviour).
-*/
-public:
-#endif
-
-    struct node {
-        node(T t) : prev_(0), next_(0), value_(t) {}
-
-        node* prev_;
-        node* next_;
-        T     value_;
-    };   
-public:
-    list() : head_(0), tail_(0), sz_(0) {}
-    ~list();
-
-    void   push_front(T);
-    void   pop_front();
-    T      front() const;
-    void   push_back(T);
-    void   pop_back();
-    T      back() const;
-    bool   remove(T);
-    size_t size()  const { return sz_; }
-    bool   empty() const { return sz_ == 0; }
-
-    class iterator {
-        node* current_;
-    public:
-        explicit iterator(node* p = 0) : current_(p) {}
-
-        T& operator*() const
-        {
-            return current_->value_;
-        }
-
-        T* operator->() const
-        {
-            return &(operator*());
-        }
-
-        iterator& operator++()
-        {
-            current_ = current_->next_;
-            return *this;
-        }
-
-        iterator& operator--()
-        {
-            current_ = current_->prev_;
-            return *this;
-        }
-
-        iterator operator++(int)
-        {
-            iterator tmp = *this;
-            current_ = current_->next_;
-            return tmp;
-        }
-
-        iterator operator--(int)
-        {
-            iterator tmp = *this;
-            current_ = current_->prev_;
-            return tmp;
-        }
-
-        bool operator==(const iterator& other) const
-        { 
-            return current_ == other.current_;
-        }
-
-        bool operator!=(const iterator& other) const
-        {
-            return current_ != other.current_;
-        }
-
-        friend class list<T>;
-    };
-
-
-    class reverse_iterator {
-        node* current_;
-    public:
-        explicit reverse_iterator(node* p = 0) : current_(p) {}
-
-        T& operator*() const
-        {
-            return current_->value_;
-        }
-
-        T* operator->() const
-        {
-            return &(operator*());
-        }
-
-        reverse_iterator& operator++()
-        {
-            current_ = current_->prev_;
-            return *this;
-        }
-
-        reverse_iterator& operator--()
-        {
-            current_ = current_->next_;
-            return *this;
-        }
-
-        reverse_iterator operator++(int)
-        {
-            reverse_iterator tmp = *this;
-            current_ = current_->prev_;
-            return tmp;
-        }
-
-        reverse_iterator operator--(int)
-        {
-            reverse_iterator tmp = *this;
-            current_ = current_->next_;
-            return tmp;
-        }
-
-        bool operator==(const reverse_iterator& other) const
-        { 
-            return current_ == other.current_;
-        }
-
-        bool operator!=(const reverse_iterator& other) const
-        {
-            return current_ != other.current_;
-        }
-
-        friend class list<T>;
-    };
-
-    bool erase(iterator);
-
-    iterator         begin()  const { return iterator(head_); }
-    reverse_iterator rbegin() const { return reverse_iterator(tail_); }
-    iterator         end()    const { return iterator(); }
-    reverse_iterator rend()   const { return reverse_iterator(); }
-
-    typedef iterator const_iterator;    // for now
-
-    class underflow {};
-    class overflow {}; 
-private:
-    node*  head_;
-    node*  tail_;
-    size_t sz_;
-
-    node* look_up(T);
-
-    list(const list&);            // hide copy
-    list& operator=(const list&); // and assign
-};
-
-
-template<typename T> 
-list<T>::~list()
-{
-    node* start = head_;
-    node* next_;
-
-    for (; start; start = next_) {
-        next_ = start->next_;
-        destroy(start);
-        FreeMemory(start);
-    }
-}
-
-
-template<typename T> 
-void list<T>::push_front(T t)
-{
-    void* mem = GetMemory(sizeof(node));
-    node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);
-
-    if (head_) {
-        add->next_ = head_;
-        head_->prev_ = add;
-    }
-    else
-        tail_ = add;
-
-    head_ = add;
-    ++sz_; 
-}
-
-
-template<typename T> 
-void list<T>::pop_front()
-{
-    node* front = head_;
-
-    if (head_ == 0)
-        return;
-    else if (head_ == tail_)
-        head_ = tail_ = 0;
-    else {
-        head_ = head_->next_;
-        head_->prev_ = 0;
-    }
-    destroy(front);
-    FreeMemory(front);
-    --sz_;
-}
-
-
-template<typename T> 
-T list<T>::front() const
-{
-    if (head_ == 0) return T();
-    return head_->value_;
-}
-
-
-template<typename T> 
-void list<T>::push_back(T t)
-{
-    void* mem = GetMemory(sizeof(node));
-    node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);
-
-    if (tail_) {
-        tail_->next_ = add;
-        add->prev_ = tail_;
-    }
-    else
-        head_ = add;
-
-    tail_ = add;
-    ++sz_;
-}
-
-
-template<typename T> 
-void list<T>::pop_back()
-{
-    node* rear = tail_;
-
-    if (tail_ == 0)
-        return;
-    else if (tail_ == head_)
-        tail_ = head_ = 0;
-    else {
-        tail_ = tail_->prev_;
-        tail_->next_ = 0;
-    }
-    destroy(rear);
-    FreeMemory(rear);
-    --sz_;
-}
-
-
-template<typename T> 
-T list<T>::back() const
-{
-    if (tail_ == 0) return T();
-    return tail_->value_;
-}
-
-
-template<typename T>
-typename list<T>::node* list<T>::look_up(T t)
-{
-    node* list = head_;
-
-    if (list == 0) return 0;
-
-    for (; list; list = list->next_)
-        if (list->value_ == t)
-            return list;
-
-    return 0;
-}
-
-
-template<typename T> 
-bool list<T>::remove(T t)
-{
-    node* del = look_up(t);
-
-    if (del == 0)
-        return false;
-    else if (del == head_)
-        pop_front();
-    else if (del == tail_)
-        pop_back();
-    else {
-        del->prev_->next_ = del->next_;
-        del->next_->prev_ = del->prev_;
-
-        destroy(del);
-        FreeMemory(del);
-        --sz_;
-    }
-    return true;
-}
-
-
-template<typename T> 
-bool list<T>::erase(iterator iter)
-{
-    node* del = iter.current_;
-
-    if (del == 0)
-        return false;
-    else if (del == head_)
-        pop_front();
-    else if (del == tail_)
-        pop_back();
-    else {
-        del->prev_->next_ = del->next_;
-        del->next_->prev_ = del->prev_;
-
-        destroy(del);
-        FreeMemory(del);
-        --sz_;
-    }
-    return true;
-}
-
-
-
-} // namespace mySTL
-
-#endif // mySTL_LIST_HPP
diff --git a/extra/yassl/taocrypt/mySTL/memory.hpp b/extra/yassl/taocrypt/mySTL/memory.hpp
deleted file mode 100644
index 7e709be3083d..000000000000
--- a/extra/yassl/taocrypt/mySTL/memory.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL memory implements auto_ptr
- *
- */
-
-#ifndef mySTL_MEMORY_HPP
-#define mySTL_MEMORY_HPP
-
-#include "memory_array.hpp"   // for auto_array
-
-#ifdef _MSC_VER
-    // disable operator-> warning for builtins
-    #pragma warning(disable:4284)
-#endif
-
-
-namespace mySTL {
-
-
-template<typename T>
-struct auto_ptr_ref {
-    T* ptr_;
-    explicit auto_ptr_ref(T* p) : ptr_(p) {}
-};
-
-
-template<typename T>
-class auto_ptr {
-    T*       ptr_;
-
-    void Destroy()
-    {
-        #ifdef YASSL_LIB
-            yaSSL::ysDelete(ptr_);
-        #else
-            TaoCrypt::tcDelete(ptr_);
-        #endif
-    }
-public:
-    explicit auto_ptr(T* p = 0) : ptr_(p) {}
-
-    ~auto_ptr() 
-    {
-        Destroy();
-    }
-
-
-    auto_ptr(auto_ptr& other) : ptr_(other.release()) {}
-
-    auto_ptr& operator=(auto_ptr& that)
-    {
-        if (this != &that) {
-            Destroy();
-            ptr_ = that.release();
-        }
-        return *this;
-    }
-
-
-    T* operator->() const
-    {
-        return ptr_;
-    }
-
-    T& operator*() const
-    {
-        return *ptr_;
-    }
-
-    T* get() const 
-    { 
-        return ptr_; 
-    }
-
-    T* release()
-    {
-        T* tmp = ptr_;
-        ptr_ = 0;
-        return tmp;
-    }
-
-    void reset(T* p = 0)
-    {
-        if (ptr_ != p) {
-            Destroy();
-            ptr_ = p;
-        }
-    }
-
-    // auto_ptr_ref conversions
-    auto_ptr(auto_ptr_ref<T> ref) : ptr_(ref.ptr_) {}
-
-    auto_ptr& operator=(auto_ptr_ref<T> ref)
-    {
-        if (this->ptr_ != ref.ptr_) {
-            Destroy();
-            ptr_ = ref.ptr_;
-        }
-        return *this;
-    }
-
-    template<typename T2>
-    operator auto_ptr<T2>()
-    {
-        return auto_ptr<T2>(this->release());
-    }
-
-    template<typename T2>
-    operator auto_ptr_ref<T2>()
-    {
-        return auto_ptr_ref<T2>(this->release());
-    }
-};
-
-
-} // namespace mySTL
-
-#endif // mySTL_MEMORY_HPP
diff --git a/extra/yassl/taocrypt/mySTL/memory_array.hpp b/extra/yassl/taocrypt/mySTL/memory_array.hpp
deleted file mode 100644
index 1c238d9ae3d7..000000000000
--- a/extra/yassl/taocrypt/mySTL/memory_array.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL memory_arry implements auto_array
- *
- */
-
-#ifndef mySTL_MEMORY_ARRAY_HPP
-#define mySTL_MEMORY_ARRAY_HPP
-
-
-#ifdef _MSC_VER
-    // disable operator-> warning for builtins
-    #pragma warning(disable:4284)
-#endif
-
-
-namespace mySTL {
-
-
-template<typename T>
-struct auto_array_ref {
-    T* ptr_;
-    explicit auto_array_ref(T* p) : ptr_(p) {}
-};
-
-
-template<typename T>
-class auto_array {
-    T*       ptr_;
-
-    void Destroy()
-    {
-        #ifdef YASSL_LIB
-            yaSSL::ysArrayDelete(ptr_);
-        #else
-            TaoCrypt::tcArrayDelete(ptr_);
-        #endif
-    }
-public:
-    explicit auto_array(T* p = 0) : ptr_(p) {}
-
-    ~auto_array() 
-    {
-        Destroy();
-    }
-
-
-    auto_array(auto_array& other) : ptr_(other.release()) {}
-
-    auto_array& operator=(auto_array& that)
-    {
-        if (this != &that) {
-            Destroy();
-            ptr_ = that.release();
-        }
-        return *this;
-    }
-
-
-    T* operator->() const
-    {
-        return ptr_;
-    }
-
-    T& operator*() const
-    {
-        return *ptr_;
-    }
-
-    T* get() const 
-    { 
-        return ptr_; 
-    }
-
-    T* release()
-    {
-        T* tmp = ptr_;
-        ptr_ = 0;
-        return tmp;
-    }
-
-    void reset(T* p = 0)
-    {
-        if (ptr_ != p) {
-            Destroy();
-            ptr_ = p;
-        }
-    }
-
-    // auto_array_ref conversions
-    auto_array(auto_array_ref<T> ref) : ptr_(ref.ptr_) {}
-
-    auto_array& operator=(auto_array_ref<T> ref)
-    {
-        if (this->ptr_ != ref.ptr_) {
-            Destroy();
-            ptr_ = ref.ptr_;
-        }
-        return *this;
-    }
-
-    template<typename T2>
-    operator auto_array<T2>()
-    {
-        return auto_array<T2>(this->release());
-    }
-
-    template<typename T2>
-    operator auto_array_ref<T2>()
-    {
-        return auto_array_ref<T2>(this->release());
-    }
-};
-
-
-} // namespace mySTL
-
-#endif // mySTL_MEMORY_ARRAY_HPP
diff --git a/extra/yassl/taocrypt/mySTL/pair.hpp b/extra/yassl/taocrypt/mySTL/pair.hpp
deleted file mode 100644
index 545827a9f8f0..000000000000
--- a/extra/yassl/taocrypt/mySTL/pair.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL pair implements pair
- *
- */
-
-#ifndef mySTL_PAIR_HPP
-#define mySTL_PAIR_HPP
-
-
-
-namespace mySTL {
-
-
-template<typename T1, typename T2>
-struct pair {
-    typedef T1 first_type;
-    typedef T2 second_type;
-
-    first_type  first;
-    second_type second;
-
-    pair() {}
-    pair(const T1& t1, const T2& t2) : first(t1), second(t2) {}
-
-    template<typename U1, typename U2>
-    pair(const pair<U1, U2>& p) : first(p.first), second(p.second) {}
-};
-
-
-template<typename T1, typename T2>
-inline pair<T1, T2> make_pair(const T1& a, const T2& b)
-{
-    return pair<T1, T2>(a, b);
-}
-
-
-
-} // namespace mySTL
-
-#endif // mySTL_PAIR_HPP
diff --git a/extra/yassl/taocrypt/mySTL/stdexcept.hpp b/extra/yassl/taocrypt/mySTL/stdexcept.hpp
deleted file mode 100644
index 79ae6de3380c..000000000000
--- a/extra/yassl/taocrypt/mySTL/stdexcept.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL memory implements exception, runtime_error
- *
- */
-
-#ifndef mySTL_STDEXCEPT_HPP
-#define mySTL_STDEXCEPT_HPP
-
-
-#include <string.h>  // strncpy
-#include <stdlib.h>  // size_t
-
-
-namespace mySTL {
-
-
-class exception {
-public:
-    exception() {}
-    virtual ~exception() {}   // to shut up compiler warnings
-
-    virtual const char* what() const { return ""; }
-
-    // for compiler generated call, never used
-    static void operator delete(void*) { }
-private:
-    // don't allow dynamic creation of exceptions
-    static void* operator new(size_t);
-};
-
-
-class named_exception : public exception {
-public:
-    enum { NAME_SIZE = 80 };
-
-    explicit named_exception(const char* str) 
-    {
-        strncpy(name_, str, NAME_SIZE);
-        name_[NAME_SIZE - 1] = 0;
-    }
-
-    virtual const char* what() const { return name_; }
-private:
-    char name_[NAME_SIZE];
-};
-
-
-class runtime_error : public named_exception {
-public:
-    explicit runtime_error(const char* str) : named_exception(str) {}
-};
-
-
-
-
-} // namespace mySTL
-
-#endif // mySTL_STDEXCEPT_HPP
diff --git a/extra/yassl/taocrypt/mySTL/vector.hpp b/extra/yassl/taocrypt/mySTL/vector.hpp
deleted file mode 100644
index f3702b751259..000000000000
--- a/extra/yassl/taocrypt/mySTL/vector.hpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* mySTL vector implements simple vector, w/ swap
- *
- */
-
-#ifndef mySTL_VECTOR_HPP
-#define mySTL_VECTOR_HPP
-
-#include "helpers.hpp"    // construct, destory, fill, etc.
-#include "algorithm.hpp"  // swap
-
-
-namespace mySTL {
-
-
-template <typename T>
-struct vector_base {
-    T* start_;
-    T* finish_;
-    T* end_of_storage_;
-
-    vector_base() : start_(0), finish_(0), end_of_storage_(0) {}
-    vector_base(size_t n)
-    {
-        start_ = GetArrayMemory<T>(n);
-        finish_ = start_;
-        end_of_storage_ = start_ + n;
-    }
-
-    ~vector_base() 
-    { 
-        FreeArrayMemory(start_);
-    }
-
-    void Swap(vector_base& that) 
-    {
-        swap(start_, that.start_);
-        swap(finish_, that.finish_);
-        swap(end_of_storage_, that.end_of_storage_);
-    }
-};
-
-
-
-template <typename T>
-class vector {
-public:
-    typedef T*       iterator;
-    typedef const T* const_iterator;
-
-    vector() {}
-    explicit vector(size_t n) : vec_(n) 
-    { 
-        vec_.finish_ = uninit_fill_n(vec_.start_, n, T()); 
-    }
-
-    ~vector() { destroy(vec_.start_, vec_.finish_); }
-
-    vector(const vector& other) : vec_(other.size())
-    {
-        vec_.finish_ = uninit_copy(other.vec_.start_, other.vec_.finish_,
-                                   vec_.start_);   
-    }
-
-    size_t capacity() const { return vec_.end_of_storage_ - vec_.start_; }
-
-    size_t size() const { return vec_.finish_ - vec_.start_; }
-
-    T&       operator[](size_t idx)       { return *(vec_.start_ + idx); }
-    const T& operator[](size_t idx) const { return *(vec_.start_ + idx); }
-
-    const T* begin() const { return vec_.start_; }
-    const T* end()   const { return vec_.finish_; }
-
-    void push_back(const T& v)
-    {
-        if (vec_.finish_ != vec_.end_of_storage_) {
-            construct(vec_.finish_, v);
-            ++vec_.finish_;
-        }
-        else {
-            vector tmp(size() * 2 + 1, *this);
-            construct(tmp.vec_.finish_, v);
-            ++tmp.vec_.finish_;
-            Swap(tmp);
-        }  
-    }
-
-    void resize(size_t n, const T& v)
-    {
-        if (n == size()) return;
-
-        if (n < size()) {
-            T* first = vec_.start_ + n;
-            destroy(first, vec_.finish_);
-            vec_.finish_ -= vec_.finish_ - first;
-        }
-        else {
-            vector tmp(n, *this);
-            tmp.vec_.finish_ = uninit_fill_n(tmp.vec_.finish_, n - size(), v);
-            Swap(tmp);
-        }
-    }
-
-    void reserve(size_t n)
-    {
-        if (capacity() < n) {
-            vector tmp(n, *this);
-            Swap(tmp);
-        }
-    }
-
-    void Swap(vector& that)
-    {
-        vec_.Swap(that.vec_);
-    }
-private:
-    vector_base<T> vec_;
-
-    vector& operator=(const vector&);   // hide assign
-
-    // for growing, n must be bigger than other size
-    vector(size_t n, const vector& other) : vec_(n)
-    {
-        if (n > other.size())
-            vec_.finish_ = uninit_copy(other.vec_.start_, other.vec_.finish_,
-                                       vec_.start_);
-    }
-};
-
-
-
-} // namespace mySTL
-
-#endif // mySTL_VECTOR_HPP
diff --git a/extra/yassl/taocrypt/src/aes.cpp b/extra/yassl/taocrypt/src/aes.cpp
deleted file mode 100644
index 3fcf80ac2020..000000000000
--- a/extra/yassl/taocrypt/src/aes.cpp
+++ /dev/null
@@ -1,1885 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* C++ based on Wei Dai's aes.cpp from CryptoPP */
-/* x86 asm original */
-
-#if defined(TAOCRYPT_KERNEL_MODE)
-    #define DO_TAOCRYPT_KERNEL_MODE
-#endif                                  // only some modules now support this
-
-#include "runtime.hpp"
-#include "aes.hpp"
-
-
-namespace TaoCrypt {
-
-
-#if defined(DO_AES_ASM)
-
-// ia32 optimized version
-void AES::Process(byte* out, const byte* in, word32 sz)
-{
-    if (!isMMX) {
-        Mode_BASE::Process(out, in, sz);
-        return;
-    }
-
-    word32 blocks = sz / BLOCK_SIZE;
-
-    if (mode_ == ECB)
-        while (blocks--) {
-            if (dir_ == ENCRYPTION)
-                AsmEncrypt(in, out, (void*)Te0);
-            else
-                AsmDecrypt(in, out, (void*)Td0);               
-            out += BLOCK_SIZE;
-            in  += BLOCK_SIZE;
-        }
-    else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION) {
-            while (blocks--) {
-                r_[0] ^= *(word32*)in;
-                r_[1] ^= *(word32*)(in +  4);
-                r_[2] ^= *(word32*)(in +  8);
-                r_[3] ^= *(word32*)(in + 12);
-
-                AsmEncrypt((byte*)r_, (byte*)r_, (void*)Te0);
-
-                memcpy(out, r_, BLOCK_SIZE);
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-        else {
-            while (blocks--) {
-                AsmDecrypt(in, out, (void*)Td0);
-                
-                *(word32*)out        ^= r_[0];
-                *(word32*)(out +  4) ^= r_[1];
-                *(word32*)(out +  8) ^= r_[2];
-                *(word32*)(out + 12) ^= r_[3];
-
-                memcpy(r_, in, BLOCK_SIZE);
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-    }
-}
-
-#endif // DO_AES_ASM
-
-
-void AES::SetKey(const byte* userKey, word32 keylen, CipherDir /*dummy*/)
-{
-    if (keylen <= 16)
-        keylen = 16;
-    else if (keylen >= 32)
-        keylen = 32;
-    else if (keylen != 24)
-        keylen = 24;
-    
-    rounds_ = keylen/4 + 6;
-
-    word32 temp, *rk = key_;
-    unsigned int i=0;
-
-    GetUserKey(BigEndianOrder, rk, keylen/4, userKey, keylen);
-
-    switch(keylen)
-    {
-    case 16:
-        while (true)
-        {
-            temp  = rk[3];
-            rk[4] = rk[0] ^
-                (Te2[GETBYTE(temp, 2)] & 0xff000000) ^
-                (Te3[GETBYTE(temp, 1)] & 0x00ff0000) ^
-                (Te0[GETBYTE(temp, 0)] & 0x0000ff00) ^
-                (Te1[GETBYTE(temp, 3)] & 0x000000ff) ^
-                rcon_[i];
-            rk[5] = rk[1] ^ rk[4];
-            rk[6] = rk[2] ^ rk[5];
-            rk[7] = rk[3] ^ rk[6];
-            if (++i == 10)
-                break;
-            rk += 4;
-        }
-        break;
-
-    case 24:
-        while (true)    // for (;;) here triggers a bug in VC60 SP4 w/ Pro Pack
-        {
-            temp = rk[ 5];
-            rk[ 6] = rk[ 0] ^
-                (Te2[GETBYTE(temp, 2)] & 0xff000000) ^
-                (Te3[GETBYTE(temp, 1)] & 0x00ff0000) ^
-                (Te0[GETBYTE(temp, 0)] & 0x0000ff00) ^
-                (Te1[GETBYTE(temp, 3)] & 0x000000ff) ^
-                rcon_[i];
-            rk[ 7] = rk[ 1] ^ rk[ 6];
-            rk[ 8] = rk[ 2] ^ rk[ 7];
-            rk[ 9] = rk[ 3] ^ rk[ 8];
-            if (++i == 8)
-                break;
-            rk[10] = rk[ 4] ^ rk[ 9];
-            rk[11] = rk[ 5] ^ rk[10];
-            rk += 6;
-        }
-        break;
-
-    case 32:
-        while (true)
-        {
-            temp = rk[ 7];
-            rk[ 8] = rk[ 0] ^
-                (Te2[GETBYTE(temp, 2)] & 0xff000000) ^
-                (Te3[GETBYTE(temp, 1)] & 0x00ff0000) ^
-                (Te0[GETBYTE(temp, 0)] & 0x0000ff00) ^
-                (Te1[GETBYTE(temp, 3)] & 0x000000ff) ^
-                rcon_[i];
-            rk[ 9] = rk[ 1] ^ rk[ 8];
-            rk[10] = rk[ 2] ^ rk[ 9];
-            rk[11] = rk[ 3] ^ rk[10];
-            if (++i == 7)
-                break;
-            temp = rk[11];
-            rk[12] = rk[ 4] ^
-                (Te2[GETBYTE(temp, 3)] & 0xff000000) ^
-                (Te3[GETBYTE(temp, 2)] & 0x00ff0000) ^
-                (Te0[GETBYTE(temp, 1)] & 0x0000ff00) ^
-                (Te1[GETBYTE(temp, 0)] & 0x000000ff);
-            rk[13] = rk[ 5] ^ rk[12];
-            rk[14] = rk[ 6] ^ rk[13];
-            rk[15] = rk[ 7] ^ rk[14];
-
-            rk += 8;
-        }
-        break;
-    }
-
-    if (dir_ == DECRYPTION)
-    {
-        unsigned int i, j;
-        rk = key_;
-
-        /* invert the order of the round keys: */
-        for (i = 0, j = 4*rounds_; i < j; i += 4, j -= 4) {
-            temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-            temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-            temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-            temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-        }
-        // apply the inverse MixColumn transform to all round keys but the
-        // first and the last:
-        for (i = 1; i < rounds_; i++) {
-            rk += 4;
-            rk[0] =
-                Td0[Te1[GETBYTE(rk[0], 3)] & 0xff] ^
-                Td1[Te1[GETBYTE(rk[0], 2)] & 0xff] ^
-                Td2[Te1[GETBYTE(rk[0], 1)] & 0xff] ^
-                Td3[Te1[GETBYTE(rk[0], 0)] & 0xff];
-            rk[1] =
-                Td0[Te1[GETBYTE(rk[1], 3)] & 0xff] ^
-                Td1[Te1[GETBYTE(rk[1], 2)] & 0xff] ^
-                Td2[Te1[GETBYTE(rk[1], 1)] & 0xff] ^
-                Td3[Te1[GETBYTE(rk[1], 0)] & 0xff];
-            rk[2] =
-                Td0[Te1[GETBYTE(rk[2], 3)] & 0xff] ^
-                Td1[Te1[GETBYTE(rk[2], 2)] & 0xff] ^
-                Td2[Te1[GETBYTE(rk[2], 1)] & 0xff] ^
-                Td3[Te1[GETBYTE(rk[2], 0)] & 0xff];
-            rk[3] =
-                Td0[Te1[GETBYTE(rk[3], 3)] & 0xff] ^
-                Td1[Te1[GETBYTE(rk[3], 2)] & 0xff] ^
-                Td2[Te1[GETBYTE(rk[3], 1)] & 0xff] ^
-                Td3[Te1[GETBYTE(rk[3], 0)] & 0xff];
-        }
-    }
-}
-
-
-void AES::ProcessAndXorBlock(const byte* in, const byte* xOr, byte* out) const
-{
-    if (dir_ == ENCRYPTION)
-        encrypt(in, xOr, out);
-    else
-        decrypt(in, xOr, out);
-}
-
-
-typedef BlockGetAndPut<word32, BigEndian> gpBlock;
-
-	
-void AES::encrypt(const byte* inBlock, const byte* xorBlock,
-                  byte* outBlock) const
-{
-    word32 s0, s1, s2, s3;
-    word32 t0, t1, t2, t3;
-
-    const word32 *rk = key_;
-    /*
-     * map byte array block to cipher state
-     * and add initial round key:
-     */
-    gpBlock::Get(inBlock)(s0)(s1)(s2)(s3);
-    s0 ^= rk[0];
-    s1 ^= rk[1];
-    s2 ^= rk[2];
-    s3 ^= rk[3];
-   
-    s0 |= PreFetchTe();
-    /*
-     * Nr - 1 full rounds:
-     */
-
-    unsigned int r = rounds_ >> 1;
-    for (;;) {
-        t0 =
-            Te0[GETBYTE(s0, 3)] ^
-            Te1[GETBYTE(s1, 2)]  ^
-            Te2[GETBYTE(s2, 1)]  ^
-            Te3[GETBYTE(s3, 0)]  ^
-            rk[4];
-        t1 =
-            Te0[GETBYTE(s1, 3)] ^
-            Te1[GETBYTE(s2, 2)]  ^
-            Te2[GETBYTE(s3, 1)]  ^
-            Te3[GETBYTE(s0, 0)]  ^
-            rk[5];
-        t2 =
-            Te0[GETBYTE(s2, 3)] ^
-            Te1[GETBYTE(s3, 2)]  ^
-            Te2[GETBYTE(s0, 1)]  ^
-            Te3[GETBYTE(s1, 0)]  ^
-            rk[6];
-        t3 =
-            Te0[GETBYTE(s3, 3)] ^
-            Te1[GETBYTE(s0, 2)]  ^
-            Te2[GETBYTE(s1, 1)]  ^
-            Te3[GETBYTE(s2, 0)]  ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-        
-        s0 =
-            Te0[GETBYTE(t0, 3)] ^
-            Te1[GETBYTE(t1, 2)] ^
-            Te2[GETBYTE(t2, 1)] ^
-            Te3[GETBYTE(t3, 0)] ^
-            rk[0];
-        s1 =
-            Te0[GETBYTE(t1, 3)] ^
-            Te1[GETBYTE(t2, 2)] ^
-            Te2[GETBYTE(t3, 1)] ^
-            Te3[GETBYTE(t0, 0)] ^
-            rk[1];
-        s2 =
-            Te0[GETBYTE(t2, 3)] ^
-            Te1[GETBYTE(t3, 2)] ^
-            Te2[GETBYTE(t0, 1)] ^
-            Te3[GETBYTE(t1, 0)] ^
-            rk[2];
-        s3 =
-            Te0[GETBYTE(t3, 3)] ^
-            Te1[GETBYTE(t0, 2)] ^
-            Te2[GETBYTE(t1, 1)] ^
-            Te3[GETBYTE(t2, 0)] ^
-            rk[3];
-    }
-
-    /*
-     * apply last round and
-     * map cipher state to byte array block:
-     */
-
-    s0 =
-        (Te2[GETBYTE(t0, 3)] & 0xff000000) ^
-        (Te3[GETBYTE(t1, 2)] & 0x00ff0000) ^
-        (Te0[GETBYTE(t2, 1)] & 0x0000ff00) ^
-        (Te1[GETBYTE(t3, 0)] & 0x000000ff) ^
-        rk[0];
-    s1 =
-        (Te2[GETBYTE(t1, 3)] & 0xff000000) ^
-        (Te3[GETBYTE(t2, 2)] & 0x00ff0000) ^
-        (Te0[GETBYTE(t3, 1)] & 0x0000ff00) ^
-        (Te1[GETBYTE(t0, 0)] & 0x000000ff) ^
-        rk[1];
-    s2 =
-        (Te2[GETBYTE(t2, 3)] & 0xff000000) ^
-        (Te3[GETBYTE(t3, 2)] & 0x00ff0000) ^
-        (Te0[GETBYTE(t0, 1)] & 0x0000ff00) ^
-        (Te1[GETBYTE(t1, 0)] & 0x000000ff) ^
-        rk[2];
-    s3 =
-        (Te2[GETBYTE(t3, 3)] & 0xff000000) ^
-        (Te3[GETBYTE(t0, 2)] & 0x00ff0000) ^
-        (Te0[GETBYTE(t1, 1)] & 0x0000ff00) ^
-        (Te1[GETBYTE(t2, 0)] & 0x000000ff) ^
-        rk[3];
-
-
-    gpBlock::Put(xorBlock, outBlock)(s0)(s1)(s2)(s3);
-}
-
-
-void AES::decrypt(const byte* inBlock, const byte* xorBlock,
-                  byte* outBlock) const
-{
-    word32 s0, s1, s2, s3;
-    word32 t0, t1, t2, t3;
-    const word32* rk = key_;
-
-    /*
-     * map byte array block to cipher state
-     * and add initial round key:
-     */
-    gpBlock::Get(inBlock)(s0)(s1)(s2)(s3);
-    s0 ^= rk[0];
-    s1 ^= rk[1];
-    s2 ^= rk[2];
-    s3 ^= rk[3];
-
-    s0 |= PreFetchTd();
-
-    /*
-     * Nr - 1 full rounds:
-     */
-
-    unsigned int r = rounds_ >> 1;
-    for (;;) {
-        t0 =
-            Td0[GETBYTE(s0, 3)] ^
-            Td1[GETBYTE(s3, 2)] ^
-            Td2[GETBYTE(s2, 1)] ^
-            Td3[GETBYTE(s1, 0)] ^
-            rk[4];
-        t1 =
-            Td0[GETBYTE(s1, 3)] ^
-            Td1[GETBYTE(s0, 2)] ^
-            Td2[GETBYTE(s3, 1)] ^
-            Td3[GETBYTE(s2, 0)] ^
-            rk[5];
-        t2 =
-            Td0[GETBYTE(s2, 3)] ^
-            Td1[GETBYTE(s1, 2)] ^
-            Td2[GETBYTE(s0, 1)] ^
-            Td3[GETBYTE(s3, 0)] ^
-            rk[6];
-        t3 =
-            Td0[GETBYTE(s3, 3)] ^
-            Td1[GETBYTE(s2, 2)] ^
-            Td2[GETBYTE(s1, 1)] ^
-            Td3[GETBYTE(s0, 0)] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Td0[GETBYTE(t0, 3)] ^
-            Td1[GETBYTE(t3, 2)] ^
-            Td2[GETBYTE(t2, 1)] ^
-            Td3[GETBYTE(t1, 0)] ^
-            rk[0];
-        s1 =
-            Td0[GETBYTE(t1, 3)] ^
-            Td1[GETBYTE(t0, 2)] ^
-            Td2[GETBYTE(t3, 1)] ^
-            Td3[GETBYTE(t2, 0)] ^
-            rk[1];
-        s2 =
-            Td0[GETBYTE(t2, 3)] ^
-            Td1[GETBYTE(t1, 2)] ^
-            Td2[GETBYTE(t0, 1)] ^
-            Td3[GETBYTE(t3, 0)] ^
-            rk[2];
-        s3 =
-            Td0[GETBYTE(t3, 3)] ^
-            Td1[GETBYTE(t2, 2)] ^
-            Td2[GETBYTE(t1, 1)] ^
-            Td3[GETBYTE(t0, 0)] ^
-            rk[3];
-    }
-    /*
-     * apply last round and
-     * map cipher state to byte array block:
-     */
-
-    t0 |= PreFetchCTd4();
-
-    s0 =
-        ((word32)CTd4[GETBYTE(t0, 3)] << 24) ^
-        ((word32)CTd4[GETBYTE(t3, 2)] << 16) ^
-        ((word32)CTd4[GETBYTE(t2, 1)] <<  8) ^
-        ((word32)CTd4[GETBYTE(t1, 0)]) ^
-        rk[0];
-    s1 =
-        ((word32)CTd4[GETBYTE(t1, 3)]  << 24) ^
-        ((word32)CTd4[GETBYTE(t0, 2)]  << 16) ^
-        ((word32)CTd4[GETBYTE(t3, 1)]  <<  8) ^
-        ((word32)CTd4[GETBYTE(t2, 0)]) ^
-        rk[1];
-    s2 =
-        ((word32)CTd4[GETBYTE(t2, 3)] << 24  ) ^
-        ((word32)CTd4[GETBYTE(t1, 2)] << 16 ) ^
-        ((word32)CTd4[GETBYTE(t0, 1)] <<  8 ) ^
-        ((word32)CTd4[GETBYTE(t3, 0)]) ^
-        rk[2];
-    s3 =
-        ((word32)CTd4[GETBYTE(t3, 3)] << 24) ^
-        ((word32)CTd4[GETBYTE(t2, 2)] << 16) ^
-        ((word32)CTd4[GETBYTE(t1, 1)] <<  8) ^
-        ((word32)CTd4[GETBYTE(t0, 0)]) ^
-        rk[3];
-
-    gpBlock::Put(xorBlock, outBlock)(s0)(s1)(s2)(s3);
-}
-
-
-#if defined(DO_AES_ASM)
-    #ifdef __GNUC__
-        #define AS1(x)    #x ";"
-        #define AS2(x, y) #x ", " #y ";"
-
-        #define PROLOG()  \
-        __asm__ __volatile__ \
-        ( \
-            ".intel_syntax noprefix;" \
-            "push ebx;" \
-            "push ebp;" \
-            "movd mm7, ebp;" \
-            "movd mm4, eax;" \
-            "mov  ebp, edx;"  \
-            "sub  esp, 4;" 
-        #define EPILOG()  \
-            "add esp, 4;" \
-            "pop ebp;" \
-            "pop ebx;" \
-       	    "emms;" \
-       	    ".att_syntax;" \
-                : \
-                : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
-                : "%edi", "memory", "cc" \
-        );
-
-    #else
-        #define AS1(x)    __asm x
-        #define AS2(x, y) __asm x, y
-
-        #define PROLOG() \
-            AS1(    push  ebp                           )   \
-            AS2(    mov   ebp, esp                      )   \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    sub   esp, 4                        )   \
-            AS2(    movd  mm7, ebp                      )   \
-            AS2(    mov   [ebp - 4], esi                )   \
-            AS2(    mov   esi, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   ebp, DWORD PTR [ebp + 16]     )
-
-        // ebp is restored at end
-        #define EPILOG()  \
-            AS2(    mov   esi, [ebp - 4]                )   \
-            AS2(    movd  ebx, mm4                      )   \
-            AS2(    movd  edi, mm3                      )   \
-            AS2(    mov   esp, ebp                      )   \
-            AS1(    pop   ebp                           )   \
-            AS1(    emms                                )   \
-            AS1(    ret   12                            )
-            
-            
-    #endif
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void AES::AsmEncrypt(const byte* inBlock, byte* outBlock, void* boxes) const
-{
-
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    mov   edx, DWORD PTR [ecx + 60]     )   // rounds
-        AS2(    lea   edi, [ecx + 64]               )   // rk
-    #else
-        AS2(    mov   edx, DWORD PTR [ecx + 56]     )   // rounds
-        AS2(    lea   edi, [ecx + 60]               )   // rk
-    #endif
-
-    AS1(    dec   edx                           )
-    AS2(    movd  mm6, edi                      )   // save rk
-    AS2(    movd  mm5, edx                      )   // save rounds
-  
-    AS2(    mov   eax, DWORD PTR [esi]                                  )
-    AS2(    mov   ebx, DWORD PTR [esi + 4]                              )
-    AS2(    mov   ecx, DWORD PTR [esi + 8]                              )
-    AS2(    mov   edx, DWORD PTR [esi + 12]                             )
-
-    AS1(    bswap eax                                                   )
-    AS1(    bswap ebx                                                   )
-    AS1(    bswap ecx                                                   )
-    AS1(    bswap edx                                                   )
-
-    AS2(    xor   eax, DWORD PTR [edi]               )   // s0
-    AS2(    xor   ebx, DWORD PTR [edi +  4]          )   // s1
-    AS2(    xor   ecx, DWORD PTR [edi +  8]          )   // s2
-    AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
-
-#ifdef _MSC_VER
-    AS1( loop1: )  // loop1
-#else
-    AS1(1:  )      // loop1
-#endif
-            /* Put0 (mm0) =  
-                Te0[get0,rs 24] ^
-                Te1[get1,rs 16] ^
-                Te2[get2,rs  8] ^
-                Te3[get3,rs  0]
-            */
-       
-    AS2(    mov   esi, eax                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-                                                    
-    AS2(    mov   edi, ebx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, ch                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, dl                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm0, esi                                              )
-
-             /* Put1 (mm1) =  
-                Te0[get1,rs 24] ^
-                Te1[get2,rs 16] ^
-                Te2[get3,rs  8] ^
-                Te3[get0,rs  0]
-            */
-
-    AS2(    mov   esi, ebx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-
-    AS2(    mov   edi, ecx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, dh                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, al                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm1, esi                                              )
-
-
-             /* Put2 (mm2) =  
-                Te0[get2,rs 24] ^
-                Te1[get3,rs 16] ^
-                Te2[get0,rs  8] ^
-                Te3[get1,rs  0] 
-            */
-
-    AS2(    mov   esi, ecx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-
-    AS2(    mov   edi, edx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, ah                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, bl                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm2, esi                                              )
-
-             /* Put3 (edx) =  
-                Te0[get3,rs 24] ^
-                Te1[get0,rs 16] ^
-                Te2[get1,rs  8] ^
-                Te3[get2,rs  0] 
-            */
-
-    AS2(    mov   esi, edx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   edx, DWORD PTR [ebp + esi*4]                          )
-
-    AS2(    mov   edi, eax                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   edx, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx esi, bh                                               )
-    AS2(    xor   edx, DWORD PTR [ebp + 2048 + esi*4]                   )
-
-    AS2(    movzx edi, cl                                               )
-    AS2(    xor   edx, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-            // xOr
-
-    AS2(    movd   esi, mm6                      )   //  rk
-
-    AS2(    movd   eax, mm0                                             )
-    AS2(    add    esi, 16                                              )
-    AS2(    movd   ebx, mm1                                             )
-    AS2(    movd   mm6, esi                      )   //  save back
-    AS2(    movd   ecx, mm2                                             )
-
-    AS2(    xor   eax, DWORD PTR [esi]                                  )
-    AS2(    xor   ebx, DWORD PTR [esi +  4]                             )
-    AS2(    movd  edi, mm5                                              )
-    AS2(    xor   ecx, DWORD PTR [esi +  8]                             )
-    AS2(    xor   edx, DWORD PTR [esi + 12]                             )
-
-    AS1(    dec   edi                                                   )
-    AS2(    movd  mm5, edi                                              )
-
-#ifdef _MSC_VER
-    AS1(    jnz   loop1)  // loop1
-#else
-    AS1(    jnz   1b )    // loop1
-#endif
-
-            // last round
-            /*
-            Put0 (mm0) =
-                (Te4[get0, rs24] & 0xff000000) ^  h = 4278190080
-                (Te4[get1, rs16] & 0x00ff0000) ^  h =   16711680
-                (Te4[get2, rs 8] & 0x0000ff00) ^  h =      65280
-                (Te4[get3, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, eax                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, ebx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, ch                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, dl                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm0, esi                                              )
-
-            /*
-            Put1 (mm1) =
-                (Te4[get1, rs24] & 0xff000000) ^  h = 4278190080
-                (Te4[get2, rs16] & 0x00ff0000) ^  h =   16711680
-                (Te4[get3, rs 8] & 0x0000ff00) ^  h =      65280
-                (Te4[get0, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, ebx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, ecx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, dh                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, al                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm1, esi                                              )
-
-            /*
-            Put2 (mm2) =
-                (Te4[get2, rs24] & 0xff000000) ^  h = 4278190080
-                (Te4[get3, rs16] & 0x00ff0000) ^  h =   16711680
-                (Te4[get0, rs 8] & 0x0000ff00) ^  h =      65280
-                (Te4[get1, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, ecx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, edx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, ah                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, bl                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm2, esi                                              )
-
-            /*
-            Put3 (edx) =
-                (Te4[get3, rs24] & 0xff000000) ^  h = 4278190080
-                (Te4[get0, rs16] & 0x00ff0000) ^  h =   16711680
-                (Te4[get1, rs 8] & 0x0000ff00) ^  h =      65280
-                (Te4[get2, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, edx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   edx, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   edx, 4278190080                                       )
-
-    AS2(    mov   edi, eax                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   esi, 16711680                                         )
-    AS2(    xor   edx, esi                                              )
-
-    AS2(    movzx esi, bh                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   edx, edi                                              )
-
-    AS2(    movzx edi, cl                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   esi, 255                                              )
-    AS2(    xor   edx, esi                                              )
-
-    
-            // xOr
-    AS2(    movd   eax, mm0                                             )
-    AS2(    movd   esi, mm6                      )   //  rk
-    AS2(    movd   ebx, mm1                                             )
-    AS2(    add    esi, 16                                               )
-    AS2(    movd   ecx, mm2                                             )
-
-    AS2(    xor   eax, DWORD PTR [esi]                                  )
-    AS2(    xor   ebx, DWORD PTR [esi +  4]                             )
-    AS2(    xor   ecx, DWORD PTR [esi +  8]                             )
-    AS2(    xor   edx, DWORD PTR [esi + 12]                             )
-
-    // end
-    AS2(    movd  ebp, mm7                                              )
-
-            // swap
-    AS1(    bswap eax                                                   )
-    AS1(    bswap ebx                                                   )
-
-            // store
-    #ifdef __GNUC__
-        AS2(    movd esi, mm4                       )   //  outBlock
-    #else
-        AS2(    mov  esi, DWORD PTR [ebp + 12]      )   //  outBlock
-    #endif
-
-    AS1(    bswap ecx                                                   )
-    AS1(    bswap edx                                                   )
-
-    AS2(    mov DWORD PTR [esi],      eax                               )
-    AS2(    mov DWORD PTR [esi +  4], ebx                               )
-    AS2(    mov DWORD PTR [esi +  8], ecx                               )
-    AS2(    mov DWORD PTR [esi + 12], edx                               )
-
-
-    EPILOG()
-}
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
-{
-
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    mov   edx, DWORD PTR [ecx + 60]     )   // rounds
-        AS2(    lea   edi, [ecx + 64]               )   // rk 
-    #else
-        AS2(    mov   edx, DWORD PTR [ecx + 56]     )   // rounds
-        AS2(    lea   edi, [ecx + 60]               )   // rk 
-    #endif
-   
-    AS1(    dec   edx                           )
-    AS2(    movd  mm6, edi                      )   // save rk
-    AS2(    movd  mm5, edx                      )   // save rounds
-
-    AS2(    mov   eax, DWORD PTR [esi]                                  )
-    AS2(    mov   ebx, DWORD PTR [esi + 4]                              )
-    AS2(    mov   ecx, DWORD PTR [esi + 8]                              )
-    AS2(    mov   edx, DWORD PTR [esi + 12]                             )
-
-    AS1(    bswap eax                                                   )
-    AS1(    bswap ebx                                                   )
-    AS1(    bswap ecx                                                   )
-    AS1(    bswap edx                                                   )
-
-    AS2(    xor   eax, DWORD PTR [edi]               )   // s0
-    AS2(    xor   ebx, DWORD PTR [edi +  4]          )   // s1
-    AS2(    xor   ecx, DWORD PTR [edi +  8]          )   // s2
-    AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
-
-
-#ifdef _MSC_VER
-    AS1( loop2: )  // loop2
-#else
-    AS1(2:  )      // loop2
-#endif
-       /*   Put0 (mm0) =
-            Td0[GETBYTE(get0, rs24)] ^
-            Td1[GETBYTE(get3, rs16)] ^
-            Td2[GETBYTE(get2, rs 8)] ^
-            Td3[GETBYTE(tet1,     )]  
-        */
-    AS2(    mov   esi, eax                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-                                                    
-    AS2(    mov   edi, edx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, ch                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, bl                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm0, esi                                              )
-
-      /*    Put1 (mm1) =
-            Td0[GETBYTE(get1, rs24)] ^
-            Td1[GETBYTE(get0, rs16)] ^
-            Td2[GETBYTE(get3, rs 8)] ^
-            Td3[GETBYTE(tet2,     )]  
-        */
-    AS2(    mov   esi, ebx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-                                                    
-    AS2(    mov   edi, eax                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, dh                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, cl                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm1, esi                                              )
-
-      /*    Put2 (mm2) =
-            Td0[GETBYTE(get2, rs24)] ^
-            Td1[GETBYTE(get1, rs16)] ^
-            Td2[GETBYTE(get0, rs 8)] ^
-            Td3[GETBYTE(tet3,     )]  
-      */
-    AS2(    mov   esi, ecx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + esi*4]                          )
-                                                    
-    AS2(    mov   edi, ebx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx edi, ah                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 2048 + edi*4]                   )
-
-    AS2(    movzx edi, dl                                               )
-    AS2(    xor   esi, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-    AS2(    movd  mm2, esi                                              )
-
-      /*    Put3 (edx) =
-            Td0[GETBYTE(get3, rs24)] ^
-            Td1[GETBYTE(get2, rs16)] ^
-            Td2[GETBYTE(get1, rs 8)] ^
-            Td3[GETBYTE(tet0,     )]  
-      */
-    AS2(    mov   esi, edx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   edx, DWORD PTR [ebp + esi*4]                          )
-                                                    
-    AS2(    mov   edi, ecx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   edx, DWORD PTR [ebp + 1024 + edi*4]                   )
-
-    AS2(    movzx esi, bh                                               )
-    AS2(    xor   edx, DWORD PTR [ebp + 2048 + esi*4]                   )
-
-    AS2(    movzx edi, al                                               )
-    AS2(    xor   edx, DWORD PTR [ebp + 3072 + edi*4]                   )
-
-
-            // xOr
-
-    AS2(    movd  esi, mm6                      )   //  rk
-    AS2(    add   esi, 16                                               )
-    AS2(    movd  mm6, esi                      )   //  save back
-
-    AS2(    movd  eax, mm0                                              )
-    AS2(    movd  ebx, mm1                                              )
-    AS2(    movd  ecx, mm2                                              )
-
-    AS2(    xor   eax, DWORD PTR [esi]                                  )
-    AS2(    xor   ebx, DWORD PTR [esi +  4]                             )
-    AS2(    xor   ecx, DWORD PTR [esi +  8]                             )
-    AS2(    xor   edx, DWORD PTR [esi + 12]                             )
-
-    AS2(    movd  edi, mm5                                              )
-    AS1(    dec   edi                                                   )
-    AS2(    movd  mm5, edi                                              )
-
-#ifdef _MSC_VER
-    AS1(    jnz   loop2)  // loop2
-#else
-    AS1(    jnz   2b )    // loop2
-#endif
-
-            // last round
-            /*
-            Put0 (mm0) =
-                (Td4[get0, rs24] & 0xff000000) ^  h = 4278190080
-                (Td4[get3, rs16] & 0x00ff0000) ^  h =   16711680
-                (Td4[get2, rs 8] & 0x0000ff00) ^  h =      65280
-                (Td4[get1, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, eax                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, edx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, ch                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, bl                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm0, esi                                              )
-
-            /*
-            Put1 (mm1) =
-                (Td4[get1, rs24] & 0xff000000) ^  h = 4278190080
-                (Td4[get0, rs16] & 0x00ff0000) ^  h =   16711680
-                (Td4[get3, rs 8] & 0x0000ff00) ^  h =      65280
-                (Td4[get2, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, ebx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, eax                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, dh                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, cl                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm1, esi                                              )
-
-            /*
-            Put2 (mm2) =
-                (Td4[get2, rs24] & 0xff000000) ^  h = 4278190080
-                (Td4[get1, rs16] & 0x00ff0000) ^  h =   16711680
-                (Td4[get0, rs 8] & 0x0000ff00) ^  h =      65280
-                (Td4[get3, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, ecx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   esi, 4278190080                                       )
-
-    AS2(    mov   edi, ebx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 16711680                                         )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, ah                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movzx edi, dl                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   edi, 255                                              )
-    AS2(    xor   esi, edi                                              )
-
-    AS2(    movd  mm2, esi                                              )
-
-            /*
-            Put3 (edx) =
-                (Td4[get3, rs24] & 0xff000000) ^  h = 4278190080
-                (Td4[get2, rs16] & 0x00ff0000) ^  h =   16711680
-                (Td4[get1, rs 8] & 0x0000ff00) ^  h =      65280
-                (Td4[get0, rs 0] & 0x000000ff)    h =        255
-            */
-    AS2(    mov   esi, edx                                              )
-    AS2(    shr   esi, 24                                               )
-    AS2(    mov   edx, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   edx, 4278190080                                       )
-
-    AS2(    mov   edi, ecx                                              )
-    AS2(    shr   edi, 16                                               )
-    AS2(    and   edi, 255                                              )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   esi, 16711680                                         )
-    AS2(    xor   edx, esi                                              )
-
-    AS2(    movzx esi, bh                                               )
-    AS2(    mov   edi, DWORD PTR [ebp + 4096 + esi*4]                   )
-    AS2(    and   edi, 65280                                            )
-    AS2(    xor   edx, edi                                              )
-
-    AS2(    movzx edi, al                                               )
-    AS2(    mov   esi, DWORD PTR [ebp + 4096 + edi*4]                   )
-    AS2(    and   esi, 255                                              )
-    AS2(    xor   edx, esi                                              )
-
-
-            // xOr
-    AS2(    movd  esi, mm6                      )   //  rk
-    AS2(    add   esi, 16                                               )
-
-    AS2(    movd   eax, mm0                                             )
-    AS2(    movd   ebx, mm1                                             )
-    AS2(    movd   ecx, mm2                                             )
-
-    AS2(    xor   eax, DWORD PTR [esi]                                  )
-    AS2(    xor   ebx, DWORD PTR [esi +  4]                             )
-    AS2(    xor   ecx, DWORD PTR [esi +  8]                             )
-    AS2(    xor   edx, DWORD PTR [esi + 12]                             )
-
-    // end
-    AS2(    movd  ebp, mm7                                              )
-
-            // swap
-    AS1(    bswap eax                                                   )
-    AS1(    bswap ebx                                                   )
-    AS1(    bswap ecx                                                   )
-    AS1(    bswap edx                                                   )
-
-            // store
-    #ifdef __GNUC__
-        AS2(    movd esi, mm4                        )   //  outBlock
-    #else
-        AS2(    mov esi,  DWORD PTR [ebp + 12]       )   //  outBlock
-    #endif
-    AS2(    mov DWORD PTR [esi],      eax                               )
-    AS2(    mov DWORD PTR [esi +  4], ebx                               )
-    AS2(    mov DWORD PTR [esi +  8], ecx                               )
-    AS2(    mov DWORD PTR [esi + 12], edx                               )
-
-
-    EPILOG()
-}
-
-
-
-#endif // defined(DO_AES_ASM)
-
-
-
-const word32 AES::Te[5][256] = {
-{
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-},
-{
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-},
-{
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-},
-{
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-},
-{
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-}
-};
-
-
-const word32 AES::Td[5][256] = {
-{
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-},
-{
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-},
-{
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-},
-{
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-},
-{
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-}
-};
-
-const byte AES::CTd4[256] =
-{
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
-};
-
-
-const word32* AES::Te0 = AES::Te[0];
-const word32* AES::Te1 = AES::Te[1];
-const word32* AES::Te2 = AES::Te[2];
-const word32* AES::Te3 = AES::Te[3];
-
-const word32* AES::Td0 = AES::Td[0];
-const word32* AES::Td1 = AES::Td[1];
-const word32* AES::Td2 = AES::Td[2];
-const word32* AES::Td3 = AES::Td[3];
-
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/aestables.cpp b/extra/yassl/taocrypt/src/aestables.cpp
deleted file mode 100644
index 60795a549e48..000000000000
--- a/extra/yassl/taocrypt/src/aestables.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's aestables.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "aes.hpp"
-
-
-namespace TaoCrypt {
-
-
-const word32 AES::rcon_[] = {
-    0x01000000, 0x02000000, 0x04000000, 0x08000000,
-    0x10000000, 0x20000000, 0x40000000, 0x80000000,
-    0x1B000000, 0x36000000, 
-    /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/algebra.cpp b/extra/yassl/taocrypt/src/algebra.cpp
deleted file mode 100644
index ace17047a7ab..000000000000
--- a/extra/yassl/taocrypt/src/algebra.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
-
-/* based on Wei Dai's algebra.cpp from CryptoPP */
-#undef  NDEBUG
-#define DEBUG   // GCC 4.0 bug if NDEBUG and Optimize > 1
-
-#include "runtime.hpp"
-#include "algebra.hpp"
-#ifdef USE_SYS_STL
-    #include <vector>
-#else
-    #include "vector.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-namespace TaoCrypt {
-
-
-const Integer& AbstractGroup::Double(const Element &a) const
-{
-    return Add(a, a);
-}
-
-const Integer& AbstractGroup::Subtract(const Element &a, const Element &b) const
-{
-    // make copy of a in case Inverse() overwrites it
-    Element a1(a);
-    return Add(a1, Inverse(b));
-}
-
-Integer& AbstractGroup::Accumulate(Element &a, const Element &b) const
-{
-    return a = Add(a, b);
-}
-
-Integer& AbstractGroup::Reduce(Element &a, const Element &b) const
-{
-    return a = Subtract(a, b);
-}
-
-const Integer& AbstractRing::Square(const Element &a) const
-{
-    return Multiply(a, a);
-}
-
-
-const Integer& AbstractRing::Divide(const Element &a, const Element &b) const
-{
-    // make copy of a in case MultiplicativeInverse() overwrites it
-    Element a1(a);
-    return Multiply(a1, MultiplicativeInverse(b));
-}
-
-
-const Integer& AbstractEuclideanDomain::Mod(const Element &a,
-                                            const Element &b) const
-{
-    Element q;
-    DivisionAlgorithm(result, q, a, b);
-    return result;
-}
-
-const Integer& AbstractEuclideanDomain::Gcd(const Element &a,
-                                            const Element &b) const
-{
-    STL::vector<Element> g(3);
-    g[0]= b;
-    g[1]= a;
-    unsigned int i0=0, i1=1, i2=2;
-
-    while (!Equal(g[i1], this->Identity()))
-    {
-        g[i2] = Mod(g[i0], g[i1]);
-        unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-    }
-
-    return result = g[i0];
-}
-
-
-Integer AbstractGroup::ScalarMultiply(const Element &base,
-                                      const Integer &exponent) const
-{
-    Element result;
-    SimultaneousMultiply(&result, base, &exponent, 1);
-    return result;
-}
-
-
-Integer AbstractGroup::CascadeScalarMultiply(const Element &x,
-                  const Integer &e1, const Element &y, const Integer &e2) const
-{
-    const unsigned expLen = max(e1.BitCount(), e2.BitCount());
-    if (expLen==0)
-        return Identity();
-
-    const unsigned w = (expLen <= 46 ? 1 : (expLen <= 260 ? 2 : 3));
-    const unsigned tableSize = 1<<w;
-    STL::vector<Element> powerTable(tableSize << w);
-
-    powerTable[1] = x;
-    powerTable[tableSize] = y;
-    if (w==1)
-        powerTable[3] = Add(x,y);
-    else
-    {
-        powerTable[2] = Double(x);
-        powerTable[2*tableSize] = Double(y);
-
-        unsigned i, j;
-
-        for (i=3; i<tableSize; i+=2)
-            powerTable[i] = Add(powerTable[i-2], powerTable[2]);
-        for (i=1; i<tableSize; i+=2)
-            for (j=i+tableSize; j<(tableSize<<w); j+=tableSize)
-                powerTable[j] = Add(powerTable[j-tableSize], y);
-
-        for (i=3*tableSize; i<(tableSize<<w); i+=2*tableSize)
-            powerTable[i] = Add(powerTable[i-2*tableSize],
-            powerTable[2*tableSize]);
-        for (i=tableSize; i<(tableSize<<w); i+=2*tableSize)
-            for (j=i+2; j<i+tableSize; j+=2)
-                powerTable[j] = Add(powerTable[j-1], x);
-    }
-
-    Element result;
-    unsigned power1 = 0, power2 = 0, prevPosition = expLen-1;
-    bool firstTime = true;
-
-    for (int i = expLen-1; i>=0; i--)
-    {
-        power1 = 2*power1 + e1.GetBit(i);
-        power2 = 2*power2 + e2.GetBit(i);
-
-        if (i==0 || 2*power1 >= tableSize || 2*power2 >= tableSize)
-        {
-            unsigned squaresBefore = prevPosition-i;
-            unsigned squaresAfter = 0;
-            prevPosition = i;
-            while ((power1 || power2) && power1%2 == 0 && power2%2==0)
-            {
-                power1 /= 2;
-                power2 /= 2;
-                squaresBefore--;
-                squaresAfter++;
-            }
-            if (firstTime)
-            {
-                result = powerTable[(power2<<w) + power1];
-                firstTime = false;
-            }
-            else
-            {
-                while (squaresBefore--)
-                result = Double(result);
-                if (power1 || power2)
-                    Accumulate(result, powerTable[(power2<<w) + power1]);
-            }
-            while (squaresAfter--)
-                result = Double(result);
-            power1 = power2 = 0;
-        }
-    }
-    return result;
-}
-
-
-struct WindowSlider
-{
-    WindowSlider(const Integer &exp, bool fastNegate,
-                 unsigned int windowSizeIn=0)
-        : exp(exp), windowModulus(Integer::One()), windowSize(windowSizeIn),
-          windowBegin(0), fastNegate(fastNegate), firstTime(true),
-          finished(false)
-    {
-        if (windowSize == 0)
-        {
-            unsigned int expLen = exp.BitCount();
-            windowSize = expLen <= 17 ? 1 : (expLen <= 24 ? 2 : 
-                (expLen <= 70 ? 3 : (expLen <= 197 ? 4 : (expLen <= 539 ? 5 : 
-                (expLen <= 1434 ? 6 : 7)))));
-        }
-        windowModulus <<= windowSize;
-    }
-
-    void FindNextWindow()
-    {
-        unsigned int expLen = exp.WordCount() * WORD_BITS;
-        unsigned int skipCount = firstTime ? 0 : windowSize;
-        firstTime = false;
-        while (!exp.GetBit(skipCount))
-        {
-            if (skipCount >= expLen)
-            {
-                finished = true;
-                return;
-            }
-            skipCount++;
-        }
-
-        exp >>= skipCount;
-        windowBegin += skipCount;
-        expWindow = exp % (1 << windowSize);
-
-        if (fastNegate && exp.GetBit(windowSize))
-        {
-            negateNext = true;
-            expWindow = (1 << windowSize) - expWindow;
-            exp += windowModulus;
-        }
-        else
-            negateNext = false;
-    }
-
-    Integer exp, windowModulus;
-    unsigned int windowSize, windowBegin, expWindow;
-    bool fastNegate, negateNext, firstTime, finished;
-};
-
-
-void AbstractGroup::SimultaneousMultiply(Integer *results, const Integer &base,
-                          const Integer *expBegin, unsigned int expCount) const
-{
-    STL::vector<STL::vector<Element> > buckets(expCount);
-    STL::vector<WindowSlider> exponents;
-    exponents.reserve(expCount);
-    unsigned int i;
-
-    for (i=0; i<expCount; i++)
-    {
-        exponents.push_back(WindowSlider(*expBegin++, InversionIsFast(), 0));
-        exponents[i].FindNextWindow();
-        buckets[i].resize(1<<(exponents[i].windowSize-1), Identity());
-    }
-
-    unsigned int expBitPosition = 0;
-    Element g = base;
-    bool notDone = true;
-
-    while (notDone)
-    {
-        notDone = false;
-        for (i=0; i<expCount; i++)
-        {
-            if (!exponents[i].finished && expBitPosition == 
-                 exponents[i].windowBegin)
-            {
-                Element &bucket = buckets[i][exponents[i].expWindow/2];
-                if (exponents[i].negateNext)
-                    Accumulate(bucket, Inverse(g));
-                else
-                    Accumulate(bucket, g);
-                exponents[i].FindNextWindow();
-            }
-            notDone = notDone || !exponents[i].finished;
-        }
-
-        if (notDone)
-        {
-            g = Double(g);
-            expBitPosition++;
-        }
-    }
-
-    for (i=0; i<expCount; i++)
-    {
-        Element &r = *results++;
-        r = buckets[i][buckets[i].size()-1];
-        if (buckets[i].size() > 1)
-        {
-            for (size_t j = buckets[i].size()-2; j >= 1; j--)
-            {
-                Accumulate(buckets[i][j], buckets[i][j+1]);
-                Accumulate(r, buckets[i][j]);
-            }
-            Accumulate(buckets[i][0], buckets[i][1]);
-            r = Add(Double(r), buckets[i][0]);
-        }
-    }
-}
-
-Integer AbstractRing::Exponentiate(const Element &base,
-                                   const Integer &exponent) const
-{
-    Element result;
-    SimultaneousExponentiate(&result, base, &exponent, 1);
-    return result;
-}
-
-
-Integer AbstractRing::CascadeExponentiate(const Element &x,
-                  const Integer &e1, const Element &y, const Integer &e2) const
-{
-    return MultiplicativeGroup().AbstractGroup::CascadeScalarMultiply(
-                x, e1, y, e2);
-}
-
-
-void AbstractRing::SimultaneousExponentiate(Integer *results,
-                                            const Integer &base,
-                         const Integer *exponents, unsigned int expCount) const
-{
-    MultiplicativeGroup().AbstractGroup::SimultaneousMultiply(results, base,
-                                                          exponents, expCount);
-}
-
-
-} // namespace
-
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-namespace mySTL {
-template TaoCrypt::WindowSlider* uninit_copy<TaoCrypt::WindowSlider*, TaoCrypt::WindowSlider*>(TaoCrypt::WindowSlider*, TaoCrypt::WindowSlider*, TaoCrypt::WindowSlider*);
-template void destroy<TaoCrypt::WindowSlider*>(TaoCrypt::WindowSlider*, TaoCrypt::WindowSlider*);
-template TaoCrypt::WindowSlider* GetArrayMemory<TaoCrypt::WindowSlider>(size_t);
-template void FreeArrayMemory<TaoCrypt::WindowSlider>(TaoCrypt::WindowSlider*);
-}
-#endif
-
diff --git a/extra/yassl/taocrypt/src/arc4.cpp b/extra/yassl/taocrypt/src/arc4.cpp
deleted file mode 100644
index 10a3a7d6ffcb..000000000000
--- a/extra/yassl/taocrypt/src/arc4.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's arc4.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "arc4.hpp"
-
-
-#if defined(TAOCRYPT_X86ASM_AVAILABLE) && defined(TAO_ASM)
-    #define DO_ARC4_ASM
-#endif
-
-
-namespace TaoCrypt {
-
-void ARC4::SetKey(const byte* key, word32 length)
-{
-    x_ = 1;
-    y_ = 0;
-
-    word32 i;
-
-    for (i = 0; i < STATE_SIZE; i++)
-        state_[i] = i;
-
-    word32 keyIndex = 0, stateIndex = 0;
-
-    for (i = 0; i < STATE_SIZE; i++) {
-        word32 a = state_[i];
-        stateIndex += key[keyIndex] + a;
-        stateIndex &= 0xFF;
-        state_[i] = state_[stateIndex];
-        state_[stateIndex] = a;
-
-        if (++keyIndex >= length)
-            keyIndex = 0;
-    }
-}
-
-
-// local
-namespace {
-
-inline unsigned int MakeByte(word32& x, word32& y, byte* s)
-{
-    word32 a = s[x];
-    y = (y+a) & 0xff;
-
-    word32 b = s[y];
-    s[x] = b;
-    s[y] = a;
-    x = (x+1) & 0xff;
-
-    return s[(a+b) & 0xff];
-}
-
-} // namespace
-
-
-
-void ARC4::Process(byte* out, const byte* in, word32 length)
-{
-    if (length == 0) return;
-
-#ifdef DO_ARC4_ASM
-    if (isMMX) {
-        AsmProcess(out, in, length);
-        return;
-    } 
-#endif
-
-    byte *const s = state_;
-    word32 x = x_;
-    word32 y = y_;
-
-    if (in == out)
-        while (length--)
-            *out++ ^= MakeByte(x, y, s);
-    else
-        while(length--)
-            *out++ = *in++ ^ MakeByte(x, y, s);
-    x_ = x;
-    y_ = y;
-}
-
-
-
-#ifdef DO_ARC4_ASM
-
-#ifdef _MSC_VER
-    __declspec(naked)
-#else
-    __attribute__ ((noinline))
-#endif
-void ARC4::AsmProcess(byte* out, const byte* in, word32 length)
-{
-#ifdef __GNUC__
-    #define AS1(x)    #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-
-    #define PROLOG()  \
-    __asm__ __volatile__ \
-    ( \
-        ".intel_syntax noprefix;" \
-        "push ebx;" \
-        "push ebp;" \
-        "mov ebp, eax;"
-    #define EPILOG()  \
-        "pop ebp;" \
-        "pop ebx;" \
-       	"emms;" \
-       	".att_syntax;" \
-            : \
-            : "c" (this), "D" (out), "S" (in), "a" (length) \
-            : "%edx", "memory", "cc" \
-    );
-
-#else
-    #define AS1(x)    __asm x
-    #define AS2(x, y) __asm x, y
-
-    #define PROLOG() \
-        AS1(    push  ebp                       )   \
-        AS2(    mov   ebp, esp                  )   \
-        AS2(    movd  mm3, edi                  )   \
-        AS2(    movd  mm4, ebx                  )   \
-        AS2(    movd  mm5, esi                  )   \
-        AS2(    movd  mm6, ebp                  )   \
-        AS2(    mov   edi, DWORD PTR [ebp +  8] )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 12] )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 16] )
-
-    #define EPILOG() \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS1(    pop   ebp                       )   \
-        AS1(    emms                            )   \
-        AS1(    ret 12                          )
-        
-#endif
-
-    PROLOG()
-
-    AS2(    sub    esp, 4                   )   // make room 
-
-    AS2(    cmp    ebp, 0                   )
-    AS1(    jz     nothing                  )
-
-    AS2(    mov    [esp], ebp               )   // length
-
-    AS2(    movzx  edx, BYTE PTR [ecx + 1]  )   // y
-    AS2(    lea    ebp, [ecx + 2]           )   // state_
-    AS2(    movzx  ecx, BYTE PTR [ecx]      )   // x
-
-    // setup loop
-    // a = s[x];
-    AS2(    movzx  eax, BYTE PTR [ebp + ecx]    )
-
-
-#ifdef _MSC_VER
-    AS1( loopStart: )  // loopStart
-#else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
-#endif
-
-    // y = (y+a) & 0xff;
-    AS2(    add    edx, eax                     )
-    AS2(    and    edx, 255                     )
-
-    // b = s[y];
-    AS2(    movzx  ebx, BYTE PTR [ebp + edx]    )
-
-    // s[x] = b;
-    AS2(    mov    [ebp + ecx], bl              )
-
-    // s[y] = a;
-    AS2(    mov    [ebp + edx], al              )
-
-    // x = (x+1) & 0xff;
-    AS1(    inc    ecx                          )
-    AS2(    and    ecx, 255                     )
-
-    //return s[(a+b) & 0xff];
-    AS2(    add    eax, ebx                     )
-    AS2(    and    eax, 255                     )
-    
-    AS2(    movzx  ebx, BYTE PTR [ebp + eax]    )
-
-    // a = s[x];   for next round
-    AS2(    movzx  eax, BYTE PTR [ebp + ecx]    )
-
-    // xOr w/ inByte
-    AS2(    xor    bl,  BYTE PTR [esi]          )
-    AS1(    inc    esi                          )
-
-    // write to outByte
-    AS2(    mov    [edi], bl                    )
-    AS1(    inc    edi                          )
-
-    AS1(    dec    DWORD PTR [esp]              )
-#ifdef _MSC_VER
-    AS1(    jnz   loopStart )  // loopStart
-#else
-    AS1(    jnz   0b )         // loopStart
-#endif
-
-
-    // write back to x_ and y_
-    AS2(    mov    [ebp - 2], cl            )
-    AS2(    mov    [ebp - 1], dl            )
-
-
-AS1( nothing:                           )
-
-    // inline adjust 
-    AS2(    add   esp, 4               )   // fix room on stack
-
-    EPILOG()
-}
-
-#endif // DO_ARC4_ASM
-
-
-}  // namespace
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp
deleted file mode 100644
index e0aef45fc276..000000000000
--- a/extra/yassl/taocrypt/src/asn.cpp
+++ /dev/null
@@ -1,1348 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* asn.cpp implements ASN1 BER, PublicKey, and x509v3 decoding 
-*/
-
-#include "runtime.hpp"
-#include "asn.hpp"
-#include "file.hpp"
-#include "integer.hpp"
-#include "rsa.hpp"
-#include "dsa.hpp"
-#include "dh.hpp"
-#include "md5.hpp"
-#include "md2.hpp"
-#include "sha.hpp"
-#include "coding.hpp"
-#include <time.h>     // gmtime();
-#include "memory.hpp" // some auto_ptr don't have reset, also need auto_array
-
-
-namespace TaoCrypt {
-
-// like atoi but only use first byte
-word32 btoi(byte b)
-{
-    return b - 0x30;
-}
-
-
-// two byte date/time, add to value
-void GetTime(int *value, const byte* date, int& i)
-{
-    *value += btoi(date[i++]) * 10;
-    *value += btoi(date[i++]);
-}
-
-
-bool ASN1_TIME_extract(const unsigned char* date, unsigned char format,
-                       tm *t)
-{
-  int i = 0;
-  memset(t, 0, sizeof (tm));
-
-  if (format != UTC_TIME && format != GENERALIZED_TIME)
-    return false;
-
-  if (format == UTC_TIME) {
-    if (btoi(date[0]) >= 5)
-      t->tm_year = 1900;
-    else
-      t->tm_year = 2000;
-  }
-  else  { // format == GENERALIZED_TIME
-    t->tm_year += btoi(date[i++]) * 1000;
-    t->tm_year += btoi(date[i++]) * 100;
-  }
-
-  GetTime(&t->tm_year, date, i);     t->tm_year -= 1900; // adjust
-  GetTime(&t->tm_mon,  date, i);     t->tm_mon  -= 1;    // adjust
-  GetTime(&t->tm_mday, date, i);
-  GetTime(&t->tm_hour, date, i);
-  GetTime(&t->tm_min,  date, i);
-  GetTime(&t->tm_sec,  date, i);
-
-  if (date[i] != 'Z')     // only Zulu supported for this profile
-    return false;
-  return true;
-}
-
-
-namespace { // locals
-
-
-// to the second
-bool operator>(tm& a, tm& b)
-{
-    if (a.tm_year > b.tm_year)
-        return true;
-
-    if (a.tm_year == b.tm_year && a.tm_mon > b.tm_mon)
-        return true;
-    
-    if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon && a.tm_mday >b.tm_mday)
-        return true;
-
-    if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon &&
-        a.tm_mday == b.tm_mday && a.tm_hour > b.tm_hour)
-        return true;
-
-    if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon &&
-        a.tm_mday == b.tm_mday && a.tm_hour == b.tm_hour &&
-        a.tm_min > b.tm_min)
-        return true;
-
-    if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon &&
-        a.tm_mday == b.tm_mday && a.tm_hour == b.tm_hour &&
-        a.tm_min  == b.tm_min  && a.tm_sec > b.tm_sec)
-        return true;
-
-    return false;
-}
-
-
-bool operator<(tm& a, tm&b)
-{
-    return (b>a);
-}
-
-
-// Make sure before and after dates are valid
-bool ValidateDate(const byte* date, byte format, CertDecoder::DateType dt)
-{
-    tm certTime;
-
-    if (!ASN1_TIME_extract(date, format, &certTime))
-        return false;
-
-    time_t ltime = time(0);
-    tm* localTime = gmtime(&ltime);
-
-    if (dt == CertDecoder::BEFORE) {
-        if (*localTime < certTime)
-            return false;
-    }
-    else
-        if (*localTime > certTime)
-            return false;
-
-    return true;
-}
-
-
-class BadCertificate {};
-
-} // local namespace
-
-
-
-// used by Integer as well
-word32 GetLength(Source& source)
-{
-    word32 length = 0;
-
-    byte b = source.next();
-    if (b >= LONG_LENGTH) {        
-        word32 bytes = b & 0x7F;
-
-        if (source.IsLeft(bytes) == false) return 0;
-
-        while (bytes--) {
-            b = source.next();
-            length = (length << 8) | b;
-        }
-    }
-    else
-        length = b;
-
-    if (source.IsLeft(length) == false) return 0;
-
-    return length;
-}
-
-
-word32 SetLength(word32 length, byte* output)
-{
-    word32 i = 0;
-
-    if (length < LONG_LENGTH)
-        output[i++] = length;
-    else {
-        output[i++] = BytePrecision(length) | 0x80;
-      
-        for (int j = BytePrecision(length); j; --j) {
-            output[i] = length >> (j - 1) * 8;
-            i++;
-        }
-    }
-    return i;
-}
-
-
-PublicKey::PublicKey(const byte* k, word32 s) : key_(0), sz_(0)
-{
-    if (s) {
-        SetSize(s);
-        SetKey(k);
-    }
-}
-
-
-void PublicKey::SetSize(word32 s)
-{
-    sz_ = s;
-    key_ = NEW_TC byte[sz_];
-}
-
-
-void PublicKey::SetKey(const byte* k)
-{
-    memcpy(key_, k, sz_);
-}
-
-
-void PublicKey::AddToEnd(const byte* data, word32 len)
-{
-    mySTL::auto_array<byte> tmp(NEW_TC byte[sz_ + len]);
-
-    memcpy(tmp.get(), key_, sz_);
-    memcpy(tmp.get() + sz_, data, len);
-
-    byte* del = 0;
-    STL::swap(del, key_);
-    tcArrayDelete(del);
-
-    key_ = tmp.release();
-    sz_ += len;
-}
-
-
-Signer::Signer(const byte* k, word32 kSz, const char* n, const byte* h)
-    : key_(k, kSz)
-{
-    size_t sz = strlen(n);
-    memcpy(name_, n, sz);
-    name_[sz] = 0;
-
-    memcpy(hash_, h, SHA::DIGEST_SIZE);
-}
-
-Signer::~Signer()
-{
-}
-
-
-Error BER_Decoder::GetError()
-{ 
-    return source_.GetError(); 
-}
-
-
-Integer& BER_Decoder::GetInteger(Integer& integer)
-{
-    if (!source_.GetError().What())
-        integer.Decode(source_);
-    return integer;
-}
-
-  
-// Read a Sequence, return length
-word32 BER_Decoder::GetSequence()
-{
-    if (source_.GetError().What()) return 0;
-
-    byte b = source_.next();
-    if (b != (SEQUENCE | CONSTRUCTED)) {
-        source_.SetError(SEQUENCE_E);
-        return 0;
-    }
-
-    return GetLength(source_);
-}
-
-
-// Read a Sequence, return length
-word32 BER_Decoder::GetSet()
-{
-    if (source_.GetError().What()) return 0;
-
-    byte b = source_.next();
-    if (b != (SET | CONSTRUCTED)) {
-        source_.SetError(SET_E);
-        return 0;
-    }
-
-    return GetLength(source_);
-}
-
-
-// Read Version, return it
-word32 BER_Decoder::GetVersion()
-{
-    if (source_.GetError().What()) return 0;
-
-    byte b = source_.next();
-    if (b != INTEGER) {
-        source_.SetError(INTEGER_E);
-        return 0;
-    }
-
-    b = source_.next();
-    if (b != 0x01) {
-        source_.SetError(VERSION_E);
-        return 0;
-    }
-
-    return source_.next();
-}
-
-
-// Read ExplicitVersion, return it or 0 if not there (not an error)
-word32 BER_Decoder::GetExplicitVersion()
-{
-    if (source_.GetError().What()) return 0;
-
-    byte b = source_.next();
-
-    if (b == (CONTEXT_SPECIFIC | CONSTRUCTED)) { // not an error if not here
-        source_.next();
-        return GetVersion();
-    }
-    else 
-        source_.prev(); // put back
-  
-    return 0;
-}
-
-
-// Decode a BER encoded RSA Private Key
-void RSA_Private_Decoder::Decode(RSA_PrivateKey& key)
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-    // public
-    key.SetModulus(GetInteger(Integer().Ref()));
-    key.SetPublicExponent(GetInteger(Integer().Ref()));
-
-    // private
-    key.SetPrivateExponent(GetInteger(Integer().Ref()));
-    key.SetPrime1(GetInteger(Integer().Ref()));
-    key.SetPrime2(GetInteger(Integer().Ref()));
-    key.SetModPrime1PrivateExponent(GetInteger(Integer().Ref()));
-    key.SetModPrime2PrivateExponent(GetInteger(Integer().Ref()));
-    key.SetMultiplicativeInverseOfPrime2ModPrime1(GetInteger(Integer().Ref()));
-}
-
-
-void RSA_Private_Decoder::ReadHeader()
-{
-    GetSequence();
-    GetVersion();
-}
-
-
-// Decode a BER encoded DSA Private Key
-void DSA_Private_Decoder::Decode(DSA_PrivateKey& key)
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-    // group parameters
-    key.SetModulus(GetInteger(Integer().Ref()));
-    key.SetSubGroupOrder(GetInteger(Integer().Ref()));
-    key.SetSubGroupGenerator(GetInteger(Integer().Ref()));
-
-    // key
-    key.SetPublicPart(GetInteger(Integer().Ref()));
-    key.SetPrivatePart(GetInteger(Integer().Ref()));   
-}
-
-
-void DSA_Private_Decoder::ReadHeader()
-{
-    GetSequence();
-    GetVersion();
-}
-
-
-// Decode a BER encoded RSA Public Key
-void RSA_Public_Decoder::Decode(RSA_PublicKey& key)
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-
-    ReadHeaderOpenSSL();   // may or may not be
-    if (source_.GetError().What()) return;
-
-    // public key
-    key.SetModulus(GetInteger(Integer().Ref()));
-    key.SetPublicExponent(GetInteger(Integer().Ref()));
-}
-
-
-// Read OpenSSL format public header
-void RSA_Public_Decoder::ReadHeaderOpenSSL()
-{
-    byte b = source_.next();  // peek
-    source_.prev();
-
-    if (b != INTEGER) { // have OpenSSL public format
-        GetSequence();
-        b = source_.next();
-        if (b != OBJECT_IDENTIFIER) {
-            source_.SetError(OBJECT_ID_E);
-            return;
-        }
-
-        word32 len = GetLength(source_);
-        source_.advance(len);
-
-        b = source_.next();
-        if (b == TAG_NULL) {   // could have NULL tag and 0 terminator, may not 
-            b = source_.next();
-            if (b != 0) {
-                source_.SetError(EXPECT_0_E);
-                return; 
-            }
-        }
-        else
-            source_.prev();   // put back
-
-        b = source_.next();
-        if (b != BIT_STRING) {   
-            source_.SetError(BIT_STR_E);
-            return; 
-        }
-
-        len = GetLength(source_); 
-        b = source_.next();
-        if (b != 0)           // could have 0
-            source_.prev();   // put back
-        
-        GetSequence();
-    }
-}
-
-
-void RSA_Public_Decoder::ReadHeader()
-{
-    GetSequence();
-}
-
-
-// Decode a BER encoded DSA Public Key
-void DSA_Public_Decoder::Decode(DSA_PublicKey& key)
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-
-    // group parameters
-    key.SetModulus(GetInteger(Integer().Ref()));
-    key.SetSubGroupOrder(GetInteger(Integer().Ref()));
-    key.SetSubGroupGenerator(GetInteger(Integer().Ref()));
-
-    // key
-    key.SetPublicPart(GetInteger(Integer().Ref()));
-}
-
-
-void DSA_Public_Decoder::ReadHeader()
-{
-    GetSequence();
-}
-
-
-void DH_Decoder::ReadHeader()
-{
-    GetSequence();
-}
-
-
-// Decode a BER encoded Diffie-Hellman Key
-void DH_Decoder::Decode(DH& key)
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-
-    // group parms
-    key.SetP(GetInteger(Integer().Ref()));
-    key.SetG(GetInteger(Integer().Ref()));
-}
-
-
-CertDecoder::CertDecoder(Source& s, bool decode, SignerList* signers,
-                         bool noVerify, CertType ct)
-    : BER_Decoder(s), certBegin_(0), sigIndex_(0), sigLength_(0), subCnPos_(-1),
-      subCnLen_(0), issCnPos_(-1), issCnLen_(0), signature_(0),
-      verify_(!noVerify)
-{
-    issuer_[0] = 0;
-    subject_[0] = 0;
-
-    if (decode)
-        Decode(signers, ct);
-
-}
-
-
-CertDecoder::~CertDecoder()
-{
-    tcArrayDelete(signature_);
-}
-
-
-// process certificate header, set signature offset
-void CertDecoder::ReadHeader()
-{
-    if (source_.GetError().What()) return;
-
-    GetSequence();  // total
-    certBegin_ = source_.get_index();
-
-    sigIndex_ = GetSequence();  // this cert
-    sigIndex_ += source_.get_index();
-
-    GetExplicitVersion(); // version
-    GetInteger(Integer().Ref());  // serial number
-}
-
-
-// Decode a x509v3 Certificate
-void CertDecoder::Decode(SignerList* signers, CertType ct)
-{
-    if (source_.GetError().What()) return;
-    DecodeToKey();
-    if (source_.GetError().What()) return;
-
-    if (source_.get_index() != sigIndex_)
-        source_.set_index(sigIndex_);
-
-    word32 confirmOID = GetAlgoId();
-    GetSignature();
-    if (source_.GetError().What()) return;
-
-    if ( confirmOID != signatureOID_ ) {
-        source_.SetError(SIG_OID_E);
-        return;
-    }
-    
-    if (ct != CA && verify_ && !ValidateSignature(signers))
-        source_.SetError(SIG_OTHER_E);
-}
-
-
-void CertDecoder::DecodeToKey()
-{
-    ReadHeader();
-    signatureOID_ = GetAlgoId();
-    GetName(ISSUER);   
-    GetValidity();
-    GetName(SUBJECT);   
-    GetKey();
-}
-
-
-// Read public key
-void CertDecoder::GetKey()
-{
-    if (source_.GetError().What()) return;
-
-    GetSequence();    
-    keyOID_ = GetAlgoId();
-
-    if (keyOID_ == RSAk) {
-        byte b = source_.next();
-        if (b != BIT_STRING) {
-            source_.SetError(BIT_STR_E);
-            return;
-        }
-        b = source_.next();      // length, future
-        b = source_.next(); 
-        while(b != 0)
-            b = source_.next();
-    }
-    else if (keyOID_ == DSAk)
-        ;   // do nothing
-    else {
-        source_.SetError(UNKNOWN_OID_E);
-        return;
-    }
-
-    StoreKey();
-    if (keyOID_ == DSAk)
-        AddDSA();
-}
-
-
-// Save public key
-void CertDecoder::StoreKey()
-{
-    if (source_.GetError().What()) return;
-
-    word32 read = source_.get_index();
-    word32 length = GetSequence();
-
-    read = source_.get_index() - read;
-    length += read;
-
-    if (source_.GetError().What()) return;
-    while (read--) source_.prev();
-
-    if (source_.IsLeft(length) == false) return;
-    key_.SetSize(length);
-    key_.SetKey(source_.get_current());
-    source_.advance(length);
-}
-
-
-// DSA has public key after group
-void CertDecoder::AddDSA()
-{
-    if (source_.GetError().What()) return;
-
-    byte b = source_.next();
-    if (b != BIT_STRING) {
-        source_.SetError(BIT_STR_E);
-        return;
-    }
-    b = source_.next();      // length, future
-    b = source_.next(); 
-    while(b != 0)
-        b = source_.next();
-
-    word32 idx = source_.get_index();
-    b = source_.next();
-    if (b != INTEGER) {
-        source_.SetError(INTEGER_E);
-        return;
-    }
-
-    word32 length = GetLength(source_);
-    length += source_.get_index() - idx;
-
-    if (source_.IsLeft(length) == false) return;
-
-    key_.AddToEnd(source_.get_buffer() + idx, length);    
-}
-
-
-// process algo OID by summing, return it
-word32 CertDecoder::GetAlgoId()
-{
-    if (source_.GetError().What()) return 0;
-    word32 length = GetSequence();
-
-    if (source_.GetError().What()) return 0;
-    
-    byte b = source_.next();
-    if (b != OBJECT_IDENTIFIER) {
-        source_.SetError(OBJECT_ID_E);
-        return 0;
-    }
-
-    length = GetLength(source_);
-    if (source_.IsLeft(length) == false) return 0;
-
-    word32 oid = 0;
-    while(length--)
-        oid += source_.next();        // just sum it up for now
-
-    // could have NULL tag and 0 terminator, but may not
-    b = source_.next();
-    if (b == TAG_NULL) {
-        b = source_.next();
-        if (b != 0) {
-            source_.SetError(EXPECT_0_E);
-            return 0;
-        }
-    }
-    else
-        // go back, didn't have it
-        b = source_.prev();
-
-    return oid;
-}
-
-
-// read cert signature, store in signature_
-word32 CertDecoder::GetSignature()
-{
-    if (source_.GetError().What()) return 0;
-    byte b = source_.next();
-
-    if (b != BIT_STRING) {
-        source_.SetError(BIT_STR_E);
-        return 0;
-    }
-
-    sigLength_ = GetLength(source_);
-    if (sigLength_ <= 1 || source_.IsLeft(sigLength_) == false) {
-        source_.SetError(CONTENT_E);
-        return 0;
-    }
-  
-    b = source_.next();
-    if (b != 0) {
-        source_.SetError(EXPECT_0_E);
-        return 0;
-    }
-    sigLength_--;
-
-    signature_ = NEW_TC byte[sigLength_];
-    memcpy(signature_, source_.get_current(), sigLength_);
-    source_.advance(sigLength_);
-
-    return sigLength_;
-}
-
-
-// read cert digest, store in signature_
-word32 CertDecoder::GetDigest()
-{
-    if (source_.GetError().What()) return 0;
-    byte b = source_.next();
-
-    if (b != OCTET_STRING) {
-        source_.SetError(OCTET_STR_E);
-        return 0;
-    }
-
-    sigLength_ = GetLength(source_);
-
-    signature_ = NEW_TC byte[sigLength_];
-    memcpy(signature_, source_.get_current(), sigLength_);
-    source_.advance(sigLength_);
-
-    return sigLength_;
-}
-
-
-// memory length checked add tag to buffer
-char* CertDecoder::AddTag(char* ptr, const char* buf_end, const char* tag_name,
-                          word32 tag_name_length, word32 tag_value_length)
-{
-    if (ptr + tag_name_length + tag_value_length > buf_end) {
-        source_.SetError(CONTENT_E);
-        return 0;
-    }
-
-    memcpy(ptr, tag_name, tag_name_length);
-    ptr += tag_name_length;
-
-    memcpy(ptr, source_.get_current(), tag_value_length);
-    ptr += tag_value_length;
-
-    return ptr;
-}
-
-
-// process NAME, either issuer or subject
-void CertDecoder::GetName(NameType nt)
-{
-    if (source_.GetError().What()) return;
-
-    SHA    sha;
-    word32 length = GetSequence();  // length of all distinguished names
-
-    if (length >= ASN_NAME_MAX)
-        return;
-    if (source_.IsLeft(length) == false) return;
-    length += source_.get_index();
-    
-    char* ptr;
-    char* buf_end;
-
-    if (nt == ISSUER) {
-        ptr = issuer_;
-        buf_end = ptr + sizeof(issuer_) - 1;   // 1 byte for trailing 0
-    }
-    else {
-        ptr = subject_;
-        buf_end = ptr + sizeof(subject_) - 1;  // 1 byte for trailing 0
-    }
-
-    while (source_.get_index() < length) {
-        GetSet();
-        if (source_.GetError().What() == SET_E) {
-            source_.SetError(NO_ERROR_E);  // extensions may only have sequence 
-            source_.prev();
-        }
-        GetSequence();
-
-        byte b = source_.next();
-        if (b != OBJECT_IDENTIFIER) {
-            source_.SetError(OBJECT_ID_E);
-            return;
-        }
-
-        word32 oidSz = GetLength(source_);
-        if (source_.IsLeft(oidSz) == false) return;
-
-        byte joint[2];
-        if (source_.IsLeft(sizeof(joint)) == false) return;
-        memcpy(joint, source_.get_current(), sizeof(joint));
-
-        // v1 name types
-        if (joint[0] == 0x55 && joint[1] == 0x04) {
-            source_.advance(2);
-            byte   id      = source_.next();  
-            b              = source_.next();    // strType
-            word32 strLen  = GetLength(source_);
-
-            if (source_.IsLeft(strLen) == false) return;
-
-            switch (id) {
-            case COMMON_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/CN=", 4, strLen)))
-                    return;
-                if (nt == ISSUER) {
-                    issCnPos_ = (int)(ptr - strLen - issuer_);
-                    issCnLen_ = (int)strLen;
-                } else {
-                    subCnPos_ = (int)(ptr - strLen - subject_);
-                    subCnLen_ = (int)strLen;
-                }
-                break;
-            case SUR_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/SN=", 4, strLen)))
-                    return;
-                break;
-            case COUNTRY_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/C=", 3, strLen)))
-                    return;
-                break;
-            case LOCALITY_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/L=", 3, strLen)))
-                    return;
-                break;
-            case STATE_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/ST=", 4, strLen)))
-                    return;
-                break;
-            case ORG_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/O=", 3, strLen)))
-                    return;
-                break;
-            case ORGUNIT_NAME:
-                if (!(ptr = AddTag(ptr, buf_end, "/OU=", 4, strLen)))
-                    return;
-                break;
-            }
-
-            sha.Update(source_.get_current(), strLen);
-            source_.advance(strLen);
-        }
-        else { 
-            bool email = false;
-            if (joint[0] == 0x2a && joint[1] == 0x86)  // email id hdr
-                email = true;
-
-            source_.advance(oidSz + 1);
-            word32 length = GetLength(source_);
-            if (source_.IsLeft(length) == false) return;
-
-            if (email) {
-                if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length)))
-                    return; 
-            }
-
-            source_.advance(length);
-        }
-    }
-
-    *ptr = 0;
-
-    if (nt == ISSUER)
-        sha.Final(issuerHash_);
-    else
-        sha.Final(subjectHash_);
-}
-
-
-// process a Date, either BEFORE or AFTER
-void CertDecoder::GetDate(DateType dt)
-{
-    if (source_.GetError().What()) return;
-
-    byte b = source_.next();
-    if (b != UTC_TIME && b != GENERALIZED_TIME) {
-        source_.SetError(TIME_E);
-        return;
-    }
-
-    word32 length = GetLength(source_);
-    if (source_.IsLeft(length) == false) return;
-
-    byte date[MAX_DATE_SZ];
-    if (length > MAX_DATE_SZ || length < MIN_DATE_SZ) {
-        source_.SetError(DATE_SZ_E);
-        return;
-    }
-
-    memcpy(date, source_.get_current(), length);
-    source_.advance(length);
-
-    if (!ValidateDate(date, b, dt) && verify_) {
-        if (dt == BEFORE)
-            source_.SetError(BEFORE_DATE_E);
-        else
-            source_.SetError(AFTER_DATE_E);
-    }
-
-    // save for later use
-    if (dt == BEFORE) {
-        memcpy(beforeDate_, date, length);
-        beforeDate_[length] = 0;
-        beforeDateType_= b;
-    }
-    else {  // after
-        memcpy(afterDate_, date, length);
-        afterDate_[length] = 0;
-        afterDateType_= b;
-    }       
-}
-
-
-void CertDecoder::GetValidity()
-{
-    if (source_.GetError().What()) return;
-
-    GetSequence();
-    GetDate(BEFORE);
-    GetDate(AFTER);
-}
-
-
-bool CertDecoder::ValidateSelfSignature()
-{
-    Source pub(key_.GetKey(), key_.size());
-    return ConfirmSignature(pub);
-}
-
-
-// extract compare signature hash from plain and place into digest
-void CertDecoder::GetCompareHash(const byte* plain, word32 sz, byte* digest,
-                                 word32 digSz)
-{
-    if (source_.GetError().What()) return;
-
-    Source s(plain, sz);
-    CertDecoder dec(s, false);
-
-    dec.GetSequence();
-    dec.GetAlgoId();
-    dec.GetDigest();
-
-    if (dec.sigLength_ > digSz) {
-        source_.SetError(SIG_LEN_E);
-        return;
-    }
-
-    memcpy(digest, dec.signature_, dec.sigLength_);
-}
-
-
-// validate signature signed by someone else
-bool CertDecoder::ValidateSignature(SignerList* signers)
-{
-    if (!signers)
-        return false;
-
-    SignerList::iterator first = signers->begin();
-    SignerList::iterator last  = signers->end();
-
-    while (first != last) {
-        if ( memcmp(issuerHash_, (*first)->GetHash(), SHA::DIGEST_SIZE) == 0) {
-      
-            const PublicKey& iKey = (*first)->GetPublicKey();
-            Source pub(iKey.GetKey(), iKey.size());
-            return ConfirmSignature(pub);
-        }   
-        ++first;
-    }
-    return false;
-}
-
-
-// confirm certificate signature
-bool CertDecoder::ConfirmSignature(Source& pub)
-{
-    HashType ht;
-    mySTL::auto_ptr<HASH> hasher;
-
-    if (signatureOID_ == MD5wRSA) {
-        hasher.reset(NEW_TC MD5);
-        ht = MD5h;
-    }
-    else if (signatureOID_ == MD2wRSA) {
-        hasher.reset(NEW_TC MD2);
-        ht = MD2h;
-    }
-    else if (signatureOID_ == SHAwRSA || signatureOID_ == SHAwDSA) {
-        hasher.reset(NEW_TC SHA);
-        ht = SHAh;
-    }
-    else if (signatureOID_ == SHA256wRSA || signatureOID_ == SHA256wDSA) {
-        hasher.reset(NEW_TC SHA256);
-        ht = SHA256h;
-    }
-#ifdef WORD64_AVAILABLE
-    else if (signatureOID_ == SHA384wRSA) {
-        hasher.reset(NEW_TC SHA384);
-        ht = SHA384h;
-    }
-    else if (signatureOID_ == SHA512wRSA) {
-        hasher.reset(NEW_TC SHA512);
-        ht = SHA512h;
-    }
-#endif
-    else {
-        source_.SetError(UNKOWN_SIG_E);
-        return false;
-    }
-
-    byte digest[MAX_SHA2_DIGEST_SIZE];      // largest size
-
-    hasher->Update(source_.get_buffer() + certBegin_, sigIndex_ - certBegin_);
-    hasher->Final(digest);
-
-    if (keyOID_ == RSAk) {
-        // put in ASN.1 signature format
-        Source build;
-        Signature_Encoder(digest, hasher->getDigestSize(), ht, build);
-
-        RSA_PublicKey pubKey(pub);
-        RSAES_Encryptor enc(pubKey);
-
-        if (pubKey.FixedCiphertextLength() != sigLength_) {
-            source_.SetError(SIG_LEN_E);
-            return false;
-        }
-
-        return enc.SSL_Verify(build.get_buffer(), build.size(), signature_);
-    }
-    else  { // DSA
-        // extract r and s from sequence
-        byte seqDecoded[DSA_SIG_SZ];
-        memset(seqDecoded, 0, sizeof(seqDecoded));
-        DecodeDSA_Signature(seqDecoded, signature_, sigLength_);
-
-        DSA_PublicKey pubKey(pub);
-        DSA_Verifier  ver(pubKey);
-
-        return ver.Verify(digest, seqDecoded);
-    }
-}
-
-
-Signature_Encoder::Signature_Encoder(const byte* dig, word32 digSz,
-                                     HashType digOID, Source& source)
-{
-    // build bottom up
-
-    // Digest
-    byte digArray[MAX_DIGEST_SZ];
-    word32 digestSz = SetDigest(dig, digSz, digArray);
-
-    // AlgoID
-    byte algoArray[MAX_ALGO_SZ];
-    word32 algoSz = SetAlgoID(digOID, algoArray);
-
-    // Sequence
-    byte seqArray[MAX_SEQ_SZ];
-    word32 seqSz = SetSequence(digestSz + algoSz, seqArray);
-
-    source.grow(seqSz + algoSz + digestSz);  // make sure enough room
-    source.add(seqArray,  seqSz);
-    source.add(algoArray, algoSz);
-    source.add(digArray,  digestSz);
-}
-
-
-
-word32 Signature_Encoder::SetDigest(const byte* d, word32 dSz, byte* output)
-{
-    output[0] = OCTET_STRING;
-    output[1] = dSz;
-    memcpy(&output[2], d, dSz);
-    
-    return dSz + 2;
-}
-
-
-
-word32 DER_Encoder::SetAlgoID(HashType aOID, byte* output)
-{
-    // adding TAG_NULL and 0 to end
-    static const byte shaAlgoID[] = { 0x2b, 0x0e, 0x03, 0x02, 0x1a,
-                                      0x05, 0x00 };
-    static const byte md5AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
-                                      0x02, 0x05, 0x05, 0x00  };
-    static const byte md2AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
-                                      0x02, 0x02, 0x05, 0x00};
-    static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-                                         0x04, 0x02, 0x01, 0x05, 0x00 };
-    static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-                                         0x04, 0x02, 0x02, 0x05, 0x00 };
-    static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
-                                         0x04, 0x02, 0x03, 0x05, 0x00 };
-    int algoSz = 0;
-    const byte* algoName = 0;
-
-    switch (aOID) {
-    case SHAh:
-        algoSz = sizeof(shaAlgoID);
-        algoName = shaAlgoID;
-        break;
-
-    case SHA256h:
-        algoSz = sizeof(sha256AlgoID);
-        algoName = sha256AlgoID;
-        break;
-
-    case SHA384h:
-        algoSz = sizeof(sha384AlgoID);
-        algoName = sha384AlgoID;
-        break;
-
-    case SHA512h:
-        algoSz = sizeof(sha512AlgoID);
-        algoName = sha512AlgoID;
-        break;
-
-    case MD2h:
-        algoSz = sizeof(md2AlgoID);
-        algoName = md2AlgoID;
-        break;
-
-    case MD5h:
-        algoSz = sizeof(md5AlgoID);
-        algoName = md5AlgoID;
-        break;
-
-    default:
-        error_.SetError(UNKOWN_HASH_E);
-        return 0;
-    }
-
-
-    byte ID_Length[MAX_LENGTH_SZ];
-    word32 idSz = SetLength(algoSz - 2, ID_Length); // don't include TAG_NULL/0
-
-    byte seqArray[MAX_SEQ_SZ + 1];  // add object_id to end
-    word32 seqSz = SetSequence(idSz + algoSz + 1, seqArray);
-    seqArray[seqSz++] = OBJECT_IDENTIFIER;
-
-    memcpy(output, seqArray, seqSz);
-    memcpy(output + seqSz, ID_Length, idSz);
-    memcpy(output + seqSz + idSz, algoName, algoSz);
-
-    return seqSz + idSz + algoSz;
-}
-
-
-word32 SetSequence(word32 len, byte* output)
-{
-  
-    output[0] = SEQUENCE | CONSTRUCTED;
-    return SetLength(len, output + 1) + 1;
-}
-
-
-word32 EncodeDSA_Signature(const byte* signature, byte* output)
-{
-    Integer r(signature, 20);
-    Integer s(signature + 20, 20);
-
-    return EncodeDSA_Signature(r, s, output);
-}
-
-
-word32 EncodeDSA_Signature(const Integer& r, const Integer& s, byte* output)
-{
-    word32 rSz = r.ByteCount();
-    word32 sSz = s.ByteCount();
-
-    byte rLen[MAX_LENGTH_SZ + 1];
-    byte sLen[MAX_LENGTH_SZ + 1];
-
-    rLen[0] = INTEGER;
-    sLen[0] = INTEGER;
-
-    word32 rLenSz = SetLength(rSz, &rLen[1]) + 1;
-    word32 sLenSz = SetLength(sSz, &sLen[1]) + 1;
-
-    byte seqArray[MAX_SEQ_SZ];
-
-    word32 seqSz = SetSequence(rLenSz + rSz + sLenSz + sSz, seqArray);
-    
-    // seq
-    memcpy(output, seqArray, seqSz);
-    // r
-    memcpy(output + seqSz, rLen, rLenSz);
-    r.Encode(output + seqSz + rLenSz, rSz);
-    // s
-    memcpy(output + seqSz + rLenSz + rSz, sLen, sLenSz);
-    s.Encode(output + seqSz + rLenSz + rSz + sLenSz, sSz);
-
-    return seqSz + rLenSz + rSz + sLenSz + sSz;
-}
-
-
-// put sequence encoded dsa signature into decoded in 2 20 byte integers
-word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz)
-{
-    Source source(encoded, sz);
-
-    if (source.next() != (SEQUENCE | CONSTRUCTED)) {
-        source.SetError(SEQUENCE_E);
-        return 0;
-    }
-
-    GetLength(source);  // total
-
-    // r
-    if (source.next() != INTEGER) {
-        source.SetError(INTEGER_E);
-        return 0;
-    }
-    word32 rLen = GetLength(source);
-    if (rLen != 20) {
-        while (rLen > 20 && source.remaining() > 0) {  // zero's at front, eat
-            source.next();
-            --rLen;
-        }
-        if (rLen < 20) { // add zero's to front so 20 bytes
-            word32 tmpLen = rLen;
-            while (tmpLen < 20) {
-            decoded[0] = 0;
-            decoded++;
-                tmpLen++;
-        }
-        }
-    }
-    memcpy(decoded, source.get_buffer() + source.get_index(), rLen);
-    source.advance(rLen);
-
-    // s
-    if (source.next() != INTEGER) {
-        source.SetError(INTEGER_E);
-        return 0;
-    }
-    word32 sLen = GetLength(source);
-    if (sLen != 20) {
-        while (sLen > 20 && source.remaining() > 0) {
-            source.next();          // zero's at front, eat
-            --sLen;
-        }
-        if (sLen < 20) { // add zero's to front so 20 bytes
-            word32 tmpLen = sLen;
-            while (tmpLen < 20) {
-                decoded[rLen] = 0;
-            decoded++;
-                tmpLen++;
-        }
-        }
-    }
-    memcpy(decoded + rLen, source.get_buffer() + source.get_index(), sLen);
-    source.advance(sLen);
-
-    return 40;
-}
-
-
-/*
-// Get Cert in PEM format from BEGIN to END
-int GetCert(Source& source)
-{
-    char header[] = "-----BEGIN CERTIFICATE-----";
-    char footer[] = "-----END CERTIFICATE-----";
-
-    char* begin = strstr((char*)source.get_buffer(), header);
-    char* end   = strstr((char*)source.get_buffer(), footer);
-
-    if (!begin || !end || begin >= end) return -1;
-
-    end += strlen(footer); 
-    if (*end == '\r') end++;
-
-    Source tmp((byte*)begin, end - begin + 1);
-    source.Swap(tmp);
-
-    return 0;
-}
-
-
-
-// Decode a BER encoded PKCS12 structure
-void PKCS12_Decoder::Decode()
-{
-    ReadHeader();
-    if (source_.GetError().What()) return;
-
-    // Get AuthSafe
-
-    GetSequence();
-    
-        // get object id
-    byte obj_id = source_.next();
-    if (obj_id != OBJECT_IDENTIFIER) {
-        source_.SetError(OBJECT_ID_E);
-        return;
-    }
-
-    word32 length = GetLength(source_);
-
-    word32 algo_sum = 0;
-    while (length--)
-        algo_sum += source_.next();
-
-    
-       
-
-
-
-    // Get MacData optional
-    // mac     digestInfo  like certdecoder::getdigest?
-    // macsalt octet string
-    // iter    integer
-    
-}
-
-
-void PKCS12_Decoder::ReadHeader()
-{
-    // Gets Version
-    GetSequence();
-    GetVersion();
-}
-
-
-// Get Cert in PEM format from pkcs12 file
-int GetPKCS_Cert(const char* password, Source& source)
-{
-    PKCS12_Decoder pkcs12(source);
-    pkcs12.Decode();
-
-    return 0;
-}
-*/
-
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/bftables.cpp b/extra/yassl/taocrypt/src/bftables.cpp
deleted file mode 100644
index f18f0b4af72e..000000000000
--- a/extra/yassl/taocrypt/src/bftables.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's bfinit.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "blowfish.hpp"
-
-
-namespace TaoCrypt {
-
-const word32 Blowfish::p_init_[Blowfish::ROUNDS+2] =
-{
-  608135816U, 2242054355U,  320440878U,   57701188U,
- 2752067618U,  698298832U,  137296536U, 3964562569U,
- 1160258022U,  953160567U, 3193202383U,  887688300U,
- 3232508343U, 3380367581U, 1065670069U, 3041331479U,
- 2450970073U, 2306472731U
-} ;
-
-
-const word32 Blowfish::s_init_[4*256] = {
- 3509652390U, 2564797868U,  805139163U, 3491422135U,
- 3101798381U, 1780907670U, 3128725573U, 4046225305U,
-  614570311U, 3012652279U,  134345442U, 2240740374U,
- 1667834072U, 1901547113U, 2757295779U, 4103290238U,
-  227898511U, 1921955416U, 1904987480U, 2182433518U,
- 2069144605U, 3260701109U, 2620446009U,  720527379U,
- 3318853667U,  677414384U, 3393288472U, 3101374703U,
- 2390351024U, 1614419982U, 1822297739U, 2954791486U,
- 3608508353U, 3174124327U, 2024746970U, 1432378464U,
- 3864339955U, 2857741204U, 1464375394U, 1676153920U,
- 1439316330U,  715854006U, 3033291828U,  289532110U,
- 2706671279U, 2087905683U, 3018724369U, 1668267050U,
-  732546397U, 1947742710U, 3462151702U, 2609353502U,
- 2950085171U, 1814351708U, 2050118529U,  680887927U,
-  999245976U, 1800124847U, 3300911131U, 1713906067U,
- 1641548236U, 4213287313U, 1216130144U, 1575780402U,
- 4018429277U, 3917837745U, 3693486850U, 3949271944U,
-  596196993U, 3549867205U,  258830323U, 2213823033U,
-  772490370U, 2760122372U, 1774776394U, 2652871518U,
-  566650946U, 4142492826U, 1728879713U, 2882767088U,
- 1783734482U, 3629395816U, 2517608232U, 2874225571U,
- 1861159788U,  326777828U, 3124490320U, 2130389656U,
- 2716951837U,  967770486U, 1724537150U, 2185432712U,
- 2364442137U, 1164943284U, 2105845187U,  998989502U,
- 3765401048U, 2244026483U, 1075463327U, 1455516326U,
- 1322494562U,  910128902U,  469688178U, 1117454909U,
-  936433444U, 3490320968U, 3675253459U, 1240580251U,
-  122909385U, 2157517691U,  634681816U, 4142456567U,
- 3825094682U, 3061402683U, 2540495037U,   79693498U,
- 3249098678U, 1084186820U, 1583128258U,  426386531U,
- 1761308591U, 1047286709U,  322548459U,  995290223U,
- 1845252383U, 2603652396U, 3431023940U, 2942221577U,
- 3202600964U, 3727903485U, 1712269319U,  422464435U,
- 3234572375U, 1170764815U, 3523960633U, 3117677531U,
- 1434042557U,  442511882U, 3600875718U, 1076654713U,
- 1738483198U, 4213154764U, 2393238008U, 3677496056U,
- 1014306527U, 4251020053U,  793779912U, 2902807211U,
-  842905082U, 4246964064U, 1395751752U, 1040244610U,
- 2656851899U, 3396308128U,  445077038U, 3742853595U,
- 3577915638U,  679411651U, 2892444358U, 2354009459U,
- 1767581616U, 3150600392U, 3791627101U, 3102740896U,
-  284835224U, 4246832056U, 1258075500U,  768725851U,
- 2589189241U, 3069724005U, 3532540348U, 1274779536U,
- 3789419226U, 2764799539U, 1660621633U, 3471099624U,
- 4011903706U,  913787905U, 3497959166U,  737222580U,
- 2514213453U, 2928710040U, 3937242737U, 1804850592U,
- 3499020752U, 2949064160U, 2386320175U, 2390070455U,
- 2415321851U, 4061277028U, 2290661394U, 2416832540U,
- 1336762016U, 1754252060U, 3520065937U, 3014181293U,
-  791618072U, 3188594551U, 3933548030U, 2332172193U,
- 3852520463U, 3043980520U,  413987798U, 3465142937U,
- 3030929376U, 4245938359U, 2093235073U, 3534596313U,
-  375366246U, 2157278981U, 2479649556U,  555357303U,
- 3870105701U, 2008414854U, 3344188149U, 4221384143U,
- 3956125452U, 2067696032U, 3594591187U, 2921233993U,
-	2428461U,  544322398U,  577241275U, 1471733935U,
-  610547355U, 4027169054U, 1432588573U, 1507829418U,
- 2025931657U, 3646575487U,  545086370U,   48609733U,
- 2200306550U, 1653985193U,  298326376U, 1316178497U,
- 3007786442U, 2064951626U,  458293330U, 2589141269U,
- 3591329599U, 3164325604U,  727753846U, 2179363840U,
-  146436021U, 1461446943U, 4069977195U,  705550613U,
- 3059967265U, 3887724982U, 4281599278U, 3313849956U,
- 1404054877U, 2845806497U,  146425753U, 1854211946U,
-
- 1266315497U, 3048417604U, 3681880366U, 3289982499U,
- 2909710000U, 1235738493U, 2632868024U, 2414719590U,
- 3970600049U, 1771706367U, 1449415276U, 3266420449U,
-  422970021U, 1963543593U, 2690192192U, 3826793022U,
- 1062508698U, 1531092325U, 1804592342U, 2583117782U,
- 2714934279U, 4024971509U, 1294809318U, 4028980673U,
- 1289560198U, 2221992742U, 1669523910U,   35572830U,
-  157838143U, 1052438473U, 1016535060U, 1802137761U,
- 1753167236U, 1386275462U, 3080475397U, 2857371447U,
- 1040679964U, 2145300060U, 2390574316U, 1461121720U,
- 2956646967U, 4031777805U, 4028374788U,   33600511U,
- 2920084762U, 1018524850U,  629373528U, 3691585981U,
- 3515945977U, 2091462646U, 2486323059U,  586499841U,
-  988145025U,  935516892U, 3367335476U, 2599673255U,
- 2839830854U,  265290510U, 3972581182U, 2759138881U,
- 3795373465U, 1005194799U,  847297441U,  406762289U,
- 1314163512U, 1332590856U, 1866599683U, 4127851711U,
-  750260880U,  613907577U, 1450815602U, 3165620655U,
- 3734664991U, 3650291728U, 3012275730U, 3704569646U,
- 1427272223U,  778793252U, 1343938022U, 2676280711U,
- 2052605720U, 1946737175U, 3164576444U, 3914038668U,
- 3967478842U, 3682934266U, 1661551462U, 3294938066U,
- 4011595847U,  840292616U, 3712170807U,  616741398U,
-  312560963U,  711312465U, 1351876610U,  322626781U,
- 1910503582U,  271666773U, 2175563734U, 1594956187U,
-   70604529U, 3617834859U, 1007753275U, 1495573769U,
- 4069517037U, 2549218298U, 2663038764U,  504708206U,
- 2263041392U, 3941167025U, 2249088522U, 1514023603U,
- 1998579484U, 1312622330U,  694541497U, 2582060303U,
- 2151582166U, 1382467621U,  776784248U, 2618340202U,
- 3323268794U, 2497899128U, 2784771155U,  503983604U,
- 4076293799U,  907881277U,  423175695U,  432175456U,
- 1378068232U, 4145222326U, 3954048622U, 3938656102U,
- 3820766613U, 2793130115U, 2977904593U,   26017576U,
- 3274890735U, 3194772133U, 1700274565U, 1756076034U,
- 4006520079U, 3677328699U,  720338349U, 1533947780U,
-  354530856U,  688349552U, 3973924725U, 1637815568U,
-  332179504U, 3949051286U,   53804574U, 2852348879U,
- 3044236432U, 1282449977U, 3583942155U, 3416972820U,
- 4006381244U, 1617046695U, 2628476075U, 3002303598U,
- 1686838959U,  431878346U, 2686675385U, 1700445008U,
- 1080580658U, 1009431731U,  832498133U, 3223435511U,
- 2605976345U, 2271191193U, 2516031870U, 1648197032U,
- 4164389018U, 2548247927U,  300782431U,  375919233U,
-  238389289U, 3353747414U, 2531188641U, 2019080857U,
- 1475708069U,  455242339U, 2609103871U,  448939670U,
- 3451063019U, 1395535956U, 2413381860U, 1841049896U,
- 1491858159U,  885456874U, 4264095073U, 4001119347U,
- 1565136089U, 3898914787U, 1108368660U,  540939232U,
- 1173283510U, 2745871338U, 3681308437U, 4207628240U,
- 3343053890U, 4016749493U, 1699691293U, 1103962373U,
- 3625875870U, 2256883143U, 3830138730U, 1031889488U,
- 3479347698U, 1535977030U, 4236805024U, 3251091107U,
- 2132092099U, 1774941330U, 1199868427U, 1452454533U,
-  157007616U, 2904115357U,  342012276U,  595725824U,
- 1480756522U,  206960106U,  497939518U,  591360097U,
-  863170706U, 2375253569U, 3596610801U, 1814182875U,
- 2094937945U, 3421402208U, 1082520231U, 3463918190U,
- 2785509508U,  435703966U, 3908032597U, 1641649973U,
- 2842273706U, 3305899714U, 1510255612U, 2148256476U,
- 2655287854U, 3276092548U, 4258621189U,  236887753U,
- 3681803219U,  274041037U, 1734335097U, 3815195456U,
- 3317970021U, 1899903192U, 1026095262U, 4050517792U,
-  356393447U, 2410691914U, 3873677099U, 3682840055U,
-
- 3913112168U, 2491498743U, 4132185628U, 2489919796U,
- 1091903735U, 1979897079U, 3170134830U, 3567386728U,
- 3557303409U,  857797738U, 1136121015U, 1342202287U,
-  507115054U, 2535736646U,  337727348U, 3213592640U,
- 1301675037U, 2528481711U, 1895095763U, 1721773893U,
- 3216771564U,   62756741U, 2142006736U,  835421444U,
- 2531993523U, 1442658625U, 3659876326U, 2882144922U,
-  676362277U, 1392781812U,  170690266U, 3921047035U,
- 1759253602U, 3611846912U, 1745797284U,  664899054U,
- 1329594018U, 3901205900U, 3045908486U, 2062866102U,
- 2865634940U, 3543621612U, 3464012697U, 1080764994U,
-  553557557U, 3656615353U, 3996768171U,  991055499U,
-  499776247U, 1265440854U,  648242737U, 3940784050U,
-  980351604U, 3713745714U, 1749149687U, 3396870395U,
- 4211799374U, 3640570775U, 1161844396U, 3125318951U,
- 1431517754U,  545492359U, 4268468663U, 3499529547U,
- 1437099964U, 2702547544U, 3433638243U, 2581715763U,
- 2787789398U, 1060185593U, 1593081372U, 2418618748U,
- 4260947970U,   69676912U, 2159744348U,   86519011U,
- 2512459080U, 3838209314U, 1220612927U, 3339683548U,
-  133810670U, 1090789135U, 1078426020U, 1569222167U,
-  845107691U, 3583754449U, 4072456591U, 1091646820U,
-  628848692U, 1613405280U, 3757631651U,  526609435U,
-  236106946U,   48312990U, 2942717905U, 3402727701U,
- 1797494240U,  859738849U,  992217954U, 4005476642U,
- 2243076622U, 3870952857U, 3732016268U,  765654824U,
- 3490871365U, 2511836413U, 1685915746U, 3888969200U,
- 1414112111U, 2273134842U, 3281911079U, 4080962846U,
-  172450625U, 2569994100U,  980381355U, 4109958455U,
- 2819808352U, 2716589560U, 2568741196U, 3681446669U,
- 3329971472U, 1835478071U,  660984891U, 3704678404U,
- 4045999559U, 3422617507U, 3040415634U, 1762651403U,
- 1719377915U, 3470491036U, 2693910283U, 3642056355U,
- 3138596744U, 1364962596U, 2073328063U, 1983633131U,
-  926494387U, 3423689081U, 2150032023U, 4096667949U,
- 1749200295U, 3328846651U,  309677260U, 2016342300U,
- 1779581495U, 3079819751U,  111262694U, 1274766160U,
-  443224088U,  298511866U, 1025883608U, 3806446537U,
- 1145181785U,  168956806U, 3641502830U, 3584813610U,
- 1689216846U, 3666258015U, 3200248200U, 1692713982U,
- 2646376535U, 4042768518U, 1618508792U, 1610833997U,
- 3523052358U, 4130873264U, 2001055236U, 3610705100U,
- 2202168115U, 4028541809U, 2961195399U, 1006657119U,
- 2006996926U, 3186142756U, 1430667929U, 3210227297U,
- 1314452623U, 4074634658U, 4101304120U, 2273951170U,
- 1399257539U, 3367210612U, 3027628629U, 1190975929U,
- 2062231137U, 2333990788U, 2221543033U, 2438960610U,
- 1181637006U,  548689776U, 2362791313U, 3372408396U,
- 3104550113U, 3145860560U,  296247880U, 1970579870U,
- 3078560182U, 3769228297U, 1714227617U, 3291629107U,
- 3898220290U,  166772364U, 1251581989U,  493813264U,
-  448347421U,  195405023U, 2709975567U,  677966185U,
- 3703036547U, 1463355134U, 2715995803U, 1338867538U,
- 1343315457U, 2802222074U, 2684532164U,  233230375U,
- 2599980071U, 2000651841U, 3277868038U, 1638401717U,
- 4028070440U, 3237316320U,    6314154U,  819756386U,
-  300326615U,  590932579U, 1405279636U, 3267499572U,
- 3150704214U, 2428286686U, 3959192993U, 3461946742U,
- 1862657033U, 1266418056U,  963775037U, 2089974820U,
- 2263052895U, 1917689273U,  448879540U, 3550394620U,
- 3981727096U,  150775221U, 3627908307U, 1303187396U,
-  508620638U, 2975983352U, 2726630617U, 1817252668U,
- 1876281319U, 1457606340U,  908771278U, 3720792119U,
- 3617206836U, 2455994898U, 1729034894U, 1080033504U,
-
-  976866871U, 3556439503U, 2881648439U, 1522871579U,
- 1555064734U, 1336096578U, 3548522304U, 2579274686U,
- 3574697629U, 3205460757U, 3593280638U, 3338716283U,
- 3079412587U,  564236357U, 2993598910U, 1781952180U,
- 1464380207U, 3163844217U, 3332601554U, 1699332808U,
- 1393555694U, 1183702653U, 3581086237U, 1288719814U,
-  691649499U, 2847557200U, 2895455976U, 3193889540U,
- 2717570544U, 1781354906U, 1676643554U, 2592534050U,
- 3230253752U, 1126444790U, 2770207658U, 2633158820U,
- 2210423226U, 2615765581U, 2414155088U, 3127139286U,
-  673620729U, 2805611233U, 1269405062U, 4015350505U,
- 3341807571U, 4149409754U, 1057255273U, 2012875353U,
- 2162469141U, 2276492801U, 2601117357U,  993977747U,
- 3918593370U, 2654263191U,  753973209U,   36408145U,
- 2530585658U,   25011837U, 3520020182U, 2088578344U,
-  530523599U, 2918365339U, 1524020338U, 1518925132U,
- 3760827505U, 3759777254U, 1202760957U, 3985898139U,
- 3906192525U,  674977740U, 4174734889U, 2031300136U,
- 2019492241U, 3983892565U, 4153806404U, 3822280332U,
-  352677332U, 2297720250U,   60907813U,   90501309U,
- 3286998549U, 1016092578U, 2535922412U, 2839152426U,
-  457141659U,  509813237U, 4120667899U,  652014361U,
- 1966332200U, 2975202805U,   55981186U, 2327461051U,
-  676427537U, 3255491064U, 2882294119U, 3433927263U,
- 1307055953U,  942726286U,  933058658U, 2468411793U,
- 3933900994U, 4215176142U, 1361170020U, 2001714738U,
- 2830558078U, 3274259782U, 1222529897U, 1679025792U,
- 2729314320U, 3714953764U, 1770335741U,  151462246U,
- 3013232138U, 1682292957U, 1483529935U,  471910574U,
- 1539241949U,  458788160U, 3436315007U, 1807016891U,
- 3718408830U,  978976581U, 1043663428U, 3165965781U,
- 1927990952U, 4200891579U, 2372276910U, 3208408903U,
- 3533431907U, 1412390302U, 2931980059U, 4132332400U,
- 1947078029U, 3881505623U, 4168226417U, 2941484381U,
- 1077988104U, 1320477388U,  886195818U,   18198404U,
- 3786409000U, 2509781533U,  112762804U, 3463356488U,
- 1866414978U,  891333506U,   18488651U,  661792760U,
- 1628790961U, 3885187036U, 3141171499U,  876946877U,
- 2693282273U, 1372485963U,  791857591U, 2686433993U,
- 3759982718U, 3167212022U, 3472953795U, 2716379847U,
-  445679433U, 3561995674U, 3504004811U, 3574258232U,
-   54117162U, 3331405415U, 2381918588U, 3769707343U,
- 4154350007U, 1140177722U, 4074052095U,  668550556U,
- 3214352940U,  367459370U,  261225585U, 2610173221U,
- 4209349473U, 3468074219U, 3265815641U,  314222801U,
- 3066103646U, 3808782860U,  282218597U, 3406013506U,
- 3773591054U,  379116347U, 1285071038U,  846784868U,
- 2669647154U, 3771962079U, 3550491691U, 2305946142U,
-  453669953U, 1268987020U, 3317592352U, 3279303384U,
- 3744833421U, 2610507566U, 3859509063U,  266596637U,
- 3847019092U,  517658769U, 3462560207U, 3443424879U,
-  370717030U, 4247526661U, 2224018117U, 4143653529U,
- 4112773975U, 2788324899U, 2477274417U, 1456262402U,
- 2901442914U, 1517677493U, 1846949527U, 2295493580U,
- 3734397586U, 2176403920U, 1280348187U, 1908823572U,
- 3871786941U,  846861322U, 1172426758U, 3287448474U,
- 3383383037U, 1655181056U, 3139813346U,  901632758U,
- 1897031941U, 2986607138U, 3066810236U, 3447102507U,
- 1393639104U,  373351379U,  950779232U,  625454576U,
- 3124240540U, 4148612726U, 2007998917U,  544563296U,
- 2244738638U, 2330496472U, 2058025392U, 1291430526U,
-  424198748U,   50039436U,   29584100U, 3605783033U,
- 2429876329U, 2791104160U, 1057563949U, 3255363231U,
- 3075367218U, 3463963227U, 1469046755U,  985887462U
-};
-
-
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/blowfish.cpp b/extra/yassl/taocrypt/src/blowfish.cpp
deleted file mode 100644
index 9491c93040e3..000000000000
--- a/extra/yassl/taocrypt/src/blowfish.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* C++ code based on Wei Dai's blowfish.cpp from CryptoPP */
-/* x86 asm is original */
-
-
-#if defined(TAOCRYPT_KERNEL_MODE)
-    #define DO_TAOCRYPT_KERNEL_MODE
-#endif                                  // only some modules now support this
-
-
-#include "runtime.hpp"
-#include "blowfish.hpp"
-
-
-
-
-
-namespace TaoCrypt {
-
-
-#if defined(DO_BLOWFISH_ASM)
-
-// ia32 optimized version
-void Blowfish::Process(byte* out, const byte* in, word32 sz)
-{
-    if (!isMMX) {
-        Mode_BASE::Process(out, in, sz);
-        return;
-    }
-
-    word32 blocks = sz / BLOCK_SIZE;
-
-    if (mode_ == ECB)
-        while (blocks--) {
-            AsmProcess(in, out);
-            out += BLOCK_SIZE;
-            in  += BLOCK_SIZE;
-        }
-    else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION) {
-            while (blocks--) {
-                r_[0] ^= *(word32*)in;
-                r_[1] ^= *(word32*)(in + 4);
-
-                AsmProcess((byte*)r_, (byte*)r_);
-                
-                memcpy(out, r_, BLOCK_SIZE);
-
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-        else {
-            while (blocks--) {
-                AsmProcess(in, out);
-                
-                *(word32*)out       ^= r_[0];
-                *(word32*)(out + 4) ^= r_[1];
-
-                memcpy(r_, in, BLOCK_SIZE);
-
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-    }
-}
-
-#endif // DO_BLOWFISH_ASM
-
-
-void Blowfish::SetKey(const byte* key_string, word32 keylength, CipherDir dir)
-{
-    if (keylength < 4)
-        keylength = 4;
-    else if (keylength > 56)
-        keylength = 56;
-
-	unsigned i, j=0, k;
-	word32 data, dspace[2] = {0, 0};
-
-	memcpy(pbox_, p_init_, sizeof(p_init_));
-	memcpy(sbox_, s_init_, sizeof(s_init_));
-
-	// Xor key string into encryption key vector
-	for (i=0 ; i<ROUNDS+2 ; ++i) {
-		data = 0;
-		for (k=0 ; k<4 ; ++k )
-			data = (data << 8) | key_string[j++ % keylength];
-		pbox_[i] ^= data;
-	}
-
-	crypt_block(dspace, pbox_);
-
-	for (i=0; i<ROUNDS; i+=2)
-		crypt_block(pbox_ + i, pbox_ + i + 2);
-
-	crypt_block(pbox_ + ROUNDS, sbox_);
-
-	for (i=0; i < 4*256-2; i+=2)
-		crypt_block(sbox_ + i, sbox_ + i + 2);
-
-	if (dir==DECRYPTION)
-		for (i=0; i<(ROUNDS+2)/2; i++)
-			STL::swap(pbox_[i], pbox_[ROUNDS+1-i]);
-}
-
-
-#define BFBYTE_0(x) ( x     &0xFF)
-#define BFBYTE_1(x) ((x>> 8)&0xFF)
-#define BFBYTE_2(x) ((x>>16)&0xFF)
-#define BFBYTE_3(x) ( x>>24)
-
-
-#define BF_S(Put, Get, I) (\
-        Put ^= p[I], \
-		tmp =  p[18 + BFBYTE_3(Get)],  \
-        tmp += p[274+ BFBYTE_2(Get)],  \
-        tmp ^= p[530+ BFBYTE_1(Get)],  \
-        tmp += p[786+ BFBYTE_0(Get)],  \
-        Put ^= tmp \
-    )
-
-
-#define BF_ROUNDS           \
-    BF_S(right, left,  1);  \
-    BF_S(left,  right, 2);  \
-    BF_S(right, left,  3);  \
-    BF_S(left,  right, 4);  \
-    BF_S(right, left,  5);  \
-    BF_S(left,  right, 6);  \
-    BF_S(right, left,  7);  \
-    BF_S(left,  right, 8);  \
-    BF_S(right, left,  9);  \
-    BF_S(left,  right, 10); \
-    BF_S(right, left,  11); \
-    BF_S(left,  right, 12); \
-    BF_S(right, left,  13); \
-    BF_S(left,  right, 14); \
-    BF_S(right, left,  15); \
-    BF_S(left,  right, 16); 
-
-#define BF_EXTRA_ROUNDS     \
-    BF_S(right, left,  17); \
-    BF_S(left,  right, 18); \
-    BF_S(right, left,  19); \
-    BF_S(left,  right, 20);
-
-
-// Used by key setup, no byte swapping
-void Blowfish::crypt_block(const word32 in[2], word32 out[2]) const
-{
-	word32 left  = in[0];
-	word32 right = in[1];
-
-	const word32  *const s = sbox_;
-	const word32* p = pbox_;
-
-	left ^= p[0];
-
-    // roll back up and use s and p index instead of just p
-    for (unsigned i = 0; i < ROUNDS / 2; i++) {
-        right ^= (((s[GETBYTE(left,3)] + s[256+GETBYTE(left,2)])
-            ^ s[2*256+GETBYTE(left,1)]) + s[3*256+GETBYTE(left,0)])
-            ^ p[2*i+1];
-
-        left ^= (((s[GETBYTE(right,3)] + s[256+GETBYTE(right,2)])
-            ^ s[2*256+GETBYTE(right,1)]) + s[3*256+GETBYTE(right,0)])
-            ^ p[2*i+2];
-    }
-
-	right ^= p[ROUNDS + 1];
-
-	out[0] = right;
-	out[1] = left;
-}
-
-
-typedef BlockGetAndPut<word32, BigEndian> gpBlock;
-
-void Blowfish::ProcessAndXorBlock(const byte* in, const byte* xOr, byte* out)
-    const
-{
-    word32 left, right;
-	const word32  *const s = sbox_;
-    const word32* p = pbox_;
-    
-    gpBlock::Get(in)(left)(right);
-	left ^= p[0];
-
-    // roll back up and use s and p index instead of just p
-    for (unsigned i = 0; i < ROUNDS / 2; i++) {
-        right ^= (((s[GETBYTE(left,3)] + s[256+GETBYTE(left,2)])
-            ^ s[2*256+GETBYTE(left,1)]) + s[3*256+GETBYTE(left,0)])
-            ^ p[2*i+1];
-
-        left ^= (((s[GETBYTE(right,3)] + s[256+GETBYTE(right,2)])
-            ^ s[2*256+GETBYTE(right,1)]) + s[3*256+GETBYTE(right,0)])
-            ^ p[2*i+2];
-    }
-
-	right ^= p[ROUNDS + 1];
-
-    gpBlock::Put(xOr, out)(right)(left);
-}
-
-
-#if defined(DO_BLOWFISH_ASM)
-    #ifdef __GNUC__
-        #define AS1(x)    #x ";"
-        #define AS2(x, y) #x ", " #y ";"
-
-        #define PROLOG()  \
-        __asm__ __volatile__ \
-        ( \
-            ".intel_syntax noprefix;" \
-            "push ebx;" \
-            "push ebp;" \
-            "movd mm3, eax;"
-        #define EPILOG()  \
-            "pop ebp;" \
-            "pop ebx;" \
-       	    "emms;" \
-       	    ".att_syntax;" \
-                : \
-                : "c" (this), "S" (inBlock), "a" (outBlock) \
-                : "%edi", "%edx", "memory", "cc" \
-        );
-
-    #else
-        #define AS1(x)    __asm x
-        #define AS2(x, y) __asm x, y
-
-        #define PROLOG() \
-            AS1(    push  ebp                           )   \
-            AS2(    mov   ebp, esp                      )   \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    mov   esi, DWORD PTR [ebp +  8]     )
-
-        #define EPILOG()  \
-            AS2(    movd esi, mm5                       )   \
-            AS2(    movd ebx, mm4                       )   \
-            AS2(    movd edi, mm3                       )   \
-            AS2(    mov  esp, ebp                       )   \
-            AS1(    pop  ebp                            )   \
-            AS1(    emms                                )   \
-            AS1(    ret 8                               )
-            
-    #endif
-
-
-#define BF_ROUND(P, G, I)   \
-    /* Put ^= p[I]  */                              \
-    AS2(    xor   P,   [edi + I*4]              )   \
-    /* tmp =  p[18 + BFBYTE_3(Get)] */              \
-    AS2(    mov   ecx, G                        )   \
-    AS2(    shr   ecx, 16                       )   \
-    AS2(    movzx edx, ch                       )   \
-    AS2(    mov   esi, [edi + edx*4 +   72]     )   \
-    /* tmp += p[274+ BFBYTE_2(Get)] */              \
-    AS2(    movzx ecx, cl                       )   \
-    AS2(    add   esi, [edi + ecx*4 + 1096]     )   \
-    /* tmp ^= p[530+ BFBYTE_1(Get)] */              \
-    AS2(    mov   ecx, G                        )   \
-    AS2(    movzx edx, ch                       )   \
-    AS2(    xor   esi, [edi + edx*4 + 2120]     )   \
-    /* tmp += p[786+ BFBYTE_0(Get)] */              \
-    AS2(    movzx ecx, cl                       )   \
-    AS2(    add   esi, [edi + ecx*4 + 3144]     )   \
-    /* Put ^= tmp */                                \
-    AS2(    xor   P,   esi                      )
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void Blowfish::AsmProcess(const byte* inBlock, byte* outBlock) const
-{
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    lea   edi, [ecx + 60]                       )   // pbox
-    #else
-        AS2(    lea   edi, [ecx + 56]                       )   // pbox
-    #endif
-
-    AS2(    mov   eax, DWORD PTR [esi]                                  )
-    AS2(    mov   edx, DWORD PTR [edi]                                  )
-    AS1(    bswap eax                                                   )
-
-    AS2(    mov   ebx, DWORD PTR [esi + 4]                              )
-    AS2(    xor   eax, edx                      )   // left
-    AS1(    bswap ebx                           )   // right
-
-
-    BF_ROUND(ebx, eax, 1)
-    BF_ROUND(eax, ebx, 2)
-    BF_ROUND(ebx, eax, 3)
-    BF_ROUND(eax, ebx, 4)
-    BF_ROUND(ebx, eax, 5)
-    BF_ROUND(eax, ebx, 6)
-    BF_ROUND(ebx, eax, 7)
-    BF_ROUND(eax, ebx, 8)
-    BF_ROUND(ebx, eax, 9)
-    BF_ROUND(eax, ebx, 10)
-    BF_ROUND(ebx, eax, 11)
-    BF_ROUND(eax, ebx, 12)
-    BF_ROUND(ebx, eax, 13)
-    BF_ROUND(eax, ebx, 14)
-    BF_ROUND(ebx, eax, 15)
-    BF_ROUND(eax, ebx, 16)
-    #if ROUNDS == 20
-        BF_ROUND(ebx, eax, 17)
-        BF_ROUND(eax, ebx, 18)
-        BF_ROUND(ebx, eax, 19)
-        BF_ROUND(eax, ebx, 20)
-
-        AS2(    xor   ebx, [edi + 84]           )   // 20 + 1 (x4)
-    #else
-        AS2(    xor   ebx, [edi + 68]           )   // 16 + 1 (x4)
-    #endif
-
-    #ifdef __GNUC__
-        AS2(    movd  edi, mm3                  ) // outBlock
-    #else
-        AS2(    mov   edi, [ebp + 12]           ) // outBlock
-    #endif
-
-    AS1(    bswap ebx                           )
-    AS1(    bswap eax                           )
-
-    AS2(    mov   [edi]    , ebx                )
-    AS2(    mov   [edi + 4], eax                )
-
-    EPILOG()
-}
-
-
-#endif  // DO_BLOWFISH_ASM
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/coding.cpp b/extra/yassl/taocrypt/src/coding.cpp
deleted file mode 100644
index bc4727cc5e3c..000000000000
--- a/extra/yassl/taocrypt/src/coding.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* coding.cpp implements hex and base64 encoding/decoing
-*/
-
-#include "runtime.hpp"
-#include "coding.hpp"
-#include "file.hpp"
-
-
-namespace TaoCrypt {
-
-
-namespace { // locals
-
-const byte bad = 0xFF;  // invalid encoding
-
-const byte hexEncode[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-                           'A', 'B', 'C', 'D', 'E', 'F'
-                         };
-
-const byte hexDecode[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-                           bad, bad, bad, bad, bad, bad, bad,
-                           10, 11, 12, 13, 14, 15 
-                         };  // A starts at 0x41 not 0x3A
-
-
-const byte base64Encode[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-                              'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-                              'U', 'V', 'W', 'X', 'Y', 'Z',
-                              'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-                              'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
-                              'u', 'v', 'w', 'x', 'y', 'z',
-                              '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-                              '+', '/'
-                            };
-
-const byte base64Decode[] = { 62, bad, bad, bad, 63,   // + starts at 0x2B
-                              52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-                              bad, bad, bad, bad, bad, bad, bad,
-                              0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-                              10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                              20, 21, 22, 23, 24, 25,
-                              bad, bad, bad, bad, bad, bad,
-                              26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-                              36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-                              46, 47, 48, 49, 50, 51
-                            };
-
-const byte pad = '=';
-const int pemLineSz = 64;
-
-}  // local namespace
-
-
-// Hex Encode
-void HexEncoder::Encode()
-{
-    word32 bytes = plain_.size();
-    encoded_.New(bytes * 2);
-
-    word32 i = 0;
-
-    while (bytes--) {
-        byte p = plain_.next();
-
-        byte b  = p >> 4;
-        byte b2 = p & 0xF;
-
-        encoded_[i++] = hexEncode[b];
-        encoded_[i++] = hexEncode[b2];
-    }
-
-    plain_.reset(encoded_);
-}
-
-
-// Hex Decode
-void HexDecoder::Decode()
-{
-    word32 bytes = coded_.size();
-    decoded_.New(bytes / 2);
-
-    word32 i(0);
-
-    while (bytes) {
-        byte b  = coded_.next() - 0x30;  // 0 starts at 0x30
-        byte b2 = coded_.next() - 0x30;
-
-        // sanity checks
-        if (b >= sizeof(hexDecode)/sizeof(hexDecode[0])) {
-            coded_.SetError(PEM_E);
-            return;
-        }
-        if (b2 >= sizeof(hexDecode)/sizeof(hexDecode[0])) {
-            coded_.SetError(PEM_E);
-            return;
-        }
-
-        b  = hexDecode[b];
-        b2 = hexDecode[b2];
-
-        decoded_[i++] = (b << 4) | b2;
-        bytes -= 2;
-    }
-
-    coded_.reset(decoded_);
-}
-
-
-// Base 64 Encode
-void Base64Encoder::Encode()
-{
-    word32 bytes = plain_.size();
-    word32 outSz = (bytes + 3 - 1) / 3 * 4;
-
-    outSz += (outSz + pemLineSz - 1) / pemLineSz;  // new lines
-    encoded_.New(outSz);
-
-    word32 i = 0;
-    word32 j = 0;
-    
-    while (bytes > 2) {
-        byte b1 = plain_.next();
-        byte b2 = plain_.next();
-        byte b3 = plain_.next();
-
-        // encoded idx
-        byte e1 = b1 >> 2;
-        byte e2 = ((b1 & 0x3) << 4) | (b2 >> 4);
-        byte e3 = ((b2 & 0xF) << 2) | (b3 >> 6);
-        byte e4 = b3 & 0x3F;
-
-        // store
-        encoded_[i++] = base64Encode[e1];
-        encoded_[i++] = base64Encode[e2];
-        encoded_[i++] = base64Encode[e3];
-        encoded_[i++] = base64Encode[e4];
-
-        bytes -= 3;
-
-        if ((++j % 16) == 0 && bytes)
-            encoded_[i++] = '\n';
-    }
-
-    // last integral
-    if (bytes) {
-        bool twoBytes = (bytes == 2);
-
-        byte b1 = plain_.next();
-        byte b2 = (twoBytes) ? plain_.next() : 0;
-
-        byte e1 = b1 >> 2;
-        byte e2 = ((b1 & 0x3) << 4) | (b2 >> 4);
-        byte e3 =  (b2 & 0xF) << 2;
-
-        encoded_[i++] = base64Encode[e1];
-        encoded_[i++] = base64Encode[e2];
-        encoded_[i++] = (twoBytes) ? base64Encode[e3] : pad;
-        encoded_[i++] = pad;
-    } 
-
-    encoded_[i++] = '\n';
-    
-    if (i == outSz)
-        plain_.reset(encoded_);
-}
-
-
-// Base 64 Decode
-void Base64Decoder::Decode()
-{
-    word32 bytes = coded_.size();
-    word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz); 
-    const  byte maxIdx = (byte)sizeof(base64Decode) + 0x2B - 1;
-    plainSz = ((plainSz * 3) / 4) + 3;
-    decoded_.New(plainSz);
-
-    word32 i = 0;
-    word32 j = 0;
-
-    while (bytes > 3) {
-        byte e1 = coded_.next();
-        byte e2 = coded_.next();
-        byte e3 = coded_.next();
-        byte e4 = coded_.next();
-
-        if (e1 == 0)            // end file 0's
-            break;
-
-        bool pad3 = false;
-        bool pad4 = false;
-        if (e3 == pad)
-            pad3 = true;
-        if (e4 == pad)
-            pad4 = true;
-
-        if (e1 < 0x2B || e2 < 0x2B || e3 < 0x2B || e4 < 0x2B) {
-            coded_.SetError(PEM_E);
-            return;
-        }
-
-        if (e1 > maxIdx || e2 > maxIdx || e3 > maxIdx || e4 > maxIdx) {
-            coded_.SetError(PEM_E);
-            return;
-        }
-
-        e1 = base64Decode[e1 - 0x2B];
-        e2 = base64Decode[e2 - 0x2B];
-        e3 = (e3 == pad) ? 0 : base64Decode[e3 - 0x2B];
-        e4 = (e4 == pad) ? 0 : base64Decode[e4 - 0x2B];
-
-        byte b1 = (e1 << 2) | (e2 >> 4);
-        byte b2 = ((e2 & 0xF) << 4) | (e3 >> 2);
-        byte b3 = ((e3 & 0x3) << 6) | e4;
-
-        decoded_[i++] = b1;
-        if (!pad3)
-            decoded_[i++] = b2;
-        if (!pad4)
-            decoded_[i++] = b3;
-        else
-            break;
-        
-        bytes -= 4;
-        if ((++j % 16) == 0) {
-            byte endLine = coded_.next();
-            bytes--;
-            while (endLine == ' ') {        // remove possible whitespace
-                endLine = coded_.next();
-                bytes--;
-            }
-            if (endLine == '\r') {
-                endLine = coded_.next();
-                bytes--;
-            }
-            if (endLine != '\n') {
-                coded_.SetError(PEM_E); 
-                return;
-            }
-        }
-    }
-
-    if (i != decoded_.size())
-        decoded_.resize(i);
-    coded_.reset(decoded_);
-}
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/des.cpp b/extra/yassl/taocrypt/src/des.cpp
deleted file mode 100644
index 53777f082199..000000000000
--- a/extra/yassl/taocrypt/src/des.cpp
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* C++ part based on Wei Dai's des.cpp from CryptoPP */
-/* x86 asm is original */
-
-
-#if defined(TAOCRYPT_KERNEL_MODE)
-    #define DO_TAOCRYPT_KERNEL_MODE
-#endif                                  // only some modules now support this
-
-
-#include "runtime.hpp"
-#include "des.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-
-namespace TaoCrypt {
-
-
-/* permuted choice table (key) */
-static const byte pc1[] = {
-       57, 49, 41, 33, 25, 17,  9,
-        1, 58, 50, 42, 34, 26, 18,
-       10,  2, 59, 51, 43, 35, 27,
-       19, 11,  3, 60, 52, 44, 36,
-
-       63, 55, 47, 39, 31, 23, 15,
-        7, 62, 54, 46, 38, 30, 22,
-       14,  6, 61, 53, 45, 37, 29,
-       21, 13,  5, 28, 20, 12,  4
-};
-
-/* number left rotations of pc1 */
-static const byte totrot[] = {
-       1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28
-};
-
-/* permuted choice key (table) */
-static const byte pc2[] = {
-       14, 17, 11, 24,  1,  5,
-        3, 28, 15,  6, 21, 10,
-       23, 19, 12,  4, 26,  8,
-       16,  7, 27, 20, 13,  2,
-       41, 52, 31, 37, 47, 55,
-       30, 40, 51, 45, 33, 48,
-       44, 49, 39, 56, 34, 53,
-       46, 42, 50, 36, 29, 32
-};
-
-/* End of DES-defined tables */
-
-/* bit 0 is left-most in byte */
-static const int bytebit[] = {
-       0200,0100,040,020,010,04,02,01
-};
-
-const word32 Spbox[8][64] = {
-{
-0x01010400,0x00000000,0x00010000,0x01010404,
-0x01010004,0x00010404,0x00000004,0x00010000,
-0x00000400,0x01010400,0x01010404,0x00000400,
-0x01000404,0x01010004,0x01000000,0x00000004,
-0x00000404,0x01000400,0x01000400,0x00010400,
-0x00010400,0x01010000,0x01010000,0x01000404,
-0x00010004,0x01000004,0x01000004,0x00010004,
-0x00000000,0x00000404,0x00010404,0x01000000,
-0x00010000,0x01010404,0x00000004,0x01010000,
-0x01010400,0x01000000,0x01000000,0x00000400,
-0x01010004,0x00010000,0x00010400,0x01000004,
-0x00000400,0x00000004,0x01000404,0x00010404,
-0x01010404,0x00010004,0x01010000,0x01000404,
-0x01000004,0x00000404,0x00010404,0x01010400,
-0x00000404,0x01000400,0x01000400,0x00000000,
-0x00010004,0x00010400,0x00000000,0x01010004},
-{
-0x80108020,0x80008000,0x00008000,0x00108020,
-0x00100000,0x00000020,0x80100020,0x80008020,
-0x80000020,0x80108020,0x80108000,0x80000000,
-0x80008000,0x00100000,0x00000020,0x80100020,
-0x00108000,0x00100020,0x80008020,0x00000000,
-0x80000000,0x00008000,0x00108020,0x80100000,
-0x00100020,0x80000020,0x00000000,0x00108000,
-0x00008020,0x80108000,0x80100000,0x00008020,
-0x00000000,0x00108020,0x80100020,0x00100000,
-0x80008020,0x80100000,0x80108000,0x00008000,
-0x80100000,0x80008000,0x00000020,0x80108020,
-0x00108020,0x00000020,0x00008000,0x80000000,
-0x00008020,0x80108000,0x00100000,0x80000020,
-0x00100020,0x80008020,0x80000020,0x00100020,
-0x00108000,0x00000000,0x80008000,0x00008020,
-0x80000000,0x80100020,0x80108020,0x00108000},
-{
-0x00000208,0x08020200,0x00000000,0x08020008,
-0x08000200,0x00000000,0x00020208,0x08000200,
-0x00020008,0x08000008,0x08000008,0x00020000,
-0x08020208,0x00020008,0x08020000,0x00000208,
-0x08000000,0x00000008,0x08020200,0x00000200,
-0x00020200,0x08020000,0x08020008,0x00020208,
-0x08000208,0x00020200,0x00020000,0x08000208,
-0x00000008,0x08020208,0x00000200,0x08000000,
-0x08020200,0x08000000,0x00020008,0x00000208,
-0x00020000,0x08020200,0x08000200,0x00000000,
-0x00000200,0x00020008,0x08020208,0x08000200,
-0x08000008,0x00000200,0x00000000,0x08020008,
-0x08000208,0x00020000,0x08000000,0x08020208,
-0x00000008,0x00020208,0x00020200,0x08000008,
-0x08020000,0x08000208,0x00000208,0x08020000,
-0x00020208,0x00000008,0x08020008,0x00020200},
-{
-0x00802001,0x00002081,0x00002081,0x00000080,
-0x00802080,0x00800081,0x00800001,0x00002001,
-0x00000000,0x00802000,0x00802000,0x00802081,
-0x00000081,0x00000000,0x00800080,0x00800001,
-0x00000001,0x00002000,0x00800000,0x00802001,
-0x00000080,0x00800000,0x00002001,0x00002080,
-0x00800081,0x00000001,0x00002080,0x00800080,
-0x00002000,0x00802080,0x00802081,0x00000081,
-0x00800080,0x00800001,0x00802000,0x00802081,
-0x00000081,0x00000000,0x00000000,0x00802000,
-0x00002080,0x00800080,0x00800081,0x00000001,
-0x00802001,0x00002081,0x00002081,0x00000080,
-0x00802081,0x00000081,0x00000001,0x00002000,
-0x00800001,0x00002001,0x00802080,0x00800081,
-0x00002001,0x00002080,0x00800000,0x00802001,
-0x00000080,0x00800000,0x00002000,0x00802080},
-{
-0x00000100,0x02080100,0x02080000,0x42000100,
-0x00080000,0x00000100,0x40000000,0x02080000,
-0x40080100,0x00080000,0x02000100,0x40080100,
-0x42000100,0x42080000,0x00080100,0x40000000,
-0x02000000,0x40080000,0x40080000,0x00000000,
-0x40000100,0x42080100,0x42080100,0x02000100,
-0x42080000,0x40000100,0x00000000,0x42000000,
-0x02080100,0x02000000,0x42000000,0x00080100,
-0x00080000,0x42000100,0x00000100,0x02000000,
-0x40000000,0x02080000,0x42000100,0x40080100,
-0x02000100,0x40000000,0x42080000,0x02080100,
-0x40080100,0x00000100,0x02000000,0x42080000,
-0x42080100,0x00080100,0x42000000,0x42080100,
-0x02080000,0x00000000,0x40080000,0x42000000,
-0x00080100,0x02000100,0x40000100,0x00080000,
-0x00000000,0x40080000,0x02080100,0x40000100},
-{
-0x20000010,0x20400000,0x00004000,0x20404010,
-0x20400000,0x00000010,0x20404010,0x00400000,
-0x20004000,0x00404010,0x00400000,0x20000010,
-0x00400010,0x20004000,0x20000000,0x00004010,
-0x00000000,0x00400010,0x20004010,0x00004000,
-0x00404000,0x20004010,0x00000010,0x20400010,
-0x20400010,0x00000000,0x00404010,0x20404000,
-0x00004010,0x00404000,0x20404000,0x20000000,
-0x20004000,0x00000010,0x20400010,0x00404000,
-0x20404010,0x00400000,0x00004010,0x20000010,
-0x00400000,0x20004000,0x20000000,0x00004010,
-0x20000010,0x20404010,0x00404000,0x20400000,
-0x00404010,0x20404000,0x00000000,0x20400010,
-0x00000010,0x00004000,0x20400000,0x00404010,
-0x00004000,0x00400010,0x20004010,0x00000000,
-0x20404000,0x20000000,0x00400010,0x20004010},
-{
-0x00200000,0x04200002,0x04000802,0x00000000,
-0x00000800,0x04000802,0x00200802,0x04200800,
-0x04200802,0x00200000,0x00000000,0x04000002,
-0x00000002,0x04000000,0x04200002,0x00000802,
-0x04000800,0x00200802,0x00200002,0x04000800,
-0x04000002,0x04200000,0x04200800,0x00200002,
-0x04200000,0x00000800,0x00000802,0x04200802,
-0x00200800,0x00000002,0x04000000,0x00200800,
-0x04000000,0x00200800,0x00200000,0x04000802,
-0x04000802,0x04200002,0x04200002,0x00000002,
-0x00200002,0x04000000,0x04000800,0x00200000,
-0x04200800,0x00000802,0x00200802,0x04200800,
-0x00000802,0x04000002,0x04200802,0x04200000,
-0x00200800,0x00000000,0x00000002,0x04200802,
-0x00000000,0x00200802,0x04200000,0x00000800,
-0x04000002,0x04000800,0x00000800,0x00200002},
-{
-0x10001040,0x00001000,0x00040000,0x10041040,
-0x10000000,0x10001040,0x00000040,0x10000000,
-0x00040040,0x10040000,0x10041040,0x00041000,
-0x10041000,0x00041040,0x00001000,0x00000040,
-0x10040000,0x10000040,0x10001000,0x00001040,
-0x00041000,0x00040040,0x10040040,0x10041000,
-0x00001040,0x00000000,0x00000000,0x10040040,
-0x10000040,0x10001000,0x00041040,0x00040000,
-0x00041040,0x00040000,0x10041000,0x00001000,
-0x00000040,0x10040040,0x00001000,0x00041040,
-0x10001000,0x00000040,0x10000040,0x10040000,
-0x10040040,0x10000000,0x00040000,0x10001040,
-0x00000000,0x10041040,0x00040040,0x10000040,
-0x10040000,0x10001000,0x10001040,0x00000000,
-0x10041040,0x00041000,0x00041000,0x00001040,
-0x00001040,0x00040040,0x10000000,0x10041000}
-};
-
-
-void BasicDES::SetKey(const byte* key, word32 /*length*/, CipherDir dir)
-{
-    byte buffer[56+56+8];
-    byte *const pc1m = buffer;                 /* place to modify pc1 into */
-    byte *const pcr = pc1m + 56;               /* place to rotate pc1 into */
-    byte *const ks = pcr + 56;
-    int i,j,l;
-    int m;
-
-    for (j = 0; j < 56; j++) {          /* convert pc1 to bits of key */
-        l = pc1[j] - 1;                 /* integer bit location  */
-        m = l & 07;                     /* find bit              */
-        pc1m[j] = (key[l >> 3] &        /* find which key byte l is in */
-            bytebit[m])                 /* and which bit of that byte */
-            ? 1 : 0;                    /* and store 1-bit result */
-    }
-    for (i = 0; i < 16; i++) {          /* key chunk for each iteration */
-        memset(ks, 0, 8);               /* Clear key schedule */
-        for (j = 0; j < 56; j++)        /* rotate pc1 the right amount */
-            pcr[j] = pc1m[(l = j + totrot[i]) < (j < 28 ? 28 : 56) ? l: l-28];
-        /* rotate left and right halves independently */
-        for (j = 0; j < 48; j++){   /* select bits individually */
-            /* check bit that goes to ks[j] */
-            if (pcr[pc2[j] - 1]){
-                /* mask it in if it's there */
-                l= j % 6;
-                ks[j/6] |= bytebit[l] >> 2;
-            }
-        }
-        /* Now convert to odd/even interleaved form for use in F */
-        k_[2*i] = ((word32)ks[0] << 24)
-            | ((word32)ks[2] << 16)
-            | ((word32)ks[4] << 8)
-            | ((word32)ks[6]);
-        k_[2*i + 1] = ((word32)ks[1] << 24)
-            | ((word32)ks[3] << 16)
-            | ((word32)ks[5] << 8)
-            | ((word32)ks[7]);
-    }
-    
-    // reverse key schedule order
-    if (dir == DECRYPTION)
-        for (i = 0; i < 16; i += 2) {
-            STL::swap(k_[i],   k_[32 - 2 - i]);
-            STL::swap(k_[i+1], k_[32 - 1 - i]);
-        }
-   
-}
-
-static inline void IPERM(word32& left, word32& right)
-{
-    word32 work;
-
-    right = rotlFixed(right, 4U);
-    work = (left ^ right) & 0xf0f0f0f0;
-    left ^= work;
-
-    right = rotrFixed(right^work, 20U);
-    work = (left ^ right) & 0xffff0000;
-    left ^= work;
-
-    right = rotrFixed(right^work, 18U);
-    work = (left ^ right) & 0x33333333;
-    left ^= work;
-
-    right = rotrFixed(right^work, 6U);
-    work = (left ^ right) & 0x00ff00ff;
-    left ^= work;
-
-    right = rotlFixed(right^work, 9U);
-    work = (left ^ right) & 0xaaaaaaaa;
-    left = rotlFixed(left^work, 1U);
-    right ^= work;
-}
-
-static inline void FPERM(word32& left, word32& right)
-{
-    word32 work;
-
-    right = rotrFixed(right, 1U);
-    work = (left ^ right) & 0xaaaaaaaa;
-    right ^= work;
-    left = rotrFixed(left^work, 9U);
-    work = (left ^ right) & 0x00ff00ff;
-    right ^= work;
-    left = rotlFixed(left^work, 6U);
-    work = (left ^ right) & 0x33333333;
-    right ^= work;
-    left = rotlFixed(left^work, 18U);
-    work = (left ^ right) & 0xffff0000;
-    right ^= work;
-    left = rotlFixed(left^work, 20U);
-    work = (left ^ right) & 0xf0f0f0f0;
-    right ^= work;
-    left = rotrFixed(left^work, 4U);
-}
-
-
-void BasicDES::RawProcessBlock(word32& lIn, word32& rIn) const
-{
-    word32 l = lIn, r = rIn;
-    const word32* kptr = k_;
-
-    for (unsigned i=0; i<8; i++)
-    {
-        word32 work = rotrFixed(r, 4U) ^ kptr[4*i+0];
-        l ^= Spbox[6][(work) & 0x3f]
-          ^  Spbox[4][(work >> 8) & 0x3f]
-          ^  Spbox[2][(work >> 16) & 0x3f]
-          ^  Spbox[0][(work >> 24) & 0x3f];
-        work = r ^ kptr[4*i+1];
-        l ^= Spbox[7][(work) & 0x3f]
-          ^  Spbox[5][(work >> 8) & 0x3f]
-          ^  Spbox[3][(work >> 16) & 0x3f]
-          ^  Spbox[1][(work >> 24) & 0x3f];
-
-        work = rotrFixed(l, 4U) ^ kptr[4*i+2];
-        r ^= Spbox[6][(work) & 0x3f]
-          ^  Spbox[4][(work >> 8) & 0x3f]
-          ^  Spbox[2][(work >> 16) & 0x3f]
-          ^  Spbox[0][(work >> 24) & 0x3f];
-        work = l ^ kptr[4*i+3];
-        r ^= Spbox[7][(work) & 0x3f]
-          ^  Spbox[5][(work >> 8) & 0x3f]
-          ^  Spbox[3][(work >> 16) & 0x3f]
-          ^  Spbox[1][(work >> 24) & 0x3f];
-    }
-
-    lIn = l; rIn = r;
-}
-
-
-
-typedef BlockGetAndPut<word32, BigEndian> Block;
-
-
-void DES::ProcessAndXorBlock(const byte* in, const byte* xOr, byte* out) const
-{
-    word32 l,r;
-    Block::Get(in)(l)(r);
-    IPERM(l,r);
-
-    RawProcessBlock(l, r);
-
-    FPERM(l,r);
-    Block::Put(xOr, out)(r)(l);
-}
-
-
-void DES_EDE2::SetKey(const byte* key, word32 sz, CipherDir dir)
-{
-    des1_.SetKey(key, sz, dir);
-    des2_.SetKey(key + 8, sz, ReverseDir(dir));
-}
-
-
-void DES_EDE2::ProcessAndXorBlock(const byte* in, const byte* xOr,
-                                  byte* out) const
-{
-    word32 l,r;
-    Block::Get(in)(l)(r);
-    IPERM(l,r);
-
-    des1_.RawProcessBlock(l, r);
-    des2_.RawProcessBlock(r, l);
-    des1_.RawProcessBlock(l, r);
-
-    FPERM(l,r);
-    Block::Put(xOr, out)(r)(l);
-}
-
-
-void DES_EDE3::SetKey(const byte* key, word32 sz, CipherDir dir)
-{
-    des1_.SetKey(key+(dir==ENCRYPTION?0:2*8), sz, dir);
-    des2_.SetKey(key+8, sz, ReverseDir(dir));
-    des3_.SetKey(key+(dir==DECRYPTION?0:2*8), sz, dir);
-}
-
-
-
-#if defined(DO_DES_ASM)
-
-// ia32 optimized version
-void DES_EDE3::Process(byte* out, const byte* in, word32 sz)
-{
-    if (!isMMX) {
-        Mode_BASE::Process(out, in, sz);
-        return;
-    }
-
-    word32 blocks = sz / DES_BLOCK_SIZE;
-
-    if (mode_ == CBC)    
-        if (dir_ == ENCRYPTION)
-            while (blocks--) {
-                r_[0] ^= *(word32*)in;
-                r_[1] ^= *(word32*)(in + 4);
-
-                AsmProcess((byte*)r_, (byte*)r_, (void*)Spbox);
-                
-                memcpy(out, r_, DES_BLOCK_SIZE);
-
-                in  += DES_BLOCK_SIZE;
-                out += DES_BLOCK_SIZE;
-            }
-        else
-            while (blocks--) {
-                AsmProcess(in, out, (void*)Spbox);
-               
-                *(word32*)out       ^= r_[0];
-                *(word32*)(out + 4) ^= r_[1];
-
-                memcpy(r_, in, DES_BLOCK_SIZE);
-
-                out += DES_BLOCK_SIZE;
-                in  += DES_BLOCK_SIZE;
-            }
-    else
-        while (blocks--) {
-            AsmProcess(in, out, (void*)Spbox);
-           
-            out += DES_BLOCK_SIZE;
-            in  += DES_BLOCK_SIZE;
-        }
-}
-
-#endif // DO_DES_ASM
-
-
-void DES_EDE3::ProcessAndXorBlock(const byte* in, const byte* xOr,
-                                  byte* out) const
-{
-    word32 l,r;
-    Block::Get(in)(l)(r);
-    IPERM(l,r);
-
-    des1_.RawProcessBlock(l, r);
-    des2_.RawProcessBlock(r, l);
-    des3_.RawProcessBlock(l, r);
-
-    FPERM(l,r);
-    Block::Put(xOr, out)(r)(l);
-}
-
-
-#if defined(DO_DES_ASM)
-
-/* Uses IPERM algorithm from above
-
-   left  is in eax
-   right is in ebx
-
-   uses ecx
-*/
-#define AsmIPERM() \
-    AS2(    rol   ebx, 4                        )   \
-    AS2(    mov   ecx, eax                      )   \
-    AS2(    xor   ecx, ebx                      )   \
-    AS2(    and   ecx, 0xf0f0f0f0               )   \
-    AS2(    xor   ebx, ecx                      )   \
-    AS2(    xor   eax, ecx                      )   \
-    AS2(    ror   ebx, 20                       )   \
-    AS2(    mov   ecx, eax                      )   \
-    AS2(    xor   ecx, ebx                      )   \
-    AS2(    and   ecx, 0xffff0000               )   \
-    AS2(    xor   ebx, ecx                      )   \
-    AS2(    xor   eax, ecx                      )   \
-    AS2(    ror   ebx, 18                       )   \
-    AS2(    mov   ecx, eax                      )   \
-    AS2(    xor   ecx, ebx                      )   \
-    AS2(    and   ecx, 0x33333333               )   \
-    AS2(    xor   ebx, ecx                      )   \
-    AS2(    xor   eax, ecx                      )   \
-    AS2(    ror   ebx, 6                        )   \
-    AS2(    mov   ecx, eax                      )   \
-    AS2(    xor   ecx, ebx                      )   \
-    AS2(    and   ecx, 0x00ff00ff               )   \
-    AS2(    xor   ebx, ecx                      )   \
-    AS2(    xor   eax, ecx                      )   \
-    AS2(    rol   ebx, 9                        )   \
-    AS2(    mov   ecx, eax                      )   \
-    AS2(    xor   ecx, ebx                      )   \
-    AS2(    and   ecx, 0xaaaaaaaa               )   \
-    AS2(    xor   eax, ecx                      )   \
-    AS2(    rol   eax, 1                        )   \
-    AS2(    xor   ebx, ecx                      )
-
-
-/* Uses FPERM algorithm from above
-
-   left  is in eax
-   right is in ebx
-
-   uses ecx
-*/
-#define AsmFPERM()    \
-    AS2(    ror  ebx, 1                     )    \
-    AS2(    mov  ecx, eax                   )    \
-    AS2(    xor  ecx, ebx                   )    \
-    AS2(    and  ecx, 0xaaaaaaaa            )    \
-    AS2(    xor  eax, ecx                   )    \
-    AS2(    xor  ebx, ecx                   )    \
-    AS2(    ror  eax, 9                     )    \
-    AS2(    mov  ecx, ebx                   )    \
-    AS2(    xor  ecx, eax                   )    \
-    AS2(    and  ecx, 0x00ff00ff            )    \
-    AS2(    xor  eax, ecx                   )    \
-    AS2(    xor  ebx, ecx                   )    \
-    AS2(    rol  eax, 6                     )    \
-    AS2(    mov  ecx, ebx                   )    \
-    AS2(    xor  ecx, eax                   )    \
-    AS2(    and  ecx, 0x33333333            )    \
-    AS2(    xor  eax, ecx                   )    \
-    AS2(    xor  ebx, ecx                   )    \
-    AS2(    rol  eax, 18                    )    \
-    AS2(    mov  ecx, ebx                   )    \
-    AS2(    xor  ecx, eax                   )    \
-    AS2(    and  ecx, 0xffff0000            )    \
-    AS2(    xor  eax, ecx                   )    \
-    AS2(    xor  ebx, ecx                   )    \
-    AS2(    rol  eax, 20                    )    \
-    AS2(    mov  ecx, ebx                   )    \
-    AS2(    xor  ecx, eax                   )    \
-    AS2(    and  ecx, 0xf0f0f0f0            )    \
-    AS2(    xor  eax, ecx                   )    \
-    AS2(    xor  ebx, ecx                   )    \
-    AS2(    ror  eax, 4                     )
-
-
-
-
-/* DesRound implements this algorithm:
-
-        word32 work = rotrFixed(r, 4U) ^ key[0];
-        l ^= Spbox[6][(work) & 0x3f]
-          ^  Spbox[4][(work >> 8) & 0x3f]
-          ^  Spbox[2][(work >> 16) & 0x3f]
-          ^  Spbox[0][(work >> 24) & 0x3f];
-        work = r ^ key[1];
-        l ^= Spbox[7][(work) & 0x3f]
-          ^  Spbox[5][(work >> 8) & 0x3f]
-          ^  Spbox[3][(work >> 16) & 0x3f]
-          ^  Spbox[1][(work >> 24) & 0x3f];
-
-        work = rotrFixed(l, 4U) ^ key[2];
-        r ^= Spbox[6][(work) & 0x3f]
-          ^  Spbox[4][(work >> 8) & 0x3f]
-          ^  Spbox[2][(work >> 16) & 0x3f]
-          ^  Spbox[0][(work >> 24) & 0x3f];
-        work = l ^ key[3];
-        r ^= Spbox[7][(work) & 0x3f]
-          ^  Spbox[5][(work >> 8) & 0x3f]
-          ^  Spbox[3][(work >> 16) & 0x3f]
-          ^  Spbox[1][(work >> 24) & 0x3f];
-
-   left  is in aex
-   right is in ebx
-   key   is in edx
-
-   edvances key for next round
-
-   uses ecx, esi, and edi
-*/
-#define DesRound() \
-    AS2(    mov   ecx,  ebx                     )\
-    AS2(    mov   esi,  DWORD PTR [edx]         )\
-    AS2(    ror   ecx,  4                       )\
-    AS2(    xor   ecx,  esi                     )\
-    AS2(    and   ecx,  0x3f3f3f3f              )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   eax,  [ebp + esi*4 + 6*256]   )\
-    AS2(    shr   ecx,  16                      )\
-    AS2(    xor   eax,  [ebp + edi*4 + 4*256]   )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   eax,  [ebp + esi*4 + 2*256]   )\
-    AS2(    mov   esi,  DWORD PTR [edx + 4]     )\
-    AS2(    xor   eax,  [ebp + edi*4]           )\
-    AS2(    mov   ecx,  ebx                     )\
-    AS2(    xor   ecx,  esi                     )\
-    AS2(    and   ecx,  0x3f3f3f3f              )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   eax,  [ebp + esi*4 + 7*256]   )\
-    AS2(    shr   ecx,  16                      )\
-    AS2(    xor   eax,  [ebp + edi*4 + 5*256]   )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   eax,  [ebp + esi*4 + 3*256]   )\
-    AS2(    mov   esi,  DWORD PTR [edx + 8]     )\
-    AS2(    xor   eax,  [ebp + edi*4 + 1*256]   )\
-    AS2(    mov   ecx,  eax                     )\
-    AS2(    ror   ecx,  4                       )\
-    AS2(    xor   ecx,  esi                     )\
-    AS2(    and   ecx,  0x3f3f3f3f              )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   ebx,  [ebp + esi*4 + 6*256]   )\
-    AS2(    shr   ecx,  16                      )\
-    AS2(    xor   ebx,  [ebp + edi*4 + 4*256]   )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   ebx,  [ebp + esi*4 + 2*256]   )\
-    AS2(    mov   esi,  DWORD PTR [edx + 12]    )\
-    AS2(    xor   ebx,  [ebp + edi*4]           )\
-    AS2(    mov   ecx,  eax                     )\
-    AS2(    xor   ecx,  esi                     )\
-    AS2(    and   ecx,  0x3f3f3f3f              )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   ebx,  [ebp + esi*4 + 7*256]   )\
-    AS2(    shr   ecx,  16                      )\
-    AS2(    xor   ebx,  [ebp + edi*4 + 5*256]   )\
-    AS2(    movzx esi,  cl                      )\
-    AS2(    movzx edi,  ch                      )\
-    AS2(    xor   ebx,  [ebp + esi*4 + 3*256]   )\
-    AS2(    add   edx,  16                      )\
-    AS2(    xor   ebx,  [ebp + edi*4 + 1*256]   )
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
-{
-#ifdef __GNUC__
-    #define AS1(x)    #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-
-    #define PROLOG()  \
-    __asm__ __volatile__ \
-    ( \
-        ".intel_syntax noprefix;" \
-        "push ebx;" \
-        "push ebp;" \
-        "movd mm6, ebp;" \
-        "movd mm7, ecx;" \
-        "mov  ebp, eax;"
-    #define EPILOG()  \
-        "pop ebp;" \
-        "pop ebx;" \
-       	"emms;" \
-       	".att_syntax;" \
-            :  \
-            : "d" (this), "S" (in), "a" (box), "c" (out) \
-            : "%edi", "memory", "cc" \
-    );
-
-#else
-    #define AS1(x)      __asm x
-    #define AS2(x, y)   __asm x, y
-
-    #define PROLOG()  \
-        AS1(    push  ebp                           )   \
-        AS2(    mov   ebp, esp                      )   \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   esi, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edx, ecx                      )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 16]     )
-
-    // ebp restored at end
-    #define EPILOG() \
-        AS2(    movd  edi, mm3                      )   \
-        AS2(    movd  ebx, mm4                      )   \
-        AS2(    movd  esi, mm5                      )   \
-        AS2(    mov   esp, ebp                      )   \
-        AS1(    pop   ebp                           )   \
-        AS1(    emms                                )   \
-        AS1(    ret 12                              )
-
-#endif
-
-
-    PROLOG()
-
-    AS2(    movd  mm2, edx                      )
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    add   edx, 60                       )   // des1 = des1 key
-    #else
-        AS2(    add   edx, 56                       )   // des1 = des1 key
-    #endif
-
-    AS2(    mov   eax, DWORD PTR [esi]          )
-    AS2(    mov   ebx, DWORD PTR [esi + 4]      )
-    AS1(    bswap eax                           )    // left
-    AS1(    bswap ebx                           )    // right
-
-    AsmIPERM()
-
-    DesRound() // 1
-    DesRound() // 2
-    DesRound() // 3
-    DesRound() // 4
-    DesRound() // 5
-    DesRound() // 6
-    DesRound() // 7
-    DesRound() // 8
-
-    // swap left and right 
-    AS2(    xchg  eax, ebx                      )
-
-    DesRound() // 1
-    DesRound() // 2
-    DesRound() // 3
-    DesRound() // 4
-    DesRound() // 5
-    DesRound() // 6
-    DesRound() // 7
-    DesRound() // 8
-
-    // swap left and right
-    AS2(    xchg  eax, ebx                      )
-
-    DesRound() // 1
-    DesRound() // 2
-    DesRound() // 3
-    DesRound() // 4
-    DesRound() // 5
-    DesRound() // 6
-    DesRound() // 7
-    DesRound() // 8
-
-    AsmFPERM()
-
-    //end
-    AS2(    movd  ebp, mm6                      )
-
-    // swap and write out
-    AS1(    bswap ebx                           )
-    AS1(    bswap eax                           )
-
-#ifdef __GNUC__
-    AS2(    movd  esi, mm7   )   // outBlock
-#else
-    AS2(    mov   esi, DWORD PTR [ebp +  12]    )   // outBlock
-#endif
-
-    AS2(    mov   DWORD PTR [esi],     ebx      )   // right first
-    AS2(    mov   DWORD PTR [esi + 4], eax      )
-    
-
-    EPILOG()
-}
-
-
-
-#endif // defined(DO_DES_ASM)
-
-
-}  // namespace
diff --git a/extra/yassl/taocrypt/src/dh.cpp b/extra/yassl/taocrypt/src/dh.cpp
deleted file mode 100644
index 615a8c6da3c4..000000000000
--- a/extra/yassl/taocrypt/src/dh.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* dh.cpp implements Diffie-Hellman support
-*/
-
-#include "runtime.hpp"
-#include "dh.hpp"
-#include "asn.hpp"
-#include <math.h>
-
-namespace TaoCrypt {
-
-
-namespace {  // locals
-
-unsigned int DiscreteLogWorkFactor(unsigned int n)
-{
-    // assuming discrete log takes about the same time as factoring
-    if (n<5)
-        return 0;
-    else
-        return (unsigned int)(2.4 * pow((double)n, 1.0/3.0) *
-                pow(log(double(n)), 2.0/3.0) - 5);
-}
-
-} // namespace locals
-
-
-// Generate a DH Key Pair
-void DH::GenerateKeyPair(RandomNumberGenerator& rng, byte* priv, byte* pub)
-{
-    GeneratePrivate(rng, priv);
-    GeneratePublic(priv, pub);
-}
-
-
-// Generate private value
-void DH::GeneratePrivate(RandomNumberGenerator& rng, byte* priv)
-{
-    Integer x(rng, Integer::One(), min(p_ - 1,
-        Integer::Power2(2*DiscreteLogWorkFactor(p_.BitCount())) ) );
-    x.Encode(priv, p_.ByteCount());
-}
-
-
-// Generate public value
-void DH::GeneratePublic(const byte* priv, byte* pub)
-{
-    const word32 bc(p_.ByteCount());
-    Integer x(priv, bc);
-    Integer y(a_exp_b_mod_c(g_, x, p_));
-    y.Encode(pub, bc);
-}
-
-
-// Generate Agreement
-void DH::Agree(byte* agree, const byte* priv, const byte* otherPub, word32
-               otherSz)
-{
-    const word32 bc(p_.ByteCount());
-    Integer x(priv, bc);
-    Integer y;
-    if (otherSz)
-        y.Decode(otherPub, otherSz);
-    else
-        y.Decode(otherPub, bc);
-
-    Integer z(a_exp_b_mod_c(y, x, p_));
-    z.Encode(agree, bc);
-}
-
-
-DH::DH(Source& source)
-{
-    Initialize(source);
-}
-
-
-void DH::Initialize(Source& source)
-{
-    DH_Decoder decoder(source);
-    decoder.Decode(*this);
-}
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/dsa.cpp b/extra/yassl/taocrypt/src/dsa.cpp
deleted file mode 100644
index b19fed9235b2..000000000000
--- a/extra/yassl/taocrypt/src/dsa.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-#include "runtime.hpp"
-#include "dsa.hpp"
-#include "sha.hpp"
-#include "asn.hpp"
-#include "modarith.hpp"
-
-
-namespace TaoCrypt {
-
-
-void DSA_PublicKey::Swap(DSA_PublicKey& other)
-{
-    p_.Swap(other.p_);
-    q_.Swap(other.q_);
-    g_.Swap(other.g_);
-    y_.Swap(other.y_);
-}
-
-
-DSA_PublicKey::DSA_PublicKey(const DSA_PublicKey& other)
-    : p_(other.p_), q_(other.q_), g_(other.g_), y_(other.y_)
-{}
-
-
-DSA_PublicKey& DSA_PublicKey::operator=(const DSA_PublicKey& that)
-{
-    DSA_PublicKey tmp(that);
-    Swap(tmp);
-    return *this;
-}
-
-
-DSA_PublicKey::DSA_PublicKey(Source& source)
-{
-    Initialize(source);
-}
-
-
-void DSA_PublicKey::Initialize(Source& source)
-{
-    DSA_Public_Decoder decoder(source);
-    decoder.Decode(*this);
-}
-
-
-void DSA_PublicKey::Initialize(const Integer& p, const Integer& q,
-                               const Integer& g, const Integer& y)
-{
-    p_ = p;
-    q_ = q;
-    g_ = g;
-    y_ = y;
-}
-   
-
-const Integer& DSA_PublicKey::GetModulus() const
-{
-    return p_;
-}
-
-const Integer& DSA_PublicKey::GetSubGroupOrder() const
-{
-    return q_;
-}
-
-
-const Integer& DSA_PublicKey::GetSubGroupGenerator() const
-{
-    return g_;
-}
-
-
-const Integer& DSA_PublicKey::GetPublicPart() const
-{
-    return y_;
-}
-
-
-void DSA_PublicKey::SetModulus(const Integer& p)
-{
-    p_ = p;
-}
-
-
-void DSA_PublicKey::SetSubGroupOrder(const Integer& q)
-{
-    q_ = q;
-}
-
-
-void DSA_PublicKey::SetSubGroupGenerator(const Integer& g)
-{
-    g_ = g;
-}
-
-
-void DSA_PublicKey::SetPublicPart(const Integer& y)
-{
-    y_ = y;
-}
-
-
-word32 DSA_PublicKey::SignatureLength() const
-{
-    return GetSubGroupOrder().ByteCount() * 2;  // r and s
-}
-
-
-
-DSA_PrivateKey::DSA_PrivateKey(Source& source)
-{
-    Initialize(source);
-}
-
-
-void DSA_PrivateKey::Initialize(Source& source)
-{
-    DSA_Private_Decoder decoder(source);
-    decoder.Decode(*this);
-}
-
-
-void DSA_PrivateKey::Initialize(const Integer& p, const Integer& q,
-                                const Integer& g, const Integer& y,
-                                const Integer& x)
-{
-    DSA_PublicKey::Initialize(p, q, g, y);
-    x_ = x;
-}
-
-
-const Integer& DSA_PrivateKey::GetPrivatePart() const
-{
-    return x_;
-}
-
-
-void DSA_PrivateKey::SetPrivatePart(const Integer& x)
-{
-    x_ = x;
-}
-
-
-DSA_Signer::DSA_Signer(const DSA_PrivateKey& key)
-    : key_(key)
-{}
-
-
-word32 DSA_Signer::Sign(const byte* sha_digest, byte* sig,
-                        RandomNumberGenerator& rng)
-{
-    const Integer& p = key_.GetModulus();
-    const Integer& q = key_.GetSubGroupOrder();
-    const Integer& g = key_.GetSubGroupGenerator();
-    const Integer& x = key_.GetPrivatePart();
-    byte* tmpPtr = sig;  // initial signature output
-
-    Integer k(rng, 1, q - 1);
-
-    r_ =  a_exp_b_mod_c(g, k, p);
-    r_ %= q;
-
-    Integer H(sha_digest, SHA::DIGEST_SIZE);  // sha Hash(m)
-
-    Integer kInv = k.InverseMod(q);
-    s_ = (kInv * (H + x*r_)) % q;
-
-    if (!(!!r_ && !!s_))
-        return -1;
-
-    int rSz = r_.ByteCount();
-    int tmpSz = rSz;
-
-    while (tmpSz++ < SHA::DIGEST_SIZE) {
-        *sig++ = 0;
-    }
-    
-    r_.Encode(sig,  rSz);
-
-    sig = tmpPtr + SHA::DIGEST_SIZE;  // advance sig output to s
-    int sSz = s_.ByteCount();
-    tmpSz = sSz;
-
-    while (tmpSz++ < SHA::DIGEST_SIZE) {
-        *sig++ = 0;
-    }
-
-    s_.Encode(sig, sSz);
-
-    return 40;
-}
-
-
-DSA_Verifier::DSA_Verifier(const DSA_PublicKey& key)
-    : key_(key)
-{}
-
-
-bool DSA_Verifier::Verify(const byte* sha_digest, const byte* sig)
-{
-    const Integer& p = key_.GetModulus();
-    const Integer& q = key_.GetSubGroupOrder();
-    const Integer& g = key_.GetSubGroupGenerator();
-    const Integer& y = key_.GetPublicPart();
-
-    int sz = q.ByteCount();
-
-    r_.Decode(sig, sz);
-    s_.Decode(sig + sz, sz);
-
-    if (r_ >= q || r_ < 1 || s_ >= q || s_ < 1)
-        return false;
-
-    Integer H(sha_digest, SHA::DIGEST_SIZE);  // sha Hash(m)
-
-    Integer w = s_.InverseMod(q);
-    Integer u1 = (H  * w) % q;
-    Integer u2 = (r_ * w) % q;
-
-    // verify r == ((g^u1 * y^u2) mod p) mod q
-    ModularArithmetic ma(p);
-    Integer v = ma.CascadeExponentiate(g, u1, y, u2);
-    v %= q;
-
-    return r_ == v;
-}
-
-
-
-
-const Integer& DSA_Signer::GetR() const
-{
-    return r_;
-}
-
-
-const Integer& DSA_Signer::GetS() const
-{
-    return s_;
-}
-
-
-const Integer& DSA_Verifier::GetR() const
-{
-    return r_;
-}
-
-
-const Integer& DSA_Verifier::GetS() const
-{
-    return s_;
-}
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/file.cpp b/extra/yassl/taocrypt/src/file.cpp
deleted file mode 100644
index 7c2044bf3528..000000000000
--- a/extra/yassl/taocrypt/src/file.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* file.cpp implements File Sources and Sinks
-*/
-
-#include "runtime.hpp"
-#include "file.hpp"
-
-
-namespace TaoCrypt {
-
-
-FileSource::FileSource(const char* fname, Source& source)
-{
-    file_ = fopen(fname, "rb");
-    if (file_) get(source);
-}
-
-
-FileSource::~FileSource()
-{
-    if (file_)
-        fclose(file_);
-}
-
-
-
-// return size of source from beginning or current position
-word32 FileSource::size(bool use_current)
-{
-    long current = ftell(file_);
-    long begin   = current;
-
-    if (!use_current) {
-        fseek(file_, 0, SEEK_SET);
-        begin = ftell(file_);
-    }
-
-    fseek(file_, 0, SEEK_END);
-    long end = ftell(file_);
-
-    fseek(file_, current, SEEK_SET);
-
-    return end - begin;
-}
-
-
-word32 FileSource::size_left()
-{
-    return size(true);
-}
-
-
-// fill file source from source
-word32 FileSource::get(Source& source)
-{
-    word32 sz(size());
-    if (source.size() < sz)
-        source.grow(sz);
-
-    size_t bytes = fread(source.buffer_.get_buffer(), 1, sz, file_);
-
-    if (bytes == 1)
-        return sz;
-    else
-        return 0;
-}
-
-
-FileSink::FileSink(const char* fname, Source& source)
-{
-    file_ = fopen(fname, "wb");
-    if (file_) put(source);
-}
-
-
-FileSink::~FileSink()
-{
-    if (file_)
-        fclose(file_);
-}
-
-
-// fill source from file sink
-void FileSink::put(Source& source)
-{
-    fwrite(source.get_buffer(), 1, source.size(), file_);
-}
-
-
-// swap with other and reset to beginning
-void Source::reset(ByteBlock& otherBlock)
-{
-    buffer_.Swap(otherBlock);   
-    current_ = 0;
-}
-
-
-}  // namespace
diff --git a/extra/yassl/taocrypt/src/hash.cpp b/extra/yassl/taocrypt/src/hash.cpp
deleted file mode 100644
index c176e6a68d05..000000000000
--- a/extra/yassl/taocrypt/src/hash.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* hash.cpp implements a base for digest types
-*/
-
-#include "runtime.hpp"
-#include <string.h>
-
-#include "hash.hpp"
-
-
-namespace TaoCrypt {
-
-
-HASHwithTransform::HASHwithTransform(word32 digSz, word32 buffSz)
-{
-}
-
-
-void HASHwithTransform::AddLength(word32 len)
-{
-    HashLengthType tmp = loLen_;
-    if ( (loLen_ += len) < tmp)
-        hiLen_++;                       // carry low to high
-    hiLen_ += SafeRightShift<8*sizeof(HashLengthType)>(len);
-}
-
-
-// Update digest with data of size len, do in blocks
-void HASHwithTransform::Update(const byte* data, word32 len)
-{
-    // do block size increments
-    word32 blockSz = getBlockSize();
-    byte*  local   = reinterpret_cast<byte*>(buffer_);
-
-    while (len) {
-        word32 add = min(len, blockSz - buffLen_);
-        memcpy(&local[buffLen_], data, add);
-
-        buffLen_ += add;
-        data     += add;
-        len      -= add;
-
-        if (buffLen_ == blockSz) {
-            ByteReverseIf(local, local, blockSz, getByteOrder());
-            Transform();
-            AddLength(blockSz);
-            buffLen_ = 0;
-        }
-    }
-}
-
-
-// Final process, place digest in hash
-void HASHwithTransform::Final(byte* hash)
-{
-    word32    blockSz  = getBlockSize();
-    word32    digestSz = getDigestSize();
-    word32    padSz    = getPadSize();
-    ByteOrder order    = getByteOrder();
-
-    AddLength(buffLen_);                        // before adding pads
-    HashLengthType preLoLen = GetBitCountLo();
-    HashLengthType preHiLen = GetBitCountHi();
-    byte*     local         = reinterpret_cast<byte*>(buffer_);
-
-    local[buffLen_++] = 0x80;  // add 1
-
-    // pad with zeros
-    if (buffLen_ > padSz) {
-        memset(&local[buffLen_], 0, blockSz - buffLen_);
-        buffLen_ += blockSz - buffLen_;
-
-        ByteReverseIf(local, local, blockSz, order);
-        Transform();
-        buffLen_ = 0;
-    }
-    memset(&local[buffLen_], 0, padSz - buffLen_);
-   
-    ByteReverseIf(local, local, blockSz, order);
-    
-    memcpy(&local[padSz],   order ? &preHiLen : &preLoLen, sizeof(preLoLen));
-    memcpy(&local[padSz+4], order ? &preLoLen : &preHiLen, sizeof(preLoLen));
-
-    Transform();
-    ByteReverseIf(digest_, digest_, digestSz, order);
-    memcpy(hash, digest_, digestSz);
-
-    Init();  // reset state
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-HASH64withTransform::HASH64withTransform(word32 digSz, word32 buffSz)
-{
-}
-
-
-void HASH64withTransform::AddLength(word32 len)
-{
-    HashLengthType tmp = loLen_;
-    if ( (loLen_ += len) < tmp)
-        hiLen_++;                       // carry low to high
-    hiLen_ += SafeRightShift<8*sizeof(HashLengthType)>(len);
-}
-
-
-// Update digest with data of size len, do in blocks
-void HASH64withTransform::Update(const byte* data, word32 len)
-{
-    // do block size increments
-    word32 blockSz = getBlockSize();
-    byte*  local   = reinterpret_cast<byte*>(buffer_);
-
-    while (len) {
-        word32 add = min(len, blockSz - buffLen_);
-        memcpy(&local[buffLen_], data, add);
-
-        buffLen_ += add;
-        data     += add;
-        len      -= add;
-
-        if (buffLen_ == blockSz) {
-            ByteReverseIf(buffer_, buffer_, blockSz, getByteOrder());
-            Transform();
-            AddLength(blockSz);
-            buffLen_ = 0;
-        }
-    }
-}
-
-
-// Final process, place digest in hash
-void HASH64withTransform::Final(byte* hash)
-{
-    word32    blockSz  = getBlockSize();
-    word32    digestSz = getDigestSize();
-    word32    padSz    = getPadSize();
-    ByteOrder order    = getByteOrder();
-
-    AddLength(buffLen_);                        // before adding pads
-    HashLengthType preLoLen = GetBitCountLo();
-    HashLengthType preHiLen = GetBitCountHi();
-    byte*     local         = reinterpret_cast<byte*>(buffer_);
-
-    local[buffLen_++] = 0x80;  // add 1
-
-    // pad with zeros
-    if (buffLen_ > padSz) {
-        memset(&local[buffLen_], 0, blockSz - buffLen_);
-        buffLen_ += blockSz - buffLen_;
-
-        ByteReverseIf(buffer_, buffer_, blockSz, order);
-        Transform();
-        buffLen_ = 0;
-    }
-    memset(&local[buffLen_], 0, padSz - buffLen_);
-   
-    ByteReverseIf(buffer_, buffer_, padSz, order);
-    
-    buffer_[blockSz / sizeof(word64) - 2] = order ? preHiLen : preLoLen;
-    buffer_[blockSz / sizeof(word64) - 1] = order ? preLoLen : preHiLen;
-
-    Transform();
-    ByteReverseIf(digest_, digest_, digestSz, order);
-    memcpy(hash, digest_, digestSz);
-
-    Init();  // reset state
-}
-
-#endif // WORD64_AVAILABLE
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/hc128.cpp b/extra/yassl/taocrypt/src/hc128.cpp
deleted file mode 100644
index 1d329c87e8f7..000000000000
--- a/extra/yassl/taocrypt/src/hc128.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-#include "runtime.hpp"
-#include "hc128.hpp"
-
-
-
-namespace TaoCrypt {
-
-
-
-
-#ifdef BIG_ENDIAN_ORDER
-    #define LITTLE32(x) ByteReverse((word32)x)
-#else
-    #define LITTLE32(x) (x)
-#endif
-
-
-/*h1 function*/
-#define h1(x, y) {                              \
-     byte a,c;                                  \
-     a = (byte) (x);                            \
-     c = (byte) ((x) >> 16);                    \
-     y = (T_[512+a])+(T_[512+256+c]);           \
-}
-
-/*h2 function*/
-#define h2(x, y) {                              \
-     byte a,c;                                  \
-     a = (byte) (x);                            \
-     c = (byte) ((x) >> 16);                    \
-     y = (T_[a])+(T_[256+c]);                   \
-}
-
-/*one step of HC-128, update P and generate 32 bits keystream*/
-#define step_P(u,v,a,b,c,d,n){                  \
-     word32 tem0,tem1,tem2,tem3;                \
-     h1((X_[(d)]),tem3);                        \
-     tem0 = rotrFixed((T_[(v)]),23);            \
-     tem1 = rotrFixed((X_[(c)]),10);            \
-     tem2 = rotrFixed((X_[(b)]),8);             \
-     (T_[(u)]) += tem2+(tem0 ^ tem1);           \
-     (X_[(a)]) = (T_[(u)]);                     \
-     (n) = tem3 ^ (T_[(u)]) ;                   \
-}       
-
-/*one step of HC-128, update Q and generate 32 bits keystream*/
-#define step_Q(u,v,a,b,c,d,n){                  \
-     word32 tem0,tem1,tem2,tem3;                \
-     h2((Y_[(d)]),tem3);                        \
-     tem0 = rotrFixed((T_[(v)]),(32-23));       \
-     tem1 = rotrFixed((Y_[(c)]),(32-10));       \
-     tem2 = rotrFixed((Y_[(b)]),(32-8));        \
-     (T_[(u)]) += tem2 + (tem0 ^ tem1);         \
-     (Y_[(a)]) = (T_[(u)]);                     \
-     (n) = tem3 ^ (T_[(u)]) ;                   \
-}   
-
-
-/*16 steps of HC-128, generate 512 bits keystream*/
-void HC128::GenerateKeystream(word32* keystream)  
-{
-   word32 cc,dd;
-   cc = counter1024_ & 0x1ff;
-   dd = (cc+16)&0x1ff;
-
-   if (counter1024_ < 512)	
-   {   		
-      counter1024_ = (counter1024_ + 16) & 0x3ff;
-      step_P(cc+0, cc+1, 0, 6, 13,4, keystream[0]);
-      step_P(cc+1, cc+2, 1, 7, 14,5, keystream[1]);
-      step_P(cc+2, cc+3, 2, 8, 15,6, keystream[2]);
-      step_P(cc+3, cc+4, 3, 9, 0, 7, keystream[3]);
-      step_P(cc+4, cc+5, 4, 10,1, 8, keystream[4]);
-      step_P(cc+5, cc+6, 5, 11,2, 9, keystream[5]);
-      step_P(cc+6, cc+7, 6, 12,3, 10,keystream[6]);
-      step_P(cc+7, cc+8, 7, 13,4, 11,keystream[7]);
-      step_P(cc+8, cc+9, 8, 14,5, 12,keystream[8]);
-      step_P(cc+9, cc+10,9, 15,6, 13,keystream[9]);
-      step_P(cc+10,cc+11,10,0, 7, 14,keystream[10]);
-      step_P(cc+11,cc+12,11,1, 8, 15,keystream[11]);
-      step_P(cc+12,cc+13,12,2, 9, 0, keystream[12]);
-      step_P(cc+13,cc+14,13,3, 10,1, keystream[13]);
-      step_P(cc+14,cc+15,14,4, 11,2, keystream[14]);
-      step_P(cc+15,dd+0, 15,5, 12,3, keystream[15]);
-   }
-   else				    
-   {
-	  counter1024_ = (counter1024_ + 16) & 0x3ff;
-      step_Q(512+cc+0, 512+cc+1, 0, 6, 13,4, keystream[0]);
-      step_Q(512+cc+1, 512+cc+2, 1, 7, 14,5, keystream[1]);
-      step_Q(512+cc+2, 512+cc+3, 2, 8, 15,6, keystream[2]);
-      step_Q(512+cc+3, 512+cc+4, 3, 9, 0, 7, keystream[3]);
-      step_Q(512+cc+4, 512+cc+5, 4, 10,1, 8, keystream[4]);
-      step_Q(512+cc+5, 512+cc+6, 5, 11,2, 9, keystream[5]);
-      step_Q(512+cc+6, 512+cc+7, 6, 12,3, 10,keystream[6]);
-      step_Q(512+cc+7, 512+cc+8, 7, 13,4, 11,keystream[7]);
-      step_Q(512+cc+8, 512+cc+9, 8, 14,5, 12,keystream[8]);
-      step_Q(512+cc+9, 512+cc+10,9, 15,6, 13,keystream[9]);
-      step_Q(512+cc+10,512+cc+11,10,0, 7, 14,keystream[10]);
-      step_Q(512+cc+11,512+cc+12,11,1, 8, 15,keystream[11]);
-      step_Q(512+cc+12,512+cc+13,12,2, 9, 0, keystream[12]);
-      step_Q(512+cc+13,512+cc+14,13,3, 10,1, keystream[13]);
-      step_Q(512+cc+14,512+cc+15,14,4, 11,2, keystream[14]);
-      step_Q(512+cc+15,512+dd+0, 15,5, 12,3, keystream[15]);
-   }
-}
-
-
-/* The following defines the initialization functions */
-#define f1(x)  (rotrFixed((x),7)  ^ rotrFixed((x),18) ^ ((x) >> 3))
-#define f2(x)  (rotrFixed((x),17) ^ rotrFixed((x),19) ^ ((x) >> 10))
-
-/*update table P*/
-#define update_P(u,v,a,b,c,d){                      \
-     word32 tem0,tem1,tem2,tem3;                    \
-     tem0 = rotrFixed((T_[(v)]),23);                \
-     tem1 = rotrFixed((X_[(c)]),10);                \
-     tem2 = rotrFixed((X_[(b)]),8);                 \
-     h1((X_[(d)]),tem3);                            \
-     (T_[(u)]) = ((T_[(u)]) + tem2+(tem0^tem1)) ^ tem3;     \
-     (X_[(a)]) = (T_[(u)]);                         \
-}  
-
-/*update table Q*/
-#define update_Q(u,v,a,b,c,d){                      \
-     word32 tem0,tem1,tem2,tem3;                    \
-     tem0 = rotrFixed((T_[(v)]),(32-23));           \
-     tem1 = rotrFixed((Y_[(c)]),(32-10));           \
-     tem2 = rotrFixed((Y_[(b)]),(32-8));            \
-     h2((Y_[(d)]),tem3);                            \
-     (T_[(u)]) = ((T_[(u)]) + tem2+(tem0^tem1)) ^ tem3;     \
-     (Y_[(a)]) = (T_[(u)]);                         \
-}     
-
-/*16 steps of HC-128, without generating keystream, */
-/*but use the outputs to update P and Q*/
-void HC128::SetupUpdate()  /*each time 16 steps*/
-{
-   word32 cc,dd;
-   cc = counter1024_ & 0x1ff;
-   dd = (cc+16)&0x1ff;
-
-   if (counter1024_ < 512)	
-   {   		
-      counter1024_ = (counter1024_ + 16) & 0x3ff;
-      update_P(cc+0, cc+1, 0, 6, 13, 4);
-      update_P(cc+1, cc+2, 1, 7, 14, 5);
-      update_P(cc+2, cc+3, 2, 8, 15, 6);
-      update_P(cc+3, cc+4, 3, 9, 0,  7);
-      update_P(cc+4, cc+5, 4, 10,1,  8);
-      update_P(cc+5, cc+6, 5, 11,2,  9);
-      update_P(cc+6, cc+7, 6, 12,3,  10);
-      update_P(cc+7, cc+8, 7, 13,4,  11);
-      update_P(cc+8, cc+9, 8, 14,5,  12);
-      update_P(cc+9, cc+10,9, 15,6,  13);
-      update_P(cc+10,cc+11,10,0, 7,  14);
-      update_P(cc+11,cc+12,11,1, 8,  15);
-      update_P(cc+12,cc+13,12,2, 9,  0);
-      update_P(cc+13,cc+14,13,3, 10, 1);
-      update_P(cc+14,cc+15,14,4, 11, 2);
-      update_P(cc+15,dd+0, 15,5, 12, 3);   
-   }
-   else				    
-   {
-      counter1024_ = (counter1024_ + 16) & 0x3ff;
-      update_Q(512+cc+0, 512+cc+1, 0, 6, 13, 4);
-      update_Q(512+cc+1, 512+cc+2, 1, 7, 14, 5);
-      update_Q(512+cc+2, 512+cc+3, 2, 8, 15, 6);
-      update_Q(512+cc+3, 512+cc+4, 3, 9, 0,  7);
-      update_Q(512+cc+4, 512+cc+5, 4, 10,1,  8);
-      update_Q(512+cc+5, 512+cc+6, 5, 11,2,  9);
-      update_Q(512+cc+6, 512+cc+7, 6, 12,3,  10);
-      update_Q(512+cc+7, 512+cc+8, 7, 13,4,  11);
-      update_Q(512+cc+8, 512+cc+9, 8, 14,5,  12);
-      update_Q(512+cc+9, 512+cc+10,9, 15,6,  13);
-      update_Q(512+cc+10,512+cc+11,10,0, 7,  14);
-      update_Q(512+cc+11,512+cc+12,11,1, 8,  15);
-      update_Q(512+cc+12,512+cc+13,12,2, 9,  0);
-      update_Q(512+cc+13,512+cc+14,13,3, 10, 1);
-      update_Q(512+cc+14,512+cc+15,14,4, 11, 2);
-      update_Q(512+cc+15,512+dd+0, 15,5, 12, 3); 
-   }       
-}
-
-
-/* for the 128-bit key:  key[0]...key[15]
-*  key[0] is the least significant byte of ctx->key[0] (K_0);
-*  key[3] is the most significant byte of ctx->key[0]  (K_0);
-*  ...
-*  key[12] is the least significant byte of ctx->key[3] (K_3)
-*  key[15] is the most significant byte of ctx->key[3]  (K_3)
-*
-*  for the 128-bit iv:  iv[0]...iv[15]
-*  iv[0] is the least significant byte of ctx->iv[0] (IV_0);
-*  iv[3] is the most significant byte of ctx->iv[0]  (IV_0);
-*  ...
-*  iv[12] is the least significant byte of ctx->iv[3] (IV_3)
-*  iv[15] is the most significant byte of ctx->iv[3]  (IV_3)
-*/
-
-
-
-void HC128::SetIV(const byte* iv)
-{ 
-    word32 i;
-	
-	for (i = 0; i < (128 >> 5); i++)
-        iv_[i] = LITTLE32(((word32*)iv)[i]);
-	
-    for (; i < 8; i++) iv_[i] = iv_[i-4];
-  
-    /* expand the key and IV into the table T */ 
-    /* (expand the key and IV into the table P and Q) */ 
-	
-	for (i = 0; i < 8;  i++)   T_[i] = key_[i];
-	for (i = 8; i < 16; i++)   T_[i] = iv_[i-8];
-
-    for (i = 16; i < (256+16); i++) 
-		T_[i] = f2(T_[i-2]) + T_[i-7] + f1(T_[i-15]) + T_[i-16]+i;
-    
-	for (i = 0; i < 16;  i++)  T_[i] = T_[256+i];
-
-	for (i = 16; i < 1024; i++) 
-		T_[i] = f2(T_[i-2]) + T_[i-7] + f1(T_[i-15]) + T_[i-16]+256+i;
-    
-    /* initialize counter1024, X and Y */
-	counter1024_ = 0;
-	for (i = 0; i < 16; i++) X_[i] = T_[512-16+i];
-    for (i = 0; i < 16; i++) Y_[i] = T_[512+512-16+i];
-    
-    /* run the cipher 1024 steps before generating the output */
-	for (i = 0; i < 64; i++)  SetupUpdate();  
-}
-
-
-void HC128::SetKey(const byte* key, const byte* iv)
-{ 
-  word32 i;  
-
-  /* Key size in bits 128 */ 
-  for (i = 0; i < (128 >> 5); i++)
-      key_[i] = LITTLE32(((word32*)key)[i]);
- 
-  for ( ; i < 8 ; i++) key_[i] = key_[i-4];
-
-  SetIV(iv);
-}
-
-
-/* The following defines the encryption of data stream */
-void HC128::Process(byte* output, const byte* input, word32 msglen)
-{
-  word32 i, keystream[16];
-
-  for ( ; msglen >= 64; msglen -= 64, input += 64, output += 64)
-  {
-	  GenerateKeystream(keystream);
-
-      /* unroll loop */
-	  ((word32*)output)[0]  = ((word32*)input)[0]  ^ LITTLE32(keystream[0]);
-	  ((word32*)output)[1]  = ((word32*)input)[1]  ^ LITTLE32(keystream[1]);
-	  ((word32*)output)[2]  = ((word32*)input)[2]  ^ LITTLE32(keystream[2]);
-	  ((word32*)output)[3]  = ((word32*)input)[3]  ^ LITTLE32(keystream[3]);
-	  ((word32*)output)[4]  = ((word32*)input)[4]  ^ LITTLE32(keystream[4]);
-	  ((word32*)output)[5]  = ((word32*)input)[5]  ^ LITTLE32(keystream[5]);
-	  ((word32*)output)[6]  = ((word32*)input)[6]  ^ LITTLE32(keystream[6]);
-	  ((word32*)output)[7]  = ((word32*)input)[7]  ^ LITTLE32(keystream[7]);
-	  ((word32*)output)[8]  = ((word32*)input)[8]  ^ LITTLE32(keystream[8]);
-	  ((word32*)output)[9]  = ((word32*)input)[9]  ^ LITTLE32(keystream[9]);
-	  ((word32*)output)[10] = ((word32*)input)[10] ^ LITTLE32(keystream[10]);
-	  ((word32*)output)[11] = ((word32*)input)[11] ^ LITTLE32(keystream[11]);
-	  ((word32*)output)[12] = ((word32*)input)[12] ^ LITTLE32(keystream[12]);
-	  ((word32*)output)[13] = ((word32*)input)[13] ^ LITTLE32(keystream[13]);
-	  ((word32*)output)[14] = ((word32*)input)[14] ^ LITTLE32(keystream[14]);
-	  ((word32*)output)[15] = ((word32*)input)[15] ^ LITTLE32(keystream[15]);
-  }
-
-  if (msglen > 0)
-  {
-      GenerateKeystream(keystream);
-
-#ifdef BIG_ENDIAN_ORDER
-      {
-          word32 wordsLeft = msglen / sizeof(word32);
-          if (msglen % sizeof(word32)) wordsLeft++;
-          
-          ByteReverse(keystream, keystream, wordsLeft * sizeof(word32));
-      }
-#endif
-
-      for (i = 0; i < msglen; i++)
-	      output[i] = input[i] ^ ((byte*)keystream)[i];
-  }
-
-}
-
-
-}  // namespace
diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
deleted file mode 100644
index 478a13cd87ad..000000000000
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ /dev/null
@@ -1,3894 +0,0 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
-
-/* based on Wei Dai's integer.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "integer.hpp"
-#include "modarith.hpp"
-#include "asn.hpp"
-
-
-
-#ifdef __DECCXX
-    #include <c_asm.h>  // for asm overflow assembly
-#endif
-
-#if defined(_M_X64) || defined(_M_IA64)
-    #include <intrin.h> 
-#pragma intrinsic(_umul128)
-#endif
-
-
-#ifdef __GNUC__
-    #include <signal.h>
-    #include <setjmp.h>
-#endif
-
-
-#ifdef SSE2_INTRINSICS_AVAILABLE
-    #ifdef __GNUC__
-        #include <xmmintrin.h>
-        #ifdef TAOCRYPT_MEMALIGN_AVAILABLE
-            #include <malloc.h>
-        #else
-            #include <stdlib.h>
-        #endif
-    #else
-        #include <emmintrin.h>
-    #endif
-#elif defined(_MSC_VER) && defined(_M_IX86)
-/*    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
-     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
-*/
-    #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
-#elif defined(__GNUC__) && defined(__i386__)
-/*   #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
-             compiler option. Use of SSE2 intrinsics will be disabled.
-*/
-#endif
-
-
-namespace TaoCrypt {
-
-
-#ifdef SSE2_INTRINSICS_AVAILABLE
-
-template <class T>
-CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
-                                           size_type n, const void *)
-{
-    if (n > this->max_size())
-        return 0;
-    if (n == 0)
-        return 0;
-    if (n >= 4)
-    {
-        void* p;
-    #ifdef TAOCRYPT_MM_MALLOC_AVAILABLE
-        p = _mm_malloc(sizeof(T)*n, 16);
-    #elif defined(TAOCRYPT_MEMALIGN_AVAILABLE)
-        p = memalign(16, sizeof(T)*n);
-    #elif defined(TAOCRYPT_MALLOC_ALIGNMENT_IS_16)
-        p = malloc(sizeof(T)*n);
-    #else
-        p = (byte *)malloc(sizeof(T)*n + 8);
-        // assume malloc alignment is at least 8
-    #endif
-
-    #ifdef TAOCRYPT_NO_ALIGNED_ALLOC
-        m_pBlock = p;
-        if (!IsAlignedOn(p, 16))
-        {
-            p = (byte *)p + 8;
-        }
-    #endif
-
-        return (T*)p;
-    }
-    return NEW_TC T[n];
-}
-
-
-template <class T>
-void AlignedAllocator<T>::deallocate(void* p, size_type n)
-{
-    memset(p, 0, n*sizeof(T));
-    if (n >= 4)
-    {
-        #ifdef TAOCRYPT_MM_MALLOC_AVAILABLE
-            _mm_free(p);
-        #elif defined(TAOCRYPT_NO_ALIGNED_ALLOC)
-            free(m_pBlock);
-            m_pBlock = 0;
-        #else
-            free(p);
-        #endif
-    }
-    else
-        tcArrayDelete((T *)p);
-}
-
-#endif  // SSE2
-
-
-// ********  start of integer needs
-
-// start 5.2.1 adds DWord and Word ********
-
-// ********************************************************
-
-class DWord {
-public:
-DWord() {}
-
-#ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-    explicit DWord(word low)
-    {
-        whole_ = low;
-    }
-#else
-    explicit DWord(word low)
-    {
-        halfs_.low = low;
-        halfs_.high = 0;
-    }
-#endif
-
-    DWord(word low, word high)
-    {
-        halfs_.low = low;
-        halfs_.high = high;
-    }
-
-    static DWord Multiply(word a, word b)
-    {
-        DWord r;
-
-        #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-            r.whole_ = (dword)a * b;
-
-        #elif defined(_M_X64) || defined(_M_IA64)
-            r.halfs_.low = _umul128(a, b, &r.halfs_.high);
-
-        #elif defined(__ia64__)
-            r.halfs_.low = a*b;
-            __asm__("xmpy.hu %0=%1,%2" : "=f" (r.halfs_.high)
-                : "f" (a), "f" (b));
-
-        #elif defined(_ARCH_PPC64)
-            r.halfs_.low = a*b;
-            __asm__("mulhdu %0,%1,%2" : "=r" (r.halfs_.high)
-                : "r" (a), "r" (b) : "cc");
-
-        #elif defined(__x86_64__)
-            __asm__("mulq %3" : "=d" (r.halfs_.high), "=a" (r.halfs_.low) :
-                "a" (a), "rm" (b) : "cc");
-
-        #elif defined(__mips64)
-            __asm__("dmultu %2,%3" : "=h" (r.halfs_.high), "=l" (r.halfs_.low)
-                : "r" (a), "r" (b));
-
-        #elif defined(_M_IX86)
-            // for testing
-            word64 t = (word64)a * b;
-            r.halfs_.high = ((word32 *)(&t))[1];
-            r.halfs_.low = (word32)t;
-        #else
-            #error can not implement DWord
-        #endif
-
-        return r;
-    }
-
-    static DWord MultiplyAndAdd(word a, word b, word c)
-    {
-        DWord r = Multiply(a, b);
-        return r += c;
-    }
-
-    DWord & operator+=(word a)
-    {
-        #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-            whole_ = whole_ + a;
-        #else
-            halfs_.low += a;
-            halfs_.high += (halfs_.low < a);
-        #endif
-        return *this;
-    }
-
-    DWord operator+(word a)
-    {
-        DWord r;
-        #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-            r.whole_ = whole_ + a;
-        #else
-            r.halfs_.low = halfs_.low + a;
-            r.halfs_.high = halfs_.high + (r.halfs_.low < a);
-        #endif
-        return r;
-    }
-
-    DWord operator-(DWord a)
-    {
-        DWord r;
-        #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-            r.whole_ = whole_ - a.whole_;
-        #else
-            r.halfs_.low = halfs_.low - a.halfs_.low;
-            r.halfs_.high = halfs_.high - a.halfs_.high -
-                             (r.halfs_.low > halfs_.low);
-        #endif
-        return r;
-    }
-
-    DWord operator-(word a)
-    {
-        DWord r;
-        #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-            r.whole_ = whole_ - a;
-        #else
-            r.halfs_.low = halfs_.low - a;
-            r.halfs_.high = halfs_.high - (r.halfs_.low > halfs_.low);
-        #endif
-        return r;
-    }
-
-    // returns quotient, which must fit in a word
-    word operator/(word divisor);
-
-    word operator%(word a);
-
-    bool operator!() const
-    {
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        return !whole_;
-    #else
-        return !halfs_.high && !halfs_.low;
-    #endif
-    }
-
-    word GetLowHalf() const {return halfs_.low;}
-    word GetHighHalf() const {return halfs_.high;}
-    word GetHighHalfAsBorrow() const {return 0-halfs_.high;}
-
-private:
-    struct dword_struct
-        {
-        #ifdef LITTLE_ENDIAN_ORDER
-            word low;
-            word high;
-        #else
-            word high;
-            word low;
-        #endif
-    };
-
-    union
-    {
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        dword whole_;
-    #endif
-        struct dword_struct halfs_;
-    };
-};
-
-
-class Word {
-public:
-    Word() {}
-
-    Word(word value)
-    {
-        whole_ = value;
-    }
-
-    Word(hword low, hword high)
-    {
-        whole_ = low | (word(high) << (WORD_BITS/2));
-    }
-
-    static Word Multiply(hword a, hword b)
-    {
-        Word r;
-        r.whole_ = (word)a * b;
-        return r;
-    }
-
-    Word operator-(Word a)
-    {
-        Word r;
-        r.whole_ = whole_ - a.whole_;
-        return r;
-    }
-
-    Word operator-(hword a)
-    {
-        Word r;
-        r.whole_ = whole_ - a;
-        return r;
-    }
-
-    // returns quotient, which must fit in a word
-    hword operator/(hword divisor)
-    {
-        return hword(whole_ / divisor);
-    }
-
-    bool operator!() const
-    {
-        return !whole_;
-    }
-
-    word GetWhole() const {return whole_;}
-    hword GetLowHalf() const {return hword(whole_);}
-    hword GetHighHalf() const {return hword(whole_>>(WORD_BITS/2));}
-    hword GetHighHalfAsBorrow() const {return 0-hword(whole_>>(WORD_BITS/2));}
-
-private:
-    word whole_;
-};
-
-
-// dummy is VC60 compiler bug workaround
-// do a 3 word by 2 word divide, returns quotient and leaves remainder in A
-template <class S, class D>
-S DivideThreeWordsByTwo(S* A, S B0, S B1, D* dummy_VC6_WorkAround = 0)
-{
-    // estimate the quotient: do a 2 S by 1 S divide
-    S Q;
-    if (S(B1+1) == 0)
-        Q = A[2];
-    else
-        Q = D(A[1], A[2]) / S(B1+1);
-
-    // now subtract Q*B from A
-    D p = D::Multiply(B0, Q);
-    D u = (D) A[0] - p.GetLowHalf();
-    A[0] = u.GetLowHalf();
-    u = (D) A[1] - p.GetHighHalf() - u.GetHighHalfAsBorrow() - 
-            D::Multiply(B1, Q);
-    A[1] = u.GetLowHalf();
-    A[2] += u.GetHighHalf();
-
-    // Q <= actual quotient, so fix it
-    while (A[2] || A[1] > B1 || (A[1]==B1 && A[0]>=B0))
-    {
-        u = (D) A[0] - B0;
-        A[0] = u.GetLowHalf();
-        u = (D) A[1] - B1 - u.GetHighHalfAsBorrow();
-        A[1] = u.GetLowHalf();
-        A[2] += u.GetHighHalf();
-        Q++;
-    }
-
-    return Q;
-}
-
-
-// do a 4 word by 2 word divide, returns 2 word quotient in Q0 and Q1
-template <class S, class D>
-inline D DivideFourWordsByTwo(S *T, const D &Al, const D &Ah, const D &B)
-{
-    if (!B) // if divisor is 0, we assume divisor==2**(2*WORD_BITS)
-        return D(Ah.GetLowHalf(), Ah.GetHighHalf());
-    else
-    {
-        S Q[2];
-        T[0] = Al.GetLowHalf();
-        T[1] = Al.GetHighHalf(); 
-        T[2] = Ah.GetLowHalf();
-        T[3] = Ah.GetHighHalf();
-        Q[1] = DivideThreeWordsByTwo<S, D>(T+1, B.GetLowHalf(),
-                                                B.GetHighHalf());
-        Q[0] = DivideThreeWordsByTwo<S, D>(T, B.GetLowHalf(), B.GetHighHalf());
-        return D(Q[0], Q[1]);
-    }
-}
-
-
-// returns quotient, which must fit in a word
-inline word DWord::operator/(word a)
-{
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        return word(whole_ / a);
-    #else
-        hword r[4];
-        return DivideFourWordsByTwo<hword, Word>(r, halfs_.low,
-                                                    halfs_.high, a).GetWhole();
-    #endif
-}
-
-inline word DWord::operator%(word a)
-{
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        return word(whole_ % a);
-    #else
-        if (a < (word(1) << (WORD_BITS/2)))
-        {
-            hword h = hword(a);
-            word r = halfs_.high % h;
-            r = ((halfs_.low >> (WORD_BITS/2)) + (r << (WORD_BITS/2))) % h;
-            return hword((hword(halfs_.low) + (r << (WORD_BITS/2))) % h);
-        }
-        else
-        {
-            hword r[4];
-            DivideFourWordsByTwo<hword, Word>(r, halfs_.low, halfs_.high, a);
-            return Word(r[0], r[1]).GetWhole();
-        }
-    #endif
-}
-
-
-
-// end 5.2.1 DWord and Word adds
-
-
-
-
-
-static const unsigned int RoundupSizeTable[] = {2, 2, 2, 4, 4, 8, 8, 8, 8};
-
-static inline unsigned int RoundupSize(unsigned int n)
-{
-    if (n<=8)
-        return RoundupSizeTable[n];
-    else if (n<=16)
-        return 16;
-    else if (n<=32)
-        return 32;
-    else if (n<=64)
-        return 64;
-    else return 1U << BitPrecision(n-1);
-}
-
-
-static int Compare(const word *A, const word *B, unsigned int N)
-{
-    while (N--)
-        if (A[N] > B[N])
-            return 1;
-        else if (A[N] < B[N])
-            return -1;
-
-    return 0;
-}
-
-static word Increment(word *A, unsigned int N, word B=1)
-{
-    word t = A[0];
-    A[0] = t+B;
-    if (A[0] >= t)
-        return 0;
-    for (unsigned i=1; i<N; i++)
-        if (++A[i])
-            return 0;
-    return 1;
-}
-
-static word Decrement(word *A, unsigned int N, word B=1)
-{
-    word t = A[0];
-    A[0] = t-B;
-    if (A[0] <= t)
-        return 0;
-    for (unsigned i=1; i<N; i++)
-        if (A[i]--)
-            return 0;
-    return 1;
-}
-
-static void TwosComplement(word *A, unsigned int N)
-{
-    Decrement(A, N);
-    for (unsigned i=0; i<N; i++)
-        A[i] = ~A[i];
-}
-
-
-static word LinearMultiply(word *C, const word *A, word B, unsigned int N)
-{
-    word carry=0;
-    for(unsigned i=0; i<N; i++)
-    {
-        DWord p = DWord::MultiplyAndAdd(A[i], B, carry);
-        C[i] = p.GetLowHalf();
-        carry = p.GetHighHalf();
-    }
-    return carry;
-}
-
-
-static word AtomicInverseModPower2(word A)
-{
-    word R=A%8;
-
-    for (unsigned i=3; i<WORD_BITS; i*=2)
-        R = R*(2-R*A);
-
-    return R;
-}
-
-
-// ********************************************************
-
-class Portable
-{
-public:
-    static word TAOCRYPT_CDECL Add(word *C, const word *A, const word *B,
-                                   unsigned int N);
-    static word TAOCRYPT_CDECL Subtract(word *C, const word *A, const word*B,
-                                        unsigned int N);
-    static void TAOCRYPT_CDECL Multiply2(word *C, const word *A, const word *B);
-    static word TAOCRYPT_CDECL Multiply2Add(word *C,
-                                            const word *A, const word *B);
-    static void TAOCRYPT_CDECL Multiply4(word *C, const word *A, const word *B);
-    static void TAOCRYPT_CDECL Multiply8(word *C, const word *A, const word *B);
-    static unsigned int TAOCRYPT_CDECL MultiplyRecursionLimit() {return 8;}
-
-    static void TAOCRYPT_CDECL Multiply2Bottom(word *C, const word *A,
-                                               const word *B);
-    static void TAOCRYPT_CDECL Multiply4Bottom(word *C, const word *A,
-                                               const word *B);
-    static void TAOCRYPT_CDECL Multiply8Bottom(word *C, const word *A,
-                                               const word *B);
-    static unsigned int TAOCRYPT_CDECL MultiplyBottomRecursionLimit(){return 8;}
-
-    static void TAOCRYPT_CDECL Square2(word *R, const word *A);
-    static void TAOCRYPT_CDECL Square4(word *R, const word *A);
-    static unsigned int TAOCRYPT_CDECL SquareRecursionLimit() {return 4;}
-};
-
-word Portable::Add(word *C, const word *A, const word *B, unsigned int N)
-{
-    DWord u(0, 0);
-    for (unsigned int i = 0; i < N; i+=2)
-    {
-        u = DWord(A[i]) + B[i] + u.GetHighHalf();
-        C[i] = u.GetLowHalf();
-        u = DWord(A[i+1]) + B[i+1] + u.GetHighHalf();
-        C[i+1] = u.GetLowHalf();
-    }
-    return u.GetHighHalf();
-}
-
-word Portable::Subtract(word *C, const word *A, const word *B, unsigned int N)
-{
-    DWord u(0, 0);
-    for (unsigned int i = 0; i < N; i+=2)
-    {
-        u = (DWord) A[i] - B[i] - u.GetHighHalfAsBorrow();
-        C[i] = u.GetLowHalf();
-        u = (DWord) A[i+1] - B[i+1] - u.GetHighHalfAsBorrow();
-        C[i+1] = u.GetLowHalf();
-    }
-    return 0-u.GetHighHalf();
-}
-
-void Portable::Multiply2(word *C, const word *A, const word *B)
-{
-/*
-    word s;
-    dword d;
-
-    if (A1 >= A0)
-        if (B0 >= B1)
-        {
-            s = 0;
-            d = (dword)(A1-A0)*(B0-B1);
-        }
-        else
-        {
-            s = (A1-A0);
-            d = (dword)s*(word)(B0-B1);
-        }
-    else
-        if (B0 > B1)
-        {
-            s = (B0-B1);
-            d = (word)(A1-A0)*(dword)s;
-        }
-        else
-        {
-            s = 0;
-            d = (dword)(A0-A1)*(B1-B0);
-        }
-*/
-    // this segment is the branchless equivalent of above
-    word D[4] = {A[1]-A[0], A[0]-A[1], B[0]-B[1], B[1]-B[0]};
-    unsigned int ai = A[1] < A[0];
-    unsigned int bi = B[0] < B[1];
-    unsigned int di = ai & bi;
-    DWord d = DWord::Multiply(D[di], D[di+2]);
-    D[1] = D[3] = 0;
-    unsigned int si = ai + !bi;
-    word s = D[si];
-
-    DWord A0B0 = DWord::Multiply(A[0], B[0]);
-    C[0] = A0B0.GetLowHalf();
-
-    DWord A1B1 = DWord::Multiply(A[1], B[1]);
-    DWord t = (DWord) A0B0.GetHighHalf() + A0B0.GetLowHalf() + d.GetLowHalf()
-                       + A1B1.GetLowHalf();
-    C[1] = t.GetLowHalf();
-
-    t = A1B1 + t.GetHighHalf() + A0B0.GetHighHalf() + d.GetHighHalf()
-             + A1B1.GetHighHalf() - s;
-    C[2] = t.GetLowHalf();
-    C[3] = t.GetHighHalf();
-}
-
-void Portable::Multiply2Bottom(word *C, const word *A, const word *B)
-{
-    DWord t = DWord::Multiply(A[0], B[0]);
-    C[0] = t.GetLowHalf();
-    C[1] = t.GetHighHalf() + A[0]*B[1] + A[1]*B[0];
-}
-
-word Portable::Multiply2Add(word *C, const word *A, const word *B)
-{
-    word D[4] = {A[1]-A[0], A[0]-A[1], B[0]-B[1], B[1]-B[0]};
-    unsigned int ai = A[1] < A[0];
-    unsigned int bi = B[0] < B[1];
-    unsigned int di = ai & bi;
-    DWord d = DWord::Multiply(D[di], D[di+2]);
-    D[1] = D[3] = 0;
-    unsigned int si = ai + !bi;
-    word s = D[si];
-
-    DWord A0B0 = DWord::Multiply(A[0], B[0]);
-    DWord t = A0B0 + C[0];
-    C[0] = t.GetLowHalf();
-
-    DWord A1B1 = DWord::Multiply(A[1], B[1]);
-    t = (DWord) t.GetHighHalf() + A0B0.GetLowHalf() + d.GetLowHalf() +
-        A1B1.GetLowHalf() + C[1];
-    C[1] = t.GetLowHalf();
-
-    t = (DWord) t.GetHighHalf() + A1B1.GetLowHalf() + A0B0.GetHighHalf() +
-        d.GetHighHalf() + A1B1.GetHighHalf() - s + C[2];
-    C[2] = t.GetLowHalf();
-
-    t = (DWord) t.GetHighHalf() + A1B1.GetHighHalf() + C[3];
-    C[3] = t.GetLowHalf();
-    return t.GetHighHalf();
-}
-
-
-#define MulAcc(x, y)                                \
-    p = DWord::MultiplyAndAdd(A[x], B[y], c);       \
-    c = p.GetLowHalf();                             \
-    p = (DWord) d + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e += p.GetHighHalf();
-
-#define SaveMulAcc(s, x, y)                         \
-    R[s] = c;                                       \
-    p = DWord::MultiplyAndAdd(A[x], B[y], d);       \
-    c = p.GetLowHalf();                             \
-    p = (DWord) e + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e = p.GetHighHalf();
-
-#define SquAcc(x, y)                                \
-    q = DWord::Multiply(A[x], A[y]);                \
-    p = q + c;                                      \
-    c = p.GetLowHalf();                             \
-    p = (DWord) d + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e += p.GetHighHalf();                           \
-    p = q + c;                                      \
-    c = p.GetLowHalf();                             \
-    p = (DWord) d + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e += p.GetHighHalf();
-
-#define SaveSquAcc(s, x, y)                         \
-    R[s] = c;                                       \
-    q = DWord::Multiply(A[x], A[y]);                \
-    p = q + d;                                      \
-    c = p.GetLowHalf();                             \
-    p = (DWord) e + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e = p.GetHighHalf();                            \
-    p = q + c;                                      \
-    c = p.GetLowHalf();                             \
-    p = (DWord) d + p.GetHighHalf();                \
-    d = p.GetLowHalf();                             \
-    e += p.GetHighHalf();
-
-
-void Portable::Multiply4(word *R, const word *A, const word *B)
-{
-    DWord p;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], B[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    MulAcc(0, 1);
-    MulAcc(1, 0);
-
-    SaveMulAcc(1, 2, 0);
-    MulAcc(1, 1);
-    MulAcc(0, 2);
-
-    SaveMulAcc(2, 0, 3);
-    MulAcc(1, 2);
-    MulAcc(2, 1);
-    MulAcc(3, 0);
-
-    SaveMulAcc(3, 3, 1);
-    MulAcc(2, 2);
-    MulAcc(1, 3);
-
-    SaveMulAcc(4, 2, 3);
-    MulAcc(3, 2);
-
-    R[5] = c;
-    p = DWord::MultiplyAndAdd(A[3], B[3], d);
-    R[6] = p.GetLowHalf();
-    R[7] = e + p.GetHighHalf();
-}
-
-void Portable::Square2(word *R, const word *A)
-{
-    DWord p, q;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], A[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    SquAcc(0, 1);
-
-    R[1] = c;
-    p = DWord::MultiplyAndAdd(A[1], A[1], d);
-    R[2] = p.GetLowHalf();
-    R[3] = e + p.GetHighHalf();
-}
-
-void Portable::Square4(word *R, const word *A)
-{
-#ifdef _MSC_VER
-    // VC60 workaround: MSVC 6.0 has an optimization bug that makes
-    // (dword)A*B where either A or B has been cast to a dword before
-    // very expensive. Revisit this function when this
-    // bug is fixed.
-    Multiply4(R, A, A);
-#else
-    const word *B = A;
-    DWord p, q;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], A[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    SquAcc(0, 1);
-
-    SaveSquAcc(1, 2, 0);
-    MulAcc(1, 1);
-
-    SaveSquAcc(2, 0, 3);
-    SquAcc(1, 2);
-
-    SaveSquAcc(3, 3, 1);
-    MulAcc(2, 2);
-
-    SaveSquAcc(4, 2, 3);
-
-    R[5] = c;
-    p = DWord::MultiplyAndAdd(A[3], A[3], d);
-    R[6] = p.GetLowHalf();
-    R[7] = e + p.GetHighHalf();
-#endif
-}
-
-void Portable::Multiply8(word *R, const word *A, const word *B)
-{
-    DWord p;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], B[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    MulAcc(0, 1);
-    MulAcc(1, 0);
-
-    SaveMulAcc(1, 2, 0);
-    MulAcc(1, 1);
-    MulAcc(0, 2);
-
-    SaveMulAcc(2, 0, 3);
-    MulAcc(1, 2);
-    MulAcc(2, 1);
-    MulAcc(3, 0);
-
-    SaveMulAcc(3, 0, 4);
-    MulAcc(1, 3);
-    MulAcc(2, 2);
-    MulAcc(3, 1);
-    MulAcc(4, 0);
-
-    SaveMulAcc(4, 0, 5);
-    MulAcc(1, 4);
-    MulAcc(2, 3);
-    MulAcc(3, 2);
-    MulAcc(4, 1);
-    MulAcc(5, 0);
-
-    SaveMulAcc(5, 0, 6);
-    MulAcc(1, 5);
-    MulAcc(2, 4);
-    MulAcc(3, 3);
-    MulAcc(4, 2);
-    MulAcc(5, 1);
-    MulAcc(6, 0);
-
-    SaveMulAcc(6, 0, 7);
-    MulAcc(1, 6);
-    MulAcc(2, 5);
-    MulAcc(3, 4);
-    MulAcc(4, 3);
-    MulAcc(5, 2);
-    MulAcc(6, 1);
-    MulAcc(7, 0);
-
-    SaveMulAcc(7, 1, 7);
-    MulAcc(2, 6);
-    MulAcc(3, 5);
-    MulAcc(4, 4);
-    MulAcc(5, 3);
-    MulAcc(6, 2);
-    MulAcc(7, 1);
-
-    SaveMulAcc(8, 2, 7);
-    MulAcc(3, 6);
-    MulAcc(4, 5);
-    MulAcc(5, 4);
-    MulAcc(6, 3);
-    MulAcc(7, 2);
-
-    SaveMulAcc(9, 3, 7);
-    MulAcc(4, 6);
-    MulAcc(5, 5);
-    MulAcc(6, 4);
-    MulAcc(7, 3);
-
-    SaveMulAcc(10, 4, 7);
-    MulAcc(5, 6);
-    MulAcc(6, 5);
-    MulAcc(7, 4);
-
-    SaveMulAcc(11, 5, 7);
-    MulAcc(6, 6);
-    MulAcc(7, 5);
-
-    SaveMulAcc(12, 6, 7);
-    MulAcc(7, 6);
-
-    R[13] = c;
-    p = DWord::MultiplyAndAdd(A[7], B[7], d);
-    R[14] = p.GetLowHalf();
-    R[15] = e + p.GetHighHalf();
-}
-
-void Portable::Multiply4Bottom(word *R, const word *A, const word *B)
-{
-    DWord p;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], B[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    MulAcc(0, 1);
-    MulAcc(1, 0);
-
-    SaveMulAcc(1, 2, 0);
-    MulAcc(1, 1);
-    MulAcc(0, 2);
-
-    R[2] = c;
-    R[3] = d + A[0] * B[3] + A[1] * B[2] + A[2] * B[1] + A[3] * B[0];
-}
-
-void Portable::Multiply8Bottom(word *R, const word *A, const word *B)
-{
-    DWord p;
-    word c, d, e;
-
-    p = DWord::Multiply(A[0], B[0]);
-    R[0] = p.GetLowHalf();
-    c = p.GetHighHalf();
-    d = e = 0;
-
-    MulAcc(0, 1);
-    MulAcc(1, 0);
-
-    SaveMulAcc(1, 2, 0);
-    MulAcc(1, 1);
-    MulAcc(0, 2);
-
-    SaveMulAcc(2, 0, 3);
-    MulAcc(1, 2);
-    MulAcc(2, 1);
-    MulAcc(3, 0);
-
-    SaveMulAcc(3, 0, 4);
-    MulAcc(1, 3);
-    MulAcc(2, 2);
-    MulAcc(3, 1);
-    MulAcc(4, 0);
-
-    SaveMulAcc(4, 0, 5);
-    MulAcc(1, 4);
-    MulAcc(2, 3);
-    MulAcc(3, 2);
-    MulAcc(4, 1);
-    MulAcc(5, 0);
-
-    SaveMulAcc(5, 0, 6);
-    MulAcc(1, 5);
-    MulAcc(2, 4);
-    MulAcc(3, 3);
-    MulAcc(4, 2);
-    MulAcc(5, 1);
-    MulAcc(6, 0);
-
-    R[6] = c;
-    R[7] = d + A[0] * B[7] + A[1] * B[6] + A[2] * B[5] + A[3] * B[4] +
-               A[4] * B[3] + A[5] * B[2] + A[6] * B[1] + A[7] * B[0];
-}
-
-
-#undef MulAcc
-#undef SaveMulAcc
-#undef SquAcc
-#undef SaveSquAcc
-
-// optimized
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-
-// ************** x86 feature detection ***************
-
-
-#ifdef SSE2_INTRINSICS_AVAILABLE
-
-#ifndef _MSC_VER
-    static jmp_buf s_env;
-    static void SigIllHandler(int)
-    {
-        longjmp(s_env, 1);
-    }
-#endif
-
-static bool HasSSE2()
-{
-    if (!IsPentium())
-        return false;
-
-    word32 cpuid[4];
-    CpuId(1, cpuid);
-    if ((cpuid[3] & (1 << 26)) == 0)
-        return false;
-
-#ifdef _MSC_VER
-    __try
-    {
-        __asm xorpd xmm0, xmm0        // executing SSE2 instruction
-    }
-    __except (1)
-    {
-        return false;
-    }
-    return true;
-#else
-    typedef void (*SigHandler)(int);
-
-    SigHandler oldHandler = signal(SIGILL, SigIllHandler);
-    if (oldHandler == SIG_ERR)
-        return false;
-
-    bool result = true;
-    if (setjmp(s_env))
-        result = false;
-    else
-        __asm __volatile ("xorpd %xmm0, %xmm0");
-
-    signal(SIGILL, oldHandler);
-    return result;
-#endif
-}
-#endif // SSE2_INTRINSICS_AVAILABLE
-
-
-static bool IsP4()
-{
-    if (!IsPentium())
-        return false;
-
-    word32 cpuid[4];
-
-    CpuId(1, cpuid);
-    return ((cpuid[0] >> 8) & 0xf) == 0xf;
-}
-
-// ************** Pentium/P4 optimizations ***************
-
-class PentiumOptimized : public Portable
-{
-public:
-    static word TAOCRYPT_CDECL Add(word *C, const word *A, const word *B,
-                                   unsigned int N);
-    static word TAOCRYPT_CDECL Subtract(word *C, const word *A, const word *B,
-                                        unsigned int N);
-    static void TAOCRYPT_CDECL Multiply4(word *C, const word *A,
-                                         const word *B);
-    static void TAOCRYPT_CDECL Multiply8(word *C, const word *A,
-                                         const word *B);
-    static void TAOCRYPT_CDECL Multiply8Bottom(word *C, const word *A,
-                                               const word *B);
-};
-
-class P4Optimized
-{
-public:
-    static word TAOCRYPT_CDECL Add(word *C, const word *A, const word *B,
-                                   unsigned int N);
-    static word TAOCRYPT_CDECL Subtract(word *C, const word *A, const word *B,
-                                        unsigned int N);
-#ifdef SSE2_INTRINSICS_AVAILABLE
-    static void TAOCRYPT_CDECL Multiply4(word *C, const word *A,
-                                         const word *B);
-    static void TAOCRYPT_CDECL Multiply8(word *C, const word *A,
-                                         const word *B);
-    static void TAOCRYPT_CDECL Multiply8Bottom(word *C, const word *A,
-                                               const word *B);
-#endif
-};
-
-typedef word (TAOCRYPT_CDECL * PAddSub)(word *C, const word *A, const word *B,
-                                        unsigned int N);
-typedef void (TAOCRYPT_CDECL * PMul)(word *C, const word *A, const word *B);
-
-static PAddSub s_pAdd, s_pSub;
-#ifdef SSE2_INTRINSICS_AVAILABLE
-static PMul s_pMul4, s_pMul8, s_pMul8B;
-#endif
-
-static void SetPentiumFunctionPointers()
-{
-    if (!IsPentium())
-    {   
-        s_pAdd = &Portable::Add;
-        s_pSub = &Portable::Subtract;
-    }
-    else if (IsP4())
-    {
-        s_pAdd = &P4Optimized::Add;
-        s_pSub = &P4Optimized::Subtract;
-    }
-    else
-    {
-        s_pAdd = &PentiumOptimized::Add;
-        s_pSub = &PentiumOptimized::Subtract;
-    }
-
-#ifdef SSE2_INTRINSICS_AVAILABLE
-    if (!IsPentium()) 
-    {
-        s_pMul4 = &Portable::Multiply4;
-        s_pMul8 = &Portable::Multiply8;
-        s_pMul8B = &Portable::Multiply8Bottom;
-    }
-    else if (HasSSE2())
-    {
-        s_pMul4 = &P4Optimized::Multiply4;
-        s_pMul8 = &P4Optimized::Multiply8;
-        s_pMul8B = &P4Optimized::Multiply8Bottom;
-    }
-    else
-    {
-        s_pMul4 = &PentiumOptimized::Multiply4;
-        s_pMul8 = &PentiumOptimized::Multiply8;
-        s_pMul8B = &PentiumOptimized::Multiply8Bottom;
-    }
-#endif
-}
-
-static const char s_RunAtStartupSetPentiumFunctionPointers =
-    (SetPentiumFunctionPointers(), 0);
-
-
-class LowLevel : public PentiumOptimized
-{
-public:
-    inline static word Add(word *C, const word *A, const word *B,
-                           unsigned int N)
-        {return s_pAdd(C, A, B, N);}
-    inline static word Subtract(word *C, const word *A, const word *B,
-                                unsigned int N)
-        {return s_pSub(C, A, B, N);}
-    inline static void Square4(word *R, const word *A)
-        {Multiply4(R, A, A);}
-#ifdef SSE2_INTRINSICS_AVAILABLE
-    inline static void Multiply4(word *C, const word *A, const word *B)
-        {s_pMul4(C, A, B);}
-    inline static void Multiply8(word *C, const word *A, const word *B)
-        {s_pMul8(C, A, B);}
-    inline static void Multiply8Bottom(word *C, const word *A, const word *B)
-        {s_pMul8B(C, A, B);}
-#endif
-};
-
-// use some tricks to share assembly code between MSVC and GCC
-#ifdef _MSC_VER
-    #define TAOCRYPT_NAKED __declspec(naked)
-    #define AS1(x) __asm x
-    #define AS2(x, y) __asm x, y
-    #define AddPrologue \
-        __asm	push ebp \
-        __asm	push ebx \
-        __asm	push esi \
-        __asm	push edi \
-        __asm	mov		ecx, [esp+20] \
-        __asm	mov		edx, [esp+24] \
-        __asm	mov		ebx, [esp+28] \
-        __asm	mov		esi, [esp+32]
-    #define AddEpilogue \
-        __asm	pop edi \
-        __asm	pop esi \
-        __asm	pop ebx \
-        __asm	pop ebp \
-        __asm	ret
-    #define MulPrologue \
-        __asm	push ebp \
-        __asm	push ebx \
-        __asm	push esi \
-        __asm	push edi \
-        __asm	mov ecx, [esp+28] \
-        __asm	mov esi, [esp+24] \
-        __asm	push [esp+20]
-    #define MulEpilogue \
-        __asm	add esp, 4 \
-        __asm	pop edi \
-        __asm	pop esi \
-        __asm	pop ebx \
-        __asm	pop ebp \
-        __asm	ret
-#else
-    #define TAOCRYPT_NAKED
-    #define AS1(x) #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-    #define AddPrologue \
-        word res; \
-        __asm__ __volatile__ \
-        ( \
-            "push %%ebx;"	/* save this manually, in case of -fPIC */ \
-            "mov %3, %%ebx;" \
-            ".intel_syntax noprefix;" \
-            "push ebp;"
-    #define AddEpilogue \
-            "pop ebp;" \
-            ".att_syntax prefix;" \
-            "pop %%ebx;" \
-            "mov %%eax, %0;" \
-                    : "=g" (res) \
-                    : "c" (C), "d" (A), "m" (B), "S" (N) \
-                    : "%edi", "memory", "cc" \
-        ); \
-        return res;
-
-    #define MulPrologue \
-        __asm__ __volatile__ \
-        ( \
-            "push %%ebx;"	/* save this manually, in case of -fPIC */ \
-            "push %%ebp;" \
-            "push %0;" \
-            ".intel_syntax noprefix;"
-    #define MulEpilogue \
-            "add esp, 4;" \
-            "pop ebp;" \
-            "pop ebx;" \
-            ".att_syntax prefix;" \
-            : \
-            : "rm" (Z), "S" (X), "c" (Y) \
-            : "%eax", "%edx", "%edi", "memory", "cc" \
-        );
-#endif
-
-TAOCRYPT_NAKED word PentiumOptimized::Add(word *C, const word *A,
-                                          const word *B, unsigned int N)
-{
-    AddPrologue
-
-    // now: ebx = B, ecx = C, edx = A, esi = N
-    AS2(    sub ecx, edx)           // hold the distance between C & A so we
-                                    // can add this to A to get C
-    AS2(    xor eax, eax)           // clear eax
-
-    AS2(    sub eax, esi)           // eax is a negative index from end of B
-    AS2(    lea ebx, [ebx+4*esi])   // ebx is end of B
-
-    AS2(    sar eax, 1)             // unit of eax is now dwords; this also
-                                    // clears the carry flag
-    AS1(    jz  loopendAdd)         // if no dwords then nothing to do
-
-    AS1(loopstartAdd:)
-    AS2(    mov    esi,[edx])           // load lower word of A
-    AS2(    mov    ebp,[edx+4])         // load higher word of A
-
-    AS2(    mov    edi,[ebx+8*eax])     // load lower word of B
-    AS2(    lea    edx,[edx+8])         // advance A and C
-
-    AS2(    adc    esi,edi)             // add lower words
-    AS2(    mov    edi,[ebx+8*eax+4])   // load higher word of B
-
-    AS2(    adc    ebp,edi)             // add higher words
-    AS1(    inc    eax)                 // advance B
-
-    AS2(    mov    [edx+ecx-8],esi)     // store lower word result
-    AS2(    mov    [edx+ecx-4],ebp)     // store higher word result
-
-    AS1(    jnz    loopstartAdd)   // loop until eax overflows and becomes zero
-
-    AS1(loopendAdd:)
-    AS2(    adc eax, 0)     // store carry into eax (return result register)
-
-    AddEpilogue
-}
-
-TAOCRYPT_NAKED word PentiumOptimized::Subtract(word *C, const word *A,
-                                               const word *B, unsigned int N)
-{
-    AddPrologue
-
-    // now: ebx = B, ecx = C, edx = A, esi = N
-    AS2(    sub ecx, edx)           // hold the distance between C & A so we
-                                    // can add this to A to get C
-    AS2(    xor eax, eax)           // clear eax
-
-    AS2(    sub eax, esi)           // eax is a negative index from end of B
-    AS2(    lea ebx, [ebx+4*esi])   // ebx is end of B
-
-    AS2(    sar eax, 1)             // unit of eax is now dwords; this also
-                                    // clears the carry flag
-    AS1(    jz  loopendSub)         // if no dwords then nothing to do
-
-    AS1(loopstartSub:)
-    AS2(    mov    esi,[edx])           // load lower word of A
-    AS2(    mov    ebp,[edx+4])         // load higher word of A
-
-    AS2(    mov    edi,[ebx+8*eax])     // load lower word of B
-    AS2(    lea    edx,[edx+8])         // advance A and C
-
-    AS2(    sbb    esi,edi)             // subtract lower words
-    AS2(    mov    edi,[ebx+8*eax+4])   // load higher word of B
-
-    AS2(    sbb    ebp,edi)             // subtract higher words
-    AS1(    inc    eax)                 // advance B
-
-    AS2(    mov    [edx+ecx-8],esi)     // store lower word result
-    AS2(    mov    [edx+ecx-4],ebp)     // store higher word result
-
-    AS1(    jnz    loopstartSub)   // loop until eax overflows and becomes zero
-
-    AS1(loopendSub:)
-    AS2(    adc eax, 0)     // store carry into eax (return result register)
-
-    AddEpilogue
-}
-
-// On Pentium 4, the adc and sbb instructions are very expensive, so avoid them.
-
-TAOCRYPT_NAKED word P4Optimized::Add(word *C, const word *A, const word *B,
-                                     unsigned int N)
-{
-    AddPrologue
-
-    // now: ebx = B, ecx = C, edx = A, esi = N
-    AS2(    xor     eax, eax)
-    AS1(    neg     esi)
-    AS1(    jz      loopendAddP4)       // if no dwords then nothing to do
-
-    AS2(    mov     edi, [edx])
-    AS2(    mov     ebp, [ebx])
-    AS1(    jmp     carry1AddP4)
-
-    AS1(loopstartAddP4:)
-    AS2(    mov     edi, [edx+8])
-    AS2(    add     ecx, 8)
-    AS2(    add     edx, 8)
-    AS2(    mov     ebp, [ebx])
-    AS2(    add     edi, eax)
-    AS1(    jc      carry1AddP4)
-    AS2(    xor     eax, eax)
-
-    AS1(carry1AddP4:)
-    AS2(    add     edi, ebp)
-    AS2(    mov     ebp, 1)
-    AS2(    mov     [ecx], edi)
-    AS2(    mov     edi, [edx+4])
-    AS2(    cmovc   eax, ebp)
-    AS2(    mov     ebp, [ebx+4])
-    AS2(    add     ebx, 8)
-    AS2(    add     edi, eax)
-    AS1(    jc      carry2AddP4)
-    AS2(    xor     eax, eax)
-
-    AS1(carry2AddP4:)
-    AS2(    add     edi, ebp)
-    AS2(    mov     ebp, 1)
-    AS2(    cmovc   eax, ebp)
-    AS2(    mov     [ecx+4], edi)
-    AS2(    add     esi, 2)
-    AS1(    jnz     loopstartAddP4)
-
-    AS1(loopendAddP4:)
-
-    AddEpilogue
-}
-
-TAOCRYPT_NAKED word P4Optimized::Subtract(word *C, const word *A,
-                                          const word *B, unsigned int N)
-{
-    AddPrologue
-
-    // now: ebx = B, ecx = C, edx = A, esi = N
-    AS2(    xor     eax, eax)
-    AS1(    neg     esi)
-    AS1(    jz      loopendSubP4)       // if no dwords then nothing to do
-
-    AS2(    mov     edi, [edx])
-    AS2(    mov     ebp, [ebx])
-    AS1(    jmp     carry1SubP4)
-
-    AS1(loopstartSubP4:)
-    AS2(    mov     edi, [edx+8])
-    AS2(    add     edx, 8)
-    AS2(    add     ecx, 8)
-    AS2(    mov     ebp, [ebx])
-    AS2(    sub     edi, eax)
-    AS1(    jc      carry1SubP4)
-    AS2(    xor     eax, eax)
-
-    AS1(carry1SubP4:)
-    AS2(    sub     edi, ebp)
-    AS2(    mov     ebp, 1)
-    AS2(    mov     [ecx], edi)
-    AS2(    mov     edi, [edx+4])
-    AS2(    cmovc   eax, ebp)
-    AS2(    mov     ebp, [ebx+4])
-    AS2(    add     ebx, 8)
-    AS2(    sub     edi, eax)
-    AS1(    jc      carry2SubP4)
-    AS2(    xor     eax, eax)
-
-    AS1(carry2SubP4:)
-    AS2(    sub     edi, ebp)
-    AS2(    mov     ebp, 1)
-    AS2(    cmovc   eax, ebp)
-    AS2(    mov     [ecx+4], edi)
-    AS2(    add     esi, 2)
-    AS1(    jnz     loopstartSubP4)
-
-    AS1(loopendSubP4:)
-
-    AddEpilogue
-}
-
-// multiply assembly code originally contributed by Leonard Janke
-
-#define MulStartup \
-    AS2(xor ebp, ebp) \
-    AS2(xor edi, edi) \
-    AS2(xor ebx, ebx) 
-
-#define MulShiftCarry \
-    AS2(mov ebp, edx) \
-    AS2(mov edi, ebx) \
-    AS2(xor ebx, ebx)
-
-#define MulAccumulateBottom(i,j) \
-    AS2(mov eax, [ecx+4*j]) \
-    AS2(imul eax, dword ptr [esi+4*i]) \
-    AS2(add ebp, eax)
-
-#define MulAccumulate(i,j) \
-    AS2(mov eax, [ecx+4*j]) \
-    AS1(mul dword ptr [esi+4*i]) \
-    AS2(add ebp, eax) \
-    AS2(adc edi, edx) \
-    AS2(adc bl, bh)
-
-#define MulStoreDigit(i)  \
-    AS2(mov edx, edi) \
-    AS2(mov edi, [esp]) \
-    AS2(mov [edi+4*i], ebp)
-
-#define MulLastDiagonal(digits) \
-    AS2(mov eax, [ecx+4*(digits-1)]) \
-    AS1(mul dword ptr [esi+4*(digits-1)]) \
-    AS2(add ebp, eax) \
-    AS2(adc edx, edi) \
-    AS2(mov edi, [esp]) \
-    AS2(mov [edi+4*(2*digits-2)], ebp) \
-    AS2(mov [edi+4*(2*digits-1)], edx)
-
-TAOCRYPT_NAKED void PentiumOptimized::Multiply4(word* Z, const word* X,
-                                                const word* Y)
-{
-    MulPrologue
-    // now: [esp] = Z, esi = X, ecx = Y
-    MulStartup
-    MulAccumulate(0,0)
-    MulStoreDigit(0)
-    MulShiftCarry
-
-    MulAccumulate(1,0)
-    MulAccumulate(0,1)
-    MulStoreDigit(1)
-    MulShiftCarry
-
-    MulAccumulate(2,0)
-    MulAccumulate(1,1)
-    MulAccumulate(0,2)
-    MulStoreDigit(2)
-    MulShiftCarry
-
-    MulAccumulate(3,0)
-    MulAccumulate(2,1)
-    MulAccumulate(1,2)
-    MulAccumulate(0,3)
-    MulStoreDigit(3)
-    MulShiftCarry
-
-    MulAccumulate(3,1)
-    MulAccumulate(2,2)
-    MulAccumulate(1,3)
-    MulStoreDigit(4)
-    MulShiftCarry
-
-    MulAccumulate(3,2)
-    MulAccumulate(2,3)
-    MulStoreDigit(5)
-    MulShiftCarry
-
-    MulLastDiagonal(4)
-    MulEpilogue
-}
-
-TAOCRYPT_NAKED void PentiumOptimized::Multiply8(word* Z, const word* X,
-                                                const word* Y)
-{
-    MulPrologue
-    // now: [esp] = Z, esi = X, ecx = Y
-    MulStartup
-    MulAccumulate(0,0)
-    MulStoreDigit(0)
-    MulShiftCarry
-
-    MulAccumulate(1,0)
-    MulAccumulate(0,1)
-    MulStoreDigit(1)
-    MulShiftCarry
-
-    MulAccumulate(2,0)
-    MulAccumulate(1,1)
-    MulAccumulate(0,2)
-    MulStoreDigit(2)
-    MulShiftCarry
-
-    MulAccumulate(3,0)
-    MulAccumulate(2,1)
-    MulAccumulate(1,2)
-    MulAccumulate(0,3)
-    MulStoreDigit(3)
-    MulShiftCarry
-
-    MulAccumulate(4,0)
-    MulAccumulate(3,1)
-    MulAccumulate(2,2)
-    MulAccumulate(1,3)
-    MulAccumulate(0,4)
-    MulStoreDigit(4)
-    MulShiftCarry
-
-    MulAccumulate(5,0)
-    MulAccumulate(4,1)
-    MulAccumulate(3,2)
-    MulAccumulate(2,3)
-    MulAccumulate(1,4)
-    MulAccumulate(0,5)
-    MulStoreDigit(5)
-    MulShiftCarry
-
-    MulAccumulate(6,0)
-    MulAccumulate(5,1)
-    MulAccumulate(4,2)
-    MulAccumulate(3,3)
-    MulAccumulate(2,4)
-    MulAccumulate(1,5)
-    MulAccumulate(0,6)
-    MulStoreDigit(6)
-    MulShiftCarry
-
-    MulAccumulate(7,0)
-    MulAccumulate(6,1)
-    MulAccumulate(5,2)
-    MulAccumulate(4,3)
-    MulAccumulate(3,4)
-    MulAccumulate(2,5)
-    MulAccumulate(1,6)
-    MulAccumulate(0,7)
-    MulStoreDigit(7)
-    MulShiftCarry
-
-    MulAccumulate(7,1)
-    MulAccumulate(6,2)
-    MulAccumulate(5,3)
-    MulAccumulate(4,4)
-    MulAccumulate(3,5)
-    MulAccumulate(2,6)
-    MulAccumulate(1,7)
-    MulStoreDigit(8)
-    MulShiftCarry
-
-    MulAccumulate(7,2)
-    MulAccumulate(6,3)
-    MulAccumulate(5,4)
-    MulAccumulate(4,5)
-    MulAccumulate(3,6)
-    MulAccumulate(2,7)
-    MulStoreDigit(9)
-    MulShiftCarry
-
-    MulAccumulate(7,3)
-    MulAccumulate(6,4)
-    MulAccumulate(5,5)
-    MulAccumulate(4,6)
-    MulAccumulate(3,7)
-    MulStoreDigit(10)
-    MulShiftCarry
-
-    MulAccumulate(7,4)
-    MulAccumulate(6,5)
-    MulAccumulate(5,6)
-    MulAccumulate(4,7)
-    MulStoreDigit(11)
-    MulShiftCarry
-
-    MulAccumulate(7,5)
-    MulAccumulate(6,6)
-    MulAccumulate(5,7)
-    MulStoreDigit(12)
-    MulShiftCarry
-
-    MulAccumulate(7,6)
-    MulAccumulate(6,7)
-    MulStoreDigit(13)
-    MulShiftCarry
-
-    MulLastDiagonal(8)
-    MulEpilogue
-}
-
-TAOCRYPT_NAKED void PentiumOptimized::Multiply8Bottom(word* Z, const word* X,
-                                                      const word* Y)
-{
-    MulPrologue
-    // now: [esp] = Z, esi = X, ecx = Y
-    MulStartup
-    MulAccumulate(0,0)
-    MulStoreDigit(0)
-    MulShiftCarry
-
-    MulAccumulate(1,0)
-    MulAccumulate(0,1)
-    MulStoreDigit(1)
-    MulShiftCarry
-
-    MulAccumulate(2,0)
-    MulAccumulate(1,1)
-    MulAccumulate(0,2)
-    MulStoreDigit(2)
-    MulShiftCarry
-
-    MulAccumulate(3,0)
-    MulAccumulate(2,1)
-    MulAccumulate(1,2)
-    MulAccumulate(0,3)
-    MulStoreDigit(3)
-    MulShiftCarry
-
-    MulAccumulate(4,0)
-    MulAccumulate(3,1)
-    MulAccumulate(2,2)
-    MulAccumulate(1,3)
-    MulAccumulate(0,4)
-    MulStoreDigit(4)
-    MulShiftCarry
-
-    MulAccumulate(5,0)
-    MulAccumulate(4,1)
-    MulAccumulate(3,2)
-    MulAccumulate(2,3)
-    MulAccumulate(1,4)
-    MulAccumulate(0,5)
-    MulStoreDigit(5)
-    MulShiftCarry
-
-    MulAccumulate(6,0)
-    MulAccumulate(5,1)
-    MulAccumulate(4,2)
-    MulAccumulate(3,3)
-    MulAccumulate(2,4)
-    MulAccumulate(1,5)
-    MulAccumulate(0,6)
-    MulStoreDigit(6)
-    MulShiftCarry
-
-    MulAccumulateBottom(7,0)
-    MulAccumulateBottom(6,1)
-    MulAccumulateBottom(5,2)
-    MulAccumulateBottom(4,3)
-    MulAccumulateBottom(3,4)
-    MulAccumulateBottom(2,5)
-    MulAccumulateBottom(1,6)
-    MulAccumulateBottom(0,7)
-    MulStoreDigit(7)
-    MulEpilogue
-}
-
-#undef AS1
-#undef AS2
-
-#else	// not x86 - no processor specific code at this layer
-
-typedef Portable LowLevel;
-
-#endif
-
-#ifdef SSE2_INTRINSICS_AVAILABLE
-
-#ifdef __GNUC__
-#define TAOCRYPT_FASTCALL
-#else
-#define TAOCRYPT_FASTCALL __fastcall
-#endif
-
-static void TAOCRYPT_FASTCALL P4_Mul(__m128i *C, const __m128i *A,
-                                     const __m128i *B)
-{
-    __m128i a3210 = _mm_load_si128(A);
-    __m128i b3210 = _mm_load_si128(B);
-
-    __m128i sum;
-
-    __m128i z = _mm_setzero_si128();
-    __m128i a2b2_a0b0 = _mm_mul_epu32(a3210, b3210);
-    C[0] = a2b2_a0b0;
-
-    __m128i a3120 = _mm_shuffle_epi32(a3210, _MM_SHUFFLE(3, 1, 2, 0));
-    __m128i b3021 = _mm_shuffle_epi32(b3210, _MM_SHUFFLE(3, 0, 2, 1));
-    __m128i a1b0_a0b1 = _mm_mul_epu32(a3120, b3021);
-    __m128i a1b0 = _mm_unpackhi_epi32(a1b0_a0b1, z);
-    __m128i a0b1 = _mm_unpacklo_epi32(a1b0_a0b1, z);
-    C[1] = _mm_add_epi64(a1b0, a0b1);
-
-    __m128i a31 = _mm_srli_epi64(a3210, 32);
-    __m128i b31 = _mm_srli_epi64(b3210, 32);
-    __m128i a3b3_a1b1 = _mm_mul_epu32(a31, b31);
-    C[6] = a3b3_a1b1;
-
-    __m128i a1b1 = _mm_unpacklo_epi32(a3b3_a1b1, z);
-    __m128i b3012 = _mm_shuffle_epi32(b3210, _MM_SHUFFLE(3, 0, 1, 2));
-    __m128i a2b0_a0b2 = _mm_mul_epu32(a3210, b3012);
-    __m128i a0b2 = _mm_unpacklo_epi32(a2b0_a0b2, z);
-    __m128i a2b0 = _mm_unpackhi_epi32(a2b0_a0b2, z);
-    sum = _mm_add_epi64(a1b1, a0b2);
-    C[2] = _mm_add_epi64(sum, a2b0);
-
-    __m128i a2301 = _mm_shuffle_epi32(a3210, _MM_SHUFFLE(2, 3, 0, 1));
-    __m128i b2103 = _mm_shuffle_epi32(b3210, _MM_SHUFFLE(2, 1, 0, 3));
-    __m128i a3b0_a1b2 = _mm_mul_epu32(a2301, b3012);
-    __m128i a2b1_a0b3 = _mm_mul_epu32(a3210, b2103);
-    __m128i a3b0 = _mm_unpackhi_epi32(a3b0_a1b2, z);
-    __m128i a1b2 = _mm_unpacklo_epi32(a3b0_a1b2, z);
-    __m128i a2b1 = _mm_unpackhi_epi32(a2b1_a0b3, z);
-    __m128i a0b3 = _mm_unpacklo_epi32(a2b1_a0b3, z);
-    __m128i sum1 = _mm_add_epi64(a3b0, a1b2);
-    sum = _mm_add_epi64(a2b1, a0b3);
-    C[3] = _mm_add_epi64(sum, sum1);
-
-    __m128i	a3b1_a1b3 = _mm_mul_epu32(a2301, b2103);
-    __m128i a2b2 = _mm_unpackhi_epi32(a2b2_a0b0, z);
-    __m128i a3b1 = _mm_unpackhi_epi32(a3b1_a1b3, z);
-    __m128i a1b3 = _mm_unpacklo_epi32(a3b1_a1b3, z);
-    sum = _mm_add_epi64(a2b2, a3b1);
-    C[4] = _mm_add_epi64(sum, a1b3);
-
-    __m128i a1302 = _mm_shuffle_epi32(a3210, _MM_SHUFFLE(1, 3, 0, 2));
-    __m128i b1203 = _mm_shuffle_epi32(b3210, _MM_SHUFFLE(1, 2, 0, 3));
-    __m128i a3b2_a2b3 = _mm_mul_epu32(a1302, b1203);
-    __m128i a3b2 = _mm_unpackhi_epi32(a3b2_a2b3, z);
-    __m128i a2b3 = _mm_unpacklo_epi32(a3b2_a2b3, z);
-    C[5] = _mm_add_epi64(a3b2, a2b3);
-}
-
-void P4Optimized::Multiply4(word *C, const word *A, const word *B)
-{
-    __m128i temp[7];
-    const word *w = (word *)temp;
-    const __m64 *mw = (__m64 *)w;
-
-    P4_Mul(temp, (__m128i *)A, (__m128i *)B);
-
-    C[0] = w[0];
-
-    __m64 s1, s2;
-
-    __m64 w1 = _mm_cvtsi32_si64(w[1]);
-    __m64 w4 = mw[2];
-    __m64 w6 = mw[3];
-    __m64 w8 = mw[4];
-    __m64 w10 = mw[5];
-    __m64 w12 = mw[6];
-    __m64 w14 = mw[7];
-    __m64 w16 = mw[8];
-    __m64 w18 = mw[9];
-    __m64 w20 = mw[10];
-    __m64 w22 = mw[11];
-    __m64 w26 = _mm_cvtsi32_si64(w[26]);
-
-    s1 = _mm_add_si64(w1, w4);
-    C[1] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w6, w8);
-    s1 = _mm_add_si64(s1, s2);
-    C[2] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w10, w12);
-    s1 = _mm_add_si64(s1, s2);
-    C[3] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w14, w16);
-    s1 = _mm_add_si64(s1, s2);
-    C[4] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w18, w20);
-    s1 = _mm_add_si64(s1, s2);
-    C[5] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w22, w26);
-    s1 = _mm_add_si64(s1, s2);
-    C[6] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    C[7] = _mm_cvtsi64_si32(s1) + w[27];
-    _mm_empty();
-}
-
-void P4Optimized::Multiply8(word *C, const word *A, const word *B)
-{
-    __m128i temp[28];
-    const word *w = (word *)temp;
-    const __m64 *mw = (__m64 *)w;
-    const word *x = (word *)temp+7*4;
-    const __m64 *mx = (__m64 *)x;
-    const word *y = (word *)temp+7*4*2;
-    const __m64 *my = (__m64 *)y;
-    const word *z = (word *)temp+7*4*3;
-    const __m64 *mz = (__m64 *)z;
-
-    P4_Mul(temp, (__m128i *)A, (__m128i *)B);
-
-    P4_Mul(temp+7, (__m128i *)A+1, (__m128i *)B);
-
-    P4_Mul(temp+14, (__m128i *)A, (__m128i *)B+1);
-
-    P4_Mul(temp+21, (__m128i *)A+1, (__m128i *)B+1);
-
-    C[0] = w[0];
-
-    __m64 s1, s2, s3, s4;
-
-    __m64 w1 = _mm_cvtsi32_si64(w[1]);
-    __m64 w4 = mw[2];
-    __m64 w6 = mw[3];
-    __m64 w8 = mw[4];
-    __m64 w10 = mw[5];
-    __m64 w12 = mw[6];
-    __m64 w14 = mw[7];
-    __m64 w16 = mw[8];
-    __m64 w18 = mw[9];
-    __m64 w20 = mw[10];
-    __m64 w22 = mw[11];
-    __m64 w26 = _mm_cvtsi32_si64(w[26]);
-    __m64 w27 = _mm_cvtsi32_si64(w[27]);
-
-    __m64 x0 = _mm_cvtsi32_si64(x[0]);
-    __m64 x1 = _mm_cvtsi32_si64(x[1]);
-    __m64 x4 = mx[2];
-    __m64 x6 = mx[3];
-    __m64 x8 = mx[4];
-    __m64 x10 = mx[5];
-    __m64 x12 = mx[6];
-    __m64 x14 = mx[7];
-    __m64 x16 = mx[8];
-    __m64 x18 = mx[9];
-    __m64 x20 = mx[10];
-    __m64 x22 = mx[11];
-    __m64 x26 = _mm_cvtsi32_si64(x[26]);
-    __m64 x27 = _mm_cvtsi32_si64(x[27]);
-
-    __m64 y0 = _mm_cvtsi32_si64(y[0]);
-    __m64 y1 = _mm_cvtsi32_si64(y[1]);
-    __m64 y4 = my[2];
-    __m64 y6 = my[3];
-    __m64 y8 = my[4];
-    __m64 y10 = my[5];
-    __m64 y12 = my[6];
-    __m64 y14 = my[7];
-    __m64 y16 = my[8];
-    __m64 y18 = my[9];
-    __m64 y20 = my[10];
-    __m64 y22 = my[11];
-    __m64 y26 = _mm_cvtsi32_si64(y[26]);
-    __m64 y27 = _mm_cvtsi32_si64(y[27]);
-
-    __m64 z0 = _mm_cvtsi32_si64(z[0]);
-    __m64 z1 = _mm_cvtsi32_si64(z[1]);
-    __m64 z4 = mz[2];
-    __m64 z6 = mz[3];
-    __m64 z8 = mz[4];
-    __m64 z10 = mz[5];
-    __m64 z12 = mz[6];
-    __m64 z14 = mz[7];
-    __m64 z16 = mz[8];
-    __m64 z18 = mz[9];
-    __m64 z20 = mz[10];
-    __m64 z22 = mz[11];
-    __m64 z26 = _mm_cvtsi32_si64(z[26]);
-
-    s1 = _mm_add_si64(w1, w4);
-    C[1] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w6, w8);
-    s1 = _mm_add_si64(s1, s2);
-    C[2] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w10, w12);
-    s1 = _mm_add_si64(s1, s2);
-    C[3] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x0, y0);
-    s2 = _mm_add_si64(w14, w16);
-    s1 = _mm_add_si64(s1, s3);
-    s1 = _mm_add_si64(s1, s2);
-    C[4] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x1, y1);
-    s4 = _mm_add_si64(x4, y4);
-    s1 = _mm_add_si64(s1, w18);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, w20);
-    s1 = _mm_add_si64(s1, s3);
-    C[5] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x6, y6);
-    s4 = _mm_add_si64(x8, y8);
-    s1 = _mm_add_si64(s1, w22);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, w26);
-    s1 = _mm_add_si64(s1, s3);
-    C[6] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x10, y10);
-    s4 = _mm_add_si64(x12, y12);
-    s1 = _mm_add_si64(s1, w27);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, s3);
-    C[7] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x14, y14);
-    s4 = _mm_add_si64(x16, y16);
-    s1 = _mm_add_si64(s1, z0);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, s3);
-    C[8] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x18, y18);
-    s4 = _mm_add_si64(x20, y20);
-    s1 = _mm_add_si64(s1, z1);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, z4);
-    s1 = _mm_add_si64(s1, s3);
-    C[9] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x22, y22);
-    s4 = _mm_add_si64(x26, y26);
-    s1 = _mm_add_si64(s1, z6);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, z8);
-    s1 = _mm_add_si64(s1, s3);
-    C[10] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x27, y27);
-    s1 = _mm_add_si64(s1, z10);
-    s1 = _mm_add_si64(s1, z12);
-    s1 = _mm_add_si64(s1, s3);
-    C[11] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(z14, z16);
-    s1 = _mm_add_si64(s1, s3);
-    C[12] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(z18, z20);
-    s1 = _mm_add_si64(s1, s3);
-    C[13] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(z22, z26);
-    s1 = _mm_add_si64(s1, s3);
-    C[14] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    C[15] = z[27] + _mm_cvtsi64_si32(s1);
-    _mm_empty();
-}
-
-void P4Optimized::Multiply8Bottom(word *C, const word *A, const word *B)
-{
-    __m128i temp[21];
-    const word *w = (word *)temp;
-    const __m64 *mw = (__m64 *)w;
-    const word *x = (word *)temp+7*4;
-    const __m64 *mx = (__m64 *)x;
-    const word *y = (word *)temp+7*4*2;
-    const __m64 *my = (__m64 *)y;
-
-    P4_Mul(temp, (__m128i *)A, (__m128i *)B);
-
-    P4_Mul(temp+7, (__m128i *)A+1, (__m128i *)B);
-
-    P4_Mul(temp+14, (__m128i *)A, (__m128i *)B+1);
-
-    C[0] = w[0];
-
-    __m64 s1, s2, s3, s4;
-
-    __m64 w1 = _mm_cvtsi32_si64(w[1]);
-    __m64 w4 = mw[2];
-    __m64 w6 = mw[3];
-    __m64 w8 = mw[4];
-    __m64 w10 = mw[5];
-    __m64 w12 = mw[6];
-    __m64 w14 = mw[7];
-    __m64 w16 = mw[8];
-    __m64 w18 = mw[9];
-    __m64 w20 = mw[10];
-    __m64 w22 = mw[11];
-    __m64 w26 = _mm_cvtsi32_si64(w[26]);
-
-    __m64 x0 = _mm_cvtsi32_si64(x[0]);
-    __m64 x1 = _mm_cvtsi32_si64(x[1]);
-    __m64 x4 = mx[2];
-    __m64 x6 = mx[3];
-    __m64 x8 = mx[4];
-
-    __m64 y0 = _mm_cvtsi32_si64(y[0]);
-    __m64 y1 = _mm_cvtsi32_si64(y[1]);
-    __m64 y4 = my[2];
-    __m64 y6 = my[3];
-    __m64 y8 = my[4];
-
-    s1 = _mm_add_si64(w1, w4);
-    C[1] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w6, w8);
-    s1 = _mm_add_si64(s1, s2);
-    C[2] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s2 = _mm_add_si64(w10, w12);
-    s1 = _mm_add_si64(s1, s2);
-    C[3] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x0, y0);
-    s2 = _mm_add_si64(w14, w16);
-    s1 = _mm_add_si64(s1, s3);
-    s1 = _mm_add_si64(s1, s2);
-    C[4] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x1, y1);
-    s4 = _mm_add_si64(x4, y4);
-    s1 = _mm_add_si64(s1, w18);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, w20);
-    s1 = _mm_add_si64(s1, s3);
-    C[5] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    s3 = _mm_add_si64(x6, y6);
-    s4 = _mm_add_si64(x8, y8);
-    s1 = _mm_add_si64(s1, w22);
-    s3 = _mm_add_si64(s3, s4);
-    s1 = _mm_add_si64(s1, w26);
-    s1 = _mm_add_si64(s1, s3);
-    C[6] = _mm_cvtsi64_si32(s1);
-    s1 = _mm_srli_si64(s1, 32);
-
-    C[7] = _mm_cvtsi64_si32(s1) + w[27] + x[10] + y[10] + x[12] + y[12];
-    _mm_empty();
-}
-
-#endif	// #ifdef SSE2_INTRINSICS_AVAILABLE
-
-// end optimized
-
-// ********************************************************
-
-#define A0      A
-#define A1      (A+N2)
-#define B0      B
-#define B1      (B+N2)
-
-#define T0      T
-#define T1      (T+N2)
-#define T2      (T+N)
-#define T3      (T+N+N2)
-
-#define R0      R
-#define R1      (R+N2)
-#define R2      (R+N)
-#define R3      (R+N+N2)
-
-//VC60 workaround: compiler bug triggered without the extra dummy parameters
-
-// R[2*N] - result = A*B
-// T[2*N] - temporary work space
-// A[N] --- multiplier
-// B[N] --- multiplicant
-
-
-void RecursiveMultiply(word *R, word *T, const word *A, const word *B,
-                       unsigned int N)
-{
-    if (LowLevel::MultiplyRecursionLimit() >= 8 && N==8)
-        LowLevel::Multiply8(R, A, B);
-    else if (LowLevel::MultiplyRecursionLimit() >= 4 && N==4)
-        LowLevel::Multiply4(R, A, B);
-    else if (N==2)
-        LowLevel::Multiply2(R, A, B);
-    else
-    {
-        const unsigned int N2 = N/2;
-        int carry;
-
-        int aComp = Compare(A0, A1, N2);
-        int bComp = Compare(B0, B1, N2);
-
-        switch (2*aComp + aComp + bComp)
-        {
-        case -4:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            LowLevel::Subtract(T1, T1, R0, N2);
-            carry = -1;
-            break;
-        case -2:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            carry = 0;
-            break;
-        case 2:
-            LowLevel::Subtract(R0, A0, A1, N2);
-            LowLevel::Subtract(R1, B1, B0, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            carry = 0;
-            break;
-        case 4:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            LowLevel::Subtract(T1, T1, R1, N2);
-            carry = -1;
-            break;
-        default:
-            SetWords(T0, 0, N);
-            carry = 0;
-        }
-
-        RecursiveMultiply(R0, T2, A0, B0, N2);
-        RecursiveMultiply(R2, T2, A1, B1, N2);
-
-        // now T[01] holds (A1-A0)*(B0-B1),R[01] holds A0*B0, R[23] holds A1*B1
-
-        carry += LowLevel::Add(T0, T0, R0, N);
-        carry += LowLevel::Add(T0, T0, R2, N);
-        carry += LowLevel::Add(R1, R1, T0, N);
-
-        Increment(R3, N2, carry);
-    }
-}
-
-
-void RecursiveSquare(word *R, word *T, const word *A, unsigned int N)                     
-{
-    if (LowLevel::SquareRecursionLimit() >= 4 && N==4)
-        LowLevel::Square4(R, A);
-    else if (N==2)
-        LowLevel::Square2(R, A);
-    else
-    {
-        const unsigned int N2 = N/2;
-
-        RecursiveSquare(R0, T2, A0, N2);
-        RecursiveSquare(R2, T2, A1, N2);
-        RecursiveMultiply(T0, T2, A0, A1, N2);
-
-        word carry = LowLevel::Add(R1, R1, T0, N);
-        carry += LowLevel::Add(R1, R1, T0, N);
-        Increment(R3, N2, carry);
-    }
-}
-
-
-// R[N] - bottom half of A*B
-// T[N] - temporary work space
-// A[N] - multiplier
-// B[N] - multiplicant
-
-
-void RecursiveMultiplyBottom(word *R, word *T, const word *A, const word *B,
-                             unsigned int N)
-{
-    if (LowLevel::MultiplyBottomRecursionLimit() >= 8 && N==8)
-        LowLevel::Multiply8Bottom(R, A, B);
-    else if (LowLevel::MultiplyBottomRecursionLimit() >= 4 && N==4)
-        LowLevel::Multiply4Bottom(R, A, B);
-    else if (N==2)
-        LowLevel::Multiply2Bottom(R, A, B);
-    else
-    {
-        const unsigned int N2 = N/2;
-
-        RecursiveMultiply(R, T, A0, B0, N2);
-        RecursiveMultiplyBottom(T0, T1, A1, B0, N2);
-        LowLevel::Add(R1, R1, T0, N2);
-        RecursiveMultiplyBottom(T0, T1, A0, B1, N2);
-        LowLevel::Add(R1, R1, T0, N2);
-    }
-}
-
-
-void RecursiveMultiplyTop(word *R, word *T, const word *L, const word *A,
-                          const word *B, unsigned int N)
-{
-    if (N==4)
-    {
-        LowLevel::Multiply4(T, A, B);
-        memcpy(R, T+4, 4*WORD_SIZE);
-    }
-    else if (N==2)
-    {
-        LowLevel::Multiply2(T, A, B);
-        memcpy(R, T+2, 2*WORD_SIZE);
-    }
-    else
-    {
-        const unsigned int N2 = N/2;
-        int carry;
-
-        int aComp = Compare(A0, A1, N2);
-        int bComp = Compare(B0, B1, N2);
-
-        switch (2*aComp + aComp + bComp)
-        {
-        case -4:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            LowLevel::Subtract(T1, T1, R0, N2);
-            carry = -1;
-            break;
-        case -2:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            carry = 0;
-            break;
-        case 2:
-            LowLevel::Subtract(R0, A0, A1, N2);
-            LowLevel::Subtract(R1, B1, B0, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            carry = 0;
-            break;
-        case 4:
-            LowLevel::Subtract(R0, A1, A0, N2);
-            LowLevel::Subtract(R1, B0, B1, N2);
-            RecursiveMultiply(T0, T2, R0, R1, N2);
-            LowLevel::Subtract(T1, T1, R1, N2);
-            carry = -1;
-            break;
-        default:
-            SetWords(T0, 0, N);
-            carry = 0;
-        }
-
-        RecursiveMultiply(T2, R0, A1, B1, N2);
-
-        // now T[01] holds (A1-A0)*(B0-B1), T[23] holds A1*B1
-
-        word c2 = LowLevel::Subtract(R0, L+N2, L, N2);
-        c2 += LowLevel::Subtract(R0, R0, T0, N2);
-        word t = (Compare(R0, T2, N2) == -1);
-
-        carry += t;
-        carry += Increment(R0, N2, c2+t);
-        carry += LowLevel::Add(R0, R0, T1, N2);
-        carry += LowLevel::Add(R0, R0, T3, N2);
-
-        CopyWords(R1, T3, N2);
-        Increment(R1, N2, carry);
-    }
-}
-
-
-inline word Add(word *C, const word *A, const word *B, unsigned int N)
-{
-    return LowLevel::Add(C, A, B, N);
-}
-
-inline word Subtract(word *C, const word *A, const word *B, unsigned int N)
-{
-    return LowLevel::Subtract(C, A, B, N);
-}
-
-inline void Multiply(word *R, word *T, const word *A, const word *B,
-                     unsigned int N)
-{
-    RecursiveMultiply(R, T, A, B, N);
-}
-
-inline void Square(word *R, word *T, const word *A, unsigned int N)
-{
-    RecursiveSquare(R, T, A, N);
-}
-
-
-void AsymmetricMultiply(word *R, word *T, const word *A, unsigned int NA,
-                        const word *B, unsigned int NB)
-{
-    if (NA == NB)
-    {
-        if (A == B)
-            Square(R, T, A, NA);
-        else
-            Multiply(R, T, A, B, NA);
-
-        return;
-    }
-
-    if (NA > NB)
-    {
-        STL::swap(A, B);
-        STL::swap(NA, NB);
-    }
-
-    if (NA==2 && !A[1])
-    {
-        switch (A[0])
-        {
-        case 0:
-            SetWords(R, 0, NB+2);
-            return;
-        case 1:
-            CopyWords(R, B, NB);
-            R[NB] = R[NB+1] = 0;
-            return;
-        default:
-            R[NB] = LinearMultiply(R, B, A[0], NB);
-            R[NB+1] = 0;
-            return;
-        }
-    }
-
-    Multiply(R, T, A, B, NA);
-    CopyWords(T+2*NA, R+NA, NA);
-
-    unsigned i;
-
-    for (i=2*NA; i<NB; i+=2*NA)
-        Multiply(T+NA+i, T, A, B+i, NA);
-    for (i=NA; i<NB; i+=2*NA)
-        Multiply(R+i, T, A, B+i, NA);
-
-    if (Add(R+NA, R+NA, T+2*NA, NB-NA))
-        Increment(R+NB, NA);
-}
-
-
-void PositiveMultiply(Integer& product, const Integer& a, const Integer& b)
-{
-    unsigned int aSize = RoundupSize(a.WordCount());
-    unsigned int bSize = RoundupSize(b.WordCount());
-
-    product.reg_.CleanNew(RoundupSize(aSize + bSize));
-    product.sign_ = Integer::POSITIVE;
-
-    AlignedWordBlock workspace(aSize + bSize);
-    AsymmetricMultiply(product.reg_.get_buffer(), workspace.get_buffer(),
-                       a.reg_.get_buffer(), aSize, b.reg_.get_buffer(), bSize);
-}
-
-void Multiply(Integer &product, const Integer &a, const Integer &b)
-{
-    PositiveMultiply(product, a, b);
-
-    if (a.NotNegative() != b.NotNegative())
-        product.Negate();
-}
-
-
-static inline unsigned int EvenWordCount(const word *X, unsigned int N)
-{
-    while (N && X[N-2]==0 && X[N-1]==0)
-        N-=2;
-    return N;
-}
-
-
-unsigned int AlmostInverse(word *R, word *T, const word *A, unsigned int NA,
-                           const word *M, unsigned int N)
-{
-    word *b = T;
-    word *c = T+N;
-    word *f = T+2*N;
-    word *g = T+3*N;
-    unsigned int bcLen=2, fgLen=EvenWordCount(M, N);
-    unsigned int k=0, s=0;
-
-    SetWords(T, 0, 3*N);
-    b[0]=1;
-    CopyWords(f, A, NA);
-    CopyWords(g, M, N);
-
-    while (1)
-    {
-        word t=f[0];
-        while (!t)
-        {
-            if (EvenWordCount(f, fgLen)==0)
-            {
-                SetWords(R, 0, N);
-                return 0;
-            }
-
-            ShiftWordsRightByWords(f, fgLen, 1);
-            if (c[bcLen-1]) bcLen+=2;
-            ShiftWordsLeftByWords(c, bcLen, 1);
-            k+=WORD_BITS;
-            t=f[0];
-        }
-
-        unsigned int i=0;
-        while (t%2 == 0)
-        {
-            t>>=1;
-            i++;
-        }
-        k+=i;
-
-        if (t==1 && f[1]==0 && EvenWordCount(f, fgLen)==2)
-        {
-            if (s%2==0)
-                CopyWords(R, b, N);
-            else
-                Subtract(R, M, b, N);
-            return k;
-        }
-
-        ShiftWordsRightByBits(f, fgLen, i);
-        t=ShiftWordsLeftByBits(c, bcLen, i);
-        if (t)
-        {
-            c[bcLen] = t;
-            bcLen+=2;
-        }
-
-        if (f[fgLen-2]==0 && g[fgLen-2]==0 && f[fgLen-1]==0 && g[fgLen-1]==0)
-            fgLen-=2;
-
-        if (Compare(f, g, fgLen)==-1)
-        {
-            STL::swap(f, g);
-            STL::swap(b, c);
-            s++;
-        }
-
-        Subtract(f, f, g, fgLen);
-
-        if (Add(b, b, c, bcLen))
-        {
-            b[bcLen] = 1;
-            bcLen+=2;
-        }
-    }
-}
-
-// R[N] - result = A/(2^k) mod M
-// A[N] - input
-// M[N] - modulus
-
-void DivideByPower2Mod(word *R, const word *A, unsigned int k, const word *M,
-                       unsigned int N)
-{
-    CopyWords(R, A, N);
-
-    while (k--)
-    {
-        if (R[0]%2==0)
-            ShiftWordsRightByBits(R, N, 1);
-        else
-        {
-            word carry = Add(R, R, M, N);
-            ShiftWordsRightByBits(R, N, 1);
-            R[N-1] += carry<<(WORD_BITS-1);
-        }
-    }
-}
-
-// R[N] - result = A*(2^k) mod M
-// A[N] - input
-// M[N] - modulus
-
-void MultiplyByPower2Mod(word *R, const word *A, unsigned int k, const word *M,
-                         unsigned int N)
-{
-    CopyWords(R, A, N);
-
-    while (k--)
-        if (ShiftWordsLeftByBits(R, N, 1) || Compare(R, M, N)>=0)
-            Subtract(R, R, M, N);
-}
-
-
-// ********** end of integer needs
-
-
-Integer::Integer()
-    : reg_(2), sign_(POSITIVE)
-{
-    reg_[0] = reg_[1] = 0;
-}
-
-
-Integer::Integer(const Integer& t)
-    : reg_(RoundupSize(t.WordCount())), sign_(t.sign_)
-{
-    CopyWords(reg_.get_buffer(), t.reg_.get_buffer(), reg_.size());
-}
-
-
-Integer::Integer(signed long value)
-    : reg_(2)
-{
-    if (value >= 0)
-        sign_ = POSITIVE;
-    else
-    {
-        sign_ = NEGATIVE;
-        value = -value;
-    }
-    reg_[0] = word(value);
-    reg_[1] = word(SafeRightShift<WORD_BITS, unsigned long>(value));
-}
-
-
-Integer::Integer(Sign s, word high, word low)
-    : reg_(2), sign_(s)
-{
-    reg_[0] = low;
-    reg_[1] = high;
-}
-
-
-Integer::Integer(word value, unsigned int length)
-    : reg_(RoundupSize(length)), sign_(POSITIVE)
-{
-    reg_[0] = value;
-    SetWords(reg_ + 1, 0, reg_.size() - 1);
-}
-
-
-Integer::Integer(const byte *encodedInteger, unsigned int byteCount,
-                 Signedness s)
-{
-    Decode(encodedInteger, byteCount, s);
-}
-
-class BadBER {};
-
-// BER Decode Source
-Integer::Integer(Source& source)
-    : reg_(2), sign_(POSITIVE)
-{
-    Decode(source);
-}
-
-void Integer::Decode(Source& source)
-{
-    byte b = source.next();
-    if (b != INTEGER) {
-        source.SetError(INTEGER_E);
-        return;
-    }
-
-    word32 length = GetLength(source);
-    if (length == 0 || source.GetError().What()) return;
-
-    if ( (b = source.next()) == 0x00)
-        length--;
-    else
-        source.prev();
-
-    if (source.IsLeft(length) == false) return;
- 
-    unsigned int words = (length + WORD_SIZE - 1) / WORD_SIZE;
-    words = RoundupSize(words);
-    if (words > reg_.size()) reg_.CleanNew(words);
-
-    for (int j = length; j > 0; j--) {
-        b = source.next();
-        reg_ [(j-1) / WORD_SIZE] |= (word)b << ((j-1) % WORD_SIZE) * 8;
-    }
-}
-
-
-void Integer::Decode(const byte* input, unsigned int inputLen, Signedness s)
-{
-    unsigned int idx(0);
-    byte b = 0; 
-    if (inputLen>0)
-        b = input[idx];   // peek
-    sign_  = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE;
-
-    while (inputLen>0 && (sign_==POSITIVE ? b==0 : b==0xff))
-    {
-        idx++;   // skip
-        if (--inputLen>0)
-            b = input[idx];  // peek
-    }
-
-    reg_.CleanNew(RoundupSize(BytesToWords(inputLen)));
-
-    for (unsigned int i=inputLen; i > 0; i--)
-    {
-        b = input[idx++];
-        reg_[(i-1)/WORD_SIZE] |= (word)b << ((i-1)%WORD_SIZE)*8;
-    }
-
-    if (sign_ == NEGATIVE)
-    {
-        for (unsigned i=inputLen; i<reg_.size()*WORD_SIZE; i++)
-            reg_[i/WORD_SIZE] |= (word)0xff << (i%WORD_SIZE)*8;
-        TwosComplement(reg_.get_buffer(), reg_.size());
-    }
-}
-
-
-unsigned int Integer::Encode(byte* output, unsigned int outputLen,
-                       Signedness signedness) const
-{
-    unsigned int idx(0);
-    if (signedness == UNSIGNED || NotNegative())
-    {
-        for (unsigned int i=outputLen; i > 0; i--)
-            output[idx++] = GetByte(i-1);
-    }
-    else
-    {
-        // take two's complement of *this
-        Integer temp = Integer::Power2(8*max(ByteCount(), outputLen)) + *this;
-        for (unsigned i=0; i<outputLen; i++)
-            output[idx++] = temp.GetByte(outputLen-i-1);
-    }
-    return outputLen;
-}
-
-
-static Integer* zero = 0;
-
-const Integer &Integer::Zero()
-{
-    if (!zero)
-        zero = NEW_TC Integer;
-    return *zero;
-}
-
-
-static Integer* one = 0;
-
-const Integer &Integer::One()
-{
-    if (!one)
-        one = NEW_TC Integer(1,2);
-    return *one;
-}
-
-
-// Clean up static singleton holders, not a leak, but helpful to have gone
-// when checking for leaks
-void CleanUp()
-{
-    tcDelete(one);
-    tcDelete(zero);
-
-    // In case user calls more than once, prevent seg fault
-    one  = 0;
-    zero = 0;
-}
-
-Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
-                 const Integer& max)
-{
-    Randomize(rng, min, max);
-}
-
-
-void Integer::Randomize(RandomNumberGenerator& rng, unsigned int nbits)
-{
-    const unsigned int nbytes = nbits/8 + 1;
-    ByteBlock buf(nbytes);
-    rng.GenerateBlock(buf.get_buffer(), nbytes);
-    if (nbytes)
-        buf[0] = (byte)Crop(buf[0], nbits % 8);
-    Decode(buf.get_buffer(), nbytes, UNSIGNED);
-}
-
-void Integer::Randomize(RandomNumberGenerator& rng, const Integer& min,
-                        const Integer& max)
-{
-    Integer range = max - min;
-    const unsigned int nbits = range.BitCount();
-
-    do
-    {
-        Randomize(rng, nbits);
-    }
-    while (*this > range);
-
-    *this += min;
-}
-
-
-Integer Integer::Power2(unsigned int e)
-{
-    Integer r((word)0, BitsToWords(e + 1));
-    r.SetBit(e);
-    return r;
-}
-
-
-void Integer::SetBit(unsigned int n, bool value)
-{
-    if (value)
-    {
-        reg_.CleanGrow(RoundupSize(BitsToWords(n + 1)));
-        reg_[n / WORD_BITS] |= (word(1) << (n % WORD_BITS));
-    }
-    else
-    {
-        if (n / WORD_BITS < reg_.size())
-            reg_[n / WORD_BITS] &= ~(word(1) << (n % WORD_BITS));
-    }
-}
-
-
-void Integer::SetByte(unsigned int n, byte value)
-{
-    reg_.CleanGrow(RoundupSize(BytesToWords(n+1)));
-    reg_[n/WORD_SIZE] &= ~(word(0xff) << 8*(n%WORD_SIZE));
-    reg_[n/WORD_SIZE] |= (word(value) << 8*(n%WORD_SIZE));
-}
-
-
-void Integer::Negate()
-{
-    if (!!(*this))	// don't flip sign if *this==0
-        sign_ = Sign(1 - sign_);
-}
-
-
-bool Integer::operator!() const
-{
-    return IsNegative() ? false : (reg_[0]==0 && WordCount()==0);
-}
-
-
-Integer& Integer::operator=(const Integer& t)
-{
-    if (this != &t)
-    {
-        reg_.New(RoundupSize(t.WordCount()));
-        CopyWords(reg_.get_buffer(), t.reg_.get_buffer(), reg_.size());
-        sign_ = t.sign_;
-    }
-    return *this;
-}
-
-
-Integer& Integer::operator+=(const Integer& t)
-{
-    reg_.CleanGrow(t.reg_.size());
-    if (NotNegative())
-    {
-        if (t.NotNegative())
-            PositiveAdd(*this, *this, t);
-        else
-            PositiveSubtract(*this, *this, t);
-    }
-    else
-    {
-        if (t.NotNegative())
-            PositiveSubtract(*this, t, *this);
-        else
-        {
-            PositiveAdd(*this, *this, t);
-            sign_ = Integer::NEGATIVE;
-        }
-    }
-    return *this;
-}
-
-
-Integer Integer::operator-() const
-{
-    Integer result(*this);
-    result.Negate();
-    return result;
-}
-
-
-Integer& Integer::operator-=(const Integer& t)
-{
-    reg_.CleanGrow(t.reg_.size());
-    if (NotNegative())
-    {
-        if (t.NotNegative())
-            PositiveSubtract(*this, *this, t);
-        else
-            PositiveAdd(*this, *this, t);
-    }
-    else
-    {
-        if (t.NotNegative())
-        {
-            PositiveAdd(*this, *this, t);
-            sign_ = Integer::NEGATIVE;
-        }
-        else
-            PositiveSubtract(*this, t, *this);
-    }
-    return *this;
-}
-
-
-Integer& Integer::operator++()
-{
-    if (NotNegative())
-    {
-        if (Increment(reg_.get_buffer(), reg_.size()))
-        {
-            reg_.CleanGrow(2*reg_.size());
-            reg_[reg_.size()/2]=1;
-        }
-    }
-    else
-    {
-        word borrow = Decrement(reg_.get_buffer(), reg_.size());
-        (void)borrow;           // shut up compiler
-        if (WordCount()==0)
-            *this = Zero();
-    }
-    return *this;
-}
-
-Integer& Integer::operator--()
-{
-    if (IsNegative())
-    {
-        if (Increment(reg_.get_buffer(), reg_.size()))
-        {
-            reg_.CleanGrow(2*reg_.size());
-            reg_[reg_.size()/2]=1;
-        }
-    }
-    else
-    {
-        if (Decrement(reg_.get_buffer(), reg_.size()))
-            *this = -One();
-    }
-    return *this;
-}
-
-
-Integer& Integer::operator<<=(unsigned int n)
-{
-    const unsigned int wordCount = WordCount();
-    const unsigned int shiftWords = n / WORD_BITS;
-    const unsigned int shiftBits = n % WORD_BITS;
-
-    reg_.CleanGrow(RoundupSize(wordCount+BitsToWords(n)));
-    ShiftWordsLeftByWords(reg_.get_buffer(), wordCount + shiftWords,
-                          shiftWords);
-    ShiftWordsLeftByBits(reg_+shiftWords, wordCount+BitsToWords(shiftBits),
-                         shiftBits);
-    return *this;
-}
-
-Integer& Integer::operator>>=(unsigned int n)
-{
-    const unsigned int wordCount = WordCount();
-    const unsigned int shiftWords = n / WORD_BITS;
-    const unsigned int shiftBits = n % WORD_BITS;
-
-    ShiftWordsRightByWords(reg_.get_buffer(), wordCount, shiftWords);
-    if (wordCount > shiftWords)
-        ShiftWordsRightByBits(reg_.get_buffer(), wordCount-shiftWords,
-                              shiftBits);
-    if (IsNegative() && WordCount()==0)   // avoid -0
-        *this = Zero();
-    return *this;
-}
-
-
-void PositiveAdd(Integer& sum, const Integer& a, const Integer& b)
-{
-    word carry;
-    if (a.reg_.size() == b.reg_.size())
-        carry = Add(sum.reg_.get_buffer(), a.reg_.get_buffer(),
-                    b.reg_.get_buffer(), a.reg_.size());
-    else if (a.reg_.size() > b.reg_.size())
-    {
-        carry = Add(sum.reg_.get_buffer(), a.reg_.get_buffer(),
-                    b.reg_.get_buffer(), b.reg_.size());
-        CopyWords(sum.reg_+b.reg_.size(), a.reg_+b.reg_.size(),
-                  a.reg_.size()-b.reg_.size());
-        carry = Increment(sum.reg_+b.reg_.size(), a.reg_.size()-b.reg_.size(),
-                          carry);
-    }
-    else
-    {
-        carry = Add(sum.reg_.get_buffer(), a.reg_.get_buffer(),
-                    b.reg_.get_buffer(), a.reg_.size());
-        CopyWords(sum.reg_+a.reg_.size(), b.reg_+a.reg_.size(),
-                  b.reg_.size()-a.reg_.size());
-        carry = Increment(sum.reg_+a.reg_.size(), b.reg_.size()-a.reg_.size(),
-                          carry);
-    }
-
-    if (carry)
-    {
-        sum.reg_.CleanGrow(2*sum.reg_.size());
-        sum.reg_[sum.reg_.size()/2] = 1;
-    }
-    sum.sign_ = Integer::POSITIVE;
-}
-
-void PositiveSubtract(Integer &diff, const Integer &a, const Integer& b)
-{
-    unsigned aSize = a.WordCount();
-    aSize += aSize%2;
-    unsigned bSize = b.WordCount();
-    bSize += bSize%2;
-
-    if (aSize == bSize)
-    {
-        if (Compare(a.reg_.get_buffer(), b.reg_.get_buffer(), aSize) >= 0)
-        {
-            Subtract(diff.reg_.get_buffer(), a.reg_.get_buffer(),
-                     b.reg_.get_buffer(), aSize);
-            diff.sign_ = Integer::POSITIVE;
-        }
-        else
-        {
-            Subtract(diff.reg_.get_buffer(), b.reg_.get_buffer(),
-                     a.reg_.get_buffer(), aSize);
-            diff.sign_ = Integer::NEGATIVE;
-        }
-    }
-    else if (aSize > bSize)
-    {
-        word borrow = Subtract(diff.reg_.get_buffer(), a.reg_.get_buffer(),
-                               b.reg_.get_buffer(), bSize);
-        CopyWords(diff.reg_+bSize, a.reg_+bSize, aSize-bSize);
-        borrow = Decrement(diff.reg_+bSize, aSize-bSize, borrow);
-        diff.sign_ = Integer::POSITIVE;
-    }
-    else
-    {
-        word borrow = Subtract(diff.reg_.get_buffer(), b.reg_.get_buffer(),
-                               a.reg_.get_buffer(), aSize);
-        CopyWords(diff.reg_+aSize, b.reg_+aSize, bSize-aSize);
-        borrow = Decrement(diff.reg_+aSize, bSize-aSize, borrow);
-        diff.sign_ = Integer::NEGATIVE;
-    }
-}
-
-
-unsigned int Integer::MinEncodedSize(Signedness signedness) const
-{
-    unsigned int outputLen = max(1U, ByteCount());
-    if (signedness == UNSIGNED)
-        return outputLen;
-    if (NotNegative() && (GetByte(outputLen-1) & 0x80))
-        outputLen++;
-    if (IsNegative() && *this < -Power2(outputLen*8-1))
-        outputLen++;
-    return outputLen;
-}
-
-
-int Integer::Compare(const Integer& t) const
-{
-    if (NotNegative())
-    {
-        if (t.NotNegative())
-            return PositiveCompare(t);
-        else
-            return 1;
-    }
-    else
-    {
-        if (t.NotNegative())
-            return -1;
-        else
-            return -PositiveCompare(t);
-    }
-}
-
-
-int Integer::PositiveCompare(const Integer& t) const
-{
-    unsigned size = WordCount(), tSize = t.WordCount();
-
-    if (size == tSize)
-        return TaoCrypt::Compare(reg_.get_buffer(), t.reg_.get_buffer(), size);
-    else
-        return size > tSize ? 1 : -1;
-}
-
-
-bool Integer::GetBit(unsigned int n) const
-{
-    if (n/WORD_BITS >= reg_.size())
-        return 0;
-    else
-        return bool((reg_[n/WORD_BITS] >> (n % WORD_BITS)) & 1);
-}
-
-
-unsigned long Integer::GetBits(unsigned int i, unsigned int n) const
-{
-    unsigned long v = 0;
-    for (unsigned int j=0; j<n; j++)
-        v |= GetBit(i+j) << j;
-    return v;
-}
-
-
-byte Integer::GetByte(unsigned int n) const
-{
-    if (n/WORD_SIZE >= reg_.size())
-        return 0;
-    else
-        return byte(reg_[n/WORD_SIZE] >> ((n%WORD_SIZE)*8));
-}
-
-
-unsigned int Integer::BitCount() const
-{
-    unsigned wordCount = WordCount();
-    if (wordCount)
-        return (wordCount-1)*WORD_BITS + BitPrecision(reg_[wordCount-1]);
-    else
-        return 0;
-}
-
-
-unsigned int Integer::ByteCount() const
-{
-    unsigned wordCount = WordCount();
-    if (wordCount)
-        return (wordCount-1)*WORD_SIZE + BytePrecision(reg_[wordCount-1]);
-    else
-        return 0;
-}
-
-
-unsigned int Integer::WordCount() const
-{
-    return CountWords(reg_.get_buffer(), reg_.size());
-}
-
-
-bool Integer::IsConvertableToLong() const
-{
-    if (ByteCount() > sizeof(long))
-        return false;
-
-    unsigned long value = reg_[0];
-    value += SafeLeftShift<WORD_BITS, unsigned long>(reg_[1]);
-
-    if (sign_ == POSITIVE)
-        return (signed long)value >= 0;
-    else
-        return -(signed long)value < 0;
-}
-
-
-signed long Integer::ConvertToLong() const
-{
-    unsigned long value = reg_[0];
-    value += SafeLeftShift<WORD_BITS, unsigned long>(reg_[1]);
-    return sign_ == POSITIVE ? value : -(signed long)value;
-}
-
-
-void Integer::Swap(Integer& a)
-{
-    reg_.Swap(a.reg_);
-    STL::swap(sign_, a.sign_);
-}
-
-
-Integer Integer::Plus(const Integer& b) const
-{
-    Integer sum((word)0, max(reg_.size(), b.reg_.size()));
-    if (NotNegative())
-    {
-        if (b.NotNegative())
-            PositiveAdd(sum, *this, b);
-        else
-            PositiveSubtract(sum, *this, b);
-    }
-    else
-    {
-        if (b.NotNegative())
-            PositiveSubtract(sum, b, *this);
-        else
-        {
-            PositiveAdd(sum, *this, b);
-            sum.sign_ = Integer::NEGATIVE;
-        }
-    }
-    return sum;
-}
-
-
-Integer Integer::Minus(const Integer& b) const
-{
-    Integer diff((word)0, max(reg_.size(), b.reg_.size()));
-    if (NotNegative())
-    {
-        if (b.NotNegative())
-            PositiveSubtract(diff, *this, b);
-        else
-            PositiveAdd(diff, *this, b);
-    }
-    else
-    {
-        if (b.NotNegative())
-        {
-            PositiveAdd(diff, *this, b);
-            diff.sign_ = Integer::NEGATIVE;
-        }
-        else
-            PositiveSubtract(diff, b, *this);
-    }
-    return diff;
-}
-
-
-Integer Integer::Times(const Integer &b) const
-{
-    Integer product;
-    Multiply(product, *this, b);
-    return product;
-}
-
-
-#undef A0
-#undef A1
-#undef B0
-#undef B1
-
-#undef T0
-#undef T1
-#undef T2
-#undef T3
-
-#undef R0
-#undef R1
-#undef R2
-#undef R3
-
-
-static inline void AtomicDivide(word *Q, const word *A, const word *B)
-{
-    word T[4];
-    DWord q = DivideFourWordsByTwo<word, DWord>(T, DWord(A[0], A[1]),
-                                         DWord(A[2], A[3]), DWord(B[0], B[1]));
-    Q[0] = q.GetLowHalf();
-    Q[1] = q.GetHighHalf();
-
-#ifndef NDEBUG
-    if (B[0] || B[1])
-    {
-        // multiply quotient and divisor and add remainder, make sure it 
-        // equals dividend
-        word P[4];
-        Portable::Multiply2(P, Q, B);
-        Add(P, P, T, 4);
-    }
-#endif
-}
-
-
-// for use by Divide(), corrects the underestimated quotient {Q1,Q0}
-static void CorrectQuotientEstimate(word *R, word *T, word *Q, const word *B,
-                                    unsigned int N)
-{
-    if (Q[1])
-    {
-        T[N] = T[N+1] = 0;
-        unsigned i;
-        for (i=0; i<N; i+=4)
-            LowLevel::Multiply2(T+i, Q, B+i);
-        for (i=2; i<N; i+=4)
-            if (LowLevel::Multiply2Add(T+i, Q, B+i))
-                T[i+5] += (++T[i+4]==0);
-    }
-    else
-    {
-        T[N] = LinearMultiply(T, B, Q[0], N);
-        T[N+1] = 0;
-    }
-
-    word borrow = Subtract(R, R, T, N+2);
-    (void)borrow;       // shut up compiler
-
-    while (R[N] || Compare(R, B, N) >= 0)
-    {
-        R[N] -= Subtract(R, R, B, N);
-        Q[1] += (++Q[0]==0);
-    }
-}
-
-// R[NB] -------- remainder = A%B
-// Q[NA-NB+2] --- quotient	= A/B
-// T[NA+2*NB+4] - temp work space
-// A[NA] -------- dividend
-// B[NB] -------- divisor
-
-
-void Divide(word* R, word* Q, word* T, const word* A, unsigned int NA,
-            const word* B, unsigned int NB)
-{
-    // set up temporary work space
-    word *const TA=T;
-    word *const TB=T+NA+2;
-    word *const TP=T+NA+2+NB;
-
-    // copy B into TB and normalize it so that TB has highest bit set to 1
-    unsigned shiftWords = (B[NB-1]==0);
-    TB[0] = TB[NB-1] = 0;
-    CopyWords(TB+shiftWords, B, NB-shiftWords);
-    unsigned shiftBits = WORD_BITS - BitPrecision(TB[NB-1]);
-    ShiftWordsLeftByBits(TB, NB, shiftBits);
-
-    // copy A into TA and normalize it
-    TA[0] = TA[NA] = TA[NA+1] = 0;
-    CopyWords(TA+shiftWords, A, NA);
-    ShiftWordsLeftByBits(TA, NA+2, shiftBits);
-
-    if (TA[NA+1]==0 && TA[NA] <= 1)
-    {
-        Q[NA-NB+1] = Q[NA-NB] = 0;
-        while (TA[NA] || Compare(TA+NA-NB, TB, NB) >= 0)
-        {
-            TA[NA] -= Subtract(TA+NA-NB, TA+NA-NB, TB, NB);
-            ++Q[NA-NB];
-        }
-    }
-    else
-    {
-        NA+=2;
-    }
-
-    word BT[2];
-    BT[0] = TB[NB-2] + 1;
-    BT[1] = TB[NB-1] + (BT[0]==0);
-
-    // start reducing TA mod TB, 2 words at a time
-    for (unsigned i=NA-2; i>=NB; i-=2)
-    {
-        AtomicDivide(Q+i-NB, TA+i-2, BT);
-        CorrectQuotientEstimate(TA+i-NB, TP, Q+i-NB, TB, NB);
-    }
-
-    // copy TA into R, and denormalize it
-    CopyWords(R, TA+shiftWords, NB);
-    ShiftWordsRightByBits(R, NB, shiftBits);
-}
-
-
-void PositiveDivide(Integer& remainder, Integer& quotient,
-                   const Integer& a, const Integer& b)
-{
-    unsigned aSize = a.WordCount();
-    unsigned bSize = b.WordCount();
-
-    if (a.PositiveCompare(b) == -1)
-    {
-        remainder = a;
-        remainder.sign_ = Integer::POSITIVE;
-        quotient = Integer::Zero();
-        return;
-    }
-
-    aSize += aSize%2;	// round up to next even number
-    bSize += bSize%2;
-
-    remainder.reg_.CleanNew(RoundupSize(bSize));
-    remainder.sign_ = Integer::POSITIVE;
-    quotient.reg_.CleanNew(RoundupSize(aSize-bSize+2));
-    quotient.sign_ = Integer::POSITIVE;
-
-    AlignedWordBlock T(aSize+2*bSize+4);
-    Divide(remainder.reg_.get_buffer(), quotient.reg_.get_buffer(),
-           T.get_buffer(), a.reg_.get_buffer(), aSize, b.reg_.get_buffer(),
-           bSize);
-}
-
-void Integer::Divide(Integer &remainder, Integer &quotient,
-                     const Integer &dividend, const Integer &divisor)
-{
-    PositiveDivide(remainder, quotient, dividend, divisor);
-
-    if (dividend.IsNegative())
-    {
-        quotient.Negate();
-        if (remainder.NotZero())
-        {
-            --quotient;
-            remainder = divisor.AbsoluteValue() - remainder;
-        }
-    }
-
-    if (divisor.IsNegative())
-        quotient.Negate();
-}
-
-void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a,
-                               unsigned int n)
-{
-    q = a;
-    q >>= n;
-
-    const unsigned int wordCount = BitsToWords(n);
-    if (wordCount <= a.WordCount())
-    {
-        r.reg_.resize(RoundupSize(wordCount));
-        CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount);
-        SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount);
-        if (n % WORD_BITS != 0)
-          r.reg_[wordCount-1] %= (word(1) << (n % WORD_BITS));
-    }
-    else
-    {
-        r.reg_.resize(RoundupSize(a.WordCount()));
-        CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), r.reg_.size());
-    }
-    r.sign_ = POSITIVE;
-
-    if (a.IsNegative() && r.NotZero())
-    {
-        --q;
-        r = Power2(n) - r;
-    }
-}
-
-Integer Integer::DividedBy(const Integer &b) const
-{
-    Integer remainder, quotient;
-    Integer::Divide(remainder, quotient, *this, b);
-    return quotient;
-}
-
-Integer Integer::Modulo(const Integer &b) const
-{
-    Integer remainder, quotient;
-    Integer::Divide(remainder, quotient, *this, b);
-    return remainder;
-}
-
-void Integer::Divide(word &remainder, Integer &quotient,
-                     const Integer &dividend, word divisor)
-{
-    if ((divisor & (divisor-1)) == 0)	// divisor is a power of 2
-    {
-        quotient = dividend >> (BitPrecision(divisor)-1);
-        remainder = dividend.reg_[0] & (divisor-1);
-        return;
-    }
-
-    unsigned int i = dividend.WordCount();
-    quotient.reg_.CleanNew(RoundupSize(i));
-    remainder = 0;
-    while (i--)
-    {
-        quotient.reg_[i] = DWord(dividend.reg_[i], remainder) / divisor;
-        remainder = DWord(dividend.reg_[i], remainder) % divisor;
-    }
-
-    if (dividend.NotNegative())
-        quotient.sign_ = POSITIVE;
-    else
-    {
-        quotient.sign_ = NEGATIVE;
-        if (remainder)
-        {
-            --quotient;
-            remainder = divisor - remainder;
-        }
-    }
-}
-
-Integer Integer::DividedBy(word b) const
-{
-    word remainder;
-    Integer quotient;
-    Integer::Divide(remainder, quotient, *this, b);
-    return quotient;
-}
-
-word Integer::Modulo(word divisor) const
-{
-    word remainder;
-
-    if ((divisor & (divisor-1)) == 0)	// divisor is a power of 2
-        remainder = reg_[0] & (divisor-1);
-    else
-    {
-        unsigned int i = WordCount();
-
-        if (divisor <= 5)
-        {
-            DWord sum(0, 0);
-            while (i--)
-                sum += reg_[i];
-            remainder = sum % divisor;
-        }
-        else
-        {
-            remainder = 0;
-            while (i--)
-                remainder = DWord(reg_[i], remainder) % divisor;
-        }
-    }
-
-    if (IsNegative() && remainder)
-        remainder = divisor - remainder;
-
-    return remainder;
-}
-
-
-Integer Integer::AbsoluteValue() const
-{
-    Integer result(*this);
-    result.sign_ = POSITIVE;
-    return result;
-}
-
-
-Integer Integer::SquareRoot() const
-{
-    if (!IsPositive())
-        return Zero();
-
-    // overestimate square root
-    Integer x, y = Power2((BitCount()+1)/2);
-
-    do
-    {
-        x = y;
-        y = (x + *this/x) >> 1;
-    } while (y<x);
-
-    return x;
-}
-
-bool Integer::IsSquare() const
-{
-    Integer r = SquareRoot();
-    return *this == r.Squared();
-}
-
-bool Integer::IsUnit() const
-{
-    return (WordCount() == 1) && (reg_[0] == 1);
-}
-
-Integer Integer::MultiplicativeInverse() const
-{
-    return IsUnit() ? *this : Zero();
-}
-
-Integer a_times_b_mod_c(const Integer &x, const Integer& y, const Integer& m)
-{
-    return x*y%m;
-}
-
-Integer a_exp_b_mod_c(const Integer &x, const Integer& e, const Integer& m)
-{
-    ModularArithmetic mr(m);
-    return mr.Exponentiate(x, e);
-}
-
-Integer Integer::Gcd(const Integer &a, const Integer &b)
-{
-    return EuclideanDomainOf().Gcd(a, b);
-}
-
-Integer Integer::InverseMod(const Integer &m) const
-{
-    if (IsNegative() || *this>=m)
-        return (*this%m).InverseMod(m);
-
-    if (m.IsEven())
-    {
-        if (!m || IsEven())
-            return Zero();	// no inverse
-        if (*this == One())
-            return One();
-
-        Integer u = m.InverseMod(*this);
-        return !u ? Zero() : (m*(*this-u)+1)/(*this);
-    }
-
-    AlignedWordBlock T(m.reg_.size() * 4);
-    Integer r((word)0, m.reg_.size());
-    unsigned k = AlmostInverse(r.reg_.get_buffer(), T.get_buffer(),
-                               reg_.get_buffer(), reg_.size(),
-                               m.reg_.get_buffer(), m.reg_.size());
-    DivideByPower2Mod(r.reg_.get_buffer(), r.reg_.get_buffer(), k,
-                      m.reg_.get_buffer(), m.reg_.size());
-    return r;
-}
-
-word Integer::InverseMod(const word mod) const
-{
-    word g0 = mod, g1 = *this % mod;
-    word v0 = 0, v1 = 1;
-    word y;
-
-    while (g1)
-    {
-        if (g1 == 1)
-            return v1;
-        y = g0 / g1;
-        g0 = g0 % g1;
-        v0 += y * v1;
-
-        if (!g0)
-            break;
-        if (g0 == 1)
-            return mod-v0;
-        y = g1 / g0;
-        g1 = g1 % g0;
-        v1 += y * v0;
-    }
-    return 0;
-}
-
-// ********* ModArith stuff
-
-const Integer& ModularArithmetic::Half(const Integer &a) const
-{
-    if (a.reg_.size()==modulus.reg_.size())
-    {
-        TaoCrypt::DivideByPower2Mod(result.reg_.begin(), a.reg_.begin(), 1,
-                                    modulus.reg_.begin(), a.reg_.size());
-        return result;
-    }
-    else
-        return result1 = (a.IsEven() ? (a >> 1) : ((a+modulus) >> 1));
-}
-
-const Integer& ModularArithmetic::Add(const Integer &a, const Integer &b) const
-{
-    if (a.reg_.size()==modulus.reg_.size() && 
-        b.reg_.size()==modulus.reg_.size())
-    {
-        if (TaoCrypt::Add(result.reg_.begin(), a.reg_.begin(), b.reg_.begin(),
-                          a.reg_.size())
-            || Compare(result.reg_.get_buffer(), modulus.reg_.get_buffer(),
-                       a.reg_.size()) >= 0)
-        {
-            TaoCrypt::Subtract(result.reg_.begin(), result.reg_.begin(),
-                               modulus.reg_.begin(), a.reg_.size());
-        }
-        return result;
-    }
-    else
-    {
-        result1 = a+b;
-        if (result1 >= modulus)
-            result1 -= modulus;
-        return result1;
-    }
-}
-
-Integer& ModularArithmetic::Accumulate(Integer &a, const Integer &b) const
-{
-    if (a.reg_.size()==modulus.reg_.size() && 
-        b.reg_.size()==modulus.reg_.size())
-    {
-        if (TaoCrypt::Add(a.reg_.get_buffer(), a.reg_.get_buffer(),
-                          b.reg_.get_buffer(), a.reg_.size())
-            || Compare(a.reg_.get_buffer(), modulus.reg_.get_buffer(),
-                       a.reg_.size()) >= 0)
-        {
-            TaoCrypt::Subtract(a.reg_.get_buffer(), a.reg_.get_buffer(),
-                               modulus.reg_.get_buffer(), a.reg_.size());
-        }
-    }
-    else
-    {
-        a+=b;
-        if (a>=modulus)
-            a-=modulus;
-    }
-
-    return a;
-}
-
-const Integer& ModularArithmetic::Subtract(const Integer &a,
-                                           const Integer &b) const
-{
-    if (a.reg_.size()==modulus.reg_.size() && 
-        b.reg_.size()==modulus.reg_.size())
-    {
-        if (TaoCrypt::Subtract(result.reg_.begin(), a.reg_.begin(),
-                               b.reg_.begin(), a.reg_.size()))
-            TaoCrypt::Add(result.reg_.begin(), result.reg_.begin(),
-                          modulus.reg_.begin(), a.reg_.size());
-        return result;
-    }
-    else
-    {
-        result1 = a-b;
-        if (result1.IsNegative())
-            result1 += modulus;
-        return result1;
-    }
-}
-
-Integer& ModularArithmetic::Reduce(Integer &a, const Integer &b) const
-{
-    if (a.reg_.size()==modulus.reg_.size() && 
-        b.reg_.size()==modulus.reg_.size())
-    {
-        if (TaoCrypt::Subtract(a.reg_.get_buffer(), a.reg_.get_buffer(),
-                               b.reg_.get_buffer(), a.reg_.size()))
-            TaoCrypt::Add(a.reg_.get_buffer(), a.reg_.get_buffer(),
-                          modulus.reg_.get_buffer(), a.reg_.size());
-    }
-    else
-    {
-        a-=b;
-        if (a.IsNegative())
-            a+=modulus;
-    }
-
-    return a;
-}
-
-const Integer& ModularArithmetic::Inverse(const Integer &a) const
-{
-    if (!a)
-        return a;
-
-    CopyWords(result.reg_.begin(), modulus.reg_.begin(), modulus.reg_.size());
-    if (TaoCrypt::Subtract(result.reg_.begin(), result.reg_.begin(),
-                           a.reg_.begin(), a.reg_.size()))
-        Decrement(result.reg_.begin()+a.reg_.size(), 1,
-                  modulus.reg_.size()-a.reg_.size());
-
-    return result;
-}
-
-Integer ModularArithmetic::CascadeExponentiate(const Integer &x,
-                  const Integer &e1, const Integer &y, const Integer &e2) const
-{
-    if (modulus.IsOdd())
-    {
-        MontgomeryRepresentation dr(modulus);
-        return dr.ConvertOut(dr.CascadeExponentiate(dr.ConvertIn(x), e1,
-                                                    dr.ConvertIn(y), e2));
-    }
-    else
-        return AbstractRing::CascadeExponentiate(x, e1, y, e2);
-}
-
-void ModularArithmetic::SimultaneousExponentiate(Integer *results,
-        const Integer &base, const Integer *exponents,
-        unsigned int exponentsCount) const
-{
-    if (modulus.IsOdd())
-    {
-        MontgomeryRepresentation dr(modulus);
-        dr.SimultaneousExponentiate(results, dr.ConvertIn(base), exponents,
-                                    exponentsCount);
-        for (unsigned int i=0; i<exponentsCount; i++)
-            results[i] = dr.ConvertOut(results[i]);
-    }
-    else
-        AbstractRing::SimultaneousExponentiate(results, base,
-                                                    exponents, exponentsCount);
-}
-
-
-// ********************************************************
-
-#define A0      A
-#define A1      (A+N2)
-#define B0      B
-#define B1      (B+N2)
-
-#define T0      T
-#define T1      (T+N2)
-#define T2      (T+N)
-#define T3      (T+N+N2)
-
-#define R0      R
-#define R1      (R+N2)
-#define R2      (R+N)
-#define R3      (R+N+N2)
-
-
-inline void MultiplyBottom(word *R, word *T, const word *A, const word *B,
-                           unsigned int N)
-{
-    RecursiveMultiplyBottom(R, T, A, B, N);
-}
-
-inline void MultiplyTop(word *R, word *T, const word *L, const word *A,
-                        const word *B, unsigned int N)
-{
-    RecursiveMultiplyTop(R, T, L, A, B, N);
-}
-
-
-// R[N] --- result = X/(2**(WORD_BITS*N)) mod M
-// T[3*N] - temporary work space
-// X[2*N] - number to be reduced
-// M[N] --- modulus
-// U[N] --- multiplicative inverse of M mod 2**(WORD_BITS*N)
-
-void MontgomeryReduce(word *R, word *T, const word *X, const word *M,
-                      const word *U, unsigned int N)
-{
-    MultiplyBottom(R, T, X, U, N);
-    MultiplyTop(T, T+N, X, R, M, N);
-    word borrow = Subtract(T, X+N, T, N);
-    // defend against timing attack by doing this Add even when not needed
-    word carry = Add(T+N, T, M, N);
-    (void)carry;            // shut up compiler
-    CopyWords(R, T + (borrow ? N : 0), N);
-}
-
-// R[N] ----- result = A inverse mod 2**(WORD_BITS*N)
-// T[3*N/2] - temporary work space
-// A[N] ----- an odd number as input
-
-void RecursiveInverseModPower2(word *R, word *T, const word *A, unsigned int N)
-{
-    if (N==2)
-    {
-        T[0] = AtomicInverseModPower2(A[0]);
-        T[1] = 0;
-        LowLevel::Multiply2Bottom(T+2, T, A);
-        TwosComplement(T+2, 2);
-        Increment(T+2, 2, 2);
-        LowLevel::Multiply2Bottom(R, T, T+2);
-    }
-    else
-    {
-        const unsigned int N2 = N/2;
-        RecursiveInverseModPower2(R0, T0, A0, N2);
-        T0[0] = 1;
-        SetWords(T0+1, 0, N2-1);
-        MultiplyTop(R1, T1, T0, R0, A0, N2);
-        MultiplyBottom(T0, T1, R0, A1, N2);
-        Add(T0, R1, T0, N2);
-        TwosComplement(T0, N2);
-        MultiplyBottom(R1, T1, R0, T0, N2);
-    }
-}
-
-
-#undef A0
-#undef A1
-#undef B0
-#undef B1
-
-#undef T0
-#undef T1
-#undef T2
-#undef T3
-
-#undef R0
-#undef R1
-#undef R2
-#undef R3
-
-
-// modulus must be odd
-MontgomeryRepresentation::MontgomeryRepresentation(const Integer &m)
-    : ModularArithmetic(m),
-      u((word)0, modulus.reg_.size()),
-      workspace(5*modulus.reg_.size())
-{
-    RecursiveInverseModPower2(u.reg_.get_buffer(), workspace.get_buffer(),
-                              modulus.reg_.get_buffer(), modulus.reg_.size());
-}
-
-const Integer& MontgomeryRepresentation::Multiply(const Integer &a,
-                                                  const Integer &b) const
-{
-    word *const T = workspace.begin();
-    word *const R = result.reg_.begin();
-    const unsigned int N = modulus.reg_.size();
-
-    AsymmetricMultiply(T, T+2*N, a.reg_.get_buffer(), a.reg_.size(),
-                       b.reg_.get_buffer(), b.reg_.size());
-    SetWords(T+a.reg_.size()+b.reg_.size(),0, 2*N-a.reg_.size()-b.reg_.size());
-    MontgomeryReduce(R, T+2*N, T, modulus.reg_.get_buffer(),
-                     u.reg_.get_buffer(), N);
-    return result;
-}
-
-const Integer& MontgomeryRepresentation::Square(const Integer &a) const
-{
-    word *const T = workspace.begin();
-    word *const R = result.reg_.begin();
-    const unsigned int N = modulus.reg_.size();
-
-    TaoCrypt::Square(T, T+2*N, a.reg_.get_buffer(), a.reg_.size());
-    SetWords(T+2*a.reg_.size(), 0, 2*N-2*a.reg_.size());
-    MontgomeryReduce(R, T+2*N, T, modulus.reg_.get_buffer(),
-                     u.reg_.get_buffer(), N);
-    return result;
-}
-
-Integer MontgomeryRepresentation::ConvertOut(const Integer &a) const
-{
-    word *const T = workspace.begin();
-    word *const R = result.reg_.begin();
-    const unsigned int N = modulus.reg_.size();
-
-    CopyWords(T, a.reg_.get_buffer(), a.reg_.size());
-    SetWords(T+a.reg_.size(), 0, 2*N-a.reg_.size());
-    MontgomeryReduce(R, T+2*N, T, modulus.reg_.get_buffer(),
-                     u.reg_.get_buffer(), N);
-    return result;
-}
-
-const Integer& MontgomeryRepresentation::MultiplicativeInverse(
-                                                        const Integer &a) const
-{
-//  return (EuclideanMultiplicativeInverse(a, modulus)<<
-//      (2*WORD_BITS*modulus.reg_.size()))%modulus;
-    word *const T = workspace.begin();
-    word *const R = result.reg_.begin();
-    const unsigned int N = modulus.reg_.size();
-
-    CopyWords(T, a.reg_.get_buffer(), a.reg_.size());
-    SetWords(T+a.reg_.size(), 0, 2*N-a.reg_.size());
-    MontgomeryReduce(R, T+2*N, T, modulus.reg_.get_buffer(),
-                     u.reg_.get_buffer(), N);
-    unsigned k = AlmostInverse(R, T, R, N, modulus.reg_.get_buffer(), N);
-
-//  cout << "k=" << k << " N*32=" << 32*N << endl;
-
-    if (k>N*WORD_BITS)
-        DivideByPower2Mod(R, R, k-N*WORD_BITS, modulus.reg_.get_buffer(), N);
-    else
-        MultiplyByPower2Mod(R, R, N*WORD_BITS-k, modulus.reg_.get_buffer(), N);
-
-    return result;
-}
-
-
-//  mod Root stuff
-Integer ModularRoot(const Integer &a, const Integer &dp, const Integer &dq,
-                    const Integer &p, const Integer &q, const Integer &u)
-{
-    Integer p2 = ModularExponentiation((a % p), dp, p);
-    Integer q2 = ModularExponentiation((a % q), dq, q);
-    return CRT(p2, p, q2, q, u);
-}
-
-Integer CRT(const Integer &xp, const Integer &p, const Integer &xq,
-            const Integer &q, const Integer &u)
-{
-    // isn't operator overloading great?
-    return p * (u * (xq-xp) % q) + xp;
-}
-
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-#ifndef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-template hword DivideThreeWordsByTwo<hword, Word>(hword*, hword, hword, Word*);
-#endif
-template word DivideThreeWordsByTwo<word, DWord>(word*, word, word, DWord*);
-#ifdef SSE2_INTRINSICS_AVAILABLE
-template class AlignedAllocator<word>;
-#endif
-#endif
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/make.bat b/extra/yassl/taocrypt/src/make.bat
deleted file mode 100644
index f98ed36652df..000000000000
--- a/extra/yassl/taocrypt/src/make.bat
+++ /dev/null
@@ -1,53 +0,0 @@
-REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-REM quick and dirty build file for testing different MSDEVs
-setlocal 
-
-set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2 
-
-cl %myFLAGS% aes.cpp
-cl %myFLAGS% aestables.cpp
-cl %myFLAGS% algebra.cpp
-cl %myFLAGS% arc4.cpp
-
-cl %myFLAGS% asn.cpp
-cl %myFLAGS% bftables.cpp
-cl %myFLAGS% blowfish.cpp
-cl %myFLAGS% coding.cpp
-
-cl %myFLAGS% des.cpp
-cl %myFLAGS% dh.cpp
-cl %myFLAGS% dsa.cpp
-cl %myFLAGS% file.cpp
-
-cl %myFLAGS% hash.cpp
-cl %myFLAGS% integer.cpp
-cl %myFLAGS% md2.cpp
-cl %myFLAGS% md4.cpp
-cl %myFLAGS% md5.cpp
-
-cl %myFLAGS% misc.cpp
-cl %myFLAGS% random.cpp
-cl %myFLAGS% ripemd.cpp
-cl %myFLAGS% rsa.cpp
-
-cl %myFLAGS% sha.cpp
-cl %myFLAGS% template_instnt.cpp
-cl %myFLAGS% tftables.cpp
-cl %myFLAGS% twofish.cpp
-
-link.exe -lib /out:taocrypt.lib aes.obj aestables.obj algebra.obj arc4.obj asn.obj bftables.obj blowfish.obj coding.obj des.obj dh.obj dsa.obj file.obj hash.obj integer.obj md2.obj md4.obj md5.obj misc.obj random.obj ripemd.obj rsa.obj sha.obj template_instnt.obj tftables.obj twofish.obj
-
diff --git a/extra/yassl/taocrypt/src/md2.cpp b/extra/yassl/taocrypt/src/md2.cpp
deleted file mode 100644
index 3dfc0d6e7a50..000000000000
--- a/extra/yassl/taocrypt/src/md2.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* based on Wei Dai's md2.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "md2.hpp"
-#include <string.h>
-
-namespace TaoCrypt {
-
-
-MD2::MD2()
-    : X_(X_SIZE), C_(BLOCK_SIZE), buffer_(BLOCK_SIZE)
-{
-    Init();
-}
-
-void MD2::Init()
-{
-    memset(X_.get_buffer(), 0, X_SIZE);
-    memset(C_.get_buffer(), 0, BLOCK_SIZE);
-    memset(buffer_.get_buffer(), 0, BLOCK_SIZE);
-    count_ = 0;
-}
-
-
-void MD2::Update(const byte* data, word32 len)
-{
-
-    static const byte S[256] = 
-    {
-        41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
-        19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
-        76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
-        138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
-        245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
-        148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
-        39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
-        181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
-        150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
-        112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
-        96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
-        85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
-        234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
-        129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
-        8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
-        203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
-        166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
-        31, 26, 219, 153, 141, 51, 159, 17, 131, 20
-    };
-
-    while (len) {
-        word32 L = (PAD_SIZE - count_) < len ? (PAD_SIZE - count_) : len;
-        memcpy(buffer_.get_buffer() + count_, data, L);
-        count_ += L;
-        data += L;
-        len  -= L;
-
-        if (count_==PAD_SIZE) {
-            count_ = 0;
-            memcpy(X_.get_buffer() + PAD_SIZE, buffer_.get_buffer(), PAD_SIZE);
-            byte t = C_[15];
-
-            int i;
-            for(i = 0; i < PAD_SIZE; i++) {
-                X_[32 + i] = X_[PAD_SIZE + i] ^ X_[i];
-                t = C_[i] ^= S[buffer_[i] ^ t];
-            }
-
-            t=0;
-            for(i = 0; i < 18; i++) {
-                for(int j = 0; j < X_SIZE; j += 8) {
-                    t = X_[j+0] ^= S[t];
-                    t = X_[j+1] ^= S[t];
-                    t = X_[j+2] ^= S[t];
-                    t = X_[j+3] ^= S[t];
-                    t = X_[j+4] ^= S[t];
-                    t = X_[j+5] ^= S[t];
-                    t = X_[j+6] ^= S[t];
-                    t = X_[j+7] ^= S[t];
-                }
-                t = (t + i) & 0xFF;
-            }
-        }
-    }
-}
-
-
-void MD2::Final(byte *hash)
-{
-    byte   padding[BLOCK_SIZE];
-    word32 padLen = PAD_SIZE - count_;
-
-    for (word32 i = 0; i < padLen; i++)
-        padding[i] = static_cast<byte>(padLen);
-
-    Update(padding, padLen);
-    Update(C_.get_buffer(), BLOCK_SIZE);
-
-    memcpy(hash, X_.get_buffer(), DIGEST_SIZE);
-
-    Init();
-}
-
-
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/md4.cpp b/extra/yassl/taocrypt/src/md4.cpp
deleted file mode 100644
index 9364a1c23b15..000000000000
--- a/extra/yassl/taocrypt/src/md4.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* based on Wei Dai's md4.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "md4.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-   
-
-namespace TaoCrypt {
-
-void MD4::Init()
-{
-    digest_[0] = 0x67452301L;
-    digest_[1] = 0xefcdab89L;
-    digest_[2] = 0x98badcfeL;
-    digest_[3] = 0x10325476L;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-MD4::MD4(const MD4& that) : HASHwithTransform(DIGEST_SIZE / sizeof(word32),
-                                              BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_  =  that.loLen_;
-    hiLen_  =  that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-MD4& MD4::operator= (const MD4& that)
-{
-    MD4 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-void MD4::Swap(MD4& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-void MD4::Transform()
-{
-#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
-#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-
-    word32 A, B, C, D;
-
-    A = digest_[0];
-    B = digest_[1];
-    C = digest_[2];
-    D = digest_[3];
-
-#define function(a,b,c,d,k,s) a=rotlFixed(a+F(b,c,d)+buffer_[k],s);
-    function(A,B,C,D, 0, 3);
-    function(D,A,B,C, 1, 7);
-    function(C,D,A,B, 2,11);
-    function(B,C,D,A, 3,19);
-    function(A,B,C,D, 4, 3);
-    function(D,A,B,C, 5, 7);
-    function(C,D,A,B, 6,11);
-    function(B,C,D,A, 7,19);
-    function(A,B,C,D, 8, 3);
-    function(D,A,B,C, 9, 7);
-    function(C,D,A,B,10,11);
-    function(B,C,D,A,11,19);
-    function(A,B,C,D,12, 3);
-    function(D,A,B,C,13, 7);
-    function(C,D,A,B,14,11);
-    function(B,C,D,A,15,19);
-
-#undef function	  
-#define function(a,b,c,d,k,s) a=rotlFixed(a+G(b,c,d)+buffer_[k]+0x5a827999,s);
-    function(A,B,C,D, 0, 3);
-    function(D,A,B,C, 4, 5);
-    function(C,D,A,B, 8, 9);
-    function(B,C,D,A,12,13);
-    function(A,B,C,D, 1, 3);
-    function(D,A,B,C, 5, 5);
-    function(C,D,A,B, 9, 9);
-    function(B,C,D,A,13,13);
-    function(A,B,C,D, 2, 3);
-    function(D,A,B,C, 6, 5);
-    function(C,D,A,B,10, 9);
-    function(B,C,D,A,14,13);
-    function(A,B,C,D, 3, 3);
-    function(D,A,B,C, 7, 5);
-    function(C,D,A,B,11, 9);
-    function(B,C,D,A,15,13);
-
-#undef function	 
-#define function(a,b,c,d,k,s) a=rotlFixed(a+H(b,c,d)+buffer_[k]+0x6ed9eba1,s);
-    function(A,B,C,D, 0, 3);
-    function(D,A,B,C, 8, 9);
-    function(C,D,A,B, 4,11);
-    function(B,C,D,A,12,15);
-    function(A,B,C,D, 2, 3);
-    function(D,A,B,C,10, 9);
-    function(C,D,A,B, 6,11);
-    function(B,C,D,A,14,15);
-    function(A,B,C,D, 1, 3);
-    function(D,A,B,C, 9, 9);
-    function(C,D,A,B, 5,11);
-    function(B,C,D,A,13,15);
-    function(A,B,C,D, 3, 3);
-    function(D,A,B,C,11, 9);
-    function(C,D,A,B, 7,11);
-    function(B,C,D,A,15,15);
-
-    digest_[0] += A;
-    digest_[1] += B;
-    digest_[2] += C;
-    digest_[3] += D;
-}
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/md5.cpp b/extra/yassl/taocrypt/src/md5.cpp
deleted file mode 100644
index 45cfa8a3322c..000000000000
--- a/extra/yassl/taocrypt/src/md5.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* based on Wei Dai's md5.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "md5.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-
-namespace TaoCrypt {
-
-void MD5::Init()
-{
-    digest_[0] = 0x67452301L;
-    digest_[1] = 0xefcdab89L;
-    digest_[2] = 0x98badcfeL;
-    digest_[3] = 0x10325476L;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-MD5::MD5(const MD5& that) : HASHwithTransform(DIGEST_SIZE / sizeof(word32),
-                                              BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_  =  that.loLen_;
-    hiLen_  =  that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-MD5& MD5::operator= (const MD5& that)
-{
-    MD5 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-void MD5::Swap(MD5& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-#ifdef DO_MD5_ASM
-
-// Update digest with data of size len
-void MD5::Update(const byte* data, word32 len)
-{
-    if (!isMMX) {
-        HASHwithTransform::Update(data, len);
-        return;
-    }
-
-    byte* local = reinterpret_cast<byte*>(buffer_);
-
-    // remove buffered data if possible
-    if (buffLen_)  {   
-        word32 add = min(len, BLOCK_SIZE - buffLen_);
-        memcpy(&local[buffLen_], data, add);
-
-        buffLen_ += add;
-        data     += add;
-        len      -= add;
-
-        if (buffLen_ == BLOCK_SIZE) {
-            Transform();
-            AddLength(BLOCK_SIZE);
-            buffLen_ = 0;
-        }
-    }
-
-    // at once for asm
-    if (buffLen_ == 0) {
-        word32 times = len / BLOCK_SIZE;
-        if (times) {
-            AsmTransform(data, times);
-            const word32 add = BLOCK_SIZE * times;
-            AddLength(add);
-            len  -= add;
-            data += add;
-        }
-    }
-
-    // cache any data left
-    if (len) {
-        memcpy(&local[buffLen_], data, len);
-        buffLen_ += len;
-    }
-}
-
-
-
-
-/*
-    // w = rotlFixed(w + f(x, y, z) + index[edi] + data, s) + x
-#define ASMMD5STEP(f, w, x, y, z, index, data, s)       \
-    f(x, y, z)                                          \
-    AS2(    mov   ebp, [edi + index * 4]            )   \
-    AS2(    lea     w, [esi + w + data]             )   \
-    AS2(    add     w, ebp                          )   \
-    AS2(    rol     w, s                            )   \
-    AS2(    add     w, x                            )
-
-
-    // F1(x, y, z) (z ^ (x & (y ^ z)))
-    // place in esi
-#define ASMF1(x, y, z) \
-    AS2(    mov   esi, y                )   \
-    AS2(    xor   esi, z                )   \
-    AS2(    and   esi, x                )   \
-    AS2(    xor   esi, z                )
-
-
-#define ASMF2(x, y, z) ASMF1(z, x, y)
-
-
-    // F3(x ^ y ^ z)
-    // place in esi
-#define ASMF3(x, y, z)  \
-    AS2(    mov   esi, x                )   \
-    AS2(    xor   esi, y                )   \
-    AS2(    xor   esi, z                )
-
-
-
-    // F4(x, y, z) (y ^ (x | ~z))
-    // place in esi
-#define ASMF4(x, y, z)  \
-    AS2(    mov   esi, z                )   \
-    AS1(    not   esi                   )   \
-    AS2(     or   esi, x                )   \
-    AS2(    xor   esi, y                )
-*/
-
-
-    // combine above ASMMD5STEP(f w/ each f ASMF1 - F4
-
-    // esi already set up, after using set for next round
-    // ebp already set up, set up using next round index
-    
-#define MD5STEP1(w, x, y, z, index, data, s)    \
-    AS2(    xor   esi, z                    )   \
-    AS2(    and   esi, x                    )   \
-    AS2(    lea     w, [ebp + w + data]     )   \
-    AS2(    xor   esi, z                    )   \
-    AS2(    add     w, esi                  )   \
-    AS2(    mov   esi, x                    )   \
-    AS2(    rol     w, s                    )   \
-    AS2(    mov   ebp, [edi + index * 4]    )   \
-    AS2(    add     w, x                    )
-
-#define MD5STEP2(w, x, y, z, index, data, s)    \
-    AS2(    xor   esi, x                    )   \
-    AS2(    and   esi, z                    )   \
-    AS2(    lea     w, [ebp + w + data]     )   \
-    AS2(    xor   esi, y                    )   \
-    AS2(    add     w, esi                  )   \
-    AS2(    mov   esi, x                    )   \
-    AS2(    rol     w, s                    )   \
-    AS2(    mov   ebp, [edi + index * 4]    )   \
-    AS2(    add     w, x                    )
-
-
-#define MD5STEP3(w, x, y, z, index, data, s)    \
-    AS2(    xor   esi, z                    )   \
-    AS2(    lea     w, [ebp + w + data]     )   \
-    AS2(    xor   esi, x                    )   \
-    AS2(    add     w, esi                  )   \
-    AS2(    mov   esi, x                    )   \
-    AS2(    rol     w, s                    )   \
-    AS2(    mov   ebp, [edi + index * 4]    )   \
-    AS2(    add     w, x                    )
-
-
-#define MD5STEP4(w, x, y, z, index, data, s)    \
-    AS2(     or   esi, x                    )   \
-    AS2(    lea     w, [ebp + w + data]     )   \
-    AS2(    xor   esi, y                    )   \
-    AS2(    add     w, esi                  )   \
-    AS2(    mov   esi, y                    )   \
-    AS2(    rol     w, s                    )   \
-    AS1(    not   esi                       )   \
-    AS2(    mov   ebp, [edi + index * 4]    )   \
-    AS2(    add     w, x                    )
-
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void MD5::AsmTransform(const byte* data, word32 times)
-{
-#ifdef __GNUC__
-    #define AS1(x)    #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-
-    #define PROLOG()  \
-    __asm__ __volatile__ \
-    ( \
-        ".intel_syntax noprefix;" \
-        "push ebx;" \
-        "push ebp;"
-    #define EPILOG()  \
-        "pop ebp;" \
-        "pop ebx;" \
-       	"emms;" \
-       	".att_syntax;" \
-            : \
-            : "c" (this), "D" (data), "a" (times) \
-            : "%esi", "%edx", "memory", "cc" \
-    );
-
-#else
-    #define AS1(x)    __asm x
-    #define AS2(x, y) __asm x, y
-
-    #define PROLOG() \
-        AS1(    push  ebp                       )   \
-        AS2(    mov   ebp, esp                  )   \
-        AS2(    movd  mm3, edi                  )   \
-        AS2(    movd  mm4, ebx                  )   \
-        AS2(    movd  mm5, esi                  )   \
-        AS2(    movd  mm6, ebp                  )   \
-        AS2(    mov   edi, DWORD PTR [ebp +  8] )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 12] )
-
-    #define EPILOG() \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS1(    pop   ebp                       )   \
-        AS1(    emms                            )   \
-        AS1(    ret  8                          )
-        
-#endif
-
-
-    PROLOG()
-
-    AS2(    mov   esi, ecx              )
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    add   esi, 20               )   // digest_[0]
-    #else
-        AS2(    add   esi, 16               )   // digest_[0]
-    #endif
-
-    AS2(    movd  mm2, eax              )   // store times_
-    AS2(    movd  mm1, esi              )   // store digest_
-    
-    AS2(    mov   eax, [esi]            )   // a
-    AS2(    mov   ebx, [esi +  4]       )   // b
-    AS2(    mov   ecx, [esi +  8]       )   // c
-    AS2(    mov   edx, [esi + 12]       )   // d
-  
-#ifdef _MSC_VER
-    AS1( loopStart: )  // loopStart
-#else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
-#endif
-
-    // set up
-    AS2(    mov   esi, ecx      )
-    AS2(    mov   ebp, [edi]    )
-
-    MD5STEP1( eax, ebx, ecx, edx, 1,   0xd76aa478,  7)
-    MD5STEP1( edx, eax, ebx, ecx, 2,   0xe8c7b756, 12)
-    MD5STEP1( ecx, edx, eax, ebx, 3,   0x242070db, 17)
-    MD5STEP1( ebx, ecx, edx, eax, 4,   0xc1bdceee, 22)
-    MD5STEP1( eax, ebx, ecx, edx, 5,   0xf57c0faf,  7)
-    MD5STEP1( edx, eax, ebx, ecx, 6,   0x4787c62a, 12)
-    MD5STEP1( ecx, edx, eax, ebx, 7,   0xa8304613, 17)
-    MD5STEP1( ebx, ecx, edx, eax, 8,   0xfd469501, 22)
-    MD5STEP1( eax, ebx, ecx, edx, 9,   0x698098d8,  7)
-    MD5STEP1( edx, eax, ebx, ecx, 10,  0x8b44f7af, 12)
-    MD5STEP1( ecx, edx, eax, ebx, 11,  0xffff5bb1, 17)
-    MD5STEP1( ebx, ecx, edx, eax, 12,  0x895cd7be, 22)
-    MD5STEP1( eax, ebx, ecx, edx, 13,  0x6b901122,  7)
-    MD5STEP1( edx, eax, ebx, ecx, 14,  0xfd987193, 12)
-    MD5STEP1( ecx, edx, eax, ebx, 15,  0xa679438e, 17)
-    MD5STEP1( ebx, ecx, edx, eax, 1,   0x49b40821, 22)
-
-    MD5STEP2( eax, ebx, ecx, edx, 6,  0xf61e2562,  5)
-    MD5STEP2( edx, eax, ebx, ecx, 11, 0xc040b340,  9)
-    MD5STEP2( ecx, edx, eax, ebx, 0,  0x265e5a51, 14)
-    MD5STEP2( ebx, ecx, edx, eax, 5,  0xe9b6c7aa, 20)
-    MD5STEP2( eax, ebx, ecx, edx, 10, 0xd62f105d,  5)
-    MD5STEP2( edx, eax, ebx, ecx, 15, 0x02441453,  9)
-    MD5STEP2( ecx, edx, eax, ebx, 4,  0xd8a1e681, 14)
-    MD5STEP2( ebx, ecx, edx, eax, 9,  0xe7d3fbc8, 20)
-    MD5STEP2( eax, ebx, ecx, edx, 14, 0x21e1cde6,  5)
-    MD5STEP2( edx, eax, ebx, ecx, 3,  0xc33707d6,  9)
-    MD5STEP2( ecx, edx, eax, ebx, 8,  0xf4d50d87, 14)
-    MD5STEP2( ebx, ecx, edx, eax, 13, 0x455a14ed, 20)
-    MD5STEP2( eax, ebx, ecx, edx, 2,  0xa9e3e905,  5)
-    MD5STEP2( edx, eax, ebx, ecx, 7,  0xfcefa3f8,  9)
-    MD5STEP2( ecx, edx, eax, ebx, 12, 0x676f02d9, 14)
-    MD5STEP2( ebx, ecx, edx, eax, 5,  0x8d2a4c8a, 20)
-
-    MD5STEP3(  eax, ebx, ecx, edx, 8,   0xfffa3942,  4)
-    MD5STEP3(  edx, eax, ebx, ecx, 11,  0x8771f681, 11)
-    MD5STEP3(  ecx, edx, eax, ebx, 14,  0x6d9d6122, 16)
-    MD5STEP3(  ebx, ecx, edx, eax, 1,   0xfde5380c, 23)
-    MD5STEP3(  eax, ebx, ecx, edx, 4,   0xa4beea44,  4)
-    MD5STEP3(  edx, eax, ebx, ecx, 7,   0x4bdecfa9, 11)
-    MD5STEP3(  ecx, edx, eax, ebx, 10,  0xf6bb4b60, 16)
-    MD5STEP3(  ebx, ecx, edx, eax, 13,  0xbebfbc70, 23)
-    MD5STEP3(  eax, ebx, ecx, edx, 0,   0x289b7ec6,  4)
-    MD5STEP3(  edx, eax, ebx, ecx, 3,   0xeaa127fa, 11)
-    MD5STEP3(  ecx, edx, eax, ebx, 6,   0xd4ef3085, 16)
-    MD5STEP3(  ebx, ecx, edx, eax, 9,   0x04881d05, 23)
-    MD5STEP3(  eax, ebx, ecx, edx, 12,  0xd9d4d039,  4)
-    MD5STEP3(  edx, eax, ebx, ecx, 15,  0xe6db99e5, 11)
-    MD5STEP3(  ecx, edx, eax, ebx, 2,   0x1fa27cf8, 16)
-    MD5STEP3(  ebx, ecx, edx, eax, 0,   0xc4ac5665, 23)
-
-    // setup
-    AS2(    mov   esi, edx      )
-    AS1(    not   esi           )
-
-    MD5STEP4(  eax, ebx, ecx, edx, 7,   0xf4292244,  6)
-    MD5STEP4(  edx, eax, ebx, ecx, 14,  0x432aff97, 10)
-    MD5STEP4(  ecx, edx, eax, ebx, 5,   0xab9423a7, 15)
-    MD5STEP4(  ebx, ecx, edx, eax, 12,  0xfc93a039, 21)
-    MD5STEP4(  eax, ebx, ecx, edx, 3,   0x655b59c3,  6)
-    MD5STEP4(  edx, eax, ebx, ecx, 10,  0x8f0ccc92, 10)
-    MD5STEP4(  ecx, edx, eax, ebx, 1,   0xffeff47d, 15)
-    MD5STEP4(  ebx, ecx, edx, eax, 8,   0x85845dd1, 21)
-    MD5STEP4(  eax, ebx, ecx, edx, 15,  0x6fa87e4f,  6)
-    MD5STEP4(  edx, eax, ebx, ecx, 6,   0xfe2ce6e0, 10)
-    MD5STEP4(  ecx, edx, eax, ebx, 13,  0xa3014314, 15)
-    MD5STEP4(  ebx, ecx, edx, eax, 4,   0x4e0811a1, 21)
-    MD5STEP4(  eax, ebx, ecx, edx, 11,  0xf7537e82,  6)
-    MD5STEP4(  edx, eax, ebx, ecx, 2,   0xbd3af235, 10)
-    MD5STEP4(  ecx, edx, eax, ebx, 9,   0x2ad7d2bb, 15)
-    MD5STEP4(  ebx, ecx, edx, eax, 9,   0xeb86d391, 21)
-    
-    AS2(    movd  esi, mm1              )   // digest_
-
-    AS2(    add   [esi],      eax       )   // write out
-    AS2(    add   [esi +  4], ebx       )
-    AS2(    add   [esi +  8], ecx       )
-    AS2(    add   [esi + 12], edx       )
-
-    AS2(    add   edi, 64               )
-
-    AS2(    mov   eax, [esi]            )
-    AS2(    mov   ebx, [esi +  4]       )
-    AS2(    mov   ecx, [esi +  8]       )
-    AS2(    mov   edx, [esi + 12]       )
-
-    AS2(    movd  ebp, mm2              )   // times
-    AS1(    dec   ebp                   )
-    AS2(    movd  mm2, ebp              )
-#ifdef _MSC_VER
-    AS1(    jnz   loopStart )  // loopStart
-#else
-    AS1(    jnz   0b )         // loopStart
-#endif
-
-
-    EPILOG()
-}
-
-
-#endif // DO_MD5_ASM
-
-
-void MD5::Transform()
-{
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-#define MD5STEP(f, w, x, y, z, data, s) \
-    w = rotlFixed(w + f(x, y, z) + data, s) + x
-
-    // Copy context->state[] to working vars 
-    word32 a = digest_[0];
-    word32 b = digest_[1];
-    word32 c = digest_[2];
-    word32 d = digest_[3];
-
-    MD5STEP(F1, a, b, c, d, buffer_[0]  + 0xd76aa478,  7);
-    MD5STEP(F1, d, a, b, c, buffer_[1]  + 0xe8c7b756, 12);
-    MD5STEP(F1, c, d, a, b, buffer_[2]  + 0x242070db, 17);
-    MD5STEP(F1, b, c, d, a, buffer_[3]  + 0xc1bdceee, 22);
-    MD5STEP(F1, a, b, c, d, buffer_[4]  + 0xf57c0faf,  7);
-    MD5STEP(F1, d, a, b, c, buffer_[5]  + 0x4787c62a, 12);
-    MD5STEP(F1, c, d, a, b, buffer_[6]  + 0xa8304613, 17);
-    MD5STEP(F1, b, c, d, a, buffer_[7]  + 0xfd469501, 22);
-    MD5STEP(F1, a, b, c, d, buffer_[8]  + 0x698098d8,  7);
-    MD5STEP(F1, d, a, b, c, buffer_[9]  + 0x8b44f7af, 12);
-    MD5STEP(F1, c, d, a, b, buffer_[10] + 0xffff5bb1, 17);
-    MD5STEP(F1, b, c, d, a, buffer_[11] + 0x895cd7be, 22);
-    MD5STEP(F1, a, b, c, d, buffer_[12] + 0x6b901122,  7);
-    MD5STEP(F1, d, a, b, c, buffer_[13] + 0xfd987193, 12);
-    MD5STEP(F1, c, d, a, b, buffer_[14] + 0xa679438e, 17);
-    MD5STEP(F1, b, c, d, a, buffer_[15] + 0x49b40821, 22);
-
-    MD5STEP(F2, a, b, c, d, buffer_[1]  + 0xf61e2562,  5);
-    MD5STEP(F2, d, a, b, c, buffer_[6]  + 0xc040b340,  9);
-    MD5STEP(F2, c, d, a, b, buffer_[11] + 0x265e5a51, 14);
-    MD5STEP(F2, b, c, d, a, buffer_[0]  + 0xe9b6c7aa, 20);
-    MD5STEP(F2, a, b, c, d, buffer_[5]  + 0xd62f105d,  5);
-    MD5STEP(F2, d, a, b, c, buffer_[10] + 0x02441453,  9);
-    MD5STEP(F2, c, d, a, b, buffer_[15] + 0xd8a1e681, 14);
-    MD5STEP(F2, b, c, d, a, buffer_[4]  + 0xe7d3fbc8, 20);
-    MD5STEP(F2, a, b, c, d, buffer_[9]  + 0x21e1cde6,  5);
-    MD5STEP(F2, d, a, b, c, buffer_[14] + 0xc33707d6,  9);
-    MD5STEP(F2, c, d, a, b, buffer_[3]  + 0xf4d50d87, 14);
-    MD5STEP(F2, b, c, d, a, buffer_[8]  + 0x455a14ed, 20);
-    MD5STEP(F2, a, b, c, d, buffer_[13] + 0xa9e3e905,  5);
-    MD5STEP(F2, d, a, b, c, buffer_[2]  + 0xfcefa3f8,  9);
-    MD5STEP(F2, c, d, a, b, buffer_[7]  + 0x676f02d9, 14);
-    MD5STEP(F2, b, c, d, a, buffer_[12] + 0x8d2a4c8a, 20);
-
-    MD5STEP(F3, a, b, c, d, buffer_[5]  + 0xfffa3942,  4);
-    MD5STEP(F3, d, a, b, c, buffer_[8]  + 0x8771f681, 11);
-    MD5STEP(F3, c, d, a, b, buffer_[11] + 0x6d9d6122, 16);
-    MD5STEP(F3, b, c, d, a, buffer_[14] + 0xfde5380c, 23);
-    MD5STEP(F3, a, b, c, d, buffer_[1]  + 0xa4beea44,  4);
-    MD5STEP(F3, d, a, b, c, buffer_[4]  + 0x4bdecfa9, 11);
-    MD5STEP(F3, c, d, a, b, buffer_[7]  + 0xf6bb4b60, 16);
-    MD5STEP(F3, b, c, d, a, buffer_[10] + 0xbebfbc70, 23);
-    MD5STEP(F3, a, b, c, d, buffer_[13] + 0x289b7ec6,  4);
-    MD5STEP(F3, d, a, b, c, buffer_[0]  + 0xeaa127fa, 11);
-    MD5STEP(F3, c, d, a, b, buffer_[3]  + 0xd4ef3085, 16);
-    MD5STEP(F3, b, c, d, a, buffer_[6]  + 0x04881d05, 23);
-    MD5STEP(F3, a, b, c, d, buffer_[9]  + 0xd9d4d039,  4);
-    MD5STEP(F3, d, a, b, c, buffer_[12] + 0xe6db99e5, 11);
-    MD5STEP(F3, c, d, a, b, buffer_[15] + 0x1fa27cf8, 16);
-    MD5STEP(F3, b, c, d, a, buffer_[2]  + 0xc4ac5665, 23);
-
-    MD5STEP(F4, a, b, c, d, buffer_[0]  + 0xf4292244,  6);
-    MD5STEP(F4, d, a, b, c, buffer_[7]  + 0x432aff97, 10);
-    MD5STEP(F4, c, d, a, b, buffer_[14] + 0xab9423a7, 15);
-    MD5STEP(F4, b, c, d, a, buffer_[5]  + 0xfc93a039, 21);
-    MD5STEP(F4, a, b, c, d, buffer_[12] + 0x655b59c3,  6);
-    MD5STEP(F4, d, a, b, c, buffer_[3]  + 0x8f0ccc92, 10);
-    MD5STEP(F4, c, d, a, b, buffer_[10] + 0xffeff47d, 15);
-    MD5STEP(F4, b, c, d, a, buffer_[1]  + 0x85845dd1, 21);
-    MD5STEP(F4, a, b, c, d, buffer_[8]  + 0x6fa87e4f,  6);
-    MD5STEP(F4, d, a, b, c, buffer_[15] + 0xfe2ce6e0, 10);
-    MD5STEP(F4, c, d, a, b, buffer_[6]  + 0xa3014314, 15);
-    MD5STEP(F4, b, c, d, a, buffer_[13] + 0x4e0811a1, 21);
-    MD5STEP(F4, a, b, c, d, buffer_[4]  + 0xf7537e82,  6);
-    MD5STEP(F4, d, a, b, c, buffer_[11] + 0xbd3af235, 10);
-    MD5STEP(F4, c, d, a, b, buffer_[2]  + 0x2ad7d2bb, 15);
-    MD5STEP(F4, b, c, d, a, buffer_[9]  + 0xeb86d391, 21);
-    
-    // Add the working vars back into digest state[]
-    digest_[0] += a;
-    digest_[1] += b;
-    digest_[2] += c;
-    digest_[3] += d;
-
-    // Wipe variables
-    a = b = c = d = 0;
-}
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp
deleted file mode 100644
index b576d3d59d2f..000000000000
--- a/extra/yassl/taocrypt/src/misc.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's misc.cpp from CryptoPP */
-
-
-#include "runtime.hpp"
-#include "misc.hpp"
-
-
-#ifdef __GNUC__
-    #include <signal.h>
-    #include <setjmp.h>
-#endif
-
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-namespace STL = STL_NAMESPACE;
-
-
-#ifdef YASSL_PURE_C
-
-    void* operator new(size_t sz, TaoCrypt::new_t)
-    {
-        void* ptr = malloc(sz ? sz : 1);
-        if (!ptr) abort();
-
-        return ptr;
-    }
-
-
-    void operator delete(void* ptr, TaoCrypt::new_t)
-    {
-        if (ptr) free(ptr);
-    }
-
-
-    void* operator new[](size_t sz, TaoCrypt::new_t nt)
-    {
-        return ::operator new(sz, nt);
-    }
-
-
-    void operator delete[](void* ptr, TaoCrypt::new_t nt)
-    {
-        ::operator delete(ptr, nt);
-    }
-
-
-    /* uncomment to test
-    // make sure not using globals anywhere by forgetting to use overloaded
-    void* operator new(size_t sz);
-
-    void operator delete(void* ptr);
-
-    void* operator new[](size_t sz);
-
-    void operator delete[](void* ptr);
-    */
-
-
-    namespace TaoCrypt {
-
-        new_t tc;   // for library new
-
-    }
-
-#ifdef __sun
-
-// Handler for pure virtual functions
-namespace __Crun {
-    void pure_error() {
-    }
-}
-
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER) || (__GNUC__ > 2)
-
-extern "C" {
-
-    int __cxa_pure_virtual() {
-      return 0;
-    }
-
-}  // extern "C"
-
-#endif
-
-#endif // YASSL_PURE_C
-
-
-namespace TaoCrypt {
-
-
-inline void XorWords(word* r, const word* a, unsigned int n)
-{
-    for (unsigned int i=0; i<n; i++)
-        r[i] ^= a[i];
-}
-
-
-void xorbuf(byte* buf, const byte* mask, unsigned int count)
-{
-    if (((size_t)buf | (size_t)mask | count) % WORD_SIZE == 0)
-        XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
-    else
-    {
-        for (unsigned int i=0; i<count; i++)
-            buf[i] ^= mask[i];
-    }
-}
-
-
-unsigned int BytePrecision(word value)
-{
-    unsigned int i;
-    for (i=sizeof(value); i; --i)
-        if (value >> (i-1)*8)
-            break;
-
-    return i;
-}
-
-
-unsigned int BitPrecision(word value)
-{
-    if (!value)
-        return 0;
-
-    unsigned int l = 0,
-                 h = 8 * sizeof(value);
-
-    while (h-l > 1)
-    {
-        unsigned int t = (l+h)/2;
-        if (value >> t)
-            l = t;
-        else
-            h = t;
-    }
-
-    return h;
-}
-
-
-word Crop(word value, unsigned int size)
-{
-    if (size < 8*sizeof(value))
-        return (value & ((1L << size) - 1));
-    else
-        return value;
-}
-
-
-
-#ifdef TAOCRYPT_X86ASM_AVAILABLE
-
-
-bool HaveCpuId()
-{
-#ifdef _MSC_VER
-    __try
-    {
-        __asm
-        {
-            mov eax, 0
-            cpuid
-        }            
-    }
-    __except (1)
-    {
-        return false;
-    }
-    return true;
-#else
-    word32 eax, ebx;
-    __asm__ __volatile
-    (
-        /* Put EFLAGS in eax and ebx */
-        "pushf;"
-        "pushf;"
-        "pop %0;"
-        "movl %0,%1;"
-
-        /* Flip the cpuid bit and store back in EFLAGS */
-        "xorl $0x200000,%0;"
-        "push %0;"
-        "popf;"
-
-        /* Read EFLAGS again */
-        "pushf;"
-        "pop %0;"
-        "popf"
-        : "=r" (eax), "=r" (ebx)
-        :
-        : "cc"
-    );
-
-    if (eax == ebx)
-        return false;
-    return true;
-#endif
-}
-
-
-void CpuId(word32 input, word32 *output)
-{
-#ifdef __GNUC__
-    __asm__
-    (
-        // save ebx in case -fPIC is being used
-        "push %%ebx; cpuid; mov %%ebx, %%edi; pop %%ebx"
-        : "=a" (output[0]), "=D" (output[1]), "=c" (output[2]), "=d"(output[3])
-        : "a" (input)
-    );
-#else
-    __asm
-    {
-        mov eax, input
-        cpuid
-        mov edi, output
-        mov [edi], eax
-        mov [edi+4], ebx
-        mov [edi+8], ecx
-        mov [edi+12], edx
-    }
-#endif
-}
-
-
-bool IsPentium()
-{
-    if (!HaveCpuId())
-        return false;
-
-    word32 cpuid[4];
-
-    CpuId(0, cpuid);
-    STL::swap(cpuid[2], cpuid[3]);
-    if (memcmp(cpuid+1, "GenuineIntel", 12) != 0)
-        return false;
-
-    CpuId(1, cpuid);
-    byte family = ((cpuid[0] >> 8) & 0xf);
-    if (family < 5)
-        return false;
-
-    return true;
-}
-
-
-
-static bool IsMmx()
-{
-    if (!IsPentium())
-        return false;
-
-    word32 cpuid[4];
-
-    CpuId(1, cpuid);
-    if ((cpuid[3] & (1 << 23)) == 0)
-        return false;
-
-    return true;
-}
-
-
-bool isMMX = IsMmx();
-
-
-#endif // TAOCRYPT_X86ASM_AVAILABLE
-
-
-
-
-}  // namespace
-
diff --git a/extra/yassl/taocrypt/src/rabbit.cpp b/extra/yassl/taocrypt/src/rabbit.cpp
deleted file mode 100644
index 5e32f3834938..000000000000
--- a/extra/yassl/taocrypt/src/rabbit.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-#include "runtime.hpp"
-#include "rabbit.hpp"
-
-
-
-namespace TaoCrypt {
-
-
-#define U32V(x)  (word32)(x)
-
-
-#ifdef BIG_ENDIAN_ORDER
-    #define LITTLE32(x) ByteReverse((word32)x)
-#else
-    #define LITTLE32(x) (x)
-#endif
-
-
-// local
-namespace {
-
-
-/* Square a 32-bit unsigned integer to obtain the 64-bit result and return */
-/* the upper 32 bits XOR the lower 32 bits */
-word32 RABBIT_g_func(word32 x)
-{
-    /* Temporary variables */
-    word32 a, b, h, l;
-
-    /* Construct high and low argument for squaring */
-    a = x&0xFFFF;
-    b = x>>16;
-
-    /* Calculate high and low result of squaring */
-    h = (((U32V(a*a)>>17) + U32V(a*b))>>15) + b*b;
-    l = x*x;
-
-    /* Return high XOR low */
-    return U32V(h^l);
-}
-
-
-} // namespace local
-
-
-/* Calculate the next internal state */
-void Rabbit::NextState(RabbitCtx which)
-{
-    /* Temporary variables */
-    word32 g[8], c_old[8], i;
-
-    Ctx* ctx;
-
-    if (which == Master)
-        ctx = &masterCtx_;
-    else
-        ctx = &workCtx_;
-
-    /* Save old counter values */
-    for (i=0; i<8; i++)
-        c_old[i] = ctx->c[i];
-
-    /* Calculate new counter values */
-    ctx->c[0] = U32V(ctx->c[0] + 0x4D34D34D + ctx->carry);
-    ctx->c[1] = U32V(ctx->c[1] + 0xD34D34D3 + (ctx->c[0] < c_old[0]));
-    ctx->c[2] = U32V(ctx->c[2] + 0x34D34D34 + (ctx->c[1] < c_old[1]));
-    ctx->c[3] = U32V(ctx->c[3] + 0x4D34D34D + (ctx->c[2] < c_old[2]));
-    ctx->c[4] = U32V(ctx->c[4] + 0xD34D34D3 + (ctx->c[3] < c_old[3]));
-    ctx->c[5] = U32V(ctx->c[5] + 0x34D34D34 + (ctx->c[4] < c_old[4]));
-    ctx->c[6] = U32V(ctx->c[6] + 0x4D34D34D + (ctx->c[5] < c_old[5]));
-    ctx->c[7] = U32V(ctx->c[7] + 0xD34D34D3 + (ctx->c[6] < c_old[6]));
-    ctx->carry = (ctx->c[7] < c_old[7]);
-   
-    /* Calculate the g-values */
-    for (i=0;i<8;i++)
-        g[i] = RABBIT_g_func(U32V(ctx->x[i] + ctx->c[i]));
-
-    /* Calculate new state values */
-    ctx->x[0] = U32V(g[0] + rotlFixed(g[7],16) + rotlFixed(g[6], 16));
-    ctx->x[1] = U32V(g[1] + rotlFixed(g[0], 8) + g[7]);
-    ctx->x[2] = U32V(g[2] + rotlFixed(g[1],16) + rotlFixed(g[0], 16));
-    ctx->x[3] = U32V(g[3] + rotlFixed(g[2], 8) + g[1]);
-    ctx->x[4] = U32V(g[4] + rotlFixed(g[3],16) + rotlFixed(g[2], 16));
-    ctx->x[5] = U32V(g[5] + rotlFixed(g[4], 8) + g[3]);
-    ctx->x[6] = U32V(g[6] + rotlFixed(g[5],16) + rotlFixed(g[4], 16));
-    ctx->x[7] = U32V(g[7] + rotlFixed(g[6], 8) + g[5]);
-}
-
-
-/* IV setup */
-void Rabbit::SetIV(const byte* iv)
-{
-    /* Temporary variables */
-    word32 i0, i1, i2, i3, i;
-      
-    /* Generate four subvectors */
-    i0 = LITTLE32(*(word32*)(iv+0));
-    i2 = LITTLE32(*(word32*)(iv+4));
-    i1 = (i0>>16) | (i2&0xFFFF0000);
-    i3 = (i2<<16) | (i0&0x0000FFFF);
-
-    /* Modify counter values */
-    workCtx_.c[0] = masterCtx_.c[0] ^ i0;
-    workCtx_.c[1] = masterCtx_.c[1] ^ i1;
-    workCtx_.c[2] = masterCtx_.c[2] ^ i2;
-    workCtx_.c[3] = masterCtx_.c[3] ^ i3;
-    workCtx_.c[4] = masterCtx_.c[4] ^ i0;
-    workCtx_.c[5] = masterCtx_.c[5] ^ i1;
-    workCtx_.c[6] = masterCtx_.c[6] ^ i2;
-    workCtx_.c[7] = masterCtx_.c[7] ^ i3;
-
-    /* Copy state variables */
-    for (i=0; i<8; i++)
-        workCtx_.x[i] = masterCtx_.x[i];
-    workCtx_.carry = masterCtx_.carry;
-
-    /* Iterate the system four times */
-    for (i=0; i<4; i++)
-        NextState(Work);
-}
-
-
-/* Key setup */
-void Rabbit::SetKey(const byte* key, const byte* iv)
-{
-    /* Temporary variables */
-    word32 k0, k1, k2, k3, i;
-
-    /* Generate four subkeys */
-    k0 = LITTLE32(*(word32*)(key+ 0));
-    k1 = LITTLE32(*(word32*)(key+ 4));
-    k2 = LITTLE32(*(word32*)(key+ 8));
-    k3 = LITTLE32(*(word32*)(key+12));
-
-    /* Generate initial state variables */
-    masterCtx_.x[0] = k0;
-    masterCtx_.x[2] = k1;
-    masterCtx_.x[4] = k2;
-    masterCtx_.x[6] = k3;
-    masterCtx_.x[1] = U32V(k3<<16) | (k2>>16);
-    masterCtx_.x[3] = U32V(k0<<16) | (k3>>16);
-    masterCtx_.x[5] = U32V(k1<<16) | (k0>>16);
-    masterCtx_.x[7] = U32V(k2<<16) | (k1>>16);
-
-    /* Generate initial counter values */
-    masterCtx_.c[0] = rotlFixed(k2, 16);
-    masterCtx_.c[2] = rotlFixed(k3, 16);
-    masterCtx_.c[4] = rotlFixed(k0, 16);
-    masterCtx_.c[6] = rotlFixed(k1, 16);
-    masterCtx_.c[1] = (k0&0xFFFF0000) | (k1&0xFFFF);
-    masterCtx_.c[3] = (k1&0xFFFF0000) | (k2&0xFFFF);
-    masterCtx_.c[5] = (k2&0xFFFF0000) | (k3&0xFFFF);
-    masterCtx_.c[7] = (k3&0xFFFF0000) | (k0&0xFFFF);
-
-    /* Clear carry bit */
-    masterCtx_.carry = 0;
-
-    /* Iterate the system four times */
-    for (i=0; i<4; i++)
-        NextState(Master);
-
-    /* Modify the counters */
-    for (i=0; i<8; i++)
-        masterCtx_.c[i] ^= masterCtx_.x[(i+4)&0x7];
-
-    /* Copy master instance to work instance */
-    for (i=0; i<8; i++) {
-        workCtx_.x[i] = masterCtx_.x[i];
-        workCtx_.c[i] = masterCtx_.c[i];
-    }
-    workCtx_.carry = masterCtx_.carry;
-
-    if (iv) SetIV(iv);    
-}
-
-
-/* Encrypt/decrypt a message of any size */
-void Rabbit::Process(byte* output, const byte* input, word32 msglen)
-{
-    /* Temporary variables */
-    word32 i;
-
-    /* Encrypt/decrypt all full blocks */
-    while (msglen >= 16) {
-        /* Iterate the system */
-        NextState(Work);
-
-        /* Encrypt/decrypt 16 bytes of data */
-        *(word32*)(output+ 0) = *(word32*)(input+ 0) ^
-                   LITTLE32(workCtx_.x[0] ^ (workCtx_.x[5]>>16) ^
-                   U32V(workCtx_.x[3]<<16));
-        *(word32*)(output+ 4) = *(word32*)(input+ 4) ^
-                   LITTLE32(workCtx_.x[2] ^ (workCtx_.x[7]>>16) ^
-                   U32V(workCtx_.x[5]<<16));
-        *(word32*)(output+ 8) = *(word32*)(input+ 8) ^
-                   LITTLE32(workCtx_.x[4] ^ (workCtx_.x[1]>>16) ^
-                   U32V(workCtx_.x[7]<<16));
-        *(word32*)(output+12) = *(word32*)(input+12) ^
-                   LITTLE32(workCtx_.x[6] ^ (workCtx_.x[3]>>16) ^
-                   U32V(workCtx_.x[1]<<16));
-
-        /* Increment pointers and decrement length */
-        input  += 16;
-        output += 16;
-        msglen -= 16;
-    }
-
-    /* Encrypt/decrypt remaining data */
-    if (msglen) {
-
-        word32 tmp[4];
-        byte*  buffer = (byte*)tmp;
-
-        memset(tmp, 0, sizeof(tmp));   /* help static analysis */
-
-        /* Iterate the system */
-        NextState(Work);
-
-        /* Generate 16 bytes of pseudo-random data */
-        tmp[0] = LITTLE32(workCtx_.x[0] ^
-                  (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
-        tmp[1] = LITTLE32(workCtx_.x[2] ^ 
-                  (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
-        tmp[2] = LITTLE32(workCtx_.x[4] ^ 
-                  (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
-        tmp[3] = LITTLE32(workCtx_.x[6] ^ 
-                  (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
-
-        /* Encrypt/decrypt the data */
-        for (i=0; i<msglen; i++)
-            output[i] = input[i] ^ buffer[i];
-    }
-}
-
-
-}  // namespace
diff --git a/extra/yassl/taocrypt/src/random.cpp b/extra/yassl/taocrypt/src/random.cpp
deleted file mode 100644
index 26dae7d1993f..000000000000
--- a/extra/yassl/taocrypt/src/random.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* random.cpp implements a crypto secure Random Number Generator using an OS
-   specific seed, switch to /dev/random for more security but may block
-*/
-
-#include "runtime.hpp"
-#include "random.hpp"
-#include <string.h>
-#include <time.h>
-
-#if defined(_WIN32)
-    #include <windows.h>
-    #include <wincrypt.h>
-#else
-    #include <errno.h>
-    #include <fcntl.h>
-    #include <unistd.h>
-#endif // _WIN32
-
-namespace TaoCrypt {
-
-
-// Get seed and key cipher
-RandomNumberGenerator::RandomNumberGenerator()
-{
-    byte key[32];
-    byte junk[256];
-
-    seed_.GenerateSeed(key, sizeof(key));
-    cipher_.SetKey(key, sizeof(key));
-    GenerateBlock(junk, sizeof(junk));  // rid initial state
-}
-
-
-// place a generated block in output
-void RandomNumberGenerator::GenerateBlock(byte* output, word32 sz)
-{
-    memset(output, 0, sz);
-    cipher_.Process(output, output, sz);
-}
-
-
-byte RandomNumberGenerator::GenerateByte()
-{
-    byte b;
-    GenerateBlock(&b, 1);
-
-    return b;
-}
-
-
-#if defined(_WIN32)
-
-/* The OS_Seed implementation for windows */
-
-OS_Seed::OS_Seed()
-{
-    if(!CryptAcquireContext(&handle_, 0, 0, PROV_RSA_FULL,
-                             CRYPT_VERIFYCONTEXT))
-        error_.SetError(WINCRYPT_E);
-}
-
-
-OS_Seed::~OS_Seed()
-{
-    CryptReleaseContext(handle_, 0);
-}
-
-
-void OS_Seed::GenerateSeed(byte* output, word32 sz)
-{
-    if (!CryptGenRandom(handle_, sz, output))
-        error_.SetError(CRYPTGEN_E);
-}
-
-
-#else
-
-/* The default OS_Seed implementation */
-
-OS_Seed::OS_Seed()
-{
-    fd_ = open("/dev/urandom",O_RDONLY);
-    if (fd_ == -1) {
-        fd_ = open("/dev/random",O_RDONLY);
-        if (fd_ == -1)
-            error_.SetError(OPEN_RAN_E);
-    }
-}
-
-
-OS_Seed::~OS_Seed() 
-{
-    close(fd_);
-}
-
-
-// may block
-void OS_Seed::GenerateSeed(byte* output, word32 sz)
-{
-    while (sz) {
-        int len = read(fd_, output, sz);
-        if (len == -1) {
-            error_.SetError(READ_RAN_E);
-            return;
-        }
-
-        sz     -= len;
-        output += len;
-
-        if (sz)
-            sleep(1);
-    }
-}
-
-#endif // _WIN32
-
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/ripemd.cpp b/extra/yassl/taocrypt/src/ripemd.cpp
deleted file mode 100644
index 5d03dc61cd61..000000000000
--- a/extra/yassl/taocrypt/src/ripemd.cpp
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/* based on Wei Dai's ripemd.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "ripemd.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-
-namespace TaoCrypt {
-
-void RIPEMD160::Init()
-{
-    digest_[0] = 0x67452301L;
-    digest_[1] = 0xefcdab89L;
-    digest_[2] = 0x98badcfeL;
-    digest_[3] = 0x10325476L;
-    digest_[4] = 0xc3d2e1f0L;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-RIPEMD160::RIPEMD160(const RIPEMD160& that)
-    : HASHwithTransform(DIGEST_SIZE / sizeof(word32), BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-
-RIPEMD160& RIPEMD160::operator= (const RIPEMD160& that)
-{
-    RIPEMD160 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-void RIPEMD160::Swap(RIPEMD160& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-#ifdef DO_RIPEMD_ASM
-
-// Update digest with data of size len
-void RIPEMD160::Update(const byte* data, word32 len)
-{
-    if (!isMMX) {
-        HASHwithTransform::Update(data, len);
-        return;
-    }
-
-    byte* local = reinterpret_cast<byte*>(buffer_);
-
-    // remove buffered data if possible
-    if (buffLen_)  {   
-        word32 add = min(len, BLOCK_SIZE - buffLen_);
-        memcpy(&local[buffLen_], data, add);
-
-        buffLen_ += add;
-        data     += add;
-        len      -= add;
-
-        if (buffLen_ == BLOCK_SIZE) {
-            Transform();
-            AddLength(BLOCK_SIZE);
-            buffLen_ = 0;
-        }
-    }
-
-    // all at once for asm
-    if (buffLen_ == 0) {
-        word32 times = len / BLOCK_SIZE;
-        if (times) {
-            AsmTransform(data, times);
-            const word32 add = BLOCK_SIZE * times;
-            AddLength(add);
-            len  -= add;
-            data += add;
-        }
-    }
-
-    // cache any data left
-    if (len) {
-        memcpy(&local[buffLen_], data, len);
-        buffLen_ += len;
-    }
-}
-
-#endif // DO_RIPEMD_ASM
-
-
-// for all
-#define F(x, y, z)    (x ^ y ^ z) 
-#define G(x, y, z)    (z ^ (x & (y^z)))
-#define H(x, y, z)    (z ^ (x | ~y))
-#define I(x, y, z)    (y ^ (z & (x^y)))
-#define J(x, y, z)    (x ^ (y | ~z))
-
-#define k0 0
-#define k1 0x5a827999
-#define k2 0x6ed9eba1
-#define k3 0x8f1bbcdc
-#define k4 0xa953fd4e
-#define k5 0x50a28be6
-#define k6 0x5c4dd124
-#define k7 0x6d703ef3
-#define k8 0x7a6d76e9
-#define k9 0
-
-// for 160 and 320
-#define Subround(f, a, b, c, d, e, x, s, k) \
-    a += f(b, c, d) + x + k;\
-    a = rotlFixed((word32)a, s) + e;\
-    c = rotlFixed((word32)c, 10U)
-
-
-void RIPEMD160::Transform()
-{
-    unsigned long a1, b1, c1, d1, e1, a2, b2, c2, d2, e2;
-    a1 = a2 = digest_[0];
-    b1 = b2 = digest_[1];
-    c1 = c2 = digest_[2];
-    d1 = d2 = digest_[3];
-    e1 = e2 = digest_[4];
-
-    Subround(F, a1, b1, c1, d1, e1, buffer_[ 0], 11, k0);
-    Subround(F, e1, a1, b1, c1, d1, buffer_[ 1], 14, k0);
-    Subround(F, d1, e1, a1, b1, c1, buffer_[ 2], 15, k0);
-    Subround(F, c1, d1, e1, a1, b1, buffer_[ 3], 12, k0);
-    Subround(F, b1, c1, d1, e1, a1, buffer_[ 4],  5, k0);
-    Subround(F, a1, b1, c1, d1, e1, buffer_[ 5],  8, k0);
-    Subround(F, e1, a1, b1, c1, d1, buffer_[ 6],  7, k0);
-    Subround(F, d1, e1, a1, b1, c1, buffer_[ 7],  9, k0);
-    Subround(F, c1, d1, e1, a1, b1, buffer_[ 8], 11, k0);
-    Subround(F, b1, c1, d1, e1, a1, buffer_[ 9], 13, k0);
-    Subround(F, a1, b1, c1, d1, e1, buffer_[10], 14, k0);
-    Subround(F, e1, a1, b1, c1, d1, buffer_[11], 15, k0);
-    Subround(F, d1, e1, a1, b1, c1, buffer_[12],  6, k0);
-    Subround(F, c1, d1, e1, a1, b1, buffer_[13],  7, k0);
-    Subround(F, b1, c1, d1, e1, a1, buffer_[14],  9, k0);
-    Subround(F, a1, b1, c1, d1, e1, buffer_[15],  8, k0);
-
-    Subround(G, e1, a1, b1, c1, d1, buffer_[ 7],  7, k1);
-    Subround(G, d1, e1, a1, b1, c1, buffer_[ 4],  6, k1);
-    Subround(G, c1, d1, e1, a1, b1, buffer_[13],  8, k1);
-    Subround(G, b1, c1, d1, e1, a1, buffer_[ 1], 13, k1);
-    Subround(G, a1, b1, c1, d1, e1, buffer_[10], 11, k1);
-    Subround(G, e1, a1, b1, c1, d1, buffer_[ 6],  9, k1);
-    Subround(G, d1, e1, a1, b1, c1, buffer_[15],  7, k1);
-    Subround(G, c1, d1, e1, a1, b1, buffer_[ 3], 15, k1);
-    Subround(G, b1, c1, d1, e1, a1, buffer_[12],  7, k1);
-    Subround(G, a1, b1, c1, d1, e1, buffer_[ 0], 12, k1);
-    Subround(G, e1, a1, b1, c1, d1, buffer_[ 9], 15, k1);
-    Subround(G, d1, e1, a1, b1, c1, buffer_[ 5],  9, k1);
-    Subround(G, c1, d1, e1, a1, b1, buffer_[ 2], 11, k1);
-    Subround(G, b1, c1, d1, e1, a1, buffer_[14],  7, k1);
-    Subround(G, a1, b1, c1, d1, e1, buffer_[11], 13, k1);
-    Subround(G, e1, a1, b1, c1, d1, buffer_[ 8], 12, k1);
-
-    Subround(H, d1, e1, a1, b1, c1, buffer_[ 3], 11, k2);
-    Subround(H, c1, d1, e1, a1, b1, buffer_[10], 13, k2);
-    Subround(H, b1, c1, d1, e1, a1, buffer_[14],  6, k2);
-    Subround(H, a1, b1, c1, d1, e1, buffer_[ 4],  7, k2);
-    Subround(H, e1, a1, b1, c1, d1, buffer_[ 9], 14, k2);
-    Subround(H, d1, e1, a1, b1, c1, buffer_[15],  9, k2);
-    Subround(H, c1, d1, e1, a1, b1, buffer_[ 8], 13, k2);
-    Subround(H, b1, c1, d1, e1, a1, buffer_[ 1], 15, k2);
-    Subround(H, a1, b1, c1, d1, e1, buffer_[ 2], 14, k2);
-    Subround(H, e1, a1, b1, c1, d1, buffer_[ 7],  8, k2);
-    Subround(H, d1, e1, a1, b1, c1, buffer_[ 0], 13, k2);
-    Subround(H, c1, d1, e1, a1, b1, buffer_[ 6],  6, k2);
-    Subround(H, b1, c1, d1, e1, a1, buffer_[13],  5, k2);
-    Subround(H, a1, b1, c1, d1, e1, buffer_[11], 12, k2);
-    Subround(H, e1, a1, b1, c1, d1, buffer_[ 5],  7, k2);
-    Subround(H, d1, e1, a1, b1, c1, buffer_[12],  5, k2);
-
-    Subround(I, c1, d1, e1, a1, b1, buffer_[ 1], 11, k3);
-    Subround(I, b1, c1, d1, e1, a1, buffer_[ 9], 12, k3);
-    Subround(I, a1, b1, c1, d1, e1, buffer_[11], 14, k3);
-    Subround(I, e1, a1, b1, c1, d1, buffer_[10], 15, k3);
-    Subround(I, d1, e1, a1, b1, c1, buffer_[ 0], 14, k3);
-    Subround(I, c1, d1, e1, a1, b1, buffer_[ 8], 15, k3);
-    Subround(I, b1, c1, d1, e1, a1, buffer_[12],  9, k3);
-    Subround(I, a1, b1, c1, d1, e1, buffer_[ 4],  8, k3);
-    Subround(I, e1, a1, b1, c1, d1, buffer_[13],  9, k3);
-    Subround(I, d1, e1, a1, b1, c1, buffer_[ 3], 14, k3);
-    Subround(I, c1, d1, e1, a1, b1, buffer_[ 7],  5, k3);
-    Subround(I, b1, c1, d1, e1, a1, buffer_[15],  6, k3);
-    Subround(I, a1, b1, c1, d1, e1, buffer_[14],  8, k3);
-    Subround(I, e1, a1, b1, c1, d1, buffer_[ 5],  6, k3);
-    Subround(I, d1, e1, a1, b1, c1, buffer_[ 6],  5, k3);
-    Subround(I, c1, d1, e1, a1, b1, buffer_[ 2], 12, k3);
-
-    Subround(J, b1, c1, d1, e1, a1, buffer_[ 4],  9, k4);
-    Subround(J, a1, b1, c1, d1, e1, buffer_[ 0], 15, k4);
-    Subround(J, e1, a1, b1, c1, d1, buffer_[ 5],  5, k4);
-    Subround(J, d1, e1, a1, b1, c1, buffer_[ 9], 11, k4);
-    Subround(J, c1, d1, e1, a1, b1, buffer_[ 7],  6, k4);
-    Subround(J, b1, c1, d1, e1, a1, buffer_[12],  8, k4);
-    Subround(J, a1, b1, c1, d1, e1, buffer_[ 2], 13, k4);
-    Subround(J, e1, a1, b1, c1, d1, buffer_[10], 12, k4);
-    Subround(J, d1, e1, a1, b1, c1, buffer_[14],  5, k4);
-    Subround(J, c1, d1, e1, a1, b1, buffer_[ 1], 12, k4);
-    Subround(J, b1, c1, d1, e1, a1, buffer_[ 3], 13, k4);
-    Subround(J, a1, b1, c1, d1, e1, buffer_[ 8], 14, k4);
-    Subround(J, e1, a1, b1, c1, d1, buffer_[11], 11, k4);
-    Subround(J, d1, e1, a1, b1, c1, buffer_[ 6],  8, k4);
-    Subround(J, c1, d1, e1, a1, b1, buffer_[15],  5, k4);
-    Subround(J, b1, c1, d1, e1, a1, buffer_[13],  6, k4);
-
-    Subround(J, a2, b2, c2, d2, e2, buffer_[ 5],  8, k5);
-    Subround(J, e2, a2, b2, c2, d2, buffer_[14],  9, k5);
-    Subround(J, d2, e2, a2, b2, c2, buffer_[ 7],  9, k5);
-    Subround(J, c2, d2, e2, a2, b2, buffer_[ 0], 11, k5);
-    Subround(J, b2, c2, d2, e2, a2, buffer_[ 9], 13, k5);
-    Subround(J, a2, b2, c2, d2, e2, buffer_[ 2], 15, k5);
-    Subround(J, e2, a2, b2, c2, d2, buffer_[11], 15, k5);
-    Subround(J, d2, e2, a2, b2, c2, buffer_[ 4],  5, k5);
-    Subround(J, c2, d2, e2, a2, b2, buffer_[13],  7, k5);
-    Subround(J, b2, c2, d2, e2, a2, buffer_[ 6],  7, k5);
-    Subround(J, a2, b2, c2, d2, e2, buffer_[15],  8, k5);
-    Subround(J, e2, a2, b2, c2, d2, buffer_[ 8], 11, k5);
-    Subround(J, d2, e2, a2, b2, c2, buffer_[ 1], 14, k5);
-    Subround(J, c2, d2, e2, a2, b2, buffer_[10], 14, k5);
-    Subround(J, b2, c2, d2, e2, a2, buffer_[ 3], 12, k5);
-    Subround(J, a2, b2, c2, d2, e2, buffer_[12],  6, k5);
-
-    Subround(I, e2, a2, b2, c2, d2, buffer_[ 6],  9, k6); 
-    Subround(I, d2, e2, a2, b2, c2, buffer_[11], 13, k6);
-    Subround(I, c2, d2, e2, a2, b2, buffer_[ 3], 15, k6);
-    Subround(I, b2, c2, d2, e2, a2, buffer_[ 7],  7, k6);
-    Subround(I, a2, b2, c2, d2, e2, buffer_[ 0], 12, k6);
-    Subround(I, e2, a2, b2, c2, d2, buffer_[13],  8, k6);
-    Subround(I, d2, e2, a2, b2, c2, buffer_[ 5],  9, k6);
-    Subround(I, c2, d2, e2, a2, b2, buffer_[10], 11, k6);
-    Subround(I, b2, c2, d2, e2, a2, buffer_[14],  7, k6);
-    Subround(I, a2, b2, c2, d2, e2, buffer_[15],  7, k6);
-    Subround(I, e2, a2, b2, c2, d2, buffer_[ 8], 12, k6);
-    Subround(I, d2, e2, a2, b2, c2, buffer_[12],  7, k6);
-    Subround(I, c2, d2, e2, a2, b2, buffer_[ 4],  6, k6);
-    Subround(I, b2, c2, d2, e2, a2, buffer_[ 9], 15, k6);
-    Subround(I, a2, b2, c2, d2, e2, buffer_[ 1], 13, k6);
-    Subround(I, e2, a2, b2, c2, d2, buffer_[ 2], 11, k6);
-
-    Subround(H, d2, e2, a2, b2, c2, buffer_[15],  9, k7);
-    Subround(H, c2, d2, e2, a2, b2, buffer_[ 5],  7, k7);
-    Subround(H, b2, c2, d2, e2, a2, buffer_[ 1], 15, k7);
-    Subround(H, a2, b2, c2, d2, e2, buffer_[ 3], 11, k7);
-    Subround(H, e2, a2, b2, c2, d2, buffer_[ 7],  8, k7);
-    Subround(H, d2, e2, a2, b2, c2, buffer_[14],  6, k7);
-    Subround(H, c2, d2, e2, a2, b2, buffer_[ 6],  6, k7);
-    Subround(H, b2, c2, d2, e2, a2, buffer_[ 9], 14, k7);
-    Subround(H, a2, b2, c2, d2, e2, buffer_[11], 12, k7);
-    Subround(H, e2, a2, b2, c2, d2, buffer_[ 8], 13, k7);
-    Subround(H, d2, e2, a2, b2, c2, buffer_[12],  5, k7);
-    Subround(H, c2, d2, e2, a2, b2, buffer_[ 2], 14, k7);
-    Subround(H, b2, c2, d2, e2, a2, buffer_[10], 13, k7);
-    Subround(H, a2, b2, c2, d2, e2, buffer_[ 0], 13, k7);
-    Subround(H, e2, a2, b2, c2, d2, buffer_[ 4],  7, k7);
-    Subround(H, d2, e2, a2, b2, c2, buffer_[13],  5, k7);
-
-    Subround(G, c2, d2, e2, a2, b2, buffer_[ 8], 15, k8);
-    Subround(G, b2, c2, d2, e2, a2, buffer_[ 6],  5, k8);
-    Subround(G, a2, b2, c2, d2, e2, buffer_[ 4],  8, k8);
-    Subround(G, e2, a2, b2, c2, d2, buffer_[ 1], 11, k8);
-    Subround(G, d2, e2, a2, b2, c2, buffer_[ 3], 14, k8);
-    Subround(G, c2, d2, e2, a2, b2, buffer_[11], 14, k8);
-    Subround(G, b2, c2, d2, e2, a2, buffer_[15],  6, k8);
-    Subround(G, a2, b2, c2, d2, e2, buffer_[ 0], 14, k8);
-    Subround(G, e2, a2, b2, c2, d2, buffer_[ 5],  6, k8);
-    Subround(G, d2, e2, a2, b2, c2, buffer_[12],  9, k8);
-    Subround(G, c2, d2, e2, a2, b2, buffer_[ 2], 12, k8);
-    Subround(G, b2, c2, d2, e2, a2, buffer_[13],  9, k8);
-    Subround(G, a2, b2, c2, d2, e2, buffer_[ 9], 12, k8);
-    Subround(G, e2, a2, b2, c2, d2, buffer_[ 7],  5, k8);
-    Subround(G, d2, e2, a2, b2, c2, buffer_[10], 15, k8);
-    Subround(G, c2, d2, e2, a2, b2, buffer_[14],  8, k8);
-
-    Subround(F, b2, c2, d2, e2, a2, buffer_[12],  8, k9);
-    Subround(F, a2, b2, c2, d2, e2, buffer_[15],  5, k9);
-    Subround(F, e2, a2, b2, c2, d2, buffer_[10], 12, k9);
-    Subround(F, d2, e2, a2, b2, c2, buffer_[ 4],  9, k9);
-    Subround(F, c2, d2, e2, a2, b2, buffer_[ 1], 12, k9);
-    Subround(F, b2, c2, d2, e2, a2, buffer_[ 5],  5, k9);
-    Subround(F, a2, b2, c2, d2, e2, buffer_[ 8], 14, k9);
-    Subround(F, e2, a2, b2, c2, d2, buffer_[ 7],  6, k9);
-    Subround(F, d2, e2, a2, b2, c2, buffer_[ 6],  8, k9);
-    Subround(F, c2, d2, e2, a2, b2, buffer_[ 2], 13, k9);
-    Subround(F, b2, c2, d2, e2, a2, buffer_[13],  6, k9);
-    Subround(F, a2, b2, c2, d2, e2, buffer_[14],  5, k9);
-    Subround(F, e2, a2, b2, c2, d2, buffer_[ 0], 15, k9);
-    Subround(F, d2, e2, a2, b2, c2, buffer_[ 3], 13, k9);
-    Subround(F, c2, d2, e2, a2, b2, buffer_[ 9], 11, k9);
-    Subround(F, b2, c2, d2, e2, a2, buffer_[11], 11, k9);
-
-    c1         = digest_[1] + c1 + d2;
-    digest_[1] = digest_[2] + d1 + e2;
-    digest_[2] = digest_[3] + e1 + a2;
-    digest_[3] = digest_[4] + a1 + b2;
-    digest_[4] = digest_[0] + b1 + c2;
-    digest_[0] = c1;
-}
-
-
-#ifdef DO_RIPEMD_ASM
-
-/*
-    // F(x ^ y ^ z)
-    // place in esi
-#define ASMF(x, y, z)  \
-    AS2(    mov   esi, x                )   \
-    AS2(    xor   esi, y                )   \
-    AS2(    xor   esi, z                )
-
-
-    // G(z ^ (x & (y^z)))
-    // place in esi
-#define ASMG(x, y, z)  \
-    AS2(    mov   esi, z                )   \
-    AS2(    xor   esi, y                )   \
-    AS2(    and   esi, x                )   \
-    AS2(    xor   esi, z                )
-
-    
-    // H(z ^ (x | ~y))
-    // place in esi
-#define ASMH(x, y, z) \
-    AS2(    mov   esi, y                )   \
-    AS1(    not   esi                   )   \
-    AS2(     or   esi, x                )   \
-    AS2(    xor   esi, z                )
-
-
-    // I(y ^ (z & (x^y)))
-    // place in esi
-#define ASMI(x, y, z)  \
-    AS2(    mov   esi, y                )   \
-    AS2(    xor   esi, x                )   \
-    AS2(    and   esi, z                )   \
-    AS2(    xor   esi, y                )
-
-
-    // J(x ^ (y | ~z)))
-    // place in esi
-#define ASMJ(x, y, z)   \
-    AS2(    mov   esi, z                )   \
-    AS1(    not   esi                   )   \
-    AS2(     or   esi, y                )   \
-    AS2(    xor   esi, x                )
-
-
-// for 160 and 320
-// #define ASMSubround(f, a, b, c, d, e, i, s, k) 
-//    a += f(b, c, d) + data[i] + k;
-//    a = rotlFixed((word32)a, s) + e;
-//    c = rotlFixed((word32)c, 10U)
-
-#define ASMSubround(f, a, b, c, d, e, index, s, k) \
-    // a += f(b, c, d) + data[i] + k                    \
-    AS2(    mov   esp, [edi + index * 4]            )   \
-    f(b, c, d)                                          \
-    AS2(    add   esi, k                            )   \
-    AS2(    add   esi, esp                          )   \
-    AS2(    add     a, esi                          )   \
-    // a = rotlFixed((word32)a, s) + e                  \
-    AS2(    rol     a, s                            )   \
-    AS2(    rol     c, 10                           )   \
-    // c = rotlFixed((word32)c, 10U)                    \
-    AS2(    add     a, e                            )
-*/
-
-
-// combine F into subround w/ setup
-// esi already has c, setup for next round when done
-// esp already has edi[index], setup for next round when done
-
-#define ASMSubroundF(a, b, c, d, e, index, s) \
-    /* a += (b ^ c ^ d) + data[i] + k  */               \
-    AS2(    xor   esi, b                            )   \
-    AS2(    add     a, [edi + index * 4]            )   \
-    AS2(    xor   esi, d                            )   \
-    AS2(    add     a, esi                          )   \
-    /* a = rotlFixed((word32)a, s) + e */               \
-    AS2(    mov   esi, b                            )   \
-    AS2(    rol     a, s                            )   \
-    /* c = rotlFixed((word32)c, 10U) */                 \
-    AS2(    rol     c, 10                           )   \
-    AS2(    add     a, e                            )
-
-
-// combine G into subround w/ setup
-// esi already has c, setup for next round when done
-// esp already has edi[index], setup for next round when done
-
-#define ASMSubroundG(a, b, c, d, e, index, s, k) \
-    /* a += (d ^ (b & (c^d))) + data[i] + k  */         \
-    AS2(    xor   esi, d                            )   \
-    AS2(    and   esi, b                            )   \
-    AS2(    add     a, [edi + index * 4]            )   \
-    AS2(    xor   esi, d                            )   \
-    AS2(    lea     a, [esi + a + k]                )   \
-    /* a = rotlFixed((word32)a, s) + e */               \
-    AS2(    mov   esi, b                            )   \
-    AS2(    rol     a, s                            )   \
-    /* c = rotlFixed((word32)c, 10U) */                 \
-    AS2(    rol     c, 10                           )   \
-    AS2(    add     a, e                            )
-
-
-// combine H into subround w/ setup
-// esi already has c, setup for next round when done
-// esp already has edi[index], setup for next round when done
-
-#define ASMSubroundH(a, b, c, d, e, index, s, k) \
-    /* a += (d ^ (b | ~c)) + data[i] + k  */            \
-    AS1(    not   esi                               )   \
-    AS2(     or   esi, b                            )   \
-    AS2(    add     a, [edi + index * 4]            )   \
-    AS2(    xor   esi, d                            )   \
-    AS2(    lea     a, [esi + a + k]                )   \
-    /* a = rotlFixed((word32)a, s) + e */               \
-    AS2(    mov   esi, b                            )   \
-    AS2(    rol     a, s                            )   \
-    /* c = rotlFixed((word32)c, 10U) */                 \
-    AS2(    rol     c, 10                           )   \
-    AS2(    add     a, e                            )
-
-
-// combine I into subround w/ setup
-// esi already has c, setup for next round when done
-// esp already has edi[index], setup for next round when done
-
-#define ASMSubroundI(a, b, c, d, e, index, s, k) \
-    /* a += (c ^ (d & (b^c))) + data[i] + k  */         \
-    AS2(    xor   esi, b                            )   \
-    AS2(    and   esi, d                            )   \
-    AS2(    add     a, [edi + index * 4]            )   \
-    AS2(    xor   esi, c                            )   \
-    AS2(    lea     a, [esi + a + k]                )   \
-    /* a = rotlFixed((word32)a, s) + e */               \
-    AS2(    mov   esi, b                            )   \
-    AS2(    rol     a, s                            )   \
-    /* c = rotlFixed((word32)c, 10U) */                 \
-    AS2(    rol     c, 10                           )   \
-    AS2(    add     a, e                            )
-
-
-// combine J into subround w/ setup
-// esi already has d, setup for next round when done
-// esp already has edi[index], setup for next round when done
-
-#define ASMSubroundJ(a, b, c, d, e, index, s, k) \
-    /* a += (b ^ (c | ~d))) + data[i] + k  */           \
-    AS1(    not   esi                               )   \
-    AS2(     or   esi, c                            )   \
-    /* c = rotlFixed((word32)c, 10U) */                 \
-    AS2(    add     a, [edi + index * 4]            )   \
-    AS2(    xor   esi, b                            )   \
-    AS2(    rol     c, 10                           )   \
-    AS2(    lea     a, [esi + a + k]                )   \
-    /* a = rotlFixed((word32)a, s) + e */               \
-    AS2(    rol     a, s                            )   \
-    AS2(    mov   esi, c                            )   \
-    AS2(    add     a, e                            )
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void RIPEMD160::AsmTransform(const byte* data, word32 times)
-{
-#ifdef __GNUC__
-    #define AS1(x)    #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-
-    #define PROLOG()  \
-    __asm__ __volatile__ \
-    ( \
-        ".intel_syntax noprefix;" \
-        "push ebx;" \
-        "push ebp;"
-    #define EPILOG()  \
-        "pop ebp;" \
-        "pop ebx;" \
-       	"emms;" \
-       	".att_syntax;" \
-            : \
-            : "c" (this), "D" (data), "d" (times) \
-            : "%esi", "%eax", "memory", "cc" \
-    );
-
-#else
-    #define AS1(x)    __asm x
-    #define AS2(x, y) __asm x, y
-
-    #define PROLOG() \
-        AS1(    push  ebp                       )   \
-        AS2(    mov   ebp, esp                  )   \
-        AS2(    movd  mm3, edi                  )   \
-        AS2(    movd  mm4, ebx                  )   \
-        AS2(    movd  mm5, esi                  )   \
-        AS2(    movd  mm6, ebp                  )   \
-        AS2(    mov   edi, DWORD PTR [ebp +  8] )   \
-        AS2(    mov   edx, DWORD PTR [ebp + 12] )
-
-    #define EPILOG() \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS1(    pop   ebp                       )   \
-        AS1(    emms                            )   \
-        AS1(    ret   8                         )
-        
-#endif
-
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    lea   esi, [ecx + 20]               )   // digest_[0]
-    #else
-        AS2(    lea   esi, [ecx + 16]               )   // digest_[0]
-    #endif
-
-    AS2(    sub   esp, 24               )   // make room for tmp a1 - e1
-    AS2(    movd  mm1, esi              )   // store digest_
-    
-#ifdef _MSC_VER
-    AS1( loopStart: )  // loopStart
-#else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
-#endif
-
-    AS2(    movd  mm2, edx              )   // store times_
-
-    AS2(    mov   eax, [esi]            )   // a1
-    AS2(    mov   ebx, [esi +  4]       )   // b1
-    AS2(    mov   ecx, [esi +  8]       )   // c1
-    AS2(    mov   edx, [esi + 12]       )   // d1
-    AS2(    mov   ebp, [esi + 16]       )   // e1
-
-    // setup 
-    AS2(    mov   esi, ecx      )
-
-    ASMSubroundF( eax, ebx, ecx, edx, ebp,  0, 11)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx,  1, 14)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx,  2, 15)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx,  3, 12)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax,  4,  5)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp,  5,  8)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx,  6,  7)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx,  7,  9)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx,  8, 11)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax,  9, 13)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp, 10, 14)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx, 11, 15)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx, 12,  6)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx, 13,  7)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax, 14,  9)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp, 15,  8)
-
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  7,  7, k1)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx,  4,  6, k1)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx, 13,  8, k1)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax,  1, 13, k1)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp, 10, 11, k1)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  6,  9, k1)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx, 15,  7, k1)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx,  3, 15, k1)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax, 12,  7, k1)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp,  0, 12, k1)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  9, 15, k1)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx,  5,  9, k1)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx,  2, 11, k1)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax, 14,  7, k1)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp, 11, 13, k1)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  8, 12, k1)
-
-    ASMSubroundH( edx, ebp, eax, ebx, ecx,  3, 11, k2)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx, 10, 13, k2)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax, 14,  6, k2)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp,  4,  7, k2)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  9, 14, k2)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 15,  9, k2)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx,  8, 13, k2)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax,  1, 15, k2)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp,  2, 14, k2)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  7,  8, k2)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx,  0, 13, k2)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx,  6,  6, k2)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax, 13,  5, k2)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp, 11, 12, k2)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  5,  7, k2)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 12,  5, k2)
-
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  1, 11, k3)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax,  9, 12, k3)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp, 11, 14, k3)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx, 10, 15, k3)
-    ASMSubroundI( edx, ebp, eax, ebx, ecx,  0, 14, k3)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  8, 15, k3)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax, 12,  9, k3)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp,  4,  8, k3)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx, 13,  9, k3)
-    ASMSubroundI( edx, ebp, eax, ebx, ecx,  3, 14, k3)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  7,  5, k3)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax, 15,  6, k3)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp, 14,  8, k3)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx,  5,  6, k3)
-    ASMSubroundI( edx, ebp, eax, ebx, ecx,  6,  5, k3)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  2, 12, k3)
-
-    // setup
-    AS2(    mov   esi, ebp      )
-
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax,  4,  9, k4)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp,  0, 15, k4)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx,  5,  5, k4)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx,  9, 11, k4)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx,  7,  6, k4)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax, 12,  8, k4)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp,  2, 13, k4)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx, 10, 12, k4)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx, 14,  5, k4)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx,  1, 12, k4)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax,  3, 13, k4)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp,  8, 14, k4)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx, 11, 11, k4)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx,  6,  8, k4)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx, 15,  5, k4)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax, 13,  6, k4)
-
-    // store a1 - e1 on stack
-    AS2(    movd  esi, mm1              )   // digest_
-
-    AS2(    mov   [esp],      eax       )
-    AS2(    mov   [esp +  4], ebx       )
-    AS2(    mov   [esp +  8], ecx       )
-    AS2(    mov   [esp + 12], edx       )
-    AS2(    mov   [esp + 16], ebp       )
-
-    AS2(    mov   eax, [esi]            )   // a2
-    AS2(    mov   ebx, [esi +  4]       )   // b2
-    AS2(    mov   ecx, [esi +  8]       )   // c2
-    AS2(    mov   edx, [esi + 12]       )   // d2
-    AS2(    mov   ebp, [esi + 16]       )   // e2
-
-
-    // setup
-    AS2(    mov   esi, edx      )
-
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp,  5,  8, k5)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx, 14,  9, k5)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx,  7,  9, k5)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx,  0, 11, k5)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax,  9, 13, k5)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp,  2, 15, k5)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx, 11, 15, k5)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx,  4,  5, k5)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx, 13,  7, k5)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax,  6,  7, k5)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp, 15,  8, k5)
-    ASMSubroundJ( ebp, eax, ebx, ecx, edx,  8, 11, k5)
-    ASMSubroundJ( edx, ebp, eax, ebx, ecx,  1, 14, k5)
-    ASMSubroundJ( ecx, edx, ebp, eax, ebx, 10, 14, k5)
-    ASMSubroundJ( ebx, ecx, edx, ebp, eax,  3, 12, k5)
-    ASMSubroundJ( eax, ebx, ecx, edx, ebp, 12,  6, k5)
-
-    // setup
-    AS2(    mov   esi, ebx      )
-
-    ASMSubroundI( ebp, eax, ebx, ecx, edx,  6,  9, k6) 
-    ASMSubroundI( edx, ebp, eax, ebx, ecx, 11, 13, k6)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  3, 15, k6)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax,  7,  7, k6)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp,  0, 12, k6)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx, 13,  8, k6)
-    ASMSubroundI( edx, ebp, eax, ebx, ecx,  5,  9, k6)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx, 10, 11, k6)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax, 14,  7, k6)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp, 15,  7, k6)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx,  8, 12, k6)
-    ASMSubroundI( edx, ebp, eax, ebx, ecx, 12,  7, k6)
-    ASMSubroundI( ecx, edx, ebp, eax, ebx,  4,  6, k6)
-    ASMSubroundI( ebx, ecx, edx, ebp, eax,  9, 15, k6)
-    ASMSubroundI( eax, ebx, ecx, edx, ebp,  1, 13, k6)
-    ASMSubroundI( ebp, eax, ebx, ecx, edx,  2, 11, k6)
-
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 15,  9, k7)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx,  5,  7, k7)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax,  1, 15, k7)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp,  3, 11, k7)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  7,  8, k7)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 14,  6, k7)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx,  6,  6, k7)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax,  9, 14, k7)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp, 11, 12, k7)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  8, 13, k7)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 12,  5, k7)
-    ASMSubroundH( ecx, edx, ebp, eax, ebx,  2, 14, k7)
-    ASMSubroundH( ebx, ecx, edx, ebp, eax, 10, 13, k7)
-    ASMSubroundH( eax, ebx, ecx, edx, ebp,  0, 13, k7)
-    ASMSubroundH( ebp, eax, ebx, ecx, edx,  4,  7, k7)
-    ASMSubroundH( edx, ebp, eax, ebx, ecx, 13,  5, k7)
-
-    ASMSubroundG( ecx, edx, ebp, eax, ebx,  8, 15, k8)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax,  6,  5, k8)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp,  4,  8, k8)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  1, 11, k8)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx,  3, 14, k8)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx, 11, 14, k8)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax, 15,  6, k8)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp,  0, 14, k8)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  5,  6, k8)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx, 12,  9, k8)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx,  2, 12, k8)
-    ASMSubroundG( ebx, ecx, edx, ebp, eax, 13,  9, k8)
-    ASMSubroundG( eax, ebx, ecx, edx, ebp,  9, 12, k8)
-    ASMSubroundG( ebp, eax, ebx, ecx, edx,  7,  5, k8)
-    ASMSubroundG( edx, ebp, eax, ebx, ecx, 10, 15, k8)
-    ASMSubroundG( ecx, edx, ebp, eax, ebx, 14,  8, k8)
-
-    ASMSubroundF( ebx, ecx, edx, ebp, eax, 12,  8)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp, 15,  5)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx, 10, 12)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx,  4,  9)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx,  1, 12)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax,  5,  5)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp,  8, 14)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx,  7,  6)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx,  6,  8)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx,  2, 13)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax, 13,  6)
-    ASMSubroundF( eax, ebx, ecx, edx, ebp, 14,  5)
-    ASMSubroundF( ebp, eax, ebx, ecx, edx,  0, 15)
-    ASMSubroundF( edx, ebp, eax, ebx, ecx,  3, 13)
-    ASMSubroundF( ecx, edx, ebp, eax, ebx,  9, 11)
-    ASMSubroundF( ebx, ecx, edx, ebp, eax, 11, 11)
-
-    // advance data and store for next round
-    AS2(    add   edi, 64                       )
-    AS2(    movd  esi, mm1                      )   // digest_
-    AS2(    movd  mm0, edi                      )   // store
-
-    // now edi as tmp
-
-    // c1         = digest_[1] + c1 + d2;
-    AS2(    add   [esp +  8], edx               )   // + d2
-    AS2(    mov   edi, [esi + 4]                )   // digest_[1]
-    AS2(    add   [esp +  8], edi               )
-
-    // digest_[1] = digest_[2] + d1 + e2;
-    AS2(    mov   [esi + 4], ebp                )   // e2
-    AS2(    mov   edi, [esp + 12]               )   // d1
-    AS2(    add   edi, [esi + 8]                )   // digest_[2]
-    AS2(    add   [esi + 4], edi                )
-
-    // digest_[2] = digest_[3] + e1 + a2;
-    AS2(    mov   [esi + 8], eax                )   // a2
-    AS2(    mov   edi, [esp + 16]               )   // e1
-    AS2(    add   edi, [esi + 12]               )   // digest_[3]
-    AS2(    add   [esi + 8], edi                )
-
-    // digest_[3] = digest_[4] + a1 + b2;
-    AS2(    mov   [esi + 12], ebx               )   // b2
-    AS2(    mov   edi, [esp]                    )   // a1
-    AS2(    add   edi, [esi + 16]               )   // digest_[4]
-    AS2(    add   [esi + 12], edi               )
-
-    // digest_[4] = digest_[0] + b1 + c2;
-    AS2(    mov   [esi + 16], ecx               )   // c2
-    AS2(    mov   edi, [esp +  4]               )   // b1
-    AS2(    add   edi, [esi]                    )   // digest_[0]
-    AS2(    add   [esi + 16], edi               )
-
-    // digest_[0] = c1;
-    AS2(    mov   edi, [esp +  8]               )   // c1
-    AS2(    mov   [esi], edi                    )
-
-    // setup for loop back
-    AS2(    movd  edx, mm2              )   // times
-    AS2(    movd  edi, mm0              )   // data, already advanced
-    AS1(    dec   edx                   )
-#ifdef _MSC_VER
-    AS1(    jnz   loopStart )  // loopStart
-#else
-    AS1(    jnz   0b )         // loopStart
-#endif
-
-    // inline adjust 
-    AS2(    add   esp, 24               )   // fix room on stack
-
-    EPILOG()
-}
-
-
-#endif // DO_RIPEMD_ASM
-
-
-} // namespace TaoCrypt
diff --git a/extra/yassl/taocrypt/src/rsa.cpp b/extra/yassl/taocrypt/src/rsa.cpp
deleted file mode 100644
index 73f678e2674c..000000000000
--- a/extra/yassl/taocrypt/src/rsa.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's rsa.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "rsa.hpp"
-#include "asn.hpp"
-#include "modarith.hpp"
-
-
-
-namespace TaoCrypt {
-
-
-Integer RSA_PublicKey::ApplyFunction(const Integer& x) const
-{
-    return a_exp_b_mod_c(x, e_, n_);
-}
-
-
-RSA_PublicKey::RSA_PublicKey(Source& source)
-{
-    Initialize(source);
-}
-
-
-void RSA_PublicKey::Initialize(Source& source)
-{
-    RSA_Public_Decoder decoder(source);
-    decoder.Decode(*this);
-}
-
-
-Integer RSA_PrivateKey::CalculateInverse(RandomNumberGenerator& rng,
-                                         const Integer& x) const
-{
-    ModularArithmetic modn(n_);
-
-    Integer r(rng, Integer::One(), n_ - Integer::One());
-    Integer re = modn.Exponentiate(r, e_);
-    re = modn.Multiply(re, x);			// blind
-
-    // here we follow the notation of PKCS #1 and let u=q inverse mod p
-    // but in ModRoot, u=p inverse mod q, so we reverse the order of p and q
-
-    Integer y = ModularRoot(re, dq_, dp_, q_, p_, u_);
-    y = modn.Divide(y, r);				    // unblind
-       
-    return y;
-}
-
-
-RSA_PrivateKey::RSA_PrivateKey(Source& source)
-{
-    Initialize(source);
-}
-
-
-void RSA_PrivateKey::Initialize(Source& source)
-{
-    RSA_Private_Decoder decoder(source);
-    decoder.Decode(*this);
-}
-
-
-void RSA_BlockType2::Pad(const byte *input, word32 inputLen, byte *pkcsBlock,
-                         word32 pkcsBlockLen, RandomNumberGenerator& rng) const
-{
-    // convert from bit length to byte length
-    if (pkcsBlockLen % 8 != 0)
-    {
-        pkcsBlock[0] = 0;
-        pkcsBlock++;
-    }
-    pkcsBlockLen /= 8;
-
-    pkcsBlock[0] = 2;  // block type 2
-
-    // pad with non-zero random bytes
-    word32 padLen = pkcsBlockLen - inputLen - 1;
-    rng.GenerateBlock(&pkcsBlock[1], padLen);
-    for (word32 i = 1; i < padLen; i++)
-        if (pkcsBlock[i] == 0) pkcsBlock[i] = 0x01;
-    
-    pkcsBlock[pkcsBlockLen-inputLen-1] = 0;     // separator
-    memcpy(pkcsBlock+pkcsBlockLen-inputLen, input, inputLen);
-}
-
-word32 RSA_BlockType2::UnPad(const byte *pkcsBlock, unsigned int pkcsBlockLen,
-                           byte *output) const
-{
-    bool invalid = false;
-    unsigned int maxOutputLen = SaturatingSubtract(pkcsBlockLen / 8, 10U);
-
-    // convert from bit length to byte length
-    if (pkcsBlockLen % 8 != 0)
-    {
-        invalid = (pkcsBlock[0] != 0) || invalid;
-        pkcsBlock++;
-    }
-    pkcsBlockLen /= 8;
-
-    // Require block type 2.
-    invalid = (pkcsBlock[0] != 2) || invalid;
-
-    // skip past the padding until we find the separator
-    unsigned i=1;
-    while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body
-        }
-    if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0))
-        return 0;
-
-    unsigned int outputLen = pkcsBlockLen - i;
-    invalid = (outputLen > maxOutputLen) || invalid;
-
-    if (invalid)
-        return 0;
-
-    memcpy (output, pkcsBlock+i, outputLen);
-    return outputLen;
-}
-
-
-void RSA_BlockType1::Pad(const byte* input, word32 inputLen, byte* pkcsBlock,
-                         word32 pkcsBlockLen, RandomNumberGenerator&) const
-{
-    // sanity checks
-    if (input == NULL || pkcsBlock == NULL)
-        return;
-
-    // convert from bit length to byte length
-    if (pkcsBlockLen % 8 != 0)
-    {
-        pkcsBlock[0] = 0;
-        pkcsBlock++;
-    }
-    pkcsBlockLen /= 8;
-
-    pkcsBlock[0] = 1;  // block type 1 for SSL
-
-    // pad with 0xff bytes
-    memset(&pkcsBlock[1], 0xFF, pkcsBlockLen - inputLen - 2);
-
-    pkcsBlock[pkcsBlockLen-inputLen-1] = 0;     // separator
-    memcpy(pkcsBlock+pkcsBlockLen-inputLen, input, inputLen);
-}
-
-
-word32 RSA_BlockType1::UnPad(const byte* pkcsBlock, word32 pkcsBlockLen,
-                             byte* output) const
-{
-    bool invalid = false;
-    unsigned int maxOutputLen = SaturatingSubtract(pkcsBlockLen / 8, 10U);
-
-    // convert from bit length to byte length
-    if (pkcsBlockLen % 8 != 0)
-    {
-        invalid = (pkcsBlock[0] != 0) || invalid;
-        pkcsBlock++;
-    }
-    pkcsBlockLen /= 8;
-
-    // Require block type 1 for SSL.
-    invalid = (pkcsBlock[0] != 1) || invalid;
-
-    // skip past the padding until we find the separator
-    unsigned i=1;
-    while (i<pkcsBlockLen && pkcsBlock[i++] == 0xFF) { // null body
-        }
-    if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0))
-        return 0;
-
-    unsigned int outputLen = pkcsBlockLen - i;
-    invalid = (outputLen > maxOutputLen) || invalid;
-
-    if (invalid)
-        return 0;
-
-    memcpy(output, pkcsBlock+i, outputLen);
-    return outputLen;
-}
-
-
-word32 SSL_Decrypt(const RSA_PublicKey& key, const byte* sig, byte* plain)
-{
-    PK_Lengths lengths(key.GetModulus());
-   
-    ByteBlock paddedBlock(BitsToBytes(lengths.PaddedBlockBitLength()));
-    Integer x = key.ApplyFunction(Integer(sig,
-                                          lengths.FixedCiphertextLength()));
-    if (x.ByteCount() > paddedBlock.size())
-        x = Integer::Zero();	
-    x.Encode(paddedBlock.get_buffer(), paddedBlock.size());
-    return RSA_BlockType1().UnPad(paddedBlock.get_buffer(),
-                                  lengths.PaddedBlockBitLength(), plain);
-}
-
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/sha.cpp b/extra/yassl/taocrypt/src/sha.cpp
deleted file mode 100644
index 4206f7f64eae..000000000000
--- a/extra/yassl/taocrypt/src/sha.cpp
+++ /dev/null
@@ -1,1033 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's sha.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include <string.h>
-#include "sha.hpp"
-#ifdef USE_SYS_STL
-    #include <algorithm>
-#else
-    #include "algorithm.hpp"
-#endif
-
-
-namespace STL = STL_NAMESPACE;
-
-
-
-namespace TaoCrypt {
-
-#define blk0(i) (W[i] = buffer_[i])
-#define blk1(i) (W[i&15] = \
-                 rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
-
-#define f1(x,y,z) (z^(x &(y^z)))
-#define f2(x,y,z) (x^y^z)
-#define f3(x,y,z) ((x&y)|(z&(x|y)))
-#define f4(x,y,z) (x^y^z)
-
-// (R0+R1), R2, R3, R4 are the different operations used in SHA1
-#define R0(v,w,x,y,z,i) z+= f1(w,x,y) + blk0(i) + 0x5A827999+ \
-                        rotlFixed(v,5); w = rotlFixed(w,30);
-#define R1(v,w,x,y,z,i) z+= f1(w,x,y) + blk1(i) + 0x5A827999+ \
-                        rotlFixed(v,5); w = rotlFixed(w,30);
-#define R2(v,w,x,y,z,i) z+= f2(w,x,y) + blk1(i) + 0x6ED9EBA1+ \
-                        rotlFixed(v,5); w = rotlFixed(w,30);
-#define R3(v,w,x,y,z,i) z+= f3(w,x,y) + blk1(i) + 0x8F1BBCDC+ \
-                        rotlFixed(v,5); w = rotlFixed(w,30);
-#define R4(v,w,x,y,z,i) z+= f4(w,x,y) + blk1(i) + 0xCA62C1D6+ \
-                        rotlFixed(v,5); w = rotlFixed(w,30);
-
-
-void SHA::Init()
-{
-    digest_[0] = 0x67452301L;
-    digest_[1] = 0xEFCDAB89L;
-    digest_[2] = 0x98BADCFEL;
-    digest_[3] = 0x10325476L;
-    digest_[4] = 0xC3D2E1F0L;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-void SHA256::Init()
-{
-    digest_[0] = 0x6A09E667L;
-    digest_[1] = 0xBB67AE85L;
-    digest_[2] = 0x3C6EF372L;
-    digest_[3] = 0xA54FF53AL;
-    digest_[4] = 0x510E527FL;
-    digest_[5] = 0x9B05688CL;
-    digest_[6] = 0x1F83D9ABL;
-    digest_[7] = 0x5BE0CD19L;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-void SHA224::Init()
-{
-    digest_[0] = 0xc1059ed8;
-    digest_[1] = 0x367cd507;
-    digest_[2] = 0x3070dd17;
-    digest_[3] = 0xf70e5939;
-    digest_[4] = 0xffc00b31;
-    digest_[5] = 0x68581511;
-    digest_[6] = 0x64f98fa7;
-    digest_[7] = 0xbefa4fa4;
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-void SHA512::Init()
-{
-    digest_[0] = W64LIT(0x6a09e667f3bcc908);
-    digest_[1] = W64LIT(0xbb67ae8584caa73b);
-    digest_[2] = W64LIT(0x3c6ef372fe94f82b);
-    digest_[3] = W64LIT(0xa54ff53a5f1d36f1);
-    digest_[4] = W64LIT(0x510e527fade682d1);
-    digest_[5] = W64LIT(0x9b05688c2b3e6c1f);
-    digest_[6] = W64LIT(0x1f83d9abfb41bd6b);
-    digest_[7] = W64LIT(0x5be0cd19137e2179);
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-
-void SHA384::Init()
-{
-    digest_[0] = W64LIT(0xcbbb9d5dc1059ed8);
-    digest_[1] = W64LIT(0x629a292a367cd507);
-    digest_[2] = W64LIT(0x9159015a3070dd17);
-    digest_[3] = W64LIT(0x152fecd8f70e5939);
-    digest_[4] = W64LIT(0x67332667ffc00b31);
-    digest_[5] = W64LIT(0x8eb44a8768581511);
-    digest_[6] = W64LIT(0xdb0c2e0d64f98fa7);
-    digest_[7] = W64LIT(0x47b5481dbefa4fa4);
-
-    buffLen_ = 0;
-    loLen_  = 0;
-    hiLen_  = 0;
-}
-
-#endif // WORD64_AVAILABLE
-
-
-SHA::SHA(const SHA& that) : HASHwithTransform(DIGEST_SIZE / sizeof(word32),
-                                              BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-
-SHA256::SHA256(const SHA256& that) : HASHwithTransform(DIGEST_SIZE /
-                                       sizeof(word32), BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-
-SHA224::SHA224(const SHA224& that) : HASHwithTransform(SHA256::DIGEST_SIZE /
-                                       sizeof(word32), BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-
-#ifdef WORD64_AVAILABLE 
-
-SHA512::SHA512(const SHA512& that) : HASH64withTransform(DIGEST_SIZE /
-                                       sizeof(word64), BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-
-SHA384::SHA384(const SHA384& that) : HASH64withTransform(SHA512::DIGEST_SIZE /
-                                       sizeof(word64), BLOCK_SIZE) 
-{ 
-    buffLen_ = that.buffLen_;
-    loLen_   = that.loLen_;
-    hiLen_   = that.hiLen_;
-
-    memcpy(digest_, that.digest_, DIGEST_SIZE);
-    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
-}
-
-#endif // WORD64_AVAILABLE
-
-
-SHA& SHA::operator= (const SHA& that)
-{
-    SHA tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-SHA256& SHA256::operator= (const SHA256& that)
-{
-    SHA256 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-SHA224& SHA224::operator= (const SHA224& that)
-{
-    SHA224 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-SHA512& SHA512::operator= (const SHA512& that)
-{
-    SHA512 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-
-SHA384& SHA384::operator= (const SHA384& that)
-{
-    SHA384 tmp(that);
-    Swap(tmp);
-
-    return *this;
-}
-
-#endif // WORD64_AVAILABLE
-
-
-void SHA::Swap(SHA& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-void SHA256::Swap(SHA256& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-void SHA224::Swap(SHA224& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-void SHA512::Swap(SHA512& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-
-void SHA384::Swap(SHA384& other)
-{
-    STL::swap(loLen_,   other.loLen_);
-    STL::swap(hiLen_,   other.hiLen_);
-    STL::swap(buffLen_, other.buffLen_);
-
-    memcpy(digest_, other.digest_, DIGEST_SIZE);
-    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
-}
-
-#endif // WORD64_AVIALABLE
-
-
-#ifdef DO_SHA_ASM
-
-// Update digest with data of size len
-void SHA::Update(const byte* data, word32 len)
-{
-    if (!isMMX) {
-        HASHwithTransform::Update(data, len);
-        return;
-    }
-
-    byte* local = reinterpret_cast<byte*>(buffer_);
-
-    // remove buffered data if possible
-    if (buffLen_)  {   
-        word32 add = min(len, BLOCK_SIZE - buffLen_);
-        memcpy(&local[buffLen_], data, add);
-
-        buffLen_ += add;
-        data     += add;
-        len      -= add;
-
-        if (buffLen_ == BLOCK_SIZE) {
-            ByteReverse(local, local, BLOCK_SIZE);
-            Transform();
-            AddLength(BLOCK_SIZE);
-            buffLen_ = 0;
-        }
-    }
-
-    // all at once for asm
-    if (buffLen_ == 0) {
-        word32 times = len / BLOCK_SIZE;
-        if (times) {
-            AsmTransform(data, times);
-            const word32 add = BLOCK_SIZE * times;
-            AddLength(add);
-            len  -= add;
-            data += add;
-        }
-    }
-
-    // cache any data left
-    if (len) {
-        memcpy(&local[buffLen_], data, len);
-        buffLen_ += len;
-    }
-}
-
-#endif // DO_SHA_ASM
-
-
-void SHA::Transform()
-{
-    word32 W[BLOCK_SIZE / sizeof(word32)];
-
-    // Copy context->state[] to working vars 
-    word32 a = digest_[0];
-    word32 b = digest_[1];
-    word32 c = digest_[2];
-    word32 d = digest_[3];
-    word32 e = digest_[4];
-
-    // 4 rounds of 20 operations each. Loop unrolled. 
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-
-    // Add the working vars back into digest state[]
-    digest_[0] += a;
-    digest_[1] += b;
-    digest_[2] += c;
-    digest_[3] += d;
-    digest_[4] += e;
-
-    // Wipe variables
-    a = b = c = d = e = 0;
-    memset(W, 0, sizeof(W));
-}
-
-
-#define blk2(i) (W[i&15]+=s1(W[(i-2)&15])+W[(i-7)&15]+s0(W[(i-15)&15]))
-
-#define Ch(x,y,z) (z^(x&(y^z)))
-#define Maj(x,y,z) ((x&y)|(z&(x|y)))
-
-#define a(i) T[(0-i)&7]
-#define b(i) T[(1-i)&7]
-#define c(i) T[(2-i)&7]
-#define d(i) T[(3-i)&7]
-#define e(i) T[(4-i)&7]
-#define f(i) T[(5-i)&7]
-#define g(i) T[(6-i)&7]
-#define h(i) T[(7-i)&7]
-
-#define R(i) h(i)+=S1(e(i))+Ch(e(i),f(i),g(i))+K[i+j]+(j?blk2(i):blk0(i));\
-	d(i)+=h(i);h(i)+=S0(a(i))+Maj(a(i),b(i),c(i))
-
-// for SHA256
-#define S0(x) (rotrFixed(x,2)^rotrFixed(x,13)^rotrFixed(x,22))
-#define S1(x) (rotrFixed(x,6)^rotrFixed(x,11)^rotrFixed(x,25))
-#define s0(x) (rotrFixed(x,7)^rotrFixed(x,18)^(x>>3))
-#define s1(x) (rotrFixed(x,17)^rotrFixed(x,19)^(x>>10))
-
-
-static const word32 K256[64] = {
-	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
-	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
-	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
-	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
-	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-};
-
-
-static void Transform256(word32* digest_, word32* buffer_)
-{
-    const  word32* K = K256;
-
-    word32 W[16];
-    word32 T[8];
-
-    // Copy digest to working vars
-    memcpy(T, digest_, sizeof(T));
-
-    // 64 operations, partially loop unrolled
-    for (unsigned int j = 0; j < 64; j += 16) {
-        R( 0); R( 1); R( 2); R( 3);
-        R( 4); R( 5); R( 6); R( 7);
-        R( 8); R( 9); R(10); R(11);
-        R(12); R(13); R(14); R(15);
-    }
-
-    // Add the working vars back into digest
-    digest_[0] += a(0);
-    digest_[1] += b(0);
-    digest_[2] += c(0);
-    digest_[3] += d(0);
-    digest_[4] += e(0);
-    digest_[5] += f(0);
-    digest_[6] += g(0);
-    digest_[7] += h(0);
-
-    // Wipe variables
-    memset(W, 0, sizeof(W));
-    memset(T, 0, sizeof(T));
-}
-
-
-// undef for 256
-#undef S0
-#undef S1
-#undef s0
-#undef s1
-
-
-void SHA256::Transform()
-{
-    Transform256(digest_, buffer_);
-}
-
-
-void SHA224::Transform()
-{
-    Transform256(digest_, buffer_);
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-static const word64 K512[80] = {
-	W64LIT(0x428a2f98d728ae22), W64LIT(0x7137449123ef65cd),
-	W64LIT(0xb5c0fbcfec4d3b2f), W64LIT(0xe9b5dba58189dbbc),
-	W64LIT(0x3956c25bf348b538), W64LIT(0x59f111f1b605d019),
-	W64LIT(0x923f82a4af194f9b), W64LIT(0xab1c5ed5da6d8118),
-	W64LIT(0xd807aa98a3030242), W64LIT(0x12835b0145706fbe),
-	W64LIT(0x243185be4ee4b28c), W64LIT(0x550c7dc3d5ffb4e2),
-	W64LIT(0x72be5d74f27b896f), W64LIT(0x80deb1fe3b1696b1),
-	W64LIT(0x9bdc06a725c71235), W64LIT(0xc19bf174cf692694),
-	W64LIT(0xe49b69c19ef14ad2), W64LIT(0xefbe4786384f25e3),
-	W64LIT(0x0fc19dc68b8cd5b5), W64LIT(0x240ca1cc77ac9c65),
-	W64LIT(0x2de92c6f592b0275), W64LIT(0x4a7484aa6ea6e483),
-	W64LIT(0x5cb0a9dcbd41fbd4), W64LIT(0x76f988da831153b5),
-	W64LIT(0x983e5152ee66dfab), W64LIT(0xa831c66d2db43210),
-	W64LIT(0xb00327c898fb213f), W64LIT(0xbf597fc7beef0ee4),
-	W64LIT(0xc6e00bf33da88fc2), W64LIT(0xd5a79147930aa725),
-	W64LIT(0x06ca6351e003826f), W64LIT(0x142929670a0e6e70),
-	W64LIT(0x27b70a8546d22ffc), W64LIT(0x2e1b21385c26c926),
-	W64LIT(0x4d2c6dfc5ac42aed), W64LIT(0x53380d139d95b3df),
-	W64LIT(0x650a73548baf63de), W64LIT(0x766a0abb3c77b2a8),
-	W64LIT(0x81c2c92e47edaee6), W64LIT(0x92722c851482353b),
-	W64LIT(0xa2bfe8a14cf10364), W64LIT(0xa81a664bbc423001),
-	W64LIT(0xc24b8b70d0f89791), W64LIT(0xc76c51a30654be30),
-	W64LIT(0xd192e819d6ef5218), W64LIT(0xd69906245565a910),
-	W64LIT(0xf40e35855771202a), W64LIT(0x106aa07032bbd1b8),
-	W64LIT(0x19a4c116b8d2d0c8), W64LIT(0x1e376c085141ab53),
-	W64LIT(0x2748774cdf8eeb99), W64LIT(0x34b0bcb5e19b48a8),
-	W64LIT(0x391c0cb3c5c95a63), W64LIT(0x4ed8aa4ae3418acb),
-	W64LIT(0x5b9cca4f7763e373), W64LIT(0x682e6ff3d6b2b8a3),
-	W64LIT(0x748f82ee5defb2fc), W64LIT(0x78a5636f43172f60),
-	W64LIT(0x84c87814a1f0ab72), W64LIT(0x8cc702081a6439ec),
-	W64LIT(0x90befffa23631e28), W64LIT(0xa4506cebde82bde9),
-	W64LIT(0xbef9a3f7b2c67915), W64LIT(0xc67178f2e372532b),
-	W64LIT(0xca273eceea26619c), W64LIT(0xd186b8c721c0c207),
-	W64LIT(0xeada7dd6cde0eb1e), W64LIT(0xf57d4f7fee6ed178),
-	W64LIT(0x06f067aa72176fba), W64LIT(0x0a637dc5a2c898a6),
-	W64LIT(0x113f9804bef90dae), W64LIT(0x1b710b35131c471b),
-	W64LIT(0x28db77f523047d84), W64LIT(0x32caab7b40c72493),
-	W64LIT(0x3c9ebe0a15c9bebc), W64LIT(0x431d67c49c100d4c),
-	W64LIT(0x4cc5d4becb3e42b6), W64LIT(0x597f299cfc657e2a),
-	W64LIT(0x5fcb6fab3ad6faec), W64LIT(0x6c44198c4a475817)
-};
-
-
-// for SHA512
-#define S0(x) (rotrFixed(x,28)^rotrFixed(x,34)^rotrFixed(x,39))
-#define S1(x) (rotrFixed(x,14)^rotrFixed(x,18)^rotrFixed(x,41))
-#define s0(x) (rotrFixed(x,1)^rotrFixed(x,8)^(x>>7))
-#define s1(x) (rotrFixed(x,19)^rotrFixed(x,61)^(x>>6))
-
-
-static void Transform512(word64* digest_, word64* buffer_)
-{
-    const word64* K = K512;
-
-    word64 W[16];
-    word64 T[8];
-
-    // Copy digest to working vars
-    memcpy(T, digest_, sizeof(T));
-
-    // 64 operations, partially loop unrolled
-    for (unsigned int j = 0; j < 80; j += 16) {
-        R( 0); R( 1); R( 2); R( 3);
-        R( 4); R( 5); R( 6); R( 7);
-        R( 8); R( 9); R(10); R(11);
-        R(12); R(13); R(14); R(15);
-    }
-
-    // Add the working vars back into digest 
-
-    digest_[0] += a(0);
-    digest_[1] += b(0);
-    digest_[2] += c(0);
-    digest_[3] += d(0);
-    digest_[4] += e(0);
-    digest_[5] += f(0);
-    digest_[6] += g(0);
-    digest_[7] += h(0);
-
-    // Wipe variables
-    memset(W, 0, sizeof(W));
-    memset(T, 0, sizeof(T));
-}
-
-
-void SHA512::Transform()
-{
-    Transform512(digest_, buffer_);
-}
-
-
-void SHA384::Transform()
-{
-    Transform512(digest_, buffer_);
-}
-
-#endif // WORD64_AVIALABLE
-
-
-#ifdef DO_SHA_ASM
-
-// f1(x,y,z) (z^(x &(y^z)))
-// place in esi
-#define ASMf1(x,y,z)   \
-    AS2(    mov   esi, y    )   \
-    AS2(    xor   esi, z    )   \
-    AS2(    and   esi, x    )   \
-    AS2(    xor   esi, z    )
-
-
-// R0(v,w,x,y,z,i) =
-//      z+= f1(w,x,y) + W[i] + 0x5A827999 + rotlFixed(v,5);
-//      w = rotlFixed(w,30);
-
-//      use esi for f
-//      use edi as tmp
-
-
-#define ASMR0(v,w,x,y,z,i) \
-    AS2(    mov   esi, x                        )   \
-    AS2(    mov   edi, [esp + i * 4]            )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    and   esi, w                        )   \
-    AS2(    lea     z, [edi + z + 0x5A827999]   )   \
-    AS2(    mov   edi, v                        )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    rol   edi, 5                        )   \
-    AS2(    add     z, esi                      )   \
-    AS2(    rol     w, 30                       )   \
-    AS2(    add     z, edi                      )
-
-
-/*  Some macro stuff, but older gas ( < 2,16 ) can't process &, so do by hand
-    % won't work on gas at all
-
-#define xstr(s) str(s)
-#define  str(s) #s
-
-#define WOFF1(a) ( a       & 15)
-#define WOFF2(a) ((a +  2) & 15)
-#define WOFF3(a) ((a +  8) & 15)
-#define WOFF4(a) ((a + 13) & 15)
-
-#ifdef __GNUC__
-    #define WGET1(i) asm("mov esp, [edi - "xstr(WOFF1(i))" * 4] ");
-    #define WGET2(i) asm("xor esp, [edi - "xstr(WOFF2(i))" * 4] ");
-    #define WGET3(i) asm("xor esp, [edi - "xstr(WOFF3(i))" * 4] ");
-    #define WGET4(i) asm("xor esp, [edi - "xstr(WOFF4(i))" * 4] ");
-    #define WPUT1(i) asm("mov [edi - "xstr(WOFF1(i))" * 4], esp ");
-#else
-    #define WGET1(i) AS2( mov   esp, [edi - WOFF1(i) * 4]   )
-    #define WGET2(i) AS2( xor   esp, [edi - WOFF2(i) * 4]   )
-    #define WGET3(i) AS2( xor   esp, [edi - WOFF3(i) * 4]   )
-    #define WGET4(i) AS2( xor   esp, [edi - WOFF4(i) * 4]   )
-    #define WPUT1(i) AS2( mov   [edi - WOFF1(i) * 4], esp   )
-#endif
-*/
-
-// ASMR1 = ASMR0 but use esp for W calcs
-
-#define ASMR1(v,w,x,y,z,i,W1,W2,W3,W4) \
-    AS2(    mov   edi, [esp + W1 * 4]           )   \
-    AS2(    mov   esi, x                        )   \
-    AS2(    xor   edi, [esp + W2 * 4]           )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    xor   edi, [esp + W3 * 4]           )   \
-    AS2(    and   esi, w                        )   \
-    AS2(    xor   edi, [esp + W4 * 4]           )   \
-    AS2(    rol   edi, 1                        )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    mov   [esp + W1 * 4], edi           )   \
-    AS2(    lea     z, [edi + z + 0x5A827999]   )   \
-    AS2(    mov   edi, v                        )   \
-    AS2(    rol   edi, 5                        )   \
-    AS2(    add     z, esi                      )   \
-    AS2(    rol     w, 30                       )   \
-    AS2(    add     z, edi                      )
-
-
-// ASMR2 = ASMR1 but f is xor, xor instead
-
-#define ASMR2(v,w,x,y,z,i,W1,W2,W3,W4) \
-    AS2(    mov   edi, [esp + W1 * 4]           )   \
-    AS2(    mov   esi, x                        )   \
-    AS2(    xor   edi, [esp + W2 * 4]           )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    xor   edi, [esp + W3 * 4]           )   \
-    AS2(    xor   esi, w                        )   \
-    AS2(    xor   edi, [esp + W4 * 4]           )   \
-    AS2(    rol   edi, 1                        )   \
-    AS2(    add     z, esi                      )   \
-    AS2(    mov   [esp + W1 * 4], edi           )   \
-    AS2(    lea     z, [edi + z + 0x6ED9EBA1]   )   \
-    AS2(    mov   edi, v                        )   \
-    AS2(    rol   edi, 5                        )   \
-    AS2(    rol     w, 30                       )   \
-    AS2(    add     z, edi                      )
-
-
-// ASMR3 = ASMR2 but f is (x&y)|(z&(x|y))
-//               which is (w&x)|(y&(w|x))
-
-#define ASMR3(v,w,x,y,z,i,W1,W2,W3,W4) \
-    AS2(    mov   edi, [esp + W1 * 4]           )   \
-    AS2(    mov   esi, x                        )   \
-    AS2(    xor   edi, [esp + W2 * 4]           )   \
-    AS2(     or   esi, w                        )   \
-    AS2(    xor   edi, [esp + W3 * 4]           )   \
-    AS2(    and   esi, y                        )   \
-    AS2(    xor   edi, [esp + W4 * 4]           )   \
-    AS2(    movd  mm0, esi                      )   \
-    AS2(    rol   edi, 1                        )   \
-    AS2(    mov   esi, x                        )   \
-    AS2(    mov   [esp + W1 * 4], edi           )   \
-    AS2(    and   esi, w                        )   \
-    AS2(    lea     z, [edi + z + 0x8F1BBCDC]   )   \
-    AS2(    movd  edi, mm0                      )   \
-    AS2(     or   esi, edi                      )   \
-    AS2(    mov   edi, v                        )   \
-    AS2(    rol   edi, 5                        )   \
-    AS2(    add     z, esi                      )   \
-    AS2(    rol     w, 30                       )   \
-    AS2(    add     z, edi                      )
-
-
-// ASMR4 = ASMR2 but different constant
-
-#define ASMR4(v,w,x,y,z,i,W1,W2,W3,W4) \
-    AS2(    mov   edi, [esp + W1 * 4]           )   \
-    AS2(    mov   esi, x                        )   \
-    AS2(    xor   edi, [esp + W2 * 4]           )   \
-    AS2(    xor   esi, y                        )   \
-    AS2(    xor   edi, [esp + W3 * 4]           )   \
-    AS2(    xor   esi, w                        )   \
-    AS2(    xor   edi, [esp + W4 * 4]           )   \
-    AS2(    rol   edi, 1                        )   \
-    AS2(    add     z, esi                      )   \
-    AS2(    mov   [esp + W1 * 4], edi           )   \
-    AS2(    lea     z, [edi + z + 0xCA62C1D6]   )   \
-    AS2(    mov   edi, v                        )   \
-    AS2(    rol   edi, 5                        )   \
-    AS2(    rol     w, 30                       )   \
-    AS2(    add     z, edi                      )
-
-
-#ifdef _MSC_VER
-    __declspec(naked)
-#else
-    __attribute__ ((noinline))
-#endif
-void SHA::AsmTransform(const byte* data, word32 times)
-{
-#ifdef __GNUC__
-    #define AS1(x)    #x ";"
-    #define AS2(x, y) #x ", " #y ";"
-
-    #define PROLOG()  \
-    __asm__ __volatile__ \
-    ( \
-        ".intel_syntax noprefix;" \
-        "push ebx;" \
-        "push ebp;"
-    #define EPILOG()  \
-        "pop ebp;" \
-        "pop ebx;" \
-       	"emms;" \
-       	".att_syntax;" \
-            : \
-            : "c" (this), "D" (data), "a" (times) \
-            : "%esi", "%edx", "memory", "cc" \
-    );
-
-#else
-    #define AS1(x)    __asm x
-    #define AS2(x, y) __asm x, y
-
-    #define PROLOG() \
-        AS1(    push  ebp                           )   \
-        AS2(    mov   ebp, esp                      )   \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   edi, data                     )   \
-        AS2(    mov   eax, times                    )
-
-    #define EPILOG() \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS1(    pop   ebp                       )   \
-        AS1(    emms   )                            \
-        AS1(    ret 8  )   
-#endif
-
-    PROLOG()
-
-    AS2(    mov   esi, ecx              )
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    add   esi, 20               )   // digest_[0]
-    #else
-        AS2(    add   esi, 16               )   // digest_[0]
-    #endif
-
-    AS2(    movd  mm2, eax              )   // store times_
-    AS2(    movd  mm1, esi              )   // store digest_
-
-    AS2(    sub   esp, 68               )   // make room on stack
-
-#ifdef _MSC_VER
-    AS1( loopStart: )  // loopStart
-#else
-    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
-#endif
-
-    // byte reverse 16 words of input, 4 at a time, put on stack for W[]
-
-    // part 1
-    AS2(    mov   eax, [edi]        )
-    AS2(    mov   ebx, [edi +  4]   )
-    AS2(    mov   ecx, [edi +  8]   )
-    AS2(    mov   edx, [edi + 12]   )
-
-    AS1(    bswap eax   )
-    AS1(    bswap ebx   )
-    AS1(    bswap ecx   )
-    AS1(    bswap edx   )
-
-    AS2(    mov   [esp],      eax   )
-    AS2(    mov   [esp +  4], ebx   )
-    AS2(    mov   [esp +  8], ecx   )
-    AS2(    mov   [esp + 12], edx   )
-
-    // part 2
-    AS2(    mov   eax, [edi + 16]   )
-    AS2(    mov   ebx, [edi + 20]   )
-    AS2(    mov   ecx, [edi + 24]   )
-    AS2(    mov   edx, [edi + 28]   )
-
-    AS1(    bswap eax   )
-    AS1(    bswap ebx   )
-    AS1(    bswap ecx   )
-    AS1(    bswap edx   )
-
-    AS2(    mov   [esp + 16], eax   )
-    AS2(    mov   [esp + 20], ebx   )
-    AS2(    mov   [esp + 24], ecx   )
-    AS2(    mov   [esp + 28], edx   )
-
-
-    // part 3
-    AS2(    mov   eax, [edi + 32]   )
-    AS2(    mov   ebx, [edi + 36]   )
-    AS2(    mov   ecx, [edi + 40]   )
-    AS2(    mov   edx, [edi + 44]   )
-
-    AS1(    bswap eax   )
-    AS1(    bswap ebx   )
-    AS1(    bswap ecx   )
-    AS1(    bswap edx   )
-
-    AS2(    mov   [esp + 32], eax   )
-    AS2(    mov   [esp + 36], ebx   )
-    AS2(    mov   [esp + 40], ecx   )
-    AS2(    mov   [esp + 44], edx   )
-
-
-    // part 4
-    AS2(    mov   eax, [edi + 48]   )
-    AS2(    mov   ebx, [edi + 52]   )
-    AS2(    mov   ecx, [edi + 56]   )
-    AS2(    mov   edx, [edi + 60]   )
-
-    AS1(    bswap eax   )
-    AS1(    bswap ebx   )
-    AS1(    bswap ecx   )
-    AS1(    bswap edx   )
-
-    AS2(    mov   [esp + 48], eax   )
-    AS2(    mov   [esp + 52], ebx   )
-    AS2(    mov   [esp + 56], ecx   )
-    AS2(    mov   [esp + 60], edx   )
-
-    AS2(    mov   [esp + 64], edi   )   // store edi for end
-
-    // read from digest_
-    AS2(    mov   eax, [esi]            )   // a1
-    AS2(    mov   ebx, [esi +  4]       )   // b1
-    AS2(    mov   ecx, [esi +  8]       )   // c1
-    AS2(    mov   edx, [esi + 12]       )   // d1
-    AS2(    mov   ebp, [esi + 16]       )   // e1
-
-
-    ASMR0(eax, ebx, ecx, edx, ebp,  0)
-    ASMR0(ebp, eax, ebx, ecx, edx,  1)
-    ASMR0(edx, ebp, eax, ebx, ecx,  2)
-    ASMR0(ecx, edx, ebp, eax, ebx,  3)
-    ASMR0(ebx, ecx, edx, ebp, eax,  4)
-    ASMR0(eax, ebx, ecx, edx, ebp,  5)
-    ASMR0(ebp, eax, ebx, ecx, edx,  6)
-    ASMR0(edx, ebp, eax, ebx, ecx,  7)
-    ASMR0(ecx, edx, ebp, eax, ebx,  8)
-    ASMR0(ebx, ecx, edx, ebp, eax,  9)
-    ASMR0(eax, ebx, ecx, edx, ebp, 10)
-    ASMR0(ebp, eax, ebx, ecx, edx, 11)
-    ASMR0(edx, ebp, eax, ebx, ecx, 12)
-    ASMR0(ecx, edx, ebp, eax, ebx, 13)
-    ASMR0(ebx, ecx, edx, ebp, eax, 14)
-    ASMR0(eax, ebx, ecx, edx, ebp, 15)
-
-    ASMR1(ebp, eax, ebx, ecx, edx, 16,  0,  2,  8, 13)
-    ASMR1(edx, ebp, eax, ebx, ecx, 17,  1,  3,  9, 14)
-    ASMR1(ecx, edx, ebp, eax, ebx, 18,  2,  4, 10, 15)
-    ASMR1(ebx, ecx, edx, ebp, eax, 19,  3,  5, 11,  0)
-
-    ASMR2(eax, ebx, ecx, edx, ebp, 20,  4,  6, 12,  1)
-    ASMR2(ebp, eax, ebx, ecx, edx, 21,  5,  7, 13,  2)
-    ASMR2(edx, ebp, eax, ebx, ecx, 22,  6,  8, 14,  3)
-    ASMR2(ecx, edx, ebp, eax, ebx, 23,  7,  9, 15,  4)
-    ASMR2(ebx, ecx, edx, ebp, eax, 24,  8, 10,  0,  5)
-    ASMR2(eax, ebx, ecx, edx, ebp, 25,  9, 11,  1,  6)
-    ASMR2(ebp, eax, ebx, ecx, edx, 26, 10, 12,  2,  7)
-    ASMR2(edx, ebp, eax, ebx, ecx, 27, 11, 13,  3,  8)
-    ASMR2(ecx, edx, ebp, eax, ebx, 28, 12, 14,  4,  9)
-    ASMR2(ebx, ecx, edx, ebp, eax, 29, 13, 15,  5, 10)
-    ASMR2(eax, ebx, ecx, edx, ebp, 30, 14,  0,  6, 11)
-    ASMR2(ebp, eax, ebx, ecx, edx, 31, 15,  1,  7, 12)
-    ASMR2(edx, ebp, eax, ebx, ecx, 32,  0,  2,  8, 13)
-    ASMR2(ecx, edx, ebp, eax, ebx, 33,  1,  3,  9, 14)
-    ASMR2(ebx, ecx, edx, ebp, eax, 34,  2,  4, 10, 15)
-    ASMR2(eax, ebx, ecx, edx, ebp, 35,  3,  5, 11,  0)
-    ASMR2(ebp, eax, ebx, ecx, edx, 36,  4,  6, 12,  1)
-    ASMR2(edx, ebp, eax, ebx, ecx, 37,  5,  7, 13,  2)
-    ASMR2(ecx, edx, ebp, eax, ebx, 38,  6,  8, 14,  3)
-    ASMR2(ebx, ecx, edx, ebp, eax, 39,  7,  9, 15,  4)
-
-
-    ASMR3(eax, ebx, ecx, edx, ebp, 40,  8, 10,  0,  5)
-    ASMR3(ebp, eax, ebx, ecx, edx, 41,  9, 11,  1,  6)
-    ASMR3(edx, ebp, eax, ebx, ecx, 42, 10, 12,  2,  7)
-    ASMR3(ecx, edx, ebp, eax, ebx, 43, 11, 13,  3,  8)
-    ASMR3(ebx, ecx, edx, ebp, eax, 44, 12, 14,  4,  9)
-    ASMR3(eax, ebx, ecx, edx, ebp, 45, 13, 15,  5, 10)
-    ASMR3(ebp, eax, ebx, ecx, edx, 46, 14,  0,  6, 11)
-    ASMR3(edx, ebp, eax, ebx, ecx, 47, 15,  1,  7, 12)
-    ASMR3(ecx, edx, ebp, eax, ebx, 48,  0,  2,  8, 13)
-    ASMR3(ebx, ecx, edx, ebp, eax, 49,  1,  3,  9, 14)
-    ASMR3(eax, ebx, ecx, edx, ebp, 50,  2,  4, 10, 15)
-    ASMR3(ebp, eax, ebx, ecx, edx, 51,  3,  5, 11,  0)
-    ASMR3(edx, ebp, eax, ebx, ecx, 52,  4,  6, 12,  1)
-    ASMR3(ecx, edx, ebp, eax, ebx, 53,  5,  7, 13,  2)
-    ASMR3(ebx, ecx, edx, ebp, eax, 54,  6,  8, 14,  3)
-    ASMR3(eax, ebx, ecx, edx, ebp, 55,  7,  9, 15,  4)
-    ASMR3(ebp, eax, ebx, ecx, edx, 56,  8, 10,  0,  5)
-    ASMR3(edx, ebp, eax, ebx, ecx, 57,  9, 11,  1,  6)
-    ASMR3(ecx, edx, ebp, eax, ebx, 58, 10, 12,  2,  7)
-    ASMR3(ebx, ecx, edx, ebp, eax, 59, 11, 13,  3,  8)
-
-    ASMR4(eax, ebx, ecx, edx, ebp, 60, 12, 14,  4,  9)
-    ASMR4(ebp, eax, ebx, ecx, edx, 61, 13, 15,  5, 10)
-    ASMR4(edx, ebp, eax, ebx, ecx, 62, 14,  0,  6, 11)
-    ASMR4(ecx, edx, ebp, eax, ebx, 63, 15,  1,  7, 12)
-    ASMR4(ebx, ecx, edx, ebp, eax, 64,  0,  2,  8, 13)
-    ASMR4(eax, ebx, ecx, edx, ebp, 65,  1,  3,  9, 14)
-    ASMR4(ebp, eax, ebx, ecx, edx, 66,  2,  4, 10, 15)
-    ASMR4(edx, ebp, eax, ebx, ecx, 67,  3,  5, 11,  0)
-    ASMR4(ecx, edx, ebp, eax, ebx, 68,  4,  6, 12,  1)
-    ASMR4(ebx, ecx, edx, ebp, eax, 69,  5,  7, 13,  2)
-    ASMR4(eax, ebx, ecx, edx, ebp, 70,  6,  8, 14,  3)
-    ASMR4(ebp, eax, ebx, ecx, edx, 71,  7,  9, 15,  4)
-    ASMR4(edx, ebp, eax, ebx, ecx, 72,  8, 10,  0,  5)
-    ASMR4(ecx, edx, ebp, eax, ebx, 73,  9, 11,  1,  6)
-    ASMR4(ebx, ecx, edx, ebp, eax, 74, 10, 12,  2,  7)
-    ASMR4(eax, ebx, ecx, edx, ebp, 75, 11, 13,  3,  8)
-    ASMR4(ebp, eax, ebx, ecx, edx, 76, 12, 14,  4,  9)
-    ASMR4(edx, ebp, eax, ebx, ecx, 77, 13, 15,  5, 10)
-    ASMR4(ecx, edx, ebp, eax, ebx, 78, 14,  0,  6, 11)
-    ASMR4(ebx, ecx, edx, ebp, eax, 79, 15,  1,  7, 12)
-
-
-    AS2(    movd  esi, mm1              )   // digest_
-
-    AS2(    add   [esi],      eax       )   // write out
-    AS2(    add   [esi +  4], ebx       )
-    AS2(    add   [esi +  8], ecx       )
-    AS2(    add   [esi + 12], edx       )
-    AS2(    add   [esi + 16], ebp       )
-
-    // setup next round
-    AS2(    movd  ebp, mm2              )   // times
- 
-    AS2(    mov   edi, DWORD PTR [esp + 64] )   // data
-    
-    AS2(    add   edi, 64               )   // next round of data
-    AS2(    mov   [esp + 64], edi       )   // restore
-    
-    AS1(    dec   ebp                   )
-    AS2(    movd  mm2, ebp              )
-#ifdef _MSC_VER
-    AS1(    jnz   loopStart )  // loopStart
-#else
-    AS1(    jnz   0b )         // loopStart
-#endif
-
-    // inline adjust 
-    AS2(    add   esp, 68               )   // fix room on stack
-
-    EPILOG()
-}
-
-
-#endif // DO_SHA_ASM
-
-} // namespace
diff --git a/extra/yassl/taocrypt/src/template_instnt.cpp b/extra/yassl/taocrypt/src/template_instnt.cpp
deleted file mode 100644
index 651ef93a5f8e..000000000000
--- a/extra/yassl/taocrypt/src/template_instnt.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-
-/*  Explicit template instantiation requests 
- */
-
-
-#include "runtime.hpp"
-#include "integer.hpp"
-#include "rsa.hpp"
-#include "sha.hpp"
-#include "md5.hpp"
-#include "hmac.hpp"
-#include "ripemd.hpp"
-#include "pwdbased.hpp"
-#include "algebra.hpp"
-#include "vector.hpp"
-#include "hash.hpp"
-
-#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-namespace TaoCrypt {
-
-#if defined(SSE2_INTRINSICS_AVAILABLE)
-template AlignedAllocator<unsigned int>::pointer StdReallocate<unsigned int, AlignedAllocator<unsigned int> >(AlignedAllocator<unsigned int>&, unsigned int*, AlignedAllocator<unsigned int>::size_type, AlignedAllocator<unsigned int>::size_type, bool);
-#endif
-
-template class RSA_Decryptor<RSA_BlockType2>;
-template class RSA_Encryptor<RSA_BlockType1>;
-template class RSA_Encryptor<RSA_BlockType2>;
-template void tcDelete<HASH>(HASH*);
-template void tcDelete<Integer>(Integer*);
-template void tcArrayDelete<byte>(byte*);
-template AllocatorWithCleanup<byte>::pointer StdReallocate<byte, AllocatorWithCleanup<byte> >(AllocatorWithCleanup<byte>&, byte*, AllocatorWithCleanup<byte>::size_type, AllocatorWithCleanup<byte>::size_type, bool);
-template void tcArrayDelete<word>(word*);
-template AllocatorWithCleanup<word>::pointer StdReallocate<word, AllocatorWithCleanup<word> >(AllocatorWithCleanup<word>&, word*, AllocatorWithCleanup<word>::size_type, AllocatorWithCleanup<word>::size_type, bool);
-
-#ifndef TAOCRYPT_SLOW_WORD64 // defined when word != word32
-template void tcArrayDelete<word32>(word32*);
-template AllocatorWithCleanup<word32>::pointer StdReallocate<word32, AllocatorWithCleanup<word32> >(AllocatorWithCleanup<word32>&, word32*, AllocatorWithCleanup<word32>::size_type, AllocatorWithCleanup<word32>::size_type, bool);
-#endif
-
-template void tcArrayDelete<char>(char*);
-
-template class PBKDF2_HMAC<SHA>;
-template class HMAC<MD5>;
-template class HMAC<SHA>;
-template class HMAC<RIPEMD160>;
-}
-
-namespace mySTL {
-template vector<TaoCrypt::Integer>* uninit_fill_n<vector<TaoCrypt::Integer>*, size_t, vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*, size_t, vector<TaoCrypt::Integer> const&);
-template void destroy<vector<TaoCrypt::Integer>*>(vector<TaoCrypt::Integer>*, vector<TaoCrypt::Integer>*);
-template TaoCrypt::Integer* uninit_copy<TaoCrypt::Integer*, TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*, TaoCrypt::Integer*);
-template TaoCrypt::Integer* uninit_fill_n<TaoCrypt::Integer*, size_t, TaoCrypt::Integer>(TaoCrypt::Integer*, size_t, TaoCrypt::Integer const&);
-template void destroy<TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*);
-template TaoCrypt::byte* GetArrayMemory<TaoCrypt::byte>(size_t);
-template void FreeArrayMemory<TaoCrypt::byte>(TaoCrypt::byte*);
-template TaoCrypt::Integer* GetArrayMemory<TaoCrypt::Integer>(size_t);
-template void FreeArrayMemory<TaoCrypt::Integer>(TaoCrypt::Integer*);
-template vector<TaoCrypt::Integer>* GetArrayMemory<vector<TaoCrypt::Integer> >(size_t);
-template void FreeArrayMemory<vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*);
-template void FreeArrayMemory<void>(void*);
-}
-
-#endif
diff --git a/extra/yassl/taocrypt/src/tftables.cpp b/extra/yassl/taocrypt/src/tftables.cpp
deleted file mode 100644
index 314b303afa65..000000000000
--- a/extra/yassl/taocrypt/src/tftables.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* based on Wei Dai's tftables.cpp from CryptoPP */
-
-#include "runtime.hpp"
-#include "twofish.hpp"
-
-
-namespace TaoCrypt {
-
-
-const byte Twofish::q_[2][256] = {
-{
-   0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76, 0x9A, 0x92, 0x80, 0x78,
-   0xE4, 0xDD, 0xD1, 0x38, 0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
-   0x43, 0x75, 0x37, 0x26, 0xFA, 0x13, 0x94, 0x48, 0xF2, 0xD0, 0x8B, 0x30,
-   0x84, 0x54, 0xDF, 0x23, 0x19, 0x5B, 0x3D, 0x59, 0xF3, 0xAE, 0xA2, 0x82,
-   0x63, 0x01, 0x83, 0x2E, 0xD9, 0x51, 0x9B, 0x7C, 0xA6, 0xEB, 0xA5, 0xBE,
-   0x16, 0x0C, 0xE3, 0x61, 0xC0, 0x8C, 0x3A, 0xF5, 0x73, 0x2C, 0x25, 0x0B,
-   0xBB, 0x4E, 0x89, 0x6B, 0x53, 0x6A, 0xB4, 0xF1, 0xE1, 0xE6, 0xBD, 0x45,
-   0xE2, 0xF4, 0xB6, 0x66, 0xCC, 0x95, 0x03, 0x56, 0xD4, 0x1C, 0x1E, 0xD7,
-   0xFB, 0xC3, 0x8E, 0xB5, 0xE9, 0xCF, 0xBF, 0xBA, 0xEA, 0x77, 0x39, 0xAF,
-   0x33, 0xC9, 0x62, 0x71, 0x81, 0x79, 0x09, 0xAD, 0x24, 0xCD, 0xF9, 0xD8,
-   0xE5, 0xC5, 0xB9, 0x4D, 0x44, 0x08, 0x86, 0xE7, 0xA1, 0x1D, 0xAA, 0xED,
-   0x06, 0x70, 0xB2, 0xD2, 0x41, 0x7B, 0xA0, 0x11, 0x31, 0xC2, 0x27, 0x90,
-   0x20, 0xF6, 0x60, 0xFF, 0x96, 0x5C, 0xB1, 0xAB, 0x9E, 0x9C, 0x52, 0x1B,
-   0x5F, 0x93, 0x0A, 0xEF, 0x91, 0x85, 0x49, 0xEE, 0x2D, 0x4F, 0x8F, 0x3B,
-   0x47, 0x87, 0x6D, 0x46, 0xD6, 0x3E, 0x69, 0x64, 0x2A, 0xCE, 0xCB, 0x2F,
-   0xFC, 0x97, 0x05, 0x7A, 0xAC, 0x7F, 0xD5, 0x1A, 0x4B, 0x0E, 0xA7, 0x5A,
-   0x28, 0x14, 0x3F, 0x29, 0x88, 0x3C, 0x4C, 0x02, 0xB8, 0xDA, 0xB0, 0x17,
-   0x55, 0x1F, 0x8A, 0x7D, 0x57, 0xC7, 0x8D, 0x74, 0xB7, 0xC4, 0x9F, 0x72,
-   0x7E, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34, 0x6E, 0x50, 0xDE, 0x68,
-   0x65, 0xBC, 0xDB, 0xF8, 0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,
-   0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00, 0x6F, 0x9D, 0x36, 0x42,
-   0x4A, 0x5E, 0xC1, 0xE0
-},
-{
-   0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8, 0x4A, 0xD3, 0xE6, 0x6B,
-   0x45, 0x7D, 0xE8, 0x4B, 0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
-   0x30, 0x0F, 0xF8, 0x1B, 0x87, 0xFA, 0x06, 0x3F, 0x5E, 0xBA, 0xAE, 0x5B,
-   0x8A, 0x00, 0xBC, 0x9D, 0x6D, 0xC1, 0xB1, 0x0E, 0x80, 0x5D, 0xD2, 0xD5,
-   0xA0, 0x84, 0x07, 0x14, 0xB5, 0x90, 0x2C, 0xA3, 0xB2, 0x73, 0x4C, 0x54,
-   0x92, 0x74, 0x36, 0x51, 0x38, 0xB0, 0xBD, 0x5A, 0xFC, 0x60, 0x62, 0x96,
-   0x6C, 0x42, 0xF7, 0x10, 0x7C, 0x28, 0x27, 0x8C, 0x13, 0x95, 0x9C, 0xC7,
-   0x24, 0x46, 0x3B, 0x70, 0xCA, 0xE3, 0x85, 0xCB, 0x11, 0xD0, 0x93, 0xB8,
-   0xA6, 0x83, 0x20, 0xFF, 0x9F, 0x77, 0xC3, 0xCC, 0x03, 0x6F, 0x08, 0xBF,
-   0x40, 0xE7, 0x2B, 0xE2, 0x79, 0x0C, 0xAA, 0x82, 0x41, 0x3A, 0xEA, 0xB9,
-   0xE4, 0x9A, 0xA4, 0x97, 0x7E, 0xDA, 0x7A, 0x17, 0x66, 0x94, 0xA1, 0x1D,
-   0x3D, 0xF0, 0xDE, 0xB3, 0x0B, 0x72, 0xA7, 0x1C, 0xEF, 0xD1, 0x53, 0x3E,
-   0x8F, 0x33, 0x26, 0x5F, 0xEC, 0x76, 0x2A, 0x49, 0x81, 0x88, 0xEE, 0x21,
-   0xC4, 0x1A, 0xEB, 0xD9, 0xC5, 0x39, 0x99, 0xCD, 0xAD, 0x31, 0x8B, 0x01,
-   0x18, 0x23, 0xDD, 0x1F, 0x4E, 0x2D, 0xF9, 0x48, 0x4F, 0xF2, 0x65, 0x8E,
-   0x78, 0x5C, 0x58, 0x19, 0x8D, 0xE5, 0x98, 0x57, 0x67, 0x7F, 0x05, 0x64,
-   0xAF, 0x63, 0xB6, 0xFE, 0xF5, 0xB7, 0x3C, 0xA5, 0xCE, 0xE9, 0x68, 0x44,
-   0xE0, 0x4D, 0x43, 0x69, 0x29, 0x2E, 0xAC, 0x15, 0x59, 0xA8, 0x0A, 0x9E,
-   0x6E, 0x47, 0xDF, 0x34, 0x35, 0x6A, 0xCF, 0xDC, 0x22, 0xC9, 0xC0, 0x9B,
-   0x89, 0xD4, 0xED, 0xAB, 0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,
-   0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2, 0x16, 0x25, 0x86, 0x56,
-   0x55, 0x09, 0xBE, 0x91
-}
-};
-
-
-const word32 Twofish::mds_[4][256] = {
-    {
-	0xbcbc3275, 0xecec21f3, 0x202043c6, 0xb3b3c9f4, 
-	0xdada03db, 0x02028b7b, 0xe2e22bfb, 0x9e9efac8, 
-	0xc9c9ec4a, 0xd4d409d3, 0x18186be6, 0x1e1e9f6b, 
-	0x98980e45, 0xb2b2387d, 0xa6a6d2e8, 0x2626b74b, 
-	0x3c3c57d6, 0x93938a32, 0x8282eed8, 0x525298fd, 
-	0x7b7bd437, 0xbbbb3771, 0x5b5b97f1, 0x474783e1, 
-	0x24243c30, 0x5151e20f, 0xbabac6f8, 0x4a4af31b, 
-	0xbfbf4887, 0x0d0d70fa, 0xb0b0b306, 0x7575de3f, 
-	0xd2d2fd5e, 0x7d7d20ba, 0x666631ae, 0x3a3aa35b, 
-	0x59591c8a, 0x00000000, 0xcdcd93bc, 0x1a1ae09d, 
-	0xaeae2c6d, 0x7f7fabc1, 0x2b2bc7b1, 0xbebeb90e, 
-	0xe0e0a080, 0x8a8a105d, 0x3b3b52d2, 0x6464bad5, 
-	0xd8d888a0, 0xe7e7a584, 0x5f5fe807, 0x1b1b1114, 
-	0x2c2cc2b5, 0xfcfcb490, 0x3131272c, 0x808065a3, 
-	0x73732ab2, 0x0c0c8173, 0x79795f4c, 0x6b6b4154, 
-	0x4b4b0292, 0x53536974, 0x94948f36, 0x83831f51, 
-	0x2a2a3638, 0xc4c49cb0, 0x2222c8bd, 0xd5d5f85a, 
-	0xbdbdc3fc, 0x48487860, 0xffffce62, 0x4c4c0796, 
-	0x4141776c, 0xc7c7e642, 0xebeb24f7, 0x1c1c1410, 
-	0x5d5d637c, 0x36362228, 0x6767c027, 0xe9e9af8c, 
-	0x4444f913, 0x1414ea95, 0xf5f5bb9c, 0xcfcf18c7, 
-	0x3f3f2d24, 0xc0c0e346, 0x7272db3b, 0x54546c70, 
-	0x29294cca, 0xf0f035e3, 0x0808fe85, 0xc6c617cb, 
-	0xf3f34f11, 0x8c8ce4d0, 0xa4a45993, 0xcaca96b8, 
-	0x68683ba6, 0xb8b84d83, 0x38382820, 0xe5e52eff, 
-	0xadad569f, 0x0b0b8477, 0xc8c81dc3, 0x9999ffcc, 
-	0x5858ed03, 0x19199a6f, 0x0e0e0a08, 0x95957ebf, 
-	0x70705040, 0xf7f730e7, 0x6e6ecf2b, 0x1f1f6ee2, 
-	0xb5b53d79, 0x09090f0c, 0x616134aa, 0x57571682, 
-	0x9f9f0b41, 0x9d9d803a, 0x111164ea, 0x2525cdb9, 
-	0xafafdde4, 0x4545089a, 0xdfdf8da4, 0xa3a35c97, 
-	0xeaead57e, 0x353558da, 0xededd07a, 0x4343fc17, 
-	0xf8f8cb66, 0xfbfbb194, 0x3737d3a1, 0xfafa401d, 
-	0xc2c2683d, 0xb4b4ccf0, 0x32325dde, 0x9c9c71b3, 
-	0x5656e70b, 0xe3e3da72, 0x878760a7, 0x15151b1c, 
-	0xf9f93aef, 0x6363bfd1, 0x3434a953, 0x9a9a853e, 
-	0xb1b1428f, 0x7c7cd133, 0x88889b26, 0x3d3da65f, 
-	0xa1a1d7ec, 0xe4e4df76, 0x8181942a, 0x91910149, 
-	0x0f0ffb81, 0xeeeeaa88, 0x161661ee, 0xd7d77321, 
-	0x9797f5c4, 0xa5a5a81a, 0xfefe3feb, 0x6d6db5d9, 
-	0x7878aec5, 0xc5c56d39, 0x1d1de599, 0x7676a4cd, 
-	0x3e3edcad, 0xcbcb6731, 0xb6b6478b, 0xefef5b01, 
-	0x12121e18, 0x6060c523, 0x6a6ab0dd, 0x4d4df61f, 
-	0xcecee94e, 0xdede7c2d, 0x55559df9, 0x7e7e5a48, 
-	0x2121b24f, 0x03037af2, 0xa0a02665, 0x5e5e198e, 
-	0x5a5a6678, 0x65654b5c, 0x62624e58, 0xfdfd4519, 
-	0x0606f48d, 0x404086e5, 0xf2f2be98, 0x3333ac57, 
-	0x17179067, 0x05058e7f, 0xe8e85e05, 0x4f4f7d64, 
-	0x89896aaf, 0x10109563, 0x74742fb6, 0x0a0a75fe, 
-	0x5c5c92f5, 0x9b9b74b7, 0x2d2d333c, 0x3030d6a5, 
-	0x2e2e49ce, 0x494989e9, 0x46467268, 0x77775544, 
-	0xa8a8d8e0, 0x9696044d, 0x2828bd43, 0xa9a92969, 
-	0xd9d97929, 0x8686912e, 0xd1d187ac, 0xf4f44a15, 
-	0x8d8d1559, 0xd6d682a8, 0xb9b9bc0a, 0x42420d9e, 
-	0xf6f6c16e, 0x2f2fb847, 0xdddd06df, 0x23233934, 
-	0xcccc6235, 0xf1f1c46a, 0xc1c112cf, 0x8585ebdc, 
-	0x8f8f9e22, 0x7171a1c9, 0x9090f0c0, 0xaaaa539b, 
-	0x0101f189, 0x8b8be1d4, 0x4e4e8ced, 0x8e8e6fab, 
-	0xababa212, 0x6f6f3ea2, 0xe6e6540d, 0xdbdbf252, 
-	0x92927bbb, 0xb7b7b602, 0x6969ca2f, 0x3939d9a9, 
-	0xd3d30cd7, 0xa7a72361, 0xa2a2ad1e, 0xc3c399b4, 
-	0x6c6c4450, 0x07070504, 0x04047ff6, 0x272746c2, 
-	0xacaca716, 0xd0d07625, 0x50501386, 0xdcdcf756, 
-	0x84841a55, 0xe1e15109, 0x7a7a25be, 0x1313ef91
-    },
-    {
-	0xa9d93939, 0x67901717, 0xb3719c9c, 0xe8d2a6a6, 
-	0x04050707, 0xfd985252, 0xa3658080, 0x76dfe4e4, 
-	0x9a084545, 0x92024b4b, 0x80a0e0e0, 0x78665a5a, 
-	0xe4ddafaf, 0xddb06a6a, 0xd1bf6363, 0x38362a2a, 
-	0x0d54e6e6, 0xc6432020, 0x3562cccc, 0x98bef2f2, 
-	0x181e1212, 0xf724ebeb, 0xecd7a1a1, 0x6c774141, 
-	0x43bd2828, 0x7532bcbc, 0x37d47b7b, 0x269b8888, 
-	0xfa700d0d, 0x13f94444, 0x94b1fbfb, 0x485a7e7e, 
-	0xf27a0303, 0xd0e48c8c, 0x8b47b6b6, 0x303c2424, 
-	0x84a5e7e7, 0x54416b6b, 0xdf06dddd, 0x23c56060, 
-	0x1945fdfd, 0x5ba33a3a, 0x3d68c2c2, 0x59158d8d, 
-	0xf321ecec, 0xae316666, 0xa23e6f6f, 0x82165757, 
-	0x63951010, 0x015befef, 0x834db8b8, 0x2e918686, 
-	0xd9b56d6d, 0x511f8383, 0x9b53aaaa, 0x7c635d5d, 
-	0xa63b6868, 0xeb3ffefe, 0xa5d63030, 0xbe257a7a, 
-	0x16a7acac, 0x0c0f0909, 0xe335f0f0, 0x6123a7a7, 
-	0xc0f09090, 0x8cafe9e9, 0x3a809d9d, 0xf5925c5c, 
-	0x73810c0c, 0x2c273131, 0x2576d0d0, 0x0be75656, 
-	0xbb7b9292, 0x4ee9cece, 0x89f10101, 0x6b9f1e1e, 
-	0x53a93434, 0x6ac4f1f1, 0xb499c3c3, 0xf1975b5b, 
-	0xe1834747, 0xe66b1818, 0xbdc82222, 0x450e9898, 
-	0xe26e1f1f, 0xf4c9b3b3, 0xb62f7474, 0x66cbf8f8, 
-	0xccff9999, 0x95ea1414, 0x03ed5858, 0x56f7dcdc, 
-	0xd4e18b8b, 0x1c1b1515, 0x1eada2a2, 0xd70cd3d3, 
-	0xfb2be2e2, 0xc31dc8c8, 0x8e195e5e, 0xb5c22c2c, 
-	0xe9894949, 0xcf12c1c1, 0xbf7e9595, 0xba207d7d, 
-	0xea641111, 0x77840b0b, 0x396dc5c5, 0xaf6a8989, 
-	0x33d17c7c, 0xc9a17171, 0x62ceffff, 0x7137bbbb, 
-	0x81fb0f0f, 0x793db5b5, 0x0951e1e1, 0xaddc3e3e, 
-	0x242d3f3f, 0xcda47676, 0xf99d5555, 0xd8ee8282, 
-	0xe5864040, 0xc5ae7878, 0xb9cd2525, 0x4d049696, 
-	0x44557777, 0x080a0e0e, 0x86135050, 0xe730f7f7, 
-	0xa1d33737, 0x1d40fafa, 0xaa346161, 0xed8c4e4e, 
-	0x06b3b0b0, 0x706c5454, 0xb22a7373, 0xd2523b3b, 
-	0x410b9f9f, 0x7b8b0202, 0xa088d8d8, 0x114ff3f3, 
-	0x3167cbcb, 0xc2462727, 0x27c06767, 0x90b4fcfc, 
-	0x20283838, 0xf67f0404, 0x60784848, 0xff2ee5e5, 
-	0x96074c4c, 0x5c4b6565, 0xb1c72b2b, 0xab6f8e8e, 
-	0x9e0d4242, 0x9cbbf5f5, 0x52f2dbdb, 0x1bf34a4a, 
-	0x5fa63d3d, 0x9359a4a4, 0x0abcb9b9, 0xef3af9f9, 
-	0x91ef1313, 0x85fe0808, 0x49019191, 0xee611616, 
-	0x2d7cdede, 0x4fb22121, 0x8f42b1b1, 0x3bdb7272, 
-	0x47b82f2f, 0x8748bfbf, 0x6d2caeae, 0x46e3c0c0, 
-	0xd6573c3c, 0x3e859a9a, 0x6929a9a9, 0x647d4f4f, 
-	0x2a948181, 0xce492e2e, 0xcb17c6c6, 0x2fca6969, 
-	0xfcc3bdbd, 0x975ca3a3, 0x055ee8e8, 0x7ad0eded, 
-	0xac87d1d1, 0x7f8e0505, 0xd5ba6464, 0x1aa8a5a5, 
-	0x4bb72626, 0x0eb9bebe, 0xa7608787, 0x5af8d5d5, 
-	0x28223636, 0x14111b1b, 0x3fde7575, 0x2979d9d9, 
-	0x88aaeeee, 0x3c332d2d, 0x4c5f7979, 0x02b6b7b7, 
-	0xb896caca, 0xda583535, 0xb09cc4c4, 0x17fc4343, 
-	0x551a8484, 0x1ff64d4d, 0x8a1c5959, 0x7d38b2b2, 
-	0x57ac3333, 0xc718cfcf, 0x8df40606, 0x74695353, 
-	0xb7749b9b, 0xc4f59797, 0x9f56adad, 0x72dae3e3, 
-	0x7ed5eaea, 0x154af4f4, 0x229e8f8f, 0x12a2abab, 
-	0x584e6262, 0x07e85f5f, 0x99e51d1d, 0x34392323, 
-	0x6ec1f6f6, 0x50446c6c, 0xde5d3232, 0x68724646, 
-	0x6526a0a0, 0xbc93cdcd, 0xdb03dada, 0xf8c6baba, 
-	0xc8fa9e9e, 0xa882d6d6, 0x2bcf6e6e, 0x40507070, 
-	0xdceb8585, 0xfe750a0a, 0x328a9393, 0xa48ddfdf, 
-	0xca4c2929, 0x10141c1c, 0x2173d7d7, 0xf0ccb4b4, 
-	0xd309d4d4, 0x5d108a8a, 0x0fe25151, 0x00000000, 
-	0x6f9a1919, 0x9de01a1a, 0x368f9494, 0x42e6c7c7, 
-	0x4aecc9c9, 0x5efdd2d2, 0xc1ab7f7f, 0xe0d8a8a8
-    },
-    {
-	0xbc75bc32, 0xecf3ec21, 0x20c62043, 0xb3f4b3c9, 
-	0xdadbda03, 0x027b028b, 0xe2fbe22b, 0x9ec89efa, 
-	0xc94ac9ec, 0xd4d3d409, 0x18e6186b, 0x1e6b1e9f, 
-	0x9845980e, 0xb27db238, 0xa6e8a6d2, 0x264b26b7, 
-	0x3cd63c57, 0x9332938a, 0x82d882ee, 0x52fd5298, 
-	0x7b377bd4, 0xbb71bb37, 0x5bf15b97, 0x47e14783, 
-	0x2430243c, 0x510f51e2, 0xbaf8bac6, 0x4a1b4af3, 
-	0xbf87bf48, 0x0dfa0d70, 0xb006b0b3, 0x753f75de, 
-	0xd25ed2fd, 0x7dba7d20, 0x66ae6631, 0x3a5b3aa3, 
-	0x598a591c, 0x00000000, 0xcdbccd93, 0x1a9d1ae0, 
-	0xae6dae2c, 0x7fc17fab, 0x2bb12bc7, 0xbe0ebeb9, 
-	0xe080e0a0, 0x8a5d8a10, 0x3bd23b52, 0x64d564ba, 
-	0xd8a0d888, 0xe784e7a5, 0x5f075fe8, 0x1b141b11, 
-	0x2cb52cc2, 0xfc90fcb4, 0x312c3127, 0x80a38065, 
-	0x73b2732a, 0x0c730c81, 0x794c795f, 0x6b546b41, 
-	0x4b924b02, 0x53745369, 0x9436948f, 0x8351831f, 
-	0x2a382a36, 0xc4b0c49c, 0x22bd22c8, 0xd55ad5f8, 
-	0xbdfcbdc3, 0x48604878, 0xff62ffce, 0x4c964c07, 
-	0x416c4177, 0xc742c7e6, 0xebf7eb24, 0x1c101c14, 
-	0x5d7c5d63, 0x36283622, 0x672767c0, 0xe98ce9af, 
-	0x441344f9, 0x149514ea, 0xf59cf5bb, 0xcfc7cf18, 
-	0x3f243f2d, 0xc046c0e3, 0x723b72db, 0x5470546c, 
-	0x29ca294c, 0xf0e3f035, 0x088508fe, 0xc6cbc617, 
-	0xf311f34f, 0x8cd08ce4, 0xa493a459, 0xcab8ca96, 
-	0x68a6683b, 0xb883b84d, 0x38203828, 0xe5ffe52e, 
-	0xad9fad56, 0x0b770b84, 0xc8c3c81d, 0x99cc99ff, 
-	0x580358ed, 0x196f199a, 0x0e080e0a, 0x95bf957e, 
-	0x70407050, 0xf7e7f730, 0x6e2b6ecf, 0x1fe21f6e, 
-	0xb579b53d, 0x090c090f, 0x61aa6134, 0x57825716, 
-	0x9f419f0b, 0x9d3a9d80, 0x11ea1164, 0x25b925cd, 
-	0xafe4afdd, 0x459a4508, 0xdfa4df8d, 0xa397a35c, 
-	0xea7eead5, 0x35da3558, 0xed7aedd0, 0x431743fc, 
-	0xf866f8cb, 0xfb94fbb1, 0x37a137d3, 0xfa1dfa40, 
-	0xc23dc268, 0xb4f0b4cc, 0x32de325d, 0x9cb39c71, 
-	0x560b56e7, 0xe372e3da, 0x87a78760, 0x151c151b, 
-	0xf9eff93a, 0x63d163bf, 0x345334a9, 0x9a3e9a85, 
-	0xb18fb142, 0x7c337cd1, 0x8826889b, 0x3d5f3da6, 
-	0xa1eca1d7, 0xe476e4df, 0x812a8194, 0x91499101, 
-	0x0f810ffb, 0xee88eeaa, 0x16ee1661, 0xd721d773, 
-	0x97c497f5, 0xa51aa5a8, 0xfeebfe3f, 0x6dd96db5, 
-	0x78c578ae, 0xc539c56d, 0x1d991de5, 0x76cd76a4, 
-	0x3ead3edc, 0xcb31cb67, 0xb68bb647, 0xef01ef5b, 
-	0x1218121e, 0x602360c5, 0x6add6ab0, 0x4d1f4df6, 
-	0xce4ecee9, 0xde2dde7c, 0x55f9559d, 0x7e487e5a, 
-	0x214f21b2, 0x03f2037a, 0xa065a026, 0x5e8e5e19, 
-	0x5a785a66, 0x655c654b, 0x6258624e, 0xfd19fd45, 
-	0x068d06f4, 0x40e54086, 0xf298f2be, 0x335733ac, 
-	0x17671790, 0x057f058e, 0xe805e85e, 0x4f644f7d, 
-	0x89af896a, 0x10631095, 0x74b6742f, 0x0afe0a75, 
-	0x5cf55c92, 0x9bb79b74, 0x2d3c2d33, 0x30a530d6, 
-	0x2ece2e49, 0x49e94989, 0x46684672, 0x77447755, 
-	0xa8e0a8d8, 0x964d9604, 0x284328bd, 0xa969a929, 
-	0xd929d979, 0x862e8691, 0xd1acd187, 0xf415f44a, 
-	0x8d598d15, 0xd6a8d682, 0xb90ab9bc, 0x429e420d, 
-	0xf66ef6c1, 0x2f472fb8, 0xdddfdd06, 0x23342339, 
-	0xcc35cc62, 0xf16af1c4, 0xc1cfc112, 0x85dc85eb, 
-	0x8f228f9e, 0x71c971a1, 0x90c090f0, 0xaa9baa53, 
-	0x018901f1, 0x8bd48be1, 0x4eed4e8c, 0x8eab8e6f, 
-	0xab12aba2, 0x6fa26f3e, 0xe60de654, 0xdb52dbf2, 
-	0x92bb927b, 0xb702b7b6, 0x692f69ca, 0x39a939d9, 
-	0xd3d7d30c, 0xa761a723, 0xa21ea2ad, 0xc3b4c399, 
-	0x6c506c44, 0x07040705, 0x04f6047f, 0x27c22746, 
-	0xac16aca7, 0xd025d076, 0x50865013, 0xdc56dcf7, 
-	0x8455841a, 0xe109e151, 0x7abe7a25, 0x139113ef
-    },
-    {
-	0xd939a9d9, 0x90176790, 0x719cb371, 0xd2a6e8d2, 
-	0x05070405, 0x9852fd98, 0x6580a365, 0xdfe476df, 
-	0x08459a08, 0x024b9202, 0xa0e080a0, 0x665a7866, 
-	0xddafe4dd, 0xb06addb0, 0xbf63d1bf, 0x362a3836, 
-	0x54e60d54, 0x4320c643, 0x62cc3562, 0xbef298be, 
-	0x1e12181e, 0x24ebf724, 0xd7a1ecd7, 0x77416c77, 
-	0xbd2843bd, 0x32bc7532, 0xd47b37d4, 0x9b88269b, 
-	0x700dfa70, 0xf94413f9, 0xb1fb94b1, 0x5a7e485a, 
-	0x7a03f27a, 0xe48cd0e4, 0x47b68b47, 0x3c24303c, 
-	0xa5e784a5, 0x416b5441, 0x06dddf06, 0xc56023c5, 
-	0x45fd1945, 0xa33a5ba3, 0x68c23d68, 0x158d5915, 
-	0x21ecf321, 0x3166ae31, 0x3e6fa23e, 0x16578216, 
-	0x95106395, 0x5bef015b, 0x4db8834d, 0x91862e91, 
-	0xb56dd9b5, 0x1f83511f, 0x53aa9b53, 0x635d7c63, 
-	0x3b68a63b, 0x3ffeeb3f, 0xd630a5d6, 0x257abe25, 
-	0xa7ac16a7, 0x0f090c0f, 0x35f0e335, 0x23a76123, 
-	0xf090c0f0, 0xafe98caf, 0x809d3a80, 0x925cf592, 
-	0x810c7381, 0x27312c27, 0x76d02576, 0xe7560be7, 
-	0x7b92bb7b, 0xe9ce4ee9, 0xf10189f1, 0x9f1e6b9f, 
-	0xa93453a9, 0xc4f16ac4, 0x99c3b499, 0x975bf197, 
-	0x8347e183, 0x6b18e66b, 0xc822bdc8, 0x0e98450e, 
-	0x6e1fe26e, 0xc9b3f4c9, 0x2f74b62f, 0xcbf866cb, 
-	0xff99ccff, 0xea1495ea, 0xed5803ed, 0xf7dc56f7, 
-	0xe18bd4e1, 0x1b151c1b, 0xada21ead, 0x0cd3d70c, 
-	0x2be2fb2b, 0x1dc8c31d, 0x195e8e19, 0xc22cb5c2, 
-	0x8949e989, 0x12c1cf12, 0x7e95bf7e, 0x207dba20, 
-	0x6411ea64, 0x840b7784, 0x6dc5396d, 0x6a89af6a, 
-	0xd17c33d1, 0xa171c9a1, 0xceff62ce, 0x37bb7137, 
-	0xfb0f81fb, 0x3db5793d, 0x51e10951, 0xdc3eaddc, 
-	0x2d3f242d, 0xa476cda4, 0x9d55f99d, 0xee82d8ee, 
-	0x8640e586, 0xae78c5ae, 0xcd25b9cd, 0x04964d04, 
-	0x55774455, 0x0a0e080a, 0x13508613, 0x30f7e730, 
-	0xd337a1d3, 0x40fa1d40, 0x3461aa34, 0x8c4eed8c, 
-	0xb3b006b3, 0x6c54706c, 0x2a73b22a, 0x523bd252, 
-	0x0b9f410b, 0x8b027b8b, 0x88d8a088, 0x4ff3114f, 
-	0x67cb3167, 0x4627c246, 0xc06727c0, 0xb4fc90b4, 
-	0x28382028, 0x7f04f67f, 0x78486078, 0x2ee5ff2e, 
-	0x074c9607, 0x4b655c4b, 0xc72bb1c7, 0x6f8eab6f, 
-	0x0d429e0d, 0xbbf59cbb, 0xf2db52f2, 0xf34a1bf3, 
-	0xa63d5fa6, 0x59a49359, 0xbcb90abc, 0x3af9ef3a, 
-	0xef1391ef, 0xfe0885fe, 0x01914901, 0x6116ee61, 
-	0x7cde2d7c, 0xb2214fb2, 0x42b18f42, 0xdb723bdb, 
-	0xb82f47b8, 0x48bf8748, 0x2cae6d2c, 0xe3c046e3, 
-	0x573cd657, 0x859a3e85, 0x29a96929, 0x7d4f647d, 
-	0x94812a94, 0x492ece49, 0x17c6cb17, 0xca692fca, 
-	0xc3bdfcc3, 0x5ca3975c, 0x5ee8055e, 0xd0ed7ad0, 
-	0x87d1ac87, 0x8e057f8e, 0xba64d5ba, 0xa8a51aa8, 
-	0xb7264bb7, 0xb9be0eb9, 0x6087a760, 0xf8d55af8, 
-	0x22362822, 0x111b1411, 0xde753fde, 0x79d92979, 
-	0xaaee88aa, 0x332d3c33, 0x5f794c5f, 0xb6b702b6, 
-	0x96cab896, 0x5835da58, 0x9cc4b09c, 0xfc4317fc, 
-	0x1a84551a, 0xf64d1ff6, 0x1c598a1c, 0x38b27d38, 
-	0xac3357ac, 0x18cfc718, 0xf4068df4, 0x69537469, 
-	0x749bb774, 0xf597c4f5, 0x56ad9f56, 0xdae372da, 
-	0xd5ea7ed5, 0x4af4154a, 0x9e8f229e, 0xa2ab12a2, 
-	0x4e62584e, 0xe85f07e8, 0xe51d99e5, 0x39233439, 
-	0xc1f66ec1, 0x446c5044, 0x5d32de5d, 0x72466872, 
-	0x26a06526, 0x93cdbc93, 0x03dadb03, 0xc6baf8c6, 
-	0xfa9ec8fa, 0x82d6a882, 0xcf6e2bcf, 0x50704050, 
-	0xeb85dceb, 0x750afe75, 0x8a93328a, 0x8ddfa48d, 
-	0x4c29ca4c, 0x141c1014, 0x73d72173, 0xccb4f0cc, 
-	0x09d4d309, 0x108a5d10, 0xe2510fe2, 0x00000000, 
-	0x9a196f9a, 0xe01a9de0, 0x8f94368f, 0xe6c742e6, 
-	0xecc94aec, 0xfdd25efd, 0xab7fc1ab, 0xd8a8e0d8
-    }
-};
-
-
-} // namespace
-
diff --git a/extra/yassl/taocrypt/src/twofish.cpp b/extra/yassl/taocrypt/src/twofish.cpp
deleted file mode 100644
index 3051af215135..000000000000
--- a/extra/yassl/taocrypt/src/twofish.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* C++ based on Wei Dai's twofish.cpp from CryptoPP */
-/* x86 asm original */
-
-
-#if defined(TAOCRYPT_KERNEL_MODE)
-    #define DO_TAOCRYPT_KERNEL_MODE
-#endif                                  // only some modules now support this
-
-#include "runtime.hpp"
-#include "twofish.hpp"
-
-
-
-namespace TaoCrypt {
-
-
-#if defined(DO_TWOFISH_ASM)
-
-// ia32 optimized version
-void Twofish::Process(byte* out, const byte* in, word32 sz)
-{
-    if (!isMMX) {
-        Mode_BASE::Process(out, in, sz);
-        return;
-    }
-
-    word32 blocks = sz / BLOCK_SIZE;
-
-    if (mode_ == ECB)
-        while (blocks--) {
-            if (dir_ == ENCRYPTION)
-                AsmEncrypt(in, out);
-            else
-                AsmDecrypt(in, out);
-        
-            out += BLOCK_SIZE;
-            in  += BLOCK_SIZE;
-        }
-    else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION) {
-            while (blocks--) {
-                r_[0] ^= *(word32*)in;
-                r_[1] ^= *(word32*)(in +  4);
-                r_[2] ^= *(word32*)(in +  8);
-                r_[3] ^= *(word32*)(in + 12);
-
-                AsmEncrypt((byte*)r_, (byte*)r_);
-                memcpy(out, r_, BLOCK_SIZE);
-
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-        else {
-            while (blocks--) {
-                AsmDecrypt(in, out);
-               
-                *(word32*)out        ^= r_[0];
-                *(word32*)(out +  4) ^= r_[1];
-                *(word32*)(out +  8) ^= r_[2];
-                *(word32*)(out + 12) ^= r_[3];
-
-                memcpy(r_, in, BLOCK_SIZE);
-
-                out += BLOCK_SIZE;
-                in  += BLOCK_SIZE;
-            }
-        }
-    }
-}
-
-#endif // DO_TWOFISH_ASM
-
-
-namespace {     // locals
-
-// compute (c * x^4) mod (x^4 + (a + 1/a) * x^3 + a * x^2 + (a + 1/a) * x + 1)
-// over GF(256)
-static inline unsigned int Mod(unsigned int c)
-{
-	static const unsigned int modulus = 0x14d;
-	unsigned int c2 = (c<<1) ^ ((c & 0x80) ? modulus : 0);
-	unsigned int c1 = c2 ^ (c>>1) ^ ((c & 1) ? (modulus>>1) : 0);
-	return c | (c1 << 8) | (c2 << 16) | (c1 << 24);
-}
-
-// compute RS(12,8) code with the above polynomial as generator
-// this is equivalent to multiplying by the RS matrix
-static word32 ReedSolomon(word32 high, word32 low)
-{
-	for (unsigned int i=0; i<8; i++) {
-		high = Mod(high>>24) ^ (high<<8) ^ (low>>24);
-		low <<= 8;
-	}
-	return high;
-}
-
-}  // local namespace
-
-
-
-inline word32 Twofish::h0(word32 x, const word32* key, unsigned int kLen)
-{
-	x = x | (x<<8) | (x<<16) | (x<<24);
-	switch(kLen)
-	{
-#define Q(a, b, c, d, t) q_[a][GETBYTE(t,0)] ^ (q_[b][GETBYTE(t,1)] << 8) ^  \
-            (q_[c][GETBYTE(t,2)] << 16) ^ (q_[d][GETBYTE(t,3)] << 24)
-	case 4: x = Q(1, 0, 0, 1, x) ^ key[6];
-	case 3: x = Q(1, 1, 0, 0, x) ^ key[4];
-	case 2: x = Q(0, 1, 0, 1, x) ^ key[2];
-			x = Q(0, 0, 1, 1, x) ^ key[0];
-	}
-	return x;
-}
-
-inline word32 Twofish::h(word32 x, const word32* key, unsigned int kLen)
-{
-	x = h0(x, key, kLen);
-	return mds_[0][GETBYTE(x,0)] ^ mds_[1][GETBYTE(x,1)] ^ 
-        mds_[2][GETBYTE(x,2)] ^ mds_[3][GETBYTE(x,3)];
-}
-
-
-void Twofish::SetKey(const byte* userKey, word32 keylen, CipherDir /*dummy*/)
-{
-	unsigned int len = (keylen <= 16 ? 2 : (keylen <= 24 ? 3 : 4));
-    word32 key[8];
-	GetUserKey(LittleEndianOrder, key, len*2, userKey, keylen);
-
-	unsigned int i;
-	for (i=0; i<40; i+=2) {
-		word32 a = h(i, key, len);
-		word32 b = rotlFixed(h(i+1, key+1, len), 8);
-		k_[i] = a+b;
-		k_[i+1] = rotlFixed(a+2*b, 9);
-	}
-
-	word32 svec[8];
-	for (i=0; i<len; i++)
-		svec[2*(len-i-1)] = ReedSolomon(key[2*i+1], key[2*i]);
-
-	for (i=0; i<256; i++) {
-		word32 t = h0(i, svec, len);
-		s_[0][i] = mds_[0][GETBYTE(t, 0)];
-		s_[1][i] = mds_[1][GETBYTE(t, 1)];
-		s_[2][i] = mds_[2][GETBYTE(t, 2)];
-		s_[3][i] = mds_[3][GETBYTE(t, 3)];
-	}
-}
-
-
-void Twofish::ProcessAndXorBlock(const byte* in, const byte* xOr, byte* out)
-    const
-{
-    if (dir_ == ENCRYPTION)
-        encrypt(in, xOr, out);
-    else
-        decrypt(in, xOr, out);
-}
-
-#define G1(x) (s_[0][GETBYTE(x,0)] ^ s_[1][GETBYTE(x,1)] ^ \
-            s_[2][GETBYTE(x,2)] ^ s_[3][GETBYTE(x,3)])
-#define G2(x) (s_[0][GETBYTE(x,3)] ^ s_[1][GETBYTE(x,0)] ^ \
-            s_[2][GETBYTE(x,1)] ^ s_[3][GETBYTE(x,2)])
-
-#define ENCROUND(n, a, b, c, d) \
-	x = G1 (a); y = G2 (b); \
-	x += y; y += x + k[2 * (n) + 1]; \
-	(c) ^= x + k[2 * (n)]; \
-	(c) = rotrFixed(c, 1); \
-	(d) = rotlFixed(d, 1) ^ y
-
-#define ENCCYCLE(n) \
-	ENCROUND (2 * (n), a, b, c, d); \
-	ENCROUND (2 * (n) + 1, c, d, a, b)
-
-#define DECROUND(n, a, b, c, d) \
-	x = G1 (a); y = G2 (b); \
-	x += y; y += x; \
-	(d) ^= y + k[2 * (n) + 1]; \
-	(d) = rotrFixed(d, 1); \
-	(c) = rotlFixed(c, 1); \
-	(c) ^= (x + k[2 * (n)])
-
-#define DECCYCLE(n) \
-	DECROUND (2 * (n) + 1, c, d, a, b); \
-	DECROUND (2 * (n), a, b, c, d)
-
-
-typedef BlockGetAndPut<word32, LittleEndian> gpBlock;
-
-void Twofish::encrypt(const byte* inBlock, const byte* xorBlock,
-                  byte* outBlock) const
-{
-	word32 x, y, a, b, c, d;
-
-	gpBlock::Get(inBlock)(a)(b)(c)(d);
-
-	a ^= k_[0];
-	b ^= k_[1];
-	c ^= k_[2];
-	d ^= k_[3];
-
-	const word32 *k = k_+8;
-
-	ENCCYCLE (0);
-	ENCCYCLE (1);
-	ENCCYCLE (2);
-	ENCCYCLE (3);
-	ENCCYCLE (4);
-	ENCCYCLE (5);
-	ENCCYCLE (6);
-	ENCCYCLE (7);
-
-	c ^= k_[4];
-	d ^= k_[5];
-	a ^= k_[6];
-	b ^= k_[7]; 
-
-	gpBlock::Put(xorBlock, outBlock)(c)(d)(a)(b);
-}
-
-
-void Twofish::decrypt(const byte* inBlock, const byte* xorBlock,
-                  byte* outBlock) const
-{
-	word32 x, y, a, b, c, d;
-
-	gpBlock::Get(inBlock)(c)(d)(a)(b);
-
-	c ^= k_[4];
-	d ^= k_[5];
-	a ^= k_[6];
-	b ^= k_[7];
-
-	const word32 *k = k_+8;
-	DECCYCLE (7);
-	DECCYCLE (6);
-	DECCYCLE (5);
-	DECCYCLE (4);
-	DECCYCLE (3);
-	DECCYCLE (2);
-	DECCYCLE (1);
-	DECCYCLE (0);
-
-	a ^= k_[0];
-	b ^= k_[1];
-	c ^= k_[2];
-	d ^= k_[3];
-
-	gpBlock::Put(xorBlock, outBlock)(a)(b)(c)(d);
-}
-
-
-
-#if defined(DO_TWOFISH_ASM)
-    #ifdef __GNUC__
-        #define AS1(x)    #x ";"
-        #define AS2(x, y) #x ", " #y ";"
-
-        #define PROLOG()  \
-        __asm__ __volatile__ \
-        ( \
-            ".intel_syntax noprefix;" \
-            "push ebx;" \
-            "push ebp;" \
-            "movd mm3, eax;" \
-            "movd mm6, ebp;"
-        #define EPILOG()  \
-            "pop ebp;" \
-            "pop ebx;" \
-       	    "emms;" \
-       	    ".att_syntax;" \
-                : \
-                : "D" (this), "S" (inBlock), "a" (outBlock) \
-                : "%ecx", "%edx", "memory", "cc" \
-        );
-
-    #else
-        #define AS1(x)    __asm x
-        #define AS2(x, y) __asm x, y
-
-        #define PROLOG() \
-            AS1(    push  ebp                           )   \
-            AS2(    mov   ebp, esp                      )   \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    movd  mm6, ebp                      )   \
-            AS2(    mov   edi, ecx                      )   \
-            AS2(    mov   esi, DWORD PTR [ebp +  8]     )
-
-        /* ebp already set */
-        #define EPILOG()  \
-            AS2(    movd esi, mm5                   )   \
-            AS2(    movd ebx, mm4                   )   \
-            AS2(    movd edi, mm3                   )   \
-            AS2(    mov  esp, ebp                   )   \
-            AS1(    pop  ebp                        )   \
-            AS1(    emms                            )   \
-            AS1(    ret 8                           )    
-            
-    #endif
-
-
-
-
-    // x = esi, y = [esp], s_ = ebp
-    // edi always open for G1 and G2
-    // G1 also uses edx after save and restore
-    // G2 also uses eax after save and restore
-    //      and ecx for tmp [esp] which Rounds also use
-    //      and restore from mm7
-
-    // x = G1(a)   bytes(0,1,2,3)
-#define ASMG1(z, zl, zh) \
-    AS2(    movd  mm2, edx                          )   \
-    AS2(    movzx edi, zl                           )   \
-    AS2(    mov   esi, DWORD PTR     [ebp + edi*4]  )   \
-    AS2(    movzx edx, zh                           )   \
-    AS2(    xor   esi, DWORD PTR 1024[ebp + edx*4]  )   \
-                                                        \
-    AS2(    mov   edx, z                            )   \
-    AS2(    shr   edx, 16                           )   \
-    AS2(    movzx edi, dl                           )   \
-    AS2(    xor   esi, DWORD PTR 2048[ebp + edi*4]  )   \
-    AS2(    movzx edx, dh                           )   \
-    AS2(    xor   esi, DWORD PTR 3072[ebp + edx*4]  )   \
-    AS2(    movd  edx, mm2                          )
-
-
-    // y = G2(b)  bytes(3,0,1,2)  [ put y into ecx for Rounds ]
-#define ASMG2(z, zl, zh)    \
-    AS2(    movd  mm7, ecx                          )   \
-    AS2(    movd  mm2, eax                          )   \
-    AS2(    mov   edi, z                            )   \
-    AS2(    shr   edi, 24                           )   \
-    AS2(    mov   ecx, DWORD PTR     [ebp + edi*4]  )   \
-    AS2(    movzx eax, zl                           )   \
-    AS2(    xor   ecx, DWORD PTR 1024[ebp + eax*4]  )   \
-                                                        \
-    AS2(    mov   eax, z                            )   \
-    AS2(    shr   eax, 16                           )   \
-    AS2(    movzx edi, zh                           )   \
-    AS2(    xor   ecx, DWORD PTR 2048[ebp + edi*4]  )   \
-    AS2(    movzx eax, al                           )   \
-    AS2(    xor   ecx, DWORD PTR 3072[ebp + eax*4]  )   \
-    AS2(    movd  eax, mm2                          )
-
-
-    // encrypt Round (n), 
-    // x = esi, k = ebp, edi open
-    // y is in ecx from G2, restore when done from mm7
-    //      before C (which be same register!)
-#define ASMENCROUND(N, A, A2, A3, B, B2, B3, C, D)      \
-    /* setup s_  */                                     \
-    AS2(    movd  ebp, mm1                          )   \
-    ASMG1(A, A2, A3)                                    \
-    ASMG2(B, B2, B3)                                    \
-    /* setup k  */                                      \
-    AS2(    movd  ebp, mm0                          )   \
-    /* x += y   */                                      \
-    AS2(    add   esi, ecx                          )   \
-    AS2(    add   ebp, 32                           )   \
-    /* y += x + k[2 * (n) + 1] */                       \
-    AS2(    add   ecx, esi                          )   \
-    AS2(    rol   D,   1                            )   \
-    AS2(    add   ecx, DWORD PTR [ebp + 8 * N + 4]  )   \
-	/* (d) = rotlFixed(d, 1) ^ y  */                    \
-    AS2(    xor   D,   ecx                          )   \
-    AS2(    movd  ecx, mm7                          )   \
-	/* (c) ^= x + k[2 * (n)] */                         \
-    AS2(    mov   edi, esi                          )   \
-    AS2(    add   edi, DWORD PTR [ebp + 8 * N]      )   \
-    AS2(    xor   C,   edi                          )   \
-	/* (c) = rotrFixed(c, 1) */                         \
-    AS2(    ror   C,   1                            )
-
-
-    // decrypt Round (n), 
-    // x = esi, k = ebp, edi open
-    // y is in ecx from G2, restore ecx from mm7 when done
-#define ASMDECROUND(N, A, A2, A3, B, B2, B3, C, D)      \
-    /* setup s_  */                                     \
-    AS2(    movd  ebp, mm1                          )   \
-    ASMG1(A, A2, A3)                                    \
-    ASMG2(B, B2, B3)                                    \
-    /* setup k  */                                      \
-    AS2(    movd  ebp, mm0                          )   \
-    /* x += y   */                                      \
-    AS2(    add   esi, ecx                          )   \
-    AS2(    add   ebp, 32                           )   \
-    /* y += x     */                                    \
-    AS2(    add   ecx, esi                          )   \
-	/* (d) ^= y + k[2 * (n) + 1] */                     \
-    AS2(    mov   edi, DWORD PTR [ebp + 8 * N + 4]  )   \
-    AS2(    add   edi, ecx                          )   \
-    AS2(    movd  ecx, mm7                          )   \
-    AS2(    xor   D,   edi                          )   \
-	/* (d) = rotrFixed(d, 1)     */                     \
-    AS2(    ror   D,   1                            )   \
-	/* (c) = rotlFixed(c, 1)     */                     \
-    AS2(    rol   C,   1                            )   \
-	/* (c) ^= (x + k[2 * (n)])   */                     \
-    AS2(    mov   edi, esi                          )   \
-    AS2(    add   edi, DWORD PTR [ebp + 8 * N]      )   \
-    AS2(    xor   C,   edi                          )
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void Twofish::AsmEncrypt(const byte* inBlock, byte* outBlock) const
-{
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    add   edi, 60                       ) // k_
-    #else
-        AS2(    add   edi, 56                       ) // k_
-    #endif
-
-    AS2(    mov   ebp, edi                      )
-
-    AS2(    mov   eax, DWORD PTR [esi]          ) // a
-    AS2(    movd  mm0, edi                      ) // store k_
-    AS2(    mov   ebx, DWORD PTR [esi +  4]     ) // b
-    AS2(    add   ebp, 160                      ) // s_[0]
-    AS2(    mov   ecx, DWORD PTR [esi +  8]     ) // c
-    AS2(    movd  mm1, ebp                      ) // store s_
-    AS2(    mov   edx, DWORD PTR [esi + 12]     ) // d
-    
-    AS2(    xor   eax, DWORD PTR [edi]          ) // k_[0]
-    AS2(    xor   ebx, DWORD PTR [edi +  4]     ) //   [1]
-    AS2(    xor   ecx, DWORD PTR [edi +  8]     ) //   [2]
-    AS2(    xor   edx, DWORD PTR [edi + 12]     ) //   [3]
-
-
-    ASMENCROUND( 0, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND( 1, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND( 2, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND( 3, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND( 4, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND( 5, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND( 6, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND( 7, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND( 8, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND( 9, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND(10, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND(11, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND(12, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND(13, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMENCROUND(14, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMENCROUND(15, ecx, cl, ch, edx, dl, dh, eax, ebx)
-
-
-    AS2(    movd  ebp, mm6                      )
-    AS2(    movd  esi, mm0                      ) // k_
-    #ifdef __GNUC__
-        AS2(    movd  edi, mm3                  ) // outBlock
-    #else
-        AS2(    mov   edi, [ebp + 12]           ) // outBlock
-    #endif
-
-    AS2(    xor   ecx, DWORD PTR [esi + 16]     ) // k_[4]
-    AS2(    xor   edx, DWORD PTR [esi + 20]     ) // k_[5]
-    AS2(    xor   eax, DWORD PTR [esi + 24]     ) // k_[6]
-    AS2(    xor   ebx, DWORD PTR [esi + 28]     ) // k_[7]
-
-    AS2(    mov   [edi],      ecx               ) // write out
-    AS2(    mov   [edi +  4], edx               ) // write out
-    AS2(    mov   [edi +  8], eax               ) // write out
-    AS2(    mov   [edi + 12], ebx               ) // write out
-
-
-    EPILOG()
-}
-
-
-#ifdef _MSC_VER
-    __declspec(naked) 
-#else
-    __attribute__ ((noinline))
-#endif
-void Twofish::AsmDecrypt(const byte* inBlock, byte* outBlock) const
-{
-    PROLOG()
-
-    #ifdef OLD_GCC_OFFSET
-        AS2(    add   edi, 60                       ) // k_
-    #else
-        AS2(    add   edi, 56                       ) // k_
-    #endif
-
-    AS2(    mov   ebp, edi                      )
-
-    AS2(    mov   ecx, DWORD PTR [esi]          ) // c
-    AS2(    movd  mm0, edi                      ) // store k_
-    AS2(    mov   edx, DWORD PTR [esi +  4]     ) // d
-    AS2(    add   ebp, 160                      ) // s_[0]
-    AS2(    mov   eax, DWORD PTR [esi +  8]     ) // a
-    AS2(    movd  mm1, ebp                      ) // store s_
-    AS2(    mov   ebx, DWORD PTR [esi + 12]     ) // b
-
-    AS2(    xor   ecx, DWORD PTR [edi + 16]     ) // k_[4]
-    AS2(    xor   edx, DWORD PTR [edi + 20]     ) //   [5]
-    AS2(    xor   eax, DWORD PTR [edi + 24]     ) //   [6]
-    AS2(    xor   ebx, DWORD PTR [edi + 28]     ) //   [7]
-
-
-    ASMDECROUND(15, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND(14, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND(13, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND(12, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND(11, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND(10, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND( 9, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND( 8, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND( 7, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND( 6, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND( 5, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND( 4, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND( 3, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND( 2, eax, al, ah, ebx, bl, bh, ecx, edx)
-    ASMDECROUND( 1, ecx, cl, ch, edx, dl, dh, eax, ebx)
-    ASMDECROUND( 0, eax, al, ah, ebx, bl, bh, ecx, edx)
-
-
-    AS2(    movd  ebp, mm6                      )
-    AS2(    movd  esi, mm0                      ) // k_
-    #ifdef __GNUC__
-        AS2(    movd  edi, mm3                  ) // outBlock
-    #else
-        AS2(    mov   edi, [ebp + 12]           ) // outBlock
-    #endif
-
-    AS2(    xor   eax, DWORD PTR [esi     ]     ) // k_[0]
-    AS2(    xor   ebx, DWORD PTR [esi +  4]     ) // k_[1]
-    AS2(    xor   ecx, DWORD PTR [esi +  8]     ) // k_[2]
-    AS2(    xor   edx, DWORD PTR [esi + 12]     ) // k_[3]
-
-    AS2(    mov   [edi],      eax               ) // write out
-    AS2(    mov   [edi +  4], ebx               ) // write out
-    AS2(    mov   [edi +  8], ecx               ) // write out
-    AS2(    mov   [edi + 12], edx               ) // write out
-
-
-    EPILOG()
-}
-
-
-
-#endif // defined(DO_TWOFISH_ASM)
-
-
-
-
-
-} // namespace
-
-
diff --git a/extra/yassl/taocrypt/taocrypt.dsp b/extra/yassl/taocrypt/taocrypt.dsp
deleted file mode 100644
index 9c8e74da8c84..000000000000
--- a/extra/yassl/taocrypt/taocrypt.dsp
+++ /dev/null
@@ -1,321 +0,0 @@
-# Microsoft Developer Studio Project File - Name="taocrypt" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=taocrypt - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "taocrypt.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "taocrypt.mak" CFG="taocrypt - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "taocrypt - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "taocrypt - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "taocrypt - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "taocrypt___Win32_Release"
-# PROP BASE Intermediate_Dir "taocrypt___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "include" /I "mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "taocrypt - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "taocrypt___Win32_Debug"
-# PROP BASE Intermediate_Dir "taocrypt___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "taocrypt - Win32 Release"
-# Name "taocrypt - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\aes.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\aestables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\algebra.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\arc4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\asn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bftables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\blowfish.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\coding.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\des.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\dh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\dsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\hash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\hc128.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\integer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\md2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\md4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\md5.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\misc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\rabbit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\random.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\ripemd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\rsa.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\sha.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\tftables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\twofish.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\include\aes.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\algebra.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arc4.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\asn.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\block.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\blowfish.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\coding.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\des.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\dh.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\dsa.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\error.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\file.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\hash.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\hc128.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\hmac.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\integer.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\md2.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\md4.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\md5.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\misc.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\modarith.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\modes.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\pwdbased.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\rabbit.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\random.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\ripemd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\rsa.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\sha.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\twofish.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\type_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\types.hpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/taocrypt/taocrypt.dsw b/extra/yassl/taocrypt/taocrypt.dsw
deleted file mode 100644
index 431150691609..000000000000
--- a/extra/yassl/taocrypt/taocrypt.dsw
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "benchmark"=.\benchmark\benchmark.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name taocrypt
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "taocrypt"=.\taocrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "test"=.\test\test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name taocrypt
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/extra/yassl/taocrypt/test.dsw b/extra/yassl/taocrypt/test.dsw
deleted file mode 100644
index b5c03bc6e039..000000000000
--- a/extra/yassl/taocrypt/test.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "test"=.\test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/extra/yassl/taocrypt/test/make.bat b/extra/yassl/taocrypt/test/make.bat
deleted file mode 100644
index a0cd1566e12b..000000000000
--- a/extra/yassl/taocrypt/test/make.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-REM quick and dirty build file for testing different MSDEVs
-setlocal 
-
-set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2
-
-cl %myFLAGS% test.cpp
-
-link.exe  /out:test.exe ../src/taocrypt.lib test.obj advapi32.lib
-
diff --git a/extra/yassl/taocrypt/test/memory.cpp b/extra/yassl/taocrypt/test/memory.cpp
deleted file mode 100644
index 053d79688a27..000000000000
--- a/extra/yassl/taocrypt/test/memory.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-// memory.cpp
-#include "../../include/lock.hpp"     // locking
-#include <new>          // std::bad_alloc
-#include <cstdlib>      // malloc
-#include <cstring>      // memset
-#include <fstream>      // ofstream
-#include <sstream>      // stringstream
-#include <cassert>      // assert
-#include <iomanip>      // setiosflags
-
-/*********************************************************************
-
-To use MemoryTracker merely add this file to your project
-No need to instantiate anything
-
-If your app is multi threaded define MULTI_THREADED
-
-*********************************************************************/
-
-
-// locals
-namespace {
-
-class MemoryTracker {
-    std::ofstream log_;
-public:
-    MemoryTracker();
-    ~MemoryTracker();
-private:
-    MemoryTracker(const MemoryTracker&);             // hide copy
-    MemoryTracker& operator=(const MemoryTracker&);  // and assign
-
-    void LogStats();
-};
-
-
-struct alloc_node {
-    alloc_node* left_;
-    alloc_node* right_;
-  
-    alloc_node() : left_(0), right_(0) {}
-};
-
-
-alloc_node* Root = 0;
-
-size_t Allocs    = 0;
-size_t DeAllocs  = 0;
-size_t Bytes     = 0;
-
-
-struct size_tracker {
-    size_t size_;
-    size_t count_;
-};
-
-size_tracker sizes[] = 
-{
-    {0,0},
-    {2,0},
-    {4,0},
-    {8,0},
-    {16,0},
-    {32,0},
-    {64,0},
-    {128,0},
-    {256,0},
-    {512,0},
-    {1024,0},
-    {2048,0},
-    {4096,0},
-    {8192,0},
-};
-
-const size_t size_elements(sizeof(sizes) / sizeof(size_tracker));
-
-bool Tracking(false);
-
-using   yaSSL::Mutex;
-typedef Mutex::Lock Lock;
-
-Mutex mutex;
-
-MemoryTracker theTracker;
-
-
-bool lookup(alloc_node*& find, void* key, alloc_node*& prev)
-{
-    bool found(false);
-
-    while (find) {
-        if (find == key) {
-            found = true;
-            break;
-        }
-        prev = find;
-        if (key < find)
-            find = find->left_;
-        else
-            find = find->right_;
-    }
-    return found;
-}
-
-
-// iterative insert
-void insert(alloc_node* entry)
-{
-    if (!Root) {
-        Root = entry;
-        return;
-    }
-       
-    alloc_node* tmp  = Root;
-    alloc_node* prev = 0;
-
-    if (lookup(tmp, entry, prev)) 
-        assert(0); // duplicate
-
-    if (entry < prev)
-        prev->left_  = entry;
-    else
-        prev->right_ = entry;
-}
-
-
-alloc_node* predecessorSwap(alloc_node* del)
-{
-    alloc_node* pred = del->left_;
-    alloc_node* predPrev = del;
-
-    while (pred->right_) {
-        predPrev = pred;
-        pred = pred->right_;
-    }
-    if (predPrev == del)
-        predPrev->left_  = pred->left_;
-    else
-        predPrev->right_ = pred->left_;
-
-    pred->left_  = del->left_;
-    pred->right_ = del->right_;
-
-    return pred;
-}
-
-
-// iterative remove
-void remove(void* ptr)
-{
-    alloc_node* del  = Root;
-    alloc_node* prev = 0;
-    alloc_node* replace = 0;
-
-    if ( lookup(del, ptr, prev) == false)
-        assert(0); // oops, not there
-
-    if (del->left_ && del->right_)          // two children
-        replace = predecessorSwap(del);
-    else if (!del->left_ && !del->right_)   // no children
-        replace = 0;
-    else                                    // one child
-        replace = (del->left_) ? del->left_ : del->right_;
-
-    if (del == Root)
-        Root = replace;
-    else if (prev->left_ == del)
-        prev->left_  = replace;
-    else
-        prev->right_ = replace;
-}
-
-
-typedef void (*fp)(alloc_node*, void*);
-
-void applyInOrder(alloc_node* root, fp f, void* arg)
-{
-    if (root == 0)
-        return;
-    
-    applyInOrder(root->left_,  f, arg);
-    f(root, arg);
-    applyInOrder(root->right_, f, arg);
-}
-
-
-void show(alloc_node* ptr, void* arg)
-{
-    std::ofstream* log = static_cast<std::ofstream*>(arg);
-    *log << ptr << '\n';
-}
-
-
-MemoryTracker::MemoryTracker() : log_("memory.log")
-{
-#ifdef __GNUC__
-    // Force pool allocator to cleanup at exit
-    setenv("GLIBCPP_FORCE_NEW", "1", 0);
-#endif
-
-#ifdef _MSC_VER
-    // msvc6 needs to create Facility for ostream before main starts, otherwise
-    // if another ostream is created and destroyed in main scope, log stats
-    // will access a dead Facility reference (std::numput)
-    int msvcFac = 6;
-    log_ << "MSVC " << msvcFac << "workaround" << std::endl; 
-#endif
-
-
-    Tracking = true;
-}
-
-
-MemoryTracker::~MemoryTracker()
-{
-    // stop tracking before log (which will alloc on output)
-    Tracking = false;
-    LogStats();
-
-    //assert(Allocs == DeAllocs);
-    //assert(Root == 0);
-}
-
-
-void MemoryTracker::LogStats()
-{
-    log_ << "Number of Allocs:     " << Allocs    << '\n';
-    log_ << "Number of DeAllocs:   " << DeAllocs  << '\n';
-    log_ << "Number of bytes used: " << Bytes     << '\n';
-
-    log_ << "Alloc size table:\n";
-    log_ << " Bytes " << '\t' << "   Times\n";
-
-    for (size_t i = 0; i < size_elements; ++i) {
-        log_ << " " << sizes[i].size_  << "  " << '\t';
-        log_ << std::setiosflags(std::ios::right) << std::setw(8);
-        log_ << sizes[i].count_ << '\n';
-    }
-
-    if (Allocs != DeAllocs) {
-        log_<< "Showing new'd allocs with no deletes" << '\n';
-        applyInOrder(Root, show, &log_);
-    }
-    log_.flush();
-}
-
-
-// return power of 2 up to size_tracker elements
-size_t powerOf2(size_t sz)
-{
-    size_t shifts = 0;
-
-    if (sz)
-        sz -= 1;
-    else
-        return 0;
-	   
-    while (sz) {
-        sz >>= 1;
-        ++shifts;
-    }
-
-    return shifts < size_elements ? shifts : size_elements;
-}
-
-
-} // namespace local
-
-
-void* operator new(size_t sz)
-{
-    // put alloc node in front of requested memory
-    void* ptr = malloc(sz + sizeof(alloc_node));
-    if (ptr) {
-        if (Tracking) {
-            Lock l(mutex);
-            ++Allocs;
-            Bytes += sz;
-            ++sizes[powerOf2(sz)].count_;
-            insert(new (ptr) alloc_node);
-        }
-        return static_cast<char*>(ptr) + sizeof(alloc_node);
-    }
-    else
-        assert(0);
-}
-
-
-void operator delete(void* ptr)
-{
-    if (ptr) {
-        ptr = static_cast<char*>(ptr) - sizeof(alloc_node);  // correct offset
-        if (Tracking) {
-            Lock l(mutex);
-            ++DeAllocs;
-            remove(ptr);
-        }
-        free(ptr);
-    }
-}
-
-
-void* operator new[](size_t sz)
-{
-    return ::operator new(sz);
-}
-
-
-void operator delete[](void* ptr)
-{
-    ::operator delete(ptr);
-}
-
-
-extern "C" {
-
-void* XMALLOC(size_t sz, void* head)
-{
-    return ::operator new(sz);
-}
-
-void* XREALLOC(void* ptr, size_t sz, void* heap)
-{
-    void* ret = ::operator new(sz);
-
-    if (ret && ptr)
-        memcpy(ret, ptr, sz);
-
-    if (ret)
-        ::operator delete(ptr);
-    return ret;
-}
-
-
-void XFREE(void* ptr, void* heap)
-{
-    ::operator delete(ptr);
-}
-
-}  // extern "C"
-
diff --git a/extra/yassl/taocrypt/test/test.cpp b/extra/yassl/taocrypt/test/test.cpp
deleted file mode 100644
index fc1f0e8762dd..000000000000
--- a/extra/yassl/taocrypt/test/test.cpp
+++ /dev/null
@@ -1,1354 +0,0 @@
-/*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-// test.cpp
-// test taocrypt functionality
-
-#include <string.h>
-#include <stdio.h>
-
-#include "runtime.hpp"
-#include "sha.hpp"
-#include "md5.hpp"
-#include "md2.hpp"
-#include "md4.hpp"
-#include "ripemd.hpp"
-#include "hmac.hpp"
-#include "arc4.hpp"
-#include "des.hpp"
-#include "rsa.hpp"
-#include "dsa.hpp"
-#include "aes.hpp"
-#include "twofish.hpp"
-#include "blowfish.hpp"
-#include "asn.hpp"
-#include "dh.hpp"
-#include "coding.hpp"
-#include "random.hpp"
-#include "pwdbased.hpp"
-#include "rabbit.hpp"
-#include "hc128.hpp"
-
-
-
-using TaoCrypt::byte;
-using TaoCrypt::word32;
-using TaoCrypt::SHA;
-using TaoCrypt::SHA256;
-using TaoCrypt::SHA224;
-#ifdef WORD64_AVAILABLE
-    using TaoCrypt::SHA512;
-    using TaoCrypt::SHA384;
-#endif
-using TaoCrypt::MD5;
-using TaoCrypt::MD2;
-using TaoCrypt::MD4;
-using TaoCrypt::RIPEMD160;
-using TaoCrypt::HMAC;
-using TaoCrypt::ARC4;
-using TaoCrypt::DES_EDE3_CBC_Encryption;
-using TaoCrypt::DES_EDE3_CBC_Decryption;
-using TaoCrypt::DES_CBC_Encryption;
-using TaoCrypt::DES_CBC_Decryption;
-using TaoCrypt::DES_ECB_Encryption;
-using TaoCrypt::DES_ECB_Decryption;
-using TaoCrypt::AES_CBC_Encryption;
-using TaoCrypt::AES_CBC_Decryption;
-using TaoCrypt::AES_ECB_Encryption;
-using TaoCrypt::AES_ECB_Decryption;
-using TaoCrypt::Twofish_CBC_Encryption;
-using TaoCrypt::Twofish_CBC_Decryption;
-using TaoCrypt::Twofish_ECB_Encryption;
-using TaoCrypt::Twofish_ECB_Decryption;
-using TaoCrypt::Blowfish_CBC_Encryption;
-using TaoCrypt::Blowfish_CBC_Decryption;
-using TaoCrypt::Blowfish_ECB_Encryption;
-using TaoCrypt::Blowfish_ECB_Decryption;
-using TaoCrypt::RSA_PrivateKey;
-using TaoCrypt::RSA_PublicKey;
-using TaoCrypt::DSA_PrivateKey;
-using TaoCrypt::DSA_PublicKey;
-using TaoCrypt::DSA_Signer;
-using TaoCrypt::DSA_Verifier;
-using TaoCrypt::RSAES_Encryptor;
-using TaoCrypt::RSAES_Decryptor;
-using TaoCrypt::Source;
-using TaoCrypt::FileSource;
-using TaoCrypt::FileSource;
-using TaoCrypt::HexDecoder;
-using TaoCrypt::HexEncoder;
-using TaoCrypt::Base64Decoder;
-using TaoCrypt::Base64Encoder;
-using TaoCrypt::CertDecoder;
-using TaoCrypt::DH;
-using TaoCrypt::EncodeDSA_Signature;
-using TaoCrypt::DecodeDSA_Signature;
-using TaoCrypt::PBKDF2_HMAC;
-using TaoCrypt::tcArrayDelete;
-using TaoCrypt::GetCert;
-using TaoCrypt::GetPKCS_Cert;
-using TaoCrypt::Rabbit;
-using TaoCrypt::HC128;
-
-struct testVector {
-    byte*  input_;
-    byte*  output_; 
-    word32 inLen_;
-    word32 outLen_;
-
-    testVector(const char* in, const char* out) : input_((byte*)in),
-               output_((byte*)out), inLen_((word32)strlen(in)),
-               outLen_((word32)strlen(out)) {}
-};
-
-int  sha_test();
-int  sha256_test();
-#ifdef WORD64_AVAILABLE
-    int  sha512_test();
-    int  sha384_test();
-#endif
-int  sha224_test();
-int  md5_test();
-int  md2_test();
-int  md4_test();
-int  ripemd_test();
-int  hmac_test();
-int  arc4_test();
-int  des_test();
-int  aes_test();
-int  twofish_test();
-int  blowfish_test();
-int  rsa_test();
-int  dsa_test();
-int  dh_test();
-int  pwdbased_test();
-int  pkcs12_test();
-int  rabbit_test();
-int  hc128_test();
-
-TaoCrypt::RandomNumberGenerator rng;
-
-
-void err_sys(const char* msg, int es)
-{
-    printf("%s\n", msg);
-    exit(es);    
-}
-
-// func_args from test.hpp, so don't have to pull in other junk
-struct func_args {
-    int    argc;
-    char** argv;
-    int    return_code;
-};
-
-
-/* 
-   DES, AES, Blowfish, and Twofish need aligned (4 byte) input/output for
-   processing, can turn this off by setting gpBlock(assumeAligned = false)
-   but would hurt performance.  yaSSL always uses dynamic memory so we have
-   at least 8 byte alignment.  This test tried to force alignment for stack
-   variables (for convenience) but some compiler versions and optimizations
-   seemed to be off.  So we have msgTmp variable which we copy into dynamic
-   memory at runtime to ensure proper alignment, along with plain/cipher.
-   Whew!
-*/
-const byte msgTmp[] = { // "now is the time for all " w/o trailing 0
-    0x6e,0x6f,0x77,0x20,0x69,0x73,0x20,0x74,
-    0x68,0x65,0x20,0x74,0x69,0x6d,0x65,0x20,
-    0x66,0x6f,0x72,0x20,0x61,0x6c,0x6c,0x20
-};
-
-byte* msg    = 0;   // for block cipher input
-byte* plain  = 0;   // for cipher decrypt comparison 
-byte* cipher = 0;   // block output
-
-
-void taocrypt_test(void* args)
-{
-    ((func_args*)args)->return_code = -1; // error state
-
-    msg    = NEW_TC byte[24];
-    plain  = NEW_TC byte[24];
-    cipher = NEW_TC byte[24];
-
-    memcpy(msg, msgTmp, 24);
-
-    int ret = 0;
-    if ( (ret = sha_test()) ) 
-        err_sys("SHA      test failed!\n", ret);
-    else
-        printf( "SHA      test passed!\n");
-
-    if ( (ret = sha256_test()) ) 
-        err_sys("SHA-256  test failed!\n", ret);
-    else
-        printf( "SHA-256  test passed!\n");
-
-    if ( (ret = sha224_test()) ) 
-        err_sys("SHA-224  test failed!\n", ret);
-    else
-        printf( "SHA-224  test passed!\n");
-
-#ifdef WORD64_AVAILABLE
-
-    if ( (ret = sha512_test()) ) 
-        err_sys("SHA-512  test failed!\n", ret);
-    else
-        printf( "SHA-512  test passed!\n");
-
-    if ( (ret = sha384_test()) ) 
-        err_sys("SHA-384  test failed!\n", ret);
-    else
-        printf( "SHA-384  test passed!\n");
-
-#endif
-
-    if ( (ret = md5_test()) ) 
-        err_sys("MD5      test failed!\n", ret);
-    else
-        printf( "MD5      test passed!\n");
-
-    if ( (ret = md2_test()) ) 
-        err_sys("MD2      test failed!\n", ret);
-    else
-        printf( "MD2      test passed!\n");
-
-    if ( (ret = md4_test()) ) 
-        err_sys("MD4      test failed!\n", ret);
-    else
-        printf( "MD4      test passed!\n");
-
-    if ( (ret = ripemd_test()) )
-        err_sys("RIPEMD   test failed!\n", ret);
-    else
-        printf( "RIPEMD   test passed!\n");
-
-    if ( ( ret = hmac_test()) )
-        err_sys("HMAC     test failed!\n", ret);
-    else
-        printf( "HMAC     test passed!\n");
-
-    if ( (ret = arc4_test()) )
-        err_sys("ARC4     test failed!\n", ret);
-    else
-        printf( "ARC4     test passed!\n");
-
-    if ( (ret = rabbit_test()) )
-        err_sys("Rabbit   test failed!\n", ret);
-    else
-        printf( "Rabbit   test passed!\n");
-
-    if ( (ret = hc128_test()) )
-        err_sys("HC128    test failed!\n", ret);
-    else
-        printf( "HC128    test passed!\n");
-
-    if ( (ret = des_test()) )
-        err_sys("DES      test failed!\n", ret);
-    else
-        printf( "DES      test passed!\n");
-
-    if ( (ret = aes_test()) )
-        err_sys("AES      test failed!\n", ret);
-    else
-        printf( "AES      test passed!\n");
-
-    if ( (ret = twofish_test()) )
-        err_sys("Twofish  test failed!\n", ret);
-    else
-        printf( "Twofish  test passed!\n");
-
-    if ( (ret = blowfish_test()) )
-        err_sys("Blowfish test failed!\n", ret);
-    else
-        printf( "Blowfish test passed!\n");
-
-    if ( (ret = rsa_test()) )
-        err_sys("RSA      test failed!\n", ret);
-    else
-        printf( "RSA      test passed!\n");
-
-    if ( (ret = dh_test()) )
-        err_sys("DH       test failed!\n", ret);
-    else
-        printf( "DH       test passed!\n");
-
-    if ( (ret = dsa_test()) )
-        err_sys("DSA      test failed!\n", ret);
-    else
-        printf( "DSA      test passed!\n");
-
-    if ( (ret = pwdbased_test()) )
-        err_sys("PBKDF2   test failed!\n", ret);
-    else
-        printf( "PBKDF2   test passed!\n");
-
-    /* not ready yet
-    if ( (ret = pkcs12_test()) )
-        err_sys("PKCS12   test failed!\n", ret);
-    else
-        printf( "PKCS12   test passed!\n");
-    */
-
-    tcArrayDelete(cipher);
-    tcArrayDelete(plain);
-    tcArrayDelete(msg);
-
-    ((func_args*)args)->return_code = ret;
-}
-
-
-// so overall tests can pull in test function 
-#ifndef NO_MAIN_DRIVER
-
-    int main(int argc, char** argv)
-    {
-        func_args args;
-
-        args.argc = argc;
-        args.argv = argv;
-
-        taocrypt_test(&args);
-        TaoCrypt::CleanUp();
-
-        return args.return_code;
-    }
-
-#endif // NO_MAIN_DRIVER
-
-
-void file_test(const char* file, byte* check)
-{
-    FILE* f;
-    int i = 0;
-    MD5    md5;
-    byte   buf[1024];
-    byte   md5sum[MD5::DIGEST_SIZE];
-    
-    if( !( f = fopen( file, "rb" ) )) {
-        printf("Can't open %s\n", file);
-        return;
-    }
-    while( ( i = (int)fread(buf, 1, sizeof(buf), f )) > 0 )
-        md5.Update(buf, i);
-    
-    md5.Final(md5sum);
-    memcpy(check, md5sum, sizeof(md5sum));
-
-    for(int j = 0; j < MD5::DIGEST_SIZE; ++j ) 
-        printf( "%02x", md5sum[j] );
-   
-    printf("  %s\n", file);
-
-    fclose(f);
-}
-
-
-int sha_test()
-{
-    SHA  sha;
-    byte hash[SHA::DIGEST_SIZE];
-
-    testVector test_sha[] =
-    {
-        testVector("abc", 
-                 "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2"
-                 "\x6C\x9C\xD0\xD8\x9D"),
-        testVector("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                 "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29"
-                 "\xE5\xE5\x46\x70\xF1"),
-        testVector("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-                 "aaaaaa", 
-                 "\x00\x98\xBA\x82\x4B\x5C\x16\x42\x7B\xD7\xA1\x12\x2A\x5A\x44"
-                 "\x2A\x25\xEC\x64\x4D"),
-        testVector("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-                 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-                 "aaaaaaaaaa",
-                 "\xAD\x5B\x3F\xDB\xCB\x52\x67\x78\xC2\x83\x9D\x2F\x15\x1E\xA7"
-                 "\x53\x99\x5E\x26\xA0")  
-    };
-
-    int times( sizeof(test_sha) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        sha.Update(test_sha[i].input_, test_sha[i].inLen_);
-        sha.Final(hash);
-
-        if (memcmp(hash, test_sha[i].output_, SHA::DIGEST_SIZE) != 0)
-            return -1 - i;
-    }
-
-    return 0;
-}
-
-
-int sha256_test()
-{
-    SHA256 sha;
-    byte   hash[SHA256::DIGEST_SIZE];
-
-    testVector test_sha[] =
-    {
-        testVector("abc",
-                 "\xBA\x78\x16\xBF\x8F\x01\xCF\xEA\x41\x41\x40\xDE\x5D\xAE\x22"
-                 "\x23\xB0\x03\x61\xA3\x96\x17\x7A\x9C\xB4\x10\xFF\x61\xF2\x00"
-                 "\x15\xAD"),
-        testVector("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                 "\x24\x8D\x6A\x61\xD2\x06\x38\xB8\xE5\xC0\x26\x93\x0C\x3E\x60"
-                 "\x39\xA3\x3C\xE4\x59\x64\xFF\x21\x67\xF6\xEC\xED\xD4\x19\xDB"
-                 "\x06\xC1")
-    };
-
-    int times( sizeof(test_sha) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        sha.Update(test_sha[i].input_, test_sha[i].inLen_);
-        sha.Final(hash);
-
-        if (memcmp(hash, test_sha[i].output_, SHA256::DIGEST_SIZE) != 0)
-            return -1 - i;
-    }
-
-    return 0;
-}
-
-
-#ifdef WORD64_AVAILABLE
-
-int sha512_test()
-{
-    SHA512 sha;
-    byte   hash[SHA512::DIGEST_SIZE];
-
-    testVector test_sha[] =
-    {
-        testVector("abc",
-                 "\xdd\xaf\x35\xa1\x93\x61\x7a\xba\xcc\x41\x73\x49\xae\x20\x41"
-                 "\x31\x12\xe6\xfa\x4e\x89\xa9\x7e\xa2\x0a\x9e\xee\xe6\x4b\x55"
-                 "\xd3\x9a\x21\x92\x99\x2a\x27\x4f\xc1\xa8\x36\xba\x3c\x23\xa3"
-                 "\xfe\xeb\xbd\x45\x4d\x44\x23\x64\x3c\xe8\x0e\x2a\x9a\xc9\x4f"
-                 "\xa5\x4c\xa4\x9f"),
-        testVector("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhi"
-                   "jklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", 
-                 "\x8e\x95\x9b\x75\xda\xe3\x13\xda\x8c\xf4\xf7\x28\x14\xfc\x14"
-                 "\x3f\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1\x72\x99\xae\xad\xb6\x88"
-                 "\x90\x18\x50\x1d\x28\x9e\x49\x00\xf7\xe4\x33\x1b\x99\xde\xc4"
-                 "\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b"
-                 "\x87\x4b\xe9\x09")
-    };
-
-    int times( sizeof(test_sha) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        sha.Update(test_sha[i].input_, test_sha[i].inLen_);
-        sha.Final(hash);
-
-        if (memcmp(hash, test_sha[i].output_, SHA512::DIGEST_SIZE) != 0)
-            return -1 - i;
-    }
-
-    return 0;
-}
-
-
-int sha384_test()
-{
-    SHA384 sha;
-    byte   hash[SHA384::DIGEST_SIZE];
-
-    testVector test_sha[] =
-    {
-        testVector("abc",
-                 "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b\xb5\xa0\x3d\x69\x9a\xc6\x50"
-                 "\x07\x27\x2c\x32\xab\x0e\xde\xd1\x63\x1a\x8b\x60\x5a\x43\xff"
-                 "\x5b\xed\x80\x86\x07\x2b\xa1\xe7\xcc\x23\x58\xba\xec\xa1\x34"
-                 "\xc8\x25\xa7"),
-        testVector("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhi"
-                   "jklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", 
-                 "\x09\x33\x0c\x33\xf7\x11\x47\xe8\x3d\x19\x2f\xc7\x82\xcd\x1b"
-                 "\x47\x53\x11\x1b\x17\x3b\x3b\x05\xd2\x2f\xa0\x80\x86\xe3\xb0"
-                 "\xf7\x12\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9\x66\xc3\xe9\xfa\x91"
-                 "\x74\x60\x39")
-    };
-
-    int times( sizeof(test_sha) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        sha.Update(test_sha[i].input_, test_sha[i].inLen_);
-        sha.Final(hash);
-
-        if (memcmp(hash, test_sha[i].output_, SHA384::DIGEST_SIZE) != 0)
-            return -1 - i;
-    }
-
-    return 0;
-}
-
-#endif // WORD64_AVAILABLE
-
-
-int sha224_test()
-{
-    SHA224 sha;
-    byte   hash[SHA224::DIGEST_SIZE];
-
-    testVector test_sha[] =
-    {
-        testVector("abc",
-                 "\x23\x09\x7d\x22\x34\x05\xd8\x22\x86\x42\xa4\x77\xbd\xa2\x55"
-                 "\xb3\x2a\xad\xbc\xe4\xbd\xa0\xb3\xf7\xe3\x6c\x9d\xa7"),
-        testVector("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                 "\x75\x38\x8b\x16\x51\x27\x76\xcc\x5d\xba\x5d\xa1\xfd\x89\x01"
-                 "\x50\xb0\xc6\x45\x5c\xb4\xf5\x8b\x19\x52\x52\x25\x25")
-    };
-
-    int times( sizeof(test_sha) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        sha.Update(test_sha[i].input_, test_sha[i].inLen_);
-        sha.Final(hash);
-
-        if (memcmp(hash, test_sha[i].output_, SHA224::DIGEST_SIZE) != 0)
-            return -1 - i;
-    }
-
-    return 0;
-}
-
-
-int md5_test()
-{
-    MD5  md5;
-    byte hash[MD5::DIGEST_SIZE];
-
-    testVector test_md5[] =
-    {
-        testVector("abc", 
-                 "\x90\x01\x50\x98\x3c\xd2\x4f\xb0\xd6\x96\x3f\x7d\x28\xe1\x7f"
-                 "\x72"),
-        testVector("message digest", 
-                 "\xf9\x6b\x69\x7d\x7c\xb7\x93\x8d\x52\x5a\x2f\x31\xaa\xf1\x61"
-                 "\xd0"),
-        testVector("abcdefghijklmnopqrstuvwxyz",
-                 "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00\x7d\xfb\x49\x6c\xca\x67\xe1"
-                 "\x3b"),
-        testVector("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz012345"
-                 "6789",
-                 "\xd1\x74\xab\x98\xd2\x77\xd9\xf5\xa5\x61\x1c\x2c\x9f\x41\x9d"
-                 "\x9f"),
-        testVector("1234567890123456789012345678901234567890123456789012345678"
-                 "9012345678901234567890",
-                 "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55\xac\x49\xda\x2e\x21\x07\xb6"
-                 "\x7a")
-    };
-
-    int times( sizeof(test_md5) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        md5.Update(test_md5[i].input_, test_md5[i].inLen_);
-        md5.Final(hash);
-
-        if (memcmp(hash, test_md5[i].output_, MD5::DIGEST_SIZE) != 0)
-            return -5 - i;
-    }
-
-    return 0;
-}
-
-
-int md4_test()
-{
-    MD4  md4;
-    byte hash[MD4::DIGEST_SIZE];
-
-    testVector test_md4[] =
-    {
-        testVector("",
-                 "\x31\xd6\xcf\xe0\xd1\x6a\xe9\x31\xb7\x3c\x59\xd7\xe0\xc0\x89"
-                 "\xc0"),
-        testVector("a",
-                 "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46\x24\x5e\x05\xfb\xdb\xd6\xfb"
-                 "\x24"),
-        testVector("abc", 
-                 "\xa4\x48\x01\x7a\xaf\x21\xd8\x52\x5f\xc1\x0a\xe8\x7a\xa6\x72"
-                 "\x9d"),
-        testVector("message digest", 
-                 "\xd9\x13\x0a\x81\x64\x54\x9f\xe8\x18\x87\x48\x06\xe1\xc7\x01"
-                 "\x4b"),
-        testVector("abcdefghijklmnopqrstuvwxyz",
-                 "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd\xee\xa8\xed\x63\xdf\x41\x2d"
-                 "\xa9"),
-        testVector("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz012345"
-                 "6789",
-                 "\x04\x3f\x85\x82\xf2\x41\xdb\x35\x1c\xe6\x27\xe1\x53\xe7\xf0"
-                 "\xe4"),
-        testVector("1234567890123456789012345678901234567890123456789012345678"
-                 "9012345678901234567890",
-                 "\xe3\x3b\x4d\xdc\x9c\x38\xf2\x19\x9c\x3e\x7b\x16\x4f\xcc\x05"
-                 "\x36")
-    };
-
-    int times( sizeof(test_md4) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        md4.Update(test_md4[i].input_, test_md4[i].inLen_);
-        md4.Final(hash);
-
-        if (memcmp(hash, test_md4[i].output_, MD4::DIGEST_SIZE) != 0)
-            return -5 - i;
-    }
-
-    return 0;
-}
-
-
-int md2_test()
-{
-    MD2  md5;
-    byte hash[MD2::DIGEST_SIZE];
-
-    testVector test_md2[] =
-    {
-        testVector("",
-                   "\x83\x50\xe5\xa3\xe2\x4c\x15\x3d\xf2\x27\x5c\x9f\x80\x69"
-                   "\x27\x73"),
-        testVector("a",
-                   "\x32\xec\x01\xec\x4a\x6d\xac\x72\xc0\xab\x96\xfb\x34\xc0"
-                   "\xb5\xd1"),
-        testVector("abc",
-                   "\xda\x85\x3b\x0d\x3f\x88\xd9\x9b\x30\x28\x3a\x69\xe6\xde"
-                   "\xd6\xbb"),
-        testVector("message digest",
-                   "\xab\x4f\x49\x6b\xfb\x2a\x53\x0b\x21\x9f\xf3\x30\x31\xfe"
-                   "\x06\xb0"),
-        testVector("abcdefghijklmnopqrstuvwxyz",
-                   "\x4e\x8d\xdf\xf3\x65\x02\x92\xab\x5a\x41\x08\xc3\xaa\x47"
-                   "\x94\x0b"),
-        testVector("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-                   "0123456789",
-                   "\xda\x33\xde\xf2\xa4\x2d\xf1\x39\x75\x35\x28\x46\xc3\x03"
-                   "\x38\xcd"),
-        testVector("12345678901234567890123456789012345678901234567890123456"
-                   "789012345678901234567890",
-                   "\xd5\x97\x6f\x79\xd8\x3d\x3a\x0d\xc9\x80\x6c\x3c\x66\xf3"
-                   "\xef\xd8")
-    };
-
-    int times( sizeof(test_md2) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        md5.Update(test_md2[i].input_, test_md2[i].inLen_);
-        md5.Final(hash);
-
-        if (memcmp(hash, test_md2[i].output_, MD2::DIGEST_SIZE) != 0)
-            return -10 - i;
-    }
-
-    return 0;
-}
-
-
-int ripemd_test()
-{
-    RIPEMD160  ripe160;
-    byte hash[RIPEMD160::DIGEST_SIZE];
-
-    testVector test_ripemd[] =
-    {
-        testVector("",
-                   "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28\x08\x97\x7e\xe8"
-                   "\xf5\x48\xb2\x25\x8d\x31"),
-        testVector("a",
-                   "\x0b\xdc\x9d\x2d\x25\x6b\x3e\xe9\xda\xae\x34\x7b\xe6\xf4"
-                   "\xdc\x83\x5a\x46\x7f\xfe"),
-        testVector("abc",
-                   "\x8e\xb2\x08\xf7\xe0\x5d\x98\x7a\x9b\x04\x4a\x8e\x98\xc6"
-                   "\xb0\x87\xf1\x5a\x0b\xfc"),
-        testVector("message digest",
-                   "\x5d\x06\x89\xef\x49\xd2\xfa\xe5\x72\xb8\x81\xb1\x23\xa8"
-                   "\x5f\xfa\x21\x59\x5f\x36"),
-        testVector("abcdefghijklmnopqrstuvwxyz",
-                   "\xf7\x1c\x27\x10\x9c\x69\x2c\x1b\x56\xbb\xdc\xeb\x5b\x9d"
-                   "\x28\x65\xb3\x70\x8d\xbc"),
-        testVector("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-                   "\x12\xa0\x53\x38\x4a\x9c\x0c\x88\xe4\x05\xa0\x6c\x27\xdc"
-                   "\xf4\x9a\xda\x62\xeb\x2b"),
-        testVector("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123"
-                   "456789",
-                   "\xb0\xe2\x0b\x6e\x31\x16\x64\x02\x86\xed\x3a\x87\xa5\x71"
-                   "\x30\x79\xb2\x1f\x51\x89"),
-        testVector("12345678901234567890123456789012345678901234567890123456"
-                   "789012345678901234567890",
-                   "\x9b\x75\x2e\x45\x57\x3d\x4b\x39\xf4\xdb\xd3\x32\x3c\xab"
-                   "\x82\xbf\x63\x32\x6b\xfb"),
-    };
-
-    int times( sizeof(test_ripemd) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        ripe160.Update(test_ripemd[i].input_, test_ripemd[i].inLen_);
-        ripe160.Final(hash);
-
-        if (memcmp(hash, test_ripemd[i].output_, RIPEMD160::DIGEST_SIZE) != 0)
-            return -100 - i;
-    }
-
-    return 0;
-}
-
-
-int hmac_test()
-{
-    HMAC<MD5> hmacMD5;
-    byte hash[MD5::DIGEST_SIZE];
-
-    const char* keys[]=
-    {
-        "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-        "Jefe",
-        "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-    };
-
-    testVector test_hmacMD5[] = 
-    {
-        testVector("Hi There",
-                 "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc"
-                 "\x9d"),
-        testVector("what do ya want for nothing?",
-                 "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7"
-                 "\x38"),
-        testVector("\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-                 "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-                 "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-                 "\xDD\xDD\xDD\xDD\xDD\xDD",
-                 "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3"
-                 "\xf6")
-    };
-
-    int times( sizeof(test_hmacMD5) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        hmacMD5.SetKey((byte*)keys[i], (word32)strlen(keys[i]));
-        hmacMD5.Update(test_hmacMD5[i].input_, test_hmacMD5[i].inLen_);
-        hmacMD5.Final(hash);
-
-        if (memcmp(hash, test_hmacMD5[i].output_, MD5::DIGEST_SIZE) != 0)
-            return -20 - i;
-    }
-
-    return 0;
-}
-
-
-int arc4_test()
-{
-    byte cipher[16];
-    byte plain[16];
-
-    const char* keys[] = 
-    {           
-        "\x01\x23\x45\x67\x89\xab\xcd\xef",
-        "\x01\x23\x45\x67\x89\xab\xcd\xef",
-        "\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\xef\x01\x23\x45"
-    };
-
-    testVector test_arc4[] =
-    {
-        testVector("\x01\x23\x45\x67\x89\xab\xcd\xef",
-                   "\x75\xb7\x87\x80\x99\xe0\xc5\x96"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x74\x94\xc2\xe7\x10\x4b\x08\x79"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\xde\x18\x89\x41\xa3\x37\x5d\x3a"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf\xbd\x61")
-    };
-
-
-    int times( sizeof(test_arc4) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        ARC4::Encryption enc;
-        ARC4::Decryption dec;
-
-        enc.SetKey((byte*)keys[i], (word32)strlen(keys[i]));
-        dec.SetKey((byte*)keys[i], (word32)strlen(keys[i]));
-
-        enc.Process(cipher, test_arc4[i].input_, test_arc4[i].outLen_);
-        dec.Process(plain,  cipher, test_arc4[i].outLen_);
-
-        if (memcmp(plain, test_arc4[i].input_, test_arc4[i].outLen_))
-            return -30 - i;
-
-        if (memcmp(cipher, test_arc4[i].output_, test_arc4[i].outLen_))
-            return -40 - i;
-    }
-
-    return 0;
-}
-
-
-int rabbit_test()
-{
-    byte cipher[16];
-    byte plain[16];
-
-    const char* keys[] = 
-    {           
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\xAC\xC3\x51\xDC\xF1\x62\xFC\x3B\xFE\x36\x3D\x2E\x29\x13\x28\x91"
-    };
-
-    const char* ivs[] =
-    {
-        "\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x59\x7E\x26\xC1\x75\xF5\x73\xC3",
-        0
-    };
-
-
-    testVector test_rabbit[] =
-    {
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\xED\xB7\x05\x67\x37\x5D\xCD\x7C"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x6D\x7D\x01\x22\x92\xCC\xDC\xE0"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x9C\x51\xE2\x87\x84\xC3\x7F\xE9")
-    };
-
-
-    int times( sizeof(test_rabbit) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        Rabbit::Encryption enc;
-        Rabbit::Decryption dec;
-
-        enc.SetKey((byte*)keys[i], (byte*)ivs[i]);
-        dec.SetKey((byte*)keys[i], (byte*)ivs[i]);
-
-        enc.Process(cipher, test_rabbit[i].input_, test_rabbit[i].outLen_);
-        dec.Process(plain,  cipher, test_rabbit[i].outLen_);
-
-        if (memcmp(plain, test_rabbit[i].input_, test_rabbit[i].outLen_))
-            return -230 - i;
-
-        if (memcmp(cipher, test_rabbit[i].output_, test_rabbit[i].outLen_))
-            return -240 - i;
-    }
-
-    return 0;
-}
-
-
-int hc128_test()
-{
-    byte cipher[16];
-    byte plain[16];
-
-    const char* keys[] = 
-    {           
-        "\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x00\x53\xA6\xF9\x4C\x9F\xF2\x45\x98\xEB\x3E\x91\xE4\x37\x8A\xDD",
-        "\x0F\x62\xB5\x08\x5B\xAE\x01\x54\xA7\xFA\x4D\xA0\xF3\x46\x99\xEC"
-    };
-
-    const char* ivs[] =
-    {
-        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-        "\x0D\x74\xDB\x42\xA9\x10\x77\xDE\x45\xAC\x13\x7A\xE1\x48\xAF\x16",
-        "\x28\x8F\xF6\x5D\xC4\x2B\x92\xF9\x60\xC7\x2E\x95\xFC\x63\xCA\x31"
-    };
-
-    testVector test_hc128[] =
-    {
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x37\x86\x02\xB9\x8F\x32\xA7\x48"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x33\x7F\x86\x11\xC6\xED\x61\x5F"),
-        testVector("\x00\x00\x00\x00\x00\x00\x00\x00",
-                   "\x2E\x1E\xD1\x2A\x85\x51\xC0\x5A"),
-      testVector("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-                 "\x1C\xD8\xAE\xDD\xFE\x52\xE2\x17\xE8\x35\xD0\xB7\xE8\x4E\x29")
-    };
-
-    int times( sizeof(test_hc128) / sizeof(testVector) );
-    for (int i = 0; i < times; ++i) {
-        HC128::Encryption enc;
-        HC128::Decryption dec;
-
-        enc.SetKey((byte*)keys[i], (byte*)ivs[i]);
-        dec.SetKey((byte*)keys[i], (byte*)ivs[i]);
-
-        enc.Process(cipher, test_hc128[i].input_, test_hc128[i].outLen_);
-        dec.Process(plain,  cipher, test_hc128[i].outLen_);
-
-        if (memcmp(plain, test_hc128[i].input_, test_hc128[i].outLen_))
-            return -330 - i;
-
-        if (memcmp(cipher, test_hc128[i].output_, test_hc128[i].outLen_))
-            return -340 - i;
-    }
-
-    return 0;
-}
-
-
-int des_test()
-{
-    //ECB mode
-    DES_ECB_Encryption enc;
-    DES_ECB_Decryption dec;
-
-    const int sz = TaoCrypt::DES_BLOCK_SIZE * 3;
-    const byte key[] = { 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef };
-    const byte iv[] =  { 0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef };
-
-    enc.SetKey(key, sizeof(key));
-    enc.Process(cipher, msg, sz);
-    dec.SetKey(key, sizeof(key));
-    dec.Process(plain, cipher, sz);
-
-    if (memcmp(plain, msg, sz))
-        return -50;
-
-    const byte verify1[] = 
-    {
-        0xf9,0x99,0xb8,0x8e,0xaf,0xea,0x71,0x53,
-        0x6a,0x27,0x17,0x87,0xab,0x88,0x83,0xf9,
-        0x89,0x3d,0x51,0xec,0x4b,0x56,0x3b,0x53
-    };
-
-    if (memcmp(cipher, verify1, sz))
-        return -51;
-
-    // CBC mode
-    DES_CBC_Encryption enc2;
-    DES_CBC_Decryption dec2;
-
-    enc2.SetKey(key, sizeof(key), iv);
-    enc2.Process(cipher, msg, sz);
-    dec2.SetKey(key, sizeof(key), iv);
-    dec2.Process(plain, cipher, sz);
-
-    if (memcmp(plain, msg, sz))
-        return -52;
-
-    const byte verify2[] = 
-    {
-        0x8b,0x7c,0x52,0xb0,0x01,0x2b,0x6c,0xb8,
-        0x4f,0x0f,0xeb,0xf3,0xfb,0x5f,0x86,0x73,
-        0x15,0x85,0xb3,0x22,0x4b,0x86,0x2b,0x4b
-    };
-
-    if (memcmp(cipher, verify2, sz))
-        return -53;
-
-    // EDE3 CBC mode
-    DES_EDE3_CBC_Encryption enc3;
-    DES_EDE3_CBC_Decryption dec3;
-
-    const byte key3[] = 
-    {
-        0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
-        0xfe,0xde,0xba,0x98,0x76,0x54,0x32,0x10,
-        0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67
-    };
-    const byte iv3[] = 
-    {
-        0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef,
-        0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-        0x11,0x21,0x31,0x41,0x51,0x61,0x71,0x81
-        
-    };
-
-    enc3.SetKey(key3, sizeof(key3), iv3);
-    enc3.Process(cipher, msg, sz);
-    dec3.SetKey(key3, sizeof(key3), iv3);
-    dec3.Process(plain, cipher, sz);
-
-    if (memcmp(plain, msg, sz))
-        return -54;
-
-    const byte verify3[] = 
-    {
-        0x08,0x8a,0xae,0xe6,0x9a,0xa9,0xc1,0x13,
-        0x93,0x7d,0xf7,0x3a,0x11,0x56,0x66,0xb3,
-        0x18,0xbc,0xbb,0x6d,0xd2,0xb1,0x16,0xda
-    };
-
-    if (memcmp(cipher, verify3, sz))
-        return -55;
-
-    return 0;
-}
-
-
-int aes_test()
-{
-    AES_CBC_Encryption enc;
-    AES_CBC_Decryption dec;
-    const int bs(TaoCrypt::AES::BLOCK_SIZE);
-
-    byte key[] = "0123456789abcdef   ";  // align
-    byte iv[]  = "1234567890abcdef   ";  // align
-
-    enc.SetKey(key, bs, iv);
-    dec.SetKey(key, bs, iv);
-
-    enc.Process(cipher, msg, bs);
-    dec.Process(plain, cipher, bs);
-
-    if (memcmp(plain, msg, bs))
-        return -60;
-
-    const byte verify[] = 
-    {
-        0x95,0x94,0x92,0x57,0x5f,0x42,0x81,0x53,
-        0x2c,0xcc,0x9d,0x46,0x77,0xa2,0x33,0xcb
-    };
-
-    if (memcmp(cipher, verify, bs))
-        return -61;
-
-    AES_ECB_Encryption enc2;
-    AES_ECB_Decryption dec2;
-
-    enc2.SetKey(key, bs, iv);
-    dec2.SetKey(key, bs, iv);
-
-    enc2.Process(cipher, msg, bs);
-    dec2.Process(plain, cipher, bs);
-
-    if (memcmp(plain, msg, bs))
-        return -62;
-
-    const byte verify2[] = 
-    {
-        0xd0,0xc9,0xd9,0xc9,0x40,0xe8,0x97,0xb6,
-        0xc8,0x8c,0x33,0x3b,0xb5,0x8f,0x85,0xd1
-    };
-
-    if (memcmp(cipher, verify2, bs))
-        return -63;
-
-    return 0;
-}
-
-
-int twofish_test()
-{
-    Twofish_CBC_Encryption enc;
-    Twofish_CBC_Decryption dec;
-    const int bs(TaoCrypt::Twofish::BLOCK_SIZE);
-
-    byte key[] = "0123456789abcdef   ";  // align
-    byte iv[]  = "1234567890abcdef   ";  // align
-
-    enc.SetKey(key, bs, iv);
-    dec.SetKey(key, bs, iv);
-
-    enc.Process(cipher, msg, bs);
-    dec.Process(plain, cipher, bs);
-
-    if (memcmp(plain, msg, bs))
-        return -60;
-
-    const byte verify[] = 
-    {
-        0xD2,0xD7,0x47,0x47,0x4A,0x65,0x4E,0x16,
-        0x21,0x03,0x58,0x79,0x5F,0x02,0x27,0x2C
-    };
-
-    if (memcmp(cipher, verify, bs))
-        return -61;
-
-    Twofish_ECB_Encryption enc2;
-    Twofish_ECB_Decryption dec2;
-
-    enc2.SetKey(key, bs, iv);
-    dec2.SetKey(key, bs, iv);
-
-    enc2.Process(cipher, msg, bs);
-    dec2.Process(plain, cipher, bs);
-
-    if (memcmp(plain, msg, bs))
-        return -62;
-
-    const byte verify2[] = 
-    {
-        0x3B,0x6C,0x63,0x10,0x34,0xAB,0xB2,0x87,
-        0xC4,0xCD,0x6B,0x91,0x14,0xC5,0x3A,0x09
-    };
-
-    if (memcmp(cipher, verify2, bs))
-        return -63;
-
-    return 0;
-}
-
-
-int blowfish_test()
-{
-    Blowfish_CBC_Encryption enc;
-    Blowfish_CBC_Decryption dec;
-    const int bs(TaoCrypt::Blowfish::BLOCK_SIZE);
-
-    byte key[] = "0123456789abcdef   ";  // align
-    byte iv[]  = "1234567890abcdef   ";  // align
-
-    enc.SetKey(key, 16, iv);
-    dec.SetKey(key, 16, iv);
-
-    enc.Process(cipher, msg, bs * 2);
-    dec.Process(plain, cipher, bs * 2);
-
-    if (memcmp(plain, msg, bs))
-        return -60;
-
-    const byte verify[] = 
-    {
-        0x0E,0x26,0xAA,0x29,0x11,0x25,0xAB,0xB5,
-        0xBC,0xD9,0x08,0xC4,0x94,0x6C,0x89,0xA3
-    };
-
-    if (memcmp(cipher, verify, bs))
-        return -61;
-
-    Blowfish_ECB_Encryption enc2;
-    Blowfish_ECB_Decryption dec2;
-
-    enc2.SetKey(key, 16, iv);
-    dec2.SetKey(key, 16, iv);
-
-    enc2.Process(cipher, msg, bs * 2);
-    dec2.Process(plain, cipher, bs * 2);
-
-    if (memcmp(plain, msg, bs))
-        return -62;
-
-    const byte verify2[] = 
-    {
-        0xE7,0x42,0xB9,0x37,0xC8,0x7D,0x93,0xCA,
-        0x8F,0xCE,0x39,0x32,0xDE,0xD7,0xBC,0x5B
-    };
-
-    if (memcmp(cipher, verify2, bs))
-        return -63;
-
-    return 0;
-}
-
-
-int rsa_test()
-{
-    Source source;
-    FileSource("../certs/client-key.der", source);
-    if (source.size() == 0) {
-        FileSource("../../certs/client-key.der", source);  // for testsuite
-        if (source.size() == 0) {
-            FileSource("../../../certs/client-key.der", source); // Debug dir
-            if (source.size() == 0)
-                err_sys("where's your certs dir?", -79);
-        }
-    }
-    RSA_PrivateKey priv(source);
-
-    RSAES_Encryptor enc(priv);
-    byte message[] = "Everyone gets Friday off.";
-    const word32 len = (word32)strlen((char*)message);
-    byte cipher[512];
-    enc.Encrypt(message, len, cipher, rng);
-
-    RSAES_Decryptor dec(priv);
-    byte plain[512];
-    dec.Decrypt(cipher, priv.FixedCiphertextLength(), plain, rng);
-
-    if (memcmp(plain, message, len))
-        return -70;
-
-    dec.SSL_Sign(message, len, cipher, rng);
-    if (!enc.SSL_Verify(message, len, cipher))
-        return -71;
-
-
-    // test decode   
-    Source source2;
-    FileSource("../certs/client-cert.der", source2);
-    if (source2.size() == 0) {
-        FileSource("../../certs/client-cert.der", source2);  // for testsuite
-        if (source2.size() == 0) {
-            FileSource("../../../certs/client-cert.der", source2); // Debug dir
-            if (source2.size() == 0)
-                err_sys("where's your certs dir?", -79);
-        }
-    }
-    CertDecoder cd(source2, true, 0, false, CertDecoder::CA);
-    if (cd.GetError().What())
-        err_sys("cert error", -80);
-    Source source3(cd.GetPublicKey().GetKey(), cd.GetPublicKey().size());
-    RSA_PublicKey pub(source3);
- 
-    return 0;
-}
-
-
-int dh_test()
-{
-    Source source;
-    FileSource("../certs/dh1024.dat", source);
-    if (source.size() == 0) {
-        FileSource("../../certs/dh1024.dat", source);  // for testsuite
-        if (source.size() == 0) {
-            FileSource("../../../certs/dh1024.dat", source); // win32 Debug dir
-            if (source.size() == 0)
-                err_sys("where's your certs dir?", -79);
-        }
-    }
-    HexDecoder hDec(source);
-
-    DH dh(source);
-
-    byte pub[128];
-    byte priv[128];
-    byte agree[128];
-    byte pub2[128];
-    byte priv2[128];
-    byte agree2[128];
-
-    DH dh2(dh);
-
-    dh.GenerateKeyPair(rng, priv, pub);
-    dh2.GenerateKeyPair(rng, priv2, pub2);
-    dh.Agree(agree, priv, pub2); 
-    dh2.Agree(agree2, priv2, pub);
-
-    
-    if ( memcmp(agree, agree2, dh.GetByteLength()) )
-        return -80;
-
-    return 0;
-}
-
-
-int dsa_test()
-{
-    Source source;
-    FileSource("../certs/dsa1024.der", source);
-    if (source.size() == 0) {
-        FileSource("../../certs/dsa1024.der", source);  // for testsuite
-        if (source.size() == 0) {
-            FileSource("../../../certs/dsa1024.der", source); // win32 Debug dir
-            if (source.size() == 0)
-                err_sys("where's your certs dir?", -89);
-        }
-    }
-
-    const char msg[] = "this is the message";
-    byte signature[40];
-
-    DSA_PrivateKey priv(source);
-    DSA_Signer signer(priv);
-
-    SHA sha;
-    byte digest[SHA::DIGEST_SIZE];
-    sha.Update((byte*)msg, sizeof(msg));
-    sha.Final(digest);
-
-    signer.Sign(digest, signature, rng);
-
-    byte encoded[sizeof(signature) + 6];
-    byte decoded[40];
-
-    word32 encSz = EncodeDSA_Signature(signer.GetR(), signer.GetS(), encoded);
-    DecodeDSA_Signature(decoded, encoded, encSz);
-
-    DSA_PublicKey pub(priv);
-    DSA_Verifier verifier(pub);
-
-    if (!verifier.Verify(digest, decoded))
-        return -90;
-
-    if (!verifier.Verify(digest, signature))
-        return -91;
-
-    return 0;
-}
-
-
-int pwdbased_test()
-{
-    PBKDF2_HMAC<SHA> pb;
-
-    byte derived[32];
-    const byte pwd1[] = "password   ";  // align
-    const byte salt[]  = { 0x12, 0x34, 0x56, 0x78, 0x78, 0x56, 0x34, 0x12 };
-    
-    pb.DeriveKey(derived, 8, pwd1, 8, salt, sizeof(salt), 5);
-
-    const byte verify1[] = { 0xD1, 0xDA, 0xA7, 0x86, 0x15, 0xF2, 0x87, 0xE6 };
-
-    if ( memcmp(derived, verify1, sizeof(verify1)) )
-        return -101;
-
-
-    const byte pwd2[] = "All n-entities must communicate with other n-entities"
-                        " via n-1 entiteeheehees   ";  // align
-
-    pb.DeriveKey(derived, 24, pwd2, 76, salt, sizeof(salt), 500);
-
-    const byte verify2[] = { 0x6A, 0x89, 0x70, 0xBF, 0x68, 0xC9, 0x2C, 0xAE,
-                             0xA8, 0x4A, 0x8D, 0xF2, 0x85, 0x10, 0x85, 0x86,
-                             0x07, 0x12, 0x63, 0x80, 0xCC, 0x47, 0xAB, 0x2D
-    };
-
-    if ( memcmp(derived, verify2, sizeof(verify2)) )
-        return -102;
-
-    return 0;
-}
-
-
-/*
-int pkcs12_test()
-{
-    Source cert;
-    FileSource("../certs/server-cert.pem", cert);
-    if (cert.size() == 0) {
-        FileSource("../../certs/server-cert.pem", cert);  // for testsuite
-        if (cert.size() == 0) {
-            FileSource("../../../certs/server-cert.pem", cert); // Debug dir
-            if (cert.size() == 0)
-                err_sys("where's your certs dir?", -109);
-        }
-    }
-
-    if (GetCert(cert) != 0)
-        return -110;
-
-    Source source;
-    FileSource("../certs/server.p12", source);
-    if (source.size() == 0) {
-        FileSource("../../certs/server.p12", source);  // for testsuite
-        if (source.size() == 0) {
-            FileSource("../../../certs/server.p12", source); // Debug dir
-            if (source.size() == 0)
-                err_sys("where's your certs dir?", -111);
-        }
-    }
-
-    if (GetPKCS_Cert("password", source) != 0)
-        return -112;
-
-    return 0;
-}
-*/
-
diff --git a/extra/yassl/taocrypt/test/test.dsp b/extra/yassl/taocrypt/test/test.dsp
deleted file mode 100644
index 93b369de3d97..000000000000
--- a/extra/yassl/taocrypt/test/test.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "test___Win32_Release"
-# PROP BASE Intermediate_Dir "test___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../include" /I "../mySTL" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "test___Win32_Debug"
-# PROP BASE Intermediate_Dir "test___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../include" /I "../mySTL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "test - Win32 Release"
-# Name "test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/testsuite/cipher-test.sh b/extra/yassl/testsuite/cipher-test.sh
deleted file mode 100644
index d3e691460973..000000000000
--- a/extra/yassl/testsuite/cipher-test.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-# test all yassl cipher suties 
-# 
-
-
-no_pid=-1
-server_pid=$no_pid
-
-
-do_cleanup() {
-    echo "in cleanup"
-
-    if [[ $server_pid != $no_pid ]]
-    then
-        echo "killing server"
-        kill -9 $server_pid
-    fi
-}
-
-do_trap() {
-    echo "got trap"
-    do_cleanup
-    exit -1
-}
-
-trap do_trap INT TERM
-
-
-# make sure example server and client are built
-if test ! -s ../examples/server/server; then
-    echo "Please build yaSSL first, example server missing"
-    exit -1
-fi
-
-if test ! -s ../examples/client/client; then
-    echo "Please build yaSSL first, example client missing"
-    exit -1
-fi
-
-
-# non DSA suites
-for suite in {"DHE-RSA-AES256-SHA","AES256-SHA","DHE-RSA-AES128-SHA","AES128-SHA","AES256-RMD","AES128-RMD","DES-CBC3-RMD","DHE-RSA-AES256-RMD","DHE-RSA-AES128-RMD","DHE-RSA-DES-CBC3-RMD","RC4-SHA","RC4-MD5","DES-CBC3-SHA","DES-CBC-SHA","EDH-RSA-DES-CBC3-SHA","EDH-RSA-DES-CBC-SHA"}
-do
-  for client_auth in {y,n}
-  do
-    echo "Trying $suite client auth = $client_auth ..."
-
-    if test -e server_ready; then
-        echo -e "removing exisitng server_ready file"
-        rm server_ready
-    fi
-    ../examples/server/server $client_auth &
-    server_pid=$!
-
-    while [ ! -s server_ready ]; do
-        echo -e "waiting for server_ready file..."
-        sleep 0.1
-    done
-
-    ../examples/client/client $suite
-    client_result=$?
-
-    wait $server_pid
-    server_result=$?
-
-    server_pid=$no_pid
-
-    if [[ $client_result != 0 ]]
-    then
-        echo "Client Error"
-        exit $client_result
-    fi
-
-    if [[ $server_result != 0 ]]
-    then
-        echo "Server Error"
-        exit $server_result
-    fi
-
-  done   # end client auth loop
-done  # end non dsa suite list
-echo -e "Non DSA Loop SUCCESS"
-
-
-
-# DSA suites
-for suite in {"DHE-DSS-AES256-SHA","DHE-DSS-AES128-SHA","DHE-DSS-AES256-RMD","DHE-DSS-AES128-RMD","DHE-DSS-DES-CBC3-RMD","EDH-DSS-DES-CBC3-SHA","EDH-DSS-DES-CBC-SHA"}
-do
-  for client_auth in {y,n}
-  do
-    echo "Trying $suite client auth = $client_auth ..."
-
-    if test -e server_ready; then
-        echo -e "removing exisitng server_ready file"
-        rm server_ready
-    fi
-    # d signifies DSA
-    ../examples/server/server $client_auth d &
-    server_pid=$!
-
-    while [ ! -s server_ready ]; do
-        echo -e "waiting for server_ready file..."
-        sleep 0.1
-    done
-
-    ../examples/client/client $suite
-    client_result=$?
-
-    wait $server_pid
-    server_result=$?
-
-    server_pid=$no_pid
-
-    if [[ $client_result != 0 ]]
-    then
-        echo "Client Error"
-        exit $client_result
-    fi
-
-    if [[ $server_result != 0 ]]
-    then
-        echo "Server Error"
-        exit $server_result
-    fi
-
-  done   # end client auth loop
-done  # end dsa suite list
-echo -e "DSA Loop SUCCESS"
-
-exit 0
diff --git a/extra/yassl/testsuite/input b/extra/yassl/testsuite/input
deleted file mode 100644
index d16cbc407501..000000000000
--- a/extra/yassl/testsuite/input
+++ /dev/null
@@ -1,107 +0,0 @@
-// testsuite.cpp
-
-#include "test.hpp"
-#include "md5.hpp"
-
-typedef unsigned char byte;
-
-void taocrypt_test(void*);
-void file_test(char*, byte*);
-
-void client_test(void*);
-void echoclient_test(void*);
-
-THREAD_RETURN YASSL_API server_test(void*);
-THREAD_RETURN YASSL_API echoserver_test(void*);
-
-int main(int argc, char** argv)
-{
-    func_args args(argc, argv);
-    func_args server_args(args);
-
-    // *** Crypto Test ***
-    taocrypt_test(&args);
-    assert(args.return_code == 0);
-    
-    
-    // *** Simple yaSSL client server test ***
-    THREAD_TYPE thread;
-
-    start_thread(server_test, &server_args, &thread);
-    client_test(&args);
-
-    assert(args.return_code == 0);
-    join_thread(thread);
-    assert(server_args.return_code == 0);
-    
-
-    // *** Echo input yaSSL client server test ***
-    start_thread(echoserver_test, &server_args, &thread);
-    func_args echo_args;
-
-            // setup args
-    echo_args.argc = 3;
-    echo_args.argv = new char*[echo_args.argc];
-    for (int i = 0; i < echo_args.argc; i++)
-        echo_args.argv[i] = new char[32];
-   
-    strcpy(echo_args.argv[0], "echoclient");
-    strcpy(echo_args.argv[1], "input");
-    strcpy(echo_args.argv[2], "output");
-    remove("output");
-
-            // make sure OK
-    echoclient_test(&echo_args);
-    assert(echo_args.return_code == 0);
-
-
-    // *** Echo quit yaSSL client server test ***
-    echo_args.argc = 2;
-    strcpy(echo_args.argv[1], "quit");
-
-    echoclient_test(&echo_args);
-    assert(echo_args.return_code == 0);
-    join_thread(thread);
-    assert(server_args.return_code == 0);
-
-
-            // input output compare
-    byte input[TaoCrypt::MD5::DIGEST_SIZE];
-    byte output[TaoCrypt::MD5::DIGEST_SIZE];
-    file_test("input", input);
-    file_test("output", output);
-    assert(memcmp(input, output, sizeof(input)) == 0);
-
-    printf("\nAll tests passed!\n");
-
-    // cleanup
-    for (int j = echo_args.argc; j >= 0; j--)
-        delete[] echo_args.argv[j];
-    delete[] echo_args.argv;
-
-    return 0;
-}
-
-
-
-void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
-{
-#ifdef _WIN32
-    *thread = _beginthreadex(0, 0, fun, args, 0, 0);
-#else
-    pthread_create(thread, 0, fun, args);
-#endif
-}
-
-
-void join_thread(THREAD_TYPE thread)
-{
-#ifdef _WIN32
-    int res = WaitForSingleObject(reinterpret_cast<HANDLE>(thread), INFINITE);
-    assert(res == WAIT_OBJECT_0);
-    res = CloseHandle(reinterpret_cast<HANDLE>(thread));
-    assert(res);
-#else
-    pthread_join(thread, 0);
-#endif
-}
diff --git a/extra/yassl/testsuite/make.bat b/extra/yassl/testsuite/make.bat
deleted file mode 100644
index ef8b9398102b..000000000000
--- a/extra/yassl/testsuite/make.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-REM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-REM 
-REM This program is free software; you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation; version 2 of the License.
-REM 
-REM This program is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM 
-REM You should have received a copy of the GNU General Public License
-REM along with this program; if not, write to the Free Software
-REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-REM quick and dirty build file for testing different MSDEVs
-setlocal 
-
-set myFLAGS= /I../include /I../taocrypt/include /I../taocrypt/mySTL /c /W3 /G6 /O2 /MT /D"WIN32" /D"NO_MAIN_DRIVER"
-
-cl %myFLAGS% testsuite.cpp
-cl %myFLAGS% ../examples/client/client.cpp
-cl %myFLAGS% ../examples/echoclient/echoclient.cpp
-cl %myFLAGS% ../examples/server/server.cpp
-cl %myFLAGS% ../examples/echoserver/echoserver.cpp
-cl %myFLAGS% ../taocrypt/test/test.cpp
-
-link.exe  /out:testsuite.exe ../src/yassl.lib ../taocrypt/src/taocrypt.lib testsuite.obj client.obj server.obj echoclient.obj echoserver.obj test.obj advapi32.lib Ws2_32.lib
-
diff --git a/extra/yassl/testsuite/quit b/extra/yassl/testsuite/quit
deleted file mode 100644
index 3db49b3ad126..000000000000
--- a/extra/yassl/testsuite/quit
+++ /dev/null
@@ -1,2 +0,0 @@
-quit
-
diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp
deleted file mode 100644
index 92d41706c61e..000000000000
--- a/extra/yassl/testsuite/test.hpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-// test.hpp
-
-#ifndef yaSSL_TEST_HPP
-#define yaSSL_TEST_HPP
-
-#include "runtime.hpp"
-#include "error.hpp"
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-//#define NON_BLOCKING  // test server and client example (not echos)
-
-#ifdef _WIN32
-    #include <winsock2.h>
-    #include <process.h>
-    #ifdef TEST_IPV6            // don't require newer SDK for IPV4
-	    #include <ws2tcpip.h>
-        #include <wspiapi.h>
-    #endif
-    #define SOCKET_T unsigned int
-#else
-    #include <string.h>
-    #include <unistd.h>
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-    #include <sys/ioctl.h>
-    #include <sys/time.h>
-    #include <sys/types.h>
-    #include <sys/socket.h>
-    #ifdef TEST_IPV6
-        #include <netdb.h>
-    #endif
-    #include <pthread.h>
-#ifdef NON_BLOCKING
-    #include <fcntl.h>
-#endif
-    #define SOCKET_T int
-#endif /* _WIN32 */
-#include "openssl/ssl.h"   /* openssl compatibility test */
-
-
-#ifdef _MSC_VER
-    // disable conversion warning
-    // 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy
-    #pragma warning(disable:4244 4996)
-#endif
-
-
-#if !defined(_SOCKLEN_T) && (defined(_WIN32) || defined(__APPLE__))
-    typedef int socklen_t;
-#endif
-
-
-// Check type of third arg to accept
-#if defined(__hpux)
-// HPUX uses int* for third parameter to accept
-    typedef int*       ACCEPT_THIRD_T;
-#else
-    typedef socklen_t* ACCEPT_THIRD_T;
-#endif
-
-
-#ifdef TEST_IPV6
-    typedef sockaddr_in6 SOCKADDR_IN_T;
-    #define AF_INET_V    AF_INET6
-#else
-    typedef sockaddr_in  SOCKADDR_IN_T;
-    #define AF_INET_V    AF_INET
-#endif
-   
-
-// Check if _POSIX_THREADS should be forced
-#if !defined(_POSIX_THREADS) && defined(__hpux)
-// HPUX does not define _POSIX_THREADS as it's not _fully_ implemented
-#define _POSIX_THREADS
-#endif
-
-
-#ifndef _POSIX_THREADS
-    typedef unsigned int  THREAD_RETURN;
-    typedef HANDLE        THREAD_TYPE;
-    #define YASSL_API __stdcall
-#else
-    typedef void*         THREAD_RETURN;
-    typedef pthread_t     THREAD_TYPE;
-    #define YASSL_API 
-#endif
-
-
-struct tcp_ready {
-#ifdef _POSIX_THREADS
-    pthread_mutex_t mutex_;
-    pthread_cond_t  cond_;
-    bool            ready_;   // predicate
-
-    tcp_ready() : ready_(false)
-    {
-        pthread_mutex_init(&mutex_, 0);
-        pthread_cond_init(&cond_, 0);
-    }
-
-    ~tcp_ready()
-    {
-        pthread_mutex_destroy(&mutex_);
-        pthread_cond_destroy(&cond_);
-    }
-#endif
-};    
-
-
-struct func_args {
-    int    argc;
-    char** argv;
-    int    return_code;
-    const char* file_ready;
-    tcp_ready* signal_;
-
-    func_args(int c = 0, char** v = 0) : argc(c), argv(v), file_ready(0) {}
-
-    void SetSignal(tcp_ready* p) { signal_ = p; }
-};
-
-typedef THREAD_RETURN YASSL_API THREAD_FUNC(void*);
-
-void start_thread(THREAD_FUNC, func_args*, THREAD_TYPE*);
-void join_thread(THREAD_TYPE);
-
-// yaSSL
-const char* const    yasslIP      = "127.0.0.1";
-const unsigned short yasslPort    =  11111;
-const unsigned short proxyPort    =  12345;
-
-
-// client
-const char* const cert = "../certs/client-cert.pem";
-const char* const key  = "../certs/client-key.pem";
-
-const char* const certSuite = "../../certs/client-cert.pem";
-const char* const keySuite  = "../../certs/client-key.pem";
-
-const char* const certDebug = "../../../certs/client-cert.pem";
-const char* const keyDebug  = "../../../certs/client-key.pem";
-
-
-// server
-const char* const svrCert = "../certs/server-cert.pem";
-const char* const svrKey  = "../certs/server-key.pem";
-
-const char* const svrCert2 = "../../certs/server-cert.pem";
-const char* const svrKey2  = "../../certs/server-key.pem";
-
-const char* const svrCert3 = "../../../certs/server-cert.pem";
-const char* const svrKey3  = "../../../certs/server-key.pem";
-
-
-// server dsa
-const char* const dsaCert = "../certs/dsa-cert.pem";
-const char* const dsaKey  = "../certs/dsa1024.der";
-
-const char* const dsaCert2 = "../../certs/dsa-cert.pem";
-const char* const dsaKey2  = "../../certs/dsa1024.der";
-
-const char* const dsaCert3 = "../../../certs/dsa-cert.pem";
-const char* const dsaKey3  = "../../../certs/dsa1024.der";
-
-
-// CA 
-const char* const caCert  = "../certs/ca-cert.pem";
-const char* const caCert2 = "../../certs/ca-cert.pem";
-const char* const caCert3 = "../../../certs/ca-cert.pem";
-
-
-using namespace yaSSL;
-
-
-inline void err_sys(const char* msg)
-{
-    printf("yassl error: %s\n", msg);
-    exit(EXIT_FAILURE);
-}
-
-
-extern "C" {
-  static int PasswordCallBack(char*, int, int, void*);
-}
-
-
-static int PasswordCallBack(char* passwd, int sz, int rw, void* userdata)
-{
-    strncpy(passwd, "yassl123", sz);
-    return 8;
-}
-
-
-inline void store_ca(SSL_CTX* ctx)
-{
-    // To allow testing from serveral dirs
-    if (SSL_CTX_load_verify_locations(ctx, caCert, 0) != SSL_SUCCESS)
-        if (SSL_CTX_load_verify_locations(ctx, caCert2, 0) != SSL_SUCCESS)
-            if (SSL_CTX_load_verify_locations(ctx, caCert3, 0) != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/cacert.pem");
-
-    // load client CA for server verify
-    if (SSL_CTX_load_verify_locations(ctx, cert, 0) != SSL_SUCCESS)
-        if (SSL_CTX_load_verify_locations(ctx, certSuite, 0) != SSL_SUCCESS)
-            if (SSL_CTX_load_verify_locations(ctx, certDebug,0) != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/client-cert.pem");
-
-    // DSA cert 
-    if (SSL_CTX_load_verify_locations(ctx, dsaCert, 0) != SSL_SUCCESS)
-        if (SSL_CTX_load_verify_locations(ctx, dsaCert2, 0) != SSL_SUCCESS)
-            if (SSL_CTX_load_verify_locations(ctx, dsaCert3, 0) != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/dsa-cert.pem");
-
-}
-
-
-// client
-inline void set_certs(SSL_CTX* ctx)
-{
-    store_ca(ctx);
-    SSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
-
-    // To allow testing from serveral dirs
-    if (SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM)
-        != SSL_SUCCESS)
-        if (SSL_CTX_use_certificate_file(ctx, certSuite, SSL_FILETYPE_PEM)
-            != SSL_SUCCESS)
-            if (SSL_CTX_use_certificate_file(ctx, certDebug, SSL_FILETYPE_PEM)
-                != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/client-cert.pem");
-    
-    // To allow testing from several dirs
-    if (SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM)
-         != SSL_SUCCESS) 
-         if (SSL_CTX_use_PrivateKey_file(ctx, keySuite, SSL_FILETYPE_PEM)
-            != SSL_SUCCESS) 
-                if (SSL_CTX_use_PrivateKey_file(ctx,keyDebug,SSL_FILETYPE_PEM)
-                    != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/client-key.pem");
-}
-
-
-// server
-inline void set_serverCerts(SSL_CTX* ctx)
-{
-    store_ca(ctx);
-    SSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
-
-    // To allow testing from serveral dirs
-    if (SSL_CTX_use_certificate_file(ctx, svrCert, SSL_FILETYPE_PEM)
-        != SSL_SUCCESS)
-        if (SSL_CTX_use_certificate_file(ctx, svrCert2, SSL_FILETYPE_PEM)
-            != SSL_SUCCESS)
-            if (SSL_CTX_use_certificate_file(ctx, svrCert3, SSL_FILETYPE_PEM)
-                != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/server-cert.pem");
-    
-    // To allow testing from several dirs
-    if (SSL_CTX_use_PrivateKey_file(ctx, svrKey, SSL_FILETYPE_PEM)
-         != SSL_SUCCESS) 
-         if (SSL_CTX_use_PrivateKey_file(ctx, svrKey2, SSL_FILETYPE_PEM)
-            != SSL_SUCCESS) 
-                if (SSL_CTX_use_PrivateKey_file(ctx, svrKey3,SSL_FILETYPE_PEM)
-                    != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/server-key.pem");
-}
-
-
-// dsa server
-inline void set_dsaServerCerts(SSL_CTX* ctx)
-{
-    store_ca(ctx);
-
-    // To allow testing from serveral dirs
-    if (SSL_CTX_use_certificate_file(ctx, dsaCert, SSL_FILETYPE_PEM)
-        != SSL_SUCCESS)
-        if (SSL_CTX_use_certificate_file(ctx, dsaCert2, SSL_FILETYPE_PEM)
-            != SSL_SUCCESS)
-            if (SSL_CTX_use_certificate_file(ctx, dsaCert3, SSL_FILETYPE_PEM)
-                != SSL_SUCCESS)
-                err_sys("failed to use certificate: certs/dsa-cert.pem");
-    
-    // To allow testing from several dirs
-    if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey, SSL_FILETYPE_ASN1)
-         != SSL_SUCCESS) 
-         if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey2, SSL_FILETYPE_ASN1)
-            != SSL_SUCCESS) 
-                if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey3,SSL_FILETYPE_ASN1)
-                    != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/dsa1024.der");
-}
-
-
-inline void set_args(int& argc, char**& argv, func_args& args)
-{
-    argc = args.argc;
-    argv = args.argv;
-    args.return_code = -1; // error state
-}
-
-
-inline void set_file_ready(const char* name, func_args& args)
-{
-    args.file_ready = name;
-}
-
-
-inline void tcp_set_nonblocking(SOCKET_T& sockfd)
-{
-#ifdef NON_BLOCKING
-    #ifdef _WIN32
-        unsigned long blocking = 1;
-        int ret = ioctlsocket(sockfd, FIONBIO, &blocking);
-    #else
-        int flags = fcntl(sockfd, F_GETFL, 0);
-        int ret = fcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
-    #endif
-#endif
-}
-
-
-inline void tcp_socket(SOCKET_T& sockfd, SOCKADDR_IN_T& addr)
-{
-    sockfd = socket(AF_INET_V, SOCK_STREAM, 0);
-    memset(&addr, 0, sizeof(addr));
-
-#ifdef TEST_IPV6
-    addr.sin6_family = AF_INET_V;
-    addr.sin6_port = htons(yasslPort);
-    addr.sin6_addr = in6addr_loopback;
-
-    /* // for external testing later 
-    addrinfo hints;
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family   = AF_INET_V;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags    = AI_PASSIVE;
-
-    getaddrinfo(yasslIP6, yasslPortStr, &hints, info);
-    // then use info connect(sockfd, info->ai_addr, info->ai_addrlen)
-
-    if (*info == 0)
-        err_sys("getaddrinfo failed");
-        */   // end external testing later
-#else
-    addr.sin_family = AF_INET_V;
-#ifdef YASSL_PROXY_PORT
-    addr.sin_port = htons(proxyPort);
-#else
-    addr.sin_port = htons(yasslPort);
-#endif
-    addr.sin_addr.s_addr = inet_addr(yasslIP);
-#endif
-
-}
-
-
-inline void tcp_close(SOCKET_T& sockfd)
-{
-#ifdef _WIN32
-    closesocket(sockfd);
-#else
-    close(sockfd);
-#endif
-    sockfd = (SOCKET_T) -1;
-}
-
-
-inline void tcp_connect(SOCKET_T& sockfd)
-{
-    SOCKADDR_IN_T addr;
-    tcp_socket(sockfd, addr);
-
-    if (connect(sockfd, (const sockaddr*)&addr, sizeof(addr)) != 0) {
-        tcp_close(sockfd);
-        err_sys("tcp connect failed");
-    }
-}
-
-
-inline void tcp_listen(SOCKET_T& sockfd)
-{
-    SOCKADDR_IN_T addr;
-    tcp_socket(sockfd, addr);
-
-#ifndef _WIN32
-    int       on  = 1;
-    socklen_t len = sizeof(on);
-    setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, len);
-#endif
-
-    if (bind(sockfd, (const sockaddr*)&addr, sizeof(addr)) != 0) {
-        tcp_close(sockfd);
-        err_sys("tcp bind failed");
-    }
-    if (listen(sockfd, 3) != 0) {
-        tcp_close(sockfd);
-        err_sys("tcp listen failed");
-    }
-}
-
-
-inline void create_ready_file(func_args& args)
-{
-    FILE* f = fopen(args.file_ready, "w+");
-
-    if (f) {
-        fputs("ready", f);
-        fclose(f);
-    }
-}
-
-
-inline void tcp_accept(SOCKET_T& sockfd, SOCKET_T& clientfd, func_args& args)
-{
-    tcp_listen(sockfd);
-
-    SOCKADDR_IN_T client;
-    socklen_t client_len = sizeof(client);
-
-#if defined(_POSIX_THREADS) && defined(NO_MAIN_DRIVER)
-    // signal ready to tcp_accept
-    tcp_ready& ready = *args.signal_;
-    pthread_mutex_lock(&ready.mutex_);
-    ready.ready_ = true;
-    pthread_cond_signal(&ready.cond_);
-    pthread_mutex_unlock(&ready.mutex_);
-#endif
-
-    if (args.file_ready)
-        create_ready_file(args);
-
-    clientfd = accept(sockfd, (sockaddr*)&client, (ACCEPT_THIRD_T)&client_len);
-
-    if (clientfd == (SOCKET_T) -1) {
-        tcp_close(sockfd);
-        err_sys("tcp accept failed");
-    }
-
-#ifdef NON_BLOCKING
-    tcp_set_nonblocking(clientfd);
-#endif
-}
-
-
-inline void showPeer(SSL* ssl)
-{
-    X509* peer = SSL_get_peer_certificate(ssl);
-    if (peer) {
-        char* issuer  = X509_NAME_oneline(X509_get_issuer_name(peer), 0, 0);
-        char* subject = X509_NAME_oneline(X509_get_subject_name(peer), 0, 0);
-        X509_NAME_ENTRY* se = NULL;
-        ASN1_STRING*     sd = NULL;
-        char*            subCN = NULL;
-        X509_NAME* sub = X509_get_subject_name(peer);
-        int lastpos = -1;
-        if (sub)
-            lastpos = X509_NAME_get_index_by_NID(sub, NID_commonName, lastpos);
-        if (lastpos >= 0) {
-            se = X509_NAME_get_entry(sub, lastpos);
-            if (se)
-                sd = X509_NAME_ENTRY_get_data(se);
-            if (sd)
-                subCN = (char*)ASN1_STRING_data(sd);
-        }
-
-        printf("peer's cert info:\n issuer : %s\n subject: %s\n"
-               " subject cn: %s\n", issuer, subject, subCN);
-
-        free(subject);
-        free(issuer);
-    }
-    else
-        printf("peer has no cert!\n");
-}
-
-
-
-inline DH* set_tmpDH(SSL_CTX* ctx)
-{
-    static unsigned char dh1024_p[] =
-    {
-        0xE6, 0x96, 0x9D, 0x3D, 0x49, 0x5B, 0xE3, 0x2C, 0x7C, 0xF1, 0x80, 0xC3,
-        0xBD, 0xD4, 0x79, 0x8E, 0x91, 0xB7, 0x81, 0x82, 0x51, 0xBB, 0x05, 0x5E,
-        0x2A, 0x20, 0x64, 0x90, 0x4A, 0x79, 0xA7, 0x70, 0xFA, 0x15, 0xA2, 0x59,
-        0xCB, 0xD5, 0x23, 0xA6, 0xA6, 0xEF, 0x09, 0xC4, 0x30, 0x48, 0xD5, 0xA2,
-        0x2F, 0x97, 0x1F, 0x3C, 0x20, 0x12, 0x9B, 0x48, 0x00, 0x0E, 0x6E, 0xDD,
-        0x06, 0x1C, 0xBC, 0x05, 0x3E, 0x37, 0x1D, 0x79, 0x4E, 0x53, 0x27, 0xDF,
-        0x61, 0x1E, 0xBB, 0xBE, 0x1B, 0xAC, 0x9B, 0x5C, 0x60, 0x44, 0xCF, 0x02,
-        0x3D, 0x76, 0xE0, 0x5E, 0xEA, 0x9B, 0xAD, 0x99, 0x1B, 0x13, 0xA6, 0x3C,
-        0x97, 0x4E, 0x9E, 0xF1, 0x83, 0x9E, 0xB5, 0xDB, 0x12, 0x51, 0x36, 0xF7,
-        0x26, 0x2E, 0x56, 0xA8, 0x87, 0x15, 0x38, 0xDF, 0xD8, 0x23, 0xC6, 0x50,
-        0x50, 0x85, 0xE2, 0x1F, 0x0D, 0xD5, 0xC8, 0x6B,
-    };
-
-    static unsigned char dh1024_g[] =
-    {
-      0x02,
-    };
-
-    DH* dh;
-    if ( (dh = DH_new()) ) {
-        dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
-        dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
-    }
-    if (!dh->p || !dh->g) {
-        DH_free(dh);
-        dh = 0;
-    }
-    SSL_CTX_set_tmp_dh(ctx, dh);
-    return dh;
-}
-
-
-inline int verify_callback(int preverify_ok, X509_STORE_CTX* ctx)
-{
-    X509* err_cert = X509_STORE_CTX_get_current_cert(ctx);
-    int   err      = X509_STORE_CTX_get_error(ctx);
-    int   depth    = X509_STORE_CTX_get_error_depth(ctx);
-
-    // test allow self signed
-    if (err_cert && depth == 0 && err == TaoCrypt::SIG_OTHER_E)
-        return 1;
-
-    return 0;
-}
-
-
-#endif // yaSSL_TEST_HPP
-
diff --git a/extra/yassl/testsuite/testsuite.cpp b/extra/yassl/testsuite/testsuite.cpp
deleted file mode 100644
index 7973a3704e1b..000000000000
--- a/extra/yassl/testsuite/testsuite.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-// testsuite.cpp
-
-#include "test.hpp"
-#include "md5.hpp"
-
-
-typedef unsigned char byte;
-
-void taocrypt_test(void*);
-void file_test(const char*, byte*);
-
-void client_test(void*);
-void echoclient_test(void*);
-
-THREAD_RETURN YASSL_API server_test(void*);
-THREAD_RETURN YASSL_API echoserver_test(void*);
-
-void wait_tcp_ready(func_args&);
-
-
-
-int main(int argc, char** argv)
-{
-    func_args args(argc, argv);
-    func_args server_args(argc, argv);
-
-    // *** Crypto Test ***
-    taocrypt_test(&args);
-    assert(args.return_code == 0);
-    
-    
-    // *** Simple yaSSL client server test ***
-    tcp_ready ready;
-    server_args.SetSignal(&ready);
-
-    THREAD_TYPE serverThread;
-    start_thread(server_test, &server_args, &serverThread);
-    wait_tcp_ready(server_args);
-
-    client_test(&args);
-    assert(args.return_code == 0);
-    join_thread(serverThread);
-    assert(server_args.return_code == 0);
-    
-
-    // *** Echo input yaSSL client server test ***
-    start_thread(echoserver_test, &server_args, &serverThread);
-    wait_tcp_ready(server_args);
-    func_args echo_args;
-
-            // setup args
-    const int numArgs = 3;
-    echo_args.argc = numArgs;
-    char* myArgv[numArgs];
-
-    char argc0[32];
-    char argc1[32];
-    char argc2[32];
-
-    myArgv[0] = argc0;
-    myArgv[1] = argc1;
-    myArgv[2] = argc2;
-
-    echo_args.argv = myArgv;
-   
-    strcpy(echo_args.argv[0], "echoclient");
-    strcpy(echo_args.argv[1], "input");
-    strcpy(echo_args.argv[2], "output");
-    remove("output");
-
-            // make sure OK
-    echoclient_test(&echo_args);
-    assert(echo_args.return_code == 0);
-
-
-    // *** Echo quit yaSSL client server test ***
-    echo_args.argc = 2;
-    strcpy(echo_args.argv[1], "quit");
-
-    echoclient_test(&echo_args);
-    assert(echo_args.return_code == 0);
-    join_thread(serverThread);
-    assert(server_args.return_code == 0);
-
-
-            // input output compare
-    byte input[TaoCrypt::MD5::DIGEST_SIZE];
-    byte output[TaoCrypt::MD5::DIGEST_SIZE];
-    file_test("input", input);
-    file_test("output", output);
-    assert(memcmp(input, output, sizeof(input)) == 0);
-
-    printf("\nAll tests passed!\n");
-    yaSSL_CleanUp();
-
-    return 0;
-}
-
-
-
-void start_thread(THREAD_FUNC fun, func_args* args, THREAD_TYPE* thread)
-{
-#ifndef _POSIX_THREADS
-    *thread = (HANDLE)_beginthreadex(0, 0, fun, args, 0, 0);
-#else
-    pthread_create(thread, 0, fun, args);
-#endif
-}
-
-
-void join_thread(THREAD_TYPE thread)
-{
-#ifndef _POSIX_THREADS
-    int res = WaitForSingleObject(thread, INFINITE);
-    assert(res == WAIT_OBJECT_0);
-    res = CloseHandle(thread);
-    assert(res);
-#else
-    pthread_join(thread, 0);
-#endif
-}
-
-
-
-void wait_tcp_ready(func_args& args)
-{
-#ifdef _POSIX_THREADS
-    pthread_mutex_lock(&args.signal_->mutex_);
-    
-    if (!args.signal_->ready_)
-        pthread_cond_wait(&args.signal_->cond_, &args.signal_->mutex_);
-    args.signal_->ready_ = false; // reset
-
-    pthread_mutex_unlock(&args.signal_->mutex_);
-#endif
-}
-
-
-int test_openSSL_des()
-{
-    /* test des encrypt/decrypt */
-    char data[] = "this is my data ";
-    int  dataSz = (int)strlen(data);
-    DES_key_schedule key[3];
-    byte iv[8];
-    EVP_BytesToKey(EVP_des_ede3_cbc(), EVP_md5(), NULL, (byte*)data, dataSz, 1,
-                   (byte*)key, iv);
-
-    byte cipher[16];
-    DES_ede3_cbc_encrypt((byte*)data, cipher, dataSz, &key[0], &key[1],
-                         &key[2], &iv, true);
-    byte plain[16];
-    DES_ede3_cbc_encrypt(cipher, plain, 16, &key[0], &key[1], &key[2],
-                         &iv, false);
-    return 0;
-}
diff --git a/extra/yassl/testsuite/testsuite.dsp b/extra/yassl/testsuite/testsuite.dsp
deleted file mode 100644
index 2a7f5a774337..000000000000
--- a/extra/yassl/testsuite/testsuite.dsp
+++ /dev/null
@@ -1,127 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testsuite" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testsuite - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testsuite.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testsuite.mak" CFG="testsuite - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testsuite - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testsuite - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testsuite - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../taocrypt/include" /I "../include" /I "../taocrypt/mySTL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NO_MAIN_DRIVER" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBC"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "testsuite - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../taocrypt/include" /I "../include" /I "../taocrypt/mySTL" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NO_MAIN_DRIVER" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCD" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testsuite - Win32 Release"
-# Name "testsuite - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\examples\client\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\examples\echoclient\echoclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\examples\echoserver\echoserver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\examples\server\server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\taocrypt\test\test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsuite.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\test.hpp
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/yassl.dsp b/extra/yassl/yassl.dsp
deleted file mode 100644
index f9b1699e6673..000000000000
--- a/extra/yassl/yassl.dsp
+++ /dev/null
@@ -1,192 +0,0 @@
-# Microsoft Developer Studio Project File - Name="yassl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=yassl - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "yassl.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "yassl.mak" CFG="yassl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "yassl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "yassl - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "yassl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "include" /I "taocrypt\include" /I "taocrypt\mySTL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "yassl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "include" /I "taocrypt\include" /I "taocrypt\mySTL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "YASSL_PREFIX" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "yassl - Win32 Release"
-# Name "yassl - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\buffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\cert_wrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\crypto_wrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\handshake.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\lock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\log.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\socket_wrapper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\ssl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\timer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\yassl_error.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\yassl_imp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\yassl_int.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\include\buffer.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\cert_wrapper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\crypto_wrapper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\factory.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\handshake.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\lock.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\log.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\socket_wrapper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\timer.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\yassl_error.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\yassl_imp.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\yassl_int.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\yassl_types.hpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/extra/yassl/yassl.dsw b/extra/yassl/yassl.dsw
deleted file mode 100644
index 8da089fc1fa7..000000000000
--- a/extra/yassl/yassl.dsw
+++ /dev/null
@@ -1,149 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "benchmark"=.\taocrypt\benchmark\benchmark.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name taocrypt
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "client"=.\examples\client\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name yassl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "echoclient"=.\examples\echoclient\echoclient.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name yassl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "echoserver"=.\examples\echoserver\echoserver.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name yassl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "server"=.\examples\server\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name yassl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "taocrypt"=.\taocrypt\taocrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "test"=.\taocrypt\test\test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name taocrypt
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testsuite"=.\testsuite\testsuite.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name yassl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "yassl"=.\yassl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name taocrypt
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/extra/zlib/zlib-1.2.13/CMakeLists.txt b/extra/zlib/zlib-1.2.13/CMakeLists.txt
new file mode 100644
index 000000000000..f238a546bde0
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/CMakeLists.txt
@@ -0,0 +1,238 @@
+#cmake_minimum_required(VERSION 2.4.4)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
+set(VERSION "1.2.13")
+
+IF(POLICY CMP0048)
+  CMAKE_POLICY(SET CMP0048 NEW)
+  project(zlib VERSION ${VERSION} LANGUAGES C)
+ELSE()
+  project(zlib C)
+ENDIF()
+
+IF(DISABLE_THESE_LINES)
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+ENDIF(DISABLE_THESE_LINES)
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+# enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+IF(DISABLE_THESE_LINES)
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+  endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+ENDIF(DISABLE_THESE_LINES)
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+  ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY
+  )
+INCLUDE_DIRECTORIES(
+  BEFORE SYSTEM ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+  )
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+if(NOT MINGW)
+    set(ZLIB_DLL_SRCS
+        win32/zlib1.rc # If present will override custom build rule below.
+    )
+endif()
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+ADD_CONVENIENCE_LIBRARY(zlib
+  ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+
+RETURN()
+
+# Skip anything below.
+################################################################
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        set(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND ${CMAKE_RC_COMPILER}
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   if(NOT APPLE)
+     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+   endif()
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Example binaries
+#============================================================================
+
+add_executable(example test/example.c)
+target_link_libraries(example zlib)
+add_test(example example)
+
+add_executable(minigzip test/minigzip.c)
+target_link_libraries(minigzip zlib)
+
+if(HAVE_OFF64_T)
+    add_executable(example64 test/example.c)
+    target_link_libraries(example64 zlib)
+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    add_test(example64 example64)
+
+    add_executable(minigzip64 test/minigzip.c)
+    target_link_libraries(minigzip64 zlib)
+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+endif()
diff --git a/extra/zlib/zlib-1.2.13/ChangeLog b/extra/zlib/zlib-1.2.13/ChangeLog
new file mode 100644
index 000000000000..457526bc6a51
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/ChangeLog
@@ -0,0 +1,1590 @@
+
+                ChangeLog file for zlib
+
+Changes in 1.2.13 (13 Oct 2022)
+- Fix configure issue that discarded provided CC definition
+- Correct incorrect inputs provided to the CRC functions
+- Repair prototypes and exporting of new CRC functions
+- Fix inflateBack to detect invalid input with distances too far
+- Have infback() deliver all of the available output up to any error
+- Fix a bug when getting a gzip header extra field with inflate()
+- Fix bug in block type selection when Z_FIXED used
+- Tighten deflateBound bounds
+- Remove deleted assembler code references
+- Various portability and appearance improvements
+
+Changes in 1.2.12 (27 Mar 2022)
+- Cygwin does not have _wopen(), so do not create gzopen_w() there
+- Permit a deflateParams() parameter change as soon as possible
+- Limit hash table inserts after switch from stored deflate
+- Fix bug when window full in deflate_stored()
+- Fix CLEAR_HASH macro to be usable as a single statement
+- Avoid a conversion error in gzseek when off_t type too small
+- Have Makefile return non-zero error code on test failure
+- Avoid some conversion warnings in gzread.c and gzwrite.c
+- Update use of errno for newer Windows CE versions
+- Small speedup to inflate [psumbera]
+- Return an error if the gzputs string length can't fit in an int
+- Add address checking in clang to -w option of configure
+- Don't compute check value for raw inflate if asked to validate
+- Handle case where inflateSync used when header never processed
+- Avoid the use of ptrdiff_t
+- Avoid an undefined behavior of memcpy() in gzappend()
+- Avoid undefined behaviors of memcpy() in gz*printf()
+- Avoid an undefined behavior of memcpy() in _tr_stored_block()
+- Make the names in functions declarations identical to definitions
+- Remove old assembler code in which bugs have manifested
+- Fix deflateEnd() to not report an error at start of raw deflate
+- Add legal disclaimer to README
+- Emphasize the need to continue decompressing gzip members
+- Correct the initialization requirements for deflateInit2()
+- Fix a bug that can crash deflate on some input when using Z_FIXED
+- Assure that the number of bits for deflatePrime() is valid
+- Use a structure to make globals in enough.c evident
+- Use a macro for the printf format of big_t in enough.c
+- Clean up code style in enough.c, update version
+- Use inline function instead of macro for index in enough.c
+- Clarify that prefix codes are counted in enough.c
+- Show all the codes for the maximum tables size in enough.c
+- Add gznorm.c example, which normalizes gzip files
+- Fix the zran.c example to work on a multiple-member gzip file
+- Add tables for crc32_combine(), to speed it up by a factor of 200
+- Add crc32_combine_gen() and crc32_combine_op() for fast combines
+- Speed up software CRC-32 computation by a factor of 1.5 to 3
+- Use atomic test and set, if available, for dynamic CRC tables
+- Don't bother computing check value after successful inflateSync()
+- Correct comment in crc32.c
+- Add use of the ARMv8 crc32 instructions when requested
+- Use ARM crc32 instructions if the ARM architecture has them
+- Explicitly note that the 32-bit check values are 32 bits
+- Avoid adding empty gzip member after gzflush with Z_FINISH
+- Fix memory leak on error in gzlog.c
+- Fix error in comment on the polynomial representation of a byte
+- Clarify gz* function interfaces, referring to parameter names
+- Change macro name in inflate.c to avoid collision in VxWorks
+- Correct typo in blast.c
+- Improve portability of contrib/minizip
+- Fix indentation in minizip's zip.c
+- Replace black/white with allow/block. (theresa-m)
+- minizip warning fix if MAXU32 already defined. (gvollant)
+- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
+- Clean up minizip to reduce warnings for testing
+- Add fallthrough comments for gcc
+- Eliminate use of ULL constants
+- Separate out address sanitizing from warnings in configure
+- Remove destructive aspects of make distclean
+- Check for cc masquerading as gcc or clang in configure
+- Fix crc32.c to compile local functions only if used
+
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
+Changes in 1.2.10 (2 Jan 2017)
+- Avoid warnings on snprintf() return value
+- Fix bug in deflate_stored() for zero-length input
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
+
+Changes in 1.2.9 (31 Dec 2016)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
+- Improve contrib/blast to return unused bytes
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
+
+Changes in 1.2.8 (28 Apr 2013)
+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
+- Do not force Z_CONST for C++
+- Clean up contrib/vstudio [Roß]
+- Correct spelling error in zlib.h
+- Fix mixed line endings in contrib/vstudio
+
+Changes in 1.2.7.3 (13 Apr 2013)
+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
+
+Changes in 1.2.7.2 (13 Apr 2013)
+- Change check for a four-byte type back to hexadecimal
+- Fix typo in win32/Makefile.msc
+- Add casts in gzwrite.c for pointer differences
+
+Changes in 1.2.7.1 (24 Mar 2013)
+- Replace use of unsafe string functions with snprintf if available
+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
+- Fix gzgetc undefine when Z_PREFIX set [Turk]
+- Eliminate use of mktemp in Makefile (not always available)
+- Fix bug in 'F' mode for gzopen()
+- Add inflateGetDictionary() function
+- Correct comment in deflate.h
+- Use _snprintf for snprintf in Microsoft C
+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
+- Delete "--version" file if created by "ar --version" [Richard G.]
+- Fix configure check for veracity of compiler error return codes
+- Fix CMake compilation of static lib for MSVC2010 x64
+- Remove unused variable in infback9.c
+- Fix argument checks in gzlog_compress() and gzlog_write()
+- Clean up the usage of z_const and respect const usage within zlib
+- Clean up examples/gzlog.[ch] comparisons of different types
+- Avoid shift equal to bits in type (caused endless loop)
+- Fix uninitialized value bug in gzputc() introduced by const patches
+- Fix memory allocation error in examples/zran.c [Nor]
+- Fix bug where gzopen(), gzclose() would write an empty file
+- Fix bug in gzclose() when gzwrite() runs out of memory
+- Check for input buffer malloc failure in examples/gzappend.c
+- Add note to contrib/blast to use binary mode in stdio
+- Fix comparisons of differently signed integers in contrib/blast
+- Check for invalid code length codes in contrib/puff
+- Fix serious but very rare decompression bug in inftrees.c
+- Update inflateBack() comments, since inflate() can be faster
+- Use underscored I/O function names for WINAPI_FAMILY
+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
+- Add contrib/vstudio/vc10 pre-build step for static only
+- Quote --version-script argument in CMakeLists.txt
+- Don't specify --version-script on Apple platforms in CMakeLists.txt
+- Fix casting error in contrib/testzlib/testzlib.c
+- Fix types in contrib/minizip to match result of get_crc_table()
+- Simplify contrib/vstudio/vc10 with 'd' suffix
+- Add TOP support to win32/Makefile.msc
+- Support i686 and amd64 assembler builds in CMakeLists.txt
+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
+- Add vc11 and vc12 build files to contrib/vstudio
+- Add gzvprintf() as an undocumented function in zlib
+- Fix configure for Sun shell
+- Remove runtime check in configure for four-byte integer type
+- Add casts and consts to ease user conversion to C++
+- Add man pages for minizip and miniunzip
+- In Makefile uninstall, don't rm if preceding cd fails
+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip [Schiffer]
+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation [McClure]
+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
+- Include io.h for Turbo C / Borland C on all platforms [Truta]
+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
+- Fix bug when compiling minizip with C++ [Vollant]
+- Protect for long name and extra fields in contrib/minizip [Vollant]
+- Avoid some warnings in contrib/minizip [Vollant]
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems [Tobias]
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ [Truta]
+- Update win32/Makefile.msc to build test/*.c [Truta]
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation [Monnerat]
+- Update win32/Makefile.gcc to build test/*.c [Truta]
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
+- Add a ./config --solo option to make zlib subset with no library use
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff [Oberhumer]
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
+- Add *bsd* to Linux* case in configure [Bar-Lev]
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h [Kohler]
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) [Monnerat]
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
+- Improve inflateSync() documentation to note indeterminacy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
+- Add debug records in assembler code [Londer]
+- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
+
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
+- Default to libdir as sharedlibdir in configure [Nieder]
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open [Homurlu]
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure [Torok]
+- Set LDFLAGS in Makefile.in [Bar-Lev]
+- Avoid mkdir objs race condition in Makefile.in [Bowler]
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure [Weigelt]
+- Use hidden visibility attribute when available [Frysinger]
+
+Changes in 1.2.4.3 (10 Apr 2010)
+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
+- Use CROSS_PREFIX for nm [Bar-Lev]
+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
+- Avoid use of undefined symbols in #if with && and ||
+- Make *64 prototypes in gzguts.h consistent with functions
+- Add -shared load option for MinGW in configure [Bowler]
+- Move z_off64_t to public interface, use instead of off64_t
+- Remove ! from shell test in configure (not portable to Solaris)
+- Change +0 macro tests to -0 for possibly increased portability
+
+Changes in 1.2.4.2 (9 Apr 2010)
+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
+- Really provide prototypes for *64 functions when building without LFS
+- Only define unlink() in minigzip.c if unistd.h not included
+- Update README to point to contrib/vstudio project files
+- Move projects/vc6 to old/ and remove projects/
+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
+- Clean up assembler builds in win32/Makefile.msc [Rowe]
+- Include sys/types.h for Microsoft for off_t definition
+- Fix memory leak on error in gz_open()
+- Symbolize nm as $NM in configure [Weigelt]
+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
+- Fix bug in gzeof() to take into account unused input data
+- Avoid initialization of structures with variables in puff.c
+- Updated win32/README-WIN32.txt [Rowe]
+
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 [Rowe]
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW [Kahle]
+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
+- Add DLL install in win32/makefile.gcc [Bar-Lev]
+- Allow Linux* or linux* from uname in configure [Bar-Lev]
+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
+- Add cross-compilation prefixes to configure [Bar-Lev]
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
+Changes in 1.2.4 (14 Mar 2010)
+- Fix VER3 extraction in configure for no fourth subversion
+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
+- Add zlib.3.pdf to distribution
+- Don't set error code in gzerror() if passed pointer is NULL
+- Apply destination directory fixes to CMakeLists.txt [Lowman]
+- Move #cmakedefine's to a new zconf.in.cmakein
+- Restore zconf.h for builds that don't use configure or cmake
+- Add distclean to dummy Makefile for convenience
+- Update and improve INDEX, README, and FAQ
+- Update CMakeLists.txt for the return of zconf.h [Lowman]
+- Update contrib/vstudio/vc9 and vc10 [Vollant]
+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
+- Apply license and readme changes to contrib/asm686 [Raiter]
+- Check file name lengths and add -c option in minigzip.c [Li]
+- Update contrib/amd64 and contrib/masmx86/ [Vollant]
+- Avoid use of "eof" parameter in trees.c to not shadow library variable
+- Update make_vms.com for removal of zlibdefs.h [Zinser]
+- Update assembler code and vstudio projects in contrib [Vollant]
+- Remove outdated assembler code contrib/masm686 and contrib/asm586
+- Remove old vc7 and vc8 from contrib/vstudio
+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
+- Fix bug in void-returning vsprintf() case in gzwrite.c
+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
+- Check if temporary file exists before removing in make_vms.com [Zinser]
+- Fix make install and uninstall for --static option
+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
+
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
+- Delete zconf.h (made by configure) [Weigelt]
+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 [Vollant]
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
+- Fix zconf.h generation in CMakeLists.txt [Lowman]
+- Improve comments in zconf.h where modified by configure
+
+Changes in 1.2.3.8 (13 Feb 2010)
+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
+- Fix missing error return in gzflush(), add zlib.h note
+- Add *64 functions to zlib.map [Levin]
+- Fix signed/unsigned comparison in gz_comp()
+- Use SFLAGS when testing shared linking in configure
+- Add --64 option to ./configure to use -m64 with gcc
+- Fix ./configure --help to correctly name options
+- Have make fail if a test fails [Levin]
+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
+- Remove assembler object files from contrib
+
+Changes in 1.2.3.7 (24 Jan 2010)
+- Always gzopen() with O_LARGEFILE if available
+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
+- Make gzdirect() more precise when the state changes while reading
+- Improve zlib.h documentation in many places
+- Catch memory allocation failure in gz_open()
+- Complete close operation if seek forward in gzclose_w() fails
+- Return Z_ERRNO from gzclose_r() if close() fails
+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
+- Return zero for gzwrite() errors to match zlib.h description
+- Return -1 on gzputs() error to match zlib.h description
+- Add zconf.in.h to allow recovery from configure modification [Weigelt]
+- Fix static library permissions in Makefile.in [Weigelt]
+- Avoid warnings in configure tests that hide functionality [Weigelt]
+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
+- Keep object files in subdirectories to reduce the clutter somewhat
+- Remove default Makefile and zlibdefs.h, add dummy Makefile
+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
+- Remove zlibdefs.h completely -- modify zconf.h instead
+
+Changes in 1.2.3.6 (17 Jan 2010)
+- Avoid void * arithmetic in gzread.c and gzwrite.c
+- Make compilers happier with const char * for gz_error message
+- Avoid unused parameter warning in inflate.c
+- Avoid signed-unsigned comparison warning in inflate.c
+- Indent #pragma's for traditional C
+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
+- Correct email address in configure for system options
+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
+- Update zlib.map [Brown]
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
+- Apply various fixes to CMakeLists.txt [Lowman]
+- Add checks on len in gzread() and gzwrite()
+- Add error message for no more room for gzungetc()
+- Remove zlib version check in gzwrite()
+- Defer compression of gzprintf() result until need to
+- Use snprintf() in gzdopen() if available
+- Remove USE_MMAP configuration determination (only used by minigzip)
+- Remove examples/pigz.c (available separately)
+- Update examples/gun.c to 1.6
+
+Changes in 1.2.3.5 (8 Jan 2010)
+- Add space after #if in zutil.h for some compilers
+- Fix relatively harmless bug in deflate_fast() [Exarevsky]
+- Fix same problem in deflate_slow()
+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
+- Change name of "write" variable in inffast.c to avoid library collisions
+- Fix premature EOF from gzread() in gzio.c [Brown]
+- Use zlib header window size if windowBits is 0 in inflateInit2()
+- Remove compressBound() call in deflate.c to avoid linking compress.o
+- Replace use of errno in gz* with functions, support WinCE [Alves]
+- Provide alternative to perror() in minigzip.c for WinCE [Alves]
+- Don't use _vsnprintf on later versions of MSVC [Lowman]
+- Add CMake build script and input file [Lowman]
+- Update contrib/minizip to 1.1 [Svensson, Vollant]
+- Moved nintendods directory from contrib to root
+- Replace gzio.c with a new set of routines with the same functionality
+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
+- Update contrib/minizip to 1.1b
+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
+
+Changes in 1.2.3.4 (21 Dec 2009)
+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
+- Update comments in configure and Makefile.in for default --shared
+- Fix test -z's in configure [Marquess]
+- Build examplesh and minigzipsh when not testing
+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
+- Import LDFLAGS from the environment in configure
+- Fix configure to populate SFLAGS with discovered CFLAGS options
+- Adapt make_vms.com to the new Makefile.in [Zinser]
+- Add zlib2ansi script for C++ compilation [Marquess]
+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
+- Add AMD64 assembler code for longest match to contrib [Teterin]
+- Include options from $SFLAGS when doing $LDSHARED
+- Simplify 64-bit file support by introducing z_off64_t type
+- Make shared object files in objs directory to work around old Sun cc
+- Use only three-part version number for Darwin shared compiles
+- Add rc option to ar in Makefile.in for when ./configure not run
+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
+- Rename Makefile.in targets allstatic to static and allshared to shared
+- Fix static and shared Makefile.in targets to be independent
+- Correct error return bug in gz_open() by setting state [Brown]
+- Put spaces before ;;'s in configure for better sh compatibility
+- Add pigz.c (parallel implementation of gzip) to examples/
+- Correct constant in crc32.c to UL [Leventhal]
+- Reject negative lengths in crc32_combine()
+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
+- Correct typo in doc/algorithm.txt [Janik]
+- Fix bug in adler32_combine() [Zhu]
+- Catch missing-end-of-block-code error in all inflates and in puff
+    Assures that random input to inflate eventually results in an error
+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
+- Update ENOUGH and its usage to reflect discovered bounds
+- Fix gzerror() error report on empty input file [Brown]
+- Add ush casts in trees.c to avoid pedantic runtime errors
+- Fix typo in zlib.h uncompress() description [Reiss]
+- Correct inflate() comments with regard to automatic header detection
+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
+- Put new version of gzlog (2.0) in examples with interruption recovery
+- Add puff compile option to permit invalid distance-too-far streams
+- Add puff TEST command options, ability to read piped input
+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
+  _LARGEFILE64_SOURCE not defined
+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
+- Fix deflateSetDictionary() to use all 32K for output consistency
+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
+- Clear bytes after deflate lookahead to avoid use of uninitialized data
+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
+- Update win32/zlib.def with exported symbols from zlib.h
+- Correct spelling errors in zlib.h [Willem, Sobrado]
+- Allow Z_BLOCK for deflate() to force a new block
+- Allow negative bits in inflatePrime() to delete existing bit buffer
+- Add Z_TREES flush option to inflate() to return at end of trees
+- Add inflateMark() to return current state information for random access
+- Add Makefile for NintendoDS to contrib [Costa]
+- Add -w in configure compile tests to avoid spurious warnings [Beucler]
+- Fix typos in zlib.h comments for deflateSetDictionary()
+- Fix EOF detection in transparent gzread() [Maier]
+
+Changes in 1.2.3.3 (2 October 2006)
+- Make --shared the default for configure, add a --static option
+- Add compile option to permit invalid distance-too-far streams
+- Add inflateUndermine() function which is required to enable above
+- Remove use of "this" variable name for C++ compatibility [Marquess]
+- Add testing of shared library in make test, if shared library built
+- Use ftello() and fseeko() if available instead of ftell() and fseek()
+- Provide two versions of all functions that use the z_off_t type for
+  binary compatibility -- a normal version and a 64-bit offset version,
+  per the Large File Support Extension when _LARGEFILE64_SOURCE is
+  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
+  is defined to be 64
+- Add a --uname= option to configure to perhaps help with cross-compiling
+
+Changes in 1.2.3.2 (3 September 2006)
+- Turn off silly Borland warnings [Hay]
+- Use off64_t and define _LARGEFILE64_SOURCE when present
+- Fix missing dependency on inffixed.h in Makefile.in
+- Rig configure --shared to build both shared and static [Teredesai, Truta]
+- Remove zconf.in.h and instead create a new zlibdefs.h file
+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
+
+Changes in 1.2.3.1 (16 August 2006)
+- Add watcom directory with OpenWatcom make files [Daniel]
+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
+- Update make_vms.com [Zinser]
+- Use -fPIC for shared build in configure [Teredesai, Nicholson]
+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
+- Add some FAQ entries about the contrib directory
+- Update the MVS question in the FAQ
+- Avoid extraneous reads after EOF in gzio.c [Brown]
+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
+- Add comments to zlib.h about gzerror() usage [Brown]
+- Set extra flags in gzip header in gzopen() like deflate() does
+- Make configure options more compatible with double-dash conventions
+  [Weigelt]
+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
+- Fix uninstall target in Makefile.in [Truta]
+- Add pkgconfig support [Weigelt]
+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
+- Replace set_data_type() with a more accurate detect_data_type() in
+  trees.c, according to the txtvsbin.txt document [Truta]
+- Swap the order of #include <stdio.h> and #include "zlib.h" in
+  gzio.c, example.c and minigzip.c [Truta]
+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
+  Truta] (where?)
+- Fix target "clean" from win32/Makefile.bor [Truta]
+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
+- Enable browse info in the "Debug" and "ASM Debug" configurations in
+  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
+- Add pkgconfig support [Weigelt]
+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
+  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
+- Add a document that explains the new text detection scheme to
+  doc/txtvsbin.txt [Truta]
+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
+- Move algorithm.txt into doc/ [Truta]
+- Synchronize FAQ with website
+- Fix compressBound(), was low for some pathological cases [Fearnley]
+- Take into account wrapper variations in deflateBound()
+- Set examples/zpipe.c input and output to binary mode for Windows
+- Update examples/zlib_how.html with new zpipe.c (also web site)
+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
+  that gcc became pickier in 4.0)
+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
+  un-versioned, the patch adds versioning only for symbols introduced in
+  zlib-1.2.0 or later.  It also declares as local those symbols which are
+  not designed to be exported." [Levin]
+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
+- Do not initialize global static by default in trees.c, add a response
+  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
+- Don't use strerror() in gzio.c under WinCE [Yakimov]
+- Don't use errno.h in zutil.h under WinCE [Yakimov]
+- Move arguments for AR to its usage to allow replacing ar [Marot]
+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
+- Improve inflateInit() and inflateInit2() documentation
+- Fix structure size comment in inflate.h
+- Change configure help option from --h* to --help [Santos]
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Add zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enhance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5)
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+  occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+  (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+  See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean"  (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+  . zutil.c, zutil.h: added "const" for zmem*
+  . Make_vms.com: fixed some typos
+  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+  . msdos/Makefile.*: use model-dependent name for the built zlib library
+  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+  See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+  completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+  compression ratio on some files. This also allows inlining _tr_tally for
+  matches in deflate_slow
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+  on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+  the declaration of FAR (Gilles Vollant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+  them at run time (thanks to Ken Raeburn for this suggestion). To create
+  trees.h, compile with GEN_TREES_H and run "make test"
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+  Andy Buckler for finding this one)
+- In minigzip, pass transparently also the first byte for .Z files
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+  (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+  inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+   contrib/asm386/ by Gilles Vollant <info@winimage.com>
+        386 asm code replacing longest_match()
+   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
+   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+        Another C++ I/O streams interface
+   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+        How to use compress(), uncompress() and the gz* functions from VB
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+  level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+  (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code
+- Use default memcpy for Symantec MSDOS compiler
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch)
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+  bit, so the decompressor could decompress all the correct data but went
+  on to attempt decompressing extra garbage data. This affected minigzip too
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+  small and medium models; this makes the library incompatible with previous
+  versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+  avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generate bad compressed data
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count)
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?)
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions)
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h)
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model)
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+  TurboC large model
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support
+- Simplified the crc32() interface. The pre- and post-conditioning
+  (one's complement) is now done inside crc32(). WARNING: this is
+  incompatible with previous versions; see zlib.h for the new usage
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose)
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+  not yet Z_FULL_FLUSH
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'
+  Added Z_FILTERED and Z_HUFFMAN_ONLY constants
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+  if compression method == 8
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2
+- added inflateInit2
+- simplified considerably deflateInit and inflateInit by not supporting
+  user-provided history buffer. This is supported only in deflateInit2
+  and inflateInit2
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression
+- added Z_HUFFMAN_ONLY
+- added gzerror()
diff --git a/extra/zlib/zlib-1.2.13/FAQ b/extra/zlib/zlib-1.2.13/FAQ
new file mode 100644
index 000000000000..99b7cf92e454
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/FAQ
@@ -0,0 +1,368 @@
+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://zlib.net/ which may have more recent information.
+The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.  See the
+    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
+    precompiled DLL are found in the zlib web site at http://zlib.net/ .
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://marknelson.us/1997/01/01/zlib-engine/
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress(), the length of the compressed
+    buffer is equal to the available size of the compressed buffer and not
+    zero.  For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not zero.
+    When setting the parameter flush equal to Z_FINISH, also make sure that
+    avail_out is big enough to allow processing all pending input.  Note that a
+    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
+    made with more input or output space.  A Z_BUF_ERROR may in fact be
+    unavoidable depending on how the functions are used, since it is not
+    possible to tell whether or not there is more output pending when
+    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
+    heavily annotated example.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
+    and test/minigzip.c, with more in examples/ .
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple package.
+    zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of zlib.
+    Please try to reproduce the problem with a small program and send the
+    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
+    data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    By default a shared (and a static) library is built for Unix.  So:
+
+    make distclean
+    ./configure
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there!  If you
+    can #include <zlib.h>, it's there.  The -lz option will probably link to
+    it.  You can check the version at the top of zlib.h or with the
+    ZLIB_VERSION symbol defined in zlib.h .
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
+    http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc).  You must recompile applications using zlib
+    which have this problem.  This problem is specific to Solaris.  See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format.  The gz* functions in
+    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
+    use the same compressed data format internally, but have different headers
+    and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about a
+    single file, such as the name and last modification date.  The zlib format
+    on the other hand was designed for in-memory and communication channel
+    applications, and has a much more compact header and trailer and uses a
+    faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2().  You can also request that inflate decode the
+    gzip format using inflateInit2().  Read zlib.h for more details.
+
+21. Is zlib thread-safe?
+
+    Yes.  However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe.  zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default.  zlib's *Init* functions
+    allow for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes.  Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No.  Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION.  Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers.  For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations.  The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    Yes.  It has been tested on 64-bit machines, and has no dependence on any
+    data types being limited to 32-bits in length.  If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No.  The PKWare DCL uses a completely different compressed data format than
+    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation.  If when compressing you periodically use
+    Z_FULL_FLUSH, carefully write all the pending data at those points, and
+    keep an index of those locations, then you can start decompression at those
+    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
+    can significantly degrade compression.  Alternatively, you can scan a
+    deflate stream once to generate an index, and then use that index for
+    random access.  See examples/zran.c .
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    It has in the past, but we have not heard of any recent evidence.  There
+    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
+    If you know of recent, successful applications of zlib on these operating
+    systems, please let us know.  Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at to
+    understand the deflate format?
+
+    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no.  In fact, that was originally the whole point behind
+    zlib.  Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes.  inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks.  Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate().  The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit only
+    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
+    64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf().  If zlib is
+    compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of an 8K string space (or other value as set by
+    gzbuffer()), other than the caller of gzprintf() assuring that the output
+    will not exceed 8K.  On the other hand, if zlib is compiled to use
+    snprintf() or vsnprintf(), which should normally be the case, then there is
+    no vulnerability.  The ./configure script will display warnings if an
+    insecure variation of sprintf() will be used by gzprintf().  Also the
+    zlibCompileFlags() function will return information on what variant of
+    sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib.  Versions
+    1.1.3 and before were subject to a double-free vulnerability, and versions
+    1.2.1 and 1.2.2 were subject to an access exception when decompressing
+    invalid compressed data.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://zlib.net/ .
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe.  It just got to be a waste of time, and some compilers
+    were downright silly as well as contradicted each other.  So now, we simply
+    make sure that the code always works.
+
+36. Valgrind (or some similar memory access checker) says that deflate is
+    performing a conditional jump that depends on an uninitialized value.
+    Isn't that a bug?
+
+    No.  That is intentional for performance reasons, and the output of deflate
+    is not affected.  This only started showing up recently since zlib 1.2.x
+    uses malloc() by default for allocations, whereas earlier versions used
+    calloc(), which zeros out the allocated memory.  Even though the code was
+    correct, versions 1.2.4 and later was changed to not stimulate these
+    checkers.
+
+37. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+38. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption.  The original PKZIP encryption is very
+    weak and can be broken with freely available programs.  To get strong
+    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
+    compression.  For PKZIP compatible "encryption", look at
+    http://www.info-zip.org/
+
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
+    probably have called the second one "zlib" instead to avoid confusion with
+    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specification in RFC 1951, most notably Microsoft.  So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No.  PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.  In
+    any case, the compression improvements are so modest compared to other more
+    modern approaches, that it's not worth the effort to implement.
+
+41. I'm having a problem with the zip functions in zlib, can you help?
+
+    There are no zip functions in zlib.  You are probably using minizip by
+    Giles Vollant, which is found in the contrib directory of zlib.  It is not
+    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
+    files in there are not supported by the zlib authors.  You need to contact
+    the authors of the respective contribution for help.
+
+42. The match.asm code in contrib is under the GNU General Public License.
+    Since it's part of zlib, doesn't that mean that all of zlib falls under the
+    GNU GPL?
+
+    No.  The files in contrib are not part of zlib.  They were contributed by
+    other authors and are provided as a convenience to the user within the zlib
+    distribution.  Each item in contrib has its own license.
+
+43. Is zlib subject to export controls?  What is its ECCN?
+
+    zlib is not subject to export controls, and so is classified as EAR99.
+
+44. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/extra/zlib/zlib-1.2.13/INDEX b/extra/zlib/zlib-1.2.13/INDEX
new file mode 100644
index 000000000000..2ba064120486
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/INDEX
@@ -0,0 +1,68 @@
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs
+See examples/README.examples
+
+                unsupported contributions by third parties
+See contrib/README.contrib
diff --git a/extra/zlib/zlib-1.2.13/LICENSE b/extra/zlib/zlib-1.2.13/LICENSE
new file mode 100644
index 000000000000..ab8ee6f71428
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/LICENSE
@@ -0,0 +1,22 @@
+Copyright notice:
+
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
diff --git a/extra/zlib/zlib-1.2.13/Makefile.in b/extra/zlib/zlib-1.2.13/Makefile.in
new file mode 100644
index 000000000000..7d2713f4c574
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/Makefile.in
@@ -0,0 +1,404 @@
+# Makefile for zlib
+# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#    ./configure; make test
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+#    make install
+# To install in $HOME instead of /usr/local, use:
+#    make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DZLIB_DEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+SFLAGS=-O
+LDFLAGS=
+TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
+LDSHARED=$(CC)
+CPP=$(CC) -E
+
+STATICLIB=libz.a
+SHAREDLIB=libz.so
+SHAREDLIBV=libz.so.1.2.13
+SHAREDLIBM=libz.so.1
+LIBS=$(STATICLIB) $(SHAREDLIBV)
+
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+LDCONFIG=ldconfig
+LDSHAREDLIBC=-lc
+TAR=tar
+SHELL=/bin/sh
+EXE=
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+sharedlibdir = ${libdir}
+includedir = ${prefix}/include
+mandir = ${prefix}/share/man
+man3dir = ${mandir}/man3
+pkgconfigdir = ${libdir}/pkgconfig
+SRCDIR=
+ZINC=
+ZINCOUT=-I.
+
+OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
+OBJC = $(OBJZ) $(OBJG)
+
+PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
+PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
+
+# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
+OBJA =
+PIC_OBJA =
+
+OBJS = $(OBJC) $(OBJA)
+
+PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
+
+all: static shared
+
+static: example$(EXE) minigzip$(EXE)
+
+shared: examplesh$(EXE) minigzipsh$(EXE)
+
+all64: example64$(EXE) minigzip64$(EXE)
+
+check: test
+
+test: all teststatic testshared
+
+teststatic: static
+	@TMPST=tmpst_$$; \
+	if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
+	  echo '		*** zlib test OK ***'; \
+	else \
+	  echo '		*** zlib test FAILED ***'; false; \
+	fi
+	@rm -f tmpst_$$
+
+testshared: shared
+	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
+	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
+	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
+	TMPSH=tmpsh_$$; \
+	if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
+	  echo '		*** zlib shared test OK ***'; \
+	else \
+	  echo '		*** zlib shared test FAILED ***'; false; \
+	fi
+	@rm -f tmpsh_$$
+
+test64: all64
+	@TMP64=tmp64_$$; \
+	if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
+	  echo '		*** zlib 64-bit test OK ***'; \
+	else \
+	  echo '		*** zlib 64-bit test FAILED ***'; false; \
+	fi
+	@rm -f tmp64_$$
+
+infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
+	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
+
+infcover: infcover.o libz.a
+	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
+
+cover: infcover
+	rm -f *.gcda
+	${QEMU_RUN} ./infcover
+	gcov inf*.c
+
+libz.a: $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+match.o: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c _match.s
+	mv _match.o match.o
+	rm -f _match.s
+
+match.lo: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c -fPIC _match.s
+	mv _match.o match.lo
+	rm -f _match.s
+
+example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
+	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
+
+minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
+	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
+
+example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
+	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
+
+minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
+	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
+
+
+adler32.o: $(SRCDIR)adler32.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
+
+crc32.o: $(SRCDIR)crc32.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
+
+deflate.o: $(SRCDIR)deflate.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
+
+infback.o: $(SRCDIR)infback.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
+
+inffast.o: $(SRCDIR)inffast.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
+
+inflate.o: $(SRCDIR)inflate.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
+
+inftrees.o: $(SRCDIR)inftrees.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
+
+trees.o: $(SRCDIR)trees.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
+
+zutil.o: $(SRCDIR)zutil.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
+
+compress.o: $(SRCDIR)compress.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
+
+uncompr.o: $(SRCDIR)uncompr.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
+
+gzclose.o: $(SRCDIR)gzclose.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
+
+gzlib.o: $(SRCDIR)gzlib.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
+
+gzread.o: $(SRCDIR)gzread.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
+
+gzwrite.o: $(SRCDIR)gzwrite.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
+
+
+adler32.lo: $(SRCDIR)adler32.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
+	-@mv objs/adler32.o $@
+
+crc32.lo: $(SRCDIR)crc32.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
+	-@mv objs/crc32.o $@
+
+deflate.lo: $(SRCDIR)deflate.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
+	-@mv objs/deflate.o $@
+
+infback.lo: $(SRCDIR)infback.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
+	-@mv objs/infback.o $@
+
+inffast.lo: $(SRCDIR)inffast.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
+	-@mv objs/inffast.o $@
+
+inflate.lo: $(SRCDIR)inflate.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
+	-@mv objs/inflate.o $@
+
+inftrees.lo: $(SRCDIR)inftrees.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
+	-@mv objs/inftrees.o $@
+
+trees.lo: $(SRCDIR)trees.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
+	-@mv objs/trees.o $@
+
+zutil.lo: $(SRCDIR)zutil.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
+	-@mv objs/zutil.o $@
+
+compress.lo: $(SRCDIR)compress.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
+	-@mv objs/compress.o $@
+
+uncompr.lo: $(SRCDIR)uncompr.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
+	-@mv objs/uncompr.o $@
+
+gzclose.lo: $(SRCDIR)gzclose.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
+	-@mv objs/gzclose.o $@
+
+gzlib.lo: $(SRCDIR)gzlib.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
+	-@mv objs/gzlib.o $@
+
+gzread.lo: $(SRCDIR)gzread.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
+	-@mv objs/gzread.o $@
+
+gzwrite.lo: $(SRCDIR)gzwrite.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
+	-@mv objs/gzwrite.o $@
+
+
+placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
+	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
+	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+	ln -s $@ $(SHAREDLIB)
+	ln -s $@ $(SHAREDLIBM)
+	-@rmdir objs
+
+example$(EXE): example.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
+
+minigzip$(EXE): minigzip.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+
+examplesh$(EXE): example.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
+
+minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
+
+example64$(EXE): example64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+
+minigzip64$(EXE): minigzip64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
+
+install-libs: $(LIBS)
+	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
+	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
+	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
+	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
+	cp $(STATICLIB) $(DESTDIR)$(libdir)
+	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
+	-@if test -n "$(SHAREDLIBV)"; then \
+	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
+	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
+	fi
+	rm -f $(DESTDIR)$(man3dir)/zlib.3
+	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
+	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+	rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
+	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
+	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
+# The ranlib in install is needed on NeXTSTEP which checks file times
+# ldconfig is for Linux
+
+install: install-libs
+	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
+	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+
+uninstall:
+	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
+	cd $(DESTDIR)$(libdir) && rm -f libz.a; \
+	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+	fi
+	cd $(DESTDIR)$(man3dir) && rm -f zlib.3
+	cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
+
+docs: zlib.3.pdf
+
+zlib.3.pdf: $(SRCDIR)zlib.3
+	groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
+
+zconf.h.cmakein: $(SRCDIR)zconf.h.in
+	-@ TEMPFILE=zconfh_$$; \
+	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
+	sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
+	touch -r $(SRCDIR)zconf.h.in $@ &&\
+	rm $$TEMPFILE
+
+zconf: $(SRCDIR)zconf.h.in
+	cp -p $(SRCDIR)zconf.h.in zconf.h
+
+mostlyclean: clean
+clean:
+	rm -f *.o *.lo *~ \
+	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
+	   example64$(EXE) minigzip64$(EXE) \
+	   infcover \
+	   libz.* foo.gz so_locations \
+	   _match.s maketree contrib/infback9/*.o
+	rm -rf objs
+	rm -f *.gcda *.gcno *.gcov
+	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
+
+maintainer-clean: distclean
+distclean: clean zconf zconf.h.cmakein
+	rm -f Makefile zlib.pc configure.log
+	-@rm -f .DS_Store
+	@if [ -f Makefile.in ]; then \
+	printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
+	printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
+	touch -r $(SRCDIR)Makefile.in Makefile ; fi
+
+tags:
+	etags $(SRCDIR)*.[ch]
+
+adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
+compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h
+crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
+deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
+inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
+inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
+trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+
+adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
+compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h
+crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
+deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
+infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
+inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
+inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
+trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
diff --git a/extra/zlib/zlib-1.2.13/README b/extra/zlib/zlib-1.2.13/README
new file mode 100644
index 000000000000..ba34d1894a9b
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/README
@@ -0,0 +1,118 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.13 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in.  In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version.  The zlib home page is
+http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+issue of Dr.  Dobb's Journal; a copy of the article is available at
+http://marknelson.us/1997/01/01/zlib-engine/ .
+
+The changes made in version 1.2.13 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://docs.python.org/library/zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz.  The deflate and
+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+  people who reported problems and suggested various improvements in zlib; they
+  are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.  We make all
+contributions to and distributions of this project solely in our personal
+capacity, and are not conveying any rights to any intellectual property of
+any third parties.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/extra/zlib/zlib-1.2.13/adler32.c b/extra/zlib/zlib-1.2.13/adler32.c
new file mode 100644
index 000000000000..d0be4380a39c
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/adler32.c
@@ -0,0 +1,186 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521U     /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_z(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    z_size_t len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/extra/zlib/zlib-1.2.13/compress.c b/extra/zlib/zlib-1.2.13/compress.c
new file mode 100644
index 000000000000..2ad5326c14ec
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/compress.c
@@ -0,0 +1,86 @@
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong left;
+
+    left = *destLen;
+    *destLen = 0;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    stream.next_out = dest;
+    stream.avail_out = 0;
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+            sourceLen -= stream.avail_in;
+        }
+        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
+    } while (err == Z_OK);
+
+    *destLen = stream.total_out;
+    deflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK : err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound(sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
+}
diff --git a/extra/zlib/zlib-1.2.13/configure b/extra/zlib/zlib-1.2.13/configure
new file mode 100755
index 000000000000..fa4d5daaba99
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/configure
@@ -0,0 +1,922 @@
+#!/bin/sh
+# configure script for zlib.
+#
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+#
+# To impose specific compiler or flags or install directory, use for example:
+#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+
+# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
+# If you have problems, try without defining CC and CFLAGS before reporting
+# an error.
+
+# start off configure.log
+echo -------------------- >> configure.log
+echo $0 $* >> configure.log
+date >> configure.log
+
+# get source directory
+SRCDIR=`dirname $0`
+if test $SRCDIR = "."; then
+    ZINC=""
+    ZINCOUT="-I."
+    SRCDIR=""
+else
+    ZINC='-include zconf.h'
+    ZINCOUT='-I. -I$(SRCDIR)'
+    SRCDIR="$SRCDIR/"
+fi
+
+# set command prefix for cross-compilation
+if [ -n "${CHOST}" ]; then
+    uname=${CHOST}
+    mname=${CHOST}
+    CROSS_PREFIX="${CHOST}-"
+else
+    mname=`(uname -a || echo unknown) 2>/dev/null`
+fi
+
+# destination name for static library
+STATICLIB=libz.a
+
+# extract zlib version numbers from zlib.h
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
+VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
+VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
+VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
+
+# establish commands for library building
+if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    AR=${AR-"${CROSS_PREFIX}ar"}
+    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
+else
+    AR=${AR-"ar"}
+    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
+fi
+ARFLAGS=${ARFLAGS-"rc"}
+if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
+    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
+else
+    RANLIB=${RANLIB-"ranlib"}
+fi
+if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+    NM=${NM-"${CROSS_PREFIX}nm"}
+    test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log
+else
+    NM=${NM-"nm"}
+fi
+
+# set defaults before processing command line options
+LDCONFIG=${LDCONFIG-"ldconfig"}
+LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
+ARCHS=
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+sharedlibdir=${sharedlibdir-'${libdir}'}
+includedir=${includedir-'${prefix}/include'}
+mandir=${mandir-'${prefix}/share/man'}
+shared_ext='.so'
+shared=1
+solo=0
+cover=0
+zprefix=0
+zconst=0
+build64=0
+gcc=0
+warn=0
+debug=0
+sanitize=0
+old_cc="$CC"
+old_cflags="$CFLAGS"
+OBJC='$(OBJZ) $(OBJG)'
+PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
+
+# leave this script, optionally in a bad way
+leave()
+{
+  if test "$*" != "0"; then
+    echo "** $0 aborting." | tee -a configure.log
+  fi
+  rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version
+  echo -------------------- >> configure.log
+  echo >> configure.log
+  echo >> configure.log
+  exit $1
+}
+
+# process command line options
+while test $# -ge 1
+do
+case "$1" in
+    -h* | --help)
+      echo 'usage:' | tee -a configure.log
+      echo '  configure [--const] [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]' | tee -a configure.log
+      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
+      echo '    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
+        exit 0 ;;
+    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
+    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
+    -p* | --prefix) prefix="$2"; shift; shift ;;
+    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
+    -l* | --libdir) libdir="$2"; shift; shift ;;
+    -i* | --includedir) includedir="$2"; shift; shift ;;
+    -s* | --shared | --enable-shared) shared=1; shift ;;
+    -t | --static) shared=0; shift ;;
+    --solo) solo=1; shift ;;
+    --cover) cover=1; shift ;;
+    -z* | --zprefix) zprefix=1; shift ;;
+    -6* | --64) build64=1; shift ;;
+    -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
+    --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
+    --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
+    -c* | --const) zconst=1; shift ;;
+    -w* | --warn) warn=1; shift ;;
+    -d* | --debug) debug=1; shift ;;
+    --sanitize) sanitize=1; shift ;;
+    *)
+      echo "unknown option: $1" | tee -a configure.log
+      echo "$0 --help for help" | tee -a configure.log
+      leave 1;;
+    esac
+done
+
+# temporary file name
+test=ztest$$
+
+# put arguments in log, also put test file in log if used in arguments
+show()
+{
+  case "$*" in
+    *$test.c*)
+      echo === $test.c === >> configure.log
+      cat $test.c >> configure.log
+      echo === >> configure.log;;
+  esac
+  echo $* >> configure.log
+}
+
+# check for gcc vs. cc and set compile and link flags based on the system identified by uname
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+
+if test -z "$CC"; then
+  echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
+  if ${CROSS_PREFIX}gcc -v >/dev/null 2>&1; then
+    cc=${CROSS_PREFIX}gcc
+  else
+    cc=${CROSS_PREFIX}cc
+  fi
+else
+  cc=${CC}
+fi
+
+case "$cc" in
+  *gcc*) gcc=1 ;;
+  *clang*) gcc=1 ;;
+esac
+case `$cc -v 2>&1` in
+  *gcc*) gcc=1 ;;
+  *clang*) gcc=1 ;;
+esac
+
+show $cc -c $test.c
+if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+  echo ... using gcc >> configure.log
+  CC="$cc"
+  CFLAGS="${CFLAGS--O3}"
+  SFLAGS="${CFLAGS--O3} -fPIC"
+  if test "$ARCHS"; then
+    CFLAGS="${CFLAGS} ${ARCHS}"
+    LDFLAGS="${LDFLAGS} ${ARCHS}"
+  fi
+  if test $build64 -eq 1; then
+    CFLAGS="${CFLAGS} -m64"
+    SFLAGS="${SFLAGS} -m64"
+  fi
+  if test "$warn" -eq 1; then
+    if test "$zconst" -eq 1; then
+      CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -DZLIB_CONST"
+    else
+      CFLAGS="${CFLAGS} -Wall -Wextra"
+    fi
+  fi
+  if test $sanitize -eq 1; then
+    CFLAGS="${CFLAGS} -g -fsanitize=address"
+  fi
+  if test $debug -eq 1; then
+    CFLAGS="${CFLAGS} -DZLIB_DEBUG"
+    SFLAGS="${SFLAGS} -DZLIB_DEBUG"
+  fi
+  if test -z "$uname"; then
+    uname=`(uname -s || echo unknown) 2>/dev/null`
+  fi
+  case "$uname" in
+  Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+        case "$mname" in
+        *sparc*)
+            LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+        esac
+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
+  *BSD | *bsd* | DragonFly)
+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
+        LDCONFIG="ldconfig -m" ;;
+  CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*)
+        EXE='.exe' ;;
+  MINGW* | mingw* | *-mingw*)
+        rm -f $test.[co] $test $test$shared_ext
+        echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log
+        LDSHARED=${LDSHARED-"$cc -shared"}
+        LDSHAREDLIBC=""
+        EXE='.exe' ;;
+  QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+        # (alain.bonnefoy@icbt.com)
+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
+  HP-UX*)
+        LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+        case `(uname -m || echo unknown) 2>/dev/null` in
+        ia64)
+            shared_ext='.so'
+            SHAREDLIB='libz.so' ;;
+        *)
+            shared_ext='.sl'
+            SHAREDLIB='libz.sl' ;;
+        esac ;;
+  AIX*)
+        LDFLAGS="${LDFLAGS} -Wl,-brtl" ;;
+  Darwin* | darwin* | *-darwin*)
+        shared_ext='.dylib'
+        SHAREDLIB=libz$shared_ext
+        SHAREDLIBV=libz.$VER$shared_ext
+        SHAREDLIBM=libz.$VER1$shared_ext
+        LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+        if libtool -V 2>&1 | grep Apple > /dev/null; then
+            AR="libtool"
+        else
+            AR="/usr/bin/libtool"
+        fi
+        ARFLAGS="-o" ;;
+  *)
+        LDSHARED=${LDSHARED-"$cc -shared"} ;;
+  esac
+else
+  # find system name and corresponding cc options
+  CC=${CC-cc}
+  gcc=0
+  echo ... using $CC >> configure.log
+  if test -z "$uname"; then
+    uname=`(uname -sr || echo unknown) 2>/dev/null`
+  fi
+  case "$uname" in
+  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
+             CFLAGS=${CFLAGS-"-O"}
+#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
+             LDSHARED=${LDSHARED-"ld -b"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
+         ia64)
+             shared_ext='.so'
+             SHAREDLIB='libz.so' ;;
+         *)
+             shared_ext='.sl'
+             SHAREDLIB='libz.sl' ;;
+         esac ;;
+  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+             CFLAGS=${CFLAGS-"-ansi -O2"}
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
+             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
+  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
+             CFLAGS=${CFLAGS-"-O -std1"}
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
+             CFLAGS=${CFLAGS-"-4 -O"}
+             LDSHARED=${LDSHARED-"cc"}
+             RANLIB=${RANLIB-"true"}
+             AR="cc"
+             ARFLAGS="-A" ;;
+  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+             CFLAGS=${CFLAGS-"-O3"}
+             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
+  SunOS\ 5* | solaris*)
+         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
+         SFLAGS=${CFLAGS-"-fast -KPIC"}
+         CFLAGS=${CFLAGS-"-fast"}
+         if test $build64 -eq 1; then
+             # old versions of SunPRO/Workshop/Studio don't support -m64,
+             # but newer ones do.  Check for it.
+             flag64=`$CC -flags | egrep -- '^-m64'`
+             if test x"$flag64" != x"" ; then
+                 CFLAGS="${CFLAGS} -m64"
+                 SFLAGS="${SFLAGS} -m64"
+             else
+                 case `(uname -m || echo unknown) 2>/dev/null` in
+                   i86*)
+                     SFLAGS="$SFLAGS -xarch=amd64"
+                     CFLAGS="$CFLAGS -xarch=amd64" ;;
+                   *)
+                     SFLAGS="$SFLAGS -xarch=v9"
+                     CFLAGS="$CFLAGS -xarch=v9" ;;
+                 esac
+             fi
+         fi
+         if test -n "$ZINC"; then
+             ZINC='-I- -I. -I$(SRCDIR)'
+         fi
+         ;;
+  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+             CFLAGS=${CFLAGS-"-O2"}
+             LDSHARED=${LDSHARED-"ld"} ;;
+  SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
+             CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
+             LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
+  UNIX_System_V\ 4.2.0)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  UNIX_SV\ 4.2MP)
+             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  OpenUNIX\ 5)
+             SFLAGS=${CFLAGS-"-KPIC -O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -G"} ;;
+  AIX*)  # Courtesy of dbakker@arrayasolutions.com
+             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+             LDSHARED=${LDSHARED-"xlc -G"} ;;
+  # send working options for other systems to zlib@gzip.org
+  *)         SFLAGS=${CFLAGS-"-O"}
+             CFLAGS=${CFLAGS-"-O"}
+             LDSHARED=${LDSHARED-"cc -shared"} ;;
+  esac
+fi
+
+# destination names for shared library if not defined above
+SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
+SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
+SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
+
+echo >> configure.log
+
+# define functions for testing compiler and library characteristics and logging the results
+
+cat > $test.c <<EOF
+#error error
+EOF
+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+  try()
+  {
+    show $*
+    test "`( $* ) 2>&1 | tee -a configure.log`" = ""
+  }
+  echo - using any output from compiler to indicate an error >> configure.log
+else
+  try()
+  {
+    show $*
+    got=`( $* ) 2>&1`
+    ret=$?
+    if test "$got" != ""; then
+      printf "%s\n" "$got" >> configure.log
+    fi
+    if test $ret -ne 0; then
+      echo "(exit code "$ret")" >> configure.log
+    fi
+    return $ret
+  }
+fi
+
+tryboth()
+{
+  show $*
+  got=`( $* ) 2>&1`
+  ret=$?
+  if test "$got" != ""; then
+    printf "%s\n" "$got" >> configure.log
+  fi
+  if test $ret -ne 0; then
+    echo "(exit code "$ret")" >> configure.log
+    return $ret
+  fi
+  test "$got" = ""
+}
+
+cat > $test.c << EOF
+int foo() { return 0; }
+EOF
+echo "Checking for obsessive-compulsive compiler options..." >> configure.log
+if try $CC -c $CFLAGS $test.c; then
+  :
+else
+  echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log
+  leave 1
+fi
+
+echo >> configure.log
+
+# see if shared library build supported
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+if test $shared -eq 1; then
+  echo Checking for shared library support... | tee -a configure.log
+  # we must test in two steps (cc then ld), required at least on SunOS 4.x
+  if try $CC -w -c $SFLAGS $test.c &&
+     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
+    echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
+  elif test -z "$old_cc" -a -z "$old_cflags"; then
+    echo No shared library support. | tee -a configure.log
+    shared=0;
+  else
+    echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
+    shared=0;
+  fi
+fi
+if test $shared -eq 0; then
+  LDSHARED="$CC"
+  ALL="static"
+  TEST="all teststatic"
+  SHAREDLIB=""
+  SHAREDLIBV=""
+  SHAREDLIBM=""
+  echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
+else
+  ALL="static shared"
+  TEST="all teststatic testshared"
+fi
+
+echo >> configure.log
+
+# check for size_t
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdlib.h>
+size_t dummy = 0;
+EOF
+if try $CC -c $CFLAGS $test.c; then
+  echo "Checking for size_t... Yes." | tee -a configure.log
+else
+  echo "Checking for size_t... No." | tee -a configure.log
+  # find a size_t integer type
+  # check for long long
+  cat > $test.c << EOF
+long long dummy = 0;
+EOF
+  if try $CC -c $CFLAGS $test.c; then
+    echo "Checking for long long... Yes." | tee -a configure.log
+    cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+    if (sizeof(void *) <= sizeof(int)) puts("int");
+    else if (sizeof(void *) <= sizeof(long)) puts("long");
+    else puts("z_longlong");
+    return 0;
+}
+EOF
+  else
+    echo "Checking for long long... No." | tee -a configure.log
+    cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+    if (sizeof(void *) <= sizeof(int)) puts("int");
+    else puts("long");
+    return 0;
+}
+EOF
+  fi
+  if try $CC $CFLAGS -o $test $test.c; then
+    sizet=`./$test`
+    echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
+    CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
+    SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
+  else
+    echo "Checking for a pointer-size integer type... not found." | tee -a configure.log
+  fi
+fi
+
+echo >> configure.log
+
+# check for large file support, and if none, check for fseeko()
+cat > $test.c <<EOF
+#include <sys/types.h>
+off64_t dummy = 0;
+EOF
+if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
+  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
+  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
+  ALL="${ALL} all64"
+  TEST="${TEST} test64"
+  echo "Checking for off64_t... Yes." | tee -a configure.log
+  echo "Checking for fseeko... Yes." | tee -a configure.log
+else
+  echo "Checking for off64_t... No." | tee -a configure.log
+  echo >> configure.log
+  cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+  fseeko(NULL, 0, 0);
+  return 0;
+}
+EOF
+  if try $CC $CFLAGS -o $test $test.c; then
+    echo "Checking for fseeko... Yes." | tee -a configure.log
+  else
+    CFLAGS="${CFLAGS} -DNO_FSEEKO"
+    SFLAGS="${SFLAGS} -DNO_FSEEKO"
+    echo "Checking for fseeko... No." | tee -a configure.log
+  fi
+fi
+
+echo >> configure.log
+
+# check for strerror() for use by gz* functions
+cat > $test.c <<EOF
+#include <string.h>
+#include <errno.h>
+int main() { return strlen(strerror(errno)); }
+EOF
+if try $CC $CFLAGS -o $test $test.c; then
+  echo "Checking for strerror... Yes." | tee -a configure.log
+else
+  CFLAGS="${CFLAGS} -DNO_STRERROR"
+  SFLAGS="${SFLAGS} -DNO_STRERROR"
+  echo "Checking for strerror... No." | tee -a configure.log
+fi
+
+# copy clean zconf.h for subsequent edits
+cp -p ${SRCDIR}zconf.h.in zconf.h
+
+echo >> configure.log
+
+# check for unistd.h and save result in zconf.h
+cat > $test.c <<EOF
+#include <unistd.h>
+int main() { return 0; }
+EOF
+if try $CC -c $CFLAGS $test.c; then
+  sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
+  mv zconf.temp.h zconf.h
+  echo "Checking for unistd.h... Yes." | tee -a configure.log
+else
+  echo "Checking for unistd.h... No." | tee -a configure.log
+fi
+
+echo >> configure.log
+
+# check for stdarg.h and save result in zconf.h
+cat > $test.c <<EOF
+#include <stdarg.h>
+int main() { return 0; }
+EOF
+if try $CC -c $CFLAGS $test.c; then
+  sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
+  mv zconf.temp.h zconf.h
+  echo "Checking for stdarg.h... Yes." | tee -a configure.log
+else
+  echo "Checking for stdarg.h... No." | tee -a configure.log
+fi
+
+# if the z_ prefix was requested, save that in zconf.h
+if test $zprefix -eq 1; then
+  sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
+  mv zconf.temp.h zconf.h
+  echo >> configure.log
+  echo "Using z_ prefix on all symbols." | tee -a configure.log
+fi
+
+# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
+if test $solo -eq 1; then
+  sed '/#define ZCONF_H/a\
+#define Z_SOLO
+
+' < zconf.h > zconf.temp.h
+  mv zconf.temp.h zconf.h
+OBJC='$(OBJZ)'
+PIC_OBJC='$(PIC_OBJZ)'
+fi
+
+# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
+if test $cover -eq 1; then
+  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
+  if test -n "$GCC_CLASSIC"; then
+    CC=$GCC_CLASSIC
+  fi
+fi
+
+echo >> configure.log
+
+# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions
+# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a
+# return value.  The most secure result is vsnprintf() with a return value.  snprintf() with a
+# return value is secure as well, but then gzprintf() will be limited to 20 arguments.
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+#include "zconf.h"
+int main()
+{
+#ifndef STDC
+  choke me
+#endif
+  return 0;
+}
+EOF
+if try $CC -c $CFLAGS $test.c; then
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log
+
+  echo >> configure.log
+  cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+  char buf[20];
+  va_list ap;
+  va_start(ap, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return 0;
+}
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+  if try $CC $CFLAGS -o $test $test.c; then
+    echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
+
+    echo >> configure.log
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+  va_start(ap, fmt);
+  n = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return n;
+}
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if try $CC -c $CFLAGS $test.c; then
+      echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log
+    else
+      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
+      SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
+      echo "Checking for return value of vsnprintf()... No." | tee -a configure.log
+      echo "  WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log
+      echo "  can build but will be open to possible string-format security" | tee -a configure.log
+      echo "  vulnerabilities." | tee -a configure.log
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_vsnprintf"
+    SFLAGS="$SFLAGS -DNO_vsnprintf"
+    echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log
+    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log
+    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
+    echo "  vulnerabilities." | tee -a configure.log
+
+    echo >> configure.log
+    cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+  int n;
+  char buf[20];
+  va_list ap;
+  va_start(ap, fmt);
+  n = vsprintf(buf, fmt, ap);
+  va_end(ap);
+  return n;
+}
+int main()
+{
+  return (mytest("Hello%d\n", 1));
+}
+EOF
+
+    if try $CC -c $CFLAGS $test.c; then
+      echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log
+    else
+      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
+      SFLAGS="$SFLAGS -DHAS_vsprintf_void"
+      echo "Checking for return value of vsprintf()... No." | tee -a configure.log
+      echo "  WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log
+      echo "  can build but will be open to possible string-format security" | tee -a configure.log
+      echo "  vulnerabilities." | tee -a configure.log
+    fi
+  fi
+else
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log
+
+  echo >> configure.log
+  cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+  char buf[20];
+  snprintf(buf, sizeof(buf), "%s", "foo");
+  return 0;
+}
+int main()
+{
+  return (mytest());
+}
+EOF
+
+  if try $CC $CFLAGS -o $test $test.c; then
+    echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
+
+    echo >> configure.log
+    cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+  char buf[20];
+  return snprintf(buf, sizeof(buf), "%s", "foo");
+}
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if try $CC -c $CFLAGS $test.c; then
+      echo "Checking for return value of snprintf()... Yes." | tee -a configure.log
+    else
+      CFLAGS="$CFLAGS -DHAS_snprintf_void"
+      SFLAGS="$SFLAGS -DHAS_snprintf_void"
+      echo "Checking for return value of snprintf()... No." | tee -a configure.log
+      echo "  WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log
+      echo "  can build but will be open to possible string-format security" | tee -a configure.log
+      echo "  vulnerabilities." | tee -a configure.log
+    fi
+  else
+    CFLAGS="$CFLAGS -DNO_snprintf"
+    SFLAGS="$SFLAGS -DNO_snprintf"
+    echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log
+    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log
+    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
+    echo "  vulnerabilities." | tee -a configure.log
+
+    echo >> configure.log
+    cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+  char buf[20];
+  return sprintf(buf, "%s", "foo");
+}
+int main()
+{
+  return (mytest());
+}
+EOF
+
+    if try $CC -c $CFLAGS $test.c; then
+      echo "Checking for return value of sprintf()... Yes." | tee -a configure.log
+    else
+      CFLAGS="$CFLAGS -DHAS_sprintf_void"
+      SFLAGS="$SFLAGS -DHAS_sprintf_void"
+      echo "Checking for return value of sprintf()... No." | tee -a configure.log
+      echo "  WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log
+      echo "  can build but will be open to possible string-format security" | tee -a configure.log
+      echo "  vulnerabilities." | tee -a configure.log
+    fi
+  fi
+fi
+
+# see if we can hide zlib internal symbols that are linked between separate source files
+if test "$gcc" -eq 1; then
+  echo >> configure.log
+  cat > $test.c <<EOF
+#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+int ZLIB_INTERNAL foo;
+int main()
+{
+  return 0;
+}
+EOF
+  if tryboth $CC -c $CFLAGS $test.c; then
+    CFLAGS="$CFLAGS -DHAVE_HIDDEN"
+    SFLAGS="$SFLAGS -DHAVE_HIDDEN"
+    echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
+  else
+    echo "Checking for attribute(visibility) support... No." | tee -a configure.log
+  fi
+fi
+
+# show the results in the log
+echo >> configure.log
+echo ALL = $ALL >> configure.log
+echo AR = $AR >> configure.log
+echo ARFLAGS = $ARFLAGS >> configure.log
+echo CC = $CC >> configure.log
+echo CFLAGS = $CFLAGS >> configure.log
+echo CPP = $CPP >> configure.log
+echo EXE = $EXE >> configure.log
+echo LDCONFIG = $LDCONFIG >> configure.log
+echo LDFLAGS = $LDFLAGS >> configure.log
+echo LDSHARED = $LDSHARED >> configure.log
+echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
+echo OBJC = $OBJC >> configure.log
+echo PIC_OBJC = $PIC_OBJC >> configure.log
+echo RANLIB = $RANLIB >> configure.log
+echo SFLAGS = $SFLAGS >> configure.log
+echo SHAREDLIB = $SHAREDLIB >> configure.log
+echo SHAREDLIBM = $SHAREDLIBM >> configure.log
+echo SHAREDLIBV = $SHAREDLIBV >> configure.log
+echo STATICLIB = $STATICLIB >> configure.log
+echo TEST = $TEST >> configure.log
+echo VER = $VER >> configure.log
+echo SRCDIR = $SRCDIR >> configure.log
+echo exec_prefix = $exec_prefix >> configure.log
+echo includedir = $includedir >> configure.log
+echo libdir = $libdir >> configure.log
+echo mandir = $mandir >> configure.log
+echo prefix = $prefix >> configure.log
+echo sharedlibdir = $sharedlibdir >> configure.log
+echo uname = $uname >> configure.log
+
+# udpate Makefile with the configure results
+sed < ${SRCDIR}Makefile.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^SFLAGS *=/s#=.*#=$SFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^CPP *=/s#=.*#=$CPP#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR#
+/^ARFLAGS *=/s#=.*#=$ARFLAGS#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^LDCONFIG *=/s#=.*#=$LDCONFIG#
+/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
+/^EXE *=/s#=.*#=$EXE#
+/^SRCDIR *=/s#=.*#=$SRCDIR#
+/^ZINC *=/s#=.*#=$ZINC#
+/^ZINCOUT *=/s#=.*#=$ZINCOUT#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^OBJC *=/s#=.*#= $OBJC#
+/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
+/^all: */s#:.*#: $ALL#
+/^test: */s#:.*#: $TEST#
+" > Makefile
+
+# create zlib.pc with the configure results
+sed < ${SRCDIR}zlib.pc.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^CPP *=/s#=.*#=$CPP#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR#
+/^ARFLAGS *=/s#=.*#=$ARFLAGS#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+" | sed -e "
+s/\@VERSION\@/$VER/g;
+" > zlib.pc
+
+# done
+leave 0
diff --git a/extra/zlib/zlib-1.2.13/crc32.c b/extra/zlib/zlib-1.2.13/crc32.c
new file mode 100644
index 000000000000..f8357b083f76
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/crc32.c
@@ -0,0 +1,1125 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * This interleaved implementation of a CRC makes use of pipelined multiple
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  MAKECRCH can be #defined to write out crc32.h. A main() routine is also
+  produced, so that this one source file can be compiled to an executable.
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
+
+ /*
+  A CRC of a message is computed on N braids of words in the message, where
+  each word consists of W bytes (4 or 8). If N is 3, for example, then three
+  running sparse CRCs are calculated respectively on each braid, at these
+  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
+  This is done starting at a word boundary, and continues until as many blocks
+  of N * W bytes as are available have been processed. The results are combined
+  into a single CRC at the end. For this code, N must be in the range 1..6 and
+  W must be 4 or 8. The upper limit on N can be increased if desired by adding
+  more #if blocks, extending the patterns apparent in the code. In addition,
+  crc32.h would need to be regenerated, if the maximum N value is increased.
+
+  N and W are chosen empirically by benchmarking the execution time on a given
+  processor. The choices for N and W below were based on testing on Intel Kaby
+  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
+  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
+  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
+  They were all tested with either gcc or clang, all using the -O3 optimization
+  level. Your mileage may vary.
+ */
+
+/* Define N */
+#ifdef Z_TESTN
+#  define N Z_TESTN
+#else
+#  define N 5
+#endif
+#if N < 1 || N > 6
+#  error N must be in 1..6
+#endif
+
+/*
+  z_crc_t must be at least 32 bits. z_word_t must be at least as long as
+  z_crc_t. It is assumed here that z_word_t is either 32 bits or 64 bits, and
+  that bytes are eight bits.
+ */
+
+/*
+  Define W and the associated z_word_t type. If W is not defined, then a
+  braided calculation is not used, and the associated tables and code are not
+  compiled.
+ */
+#ifdef Z_TESTW
+#  if Z_TESTW-1 != -1
+#    define W Z_TESTW
+#  endif
+#else
+#  ifdef MAKECRCH
+#    define W 8         /* required for MAKECRCH */
+#  else
+#    if defined(__x86_64__) || defined(__aarch64__)
+#      define W 8
+#    else
+#      define W 4
+#    endif
+#  endif
+#endif
+#ifdef W
+#  if W == 8 && defined(Z_U8)
+     typedef Z_U8 z_word_t;
+#  elif defined(Z_U4)
+#    undef W
+#    define W 4
+     typedef Z_U4 z_word_t;
+#  else
+#    undef W
+#  endif
+#endif
+
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#  define ARMCRC32
+#endif
+
+/* Local functions. */
+local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
+local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
+
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+    local z_word_t byte_swap OF((z_word_t word));
+#endif
+
+#if defined(W) && !defined(ARMCRC32)
+    local z_crc_t crc_word OF((z_word_t data));
+    local z_word_t crc_word_big OF((z_word_t data));
+#endif
+
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+/*
+  Swap the bytes in a z_word_t to convert between little and big endian. Any
+  self-respecting compiler will optimize this to a single machine byte-swap
+  instruction, if one is available. This assumes that word_t is either 32 bits
+  or 64 bits.
+ */
+local z_word_t byte_swap(word)
+    z_word_t word;
+{
+#  if W == 8
+    return
+        (word & 0xff00000000000000) >> 56 |
+        (word & 0xff000000000000) >> 40 |
+        (word & 0xff0000000000) >> 24 |
+        (word & 0xff00000000) >> 8 |
+        (word & 0xff000000) << 8 |
+        (word & 0xff0000) << 24 |
+        (word & 0xff00) << 40 |
+        (word & 0xff) << 56;
+#  else   /* W == 4 */
+    return
+        (word & 0xff000000) >> 24 |
+        (word & 0xff0000) >> 8 |
+        (word & 0xff00) << 8 |
+        (word & 0xff) << 24;
+#  endif
+}
+#endif
+
+/* CRC polynomial. */
+#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local z_crc_t FAR crc_table[256];
+local z_crc_t FAR x2n_table[32];
+local void make_crc_table OF((void));
+#ifdef W
+   local z_word_t FAR crc_big_table[256];
+   local z_crc_t FAR crc_braid_table[W][256];
+   local z_word_t FAR crc_braid_big_table[W][256];
+   local void braid OF((z_crc_t [][256], z_word_t [][256], int, int));
+#endif
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const z_crc_t FAR *, int));
+   local void write_table32hi OF((FILE *, const z_word_t FAR *, int));
+   local void write_table64 OF((FILE *, const z_word_t FAR *, int));
+#endif /* MAKECRCH */
+
+/*
+  Define a once() function depending on the availability of atomics. If this is
+  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
+  multiple threads, and if atomics are not available, then get_crc_table() must
+  be called to initialize the tables and must return before any threads are
+  allowed to compute or combine CRCs.
+ */
+
+/* Definition of once functionality. */
+typedef struct once_s once_t;
+local void once OF((once_t *, void (*)(void)));
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    atomic_flag begun;
+    atomic_int done;
+};
+#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  ONCE_INIT.
+ */
+local void once(state, init)
+    once_t *state;
+    void (*init)(void);
+{
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    volatile int begun;
+    volatile int done;
+};
+#define ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to minimize the period of
+   vulnerability. */
+local int test_and_set OF((int volatile *));
+local int test_and_set(flag)
+    int volatile *flag;
+{
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void once(state, init)
+    once_t *state;
+    void (*init)(void);
+{
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif
+
+/* State for once(). */
+local once_t made = ONCE_INIT;
+
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit. Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one. If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder. The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
+  (which is shifting right by one and adding x^32 mod p if the bit shifted out
+  is a one). We start with the highest power (least significant bit) of q and
+  repeat for all eight bits of q.
+
+  The table is simply the CRC of all possible eight bit values. This is all the
+  information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+ */
+
+local void make_crc_table()
+{
+    unsigned i, j, n;
+    z_crc_t p;
+
+    /* initialize the CRC of bytes tables */
+    for (i = 0; i < 256; i++) {
+        p = i;
+        for (j = 0; j < 8; j++)
+            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
+        crc_table[i] = p;
+#ifdef W
+        crc_big_table[i] = byte_swap(p);
+#endif
+    }
+
+    /* initialize the x^2^n mod p(x) table */
+    p = (z_crc_t)1 << 30;         /* x^1 */
+    x2n_table[0] = p;
+    for (n = 1; n < 32; n++)
+        x2n_table[n] = p = multmodp(p, p);
+
+#ifdef W
+    /* initialize the braiding tables -- needs x2n_table[] */
+    braid(crc_braid_table, crc_braid_big_table, N, W);
+#endif
+
+#ifdef MAKECRCH
+    {
+        /*
+          The crc32.h header file contains tables for both 32-bit and 64-bit
+          z_word_t's, and so requires a 64-bit type be available. In that case,
+          z_word_t must be defined to be 64-bits. This code then also generates
+          and writes out the tables for the case that z_word_t is 32 bits.
+         */
+#if !defined(W) || W != 8
+#  error Need a 64-bit integer type in order to generate crc32.h.
+#endif
+        FILE *out;
+        int k, n;
+        z_crc_t ltl[8][256];
+        z_word_t big[8][256];
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+
+        /* write out little-endian CRC table to crc32.h */
+        fprintf(out,
+            "/* crc32.h -- tables for rapid CRC calculation\n"
+            " * Generated automatically by crc32.c\n */\n"
+            "\n"
+            "local const z_crc_t FAR crc_table[] = {\n"
+            "    ");
+        write_table(out, crc_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 64-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#ifdef W\n"
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table64(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 32-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table32hi(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n");
+
+        /* write out braid tables for each value of N */
+        for (n = 1; n <= 6; n++) {
+            fprintf(out,
+            "\n"
+            "#if N == %d\n", n);
+
+            /* compute braid tables for this N and 64-bit word_t */
+            braid(ltl, big, n, 8);
+
+            /* write out braid tables for 64-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table64(out, big[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n");
+
+            /* compute braid tables for this N and 32-bit word_t */
+            braid(ltl, big, n, 4);
+
+            /* write out braid tables for 32-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table32hi(out, big[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n"
+            "\n"
+            "#endif\n");
+        }
+        fprintf(out,
+            "\n"
+            "#endif\n");
+
+        /* write out zeros operator table to crc32.h */
+        fprintf(out,
+            "\n"
+            "local const z_crc_t FAR x2n_table[] = {\n"
+            "    ");
+        write_table(out, x2n_table, 32);
+        fprintf(out,
+            "};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+local void write_table(out, table, k)
+    FILE *out;
+    const z_crc_t FAR *table;
+    int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+   Write the high 32-bits of each value in table[0..k-1] to out, five per line
+   in hexadecimal separated by commas.
+ */
+local void write_table32hi(out, table, k)
+FILE *out;
+const z_word_t FAR *table;
+int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n] >> 32),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+  Write the 64-bit values in table[0..k-1] to out, three per line in
+  hexadecimal separated by commas. This assumes that if there is a 64-bit
+  type, then there is also a long long integer type, and it is at least 64
+  bits. If not, then the type cast and format string can be adjusted
+  accordingly.
+ */
+local void write_table64(out, table, k)
+    FILE *out;
+    const z_word_t FAR *table;
+    int k;
+{
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : "    ",
+                (unsigned long long)(table[n]),
+                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
+}
+
+/* Actually do the deed. */
+int main()
+{
+    make_crc_table();
+    return 0;
+}
+
+#endif /* MAKECRCH */
+
+#ifdef W
+/*
+  Generate the little and big-endian braid tables for the given n and z_word_t
+  size w. Each array must have room for w blocks of 256 elements.
+ */
+local void braid(ltl, big, n, w)
+    z_crc_t ltl[][256];
+    z_word_t big[][256];
+    int n;
+    int w;
+{
+    int k;
+    z_crc_t i, p, q;
+    for (k = 0; k < w; k++) {
+        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        ltl[k][0] = 0;
+        big[w - 1 - k][0] = 0;
+        for (i = 1; i < 256; i++) {
+            ltl[k][i] = q = multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* ========================================================================
+ * Routines used for CRC calculation. Some are also required for the table
+ * generation above.
+ */
+
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+local z_crc_t multmodp(a, b)
+    z_crc_t a;
+    z_crc_t b;
+{
+    z_crc_t m, p;
+
+    m = (z_crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
+
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+local z_crc_t x2nmodp(n, k)
+    z_off64_t n;
+    unsigned k;
+{
+    z_crc_t p;
+
+    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32(), and to force the
+ * generation of the CRC tables in a threaded application.
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const z_crc_t FAR *)crc_table;
+}
+
+/* =========================================================================
+ * Use ARM machine instructions if available. This will compute the CRC about
+ * ten times faster than the braided calculation. This code does not check for
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
+ * only be defined if the compilation specifies an ARM processor architecture
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
+ * instructions.
+ */
+#ifdef ARMCRC32
+
+/*
+   Constants empirically determined to maximize speed. These values are from
+   measurements on a Cortex-A57. Your mileage may vary.
+ */
+#define Z_BATCH 3990                /* number of words in a batch */
+#define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
+#define Z_BATCH_MIN 800             /* fewest words in a final batch */
+
+unsigned long ZEXPORT crc32_z(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    z_crc_t val;
+    z_word_t crc1, crc2;
+    const z_word_t *word;
+    z_word_t val0, val1, val2;
+    z_size_t last, last2, i;
+    z_size_t num;
+
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+    /* Compute the CRC up to a word boundary. */
+    while (len && ((z_size_t)buf & 7) != 0) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
+    word = (z_word_t const *)buf;
+    num = len >> 3;
+    len &= 7;
+
+    /* Do three interleaved CRCs to realize the throughput of one crc32x
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
+    while (num >= 3 * Z_BATCH) {
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < Z_BATCH; i++) {
+            val0 = word[i];
+            val1 = word[i + Z_BATCH];
+            val2 = word[i + 2 * Z_BATCH];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * Z_BATCH;
+        num -= 3 * Z_BATCH;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
+    }
+
+    /* Do one last smaller batch with the remaining words, if there are enough
+       to pay for the combination of CRCs. */
+    last = num / 3;
+    if (last >= Z_BATCH_MIN) {
+        last2 = last << 1;
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < last; i++) {
+            val0 = word[i];
+            val1 = word[i + last];
+            val2 = word[i + last2];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * last;
+        num -= 3 * last;
+        val = x2nmodp(last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
+
+    /* Compute the CRC on any remaining words. */
+    for (i = 0; i < num; i++) {
+        val0 = word[i];
+        __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+    }
+    word += num;
+
+    /* Complete the CRC on any remaining bytes. */
+    buf = (const unsigned char FAR *)word;
+    while (len) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#else
+
+#ifdef W
+
+/*
+  Return the CRC of the W bytes in the word_t data, taking the
+  least-significant byte of the word as the first byte of data, without any pre
+  or post conditioning. This is used to combine the CRCs of each braid.
+ */
+local z_crc_t crc_word(data)
+    z_word_t data;
+{
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (z_crc_t)data;
+}
+
+local z_word_t crc_word_big(data)
+    z_word_t data;
+{
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data << 8) ^
+            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
+    return data;
+}
+
+#endif
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32_z(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
+
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
+
+#ifdef W
+
+    /* If provided enough bytes, do a braided CRC calculation. */
+    if (len >= N * W + W - 1) {
+        z_size_t blks;
+        z_word_t const *words;
+        unsigned endian;
+        int k;
+
+        /* Compute the CRC up to a z_word_t boundary. */
+        while (len && ((z_size_t)buf & (W - 1)) != 0) {
+            len--;
+            crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        }
+
+        /* Compute the CRC on as many N z_word_t blocks as are available. */
+        blks = len / (N * W);
+        len -= blks * N * W;
+        words = (z_word_t const *)buf;
+
+        /* Do endian check at execution time instead of compile time, since ARM
+           processors can change the endianess at execution time. If the
+           compiler knows what the endianess will be, it can optimize out the
+           check and the unused branch. */
+        endian = 1;
+        if (*(unsigned char *)&endian) {
+            /* Little endian. */
+
+            z_crc_t crc0;
+            z_word_t word0;
+#if N > 1
+            z_crc_t crc1;
+            z_word_t word1;
+#if N > 2
+            z_crc_t crc2;
+            z_word_t word2;
+#if N > 3
+            z_crc_t crc3;
+            z_word_t word3;
+#if N > 4
+            z_crc_t crc4;
+            z_word_t word4;
+#if N > 5
+            z_crc_t crc5;
+            z_word_t word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = crc;
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            crc = crc_word(crc0 ^ words[0]);
+#if N > 1
+            crc = crc_word(crc1 ^ words[1] ^ crc);
+#if N > 2
+            crc = crc_word(crc2 ^ words[2] ^ crc);
+#if N > 3
+            crc = crc_word(crc3 ^ words[3] ^ crc);
+#if N > 4
+            crc = crc_word(crc4 ^ words[4] ^ crc);
+#if N > 5
+            crc = crc_word(crc5 ^ words[5] ^ crc);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+        }
+        else {
+            /* Big endian. */
+
+            z_word_t crc0, word0, comb;
+#if N > 1
+            z_word_t crc1, word1;
+#if N > 2
+            z_word_t crc2, word2;
+#if N > 3
+            z_word_t crc3, word3;
+#if N > 4
+            z_word_t crc4, word4;
+#if N > 5
+            z_word_t crc5, word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = byte_swap(crc);
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_big_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_big_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_big_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_big_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_big_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_big_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            comb = crc_word_big(crc0 ^ words[0]);
+#if N > 1
+            comb = crc_word_big(crc1 ^ words[1] ^ comb);
+#if N > 2
+            comb = crc_word_big(crc2 ^ words[2] ^ comb);
+#if N > 3
+            comb = crc_word_big(crc3 ^ words[3] ^ comb);
+#if N > 4
+            comb = crc_word_big(crc4 ^ words[4] ^ comb);
+#if N > 5
+            comb = crc_word_big(crc5 ^ words[5] ^ comb);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+            crc = byte_swap(comb);
+        }
+
+        /*
+          Update the pointer to the remaining bytes to process.
+         */
+        buf = (unsigned char const *)words;
+    }
+
+#endif /* W */
+
+    /* Complete the computation of the CRC on any remaining bytes. */
+    while (len >= 8) {
+        len -= 8;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
+}
+
+#endif
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    return crc32_z(crc, buf, len);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen64(len2)
+    z_off64_t len2;
+{
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return x2nmodp(len2, 3);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen(len2)
+    z_off_t len2;
+{
+    return crc32_combine_gen64((z_off64_t)len2);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
+    uLong crc1;
+    uLong crc2;
+    uLong op;
+{
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+}
diff --git a/extra/zlib/zlib-1.2.13/crc32.h b/extra/zlib/zlib-1.2.13/crc32.h
new file mode 100644
index 000000000000..137df68d616c
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/crc32.h
@@ -0,0 +1,9446 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d};
+
+#ifdef W
+
+#if W == 8
+
+local const z_word_t FAR crc_big_table[] = {
+    0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000};
+
+#else /* W == 4 */
+
+local const z_word_t FAR crc_big_table[] = {
+    0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d};
+
+#endif
+
+#if N == 1
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c},
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000},
+   {0x0000000000000000, 0x41311b1900000000, 0x8262363200000000,
+    0xc3532d2b00000000, 0x04c56c6400000000, 0x45f4777d00000000,
+    0x86a75a5600000000, 0xc796414f00000000, 0x088ad9c800000000,
+    0x49bbc2d100000000, 0x8ae8effa00000000, 0xcbd9f4e300000000,
+    0x0c4fb5ac00000000, 0x4d7eaeb500000000, 0x8e2d839e00000000,
+    0xcf1c988700000000, 0x5112c24a00000000, 0x1023d95300000000,
+    0xd370f47800000000, 0x9241ef6100000000, 0x55d7ae2e00000000,
+    0x14e6b53700000000, 0xd7b5981c00000000, 0x9684830500000000,
+    0x59981b8200000000, 0x18a9009b00000000, 0xdbfa2db000000000,
+    0x9acb36a900000000, 0x5d5d77e600000000, 0x1c6c6cff00000000,
+    0xdf3f41d400000000, 0x9e0e5acd00000000, 0xa224849500000000,
+    0xe3159f8c00000000, 0x2046b2a700000000, 0x6177a9be00000000,
+    0xa6e1e8f100000000, 0xe7d0f3e800000000, 0x2483dec300000000,
+    0x65b2c5da00000000, 0xaaae5d5d00000000, 0xeb9f464400000000,
+    0x28cc6b6f00000000, 0x69fd707600000000, 0xae6b313900000000,
+    0xef5a2a2000000000, 0x2c09070b00000000, 0x6d381c1200000000,
+    0xf33646df00000000, 0xb2075dc600000000, 0x715470ed00000000,
+    0x30656bf400000000, 0xf7f32abb00000000, 0xb6c231a200000000,
+    0x75911c8900000000, 0x34a0079000000000, 0xfbbc9f1700000000,
+    0xba8d840e00000000, 0x79dea92500000000, 0x38efb23c00000000,
+    0xff79f37300000000, 0xbe48e86a00000000, 0x7d1bc54100000000,
+    0x3c2ade5800000000, 0x054f79f000000000, 0x447e62e900000000,
+    0x872d4fc200000000, 0xc61c54db00000000, 0x018a159400000000,
+    0x40bb0e8d00000000, 0x83e823a600000000, 0xc2d938bf00000000,
+    0x0dc5a03800000000, 0x4cf4bb2100000000, 0x8fa7960a00000000,
+    0xce968d1300000000, 0x0900cc5c00000000, 0x4831d74500000000,
+    0x8b62fa6e00000000, 0xca53e17700000000, 0x545dbbba00000000,
+    0x156ca0a300000000, 0xd63f8d8800000000, 0x970e969100000000,
+    0x5098d7de00000000, 0x11a9ccc700000000, 0xd2fae1ec00000000,
+    0x93cbfaf500000000, 0x5cd7627200000000, 0x1de6796b00000000,
+    0xdeb5544000000000, 0x9f844f5900000000, 0x58120e1600000000,
+    0x1923150f00000000, 0xda70382400000000, 0x9b41233d00000000,
+    0xa76bfd6500000000, 0xe65ae67c00000000, 0x2509cb5700000000,
+    0x6438d04e00000000, 0xa3ae910100000000, 0xe29f8a1800000000,
+    0x21cca73300000000, 0x60fdbc2a00000000, 0xafe124ad00000000,
+    0xeed03fb400000000, 0x2d83129f00000000, 0x6cb2098600000000,
+    0xab2448c900000000, 0xea1553d000000000, 0x29467efb00000000,
+    0x687765e200000000, 0xf6793f2f00000000, 0xb748243600000000,
+    0x741b091d00000000, 0x352a120400000000, 0xf2bc534b00000000,
+    0xb38d485200000000, 0x70de657900000000, 0x31ef7e6000000000,
+    0xfef3e6e700000000, 0xbfc2fdfe00000000, 0x7c91d0d500000000,
+    0x3da0cbcc00000000, 0xfa368a8300000000, 0xbb07919a00000000,
+    0x7854bcb100000000, 0x3965a7a800000000, 0x4b98833b00000000,
+    0x0aa9982200000000, 0xc9fab50900000000, 0x88cbae1000000000,
+    0x4f5def5f00000000, 0x0e6cf44600000000, 0xcd3fd96d00000000,
+    0x8c0ec27400000000, 0x43125af300000000, 0x022341ea00000000,
+    0xc1706cc100000000, 0x804177d800000000, 0x47d7369700000000,
+    0x06e62d8e00000000, 0xc5b500a500000000, 0x84841bbc00000000,
+    0x1a8a417100000000, 0x5bbb5a6800000000, 0x98e8774300000000,
+    0xd9d96c5a00000000, 0x1e4f2d1500000000, 0x5f7e360c00000000,
+    0x9c2d1b2700000000, 0xdd1c003e00000000, 0x120098b900000000,
+    0x533183a000000000, 0x9062ae8b00000000, 0xd153b59200000000,
+    0x16c5f4dd00000000, 0x57f4efc400000000, 0x94a7c2ef00000000,
+    0xd596d9f600000000, 0xe9bc07ae00000000, 0xa88d1cb700000000,
+    0x6bde319c00000000, 0x2aef2a8500000000, 0xed796bca00000000,
+    0xac4870d300000000, 0x6f1b5df800000000, 0x2e2a46e100000000,
+    0xe136de6600000000, 0xa007c57f00000000, 0x6354e85400000000,
+    0x2265f34d00000000, 0xe5f3b20200000000, 0xa4c2a91b00000000,
+    0x6791843000000000, 0x26a09f2900000000, 0xb8aec5e400000000,
+    0xf99fdefd00000000, 0x3accf3d600000000, 0x7bfde8cf00000000,
+    0xbc6ba98000000000, 0xfd5ab29900000000, 0x3e099fb200000000,
+    0x7f3884ab00000000, 0xb0241c2c00000000, 0xf115073500000000,
+    0x32462a1e00000000, 0x7377310700000000, 0xb4e1704800000000,
+    0xf5d06b5100000000, 0x3683467a00000000, 0x77b25d6300000000,
+    0x4ed7facb00000000, 0x0fe6e1d200000000, 0xccb5ccf900000000,
+    0x8d84d7e000000000, 0x4a1296af00000000, 0x0b238db600000000,
+    0xc870a09d00000000, 0x8941bb8400000000, 0x465d230300000000,
+    0x076c381a00000000, 0xc43f153100000000, 0x850e0e2800000000,
+    0x42984f6700000000, 0x03a9547e00000000, 0xc0fa795500000000,
+    0x81cb624c00000000, 0x1fc5388100000000, 0x5ef4239800000000,
+    0x9da70eb300000000, 0xdc9615aa00000000, 0x1b0054e500000000,
+    0x5a314ffc00000000, 0x996262d700000000, 0xd85379ce00000000,
+    0x174fe14900000000, 0x567efa5000000000, 0x952dd77b00000000,
+    0xd41ccc6200000000, 0x138a8d2d00000000, 0x52bb963400000000,
+    0x91e8bb1f00000000, 0xd0d9a00600000000, 0xecf37e5e00000000,
+    0xadc2654700000000, 0x6e91486c00000000, 0x2fa0537500000000,
+    0xe836123a00000000, 0xa907092300000000, 0x6a54240800000000,
+    0x2b653f1100000000, 0xe479a79600000000, 0xa548bc8f00000000,
+    0x661b91a400000000, 0x272a8abd00000000, 0xe0bccbf200000000,
+    0xa18dd0eb00000000, 0x62defdc000000000, 0x23efe6d900000000,
+    0xbde1bc1400000000, 0xfcd0a70d00000000, 0x3f838a2600000000,
+    0x7eb2913f00000000, 0xb924d07000000000, 0xf815cb6900000000,
+    0x3b46e64200000000, 0x7a77fd5b00000000, 0xb56b65dc00000000,
+    0xf45a7ec500000000, 0x370953ee00000000, 0x763848f700000000,
+    0xb1ae09b800000000, 0xf09f12a100000000, 0x33cc3f8a00000000,
+    0x72fd249300000000},
+   {0x0000000000000000, 0x376ac20100000000, 0x6ed4840300000000,
+    0x59be460200000000, 0xdca8090700000000, 0xebc2cb0600000000,
+    0xb27c8d0400000000, 0x85164f0500000000, 0xb851130e00000000,
+    0x8f3bd10f00000000, 0xd685970d00000000, 0xe1ef550c00000000,
+    0x64f91a0900000000, 0x5393d80800000000, 0x0a2d9e0a00000000,
+    0x3d475c0b00000000, 0x70a3261c00000000, 0x47c9e41d00000000,
+    0x1e77a21f00000000, 0x291d601e00000000, 0xac0b2f1b00000000,
+    0x9b61ed1a00000000, 0xc2dfab1800000000, 0xf5b5691900000000,
+    0xc8f2351200000000, 0xff98f71300000000, 0xa626b11100000000,
+    0x914c731000000000, 0x145a3c1500000000, 0x2330fe1400000000,
+    0x7a8eb81600000000, 0x4de47a1700000000, 0xe0464d3800000000,
+    0xd72c8f3900000000, 0x8e92c93b00000000, 0xb9f80b3a00000000,
+    0x3cee443f00000000, 0x0b84863e00000000, 0x523ac03c00000000,
+    0x6550023d00000000, 0x58175e3600000000, 0x6f7d9c3700000000,
+    0x36c3da3500000000, 0x01a9183400000000, 0x84bf573100000000,
+    0xb3d5953000000000, 0xea6bd33200000000, 0xdd01113300000000,
+    0x90e56b2400000000, 0xa78fa92500000000, 0xfe31ef2700000000,
+    0xc95b2d2600000000, 0x4c4d622300000000, 0x7b27a02200000000,
+    0x2299e62000000000, 0x15f3242100000000, 0x28b4782a00000000,
+    0x1fdeba2b00000000, 0x4660fc2900000000, 0x710a3e2800000000,
+    0xf41c712d00000000, 0xc376b32c00000000, 0x9ac8f52e00000000,
+    0xada2372f00000000, 0xc08d9a7000000000, 0xf7e7587100000000,
+    0xae591e7300000000, 0x9933dc7200000000, 0x1c25937700000000,
+    0x2b4f517600000000, 0x72f1177400000000, 0x459bd57500000000,
+    0x78dc897e00000000, 0x4fb64b7f00000000, 0x16080d7d00000000,
+    0x2162cf7c00000000, 0xa474807900000000, 0x931e427800000000,
+    0xcaa0047a00000000, 0xfdcac67b00000000, 0xb02ebc6c00000000,
+    0x87447e6d00000000, 0xdefa386f00000000, 0xe990fa6e00000000,
+    0x6c86b56b00000000, 0x5bec776a00000000, 0x0252316800000000,
+    0x3538f36900000000, 0x087faf6200000000, 0x3f156d6300000000,
+    0x66ab2b6100000000, 0x51c1e96000000000, 0xd4d7a66500000000,
+    0xe3bd646400000000, 0xba03226600000000, 0x8d69e06700000000,
+    0x20cbd74800000000, 0x17a1154900000000, 0x4e1f534b00000000,
+    0x7975914a00000000, 0xfc63de4f00000000, 0xcb091c4e00000000,
+    0x92b75a4c00000000, 0xa5dd984d00000000, 0x989ac44600000000,
+    0xaff0064700000000, 0xf64e404500000000, 0xc124824400000000,
+    0x4432cd4100000000, 0x73580f4000000000, 0x2ae6494200000000,
+    0x1d8c8b4300000000, 0x5068f15400000000, 0x6702335500000000,
+    0x3ebc755700000000, 0x09d6b75600000000, 0x8cc0f85300000000,
+    0xbbaa3a5200000000, 0xe2147c5000000000, 0xd57ebe5100000000,
+    0xe839e25a00000000, 0xdf53205b00000000, 0x86ed665900000000,
+    0xb187a45800000000, 0x3491eb5d00000000, 0x03fb295c00000000,
+    0x5a456f5e00000000, 0x6d2fad5f00000000, 0x801b35e100000000,
+    0xb771f7e000000000, 0xeecfb1e200000000, 0xd9a573e300000000,
+    0x5cb33ce600000000, 0x6bd9fee700000000, 0x3267b8e500000000,
+    0x050d7ae400000000, 0x384a26ef00000000, 0x0f20e4ee00000000,
+    0x569ea2ec00000000, 0x61f460ed00000000, 0xe4e22fe800000000,
+    0xd388ede900000000, 0x8a36abeb00000000, 0xbd5c69ea00000000,
+    0xf0b813fd00000000, 0xc7d2d1fc00000000, 0x9e6c97fe00000000,
+    0xa90655ff00000000, 0x2c101afa00000000, 0x1b7ad8fb00000000,
+    0x42c49ef900000000, 0x75ae5cf800000000, 0x48e900f300000000,
+    0x7f83c2f200000000, 0x263d84f000000000, 0x115746f100000000,
+    0x944109f400000000, 0xa32bcbf500000000, 0xfa958df700000000,
+    0xcdff4ff600000000, 0x605d78d900000000, 0x5737bad800000000,
+    0x0e89fcda00000000, 0x39e33edb00000000, 0xbcf571de00000000,
+    0x8b9fb3df00000000, 0xd221f5dd00000000, 0xe54b37dc00000000,
+    0xd80c6bd700000000, 0xef66a9d600000000, 0xb6d8efd400000000,
+    0x81b22dd500000000, 0x04a462d000000000, 0x33cea0d100000000,
+    0x6a70e6d300000000, 0x5d1a24d200000000, 0x10fe5ec500000000,
+    0x27949cc400000000, 0x7e2adac600000000, 0x494018c700000000,
+    0xcc5657c200000000, 0xfb3c95c300000000, 0xa282d3c100000000,
+    0x95e811c000000000, 0xa8af4dcb00000000, 0x9fc58fca00000000,
+    0xc67bc9c800000000, 0xf1110bc900000000, 0x740744cc00000000,
+    0x436d86cd00000000, 0x1ad3c0cf00000000, 0x2db902ce00000000,
+    0x4096af9100000000, 0x77fc6d9000000000, 0x2e422b9200000000,
+    0x1928e99300000000, 0x9c3ea69600000000, 0xab54649700000000,
+    0xf2ea229500000000, 0xc580e09400000000, 0xf8c7bc9f00000000,
+    0xcfad7e9e00000000, 0x9613389c00000000, 0xa179fa9d00000000,
+    0x246fb59800000000, 0x1305779900000000, 0x4abb319b00000000,
+    0x7dd1f39a00000000, 0x3035898d00000000, 0x075f4b8c00000000,
+    0x5ee10d8e00000000, 0x698bcf8f00000000, 0xec9d808a00000000,
+    0xdbf7428b00000000, 0x8249048900000000, 0xb523c68800000000,
+    0x88649a8300000000, 0xbf0e588200000000, 0xe6b01e8000000000,
+    0xd1dadc8100000000, 0x54cc938400000000, 0x63a6518500000000,
+    0x3a18178700000000, 0x0d72d58600000000, 0xa0d0e2a900000000,
+    0x97ba20a800000000, 0xce0466aa00000000, 0xf96ea4ab00000000,
+    0x7c78ebae00000000, 0x4b1229af00000000, 0x12ac6fad00000000,
+    0x25c6adac00000000, 0x1881f1a700000000, 0x2feb33a600000000,
+    0x765575a400000000, 0x413fb7a500000000, 0xc429f8a000000000,
+    0xf3433aa100000000, 0xaafd7ca300000000, 0x9d97bea200000000,
+    0xd073c4b500000000, 0xe71906b400000000, 0xbea740b600000000,
+    0x89cd82b700000000, 0x0cdbcdb200000000, 0x3bb10fb300000000,
+    0x620f49b100000000, 0x55658bb000000000, 0x6822d7bb00000000,
+    0x5f4815ba00000000, 0x06f653b800000000, 0x319c91b900000000,
+    0xb48adebc00000000, 0x83e01cbd00000000, 0xda5e5abf00000000,
+    0xed3498be00000000},
+   {0x0000000000000000, 0x6567bcb800000000, 0x8bc809aa00000000,
+    0xeeafb51200000000, 0x5797628f00000000, 0x32f0de3700000000,
+    0xdc5f6b2500000000, 0xb938d79d00000000, 0xef28b4c500000000,
+    0x8a4f087d00000000, 0x64e0bd6f00000000, 0x018701d700000000,
+    0xb8bfd64a00000000, 0xddd86af200000000, 0x3377dfe000000000,
+    0x5610635800000000, 0x9f57195000000000, 0xfa30a5e800000000,
+    0x149f10fa00000000, 0x71f8ac4200000000, 0xc8c07bdf00000000,
+    0xada7c76700000000, 0x4308727500000000, 0x266fcecd00000000,
+    0x707fad9500000000, 0x1518112d00000000, 0xfbb7a43f00000000,
+    0x9ed0188700000000, 0x27e8cf1a00000000, 0x428f73a200000000,
+    0xac20c6b000000000, 0xc9477a0800000000, 0x3eaf32a000000000,
+    0x5bc88e1800000000, 0xb5673b0a00000000, 0xd00087b200000000,
+    0x6938502f00000000, 0x0c5fec9700000000, 0xe2f0598500000000,
+    0x8797e53d00000000, 0xd187866500000000, 0xb4e03add00000000,
+    0x5a4f8fcf00000000, 0x3f28337700000000, 0x8610e4ea00000000,
+    0xe377585200000000, 0x0dd8ed4000000000, 0x68bf51f800000000,
+    0xa1f82bf000000000, 0xc49f974800000000, 0x2a30225a00000000,
+    0x4f579ee200000000, 0xf66f497f00000000, 0x9308f5c700000000,
+    0x7da740d500000000, 0x18c0fc6d00000000, 0x4ed09f3500000000,
+    0x2bb7238d00000000, 0xc518969f00000000, 0xa07f2a2700000000,
+    0x1947fdba00000000, 0x7c20410200000000, 0x928ff41000000000,
+    0xf7e848a800000000, 0x3d58149b00000000, 0x583fa82300000000,
+    0xb6901d3100000000, 0xd3f7a18900000000, 0x6acf761400000000,
+    0x0fa8caac00000000, 0xe1077fbe00000000, 0x8460c30600000000,
+    0xd270a05e00000000, 0xb7171ce600000000, 0x59b8a9f400000000,
+    0x3cdf154c00000000, 0x85e7c2d100000000, 0xe0807e6900000000,
+    0x0e2fcb7b00000000, 0x6b4877c300000000, 0xa20f0dcb00000000,
+    0xc768b17300000000, 0x29c7046100000000, 0x4ca0b8d900000000,
+    0xf5986f4400000000, 0x90ffd3fc00000000, 0x7e5066ee00000000,
+    0x1b37da5600000000, 0x4d27b90e00000000, 0x284005b600000000,
+    0xc6efb0a400000000, 0xa3880c1c00000000, 0x1ab0db8100000000,
+    0x7fd7673900000000, 0x9178d22b00000000, 0xf41f6e9300000000,
+    0x03f7263b00000000, 0x66909a8300000000, 0x883f2f9100000000,
+    0xed58932900000000, 0x546044b400000000, 0x3107f80c00000000,
+    0xdfa84d1e00000000, 0xbacff1a600000000, 0xecdf92fe00000000,
+    0x89b82e4600000000, 0x67179b5400000000, 0x027027ec00000000,
+    0xbb48f07100000000, 0xde2f4cc900000000, 0x3080f9db00000000,
+    0x55e7456300000000, 0x9ca03f6b00000000, 0xf9c783d300000000,
+    0x176836c100000000, 0x720f8a7900000000, 0xcb375de400000000,
+    0xae50e15c00000000, 0x40ff544e00000000, 0x2598e8f600000000,
+    0x73888bae00000000, 0x16ef371600000000, 0xf840820400000000,
+    0x9d273ebc00000000, 0x241fe92100000000, 0x4178559900000000,
+    0xafd7e08b00000000, 0xcab05c3300000000, 0x3bb659ed00000000,
+    0x5ed1e55500000000, 0xb07e504700000000, 0xd519ecff00000000,
+    0x6c213b6200000000, 0x094687da00000000, 0xe7e932c800000000,
+    0x828e8e7000000000, 0xd49eed2800000000, 0xb1f9519000000000,
+    0x5f56e48200000000, 0x3a31583a00000000, 0x83098fa700000000,
+    0xe66e331f00000000, 0x08c1860d00000000, 0x6da63ab500000000,
+    0xa4e140bd00000000, 0xc186fc0500000000, 0x2f29491700000000,
+    0x4a4ef5af00000000, 0xf376223200000000, 0x96119e8a00000000,
+    0x78be2b9800000000, 0x1dd9972000000000, 0x4bc9f47800000000,
+    0x2eae48c000000000, 0xc001fdd200000000, 0xa566416a00000000,
+    0x1c5e96f700000000, 0x79392a4f00000000, 0x97969f5d00000000,
+    0xf2f123e500000000, 0x05196b4d00000000, 0x607ed7f500000000,
+    0x8ed162e700000000, 0xebb6de5f00000000, 0x528e09c200000000,
+    0x37e9b57a00000000, 0xd946006800000000, 0xbc21bcd000000000,
+    0xea31df8800000000, 0x8f56633000000000, 0x61f9d62200000000,
+    0x049e6a9a00000000, 0xbda6bd0700000000, 0xd8c101bf00000000,
+    0x366eb4ad00000000, 0x5309081500000000, 0x9a4e721d00000000,
+    0xff29cea500000000, 0x11867bb700000000, 0x74e1c70f00000000,
+    0xcdd9109200000000, 0xa8beac2a00000000, 0x4611193800000000,
+    0x2376a58000000000, 0x7566c6d800000000, 0x10017a6000000000,
+    0xfeaecf7200000000, 0x9bc973ca00000000, 0x22f1a45700000000,
+    0x479618ef00000000, 0xa939adfd00000000, 0xcc5e114500000000,
+    0x06ee4d7600000000, 0x6389f1ce00000000, 0x8d2644dc00000000,
+    0xe841f86400000000, 0x51792ff900000000, 0x341e934100000000,
+    0xdab1265300000000, 0xbfd69aeb00000000, 0xe9c6f9b300000000,
+    0x8ca1450b00000000, 0x620ef01900000000, 0x07694ca100000000,
+    0xbe519b3c00000000, 0xdb36278400000000, 0x3599929600000000,
+    0x50fe2e2e00000000, 0x99b9542600000000, 0xfcdee89e00000000,
+    0x12715d8c00000000, 0x7716e13400000000, 0xce2e36a900000000,
+    0xab498a1100000000, 0x45e63f0300000000, 0x208183bb00000000,
+    0x7691e0e300000000, 0x13f65c5b00000000, 0xfd59e94900000000,
+    0x983e55f100000000, 0x2106826c00000000, 0x44613ed400000000,
+    0xaace8bc600000000, 0xcfa9377e00000000, 0x38417fd600000000,
+    0x5d26c36e00000000, 0xb389767c00000000, 0xd6eecac400000000,
+    0x6fd61d5900000000, 0x0ab1a1e100000000, 0xe41e14f300000000,
+    0x8179a84b00000000, 0xd769cb1300000000, 0xb20e77ab00000000,
+    0x5ca1c2b900000000, 0x39c67e0100000000, 0x80fea99c00000000,
+    0xe599152400000000, 0x0b36a03600000000, 0x6e511c8e00000000,
+    0xa716668600000000, 0xc271da3e00000000, 0x2cde6f2c00000000,
+    0x49b9d39400000000, 0xf081040900000000, 0x95e6b8b100000000,
+    0x7b490da300000000, 0x1e2eb11b00000000, 0x483ed24300000000,
+    0x2d596efb00000000, 0xc3f6dbe900000000, 0xa691675100000000,
+    0x1fa9b0cc00000000, 0x7ace0c7400000000, 0x9461b96600000000,
+    0xf10605de00000000},
+   {0x0000000000000000, 0xb029603d00000000, 0x6053c07a00000000,
+    0xd07aa04700000000, 0xc0a680f500000000, 0x708fe0c800000000,
+    0xa0f5408f00000000, 0x10dc20b200000000, 0xc14b703000000000,
+    0x7162100d00000000, 0xa118b04a00000000, 0x1131d07700000000,
+    0x01edf0c500000000, 0xb1c490f800000000, 0x61be30bf00000000,
+    0xd197508200000000, 0x8297e06000000000, 0x32be805d00000000,
+    0xe2c4201a00000000, 0x52ed402700000000, 0x4231609500000000,
+    0xf21800a800000000, 0x2262a0ef00000000, 0x924bc0d200000000,
+    0x43dc905000000000, 0xf3f5f06d00000000, 0x238f502a00000000,
+    0x93a6301700000000, 0x837a10a500000000, 0x3353709800000000,
+    0xe329d0df00000000, 0x5300b0e200000000, 0x042fc1c100000000,
+    0xb406a1fc00000000, 0x647c01bb00000000, 0xd455618600000000,
+    0xc489413400000000, 0x74a0210900000000, 0xa4da814e00000000,
+    0x14f3e17300000000, 0xc564b1f100000000, 0x754dd1cc00000000,
+    0xa537718b00000000, 0x151e11b600000000, 0x05c2310400000000,
+    0xb5eb513900000000, 0x6591f17e00000000, 0xd5b8914300000000,
+    0x86b821a100000000, 0x3691419c00000000, 0xe6ebe1db00000000,
+    0x56c281e600000000, 0x461ea15400000000, 0xf637c16900000000,
+    0x264d612e00000000, 0x9664011300000000, 0x47f3519100000000,
+    0xf7da31ac00000000, 0x27a091eb00000000, 0x9789f1d600000000,
+    0x8755d16400000000, 0x377cb15900000000, 0xe706111e00000000,
+    0x572f712300000000, 0x4958f35800000000, 0xf971936500000000,
+    0x290b332200000000, 0x9922531f00000000, 0x89fe73ad00000000,
+    0x39d7139000000000, 0xe9adb3d700000000, 0x5984d3ea00000000,
+    0x8813836800000000, 0x383ae35500000000, 0xe840431200000000,
+    0x5869232f00000000, 0x48b5039d00000000, 0xf89c63a000000000,
+    0x28e6c3e700000000, 0x98cfa3da00000000, 0xcbcf133800000000,
+    0x7be6730500000000, 0xab9cd34200000000, 0x1bb5b37f00000000,
+    0x0b6993cd00000000, 0xbb40f3f000000000, 0x6b3a53b700000000,
+    0xdb13338a00000000, 0x0a84630800000000, 0xbaad033500000000,
+    0x6ad7a37200000000, 0xdafec34f00000000, 0xca22e3fd00000000,
+    0x7a0b83c000000000, 0xaa71238700000000, 0x1a5843ba00000000,
+    0x4d77329900000000, 0xfd5e52a400000000, 0x2d24f2e300000000,
+    0x9d0d92de00000000, 0x8dd1b26c00000000, 0x3df8d25100000000,
+    0xed82721600000000, 0x5dab122b00000000, 0x8c3c42a900000000,
+    0x3c15229400000000, 0xec6f82d300000000, 0x5c46e2ee00000000,
+    0x4c9ac25c00000000, 0xfcb3a26100000000, 0x2cc9022600000000,
+    0x9ce0621b00000000, 0xcfe0d2f900000000, 0x7fc9b2c400000000,
+    0xafb3128300000000, 0x1f9a72be00000000, 0x0f46520c00000000,
+    0xbf6f323100000000, 0x6f15927600000000, 0xdf3cf24b00000000,
+    0x0eaba2c900000000, 0xbe82c2f400000000, 0x6ef862b300000000,
+    0xded1028e00000000, 0xce0d223c00000000, 0x7e24420100000000,
+    0xae5ee24600000000, 0x1e77827b00000000, 0x92b0e6b100000000,
+    0x2299868c00000000, 0xf2e326cb00000000, 0x42ca46f600000000,
+    0x5216664400000000, 0xe23f067900000000, 0x3245a63e00000000,
+    0x826cc60300000000, 0x53fb968100000000, 0xe3d2f6bc00000000,
+    0x33a856fb00000000, 0x838136c600000000, 0x935d167400000000,
+    0x2374764900000000, 0xf30ed60e00000000, 0x4327b63300000000,
+    0x102706d100000000, 0xa00e66ec00000000, 0x7074c6ab00000000,
+    0xc05da69600000000, 0xd081862400000000, 0x60a8e61900000000,
+    0xb0d2465e00000000, 0x00fb266300000000, 0xd16c76e100000000,
+    0x614516dc00000000, 0xb13fb69b00000000, 0x0116d6a600000000,
+    0x11caf61400000000, 0xa1e3962900000000, 0x7199366e00000000,
+    0xc1b0565300000000, 0x969f277000000000, 0x26b6474d00000000,
+    0xf6cce70a00000000, 0x46e5873700000000, 0x5639a78500000000,
+    0xe610c7b800000000, 0x366a67ff00000000, 0x864307c200000000,
+    0x57d4574000000000, 0xe7fd377d00000000, 0x3787973a00000000,
+    0x87aef70700000000, 0x9772d7b500000000, 0x275bb78800000000,
+    0xf72117cf00000000, 0x470877f200000000, 0x1408c71000000000,
+    0xa421a72d00000000, 0x745b076a00000000, 0xc472675700000000,
+    0xd4ae47e500000000, 0x648727d800000000, 0xb4fd879f00000000,
+    0x04d4e7a200000000, 0xd543b72000000000, 0x656ad71d00000000,
+    0xb510775a00000000, 0x0539176700000000, 0x15e537d500000000,
+    0xa5cc57e800000000, 0x75b6f7af00000000, 0xc59f979200000000,
+    0xdbe815e900000000, 0x6bc175d400000000, 0xbbbbd59300000000,
+    0x0b92b5ae00000000, 0x1b4e951c00000000, 0xab67f52100000000,
+    0x7b1d556600000000, 0xcb34355b00000000, 0x1aa365d900000000,
+    0xaa8a05e400000000, 0x7af0a5a300000000, 0xcad9c59e00000000,
+    0xda05e52c00000000, 0x6a2c851100000000, 0xba56255600000000,
+    0x0a7f456b00000000, 0x597ff58900000000, 0xe95695b400000000,
+    0x392c35f300000000, 0x890555ce00000000, 0x99d9757c00000000,
+    0x29f0154100000000, 0xf98ab50600000000, 0x49a3d53b00000000,
+    0x983485b900000000, 0x281de58400000000, 0xf86745c300000000,
+    0x484e25fe00000000, 0x5892054c00000000, 0xe8bb657100000000,
+    0x38c1c53600000000, 0x88e8a50b00000000, 0xdfc7d42800000000,
+    0x6feeb41500000000, 0xbf94145200000000, 0x0fbd746f00000000,
+    0x1f6154dd00000000, 0xaf4834e000000000, 0x7f3294a700000000,
+    0xcf1bf49a00000000, 0x1e8ca41800000000, 0xaea5c42500000000,
+    0x7edf646200000000, 0xcef6045f00000000, 0xde2a24ed00000000,
+    0x6e0344d000000000, 0xbe79e49700000000, 0x0e5084aa00000000,
+    0x5d50344800000000, 0xed79547500000000, 0x3d03f43200000000,
+    0x8d2a940f00000000, 0x9df6b4bd00000000, 0x2ddfd48000000000,
+    0xfda574c700000000, 0x4d8c14fa00000000, 0x9c1b447800000000,
+    0x2c32244500000000, 0xfc48840200000000, 0x4c61e43f00000000,
+    0x5cbdc48d00000000, 0xec94a4b000000000, 0x3cee04f700000000,
+    0x8cc764ca00000000},
+   {0x0000000000000000, 0xa5d35ccb00000000, 0x0ba1c84d00000000,
+    0xae72948600000000, 0x1642919b00000000, 0xb391cd5000000000,
+    0x1de359d600000000, 0xb830051d00000000, 0x6d8253ec00000000,
+    0xc8510f2700000000, 0x66239ba100000000, 0xc3f0c76a00000000,
+    0x7bc0c27700000000, 0xde139ebc00000000, 0x70610a3a00000000,
+    0xd5b256f100000000, 0x9b02d60300000000, 0x3ed18ac800000000,
+    0x90a31e4e00000000, 0x3570428500000000, 0x8d40479800000000,
+    0x28931b5300000000, 0x86e18fd500000000, 0x2332d31e00000000,
+    0xf68085ef00000000, 0x5353d92400000000, 0xfd214da200000000,
+    0x58f2116900000000, 0xe0c2147400000000, 0x451148bf00000000,
+    0xeb63dc3900000000, 0x4eb080f200000000, 0x3605ac0700000000,
+    0x93d6f0cc00000000, 0x3da4644a00000000, 0x9877388100000000,
+    0x20473d9c00000000, 0x8594615700000000, 0x2be6f5d100000000,
+    0x8e35a91a00000000, 0x5b87ffeb00000000, 0xfe54a32000000000,
+    0x502637a600000000, 0xf5f56b6d00000000, 0x4dc56e7000000000,
+    0xe81632bb00000000, 0x4664a63d00000000, 0xe3b7faf600000000,
+    0xad077a0400000000, 0x08d426cf00000000, 0xa6a6b24900000000,
+    0x0375ee8200000000, 0xbb45eb9f00000000, 0x1e96b75400000000,
+    0xb0e423d200000000, 0x15377f1900000000, 0xc08529e800000000,
+    0x6556752300000000, 0xcb24e1a500000000, 0x6ef7bd6e00000000,
+    0xd6c7b87300000000, 0x7314e4b800000000, 0xdd66703e00000000,
+    0x78b52cf500000000, 0x6c0a580f00000000, 0xc9d904c400000000,
+    0x67ab904200000000, 0xc278cc8900000000, 0x7a48c99400000000,
+    0xdf9b955f00000000, 0x71e901d900000000, 0xd43a5d1200000000,
+    0x01880be300000000, 0xa45b572800000000, 0x0a29c3ae00000000,
+    0xaffa9f6500000000, 0x17ca9a7800000000, 0xb219c6b300000000,
+    0x1c6b523500000000, 0xb9b80efe00000000, 0xf7088e0c00000000,
+    0x52dbd2c700000000, 0xfca9464100000000, 0x597a1a8a00000000,
+    0xe14a1f9700000000, 0x4499435c00000000, 0xeaebd7da00000000,
+    0x4f388b1100000000, 0x9a8adde000000000, 0x3f59812b00000000,
+    0x912b15ad00000000, 0x34f8496600000000, 0x8cc84c7b00000000,
+    0x291b10b000000000, 0x8769843600000000, 0x22bad8fd00000000,
+    0x5a0ff40800000000, 0xffdca8c300000000, 0x51ae3c4500000000,
+    0xf47d608e00000000, 0x4c4d659300000000, 0xe99e395800000000,
+    0x47ecadde00000000, 0xe23ff11500000000, 0x378da7e400000000,
+    0x925efb2f00000000, 0x3c2c6fa900000000, 0x99ff336200000000,
+    0x21cf367f00000000, 0x841c6ab400000000, 0x2a6efe3200000000,
+    0x8fbda2f900000000, 0xc10d220b00000000, 0x64de7ec000000000,
+    0xcaacea4600000000, 0x6f7fb68d00000000, 0xd74fb39000000000,
+    0x729cef5b00000000, 0xdcee7bdd00000000, 0x793d271600000000,
+    0xac8f71e700000000, 0x095c2d2c00000000, 0xa72eb9aa00000000,
+    0x02fde56100000000, 0xbacde07c00000000, 0x1f1ebcb700000000,
+    0xb16c283100000000, 0x14bf74fa00000000, 0xd814b01e00000000,
+    0x7dc7ecd500000000, 0xd3b5785300000000, 0x7666249800000000,
+    0xce56218500000000, 0x6b857d4e00000000, 0xc5f7e9c800000000,
+    0x6024b50300000000, 0xb596e3f200000000, 0x1045bf3900000000,
+    0xbe372bbf00000000, 0x1be4777400000000, 0xa3d4726900000000,
+    0x06072ea200000000, 0xa875ba2400000000, 0x0da6e6ef00000000,
+    0x4316661d00000000, 0xe6c53ad600000000, 0x48b7ae5000000000,
+    0xed64f29b00000000, 0x5554f78600000000, 0xf087ab4d00000000,
+    0x5ef53fcb00000000, 0xfb26630000000000, 0x2e9435f100000000,
+    0x8b47693a00000000, 0x2535fdbc00000000, 0x80e6a17700000000,
+    0x38d6a46a00000000, 0x9d05f8a100000000, 0x33776c2700000000,
+    0x96a430ec00000000, 0xee111c1900000000, 0x4bc240d200000000,
+    0xe5b0d45400000000, 0x4063889f00000000, 0xf8538d8200000000,
+    0x5d80d14900000000, 0xf3f245cf00000000, 0x5621190400000000,
+    0x83934ff500000000, 0x2640133e00000000, 0x883287b800000000,
+    0x2de1db7300000000, 0x95d1de6e00000000, 0x300282a500000000,
+    0x9e70162300000000, 0x3ba34ae800000000, 0x7513ca1a00000000,
+    0xd0c096d100000000, 0x7eb2025700000000, 0xdb615e9c00000000,
+    0x63515b8100000000, 0xc682074a00000000, 0x68f093cc00000000,
+    0xcd23cf0700000000, 0x189199f600000000, 0xbd42c53d00000000,
+    0x133051bb00000000, 0xb6e30d7000000000, 0x0ed3086d00000000,
+    0xab0054a600000000, 0x0572c02000000000, 0xa0a19ceb00000000,
+    0xb41ee81100000000, 0x11cdb4da00000000, 0xbfbf205c00000000,
+    0x1a6c7c9700000000, 0xa25c798a00000000, 0x078f254100000000,
+    0xa9fdb1c700000000, 0x0c2eed0c00000000, 0xd99cbbfd00000000,
+    0x7c4fe73600000000, 0xd23d73b000000000, 0x77ee2f7b00000000,
+    0xcfde2a6600000000, 0x6a0d76ad00000000, 0xc47fe22b00000000,
+    0x61acbee000000000, 0x2f1c3e1200000000, 0x8acf62d900000000,
+    0x24bdf65f00000000, 0x816eaa9400000000, 0x395eaf8900000000,
+    0x9c8df34200000000, 0x32ff67c400000000, 0x972c3b0f00000000,
+    0x429e6dfe00000000, 0xe74d313500000000, 0x493fa5b300000000,
+    0xececf97800000000, 0x54dcfc6500000000, 0xf10fa0ae00000000,
+    0x5f7d342800000000, 0xfaae68e300000000, 0x821b441600000000,
+    0x27c818dd00000000, 0x89ba8c5b00000000, 0x2c69d09000000000,
+    0x9459d58d00000000, 0x318a894600000000, 0x9ff81dc000000000,
+    0x3a2b410b00000000, 0xef9917fa00000000, 0x4a4a4b3100000000,
+    0xe438dfb700000000, 0x41eb837c00000000, 0xf9db866100000000,
+    0x5c08daaa00000000, 0xf27a4e2c00000000, 0x57a912e700000000,
+    0x1919921500000000, 0xbccacede00000000, 0x12b85a5800000000,
+    0xb76b069300000000, 0x0f5b038e00000000, 0xaa885f4500000000,
+    0x04facbc300000000, 0xa129970800000000, 0x749bc1f900000000,
+    0xd1489d3200000000, 0x7f3a09b400000000, 0xdae9557f00000000,
+    0x62d9506200000000, 0xc70a0ca900000000, 0x6978982f00000000,
+    0xccabc4e400000000},
+   {0x0000000000000000, 0xb40b77a600000000, 0x29119f9700000000,
+    0x9d1ae83100000000, 0x13244ff400000000, 0xa72f385200000000,
+    0x3a35d06300000000, 0x8e3ea7c500000000, 0x674eef3300000000,
+    0xd345989500000000, 0x4e5f70a400000000, 0xfa54070200000000,
+    0x746aa0c700000000, 0xc061d76100000000, 0x5d7b3f5000000000,
+    0xe97048f600000000, 0xce9cde6700000000, 0x7a97a9c100000000,
+    0xe78d41f000000000, 0x5386365600000000, 0xddb8919300000000,
+    0x69b3e63500000000, 0xf4a90e0400000000, 0x40a279a200000000,
+    0xa9d2315400000000, 0x1dd946f200000000, 0x80c3aec300000000,
+    0x34c8d96500000000, 0xbaf67ea000000000, 0x0efd090600000000,
+    0x93e7e13700000000, 0x27ec969100000000, 0x9c39bdcf00000000,
+    0x2832ca6900000000, 0xb528225800000000, 0x012355fe00000000,
+    0x8f1df23b00000000, 0x3b16859d00000000, 0xa60c6dac00000000,
+    0x12071a0a00000000, 0xfb7752fc00000000, 0x4f7c255a00000000,
+    0xd266cd6b00000000, 0x666dbacd00000000, 0xe8531d0800000000,
+    0x5c586aae00000000, 0xc142829f00000000, 0x7549f53900000000,
+    0x52a563a800000000, 0xe6ae140e00000000, 0x7bb4fc3f00000000,
+    0xcfbf8b9900000000, 0x41812c5c00000000, 0xf58a5bfa00000000,
+    0x6890b3cb00000000, 0xdc9bc46d00000000, 0x35eb8c9b00000000,
+    0x81e0fb3d00000000, 0x1cfa130c00000000, 0xa8f164aa00000000,
+    0x26cfc36f00000000, 0x92c4b4c900000000, 0x0fde5cf800000000,
+    0xbbd52b5e00000000, 0x79750b4400000000, 0xcd7e7ce200000000,
+    0x506494d300000000, 0xe46fe37500000000, 0x6a5144b000000000,
+    0xde5a331600000000, 0x4340db2700000000, 0xf74bac8100000000,
+    0x1e3be47700000000, 0xaa3093d100000000, 0x372a7be000000000,
+    0x83210c4600000000, 0x0d1fab8300000000, 0xb914dc2500000000,
+    0x240e341400000000, 0x900543b200000000, 0xb7e9d52300000000,
+    0x03e2a28500000000, 0x9ef84ab400000000, 0x2af33d1200000000,
+    0xa4cd9ad700000000, 0x10c6ed7100000000, 0x8ddc054000000000,
+    0x39d772e600000000, 0xd0a73a1000000000, 0x64ac4db600000000,
+    0xf9b6a58700000000, 0x4dbdd22100000000, 0xc38375e400000000,
+    0x7788024200000000, 0xea92ea7300000000, 0x5e999dd500000000,
+    0xe54cb68b00000000, 0x5147c12d00000000, 0xcc5d291c00000000,
+    0x78565eba00000000, 0xf668f97f00000000, 0x42638ed900000000,
+    0xdf7966e800000000, 0x6b72114e00000000, 0x820259b800000000,
+    0x36092e1e00000000, 0xab13c62f00000000, 0x1f18b18900000000,
+    0x9126164c00000000, 0x252d61ea00000000, 0xb83789db00000000,
+    0x0c3cfe7d00000000, 0x2bd068ec00000000, 0x9fdb1f4a00000000,
+    0x02c1f77b00000000, 0xb6ca80dd00000000, 0x38f4271800000000,
+    0x8cff50be00000000, 0x11e5b88f00000000, 0xa5eecf2900000000,
+    0x4c9e87df00000000, 0xf895f07900000000, 0x658f184800000000,
+    0xd1846fee00000000, 0x5fbac82b00000000, 0xebb1bf8d00000000,
+    0x76ab57bc00000000, 0xc2a0201a00000000, 0xf2ea168800000000,
+    0x46e1612e00000000, 0xdbfb891f00000000, 0x6ff0feb900000000,
+    0xe1ce597c00000000, 0x55c52eda00000000, 0xc8dfc6eb00000000,
+    0x7cd4b14d00000000, 0x95a4f9bb00000000, 0x21af8e1d00000000,
+    0xbcb5662c00000000, 0x08be118a00000000, 0x8680b64f00000000,
+    0x328bc1e900000000, 0xaf9129d800000000, 0x1b9a5e7e00000000,
+    0x3c76c8ef00000000, 0x887dbf4900000000, 0x1567577800000000,
+    0xa16c20de00000000, 0x2f52871b00000000, 0x9b59f0bd00000000,
+    0x0643188c00000000, 0xb2486f2a00000000, 0x5b3827dc00000000,
+    0xef33507a00000000, 0x7229b84b00000000, 0xc622cfed00000000,
+    0x481c682800000000, 0xfc171f8e00000000, 0x610df7bf00000000,
+    0xd506801900000000, 0x6ed3ab4700000000, 0xdad8dce100000000,
+    0x47c234d000000000, 0xf3c9437600000000, 0x7df7e4b300000000,
+    0xc9fc931500000000, 0x54e67b2400000000, 0xe0ed0c8200000000,
+    0x099d447400000000, 0xbd9633d200000000, 0x208cdbe300000000,
+    0x9487ac4500000000, 0x1ab90b8000000000, 0xaeb27c2600000000,
+    0x33a8941700000000, 0x87a3e3b100000000, 0xa04f752000000000,
+    0x1444028600000000, 0x895eeab700000000, 0x3d559d1100000000,
+    0xb36b3ad400000000, 0x07604d7200000000, 0x9a7aa54300000000,
+    0x2e71d2e500000000, 0xc7019a1300000000, 0x730aedb500000000,
+    0xee10058400000000, 0x5a1b722200000000, 0xd425d5e700000000,
+    0x602ea24100000000, 0xfd344a7000000000, 0x493f3dd600000000,
+    0x8b9f1dcc00000000, 0x3f946a6a00000000, 0xa28e825b00000000,
+    0x1685f5fd00000000, 0x98bb523800000000, 0x2cb0259e00000000,
+    0xb1aacdaf00000000, 0x05a1ba0900000000, 0xecd1f2ff00000000,
+    0x58da855900000000, 0xc5c06d6800000000, 0x71cb1ace00000000,
+    0xfff5bd0b00000000, 0x4bfecaad00000000, 0xd6e4229c00000000,
+    0x62ef553a00000000, 0x4503c3ab00000000, 0xf108b40d00000000,
+    0x6c125c3c00000000, 0xd8192b9a00000000, 0x56278c5f00000000,
+    0xe22cfbf900000000, 0x7f3613c800000000, 0xcb3d646e00000000,
+    0x224d2c9800000000, 0x96465b3e00000000, 0x0b5cb30f00000000,
+    0xbf57c4a900000000, 0x3169636c00000000, 0x856214ca00000000,
+    0x1878fcfb00000000, 0xac738b5d00000000, 0x17a6a00300000000,
+    0xa3add7a500000000, 0x3eb73f9400000000, 0x8abc483200000000,
+    0x0482eff700000000, 0xb089985100000000, 0x2d93706000000000,
+    0x999807c600000000, 0x70e84f3000000000, 0xc4e3389600000000,
+    0x59f9d0a700000000, 0xedf2a70100000000, 0x63cc00c400000000,
+    0xd7c7776200000000, 0x4add9f5300000000, 0xfed6e8f500000000,
+    0xd93a7e6400000000, 0x6d3109c200000000, 0xf02be1f300000000,
+    0x4420965500000000, 0xca1e319000000000, 0x7e15463600000000,
+    0xe30fae0700000000, 0x5704d9a100000000, 0xbe74915700000000,
+    0x0a7fe6f100000000, 0x97650ec000000000, 0x236e796600000000,
+    0xad50dea300000000, 0x195ba90500000000, 0x8441413400000000,
+    0x304a369200000000},
+   {0x0000000000000000, 0x9e00aacc00000000, 0x7d07254200000000,
+    0xe3078f8e00000000, 0xfa0e4a8400000000, 0x640ee04800000000,
+    0x87096fc600000000, 0x1909c50a00000000, 0xb51be5d300000000,
+    0x2b1b4f1f00000000, 0xc81cc09100000000, 0x561c6a5d00000000,
+    0x4f15af5700000000, 0xd115059b00000000, 0x32128a1500000000,
+    0xac1220d900000000, 0x2b31bb7c00000000, 0xb53111b000000000,
+    0x56369e3e00000000, 0xc83634f200000000, 0xd13ff1f800000000,
+    0x4f3f5b3400000000, 0xac38d4ba00000000, 0x32387e7600000000,
+    0x9e2a5eaf00000000, 0x002af46300000000, 0xe32d7bed00000000,
+    0x7d2dd12100000000, 0x6424142b00000000, 0xfa24bee700000000,
+    0x1923316900000000, 0x87239ba500000000, 0x566276f900000000,
+    0xc862dc3500000000, 0x2b6553bb00000000, 0xb565f97700000000,
+    0xac6c3c7d00000000, 0x326c96b100000000, 0xd16b193f00000000,
+    0x4f6bb3f300000000, 0xe379932a00000000, 0x7d7939e600000000,
+    0x9e7eb66800000000, 0x007e1ca400000000, 0x1977d9ae00000000,
+    0x8777736200000000, 0x6470fcec00000000, 0xfa70562000000000,
+    0x7d53cd8500000000, 0xe353674900000000, 0x0054e8c700000000,
+    0x9e54420b00000000, 0x875d870100000000, 0x195d2dcd00000000,
+    0xfa5aa24300000000, 0x645a088f00000000, 0xc848285600000000,
+    0x5648829a00000000, 0xb54f0d1400000000, 0x2b4fa7d800000000,
+    0x324662d200000000, 0xac46c81e00000000, 0x4f41479000000000,
+    0xd141ed5c00000000, 0xedc29d2900000000, 0x73c237e500000000,
+    0x90c5b86b00000000, 0x0ec512a700000000, 0x17ccd7ad00000000,
+    0x89cc7d6100000000, 0x6acbf2ef00000000, 0xf4cb582300000000,
+    0x58d978fa00000000, 0xc6d9d23600000000, 0x25de5db800000000,
+    0xbbdef77400000000, 0xa2d7327e00000000, 0x3cd798b200000000,
+    0xdfd0173c00000000, 0x41d0bdf000000000, 0xc6f3265500000000,
+    0x58f38c9900000000, 0xbbf4031700000000, 0x25f4a9db00000000,
+    0x3cfd6cd100000000, 0xa2fdc61d00000000, 0x41fa499300000000,
+    0xdffae35f00000000, 0x73e8c38600000000, 0xede8694a00000000,
+    0x0eefe6c400000000, 0x90ef4c0800000000, 0x89e6890200000000,
+    0x17e623ce00000000, 0xf4e1ac4000000000, 0x6ae1068c00000000,
+    0xbba0ebd000000000, 0x25a0411c00000000, 0xc6a7ce9200000000,
+    0x58a7645e00000000, 0x41aea15400000000, 0xdfae0b9800000000,
+    0x3ca9841600000000, 0xa2a92eda00000000, 0x0ebb0e0300000000,
+    0x90bba4cf00000000, 0x73bc2b4100000000, 0xedbc818d00000000,
+    0xf4b5448700000000, 0x6ab5ee4b00000000, 0x89b261c500000000,
+    0x17b2cb0900000000, 0x909150ac00000000, 0x0e91fa6000000000,
+    0xed9675ee00000000, 0x7396df2200000000, 0x6a9f1a2800000000,
+    0xf49fb0e400000000, 0x17983f6a00000000, 0x899895a600000000,
+    0x258ab57f00000000, 0xbb8a1fb300000000, 0x588d903d00000000,
+    0xc68d3af100000000, 0xdf84fffb00000000, 0x4184553700000000,
+    0xa283dab900000000, 0x3c83707500000000, 0xda853b5300000000,
+    0x4485919f00000000, 0xa7821e1100000000, 0x3982b4dd00000000,
+    0x208b71d700000000, 0xbe8bdb1b00000000, 0x5d8c549500000000,
+    0xc38cfe5900000000, 0x6f9ede8000000000, 0xf19e744c00000000,
+    0x1299fbc200000000, 0x8c99510e00000000, 0x9590940400000000,
+    0x0b903ec800000000, 0xe897b14600000000, 0x76971b8a00000000,
+    0xf1b4802f00000000, 0x6fb42ae300000000, 0x8cb3a56d00000000,
+    0x12b30fa100000000, 0x0bbacaab00000000, 0x95ba606700000000,
+    0x76bdefe900000000, 0xe8bd452500000000, 0x44af65fc00000000,
+    0xdaafcf3000000000, 0x39a840be00000000, 0xa7a8ea7200000000,
+    0xbea12f7800000000, 0x20a185b400000000, 0xc3a60a3a00000000,
+    0x5da6a0f600000000, 0x8ce74daa00000000, 0x12e7e76600000000,
+    0xf1e068e800000000, 0x6fe0c22400000000, 0x76e9072e00000000,
+    0xe8e9ade200000000, 0x0bee226c00000000, 0x95ee88a000000000,
+    0x39fca87900000000, 0xa7fc02b500000000, 0x44fb8d3b00000000,
+    0xdafb27f700000000, 0xc3f2e2fd00000000, 0x5df2483100000000,
+    0xbef5c7bf00000000, 0x20f56d7300000000, 0xa7d6f6d600000000,
+    0x39d65c1a00000000, 0xdad1d39400000000, 0x44d1795800000000,
+    0x5dd8bc5200000000, 0xc3d8169e00000000, 0x20df991000000000,
+    0xbedf33dc00000000, 0x12cd130500000000, 0x8ccdb9c900000000,
+    0x6fca364700000000, 0xf1ca9c8b00000000, 0xe8c3598100000000,
+    0x76c3f34d00000000, 0x95c47cc300000000, 0x0bc4d60f00000000,
+    0x3747a67a00000000, 0xa9470cb600000000, 0x4a40833800000000,
+    0xd44029f400000000, 0xcd49ecfe00000000, 0x5349463200000000,
+    0xb04ec9bc00000000, 0x2e4e637000000000, 0x825c43a900000000,
+    0x1c5ce96500000000, 0xff5b66eb00000000, 0x615bcc2700000000,
+    0x7852092d00000000, 0xe652a3e100000000, 0x05552c6f00000000,
+    0x9b5586a300000000, 0x1c761d0600000000, 0x8276b7ca00000000,
+    0x6171384400000000, 0xff71928800000000, 0xe678578200000000,
+    0x7878fd4e00000000, 0x9b7f72c000000000, 0x057fd80c00000000,
+    0xa96df8d500000000, 0x376d521900000000, 0xd46add9700000000,
+    0x4a6a775b00000000, 0x5363b25100000000, 0xcd63189d00000000,
+    0x2e64971300000000, 0xb0643ddf00000000, 0x6125d08300000000,
+    0xff257a4f00000000, 0x1c22f5c100000000, 0x82225f0d00000000,
+    0x9b2b9a0700000000, 0x052b30cb00000000, 0xe62cbf4500000000,
+    0x782c158900000000, 0xd43e355000000000, 0x4a3e9f9c00000000,
+    0xa939101200000000, 0x3739bade00000000, 0x2e307fd400000000,
+    0xb030d51800000000, 0x53375a9600000000, 0xcd37f05a00000000,
+    0x4a146bff00000000, 0xd414c13300000000, 0x37134ebd00000000,
+    0xa913e47100000000, 0xb01a217b00000000, 0x2e1a8bb700000000,
+    0xcd1d043900000000, 0x531daef500000000, 0xff0f8e2c00000000,
+    0x610f24e000000000, 0x8208ab6e00000000, 0x1c0801a200000000,
+    0x0501c4a800000000, 0x9b016e6400000000, 0x7806e1ea00000000,
+    0xe6064b2600000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d},
+   {0x00000000, 0x41311b19, 0x82623632, 0xc3532d2b, 0x04c56c64,
+    0x45f4777d, 0x86a75a56, 0xc796414f, 0x088ad9c8, 0x49bbc2d1,
+    0x8ae8effa, 0xcbd9f4e3, 0x0c4fb5ac, 0x4d7eaeb5, 0x8e2d839e,
+    0xcf1c9887, 0x5112c24a, 0x1023d953, 0xd370f478, 0x9241ef61,
+    0x55d7ae2e, 0x14e6b537, 0xd7b5981c, 0x96848305, 0x59981b82,
+    0x18a9009b, 0xdbfa2db0, 0x9acb36a9, 0x5d5d77e6, 0x1c6c6cff,
+    0xdf3f41d4, 0x9e0e5acd, 0xa2248495, 0xe3159f8c, 0x2046b2a7,
+    0x6177a9be, 0xa6e1e8f1, 0xe7d0f3e8, 0x2483dec3, 0x65b2c5da,
+    0xaaae5d5d, 0xeb9f4644, 0x28cc6b6f, 0x69fd7076, 0xae6b3139,
+    0xef5a2a20, 0x2c09070b, 0x6d381c12, 0xf33646df, 0xb2075dc6,
+    0x715470ed, 0x30656bf4, 0xf7f32abb, 0xb6c231a2, 0x75911c89,
+    0x34a00790, 0xfbbc9f17, 0xba8d840e, 0x79dea925, 0x38efb23c,
+    0xff79f373, 0xbe48e86a, 0x7d1bc541, 0x3c2ade58, 0x054f79f0,
+    0x447e62e9, 0x872d4fc2, 0xc61c54db, 0x018a1594, 0x40bb0e8d,
+    0x83e823a6, 0xc2d938bf, 0x0dc5a038, 0x4cf4bb21, 0x8fa7960a,
+    0xce968d13, 0x0900cc5c, 0x4831d745, 0x8b62fa6e, 0xca53e177,
+    0x545dbbba, 0x156ca0a3, 0xd63f8d88, 0x970e9691, 0x5098d7de,
+    0x11a9ccc7, 0xd2fae1ec, 0x93cbfaf5, 0x5cd76272, 0x1de6796b,
+    0xdeb55440, 0x9f844f59, 0x58120e16, 0x1923150f, 0xda703824,
+    0x9b41233d, 0xa76bfd65, 0xe65ae67c, 0x2509cb57, 0x6438d04e,
+    0xa3ae9101, 0xe29f8a18, 0x21cca733, 0x60fdbc2a, 0xafe124ad,
+    0xeed03fb4, 0x2d83129f, 0x6cb20986, 0xab2448c9, 0xea1553d0,
+    0x29467efb, 0x687765e2, 0xf6793f2f, 0xb7482436, 0x741b091d,
+    0x352a1204, 0xf2bc534b, 0xb38d4852, 0x70de6579, 0x31ef7e60,
+    0xfef3e6e7, 0xbfc2fdfe, 0x7c91d0d5, 0x3da0cbcc, 0xfa368a83,
+    0xbb07919a, 0x7854bcb1, 0x3965a7a8, 0x4b98833b, 0x0aa99822,
+    0xc9fab509, 0x88cbae10, 0x4f5def5f, 0x0e6cf446, 0xcd3fd96d,
+    0x8c0ec274, 0x43125af3, 0x022341ea, 0xc1706cc1, 0x804177d8,
+    0x47d73697, 0x06e62d8e, 0xc5b500a5, 0x84841bbc, 0x1a8a4171,
+    0x5bbb5a68, 0x98e87743, 0xd9d96c5a, 0x1e4f2d15, 0x5f7e360c,
+    0x9c2d1b27, 0xdd1c003e, 0x120098b9, 0x533183a0, 0x9062ae8b,
+    0xd153b592, 0x16c5f4dd, 0x57f4efc4, 0x94a7c2ef, 0xd596d9f6,
+    0xe9bc07ae, 0xa88d1cb7, 0x6bde319c, 0x2aef2a85, 0xed796bca,
+    0xac4870d3, 0x6f1b5df8, 0x2e2a46e1, 0xe136de66, 0xa007c57f,
+    0x6354e854, 0x2265f34d, 0xe5f3b202, 0xa4c2a91b, 0x67918430,
+    0x26a09f29, 0xb8aec5e4, 0xf99fdefd, 0x3accf3d6, 0x7bfde8cf,
+    0xbc6ba980, 0xfd5ab299, 0x3e099fb2, 0x7f3884ab, 0xb0241c2c,
+    0xf1150735, 0x32462a1e, 0x73773107, 0xb4e17048, 0xf5d06b51,
+    0x3683467a, 0x77b25d63, 0x4ed7facb, 0x0fe6e1d2, 0xccb5ccf9,
+    0x8d84d7e0, 0x4a1296af, 0x0b238db6, 0xc870a09d, 0x8941bb84,
+    0x465d2303, 0x076c381a, 0xc43f1531, 0x850e0e28, 0x42984f67,
+    0x03a9547e, 0xc0fa7955, 0x81cb624c, 0x1fc53881, 0x5ef42398,
+    0x9da70eb3, 0xdc9615aa, 0x1b0054e5, 0x5a314ffc, 0x996262d7,
+    0xd85379ce, 0x174fe149, 0x567efa50, 0x952dd77b, 0xd41ccc62,
+    0x138a8d2d, 0x52bb9634, 0x91e8bb1f, 0xd0d9a006, 0xecf37e5e,
+    0xadc26547, 0x6e91486c, 0x2fa05375, 0xe836123a, 0xa9070923,
+    0x6a542408, 0x2b653f11, 0xe479a796, 0xa548bc8f, 0x661b91a4,
+    0x272a8abd, 0xe0bccbf2, 0xa18dd0eb, 0x62defdc0, 0x23efe6d9,
+    0xbde1bc14, 0xfcd0a70d, 0x3f838a26, 0x7eb2913f, 0xb924d070,
+    0xf815cb69, 0x3b46e642, 0x7a77fd5b, 0xb56b65dc, 0xf45a7ec5,
+    0x370953ee, 0x763848f7, 0xb1ae09b8, 0xf09f12a1, 0x33cc3f8a,
+    0x72fd2493},
+   {0x00000000, 0x376ac201, 0x6ed48403, 0x59be4602, 0xdca80907,
+    0xebc2cb06, 0xb27c8d04, 0x85164f05, 0xb851130e, 0x8f3bd10f,
+    0xd685970d, 0xe1ef550c, 0x64f91a09, 0x5393d808, 0x0a2d9e0a,
+    0x3d475c0b, 0x70a3261c, 0x47c9e41d, 0x1e77a21f, 0x291d601e,
+    0xac0b2f1b, 0x9b61ed1a, 0xc2dfab18, 0xf5b56919, 0xc8f23512,
+    0xff98f713, 0xa626b111, 0x914c7310, 0x145a3c15, 0x2330fe14,
+    0x7a8eb816, 0x4de47a17, 0xe0464d38, 0xd72c8f39, 0x8e92c93b,
+    0xb9f80b3a, 0x3cee443f, 0x0b84863e, 0x523ac03c, 0x6550023d,
+    0x58175e36, 0x6f7d9c37, 0x36c3da35, 0x01a91834, 0x84bf5731,
+    0xb3d59530, 0xea6bd332, 0xdd011133, 0x90e56b24, 0xa78fa925,
+    0xfe31ef27, 0xc95b2d26, 0x4c4d6223, 0x7b27a022, 0x2299e620,
+    0x15f32421, 0x28b4782a, 0x1fdeba2b, 0x4660fc29, 0x710a3e28,
+    0xf41c712d, 0xc376b32c, 0x9ac8f52e, 0xada2372f, 0xc08d9a70,
+    0xf7e75871, 0xae591e73, 0x9933dc72, 0x1c259377, 0x2b4f5176,
+    0x72f11774, 0x459bd575, 0x78dc897e, 0x4fb64b7f, 0x16080d7d,
+    0x2162cf7c, 0xa4748079, 0x931e4278, 0xcaa0047a, 0xfdcac67b,
+    0xb02ebc6c, 0x87447e6d, 0xdefa386f, 0xe990fa6e, 0x6c86b56b,
+    0x5bec776a, 0x02523168, 0x3538f369, 0x087faf62, 0x3f156d63,
+    0x66ab2b61, 0x51c1e960, 0xd4d7a665, 0xe3bd6464, 0xba032266,
+    0x8d69e067, 0x20cbd748, 0x17a11549, 0x4e1f534b, 0x7975914a,
+    0xfc63de4f, 0xcb091c4e, 0x92b75a4c, 0xa5dd984d, 0x989ac446,
+    0xaff00647, 0xf64e4045, 0xc1248244, 0x4432cd41, 0x73580f40,
+    0x2ae64942, 0x1d8c8b43, 0x5068f154, 0x67023355, 0x3ebc7557,
+    0x09d6b756, 0x8cc0f853, 0xbbaa3a52, 0xe2147c50, 0xd57ebe51,
+    0xe839e25a, 0xdf53205b, 0x86ed6659, 0xb187a458, 0x3491eb5d,
+    0x03fb295c, 0x5a456f5e, 0x6d2fad5f, 0x801b35e1, 0xb771f7e0,
+    0xeecfb1e2, 0xd9a573e3, 0x5cb33ce6, 0x6bd9fee7, 0x3267b8e5,
+    0x050d7ae4, 0x384a26ef, 0x0f20e4ee, 0x569ea2ec, 0x61f460ed,
+    0xe4e22fe8, 0xd388ede9, 0x8a36abeb, 0xbd5c69ea, 0xf0b813fd,
+    0xc7d2d1fc, 0x9e6c97fe, 0xa90655ff, 0x2c101afa, 0x1b7ad8fb,
+    0x42c49ef9, 0x75ae5cf8, 0x48e900f3, 0x7f83c2f2, 0x263d84f0,
+    0x115746f1, 0x944109f4, 0xa32bcbf5, 0xfa958df7, 0xcdff4ff6,
+    0x605d78d9, 0x5737bad8, 0x0e89fcda, 0x39e33edb, 0xbcf571de,
+    0x8b9fb3df, 0xd221f5dd, 0xe54b37dc, 0xd80c6bd7, 0xef66a9d6,
+    0xb6d8efd4, 0x81b22dd5, 0x04a462d0, 0x33cea0d1, 0x6a70e6d3,
+    0x5d1a24d2, 0x10fe5ec5, 0x27949cc4, 0x7e2adac6, 0x494018c7,
+    0xcc5657c2, 0xfb3c95c3, 0xa282d3c1, 0x95e811c0, 0xa8af4dcb,
+    0x9fc58fca, 0xc67bc9c8, 0xf1110bc9, 0x740744cc, 0x436d86cd,
+    0x1ad3c0cf, 0x2db902ce, 0x4096af91, 0x77fc6d90, 0x2e422b92,
+    0x1928e993, 0x9c3ea696, 0xab546497, 0xf2ea2295, 0xc580e094,
+    0xf8c7bc9f, 0xcfad7e9e, 0x9613389c, 0xa179fa9d, 0x246fb598,
+    0x13057799, 0x4abb319b, 0x7dd1f39a, 0x3035898d, 0x075f4b8c,
+    0x5ee10d8e, 0x698bcf8f, 0xec9d808a, 0xdbf7428b, 0x82490489,
+    0xb523c688, 0x88649a83, 0xbf0e5882, 0xe6b01e80, 0xd1dadc81,
+    0x54cc9384, 0x63a65185, 0x3a181787, 0x0d72d586, 0xa0d0e2a9,
+    0x97ba20a8, 0xce0466aa, 0xf96ea4ab, 0x7c78ebae, 0x4b1229af,
+    0x12ac6fad, 0x25c6adac, 0x1881f1a7, 0x2feb33a6, 0x765575a4,
+    0x413fb7a5, 0xc429f8a0, 0xf3433aa1, 0xaafd7ca3, 0x9d97bea2,
+    0xd073c4b5, 0xe71906b4, 0xbea740b6, 0x89cd82b7, 0x0cdbcdb2,
+    0x3bb10fb3, 0x620f49b1, 0x55658bb0, 0x6822d7bb, 0x5f4815ba,
+    0x06f653b8, 0x319c91b9, 0xb48adebc, 0x83e01cbd, 0xda5e5abf,
+    0xed3498be},
+   {0x00000000, 0x6567bcb8, 0x8bc809aa, 0xeeafb512, 0x5797628f,
+    0x32f0de37, 0xdc5f6b25, 0xb938d79d, 0xef28b4c5, 0x8a4f087d,
+    0x64e0bd6f, 0x018701d7, 0xb8bfd64a, 0xddd86af2, 0x3377dfe0,
+    0x56106358, 0x9f571950, 0xfa30a5e8, 0x149f10fa, 0x71f8ac42,
+    0xc8c07bdf, 0xada7c767, 0x43087275, 0x266fcecd, 0x707fad95,
+    0x1518112d, 0xfbb7a43f, 0x9ed01887, 0x27e8cf1a, 0x428f73a2,
+    0xac20c6b0, 0xc9477a08, 0x3eaf32a0, 0x5bc88e18, 0xb5673b0a,
+    0xd00087b2, 0x6938502f, 0x0c5fec97, 0xe2f05985, 0x8797e53d,
+    0xd1878665, 0xb4e03add, 0x5a4f8fcf, 0x3f283377, 0x8610e4ea,
+    0xe3775852, 0x0dd8ed40, 0x68bf51f8, 0xa1f82bf0, 0xc49f9748,
+    0x2a30225a, 0x4f579ee2, 0xf66f497f, 0x9308f5c7, 0x7da740d5,
+    0x18c0fc6d, 0x4ed09f35, 0x2bb7238d, 0xc518969f, 0xa07f2a27,
+    0x1947fdba, 0x7c204102, 0x928ff410, 0xf7e848a8, 0x3d58149b,
+    0x583fa823, 0xb6901d31, 0xd3f7a189, 0x6acf7614, 0x0fa8caac,
+    0xe1077fbe, 0x8460c306, 0xd270a05e, 0xb7171ce6, 0x59b8a9f4,
+    0x3cdf154c, 0x85e7c2d1, 0xe0807e69, 0x0e2fcb7b, 0x6b4877c3,
+    0xa20f0dcb, 0xc768b173, 0x29c70461, 0x4ca0b8d9, 0xf5986f44,
+    0x90ffd3fc, 0x7e5066ee, 0x1b37da56, 0x4d27b90e, 0x284005b6,
+    0xc6efb0a4, 0xa3880c1c, 0x1ab0db81, 0x7fd76739, 0x9178d22b,
+    0xf41f6e93, 0x03f7263b, 0x66909a83, 0x883f2f91, 0xed589329,
+    0x546044b4, 0x3107f80c, 0xdfa84d1e, 0xbacff1a6, 0xecdf92fe,
+    0x89b82e46, 0x67179b54, 0x027027ec, 0xbb48f071, 0xde2f4cc9,
+    0x3080f9db, 0x55e74563, 0x9ca03f6b, 0xf9c783d3, 0x176836c1,
+    0x720f8a79, 0xcb375de4, 0xae50e15c, 0x40ff544e, 0x2598e8f6,
+    0x73888bae, 0x16ef3716, 0xf8408204, 0x9d273ebc, 0x241fe921,
+    0x41785599, 0xafd7e08b, 0xcab05c33, 0x3bb659ed, 0x5ed1e555,
+    0xb07e5047, 0xd519ecff, 0x6c213b62, 0x094687da, 0xe7e932c8,
+    0x828e8e70, 0xd49eed28, 0xb1f95190, 0x5f56e482, 0x3a31583a,
+    0x83098fa7, 0xe66e331f, 0x08c1860d, 0x6da63ab5, 0xa4e140bd,
+    0xc186fc05, 0x2f294917, 0x4a4ef5af, 0xf3762232, 0x96119e8a,
+    0x78be2b98, 0x1dd99720, 0x4bc9f478, 0x2eae48c0, 0xc001fdd2,
+    0xa566416a, 0x1c5e96f7, 0x79392a4f, 0x97969f5d, 0xf2f123e5,
+    0x05196b4d, 0x607ed7f5, 0x8ed162e7, 0xebb6de5f, 0x528e09c2,
+    0x37e9b57a, 0xd9460068, 0xbc21bcd0, 0xea31df88, 0x8f566330,
+    0x61f9d622, 0x049e6a9a, 0xbda6bd07, 0xd8c101bf, 0x366eb4ad,
+    0x53090815, 0x9a4e721d, 0xff29cea5, 0x11867bb7, 0x74e1c70f,
+    0xcdd91092, 0xa8beac2a, 0x46111938, 0x2376a580, 0x7566c6d8,
+    0x10017a60, 0xfeaecf72, 0x9bc973ca, 0x22f1a457, 0x479618ef,
+    0xa939adfd, 0xcc5e1145, 0x06ee4d76, 0x6389f1ce, 0x8d2644dc,
+    0xe841f864, 0x51792ff9, 0x341e9341, 0xdab12653, 0xbfd69aeb,
+    0xe9c6f9b3, 0x8ca1450b, 0x620ef019, 0x07694ca1, 0xbe519b3c,
+    0xdb362784, 0x35999296, 0x50fe2e2e, 0x99b95426, 0xfcdee89e,
+    0x12715d8c, 0x7716e134, 0xce2e36a9, 0xab498a11, 0x45e63f03,
+    0x208183bb, 0x7691e0e3, 0x13f65c5b, 0xfd59e949, 0x983e55f1,
+    0x2106826c, 0x44613ed4, 0xaace8bc6, 0xcfa9377e, 0x38417fd6,
+    0x5d26c36e, 0xb389767c, 0xd6eecac4, 0x6fd61d59, 0x0ab1a1e1,
+    0xe41e14f3, 0x8179a84b, 0xd769cb13, 0xb20e77ab, 0x5ca1c2b9,
+    0x39c67e01, 0x80fea99c, 0xe5991524, 0x0b36a036, 0x6e511c8e,
+    0xa7166686, 0xc271da3e, 0x2cde6f2c, 0x49b9d394, 0xf0810409,
+    0x95e6b8b1, 0x7b490da3, 0x1e2eb11b, 0x483ed243, 0x2d596efb,
+    0xc3f6dbe9, 0xa6916751, 0x1fa9b0cc, 0x7ace0c74, 0x9461b966,
+    0xf10605de}};
+
+#endif
+
+#endif
+
+#if N == 2
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6},
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43147b1700000000, 0x8628f62e00000000,
+    0xc53c8d3900000000, 0x0c51ec5d00000000, 0x4f45974a00000000,
+    0x8a791a7300000000, 0xc96d616400000000, 0x18a2d8bb00000000,
+    0x5bb6a3ac00000000, 0x9e8a2e9500000000, 0xdd9e558200000000,
+    0x14f334e600000000, 0x57e74ff100000000, 0x92dbc2c800000000,
+    0xd1cfb9df00000000, 0x7142c0ac00000000, 0x3256bbbb00000000,
+    0xf76a368200000000, 0xb47e4d9500000000, 0x7d132cf100000000,
+    0x3e0757e600000000, 0xfb3bdadf00000000, 0xb82fa1c800000000,
+    0x69e0181700000000, 0x2af4630000000000, 0xefc8ee3900000000,
+    0xacdc952e00000000, 0x65b1f44a00000000, 0x26a58f5d00000000,
+    0xe399026400000000, 0xa08d797300000000, 0xa382f18200000000,
+    0xe0968a9500000000, 0x25aa07ac00000000, 0x66be7cbb00000000,
+    0xafd31ddf00000000, 0xecc766c800000000, 0x29fbebf100000000,
+    0x6aef90e600000000, 0xbb20293900000000, 0xf834522e00000000,
+    0x3d08df1700000000, 0x7e1ca40000000000, 0xb771c56400000000,
+    0xf465be7300000000, 0x3159334a00000000, 0x724d485d00000000,
+    0xd2c0312e00000000, 0x91d44a3900000000, 0x54e8c70000000000,
+    0x17fcbc1700000000, 0xde91dd7300000000, 0x9d85a66400000000,
+    0x58b92b5d00000000, 0x1bad504a00000000, 0xca62e99500000000,
+    0x8976928200000000, 0x4c4a1fbb00000000, 0x0f5e64ac00000000,
+    0xc63305c800000000, 0x85277edf00000000, 0x401bf3e600000000,
+    0x030f88f100000000, 0x070392de00000000, 0x4417e9c900000000,
+    0x812b64f000000000, 0xc23f1fe700000000, 0x0b527e8300000000,
+    0x4846059400000000, 0x8d7a88ad00000000, 0xce6ef3ba00000000,
+    0x1fa14a6500000000, 0x5cb5317200000000, 0x9989bc4b00000000,
+    0xda9dc75c00000000, 0x13f0a63800000000, 0x50e4dd2f00000000,
+    0x95d8501600000000, 0xd6cc2b0100000000, 0x7641527200000000,
+    0x3555296500000000, 0xf069a45c00000000, 0xb37ddf4b00000000,
+    0x7a10be2f00000000, 0x3904c53800000000, 0xfc38480100000000,
+    0xbf2c331600000000, 0x6ee38ac900000000, 0x2df7f1de00000000,
+    0xe8cb7ce700000000, 0xabdf07f000000000, 0x62b2669400000000,
+    0x21a61d8300000000, 0xe49a90ba00000000, 0xa78eebad00000000,
+    0xa481635c00000000, 0xe795184b00000000, 0x22a9957200000000,
+    0x61bdee6500000000, 0xa8d08f0100000000, 0xebc4f41600000000,
+    0x2ef8792f00000000, 0x6dec023800000000, 0xbc23bbe700000000,
+    0xff37c0f000000000, 0x3a0b4dc900000000, 0x791f36de00000000,
+    0xb07257ba00000000, 0xf3662cad00000000, 0x365aa19400000000,
+    0x754eda8300000000, 0xd5c3a3f000000000, 0x96d7d8e700000000,
+    0x53eb55de00000000, 0x10ff2ec900000000, 0xd9924fad00000000,
+    0x9a8634ba00000000, 0x5fbab98300000000, 0x1caec29400000000,
+    0xcd617b4b00000000, 0x8e75005c00000000, 0x4b498d6500000000,
+    0x085df67200000000, 0xc130971600000000, 0x8224ec0100000000,
+    0x4718613800000000, 0x040c1a2f00000000, 0x4f00556600000000,
+    0x0c142e7100000000, 0xc928a34800000000, 0x8a3cd85f00000000,
+    0x4351b93b00000000, 0x0045c22c00000000, 0xc5794f1500000000,
+    0x866d340200000000, 0x57a28ddd00000000, 0x14b6f6ca00000000,
+    0xd18a7bf300000000, 0x929e00e400000000, 0x5bf3618000000000,
+    0x18e71a9700000000, 0xdddb97ae00000000, 0x9ecfecb900000000,
+    0x3e4295ca00000000, 0x7d56eedd00000000, 0xb86a63e400000000,
+    0xfb7e18f300000000, 0x3213799700000000, 0x7107028000000000,
+    0xb43b8fb900000000, 0xf72ff4ae00000000, 0x26e04d7100000000,
+    0x65f4366600000000, 0xa0c8bb5f00000000, 0xe3dcc04800000000,
+    0x2ab1a12c00000000, 0x69a5da3b00000000, 0xac99570200000000,
+    0xef8d2c1500000000, 0xec82a4e400000000, 0xaf96dff300000000,
+    0x6aaa52ca00000000, 0x29be29dd00000000, 0xe0d348b900000000,
+    0xa3c733ae00000000, 0x66fbbe9700000000, 0x25efc58000000000,
+    0xf4207c5f00000000, 0xb734074800000000, 0x72088a7100000000,
+    0x311cf16600000000, 0xf871900200000000, 0xbb65eb1500000000,
+    0x7e59662c00000000, 0x3d4d1d3b00000000, 0x9dc0644800000000,
+    0xded41f5f00000000, 0x1be8926600000000, 0x58fce97100000000,
+    0x9191881500000000, 0xd285f30200000000, 0x17b97e3b00000000,
+    0x54ad052c00000000, 0x8562bcf300000000, 0xc676c7e400000000,
+    0x034a4add00000000, 0x405e31ca00000000, 0x893350ae00000000,
+    0xca272bb900000000, 0x0f1ba68000000000, 0x4c0fdd9700000000,
+    0x4803c7b800000000, 0x0b17bcaf00000000, 0xce2b319600000000,
+    0x8d3f4a8100000000, 0x44522be500000000, 0x074650f200000000,
+    0xc27addcb00000000, 0x816ea6dc00000000, 0x50a11f0300000000,
+    0x13b5641400000000, 0xd689e92d00000000, 0x959d923a00000000,
+    0x5cf0f35e00000000, 0x1fe4884900000000, 0xdad8057000000000,
+    0x99cc7e6700000000, 0x3941071400000000, 0x7a557c0300000000,
+    0xbf69f13a00000000, 0xfc7d8a2d00000000, 0x3510eb4900000000,
+    0x7604905e00000000, 0xb3381d6700000000, 0xf02c667000000000,
+    0x21e3dfaf00000000, 0x62f7a4b800000000, 0xa7cb298100000000,
+    0xe4df529600000000, 0x2db233f200000000, 0x6ea648e500000000,
+    0xab9ac5dc00000000, 0xe88ebecb00000000, 0xeb81363a00000000,
+    0xa8954d2d00000000, 0x6da9c01400000000, 0x2ebdbb0300000000,
+    0xe7d0da6700000000, 0xa4c4a17000000000, 0x61f82c4900000000,
+    0x22ec575e00000000, 0xf323ee8100000000, 0xb037959600000000,
+    0x750b18af00000000, 0x361f63b800000000, 0xff7202dc00000000,
+    0xbc6679cb00000000, 0x795af4f200000000, 0x3a4e8fe500000000,
+    0x9ac3f69600000000, 0xd9d78d8100000000, 0x1ceb00b800000000,
+    0x5fff7baf00000000, 0x96921acb00000000, 0xd58661dc00000000,
+    0x10baece500000000, 0x53ae97f200000000, 0x82612e2d00000000,
+    0xc175553a00000000, 0x0449d80300000000, 0x475da31400000000,
+    0x8e30c27000000000, 0xcd24b96700000000, 0x0818345e00000000,
+    0x4b0c4f4900000000},
+   {0x0000000000000000, 0x3e6bc2ef00000000, 0x3dd0f50400000000,
+    0x03bb37eb00000000, 0x7aa0eb0900000000, 0x44cb29e600000000,
+    0x47701e0d00000000, 0x791bdce200000000, 0xf440d71300000000,
+    0xca2b15fc00000000, 0xc990221700000000, 0xf7fbe0f800000000,
+    0x8ee03c1a00000000, 0xb08bfef500000000, 0xb330c91e00000000,
+    0x8d5b0bf100000000, 0xe881ae2700000000, 0xd6ea6cc800000000,
+    0xd5515b2300000000, 0xeb3a99cc00000000, 0x9221452e00000000,
+    0xac4a87c100000000, 0xaff1b02a00000000, 0x919a72c500000000,
+    0x1cc1793400000000, 0x22aabbdb00000000, 0x21118c3000000000,
+    0x1f7a4edf00000000, 0x6661923d00000000, 0x580a50d200000000,
+    0x5bb1673900000000, 0x65daa5d600000000, 0xd0035d4f00000000,
+    0xee689fa000000000, 0xedd3a84b00000000, 0xd3b86aa400000000,
+    0xaaa3b64600000000, 0x94c874a900000000, 0x9773434200000000,
+    0xa91881ad00000000, 0x24438a5c00000000, 0x1a2848b300000000,
+    0x19937f5800000000, 0x27f8bdb700000000, 0x5ee3615500000000,
+    0x6088a3ba00000000, 0x6333945100000000, 0x5d5856be00000000,
+    0x3882f36800000000, 0x06e9318700000000, 0x0552066c00000000,
+    0x3b39c48300000000, 0x4222186100000000, 0x7c49da8e00000000,
+    0x7ff2ed6500000000, 0x41992f8a00000000, 0xccc2247b00000000,
+    0xf2a9e69400000000, 0xf112d17f00000000, 0xcf79139000000000,
+    0xb662cf7200000000, 0x88090d9d00000000, 0x8bb23a7600000000,
+    0xb5d9f89900000000, 0xa007ba9e00000000, 0x9e6c787100000000,
+    0x9dd74f9a00000000, 0xa3bc8d7500000000, 0xdaa7519700000000,
+    0xe4cc937800000000, 0xe777a49300000000, 0xd91c667c00000000,
+    0x54476d8d00000000, 0x6a2caf6200000000, 0x6997988900000000,
+    0x57fc5a6600000000, 0x2ee7868400000000, 0x108c446b00000000,
+    0x1337738000000000, 0x2d5cb16f00000000, 0x488614b900000000,
+    0x76edd65600000000, 0x7556e1bd00000000, 0x4b3d235200000000,
+    0x3226ffb000000000, 0x0c4d3d5f00000000, 0x0ff60ab400000000,
+    0x319dc85b00000000, 0xbcc6c3aa00000000, 0x82ad014500000000,
+    0x811636ae00000000, 0xbf7df44100000000, 0xc66628a300000000,
+    0xf80dea4c00000000, 0xfbb6dda700000000, 0xc5dd1f4800000000,
+    0x7004e7d100000000, 0x4e6f253e00000000, 0x4dd412d500000000,
+    0x73bfd03a00000000, 0x0aa40cd800000000, 0x34cfce3700000000,
+    0x3774f9dc00000000, 0x091f3b3300000000, 0x844430c200000000,
+    0xba2ff22d00000000, 0xb994c5c600000000, 0x87ff072900000000,
+    0xfee4dbcb00000000, 0xc08f192400000000, 0xc3342ecf00000000,
+    0xfd5fec2000000000, 0x988549f600000000, 0xa6ee8b1900000000,
+    0xa555bcf200000000, 0x9b3e7e1d00000000, 0xe225a2ff00000000,
+    0xdc4e601000000000, 0xdff557fb00000000, 0xe19e951400000000,
+    0x6cc59ee500000000, 0x52ae5c0a00000000, 0x51156be100000000,
+    0x6f7ea90e00000000, 0x166575ec00000000, 0x280eb70300000000,
+    0x2bb580e800000000, 0x15de420700000000, 0x010905e600000000,
+    0x3f62c70900000000, 0x3cd9f0e200000000, 0x02b2320d00000000,
+    0x7ba9eeef00000000, 0x45c22c0000000000, 0x46791beb00000000,
+    0x7812d90400000000, 0xf549d2f500000000, 0xcb22101a00000000,
+    0xc89927f100000000, 0xf6f2e51e00000000, 0x8fe939fc00000000,
+    0xb182fb1300000000, 0xb239ccf800000000, 0x8c520e1700000000,
+    0xe988abc100000000, 0xd7e3692e00000000, 0xd4585ec500000000,
+    0xea339c2a00000000, 0x932840c800000000, 0xad43822700000000,
+    0xaef8b5cc00000000, 0x9093772300000000, 0x1dc87cd200000000,
+    0x23a3be3d00000000, 0x201889d600000000, 0x1e734b3900000000,
+    0x676897db00000000, 0x5903553400000000, 0x5ab862df00000000,
+    0x64d3a03000000000, 0xd10a58a900000000, 0xef619a4600000000,
+    0xecdaadad00000000, 0xd2b16f4200000000, 0xabaab3a000000000,
+    0x95c1714f00000000, 0x967a46a400000000, 0xa811844b00000000,
+    0x254a8fba00000000, 0x1b214d5500000000, 0x189a7abe00000000,
+    0x26f1b85100000000, 0x5fea64b300000000, 0x6181a65c00000000,
+    0x623a91b700000000, 0x5c51535800000000, 0x398bf68e00000000,
+    0x07e0346100000000, 0x045b038a00000000, 0x3a30c16500000000,
+    0x432b1d8700000000, 0x7d40df6800000000, 0x7efbe88300000000,
+    0x40902a6c00000000, 0xcdcb219d00000000, 0xf3a0e37200000000,
+    0xf01bd49900000000, 0xce70167600000000, 0xb76bca9400000000,
+    0x8900087b00000000, 0x8abb3f9000000000, 0xb4d0fd7f00000000,
+    0xa10ebf7800000000, 0x9f657d9700000000, 0x9cde4a7c00000000,
+    0xa2b5889300000000, 0xdbae547100000000, 0xe5c5969e00000000,
+    0xe67ea17500000000, 0xd815639a00000000, 0x554e686b00000000,
+    0x6b25aa8400000000, 0x689e9d6f00000000, 0x56f55f8000000000,
+    0x2fee836200000000, 0x1185418d00000000, 0x123e766600000000,
+    0x2c55b48900000000, 0x498f115f00000000, 0x77e4d3b000000000,
+    0x745fe45b00000000, 0x4a3426b400000000, 0x332ffa5600000000,
+    0x0d4438b900000000, 0x0eff0f5200000000, 0x3094cdbd00000000,
+    0xbdcfc64c00000000, 0x83a404a300000000, 0x801f334800000000,
+    0xbe74f1a700000000, 0xc76f2d4500000000, 0xf904efaa00000000,
+    0xfabfd84100000000, 0xc4d41aae00000000, 0x710de23700000000,
+    0x4f6620d800000000, 0x4cdd173300000000, 0x72b6d5dc00000000,
+    0x0bad093e00000000, 0x35c6cbd100000000, 0x367dfc3a00000000,
+    0x08163ed500000000, 0x854d352400000000, 0xbb26f7cb00000000,
+    0xb89dc02000000000, 0x86f602cf00000000, 0xffedde2d00000000,
+    0xc1861cc200000000, 0xc23d2b2900000000, 0xfc56e9c600000000,
+    0x998c4c1000000000, 0xa7e78eff00000000, 0xa45cb91400000000,
+    0x9a377bfb00000000, 0xe32ca71900000000, 0xdd4765f600000000,
+    0xdefc521d00000000, 0xe09790f200000000, 0x6dcc9b0300000000,
+    0x53a759ec00000000, 0x501c6e0700000000, 0x6e77ace800000000,
+    0x176c700a00000000, 0x2907b2e500000000, 0x2abc850e00000000,
+    0x14d747e100000000},
+   {0x0000000000000000, 0xc0df8ec100000000, 0xc1b96c5800000000,
+    0x0166e29900000000, 0x8273d9b000000000, 0x42ac577100000000,
+    0x43cab5e800000000, 0x83153b2900000000, 0x45e1c3ba00000000,
+    0x853e4d7b00000000, 0x8458afe200000000, 0x4487212300000000,
+    0xc7921a0a00000000, 0x074d94cb00000000, 0x062b765200000000,
+    0xc6f4f89300000000, 0xcbc4f6ae00000000, 0x0b1b786f00000000,
+    0x0a7d9af600000000, 0xcaa2143700000000, 0x49b72f1e00000000,
+    0x8968a1df00000000, 0x880e434600000000, 0x48d1cd8700000000,
+    0x8e25351400000000, 0x4efabbd500000000, 0x4f9c594c00000000,
+    0x8f43d78d00000000, 0x0c56eca400000000, 0xcc89626500000000,
+    0xcdef80fc00000000, 0x0d300e3d00000000, 0xd78f9c8600000000,
+    0x1750124700000000, 0x1636f0de00000000, 0xd6e97e1f00000000,
+    0x55fc453600000000, 0x9523cbf700000000, 0x9445296e00000000,
+    0x549aa7af00000000, 0x926e5f3c00000000, 0x52b1d1fd00000000,
+    0x53d7336400000000, 0x9308bda500000000, 0x101d868c00000000,
+    0xd0c2084d00000000, 0xd1a4ead400000000, 0x117b641500000000,
+    0x1c4b6a2800000000, 0xdc94e4e900000000, 0xddf2067000000000,
+    0x1d2d88b100000000, 0x9e38b39800000000, 0x5ee73d5900000000,
+    0x5f81dfc000000000, 0x9f5e510100000000, 0x59aaa99200000000,
+    0x9975275300000000, 0x9813c5ca00000000, 0x58cc4b0b00000000,
+    0xdbd9702200000000, 0x1b06fee300000000, 0x1a601c7a00000000,
+    0xdabf92bb00000000, 0xef1948d600000000, 0x2fc6c61700000000,
+    0x2ea0248e00000000, 0xee7faa4f00000000, 0x6d6a916600000000,
+    0xadb51fa700000000, 0xacd3fd3e00000000, 0x6c0c73ff00000000,
+    0xaaf88b6c00000000, 0x6a2705ad00000000, 0x6b41e73400000000,
+    0xab9e69f500000000, 0x288b52dc00000000, 0xe854dc1d00000000,
+    0xe9323e8400000000, 0x29edb04500000000, 0x24ddbe7800000000,
+    0xe40230b900000000, 0xe564d22000000000, 0x25bb5ce100000000,
+    0xa6ae67c800000000, 0x6671e90900000000, 0x67170b9000000000,
+    0xa7c8855100000000, 0x613c7dc200000000, 0xa1e3f30300000000,
+    0xa085119a00000000, 0x605a9f5b00000000, 0xe34fa47200000000,
+    0x23902ab300000000, 0x22f6c82a00000000, 0xe22946eb00000000,
+    0x3896d45000000000, 0xf8495a9100000000, 0xf92fb80800000000,
+    0x39f036c900000000, 0xbae50de000000000, 0x7a3a832100000000,
+    0x7b5c61b800000000, 0xbb83ef7900000000, 0x7d7717ea00000000,
+    0xbda8992b00000000, 0xbcce7bb200000000, 0x7c11f57300000000,
+    0xff04ce5a00000000, 0x3fdb409b00000000, 0x3ebda20200000000,
+    0xfe622cc300000000, 0xf35222fe00000000, 0x338dac3f00000000,
+    0x32eb4ea600000000, 0xf234c06700000000, 0x7121fb4e00000000,
+    0xb1fe758f00000000, 0xb098971600000000, 0x704719d700000000,
+    0xb6b3e14400000000, 0x766c6f8500000000, 0x770a8d1c00000000,
+    0xb7d503dd00000000, 0x34c038f400000000, 0xf41fb63500000000,
+    0xf57954ac00000000, 0x35a6da6d00000000, 0x9f35e17700000000,
+    0x5fea6fb600000000, 0x5e8c8d2f00000000, 0x9e5303ee00000000,
+    0x1d4638c700000000, 0xdd99b60600000000, 0xdcff549f00000000,
+    0x1c20da5e00000000, 0xdad422cd00000000, 0x1a0bac0c00000000,
+    0x1b6d4e9500000000, 0xdbb2c05400000000, 0x58a7fb7d00000000,
+    0x987875bc00000000, 0x991e972500000000, 0x59c119e400000000,
+    0x54f117d900000000, 0x942e991800000000, 0x95487b8100000000,
+    0x5597f54000000000, 0xd682ce6900000000, 0x165d40a800000000,
+    0x173ba23100000000, 0xd7e42cf000000000, 0x1110d46300000000,
+    0xd1cf5aa200000000, 0xd0a9b83b00000000, 0x107636fa00000000,
+    0x93630dd300000000, 0x53bc831200000000, 0x52da618b00000000,
+    0x9205ef4a00000000, 0x48ba7df100000000, 0x8865f33000000000,
+    0x890311a900000000, 0x49dc9f6800000000, 0xcac9a44100000000,
+    0x0a162a8000000000, 0x0b70c81900000000, 0xcbaf46d800000000,
+    0x0d5bbe4b00000000, 0xcd84308a00000000, 0xcce2d21300000000,
+    0x0c3d5cd200000000, 0x8f2867fb00000000, 0x4ff7e93a00000000,
+    0x4e910ba300000000, 0x8e4e856200000000, 0x837e8b5f00000000,
+    0x43a1059e00000000, 0x42c7e70700000000, 0x821869c600000000,
+    0x010d52ef00000000, 0xc1d2dc2e00000000, 0xc0b43eb700000000,
+    0x006bb07600000000, 0xc69f48e500000000, 0x0640c62400000000,
+    0x072624bd00000000, 0xc7f9aa7c00000000, 0x44ec915500000000,
+    0x84331f9400000000, 0x8555fd0d00000000, 0x458a73cc00000000,
+    0x702ca9a100000000, 0xb0f3276000000000, 0xb195c5f900000000,
+    0x714a4b3800000000, 0xf25f701100000000, 0x3280fed000000000,
+    0x33e61c4900000000, 0xf339928800000000, 0x35cd6a1b00000000,
+    0xf512e4da00000000, 0xf474064300000000, 0x34ab888200000000,
+    0xb7beb3ab00000000, 0x77613d6a00000000, 0x7607dff300000000,
+    0xb6d8513200000000, 0xbbe85f0f00000000, 0x7b37d1ce00000000,
+    0x7a51335700000000, 0xba8ebd9600000000, 0x399b86bf00000000,
+    0xf944087e00000000, 0xf822eae700000000, 0x38fd642600000000,
+    0xfe099cb500000000, 0x3ed6127400000000, 0x3fb0f0ed00000000,
+    0xff6f7e2c00000000, 0x7c7a450500000000, 0xbca5cbc400000000,
+    0xbdc3295d00000000, 0x7d1ca79c00000000, 0xa7a3352700000000,
+    0x677cbbe600000000, 0x661a597f00000000, 0xa6c5d7be00000000,
+    0x25d0ec9700000000, 0xe50f625600000000, 0xe46980cf00000000,
+    0x24b60e0e00000000, 0xe242f69d00000000, 0x229d785c00000000,
+    0x23fb9ac500000000, 0xe324140400000000, 0x60312f2d00000000,
+    0xa0eea1ec00000000, 0xa188437500000000, 0x6157cdb400000000,
+    0x6c67c38900000000, 0xacb84d4800000000, 0xaddeafd100000000,
+    0x6d01211000000000, 0xee141a3900000000, 0x2ecb94f800000000,
+    0x2fad766100000000, 0xef72f8a000000000, 0x2986003300000000,
+    0xe9598ef200000000, 0xe83f6c6b00000000, 0x28e0e2aa00000000,
+    0xabf5d98300000000, 0x6b2a574200000000, 0x6a4cb5db00000000,
+    0xaa933b1a00000000},
+   {0x0000000000000000, 0x6f4ca59b00000000, 0x9f9e3bec00000000,
+    0xf0d29e7700000000, 0x7f3b060300000000, 0x1077a39800000000,
+    0xe0a53def00000000, 0x8fe9987400000000, 0xfe760c0600000000,
+    0x913aa99d00000000, 0x61e837ea00000000, 0x0ea4927100000000,
+    0x814d0a0500000000, 0xee01af9e00000000, 0x1ed331e900000000,
+    0x719f947200000000, 0xfced180c00000000, 0x93a1bd9700000000,
+    0x637323e000000000, 0x0c3f867b00000000, 0x83d61e0f00000000,
+    0xec9abb9400000000, 0x1c4825e300000000, 0x7304807800000000,
+    0x029b140a00000000, 0x6dd7b19100000000, 0x9d052fe600000000,
+    0xf2498a7d00000000, 0x7da0120900000000, 0x12ecb79200000000,
+    0xe23e29e500000000, 0x8d728c7e00000000, 0xf8db311800000000,
+    0x9797948300000000, 0x67450af400000000, 0x0809af6f00000000,
+    0x87e0371b00000000, 0xe8ac928000000000, 0x187e0cf700000000,
+    0x7732a96c00000000, 0x06ad3d1e00000000, 0x69e1988500000000,
+    0x993306f200000000, 0xf67fa36900000000, 0x79963b1d00000000,
+    0x16da9e8600000000, 0xe60800f100000000, 0x8944a56a00000000,
+    0x0436291400000000, 0x6b7a8c8f00000000, 0x9ba812f800000000,
+    0xf4e4b76300000000, 0x7b0d2f1700000000, 0x14418a8c00000000,
+    0xe49314fb00000000, 0x8bdfb16000000000, 0xfa40251200000000,
+    0x950c808900000000, 0x65de1efe00000000, 0x0a92bb6500000000,
+    0x857b231100000000, 0xea37868a00000000, 0x1ae518fd00000000,
+    0x75a9bd6600000000, 0xf0b7633000000000, 0x9ffbc6ab00000000,
+    0x6f2958dc00000000, 0x0065fd4700000000, 0x8f8c653300000000,
+    0xe0c0c0a800000000, 0x10125edf00000000, 0x7f5efb4400000000,
+    0x0ec16f3600000000, 0x618dcaad00000000, 0x915f54da00000000,
+    0xfe13f14100000000, 0x71fa693500000000, 0x1eb6ccae00000000,
+    0xee6452d900000000, 0x8128f74200000000, 0x0c5a7b3c00000000,
+    0x6316dea700000000, 0x93c440d000000000, 0xfc88e54b00000000,
+    0x73617d3f00000000, 0x1c2dd8a400000000, 0xecff46d300000000,
+    0x83b3e34800000000, 0xf22c773a00000000, 0x9d60d2a100000000,
+    0x6db24cd600000000, 0x02fee94d00000000, 0x8d17713900000000,
+    0xe25bd4a200000000, 0x12894ad500000000, 0x7dc5ef4e00000000,
+    0x086c522800000000, 0x6720f7b300000000, 0x97f269c400000000,
+    0xf8becc5f00000000, 0x7757542b00000000, 0x181bf1b000000000,
+    0xe8c96fc700000000, 0x8785ca5c00000000, 0xf61a5e2e00000000,
+    0x9956fbb500000000, 0x698465c200000000, 0x06c8c05900000000,
+    0x8921582d00000000, 0xe66dfdb600000000, 0x16bf63c100000000,
+    0x79f3c65a00000000, 0xf4814a2400000000, 0x9bcdefbf00000000,
+    0x6b1f71c800000000, 0x0453d45300000000, 0x8bba4c2700000000,
+    0xe4f6e9bc00000000, 0x142477cb00000000, 0x7b68d25000000000,
+    0x0af7462200000000, 0x65bbe3b900000000, 0x95697dce00000000,
+    0xfa25d85500000000, 0x75cc402100000000, 0x1a80e5ba00000000,
+    0xea527bcd00000000, 0x851ede5600000000, 0xe06fc76000000000,
+    0x8f2362fb00000000, 0x7ff1fc8c00000000, 0x10bd591700000000,
+    0x9f54c16300000000, 0xf01864f800000000, 0x00cafa8f00000000,
+    0x6f865f1400000000, 0x1e19cb6600000000, 0x71556efd00000000,
+    0x8187f08a00000000, 0xeecb551100000000, 0x6122cd6500000000,
+    0x0e6e68fe00000000, 0xfebcf68900000000, 0x91f0531200000000,
+    0x1c82df6c00000000, 0x73ce7af700000000, 0x831ce48000000000,
+    0xec50411b00000000, 0x63b9d96f00000000, 0x0cf57cf400000000,
+    0xfc27e28300000000, 0x936b471800000000, 0xe2f4d36a00000000,
+    0x8db876f100000000, 0x7d6ae88600000000, 0x12264d1d00000000,
+    0x9dcfd56900000000, 0xf28370f200000000, 0x0251ee8500000000,
+    0x6d1d4b1e00000000, 0x18b4f67800000000, 0x77f853e300000000,
+    0x872acd9400000000, 0xe866680f00000000, 0x678ff07b00000000,
+    0x08c355e000000000, 0xf811cb9700000000, 0x975d6e0c00000000,
+    0xe6c2fa7e00000000, 0x898e5fe500000000, 0x795cc19200000000,
+    0x1610640900000000, 0x99f9fc7d00000000, 0xf6b559e600000000,
+    0x0667c79100000000, 0x692b620a00000000, 0xe459ee7400000000,
+    0x8b154bef00000000, 0x7bc7d59800000000, 0x148b700300000000,
+    0x9b62e87700000000, 0xf42e4dec00000000, 0x04fcd39b00000000,
+    0x6bb0760000000000, 0x1a2fe27200000000, 0x756347e900000000,
+    0x85b1d99e00000000, 0xeafd7c0500000000, 0x6514e47100000000,
+    0x0a5841ea00000000, 0xfa8adf9d00000000, 0x95c67a0600000000,
+    0x10d8a45000000000, 0x7f9401cb00000000, 0x8f469fbc00000000,
+    0xe00a3a2700000000, 0x6fe3a25300000000, 0x00af07c800000000,
+    0xf07d99bf00000000, 0x9f313c2400000000, 0xeeaea85600000000,
+    0x81e20dcd00000000, 0x713093ba00000000, 0x1e7c362100000000,
+    0x9195ae5500000000, 0xfed90bce00000000, 0x0e0b95b900000000,
+    0x6147302200000000, 0xec35bc5c00000000, 0x837919c700000000,
+    0x73ab87b000000000, 0x1ce7222b00000000, 0x930eba5f00000000,
+    0xfc421fc400000000, 0x0c9081b300000000, 0x63dc242800000000,
+    0x1243b05a00000000, 0x7d0f15c100000000, 0x8ddd8bb600000000,
+    0xe2912e2d00000000, 0x6d78b65900000000, 0x023413c200000000,
+    0xf2e68db500000000, 0x9daa282e00000000, 0xe803954800000000,
+    0x874f30d300000000, 0x779daea400000000, 0x18d10b3f00000000,
+    0x9738934b00000000, 0xf87436d000000000, 0x08a6a8a700000000,
+    0x67ea0d3c00000000, 0x1675994e00000000, 0x79393cd500000000,
+    0x89eba2a200000000, 0xe6a7073900000000, 0x694e9f4d00000000,
+    0x06023ad600000000, 0xf6d0a4a100000000, 0x999c013a00000000,
+    0x14ee8d4400000000, 0x7ba228df00000000, 0x8b70b6a800000000,
+    0xe43c133300000000, 0x6bd58b4700000000, 0x04992edc00000000,
+    0xf44bb0ab00000000, 0x9b07153000000000, 0xea98814200000000,
+    0x85d424d900000000, 0x7506baae00000000, 0x1a4a1f3500000000,
+    0x95a3874100000000, 0xfaef22da00000000, 0x0a3dbcad00000000,
+    0x6571193600000000},
+   {0x0000000000000000, 0x85d996dd00000000, 0x4bb55c6000000000,
+    0xce6ccabd00000000, 0x966ab9c000000000, 0x13b32f1d00000000,
+    0xdddfe5a000000000, 0x5806737d00000000, 0x6dd3035a00000000,
+    0xe80a958700000000, 0x26665f3a00000000, 0xa3bfc9e700000000,
+    0xfbb9ba9a00000000, 0x7e602c4700000000, 0xb00ce6fa00000000,
+    0x35d5702700000000, 0xdaa607b400000000, 0x5f7f916900000000,
+    0x91135bd400000000, 0x14cacd0900000000, 0x4cccbe7400000000,
+    0xc91528a900000000, 0x0779e21400000000, 0x82a074c900000000,
+    0xb77504ee00000000, 0x32ac923300000000, 0xfcc0588e00000000,
+    0x7919ce5300000000, 0x211fbd2e00000000, 0xa4c62bf300000000,
+    0x6aaae14e00000000, 0xef73779300000000, 0xf54b7eb300000000,
+    0x7092e86e00000000, 0xbefe22d300000000, 0x3b27b40e00000000,
+    0x6321c77300000000, 0xe6f851ae00000000, 0x28949b1300000000,
+    0xad4d0dce00000000, 0x98987de900000000, 0x1d41eb3400000000,
+    0xd32d218900000000, 0x56f4b75400000000, 0x0ef2c42900000000,
+    0x8b2b52f400000000, 0x4547984900000000, 0xc09e0e9400000000,
+    0x2fed790700000000, 0xaa34efda00000000, 0x6458256700000000,
+    0xe181b3ba00000000, 0xb987c0c700000000, 0x3c5e561a00000000,
+    0xf2329ca700000000, 0x77eb0a7a00000000, 0x423e7a5d00000000,
+    0xc7e7ec8000000000, 0x098b263d00000000, 0x8c52b0e000000000,
+    0xd454c39d00000000, 0x518d554000000000, 0x9fe19ffd00000000,
+    0x1a38092000000000, 0xab918dbd00000000, 0x2e481b6000000000,
+    0xe024d1dd00000000, 0x65fd470000000000, 0x3dfb347d00000000,
+    0xb822a2a000000000, 0x764e681d00000000, 0xf397fec000000000,
+    0xc6428ee700000000, 0x439b183a00000000, 0x8df7d28700000000,
+    0x082e445a00000000, 0x5028372700000000, 0xd5f1a1fa00000000,
+    0x1b9d6b4700000000, 0x9e44fd9a00000000, 0x71378a0900000000,
+    0xf4ee1cd400000000, 0x3a82d66900000000, 0xbf5b40b400000000,
+    0xe75d33c900000000, 0x6284a51400000000, 0xace86fa900000000,
+    0x2931f97400000000, 0x1ce4895300000000, 0x993d1f8e00000000,
+    0x5751d53300000000, 0xd28843ee00000000, 0x8a8e309300000000,
+    0x0f57a64e00000000, 0xc13b6cf300000000, 0x44e2fa2e00000000,
+    0x5edaf30e00000000, 0xdb0365d300000000, 0x156faf6e00000000,
+    0x90b639b300000000, 0xc8b04ace00000000, 0x4d69dc1300000000,
+    0x830516ae00000000, 0x06dc807300000000, 0x3309f05400000000,
+    0xb6d0668900000000, 0x78bcac3400000000, 0xfd653ae900000000,
+    0xa563499400000000, 0x20badf4900000000, 0xeed615f400000000,
+    0x6b0f832900000000, 0x847cf4ba00000000, 0x01a5626700000000,
+    0xcfc9a8da00000000, 0x4a103e0700000000, 0x12164d7a00000000,
+    0x97cfdba700000000, 0x59a3111a00000000, 0xdc7a87c700000000,
+    0xe9aff7e000000000, 0x6c76613d00000000, 0xa21aab8000000000,
+    0x27c33d5d00000000, 0x7fc54e2000000000, 0xfa1cd8fd00000000,
+    0x3470124000000000, 0xb1a9849d00000000, 0x17256aa000000000,
+    0x92fcfc7d00000000, 0x5c9036c000000000, 0xd949a01d00000000,
+    0x814fd36000000000, 0x049645bd00000000, 0xcafa8f0000000000,
+    0x4f2319dd00000000, 0x7af669fa00000000, 0xff2fff2700000000,
+    0x3143359a00000000, 0xb49aa34700000000, 0xec9cd03a00000000,
+    0x694546e700000000, 0xa7298c5a00000000, 0x22f01a8700000000,
+    0xcd836d1400000000, 0x485afbc900000000, 0x8636317400000000,
+    0x03efa7a900000000, 0x5be9d4d400000000, 0xde30420900000000,
+    0x105c88b400000000, 0x95851e6900000000, 0xa0506e4e00000000,
+    0x2589f89300000000, 0xebe5322e00000000, 0x6e3ca4f300000000,
+    0x363ad78e00000000, 0xb3e3415300000000, 0x7d8f8bee00000000,
+    0xf8561d3300000000, 0xe26e141300000000, 0x67b782ce00000000,
+    0xa9db487300000000, 0x2c02deae00000000, 0x7404add300000000,
+    0xf1dd3b0e00000000, 0x3fb1f1b300000000, 0xba68676e00000000,
+    0x8fbd174900000000, 0x0a64819400000000, 0xc4084b2900000000,
+    0x41d1ddf400000000, 0x19d7ae8900000000, 0x9c0e385400000000,
+    0x5262f2e900000000, 0xd7bb643400000000, 0x38c813a700000000,
+    0xbd11857a00000000, 0x737d4fc700000000, 0xf6a4d91a00000000,
+    0xaea2aa6700000000, 0x2b7b3cba00000000, 0xe517f60700000000,
+    0x60ce60da00000000, 0x551b10fd00000000, 0xd0c2862000000000,
+    0x1eae4c9d00000000, 0x9b77da4000000000, 0xc371a93d00000000,
+    0x46a83fe000000000, 0x88c4f55d00000000, 0x0d1d638000000000,
+    0xbcb4e71d00000000, 0x396d71c000000000, 0xf701bb7d00000000,
+    0x72d82da000000000, 0x2ade5edd00000000, 0xaf07c80000000000,
+    0x616b02bd00000000, 0xe4b2946000000000, 0xd167e44700000000,
+    0x54be729a00000000, 0x9ad2b82700000000, 0x1f0b2efa00000000,
+    0x470d5d8700000000, 0xc2d4cb5a00000000, 0x0cb801e700000000,
+    0x8961973a00000000, 0x6612e0a900000000, 0xe3cb767400000000,
+    0x2da7bcc900000000, 0xa87e2a1400000000, 0xf078596900000000,
+    0x75a1cfb400000000, 0xbbcd050900000000, 0x3e1493d400000000,
+    0x0bc1e3f300000000, 0x8e18752e00000000, 0x4074bf9300000000,
+    0xc5ad294e00000000, 0x9dab5a3300000000, 0x1872ccee00000000,
+    0xd61e065300000000, 0x53c7908e00000000, 0x49ff99ae00000000,
+    0xcc260f7300000000, 0x024ac5ce00000000, 0x8793531300000000,
+    0xdf95206e00000000, 0x5a4cb6b300000000, 0x94207c0e00000000,
+    0x11f9ead300000000, 0x242c9af400000000, 0xa1f50c2900000000,
+    0x6f99c69400000000, 0xea40504900000000, 0xb246233400000000,
+    0x379fb5e900000000, 0xf9f37f5400000000, 0x7c2ae98900000000,
+    0x93599e1a00000000, 0x168008c700000000, 0xd8ecc27a00000000,
+    0x5d3554a700000000, 0x053327da00000000, 0x80eab10700000000,
+    0x4e867bba00000000, 0xcb5fed6700000000, 0xfe8a9d4000000000,
+    0x7b530b9d00000000, 0xb53fc12000000000, 0x30e657fd00000000,
+    0x68e0248000000000, 0xed39b25d00000000, 0x235578e000000000,
+    0xa68cee3d00000000},
+   {0x0000000000000000, 0x76e10f9d00000000, 0xadc46ee100000000,
+    0xdb25617c00000000, 0x1b8fac1900000000, 0x6d6ea38400000000,
+    0xb64bc2f800000000, 0xc0aacd6500000000, 0x361e593300000000,
+    0x40ff56ae00000000, 0x9bda37d200000000, 0xed3b384f00000000,
+    0x2d91f52a00000000, 0x5b70fab700000000, 0x80559bcb00000000,
+    0xf6b4945600000000, 0x6c3cb26600000000, 0x1addbdfb00000000,
+    0xc1f8dc8700000000, 0xb719d31a00000000, 0x77b31e7f00000000,
+    0x015211e200000000, 0xda77709e00000000, 0xac967f0300000000,
+    0x5a22eb5500000000, 0x2cc3e4c800000000, 0xf7e685b400000000,
+    0x81078a2900000000, 0x41ad474c00000000, 0x374c48d100000000,
+    0xec6929ad00000000, 0x9a88263000000000, 0xd87864cd00000000,
+    0xae996b5000000000, 0x75bc0a2c00000000, 0x035d05b100000000,
+    0xc3f7c8d400000000, 0xb516c74900000000, 0x6e33a63500000000,
+    0x18d2a9a800000000, 0xee663dfe00000000, 0x9887326300000000,
+    0x43a2531f00000000, 0x35435c8200000000, 0xf5e991e700000000,
+    0x83089e7a00000000, 0x582dff0600000000, 0x2eccf09b00000000,
+    0xb444d6ab00000000, 0xc2a5d93600000000, 0x1980b84a00000000,
+    0x6f61b7d700000000, 0xafcb7ab200000000, 0xd92a752f00000000,
+    0x020f145300000000, 0x74ee1bce00000000, 0x825a8f9800000000,
+    0xf4bb800500000000, 0x2f9ee17900000000, 0x597feee400000000,
+    0x99d5238100000000, 0xef342c1c00000000, 0x34114d6000000000,
+    0x42f042fd00000000, 0xf1f7b94100000000, 0x8716b6dc00000000,
+    0x5c33d7a000000000, 0x2ad2d83d00000000, 0xea78155800000000,
+    0x9c991ac500000000, 0x47bc7bb900000000, 0x315d742400000000,
+    0xc7e9e07200000000, 0xb108efef00000000, 0x6a2d8e9300000000,
+    0x1ccc810e00000000, 0xdc664c6b00000000, 0xaa8743f600000000,
+    0x71a2228a00000000, 0x07432d1700000000, 0x9dcb0b2700000000,
+    0xeb2a04ba00000000, 0x300f65c600000000, 0x46ee6a5b00000000,
+    0x8644a73e00000000, 0xf0a5a8a300000000, 0x2b80c9df00000000,
+    0x5d61c64200000000, 0xabd5521400000000, 0xdd345d8900000000,
+    0x06113cf500000000, 0x70f0336800000000, 0xb05afe0d00000000,
+    0xc6bbf19000000000, 0x1d9e90ec00000000, 0x6b7f9f7100000000,
+    0x298fdd8c00000000, 0x5f6ed21100000000, 0x844bb36d00000000,
+    0xf2aabcf000000000, 0x3200719500000000, 0x44e17e0800000000,
+    0x9fc41f7400000000, 0xe92510e900000000, 0x1f9184bf00000000,
+    0x69708b2200000000, 0xb255ea5e00000000, 0xc4b4e5c300000000,
+    0x041e28a600000000, 0x72ff273b00000000, 0xa9da464700000000,
+    0xdf3b49da00000000, 0x45b36fea00000000, 0x3352607700000000,
+    0xe877010b00000000, 0x9e960e9600000000, 0x5e3cc3f300000000,
+    0x28ddcc6e00000000, 0xf3f8ad1200000000, 0x8519a28f00000000,
+    0x73ad36d900000000, 0x054c394400000000, 0xde69583800000000,
+    0xa88857a500000000, 0x68229ac000000000, 0x1ec3955d00000000,
+    0xc5e6f42100000000, 0xb307fbbc00000000, 0xe2ef738300000000,
+    0x940e7c1e00000000, 0x4f2b1d6200000000, 0x39ca12ff00000000,
+    0xf960df9a00000000, 0x8f81d00700000000, 0x54a4b17b00000000,
+    0x2245bee600000000, 0xd4f12ab000000000, 0xa210252d00000000,
+    0x7935445100000000, 0x0fd44bcc00000000, 0xcf7e86a900000000,
+    0xb99f893400000000, 0x62bae84800000000, 0x145be7d500000000,
+    0x8ed3c1e500000000, 0xf832ce7800000000, 0x2317af0400000000,
+    0x55f6a09900000000, 0x955c6dfc00000000, 0xe3bd626100000000,
+    0x3898031d00000000, 0x4e790c8000000000, 0xb8cd98d600000000,
+    0xce2c974b00000000, 0x1509f63700000000, 0x63e8f9aa00000000,
+    0xa34234cf00000000, 0xd5a33b5200000000, 0x0e865a2e00000000,
+    0x786755b300000000, 0x3a97174e00000000, 0x4c7618d300000000,
+    0x975379af00000000, 0xe1b2763200000000, 0x2118bb5700000000,
+    0x57f9b4ca00000000, 0x8cdcd5b600000000, 0xfa3dda2b00000000,
+    0x0c894e7d00000000, 0x7a6841e000000000, 0xa14d209c00000000,
+    0xd7ac2f0100000000, 0x1706e26400000000, 0x61e7edf900000000,
+    0xbac28c8500000000, 0xcc23831800000000, 0x56aba52800000000,
+    0x204aaab500000000, 0xfb6fcbc900000000, 0x8d8ec45400000000,
+    0x4d24093100000000, 0x3bc506ac00000000, 0xe0e067d000000000,
+    0x9601684d00000000, 0x60b5fc1b00000000, 0x1654f38600000000,
+    0xcd7192fa00000000, 0xbb909d6700000000, 0x7b3a500200000000,
+    0x0ddb5f9f00000000, 0xd6fe3ee300000000, 0xa01f317e00000000,
+    0x1318cac200000000, 0x65f9c55f00000000, 0xbedca42300000000,
+    0xc83dabbe00000000, 0x089766db00000000, 0x7e76694600000000,
+    0xa553083a00000000, 0xd3b207a700000000, 0x250693f100000000,
+    0x53e79c6c00000000, 0x88c2fd1000000000, 0xfe23f28d00000000,
+    0x3e893fe800000000, 0x4868307500000000, 0x934d510900000000,
+    0xe5ac5e9400000000, 0x7f2478a400000000, 0x09c5773900000000,
+    0xd2e0164500000000, 0xa40119d800000000, 0x64abd4bd00000000,
+    0x124adb2000000000, 0xc96fba5c00000000, 0xbf8eb5c100000000,
+    0x493a219700000000, 0x3fdb2e0a00000000, 0xe4fe4f7600000000,
+    0x921f40eb00000000, 0x52b58d8e00000000, 0x2454821300000000,
+    0xff71e36f00000000, 0x8990ecf200000000, 0xcb60ae0f00000000,
+    0xbd81a19200000000, 0x66a4c0ee00000000, 0x1045cf7300000000,
+    0xd0ef021600000000, 0xa60e0d8b00000000, 0x7d2b6cf700000000,
+    0x0bca636a00000000, 0xfd7ef73c00000000, 0x8b9ff8a100000000,
+    0x50ba99dd00000000, 0x265b964000000000, 0xe6f15b2500000000,
+    0x901054b800000000, 0x4b3535c400000000, 0x3dd43a5900000000,
+    0xa75c1c6900000000, 0xd1bd13f400000000, 0x0a98728800000000,
+    0x7c797d1500000000, 0xbcd3b07000000000, 0xca32bfed00000000,
+    0x1117de9100000000, 0x67f6d10c00000000, 0x9142455a00000000,
+    0xe7a34ac700000000, 0x3c862bbb00000000, 0x4a67242600000000,
+    0x8acde94300000000, 0xfc2ce6de00000000, 0x270987a200000000,
+    0x51e8883f00000000},
+   {0x0000000000000000, 0xe8dbfbb900000000, 0x91b186a800000000,
+    0x796a7d1100000000, 0x63657c8a00000000, 0x8bbe873300000000,
+    0xf2d4fa2200000000, 0x1a0f019b00000000, 0x87cc89cf00000000,
+    0x6f17727600000000, 0x167d0f6700000000, 0xfea6f4de00000000,
+    0xe4a9f54500000000, 0x0c720efc00000000, 0x751873ed00000000,
+    0x9dc3885400000000, 0x4f9f624400000000, 0xa74499fd00000000,
+    0xde2ee4ec00000000, 0x36f51f5500000000, 0x2cfa1ece00000000,
+    0xc421e57700000000, 0xbd4b986600000000, 0x559063df00000000,
+    0xc853eb8b00000000, 0x2088103200000000, 0x59e26d2300000000,
+    0xb139969a00000000, 0xab36970100000000, 0x43ed6cb800000000,
+    0x3a8711a900000000, 0xd25cea1000000000, 0x9e3ec58800000000,
+    0x76e53e3100000000, 0x0f8f432000000000, 0xe754b89900000000,
+    0xfd5bb90200000000, 0x158042bb00000000, 0x6cea3faa00000000,
+    0x8431c41300000000, 0x19f24c4700000000, 0xf129b7fe00000000,
+    0x8843caef00000000, 0x6098315600000000, 0x7a9730cd00000000,
+    0x924ccb7400000000, 0xeb26b66500000000, 0x03fd4ddc00000000,
+    0xd1a1a7cc00000000, 0x397a5c7500000000, 0x4010216400000000,
+    0xa8cbdadd00000000, 0xb2c4db4600000000, 0x5a1f20ff00000000,
+    0x23755dee00000000, 0xcbaea65700000000, 0x566d2e0300000000,
+    0xbeb6d5ba00000000, 0xc7dca8ab00000000, 0x2f07531200000000,
+    0x3508528900000000, 0xddd3a93000000000, 0xa4b9d42100000000,
+    0x4c622f9800000000, 0x7d7bfbca00000000, 0x95a0007300000000,
+    0xecca7d6200000000, 0x041186db00000000, 0x1e1e874000000000,
+    0xf6c57cf900000000, 0x8faf01e800000000, 0x6774fa5100000000,
+    0xfab7720500000000, 0x126c89bc00000000, 0x6b06f4ad00000000,
+    0x83dd0f1400000000, 0x99d20e8f00000000, 0x7109f53600000000,
+    0x0863882700000000, 0xe0b8739e00000000, 0x32e4998e00000000,
+    0xda3f623700000000, 0xa3551f2600000000, 0x4b8ee49f00000000,
+    0x5181e50400000000, 0xb95a1ebd00000000, 0xc03063ac00000000,
+    0x28eb981500000000, 0xb528104100000000, 0x5df3ebf800000000,
+    0x249996e900000000, 0xcc426d5000000000, 0xd64d6ccb00000000,
+    0x3e96977200000000, 0x47fcea6300000000, 0xaf2711da00000000,
+    0xe3453e4200000000, 0x0b9ec5fb00000000, 0x72f4b8ea00000000,
+    0x9a2f435300000000, 0x802042c800000000, 0x68fbb97100000000,
+    0x1191c46000000000, 0xf94a3fd900000000, 0x6489b78d00000000,
+    0x8c524c3400000000, 0xf538312500000000, 0x1de3ca9c00000000,
+    0x07eccb0700000000, 0xef3730be00000000, 0x965d4daf00000000,
+    0x7e86b61600000000, 0xacda5c0600000000, 0x4401a7bf00000000,
+    0x3d6bdaae00000000, 0xd5b0211700000000, 0xcfbf208c00000000,
+    0x2764db3500000000, 0x5e0ea62400000000, 0xb6d55d9d00000000,
+    0x2b16d5c900000000, 0xc3cd2e7000000000, 0xbaa7536100000000,
+    0x527ca8d800000000, 0x4873a94300000000, 0xa0a852fa00000000,
+    0xd9c22feb00000000, 0x3119d45200000000, 0xbbf0874e00000000,
+    0x532b7cf700000000, 0x2a4101e600000000, 0xc29afa5f00000000,
+    0xd895fbc400000000, 0x304e007d00000000, 0x49247d6c00000000,
+    0xa1ff86d500000000, 0x3c3c0e8100000000, 0xd4e7f53800000000,
+    0xad8d882900000000, 0x4556739000000000, 0x5f59720b00000000,
+    0xb78289b200000000, 0xcee8f4a300000000, 0x26330f1a00000000,
+    0xf46fe50a00000000, 0x1cb41eb300000000, 0x65de63a200000000,
+    0x8d05981b00000000, 0x970a998000000000, 0x7fd1623900000000,
+    0x06bb1f2800000000, 0xee60e49100000000, 0x73a36cc500000000,
+    0x9b78977c00000000, 0xe212ea6d00000000, 0x0ac911d400000000,
+    0x10c6104f00000000, 0xf81debf600000000, 0x817796e700000000,
+    0x69ac6d5e00000000, 0x25ce42c600000000, 0xcd15b97f00000000,
+    0xb47fc46e00000000, 0x5ca43fd700000000, 0x46ab3e4c00000000,
+    0xae70c5f500000000, 0xd71ab8e400000000, 0x3fc1435d00000000,
+    0xa202cb0900000000, 0x4ad930b000000000, 0x33b34da100000000,
+    0xdb68b61800000000, 0xc167b78300000000, 0x29bc4c3a00000000,
+    0x50d6312b00000000, 0xb80dca9200000000, 0x6a51208200000000,
+    0x828adb3b00000000, 0xfbe0a62a00000000, 0x133b5d9300000000,
+    0x09345c0800000000, 0xe1efa7b100000000, 0x9885daa000000000,
+    0x705e211900000000, 0xed9da94d00000000, 0x054652f400000000,
+    0x7c2c2fe500000000, 0x94f7d45c00000000, 0x8ef8d5c700000000,
+    0x66232e7e00000000, 0x1f49536f00000000, 0xf792a8d600000000,
+    0xc68b7c8400000000, 0x2e50873d00000000, 0x573afa2c00000000,
+    0xbfe1019500000000, 0xa5ee000e00000000, 0x4d35fbb700000000,
+    0x345f86a600000000, 0xdc847d1f00000000, 0x4147f54b00000000,
+    0xa99c0ef200000000, 0xd0f673e300000000, 0x382d885a00000000,
+    0x222289c100000000, 0xcaf9727800000000, 0xb3930f6900000000,
+    0x5b48f4d000000000, 0x89141ec000000000, 0x61cfe57900000000,
+    0x18a5986800000000, 0xf07e63d100000000, 0xea71624a00000000,
+    0x02aa99f300000000, 0x7bc0e4e200000000, 0x931b1f5b00000000,
+    0x0ed8970f00000000, 0xe6036cb600000000, 0x9f6911a700000000,
+    0x77b2ea1e00000000, 0x6dbdeb8500000000, 0x8566103c00000000,
+    0xfc0c6d2d00000000, 0x14d7969400000000, 0x58b5b90c00000000,
+    0xb06e42b500000000, 0xc9043fa400000000, 0x21dfc41d00000000,
+    0x3bd0c58600000000, 0xd30b3e3f00000000, 0xaa61432e00000000,
+    0x42bab89700000000, 0xdf7930c300000000, 0x37a2cb7a00000000,
+    0x4ec8b66b00000000, 0xa6134dd200000000, 0xbc1c4c4900000000,
+    0x54c7b7f000000000, 0x2dadcae100000000, 0xc576315800000000,
+    0x172adb4800000000, 0xfff120f100000000, 0x869b5de000000000,
+    0x6e40a65900000000, 0x744fa7c200000000, 0x9c945c7b00000000,
+    0xe5fe216a00000000, 0x0d25dad300000000, 0x90e6528700000000,
+    0x783da93e00000000, 0x0157d42f00000000, 0xe98c2f9600000000,
+    0xf3832e0d00000000, 0x1b58d5b400000000, 0x6232a8a500000000,
+    0x8ae9531c00000000},
+   {0x0000000000000000, 0x919168ae00000000, 0x6325a08700000000,
+    0xf2b4c82900000000, 0x874c31d400000000, 0x16dd597a00000000,
+    0xe469915300000000, 0x75f8f9fd00000000, 0x4f9f137300000000,
+    0xde0e7bdd00000000, 0x2cbab3f400000000, 0xbd2bdb5a00000000,
+    0xc8d322a700000000, 0x59424a0900000000, 0xabf6822000000000,
+    0x3a67ea8e00000000, 0x9e3e27e600000000, 0x0faf4f4800000000,
+    0xfd1b876100000000, 0x6c8aefcf00000000, 0x1972163200000000,
+    0x88e37e9c00000000, 0x7a57b6b500000000, 0xebc6de1b00000000,
+    0xd1a1349500000000, 0x40305c3b00000000, 0xb284941200000000,
+    0x2315fcbc00000000, 0x56ed054100000000, 0xc77c6def00000000,
+    0x35c8a5c600000000, 0xa459cd6800000000, 0x7d7b3f1700000000,
+    0xecea57b900000000, 0x1e5e9f9000000000, 0x8fcff73e00000000,
+    0xfa370ec300000000, 0x6ba6666d00000000, 0x9912ae4400000000,
+    0x0883c6ea00000000, 0x32e42c6400000000, 0xa37544ca00000000,
+    0x51c18ce300000000, 0xc050e44d00000000, 0xb5a81db000000000,
+    0x2439751e00000000, 0xd68dbd3700000000, 0x471cd59900000000,
+    0xe34518f100000000, 0x72d4705f00000000, 0x8060b87600000000,
+    0x11f1d0d800000000, 0x6409292500000000, 0xf598418b00000000,
+    0x072c89a200000000, 0x96bde10c00000000, 0xacda0b8200000000,
+    0x3d4b632c00000000, 0xcfffab0500000000, 0x5e6ec3ab00000000,
+    0x2b963a5600000000, 0xba0752f800000000, 0x48b39ad100000000,
+    0xd922f27f00000000, 0xfaf67e2e00000000, 0x6b67168000000000,
+    0x99d3dea900000000, 0x0842b60700000000, 0x7dba4ffa00000000,
+    0xec2b275400000000, 0x1e9fef7d00000000, 0x8f0e87d300000000,
+    0xb5696d5d00000000, 0x24f805f300000000, 0xd64ccdda00000000,
+    0x47dda57400000000, 0x32255c8900000000, 0xa3b4342700000000,
+    0x5100fc0e00000000, 0xc09194a000000000, 0x64c859c800000000,
+    0xf559316600000000, 0x07edf94f00000000, 0x967c91e100000000,
+    0xe384681c00000000, 0x721500b200000000, 0x80a1c89b00000000,
+    0x1130a03500000000, 0x2b574abb00000000, 0xbac6221500000000,
+    0x4872ea3c00000000, 0xd9e3829200000000, 0xac1b7b6f00000000,
+    0x3d8a13c100000000, 0xcf3edbe800000000, 0x5eafb34600000000,
+    0x878d413900000000, 0x161c299700000000, 0xe4a8e1be00000000,
+    0x7539891000000000, 0x00c170ed00000000, 0x9150184300000000,
+    0x63e4d06a00000000, 0xf275b8c400000000, 0xc812524a00000000,
+    0x59833ae400000000, 0xab37f2cd00000000, 0x3aa69a6300000000,
+    0x4f5e639e00000000, 0xdecf0b3000000000, 0x2c7bc31900000000,
+    0xbdeaabb700000000, 0x19b366df00000000, 0x88220e7100000000,
+    0x7a96c65800000000, 0xeb07aef600000000, 0x9eff570b00000000,
+    0x0f6e3fa500000000, 0xfddaf78c00000000, 0x6c4b9f2200000000,
+    0x562c75ac00000000, 0xc7bd1d0200000000, 0x3509d52b00000000,
+    0xa498bd8500000000, 0xd160447800000000, 0x40f12cd600000000,
+    0xb245e4ff00000000, 0x23d48c5100000000, 0xf4edfd5c00000000,
+    0x657c95f200000000, 0x97c85ddb00000000, 0x0659357500000000,
+    0x73a1cc8800000000, 0xe230a42600000000, 0x10846c0f00000000,
+    0x811504a100000000, 0xbb72ee2f00000000, 0x2ae3868100000000,
+    0xd8574ea800000000, 0x49c6260600000000, 0x3c3edffb00000000,
+    0xadafb75500000000, 0x5f1b7f7c00000000, 0xce8a17d200000000,
+    0x6ad3daba00000000, 0xfb42b21400000000, 0x09f67a3d00000000,
+    0x9867129300000000, 0xed9feb6e00000000, 0x7c0e83c000000000,
+    0x8eba4be900000000, 0x1f2b234700000000, 0x254cc9c900000000,
+    0xb4dda16700000000, 0x4669694e00000000, 0xd7f801e000000000,
+    0xa200f81d00000000, 0x339190b300000000, 0xc125589a00000000,
+    0x50b4303400000000, 0x8996c24b00000000, 0x1807aae500000000,
+    0xeab362cc00000000, 0x7b220a6200000000, 0x0edaf39f00000000,
+    0x9f4b9b3100000000, 0x6dff531800000000, 0xfc6e3bb600000000,
+    0xc609d13800000000, 0x5798b99600000000, 0xa52c71bf00000000,
+    0x34bd191100000000, 0x4145e0ec00000000, 0xd0d4884200000000,
+    0x2260406b00000000, 0xb3f128c500000000, 0x17a8e5ad00000000,
+    0x86398d0300000000, 0x748d452a00000000, 0xe51c2d8400000000,
+    0x90e4d47900000000, 0x0175bcd700000000, 0xf3c174fe00000000,
+    0x62501c5000000000, 0x5837f6de00000000, 0xc9a69e7000000000,
+    0x3b12565900000000, 0xaa833ef700000000, 0xdf7bc70a00000000,
+    0x4eeaafa400000000, 0xbc5e678d00000000, 0x2dcf0f2300000000,
+    0x0e1b837200000000, 0x9f8aebdc00000000, 0x6d3e23f500000000,
+    0xfcaf4b5b00000000, 0x8957b2a600000000, 0x18c6da0800000000,
+    0xea72122100000000, 0x7be37a8f00000000, 0x4184900100000000,
+    0xd015f8af00000000, 0x22a1308600000000, 0xb330582800000000,
+    0xc6c8a1d500000000, 0x5759c97b00000000, 0xa5ed015200000000,
+    0x347c69fc00000000, 0x9025a49400000000, 0x01b4cc3a00000000,
+    0xf300041300000000, 0x62916cbd00000000, 0x1769954000000000,
+    0x86f8fdee00000000, 0x744c35c700000000, 0xe5dd5d6900000000,
+    0xdfbab7e700000000, 0x4e2bdf4900000000, 0xbc9f176000000000,
+    0x2d0e7fce00000000, 0x58f6863300000000, 0xc967ee9d00000000,
+    0x3bd326b400000000, 0xaa424e1a00000000, 0x7360bc6500000000,
+    0xe2f1d4cb00000000, 0x10451ce200000000, 0x81d4744c00000000,
+    0xf42c8db100000000, 0x65bde51f00000000, 0x97092d3600000000,
+    0x0698459800000000, 0x3cffaf1600000000, 0xad6ec7b800000000,
+    0x5fda0f9100000000, 0xce4b673f00000000, 0xbbb39ec200000000,
+    0x2a22f66c00000000, 0xd8963e4500000000, 0x490756eb00000000,
+    0xed5e9b8300000000, 0x7ccff32d00000000, 0x8e7b3b0400000000,
+    0x1fea53aa00000000, 0x6a12aa5700000000, 0xfb83c2f900000000,
+    0x09370ad000000000, 0x98a6627e00000000, 0xa2c188f000000000,
+    0x3350e05e00000000, 0xc1e4287700000000, 0x507540d900000000,
+    0x258db92400000000, 0xb41cd18a00000000, 0x46a819a300000000,
+    0xd739710d00000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0xb029603d, 0x6053c07a, 0xd07aa047, 0xc0a680f5,
+    0x708fe0c8, 0xa0f5408f, 0x10dc20b2, 0xc14b7030, 0x7162100d,
+    0xa118b04a, 0x1131d077, 0x01edf0c5, 0xb1c490f8, 0x61be30bf,
+    0xd1975082, 0x8297e060, 0x32be805d, 0xe2c4201a, 0x52ed4027,
+    0x42316095, 0xf21800a8, 0x2262a0ef, 0x924bc0d2, 0x43dc9050,
+    0xf3f5f06d, 0x238f502a, 0x93a63017, 0x837a10a5, 0x33537098,
+    0xe329d0df, 0x5300b0e2, 0x042fc1c1, 0xb406a1fc, 0x647c01bb,
+    0xd4556186, 0xc4894134, 0x74a02109, 0xa4da814e, 0x14f3e173,
+    0xc564b1f1, 0x754dd1cc, 0xa537718b, 0x151e11b6, 0x05c23104,
+    0xb5eb5139, 0x6591f17e, 0xd5b89143, 0x86b821a1, 0x3691419c,
+    0xe6ebe1db, 0x56c281e6, 0x461ea154, 0xf637c169, 0x264d612e,
+    0x96640113, 0x47f35191, 0xf7da31ac, 0x27a091eb, 0x9789f1d6,
+    0x8755d164, 0x377cb159, 0xe706111e, 0x572f7123, 0x4958f358,
+    0xf9719365, 0x290b3322, 0x9922531f, 0x89fe73ad, 0x39d71390,
+    0xe9adb3d7, 0x5984d3ea, 0x88138368, 0x383ae355, 0xe8404312,
+    0x5869232f, 0x48b5039d, 0xf89c63a0, 0x28e6c3e7, 0x98cfa3da,
+    0xcbcf1338, 0x7be67305, 0xab9cd342, 0x1bb5b37f, 0x0b6993cd,
+    0xbb40f3f0, 0x6b3a53b7, 0xdb13338a, 0x0a846308, 0xbaad0335,
+    0x6ad7a372, 0xdafec34f, 0xca22e3fd, 0x7a0b83c0, 0xaa712387,
+    0x1a5843ba, 0x4d773299, 0xfd5e52a4, 0x2d24f2e3, 0x9d0d92de,
+    0x8dd1b26c, 0x3df8d251, 0xed827216, 0x5dab122b, 0x8c3c42a9,
+    0x3c152294, 0xec6f82d3, 0x5c46e2ee, 0x4c9ac25c, 0xfcb3a261,
+    0x2cc90226, 0x9ce0621b, 0xcfe0d2f9, 0x7fc9b2c4, 0xafb31283,
+    0x1f9a72be, 0x0f46520c, 0xbf6f3231, 0x6f159276, 0xdf3cf24b,
+    0x0eaba2c9, 0xbe82c2f4, 0x6ef862b3, 0xded1028e, 0xce0d223c,
+    0x7e244201, 0xae5ee246, 0x1e77827b, 0x92b0e6b1, 0x2299868c,
+    0xf2e326cb, 0x42ca46f6, 0x52166644, 0xe23f0679, 0x3245a63e,
+    0x826cc603, 0x53fb9681, 0xe3d2f6bc, 0x33a856fb, 0x838136c6,
+    0x935d1674, 0x23747649, 0xf30ed60e, 0x4327b633, 0x102706d1,
+    0xa00e66ec, 0x7074c6ab, 0xc05da696, 0xd0818624, 0x60a8e619,
+    0xb0d2465e, 0x00fb2663, 0xd16c76e1, 0x614516dc, 0xb13fb69b,
+    0x0116d6a6, 0x11caf614, 0xa1e39629, 0x7199366e, 0xc1b05653,
+    0x969f2770, 0x26b6474d, 0xf6cce70a, 0x46e58737, 0x5639a785,
+    0xe610c7b8, 0x366a67ff, 0x864307c2, 0x57d45740, 0xe7fd377d,
+    0x3787973a, 0x87aef707, 0x9772d7b5, 0x275bb788, 0xf72117cf,
+    0x470877f2, 0x1408c710, 0xa421a72d, 0x745b076a, 0xc4726757,
+    0xd4ae47e5, 0x648727d8, 0xb4fd879f, 0x04d4e7a2, 0xd543b720,
+    0x656ad71d, 0xb510775a, 0x05391767, 0x15e537d5, 0xa5cc57e8,
+    0x75b6f7af, 0xc59f9792, 0xdbe815e9, 0x6bc175d4, 0xbbbbd593,
+    0x0b92b5ae, 0x1b4e951c, 0xab67f521, 0x7b1d5566, 0xcb34355b,
+    0x1aa365d9, 0xaa8a05e4, 0x7af0a5a3, 0xcad9c59e, 0xda05e52c,
+    0x6a2c8511, 0xba562556, 0x0a7f456b, 0x597ff589, 0xe95695b4,
+    0x392c35f3, 0x890555ce, 0x99d9757c, 0x29f01541, 0xf98ab506,
+    0x49a3d53b, 0x983485b9, 0x281de584, 0xf86745c3, 0x484e25fe,
+    0x5892054c, 0xe8bb6571, 0x38c1c536, 0x88e8a50b, 0xdfc7d428,
+    0x6feeb415, 0xbf941452, 0x0fbd746f, 0x1f6154dd, 0xaf4834e0,
+    0x7f3294a7, 0xcf1bf49a, 0x1e8ca418, 0xaea5c425, 0x7edf6462,
+    0xcef6045f, 0xde2a24ed, 0x6e0344d0, 0xbe79e497, 0x0e5084aa,
+    0x5d503448, 0xed795475, 0x3d03f432, 0x8d2a940f, 0x9df6b4bd,
+    0x2ddfd480, 0xfda574c7, 0x4d8c14fa, 0x9c1b4478, 0x2c322445,
+    0xfc488402, 0x4c61e43f, 0x5cbdc48d, 0xec94a4b0, 0x3cee04f7,
+    0x8cc764ca},
+   {0x00000000, 0xa5d35ccb, 0x0ba1c84d, 0xae729486, 0x1642919b,
+    0xb391cd50, 0x1de359d6, 0xb830051d, 0x6d8253ec, 0xc8510f27,
+    0x66239ba1, 0xc3f0c76a, 0x7bc0c277, 0xde139ebc, 0x70610a3a,
+    0xd5b256f1, 0x9b02d603, 0x3ed18ac8, 0x90a31e4e, 0x35704285,
+    0x8d404798, 0x28931b53, 0x86e18fd5, 0x2332d31e, 0xf68085ef,
+    0x5353d924, 0xfd214da2, 0x58f21169, 0xe0c21474, 0x451148bf,
+    0xeb63dc39, 0x4eb080f2, 0x3605ac07, 0x93d6f0cc, 0x3da4644a,
+    0x98773881, 0x20473d9c, 0x85946157, 0x2be6f5d1, 0x8e35a91a,
+    0x5b87ffeb, 0xfe54a320, 0x502637a6, 0xf5f56b6d, 0x4dc56e70,
+    0xe81632bb, 0x4664a63d, 0xe3b7faf6, 0xad077a04, 0x08d426cf,
+    0xa6a6b249, 0x0375ee82, 0xbb45eb9f, 0x1e96b754, 0xb0e423d2,
+    0x15377f19, 0xc08529e8, 0x65567523, 0xcb24e1a5, 0x6ef7bd6e,
+    0xd6c7b873, 0x7314e4b8, 0xdd66703e, 0x78b52cf5, 0x6c0a580f,
+    0xc9d904c4, 0x67ab9042, 0xc278cc89, 0x7a48c994, 0xdf9b955f,
+    0x71e901d9, 0xd43a5d12, 0x01880be3, 0xa45b5728, 0x0a29c3ae,
+    0xaffa9f65, 0x17ca9a78, 0xb219c6b3, 0x1c6b5235, 0xb9b80efe,
+    0xf7088e0c, 0x52dbd2c7, 0xfca94641, 0x597a1a8a, 0xe14a1f97,
+    0x4499435c, 0xeaebd7da, 0x4f388b11, 0x9a8adde0, 0x3f59812b,
+    0x912b15ad, 0x34f84966, 0x8cc84c7b, 0x291b10b0, 0x87698436,
+    0x22bad8fd, 0x5a0ff408, 0xffdca8c3, 0x51ae3c45, 0xf47d608e,
+    0x4c4d6593, 0xe99e3958, 0x47ecadde, 0xe23ff115, 0x378da7e4,
+    0x925efb2f, 0x3c2c6fa9, 0x99ff3362, 0x21cf367f, 0x841c6ab4,
+    0x2a6efe32, 0x8fbda2f9, 0xc10d220b, 0x64de7ec0, 0xcaacea46,
+    0x6f7fb68d, 0xd74fb390, 0x729cef5b, 0xdcee7bdd, 0x793d2716,
+    0xac8f71e7, 0x095c2d2c, 0xa72eb9aa, 0x02fde561, 0xbacde07c,
+    0x1f1ebcb7, 0xb16c2831, 0x14bf74fa, 0xd814b01e, 0x7dc7ecd5,
+    0xd3b57853, 0x76662498, 0xce562185, 0x6b857d4e, 0xc5f7e9c8,
+    0x6024b503, 0xb596e3f2, 0x1045bf39, 0xbe372bbf, 0x1be47774,
+    0xa3d47269, 0x06072ea2, 0xa875ba24, 0x0da6e6ef, 0x4316661d,
+    0xe6c53ad6, 0x48b7ae50, 0xed64f29b, 0x5554f786, 0xf087ab4d,
+    0x5ef53fcb, 0xfb266300, 0x2e9435f1, 0x8b47693a, 0x2535fdbc,
+    0x80e6a177, 0x38d6a46a, 0x9d05f8a1, 0x33776c27, 0x96a430ec,
+    0xee111c19, 0x4bc240d2, 0xe5b0d454, 0x4063889f, 0xf8538d82,
+    0x5d80d149, 0xf3f245cf, 0x56211904, 0x83934ff5, 0x2640133e,
+    0x883287b8, 0x2de1db73, 0x95d1de6e, 0x300282a5, 0x9e701623,
+    0x3ba34ae8, 0x7513ca1a, 0xd0c096d1, 0x7eb20257, 0xdb615e9c,
+    0x63515b81, 0xc682074a, 0x68f093cc, 0xcd23cf07, 0x189199f6,
+    0xbd42c53d, 0x133051bb, 0xb6e30d70, 0x0ed3086d, 0xab0054a6,
+    0x0572c020, 0xa0a19ceb, 0xb41ee811, 0x11cdb4da, 0xbfbf205c,
+    0x1a6c7c97, 0xa25c798a, 0x078f2541, 0xa9fdb1c7, 0x0c2eed0c,
+    0xd99cbbfd, 0x7c4fe736, 0xd23d73b0, 0x77ee2f7b, 0xcfde2a66,
+    0x6a0d76ad, 0xc47fe22b, 0x61acbee0, 0x2f1c3e12, 0x8acf62d9,
+    0x24bdf65f, 0x816eaa94, 0x395eaf89, 0x9c8df342, 0x32ff67c4,
+    0x972c3b0f, 0x429e6dfe, 0xe74d3135, 0x493fa5b3, 0xececf978,
+    0x54dcfc65, 0xf10fa0ae, 0x5f7d3428, 0xfaae68e3, 0x821b4416,
+    0x27c818dd, 0x89ba8c5b, 0x2c69d090, 0x9459d58d, 0x318a8946,
+    0x9ff81dc0, 0x3a2b410b, 0xef9917fa, 0x4a4a4b31, 0xe438dfb7,
+    0x41eb837c, 0xf9db8661, 0x5c08daaa, 0xf27a4e2c, 0x57a912e7,
+    0x19199215, 0xbccacede, 0x12b85a58, 0xb76b0693, 0x0f5b038e,
+    0xaa885f45, 0x04facbc3, 0xa1299708, 0x749bc1f9, 0xd1489d32,
+    0x7f3a09b4, 0xdae9557f, 0x62d95062, 0xc70a0ca9, 0x6978982f,
+    0xccabc4e4},
+   {0x00000000, 0xb40b77a6, 0x29119f97, 0x9d1ae831, 0x13244ff4,
+    0xa72f3852, 0x3a35d063, 0x8e3ea7c5, 0x674eef33, 0xd3459895,
+    0x4e5f70a4, 0xfa540702, 0x746aa0c7, 0xc061d761, 0x5d7b3f50,
+    0xe97048f6, 0xce9cde67, 0x7a97a9c1, 0xe78d41f0, 0x53863656,
+    0xddb89193, 0x69b3e635, 0xf4a90e04, 0x40a279a2, 0xa9d23154,
+    0x1dd946f2, 0x80c3aec3, 0x34c8d965, 0xbaf67ea0, 0x0efd0906,
+    0x93e7e137, 0x27ec9691, 0x9c39bdcf, 0x2832ca69, 0xb5282258,
+    0x012355fe, 0x8f1df23b, 0x3b16859d, 0xa60c6dac, 0x12071a0a,
+    0xfb7752fc, 0x4f7c255a, 0xd266cd6b, 0x666dbacd, 0xe8531d08,
+    0x5c586aae, 0xc142829f, 0x7549f539, 0x52a563a8, 0xe6ae140e,
+    0x7bb4fc3f, 0xcfbf8b99, 0x41812c5c, 0xf58a5bfa, 0x6890b3cb,
+    0xdc9bc46d, 0x35eb8c9b, 0x81e0fb3d, 0x1cfa130c, 0xa8f164aa,
+    0x26cfc36f, 0x92c4b4c9, 0x0fde5cf8, 0xbbd52b5e, 0x79750b44,
+    0xcd7e7ce2, 0x506494d3, 0xe46fe375, 0x6a5144b0, 0xde5a3316,
+    0x4340db27, 0xf74bac81, 0x1e3be477, 0xaa3093d1, 0x372a7be0,
+    0x83210c46, 0x0d1fab83, 0xb914dc25, 0x240e3414, 0x900543b2,
+    0xb7e9d523, 0x03e2a285, 0x9ef84ab4, 0x2af33d12, 0xa4cd9ad7,
+    0x10c6ed71, 0x8ddc0540, 0x39d772e6, 0xd0a73a10, 0x64ac4db6,
+    0xf9b6a587, 0x4dbdd221, 0xc38375e4, 0x77880242, 0xea92ea73,
+    0x5e999dd5, 0xe54cb68b, 0x5147c12d, 0xcc5d291c, 0x78565eba,
+    0xf668f97f, 0x42638ed9, 0xdf7966e8, 0x6b72114e, 0x820259b8,
+    0x36092e1e, 0xab13c62f, 0x1f18b189, 0x9126164c, 0x252d61ea,
+    0xb83789db, 0x0c3cfe7d, 0x2bd068ec, 0x9fdb1f4a, 0x02c1f77b,
+    0xb6ca80dd, 0x38f42718, 0x8cff50be, 0x11e5b88f, 0xa5eecf29,
+    0x4c9e87df, 0xf895f079, 0x658f1848, 0xd1846fee, 0x5fbac82b,
+    0xebb1bf8d, 0x76ab57bc, 0xc2a0201a, 0xf2ea1688, 0x46e1612e,
+    0xdbfb891f, 0x6ff0feb9, 0xe1ce597c, 0x55c52eda, 0xc8dfc6eb,
+    0x7cd4b14d, 0x95a4f9bb, 0x21af8e1d, 0xbcb5662c, 0x08be118a,
+    0x8680b64f, 0x328bc1e9, 0xaf9129d8, 0x1b9a5e7e, 0x3c76c8ef,
+    0x887dbf49, 0x15675778, 0xa16c20de, 0x2f52871b, 0x9b59f0bd,
+    0x0643188c, 0xb2486f2a, 0x5b3827dc, 0xef33507a, 0x7229b84b,
+    0xc622cfed, 0x481c6828, 0xfc171f8e, 0x610df7bf, 0xd5068019,
+    0x6ed3ab47, 0xdad8dce1, 0x47c234d0, 0xf3c94376, 0x7df7e4b3,
+    0xc9fc9315, 0x54e67b24, 0xe0ed0c82, 0x099d4474, 0xbd9633d2,
+    0x208cdbe3, 0x9487ac45, 0x1ab90b80, 0xaeb27c26, 0x33a89417,
+    0x87a3e3b1, 0xa04f7520, 0x14440286, 0x895eeab7, 0x3d559d11,
+    0xb36b3ad4, 0x07604d72, 0x9a7aa543, 0x2e71d2e5, 0xc7019a13,
+    0x730aedb5, 0xee100584, 0x5a1b7222, 0xd425d5e7, 0x602ea241,
+    0xfd344a70, 0x493f3dd6, 0x8b9f1dcc, 0x3f946a6a, 0xa28e825b,
+    0x1685f5fd, 0x98bb5238, 0x2cb0259e, 0xb1aacdaf, 0x05a1ba09,
+    0xecd1f2ff, 0x58da8559, 0xc5c06d68, 0x71cb1ace, 0xfff5bd0b,
+    0x4bfecaad, 0xd6e4229c, 0x62ef553a, 0x4503c3ab, 0xf108b40d,
+    0x6c125c3c, 0xd8192b9a, 0x56278c5f, 0xe22cfbf9, 0x7f3613c8,
+    0xcb3d646e, 0x224d2c98, 0x96465b3e, 0x0b5cb30f, 0xbf57c4a9,
+    0x3169636c, 0x856214ca, 0x1878fcfb, 0xac738b5d, 0x17a6a003,
+    0xa3add7a5, 0x3eb73f94, 0x8abc4832, 0x0482eff7, 0xb0899851,
+    0x2d937060, 0x999807c6, 0x70e84f30, 0xc4e33896, 0x59f9d0a7,
+    0xedf2a701, 0x63cc00c4, 0xd7c77762, 0x4add9f53, 0xfed6e8f5,
+    0xd93a7e64, 0x6d3109c2, 0xf02be1f3, 0x44209655, 0xca1e3190,
+    0x7e154636, 0xe30fae07, 0x5704d9a1, 0xbe749157, 0x0a7fe6f1,
+    0x97650ec0, 0x236e7966, 0xad50dea3, 0x195ba905, 0x84414134,
+    0x304a3692},
+   {0x00000000, 0x9e00aacc, 0x7d072542, 0xe3078f8e, 0xfa0e4a84,
+    0x640ee048, 0x87096fc6, 0x1909c50a, 0xb51be5d3, 0x2b1b4f1f,
+    0xc81cc091, 0x561c6a5d, 0x4f15af57, 0xd115059b, 0x32128a15,
+    0xac1220d9, 0x2b31bb7c, 0xb53111b0, 0x56369e3e, 0xc83634f2,
+    0xd13ff1f8, 0x4f3f5b34, 0xac38d4ba, 0x32387e76, 0x9e2a5eaf,
+    0x002af463, 0xe32d7bed, 0x7d2dd121, 0x6424142b, 0xfa24bee7,
+    0x19233169, 0x87239ba5, 0x566276f9, 0xc862dc35, 0x2b6553bb,
+    0xb565f977, 0xac6c3c7d, 0x326c96b1, 0xd16b193f, 0x4f6bb3f3,
+    0xe379932a, 0x7d7939e6, 0x9e7eb668, 0x007e1ca4, 0x1977d9ae,
+    0x87777362, 0x6470fcec, 0xfa705620, 0x7d53cd85, 0xe3536749,
+    0x0054e8c7, 0x9e54420b, 0x875d8701, 0x195d2dcd, 0xfa5aa243,
+    0x645a088f, 0xc8482856, 0x5648829a, 0xb54f0d14, 0x2b4fa7d8,
+    0x324662d2, 0xac46c81e, 0x4f414790, 0xd141ed5c, 0xedc29d29,
+    0x73c237e5, 0x90c5b86b, 0x0ec512a7, 0x17ccd7ad, 0x89cc7d61,
+    0x6acbf2ef, 0xf4cb5823, 0x58d978fa, 0xc6d9d236, 0x25de5db8,
+    0xbbdef774, 0xa2d7327e, 0x3cd798b2, 0xdfd0173c, 0x41d0bdf0,
+    0xc6f32655, 0x58f38c99, 0xbbf40317, 0x25f4a9db, 0x3cfd6cd1,
+    0xa2fdc61d, 0x41fa4993, 0xdffae35f, 0x73e8c386, 0xede8694a,
+    0x0eefe6c4, 0x90ef4c08, 0x89e68902, 0x17e623ce, 0xf4e1ac40,
+    0x6ae1068c, 0xbba0ebd0, 0x25a0411c, 0xc6a7ce92, 0x58a7645e,
+    0x41aea154, 0xdfae0b98, 0x3ca98416, 0xa2a92eda, 0x0ebb0e03,
+    0x90bba4cf, 0x73bc2b41, 0xedbc818d, 0xf4b54487, 0x6ab5ee4b,
+    0x89b261c5, 0x17b2cb09, 0x909150ac, 0x0e91fa60, 0xed9675ee,
+    0x7396df22, 0x6a9f1a28, 0xf49fb0e4, 0x17983f6a, 0x899895a6,
+    0x258ab57f, 0xbb8a1fb3, 0x588d903d, 0xc68d3af1, 0xdf84fffb,
+    0x41845537, 0xa283dab9, 0x3c837075, 0xda853b53, 0x4485919f,
+    0xa7821e11, 0x3982b4dd, 0x208b71d7, 0xbe8bdb1b, 0x5d8c5495,
+    0xc38cfe59, 0x6f9ede80, 0xf19e744c, 0x1299fbc2, 0x8c99510e,
+    0x95909404, 0x0b903ec8, 0xe897b146, 0x76971b8a, 0xf1b4802f,
+    0x6fb42ae3, 0x8cb3a56d, 0x12b30fa1, 0x0bbacaab, 0x95ba6067,
+    0x76bdefe9, 0xe8bd4525, 0x44af65fc, 0xdaafcf30, 0x39a840be,
+    0xa7a8ea72, 0xbea12f78, 0x20a185b4, 0xc3a60a3a, 0x5da6a0f6,
+    0x8ce74daa, 0x12e7e766, 0xf1e068e8, 0x6fe0c224, 0x76e9072e,
+    0xe8e9ade2, 0x0bee226c, 0x95ee88a0, 0x39fca879, 0xa7fc02b5,
+    0x44fb8d3b, 0xdafb27f7, 0xc3f2e2fd, 0x5df24831, 0xbef5c7bf,
+    0x20f56d73, 0xa7d6f6d6, 0x39d65c1a, 0xdad1d394, 0x44d17958,
+    0x5dd8bc52, 0xc3d8169e, 0x20df9910, 0xbedf33dc, 0x12cd1305,
+    0x8ccdb9c9, 0x6fca3647, 0xf1ca9c8b, 0xe8c35981, 0x76c3f34d,
+    0x95c47cc3, 0x0bc4d60f, 0x3747a67a, 0xa9470cb6, 0x4a408338,
+    0xd44029f4, 0xcd49ecfe, 0x53494632, 0xb04ec9bc, 0x2e4e6370,
+    0x825c43a9, 0x1c5ce965, 0xff5b66eb, 0x615bcc27, 0x7852092d,
+    0xe652a3e1, 0x05552c6f, 0x9b5586a3, 0x1c761d06, 0x8276b7ca,
+    0x61713844, 0xff719288, 0xe6785782, 0x7878fd4e, 0x9b7f72c0,
+    0x057fd80c, 0xa96df8d5, 0x376d5219, 0xd46add97, 0x4a6a775b,
+    0x5363b251, 0xcd63189d, 0x2e649713, 0xb0643ddf, 0x6125d083,
+    0xff257a4f, 0x1c22f5c1, 0x82225f0d, 0x9b2b9a07, 0x052b30cb,
+    0xe62cbf45, 0x782c1589, 0xd43e3550, 0x4a3e9f9c, 0xa9391012,
+    0x3739bade, 0x2e307fd4, 0xb030d518, 0x53375a96, 0xcd37f05a,
+    0x4a146bff, 0xd414c133, 0x37134ebd, 0xa913e471, 0xb01a217b,
+    0x2e1a8bb7, 0xcd1d0439, 0x531daef5, 0xff0f8e2c, 0x610f24e0,
+    0x8208ab6e, 0x1c0801a2, 0x0501c4a8, 0x9b016e64, 0x7806e1ea,
+    0xe6064b26}};
+
+#endif
+
+#endif
+
+#if N == 3
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848},
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43cba68700000000, 0xc7903cd400000000,
+    0x845b9a5300000000, 0xcf27087300000000, 0x8cecaef400000000,
+    0x08b734a700000000, 0x4b7c922000000000, 0x9e4f10e600000000,
+    0xdd84b66100000000, 0x59df2c3200000000, 0x1a148ab500000000,
+    0x5168189500000000, 0x12a3be1200000000, 0x96f8244100000000,
+    0xd53382c600000000, 0x7d99511700000000, 0x3e52f79000000000,
+    0xba096dc300000000, 0xf9c2cb4400000000, 0xb2be596400000000,
+    0xf175ffe300000000, 0x752e65b000000000, 0x36e5c33700000000,
+    0xe3d641f100000000, 0xa01de77600000000, 0x24467d2500000000,
+    0x678ddba200000000, 0x2cf1498200000000, 0x6f3aef0500000000,
+    0xeb61755600000000, 0xa8aad3d100000000, 0xfa32a32e00000000,
+    0xb9f905a900000000, 0x3da29ffa00000000, 0x7e69397d00000000,
+    0x3515ab5d00000000, 0x76de0dda00000000, 0xf285978900000000,
+    0xb14e310e00000000, 0x647db3c800000000, 0x27b6154f00000000,
+    0xa3ed8f1c00000000, 0xe026299b00000000, 0xab5abbbb00000000,
+    0xe8911d3c00000000, 0x6cca876f00000000, 0x2f0121e800000000,
+    0x87abf23900000000, 0xc46054be00000000, 0x403bceed00000000,
+    0x03f0686a00000000, 0x488cfa4a00000000, 0x0b475ccd00000000,
+    0x8f1cc69e00000000, 0xccd7601900000000, 0x19e4e2df00000000,
+    0x5a2f445800000000, 0xde74de0b00000000, 0x9dbf788c00000000,
+    0xd6c3eaac00000000, 0x95084c2b00000000, 0x1153d67800000000,
+    0x529870ff00000000, 0xf465465d00000000, 0xb7aee0da00000000,
+    0x33f57a8900000000, 0x703edc0e00000000, 0x3b424e2e00000000,
+    0x7889e8a900000000, 0xfcd272fa00000000, 0xbf19d47d00000000,
+    0x6a2a56bb00000000, 0x29e1f03c00000000, 0xadba6a6f00000000,
+    0xee71cce800000000, 0xa50d5ec800000000, 0xe6c6f84f00000000,
+    0x629d621c00000000, 0x2156c49b00000000, 0x89fc174a00000000,
+    0xca37b1cd00000000, 0x4e6c2b9e00000000, 0x0da78d1900000000,
+    0x46db1f3900000000, 0x0510b9be00000000, 0x814b23ed00000000,
+    0xc280856a00000000, 0x17b307ac00000000, 0x5478a12b00000000,
+    0xd0233b7800000000, 0x93e89dff00000000, 0xd8940fdf00000000,
+    0x9b5fa95800000000, 0x1f04330b00000000, 0x5ccf958c00000000,
+    0x0e57e57300000000, 0x4d9c43f400000000, 0xc9c7d9a700000000,
+    0x8a0c7f2000000000, 0xc170ed0000000000, 0x82bb4b8700000000,
+    0x06e0d1d400000000, 0x452b775300000000, 0x9018f59500000000,
+    0xd3d3531200000000, 0x5788c94100000000, 0x14436fc600000000,
+    0x5f3ffde600000000, 0x1cf45b6100000000, 0x98afc13200000000,
+    0xdb6467b500000000, 0x73ceb46400000000, 0x300512e300000000,
+    0xb45e88b000000000, 0xf7952e3700000000, 0xbce9bc1700000000,
+    0xff221a9000000000, 0x7b7980c300000000, 0x38b2264400000000,
+    0xed81a48200000000, 0xae4a020500000000, 0x2a11985600000000,
+    0x69da3ed100000000, 0x22a6acf100000000, 0x616d0a7600000000,
+    0xe536902500000000, 0xa6fd36a200000000, 0xe8cb8cba00000000,
+    0xab002a3d00000000, 0x2f5bb06e00000000, 0x6c9016e900000000,
+    0x27ec84c900000000, 0x6427224e00000000, 0xe07cb81d00000000,
+    0xa3b71e9a00000000, 0x76849c5c00000000, 0x354f3adb00000000,
+    0xb114a08800000000, 0xf2df060f00000000, 0xb9a3942f00000000,
+    0xfa6832a800000000, 0x7e33a8fb00000000, 0x3df80e7c00000000,
+    0x9552ddad00000000, 0xd6997b2a00000000, 0x52c2e17900000000,
+    0x110947fe00000000, 0x5a75d5de00000000, 0x19be735900000000,
+    0x9de5e90a00000000, 0xde2e4f8d00000000, 0x0b1dcd4b00000000,
+    0x48d66bcc00000000, 0xcc8df19f00000000, 0x8f46571800000000,
+    0xc43ac53800000000, 0x87f163bf00000000, 0x03aaf9ec00000000,
+    0x40615f6b00000000, 0x12f92f9400000000, 0x5132891300000000,
+    0xd569134000000000, 0x96a2b5c700000000, 0xddde27e700000000,
+    0x9e15816000000000, 0x1a4e1b3300000000, 0x5985bdb400000000,
+    0x8cb63f7200000000, 0xcf7d99f500000000, 0x4b2603a600000000,
+    0x08eda52100000000, 0x4391370100000000, 0x005a918600000000,
+    0x84010bd500000000, 0xc7caad5200000000, 0x6f607e8300000000,
+    0x2cabd80400000000, 0xa8f0425700000000, 0xeb3be4d000000000,
+    0xa04776f000000000, 0xe38cd07700000000, 0x67d74a2400000000,
+    0x241ceca300000000, 0xf12f6e6500000000, 0xb2e4c8e200000000,
+    0x36bf52b100000000, 0x7574f43600000000, 0x3e08661600000000,
+    0x7dc3c09100000000, 0xf9985ac200000000, 0xba53fc4500000000,
+    0x1caecae700000000, 0x5f656c6000000000, 0xdb3ef63300000000,
+    0x98f550b400000000, 0xd389c29400000000, 0x9042641300000000,
+    0x1419fe4000000000, 0x57d258c700000000, 0x82e1da0100000000,
+    0xc12a7c8600000000, 0x4571e6d500000000, 0x06ba405200000000,
+    0x4dc6d27200000000, 0x0e0d74f500000000, 0x8a56eea600000000,
+    0xc99d482100000000, 0x61379bf000000000, 0x22fc3d7700000000,
+    0xa6a7a72400000000, 0xe56c01a300000000, 0xae10938300000000,
+    0xeddb350400000000, 0x6980af5700000000, 0x2a4b09d000000000,
+    0xff788b1600000000, 0xbcb32d9100000000, 0x38e8b7c200000000,
+    0x7b23114500000000, 0x305f836500000000, 0x739425e200000000,
+    0xf7cfbfb100000000, 0xb404193600000000, 0xe69c69c900000000,
+    0xa557cf4e00000000, 0x210c551d00000000, 0x62c7f39a00000000,
+    0x29bb61ba00000000, 0x6a70c73d00000000, 0xee2b5d6e00000000,
+    0xade0fbe900000000, 0x78d3792f00000000, 0x3b18dfa800000000,
+    0xbf4345fb00000000, 0xfc88e37c00000000, 0xb7f4715c00000000,
+    0xf43fd7db00000000, 0x70644d8800000000, 0x33afeb0f00000000,
+    0x9b0538de00000000, 0xd8ce9e5900000000, 0x5c95040a00000000,
+    0x1f5ea28d00000000, 0x542230ad00000000, 0x17e9962a00000000,
+    0x93b20c7900000000, 0xd079aafe00000000, 0x054a283800000000,
+    0x46818ebf00000000, 0xc2da14ec00000000, 0x8111b26b00000000,
+    0xca6d204b00000000, 0x89a686cc00000000, 0x0dfd1c9f00000000,
+    0x4e36ba1800000000},
+   {0x0000000000000000, 0xe1b652ef00000000, 0x836bd40500000000,
+    0x62dd86ea00000000, 0x06d7a80b00000000, 0xe761fae400000000,
+    0x85bc7c0e00000000, 0x640a2ee100000000, 0x0cae511700000000,
+    0xed1803f800000000, 0x8fc5851200000000, 0x6e73d7fd00000000,
+    0x0a79f91c00000000, 0xebcfabf300000000, 0x89122d1900000000,
+    0x68a47ff600000000, 0x185ca32e00000000, 0xf9eaf1c100000000,
+    0x9b37772b00000000, 0x7a8125c400000000, 0x1e8b0b2500000000,
+    0xff3d59ca00000000, 0x9de0df2000000000, 0x7c568dcf00000000,
+    0x14f2f23900000000, 0xf544a0d600000000, 0x9799263c00000000,
+    0x762f74d300000000, 0x12255a3200000000, 0xf39308dd00000000,
+    0x914e8e3700000000, 0x70f8dcd800000000, 0x30b8465d00000000,
+    0xd10e14b200000000, 0xb3d3925800000000, 0x5265c0b700000000,
+    0x366fee5600000000, 0xd7d9bcb900000000, 0xb5043a5300000000,
+    0x54b268bc00000000, 0x3c16174a00000000, 0xdda045a500000000,
+    0xbf7dc34f00000000, 0x5ecb91a000000000, 0x3ac1bf4100000000,
+    0xdb77edae00000000, 0xb9aa6b4400000000, 0x581c39ab00000000,
+    0x28e4e57300000000, 0xc952b79c00000000, 0xab8f317600000000,
+    0x4a39639900000000, 0x2e334d7800000000, 0xcf851f9700000000,
+    0xad58997d00000000, 0x4ceecb9200000000, 0x244ab46400000000,
+    0xc5fce68b00000000, 0xa721606100000000, 0x4697328e00000000,
+    0x229d1c6f00000000, 0xc32b4e8000000000, 0xa1f6c86a00000000,
+    0x40409a8500000000, 0x60708dba00000000, 0x81c6df5500000000,
+    0xe31b59bf00000000, 0x02ad0b5000000000, 0x66a725b100000000,
+    0x8711775e00000000, 0xe5ccf1b400000000, 0x047aa35b00000000,
+    0x6cdedcad00000000, 0x8d688e4200000000, 0xefb508a800000000,
+    0x0e035a4700000000, 0x6a0974a600000000, 0x8bbf264900000000,
+    0xe962a0a300000000, 0x08d4f24c00000000, 0x782c2e9400000000,
+    0x999a7c7b00000000, 0xfb47fa9100000000, 0x1af1a87e00000000,
+    0x7efb869f00000000, 0x9f4dd47000000000, 0xfd90529a00000000,
+    0x1c26007500000000, 0x74827f8300000000, 0x95342d6c00000000,
+    0xf7e9ab8600000000, 0x165ff96900000000, 0x7255d78800000000,
+    0x93e3856700000000, 0xf13e038d00000000, 0x1088516200000000,
+    0x50c8cbe700000000, 0xb17e990800000000, 0xd3a31fe200000000,
+    0x32154d0d00000000, 0x561f63ec00000000, 0xb7a9310300000000,
+    0xd574b7e900000000, 0x34c2e50600000000, 0x5c669af000000000,
+    0xbdd0c81f00000000, 0xdf0d4ef500000000, 0x3ebb1c1a00000000,
+    0x5ab132fb00000000, 0xbb07601400000000, 0xd9dae6fe00000000,
+    0x386cb41100000000, 0x489468c900000000, 0xa9223a2600000000,
+    0xcbffbccc00000000, 0x2a49ee2300000000, 0x4e43c0c200000000,
+    0xaff5922d00000000, 0xcd2814c700000000, 0x2c9e462800000000,
+    0x443a39de00000000, 0xa58c6b3100000000, 0xc751eddb00000000,
+    0x26e7bf3400000000, 0x42ed91d500000000, 0xa35bc33a00000000,
+    0xc18645d000000000, 0x2030173f00000000, 0x81e66bae00000000,
+    0x6050394100000000, 0x028dbfab00000000, 0xe33bed4400000000,
+    0x8731c3a500000000, 0x6687914a00000000, 0x045a17a000000000,
+    0xe5ec454f00000000, 0x8d483ab900000000, 0x6cfe685600000000,
+    0x0e23eebc00000000, 0xef95bc5300000000, 0x8b9f92b200000000,
+    0x6a29c05d00000000, 0x08f446b700000000, 0xe942145800000000,
+    0x99bac88000000000, 0x780c9a6f00000000, 0x1ad11c8500000000,
+    0xfb674e6a00000000, 0x9f6d608b00000000, 0x7edb326400000000,
+    0x1c06b48e00000000, 0xfdb0e66100000000, 0x9514999700000000,
+    0x74a2cb7800000000, 0x167f4d9200000000, 0xf7c91f7d00000000,
+    0x93c3319c00000000, 0x7275637300000000, 0x10a8e59900000000,
+    0xf11eb77600000000, 0xb15e2df300000000, 0x50e87f1c00000000,
+    0x3235f9f600000000, 0xd383ab1900000000, 0xb78985f800000000,
+    0x563fd71700000000, 0x34e251fd00000000, 0xd554031200000000,
+    0xbdf07ce400000000, 0x5c462e0b00000000, 0x3e9ba8e100000000,
+    0xdf2dfa0e00000000, 0xbb27d4ef00000000, 0x5a91860000000000,
+    0x384c00ea00000000, 0xd9fa520500000000, 0xa9028edd00000000,
+    0x48b4dc3200000000, 0x2a695ad800000000, 0xcbdf083700000000,
+    0xafd526d600000000, 0x4e63743900000000, 0x2cbef2d300000000,
+    0xcd08a03c00000000, 0xa5acdfca00000000, 0x441a8d2500000000,
+    0x26c70bcf00000000, 0xc771592000000000, 0xa37b77c100000000,
+    0x42cd252e00000000, 0x2010a3c400000000, 0xc1a6f12b00000000,
+    0xe196e61400000000, 0x0020b4fb00000000, 0x62fd321100000000,
+    0x834b60fe00000000, 0xe7414e1f00000000, 0x06f71cf000000000,
+    0x642a9a1a00000000, 0x859cc8f500000000, 0xed38b70300000000,
+    0x0c8ee5ec00000000, 0x6e53630600000000, 0x8fe531e900000000,
+    0xebef1f0800000000, 0x0a594de700000000, 0x6884cb0d00000000,
+    0x893299e200000000, 0xf9ca453a00000000, 0x187c17d500000000,
+    0x7aa1913f00000000, 0x9b17c3d000000000, 0xff1ded3100000000,
+    0x1eabbfde00000000, 0x7c76393400000000, 0x9dc06bdb00000000,
+    0xf564142d00000000, 0x14d246c200000000, 0x760fc02800000000,
+    0x97b992c700000000, 0xf3b3bc2600000000, 0x1205eec900000000,
+    0x70d8682300000000, 0x916e3acc00000000, 0xd12ea04900000000,
+    0x3098f2a600000000, 0x5245744c00000000, 0xb3f326a300000000,
+    0xd7f9084200000000, 0x364f5aad00000000, 0x5492dc4700000000,
+    0xb5248ea800000000, 0xdd80f15e00000000, 0x3c36a3b100000000,
+    0x5eeb255b00000000, 0xbf5d77b400000000, 0xdb57595500000000,
+    0x3ae10bba00000000, 0x583c8d5000000000, 0xb98adfbf00000000,
+    0xc972036700000000, 0x28c4518800000000, 0x4a19d76200000000,
+    0xabaf858d00000000, 0xcfa5ab6c00000000, 0x2e13f98300000000,
+    0x4cce7f6900000000, 0xad782d8600000000, 0xc5dc527000000000,
+    0x246a009f00000000, 0x46b7867500000000, 0xa701d49a00000000,
+    0xc30bfa7b00000000, 0x22bda89400000000, 0x40602e7e00000000,
+    0xa1d67c9100000000},
+   {0x0000000000000000, 0x5880e2d700000000, 0xf106b47400000000,
+    0xa98656a300000000, 0xe20d68e900000000, 0xba8d8a3e00000000,
+    0x130bdc9d00000000, 0x4b8b3e4a00000000, 0x851da10900000000,
+    0xdd9d43de00000000, 0x741b157d00000000, 0x2c9bf7aa00000000,
+    0x6710c9e000000000, 0x3f902b3700000000, 0x96167d9400000000,
+    0xce969f4300000000, 0x0a3b421300000000, 0x52bba0c400000000,
+    0xfb3df66700000000, 0xa3bd14b000000000, 0xe8362afa00000000,
+    0xb0b6c82d00000000, 0x19309e8e00000000, 0x41b07c5900000000,
+    0x8f26e31a00000000, 0xd7a601cd00000000, 0x7e20576e00000000,
+    0x26a0b5b900000000, 0x6d2b8bf300000000, 0x35ab692400000000,
+    0x9c2d3f8700000000, 0xc4addd5000000000, 0x1476842600000000,
+    0x4cf666f100000000, 0xe570305200000000, 0xbdf0d28500000000,
+    0xf67beccf00000000, 0xaefb0e1800000000, 0x077d58bb00000000,
+    0x5ffdba6c00000000, 0x916b252f00000000, 0xc9ebc7f800000000,
+    0x606d915b00000000, 0x38ed738c00000000, 0x73664dc600000000,
+    0x2be6af1100000000, 0x8260f9b200000000, 0xdae01b6500000000,
+    0x1e4dc63500000000, 0x46cd24e200000000, 0xef4b724100000000,
+    0xb7cb909600000000, 0xfc40aedc00000000, 0xa4c04c0b00000000,
+    0x0d461aa800000000, 0x55c6f87f00000000, 0x9b50673c00000000,
+    0xc3d085eb00000000, 0x6a56d34800000000, 0x32d6319f00000000,
+    0x795d0fd500000000, 0x21dded0200000000, 0x885bbba100000000,
+    0xd0db597600000000, 0x28ec084d00000000, 0x706cea9a00000000,
+    0xd9eabc3900000000, 0x816a5eee00000000, 0xcae160a400000000,
+    0x9261827300000000, 0x3be7d4d000000000, 0x6367360700000000,
+    0xadf1a94400000000, 0xf5714b9300000000, 0x5cf71d3000000000,
+    0x0477ffe700000000, 0x4ffcc1ad00000000, 0x177c237a00000000,
+    0xbefa75d900000000, 0xe67a970e00000000, 0x22d74a5e00000000,
+    0x7a57a88900000000, 0xd3d1fe2a00000000, 0x8b511cfd00000000,
+    0xc0da22b700000000, 0x985ac06000000000, 0x31dc96c300000000,
+    0x695c741400000000, 0xa7caeb5700000000, 0xff4a098000000000,
+    0x56cc5f2300000000, 0x0e4cbdf400000000, 0x45c783be00000000,
+    0x1d47616900000000, 0xb4c137ca00000000, 0xec41d51d00000000,
+    0x3c9a8c6b00000000, 0x641a6ebc00000000, 0xcd9c381f00000000,
+    0x951cdac800000000, 0xde97e48200000000, 0x8617065500000000,
+    0x2f9150f600000000, 0x7711b22100000000, 0xb9872d6200000000,
+    0xe107cfb500000000, 0x4881991600000000, 0x10017bc100000000,
+    0x5b8a458b00000000, 0x030aa75c00000000, 0xaa8cf1ff00000000,
+    0xf20c132800000000, 0x36a1ce7800000000, 0x6e212caf00000000,
+    0xc7a77a0c00000000, 0x9f2798db00000000, 0xd4aca69100000000,
+    0x8c2c444600000000, 0x25aa12e500000000, 0x7d2af03200000000,
+    0xb3bc6f7100000000, 0xeb3c8da600000000, 0x42badb0500000000,
+    0x1a3a39d200000000, 0x51b1079800000000, 0x0931e54f00000000,
+    0xa0b7b3ec00000000, 0xf837513b00000000, 0x50d8119a00000000,
+    0x0858f34d00000000, 0xa1dea5ee00000000, 0xf95e473900000000,
+    0xb2d5797300000000, 0xea559ba400000000, 0x43d3cd0700000000,
+    0x1b532fd000000000, 0xd5c5b09300000000, 0x8d45524400000000,
+    0x24c304e700000000, 0x7c43e63000000000, 0x37c8d87a00000000,
+    0x6f483aad00000000, 0xc6ce6c0e00000000, 0x9e4e8ed900000000,
+    0x5ae3538900000000, 0x0263b15e00000000, 0xabe5e7fd00000000,
+    0xf365052a00000000, 0xb8ee3b6000000000, 0xe06ed9b700000000,
+    0x49e88f1400000000, 0x11686dc300000000, 0xdffef28000000000,
+    0x877e105700000000, 0x2ef846f400000000, 0x7678a42300000000,
+    0x3df39a6900000000, 0x657378be00000000, 0xccf52e1d00000000,
+    0x9475ccca00000000, 0x44ae95bc00000000, 0x1c2e776b00000000,
+    0xb5a821c800000000, 0xed28c31f00000000, 0xa6a3fd5500000000,
+    0xfe231f8200000000, 0x57a5492100000000, 0x0f25abf600000000,
+    0xc1b334b500000000, 0x9933d66200000000, 0x30b580c100000000,
+    0x6835621600000000, 0x23be5c5c00000000, 0x7b3ebe8b00000000,
+    0xd2b8e82800000000, 0x8a380aff00000000, 0x4e95d7af00000000,
+    0x1615357800000000, 0xbf9363db00000000, 0xe713810c00000000,
+    0xac98bf4600000000, 0xf4185d9100000000, 0x5d9e0b3200000000,
+    0x051ee9e500000000, 0xcb8876a600000000, 0x9308947100000000,
+    0x3a8ec2d200000000, 0x620e200500000000, 0x29851e4f00000000,
+    0x7105fc9800000000, 0xd883aa3b00000000, 0x800348ec00000000,
+    0x783419d700000000, 0x20b4fb0000000000, 0x8932ada300000000,
+    0xd1b24f7400000000, 0x9a39713e00000000, 0xc2b993e900000000,
+    0x6b3fc54a00000000, 0x33bf279d00000000, 0xfd29b8de00000000,
+    0xa5a95a0900000000, 0x0c2f0caa00000000, 0x54afee7d00000000,
+    0x1f24d03700000000, 0x47a432e000000000, 0xee22644300000000,
+    0xb6a2869400000000, 0x720f5bc400000000, 0x2a8fb91300000000,
+    0x8309efb000000000, 0xdb890d6700000000, 0x9002332d00000000,
+    0xc882d1fa00000000, 0x6104875900000000, 0x3984658e00000000,
+    0xf712facd00000000, 0xaf92181a00000000, 0x06144eb900000000,
+    0x5e94ac6e00000000, 0x151f922400000000, 0x4d9f70f300000000,
+    0xe419265000000000, 0xbc99c48700000000, 0x6c429df100000000,
+    0x34c27f2600000000, 0x9d44298500000000, 0xc5c4cb5200000000,
+    0x8e4ff51800000000, 0xd6cf17cf00000000, 0x7f49416c00000000,
+    0x27c9a3bb00000000, 0xe95f3cf800000000, 0xb1dfde2f00000000,
+    0x1859888c00000000, 0x40d96a5b00000000, 0x0b52541100000000,
+    0x53d2b6c600000000, 0xfa54e06500000000, 0xa2d402b200000000,
+    0x6679dfe200000000, 0x3ef93d3500000000, 0x977f6b9600000000,
+    0xcfff894100000000, 0x8474b70b00000000, 0xdcf455dc00000000,
+    0x7572037f00000000, 0x2df2e1a800000000, 0xe3647eeb00000000,
+    0xbbe49c3c00000000, 0x1262ca9f00000000, 0x4ae2284800000000,
+    0x0169160200000000, 0x59e9f4d500000000, 0xf06fa27600000000,
+    0xa8ef40a100000000},
+   {0x0000000000000000, 0x463b676500000000, 0x8c76ceca00000000,
+    0xca4da9af00000000, 0x59ebed4e00000000, 0x1fd08a2b00000000,
+    0xd59d238400000000, 0x93a644e100000000, 0xb2d6db9d00000000,
+    0xf4edbcf800000000, 0x3ea0155700000000, 0x789b723200000000,
+    0xeb3d36d300000000, 0xad0651b600000000, 0x674bf81900000000,
+    0x21709f7c00000000, 0x25abc6e000000000, 0x6390a18500000000,
+    0xa9dd082a00000000, 0xefe66f4f00000000, 0x7c402bae00000000,
+    0x3a7b4ccb00000000, 0xf036e56400000000, 0xb60d820100000000,
+    0x977d1d7d00000000, 0xd1467a1800000000, 0x1b0bd3b700000000,
+    0x5d30b4d200000000, 0xce96f03300000000, 0x88ad975600000000,
+    0x42e03ef900000000, 0x04db599c00000000, 0x0b50fc1a00000000,
+    0x4d6b9b7f00000000, 0x872632d000000000, 0xc11d55b500000000,
+    0x52bb115400000000, 0x1480763100000000, 0xdecddf9e00000000,
+    0x98f6b8fb00000000, 0xb986278700000000, 0xffbd40e200000000,
+    0x35f0e94d00000000, 0x73cb8e2800000000, 0xe06dcac900000000,
+    0xa656adac00000000, 0x6c1b040300000000, 0x2a20636600000000,
+    0x2efb3afa00000000, 0x68c05d9f00000000, 0xa28df43000000000,
+    0xe4b6935500000000, 0x7710d7b400000000, 0x312bb0d100000000,
+    0xfb66197e00000000, 0xbd5d7e1b00000000, 0x9c2de16700000000,
+    0xda16860200000000, 0x105b2fad00000000, 0x566048c800000000,
+    0xc5c60c2900000000, 0x83fd6b4c00000000, 0x49b0c2e300000000,
+    0x0f8ba58600000000, 0x16a0f83500000000, 0x509b9f5000000000,
+    0x9ad636ff00000000, 0xdced519a00000000, 0x4f4b157b00000000,
+    0x0970721e00000000, 0xc33ddbb100000000, 0x8506bcd400000000,
+    0xa47623a800000000, 0xe24d44cd00000000, 0x2800ed6200000000,
+    0x6e3b8a0700000000, 0xfd9dcee600000000, 0xbba6a98300000000,
+    0x71eb002c00000000, 0x37d0674900000000, 0x330b3ed500000000,
+    0x753059b000000000, 0xbf7df01f00000000, 0xf946977a00000000,
+    0x6ae0d39b00000000, 0x2cdbb4fe00000000, 0xe6961d5100000000,
+    0xa0ad7a3400000000, 0x81dde54800000000, 0xc7e6822d00000000,
+    0x0dab2b8200000000, 0x4b904ce700000000, 0xd836080600000000,
+    0x9e0d6f6300000000, 0x5440c6cc00000000, 0x127ba1a900000000,
+    0x1df0042f00000000, 0x5bcb634a00000000, 0x9186cae500000000,
+    0xd7bdad8000000000, 0x441be96100000000, 0x02208e0400000000,
+    0xc86d27ab00000000, 0x8e5640ce00000000, 0xaf26dfb200000000,
+    0xe91db8d700000000, 0x2350117800000000, 0x656b761d00000000,
+    0xf6cd32fc00000000, 0xb0f6559900000000, 0x7abbfc3600000000,
+    0x3c809b5300000000, 0x385bc2cf00000000, 0x7e60a5aa00000000,
+    0xb42d0c0500000000, 0xf2166b6000000000, 0x61b02f8100000000,
+    0x278b48e400000000, 0xedc6e14b00000000, 0xabfd862e00000000,
+    0x8a8d195200000000, 0xccb67e3700000000, 0x06fbd79800000000,
+    0x40c0b0fd00000000, 0xd366f41c00000000, 0x955d937900000000,
+    0x5f103ad600000000, 0x192b5db300000000, 0x2c40f16b00000000,
+    0x6a7b960e00000000, 0xa0363fa100000000, 0xe60d58c400000000,
+    0x75ab1c2500000000, 0x33907b4000000000, 0xf9ddd2ef00000000,
+    0xbfe6b58a00000000, 0x9e962af600000000, 0xd8ad4d9300000000,
+    0x12e0e43c00000000, 0x54db835900000000, 0xc77dc7b800000000,
+    0x8146a0dd00000000, 0x4b0b097200000000, 0x0d306e1700000000,
+    0x09eb378b00000000, 0x4fd050ee00000000, 0x859df94100000000,
+    0xc3a69e2400000000, 0x5000dac500000000, 0x163bbda000000000,
+    0xdc76140f00000000, 0x9a4d736a00000000, 0xbb3dec1600000000,
+    0xfd068b7300000000, 0x374b22dc00000000, 0x717045b900000000,
+    0xe2d6015800000000, 0xa4ed663d00000000, 0x6ea0cf9200000000,
+    0x289ba8f700000000, 0x27100d7100000000, 0x612b6a1400000000,
+    0xab66c3bb00000000, 0xed5da4de00000000, 0x7efbe03f00000000,
+    0x38c0875a00000000, 0xf28d2ef500000000, 0xb4b6499000000000,
+    0x95c6d6ec00000000, 0xd3fdb18900000000, 0x19b0182600000000,
+    0x5f8b7f4300000000, 0xcc2d3ba200000000, 0x8a165cc700000000,
+    0x405bf56800000000, 0x0660920d00000000, 0x02bbcb9100000000,
+    0x4480acf400000000, 0x8ecd055b00000000, 0xc8f6623e00000000,
+    0x5b5026df00000000, 0x1d6b41ba00000000, 0xd726e81500000000,
+    0x911d8f7000000000, 0xb06d100c00000000, 0xf656776900000000,
+    0x3c1bdec600000000, 0x7a20b9a300000000, 0xe986fd4200000000,
+    0xafbd9a2700000000, 0x65f0338800000000, 0x23cb54ed00000000,
+    0x3ae0095e00000000, 0x7cdb6e3b00000000, 0xb696c79400000000,
+    0xf0ada0f100000000, 0x630be41000000000, 0x2530837500000000,
+    0xef7d2ada00000000, 0xa9464dbf00000000, 0x8836d2c300000000,
+    0xce0db5a600000000, 0x04401c0900000000, 0x427b7b6c00000000,
+    0xd1dd3f8d00000000, 0x97e658e800000000, 0x5dabf14700000000,
+    0x1b90962200000000, 0x1f4bcfbe00000000, 0x5970a8db00000000,
+    0x933d017400000000, 0xd506661100000000, 0x46a022f000000000,
+    0x009b459500000000, 0xcad6ec3a00000000, 0x8ced8b5f00000000,
+    0xad9d142300000000, 0xeba6734600000000, 0x21ebdae900000000,
+    0x67d0bd8c00000000, 0xf476f96d00000000, 0xb24d9e0800000000,
+    0x780037a700000000, 0x3e3b50c200000000, 0x31b0f54400000000,
+    0x778b922100000000, 0xbdc63b8e00000000, 0xfbfd5ceb00000000,
+    0x685b180a00000000, 0x2e607f6f00000000, 0xe42dd6c000000000,
+    0xa216b1a500000000, 0x83662ed900000000, 0xc55d49bc00000000,
+    0x0f10e01300000000, 0x492b877600000000, 0xda8dc39700000000,
+    0x9cb6a4f200000000, 0x56fb0d5d00000000, 0x10c06a3800000000,
+    0x141b33a400000000, 0x522054c100000000, 0x986dfd6e00000000,
+    0xde569a0b00000000, 0x4df0deea00000000, 0x0bcbb98f00000000,
+    0xc186102000000000, 0x87bd774500000000, 0xa6cde83900000000,
+    0xe0f68f5c00000000, 0x2abb26f300000000, 0x6c80419600000000,
+    0xff26057700000000, 0xb91d621200000000, 0x7350cbbd00000000,
+    0x356bacd800000000},
+   {0x0000000000000000, 0x9e83da9f00000000, 0x7d01c4e400000000,
+    0xe3821e7b00000000, 0xbb04f91200000000, 0x2587238d00000000,
+    0xc6053df600000000, 0x5886e76900000000, 0x7609f22500000000,
+    0xe88a28ba00000000, 0x0b0836c100000000, 0x958bec5e00000000,
+    0xcd0d0b3700000000, 0x538ed1a800000000, 0xb00ccfd300000000,
+    0x2e8f154c00000000, 0xec12e44b00000000, 0x72913ed400000000,
+    0x911320af00000000, 0x0f90fa3000000000, 0x57161d5900000000,
+    0xc995c7c600000000, 0x2a17d9bd00000000, 0xb494032200000000,
+    0x9a1b166e00000000, 0x0498ccf100000000, 0xe71ad28a00000000,
+    0x7999081500000000, 0x211fef7c00000000, 0xbf9c35e300000000,
+    0x5c1e2b9800000000, 0xc29df10700000000, 0xd825c89700000000,
+    0x46a6120800000000, 0xa5240c7300000000, 0x3ba7d6ec00000000,
+    0x6321318500000000, 0xfda2eb1a00000000, 0x1e20f56100000000,
+    0x80a32ffe00000000, 0xae2c3ab200000000, 0x30afe02d00000000,
+    0xd32dfe5600000000, 0x4dae24c900000000, 0x1528c3a000000000,
+    0x8bab193f00000000, 0x6829074400000000, 0xf6aadddb00000000,
+    0x34372cdc00000000, 0xaab4f64300000000, 0x4936e83800000000,
+    0xd7b532a700000000, 0x8f33d5ce00000000, 0x11b00f5100000000,
+    0xf232112a00000000, 0x6cb1cbb500000000, 0x423edef900000000,
+    0xdcbd046600000000, 0x3f3f1a1d00000000, 0xa1bcc08200000000,
+    0xf93a27eb00000000, 0x67b9fd7400000000, 0x843be30f00000000,
+    0x1ab8399000000000, 0xf14de1f400000000, 0x6fce3b6b00000000,
+    0x8c4c251000000000, 0x12cfff8f00000000, 0x4a4918e600000000,
+    0xd4cac27900000000, 0x3748dc0200000000, 0xa9cb069d00000000,
+    0x874413d100000000, 0x19c7c94e00000000, 0xfa45d73500000000,
+    0x64c60daa00000000, 0x3c40eac300000000, 0xa2c3305c00000000,
+    0x41412e2700000000, 0xdfc2f4b800000000, 0x1d5f05bf00000000,
+    0x83dcdf2000000000, 0x605ec15b00000000, 0xfedd1bc400000000,
+    0xa65bfcad00000000, 0x38d8263200000000, 0xdb5a384900000000,
+    0x45d9e2d600000000, 0x6b56f79a00000000, 0xf5d52d0500000000,
+    0x1657337e00000000, 0x88d4e9e100000000, 0xd0520e8800000000,
+    0x4ed1d41700000000, 0xad53ca6c00000000, 0x33d010f300000000,
+    0x2968296300000000, 0xb7ebf3fc00000000, 0x5469ed8700000000,
+    0xcaea371800000000, 0x926cd07100000000, 0x0cef0aee00000000,
+    0xef6d149500000000, 0x71eece0a00000000, 0x5f61db4600000000,
+    0xc1e201d900000000, 0x22601fa200000000, 0xbce3c53d00000000,
+    0xe465225400000000, 0x7ae6f8cb00000000, 0x9964e6b000000000,
+    0x07e73c2f00000000, 0xc57acd2800000000, 0x5bf917b700000000,
+    0xb87b09cc00000000, 0x26f8d35300000000, 0x7e7e343a00000000,
+    0xe0fdeea500000000, 0x037ff0de00000000, 0x9dfc2a4100000000,
+    0xb3733f0d00000000, 0x2df0e59200000000, 0xce72fbe900000000,
+    0x50f1217600000000, 0x0877c61f00000000, 0x96f41c8000000000,
+    0x757602fb00000000, 0xebf5d86400000000, 0xa39db33200000000,
+    0x3d1e69ad00000000, 0xde9c77d600000000, 0x401fad4900000000,
+    0x18994a2000000000, 0x861a90bf00000000, 0x65988ec400000000,
+    0xfb1b545b00000000, 0xd594411700000000, 0x4b179b8800000000,
+    0xa89585f300000000, 0x36165f6c00000000, 0x6e90b80500000000,
+    0xf013629a00000000, 0x13917ce100000000, 0x8d12a67e00000000,
+    0x4f8f577900000000, 0xd10c8de600000000, 0x328e939d00000000,
+    0xac0d490200000000, 0xf48bae6b00000000, 0x6a0874f400000000,
+    0x898a6a8f00000000, 0x1709b01000000000, 0x3986a55c00000000,
+    0xa7057fc300000000, 0x448761b800000000, 0xda04bb2700000000,
+    0x82825c4e00000000, 0x1c0186d100000000, 0xff8398aa00000000,
+    0x6100423500000000, 0x7bb87ba500000000, 0xe53ba13a00000000,
+    0x06b9bf4100000000, 0x983a65de00000000, 0xc0bc82b700000000,
+    0x5e3f582800000000, 0xbdbd465300000000, 0x233e9ccc00000000,
+    0x0db1898000000000, 0x9332531f00000000, 0x70b04d6400000000,
+    0xee3397fb00000000, 0xb6b5709200000000, 0x2836aa0d00000000,
+    0xcbb4b47600000000, 0x55376ee900000000, 0x97aa9fee00000000,
+    0x0929457100000000, 0xeaab5b0a00000000, 0x7428819500000000,
+    0x2cae66fc00000000, 0xb22dbc6300000000, 0x51afa21800000000,
+    0xcf2c788700000000, 0xe1a36dcb00000000, 0x7f20b75400000000,
+    0x9ca2a92f00000000, 0x022173b000000000, 0x5aa794d900000000,
+    0xc4244e4600000000, 0x27a6503d00000000, 0xb9258aa200000000,
+    0x52d052c600000000, 0xcc53885900000000, 0x2fd1962200000000,
+    0xb1524cbd00000000, 0xe9d4abd400000000, 0x7757714b00000000,
+    0x94d56f3000000000, 0x0a56b5af00000000, 0x24d9a0e300000000,
+    0xba5a7a7c00000000, 0x59d8640700000000, 0xc75bbe9800000000,
+    0x9fdd59f100000000, 0x015e836e00000000, 0xe2dc9d1500000000,
+    0x7c5f478a00000000, 0xbec2b68d00000000, 0x20416c1200000000,
+    0xc3c3726900000000, 0x5d40a8f600000000, 0x05c64f9f00000000,
+    0x9b45950000000000, 0x78c78b7b00000000, 0xe64451e400000000,
+    0xc8cb44a800000000, 0x56489e3700000000, 0xb5ca804c00000000,
+    0x2b495ad300000000, 0x73cfbdba00000000, 0xed4c672500000000,
+    0x0ece795e00000000, 0x904da3c100000000, 0x8af59a5100000000,
+    0x147640ce00000000, 0xf7f45eb500000000, 0x6977842a00000000,
+    0x31f1634300000000, 0xaf72b9dc00000000, 0x4cf0a7a700000000,
+    0xd2737d3800000000, 0xfcfc687400000000, 0x627fb2eb00000000,
+    0x81fdac9000000000, 0x1f7e760f00000000, 0x47f8916600000000,
+    0xd97b4bf900000000, 0x3af9558200000000, 0xa47a8f1d00000000,
+    0x66e77e1a00000000, 0xf864a48500000000, 0x1be6bafe00000000,
+    0x8565606100000000, 0xdde3870800000000, 0x43605d9700000000,
+    0xa0e243ec00000000, 0x3e61997300000000, 0x10ee8c3f00000000,
+    0x8e6d56a000000000, 0x6def48db00000000, 0xf36c924400000000,
+    0xabea752d00000000, 0x3569afb200000000, 0xd6ebb1c900000000,
+    0x48686b5600000000},
+   {0x0000000000000000, 0xc064281700000000, 0x80c9502e00000000,
+    0x40ad783900000000, 0x0093a15c00000000, 0xc0f7894b00000000,
+    0x805af17200000000, 0x403ed96500000000, 0x002643b900000000,
+    0xc0426bae00000000, 0x80ef139700000000, 0x408b3b8000000000,
+    0x00b5e2e500000000, 0xc0d1caf200000000, 0x807cb2cb00000000,
+    0x40189adc00000000, 0x414af7a900000000, 0x812edfbe00000000,
+    0xc183a78700000000, 0x01e78f9000000000, 0x41d956f500000000,
+    0x81bd7ee200000000, 0xc11006db00000000, 0x01742ecc00000000,
+    0x416cb41000000000, 0x81089c0700000000, 0xc1a5e43e00000000,
+    0x01c1cc2900000000, 0x41ff154c00000000, 0x819b3d5b00000000,
+    0xc136456200000000, 0x01526d7500000000, 0xc3929f8800000000,
+    0x03f6b79f00000000, 0x435bcfa600000000, 0x833fe7b100000000,
+    0xc3013ed400000000, 0x036516c300000000, 0x43c86efa00000000,
+    0x83ac46ed00000000, 0xc3b4dc3100000000, 0x03d0f42600000000,
+    0x437d8c1f00000000, 0x8319a40800000000, 0xc3277d6d00000000,
+    0x0343557a00000000, 0x43ee2d4300000000, 0x838a055400000000,
+    0x82d8682100000000, 0x42bc403600000000, 0x0211380f00000000,
+    0xc275101800000000, 0x824bc97d00000000, 0x422fe16a00000000,
+    0x0282995300000000, 0xc2e6b14400000000, 0x82fe2b9800000000,
+    0x429a038f00000000, 0x02377bb600000000, 0xc25353a100000000,
+    0x826d8ac400000000, 0x4209a2d300000000, 0x02a4daea00000000,
+    0xc2c0f2fd00000000, 0xc7234eca00000000, 0x074766dd00000000,
+    0x47ea1ee400000000, 0x878e36f300000000, 0xc7b0ef9600000000,
+    0x07d4c78100000000, 0x4779bfb800000000, 0x871d97af00000000,
+    0xc7050d7300000000, 0x0761256400000000, 0x47cc5d5d00000000,
+    0x87a8754a00000000, 0xc796ac2f00000000, 0x07f2843800000000,
+    0x475ffc0100000000, 0x873bd41600000000, 0x8669b96300000000,
+    0x460d917400000000, 0x06a0e94d00000000, 0xc6c4c15a00000000,
+    0x86fa183f00000000, 0x469e302800000000, 0x0633481100000000,
+    0xc657600600000000, 0x864ffada00000000, 0x462bd2cd00000000,
+    0x0686aaf400000000, 0xc6e282e300000000, 0x86dc5b8600000000,
+    0x46b8739100000000, 0x06150ba800000000, 0xc67123bf00000000,
+    0x04b1d14200000000, 0xc4d5f95500000000, 0x8478816c00000000,
+    0x441ca97b00000000, 0x0422701e00000000, 0xc446580900000000,
+    0x84eb203000000000, 0x448f082700000000, 0x049792fb00000000,
+    0xc4f3baec00000000, 0x845ec2d500000000, 0x443aeac200000000,
+    0x040433a700000000, 0xc4601bb000000000, 0x84cd638900000000,
+    0x44a94b9e00000000, 0x45fb26eb00000000, 0x859f0efc00000000,
+    0xc53276c500000000, 0x05565ed200000000, 0x456887b700000000,
+    0x850cafa000000000, 0xc5a1d79900000000, 0x05c5ff8e00000000,
+    0x45dd655200000000, 0x85b94d4500000000, 0xc514357c00000000,
+    0x05701d6b00000000, 0x454ec40e00000000, 0x852aec1900000000,
+    0xc587942000000000, 0x05e3bc3700000000, 0xcf41ed4f00000000,
+    0x0f25c55800000000, 0x4f88bd6100000000, 0x8fec957600000000,
+    0xcfd24c1300000000, 0x0fb6640400000000, 0x4f1b1c3d00000000,
+    0x8f7f342a00000000, 0xcf67aef600000000, 0x0f0386e100000000,
+    0x4faefed800000000, 0x8fcad6cf00000000, 0xcff40faa00000000,
+    0x0f9027bd00000000, 0x4f3d5f8400000000, 0x8f59779300000000,
+    0x8e0b1ae600000000, 0x4e6f32f100000000, 0x0ec24ac800000000,
+    0xcea662df00000000, 0x8e98bbba00000000, 0x4efc93ad00000000,
+    0x0e51eb9400000000, 0xce35c38300000000, 0x8e2d595f00000000,
+    0x4e49714800000000, 0x0ee4097100000000, 0xce80216600000000,
+    0x8ebef80300000000, 0x4edad01400000000, 0x0e77a82d00000000,
+    0xce13803a00000000, 0x0cd372c700000000, 0xccb75ad000000000,
+    0x8c1a22e900000000, 0x4c7e0afe00000000, 0x0c40d39b00000000,
+    0xcc24fb8c00000000, 0x8c8983b500000000, 0x4cedaba200000000,
+    0x0cf5317e00000000, 0xcc91196900000000, 0x8c3c615000000000,
+    0x4c58494700000000, 0x0c66902200000000, 0xcc02b83500000000,
+    0x8cafc00c00000000, 0x4ccbe81b00000000, 0x4d99856e00000000,
+    0x8dfdad7900000000, 0xcd50d54000000000, 0x0d34fd5700000000,
+    0x4d0a243200000000, 0x8d6e0c2500000000, 0xcdc3741c00000000,
+    0x0da75c0b00000000, 0x4dbfc6d700000000, 0x8ddbeec000000000,
+    0xcd7696f900000000, 0x0d12beee00000000, 0x4d2c678b00000000,
+    0x8d484f9c00000000, 0xcde537a500000000, 0x0d811fb200000000,
+    0x0862a38500000000, 0xc8068b9200000000, 0x88abf3ab00000000,
+    0x48cfdbbc00000000, 0x08f102d900000000, 0xc8952ace00000000,
+    0x883852f700000000, 0x485c7ae000000000, 0x0844e03c00000000,
+    0xc820c82b00000000, 0x888db01200000000, 0x48e9980500000000,
+    0x08d7416000000000, 0xc8b3697700000000, 0x881e114e00000000,
+    0x487a395900000000, 0x4928542c00000000, 0x894c7c3b00000000,
+    0xc9e1040200000000, 0x09852c1500000000, 0x49bbf57000000000,
+    0x89dfdd6700000000, 0xc972a55e00000000, 0x09168d4900000000,
+    0x490e179500000000, 0x896a3f8200000000, 0xc9c747bb00000000,
+    0x09a36fac00000000, 0x499db6c900000000, 0x89f99ede00000000,
+    0xc954e6e700000000, 0x0930cef000000000, 0xcbf03c0d00000000,
+    0x0b94141a00000000, 0x4b396c2300000000, 0x8b5d443400000000,
+    0xcb639d5100000000, 0x0b07b54600000000, 0x4baacd7f00000000,
+    0x8bcee56800000000, 0xcbd67fb400000000, 0x0bb257a300000000,
+    0x4b1f2f9a00000000, 0x8b7b078d00000000, 0xcb45dee800000000,
+    0x0b21f6ff00000000, 0x4b8c8ec600000000, 0x8be8a6d100000000,
+    0x8abacba400000000, 0x4adee3b300000000, 0x0a739b8a00000000,
+    0xca17b39d00000000, 0x8a296af800000000, 0x4a4d42ef00000000,
+    0x0ae03ad600000000, 0xca8412c100000000, 0x8a9c881d00000000,
+    0x4af8a00a00000000, 0x0a55d83300000000, 0xca31f02400000000,
+    0x8a0f294100000000, 0x4a6b015600000000, 0x0ac6796f00000000,
+    0xcaa2517800000000},
+   {0x0000000000000000, 0xd4ea739b00000000, 0xe9d396ed00000000,
+    0x3d39e57600000000, 0x93a15c0000000000, 0x474b2f9b00000000,
+    0x7a72caed00000000, 0xae98b97600000000, 0x2643b90000000000,
+    0xf2a9ca9b00000000, 0xcf902fed00000000, 0x1b7a5c7600000000,
+    0xb5e2e50000000000, 0x6108969b00000000, 0x5c3173ed00000000,
+    0x88db007600000000, 0x4c86720100000000, 0x986c019a00000000,
+    0xa555e4ec00000000, 0x71bf977700000000, 0xdf272e0100000000,
+    0x0bcd5d9a00000000, 0x36f4b8ec00000000, 0xe21ecb7700000000,
+    0x6ac5cb0100000000, 0xbe2fb89a00000000, 0x83165dec00000000,
+    0x57fc2e7700000000, 0xf964970100000000, 0x2d8ee49a00000000,
+    0x10b701ec00000000, 0xc45d727700000000, 0x980ce50200000000,
+    0x4ce6969900000000, 0x71df73ef00000000, 0xa535007400000000,
+    0x0badb90200000000, 0xdf47ca9900000000, 0xe27e2fef00000000,
+    0x36945c7400000000, 0xbe4f5c0200000000, 0x6aa52f9900000000,
+    0x579ccaef00000000, 0x8376b97400000000, 0x2dee000200000000,
+    0xf904739900000000, 0xc43d96ef00000000, 0x10d7e57400000000,
+    0xd48a970300000000, 0x0060e49800000000, 0x3d5901ee00000000,
+    0xe9b3727500000000, 0x472bcb0300000000, 0x93c1b89800000000,
+    0xaef85dee00000000, 0x7a122e7500000000, 0xf2c92e0300000000,
+    0x26235d9800000000, 0x1b1ab8ee00000000, 0xcff0cb7500000000,
+    0x6168720300000000, 0xb582019800000000, 0x88bbe4ee00000000,
+    0x5c51977500000000, 0x3019ca0500000000, 0xe4f3b99e00000000,
+    0xd9ca5ce800000000, 0x0d202f7300000000, 0xa3b8960500000000,
+    0x7752e59e00000000, 0x4a6b00e800000000, 0x9e81737300000000,
+    0x165a730500000000, 0xc2b0009e00000000, 0xff89e5e800000000,
+    0x2b63967300000000, 0x85fb2f0500000000, 0x51115c9e00000000,
+    0x6c28b9e800000000, 0xb8c2ca7300000000, 0x7c9fb80400000000,
+    0xa875cb9f00000000, 0x954c2ee900000000, 0x41a65d7200000000,
+    0xef3ee40400000000, 0x3bd4979f00000000, 0x06ed72e900000000,
+    0xd207017200000000, 0x5adc010400000000, 0x8e36729f00000000,
+    0xb30f97e900000000, 0x67e5e47200000000, 0xc97d5d0400000000,
+    0x1d972e9f00000000, 0x20aecbe900000000, 0xf444b87200000000,
+    0xa8152f0700000000, 0x7cff5c9c00000000, 0x41c6b9ea00000000,
+    0x952cca7100000000, 0x3bb4730700000000, 0xef5e009c00000000,
+    0xd267e5ea00000000, 0x068d967100000000, 0x8e56960700000000,
+    0x5abce59c00000000, 0x678500ea00000000, 0xb36f737100000000,
+    0x1df7ca0700000000, 0xc91db99c00000000, 0xf4245cea00000000,
+    0x20ce2f7100000000, 0xe4935d0600000000, 0x30792e9d00000000,
+    0x0d40cbeb00000000, 0xd9aab87000000000, 0x7732010600000000,
+    0xa3d8729d00000000, 0x9ee197eb00000000, 0x4a0be47000000000,
+    0xc2d0e40600000000, 0x163a979d00000000, 0x2b0372eb00000000,
+    0xffe9017000000000, 0x5171b80600000000, 0x859bcb9d00000000,
+    0xb8a22eeb00000000, 0x6c485d7000000000, 0x6032940b00000000,
+    0xb4d8e79000000000, 0x89e102e600000000, 0x5d0b717d00000000,
+    0xf393c80b00000000, 0x2779bb9000000000, 0x1a405ee600000000,
+    0xceaa2d7d00000000, 0x46712d0b00000000, 0x929b5e9000000000,
+    0xafa2bbe600000000, 0x7b48c87d00000000, 0xd5d0710b00000000,
+    0x013a029000000000, 0x3c03e7e600000000, 0xe8e9947d00000000,
+    0x2cb4e60a00000000, 0xf85e959100000000, 0xc56770e700000000,
+    0x118d037c00000000, 0xbf15ba0a00000000, 0x6bffc99100000000,
+    0x56c62ce700000000, 0x822c5f7c00000000, 0x0af75f0a00000000,
+    0xde1d2c9100000000, 0xe324c9e700000000, 0x37ceba7c00000000,
+    0x9956030a00000000, 0x4dbc709100000000, 0x708595e700000000,
+    0xa46fe67c00000000, 0xf83e710900000000, 0x2cd4029200000000,
+    0x11ede7e400000000, 0xc507947f00000000, 0x6b9f2d0900000000,
+    0xbf755e9200000000, 0x824cbbe400000000, 0x56a6c87f00000000,
+    0xde7dc80900000000, 0x0a97bb9200000000, 0x37ae5ee400000000,
+    0xe3442d7f00000000, 0x4ddc940900000000, 0x9936e79200000000,
+    0xa40f02e400000000, 0x70e5717f00000000, 0xb4b8030800000000,
+    0x6052709300000000, 0x5d6b95e500000000, 0x8981e67e00000000,
+    0x27195f0800000000, 0xf3f32c9300000000, 0xcecac9e500000000,
+    0x1a20ba7e00000000, 0x92fbba0800000000, 0x4611c99300000000,
+    0x7b282ce500000000, 0xafc25f7e00000000, 0x015ae60800000000,
+    0xd5b0959300000000, 0xe88970e500000000, 0x3c63037e00000000,
+    0x502b5e0e00000000, 0x84c12d9500000000, 0xb9f8c8e300000000,
+    0x6d12bb7800000000, 0xc38a020e00000000, 0x1760719500000000,
+    0x2a5994e300000000, 0xfeb3e77800000000, 0x7668e70e00000000,
+    0xa282949500000000, 0x9fbb71e300000000, 0x4b51027800000000,
+    0xe5c9bb0e00000000, 0x3123c89500000000, 0x0c1a2de300000000,
+    0xd8f05e7800000000, 0x1cad2c0f00000000, 0xc8475f9400000000,
+    0xf57ebae200000000, 0x2194c97900000000, 0x8f0c700f00000000,
+    0x5be6039400000000, 0x66dfe6e200000000, 0xb235957900000000,
+    0x3aee950f00000000, 0xee04e69400000000, 0xd33d03e200000000,
+    0x07d7707900000000, 0xa94fc90f00000000, 0x7da5ba9400000000,
+    0x409c5fe200000000, 0x94762c7900000000, 0xc827bb0c00000000,
+    0x1ccdc89700000000, 0x21f42de100000000, 0xf51e5e7a00000000,
+    0x5b86e70c00000000, 0x8f6c949700000000, 0xb25571e100000000,
+    0x66bf027a00000000, 0xee64020c00000000, 0x3a8e719700000000,
+    0x07b794e100000000, 0xd35de77a00000000, 0x7dc55e0c00000000,
+    0xa92f2d9700000000, 0x9416c8e100000000, 0x40fcbb7a00000000,
+    0x84a1c90d00000000, 0x504bba9600000000, 0x6d725fe000000000,
+    0xb9982c7b00000000, 0x1700950d00000000, 0xc3eae69600000000,
+    0xfed303e000000000, 0x2a39707b00000000, 0xa2e2700d00000000,
+    0x7608039600000000, 0x4b31e6e000000000, 0x9fdb957b00000000,
+    0x31432c0d00000000, 0xe5a95f9600000000, 0xd890bae000000000,
+    0x0c7ac97b00000000},
+   {0x0000000000000000, 0x2765258100000000, 0x0fcc3bd900000000,
+    0x28a91e5800000000, 0x5f9e066900000000, 0x78fb23e800000000,
+    0x50523db000000000, 0x7737183100000000, 0xbe3c0dd200000000,
+    0x9959285300000000, 0xb1f0360b00000000, 0x9695138a00000000,
+    0xe1a20bbb00000000, 0xc6c72e3a00000000, 0xee6e306200000000,
+    0xc90b15e300000000, 0x3d7f6b7f00000000, 0x1a1a4efe00000000,
+    0x32b350a600000000, 0x15d6752700000000, 0x62e16d1600000000,
+    0x4584489700000000, 0x6d2d56cf00000000, 0x4a48734e00000000,
+    0x834366ad00000000, 0xa426432c00000000, 0x8c8f5d7400000000,
+    0xabea78f500000000, 0xdcdd60c400000000, 0xfbb8454500000000,
+    0xd3115b1d00000000, 0xf4747e9c00000000, 0x7afed6fe00000000,
+    0x5d9bf37f00000000, 0x7532ed2700000000, 0x5257c8a600000000,
+    0x2560d09700000000, 0x0205f51600000000, 0x2aaceb4e00000000,
+    0x0dc9cecf00000000, 0xc4c2db2c00000000, 0xe3a7fead00000000,
+    0xcb0ee0f500000000, 0xec6bc57400000000, 0x9b5cdd4500000000,
+    0xbc39f8c400000000, 0x9490e69c00000000, 0xb3f5c31d00000000,
+    0x4781bd8100000000, 0x60e4980000000000, 0x484d865800000000,
+    0x6f28a3d900000000, 0x181fbbe800000000, 0x3f7a9e6900000000,
+    0x17d3803100000000, 0x30b6a5b000000000, 0xf9bdb05300000000,
+    0xded895d200000000, 0xf6718b8a00000000, 0xd114ae0b00000000,
+    0xa623b63a00000000, 0x814693bb00000000, 0xa9ef8de300000000,
+    0x8e8aa86200000000, 0xb5fadc2600000000, 0x929ff9a700000000,
+    0xba36e7ff00000000, 0x9d53c27e00000000, 0xea64da4f00000000,
+    0xcd01ffce00000000, 0xe5a8e19600000000, 0xc2cdc41700000000,
+    0x0bc6d1f400000000, 0x2ca3f47500000000, 0x040aea2d00000000,
+    0x236fcfac00000000, 0x5458d79d00000000, 0x733df21c00000000,
+    0x5b94ec4400000000, 0x7cf1c9c500000000, 0x8885b75900000000,
+    0xafe092d800000000, 0x87498c8000000000, 0xa02ca90100000000,
+    0xd71bb13000000000, 0xf07e94b100000000, 0xd8d78ae900000000,
+    0xffb2af6800000000, 0x36b9ba8b00000000, 0x11dc9f0a00000000,
+    0x3975815200000000, 0x1e10a4d300000000, 0x6927bce200000000,
+    0x4e42996300000000, 0x66eb873b00000000, 0x418ea2ba00000000,
+    0xcf040ad800000000, 0xe8612f5900000000, 0xc0c8310100000000,
+    0xe7ad148000000000, 0x909a0cb100000000, 0xb7ff293000000000,
+    0x9f56376800000000, 0xb83312e900000000, 0x7138070a00000000,
+    0x565d228b00000000, 0x7ef43cd300000000, 0x5991195200000000,
+    0x2ea6016300000000, 0x09c324e200000000, 0x216a3aba00000000,
+    0x060f1f3b00000000, 0xf27b61a700000000, 0xd51e442600000000,
+    0xfdb75a7e00000000, 0xdad27fff00000000, 0xade567ce00000000,
+    0x8a80424f00000000, 0xa2295c1700000000, 0x854c799600000000,
+    0x4c476c7500000000, 0x6b2249f400000000, 0x438b57ac00000000,
+    0x64ee722d00000000, 0x13d96a1c00000000, 0x34bc4f9d00000000,
+    0x1c1551c500000000, 0x3b70744400000000, 0x6af5b94d00000000,
+    0x4d909ccc00000000, 0x6539829400000000, 0x425ca71500000000,
+    0x356bbf2400000000, 0x120e9aa500000000, 0x3aa784fd00000000,
+    0x1dc2a17c00000000, 0xd4c9b49f00000000, 0xf3ac911e00000000,
+    0xdb058f4600000000, 0xfc60aac700000000, 0x8b57b2f600000000,
+    0xac32977700000000, 0x849b892f00000000, 0xa3feacae00000000,
+    0x578ad23200000000, 0x70eff7b300000000, 0x5846e9eb00000000,
+    0x7f23cc6a00000000, 0x0814d45b00000000, 0x2f71f1da00000000,
+    0x07d8ef8200000000, 0x20bdca0300000000, 0xe9b6dfe000000000,
+    0xced3fa6100000000, 0xe67ae43900000000, 0xc11fc1b800000000,
+    0xb628d98900000000, 0x914dfc0800000000, 0xb9e4e25000000000,
+    0x9e81c7d100000000, 0x100b6fb300000000, 0x376e4a3200000000,
+    0x1fc7546a00000000, 0x38a271eb00000000, 0x4f9569da00000000,
+    0x68f04c5b00000000, 0x4059520300000000, 0x673c778200000000,
+    0xae37626100000000, 0x895247e000000000, 0xa1fb59b800000000,
+    0x869e7c3900000000, 0xf1a9640800000000, 0xd6cc418900000000,
+    0xfe655fd100000000, 0xd9007a5000000000, 0x2d7404cc00000000,
+    0x0a11214d00000000, 0x22b83f1500000000, 0x05dd1a9400000000,
+    0x72ea02a500000000, 0x558f272400000000, 0x7d26397c00000000,
+    0x5a431cfd00000000, 0x9348091e00000000, 0xb42d2c9f00000000,
+    0x9c8432c700000000, 0xbbe1174600000000, 0xccd60f7700000000,
+    0xebb32af600000000, 0xc31a34ae00000000, 0xe47f112f00000000,
+    0xdf0f656b00000000, 0xf86a40ea00000000, 0xd0c35eb200000000,
+    0xf7a67b3300000000, 0x8091630200000000, 0xa7f4468300000000,
+    0x8f5d58db00000000, 0xa8387d5a00000000, 0x613368b900000000,
+    0x46564d3800000000, 0x6eff536000000000, 0x499a76e100000000,
+    0x3ead6ed000000000, 0x19c84b5100000000, 0x3161550900000000,
+    0x1604708800000000, 0xe2700e1400000000, 0xc5152b9500000000,
+    0xedbc35cd00000000, 0xcad9104c00000000, 0xbdee087d00000000,
+    0x9a8b2dfc00000000, 0xb22233a400000000, 0x9547162500000000,
+    0x5c4c03c600000000, 0x7b29264700000000, 0x5380381f00000000,
+    0x74e51d9e00000000, 0x03d205af00000000, 0x24b7202e00000000,
+    0x0c1e3e7600000000, 0x2b7b1bf700000000, 0xa5f1b39500000000,
+    0x8294961400000000, 0xaa3d884c00000000, 0x8d58adcd00000000,
+    0xfa6fb5fc00000000, 0xdd0a907d00000000, 0xf5a38e2500000000,
+    0xd2c6aba400000000, 0x1bcdbe4700000000, 0x3ca89bc600000000,
+    0x1401859e00000000, 0x3364a01f00000000, 0x4453b82e00000000,
+    0x63369daf00000000, 0x4b9f83f700000000, 0x6cfaa67600000000,
+    0x988ed8ea00000000, 0xbfebfd6b00000000, 0x9742e33300000000,
+    0xb027c6b200000000, 0xc710de8300000000, 0xe075fb0200000000,
+    0xc8dce55a00000000, 0xefb9c0db00000000, 0x26b2d53800000000,
+    0x01d7f0b900000000, 0x297eeee100000000, 0x0e1bcb6000000000,
+    0x792cd35100000000, 0x5e49f6d000000000, 0x76e0e88800000000,
+    0x5185cd0900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43147b17, 0x8628f62e, 0xc53c8d39, 0x0c51ec5d,
+    0x4f45974a, 0x8a791a73, 0xc96d6164, 0x18a2d8bb, 0x5bb6a3ac,
+    0x9e8a2e95, 0xdd9e5582, 0x14f334e6, 0x57e74ff1, 0x92dbc2c8,
+    0xd1cfb9df, 0x7142c0ac, 0x3256bbbb, 0xf76a3682, 0xb47e4d95,
+    0x7d132cf1, 0x3e0757e6, 0xfb3bdadf, 0xb82fa1c8, 0x69e01817,
+    0x2af46300, 0xefc8ee39, 0xacdc952e, 0x65b1f44a, 0x26a58f5d,
+    0xe3990264, 0xa08d7973, 0xa382f182, 0xe0968a95, 0x25aa07ac,
+    0x66be7cbb, 0xafd31ddf, 0xecc766c8, 0x29fbebf1, 0x6aef90e6,
+    0xbb202939, 0xf834522e, 0x3d08df17, 0x7e1ca400, 0xb771c564,
+    0xf465be73, 0x3159334a, 0x724d485d, 0xd2c0312e, 0x91d44a39,
+    0x54e8c700, 0x17fcbc17, 0xde91dd73, 0x9d85a664, 0x58b92b5d,
+    0x1bad504a, 0xca62e995, 0x89769282, 0x4c4a1fbb, 0x0f5e64ac,
+    0xc63305c8, 0x85277edf, 0x401bf3e6, 0x030f88f1, 0x070392de,
+    0x4417e9c9, 0x812b64f0, 0xc23f1fe7, 0x0b527e83, 0x48460594,
+    0x8d7a88ad, 0xce6ef3ba, 0x1fa14a65, 0x5cb53172, 0x9989bc4b,
+    0xda9dc75c, 0x13f0a638, 0x50e4dd2f, 0x95d85016, 0xd6cc2b01,
+    0x76415272, 0x35552965, 0xf069a45c, 0xb37ddf4b, 0x7a10be2f,
+    0x3904c538, 0xfc384801, 0xbf2c3316, 0x6ee38ac9, 0x2df7f1de,
+    0xe8cb7ce7, 0xabdf07f0, 0x62b26694, 0x21a61d83, 0xe49a90ba,
+    0xa78eebad, 0xa481635c, 0xe795184b, 0x22a99572, 0x61bdee65,
+    0xa8d08f01, 0xebc4f416, 0x2ef8792f, 0x6dec0238, 0xbc23bbe7,
+    0xff37c0f0, 0x3a0b4dc9, 0x791f36de, 0xb07257ba, 0xf3662cad,
+    0x365aa194, 0x754eda83, 0xd5c3a3f0, 0x96d7d8e7, 0x53eb55de,
+    0x10ff2ec9, 0xd9924fad, 0x9a8634ba, 0x5fbab983, 0x1caec294,
+    0xcd617b4b, 0x8e75005c, 0x4b498d65, 0x085df672, 0xc1309716,
+    0x8224ec01, 0x47186138, 0x040c1a2f, 0x4f005566, 0x0c142e71,
+    0xc928a348, 0x8a3cd85f, 0x4351b93b, 0x0045c22c, 0xc5794f15,
+    0x866d3402, 0x57a28ddd, 0x14b6f6ca, 0xd18a7bf3, 0x929e00e4,
+    0x5bf36180, 0x18e71a97, 0xdddb97ae, 0x9ecfecb9, 0x3e4295ca,
+    0x7d56eedd, 0xb86a63e4, 0xfb7e18f3, 0x32137997, 0x71070280,
+    0xb43b8fb9, 0xf72ff4ae, 0x26e04d71, 0x65f43666, 0xa0c8bb5f,
+    0xe3dcc048, 0x2ab1a12c, 0x69a5da3b, 0xac995702, 0xef8d2c15,
+    0xec82a4e4, 0xaf96dff3, 0x6aaa52ca, 0x29be29dd, 0xe0d348b9,
+    0xa3c733ae, 0x66fbbe97, 0x25efc580, 0xf4207c5f, 0xb7340748,
+    0x72088a71, 0x311cf166, 0xf8719002, 0xbb65eb15, 0x7e59662c,
+    0x3d4d1d3b, 0x9dc06448, 0xded41f5f, 0x1be89266, 0x58fce971,
+    0x91918815, 0xd285f302, 0x17b97e3b, 0x54ad052c, 0x8562bcf3,
+    0xc676c7e4, 0x034a4add, 0x405e31ca, 0x893350ae, 0xca272bb9,
+    0x0f1ba680, 0x4c0fdd97, 0x4803c7b8, 0x0b17bcaf, 0xce2b3196,
+    0x8d3f4a81, 0x44522be5, 0x074650f2, 0xc27addcb, 0x816ea6dc,
+    0x50a11f03, 0x13b56414, 0xd689e92d, 0x959d923a, 0x5cf0f35e,
+    0x1fe48849, 0xdad80570, 0x99cc7e67, 0x39410714, 0x7a557c03,
+    0xbf69f13a, 0xfc7d8a2d, 0x3510eb49, 0x7604905e, 0xb3381d67,
+    0xf02c6670, 0x21e3dfaf, 0x62f7a4b8, 0xa7cb2981, 0xe4df5296,
+    0x2db233f2, 0x6ea648e5, 0xab9ac5dc, 0xe88ebecb, 0xeb81363a,
+    0xa8954d2d, 0x6da9c014, 0x2ebdbb03, 0xe7d0da67, 0xa4c4a170,
+    0x61f82c49, 0x22ec575e, 0xf323ee81, 0xb0379596, 0x750b18af,
+    0x361f63b8, 0xff7202dc, 0xbc6679cb, 0x795af4f2, 0x3a4e8fe5,
+    0x9ac3f696, 0xd9d78d81, 0x1ceb00b8, 0x5fff7baf, 0x96921acb,
+    0xd58661dc, 0x10baece5, 0x53ae97f2, 0x82612e2d, 0xc175553a,
+    0x0449d803, 0x475da314, 0x8e30c270, 0xcd24b967, 0x0818345e,
+    0x4b0c4f49},
+   {0x00000000, 0x3e6bc2ef, 0x3dd0f504, 0x03bb37eb, 0x7aa0eb09,
+    0x44cb29e6, 0x47701e0d, 0x791bdce2, 0xf440d713, 0xca2b15fc,
+    0xc9902217, 0xf7fbe0f8, 0x8ee03c1a, 0xb08bfef5, 0xb330c91e,
+    0x8d5b0bf1, 0xe881ae27, 0xd6ea6cc8, 0xd5515b23, 0xeb3a99cc,
+    0x9221452e, 0xac4a87c1, 0xaff1b02a, 0x919a72c5, 0x1cc17934,
+    0x22aabbdb, 0x21118c30, 0x1f7a4edf, 0x6661923d, 0x580a50d2,
+    0x5bb16739, 0x65daa5d6, 0xd0035d4f, 0xee689fa0, 0xedd3a84b,
+    0xd3b86aa4, 0xaaa3b646, 0x94c874a9, 0x97734342, 0xa91881ad,
+    0x24438a5c, 0x1a2848b3, 0x19937f58, 0x27f8bdb7, 0x5ee36155,
+    0x6088a3ba, 0x63339451, 0x5d5856be, 0x3882f368, 0x06e93187,
+    0x0552066c, 0x3b39c483, 0x42221861, 0x7c49da8e, 0x7ff2ed65,
+    0x41992f8a, 0xccc2247b, 0xf2a9e694, 0xf112d17f, 0xcf791390,
+    0xb662cf72, 0x88090d9d, 0x8bb23a76, 0xb5d9f899, 0xa007ba9e,
+    0x9e6c7871, 0x9dd74f9a, 0xa3bc8d75, 0xdaa75197, 0xe4cc9378,
+    0xe777a493, 0xd91c667c, 0x54476d8d, 0x6a2caf62, 0x69979889,
+    0x57fc5a66, 0x2ee78684, 0x108c446b, 0x13377380, 0x2d5cb16f,
+    0x488614b9, 0x76edd656, 0x7556e1bd, 0x4b3d2352, 0x3226ffb0,
+    0x0c4d3d5f, 0x0ff60ab4, 0x319dc85b, 0xbcc6c3aa, 0x82ad0145,
+    0x811636ae, 0xbf7df441, 0xc66628a3, 0xf80dea4c, 0xfbb6dda7,
+    0xc5dd1f48, 0x7004e7d1, 0x4e6f253e, 0x4dd412d5, 0x73bfd03a,
+    0x0aa40cd8, 0x34cfce37, 0x3774f9dc, 0x091f3b33, 0x844430c2,
+    0xba2ff22d, 0xb994c5c6, 0x87ff0729, 0xfee4dbcb, 0xc08f1924,
+    0xc3342ecf, 0xfd5fec20, 0x988549f6, 0xa6ee8b19, 0xa555bcf2,
+    0x9b3e7e1d, 0xe225a2ff, 0xdc4e6010, 0xdff557fb, 0xe19e9514,
+    0x6cc59ee5, 0x52ae5c0a, 0x51156be1, 0x6f7ea90e, 0x166575ec,
+    0x280eb703, 0x2bb580e8, 0x15de4207, 0x010905e6, 0x3f62c709,
+    0x3cd9f0e2, 0x02b2320d, 0x7ba9eeef, 0x45c22c00, 0x46791beb,
+    0x7812d904, 0xf549d2f5, 0xcb22101a, 0xc89927f1, 0xf6f2e51e,
+    0x8fe939fc, 0xb182fb13, 0xb239ccf8, 0x8c520e17, 0xe988abc1,
+    0xd7e3692e, 0xd4585ec5, 0xea339c2a, 0x932840c8, 0xad438227,
+    0xaef8b5cc, 0x90937723, 0x1dc87cd2, 0x23a3be3d, 0x201889d6,
+    0x1e734b39, 0x676897db, 0x59035534, 0x5ab862df, 0x64d3a030,
+    0xd10a58a9, 0xef619a46, 0xecdaadad, 0xd2b16f42, 0xabaab3a0,
+    0x95c1714f, 0x967a46a4, 0xa811844b, 0x254a8fba, 0x1b214d55,
+    0x189a7abe, 0x26f1b851, 0x5fea64b3, 0x6181a65c, 0x623a91b7,
+    0x5c515358, 0x398bf68e, 0x07e03461, 0x045b038a, 0x3a30c165,
+    0x432b1d87, 0x7d40df68, 0x7efbe883, 0x40902a6c, 0xcdcb219d,
+    0xf3a0e372, 0xf01bd499, 0xce701676, 0xb76bca94, 0x8900087b,
+    0x8abb3f90, 0xb4d0fd7f, 0xa10ebf78, 0x9f657d97, 0x9cde4a7c,
+    0xa2b58893, 0xdbae5471, 0xe5c5969e, 0xe67ea175, 0xd815639a,
+    0x554e686b, 0x6b25aa84, 0x689e9d6f, 0x56f55f80, 0x2fee8362,
+    0x1185418d, 0x123e7666, 0x2c55b489, 0x498f115f, 0x77e4d3b0,
+    0x745fe45b, 0x4a3426b4, 0x332ffa56, 0x0d4438b9, 0x0eff0f52,
+    0x3094cdbd, 0xbdcfc64c, 0x83a404a3, 0x801f3348, 0xbe74f1a7,
+    0xc76f2d45, 0xf904efaa, 0xfabfd841, 0xc4d41aae, 0x710de237,
+    0x4f6620d8, 0x4cdd1733, 0x72b6d5dc, 0x0bad093e, 0x35c6cbd1,
+    0x367dfc3a, 0x08163ed5, 0x854d3524, 0xbb26f7cb, 0xb89dc020,
+    0x86f602cf, 0xffedde2d, 0xc1861cc2, 0xc23d2b29, 0xfc56e9c6,
+    0x998c4c10, 0xa7e78eff, 0xa45cb914, 0x9a377bfb, 0xe32ca719,
+    0xdd4765f6, 0xdefc521d, 0xe09790f2, 0x6dcc9b03, 0x53a759ec,
+    0x501c6e07, 0x6e77ace8, 0x176c700a, 0x2907b2e5, 0x2abc850e,
+    0x14d747e1},
+   {0x00000000, 0xc0df8ec1, 0xc1b96c58, 0x0166e299, 0x8273d9b0,
+    0x42ac5771, 0x43cab5e8, 0x83153b29, 0x45e1c3ba, 0x853e4d7b,
+    0x8458afe2, 0x44872123, 0xc7921a0a, 0x074d94cb, 0x062b7652,
+    0xc6f4f893, 0xcbc4f6ae, 0x0b1b786f, 0x0a7d9af6, 0xcaa21437,
+    0x49b72f1e, 0x8968a1df, 0x880e4346, 0x48d1cd87, 0x8e253514,
+    0x4efabbd5, 0x4f9c594c, 0x8f43d78d, 0x0c56eca4, 0xcc896265,
+    0xcdef80fc, 0x0d300e3d, 0xd78f9c86, 0x17501247, 0x1636f0de,
+    0xd6e97e1f, 0x55fc4536, 0x9523cbf7, 0x9445296e, 0x549aa7af,
+    0x926e5f3c, 0x52b1d1fd, 0x53d73364, 0x9308bda5, 0x101d868c,
+    0xd0c2084d, 0xd1a4ead4, 0x117b6415, 0x1c4b6a28, 0xdc94e4e9,
+    0xddf20670, 0x1d2d88b1, 0x9e38b398, 0x5ee73d59, 0x5f81dfc0,
+    0x9f5e5101, 0x59aaa992, 0x99752753, 0x9813c5ca, 0x58cc4b0b,
+    0xdbd97022, 0x1b06fee3, 0x1a601c7a, 0xdabf92bb, 0xef1948d6,
+    0x2fc6c617, 0x2ea0248e, 0xee7faa4f, 0x6d6a9166, 0xadb51fa7,
+    0xacd3fd3e, 0x6c0c73ff, 0xaaf88b6c, 0x6a2705ad, 0x6b41e734,
+    0xab9e69f5, 0x288b52dc, 0xe854dc1d, 0xe9323e84, 0x29edb045,
+    0x24ddbe78, 0xe40230b9, 0xe564d220, 0x25bb5ce1, 0xa6ae67c8,
+    0x6671e909, 0x67170b90, 0xa7c88551, 0x613c7dc2, 0xa1e3f303,
+    0xa085119a, 0x605a9f5b, 0xe34fa472, 0x23902ab3, 0x22f6c82a,
+    0xe22946eb, 0x3896d450, 0xf8495a91, 0xf92fb808, 0x39f036c9,
+    0xbae50de0, 0x7a3a8321, 0x7b5c61b8, 0xbb83ef79, 0x7d7717ea,
+    0xbda8992b, 0xbcce7bb2, 0x7c11f573, 0xff04ce5a, 0x3fdb409b,
+    0x3ebda202, 0xfe622cc3, 0xf35222fe, 0x338dac3f, 0x32eb4ea6,
+    0xf234c067, 0x7121fb4e, 0xb1fe758f, 0xb0989716, 0x704719d7,
+    0xb6b3e144, 0x766c6f85, 0x770a8d1c, 0xb7d503dd, 0x34c038f4,
+    0xf41fb635, 0xf57954ac, 0x35a6da6d, 0x9f35e177, 0x5fea6fb6,
+    0x5e8c8d2f, 0x9e5303ee, 0x1d4638c7, 0xdd99b606, 0xdcff549f,
+    0x1c20da5e, 0xdad422cd, 0x1a0bac0c, 0x1b6d4e95, 0xdbb2c054,
+    0x58a7fb7d, 0x987875bc, 0x991e9725, 0x59c119e4, 0x54f117d9,
+    0x942e9918, 0x95487b81, 0x5597f540, 0xd682ce69, 0x165d40a8,
+    0x173ba231, 0xd7e42cf0, 0x1110d463, 0xd1cf5aa2, 0xd0a9b83b,
+    0x107636fa, 0x93630dd3, 0x53bc8312, 0x52da618b, 0x9205ef4a,
+    0x48ba7df1, 0x8865f330, 0x890311a9, 0x49dc9f68, 0xcac9a441,
+    0x0a162a80, 0x0b70c819, 0xcbaf46d8, 0x0d5bbe4b, 0xcd84308a,
+    0xcce2d213, 0x0c3d5cd2, 0x8f2867fb, 0x4ff7e93a, 0x4e910ba3,
+    0x8e4e8562, 0x837e8b5f, 0x43a1059e, 0x42c7e707, 0x821869c6,
+    0x010d52ef, 0xc1d2dc2e, 0xc0b43eb7, 0x006bb076, 0xc69f48e5,
+    0x0640c624, 0x072624bd, 0xc7f9aa7c, 0x44ec9155, 0x84331f94,
+    0x8555fd0d, 0x458a73cc, 0x702ca9a1, 0xb0f32760, 0xb195c5f9,
+    0x714a4b38, 0xf25f7011, 0x3280fed0, 0x33e61c49, 0xf3399288,
+    0x35cd6a1b, 0xf512e4da, 0xf4740643, 0x34ab8882, 0xb7beb3ab,
+    0x77613d6a, 0x7607dff3, 0xb6d85132, 0xbbe85f0f, 0x7b37d1ce,
+    0x7a513357, 0xba8ebd96, 0x399b86bf, 0xf944087e, 0xf822eae7,
+    0x38fd6426, 0xfe099cb5, 0x3ed61274, 0x3fb0f0ed, 0xff6f7e2c,
+    0x7c7a4505, 0xbca5cbc4, 0xbdc3295d, 0x7d1ca79c, 0xa7a33527,
+    0x677cbbe6, 0x661a597f, 0xa6c5d7be, 0x25d0ec97, 0xe50f6256,
+    0xe46980cf, 0x24b60e0e, 0xe242f69d, 0x229d785c, 0x23fb9ac5,
+    0xe3241404, 0x60312f2d, 0xa0eea1ec, 0xa1884375, 0x6157cdb4,
+    0x6c67c389, 0xacb84d48, 0xaddeafd1, 0x6d012110, 0xee141a39,
+    0x2ecb94f8, 0x2fad7661, 0xef72f8a0, 0x29860033, 0xe9598ef2,
+    0xe83f6c6b, 0x28e0e2aa, 0xabf5d983, 0x6b2a5742, 0x6a4cb5db,
+    0xaa933b1a},
+   {0x00000000, 0x6f4ca59b, 0x9f9e3bec, 0xf0d29e77, 0x7f3b0603,
+    0x1077a398, 0xe0a53def, 0x8fe99874, 0xfe760c06, 0x913aa99d,
+    0x61e837ea, 0x0ea49271, 0x814d0a05, 0xee01af9e, 0x1ed331e9,
+    0x719f9472, 0xfced180c, 0x93a1bd97, 0x637323e0, 0x0c3f867b,
+    0x83d61e0f, 0xec9abb94, 0x1c4825e3, 0x73048078, 0x029b140a,
+    0x6dd7b191, 0x9d052fe6, 0xf2498a7d, 0x7da01209, 0x12ecb792,
+    0xe23e29e5, 0x8d728c7e, 0xf8db3118, 0x97979483, 0x67450af4,
+    0x0809af6f, 0x87e0371b, 0xe8ac9280, 0x187e0cf7, 0x7732a96c,
+    0x06ad3d1e, 0x69e19885, 0x993306f2, 0xf67fa369, 0x79963b1d,
+    0x16da9e86, 0xe60800f1, 0x8944a56a, 0x04362914, 0x6b7a8c8f,
+    0x9ba812f8, 0xf4e4b763, 0x7b0d2f17, 0x14418a8c, 0xe49314fb,
+    0x8bdfb160, 0xfa402512, 0x950c8089, 0x65de1efe, 0x0a92bb65,
+    0x857b2311, 0xea37868a, 0x1ae518fd, 0x75a9bd66, 0xf0b76330,
+    0x9ffbc6ab, 0x6f2958dc, 0x0065fd47, 0x8f8c6533, 0xe0c0c0a8,
+    0x10125edf, 0x7f5efb44, 0x0ec16f36, 0x618dcaad, 0x915f54da,
+    0xfe13f141, 0x71fa6935, 0x1eb6ccae, 0xee6452d9, 0x8128f742,
+    0x0c5a7b3c, 0x6316dea7, 0x93c440d0, 0xfc88e54b, 0x73617d3f,
+    0x1c2dd8a4, 0xecff46d3, 0x83b3e348, 0xf22c773a, 0x9d60d2a1,
+    0x6db24cd6, 0x02fee94d, 0x8d177139, 0xe25bd4a2, 0x12894ad5,
+    0x7dc5ef4e, 0x086c5228, 0x6720f7b3, 0x97f269c4, 0xf8becc5f,
+    0x7757542b, 0x181bf1b0, 0xe8c96fc7, 0x8785ca5c, 0xf61a5e2e,
+    0x9956fbb5, 0x698465c2, 0x06c8c059, 0x8921582d, 0xe66dfdb6,
+    0x16bf63c1, 0x79f3c65a, 0xf4814a24, 0x9bcdefbf, 0x6b1f71c8,
+    0x0453d453, 0x8bba4c27, 0xe4f6e9bc, 0x142477cb, 0x7b68d250,
+    0x0af74622, 0x65bbe3b9, 0x95697dce, 0xfa25d855, 0x75cc4021,
+    0x1a80e5ba, 0xea527bcd, 0x851ede56, 0xe06fc760, 0x8f2362fb,
+    0x7ff1fc8c, 0x10bd5917, 0x9f54c163, 0xf01864f8, 0x00cafa8f,
+    0x6f865f14, 0x1e19cb66, 0x71556efd, 0x8187f08a, 0xeecb5511,
+    0x6122cd65, 0x0e6e68fe, 0xfebcf689, 0x91f05312, 0x1c82df6c,
+    0x73ce7af7, 0x831ce480, 0xec50411b, 0x63b9d96f, 0x0cf57cf4,
+    0xfc27e283, 0x936b4718, 0xe2f4d36a, 0x8db876f1, 0x7d6ae886,
+    0x12264d1d, 0x9dcfd569, 0xf28370f2, 0x0251ee85, 0x6d1d4b1e,
+    0x18b4f678, 0x77f853e3, 0x872acd94, 0xe866680f, 0x678ff07b,
+    0x08c355e0, 0xf811cb97, 0x975d6e0c, 0xe6c2fa7e, 0x898e5fe5,
+    0x795cc192, 0x16106409, 0x99f9fc7d, 0xf6b559e6, 0x0667c791,
+    0x692b620a, 0xe459ee74, 0x8b154bef, 0x7bc7d598, 0x148b7003,
+    0x9b62e877, 0xf42e4dec, 0x04fcd39b, 0x6bb07600, 0x1a2fe272,
+    0x756347e9, 0x85b1d99e, 0xeafd7c05, 0x6514e471, 0x0a5841ea,
+    0xfa8adf9d, 0x95c67a06, 0x10d8a450, 0x7f9401cb, 0x8f469fbc,
+    0xe00a3a27, 0x6fe3a253, 0x00af07c8, 0xf07d99bf, 0x9f313c24,
+    0xeeaea856, 0x81e20dcd, 0x713093ba, 0x1e7c3621, 0x9195ae55,
+    0xfed90bce, 0x0e0b95b9, 0x61473022, 0xec35bc5c, 0x837919c7,
+    0x73ab87b0, 0x1ce7222b, 0x930eba5f, 0xfc421fc4, 0x0c9081b3,
+    0x63dc2428, 0x1243b05a, 0x7d0f15c1, 0x8ddd8bb6, 0xe2912e2d,
+    0x6d78b659, 0x023413c2, 0xf2e68db5, 0x9daa282e, 0xe8039548,
+    0x874f30d3, 0x779daea4, 0x18d10b3f, 0x9738934b, 0xf87436d0,
+    0x08a6a8a7, 0x67ea0d3c, 0x1675994e, 0x79393cd5, 0x89eba2a2,
+    0xe6a70739, 0x694e9f4d, 0x06023ad6, 0xf6d0a4a1, 0x999c013a,
+    0x14ee8d44, 0x7ba228df, 0x8b70b6a8, 0xe43c1333, 0x6bd58b47,
+    0x04992edc, 0xf44bb0ab, 0x9b071530, 0xea988142, 0x85d424d9,
+    0x7506baae, 0x1a4a1f35, 0x95a38741, 0xfaef22da, 0x0a3dbcad,
+    0x65711936}};
+
+#endif
+
+#endif
+
+#if N == 4
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xf1da05aa, 0x38c50d15, 0xc91f08bf, 0x718a1a2a,
+    0x80501f80, 0x494f173f, 0xb8951295, 0xe3143454, 0x12ce31fe,
+    0xdbd13941, 0x2a0b3ceb, 0x929e2e7e, 0x63442bd4, 0xaa5b236b,
+    0x5b8126c1, 0x1d596ee9, 0xec836b43, 0x259c63fc, 0xd4466656,
+    0x6cd374c3, 0x9d097169, 0x541679d6, 0xa5cc7c7c, 0xfe4d5abd,
+    0x0f975f17, 0xc68857a8, 0x37525202, 0x8fc74097, 0x7e1d453d,
+    0xb7024d82, 0x46d84828, 0x3ab2ddd2, 0xcb68d878, 0x0277d0c7,
+    0xf3add56d, 0x4b38c7f8, 0xbae2c252, 0x73fdcaed, 0x8227cf47,
+    0xd9a6e986, 0x287cec2c, 0xe163e493, 0x10b9e139, 0xa82cf3ac,
+    0x59f6f606, 0x90e9feb9, 0x6133fb13, 0x27ebb33b, 0xd631b691,
+    0x1f2ebe2e, 0xeef4bb84, 0x5661a911, 0xa7bbacbb, 0x6ea4a404,
+    0x9f7ea1ae, 0xc4ff876f, 0x352582c5, 0xfc3a8a7a, 0x0de08fd0,
+    0xb5759d45, 0x44af98ef, 0x8db09050, 0x7c6a95fa, 0x7565bba4,
+    0x84bfbe0e, 0x4da0b6b1, 0xbc7ab31b, 0x04efa18e, 0xf535a424,
+    0x3c2aac9b, 0xcdf0a931, 0x96718ff0, 0x67ab8a5a, 0xaeb482e5,
+    0x5f6e874f, 0xe7fb95da, 0x16219070, 0xdf3e98cf, 0x2ee49d65,
+    0x683cd54d, 0x99e6d0e7, 0x50f9d858, 0xa123ddf2, 0x19b6cf67,
+    0xe86ccacd, 0x2173c272, 0xd0a9c7d8, 0x8b28e119, 0x7af2e4b3,
+    0xb3edec0c, 0x4237e9a6, 0xfaa2fb33, 0x0b78fe99, 0xc267f626,
+    0x33bdf38c, 0x4fd76676, 0xbe0d63dc, 0x77126b63, 0x86c86ec9,
+    0x3e5d7c5c, 0xcf8779f6, 0x06987149, 0xf74274e3, 0xacc35222,
+    0x5d195788, 0x94065f37, 0x65dc5a9d, 0xdd494808, 0x2c934da2,
+    0xe58c451d, 0x145640b7, 0x528e089f, 0xa3540d35, 0x6a4b058a,
+    0x9b910020, 0x230412b5, 0xd2de171f, 0x1bc11fa0, 0xea1b1a0a,
+    0xb19a3ccb, 0x40403961, 0x895f31de, 0x78853474, 0xc01026e1,
+    0x31ca234b, 0xf8d52bf4, 0x090f2e5e, 0xeacb7748, 0x1b1172e2,
+    0xd20e7a5d, 0x23d47ff7, 0x9b416d62, 0x6a9b68c8, 0xa3846077,
+    0x525e65dd, 0x09df431c, 0xf80546b6, 0x311a4e09, 0xc0c04ba3,
+    0x78555936, 0x898f5c9c, 0x40905423, 0xb14a5189, 0xf79219a1,
+    0x06481c0b, 0xcf5714b4, 0x3e8d111e, 0x8618038b, 0x77c20621,
+    0xbedd0e9e, 0x4f070b34, 0x14862df5, 0xe55c285f, 0x2c4320e0,
+    0xdd99254a, 0x650c37df, 0x94d63275, 0x5dc93aca, 0xac133f60,
+    0xd079aa9a, 0x21a3af30, 0xe8bca78f, 0x1966a225, 0xa1f3b0b0,
+    0x5029b51a, 0x9936bda5, 0x68ecb80f, 0x336d9ece, 0xc2b79b64,
+    0x0ba893db, 0xfa729671, 0x42e784e4, 0xb33d814e, 0x7a2289f1,
+    0x8bf88c5b, 0xcd20c473, 0x3cfac1d9, 0xf5e5c966, 0x043fcccc,
+    0xbcaade59, 0x4d70dbf3, 0x846fd34c, 0x75b5d6e6, 0x2e34f027,
+    0xdfeef58d, 0x16f1fd32, 0xe72bf898, 0x5fbeea0d, 0xae64efa7,
+    0x677be718, 0x96a1e2b2, 0x9faeccec, 0x6e74c946, 0xa76bc1f9,
+    0x56b1c453, 0xee24d6c6, 0x1ffed36c, 0xd6e1dbd3, 0x273bde79,
+    0x7cbaf8b8, 0x8d60fd12, 0x447ff5ad, 0xb5a5f007, 0x0d30e292,
+    0xfceae738, 0x35f5ef87, 0xc42fea2d, 0x82f7a205, 0x732da7af,
+    0xba32af10, 0x4be8aaba, 0xf37db82f, 0x02a7bd85, 0xcbb8b53a,
+    0x3a62b090, 0x61e39651, 0x903993fb, 0x59269b44, 0xa8fc9eee,
+    0x10698c7b, 0xe1b389d1, 0x28ac816e, 0xd97684c4, 0xa51c113e,
+    0x54c61494, 0x9dd91c2b, 0x6c031981, 0xd4960b14, 0x254c0ebe,
+    0xec530601, 0x1d8903ab, 0x4608256a, 0xb7d220c0, 0x7ecd287f,
+    0x8f172dd5, 0x37823f40, 0xc6583aea, 0x0f473255, 0xfe9d37ff,
+    0xb8457fd7, 0x499f7a7d, 0x808072c2, 0x715a7768, 0xc9cf65fd,
+    0x38156057, 0xf10a68e8, 0x00d06d42, 0x5b514b83, 0xaa8b4e29,
+    0x63944696, 0x924e433c, 0x2adb51a9, 0xdb015403, 0x121e5cbc,
+    0xe3c45916},
+   {0x00000000, 0x0ee7e8d1, 0x1dcfd1a2, 0x13283973, 0x3b9fa344,
+    0x35784b95, 0x265072e6, 0x28b79a37, 0x773f4688, 0x79d8ae59,
+    0x6af0972a, 0x64177ffb, 0x4ca0e5cc, 0x42470d1d, 0x516f346e,
+    0x5f88dcbf, 0xee7e8d10, 0xe09965c1, 0xf3b15cb2, 0xfd56b463,
+    0xd5e12e54, 0xdb06c685, 0xc82efff6, 0xc6c91727, 0x9941cb98,
+    0x97a62349, 0x848e1a3a, 0x8a69f2eb, 0xa2de68dc, 0xac39800d,
+    0xbf11b97e, 0xb1f651af, 0x078c1c61, 0x096bf4b0, 0x1a43cdc3,
+    0x14a42512, 0x3c13bf25, 0x32f457f4, 0x21dc6e87, 0x2f3b8656,
+    0x70b35ae9, 0x7e54b238, 0x6d7c8b4b, 0x639b639a, 0x4b2cf9ad,
+    0x45cb117c, 0x56e3280f, 0x5804c0de, 0xe9f29171, 0xe71579a0,
+    0xf43d40d3, 0xfadaa802, 0xd26d3235, 0xdc8adae4, 0xcfa2e397,
+    0xc1450b46, 0x9ecdd7f9, 0x902a3f28, 0x8302065b, 0x8de5ee8a,
+    0xa55274bd, 0xabb59c6c, 0xb89da51f, 0xb67a4dce, 0x0f1838c2,
+    0x01ffd013, 0x12d7e960, 0x1c3001b1, 0x34879b86, 0x3a607357,
+    0x29484a24, 0x27afa2f5, 0x78277e4a, 0x76c0969b, 0x65e8afe8,
+    0x6b0f4739, 0x43b8dd0e, 0x4d5f35df, 0x5e770cac, 0x5090e47d,
+    0xe166b5d2, 0xef815d03, 0xfca96470, 0xf24e8ca1, 0xdaf91696,
+    0xd41efe47, 0xc736c734, 0xc9d12fe5, 0x9659f35a, 0x98be1b8b,
+    0x8b9622f8, 0x8571ca29, 0xadc6501e, 0xa321b8cf, 0xb00981bc,
+    0xbeee696d, 0x089424a3, 0x0673cc72, 0x155bf501, 0x1bbc1dd0,
+    0x330b87e7, 0x3dec6f36, 0x2ec45645, 0x2023be94, 0x7fab622b,
+    0x714c8afa, 0x6264b389, 0x6c835b58, 0x4434c16f, 0x4ad329be,
+    0x59fb10cd, 0x571cf81c, 0xe6eaa9b3, 0xe80d4162, 0xfb257811,
+    0xf5c290c0, 0xdd750af7, 0xd392e226, 0xc0badb55, 0xce5d3384,
+    0x91d5ef3b, 0x9f3207ea, 0x8c1a3e99, 0x82fdd648, 0xaa4a4c7f,
+    0xa4ada4ae, 0xb7859ddd, 0xb962750c, 0x1e307184, 0x10d79955,
+    0x03ffa026, 0x0d1848f7, 0x25afd2c0, 0x2b483a11, 0x38600362,
+    0x3687ebb3, 0x690f370c, 0x67e8dfdd, 0x74c0e6ae, 0x7a270e7f,
+    0x52909448, 0x5c777c99, 0x4f5f45ea, 0x41b8ad3b, 0xf04efc94,
+    0xfea91445, 0xed812d36, 0xe366c5e7, 0xcbd15fd0, 0xc536b701,
+    0xd61e8e72, 0xd8f966a3, 0x8771ba1c, 0x899652cd, 0x9abe6bbe,
+    0x9459836f, 0xbcee1958, 0xb209f189, 0xa121c8fa, 0xafc6202b,
+    0x19bc6de5, 0x175b8534, 0x0473bc47, 0x0a945496, 0x2223cea1,
+    0x2cc42670, 0x3fec1f03, 0x310bf7d2, 0x6e832b6d, 0x6064c3bc,
+    0x734cfacf, 0x7dab121e, 0x551c8829, 0x5bfb60f8, 0x48d3598b,
+    0x4634b15a, 0xf7c2e0f5, 0xf9250824, 0xea0d3157, 0xe4ead986,
+    0xcc5d43b1, 0xc2baab60, 0xd1929213, 0xdf757ac2, 0x80fda67d,
+    0x8e1a4eac, 0x9d3277df, 0x93d59f0e, 0xbb620539, 0xb585ede8,
+    0xa6add49b, 0xa84a3c4a, 0x11284946, 0x1fcfa197, 0x0ce798e4,
+    0x02007035, 0x2ab7ea02, 0x245002d3, 0x37783ba0, 0x399fd371,
+    0x66170fce, 0x68f0e71f, 0x7bd8de6c, 0x753f36bd, 0x5d88ac8a,
+    0x536f445b, 0x40477d28, 0x4ea095f9, 0xff56c456, 0xf1b12c87,
+    0xe29915f4, 0xec7efd25, 0xc4c96712, 0xca2e8fc3, 0xd906b6b0,
+    0xd7e15e61, 0x886982de, 0x868e6a0f, 0x95a6537c, 0x9b41bbad,
+    0xb3f6219a, 0xbd11c94b, 0xae39f038, 0xa0de18e9, 0x16a45527,
+    0x1843bdf6, 0x0b6b8485, 0x058c6c54, 0x2d3bf663, 0x23dc1eb2,
+    0x30f427c1, 0x3e13cf10, 0x619b13af, 0x6f7cfb7e, 0x7c54c20d,
+    0x72b32adc, 0x5a04b0eb, 0x54e3583a, 0x47cb6149, 0x492c8998,
+    0xf8dad837, 0xf63d30e6, 0xe5150995, 0xebf2e144, 0xc3457b73,
+    0xcda293a2, 0xde8aaad1, 0xd06d4200, 0x8fe59ebf, 0x8102766e,
+    0x922a4f1d, 0x9ccda7cc, 0xb47a3dfb, 0xba9dd52a, 0xa9b5ec59,
+    0xa7520488},
+   {0x00000000, 0x3c60e308, 0x78c1c610, 0x44a12518, 0xf1838c20,
+    0xcde36f28, 0x89424a30, 0xb522a938, 0x38761e01, 0x0416fd09,
+    0x40b7d811, 0x7cd73b19, 0xc9f59221, 0xf5957129, 0xb1345431,
+    0x8d54b739, 0x70ec3c02, 0x4c8cdf0a, 0x082dfa12, 0x344d191a,
+    0x816fb022, 0xbd0f532a, 0xf9ae7632, 0xc5ce953a, 0x489a2203,
+    0x74fac10b, 0x305be413, 0x0c3b071b, 0xb919ae23, 0x85794d2b,
+    0xc1d86833, 0xfdb88b3b, 0xe1d87804, 0xddb89b0c, 0x9919be14,
+    0xa5795d1c, 0x105bf424, 0x2c3b172c, 0x689a3234, 0x54fad13c,
+    0xd9ae6605, 0xe5ce850d, 0xa16fa015, 0x9d0f431d, 0x282dea25,
+    0x144d092d, 0x50ec2c35, 0x6c8ccf3d, 0x91344406, 0xad54a70e,
+    0xe9f58216, 0xd595611e, 0x60b7c826, 0x5cd72b2e, 0x18760e36,
+    0x2416ed3e, 0xa9425a07, 0x9522b90f, 0xd1839c17, 0xede37f1f,
+    0x58c1d627, 0x64a1352f, 0x20001037, 0x1c60f33f, 0x18c1f649,
+    0x24a11541, 0x60003059, 0x5c60d351, 0xe9427a69, 0xd5229961,
+    0x9183bc79, 0xade35f71, 0x20b7e848, 0x1cd70b40, 0x58762e58,
+    0x6416cd50, 0xd1346468, 0xed548760, 0xa9f5a278, 0x95954170,
+    0x682dca4b, 0x544d2943, 0x10ec0c5b, 0x2c8cef53, 0x99ae466b,
+    0xa5cea563, 0xe16f807b, 0xdd0f6373, 0x505bd44a, 0x6c3b3742,
+    0x289a125a, 0x14faf152, 0xa1d8586a, 0x9db8bb62, 0xd9199e7a,
+    0xe5797d72, 0xf9198e4d, 0xc5796d45, 0x81d8485d, 0xbdb8ab55,
+    0x089a026d, 0x34fae165, 0x705bc47d, 0x4c3b2775, 0xc16f904c,
+    0xfd0f7344, 0xb9ae565c, 0x85ceb554, 0x30ec1c6c, 0x0c8cff64,
+    0x482dda7c, 0x744d3974, 0x89f5b24f, 0xb5955147, 0xf134745f,
+    0xcd549757, 0x78763e6f, 0x4416dd67, 0x00b7f87f, 0x3cd71b77,
+    0xb183ac4e, 0x8de34f46, 0xc9426a5e, 0xf5228956, 0x4000206e,
+    0x7c60c366, 0x38c1e67e, 0x04a10576, 0x3183ec92, 0x0de30f9a,
+    0x49422a82, 0x7522c98a, 0xc00060b2, 0xfc6083ba, 0xb8c1a6a2,
+    0x84a145aa, 0x09f5f293, 0x3595119b, 0x71343483, 0x4d54d78b,
+    0xf8767eb3, 0xc4169dbb, 0x80b7b8a3, 0xbcd75bab, 0x416fd090,
+    0x7d0f3398, 0x39ae1680, 0x05cef588, 0xb0ec5cb0, 0x8c8cbfb8,
+    0xc82d9aa0, 0xf44d79a8, 0x7919ce91, 0x45792d99, 0x01d80881,
+    0x3db8eb89, 0x889a42b1, 0xb4faa1b9, 0xf05b84a1, 0xcc3b67a9,
+    0xd05b9496, 0xec3b779e, 0xa89a5286, 0x94fab18e, 0x21d818b6,
+    0x1db8fbbe, 0x5919dea6, 0x65793dae, 0xe82d8a97, 0xd44d699f,
+    0x90ec4c87, 0xac8caf8f, 0x19ae06b7, 0x25cee5bf, 0x616fc0a7,
+    0x5d0f23af, 0xa0b7a894, 0x9cd74b9c, 0xd8766e84, 0xe4168d8c,
+    0x513424b4, 0x6d54c7bc, 0x29f5e2a4, 0x159501ac, 0x98c1b695,
+    0xa4a1559d, 0xe0007085, 0xdc60938d, 0x69423ab5, 0x5522d9bd,
+    0x1183fca5, 0x2de31fad, 0x29421adb, 0x1522f9d3, 0x5183dccb,
+    0x6de33fc3, 0xd8c196fb, 0xe4a175f3, 0xa00050eb, 0x9c60b3e3,
+    0x113404da, 0x2d54e7d2, 0x69f5c2ca, 0x559521c2, 0xe0b788fa,
+    0xdcd76bf2, 0x98764eea, 0xa416ade2, 0x59ae26d9, 0x65cec5d1,
+    0x216fe0c9, 0x1d0f03c1, 0xa82daaf9, 0x944d49f1, 0xd0ec6ce9,
+    0xec8c8fe1, 0x61d838d8, 0x5db8dbd0, 0x1919fec8, 0x25791dc0,
+    0x905bb4f8, 0xac3b57f0, 0xe89a72e8, 0xd4fa91e0, 0xc89a62df,
+    0xf4fa81d7, 0xb05ba4cf, 0x8c3b47c7, 0x3919eeff, 0x05790df7,
+    0x41d828ef, 0x7db8cbe7, 0xf0ec7cde, 0xcc8c9fd6, 0x882dbace,
+    0xb44d59c6, 0x016ff0fe, 0x3d0f13f6, 0x79ae36ee, 0x45ced5e6,
+    0xb8765edd, 0x8416bdd5, 0xc0b798cd, 0xfcd77bc5, 0x49f5d2fd,
+    0x759531f5, 0x313414ed, 0x0d54f7e5, 0x800040dc, 0xbc60a3d4,
+    0xf8c186cc, 0xc4a165c4, 0x7183ccfc, 0x4de32ff4, 0x09420aec,
+    0x3522e9e4},
+   {0x00000000, 0x6307d924, 0xc60fb248, 0xa5086b6c, 0x576e62d1,
+    0x3469bbf5, 0x9161d099, 0xf26609bd, 0xaedcc5a2, 0xcddb1c86,
+    0x68d377ea, 0x0bd4aece, 0xf9b2a773, 0x9ab57e57, 0x3fbd153b,
+    0x5cbacc1f, 0x86c88d05, 0xe5cf5421, 0x40c73f4d, 0x23c0e669,
+    0xd1a6efd4, 0xb2a136f0, 0x17a95d9c, 0x74ae84b8, 0x281448a7,
+    0x4b139183, 0xee1bfaef, 0x8d1c23cb, 0x7f7a2a76, 0x1c7df352,
+    0xb975983e, 0xda72411a, 0xd6e01c4b, 0xb5e7c56f, 0x10efae03,
+    0x73e87727, 0x818e7e9a, 0xe289a7be, 0x4781ccd2, 0x248615f6,
+    0x783cd9e9, 0x1b3b00cd, 0xbe336ba1, 0xdd34b285, 0x2f52bb38,
+    0x4c55621c, 0xe95d0970, 0x8a5ad054, 0x5028914e, 0x332f486a,
+    0x96272306, 0xf520fa22, 0x0746f39f, 0x64412abb, 0xc14941d7,
+    0xa24e98f3, 0xfef454ec, 0x9df38dc8, 0x38fbe6a4, 0x5bfc3f80,
+    0xa99a363d, 0xca9def19, 0x6f958475, 0x0c925d51, 0x76b13ed7,
+    0x15b6e7f3, 0xb0be8c9f, 0xd3b955bb, 0x21df5c06, 0x42d88522,
+    0xe7d0ee4e, 0x84d7376a, 0xd86dfb75, 0xbb6a2251, 0x1e62493d,
+    0x7d659019, 0x8f0399a4, 0xec044080, 0x490c2bec, 0x2a0bf2c8,
+    0xf079b3d2, 0x937e6af6, 0x3676019a, 0x5571d8be, 0xa717d103,
+    0xc4100827, 0x6118634b, 0x021fba6f, 0x5ea57670, 0x3da2af54,
+    0x98aac438, 0xfbad1d1c, 0x09cb14a1, 0x6acccd85, 0xcfc4a6e9,
+    0xacc37fcd, 0xa051229c, 0xc356fbb8, 0x665e90d4, 0x055949f0,
+    0xf73f404d, 0x94389969, 0x3130f205, 0x52372b21, 0x0e8de73e,
+    0x6d8a3e1a, 0xc8825576, 0xab858c52, 0x59e385ef, 0x3ae45ccb,
+    0x9fec37a7, 0xfcebee83, 0x2699af99, 0x459e76bd, 0xe0961dd1,
+    0x8391c4f5, 0x71f7cd48, 0x12f0146c, 0xb7f87f00, 0xd4ffa624,
+    0x88456a3b, 0xeb42b31f, 0x4e4ad873, 0x2d4d0157, 0xdf2b08ea,
+    0xbc2cd1ce, 0x1924baa2, 0x7a236386, 0xed627dae, 0x8e65a48a,
+    0x2b6dcfe6, 0x486a16c2, 0xba0c1f7f, 0xd90bc65b, 0x7c03ad37,
+    0x1f047413, 0x43beb80c, 0x20b96128, 0x85b10a44, 0xe6b6d360,
+    0x14d0dadd, 0x77d703f9, 0xd2df6895, 0xb1d8b1b1, 0x6baaf0ab,
+    0x08ad298f, 0xada542e3, 0xcea29bc7, 0x3cc4927a, 0x5fc34b5e,
+    0xfacb2032, 0x99ccf916, 0xc5763509, 0xa671ec2d, 0x03798741,
+    0x607e5e65, 0x921857d8, 0xf11f8efc, 0x5417e590, 0x37103cb4,
+    0x3b8261e5, 0x5885b8c1, 0xfd8dd3ad, 0x9e8a0a89, 0x6cec0334,
+    0x0febda10, 0xaae3b17c, 0xc9e46858, 0x955ea447, 0xf6597d63,
+    0x5351160f, 0x3056cf2b, 0xc230c696, 0xa1371fb2, 0x043f74de,
+    0x6738adfa, 0xbd4aece0, 0xde4d35c4, 0x7b455ea8, 0x1842878c,
+    0xea248e31, 0x89235715, 0x2c2b3c79, 0x4f2ce55d, 0x13962942,
+    0x7091f066, 0xd5999b0a, 0xb69e422e, 0x44f84b93, 0x27ff92b7,
+    0x82f7f9db, 0xe1f020ff, 0x9bd34379, 0xf8d49a5d, 0x5ddcf131,
+    0x3edb2815, 0xccbd21a8, 0xafbaf88c, 0x0ab293e0, 0x69b54ac4,
+    0x350f86db, 0x56085fff, 0xf3003493, 0x9007edb7, 0x6261e40a,
+    0x01663d2e, 0xa46e5642, 0xc7698f66, 0x1d1bce7c, 0x7e1c1758,
+    0xdb147c34, 0xb813a510, 0x4a75acad, 0x29727589, 0x8c7a1ee5,
+    0xef7dc7c1, 0xb3c70bde, 0xd0c0d2fa, 0x75c8b996, 0x16cf60b2,
+    0xe4a9690f, 0x87aeb02b, 0x22a6db47, 0x41a10263, 0x4d335f32,
+    0x2e348616, 0x8b3ced7a, 0xe83b345e, 0x1a5d3de3, 0x795ae4c7,
+    0xdc528fab, 0xbf55568f, 0xe3ef9a90, 0x80e843b4, 0x25e028d8,
+    0x46e7f1fc, 0xb481f841, 0xd7862165, 0x728e4a09, 0x1189932d,
+    0xcbfbd237, 0xa8fc0b13, 0x0df4607f, 0x6ef3b95b, 0x9c95b0e6,
+    0xff9269c2, 0x5a9a02ae, 0x399ddb8a, 0x65271795, 0x0620ceb1,
+    0xa328a5dd, 0xc02f7cf9, 0x32497544, 0x514eac60, 0xf446c70c,
+    0x97411e28},
+   {0x00000000, 0x01b5fd1d, 0x036bfa3a, 0x02de0727, 0x06d7f474,
+    0x07620969, 0x05bc0e4e, 0x0409f353, 0x0dafe8e8, 0x0c1a15f5,
+    0x0ec412d2, 0x0f71efcf, 0x0b781c9c, 0x0acde181, 0x0813e6a6,
+    0x09a61bbb, 0x1b5fd1d0, 0x1aea2ccd, 0x18342bea, 0x1981d6f7,
+    0x1d8825a4, 0x1c3dd8b9, 0x1ee3df9e, 0x1f562283, 0x16f03938,
+    0x1745c425, 0x159bc302, 0x142e3e1f, 0x1027cd4c, 0x11923051,
+    0x134c3776, 0x12f9ca6b, 0x36bfa3a0, 0x370a5ebd, 0x35d4599a,
+    0x3461a487, 0x306857d4, 0x31ddaac9, 0x3303adee, 0x32b650f3,
+    0x3b104b48, 0x3aa5b655, 0x387bb172, 0x39ce4c6f, 0x3dc7bf3c,
+    0x3c724221, 0x3eac4506, 0x3f19b81b, 0x2de07270, 0x2c558f6d,
+    0x2e8b884a, 0x2f3e7557, 0x2b378604, 0x2a827b19, 0x285c7c3e,
+    0x29e98123, 0x204f9a98, 0x21fa6785, 0x232460a2, 0x22919dbf,
+    0x26986eec, 0x272d93f1, 0x25f394d6, 0x244669cb, 0x6d7f4740,
+    0x6ccaba5d, 0x6e14bd7a, 0x6fa14067, 0x6ba8b334, 0x6a1d4e29,
+    0x68c3490e, 0x6976b413, 0x60d0afa8, 0x616552b5, 0x63bb5592,
+    0x620ea88f, 0x66075bdc, 0x67b2a6c1, 0x656ca1e6, 0x64d95cfb,
+    0x76209690, 0x77956b8d, 0x754b6caa, 0x74fe91b7, 0x70f762e4,
+    0x71429ff9, 0x739c98de, 0x722965c3, 0x7b8f7e78, 0x7a3a8365,
+    0x78e48442, 0x7951795f, 0x7d588a0c, 0x7ced7711, 0x7e337036,
+    0x7f868d2b, 0x5bc0e4e0, 0x5a7519fd, 0x58ab1eda, 0x591ee3c7,
+    0x5d171094, 0x5ca2ed89, 0x5e7ceaae, 0x5fc917b3, 0x566f0c08,
+    0x57daf115, 0x5504f632, 0x54b10b2f, 0x50b8f87c, 0x510d0561,
+    0x53d30246, 0x5266ff5b, 0x409f3530, 0x412ac82d, 0x43f4cf0a,
+    0x42413217, 0x4648c144, 0x47fd3c59, 0x45233b7e, 0x4496c663,
+    0x4d30ddd8, 0x4c8520c5, 0x4e5b27e2, 0x4feedaff, 0x4be729ac,
+    0x4a52d4b1, 0x488cd396, 0x49392e8b, 0xdafe8e80, 0xdb4b739d,
+    0xd99574ba, 0xd82089a7, 0xdc297af4, 0xdd9c87e9, 0xdf4280ce,
+    0xdef77dd3, 0xd7516668, 0xd6e49b75, 0xd43a9c52, 0xd58f614f,
+    0xd186921c, 0xd0336f01, 0xd2ed6826, 0xd358953b, 0xc1a15f50,
+    0xc014a24d, 0xc2caa56a, 0xc37f5877, 0xc776ab24, 0xc6c35639,
+    0xc41d511e, 0xc5a8ac03, 0xcc0eb7b8, 0xcdbb4aa5, 0xcf654d82,
+    0xced0b09f, 0xcad943cc, 0xcb6cbed1, 0xc9b2b9f6, 0xc80744eb,
+    0xec412d20, 0xedf4d03d, 0xef2ad71a, 0xee9f2a07, 0xea96d954,
+    0xeb232449, 0xe9fd236e, 0xe848de73, 0xe1eec5c8, 0xe05b38d5,
+    0xe2853ff2, 0xe330c2ef, 0xe73931bc, 0xe68ccca1, 0xe452cb86,
+    0xe5e7369b, 0xf71efcf0, 0xf6ab01ed, 0xf47506ca, 0xf5c0fbd7,
+    0xf1c90884, 0xf07cf599, 0xf2a2f2be, 0xf3170fa3, 0xfab11418,
+    0xfb04e905, 0xf9daee22, 0xf86f133f, 0xfc66e06c, 0xfdd31d71,
+    0xff0d1a56, 0xfeb8e74b, 0xb781c9c0, 0xb63434dd, 0xb4ea33fa,
+    0xb55fcee7, 0xb1563db4, 0xb0e3c0a9, 0xb23dc78e, 0xb3883a93,
+    0xba2e2128, 0xbb9bdc35, 0xb945db12, 0xb8f0260f, 0xbcf9d55c,
+    0xbd4c2841, 0xbf922f66, 0xbe27d27b, 0xacde1810, 0xad6be50d,
+    0xafb5e22a, 0xae001f37, 0xaa09ec64, 0xabbc1179, 0xa962165e,
+    0xa8d7eb43, 0xa171f0f8, 0xa0c40de5, 0xa21a0ac2, 0xa3aff7df,
+    0xa7a6048c, 0xa613f991, 0xa4cdfeb6, 0xa57803ab, 0x813e6a60,
+    0x808b977d, 0x8255905a, 0x83e06d47, 0x87e99e14, 0x865c6309,
+    0x8482642e, 0x85379933, 0x8c918288, 0x8d247f95, 0x8ffa78b2,
+    0x8e4f85af, 0x8a4676fc, 0x8bf38be1, 0x892d8cc6, 0x889871db,
+    0x9a61bbb0, 0x9bd446ad, 0x990a418a, 0x98bfbc97, 0x9cb64fc4,
+    0x9d03b2d9, 0x9fddb5fe, 0x9e6848e3, 0x97ce5358, 0x967bae45,
+    0x94a5a962, 0x9510547f, 0x9119a72c, 0x90ac5a31, 0x92725d16,
+    0x93c7a00b},
+   {0x00000000, 0x6e8c1b41, 0xdd183682, 0xb3942dc3, 0x61416b45,
+    0x0fcd7004, 0xbc595dc7, 0xd2d54686, 0xc282d68a, 0xac0ecdcb,
+    0x1f9ae008, 0x7116fb49, 0xa3c3bdcf, 0xcd4fa68e, 0x7edb8b4d,
+    0x1057900c, 0x5e74ab55, 0x30f8b014, 0x836c9dd7, 0xede08696,
+    0x3f35c010, 0x51b9db51, 0xe22df692, 0x8ca1edd3, 0x9cf67ddf,
+    0xf27a669e, 0x41ee4b5d, 0x2f62501c, 0xfdb7169a, 0x933b0ddb,
+    0x20af2018, 0x4e233b59, 0xbce956aa, 0xd2654deb, 0x61f16028,
+    0x0f7d7b69, 0xdda83def, 0xb32426ae, 0x00b00b6d, 0x6e3c102c,
+    0x7e6b8020, 0x10e79b61, 0xa373b6a2, 0xcdffade3, 0x1f2aeb65,
+    0x71a6f024, 0xc232dde7, 0xacbec6a6, 0xe29dfdff, 0x8c11e6be,
+    0x3f85cb7d, 0x5109d03c, 0x83dc96ba, 0xed508dfb, 0x5ec4a038,
+    0x3048bb79, 0x201f2b75, 0x4e933034, 0xfd071df7, 0x938b06b6,
+    0x415e4030, 0x2fd25b71, 0x9c4676b2, 0xf2ca6df3, 0xa2a3ab15,
+    0xcc2fb054, 0x7fbb9d97, 0x113786d6, 0xc3e2c050, 0xad6edb11,
+    0x1efaf6d2, 0x7076ed93, 0x60217d9f, 0x0ead66de, 0xbd394b1d,
+    0xd3b5505c, 0x016016da, 0x6fec0d9b, 0xdc782058, 0xb2f43b19,
+    0xfcd70040, 0x925b1b01, 0x21cf36c2, 0x4f432d83, 0x9d966b05,
+    0xf31a7044, 0x408e5d87, 0x2e0246c6, 0x3e55d6ca, 0x50d9cd8b,
+    0xe34de048, 0x8dc1fb09, 0x5f14bd8f, 0x3198a6ce, 0x820c8b0d,
+    0xec80904c, 0x1e4afdbf, 0x70c6e6fe, 0xc352cb3d, 0xadded07c,
+    0x7f0b96fa, 0x11878dbb, 0xa213a078, 0xcc9fbb39, 0xdcc82b35,
+    0xb2443074, 0x01d01db7, 0x6f5c06f6, 0xbd894070, 0xd3055b31,
+    0x609176f2, 0x0e1d6db3, 0x403e56ea, 0x2eb24dab, 0x9d266068,
+    0xf3aa7b29, 0x217f3daf, 0x4ff326ee, 0xfc670b2d, 0x92eb106c,
+    0x82bc8060, 0xec309b21, 0x5fa4b6e2, 0x3128ada3, 0xe3fdeb25,
+    0x8d71f064, 0x3ee5dda7, 0x5069c6e6, 0x9e36506b, 0xf0ba4b2a,
+    0x432e66e9, 0x2da27da8, 0xff773b2e, 0x91fb206f, 0x226f0dac,
+    0x4ce316ed, 0x5cb486e1, 0x32389da0, 0x81acb063, 0xef20ab22,
+    0x3df5eda4, 0x5379f6e5, 0xe0eddb26, 0x8e61c067, 0xc042fb3e,
+    0xaecee07f, 0x1d5acdbc, 0x73d6d6fd, 0xa103907b, 0xcf8f8b3a,
+    0x7c1ba6f9, 0x1297bdb8, 0x02c02db4, 0x6c4c36f5, 0xdfd81b36,
+    0xb1540077, 0x638146f1, 0x0d0d5db0, 0xbe997073, 0xd0156b32,
+    0x22df06c1, 0x4c531d80, 0xffc73043, 0x914b2b02, 0x439e6d84,
+    0x2d1276c5, 0x9e865b06, 0xf00a4047, 0xe05dd04b, 0x8ed1cb0a,
+    0x3d45e6c9, 0x53c9fd88, 0x811cbb0e, 0xef90a04f, 0x5c048d8c,
+    0x328896cd, 0x7cabad94, 0x1227b6d5, 0xa1b39b16, 0xcf3f8057,
+    0x1deac6d1, 0x7366dd90, 0xc0f2f053, 0xae7eeb12, 0xbe297b1e,
+    0xd0a5605f, 0x63314d9c, 0x0dbd56dd, 0xdf68105b, 0xb1e40b1a,
+    0x027026d9, 0x6cfc3d98, 0x3c95fb7e, 0x5219e03f, 0xe18dcdfc,
+    0x8f01d6bd, 0x5dd4903b, 0x33588b7a, 0x80cca6b9, 0xee40bdf8,
+    0xfe172df4, 0x909b36b5, 0x230f1b76, 0x4d830037, 0x9f5646b1,
+    0xf1da5df0, 0x424e7033, 0x2cc26b72, 0x62e1502b, 0x0c6d4b6a,
+    0xbff966a9, 0xd1757de8, 0x03a03b6e, 0x6d2c202f, 0xdeb80dec,
+    0xb03416ad, 0xa06386a1, 0xceef9de0, 0x7d7bb023, 0x13f7ab62,
+    0xc122ede4, 0xafaef6a5, 0x1c3adb66, 0x72b6c027, 0x807cadd4,
+    0xeef0b695, 0x5d649b56, 0x33e88017, 0xe13dc691, 0x8fb1ddd0,
+    0x3c25f013, 0x52a9eb52, 0x42fe7b5e, 0x2c72601f, 0x9fe64ddc,
+    0xf16a569d, 0x23bf101b, 0x4d330b5a, 0xfea72699, 0x902b3dd8,
+    0xde080681, 0xb0841dc0, 0x03103003, 0x6d9c2b42, 0xbf496dc4,
+    0xd1c57685, 0x62515b46, 0x0cdd4007, 0x1c8ad00b, 0x7206cb4a,
+    0xc192e689, 0xaf1efdc8, 0x7dcbbb4e, 0x1347a00f, 0xa0d38dcc,
+    0xce5f968d},
+   {0x00000000, 0xe71da697, 0x154a4b6f, 0xf257edf8, 0x2a9496de,
+    0xcd893049, 0x3fdeddb1, 0xd8c37b26, 0x55292dbc, 0xb2348b2b,
+    0x406366d3, 0xa77ec044, 0x7fbdbb62, 0x98a01df5, 0x6af7f00d,
+    0x8dea569a, 0xaa525b78, 0x4d4ffdef, 0xbf181017, 0x5805b680,
+    0x80c6cda6, 0x67db6b31, 0x958c86c9, 0x7291205e, 0xff7b76c4,
+    0x1866d053, 0xea313dab, 0x0d2c9b3c, 0xd5efe01a, 0x32f2468d,
+    0xc0a5ab75, 0x27b80de2, 0x8fd5b0b1, 0x68c81626, 0x9a9ffbde,
+    0x7d825d49, 0xa541266f, 0x425c80f8, 0xb00b6d00, 0x5716cb97,
+    0xdafc9d0d, 0x3de13b9a, 0xcfb6d662, 0x28ab70f5, 0xf0680bd3,
+    0x1775ad44, 0xe52240bc, 0x023fe62b, 0x2587ebc9, 0xc29a4d5e,
+    0x30cda0a6, 0xd7d00631, 0x0f137d17, 0xe80edb80, 0x1a593678,
+    0xfd4490ef, 0x70aec675, 0x97b360e2, 0x65e48d1a, 0x82f92b8d,
+    0x5a3a50ab, 0xbd27f63c, 0x4f701bc4, 0xa86dbd53, 0xc4da6723,
+    0x23c7c1b4, 0xd1902c4c, 0x368d8adb, 0xee4ef1fd, 0x0953576a,
+    0xfb04ba92, 0x1c191c05, 0x91f34a9f, 0x76eeec08, 0x84b901f0,
+    0x63a4a767, 0xbb67dc41, 0x5c7a7ad6, 0xae2d972e, 0x493031b9,
+    0x6e883c5b, 0x89959acc, 0x7bc27734, 0x9cdfd1a3, 0x441caa85,
+    0xa3010c12, 0x5156e1ea, 0xb64b477d, 0x3ba111e7, 0xdcbcb770,
+    0x2eeb5a88, 0xc9f6fc1f, 0x11358739, 0xf62821ae, 0x047fcc56,
+    0xe3626ac1, 0x4b0fd792, 0xac127105, 0x5e459cfd, 0xb9583a6a,
+    0x619b414c, 0x8686e7db, 0x74d10a23, 0x93ccacb4, 0x1e26fa2e,
+    0xf93b5cb9, 0x0b6cb141, 0xec7117d6, 0x34b26cf0, 0xd3afca67,
+    0x21f8279f, 0xc6e58108, 0xe15d8cea, 0x06402a7d, 0xf417c785,
+    0x130a6112, 0xcbc91a34, 0x2cd4bca3, 0xde83515b, 0x399ef7cc,
+    0xb474a156, 0x536907c1, 0xa13eea39, 0x46234cae, 0x9ee03788,
+    0x79fd911f, 0x8baa7ce7, 0x6cb7da70, 0x52c5c807, 0xb5d86e90,
+    0x478f8368, 0xa09225ff, 0x78515ed9, 0x9f4cf84e, 0x6d1b15b6,
+    0x8a06b321, 0x07ece5bb, 0xe0f1432c, 0x12a6aed4, 0xf5bb0843,
+    0x2d787365, 0xca65d5f2, 0x3832380a, 0xdf2f9e9d, 0xf897937f,
+    0x1f8a35e8, 0xedddd810, 0x0ac07e87, 0xd20305a1, 0x351ea336,
+    0xc7494ece, 0x2054e859, 0xadbebec3, 0x4aa31854, 0xb8f4f5ac,
+    0x5fe9533b, 0x872a281d, 0x60378e8a, 0x92606372, 0x757dc5e5,
+    0xdd1078b6, 0x3a0dde21, 0xc85a33d9, 0x2f47954e, 0xf784ee68,
+    0x109948ff, 0xe2cea507, 0x05d30390, 0x8839550a, 0x6f24f39d,
+    0x9d731e65, 0x7a6eb8f2, 0xa2adc3d4, 0x45b06543, 0xb7e788bb,
+    0x50fa2e2c, 0x774223ce, 0x905f8559, 0x620868a1, 0x8515ce36,
+    0x5dd6b510, 0xbacb1387, 0x489cfe7f, 0xaf8158e8, 0x226b0e72,
+    0xc576a8e5, 0x3721451d, 0xd03ce38a, 0x08ff98ac, 0xefe23e3b,
+    0x1db5d3c3, 0xfaa87554, 0x961faf24, 0x710209b3, 0x8355e44b,
+    0x644842dc, 0xbc8b39fa, 0x5b969f6d, 0xa9c17295, 0x4edcd402,
+    0xc3368298, 0x242b240f, 0xd67cc9f7, 0x31616f60, 0xe9a21446,
+    0x0ebfb2d1, 0xfce85f29, 0x1bf5f9be, 0x3c4df45c, 0xdb5052cb,
+    0x2907bf33, 0xce1a19a4, 0x16d96282, 0xf1c4c415, 0x039329ed,
+    0xe48e8f7a, 0x6964d9e0, 0x8e797f77, 0x7c2e928f, 0x9b333418,
+    0x43f04f3e, 0xa4ede9a9, 0x56ba0451, 0xb1a7a2c6, 0x19ca1f95,
+    0xfed7b902, 0x0c8054fa, 0xeb9df26d, 0x335e894b, 0xd4432fdc,
+    0x2614c224, 0xc10964b3, 0x4ce33229, 0xabfe94be, 0x59a97946,
+    0xbeb4dfd1, 0x6677a4f7, 0x816a0260, 0x733def98, 0x9420490f,
+    0xb39844ed, 0x5485e27a, 0xa6d20f82, 0x41cfa915, 0x990cd233,
+    0x7e1174a4, 0x8c46995c, 0x6b5b3fcb, 0xe6b16951, 0x01accfc6,
+    0xf3fb223e, 0x14e684a9, 0xcc25ff8f, 0x2b385918, 0xd96fb4e0,
+    0x3e721277},
+   {0x00000000, 0xa58b900e, 0x9066265d, 0x35edb653, 0xfbbd4afb,
+    0x5e36daf5, 0x6bdb6ca6, 0xce50fca8, 0x2c0b93b7, 0x898003b9,
+    0xbc6db5ea, 0x19e625e4, 0xd7b6d94c, 0x723d4942, 0x47d0ff11,
+    0xe25b6f1f, 0x5817276e, 0xfd9cb760, 0xc8710133, 0x6dfa913d,
+    0xa3aa6d95, 0x0621fd9b, 0x33cc4bc8, 0x9647dbc6, 0x741cb4d9,
+    0xd19724d7, 0xe47a9284, 0x41f1028a, 0x8fa1fe22, 0x2a2a6e2c,
+    0x1fc7d87f, 0xba4c4871, 0xb02e4edc, 0x15a5ded2, 0x20486881,
+    0x85c3f88f, 0x4b930427, 0xee189429, 0xdbf5227a, 0x7e7eb274,
+    0x9c25dd6b, 0x39ae4d65, 0x0c43fb36, 0xa9c86b38, 0x67989790,
+    0xc213079e, 0xf7feb1cd, 0x527521c3, 0xe83969b2, 0x4db2f9bc,
+    0x785f4fef, 0xddd4dfe1, 0x13842349, 0xb60fb347, 0x83e20514,
+    0x2669951a, 0xc432fa05, 0x61b96a0b, 0x5454dc58, 0xf1df4c56,
+    0x3f8fb0fe, 0x9a0420f0, 0xafe996a3, 0x0a6206ad, 0xbb2d9bf9,
+    0x1ea60bf7, 0x2b4bbda4, 0x8ec02daa, 0x4090d102, 0xe51b410c,
+    0xd0f6f75f, 0x757d6751, 0x9726084e, 0x32ad9840, 0x07402e13,
+    0xa2cbbe1d, 0x6c9b42b5, 0xc910d2bb, 0xfcfd64e8, 0x5976f4e6,
+    0xe33abc97, 0x46b12c99, 0x735c9aca, 0xd6d70ac4, 0x1887f66c,
+    0xbd0c6662, 0x88e1d031, 0x2d6a403f, 0xcf312f20, 0x6ababf2e,
+    0x5f57097d, 0xfadc9973, 0x348c65db, 0x9107f5d5, 0xa4ea4386,
+    0x0161d388, 0x0b03d525, 0xae88452b, 0x9b65f378, 0x3eee6376,
+    0xf0be9fde, 0x55350fd0, 0x60d8b983, 0xc553298d, 0x27084692,
+    0x8283d69c, 0xb76e60cf, 0x12e5f0c1, 0xdcb50c69, 0x793e9c67,
+    0x4cd32a34, 0xe958ba3a, 0x5314f24b, 0xf69f6245, 0xc372d416,
+    0x66f94418, 0xa8a9b8b0, 0x0d2228be, 0x38cf9eed, 0x9d440ee3,
+    0x7f1f61fc, 0xda94f1f2, 0xef7947a1, 0x4af2d7af, 0x84a22b07,
+    0x2129bb09, 0x14c40d5a, 0xb14f9d54, 0xad2a31b3, 0x08a1a1bd,
+    0x3d4c17ee, 0x98c787e0, 0x56977b48, 0xf31ceb46, 0xc6f15d15,
+    0x637acd1b, 0x8121a204, 0x24aa320a, 0x11478459, 0xb4cc1457,
+    0x7a9ce8ff, 0xdf1778f1, 0xeafacea2, 0x4f715eac, 0xf53d16dd,
+    0x50b686d3, 0x655b3080, 0xc0d0a08e, 0x0e805c26, 0xab0bcc28,
+    0x9ee67a7b, 0x3b6dea75, 0xd936856a, 0x7cbd1564, 0x4950a337,
+    0xecdb3339, 0x228bcf91, 0x87005f9f, 0xb2ede9cc, 0x176679c2,
+    0x1d047f6f, 0xb88fef61, 0x8d625932, 0x28e9c93c, 0xe6b93594,
+    0x4332a59a, 0x76df13c9, 0xd35483c7, 0x310fecd8, 0x94847cd6,
+    0xa169ca85, 0x04e25a8b, 0xcab2a623, 0x6f39362d, 0x5ad4807e,
+    0xff5f1070, 0x45135801, 0xe098c80f, 0xd5757e5c, 0x70feee52,
+    0xbeae12fa, 0x1b2582f4, 0x2ec834a7, 0x8b43a4a9, 0x6918cbb6,
+    0xcc935bb8, 0xf97eedeb, 0x5cf57de5, 0x92a5814d, 0x372e1143,
+    0x02c3a710, 0xa748371e, 0x1607aa4a, 0xb38c3a44, 0x86618c17,
+    0x23ea1c19, 0xedbae0b1, 0x483170bf, 0x7ddcc6ec, 0xd85756e2,
+    0x3a0c39fd, 0x9f87a9f3, 0xaa6a1fa0, 0x0fe18fae, 0xc1b17306,
+    0x643ae308, 0x51d7555b, 0xf45cc555, 0x4e108d24, 0xeb9b1d2a,
+    0xde76ab79, 0x7bfd3b77, 0xb5adc7df, 0x102657d1, 0x25cbe182,
+    0x8040718c, 0x621b1e93, 0xc7908e9d, 0xf27d38ce, 0x57f6a8c0,
+    0x99a65468, 0x3c2dc466, 0x09c07235, 0xac4be23b, 0xa629e496,
+    0x03a27498, 0x364fc2cb, 0x93c452c5, 0x5d94ae6d, 0xf81f3e63,
+    0xcdf28830, 0x6879183e, 0x8a227721, 0x2fa9e72f, 0x1a44517c,
+    0xbfcfc172, 0x719f3dda, 0xd414add4, 0xe1f91b87, 0x44728b89,
+    0xfe3ec3f8, 0x5bb553f6, 0x6e58e5a5, 0xcbd375ab, 0x05838903,
+    0xa008190d, 0x95e5af5e, 0x306e3f50, 0xd235504f, 0x77bec041,
+    0x42537612, 0xe7d8e61c, 0x29881ab4, 0x8c038aba, 0xb9ee3ce9,
+    0x1c65ace7}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x0e908ba500000000, 0x5d26669000000000,
+    0x53b6ed3500000000, 0xfb4abdfb00000000, 0xf5da365e00000000,
+    0xa66cdb6b00000000, 0xa8fc50ce00000000, 0xb7930b2c00000000,
+    0xb903808900000000, 0xeab56dbc00000000, 0xe425e61900000000,
+    0x4cd9b6d700000000, 0x42493d7200000000, 0x11ffd04700000000,
+    0x1f6f5be200000000, 0x6e27175800000000, 0x60b79cfd00000000,
+    0x330171c800000000, 0x3d91fa6d00000000, 0x956daaa300000000,
+    0x9bfd210600000000, 0xc84bcc3300000000, 0xc6db479600000000,
+    0xd9b41c7400000000, 0xd72497d100000000, 0x84927ae400000000,
+    0x8a02f14100000000, 0x22fea18f00000000, 0x2c6e2a2a00000000,
+    0x7fd8c71f00000000, 0x71484cba00000000, 0xdc4e2eb000000000,
+    0xd2dea51500000000, 0x8168482000000000, 0x8ff8c38500000000,
+    0x2704934b00000000, 0x299418ee00000000, 0x7a22f5db00000000,
+    0x74b27e7e00000000, 0x6bdd259c00000000, 0x654dae3900000000,
+    0x36fb430c00000000, 0x386bc8a900000000, 0x9097986700000000,
+    0x9e0713c200000000, 0xcdb1fef700000000, 0xc321755200000000,
+    0xb26939e800000000, 0xbcf9b24d00000000, 0xef4f5f7800000000,
+    0xe1dfd4dd00000000, 0x4923841300000000, 0x47b30fb600000000,
+    0x1405e28300000000, 0x1a95692600000000, 0x05fa32c400000000,
+    0x0b6ab96100000000, 0x58dc545400000000, 0x564cdff100000000,
+    0xfeb08f3f00000000, 0xf020049a00000000, 0xa396e9af00000000,
+    0xad06620a00000000, 0xf99b2dbb00000000, 0xf70ba61e00000000,
+    0xa4bd4b2b00000000, 0xaa2dc08e00000000, 0x02d1904000000000,
+    0x0c411be500000000, 0x5ff7f6d000000000, 0x51677d7500000000,
+    0x4e08269700000000, 0x4098ad3200000000, 0x132e400700000000,
+    0x1dbecba200000000, 0xb5429b6c00000000, 0xbbd210c900000000,
+    0xe864fdfc00000000, 0xe6f4765900000000, 0x97bc3ae300000000,
+    0x992cb14600000000, 0xca9a5c7300000000, 0xc40ad7d600000000,
+    0x6cf6871800000000, 0x62660cbd00000000, 0x31d0e18800000000,
+    0x3f406a2d00000000, 0x202f31cf00000000, 0x2ebfba6a00000000,
+    0x7d09575f00000000, 0x7399dcfa00000000, 0xdb658c3400000000,
+    0xd5f5079100000000, 0x8643eaa400000000, 0x88d3610100000000,
+    0x25d5030b00000000, 0x2b4588ae00000000, 0x78f3659b00000000,
+    0x7663ee3e00000000, 0xde9fbef000000000, 0xd00f355500000000,
+    0x83b9d86000000000, 0x8d2953c500000000, 0x9246082700000000,
+    0x9cd6838200000000, 0xcf606eb700000000, 0xc1f0e51200000000,
+    0x690cb5dc00000000, 0x679c3e7900000000, 0x342ad34c00000000,
+    0x3aba58e900000000, 0x4bf2145300000000, 0x45629ff600000000,
+    0x16d472c300000000, 0x1844f96600000000, 0xb0b8a9a800000000,
+    0xbe28220d00000000, 0xed9ecf3800000000, 0xe30e449d00000000,
+    0xfc611f7f00000000, 0xf2f194da00000000, 0xa14779ef00000000,
+    0xafd7f24a00000000, 0x072ba28400000000, 0x09bb292100000000,
+    0x5a0dc41400000000, 0x549d4fb100000000, 0xb3312aad00000000,
+    0xbda1a10800000000, 0xee174c3d00000000, 0xe087c79800000000,
+    0x487b975600000000, 0x46eb1cf300000000, 0x155df1c600000000,
+    0x1bcd7a6300000000, 0x04a2218100000000, 0x0a32aa2400000000,
+    0x5984471100000000, 0x5714ccb400000000, 0xffe89c7a00000000,
+    0xf17817df00000000, 0xa2cefaea00000000, 0xac5e714f00000000,
+    0xdd163df500000000, 0xd386b65000000000, 0x80305b6500000000,
+    0x8ea0d0c000000000, 0x265c800e00000000, 0x28cc0bab00000000,
+    0x7b7ae69e00000000, 0x75ea6d3b00000000, 0x6a8536d900000000,
+    0x6415bd7c00000000, 0x37a3504900000000, 0x3933dbec00000000,
+    0x91cf8b2200000000, 0x9f5f008700000000, 0xcce9edb200000000,
+    0xc279661700000000, 0x6f7f041d00000000, 0x61ef8fb800000000,
+    0x3259628d00000000, 0x3cc9e92800000000, 0x9435b9e600000000,
+    0x9aa5324300000000, 0xc913df7600000000, 0xc78354d300000000,
+    0xd8ec0f3100000000, 0xd67c849400000000, 0x85ca69a100000000,
+    0x8b5ae20400000000, 0x23a6b2ca00000000, 0x2d36396f00000000,
+    0x7e80d45a00000000, 0x70105fff00000000, 0x0158134500000000,
+    0x0fc898e000000000, 0x5c7e75d500000000, 0x52eefe7000000000,
+    0xfa12aebe00000000, 0xf482251b00000000, 0xa734c82e00000000,
+    0xa9a4438b00000000, 0xb6cb186900000000, 0xb85b93cc00000000,
+    0xebed7ef900000000, 0xe57df55c00000000, 0x4d81a59200000000,
+    0x43112e3700000000, 0x10a7c30200000000, 0x1e3748a700000000,
+    0x4aaa071600000000, 0x443a8cb300000000, 0x178c618600000000,
+    0x191cea2300000000, 0xb1e0baed00000000, 0xbf70314800000000,
+    0xecc6dc7d00000000, 0xe25657d800000000, 0xfd390c3a00000000,
+    0xf3a9879f00000000, 0xa01f6aaa00000000, 0xae8fe10f00000000,
+    0x0673b1c100000000, 0x08e33a6400000000, 0x5b55d75100000000,
+    0x55c55cf400000000, 0x248d104e00000000, 0x2a1d9beb00000000,
+    0x79ab76de00000000, 0x773bfd7b00000000, 0xdfc7adb500000000,
+    0xd157261000000000, 0x82e1cb2500000000, 0x8c71408000000000,
+    0x931e1b6200000000, 0x9d8e90c700000000, 0xce387df200000000,
+    0xc0a8f65700000000, 0x6854a69900000000, 0x66c42d3c00000000,
+    0x3572c00900000000, 0x3be24bac00000000, 0x96e429a600000000,
+    0x9874a20300000000, 0xcbc24f3600000000, 0xc552c49300000000,
+    0x6dae945d00000000, 0x633e1ff800000000, 0x3088f2cd00000000,
+    0x3e18796800000000, 0x2177228a00000000, 0x2fe7a92f00000000,
+    0x7c51441a00000000, 0x72c1cfbf00000000, 0xda3d9f7100000000,
+    0xd4ad14d400000000, 0x871bf9e100000000, 0x898b724400000000,
+    0xf8c33efe00000000, 0xf653b55b00000000, 0xa5e5586e00000000,
+    0xab75d3cb00000000, 0x0389830500000000, 0x0d1908a000000000,
+    0x5eafe59500000000, 0x503f6e3000000000, 0x4f5035d200000000,
+    0x41c0be7700000000, 0x1276534200000000, 0x1ce6d8e700000000,
+    0xb41a882900000000, 0xba8a038c00000000, 0xe93ceeb900000000,
+    0xe7ac651c00000000},
+   {0x0000000000000000, 0x97a61de700000000, 0x6f4b4a1500000000,
+    0xf8ed57f200000000, 0xde96942a00000000, 0x493089cd00000000,
+    0xb1ddde3f00000000, 0x267bc3d800000000, 0xbc2d295500000000,
+    0x2b8b34b200000000, 0xd366634000000000, 0x44c07ea700000000,
+    0x62bbbd7f00000000, 0xf51da09800000000, 0x0df0f76a00000000,
+    0x9a56ea8d00000000, 0x785b52aa00000000, 0xeffd4f4d00000000,
+    0x171018bf00000000, 0x80b6055800000000, 0xa6cdc68000000000,
+    0x316bdb6700000000, 0xc9868c9500000000, 0x5e20917200000000,
+    0xc4767bff00000000, 0x53d0661800000000, 0xab3d31ea00000000,
+    0x3c9b2c0d00000000, 0x1ae0efd500000000, 0x8d46f23200000000,
+    0x75aba5c000000000, 0xe20db82700000000, 0xb1b0d58f00000000,
+    0x2616c86800000000, 0xdefb9f9a00000000, 0x495d827d00000000,
+    0x6f2641a500000000, 0xf8805c4200000000, 0x006d0bb000000000,
+    0x97cb165700000000, 0x0d9dfcda00000000, 0x9a3be13d00000000,
+    0x62d6b6cf00000000, 0xf570ab2800000000, 0xd30b68f000000000,
+    0x44ad751700000000, 0xbc4022e500000000, 0x2be63f0200000000,
+    0xc9eb872500000000, 0x5e4d9ac200000000, 0xa6a0cd3000000000,
+    0x3106d0d700000000, 0x177d130f00000000, 0x80db0ee800000000,
+    0x7836591a00000000, 0xef9044fd00000000, 0x75c6ae7000000000,
+    0xe260b39700000000, 0x1a8de46500000000, 0x8d2bf98200000000,
+    0xab503a5a00000000, 0x3cf627bd00000000, 0xc41b704f00000000,
+    0x53bd6da800000000, 0x2367dac400000000, 0xb4c1c72300000000,
+    0x4c2c90d100000000, 0xdb8a8d3600000000, 0xfdf14eee00000000,
+    0x6a57530900000000, 0x92ba04fb00000000, 0x051c191c00000000,
+    0x9f4af39100000000, 0x08ecee7600000000, 0xf001b98400000000,
+    0x67a7a46300000000, 0x41dc67bb00000000, 0xd67a7a5c00000000,
+    0x2e972dae00000000, 0xb931304900000000, 0x5b3c886e00000000,
+    0xcc9a958900000000, 0x3477c27b00000000, 0xa3d1df9c00000000,
+    0x85aa1c4400000000, 0x120c01a300000000, 0xeae1565100000000,
+    0x7d474bb600000000, 0xe711a13b00000000, 0x70b7bcdc00000000,
+    0x885aeb2e00000000, 0x1ffcf6c900000000, 0x3987351100000000,
+    0xae2128f600000000, 0x56cc7f0400000000, 0xc16a62e300000000,
+    0x92d70f4b00000000, 0x057112ac00000000, 0xfd9c455e00000000,
+    0x6a3a58b900000000, 0x4c419b6100000000, 0xdbe7868600000000,
+    0x230ad17400000000, 0xb4accc9300000000, 0x2efa261e00000000,
+    0xb95c3bf900000000, 0x41b16c0b00000000, 0xd61771ec00000000,
+    0xf06cb23400000000, 0x67caafd300000000, 0x9f27f82100000000,
+    0x0881e5c600000000, 0xea8c5de100000000, 0x7d2a400600000000,
+    0x85c717f400000000, 0x12610a1300000000, 0x341ac9cb00000000,
+    0xa3bcd42c00000000, 0x5b5183de00000000, 0xccf79e3900000000,
+    0x56a174b400000000, 0xc107695300000000, 0x39ea3ea100000000,
+    0xae4c234600000000, 0x8837e09e00000000, 0x1f91fd7900000000,
+    0xe77caa8b00000000, 0x70dab76c00000000, 0x07c8c55200000000,
+    0x906ed8b500000000, 0x68838f4700000000, 0xff2592a000000000,
+    0xd95e517800000000, 0x4ef84c9f00000000, 0xb6151b6d00000000,
+    0x21b3068a00000000, 0xbbe5ec0700000000, 0x2c43f1e000000000,
+    0xd4aea61200000000, 0x4308bbf500000000, 0x6573782d00000000,
+    0xf2d565ca00000000, 0x0a38323800000000, 0x9d9e2fdf00000000,
+    0x7f9397f800000000, 0xe8358a1f00000000, 0x10d8dded00000000,
+    0x877ec00a00000000, 0xa10503d200000000, 0x36a31e3500000000,
+    0xce4e49c700000000, 0x59e8542000000000, 0xc3bebead00000000,
+    0x5418a34a00000000, 0xacf5f4b800000000, 0x3b53e95f00000000,
+    0x1d282a8700000000, 0x8a8e376000000000, 0x7263609200000000,
+    0xe5c57d7500000000, 0xb67810dd00000000, 0x21de0d3a00000000,
+    0xd9335ac800000000, 0x4e95472f00000000, 0x68ee84f700000000,
+    0xff48991000000000, 0x07a5cee200000000, 0x9003d30500000000,
+    0x0a55398800000000, 0x9df3246f00000000, 0x651e739d00000000,
+    0xf2b86e7a00000000, 0xd4c3ada200000000, 0x4365b04500000000,
+    0xbb88e7b700000000, 0x2c2efa5000000000, 0xce23427700000000,
+    0x59855f9000000000, 0xa168086200000000, 0x36ce158500000000,
+    0x10b5d65d00000000, 0x8713cbba00000000, 0x7ffe9c4800000000,
+    0xe85881af00000000, 0x720e6b2200000000, 0xe5a876c500000000,
+    0x1d45213700000000, 0x8ae33cd000000000, 0xac98ff0800000000,
+    0x3b3ee2ef00000000, 0xc3d3b51d00000000, 0x5475a8fa00000000,
+    0x24af1f9600000000, 0xb309027100000000, 0x4be4558300000000,
+    0xdc42486400000000, 0xfa398bbc00000000, 0x6d9f965b00000000,
+    0x9572c1a900000000, 0x02d4dc4e00000000, 0x988236c300000000,
+    0x0f242b2400000000, 0xf7c97cd600000000, 0x606f613100000000,
+    0x4614a2e900000000, 0xd1b2bf0e00000000, 0x295fe8fc00000000,
+    0xbef9f51b00000000, 0x5cf44d3c00000000, 0xcb5250db00000000,
+    0x33bf072900000000, 0xa4191ace00000000, 0x8262d91600000000,
+    0x15c4c4f100000000, 0xed29930300000000, 0x7a8f8ee400000000,
+    0xe0d9646900000000, 0x777f798e00000000, 0x8f922e7c00000000,
+    0x1834339b00000000, 0x3e4ff04300000000, 0xa9e9eda400000000,
+    0x5104ba5600000000, 0xc6a2a7b100000000, 0x951fca1900000000,
+    0x02b9d7fe00000000, 0xfa54800c00000000, 0x6df29deb00000000,
+    0x4b895e3300000000, 0xdc2f43d400000000, 0x24c2142600000000,
+    0xb36409c100000000, 0x2932e34c00000000, 0xbe94feab00000000,
+    0x4679a95900000000, 0xd1dfb4be00000000, 0xf7a4776600000000,
+    0x60026a8100000000, 0x98ef3d7300000000, 0x0f49209400000000,
+    0xed4498b300000000, 0x7ae2855400000000, 0x820fd2a600000000,
+    0x15a9cf4100000000, 0x33d20c9900000000, 0xa474117e00000000,
+    0x5c99468c00000000, 0xcb3f5b6b00000000, 0x5169b1e600000000,
+    0xc6cfac0100000000, 0x3e22fbf300000000, 0xa984e61400000000,
+    0x8fff25cc00000000, 0x1859382b00000000, 0xe0b46fd900000000,
+    0x7712723e00000000},
+   {0x0000000000000000, 0x411b8c6e00000000, 0x823618dd00000000,
+    0xc32d94b300000000, 0x456b416100000000, 0x0470cd0f00000000,
+    0xc75d59bc00000000, 0x8646d5d200000000, 0x8ad682c200000000,
+    0xcbcd0eac00000000, 0x08e09a1f00000000, 0x49fb167100000000,
+    0xcfbdc3a300000000, 0x8ea64fcd00000000, 0x4d8bdb7e00000000,
+    0x0c90571000000000, 0x55ab745e00000000, 0x14b0f83000000000,
+    0xd79d6c8300000000, 0x9686e0ed00000000, 0x10c0353f00000000,
+    0x51dbb95100000000, 0x92f62de200000000, 0xd3eda18c00000000,
+    0xdf7df69c00000000, 0x9e667af200000000, 0x5d4bee4100000000,
+    0x1c50622f00000000, 0x9a16b7fd00000000, 0xdb0d3b9300000000,
+    0x1820af2000000000, 0x593b234e00000000, 0xaa56e9bc00000000,
+    0xeb4d65d200000000, 0x2860f16100000000, 0x697b7d0f00000000,
+    0xef3da8dd00000000, 0xae2624b300000000, 0x6d0bb00000000000,
+    0x2c103c6e00000000, 0x20806b7e00000000, 0x619be71000000000,
+    0xa2b673a300000000, 0xe3adffcd00000000, 0x65eb2a1f00000000,
+    0x24f0a67100000000, 0xe7dd32c200000000, 0xa6c6beac00000000,
+    0xfffd9de200000000, 0xbee6118c00000000, 0x7dcb853f00000000,
+    0x3cd0095100000000, 0xba96dc8300000000, 0xfb8d50ed00000000,
+    0x38a0c45e00000000, 0x79bb483000000000, 0x752b1f2000000000,
+    0x3430934e00000000, 0xf71d07fd00000000, 0xb6068b9300000000,
+    0x30405e4100000000, 0x715bd22f00000000, 0xb276469c00000000,
+    0xf36dcaf200000000, 0x15aba3a200000000, 0x54b02fcc00000000,
+    0x979dbb7f00000000, 0xd686371100000000, 0x50c0e2c300000000,
+    0x11db6ead00000000, 0xd2f6fa1e00000000, 0x93ed767000000000,
+    0x9f7d216000000000, 0xde66ad0e00000000, 0x1d4b39bd00000000,
+    0x5c50b5d300000000, 0xda16600100000000, 0x9b0dec6f00000000,
+    0x582078dc00000000, 0x193bf4b200000000, 0x4000d7fc00000000,
+    0x011b5b9200000000, 0xc236cf2100000000, 0x832d434f00000000,
+    0x056b969d00000000, 0x44701af300000000, 0x875d8e4000000000,
+    0xc646022e00000000, 0xcad6553e00000000, 0x8bcdd95000000000,
+    0x48e04de300000000, 0x09fbc18d00000000, 0x8fbd145f00000000,
+    0xcea6983100000000, 0x0d8b0c8200000000, 0x4c9080ec00000000,
+    0xbffd4a1e00000000, 0xfee6c67000000000, 0x3dcb52c300000000,
+    0x7cd0dead00000000, 0xfa960b7f00000000, 0xbb8d871100000000,
+    0x78a013a200000000, 0x39bb9fcc00000000, 0x352bc8dc00000000,
+    0x743044b200000000, 0xb71dd00100000000, 0xf6065c6f00000000,
+    0x704089bd00000000, 0x315b05d300000000, 0xf276916000000000,
+    0xb36d1d0e00000000, 0xea563e4000000000, 0xab4db22e00000000,
+    0x6860269d00000000, 0x297baaf300000000, 0xaf3d7f2100000000,
+    0xee26f34f00000000, 0x2d0b67fc00000000, 0x6c10eb9200000000,
+    0x6080bc8200000000, 0x219b30ec00000000, 0xe2b6a45f00000000,
+    0xa3ad283100000000, 0x25ebfde300000000, 0x64f0718d00000000,
+    0xa7dde53e00000000, 0xe6c6695000000000, 0x6b50369e00000000,
+    0x2a4bbaf000000000, 0xe9662e4300000000, 0xa87da22d00000000,
+    0x2e3b77ff00000000, 0x6f20fb9100000000, 0xac0d6f2200000000,
+    0xed16e34c00000000, 0xe186b45c00000000, 0xa09d383200000000,
+    0x63b0ac8100000000, 0x22ab20ef00000000, 0xa4edf53d00000000,
+    0xe5f6795300000000, 0x26dbede000000000, 0x67c0618e00000000,
+    0x3efb42c000000000, 0x7fe0ceae00000000, 0xbccd5a1d00000000,
+    0xfdd6d67300000000, 0x7b9003a100000000, 0x3a8b8fcf00000000,
+    0xf9a61b7c00000000, 0xb8bd971200000000, 0xb42dc00200000000,
+    0xf5364c6c00000000, 0x361bd8df00000000, 0x770054b100000000,
+    0xf146816300000000, 0xb05d0d0d00000000, 0x737099be00000000,
+    0x326b15d000000000, 0xc106df2200000000, 0x801d534c00000000,
+    0x4330c7ff00000000, 0x022b4b9100000000, 0x846d9e4300000000,
+    0xc576122d00000000, 0x065b869e00000000, 0x47400af000000000,
+    0x4bd05de000000000, 0x0acbd18e00000000, 0xc9e6453d00000000,
+    0x88fdc95300000000, 0x0ebb1c8100000000, 0x4fa090ef00000000,
+    0x8c8d045c00000000, 0xcd96883200000000, 0x94adab7c00000000,
+    0xd5b6271200000000, 0x169bb3a100000000, 0x57803fcf00000000,
+    0xd1c6ea1d00000000, 0x90dd667300000000, 0x53f0f2c000000000,
+    0x12eb7eae00000000, 0x1e7b29be00000000, 0x5f60a5d000000000,
+    0x9c4d316300000000, 0xdd56bd0d00000000, 0x5b1068df00000000,
+    0x1a0be4b100000000, 0xd926700200000000, 0x983dfc6c00000000,
+    0x7efb953c00000000, 0x3fe0195200000000, 0xfccd8de100000000,
+    0xbdd6018f00000000, 0x3b90d45d00000000, 0x7a8b583300000000,
+    0xb9a6cc8000000000, 0xf8bd40ee00000000, 0xf42d17fe00000000,
+    0xb5369b9000000000, 0x761b0f2300000000, 0x3700834d00000000,
+    0xb146569f00000000, 0xf05ddaf100000000, 0x33704e4200000000,
+    0x726bc22c00000000, 0x2b50e16200000000, 0x6a4b6d0c00000000,
+    0xa966f9bf00000000, 0xe87d75d100000000, 0x6e3ba00300000000,
+    0x2f202c6d00000000, 0xec0db8de00000000, 0xad1634b000000000,
+    0xa18663a000000000, 0xe09defce00000000, 0x23b07b7d00000000,
+    0x62abf71300000000, 0xe4ed22c100000000, 0xa5f6aeaf00000000,
+    0x66db3a1c00000000, 0x27c0b67200000000, 0xd4ad7c8000000000,
+    0x95b6f0ee00000000, 0x569b645d00000000, 0x1780e83300000000,
+    0x91c63de100000000, 0xd0ddb18f00000000, 0x13f0253c00000000,
+    0x52eba95200000000, 0x5e7bfe4200000000, 0x1f60722c00000000,
+    0xdc4de69f00000000, 0x9d566af100000000, 0x1b10bf2300000000,
+    0x5a0b334d00000000, 0x9926a7fe00000000, 0xd83d2b9000000000,
+    0x810608de00000000, 0xc01d84b000000000, 0x0330100300000000,
+    0x422b9c6d00000000, 0xc46d49bf00000000, 0x8576c5d100000000,
+    0x465b516200000000, 0x0740dd0c00000000, 0x0bd08a1c00000000,
+    0x4acb067200000000, 0x89e692c100000000, 0xc8fd1eaf00000000,
+    0x4ebbcb7d00000000, 0x0fa0471300000000, 0xcc8dd3a000000000,
+    0x8d965fce00000000},
+   {0x0000000000000000, 0x1dfdb50100000000, 0x3afa6b0300000000,
+    0x2707de0200000000, 0x74f4d70600000000, 0x6909620700000000,
+    0x4e0ebc0500000000, 0x53f3090400000000, 0xe8e8af0d00000000,
+    0xf5151a0c00000000, 0xd212c40e00000000, 0xcfef710f00000000,
+    0x9c1c780b00000000, 0x81e1cd0a00000000, 0xa6e6130800000000,
+    0xbb1ba60900000000, 0xd0d15f1b00000000, 0xcd2cea1a00000000,
+    0xea2b341800000000, 0xf7d6811900000000, 0xa425881d00000000,
+    0xb9d83d1c00000000, 0x9edfe31e00000000, 0x8322561f00000000,
+    0x3839f01600000000, 0x25c4451700000000, 0x02c39b1500000000,
+    0x1f3e2e1400000000, 0x4ccd271000000000, 0x5130921100000000,
+    0x76374c1300000000, 0x6bcaf91200000000, 0xa0a3bf3600000000,
+    0xbd5e0a3700000000, 0x9a59d43500000000, 0x87a4613400000000,
+    0xd457683000000000, 0xc9aadd3100000000, 0xeead033300000000,
+    0xf350b63200000000, 0x484b103b00000000, 0x55b6a53a00000000,
+    0x72b17b3800000000, 0x6f4cce3900000000, 0x3cbfc73d00000000,
+    0x2142723c00000000, 0x0645ac3e00000000, 0x1bb8193f00000000,
+    0x7072e02d00000000, 0x6d8f552c00000000, 0x4a888b2e00000000,
+    0x57753e2f00000000, 0x0486372b00000000, 0x197b822a00000000,
+    0x3e7c5c2800000000, 0x2381e92900000000, 0x989a4f2000000000,
+    0x8567fa2100000000, 0xa260242300000000, 0xbf9d912200000000,
+    0xec6e982600000000, 0xf1932d2700000000, 0xd694f32500000000,
+    0xcb69462400000000, 0x40477f6d00000000, 0x5dbaca6c00000000,
+    0x7abd146e00000000, 0x6740a16f00000000, 0x34b3a86b00000000,
+    0x294e1d6a00000000, 0x0e49c36800000000, 0x13b4766900000000,
+    0xa8afd06000000000, 0xb552656100000000, 0x9255bb6300000000,
+    0x8fa80e6200000000, 0xdc5b076600000000, 0xc1a6b26700000000,
+    0xe6a16c6500000000, 0xfb5cd96400000000, 0x9096207600000000,
+    0x8d6b957700000000, 0xaa6c4b7500000000, 0xb791fe7400000000,
+    0xe462f77000000000, 0xf99f427100000000, 0xde989c7300000000,
+    0xc365297200000000, 0x787e8f7b00000000, 0x65833a7a00000000,
+    0x4284e47800000000, 0x5f79517900000000, 0x0c8a587d00000000,
+    0x1177ed7c00000000, 0x3670337e00000000, 0x2b8d867f00000000,
+    0xe0e4c05b00000000, 0xfd19755a00000000, 0xda1eab5800000000,
+    0xc7e31e5900000000, 0x9410175d00000000, 0x89eda25c00000000,
+    0xaeea7c5e00000000, 0xb317c95f00000000, 0x080c6f5600000000,
+    0x15f1da5700000000, 0x32f6045500000000, 0x2f0bb15400000000,
+    0x7cf8b85000000000, 0x61050d5100000000, 0x4602d35300000000,
+    0x5bff665200000000, 0x30359f4000000000, 0x2dc82a4100000000,
+    0x0acff44300000000, 0x1732414200000000, 0x44c1484600000000,
+    0x593cfd4700000000, 0x7e3b234500000000, 0x63c6964400000000,
+    0xd8dd304d00000000, 0xc520854c00000000, 0xe2275b4e00000000,
+    0xffdaee4f00000000, 0xac29e74b00000000, 0xb1d4524a00000000,
+    0x96d38c4800000000, 0x8b2e394900000000, 0x808efeda00000000,
+    0x9d734bdb00000000, 0xba7495d900000000, 0xa78920d800000000,
+    0xf47a29dc00000000, 0xe9879cdd00000000, 0xce8042df00000000,
+    0xd37df7de00000000, 0x686651d700000000, 0x759be4d600000000,
+    0x529c3ad400000000, 0x4f618fd500000000, 0x1c9286d100000000,
+    0x016f33d000000000, 0x2668edd200000000, 0x3b9558d300000000,
+    0x505fa1c100000000, 0x4da214c000000000, 0x6aa5cac200000000,
+    0x77587fc300000000, 0x24ab76c700000000, 0x3956c3c600000000,
+    0x1e511dc400000000, 0x03aca8c500000000, 0xb8b70ecc00000000,
+    0xa54abbcd00000000, 0x824d65cf00000000, 0x9fb0d0ce00000000,
+    0xcc43d9ca00000000, 0xd1be6ccb00000000, 0xf6b9b2c900000000,
+    0xeb4407c800000000, 0x202d41ec00000000, 0x3dd0f4ed00000000,
+    0x1ad72aef00000000, 0x072a9fee00000000, 0x54d996ea00000000,
+    0x492423eb00000000, 0x6e23fde900000000, 0x73de48e800000000,
+    0xc8c5eee100000000, 0xd5385be000000000, 0xf23f85e200000000,
+    0xefc230e300000000, 0xbc3139e700000000, 0xa1cc8ce600000000,
+    0x86cb52e400000000, 0x9b36e7e500000000, 0xf0fc1ef700000000,
+    0xed01abf600000000, 0xca0675f400000000, 0xd7fbc0f500000000,
+    0x8408c9f100000000, 0x99f57cf000000000, 0xbef2a2f200000000,
+    0xa30f17f300000000, 0x1814b1fa00000000, 0x05e904fb00000000,
+    0x22eedaf900000000, 0x3f136ff800000000, 0x6ce066fc00000000,
+    0x711dd3fd00000000, 0x561a0dff00000000, 0x4be7b8fe00000000,
+    0xc0c981b700000000, 0xdd3434b600000000, 0xfa33eab400000000,
+    0xe7ce5fb500000000, 0xb43d56b100000000, 0xa9c0e3b000000000,
+    0x8ec73db200000000, 0x933a88b300000000, 0x28212eba00000000,
+    0x35dc9bbb00000000, 0x12db45b900000000, 0x0f26f0b800000000,
+    0x5cd5f9bc00000000, 0x41284cbd00000000, 0x662f92bf00000000,
+    0x7bd227be00000000, 0x1018deac00000000, 0x0de56bad00000000,
+    0x2ae2b5af00000000, 0x371f00ae00000000, 0x64ec09aa00000000,
+    0x7911bcab00000000, 0x5e1662a900000000, 0x43ebd7a800000000,
+    0xf8f071a100000000, 0xe50dc4a000000000, 0xc20a1aa200000000,
+    0xdff7afa300000000, 0x8c04a6a700000000, 0x91f913a600000000,
+    0xb6fecda400000000, 0xab0378a500000000, 0x606a3e8100000000,
+    0x7d978b8000000000, 0x5a90558200000000, 0x476de08300000000,
+    0x149ee98700000000, 0x09635c8600000000, 0x2e64828400000000,
+    0x3399378500000000, 0x8882918c00000000, 0x957f248d00000000,
+    0xb278fa8f00000000, 0xaf854f8e00000000, 0xfc76468a00000000,
+    0xe18bf38b00000000, 0xc68c2d8900000000, 0xdb71988800000000,
+    0xb0bb619a00000000, 0xad46d49b00000000, 0x8a410a9900000000,
+    0x97bcbf9800000000, 0xc44fb69c00000000, 0xd9b2039d00000000,
+    0xfeb5dd9f00000000, 0xe348689e00000000, 0x5853ce9700000000,
+    0x45ae7b9600000000, 0x62a9a59400000000, 0x7f54109500000000,
+    0x2ca7199100000000, 0x315aac9000000000, 0x165d729200000000,
+    0x0ba0c79300000000},
+   {0x0000000000000000, 0x24d9076300000000, 0x48b20fc600000000,
+    0x6c6b08a500000000, 0xd1626e5700000000, 0xf5bb693400000000,
+    0x99d0619100000000, 0xbd0966f200000000, 0xa2c5dcae00000000,
+    0x861cdbcd00000000, 0xea77d36800000000, 0xceaed40b00000000,
+    0x73a7b2f900000000, 0x577eb59a00000000, 0x3b15bd3f00000000,
+    0x1fccba5c00000000, 0x058dc88600000000, 0x2154cfe500000000,
+    0x4d3fc74000000000, 0x69e6c02300000000, 0xd4efa6d100000000,
+    0xf036a1b200000000, 0x9c5da91700000000, 0xb884ae7400000000,
+    0xa748142800000000, 0x8391134b00000000, 0xeffa1bee00000000,
+    0xcb231c8d00000000, 0x762a7a7f00000000, 0x52f37d1c00000000,
+    0x3e9875b900000000, 0x1a4172da00000000, 0x4b1ce0d600000000,
+    0x6fc5e7b500000000, 0x03aeef1000000000, 0x2777e87300000000,
+    0x9a7e8e8100000000, 0xbea789e200000000, 0xd2cc814700000000,
+    0xf615862400000000, 0xe9d93c7800000000, 0xcd003b1b00000000,
+    0xa16b33be00000000, 0x85b234dd00000000, 0x38bb522f00000000,
+    0x1c62554c00000000, 0x70095de900000000, 0x54d05a8a00000000,
+    0x4e91285000000000, 0x6a482f3300000000, 0x0623279600000000,
+    0x22fa20f500000000, 0x9ff3460700000000, 0xbb2a416400000000,
+    0xd74149c100000000, 0xf3984ea200000000, 0xec54f4fe00000000,
+    0xc88df39d00000000, 0xa4e6fb3800000000, 0x803ffc5b00000000,
+    0x3d369aa900000000, 0x19ef9dca00000000, 0x7584956f00000000,
+    0x515d920c00000000, 0xd73eb17600000000, 0xf3e7b61500000000,
+    0x9f8cbeb000000000, 0xbb55b9d300000000, 0x065cdf2100000000,
+    0x2285d84200000000, 0x4eeed0e700000000, 0x6a37d78400000000,
+    0x75fb6dd800000000, 0x51226abb00000000, 0x3d49621e00000000,
+    0x1990657d00000000, 0xa499038f00000000, 0x804004ec00000000,
+    0xec2b0c4900000000, 0xc8f20b2a00000000, 0xd2b379f000000000,
+    0xf66a7e9300000000, 0x9a01763600000000, 0xbed8715500000000,
+    0x03d117a700000000, 0x270810c400000000, 0x4b63186100000000,
+    0x6fba1f0200000000, 0x7076a55e00000000, 0x54afa23d00000000,
+    0x38c4aa9800000000, 0x1c1dadfb00000000, 0xa114cb0900000000,
+    0x85cdcc6a00000000, 0xe9a6c4cf00000000, 0xcd7fc3ac00000000,
+    0x9c2251a000000000, 0xb8fb56c300000000, 0xd4905e6600000000,
+    0xf049590500000000, 0x4d403ff700000000, 0x6999389400000000,
+    0x05f2303100000000, 0x212b375200000000, 0x3ee78d0e00000000,
+    0x1a3e8a6d00000000, 0x765582c800000000, 0x528c85ab00000000,
+    0xef85e35900000000, 0xcb5ce43a00000000, 0xa737ec9f00000000,
+    0x83eeebfc00000000, 0x99af992600000000, 0xbd769e4500000000,
+    0xd11d96e000000000, 0xf5c4918300000000, 0x48cdf77100000000,
+    0x6c14f01200000000, 0x007ff8b700000000, 0x24a6ffd400000000,
+    0x3b6a458800000000, 0x1fb342eb00000000, 0x73d84a4e00000000,
+    0x57014d2d00000000, 0xea082bdf00000000, 0xced12cbc00000000,
+    0xa2ba241900000000, 0x8663237a00000000, 0xae7d62ed00000000,
+    0x8aa4658e00000000, 0xe6cf6d2b00000000, 0xc2166a4800000000,
+    0x7f1f0cba00000000, 0x5bc60bd900000000, 0x37ad037c00000000,
+    0x1374041f00000000, 0x0cb8be4300000000, 0x2861b92000000000,
+    0x440ab18500000000, 0x60d3b6e600000000, 0xdddad01400000000,
+    0xf903d77700000000, 0x9568dfd200000000, 0xb1b1d8b100000000,
+    0xabf0aa6b00000000, 0x8f29ad0800000000, 0xe342a5ad00000000,
+    0xc79ba2ce00000000, 0x7a92c43c00000000, 0x5e4bc35f00000000,
+    0x3220cbfa00000000, 0x16f9cc9900000000, 0x093576c500000000,
+    0x2dec71a600000000, 0x4187790300000000, 0x655e7e6000000000,
+    0xd857189200000000, 0xfc8e1ff100000000, 0x90e5175400000000,
+    0xb43c103700000000, 0xe561823b00000000, 0xc1b8855800000000,
+    0xadd38dfd00000000, 0x890a8a9e00000000, 0x3403ec6c00000000,
+    0x10daeb0f00000000, 0x7cb1e3aa00000000, 0x5868e4c900000000,
+    0x47a45e9500000000, 0x637d59f600000000, 0x0f16515300000000,
+    0x2bcf563000000000, 0x96c630c200000000, 0xb21f37a100000000,
+    0xde743f0400000000, 0xfaad386700000000, 0xe0ec4abd00000000,
+    0xc4354dde00000000, 0xa85e457b00000000, 0x8c87421800000000,
+    0x318e24ea00000000, 0x1557238900000000, 0x793c2b2c00000000,
+    0x5de52c4f00000000, 0x4229961300000000, 0x66f0917000000000,
+    0x0a9b99d500000000, 0x2e429eb600000000, 0x934bf84400000000,
+    0xb792ff2700000000, 0xdbf9f78200000000, 0xff20f0e100000000,
+    0x7943d39b00000000, 0x5d9ad4f800000000, 0x31f1dc5d00000000,
+    0x1528db3e00000000, 0xa821bdcc00000000, 0x8cf8baaf00000000,
+    0xe093b20a00000000, 0xc44ab56900000000, 0xdb860f3500000000,
+    0xff5f085600000000, 0x933400f300000000, 0xb7ed079000000000,
+    0x0ae4616200000000, 0x2e3d660100000000, 0x42566ea400000000,
+    0x668f69c700000000, 0x7cce1b1d00000000, 0x58171c7e00000000,
+    0x347c14db00000000, 0x10a513b800000000, 0xadac754a00000000,
+    0x8975722900000000, 0xe51e7a8c00000000, 0xc1c77def00000000,
+    0xde0bc7b300000000, 0xfad2c0d000000000, 0x96b9c87500000000,
+    0xb260cf1600000000, 0x0f69a9e400000000, 0x2bb0ae8700000000,
+    0x47dba62200000000, 0x6302a14100000000, 0x325f334d00000000,
+    0x1686342e00000000, 0x7aed3c8b00000000, 0x5e343be800000000,
+    0xe33d5d1a00000000, 0xc7e45a7900000000, 0xab8f52dc00000000,
+    0x8f5655bf00000000, 0x909aefe300000000, 0xb443e88000000000,
+    0xd828e02500000000, 0xfcf1e74600000000, 0x41f881b400000000,
+    0x652186d700000000, 0x094a8e7200000000, 0x2d93891100000000,
+    0x37d2fbcb00000000, 0x130bfca800000000, 0x7f60f40d00000000,
+    0x5bb9f36e00000000, 0xe6b0959c00000000, 0xc26992ff00000000,
+    0xae029a5a00000000, 0x8adb9d3900000000, 0x9517276500000000,
+    0xb1ce200600000000, 0xdda528a300000000, 0xf97c2fc000000000,
+    0x4475493200000000, 0x60ac4e5100000000, 0x0cc746f400000000,
+    0x281e419700000000},
+   {0x0000000000000000, 0x08e3603c00000000, 0x10c6c17800000000,
+    0x1825a14400000000, 0x208c83f100000000, 0x286fe3cd00000000,
+    0x304a428900000000, 0x38a922b500000000, 0x011e763800000000,
+    0x09fd160400000000, 0x11d8b74000000000, 0x193bd77c00000000,
+    0x2192f5c900000000, 0x297195f500000000, 0x315434b100000000,
+    0x39b7548d00000000, 0x023cec7000000000, 0x0adf8c4c00000000,
+    0x12fa2d0800000000, 0x1a194d3400000000, 0x22b06f8100000000,
+    0x2a530fbd00000000, 0x3276aef900000000, 0x3a95cec500000000,
+    0x03229a4800000000, 0x0bc1fa7400000000, 0x13e45b3000000000,
+    0x1b073b0c00000000, 0x23ae19b900000000, 0x2b4d798500000000,
+    0x3368d8c100000000, 0x3b8bb8fd00000000, 0x0478d8e100000000,
+    0x0c9bb8dd00000000, 0x14be199900000000, 0x1c5d79a500000000,
+    0x24f45b1000000000, 0x2c173b2c00000000, 0x34329a6800000000,
+    0x3cd1fa5400000000, 0x0566aed900000000, 0x0d85cee500000000,
+    0x15a06fa100000000, 0x1d430f9d00000000, 0x25ea2d2800000000,
+    0x2d094d1400000000, 0x352cec5000000000, 0x3dcf8c6c00000000,
+    0x0644349100000000, 0x0ea754ad00000000, 0x1682f5e900000000,
+    0x1e6195d500000000, 0x26c8b76000000000, 0x2e2bd75c00000000,
+    0x360e761800000000, 0x3eed162400000000, 0x075a42a900000000,
+    0x0fb9229500000000, 0x179c83d100000000, 0x1f7fe3ed00000000,
+    0x27d6c15800000000, 0x2f35a16400000000, 0x3710002000000000,
+    0x3ff3601c00000000, 0x49f6c11800000000, 0x4115a12400000000,
+    0x5930006000000000, 0x51d3605c00000000, 0x697a42e900000000,
+    0x619922d500000000, 0x79bc839100000000, 0x715fe3ad00000000,
+    0x48e8b72000000000, 0x400bd71c00000000, 0x582e765800000000,
+    0x50cd166400000000, 0x686434d100000000, 0x608754ed00000000,
+    0x78a2f5a900000000, 0x7041959500000000, 0x4bca2d6800000000,
+    0x43294d5400000000, 0x5b0cec1000000000, 0x53ef8c2c00000000,
+    0x6b46ae9900000000, 0x63a5cea500000000, 0x7b806fe100000000,
+    0x73630fdd00000000, 0x4ad45b5000000000, 0x42373b6c00000000,
+    0x5a129a2800000000, 0x52f1fa1400000000, 0x6a58d8a100000000,
+    0x62bbb89d00000000, 0x7a9e19d900000000, 0x727d79e500000000,
+    0x4d8e19f900000000, 0x456d79c500000000, 0x5d48d88100000000,
+    0x55abb8bd00000000, 0x6d029a0800000000, 0x65e1fa3400000000,
+    0x7dc45b7000000000, 0x75273b4c00000000, 0x4c906fc100000000,
+    0x44730ffd00000000, 0x5c56aeb900000000, 0x54b5ce8500000000,
+    0x6c1cec3000000000, 0x64ff8c0c00000000, 0x7cda2d4800000000,
+    0x74394d7400000000, 0x4fb2f58900000000, 0x475195b500000000,
+    0x5f7434f100000000, 0x579754cd00000000, 0x6f3e767800000000,
+    0x67dd164400000000, 0x7ff8b70000000000, 0x771bd73c00000000,
+    0x4eac83b100000000, 0x464fe38d00000000, 0x5e6a42c900000000,
+    0x568922f500000000, 0x6e20004000000000, 0x66c3607c00000000,
+    0x7ee6c13800000000, 0x7605a10400000000, 0x92ec833100000000,
+    0x9a0fe30d00000000, 0x822a424900000000, 0x8ac9227500000000,
+    0xb26000c000000000, 0xba8360fc00000000, 0xa2a6c1b800000000,
+    0xaa45a18400000000, 0x93f2f50900000000, 0x9b11953500000000,
+    0x8334347100000000, 0x8bd7544d00000000, 0xb37e76f800000000,
+    0xbb9d16c400000000, 0xa3b8b78000000000, 0xab5bd7bc00000000,
+    0x90d06f4100000000, 0x98330f7d00000000, 0x8016ae3900000000,
+    0x88f5ce0500000000, 0xb05cecb000000000, 0xb8bf8c8c00000000,
+    0xa09a2dc800000000, 0xa8794df400000000, 0x91ce197900000000,
+    0x992d794500000000, 0x8108d80100000000, 0x89ebb83d00000000,
+    0xb1429a8800000000, 0xb9a1fab400000000, 0xa1845bf000000000,
+    0xa9673bcc00000000, 0x96945bd000000000, 0x9e773bec00000000,
+    0x86529aa800000000, 0x8eb1fa9400000000, 0xb618d82100000000,
+    0xbefbb81d00000000, 0xa6de195900000000, 0xae3d796500000000,
+    0x978a2de800000000, 0x9f694dd400000000, 0x874cec9000000000,
+    0x8faf8cac00000000, 0xb706ae1900000000, 0xbfe5ce2500000000,
+    0xa7c06f6100000000, 0xaf230f5d00000000, 0x94a8b7a000000000,
+    0x9c4bd79c00000000, 0x846e76d800000000, 0x8c8d16e400000000,
+    0xb424345100000000, 0xbcc7546d00000000, 0xa4e2f52900000000,
+    0xac01951500000000, 0x95b6c19800000000, 0x9d55a1a400000000,
+    0x857000e000000000, 0x8d9360dc00000000, 0xb53a426900000000,
+    0xbdd9225500000000, 0xa5fc831100000000, 0xad1fe32d00000000,
+    0xdb1a422900000000, 0xd3f9221500000000, 0xcbdc835100000000,
+    0xc33fe36d00000000, 0xfb96c1d800000000, 0xf375a1e400000000,
+    0xeb5000a000000000, 0xe3b3609c00000000, 0xda04341100000000,
+    0xd2e7542d00000000, 0xcac2f56900000000, 0xc221955500000000,
+    0xfa88b7e000000000, 0xf26bd7dc00000000, 0xea4e769800000000,
+    0xe2ad16a400000000, 0xd926ae5900000000, 0xd1c5ce6500000000,
+    0xc9e06f2100000000, 0xc1030f1d00000000, 0xf9aa2da800000000,
+    0xf1494d9400000000, 0xe96cecd000000000, 0xe18f8cec00000000,
+    0xd838d86100000000, 0xd0dbb85d00000000, 0xc8fe191900000000,
+    0xc01d792500000000, 0xf8b45b9000000000, 0xf0573bac00000000,
+    0xe8729ae800000000, 0xe091fad400000000, 0xdf629ac800000000,
+    0xd781faf400000000, 0xcfa45bb000000000, 0xc7473b8c00000000,
+    0xffee193900000000, 0xf70d790500000000, 0xef28d84100000000,
+    0xe7cbb87d00000000, 0xde7cecf000000000, 0xd69f8ccc00000000,
+    0xceba2d8800000000, 0xc6594db400000000, 0xfef06f0100000000,
+    0xf6130f3d00000000, 0xee36ae7900000000, 0xe6d5ce4500000000,
+    0xdd5e76b800000000, 0xd5bd168400000000, 0xcd98b7c000000000,
+    0xc57bd7fc00000000, 0xfdd2f54900000000, 0xf531957500000000,
+    0xed14343100000000, 0xe5f7540d00000000, 0xdc40008000000000,
+    0xd4a360bc00000000, 0xcc86c1f800000000, 0xc465a1c400000000,
+    0xfccc837100000000, 0xf42fe34d00000000, 0xec0a420900000000,
+    0xe4e9223500000000},
+   {0x0000000000000000, 0xd1e8e70e00000000, 0xa2d1cf1d00000000,
+    0x7339281300000000, 0x44a39f3b00000000, 0x954b783500000000,
+    0xe672502600000000, 0x379ab72800000000, 0x88463f7700000000,
+    0x59aed87900000000, 0x2a97f06a00000000, 0xfb7f176400000000,
+    0xcce5a04c00000000, 0x1d0d474200000000, 0x6e346f5100000000,
+    0xbfdc885f00000000, 0x108d7eee00000000, 0xc16599e000000000,
+    0xb25cb1f300000000, 0x63b456fd00000000, 0x542ee1d500000000,
+    0x85c606db00000000, 0xf6ff2ec800000000, 0x2717c9c600000000,
+    0x98cb419900000000, 0x4923a69700000000, 0x3a1a8e8400000000,
+    0xebf2698a00000000, 0xdc68dea200000000, 0x0d8039ac00000000,
+    0x7eb911bf00000000, 0xaf51f6b100000000, 0x611c8c0700000000,
+    0xb0f46b0900000000, 0xc3cd431a00000000, 0x1225a41400000000,
+    0x25bf133c00000000, 0xf457f43200000000, 0x876edc2100000000,
+    0x56863b2f00000000, 0xe95ab37000000000, 0x38b2547e00000000,
+    0x4b8b7c6d00000000, 0x9a639b6300000000, 0xadf92c4b00000000,
+    0x7c11cb4500000000, 0x0f28e35600000000, 0xdec0045800000000,
+    0x7191f2e900000000, 0xa07915e700000000, 0xd3403df400000000,
+    0x02a8dafa00000000, 0x35326dd200000000, 0xe4da8adc00000000,
+    0x97e3a2cf00000000, 0x460b45c100000000, 0xf9d7cd9e00000000,
+    0x283f2a9000000000, 0x5b06028300000000, 0x8aeee58d00000000,
+    0xbd7452a500000000, 0x6c9cb5ab00000000, 0x1fa59db800000000,
+    0xce4d7ab600000000, 0xc238180f00000000, 0x13d0ff0100000000,
+    0x60e9d71200000000, 0xb101301c00000000, 0x869b873400000000,
+    0x5773603a00000000, 0x244a482900000000, 0xf5a2af2700000000,
+    0x4a7e277800000000, 0x9b96c07600000000, 0xe8afe86500000000,
+    0x39470f6b00000000, 0x0eddb84300000000, 0xdf355f4d00000000,
+    0xac0c775e00000000, 0x7de4905000000000, 0xd2b566e100000000,
+    0x035d81ef00000000, 0x7064a9fc00000000, 0xa18c4ef200000000,
+    0x9616f9da00000000, 0x47fe1ed400000000, 0x34c736c700000000,
+    0xe52fd1c900000000, 0x5af3599600000000, 0x8b1bbe9800000000,
+    0xf822968b00000000, 0x29ca718500000000, 0x1e50c6ad00000000,
+    0xcfb821a300000000, 0xbc8109b000000000, 0x6d69eebe00000000,
+    0xa324940800000000, 0x72cc730600000000, 0x01f55b1500000000,
+    0xd01dbc1b00000000, 0xe7870b3300000000, 0x366fec3d00000000,
+    0x4556c42e00000000, 0x94be232000000000, 0x2b62ab7f00000000,
+    0xfa8a4c7100000000, 0x89b3646200000000, 0x585b836c00000000,
+    0x6fc1344400000000, 0xbe29d34a00000000, 0xcd10fb5900000000,
+    0x1cf81c5700000000, 0xb3a9eae600000000, 0x62410de800000000,
+    0x117825fb00000000, 0xc090c2f500000000, 0xf70a75dd00000000,
+    0x26e292d300000000, 0x55dbbac000000000, 0x84335dce00000000,
+    0x3befd59100000000, 0xea07329f00000000, 0x993e1a8c00000000,
+    0x48d6fd8200000000, 0x7f4c4aaa00000000, 0xaea4ada400000000,
+    0xdd9d85b700000000, 0x0c7562b900000000, 0x8471301e00000000,
+    0x5599d71000000000, 0x26a0ff0300000000, 0xf748180d00000000,
+    0xc0d2af2500000000, 0x113a482b00000000, 0x6203603800000000,
+    0xb3eb873600000000, 0x0c370f6900000000, 0xdddfe86700000000,
+    0xaee6c07400000000, 0x7f0e277a00000000, 0x4894905200000000,
+    0x997c775c00000000, 0xea455f4f00000000, 0x3badb84100000000,
+    0x94fc4ef000000000, 0x4514a9fe00000000, 0x362d81ed00000000,
+    0xe7c566e300000000, 0xd05fd1cb00000000, 0x01b736c500000000,
+    0x728e1ed600000000, 0xa366f9d800000000, 0x1cba718700000000,
+    0xcd52968900000000, 0xbe6bbe9a00000000, 0x6f83599400000000,
+    0x5819eebc00000000, 0x89f109b200000000, 0xfac821a100000000,
+    0x2b20c6af00000000, 0xe56dbc1900000000, 0x34855b1700000000,
+    0x47bc730400000000, 0x9654940a00000000, 0xa1ce232200000000,
+    0x7026c42c00000000, 0x031fec3f00000000, 0xd2f70b3100000000,
+    0x6d2b836e00000000, 0xbcc3646000000000, 0xcffa4c7300000000,
+    0x1e12ab7d00000000, 0x29881c5500000000, 0xf860fb5b00000000,
+    0x8b59d34800000000, 0x5ab1344600000000, 0xf5e0c2f700000000,
+    0x240825f900000000, 0x57310dea00000000, 0x86d9eae400000000,
+    0xb1435dcc00000000, 0x60abbac200000000, 0x139292d100000000,
+    0xc27a75df00000000, 0x7da6fd8000000000, 0xac4e1a8e00000000,
+    0xdf77329d00000000, 0x0e9fd59300000000, 0x390562bb00000000,
+    0xe8ed85b500000000, 0x9bd4ada600000000, 0x4a3c4aa800000000,
+    0x4649281100000000, 0x97a1cf1f00000000, 0xe498e70c00000000,
+    0x3570000200000000, 0x02eab72a00000000, 0xd302502400000000,
+    0xa03b783700000000, 0x71d39f3900000000, 0xce0f176600000000,
+    0x1fe7f06800000000, 0x6cded87b00000000, 0xbd363f7500000000,
+    0x8aac885d00000000, 0x5b446f5300000000, 0x287d474000000000,
+    0xf995a04e00000000, 0x56c456ff00000000, 0x872cb1f100000000,
+    0xf41599e200000000, 0x25fd7eec00000000, 0x1267c9c400000000,
+    0xc38f2eca00000000, 0xb0b606d900000000, 0x615ee1d700000000,
+    0xde82698800000000, 0x0f6a8e8600000000, 0x7c53a69500000000,
+    0xadbb419b00000000, 0x9a21f6b300000000, 0x4bc911bd00000000,
+    0x38f039ae00000000, 0xe918dea000000000, 0x2755a41600000000,
+    0xf6bd431800000000, 0x85846b0b00000000, 0x546c8c0500000000,
+    0x63f63b2d00000000, 0xb21edc2300000000, 0xc127f43000000000,
+    0x10cf133e00000000, 0xaf139b6100000000, 0x7efb7c6f00000000,
+    0x0dc2547c00000000, 0xdc2ab37200000000, 0xebb0045a00000000,
+    0x3a58e35400000000, 0x4961cb4700000000, 0x98892c4900000000,
+    0x37d8daf800000000, 0xe6303df600000000, 0x950915e500000000,
+    0x44e1f2eb00000000, 0x737b45c300000000, 0xa293a2cd00000000,
+    0xd1aa8ade00000000, 0x00426dd000000000, 0xbf9ee58f00000000,
+    0x6e76028100000000, 0x1d4f2a9200000000, 0xcca7cd9c00000000,
+    0xfb3d7ab400000000, 0x2ad59dba00000000, 0x59ecb5a900000000,
+    0x880452a700000000},
+   {0x0000000000000000, 0xaa05daf100000000, 0x150dc53800000000,
+    0xbf081fc900000000, 0x2a1a8a7100000000, 0x801f508000000000,
+    0x3f174f4900000000, 0x951295b800000000, 0x543414e300000000,
+    0xfe31ce1200000000, 0x4139d1db00000000, 0xeb3c0b2a00000000,
+    0x7e2e9e9200000000, 0xd42b446300000000, 0x6b235baa00000000,
+    0xc126815b00000000, 0xe96e591d00000000, 0x436b83ec00000000,
+    0xfc639c2500000000, 0x566646d400000000, 0xc374d36c00000000,
+    0x6971099d00000000, 0xd679165400000000, 0x7c7ccca500000000,
+    0xbd5a4dfe00000000, 0x175f970f00000000, 0xa85788c600000000,
+    0x0252523700000000, 0x9740c78f00000000, 0x3d451d7e00000000,
+    0x824d02b700000000, 0x2848d84600000000, 0xd2ddb23a00000000,
+    0x78d868cb00000000, 0xc7d0770200000000, 0x6dd5adf300000000,
+    0xf8c7384b00000000, 0x52c2e2ba00000000, 0xedcafd7300000000,
+    0x47cf278200000000, 0x86e9a6d900000000, 0x2cec7c2800000000,
+    0x93e463e100000000, 0x39e1b91000000000, 0xacf32ca800000000,
+    0x06f6f65900000000, 0xb9fee99000000000, 0x13fb336100000000,
+    0x3bb3eb2700000000, 0x91b631d600000000, 0x2ebe2e1f00000000,
+    0x84bbf4ee00000000, 0x11a9615600000000, 0xbbacbba700000000,
+    0x04a4a46e00000000, 0xaea17e9f00000000, 0x6f87ffc400000000,
+    0xc582253500000000, 0x7a8a3afc00000000, 0xd08fe00d00000000,
+    0x459d75b500000000, 0xef98af4400000000, 0x5090b08d00000000,
+    0xfa956a7c00000000, 0xa4bb657500000000, 0x0ebebf8400000000,
+    0xb1b6a04d00000000, 0x1bb37abc00000000, 0x8ea1ef0400000000,
+    0x24a435f500000000, 0x9bac2a3c00000000, 0x31a9f0cd00000000,
+    0xf08f719600000000, 0x5a8aab6700000000, 0xe582b4ae00000000,
+    0x4f876e5f00000000, 0xda95fbe700000000, 0x7090211600000000,
+    0xcf983edf00000000, 0x659de42e00000000, 0x4dd53c6800000000,
+    0xe7d0e69900000000, 0x58d8f95000000000, 0xf2dd23a100000000,
+    0x67cfb61900000000, 0xcdca6ce800000000, 0x72c2732100000000,
+    0xd8c7a9d000000000, 0x19e1288b00000000, 0xb3e4f27a00000000,
+    0x0cecedb300000000, 0xa6e9374200000000, 0x33fba2fa00000000,
+    0x99fe780b00000000, 0x26f667c200000000, 0x8cf3bd3300000000,
+    0x7666d74f00000000, 0xdc630dbe00000000, 0x636b127700000000,
+    0xc96ec88600000000, 0x5c7c5d3e00000000, 0xf67987cf00000000,
+    0x4971980600000000, 0xe37442f700000000, 0x2252c3ac00000000,
+    0x8857195d00000000, 0x375f069400000000, 0x9d5adc6500000000,
+    0x084849dd00000000, 0xa24d932c00000000, 0x1d458ce500000000,
+    0xb740561400000000, 0x9f088e5200000000, 0x350d54a300000000,
+    0x8a054b6a00000000, 0x2000919b00000000, 0xb512042300000000,
+    0x1f17ded200000000, 0xa01fc11b00000000, 0x0a1a1bea00000000,
+    0xcb3c9ab100000000, 0x6139404000000000, 0xde315f8900000000,
+    0x7434857800000000, 0xe12610c000000000, 0x4b23ca3100000000,
+    0xf42bd5f800000000, 0x5e2e0f0900000000, 0x4877cbea00000000,
+    0xe272111b00000000, 0x5d7a0ed200000000, 0xf77fd42300000000,
+    0x626d419b00000000, 0xc8689b6a00000000, 0x776084a300000000,
+    0xdd655e5200000000, 0x1c43df0900000000, 0xb64605f800000000,
+    0x094e1a3100000000, 0xa34bc0c000000000, 0x3659557800000000,
+    0x9c5c8f8900000000, 0x2354904000000000, 0x89514ab100000000,
+    0xa11992f700000000, 0x0b1c480600000000, 0xb41457cf00000000,
+    0x1e118d3e00000000, 0x8b03188600000000, 0x2106c27700000000,
+    0x9e0eddbe00000000, 0x340b074f00000000, 0xf52d861400000000,
+    0x5f285ce500000000, 0xe020432c00000000, 0x4a2599dd00000000,
+    0xdf370c6500000000, 0x7532d69400000000, 0xca3ac95d00000000,
+    0x603f13ac00000000, 0x9aaa79d000000000, 0x30afa32100000000,
+    0x8fa7bce800000000, 0x25a2661900000000, 0xb0b0f3a100000000,
+    0x1ab5295000000000, 0xa5bd369900000000, 0x0fb8ec6800000000,
+    0xce9e6d3300000000, 0x649bb7c200000000, 0xdb93a80b00000000,
+    0x719672fa00000000, 0xe484e74200000000, 0x4e813db300000000,
+    0xf189227a00000000, 0x5b8cf88b00000000, 0x73c420cd00000000,
+    0xd9c1fa3c00000000, 0x66c9e5f500000000, 0xcccc3f0400000000,
+    0x59deaabc00000000, 0xf3db704d00000000, 0x4cd36f8400000000,
+    0xe6d6b57500000000, 0x27f0342e00000000, 0x8df5eedf00000000,
+    0x32fdf11600000000, 0x98f82be700000000, 0x0deabe5f00000000,
+    0xa7ef64ae00000000, 0x18e77b6700000000, 0xb2e2a19600000000,
+    0xecccae9f00000000, 0x46c9746e00000000, 0xf9c16ba700000000,
+    0x53c4b15600000000, 0xc6d624ee00000000, 0x6cd3fe1f00000000,
+    0xd3dbe1d600000000, 0x79de3b2700000000, 0xb8f8ba7c00000000,
+    0x12fd608d00000000, 0xadf57f4400000000, 0x07f0a5b500000000,
+    0x92e2300d00000000, 0x38e7eafc00000000, 0x87eff53500000000,
+    0x2dea2fc400000000, 0x05a2f78200000000, 0xafa72d7300000000,
+    0x10af32ba00000000, 0xbaaae84b00000000, 0x2fb87df300000000,
+    0x85bda70200000000, 0x3ab5b8cb00000000, 0x90b0623a00000000,
+    0x5196e36100000000, 0xfb93399000000000, 0x449b265900000000,
+    0xee9efca800000000, 0x7b8c691000000000, 0xd189b3e100000000,
+    0x6e81ac2800000000, 0xc48476d900000000, 0x3e111ca500000000,
+    0x9414c65400000000, 0x2b1cd99d00000000, 0x8119036c00000000,
+    0x140b96d400000000, 0xbe0e4c2500000000, 0x010653ec00000000,
+    0xab03891d00000000, 0x6a25084600000000, 0xc020d2b700000000,
+    0x7f28cd7e00000000, 0xd52d178f00000000, 0x403f823700000000,
+    0xea3a58c600000000, 0x5532470f00000000, 0xff379dfe00000000,
+    0xd77f45b800000000, 0x7d7a9f4900000000, 0xc272808000000000,
+    0x68775a7100000000, 0xfd65cfc900000000, 0x5760153800000000,
+    0xe8680af100000000, 0x426dd00000000000, 0x834b515b00000000,
+    0x294e8baa00000000, 0x9646946300000000, 0x3c434e9200000000,
+    0xa951db2a00000000, 0x035401db00000000, 0xbc5c1e1200000000,
+    0x1659c4e300000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x85d996dd, 0x4bb55c60, 0xce6ccabd, 0x966ab9c0,
+    0x13b32f1d, 0xdddfe5a0, 0x5806737d, 0x6dd3035a, 0xe80a9587,
+    0x26665f3a, 0xa3bfc9e7, 0xfbb9ba9a, 0x7e602c47, 0xb00ce6fa,
+    0x35d57027, 0xdaa607b4, 0x5f7f9169, 0x91135bd4, 0x14cacd09,
+    0x4cccbe74, 0xc91528a9, 0x0779e214, 0x82a074c9, 0xb77504ee,
+    0x32ac9233, 0xfcc0588e, 0x7919ce53, 0x211fbd2e, 0xa4c62bf3,
+    0x6aaae14e, 0xef737793, 0xf54b7eb3, 0x7092e86e, 0xbefe22d3,
+    0x3b27b40e, 0x6321c773, 0xe6f851ae, 0x28949b13, 0xad4d0dce,
+    0x98987de9, 0x1d41eb34, 0xd32d2189, 0x56f4b754, 0x0ef2c429,
+    0x8b2b52f4, 0x45479849, 0xc09e0e94, 0x2fed7907, 0xaa34efda,
+    0x64582567, 0xe181b3ba, 0xb987c0c7, 0x3c5e561a, 0xf2329ca7,
+    0x77eb0a7a, 0x423e7a5d, 0xc7e7ec80, 0x098b263d, 0x8c52b0e0,
+    0xd454c39d, 0x518d5540, 0x9fe19ffd, 0x1a380920, 0xab918dbd,
+    0x2e481b60, 0xe024d1dd, 0x65fd4700, 0x3dfb347d, 0xb822a2a0,
+    0x764e681d, 0xf397fec0, 0xc6428ee7, 0x439b183a, 0x8df7d287,
+    0x082e445a, 0x50283727, 0xd5f1a1fa, 0x1b9d6b47, 0x9e44fd9a,
+    0x71378a09, 0xf4ee1cd4, 0x3a82d669, 0xbf5b40b4, 0xe75d33c9,
+    0x6284a514, 0xace86fa9, 0x2931f974, 0x1ce48953, 0x993d1f8e,
+    0x5751d533, 0xd28843ee, 0x8a8e3093, 0x0f57a64e, 0xc13b6cf3,
+    0x44e2fa2e, 0x5edaf30e, 0xdb0365d3, 0x156faf6e, 0x90b639b3,
+    0xc8b04ace, 0x4d69dc13, 0x830516ae, 0x06dc8073, 0x3309f054,
+    0xb6d06689, 0x78bcac34, 0xfd653ae9, 0xa5634994, 0x20badf49,
+    0xeed615f4, 0x6b0f8329, 0x847cf4ba, 0x01a56267, 0xcfc9a8da,
+    0x4a103e07, 0x12164d7a, 0x97cfdba7, 0x59a3111a, 0xdc7a87c7,
+    0xe9aff7e0, 0x6c76613d, 0xa21aab80, 0x27c33d5d, 0x7fc54e20,
+    0xfa1cd8fd, 0x34701240, 0xb1a9849d, 0x17256aa0, 0x92fcfc7d,
+    0x5c9036c0, 0xd949a01d, 0x814fd360, 0x049645bd, 0xcafa8f00,
+    0x4f2319dd, 0x7af669fa, 0xff2fff27, 0x3143359a, 0xb49aa347,
+    0xec9cd03a, 0x694546e7, 0xa7298c5a, 0x22f01a87, 0xcd836d14,
+    0x485afbc9, 0x86363174, 0x03efa7a9, 0x5be9d4d4, 0xde304209,
+    0x105c88b4, 0x95851e69, 0xa0506e4e, 0x2589f893, 0xebe5322e,
+    0x6e3ca4f3, 0x363ad78e, 0xb3e34153, 0x7d8f8bee, 0xf8561d33,
+    0xe26e1413, 0x67b782ce, 0xa9db4873, 0x2c02deae, 0x7404add3,
+    0xf1dd3b0e, 0x3fb1f1b3, 0xba68676e, 0x8fbd1749, 0x0a648194,
+    0xc4084b29, 0x41d1ddf4, 0x19d7ae89, 0x9c0e3854, 0x5262f2e9,
+    0xd7bb6434, 0x38c813a7, 0xbd11857a, 0x737d4fc7, 0xf6a4d91a,
+    0xaea2aa67, 0x2b7b3cba, 0xe517f607, 0x60ce60da, 0x551b10fd,
+    0xd0c28620, 0x1eae4c9d, 0x9b77da40, 0xc371a93d, 0x46a83fe0,
+    0x88c4f55d, 0x0d1d6380, 0xbcb4e71d, 0x396d71c0, 0xf701bb7d,
+    0x72d82da0, 0x2ade5edd, 0xaf07c800, 0x616b02bd, 0xe4b29460,
+    0xd167e447, 0x54be729a, 0x9ad2b827, 0x1f0b2efa, 0x470d5d87,
+    0xc2d4cb5a, 0x0cb801e7, 0x8961973a, 0x6612e0a9, 0xe3cb7674,
+    0x2da7bcc9, 0xa87e2a14, 0xf0785969, 0x75a1cfb4, 0xbbcd0509,
+    0x3e1493d4, 0x0bc1e3f3, 0x8e18752e, 0x4074bf93, 0xc5ad294e,
+    0x9dab5a33, 0x1872ccee, 0xd61e0653, 0x53c7908e, 0x49ff99ae,
+    0xcc260f73, 0x024ac5ce, 0x87935313, 0xdf95206e, 0x5a4cb6b3,
+    0x94207c0e, 0x11f9ead3, 0x242c9af4, 0xa1f50c29, 0x6f99c694,
+    0xea405049, 0xb2462334, 0x379fb5e9, 0xf9f37f54, 0x7c2ae989,
+    0x93599e1a, 0x168008c7, 0xd8ecc27a, 0x5d3554a7, 0x053327da,
+    0x80eab107, 0x4e867bba, 0xcb5fed67, 0xfe8a9d40, 0x7b530b9d,
+    0xb53fc120, 0x30e657fd, 0x68e02480, 0xed39b25d, 0x235578e0,
+    0xa68cee3d},
+   {0x00000000, 0x76e10f9d, 0xadc46ee1, 0xdb25617c, 0x1b8fac19,
+    0x6d6ea384, 0xb64bc2f8, 0xc0aacd65, 0x361e5933, 0x40ff56ae,
+    0x9bda37d2, 0xed3b384f, 0x2d91f52a, 0x5b70fab7, 0x80559bcb,
+    0xf6b49456, 0x6c3cb266, 0x1addbdfb, 0xc1f8dc87, 0xb719d31a,
+    0x77b31e7f, 0x015211e2, 0xda77709e, 0xac967f03, 0x5a22eb55,
+    0x2cc3e4c8, 0xf7e685b4, 0x81078a29, 0x41ad474c, 0x374c48d1,
+    0xec6929ad, 0x9a882630, 0xd87864cd, 0xae996b50, 0x75bc0a2c,
+    0x035d05b1, 0xc3f7c8d4, 0xb516c749, 0x6e33a635, 0x18d2a9a8,
+    0xee663dfe, 0x98873263, 0x43a2531f, 0x35435c82, 0xf5e991e7,
+    0x83089e7a, 0x582dff06, 0x2eccf09b, 0xb444d6ab, 0xc2a5d936,
+    0x1980b84a, 0x6f61b7d7, 0xafcb7ab2, 0xd92a752f, 0x020f1453,
+    0x74ee1bce, 0x825a8f98, 0xf4bb8005, 0x2f9ee179, 0x597feee4,
+    0x99d52381, 0xef342c1c, 0x34114d60, 0x42f042fd, 0xf1f7b941,
+    0x8716b6dc, 0x5c33d7a0, 0x2ad2d83d, 0xea781558, 0x9c991ac5,
+    0x47bc7bb9, 0x315d7424, 0xc7e9e072, 0xb108efef, 0x6a2d8e93,
+    0x1ccc810e, 0xdc664c6b, 0xaa8743f6, 0x71a2228a, 0x07432d17,
+    0x9dcb0b27, 0xeb2a04ba, 0x300f65c6, 0x46ee6a5b, 0x8644a73e,
+    0xf0a5a8a3, 0x2b80c9df, 0x5d61c642, 0xabd55214, 0xdd345d89,
+    0x06113cf5, 0x70f03368, 0xb05afe0d, 0xc6bbf190, 0x1d9e90ec,
+    0x6b7f9f71, 0x298fdd8c, 0x5f6ed211, 0x844bb36d, 0xf2aabcf0,
+    0x32007195, 0x44e17e08, 0x9fc41f74, 0xe92510e9, 0x1f9184bf,
+    0x69708b22, 0xb255ea5e, 0xc4b4e5c3, 0x041e28a6, 0x72ff273b,
+    0xa9da4647, 0xdf3b49da, 0x45b36fea, 0x33526077, 0xe877010b,
+    0x9e960e96, 0x5e3cc3f3, 0x28ddcc6e, 0xf3f8ad12, 0x8519a28f,
+    0x73ad36d9, 0x054c3944, 0xde695838, 0xa88857a5, 0x68229ac0,
+    0x1ec3955d, 0xc5e6f421, 0xb307fbbc, 0xe2ef7383, 0x940e7c1e,
+    0x4f2b1d62, 0x39ca12ff, 0xf960df9a, 0x8f81d007, 0x54a4b17b,
+    0x2245bee6, 0xd4f12ab0, 0xa210252d, 0x79354451, 0x0fd44bcc,
+    0xcf7e86a9, 0xb99f8934, 0x62bae848, 0x145be7d5, 0x8ed3c1e5,
+    0xf832ce78, 0x2317af04, 0x55f6a099, 0x955c6dfc, 0xe3bd6261,
+    0x3898031d, 0x4e790c80, 0xb8cd98d6, 0xce2c974b, 0x1509f637,
+    0x63e8f9aa, 0xa34234cf, 0xd5a33b52, 0x0e865a2e, 0x786755b3,
+    0x3a97174e, 0x4c7618d3, 0x975379af, 0xe1b27632, 0x2118bb57,
+    0x57f9b4ca, 0x8cdcd5b6, 0xfa3dda2b, 0x0c894e7d, 0x7a6841e0,
+    0xa14d209c, 0xd7ac2f01, 0x1706e264, 0x61e7edf9, 0xbac28c85,
+    0xcc238318, 0x56aba528, 0x204aaab5, 0xfb6fcbc9, 0x8d8ec454,
+    0x4d240931, 0x3bc506ac, 0xe0e067d0, 0x9601684d, 0x60b5fc1b,
+    0x1654f386, 0xcd7192fa, 0xbb909d67, 0x7b3a5002, 0x0ddb5f9f,
+    0xd6fe3ee3, 0xa01f317e, 0x1318cac2, 0x65f9c55f, 0xbedca423,
+    0xc83dabbe, 0x089766db, 0x7e766946, 0xa553083a, 0xd3b207a7,
+    0x250693f1, 0x53e79c6c, 0x88c2fd10, 0xfe23f28d, 0x3e893fe8,
+    0x48683075, 0x934d5109, 0xe5ac5e94, 0x7f2478a4, 0x09c57739,
+    0xd2e01645, 0xa40119d8, 0x64abd4bd, 0x124adb20, 0xc96fba5c,
+    0xbf8eb5c1, 0x493a2197, 0x3fdb2e0a, 0xe4fe4f76, 0x921f40eb,
+    0x52b58d8e, 0x24548213, 0xff71e36f, 0x8990ecf2, 0xcb60ae0f,
+    0xbd81a192, 0x66a4c0ee, 0x1045cf73, 0xd0ef0216, 0xa60e0d8b,
+    0x7d2b6cf7, 0x0bca636a, 0xfd7ef73c, 0x8b9ff8a1, 0x50ba99dd,
+    0x265b9640, 0xe6f15b25, 0x901054b8, 0x4b3535c4, 0x3dd43a59,
+    0xa75c1c69, 0xd1bd13f4, 0x0a987288, 0x7c797d15, 0xbcd3b070,
+    0xca32bfed, 0x1117de91, 0x67f6d10c, 0x9142455a, 0xe7a34ac7,
+    0x3c862bbb, 0x4a672426, 0x8acde943, 0xfc2ce6de, 0x270987a2,
+    0x51e8883f},
+   {0x00000000, 0xe8dbfbb9, 0x91b186a8, 0x796a7d11, 0x63657c8a,
+    0x8bbe8733, 0xf2d4fa22, 0x1a0f019b, 0x87cc89cf, 0x6f177276,
+    0x167d0f67, 0xfea6f4de, 0xe4a9f545, 0x0c720efc, 0x751873ed,
+    0x9dc38854, 0x4f9f6244, 0xa74499fd, 0xde2ee4ec, 0x36f51f55,
+    0x2cfa1ece, 0xc421e577, 0xbd4b9866, 0x559063df, 0xc853eb8b,
+    0x20881032, 0x59e26d23, 0xb139969a, 0xab369701, 0x43ed6cb8,
+    0x3a8711a9, 0xd25cea10, 0x9e3ec588, 0x76e53e31, 0x0f8f4320,
+    0xe754b899, 0xfd5bb902, 0x158042bb, 0x6cea3faa, 0x8431c413,
+    0x19f24c47, 0xf129b7fe, 0x8843caef, 0x60983156, 0x7a9730cd,
+    0x924ccb74, 0xeb26b665, 0x03fd4ddc, 0xd1a1a7cc, 0x397a5c75,
+    0x40102164, 0xa8cbdadd, 0xb2c4db46, 0x5a1f20ff, 0x23755dee,
+    0xcbaea657, 0x566d2e03, 0xbeb6d5ba, 0xc7dca8ab, 0x2f075312,
+    0x35085289, 0xddd3a930, 0xa4b9d421, 0x4c622f98, 0x7d7bfbca,
+    0x95a00073, 0xecca7d62, 0x041186db, 0x1e1e8740, 0xf6c57cf9,
+    0x8faf01e8, 0x6774fa51, 0xfab77205, 0x126c89bc, 0x6b06f4ad,
+    0x83dd0f14, 0x99d20e8f, 0x7109f536, 0x08638827, 0xe0b8739e,
+    0x32e4998e, 0xda3f6237, 0xa3551f26, 0x4b8ee49f, 0x5181e504,
+    0xb95a1ebd, 0xc03063ac, 0x28eb9815, 0xb5281041, 0x5df3ebf8,
+    0x249996e9, 0xcc426d50, 0xd64d6ccb, 0x3e969772, 0x47fcea63,
+    0xaf2711da, 0xe3453e42, 0x0b9ec5fb, 0x72f4b8ea, 0x9a2f4353,
+    0x802042c8, 0x68fbb971, 0x1191c460, 0xf94a3fd9, 0x6489b78d,
+    0x8c524c34, 0xf5383125, 0x1de3ca9c, 0x07eccb07, 0xef3730be,
+    0x965d4daf, 0x7e86b616, 0xacda5c06, 0x4401a7bf, 0x3d6bdaae,
+    0xd5b02117, 0xcfbf208c, 0x2764db35, 0x5e0ea624, 0xb6d55d9d,
+    0x2b16d5c9, 0xc3cd2e70, 0xbaa75361, 0x527ca8d8, 0x4873a943,
+    0xa0a852fa, 0xd9c22feb, 0x3119d452, 0xbbf0874e, 0x532b7cf7,
+    0x2a4101e6, 0xc29afa5f, 0xd895fbc4, 0x304e007d, 0x49247d6c,
+    0xa1ff86d5, 0x3c3c0e81, 0xd4e7f538, 0xad8d8829, 0x45567390,
+    0x5f59720b, 0xb78289b2, 0xcee8f4a3, 0x26330f1a, 0xf46fe50a,
+    0x1cb41eb3, 0x65de63a2, 0x8d05981b, 0x970a9980, 0x7fd16239,
+    0x06bb1f28, 0xee60e491, 0x73a36cc5, 0x9b78977c, 0xe212ea6d,
+    0x0ac911d4, 0x10c6104f, 0xf81debf6, 0x817796e7, 0x69ac6d5e,
+    0x25ce42c6, 0xcd15b97f, 0xb47fc46e, 0x5ca43fd7, 0x46ab3e4c,
+    0xae70c5f5, 0xd71ab8e4, 0x3fc1435d, 0xa202cb09, 0x4ad930b0,
+    0x33b34da1, 0xdb68b618, 0xc167b783, 0x29bc4c3a, 0x50d6312b,
+    0xb80dca92, 0x6a512082, 0x828adb3b, 0xfbe0a62a, 0x133b5d93,
+    0x09345c08, 0xe1efa7b1, 0x9885daa0, 0x705e2119, 0xed9da94d,
+    0x054652f4, 0x7c2c2fe5, 0x94f7d45c, 0x8ef8d5c7, 0x66232e7e,
+    0x1f49536f, 0xf792a8d6, 0xc68b7c84, 0x2e50873d, 0x573afa2c,
+    0xbfe10195, 0xa5ee000e, 0x4d35fbb7, 0x345f86a6, 0xdc847d1f,
+    0x4147f54b, 0xa99c0ef2, 0xd0f673e3, 0x382d885a, 0x222289c1,
+    0xcaf97278, 0xb3930f69, 0x5b48f4d0, 0x89141ec0, 0x61cfe579,
+    0x18a59868, 0xf07e63d1, 0xea71624a, 0x02aa99f3, 0x7bc0e4e2,
+    0x931b1f5b, 0x0ed8970f, 0xe6036cb6, 0x9f6911a7, 0x77b2ea1e,
+    0x6dbdeb85, 0x8566103c, 0xfc0c6d2d, 0x14d79694, 0x58b5b90c,
+    0xb06e42b5, 0xc9043fa4, 0x21dfc41d, 0x3bd0c586, 0xd30b3e3f,
+    0xaa61432e, 0x42bab897, 0xdf7930c3, 0x37a2cb7a, 0x4ec8b66b,
+    0xa6134dd2, 0xbc1c4c49, 0x54c7b7f0, 0x2dadcae1, 0xc5763158,
+    0x172adb48, 0xfff120f1, 0x869b5de0, 0x6e40a659, 0x744fa7c2,
+    0x9c945c7b, 0xe5fe216a, 0x0d25dad3, 0x90e65287, 0x783da93e,
+    0x0157d42f, 0xe98c2f96, 0xf3832e0d, 0x1b58d5b4, 0x6232a8a5,
+    0x8ae9531c},
+   {0x00000000, 0x919168ae, 0x6325a087, 0xf2b4c829, 0x874c31d4,
+    0x16dd597a, 0xe4699153, 0x75f8f9fd, 0x4f9f1373, 0xde0e7bdd,
+    0x2cbab3f4, 0xbd2bdb5a, 0xc8d322a7, 0x59424a09, 0xabf68220,
+    0x3a67ea8e, 0x9e3e27e6, 0x0faf4f48, 0xfd1b8761, 0x6c8aefcf,
+    0x19721632, 0x88e37e9c, 0x7a57b6b5, 0xebc6de1b, 0xd1a13495,
+    0x40305c3b, 0xb2849412, 0x2315fcbc, 0x56ed0541, 0xc77c6def,
+    0x35c8a5c6, 0xa459cd68, 0x7d7b3f17, 0xecea57b9, 0x1e5e9f90,
+    0x8fcff73e, 0xfa370ec3, 0x6ba6666d, 0x9912ae44, 0x0883c6ea,
+    0x32e42c64, 0xa37544ca, 0x51c18ce3, 0xc050e44d, 0xb5a81db0,
+    0x2439751e, 0xd68dbd37, 0x471cd599, 0xe34518f1, 0x72d4705f,
+    0x8060b876, 0x11f1d0d8, 0x64092925, 0xf598418b, 0x072c89a2,
+    0x96bde10c, 0xacda0b82, 0x3d4b632c, 0xcfffab05, 0x5e6ec3ab,
+    0x2b963a56, 0xba0752f8, 0x48b39ad1, 0xd922f27f, 0xfaf67e2e,
+    0x6b671680, 0x99d3dea9, 0x0842b607, 0x7dba4ffa, 0xec2b2754,
+    0x1e9fef7d, 0x8f0e87d3, 0xb5696d5d, 0x24f805f3, 0xd64ccdda,
+    0x47dda574, 0x32255c89, 0xa3b43427, 0x5100fc0e, 0xc09194a0,
+    0x64c859c8, 0xf5593166, 0x07edf94f, 0x967c91e1, 0xe384681c,
+    0x721500b2, 0x80a1c89b, 0x1130a035, 0x2b574abb, 0xbac62215,
+    0x4872ea3c, 0xd9e38292, 0xac1b7b6f, 0x3d8a13c1, 0xcf3edbe8,
+    0x5eafb346, 0x878d4139, 0x161c2997, 0xe4a8e1be, 0x75398910,
+    0x00c170ed, 0x91501843, 0x63e4d06a, 0xf275b8c4, 0xc812524a,
+    0x59833ae4, 0xab37f2cd, 0x3aa69a63, 0x4f5e639e, 0xdecf0b30,
+    0x2c7bc319, 0xbdeaabb7, 0x19b366df, 0x88220e71, 0x7a96c658,
+    0xeb07aef6, 0x9eff570b, 0x0f6e3fa5, 0xfddaf78c, 0x6c4b9f22,
+    0x562c75ac, 0xc7bd1d02, 0x3509d52b, 0xa498bd85, 0xd1604478,
+    0x40f12cd6, 0xb245e4ff, 0x23d48c51, 0xf4edfd5c, 0x657c95f2,
+    0x97c85ddb, 0x06593575, 0x73a1cc88, 0xe230a426, 0x10846c0f,
+    0x811504a1, 0xbb72ee2f, 0x2ae38681, 0xd8574ea8, 0x49c62606,
+    0x3c3edffb, 0xadafb755, 0x5f1b7f7c, 0xce8a17d2, 0x6ad3daba,
+    0xfb42b214, 0x09f67a3d, 0x98671293, 0xed9feb6e, 0x7c0e83c0,
+    0x8eba4be9, 0x1f2b2347, 0x254cc9c9, 0xb4dda167, 0x4669694e,
+    0xd7f801e0, 0xa200f81d, 0x339190b3, 0xc125589a, 0x50b43034,
+    0x8996c24b, 0x1807aae5, 0xeab362cc, 0x7b220a62, 0x0edaf39f,
+    0x9f4b9b31, 0x6dff5318, 0xfc6e3bb6, 0xc609d138, 0x5798b996,
+    0xa52c71bf, 0x34bd1911, 0x4145e0ec, 0xd0d48842, 0x2260406b,
+    0xb3f128c5, 0x17a8e5ad, 0x86398d03, 0x748d452a, 0xe51c2d84,
+    0x90e4d479, 0x0175bcd7, 0xf3c174fe, 0x62501c50, 0x5837f6de,
+    0xc9a69e70, 0x3b125659, 0xaa833ef7, 0xdf7bc70a, 0x4eeaafa4,
+    0xbc5e678d, 0x2dcf0f23, 0x0e1b8372, 0x9f8aebdc, 0x6d3e23f5,
+    0xfcaf4b5b, 0x8957b2a6, 0x18c6da08, 0xea721221, 0x7be37a8f,
+    0x41849001, 0xd015f8af, 0x22a13086, 0xb3305828, 0xc6c8a1d5,
+    0x5759c97b, 0xa5ed0152, 0x347c69fc, 0x9025a494, 0x01b4cc3a,
+    0xf3000413, 0x62916cbd, 0x17699540, 0x86f8fdee, 0x744c35c7,
+    0xe5dd5d69, 0xdfbab7e7, 0x4e2bdf49, 0xbc9f1760, 0x2d0e7fce,
+    0x58f68633, 0xc967ee9d, 0x3bd326b4, 0xaa424e1a, 0x7360bc65,
+    0xe2f1d4cb, 0x10451ce2, 0x81d4744c, 0xf42c8db1, 0x65bde51f,
+    0x97092d36, 0x06984598, 0x3cffaf16, 0xad6ec7b8, 0x5fda0f91,
+    0xce4b673f, 0xbbb39ec2, 0x2a22f66c, 0xd8963e45, 0x490756eb,
+    0xed5e9b83, 0x7ccff32d, 0x8e7b3b04, 0x1fea53aa, 0x6a12aa57,
+    0xfb83c2f9, 0x09370ad0, 0x98a6627e, 0xa2c188f0, 0x3350e05e,
+    0xc1e42877, 0x507540d9, 0x258db924, 0xb41cd18a, 0x46a819a3,
+    0xd739710d}};
+
+#endif
+
+#endif
+
+#if N == 5
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xaf449247, 0x85f822cf, 0x2abcb088, 0xd08143df,
+    0x7fc5d198, 0x55796110, 0xfa3df357, 0x7a7381ff, 0xd53713b8,
+    0xff8ba330, 0x50cf3177, 0xaaf2c220, 0x05b65067, 0x2f0ae0ef,
+    0x804e72a8, 0xf4e703fe, 0x5ba391b9, 0x711f2131, 0xde5bb376,
+    0x24664021, 0x8b22d266, 0xa19e62ee, 0x0edaf0a9, 0x8e948201,
+    0x21d01046, 0x0b6ca0ce, 0xa4283289, 0x5e15c1de, 0xf1515399,
+    0xdbede311, 0x74a97156, 0x32bf01bd, 0x9dfb93fa, 0xb7472372,
+    0x1803b135, 0xe23e4262, 0x4d7ad025, 0x67c660ad, 0xc882f2ea,
+    0x48cc8042, 0xe7881205, 0xcd34a28d, 0x627030ca, 0x984dc39d,
+    0x370951da, 0x1db5e152, 0xb2f17315, 0xc6580243, 0x691c9004,
+    0x43a0208c, 0xece4b2cb, 0x16d9419c, 0xb99dd3db, 0x93216353,
+    0x3c65f114, 0xbc2b83bc, 0x136f11fb, 0x39d3a173, 0x96973334,
+    0x6caac063, 0xc3ee5224, 0xe952e2ac, 0x461670eb, 0x657e037a,
+    0xca3a913d, 0xe08621b5, 0x4fc2b3f2, 0xb5ff40a5, 0x1abbd2e2,
+    0x3007626a, 0x9f43f02d, 0x1f0d8285, 0xb04910c2, 0x9af5a04a,
+    0x35b1320d, 0xcf8cc15a, 0x60c8531d, 0x4a74e395, 0xe53071d2,
+    0x91990084, 0x3edd92c3, 0x1461224b, 0xbb25b00c, 0x4118435b,
+    0xee5cd11c, 0xc4e06194, 0x6ba4f3d3, 0xebea817b, 0x44ae133c,
+    0x6e12a3b4, 0xc15631f3, 0x3b6bc2a4, 0x942f50e3, 0xbe93e06b,
+    0x11d7722c, 0x57c102c7, 0xf8859080, 0xd2392008, 0x7d7db24f,
+    0x87404118, 0x2804d35f, 0x02b863d7, 0xadfcf190, 0x2db28338,
+    0x82f6117f, 0xa84aa1f7, 0x070e33b0, 0xfd33c0e7, 0x527752a0,
+    0x78cbe228, 0xd78f706f, 0xa3260139, 0x0c62937e, 0x26de23f6,
+    0x899ab1b1, 0x73a742e6, 0xdce3d0a1, 0xf65f6029, 0x591bf26e,
+    0xd95580c6, 0x76111281, 0x5cada209, 0xf3e9304e, 0x09d4c319,
+    0xa690515e, 0x8c2ce1d6, 0x23687391, 0xcafc06f4, 0x65b894b3,
+    0x4f04243b, 0xe040b67c, 0x1a7d452b, 0xb539d76c, 0x9f8567e4,
+    0x30c1f5a3, 0xb08f870b, 0x1fcb154c, 0x3577a5c4, 0x9a333783,
+    0x600ec4d4, 0xcf4a5693, 0xe5f6e61b, 0x4ab2745c, 0x3e1b050a,
+    0x915f974d, 0xbbe327c5, 0x14a7b582, 0xee9a46d5, 0x41ded492,
+    0x6b62641a, 0xc426f65d, 0x446884f5, 0xeb2c16b2, 0xc190a63a,
+    0x6ed4347d, 0x94e9c72a, 0x3bad556d, 0x1111e5e5, 0xbe5577a2,
+    0xf8430749, 0x5707950e, 0x7dbb2586, 0xd2ffb7c1, 0x28c24496,
+    0x8786d6d1, 0xad3a6659, 0x027ef41e, 0x823086b6, 0x2d7414f1,
+    0x07c8a479, 0xa88c363e, 0x52b1c569, 0xfdf5572e, 0xd749e7a6,
+    0x780d75e1, 0x0ca404b7, 0xa3e096f0, 0x895c2678, 0x2618b43f,
+    0xdc254768, 0x7361d52f, 0x59dd65a7, 0xf699f7e0, 0x76d78548,
+    0xd993170f, 0xf32fa787, 0x5c6b35c0, 0xa656c697, 0x091254d0,
+    0x23aee458, 0x8cea761f, 0xaf82058e, 0x00c697c9, 0x2a7a2741,
+    0x853eb506, 0x7f034651, 0xd047d416, 0xfafb649e, 0x55bff6d9,
+    0xd5f18471, 0x7ab51636, 0x5009a6be, 0xff4d34f9, 0x0570c7ae,
+    0xaa3455e9, 0x8088e561, 0x2fcc7726, 0x5b650670, 0xf4219437,
+    0xde9d24bf, 0x71d9b6f8, 0x8be445af, 0x24a0d7e8, 0x0e1c6760,
+    0xa158f527, 0x2116878f, 0x8e5215c8, 0xa4eea540, 0x0baa3707,
+    0xf197c450, 0x5ed35617, 0x746fe69f, 0xdb2b74d8, 0x9d3d0433,
+    0x32799674, 0x18c526fc, 0xb781b4bb, 0x4dbc47ec, 0xe2f8d5ab,
+    0xc8446523, 0x6700f764, 0xe74e85cc, 0x480a178b, 0x62b6a703,
+    0xcdf23544, 0x37cfc613, 0x988b5454, 0xb237e4dc, 0x1d73769b,
+    0x69da07cd, 0xc69e958a, 0xec222502, 0x4366b745, 0xb95b4412,
+    0x161fd655, 0x3ca366dd, 0x93e7f49a, 0x13a98632, 0xbced1475,
+    0x9651a4fd, 0x391536ba, 0xc328c5ed, 0x6c6c57aa, 0x46d0e722,
+    0xe9947565},
+   {0x00000000, 0x4e890ba9, 0x9d121752, 0xd39b1cfb, 0xe15528e5,
+    0xafdc234c, 0x7c473fb7, 0x32ce341e, 0x19db578b, 0x57525c22,
+    0x84c940d9, 0xca404b70, 0xf88e7f6e, 0xb60774c7, 0x659c683c,
+    0x2b156395, 0x33b6af16, 0x7d3fa4bf, 0xaea4b844, 0xe02db3ed,
+    0xd2e387f3, 0x9c6a8c5a, 0x4ff190a1, 0x01789b08, 0x2a6df89d,
+    0x64e4f334, 0xb77fefcf, 0xf9f6e466, 0xcb38d078, 0x85b1dbd1,
+    0x562ac72a, 0x18a3cc83, 0x676d5e2c, 0x29e45585, 0xfa7f497e,
+    0xb4f642d7, 0x863876c9, 0xc8b17d60, 0x1b2a619b, 0x55a36a32,
+    0x7eb609a7, 0x303f020e, 0xe3a41ef5, 0xad2d155c, 0x9fe32142,
+    0xd16a2aeb, 0x02f13610, 0x4c783db9, 0x54dbf13a, 0x1a52fa93,
+    0xc9c9e668, 0x8740edc1, 0xb58ed9df, 0xfb07d276, 0x289cce8d,
+    0x6615c524, 0x4d00a6b1, 0x0389ad18, 0xd012b1e3, 0x9e9bba4a,
+    0xac558e54, 0xe2dc85fd, 0x31479906, 0x7fce92af, 0xcedabc58,
+    0x8053b7f1, 0x53c8ab0a, 0x1d41a0a3, 0x2f8f94bd, 0x61069f14,
+    0xb29d83ef, 0xfc148846, 0xd701ebd3, 0x9988e07a, 0x4a13fc81,
+    0x049af728, 0x3654c336, 0x78ddc89f, 0xab46d464, 0xe5cfdfcd,
+    0xfd6c134e, 0xb3e518e7, 0x607e041c, 0x2ef70fb5, 0x1c393bab,
+    0x52b03002, 0x812b2cf9, 0xcfa22750, 0xe4b744c5, 0xaa3e4f6c,
+    0x79a55397, 0x372c583e, 0x05e26c20, 0x4b6b6789, 0x98f07b72,
+    0xd67970db, 0xa9b7e274, 0xe73ee9dd, 0x34a5f526, 0x7a2cfe8f,
+    0x48e2ca91, 0x066bc138, 0xd5f0ddc3, 0x9b79d66a, 0xb06cb5ff,
+    0xfee5be56, 0x2d7ea2ad, 0x63f7a904, 0x51399d1a, 0x1fb096b3,
+    0xcc2b8a48, 0x82a281e1, 0x9a014d62, 0xd48846cb, 0x07135a30,
+    0x499a5199, 0x7b546587, 0x35dd6e2e, 0xe64672d5, 0xa8cf797c,
+    0x83da1ae9, 0xcd531140, 0x1ec80dbb, 0x50410612, 0x628f320c,
+    0x2c0639a5, 0xff9d255e, 0xb1142ef7, 0x46c47ef1, 0x084d7558,
+    0xdbd669a3, 0x955f620a, 0xa7915614, 0xe9185dbd, 0x3a834146,
+    0x740a4aef, 0x5f1f297a, 0x119622d3, 0xc20d3e28, 0x8c843581,
+    0xbe4a019f, 0xf0c30a36, 0x235816cd, 0x6dd11d64, 0x7572d1e7,
+    0x3bfbda4e, 0xe860c6b5, 0xa6e9cd1c, 0x9427f902, 0xdaaef2ab,
+    0x0935ee50, 0x47bce5f9, 0x6ca9866c, 0x22208dc5, 0xf1bb913e,
+    0xbf329a97, 0x8dfcae89, 0xc375a520, 0x10eeb9db, 0x5e67b272,
+    0x21a920dd, 0x6f202b74, 0xbcbb378f, 0xf2323c26, 0xc0fc0838,
+    0x8e750391, 0x5dee1f6a, 0x136714c3, 0x38727756, 0x76fb7cff,
+    0xa5606004, 0xebe96bad, 0xd9275fb3, 0x97ae541a, 0x443548e1,
+    0x0abc4348, 0x121f8fcb, 0x5c968462, 0x8f0d9899, 0xc1849330,
+    0xf34aa72e, 0xbdc3ac87, 0x6e58b07c, 0x20d1bbd5, 0x0bc4d840,
+    0x454dd3e9, 0x96d6cf12, 0xd85fc4bb, 0xea91f0a5, 0xa418fb0c,
+    0x7783e7f7, 0x390aec5e, 0x881ec2a9, 0xc697c900, 0x150cd5fb,
+    0x5b85de52, 0x694bea4c, 0x27c2e1e5, 0xf459fd1e, 0xbad0f6b7,
+    0x91c59522, 0xdf4c9e8b, 0x0cd78270, 0x425e89d9, 0x7090bdc7,
+    0x3e19b66e, 0xed82aa95, 0xa30ba13c, 0xbba86dbf, 0xf5216616,
+    0x26ba7aed, 0x68337144, 0x5afd455a, 0x14744ef3, 0xc7ef5208,
+    0x896659a1, 0xa2733a34, 0xecfa319d, 0x3f612d66, 0x71e826cf,
+    0x432612d1, 0x0daf1978, 0xde340583, 0x90bd0e2a, 0xef739c85,
+    0xa1fa972c, 0x72618bd7, 0x3ce8807e, 0x0e26b460, 0x40afbfc9,
+    0x9334a332, 0xddbda89b, 0xf6a8cb0e, 0xb821c0a7, 0x6bbadc5c,
+    0x2533d7f5, 0x17fde3eb, 0x5974e842, 0x8aeff4b9, 0xc466ff10,
+    0xdcc53393, 0x924c383a, 0x41d724c1, 0x0f5e2f68, 0x3d901b76,
+    0x731910df, 0xa0820c24, 0xee0b078d, 0xc51e6418, 0x8b976fb1,
+    0x580c734a, 0x168578e3, 0x244b4cfd, 0x6ac24754, 0xb9595baf,
+    0xf7d05006},
+   {0x00000000, 0x8d88fde2, 0xc060fd85, 0x4de80067, 0x5bb0fd4b,
+    0xd63800a9, 0x9bd000ce, 0x1658fd2c, 0xb761fa96, 0x3ae90774,
+    0x77010713, 0xfa89faf1, 0xecd107dd, 0x6159fa3f, 0x2cb1fa58,
+    0xa13907ba, 0xb5b2f36d, 0x383a0e8f, 0x75d20ee8, 0xf85af30a,
+    0xee020e26, 0x638af3c4, 0x2e62f3a3, 0xa3ea0e41, 0x02d309fb,
+    0x8f5bf419, 0xc2b3f47e, 0x4f3b099c, 0x5963f4b0, 0xd4eb0952,
+    0x99030935, 0x148bf4d7, 0xb014e09b, 0x3d9c1d79, 0x70741d1e,
+    0xfdfce0fc, 0xeba41dd0, 0x662ce032, 0x2bc4e055, 0xa64c1db7,
+    0x07751a0d, 0x8afde7ef, 0xc715e788, 0x4a9d1a6a, 0x5cc5e746,
+    0xd14d1aa4, 0x9ca51ac3, 0x112de721, 0x05a613f6, 0x882eee14,
+    0xc5c6ee73, 0x484e1391, 0x5e16eebd, 0xd39e135f, 0x9e761338,
+    0x13feeeda, 0xb2c7e960, 0x3f4f1482, 0x72a714e5, 0xff2fe907,
+    0xe977142b, 0x64ffe9c9, 0x2917e9ae, 0xa49f144c, 0xbb58c777,
+    0x36d03a95, 0x7b383af2, 0xf6b0c710, 0xe0e83a3c, 0x6d60c7de,
+    0x2088c7b9, 0xad003a5b, 0x0c393de1, 0x81b1c003, 0xcc59c064,
+    0x41d13d86, 0x5789c0aa, 0xda013d48, 0x97e93d2f, 0x1a61c0cd,
+    0x0eea341a, 0x8362c9f8, 0xce8ac99f, 0x4302347d, 0x555ac951,
+    0xd8d234b3, 0x953a34d4, 0x18b2c936, 0xb98bce8c, 0x3403336e,
+    0x79eb3309, 0xf463ceeb, 0xe23b33c7, 0x6fb3ce25, 0x225bce42,
+    0xafd333a0, 0x0b4c27ec, 0x86c4da0e, 0xcb2cda69, 0x46a4278b,
+    0x50fcdaa7, 0xdd742745, 0x909c2722, 0x1d14dac0, 0xbc2ddd7a,
+    0x31a52098, 0x7c4d20ff, 0xf1c5dd1d, 0xe79d2031, 0x6a15ddd3,
+    0x27fdddb4, 0xaa752056, 0xbefed481, 0x33762963, 0x7e9e2904,
+    0xf316d4e6, 0xe54e29ca, 0x68c6d428, 0x252ed44f, 0xa8a629ad,
+    0x099f2e17, 0x8417d3f5, 0xc9ffd392, 0x44772e70, 0x522fd35c,
+    0xdfa72ebe, 0x924f2ed9, 0x1fc7d33b, 0xadc088af, 0x2048754d,
+    0x6da0752a, 0xe02888c8, 0xf67075e4, 0x7bf88806, 0x36108861,
+    0xbb987583, 0x1aa17239, 0x97298fdb, 0xdac18fbc, 0x5749725e,
+    0x41118f72, 0xcc997290, 0x817172f7, 0x0cf98f15, 0x18727bc2,
+    0x95fa8620, 0xd8128647, 0x559a7ba5, 0x43c28689, 0xce4a7b6b,
+    0x83a27b0c, 0x0e2a86ee, 0xaf138154, 0x229b7cb6, 0x6f737cd1,
+    0xe2fb8133, 0xf4a37c1f, 0x792b81fd, 0x34c3819a, 0xb94b7c78,
+    0x1dd46834, 0x905c95d6, 0xddb495b1, 0x503c6853, 0x4664957f,
+    0xcbec689d, 0x860468fa, 0x0b8c9518, 0xaab592a2, 0x273d6f40,
+    0x6ad56f27, 0xe75d92c5, 0xf1056fe9, 0x7c8d920b, 0x3165926c,
+    0xbced6f8e, 0xa8669b59, 0x25ee66bb, 0x680666dc, 0xe58e9b3e,
+    0xf3d66612, 0x7e5e9bf0, 0x33b69b97, 0xbe3e6675, 0x1f0761cf,
+    0x928f9c2d, 0xdf679c4a, 0x52ef61a8, 0x44b79c84, 0xc93f6166,
+    0x84d76101, 0x095f9ce3, 0x16984fd8, 0x9b10b23a, 0xd6f8b25d,
+    0x5b704fbf, 0x4d28b293, 0xc0a04f71, 0x8d484f16, 0x00c0b2f4,
+    0xa1f9b54e, 0x2c7148ac, 0x619948cb, 0xec11b529, 0xfa494805,
+    0x77c1b5e7, 0x3a29b580, 0xb7a14862, 0xa32abcb5, 0x2ea24157,
+    0x634a4130, 0xeec2bcd2, 0xf89a41fe, 0x7512bc1c, 0x38fabc7b,
+    0xb5724199, 0x144b4623, 0x99c3bbc1, 0xd42bbba6, 0x59a34644,
+    0x4ffbbb68, 0xc273468a, 0x8f9b46ed, 0x0213bb0f, 0xa68caf43,
+    0x2b0452a1, 0x66ec52c6, 0xeb64af24, 0xfd3c5208, 0x70b4afea,
+    0x3d5caf8d, 0xb0d4526f, 0x11ed55d5, 0x9c65a837, 0xd18da850,
+    0x5c0555b2, 0x4a5da89e, 0xc7d5557c, 0x8a3d551b, 0x07b5a8f9,
+    0x133e5c2e, 0x9eb6a1cc, 0xd35ea1ab, 0x5ed65c49, 0x488ea165,
+    0xc5065c87, 0x88ee5ce0, 0x0566a102, 0xa45fa6b8, 0x29d75b5a,
+    0x643f5b3d, 0xe9b7a6df, 0xffef5bf3, 0x7267a611, 0x3f8fa676,
+    0xb2075b94},
+   {0x00000000, 0x80f0171f, 0xda91287f, 0x5a613f60, 0x6e5356bf,
+    0xeea341a0, 0xb4c27ec0, 0x343269df, 0xdca6ad7e, 0x5c56ba61,
+    0x06378501, 0x86c7921e, 0xb2f5fbc1, 0x3205ecde, 0x6864d3be,
+    0xe894c4a1, 0x623c5cbd, 0xe2cc4ba2, 0xb8ad74c2, 0x385d63dd,
+    0x0c6f0a02, 0x8c9f1d1d, 0xd6fe227d, 0x560e3562, 0xbe9af1c3,
+    0x3e6ae6dc, 0x640bd9bc, 0xe4fbcea3, 0xd0c9a77c, 0x5039b063,
+    0x0a588f03, 0x8aa8981c, 0xc478b97a, 0x4488ae65, 0x1ee99105,
+    0x9e19861a, 0xaa2befc5, 0x2adbf8da, 0x70bac7ba, 0xf04ad0a5,
+    0x18de1404, 0x982e031b, 0xc24f3c7b, 0x42bf2b64, 0x768d42bb,
+    0xf67d55a4, 0xac1c6ac4, 0x2cec7ddb, 0xa644e5c7, 0x26b4f2d8,
+    0x7cd5cdb8, 0xfc25daa7, 0xc817b378, 0x48e7a467, 0x12869b07,
+    0x92768c18, 0x7ae248b9, 0xfa125fa6, 0xa07360c6, 0x208377d9,
+    0x14b11e06, 0x94410919, 0xce203679, 0x4ed02166, 0x538074b5,
+    0xd37063aa, 0x89115cca, 0x09e14bd5, 0x3dd3220a, 0xbd233515,
+    0xe7420a75, 0x67b21d6a, 0x8f26d9cb, 0x0fd6ced4, 0x55b7f1b4,
+    0xd547e6ab, 0xe1758f74, 0x6185986b, 0x3be4a70b, 0xbb14b014,
+    0x31bc2808, 0xb14c3f17, 0xeb2d0077, 0x6bdd1768, 0x5fef7eb7,
+    0xdf1f69a8, 0x857e56c8, 0x058e41d7, 0xed1a8576, 0x6dea9269,
+    0x378bad09, 0xb77bba16, 0x8349d3c9, 0x03b9c4d6, 0x59d8fbb6,
+    0xd928eca9, 0x97f8cdcf, 0x1708dad0, 0x4d69e5b0, 0xcd99f2af,
+    0xf9ab9b70, 0x795b8c6f, 0x233ab30f, 0xa3caa410, 0x4b5e60b1,
+    0xcbae77ae, 0x91cf48ce, 0x113f5fd1, 0x250d360e, 0xa5fd2111,
+    0xff9c1e71, 0x7f6c096e, 0xf5c49172, 0x7534866d, 0x2f55b90d,
+    0xafa5ae12, 0x9b97c7cd, 0x1b67d0d2, 0x4106efb2, 0xc1f6f8ad,
+    0x29623c0c, 0xa9922b13, 0xf3f31473, 0x7303036c, 0x47316ab3,
+    0xc7c17dac, 0x9da042cc, 0x1d5055d3, 0xa700e96a, 0x27f0fe75,
+    0x7d91c115, 0xfd61d60a, 0xc953bfd5, 0x49a3a8ca, 0x13c297aa,
+    0x933280b5, 0x7ba64414, 0xfb56530b, 0xa1376c6b, 0x21c77b74,
+    0x15f512ab, 0x950505b4, 0xcf643ad4, 0x4f942dcb, 0xc53cb5d7,
+    0x45cca2c8, 0x1fad9da8, 0x9f5d8ab7, 0xab6fe368, 0x2b9ff477,
+    0x71fecb17, 0xf10edc08, 0x199a18a9, 0x996a0fb6, 0xc30b30d6,
+    0x43fb27c9, 0x77c94e16, 0xf7395909, 0xad586669, 0x2da87176,
+    0x63785010, 0xe388470f, 0xb9e9786f, 0x39196f70, 0x0d2b06af,
+    0x8ddb11b0, 0xd7ba2ed0, 0x574a39cf, 0xbfdefd6e, 0x3f2eea71,
+    0x654fd511, 0xe5bfc20e, 0xd18dabd1, 0x517dbcce, 0x0b1c83ae,
+    0x8bec94b1, 0x01440cad, 0x81b41bb2, 0xdbd524d2, 0x5b2533cd,
+    0x6f175a12, 0xefe74d0d, 0xb586726d, 0x35766572, 0xdde2a1d3,
+    0x5d12b6cc, 0x077389ac, 0x87839eb3, 0xb3b1f76c, 0x3341e073,
+    0x6920df13, 0xe9d0c80c, 0xf4809ddf, 0x74708ac0, 0x2e11b5a0,
+    0xaee1a2bf, 0x9ad3cb60, 0x1a23dc7f, 0x4042e31f, 0xc0b2f400,
+    0x282630a1, 0xa8d627be, 0xf2b718de, 0x72470fc1, 0x4675661e,
+    0xc6857101, 0x9ce44e61, 0x1c14597e, 0x96bcc162, 0x164cd67d,
+    0x4c2de91d, 0xccddfe02, 0xf8ef97dd, 0x781f80c2, 0x227ebfa2,
+    0xa28ea8bd, 0x4a1a6c1c, 0xcaea7b03, 0x908b4463, 0x107b537c,
+    0x24493aa3, 0xa4b92dbc, 0xfed812dc, 0x7e2805c3, 0x30f824a5,
+    0xb00833ba, 0xea690cda, 0x6a991bc5, 0x5eab721a, 0xde5b6505,
+    0x843a5a65, 0x04ca4d7a, 0xec5e89db, 0x6cae9ec4, 0x36cfa1a4,
+    0xb63fb6bb, 0x820ddf64, 0x02fdc87b, 0x589cf71b, 0xd86ce004,
+    0x52c47818, 0xd2346f07, 0x88555067, 0x08a54778, 0x3c972ea7,
+    0xbc6739b8, 0xe60606d8, 0x66f611c7, 0x8e62d566, 0x0e92c279,
+    0x54f3fd19, 0xd403ea06, 0xe03183d9, 0x60c194c6, 0x3aa0aba6,
+    0xba50bcb9},
+   {0x00000000, 0x9570d495, 0xf190af6b, 0x64e07bfe, 0x38505897,
+    0xad208c02, 0xc9c0f7fc, 0x5cb02369, 0x70a0b12e, 0xe5d065bb,
+    0x81301e45, 0x1440cad0, 0x48f0e9b9, 0xdd803d2c, 0xb96046d2,
+    0x2c109247, 0xe141625c, 0x7431b6c9, 0x10d1cd37, 0x85a119a2,
+    0xd9113acb, 0x4c61ee5e, 0x288195a0, 0xbdf14135, 0x91e1d372,
+    0x049107e7, 0x60717c19, 0xf501a88c, 0xa9b18be5, 0x3cc15f70,
+    0x5821248e, 0xcd51f01b, 0x19f3c2f9, 0x8c83166c, 0xe8636d92,
+    0x7d13b907, 0x21a39a6e, 0xb4d34efb, 0xd0333505, 0x4543e190,
+    0x695373d7, 0xfc23a742, 0x98c3dcbc, 0x0db30829, 0x51032b40,
+    0xc473ffd5, 0xa093842b, 0x35e350be, 0xf8b2a0a5, 0x6dc27430,
+    0x09220fce, 0x9c52db5b, 0xc0e2f832, 0x55922ca7, 0x31725759,
+    0xa40283cc, 0x8812118b, 0x1d62c51e, 0x7982bee0, 0xecf26a75,
+    0xb042491c, 0x25329d89, 0x41d2e677, 0xd4a232e2, 0x33e785f2,
+    0xa6975167, 0xc2772a99, 0x5707fe0c, 0x0bb7dd65, 0x9ec709f0,
+    0xfa27720e, 0x6f57a69b, 0x434734dc, 0xd637e049, 0xb2d79bb7,
+    0x27a74f22, 0x7b176c4b, 0xee67b8de, 0x8a87c320, 0x1ff717b5,
+    0xd2a6e7ae, 0x47d6333b, 0x233648c5, 0xb6469c50, 0xeaf6bf39,
+    0x7f866bac, 0x1b661052, 0x8e16c4c7, 0xa2065680, 0x37768215,
+    0x5396f9eb, 0xc6e62d7e, 0x9a560e17, 0x0f26da82, 0x6bc6a17c,
+    0xfeb675e9, 0x2a14470b, 0xbf64939e, 0xdb84e860, 0x4ef43cf5,
+    0x12441f9c, 0x8734cb09, 0xe3d4b0f7, 0x76a46462, 0x5ab4f625,
+    0xcfc422b0, 0xab24594e, 0x3e548ddb, 0x62e4aeb2, 0xf7947a27,
+    0x937401d9, 0x0604d54c, 0xcb552557, 0x5e25f1c2, 0x3ac58a3c,
+    0xafb55ea9, 0xf3057dc0, 0x6675a955, 0x0295d2ab, 0x97e5063e,
+    0xbbf59479, 0x2e8540ec, 0x4a653b12, 0xdf15ef87, 0x83a5ccee,
+    0x16d5187b, 0x72356385, 0xe745b710, 0x67cf0be4, 0xf2bfdf71,
+    0x965fa48f, 0x032f701a, 0x5f9f5373, 0xcaef87e6, 0xae0ffc18,
+    0x3b7f288d, 0x176fbaca, 0x821f6e5f, 0xe6ff15a1, 0x738fc134,
+    0x2f3fe25d, 0xba4f36c8, 0xdeaf4d36, 0x4bdf99a3, 0x868e69b8,
+    0x13febd2d, 0x771ec6d3, 0xe26e1246, 0xbede312f, 0x2baee5ba,
+    0x4f4e9e44, 0xda3e4ad1, 0xf62ed896, 0x635e0c03, 0x07be77fd,
+    0x92cea368, 0xce7e8001, 0x5b0e5494, 0x3fee2f6a, 0xaa9efbff,
+    0x7e3cc91d, 0xeb4c1d88, 0x8fac6676, 0x1adcb2e3, 0x466c918a,
+    0xd31c451f, 0xb7fc3ee1, 0x228cea74, 0x0e9c7833, 0x9becaca6,
+    0xff0cd758, 0x6a7c03cd, 0x36cc20a4, 0xa3bcf431, 0xc75c8fcf,
+    0x522c5b5a, 0x9f7dab41, 0x0a0d7fd4, 0x6eed042a, 0xfb9dd0bf,
+    0xa72df3d6, 0x325d2743, 0x56bd5cbd, 0xc3cd8828, 0xefdd1a6f,
+    0x7aadcefa, 0x1e4db504, 0x8b3d6191, 0xd78d42f8, 0x42fd966d,
+    0x261ded93, 0xb36d3906, 0x54288e16, 0xc1585a83, 0xa5b8217d,
+    0x30c8f5e8, 0x6c78d681, 0xf9080214, 0x9de879ea, 0x0898ad7f,
+    0x24883f38, 0xb1f8ebad, 0xd5189053, 0x406844c6, 0x1cd867af,
+    0x89a8b33a, 0xed48c8c4, 0x78381c51, 0xb569ec4a, 0x201938df,
+    0x44f94321, 0xd18997b4, 0x8d39b4dd, 0x18496048, 0x7ca91bb6,
+    0xe9d9cf23, 0xc5c95d64, 0x50b989f1, 0x3459f20f, 0xa129269a,
+    0xfd9905f3, 0x68e9d166, 0x0c09aa98, 0x99797e0d, 0x4ddb4cef,
+    0xd8ab987a, 0xbc4be384, 0x293b3711, 0x758b1478, 0xe0fbc0ed,
+    0x841bbb13, 0x116b6f86, 0x3d7bfdc1, 0xa80b2954, 0xcceb52aa,
+    0x599b863f, 0x052ba556, 0x905b71c3, 0xf4bb0a3d, 0x61cbdea8,
+    0xac9a2eb3, 0x39eafa26, 0x5d0a81d8, 0xc87a554d, 0x94ca7624,
+    0x01baa2b1, 0x655ad94f, 0xf02a0dda, 0xdc3a9f9d, 0x494a4b08,
+    0x2daa30f6, 0xb8dae463, 0xe46ac70a, 0x711a139f, 0x15fa6861,
+    0x808abcf4},
+   {0x00000000, 0xcf9e17c8, 0x444d29d1, 0x8bd33e19, 0x889a53a2,
+    0x4704446a, 0xccd77a73, 0x03496dbb, 0xca45a105, 0x05dbb6cd,
+    0x8e0888d4, 0x41969f1c, 0x42dff2a7, 0x8d41e56f, 0x0692db76,
+    0xc90cccbe, 0x4ffa444b, 0x80645383, 0x0bb76d9a, 0xc4297a52,
+    0xc76017e9, 0x08fe0021, 0x832d3e38, 0x4cb329f0, 0x85bfe54e,
+    0x4a21f286, 0xc1f2cc9f, 0x0e6cdb57, 0x0d25b6ec, 0xc2bba124,
+    0x49689f3d, 0x86f688f5, 0x9ff48896, 0x506a9f5e, 0xdbb9a147,
+    0x1427b68f, 0x176edb34, 0xd8f0ccfc, 0x5323f2e5, 0x9cbde52d,
+    0x55b12993, 0x9a2f3e5b, 0x11fc0042, 0xde62178a, 0xdd2b7a31,
+    0x12b56df9, 0x996653e0, 0x56f84428, 0xd00eccdd, 0x1f90db15,
+    0x9443e50c, 0x5bddf2c4, 0x58949f7f, 0x970a88b7, 0x1cd9b6ae,
+    0xd347a166, 0x1a4b6dd8, 0xd5d57a10, 0x5e064409, 0x919853c1,
+    0x92d13e7a, 0x5d4f29b2, 0xd69c17ab, 0x19020063, 0xe498176d,
+    0x2b0600a5, 0xa0d53ebc, 0x6f4b2974, 0x6c0244cf, 0xa39c5307,
+    0x284f6d1e, 0xe7d17ad6, 0x2eddb668, 0xe143a1a0, 0x6a909fb9,
+    0xa50e8871, 0xa647e5ca, 0x69d9f202, 0xe20acc1b, 0x2d94dbd3,
+    0xab625326, 0x64fc44ee, 0xef2f7af7, 0x20b16d3f, 0x23f80084,
+    0xec66174c, 0x67b52955, 0xa82b3e9d, 0x6127f223, 0xaeb9e5eb,
+    0x256adbf2, 0xeaf4cc3a, 0xe9bda181, 0x2623b649, 0xadf08850,
+    0x626e9f98, 0x7b6c9ffb, 0xb4f28833, 0x3f21b62a, 0xf0bfa1e2,
+    0xf3f6cc59, 0x3c68db91, 0xb7bbe588, 0x7825f240, 0xb1293efe,
+    0x7eb72936, 0xf564172f, 0x3afa00e7, 0x39b36d5c, 0xf62d7a94,
+    0x7dfe448d, 0xb2605345, 0x3496dbb0, 0xfb08cc78, 0x70dbf261,
+    0xbf45e5a9, 0xbc0c8812, 0x73929fda, 0xf841a1c3, 0x37dfb60b,
+    0xfed37ab5, 0x314d6d7d, 0xba9e5364, 0x750044ac, 0x76492917,
+    0xb9d73edf, 0x320400c6, 0xfd9a170e, 0x1241289b, 0xdddf3f53,
+    0x560c014a, 0x99921682, 0x9adb7b39, 0x55456cf1, 0xde9652e8,
+    0x11084520, 0xd804899e, 0x179a9e56, 0x9c49a04f, 0x53d7b787,
+    0x509eda3c, 0x9f00cdf4, 0x14d3f3ed, 0xdb4de425, 0x5dbb6cd0,
+    0x92257b18, 0x19f64501, 0xd66852c9, 0xd5213f72, 0x1abf28ba,
+    0x916c16a3, 0x5ef2016b, 0x97fecdd5, 0x5860da1d, 0xd3b3e404,
+    0x1c2df3cc, 0x1f649e77, 0xd0fa89bf, 0x5b29b7a6, 0x94b7a06e,
+    0x8db5a00d, 0x422bb7c5, 0xc9f889dc, 0x06669e14, 0x052ff3af,
+    0xcab1e467, 0x4162da7e, 0x8efccdb6, 0x47f00108, 0x886e16c0,
+    0x03bd28d9, 0xcc233f11, 0xcf6a52aa, 0x00f44562, 0x8b277b7b,
+    0x44b96cb3, 0xc24fe446, 0x0dd1f38e, 0x8602cd97, 0x499cda5f,
+    0x4ad5b7e4, 0x854ba02c, 0x0e989e35, 0xc10689fd, 0x080a4543,
+    0xc794528b, 0x4c476c92, 0x83d97b5a, 0x809016e1, 0x4f0e0129,
+    0xc4dd3f30, 0x0b4328f8, 0xf6d93ff6, 0x3947283e, 0xb2941627,
+    0x7d0a01ef, 0x7e436c54, 0xb1dd7b9c, 0x3a0e4585, 0xf590524d,
+    0x3c9c9ef3, 0xf302893b, 0x78d1b722, 0xb74fa0ea, 0xb406cd51,
+    0x7b98da99, 0xf04be480, 0x3fd5f348, 0xb9237bbd, 0x76bd6c75,
+    0xfd6e526c, 0x32f045a4, 0x31b9281f, 0xfe273fd7, 0x75f401ce,
+    0xba6a1606, 0x7366dab8, 0xbcf8cd70, 0x372bf369, 0xf8b5e4a1,
+    0xfbfc891a, 0x34629ed2, 0xbfb1a0cb, 0x702fb703, 0x692db760,
+    0xa6b3a0a8, 0x2d609eb1, 0xe2fe8979, 0xe1b7e4c2, 0x2e29f30a,
+    0xa5facd13, 0x6a64dadb, 0xa3681665, 0x6cf601ad, 0xe7253fb4,
+    0x28bb287c, 0x2bf245c7, 0xe46c520f, 0x6fbf6c16, 0xa0217bde,
+    0x26d7f32b, 0xe949e4e3, 0x629adafa, 0xad04cd32, 0xae4da089,
+    0x61d3b741, 0xea008958, 0x259e9e90, 0xec92522e, 0x230c45e6,
+    0xa8df7bff, 0x67416c37, 0x6408018c, 0xab961644, 0x2045285d,
+    0xefdb3f95},
+   {0x00000000, 0x24825136, 0x4904a26c, 0x6d86f35a, 0x920944d8,
+    0xb68b15ee, 0xdb0de6b4, 0xff8fb782, 0xff638ff1, 0xdbe1dec7,
+    0xb6672d9d, 0x92e57cab, 0x6d6acb29, 0x49e89a1f, 0x246e6945,
+    0x00ec3873, 0x25b619a3, 0x01344895, 0x6cb2bbcf, 0x4830eaf9,
+    0xb7bf5d7b, 0x933d0c4d, 0xfebbff17, 0xda39ae21, 0xdad59652,
+    0xfe57c764, 0x93d1343e, 0xb7536508, 0x48dcd28a, 0x6c5e83bc,
+    0x01d870e6, 0x255a21d0, 0x4b6c3346, 0x6fee6270, 0x0268912a,
+    0x26eac01c, 0xd965779e, 0xfde726a8, 0x9061d5f2, 0xb4e384c4,
+    0xb40fbcb7, 0x908ded81, 0xfd0b1edb, 0xd9894fed, 0x2606f86f,
+    0x0284a959, 0x6f025a03, 0x4b800b35, 0x6eda2ae5, 0x4a587bd3,
+    0x27de8889, 0x035cd9bf, 0xfcd36e3d, 0xd8513f0b, 0xb5d7cc51,
+    0x91559d67, 0x91b9a514, 0xb53bf422, 0xd8bd0778, 0xfc3f564e,
+    0x03b0e1cc, 0x2732b0fa, 0x4ab443a0, 0x6e361296, 0x96d8668c,
+    0xb25a37ba, 0xdfdcc4e0, 0xfb5e95d6, 0x04d12254, 0x20537362,
+    0x4dd58038, 0x6957d10e, 0x69bbe97d, 0x4d39b84b, 0x20bf4b11,
+    0x043d1a27, 0xfbb2ada5, 0xdf30fc93, 0xb2b60fc9, 0x96345eff,
+    0xb36e7f2f, 0x97ec2e19, 0xfa6add43, 0xdee88c75, 0x21673bf7,
+    0x05e56ac1, 0x6863999b, 0x4ce1c8ad, 0x4c0df0de, 0x688fa1e8,
+    0x050952b2, 0x218b0384, 0xde04b406, 0xfa86e530, 0x9700166a,
+    0xb382475c, 0xddb455ca, 0xf93604fc, 0x94b0f7a6, 0xb032a690,
+    0x4fbd1112, 0x6b3f4024, 0x06b9b37e, 0x223be248, 0x22d7da3b,
+    0x06558b0d, 0x6bd37857, 0x4f512961, 0xb0de9ee3, 0x945ccfd5,
+    0xf9da3c8f, 0xdd586db9, 0xf8024c69, 0xdc801d5f, 0xb106ee05,
+    0x9584bf33, 0x6a0b08b1, 0x4e895987, 0x230faadd, 0x078dfbeb,
+    0x0761c398, 0x23e392ae, 0x4e6561f4, 0x6ae730c2, 0x95688740,
+    0xb1ead676, 0xdc6c252c, 0xf8ee741a, 0xf6c1cb59, 0xd2439a6f,
+    0xbfc56935, 0x9b473803, 0x64c88f81, 0x404adeb7, 0x2dcc2ded,
+    0x094e7cdb, 0x09a244a8, 0x2d20159e, 0x40a6e6c4, 0x6424b7f2,
+    0x9bab0070, 0xbf295146, 0xd2afa21c, 0xf62df32a, 0xd377d2fa,
+    0xf7f583cc, 0x9a737096, 0xbef121a0, 0x417e9622, 0x65fcc714,
+    0x087a344e, 0x2cf86578, 0x2c145d0b, 0x08960c3d, 0x6510ff67,
+    0x4192ae51, 0xbe1d19d3, 0x9a9f48e5, 0xf719bbbf, 0xd39bea89,
+    0xbdadf81f, 0x992fa929, 0xf4a95a73, 0xd02b0b45, 0x2fa4bcc7,
+    0x0b26edf1, 0x66a01eab, 0x42224f9d, 0x42ce77ee, 0x664c26d8,
+    0x0bcad582, 0x2f4884b4, 0xd0c73336, 0xf4456200, 0x99c3915a,
+    0xbd41c06c, 0x981be1bc, 0xbc99b08a, 0xd11f43d0, 0xf59d12e6,
+    0x0a12a564, 0x2e90f452, 0x43160708, 0x6794563e, 0x67786e4d,
+    0x43fa3f7b, 0x2e7ccc21, 0x0afe9d17, 0xf5712a95, 0xd1f37ba3,
+    0xbc7588f9, 0x98f7d9cf, 0x6019add5, 0x449bfce3, 0x291d0fb9,
+    0x0d9f5e8f, 0xf210e90d, 0xd692b83b, 0xbb144b61, 0x9f961a57,
+    0x9f7a2224, 0xbbf87312, 0xd67e8048, 0xf2fcd17e, 0x0d7366fc,
+    0x29f137ca, 0x4477c490, 0x60f595a6, 0x45afb476, 0x612de540,
+    0x0cab161a, 0x2829472c, 0xd7a6f0ae, 0xf324a198, 0x9ea252c2,
+    0xba2003f4, 0xbacc3b87, 0x9e4e6ab1, 0xf3c899eb, 0xd74ac8dd,
+    0x28c57f5f, 0x0c472e69, 0x61c1dd33, 0x45438c05, 0x2b759e93,
+    0x0ff7cfa5, 0x62713cff, 0x46f36dc9, 0xb97cda4b, 0x9dfe8b7d,
+    0xf0787827, 0xd4fa2911, 0xd4161162, 0xf0944054, 0x9d12b30e,
+    0xb990e238, 0x461f55ba, 0x629d048c, 0x0f1bf7d6, 0x2b99a6e0,
+    0x0ec38730, 0x2a41d606, 0x47c7255c, 0x6345746a, 0x9ccac3e8,
+    0xb84892de, 0xd5ce6184, 0xf14c30b2, 0xf1a008c1, 0xd52259f7,
+    0xb8a4aaad, 0x9c26fb9b, 0x63a94c19, 0x472b1d2f, 0x2aadee75,
+    0x0e2fbf43},
+   {0x00000000, 0x36f290f3, 0x6de521e6, 0x5b17b115, 0xdbca43cc,
+    0xed38d33f, 0xb62f622a, 0x80ddf2d9, 0x6ce581d9, 0x5a17112a,
+    0x0100a03f, 0x37f230cc, 0xb72fc215, 0x81dd52e6, 0xdacae3f3,
+    0xec387300, 0xd9cb03b2, 0xef399341, 0xb42e2254, 0x82dcb2a7,
+    0x0201407e, 0x34f3d08d, 0x6fe46198, 0x5916f16b, 0xb52e826b,
+    0x83dc1298, 0xd8cba38d, 0xee39337e, 0x6ee4c1a7, 0x58165154,
+    0x0301e041, 0x35f370b2, 0x68e70125, 0x5e1591d6, 0x050220c3,
+    0x33f0b030, 0xb32d42e9, 0x85dfd21a, 0xdec8630f, 0xe83af3fc,
+    0x040280fc, 0x32f0100f, 0x69e7a11a, 0x5f1531e9, 0xdfc8c330,
+    0xe93a53c3, 0xb22de2d6, 0x84df7225, 0xb12c0297, 0x87de9264,
+    0xdcc92371, 0xea3bb382, 0x6ae6415b, 0x5c14d1a8, 0x070360bd,
+    0x31f1f04e, 0xddc9834e, 0xeb3b13bd, 0xb02ca2a8, 0x86de325b,
+    0x0603c082, 0x30f15071, 0x6be6e164, 0x5d147197, 0xd1ce024a,
+    0xe73c92b9, 0xbc2b23ac, 0x8ad9b35f, 0x0a044186, 0x3cf6d175,
+    0x67e16060, 0x5113f093, 0xbd2b8393, 0x8bd91360, 0xd0cea275,
+    0xe63c3286, 0x66e1c05f, 0x501350ac, 0x0b04e1b9, 0x3df6714a,
+    0x080501f8, 0x3ef7910b, 0x65e0201e, 0x5312b0ed, 0xd3cf4234,
+    0xe53dd2c7, 0xbe2a63d2, 0x88d8f321, 0x64e08021, 0x521210d2,
+    0x0905a1c7, 0x3ff73134, 0xbf2ac3ed, 0x89d8531e, 0xd2cfe20b,
+    0xe43d72f8, 0xb929036f, 0x8fdb939c, 0xd4cc2289, 0xe23eb27a,
+    0x62e340a3, 0x5411d050, 0x0f066145, 0x39f4f1b6, 0xd5cc82b6,
+    0xe33e1245, 0xb829a350, 0x8edb33a3, 0x0e06c17a, 0x38f45189,
+    0x63e3e09c, 0x5511706f, 0x60e200dd, 0x5610902e, 0x0d07213b,
+    0x3bf5b1c8, 0xbb284311, 0x8ddad3e2, 0xd6cd62f7, 0xe03ff204,
+    0x0c078104, 0x3af511f7, 0x61e2a0e2, 0x57103011, 0xd7cdc2c8,
+    0xe13f523b, 0xba28e32e, 0x8cda73dd, 0x78ed02d5, 0x4e1f9226,
+    0x15082333, 0x23fab3c0, 0xa3274119, 0x95d5d1ea, 0xcec260ff,
+    0xf830f00c, 0x1408830c, 0x22fa13ff, 0x79eda2ea, 0x4f1f3219,
+    0xcfc2c0c0, 0xf9305033, 0xa227e126, 0x94d571d5, 0xa1260167,
+    0x97d49194, 0xccc32081, 0xfa31b072, 0x7aec42ab, 0x4c1ed258,
+    0x1709634d, 0x21fbf3be, 0xcdc380be, 0xfb31104d, 0xa026a158,
+    0x96d431ab, 0x1609c372, 0x20fb5381, 0x7bece294, 0x4d1e7267,
+    0x100a03f0, 0x26f89303, 0x7def2216, 0x4b1db2e5, 0xcbc0403c,
+    0xfd32d0cf, 0xa62561da, 0x90d7f129, 0x7cef8229, 0x4a1d12da,
+    0x110aa3cf, 0x27f8333c, 0xa725c1e5, 0x91d75116, 0xcac0e003,
+    0xfc3270f0, 0xc9c10042, 0xff3390b1, 0xa42421a4, 0x92d6b157,
+    0x120b438e, 0x24f9d37d, 0x7fee6268, 0x491cf29b, 0xa524819b,
+    0x93d61168, 0xc8c1a07d, 0xfe33308e, 0x7eeec257, 0x481c52a4,
+    0x130be3b1, 0x25f97342, 0xa923009f, 0x9fd1906c, 0xc4c62179,
+    0xf234b18a, 0x72e94353, 0x441bd3a0, 0x1f0c62b5, 0x29fef246,
+    0xc5c68146, 0xf33411b5, 0xa823a0a0, 0x9ed13053, 0x1e0cc28a,
+    0x28fe5279, 0x73e9e36c, 0x451b739f, 0x70e8032d, 0x461a93de,
+    0x1d0d22cb, 0x2bffb238, 0xab2240e1, 0x9dd0d012, 0xc6c76107,
+    0xf035f1f4, 0x1c0d82f4, 0x2aff1207, 0x71e8a312, 0x471a33e1,
+    0xc7c7c138, 0xf13551cb, 0xaa22e0de, 0x9cd0702d, 0xc1c401ba,
+    0xf7369149, 0xac21205c, 0x9ad3b0af, 0x1a0e4276, 0x2cfcd285,
+    0x77eb6390, 0x4119f363, 0xad218063, 0x9bd31090, 0xc0c4a185,
+    0xf6363176, 0x76ebc3af, 0x4019535c, 0x1b0ee249, 0x2dfc72ba,
+    0x180f0208, 0x2efd92fb, 0x75ea23ee, 0x4318b31d, 0xc3c541c4,
+    0xf537d137, 0xae206022, 0x98d2f0d1, 0x74ea83d1, 0x42181322,
+    0x190fa237, 0x2ffd32c4, 0xaf20c01d, 0x99d250ee, 0xc2c5e1fb,
+    0xf4377108}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xf390f23600000000, 0xe621e56d00000000,
+    0x15b1175b00000000, 0xcc43cadb00000000, 0x3fd338ed00000000,
+    0x2a622fb600000000, 0xd9f2dd8000000000, 0xd981e56c00000000,
+    0x2a11175a00000000, 0x3fa0000100000000, 0xcc30f23700000000,
+    0x15c22fb700000000, 0xe652dd8100000000, 0xf3e3cada00000000,
+    0x007338ec00000000, 0xb203cbd900000000, 0x419339ef00000000,
+    0x54222eb400000000, 0xa7b2dc8200000000, 0x7e40010200000000,
+    0x8dd0f33400000000, 0x9861e46f00000000, 0x6bf1165900000000,
+    0x6b822eb500000000, 0x9812dc8300000000, 0x8da3cbd800000000,
+    0x7e3339ee00000000, 0xa7c1e46e00000000, 0x5451165800000000,
+    0x41e0010300000000, 0xb270f33500000000, 0x2501e76800000000,
+    0xd691155e00000000, 0xc320020500000000, 0x30b0f03300000000,
+    0xe9422db300000000, 0x1ad2df8500000000, 0x0f63c8de00000000,
+    0xfcf33ae800000000, 0xfc80020400000000, 0x0f10f03200000000,
+    0x1aa1e76900000000, 0xe931155f00000000, 0x30c3c8df00000000,
+    0xc3533ae900000000, 0xd6e22db200000000, 0x2572df8400000000,
+    0x97022cb100000000, 0x6492de8700000000, 0x7123c9dc00000000,
+    0x82b33bea00000000, 0x5b41e66a00000000, 0xa8d1145c00000000,
+    0xbd60030700000000, 0x4ef0f13100000000, 0x4e83c9dd00000000,
+    0xbd133beb00000000, 0xa8a22cb000000000, 0x5b32de8600000000,
+    0x82c0030600000000, 0x7150f13000000000, 0x64e1e66b00000000,
+    0x9771145d00000000, 0x4a02ced100000000, 0xb9923ce700000000,
+    0xac232bbc00000000, 0x5fb3d98a00000000, 0x8641040a00000000,
+    0x75d1f63c00000000, 0x6060e16700000000, 0x93f0135100000000,
+    0x93832bbd00000000, 0x6013d98b00000000, 0x75a2ced000000000,
+    0x86323ce600000000, 0x5fc0e16600000000, 0xac50135000000000,
+    0xb9e1040b00000000, 0x4a71f63d00000000, 0xf801050800000000,
+    0x0b91f73e00000000, 0x1e20e06500000000, 0xedb0125300000000,
+    0x3442cfd300000000, 0xc7d23de500000000, 0xd2632abe00000000,
+    0x21f3d88800000000, 0x2180e06400000000, 0xd210125200000000,
+    0xc7a1050900000000, 0x3431f73f00000000, 0xedc32abf00000000,
+    0x1e53d88900000000, 0x0be2cfd200000000, 0xf8723de400000000,
+    0x6f0329b900000000, 0x9c93db8f00000000, 0x8922ccd400000000,
+    0x7ab23ee200000000, 0xa340e36200000000, 0x50d0115400000000,
+    0x4561060f00000000, 0xb6f1f43900000000, 0xb682ccd500000000,
+    0x45123ee300000000, 0x50a329b800000000, 0xa333db8e00000000,
+    0x7ac1060e00000000, 0x8951f43800000000, 0x9ce0e36300000000,
+    0x6f70115500000000, 0xdd00e26000000000, 0x2e90105600000000,
+    0x3b21070d00000000, 0xc8b1f53b00000000, 0x114328bb00000000,
+    0xe2d3da8d00000000, 0xf762cdd600000000, 0x04f23fe000000000,
+    0x0481070c00000000, 0xf711f53a00000000, 0xe2a0e26100000000,
+    0x1130105700000000, 0xc8c2cdd700000000, 0x3b523fe100000000,
+    0x2ee328ba00000000, 0xdd73da8c00000000, 0xd502ed7800000000,
+    0x26921f4e00000000, 0x3323081500000000, 0xc0b3fa2300000000,
+    0x194127a300000000, 0xead1d59500000000, 0xff60c2ce00000000,
+    0x0cf030f800000000, 0x0c83081400000000, 0xff13fa2200000000,
+    0xeaa2ed7900000000, 0x19321f4f00000000, 0xc0c0c2cf00000000,
+    0x335030f900000000, 0x26e127a200000000, 0xd571d59400000000,
+    0x670126a100000000, 0x9491d49700000000, 0x8120c3cc00000000,
+    0x72b031fa00000000, 0xab42ec7a00000000, 0x58d21e4c00000000,
+    0x4d63091700000000, 0xbef3fb2100000000, 0xbe80c3cd00000000,
+    0x4d1031fb00000000, 0x58a126a000000000, 0xab31d49600000000,
+    0x72c3091600000000, 0x8153fb2000000000, 0x94e2ec7b00000000,
+    0x67721e4d00000000, 0xf0030a1000000000, 0x0393f82600000000,
+    0x1622ef7d00000000, 0xe5b21d4b00000000, 0x3c40c0cb00000000,
+    0xcfd032fd00000000, 0xda6125a600000000, 0x29f1d79000000000,
+    0x2982ef7c00000000, 0xda121d4a00000000, 0xcfa30a1100000000,
+    0x3c33f82700000000, 0xe5c125a700000000, 0x1651d79100000000,
+    0x03e0c0ca00000000, 0xf07032fc00000000, 0x4200c1c900000000,
+    0xb19033ff00000000, 0xa42124a400000000, 0x57b1d69200000000,
+    0x8e430b1200000000, 0x7dd3f92400000000, 0x6862ee7f00000000,
+    0x9bf21c4900000000, 0x9b8124a500000000, 0x6811d69300000000,
+    0x7da0c1c800000000, 0x8e3033fe00000000, 0x57c2ee7e00000000,
+    0xa4521c4800000000, 0xb1e30b1300000000, 0x4273f92500000000,
+    0x9f0023a900000000, 0x6c90d19f00000000, 0x7921c6c400000000,
+    0x8ab134f200000000, 0x5343e97200000000, 0xa0d31b4400000000,
+    0xb5620c1f00000000, 0x46f2fe2900000000, 0x4681c6c500000000,
+    0xb51134f300000000, 0xa0a023a800000000, 0x5330d19e00000000,
+    0x8ac20c1e00000000, 0x7952fe2800000000, 0x6ce3e97300000000,
+    0x9f731b4500000000, 0x2d03e87000000000, 0xde931a4600000000,
+    0xcb220d1d00000000, 0x38b2ff2b00000000, 0xe14022ab00000000,
+    0x12d0d09d00000000, 0x0761c7c600000000, 0xf4f135f000000000,
+    0xf4820d1c00000000, 0x0712ff2a00000000, 0x12a3e87100000000,
+    0xe1331a4700000000, 0x38c1c7c700000000, 0xcb5135f100000000,
+    0xdee022aa00000000, 0x2d70d09c00000000, 0xba01c4c100000000,
+    0x499136f700000000, 0x5c2021ac00000000, 0xafb0d39a00000000,
+    0x76420e1a00000000, 0x85d2fc2c00000000, 0x9063eb7700000000,
+    0x63f3194100000000, 0x638021ad00000000, 0x9010d39b00000000,
+    0x85a1c4c000000000, 0x763136f600000000, 0xafc3eb7600000000,
+    0x5c53194000000000, 0x49e20e1b00000000, 0xba72fc2d00000000,
+    0x08020f1800000000, 0xfb92fd2e00000000, 0xee23ea7500000000,
+    0x1db3184300000000, 0xc441c5c300000000, 0x37d137f500000000,
+    0x226020ae00000000, 0xd1f0d29800000000, 0xd183ea7400000000,
+    0x2213184200000000, 0x37a20f1900000000, 0xc432fd2f00000000,
+    0x1dc020af00000000, 0xee50d29900000000, 0xfbe1c5c200000000,
+    0x087137f400000000},
+   {0x0000000000000000, 0x3651822400000000, 0x6ca2044900000000,
+    0x5af3866d00000000, 0xd844099200000000, 0xee158bb600000000,
+    0xb4e60ddb00000000, 0x82b78fff00000000, 0xf18f63ff00000000,
+    0xc7dee1db00000000, 0x9d2d67b600000000, 0xab7ce59200000000,
+    0x29cb6a6d00000000, 0x1f9ae84900000000, 0x45696e2400000000,
+    0x7338ec0000000000, 0xa319b62500000000, 0x9548340100000000,
+    0xcfbbb26c00000000, 0xf9ea304800000000, 0x7b5dbfb700000000,
+    0x4d0c3d9300000000, 0x17ffbbfe00000000, 0x21ae39da00000000,
+    0x5296d5da00000000, 0x64c757fe00000000, 0x3e34d19300000000,
+    0x086553b700000000, 0x8ad2dc4800000000, 0xbc835e6c00000000,
+    0xe670d80100000000, 0xd0215a2500000000, 0x46336c4b00000000,
+    0x7062ee6f00000000, 0x2a91680200000000, 0x1cc0ea2600000000,
+    0x9e7765d900000000, 0xa826e7fd00000000, 0xf2d5619000000000,
+    0xc484e3b400000000, 0xb7bc0fb400000000, 0x81ed8d9000000000,
+    0xdb1e0bfd00000000, 0xed4f89d900000000, 0x6ff8062600000000,
+    0x59a9840200000000, 0x035a026f00000000, 0x350b804b00000000,
+    0xe52ada6e00000000, 0xd37b584a00000000, 0x8988de2700000000,
+    0xbfd95c0300000000, 0x3d6ed3fc00000000, 0x0b3f51d800000000,
+    0x51ccd7b500000000, 0x679d559100000000, 0x14a5b99100000000,
+    0x22f43bb500000000, 0x7807bdd800000000, 0x4e563ffc00000000,
+    0xcce1b00300000000, 0xfab0322700000000, 0xa043b44a00000000,
+    0x9612366e00000000, 0x8c66d89600000000, 0xba375ab200000000,
+    0xe0c4dcdf00000000, 0xd6955efb00000000, 0x5422d10400000000,
+    0x6273532000000000, 0x3880d54d00000000, 0x0ed1576900000000,
+    0x7de9bb6900000000, 0x4bb8394d00000000, 0x114bbf2000000000,
+    0x271a3d0400000000, 0xa5adb2fb00000000, 0x93fc30df00000000,
+    0xc90fb6b200000000, 0xff5e349600000000, 0x2f7f6eb300000000,
+    0x192eec9700000000, 0x43dd6afa00000000, 0x758ce8de00000000,
+    0xf73b672100000000, 0xc16ae50500000000, 0x9b99636800000000,
+    0xadc8e14c00000000, 0xdef00d4c00000000, 0xe8a18f6800000000,
+    0xb252090500000000, 0x84038b2100000000, 0x06b404de00000000,
+    0x30e586fa00000000, 0x6a16009700000000, 0x5c4782b300000000,
+    0xca55b4dd00000000, 0xfc0436f900000000, 0xa6f7b09400000000,
+    0x90a632b000000000, 0x1211bd4f00000000, 0x24403f6b00000000,
+    0x7eb3b90600000000, 0x48e23b2200000000, 0x3bdad72200000000,
+    0x0d8b550600000000, 0x5778d36b00000000, 0x6129514f00000000,
+    0xe39edeb000000000, 0xd5cf5c9400000000, 0x8f3cdaf900000000,
+    0xb96d58dd00000000, 0x694c02f800000000, 0x5f1d80dc00000000,
+    0x05ee06b100000000, 0x33bf849500000000, 0xb1080b6a00000000,
+    0x8759894e00000000, 0xddaa0f2300000000, 0xebfb8d0700000000,
+    0x98c3610700000000, 0xae92e32300000000, 0xf461654e00000000,
+    0xc230e76a00000000, 0x4087689500000000, 0x76d6eab100000000,
+    0x2c256cdc00000000, 0x1a74eef800000000, 0x59cbc1f600000000,
+    0x6f9a43d200000000, 0x3569c5bf00000000, 0x0338479b00000000,
+    0x818fc86400000000, 0xb7de4a4000000000, 0xed2dcc2d00000000,
+    0xdb7c4e0900000000, 0xa844a20900000000, 0x9e15202d00000000,
+    0xc4e6a64000000000, 0xf2b7246400000000, 0x7000ab9b00000000,
+    0x465129bf00000000, 0x1ca2afd200000000, 0x2af32df600000000,
+    0xfad277d300000000, 0xcc83f5f700000000, 0x9670739a00000000,
+    0xa021f1be00000000, 0x22967e4100000000, 0x14c7fc6500000000,
+    0x4e347a0800000000, 0x7865f82c00000000, 0x0b5d142c00000000,
+    0x3d0c960800000000, 0x67ff106500000000, 0x51ae924100000000,
+    0xd3191dbe00000000, 0xe5489f9a00000000, 0xbfbb19f700000000,
+    0x89ea9bd300000000, 0x1ff8adbd00000000, 0x29a92f9900000000,
+    0x735aa9f400000000, 0x450b2bd000000000, 0xc7bca42f00000000,
+    0xf1ed260b00000000, 0xab1ea06600000000, 0x9d4f224200000000,
+    0xee77ce4200000000, 0xd8264c6600000000, 0x82d5ca0b00000000,
+    0xb484482f00000000, 0x3633c7d000000000, 0x006245f400000000,
+    0x5a91c39900000000, 0x6cc041bd00000000, 0xbce11b9800000000,
+    0x8ab099bc00000000, 0xd0431fd100000000, 0xe6129df500000000,
+    0x64a5120a00000000, 0x52f4902e00000000, 0x0807164300000000,
+    0x3e56946700000000, 0x4d6e786700000000, 0x7b3ffa4300000000,
+    0x21cc7c2e00000000, 0x179dfe0a00000000, 0x952a71f500000000,
+    0xa37bf3d100000000, 0xf98875bc00000000, 0xcfd9f79800000000,
+    0xd5ad196000000000, 0xe3fc9b4400000000, 0xb90f1d2900000000,
+    0x8f5e9f0d00000000, 0x0de910f200000000, 0x3bb892d600000000,
+    0x614b14bb00000000, 0x571a969f00000000, 0x24227a9f00000000,
+    0x1273f8bb00000000, 0x48807ed600000000, 0x7ed1fcf200000000,
+    0xfc66730d00000000, 0xca37f12900000000, 0x90c4774400000000,
+    0xa695f56000000000, 0x76b4af4500000000, 0x40e52d6100000000,
+    0x1a16ab0c00000000, 0x2c47292800000000, 0xaef0a6d700000000,
+    0x98a124f300000000, 0xc252a29e00000000, 0xf40320ba00000000,
+    0x873bccba00000000, 0xb16a4e9e00000000, 0xeb99c8f300000000,
+    0xddc84ad700000000, 0x5f7fc52800000000, 0x692e470c00000000,
+    0x33ddc16100000000, 0x058c434500000000, 0x939e752b00000000,
+    0xa5cff70f00000000, 0xff3c716200000000, 0xc96df34600000000,
+    0x4bda7cb900000000, 0x7d8bfe9d00000000, 0x277878f000000000,
+    0x1129fad400000000, 0x621116d400000000, 0x544094f000000000,
+    0x0eb3129d00000000, 0x38e290b900000000, 0xba551f4600000000,
+    0x8c049d6200000000, 0xd6f71b0f00000000, 0xe0a6992b00000000,
+    0x3087c30e00000000, 0x06d6412a00000000, 0x5c25c74700000000,
+    0x6a74456300000000, 0xe8c3ca9c00000000, 0xde9248b800000000,
+    0x8461ced500000000, 0xb2304cf100000000, 0xc108a0f100000000,
+    0xf75922d500000000, 0xadaaa4b800000000, 0x9bfb269c00000000,
+    0x194ca96300000000, 0x2f1d2b4700000000, 0x75eead2a00000000,
+    0x43bf2f0e00000000},
+   {0x0000000000000000, 0xc8179ecf00000000, 0xd1294d4400000000,
+    0x193ed38b00000000, 0xa2539a8800000000, 0x6a44044700000000,
+    0x737ad7cc00000000, 0xbb6d490300000000, 0x05a145ca00000000,
+    0xcdb6db0500000000, 0xd488088e00000000, 0x1c9f964100000000,
+    0xa7f2df4200000000, 0x6fe5418d00000000, 0x76db920600000000,
+    0xbecc0cc900000000, 0x4b44fa4f00000000, 0x8353648000000000,
+    0x9a6db70b00000000, 0x527a29c400000000, 0xe91760c700000000,
+    0x2100fe0800000000, 0x383e2d8300000000, 0xf029b34c00000000,
+    0x4ee5bf8500000000, 0x86f2214a00000000, 0x9fccf2c100000000,
+    0x57db6c0e00000000, 0xecb6250d00000000, 0x24a1bbc200000000,
+    0x3d9f684900000000, 0xf588f68600000000, 0x9688f49f00000000,
+    0x5e9f6a5000000000, 0x47a1b9db00000000, 0x8fb6271400000000,
+    0x34db6e1700000000, 0xfcccf0d800000000, 0xe5f2235300000000,
+    0x2de5bd9c00000000, 0x9329b15500000000, 0x5b3e2f9a00000000,
+    0x4200fc1100000000, 0x8a1762de00000000, 0x317a2bdd00000000,
+    0xf96db51200000000, 0xe053669900000000, 0x2844f85600000000,
+    0xddcc0ed000000000, 0x15db901f00000000, 0x0ce5439400000000,
+    0xc4f2dd5b00000000, 0x7f9f945800000000, 0xb7880a9700000000,
+    0xaeb6d91c00000000, 0x66a147d300000000, 0xd86d4b1a00000000,
+    0x107ad5d500000000, 0x0944065e00000000, 0xc153989100000000,
+    0x7a3ed19200000000, 0xb2294f5d00000000, 0xab179cd600000000,
+    0x6300021900000000, 0x6d1798e400000000, 0xa500062b00000000,
+    0xbc3ed5a000000000, 0x74294b6f00000000, 0xcf44026c00000000,
+    0x07539ca300000000, 0x1e6d4f2800000000, 0xd67ad1e700000000,
+    0x68b6dd2e00000000, 0xa0a143e100000000, 0xb99f906a00000000,
+    0x71880ea500000000, 0xcae547a600000000, 0x02f2d96900000000,
+    0x1bcc0ae200000000, 0xd3db942d00000000, 0x265362ab00000000,
+    0xee44fc6400000000, 0xf77a2fef00000000, 0x3f6db12000000000,
+    0x8400f82300000000, 0x4c1766ec00000000, 0x5529b56700000000,
+    0x9d3e2ba800000000, 0x23f2276100000000, 0xebe5b9ae00000000,
+    0xf2db6a2500000000, 0x3accf4ea00000000, 0x81a1bde900000000,
+    0x49b6232600000000, 0x5088f0ad00000000, 0x989f6e6200000000,
+    0xfb9f6c7b00000000, 0x3388f2b400000000, 0x2ab6213f00000000,
+    0xe2a1bff000000000, 0x59ccf6f300000000, 0x91db683c00000000,
+    0x88e5bbb700000000, 0x40f2257800000000, 0xfe3e29b100000000,
+    0x3629b77e00000000, 0x2f1764f500000000, 0xe700fa3a00000000,
+    0x5c6db33900000000, 0x947a2df600000000, 0x8d44fe7d00000000,
+    0x455360b200000000, 0xb0db963400000000, 0x78cc08fb00000000,
+    0x61f2db7000000000, 0xa9e545bf00000000, 0x12880cbc00000000,
+    0xda9f927300000000, 0xc3a141f800000000, 0x0bb6df3700000000,
+    0xb57ad3fe00000000, 0x7d6d4d3100000000, 0x64539eba00000000,
+    0xac44007500000000, 0x1729497600000000, 0xdf3ed7b900000000,
+    0xc600043200000000, 0x0e179afd00000000, 0x9b28411200000000,
+    0x533fdfdd00000000, 0x4a010c5600000000, 0x8216929900000000,
+    0x397bdb9a00000000, 0xf16c455500000000, 0xe85296de00000000,
+    0x2045081100000000, 0x9e8904d800000000, 0x569e9a1700000000,
+    0x4fa0499c00000000, 0x87b7d75300000000, 0x3cda9e5000000000,
+    0xf4cd009f00000000, 0xedf3d31400000000, 0x25e44ddb00000000,
+    0xd06cbb5d00000000, 0x187b259200000000, 0x0145f61900000000,
+    0xc95268d600000000, 0x723f21d500000000, 0xba28bf1a00000000,
+    0xa3166c9100000000, 0x6b01f25e00000000, 0xd5cdfe9700000000,
+    0x1dda605800000000, 0x04e4b3d300000000, 0xccf32d1c00000000,
+    0x779e641f00000000, 0xbf89fad000000000, 0xa6b7295b00000000,
+    0x6ea0b79400000000, 0x0da0b58d00000000, 0xc5b72b4200000000,
+    0xdc89f8c900000000, 0x149e660600000000, 0xaff32f0500000000,
+    0x67e4b1ca00000000, 0x7eda624100000000, 0xb6cdfc8e00000000,
+    0x0801f04700000000, 0xc0166e8800000000, 0xd928bd0300000000,
+    0x113f23cc00000000, 0xaa526acf00000000, 0x6245f40000000000,
+    0x7b7b278b00000000, 0xb36cb94400000000, 0x46e44fc200000000,
+    0x8ef3d10d00000000, 0x97cd028600000000, 0x5fda9c4900000000,
+    0xe4b7d54a00000000, 0x2ca04b8500000000, 0x359e980e00000000,
+    0xfd8906c100000000, 0x43450a0800000000, 0x8b5294c700000000,
+    0x926c474c00000000, 0x5a7bd98300000000, 0xe116908000000000,
+    0x29010e4f00000000, 0x303fddc400000000, 0xf828430b00000000,
+    0xf63fd9f600000000, 0x3e28473900000000, 0x271694b200000000,
+    0xef010a7d00000000, 0x546c437e00000000, 0x9c7bddb100000000,
+    0x85450e3a00000000, 0x4d5290f500000000, 0xf39e9c3c00000000,
+    0x3b8902f300000000, 0x22b7d17800000000, 0xeaa04fb700000000,
+    0x51cd06b400000000, 0x99da987b00000000, 0x80e44bf000000000,
+    0x48f3d53f00000000, 0xbd7b23b900000000, 0x756cbd7600000000,
+    0x6c526efd00000000, 0xa445f03200000000, 0x1f28b93100000000,
+    0xd73f27fe00000000, 0xce01f47500000000, 0x06166aba00000000,
+    0xb8da667300000000, 0x70cdf8bc00000000, 0x69f32b3700000000,
+    0xa1e4b5f800000000, 0x1a89fcfb00000000, 0xd29e623400000000,
+    0xcba0b1bf00000000, 0x03b72f7000000000, 0x60b72d6900000000,
+    0xa8a0b3a600000000, 0xb19e602d00000000, 0x7989fee200000000,
+    0xc2e4b7e100000000, 0x0af3292e00000000, 0x13cdfaa500000000,
+    0xdbda646a00000000, 0x651668a300000000, 0xad01f66c00000000,
+    0xb43f25e700000000, 0x7c28bb2800000000, 0xc745f22b00000000,
+    0x0f526ce400000000, 0x166cbf6f00000000, 0xde7b21a000000000,
+    0x2bf3d72600000000, 0xe3e449e900000000, 0xfada9a6200000000,
+    0x32cd04ad00000000, 0x89a04dae00000000, 0x41b7d36100000000,
+    0x588900ea00000000, 0x909e9e2500000000, 0x2e5292ec00000000,
+    0xe6450c2300000000, 0xff7bdfa800000000, 0x376c416700000000,
+    0x8c01086400000000, 0x441696ab00000000, 0x5d28452000000000,
+    0x953fdbef00000000},
+   {0x0000000000000000, 0x95d4709500000000, 0x6baf90f100000000,
+    0xfe7be06400000000, 0x9758503800000000, 0x028c20ad00000000,
+    0xfcf7c0c900000000, 0x6923b05c00000000, 0x2eb1a07000000000,
+    0xbb65d0e500000000, 0x451e308100000000, 0xd0ca401400000000,
+    0xb9e9f04800000000, 0x2c3d80dd00000000, 0xd24660b900000000,
+    0x4792102c00000000, 0x5c6241e100000000, 0xc9b6317400000000,
+    0x37cdd11000000000, 0xa219a18500000000, 0xcb3a11d900000000,
+    0x5eee614c00000000, 0xa095812800000000, 0x3541f1bd00000000,
+    0x72d3e19100000000, 0xe707910400000000, 0x197c716000000000,
+    0x8ca801f500000000, 0xe58bb1a900000000, 0x705fc13c00000000,
+    0x8e24215800000000, 0x1bf051cd00000000, 0xf9c2f31900000000,
+    0x6c16838c00000000, 0x926d63e800000000, 0x07b9137d00000000,
+    0x6e9aa32100000000, 0xfb4ed3b400000000, 0x053533d000000000,
+    0x90e1434500000000, 0xd773536900000000, 0x42a723fc00000000,
+    0xbcdcc39800000000, 0x2908b30d00000000, 0x402b035100000000,
+    0xd5ff73c400000000, 0x2b8493a000000000, 0xbe50e33500000000,
+    0xa5a0b2f800000000, 0x3074c26d00000000, 0xce0f220900000000,
+    0x5bdb529c00000000, 0x32f8e2c000000000, 0xa72c925500000000,
+    0x5957723100000000, 0xcc8302a400000000, 0x8b11128800000000,
+    0x1ec5621d00000000, 0xe0be827900000000, 0x756af2ec00000000,
+    0x1c4942b000000000, 0x899d322500000000, 0x77e6d24100000000,
+    0xe232a2d400000000, 0xf285e73300000000, 0x675197a600000000,
+    0x992a77c200000000, 0x0cfe075700000000, 0x65ddb70b00000000,
+    0xf009c79e00000000, 0x0e7227fa00000000, 0x9ba6576f00000000,
+    0xdc34474300000000, 0x49e037d600000000, 0xb79bd7b200000000,
+    0x224fa72700000000, 0x4b6c177b00000000, 0xdeb867ee00000000,
+    0x20c3878a00000000, 0xb517f71f00000000, 0xaee7a6d200000000,
+    0x3b33d64700000000, 0xc548362300000000, 0x509c46b600000000,
+    0x39bff6ea00000000, 0xac6b867f00000000, 0x5210661b00000000,
+    0xc7c4168e00000000, 0x805606a200000000, 0x1582763700000000,
+    0xebf9965300000000, 0x7e2de6c600000000, 0x170e569a00000000,
+    0x82da260f00000000, 0x7ca1c66b00000000, 0xe975b6fe00000000,
+    0x0b47142a00000000, 0x9e9364bf00000000, 0x60e884db00000000,
+    0xf53cf44e00000000, 0x9c1f441200000000, 0x09cb348700000000,
+    0xf7b0d4e300000000, 0x6264a47600000000, 0x25f6b45a00000000,
+    0xb022c4cf00000000, 0x4e5924ab00000000, 0xdb8d543e00000000,
+    0xb2aee46200000000, 0x277a94f700000000, 0xd901749300000000,
+    0x4cd5040600000000, 0x572555cb00000000, 0xc2f1255e00000000,
+    0x3c8ac53a00000000, 0xa95eb5af00000000, 0xc07d05f300000000,
+    0x55a9756600000000, 0xabd2950200000000, 0x3e06e59700000000,
+    0x7994f5bb00000000, 0xec40852e00000000, 0x123b654a00000000,
+    0x87ef15df00000000, 0xeecca58300000000, 0x7b18d51600000000,
+    0x8563357200000000, 0x10b745e700000000, 0xe40bcf6700000000,
+    0x71dfbff200000000, 0x8fa45f9600000000, 0x1a702f0300000000,
+    0x73539f5f00000000, 0xe687efca00000000, 0x18fc0fae00000000,
+    0x8d287f3b00000000, 0xcaba6f1700000000, 0x5f6e1f8200000000,
+    0xa115ffe600000000, 0x34c18f7300000000, 0x5de23f2f00000000,
+    0xc8364fba00000000, 0x364dafde00000000, 0xa399df4b00000000,
+    0xb8698e8600000000, 0x2dbdfe1300000000, 0xd3c61e7700000000,
+    0x46126ee200000000, 0x2f31debe00000000, 0xbae5ae2b00000000,
+    0x449e4e4f00000000, 0xd14a3eda00000000, 0x96d82ef600000000,
+    0x030c5e6300000000, 0xfd77be0700000000, 0x68a3ce9200000000,
+    0x01807ece00000000, 0x94540e5b00000000, 0x6a2fee3f00000000,
+    0xfffb9eaa00000000, 0x1dc93c7e00000000, 0x881d4ceb00000000,
+    0x7666ac8f00000000, 0xe3b2dc1a00000000, 0x8a916c4600000000,
+    0x1f451cd300000000, 0xe13efcb700000000, 0x74ea8c2200000000,
+    0x33789c0e00000000, 0xa6acec9b00000000, 0x58d70cff00000000,
+    0xcd037c6a00000000, 0xa420cc3600000000, 0x31f4bca300000000,
+    0xcf8f5cc700000000, 0x5a5b2c5200000000, 0x41ab7d9f00000000,
+    0xd47f0d0a00000000, 0x2a04ed6e00000000, 0xbfd09dfb00000000,
+    0xd6f32da700000000, 0x43275d3200000000, 0xbd5cbd5600000000,
+    0x2888cdc300000000, 0x6f1addef00000000, 0xfacead7a00000000,
+    0x04b54d1e00000000, 0x91613d8b00000000, 0xf8428dd700000000,
+    0x6d96fd4200000000, 0x93ed1d2600000000, 0x06396db300000000,
+    0x168e285400000000, 0x835a58c100000000, 0x7d21b8a500000000,
+    0xe8f5c83000000000, 0x81d6786c00000000, 0x140208f900000000,
+    0xea79e89d00000000, 0x7fad980800000000, 0x383f882400000000,
+    0xadebf8b100000000, 0x539018d500000000, 0xc644684000000000,
+    0xaf67d81c00000000, 0x3ab3a88900000000, 0xc4c848ed00000000,
+    0x511c387800000000, 0x4aec69b500000000, 0xdf38192000000000,
+    0x2143f94400000000, 0xb49789d100000000, 0xddb4398d00000000,
+    0x4860491800000000, 0xb61ba97c00000000, 0x23cfd9e900000000,
+    0x645dc9c500000000, 0xf189b95000000000, 0x0ff2593400000000,
+    0x9a2629a100000000, 0xf30599fd00000000, 0x66d1e96800000000,
+    0x98aa090c00000000, 0x0d7e799900000000, 0xef4cdb4d00000000,
+    0x7a98abd800000000, 0x84e34bbc00000000, 0x11373b2900000000,
+    0x78148b7500000000, 0xedc0fbe000000000, 0x13bb1b8400000000,
+    0x866f6b1100000000, 0xc1fd7b3d00000000, 0x54290ba800000000,
+    0xaa52ebcc00000000, 0x3f869b5900000000, 0x56a52b0500000000,
+    0xc3715b9000000000, 0x3d0abbf400000000, 0xa8decb6100000000,
+    0xb32e9aac00000000, 0x26faea3900000000, 0xd8810a5d00000000,
+    0x4d557ac800000000, 0x2476ca9400000000, 0xb1a2ba0100000000,
+    0x4fd95a6500000000, 0xda0d2af000000000, 0x9d9f3adc00000000,
+    0x084b4a4900000000, 0xf630aa2d00000000, 0x63e4dab800000000,
+    0x0ac76ae400000000, 0x9f131a7100000000, 0x6168fa1500000000,
+    0xf4bc8a8000000000},
+   {0x0000000000000000, 0x1f17f08000000000, 0x7f2891da00000000,
+    0x603f615a00000000, 0xbf56536e00000000, 0xa041a3ee00000000,
+    0xc07ec2b400000000, 0xdf69323400000000, 0x7eada6dc00000000,
+    0x61ba565c00000000, 0x0185370600000000, 0x1e92c78600000000,
+    0xc1fbf5b200000000, 0xdeec053200000000, 0xbed3646800000000,
+    0xa1c494e800000000, 0xbd5c3c6200000000, 0xa24bcce200000000,
+    0xc274adb800000000, 0xdd635d3800000000, 0x020a6f0c00000000,
+    0x1d1d9f8c00000000, 0x7d22fed600000000, 0x62350e5600000000,
+    0xc3f19abe00000000, 0xdce66a3e00000000, 0xbcd90b6400000000,
+    0xa3cefbe400000000, 0x7ca7c9d000000000, 0x63b0395000000000,
+    0x038f580a00000000, 0x1c98a88a00000000, 0x7ab978c400000000,
+    0x65ae884400000000, 0x0591e91e00000000, 0x1a86199e00000000,
+    0xc5ef2baa00000000, 0xdaf8db2a00000000, 0xbac7ba7000000000,
+    0xa5d04af000000000, 0x0414de1800000000, 0x1b032e9800000000,
+    0x7b3c4fc200000000, 0x642bbf4200000000, 0xbb428d7600000000,
+    0xa4557df600000000, 0xc46a1cac00000000, 0xdb7dec2c00000000,
+    0xc7e544a600000000, 0xd8f2b42600000000, 0xb8cdd57c00000000,
+    0xa7da25fc00000000, 0x78b317c800000000, 0x67a4e74800000000,
+    0x079b861200000000, 0x188c769200000000, 0xb948e27a00000000,
+    0xa65f12fa00000000, 0xc66073a000000000, 0xd977832000000000,
+    0x061eb11400000000, 0x1909419400000000, 0x793620ce00000000,
+    0x6621d04e00000000, 0xb574805300000000, 0xaa6370d300000000,
+    0xca5c118900000000, 0xd54be10900000000, 0x0a22d33d00000000,
+    0x153523bd00000000, 0x750a42e700000000, 0x6a1db26700000000,
+    0xcbd9268f00000000, 0xd4ced60f00000000, 0xb4f1b75500000000,
+    0xabe647d500000000, 0x748f75e100000000, 0x6b98856100000000,
+    0x0ba7e43b00000000, 0x14b014bb00000000, 0x0828bc3100000000,
+    0x173f4cb100000000, 0x77002deb00000000, 0x6817dd6b00000000,
+    0xb77eef5f00000000, 0xa8691fdf00000000, 0xc8567e8500000000,
+    0xd7418e0500000000, 0x76851aed00000000, 0x6992ea6d00000000,
+    0x09ad8b3700000000, 0x16ba7bb700000000, 0xc9d3498300000000,
+    0xd6c4b90300000000, 0xb6fbd85900000000, 0xa9ec28d900000000,
+    0xcfcdf89700000000, 0xd0da081700000000, 0xb0e5694d00000000,
+    0xaff299cd00000000, 0x709babf900000000, 0x6f8c5b7900000000,
+    0x0fb33a2300000000, 0x10a4caa300000000, 0xb1605e4b00000000,
+    0xae77aecb00000000, 0xce48cf9100000000, 0xd15f3f1100000000,
+    0x0e360d2500000000, 0x1121fda500000000, 0x711e9cff00000000,
+    0x6e096c7f00000000, 0x7291c4f500000000, 0x6d86347500000000,
+    0x0db9552f00000000, 0x12aea5af00000000, 0xcdc7979b00000000,
+    0xd2d0671b00000000, 0xb2ef064100000000, 0xadf8f6c100000000,
+    0x0c3c622900000000, 0x132b92a900000000, 0x7314f3f300000000,
+    0x6c03037300000000, 0xb36a314700000000, 0xac7dc1c700000000,
+    0xcc42a09d00000000, 0xd355501d00000000, 0x6ae900a700000000,
+    0x75fef02700000000, 0x15c1917d00000000, 0x0ad661fd00000000,
+    0xd5bf53c900000000, 0xcaa8a34900000000, 0xaa97c21300000000,
+    0xb580329300000000, 0x1444a67b00000000, 0x0b5356fb00000000,
+    0x6b6c37a100000000, 0x747bc72100000000, 0xab12f51500000000,
+    0xb405059500000000, 0xd43a64cf00000000, 0xcb2d944f00000000,
+    0xd7b53cc500000000, 0xc8a2cc4500000000, 0xa89dad1f00000000,
+    0xb78a5d9f00000000, 0x68e36fab00000000, 0x77f49f2b00000000,
+    0x17cbfe7100000000, 0x08dc0ef100000000, 0xa9189a1900000000,
+    0xb60f6a9900000000, 0xd6300bc300000000, 0xc927fb4300000000,
+    0x164ec97700000000, 0x095939f700000000, 0x696658ad00000000,
+    0x7671a82d00000000, 0x1050786300000000, 0x0f4788e300000000,
+    0x6f78e9b900000000, 0x706f193900000000, 0xaf062b0d00000000,
+    0xb011db8d00000000, 0xd02ebad700000000, 0xcf394a5700000000,
+    0x6efddebf00000000, 0x71ea2e3f00000000, 0x11d54f6500000000,
+    0x0ec2bfe500000000, 0xd1ab8dd100000000, 0xcebc7d5100000000,
+    0xae831c0b00000000, 0xb194ec8b00000000, 0xad0c440100000000,
+    0xb21bb48100000000, 0xd224d5db00000000, 0xcd33255b00000000,
+    0x125a176f00000000, 0x0d4de7ef00000000, 0x6d7286b500000000,
+    0x7265763500000000, 0xd3a1e2dd00000000, 0xccb6125d00000000,
+    0xac89730700000000, 0xb39e838700000000, 0x6cf7b1b300000000,
+    0x73e0413300000000, 0x13df206900000000, 0x0cc8d0e900000000,
+    0xdf9d80f400000000, 0xc08a707400000000, 0xa0b5112e00000000,
+    0xbfa2e1ae00000000, 0x60cbd39a00000000, 0x7fdc231a00000000,
+    0x1fe3424000000000, 0x00f4b2c000000000, 0xa130262800000000,
+    0xbe27d6a800000000, 0xde18b7f200000000, 0xc10f477200000000,
+    0x1e66754600000000, 0x017185c600000000, 0x614ee49c00000000,
+    0x7e59141c00000000, 0x62c1bc9600000000, 0x7dd64c1600000000,
+    0x1de92d4c00000000, 0x02feddcc00000000, 0xdd97eff800000000,
+    0xc2801f7800000000, 0xa2bf7e2200000000, 0xbda88ea200000000,
+    0x1c6c1a4a00000000, 0x037beaca00000000, 0x63448b9000000000,
+    0x7c537b1000000000, 0xa33a492400000000, 0xbc2db9a400000000,
+    0xdc12d8fe00000000, 0xc305287e00000000, 0xa524f83000000000,
+    0xba3308b000000000, 0xda0c69ea00000000, 0xc51b996a00000000,
+    0x1a72ab5e00000000, 0x05655bde00000000, 0x655a3a8400000000,
+    0x7a4dca0400000000, 0xdb895eec00000000, 0xc49eae6c00000000,
+    0xa4a1cf3600000000, 0xbbb63fb600000000, 0x64df0d8200000000,
+    0x7bc8fd0200000000, 0x1bf79c5800000000, 0x04e06cd800000000,
+    0x1878c45200000000, 0x076f34d200000000, 0x6750558800000000,
+    0x7847a50800000000, 0xa72e973c00000000, 0xb83967bc00000000,
+    0xd80606e600000000, 0xc711f66600000000, 0x66d5628e00000000,
+    0x79c2920e00000000, 0x19fdf35400000000, 0x06ea03d400000000,
+    0xd98331e000000000, 0xc694c16000000000, 0xa6aba03a00000000,
+    0xb9bc50ba00000000},
+   {0x0000000000000000, 0xe2fd888d00000000, 0x85fd60c000000000,
+    0x6700e84d00000000, 0x4bfdb05b00000000, 0xa90038d600000000,
+    0xce00d09b00000000, 0x2cfd581600000000, 0x96fa61b700000000,
+    0x7407e93a00000000, 0x1307017700000000, 0xf1fa89fa00000000,
+    0xdd07d1ec00000000, 0x3ffa596100000000, 0x58fab12c00000000,
+    0xba0739a100000000, 0x6df3b2b500000000, 0x8f0e3a3800000000,
+    0xe80ed27500000000, 0x0af35af800000000, 0x260e02ee00000000,
+    0xc4f38a6300000000, 0xa3f3622e00000000, 0x410eeaa300000000,
+    0xfb09d30200000000, 0x19f45b8f00000000, 0x7ef4b3c200000000,
+    0x9c093b4f00000000, 0xb0f4635900000000, 0x5209ebd400000000,
+    0x3509039900000000, 0xd7f48b1400000000, 0x9be014b000000000,
+    0x791d9c3d00000000, 0x1e1d747000000000, 0xfce0fcfd00000000,
+    0xd01da4eb00000000, 0x32e02c6600000000, 0x55e0c42b00000000,
+    0xb71d4ca600000000, 0x0d1a750700000000, 0xefe7fd8a00000000,
+    0x88e715c700000000, 0x6a1a9d4a00000000, 0x46e7c55c00000000,
+    0xa41a4dd100000000, 0xc31aa59c00000000, 0x21e72d1100000000,
+    0xf613a60500000000, 0x14ee2e8800000000, 0x73eec6c500000000,
+    0x91134e4800000000, 0xbdee165e00000000, 0x5f139ed300000000,
+    0x3813769e00000000, 0xdaeefe1300000000, 0x60e9c7b200000000,
+    0x82144f3f00000000, 0xe514a77200000000, 0x07e92fff00000000,
+    0x2b1477e900000000, 0xc9e9ff6400000000, 0xaee9172900000000,
+    0x4c149fa400000000, 0x77c758bb00000000, 0x953ad03600000000,
+    0xf23a387b00000000, 0x10c7b0f600000000, 0x3c3ae8e000000000,
+    0xdec7606d00000000, 0xb9c7882000000000, 0x5b3a00ad00000000,
+    0xe13d390c00000000, 0x03c0b18100000000, 0x64c059cc00000000,
+    0x863dd14100000000, 0xaac0895700000000, 0x483d01da00000000,
+    0x2f3de99700000000, 0xcdc0611a00000000, 0x1a34ea0e00000000,
+    0xf8c9628300000000, 0x9fc98ace00000000, 0x7d34024300000000,
+    0x51c95a5500000000, 0xb334d2d800000000, 0xd4343a9500000000,
+    0x36c9b21800000000, 0x8cce8bb900000000, 0x6e33033400000000,
+    0x0933eb7900000000, 0xebce63f400000000, 0xc7333be200000000,
+    0x25ceb36f00000000, 0x42ce5b2200000000, 0xa033d3af00000000,
+    0xec274c0b00000000, 0x0edac48600000000, 0x69da2ccb00000000,
+    0x8b27a44600000000, 0xa7dafc5000000000, 0x452774dd00000000,
+    0x22279c9000000000, 0xc0da141d00000000, 0x7add2dbc00000000,
+    0x9820a53100000000, 0xff204d7c00000000, 0x1dddc5f100000000,
+    0x31209de700000000, 0xd3dd156a00000000, 0xb4ddfd2700000000,
+    0x562075aa00000000, 0x81d4febe00000000, 0x6329763300000000,
+    0x04299e7e00000000, 0xe6d416f300000000, 0xca294ee500000000,
+    0x28d4c66800000000, 0x4fd42e2500000000, 0xad29a6a800000000,
+    0x172e9f0900000000, 0xf5d3178400000000, 0x92d3ffc900000000,
+    0x702e774400000000, 0x5cd32f5200000000, 0xbe2ea7df00000000,
+    0xd92e4f9200000000, 0x3bd3c71f00000000, 0xaf88c0ad00000000,
+    0x4d75482000000000, 0x2a75a06d00000000, 0xc88828e000000000,
+    0xe47570f600000000, 0x0688f87b00000000, 0x6188103600000000,
+    0x837598bb00000000, 0x3972a11a00000000, 0xdb8f299700000000,
+    0xbc8fc1da00000000, 0x5e72495700000000, 0x728f114100000000,
+    0x907299cc00000000, 0xf772718100000000, 0x158ff90c00000000,
+    0xc27b721800000000, 0x2086fa9500000000, 0x478612d800000000,
+    0xa57b9a5500000000, 0x8986c24300000000, 0x6b7b4ace00000000,
+    0x0c7ba28300000000, 0xee862a0e00000000, 0x548113af00000000,
+    0xb67c9b2200000000, 0xd17c736f00000000, 0x3381fbe200000000,
+    0x1f7ca3f400000000, 0xfd812b7900000000, 0x9a81c33400000000,
+    0x787c4bb900000000, 0x3468d41d00000000, 0xd6955c9000000000,
+    0xb195b4dd00000000, 0x53683c5000000000, 0x7f95644600000000,
+    0x9d68eccb00000000, 0xfa68048600000000, 0x18958c0b00000000,
+    0xa292b5aa00000000, 0x406f3d2700000000, 0x276fd56a00000000,
+    0xc5925de700000000, 0xe96f05f100000000, 0x0b928d7c00000000,
+    0x6c92653100000000, 0x8e6fedbc00000000, 0x599b66a800000000,
+    0xbb66ee2500000000, 0xdc66066800000000, 0x3e9b8ee500000000,
+    0x1266d6f300000000, 0xf09b5e7e00000000, 0x979bb63300000000,
+    0x75663ebe00000000, 0xcf61071f00000000, 0x2d9c8f9200000000,
+    0x4a9c67df00000000, 0xa861ef5200000000, 0x849cb74400000000,
+    0x66613fc900000000, 0x0161d78400000000, 0xe39c5f0900000000,
+    0xd84f981600000000, 0x3ab2109b00000000, 0x5db2f8d600000000,
+    0xbf4f705b00000000, 0x93b2284d00000000, 0x714fa0c000000000,
+    0x164f488d00000000, 0xf4b2c00000000000, 0x4eb5f9a100000000,
+    0xac48712c00000000, 0xcb48996100000000, 0x29b511ec00000000,
+    0x054849fa00000000, 0xe7b5c17700000000, 0x80b5293a00000000,
+    0x6248a1b700000000, 0xb5bc2aa300000000, 0x5741a22e00000000,
+    0x30414a6300000000, 0xd2bcc2ee00000000, 0xfe419af800000000,
+    0x1cbc127500000000, 0x7bbcfa3800000000, 0x994172b500000000,
+    0x23464b1400000000, 0xc1bbc39900000000, 0xa6bb2bd400000000,
+    0x4446a35900000000, 0x68bbfb4f00000000, 0x8a4673c200000000,
+    0xed469b8f00000000, 0x0fbb130200000000, 0x43af8ca600000000,
+    0xa152042b00000000, 0xc652ec6600000000, 0x24af64eb00000000,
+    0x08523cfd00000000, 0xeaafb47000000000, 0x8daf5c3d00000000,
+    0x6f52d4b000000000, 0xd555ed1100000000, 0x37a8659c00000000,
+    0x50a88dd100000000, 0xb255055c00000000, 0x9ea85d4a00000000,
+    0x7c55d5c700000000, 0x1b553d8a00000000, 0xf9a8b50700000000,
+    0x2e5c3e1300000000, 0xcca1b69e00000000, 0xaba15ed300000000,
+    0x495cd65e00000000, 0x65a18e4800000000, 0x875c06c500000000,
+    0xe05cee8800000000, 0x02a1660500000000, 0xb8a65fa400000000,
+    0x5a5bd72900000000, 0x3d5b3f6400000000, 0xdfa6b7e900000000,
+    0xf35befff00000000, 0x11a6677200000000, 0x76a68f3f00000000,
+    0x945b07b200000000},
+   {0x0000000000000000, 0xa90b894e00000000, 0x5217129d00000000,
+    0xfb1c9bd300000000, 0xe52855e100000000, 0x4c23dcaf00000000,
+    0xb73f477c00000000, 0x1e34ce3200000000, 0x8b57db1900000000,
+    0x225c525700000000, 0xd940c98400000000, 0x704b40ca00000000,
+    0x6e7f8ef800000000, 0xc77407b600000000, 0x3c689c6500000000,
+    0x9563152b00000000, 0x16afb63300000000, 0xbfa43f7d00000000,
+    0x44b8a4ae00000000, 0xedb32de000000000, 0xf387e3d200000000,
+    0x5a8c6a9c00000000, 0xa190f14f00000000, 0x089b780100000000,
+    0x9df86d2a00000000, 0x34f3e46400000000, 0xcfef7fb700000000,
+    0x66e4f6f900000000, 0x78d038cb00000000, 0xd1dbb18500000000,
+    0x2ac72a5600000000, 0x83cca31800000000, 0x2c5e6d6700000000,
+    0x8555e42900000000, 0x7e497ffa00000000, 0xd742f6b400000000,
+    0xc976388600000000, 0x607db1c800000000, 0x9b612a1b00000000,
+    0x326aa35500000000, 0xa709b67e00000000, 0x0e023f3000000000,
+    0xf51ea4e300000000, 0x5c152dad00000000, 0x4221e39f00000000,
+    0xeb2a6ad100000000, 0x1036f10200000000, 0xb93d784c00000000,
+    0x3af1db5400000000, 0x93fa521a00000000, 0x68e6c9c900000000,
+    0xc1ed408700000000, 0xdfd98eb500000000, 0x76d207fb00000000,
+    0x8dce9c2800000000, 0x24c5156600000000, 0xb1a6004d00000000,
+    0x18ad890300000000, 0xe3b112d000000000, 0x4aba9b9e00000000,
+    0x548e55ac00000000, 0xfd85dce200000000, 0x0699473100000000,
+    0xaf92ce7f00000000, 0x58bcdace00000000, 0xf1b7538000000000,
+    0x0aabc85300000000, 0xa3a0411d00000000, 0xbd948f2f00000000,
+    0x149f066100000000, 0xef839db200000000, 0x468814fc00000000,
+    0xd3eb01d700000000, 0x7ae0889900000000, 0x81fc134a00000000,
+    0x28f79a0400000000, 0x36c3543600000000, 0x9fc8dd7800000000,
+    0x64d446ab00000000, 0xcddfcfe500000000, 0x4e136cfd00000000,
+    0xe718e5b300000000, 0x1c047e6000000000, 0xb50ff72e00000000,
+    0xab3b391c00000000, 0x0230b05200000000, 0xf92c2b8100000000,
+    0x5027a2cf00000000, 0xc544b7e400000000, 0x6c4f3eaa00000000,
+    0x9753a57900000000, 0x3e582c3700000000, 0x206ce20500000000,
+    0x89676b4b00000000, 0x727bf09800000000, 0xdb7079d600000000,
+    0x74e2b7a900000000, 0xdde93ee700000000, 0x26f5a53400000000,
+    0x8ffe2c7a00000000, 0x91cae24800000000, 0x38c16b0600000000,
+    0xc3ddf0d500000000, 0x6ad6799b00000000, 0xffb56cb000000000,
+    0x56bee5fe00000000, 0xada27e2d00000000, 0x04a9f76300000000,
+    0x1a9d395100000000, 0xb396b01f00000000, 0x488a2bcc00000000,
+    0xe181a28200000000, 0x624d019a00000000, 0xcb4688d400000000,
+    0x305a130700000000, 0x99519a4900000000, 0x8765547b00000000,
+    0x2e6edd3500000000, 0xd57246e600000000, 0x7c79cfa800000000,
+    0xe91ada8300000000, 0x401153cd00000000, 0xbb0dc81e00000000,
+    0x1206415000000000, 0x0c328f6200000000, 0xa539062c00000000,
+    0x5e259dff00000000, 0xf72e14b100000000, 0xf17ec44600000000,
+    0x58754d0800000000, 0xa369d6db00000000, 0x0a625f9500000000,
+    0x145691a700000000, 0xbd5d18e900000000, 0x4641833a00000000,
+    0xef4a0a7400000000, 0x7a291f5f00000000, 0xd322961100000000,
+    0x283e0dc200000000, 0x8135848c00000000, 0x9f014abe00000000,
+    0x360ac3f000000000, 0xcd16582300000000, 0x641dd16d00000000,
+    0xe7d1727500000000, 0x4edafb3b00000000, 0xb5c660e800000000,
+    0x1ccde9a600000000, 0x02f9279400000000, 0xabf2aeda00000000,
+    0x50ee350900000000, 0xf9e5bc4700000000, 0x6c86a96c00000000,
+    0xc58d202200000000, 0x3e91bbf100000000, 0x979a32bf00000000,
+    0x89aefc8d00000000, 0x20a575c300000000, 0xdbb9ee1000000000,
+    0x72b2675e00000000, 0xdd20a92100000000, 0x742b206f00000000,
+    0x8f37bbbc00000000, 0x263c32f200000000, 0x3808fcc000000000,
+    0x9103758e00000000, 0x6a1fee5d00000000, 0xc314671300000000,
+    0x5677723800000000, 0xff7cfb7600000000, 0x046060a500000000,
+    0xad6be9eb00000000, 0xb35f27d900000000, 0x1a54ae9700000000,
+    0xe148354400000000, 0x4843bc0a00000000, 0xcb8f1f1200000000,
+    0x6284965c00000000, 0x99980d8f00000000, 0x309384c100000000,
+    0x2ea74af300000000, 0x87acc3bd00000000, 0x7cb0586e00000000,
+    0xd5bbd12000000000, 0x40d8c40b00000000, 0xe9d34d4500000000,
+    0x12cfd69600000000, 0xbbc45fd800000000, 0xa5f091ea00000000,
+    0x0cfb18a400000000, 0xf7e7837700000000, 0x5eec0a3900000000,
+    0xa9c21e8800000000, 0x00c997c600000000, 0xfbd50c1500000000,
+    0x52de855b00000000, 0x4cea4b6900000000, 0xe5e1c22700000000,
+    0x1efd59f400000000, 0xb7f6d0ba00000000, 0x2295c59100000000,
+    0x8b9e4cdf00000000, 0x7082d70c00000000, 0xd9895e4200000000,
+    0xc7bd907000000000, 0x6eb6193e00000000, 0x95aa82ed00000000,
+    0x3ca10ba300000000, 0xbf6da8bb00000000, 0x166621f500000000,
+    0xed7aba2600000000, 0x4471336800000000, 0x5a45fd5a00000000,
+    0xf34e741400000000, 0x0852efc700000000, 0xa159668900000000,
+    0x343a73a200000000, 0x9d31faec00000000, 0x662d613f00000000,
+    0xcf26e87100000000, 0xd112264300000000, 0x7819af0d00000000,
+    0x830534de00000000, 0x2a0ebd9000000000, 0x859c73ef00000000,
+    0x2c97faa100000000, 0xd78b617200000000, 0x7e80e83c00000000,
+    0x60b4260e00000000, 0xc9bfaf4000000000, 0x32a3349300000000,
+    0x9ba8bddd00000000, 0x0ecba8f600000000, 0xa7c021b800000000,
+    0x5cdcba6b00000000, 0xf5d7332500000000, 0xebe3fd1700000000,
+    0x42e8745900000000, 0xb9f4ef8a00000000, 0x10ff66c400000000,
+    0x9333c5dc00000000, 0x3a384c9200000000, 0xc124d74100000000,
+    0x682f5e0f00000000, 0x761b903d00000000, 0xdf10197300000000,
+    0x240c82a000000000, 0x8d070bee00000000, 0x18641ec500000000,
+    0xb16f978b00000000, 0x4a730c5800000000, 0xe378851600000000,
+    0xfd4c4b2400000000, 0x5447c26a00000000, 0xaf5b59b900000000,
+    0x0650d0f700000000},
+   {0x0000000000000000, 0x479244af00000000, 0xcf22f88500000000,
+    0x88b0bc2a00000000, 0xdf4381d000000000, 0x98d1c57f00000000,
+    0x1061795500000000, 0x57f33dfa00000000, 0xff81737a00000000,
+    0xb81337d500000000, 0x30a38bff00000000, 0x7731cf5000000000,
+    0x20c2f2aa00000000, 0x6750b60500000000, 0xefe00a2f00000000,
+    0xa8724e8000000000, 0xfe03e7f400000000, 0xb991a35b00000000,
+    0x31211f7100000000, 0x76b35bde00000000, 0x2140662400000000,
+    0x66d2228b00000000, 0xee629ea100000000, 0xa9f0da0e00000000,
+    0x0182948e00000000, 0x4610d02100000000, 0xcea06c0b00000000,
+    0x893228a400000000, 0xdec1155e00000000, 0x995351f100000000,
+    0x11e3eddb00000000, 0x5671a97400000000, 0xbd01bf3200000000,
+    0xfa93fb9d00000000, 0x722347b700000000, 0x35b1031800000000,
+    0x62423ee200000000, 0x25d07a4d00000000, 0xad60c66700000000,
+    0xeaf282c800000000, 0x4280cc4800000000, 0x051288e700000000,
+    0x8da234cd00000000, 0xca30706200000000, 0x9dc34d9800000000,
+    0xda51093700000000, 0x52e1b51d00000000, 0x1573f1b200000000,
+    0x430258c600000000, 0x04901c6900000000, 0x8c20a04300000000,
+    0xcbb2e4ec00000000, 0x9c41d91600000000, 0xdbd39db900000000,
+    0x5363219300000000, 0x14f1653c00000000, 0xbc832bbc00000000,
+    0xfb116f1300000000, 0x73a1d33900000000, 0x3433979600000000,
+    0x63c0aa6c00000000, 0x2452eec300000000, 0xace252e900000000,
+    0xeb70164600000000, 0x7a037e6500000000, 0x3d913aca00000000,
+    0xb52186e000000000, 0xf2b3c24f00000000, 0xa540ffb500000000,
+    0xe2d2bb1a00000000, 0x6a62073000000000, 0x2df0439f00000000,
+    0x85820d1f00000000, 0xc21049b000000000, 0x4aa0f59a00000000,
+    0x0d32b13500000000, 0x5ac18ccf00000000, 0x1d53c86000000000,
+    0x95e3744a00000000, 0xd27130e500000000, 0x8400999100000000,
+    0xc392dd3e00000000, 0x4b22611400000000, 0x0cb025bb00000000,
+    0x5b43184100000000, 0x1cd15cee00000000, 0x9461e0c400000000,
+    0xd3f3a46b00000000, 0x7b81eaeb00000000, 0x3c13ae4400000000,
+    0xb4a3126e00000000, 0xf33156c100000000, 0xa4c26b3b00000000,
+    0xe3502f9400000000, 0x6be093be00000000, 0x2c72d71100000000,
+    0xc702c15700000000, 0x809085f800000000, 0x082039d200000000,
+    0x4fb27d7d00000000, 0x1841408700000000, 0x5fd3042800000000,
+    0xd763b80200000000, 0x90f1fcad00000000, 0x3883b22d00000000,
+    0x7f11f68200000000, 0xf7a14aa800000000, 0xb0330e0700000000,
+    0xe7c033fd00000000, 0xa052775200000000, 0x28e2cb7800000000,
+    0x6f708fd700000000, 0x390126a300000000, 0x7e93620c00000000,
+    0xf623de2600000000, 0xb1b19a8900000000, 0xe642a77300000000,
+    0xa1d0e3dc00000000, 0x29605ff600000000, 0x6ef21b5900000000,
+    0xc68055d900000000, 0x8112117600000000, 0x09a2ad5c00000000,
+    0x4e30e9f300000000, 0x19c3d40900000000, 0x5e5190a600000000,
+    0xd6e12c8c00000000, 0x9173682300000000, 0xf406fcca00000000,
+    0xb394b86500000000, 0x3b24044f00000000, 0x7cb640e000000000,
+    0x2b457d1a00000000, 0x6cd739b500000000, 0xe467859f00000000,
+    0xa3f5c13000000000, 0x0b878fb000000000, 0x4c15cb1f00000000,
+    0xc4a5773500000000, 0x8337339a00000000, 0xd4c40e6000000000,
+    0x93564acf00000000, 0x1be6f6e500000000, 0x5c74b24a00000000,
+    0x0a051b3e00000000, 0x4d975f9100000000, 0xc527e3bb00000000,
+    0x82b5a71400000000, 0xd5469aee00000000, 0x92d4de4100000000,
+    0x1a64626b00000000, 0x5df626c400000000, 0xf584684400000000,
+    0xb2162ceb00000000, 0x3aa690c100000000, 0x7d34d46e00000000,
+    0x2ac7e99400000000, 0x6d55ad3b00000000, 0xe5e5111100000000,
+    0xa27755be00000000, 0x490743f800000000, 0x0e95075700000000,
+    0x8625bb7d00000000, 0xc1b7ffd200000000, 0x9644c22800000000,
+    0xd1d6868700000000, 0x59663aad00000000, 0x1ef47e0200000000,
+    0xb686308200000000, 0xf114742d00000000, 0x79a4c80700000000,
+    0x3e368ca800000000, 0x69c5b15200000000, 0x2e57f5fd00000000,
+    0xa6e749d700000000, 0xe1750d7800000000, 0xb704a40c00000000,
+    0xf096e0a300000000, 0x78265c8900000000, 0x3fb4182600000000,
+    0x684725dc00000000, 0x2fd5617300000000, 0xa765dd5900000000,
+    0xe0f799f600000000, 0x4885d77600000000, 0x0f1793d900000000,
+    0x87a72ff300000000, 0xc0356b5c00000000, 0x97c656a600000000,
+    0xd054120900000000, 0x58e4ae2300000000, 0x1f76ea8c00000000,
+    0x8e0582af00000000, 0xc997c60000000000, 0x41277a2a00000000,
+    0x06b53e8500000000, 0x5146037f00000000, 0x16d447d000000000,
+    0x9e64fbfa00000000, 0xd9f6bf5500000000, 0x7184f1d500000000,
+    0x3616b57a00000000, 0xbea6095000000000, 0xf9344dff00000000,
+    0xaec7700500000000, 0xe95534aa00000000, 0x61e5888000000000,
+    0x2677cc2f00000000, 0x7006655b00000000, 0x379421f400000000,
+    0xbf249dde00000000, 0xf8b6d97100000000, 0xaf45e48b00000000,
+    0xe8d7a02400000000, 0x60671c0e00000000, 0x27f558a100000000,
+    0x8f87162100000000, 0xc815528e00000000, 0x40a5eea400000000,
+    0x0737aa0b00000000, 0x50c497f100000000, 0x1756d35e00000000,
+    0x9fe66f7400000000, 0xd8742bdb00000000, 0x33043d9d00000000,
+    0x7496793200000000, 0xfc26c51800000000, 0xbbb481b700000000,
+    0xec47bc4d00000000, 0xabd5f8e200000000, 0x236544c800000000,
+    0x64f7006700000000, 0xcc854ee700000000, 0x8b170a4800000000,
+    0x03a7b66200000000, 0x4435f2cd00000000, 0x13c6cf3700000000,
+    0x54548b9800000000, 0xdce437b200000000, 0x9b76731d00000000,
+    0xcd07da6900000000, 0x8a959ec600000000, 0x022522ec00000000,
+    0x45b7664300000000, 0x12445bb900000000, 0x55d61f1600000000,
+    0xdd66a33c00000000, 0x9af4e79300000000, 0x3286a91300000000,
+    0x7514edbc00000000, 0xfda4519600000000, 0xba36153900000000,
+    0xedc528c300000000, 0xaa576c6c00000000, 0x22e7d04600000000,
+    0x657594e900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43cba687, 0xc7903cd4, 0x845b9a53, 0xcf270873,
+    0x8cecaef4, 0x08b734a7, 0x4b7c9220, 0x9e4f10e6, 0xdd84b661,
+    0x59df2c32, 0x1a148ab5, 0x51681895, 0x12a3be12, 0x96f82441,
+    0xd53382c6, 0x7d995117, 0x3e52f790, 0xba096dc3, 0xf9c2cb44,
+    0xb2be5964, 0xf175ffe3, 0x752e65b0, 0x36e5c337, 0xe3d641f1,
+    0xa01de776, 0x24467d25, 0x678ddba2, 0x2cf14982, 0x6f3aef05,
+    0xeb617556, 0xa8aad3d1, 0xfa32a32e, 0xb9f905a9, 0x3da29ffa,
+    0x7e69397d, 0x3515ab5d, 0x76de0dda, 0xf2859789, 0xb14e310e,
+    0x647db3c8, 0x27b6154f, 0xa3ed8f1c, 0xe026299b, 0xab5abbbb,
+    0xe8911d3c, 0x6cca876f, 0x2f0121e8, 0x87abf239, 0xc46054be,
+    0x403bceed, 0x03f0686a, 0x488cfa4a, 0x0b475ccd, 0x8f1cc69e,
+    0xccd76019, 0x19e4e2df, 0x5a2f4458, 0xde74de0b, 0x9dbf788c,
+    0xd6c3eaac, 0x95084c2b, 0x1153d678, 0x529870ff, 0xf465465d,
+    0xb7aee0da, 0x33f57a89, 0x703edc0e, 0x3b424e2e, 0x7889e8a9,
+    0xfcd272fa, 0xbf19d47d, 0x6a2a56bb, 0x29e1f03c, 0xadba6a6f,
+    0xee71cce8, 0xa50d5ec8, 0xe6c6f84f, 0x629d621c, 0x2156c49b,
+    0x89fc174a, 0xca37b1cd, 0x4e6c2b9e, 0x0da78d19, 0x46db1f39,
+    0x0510b9be, 0x814b23ed, 0xc280856a, 0x17b307ac, 0x5478a12b,
+    0xd0233b78, 0x93e89dff, 0xd8940fdf, 0x9b5fa958, 0x1f04330b,
+    0x5ccf958c, 0x0e57e573, 0x4d9c43f4, 0xc9c7d9a7, 0x8a0c7f20,
+    0xc170ed00, 0x82bb4b87, 0x06e0d1d4, 0x452b7753, 0x9018f595,
+    0xd3d35312, 0x5788c941, 0x14436fc6, 0x5f3ffde6, 0x1cf45b61,
+    0x98afc132, 0xdb6467b5, 0x73ceb464, 0x300512e3, 0xb45e88b0,
+    0xf7952e37, 0xbce9bc17, 0xff221a90, 0x7b7980c3, 0x38b22644,
+    0xed81a482, 0xae4a0205, 0x2a119856, 0x69da3ed1, 0x22a6acf1,
+    0x616d0a76, 0xe5369025, 0xa6fd36a2, 0xe8cb8cba, 0xab002a3d,
+    0x2f5bb06e, 0x6c9016e9, 0x27ec84c9, 0x6427224e, 0xe07cb81d,
+    0xa3b71e9a, 0x76849c5c, 0x354f3adb, 0xb114a088, 0xf2df060f,
+    0xb9a3942f, 0xfa6832a8, 0x7e33a8fb, 0x3df80e7c, 0x9552ddad,
+    0xd6997b2a, 0x52c2e179, 0x110947fe, 0x5a75d5de, 0x19be7359,
+    0x9de5e90a, 0xde2e4f8d, 0x0b1dcd4b, 0x48d66bcc, 0xcc8df19f,
+    0x8f465718, 0xc43ac538, 0x87f163bf, 0x03aaf9ec, 0x40615f6b,
+    0x12f92f94, 0x51328913, 0xd5691340, 0x96a2b5c7, 0xddde27e7,
+    0x9e158160, 0x1a4e1b33, 0x5985bdb4, 0x8cb63f72, 0xcf7d99f5,
+    0x4b2603a6, 0x08eda521, 0x43913701, 0x005a9186, 0x84010bd5,
+    0xc7caad52, 0x6f607e83, 0x2cabd804, 0xa8f04257, 0xeb3be4d0,
+    0xa04776f0, 0xe38cd077, 0x67d74a24, 0x241ceca3, 0xf12f6e65,
+    0xb2e4c8e2, 0x36bf52b1, 0x7574f436, 0x3e086616, 0x7dc3c091,
+    0xf9985ac2, 0xba53fc45, 0x1caecae7, 0x5f656c60, 0xdb3ef633,
+    0x98f550b4, 0xd389c294, 0x90426413, 0x1419fe40, 0x57d258c7,
+    0x82e1da01, 0xc12a7c86, 0x4571e6d5, 0x06ba4052, 0x4dc6d272,
+    0x0e0d74f5, 0x8a56eea6, 0xc99d4821, 0x61379bf0, 0x22fc3d77,
+    0xa6a7a724, 0xe56c01a3, 0xae109383, 0xeddb3504, 0x6980af57,
+    0x2a4b09d0, 0xff788b16, 0xbcb32d91, 0x38e8b7c2, 0x7b231145,
+    0x305f8365, 0x739425e2, 0xf7cfbfb1, 0xb4041936, 0xe69c69c9,
+    0xa557cf4e, 0x210c551d, 0x62c7f39a, 0x29bb61ba, 0x6a70c73d,
+    0xee2b5d6e, 0xade0fbe9, 0x78d3792f, 0x3b18dfa8, 0xbf4345fb,
+    0xfc88e37c, 0xb7f4715c, 0xf43fd7db, 0x70644d88, 0x33afeb0f,
+    0x9b0538de, 0xd8ce9e59, 0x5c95040a, 0x1f5ea28d, 0x542230ad,
+    0x17e9962a, 0x93b20c79, 0xd079aafe, 0x054a2838, 0x46818ebf,
+    0xc2da14ec, 0x8111b26b, 0xca6d204b, 0x89a686cc, 0x0dfd1c9f,
+    0x4e36ba18},
+   {0x00000000, 0xe1b652ef, 0x836bd405, 0x62dd86ea, 0x06d7a80b,
+    0xe761fae4, 0x85bc7c0e, 0x640a2ee1, 0x0cae5117, 0xed1803f8,
+    0x8fc58512, 0x6e73d7fd, 0x0a79f91c, 0xebcfabf3, 0x89122d19,
+    0x68a47ff6, 0x185ca32e, 0xf9eaf1c1, 0x9b37772b, 0x7a8125c4,
+    0x1e8b0b25, 0xff3d59ca, 0x9de0df20, 0x7c568dcf, 0x14f2f239,
+    0xf544a0d6, 0x9799263c, 0x762f74d3, 0x12255a32, 0xf39308dd,
+    0x914e8e37, 0x70f8dcd8, 0x30b8465d, 0xd10e14b2, 0xb3d39258,
+    0x5265c0b7, 0x366fee56, 0xd7d9bcb9, 0xb5043a53, 0x54b268bc,
+    0x3c16174a, 0xdda045a5, 0xbf7dc34f, 0x5ecb91a0, 0x3ac1bf41,
+    0xdb77edae, 0xb9aa6b44, 0x581c39ab, 0x28e4e573, 0xc952b79c,
+    0xab8f3176, 0x4a396399, 0x2e334d78, 0xcf851f97, 0xad58997d,
+    0x4ceecb92, 0x244ab464, 0xc5fce68b, 0xa7216061, 0x4697328e,
+    0x229d1c6f, 0xc32b4e80, 0xa1f6c86a, 0x40409a85, 0x60708dba,
+    0x81c6df55, 0xe31b59bf, 0x02ad0b50, 0x66a725b1, 0x8711775e,
+    0xe5ccf1b4, 0x047aa35b, 0x6cdedcad, 0x8d688e42, 0xefb508a8,
+    0x0e035a47, 0x6a0974a6, 0x8bbf2649, 0xe962a0a3, 0x08d4f24c,
+    0x782c2e94, 0x999a7c7b, 0xfb47fa91, 0x1af1a87e, 0x7efb869f,
+    0x9f4dd470, 0xfd90529a, 0x1c260075, 0x74827f83, 0x95342d6c,
+    0xf7e9ab86, 0x165ff969, 0x7255d788, 0x93e38567, 0xf13e038d,
+    0x10885162, 0x50c8cbe7, 0xb17e9908, 0xd3a31fe2, 0x32154d0d,
+    0x561f63ec, 0xb7a93103, 0xd574b7e9, 0x34c2e506, 0x5c669af0,
+    0xbdd0c81f, 0xdf0d4ef5, 0x3ebb1c1a, 0x5ab132fb, 0xbb076014,
+    0xd9dae6fe, 0x386cb411, 0x489468c9, 0xa9223a26, 0xcbffbccc,
+    0x2a49ee23, 0x4e43c0c2, 0xaff5922d, 0xcd2814c7, 0x2c9e4628,
+    0x443a39de, 0xa58c6b31, 0xc751eddb, 0x26e7bf34, 0x42ed91d5,
+    0xa35bc33a, 0xc18645d0, 0x2030173f, 0x81e66bae, 0x60503941,
+    0x028dbfab, 0xe33bed44, 0x8731c3a5, 0x6687914a, 0x045a17a0,
+    0xe5ec454f, 0x8d483ab9, 0x6cfe6856, 0x0e23eebc, 0xef95bc53,
+    0x8b9f92b2, 0x6a29c05d, 0x08f446b7, 0xe9421458, 0x99bac880,
+    0x780c9a6f, 0x1ad11c85, 0xfb674e6a, 0x9f6d608b, 0x7edb3264,
+    0x1c06b48e, 0xfdb0e661, 0x95149997, 0x74a2cb78, 0x167f4d92,
+    0xf7c91f7d, 0x93c3319c, 0x72756373, 0x10a8e599, 0xf11eb776,
+    0xb15e2df3, 0x50e87f1c, 0x3235f9f6, 0xd383ab19, 0xb78985f8,
+    0x563fd717, 0x34e251fd, 0xd5540312, 0xbdf07ce4, 0x5c462e0b,
+    0x3e9ba8e1, 0xdf2dfa0e, 0xbb27d4ef, 0x5a918600, 0x384c00ea,
+    0xd9fa5205, 0xa9028edd, 0x48b4dc32, 0x2a695ad8, 0xcbdf0837,
+    0xafd526d6, 0x4e637439, 0x2cbef2d3, 0xcd08a03c, 0xa5acdfca,
+    0x441a8d25, 0x26c70bcf, 0xc7715920, 0xa37b77c1, 0x42cd252e,
+    0x2010a3c4, 0xc1a6f12b, 0xe196e614, 0x0020b4fb, 0x62fd3211,
+    0x834b60fe, 0xe7414e1f, 0x06f71cf0, 0x642a9a1a, 0x859cc8f5,
+    0xed38b703, 0x0c8ee5ec, 0x6e536306, 0x8fe531e9, 0xebef1f08,
+    0x0a594de7, 0x6884cb0d, 0x893299e2, 0xf9ca453a, 0x187c17d5,
+    0x7aa1913f, 0x9b17c3d0, 0xff1ded31, 0x1eabbfde, 0x7c763934,
+    0x9dc06bdb, 0xf564142d, 0x14d246c2, 0x760fc028, 0x97b992c7,
+    0xf3b3bc26, 0x1205eec9, 0x70d86823, 0x916e3acc, 0xd12ea049,
+    0x3098f2a6, 0x5245744c, 0xb3f326a3, 0xd7f90842, 0x364f5aad,
+    0x5492dc47, 0xb5248ea8, 0xdd80f15e, 0x3c36a3b1, 0x5eeb255b,
+    0xbf5d77b4, 0xdb575955, 0x3ae10bba, 0x583c8d50, 0xb98adfbf,
+    0xc9720367, 0x28c45188, 0x4a19d762, 0xabaf858d, 0xcfa5ab6c,
+    0x2e13f983, 0x4cce7f69, 0xad782d86, 0xc5dc5270, 0x246a009f,
+    0x46b78675, 0xa701d49a, 0xc30bfa7b, 0x22bda894, 0x40602e7e,
+    0xa1d67c91},
+   {0x00000000, 0x5880e2d7, 0xf106b474, 0xa98656a3, 0xe20d68e9,
+    0xba8d8a3e, 0x130bdc9d, 0x4b8b3e4a, 0x851da109, 0xdd9d43de,
+    0x741b157d, 0x2c9bf7aa, 0x6710c9e0, 0x3f902b37, 0x96167d94,
+    0xce969f43, 0x0a3b4213, 0x52bba0c4, 0xfb3df667, 0xa3bd14b0,
+    0xe8362afa, 0xb0b6c82d, 0x19309e8e, 0x41b07c59, 0x8f26e31a,
+    0xd7a601cd, 0x7e20576e, 0x26a0b5b9, 0x6d2b8bf3, 0x35ab6924,
+    0x9c2d3f87, 0xc4addd50, 0x14768426, 0x4cf666f1, 0xe5703052,
+    0xbdf0d285, 0xf67beccf, 0xaefb0e18, 0x077d58bb, 0x5ffdba6c,
+    0x916b252f, 0xc9ebc7f8, 0x606d915b, 0x38ed738c, 0x73664dc6,
+    0x2be6af11, 0x8260f9b2, 0xdae01b65, 0x1e4dc635, 0x46cd24e2,
+    0xef4b7241, 0xb7cb9096, 0xfc40aedc, 0xa4c04c0b, 0x0d461aa8,
+    0x55c6f87f, 0x9b50673c, 0xc3d085eb, 0x6a56d348, 0x32d6319f,
+    0x795d0fd5, 0x21dded02, 0x885bbba1, 0xd0db5976, 0x28ec084d,
+    0x706cea9a, 0xd9eabc39, 0x816a5eee, 0xcae160a4, 0x92618273,
+    0x3be7d4d0, 0x63673607, 0xadf1a944, 0xf5714b93, 0x5cf71d30,
+    0x0477ffe7, 0x4ffcc1ad, 0x177c237a, 0xbefa75d9, 0xe67a970e,
+    0x22d74a5e, 0x7a57a889, 0xd3d1fe2a, 0x8b511cfd, 0xc0da22b7,
+    0x985ac060, 0x31dc96c3, 0x695c7414, 0xa7caeb57, 0xff4a0980,
+    0x56cc5f23, 0x0e4cbdf4, 0x45c783be, 0x1d476169, 0xb4c137ca,
+    0xec41d51d, 0x3c9a8c6b, 0x641a6ebc, 0xcd9c381f, 0x951cdac8,
+    0xde97e482, 0x86170655, 0x2f9150f6, 0x7711b221, 0xb9872d62,
+    0xe107cfb5, 0x48819916, 0x10017bc1, 0x5b8a458b, 0x030aa75c,
+    0xaa8cf1ff, 0xf20c1328, 0x36a1ce78, 0x6e212caf, 0xc7a77a0c,
+    0x9f2798db, 0xd4aca691, 0x8c2c4446, 0x25aa12e5, 0x7d2af032,
+    0xb3bc6f71, 0xeb3c8da6, 0x42badb05, 0x1a3a39d2, 0x51b10798,
+    0x0931e54f, 0xa0b7b3ec, 0xf837513b, 0x50d8119a, 0x0858f34d,
+    0xa1dea5ee, 0xf95e4739, 0xb2d57973, 0xea559ba4, 0x43d3cd07,
+    0x1b532fd0, 0xd5c5b093, 0x8d455244, 0x24c304e7, 0x7c43e630,
+    0x37c8d87a, 0x6f483aad, 0xc6ce6c0e, 0x9e4e8ed9, 0x5ae35389,
+    0x0263b15e, 0xabe5e7fd, 0xf365052a, 0xb8ee3b60, 0xe06ed9b7,
+    0x49e88f14, 0x11686dc3, 0xdffef280, 0x877e1057, 0x2ef846f4,
+    0x7678a423, 0x3df39a69, 0x657378be, 0xccf52e1d, 0x9475ccca,
+    0x44ae95bc, 0x1c2e776b, 0xb5a821c8, 0xed28c31f, 0xa6a3fd55,
+    0xfe231f82, 0x57a54921, 0x0f25abf6, 0xc1b334b5, 0x9933d662,
+    0x30b580c1, 0x68356216, 0x23be5c5c, 0x7b3ebe8b, 0xd2b8e828,
+    0x8a380aff, 0x4e95d7af, 0x16153578, 0xbf9363db, 0xe713810c,
+    0xac98bf46, 0xf4185d91, 0x5d9e0b32, 0x051ee9e5, 0xcb8876a6,
+    0x93089471, 0x3a8ec2d2, 0x620e2005, 0x29851e4f, 0x7105fc98,
+    0xd883aa3b, 0x800348ec, 0x783419d7, 0x20b4fb00, 0x8932ada3,
+    0xd1b24f74, 0x9a39713e, 0xc2b993e9, 0x6b3fc54a, 0x33bf279d,
+    0xfd29b8de, 0xa5a95a09, 0x0c2f0caa, 0x54afee7d, 0x1f24d037,
+    0x47a432e0, 0xee226443, 0xb6a28694, 0x720f5bc4, 0x2a8fb913,
+    0x8309efb0, 0xdb890d67, 0x9002332d, 0xc882d1fa, 0x61048759,
+    0x3984658e, 0xf712facd, 0xaf92181a, 0x06144eb9, 0x5e94ac6e,
+    0x151f9224, 0x4d9f70f3, 0xe4192650, 0xbc99c487, 0x6c429df1,
+    0x34c27f26, 0x9d442985, 0xc5c4cb52, 0x8e4ff518, 0xd6cf17cf,
+    0x7f49416c, 0x27c9a3bb, 0xe95f3cf8, 0xb1dfde2f, 0x1859888c,
+    0x40d96a5b, 0x0b525411, 0x53d2b6c6, 0xfa54e065, 0xa2d402b2,
+    0x6679dfe2, 0x3ef93d35, 0x977f6b96, 0xcfff8941, 0x8474b70b,
+    0xdcf455dc, 0x7572037f, 0x2df2e1a8, 0xe3647eeb, 0xbbe49c3c,
+    0x1262ca9f, 0x4ae22848, 0x01691602, 0x59e9f4d5, 0xf06fa276,
+    0xa8ef40a1},
+   {0x00000000, 0x463b6765, 0x8c76ceca, 0xca4da9af, 0x59ebed4e,
+    0x1fd08a2b, 0xd59d2384, 0x93a644e1, 0xb2d6db9d, 0xf4edbcf8,
+    0x3ea01557, 0x789b7232, 0xeb3d36d3, 0xad0651b6, 0x674bf819,
+    0x21709f7c, 0x25abc6e0, 0x6390a185, 0xa9dd082a, 0xefe66f4f,
+    0x7c402bae, 0x3a7b4ccb, 0xf036e564, 0xb60d8201, 0x977d1d7d,
+    0xd1467a18, 0x1b0bd3b7, 0x5d30b4d2, 0xce96f033, 0x88ad9756,
+    0x42e03ef9, 0x04db599c, 0x0b50fc1a, 0x4d6b9b7f, 0x872632d0,
+    0xc11d55b5, 0x52bb1154, 0x14807631, 0xdecddf9e, 0x98f6b8fb,
+    0xb9862787, 0xffbd40e2, 0x35f0e94d, 0x73cb8e28, 0xe06dcac9,
+    0xa656adac, 0x6c1b0403, 0x2a206366, 0x2efb3afa, 0x68c05d9f,
+    0xa28df430, 0xe4b69355, 0x7710d7b4, 0x312bb0d1, 0xfb66197e,
+    0xbd5d7e1b, 0x9c2de167, 0xda168602, 0x105b2fad, 0x566048c8,
+    0xc5c60c29, 0x83fd6b4c, 0x49b0c2e3, 0x0f8ba586, 0x16a0f835,
+    0x509b9f50, 0x9ad636ff, 0xdced519a, 0x4f4b157b, 0x0970721e,
+    0xc33ddbb1, 0x8506bcd4, 0xa47623a8, 0xe24d44cd, 0x2800ed62,
+    0x6e3b8a07, 0xfd9dcee6, 0xbba6a983, 0x71eb002c, 0x37d06749,
+    0x330b3ed5, 0x753059b0, 0xbf7df01f, 0xf946977a, 0x6ae0d39b,
+    0x2cdbb4fe, 0xe6961d51, 0xa0ad7a34, 0x81dde548, 0xc7e6822d,
+    0x0dab2b82, 0x4b904ce7, 0xd8360806, 0x9e0d6f63, 0x5440c6cc,
+    0x127ba1a9, 0x1df0042f, 0x5bcb634a, 0x9186cae5, 0xd7bdad80,
+    0x441be961, 0x02208e04, 0xc86d27ab, 0x8e5640ce, 0xaf26dfb2,
+    0xe91db8d7, 0x23501178, 0x656b761d, 0xf6cd32fc, 0xb0f65599,
+    0x7abbfc36, 0x3c809b53, 0x385bc2cf, 0x7e60a5aa, 0xb42d0c05,
+    0xf2166b60, 0x61b02f81, 0x278b48e4, 0xedc6e14b, 0xabfd862e,
+    0x8a8d1952, 0xccb67e37, 0x06fbd798, 0x40c0b0fd, 0xd366f41c,
+    0x955d9379, 0x5f103ad6, 0x192b5db3, 0x2c40f16b, 0x6a7b960e,
+    0xa0363fa1, 0xe60d58c4, 0x75ab1c25, 0x33907b40, 0xf9ddd2ef,
+    0xbfe6b58a, 0x9e962af6, 0xd8ad4d93, 0x12e0e43c, 0x54db8359,
+    0xc77dc7b8, 0x8146a0dd, 0x4b0b0972, 0x0d306e17, 0x09eb378b,
+    0x4fd050ee, 0x859df941, 0xc3a69e24, 0x5000dac5, 0x163bbda0,
+    0xdc76140f, 0x9a4d736a, 0xbb3dec16, 0xfd068b73, 0x374b22dc,
+    0x717045b9, 0xe2d60158, 0xa4ed663d, 0x6ea0cf92, 0x289ba8f7,
+    0x27100d71, 0x612b6a14, 0xab66c3bb, 0xed5da4de, 0x7efbe03f,
+    0x38c0875a, 0xf28d2ef5, 0xb4b64990, 0x95c6d6ec, 0xd3fdb189,
+    0x19b01826, 0x5f8b7f43, 0xcc2d3ba2, 0x8a165cc7, 0x405bf568,
+    0x0660920d, 0x02bbcb91, 0x4480acf4, 0x8ecd055b, 0xc8f6623e,
+    0x5b5026df, 0x1d6b41ba, 0xd726e815, 0x911d8f70, 0xb06d100c,
+    0xf6567769, 0x3c1bdec6, 0x7a20b9a3, 0xe986fd42, 0xafbd9a27,
+    0x65f03388, 0x23cb54ed, 0x3ae0095e, 0x7cdb6e3b, 0xb696c794,
+    0xf0ada0f1, 0x630be410, 0x25308375, 0xef7d2ada, 0xa9464dbf,
+    0x8836d2c3, 0xce0db5a6, 0x04401c09, 0x427b7b6c, 0xd1dd3f8d,
+    0x97e658e8, 0x5dabf147, 0x1b909622, 0x1f4bcfbe, 0x5970a8db,
+    0x933d0174, 0xd5066611, 0x46a022f0, 0x009b4595, 0xcad6ec3a,
+    0x8ced8b5f, 0xad9d1423, 0xeba67346, 0x21ebdae9, 0x67d0bd8c,
+    0xf476f96d, 0xb24d9e08, 0x780037a7, 0x3e3b50c2, 0x31b0f544,
+    0x778b9221, 0xbdc63b8e, 0xfbfd5ceb, 0x685b180a, 0x2e607f6f,
+    0xe42dd6c0, 0xa216b1a5, 0x83662ed9, 0xc55d49bc, 0x0f10e013,
+    0x492b8776, 0xda8dc397, 0x9cb6a4f2, 0x56fb0d5d, 0x10c06a38,
+    0x141b33a4, 0x522054c1, 0x986dfd6e, 0xde569a0b, 0x4df0deea,
+    0x0bcbb98f, 0xc1861020, 0x87bd7745, 0xa6cde839, 0xe0f68f5c,
+    0x2abb26f3, 0x6c804196, 0xff260577, 0xb91d6212, 0x7350cbbd,
+    0x356bacd8}};
+
+#endif
+
+#endif
+
+#if N == 6
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x3db1ecdc, 0x7b63d9b8, 0x46d23564, 0xf6c7b370,
+    0xcb765fac, 0x8da46ac8, 0xb0158614, 0x36fe60a1, 0x0b4f8c7d,
+    0x4d9db919, 0x702c55c5, 0xc039d3d1, 0xfd883f0d, 0xbb5a0a69,
+    0x86ebe6b5, 0x6dfcc142, 0x504d2d9e, 0x169f18fa, 0x2b2ef426,
+    0x9b3b7232, 0xa68a9eee, 0xe058ab8a, 0xdde94756, 0x5b02a1e3,
+    0x66b34d3f, 0x2061785b, 0x1dd09487, 0xadc51293, 0x9074fe4f,
+    0xd6a6cb2b, 0xeb1727f7, 0xdbf98284, 0xe6486e58, 0xa09a5b3c,
+    0x9d2bb7e0, 0x2d3e31f4, 0x108fdd28, 0x565de84c, 0x6bec0490,
+    0xed07e225, 0xd0b60ef9, 0x96643b9d, 0xabd5d741, 0x1bc05155,
+    0x2671bd89, 0x60a388ed, 0x5d126431, 0xb60543c6, 0x8bb4af1a,
+    0xcd669a7e, 0xf0d776a2, 0x40c2f0b6, 0x7d731c6a, 0x3ba1290e,
+    0x0610c5d2, 0x80fb2367, 0xbd4acfbb, 0xfb98fadf, 0xc6291603,
+    0x763c9017, 0x4b8d7ccb, 0x0d5f49af, 0x30eea573, 0x6c820349,
+    0x5133ef95, 0x17e1daf1, 0x2a50362d, 0x9a45b039, 0xa7f45ce5,
+    0xe1266981, 0xdc97855d, 0x5a7c63e8, 0x67cd8f34, 0x211fba50,
+    0x1cae568c, 0xacbbd098, 0x910a3c44, 0xd7d80920, 0xea69e5fc,
+    0x017ec20b, 0x3ccf2ed7, 0x7a1d1bb3, 0x47acf76f, 0xf7b9717b,
+    0xca089da7, 0x8cdaa8c3, 0xb16b441f, 0x3780a2aa, 0x0a314e76,
+    0x4ce37b12, 0x715297ce, 0xc14711da, 0xfcf6fd06, 0xba24c862,
+    0x879524be, 0xb77b81cd, 0x8aca6d11, 0xcc185875, 0xf1a9b4a9,
+    0x41bc32bd, 0x7c0dde61, 0x3adfeb05, 0x076e07d9, 0x8185e16c,
+    0xbc340db0, 0xfae638d4, 0xc757d408, 0x7742521c, 0x4af3bec0,
+    0x0c218ba4, 0x31906778, 0xda87408f, 0xe736ac53, 0xa1e49937,
+    0x9c5575eb, 0x2c40f3ff, 0x11f11f23, 0x57232a47, 0x6a92c69b,
+    0xec79202e, 0xd1c8ccf2, 0x971af996, 0xaaab154a, 0x1abe935e,
+    0x270f7f82, 0x61dd4ae6, 0x5c6ca63a, 0xd9040692, 0xe4b5ea4e,
+    0xa267df2a, 0x9fd633f6, 0x2fc3b5e2, 0x1272593e, 0x54a06c5a,
+    0x69118086, 0xeffa6633, 0xd24b8aef, 0x9499bf8b, 0xa9285357,
+    0x193dd543, 0x248c399f, 0x625e0cfb, 0x5fefe027, 0xb4f8c7d0,
+    0x89492b0c, 0xcf9b1e68, 0xf22af2b4, 0x423f74a0, 0x7f8e987c,
+    0x395cad18, 0x04ed41c4, 0x8206a771, 0xbfb74bad, 0xf9657ec9,
+    0xc4d49215, 0x74c11401, 0x4970f8dd, 0x0fa2cdb9, 0x32132165,
+    0x02fd8416, 0x3f4c68ca, 0x799e5dae, 0x442fb172, 0xf43a3766,
+    0xc98bdbba, 0x8f59eede, 0xb2e80202, 0x3403e4b7, 0x09b2086b,
+    0x4f603d0f, 0x72d1d1d3, 0xc2c457c7, 0xff75bb1b, 0xb9a78e7f,
+    0x841662a3, 0x6f014554, 0x52b0a988, 0x14629cec, 0x29d37030,
+    0x99c6f624, 0xa4771af8, 0xe2a52f9c, 0xdf14c340, 0x59ff25f5,
+    0x644ec929, 0x229cfc4d, 0x1f2d1091, 0xaf389685, 0x92897a59,
+    0xd45b4f3d, 0xe9eaa3e1, 0xb58605db, 0x8837e907, 0xcee5dc63,
+    0xf35430bf, 0x4341b6ab, 0x7ef05a77, 0x38226f13, 0x059383cf,
+    0x8378657a, 0xbec989a6, 0xf81bbcc2, 0xc5aa501e, 0x75bfd60a,
+    0x480e3ad6, 0x0edc0fb2, 0x336de36e, 0xd87ac499, 0xe5cb2845,
+    0xa3191d21, 0x9ea8f1fd, 0x2ebd77e9, 0x130c9b35, 0x55deae51,
+    0x686f428d, 0xee84a438, 0xd33548e4, 0x95e77d80, 0xa856915c,
+    0x18431748, 0x25f2fb94, 0x6320cef0, 0x5e91222c, 0x6e7f875f,
+    0x53ce6b83, 0x151c5ee7, 0x28adb23b, 0x98b8342f, 0xa509d8f3,
+    0xe3dbed97, 0xde6a014b, 0x5881e7fe, 0x65300b22, 0x23e23e46,
+    0x1e53d29a, 0xae46548e, 0x93f7b852, 0xd5258d36, 0xe89461ea,
+    0x0383461d, 0x3e32aac1, 0x78e09fa5, 0x45517379, 0xf544f56d,
+    0xc8f519b1, 0x8e272cd5, 0xb396c009, 0x357d26bc, 0x08ccca60,
+    0x4e1eff04, 0x73af13d8, 0xc3ba95cc, 0xfe0b7910, 0xb8d94c74,
+    0x8568a0a8},
+   {0x00000000, 0x69790b65, 0xd2f216ca, 0xbb8b1daf, 0x7e952bd5,
+    0x17ec20b0, 0xac673d1f, 0xc51e367a, 0xfd2a57aa, 0x94535ccf,
+    0x2fd84160, 0x46a14a05, 0x83bf7c7f, 0xeac6771a, 0x514d6ab5,
+    0x383461d0, 0x2125a915, 0x485ca270, 0xf3d7bfdf, 0x9aaeb4ba,
+    0x5fb082c0, 0x36c989a5, 0x8d42940a, 0xe43b9f6f, 0xdc0ffebf,
+    0xb576f5da, 0x0efde875, 0x6784e310, 0xa29ad56a, 0xcbe3de0f,
+    0x7068c3a0, 0x1911c8c5, 0x424b522a, 0x2b32594f, 0x90b944e0,
+    0xf9c04f85, 0x3cde79ff, 0x55a7729a, 0xee2c6f35, 0x87556450,
+    0xbf610580, 0xd6180ee5, 0x6d93134a, 0x04ea182f, 0xc1f42e55,
+    0xa88d2530, 0x1306389f, 0x7a7f33fa, 0x636efb3f, 0x0a17f05a,
+    0xb19cedf5, 0xd8e5e690, 0x1dfbd0ea, 0x7482db8f, 0xcf09c620,
+    0xa670cd45, 0x9e44ac95, 0xf73da7f0, 0x4cb6ba5f, 0x25cfb13a,
+    0xe0d18740, 0x89a88c25, 0x3223918a, 0x5b5a9aef, 0x8496a454,
+    0xedefaf31, 0x5664b29e, 0x3f1db9fb, 0xfa038f81, 0x937a84e4,
+    0x28f1994b, 0x4188922e, 0x79bcf3fe, 0x10c5f89b, 0xab4ee534,
+    0xc237ee51, 0x0729d82b, 0x6e50d34e, 0xd5dbcee1, 0xbca2c584,
+    0xa5b30d41, 0xccca0624, 0x77411b8b, 0x1e3810ee, 0xdb262694,
+    0xb25f2df1, 0x09d4305e, 0x60ad3b3b, 0x58995aeb, 0x31e0518e,
+    0x8a6b4c21, 0xe3124744, 0x260c713e, 0x4f757a5b, 0xf4fe67f4,
+    0x9d876c91, 0xc6ddf67e, 0xafa4fd1b, 0x142fe0b4, 0x7d56ebd1,
+    0xb848ddab, 0xd131d6ce, 0x6abacb61, 0x03c3c004, 0x3bf7a1d4,
+    0x528eaab1, 0xe905b71e, 0x807cbc7b, 0x45628a01, 0x2c1b8164,
+    0x97909ccb, 0xfee997ae, 0xe7f85f6b, 0x8e81540e, 0x350a49a1,
+    0x5c7342c4, 0x996d74be, 0xf0147fdb, 0x4b9f6274, 0x22e66911,
+    0x1ad208c1, 0x73ab03a4, 0xc8201e0b, 0xa159156e, 0x64472314,
+    0x0d3e2871, 0xb6b535de, 0xdfcc3ebb, 0xd25c4ee9, 0xbb25458c,
+    0x00ae5823, 0x69d75346, 0xacc9653c, 0xc5b06e59, 0x7e3b73f6,
+    0x17427893, 0x2f761943, 0x460f1226, 0xfd840f89, 0x94fd04ec,
+    0x51e33296, 0x389a39f3, 0x8311245c, 0xea682f39, 0xf379e7fc,
+    0x9a00ec99, 0x218bf136, 0x48f2fa53, 0x8deccc29, 0xe495c74c,
+    0x5f1edae3, 0x3667d186, 0x0e53b056, 0x672abb33, 0xdca1a69c,
+    0xb5d8adf9, 0x70c69b83, 0x19bf90e6, 0xa2348d49, 0xcb4d862c,
+    0x90171cc3, 0xf96e17a6, 0x42e50a09, 0x2b9c016c, 0xee823716,
+    0x87fb3c73, 0x3c7021dc, 0x55092ab9, 0x6d3d4b69, 0x0444400c,
+    0xbfcf5da3, 0xd6b656c6, 0x13a860bc, 0x7ad16bd9, 0xc15a7676,
+    0xa8237d13, 0xb132b5d6, 0xd84bbeb3, 0x63c0a31c, 0x0ab9a879,
+    0xcfa79e03, 0xa6de9566, 0x1d5588c9, 0x742c83ac, 0x4c18e27c,
+    0x2561e919, 0x9eeaf4b6, 0xf793ffd3, 0x328dc9a9, 0x5bf4c2cc,
+    0xe07fdf63, 0x8906d406, 0x56caeabd, 0x3fb3e1d8, 0x8438fc77,
+    0xed41f712, 0x285fc168, 0x4126ca0d, 0xfaadd7a2, 0x93d4dcc7,
+    0xabe0bd17, 0xc299b672, 0x7912abdd, 0x106ba0b8, 0xd57596c2,
+    0xbc0c9da7, 0x07878008, 0x6efe8b6d, 0x77ef43a8, 0x1e9648cd,
+    0xa51d5562, 0xcc645e07, 0x097a687d, 0x60036318, 0xdb887eb7,
+    0xb2f175d2, 0x8ac51402, 0xe3bc1f67, 0x583702c8, 0x314e09ad,
+    0xf4503fd7, 0x9d2934b2, 0x26a2291d, 0x4fdb2278, 0x1481b897,
+    0x7df8b3f2, 0xc673ae5d, 0xaf0aa538, 0x6a149342, 0x036d9827,
+    0xb8e68588, 0xd19f8eed, 0xe9abef3d, 0x80d2e458, 0x3b59f9f7,
+    0x5220f292, 0x973ec4e8, 0xfe47cf8d, 0x45ccd222, 0x2cb5d947,
+    0x35a41182, 0x5cdd1ae7, 0xe7560748, 0x8e2f0c2d, 0x4b313a57,
+    0x22483132, 0x99c32c9d, 0xf0ba27f8, 0xc88e4628, 0xa1f74d4d,
+    0x1a7c50e2, 0x73055b87, 0xb61b6dfd, 0xdf626698, 0x64e97b37,
+    0x0d907052},
+   {0x00000000, 0x7fc99b93, 0xff933726, 0x805aacb5, 0x2457680d,
+    0x5b9ef39e, 0xdbc45f2b, 0xa40dc4b8, 0x48aed01a, 0x37674b89,
+    0xb73de73c, 0xc8f47caf, 0x6cf9b817, 0x13302384, 0x936a8f31,
+    0xeca314a2, 0x915da034, 0xee943ba7, 0x6ece9712, 0x11070c81,
+    0xb50ac839, 0xcac353aa, 0x4a99ff1f, 0x3550648c, 0xd9f3702e,
+    0xa63aebbd, 0x26604708, 0x59a9dc9b, 0xfda41823, 0x826d83b0,
+    0x02372f05, 0x7dfeb496, 0xf9ca4629, 0x8603ddba, 0x0659710f,
+    0x7990ea9c, 0xdd9d2e24, 0xa254b5b7, 0x220e1902, 0x5dc78291,
+    0xb1649633, 0xcead0da0, 0x4ef7a115, 0x313e3a86, 0x9533fe3e,
+    0xeafa65ad, 0x6aa0c918, 0x1569528b, 0x6897e61d, 0x175e7d8e,
+    0x9704d13b, 0xe8cd4aa8, 0x4cc08e10, 0x33091583, 0xb353b936,
+    0xcc9a22a5, 0x20393607, 0x5ff0ad94, 0xdfaa0121, 0xa0639ab2,
+    0x046e5e0a, 0x7ba7c599, 0xfbfd692c, 0x8434f2bf, 0x28e58a13,
+    0x572c1180, 0xd776bd35, 0xa8bf26a6, 0x0cb2e21e, 0x737b798d,
+    0xf321d538, 0x8ce84eab, 0x604b5a09, 0x1f82c19a, 0x9fd86d2f,
+    0xe011f6bc, 0x441c3204, 0x3bd5a997, 0xbb8f0522, 0xc4469eb1,
+    0xb9b82a27, 0xc671b1b4, 0x462b1d01, 0x39e28692, 0x9def422a,
+    0xe226d9b9, 0x627c750c, 0x1db5ee9f, 0xf116fa3d, 0x8edf61ae,
+    0x0e85cd1b, 0x714c5688, 0xd5419230, 0xaa8809a3, 0x2ad2a516,
+    0x551b3e85, 0xd12fcc3a, 0xaee657a9, 0x2ebcfb1c, 0x5175608f,
+    0xf578a437, 0x8ab13fa4, 0x0aeb9311, 0x75220882, 0x99811c20,
+    0xe64887b3, 0x66122b06, 0x19dbb095, 0xbdd6742d, 0xc21fefbe,
+    0x4245430b, 0x3d8cd898, 0x40726c0e, 0x3fbbf79d, 0xbfe15b28,
+    0xc028c0bb, 0x64250403, 0x1bec9f90, 0x9bb63325, 0xe47fa8b6,
+    0x08dcbc14, 0x77152787, 0xf74f8b32, 0x888610a1, 0x2c8bd419,
+    0x53424f8a, 0xd318e33f, 0xacd178ac, 0x51cb1426, 0x2e028fb5,
+    0xae582300, 0xd191b893, 0x759c7c2b, 0x0a55e7b8, 0x8a0f4b0d,
+    0xf5c6d09e, 0x1965c43c, 0x66ac5faf, 0xe6f6f31a, 0x993f6889,
+    0x3d32ac31, 0x42fb37a2, 0xc2a19b17, 0xbd680084, 0xc096b412,
+    0xbf5f2f81, 0x3f058334, 0x40cc18a7, 0xe4c1dc1f, 0x9b08478c,
+    0x1b52eb39, 0x649b70aa, 0x88386408, 0xf7f1ff9b, 0x77ab532e,
+    0x0862c8bd, 0xac6f0c05, 0xd3a69796, 0x53fc3b23, 0x2c35a0b0,
+    0xa801520f, 0xd7c8c99c, 0x57926529, 0x285bfeba, 0x8c563a02,
+    0xf39fa191, 0x73c50d24, 0x0c0c96b7, 0xe0af8215, 0x9f661986,
+    0x1f3cb533, 0x60f52ea0, 0xc4f8ea18, 0xbb31718b, 0x3b6bdd3e,
+    0x44a246ad, 0x395cf23b, 0x469569a8, 0xc6cfc51d, 0xb9065e8e,
+    0x1d0b9a36, 0x62c201a5, 0xe298ad10, 0x9d513683, 0x71f22221,
+    0x0e3bb9b2, 0x8e611507, 0xf1a88e94, 0x55a54a2c, 0x2a6cd1bf,
+    0xaa367d0a, 0xd5ffe699, 0x792e9e35, 0x06e705a6, 0x86bda913,
+    0xf9743280, 0x5d79f638, 0x22b06dab, 0xa2eac11e, 0xdd235a8d,
+    0x31804e2f, 0x4e49d5bc, 0xce137909, 0xb1dae29a, 0x15d72622,
+    0x6a1ebdb1, 0xea441104, 0x958d8a97, 0xe8733e01, 0x97baa592,
+    0x17e00927, 0x682992b4, 0xcc24560c, 0xb3edcd9f, 0x33b7612a,
+    0x4c7efab9, 0xa0ddee1b, 0xdf147588, 0x5f4ed93d, 0x208742ae,
+    0x848a8616, 0xfb431d85, 0x7b19b130, 0x04d02aa3, 0x80e4d81c,
+    0xff2d438f, 0x7f77ef3a, 0x00be74a9, 0xa4b3b011, 0xdb7a2b82,
+    0x5b208737, 0x24e91ca4, 0xc84a0806, 0xb7839395, 0x37d93f20,
+    0x4810a4b3, 0xec1d600b, 0x93d4fb98, 0x138e572d, 0x6c47ccbe,
+    0x11b97828, 0x6e70e3bb, 0xee2a4f0e, 0x91e3d49d, 0x35ee1025,
+    0x4a278bb6, 0xca7d2703, 0xb5b4bc90, 0x5917a832, 0x26de33a1,
+    0xa6849f14, 0xd94d0487, 0x7d40c03f, 0x02895bac, 0x82d3f719,
+    0xfd1a6c8a},
+   {0x00000000, 0xa396284c, 0x9c5d56d9, 0x3fcb7e95, 0xe3cbabf3,
+    0x405d83bf, 0x7f96fd2a, 0xdc00d566, 0x1ce651a7, 0xbf7079eb,
+    0x80bb077e, 0x232d2f32, 0xff2dfa54, 0x5cbbd218, 0x6370ac8d,
+    0xc0e684c1, 0x39cca34e, 0x9a5a8b02, 0xa591f597, 0x0607dddb,
+    0xda0708bd, 0x799120f1, 0x465a5e64, 0xe5cc7628, 0x252af2e9,
+    0x86bcdaa5, 0xb977a430, 0x1ae18c7c, 0xc6e1591a, 0x65777156,
+    0x5abc0fc3, 0xf92a278f, 0x7399469c, 0xd00f6ed0, 0xefc41045,
+    0x4c523809, 0x9052ed6f, 0x33c4c523, 0x0c0fbbb6, 0xaf9993fa,
+    0x6f7f173b, 0xcce93f77, 0xf32241e2, 0x50b469ae, 0x8cb4bcc8,
+    0x2f229484, 0x10e9ea11, 0xb37fc25d, 0x4a55e5d2, 0xe9c3cd9e,
+    0xd608b30b, 0x759e9b47, 0xa99e4e21, 0x0a08666d, 0x35c318f8,
+    0x965530b4, 0x56b3b475, 0xf5259c39, 0xcaeee2ac, 0x6978cae0,
+    0xb5781f86, 0x16ee37ca, 0x2925495f, 0x8ab36113, 0xe7328d38,
+    0x44a4a574, 0x7b6fdbe1, 0xd8f9f3ad, 0x04f926cb, 0xa76f0e87,
+    0x98a47012, 0x3b32585e, 0xfbd4dc9f, 0x5842f4d3, 0x67898a46,
+    0xc41fa20a, 0x181f776c, 0xbb895f20, 0x844221b5, 0x27d409f9,
+    0xdefe2e76, 0x7d68063a, 0x42a378af, 0xe13550e3, 0x3d358585,
+    0x9ea3adc9, 0xa168d35c, 0x02fefb10, 0xc2187fd1, 0x618e579d,
+    0x5e452908, 0xfdd30144, 0x21d3d422, 0x8245fc6e, 0xbd8e82fb,
+    0x1e18aab7, 0x94abcba4, 0x373de3e8, 0x08f69d7d, 0xab60b531,
+    0x77606057, 0xd4f6481b, 0xeb3d368e, 0x48ab1ec2, 0x884d9a03,
+    0x2bdbb24f, 0x1410ccda, 0xb786e496, 0x6b8631f0, 0xc81019bc,
+    0xf7db6729, 0x544d4f65, 0xad6768ea, 0x0ef140a6, 0x313a3e33,
+    0x92ac167f, 0x4eacc319, 0xed3aeb55, 0xd2f195c0, 0x7167bd8c,
+    0xb181394d, 0x12171101, 0x2ddc6f94, 0x8e4a47d8, 0x524a92be,
+    0xf1dcbaf2, 0xce17c467, 0x6d81ec2b, 0x15141c31, 0xb682347d,
+    0x89494ae8, 0x2adf62a4, 0xf6dfb7c2, 0x55499f8e, 0x6a82e11b,
+    0xc914c957, 0x09f24d96, 0xaa6465da, 0x95af1b4f, 0x36393303,
+    0xea39e665, 0x49afce29, 0x7664b0bc, 0xd5f298f0, 0x2cd8bf7f,
+    0x8f4e9733, 0xb085e9a6, 0x1313c1ea, 0xcf13148c, 0x6c853cc0,
+    0x534e4255, 0xf0d86a19, 0x303eeed8, 0x93a8c694, 0xac63b801,
+    0x0ff5904d, 0xd3f5452b, 0x70636d67, 0x4fa813f2, 0xec3e3bbe,
+    0x668d5aad, 0xc51b72e1, 0xfad00c74, 0x59462438, 0x8546f15e,
+    0x26d0d912, 0x191ba787, 0xba8d8fcb, 0x7a6b0b0a, 0xd9fd2346,
+    0xe6365dd3, 0x45a0759f, 0x99a0a0f9, 0x3a3688b5, 0x05fdf620,
+    0xa66bde6c, 0x5f41f9e3, 0xfcd7d1af, 0xc31caf3a, 0x608a8776,
+    0xbc8a5210, 0x1f1c7a5c, 0x20d704c9, 0x83412c85, 0x43a7a844,
+    0xe0318008, 0xdffafe9d, 0x7c6cd6d1, 0xa06c03b7, 0x03fa2bfb,
+    0x3c31556e, 0x9fa77d22, 0xf2269109, 0x51b0b945, 0x6e7bc7d0,
+    0xcdedef9c, 0x11ed3afa, 0xb27b12b6, 0x8db06c23, 0x2e26446f,
+    0xeec0c0ae, 0x4d56e8e2, 0x729d9677, 0xd10bbe3b, 0x0d0b6b5d,
+    0xae9d4311, 0x91563d84, 0x32c015c8, 0xcbea3247, 0x687c1a0b,
+    0x57b7649e, 0xf4214cd2, 0x282199b4, 0x8bb7b1f8, 0xb47ccf6d,
+    0x17eae721, 0xd70c63e0, 0x749a4bac, 0x4b513539, 0xe8c71d75,
+    0x34c7c813, 0x9751e05f, 0xa89a9eca, 0x0b0cb686, 0x81bfd795,
+    0x2229ffd9, 0x1de2814c, 0xbe74a900, 0x62747c66, 0xc1e2542a,
+    0xfe292abf, 0x5dbf02f3, 0x9d598632, 0x3ecfae7e, 0x0104d0eb,
+    0xa292f8a7, 0x7e922dc1, 0xdd04058d, 0xe2cf7b18, 0x41595354,
+    0xb87374db, 0x1be55c97, 0x242e2202, 0x87b80a4e, 0x5bb8df28,
+    0xf82ef764, 0xc7e589f1, 0x6473a1bd, 0xa495257c, 0x07030d30,
+    0x38c873a5, 0x9b5e5be9, 0x475e8e8f, 0xe4c8a6c3, 0xdb03d856,
+    0x7895f01a},
+   {0x00000000, 0x2a283862, 0x545070c4, 0x7e7848a6, 0xa8a0e188,
+    0x8288d9ea, 0xfcf0914c, 0xd6d8a92e, 0x8a30c551, 0xa018fd33,
+    0xde60b595, 0xf4488df7, 0x229024d9, 0x08b81cbb, 0x76c0541d,
+    0x5ce86c7f, 0xcf108ce3, 0xe538b481, 0x9b40fc27, 0xb168c445,
+    0x67b06d6b, 0x4d985509, 0x33e01daf, 0x19c825cd, 0x452049b2,
+    0x6f0871d0, 0x11703976, 0x3b580114, 0xed80a83a, 0xc7a89058,
+    0xb9d0d8fe, 0x93f8e09c, 0x45501f87, 0x6f7827e5, 0x11006f43,
+    0x3b285721, 0xedf0fe0f, 0xc7d8c66d, 0xb9a08ecb, 0x9388b6a9,
+    0xcf60dad6, 0xe548e2b4, 0x9b30aa12, 0xb1189270, 0x67c03b5e,
+    0x4de8033c, 0x33904b9a, 0x19b873f8, 0x8a409364, 0xa068ab06,
+    0xde10e3a0, 0xf438dbc2, 0x22e072ec, 0x08c84a8e, 0x76b00228,
+    0x5c983a4a, 0x00705635, 0x2a586e57, 0x542026f1, 0x7e081e93,
+    0xa8d0b7bd, 0x82f88fdf, 0xfc80c779, 0xd6a8ff1b, 0x8aa03f0e,
+    0xa088076c, 0xdef04fca, 0xf4d877a8, 0x2200de86, 0x0828e6e4,
+    0x7650ae42, 0x5c789620, 0x0090fa5f, 0x2ab8c23d, 0x54c08a9b,
+    0x7ee8b2f9, 0xa8301bd7, 0x821823b5, 0xfc606b13, 0xd6485371,
+    0x45b0b3ed, 0x6f988b8f, 0x11e0c329, 0x3bc8fb4b, 0xed105265,
+    0xc7386a07, 0xb94022a1, 0x93681ac3, 0xcf8076bc, 0xe5a84ede,
+    0x9bd00678, 0xb1f83e1a, 0x67209734, 0x4d08af56, 0x3370e7f0,
+    0x1958df92, 0xcff02089, 0xe5d818eb, 0x9ba0504d, 0xb188682f,
+    0x6750c101, 0x4d78f963, 0x3300b1c5, 0x192889a7, 0x45c0e5d8,
+    0x6fe8ddba, 0x1190951c, 0x3bb8ad7e, 0xed600450, 0xc7483c32,
+    0xb9307494, 0x93184cf6, 0x00e0ac6a, 0x2ac89408, 0x54b0dcae,
+    0x7e98e4cc, 0xa8404de2, 0x82687580, 0xfc103d26, 0xd6380544,
+    0x8ad0693b, 0xa0f85159, 0xde8019ff, 0xf4a8219d, 0x227088b3,
+    0x0858b0d1, 0x7620f877, 0x5c08c015, 0xce31785d, 0xe419403f,
+    0x9a610899, 0xb04930fb, 0x669199d5, 0x4cb9a1b7, 0x32c1e911,
+    0x18e9d173, 0x4401bd0c, 0x6e29856e, 0x1051cdc8, 0x3a79f5aa,
+    0xeca15c84, 0xc68964e6, 0xb8f12c40, 0x92d91422, 0x0121f4be,
+    0x2b09ccdc, 0x5571847a, 0x7f59bc18, 0xa9811536, 0x83a92d54,
+    0xfdd165f2, 0xd7f95d90, 0x8b1131ef, 0xa139098d, 0xdf41412b,
+    0xf5697949, 0x23b1d067, 0x0999e805, 0x77e1a0a3, 0x5dc998c1,
+    0x8b6167da, 0xa1495fb8, 0xdf31171e, 0xf5192f7c, 0x23c18652,
+    0x09e9be30, 0x7791f696, 0x5db9cef4, 0x0151a28b, 0x2b799ae9,
+    0x5501d24f, 0x7f29ea2d, 0xa9f14303, 0x83d97b61, 0xfda133c7,
+    0xd7890ba5, 0x4471eb39, 0x6e59d35b, 0x10219bfd, 0x3a09a39f,
+    0xecd10ab1, 0xc6f932d3, 0xb8817a75, 0x92a94217, 0xce412e68,
+    0xe469160a, 0x9a115eac, 0xb03966ce, 0x66e1cfe0, 0x4cc9f782,
+    0x32b1bf24, 0x18998746, 0x44914753, 0x6eb97f31, 0x10c13797,
+    0x3ae90ff5, 0xec31a6db, 0xc6199eb9, 0xb861d61f, 0x9249ee7d,
+    0xcea18202, 0xe489ba60, 0x9af1f2c6, 0xb0d9caa4, 0x6601638a,
+    0x4c295be8, 0x3251134e, 0x18792b2c, 0x8b81cbb0, 0xa1a9f3d2,
+    0xdfd1bb74, 0xf5f98316, 0x23212a38, 0x0909125a, 0x77715afc,
+    0x5d59629e, 0x01b10ee1, 0x2b993683, 0x55e17e25, 0x7fc94647,
+    0xa911ef69, 0x8339d70b, 0xfd419fad, 0xd769a7cf, 0x01c158d4,
+    0x2be960b6, 0x55912810, 0x7fb91072, 0xa961b95c, 0x8349813e,
+    0xfd31c998, 0xd719f1fa, 0x8bf19d85, 0xa1d9a5e7, 0xdfa1ed41,
+    0xf589d523, 0x23517c0d, 0x0979446f, 0x77010cc9, 0x5d2934ab,
+    0xced1d437, 0xe4f9ec55, 0x9a81a4f3, 0xb0a99c91, 0x667135bf,
+    0x4c590ddd, 0x3221457b, 0x18097d19, 0x44e11166, 0x6ec92904,
+    0x10b161a2, 0x3a9959c0, 0xec41f0ee, 0xc669c88c, 0xb811802a,
+    0x9239b848},
+   {0x00000000, 0x4713f6fb, 0x8e27edf6, 0xc9341b0d, 0xc73eddad,
+    0x802d2b56, 0x4919305b, 0x0e0ac6a0, 0x550cbd1b, 0x121f4be0,
+    0xdb2b50ed, 0x9c38a616, 0x923260b6, 0xd521964d, 0x1c158d40,
+    0x5b067bbb, 0xaa197a36, 0xed0a8ccd, 0x243e97c0, 0x632d613b,
+    0x6d27a79b, 0x2a345160, 0xe3004a6d, 0xa413bc96, 0xff15c72d,
+    0xb80631d6, 0x71322adb, 0x3621dc20, 0x382b1a80, 0x7f38ec7b,
+    0xb60cf776, 0xf11f018d, 0x8f43f22d, 0xc85004d6, 0x01641fdb,
+    0x4677e920, 0x487d2f80, 0x0f6ed97b, 0xc65ac276, 0x8149348d,
+    0xda4f4f36, 0x9d5cb9cd, 0x5468a2c0, 0x137b543b, 0x1d71929b,
+    0x5a626460, 0x93567f6d, 0xd4458996, 0x255a881b, 0x62497ee0,
+    0xab7d65ed, 0xec6e9316, 0xe26455b6, 0xa577a34d, 0x6c43b840,
+    0x2b504ebb, 0x70563500, 0x3745c3fb, 0xfe71d8f6, 0xb9622e0d,
+    0xb768e8ad, 0xf07b1e56, 0x394f055b, 0x7e5cf3a0, 0xc5f6e21b,
+    0x82e514e0, 0x4bd10fed, 0x0cc2f916, 0x02c83fb6, 0x45dbc94d,
+    0x8cefd240, 0xcbfc24bb, 0x90fa5f00, 0xd7e9a9fb, 0x1eddb2f6,
+    0x59ce440d, 0x57c482ad, 0x10d77456, 0xd9e36f5b, 0x9ef099a0,
+    0x6fef982d, 0x28fc6ed6, 0xe1c875db, 0xa6db8320, 0xa8d14580,
+    0xefc2b37b, 0x26f6a876, 0x61e55e8d, 0x3ae32536, 0x7df0d3cd,
+    0xb4c4c8c0, 0xf3d73e3b, 0xfdddf89b, 0xbace0e60, 0x73fa156d,
+    0x34e9e396, 0x4ab51036, 0x0da6e6cd, 0xc492fdc0, 0x83810b3b,
+    0x8d8bcd9b, 0xca983b60, 0x03ac206d, 0x44bfd696, 0x1fb9ad2d,
+    0x58aa5bd6, 0x919e40db, 0xd68db620, 0xd8877080, 0x9f94867b,
+    0x56a09d76, 0x11b36b8d, 0xe0ac6a00, 0xa7bf9cfb, 0x6e8b87f6,
+    0x2998710d, 0x2792b7ad, 0x60814156, 0xa9b55a5b, 0xeea6aca0,
+    0xb5a0d71b, 0xf2b321e0, 0x3b873aed, 0x7c94cc16, 0x729e0ab6,
+    0x358dfc4d, 0xfcb9e740, 0xbbaa11bb, 0x509cc277, 0x178f348c,
+    0xdebb2f81, 0x99a8d97a, 0x97a21fda, 0xd0b1e921, 0x1985f22c,
+    0x5e9604d7, 0x05907f6c, 0x42838997, 0x8bb7929a, 0xcca46461,
+    0xc2aea2c1, 0x85bd543a, 0x4c894f37, 0x0b9ab9cc, 0xfa85b841,
+    0xbd964eba, 0x74a255b7, 0x33b1a34c, 0x3dbb65ec, 0x7aa89317,
+    0xb39c881a, 0xf48f7ee1, 0xaf89055a, 0xe89af3a1, 0x21aee8ac,
+    0x66bd1e57, 0x68b7d8f7, 0x2fa42e0c, 0xe6903501, 0xa183c3fa,
+    0xdfdf305a, 0x98ccc6a1, 0x51f8ddac, 0x16eb2b57, 0x18e1edf7,
+    0x5ff21b0c, 0x96c60001, 0xd1d5f6fa, 0x8ad38d41, 0xcdc07bba,
+    0x04f460b7, 0x43e7964c, 0x4ded50ec, 0x0afea617, 0xc3cabd1a,
+    0x84d94be1, 0x75c64a6c, 0x32d5bc97, 0xfbe1a79a, 0xbcf25161,
+    0xb2f897c1, 0xf5eb613a, 0x3cdf7a37, 0x7bcc8ccc, 0x20caf777,
+    0x67d9018c, 0xaeed1a81, 0xe9feec7a, 0xe7f42ada, 0xa0e7dc21,
+    0x69d3c72c, 0x2ec031d7, 0x956a206c, 0xd279d697, 0x1b4dcd9a,
+    0x5c5e3b61, 0x5254fdc1, 0x15470b3a, 0xdc731037, 0x9b60e6cc,
+    0xc0669d77, 0x87756b8c, 0x4e417081, 0x0952867a, 0x075840da,
+    0x404bb621, 0x897fad2c, 0xce6c5bd7, 0x3f735a5a, 0x7860aca1,
+    0xb154b7ac, 0xf6474157, 0xf84d87f7, 0xbf5e710c, 0x766a6a01,
+    0x31799cfa, 0x6a7fe741, 0x2d6c11ba, 0xe4580ab7, 0xa34bfc4c,
+    0xad413aec, 0xea52cc17, 0x2366d71a, 0x647521e1, 0x1a29d241,
+    0x5d3a24ba, 0x940e3fb7, 0xd31dc94c, 0xdd170fec, 0x9a04f917,
+    0x5330e21a, 0x142314e1, 0x4f256f5a, 0x083699a1, 0xc10282ac,
+    0x86117457, 0x881bb2f7, 0xcf08440c, 0x063c5f01, 0x412fa9fa,
+    0xb030a877, 0xf7235e8c, 0x3e174581, 0x7904b37a, 0x770e75da,
+    0x301d8321, 0xf929982c, 0xbe3a6ed7, 0xe53c156c, 0xa22fe397,
+    0x6b1bf89a, 0x2c080e61, 0x2202c8c1, 0x65113e3a, 0xac252537,
+    0xeb36d3cc},
+   {0x00000000, 0xa13984ee, 0x99020f9d, 0x383b8b73, 0xe975197b,
+    0x484c9d95, 0x707716e6, 0xd14e9208, 0x099b34b7, 0xa8a2b059,
+    0x90993b2a, 0x31a0bfc4, 0xe0ee2dcc, 0x41d7a922, 0x79ec2251,
+    0xd8d5a6bf, 0x1336696e, 0xb20fed80, 0x8a3466f3, 0x2b0de21d,
+    0xfa437015, 0x5b7af4fb, 0x63417f88, 0xc278fb66, 0x1aad5dd9,
+    0xbb94d937, 0x83af5244, 0x2296d6aa, 0xf3d844a2, 0x52e1c04c,
+    0x6ada4b3f, 0xcbe3cfd1, 0x266cd2dc, 0x87555632, 0xbf6edd41,
+    0x1e5759af, 0xcf19cba7, 0x6e204f49, 0x561bc43a, 0xf72240d4,
+    0x2ff7e66b, 0x8ece6285, 0xb6f5e9f6, 0x17cc6d18, 0xc682ff10,
+    0x67bb7bfe, 0x5f80f08d, 0xfeb97463, 0x355abbb2, 0x94633f5c,
+    0xac58b42f, 0x0d6130c1, 0xdc2fa2c9, 0x7d162627, 0x452dad54,
+    0xe41429ba, 0x3cc18f05, 0x9df80beb, 0xa5c38098, 0x04fa0476,
+    0xd5b4967e, 0x748d1290, 0x4cb699e3, 0xed8f1d0d, 0x4cd9a5b8,
+    0xede02156, 0xd5dbaa25, 0x74e22ecb, 0xa5acbcc3, 0x0495382d,
+    0x3caeb35e, 0x9d9737b0, 0x4542910f, 0xe47b15e1, 0xdc409e92,
+    0x7d791a7c, 0xac378874, 0x0d0e0c9a, 0x353587e9, 0x940c0307,
+    0x5fefccd6, 0xfed64838, 0xc6edc34b, 0x67d447a5, 0xb69ad5ad,
+    0x17a35143, 0x2f98da30, 0x8ea15ede, 0x5674f861, 0xf74d7c8f,
+    0xcf76f7fc, 0x6e4f7312, 0xbf01e11a, 0x1e3865f4, 0x2603ee87,
+    0x873a6a69, 0x6ab57764, 0xcb8cf38a, 0xf3b778f9, 0x528efc17,
+    0x83c06e1f, 0x22f9eaf1, 0x1ac26182, 0xbbfbe56c, 0x632e43d3,
+    0xc217c73d, 0xfa2c4c4e, 0x5b15c8a0, 0x8a5b5aa8, 0x2b62de46,
+    0x13595535, 0xb260d1db, 0x79831e0a, 0xd8ba9ae4, 0xe0811197,
+    0x41b89579, 0x90f60771, 0x31cf839f, 0x09f408ec, 0xa8cd8c02,
+    0x70182abd, 0xd121ae53, 0xe91a2520, 0x4823a1ce, 0x996d33c6,
+    0x3854b728, 0x006f3c5b, 0xa156b8b5, 0x99b34b70, 0x388acf9e,
+    0x00b144ed, 0xa188c003, 0x70c6520b, 0xd1ffd6e5, 0xe9c45d96,
+    0x48fdd978, 0x90287fc7, 0x3111fb29, 0x092a705a, 0xa813f4b4,
+    0x795d66bc, 0xd864e252, 0xe05f6921, 0x4166edcf, 0x8a85221e,
+    0x2bbca6f0, 0x13872d83, 0xb2bea96d, 0x63f03b65, 0xc2c9bf8b,
+    0xfaf234f8, 0x5bcbb016, 0x831e16a9, 0x22279247, 0x1a1c1934,
+    0xbb259dda, 0x6a6b0fd2, 0xcb528b3c, 0xf369004f, 0x525084a1,
+    0xbfdf99ac, 0x1ee61d42, 0x26dd9631, 0x87e412df, 0x56aa80d7,
+    0xf7930439, 0xcfa88f4a, 0x6e910ba4, 0xb644ad1b, 0x177d29f5,
+    0x2f46a286, 0x8e7f2668, 0x5f31b460, 0xfe08308e, 0xc633bbfd,
+    0x670a3f13, 0xace9f0c2, 0x0dd0742c, 0x35ebff5f, 0x94d27bb1,
+    0x459ce9b9, 0xe4a56d57, 0xdc9ee624, 0x7da762ca, 0xa572c475,
+    0x044b409b, 0x3c70cbe8, 0x9d494f06, 0x4c07dd0e, 0xed3e59e0,
+    0xd505d293, 0x743c567d, 0xd56aeec8, 0x74536a26, 0x4c68e155,
+    0xed5165bb, 0x3c1ff7b3, 0x9d26735d, 0xa51df82e, 0x04247cc0,
+    0xdcf1da7f, 0x7dc85e91, 0x45f3d5e2, 0xe4ca510c, 0x3584c304,
+    0x94bd47ea, 0xac86cc99, 0x0dbf4877, 0xc65c87a6, 0x67650348,
+    0x5f5e883b, 0xfe670cd5, 0x2f299edd, 0x8e101a33, 0xb62b9140,
+    0x171215ae, 0xcfc7b311, 0x6efe37ff, 0x56c5bc8c, 0xf7fc3862,
+    0x26b2aa6a, 0x878b2e84, 0xbfb0a5f7, 0x1e892119, 0xf3063c14,
+    0x523fb8fa, 0x6a043389, 0xcb3db767, 0x1a73256f, 0xbb4aa181,
+    0x83712af2, 0x2248ae1c, 0xfa9d08a3, 0x5ba48c4d, 0x639f073e,
+    0xc2a683d0, 0x13e811d8, 0xb2d19536, 0x8aea1e45, 0x2bd39aab,
+    0xe030557a, 0x4109d194, 0x79325ae7, 0xd80bde09, 0x09454c01,
+    0xa87cc8ef, 0x9047439c, 0x317ec772, 0xe9ab61cd, 0x4892e523,
+    0x70a96e50, 0xd190eabe, 0x00de78b6, 0xa1e7fc58, 0x99dc772b,
+    0x38e5f3c5},
+   {0x00000000, 0xe81790a1, 0x0b5e2703, 0xe349b7a2, 0x16bc4e06,
+    0xfeabdea7, 0x1de26905, 0xf5f5f9a4, 0x2d789c0c, 0xc56f0cad,
+    0x2626bb0f, 0xce312bae, 0x3bc4d20a, 0xd3d342ab, 0x309af509,
+    0xd88d65a8, 0x5af13818, 0xb2e6a8b9, 0x51af1f1b, 0xb9b88fba,
+    0x4c4d761e, 0xa45ae6bf, 0x4713511d, 0xaf04c1bc, 0x7789a414,
+    0x9f9e34b5, 0x7cd78317, 0x94c013b6, 0x6135ea12, 0x89227ab3,
+    0x6a6bcd11, 0x827c5db0, 0xb5e27030, 0x5df5e091, 0xbebc5733,
+    0x56abc792, 0xa35e3e36, 0x4b49ae97, 0xa8001935, 0x40178994,
+    0x989aec3c, 0x708d7c9d, 0x93c4cb3f, 0x7bd35b9e, 0x8e26a23a,
+    0x6631329b, 0x85788539, 0x6d6f1598, 0xef134828, 0x0704d889,
+    0xe44d6f2b, 0x0c5aff8a, 0xf9af062e, 0x11b8968f, 0xf2f1212d,
+    0x1ae6b18c, 0xc26bd424, 0x2a7c4485, 0xc935f327, 0x21226386,
+    0xd4d79a22, 0x3cc00a83, 0xdf89bd21, 0x379e2d80, 0xb0b5e621,
+    0x58a27680, 0xbbebc122, 0x53fc5183, 0xa609a827, 0x4e1e3886,
+    0xad578f24, 0x45401f85, 0x9dcd7a2d, 0x75daea8c, 0x96935d2e,
+    0x7e84cd8f, 0x8b71342b, 0x6366a48a, 0x802f1328, 0x68388389,
+    0xea44de39, 0x02534e98, 0xe11af93a, 0x090d699b, 0xfcf8903f,
+    0x14ef009e, 0xf7a6b73c, 0x1fb1279d, 0xc73c4235, 0x2f2bd294,
+    0xcc626536, 0x2475f597, 0xd1800c33, 0x39979c92, 0xdade2b30,
+    0x32c9bb91, 0x05579611, 0xed4006b0, 0x0e09b112, 0xe61e21b3,
+    0x13ebd817, 0xfbfc48b6, 0x18b5ff14, 0xf0a26fb5, 0x282f0a1d,
+    0xc0389abc, 0x23712d1e, 0xcb66bdbf, 0x3e93441b, 0xd684d4ba,
+    0x35cd6318, 0xdddaf3b9, 0x5fa6ae09, 0xb7b13ea8, 0x54f8890a,
+    0xbcef19ab, 0x491ae00f, 0xa10d70ae, 0x4244c70c, 0xaa5357ad,
+    0x72de3205, 0x9ac9a2a4, 0x79801506, 0x919785a7, 0x64627c03,
+    0x8c75eca2, 0x6f3c5b00, 0x872bcba1, 0xba1aca03, 0x520d5aa2,
+    0xb144ed00, 0x59537da1, 0xaca68405, 0x44b114a4, 0xa7f8a306,
+    0x4fef33a7, 0x9762560f, 0x7f75c6ae, 0x9c3c710c, 0x742be1ad,
+    0x81de1809, 0x69c988a8, 0x8a803f0a, 0x6297afab, 0xe0ebf21b,
+    0x08fc62ba, 0xebb5d518, 0x03a245b9, 0xf657bc1d, 0x1e402cbc,
+    0xfd099b1e, 0x151e0bbf, 0xcd936e17, 0x2584feb6, 0xc6cd4914,
+    0x2edad9b5, 0xdb2f2011, 0x3338b0b0, 0xd0710712, 0x386697b3,
+    0x0ff8ba33, 0xe7ef2a92, 0x04a69d30, 0xecb10d91, 0x1944f435,
+    0xf1536494, 0x121ad336, 0xfa0d4397, 0x2280263f, 0xca97b69e,
+    0x29de013c, 0xc1c9919d, 0x343c6839, 0xdc2bf898, 0x3f624f3a,
+    0xd775df9b, 0x5509822b, 0xbd1e128a, 0x5e57a528, 0xb6403589,
+    0x43b5cc2d, 0xaba25c8c, 0x48ebeb2e, 0xa0fc7b8f, 0x78711e27,
+    0x90668e86, 0x732f3924, 0x9b38a985, 0x6ecd5021, 0x86dac080,
+    0x65937722, 0x8d84e783, 0x0aaf2c22, 0xe2b8bc83, 0x01f10b21,
+    0xe9e69b80, 0x1c136224, 0xf404f285, 0x174d4527, 0xff5ad586,
+    0x27d7b02e, 0xcfc0208f, 0x2c89972d, 0xc49e078c, 0x316bfe28,
+    0xd97c6e89, 0x3a35d92b, 0xd222498a, 0x505e143a, 0xb849849b,
+    0x5b003339, 0xb317a398, 0x46e25a3c, 0xaef5ca9d, 0x4dbc7d3f,
+    0xa5abed9e, 0x7d268836, 0x95311897, 0x7678af35, 0x9e6f3f94,
+    0x6b9ac630, 0x838d5691, 0x60c4e133, 0x88d37192, 0xbf4d5c12,
+    0x575accb3, 0xb4137b11, 0x5c04ebb0, 0xa9f11214, 0x41e682b5,
+    0xa2af3517, 0x4ab8a5b6, 0x9235c01e, 0x7a2250bf, 0x996be71d,
+    0x717c77bc, 0x84898e18, 0x6c9e1eb9, 0x8fd7a91b, 0x67c039ba,
+    0xe5bc640a, 0x0dabf4ab, 0xeee24309, 0x06f5d3a8, 0xf3002a0c,
+    0x1b17baad, 0xf85e0d0f, 0x10499dae, 0xc8c4f806, 0x20d368a7,
+    0xc39adf05, 0x2b8d4fa4, 0xde78b600, 0x366f26a1, 0xd5269103,
+    0x3d3101a2}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xa19017e800000000, 0x03275e0b00000000,
+    0xa2b749e300000000, 0x064ebc1600000000, 0xa7deabfe00000000,
+    0x0569e21d00000000, 0xa4f9f5f500000000, 0x0c9c782d00000000,
+    0xad0c6fc500000000, 0x0fbb262600000000, 0xae2b31ce00000000,
+    0x0ad2c43b00000000, 0xab42d3d300000000, 0x09f59a3000000000,
+    0xa8658dd800000000, 0x1838f15a00000000, 0xb9a8e6b200000000,
+    0x1b1faf5100000000, 0xba8fb8b900000000, 0x1e764d4c00000000,
+    0xbfe65aa400000000, 0x1d51134700000000, 0xbcc104af00000000,
+    0x14a4897700000000, 0xb5349e9f00000000, 0x1783d77c00000000,
+    0xb613c09400000000, 0x12ea356100000000, 0xb37a228900000000,
+    0x11cd6b6a00000000, 0xb05d7c8200000000, 0x3070e2b500000000,
+    0x91e0f55d00000000, 0x3357bcbe00000000, 0x92c7ab5600000000,
+    0x363e5ea300000000, 0x97ae494b00000000, 0x351900a800000000,
+    0x9489174000000000, 0x3cec9a9800000000, 0x9d7c8d7000000000,
+    0x3fcbc49300000000, 0x9e5bd37b00000000, 0x3aa2268e00000000,
+    0x9b32316600000000, 0x3985788500000000, 0x98156f6d00000000,
+    0x284813ef00000000, 0x89d8040700000000, 0x2b6f4de400000000,
+    0x8aff5a0c00000000, 0x2e06aff900000000, 0x8f96b81100000000,
+    0x2d21f1f200000000, 0x8cb1e61a00000000, 0x24d46bc200000000,
+    0x85447c2a00000000, 0x27f335c900000000, 0x8663222100000000,
+    0x229ad7d400000000, 0x830ac03c00000000, 0x21bd89df00000000,
+    0x802d9e3700000000, 0x21e6b5b000000000, 0x8076a25800000000,
+    0x22c1ebbb00000000, 0x8351fc5300000000, 0x27a809a600000000,
+    0x86381e4e00000000, 0x248f57ad00000000, 0x851f404500000000,
+    0x2d7acd9d00000000, 0x8ceada7500000000, 0x2e5d939600000000,
+    0x8fcd847e00000000, 0x2b34718b00000000, 0x8aa4666300000000,
+    0x28132f8000000000, 0x8983386800000000, 0x39de44ea00000000,
+    0x984e530200000000, 0x3af91ae100000000, 0x9b690d0900000000,
+    0x3f90f8fc00000000, 0x9e00ef1400000000, 0x3cb7a6f700000000,
+    0x9d27b11f00000000, 0x35423cc700000000, 0x94d22b2f00000000,
+    0x366562cc00000000, 0x97f5752400000000, 0x330c80d100000000,
+    0x929c973900000000, 0x302bdeda00000000, 0x91bbc93200000000,
+    0x1196570500000000, 0xb00640ed00000000, 0x12b1090e00000000,
+    0xb3211ee600000000, 0x17d8eb1300000000, 0xb648fcfb00000000,
+    0x14ffb51800000000, 0xb56fa2f000000000, 0x1d0a2f2800000000,
+    0xbc9a38c000000000, 0x1e2d712300000000, 0xbfbd66cb00000000,
+    0x1b44933e00000000, 0xbad484d600000000, 0x1863cd3500000000,
+    0xb9f3dadd00000000, 0x09aea65f00000000, 0xa83eb1b700000000,
+    0x0a89f85400000000, 0xab19efbc00000000, 0x0fe01a4900000000,
+    0xae700da100000000, 0x0cc7444200000000, 0xad5753aa00000000,
+    0x0532de7200000000, 0xa4a2c99a00000000, 0x0615807900000000,
+    0xa785979100000000, 0x037c626400000000, 0xa2ec758c00000000,
+    0x005b3c6f00000000, 0xa1cb2b8700000000, 0x03ca1aba00000000,
+    0xa25a0d5200000000, 0x00ed44b100000000, 0xa17d535900000000,
+    0x0584a6ac00000000, 0xa414b14400000000, 0x06a3f8a700000000,
+    0xa733ef4f00000000, 0x0f56629700000000, 0xaec6757f00000000,
+    0x0c713c9c00000000, 0xade12b7400000000, 0x0918de8100000000,
+    0xa888c96900000000, 0x0a3f808a00000000, 0xabaf976200000000,
+    0x1bf2ebe000000000, 0xba62fc0800000000, 0x18d5b5eb00000000,
+    0xb945a20300000000, 0x1dbc57f600000000, 0xbc2c401e00000000,
+    0x1e9b09fd00000000, 0xbf0b1e1500000000, 0x176e93cd00000000,
+    0xb6fe842500000000, 0x1449cdc600000000, 0xb5d9da2e00000000,
+    0x11202fdb00000000, 0xb0b0383300000000, 0x120771d000000000,
+    0xb397663800000000, 0x33baf80f00000000, 0x922aefe700000000,
+    0x309da60400000000, 0x910db1ec00000000, 0x35f4441900000000,
+    0x946453f100000000, 0x36d31a1200000000, 0x97430dfa00000000,
+    0x3f26802200000000, 0x9eb697ca00000000, 0x3c01de2900000000,
+    0x9d91c9c100000000, 0x39683c3400000000, 0x98f82bdc00000000,
+    0x3a4f623f00000000, 0x9bdf75d700000000, 0x2b82095500000000,
+    0x8a121ebd00000000, 0x28a5575e00000000, 0x893540b600000000,
+    0x2dccb54300000000, 0x8c5ca2ab00000000, 0x2eebeb4800000000,
+    0x8f7bfca000000000, 0x271e717800000000, 0x868e669000000000,
+    0x24392f7300000000, 0x85a9389b00000000, 0x2150cd6e00000000,
+    0x80c0da8600000000, 0x2277936500000000, 0x83e7848d00000000,
+    0x222caf0a00000000, 0x83bcb8e200000000, 0x210bf10100000000,
+    0x809be6e900000000, 0x2462131c00000000, 0x85f204f400000000,
+    0x27454d1700000000, 0x86d55aff00000000, 0x2eb0d72700000000,
+    0x8f20c0cf00000000, 0x2d97892c00000000, 0x8c079ec400000000,
+    0x28fe6b3100000000, 0x896e7cd900000000, 0x2bd9353a00000000,
+    0x8a4922d200000000, 0x3a145e5000000000, 0x9b8449b800000000,
+    0x3933005b00000000, 0x98a317b300000000, 0x3c5ae24600000000,
+    0x9dcaf5ae00000000, 0x3f7dbc4d00000000, 0x9eedaba500000000,
+    0x3688267d00000000, 0x9718319500000000, 0x35af787600000000,
+    0x943f6f9e00000000, 0x30c69a6b00000000, 0x91568d8300000000,
+    0x33e1c46000000000, 0x9271d38800000000, 0x125c4dbf00000000,
+    0xb3cc5a5700000000, 0x117b13b400000000, 0xb0eb045c00000000,
+    0x1412f1a900000000, 0xb582e64100000000, 0x1735afa200000000,
+    0xb6a5b84a00000000, 0x1ec0359200000000, 0xbf50227a00000000,
+    0x1de76b9900000000, 0xbc777c7100000000, 0x188e898400000000,
+    0xb91e9e6c00000000, 0x1ba9d78f00000000, 0xba39c06700000000,
+    0x0a64bce500000000, 0xabf4ab0d00000000, 0x0943e2ee00000000,
+    0xa8d3f50600000000, 0x0c2a00f300000000, 0xadba171b00000000,
+    0x0f0d5ef800000000, 0xae9d491000000000, 0x06f8c4c800000000,
+    0xa768d32000000000, 0x05df9ac300000000, 0xa44f8d2b00000000,
+    0x00b678de00000000, 0xa1266f3600000000, 0x039126d500000000,
+    0xa201313d00000000},
+   {0x0000000000000000, 0xee8439a100000000, 0x9d0f029900000000,
+    0x738b3b3800000000, 0x7b1975e900000000, 0x959d4c4800000000,
+    0xe616777000000000, 0x08924ed100000000, 0xb7349b0900000000,
+    0x59b0a2a800000000, 0x2a3b999000000000, 0xc4bfa03100000000,
+    0xcc2deee000000000, 0x22a9d74100000000, 0x5122ec7900000000,
+    0xbfa6d5d800000000, 0x6e69361300000000, 0x80ed0fb200000000,
+    0xf366348a00000000, 0x1de20d2b00000000, 0x157043fa00000000,
+    0xfbf47a5b00000000, 0x887f416300000000, 0x66fb78c200000000,
+    0xd95dad1a00000000, 0x37d994bb00000000, 0x4452af8300000000,
+    0xaad6962200000000, 0xa244d8f300000000, 0x4cc0e15200000000,
+    0x3f4bda6a00000000, 0xd1cfe3cb00000000, 0xdcd26c2600000000,
+    0x3256558700000000, 0x41dd6ebf00000000, 0xaf59571e00000000,
+    0xa7cb19cf00000000, 0x494f206e00000000, 0x3ac41b5600000000,
+    0xd44022f700000000, 0x6be6f72f00000000, 0x8562ce8e00000000,
+    0xf6e9f5b600000000, 0x186dcc1700000000, 0x10ff82c600000000,
+    0xfe7bbb6700000000, 0x8df0805f00000000, 0x6374b9fe00000000,
+    0xb2bb5a3500000000, 0x5c3f639400000000, 0x2fb458ac00000000,
+    0xc130610d00000000, 0xc9a22fdc00000000, 0x2726167d00000000,
+    0x54ad2d4500000000, 0xba2914e400000000, 0x058fc13c00000000,
+    0xeb0bf89d00000000, 0x9880c3a500000000, 0x7604fa0400000000,
+    0x7e96b4d500000000, 0x90128d7400000000, 0xe399b64c00000000,
+    0x0d1d8fed00000000, 0xb8a5d94c00000000, 0x5621e0ed00000000,
+    0x25aadbd500000000, 0xcb2ee27400000000, 0xc3bcaca500000000,
+    0x2d38950400000000, 0x5eb3ae3c00000000, 0xb037979d00000000,
+    0x0f91424500000000, 0xe1157be400000000, 0x929e40dc00000000,
+    0x7c1a797d00000000, 0x748837ac00000000, 0x9a0c0e0d00000000,
+    0xe987353500000000, 0x07030c9400000000, 0xd6ccef5f00000000,
+    0x3848d6fe00000000, 0x4bc3edc600000000, 0xa547d46700000000,
+    0xadd59ab600000000, 0x4351a31700000000, 0x30da982f00000000,
+    0xde5ea18e00000000, 0x61f8745600000000, 0x8f7c4df700000000,
+    0xfcf776cf00000000, 0x12734f6e00000000, 0x1ae101bf00000000,
+    0xf465381e00000000, 0x87ee032600000000, 0x696a3a8700000000,
+    0x6477b56a00000000, 0x8af38ccb00000000, 0xf978b7f300000000,
+    0x17fc8e5200000000, 0x1f6ec08300000000, 0xf1eaf92200000000,
+    0x8261c21a00000000, 0x6ce5fbbb00000000, 0xd3432e6300000000,
+    0x3dc717c200000000, 0x4e4c2cfa00000000, 0xa0c8155b00000000,
+    0xa85a5b8a00000000, 0x46de622b00000000, 0x3555591300000000,
+    0xdbd160b200000000, 0x0a1e837900000000, 0xe49abad800000000,
+    0x971181e000000000, 0x7995b84100000000, 0x7107f69000000000,
+    0x9f83cf3100000000, 0xec08f40900000000, 0x028ccda800000000,
+    0xbd2a187000000000, 0x53ae21d100000000, 0x20251ae900000000,
+    0xcea1234800000000, 0xc6336d9900000000, 0x28b7543800000000,
+    0x5b3c6f0000000000, 0xb5b856a100000000, 0x704bb39900000000,
+    0x9ecf8a3800000000, 0xed44b10000000000, 0x03c088a100000000,
+    0x0b52c67000000000, 0xe5d6ffd100000000, 0x965dc4e900000000,
+    0x78d9fd4800000000, 0xc77f289000000000, 0x29fb113100000000,
+    0x5a702a0900000000, 0xb4f413a800000000, 0xbc665d7900000000,
+    0x52e264d800000000, 0x21695fe000000000, 0xcfed664100000000,
+    0x1e22858a00000000, 0xf0a6bc2b00000000, 0x832d871300000000,
+    0x6da9beb200000000, 0x653bf06300000000, 0x8bbfc9c200000000,
+    0xf834f2fa00000000, 0x16b0cb5b00000000, 0xa9161e8300000000,
+    0x4792272200000000, 0x34191c1a00000000, 0xda9d25bb00000000,
+    0xd20f6b6a00000000, 0x3c8b52cb00000000, 0x4f0069f300000000,
+    0xa184505200000000, 0xac99dfbf00000000, 0x421de61e00000000,
+    0x3196dd2600000000, 0xdf12e48700000000, 0xd780aa5600000000,
+    0x390493f700000000, 0x4a8fa8cf00000000, 0xa40b916e00000000,
+    0x1bad44b600000000, 0xf5297d1700000000, 0x86a2462f00000000,
+    0x68267f8e00000000, 0x60b4315f00000000, 0x8e3008fe00000000,
+    0xfdbb33c600000000, 0x133f0a6700000000, 0xc2f0e9ac00000000,
+    0x2c74d00d00000000, 0x5fffeb3500000000, 0xb17bd29400000000,
+    0xb9e99c4500000000, 0x576da5e400000000, 0x24e69edc00000000,
+    0xca62a77d00000000, 0x75c472a500000000, 0x9b404b0400000000,
+    0xe8cb703c00000000, 0x064f499d00000000, 0x0edd074c00000000,
+    0xe0593eed00000000, 0x93d205d500000000, 0x7d563c7400000000,
+    0xc8ee6ad500000000, 0x266a537400000000, 0x55e1684c00000000,
+    0xbb6551ed00000000, 0xb3f71f3c00000000, 0x5d73269d00000000,
+    0x2ef81da500000000, 0xc07c240400000000, 0x7fdaf1dc00000000,
+    0x915ec87d00000000, 0xe2d5f34500000000, 0x0c51cae400000000,
+    0x04c3843500000000, 0xea47bd9400000000, 0x99cc86ac00000000,
+    0x7748bf0d00000000, 0xa6875cc600000000, 0x4803656700000000,
+    0x3b885e5f00000000, 0xd50c67fe00000000, 0xdd9e292f00000000,
+    0x331a108e00000000, 0x40912bb600000000, 0xae15121700000000,
+    0x11b3c7cf00000000, 0xff37fe6e00000000, 0x8cbcc55600000000,
+    0x6238fcf700000000, 0x6aaab22600000000, 0x842e8b8700000000,
+    0xf7a5b0bf00000000, 0x1921891e00000000, 0x143c06f300000000,
+    0xfab83f5200000000, 0x8933046a00000000, 0x67b73dcb00000000,
+    0x6f25731a00000000, 0x81a14abb00000000, 0xf22a718300000000,
+    0x1cae482200000000, 0xa3089dfa00000000, 0x4d8ca45b00000000,
+    0x3e079f6300000000, 0xd083a6c200000000, 0xd811e81300000000,
+    0x3695d1b200000000, 0x451eea8a00000000, 0xab9ad32b00000000,
+    0x7a5530e000000000, 0x94d1094100000000, 0xe75a327900000000,
+    0x09de0bd800000000, 0x014c450900000000, 0xefc87ca800000000,
+    0x9c43479000000000, 0x72c77e3100000000, 0xcd61abe900000000,
+    0x23e5924800000000, 0x506ea97000000000, 0xbeea90d100000000,
+    0xb678de0000000000, 0x58fce7a100000000, 0x2b77dc9900000000,
+    0xc5f3e53800000000},
+   {0x0000000000000000, 0xfbf6134700000000, 0xf6ed278e00000000,
+    0x0d1b34c900000000, 0xaddd3ec700000000, 0x562b2d8000000000,
+    0x5b30194900000000, 0xa0c60a0e00000000, 0x1bbd0c5500000000,
+    0xe04b1f1200000000, 0xed502bdb00000000, 0x16a6389c00000000,
+    0xb660329200000000, 0x4d9621d500000000, 0x408d151c00000000,
+    0xbb7b065b00000000, 0x367a19aa00000000, 0xcd8c0aed00000000,
+    0xc0973e2400000000, 0x3b612d6300000000, 0x9ba7276d00000000,
+    0x6051342a00000000, 0x6d4a00e300000000, 0x96bc13a400000000,
+    0x2dc715ff00000000, 0xd63106b800000000, 0xdb2a327100000000,
+    0x20dc213600000000, 0x801a2b3800000000, 0x7bec387f00000000,
+    0x76f70cb600000000, 0x8d011ff100000000, 0x2df2438f00000000,
+    0xd60450c800000000, 0xdb1f640100000000, 0x20e9774600000000,
+    0x802f7d4800000000, 0x7bd96e0f00000000, 0x76c25ac600000000,
+    0x8d34498100000000, 0x364f4fda00000000, 0xcdb95c9d00000000,
+    0xc0a2685400000000, 0x3b547b1300000000, 0x9b92711d00000000,
+    0x6064625a00000000, 0x6d7f569300000000, 0x968945d400000000,
+    0x1b885a2500000000, 0xe07e496200000000, 0xed657dab00000000,
+    0x16936eec00000000, 0xb65564e200000000, 0x4da377a500000000,
+    0x40b8436c00000000, 0xbb4e502b00000000, 0x0035567000000000,
+    0xfbc3453700000000, 0xf6d871fe00000000, 0x0d2e62b900000000,
+    0xade868b700000000, 0x561e7bf000000000, 0x5b054f3900000000,
+    0xa0f35c7e00000000, 0x1be2f6c500000000, 0xe014e58200000000,
+    0xed0fd14b00000000, 0x16f9c20c00000000, 0xb63fc80200000000,
+    0x4dc9db4500000000, 0x40d2ef8c00000000, 0xbb24fccb00000000,
+    0x005ffa9000000000, 0xfba9e9d700000000, 0xf6b2dd1e00000000,
+    0x0d44ce5900000000, 0xad82c45700000000, 0x5674d71000000000,
+    0x5b6fe3d900000000, 0xa099f09e00000000, 0x2d98ef6f00000000,
+    0xd66efc2800000000, 0xdb75c8e100000000, 0x2083dba600000000,
+    0x8045d1a800000000, 0x7bb3c2ef00000000, 0x76a8f62600000000,
+    0x8d5ee56100000000, 0x3625e33a00000000, 0xcdd3f07d00000000,
+    0xc0c8c4b400000000, 0x3b3ed7f300000000, 0x9bf8ddfd00000000,
+    0x600eceba00000000, 0x6d15fa7300000000, 0x96e3e93400000000,
+    0x3610b54a00000000, 0xcde6a60d00000000, 0xc0fd92c400000000,
+    0x3b0b818300000000, 0x9bcd8b8d00000000, 0x603b98ca00000000,
+    0x6d20ac0300000000, 0x96d6bf4400000000, 0x2dadb91f00000000,
+    0xd65baa5800000000, 0xdb409e9100000000, 0x20b68dd600000000,
+    0x807087d800000000, 0x7b86949f00000000, 0x769da05600000000,
+    0x8d6bb31100000000, 0x006aace000000000, 0xfb9cbfa700000000,
+    0xf6878b6e00000000, 0x0d71982900000000, 0xadb7922700000000,
+    0x5641816000000000, 0x5b5ab5a900000000, 0xa0aca6ee00000000,
+    0x1bd7a0b500000000, 0xe021b3f200000000, 0xed3a873b00000000,
+    0x16cc947c00000000, 0xb60a9e7200000000, 0x4dfc8d3500000000,
+    0x40e7b9fc00000000, 0xbb11aabb00000000, 0x77c29c5000000000,
+    0x8c348f1700000000, 0x812fbbde00000000, 0x7ad9a89900000000,
+    0xda1fa29700000000, 0x21e9b1d000000000, 0x2cf2851900000000,
+    0xd704965e00000000, 0x6c7f900500000000, 0x9789834200000000,
+    0x9a92b78b00000000, 0x6164a4cc00000000, 0xc1a2aec200000000,
+    0x3a54bd8500000000, 0x374f894c00000000, 0xccb99a0b00000000,
+    0x41b885fa00000000, 0xba4e96bd00000000, 0xb755a27400000000,
+    0x4ca3b13300000000, 0xec65bb3d00000000, 0x1793a87a00000000,
+    0x1a889cb300000000, 0xe17e8ff400000000, 0x5a0589af00000000,
+    0xa1f39ae800000000, 0xace8ae2100000000, 0x571ebd6600000000,
+    0xf7d8b76800000000, 0x0c2ea42f00000000, 0x013590e600000000,
+    0xfac383a100000000, 0x5a30dfdf00000000, 0xa1c6cc9800000000,
+    0xacddf85100000000, 0x572beb1600000000, 0xf7ede11800000000,
+    0x0c1bf25f00000000, 0x0100c69600000000, 0xfaf6d5d100000000,
+    0x418dd38a00000000, 0xba7bc0cd00000000, 0xb760f40400000000,
+    0x4c96e74300000000, 0xec50ed4d00000000, 0x17a6fe0a00000000,
+    0x1abdcac300000000, 0xe14bd98400000000, 0x6c4ac67500000000,
+    0x97bcd53200000000, 0x9aa7e1fb00000000, 0x6151f2bc00000000,
+    0xc197f8b200000000, 0x3a61ebf500000000, 0x377adf3c00000000,
+    0xcc8ccc7b00000000, 0x77f7ca2000000000, 0x8c01d96700000000,
+    0x811aedae00000000, 0x7aecfee900000000, 0xda2af4e700000000,
+    0x21dce7a000000000, 0x2cc7d36900000000, 0xd731c02e00000000,
+    0x6c206a9500000000, 0x97d679d200000000, 0x9acd4d1b00000000,
+    0x613b5e5c00000000, 0xc1fd545200000000, 0x3a0b471500000000,
+    0x371073dc00000000, 0xcce6609b00000000, 0x779d66c000000000,
+    0x8c6b758700000000, 0x8170414e00000000, 0x7a86520900000000,
+    0xda40580700000000, 0x21b64b4000000000, 0x2cad7f8900000000,
+    0xd75b6cce00000000, 0x5a5a733f00000000, 0xa1ac607800000000,
+    0xacb754b100000000, 0x574147f600000000, 0xf7874df800000000,
+    0x0c715ebf00000000, 0x016a6a7600000000, 0xfa9c793100000000,
+    0x41e77f6a00000000, 0xba116c2d00000000, 0xb70a58e400000000,
+    0x4cfc4ba300000000, 0xec3a41ad00000000, 0x17cc52ea00000000,
+    0x1ad7662300000000, 0xe121756400000000, 0x41d2291a00000000,
+    0xba243a5d00000000, 0xb73f0e9400000000, 0x4cc91dd300000000,
+    0xec0f17dd00000000, 0x17f9049a00000000, 0x1ae2305300000000,
+    0xe114231400000000, 0x5a6f254f00000000, 0xa199360800000000,
+    0xac8202c100000000, 0x5774118600000000, 0xf7b21b8800000000,
+    0x0c4408cf00000000, 0x015f3c0600000000, 0xfaa92f4100000000,
+    0x77a830b000000000, 0x8c5e23f700000000, 0x8145173e00000000,
+    0x7ab3047900000000, 0xda750e7700000000, 0x21831d3000000000,
+    0x2c9829f900000000, 0xd76e3abe00000000, 0x6c153ce500000000,
+    0x97e32fa200000000, 0x9af81b6b00000000, 0x610e082c00000000,
+    0xc1c8022200000000, 0x3a3e116500000000, 0x372525ac00000000,
+    0xccd336eb00000000},
+   {0x0000000000000000, 0x6238282a00000000, 0xc470505400000000,
+    0xa648787e00000000, 0x88e1a0a800000000, 0xead9888200000000,
+    0x4c91f0fc00000000, 0x2ea9d8d600000000, 0x51c5308a00000000,
+    0x33fd18a000000000, 0x95b560de00000000, 0xf78d48f400000000,
+    0xd924902200000000, 0xbb1cb80800000000, 0x1d54c07600000000,
+    0x7f6ce85c00000000, 0xe38c10cf00000000, 0x81b438e500000000,
+    0x27fc409b00000000, 0x45c468b100000000, 0x6b6db06700000000,
+    0x0955984d00000000, 0xaf1de03300000000, 0xcd25c81900000000,
+    0xb249204500000000, 0xd071086f00000000, 0x7639701100000000,
+    0x1401583b00000000, 0x3aa880ed00000000, 0x5890a8c700000000,
+    0xfed8d0b900000000, 0x9ce0f89300000000, 0x871f504500000000,
+    0xe527786f00000000, 0x436f001100000000, 0x2157283b00000000,
+    0x0ffef0ed00000000, 0x6dc6d8c700000000, 0xcb8ea0b900000000,
+    0xa9b6889300000000, 0xd6da60cf00000000, 0xb4e248e500000000,
+    0x12aa309b00000000, 0x709218b100000000, 0x5e3bc06700000000,
+    0x3c03e84d00000000, 0x9a4b903300000000, 0xf873b81900000000,
+    0x6493408a00000000, 0x06ab68a000000000, 0xa0e310de00000000,
+    0xc2db38f400000000, 0xec72e02200000000, 0x8e4ac80800000000,
+    0x2802b07600000000, 0x4a3a985c00000000, 0x3556700000000000,
+    0x576e582a00000000, 0xf126205400000000, 0x931e087e00000000,
+    0xbdb7d0a800000000, 0xdf8ff88200000000, 0x79c780fc00000000,
+    0x1bffa8d600000000, 0x0e3fa08a00000000, 0x6c0788a000000000,
+    0xca4ff0de00000000, 0xa877d8f400000000, 0x86de002200000000,
+    0xe4e6280800000000, 0x42ae507600000000, 0x2096785c00000000,
+    0x5ffa900000000000, 0x3dc2b82a00000000, 0x9b8ac05400000000,
+    0xf9b2e87e00000000, 0xd71b30a800000000, 0xb523188200000000,
+    0x136b60fc00000000, 0x715348d600000000, 0xedb3b04500000000,
+    0x8f8b986f00000000, 0x29c3e01100000000, 0x4bfbc83b00000000,
+    0x655210ed00000000, 0x076a38c700000000, 0xa12240b900000000,
+    0xc31a689300000000, 0xbc7680cf00000000, 0xde4ea8e500000000,
+    0x7806d09b00000000, 0x1a3ef8b100000000, 0x3497206700000000,
+    0x56af084d00000000, 0xf0e7703300000000, 0x92df581900000000,
+    0x8920f0cf00000000, 0xeb18d8e500000000, 0x4d50a09b00000000,
+    0x2f6888b100000000, 0x01c1506700000000, 0x63f9784d00000000,
+    0xc5b1003300000000, 0xa789281900000000, 0xd8e5c04500000000,
+    0xbadde86f00000000, 0x1c95901100000000, 0x7eadb83b00000000,
+    0x500460ed00000000, 0x323c48c700000000, 0x947430b900000000,
+    0xf64c189300000000, 0x6aace00000000000, 0x0894c82a00000000,
+    0xaedcb05400000000, 0xcce4987e00000000, 0xe24d40a800000000,
+    0x8075688200000000, 0x263d10fc00000000, 0x440538d600000000,
+    0x3b69d08a00000000, 0x5951f8a000000000, 0xff1980de00000000,
+    0x9d21a8f400000000, 0xb388702200000000, 0xd1b0580800000000,
+    0x77f8207600000000, 0x15c0085c00000000, 0x5d7831ce00000000,
+    0x3f4019e400000000, 0x9908619a00000000, 0xfb3049b000000000,
+    0xd599916600000000, 0xb7a1b94c00000000, 0x11e9c13200000000,
+    0x73d1e91800000000, 0x0cbd014400000000, 0x6e85296e00000000,
+    0xc8cd511000000000, 0xaaf5793a00000000, 0x845ca1ec00000000,
+    0xe66489c600000000, 0x402cf1b800000000, 0x2214d99200000000,
+    0xbef4210100000000, 0xdccc092b00000000, 0x7a84715500000000,
+    0x18bc597f00000000, 0x361581a900000000, 0x542da98300000000,
+    0xf265d1fd00000000, 0x905df9d700000000, 0xef31118b00000000,
+    0x8d0939a100000000, 0x2b4141df00000000, 0x497969f500000000,
+    0x67d0b12300000000, 0x05e8990900000000, 0xa3a0e17700000000,
+    0xc198c95d00000000, 0xda67618b00000000, 0xb85f49a100000000,
+    0x1e1731df00000000, 0x7c2f19f500000000, 0x5286c12300000000,
+    0x30bee90900000000, 0x96f6917700000000, 0xf4ceb95d00000000,
+    0x8ba2510100000000, 0xe99a792b00000000, 0x4fd2015500000000,
+    0x2dea297f00000000, 0x0343f1a900000000, 0x617bd98300000000,
+    0xc733a1fd00000000, 0xa50b89d700000000, 0x39eb714400000000,
+    0x5bd3596e00000000, 0xfd9b211000000000, 0x9fa3093a00000000,
+    0xb10ad1ec00000000, 0xd332f9c600000000, 0x757a81b800000000,
+    0x1742a99200000000, 0x682e41ce00000000, 0x0a1669e400000000,
+    0xac5e119a00000000, 0xce6639b000000000, 0xe0cfe16600000000,
+    0x82f7c94c00000000, 0x24bfb13200000000, 0x4687991800000000,
+    0x5347914400000000, 0x317fb96e00000000, 0x9737c11000000000,
+    0xf50fe93a00000000, 0xdba631ec00000000, 0xb99e19c600000000,
+    0x1fd661b800000000, 0x7dee499200000000, 0x0282a1ce00000000,
+    0x60ba89e400000000, 0xc6f2f19a00000000, 0xa4cad9b000000000,
+    0x8a63016600000000, 0xe85b294c00000000, 0x4e13513200000000,
+    0x2c2b791800000000, 0xb0cb818b00000000, 0xd2f3a9a100000000,
+    0x74bbd1df00000000, 0x1683f9f500000000, 0x382a212300000000,
+    0x5a12090900000000, 0xfc5a717700000000, 0x9e62595d00000000,
+    0xe10eb10100000000, 0x8336992b00000000, 0x257ee15500000000,
+    0x4746c97f00000000, 0x69ef11a900000000, 0x0bd7398300000000,
+    0xad9f41fd00000000, 0xcfa769d700000000, 0xd458c10100000000,
+    0xb660e92b00000000, 0x1028915500000000, 0x7210b97f00000000,
+    0x5cb961a900000000, 0x3e81498300000000, 0x98c931fd00000000,
+    0xfaf119d700000000, 0x859df18b00000000, 0xe7a5d9a100000000,
+    0x41eda1df00000000, 0x23d589f500000000, 0x0d7c512300000000,
+    0x6f44790900000000, 0xc90c017700000000, 0xab34295d00000000,
+    0x37d4d1ce00000000, 0x55ecf9e400000000, 0xf3a4819a00000000,
+    0x919ca9b000000000, 0xbf35716600000000, 0xdd0d594c00000000,
+    0x7b45213200000000, 0x197d091800000000, 0x6611e14400000000,
+    0x0429c96e00000000, 0xa261b11000000000, 0xc059993a00000000,
+    0xeef041ec00000000, 0x8cc869c600000000, 0x2a8011b800000000,
+    0x48b8399200000000},
+   {0x0000000000000000, 0x4c2896a300000000, 0xd9565d9c00000000,
+    0x957ecb3f00000000, 0xf3abcbe300000000, 0xbf835d4000000000,
+    0x2afd967f00000000, 0x66d500dc00000000, 0xa751e61c00000000,
+    0xeb7970bf00000000, 0x7e07bb8000000000, 0x322f2d2300000000,
+    0x54fa2dff00000000, 0x18d2bb5c00000000, 0x8dac706300000000,
+    0xc184e6c000000000, 0x4ea3cc3900000000, 0x028b5a9a00000000,
+    0x97f591a500000000, 0xdbdd070600000000, 0xbd0807da00000000,
+    0xf120917900000000, 0x645e5a4600000000, 0x2876cce500000000,
+    0xe9f22a2500000000, 0xa5dabc8600000000, 0x30a477b900000000,
+    0x7c8ce11a00000000, 0x1a59e1c600000000, 0x5671776500000000,
+    0xc30fbc5a00000000, 0x8f272af900000000, 0x9c46997300000000,
+    0xd06e0fd000000000, 0x4510c4ef00000000, 0x0938524c00000000,
+    0x6fed529000000000, 0x23c5c43300000000, 0xb6bb0f0c00000000,
+    0xfa9399af00000000, 0x3b177f6f00000000, 0x773fe9cc00000000,
+    0xe24122f300000000, 0xae69b45000000000, 0xc8bcb48c00000000,
+    0x8494222f00000000, 0x11eae91000000000, 0x5dc27fb300000000,
+    0xd2e5554a00000000, 0x9ecdc3e900000000, 0x0bb308d600000000,
+    0x479b9e7500000000, 0x214e9ea900000000, 0x6d66080a00000000,
+    0xf818c33500000000, 0xb430559600000000, 0x75b4b35600000000,
+    0x399c25f500000000, 0xace2eeca00000000, 0xe0ca786900000000,
+    0x861f78b500000000, 0xca37ee1600000000, 0x5f49252900000000,
+    0x1361b38a00000000, 0x388d32e700000000, 0x74a5a44400000000,
+    0xe1db6f7b00000000, 0xadf3f9d800000000, 0xcb26f90400000000,
+    0x870e6fa700000000, 0x1270a49800000000, 0x5e58323b00000000,
+    0x9fdcd4fb00000000, 0xd3f4425800000000, 0x468a896700000000,
+    0x0aa21fc400000000, 0x6c771f1800000000, 0x205f89bb00000000,
+    0xb521428400000000, 0xf909d42700000000, 0x762efede00000000,
+    0x3a06687d00000000, 0xaf78a34200000000, 0xe35035e100000000,
+    0x8585353d00000000, 0xc9ada39e00000000, 0x5cd368a100000000,
+    0x10fbfe0200000000, 0xd17f18c200000000, 0x9d578e6100000000,
+    0x0829455e00000000, 0x4401d3fd00000000, 0x22d4d32100000000,
+    0x6efc458200000000, 0xfb828ebd00000000, 0xb7aa181e00000000,
+    0xa4cbab9400000000, 0xe8e33d3700000000, 0x7d9df60800000000,
+    0x31b560ab00000000, 0x5760607700000000, 0x1b48f6d400000000,
+    0x8e363deb00000000, 0xc21eab4800000000, 0x039a4d8800000000,
+    0x4fb2db2b00000000, 0xdacc101400000000, 0x96e486b700000000,
+    0xf031866b00000000, 0xbc1910c800000000, 0x2967dbf700000000,
+    0x654f4d5400000000, 0xea6867ad00000000, 0xa640f10e00000000,
+    0x333e3a3100000000, 0x7f16ac9200000000, 0x19c3ac4e00000000,
+    0x55eb3aed00000000, 0xc095f1d200000000, 0x8cbd677100000000,
+    0x4d3981b100000000, 0x0111171200000000, 0x946fdc2d00000000,
+    0xd8474a8e00000000, 0xbe924a5200000000, 0xf2badcf100000000,
+    0x67c417ce00000000, 0x2bec816d00000000, 0x311c141500000000,
+    0x7d3482b600000000, 0xe84a498900000000, 0xa462df2a00000000,
+    0xc2b7dff600000000, 0x8e9f495500000000, 0x1be1826a00000000,
+    0x57c914c900000000, 0x964df20900000000, 0xda6564aa00000000,
+    0x4f1baf9500000000, 0x0333393600000000, 0x65e639ea00000000,
+    0x29ceaf4900000000, 0xbcb0647600000000, 0xf098f2d500000000,
+    0x7fbfd82c00000000, 0x33974e8f00000000, 0xa6e985b000000000,
+    0xeac1131300000000, 0x8c1413cf00000000, 0xc03c856c00000000,
+    0x55424e5300000000, 0x196ad8f000000000, 0xd8ee3e3000000000,
+    0x94c6a89300000000, 0x01b863ac00000000, 0x4d90f50f00000000,
+    0x2b45f5d300000000, 0x676d637000000000, 0xf213a84f00000000,
+    0xbe3b3eec00000000, 0xad5a8d6600000000, 0xe1721bc500000000,
+    0x740cd0fa00000000, 0x3824465900000000, 0x5ef1468500000000,
+    0x12d9d02600000000, 0x87a71b1900000000, 0xcb8f8dba00000000,
+    0x0a0b6b7a00000000, 0x4623fdd900000000, 0xd35d36e600000000,
+    0x9f75a04500000000, 0xf9a0a09900000000, 0xb588363a00000000,
+    0x20f6fd0500000000, 0x6cde6ba600000000, 0xe3f9415f00000000,
+    0xafd1d7fc00000000, 0x3aaf1cc300000000, 0x76878a6000000000,
+    0x10528abc00000000, 0x5c7a1c1f00000000, 0xc904d72000000000,
+    0x852c418300000000, 0x44a8a74300000000, 0x088031e000000000,
+    0x9dfefadf00000000, 0xd1d66c7c00000000, 0xb7036ca000000000,
+    0xfb2bfa0300000000, 0x6e55313c00000000, 0x227da79f00000000,
+    0x099126f200000000, 0x45b9b05100000000, 0xd0c77b6e00000000,
+    0x9cefedcd00000000, 0xfa3aed1100000000, 0xb6127bb200000000,
+    0x236cb08d00000000, 0x6f44262e00000000, 0xaec0c0ee00000000,
+    0xe2e8564d00000000, 0x77969d7200000000, 0x3bbe0bd100000000,
+    0x5d6b0b0d00000000, 0x11439dae00000000, 0x843d569100000000,
+    0xc815c03200000000, 0x4732eacb00000000, 0x0b1a7c6800000000,
+    0x9e64b75700000000, 0xd24c21f400000000, 0xb499212800000000,
+    0xf8b1b78b00000000, 0x6dcf7cb400000000, 0x21e7ea1700000000,
+    0xe0630cd700000000, 0xac4b9a7400000000, 0x3935514b00000000,
+    0x751dc7e800000000, 0x13c8c73400000000, 0x5fe0519700000000,
+    0xca9e9aa800000000, 0x86b60c0b00000000, 0x95d7bf8100000000,
+    0xd9ff292200000000, 0x4c81e21d00000000, 0x00a974be00000000,
+    0x667c746200000000, 0x2a54e2c100000000, 0xbf2a29fe00000000,
+    0xf302bf5d00000000, 0x3286599d00000000, 0x7eaecf3e00000000,
+    0xebd0040100000000, 0xa7f892a200000000, 0xc12d927e00000000,
+    0x8d0504dd00000000, 0x187bcfe200000000, 0x5453594100000000,
+    0xdb7473b800000000, 0x975ce51b00000000, 0x02222e2400000000,
+    0x4e0ab88700000000, 0x28dfb85b00000000, 0x64f72ef800000000,
+    0xf189e5c700000000, 0xbda1736400000000, 0x7c2595a400000000,
+    0x300d030700000000, 0xa573c83800000000, 0xe95b5e9b00000000,
+    0x8f8e5e4700000000, 0xc3a6c8e400000000, 0x56d803db00000000,
+    0x1af0957800000000},
+   {0x0000000000000000, 0x939bc97f00000000, 0x263793ff00000000,
+    0xb5ac5a8000000000, 0x0d68572400000000, 0x9ef39e5b00000000,
+    0x2b5fc4db00000000, 0xb8c40da400000000, 0x1ad0ae4800000000,
+    0x894b673700000000, 0x3ce73db700000000, 0xaf7cf4c800000000,
+    0x17b8f96c00000000, 0x8423301300000000, 0x318f6a9300000000,
+    0xa214a3ec00000000, 0x34a05d9100000000, 0xa73b94ee00000000,
+    0x1297ce6e00000000, 0x810c071100000000, 0x39c80ab500000000,
+    0xaa53c3ca00000000, 0x1fff994a00000000, 0x8c64503500000000,
+    0x2e70f3d900000000, 0xbdeb3aa600000000, 0x0847602600000000,
+    0x9bdca95900000000, 0x2318a4fd00000000, 0xb0836d8200000000,
+    0x052f370200000000, 0x96b4fe7d00000000, 0x2946caf900000000,
+    0xbadd038600000000, 0x0f71590600000000, 0x9cea907900000000,
+    0x242e9ddd00000000, 0xb7b554a200000000, 0x02190e2200000000,
+    0x9182c75d00000000, 0x339664b100000000, 0xa00dadce00000000,
+    0x15a1f74e00000000, 0x863a3e3100000000, 0x3efe339500000000,
+    0xad65faea00000000, 0x18c9a06a00000000, 0x8b52691500000000,
+    0x1de6976800000000, 0x8e7d5e1700000000, 0x3bd1049700000000,
+    0xa84acde800000000, 0x108ec04c00000000, 0x8315093300000000,
+    0x36b953b300000000, 0xa5229acc00000000, 0x0736392000000000,
+    0x94adf05f00000000, 0x2101aadf00000000, 0xb29a63a000000000,
+    0x0a5e6e0400000000, 0x99c5a77b00000000, 0x2c69fdfb00000000,
+    0xbff2348400000000, 0x138ae52800000000, 0x80112c5700000000,
+    0x35bd76d700000000, 0xa626bfa800000000, 0x1ee2b20c00000000,
+    0x8d797b7300000000, 0x38d521f300000000, 0xab4ee88c00000000,
+    0x095a4b6000000000, 0x9ac1821f00000000, 0x2f6dd89f00000000,
+    0xbcf611e000000000, 0x04321c4400000000, 0x97a9d53b00000000,
+    0x22058fbb00000000, 0xb19e46c400000000, 0x272ab8b900000000,
+    0xb4b171c600000000, 0x011d2b4600000000, 0x9286e23900000000,
+    0x2a42ef9d00000000, 0xb9d926e200000000, 0x0c757c6200000000,
+    0x9feeb51d00000000, 0x3dfa16f100000000, 0xae61df8e00000000,
+    0x1bcd850e00000000, 0x88564c7100000000, 0x309241d500000000,
+    0xa30988aa00000000, 0x16a5d22a00000000, 0x853e1b5500000000,
+    0x3acc2fd100000000, 0xa957e6ae00000000, 0x1cfbbc2e00000000,
+    0x8f60755100000000, 0x37a478f500000000, 0xa43fb18a00000000,
+    0x1193eb0a00000000, 0x8208227500000000, 0x201c819900000000,
+    0xb38748e600000000, 0x062b126600000000, 0x95b0db1900000000,
+    0x2d74d6bd00000000, 0xbeef1fc200000000, 0x0b43454200000000,
+    0x98d88c3d00000000, 0x0e6c724000000000, 0x9df7bb3f00000000,
+    0x285be1bf00000000, 0xbbc028c000000000, 0x0304256400000000,
+    0x909fec1b00000000, 0x2533b69b00000000, 0xb6a87fe400000000,
+    0x14bcdc0800000000, 0x8727157700000000, 0x328b4ff700000000,
+    0xa110868800000000, 0x19d48b2c00000000, 0x8a4f425300000000,
+    0x3fe318d300000000, 0xac78d1ac00000000, 0x2614cb5100000000,
+    0xb58f022e00000000, 0x002358ae00000000, 0x93b891d100000000,
+    0x2b7c9c7500000000, 0xb8e7550a00000000, 0x0d4b0f8a00000000,
+    0x9ed0c6f500000000, 0x3cc4651900000000, 0xaf5fac6600000000,
+    0x1af3f6e600000000, 0x89683f9900000000, 0x31ac323d00000000,
+    0xa237fb4200000000, 0x179ba1c200000000, 0x840068bd00000000,
+    0x12b496c000000000, 0x812f5fbf00000000, 0x3483053f00000000,
+    0xa718cc4000000000, 0x1fdcc1e400000000, 0x8c47089b00000000,
+    0x39eb521b00000000, 0xaa709b6400000000, 0x0864388800000000,
+    0x9bfff1f700000000, 0x2e53ab7700000000, 0xbdc8620800000000,
+    0x050c6fac00000000, 0x9697a6d300000000, 0x233bfc5300000000,
+    0xb0a0352c00000000, 0x0f5201a800000000, 0x9cc9c8d700000000,
+    0x2965925700000000, 0xbafe5b2800000000, 0x023a568c00000000,
+    0x91a19ff300000000, 0x240dc57300000000, 0xb7960c0c00000000,
+    0x1582afe000000000, 0x8619669f00000000, 0x33b53c1f00000000,
+    0xa02ef56000000000, 0x18eaf8c400000000, 0x8b7131bb00000000,
+    0x3edd6b3b00000000, 0xad46a24400000000, 0x3bf25c3900000000,
+    0xa869954600000000, 0x1dc5cfc600000000, 0x8e5e06b900000000,
+    0x369a0b1d00000000, 0xa501c26200000000, 0x10ad98e200000000,
+    0x8336519d00000000, 0x2122f27100000000, 0xb2b93b0e00000000,
+    0x0715618e00000000, 0x948ea8f100000000, 0x2c4aa55500000000,
+    0xbfd16c2a00000000, 0x0a7d36aa00000000, 0x99e6ffd500000000,
+    0x359e2e7900000000, 0xa605e70600000000, 0x13a9bd8600000000,
+    0x803274f900000000, 0x38f6795d00000000, 0xab6db02200000000,
+    0x1ec1eaa200000000, 0x8d5a23dd00000000, 0x2f4e803100000000,
+    0xbcd5494e00000000, 0x097913ce00000000, 0x9ae2dab100000000,
+    0x2226d71500000000, 0xb1bd1e6a00000000, 0x041144ea00000000,
+    0x978a8d9500000000, 0x013e73e800000000, 0x92a5ba9700000000,
+    0x2709e01700000000, 0xb492296800000000, 0x0c5624cc00000000,
+    0x9fcdedb300000000, 0x2a61b73300000000, 0xb9fa7e4c00000000,
+    0x1beedda000000000, 0x887514df00000000, 0x3dd94e5f00000000,
+    0xae42872000000000, 0x16868a8400000000, 0x851d43fb00000000,
+    0x30b1197b00000000, 0xa32ad00400000000, 0x1cd8e48000000000,
+    0x8f432dff00000000, 0x3aef777f00000000, 0xa974be0000000000,
+    0x11b0b3a400000000, 0x822b7adb00000000, 0x3787205b00000000,
+    0xa41ce92400000000, 0x06084ac800000000, 0x959383b700000000,
+    0x203fd93700000000, 0xb3a4104800000000, 0x0b601dec00000000,
+    0x98fbd49300000000, 0x2d578e1300000000, 0xbecc476c00000000,
+    0x2878b91100000000, 0xbbe3706e00000000, 0x0e4f2aee00000000,
+    0x9dd4e39100000000, 0x2510ee3500000000, 0xb68b274a00000000,
+    0x03277dca00000000, 0x90bcb4b500000000, 0x32a8175900000000,
+    0xa133de2600000000, 0x149f84a600000000, 0x87044dd900000000,
+    0x3fc0407d00000000, 0xac5b890200000000, 0x19f7d38200000000,
+    0x8a6c1afd00000000},
+   {0x0000000000000000, 0x650b796900000000, 0xca16f2d200000000,
+    0xaf1d8bbb00000000, 0xd52b957e00000000, 0xb020ec1700000000,
+    0x1f3d67ac00000000, 0x7a361ec500000000, 0xaa572afd00000000,
+    0xcf5c539400000000, 0x6041d82f00000000, 0x054aa14600000000,
+    0x7f7cbf8300000000, 0x1a77c6ea00000000, 0xb56a4d5100000000,
+    0xd061343800000000, 0x15a9252100000000, 0x70a25c4800000000,
+    0xdfbfd7f300000000, 0xbab4ae9a00000000, 0xc082b05f00000000,
+    0xa589c93600000000, 0x0a94428d00000000, 0x6f9f3be400000000,
+    0xbffe0fdc00000000, 0xdaf576b500000000, 0x75e8fd0e00000000,
+    0x10e3846700000000, 0x6ad59aa200000000, 0x0fdee3cb00000000,
+    0xa0c3687000000000, 0xc5c8111900000000, 0x2a524b4200000000,
+    0x4f59322b00000000, 0xe044b99000000000, 0x854fc0f900000000,
+    0xff79de3c00000000, 0x9a72a75500000000, 0x356f2cee00000000,
+    0x5064558700000000, 0x800561bf00000000, 0xe50e18d600000000,
+    0x4a13936d00000000, 0x2f18ea0400000000, 0x552ef4c100000000,
+    0x30258da800000000, 0x9f38061300000000, 0xfa337f7a00000000,
+    0x3ffb6e6300000000, 0x5af0170a00000000, 0xf5ed9cb100000000,
+    0x90e6e5d800000000, 0xead0fb1d00000000, 0x8fdb827400000000,
+    0x20c609cf00000000, 0x45cd70a600000000, 0x95ac449e00000000,
+    0xf0a73df700000000, 0x5fbab64c00000000, 0x3ab1cf2500000000,
+    0x4087d1e000000000, 0x258ca88900000000, 0x8a91233200000000,
+    0xef9a5a5b00000000, 0x54a4968400000000, 0x31afefed00000000,
+    0x9eb2645600000000, 0xfbb91d3f00000000, 0x818f03fa00000000,
+    0xe4847a9300000000, 0x4b99f12800000000, 0x2e92884100000000,
+    0xfef3bc7900000000, 0x9bf8c51000000000, 0x34e54eab00000000,
+    0x51ee37c200000000, 0x2bd8290700000000, 0x4ed3506e00000000,
+    0xe1cedbd500000000, 0x84c5a2bc00000000, 0x410db3a500000000,
+    0x2406cacc00000000, 0x8b1b417700000000, 0xee10381e00000000,
+    0x942626db00000000, 0xf12d5fb200000000, 0x5e30d40900000000,
+    0x3b3bad6000000000, 0xeb5a995800000000, 0x8e51e03100000000,
+    0x214c6b8a00000000, 0x444712e300000000, 0x3e710c2600000000,
+    0x5b7a754f00000000, 0xf467fef400000000, 0x916c879d00000000,
+    0x7ef6ddc600000000, 0x1bfda4af00000000, 0xb4e02f1400000000,
+    0xd1eb567d00000000, 0xabdd48b800000000, 0xced631d100000000,
+    0x61cbba6a00000000, 0x04c0c30300000000, 0xd4a1f73b00000000,
+    0xb1aa8e5200000000, 0x1eb705e900000000, 0x7bbc7c8000000000,
+    0x018a624500000000, 0x64811b2c00000000, 0xcb9c909700000000,
+    0xae97e9fe00000000, 0x6b5ff8e700000000, 0x0e54818e00000000,
+    0xa1490a3500000000, 0xc442735c00000000, 0xbe746d9900000000,
+    0xdb7f14f000000000, 0x74629f4b00000000, 0x1169e62200000000,
+    0xc108d21a00000000, 0xa403ab7300000000, 0x0b1e20c800000000,
+    0x6e1559a100000000, 0x1423476400000000, 0x71283e0d00000000,
+    0xde35b5b600000000, 0xbb3eccdf00000000, 0xe94e5cd200000000,
+    0x8c4525bb00000000, 0x2358ae0000000000, 0x4653d76900000000,
+    0x3c65c9ac00000000, 0x596eb0c500000000, 0xf6733b7e00000000,
+    0x9378421700000000, 0x4319762f00000000, 0x26120f4600000000,
+    0x890f84fd00000000, 0xec04fd9400000000, 0x9632e35100000000,
+    0xf3399a3800000000, 0x5c24118300000000, 0x392f68ea00000000,
+    0xfce779f300000000, 0x99ec009a00000000, 0x36f18b2100000000,
+    0x53faf24800000000, 0x29ccec8d00000000, 0x4cc795e400000000,
+    0xe3da1e5f00000000, 0x86d1673600000000, 0x56b0530e00000000,
+    0x33bb2a6700000000, 0x9ca6a1dc00000000, 0xf9add8b500000000,
+    0x839bc67000000000, 0xe690bf1900000000, 0x498d34a200000000,
+    0x2c864dcb00000000, 0xc31c179000000000, 0xa6176ef900000000,
+    0x090ae54200000000, 0x6c019c2b00000000, 0x163782ee00000000,
+    0x733cfb8700000000, 0xdc21703c00000000, 0xb92a095500000000,
+    0x694b3d6d00000000, 0x0c40440400000000, 0xa35dcfbf00000000,
+    0xc656b6d600000000, 0xbc60a81300000000, 0xd96bd17a00000000,
+    0x76765ac100000000, 0x137d23a800000000, 0xd6b532b100000000,
+    0xb3be4bd800000000, 0x1ca3c06300000000, 0x79a8b90a00000000,
+    0x039ea7cf00000000, 0x6695dea600000000, 0xc988551d00000000,
+    0xac832c7400000000, 0x7ce2184c00000000, 0x19e9612500000000,
+    0xb6f4ea9e00000000, 0xd3ff93f700000000, 0xa9c98d3200000000,
+    0xccc2f45b00000000, 0x63df7fe000000000, 0x06d4068900000000,
+    0xbdeaca5600000000, 0xd8e1b33f00000000, 0x77fc388400000000,
+    0x12f741ed00000000, 0x68c15f2800000000, 0x0dca264100000000,
+    0xa2d7adfa00000000, 0xc7dcd49300000000, 0x17bde0ab00000000,
+    0x72b699c200000000, 0xddab127900000000, 0xb8a06b1000000000,
+    0xc29675d500000000, 0xa79d0cbc00000000, 0x0880870700000000,
+    0x6d8bfe6e00000000, 0xa843ef7700000000, 0xcd48961e00000000,
+    0x62551da500000000, 0x075e64cc00000000, 0x7d687a0900000000,
+    0x1863036000000000, 0xb77e88db00000000, 0xd275f1b200000000,
+    0x0214c58a00000000, 0x671fbce300000000, 0xc802375800000000,
+    0xad094e3100000000, 0xd73f50f400000000, 0xb234299d00000000,
+    0x1d29a22600000000, 0x7822db4f00000000, 0x97b8811400000000,
+    0xf2b3f87d00000000, 0x5dae73c600000000, 0x38a50aaf00000000,
+    0x4293146a00000000, 0x27986d0300000000, 0x8885e6b800000000,
+    0xed8e9fd100000000, 0x3defabe900000000, 0x58e4d28000000000,
+    0xf7f9593b00000000, 0x92f2205200000000, 0xe8c43e9700000000,
+    0x8dcf47fe00000000, 0x22d2cc4500000000, 0x47d9b52c00000000,
+    0x8211a43500000000, 0xe71add5c00000000, 0x480756e700000000,
+    0x2d0c2f8e00000000, 0x573a314b00000000, 0x3231482200000000,
+    0x9d2cc39900000000, 0xf827baf000000000, 0x28468ec800000000,
+    0x4d4df7a100000000, 0xe2507c1a00000000, 0x875b057300000000,
+    0xfd6d1bb600000000, 0x986662df00000000, 0x377be96400000000,
+    0x5270900d00000000},
+   {0x0000000000000000, 0xdcecb13d00000000, 0xb8d9637b00000000,
+    0x6435d24600000000, 0x70b3c7f600000000, 0xac5f76cb00000000,
+    0xc86aa48d00000000, 0x148615b000000000, 0xa160fe3600000000,
+    0x7d8c4f0b00000000, 0x19b99d4d00000000, 0xc5552c7000000000,
+    0xd1d339c000000000, 0x0d3f88fd00000000, 0x690a5abb00000000,
+    0xb5e6eb8600000000, 0x42c1fc6d00000000, 0x9e2d4d5000000000,
+    0xfa189f1600000000, 0x26f42e2b00000000, 0x32723b9b00000000,
+    0xee9e8aa600000000, 0x8aab58e000000000, 0x5647e9dd00000000,
+    0xe3a1025b00000000, 0x3f4db36600000000, 0x5b78612000000000,
+    0x8794d01d00000000, 0x9312c5ad00000000, 0x4ffe749000000000,
+    0x2bcba6d600000000, 0xf72717eb00000000, 0x8482f9db00000000,
+    0x586e48e600000000, 0x3c5b9aa000000000, 0xe0b72b9d00000000,
+    0xf4313e2d00000000, 0x28dd8f1000000000, 0x4ce85d5600000000,
+    0x9004ec6b00000000, 0x25e207ed00000000, 0xf90eb6d000000000,
+    0x9d3b649600000000, 0x41d7d5ab00000000, 0x5551c01b00000000,
+    0x89bd712600000000, 0xed88a36000000000, 0x3164125d00000000,
+    0xc64305b600000000, 0x1aafb48b00000000, 0x7e9a66cd00000000,
+    0xa276d7f000000000, 0xb6f0c24000000000, 0x6a1c737d00000000,
+    0x0e29a13b00000000, 0xd2c5100600000000, 0x6723fb8000000000,
+    0xbbcf4abd00000000, 0xdffa98fb00000000, 0x031629c600000000,
+    0x17903c7600000000, 0xcb7c8d4b00000000, 0xaf495f0d00000000,
+    0x73a5ee3000000000, 0x4903826c00000000, 0x95ef335100000000,
+    0xf1dae11700000000, 0x2d36502a00000000, 0x39b0459a00000000,
+    0xe55cf4a700000000, 0x816926e100000000, 0x5d8597dc00000000,
+    0xe8637c5a00000000, 0x348fcd6700000000, 0x50ba1f2100000000,
+    0x8c56ae1c00000000, 0x98d0bbac00000000, 0x443c0a9100000000,
+    0x2009d8d700000000, 0xfce569ea00000000, 0x0bc27e0100000000,
+    0xd72ecf3c00000000, 0xb31b1d7a00000000, 0x6ff7ac4700000000,
+    0x7b71b9f700000000, 0xa79d08ca00000000, 0xc3a8da8c00000000,
+    0x1f446bb100000000, 0xaaa2803700000000, 0x764e310a00000000,
+    0x127be34c00000000, 0xce97527100000000, 0xda1147c100000000,
+    0x06fdf6fc00000000, 0x62c824ba00000000, 0xbe24958700000000,
+    0xcd817bb700000000, 0x116dca8a00000000, 0x755818cc00000000,
+    0xa9b4a9f100000000, 0xbd32bc4100000000, 0x61de0d7c00000000,
+    0x05ebdf3a00000000, 0xd9076e0700000000, 0x6ce1858100000000,
+    0xb00d34bc00000000, 0xd438e6fa00000000, 0x08d457c700000000,
+    0x1c52427700000000, 0xc0bef34a00000000, 0xa48b210c00000000,
+    0x7867903100000000, 0x8f4087da00000000, 0x53ac36e700000000,
+    0x3799e4a100000000, 0xeb75559c00000000, 0xfff3402c00000000,
+    0x231ff11100000000, 0x472a235700000000, 0x9bc6926a00000000,
+    0x2e2079ec00000000, 0xf2ccc8d100000000, 0x96f91a9700000000,
+    0x4a15abaa00000000, 0x5e93be1a00000000, 0x827f0f2700000000,
+    0xe64add6100000000, 0x3aa66c5c00000000, 0x920604d900000000,
+    0x4eeab5e400000000, 0x2adf67a200000000, 0xf633d69f00000000,
+    0xe2b5c32f00000000, 0x3e59721200000000, 0x5a6ca05400000000,
+    0x8680116900000000, 0x3366faef00000000, 0xef8a4bd200000000,
+    0x8bbf999400000000, 0x575328a900000000, 0x43d53d1900000000,
+    0x9f398c2400000000, 0xfb0c5e6200000000, 0x27e0ef5f00000000,
+    0xd0c7f8b400000000, 0x0c2b498900000000, 0x681e9bcf00000000,
+    0xb4f22af200000000, 0xa0743f4200000000, 0x7c988e7f00000000,
+    0x18ad5c3900000000, 0xc441ed0400000000, 0x71a7068200000000,
+    0xad4bb7bf00000000, 0xc97e65f900000000, 0x1592d4c400000000,
+    0x0114c17400000000, 0xddf8704900000000, 0xb9cda20f00000000,
+    0x6521133200000000, 0x1684fd0200000000, 0xca684c3f00000000,
+    0xae5d9e7900000000, 0x72b12f4400000000, 0x66373af400000000,
+    0xbadb8bc900000000, 0xdeee598f00000000, 0x0202e8b200000000,
+    0xb7e4033400000000, 0x6b08b20900000000, 0x0f3d604f00000000,
+    0xd3d1d17200000000, 0xc757c4c200000000, 0x1bbb75ff00000000,
+    0x7f8ea7b900000000, 0xa362168400000000, 0x5445016f00000000,
+    0x88a9b05200000000, 0xec9c621400000000, 0x3070d32900000000,
+    0x24f6c69900000000, 0xf81a77a400000000, 0x9c2fa5e200000000,
+    0x40c314df00000000, 0xf525ff5900000000, 0x29c94e6400000000,
+    0x4dfc9c2200000000, 0x91102d1f00000000, 0x859638af00000000,
+    0x597a899200000000, 0x3d4f5bd400000000, 0xe1a3eae900000000,
+    0xdb0586b500000000, 0x07e9378800000000, 0x63dce5ce00000000,
+    0xbf3054f300000000, 0xabb6414300000000, 0x775af07e00000000,
+    0x136f223800000000, 0xcf83930500000000, 0x7a65788300000000,
+    0xa689c9be00000000, 0xc2bc1bf800000000, 0x1e50aac500000000,
+    0x0ad6bf7500000000, 0xd63a0e4800000000, 0xb20fdc0e00000000,
+    0x6ee36d3300000000, 0x99c47ad800000000, 0x4528cbe500000000,
+    0x211d19a300000000, 0xfdf1a89e00000000, 0xe977bd2e00000000,
+    0x359b0c1300000000, 0x51aede5500000000, 0x8d426f6800000000,
+    0x38a484ee00000000, 0xe44835d300000000, 0x807de79500000000,
+    0x5c9156a800000000, 0x4817431800000000, 0x94fbf22500000000,
+    0xf0ce206300000000, 0x2c22915e00000000, 0x5f877f6e00000000,
+    0x836bce5300000000, 0xe75e1c1500000000, 0x3bb2ad2800000000,
+    0x2f34b89800000000, 0xf3d809a500000000, 0x97eddbe300000000,
+    0x4b016ade00000000, 0xfee7815800000000, 0x220b306500000000,
+    0x463ee22300000000, 0x9ad2531e00000000, 0x8e5446ae00000000,
+    0x52b8f79300000000, 0x368d25d500000000, 0xea6194e800000000,
+    0x1d46830300000000, 0xc1aa323e00000000, 0xa59fe07800000000,
+    0x7973514500000000, 0x6df544f500000000, 0xb119f5c800000000,
+    0xd52c278e00000000, 0x09c096b300000000, 0xbc267d3500000000,
+    0x60cacc0800000000, 0x04ff1e4e00000000, 0xd813af7300000000,
+    0xcc95bac300000000, 0x10790bfe00000000, 0x744cd9b800000000,
+    0xa8a0688500000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x9e83da9f, 0x7d01c4e4, 0xe3821e7b, 0xbb04f912,
+    0x2587238d, 0xc6053df6, 0x5886e769, 0x7609f225, 0xe88a28ba,
+    0x0b0836c1, 0x958bec5e, 0xcd0d0b37, 0x538ed1a8, 0xb00ccfd3,
+    0x2e8f154c, 0xec12e44b, 0x72913ed4, 0x911320af, 0x0f90fa30,
+    0x57161d59, 0xc995c7c6, 0x2a17d9bd, 0xb4940322, 0x9a1b166e,
+    0x0498ccf1, 0xe71ad28a, 0x79990815, 0x211fef7c, 0xbf9c35e3,
+    0x5c1e2b98, 0xc29df107, 0xd825c897, 0x46a61208, 0xa5240c73,
+    0x3ba7d6ec, 0x63213185, 0xfda2eb1a, 0x1e20f561, 0x80a32ffe,
+    0xae2c3ab2, 0x30afe02d, 0xd32dfe56, 0x4dae24c9, 0x1528c3a0,
+    0x8bab193f, 0x68290744, 0xf6aadddb, 0x34372cdc, 0xaab4f643,
+    0x4936e838, 0xd7b532a7, 0x8f33d5ce, 0x11b00f51, 0xf232112a,
+    0x6cb1cbb5, 0x423edef9, 0xdcbd0466, 0x3f3f1a1d, 0xa1bcc082,
+    0xf93a27eb, 0x67b9fd74, 0x843be30f, 0x1ab83990, 0xf14de1f4,
+    0x6fce3b6b, 0x8c4c2510, 0x12cfff8f, 0x4a4918e6, 0xd4cac279,
+    0x3748dc02, 0xa9cb069d, 0x874413d1, 0x19c7c94e, 0xfa45d735,
+    0x64c60daa, 0x3c40eac3, 0xa2c3305c, 0x41412e27, 0xdfc2f4b8,
+    0x1d5f05bf, 0x83dcdf20, 0x605ec15b, 0xfedd1bc4, 0xa65bfcad,
+    0x38d82632, 0xdb5a3849, 0x45d9e2d6, 0x6b56f79a, 0xf5d52d05,
+    0x1657337e, 0x88d4e9e1, 0xd0520e88, 0x4ed1d417, 0xad53ca6c,
+    0x33d010f3, 0x29682963, 0xb7ebf3fc, 0x5469ed87, 0xcaea3718,
+    0x926cd071, 0x0cef0aee, 0xef6d1495, 0x71eece0a, 0x5f61db46,
+    0xc1e201d9, 0x22601fa2, 0xbce3c53d, 0xe4652254, 0x7ae6f8cb,
+    0x9964e6b0, 0x07e73c2f, 0xc57acd28, 0x5bf917b7, 0xb87b09cc,
+    0x26f8d353, 0x7e7e343a, 0xe0fdeea5, 0x037ff0de, 0x9dfc2a41,
+    0xb3733f0d, 0x2df0e592, 0xce72fbe9, 0x50f12176, 0x0877c61f,
+    0x96f41c80, 0x757602fb, 0xebf5d864, 0xa39db332, 0x3d1e69ad,
+    0xde9c77d6, 0x401fad49, 0x18994a20, 0x861a90bf, 0x65988ec4,
+    0xfb1b545b, 0xd5944117, 0x4b179b88, 0xa89585f3, 0x36165f6c,
+    0x6e90b805, 0xf013629a, 0x13917ce1, 0x8d12a67e, 0x4f8f5779,
+    0xd10c8de6, 0x328e939d, 0xac0d4902, 0xf48bae6b, 0x6a0874f4,
+    0x898a6a8f, 0x1709b010, 0x3986a55c, 0xa7057fc3, 0x448761b8,
+    0xda04bb27, 0x82825c4e, 0x1c0186d1, 0xff8398aa, 0x61004235,
+    0x7bb87ba5, 0xe53ba13a, 0x06b9bf41, 0x983a65de, 0xc0bc82b7,
+    0x5e3f5828, 0xbdbd4653, 0x233e9ccc, 0x0db18980, 0x9332531f,
+    0x70b04d64, 0xee3397fb, 0xb6b57092, 0x2836aa0d, 0xcbb4b476,
+    0x55376ee9, 0x97aa9fee, 0x09294571, 0xeaab5b0a, 0x74288195,
+    0x2cae66fc, 0xb22dbc63, 0x51afa218, 0xcf2c7887, 0xe1a36dcb,
+    0x7f20b754, 0x9ca2a92f, 0x022173b0, 0x5aa794d9, 0xc4244e46,
+    0x27a6503d, 0xb9258aa2, 0x52d052c6, 0xcc538859, 0x2fd19622,
+    0xb1524cbd, 0xe9d4abd4, 0x7757714b, 0x94d56f30, 0x0a56b5af,
+    0x24d9a0e3, 0xba5a7a7c, 0x59d86407, 0xc75bbe98, 0x9fdd59f1,
+    0x015e836e, 0xe2dc9d15, 0x7c5f478a, 0xbec2b68d, 0x20416c12,
+    0xc3c37269, 0x5d40a8f6, 0x05c64f9f, 0x9b459500, 0x78c78b7b,
+    0xe64451e4, 0xc8cb44a8, 0x56489e37, 0xb5ca804c, 0x2b495ad3,
+    0x73cfbdba, 0xed4c6725, 0x0ece795e, 0x904da3c1, 0x8af59a51,
+    0x147640ce, 0xf7f45eb5, 0x6977842a, 0x31f16343, 0xaf72b9dc,
+    0x4cf0a7a7, 0xd2737d38, 0xfcfc6874, 0x627fb2eb, 0x81fdac90,
+    0x1f7e760f, 0x47f89166, 0xd97b4bf9, 0x3af95582, 0xa47a8f1d,
+    0x66e77e1a, 0xf864a485, 0x1be6bafe, 0x85656061, 0xdde38708,
+    0x43605d97, 0xa0e243ec, 0x3e619973, 0x10ee8c3f, 0x8e6d56a0,
+    0x6def48db, 0xf36c9244, 0xabea752d, 0x3569afb2, 0xd6ebb1c9,
+    0x48686b56},
+   {0x00000000, 0xc0642817, 0x80c9502e, 0x40ad7839, 0x0093a15c,
+    0xc0f7894b, 0x805af172, 0x403ed965, 0x002643b9, 0xc0426bae,
+    0x80ef1397, 0x408b3b80, 0x00b5e2e5, 0xc0d1caf2, 0x807cb2cb,
+    0x40189adc, 0x414af7a9, 0x812edfbe, 0xc183a787, 0x01e78f90,
+    0x41d956f5, 0x81bd7ee2, 0xc11006db, 0x01742ecc, 0x416cb410,
+    0x81089c07, 0xc1a5e43e, 0x01c1cc29, 0x41ff154c, 0x819b3d5b,
+    0xc1364562, 0x01526d75, 0xc3929f88, 0x03f6b79f, 0x435bcfa6,
+    0x833fe7b1, 0xc3013ed4, 0x036516c3, 0x43c86efa, 0x83ac46ed,
+    0xc3b4dc31, 0x03d0f426, 0x437d8c1f, 0x8319a408, 0xc3277d6d,
+    0x0343557a, 0x43ee2d43, 0x838a0554, 0x82d86821, 0x42bc4036,
+    0x0211380f, 0xc2751018, 0x824bc97d, 0x422fe16a, 0x02829953,
+    0xc2e6b144, 0x82fe2b98, 0x429a038f, 0x02377bb6, 0xc25353a1,
+    0x826d8ac4, 0x4209a2d3, 0x02a4daea, 0xc2c0f2fd, 0xc7234eca,
+    0x074766dd, 0x47ea1ee4, 0x878e36f3, 0xc7b0ef96, 0x07d4c781,
+    0x4779bfb8, 0x871d97af, 0xc7050d73, 0x07612564, 0x47cc5d5d,
+    0x87a8754a, 0xc796ac2f, 0x07f28438, 0x475ffc01, 0x873bd416,
+    0x8669b963, 0x460d9174, 0x06a0e94d, 0xc6c4c15a, 0x86fa183f,
+    0x469e3028, 0x06334811, 0xc6576006, 0x864ffada, 0x462bd2cd,
+    0x0686aaf4, 0xc6e282e3, 0x86dc5b86, 0x46b87391, 0x06150ba8,
+    0xc67123bf, 0x04b1d142, 0xc4d5f955, 0x8478816c, 0x441ca97b,
+    0x0422701e, 0xc4465809, 0x84eb2030, 0x448f0827, 0x049792fb,
+    0xc4f3baec, 0x845ec2d5, 0x443aeac2, 0x040433a7, 0xc4601bb0,
+    0x84cd6389, 0x44a94b9e, 0x45fb26eb, 0x859f0efc, 0xc53276c5,
+    0x05565ed2, 0x456887b7, 0x850cafa0, 0xc5a1d799, 0x05c5ff8e,
+    0x45dd6552, 0x85b94d45, 0xc514357c, 0x05701d6b, 0x454ec40e,
+    0x852aec19, 0xc5879420, 0x05e3bc37, 0xcf41ed4f, 0x0f25c558,
+    0x4f88bd61, 0x8fec9576, 0xcfd24c13, 0x0fb66404, 0x4f1b1c3d,
+    0x8f7f342a, 0xcf67aef6, 0x0f0386e1, 0x4faefed8, 0x8fcad6cf,
+    0xcff40faa, 0x0f9027bd, 0x4f3d5f84, 0x8f597793, 0x8e0b1ae6,
+    0x4e6f32f1, 0x0ec24ac8, 0xcea662df, 0x8e98bbba, 0x4efc93ad,
+    0x0e51eb94, 0xce35c383, 0x8e2d595f, 0x4e497148, 0x0ee40971,
+    0xce802166, 0x8ebef803, 0x4edad014, 0x0e77a82d, 0xce13803a,
+    0x0cd372c7, 0xccb75ad0, 0x8c1a22e9, 0x4c7e0afe, 0x0c40d39b,
+    0xcc24fb8c, 0x8c8983b5, 0x4cedaba2, 0x0cf5317e, 0xcc911969,
+    0x8c3c6150, 0x4c584947, 0x0c669022, 0xcc02b835, 0x8cafc00c,
+    0x4ccbe81b, 0x4d99856e, 0x8dfdad79, 0xcd50d540, 0x0d34fd57,
+    0x4d0a2432, 0x8d6e0c25, 0xcdc3741c, 0x0da75c0b, 0x4dbfc6d7,
+    0x8ddbeec0, 0xcd7696f9, 0x0d12beee, 0x4d2c678b, 0x8d484f9c,
+    0xcde537a5, 0x0d811fb2, 0x0862a385, 0xc8068b92, 0x88abf3ab,
+    0x48cfdbbc, 0x08f102d9, 0xc8952ace, 0x883852f7, 0x485c7ae0,
+    0x0844e03c, 0xc820c82b, 0x888db012, 0x48e99805, 0x08d74160,
+    0xc8b36977, 0x881e114e, 0x487a3959, 0x4928542c, 0x894c7c3b,
+    0xc9e10402, 0x09852c15, 0x49bbf570, 0x89dfdd67, 0xc972a55e,
+    0x09168d49, 0x490e1795, 0x896a3f82, 0xc9c747bb, 0x09a36fac,
+    0x499db6c9, 0x89f99ede, 0xc954e6e7, 0x0930cef0, 0xcbf03c0d,
+    0x0b94141a, 0x4b396c23, 0x8b5d4434, 0xcb639d51, 0x0b07b546,
+    0x4baacd7f, 0x8bcee568, 0xcbd67fb4, 0x0bb257a3, 0x4b1f2f9a,
+    0x8b7b078d, 0xcb45dee8, 0x0b21f6ff, 0x4b8c8ec6, 0x8be8a6d1,
+    0x8abacba4, 0x4adee3b3, 0x0a739b8a, 0xca17b39d, 0x8a296af8,
+    0x4a4d42ef, 0x0ae03ad6, 0xca8412c1, 0x8a9c881d, 0x4af8a00a,
+    0x0a55d833, 0xca31f024, 0x8a0f2941, 0x4a6b0156, 0x0ac6796f,
+    0xcaa25178},
+   {0x00000000, 0xd4ea739b, 0xe9d396ed, 0x3d39e576, 0x93a15c00,
+    0x474b2f9b, 0x7a72caed, 0xae98b976, 0x2643b900, 0xf2a9ca9b,
+    0xcf902fed, 0x1b7a5c76, 0xb5e2e500, 0x6108969b, 0x5c3173ed,
+    0x88db0076, 0x4c867201, 0x986c019a, 0xa555e4ec, 0x71bf9777,
+    0xdf272e01, 0x0bcd5d9a, 0x36f4b8ec, 0xe21ecb77, 0x6ac5cb01,
+    0xbe2fb89a, 0x83165dec, 0x57fc2e77, 0xf9649701, 0x2d8ee49a,
+    0x10b701ec, 0xc45d7277, 0x980ce502, 0x4ce69699, 0x71df73ef,
+    0xa5350074, 0x0badb902, 0xdf47ca99, 0xe27e2fef, 0x36945c74,
+    0xbe4f5c02, 0x6aa52f99, 0x579ccaef, 0x8376b974, 0x2dee0002,
+    0xf9047399, 0xc43d96ef, 0x10d7e574, 0xd48a9703, 0x0060e498,
+    0x3d5901ee, 0xe9b37275, 0x472bcb03, 0x93c1b898, 0xaef85dee,
+    0x7a122e75, 0xf2c92e03, 0x26235d98, 0x1b1ab8ee, 0xcff0cb75,
+    0x61687203, 0xb5820198, 0x88bbe4ee, 0x5c519775, 0x3019ca05,
+    0xe4f3b99e, 0xd9ca5ce8, 0x0d202f73, 0xa3b89605, 0x7752e59e,
+    0x4a6b00e8, 0x9e817373, 0x165a7305, 0xc2b0009e, 0xff89e5e8,
+    0x2b639673, 0x85fb2f05, 0x51115c9e, 0x6c28b9e8, 0xb8c2ca73,
+    0x7c9fb804, 0xa875cb9f, 0x954c2ee9, 0x41a65d72, 0xef3ee404,
+    0x3bd4979f, 0x06ed72e9, 0xd2070172, 0x5adc0104, 0x8e36729f,
+    0xb30f97e9, 0x67e5e472, 0xc97d5d04, 0x1d972e9f, 0x20aecbe9,
+    0xf444b872, 0xa8152f07, 0x7cff5c9c, 0x41c6b9ea, 0x952cca71,
+    0x3bb47307, 0xef5e009c, 0xd267e5ea, 0x068d9671, 0x8e569607,
+    0x5abce59c, 0x678500ea, 0xb36f7371, 0x1df7ca07, 0xc91db99c,
+    0xf4245cea, 0x20ce2f71, 0xe4935d06, 0x30792e9d, 0x0d40cbeb,
+    0xd9aab870, 0x77320106, 0xa3d8729d, 0x9ee197eb, 0x4a0be470,
+    0xc2d0e406, 0x163a979d, 0x2b0372eb, 0xffe90170, 0x5171b806,
+    0x859bcb9d, 0xb8a22eeb, 0x6c485d70, 0x6032940b, 0xb4d8e790,
+    0x89e102e6, 0x5d0b717d, 0xf393c80b, 0x2779bb90, 0x1a405ee6,
+    0xceaa2d7d, 0x46712d0b, 0x929b5e90, 0xafa2bbe6, 0x7b48c87d,
+    0xd5d0710b, 0x013a0290, 0x3c03e7e6, 0xe8e9947d, 0x2cb4e60a,
+    0xf85e9591, 0xc56770e7, 0x118d037c, 0xbf15ba0a, 0x6bffc991,
+    0x56c62ce7, 0x822c5f7c, 0x0af75f0a, 0xde1d2c91, 0xe324c9e7,
+    0x37ceba7c, 0x9956030a, 0x4dbc7091, 0x708595e7, 0xa46fe67c,
+    0xf83e7109, 0x2cd40292, 0x11ede7e4, 0xc507947f, 0x6b9f2d09,
+    0xbf755e92, 0x824cbbe4, 0x56a6c87f, 0xde7dc809, 0x0a97bb92,
+    0x37ae5ee4, 0xe3442d7f, 0x4ddc9409, 0x9936e792, 0xa40f02e4,
+    0x70e5717f, 0xb4b80308, 0x60527093, 0x5d6b95e5, 0x8981e67e,
+    0x27195f08, 0xf3f32c93, 0xcecac9e5, 0x1a20ba7e, 0x92fbba08,
+    0x4611c993, 0x7b282ce5, 0xafc25f7e, 0x015ae608, 0xd5b09593,
+    0xe88970e5, 0x3c63037e, 0x502b5e0e, 0x84c12d95, 0xb9f8c8e3,
+    0x6d12bb78, 0xc38a020e, 0x17607195, 0x2a5994e3, 0xfeb3e778,
+    0x7668e70e, 0xa2829495, 0x9fbb71e3, 0x4b510278, 0xe5c9bb0e,
+    0x3123c895, 0x0c1a2de3, 0xd8f05e78, 0x1cad2c0f, 0xc8475f94,
+    0xf57ebae2, 0x2194c979, 0x8f0c700f, 0x5be60394, 0x66dfe6e2,
+    0xb2359579, 0x3aee950f, 0xee04e694, 0xd33d03e2, 0x07d77079,
+    0xa94fc90f, 0x7da5ba94, 0x409c5fe2, 0x94762c79, 0xc827bb0c,
+    0x1ccdc897, 0x21f42de1, 0xf51e5e7a, 0x5b86e70c, 0x8f6c9497,
+    0xb25571e1, 0x66bf027a, 0xee64020c, 0x3a8e7197, 0x07b794e1,
+    0xd35de77a, 0x7dc55e0c, 0xa92f2d97, 0x9416c8e1, 0x40fcbb7a,
+    0x84a1c90d, 0x504bba96, 0x6d725fe0, 0xb9982c7b, 0x1700950d,
+    0xc3eae696, 0xfed303e0, 0x2a39707b, 0xa2e2700d, 0x76080396,
+    0x4b31e6e0, 0x9fdb957b, 0x31432c0d, 0xe5a95f96, 0xd890bae0,
+    0x0c7ac97b},
+   {0x00000000, 0x27652581, 0x0fcc3bd9, 0x28a91e58, 0x5f9e0669,
+    0x78fb23e8, 0x50523db0, 0x77371831, 0xbe3c0dd2, 0x99592853,
+    0xb1f0360b, 0x9695138a, 0xe1a20bbb, 0xc6c72e3a, 0xee6e3062,
+    0xc90b15e3, 0x3d7f6b7f, 0x1a1a4efe, 0x32b350a6, 0x15d67527,
+    0x62e16d16, 0x45844897, 0x6d2d56cf, 0x4a48734e, 0x834366ad,
+    0xa426432c, 0x8c8f5d74, 0xabea78f5, 0xdcdd60c4, 0xfbb84545,
+    0xd3115b1d, 0xf4747e9c, 0x7afed6fe, 0x5d9bf37f, 0x7532ed27,
+    0x5257c8a6, 0x2560d097, 0x0205f516, 0x2aaceb4e, 0x0dc9cecf,
+    0xc4c2db2c, 0xe3a7fead, 0xcb0ee0f5, 0xec6bc574, 0x9b5cdd45,
+    0xbc39f8c4, 0x9490e69c, 0xb3f5c31d, 0x4781bd81, 0x60e49800,
+    0x484d8658, 0x6f28a3d9, 0x181fbbe8, 0x3f7a9e69, 0x17d38031,
+    0x30b6a5b0, 0xf9bdb053, 0xded895d2, 0xf6718b8a, 0xd114ae0b,
+    0xa623b63a, 0x814693bb, 0xa9ef8de3, 0x8e8aa862, 0xb5fadc26,
+    0x929ff9a7, 0xba36e7ff, 0x9d53c27e, 0xea64da4f, 0xcd01ffce,
+    0xe5a8e196, 0xc2cdc417, 0x0bc6d1f4, 0x2ca3f475, 0x040aea2d,
+    0x236fcfac, 0x5458d79d, 0x733df21c, 0x5b94ec44, 0x7cf1c9c5,
+    0x8885b759, 0xafe092d8, 0x87498c80, 0xa02ca901, 0xd71bb130,
+    0xf07e94b1, 0xd8d78ae9, 0xffb2af68, 0x36b9ba8b, 0x11dc9f0a,
+    0x39758152, 0x1e10a4d3, 0x6927bce2, 0x4e429963, 0x66eb873b,
+    0x418ea2ba, 0xcf040ad8, 0xe8612f59, 0xc0c83101, 0xe7ad1480,
+    0x909a0cb1, 0xb7ff2930, 0x9f563768, 0xb83312e9, 0x7138070a,
+    0x565d228b, 0x7ef43cd3, 0x59911952, 0x2ea60163, 0x09c324e2,
+    0x216a3aba, 0x060f1f3b, 0xf27b61a7, 0xd51e4426, 0xfdb75a7e,
+    0xdad27fff, 0xade567ce, 0x8a80424f, 0xa2295c17, 0x854c7996,
+    0x4c476c75, 0x6b2249f4, 0x438b57ac, 0x64ee722d, 0x13d96a1c,
+    0x34bc4f9d, 0x1c1551c5, 0x3b707444, 0x6af5b94d, 0x4d909ccc,
+    0x65398294, 0x425ca715, 0x356bbf24, 0x120e9aa5, 0x3aa784fd,
+    0x1dc2a17c, 0xd4c9b49f, 0xf3ac911e, 0xdb058f46, 0xfc60aac7,
+    0x8b57b2f6, 0xac329777, 0x849b892f, 0xa3feacae, 0x578ad232,
+    0x70eff7b3, 0x5846e9eb, 0x7f23cc6a, 0x0814d45b, 0x2f71f1da,
+    0x07d8ef82, 0x20bdca03, 0xe9b6dfe0, 0xced3fa61, 0xe67ae439,
+    0xc11fc1b8, 0xb628d989, 0x914dfc08, 0xb9e4e250, 0x9e81c7d1,
+    0x100b6fb3, 0x376e4a32, 0x1fc7546a, 0x38a271eb, 0x4f9569da,
+    0x68f04c5b, 0x40595203, 0x673c7782, 0xae376261, 0x895247e0,
+    0xa1fb59b8, 0x869e7c39, 0xf1a96408, 0xd6cc4189, 0xfe655fd1,
+    0xd9007a50, 0x2d7404cc, 0x0a11214d, 0x22b83f15, 0x05dd1a94,
+    0x72ea02a5, 0x558f2724, 0x7d26397c, 0x5a431cfd, 0x9348091e,
+    0xb42d2c9f, 0x9c8432c7, 0xbbe11746, 0xccd60f77, 0xebb32af6,
+    0xc31a34ae, 0xe47f112f, 0xdf0f656b, 0xf86a40ea, 0xd0c35eb2,
+    0xf7a67b33, 0x80916302, 0xa7f44683, 0x8f5d58db, 0xa8387d5a,
+    0x613368b9, 0x46564d38, 0x6eff5360, 0x499a76e1, 0x3ead6ed0,
+    0x19c84b51, 0x31615509, 0x16047088, 0xe2700e14, 0xc5152b95,
+    0xedbc35cd, 0xcad9104c, 0xbdee087d, 0x9a8b2dfc, 0xb22233a4,
+    0x95471625, 0x5c4c03c6, 0x7b292647, 0x5380381f, 0x74e51d9e,
+    0x03d205af, 0x24b7202e, 0x0c1e3e76, 0x2b7b1bf7, 0xa5f1b395,
+    0x82949614, 0xaa3d884c, 0x8d58adcd, 0xfa6fb5fc, 0xdd0a907d,
+    0xf5a38e25, 0xd2c6aba4, 0x1bcdbe47, 0x3ca89bc6, 0x1401859e,
+    0x3364a01f, 0x4453b82e, 0x63369daf, 0x4b9f83f7, 0x6cfaa676,
+    0x988ed8ea, 0xbfebfd6b, 0x9742e333, 0xb027c6b2, 0xc710de83,
+    0xe075fb02, 0xc8dce55a, 0xefb9c0db, 0x26b2d538, 0x01d7f0b9,
+    0x297eeee1, 0x0e1bcb60, 0x792cd351, 0x5e49f6d0, 0x76e0e888,
+    0x5185cd09}};
+
+#endif
+
+#endif
+
+#endif
+
+local const z_crc_t FAR x2n_table[] = {
+    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xedb88320, 0xb1e6b092, 0xa06a2517, 0xed627dae, 0x88d14467,
+    0xd7bbfe6a, 0xec447f11, 0x8e7ea170, 0x6427800e, 0x4d47bae0,
+    0x09fe548f, 0x83852d0f, 0x30362f1a, 0x7b5a9cc3, 0x31fec169,
+    0x9fec022a, 0x6c8dedc4, 0x15d6874d, 0x5fde7a4e, 0xbad90e37,
+    0x2e4e5eef, 0x4eaba214, 0xa8a472c0, 0x429a969e, 0x148d302a,
+    0xc40ba6d0, 0xc4e22c3c};
diff --git a/extra/zlib/zlib-1.2.13/deflate.c b/extra/zlib/zlib-1.2.13/deflate.c
new file mode 100644
index 000000000000..4a689db35989
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/deflate.c
@@ -0,0 +1,2217 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://tools.ietf.org/html/rfc1951
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local int deflateStateCheck      OF((z_streamp strm));
+local void slide_hash     OF((deflate_state *s));
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+
+#ifdef ZLIB_DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
+ *    characters, so that a running hash key can be computed from the previous
+ *    key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input
+ *    characters and the first MIN_MATCH bytes of str are valid (except for
+ *    the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    do { \
+        s->head[s->hash_size - 1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+    } while (0)
+
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local void slide_hash(s)
+    deflate_state *s;
+{
+    unsigned n, m;
+    Posf *p;
+    uInt wsize = s->w_size;
+
+    n = s->hash_size;
+    p = &s->head[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+    } while (--n);
+    n = wsize;
+#ifndef FASTEST
+    p = &s->prev[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+        /* If n is not on any hash chain, prev[n] is garbage but
+         * its value will never be used.
+         */
+    } while (--n);
+#endif
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = (uInt)windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = (uInt)memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    /* We overlay pending_buf and sym_buf. This works since the average size
+     * for length/distance pairs over any compressed block is assured to be 31
+     * bits or less.
+     *
+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
+     * possible fixed-codes length/distance pair is then 31 bits total.
+     *
+     * sym_buf starts one-fourth of the way into pending_buf. So there are
+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
+     * in sym_buf is three bytes -- two for the distance and one for the
+     * literal/length. As each symbol is consumed, the pointer to the next
+     * sym_buf value to read moves forward three bytes. From that symbol, up to
+     * 31 bits are written to pending_buf. The closest the written pending_buf
+     * bits gets to the next sym_buf symbol to read is just before the last
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
+     * symbols are written.) The closest the writing gets to what is unread is
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * can range from 128 to 32768.
+     *
+     * Therefore, at a minimum, there are 142 bits of space between what is
+     * written and what is read in the overlain buffers, so the symbols cannot
+     * be overwritten by the compressed data. That space is actually 139 bits,
+     * due to the three-bit fixed-code block header.
+     *
+     * That covers the case where either Z_FIXED is specified, forcing fixed
+     * codes, or when the use of fixed codes is chosen, because that choice
+     * results in a smaller compressed block than dynamic codes. That latter
+     * condition then assures that the above analysis also covers all dynamic
+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
+     * fewer bits than a fixed-code block would for the same set of symbols.
+     * Therefore its average symbol length is assured to be less than 31. So
+     * the compressed data for a dynamic block also cannot overwrite the
+     * symbols from which it is being constructed.
+     */
+
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->sym_buf = s->pending_buf + s->lit_bufsize;
+    s->sym_end = (s->lit_bufsize - 1) * 3;
+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* =========================================================================
+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
+ */
+local int deflateStateCheck(strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    s = strm->state;
+    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
+#ifdef GZIP
+                                           s->status != GZIP_STATE &&
+#endif
+                                           s->status != EXTRA_STATE &&
+                                           s->status != NAME_STATE &&
+                                           s->status != COMMENT_STATE &&
+                                           s->status != HCRC_STATE &&
+                                           s->status != BUSY_STATE &&
+                                           s->status != FINISH_STATE))
+        return 1;
+    return 0;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
+
+    if (deflateStateCheck(strm) || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
+
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
+    }
+
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
+    }
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateGetDictionary(strm, dictionary, dictLength)
+    z_streamp strm;
+    Bytef *dictionary;
+    uInt  *dictLength;
+{
+    deflate_state *s;
+    uInt len;
+
+    if (deflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    len = s->strstart + s->lookahead;
+    if (len > s->w_size)
+        len = s->w_size;
+    if (dictionary != Z_NULL && len)
+        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
+    if (dictLength != Z_NULL)
+        *dictLength = len;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateResetKeep(strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (deflateStateCheck(strm)) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status =
+#ifdef GZIP
+        s->wrap == 2 ? GZIP_STATE :
+#endif
+        INIT_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = -2;
+
+    _tr_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset(strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader(strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (deflateStateCheck(strm) || strm->state->wrap != 2)
+        return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending(strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime(strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    deflate_state *s;
+    int put;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+    if (bits < 0 || bits > 16 ||
+        s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        s->last_flush != -2) {
+        /* Flush the last buffer: */
+        int err = deflate(strm, Z_BLOCK);
+        if (err == Z_STREAM_ERROR)
+            return err;
+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
+            return Z_BUF_ERROR;
+    }
+    if (s->level != level) {
+        if (s->level == 0 && s->matches != 0) {
+            if (s->matches == 1)
+                slide_hash(s);
+            else
+                CLEAR_HASH(s);
+            s->matches = 0;
+        }
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = (uInt)good_length;
+    s->max_lazy_match = (uInt)max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = (uInt)max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
+ *
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
+ *
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
+ *
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
+ *
+ * Shifts are used to approximate divisions, for speed.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong fixedlen, storelen, wraplen;
+
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
+
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
+
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
+    if (deflateStateCheck(strm))
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+#ifdef GZIP
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            Bytef *str;
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+#endif
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return one of the conservative bounds */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return (s->w_bits <= s->hash_bits ? fixedlen : storelen) + wraplen;
+
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB(s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output, except for
+ * some deflate_stored() output, goes through this function so some
+ * applications may wish to modify it to avoid allocating a large
+ * strm->next_out buffer and copying into it. (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len;
+    deflate_state *s = strm->state;
+
+    _tr_flush_bits(s);
+    len = s->pending;
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, s->pending_out, len);
+    strm->next_out  += len;
+    s->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out -= len;
+    s->pending      -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
+    }
+}
+
+/* ===========================================================================
+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
+ */
+#define HCRC_UPDATE(beg) \
+    do { \
+        if (s->gzhead->hcrc && s->pending > (beg)) \
+            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
+                                s->pending - (beg)); \
+    } while (0)
+
+/* ========================================================================= */
+int ZEXPORT deflate(strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Write the header */
+    if (s->status == INIT_STATE && s->wrap == 0)
+        s->status = BUSY_STATE;
+    if (s->status == INIT_STATE) {
+        /* zlib header */
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
+        uInt level_flags;
+
+        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+            level_flags = 0;
+        else if (s->level < 6)
+            level_flags = 1;
+        else if (s->level == 6)
+            level_flags = 2;
+        else
+            level_flags = 3;
+        header |= (level_flags << 6);
+        if (s->strstart != 0) header |= PRESET_DICT;
+        header += 31 - (header % 31);
+
+        putShortMSB(s, header);
+
+        /* Save the adler32 of the preset dictionary: */
+        if (s->strstart != 0) {
+            putShortMSB(s, (uInt)(strm->adler >> 16));
+            putShortMSB(s, (uInt)(strm->adler & 0xffff));
+        }
+        strm->adler = adler32(0L, Z_NULL, 0);
+        s->status = BUSY_STATE;
+
+        /* Compression must start with an empty pending buffer */
+        flush_pending(strm);
+        if (s->pending != 0) {
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
+#ifdef GZIP
+    if (s->status == GZIP_STATE) {
+        /* gzip header */
+        strm->adler = crc32(0L, Z_NULL, 0);
+        put_byte(s, 31);
+        put_byte(s, 139);
+        put_byte(s, 8);
+        if (s->gzhead == Z_NULL) {
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, OS_CODE);
+            s->status = BUSY_STATE;
+
+            /* Compression must start with an empty pending buffer */
+            flush_pending(strm);
+            if (s->pending != 0) {
+                s->last_flush = -1;
+                return Z_OK;
+            }
+        }
+        else {
+            put_byte(s, (s->gzhead->text ? 1 : 0) +
+                     (s->gzhead->hcrc ? 2 : 0) +
+                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                     (s->gzhead->name == Z_NULL ? 0 : 8) +
+                     (s->gzhead->comment == Z_NULL ? 0 : 16)
+                     );
+            put_byte(s, (Byte)(s->gzhead->time & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, s->gzhead->os & 0xff);
+            if (s->gzhead->extra != Z_NULL) {
+                put_byte(s, s->gzhead->extra_len & 0xff);
+                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+            }
+            if (s->gzhead->hcrc)
+                strm->adler = crc32(strm->adler, s->pending_buf,
+                                    s->pending);
+            s->gzindex = 0;
+            s->status = EXTRA_STATE;
+        }
+    }
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
+            while (s->pending + left > s->pending_buf_size) {
+                uInt copy = s->pending_buf_size - s->pending;
+                zmemcpy(s->pending_buf + s->pending,
+                        s->gzhead->extra + s->gzindex, copy);
+                s->pending = s->pending_buf_size;
+                HCRC_UPDATE(beg);
+                s->gzindex += copy;
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
+                }
+                beg = 0;
+                left -= copy;
+            }
+            zmemcpy(s->pending_buf + s->pending,
+                    s->gzhead->extra + s->gzindex, left);
+            s->pending += left;
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
+        }
+        s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    HCRC_UPDATE(beg);
+                    flush_pending(strm);
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
+                    }
+                    beg = 0;
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
+        }
+        s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    HCRC_UPDATE(beg);
+                    flush_pending(strm);
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
+                    }
+                    beg = 0;
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            HCRC_UPDATE(beg);
+        }
+        s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size) {
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
+                }
+            }
+            put_byte(s, (Byte)(strm->adler & 0xff));
+            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+            strm->adler = crc32(0L, Z_NULL, 0);
+        }
+        s->status = BUSY_STATE;
+
+        /* Compression must start with an empty pending buffer */
+        flush_pending(strm);
+        if (s->pending != 0) {
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
+#endif
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = s->level == 0 ? deflate_stored(s, flush) :
+                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                 (*(configuration_table[s->level].func))(s, flush);
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd(strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy(dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+
+
+    if (deflateStateCheck(source) || dest == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local unsigned read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init(s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                      /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = (int)s->prev_length;         /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len - 1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]     != scan_end  ||
+            match[best_len - 1] != scan_end1 ||
+            *match              != *scan     ||
+            *++match            != scan[1])      continue;
+
+        /* The check at best_len - 1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart + 258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan + best_len - 1);
+#else
+            scan_end1  = scan[best_len - 1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len - 1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart + 258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef ZLIB_DEBUG
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* ZLIB_DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    unsigned n;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize + MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+            if (s->insert > s->strstart)
+                s->insert = s->strstart;
+            slide_hash(s);
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* Maximum stored block length in deflate format (not including header). */
+#define MAX_STORED 65535
+
+/* Minimum of a and b. */
+#define MIN(a, b) ((a) > (b) ? (b) : (a))
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ *
+ * In case deflateParams() is used to later switch to a non-zero compression
+ * level, s->matches (otherwise unused when storing) keeps track of the number
+ * of hash table slides to perform. If s->matches is 1, then one hash table
+ * slide will be done when switching. If s->matches is 2, the maximum value
+ * allowed here, then the hash table will be cleared, since two or more slides
+ * is the same as a clear.
+ *
+ * deflate_stored() is written to minimize the number of times an input byte is
+ * copied. It is most efficient with large input and output buffers, which
+ * maximizes the opportunities to have a single copy from next_in to next_out.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Smallest worthy block size when not flushing or finishing. By default
+     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
+     * large input and output buffers, the stored block size will be larger.
+     */
+    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
+
+    /* Copy as many min_block or larger stored blocks directly to next_out as
+     * possible. If flushing, copy the remaining available input to next_out as
+     * stored blocks, if there is enough space.
+     */
+    unsigned len, left, have, last = 0;
+    unsigned used = s->strm->avail_in;
+    do {
+        /* Set len to the maximum size block that we can copy directly with the
+         * available input data and output space. Set left to how much of that
+         * would be copied from what's left in the window.
+         */
+        len = MAX_STORED;       /* maximum deflate stored block length */
+        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        if (s->strm->avail_out < have)          /* need room for header */
+            break;
+            /* maximum stored block length that will fit in avail_out: */
+        have = s->strm->avail_out - have;
+        left = s->strstart - s->block_start;    /* bytes left in window */
+        if (len > (ulg)left + s->strm->avail_in)
+            len = left + s->strm->avail_in;     /* limit len to the input */
+        if (len > have)
+            len = have;                         /* limit len to the output */
+
+        /* If the stored block would be less than min_block in length, or if
+         * unable to copy all of the available input when flushing, then try
+         * copying to the window and the pending buffer instead. Also don't
+         * write an empty block when flushing -- deflate() does that.
+         */
+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+                                flush == Z_NO_FLUSH ||
+                                len != left + s->strm->avail_in))
+            break;
+
+        /* Make a dummy stored block in pending to get the header bytes,
+         * including any pending bits. This also updates the debugging counts.
+         */
+        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
+        _tr_stored_block(s, (char *)0, 0L, last);
+
+        /* Replace the lengths in the dummy stored block with len. */
+        s->pending_buf[s->pending - 4] = len;
+        s->pending_buf[s->pending - 3] = len >> 8;
+        s->pending_buf[s->pending - 2] = ~len;
+        s->pending_buf[s->pending - 1] = ~len >> 8;
+
+        /* Write the stored block header bytes. */
+        flush_pending(s->strm);
+
+#ifdef ZLIB_DEBUG
+        /* Update debugging counts for the data about to be copied. */
+        s->compressed_len += len << 3;
+        s->bits_sent += len << 3;
+#endif
+
+        /* Copy uncompressed bytes from the window to next_out. */
+        if (left) {
+            if (left > len)
+                left = len;
+            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
+            s->strm->next_out += left;
+            s->strm->avail_out -= left;
+            s->strm->total_out += left;
+            s->block_start += left;
+            len -= left;
+        }
+
+        /* Copy uncompressed bytes directly from next_in to next_out, updating
+         * the check value.
+         */
+        if (len) {
+            read_buf(s->strm, s->strm->next_out, len);
+            s->strm->next_out += len;
+            s->strm->avail_out -= len;
+            s->strm->total_out += len;
+        }
+    } while (last == 0);
+
+    /* Update the sliding window with the last s->w_size bytes of the copied
+     * data, or append all of the copied data to the existing window if less
+     * than s->w_size bytes were copied. Also update the number of bytes to
+     * insert in the hash tables, in the event that deflateParams() switches to
+     * a non-zero compression level.
+     */
+    used -= s->strm->avail_in;      /* number of input bytes directly copied */
+    if (used) {
+        /* If any input was used, then no unused input remains in the window,
+         * therefore s->block_start == s->strstart.
+         */
+        if (used >= s->w_size) {    /* supplant the previous history */
+            s->matches = 2;         /* clear hash */
+            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
+            s->strstart = s->w_size;
+            s->insert = s->strstart;
+        }
+        else {
+            if (s->window_size - s->strstart <= used) {
+                /* Slide the window down. */
+                s->strstart -= s->w_size;
+                zmemcpy(s->window, s->window + s->w_size, s->strstart);
+                if (s->matches < 2)
+                    s->matches++;   /* add a pending slide_hash() */
+                if (s->insert > s->strstart)
+                    s->insert = s->strstart;
+            }
+            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
+            s->strstart += used;
+            s->insert += MIN(used, s->w_size - s->insert);
+        }
+        s->block_start = s->strstart;
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* If the last block was written to next_out, then done. */
+    if (last)
+        return finish_done;
+
+    /* If flushing and all input has been consumed, then done. */
+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        return block_done;
+
+    /* Fill the window with any remaining input. */
+    have = s->window_size - s->strstart;
+    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+        /* Slide the window down. */
+        s->block_start -= s->w_size;
+        s->strstart -= s->w_size;
+        zmemcpy(s->window, s->window + s->w_size, s->strstart);
+        if (s->matches < 2)
+            s->matches++;           /* add a pending slide_hash() */
+        have += s->w_size;          /* more space now */
+        if (s->insert > s->strstart)
+            s->insert = s->strstart;
+    }
+    if (have > s->strm->avail_in)
+        have = s->strm->avail_in;
+    if (have) {
+        read_buf(s->strm, s->window + s->strstart, have);
+        s->strstart += have;
+        s->insert += MIN(have, s->w_size - s->insert);
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* There was not enough avail_out to write a complete worthy or flushed
+     * stored block to next_out. Write a stored block to pending instead, if we
+     * have enough input for a worthy block, or if flushing and there is enough
+     * room for the remaining input as a stored block in the pending buffer.
+     */
+    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        /* maximum stored block length that will fit in pending: */
+    have = MIN(s->pending_buf_size - have, MAX_STORED);
+    min_block = MIN(have, s->w_size);
+    left = s->strstart - s->block_start;
+    if (left >= min_block ||
+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+         s->strm->avail_in == 0 && left <= have)) {
+        len = MIN(left, have);
+        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
+               len == left ? 1 : 0;
+        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
+        s->block_start += len;
+        flush_pending(s->strm);
+    }
+
+    /* We've done all we can with the available input and output. */
+    return last ? finish_started : need_more;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart + 2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart + 2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart - 1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length - 1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
+        s->match_available = 0;
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest run, plus one for the unrolled loop.
+         */
+        if (s->lookahead <= MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (uInt)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->sym_next)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
diff --git a/zlib/deflate.h b/extra/zlib/zlib-1.2.13/deflate.h
similarity index 78%
rename from zlib/deflate.h
rename to extra/zlib/zlib-1.2.13/deflate.h
index 05a5ab3a2c12..1a06cd5f25d1 100644
--- a/zlib/deflate.h
+++ b/extra/zlib/zlib-1.2.13/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2004 Jean-loup Gailly
+ * Copyright (C) 1995-2018 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,13 +48,19 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
-#define INIT_STATE    42
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
+#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
+#ifdef GZIP
+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
+#endif
+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
+#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
+#define FINISH_STATE 666    /* stream complete */
 /* Stream status */
 
 
@@ -80,7 +86,7 @@ typedef struct static_tree_desc_s  static_tree_desc;
 typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
+    const static_tree_desc *stat_desc;  /* the corresponding static tree */
 } FAR tree_desc;
 
 typedef ush Pos;
@@ -97,11 +103,11 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
+    ulg   pending;       /* nb of bytes in the pending buffer */
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    ulg   gzindex;       /* where in extra, name, or comment */
+    Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
@@ -188,7 +194,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -211,7 +217,7 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
-    uchf *l_buf;          /* buffer for literals or lengths */
+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -233,20 +239,15 @@ typedef struct internal_state {
      *   - I can't count above 4
      */
 
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
+    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
     ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
 #endif
@@ -260,12 +261,19 @@ typedef struct internal_state {
      * are always zero.
      */
 
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
 } FAR deflate_state;
 
 /* Output a byte on the stream.
  * IN assertion: there is enough room in pending_buf.
  */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
 
 
 #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
@@ -278,14 +286,19 @@ typedef struct internal_state {
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
         /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -294,33 +307,35 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
  * used.
  */
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
 #else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = cc; \
     s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
+  { uch len = (uch)(length); \
+    ush dist = (ush)(distance); \
+    s->sym_buf[s->sym_next++] = (uch)dist; \
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
+    s->sym_buf[s->sym_next++] = len; \
     dist--; \
     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
     s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
   }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
diff --git a/extra/zlib/zlib-1.2.13/gzclose.c b/extra/zlib/zlib-1.2.13/gzclose.c
new file mode 100644
index 000000000000..caeb99a3177f
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/gzclose.c
@@ -0,0 +1,25 @@
+/* gzclose.c -- zlib gzclose() function
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* gzclose() is in a separate file so that it is linked in only if it is used.
+   That way the other gzclose functions can be used instead to avoid linking in
+   unneeded compression or decompression routines. */
+int ZEXPORT gzclose(file)
+    gzFile file;
+{
+#ifndef NO_GZCOMPRESS
+    gz_statep state;
+
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
+#else
+    return gzclose_r(file);
+#endif
+}
diff --git a/extra/zlib/zlib-1.2.13/gzguts.h b/extra/zlib/zlib-1.2.13/gzguts.h
new file mode 100644
index 000000000000..57faf37165a3
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/gzguts.h
@@ -0,0 +1,219 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
+
+#ifndef _POSIX_SOURCE
+#  define _POSIX_SOURCE
+#endif
+#include <fcntl.h>
+
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#if defined(_WIN32)
+#  define WIDECHAR
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99), _snprintf does not guarantee
+   null termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#  define snprintf _snprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifndef NO_STRERROR
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
+    unsigned char *in;      /* input buffer (double-sized when writing) */
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
+        /* just for reading */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+    int reset;              /* true if a reset is pending after a Z_FINISH */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/extra/zlib/zlib-1.2.13/gzlib.c b/extra/zlib/zlib-1.2.13/gzlib.c
new file mode 100644
index 000000000000..55da46a453fd
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/gzlib.c
@@ -0,0 +1,639 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+#if defined(_WIN32) && !defined(__BORLANDC__)
+#  define LSEEK _lseeki64
+#else
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define LSEEK lseek64
+#else
+#  define LSEEK lseek
+#endif
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const void *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+   string and return a pointer to it.  Typically, the values for ERROR come
+   from GetLastError.
+
+   The string pointed to shall not be modified by the application, but may be
+   overwritten by a subsequent call to gz_strwinerror
+
+   The gz_strwinerror function does not change the current setting of
+   GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror(error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+    gz_statep state;
+{
+    state->x.have = 0;              /* no output data available */
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
+        state->how = LOOK;          /* look for gzip header */
+    }
+    else                            /* for writing ... */
+        state->reset = 0;           /* no deflateReset pending */
+    state->seek = 0;                /* no seek request pending */
+    gz_error(state, Z_OK, NULL);    /* clear error */
+    state->x.pos = 0;               /* no uncompressed data yet */
+    state->strm.avail_in = 0;       /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+    const void *path;
+    int fd;
+    const char *mode;
+{
+    gz_statep state;
+    z_size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
+
+    /* allocate gzFile structure to return */
+    state = (gz_statep)malloc(sizeof(gz_state));
+    if (state == NULL)
+        return NULL;
+    state->size = 0;            /* no buffers allocated yet */
+    state->want = GZBUFSIZE;    /* requested buffer size */
+    state->msg = NULL;          /* no error message yet */
+
+    /* interpret mode */
+    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
+    while (*mode) {
+        if (*mode >= '0' && *mode <= '9')
+            state->level = *mode - '0';
+        else
+            switch (*mode) {
+            case 'r':
+                state->mode = GZ_READ;
+                break;
+#ifndef NO_GZCOMPRESS
+            case 'w':
+                state->mode = GZ_WRITE;
+                break;
+            case 'a':
+                state->mode = GZ_APPEND;
+                break;
+#endif
+            case '+':       /* can't read and write at the same time */
+                free(state);
+                return NULL;
+            case 'b':       /* ignore -- will request binary anyway */
+                break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
+            case 'f':
+                state->strategy = Z_FILTERED;
+                break;
+            case 'h':
+                state->strategy = Z_HUFFMAN_ONLY;
+                break;
+            case 'R':
+                state->strategy = Z_RLE;
+                break;
+            case 'F':
+                state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
+            default:        /* could consider as an error, but just ignore */
+                ;
+            }
+        mode++;
+    }
+
+    /* must provide an "r", "w", or "a" */
+    if (state->mode == GZ_NONE) {
+        free(state);
+        return NULL;
+    }
+
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
+    /* save the path name for error messages */
+#ifdef WIDECHAR
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (z_size_t)-1)
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
+    if (state->path == NULL) {
+        free(state);
+        return NULL;
+    }
+#ifdef WIDECHAR
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
+#else
+        strcpy(state->path, path);
+#endif
+
+    /* compute the flags for open() */
+    oflag =
+#ifdef O_LARGEFILE
+        O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+        O_BINARY |
+#endif
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef WIDECHAR
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
+    if (state->fd == -1) {
+        free(state->path);
+        free(state);
+        return NULL;
+    }
+    if (state->mode == GZ_APPEND) {
+        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
+        state->mode = GZ_WRITE;         /* simplify later checks */
+    }
+
+    /* save the current position for rewinding (only if reading) */
+    if (state->mode == GZ_READ) {
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);
+        if (state->start == -1) state->start = 0;
+    }
+
+    /* initialize stream */
+    gz_reset(state);
+
+    /* return stream */
+    return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    char *path;         /* identifier for error messages */
+    gzFile gz;
+
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
+#else
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
+    gz = gz_open(path, fd, mode);
+    free(path);
+    return gz;
+}
+
+/* -- see zlib.h -- */
+#ifdef WIDECHAR
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+    gzFile file;
+    unsigned size;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* make sure we haven't already allocated memory */
+    if (state->size != 0)
+        return -1;
+
+    /* check and set requested size */
+    if ((size << 1) < size)
+        return -1;              /* need to be able to double it */
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
+    state->want = size;
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* back up and start over */
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+        return -1;
+    gz_reset(state);
+    return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+    gzFile file;
+    z_off64_t offset;
+    int whence;
+{
+    unsigned n;
+    z_off64_t ret;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* check that there's no error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* can only seek from start or relative to current position */
+    if (whence != SEEK_SET && whence != SEEK_CUR)
+        return -1;
+
+    /* normalize offset to a SEEK_CUR specification */
+    if (whence == SEEK_SET)
+        offset -= state->x.pos;
+    else if (state->seek)
+        offset += state->skip;
+    state->seek = 0;
+
+    /* if within raw area while reading, just go there */
+    if (state->mode == GZ_READ && state->how == COPY &&
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
+        if (ret == -1)
+            return -1;
+        state->x.have = 0;
+        state->eof = 0;
+        state->past = 0;
+        state->seek = 0;
+        gz_error(state, Z_OK, NULL);
+        state->strm.avail_in = 0;
+        state->x.pos += offset;
+        return state->x.pos;
+    }
+
+    /* calculate skip amount, rewinding if needed for back seek when reading */
+    if (offset < 0) {
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
+            return -1;
+        offset += state->x.pos;
+        if (offset < 0)                     /* before start of file! */
+            return -1;
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
+            return -1;
+    }
+
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */
+    if (state->mode == GZ_READ) {
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        offset -= n;
+    }
+
+    /* request skip (if not zero) */
+    if (offset) {
+        state->seek = 1;
+        state->skip = offset;
+    }
+    return state->x.pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    z_off64_t ret;
+
+    ret = gzseek64(file, (z_off64_t)offset, whence);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* return position */
+    return state->x.pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gztell64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+    gzFile file;
+{
+    z_off64_t offset;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* compute and return effective offset in file */
+    offset = LSEEK(state->fd, 0, SEEK_CUR);
+    if (offset == -1)
+        return -1;
+    if (state->mode == GZ_READ)             /* reading */
+        offset -= state->strm.avail_in;     /* don't count buffered input */
+    return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gzoffset64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return 0;
+
+    /* return end-of-file state */
+    return state->mode == GZ_READ ? state->past : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return NULL;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return NULL;
+
+    /* return error information */
+    if (errnum != NULL)
+        *errnum = state->err;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return;
+
+    /* clear error and end-of-file */
+    if (state->mode == GZ_READ) {
+        state->eof = 0;
+        state->past = 0;
+    }
+    gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+   state->msg accordingly.  Free any previous error message already there.  Do
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of
+   memory).  Simply save the error message as a static string.  If there is an
+   allocation failure constructing the error message, then convert the error to
+   out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+    gz_statep state;
+    int err;
+    const char *msg;
+{
+    /* free previously allocated message and clear */
+    if (state->msg != NULL) {
+        if (state->err != Z_MEM_ERROR)
+            free(state->msg);
+        state->msg = NULL;
+    }
+
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
+    /* set error code, and if no message, then done */
+    state->err = err;
+    if (msg == NULL)
+        return;
+
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
+        return;
+
+    /* construct error message with path */
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
+        state->err = Z_MEM_ERROR;
+        return;
+    }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+                   "%s%s%s", state->path, ": ", msg);
+#else
+    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
+#endif
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+   available) -- we need to do this to cover cases where 2's complement not
+   used, since C standard permits 1's complement and sign-bit representations,
+   otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+    unsigned p, q;
+
+    p = 1;
+    do {
+        q = p;
+        p <<= 1;
+        p++;
+    } while (p > q);
+    return q >> 1;
+}
+#endif
diff --git a/extra/zlib/zlib-1.2.13/gzread.c b/extra/zlib/zlib-1.2.13/gzread.c
new file mode 100644
index 000000000000..dd77381596cb
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/gzread.c
@@ -0,0 +1,650 @@
+/* gzread.c -- zlib functions for reading gzip files
+ * Copyright (C) 2004-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_look OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_fetch OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
+local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.
+   This function needs to loop on read(), since read() is not guaranteed to
+   read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+    gz_statep state;
+    unsigned char *buf;
+    unsigned len;
+    unsigned *have;
+{
+    int ret;
+    unsigned get, max = ((unsigned)-1 >> 2) + 1;
+
+    *have = 0;
+    do {
+        get = len - *have;
+        if (get > max)
+            get = max;
+        ret = read(state->fd, buf + *have, get);
+        if (ret <= 0)
+            break;
+        *have += (unsigned)ret;
+    } while (*have < len);
+    if (ret < 0) {
+        gz_error(state, Z_ERRNO, zstrerror());
+        return -1;
+    }
+    if (ret == 0)
+        state->eof = 1;
+    return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input
+   file is reached, even though there may be unused data in the buffer.  Once
+   that data has been used, no more attempts will be made to read the file.
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
+local int gz_avail(state)
+    gz_statep state;
+{
+    unsigned got;
+    z_streamp strm = &(state->strm);
+
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+    if (state->eof == 0) {
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
+            return -1;
+        strm->avail_in += got;
+        strm->next_in = state->in;
+    }
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
+   If this is the first time in, allocate required memory.  state->how will be
+   left unchanged if there is no more input data available, will be set to COPY
+   if there is no gzip header and direct copying will be performed, or it will
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    /* allocate read buffers and inflate memory */
+    if (state->size == 0) {
+        /* allocate buffers */
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
+        if (state->in == NULL || state->out == NULL) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        state->size = state->want;
+
+        /* allocate inflate memory */
+        state->strm.zalloc = Z_NULL;
+        state->strm.zfree = Z_NULL;
+        state->strm.opaque = Z_NULL;
+        state->strm.avail_in = 0;
+        state->strm.next_in = Z_NULL;
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
+            free(state->out);
+            free(state->in);
+            state->size = 0;
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
+        if (gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0)
+            return 0;
+    }
+
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
+    }
+
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
+    memcpy(state->x.next, strm->next_in, strm->avail_in);
+    state->x.have = strm->avail_in;
+    strm->avail_in = 0;
+    state->how = COPY;
+    state->direct = 1;
+    return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
+local int gz_decomp(state)
+    gz_statep state;
+{
+    int ret = Z_OK;
+    unsigned had;
+    z_streamp strm = &(state->strm);
+
+    /* fill output buffer up to end of deflate stream */
+    had = strm->avail_out;
+    do {
+        /* get more input for inflate() */
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0) {
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
+        }
+
+        /* decompress and handle errors */
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+            gz_error(state, Z_STREAM_ERROR,
+                     "internal error: inflate stream corrupt");
+            return -1;
+        }
+        if (ret == Z_MEM_ERROR) {
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            gz_error(state, Z_DATA_ERROR,
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
+            return -1;
+        }
+    } while (strm->avail_out && ret != Z_STREAM_END);
+
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
+
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
+
+    /* good decompression */
+    return 0;
+}
+
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
+   Data is either copied from the input file or decompressed from the input
+   file depending on state->how.  If state->how is LOOK, then a gzip header is
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
+            return 0;
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
+    return 0;
+}
+
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    unsigned n;
+
+    /* skip over len bytes or reach end-of-file, whichever comes first */
+    while (len)
+        /* skip over whatever is in output buffer */
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
+            len -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0)
+            break;
+
+        /* need more data to skip -- load up output buffer */
+        else {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return -1;
+        }
+    return 0;
+}
+
+/* Read len bytes into buf from file, or less than len up to the end of the
+   input.  Return the number of bytes read.  If zero is returned, either the
+   end of file was reached, or there was an error.  state->err must be
+   consulted in that case to determine which. */
+local z_size_t gz_read(state, buf, len)
+    gz_statep state;
+    voidp buf;
+    z_size_t len;
+{
+    z_size_t got;
+    unsigned n;
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* get len bytes to buf, or less than len if at the end */
+    got = 0;
+    do {
+        /* set n to the maximum amount of len that fits in an unsigned int */
+        n = (unsigned)-1;
+        if (n > len)
+            n = (unsigned)len;
+
+        /* first just try copying data from the output buffer */
+        if (state->x.have) {
+            if (state->x.have < n)
+                n = state->x.have;
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0) {
+            state->past = 1;        /* tried to read past end */
+            break;
+        }
+
+        /* need output data -- for small len or new stream load up our output
+           buffer */
+        else if (state->how == LOOK || n < (state->size << 1)) {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return 0;
+            continue;       /* no progress yet -- go back to copy above */
+            /* the copy above assures that we will leave with space in the
+               output buffer, allowing at least one gzungetc() to succeed */
+        }
+
+        /* large len -- read directly into user buffer */
+        else if (state->how == COPY) {      /* read directly */
+            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
+                return 0;
+        }
+
+        /* large len -- decompress directly into user buffer */
+        else {  /* state->how == GZIP */
+            state->strm.avail_out = n;
+            state->strm.next_out = (unsigned char *)buf;
+            if (gz_decomp(state) == -1)
+                return 0;
+            n = state->x.have;
+            state->x.have = 0;
+        }
+
+        /* update progress */
+        len -= n;
+        buf = (char *)buf + n;
+        got += n;
+        state->x.pos += n;
+    } while (len);
+
+    /* return number of bytes read into user buffer */
+    return got;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids a flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
+        return -1;
+    }
+
+    /* read len or fewer bytes to buf */
+    len = (unsigned)gz_read(state, buf, len);
+
+    /* check for an error */
+    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* return the number of bytes read (this is assured to fit in an int) */
+    return (int)len;
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfread(buf, size, nitems, file)
+    voidp buf;
+    z_size_t size;
+    z_size_t nitems;
+    gzFile file;
+{
+    z_size_t len;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return 0;
+
+    /* compute bytes to read -- error on overflow */
+    len = nitems * size;
+    if (size && len / size != nitems) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+        return 0;
+    }
+
+    /* read len or fewer bytes to buf, return the number of full items read */
+    return len ? gz_read(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#else
+#  undef gzgetc
+#endif
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    unsigned char buf[1];
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* try output buffer (no need to check for skip request) */
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
+    }
+
+    /* nothing there -- try gz_read() */
+    return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
+}
+
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* can't push EOF */
+    if (c < 0)
+        return -1;
+
+    /* if output buffer empty, put byte at end (allows more pushing) */
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
+        state->x.next[0] = (unsigned char)c;
+        state->x.pos--;
+        state->past = 0;
+        return c;
+    }
+
+    /* if no room, give up (must have already done a gzungetc()) */
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+        return -1;
+    }
+
+    /* slide output data if needed and insert byte before existing data */
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
+        unsigned char *dest = state->out + (state->size << 1);
+        while (src > state->out)
+            *--dest = *--src;
+        state->x.next = dest;
+    }
+    state->x.have++;
+    state->x.next--;
+    state->x.next[0] = (unsigned char)c;
+    state->x.pos--;
+    state->past = 0;
+    return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    unsigned left, n;
+    char *str;
+    unsigned char *eol;
+    gz_statep state;
+
+    /* check parameters and get internal structure */
+    if (file == NULL || buf == NULL || len < 1)
+        return NULL;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return NULL;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return NULL;
+    }
+
+    /* copy output bytes up to new line or len - 1, whichever comes first --
+       append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) */
+    str = buf;
+    left = (unsigned)len - 1;
+    if (left) do {
+        /* assure that something is in the output buffer */
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
+        }
+
+        /* look for end-of-line in current output buffer */
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+        if (eol != NULL)
+            n = (unsigned)(eol - state->x.next) + 1;
+
+        /* copy through end-of-line, or remainder if not found */
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        left -= n;
+        buf += n;
+    } while (left && eol == NULL);
+
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
+    buf[0] = 0;
+    return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* if the state is not known, but we can find out, then do so (this is
+       mainly for right after a gzopen() or gzdopen()) */
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
+
+    /* return 1 if transparent, 0 if processing a gzip stream */
+    return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+    gzFile file;
+{
+    int ret, err;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return Z_STREAM_ERROR;
+
+    /* free memory and close file */
+    if (state->size) {
+        inflateEnd(&(state->strm));
+        free(state->out);
+        free(state->in);
+    }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret = close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : err;
+}
diff --git a/extra/zlib/zlib-1.2.13/gzwrite.c b/extra/zlib/zlib-1.2.13/gzwrite.c
new file mode 100644
index 000000000000..eb8a0e5893ff
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/gzwrite.c
@@ -0,0 +1,677 @@
+/* gzwrite.c -- zlib functions for writing gzip files
+ * Copyright (C) 2004-2019 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
+local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
+
+/* Initialize state for writing a gzip file.  Mark initialization by setting
+   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
+   success. */
+local int gz_init(state)
+    gz_statep state;
+{
+    int ret;
+    z_streamp strm = &(state->strm);
+
+    /* allocate input buffer (double size for gzprintf) */
+    state->in = (unsigned char *)malloc(state->want << 1);
+    if (state->in == NULL) {
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        strm->next_in = NULL;
+    }
+
+    /* mark state as initialized */
+    state->size = state->want;
+
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
+    return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
+   Return -1 if there is an error writing to the output file or if gz_init()
+   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
+   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
+   reset to start a new gzip stream.  If gz->direct is true, then simply write
+   to the output file without compressing, and ignore flush. */
+local int gz_comp(state, flush)
+    gz_statep state;
+    int flush;
+{
+    int ret, writ;
+    unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
+    z_streamp strm = &(state->strm);
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return -1;
+
+    /* write directly if requested */
+    if (state->direct) {
+        while (strm->avail_in) {
+            put = strm->avail_in > max ? max : strm->avail_in;
+            writ = write(state->fd, strm->next_in, put);
+            if (writ < 0) {
+                gz_error(state, Z_ERRNO, zstrerror());
+                return -1;
+            }
+            strm->avail_in -= (unsigned)writ;
+            strm->next_in += writ;
+        }
+        return 0;
+    }
+
+    /* check for a pending reset */
+    if (state->reset) {
+        /* don't start a new gzip member unless there is data to write */
+        if (strm->avail_in == 0)
+            return 0;
+        deflateReset(strm);
+        state->reset = 0;
+    }
+
+    /* run deflate() on provided input until it produces no more output */
+    ret = Z_OK;
+    do {
+        /* write out current buffer contents if full, or if flushing, but if
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
+            while (strm->next_out > state->x.next) {
+                put = strm->next_out - state->x.next > (int)max ? max :
+                      (unsigned)(strm->next_out - state->x.next);
+                writ = write(state->fd, state->x.next, put);
+                if (writ < 0) {
+                    gz_error(state, Z_ERRNO, zstrerror());
+                    return -1;
+                }
+                state->x.next += writ;
+            }
+            if (strm->avail_out == 0) {
+                strm->avail_out = state->size;
+                strm->next_out = state->out;
+                state->x.next = state->out;
+            }
+        }
+
+        /* compress */
+        have = strm->avail_out;
+        ret = deflate(strm, flush);
+        if (ret == Z_STREAM_ERROR) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: deflate stream corrupt");
+            return -1;
+        }
+        have -= strm->avail_out;
+    } while (have);
+
+    /* if that completed a deflate stream, allow another to start */
+    if (flush == Z_FINISH)
+        state->reset = 1;
+
+    /* all done, no errors */
+    return 0;
+}
+
+/* Compress len zeros to output.  Return -1 on a write error or memory
+   allocation failure by gz_comp(), or 0 on success. */
+local int gz_zero(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    int first;
+    unsigned n;
+    z_streamp strm = &(state->strm);
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return -1;
+
+    /* compress len zeros (len guaranteed > 0) */
+    first = 1;
+    while (len) {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+            (unsigned)len : state->size;
+        if (first) {
+            memset(state->in, 0, n);
+            first = 0;
+        }
+        strm->avail_in = n;
+        strm->next_in = state->in;
+        state->x.pos += n;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return -1;
+        len -= n;
+    }
+    return 0;
+}
+
+/* Write len bytes from buf to file.  Return the number of bytes written.  If
+   the returned value is less than len, then there was an error. */
+local z_size_t gz_write(state, buf, len)
+    gz_statep state;
+    voidpc buf;
+    z_size_t len;
+{
+    z_size_t put = len;
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* for small len, copy to input buffer, otherwise compress directly */
+    if (len < state->size) {
+        /* copy to input buffer, compress when full */
+        do {
+            unsigned have, copy;
+
+            if (state->strm.avail_in == 0)
+                state->strm.next_in = state->in;
+            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
+                              state->in);
+            copy = state->size - have;
+            if (copy > len)
+                copy = (unsigned)len;
+            memcpy(state->in + have, buf, copy);
+            state->strm.avail_in += copy;
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+        } while (len);
+    }
+    else {
+        /* consume whatever's left in the input buffer */
+        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+
+        /* directly compress user buffer to file */
+        state->strm.next_in = (z_const Bytef *)buf;
+        do {
+            unsigned n = (unsigned)-1;
+            if (n > len)
+                n = (unsigned)len;
+            state->strm.avail_in = n;
+            state->x.pos += n;
+            if (gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+            len -= n;
+        } while (len);
+    }
+
+    /* input was all buffered or compressed */
+    return put;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+    gzFile file;
+    voidpc buf;
+    unsigned len;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids a flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        return 0;
+    }
+
+    /* write len bytes from buf (the return value will fit in an int) */
+    return (int)gz_write(state, buf, len);
+}
+
+/* -- see zlib.h -- */
+z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
+    voidpc buf;
+    z_size_t size;
+    z_size_t nitems;
+    gzFile file;
+{
+    z_size_t len;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* compute bytes to read -- error on overflow */
+    len = nitems * size;
+    if (size && len / size != nitems) {
+        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
+        return 0;
+    }
+
+    /* write len bytes to buf, return the number of full items written */
+    return len ? gz_write(state, buf, len) / size : 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned have;
+    unsigned char buf[1];
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* try writing to input buffer for speed (state->size == 0 if buffer not
+       initialized) */
+    if (state->size) {
+        if (strm->avail_in == 0)
+            strm->next_in = state->in;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
+            state->in[have] = (unsigned char)c;
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
+    }
+
+    /* no room in buffer or not initialized, use gz_write() */
+    buf[0] = (unsigned char)c;
+    if (gz_write(state, buf, 1) != 1)
+        return -1;
+    return c & 0xff;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, s)
+    gzFile file;
+    const char *s;
+{
+    z_size_t len, put;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* write string */
+    len = strlen(s);
+    if ((int)len < 0 || (unsigned)len != len) {
+        gz_error(state, Z_STREAM_ERROR, "string length does not fit in int");
+        return -1;
+    }
+    put = gz_write(state, s, len);
+    return put < len ? -1 : (int)len;
+}
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
+{
+    int len;
+    unsigned left;
+    char *next;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return state->err;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* do the printf() into the input buffer, put length in len -- the input
+       buffer is double-sized just for this function, so there is guaranteed to
+       be state->size bytes available after the current contents */
+    if (strm->avail_in == 0)
+        strm->next_in = state->in;
+    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
+    next[state->size - 1] = 0;
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+    (void)vsprintf(next, format, va);
+    for (len = 0; len < state->size; len++)
+        if (next[len] == 0) break;
+#  else
+    len = vsprintf(next, format, va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf(next, state->size, format, va);
+    len = strlen(next);
+#  else
+    len = vsnprintf(next, state->size, format, va);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, compress first half if past that */
+    strm->avail_in += (unsigned)len;
+    state->x.pos += len;
+    if (strm->avail_in >= state->size) {
+        left = strm->avail_in - state->size;
+        strm->avail_in = state->size;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return state->err;
+        memmove(state->in, state->in + state->size, left);
+        strm->next_in = state->in;
+        strm->avail_in = left;
+    }
+    return len;
+}
+
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf(file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    unsigned len, left;
+    char *next;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
+        return Z_STREAM_ERROR;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return state->error;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->error;
+    }
+
+    /* do the printf() into the input buffer, put length in len -- the input
+       buffer is double-sized just for this function, so there is guaranteed to
+       be state->size bytes available after the current contents */
+    if (strm->avail_in == 0)
+        strm->next_in = state->in;
+    next = (char *)(strm->next_in + strm->avail_in);
+    next[state->size - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+    sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
+            a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < size; len++)
+        if (next[len] == 0)
+            break;
+#  else
+    len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
+                  a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
+             a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen(next);
+#  else
+    len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                   a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len == 0 || len >= state->size || next[state->size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, compress first half if past that */
+    strm->avail_in += len;
+    state->x.pos += len;
+    if (strm->avail_in >= state->size) {
+        left = strm->avail_in - state->size;
+        strm->avail_in = state->size;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return state->err;
+        memmove(state->in, state->in + state->size, left);
+        strm->next_in = state->in;
+        strm->avail_in = left;
+    }
+    return (int)len;
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+    gzFile file;
+    int flush;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* check flush parameter */
+    if (flush < 0 || flush > Z_FINISH)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* compress remaining data with requested flush */
+    (void)gz_comp(state, flush);
+    return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* if no change is requested, then do nothing */
+    if (level == state->level && strategy == state->strategy)
+        return Z_OK;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return state->err;
+    }
+
+    /* change compression parameters for subsequent input */
+    if (state->size) {
+        /* flush previous input with previous parameters before changing */
+        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
+            return state->err;
+        deflateParams(strm, level, strategy);
+    }
+    state->level = level;
+    state->strategy = strategy;
+    return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+    gzFile file;
+{
+    int ret = Z_OK;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing */
+    if (state->mode != GZ_WRITE)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
+    }
+
+    /* flush, free memory, and close file */
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
+    free(state);
+    return ret;
+}
diff --git a/zlib/infback.c b/extra/zlib/zlib-1.2.13/infback.c
similarity index 86%
rename from zlib/infback.c
rename to extra/zlib/zlib-1.2.13/infback.c
index 455dbc9ee843..babeaf1806f9 100644
--- a/zlib/infback.c
+++ b/extra/zlib/zlib-1.2.13/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,21 +42,31 @@ int stream_size;
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
     state->dmax = 32768U;
-    state->wbits = windowBits;
+    state->wbits = (uInt)windowBits;
     state->wsize = 1U << windowBits;
     state->window = window;
-    state->write = 0;
+    state->wnext = 0;
     state->whave = 0;
+    state->sane = 1;
     return Z_OK;
 }
 
@@ -246,14 +256,14 @@ out_func out;
 void FAR *out_desc;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
     unsigned bits;              /* bits in bit buffer */
     unsigned copy;              /* number of stored or match bytes to copy */
     unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
+    code here;                  /* current decoding table entry */
     code last;                  /* parent table entry */
     unsigned len;               /* length to copy for repeats, bits to drop */
     int ret;                    /* return code */
@@ -389,19 +399,18 @@ void FAR *out_desc;
             state->have = 0;
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
                     PULLBYTE();
                 }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
                 }
                 else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
                         if (state->have == 0) {
                             strm->msg = (char *)"invalid bit length repeat";
                             state->mode = BAD;
@@ -411,16 +420,16 @@ void FAR *out_desc;
                         copy = 3 + BITS(2);
                         DROPBITS(2);
                     }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 3 + BITS(3);
                         DROPBITS(3);
                     }
                     else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
                         len = 0;
                         copy = 11 + BITS(7);
                         DROPBITS(7);
@@ -438,7 +447,16 @@ void FAR *out_desc;
             /* handle error breaks in while */
             if (state->mode == BAD) break;
 
-            /* build code tables */
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);
             state->lenbits = 9;
@@ -460,6 +478,7 @@ void FAR *out_desc;
             }
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN;
+                /* fallthrough */
 
         case LEN:
             /* use inflate_fast() if we have enough input and output */
@@ -474,28 +493,28 @@ void FAR *out_desc;
 
             /* get a literal, length, or end-of-block code */
             for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->lencode[last.val +
+                    here = state->lencode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
             }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
 
             /* process literal */
-            if (this.op == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                         "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
+                        "inflate:         literal 0x%02x\n", here.val));
                 ROOM();
                 *put++ = (unsigned char)(state->length);
                 left--;
@@ -504,21 +523,21 @@ void FAR *out_desc;
             }
 
             /* process end of block */
-            if (this.op & 32) {
+            if (here.op & 32) {
                 Tracevv((stderr, "inflate:         end of block\n"));
                 state->mode = TYPE;
                 break;
             }
 
             /* invalid code */
-            if (this.op & 64) {
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
 
             /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
+            state->extra = (unsigned)(here.op) & 15;
             if (state->extra != 0) {
                 NEEDBITS(state->extra);
                 state->length += BITS(state->extra);
@@ -528,30 +547,30 @@ void FAR *out_desc;
 
             /* get distance code */
             for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
                 PULLBYTE();
             }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
+            if ((here.op & 0xf0) == 0) {
+                last = here;
                 for (;;) {
-                    this = state->distcode[last.val +
+                    here = state->distcode[last.val +
                             (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                     PULLBYTE();
                 }
                 DROPBITS(last.bits);
             }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
+            DROPBITS(here.bits);
+            if (here.op & 64) {
                 strm->msg = (char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
-            state->offset = (unsigned)this.val;
+            state->offset = (unsigned)here.val;
 
             /* get distance extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
+            state->extra = (unsigned)(here.op) & 15;
             if (state->extra != 0) {
                 NEEDBITS(state->extra);
                 state->offset += BITS(state->extra);
@@ -587,25 +606,27 @@ void FAR *out_desc;
             break;
 
         case DONE:
-            /* inflate stream terminated properly -- write leftover output */
+            /* inflate stream terminated properly */
             ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
             goto inf_leave;
 
         case BAD:
             ret = Z_DATA_ERROR;
             goto inf_leave;
 
-        default:                /* can't happen, but makes compilers happy */
+        default:
+            /* can't happen, but makes compilers happy */
             ret = Z_STREAM_ERROR;
             goto inf_leave;
         }
 
-    /* Return unused input */
+    /* Write leftover output and return unused input */
   inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
     strm->next_in = next;
     strm->avail_in = have;
     return ret;
diff --git a/extra/zlib/zlib-1.2.13/inffast.c b/extra/zlib/zlib-1.2.13/inffast.c
new file mode 100644
index 000000000000..1fec7f363fa6
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/inffast.c
@@ -0,0 +1,323 @@
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code const *here;           /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+        }
+        here = lcode + (hold & lmask);
+      dolen:
+        op = (unsigned)(here->bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here->op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here->val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+            }
+            here = dcode + (hold & dmask);
+          dodist:
+            op = (unsigned)(here->bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here->op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here->val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(*in++) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                *out++ = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            *out++ = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                *out++ = *from++;
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window;
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = window;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
+                                    *out++ = *from++;
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        len -= 3;
+                    }
+                    if (len) {
+                        *out++ = *from++;
+                        if (len > 1)
+                            *out++ = *from++;
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        *out++ = *from++;
+                        if (len > 1)
+                            *out++ = *from++;
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode + here->val + (hold & ((1U << op) - 1));
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode + here->val + (hold & ((1U << op) - 1));
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in;
+    strm->next_out = out;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/extra/zlib/zlib-1.2.13/inffast.h b/extra/zlib/zlib-1.2.13/inffast.h
new file mode 100644
index 000000000000..e5c1aa4ca8cd
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/inffast.h
@@ -0,0 +1,11 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/zlib/inffixed.h b/extra/zlib/zlib-1.2.13/inffixed.h
similarity index 96%
rename from zlib/inffixed.h
rename to extra/zlib/zlib-1.2.13/inffixed.h
index 75ed4b5978de..d62832776948 100644
--- a/zlib/inffixed.h
+++ b/extra/zlib/zlib-1.2.13/inffixed.h
@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {
diff --git a/extra/zlib/zlib-1.2.13/inflate.c b/extra/zlib/zlib-1.2.13/inflate.c
new file mode 100644
index 000000000000..8acbef44e993
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/inflate.c
@@ -0,0 +1,1595 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local int inflateStateCheck OF((z_streamp strm));
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
+                              unsigned len));
+
+local int inflateStateCheck(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+        state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
+int ZEXPORT inflateResetKeep(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->flags = -1;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 5;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
+    state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += (unsigned)value << state->bits;
+    state->bits += (uInt)bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, end, copy)
+z_streamp strm;
+const Bytef *end;
+unsigned copy;
+{
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE_CHECK(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                if (state->wbits == 0)
+                    state->wbits = 15;
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            if (len > 15 || len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+                /* fallthrough */
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+                /* fallthrough */
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+                /* fallthrough */
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+                /* fallthrough */
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+                /* fallthrough */
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+                /* fallthrough */
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+                /* fallthrough */
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+                /* fallthrough */
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+                /* fallthrough */
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case COPY_:
+            state->mode = COPY;
+                /* fallthrough */
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+                /* fallthrough */
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+                /* fallthrough */
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case LEN_:
+            state->mode = LEN;
+                /* fallthrough */
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+                /* fallthrough */
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+                /* fallthrough */
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+                /* fallthrough */
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+                /* fallthrough */
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if ((state->wrap & 4) && out)
+                    strm->adler = state->check =
+                        UPDATE_CHECK(state->check, put - out, out);
+                out = left;
+                if ((state->wrap & 4) && (
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+                /* fallthrough */
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+                /* fallthrough */
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+                /* fallthrough */
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if ((state->wrap & 4) && out)
+        strm->adler = state->check =
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+const unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (inflateStateCheck(source) || dest == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
+    return Z_OK;
+#else
+    (void)subvert;
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+int ZEXPORT inflateValidate(strm, check)
+z_streamp strm;
+int check;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check && state->wrap)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm))
+        return -(1L << 16);
+    state = (struct inflate_state FAR *)strm->state;
+    return (long)(((unsigned long)((long)state->back)) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
+
+unsigned long ZEXPORT inflateCodesUsed(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}
diff --git a/zlib/inflate.h b/extra/zlib/zlib-1.2.13/inflate.h
similarity index 77%
rename from zlib/inflate.h
rename to extra/zlib/zlib-1.2.13/inflate.h
index 07bd3e78a7c7..f127b6b1fa5f 100644
--- a/zlib/inflate.h
+++ b/extra/zlib/zlib-1.2.13/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2004 Mark Adler
+ * Copyright (C) 1995-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,7 +18,7 @@
 
 /* Possible inflate modes between inflate() calls */
 typedef enum {
-    HEAD,       /* i: waiting for magic header */
+    HEAD = 16180,   /* i: waiting for magic header */
     FLAGS,      /* i: waiting for method and flags (gzip) */
     TIME,       /* i: waiting for modification time (gzip) */
     OS,         /* i: waiting for extra flags and operating system (gzip) */
@@ -32,11 +32,13 @@ typedef enum {
         TYPE,       /* i: waiting for type bits, including last-flag bit */
         TYPEDO,     /* i: same, but skip check to exit inflate on new block */
         STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
         COPY,       /* i/o: waiting for input or output to copy stored block */
         TABLE,      /* i: waiting for dynamic block table lengths */
         LENLENS,    /* i: waiting for code length code lengths */
         CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN,        /* i: waiting for length/lit code */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
             LENEXT,     /* i: waiting for length extra bits */
             DIST,       /* i: waiting for distance code */
             DISTEXT,    /* i: waiting for distance extra bits */
@@ -53,19 +55,21 @@ typedef enum {
 /*
     State transitions between above modes -
 
-    (most modes can go to the BAD or MEM mode -- not shown for clarity)
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
 
     Process header:
-        HEAD -> (gzip) or (zlib)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
-        NAME -> COMMENT -> HCRC -> TYPE
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
         (zlib) -> DICTID or TYPE
         DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
     Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or CHECK
-            STORED -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
                 LEN -> LENEXT or LIT or TYPE
                 LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
                 LIT -> LEN
@@ -73,13 +77,17 @@ typedef enum {
         CHECK -> LENGTH -> DONE
  */
 
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+   including the allocated sliding window, which is up to 32K bytes. */
 struct inflate_state {
+    z_streamp strm;             /* pointer back to this zlib stream */
     inflate_mode mode;          /* current inflate mode */
     int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
+                                   bit 2 true to validate check value */
     int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
+    int flags;                  /* gzip header method and flags, 0 if zlib, or
+                                   -1 if raw or no header yet */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
     unsigned long check;        /* protected copy of check value */
     unsigned long total;        /* protected copy of output count */
@@ -88,7 +96,7 @@ struct inflate_state {
     unsigned wbits;             /* log base 2 of requested window size */
     unsigned wsize;             /* window size or zero if not using window */
     unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
+    unsigned wnext;             /* window write index */
     unsigned char FAR *window;  /* allocated sliding window, if needed */
         /* bit accumulator */
     unsigned long hold;         /* input bit accumulator */
@@ -112,4 +120,7 @@ struct inflate_state {
     unsigned short lens[320];   /* temporary storage for code lengths */
     unsigned short work[288];   /* work area for code table building */
     code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
 };
diff --git a/zlib/inftrees.c b/extra/zlib/zlib-1.2.13/inftrees.c
similarity index 79%
rename from zlib/inftrees.c
rename to extra/zlib/zlib-1.2.13/inftrees.c
index 8a9c13ff03d8..57d2793bec93 100644
--- a/zlib/inftrees.c
+++ b/extra/zlib/zlib-1.2.13/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
+   " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,7 +29,7 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int inflate_table(type, lens, codes, table, bits, work)
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
 unsigned codes;
@@ -50,11 +50,11 @@ unsigned short FAR *work;
     unsigned fill;              /* index for replicating entries */
     unsigned low;               /* low bits for current root entry */
     unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
+    code here;                  /* table entry for duplication */
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
+    unsigned match;             /* use base and extra for symbol >= match */
     unsigned short count[MAXBITS+1];    /* number of codes of each length */
     unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -115,15 +115,15 @@ unsigned short FAR *work;
         if (count[max] != 0) break;
     if (root > max) root = max;
     if (max == 0) {                     /* no symbols to code at all */
-        this.op = (unsigned char)64;    /* invalid code marker */
-        this.bits = (unsigned char)1;
-        this.val = (unsigned short)0;
-        *(*table)++ = this;             /* make a table to force an error */
-        *(*table)++ = this;
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
         *bits = 1;
         return 0;     /* no symbols, but wait for decoding to report error */
     }
-    for (min = 1; min <= MAXBITS; min++)
+    for (min = 1; min < max; min++)
         if (count[min] != 0) break;
     if (root < min) root = min;
 
@@ -166,11 +166,10 @@ unsigned short FAR *work;
        entered in the tables.
 
        used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked when a LENS table is being made
-       against the space in *table, ENOUGH, minus the maximum space needed by
-       the worst case distance code, MAXD.  This should never happen, but the
-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
-       This assumes that when type == LENS, bits == 9.
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
 
        sym increments through all symbols, and the loop terminates when
        all codes of length max, i.e. all codes, have been processed.  This
@@ -182,19 +181,17 @@ unsigned short FAR *work;
     switch (type) {
     case CODES:
         base = extra = work;    /* dummy value--not used */
-        end = 19;
+        match = 20;
         break;
     case LENS:
         base = lbase;
-        base -= 257;
         extra = lext;
-        extra -= 257;
-        end = 256;
+        match = 257;
         break;
-    default:            /* DISTS */
+    default:    /* DISTS */
         base = dbase;
         extra = dext;
-        end = -1;
+        match = 0;
     }
 
     /* initialize state for loop */
@@ -209,24 +206,25 @@ unsigned short FAR *work;
     mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
-    if (type == LENS && used >= ENOUGH - MAXD)
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
         return 1;
 
     /* process all codes and make table entries */
     for (;;) {
         /* create table entry */
-        this.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
+        here.bits = (unsigned char)(len - drop);
+        if (work[sym] + 1U < match) {
+            here.op = (unsigned char)0;
+            here.val = work[sym];
         }
-        else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
+        else if (work[sym] >= match) {
+            here.op = (unsigned char)(extra[work[sym] - match]);
+            here.val = base[work[sym] - match];
         }
         else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
         }
 
         /* replicate for those indices with low len bits equal to huff */
@@ -235,7 +233,7 @@ unsigned short FAR *work;
         min = fill;                 /* save offset to next table */
         do {
             fill -= incr;
-            next[(huff >> drop) + fill] = this;
+            next[(huff >> drop) + fill] = here;
         } while (fill != 0);
 
         /* backwards increment the len-bit code huff */
@@ -277,7 +275,8 @@ unsigned short FAR *work;
 
             /* check for enough space */
             used += 1U << curr;
-            if (type == LENS && used >= ENOUGH - MAXD)
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
                 return 1;
 
             /* point entry in root table to sub-table */
@@ -288,38 +287,14 @@ unsigned short FAR *work;
         }
     }
 
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
     }
 
     /* set return parameters */
diff --git a/extra/zlib/zlib-1.2.13/inftrees.h b/extra/zlib/zlib-1.2.13/inftrees.h
new file mode 100644
index 000000000000..f53665311c16
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/inftrees.h
@@ -0,0 +1,62 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/extra/zlib/zlib-1.2.13/make_vms.com b/extra/zlib/zlib-1.2.13/make_vms.com
new file mode 100644
index 000000000000..4dc8a8913559
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/make_vms.com
@@ -0,0 +1,867 @@
+$! make libz under VMS written by
+$! Martin P.J. Zinser
+$!
+$! In case of problems with the install you might contact me at
+$! zinser@zinser.no-ip.info(preferred) or
+$! martin.zinser@eurexchange.com (work)
+$!
+$! Make procedure history for Zlib
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20060120 First version to receive a number
+$! 0.02 20061008 Adapt to new Makefile.in
+$! 0.03 20091224 Add support for large file check
+$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
+$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
+$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new examples
+$!               subdir path, update module search in makefile.in
+$! 0.07 20120115 Triggered by work done by Alexey Chupahin completely redesigned
+$!               shared image creation
+$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
+$!               image
+$! 0.09 20120305 SMS.  P1 sets builder ("MMK", "MMS", " " (built-in)).
+$!               "" -> automatic, preference: MMK, MMS, built-in.
+$!
+$ on error then goto err_exit
+$!
+$ true  = 1
+$ false = 0
+$ tmpnam = "temp_" + f$getjpi("","pid")
+$ tt = tmpnam + ".txt"
+$ tc = tmpnam + ".c"
+$ th = tmpnam + ".h"
+$ define/nolog tconfig 'th'
+$ its_decc = false
+$ its_vaxc = false
+$ its_gnuc = false
+$ s_case   = False
+$!
+$! Setup variables holding "config" information
+$!
+$ Make    = "''p1'"
+$ name     = "Zlib"
+$ version  = "?.?.?"
+$ v_string = "ZLIB_VERSION"
+$ v_file   = "zlib.h"
+$ ccopt   = "/include = []"
+$ lopts   = ""
+$ dnsrl   = ""
+$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
+$ conf_check_string = ""
+$ linkonly = false
+$ optfile  = name + ".opt"
+$ mapfile  = name + ".map"
+$ libdefs  = ""
+$ vax      = f$getsyi("HW_MODEL").lt.1024
+$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
+$ ia64     = f$getsyi("HW_MODEL").ge.4096
+$!
+$! 2012-03-05 SMS.
+$! Why is this needed?  And if it is needed, why not simply ".not. vax"?
+$!
+$!!! if axp .or. ia64 then  set proc/parse=extended
+$!
+$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
+$ mydef  = F$parse(whoami,,,"DEVICE")
+$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
+$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
+$!
+$! Check for MMK/MMS
+$!
+$ if (Make .eqs. "")
+$ then
+$   If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
+$   If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
+$ else
+$   Make = f$edit( Make, "trim")
+$ endif
+$!
+$ gosub find_version
+$!
+$  open/write topt tmp.opt
+$  open/write optf 'optfile'
+$!
+$ gosub check_opts
+$!
+$! Look for the compiler used
+$!
+$ gosub check_compiler
+$ close topt
+$ close optf
+$!
+$ if its_decc
+$ then
+$   ccopt = "/prefix=all" + ccopt
+$   if f$trnlnm("SYS") .eqs. ""
+$   then
+$     if axp
+$     then
+$       define sys sys$library:
+$     else
+$       ccopt = "/decc" + ccopt
+$       define sys decc$library_include:
+$     endif
+$   endif
+$!
+$! 2012-03-05 SMS.
+$! Why /NAMES = AS_IS?  Why not simply ".not. vax"?  And why not on VAX?
+$!
+$   if axp .or. ia64
+$   then
+$       ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
+$       s_case = true
+$   endif
+$ endif
+$ if its_vaxc .or. its_gnuc
+$ then
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ endif
+$!
+$! Build a fake configure input header
+$!
+$ open/write conf_hin config.hin
+$ write conf_hin "#undef _LARGEFILE64_SOURCE"
+$ close conf_hin
+$!
+$!
+$ i = 0
+$FIND_ACONF:
+$ fname = f$element(i,"#",aconf_in_file)
+$ if fname .eqs. "#" then goto AMISS_ERR
+$ if f$search(fname) .eqs. ""
+$ then
+$   i = i + 1
+$   goto find_aconf
+$ endif
+$ open/read/err=aconf_err aconf_in 'fname'
+$ open/write aconf zconf.h
+$ACONF_LOOP:
+$ read/end_of_file=aconf_exit aconf_in line
+$ work = f$edit(line, "compress,trim")
+$ if f$extract(0,6,work) .nes. "#undef"
+$ then
+$   if f$extract(0,12,work) .nes. "#cmakedefine"
+$   then
+$       write aconf line
+$   endif
+$ else
+$   cdef = f$element(1," ",work)
+$   gosub check_config
+$ endif
+$ goto aconf_loop
+$ACONF_EXIT:
+$ write aconf ""
+$ write aconf "/* VMS specifics added by make_vms.com: */"
+$ write aconf "#define VMS 1"
+$ write aconf "#include <unistd.h>"
+$ write aconf "#include <unixio.h>"
+$ write aconf "#ifdef _LARGEFILE"
+$ write aconf "# define off64_t __off64_t"
+$ write aconf "# define fopen64 fopen"
+$ write aconf "# define fseeko64 fseeko"
+$ write aconf "# define lseek64 lseek"
+$ write aconf "# define ftello64 ftell"
+$ write aconf "#endif"
+$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
+$ write aconf "# define HAVE_VSNPRINTF"
+$ write aconf "#endif"
+$ close aconf_in
+$ close aconf
+$ if f$search("''th'") .nes. "" then delete 'th';*
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if make.eqs.""
+$ then
+$   if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
+$   if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflate.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
+                gzclose.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
+                gzlib.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
+                gzread.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
+                gzwrite.c zutil.h zlib.h zconf.h
+$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
+                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" -
+                [.test]example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   write sys$output "Building minigzip..."
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" -
+              [.test]minigzip.c zlib.h zconf.h
+$   call make minigzip.exe -
+              "LINK minigzip,libz.olb/lib" -
+              minigzip.obj libz.olb
+$ else
+$   gosub crea_mms
+$   write sys$output "Make ''name' ''version' with ''Make' "
+$   'make'
+$ endif
+$!
+$! Create shareable image
+$!
+$ gosub crea_olist
+$ write sys$output "Creating libzshr.exe"
+$ call map_2_shopt 'mapfile' 'optfile'
+$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
+$ write sys$output "Zlib build completed"
+$ delete/nolog tmp.opt;*
+$ exit
+$AMISS_ERR:
+$ write sys$output "No source for config.hin found."
+$ write sys$output "Tried any of ''aconf_in_file'"
+$ goto err_exit
+$CC_ERR:
+$ write sys$output "C compiler required to build ''name'"
+$ goto err_exit
+$ERR_EXIT:
+$ set message/facil/ident/sever/text
+$ close/nolog optf
+$ close/nolog topt
+$ close/nolog aconf_in
+$ close/nolog aconf
+$ close/nolog out
+$ close/nolog min
+$ close/nolog mod
+$ close/nolog h_in
+$ write sys$output "Exiting..."
+$ exit 2
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Check command line options and set symbols accordingly
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20041206 First version to receive a number
+$! 0.02 20060126 Add new "HELP" target
+$ CHECK_OPTS:
+$ i = 1
+$ OPT_LOOP:
+$ if i .lt. 9
+$ then
+$   cparm = f$edit(p'i',"upcase")
+$!
+$! Check if parameter actually contains something
+$!
+$   if f$edit(cparm,"trim") .nes. ""
+$   then
+$     if cparm .eqs. "DEBUG"
+$     then
+$       ccopt = ccopt + "/noopt/deb"
+$       lopts = lopts + "/deb"
+$     endif
+$     if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       ccopt = ccopt + f$extract(start,len,cparm)
+$       if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+          then s_case = true
+$     endif
+$     if cparm .eqs. "LINK" then linkonly = true
+$     if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       lopts = lopts + f$extract(start,len,cparm)
+$     endif
+$     if f$locate("CC=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       cc_com = f$extract(start,len,cparm)
+        if (cc_com .nes. "DECC") .and. -
+           (cc_com .nes. "VAXC") .and. -
+           (cc_com .nes. "GNUC")
+$       then
+$         write sys$output "Unsupported compiler choice ''cc_com' ignored"
+$         write sys$output "Use DECC, VAXC, or GNUC instead"
+$       else
+$         if cc_com .eqs. "DECC" then its_decc = true
+$         if cc_com .eqs. "VAXC" then its_vaxc = true
+$         if cc_com .eqs. "GNUC" then its_gnuc = true
+$       endif
+$     endif
+$     if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       mmks = f$extract(start,len,cparm)
+$       if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$       then
+$         make = mmks
+$       else
+$         write sys$output "Unsupported make choice ''mmks' ignored"
+$         write sys$output "Use MMK or MMS instead"
+$       endif
+$     endif
+$     if cparm .eqs. "HELP" then gosub bhelp
+$   endif
+$   i = i + 1
+$   goto opt_loop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Look for the compiler used
+$!
+$! Version history
+$! 0.01 20040223 First version to receive a number
+$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
+$! 0.03 20060202 Extend handling of GNU C
+$! 0.04 20090402 Compaq -> hp
+$CHECK_COMPILER:
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then
+$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
+$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
+$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
+$ endif
+$!
+$! Exit if no compiler available
+$!
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then goto CC_ERR
+$ else
+$   if its_decc
+$   then
+$     write sys$output "CC compiler check ... hp C"
+$     if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
+$     then
+$       dnrsl = f$trnlnm("decc$no_rooted_search_lists")
+$     endif
+$     define/nolog decc$no_rooted_search_lists 1
+$   else
+$     if its_vaxc then write sys$output "CC compiler check ... VAX C"
+$     if its_gnuc
+$     then
+$         write sys$output "CC compiler check ... GNU C"
+$         if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib"
+$         if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib"
+$         cc = "gcc"
+$     endif
+$     if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
+$     if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! If MMS/MMK are available dump out the descrip.mms if required
+$!
+$CREA_MMS:
+$ write sys$output "Creating descrip.mms..."
+$ create descrip.mms
+$ open/append out descrip.mms
+$ copy sys$input: out
+$ deck
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser
+# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
+       gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
+       inftrees.obj, inffast.obj
+
+$ eod
+$ write out "CFLAGS=", ccopt
+$ write out "LOPTS=", lopts
+$ write out "all : example.exe minigzip.exe libz.olb"
+$ copy sys$input: out
+$ deck
+        @ write sys$output " Example applications available"
+
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link $(LOPTS) example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link $(LOPTS) minigzip,libz.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
+
+
+# Other dependencies.
+adler32.obj  : adler32.c zutil.h zlib.h zconf.h
+compress.obj : compress.c zlib.h zconf.h
+crc32.obj    : crc32.c zutil.h zlib.h zconf.h
+deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
+example.obj  : [.test]example.c zlib.h zconf.h
+gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
+gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
+gzread.obj   : gzread.c zutil.h zlib.h zconf.h
+gzwrite.obj  : gzwrite.c zutil.h zlib.h zconf.h
+inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
+inflate.obj  : inflate.c zutil.h zlib.h zconf.h
+inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
+minigzip.obj : [.test]minigzip.c zlib.h zconf.h
+trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
+uncompr.obj  : uncompr.c zlib.h zconf.h
+zutil.obj    : zutil.c zutil.h zlib.h zconf.h
+infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ eod
+$ close out
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Read list of core library sources from makefile.in and create options
+$! needed to build shareable image
+$!
+$CREA_OLIST:
+$ open/read min makefile.in
+$ open/write mod modules.opt
+$ src_check_list = "OBJZ =#OBJG ="
+$MRLOOP:
+$ read/end=mrdone min rec
+$ i = 0
+$SRC_CHECK_LOOP:
+$ src_check = f$element(i, "#", src_check_list)
+$ i = i+1
+$ if src_check .eqs. "#" then goto mrloop
+$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
+$ rec = rec - src_check
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
+$MRSLOOP:
+$ read/end=mrdone min rec
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
+$MRDONE:
+$ close min
+$ close mod
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Take record extracted in crea_olist and split it into single filenames
+$!
+$EXTRA_FILNAM:
+$ myrec = f$edit(rec - "\", "trim,compress")
+$ i = 0
+$FELOOP:
+$ srcfil = f$element(i," ", myrec)
+$ if (srcfil .nes. " ")
+$ then
+$   write mod f$parse(srcfil,,,"NAME"), ".obj"
+$   i = i + 1
+$   goto feloop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Find current Zlib version number
+$!
+$FIND_VERSION:
+$ open/read h_in 'v_file'
+$hloop:
+$ read/end=hdone h_in rec
+$ rec = f$edit(rec,"TRIM")
+$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
+$ rec = f$edit(rec - "#", "TRIM")
+$ if f$element(0," ",rec) .nes. "define" then goto hloop
+$ if f$element(1," ",rec) .eqs. v_string
+$ then
+$   version = 'f$element(2," ",rec)'
+$   goto hdone
+$ endif
+$ goto hloop
+$hdone:
+$ close h_in
+$ return
+$!------------------------------------------------------------------------------
+$!
+$CHECK_CONFIG:
+$!
+$ in_ldef = f$locate(cdef,libdefs)
+$ if (in_ldef .lt. f$length(libdefs))
+$ then
+$   write aconf "#define ''cdef' 1"
+$   libdefs = f$extract(0,in_ldef,libdefs) + -
+              f$extract(in_ldef + f$length(cdef) + 1, -
+                        f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
+                        libdefs)
+$ else
+$   if (f$type('cdef') .eqs. "INTEGER")
+$   then
+$     write aconf "#define ''cdef' ", 'cdef'
+$   else
+$     if (f$type('cdef') .eqs. "STRING")
+$     then
+$       write aconf "#define ''cdef' ", """", '''cdef'', """"
+$     else
+$       gosub check_cc_def
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check if this is a define relating to the properties of the C/C++
+$! compiler
+$!
+$ CHECK_CC_DEF:
+$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
+$ then
+$   copy sys$input: 'tc'
+$   deck
+#include "tconfig"
+#define _LARGEFILE
+#include <stdio.h>
+
+int main(){
+FILE *fp;
+  fp = fopen("temp.txt","r");
+  fseeko(fp,1,SEEK_SET);
+  fclose(fp);
+}
+
+$   eod
+$   test_inv = false
+$   comm_h = false
+$   gosub cc_prop_check
+$   return
+$ endif
+$ write aconf "/* ", line, " */"
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler
+$!
+$! Version history
+$! 0.01 20031020 First version to receive a number
+$! 0.02 20031022 Added logic for defines with value
+$! 0.03 20040309 Make sure local config file gets not deleted
+$! 0.04 20041230 Also write include for configure run
+$! 0.05 20050103 Add processing of "comment defines"
+$CC_PROP_CHECK:
+$ cc_prop = true
+$ is_need = false
+$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
+$ if f$search(th) .eqs. "" then create 'th'
+$ set message/nofac/noident/nosever/notext
+$ on error then continue
+$ cc 'tmpnam'
+$ if .not. ($status)  then cc_prop = false
+$ on error then continue
+$! The headers might lie about the capabilities of the RTL
+$ link 'tmpnam',tmp.opt/opt
+$ if .not. ($status)  then cc_prop = false
+$ set message/fac/ident/sever/text
+$ on error then goto err_exit
+$ delete/nolog 'tmpnam'.*;*/exclude='th'
+$ if (cc_prop .and. .not. is_need) .or. -
+     (.not. cc_prop .and. is_need)
+$ then
+$   write sys$output "Checking for ''cdef'... yes"
+$   if f$type('cdef_val'_yes) .nes. ""
+$   then
+$     if f$type('cdef_val'_yes) .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
+$   else
+$     call write_config f$fao("#define !AS 1",cdef)
+$   endif
+$   if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
+       (cdef .eqs. "_LARGEFILE64_SOURCE") then -
+      call write_config f$string("#define _LARGEFILE 1")
+$ else
+$   write sys$output "Checking for ''cdef'... no"
+$   if (comm_h)
+$   then
+      call write_config f$fao("/* !AS */",line)
+$   else
+$     if f$type('cdef_val'_no) .nes. ""
+$     then
+$       if f$type('cdef_val'_no) .eqs. "INTEGER" -
+           then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
+$       if f$type('cdef_val'_no) .eqs. "STRING" -
+           then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
+$     else
+$       call write_config f$fao("#undef !AS",cdef)
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler with multiple result values
+$!
+$! Version history
+$! 0.01 20040127 First version
+$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
+$CC_MPROP_CHECK:
+$ cc_prop = true
+$ i    = 1
+$ idel = 1
+$ MT_LOOP:
+$ if f$type(result_'i') .eqs. "STRING"
+$ then
+$   set message/nofac/noident/nosever/notext
+$   on error then continue
+$   cc 'tmpnam'_'i'
+$   if .not. ($status)  then cc_prop = false
+$   on error then continue
+$! The headers might lie about the capabilities of the RTL
+$   link 'tmpnam'_'i',tmp.opt/opt
+$   if .not. ($status)  then cc_prop = false
+$   set message/fac/ident/sever/text
+$   on error then goto err_exit
+$   delete/nolog 'tmpnam'_'i'.*;*
+$   if (cc_prop)
+$   then
+$     write sys$output "Checking for ''cdef'... ", mdef_'i'
+$     if f$type(mdef_'i') .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
+$     goto msym_clean
+$   else
+$     i = i + 1
+$     goto mt_loop
+$   endif
+$ endif
+$ write sys$output "Checking for ''cdef'... no"
+$ call write_config f$fao("#undef !AS",cdef)
+$ MSYM_CLEAN:
+$ if (idel .le. msym_max)
+$ then
+$   delete/sym mdef_'idel'
+$   idel = idel + 1
+$   goto msym_clean
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Write configuration to both permanent and temporary config file
+$!
+$! Version history
+$! 0.01 20031029 First version to receive a number
+$!
+$WRITE_CONFIG: SUBROUTINE
+$  write aconf 'p1'
+$  open/append confh 'th'
+$  write confh 'p1'
+$  close confh
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Analyze the project map file and create the symbol vector for a shareable
+$! image from it
+$!
+$! Version history
+$! 0.01 20120128 First version
+$! 0.02 20120226 Add pre-load logic
+$!
+$ MAP_2_SHOPT: Subroutine
+$!
+$ SAY := "WRITE_ SYS$OUTPUT"
+$!
+$ IF F$SEARCH("''P1'") .EQS. ""
+$ THEN
+$    SAY "MAP_2_SHOPT-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
+$    goto exit_m2s
+$ ENDIF
+$ IF "''P2'" .EQS. ""
+$ THEN
+$    SAY "MAP_2_SHOPT:  Error, no output file provided"
+$    goto exit_m2s
+$ ENDIF
+$!
+$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
+$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
+$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
+$ module4 = "inflateSync#uncompress#zlibVersion#compress"
+$ open/read map 'p1
+$ if axp .or. ia64
+$ then
+$     open/write aopt a.opt
+$     open/write bopt b.opt
+$     write aopt " CASE_SENSITIVE=YES"
+$     write bopt "SYMBOL_VECTOR= (-"
+$     mod_sym_num = 1
+$ MOD_SYM_LOOP:
+$     if f$type(module'mod_sym_num') .nes. ""
+$     then
+$         mod_in = 0
+$ MOD_SYM_IN:
+$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$         if shared_proc .nes. "#"
+$         then
+$             write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+        		       f$edit(shared_proc,"upcase"),shared_proc)
+$             write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$             mod_in = mod_in + 1
+$             goto mod_sym_in
+$         endif
+$         mod_sym_num = mod_sym_num + 1
+$         goto mod_sym_loop
+$     endif
+$MAP_LOOP:
+$     read/end=map_end map line
+$     if (f$locate("{",line).lt. f$length(line)) .or. -
+         (f$locate("global:", line) .lt. f$length(line))
+$     then
+$         proc = true
+$         goto map_loop
+$     endif
+$     if f$locate("}",line).lt. f$length(line) then proc = false
+$     if f$locate("local:", line) .lt. f$length(line) then proc = false
+$     if proc
+$     then
+$         shared_proc = f$edit(line,"collapse")
+$         chop_semi = f$locate(";", shared_proc)
+$         if chop_semi .lt. f$length(shared_proc) then -
+              shared_proc = f$extract(0, chop_semi, shared_proc)
+$         write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+        			 f$edit(shared_proc,"upcase"),shared_proc)
+$         write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$     endif
+$     goto map_loop
+$MAP_END:
+$     close/nolog aopt
+$     close/nolog bopt
+$     open/append libopt 'p2'
+$     open/read aopt a.opt
+$     open/read bopt b.opt
+$ALOOP:
+$     read/end=aloop_end aopt line
+$     write libopt line
+$     goto aloop
+$ALOOP_END:
+$     close/nolog aopt
+$     sv = ""
+$BLOOP:
+$     read/end=bloop_end bopt svn
+$     if (svn.nes."")
+$     then
+$        if (sv.nes."") then write libopt sv
+$        sv = svn
+$     endif
+$     goto bloop
+$BLOOP_END:
+$     write libopt f$extract(0,f$length(sv)-2,sv), "-"
+$     write libopt ")"
+$     close/nolog bopt
+$     delete/nolog/noconf a.opt;*,b.opt;*
+$ else
+$     if vax
+$     then
+$     open/append libopt 'p2'
+$     mod_sym_num = 1
+$ VMOD_SYM_LOOP:
+$     if f$type(module'mod_sym_num') .nes. ""
+$     then
+$         mod_in = 0
+$ VMOD_SYM_IN:
+$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$         if shared_proc .nes. "#"
+$         then
+$     	      write libopt f$fao("UNIVERSAL=!AS",-
+      	  			     f$edit(shared_proc,"upcase"))
+$             mod_in = mod_in + 1
+$             goto vmod_sym_in
+$         endif
+$         mod_sym_num = mod_sym_num + 1
+$         goto vmod_sym_loop
+$     endif
+$VMAP_LOOP:
+$     	  read/end=vmap_end map line
+$     	  if (f$locate("{",line).lt. f$length(line)) .or. -
+   	      (f$locate("global:", line) .lt. f$length(line))
+$     	  then
+$     	      proc = true
+$     	      goto vmap_loop
+$     	  endif
+$     	  if f$locate("}",line).lt. f$length(line) then proc = false
+$     	  if f$locate("local:", line) .lt. f$length(line) then proc = false
+$     	  if proc
+$     	  then
+$     	      shared_proc = f$edit(line,"collapse")
+$     	      chop_semi = f$locate(";", shared_proc)
+$     	      if chop_semi .lt. f$length(shared_proc) then -
+      	  	  shared_proc = f$extract(0, chop_semi, shared_proc)
+$     	      write libopt f$fao("UNIVERSAL=!AS",-
+      	  			     f$edit(shared_proc,"upcase"))
+$     	  endif
+$     	  goto vmap_loop
+$VMAP_END:
+$     else
+$         write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
+$         write sys$output "No options file created"
+$     endif
+$ endif
+$ EXIT_M2S:
+$ close/nolog map
+$ close/nolog libopt
+$ endsubroutine
diff --git a/extra/zlib/zlib-1.2.13/msdos/Makefile.bor b/extra/zlib/zlib-1.2.13/msdos/Makefile.bor
new file mode 100644
index 000000000000..3d12a2c25270
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/msdos/Makefile.bor
@@ -0,0 +1,115 @@
+# Makefile for zlib
+# Borland C++
+# Last updated: 15-Mar-2003
+
+# To use, do "make -fmakefile.bor"
+# To compile in small model, set below: MODEL=s
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to the LOC macro below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------ Turbo C++, Borland C++ ------------
+
+#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
+#    to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+# type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+CPU_TYP = 0
+
+# memory model: one of s, m, c, l (small, medium, compact, large)
+MODEL=l
+
+# replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
+CC=bcc
+LD=bcc
+AR=tlib
+
+# compiler flags
+# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
+CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
+
+LDFLAGS=-m$(MODEL) -f-
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: test/example.c zlib.h zconf.h
+
+minigzip.obj: test/minigzip.c zlib.h zconf.h
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/extra/zlib/zlib-1.2.13/msdos/Makefile.dj2 b/extra/zlib/zlib-1.2.13/msdos/Makefile.dj2
new file mode 100644
index 000000000000..59d2037d69c4
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/msdos/Makefile.dj2
@@ -0,0 +1,104 @@
+# Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.dj2;  make test -fmakefile.dj2
+#
+# To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
+#
+#    make install -fmakefile.dj2
+#
+# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
+# in the sample below if the pattern of the DJGPP distribution is to
+# be followed.  Remember that, while <sp>'es around <=> are ignored in
+# makefiles, they are *not* in batch files or in djgpp.env.
+# - - - - -
+# [make]
+# INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
+# LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
+# BUTT=-m486
+# - - - - -
+# Alternately, these variables may be defined below, overriding the values
+# in djgpp.env, as
+# INCLUDE_PATH=c:\usr\include
+# LIBRARY_PATH=c:\usr\lib
+
+CC=gcc
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DZLIB_DEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lz
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=libz.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+OBJA =
+# to use the asm code: make OBJA=match.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+check: test
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+libz.a: $(OBJS) $(OBJA)
+	$(AR) $@ $(OBJS) $(OBJA)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
+
+.PHONY : uninstall clean
+
+install: $(INCL) $(LIBS)
+	-@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
+	-@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
+	$(INSTALL) zlib.h $(INCLUDE_PATH)
+	$(INSTALL) zconf.h $(INCLUDE_PATH)
+	$(INSTALL) libz.a $(LIBRARY_PATH)
+
+uninstall:
+	$(RM) $(INCLUDE_PATH)\zlib.h
+	$(RM) $(INCLUDE_PATH)\zconf.h
+	$(RM) $(LIBRARY_PATH)\libz.a
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) libz.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/extra/zlib/zlib-1.2.13/msdos/Makefile.emx b/extra/zlib/zlib-1.2.13/msdos/Makefile.emx
new file mode 100644
index 000000000000..e30f67bed68e
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/msdos/Makefile.emx
@@ -0,0 +1,69 @@
+# Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
+
+CC=gcc
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DZLIB_DEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lzlib
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=zlib.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+zlib.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+
+.PHONY : clean
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) zlib.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/extra/zlib/zlib-1.2.13/msdos/Makefile.msc b/extra/zlib/zlib-1.2.13/msdos/Makefile.msc
new file mode 100644
index 000000000000..ae8378615ec6
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/msdos/Makefile.msc
@@ -0,0 +1,112 @@
+# Makefile for zlib
+# Microsoft C 5.1 or later
+# Last updated: 19-Mar-2003
+
+# To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=S
+
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to the LOC macro below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------- Microsoft C 5.1 and later -------------
+
+#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
+#    to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+CPU_TYP = 0
+
+# Memory model: one of S, M, C, L (small, medium, compact, large)
+MODEL=L
+
+CC=cl
+CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
+#-Ox generates bad code with MSC 5.1
+LIB_CFLAGS=-Zl $(CFLAGS)
+
+LD=link
+LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
+# "/farcall/packcode" are only useful for `large code' memory models
+# but should be a "no-op" for small code models.
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+
+
+# targets
+all:  $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(LIB_CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: test/example.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+minigzip.obj: test/minigzip.c zlib.h zconf.h
+	$(CC) -c $(CFLAGS) $*.c
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	if exist $(ZLIB_LIB) del $(ZLIB_LIB)
+	lib $(ZLIB_LIB) $(OBJ1);
+	lib $(ZLIB_LIB) $(OBJ2);
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB);
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB);
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del *.map
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/extra/zlib/zlib-1.2.13/msdos/Makefile.tc b/extra/zlib/zlib-1.2.13/msdos/Makefile.tc
new file mode 100644
index 000000000000..5aec82a9d58c
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/msdos/Makefile.tc
@@ -0,0 +1,100 @@
+# Makefile for zlib
+# Turbo C 2.01, Turbo C++ 1.01
+# Last updated: 15-Mar-2003
+
+# To use, do "make -fmakefile.tc"
+# To compile in small model, set below: MODEL=s
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------ Turbo C 2.01, Turbo C++ 1.01 ------------
+MODEL=l
+CC=tcc
+LD=tcc
+AR=tlib
+# CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+CFLAGS=-O2 -G -Z -m$(MODEL)
+LDFLAGS=-m$(MODEL) -f-
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: test/example.c zlib.h zconf.h
+
+minigzip.obj: test/minigzip.c zlib.h zconf.h
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del zlib_*.bak
+	-del foo.gz
diff --git a/extra/zlib/zlib-1.2.13/old/Makefile.emx b/extra/zlib/zlib-1.2.13/old/Makefile.emx
new file mode 100644
index 000000000000..612b03791583
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/Makefile.emx
@@ -0,0 +1,69 @@
+# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
+# Copyright (C) 1995-1998 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type:
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
+
+CC=gcc -Zwin32
+
+#CFLAGS=-MMD -O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-MMD -g -DZLIB_DEBUG
+CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+             -Wstrict-prototypes -Wmissing-prototypes
+
+# If cp.exe is available, replace "copy /Y" with "cp -fp" .
+CP=copy /Y
+# If gnu install.exe is available, replace $(CP) with ginstall.
+INSTALL=$(CP)
+# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+RM=del
+LDLIBS=-L. -lzlib
+LD=$(CC) -s -o
+LDSHARED=$(CC)
+
+INCL=zlib.h zconf.h
+LIBS=zlib.a
+
+AR=ar rcs
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example.exe minigzip.exe
+
+test: all
+	./example
+	echo hello world | .\minigzip | .\minigzip -d
+
+%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+zlib.a: $(OBJS)
+	$(AR) $@ $(OBJS)
+
+%.exe : %.o $(LIBS)
+	$(LD) $@ $< $(LDLIBS)
+
+
+.PHONY : clean
+
+clean:
+	$(RM) *.d
+	$(RM) *.o
+	$(RM) *.exe
+	$(RM) zlib.a
+	$(RM) foo.gz
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
diff --git a/extra/zlib/zlib-1.2.13/old/Makefile.riscos b/extra/zlib/zlib-1.2.13/old/Makefile.riscos
new file mode 100644
index 000000000000..57e29d3fba91
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/Makefile.riscos
@@ -0,0 +1,151 @@
+# Project:   zlib_1_03
+# Patched for zlib 1.1.2 rw@shadow.org.uk 19980430
+# test works out-of-the-box, installs `somewhere' on demand
+
+# Toolflags:
+CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah
+C++flags = -c -depend !Depend -IC: -throwback
+Linkflags = -aif -c++ -o $@
+ObjAsmflags = -throwback -NoCache -depend !Depend
+CMHGflags =
+LibFileflags = -c -l -o $@
+Squeezeflags = -o $@
+
+# change the line below to where _you_ want the library installed.
+libdest = lib:zlib
+
+# Final targets:
+@.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
+        @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
+        @.o.uncompr @.o.zutil
+        LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
+        @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
+        @.o.trees @.o.uncompr @.o.zutil
+test:   @.minigzip @.example @.lib
+	@copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
+	@echo running tests: hang on.
+	@/@.minigzip -f -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -f -1 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -h -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -h -1 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -9 libc
+	@/@.minigzip -d libc-gz
+	@/@.minigzip -1 libc
+	@/@.minigzip -d libc-gz
+	@diff @.lib @.libc
+	@echo that should have reported '@.lib and @.libc identical' if you have diff.
+	@/@.example @.fred @.fred
+	@echo that will have given lots of hello!'s.
+
+@.minigzip:   @.o.minigzip @.lib C:o.Stubs
+        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs
+@.example:   @.o.example @.lib C:o.Stubs
+        Link $(Linkflags) @.o.example @.lib C:o.Stubs
+
+install: @.lib
+	cdir $(libdest)
+	cdir $(libdest).h
+	@copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV
+	@copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV
+	@copy @.lib $(libdest).lib  A~C~DF~L~N~P~Q~RS~TV
+	@echo okay, installed zlib in $(libdest)
+
+clean:; remove @.minigzip
+	remove @.example
+	remove @.libc
+	-wipe @.o.* F~r~cV
+	remove @.fred
+
+# User-editable dependencies:
+.c.o:
+        cc $(ccflags) -o $@ $<
+
+# Static dependencies:
+
+# Dynamic dependencies:
+o.example:	c.example
+o.example:	h.zlib
+o.example:	h.zconf
+o.minigzip:	c.minigzip
+o.minigzip:	h.zlib
+o.minigzip:	h.zconf
+o.adler32:	c.adler32
+o.adler32:	h.zlib
+o.adler32:	h.zconf
+o.compress:	c.compress
+o.compress:	h.zlib
+o.compress:	h.zconf
+o.crc32:	c.crc32
+o.crc32:	h.zlib
+o.crc32:	h.zconf
+o.deflate:	c.deflate
+o.deflate:	h.deflate
+o.deflate:	h.zutil
+o.deflate:	h.zlib
+o.deflate:	h.zconf
+o.gzio:	c.gzio
+o.gzio:	h.zutil
+o.gzio:	h.zlib
+o.gzio:	h.zconf
+o.infblock:	c.infblock
+o.infblock:	h.zutil
+o.infblock:	h.zlib
+o.infblock:	h.zconf
+o.infblock:	h.infblock
+o.infblock:	h.inftrees
+o.infblock:	h.infcodes
+o.infblock:	h.infutil
+o.infcodes:	c.infcodes
+o.infcodes:	h.zutil
+o.infcodes:	h.zlib
+o.infcodes:	h.zconf
+o.infcodes:	h.inftrees
+o.infcodes:	h.infblock
+o.infcodes:	h.infcodes
+o.infcodes:	h.infutil
+o.infcodes:	h.inffast
+o.inffast:	c.inffast
+o.inffast:	h.zutil
+o.inffast:	h.zlib
+o.inffast:	h.zconf
+o.inffast:	h.inftrees
+o.inffast:	h.infblock
+o.inffast:	h.infcodes
+o.inffast:	h.infutil
+o.inffast:	h.inffast
+o.inflate:	c.inflate
+o.inflate:	h.zutil
+o.inflate:	h.zlib
+o.inflate:	h.zconf
+o.inflate:	h.infblock
+o.inftrees:	c.inftrees
+o.inftrees:	h.zutil
+o.inftrees:	h.zlib
+o.inftrees:	h.zconf
+o.inftrees:	h.inftrees
+o.inftrees:	h.inffixed
+o.infutil:	c.infutil
+o.infutil:	h.zutil
+o.infutil:	h.zlib
+o.infutil:	h.zconf
+o.infutil:	h.infblock
+o.infutil:	h.inftrees
+o.infutil:	h.infcodes
+o.infutil:	h.infutil
+o.trees:	c.trees
+o.trees:	h.deflate
+o.trees:	h.zutil
+o.trees:	h.zlib
+o.trees:	h.zconf
+o.trees:	h.trees
+o.uncompr:	c.uncompr
+o.uncompr:	h.zlib
+o.uncompr:	h.zconf
+o.zutil:	c.zutil
+o.zutil:	h.zutil
+o.zutil:	h.zlib
+o.zutil:	h.zconf
diff --git a/extra/zlib/zlib-1.2.13/old/README b/extra/zlib/zlib-1.2.13/old/README
new file mode 100644
index 000000000000..800bf079827b
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/README
@@ -0,0 +1,3 @@
+This directory contains files that have not been updated for zlib 1.2.x
+
+(Volunteers are encouraged to help clean this up.  Thanks.)
diff --git a/extra/zlib/zlib-1.2.13/old/descrip.mms b/extra/zlib/zlib-1.2.13/old/descrip.mms
new file mode 100644
index 000000000000..7066da5b557e
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/descrip.mms
@@ -0,0 +1,48 @@
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser <m.zinser@gsi.de>
+
+cc_defs =
+c_deb =
+
+.ifdef __DECC__
+pref = /prefix=all
+.endif
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
+       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
+
+CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
+
+all : example.exe minigzip.exe
+        @ write sys$output " Example applications available"
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*
+
+
+# Other dependencies.
+adler32.obj : zutil.h zlib.h zconf.h
+compress.obj : zlib.h zconf.h
+crc32.obj : zutil.h zlib.h zconf.h
+deflate.obj : deflate.h zutil.h zlib.h zconf.h
+example.obj : zlib.h zconf.h
+gzio.obj : zutil.h zlib.h zconf.h
+infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.obj : zutil.h zlib.h zconf.h infblock.h
+inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
+infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.obj : zlib.h zconf.h
+trees.obj : deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : zlib.h zconf.h
+zutil.obj : zutil.h zlib.h zconf.h
diff --git a/extra/zlib/zlib-1.2.13/old/os2/Makefile.os2 b/extra/zlib/zlib-1.2.13/old/os2/Makefile.os2
new file mode 100644
index 000000000000..bb426c0d8e68
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/os2/Makefile.os2
@@ -0,0 +1,136 @@
+# Makefile for zlib under OS/2 using GCC (PGCC)
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+#   cp Makefile.os2 ..
+#   cd ..
+#   make -f Makefile.os2 test
+
+# This makefile will build a static library z.lib, a shared library
+# z.dll and a import library zdll.lib. You can use either z.lib or
+# zdll.lib by specifying either -lz or -lzdll on gcc's command line
+
+CC=gcc -Zomf -s
+
+CFLAGS=-O6 -Wall
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DZLIB_DEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+#################### BUG WARNING: #####################
+## infcodes.c hits a bug in pgcc-1.0, so you have to use either
+## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem)
+## This bug is reportedly fixed in pgcc >1.0, but this was not tested
+CFLAGS+=-fno-force-mem
+
+LDFLAGS=-s -L. -lzdll -Zcrtdll
+LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll
+
+VER=1.1.0
+ZLIB=z.lib
+SHAREDLIB=z.dll
+SHAREDLIBIMP=zdll.lib
+LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
+
+AR=emxomfar cr
+IMPLIB=emximp
+RANLIB=echo
+TAR=tar
+SHELL=bash
+
+prefix=/usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
+  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
+  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
+  contrib/asm386/*.asm contrib/asm386/*.c \
+  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
+  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
+  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
+
+all: example.exe minigzip.exe
+
+test: all
+	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+	echo hello world | ./minigzip | ./minigzip -d || \
+	  echo '		*** minigzip test FAILED ***' ; \
+	if ./example; then \
+	  echo '		*** zlib test OK ***'; \
+	else \
+	  echo '		*** zlib test FAILED ***'; \
+	fi
+
+$(ZLIB): $(OBJS)
+	$(AR) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+$(SHAREDLIB): $(OBJS) os2/z.def
+	$(LDSHARED) -o $@ $^
+
+$(SHAREDLIBIMP): os2/z.def
+	$(IMPLIB) -o $@ $^
+
+example.exe: example.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip.exe: minigzip.o $(LIBS)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+
+distclean:	clean
+
+zip:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	rm -f test.c ztest*.c
+	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	zip -ul9 zlib$$v $(DISTFILES)
+	mv Makefile~ Makefile
+
+dist:
+	mv Makefile Makefile~; cp -p Makefile.in Makefile
+	rm -f test.c ztest*.c
+	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
+	rm -f $$d.tar.gz; \
+	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
+	files=""; \
+	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
+	cd ..; \
+	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
+	if test ! -d $$d; then rm -f $$d; fi
+	mv Makefile~ Makefile
+
+tags:
+	etags *.[ch]
+
+depend:
+	makedepend -- $(CFLAGS) -- *.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
+infcodes.o: zutil.h zlib.h zconf.h
+infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h
+inffast.o: infblock.h infcodes.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/extra/zlib/zlib-1.2.13/old/os2/zlib.def b/extra/zlib/zlib-1.2.13/old/os2/zlib.def
new file mode 100644
index 000000000000..4c753f1a3b99
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/os2/zlib.def
@@ -0,0 +1,51 @@
+;
+; Slightly modified version of ../nt/zlib.dnt :-)
+;
+
+LIBRARY		Z
+DESCRIPTION	"Zlib compression library for OS/2"
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE MULTIPLE
+
+EXPORTS
+    adler32
+    compress
+    crc32
+    deflate
+    deflateCopy
+    deflateEnd
+    deflateInit2_
+    deflateInit_
+    deflateParams
+    deflateReset
+    deflateSetDictionary
+    gzclose
+    gzdopen
+    gzerror
+    gzflush
+    gzopen
+    gzread
+    gzwrite
+    inflate
+    inflateEnd
+    inflateInit2_
+    inflateInit_
+    inflateReset
+    inflateSetDictionary
+    inflateSync
+    uncompress
+    zlibVersion
+    gzprintf
+    gzputc
+    gzgetc
+    gzseek
+    gzrewind
+    gztell
+    gzeof
+    gzsetparams
+    zError
+    inflateSyncPoint
+    get_crc_table
+    compress2
+    gzputs
+    gzgets
diff --git a/extra/zlib/zlib-1.2.13/old/visual-basic.txt b/extra/zlib/zlib-1.2.13/old/visual-basic.txt
new file mode 100644
index 000000000000..57efe58124ee
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/old/visual-basic.txt
@@ -0,0 +1,160 @@
+See below some functions declarations for Visual Basic.
+
+Frequently Asked Question:
+
+Q: Each time I use the compress function I get the -5 error (not enough
+   room in the output buffer).
+
+A: Make sure that the length of the compressed buffer is passed by
+   reference ("as any"), not by value ("as long"). Also check that
+   before the call of compress this length is equal to the total size of
+   the compressed buffer and not zero.
+
+
+From: "Jon Caruana" <jon-net@usa.net>
+Subject: Re: How to port zlib declares to vb?
+Date: Mon, 28 Oct 1996 18:33:03 -0600
+
+Got the answer! (I haven't had time to check this but it's what I got, and
+looks correct):
+
+He has the following routines working:
+        compress
+        uncompress
+        gzopen
+        gzwrite
+        gzread
+        gzclose
+
+Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
+
+#If Win16 Then   'Use Win16 calls.
+Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
+        String, comprLen As Any, ByVal buf As String, ByVal buflen
+        As Long) As Integer
+Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
+        As String, uncomprLen As Any, ByVal compr As String, ByVal
+        lcompr As Long) As Integer
+Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
+        String, ByVal mode As String) As Long
+Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
+        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
+        As Integer
+Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
+        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
+        As Integer
+Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
+        Long) As Integer
+#Else
+Declare Function compress Lib "ZLIB32.DLL"
+        (ByVal compr As String, comprLen As Any, ByVal buf As
+        String, ByVal buflen As Long) As Integer
+Declare Function uncompress Lib "ZLIB32.DLL"
+        (ByVal uncompr As String, uncomprLen As Any, ByVal compr As
+        String, ByVal lcompr As Long) As Long
+Declare Function gzopen Lib "ZLIB32.DLL"
+        (ByVal file As String, ByVal mode As String) As Long
+Declare Function gzread Lib "ZLIB32.DLL"
+        (ByVal file As Long, ByVal uncompr As String, ByVal
+        uncomprLen As Long) As Long
+Declare Function gzwrite Lib "ZLIB32.DLL"
+        (ByVal file As Long, ByVal uncompr As String, ByVal
+        uncomprLen As Long) As Long
+Declare Function gzclose Lib "ZLIB32.DLL"
+        (ByVal file As Long) As Long
+#End If
+
+-Jon Caruana
+jon-net@usa.net
+Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
+
+
+Here is another example from Michael <michael_borgsys@hotmail.com> that he
+says conforms to the VB guidelines, and that solves the problem of not
+knowing the uncompressed size by storing it at the end of the file:
+
+'Calling the functions:
+'bracket meaning: <parameter> [optional] {Range of possible values}
+'Call subCompressFile(<path with filename to compress> [, <path with
+filename to write to>, [level of compression {1..9}]])
+'Call subUncompressFile(<path with filename to compress>)
+
+Option Explicit
+Private lngpvtPcnSml As Long 'Stores value for 'lngPercentSmaller'
+Private Const SUCCESS As Long = 0
+Private Const strFilExt As String = ".cpr"
+Private Declare Function lngfncCpr Lib "zlib.dll" Alias "compress2" (ByRef
+dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long,
+ByVal level As Integer) As Long
+Private Declare Function lngfncUcp Lib "zlib.dll" Alias "uncompress" (ByRef
+dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long)
+As Long
+
+Public Sub subCompressFile(ByVal strargOriFilPth As String, Optional ByVal
+strargCprFilPth As String, Optional ByVal intLvl As Integer = 9)
+    Dim strCprPth As String
+    Dim lngOriSiz As Long
+    Dim lngCprSiz As Long
+    Dim bytaryOri() As Byte
+    Dim bytaryCpr() As Byte
+    lngOriSiz = FileLen(strargOriFilPth)
+    ReDim bytaryOri(lngOriSiz - 1)
+    Open strargOriFilPth For Binary Access Read As #1
+        Get #1, , bytaryOri()
+    Close #1
+    strCprPth = IIf(strargCprFilPth = "", strargOriFilPth, strargCprFilPth)
+'Select file path and name
+    strCprPth = strCprPth & IIf(Right(strCprPth, Len(strFilExt)) =
+strFilExt, "", strFilExt) 'Add file extension if not exists
+    lngCprSiz = (lngOriSiz * 1.01) + 12 'Compression needs temporary a bit
+more space then original file size
+    ReDim bytaryCpr(lngCprSiz - 1)
+    If lngfncCpr(bytaryCpr(0), lngCprSiz, bytaryOri(0), lngOriSiz, intLvl) =
+SUCCESS Then
+        lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
+        ReDim Preserve bytaryCpr(lngCprSiz - 1)
+        Open strCprPth For Binary Access Write As #1
+            Put #1, , bytaryCpr()
+            Put #1, , lngOriSiz 'Add the the original size value to the end
+(last 4 bytes)
+        Close #1
+    Else
+        MsgBox "Compression error"
+    End If
+    Erase bytaryCpr
+    Erase bytaryOri
+End Sub
+
+Public Sub subUncompressFile(ByVal strargFilPth As String)
+    Dim bytaryCpr() As Byte
+    Dim bytaryOri() As Byte
+    Dim lngOriSiz As Long
+    Dim lngCprSiz As Long
+    Dim strOriPth As String
+    lngCprSiz = FileLen(strargFilPth)
+    ReDim bytaryCpr(lngCprSiz - 1)
+    Open strargFilPth For Binary Access Read As #1
+        Get #1, , bytaryCpr()
+    Close #1
+    'Read the original file size value:
+    lngOriSiz = bytaryCpr(lngCprSiz - 1) * (2 ^ 24) _
+              + bytaryCpr(lngCprSiz - 2) * (2 ^ 16) _
+              + bytaryCpr(lngCprSiz - 3) * (2 ^ 8) _
+              + bytaryCpr(lngCprSiz - 4)
+    ReDim Preserve bytaryCpr(lngCprSiz - 5) 'Cut of the original size value
+    ReDim bytaryOri(lngOriSiz - 1)
+    If lngfncUcp(bytaryOri(0), lngOriSiz, bytaryCpr(0), lngCprSiz) = SUCCESS
+Then
+        strOriPth = Left(strargFilPth, Len(strargFilPth) - Len(strFilExt))
+        Open strOriPth For Binary Access Write As #1
+            Put #1, , bytaryOri()
+        Close #1
+    Else
+        MsgBox "Uncompression error"
+    End If
+    Erase bytaryCpr
+    Erase bytaryOri
+End Sub
+Public Property Get lngPercentSmaller() As Long
+    lngPercentSmaller = lngpvtPcnSml
+End Property
diff --git a/extra/zlib/zlib-1.2.13/os400/README400 b/extra/zlib/zlib-1.2.13/os400/README400
new file mode 100644
index 000000000000..c06fa8459a01
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/os400/README400
@@ -0,0 +1,48 @@
+        ZLIB version 1.2.13 for OS/400 installation instructions
+
+1) Download and unpack the zlib tarball to some IFS directory.
+   (i.e.: /path/to/the/zlib/ifs/source/directory)
+
+   If the installed IFS command supports gzip format, this is straightforward,
+else you have to unpack first to some directory on a system supporting it,
+then move the whole directory to the IFS via the network (via SMB or FTP).
+
+2) Edit the configuration parameters in the compilation script.
+
+        EDTF STMF('/path/to/the/zlib/ifs/source/directory/os400/make.sh')
+
+Tune the parameters according to your needs if not matching the defaults.
+Save the file and exit after edition.
+
+3) Enter qshell, then work in the zlib OS/400 specific directory.
+
+        QSH
+        cd /path/to/the/zlib/ifs/source/directory/os400
+
+4) Compile and install
+
+        sh make.sh
+
+The script will:
+- create the libraries, objects and IFS directories for the zlib environment,
+- compile all modules,
+- create a service program,
+- create a static and a dynamic binding directory,
+- install header files for C/C++ and for ILE/RPG, both for compilation in
+  DB2 and IFS environments.
+
+That's all. 
+
+
+Notes:  For OS/400 ILE RPG programmers, a /copy member defining the ZLIB
+                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
+                In the ILE environment, the same definitions are available from
+                file zlib.inc located in the same IFS include directory as the
+                C/C++ header files.
+                Please read comments in this member for more information.
+
+        Remember that most foreign textual data are ASCII coded: this
+                implementation does not handle conversion from/to ASCII, so
+                text data code conversions must be done explicitly.
+
+        Mainly for the reason above, always open zipped files in binary mode.
diff --git a/extra/zlib/zlib-1.2.13/os400/bndsrc b/extra/zlib/zlib-1.2.13/os400/bndsrc
new file mode 100644
index 000000000000..9f92bb10cf37
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/os400/bndsrc
@@ -0,0 +1,127 @@
+STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.1.3 entry points.                                    */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("adler32")
+  EXPORT SYMBOL("compress")
+  EXPORT SYMBOL("compress2")
+  EXPORT SYMBOL("crc32")
+  EXPORT SYMBOL("get_crc_table")
+  EXPORT SYMBOL("deflate")
+  EXPORT SYMBOL("deflateEnd")
+  EXPORT SYMBOL("deflateSetDictionary")
+  EXPORT SYMBOL("deflateCopy")
+  EXPORT SYMBOL("deflateReset")
+  EXPORT SYMBOL("deflateParams")
+  EXPORT SYMBOL("deflatePrime")
+  EXPORT SYMBOL("deflateInit_")
+  EXPORT SYMBOL("deflateInit2_")
+  EXPORT SYMBOL("gzopen")
+  EXPORT SYMBOL("gzdopen")
+  EXPORT SYMBOL("gzsetparams")
+  EXPORT SYMBOL("gzread")
+  EXPORT SYMBOL("gzwrite")
+  EXPORT SYMBOL("gzprintf")
+  EXPORT SYMBOL("gzputs")
+  EXPORT SYMBOL("gzgets")
+  EXPORT SYMBOL("gzputc")
+  EXPORT SYMBOL("gzgetc")
+  EXPORT SYMBOL("gzflush")
+  EXPORT SYMBOL("gzseek")
+  EXPORT SYMBOL("gzrewind")
+  EXPORT SYMBOL("gztell")
+  EXPORT SYMBOL("gzeof")
+  EXPORT SYMBOL("gzclose")
+  EXPORT SYMBOL("gzerror")
+  EXPORT SYMBOL("inflate")
+  EXPORT SYMBOL("inflateEnd")
+  EXPORT SYMBOL("inflateSetDictionary")
+  EXPORT SYMBOL("inflateSync")
+  EXPORT SYMBOL("inflateReset")
+  EXPORT SYMBOL("inflateInit_")
+  EXPORT SYMBOL("inflateInit2_")
+  EXPORT SYMBOL("inflateSyncPoint")
+  EXPORT SYMBOL("uncompress")
+  EXPORT SYMBOL("zlibVersion")
+  EXPORT SYMBOL("zError")
+  EXPORT SYMBOL("z_errmsg")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.1 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("compressBound")
+  EXPORT SYMBOL("deflateBound")
+  EXPORT SYMBOL("deflatePending")
+  EXPORT SYMBOL("gzungetc")
+  EXPORT SYMBOL("gzclearerr")
+  EXPORT SYMBOL("inflateBack")
+  EXPORT SYMBOL("inflateBackEnd")
+  EXPORT SYMBOL("inflateBackInit_")
+  EXPORT SYMBOL("inflateCopy")
+  EXPORT SYMBOL("zlibCompileFlags")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.4 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("adler32_combine")
+  EXPORT SYMBOL("adler32_combine64")
+  EXPORT SYMBOL("crc32_combine")
+  EXPORT SYMBOL("crc32_combine64")
+  EXPORT SYMBOL("deflateSetHeader")
+  EXPORT SYMBOL("deflateTune")
+  EXPORT SYMBOL("gzbuffer")
+  EXPORT SYMBOL("gzclose_r")
+  EXPORT SYMBOL("gzclose_w")
+  EXPORT SYMBOL("gzdirect")
+  EXPORT SYMBOL("gzoffset")
+  EXPORT SYMBOL("gzoffset64")
+  EXPORT SYMBOL("gzopen64")
+  EXPORT SYMBOL("gzseek64")
+  EXPORT SYMBOL("gztell64")
+  EXPORT SYMBOL("inflateGetHeader")
+  EXPORT SYMBOL("inflateMark")
+  EXPORT SYMBOL("inflatePrime")
+  EXPORT SYMBOL("inflateReset2")
+  EXPORT SYMBOL("inflateUndermine")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.6 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("deflateResetKeep")
+  EXPORT SYMBOL("gzgetc_")
+  EXPORT SYMBOL("inflateResetKeep")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.8 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("gzvprintf")
+  EXPORT SYMBOL("inflateGetDictionary")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.9 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("adler32_z")
+  EXPORT SYMBOL("crc32_z")
+  EXPORT SYMBOL("deflateGetDictionary")
+  EXPORT SYMBOL("gzfread")
+  EXPORT SYMBOL("gzfwrite")
+  EXPORT SYMBOL("inflateCodesUsed")
+  EXPORT SYMBOL("inflateValidate")
+  EXPORT SYMBOL("uncompress2")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.12 additional entry points.                        */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("crc32_combine_gen64")
+  EXPORT SYMBOL("crc32_combine_gen")
+  EXPORT SYMBOL("crc32_combine_op")
+
+ENDPGMEXP
diff --git a/extra/zlib/zlib-1.2.13/os400/make.sh b/extra/zlib/zlib-1.2.13/os400/make.sh
new file mode 100644
index 000000000000..19eec117a678
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/os400/make.sh
@@ -0,0 +1,366 @@
+#!/bin/sh
+#
+#       ZLIB compilation script for the OS/400.
+#
+#
+#       This is a shell script since make is not a standard component of OS/400.
+
+
+################################################################################
+#
+#                       Tunable configuration parameters.
+#
+################################################################################
+
+TARGETLIB='ZLIB'                # Target OS/400 program library
+STATBNDDIR='ZLIB_A'             # Static binding directory.
+DYNBNDDIR='ZLIB'                # Dynamic binding directory.
+SRVPGM="ZLIB"                   # Service program.
+IFSDIR='/zlib'                  # IFS support base directory.
+TGTCCSID='500'                  # Target CCSID of objects
+DEBUG='*NONE'                   # Debug level
+OPTIMIZE='40'                   # Optimisation level
+OUTPUT='*NONE'                  # Compilation output option.
+TGTRLS='V6R1M0'                 # Target OS release
+
+export TARGETLIB STATBNDDIR DYNBNDDIR SRVPGM IFSDIR
+export TGTCCSID DEBUG OPTIMIZE OUTPUT TGTRLS
+
+
+################################################################################
+#
+#                       OS/400 specific definitions.
+#
+################################################################################
+
+LIBIFSNAME="/QSYS.LIB/${TARGETLIB}.LIB"
+
+
+################################################################################
+#
+#                               Procedures.
+#
+################################################################################
+
+#       action_needed dest [src]
+#
+#       dest is an object to build
+#       if specified, src is an object on which dest depends.
+#
+#       exit 0 (succeeds) if some action has to be taken, else 1.
+
+action_needed()
+
+{
+        [ ! -e "${1}" ] && return 0
+        [ "${2}" ] || return 1
+        [ "${1}" -ot "${2}" ] && return 0
+        return 1
+}
+
+
+#       make_module module_name source_name [additional_definitions]
+#
+#       Compile source name into module if needed.
+#       As side effect, append the module name to variable MODULES.
+#       Set LINK to "YES" if the module has been compiled.
+
+make_module()
+
+{
+    MODULES="${MODULES} ${1}"
+    MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
+    CSRC="`basename \"${2}\"`"
+
+    if action_needed "${MODIFSNAME}" "${2}"
+    then    :
+    elif [ ! "`sed -e \"/<source name=\\\"${CSRC}\\\">/,/<\\\\/source>/!d\" \
+      -e '/<depend /!d'                                                 \
+      -e 's/.* name=\"\\([^\"]*\\)\".*/\\1/' < \"${TOPDIR}/treebuild.xml\" |
+        while read HDR
+        do      if action_needed \"${MODIFSNAME}\" \"${IFSDIR}/include/${HDR}\"
+                then    echo recompile
+                        break
+                fi
+        done`" ]
+    then    return 0
+    fi
+
+    CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('${2}')"
+    CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)"
+    CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
+    CMD="${CMD} INCDIR('${IFSDIR}/include' ${INCLUDES})"
+    CMD="${CMD} TGTCCSID(${TGTCCSID}) TGTRLS(${TGTRLS})"
+    CMD="${CMD} OUTPUT(${OUTPUT})"
+    CMD="${CMD} OPTIMIZE(${OPTIMIZE})"
+    CMD="${CMD} DBGVIEW(${DEBUG})"
+    system "${CMD}"
+    LINK=YES
+}
+
+
+#       Determine DB2 object name from IFS name.
+
+db2_name()
+
+{
+        basename "${1}"                                                 |
+        tr 'a-z-' 'A-Z_'                                                |
+        sed -e 's/\..*//'                                               \
+            -e 's/^\(.\).*\(.........\)$/\1\2/'
+}
+
+
+#       Force enumeration types to be the same size as integers.
+
+copy_hfile()
+
+{
+        sed -e '1i\
+#pragma enum(int)\
+' "${@}" -e '$a\
+#pragma enum(pop)\
+'
+}
+
+
+################################################################################
+#
+#                             Script initialization.
+#
+################################################################################
+
+SCRIPTDIR=`dirname "${0}"`
+
+case "${SCRIPTDIR}" in
+/*)     ;;
+*)      SCRIPTDIR="`pwd`/${SCRIPTDIR}"
+esac
+
+while true
+do      case "${SCRIPTDIR}" in
+        */.)    SCRIPTDIR="${SCRIPTDIR%/.}";;
+        *)      break;;
+        esac
+done
+
+#  The script directory is supposed to be in ${TOPDIR}/os400.
+
+TOPDIR=`dirname "${SCRIPTDIR}"`
+export SCRIPTDIR TOPDIR
+cd "${TOPDIR}"
+
+
+#  Extract the version from the master compilation XML file.
+
+VERSION=`sed -e '/^<package /!d'                                        \
+            -e 's/^.* version="\([0-9.]*\)".*$/\1/' -e 'q'              \
+            < treebuild.xml`
+export VERSION
+
+################################################################################
+
+
+#       Create the OS/400 library if it does not exist.
+
+if action_needed "${LIBIFSNAME}"
+then    CMD="CRTLIB LIB(${TARGETLIB}) TEXT('ZLIB: Data compression API')"
+        system "${CMD}"
+fi
+
+
+#       Create the DOCS source file if it does not exist.
+
+if action_needed "${LIBIFSNAME}/DOCS.FILE"
+then    CMD="CRTSRCPF FILE(${TARGETLIB}/DOCS) RCDLEN(112)"
+        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('Documentation texts')"
+        system "${CMD}"
+fi
+
+#       Copy some documentation files if needed.
+
+for TEXT in "${TOPDIR}/ChangeLog" "${TOPDIR}/FAQ"                       \
+    "${TOPDIR}/README" "${SCRIPTDIR}/README400"
+do      MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${TEXT}\"`.MBR"
+
+        if action_needed "${MEMBER}" "${TEXT}"
+        then    CMD="CPY OBJ('${TEXT}') TOOBJ('${MEMBER}') TOCCSID(${TGTCCSID})"
+                CMD="${CMD} DTAFMT(*TEXT) REPLACE(*YES)"
+                system "${CMD}"
+        fi
+done
+
+
+#       Create the OS/400 source program file for the C header files.
+
+SRCPF="${LIBIFSNAME}/H.FILE"
+
+if action_needed "${SRCPF}"
+then    CMD="CRTSRCPF FILE(${TARGETLIB}/H) RCDLEN(112)"
+        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: C/C++ header files')"
+        system "${CMD}"
+fi
+
+
+#       Create the IFS directory for the C header files.
+
+if action_needed "${IFSDIR}/include"
+then    mkdir -p "${IFSDIR}/include"
+fi
+
+#       Copy the header files to DB2 library. Link from IFS include directory.
+
+for HFILE in "${TOPDIR}/"*.h
+do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"
+
+        if action_needed "${DEST}" "${HFILE}"
+        then    copy_hfile < "${HFILE}" > tmphdrfile
+
+                #       Need to translate to target CCSID.
+
+                CMD="CPY OBJ('`pwd`/tmphdrfile') TOOBJ('${DEST}')"
+                CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+                system "${CMD}"
+                # touch -r "${HFILE}" "${DEST}"
+                rm -f tmphdrfile
+        fi
+
+        IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
+
+        if action_needed "${IFSFILE}" "${DEST}"
+        then    rm -f "${IFSFILE}"
+                ln -s "${DEST}" "${IFSFILE}"
+        fi
+done
+
+
+#       Install the ILE/RPG header file.
+
+
+HFILE="${SCRIPTDIR}/zlib.inc"
+DEST="${SRCPF}/ZLIB.INC.MBR"
+
+if action_needed "${DEST}" "${HFILE}"
+then    CMD="CPY OBJ('${HFILE}') TOOBJ('${DEST}')"
+        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+        system "${CMD}"
+        # touch -r "${HFILE}" "${DEST}"
+fi
+
+IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
+
+if action_needed "${IFSFILE}" "${DEST}"
+then    rm -f "${IFSFILE}"
+        ln -s "${DEST}" "${IFSFILE}"
+fi
+
+
+#      Create and compile the identification source file.
+
+echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
+echo '#pragma comment(user, __DATE__)' >> os400.c
+echo '#pragma comment(user, __TIME__)' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
+make_module     OS400           os400.c
+LINK=                           # No need to rebuild service program yet.
+MODULES=
+
+
+#       Get source list.
+
+CSOURCES=`sed -e '/<source name="/!d'                                   \
+    -e 's/.* name="\([^"]*\)".*/\1/' < treebuild.xml`
+
+#       Compile the sources into modules.
+
+for SRC in ${CSOURCES}
+do      MODULE=`db2_name "${SRC}"`
+        make_module "${MODULE}" "${SRC}"
+done
+
+
+#       If needed, (re)create the static binding directory.
+
+if action_needed "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
+then    LINK=YES
+fi
+
+if [ "${LINK}" ]
+then    rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
+        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+        CMD="${CMD} TEXT('ZLIB static binding directory')"
+        system "${CMD}"
+
+        for MODULE in ${MODULES}
+        do      CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+                CMD="${CMD} OBJ((${TARGETLIB}/${MODULE} *MODULE))"
+                system "${CMD}"
+        done
+fi
+
+
+#       The exportation file for service program creation must be in a DB2
+#               source file, so make sure it exists.
+
+if action_needed "${LIBIFSNAME}/TOOLS.FILE"
+then    CMD="CRTSRCPF FILE(${TARGETLIB}/TOOLS) RCDLEN(112)"
+        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: build tools')"
+        system "${CMD}"
+fi
+
+
+DEST="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
+
+if action_needed "${SCRIPTDIR}/bndsrc" "${DEST}"
+then    CMD="CPY OBJ('${SCRIPTDIR}/bndsrc') TOOBJ('${DEST}')"
+        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
+        system "${CMD}"
+        # touch -r "${SCRIPTDIR}/bndsrc" "${DEST}"
+        LINK=YES
+fi
+
+
+#       Build the service program if needed.
+
+if action_needed "${LIBIFSNAME}/${SRVPGM}.SRVPGM"
+then    LINK=YES
+fi
+
+if [ "${LINK}" ]
+then    CMD="CRTSRVPGM SRVPGM(${TARGETLIB}/${SRVPGM})"
+        CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(BNDSRC)"
+        CMD="${CMD} MODULE(${TARGETLIB}/OS400)"
+        CMD="${CMD} BNDDIR(${TARGETLIB}/${STATBNDDIR})"
+        CMD="${CMD} TEXT('ZLIB ${VERSION} dynamic library')"
+        CMD="${CMD} TGTRLS(${TGTRLS})"
+        system "${CMD}"
+        LINK=YES
+
+        #       Duplicate the service program for a versioned backup.
+
+        BACKUP=`echo "${SRVPGM}${VERSION}"                              |
+                sed -e 's/.*\(..........\)$/\1/' -e 's/\./_/g'`
+        BACKUP="`db2_name \"${BACKUP}\"`"
+        BKUPIFSNAME="${LIBIFSNAME}/${BACKUP}.SRVPGM"
+        rm -f "${BKUPIFSNAME}"
+        CMD="CRTDUPOBJ OBJ(${SRVPGM}) FROMLIB(${TARGETLIB})"
+        CMD="${CMD} OBJTYPE(*SRVPGM) NEWOBJ(${BACKUP})"
+        system "${CMD}"
+fi
+
+
+#       If needed, (re)create the dynamic binding directory.
+
+if action_needed "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
+then    LINK=YES
+fi
+
+if [ "${LINK}" ]
+then    rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
+        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
+        CMD="${CMD} TEXT('ZLIB dynamic binding directory')"
+        system "${CMD}"
+        CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
+        CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"
+        system "${CMD}"
+fi
diff --git a/extra/zlib/zlib-1.2.13/os400/zlib.inc b/extra/zlib/zlib-1.2.13/os400/zlib.inc
new file mode 100644
index 000000000000..c273c863c614
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/os400/zlib.inc
@@ -0,0 +1,527 @@
+      *  ZLIB.INC - Interface to the general purpose compression library
+      *
+      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
+      *  Version 1.2.13
+      *
+      *
+      *  WARNING:
+      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
+      *         deflateInit2() and inflateBackInit() need to be called with
+      *         two additional arguments:
+      *         the package version string and the stream control structure.
+      *         size. This is needed because RPG lacks some macro feature.
+      *         Call these procedures as:
+      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
+      *
+      /if not defined(ZLIB_H_)
+      /define ZLIB_H_
+      *
+      **************************************************************************
+      *                               Constants
+      **************************************************************************
+      *
+      *  Versioning information.
+      *
+     D ZLIB_VERSION    C                   '1.2.13'
+     D ZLIB_VERNUM     C                   X'12a0'
+     D ZLIB_VER_MAJOR  C                   1
+     D ZLIB_VER_MINOR  C                   2
+     D ZLIB_VER_REVISION...
+     D                 C                   13
+     D ZLIB_VER_SUBREVISION...
+     D                 C                   0
+      *
+      *  Other equates.
+      *
+     D Z_NO_FLUSH      C                   0
+     D Z_PARTIAL_FLUSH...
+     D                 C                   1
+     D Z_SYNC_FLUSH    C                   2
+     D Z_FULL_FLUSH    C                   3
+     D Z_FINISH        C                   4
+     D Z_BLOCK         C                   5
+     D Z_TREES         C                   6
+      *
+     D Z_OK            C                   0
+     D Z_STREAM_END    C                   1
+     D Z_NEED_DICT     C                   2
+     D Z_ERRNO         C                   -1
+     D Z_STREAM_ERROR  C                   -2
+     D Z_DATA_ERROR    C                   -3
+     D Z_MEM_ERROR     C                   -4
+     D Z_BUF_ERROR     C                   -5
+     D Z_VERSION_ERROR C                   -6
+      *
+     D Z_NO_COMPRESSION...
+     D                 C                   0
+     D Z_BEST_SPEED    C                   1
+     D Z_BEST_COMPRESSION...
+     D                 C                   9
+     D Z_DEFAULT_COMPRESSION...
+     D                 C                   -1
+      *
+     D Z_FILTERED      C                   1
+     D Z_HUFFMAN_ONLY  C                   2
+     D Z_RLE           C                   3
+     D Z_DEFAULT_STRATEGY...
+     D                 C                   0
+      *
+     D Z_BINARY        C                   0
+     D Z_ASCII         C                   1
+     D Z_UNKNOWN       C                   2
+      *
+     D Z_DEFLATED      C                   8
+      *
+     D Z_NULL          C                   0
+      *
+      **************************************************************************
+      *                                 Types
+      **************************************************************************
+      *
+     D z_streamp       S               *                                        Stream struct ptr
+     D gzFile          S               *                                        File pointer
+     D gz_headerp      S               *
+     D z_off_t         S             10i 0                                      Stream offsets
+     D z_off64_t       S             20i 0                                      Stream offsets
+      *
+      **************************************************************************
+      *                               Structures
+      **************************************************************************
+      *
+      *  The GZIP encode/decode stream support structure.
+      *
+     D z_stream        DS                  align based(z_streamp)
+     D  zs_next_in                     *                                        Next input byte
+     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
+     D  zs_total_in                  10U 0                                      Total bytes read
+     D  zs_next_out                    *                                        Output buffer ptr
+     D  zs_avail_out                 10U 0                                      Room left @ next_out
+     D  zs_total_out                 10U 0                                      Total bytes written
+     D  zs_msg                         *                                        Last errmsg or null
+     D  zs_state                       *                                        Internal state
+     D  zs_zalloc                      *   procptr                              Int. state allocator
+     D  zs_free                        *   procptr                              Int. state dealloc.
+     D  zs_opaque                      *                                        Private alloc. data
+     D  zs_data_type                 10i 0                                      ASC/BIN best guess
+     D  zs_adler                     10u 0                                      Uncompr. adler32 val
+     D                               10U 0                                      Reserved
+     D                               10U 0                                      Ptr. alignment
+      *
+      **************************************************************************
+      *                     Utility function prototypes
+      **************************************************************************
+      *
+     D compress        PR            10I 0 extproc('compress')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10u 0 value                                Source length
+      *
+     D compress2       PR            10I 0 extproc('compress2')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+     D  level                        10I 0 value                                Compression level
+      *
+     D compressBound   PR            10U 0 extproc('compressBound')
+     D  sourceLen                    10U 0 value
+      *
+     D uncompress      PR            10I 0 extproc('uncompress')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+      *
+     D uncompress2     PR            10I 0 extproc('uncompress2')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0                                      Source length
+      *
+      /if not defined(LARGE_FILES)
+     D gzopen          PR                  extproc('gzopen')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      /else
+     D gzopen          PR                  extproc('gzopen64')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzopen64        PR                  extproc('gzopen64')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      /endif
+      *
+     D gzdopen         PR                  extproc('gzdopen')
+     D                                     like(gzFile)
+     D  fd                           10I 0 value                                File descriptor
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzbuffer        PR            10I 0 extproc('gzbuffer')
+     D  file                               value like(gzFile)                   File pointer
+     D  size                         10U 0 value
+      *
+     D gzsetparams     PR            10I 0 extproc('gzsetparams')
+     D  file                               value like(gzFile)                   File pointer
+     D  level                        10I 0 value
+     D  strategy                     10I 0 value
+      *
+     D gzread          PR            10I 0 extproc('gzread')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    options(*varsize)                    Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzfread          PR           20I 0 extproc('gzfread')
+     D  buf                       65535    options(*varsize)                    Buffer
+     D  size                         20u 0 value                                Buffer length
+     D  nitems                       20u 0 value                                Buffer length
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzwrite         PR            10I 0 extproc('gzwrite')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    const options(*varsize)              Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzfwrite         PR           20I 0 extproc('gzfwrite')
+     D  buf                       65535    options(*varsize)                    Buffer
+     D  size                         20u 0 value                                Buffer length
+     D  nitems                       20u 0 value                                Buffer length
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzputs          PR            10I 0 extproc('gzputs')
+     D  file                               value like(gzFile)                   File pointer
+     D  s                              *   value options(*string)               String to output
+      *
+     D gzgets          PR              *   extproc('gzgets')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    options(*varsize)                    Read buffer
+     D  len                          10i 0 value                                Buffer length
+      *
+     D gzputc          PR            10i 0 extproc('gzputc')
+     D  file                               value like(gzFile)                   File pointer
+     D  c                            10I 0 value                                Character to write
+      *
+     D gzgetc          PR            10i 0 extproc('gzgetc')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzgetc_         PR            10i 0 extproc('gzgetc_')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzungetc        PR            10i 0 extproc('gzungetc')
+     D  c                            10I 0 value                                Character to push
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzflush         PR            10i 0 extproc('gzflush')
+     D  file                               value like(gzFile)                   File pointer
+     D  flush                        10I 0 value                                Type of flush
+      *
+      /if not defined(LARGE_FILES)
+     D gzseek          PR                  extproc('gzseek')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off_t)                  Offset
+     D  whence                       10i 0 value                                Origin
+      /else
+     D gzseek          PR                  extproc('gzseek64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off_t)                  Offset
+     D  whence                       10i 0 value                                Origin
+      *
+     D gzseek64        PR                  extproc('gzseek64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off64_t)                Offset
+     D  whence                       10i 0 value                                Origin
+      /endif
+      *
+     D gzrewind        PR            10i 0 extproc('gzrewind')
+     D  file                               value like(gzFile)                   File pointer
+      *
+      /if not defined(LARGE_FILES)
+     D gztell          PR                  extproc('gztell')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      /else
+     D gztell          PR                  extproc('gztell64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gztell64        PR                  extproc('gztell64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+      /endif
+      *
+      /if not defined(LARGE_FILES)
+     D gzoffset        PR                  extproc('gzoffset')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      /else
+     D gzoffset        PR                  extproc('gzoffset64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzoffset64      PR                  extproc('gzoffset64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+      /endif
+      *
+     D gzeof           PR            10i 0 extproc('gzeof')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzdirect        PR            10i 0 extproc('gzdirect')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose_r       PR            10i 0 extproc('gzclose_r')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose_w       PR            10i 0 extproc('gzclose_w')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose         PR            10i 0 extproc('gzclose')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzerror         PR              *   extproc('gzerror')                   Error string
+     D  file                               value like(gzFile)                   File pointer
+     D  errnum                       10I 0                                      Error code
+      *
+     D gzclearerr      PR                  extproc('gzclearerr')
+     D  file                               value like(gzFile)                   File pointer
+      *
+      **************************************************************************
+      *                        Basic function prototypes
+      **************************************************************************
+      *
+     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
+      *
+     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflate         PR            10I 0 extproc('deflate')                   Compress data
+     D  strm                               like(z_stream)                       Compression stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflate         PR            10I 0 extproc('inflate')                   Expand data
+     D  strm                               like(z_stream)                       Expansion stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+      **************************************************************************
+      *                        Advanced function prototypes
+      **************************************************************************
+      *
+     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  method                       10I 0 value                                Compression method
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
+     D  strategy                     10I 0 value                                Compression strategy
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflateSetDictionary...
+     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Compression stream
+     D  dictionary                65535    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  strategy                     10I 0 value                                Compression strategy
+      *
+     D deflateTune     PR            10I 0 extproc('deflateTune')
+     D  strm                               like(z_stream)                       Compression stream
+     D  good                         10I 0 value
+     D  lazy                         10I 0 value
+     D  nice                         10I 0 value
+     D  chain                        10I 0 value
+      *
+     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  sourcelen                    10U 0 value                                Compression level
+      *
+     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  pending                      10U 0                                      Pending bytes
+     D  bits                         10I 0                                      Pending bits
+      *
+     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  bits                         10I 0 value                                # of bits to insert
+     D  value                        10I 0 value                                Bits to insert
+      *
+     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateSetDictionary...
+     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Expansion stream
+     D  dictionary                65535    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D inflateGetDictionary...
+     D                 PR            10I 0 extproc('inflateGetDictionary')      Get dictionary
+     D  strm                               like(z_stream)                       Expansion stream
+     D  dictionary                65535    options(*varsize)                    Dictionary bytes
+     D  dictLength                   10U 0                                      Dictionary length
+      *
+     D deflateGetDictionary...
+     D                 PR            10I 0 extproc('deflateGetDictionary')      Get dictionary
+     D  strm                               like(z_stream)                       Expansion stream
+     D  dictionary                65535    options(*varsize)                    Dictionary bytes
+     D  dictLength                   10U 0                                      Dictionary length
+      *
+     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateCopy     PR            10I 0 extproc('inflateCopy')
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                Log2(buffer size)
+      *
+     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
+     D  strm                               like(z_stream)                       Expansion stream
+     D  bits                         10I 0 value                                Bit count
+     D  value                        10I 0 value                                Bits to insert
+      *
+     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateCodesUsed...
+                       PR            20U 0 extproc('inflateCodesUsed')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateValidate...
+                       PR            20U 0 extproc('inflateValidate')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  check                        10I 0 value
+      *
+     D inflateGetHeader...
+                       PR            10U 0 extproc('inflateGetHeader')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  head                               like(gz_headerp)
+      *
+     D deflateSetHeader...
+                       PR            10U 0 extproc('deflateSetHeader')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  head                               like(gz_headerp)
+      *
+     D inflateBackInit...
+     D                 PR            10I 0 extproc('inflateBackInit_')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                Log2(buffer size)
+     D  window                    65535    options(*varsize)                    Buffer
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateBack     PR            10I 0 extproc('inflateBack')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  in                             *   value procptr                        Input function
+     D  in_desc                        *   value                                Input descriptor
+     D  out                            *   value procptr                        Output function
+     D  out_desc                       *   value                                Output descriptor
+      *
+     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D zlibCompileFlags...
+     D                 PR            10U 0 extproc('zlibCompileFlags')
+      *
+      **************************************************************************
+      *                        Checksum function prototypes
+      **************************************************************************
+      *
+     D adler32         PR            10U 0 extproc('adler32')                   New checksum
+     D  adler                        10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+     D adler32_combine...
+                       PR            10U 0 extproc('adler32_combine')           New checksum
+     D  adler1                       10U 0 value                                Old checksum
+     D  adler2                       10U 0 value                                Old checksum
+     D  len2                         20U 0 value                                Buffer length
+      *
+     D adler32_z       PR            10U 0 extproc('adler32_z')                 New checksum
+     D  adler                        10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          20U 0 value                                Buffer length
+      *
+     D crc32           PR            10U 0 extproc('crc32')                     New checksum
+     D  crc                          10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+     D crc32_combine...
+                       PR            10U 0 extproc('crc32_combine')             New checksum
+     D  crc1                         10U 0 value                                Old checksum
+     D  crc2                         10U 0 value                                Old checksum
+     D  len2                         20U 0 value                                Buffer length
+      *
+     D crc32_z         PR            10U 0 extproc('crc32_z')                   New checksum
+     D  crc                          10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          20U 0 value                                Buffer length
+      *
+      **************************************************************************
+      *                     Miscellaneous function prototypes
+      **************************************************************************
+      *
+     D zError          PR              *   extproc('zError')                    Error string
+     D  err                          10I 0 value                                Error code
+      *
+     D inflateSyncPoint...
+     D                 PR            10I 0 extproc('inflateSyncPoint')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
+      *
+     D inflateUndermine...
+     D                 PR            10I 0 extproc('inflateUndermine')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  arg                          10I 0 value                                Error code
+      *
+     D inflateResetKeep...
+     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D deflateResetKeep...
+     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+      /endif
diff --git a/extra/zlib/zlib-1.2.13/qnx/package.qpg b/extra/zlib/zlib-1.2.13/qnx/package.qpg
new file mode 100644
index 000000000000..ba2f1a2d6c37
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/qnx/package.qpg
@@ -0,0 +1,141 @@
+<QPG:Generation>
+   <QPG:Options>
+      <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
+      <QPG:Defaults type="qnx_package"/>
+      <QPG:Source></QPG:Source>
+      <QPG:Release number="+"/>
+      <QPG:Build></QPG:Build>
+      <QPG:FileSorting strip="yes"/>
+      <QPG:Package targets="combine"/>
+      <QPG:Repository generate="yes"/>
+      <QPG:FinalDir></QPG:FinalDir>
+      <QPG:Cleanup></QPG:Cleanup>
+   </QPG:Options>
+
+   <QPG:Responsible>
+      <QPG:Company></QPG:Company>
+      <QPG:Department></QPG:Department>
+      <QPG:Group></QPG:Group>
+      <QPG:Team></QPG:Team>
+      <QPG:Employee></QPG:Employee>
+      <QPG:EmailAddress></QPG:EmailAddress>
+   </QPG:Responsible>
+
+   <QPG:Values>
+      <QPG:Files>
+         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
+         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
+         <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.13"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.13"/>
+         <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" component="slib"/>
+      </QPG:Files>
+
+      <QPG:PackageFilter>
+         <QPM:PackageManifest>
+            <QPM:PackageDescription>
+               <QPM:PackageType>Library</QPM:PackageType>
+               <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
+               <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
+               <QPM:PackageRepository></QPM:PackageRepository>
+               <QPM:FileVersion>2.0</QPM:FileVersion>
+            </QPM:PackageDescription>
+
+            <QPM:ProductDescription>
+               <QPM:ProductName>zlib</QPM:ProductName>
+               <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
+               <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
+               <QPM:VendorName>Public</QPM:VendorName>
+               <QPM:VendorInstallName>public</QPM:VendorInstallName>
+               <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
+               <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
+               <QPM:VendorEmail></QPM:VendorEmail>
+               <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
+               <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
+               <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
+               <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
+               <QPM:ProductIconSmall></QPM:ProductIconSmall>
+               <QPM:ProductIconLarge></QPM:ProductIconLarge>
+               <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
+               <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
+               <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
+               <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
+            </QPM:ProductDescription>
+
+            <QPM:ReleaseDescription>
+               <QPM:ReleaseVersion>1.2.13</QPM:ReleaseVersion>
+               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
+               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
+               <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
+               <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
+               <QPM:ExcludeCountries>
+                  <QPM:Country></QPM:Country>
+               </QPM:ExcludeCountries>
+
+               <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
+            </QPM:ReleaseDescription>
+
+            <QPM:ContentDescription>
+               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
+               <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
+               <QPM:TargetOS>qnx6</QPM:TargetOS>
+               <QPM:HostOS>qnx6</QPM:HostOS>
+               <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
+               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
+            </QPM:ContentDescription>
+         </QPM:PackageManifest>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter proc="none" target="none">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationDependencies>
+               <QPM:ProductRequirements></QPM:ProductRequirements>
+            </QPM:ProductInstallationDependencies>
+
+            <QPM:ProductInstallationProcedure>
+               <QPM:Script xmlmultiple="true">
+                  <QPM:ScriptName></QPM:ScriptName>
+                  <QPM:ScriptType>Install</QPM:ScriptType>
+                  <QPM:ScriptTiming>Post</QPM:ScriptTiming>
+                  <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
+                  <QPM:ScriptResult>Ignore</QPM:ScriptResult>
+                  <QPM:ShortDescription></QPM:ShortDescription>
+                  <QPM:UseBinaries>No</QPM:UseBinaries>
+                  <QPM:Priority>Optional</QPM:Priority>
+               </QPM:Script>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter type="core" component="none">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationProcedure>
+	       <QPM:OrderDependency xmlmultiple="true">
+	          <QPM:Order>InstallOver</QPM:Order>
+	          <QPM:Product>zlib</QPM:Product>
+	       </QPM:OrderDependency>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+
+      <QPG:PackageFilter type="core" component="dev">
+         <QPM:PackageManifest>
+            <QPM:ProductInstallationProcedure>
+	       <QPM:OrderDependency xmlmultiple="true">
+	          <QPM:Order>InstallOver</QPM:Order>
+	          <QPM:Product>zlib-dev</QPM:Product>
+	       </QPM:OrderDependency>
+            </QPM:ProductInstallationProcedure>
+         </QPM:PackageManifest>
+
+         <QPM:Launch>
+         </QPM:Launch>
+      </QPG:PackageFilter>
+   </QPG:Values>
+</QPG:Generation>
diff --git a/extra/zlib/zlib-1.2.13/test/example.c b/extra/zlib/zlib-1.2.13/test/example.c
new file mode 100644
index 000000000000..1470bc842ee8
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/test/example.c
@@ -0,0 +1,602 @@
+/* example.c -- usage example of the zlib compression library
+ * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+#include <stdio.h>
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#if defined(VMS) || defined(RISCOS)
+#  define TESTFILE "foo-gz"
+#else
+#  define TESTFILE "foo.gz"
+#endif
+
+#define CHECK_ERR(err, msg) { \
+    if (err != Z_OK) { \
+        fprintf(stderr, "%s error: %d\n", msg, err); \
+        exit(1); \
+    } \
+}
+
+static z_const char hello[] = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
+
+static const char dictionary[] = "hello";
+static uLong dictId;    /* Adler32 value of the dictionary */
+
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong *comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+int  main               OF((int argc, char *argv[]));
+
+
+#ifdef Z_SOLO
+
+void *myalloc OF((void *, unsigned, unsigned));
+void myfree OF((void *, void *));
+
+void *myalloc(q, n, m)
+    void *q;
+    unsigned n, m;
+{
+    (void)q;
+    return calloc(n, m);
+}
+
+void myfree(void *q, void *p)
+{
+    (void)q;
+    free(p);
+}
+
+static alloc_func zalloc = myalloc;
+static free_func zfree = myfree;
+
+#else /* !Z_SOLO */
+
+static alloc_func zalloc = (alloc_func)0;
+static free_func zfree = (free_func)0;
+
+void test_compress      OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *fname,
+                            Byte *uncompr, uLong uncomprLen));
+
+/* ===========================================================================
+ * Test compress() and uncompress()
+ */
+void test_compress(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
+    CHECK_ERR(err, "compress");
+
+    strcpy((char*)uncompr, "garbage");
+
+    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
+    CHECK_ERR(err, "uncompress");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad uncompress\n");
+        exit(1);
+    } else {
+        printf("uncompress(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test read/write of .gz files
+ */
+void test_gzio(fname, uncompr, uncomprLen)
+    const char *fname; /* compressed file name */
+    Byte *uncompr;
+    uLong uncomprLen;
+{
+#ifdef NO_GZCOMPRESS
+    fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
+#else
+    int err;
+    int len = (int)strlen(hello)+1;
+    gzFile file;
+    z_off_t pos;
+
+    file = gzopen(fname, "wb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    gzputc(file, 'h');
+    if (gzputs(file, "ello") != 4) {
+        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (gzprintf(file, ", %s!", "hello") != 8) {
+        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
+    gzclose(file);
+
+    file = gzopen(fname, "rb");
+    if (file == NULL) {
+        fprintf(stderr, "gzopen error\n");
+        exit(1);
+    }
+    strcpy((char*)uncompr, "garbage");
+
+    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
+        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
+        exit(1);
+    } else {
+        printf("gzread(): %s\n", (char*)uncompr);
+    }
+
+    pos = gzseek(file, -8L, SEEK_CUR);
+    if (pos != 6 || gztell(file) != pos) {
+        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
+                (long)pos, (long)gztell(file));
+        exit(1);
+    }
+
+    if (gzgetc(file) != ' ') {
+        fprintf(stderr, "gzgetc error\n");
+        exit(1);
+    }
+
+    if (gzungetc(' ', file) != ' ') {
+        fprintf(stderr, "gzungetc error\n");
+        exit(1);
+    }
+
+    gzgets(file, (char*)uncompr, (int)uncomprLen);
+    if (strlen((char*)uncompr) != 7) { /* " hello!" */
+        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
+        exit(1);
+    }
+    if (strcmp((char*)uncompr, hello + 6)) {
+        fprintf(stderr, "bad gzgets after gzseek\n");
+        exit(1);
+    } else {
+        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
+    }
+
+    gzclose(file);
+#endif
+}
+
+#endif /* Z_SOLO */
+
+/* ===========================================================================
+ * Test deflate() with small buffers
+ */
+void test_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uLong len = (uLong)strlen(hello)+1;
+
+    c_stream.zalloc = zalloc;
+    c_stream.zfree = zfree;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (z_const unsigned char *)hello;
+    c_stream.next_out = compr;
+
+    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
+        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
+        err = deflate(&c_stream, Z_NO_FLUSH);
+        CHECK_ERR(err, "deflate");
+    }
+    /* Finish the stream, still forcing small buffers: */
+    for (;;) {
+        c_stream.avail_out = 1;
+        err = deflate(&c_stream, Z_FINISH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "deflate");
+    }
+
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with small buffers
+ */
+void test_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = zalloc;
+    d_stream.zfree = zfree;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 0;
+    d_stream.next_out = uncompr;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
+        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate\n");
+        exit(1);
+    } else {
+        printf("inflate(): %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with large buffers and dynamic change of compression level
+ */
+void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = zalloc;
+    c_stream.zfree = zfree;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_SPEED);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    /* At this point, uncompr is still mostly zeroes, so it should compress
+     * very well:
+     */
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+    if (c_stream.avail_in != 0) {
+        fprintf(stderr, "deflate not greedy\n");
+        exit(1);
+    }
+
+    /* Feed in already compressed data and switch to no compression: */
+    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
+    c_stream.next_in = compr;
+    c_stream.avail_in = (uInt)comprLen/2;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    /* Switch back to compressing mode: */
+    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
+    c_stream.next_in = uncompr;
+    c_stream.avail_in = (uInt)uncomprLen;
+    err = deflate(&c_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with large buffers
+ */
+void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = zalloc;
+    d_stream.zfree = zfree;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    for (;;) {
+        d_stream.next_out = uncompr;            /* discard the output */
+        d_stream.avail_out = (uInt)uncomprLen;
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        CHECK_ERR(err, "large inflate");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
+        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
+        exit(1);
+    } else {
+        printf("large_inflate(): OK\n");
+    }
+}
+
+/* ===========================================================================
+ * Test deflate() with full flush
+ */
+void test_flush(compr, comprLen)
+    Byte *compr;
+    uLong *comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+    uInt len = (uInt)strlen(hello)+1;
+
+    c_stream.zalloc = zalloc;
+    c_stream.zfree = zfree;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    c_stream.next_in  = (z_const unsigned char *)hello;
+    c_stream.next_out = compr;
+    c_stream.avail_in = 3;
+    c_stream.avail_out = (uInt)*comprLen;
+    err = deflate(&c_stream, Z_FULL_FLUSH);
+    CHECK_ERR(err, "deflate");
+
+    compr[3]++; /* force an error in first compressed block */
+    c_stream.avail_in = len - 3;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        CHECK_ERR(err, "deflate");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+
+    *comprLen = c_stream.total_out;
+}
+
+/* ===========================================================================
+ * Test inflateSync()
+ */
+void test_sync(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = zalloc;
+    d_stream.zfree = zfree;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = 2; /* just read the zlib header */
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    err = inflate(&d_stream, Z_NO_FLUSH);
+    CHECK_ERR(err, "inflate");
+
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
+    err = inflateSync(&d_stream);           /* but skip the damaged part */
+    CHECK_ERR(err, "inflateSync");
+
+    err = inflate(&d_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "inflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    printf("after inflateSync(): hel%s\n", (char *)uncompr);
+}
+
+/* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = zalloc;
+    c_stream.zfree = zfree;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+                (const Bytef*)dictionary, (int)sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (z_const unsigned char *)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+        exit(1);
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = zalloc;
+    d_stream.zfree = zfree;
+    d_stream.opaque = (voidpf)0;
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        if (err == Z_NEED_DICT) {
+            if (d_stream.adler != dictId) {
+                fprintf(stderr, "unexpected dictionary");
+                exit(1);
+            }
+            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+                                       (int)sizeof(dictionary));
+        }
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+        exit(1);
+    } else {
+        printf("inflate with dictionary: %s\n", (char *)uncompr);
+    }
+}
+
+/* ===========================================================================
+ * Usage:  example [output.gz  [input.gz]]
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
+    uLong uncomprLen = comprLen;
+    static const char* myVersion = ZLIB_VERSION;
+
+    if (zlibVersion()[0] != myVersion[0]) {
+        fprintf(stderr, "incompatible zlib version\n");
+        exit(1);
+
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
+        fprintf(stderr, "warning: different zlib version linked: %s\n",
+                zlibVersion());
+    }
+
+    printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
+            ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags());
+
+    compr    = (Byte*)calloc((uInt)comprLen, 1);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
+    /* compr and uncompr are cleared to avoid reading uninitialized
+     * data and to ensure that uncompr compresses well.
+     */
+    if (compr == Z_NULL || uncompr == Z_NULL) {
+        printf("out of memory\n");
+        exit(1);
+    }
+
+#ifdef Z_SOLO
+    (void)argc;
+    (void)argv;
+#else
+    test_compress(compr, comprLen, uncompr, uncomprLen);
+
+    test_gzio((argc > 1 ? argv[1] : TESTFILE),
+              uncompr, uncomprLen);
+#endif
+
+    test_deflate(compr, comprLen);
+    test_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
+    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    test_flush(compr, &comprLen);
+    test_sync(compr, comprLen, uncompr, uncomprLen);
+    comprLen = uncomprLen;
+
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+
+    free(compr);
+    free(uncompr);
+
+    return 0;
+}
diff --git a/extra/zlib/zlib-1.2.13/test/infcover.c b/extra/zlib/zlib-1.2.13/test/infcover.c
new file mode 100644
index 000000000000..2be01646cec3
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/test/infcover.c
@@ -0,0 +1,671 @@
+/* infcover.c -- test zlib's inflate routines with full code coverage
+ * Copyright (C) 2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* to use, do: ./configure --cover && make cover */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "zlib.h"
+
+/* get definition of internal structure so we can mess with it (see pull()),
+   and so we can call inflate_trees() (see cover5()) */
+#define ZLIB_INTERNAL
+#include "inftrees.h"
+#include "inflate.h"
+
+#define local static
+
+/* -- memory tracking routines -- */
+
+/*
+   These memory tracking routines are provided to zlib and track all of zlib's
+   allocations and deallocations, check for LIFO operations, keep a current
+   and high water mark of total bytes requested, optionally set a limit on the
+   total memory that can be allocated, and when done check for memory leaks.
+
+   They are used as follows:
+
+   z_stream strm;
+   mem_setup(&strm)         initializes the memory tracking and sets the
+                            zalloc, zfree, and opaque members of strm to use
+                            memory tracking for all zlib operations on strm
+   mem_limit(&strm, limit)  sets a limit on the total bytes requested -- a
+                            request that exceeds this limit will result in an
+                            allocation failure (returns NULL) -- setting the
+                            limit to zero means no limit, which is the default
+                            after mem_setup()
+   mem_used(&strm, "msg")   prints to stderr "msg" and the total bytes used
+   mem_high(&strm, "msg")   prints to stderr "msg" and the high water mark
+   mem_done(&strm, "msg")   ends memory tracking, releases all allocations
+                            for the tracking as well as leaked zlib blocks, if
+                            any.  If there was anything unusual, such as leaked
+                            blocks, non-FIFO frees, or frees of addresses not
+                            allocated, then "msg" and information about the
+                            problem is printed to stderr.  If everything is
+                            normal, nothing is printed. mem_done resets the
+                            strm members to Z_NULL to use the default memory
+                            allocation routines on the next zlib initialization
+                            using strm.
+ */
+
+/* these items are strung together in a linked list, one for each allocation */
+struct mem_item {
+    void *ptr;                  /* pointer to allocated memory */
+    size_t size;                /* requested size of allocation */
+    struct mem_item *next;      /* pointer to next item in list, or NULL */
+};
+
+/* this structure is at the root of the linked list, and tracks statistics */
+struct mem_zone {
+    struct mem_item *first;     /* pointer to first item in list, or NULL */
+    size_t total, highwater;    /* total allocations, and largest total */
+    size_t limit;               /* memory allocation limit, or 0 if no limit */
+    int notlifo, rogue;         /* counts of non-LIFO frees and rogue frees */
+};
+
+/* memory allocation routine to pass to zlib */
+local void *mem_alloc(void *mem, unsigned count, unsigned size)
+{
+    void *ptr;
+    struct mem_item *item;
+    struct mem_zone *zone = mem;
+    size_t len = count * (size_t)size;
+
+    /* induced allocation failure */
+    if (zone == NULL || (zone->limit && zone->total + len > zone->limit))
+        return NULL;
+
+    /* perform allocation using the standard library, fill memory with a
+       non-zero value to make sure that the code isn't depending on zeros */
+    ptr = malloc(len);
+    if (ptr == NULL)
+        return NULL;
+    memset(ptr, 0xa5, len);
+
+    /* create a new item for the list */
+    item = malloc(sizeof(struct mem_item));
+    if (item == NULL) {
+        free(ptr);
+        return NULL;
+    }
+    item->ptr = ptr;
+    item->size = len;
+
+    /* insert item at the beginning of the list */
+    item->next = zone->first;
+    zone->first = item;
+
+    /* update the statistics */
+    zone->total += item->size;
+    if (zone->total > zone->highwater)
+        zone->highwater = zone->total;
+
+    /* return the allocated memory */
+    return ptr;
+}
+
+/* memory free routine to pass to zlib */
+local void mem_free(void *mem, void *ptr)
+{
+    struct mem_item *item, *next;
+    struct mem_zone *zone = mem;
+
+    /* if no zone, just do a free */
+    if (zone == NULL) {
+        free(ptr);
+        return;
+    }
+
+    /* point next to the item that matches ptr, or NULL if not found -- remove
+       the item from the linked list if found */
+    next = zone->first;
+    if (next) {
+        if (next->ptr == ptr)
+            zone->first = next->next;   /* first one is it, remove from list */
+        else {
+            do {                        /* search the linked list */
+                item = next;
+                next = item->next;
+            } while (next != NULL && next->ptr != ptr);
+            if (next) {                 /* if found, remove from linked list */
+                item->next = next->next;
+                zone->notlifo++;        /* not a LIFO free */
+            }
+
+        }
+    }
+
+    /* if found, update the statistics and free the item */
+    if (next) {
+        zone->total -= next->size;
+        free(next);
+    }
+
+    /* if not found, update the rogue count */
+    else
+        zone->rogue++;
+
+    /* in any case, do the requested free with the standard library function */
+    free(ptr);
+}
+
+/* set up a controlled memory allocation space for monitoring, set the stream
+   parameters to the controlled routines, with opaque pointing to the space */
+local void mem_setup(z_stream *strm)
+{
+    struct mem_zone *zone;
+
+    zone = malloc(sizeof(struct mem_zone));
+    assert(zone != NULL);
+    zone->first = NULL;
+    zone->total = 0;
+    zone->highwater = 0;
+    zone->limit = 0;
+    zone->notlifo = 0;
+    zone->rogue = 0;
+    strm->opaque = zone;
+    strm->zalloc = mem_alloc;
+    strm->zfree = mem_free;
+}
+
+/* set a limit on the total memory allocation, or 0 to remove the limit */
+local void mem_limit(z_stream *strm, size_t limit)
+{
+    struct mem_zone *zone = strm->opaque;
+
+    zone->limit = limit;
+}
+
+/* show the current total requested allocations in bytes */
+local void mem_used(z_stream *strm, char *prefix)
+{
+    struct mem_zone *zone = strm->opaque;
+
+    fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
+}
+
+/* show the high water allocation in bytes */
+local void mem_high(z_stream *strm, char *prefix)
+{
+    struct mem_zone *zone = strm->opaque;
+
+    fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
+}
+
+/* release the memory allocation zone -- if there are any surprises, notify */
+local void mem_done(z_stream *strm, char *prefix)
+{
+    int count = 0;
+    struct mem_item *item, *next;
+    struct mem_zone *zone = strm->opaque;
+
+    /* show high water mark */
+    mem_high(strm, prefix);
+
+    /* free leftover allocations and item structures, if any */
+    item = zone->first;
+    while (item != NULL) {
+        free(item->ptr);
+        next = item->next;
+        free(item);
+        item = next;
+        count++;
+    }
+
+    /* issue alerts about anything unexpected */
+    if (count || zone->total)
+        fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
+                prefix, zone->total, count);
+    if (zone->notlifo)
+        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
+    if (zone->rogue)
+        fprintf(stderr, "** %s: %d frees not recognized\n",
+                prefix, zone->rogue);
+
+    /* free the zone and delete from the stream */
+    free(zone);
+    strm->opaque = Z_NULL;
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+}
+
+/* -- inflate test routines -- */
+
+/* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
+   decodes liberally, in that hex digits can be adjacent, in which case two in
+   a row writes a byte.  Or they can be delimited by any non-hex character,
+   where the delimiters are ignored except when a single hex digit is followed
+   by a delimiter, where that single digit writes a byte.  The returned data is
+   allocated and must eventually be freed.  NULL is returned if out of memory.
+   If the length is not needed, then len can be NULL. */
+local unsigned char *h2b(const char *hex, unsigned *len)
+{
+    unsigned char *in, *re;
+    unsigned next, val;
+
+    in = malloc((strlen(hex) + 1) >> 1);
+    if (in == NULL)
+        return NULL;
+    next = 0;
+    val = 1;
+    do {
+        if (*hex >= '0' && *hex <= '9')
+            val = (val << 4) + *hex - '0';
+        else if (*hex >= 'A' && *hex <= 'F')
+            val = (val << 4) + *hex - 'A' + 10;
+        else if (*hex >= 'a' && *hex <= 'f')
+            val = (val << 4) + *hex - 'a' + 10;
+        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
+            val += 240;                 /* make it look like two digits */
+        if (val > 255) {                /* have two digits */
+            in[next++] = val & 0xff;    /* save the decoded byte */
+            val = 1;                    /* start over */
+        }
+    } while (*hex++);       /* go through the loop with the terminating null */
+    if (len != NULL)
+        *len = next;
+    re = realloc(in, next);
+    return re == NULL ? in : re;
+}
+
+/* generic inflate() run, where hex is the hexadecimal input data, what is the
+   text to include in an error message, step is how much input data to feed
+   inflate() on each call, or zero to feed it all, win is the window bits
+   parameter to inflateInit2(), len is the size of the output buffer, and err
+   is the error code expected from the first inflate() call (the second
+   inflate() call is expected to return Z_STREAM_END).  If win is 47, then
+   header information is collected with inflateGetHeader().  If a zlib stream
+   is looking for a dictionary, then an empty dictionary is provided.
+   inflate() is run until all of the input data is consumed. */
+local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
+               int err)
+{
+    int ret;
+    unsigned have;
+    unsigned char *in, *out;
+    z_stream strm, copy;
+    gz_header head;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, win);
+    if (ret != Z_OK) {
+        mem_done(&strm, what);
+        return;
+    }
+    out = malloc(len);                          assert(out != NULL);
+    if (win == 47) {
+        head.extra = out;
+        head.extra_max = len;
+        head.name = out;
+        head.name_max = len;
+        head.comment = out;
+        head.comm_max = len;
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
+    }
+    in = h2b(hex, &have);                       assert(in != NULL);
+    if (step == 0 || step > have)
+        step = have;
+    strm.avail_in = step;
+    have -= step;
+    strm.next_in = in;
+    do {
+        strm.avail_out = len;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_NO_FLUSH);       assert(err == 9 || ret == err);
+        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
+            break;
+        if (ret == Z_NEED_DICT) {
+            ret = inflateSetDictionary(&strm, in, 1);
+                                                assert(ret == Z_DATA_ERROR);
+            mem_limit(&strm, 1);
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_MEM_ERROR);
+            mem_limit(&strm, 0);
+            ((struct inflate_state *)strm.state)->mode = DICT;
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_OK);
+            ret = inflate(&strm, Z_NO_FLUSH);   assert(ret == Z_BUF_ERROR);
+        }
+        ret = inflateCopy(&copy, &strm);        assert(ret == Z_OK);
+        ret = inflateEnd(&copy);                assert(ret == Z_OK);
+        err = 9;                        /* don't care next time around */
+        have += strm.avail_in;
+        strm.avail_in = step > have ? have : step;
+        have -= strm.avail_in;
+    } while (strm.avail_in);
+    free(in);
+    free(out);
+    ret = inflateReset2(&strm, -8);             assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, what);
+}
+
+/* cover all of the lines in inflate.c up to inflate() */
+local void cover_support(void)
+{
+    int ret;
+    z_stream strm;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    mem_used(&strm, "inflate init");
+    ret = inflatePrime(&strm, 5, 31);           assert(ret == Z_OK);
+    ret = inflatePrime(&strm, -1, 0);           assert(ret == Z_OK);
+    ret = inflateSetDictionary(&strm, Z_NULL, 0);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "prime");
+
+    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
+    inf("63 18 5", "force window replacement", 0, -8, 259, Z_OK);
+    inf("63 18 68 30 d0 0 0", "force split window update", 4, -8, 259, Z_OK);
+    inf("3 0", "use fixed blocks", 0, -15, 1, Z_STREAM_END);
+    inf("", "bad window size", 0, 1, 0, Z_STREAM_ERROR);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
+                                                assert(ret == Z_VERSION_ERROR);
+    mem_done(&strm, "wrong version");
+
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    fputs("inflate built-in memory routines\n", stderr);
+}
+
+/* cover all inflate() header and trailer cases and code after inflate() */
+local void cover_wrap(void)
+{
+    int ret;
+    z_stream strm, copy;
+    unsigned char dict[257];
+
+    ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
+    fputs("inflate bad parameters\n", stderr);
+
+    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
+    inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
+    inf("77 85", "bad zlib method", 0, 15, 0, Z_DATA_ERROR);
+    inf("8 99", "set window size from header", 0, 0, 0, Z_OK);
+    inf("78 9c", "bad zlib window size", 0, 8, 0, Z_DATA_ERROR);
+    inf("78 9c 63 0 0 0 1 0 1", "check adler32", 0, 15, 1, Z_STREAM_END);
+    inf("1f 8b 8 1e 0 0 0 0 0 0 1 0 0 0 0 0 0", "bad header crc", 0, 47, 1,
+        Z_DATA_ERROR);
+    inf("1f 8b 8 2 0 0 0 0 0 0 1d 26 3 0 0 0 0 0 0 0 0 0", "check gzip length",
+        0, 47, 0, Z_STREAM_END);
+    inf("78 90", "bad zlib header check", 0, 47, 0, Z_DATA_ERROR);
+    inf("8 b8 0 0 0 1", "need dictionary", 0, 8, 0, Z_NEED_DICT);
+    inf("78 9c 63 0", "compute adler32", 0, 15, 1, Z_OK);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, -8);
+    strm.avail_in = 2;
+    strm.next_in = (void *)"\x63";
+    strm.avail_out = 1;
+    strm.next_out = (void *)&ret;
+    mem_limit(&strm, 1);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    memset(dict, 0, 257);
+    ret = inflateSetDictionary(&strm, dict, 257);
+                                                assert(ret == Z_OK);
+    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
+    ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (void *)"\x80";
+    ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
+    strm.avail_in = 4;
+    strm.next_in = (void *)"\0\0\xff\xff";
+    ret = inflateSync(&strm);                   assert(ret == Z_OK);
+    (void)inflateSyncPoint(&strm);
+    ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    ret = inflateUndermine(&strm, 1);           assert(ret == Z_DATA_ERROR);
+    (void)inflateMark(&strm);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "miscellaneous, force memory errors");
+}
+
+/* input and output functions for inflateBack() */
+local unsigned pull(void *desc, unsigned char **buf)
+{
+    static unsigned int next = 0;
+    static unsigned char dat[] = {0x63, 0, 2, 0};
+    struct inflate_state *state;
+
+    if (desc == Z_NULL) {
+        next = 0;
+        return 0;   /* no input (already provided at next_in) */
+    }
+    state = (void *)((z_stream *)desc)->state;
+    if (state != Z_NULL)
+        state->mode = SYNC;     /* force an otherwise impossible situation */
+    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
+}
+
+local int push(void *desc, unsigned char *buf, unsigned len)
+{
+    buf += len;
+    return desc != Z_NULL;      /* force error if desc not null */
+}
+
+/* cover inflateBack() up to common deflate data cases and after those */
+local void cover_back(void)
+{
+    int ret;
+    z_stream strm;
+    unsigned char win[32768];
+
+    ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
+                                                assert(ret == Z_VERSION_ERROR);
+    ret = inflateBackInit(Z_NULL, 0, win);      assert(ret == Z_STREAM_ERROR);
+    ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
+    fputs("inflateBack bad parameters\n", stderr);
+
+    mem_setup(&strm);
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (void *)"\x03";
+    ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+                                                assert(ret == Z_STREAM_END);
+        /* force output error */
+    strm.avail_in = 3;
+    strm.next_in = (void *)"\x63\x00";
+    ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
+                                                assert(ret == Z_BUF_ERROR);
+        /* force mode error by mucking with state */
+    ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    mem_done(&strm, "inflateBack bad state");
+
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    fputs("inflateBack built-in memory routines\n", stderr);
+}
+
+/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
+local int try(char *hex, char *id, int err)
+{
+    int ret;
+    unsigned len, size;
+    unsigned char *in, *out, *win;
+    char *prefix;
+    z_stream strm;
+
+    /* convert to hex */
+    in = h2b(hex, &len);
+    assert(in != NULL);
+
+    /* allocate work areas */
+    size = len << 3;
+    out = malloc(size);
+    assert(out != NULL);
+    win = malloc(32768);
+    assert(win != NULL);
+    prefix = malloc(strlen(id) + 6);
+    assert(prefix != NULL);
+
+    /* first with inflate */
+    strcpy(prefix, id);
+    strcat(prefix, "-late");
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, err < 0 ? 47 : -15);
+    assert(ret == Z_OK);
+    strm.avail_in = len;
+    strm.next_in = in;
+    do {
+        strm.avail_out = size;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_TREES);
+        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
+        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
+            break;
+    } while (strm.avail_in || strm.avail_out == 0);
+    if (err) {
+        assert(ret == Z_DATA_ERROR);
+        assert(strcmp(id, strm.msg) == 0);
+    }
+    inflateEnd(&strm);
+    mem_done(&strm, prefix);
+
+    /* then with inflateBack */
+    if (err >= 0) {
+        strcpy(prefix, id);
+        strcat(prefix, "-back");
+        mem_setup(&strm);
+        ret = inflateBackInit(&strm, 15, win);
+        assert(ret == Z_OK);
+        strm.avail_in = len;
+        strm.next_in = in;
+        ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+        assert(ret != Z_STREAM_ERROR);
+        if (err) {
+            assert(ret == Z_DATA_ERROR);
+            assert(strcmp(id, strm.msg) == 0);
+        }
+        inflateBackEnd(&strm);
+        mem_done(&strm, prefix);
+    }
+
+    /* clean up */
+    free(prefix);
+    free(win);
+    free(out);
+    free(in);
+    return ret;
+}
+
+/* cover deflate data cases in both inflate() and inflateBack() */
+local void cover_inflate(void)
+{
+    try("0 0 0 0 0", "invalid stored block lengths", 1);
+    try("3 0", "fixed", 0);
+    try("6", "invalid block type", 1);
+    try("1 1 0 fe ff 0", "stored", 0);
+    try("fc 0 0", "too many length or distance symbols", 1);
+    try("4 0 fe ff", "invalid code lengths set", 1);
+    try("4 0 24 49 0", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
+    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
+        "invalid literal/lengths set", 1);
+    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
+    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
+    try("2 7e ff ff", "invalid distance code", 1);
+    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
+
+    /* also trailer mismatch just in inflate() */
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
+        "incorrect length check", -1);
+    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
+    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
+        "long code", 0);
+    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
+    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
+        "long distance and extra", 0);
+    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
+        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
+    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
+        Z_STREAM_END);
+    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
+}
+
+/* cover remaining lines in inftrees.c */
+local void cover_trees(void)
+{
+    int ret;
+    unsigned bits;
+    unsigned short lens[16], work[16];
+    code *next, table[ENOUGH_DISTS];
+
+    /* we need to call inflate_table() directly in order to manifest not-
+       enough errors, since zlib insures that enough is always enough */
+    for (bits = 0; bits < 15; bits++)
+        lens[bits] = (unsigned short)(bits + 1);
+    lens[15] = 15;
+    next = table;
+    bits = 15;
+    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+                                                assert(ret == 1);
+    next = table;
+    bits = 1;
+    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+                                                assert(ret == 1);
+    fputs("inflate_table not enough errors\n", stderr);
+}
+
+/* cover remaining inffast.c decoding and window copying */
+local void cover_fast(void)
+{
+    inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
+        " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
+    inf("25 fd 81 b5 6d 59 b6 6a 49 ea af 35 6 34 eb 8c b9 f6 b9 1e ef 67 49"
+        " 50 fe ff ff 3f 0 0", "fast distance extra bits", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("3 7e 0 0 0 0 0", "fast invalid distance code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("1b 7 0 0 0 0 0", "fast invalid literal/length code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("d c7 1 ae eb 38 c 4 41 a0 87 72 de df fb 1f b8 36 b1 38 5d ff ff 0",
+        "fast 2nd level codes and too far back", 0, -8, 258, Z_DATA_ERROR);
+    inf("63 18 5 8c 10 8 0 0 0 0", "very common case", 0, -8, 259, Z_OK);
+    inf("63 60 60 18 c9 0 8 18 18 18 26 c0 28 0 29 0 0 0",
+        "contiguous and wrap around window", 6, -8, 259, Z_OK);
+    inf("63 0 3 0 0 0 0 0", "copy direct from output", 0, -8, 259,
+        Z_STREAM_END);
+}
+
+int main(void)
+{
+    fprintf(stderr, "%s\n", zlibVersion());
+    cover_support();
+    cover_wrap();
+    cover_back();
+    cover_inflate();
+    cover_trees();
+    cover_fast();
+    return 0;
+}
diff --git a/extra/zlib/zlib-1.2.13/test/minigzip.c b/extra/zlib/zlib-1.2.13/test/minigzip.c
new file mode 100644
index 000000000000..a649d2b3d9ba
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/test/minigzip.c
@@ -0,0 +1,651 @@
+/* minigzip.c -- simulate gzip using the zlib compression library
+ * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * minigzip is a minimal implementation of the gzip utility. This is
+ * only an example of using zlib and isn't meant to replace the
+ * full-featured gzip. No attempt is made to deal with file systems
+ * limiting names to 14 or 8+3 characters, etc... Error checking is
+ * very limited. So use minigzip only for testing; use gzip for the
+ * real thing. On MSDOS, use only on file names without extension
+ * or in pipe mode.
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+#include <stdio.h>
+
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef USE_MMAP
+#  include <sys/types.h>
+#  include <sys/mman.h>
+#  include <sys/stat.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+#  include <fcntl.h>
+#  include <io.h>
+#  ifdef UNDER_CE
+#    include <stdlib.h>
+#  endif
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#  define SET_BINARY_MODE(file)
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#  define snprintf _snprintf
+#endif
+
+#ifdef VMS
+#  define unlink delete
+#  define GZ_SUFFIX "-gz"
+#endif
+#ifdef RISCOS
+#  define unlink remove
+#  define GZ_SUFFIX "-gz"
+#  define fileno(file) file->__file
+#endif
+#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#  include <unix.h> /* for fileno */
+#endif
+
+#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
+#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+  extern int unlink OF((const char *));
+#endif
+#endif
+
+#if defined(UNDER_CE)
+#  include <windows.h>
+#  define perror(s) pwinerror(s)
+
+/* Map the Windows error number in ERROR to a locale-dependent error
+   message string and return a pointer to it.  Typically, the values
+   for ERROR come from GetLastError.
+
+   The string pointed to shall not be modified by the application,
+   but may be overwritten by a subsequent call to strwinerror
+
+   The strwinerror function does not change the current setting
+   of GetLastError.  */
+
+static char *strwinerror (error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+static void pwinerror (s)
+    const char *s;
+{
+    if (s && *s)
+        fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
+    else
+        fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
+}
+
+#endif /* UNDER_CE */
+
+#ifndef GZ_SUFFIX
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+
+#define BUFLEN      16384
+#define MAX_NAME_LEN 1024
+
+#ifdef MAXSEG_64K
+#  define local static
+   /* Needed for systems with limitation on stack size. */
+#else
+#  define local
+#endif
+
+#ifdef Z_SOLO
+/* for Z_SOLO, create simplified gz* functions using deflate and inflate */
+
+#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
+#  include <unistd.h>       /* for unlink() */
+#endif
+
+void *myalloc OF((void *, unsigned, unsigned));
+void myfree OF((void *, void *));
+
+void *myalloc(q, n, m)
+    void *q;
+    unsigned n, m;
+{
+    (void)q;
+    return calloc(n, m);
+}
+
+void myfree(q, p)
+    void *q, *p;
+{
+    (void)q;
+    free(p);
+}
+
+typedef struct gzFile_s {
+    FILE *file;
+    int write;
+    int err;
+    char *msg;
+    z_stream strm;
+} *gzFile;
+
+gzFile gzopen OF((const char *, const char *));
+gzFile gzdopen OF((int, const char *));
+gzFile gz_open OF((const char *, int, const char *));
+
+gzFile gzopen(path, mode)
+const char *path;
+const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+gzFile gzdopen(fd, mode)
+int fd;
+const char *mode;
+{
+    return gz_open(NULL, fd, mode);
+}
+
+gzFile gz_open(path, fd, mode)
+    const char *path;
+    int fd;
+    const char *mode;
+{
+    gzFile gz;
+    int ret;
+
+    gz = malloc(sizeof(struct gzFile_s));
+    if (gz == NULL)
+        return NULL;
+    gz->write = strchr(mode, 'w') != NULL;
+    gz->strm.zalloc = myalloc;
+    gz->strm.zfree = myfree;
+    gz->strm.opaque = Z_NULL;
+    if (gz->write)
+        ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
+    else {
+        gz->strm.next_in = 0;
+        gz->strm.avail_in = Z_NULL;
+        ret = inflateInit2(&(gz->strm), 15 + 16);
+    }
+    if (ret != Z_OK) {
+        free(gz);
+        return NULL;
+    }
+    gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
+                              fopen(path, gz->write ? "wb" : "rb");
+    if (gz->file == NULL) {
+        gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
+        free(gz);
+        return NULL;
+    }
+    gz->err = 0;
+    gz->msg = "";
+    return gz;
+}
+
+int gzwrite OF((gzFile, const void *, unsigned));
+
+int gzwrite(gz, buf, len)
+    gzFile gz;
+    const void *buf;
+    unsigned len;
+{
+    z_stream *strm;
+    unsigned char out[BUFLEN];
+
+    if (gz == NULL || !gz->write)
+        return 0;
+    strm = &(gz->strm);
+    strm->next_in = (void *)buf;
+    strm->avail_in = len;
+    do {
+        strm->next_out = out;
+        strm->avail_out = BUFLEN;
+        (void)deflate(strm, Z_NO_FLUSH);
+        fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
+    } while (strm->avail_out == 0);
+    return len;
+}
+
+int gzread OF((gzFile, void *, unsigned));
+
+int gzread(gz, buf, len)
+    gzFile gz;
+    void *buf;
+    unsigned len;
+{
+    int ret;
+    unsigned got;
+    unsigned char in[1];
+    z_stream *strm;
+
+    if (gz == NULL || gz->write)
+        return 0;
+    if (gz->err)
+        return 0;
+    strm = &(gz->strm);
+    strm->next_out = (void *)buf;
+    strm->avail_out = len;
+    do {
+        got = fread(in, 1, 1, gz->file);
+        if (got == 0)
+            break;
+        strm->next_in = in;
+        strm->avail_in = 1;
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_DATA_ERROR) {
+            gz->err = Z_DATA_ERROR;
+            gz->msg = strm->msg;
+            return 0;
+        }
+        if (ret == Z_STREAM_END)
+            inflateReset(strm);
+    } while (strm->avail_out);
+    return len - strm->avail_out;
+}
+
+int gzclose OF((gzFile));
+
+int gzclose(gz)
+    gzFile gz;
+{
+    z_stream *strm;
+    unsigned char out[BUFLEN];
+
+    if (gz == NULL)
+        return Z_STREAM_ERROR;
+    strm = &(gz->strm);
+    if (gz->write) {
+        strm->next_in = Z_NULL;
+        strm->avail_in = 0;
+        do {
+            strm->next_out = out;
+            strm->avail_out = BUFLEN;
+            (void)deflate(strm, Z_FINISH);
+            fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
+        } while (strm->avail_out == 0);
+        deflateEnd(strm);
+    }
+    else
+        inflateEnd(strm);
+    fclose(gz->file);
+    free(gz);
+    return Z_OK;
+}
+
+const char *gzerror OF((gzFile, int *));
+
+const char *gzerror(gz, err)
+    gzFile gz;
+    int *err;
+{
+    *err = gz->err;
+    return gz->msg;
+}
+
+#endif
+
+static char *prog;
+
+void error            OF((const char *msg));
+void gz_compress      OF((FILE   *in, gzFile out));
+#ifdef USE_MMAP
+int  gz_compress_mmap OF((FILE   *in, gzFile out));
+#endif
+void gz_uncompress    OF((gzFile in, FILE   *out));
+void file_compress    OF((char  *file, char *mode));
+void file_uncompress  OF((char  *file));
+int  main             OF((int argc, char *argv[]));
+
+/* ===========================================================================
+ * Display error message and exit
+ */
+void error(msg)
+    const char *msg;
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+    exit(1);
+}
+
+/* ===========================================================================
+ * Compress input to output then close both files.
+ */
+
+void gz_compress(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+#ifdef USE_MMAP
+    /* Try first compressing with mmap. If mmap fails (minigzip used in a
+     * pipe), use the normal fread loop.
+     */
+    if (gz_compress_mmap(in, out) == Z_OK) return;
+#endif
+    for (;;) {
+        len = (int)fread(buf, 1, sizeof(buf), in);
+        if (ferror(in)) {
+            perror("fread");
+            exit(1);
+        }
+        if (len == 0) break;
+
+        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
+    }
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+}
+
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+
+/* Try compressing the input file at once using mmap. Return Z_OK if
+ * if success, Z_ERRNO otherwise.
+ */
+int gz_compress_mmap(in, out)
+    FILE   *in;
+    gzFile out;
+{
+    int len;
+    int err;
+    int ifd = fileno(in);
+    caddr_t buf;    /* mmap'ed buffer for the entire input file */
+    off_t buf_len;  /* length of the input file */
+    struct stat sb;
+
+    /* Determine the size of the file, needed for mmap: */
+    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
+    buf_len = sb.st_size;
+    if (buf_len <= 0) return Z_ERRNO;
+
+    /* Now do the actual mmap: */
+    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    if (buf == (caddr_t)(-1)) return Z_ERRNO;
+
+    /* Compress the whole file at once: */
+    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
+
+    if (len != (int)buf_len) error(gzerror(out, &err));
+
+    munmap(buf, buf_len);
+    fclose(in);
+    if (gzclose(out) != Z_OK) error("failed gzclose");
+    return Z_OK;
+}
+#endif /* USE_MMAP */
+
+/* ===========================================================================
+ * Uncompress input to output then close both files.
+ */
+void gz_uncompress(in, out)
+    gzFile in;
+    FILE   *out;
+{
+    local char buf[BUFLEN];
+    int len;
+    int err;
+
+    for (;;) {
+        len = gzread(in, buf, sizeof(buf));
+        if (len < 0) error (gzerror(in, &err));
+        if (len == 0) break;
+
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+            error("failed fwrite");
+        }
+    }
+    if (fclose(out)) error("failed fclose");
+
+    if (gzclose(in) != Z_OK) error("failed gzclose");
+}
+
+
+/* ===========================================================================
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+void file_compress(file, mode)
+    char  *file;
+    char  *mode;
+{
+    local char outfile[MAX_NAME_LEN];
+    FILE  *in;
+    gzFile out;
+
+    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
+        fprintf(stderr, "%s: filename too long\n", prog);
+        exit(1);
+    }
+
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
+#else
+    strcpy(outfile, file);
+    strcat(outfile, GZ_SUFFIX);
+#endif
+
+    in = fopen(file, "rb");
+    if (in == NULL) {
+        perror(file);
+        exit(1);
+    }
+    out = gzopen(outfile, mode);
+    if (out == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+        exit(1);
+    }
+    gz_compress(in, out);
+
+    unlink(file);
+}
+
+
+/* ===========================================================================
+ * Uncompress the given file and remove the original.
+ */
+void file_uncompress(file)
+    char  *file;
+{
+    local char buf[MAX_NAME_LEN];
+    char *infile, *outfile;
+    FILE  *out;
+    gzFile in;
+    z_size_t len = strlen(file);
+
+    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
+        fprintf(stderr, "%s: filename too long\n", prog);
+        exit(1);
+    }
+
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(buf, sizeof(buf), "%s", file);
+#else
+    strcpy(buf, file);
+#endif
+
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+        infile = file;
+        outfile = buf;
+        outfile[len-3] = '\0';
+    } else {
+        outfile = file;
+        infile = buf;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
+#else
+        strcat(infile, GZ_SUFFIX);
+#endif
+    }
+    in = gzopen(infile, "rb");
+    if (in == NULL) {
+        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+        exit(1);
+    }
+    out = fopen(outfile, "wb");
+    if (out == NULL) {
+        perror(file);
+        exit(1);
+    }
+
+    gz_uncompress(in, out);
+
+    unlink(infile);
+}
+
+
+/* ===========================================================================
+ * Usage:  minigzip [-c] [-d] [-f] [-h] [-r] [-1 to -9] [files...]
+ *   -c : write to standard output
+ *   -d : decompress
+ *   -f : compress with Z_FILTERED
+ *   -h : compress with Z_HUFFMAN_ONLY
+ *   -r : compress with Z_RLE
+ *   -1 to -9 : compression level
+ */
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    int copyout = 0;
+    int uncompr = 0;
+    gzFile file;
+    char *bname, outmode[20];
+
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(outmode, sizeof(outmode), "%s", "wb6 ");
+#else
+    strcpy(outmode, "wb6 ");
+#endif
+
+    prog = argv[0];
+    bname = strrchr(argv[0], '/');
+    if (bname)
+      bname++;
+    else
+      bname = argv[0];
+    argc--, argv++;
+
+    if (!strcmp(bname, "gunzip"))
+      uncompr = 1;
+    else if (!strcmp(bname, "zcat"))
+      copyout = uncompr = 1;
+
+    while (argc > 0) {
+      if (strcmp(*argv, "-c") == 0)
+        copyout = 1;
+      else if (strcmp(*argv, "-d") == 0)
+        uncompr = 1;
+      else if (strcmp(*argv, "-f") == 0)
+        outmode[3] = 'f';
+      else if (strcmp(*argv, "-h") == 0)
+        outmode[3] = 'h';
+      else if (strcmp(*argv, "-r") == 0)
+        outmode[3] = 'R';
+      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
+               (*argv)[2] == 0)
+        outmode[2] = (*argv)[1];
+      else
+        break;
+      argc--, argv++;
+    }
+    if (outmode[3] == ' ')
+        outmode[3] = 0;
+    if (argc == 0) {
+        SET_BINARY_MODE(stdin);
+        SET_BINARY_MODE(stdout);
+        if (uncompr) {
+            file = gzdopen(fileno(stdin), "rb");
+            if (file == NULL) error("can't gzdopen stdin");
+            gz_uncompress(file, stdout);
+        } else {
+            file = gzdopen(fileno(stdout), outmode);
+            if (file == NULL) error("can't gzdopen stdout");
+            gz_compress(stdin, file);
+        }
+    } else {
+        if (copyout) {
+            SET_BINARY_MODE(stdout);
+        }
+        do {
+            if (uncompr) {
+                if (copyout) {
+                    file = gzopen(*argv, "rb");
+                    if (file == NULL)
+                        fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
+                    else
+                        gz_uncompress(file, stdout);
+                } else {
+                    file_uncompress(*argv);
+                }
+            } else {
+                if (copyout) {
+                    FILE * in = fopen(*argv, "rb");
+
+                    if (in == NULL) {
+                        perror(*argv);
+                    } else {
+                        file = gzdopen(fileno(stdout), outmode);
+                        if (file == NULL) error("can't gzdopen stdout");
+
+                        gz_compress(in, file);
+                    }
+
+                } else {
+                    file_compress(*argv, outmode);
+                }
+            }
+        } while (argv++, --argc);
+    }
+    return 0;
+}
diff --git a/extra/zlib/zlib-1.2.13/treebuild.xml b/extra/zlib/zlib-1.2.13/treebuild.xml
new file mode 100644
index 000000000000..0017a45d3c5c
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/treebuild.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" ?>
+<package name="zlib" version="1.2.13">
+    <library name="zlib" dlversion="1.2.13" dlname="z">
+	<property name="description"> zip compression library </property>
+	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
+
+	<!-- fixme: not implemented yet -->
+	<property name="compiler/c/inline" value="yes" />
+
+	<include-file name="zlib.h" scope="public" mode="644" />
+	<include-file name="zconf.h" scope="public" mode="644" />
+
+	<source name="adler32.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="compress.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="crc32.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="crc32.h" />
+	</source>
+	<source name="gzclose.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzlib.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzread.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="gzwrite.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="gzguts.h" />
+	</source>
+	<source name="uncompr.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	</source>
+	<source name="deflate.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="deflate.h" />
+	</source>
+	<source name="trees.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="deflate.h" />
+	    <depend name="trees.h" />
+	</source>
+	<source name="zutil.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	</source>
+	<source name="inflate.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+	<source name="infback.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+	<source name="inftrees.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	</source>
+	<source name="inffast.c">
+	    <depend name="zlib.h" />
+	    <depend name="zconf.h" />
+	    <depend name="zutil.h" />
+	    <depend name="inftrees.h" />
+	    <depend name="inflate.h" />
+	    <depend name="inffast.h" />
+	</source>
+    </library>
+</package>
+
+<!--
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DZLIB_DEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+#           -Wstrict-prototypes -Wmissing-prototypes
+
+# OBJA =
+# to use the asm code: make OBJA=match.o
+#
+match.o: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c _match.s
+	mv _match.o match.o
+	rm -f _match.s
+-->
diff --git a/zlib/trees.c b/extra/zlib/zlib-1.2.13/trees.c
similarity index 79%
rename from zlib/trees.c
rename to extra/zlib/zlib-1.2.13/trees.c
index 78024e8d4cc0..5f305c47221e 100644
--- a/zlib/trees.c
+++ b/extra/zlib/zlib-1.2.13/trees.c
@@ -1,5 +1,6 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2005 Jean-loup Gailly
+ * Copyright (C) 1995-2021 Jean-loup Gailly
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -35,7 +36,7 @@
 
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #endif
 
@@ -73,11 +74,6 @@ local const uch bl_order[BL_CODES]
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -126,13 +122,13 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+local const static_tree_desc  static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local const static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local const static_tree_desc  static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
@@ -150,24 +146,22 @@ local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
 local int  build_bl_tree  OF((deflate_state *s));
 local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned code, int len));
 local void bi_windup      OF((deflate_state *s));
 local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
 
 #ifdef GEN_TREES_H
 local void gen_trees_header OF((void));
 #endif
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
    /* Send a code of the given tree. c and tree must not have side effects */
 
-#else /* DEBUG */
+#else /* !ZLIB_DEBUG */
 #  define send_code(s, c, tree) \
      { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
        send_bits(s, tree[c].Code, tree[c].Len); }
@@ -186,7 +180,7 @@ local void gen_trees_header OF((void));
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
@@ -199,35 +193,35 @@ local void send_bits(s, value, length)
     s->bits_sent += (ulg)length;
 
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
+        s->bi_buf |= (ush)value << s->bi_valid;
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
         s->bi_valid += length - Buf_size;
     } else {
-        s->bi_buf |= value << s->bi_valid;
+        s->bi_buf |= (ush)value << s->bi_valid;
         s->bi_valid += length;
     }
 }
-#else /* !DEBUG */
+#else /* !ZLIB_DEBUG */
 
 #define send_bits(s, value, length) \
 { int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
+    int val = (int)value;\
+    s->bi_buf |= (ush)val << s->bi_valid;\
     put_short(s, s->bi_buf);\
     s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
     s->bi_valid += len - Buf_size;\
   } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
     s->bi_valid += len;\
   }\
 }
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
 
 
 /* the arguments must not have side effects */
@@ -250,17 +244,19 @@ local void tr_static_init()
     if (static_init_done) return;
 
     /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
     static_l_desc.static_tree = static_ltree;
     static_l_desc.extra_bits = extra_lbits;
     static_d_desc.static_tree = static_dtree;
     static_d_desc.extra_bits = extra_dbits;
     static_bl_desc.extra_bits = extra_blbits;
+#endif
 
     /* Initialize the mapping length (0..255) -> length code (0..28) */
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -269,13 +265,13 @@ local void tr_static_init()
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -283,11 +279,11 @@ local void tr_static_init()
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -316,16 +312,16 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
-#  ifndef DEBUG
+#  ifndef ZLIB_DEBUG
 #    include <stdio.h>
 #  endif
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
 void gen_trees_header()
 {
@@ -348,13 +344,14 @@ void gen_trees_header()
                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
     }
 
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
                 SEPARATOR(i, DIST_CODE_LEN-1, 20));
     }
 
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
@@ -379,7 +376,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void _tr_init(s)
+void ZLIB_INTERNAL _tr_init(s)
     deflate_state *s;
 {
     tr_static_init();
@@ -395,8 +392,7 @@ void _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
 #endif
@@ -420,7 +416,7 @@ local void init_block(s)
 
     s->dyn_ltree[END_BLOCK].Freq = 1;
     s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
+    s->sym_next = s->matches = 0;
 }
 
 #define SMALLEST 1
@@ -462,7 +458,7 @@ local void pqdownheap(s, tree, k)
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -511,7 +507,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
         if (bits > max_length) bits = max_length, overflow++;
@@ -522,22 +518,22 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
+        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
     }
     if (overflow == 0) return;
 
-    Trace((stderr,"\nbit length overflow\n"));
+    Tracev((stderr,"\nbit length overflow\n"));
     /* This happens for example on obj2 and pic of the Calgary corpus */
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -556,9 +552,8 @@ local void gen_bitlen(s, desc)
             m = s->heap[--h];
             if (m > max_code) continue;
             if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
+                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -574,13 +569,13 @@ local void gen_bitlen(s, desc)
  * OUT assertion: the field code is set for all tree elements of non
  *     zero code length.
  */
-local void gen_codes (tree, max_code, bl_count)
+local void gen_codes(tree, max_code, bl_count)
     ct_data *tree;             /* the tree to decorate */
     int max_code;              /* largest code with non zero frequency */
     ushf *bl_count;            /* number of codes at each bit length */
 {
     ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
+    unsigned code = 0;         /* running code value */
     int bits;                  /* bit index */
     int n;                     /* code index */
 
@@ -588,12 +583,13 @@ local void gen_codes (tree, max_code, bl_count)
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
      */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
             "inconsistent bit counts");
     Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
 
@@ -601,10 +597,10 @@ local void gen_codes (tree, max_code, bl_count)
         int len = tree[n].Len;
         if (len == 0) continue;
         /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
 
         Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
     }
 }
 
@@ -628,7 +624,7 @@ local void build_tree(s, desc)
     int node;          /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
      * heap[0] is not used.
      */
     s->heap_len = 0, s->heap_max = HEAP_SIZE;
@@ -656,7 +652,7 @@ local void build_tree(s, desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
     for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -704,7 +700,7 @@ local void build_tree(s, desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (s, tree, max_code)
+local void scan_tree(s, tree, max_code)
     deflate_state *s;
     ct_data *tree;   /* the tree to be scanned */
     int max_code;    /* and its largest code of non zero frequency */
@@ -718,10 +714,10 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -749,7 +745,7 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (s, tree, max_code)
+local void send_tree(s, tree, max_code)
     deflate_state *s;
     ct_data *tree; /* the tree to be scanned */
     int max_code;       /* and its largest code of non zero frequency */
@@ -762,11 +758,11 @@ local void send_tree (s, tree, max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
     if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -777,13 +773,13 @@ local void send_tree (s, tree, max_code)
                 send_code(s, curlen, s->bl_tree); count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
@@ -811,8 +807,8 @@ local int build_bl_tree(s)
 
     /* Build the bit length tree: */
     build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
      */
 
     /* Determine the number of bit length codes to send. The pkzip format
@@ -823,7 +819,7 @@ local int build_bl_tree(s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -845,84 +841,79 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
     Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
             "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
 /* ===========================================================================
  * Send a stored block
  */
-void _tr_stored_block(s, buf, stored_len, eof)
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
+    int last;         /* one if this is the last block for a file */
 {
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-#ifdef DEBUG
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
+    bi_windup(s);        /* align on byte boundary */
+    put_short(s, (ush)stored_len);
+    put_short(s, (ush)~stored_len);
+    if (stored_len)
+        zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    s->pending += stored_len;
+#ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
+    s->bits_sent += 2*16;
+    s->bits_sent += stored_len << 3;
 #endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
 }
 
 /* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
  */
-void _tr_align(s)
+void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * trees or store, and write out the encoded block.
  */
-void _tr_flush_block(s, buf, stored_len, eof)
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
+    int last;         /* one if this is the last block for a file */
 {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
@@ -931,8 +922,8 @@ void _tr_flush_block(s, buf, stored_len, eof)
     if (s->level > 0) {
 
         /* Check if the file is binary or text */
-        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
-            set_data_type(s);
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
 
         /* Construct the literal and distance trees */
         build_tree(s, (tree_desc *)(&(s->l_desc)));
@@ -952,14 +943,17 @@ void _tr_flush_block(s, buf, stored_len, eof)
         max_blindex = build_bl_tree(s);
 
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
+                s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -969,7 +963,7 @@ void _tr_flush_block(s, buf, stored_len, eof)
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -978,24 +972,22 @@ void _tr_flush_block(s, buf, stored_len, eof)
          * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
          * transform a block into a stored block.
          */
-        _tr_stored_block(s, buf, stored_len, eof);
+        _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
     }
@@ -1005,27 +997,28 @@ void _tr_flush_block(s, buf, stored_len, eof)
      */
     init_block(s);
 
-    if (eof) {
+    if (last) {
         bi_windup(s);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally(s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+    unsigned lc;    /* match length - MIN_MATCH or unmatched char (dist==0) */
 {
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
+    s->sym_buf[s->sym_next++] = (uch)dist;
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+    s->sym_buf[s->sym_next++] = (uch)lc;
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
@@ -1037,33 +1030,10 @@ int _tr_tally (s, dist, lc)
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
+    return (s->sym_next == s->sym_end);
 }
 
 /* ===========================================================================
@@ -1071,25 +1041,26 @@ int _tr_tally (s, dist, lc)
  */
 local void compress_block(s, ltree, dtree)
     deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
 {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
+    unsigned sx = 0;    /* running index in sym_buf */
     unsigned code;      /* the code to send */
     int extra;          /* number of extra bits to send */
 
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
+    if (s->sym_next != 0) do {
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
         if (dist == 0) {
             send_code(s, lc, ltree); /* send a literal byte */
             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
         } else {
             /* Here, lc is the match length - MIN_MATCH */
             code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
             extra = extra_lbits[code];
             if (extra != 0) {
                 lc -= base_length[code];
@@ -1102,40 +1073,59 @@ local void compress_block(s, ltree, dtree)
             send_code(s, code, dtree);       /* send the distance code */
             extra = extra_dbits[code];
             if (extra != 0) {
-                dist -= base_dist[code];
+                dist -= (unsigned)base_dist[code];
                 send_bits(s, dist, extra);   /* send the extra distance bits */
             }
         } /* literal or match pair ? */
 
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
+        /* Check that the overlay between pending_buf and sym_buf is ok: */
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
 
-    } while (lx < s->last_lit);
+    } while (sx < s->sym_next);
 
     send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
- * Set the data type to BINARY or TEXT, using a crude approximation:
- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "block list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
  * IN assertion: the fields Freq of dyn_ltree are set.
  */
-local void set_data_type(s)
+local int detect_data_type(s)
     deflate_state *s;
 {
+    /* block_mask is the bit mask of block-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long block_mask = 0xf3ffc07fUL;
     int n;
 
-    for (n = 0; n < 9; n++)
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("allow-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
         if (s->dyn_ltree[n].Freq != 0)
-            break;
-    if (n == 9)
-        for (n = 14; n < 32; n++)
-            if (s->dyn_ltree[n].Freq != 0)
-                break;
-    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
+            return Z_TEXT;
+
+    /* There are no "block-listed" or "allow-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
 }
 
 /* ===========================================================================
@@ -1147,7 +1137,7 @@ local unsigned bi_reverse(code, len)
     unsigned code; /* the value to invert */
     int len;       /* its bit length */
 {
-    unsigned res = 0;
+    register unsigned res = 0;
     do {
         res |= code & 1;
         code >>= 1, res <<= 1;
@@ -1185,35 +1175,7 @@ local void bi_windup(s)
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~7;
 #endif
 }
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff --git a/zlib/trees.h b/extra/zlib/zlib-1.2.13/trees.h
similarity index 98%
rename from zlib/trees.h
rename to extra/zlib/zlib-1.2.13/trees.h
index 72facf900f77..d35639d82a27 100644
--- a/zlib/trees.h
+++ b/extra/zlib/zlib-1.2.13/trees.h
@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 
-const uch _dist_code[DIST_CODE_LEN] = {
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
diff --git a/extra/zlib/zlib-1.2.13/uncompr.c b/extra/zlib/zlib-1.2.13/uncompr.c
new file mode 100644
index 000000000000..f9532f46c1a6
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/uncompr.c
@@ -0,0 +1,93 @@
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  *sourceLen is
+   the byte length of the source buffer. Upon entry, *destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data. (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit,
+   *destLen is the size of the decompressed data and *sourceLen is the number
+   of source bytes consumed. Upon return, source + *sourceLen points to the
+   first unused input byte.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+   Z_DATA_ERROR if the input data was corrupted, including if the input data is
+   an incomplete zlib stream.
+*/
+int ZEXPORT uncompress2(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong *sourceLen;
+{
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong len, left;
+    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
+
+    len = *sourceLen;
+    if (*destLen) {
+        left = *destLen;
+        *destLen = 0;
+    }
+    else {
+        left = 1;
+        dest = buf;
+    }
+
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    stream.next_out = dest;
+    stream.avail_out = 0;
+
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = len > (uLong)max ? max : (uInt)len;
+            len -= stream.avail_in;
+        }
+        err = inflate(&stream, Z_NO_FLUSH);
+    } while (err == Z_OK);
+
+    *sourceLen -= len + stream.avail_in;
+    if (dest != buf)
+        *destLen = stream.total_out;
+    else if (stream.total_out && err == Z_BUF_ERROR)
+        left = 1;
+
+    inflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK :
+           err == Z_NEED_DICT ? Z_DATA_ERROR  :
+           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+           err;
+}
+
+int ZEXPORT uncompress(dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return uncompress2(dest, destLen, source, &sourceLen);
+}
diff --git a/extra/zlib/zlib-1.2.13/watcom/watcom_f.mak b/extra/zlib/zlib-1.2.13/watcom/watcom_f.mak
new file mode 100644
index 000000000000..37f4d74c19c0
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/watcom/watcom_f.mak
@@ -0,0 +1,43 @@
+# Makefile for zlib
+# OpenWatcom flat model
+# Last updated: 28-Dec-2005
+
+# To use, do "wmake -f watcom_f.mak"
+
+C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
+	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
+            infback.c  inffast.c  inflate.c inftrees.c   &
+            trees.c    uncompr.c  zutil.c
+
+OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
+	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
+            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
+            trees.obj    uncompr.obj  zutil.obj
+
+CC       = wcc386
+LINKER   = wcl386
+CFLAGS   = -zq -mf -3r -fp3 -s -bt=dos -oilrtfm -fr=nul -wx
+ZLIB_LIB = zlib_f.lib
+
+.C.OBJ:
+        $(CC) $(CFLAGS) $[@
+
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+$(ZLIB_LIB): $(OBJS)
+	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
+	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
+        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
+        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
+        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
+
+example.exe: $(ZLIB_LIB) example.obj
+	$(LINKER) -ldos32a -fe=example.exe example.obj $(ZLIB_LIB)
+
+minigzip.exe: $(ZLIB_LIB) minigzip.obj
+	$(LINKER) -ldos32a -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
+
+clean: .SYMBOLIC
+          del *.obj
+          del $(ZLIB_LIB)
+          @echo Cleaning done
diff --git a/extra/zlib/zlib-1.2.13/watcom/watcom_l.mak b/extra/zlib/zlib-1.2.13/watcom/watcom_l.mak
new file mode 100644
index 000000000000..193eed7b318a
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/watcom/watcom_l.mak
@@ -0,0 +1,43 @@
+# Makefile for zlib
+# OpenWatcom large model
+# Last updated: 28-Dec-2005
+
+# To use, do "wmake -f watcom_l.mak"
+
+C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
+	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
+            infback.c  inffast.c  inflate.c inftrees.c   &
+            trees.c    uncompr.c  zutil.c
+
+OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
+	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
+            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
+            trees.obj    uncompr.obj  zutil.obj
+
+CC       = wcc
+LINKER   = wcl
+CFLAGS   = -zq -ml -s -bt=dos -oilrtfm -fr=nul -wx
+ZLIB_LIB = zlib_l.lib
+
+.C.OBJ:
+        $(CC) $(CFLAGS) $[@
+
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+$(ZLIB_LIB): $(OBJS)
+	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
+	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
+        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
+        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
+        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
+
+example.exe: $(ZLIB_LIB) example.obj
+	$(LINKER) -fe=example.exe example.obj $(ZLIB_LIB)
+
+minigzip.exe: $(ZLIB_LIB) minigzip.obj
+	$(LINKER) -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
+
+clean: .SYMBOLIC
+          del *.obj
+          del $(ZLIB_LIB)
+          @echo Cleaning done
diff --git a/extra/zlib/zlib-1.2.13/win32/DLL_FAQ.txt b/extra/zlib/zlib-1.2.13/win32/DLL_FAQ.txt
new file mode 100644
index 000000000000..12c009018c37
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/DLL_FAQ.txt
@@ -0,0 +1,397 @@
+
+            Frequently Asked Questions about ZLIB1.DLL
+
+
+This document describes the design, the rationale, and the usage
+of the official DLL build of zlib, named ZLIB1.DLL.  If you have
+general questions about zlib, you should see the file "FAQ" found
+in the zlib distribution, or at the following location:
+  http://www.gzip.org/zlib/zlib_faq.html
+
+
+ 1. What is ZLIB1.DLL, and how can I get it?
+
+  - ZLIB1.DLL is the official build of zlib as a DLL.
+    (Please remark the character '1' in the name.)
+
+    Pointers to a precompiled ZLIB1.DLL can be found in the zlib
+    web site at:
+      http://www.zlib.net/
+
+    Applications that link to ZLIB1.DLL can rely on the following
+    specification:
+
+    * The exported symbols are exclusively defined in the source
+      files "zlib.h" and "zlib.def", found in an official zlib
+      source distribution.
+    * The symbols are exported by name, not by ordinal.
+    * The exported names are undecorated.
+    * The calling convention of functions is "C" (CDECL).
+    * The ZLIB1.DLL binary is linked to MSVCRT.DLL.
+
+    The archive in which ZLIB1.DLL is bundled contains compiled
+    test programs that must run with a valid build of ZLIB1.DLL.
+    It is recommended to download the prebuilt DLL from the zlib
+    web site, instead of building it yourself, to avoid potential
+    incompatibilities that could be introduced by your compiler
+    and build settings.  If you do build the DLL yourself, please
+    make sure that it complies with all the above requirements,
+    and it runs with the precompiled test programs, bundled with
+    the original ZLIB1.DLL distribution.
+
+    If, for any reason, you need to build an incompatible DLL,
+    please use a different file name.
+
+
+ 2. Why did you change the name of the DLL to ZLIB1.DLL?
+    What happened to the old ZLIB.DLL?
+
+  - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required
+    compilation settings that were incompatible to those used by
+    a static build.  The DLL settings were supposed to be enabled
+    by defining the macro ZLIB_DLL, before including "zlib.h".
+    Incorrect handling of this macro was silently accepted at
+    build time, resulting in two major problems:
+
+    * ZLIB_DLL was missing from the old makefile.  When building
+      the DLL, not all people added it to the build options.  In
+      consequence, incompatible incarnations of ZLIB.DLL started
+      to circulate around the net.
+
+    * When switching from using the static library to using the
+      DLL, applications had to define the ZLIB_DLL macro and
+      to recompile all the sources that contained calls to zlib
+      functions.  Failure to do so resulted in creating binaries
+      that were unable to run with the official ZLIB.DLL build.
+
+    The only possible solution that we could foresee was to make
+    a binary-incompatible change in the DLL interface, in order to
+    remove the dependency on the ZLIB_DLL macro, and to release
+    the new DLL under a different name.
+
+    We chose the name ZLIB1.DLL, where '1' indicates the major
+    zlib version number.  We hope that we will not have to break
+    the binary compatibility again, at least not as long as the
+    zlib-1.x series will last.
+
+    There is still a ZLIB_DLL macro, that can trigger a more
+    efficient build and use of the DLL, but compatibility no
+    longer dependents on it.
+
+
+ 3. Can I build ZLIB.DLL from the new zlib sources, and replace
+    an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?
+
+  - In principle, you can do it by assigning calling convention
+    keywords to the macros ZEXPORT and ZEXPORTVA.  In practice,
+    it depends on what you mean by "an old ZLIB.DLL", because the
+    old DLL exists in several mutually-incompatible versions.
+    You have to find out first what kind of calling convention is
+    being used in your particular ZLIB.DLL build, and to use the
+    same one in the new build.  If you don't know what this is all
+    about, you might be better off if you would just leave the old
+    DLL intact.
+
+
+ 4. Can I compile my application using the new zlib interface, and
+    link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or
+    earlier?
+
+  - The official answer is "no"; the real answer depends again on
+    what kind of ZLIB.DLL you have.  Even if you are lucky, this
+    course of action is unreliable.
+
+    If you rebuild your application and you intend to use a newer
+    version of zlib (post- 1.1.4), it is strongly recommended to
+    link it to the new ZLIB1.DLL.
+
+
+ 5. Why are the zlib symbols exported by name, and not by ordinal?
+
+  - Although exporting symbols by ordinal is a little faster, it
+    is risky.  Any single glitch in the maintenance or use of the
+    DEF file that contains the ordinals can result in incompatible
+    builds and frustrating crashes.  Simply put, the benefits of
+    exporting symbols by ordinal do not justify the risks.
+
+    Technically, it should be possible to maintain ordinals in
+    the DEF file, and still export the symbols by name.  Ordinals
+    exist in every DLL, and even if the dynamic linking performed
+    at the DLL startup is searching for names, ordinals serve as
+    hints, for a faster name lookup.  However, if the DEF file
+    contains ordinals, the Microsoft linker automatically builds
+    an implib that will cause the executables linked to it to use
+    those ordinals, and not the names.  It is interesting to
+    notice that the GNU linker for Win32 does not suffer from this
+    problem.
+
+    It is possible to avoid the DEF file if the exported symbols
+    are accompanied by a "__declspec(dllexport)" attribute in the
+    source files.  You can do this in zlib by predefining the
+    ZLIB_DLL macro.
+
+
+ 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling
+    convention.  Why not use the STDCALL convention?
+    STDCALL is the standard convention in Win32, and I need it in
+    my Visual Basic project!
+
+    (For readability, we use CDECL to refer to the convention
+     triggered by the "__cdecl" keyword, STDCALL to refer to
+     the convention triggered by "__stdcall", and FASTCALL to
+     refer to the convention triggered by "__fastcall".)
+
+  - Most of the native Windows API functions (without varargs) use
+    indeed the WINAPI convention (which translates to STDCALL in
+    Win32), but the standard C functions use CDECL.  If a user
+    application is intrinsically tied to the Windows API (e.g.
+    it calls native Windows API functions such as CreateFile()),
+    sometimes it makes sense to decorate its own functions with
+    WINAPI.  But if ANSI C or POSIX portability is a goal (e.g.
+    it calls standard C functions such as fopen()), it is not a
+    sound decision to request the inclusion of <windows.h>, or to
+    use non-ANSI constructs, for the sole purpose to make the user
+    functions STDCALL-able.
+
+    The functionality offered by zlib is not in the category of
+    "Windows functionality", but is more like "C functionality".
+
+    Technically, STDCALL is not bad; in fact, it is slightly
+    faster than CDECL, and it works with variable-argument
+    functions, just like CDECL.  It is unfortunate that, in spite
+    of using STDCALL in the Windows API, it is not the default
+    convention used by the C compilers that run under Windows.
+    The roots of the problem reside deep inside the unsafety of
+    the K&R-style function prototypes, where the argument types
+    are not specified; but that is another story for another day.
+
+    The remaining fact is that CDECL is the default convention.
+    Even if an explicit convention is hard-coded into the function
+    prototypes inside C headers, problems may appear.  The
+    necessity to expose the convention in users' callbacks is one
+    of these problems.
+
+    The calling convention issues are also important when using
+    zlib in other programming languages.  Some of them, like Ada
+    (GNAT) and Fortran (GNU G77), have C bindings implemented
+    initially on Unix, and relying on the C calling convention.
+    On the other hand, the pre- .NET versions of Microsoft Visual
+    Basic require STDCALL, while Borland Delphi prefers, although
+    it does not require, FASTCALL.
+
+    In fairness to all possible uses of zlib outside the C
+    programming language, we choose the default "C" convention.
+    Anyone interested in different bindings or conventions is
+    encouraged to maintain specialized projects.  The "contrib/"
+    directory from the zlib distribution already holds a couple
+    of foreign bindings, such as Ada, C++, and Delphi.
+
+
+ 7. I need a DLL for my Visual Basic project.  What can I do?
+
+  - Define the ZLIB_WINAPI macro before including "zlib.h", when
+    building both the DLL and the user application (except that
+    you don't need to define anything when using the DLL in Visual
+    Basic).  The ZLIB_WINAPI macro will switch on the WINAPI
+    (STDCALL) convention.  The name of this DLL must be different
+    than the official ZLIB1.DLL.
+
+    Gilles Vollant has contributed a build named ZLIBWAPI.DLL,
+    with the ZLIB_WINAPI macro turned on, and with the minizip
+    functionality built in.  For more information, please read
+    the notes inside "contrib/vstudio/readme.txt", found in the
+    zlib distribution.
+
+
+ 8. I need to use zlib in my Microsoft .NET project.  What can I
+    do?
+
+  - Henrik Ravn has contributed a .NET wrapper around zlib.  Look
+    into contrib/dotzlib/, inside the zlib distribution.
+
+
+ 9. If my application uses ZLIB1.DLL, should I link it to
+    MSVCRT.DLL?  Why?
+
+  - It is not required, but it is recommended to link your
+    application to MSVCRT.DLL, if it uses ZLIB1.DLL.
+
+    The executables (.EXE, .DLL, etc.) that are involved in the
+    same process and are using the C run-time library (i.e. they
+    are calling standard C functions), must link to the same
+    library.  There are several libraries in the Win32 system:
+    CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc.
+    Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that
+    depend on it should also be linked to MSVCRT.DLL.
+
+
+10. Why are you saying that ZLIB1.DLL and my application should
+    be linked to the same C run-time (CRT) library?  I linked my
+    application and my DLLs to different C libraries (e.g. my
+    application to a static library, and my DLLs to MSVCRT.DLL),
+    and everything works fine.
+
+  - If a user library invokes only pure Win32 API (accessible via
+    <windows.h> and the related headers), its DLL build will work
+    in any context.  But if this library invokes standard C API,
+    things get more complicated.
+
+    There is a single Win32 library in a Win32 system.  Every
+    function in this library resides in a single DLL module, that
+    is safe to call from anywhere.  On the other hand, there are
+    multiple versions of the C library, and each of them has its
+    own separate internal state.  Standalone executables and user
+    DLLs that call standard C functions must link to a C run-time
+    (CRT) library, be it static or shared (DLL).  Intermixing
+    occurs when an executable (not necessarily standalone) and a
+    DLL are linked to different CRTs, and both are running in the
+    same process.
+
+    Intermixing multiple CRTs is possible, as long as their
+    internal states are kept intact.  The Microsoft Knowledge Base
+    articles KB94248 "HOWTO: Use the C Run-Time" and KB140584
+    "HOWTO: Link with the Correct C Run-Time (CRT) Library"
+    mention the potential problems raised by intermixing.
+
+    If intermixing works for you, it's because your application
+    and DLLs are avoiding the corruption of each of the CRTs'
+    internal states, maybe by careful design, or maybe by fortune.
+
+    Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such
+    as those provided by Borland, raises similar problems.
+
+
+11. Why are you linking ZLIB1.DLL to MSVCRT.DLL?
+
+  - MSVCRT.DLL exists on every Windows 95 with a new service pack
+    installed, or with Microsoft Internet Explorer 4 or later, and
+    on all other Windows 4.x or later (Windows 98, Windows NT 4,
+    or later).  It is freely distributable; if not present in the
+    system, it can be downloaded from Microsoft or from other
+    software provider for free.
+
+    The fact that MSVCRT.DLL does not exist on a virgin Windows 95
+    is not so problematic.  Windows 95 is scarcely found nowadays,
+    Microsoft ended its support a long time ago, and many recent
+    applications from various vendors, including Microsoft, do not
+    even run on it.  Furthermore, no serious user should run
+    Windows 95 without a proper update installed.
+
+
+12. Why are you not linking ZLIB1.DLL to
+    <<my favorite C run-time library>> ?
+
+  - We considered and abandoned the following alternatives:
+
+    * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or
+      LIBCMT.LIB) is not a good option.  People are using the DLL
+      mainly to save disk space.  If you are linking your program
+      to a static C library, you may as well consider linking zlib
+      in statically, too.
+
+    * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because
+      CRTDLL.DLL is present on every Win32 installation.
+      Unfortunately, it has a series of problems: it does not
+      work properly with Microsoft's C++ libraries, it does not
+      provide support for 64-bit file offsets, (and so on...),
+      and Microsoft discontinued its support a long time ago.
+
+    * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied
+      with the Microsoft .NET platform, and Visual C++ 7.0/7.1,
+      raises problems related to the status of ZLIB1.DLL as a
+      system component.  According to the Microsoft Knowledge Base
+      article KB326922 "INFO: Redistribution of the Shared C
+      Runtime Component in Visual C++ .NET", MSVCR70.DLL and
+      MSVCR71.DLL are not supposed to function as system DLLs,
+      because they may clash with MSVCRT.DLL.  Instead, the
+      application's installer is supposed to put these DLLs
+      (if needed) in the application's private directory.
+      If ZLIB1.DLL depends on a non-system runtime, it cannot
+      function as a redistributable system component.
+
+    * Linking ZLIB1.DLL to non-Microsoft runtimes, such as
+      Borland's, or Cygwin's, raises problems related to the
+      reliable presence of these runtimes on Win32 systems.
+      It's easier to let the DLL build of zlib up to the people
+      who distribute these runtimes, and who may proceed as
+      explained in the answer to Question 14.
+
+
+13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL,
+    how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0
+    (Visual Studio .NET) or newer?
+
+  - Due to the problems explained in the Microsoft Knowledge Base
+    article KB326922 (see the previous answer), the C runtime that
+    comes with the VC7 environment is no longer considered a
+    system component.  That is, it should not be assumed that this
+    runtime exists, or may be installed in a system directory.
+    Since ZLIB1.DLL is supposed to be a system component, it may
+    not depend on a non-system component.
+
+    In order to link ZLIB1.DLL and your application to MSVCRT.DLL
+    in VC7, you need the library of Visual C++ 6.0 or older.  If
+    you don't have this library at hand, it's probably best not to
+    use ZLIB1.DLL.
+
+    We are hoping that, in the future, Microsoft will provide a
+    way to build applications linked to a proper system runtime,
+    from the Visual C++ environment.  Until then, you have a
+    couple of alternatives, such as linking zlib in statically.
+    If your application requires dynamic linking, you may proceed
+    as explained in the answer to Question 14.
+
+
+14. I need to link my own DLL build to a CRT different than
+    MSVCRT.DLL.  What can I do?
+
+  - Feel free to rebuild the DLL from the zlib sources, and link
+    it the way you want.  You should, however, clearly state that
+    your build is unofficial.  You should give it a different file
+    name, and/or install it in a private directory that can be
+    accessed by your application only, and is not visible to the
+    others (i.e. it's neither in the PATH, nor in the SYSTEM or
+    SYSTEM32 directories).  Otherwise, your build may clash with
+    applications that link to the official build.
+
+    For example, in Cygwin, zlib is linked to the Cygwin runtime
+    CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
+
+
+15. May I include additional pieces of code that I find useful,
+    link them in ZLIB1.DLL, and export them?
+
+  - No.  A legitimate build of ZLIB1.DLL must not include code
+    that does not originate from the official zlib source code.
+    But you can make your own private DLL build, under a different
+    file name, as suggested in the previous answer.
+
+    For example, zlib is a part of the VCL library, distributed
+    with Borland Delphi and C++ Builder.  The DLL build of VCL
+    is a redistributable file, named VCLxx.DLL.
+
+
+16. May I remove some functionality out of ZLIB1.DLL, by enabling
+    macros like NO_GZCOMPRESS or NO_GZIP at compile time?
+
+  - No.  A legitimate build of ZLIB1.DLL must provide the complete
+    zlib functionality, as implemented in the official zlib source
+    code.  But you can make your own private DLL build, under a
+    different file name, as suggested in the previous answer.
+
+
+17. I made my own ZLIB1.DLL build.  Can I test it for compliance?
+
+  - We prefer that you download the official DLL from the zlib
+    web site.  If you need something peculiar from this DLL, you
+    can send your suggestion to the zlib mailing list.
+
+    However, in case you do rebuild the DLL yourself, you can run
+    it with the test programs found in the DLL distribution.
+    Running these test programs is not a guarantee of compliance,
+    but a failure can imply a detected problem.
+
+**
+
+This document is written and maintained by
+Cosmin Truta <cosmint@cs.ubbcluj.ro>
diff --git a/extra/zlib/zlib-1.2.13/win32/Makefile.bor b/extra/zlib/zlib-1.2.13/win32/Makefile.bor
new file mode 100644
index 000000000000..4495353f3f54
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/Makefile.bor
@@ -0,0 +1,109 @@
+# Makefile for zlib
+# Borland C++ for Win32
+#
+# Usage:
+#  make -f win32/Makefile.bor
+
+# ------------ Borland C++ ------------
+
+# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
+# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
+# added to the declaration of LOC here:
+LOC = $(LOCAL_ZLIB)
+
+CC = bcc32
+AS = bcc32
+LD = bcc32
+AR = tlib
+CFLAGS  = -a -d -k- -O2 $(LOC)
+ASFLAGS = $(LOC)
+LDFLAGS = $(LOC)
+
+
+# variables
+ZLIB_LIB = zlib.lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+#OBJA =
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+#OBJPA=
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $<
+
+.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: test/example.c zlib.h zconf.h
+
+minigzip.obj: test/minigzip.c zlib.h zconf.h
+
+
+# For the sake of the old Borland make,
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+	$(AR) $(ZLIB_LIB) $(OBJPA)
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+
+# cleanup
+clean:
+	-del $(ZLIB_LIB)
+	-del *.obj
+	-del *.exe
+	-del *.tds
+	-del zlib.bak
+	-del foo.gz
diff --git a/extra/zlib/zlib-1.2.13/win32/Makefile.gcc b/extra/zlib/zlib-1.2.13/win32/Makefile.gcc
new file mode 100644
index 000000000000..081e391eb299
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/Makefile.gcc
@@ -0,0 +1,177 @@
+# Makefile for zlib, derived from Makefile.dj2.
+# Modified for mingw32 by C. Spieler, 6/16/98.
+# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
+# Last updated: Mar 2012.
+# Tested under Cygwin and MinGW.
+
+# Copyright (C) 1995-2003 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type from the top level zlib directory:
+#
+#   make -fwin32/Makefile.gcc;  make test testdll -fwin32/Makefile.gcc
+#
+# To install libz.a, zconf.h and zlib.h in the system directories, type:
+#
+#   make install -fwin32/Makefile.gcc
+#
+# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
+#
+# To install the shared lib, append SHARED_MODE=1 to the make command :
+#
+#   make install -fwin32/Makefile.gcc SHARED_MODE=1
+
+# Note:
+# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
+# the DLL name should be changed from "zlib1.dll".
+
+STATICLIB = libz.a
+SHAREDLIB = zlib1.dll
+IMPLIB    = libz.dll.a
+
+#
+# Set to 1 if shared object needs to be installed
+#
+SHARED_MODE=0
+
+#LOC = -DZLIB_DEBUG -g
+
+PREFIX =
+CC = $(PREFIX)gcc
+CFLAGS = $(LOC) -O3 -Wall
+
+AS = $(CC)
+ASFLAGS = $(LOC) -Wall
+
+LD = $(CC)
+LDFLAGS = $(LOC)
+
+AR = $(PREFIX)ar
+ARFLAGS = rcs
+
+RC = $(PREFIX)windres
+RCFLAGS = --define GCC_WINDRES
+
+STRIP = $(PREFIX)strip
+
+CP = cp -fp
+# If GNU install is available, replace $(CP) with install.
+INSTALL = $(CP)
+RM = rm -f
+
+prefix ?= /usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+OBJA =
+
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
+
+test: example.exe minigzip.exe
+	./example
+	echo hello world | ./minigzip | ./minigzip -d
+
+testdll: example_d.exe minigzip_d.exe
+	./example_d
+	echo hello world | ./minigzip_d | ./minigzip_d -d
+
+.c.o:
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+.S.o:
+	$(AS) $(ASFLAGS) -c -o $@ $<
+
+$(STATICLIB): $(OBJS) $(OBJA)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
+	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(STRIP) $@
+
+example.exe: example.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+	$(STRIP) $@
+
+minigzip.exe: minigzip.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
+	$(STRIP) $@
+
+example_d.exe: example.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
+	$(STRIP) $@
+
+minigzip_d.exe: minigzip.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
+	$(STRIP) $@
+
+example.o: test/example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
+
+minigzip.o: test/minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
+
+zlibrc.o: win32/zlib1.rc
+	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
+
+.PHONY: install uninstall clean
+
+install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
+	@if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
+		echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
+		exit 1; \
+	fi
+	-@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
+	-@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
+	-if [ "$(SHARED_MODE)" = "1" ]; then \
+		mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
+		$(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
+		$(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
+	fi
+	-$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
+	-$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
+	-$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
+	sed \
+		-e 's|@prefix@|${prefix}|g' \
+		-e 's|@exec_prefix@|${exec_prefix}|g' \
+		-e 's|@libdir@|$(LIBRARY_PATH)|g' \
+		-e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \
+		-e 's|@includedir@|$(INCLUDE_PATH)|g' \
+		-e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \
+		zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
+
+uninstall:
+	-if [ "$(SHARED_MODE)" = "1" ]; then \
+		$(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
+		$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
+	fi
+	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
+	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
+	-$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
+
+clean:
+	-$(RM) $(STATICLIB)
+	-$(RM) $(SHAREDLIB)
+	-$(RM) $(IMPLIB)
+	-$(RM) *.o
+	-$(RM) *.exe
+	-$(RM) foo.gz
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/extra/zlib/zlib-1.2.13/win32/Makefile.msc b/extra/zlib/zlib-1.2.13/win32/Makefile.msc
new file mode 100644
index 000000000000..9c6515360e66
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/Makefile.msc
@@ -0,0 +1,159 @@
+# Makefile for zlib using Microsoft (Visual) C
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+#
+# Usage:
+#   nmake -f win32/Makefile.msc                          (standard build)
+#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
+
+# The toplevel directory of the source tree.
+#
+TOP = .
+
+# optional build flags
+LOC =
+
+# variables
+STATICLIB = zlib.lib
+SHAREDLIB = zlib1.dll
+IMPLIB    = zdll.lib
+
+CC = cl
+AS = ml
+LD = link
+AR = lib
+RC = rc
+CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ASFLAGS = -coff -Zi $(LOC)
+LDFLAGS = -nologo -debug -incremental:no -opt:ref
+ARFLAGS = -nologo
+RCFLAGS = /dWIN32 /r
+
+OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
+       gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj
+OBJA =
+
+
+# targets
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
+     example.exe minigzip.exe example_d.exe minigzip_d.exe
+
+$(STATICLIB): $(OBJS) $(OBJA)
+	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): $(TOP)/win32/zlib.def $(OBJS) $(OBJA) zlib1.res
+	$(LD) $(LDFLAGS) -def:$(TOP)/win32/zlib.def -dll -implib:$(IMPLIB) \
+	  -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;2
+
+example.exe: example.obj $(STATICLIB)
+	$(LD) $(LDFLAGS) example.obj $(STATICLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+minigzip.exe: minigzip.obj $(STATICLIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+example_d.exe: example.obj $(IMPLIB)
+	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+minigzip_d.exe: minigzip.obj $(IMPLIB)
+	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
+	if exist $@.manifest \
+	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+
+{$(TOP)}.c.obj:
+	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+
+{$(TOP)/test}.c.obj:
+	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
+
+{$(TOP)/contrib/masmx64}.c.obj:
+	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+
+{$(TOP)/contrib/masmx64}.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+{$(TOP)/contrib/masmx86}.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+adler32.obj: $(TOP)/adler32.c $(TOP)/zlib.h $(TOP)/zconf.h
+
+compress.obj: $(TOP)/compress.c $(TOP)/zlib.h $(TOP)/zconf.h
+
+crc32.obj: $(TOP)/crc32.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/crc32.h
+
+deflate.obj: $(TOP)/deflate.c $(TOP)/deflate.h $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
+
+gzclose.obj: $(TOP)/gzclose.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+
+gzlib.obj: $(TOP)/gzlib.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+
+gzread.obj: $(TOP)/gzread.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+
+gzwrite.obj: $(TOP)/gzwrite.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+
+infback.obj: $(TOP)/infback.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
+             $(TOP)/inffast.h $(TOP)/inffixed.h
+
+inffast.obj: $(TOP)/inffast.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
+             $(TOP)/inffast.h
+
+inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
+             $(TOP)/inffast.h $(TOP)/inffixed.h
+
+inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h
+
+trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/deflate.h $(TOP)/trees.h
+
+uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib.h $(TOP)/zconf.h
+
+zutil.obj: $(TOP)/zutil.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
+
+gvmat64.obj: $(TOP)/contrib\masmx64\gvmat64.asm
+
+inffasx64.obj: $(TOP)/contrib\masmx64\inffasx64.asm
+
+inffas8664.obj: $(TOP)/contrib\masmx64\inffas8664.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h \
+		$(TOP)/inftrees.h $(TOP)/inflate.h $(TOP)/inffast.h
+
+inffas32.obj: $(TOP)/contrib\masmx86\inffas32.asm
+
+match686.obj: $(TOP)/contrib\masmx86\match686.asm
+
+example.obj: $(TOP)/test/example.c $(TOP)/zlib.h $(TOP)/zconf.h
+
+minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zlib.h $(TOP)/zconf.h
+
+zlib1.res: $(TOP)/win32/zlib1.rc
+	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/zlib1.rc
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+testdll: example_d.exe minigzip_d.exe
+	example_d
+	echo hello world | minigzip_d | minigzip_d -d
+
+
+# cleanup
+clean:
+	-del $(STATICLIB)
+	-del $(SHAREDLIB)
+	-del $(IMPLIB)
+	-del *.obj
+	-del *.res
+	-del *.exp
+	-del *.exe
+	-del *.pdb
+	-del *.manifest
+	-del foo.gz
diff --git a/extra/zlib/zlib-1.2.13/win32/README-WIN32.txt b/extra/zlib/zlib-1.2.13/win32/README-WIN32.txt
new file mode 100644
index 000000000000..050197d80f7b
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/README-WIN32.txt
@@ -0,0 +1,103 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.13 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  Two compiled
+examples are distributed in this package, example and minigzip.  The example_d
+and minigzip_d flavors validate that the zlib1.dll file is working correctly.
+
+Questions about zlib should be sent to <zlib@gzip.org>.  The zlib home page
+is http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
+before asking for help.
+
+
+Manifest:
+
+The package zlib-1.2.13-win32-x86.zip will contain the following files:
+
+  README-WIN32.txt This document
+  ChangeLog        Changes since previous zlib packages
+  DLL_FAQ.txt      Frequently asked questions about zlib1.dll
+  zlib.3.pdf       Documentation of this library in Adobe Acrobat format
+
+  example.exe      A statically-bound example (using zlib.lib, not the dll)
+  example.pdb      Symbolic information for debugging example.exe
+
+  example_d.exe    A zlib1.dll bound example (using zdll.lib)
+  example_d.pdb    Symbolic information for debugging example_d.exe
+
+  minigzip.exe     A statically-bound test program (using zlib.lib, not the dll)
+  minigzip.pdb     Symbolic information for debugging minigzip.exe
+
+  minigzip_d.exe   A zlib1.dll bound test program (using zdll.lib)
+  minigzip_d.pdb   Symbolic information for debugging minigzip_d.exe
+
+  zlib.h           Install these files into the compilers' INCLUDE path to
+  zconf.h          compile programs which use zlib.lib or zdll.lib
+
+  zdll.lib         Install these files into the compilers' LIB path if linking
+  zdll.exp         a compiled program to the zlib1.dll binary
+
+  zlib.lib         Install these files into the compilers' LIB path to link zlib
+  zlib.pdb         into compiled programs, without zlib1.dll runtime dependency
+                   (zlib.pdb provides debugging info to the compile time linker)
+
+  zlib1.dll        Install this binary shared library into the system PATH, or
+                   the program's runtime directory (where the .exe resides)
+  zlib1.pdb        Install in the same directory as zlib1.dll, in order to debug
+                   an application crash using WinDbg or similar tools.
+
+All .pdb files above are entirely optional, but are very useful to a developer
+attempting to diagnose program misbehavior or a crash.  Many additional
+important files for developers can be found in the zlib127.zip source package
+available from http://zlib.net/ - review that package's README file for details.
+
+
+Acknowledgments:
+
+The deflate format used by zlib was defined by Phil Katz.  The deflate and
+zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+people who reported problems and suggested various improvements in zlib; they
+are too numerous to cite here.
+
+
+Copyright notice:
+
+  (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/extra/zlib/zlib-1.2.13/win32/VisualC.txt b/extra/zlib/zlib-1.2.13/win32/VisualC.txt
new file mode 100644
index 000000000000..1005b219410c
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/VisualC.txt
@@ -0,0 +1,3 @@
+
+To build zlib using the Microsoft Visual C++ environment,
+use the appropriate project from the contrib/vstudio/ directory.
diff --git a/extra/zlib/zlib-1.2.13/win32/zlib.def b/extra/zlib/zlib-1.2.13/win32/zlib.def
new file mode 100644
index 000000000000..53c80115fcb6
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/zlib.def
@@ -0,0 +1,97 @@
+; zlib data compression library
+EXPORTS
+; basic functions
+    zlibVersion
+    deflate
+    deflateEnd
+    inflate
+    inflateEnd
+; advanced functions
+    deflateSetDictionary
+    deflateGetDictionary
+    deflateCopy
+    deflateReset
+    deflateParams
+    deflateTune
+    deflateBound
+    deflatePending
+    deflatePrime
+    deflateSetHeader
+    inflateSetDictionary
+    inflateGetDictionary
+    inflateSync
+    inflateCopy
+    inflateReset
+    inflateReset2
+    inflatePrime
+    inflateMark
+    inflateGetHeader
+    inflateBack
+    inflateBackEnd
+    zlibCompileFlags
+; utility functions
+    compress
+    compress2
+    compressBound
+    uncompress
+    uncompress2
+    gzopen
+    gzdopen
+    gzbuffer
+    gzsetparams
+    gzread
+    gzfread
+    gzwrite
+    gzfwrite
+    gzprintf
+    gzvprintf
+    gzputs
+    gzgets
+    gzputc
+    gzgetc
+    gzungetc
+    gzflush
+    gzseek
+    gzrewind
+    gztell
+    gzoffset
+    gzeof
+    gzdirect
+    gzclose
+    gzclose_r
+    gzclose_w
+    gzerror
+    gzclearerr
+; large file functions
+    gzopen64
+    gzseek64
+    gztell64
+    gzoffset64
+    adler32_combine64
+    crc32_combine64
+    crc32_combine_gen64
+; checksum functions
+    adler32
+    adler32_z
+    crc32
+    crc32_z
+    adler32_combine
+    crc32_combine
+    crc32_combine_gen
+    crc32_combine_op
+; various hacks, don't look :)
+    deflateInit_
+    deflateInit2_
+    inflateInit_
+    inflateInit2_
+    inflateBackInit_
+    gzgetc_
+    zError
+    inflateSyncPoint
+    get_crc_table
+    inflateUndermine
+    inflateValidate
+    inflateCodesUsed
+    inflateResetKeep
+    deflateResetKeep
+    gzopen_w
diff --git a/extra/zlib/zlib-1.2.13/win32/zlib1.rc b/extra/zlib/zlib-1.2.13/win32/zlib1.rc
new file mode 100644
index 000000000000..ceb4ee5c69e1
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/win32/zlib1.rc
@@ -0,0 +1,40 @@
+#include <winver.h>
+#include "../zlib.h"
+
+#ifdef GCC_WINDRES
+VS_VERSION_INFO		VERSIONINFO
+#else
+VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+#endif
+  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+  FILEFLAGS		1
+#else
+  FILEFLAGS		0
+#endif
+  FILEOS		VOS__WINDOWS32
+  FILETYPE		VFT_DLL
+  FILESUBTYPE		0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+    BEGIN
+      VALUE "FileDescription",	"zlib data compression library\0"
+      VALUE "FileVersion",	ZLIB_VERSION "\0"
+      VALUE "InternalName",	"zlib1.dll\0"
+      VALUE "LegalCopyright",	"(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
+      VALUE "OriginalFilename",	"zlib1.dll\0"
+      VALUE "ProductName",	"zlib\0"
+      VALUE "ProductVersion",	ZLIB_VERSION "\0"
+      VALUE "Comments",		"For more information visit http://www.zlib.net/\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
diff --git a/extra/zlib/zlib-1.2.13/zconf.h.cmakein b/extra/zlib/zlib-1.2.13/zconf.h.cmakein
new file mode 100644
index 000000000000..247ba2461dd0
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zconf.h.cmakein
@@ -0,0 +1,549 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+#cmakedefine Z_PREFIX
+#cmakedefine Z_HAVE_UNISTD_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/extra/zlib/zlib-1.2.13/zconf.h.in b/extra/zlib/zlib-1.2.13/zconf.h.in
new file mode 100644
index 000000000000..bf977d3e70ad
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zconf.h.in
@@ -0,0 +1,547 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/extra/zlib/zlib-1.2.13/zlib.3 b/extra/zlib/zlib-1.2.13/zlib.3
new file mode 100644
index 000000000000..6f6e91404dff
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib.3
@@ -0,0 +1,149 @@
+.TH ZLIB 3 "13 Oct 2022"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I test/example.c
+and
+.IR test/minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is built in to many languages and operating systems, including but not limited to
+Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
+.LP
+An experimental package to read and write files in the .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the
+.I zlib
+library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
+.br
+http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
+.br
+http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS AND LICENSE
+Version 1.2.13
+.LP
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+.LP
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+.LP
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+.LP
+.nr step 1 1
+.IP \n[step]. 3
+The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+.IP \n+[step].
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+.IP \n+[step].
+This notice may not be removed or altered from any source distribution.
+.LP
+Jean-loup Gailly        Mark Adler
+.br
+jloup@gzip.org          madler@alumni.caltech.edu
+.LP
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/extra/zlib/zlib-1.2.13/zlib.3.pdf b/extra/zlib/zlib-1.2.13/zlib.3.pdf
new file mode 100644
index 000000000000..8132d840c861
Binary files /dev/null and b/extra/zlib/zlib-1.2.13/zlib.3.pdf differ
diff --git a/extra/zlib/zlib-1.2.13/zlib.h b/extra/zlib/zlib-1.2.13/zlib.h
new file mode 100644
index 000000000000..953cb5012dc2
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib.h
@@ -0,0 +1,1935 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.13, October 13th, 2022
+
+  Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.13"
+#define ZLIB_VERNUM 0x12d0
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 13
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in the case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    z_const Bytef *next_in;     /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total number of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte will go here */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total number of bytes output so far */
+
+    z_const char *msg;  /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use by the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field for deflate() */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Generate more output starting at next_out and update next_out and avail_out
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more output
+  in that case.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
+
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
+
+  - Generate more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  To assist in this, on return inflate() always sets strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained unless inflateGetHeader() is used.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is to be attempted.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields zalloc, zfree and opaque must be initialized before by the caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute a check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the Adler-32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor.  (The Adler-32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   Adler-32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similarly, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2().  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, and if there have been any deflate() calls since the
+   state was initialized or reset, then the input available so far is
+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+   There are three approaches for the compression levels 0, 1..3, and 4..9
+   respectively.  The new level and strategy will take effect at the next call
+   of deflate().
+
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
+
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will *not* automatically decode concatenated gzip members.
+   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
+   would need to be reset to continue decoding a subsequent gzip member.  This
+   *must* be done if there is more data after a gzip member, in order for the
+   decompression to be compliant with the gzip standard (RFC 1952).
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   can be determined from the Adler-32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similarly, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above, or -65536 if the provided
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: ZLIB_DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed data.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed data.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
+*/
+
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Open the gzip (.gz) file at path for reading and decompressing, or
+   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
+   but can also include a compression level ("wb9") or a strategy: 'f' for
+   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
+   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
+   as in "wb9F".  (See the description of deflateInit2 for more information
+   about the strategy parameter.)  'T' will request transparent writing or
+   appending with no compression and not using the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     Associate a gzFile with the file descriptor fd.  File descriptors are
+   obtained from calls like open, dup, creat, pipe or fileno (if the file has
+   been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions for file to
+   size.  The default buffer size is 8192 bytes.  This function must be called
+   after gzopen() or gzdopen(), and before any other calls that read or write
+   the file.  The buffer memory allocation is always deferred to the first read
+   or write.  Three times that size in buffer space is allocated.  A larger
+   buffer size of, for example, 64K or 128K bytes will noticeably increase the
+   speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level and strategy for file.  See the
+   description of deflateInit2 for the meaning of these parameters. Previously
+   provided data is flushed before applying the parameter changes.
+
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Read and decompress up to len uncompressed bytes from file into buf.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read and decompress up to nitems items of size size from file into buf,
+   otherwise operating as gzread() does.  This duplicates the interface of
+   stdio's fread(), with size_t request and return types.  If the library
+   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
+   is an unsigned integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevertheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, resetting and retrying on end-of-file, when size is not 1.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
+/*
+     Compress and write the len uncompressed bytes at buf to file. gzwrite
+   returns the number of uncompressed bytes written or 0 in case of error.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     Compress and write nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+     Convert, format, compress, and write the arguments (...) to file under
+   control of the string format, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf(),
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Compress and write the given null-terminated string s to file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Read and decompress bytes from file into buf, until len-1 characters are
+   read, or until a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  If any characters are read or if len
+   is one, the string is terminated with a null character.  If no characters
+   are read due to an end-of-file or len is less than one, then the buffer is
+   left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Compress and write c, converted to an unsigned char, into file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Read and decompress one byte from file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push c back onto the stream for file to be read as the first character on
+   the next read.  At least one character of push-back is always allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flush all pending output to file.  The parameter flush is as in the
+   deflate() function.  The return value is the zlib error number (see function
+   gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatenated gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Set the starting position to offset relative to whence for the next gzread
+   or gzwrite on file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewind file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Return the starting position for the next gzread or gzwrite on file.
+   This position represents a number of bytes in the uncompressed data stream,
+   and is zero when starting, even if appending or reading a gzip stream from
+   the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Return the current compressed (actual) read or write offset of file.  This
+   offset includes the count of bytes that precede the gzip stream, for example
+   when appending or when using gzdopen() for reading.  When reading, the
+   offset does not include as yet unused buffered input.  This information can
+   be used for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Return true (1) if the end-of-file indicator for file has been set while
+   reading, false (0) otherwise.  Note that the end-of-file indicator is set
+   only if the read tried to go past the end of the input, but came up short.
+   Therefore, just like feof(), gzeof() may return false even if there is no
+   more data to read, in the event that the last read request was for the exact
+   number of bytes remaining in the input file.  This will happen if the input
+   file size is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Return true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flush all pending output for file, if necessary, close file and
+   deallocate the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Return the error message for the last error which occurred on file.
+   errnum is set to zlib error number.  If an error occurred in the file system
+   and not in the compression library, errnum is set to Z_ERRNO and the
+   application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clear the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. An Adler-32 value is in the range of a 32-bit
+   unsigned integer. If buf is Z_NULL, this function returns the required
+   initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
+   If buf is Z_NULL, this function returns the required initial value for the
+   crc. Pre- and post-conditioning (one's complement) is performed within this
+   function so it shouldn't be done by the application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong crc, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t len2));
+
+     Return the operator corresponding to length len2, to be used with
+   crc32_combine_op().
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine_op OF((uLong crc1, uLong crc2, uLong op));
+/*
+     Give the same result as crc32_combine(), using op in place of len2. op is
+   is generated from len2 by crc32_combine_gen(). This will be faster than
+   crc32_combine() if the generated op is used more than once.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#    define z_crc32_combine_gen z_crc32_combine_gen64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#    define crc32_combine_gen crc32_combine_gen64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF((z_streamp));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/extra/zlib/zlib-1.2.13/zlib.map b/extra/zlib/zlib-1.2.13/zlib.map
new file mode 100644
index 000000000000..b330b606febb
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib.map
@@ -0,0 +1,100 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;
+
+ZLIB_1.2.7.1 {
+    inflateGetDictionary;
+    gzvprintf;
+} ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+    inflateCodesUsed;
+    inflateValidate;
+    uncompress2;
+    gzfread;
+    gzfwrite;
+    deflateGetDictionary;
+    adler32_z;
+    crc32_z;
+} ZLIB_1.2.7.1;
+
+ZLIB_1.2.12 {
+	crc32_combine_gen;
+	crc32_combine_gen64;
+	crc32_combine_op;
+} ZLIB_1.2.9;
diff --git a/extra/zlib/zlib-1.2.13/zlib.pc.cmakein b/extra/zlib/zlib-1.2.13/zlib.pc.cmakein
new file mode 100644
index 000000000000..a5e642938c69
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib.pc.cmakein
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@INSTALL_LIB_DIR@
+sharedlibdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/extra/zlib/zlib-1.2.13/zlib.pc.in b/extra/zlib/zlib-1.2.13/zlib.pc.in
new file mode 100644
index 000000000000..7e5acf9c77e7
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/extra/zlib/zlib-1.2.13/zlib2ansi b/extra/zlib/zlib-1.2.13/zlib2ansi
new file mode 100755
index 000000000000..23b2a1d5a3ec
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zlib2ansi
@@ -0,0 +1,152 @@
+#!/usr/bin/perl
+
+# Transform K&R C function definitions into ANSI equivalent.
+#
+# Author: Paul Marquess
+# Version: 1.0
+# Date: 3 October 2006
+
+# TODO
+#
+# Assumes no function pointer parameters. unless they are typedefed.
+# Assumes no literal strings that look like function definitions
+# Assumes functions start at the beginning of a line
+
+use strict;
+use warnings;
+
+local $/;
+$_ = <>;
+
+my $sp = qr{ \s* (?: /\* .*? \*/ )? \s* }x; # assume no nested comments
+
+my $d1    = qr{ $sp (?: [\w\*\s]+ $sp)* $sp \w+ $sp [\[\]\s]* $sp }x ;
+my $decl  = qr{ $sp (?: \w+ $sp )+ $d1 }xo ;
+my $dList = qr{ $sp $decl (?: $sp , $d1 )* $sp ; $sp }xo ;
+
+
+while (s/^
+            (                  # Start $1
+                (              #   Start $2
+                    .*?        #     Minimal eat content
+                    ( ^ \w [\w\s\*]+ )    #     $3 -- function name
+                    \s*        #     optional whitespace
+                )              # $2 - Matched up to before parameter list
+
+                \( \s*         # Literal "(" + optional whitespace
+                ( [^\)]+ )     # $4 - one or more anythings except ")"
+                \s* \)         # optional whitespace surrounding a Literal ")"
+
+                ( (?: $dList )+ ) # $5
+
+                $sp ^ {        # literal "{" at start of line
+            )                  # Remember to $1
+        //xsom
+      )
+{
+    my $all = $1 ;
+    my $prefix = $2;
+    my $param_list = $4 ;
+    my $params = $5;
+
+    StripComments($params);
+    StripComments($param_list);
+    $param_list =~ s/^\s+//;
+    $param_list =~ s/\s+$//;
+
+    my $i = 0 ;
+    my %pList = map { $_ => $i++ }
+                split /\s*,\s*/, $param_list;
+    my $pMatch = '(\b' . join('|', keys %pList) . '\b)\W*$' ;
+
+    my @params = split /\s*;\s*/, $params;
+    my @outParams = ();
+    foreach my $p (@params)
+    {
+        if ($p =~ /,/)
+        {
+            my @bits = split /\s*,\s*/, $p;
+            my $first = shift @bits;
+            $first =~ s/^\s*//;
+            push @outParams, $first;
+            $first =~ /^(\w+\s*)/;
+            my $type = $1 ;
+            push @outParams, map { $type . $_ } @bits;
+        }
+        else
+        {
+            $p =~ s/^\s+//;
+            push @outParams, $p;
+        }
+    }
+
+
+    my %tmp = map { /$pMatch/;  $_ => $pList{$1}  }
+              @outParams ;
+
+    @outParams = map  { "    $_" }
+                 sort { $tmp{$a} <=> $tmp{$b} }
+                 @outParams ;
+
+    print $prefix ;
+    print "(\n" . join(",\n", @outParams) . ")\n";
+    print "{" ;
+
+}
+
+# Output any trailing code.
+print ;
+exit 0;
+
+
+sub StripComments
+{
+
+  no warnings;
+
+  # Strip C & C++ comments
+  # From the perlfaq
+  $_[0] =~
+
+    s{
+       /\*         ##  Start of /* ... */ comment
+       [^*]*\*+    ##  Non-* followed by 1-or-more *'s
+       (
+         [^/*][^*]*\*+
+       )*          ##  0-or-more things which don't start with /
+                   ##    but do end with '*'
+       /           ##  End of /* ... */ comment
+
+     |         ##     OR  C++ Comment
+       //          ## Start of C++ comment //
+       [^\n]*      ## followed by 0-or-more non end of line characters
+
+     |         ##     OR  various things which aren't comments:
+
+       (
+         "           ##  Start of " ... " string
+         (
+           \\.           ##  Escaped char
+         |               ##    OR
+           [^"\\]        ##  Non "\
+         )*
+         "           ##  End of " ... " string
+
+       |         ##     OR
+
+         '           ##  Start of ' ... ' string
+         (
+           \\.           ##  Escaped char
+         |               ##    OR
+           [^'\\]        ##  Non '\
+         )*
+         '           ##  End of ' ... ' string
+
+       |         ##     OR
+
+         .           ##  Anything other char
+         [^/"'\\]*   ##  Chars which doesn't start a comment, string or escape
+       )
+     }{$2}gxs;
+
+}
diff --git a/extra/zlib/zlib-1.2.13/zutil.c b/extra/zlib/zlib-1.2.13/zutil.c
new file mode 100644
index 000000000000..9543ae825e32
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zutil.c
@@ -0,0 +1,327 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2017 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
+
+z_const char * const z_errmsg[10] = {
+    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
+    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
+    (z_const char *)"",                    /* Z_OK              0  */
+    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
+    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
+    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
+    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
+    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
+    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
+    (z_const char *)""
+};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef ZLIB_DEBUG
+    flags += 1 << 8;
+#endif
+    /*
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+     */
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef ZLIB_DEBUG
+#include <stdlib.h>
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error(m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
+    /* The older Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf;
+    ulg bsize = (ulg)items*size;
+
+    (void)opaque;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
+{
+    int n;
+
+    (void)opaque;
+
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
+{
+    (void)opaque;
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
+{
+    (void)opaque;
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    (void)opaque;
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree(opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    (void)opaque;
+    free(ptr);
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/extra/zlib/zlib-1.2.13/zutil.h b/extra/zlib/zlib-1.2.13/zutil.h
new file mode 100644
index 000000000000..0bc7f4ecd1c0
--- /dev/null
+++ b/extra/zlib/zlib-1.2.13/zutil.h
@@ -0,0 +1,275 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (ULONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long
+#  elif (ULLONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long long
+#  elif (UINT_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned
+#  endif
+#endif
+
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
+#    endif
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  1
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  2
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#ifdef __370__
+#  if __TARGET_LIB__ < 0x20000000
+#    define OS_CODE 4
+#  elif __TARGET_LIB__ < 0x40000000
+#    define OS_CODE 11
+#  else
+#    define OS_CODE 8
+#  endif
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  5
+#endif
+
+#ifdef OS2
+#  define OS_CODE  6
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  7
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __acorn
+#  define OS_CODE 13
+#endif
+
+#if defined(WIN32) && !defined(__CYGWIN__)
+#  define OS_CODE  10
+#endif
+
+#ifdef _BEOS_
+#  define OS_CODE  16
+#endif
+
+#ifdef __TOS_OS400__
+#  define OS_CODE 18
+#endif
+
+#ifdef __APPLE__
+#  define OS_CODE 19
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  3     /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef ZLIB_DEBUG
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+#endif /* ZUTIL_H */
diff --git a/extra/zlib_decompress.cc b/extra/zlib_decompress.cc
index d2df8ce1d6ed..945f88146b76 100644
--- a/extra/zlib_decompress.cc
+++ b/extra/zlib_decompress.cc
@@ -1,15 +1,22 @@
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index fa5f0338e47e..8112cf3d4c8e 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/include/atomic/gcc_atomic.h b/include/atomic/gcc_atomic.h
index 8807857a98c9..93f3eef3b2f5 100644
--- a/include/atomic/gcc_atomic.h
+++ b/include/atomic/gcc_atomic.h
@@ -1,16 +1,23 @@
 #ifndef GCC_ATOMIC_INCLUDED
 #define GCC_ATOMIC_INCLUDED
 
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/atomic/gcc_sync.h b/include/atomic/gcc_sync.h
index 82eea35b2cea..a077bc0aaa44 100644
--- a/include/atomic/gcc_sync.h
+++ b/include/atomic/gcc_sync.h
@@ -1,16 +1,23 @@
 #ifndef GCC_SYNC_INCLUDED
 #define GCC_SYNC_INCLUDED
 
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h
index 9fe2cddd7aea..bf1fa35ae19c 100644
--- a/include/atomic/generic-msvc.h
+++ b/include/atomic/generic-msvc.h
@@ -1,16 +1,23 @@
 #ifndef ATOMIC_MSC_INCLUDED
 #define ATOMIC_MSC_INCLUDED
 
-/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/atomic/solaris.h b/include/atomic/solaris.h
index 5be36ec5e771..cbb66ce17822 100644
--- a/include/atomic/solaris.h
+++ b/include/atomic/solaris.h
@@ -1,16 +1,23 @@
 #ifndef ATOMIC_SOLARIS_INCLUDED
 #define ATOMIC_SOLARIS_INCLUDED
 
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/base64.h b/include/base64.h
index 640680807126..379ebeca7ad9 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/big_endian.h b/include/big_endian.h
index 59aa70b9d6f6..1863802a6286 100644
--- a/include/big_endian.h
+++ b/include/big_endian.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/box_box.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/box_box.hpp
index 6074af982b6b..42d500f6dedf 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/box_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/box_box.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2013-2015.
-// Modifications copyright (c) 2013-2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/point_box.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/point_box.hpp
index 73b7b7099045..a59a6d683923 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/point_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/disjoint/point_box.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland
 
 // This file was modified by Oracle on 2013-2015.
-// Modifications copyright (c) 2013-2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/distance/segment_to_box.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
index fa951524767c..02e8530de06e 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/expand_by_epsilon.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
index 7af08ee371a3..102b87cf5893 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/expand_by_epsilon.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry
 
-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/areal.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/areal.hpp
index a2322e483156..e893f0d22b5b 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/areal.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/areal.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/linear.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/linear.hpp
index 16d7b3a80320..e0c5a2e48530 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/linear.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/multipoint.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
index f9f43d1cdbbf..5c29be6c0b18 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_valid/polygon.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_valid/polygon.hpp
index bbe8e8fc39e2..23c49dceec55 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_valid/polygon.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/is_valid/polygon.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
index 8cb37d6954ad..9da2bb99b725 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/clip_linestring.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
index b9e48cdbfc6e..638656f4bc25 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
index ac36c530bfc4..89d940df863c 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
index ee0a93ae7e6a..e98157cc2852 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turns.hpp
index b2b97c0337b5..89fa36735ded 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/get_turns.hpp
@@ -4,7 +4,7 @@
 // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014.
-// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
index 1486f94fbd27..3121e3e38527 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/inconsistent_turns_exception.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/insert_touch_interior_turns.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/insert_touch_interior_turns.hpp
index bf1becf659e6..89bfc66a2d43 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/insert_touch_interior_turns.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/insert_touch_interior_turns.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
index c62b7d2834a8..234413e2154c 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
index 59c8f6f1ff93..4d045551d11e 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2014, 2015.
-// Modifications copyright (c) 2014-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/overlay.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/overlay.hpp
index c3ea215f9d75..b2f8ef562d9a 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/overlay.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/overlay.hpp
@@ -4,7 +4,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/split_rings.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/split_rings.hpp
index 5833665ba7bb..3a28073139df 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/split_rings.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/overlay/split_rings.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
index 399c8fbefcb2..84894db34754 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/areal_areal.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/areal_areal.hpp
index a74954326b72..9ceb17c1a85a 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/areal_areal.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/areal_areal.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/boundary_checker.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
index 1a9a5a8fd73f..832efa137e5b 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014 Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/topology_check.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/topology_check.hpp
index caa8a3c22dcd..d5cc80cbebdd 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/topology_check.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/topology_check.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, Oracle and/or its affiliates.
+// Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/turns.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/turns.hpp
index 09d74dec3abf..3b7352d28c94 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/turns.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/relate/turns.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/section_functions.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/section_functions.hpp
index 7bc5c08046c8..a8093ee22130 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/section_functions.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/section_functions.hpp
@@ -3,7 +3,7 @@
 // Copyright (c) 2015 Barend Gehrels, Amsterdam, the Netherlands.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/sectionalize.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/sectionalize.hpp
index 6443965e9545..055fdca99526 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/detail/sections/sectionalize.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/overlaps.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/overlaps.hpp
index 9b5abdb2a09c..957e579e98af 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/overlaps.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/overlaps.hpp
@@ -5,7 +5,7 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
 // This file was modified by Oracle on 2014, 2015.
-// Modifications copyright (c) 2014-2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/algorithms/touches.hpp b/include/boost_1_59_0/patches/boost/geometry/algorithms/touches.hpp
index 570c54797f6c..685f4e756953 100644
--- a/include/boost_1_59_0/patches/boost/geometry/algorithms/touches.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/algorithms/touches.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2013, 2014, 2015.
-// Modifications copyright (c) 2013-2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/core/exception.hpp b/include/boost_1_59_0/patches/boost/geometry/core/exception.hpp
index 21abbd577b14..181d869d6aee 100644
--- a/include/boost_1_59_0/patches/boost/geometry/core/exception.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/core/exception.hpp
@@ -5,7 +5,7 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp b/include/boost_1_59_0/patches/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
index 053723e4ccf3..f3714c6edcdd 100644
--- a/include/boost_1_59_0/patches/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
@@ -4,7 +4,7 @@
 // Copyright (c) 1995 Maarten Hilferink, Amsterdam, the Netherlands
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/box_in_box.hpp b/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/box_in_box.hpp
index 56aef9e4df17..33bec4cc0d2a 100644
--- a/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/box_in_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/box_in_box.hpp
@@ -6,7 +6,7 @@
 // Copyright (c) 2013-2015 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/point_in_box.hpp b/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/point_in_box.hpp
index bd2303cbc4d0..ff58c82da384 100644
--- a/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/point_in_box.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/strategies/cartesian/point_in_box.hpp
@@ -5,7 +5,7 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/strategies/transform/matrix_transformers.hpp b/include/boost_1_59_0/patches/boost/geometry/strategies/transform/matrix_transformers.hpp
index d891263a7d70..a679d0b9438c 100644
--- a/include/boost_1_59_0/patches/boost/geometry/strategies/transform/matrix_transformers.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/strategies/transform/matrix_transformers.hpp
@@ -5,7 +5,7 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
 // This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015 Oracle and/or its affiliates.
+// Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/util/has_nan_coordinate.hpp b/include/boost_1_59_0/patches/boost/geometry/util/has_nan_coordinate.hpp
index b442c1c2b85c..d4dcab1b5af9 100644
--- a/include/boost_1_59_0/patches/boost/geometry/util/has_nan_coordinate.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/util/has_nan_coordinate.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry
 
-// Copyright (c) 2015 Oracle and/or its affiliates.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
diff --git a/include/boost_1_59_0/patches/boost/geometry/util/math.hpp b/include/boost_1_59_0/patches/boost/geometry/util/math.hpp
index c193c8f3f149..938cf3dd056f 100644
--- a/include/boost_1_59_0/patches/boost/geometry/util/math.hpp
+++ b/include/boost_1_59_0/patches/boost/geometry/util/math.hpp
@@ -5,7 +5,7 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
 // This file was modified by Oracle on 2014, 2015.
-// Modifications copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Modifications Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
diff --git a/include/byte_order_generic.h b/include/byte_order_generic.h
index da84585c2adc..d4f2cfcf7361 100644
--- a/include/byte_order_generic.h
+++ b/include/byte_order_generic.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/byte_order_generic_x86.h b/include/byte_order_generic_x86.h
index b3762b504c7b..1bfbeb377edb 100644
--- a/include/byte_order_generic_x86.h
+++ b/include/byte_order_generic_x86.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/caching_sha2_passwordopt-longopts.h b/include/caching_sha2_passwordopt-longopts.h
new file mode 100644
index 000000000000..4213b3b2fb9f
--- /dev/null
+++ b/include/caching_sha2_passwordopt-longopts.h
@@ -0,0 +1,58 @@
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file include/caching_sha2_passwordopt-longopts.h
+*/
+
+{
+  "server-public-key-path",
+  OPT_SERVER_PUBLIC_KEY,
+  "File path to the server public RSA key in PEM format.",
+  &opt_server_public_key,
+  &opt_server_public_key,
+  0,
+  GET_STR,
+  REQUIRED_ARG,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0
+},
+{
+  "get-server-public-key",
+  0,
+  "Get server public key",
+  &opt_get_server_public_key,
+  &opt_get_server_public_key,
+  0,
+  GET_BOOL,
+  NO_ARG,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0
+},
diff --git a/include/caching_sha2_passwordopt-vars.h b/include/caching_sha2_passwordopt-vars.h
new file mode 100644
index 000000000000..c9ff186b81af
--- /dev/null
+++ b/include/caching_sha2_passwordopt-vars.h
@@ -0,0 +1,41 @@
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file include/caching_sha2_passwordopt-vars.h
+*/
+
+#include "mysql.h"
+static char *opt_server_public_key= 0;
+static my_bool opt_get_server_public_key= FALSE;
+
+inline static void set_server_public_key(MYSQL *mysql)
+{
+  if (opt_server_public_key && *opt_server_public_key)
+    mysql_options(mysql, MYSQL_SERVER_PUBLIC_KEY, opt_server_public_key);
+}
+
+inline static void set_get_server_public_key_option(MYSQL *mysql)
+{
+  mysql_options(mysql, MYSQL_OPT_GET_SERVER_PUBLIC_KEY,
+                &opt_get_server_public_key);
+}
diff --git a/include/crypt_genhash_impl.h b/include/crypt_genhash_impl.h
index 9cffd2e4ab9a..7753f4dbb7e4 100644
--- a/include/crypt_genhash_impl.h
+++ b/include/crypt_genhash_impl.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/decimal.h b/include/decimal.h
index f963b6fd10f8..4ef1215ba24f 100644
--- a/include/decimal.h
+++ b/include/decimal.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/dur_prop.h b/include/dur_prop.h
index 558ce5acc01c..dd787c43c6a7 100644
--- a/include/dur_prop.h
+++ b/include/dur_prop.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/errmsg.h b/include/errmsg.h
index 9c5327a98d60..c8d009724c29 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -1,16 +1,23 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -33,7 +40,8 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_MAX_ERROR		2999
 #if !defined(ER)
 #define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
-               client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
+               client_errors[(X)-CR_ERROR_FIRST]: \
+               client_errors[CR_UNKNOWN_ERROR -CR_ERROR_FIRST])
 
 #endif
 #define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
@@ -107,7 +115,8 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_DUPLICATE_CONNECTION_ATTR            2060
 #define CR_AUTH_PLUGIN_ERR                      2061
 #define CR_INSECURE_API_ERR                     2062
-#define CR_ERROR_LAST  /*Copy last error nr:*/  2062
+#define CR_INVALID_CLIENT_CHARSET               2063
+#define CR_ERROR_LAST  /*Copy last error nr:*/  2063
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
 #endif /* ERRMSG_INCLUDED */
diff --git a/include/ft_global.h b/include/ft_global.h
index deb34678f71c..511116adf1ca 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -1,16 +1,23 @@
 #ifndef FT_GLOBAL_INCLUDED
 #define FT_GLOBAL_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/hash.h b/include/hash.h
index 7bc97a722a26..8aa1e6c97bc0 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/heap.h b/include/heap.h
index f6e4cc446f60..923b8fdccbf9 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/i_callable.h b/include/i_callable.h
index fb60dcae6e65..a8c513295152 100644
--- a/include/i_callable.h
+++ b/include/i_callable.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/instance_callback.h b/include/instance_callback.h
index 7578b59f493e..3158e5e8f6bd 100644
--- a/include/instance_callback.h
+++ b/include/instance_callback.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/keycache.h b/include/keycache.h
index 6119f2cbe9b2..a37976f99bba 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/lf.h b/include/lf.h
index d6b73f3f69da..74da2a10bd65 100644
--- a/include/lf.h
+++ b/include/lf.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -149,7 +156,7 @@ typedef void lf_hash_init_func(uchar *dst, const uchar* src);
 #define LF_HASH_UNIQUE 1
 
 /* lf_hash overhead per element (that is, sizeof(LF_SLIST) */
-extern const int LF_HASH_OVERHEAD;
+extern MYSQL_PLUGIN_IMPORT const int LF_HASH_OVERHEAD;
 
 typedef struct st_lf_hash {
   LF_DYNARRAY array;                    /* hash itself */
diff --git a/include/little_endian.h b/include/little_endian.h
index fac4af084ed7..f75cb71684de 100644
--- a/include/little_endian.h
+++ b/include/little_endian.h
@@ -1,15 +1,27 @@
 #ifndef LITTLE_ENDIAN_INCLUDED
 #define LITTLE_ENDIAN_INCLUDED
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/m_ctype.h b/include/m_ctype.h
index dd6ee754e3d6..7758707741a8 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/m_string.h b/include/m_string.h
index ee9f86961607..5dafcf4efe83 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -22,6 +29,9 @@
 #include <string.h>
 
 #define bfill please_use_memset_rather_than_bfill
+#ifdef bzero
+#undef bzero
+#endif
 #define bzero please_use_memset_rather_than_bzero
 #define bmove please_use_memmove_rather_than_bmove
 #define strmov please_use_my_stpcpy_or_my_stpmov_rather_than_strmov
@@ -294,7 +304,7 @@ static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
     const uchar *start_words= (const uchar *)(intptr)
        ((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
-    DBUG_ASSERT(end_words > ptr);
+    assert(end_words > ptr);
     while (end > end_words && end[-1] == 0x20)
       end--;
     if (end[-1] == 0x20 && start_words < end_words)
diff --git a/include/mutex_lock.h b/include/mutex_lock.h
index abb2c5189e41..f1823034eb20 100644
--- a/include/mutex_lock.h
+++ b/include/mutex_lock.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_aes.h b/include/my_aes.h
index c5f7e8574459..ae9bcc1b870f 100644
--- a/include/my_aes.h
+++ b/include/my_aes.h
@@ -1,16 +1,23 @@
 #ifndef MY_AES_INCLUDED
 #define MY_AES_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -20,6 +27,12 @@
 /* Header file for my_aes.c */
 /* Wrapper to give simple interface for MySQL to AES standard encryption */
 
+#include <string>
+#include <vector>
+
+using std::string;
+using std::vector;
+
 C_MODE_START
 
 /** AES IV size is 16 bytes for all supported ciphers except ECB */
@@ -38,7 +51,6 @@ enum my_aes_opmode
    my_aes_128_cbc,
    my_aes_192_cbc,
    my_aes_256_cbc
-#ifndef HAVE_YASSL
    ,my_aes_128_cfb1,
    my_aes_192_cfb1,
    my_aes_256_cfb1,
@@ -51,15 +63,10 @@ enum my_aes_opmode
    my_aes_128_ofb,
    my_aes_192_ofb,
    my_aes_256_ofb
-#endif
 };
 
 #define MY_AES_BEGIN my_aes_128_ecb
-#ifdef HAVE_YASSL
-#define MY_AES_END my_aes_256_cbc
-#else
 #define MY_AES_END my_aes_256_ofb
-#endif
 
 /* If bad data discovered during decoding */
 #define MY_AES_BAD_DATA  -1
@@ -78,14 +85,16 @@ extern const char *my_aes_opmode_names[];
   @param mode           [in]  encryption mode
   @param iv             [in]  16 bytes initialization vector if needed. Otherwise NULL
   @param padding        [in]  if padding needed.
+  @param kdf_options    [in]  KDF options
   @return              size of encrypted data, or negative in case of error
 */
 
 int my_aes_encrypt(const unsigned char *source, uint32 source_length,
                    unsigned char *dest,
-		   const unsigned char *key, uint32 key_length,
+                   const unsigned char *key, uint32 key_length,
                    enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding = true);
+                   bool padding = true,
+                   vector<string> *kdf_options = NULL);
 
 /**
   Decrypt an AES encrypted buffer
@@ -98,6 +107,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
   @param mode           encryption mode
   @param iv             16 bytes initialization vector if needed. Otherwise NULL
   @param padding        if padding needed.
+  @param kdf_options    [in]  KDF options
   @return size of original data.
 */
 
@@ -106,7 +116,8 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
                    unsigned char *dest,
                    const unsigned char *key, uint32 key_length,
                    enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding = true);
+                   bool padding = true,
+                   vector<string> *kdf_options = NULL);
 
 /**
   Calculate the size of a buffer large enough for encrypted data
diff --git a/include/my_alloc.h b/include/my_alloc.h
index d236c93ffbf6..fbeccafb5a35 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 065209d8eb63..f38b4bf39caf 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -1,16 +1,23 @@
 #ifndef MY_ATOMIC_INCLUDED
 #define MY_ATOMIC_INCLUDED
 
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -56,10 +63,11 @@
 #  include "atomic/generic-msvc.h"
 #elif defined(HAVE_SOLARIS_ATOMIC)
 #  include "atomic/solaris.h"
-#elif defined(HAVE_GCC_SYNC_BUILTINS)   /* Use old __sync by default */
-#  include "atomic/gcc_sync.h"
-#elif defined(HAVE_GCC_ATOMIC_BUILTINS) /* Use __atomic on e.g. powerpc */
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS) /* Use __atomic by default */
 #  include "atomic/gcc_atomic.h"
+/* Use old __sync if __atomic is unavailable */
+#elif defined(HAVE_GCC_SYNC_BUILTINS)
+#  include "atomic/gcc_sync.h"
 #else
 #  error Native atomics support not found!
 #endif
diff --git a/include/my_base.h b/include/my_base.h
index 22587ec8be12..79cc75e6e299 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -498,7 +505,8 @@ is the global server default. */
 #define HA_ERR_WRONG_FILE_NAME         199  /* Invalid Filename */
 #define HA_ERR_NOT_ALLOWED_COMMAND     200  /* Operation is not allowed */
 #define HA_ERR_COMPUTE_FAILED          201  /* Compute generated column value failed */
-#define HA_ERR_LAST                    201  /* Copy of last error nr */
+#define HA_ERR_FTS_TOO_MANY_NESTED_EXP 202  /* Too many sub-expression in search string */
+#define HA_ERR_LAST                    202  /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_bit.h b/include/my_bit.h
index 8d9f485a0d0b..ddd97a11e680 100644
--- a/include/my_bit.h
+++ b/include/my_bit.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_bitmap.h b/include/my_bitmap.h
index f45c1bc0c79b..3deab30fe5b8 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -77,28 +84,28 @@ extern void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit);
 
 static inline void bitmap_set_bit(MY_BITMAP *map, uint bit)
 {
-  DBUG_ASSERT(bit < map->n_bits);
+  assert(bit < map->n_bits);
   ((uchar*)map->bitmap)[bit / 8] |= (1 << (bit & 7));
 }
 
 
 static inline void bitmap_flip_bit(MY_BITMAP *map, uint bit)
 {
-  DBUG_ASSERT(bit < map->n_bits);
+  assert(bit < map->n_bits);
   ((uchar*)map->bitmap)[bit / 8] ^= (1 << (bit & 7));
 }
 
 
 static inline void bitmap_clear_bit(MY_BITMAP *map, uint bit)
 {
-  DBUG_ASSERT(bit < map->n_bits);
+  assert(bit < map->n_bits);
   ((uchar*)map->bitmap)[bit / 8] &= ~(1 << (bit & 7));
 }
 
 
 static inline my_bool bitmap_is_set(const MY_BITMAP *map, uint bit)
 {
-  DBUG_ASSERT(bit < map->n_bits);
+  assert(bit < map->n_bits);
   return ((uchar*)map->bitmap)[bit / 8] & (1 << (bit & 7));
 }
 
@@ -112,8 +119,8 @@ static inline my_bool bitmap_is_set(const MY_BITMAP *map, uint bit)
  */
 static inline my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2)
 {
-  DBUG_ASSERT(map1->n_bits > 0);
-  DBUG_ASSERT(map2->n_bits > 0);
+  assert(map1->n_bits > 0);
+  assert(map2->n_bits > 0);
 
   if (memcmp(map1->bitmap, map2->bitmap, 4*(no_words_in_map(map1)-1)) != 0)
     return FALSE;
diff --git a/include/my_byteorder.h b/include/my_byteorder.h
index daedd6247efd..ba10f55b720a 100644
--- a/include/my_byteorder.h
+++ b/include/my_byteorder.h
@@ -1,16 +1,28 @@
 #ifndef MY_BYTEORDER_INCLUDED
 #define MY_BYTEORDER_INCLUDED
 
-/* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_check_opt.h b/include/my_check_opt.h
index 7b064f69ef15..3b7dfdfa83ea 100644
--- a/include/my_check_opt.h
+++ b/include/my_check_opt.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -47,7 +54,7 @@ extern "C" {
 #define T_READONLY		(1UL << 16)
 #define T_REP			(1UL << 17)
 #define T_REP_BY_SORT		(1UL << 18)
-#define T_REP_PARALLEL		(1UL << 19)
+#define T_REP_PARALLEL_OBSOLETE		(1UL << 19)
 #define T_RETRY_WITHOUT_QUICK	(1UL << 20)
 #define T_SAFE_REPAIR		(1UL << 21)
 #define T_SILENT		(1UL << 22)
@@ -61,7 +68,7 @@ extern "C" {
 #define T_WAIT_FOREVER		(1UL << 30)
 #define T_WRITE_LOOP		(1UL << 31)
 
-#define T_REP_ANY		(T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
+#define T_REP_ANY		(T_REP | T_REP_BY_SORT)
 
 #ifdef	__cplusplus
 }
diff --git a/include/my_command.h b/include/my_command.h
index 56adcffd7473..c728e6885c14 100644
--- a/include/my_command.h
+++ b/include/my_command.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+Without limiting anything contained in the foregoing, this file,
+which is part of C Driver for MySQL (Connector/C), is also subject to the
+Universal FOSS Exception, version 1.0, a copy of which can be found at
+http://oss.oracle.com/licenses/universal-foss-exception.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/include/my_compare.h b/include/my_compare.h
index bb836796de8c..bc81ab2df227 100644
--- a/include/my_compare.h
+++ b/include/my_compare.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_compiler.h b/include/my_compiler.h
index 2092537185ba..b911f2d58408 100644
--- a/include/my_compiler.h
+++ b/include/my_compiler.h
@@ -1,16 +1,28 @@
 #ifndef MY_COMPILER_INCLUDED
 #define MY_COMPILER_INCLUDED
 
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_dbug.h b/include/my_dbug.h
index 2af2e66d57a4..dccd9334b8c0 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,7 +33,7 @@
 #ifdef  __cplusplus
 extern "C" {
 #endif
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 
 struct _db_stack_frame_ {
   const char *func;      /* function name of the previous stack frame       */
@@ -115,7 +127,6 @@ extern  const char* _db_get_func_(void);
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
-#define DBUG_ASSERT(A) assert(A)
 #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
 #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
 #define DEBUGGER_OFF                    do { _dbug_on_= 0; } while(0)
@@ -181,7 +192,6 @@ extern void _db_flush_gcov_();
 #define DBUG_LONGJMP(a1) longjmp(a1)
 #define DBUG_DUMP(keyword,a1,a2)        do { } while(0)
 #define DBUG_END()                      do { } while(0)
-#define DBUG_ASSERT(A)                  do { } while(0)
 #define DBUG_LOCK_FILE                  do { } while(0)
 #define DBUG_FILE (stderr)
 #define DBUG_UNLOCK_FILE                do { } while(0)
@@ -217,7 +227,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
 #endif
 
 #ifdef __cplusplus
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 #include <sstream>
 
 /*
@@ -239,7 +249,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
 	sout << v; \
 	DBUG_PUTS(keyword, sout.str().c_str()); \
 } while(0)
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 #endif /* __cplusplus */
 
 #endif /* MY_DBUG_INCLUDED */
diff --git a/include/my_default.h b/include/my_default.h
index 66d6d918ef96..3e0d6d9eac4d 100644
--- a/include/my_default.h
+++ b/include/my_default.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_dir.h b/include/my_dir.h
index 0b512cdca9a7..42005495b911 100644
--- a/include/my_dir.h
+++ b/include/my_dir.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 7908297a000f..391a41da15d7 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -1,14 +1,21 @@
 	/*
-   Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_global.h b/include/my_global.h
index ea127a8c4442..752e2475c825 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -62,7 +74,7 @@
 
 /*
   A lot of our programs uses asserts, so better to always include it
-  This also fixes a problem when people uses DBUG_ASSERT without including
+  This also fixes a problem when people uses assert without including
   assert.h
 */
 #include <assert.h>
diff --git a/include/my_hostname.h b/include/my_hostname.h
new file mode 100644
index 000000000000..1c107ebd42dc
--- /dev/null
+++ b/include/my_hostname.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+/**
+  @file include/my_hostname.h
+  Common definition used by mysys, performance schema and server & client.
+*/
+
+#ifndef MY_HOSTNAME_INCLUDED
+#define MY_HOSTNAME_INCLUDED
+
+#include "mysql_com.h" // HOSTNAME_LENGTH
+
+/*
+  Number of characters that a port number can have.
+  As per rfc6335 section 6, the range is 0 to 65535.
+*/
+#define PORTNUMBER_LENGTH 5
+
+/**
+  Length of "hostname:portnumber".
+  This does not include the trailing '\0'.
+*/
+#define HOST_AND_PORT_LENGTH (HOSTNAME_LENGTH + 1 + PORTNUMBER_LENGTH)
+
+/* HOSTNAME_LENGTH is 60 */
+#define HOST_AND_PORT_LENGTH_STR "66"
+
+#endif /* MY_HOSTNAME_INCLUDED */
diff --git a/include/my_icp.h b/include/my_icp.h
index 8b77b7cc759b..8475e1b505da 100644
--- a/include/my_icp.h
+++ b/include/my_icp.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_list.h b/include/my_list.h
index 294be663d0e1..65ac2d81ff50 100644
--- a/include/my_list.h
+++ b/include/my_list.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_md5.h b/include/my_md5.h
index c24478a4acc7..c58385a715d4 100644
--- a/include/my_md5.h
+++ b/include/my_md5.h
@@ -1,16 +1,23 @@
 #ifndef MY_MD5_INCLUDED
 #define MY_MD5_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_md5_size.h b/include/my_md5_size.h
index 555b5700eb13..804cf1daa1f2 100644
--- a/include/my_md5_size.h
+++ b/include/my_md5_size.h
@@ -1,15 +1,22 @@
 #ifndef MY_MD5_SIZE_INCLUDED
 #define MY_MD5_SIZE_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/include/my_murmur3.h b/include/my_murmur3.h
index 9ef4286405e9..9cd0b65aa066 100644
--- a/include/my_murmur3.h
+++ b/include/my_murmur3.h
@@ -1,16 +1,23 @@
 #ifndef MY_MURMUR3_INCLUDED
 #define MY_MURMUR3_INCLUDED
 
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_openssl.h b/include/my_openssl.h
new file mode 100644
index 000000000000..c28f2fe35f2e
--- /dev/null
+++ b/include/my_openssl.h
@@ -0,0 +1,65 @@
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MY_OPENSSL_INCLUDED
+#define MY_OPENSSL_INCLUDED
+
+#include <openssl/ssl.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Visual Studio requires '__inline' for C code */
+#if !defined(__cplusplus) && defined(_WIN32) && !defined(inline)
+#define inline __inline
+#endif
+
+/*
+  HAVE_STATIC_OPENSSL:
+  This is OpenSSL version >= 1.1.1 and we are linking statically.
+  We must disable all atexit() processing in OpenSSL, otherwise
+  dlclose() of plugins might destroy data structures which are needed
+  by the application.
+
+  Otherwise: "system" OpenSSL may be any version > 1.0.0
+  For 1.0.x : SSL_library_init is a function.
+  For 1.1.y : SSL_library_init is a macro: OPENSSL_init_ssl(0, NULL)
+
+  Note that we cannot in general call OPENSSL_cleanup(). Doing so from plugins
+  would break the embedding main program. Doing so from client code may
+  break e.g. ODBC clients (if the client also uses SSL).
+ */
+static inline int mysql_OPENSSL_init()
+{
+#if defined(HAVE_STATIC_OPENSSL)
+  return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
+#else
+  return SSL_library_init();
+#endif
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // MY_OPENSSL_INCLUDED
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
index 0647096b3ab1..314bcd6bc518 100644
--- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/my_rnd.h b/include/my_rnd.h
index b9985dda1590..5a07f6c6688d 100644
--- a/include/my_rnd.h
+++ b/include/my_rnd.h
@@ -2,23 +2,30 @@
 #define MY_RANDOM_INCLUDED
 
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 /*
-  A wrapper to use OpenSSL/YaSSL PRNGs.
+  A wrapper to use OpenSSL PRNGs.
 */
 
 #include <my_global.h>
diff --git a/include/my_sqlcommand.h b/include/my_sqlcommand.h
index 846283323ec9..d8e181f3b477 100644
--- a/include/my_sqlcommand.h
+++ b/include/my_sqlcommand.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h
index a1e16a2e2795..86bf2795f157 100644
--- a/include/my_stacktrace.h
+++ b/include/my_stacktrace.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_sys.h b/include/my_sys.h
index f2fc04ba0105..23f4bdfb9845 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -166,7 +173,7 @@ extern PSI_memory_key key_memory_max_alloca;
 #define my_safe_afree(ptr, size, max_alloca_sz) if (size > max_alloca_sz) \
                                                my_free(ptr)
 
-#if !defined(DBUG_OFF) || defined(HAVE_VALGRIND)
+#if !defined(NDEBUG) || defined(HAVE_VALGRIND)
 /**
   Put bad content in memory to be sure it will segfault if dereferenced.
   With Valgrind, verify that memory is addressable, and mark it undefined.
@@ -174,9 +181,10 @@ extern PSI_memory_key key_memory_max_alloca;
   trashes value of B.
 */
 #define TRASH(A,B) do {                                                 \
+    void *p = (A);                                                      \
     const size_t l= (B);                                                \
     MEM_CHECK_ADDRESSABLE(A, l);                                        \
-    memset(A, 0x8F, l);                                                 \
+    memset(p, 0x8F, l);                                                 \
     MEM_UNDEFINED(A, l);                                                \
   } while (0)
 #else
@@ -763,12 +771,10 @@ File create_temp_file(char *to, const char *dir, const char *pfx,
 		      int mode, myf MyFlags);
 
 // Use Prealloced_array or std::vector or something similar in C++
-#if defined(__cplusplus)
-
-#define init_dynamic_array please_use_an_appropriately_typed_container
-#define my_init_dynamic_array please_use_an_appropriately_typed_container
 
-#else
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 extern my_bool my_init_dynamic_array(DYNAMIC_ARRAY *array,
                                      PSI_memory_key key,
@@ -782,7 +788,9 @@ extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size,
 #define dynamic_element(array,array_index,type) \
   ((type)((array)->buffer) +(array_index))
 
-#endif  /* __cplusplus */
+#ifdef __cplusplus
+}
+#endif
 
 /* Some functions are still in use in C++, because HASH uses DYNAMIC_ARRAY */
 extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void *element);
diff --git a/include/my_thread.h b/include/my_thread.h
index bd65e064f9ca..938029f2a95a 100644
--- a/include/my_thread.h
+++ b/include/my_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_thread_local.h b/include/my_thread_local.h
index fabd71a4c121..44f15d953f39 100644
--- a/include/my_thread_local.h
+++ b/include/my_thread_local.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -92,7 +99,7 @@ void set_thr_winerr(int winerr);
 
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /* Return pointer to DBUG for holding current state */
 struct _db_code_state_ **my_thread_var_dbug();
 
diff --git a/include/my_thread_os_id.h b/include/my_thread_os_id.h
index a0a2de31614d..459123b9098d 100644
--- a/include/my_thread_os_id.h
+++ b/include/my_thread_os_id.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,6 +41,10 @@
 #include <pthread_np.h>             /* pthread_getthreadid_np() */
 #endif /* HAVE_PTHREAD_GETTHREADID_NP */
 
+#ifdef HAVE_PTHREAD_THREADID_NP
+#include <pthread.h>
+#endif /* HAVE_PTHREAD_THREADID_NP */
+
 C_MODE_START
 
 typedef unsigned long long my_thread_os_id_t;
@@ -48,14 +59,16 @@ typedef unsigned long long my_thread_os_id_t;
 */
 static inline my_thread_os_id_t my_thread_os_id()
 {
-#ifdef HAVE_SYS_THREAD_SELFID
+#ifdef HAVE_PTHREAD_THREADID_NP
   /*
-    Mac OSX.
-    Be careful to use SYS_thread_selfid first,
-    and to not use SYS_gettid on Mac OSX,
+    macOS.
+
+    Be careful to use this version first, and to not use SYS_gettid on macOS,
     as SYS_gettid has a different meaning compared to linux gettid().
   */
-  return syscall(SYS_thread_selfid);
+  uint64_t tid64;
+  pthread_threadid_np(nullptr, &tid64);
+  return (pid_t)tid64;
 #else
 #ifdef HAVE_SYS_GETTID
   /*
diff --git a/include/my_time.h b/include/my_time.h
index 77c90a75c7e5..f1f988412438 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/include/my_timer.h b/include/my_timer.h
index 08691bbfdf14..f46f9a82774b 100644
--- a/include/my_timer.h
+++ b/include/my_timer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_tree.h b/include/my_tree.h
index 3db7b3904f35..f2d837f9914a 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_uctype.h b/include/my_uctype.h
index 80ef01c079ac..94afa5d5622d 100644
--- a/include/my_uctype.h
+++ b/include/my_uctype.h
@@ -1,17 +1,24 @@
 #ifndef MY_UCTYPE_INCLUDED
 #define MY_UCTYPE_INCLUDED
 
-/* Copyright (c) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/my_user.h b/include/my_user.h
index 48ef13f12ec9..73abbdfc10f1 100644
--- a/include/my_user.h
+++ b/include/my_user.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2005-2007 MySQL AB
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/include/my_xml.h b/include/my_xml.h
index 639fdc7da4f4..95bceb99549a 100644
--- a/include/my_xml.h
+++ b/include/my_xml.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/myisam.h b/include/myisam.h
index 72675b0fb877..548746d9c2f0 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -388,8 +395,6 @@ typedef struct st_mi_check_param
   const char *db_name, *table_name;
   const char *op_name;
   enum_mi_stats_method stats_method;
-  mysql_mutex_t print_msg_mutex;
-  my_bool need_print_msg_lock;
 } MI_CHECK;
 
 typedef struct st_sort_ft_buf
@@ -411,10 +416,6 @@ typedef struct st_sort_info
   uchar *buff;
   SORT_KEY_BLOCKS *key_block,*key_block_end;
   SORT_FT_BUF *ft_buf;
-  /* sync things */
-  uint got_error, threads_running;
-  mysql_mutex_t mutex;
-  mysql_cond_t  cond;
 } SORT_INFO;
 
 /* functions in mi_check */
@@ -430,8 +431,6 @@ int mi_sort_index(MI_CHECK *param, MI_INFO *info, char * name,
                   my_bool no_copy_stat);
 int mi_repair_by_sort(MI_CHECK *param, MI_INFO *info,
 		      const char * name, int rep_quick, my_bool no_copy_stat);
-int mi_repair_parallel(MI_CHECK *param, MI_INFO *info,
-                       const char * name, int rep_quick, my_bool no_copy_stat);
 int change_to_newfile(const char * filename, const char * old_ext,
 		      const char * new_ext, myf myflags);
 int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type,
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 84b2d637892a..6546e7104a97 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000-2002, 2004, 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/myisampack.h b/include/myisampack.h
index 48c3f67fe211..63da4f80a6db 100644
--- a/include/myisampack.h
+++ b/include/myisampack.h
@@ -1,16 +1,23 @@
 #ifndef MYISAMPACK_INCLUDED
 #define MYISAMPACK_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql.h b/include/mysql.h
index 768e541ca4b3..b712c6675c14 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -166,7 +178,8 @@ enum mysql_option
   MYSQL_OPT_SSL_ENFORCE,
   MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
   MYSQL_OPT_TLS_VERSION,
-  MYSQL_OPT_SSL_MODE
+  MYSQL_OPT_SSL_MODE,
+  MYSQL_OPT_GET_SERVER_PUBLIC_KEY
 };
 
 /**
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 7583af65ac93..7db03d5dd592 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -180,6 +180,9 @@
 void get_salt_from_password(unsigned char *res, const char *password);
 void make_password_from_salt(char *to, const unsigned char *hash_stage2);
 char *octet2hex(char *to, const char *str, unsigned int len);
+my_bool generate_sha256_scramble(unsigned char *dst, size_t dst_size,
+                                 const char *src, size_t src_size, const char *rnd,
+                                 size_t rnd_size);
 char *get_tty_password(const char *opt_message);
 const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
 my_bool my_thread_init(void);
@@ -362,7 +365,8 @@
   MYSQL_OPT_SSL_ENFORCE,
   MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
   MYSQL_OPT_TLS_VERSION,
-  MYSQL_OPT_SSL_MODE
+  MYSQL_OPT_SSL_MODE,
+  MYSQL_OPT_GET_SERVER_PUBLIC_KEY
 };
 struct st_mysql_options_extention;
 struct st_mysql_options {
diff --git a/include/mysql/client_authentication.h b/include/mysql/client_authentication.h
index 894357934db2..96c044962ef6 100644
--- a/include/mysql/client_authentication.h
+++ b/include/mysql/client_authentication.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -22,6 +29,9 @@ C_MODE_START
 int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
 int sha256_password_init(char *, size_t, int, va_list);
 int sha256_password_deinit(void);
+int caching_sha2_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
+int caching_sha2_password_init(char *, size_t, int, va_list);
+int caching_sha2_password_deinit(void);
 C_MODE_END
 
 #endif
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
index d6471dbcd0a0..135203765e39 100644
--- a/include/mysql/client_plugin.h
+++ b/include/mysql/client_plugin.h
@@ -1,14 +1,26 @@
 #ifndef MYSQL_CLIENT_PLUGIN_INCLUDED
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/com_data.h b/include/mysql/com_data.h
index 2fe9cf24b122..49544677c2e6 100644
--- a/include/mysql/com_data.h
+++ b/include/mysql/com_data.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the Free
-   Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-   more details.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc., 51
diff --git a/include/mysql/get_password.h b/include/mysql/get_password.h
index a633c58c46f2..e1afd8a70202 100644
--- a/include/mysql/get_password.h
+++ b/include/mysql/get_password.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/group_replication_priv.h b/include/mysql/group_replication_priv.h
index ed8ef3eb0980..213aed05e433 100644
--- a/include/mysql/group_replication_priv.h
+++ b/include/mysql/group_replication_priv.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -37,12 +44,9 @@
 
 
 /**
-  Server side initializations and cleanup.
+  Server side initializations.
 */
-int group_replication_init(const char* plugin_name);
-int group_replication_cleanup();
-int group_replication_start();
-int group_replication_stop();
+int group_replication_init();
 
 
 /**
@@ -131,7 +135,7 @@ void get_server_startup_prerequirements(Trans_context_info& requirements,
 bool get_server_encoded_gtid_executed(uchar **encoded_gtid_executed,
                                       size_t *length);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 /**
   Returns a text representation of a encoded GTID set.
 
@@ -191,5 +195,12 @@ void global_thd_manager_remove_thd(THD *thd);
 */
 const char* get_write_set_algorithm_string(unsigned int algorithm);
 
+/**
+  Returns the value of slave_max_allowed_packet.
+
+  @return slave_max_allowed_packet
+*/
+unsigned long get_slave_max_allowed_packet();
+
 #endif	/* GROUP_REPLICATION_PRIV_INCLUDE */
 
diff --git a/include/mysql/innodb_priv.h b/include/mysql/innodb_priv.h
index 309541aeab95..c8b85d8b3905 100644
--- a/include/mysql/innodb_priv.h
+++ b/include/mysql/innodb_priv.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/mysql_lex_string.h b/include/mysql/mysql_lex_string.h
index ce3b6e47d3a8..612bc4b94de4 100644
--- a/include/mysql/mysql_lex_string.h
+++ b/include/mysql/mysql_lex_string.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index d6832035e6d6..a2926789e909 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -217,6 +224,7 @@ typedef int (*mysql_show_var_func)(MYSQL_THD, struct st_mysql_show_var*, char *)
 #define PLUGIN_VAR_OPCMDARG     0x2000 /* Argument optional for cmd line */
 #define PLUGIN_VAR_NODEFAULT    0x4000 /* SET DEFAULT is prohibited */
 #define PLUGIN_VAR_MEMALLOC     0x8000 /* String needs memory allocated */
+#define PLUGIN_VAR_INVISIBLE    0x10000 /* Variable should not be shown */
 
 struct st_mysql_sys_var;
 struct st_mysql_value;
@@ -270,7 +278,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd,
         (PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR | \
          PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_NOCMDARG | \
          PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC | \
-         PLUGIN_VAR_NODEFAULT)
+         PLUGIN_VAR_NODEFAULT | PLUGIN_VAR_INVISIBLE)
 
 #define MYSQL_PLUGIN_VAR_HEADER \
   int flags;                    \
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index dd17df281388..4b039d0238b3 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h
index cbc69278a463..afb7d025d2e1 100644
--- a/include/mysql/plugin_auth.h
+++ b/include/mysql/plugin_auth.h
@@ -1,14 +1,21 @@
 #ifndef MYSQL_PLUGIN_AUTH_INCLUDED
-/* Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h
index 1eb178622de5..9a6aae331125 100644
--- a/include/mysql/plugin_auth_common.h
+++ b/include/mysql/plugin_auth_common.h
@@ -1,14 +1,26 @@
 #ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin_ftparser.h b/include/mysql/plugin_ftparser.h
index 90d2cf8c5122..8cc8b4f66e07 100644
--- a/include/mysql/plugin_ftparser.h
+++ b/include/mysql/plugin_ftparser.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin_group_replication.h b/include/mysql/plugin_group_replication.h
index 730bd151b785..15ab19a11870 100644
--- a/include/mysql/plugin_group_replication.h
+++ b/include/mysql/plugin_group_replication.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/plugin_keyring.h b/include/mysql/plugin_keyring.h
index 2b94b0ad4a81..69a8220d2588 100644
--- a/include/mysql/plugin_keyring.h
+++ b/include/mysql/plugin_keyring.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/plugin_trace.h b/include/mysql/plugin_trace.h
index 71ac0b107023..0e2f1cb3bf42 100644
--- a/include/mysql/plugin_trace.h
+++ b/include/mysql/plugin_trace.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -331,7 +338,7 @@ struct st_mysql_client_plugin_TRACE
 extern
 struct st_mysql_client_plugin_TRACE *trace_plugin;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 /*
   Functions for getting names of trace events and protocol
diff --git a/include/mysql/plugin_validate_password.h b/include/mysql/plugin_validate_password.h
index 20d99d3bd33b..a013f3f33c77 100644
--- a/include/mysql/plugin_validate_password.h
+++ b/include/mysql/plugin_validate_password.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h
index 4c75cda8fde3..ed3067384826 100644
--- a/include/mysql/psi/mysql_file.h
+++ b/include/mysql/psi/mysql_file.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -211,7 +218,7 @@
   With the instrumentation, mysql_fclose(NULL, ...) will safely return 0,
   which is an extension compared to my_fclose and is therefore compliant.
   mysql_fclose is on purpose *not* implementing
-  @code DBUG_ASSERT(file != NULL) @endcode,
+  @code assert(file != NULL) @endcode,
   since doing so could introduce regressions.
 */
 #ifdef HAVE_PSI_FILE_INTERFACE
diff --git a/include/mysql/psi/mysql_idle.h b/include/mysql/psi/mysql_idle.h
index 102304aa3387..b9f7cb6c4fde 100644
--- a/include/mysql/psi/mysql_idle.h
+++ b/include/mysql/psi/mysql_idle.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/mysql_mdl.h b/include/mysql/psi/mysql_mdl.h
index bb2b76c151c7..bcc47a34c385 100644
--- a/include/mysql/psi/mysql_mdl.h
+++ b/include/mysql/psi/mysql_mdl.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/mysql_memory.h b/include/mysql/psi/mysql_memory.h
index 55dd8184b104..8a0680152b99 100644
--- a/include/mysql/psi/mysql_memory.h
+++ b/include/mysql/psi/mysql_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/mysql_ps.h b/include/mysql/psi/mysql_ps.h
index 0d3157c42f07..b60fe45a26ed 100644
--- a/include/mysql/psi/mysql_ps.h
+++ b/include/mysql/psi/mysql_ps.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index ad76e318b305..50abd113b644 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; version 2 of the
-License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_sp.h b/include/mysql/psi/mysql_sp.h
index 68fc468db1f7..c25247459ae8 100644
--- a/include/mysql/psi/mysql_sp.h
+++ b/include/mysql/psi/mysql_sp.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_stage.h b/include/mysql/psi/mysql_stage.h
index 9c1623f43734..91f1292d88db 100644
--- a/include/mysql/psi/mysql_stage.h
+++ b/include/mysql/psi/mysql_stage.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_statement.h b/include/mysql/psi/mysql_statement.h
index 9c27933b0695..2341101b1445 100644
--- a/include/mysql/psi/mysql_statement.h
+++ b/include/mysql/psi/mysql_statement.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/mysql_table.h b/include/mysql/psi/mysql_table.h
index 00f75661b70a..6de423688e4f 100644
--- a/include/mysql/psi/mysql_table.h
+++ b/include/mysql/psi/mysql_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
index c5ace991e0b1..b52ea13613f1 100644
--- a/include/mysql/psi/mysql_thread.h
+++ b/include/mysql/psi/mysql_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -1313,6 +1320,13 @@ static inline void inline_mysql_thread_set_psi_THD(THD *thd)
 }
 #endif /* __cplusplus */
 
+static inline void mysql_thread_set_peer_port(uint port MY_ATTRIBUTE ((unused))) {
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  struct PSI_thread *psi = PSI_THREAD_CALL(get_thread)();
+  PSI_THREAD_CALL(set_thread_peer_port)(psi, port);
+#endif
+}
+
 #endif
 
 #endif /* DISABLE_MYSQL_THREAD_H */
diff --git a/include/mysql/psi/mysql_transaction.h b/include/mysql/psi/mysql_transaction.h
index c80abf462286..38775bef3a22 100644
--- a/include/mysql/psi/mysql_transaction.h
+++ b/include/mysql/psi/mysql_transaction.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h
index fd8927ba81dc..31ffd7fadc6c 100644
--- a/include/mysql/psi/psi.h
+++ b/include/mysql/psi/psi.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -1671,6 +1678,15 @@ typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 */
 typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
 
+/**
+  Assign the remote (peer) port to the instrumented thread.
+
+  @param thread    pointer to the thread instrumentation
+  @param port      the remote port
+*/
+typedef void (*set_thread_peer_port_v1_t)(PSI_thread *thread,
+                                          unsigned int port);
+
 /** Delete the current thread instrumentation. */
 typedef void (*delete_current_thread_v1_t)(void);
 
@@ -2717,6 +2733,8 @@ struct PSI_v1
 
   start_metadata_wait_v1_t start_metadata_wait;
   end_metadata_wait_v1_t end_metadata_wait;
+
+  set_thread_peer_port_v1_t set_thread_peer_port;
 };
 
 /** @} (end of group Group_PSI_v1) */
diff --git a/include/mysql/psi/psi_abi_v0.h b/include/mysql/psi/psi_abi_v0.h
index cb6e225246d6..589668e39946 100644
--- a/include/mysql/psi/psi_abi_v0.h
+++ b/include/mysql/psi/psi_abi_v0.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/psi_abi_v1.h b/include/mysql/psi/psi_abi_v1.h
index 54c49f0c5188..d8028db3c24f 100644
--- a/include/mysql/psi/psi_abi_v1.h
+++ b/include/mysql/psi/psi_abi_v1.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/psi_abi_v1.h.pp b/include/mysql/psi/psi_abi_v1.h.pp
index 10fcde7128ec..b84be5867a9f 100644
--- a/include/mysql/psi/psi_abi_v1.h.pp
+++ b/include/mysql/psi/psi_abi_v1.h.pp
@@ -463,6 +463,8 @@
 typedef void (*set_thread_state_v1_t)(const char* state);
 typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
+typedef void (*set_thread_peer_port_v1_t)(PSI_thread *thread,
+                                          unsigned int port);
 typedef void (*delete_current_thread_v1_t)(void);
 typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);
 typedef struct PSI_file_locker* (*get_thread_file_name_locker_v1_t)
@@ -834,6 +836,7 @@
   destroy_metadata_lock_v1_t destroy_metadata_lock;
   start_metadata_wait_v1_t start_metadata_wait;
   end_metadata_wait_v1_t end_metadata_wait;
+  set_thread_peer_port_v1_t set_thread_peer_port;
 };
 typedef struct PSI_v1 PSI;
 typedef struct PSI_mutex_info_v1 PSI_mutex_info;
diff --git a/include/mysql/psi/psi_abi_v2.h b/include/mysql/psi/psi_abi_v2.h
index bd7dd4879029..295e0a909d6d 100644
--- a/include/mysql/psi/psi_abi_v2.h
+++ b/include/mysql/psi/psi_abi_v2.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/psi/psi_base.h b/include/mysql/psi/psi_base.h
index 94cb5c9f51c0..546bf1172346 100644
--- a/include/mysql/psi/psi_base.h
+++ b/include/mysql/psi/psi_base.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -77,6 +89,12 @@ extern "C" {
 */
 #define PSI_FLAG_VOLATILITY_SESSION (1 << 6)
 
+/**
+  System thread flag.
+  Indicates that the instrumented object exists on a system thread.
+*/
+#define PSI_FLAG_THREAD_SYSTEM (1 << 9)
+
 #ifdef HAVE_PSI_INTERFACE
 
 /**
diff --git a/include/mysql/psi/psi_memory.h b/include/mysql/psi/psi_memory.h
index 725b3ed77d06..f5e0ebce56be 100644
--- a/include/mysql/psi/psi_memory.h
+++ b/include/mysql/psi/psi_memory.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/mysql/service_command.h b/include/mysql/service_command.h
index 7b90b8f78d52..dd7e99ea9e3b 100644
--- a/include/mysql/service_command.h
+++ b/include/mysql/service_command.h
@@ -1,16 +1,22 @@
 #ifndef MYSQL_SERVICE_COMMAND_INCLUDED
 #define MYSQL_SERVICE_COMMAND_INCLUDED
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_locking.h b/include/mysql/service_locking.h
index 06f02d2080cf..9ffd33c680bf 100644
--- a/include/mysql/service_locking.h
+++ b/include/mysql/service_locking.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_my_plugin_log.h b/include/mysql/service_my_plugin_log.h
index 0cf7817573c7..3456f42dc0f5 100644
--- a/include/mysql/service_my_plugin_log.h
+++ b/include/mysql/service_my_plugin_log.h
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2011, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h
index d734ae155eed..49721ad5596d 100644
--- a/include/mysql/service_my_snprintf.h
+++ b/include/mysql/service_my_snprintf.h
@@ -1,15 +1,22 @@
 #ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
 #define MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_mysql_alloc.h b/include/mysql/service_mysql_alloc.h
index a43a169dafa2..146e2d600a93 100644
--- a/include/mysql/service_mysql_alloc.h
+++ b/include/mysql/service_mysql_alloc.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_mysql_keyring.h b/include/mysql/service_mysql_keyring.h
index 991d5fdedd18..198fe2652120 100644
--- a/include/mysql/service_mysql_keyring.h
+++ b/include/mysql/service_mysql_keyring.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_mysql_password_policy.h b/include/mysql/service_mysql_password_policy.h
index 09f121dbae50..889c56b3447c 100644
--- a/include/mysql/service_mysql_password_policy.h
+++ b/include/mysql/service_mysql_password_policy.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_mysql_string.h b/include/mysql/service_mysql_string.h
index c8cde972bcdb..f87302ec5b2e 100644
--- a/include/mysql/service_mysql_string.h
+++ b/include/mysql/service_mysql_string.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_parser.h b/include/mysql/service_parser.h
index 3cf7c8b84c88..9c7db4b4bdfe 100644
--- a/include/mysql/service_parser.h
+++ b/include/mysql/service_parser.h
@@ -1,16 +1,22 @@
 #ifndef MYSQL_SERVICE_PARSER_INCLUDED
 #define MYSQL_SERVICE_PARSER_INCLUDED
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_rpl_transaction_ctx.h b/include/mysql/service_rpl_transaction_ctx.h
index e25b22f4c26a..c9f9b8c535f3 100644
--- a/include/mysql/service_rpl_transaction_ctx.h
+++ b/include/mysql/service_rpl_transaction_ctx.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_rpl_transaction_write_set.h b/include/mysql/service_rpl_transaction_write_set.h
index 7f849c25501b..2a380d093e59 100644
--- a/include/mysql/service_rpl_transaction_write_set.h
+++ b/include/mysql/service_rpl_transaction_write_set.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -59,17 +66,32 @@ typedef struct st_trans_write_set Transaction_write_set;
 
 extern struct transaction_write_set_service_st {
   Transaction_write_set* (*get_transaction_write_set)(unsigned long m_thread_id);
+  void (*require_full_write_set)(int requires_ws);
+  void (*set_write_set_memory_size_limit)(long long size_limit);
+  void (*update_write_set_memory_size_limit)(long long  size_limit);
 } *transaction_write_set_service;
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
 
 #define get_transaction_write_set(m_thread_id) \
   (transaction_write_set_service->get_transaction_write_set((m_thread_id)))
+#define require_full_write_set(requires_ws) \
+  transaction_write_set_service->require_full_write_set(requires_ws)
+#define set_write_set_memory_size_limit(size_limit) \
+  transaction_write_set_service->set_write_set_memory_size_limit(size_limit)
+#define update_write_set_memory_size_limit(size_limit) \
+  transaction_write_set_service->update_write_set_memory_size_limit(size_limit)
 
 #else
 
 Transaction_write_set* get_transaction_write_set(unsigned long m_thread_id);
 
+void require_full_write_set(int requires_ws);
+
+void set_write_set_memory_size_limit(long long size_limit);
+
+void update_write_set_memory_size_limit(long long size_limit);
+
 #endif
 
 #ifdef __cplusplus
diff --git a/include/mysql/service_rules_table.h b/include/mysql/service_rules_table.h
index aca39265b082..db6c08a5012a 100644
--- a/include/mysql/service_rules_table.h
+++ b/include/mysql/service_rules_table.h
@@ -2,17 +2,23 @@
 #ifndef SERVICE_RULES_TABLE_INCLUDED
 #define SERVICE_RULES_TABLE_INCLUDED
 
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_security_context.h b/include/mysql/service_security_context.h
index 2efa7476e890..44825bec7b1c 100644
--- a/include/mysql/service_security_context.h
+++ b/include/mysql/service_security_context.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_srv_session.h b/include/mysql/service_srv_session.h
index e6c83c853fff..70cf9bda407d 100644
--- a/include/mysql/service_srv_session.h
+++ b/include/mysql/service_srv_session.h
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_srv_session_info.h b/include/mysql/service_srv_session_info.h
index 366529d4b89b..b9ade23cce17 100644
--- a/include/mysql/service_srv_session_info.h
+++ b/include/mysql/service_srv_session_info.h
@@ -1,16 +1,22 @@
 #ifndef MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED
 #define MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_ssl_wrapper.h b/include/mysql/service_ssl_wrapper.h
index 9b500b728191..aca7abb8d49d 100644
--- a/include/mysql/service_ssl_wrapper.h
+++ b/include/mysql/service_ssl_wrapper.h
@@ -1,16 +1,23 @@
 #ifndef SSL_WRAPPER_INCLUDED
 #define SSL_WRAPPER_INCLUDED
 
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_thd_alloc.h b/include/mysql/service_thd_alloc.h
index 5a89026ca5e7..2fd65661ae0a 100644
--- a/include/mysql/service_thd_alloc.h
+++ b/include/mysql/service_thd_alloc.h
@@ -1,14 +1,21 @@
 #ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_thd_engine_lock.h b/include/mysql/service_thd_engine_lock.h
index 36957e547bb0..2e6135757c3f 100644
--- a/include/mysql/service_thd_engine_lock.h
+++ b/include/mysql/service_thd_engine_lock.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_thd_wait.h b/include/mysql/service_thd_wait.h
index 62f2ea4017cf..173943ed5a01 100644
--- a/include/mysql/service_thd_wait.h
+++ b/include/mysql/service_thd_wait.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/service_thread_scheduler.h b/include/mysql/service_thread_scheduler.h
index 832aff066420..2d3d434e3a79 100644
--- a/include/mysql/service_thread_scheduler.h
+++ b/include/mysql/service_thread_scheduler.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/include/mysql/services.h b/include/mysql/services.h
index 8f3cca947e59..6e6287fc2d33 100644
--- a/include/mysql/services.h
+++ b/include/mysql/services.h
@@ -1,14 +1,21 @@
 #ifndef MYSQL_SERVICES_INCLUDED
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql/services.h.pp b/include/mysql/services.h.pp
index c0c581a6ab98..4ec117cbc1d5 100644
--- a/include/mysql/services.h.pp
+++ b/include/mysql/services.h.pp
@@ -444,8 +444,14 @@
 typedef struct st_trans_write_set Transaction_write_set;
 extern struct transaction_write_set_service_st {
   Transaction_write_set* (*get_transaction_write_set)(unsigned long m_thread_id);
+  void (*require_full_write_set)(int requires_ws);
+  void (*set_write_set_memory_size_limit)(long long size_limit);
+  void (*update_write_set_memory_size_limit)(long long  size_limit);
 } *transaction_write_set_service;
 Transaction_write_set* get_transaction_write_set(unsigned long m_thread_id);
+void require_full_write_set(int requires_ws);
+void set_write_set_memory_size_limit(long long size_limit);
+void update_write_set_memory_size_limit(long long size_limit);
 #include <mysql/service_security_context.h>
 typedef char my_svc_bool;
 extern struct security_context_service_st {
diff --git a/include/mysql/thread_pool_priv.h b/include/mysql/thread_pool_priv.h
index b7a91f29d5b5..530cc67220a6 100644
--- a/include/mysql/thread_pool_priv.h
+++ b/include/mysql/thread_pool_priv.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -178,4 +185,8 @@ ulong get_max_connections(void);
 */
 my_thread_attr_t *get_connection_attrib(void);
 
+/* Increment the status variable 'Aborted_connects'. */
+#ifndef EMBEDDED_LIBRARY
+void increment_aborted_connects();
+#endif
 #endif // THREAD_POOL_PRIV_INCLUDED
diff --git a/include/mysql/thread_type.h b/include/mysql/thread_type.h
index 30ba0f77efd6..941433bcd8e7 100644
--- a/include/mysql/thread_type.h
+++ b/include/mysql/thread_type.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql_com.h b/include/mysql_com.h
index d864d0754cb8..361d594436de 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -124,6 +136,7 @@
 #define FIELD_IS_DROPPED (1<< 26)       /* Intern: Field is being dropped */
 #define EXPLICIT_NULL_FLAG (1<< 27)     /* Field is explicitly specified as
                                            NULL by the user */
+#define SERIAL_FLAG (1<< 28)            /* Field is "SERIAL" */
 
 #define REFRESH_GRANT		1	/* Refresh grant tables */
 #define REFRESH_LOG		2	/* Start on new log file */
@@ -587,6 +600,10 @@ char *octet2hex(char *to, const char *str, unsigned int len);
 
 /* end of password.c */
 
+my_bool generate_sha256_scramble(unsigned char *dst, size_t dst_size,
+                                 const char *src, size_t src_size, const char *rnd,
+                                 size_t rnd_size);
+
 char *get_tty_password(const char *opt_message);
 const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
 
@@ -597,9 +614,11 @@ void my_thread_end(void);
 
 #ifdef MY_GLOBAL_INCLUDED
 ulong STDCALL net_field_length(uchar **packet);
+ulong STDCALL net_field_length_checked(uchar **packet, ulong max_length);
 my_ulonglong net_field_length_ll(uchar **packet);
 uchar *net_store_length(uchar *pkg, ulonglong length);
 unsigned int net_length_size(ulonglong num);
+unsigned int net_field_length_size(const unsigned char *pos);
 #endif
 
 #ifdef __cplusplus
diff --git a/include/mysql_com_server.h b/include/mysql_com_server.h
index 1ea040207d46..7d2b79e3f384 100644
--- a/include/mysql_com_server.h
+++ b/include/mysql_com_server.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,6 +41,14 @@ struct st_net_server
   before_header_callback_fn m_before_header;
   after_header_callback_fn m_after_header;
   void *m_user_data;
+  my_bool timeout_on_full_packet;
+
+  st_net_server() {
+    m_before_header = NULL;
+    m_after_header = NULL;
+    m_user_data = NULL;
+    timeout_on_full_packet = FALSE;
+  }
 };
 
 typedef struct st_net_server NET_SERVER;
diff --git a/include/mysql_embed.h b/include/mysql_embed.h
index cdee3a98a823..0160f676116d 100644
--- a/include/mysql_embed.h
+++ b/include/mysql_embed.h
@@ -1,16 +1,23 @@
 #ifndef MYSQL_EMBED_INCLUDED
 #define MYSQL_EMBED_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/mysql_time.h b/include/mysql_time.h
index ac9719c68ccf..94dc006c70c2 100644
--- a/include/mysql_time.h
+++ b/include/mysql_time.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ Without limiting anything contained in the foregoing, this file,
+ which is part of C Driver for MySQL (Connector/C), is also subject to the
+ Universal FOSS Exception, version 1.0, a copy of which can be found at
+ http://oss.oracle.com/licenses/universal-foss-exception.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/include/mysys_err.h b/include/mysys_err.h
index 4fd2cf38fbe2..70b3163f2373 100644
--- a/include/mysys_err.h
+++ b/include/mysys_err.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/nullable.h b/include/nullable.h
index 870cd01b8b60..23cc50851184 100644
--- a/include/nullable.h
+++ b/include/nullable.h
@@ -2,16 +2,23 @@
 #define NULLABLE_INCLUDED
 
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -70,7 +77,7 @@ template<typename T_value> class Nullable
   */
   const T_value& value() const
   {
-    DBUG_ASSERT(this->m_has_value);
+    assert(this->m_has_value);
     return this->m_value;
   }
 
diff --git a/include/password.h b/include/password.h
index cb5d87e02b8f..bfba80f281e6 100644
--- a/include/password.h
+++ b/include/password.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/pfs_file_provider.h b/include/pfs_file_provider.h
index 7717e83bb350..fc59e5a9d383 100644
--- a/include/pfs_file_provider.h
+++ b/include/pfs_file_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_idle_provider.h b/include/pfs_idle_provider.h
index 71d116f7423b..acb2b31a608b 100644
--- a/include/pfs_idle_provider.h
+++ b/include/pfs_idle_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_memory_provider.h b/include/pfs_memory_provider.h
index ea60f9de3bee..a79f3560c0ba 100644
--- a/include/pfs_memory_provider.h
+++ b/include/pfs_memory_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_metadata_provider.h b/include/pfs_metadata_provider.h
index cf3dd0d0dc1c..38dd60d672f3 100644
--- a/include/pfs_metadata_provider.h
+++ b/include/pfs_metadata_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_socket_provider.h b/include/pfs_socket_provider.h
index bfafdaafb005..bf32292f7737 100644
--- a/include/pfs_socket_provider.h
+++ b/include/pfs_socket_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_stage_provider.h b/include/pfs_stage_provider.h
index 2ad2faab8906..75b5638ef06d 100644
--- a/include/pfs_stage_provider.h
+++ b/include/pfs_stage_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_statement_provider.h b/include/pfs_statement_provider.h
index 96870d8400dd..31d1e9e37538 100644
--- a/include/pfs_statement_provider.h
+++ b/include/pfs_statement_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_table_provider.h b/include/pfs_table_provider.h
index 0d7ee76274b3..341a347ffc88 100644
--- a/include/pfs_table_provider.h
+++ b/include/pfs_table_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/pfs_thread_provider.h b/include/pfs_thread_provider.h
index 419fb81b6aa2..00105f284257 100644
--- a/include/pfs_thread_provider.h
+++ b/include/pfs_thread_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -159,6 +166,8 @@ void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc);
 int pfs_set_thread_connect_attrs_v1(const char *buffer, uint length,
                                       const void *from_cs);
 
+void pfs_set_thread_peer_port_v1(PSI_thread *thread, uint port);
+
 C_MODE_END
 
 #endif /* EMBEDDED_LIBRARY */
diff --git a/include/pfs_transaction_provider.h b/include/pfs_transaction_provider.h
index 7cf5357c5707..8fbfc35bfad0 100644
--- a/include/pfs_transaction_provider.h
+++ b/include/pfs_transaction_provider.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/include/prealloced_array.h b/include/prealloced_array.h
index d4a5f7081ea2..3b705d42ba46 100644
--- a/include/prealloced_array.h
+++ b/include/prealloced_array.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -148,13 +155,13 @@ class Prealloced_array
 
   Element_type &at(size_t n)
   {
-    DBUG_ASSERT(n < size());
+    assert(n < size());
     return m_array_ptr[n];
   }
 
   const Element_type &at(size_t n) const
   {
-    DBUG_ASSERT(n < size());
+    assert(n < size());
     return m_array_ptr[n];
   }
 
@@ -233,7 +240,7 @@ class Prealloced_array
    */
   void pop_back()
   {
-    DBUG_ASSERT(!empty());
+    assert(!empty());
     if (!Has_trivial_destructor)
       back().~Element_type();
     m_size-= 1;
@@ -335,7 +342,7 @@ class Prealloced_array
   */
   iterator erase(iterator position)
   {
-    DBUG_ASSERT(position != end());
+    assert(position != end());
     if (position + 1 != end())
       std::copy(position + 1, end(), position);
     this->pop_back();
@@ -347,7 +354,7 @@ class Prealloced_array
   */
   iterator erase(size_t ix)
   {
-    DBUG_ASSERT(ix < size());
+    assert(ix < size());
     return erase(begin() + ix);
   }
 
diff --git a/include/priority_queue.h b/include/priority_queue.h
index 3bd48d373198..7731d1fba8da 100644
--- a/include/priority_queue.h
+++ b/include/priority_queue.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -98,7 +105,7 @@ class Priority_queue : public Less
   // Returns the index of the parent node of node i.
   static size_type parent(size_type i)
   {
-    DBUG_ASSERT(i != 0);
+    assert(i != 0);
     return (--i) >> 1; // (i - 1) / 2
   }
 
@@ -116,7 +123,7 @@ class Priority_queue : public Less
 
   void heapify(size_type i, size_type last)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     size_type largest = i;
 
     do
@@ -149,7 +156,7 @@ class Priority_queue : public Less
 
   void reverse_heapify(size_type i)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     while (i > 0 && !Base::operator()(m_container[i], m_container[parent(i)]))
     {
       std::swap(m_container[parent(i)], m_container[i]);
@@ -216,14 +223,14 @@ class Priority_queue : public Less
   /// Returns a const reference to the top element of the priority queue.
   value_type const &top() const
   {
-    DBUG_ASSERT(!empty());
+    assert(!empty());
     return m_container[0];
   }
 
   /// Returns a reference to the top element of the priority queue.
   value_type& top()
   {
-    DBUG_ASSERT(!empty());
+    assert(!empty());
     return m_container[0];
   }
 
@@ -257,7 +264,7 @@ class Priority_queue : public Less
   /// Removes the element at position i from the priority queue.
   void remove(size_type i)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
 
     if (i == m_container.size() - 1)
     {
@@ -267,7 +274,7 @@ class Priority_queue : public Less
 
     m_container[i] = m_container[m_container.size() - 1];
     m_container.pop_back();
-    heapify(i);
+    update(i);
   }
 
   /**
@@ -276,8 +283,8 @@ class Priority_queue : public Less
   */
   void decrease(size_type i, value_type const &x)
   {
-    DBUG_ASSERT(i < size());
-    DBUG_ASSERT(!Base::operator()(m_container[i], x));
+    assert(i < size());
+    assert(!Base::operator()(m_container[i], x));
     decrease_key(i, x);
   }
 
@@ -287,8 +294,8 @@ class Priority_queue : public Less
   */
   void increase(size_type i, value_type const &x)
   {
-    DBUG_ASSERT(i < size());
-    DBUG_ASSERT(!Base::operator()(x, m_container[i]));
+    assert(i < size());
+    assert(!Base::operator()(x, m_container[i]));
     increase_key(i, x);
   }
 
@@ -298,7 +305,7 @@ class Priority_queue : public Less
   */
   void update(size_type i, value_type const &x)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     if (Base::operator()(x, m_container[i]))
     {
       decrease_key(i, x);
@@ -333,7 +340,7 @@ class Priority_queue : public Less
   */
   void update(size_type i)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     if (i == 0 || Base::operator()(m_container[i], m_container[parent(i)]))
     {
       heapify(i);
@@ -350,7 +357,7 @@ class Priority_queue : public Less
   */
   void update_top()
   {
-    DBUG_ASSERT(!empty());
+    assert(!empty());
     heapify(0);
   }
 
@@ -363,14 +370,14 @@ class Priority_queue : public Less
   /// Returns a const reference to the i-th element in the underlying container.
   value_type const& operator[](size_type i) const
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     return m_container[i];
   }
 
   /// Returns a reference to the i-th element in the underlying container.
   value_type& operator[](size_type i)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     return m_container[i];
   }
 
@@ -465,7 +472,7 @@ class Priority_queue : public Less
   MY_ATTRIBUTE((warn_unused_result))
   bool reserve(size_type n)
   {
-    DBUG_ASSERT(n <= m_container.max_size());
+    assert(n <= m_container.max_size());
     try
     {
       m_container.reserve(n);
diff --git a/include/probes_mysql.d.base b/include/probes_mysql.d.base
index 02eb9ec1a6b0..391cac23a90d 100644
--- a/include/probes_mysql.d.base
+++ b/include/probes_mysql.d.base
@@ -1,14 +1,21 @@
-/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/probes_mysql.h b/include/probes_mysql.h
index 191860d0b947..27e54758701d 100644
--- a/include/probes_mysql.h
+++ b/include/probes_mysql.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h
index bc3b65a00e5e..2f653a4177d8 100644
--- a/include/probes_mysql_nodtrace.h
+++ b/include/probes_mysql_nodtrace.h
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /*
  * Generated by dheadgen(1).
  */
diff --git a/include/queues.h b/include/queues.h
index 4ce6598c3d15..f435e2413e7d 100644
--- a/include/queues.h
+++ b/include/queues.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/service_versions.h b/include/service_versions.h
index e05cf641113e..0713af991d71 100644
--- a/include/service_versions.h
+++ b/include/service_versions.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/sha1.h b/include/sha1.h
index 353fe990db68..ad6fd590822f 100644
--- a/include/sha1.h
+++ b/include/sha1.h
@@ -1,16 +1,23 @@
 #ifndef SHA1_INCLUDED
 #define SHA1_INCLUDED
 
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/include/sha2.h b/include/sha2.h
index 031d02f56903..765f5cad8139 100644
--- a/include/sha2.h
+++ b/include/sha2.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -18,53 +25,12 @@
 
 #include <my_config.h>
 
-#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 
 #include <stddef.h>
 
-#  ifndef HAVE_YASSL
-#    include <openssl/sha.h>
-
-#  else
-
-#include "../extra/yassl/taocrypt/include/sha.hpp"
-
-#    ifdef __cplusplus
-extern "C" {
-#    endif
-
-#ifndef SHA512_DIGEST_LENGTH
-#define SHA512_DIGEST_LENGTH TaoCrypt::SHA512::DIGEST_SIZE
-#endif
-
-#ifndef SHA384_DIGEST_LENGTH
-#define SHA384_DIGEST_LENGTH TaoCrypt::SHA384::DIGEST_SIZE
-#endif
-
-#ifndef SHA256_DIGEST_LENGTH
-#define SHA256_DIGEST_LENGTH TaoCrypt::SHA256::DIGEST_SIZE
-#endif
-
-#ifndef SHA224_DIGEST_LENGTH
-#define SHA224_DIGEST_LENGTH TaoCrypt::SHA224::DIGEST_SIZE
-#endif
-
-#define GEN_YASSL_SHA2_BRIDGE(size) \
-unsigned char* SHA##size(const unsigned char *input_ptr, size_t input_length, \
-               char unsigned *output_ptr);
-
-GEN_YASSL_SHA2_BRIDGE(512);
-GEN_YASSL_SHA2_BRIDGE(384);
-GEN_YASSL_SHA2_BRIDGE(256);
-GEN_YASSL_SHA2_BRIDGE(224);
-
-#undef GEN_YASSL_SHA2_BRIDGE
-
-#    ifdef __cplusplus
-}
-#    endif
+#include <openssl/sha.h>
 
-#  endif /* HAVE_YASSL */
 
-#endif /* HAVE_OPENSSL || HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 #endif /* included_sha2_h */
diff --git a/include/sql_chars.h b/include/sql_chars.h
index 584451a2ef54..59da0d07c5cb 100644
--- a/include/sql_chars.h
+++ b/include/sql_chars.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/sql_common.h b/include/sql_common.h
index 8d5768c2e090..ef057d8aa246 100644
--- a/include/sql_common.h
+++ b/include/sql_common.h
@@ -1,17 +1,24 @@
 #ifndef SQL_COMMON_INCLUDED
 #define SQL_COMMON_INCLUDED
 
-/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
@@ -103,7 +110,7 @@ struct st_mysql_options_extention {
   char *server_public_key_path;
   size_t connection_attributes_length;
   my_bool enable_cleartext_plugin;
-  my_bool unused0;                              /* Former ssl_enforce */
+  my_bool get_server_public_key;
   char *tls_version; /* TLS version option */
   long ssl_ctx_flags; /* SSL ctx options flag */
   unsigned int ssl_mode;
@@ -182,6 +189,9 @@ void set_stmt_error(MYSQL_STMT *stmt, int errcode, const char *sqlstate,
 void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);
 void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate,
                               const char *format, ...);
+#ifdef EMBEDDED_LIBRARY
+int embedded_ssl_check(MYSQL *mysql);
+#endif
 
 /* client side of the pluggable authentication */
 struct st_plugin_vio_info;
@@ -195,6 +205,7 @@ struct st_mysql_client_plugin;
 extern struct st_mysql_client_plugin *mysql_client_builtins[];
 uchar * send_client_connect_attrs(MYSQL *mysql, uchar *buf);
 extern my_bool libmysql_cleartext_plugin_enabled;
+int is_file_or_dir_world_writable(const char *filepath);
 void read_ok_ex(MYSQL *mysql, unsigned long len);
 
 #ifdef	__cplusplus
diff --git a/include/sql_string.h b/include/sql_string.h
index 76782407a647..c15cbe4f2469 100644
--- a/include/sql_string.h
+++ b/include/sql_string.h
@@ -1,16 +1,23 @@
 #ifndef SQL_STRING_INCLUDED
 #define SQL_STRING_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -52,9 +59,9 @@ class Simple_cstring
   void set(const char *str_arg, size_t length_arg)
   {
     // NULL is allowed only with length==0
-    DBUG_ASSERT(str_arg || length_arg == 0);
+    assert(str_arg || length_arg == 0);
     // For non-NULL, make sure length_arg is in sync with '\0' terminator.
-    DBUG_ASSERT(!str_arg || str_arg[length_arg] == '\0');
+    assert(!str_arg || str_arg[length_arg] == '\0');
     m_str= str_arg;
     m_length= length_arg;
   }
@@ -200,8 +207,8 @@ class String
   const char *ptr() const { return m_ptr; }
   char *c_ptr()
   {
-    DBUG_ASSERT(!m_is_alloced || !m_ptr || !m_alloced_length ||
-                (m_alloced_length >= (m_length + 1)));
+    assert(!m_is_alloced || !m_ptr || !m_alloced_length ||
+           (m_alloced_length >= (m_length + 1)));
 
     if (!m_ptr || m_ptr[m_length])		/* Should be safe */
       (void) mem_realloc(m_length);
@@ -235,7 +242,7 @@ class String
 
   void set(String &str,size_t offset, size_t arg_length)
   {
-    DBUG_ASSERT(&str != this);
+    assert(&str != this);
     mem_free();
     m_ptr= const_cast<char*>(str.ptr()) + offset;
     m_length= arg_length;
@@ -317,7 +324,7 @@ class String
   {
     m_length--;
     m_ptr[m_length]= '\0';
-    DBUG_ASSERT(strlen(m_ptr) == m_length);
+    assert(strlen(m_ptr) == m_length);
   }
 
   void mem_claim()
@@ -384,7 +391,7 @@ class String
         It is forbidden to do assignments like
         some_string = substring_of_that_string
        */
-      DBUG_ASSERT(!s.uses_buffer_owned_by(this));
+      assert(!s.uses_buffer_owned_by(this));
       mem_free();
       m_ptr= s.m_ptr;
       m_length= s.m_length;
@@ -404,9 +411,9 @@ class String
   */
   void takeover(String &s)
   {
-    DBUG_ASSERT(this != &s);
+    assert(this != &s);
     // Make sure buffers of the two Strings do not overlap
-    DBUG_ASSERT(!s.uses_buffer_owned_by(this));
+    assert(!s.uses_buffer_owned_by(this));
     mem_free();
     m_ptr= s.m_ptr;
     m_length= s.m_length;
diff --git a/include/sslopt-case.h b/include/sslopt-case.h
index 745196a9c95f..cb9ea3924ba8 100644
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -54,10 +61,5 @@
     case OPT_SSL_CRL:
     case OPT_SSL_CRLPATH:
     case OPT_TLS_VERSION:
-#ifdef HAVE_YASSL
-      /* crl has no effect in yaSSL. */
-      opt_ssl_crl= NULL;
-      opt_ssl_crlpath= NULL;
-#endif /* HAVE_YASSL */
       break;
 #endif /* HAVE_OPENSSL */
diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h
index 416cea737652..e78140700cc2 100644
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,11 +64,7 @@
    &opt_ssl_crlpath, &opt_ssl_crlpath, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
    {"tls-version", OPT_TLS_VERSION, "TLS version to use, "
-#ifndef HAVE_YASSL
     "permitted values are: TLSv1, TLSv1.1, TLSv1.2",
-#else
-    "permitted values are: TLSv1, TLSv1.1",
-#endif
     &opt_tls_version, &opt_tls_version, 0, GET_STR, REQUIRED_ARG,
     0, 0, 0, 0, 0, 0},
 #endif /* HAVE_OPENSSL */
diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h
index c0dc69b04b93..0e265c3d12b4 100644
--- a/include/sslopt-vars.h
+++ b/include/sslopt-vars.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/template_utils.h b/include/template_utils.h
index 7e12b11f703b..dcf87fb62279 100644
--- a/include/template_utils.h
+++ b/include/template_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -75,7 +82,7 @@ inline const T pointer_cast(const void *p)
 template<typename Target, typename Source>
 inline Target down_cast(Source arg)
 {
-  DBUG_ASSERT(NULL != dynamic_cast<Target>(arg));
+  assert(NULL != dynamic_cast<Target>(arg));
   return static_cast<Target>(arg);
 }
 
diff --git a/include/thr_cond.h b/include/thr_cond.h
index 95df29d11cb3..99b4d2084ec6 100644
--- a/include/thr_cond.h
+++ b/include/thr_cond.h
@@ -1,16 +1,23 @@
 #ifndef THR_COND_INCLUDED
 #define THR_COND_INCLUDED
 
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 884784e8e027..c06b7d16b9c7 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/thr_mutex.h b/include/thr_mutex.h
index 1b8c9d879d65..5452cf8e33df 100644
--- a/include/thr_mutex.h
+++ b/include/thr_mutex.h
@@ -1,16 +1,23 @@
 #ifndef THR_MUTEX_INCLUDED
 #define THR_MUTEX_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -143,14 +150,14 @@ int safe_mutex_destroy(my_mutex_t *mp, const char *file, uint line);
 
 static inline void safe_mutex_assert_owner(const my_mutex_t *mp)
 {
-  DBUG_ASSERT(mp->count > 0 &&
-              my_thread_equal(my_thread_self(), mp->thread));
+  assert(mp->count > 0 &&
+         my_thread_equal(my_thread_self(), mp->thread));
 }
 
 static inline void safe_mutex_assert_not_owner(const my_mutex_t *mp)
 {
-  DBUG_ASSERT(!mp->count ||
-              !my_thread_equal(my_thread_self(), mp->thread));
+  assert(!mp->count ||
+         !my_thread_equal(my_thread_self(), mp->thread));
 }
 
 #else
diff --git a/include/thr_rwlock.h b/include/thr_rwlock.h
index c177e29e3d4b..a71ab03a2708 100644
--- a/include/thr_rwlock.h
+++ b/include/thr_rwlock.h
@@ -1,16 +1,23 @@
 #ifndef THR_RWLOCK_INCLUDED
 #define THR_RWLOCK_INCLUDED
 
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -195,8 +202,8 @@ static inline void
 rw_pr_lock_assert_write_owner(const rw_pr_lock_t *rwlock MY_ATTRIBUTE((unused)))
 {
 #ifdef SAFE_MUTEX
-  DBUG_ASSERT(rwlock->active_writer &&
-              my_thread_equal(my_thread_self(), rwlock->writer_thread));
+  assert(rwlock->active_writer &&
+         my_thread_equal(my_thread_self(), rwlock->writer_thread));
 #endif
 }
 
@@ -204,8 +211,8 @@ static inline void
 rw_pr_lock_assert_not_write_owner(const rw_pr_lock_t *rwlock MY_ATTRIBUTE((unused)))
 {
 #ifdef SAFE_MUTEX
-  DBUG_ASSERT(!rwlock->active_writer ||
-              !my_thread_equal(my_thread_self(), rwlock->writer_thread));
+  assert(!rwlock->active_writer ||
+         !my_thread_equal(my_thread_self(), rwlock->writer_thread));
 #endif
 }
 
diff --git a/include/typelib.h b/include/typelib.h
index 919dd69d6dfe..dc88e2995a3d 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/include/violite.h b/include/violite.h
index 27420f9d223e..145e90faa816 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -149,7 +156,7 @@ my_bool vio_peer_addr(Vio *vio, char *buf, uint16 *port, size_t buflen);
 /* Wait for an I/O event notification. */
 int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout);
 my_bool vio_is_connected(Vio *vio);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 ssize_t vio_pending(Vio *vio);
 #endif
 /* Set timeout for a network operation. */
@@ -181,14 +188,6 @@ int vio_getnameinfo(const struct sockaddr *sa,
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#define HEADER_DES_LOCL_H dummy_something
-#define YASSL_MYSQL_COMPATIBLE
-#ifndef YASSL_PREFIX
-#define YASSL_PREFIX
-#endif
-/* Set yaSSL to use same type as MySQL do for socket handles */
-typedef my_socket YASSL_SOCKET_T;
-#define YASSL_SOCKET_T_DEFINED
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
@@ -335,4 +334,11 @@ struct st_vio
   char    *shared_memory_pos;
 #endif /* _WIN32 && !EMBEDDED_LIBRARY */
 };
+
+#ifdef HAVE_OPENSSL
+#define SSL_handle SSL*
+#else
+#define SSL_handle void*
+#endif
+
 #endif /* vio_violite_h_ */
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h
index 2b304d57f91f..dd4e4d36983f 100644
--- a/include/welcome_copyright_notice.h
+++ b/include/welcome_copyright_notice.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,7 +23,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2018"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2023"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
@@ -25,11 +32,11 @@
 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
   (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
    "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
-   "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
+   "Oracle and/or its affiliates.\n\nOracle is a " \
    "registered trademark of Oracle Corporation and/or its\naffiliates. " \
    "Other names may be trademarks of their respective\nowners.\n" : \
    "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
-   "All rights reserved.\n\nOracle is a registered trademark of " \
+   "\n\nOracle is a registered trademark of " \
    "Oracle Corporation and/or its\naffiliates. Other names may be " \
    "trademarks of their respective\nowners.\n")
 
diff --git a/libbinlogevents/CMakeLists.txt b/libbinlogevents/CMakeLists.txt
index 44219c2ba407..d26d5351203f 100644
--- a/libbinlogevents/CMakeLists.txt
+++ b/libbinlogevents/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -18,11 +25,7 @@ INCLUDE(configure.cmake)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/include
-                    ${CMAKE_SOURCE_DIR}/libbinlogevents/export
-                    # ZLIB_INCLUDE_DIR points to ${CMAKE_SOURCE_DIR}/zlib,
-                    # when compiled with MySQL server version (< 5.7).
-                    # It is NULL otherwise.
-                    ${ZLIB_INCLUDE_DIR})
+                    ${CMAKE_SOURCE_DIR}/libbinlogevents/export)
 
 CONFIGURE_FILE(binlog_config.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/include/binlog_config.h)
diff --git a/libbinlogevents/binlog_config.h.cmake b/libbinlogevents/binlog_config.h.cmake
index 3662e8f472d2..6c7fcf94e197 100644
--- a/libbinlogevents/binlog_config.h.cmake
+++ b/libbinlogevents/binlog_config.h.cmake
@@ -1,14 +1,21 @@
 /**
- Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/configure.cmake b/libbinlogevents/configure.cmake
index 40b53c167040..354b0629982b 100644
--- a/libbinlogevents/configure.cmake
+++ b/libbinlogevents/configure.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/export/binary_log_funcs.h b/libbinlogevents/export/binary_log_funcs.h
index 3cda89bdff1c..f0c374299127 100644
--- a/libbinlogevents/export/binary_log_funcs.h
+++ b/libbinlogevents/export/binary_log_funcs.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/export/binary_log_types.h b/libbinlogevents/export/binary_log_types.h
index b20eacf61b5d..653efc97f65b 100644
--- a/libbinlogevents/export/binary_log_types.h
+++ b/libbinlogevents/export/binary_log_types.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/binary_log.h b/libbinlogevents/include/binary_log.h
index be633b9c7424..1782b38031a0 100644
--- a/libbinlogevents/include/binary_log.h
+++ b/libbinlogevents/include/binary_log.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/binlog_event.h b/libbinlogevents/include/binlog_event.h
index bb4219f14cd0..40e99d3201d5 100644
--- a/libbinlogevents/include/binlog_event.h
+++ b/libbinlogevents/include/binlog_event.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/byteorder.h b/libbinlogevents/include/byteorder.h
index d38fedd5da42..a44b02ecb0ee 100644
--- a/libbinlogevents/include/byteorder.h
+++ b/libbinlogevents/include/byteorder.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/control_events.h b/libbinlogevents/include/control_events.h
index ac1b157138aa..ad45912debbc 100644
--- a/libbinlogevents/include/control_events.h
+++ b/libbinlogevents/include/control_events.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1227,7 +1234,8 @@ class Transaction_context_event : public Binary_log_event
   virtual ~Transaction_context_event();
 
   static const char *read_data_set(const char *pos, uint32_t set_len,
-                                   std::list<const char*> *set);
+                                   std::list<const char*> *set,
+                                   uint32_t remaining_buffer);
 
   static void clear_set(std::list<const char*> *set);
 
@@ -1332,7 +1340,8 @@ class View_change_event : public Binary_log_event
   virtual ~View_change_event();
 
   static char *read_data_map(char *pos, uint32_t map_len,
-                             std::map<std::string, std::string> *map);
+                             std::map<std::string, std::string> *map,
+                             uint32_t consumable);
 
 #ifndef HAVE_MYSYS
   void print_event_info(std::ostream& info) { }
diff --git a/libbinlogevents/include/debug_vars.h b/libbinlogevents/include/debug_vars.h
index 557d87b4a5d3..45458bbfd4ce 100644
--- a/libbinlogevents/include/debug_vars.h
+++ b/libbinlogevents/include/debug_vars.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/load_data_events.h b/libbinlogevents/include/load_data_events.h
index 886d39619ef1..0552c0484d59 100644
--- a/libbinlogevents/include/load_data_events.h
+++ b/libbinlogevents/include/load_data_events.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/rows_event.h b/libbinlogevents/include/rows_event.h
index 00ba9c33afbc..85cf71191658 100644
--- a/libbinlogevents/include/rows_event.h
+++ b/libbinlogevents/include/rows_event.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/statement_events.h b/libbinlogevents/include/statement_events.h
index 47b976ca4e77..619487267ce8 100644
--- a/libbinlogevents/include/statement_events.h
+++ b/libbinlogevents/include/statement_events.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -674,6 +681,11 @@ template <class T> T available_buffer(const char* buf_start,
                                       const char* buf_current,
                                       T buf_len)
 {
+  /* Sanity check */
+  if (buf_current < buf_start ||
+      buf_len < static_cast<T>(buf_current - buf_start))
+    return static_cast<T>(0);
+
   return static_cast<T>(buf_len - (buf_current - buf_start));
 }
 
diff --git a/libbinlogevents/include/table_id.h b/libbinlogevents/include/table_id.h
index e528b027fb8f..9e46f89ef9d0 100644
--- a/libbinlogevents/include/table_id.h
+++ b/libbinlogevents/include/table_id.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/include/wrapper_functions.h b/libbinlogevents/include/wrapper_functions.h
index 5192704af627..cccab7c53d74 100644
--- a/libbinlogevents/include/wrapper_functions.h
+++ b/libbinlogevents/include/wrapper_functions.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -43,12 +50,8 @@ extern PSI_memory_key key_memory_log_event;
 
 #endif
 
-#if !defined(DBUG_OFF)
-#if HAVE_MYSYS
-#define BAPI_ASSERT(x) DBUG_ASSERT(x)
-#else
+#if !defined(NDEBUG)
 #define BAPI_ASSERT(x) assert(x)
-#endif
 #else
 #define BAPI_ASSERT(x) do { } while(0)
 #endif
diff --git a/libbinlogevents/src/CMakeLists.txt b/libbinlogevents/src/CMakeLists.txt
index 83e5c6ce0ba4..26c918865f3f 100644
--- a/libbinlogevents/src/CMakeLists.txt
+++ b/libbinlogevents/src/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/src/binary_log_funcs.cpp b/libbinlogevents/src/binary_log_funcs.cpp
index bc0e701a2621..cb7b361ac05f 100644
--- a/libbinlogevents/src/binary_log_funcs.cpp
+++ b/libbinlogevents/src/binary_log_funcs.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogevents/src/binlog_event.cpp b/libbinlogevents/src/binlog_event.cpp
index c084aee7bee9..1cf973d4c7cf 100644
--- a/libbinlogevents/src/binlog_event.cpp
+++ b/libbinlogevents/src/binlog_event.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -224,7 +231,7 @@ bool Log_event_footer::event_checksum_test(unsigned char *event_buf,
 
     if (event_buf[EVENT_TYPE_OFFSET] == FORMAT_DESCRIPTION_EVENT)
     {
-    #ifndef DBUG_OFF
+    #ifndef NDEBUG
       unsigned char fd_alg= event_buf[event_len - BINLOG_CHECKSUM_LEN -
                                       BINLOG_CHECKSUM_ALG_DESC_LEN];
     #endif
@@ -240,7 +247,7 @@ bool Log_event_footer::event_checksum_test(unsigned char *event_buf,
          The only algorithm currently is CRC32. Zero indicates
          the binlog file is checksum-free *except* the FD-event.
       */
-    #ifndef DBUG_OFF
+    #ifndef NDEBUG
       BAPI_ASSERT(fd_alg == BINLOG_CHECKSUM_ALG_CRC32 || fd_alg == 0);
     #endif
       BAPI_ASSERT(alg == BINLOG_CHECKSUM_ALG_CRC32);
@@ -268,7 +275,7 @@ bool Log_event_footer::event_checksum_test(unsigned char *event_buf,
 
     res= !(computed == incoming);
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (binary_log_debug::debug_checksum_test)
     return true;
 #endif
diff --git a/libbinlogevents/src/control_events.cpp b/libbinlogevents/src/control_events.cpp
index 15d9ab4d8e1b..13517eaee162 100644
--- a/libbinlogevents/src/control_events.cpp
+++ b/libbinlogevents/src/control_events.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -99,7 +106,7 @@ Format_description_event::Format_description_event(uint8_t binlog_ver,
      in getting rid of the valgrind errors.
     */
     memset(server_version, 0, ST_SERVER_VER_LEN);
-    strncpy(server_version, server_ver, ST_SERVER_VER_LEN);
+    strncpy(server_version, server_ver, ST_SERVER_VER_LEN - 1);
     if (binary_log_debug::debug_pretend_version_50034_in_binlog)
       strcpy(server_version, "5.0.34");
     common_header_len= LOG_EVENT_HEADER_LEN;
@@ -163,12 +170,10 @@ Format_description_event::Format_description_event(uint8_t binlog_ver,
        Allows us to sanity-check that all events initialized their
        events (see the end of this 'if' block).
     */
-    post_header_len.resize(number_of_event_types +
-                            BINLOG_CHECKSUM_ALG_DESC_LEN, 255);
     post_header_len.insert(post_header_len.begin(), server_event_header_length,
                             server_event_header_length + number_of_event_types);
     // Sanity-check that all post header lengths are initialized.
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     for (int i= 0; i < number_of_event_types; i++)
       BAPI_ASSERT(post_header_len[i] != 255);
 #endif
@@ -220,7 +225,6 @@ Format_description_event::Format_description_event(uint8_t binlog_ver,
       RAND_HEADER_LEN,
       USER_VAR_HEADER_LEN
     };
-    post_header_len.resize(number_of_event_types + BINLOG_CHECKSUM_ALG_DESC_LEN);
     post_header_len.insert(post_header_len.begin(),
                            server_event_header_length_ver_1_3,
                            server_event_header_length_ver_1_3 +
@@ -338,18 +342,21 @@ Format_description_event(const char* buf, unsigned int event_len,
   number_of_event_types=
    event_len - (LOG_EVENT_MINIMAL_HEADER_LEN + ST_COMMON_HEADER_LEN_OFFSET + 1);
 
-  const uint8_t *ubuf = reinterpret_cast<const uint8_t*>(buf);
-  post_header_len.resize(number_of_event_types);
-  post_header_len.insert(post_header_len.begin(),
-                         ubuf + ST_COMMON_HEADER_LEN_OFFSET + 1,
-                         (ubuf + ST_COMMON_HEADER_LEN_OFFSET + 1 +
-                          number_of_event_types));
-
   calc_server_version_split();
-  if ((ver_calc= get_product_version()) >= checksum_version_product)
-  {
+  ver_calc = get_product_version();
+  if (ver_calc >= checksum_version_product) {
     /* the last bytes are the checksum alg desc and value (or value's room) */
     number_of_event_types -= BINLOG_CHECKSUM_ALG_DESC_LEN;
+  }
+
+  const uint8_t *ubuf = reinterpret_cast<const uint8_t*>(buf) +
+                        ST_COMMON_HEADER_LEN_OFFSET + 1;
+  post_header_len.insert(post_header_len.begin(),
+                         ubuf, (ubuf + number_of_event_types));
+
+  ubuf += number_of_event_types;
+  if (ver_calc >= checksum_version_product)
+  {
     /*
       FD from the checksum-home version server (ver_calc ==
       checksum_version_product) must have
@@ -357,8 +364,7 @@ Format_description_event(const char* buf, unsigned int event_len,
     */
     BAPI_ASSERT(ver_calc != checksum_version_product ||
                 number_of_event_types == LOG_EVENT_TYPES);
-    footer()->checksum_alg= (enum_binlog_checksum_alg)
-                                  post_header_len[number_of_event_types];
+    footer()->checksum_alg= static_cast<enum_binlog_checksum_alg> (*ubuf);
   }
   else
   {
@@ -600,7 +606,20 @@ XA_prepare_event(const char* buf,
   memcpy(&temp, buf, sizeof(temp));
   my_xid.bqual_length= le32toh(temp);
   buf += sizeof(temp);
-  memcpy(my_xid.data, buf, my_xid.gtrid_length + my_xid.bqual_length);
+
+  /* Sanity check */
+  if (MY_XIDDATASIZE >= my_xid.gtrid_length + my_xid.bqual_length &&
+      my_xid.gtrid_length >=0 && my_xid.gtrid_length <= 64 &&
+      my_xid.bqual_length >=0 && my_xid.bqual_length <= 64)
+  {
+    memcpy(my_xid.data, buf, my_xid.gtrid_length + my_xid.bqual_length);
+  }
+  else
+  {
+    my_xid.formatID= -1;
+    my_xid.gtrid_length= 0;
+    my_xid.bqual_length= 0;
+  }
 }
 
 /**
@@ -709,6 +728,16 @@ Transaction_context_event(const char *buffer, unsigned int event_len,
   //buf is advanced in Binary_log_event constructor to point to
   //beginning of post-header
   const char* data_head = buffer;
+  const char* buffer_start = buffer - description_event->common_header_len;
+
+  server_uuid= NULL;
+  encoded_snapshot_version= NULL;
+
+  /* Avoid reading out of buffer */
+  if (static_cast<unsigned int>(description_event->common_header_len +
+                                TRANSACTION_CONTEXT_HEADER_LEN) > event_len)
+    return;
+
   uint8_t server_uuid_len= (static_cast<unsigned int>
                            (data_head[ENCODED_SERVER_UUID_LEN_OFFSET]));
 
@@ -733,6 +762,14 @@ Transaction_context_event(const char *buffer, unsigned int event_len,
   gtid_specified= (int8_t) data_head[ENCODED_GTID_SPECIFIED_OFFSET];
 
   const char *pos = data_head + TRANSACTION_CONTEXT_HEADER_LEN;
+  uint32_t remaining_buffer= 0;
+
+  /* Avoid reading out of buffer */
+  if (event_len < (TRANSACTION_CONTEXT_HEADER_LEN + server_uuid_len +
+                   encoded_snapshot_version_length +
+                   write_set_len + read_set_len))
+    goto err;
+
   server_uuid= bapi_strndup(pos, server_uuid_len);
   pos += server_uuid_len;
 
@@ -740,20 +777,24 @@ Transaction_context_event(const char *buffer, unsigned int event_len,
       reinterpret_cast<const unsigned char *>(bapi_strndup(pos,
                                                            encoded_snapshot_version_length));
   pos += encoded_snapshot_version_length;
+  remaining_buffer= event_len - (pos - buffer_start);
 
-  pos= read_data_set(pos, write_set_len, &write_set);
+  pos= read_data_set(pos, write_set_len, &write_set, remaining_buffer);
   if (pos == NULL)
     goto err;
-  pos= read_data_set(pos, read_set_len, &read_set);
+  remaining_buffer= event_len - (pos - buffer_start);
+  pos= read_data_set(pos, read_set_len, &read_set, remaining_buffer);
   if (pos == NULL)
     goto err;
 
   return;
 
 err:
-  bapi_free((void*)server_uuid);
+  if (server_uuid)
+    bapi_free((void*)server_uuid);
   server_uuid= NULL;
-  bapi_free((void*)encoded_snapshot_version);
+  if (encoded_snapshot_version)
+    bapi_free((void*)encoded_snapshot_version);
   encoded_snapshot_version= NULL;
   clear_set(&write_set);
   clear_set(&read_set);
@@ -763,27 +804,35 @@ Transaction_context_event(const char *buffer, unsigned int event_len,
 /**
   Function to read the data set for the ongoing transaction.
 
-  @param[in] pos     - postion to read from.
-  @param[in] set_len - length of the set object
-  @param[in] set     - pointer to the set object
+  @param[in] pos       - postion to read from.
+  @param[in] set_len   - length of the set object
+  @param[in] set       - pointer to the set object
+  @param[in] remaining - remaining available bytes on the buffer
 
   @retval - returns the pointer in the buffer to the end of the added hash
-            value.
+            value or NULL in case of an error.
 */
 const char* Transaction_context_event::read_data_set(const char *pos,
                                                      uint32_t set_len,
-                                                     std::list<const char*> *set)
+                                                     std::list<const char*> *set,
+                                                     uint32_t remaining)
 {
   uint16_t len= 0;
   for (uint32_t i= 0; i < set_len; i++)
   {
+    if (remaining < static_cast<uint32_t>(ENCODED_READ_WRITE_SET_ITEM_LEN))
+      return(NULL);
     memcpy(&len, pos, 2);
     len= le16toh(len);
+    remaining-= ENCODED_READ_WRITE_SET_ITEM_LEN;
     pos += ENCODED_READ_WRITE_SET_ITEM_LEN;
+    if (remaining < len)
+      return(NULL);
     const char *hash= bapi_strndup(pos, len);
     if (hash == NULL)
       return(NULL);
     pos += len;
+    remaining-= len;
     set->push_back(hash);
   }
   return(pos);
@@ -827,7 +876,8 @@ View_change_event::View_change_event(char* raw_view_id)
 : Binary_log_event(VIEW_CHANGE_EVENT),
   view_id(), seq_number(0), certification_info()
 {
-  memcpy(view_id, raw_view_id, strlen(raw_view_id));
+  strncpy(view_id, raw_view_id, sizeof(view_id)-1);
+  view_id[sizeof(view_id)-1]= 0;
 }
 
 View_change_event::
@@ -851,7 +901,20 @@ View_change_event(const char *buffer, unsigned int event_len,
 
   char *pos = (char*) data_header + VIEW_CHANGE_HEADER_LEN;
 
-  pos= read_data_map(pos, cert_info_len, &certification_info);
+  /* Avoid reading out of buffer */
+  if (event_len < (LOG_EVENT_HEADER_LEN + VIEW_CHANGE_HEADER_LEN))
+  {
+    pos= NULL;
+  }
+  else
+  {
+    unsigned int max_cert_info_len= event_len - (LOG_EVENT_HEADER_LEN +
+                                                 VIEW_CHANGE_HEADER_LEN);
+
+    pos= read_data_map(pos, cert_info_len, &certification_info,
+                       max_cert_info_len);
+  }
+
   if (pos == NULL)
     // Make is_valid() defined in the server return false.
     view_id[0]= '\0';
@@ -865,33 +928,49 @@ View_change_event(const char *buffer, unsigned int event_len,
   @param[in] pos     - start position.
   @param[in] map_len - the length of the certification info map.
   @param[in] map     - Certification info map
+  @param[in] consumable - the amount of bytes that can be read from buffer
 
   @return pointer to the snapshot version.
 */
 char* View_change_event::read_data_map(char *pos,
                                        uint32_t map_len,
-                                       std::map<std::string, std::string> *map)
+                                       std::map<std::string, std::string> *map,
+                                       uint32_t consumable)
 {
   BAPI_ASSERT(map->empty());
   uint16_t created= 0;
   uint32_t created_value= 0;
   for (uint32_t i= 0; i < map_len; i++)
   {
+    if (!consumable ||
+        consumable < static_cast<uint32_t>(ENCODED_CERT_INFO_KEY_SIZE_LEN))
+      return NULL;
     created=0;
     memcpy(&created, pos, sizeof(created));
     uint16_t key_len= (uint16_t) le16toh(created);
     pos+= ENCODED_CERT_INFO_KEY_SIZE_LEN;
+    consumable-= ENCODED_CERT_INFO_KEY_SIZE_LEN;
 
+    if (!consumable || consumable < key_len)
+      return NULL;
     std::string key(pos, key_len);
     pos+= key_len;
+    consumable-= key_len;
 
+    if (!consumable ||
+        consumable < static_cast<uint32_t>(ENCODED_CERT_INFO_VALUE_LEN))
+      return NULL;
     created_value=0;
     memcpy(&created_value, pos, sizeof(created_value));
     uint32_t value_len= le32toh(created_value);
     pos+= ENCODED_CERT_INFO_VALUE_LEN;
+    consumable-= ENCODED_CERT_INFO_VALUE_LEN;
 
+    if (!consumable || consumable < value_len)
+      return NULL;
     std::string value(pos, value_len);
     pos+= value_len;
+    consumable-= value_len;
 
     (*map)[key]= value;
   }
diff --git a/libbinlogevents/src/load_data_events.cpp b/libbinlogevents/src/load_data_events.cpp
index 84689756ec40..a4a995b3464a 100644
--- a/libbinlogevents/src/load_data_events.cpp
+++ b/libbinlogevents/src/load_data_events.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -259,9 +266,12 @@ int Load_event::copy_load_event(const char *buf, unsigned long event_len,
 
   fields= (char*)field_lens + num_fields;
   table_name= fields + field_block_len;
+  if (strlen(table_name) > NAME_LEN)
+    goto err;
+
   db= table_name + table_name_len + 1;
 
-  #ifndef DBUG_OFF
+  #ifndef NDEBUG
   /*
     This is specific to mysql test run on the server
     for the keyword "simulate_invalid_address"
diff --git a/libbinlogevents/src/rows_event.cpp b/libbinlogevents/src/rows_event.cpp
index 8849f8bdc311..6551137f0a05 100644
--- a/libbinlogevents/src/rows_event.cpp
+++ b/libbinlogevents/src/rows_event.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,15 +98,17 @@ Table_map_event::Table_map_event(const char *buf, unsigned int event_len,
   if (post_header_len == 6)
   {
     /* Master is of an intermediate source tree before 5.1.4. Id is 4 bytes */
-    memcpy(&m_table_id, post_start, 4);
-    m_table_id= le64toh(m_table_id);
+    uint64_t table_id = 0;
+    memcpy(&table_id, post_start, 4);
+    m_table_id= le64toh(table_id);
     post_start+= 4;
   }
   else
   {
     BAPI_ASSERT(post_header_len == TABLE_MAP_HEADER_LEN);
-    memcpy(&m_table_id, post_start, 6);
-    m_table_id= le64toh(m_table_id);
+    uint64_t table_id = 0;
+    memcpy(&table_id, post_start, 6);
+    m_table_id= le64toh(table_id);
     post_start+= TM_FLAGS_OFFSET;
   }
 
@@ -122,6 +131,15 @@ Table_map_event::Table_map_event(const char *buf, unsigned int event_len,
   unsigned char *ptr_after_colcnt= (unsigned char*) ptr_colcnt;
   m_colcnt= get_field_length(&ptr_after_colcnt);
 
+  bytes_read= (unsigned int) ((ptr_after_colcnt + common_header_len) -
+                              (unsigned char *)buf);
+  /* Avoid reading out of buffer */
+  if (event_len <= bytes_read || event_len - bytes_read < m_colcnt)
+  {
+    m_coltype= NULL;
+    return;
+  }
+
   m_coltype= static_cast<unsigned char*>(bapi_malloc(m_colcnt, 16));
   m_dbnam= std::string((const char*)ptr_dblen  + 1, m_dblen);
   m_tblnam= std::string((const char*)ptr_tbllen  + 1, m_tbllen + 1);
@@ -154,7 +172,8 @@ Table_map_event::~Table_map_event()
     m_null_bits= NULL;
     bapi_free(m_field_metadata);
     m_field_metadata= NULL;
-    bapi_free(m_coltype);
+    if (m_coltype != NULL)
+      bapi_free(m_coltype);
     m_coltype= NULL;
 }
 
@@ -183,14 +202,16 @@ Rows_event::Rows_event(const char *buf, unsigned int event_len,
   if (post_header_len == 6)
   {
     /* Master is of an intermediate source tree before 5.1.4. Id is 4 bytes */
-    memcpy(&m_table_id, post_start, 4);
-    m_table_id= le64toh(m_table_id);
+    uint64_t table_id = 0;
+    memcpy(&table_id, post_start, 4);
+    m_table_id= le64toh(table_id);
     post_start+= 4;
   }
   else
   {
-    memcpy(&m_table_id, post_start, 6);
-    m_table_id= le64toh(m_table_id);
+    uint64_t table_id = 0;
+    memcpy(&table_id, post_start, 6);
+    m_table_id= le64toh(table_id);
     post_start+= ROWS_FLAGS_OFFSET;
   }
 
@@ -207,7 +228,10 @@ Rows_event::Rows_event(const char *buf, unsigned int event_len,
     */
     memcpy(&var_header_len, post_start, sizeof(var_header_len));
     var_header_len= le16toh(var_header_len);
-    if (var_header_len < 2)
+    /* Check length and also avoid out of buffer read */
+    if (var_header_len < 2 ||
+        event_len < static_cast<unsigned int>(var_header_len +
+                                              (post_start - buf)))
       return;
 
     var_header_len-= 2;
@@ -254,6 +278,11 @@ Rows_event::Rows_event(const char *buf, unsigned int event_len,
   unsigned char *ptr_after_width= (unsigned char*) ptr_width;
   m_width = get_field_length(&ptr_after_width);
   n_bits_len= (m_width + 7) / 8;
+  /* Avoid reading out of buffer */
+  if (ptr_after_width + n_bits_len > (const unsigned char *)(buf +
+                                                             event_len -
+                                                             post_header_len))
+    return;
   columns_before_image.reserve((m_width + 7) / 8);
   unsigned char *ch;
   ch= ptr_after_width;
@@ -282,11 +311,20 @@ Rows_event::Rows_event(const char *buf, unsigned int event_len,
 
   const unsigned char* ptr_rows_data= (unsigned char*) ptr_after_width;
 
-  size_t const data_size= event_len -
-                          (ptr_rows_data + common_header_len -
-                          (const unsigned char *) buf);
+  size_t const read_size= ptr_rows_data + common_header_len -
+                          (const unsigned char *) buf;
+  if (read_size > event_len)
+    return;
+  size_t const data_size= event_len - read_size;
 
-  row.assign(ptr_rows_data, ptr_rows_data + data_size + 1);
+  try
+  {
+    row.assign(ptr_rows_data, ptr_rows_data + data_size + 1);
+  }
+  catch (const std::bad_alloc &e)
+  {
+    row.clear();
+  }
   BAPI_ASSERT(row.size() == data_size + 1);
 }
 
@@ -314,12 +352,18 @@ Rows_query_event(const char *buf, unsigned int event_len,
   uint8_t const post_header_len=
     descr_event->post_header_len[ROWS_QUERY_LOG_EVENT-1];
 
+  m_rows_query= NULL;
+
   /*
    m_rows_query length is stored using only one byte, but that length is
    ignored and the complete query is read.
   */
-  int offset= common_header_len + post_header_len + 1;
-  int len= event_len - offset;
+  unsigned int offset= common_header_len + post_header_len + 1;
+  /* Avoid reading out of buffer */
+  if (offset > event_len)
+    return;
+
+  unsigned int len= event_len - offset;
   if (!(m_rows_query= static_cast<char*>(bapi_malloc(len + 1, 16))))
     return;
 
diff --git a/libbinlogevents/src/statement_events.cpp b/libbinlogevents/src/statement_events.cpp
index 62831df4cf5e..281d021aa77f 100644
--- a/libbinlogevents/src/statement_events.cpp
+++ b/libbinlogevents/src/statement_events.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -310,7 +317,7 @@ break;
     case Q_UPDATED_DB_NAMES:
     {
       unsigned char i= 0;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       bool is_corruption_injected= false;
 #endif
 
@@ -331,7 +338,7 @@ break;
 
       for (i= 0; i < mts_accessed_dbs && pos < start + status_vars_len; i++)
       {
-        #ifndef DBUG_OFF
+        #ifndef NDEBUG
         /*
           This is specific to mysql test run on the server
           for the keyword "query_log_event_mts_corrupt_db_names"
@@ -352,7 +359,7 @@ break;
         pos+= 1 + strlen((const char*) pos);
       }
       if (i != mts_accessed_dbs
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           || is_corruption_injected
 #endif
           )
@@ -391,6 +398,16 @@ break;
   db= (const char* )end;
   q_len= data_len - db_len -1;
   query= (const char *)(end + db_len + 1);
+
+  unsigned int max_length;
+  max_length= (event_len - (((end + db_len + 1) - start) +
+                            (post_header_len + common_header_len)));
+  if (q_len != max_length)
+  {
+    q_len= 0;
+    query= NULL;
+  }
+
   return;
 }
 
@@ -411,6 +428,12 @@ int Query_event::fill_data_buf(Log_event_header::Byte* buf,
   if (buf_len < catalog_len + 1 + time_zone_len +
                 1 + user_len+ 1 + host_len+ 1 + data_len )
     return 0;
+
+  if (data_len && (data_len < db_len ||
+                   data_len < q_len ||
+                   data_len != (db_len + q_len + 1)))
+    return 0;
+
   unsigned char* start= buf;
   /*
     Note: catalog_len is one less than "catalog.length()"
@@ -459,6 +482,13 @@ User_var_event(const char* buf, unsigned int event_len,
 
   memcpy(&name_len, buf, 4);
   name_len= le32toh(name_len);
+  /* Avoid reading out of buffer */
+  if ((buf - buf_start) + UV_NAME_LEN_SIZE + name_len > event_len)
+  {
+    error= true;
+    goto err;
+  }
+
   name= (char *) buf + UV_NAME_LEN_SIZE;
   /*
     We don't know yet is_null value, so we must assume that name_len
@@ -526,7 +556,12 @@ User_var_event(const char* buf, unsigned int event_len,
       we keep the flags set to UNDEF_F.
     */
   size_t bytes_read= ((val + val_len) - start);
-#ifndef DBUG_OFF
+  if (bytes_read > event_len)
+  {
+    error= true;
+    goto err;
+  }
+#ifndef NDEBUG
   bool old_pre_checksum_fd= description_event->is_version_before_checksum();
   bool checksum_verify= (old_pre_checksum_fd ||
                          (description_event->footer()->checksum_alg ==
diff --git a/libbinlogevents/src/uuid.cpp b/libbinlogevents/src/uuid.cpp
index 87ede19ca3e1..3e20800771c6 100644
--- a/libbinlogevents/src/uuid.cpp
+++ b/libbinlogevents/src/uuid.cpp
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libbinlogstandalone/CMakeLists.txt b/libbinlogstandalone/CMakeLists.txt
index 3023fc807692..9c7915dbaf99 100644
--- a/libbinlogstandalone/CMakeLists.txt
+++ b/libbinlogstandalone/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -27,18 +34,11 @@ ADD_DEFINITIONS(-DSTANDALONE_BINLOG)
 #  INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
 #ENDIF()
 
-FIND_PACKAGE(ZLIB REQUIRED)
-
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/include
                     ${CMAKE_CURRENT_BINARY_DIR}/../libbinlogevents/include
                     ${CMAKE_SOURCE_DIR}/libbinlogevents/export
-                    ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/export
-                    # ZLIB_INCLUDE_DIR points to ${CMAKE_SOURCE_DIR}/zlib,
-                    # when compiled with MySQL server version (< 5.7).
-                    # It is NULL otherwise.
-                    ${ZLIB_INCLUDE_DIR})
+                    ${CMAKE_CURRENT_BINARY_DIR}/libbinlogevents/export)
 
 ADD_SUBDIRECTORY(src)
 
diff --git a/libbinlogstandalone/src/CMakeLists.txt b/libbinlogstandalone/src/CMakeLists.txt
index 18154e00915c..24c2db4686a8 100644
--- a/libbinlogstandalone/src/CMakeLists.txt
+++ b/libbinlogstandalone/src/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -27,7 +34,7 @@ SET (REPLICATION_SOURCES
 # Configure for building static library
 ADD_LIBRARY(binlogstandalone_static STATIC ${REPLICATION_SOURCES})
 
-TARGET_LINK_LIBRARIES(binlogstandalone_static ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES(binlogstandalone_static ${ZLIB_LIBRARY})
 
 SET_TARGET_PROPERTIES(binlogstandalone_static PROPERTIES
                       OUTPUT_NAME "binlogstandalone")
@@ -38,7 +45,7 @@ SET_TARGET_PROPERTIES(binlogstandalone_static PROPERTIES
 IF (NOT DISABLE_SHARED)
   # Configure for building shared library
   ADD_LIBRARY(binlogstandalone_shared SHARED ${REPLICATION_SOURCES})
-  TARGET_LINK_LIBRARIES(binlogstandalone_shared ${ZLIB_LIBRARIES})
+  TARGET_LINK_LIBRARIES(binlogstandalone_shared ${ZLIB_LIBRARY})
   SET_TARGET_PROPERTIES(binlogstandalone_shared
     PROPERTIES OUTPUT_NAME "binlogstandalone")
   SET_TARGET_PROPERTIES(binlogstandalone_shared
diff --git a/libevent/CMakeLists.txt b/libevent/CMakeLists.txt
deleted file mode 100644
index 03f69f238371..000000000000
--- a/libevent/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-# Common defines and includes
-
-ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR}/compat/sys
-  ${LIBEVENT_INCLUDE_DIR})
-
-INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
-IF ( WIN32 )
-  INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR}/WIN32-Code
-    ${LIBEVENT_INCLUDE_DIR}/compat)
-ENDIF()
-
-SET(CMAKE_C_FLAGS 
-  "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS} -I${LIBEVENT_INCLUDE_DIR}")
-
-SET(LIBEVENT_CORE_SOURCES
-  event.h
-  event-internal.h
-  evutil.h
-  log.h
-  event.c
-  buffer.c
-  evbuffer.c
-  log.c
-  signal.c
-  evutil.c)
-
-SET(LIBEVENT_EXTRA_SOURCES
-  event_tagging.c
-  evhttp.h
-  http-internal.h
-  evdns.h
-  evrpc.c
-  evrpc.h
-  evrpc-internal.h
-  strlcpy.c
-  strlcpy-internal.h)
-
-IF ( NOT WIN32 )
-  SET(LIBEVENT_OS_SPECIFIC_SOURCES select.c http.c)
-ELSE()
-  SET(LIBEVENT_OS_SPECIFIC_SOURCES WIN32-Code/win32.c)
-ENDIF()
-
-
-IF(HAVE_POLL_H)
-  SET(LIBEVENT_POLL_SOURCES poll.c)
-ENDIF()
-
-IF(HAVE_SYS_EPOLL_H)
-  SET(LIBEVENT_EPOLL_SOURCES epoll.c epoll_sub.c)
-ENDIF()
-
-IF(HAVE_SYS_DEVPOLL_H)
-  SET(LIBEVENT_DEVPOLL_SOURCES devpoll.c)
-ENDIF()
-
-IF(HAVE_EVENT_PORTS)
-  SET(LIBEVENT_EVPORT_SOURCES evport.c)
-ENDIF()
-
-IF(HAVE_WORKING_KQUEUE)
-  SET(LIBEVENT_KQUEUE_SOURCES kqueue.c)
-ENDIF()
-
-SET(LIBEVENT_ALL_SRC ${LIBEVENT_CORE_SOURCES} ${LIBEVENT_EXTRA_SOURCES}
-  ${LIBEVENT_OS_SPECIFIC_SOURCES} ${LIBEVENT_POLL_SOURCES}
-  ${LIBEVENT_EPOLL_SOURCES} ${LIBEVENT_DEVPOLL_SOURCES}
-  ${LIBEVENT_EVPORT_SOURCES} ${LIBEVENT_KQUEUE_SOURCES})
-
-IF(MSVC)
-  # The macro identifier is defined twice. The compiler uses the second macro definition.
-  ADD_COMPILE_FLAGS(${LIBEVENT_ALL_SRC} COMPILE_FLAGS "/wd4005 /wd4267 /wd4244")
-ENDIF()
-
-ADD_LIBRARY(event_share SHARED ${LIBEVENT_ALL_SRC})
-ADD_LIBRARY(event STATIC ${LIBEVENT_ALL_SRC})
diff --git a/libevent/ChangeLog b/libevent/ChangeLog
deleted file mode 100644
index 2435c1f15d84..000000000000
--- a/libevent/ChangeLog
+++ /dev/null
@@ -1,190 +0,0 @@
-Changes in 1.4.12-stable:
- o Try to contain degree of failure when running on a win32 version so heavily firewalled that we can't fake a socketpair.
- o Fix an obscure timing-dependent, allocator-dependent crash in the evdns code.
- o Use __VA_ARGS__ syntax for varargs macros in event_rpcgen when compiler is not GCC.
- o Activate fd events in a pseudorandom order with O(N) backends, so that we don't systematically favor low fds (select) or earlier-added fds (poll, win32).
- o Fix another pair of fencepost bugs in epoll.c.  [Patch from Adam Langley.]
- o Do not break evdns connections to nameservers when our IP changes.
- o Set truncated flag correctly in evdns server replies.
- o Disable strict aliasing with GCC: our code is not compliant with it.
-
-Changes in 1.4.11-stable:
- o Fix a bug when removing a timeout from the heap. [Patch from Marko Kreen]
- o Remove the limit on size of HTTP headers by removing static buffers.
- o Fix a nasty dangling pointer bug in epoll.c that could occur after epoll_recalc(). [Patch from Kevin Springborn]
- o Distribute Win32-Code/event-config.h, not ./event-config.h
-
-Changes in 1.4.10-stable:
- o clean up buffered http connection data on reset; reported by Brian O'Kelley
- o bug fix and potential race condition in signal handling; from Alexander Drozdov
- o rename the Solaris event ports backend to evport
- o support compilation on Haiku
- o fix signal processing when a signal callback delivers a signal; from Alexander Drozdov
- o const-ify some arguments to evdns functions.
- o off-by-one error in epoll_recalc; reported by Victor Goya
- o include Doxyfile in tar ball; from Jeff Garzik
- o correctly parse queries with encoded \r, \n or + characters
-
-Changes in 1.4.9-stable:
- o event_add would not return error for some backends; from Dean McNamee
- o Clear the timer cache on entering the event loop; reported by Victor Chang
- o Only bind the socket on connect when a local address has been provided; reported by Alejo Sanchez
- o Allow setting of local port for evhttp connections to support millions of connections from a single system; from Richard Jones.
- o Clear the timer cache when leaving the event loop; reported by Robin Haberkorn
- o Fix a typo in setting the global event base; reported by lance.
- o Fix a memory leak when reading multi-line headers
- o Fix a memory leak by not running explicit close detection for server connections
-
-Changes in 1.4.8-stable:
- o Match the query in DNS replies to the query in the request; from Vsevolod Stakhov.
- o Fix a merge problem in which name_from_addr returned pointers to the stack; found by Jiang Hong.
- o Do not remove Accept-Encoding header
-	
-Changes in 1.4.7-stable:
- o Fix a bug where headers arriving in multiple packets were not parsed; fix from Jiang Hong; test by me.
-	
-Changes in 1.4.6-stable:
- o evutil.h now includes <stdarg.h> directly
- o switch all uses of [v]snprintf over to evutil
- o Correct handling of trailing headers in chunked replies; from Scott Lamb.
- o Support multi-line HTTP headers; based on a patch from Moshe Litvin
- o Reject negative Content-Length headers; anonymous bug report
- o Detect CLOCK_MONOTONIC at runtime for evdns; anonymous bug report	
- o Fix a bug where deleting signals with the kqueue backend would cause subsequent adds to fail
- o Support multiple events listening on the same signal; make signals regular events that go on the same event queue; problem report by Alexander Drozdov.
- o Deal with evbuffer_read() returning -1 on EINTR|EAGAIN; from Adam Langley.
- o Fix a bug in which the DNS server would incorrectly set the type of a cname reply to a.
- o Fix a bug where setting the timeout on a bufferevent would take not effect if the event was already pending.
- o Fix a memory leak when using signals for some event bases; reported by Alexander Drozdov.
- o Add libevent.vcproj file to distribution to help with Windows build.
- o Fix a problem with epoll() and reinit; problem report by Alexander Drozdov.	
- o Fix off-by-one errors in devpoll; from Ian Bell
- o Make event_add not change any state if it fails; reported by Ian Bell.
- o Do not warn on accept when errno is either EAGAIN or EINTR
-
-Changes in 1.4.5-stable:
- o Fix connection keep-alive behavior for HTTP/1.0
- o Fix use of freed memory in event_reinit; pointed out by Peter Postma
- o Constify struct timeval * where possible; pointed out by Forest Wilkinson
- o allow min_heap_erase to be called on removed members; from liusifan.
- o Rename INPUT and OUTPUT to EVRPC_INPUT and EVRPC_OUTPUT.  Retain INPUT/OUTPUT aliases on on-win32 platforms for backwards compatibility.
- o Do not use SO_REUSEADDR when connecting
- o Fix Windows build
- o Fix a bug in event_rpcgen when generated fixed-sized entries
-
-Changes in 1.4.4-stable:
- o Correct the documentation on buffer printf functions.
- o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select.
- o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c.  This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed.
- o Fix a potential stack corruption bug in tagging on 64-bit CPUs.
- o expose bufferevent_setwatermark via header files and fix high watermark on read
- o fix a bug in bufferevent read water marks and add a test for them
- o introduce bufferevent_setcb and bufferevent_setfd to allow better manipulation of bufferevents
- o use libevent's internal timercmp on all platforms, to avoid bugs on old platforms where timercmp(a,b,<=) is buggy.
- o reduce system calls for getting current time by caching it.
- o fix evhttp_bind_socket() so that multiple sockets can be bound by the same http server.
- o Build test directory correctly with CPPFLAGS set.
- o Fix build under Visual C++ 2005.
- o Expose evhttp_accept_socket() API.
- o Merge windows gettimeofday() replacement into a new evutil_gettimeofday() function.
- o Fix autoconf script behavior on IRIX.
- o Make sure winsock2.h include always comes before windows.h include.
-
-Changes in 1.4.3-stable:
- o include Content-Length in reply for HTTP/1.0 requests with keep-alive
- o Patch from Tani Hosokawa: make some functions in http.c threadsafe.
- o Do not free the kqop file descriptor in other processes, also allow it to be 0; from Andrei Nigmatulin
- o make event_rpcgen.py generate code include event-config.h; reported by Sam Banks.
- o make event methods static so that they are not exported; from Andrei Nigmatulin
- o make RPC replies use application/octet-stream as mime type
- o do not delete uninitialized timeout event in evdns
-
-Changes in 1.4.2-rc:
- o remove pending timeouts on event_base_free()
- o also check EAGAIN for Solaris' event ports; from W.C.A. Wijngaards
- o devpoll and evport need reinit; tested by W.C.A Wijngaards
- o event_base_get_method; from Springande Ulv
- o Send CRLF after each chunk in HTTP output, for compliance with RFC2626.  Patch from "propanbutan".  Fixes bug 1894184.
- o Add a int64_t parsing function, with unit tests, so we can apply Scott Lamb's fix to allow large HTTP values.
- o Use a 64-bit field to hold HTTP content-lengths.  Patch from Scott Lamb.
- o Allow regression code to build even without Python installed
- o remove NDEBUG ifdefs from evdns.c
- o update documentation of event_loop and event_base_loop; from Tani Hosokawa.
- o detect integer types properly on platforms without stdint.h
- o Remove "AM_MAINTAINER_MODE" declaration in configure.in: now makefiles and configure should get re-generated automatically when Makefile.am or configure.in chanes.
- o do not insert event into list when evsel->add fails
-
-Changes in 1.4.1-beta:
- o free minheap on event_base_free(); from Christopher Layne
- o debug cleanups in signal.c; from Christopher Layne
- o provide event_base_new() that does not set the current_base global
- o bufferevent_write now uses a const source argument; report from Charles Kerr
- o better documentation for event_base_loopexit; from Scott Lamb.
- o Make kqueue have the same behavior as other backends when a signal is caught between event_add() and event_loop().  Previously, it would catch and ignore such signals.
- o Make kqueue restore signal handlers correctly when event_del() is called.
- o provide event_reinit() to reintialize an event_base after fork
- o small improvements to evhttp documentation
- o always generate Date and Content-Length headers for HTTP/1.1 replies
- o set the correct event base for HTTP close events
- o New function, event_{base_}loopbreak.  Like event_loopexit, it makes an event loop stop executing and return.  Unlike event_loopexit, it keeps subsequent pending events from getting executed.  Patch from Scott Lamb
- o Removed obsoleted recalc code
- o pull setters/getters out of RPC structures into a base class to which we just need to store a pointer; this reduces the memory footprint of these structures.
- o fix a bug with event_rpcgen for integers
- o move EV_PERSIST handling out of the event backends
- o support for 32-bit tag numbers in rpc structures; this is wire compatible, but changes the API slightly.
- o prefix {encode,decode}_tag functions with evtag to avoid collisions
- o Correctly handle DNS replies with no answers set (Fixes bug 1846282)
- o The configure script now takes an --enable-gcc-warnigns option that turns on many optional gcc warnings.  (Nick has been building with these for a while, but they might be useful to other developers.)
- o When building with GCC, use the "format" attribute to verify type correctness of calls to printf-like functions.
- o removed linger from http server socket; reported by Ilya Martynov
- o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
- o demote most http warnings to debug messages
- o Fix Solaris compilation; from Magne Mahre
- o Add a "Date" header to HTTP responses, as required by HTTP 1.1.
- o Support specifying the local address of an evhttp_connection using set_local_address
- o Fix a memory leak in which failed HTTP connections would not free the request object
- o Make adding of array members in event_rpcgen more efficient, but doubling memory allocation
- o Fix a memory leak in the DNS server
- o Fix compilation when DNS_USE_OPENSSL_FOR_ID is enabled
- o Fix buffer size and string generation in evdns_resolve_reverse_ipv6().
- o Respond to nonstandard DNS queries with "NOTIMPL" rather than by ignoring them.
- o In DNS responses, the CD flag should be preserved, not the TC flag.
- o Fix http.c to compile properly with USE_DEBUG; from Christopher Layne
- o Handle NULL timeouts correctly on Solaris; from Trond Norbye
- o Recalculate pending events properly when reallocating event array on Solaris; from Trond Norbye
- o Add Doxygen documentation to header files; from Mark Heily
- o Add a evdns_set_transaction_id_fn() function to override the default
-   transaction ID generation code.
- o Add an evutil module (with header evutil.h) to implement our standard cross-platform hacks, on the theory that somebody else would like to use them too.
- o Fix signals implementation on windows.
- o Fix http module on windows to close sockets properly.
- o Make autogen.sh script run correctly on systems where /bin/sh isn't bash. (Patch from Trond Norbye, rewritten by Hagne Mahre and then Hannah Schroeter.)
- o Skip calling gettime() in timeout_process if we are not in fact waiting for any events. (Patch from Trond Norbye)
- o Make test subdirectory compile under mingw.
- o Fix win32 buffer.c behavior so that it is correct for sockets (which do not like ReadFile and WriteFile).
- o Make the test.sh script run unit tests for the evpoll method.
- o Make the entire evdns.h header enclosed in "extern C" as appropriate.
- o Fix implementation of strsep on platforms that lack it
- o Fix implementation of getaddrinfo on platforms that lack it; mainly, this will make Windows http.c work better.  Original patch by Lubomir Marinov.
- o Fix evport implementation: port_disassociate called on unassociated events resulting in bogus errors; more efficient memory management; from Trond Norbye and Prakash Sangappa
- o support for hooks on rpc input and output; can be used to implement rpc independent processing such as compression or authentication.
- o use a min heap instead of a red-black tree for timeouts; as a result finding the min is a O(1) operation now; from Maxim Yegorushkin
- o associate an event base with an rpc pool
- o added two additional libraries: libevent_core and libevent_extra in addition to the regular libevent.  libevent_core contains only the event core whereas libevent_extra contains dns, http and rpc support
- o Begin using libtool's library versioning support correctly.  If we don't mess up, this will more or less guarantee binaries linked against old versions of libevent continue working when we make changes to libevent that do not break backward compatibility.
- o Fix evhttp.h compilation when TAILQ_ENTRY is not defined.
- o Small code cleanups in epoll_dispatch().
- o Increase the maximum number of addresses read from a packet in evdns to 32.
- o Remove support for the rtsig method: it hasn't compiled for a while, and nobody seems to miss it very much.  Let us know if there's a good reason to put it back in.
- o Rename the "class" field in evdns_server_request to dns_question_class, so that it won't break compilation under C++.  Use a macro so that old code won't break.  Mark the macro as deprecated.
- o Fix DNS unit tests so that having a DNS server with broken IPv6 support is no longer cause for aborting the unit tests.
- o Make event_base_free() succeed even if there are pending non-internal events on a base.  This may still leak memory and fds, but at least it no longer crashes.
- o Post-process the config.h file into a new, installed event-config.h file that we can install, and whose macros will be safe to include in header files.
- o Remove the long-deprecated acconfig.h file.
- o Do not require #include <sys/types.h> before #include <event.h>.
- o Add new evutil_timer* functions to wrap (or replace) the regular timeval manipulation functions.
- o Fix many build issues when using the Microsoft C compiler.
- o Remove a bash-ism in autogen.sh
- o When calling event_del on a signal, restore the signal handler's previous value rather than setting it to SIG_DFL. Patch from Christopher Layne.
- o Make the logic for active events work better with internal events; patch from Christopher Layne.
- o We do not need to specially remove a timeout before calling event_del; patch from Christopher Layne.
diff --git a/libevent/Doxyfile b/libevent/Doxyfile
deleted file mode 100644
index 77f6de89b46a..000000000000
--- a/libevent/Doxyfile
+++ /dev/null
@@ -1,230 +0,0 @@
-# Doxyfile 1.5.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = libevent
-
-# Place all output under 'doxygen/'
-
-OUTPUT_DIRECTORY        = doxygen/
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = event.h evdns.h evhttp.h evrpc.h
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = YES
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = TAILQ_ENTRY RB_ENTRY _EVENT_DEFINED_TQENTRY
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
diff --git a/libevent/Makefile.am b/libevent/Makefile.am
deleted file mode 100644
index 8d9d75203738..000000000000
--- a/libevent/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-# This is the point release for libevent.  It shouldn't include any
-# a/b/c/d/e notations.
-RELEASE = 1.4
-
-# This is the version info for the libevent binary API.  It has three
-# numbers:
-#   Current  -- the number of the binary API that we're implementing
-#   Revision -- which iteration of the implementation of the binary
-#               API are we supplying?
-#   Age      -- How many previous binary API versions do we also
-#               support?
-#
-# If we release a new version that does not change the binary API,
-# increment Revision.
-#
-# If we release a new version that changes the binary API, but does
-# not break programs compiled against the old binary API, increment
-# Current and Age.  Set Revision to 0, since this is the first
-# implementation of the new API.
-#
-# Otherwise, we're changing the binary API and breaking bakward
-# compatibility with old binaries.  Increment Current.  Set Age to 0,
-# since we're backward compatible with no previous APIs.  Set Revision
-# to 0 too.
-
-# History:
-#  Libevent 1.4.1 was 2:0:0
-#  Libevent 1.4.2 should be 3:0:0
-#  Libevent 1.4.5 is 3:0:1 (we forgot to increment in the past)
-VERSION_INFO = 3:3:1
-
-bin_SCRIPTS = event_rpcgen.py
-
-EXTRA_DIST = autogen.sh event.h event-internal.h log.h evsignal.h evdns.3 \
-	evrpc.h evrpc-internal.h min_heap.h \
-	event.3 \
-	Doxyfile \
-	kqueue.c epoll_sub.c epoll.c select.c poll.c signal.c \
-	evport.c devpoll.c event_rpcgen.py \
-	sample/Makefile.am sample/Makefile.in sample/event-test.c \
-	sample/signal-test.c sample/time-test.c \
-	test/Makefile.am test/Makefile.in test/bench.c test/regress.c \
-	test/test-eof.c test/test-weof.c test/test-time.c \
-	test/test-init.c test/test.sh \
-	compat/sys/queue.h compat/sys/_time.h \
-	WIN32-Code/config.h \
-	WIN32-Code/event-config.h \
-	WIN32-Code/win32.c \
-	WIN32-Code/tree.h \
-	WIN32-Prj/event_test/event_test.dsp \
-	WIN32-Prj/event_test/test.txt WIN32-Prj/libevent.dsp \
-	WIN32-Prj/libevent.dsw WIN32-Prj/signal_test/signal_test.dsp \
-	WIN32-Prj/time_test/time_test.dsp WIN32-Prj/regress/regress.vcproj \
-	WIN32-Prj/libevent.sln WIN32-Prj/libevent.vcproj
-
-lib_LTLIBRARIES = libevent.la libevent_core.la libevent_extra.la
-
-if BUILD_WIN32
-
-SUBDIRS = . sample
-SYS_LIBS = -lws2_32
-SYS_SRC = WIN32-Code/win32.c
-SYS_INCLUDES = -IWIN32-Code
-
-else
-
-SUBDIRS = . sample test
-SYS_LIBS =
-SYS_SRC =
-SYS_INCLUDES =
-
-endif
-
-BUILT_SOURCES = event-config.h
-
-event-config.h: config.h
-	echo '/* event-config.h' > $@
-	echo ' * Generated by autoconf; post-processed by libevent.' >> $@
-	echo ' * Do not edit this file.' >> $@
-	echo ' * Do not rely on macros in this file existing in later versions.'>> $@
-	echo ' */' >> $@
-	echo '#ifndef _EVENT_CONFIG_H_' >> $@
-	echo '#define _EVENT_CONFIG_H_' >> $@
-
-	sed -e 's/#define /#define _EVENT_/' \
-	    -e 's/#undef /#undef _EVENT_/' \
-	    -e 's/#ifndef /#ifndef _EVENT_/' < config.h >> $@
-	echo "#endif" >> $@
-
-CORE_SRC = event.c buffer.c evbuffer.c log.c evutil.c $(SYS_SRC)
-EXTRA_SRC = event_tagging.c http.c evhttp.h http-internal.h evdns.c \
-	evdns.h evrpc.c evrpc.h evrpc-internal.h \
-	strlcpy.c strlcpy-internal.h strlcpy-internal.h
-
-libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
-libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_la_LDFLAGS = -release $(RELEASE) -version-info $(VERSION_INFO)
-
-libevent_core_la_SOURCES = $(CORE_SRC)
-libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_core_la_LDFLAGS = -release $(RELEASE) -version-info $(VERSION_INFO)
-
-libevent_extra_la_SOURCES = $(EXTRA_SRC)
-libevent_extra_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_extra_la_LDFLAGS = -release $(RELEASE) -version-info $(VERSION_INFO)
-
-include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
-
-nodist_include_HEADERS = event-config.h
-
-INCLUDES = -I$(srcdir)/compat $(SYS_INCLUDES)
-
-man_MANS = event.3 evdns.3
-
-verify: libevent.la
-	cd test && make verify
-
-doxygen: FORCE
-	doxygen $(srcdir)/Doxyfile
-FORCE:
-
-DISTCLEANFILES = *~ event-config.h
diff --git a/libevent/README b/libevent/README
deleted file mode 100644
index b0650392ed4d..000000000000
--- a/libevent/README
+++ /dev/null
@@ -1,57 +0,0 @@
-To build libevent, type
-
-$ ./configure && make
-
-     (If you got libevent from the subversion repository, you will
-      first need to run the included "autogen.sh" script in order to
-      generate the configure script.)
-
-Install as root via
-
-# make install
-
-You can run the regression tests by
-
-$ make verify
-
-Before, reporting any problems, please run the regression tests.
-
-To enable the low-level tracing build the library as:
-
-CFLAGS=-DUSE_DEBUG ./configure [...]
-
-Acknowledgements:
------------------
-
-The following people have helped with suggestions, ideas, code or
-fixing bugs:
-
-  Alejo
-  Weston Andros Adamson
-  William Ahern
-  Stas Bekman
-  Andrew Danforth
-  Mike Davis
-  Shie Erlich
-  Alexander von Gernler
-  Artur Grabowski
-  Aaron Hopkins
-  Claudio Jeker
-  Scott Lamb
-  Adam Langley
-  Philip Lewis
-  David Libenzi
-  Nick Mathewson
-  Andrey Matveev
-  Richard Nyberg
-  Jon Oberheide
-  Phil Oleson
-  Dave Pacheco
-  Tassilo von Parseval
-  Pierre Phaneuf
-  Jon Poland
-  Bert JW Regeer
-  Dug Song
-  Taral
-
-If I have forgotten your name, please contact me.
diff --git a/libevent/WIN32-Code/event-config.h b/libevent/WIN32-Code/event-config.h
deleted file mode 100644
index 3059080274b5..000000000000
--- a/libevent/WIN32-Code/event-config.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* event-config.h
- * Generated by autoconf; post-processed by libevent.
- * Do not edit this file.
- * Do not rely on macros in this file existing in later versions.
- */
-#ifndef _EVENT_CONFIG_H_
-#define _EVENT_CONFIG_H_
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if clock_gettime is available in libc */
-/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */
-
-/* Define is no secure id variant is available */
-#define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef _EVENT_HAVE_CLOCK_GETTIME */
-
-/* Define if /dev/poll is available */
-/* #undef _EVENT_HAVE_DEVPOLL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef _EVENT_HAVE_DLFCN_H */
-
-/* Define if your system supports the epoll system calls */
-/* #undef _EVENT_HAVE_EPOLL */
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef _EVENT_HAVE_EPOLL_CTL */
-
-/* Define if your system supports event ports */
-/* #undef _EVENT_HAVE_EVENT_PORTS */
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef _EVENT_HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define _EVENT_HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-/* #undef _EVENT_HAVE_GETADDRINFO */
-
-/* Define to 1 if you have the `getnameinfo' function. */
-/* #undef _EVENT_HAVE_GETNAMEINFO */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-/* #define _EVENT_HAVE_GETTIMEOFDAY 1 */
-
-/* Define to 1 if you have the `inet_ntop' function. */
-/* #undef _EVENT_HAVE_INET_NTOP */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef _EVENT_HAVE_INTTYPES_H 1 */
-
-/* Define to 1 if you have the `kqueue' function. */
-/* #undef _EVENT_HAVE_KQUEUE */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef _EVENT_HAVE_LIBNSL */
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-/* #undef _EVENT_HAVE_LIBRESOLV */
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef _EVENT_HAVE_LIBRT */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef _EVENT_HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define _EVENT_HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <netinet/in6.h> header file. */
-/* #undef _EVENT_HAVE_NETINET_IN6_H */
-
-/* Define to 1 if you have the `poll' function. */
-/* #undef _EVENT_HAVE_POLL */
-
-/* Define to 1 if you have the <poll.h> header file. */
-/* #undef _EVENT_HAVE_POLL_H */
-
-/* Define to 1 if you have the `port_create' function. */
-/* #undef _EVENT_HAVE_PORT_CREATE */
-
-/* Define to 1 if you have the <port.h> header file. */
-/* #undef _EVENT_HAVE_PORT_H */
-
-/* Define to 1 if you have the `select' function. */
-/* #undef _EVENT_HAVE_SELECT */
-
-/* Define if F_SETFD is defined in <fcntl.h> */
-/* #undef _EVENT_HAVE_SETFD */
-
-/* Define to 1 if you have the `sigaction' function. */
-/* #undef _EVENT_HAVE_SIGACTION */
-
-/* Define to 1 if you have the `signal' function. */
-#define _EVENT_HAVE_SIGNAL 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define _EVENT_HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define _EVENT_HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #define _EVENT_HAVE_STDINT_H 1 */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define _EVENT_HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define _EVENT_HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define _EVENT_HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-/* #undef _EVENT_HAVE_STRLCPY */
-
-/* Define to 1 if you have the `strsep' function. */
-/* #undef _EVENT_HAVE_STRSEP */
-
-/* Define to 1 if you have the `strtok_r' function. */
-/* #undef _EVENT_HAVE_STRTOK_R */
-
-/* Define to 1 if the system has the type `struct in6_addr'. */
-#define _EVENT_HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have the <sys/devpoll.h> header file. */
-/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef _EVENT_HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-/* #undef _EVENT_HAVE_SYS_EVENT_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef _EVENT_HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-/* #undef _EVENT_HAVE_SYS_QUEUE_H */
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-/* #undef _EVENT_HAVE_SYS_SELECT_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef _EVENT_HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define _EVENT_HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #define _EVENT_HAVE_SYS_TIME_H 1 */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #define _EVENT_HAVE_SYS_TYPES_H 1 */
-
-/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-/* #undef _EVENT_HAVE_TAILQFOREACH */
-
-/* Define if timeradd is defined in <sys/time.h> */
-/* #undef _EVENT_HAVE_TIMERADD */
-
-/* Define if timerclear is defined in <sys/time.h> */
-/* #define _EVENT_HAVE_TIMERCLEAR 1 */
-
-/* Define if timercmp is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERCMP 1
-
-/* Define if timerisset is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERISSET 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #define _EVENT_HAVE_UNISTD_H 1 */
-
-/* Define to 1 if you have the `vasprintf' function. */
-/* #undef _EVENT_HAVE_VASPRINTF */
-
-/* Define if kqueue works correctly with pipes */
-/* #undef _EVENT_HAVE_WORKING_KQUEUE */
-
-/* Name of package */
-#define _EVENT_PACKAGE "libevent"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define _EVENT_PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define _EVENT_PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define _EVENT_PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define _EVENT_PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define _EVENT_PACKAGE_VERSION ""
-
-/* Define to 1 if you have the ANSI C header files. */
-#define _EVENT_STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define _EVENT_TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define _EVENT_VERSION "1.3.99-trunk"
-
-/* Define to appropriate substitue if compiler doesnt have __func__ */
-/* #undef _EVENT___func__ */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef _EVENT_const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef _EVENT___cplusplus
-#define _EVENT_inline __inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef _EVENT_pid_t */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef _EVENT_size_t */
-
-/* Define to unsigned int if you dont have it */
-#define _EVENT_socklen_t unsigned int
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-/* #undef _EVENT_uint16_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef _EVENT_uint32_t */
-
-/* Define to `unsigned long long' if <sys/types.h> does not define. */
-/* #undef _EVENT_uint64_t */
-
-/* Define to `unsigned char' if <sys/types.h> does not define. */
-/* #undef _EVENT_uint8_t */
-#endif
diff --git a/libevent/WIN32-Code/misc.c b/libevent/WIN32-Code/misc.c
deleted file mode 100644
index 371e192beaed..000000000000
--- a/libevent/WIN32-Code/misc.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <windows.h>
-#include <sys/timeb.h>
-#include <time.h>
-
-#ifdef __GNUC__
-/*our prototypes for timeval and timezone are in here, just in case the above
-  headers don't have them*/
-#include "misc.h"
-#endif
-
-/****************************************************************************
- *
- * Function: gettimeofday(struct timeval *, struct timezone *)
- *
- * Purpose:  Get current time of day.
- *
- * Arguments: tv => Place to store the curent time of day.
- *            tz => Ignored.
- *
- * Returns: 0 => Success.
- *
- ****************************************************************************/
-
-#ifndef HAVE_GETTIMEOFDAY
-int gettimeofday(struct timeval *tv, struct timezone *tz) {
-	struct _timeb tb;
-
-	if(tv == NULL)
-		return -1;
-
-	_ftime(&tb);
-	tv->tv_sec = (long) tb.time;
-	tv->tv_usec = ((int) tb.millitm) * 1000;
-	return 0;
-}
-#endif
-
-#if 0
-int
-win_read(int fd, void *buf, unsigned int length)
-{
-	DWORD dwBytesRead;
-	int res = ReadFile((HANDLE) fd, buf, length, &dwBytesRead, NULL);
-	if (res == 0) {
-		DWORD error = GetLastError();
-		if (error == ERROR_NO_DATA)
-			return (0);
-		return (-1);
-	} else
-		return (dwBytesRead);
-}
-
-int
-win_write(int fd, void *buf, unsigned int length)
-{
-	DWORD dwBytesWritten;
-	int res = WriteFile((HANDLE) fd, buf, length, &dwBytesWritten, NULL);
-	if (res == 0) {
-		DWORD error = GetLastError();
-		if (error == ERROR_NO_DATA)
-			return (0);
-		return (-1);
-	} else
-		return (dwBytesWritten);
-}
-
-int
-socketpair(int d, int type, int protocol, int *sv)
-{
-	static int count;
-	char buf[64];
-	HANDLE fd;
-	DWORD dwMode;
-	sprintf(buf, "\\\\.\\pipe\\levent-%d", count++);
-	/* Create a duplex pipe which will behave like a socket pair */
-	fd = CreateNamedPipe(buf, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_NOWAIT, 
-		PIPE_UNLIMITED_INSTANCES, 4096, 4096, 0, NULL);
-	if (fd == INVALID_HANDLE_VALUE)
-		return (-1);
-	sv[0] = (int)fd;
-
-	fd = CreateFile(buf, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (fd == INVALID_HANDLE_VALUE)
-		return (-1);
-	dwMode = PIPE_NOWAIT;
-	SetNamedPipeHandleState(fd, &dwMode, NULL, NULL);
-	sv[1] = (int)fd;
-
-	return (0);
-}
-#endif
diff --git a/libevent/WIN32-Code/misc.h b/libevent/WIN32-Code/misc.h
deleted file mode 100644
index aced574687c7..000000000000
--- a/libevent/WIN32-Code/misc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef MISC_H
-#define MISC_H
-
-struct timezone;
-struct timeval;
-
-#ifndef HAVE_GETTIMEOFDAY
-int gettimeofday(struct timeval *,struct timezone *);
-#endif
-
-#endif
diff --git a/libevent/WIN32-Code/tree.h b/libevent/WIN32-Code/tree.h
deleted file mode 100644
index 79e8d91f0eb3..000000000000
--- a/libevent/WIN32-Code/tree.h
+++ /dev/null
@@ -1,1354 +0,0 @@
-/*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/*
- * Copyright 2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
-
-/*
- * This file defines data structures for different types of trees:
- * splay trees and red-black trees.
- *
- * A splay tree is a self-organizing data structure.  Every operation
- * on the tree causes a splay to happen.  The splay moves the requested
- * node to the root of the tree and partly rebalances it.
- *
- * This has the benefit that request locality causes faster lookups as
- * the requested nodes move to the top of the tree.  On the other hand,
- * every lookup causes memory writes.
- *
- * The Balance Theorem bounds the total access time for m operations
- * and n inserts on an initially empty tree as O((m + n)lg n).  The
- * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
- *
- * A red-black tree is a binary search tree with the node color as an
- * extra attribute.  It fulfills a set of conditions:
- *	- every search path from the root to a leaf consists of the
- *	  same number of black nodes,
- *	- each red node (except for the root) has a black parent,
- *	- each leaf node is black.
- *
- * Every operation on a red-black tree is bounded as O(lg n).
- * The maximum height of a red-black tree is 2lg (n+1).
- */
-
-#define SPLAY_HEAD(name, type)						\
-struct name {								\
-	struct type *sph_root; /* root of the tree */			\
-}
-
-#define SPLAY_INITIALIZER(root)						\
-	{ NULL }
-
-#define SPLAY_INIT(root) do {						\
-	(root)->sph_root = NULL;					\
-} while (0)
-
-#define SPLAY_ENTRY(type)						\
-struct {								\
-	struct type *spe_left; /* left element */			\
-	struct type *spe_right; /* right element */			\
-}
-
-#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
-#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
-#define SPLAY_ROOT(head)		(head)->sph_root
-#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
-
-/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
-#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (0)
-	
-#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (0)
-
-#define SPLAY_LINKLEFT(head, tmp, field) do {				\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
-} while (0)
-
-#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
-} while (0)
-
-#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
-	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
-	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
-} while (0)
-
-/* Generates prototypes and inline functions */
-
-#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
-void name##_SPLAY(struct name *, struct type *);			\
-void name##_SPLAY_MINMAX(struct name *, int);				\
-struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
-struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
-									\
-/* Finds the node with the same key as elm */				\
-static __inline struct type *						\
-name##_SPLAY_FIND(struct name *head, struct type *elm)			\
-{									\
-	if (SPLAY_EMPTY(head))						\
-		return(NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0)				\
-		return (head->sph_root);				\
-	return (NULL);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
-{									\
-	name##_SPLAY(head, elm);					\
-	if (SPLAY_RIGHT(elm, field) != NULL) {				\
-		elm = SPLAY_RIGHT(elm, field);				\
-		while (SPLAY_LEFT(elm, field) != NULL) {		\
-			elm = SPLAY_LEFT(elm, field);			\
-		}							\
-	} else								\
-		elm = NULL;						\
-	return (elm);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_MIN_MAX(struct name *head, int val)			\
-{									\
-	name##_SPLAY_MINMAX(head, val);					\
-        return (SPLAY_ROOT(head));					\
-}
-
-/* Main splay operation.
- * Moves node close to the key of elm to top
- */
-#define SPLAY_GENERATE(name, type, field, cmp)				\
-struct type *								\
-name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
-{									\
-    if (SPLAY_EMPTY(head)) {						\
-	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
-    } else {								\
-	    int __comp;							\
-	    name##_SPLAY(head, elm);					\
-	    __comp = (cmp)(elm, (head)->sph_root);			\
-	    if(__comp < 0) {						\
-		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
-		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
-		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
-	    } else if (__comp > 0) {					\
-		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
-		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
-		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
-	    } else							\
-		    return ((head)->sph_root);				\
-    }									\
-    (head)->sph_root = (elm);						\
-    return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
-{									\
-	struct type *__tmp;						\
-	if (SPLAY_EMPTY(head))						\
-		return (NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0) {			\
-		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
-			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
-		} else {						\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
-			name##_SPLAY(head, elm);			\
-			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
-		}							\
-		return (elm);						\
-	}								\
-	return (NULL);							\
-}									\
-									\
-void									\
-name##_SPLAY(struct name *head, struct type *elm)			\
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-	int __comp;							\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while ((__comp = (cmp)(elm, (head)->sph_root))) {		\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) < 0){			\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) > 0){			\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}									\
-									\
-/* Splay with either the minimum or the maximum element			\
- * Used to find minimum or maximum element in tree.			\
- */									\
-void name##_SPLAY_MINMAX(struct name *head, int __comp) \
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while (1) {							\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp < 0){				\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp > 0) {				\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}
-
-#define SPLAY_NEGINF	-1
-#define SPLAY_INF	1
-
-#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
-#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
-#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
-#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
-#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
-#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
-
-#define SPLAY_FOREACH(x, name, head)					\
-	for ((x) = SPLAY_MIN(name, head);				\
-	     (x) != NULL;						\
-	     (x) = SPLAY_NEXT(name, head, x))
-
-/* Macros that define a red-back tree */
-#define RB_HEAD(name, type)						\
-struct name {								\
-	struct type *rbh_root; /* root of the tree */			\
-}
-
-#define RB_INITIALIZER(root)						\
-	{ NULL }
-
-#define RB_INIT(root) do {						\
-	(root)->rbh_root = NULL;					\
-} while (0)
-
-#define RB_BLACK	0
-#define RB_RED		1
-#define RB_ENTRY(type)							\
-struct {								\
-	struct type *rbe_left;		/* left element */		\
-	struct type *rbe_right;		/* right element */		\
-	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
-}
-
-#define RB_LEFT(elm, field)		(elm)->field.rbe_left
-#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
-#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
-#define RB_COLOR(elm, field)		(elm)->field.rbe_color
-#define RB_ROOT(head)			(head)->rbh_root
-#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
-
-#define RB_SET(elm, parent, field) do {					\
-	RB_PARENT(elm, field) = parent;					\
-	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
-	RB_COLOR(elm, field) = RB_RED;					\
-} while (0)
-
-#define RB_SET_BLACKRED(black, red, field) do {				\
-	RB_COLOR(black, field) = RB_BLACK;				\
-	RB_COLOR(red, field) = RB_RED;					\
-} while (0)
-
-#ifndef RB_AUGMENT
-#define RB_AUGMENT(x)
-#endif
-
-#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
-	(tmp) = RB_RIGHT(elm, field);					\
-	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) {		\
-		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_LEFT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (0)
-
-#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
-	(tmp) = RB_LEFT(elm, field);					\
-	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) {		\
-		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_RIGHT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (0)
-
-/* Generates prototypes and inline functions */
-#define RB_PROTOTYPE(name, type, field, cmp)				\
-void name##_RB_INSERT_COLOR(struct name *, struct type *);	\
-void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
-struct type *name##_RB_REMOVE(struct name *, struct type *);		\
-struct type *name##_RB_INSERT(struct name *, struct type *);		\
-struct type *name##_RB_FIND(struct name *, struct type *);		\
-struct type *name##_RB_NEXT(struct type *);				\
-struct type *name##_RB_MINMAX(struct name *, int);			\
-									\
-
-/* Main rb operation.
- * Moves node close to the key of elm to top
- */
-#define RB_GENERATE(name, type, field, cmp)				\
-void									\
-name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
-{									\
-	struct type *parent, *gparent, *tmp;				\
-	while ((parent = RB_PARENT(elm, field)) &&			\
-	    RB_COLOR(parent, field) == RB_RED) {			\
-		gparent = RB_PARENT(parent, field);			\
-		if (parent == RB_LEFT(gparent, field)) {		\
-			tmp = RB_RIGHT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_RIGHT(parent, field) == elm) {		\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
-		} else {						\
-			tmp = RB_LEFT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_LEFT(parent, field) == elm) {		\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
-		}							\
-	}								\
-	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
-}									\
-									\
-void									\
-name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
-{									\
-	struct type *tmp;						\
-	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
-	    elm != RB_ROOT(head)) {					\
-		if (RB_LEFT(parent, field) == elm) {			\
-			tmp = RB_RIGHT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = RB_RIGHT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_RIGHT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
-					struct type *oleft;		\
-					if ((oleft = RB_LEFT(tmp, field)))\
-						RB_COLOR(oleft, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
-					tmp = RB_RIGHT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_RIGHT(tmp, field))		\
-					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		} else {						\
-			tmp = RB_LEFT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = RB_LEFT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_LEFT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
-					struct type *oright;		\
-					if ((oright = RB_RIGHT(tmp, field)))\
-						RB_COLOR(oright, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_LEFT(head, tmp, oright, field);\
-					tmp = RB_LEFT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_LEFT(tmp, field))		\
-					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		}							\
-	}								\
-	if (elm)							\
-		RB_COLOR(elm, field) = RB_BLACK;			\
-}									\
-									\
-struct type *								\
-name##_RB_REMOVE(struct name *head, struct type *elm)			\
-{									\
-	struct type *child, *parent, *old = elm;			\
-	int color;							\
-	if (RB_LEFT(elm, field) == NULL)				\
-		child = RB_RIGHT(elm, field);				\
-	else if (RB_RIGHT(elm, field) == NULL)				\
-		child = RB_LEFT(elm, field);				\
-	else {								\
-		struct type *left;					\
-		elm = RB_RIGHT(elm, field);				\
-		while ((left = RB_LEFT(elm, field)))			\
-			elm = left;					\
-		child = RB_RIGHT(elm, field);				\
-		parent = RB_PARENT(elm, field);				\
-		color = RB_COLOR(elm, field);				\
-		if (child)						\
-			RB_PARENT(child, field) = parent;		\
-		if (parent) {						\
-			if (RB_LEFT(parent, field) == elm)		\
-				RB_LEFT(parent, field) = child;		\
-			else						\
-				RB_RIGHT(parent, field) = child;	\
-			RB_AUGMENT(parent);				\
-		} else							\
-			RB_ROOT(head) = child;				\
-		if (RB_PARENT(elm, field) == old)			\
-			parent = elm;					\
-		(elm)->field = (old)->field;				\
-		if (RB_PARENT(old, field)) {				\
-			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
-				RB_LEFT(RB_PARENT(old, field), field) = elm;\
-			else						\
-				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
-			RB_AUGMENT(RB_PARENT(old, field));		\
-		} else							\
-			RB_ROOT(head) = elm;				\
-		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
-		if (RB_RIGHT(old, field))				\
-			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
-		if (parent) {						\
-			left = parent;					\
-			do {						\
-				RB_AUGMENT(left);			\
-			} while ((left = RB_PARENT(left, field)));	\
-		}							\
-		goto color;						\
-	}								\
-	parent = RB_PARENT(elm, field);					\
-	color = RB_COLOR(elm, field);					\
-	if (child)							\
-		RB_PARENT(child, field) = parent;			\
-	if (parent) {							\
-		if (RB_LEFT(parent, field) == elm)			\
-			RB_LEFT(parent, field) = child;			\
-		else							\
-			RB_RIGHT(parent, field) = child;		\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = child;					\
-color:									\
-	if (color == RB_BLACK)						\
-		name##_RB_REMOVE_COLOR(head, parent, child);		\
-	return (old);							\
-}									\
-									\
-/* Inserts a node into the RB tree */					\
-struct type *								\
-name##_RB_INSERT(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp;						\
-	struct type *parent = NULL;					\
-	int comp = 0;							\
-	tmp = RB_ROOT(head);						\
-	while (tmp) {							\
-		parent = tmp;						\
-		comp = (cmp)(elm, parent);				\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	RB_SET(elm, parent, field);					\
-	if (parent != NULL) {						\
-		if (comp < 0)						\
-			RB_LEFT(parent, field) = elm;			\
-		else							\
-			RB_RIGHT(parent, field) = elm;			\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = elm;					\
-	name##_RB_INSERT_COLOR(head, elm);				\
-	return (NULL);							\
-}									\
-									\
-/* Finds the node with the same key as elm */				\
-struct type *								\
-name##_RB_FIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_RB_NEXT(struct type *elm)					\
-{									\
-	if (RB_RIGHT(elm, field)) {					\
-		elm = RB_RIGHT(elm, field);				\
-		while (RB_LEFT(elm, field))				\
-			elm = RB_LEFT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}									\
-									\
-struct type *								\
-name##_RB_MINMAX(struct name *head, int val)				\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *parent = NULL;					\
-	while (tmp) {							\
-		parent = tmp;						\
-		if (val < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else							\
-			tmp = RB_RIGHT(tmp, field);			\
-	}								\
-	return (parent);						\
-}
-
-#define RB_NEGINF	-1
-#define RB_INF	1
-
-#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
-#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
-#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
-#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
-#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
-#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
-
-#define RB_FOREACH(x, name, head)					\
-	for ((x) = RB_MIN(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_NEXT(x))
-
-#endif	/* _SYS_TREE_H_ */
-/*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/*
- * Copyright 2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
-
-/*
- * This file defines data structures for different types of trees:
- * splay trees and red-black trees.
- *
- * A splay tree is a self-organizing data structure.  Every operation
- * on the tree causes a splay to happen.  The splay moves the requested
- * node to the root of the tree and partly rebalances it.
- *
- * This has the benefit that request locality causes faster lookups as
- * the requested nodes move to the top of the tree.  On the other hand,
- * every lookup causes memory writes.
- *
- * The Balance Theorem bounds the total access time for m operations
- * and n inserts on an initially empty tree as O((m + n)lg n).  The
- * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
- *
- * A red-black tree is a binary search tree with the node color as an
- * extra attribute.  It fulfills a set of conditions:
- *	- every search path from the root to a leaf consists of the
- *	  same number of black nodes,
- *	- each red node (except for the root) has a black parent,
- *	- each leaf node is black.
- *
- * Every operation on a red-black tree is bounded as O(lg n).
- * The maximum height of a red-black tree is 2lg (n+1).
- */
-
-#define SPLAY_HEAD(name, type)						\
-struct name {								\
-	struct type *sph_root; /* root of the tree */			\
-}
-
-#define SPLAY_INITIALIZER(root)						\
-	{ NULL }
-
-#define SPLAY_INIT(root) do {						\
-	(root)->sph_root = NULL;					\
-} while (0)
-
-#define SPLAY_ENTRY(type)						\
-struct {								\
-	struct type *spe_left; /* left element */			\
-	struct type *spe_right; /* right element */			\
-}
-
-#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
-#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
-#define SPLAY_ROOT(head)		(head)->sph_root
-#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
-
-/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
-#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (0)
-	
-#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (0)
-
-#define SPLAY_LINKLEFT(head, tmp, field) do {				\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
-} while (0)
-
-#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
-} while (0)
-
-#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
-	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
-	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
-} while (0)
-
-/* Generates prototypes and inline functions */
-
-#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
-void name##_SPLAY(struct name *, struct type *);			\
-void name##_SPLAY_MINMAX(struct name *, int);				\
-struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
-struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
-									\
-/* Finds the node with the same key as elm */				\
-static __inline struct type *						\
-name##_SPLAY_FIND(struct name *head, struct type *elm)			\
-{									\
-	if (SPLAY_EMPTY(head))						\
-		return(NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0)				\
-		return (head->sph_root);				\
-	return (NULL);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
-{									\
-	name##_SPLAY(head, elm);					\
-	if (SPLAY_RIGHT(elm, field) != NULL) {				\
-		elm = SPLAY_RIGHT(elm, field);				\
-		while (SPLAY_LEFT(elm, field) != NULL) {		\
-			elm = SPLAY_LEFT(elm, field);			\
-		}							\
-	} else								\
-		elm = NULL;						\
-	return (elm);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_MIN_MAX(struct name *head, int val)			\
-{									\
-	name##_SPLAY_MINMAX(head, val);					\
-        return (SPLAY_ROOT(head));					\
-}
-
-/* Main splay operation.
- * Moves node close to the key of elm to top
- */
-#define SPLAY_GENERATE(name, type, field, cmp)				\
-struct type *								\
-name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
-{									\
-    if (SPLAY_EMPTY(head)) {						\
-	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
-    } else {								\
-	    int __comp;							\
-	    name##_SPLAY(head, elm);					\
-	    __comp = (cmp)(elm, (head)->sph_root);			\
-	    if(__comp < 0) {						\
-		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
-		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
-		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
-	    } else if (__comp > 0) {					\
-		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
-		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
-		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
-	    } else							\
-		    return ((head)->sph_root);				\
-    }									\
-    (head)->sph_root = (elm);						\
-    return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
-{									\
-	struct type *__tmp;						\
-	if (SPLAY_EMPTY(head))						\
-		return (NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0) {			\
-		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
-			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
-		} else {						\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
-			name##_SPLAY(head, elm);			\
-			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
-		}							\
-		return (elm);						\
-	}								\
-	return (NULL);							\
-}									\
-									\
-void									\
-name##_SPLAY(struct name *head, struct type *elm)			\
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-	int __comp;							\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while ((__comp = (cmp)(elm, (head)->sph_root))) {		\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) < 0){			\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) > 0){			\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}									\
-									\
-/* Splay with either the minimum or the maximum element			\
- * Used to find minimum or maximum element in tree.			\
- */									\
-void name##_SPLAY_MINMAX(struct name *head, int __comp) \
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while (1) {							\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp < 0){				\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp > 0) {				\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}
-
-#define SPLAY_NEGINF	-1
-#define SPLAY_INF	1
-
-#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
-#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
-#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
-#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
-#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
-#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
-
-#define SPLAY_FOREACH(x, name, head)					\
-	for ((x) = SPLAY_MIN(name, head);				\
-	     (x) != NULL;						\
-	     (x) = SPLAY_NEXT(name, head, x))
-
-/* Macros that define a red-back tree */
-#define RB_HEAD(name, type)						\
-struct name {								\
-	struct type *rbh_root; /* root of the tree */			\
-}
-
-#define RB_INITIALIZER(root)						\
-	{ NULL }
-
-#define RB_INIT(root) do {						\
-	(root)->rbh_root = NULL;					\
-} while (0)
-
-#define RB_BLACK	0
-#define RB_RED		1
-#define RB_ENTRY(type)							\
-struct {								\
-	struct type *rbe_left;		/* left element */		\
-	struct type *rbe_right;		/* right element */		\
-	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
-}
-
-#define RB_LEFT(elm, field)		(elm)->field.rbe_left
-#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
-#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
-#define RB_COLOR(elm, field)		(elm)->field.rbe_color
-#define RB_ROOT(head)			(head)->rbh_root
-#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
-
-#define RB_SET(elm, parent, field) do {					\
-	RB_PARENT(elm, field) = parent;					\
-	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
-	RB_COLOR(elm, field) = RB_RED;					\
-} while (0)
-
-#define RB_SET_BLACKRED(black, red, field) do {				\
-	RB_COLOR(black, field) = RB_BLACK;				\
-	RB_COLOR(red, field) = RB_RED;					\
-} while (0)
-
-#ifndef RB_AUGMENT
-#define RB_AUGMENT(x)
-#endif
-
-#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
-	(tmp) = RB_RIGHT(elm, field);					\
-	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) {		\
-		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_LEFT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (0)
-
-#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
-	(tmp) = RB_LEFT(elm, field);					\
-	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) {		\
-		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) {		\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_RIGHT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (0)
-
-/* Generates prototypes and inline functions */
-#define RB_PROTOTYPE(name, type, field, cmp)				\
-void name##_RB_INSERT_COLOR(struct name *, struct type *);	\
-void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
-struct type *name##_RB_REMOVE(struct name *, struct type *);		\
-struct type *name##_RB_INSERT(struct name *, struct type *);		\
-struct type *name##_RB_FIND(struct name *, struct type *);		\
-struct type *name##_RB_NEXT(struct type *);				\
-struct type *name##_RB_MINMAX(struct name *, int);			\
-									\
-
-/* Main rb operation.
- * Moves node close to the key of elm to top
- */
-#define RB_GENERATE(name, type, field, cmp)				\
-void									\
-name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
-{									\
-	struct type *parent, *gparent, *tmp;				\
-	while ((parent = RB_PARENT(elm, field)) &&			\
-	    RB_COLOR(parent, field) == RB_RED) {			\
-		gparent = RB_PARENT(parent, field);			\
-		if (parent == RB_LEFT(gparent, field)) {		\
-			tmp = RB_RIGHT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_RIGHT(parent, field) == elm) {		\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
-		} else {						\
-			tmp = RB_LEFT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_LEFT(parent, field) == elm) {		\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
-		}							\
-	}								\
-	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
-}									\
-									\
-void									\
-name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
-{									\
-	struct type *tmp;						\
-	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
-	    elm != RB_ROOT(head)) {					\
-		if (RB_LEFT(parent, field) == elm) {			\
-			tmp = RB_RIGHT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = RB_RIGHT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_RIGHT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
-					struct type *oleft;		\
-					if ((oleft = RB_LEFT(tmp, field)))\
-						RB_COLOR(oleft, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
-					tmp = RB_RIGHT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_RIGHT(tmp, field))		\
-					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		} else {						\
-			tmp = RB_LEFT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = RB_LEFT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_LEFT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
-					struct type *oright;		\
-					if ((oright = RB_RIGHT(tmp, field)))\
-						RB_COLOR(oright, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_LEFT(head, tmp, oright, field);\
-					tmp = RB_LEFT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_LEFT(tmp, field))		\
-					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		}							\
-	}								\
-	if (elm)							\
-		RB_COLOR(elm, field) = RB_BLACK;			\
-}									\
-									\
-struct type *								\
-name##_RB_REMOVE(struct name *head, struct type *elm)			\
-{									\
-	struct type *child, *parent, *old = elm;			\
-	int color;							\
-	if (RB_LEFT(elm, field) == NULL)				\
-		child = RB_RIGHT(elm, field);				\
-	else if (RB_RIGHT(elm, field) == NULL)				\
-		child = RB_LEFT(elm, field);				\
-	else {								\
-		struct type *left;					\
-		elm = RB_RIGHT(elm, field);				\
-		while ((left = RB_LEFT(elm, field)))			\
-			elm = left;					\
-		child = RB_RIGHT(elm, field);				\
-		parent = RB_PARENT(elm, field);				\
-		color = RB_COLOR(elm, field);				\
-		if (child)						\
-			RB_PARENT(child, field) = parent;		\
-		if (parent) {						\
-			if (RB_LEFT(parent, field) == elm)		\
-				RB_LEFT(parent, field) = child;		\
-			else						\
-				RB_RIGHT(parent, field) = child;	\
-			RB_AUGMENT(parent);				\
-		} else							\
-			RB_ROOT(head) = child;				\
-		if (RB_PARENT(elm, field) == old)			\
-			parent = elm;					\
-		(elm)->field = (old)->field;				\
-		if (RB_PARENT(old, field)) {				\
-			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
-				RB_LEFT(RB_PARENT(old, field), field) = elm;\
-			else						\
-				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
-			RB_AUGMENT(RB_PARENT(old, field));		\
-		} else							\
-			RB_ROOT(head) = elm;				\
-		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
-		if (RB_RIGHT(old, field))				\
-			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
-		if (parent) {						\
-			left = parent;					\
-			do {						\
-				RB_AUGMENT(left);			\
-			} while ((left = RB_PARENT(left, field)));	\
-		}							\
-		goto color;						\
-	}								\
-	parent = RB_PARENT(elm, field);					\
-	color = RB_COLOR(elm, field);					\
-	if (child)							\
-		RB_PARENT(child, field) = parent;			\
-	if (parent) {							\
-		if (RB_LEFT(parent, field) == elm)			\
-			RB_LEFT(parent, field) = child;			\
-		else							\
-			RB_RIGHT(parent, field) = child;		\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = child;					\
-color:									\
-	if (color == RB_BLACK)						\
-		name##_RB_REMOVE_COLOR(head, parent, child);		\
-	return (old);							\
-}									\
-									\
-/* Inserts a node into the RB tree */					\
-struct type *								\
-name##_RB_INSERT(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp;						\
-	struct type *parent = NULL;					\
-	int comp = 0;							\
-	tmp = RB_ROOT(head);						\
-	while (tmp) {							\
-		parent = tmp;						\
-		comp = (cmp)(elm, parent);				\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	RB_SET(elm, parent, field);					\
-	if (parent != NULL) {						\
-		if (comp < 0)						\
-			RB_LEFT(parent, field) = elm;			\
-		else							\
-			RB_RIGHT(parent, field) = elm;			\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = elm;					\
-	name##_RB_INSERT_COLOR(head, elm);				\
-	return (NULL);							\
-}									\
-									\
-/* Finds the node with the same key as elm */				\
-struct type *								\
-name##_RB_FIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_RB_NEXT(struct type *elm)					\
-{									\
-	if (RB_RIGHT(elm, field)) {					\
-		elm = RB_RIGHT(elm, field);				\
-		while (RB_LEFT(elm, field))				\
-			elm = RB_LEFT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}									\
-									\
-struct type *								\
-name##_RB_MINMAX(struct name *head, int val)				\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *parent = NULL;					\
-	while (tmp) {							\
-		parent = tmp;						\
-		if (val < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else							\
-			tmp = RB_RIGHT(tmp, field);			\
-	}								\
-	return (parent);						\
-}
-
-#define RB_NEGINF	-1
-#define RB_INF	1
-
-#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
-#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
-#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
-#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
-#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
-#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
-
-#define RB_FOREACH(x, name, head)					\
-	for ((x) = RB_MIN(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_NEXT(x))
-
-#endif	/* _SYS_TREE_H_ */
diff --git a/libevent/WIN32-Code/win32.c b/libevent/WIN32-Code/win32.c
deleted file mode 100644
index 8a603b7eceb4..000000000000
--- a/libevent/WIN32-Code/win32.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * Copyright 2003 Michael A. Davis <mike@datanerds.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef _MSC_VER
-#include "./config.h"
-#else
-/* Avoid the windows/msvc thing. */
-#include "../config.h"
-#endif
-
-#include <winsock2.h>
-#include <windows.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#define RB_AUGMENT(x) (void)(x)
-#include "./tree.h"
-#include "log.h"
-#include "event.h"
-#include "event-internal.h"
-
-#define XFREE(ptr) do { if (ptr) free(ptr); } while(0)
-
-extern struct event_list timequeue;
-extern struct event_list addqueue;
-#if 0
-extern struct event_list signalqueue;
-#endif
-
-struct win_fd_set {
-	u_int fd_count;
-	SOCKET fd_array[1];
-};
-
-int evsigcaught[NSIG];
-volatile sig_atomic_t signal_caught = 0;
-/* MSDN says this is required to handle SIGFPE */
-volatile double SIGFPE_REQ = 0.0f;
-
-#if 0
-static void signal_handler(int sig);
-
-void signal_process(void);
-int signal_recalc(void);
-#endif
-
-struct event_entry {
-	RB_ENTRY(event_entry) node;
-	SOCKET sock;
-	int read_pos;
-	int write_pos;
-	struct event *read_event;
-	struct event *write_event;
-};
-
-static int
-compare(struct event_entry *a, struct event_entry *b)
-{
-	if (a->sock < b->sock)
-		return -1;
-	else if (a->sock > b->sock)
-		return 1;
-	else
-		return 0;
-}
-
-struct win32op {
-	int fd_setsz;
-	struct win_fd_set *readset_in;
-	struct win_fd_set *writeset_in;
-	struct win_fd_set *readset_out;
-	struct win_fd_set *writeset_out;
-	struct win_fd_set *exset_out;
-	RB_HEAD(event_map, event_entry) event_root;
-
-	unsigned signals_are_broken : 1;
-};
-
-RB_PROTOTYPE(event_map, event_entry, node, compare);
-RB_GENERATE(event_map, event_entry, node, compare);
-
-void *win32_init	(struct event_base *);
-int win32_insert	(void *, struct event *);
-int win32_del	(void *, struct event *);
-int win32_dispatch	(struct event_base *base, void *, struct timeval *);
-void win32_dealloc	(struct event_base *, void *);
-
-struct eventop win32ops = {
-	"win32",
-	win32_init,
-	win32_insert,
-	win32_del,
-	win32_dispatch,
-	win32_dealloc,
-	0
-};
-
-#define FD_SET_ALLOC_SIZE(n) ((sizeof(struct win_fd_set) + ((n)-1)*sizeof(SOCKET)))
-
-static int
-realloc_fd_sets(struct win32op *op, size_t new_size)
-{
-	size_t size;
-
-	assert(new_size >= op->readset_in->fd_count &&
-	       new_size >= op->writeset_in->fd_count);
-	assert(new_size >= 1);
-
-	size = FD_SET_ALLOC_SIZE(new_size);
-	if (!(op->readset_in = realloc(op->readset_in, size)))
-		return (-1);
-	if (!(op->writeset_in = realloc(op->writeset_in, size)))
-		return (-1);
-	if (!(op->readset_out = realloc(op->readset_out, size)))
-		return (-1);
-	if (!(op->exset_out = realloc(op->exset_out, size)))
-		return (-1);
-	if (!(op->writeset_out = realloc(op->writeset_out, size)))
-		return (-1);
-	op->fd_setsz = new_size;
-	return (0);
-}
-
-static int
-timeval_to_ms(struct timeval *tv)
-{
-	return ((tv->tv_sec * 1000) + (tv->tv_usec / 1000));
-}
-
-static struct event_entry*
-get_event_entry(struct win32op *op, SOCKET s, int create)
-{
-	struct event_entry key, *val;
-	key.sock = s;
-	val = RB_FIND(event_map, &op->event_root, &key);
-	if (val || !create)
-		return val;
-	if (!(val = calloc(1, sizeof(struct event_entry)))) {
-		event_warn("%s: calloc", __func__);
-		return NULL;
-	}
-	val->sock = s;
-	val->read_pos = val->write_pos = -1;
-	RB_INSERT(event_map, &op->event_root, val);
-	return val;
-}
-
-static int
-do_fd_set(struct win32op *op, struct event_entry *ent, int read)
-{
-	SOCKET s = ent->sock;
-	struct win_fd_set *set = read ? op->readset_in : op->writeset_in;
-	if (read) {
-		if (ent->read_pos >= 0)
-			return (0);
-	} else {
-		if (ent->write_pos >= 0)
-			return (0);
-	}
-	if (set->fd_count == op->fd_setsz) {
-		if (realloc_fd_sets(op, op->fd_setsz*2))
-			return (-1);
-		/* set pointer will have changed and needs reiniting! */
-		set = read ? op->readset_in : op->writeset_in;
-	}
-	set->fd_array[set->fd_count] = s;
-	if (read)
-		ent->read_pos = set->fd_count;
-	else
-		ent->write_pos = set->fd_count;
-	return (set->fd_count++);
-}
-
-static int
-do_fd_clear(struct win32op *op, struct event_entry *ent, int read)
-{
-	int i;
-	struct win_fd_set *set = read ? op->readset_in : op->writeset_in;
-	if (read) {
-		i = ent->read_pos;
-		ent->read_pos = -1;
-	} else {
-		i = ent->write_pos;
-		ent->write_pos = -1;
-	}
-	if (i < 0)
-		return (0);
-	if (--set->fd_count != i) {
-		struct event_entry *ent2;
-		SOCKET s2;
-		s2 = set->fd_array[i] = set->fd_array[set->fd_count];
-		ent2 = get_event_entry(op, s2, 0);
-		if (!ent) /* This indicates a bug. */
-			return (0);
-		if (read)
-			ent2->read_pos = i;
-		else
-			ent2->write_pos = i;
-	}
-	return (0);
-}
-
-#define NEVENT 64
-void *
-win32_init(struct event_base *_base)
-{
-	struct win32op *winop;
-	size_t size;
-	if (!(winop = calloc(1, sizeof(struct win32op))))
-		return NULL;
-	winop->fd_setsz = NEVENT;
-	size = FD_SET_ALLOC_SIZE(NEVENT);
-	if (!(winop->readset_in = malloc(size)))
-		goto err;
-	if (!(winop->writeset_in = malloc(size)))
-		goto err;
-	if (!(winop->readset_out = malloc(size)))
-		goto err;
-	if (!(winop->writeset_out = malloc(size)))
-		goto err;
-	if (!(winop->exset_out = malloc(size)))
-		goto err;
-	RB_INIT(&winop->event_root);
-	winop->readset_in->fd_count = winop->writeset_in->fd_count = 0;
-	winop->readset_out->fd_count = winop->writeset_out->fd_count
-		= winop->exset_out->fd_count = 0;
-
-	if (evsignal_init(_base) < 0)
-		winop->signals_are_broken = 1;
-
-	return (winop);
- err:
-        XFREE(winop->readset_in);
-        XFREE(winop->writeset_in);
-        XFREE(winop->readset_out);
-        XFREE(winop->writeset_out);
-        XFREE(winop->exset_out);
-        XFREE(winop);
-        return (NULL);
-}
-
-int
-win32_insert(void *op, struct event *ev)
-{
-	struct win32op *win32op = op;
-	struct event_entry *ent;
-
-	if (ev->ev_events & EV_SIGNAL) {
-		if (win32op->signals_are_broken)
-			return (-1);
-		return (evsignal_add(ev));
-	}
-	if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-		return (0);
-	ent = get_event_entry(win32op, ev->ev_fd, 1);
-	if (!ent)
-		return (-1); /* out of memory */
-
-	event_debug(("%s: adding event for %d", __func__, (int)ev->ev_fd));
-	if (ev->ev_events & EV_READ) {
-		if (do_fd_set(win32op, ent, 1)<0)
-			return (-1);
-		ent->read_event = ev;
-	}
-	if (ev->ev_events & EV_WRITE) {
-		if (do_fd_set(win32op, ent, 0)<0)
-			return (-1);
-		ent->write_event = ev;
-	}
-	return (0);
-}
-
-int
-win32_del(void *op, struct event *ev)
-{
-	struct win32op *win32op = op;
-	struct event_entry *ent;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_del(ev));
-
-	if (!(ent = get_event_entry(win32op, ev->ev_fd, 0)))
-		return (-1);
-	event_debug(("%s: Removing event for %d", __func__, ev->ev_fd));
-	if (ev == ent->read_event) {
-		do_fd_clear(win32op, ent, 1);
-		ent->read_event = NULL;
-	}
-	if (ev == ent->write_event) {
-		do_fd_clear(win32op, ent, 0);
-		ent->write_event = NULL;
-	}
-	if (!ent->read_event && !ent->write_event) {
-		RB_REMOVE(event_map, &win32op->event_root, ent);
-		free(ent);
-	}
-
-	return 0;
-}
-
-static void
-fd_set_copy(struct win_fd_set *out, const struct win_fd_set *in)
-{
-	out->fd_count = in->fd_count;
-	memcpy(out->fd_array, in->fd_array, in->fd_count * (sizeof(SOCKET)));
-}
-
-/*
-  static void dump_fd_set(struct win_fd_set *s)
-  {
-  unsigned int i;
-  printf("[ ");
-  for(i=0;i<s->fd_count;++i)
-  printf("%d ",(int)s->fd_array[i]);
-  printf("]\n");
-  }
-*/
-
-int
-win32_dispatch(struct event_base *base, void *op,
-	       struct timeval *tv)
-{
-	struct win32op *win32op = op;
-	int res = 0;
-	unsigned j, i;
-	int fd_count;
-	SOCKET s;
-	struct event_entry *ent;
-
-	fd_set_copy(win32op->readset_out, win32op->readset_in);
-	fd_set_copy(win32op->exset_out, win32op->readset_in);
-	fd_set_copy(win32op->writeset_out, win32op->writeset_in);
-
-	fd_count =
-           (win32op->readset_out->fd_count > win32op->writeset_out->fd_count) ?
-	    win32op->readset_out->fd_count : win32op->writeset_out->fd_count;
-
-	if (!fd_count) {
-		/* Windows doesn't like you to call select() with no sockets */
-		Sleep(timeval_to_ms(tv));
-		evsignal_process(base);
-		return (0);
-	}
-
-	res = select(fd_count,
-		     (struct fd_set*)win32op->readset_out,
-		     (struct fd_set*)win32op->writeset_out,
-		     (struct fd_set*)win32op->exset_out, tv);
-
-	event_debug(("%s: select returned %d", __func__, res));
-
-	if(res <= 0) {
-		evsignal_process(base);
-		return res;
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-
-	if (win32op->readset_out->fd_count) {
-		i = rand() % win32op->readset_out->fd_count;
-		for (j=0; j<win32op->readset_out->fd_count; ++j) {
-			if (++i >= win32op->readset_out->fd_count)
-				i = 0;
-			s = win32op->readset_out->fd_array[i];
-			if ((ent = get_event_entry(win32op, s, 0)) && ent->read_event)
-				event_active(ent->read_event, EV_READ, 1);
-		}
-	}
-	if (win32op->exset_out->fd_count) {
-		i = rand() % win32op->exset_out->fd_count;
-		for (j=0; j<win32op->exset_out->fd_count; ++j) {
-			if (++i >= win32op->exset_out->fd_count)
-				i = 0;
-			s = win32op->exset_out->fd_array[i];
-			if ((ent = get_event_entry(win32op, s, 0)) && ent->read_event)
-				event_active(ent->read_event, EV_READ, 1);
-		}
-	}
-	if (win32op->writeset_out->fd_count) {
-		i = rand() % win32op->writeset_out->fd_count;
-		for (j=0; j<win32op->writeset_out->fd_count; ++j) {
-			if (++i >= win32op->exset_out->fd_count)
-				i = 0;
-			s = win32op->writeset_out->fd_array[i];
-			if ((ent = get_event_entry(win32op, s, 0)) && ent->write_event)
-				event_active(ent->write_event, EV_WRITE, 1);
-
-		}
-	}
-
-	return (0);
-}
-
-void
-win32_dealloc(struct event_base *_base, void *arg)
-{
-	struct win32op *win32op = arg;
-
-	evsignal_dealloc(_base);
-	if (win32op->readset_in)
-		free(win32op->readset_in);
-	if (win32op->writeset_in)
-		free(win32op->writeset_in);
-	if (win32op->readset_out)
-		free(win32op->readset_out);
-	if (win32op->writeset_out)
-		free(win32op->writeset_out);
-	if (win32op->exset_out)
-		free(win32op->exset_out);
-	/* XXXXX free the tree. */
-
-	memset(win32op, 0, sizeof(win32op));
-	free(win32op);
-}
-
-#if 0
-static void
-signal_handler(int sig)
-{
-	evsigcaught[sig]++;
-	signal_caught = 1;
-}
-
-int
-signal_recalc(void)
-{
-	struct event *ev;
-
-	/* Reinstall our signal handler. */
-	TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
-		if((int)signal(EVENT_SIGNAL(ev), signal_handler) == -1)
-			return (-1);
-	}
-	return (0);
-}
-
-void
-signal_process(void)
-{
-	struct event *ev;
-	short ncalls;
-
-	TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
-		ncalls = evsigcaught[EVENT_SIGNAL(ev)];
-		if (ncalls) {
-			if (!(ev->ev_events & EV_PERSIST))
-				event_del(ev);
-			event_active(ev, EV_SIGNAL, ncalls);
-		}
-	}
-
-	memset(evsigcaught, 0, sizeof(evsigcaught));
-	signal_caught = 0;
-}
-#endif
-
diff --git a/libevent/WIN32-Prj/libevent.dsp b/libevent/WIN32-Prj/libevent.dsp
deleted file mode 100644
index e9848f7fc01e..000000000000
--- a/libevent/WIN32-Prj/libevent.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libevent" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libevent - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libevent.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libevent.mak" CFG="libevent - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libevent - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libevent - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libevent - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\\" /I "..\WIN32-Code" /I "..\compat" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libevent - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\WIN32-Code" /I "..\compat" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libevent - Win32 Release"
-# Name "libevent - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\log.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\event.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\WIN32-Code\misc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\WIN32-Code\win32.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\acconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\WIN32-Code\config.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\err.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\event.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\WIN32-Code\misc.h"
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/libevent/WIN32-Prj/libevent.dsw b/libevent/WIN32-Prj/libevent.dsw
deleted file mode 100644
index fb05451ca253..000000000000
--- a/libevent/WIN32-Prj/libevent.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "event_test"=".\event_test\event_test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libevent
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libevent"=".\libevent.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "signal_test"=".\signal_test\signal_test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libevent
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "time_test"=".\time_test\time_test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libevent
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/libevent/WIN32-Prj/libevent.sln b/libevent/WIN32-Prj/libevent.sln
deleted file mode 100644
index 17e0c98bae64..000000000000
--- a/libevent/WIN32-Prj/libevent.sln
+++ /dev/null
@@ -1,53 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "event_test", "event_test\event_test.vcproj", "{52099A8B-455B-4BE9-8E61-A3D6E8A4338D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "libevent.vcproj", "{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_test", "signal_test\signal_test.vcproj", "{768DB9DD-2694-4274-89B8-74106E8F7786}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9} = {B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time_test", "time_test\time_test.vcproj", "{D4BE29FB-E45C-4177-9647-74BBAFDC1257}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9} = {B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress\regress.vcproj", "{F7C26008-6066-4AD3-8543-452EFE58BD2E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9} = {B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{52099A8B-455B-4BE9-8E61-A3D6E8A4338D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{52099A8B-455B-4BE9-8E61-A3D6E8A4338D}.Debug|Win32.Build.0 = Debug|Win32
-		{52099A8B-455B-4BE9-8E61-A3D6E8A4338D}.Release|Win32.ActiveCfg = Release|Win32
-		{52099A8B-455B-4BE9-8E61-A3D6E8A4338D}.Release|Win32.Build.0 = Release|Win32
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}.Debug|Win32.Build.0 = Debug|Win32
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}.Release|Win32.ActiveCfg = Release|Win32
-		{B98ABFCE-24D4-4B70-94DE-EF7F1E0662F9}.Release|Win32.Build.0 = Release|Win32
-		{768DB9DD-2694-4274-89B8-74106E8F7786}.Debug|Win32.ActiveCfg = Debug|Win32
-		{768DB9DD-2694-4274-89B8-74106E8F7786}.Debug|Win32.Build.0 = Debug|Win32
-		{768DB9DD-2694-4274-89B8-74106E8F7786}.Release|Win32.ActiveCfg = Release|Win32
-		{768DB9DD-2694-4274-89B8-74106E8F7786}.Release|Win32.Build.0 = Release|Win32
-		{D4BE29FB-E45C-4177-9647-74BBAFDC1257}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4BE29FB-E45C-4177-9647-74BBAFDC1257}.Debug|Win32.Build.0 = Debug|Win32
-		{D4BE29FB-E45C-4177-9647-74BBAFDC1257}.Release|Win32.ActiveCfg = Release|Win32
-		{D4BE29FB-E45C-4177-9647-74BBAFDC1257}.Release|Win32.Build.0 = Release|Win32
-		{F7C26008-6066-4AD3-8543-452EFE58BD2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7C26008-6066-4AD3-8543-452EFE58BD2E}.Debug|Win32.Build.0 = Debug|Win32
-		{F7C26008-6066-4AD3-8543-452EFE58BD2E}.Release|Win32.ActiveCfg = Release|Win32
-		{F7C26008-6066-4AD3-8543-452EFE58BD2E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libevent/autogen.sh b/libevent/autogen.sh
deleted file mode 100644
index 6d4275a6392a..000000000000
--- a/libevent/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-LIBTOOLIZE=libtoolize
-SYSNAME=`uname`
-if [ "x$SYSNAME" = "xDarwin" ] ; then
-  LIBTOOLIZE=glibtoolize
-fi
-aclocal && \
-	autoheader && \
-	$LIBTOOLIZE && \
-	autoconf && \
-	automake --add-missing --copy
diff --git a/libevent/buffer.c b/libevent/buffer.c
deleted file mode 100644
index 9cb0f0ce323a..000000000000
--- a/libevent/buffer.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
-#ifdef HAVE_VASPRINTF
-/* If we have vasprintf, we need to define this before we include stdio.h. */
-#define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "event.h"
-#include "config.h"
-#include "evutil.h"
-
-struct evbuffer *
-evbuffer_new(void)
-{
-	struct evbuffer *buffer;
-	
-	buffer = calloc(1, sizeof(struct evbuffer));
-
-	return (buffer);
-}
-
-void
-evbuffer_free(struct evbuffer *buffer)
-{
-	if (buffer->orig_buffer != NULL)
-		free(buffer->orig_buffer);
-	free(buffer);
-}
-
-/* 
- * This is a destructive add.  The data from one buffer moves into
- * the other buffer.
- */
-
-#define SWAP(x,y) do { \
-	(x)->buffer = (y)->buffer; \
-	(x)->orig_buffer = (y)->orig_buffer; \
-	(x)->misalign = (y)->misalign; \
-	(x)->totallen = (y)->totallen; \
-	(x)->off = (y)->off; \
-} while (0)
-
-int
-evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
-{
-	int res;
-
-	/* Short cut for better performance */
-	if (outbuf->off == 0) {
-		struct evbuffer tmp;
-		size_t oldoff = inbuf->off;
-
-		/* Swap them directly */
-		SWAP(&tmp, outbuf);
-		SWAP(outbuf, inbuf);
-		SWAP(inbuf, &tmp);
-
-		/* 
-		 * Optimization comes with a price; we need to notify the
-		 * buffer if necessary of the changes. oldoff is the amount
-		 * of data that we transfered from inbuf to outbuf
-		 */
-		if (inbuf->off != oldoff && inbuf->cb != NULL)
-			(*inbuf->cb)(inbuf, oldoff, inbuf->off, inbuf->cbarg);
-		if (oldoff && outbuf->cb != NULL)
-			(*outbuf->cb)(outbuf, 0, oldoff, outbuf->cbarg);
-		
-		return (0);
-	}
-
-	res = evbuffer_add(outbuf, inbuf->buffer, inbuf->off);
-	if (res == 0) {
-		/* We drain the input buffer on success */
-		evbuffer_drain(inbuf, inbuf->off);
-	}
-
-	return (res);
-}
-
-int
-evbuffer_add_vprintf(struct evbuffer *buf, const char *fmt, va_list ap)
-{
-	char *buffer;
-	size_t space;
-	size_t oldoff = buf->off;
-	int sz;
-	va_list aq;
-
-	/* make sure that at least some space is available */
-	evbuffer_expand(buf, 64);
-	for (;;) {
-		size_t used = buf->misalign + buf->off;
-		buffer = (char *)buf->buffer + buf->off;
-		assert(buf->totallen >= used);
-		space = buf->totallen - used;
-
-#ifndef va_copy
-#define	va_copy(dst, src)	memcpy(&(dst), &(src), sizeof(va_list))
-#endif
-		va_copy(aq, ap);
-
-		sz = evutil_vsnprintf(buffer, space, fmt, aq);
-
-		va_end(aq);
-
-		if (sz < 0)
-			return (-1);
-		if ((size_t)sz < space) {
-			buf->off += sz;
-			if (buf->cb != NULL)
-				(*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-			return (sz);
-		}
-		if (evbuffer_expand(buf, sz + 1) == -1)
-			return (-1);
-
-	}
-	/* NOTREACHED */
-}
-
-int
-evbuffer_add_printf(struct evbuffer *buf, const char *fmt, ...)
-{
-	int res = -1;
-	va_list ap;
-
-	va_start(ap, fmt);
-	res = evbuffer_add_vprintf(buf, fmt, ap);
-	va_end(ap);
-
-	return (res);
-}
-
-/* Reads data from an event buffer and drains the bytes read */
-
-int
-evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen)
-{
-	size_t nread = datlen;
-	if (nread >= buf->off)
-		nread = buf->off;
-
-	memcpy(data, buf->buffer, nread);
-	evbuffer_drain(buf, nread);
-	
-	return (nread);
-}
-
-/*
- * Reads a line terminated by either '\r\n', '\n\r' or '\r' or '\n'.
- * The returned buffer needs to be freed by the called.
- */
-
-char *
-evbuffer_readline(struct evbuffer *buffer)
-{
-	u_char *data = EVBUFFER_DATA(buffer);
-	size_t len = EVBUFFER_LENGTH(buffer);
-	char *line;
-	unsigned int i;
-
-	for (i = 0; i < len; i++) {
-		if (data[i] == '\r' || data[i] == '\n')
-			break;
-	}
-
-	if (i == len)
-		return (NULL);
-
-	if ((line = malloc(i + 1)) == NULL) {
-		fprintf(stderr, "%s: out of memory\n", __func__);
-		evbuffer_drain(buffer, i);
-		return (NULL);
-	}
-
-	memcpy(line, data, i);
-	line[i] = '\0';
-
-	/*
-	 * Some protocols terminate a line with '\r\n', so check for
-	 * that, too.
-	 */
-	if ( i < len - 1 ) {
-		char fch = data[i], sch = data[i+1];
-
-		/* Drain one more character if needed */
-		if ( (sch == '\r' || sch == '\n') && sch != fch )
-			i += 1;
-	}
-
-	evbuffer_drain(buffer, i + 1);
-
-	return (line);
-}
-
-/* Adds data to an event buffer */
-
-static void
-evbuffer_align(struct evbuffer *buf)
-{
-	memmove(buf->orig_buffer, buf->buffer, buf->off);
-	buf->buffer = buf->orig_buffer;
-	buf->misalign = 0;
-}
-
-/* Expands the available space in the event buffer to at least datlen */
-
-int
-evbuffer_expand(struct evbuffer *buf, size_t datlen)
-{
-	size_t need = buf->misalign + buf->off + datlen;
-
-	/* If we can fit all the data, then we don't have to do anything */
-	if (buf->totallen >= need)
-		return (0);
-
-	/*
-	 * If the misalignment fulfills our data needs, we just force an
-	 * alignment to happen.  Afterwards, we have enough space.
-	 */
-	if (buf->misalign >= datlen) {
-		evbuffer_align(buf);
-	} else {
-		void *newbuf;
-		size_t length = buf->totallen;
-
-		if (length < 256)
-			length = 256;
-		while (length < need)
-			length <<= 1;
-
-		if (buf->orig_buffer != buf->buffer)
-			evbuffer_align(buf);
-		if ((newbuf = realloc(buf->buffer, length)) == NULL)
-			return (-1);
-
-		buf->orig_buffer = buf->buffer = newbuf;
-		buf->totallen = length;
-	}
-
-	return (0);
-}
-
-int
-evbuffer_add(struct evbuffer *buf, const void *data, size_t datlen)
-{
-	size_t need = buf->misalign + buf->off + datlen;
-	size_t oldoff = buf->off;
-
-	if (buf->totallen < need) {
-		if (evbuffer_expand(buf, datlen) == -1)
-			return (-1);
-	}
-
-	memcpy(buf->buffer + buf->off, data, datlen);
-	buf->off += datlen;
-
-	if (datlen && buf->cb != NULL)
-		(*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-
-	return (0);
-}
-
-void
-evbuffer_drain(struct evbuffer *buf, size_t len)
-{
-	size_t oldoff = buf->off;
-
-	if (len >= buf->off) {
-		buf->off = 0;
-		buf->buffer = buf->orig_buffer;
-		buf->misalign = 0;
-		goto done;
-	}
-
-	buf->buffer += len;
-	buf->misalign += len;
-
-	buf->off -= len;
-
- done:
-	/* Tell someone about changes in this buffer */
-	if (buf->off != oldoff && buf->cb != NULL)
-		(*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-
-}
-
-/*
- * Reads data from a file descriptor into a buffer.
- */
-
-#define EVBUFFER_MAX_READ	4096
-
-int
-evbuffer_read(struct evbuffer *buf, int fd, int howmuch)
-{
-	u_char *p;
-	size_t oldoff = buf->off;
-	int n = EVBUFFER_MAX_READ;
-
-#if defined(FIONREAD)
-#ifdef WIN32
-	long lng = n;
-	if (ioctlsocket(fd, FIONREAD, &lng) == -1 || (n=lng) == 0) {
-#else
-	if (ioctl(fd, FIONREAD, &n) == -1 || n == 0) {
-#endif
-		n = EVBUFFER_MAX_READ;
-	} else if (n > EVBUFFER_MAX_READ && n > howmuch) {
-		/*
-		 * It's possible that a lot of data is available for
-		 * reading.  We do not want to exhaust resources
-		 * before the reader has a chance to do something
-		 * about it.  If the reader does not tell us how much
-		 * data we should read, we artifically limit it.
-		 */
-		if ((size_t)n > buf->totallen << 2)
-			n = buf->totallen << 2;
-		if (n < EVBUFFER_MAX_READ)
-			n = EVBUFFER_MAX_READ;
-	}
-#endif	
-	if (howmuch < 0 || howmuch > n)
-		howmuch = n;
-
-	/* If we don't have FIONREAD, we might waste some space here */
-	if (evbuffer_expand(buf, howmuch) == -1)
-		return (-1);
-
-	/* We can append new data at this point */
-	p = buf->buffer + buf->off;
-
-#ifndef WIN32
-	n = read(fd, p, howmuch);
-#else
-	n = recv(fd, p, howmuch, 0);
-#endif
-	if (n == -1)
-		return (-1);
-	if (n == 0)
-		return (0);
-
-	buf->off += n;
-
-	/* Tell someone about changes in this buffer */
-	if (buf->off != oldoff && buf->cb != NULL)
-		(*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-
-	return (n);
-}
-
-int
-evbuffer_write(struct evbuffer *buffer, int fd)
-{
-	int n;
-
-#ifndef WIN32
-	n = write(fd, buffer->buffer, buffer->off);
-#else
-	n = send(fd, buffer->buffer, buffer->off, 0);
-#endif
-	if (n == -1)
-		return (-1);
-	if (n == 0)
-		return (0);
-	evbuffer_drain(buffer, n);
-
-	return (n);
-}
-
-u_char *
-evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len)
-{
-	u_char *search = buffer->buffer, *end = search + buffer->off;
-	u_char *p;
-
-	while (search < end &&
-	    (p = memchr(search, *what, end - search)) != NULL) {
-		if (p + len > end)
-			break;
-		if (memcmp(p, what, len) == 0)
-			return (p);
-		search = p + 1;
-	}
-
-	return (NULL);
-}
-
-void evbuffer_setcb(struct evbuffer *buffer,
-    void (*cb)(struct evbuffer *, size_t, size_t, void *),
-    void *cbarg)
-{
-	buffer->cb = cb;
-	buffer->cbarg = cbarg;
-}
diff --git a/libevent/compat/sys/_time.h b/libevent/compat/sys/_time.h
deleted file mode 100644
index 680c4795a9fa..000000000000
--- a/libevent/compat/sys/_time.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*	$OpenBSD: time.h,v 1.11 2000/10/10 13:36:48 itojun Exp $	*/
-/*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)time.h	8.2 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_TIME_H_
-#define _SYS_TIME_H_
-
-#include <sys/types.h>
-
-/*
- * Structure returned by gettimeofday(2) system call,
- * and used in other calls.
- */
-struct timeval {
-	long	tv_sec;		/* seconds */
-	long	tv_usec;	/* and microseconds */
-};
-
-/*
- * Structure defined by POSIX.1b to be like a timeval.
- */
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* and nanoseconds */
-};
-#endif
-
-#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
-	(ts)->tv_sec = (tv)->tv_sec;					\
-	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
-}
-#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
-	(tv)->tv_sec = (ts)->tv_sec;					\
-	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
-}
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-
-/* Operations on timevals. */
-#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)						\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define	timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define	timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-
-/* Operations on timespecs. */
-#define	timespecclear(tsp)		(tsp)->tv_sec = (tsp)->tv_nsec = 0
-#define	timespecisset(tsp)		((tsp)->tv_sec || (tsp)->tv_nsec)
-#define	timespeccmp(tsp, usp, cmp)					\
-	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
-	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
-	    ((tsp)->tv_sec cmp (usp)->tv_sec))
-#define	timespecadd(tsp, usp, vsp)					\
-	do {								\
-		(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec;		\
-		(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec;	\
-		if ((vsp)->tv_nsec >= 1000000000L) {			\
-			(vsp)->tv_sec++;				\
-			(vsp)->tv_nsec -= 1000000000L;			\
-		}							\
-	} while (0)
-#define	timespecsub(tsp, usp, vsp)					\
-	do {								\
-		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
-		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
-		if ((vsp)->tv_nsec < 0) {				\
-			(vsp)->tv_sec--;				\
-			(vsp)->tv_nsec += 1000000000L;			\
-		}							\
-	} while (0)
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting.
- */
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-struct	itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-/*
- * Getkerninfo clock information structure
- */
-struct clockinfo {
-	int	hz;		/* clock frequency */
-	int	tick;		/* micro-seconds per hz tick */
-	int	tickadj;	/* clock skew rate for adjtime() */
-	int	stathz;		/* statistics clock frequency */
-	int	profhz;		/* profiling clock frequency */
-};
-
-#define CLOCK_REALTIME	0
-#define CLOCK_VIRTUAL	1
-#define CLOCK_PROF	2
-
-#define TIMER_RELTIME	0x0	/* relative timer */
-#define TIMER_ABSTIME	0x1	/* absolute timer */
-
-/* --- stuff got cut here - niels --- */
-
-#endif /* !_SYS_TIME_H_ */
diff --git a/libevent/configure.in b/libevent/configure.in
deleted file mode 100644
index bc3eca1f0434..000000000000
--- a/libevent/configure.in
+++ /dev/null
@@ -1,387 +0,0 @@
-dnl configure.in for libevent
-dnl Dug Song <dugsong@monkey.org>
-AC_INIT(event.c)
-
-AM_INIT_AUTOMAKE(libevent,1.4.12-stable)
-AM_CONFIG_HEADER(config.h)
-dnl AM_MAINTAINER_MODE
-
-dnl Initialize prefix.
-if test "$prefix" = "NONE"; then
-   prefix="/usr/local"
-fi
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-AC_PROG_GCC_TRADITIONAL
-if test "$GCC" = yes ; then
-        CFLAGS="$CFLAGS -Wall"
-        # And disable the strict-aliasing optimization, since it breaks
-        # our sockaddr-handling code in strange ways.
-        CFLAGS="$CFLAGS -fno-strict-aliasing"
-fi
-
-AC_ARG_ENABLE(gcc-warnings,
-     AS_HELP_STRING(--enable-gcc-warnings, enable verbose warnings with GCC))
-
-AC_PROG_LIBTOOL
-
-dnl   Uncomment "AC_DISABLE_SHARED" to make shared librraries not get
-dnl   built by default.  You can also turn shared libs on and off from 
-dnl   the command line with --enable-shared and --disable-shared.
-dnl AC_DISABLE_SHARED
-AC_SUBST(LIBTOOL_DEPS)
-
-dnl Checks for libraries.
-AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(resolv, inet_aton)
-AC_CHECK_LIB(rt, clock_gettime)
-AC_CHECK_LIB(nsl, inet_ntoa)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h stdarg.h inttypes.h stdint.h poll.h signal.h unistd.h sys/epoll.h sys/time.h sys/queue.h sys/event.h sys/param.h sys/ioctl.h sys/select.h sys/devpoll.h port.h netinet/in6.h sys/socket.h)
-if test "x$ac_cv_header_sys_queue_h" = "xyes"; then
-	AC_MSG_CHECKING(for TAILQ_FOREACH in sys/queue.h)
-	AC_EGREP_CPP(yes,
-[
-#include <sys/queue.h>
-#ifdef TAILQ_FOREACH
- yes
-#endif
-],	[AC_MSG_RESULT(yes)
-	 AC_DEFINE(HAVE_TAILQFOREACH, 1,
-		[Define if TAILQ_FOREACH is defined in <sys/queue.h>])],
-	AC_MSG_RESULT(no)
-	)
-fi
-
-if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-	AC_MSG_CHECKING(for timeradd in sys/time.h)
-	AC_EGREP_CPP(yes,
-[
-#include <sys/time.h>
-#ifdef timeradd
- yes
-#endif
-],	[ AC_DEFINE(HAVE_TIMERADD, 1,
-		[Define if timeradd is defined in <sys/time.h>])
-	  AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-)
-fi
-
-if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-	AC_MSG_CHECKING(for timercmp in sys/time.h)
-	AC_EGREP_CPP(yes,
-[
-#include <sys/time.h>
-#ifdef timercmp
- yes
-#endif
-],	[ AC_DEFINE(HAVE_TIMERCMP, 1,
-		[Define if timercmp is defined in <sys/time.h>])
-	  AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-)
-fi
-
-if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-	AC_MSG_CHECKING(for timerclear in sys/time.h)
-	AC_EGREP_CPP(yes,
-[
-#include <sys/time.h>
-#ifdef timerclear
- yes
-#endif
-],	[ AC_DEFINE(HAVE_TIMERCLEAR, 1,
-		[Define if timerclear is defined in <sys/time.h>])
-	  AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-)
-fi
-
-if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-	AC_MSG_CHECKING(for timerisset in sys/time.h)
-	AC_EGREP_CPP(yes,
-[
-#include <sys/time.h>
-#ifdef timerisset
- yes
-#endif
-],	[ AC_DEFINE(HAVE_TIMERISSET, 1,
-		[Define if timerisset is defined in <sys/time.h>])
-	  AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-)
-fi
-
-dnl - check if the macro WIN32 is defined on this compiler.
-dnl - (this is how we check for a windows version of GCC)
-AC_MSG_CHECKING(for WIN32)
-AC_TRY_COMPILE(,
-	[
-#ifndef WIN32
-die horribly
-#endif
-	],
-	bwin32=true; AC_MSG_RESULT(yes),
-	bwin32=false; AC_MSG_RESULT(no),
-)
-
-AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_HEADER_TIME
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop signal sigaction strtoll)
-
-AC_CHECK_SIZEOF(long)
-
-if test "x$ac_cv_func_clock_gettime" = "xyes"; then
-   AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
-else
-   AC_DEFINE(DNS_USE_GETTIMEOFDAY_FOR_ID, 1, [Define is no secure id variant is available])
-fi
-
-AC_MSG_CHECKING(for F_SETFD in fcntl.h)
-AC_EGREP_CPP(yes,
-[
-#define _GNU_SOURCE
-#include <fcntl.h>
-#ifdef F_SETFD
-yes
-#endif
-],	[ AC_DEFINE(HAVE_SETFD, 1,
-	      [Define if F_SETFD is defined in <fcntl.h>])
-	  AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))
-
-needsignal=no
-haveselect=no
-AC_CHECK_FUNCS(select, [haveselect=yes], )
-if test "x$haveselect" = "xyes" ; then
-	AC_LIBOBJ(select)
-	needsignal=yes
-fi
-
-havepoll=no
-AC_CHECK_FUNCS(poll, [havepoll=yes], )
-if test "x$havepoll" = "xyes" ; then
-	AC_LIBOBJ(poll)
-	needsignal=yes
-fi
-
-haveepoll=no
-AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
-if test "x$haveepoll" = "xyes" ; then
-	AC_DEFINE(HAVE_EPOLL, 1,
-		[Define if your system supports the epoll system calls])
-	AC_LIBOBJ(epoll)
-	needsignal=yes
-fi
-
-havedevpoll=no
-if test "x$ac_cv_header_sys_devpoll_h" = "xyes"; then
-	AC_DEFINE(HAVE_DEVPOLL, 1,
-		    [Define if /dev/poll is available])
-        AC_LIBOBJ(devpoll)
-fi
-
-havekqueue=no
-if test "x$ac_cv_header_sys_event_h" = "xyes"; then
-	AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
-	if test "x$havekqueue" = "xyes" ; then
-		AC_MSG_CHECKING(for working kqueue)
-		AC_TRY_RUN(
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/event.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-int
-main(int argc, char **argv)
-{
-	int kq;
-	int n;
-	int fd[[2]];
-	struct kevent ev;
-	struct timespec ts;
-	char buf[[8000]];
-
-	if (pipe(fd) == -1)
-		exit(1);
-	if (fcntl(fd[[1]], F_SETFL, O_NONBLOCK) == -1)
-		exit(1);
-
-	while ((n = write(fd[[1]], buf, sizeof(buf))) == sizeof(buf))
-		;
-
-        if ((kq = kqueue()) == -1)
-		exit(1);
-
-	ev.ident = fd[[1]];
-	ev.filter = EVFILT_WRITE;
-	ev.flags = EV_ADD | EV_ENABLE;
-	n = kevent(kq, &ev, 1, NULL, 0, NULL);
-	if (n == -1)
-		exit(1);
-	
-	read(fd[[0]], buf, sizeof(buf));
-
-	ts.tv_sec = 0;
-	ts.tv_nsec = 0;
-	n = kevent(kq, NULL, 0, &ev, 1, &ts);
-	if (n == -1 || n == 0)
-		exit(1);
-
-	exit(0);
-}, [AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_WORKING_KQUEUE, 1,
-		[Define if kqueue works correctly with pipes])
-    AC_LIBOBJ(kqueue)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
-	fi
-fi
-
-haveepollsyscall=no
-if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
-	if test "x$haveepoll" = "xno" ; then
-		AC_MSG_CHECKING(for epoll system call)
-		AC_TRY_RUN(
-#include <stdint.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/epoll.h>
-#include <unistd.h>
-
-int
-epoll_create(int size)
-{
-	return (syscall(__NR_epoll_create, size));
-}
-
-int
-main(int argc, char **argv)
-{
-	int epfd;
-
-	epfd = epoll_create(256);
-	exit (epfd == -1 ? 1 : 0);
-}, [AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_EPOLL, 1,
-	[Define if your system supports the epoll system calls])
-    needsignal=yes
-    AC_LIBOBJ(epoll_sub)
-    AC_LIBOBJ(epoll)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
-	fi
-fi
-
-haveeventports=no
-AC_CHECK_FUNCS(port_create, [haveeventports=yes], )
-if test "x$haveeventports" = "xyes" ; then
-	AC_DEFINE(HAVE_EVENT_PORTS, 1,
-		[Define if your system supports event ports])
-	AC_LIBOBJ(evport)
-	needsignal=yes
-fi
-if test "x$bwin32" = "xtrue"; then
-	needsignal=yes
-fi
-if test "x$bwin32" = "xtrue"; then
-	needsignal=yes
-fi
-if test "x$needsignal" = "xyes" ; then
-	AC_LIBOBJ(signal)
-fi
-
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([uint64_t, uint32_t, uint16_t, uint8_t], , ,
-[#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif])
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_TYPES([struct in6_addr], , ,
-[#ifdef WIN32
-#include <winsock2.h>
-#else
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
-#endif])
-
-AC_MSG_CHECKING([for socklen_t])
-AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>],
-  [socklen_t x;],
-  AC_MSG_RESULT([yes]),
-  [AC_MSG_RESULT([no])
-  AC_DEFINE(socklen_t, unsigned int,
-	[Define to unsigned int if you dont have it])]
-)
-
-AC_MSG_CHECKING([whether our compiler supports __func__])
-AC_TRY_COMPILE([],
- [ const char *cp = __func__; ],
- AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
- AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
- AC_TRY_COMPILE([],
-   [ const char *cp = __FUNCTION__; ],
-   AC_MSG_RESULT([yes])
-   AC_DEFINE(__func__, __FUNCTION__,
-         [Define to appropriate substitue if compiler doesnt have __func__]),
-   AC_MSG_RESULT([no])
-   AC_DEFINE(__func__, __FILE__,
-         [Define to appropriate substitue if compiler doesnt have __func__])))
-
-
-# Add some more warnings which we use in development but not in the
-# released versions.  (Some relevant gcc versions can't handle these.)
-if test x$enable_gcc_warnings = xyes; then
-
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [
-#if !defined(__GNUC__) || (__GNUC__ < 4)
-#error
-#endif]), have_gcc4=yes, have_gcc4=no)
-
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [
-#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
-#error
-#endif]), have_gcc42=yes, have_gcc42=no)
-
-  CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum -Werror"
-  CFLAGS="$CFLAGS -Wno-unused-parameter -Wno-sign-compare -Wstrict-aliasing"
-
-  if test x$have_gcc4 = xyes ; then 
-    # These warnings break gcc 3.3.5 and work on gcc 4.0.2
-    CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement"
-    #CFLAGS="$CFLAGS -Wold-style-definition"
-  fi
-
-  if test x$have_gcc42 = xyes ; then 
-    # These warnings break gcc 4.0.2 and work on gcc 4.2
-    CFLAGS="$CFLAGS -Waddress -Wnormalized=id -Woverride-init"
-  fi
-
-##This will break the world on some 64-bit architectures
-# CFLAGS="$CFLAGS -Winline"
-
-fi
-
-AC_OUTPUT(Makefile test/Makefile sample/Makefile)
diff --git a/libevent/devpoll.c b/libevent/devpoll.c
deleted file mode 100644
index cbd27309079a..000000000000
--- a/libevent/devpoll.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/resource.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#include <sys/queue.h>
-#include <sys/devpoll.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "event.h"
-#include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-
-/* due to limitations in the devpoll interface, we need to keep track of
- * all file descriptors outself.
- */
-struct evdevpoll {
-	struct event *evread;
-	struct event *evwrite;
-};
-
-struct devpollop {
-	struct evdevpoll *fds;
-	int nfds;
-	struct pollfd *events;
-	int nevents;
-	int dpfd;
-	struct pollfd *changes;
-	int nchanges;
-};
-
-static void *devpoll_init	(struct event_base *);
-static int devpoll_add	(void *, struct event *);
-static int devpoll_del	(void *, struct event *);
-static int devpoll_dispatch	(struct event_base *, void *, struct timeval *);
-static void devpoll_dealloc	(struct event_base *, void *);
-
-const struct eventop devpollops = {
-	"devpoll",
-	devpoll_init,
-	devpoll_add,
-	devpoll_del,
-	devpoll_dispatch,
-	devpoll_dealloc,
-	1 /* need reinit */
-};
-
-#define NEVENT	32000
-
-static int
-devpoll_commit(struct devpollop *devpollop)
-{
-	/*
-	 * Due to a bug in Solaris, we have to use pwrite with an offset of 0.
-	 * Write is limited to 2GB of data, until it will fail.
-	 */
-	if (pwrite(devpollop->dpfd, devpollop->changes,
-		sizeof(struct pollfd) * devpollop->nchanges, 0) == -1)
-		return(-1);
-
-	devpollop->nchanges = 0;
-	return(0);
-}
-
-static int
-devpoll_queue(struct devpollop *devpollop, int fd, int events) {
-	struct pollfd *pfd;
-
-	if (devpollop->nchanges >= devpollop->nevents) {
-		/*
-		 * Change buffer is full, must commit it to /dev/poll before 
-		 * adding more 
-		 */
-		if (devpoll_commit(devpollop) != 0)
-			return(-1);
-	}
-
-	pfd = &devpollop->changes[devpollop->nchanges++];
-	pfd->fd = fd;
-	pfd->events = events;
-	pfd->revents = 0;
-
-	return(0);
-}
-
-static void *
-devpoll_init(struct event_base *base)
-{
-	int dpfd, nfiles = NEVENT;
-	struct rlimit rl;
-	struct devpollop *devpollop;
-
-	/* Disable devpoll when this environment variable is set */
-	if (getenv("EVENT_NODEVPOLL"))
-		return (NULL);
-
-	if (!(devpollop = calloc(1, sizeof(struct devpollop))))
-		return (NULL);
-
-	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-	    rl.rlim_cur != RLIM_INFINITY)
-		nfiles = rl.rlim_cur;
-
-	/* Initialize the kernel queue */
-	if ((dpfd = open("/dev/poll", O_RDWR)) == -1) {
-                event_warn("open: /dev/poll");
-		free(devpollop);
-		return (NULL);
-	}
-
-	devpollop->dpfd = dpfd;
-
-	/* Initialize fields */
-	devpollop->events = calloc(nfiles, sizeof(struct pollfd));
-	if (devpollop->events == NULL) {
-		free(devpollop);
-		close(dpfd);
-		return (NULL);
-	}
-	devpollop->nevents = nfiles;
-
-	devpollop->fds = calloc(nfiles, sizeof(struct evdevpoll));
-	if (devpollop->fds == NULL) {
-		free(devpollop->events);
-		free(devpollop);
-		close(dpfd);
-		return (NULL);
-	}
-	devpollop->nfds = nfiles;
-
-	devpollop->changes = calloc(nfiles, sizeof(struct pollfd));
-	if (devpollop->changes == NULL) {
-		free(devpollop->fds);
-		free(devpollop->events);
-		free(devpollop);
-		close(dpfd);
-		return (NULL);
-	}
-
-	evsignal_init(base);
-
-	return (devpollop);
-}
-
-static int
-devpoll_recalc(struct event_base *base, void *arg, int max)
-{
-	struct devpollop *devpollop = arg;
-
-	if (max >= devpollop->nfds) {
-		struct evdevpoll *fds;
-		int nfds;
-
-		nfds = devpollop->nfds;
-		while (nfds <= max)
-			nfds <<= 1;
-
-		fds = realloc(devpollop->fds, nfds * sizeof(struct evdevpoll));
-		if (fds == NULL) {
-			event_warn("realloc");
-			return (-1);
-		}
-		devpollop->fds = fds;
-		memset(fds + devpollop->nfds, 0,
-		    (nfds - devpollop->nfds) * sizeof(struct evdevpoll));
-		devpollop->nfds = nfds;
-	}
-
-	return (0);
-}
-
-static int
-devpoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	struct devpollop *devpollop = arg;
-	struct pollfd *events = devpollop->events;
-	struct dvpoll dvp;
-	struct evdevpoll *evdp;
-	int i, res, timeout = -1;
-
-	if (devpollop->nchanges)
-		devpoll_commit(devpollop);
-
-	if (tv != NULL)
-		timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-
-	dvp.dp_fds = devpollop->events;
-	dvp.dp_nfds = devpollop->nevents;
-	dvp.dp_timeout = timeout;
-
-	res = ioctl(devpollop->dpfd, DP_POLL, &dvp);
-
-	if (res == -1) {
-		if (errno != EINTR) {
-			event_warn("ioctl: DP_POLL");
-			return (-1);
-		}
-
-		evsignal_process(base);
-		return (0);
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-
-	event_debug(("%s: devpoll_wait reports %d", __func__, res));
-
-	for (i = 0; i < res; i++) {
-		int which = 0;
-		int what = events[i].revents;
-		struct event *evread = NULL, *evwrite = NULL;
-
-		assert(events[i].fd < devpollop->nfds);
-		evdp = &devpollop->fds[events[i].fd];
-   
-                if (what & POLLHUP)
-                        what |= POLLIN | POLLOUT;
-                else if (what & POLLERR)
-                        what |= POLLIN | POLLOUT;
-
-		if (what & POLLIN) {
-			evread = evdp->evread;
-			which |= EV_READ;
-		}
-
-		if (what & POLLOUT) {
-			evwrite = evdp->evwrite;
-			which |= EV_WRITE;
-		}
-
-		if (!which)
-			continue;
-
-		if (evread != NULL && !(evread->ev_events & EV_PERSIST))
-			event_del(evread);
-		if (evwrite != NULL && evwrite != evread &&
-		    !(evwrite->ev_events & EV_PERSIST))
-			event_del(evwrite);
-
-		if (evread != NULL)
-			event_active(evread, EV_READ, 1);
-		if (evwrite != NULL)
-			event_active(evwrite, EV_WRITE, 1);
-	}
-
-	return (0);
-}
-
-
-static int
-devpoll_add(void *arg, struct event *ev)
-{
-	struct devpollop *devpollop = arg;
-	struct evdevpoll *evdp;
-	int fd, events;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_add(ev));
-
-	fd = ev->ev_fd;
-	if (fd >= devpollop->nfds) {
-		/* Extend the file descriptor array as necessary */
-		if (devpoll_recalc(ev->ev_base, devpollop, fd) == -1)
-			return (-1);
-	}
-	evdp = &devpollop->fds[fd];
-
-	/* 
-	 * It's not necessary to OR the existing read/write events that we
-	 * are currently interested in with the new event we are adding.
-	 * The /dev/poll driver ORs any new events with the existing events
-	 * that it has cached for the fd.
-	 */
-
-	events = 0;
-	if (ev->ev_events & EV_READ) {
-		if (evdp->evread && evdp->evread != ev) {
-		   /* There is already a different read event registered */
-		   return(-1);
-		}
-		events |= POLLIN;
-	}
-
-	if (ev->ev_events & EV_WRITE) {
-		if (evdp->evwrite && evdp->evwrite != ev) {
-		   /* There is already a different write event registered */
-		   return(-1);
-		}
-		events |= POLLOUT;
-	}
-
-	if (devpoll_queue(devpollop, fd, events) != 0)
-		return(-1);
-
-	/* Update events responsible */
-	if (ev->ev_events & EV_READ)
-		evdp->evread = ev;
-	if (ev->ev_events & EV_WRITE)
-		evdp->evwrite = ev;
-
-	return (0);
-}
-
-static int
-devpoll_del(void *arg, struct event *ev)
-{
-	struct devpollop *devpollop = arg;
-	struct evdevpoll *evdp;
-	int fd, events;
-	int needwritedelete = 1, needreaddelete = 1;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_del(ev));
-
-	fd = ev->ev_fd;
-	if (fd >= devpollop->nfds)
-		return (0);
-	evdp = &devpollop->fds[fd];
-
-	events = 0;
-	if (ev->ev_events & EV_READ)
-		events |= POLLIN;
-	if (ev->ev_events & EV_WRITE)
-		events |= POLLOUT;
-
-	/*
-	 * The only way to remove an fd from the /dev/poll monitored set is
-	 * to use POLLREMOVE by itself.  This removes ALL events for the fd 
-	 * provided so if we care about two events and are only removing one 
-	 * we must re-add the other event after POLLREMOVE.
-	 */
-
-	if (devpoll_queue(devpollop, fd, POLLREMOVE) != 0)
-		return(-1);
-
-	if ((events & (POLLIN|POLLOUT)) != (POLLIN|POLLOUT)) {
-		/*
-		 * We're not deleting all events, so we must resubmit the
-		 * event that we are still interested in if one exists.
-		 */
-
-		if ((events & POLLIN) && evdp->evwrite != NULL) {
-			/* Deleting read, still care about write */
-			devpoll_queue(devpollop, fd, POLLOUT);
-			needwritedelete = 0;
-		} else if ((events & POLLOUT) && evdp->evread != NULL) {
-			/* Deleting write, still care about read */
-			devpoll_queue(devpollop, fd, POLLIN);
-			needreaddelete = 0;
-		}
-	}
-
-	if (needreaddelete)
-		evdp->evread = NULL;
-	if (needwritedelete)
-		evdp->evwrite = NULL;
-
-	return (0);
-}
-
-static void
-devpoll_dealloc(struct event_base *base, void *arg)
-{
-	struct devpollop *devpollop = arg;
-
-	evsignal_dealloc(base);
-	if (devpollop->fds)
-		free(devpollop->fds);
-	if (devpollop->events)
-		free(devpollop->events);
-	if (devpollop->changes)
-		free(devpollop->changes);
-	if (devpollop->dpfd >= 0)
-		close(devpollop->dpfd);
-
-	memset(devpollop, 0, sizeof(struct devpollop));
-	free(devpollop);
-}
diff --git a/libevent/epoll.c b/libevent/epoll.c
deleted file mode 100644
index b479b9c07e9c..000000000000
--- a/libevent/epoll.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/resource.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#include <sys/queue.h>
-#include <sys/epoll.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include "event.h"
-#include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-
-/* due to limitations in the epoll interface, we need to keep track of
- * all file descriptors outself.
- */
-struct evepoll {
-	struct event *evread;
-	struct event *evwrite;
-};
-
-struct epollop {
-	struct evepoll *fds;
-	int nfds;
-	struct epoll_event *events;
-	int nevents;
-	int epfd;
-};
-
-static void *epoll_init	(struct event_base *);
-static int epoll_add	(void *, struct event *);
-static int epoll_del	(void *, struct event *);
-static int epoll_dispatch	(struct event_base *, void *, struct timeval *);
-static void epoll_dealloc	(struct event_base *, void *);
-
-const struct eventop epollops = {
-	"epoll",
-	epoll_init,
-	epoll_add,
-	epoll_del,
-	epoll_dispatch,
-	epoll_dealloc,
-	1 /* need reinit */
-};
-
-#ifdef HAVE_SETFD
-#define FD_CLOSEONEXEC(x) do { \
-        if (fcntl(x, F_SETFD, 1) == -1) \
-                event_warn("fcntl(%d, F_SETFD)", x); \
-} while (0)
-#else
-#define FD_CLOSEONEXEC(x)
-#endif
-
-#define NEVENT	32000
-
-/* On Linux kernels at least up to 2.6.24.4, epoll can't handle timeout
- * values bigger than (LONG_MAX - 999ULL)/HZ.  HZ in the wild can be
- * as big as 1000, and LONG_MAX can be as small as (1<<31)-1, so the
- * largest number of msec we can support here is 2147482.  Let's
- * round that down by 47 seconds.
- */
-#define MAX_EPOLL_TIMEOUT_MSEC (35*60*1000)
-
-static void *
-epoll_init(struct event_base *base)
-{
-	int epfd, nfiles = NEVENT;
-	struct rlimit rl;
-	struct epollop *epollop;
-
-	/* Disable epollueue when this environment variable is set */
-	if (getenv("EVENT_NOEPOLL"))
-		return (NULL);
-
-	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-	    rl.rlim_cur != RLIM_INFINITY) {
-		/*
-		 * Solaris is somewhat retarded - it's important to drop
-		 * backwards compatibility when making changes.  So, don't
-		 * dare to put rl.rlim_cur here.
-		 */
-		nfiles = rl.rlim_cur - 1;
-	}
-
-	/* Initalize the kernel queue */
-
-	if ((epfd = epoll_create(nfiles)) == -1) {
-		if (errno != ENOSYS)
-			event_warn("epoll_create");
-		return (NULL);
-	}
-
-	FD_CLOSEONEXEC(epfd);
-
-	if (!(epollop = calloc(1, sizeof(struct epollop))))
-		return (NULL);
-
-	epollop->epfd = epfd;
-
-	/* Initalize fields */
-	epollop->events = malloc(nfiles * sizeof(struct epoll_event));
-	if (epollop->events == NULL) {
-		free(epollop);
-		return (NULL);
-	}
-	epollop->nevents = nfiles;
-
-	epollop->fds = calloc(nfiles, sizeof(struct evepoll));
-	if (epollop->fds == NULL) {
-		free(epollop->events);
-		free(epollop);
-		return (NULL);
-	}
-	epollop->nfds = nfiles;
-
-	evsignal_init(base);
-
-	return (epollop);
-}
-
-static int
-epoll_recalc(struct event_base *base, void *arg, int max)
-{
-	struct epollop *epollop = arg;
-
-	if (max >= epollop->nfds) {
-		struct evepoll *fds;
-		int nfds;
-
-		nfds = epollop->nfds;
-		while (nfds <= max)
-			nfds <<= 1;
-
-		fds = realloc(epollop->fds, nfds * sizeof(struct evepoll));
-		if (fds == NULL) {
-			event_warn("realloc");
-			return (-1);
-		}
-		epollop->fds = fds;
-		memset(fds + epollop->nfds, 0,
-		    (nfds - epollop->nfds) * sizeof(struct evepoll));
-		epollop->nfds = nfds;
-	}
-
-	return (0);
-}
-
-static int
-epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	struct epollop *epollop = arg;
-	struct epoll_event *events = epollop->events;
-	struct evepoll *evep;
-	int i, res, timeout = -1;
-
-	if (tv != NULL)
-		timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-
-	if (timeout > MAX_EPOLL_TIMEOUT_MSEC) {
-		/* Linux kernels can wait forever if the timeout is too big;
-		 * see comment on MAX_EPOLL_TIMEOUT_MSEC. */
-		timeout = MAX_EPOLL_TIMEOUT_MSEC;
-	}
-
-	res = epoll_wait(epollop->epfd, events, epollop->nevents, timeout);
-
-	if (res == -1) {
-		if (errno != EINTR) {
-			event_warn("epoll_wait");
-			return (-1);
-		}
-
-		evsignal_process(base);
-		return (0);
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-
-	event_debug(("%s: epoll_wait reports %d", __func__, res));
-
-	for (i = 0; i < res; i++) {
-		int what = events[i].events;
-		struct event *evread = NULL, *evwrite = NULL;
-		int fd = events[i].data.fd;
-
-		if (fd < 0 || fd >= epollop->nfds)
-			continue;
-		evep = &epollop->fds[fd];
-
-		if (what & (EPOLLHUP|EPOLLERR)) {
-			evread = evep->evread;
-			evwrite = evep->evwrite;
-		} else {
-			if (what & EPOLLIN) {
-				evread = evep->evread;
-			}
-
-			if (what & EPOLLOUT) {
-				evwrite = evep->evwrite;
-			}
-		}
-
-		if (!(evread||evwrite))
-			continue;
-
-		if (evread != NULL)
-			event_active(evread, EV_READ, 1);
-		if (evwrite != NULL)
-			event_active(evwrite, EV_WRITE, 1);
-	}
-
-	return (0);
-}
-
-
-static int
-epoll_add(void *arg, struct event *ev)
-{
-	struct epollop *epollop = arg;
-	struct epoll_event epev = {0, {0}};
-	struct evepoll *evep;
-	int fd, op, events;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_add(ev));
-
-	fd = ev->ev_fd;
-	if (fd >= epollop->nfds) {
-		/* Extent the file descriptor array as necessary */
-		if (epoll_recalc(ev->ev_base, epollop, fd) == -1)
-			return (-1);
-	}
-	evep = &epollop->fds[fd];
-	op = EPOLL_CTL_ADD;
-	events = 0;
-	if (evep->evread != NULL) {
-		events |= EPOLLIN;
-		op = EPOLL_CTL_MOD;
-	}
-	if (evep->evwrite != NULL) {
-		events |= EPOLLOUT;
-		op = EPOLL_CTL_MOD;
-	}
-
-	if (ev->ev_events & EV_READ)
-		events |= EPOLLIN;
-	if (ev->ev_events & EV_WRITE)
-		events |= EPOLLOUT;
-
-	epev.data.fd = fd;
-	epev.events = events;
-	if (epoll_ctl(epollop->epfd, op, ev->ev_fd, &epev) == -1)
-			return (-1);
-
-	/* Update events responsible */
-	if (ev->ev_events & EV_READ)
-		evep->evread = ev;
-	if (ev->ev_events & EV_WRITE)
-		evep->evwrite = ev;
-
-	return (0);
-}
-
-static int
-epoll_del(void *arg, struct event *ev)
-{
-	struct epollop *epollop = arg;
-	struct epoll_event epev = {0, {0}};
-	struct evepoll *evep;
-	int fd, events, op;
-	int needwritedelete = 1, needreaddelete = 1;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_del(ev));
-
-	fd = ev->ev_fd;
-	if (fd >= epollop->nfds)
-		return (0);
-	evep = &epollop->fds[fd];
-
-	op = EPOLL_CTL_DEL;
-	events = 0;
-
-	if (ev->ev_events & EV_READ)
-		events |= EPOLLIN;
-	if (ev->ev_events & EV_WRITE)
-		events |= EPOLLOUT;
-
-	if ((events & (EPOLLIN|EPOLLOUT)) != (EPOLLIN|EPOLLOUT)) {
-		if ((events & EPOLLIN) && evep->evwrite != NULL) {
-			needwritedelete = 0;
-			events = EPOLLOUT;
-			op = EPOLL_CTL_MOD;
-		} else if ((events & EPOLLOUT) && evep->evread != NULL) {
-			needreaddelete = 0;
-			events = EPOLLIN;
-			op = EPOLL_CTL_MOD;
-		}
-	}
-
-	epev.events = events;
-	epev.data.fd = fd;
-
-	if (needreaddelete)
-		evep->evread = NULL;
-	if (needwritedelete)
-		evep->evwrite = NULL;
-
-	if (epoll_ctl(epollop->epfd, op, fd, &epev) == -1)
-		return (-1);
-
-	return (0);
-}
-
-static void
-epoll_dealloc(struct event_base *base, void *arg)
-{
-	struct epollop *epollop = arg;
-
-	evsignal_dealloc(base);
-	if (epollop->fds)
-		free(epollop->fds);
-	if (epollop->events)
-		free(epollop->events);
-	if (epollop->epfd >= 0)
-		close(epollop->epfd);
-
-	memset(epollop, 0, sizeof(struct epollop));
-	free(epollop);
-}
diff --git a/libevent/evbuffer.c b/libevent/evbuffer.c
deleted file mode 100644
index f2179a5044f4..000000000000
--- a/libevent/evbuffer.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include <sys/types.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
-#include "evutil.h"
-#include "event.h"
-
-/* prototypes */
-
-void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *);
-
-static int
-bufferevent_add(struct event *ev, int timeout)
-{
-	struct timeval tv, *ptv = NULL;
-
-	if (timeout) {
-		evutil_timerclear(&tv);
-		tv.tv_sec = timeout;
-		ptv = &tv;
-	}
-
-	return (event_add(ev, ptv));
-}
-
-/* 
- * This callback is executed when the size of the input buffer changes.
- * We use it to apply back pressure on the reading side.
- */
-
-void
-bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now,
-    void *arg) {
-	struct bufferevent *bufev = arg;
-	/* 
-	 * If we are below the watermark then reschedule reading if it's
-	 * still enabled.
-	 */
-	if (bufev->wm_read.high == 0 || now < bufev->wm_read.high) {
-		evbuffer_setcb(buf, NULL, NULL);
-
-		if (bufev->enabled & EV_READ)
-			bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-	}
-}
-
-static void
-bufferevent_readcb(int fd, short event, void *arg)
-{
-	struct bufferevent *bufev = arg;
-	int res = 0;
-	short what = EVBUFFER_READ;
-	size_t len;
-	int howmuch = -1;
-
-	if (event == EV_TIMEOUT) {
-		what |= EVBUFFER_TIMEOUT;
-		goto error;
-	}
-
-	/*
-	 * If we have a high watermark configured then we don't want to
-	 * read more data than would make us reach the watermark.
-	 */
-	if (bufev->wm_read.high != 0) {
-		howmuch = bufev->wm_read.high - EVBUFFER_LENGTH(bufev->input);
-		/* we might have lowered the watermark, stop reading */
-		if (howmuch <= 0) {
-			struct evbuffer *buf = bufev->input;
-			event_del(&bufev->ev_read);
-			evbuffer_setcb(buf,
-			    bufferevent_read_pressure_cb, bufev);
-			return;
-		}
-	}
-
-	res = evbuffer_read(bufev->input, fd, howmuch);
-	if (res == -1) {
-		if (errno == EAGAIN || errno == EINTR)
-			goto reschedule;
-		/* error case */
-		what |= EVBUFFER_ERROR;
-	} else if (res == 0) {
-		/* eof case */
-		what |= EVBUFFER_EOF;
-	}
-
-	if (res <= 0)
-		goto error;
-
-	bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-
-	/* See if this callbacks meets the water marks */
-	len = EVBUFFER_LENGTH(bufev->input);
-	if (bufev->wm_read.low != 0 && len < bufev->wm_read.low)
-		return;
-	if (bufev->wm_read.high != 0 && len >= bufev->wm_read.high) {
-		struct evbuffer *buf = bufev->input;
-		event_del(&bufev->ev_read);
-
-		/* Now schedule a callback for us when the buffer changes */
-		evbuffer_setcb(buf, bufferevent_read_pressure_cb, bufev);
-	}
-
-	/* Invoke the user callback - must always be called last */
-	if (bufev->readcb != NULL)
-		(*bufev->readcb)(bufev, bufev->cbarg);
-	return;
-
- reschedule:
-	bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-	return;
-
- error:
-	(*bufev->errorcb)(bufev, what, bufev->cbarg);
-}
-
-static void
-bufferevent_writecb(int fd, short event, void *arg)
-{
-	struct bufferevent *bufev = arg;
-	int res = 0;
-	short what = EVBUFFER_WRITE;
-
-	if (event == EV_TIMEOUT) {
-		what |= EVBUFFER_TIMEOUT;
-		goto error;
-	}
-
-	if (EVBUFFER_LENGTH(bufev->output)) {
-	    res = evbuffer_write(bufev->output, fd);
-	    if (res == -1) {
-#ifndef WIN32
-/*todo. evbuffer uses WriteFile when WIN32 is set. WIN32 system calls do not
- *set errno. thus this error checking is not portable*/
-		    if (errno == EAGAIN ||
-			errno == EINTR ||
-			errno == EINPROGRESS)
-			    goto reschedule;
-		    /* error case */
-		    what |= EVBUFFER_ERROR;
-
-#else
-				goto reschedule;
-#endif
-
-	    } else if (res == 0) {
-		    /* eof case */
-		    what |= EVBUFFER_EOF;
-	    }
-	    if (res <= 0)
-		    goto error;
-	}
-
-	if (EVBUFFER_LENGTH(bufev->output) != 0)
-		bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-
-	/*
-	 * Invoke the user callback if our buffer is drained or below the
-	 * low watermark.
-	 */
-	if (bufev->writecb != NULL &&
-	    EVBUFFER_LENGTH(bufev->output) <= bufev->wm_write.low)
-		(*bufev->writecb)(bufev, bufev->cbarg);
-
-	return;
-
- reschedule:
-	if (EVBUFFER_LENGTH(bufev->output) != 0)
-		bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-	return;
-
- error:
-	(*bufev->errorcb)(bufev, what, bufev->cbarg);
-}
-
-/*
- * Create a new buffered event object.
- *
- * The read callback is invoked whenever we read new data.
- * The write callback is invoked whenever the output buffer is drained.
- * The error callback is invoked on a write/read error or on EOF.
- *
- * Both read and write callbacks maybe NULL.  The error callback is not
- * allowed to be NULL and have to be provided always.
- */
-
-struct bufferevent *
-bufferevent_new(int fd, evbuffercb readcb, evbuffercb writecb,
-    everrorcb errorcb, void *cbarg)
-{
-	struct bufferevent *bufev;
-
-	if ((bufev = calloc(1, sizeof(struct bufferevent))) == NULL)
-		return (NULL);
-
-	if ((bufev->input = evbuffer_new()) == NULL) {
-		free(bufev);
-		return (NULL);
-	}
-
-	if ((bufev->output = evbuffer_new()) == NULL) {
-		evbuffer_free(bufev->input);
-		free(bufev);
-		return (NULL);
-	}
-
-	event_set(&bufev->ev_read, fd, EV_READ, bufferevent_readcb, bufev);
-	event_set(&bufev->ev_write, fd, EV_WRITE, bufferevent_writecb, bufev);
-
-	bufferevent_setcb(bufev, readcb, writecb, errorcb, cbarg);
-
-	/*
-	 * Set to EV_WRITE so that using bufferevent_write is going to
-	 * trigger a callback.  Reading needs to be explicitly enabled
-	 * because otherwise no data will be available.
-	 */
-	bufev->enabled = EV_WRITE;
-
-	return (bufev);
-}
-
-void
-bufferevent_setcb(struct bufferevent *bufev,
-    evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg)
-{
-	bufev->readcb = readcb;
-	bufev->writecb = writecb;
-	bufev->errorcb = errorcb;
-
-	bufev->cbarg = cbarg;
-}
-
-void
-bufferevent_setfd(struct bufferevent *bufev, int fd)
-{
-	event_del(&bufev->ev_read);
-	event_del(&bufev->ev_write);
-
-	event_set(&bufev->ev_read, fd, EV_READ, bufferevent_readcb, bufev);
-	event_set(&bufev->ev_write, fd, EV_WRITE, bufferevent_writecb, bufev);
-	if (bufev->ev_base != NULL) {
-		event_base_set(bufev->ev_base, &bufev->ev_read);
-		event_base_set(bufev->ev_base, &bufev->ev_write);
-	}
-
-	/* might have to manually trigger event registration */
-}
-
-int
-bufferevent_priority_set(struct bufferevent *bufev, int priority)
-{
-	if (event_priority_set(&bufev->ev_read, priority) == -1)
-		return (-1);
-	if (event_priority_set(&bufev->ev_write, priority) == -1)
-		return (-1);
-
-	return (0);
-}
-
-/* Closing the file descriptor is the responsibility of the caller */
-
-void
-bufferevent_free(struct bufferevent *bufev)
-{
-	event_del(&bufev->ev_read);
-	event_del(&bufev->ev_write);
-
-	evbuffer_free(bufev->input);
-	evbuffer_free(bufev->output);
-
-	free(bufev);
-}
-
-/*
- * Returns 0 on success;
- *        -1 on failure.
- */
-
-int
-bufferevent_write(struct bufferevent *bufev, const void *data, size_t size)
-{
-	int res;
-
-	res = evbuffer_add(bufev->output, data, size);
-
-	if (res == -1)
-		return (res);
-
-	/* If everything is okay, we need to schedule a write */
-	if (size > 0 && (bufev->enabled & EV_WRITE))
-		bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-
-	return (res);
-}
-
-int
-bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf)
-{
-	int res;
-
-	res = bufferevent_write(bufev, buf->buffer, buf->off);
-	if (res != -1)
-		evbuffer_drain(buf, buf->off);
-
-	return (res);
-}
-
-size_t
-bufferevent_read(struct bufferevent *bufev, void *data, size_t size)
-{
-	struct evbuffer *buf = bufev->input;
-
-	if (buf->off < size)
-		size = buf->off;
-
-	/* Copy the available data to the user buffer */
-	memcpy(data, buf->buffer, size);
-
-	if (size)
-		evbuffer_drain(buf, size);
-
-	return (size);
-}
-
-int
-bufferevent_enable(struct bufferevent *bufev, short event)
-{
-	if (event & EV_READ) {
-		if (bufferevent_add(&bufev->ev_read, bufev->timeout_read) == -1)
-			return (-1);
-	}
-	if (event & EV_WRITE) {
-		if (bufferevent_add(&bufev->ev_write, bufev->timeout_write) == -1)
-			return (-1);
-	}
-
-	bufev->enabled |= event;
-	return (0);
-}
-
-int
-bufferevent_disable(struct bufferevent *bufev, short event)
-{
-	if (event & EV_READ) {
-		if (event_del(&bufev->ev_read) == -1)
-			return (-1);
-	}
-	if (event & EV_WRITE) {
-		if (event_del(&bufev->ev_write) == -1)
-			return (-1);
-	}
-
-	bufev->enabled &= ~event;
-	return (0);
-}
-
-/*
- * Sets the read and write timeout for a buffered event.
- */
-
-void
-bufferevent_settimeout(struct bufferevent *bufev,
-    int timeout_read, int timeout_write) {
-	bufev->timeout_read = timeout_read;
-	bufev->timeout_write = timeout_write;
-
-	if (event_pending(&bufev->ev_read, EV_READ, NULL))
-		bufferevent_add(&bufev->ev_read, timeout_read);
-	if (event_pending(&bufev->ev_write, EV_WRITE, NULL))
-		bufferevent_add(&bufev->ev_write, timeout_write);
-}
-
-/*
- * Sets the water marks
- */
-
-void
-bufferevent_setwatermark(struct bufferevent *bufev, short events,
-    size_t lowmark, size_t highmark)
-{
-	if (events & EV_READ) {
-		bufev->wm_read.low = lowmark;
-		bufev->wm_read.high = highmark;
-	}
-
-	if (events & EV_WRITE) {
-		bufev->wm_write.low = lowmark;
-		bufev->wm_write.high = highmark;
-	}
-
-	/* If the watermarks changed then see if we should call read again */
-	bufferevent_read_pressure_cb(bufev->input,
-	    0, EVBUFFER_LENGTH(bufev->input), bufev);
-}
-
-int
-bufferevent_base_set(struct event_base *base, struct bufferevent *bufev)
-{
-	int res;
-
-	bufev->ev_base = base;
-
-	res = event_base_set(base, &bufev->ev_read);
-	if (res == -1)
-		return (res);
-
-	res = event_base_set(base, &bufev->ev_write);
-	return (res);
-}
diff --git a/libevent/evdns.3 b/libevent/evdns.3
deleted file mode 100644
index 10414fa2efbe..000000000000
--- a/libevent/evdns.3
+++ /dev/null
@@ -1,322 +0,0 @@
-.\"
-.\" Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. 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.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
-.\"
-.Dd October 7, 2006
-.Dt EVDNS 3
-.Os
-.Sh NAME
-.Nm evdns_init
-.Nm evdns_shutdown
-.Nm evdns_err_to_string
-.Nm evdns_nameserver_add
-.Nm evdns_count_nameservers
-.Nm evdns_clear_nameservers_and_suspend
-.Nm evdns_resume
-.Nm evdns_nameserver_ip_add
-.Nm evdns_resolve_ipv4
-.Nm evdns_resolve_reverse
-.Nm evdns_resolv_conf_parse
-.Nm evdns_config_windows_nameservers
-.Nm evdns_search_clear
-.Nm evdns_search_add
-.Nm evdns_search_ndots_set
-.Nm evdns_set_log_fn
-.Nd asynchronous functions for DNS resolution.
-.Sh SYNOPSIS
-.Fd #include <sys/time.h>
-.Fd #include <event.h>
-.Fd #include <evdns.h>
-.Ft int
-.Fn evdns_init
-.Ft void
-.Fn evdns_shutdown "int fail_requests"
-.Ft "const char *"
-.Fn evdns_err_to_string "int err"
-.Ft int
-.Fn evdns_nameserver_add "unsigned long int address"
-.Ft int
-.Fn evdns_count_nameservers
-.Ft int
-.Fn evdns_clear_nameservers_and_suspend
-.Ft int
-.Fn evdns_resume
-.Ft int
-.Fn evdns_nameserver_ip_add(const char *ip_as_string);
-.Ft int
-.Fn evdns_resolve_ipv4 "const char *name" "int flags" "evdns_callback_type callback" "void *ptr"
-.Ft int
-.Fn evdns_resolve_reverse "struct in_addr *in" "int flags" "evdns_callback_type callback" "void *ptr"
-.Ft int
-.Fn evdns_resolv_conf_parse "int flags" "const char *"
-.Ft void
-.Fn evdns_search_clear
-.Ft void
-.Fn evdns_search_add "const char *domain"
-.Ft void
-.Fn evdns_search_ndots_set "const int ndots"
-.Ft void
-.Fn evdns_set_log_fn "evdns_debug_log_fn_type fn"
-.Ft int
-.Fn evdns_config_windows_nameservers
-.Sh DESCRIPTION
-Welcome, gentle reader
-.Pp
-Async DNS lookups are really a whole lot harder than they should be,
-mostly stemming from the fact that the libc resolver has never been
-very good at them. Before you use this library you should see if libc
-can do the job for you with the modern async call getaddrinfo_a
-(see http://www.imperialviolet.org/page25.html#e498). Otherwise,
-please continue.
-.Pp
-This code is based on libevent and you must call event_init before
-any of the APIs in this file. You must also seed the OpenSSL random
-source if you are using OpenSSL for ids (see below).
-.Pp
-This library is designed to be included and shipped with your source
-code. You statically link with it. You should also test for the
-existence of strtok_r and define HAVE_STRTOK_R if you have it.
-.Pp
-The DNS protocol requires a good source of id numbers and these
-numbers should be unpredictable for spoofing reasons. There are
-three methods for generating them here and you must define exactly
-one of them. In increasing order of preference:
-.Pp
-.Bl -tag -width "DNS_USE_GETTIMEOFDAY_FOR_ID" -compact -offset indent
-.It DNS_USE_GETTIMEOFDAY_FOR_ID
-Using the bottom 16 bits of the usec result from gettimeofday. This
-is a pretty poor solution but should work anywhere.
-.It DNS_USE_CPU_CLOCK_FOR_ID
-Using the bottom 16 bits of the nsec result from the CPU's time
-counter. This is better, but may not work everywhere. Requires
-POSIX realtime support and you'll need to link against -lrt on
-glibc systems at least.
-.It DNS_USE_OPENSSL_FOR_ID
-Uses the OpenSSL RAND_bytes call to generate the data. You must
-have seeded the pool before making any calls to this library.
-.El
-.Pp
-The library keeps track of the state of nameservers and will avoid
-them when they go down. Otherwise it will round robin between them.
-.Pp
-Quick start guide:
-  #include "evdns.h"
-  void callback(int result, char type, int count, int ttl,
-	 void *addresses, void *arg);
-  evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
-  evdns_resolve("www.hostname.com", 0, callback, NULL);
-.Pp
-When the lookup is complete the callback function is called. The
-first argument will be one of the DNS_ERR_* defines in evdns.h.
-Hopefully it will be DNS_ERR_NONE, in which case type will be
-DNS_IPv4_A, count will be the number of IP addresses, ttl is the time
-which the data can be cached for (in seconds), addresses will point
-to an array of uint32_t's and arg will be whatever you passed to
-evdns_resolve.
-.Pp
-Searching:
-.Pp
-In order for this library to be a good replacement for glibc's resolver it
-supports searching. This involves setting a list of default domains, in
-which names will be queried for. The number of dots in the query name
-determines the order in which this list is used.
-.Pp
-Searching appears to be a single lookup from the point of view of the API,
-although many DNS queries may be generated from a single call to
-evdns_resolve. Searching can also drastically slow down the resolution
-of names.
-.Pp
-To disable searching:
-.Bl -enum -compact -offset indent
-.It
-Never set it up. If you never call
-.Fn evdns_resolv_conf_parse,
-.Fn evdns_init,
-or
-.Fn evdns_search_add
-then no searching will occur.
-.It
-If you do call
-.Fn evdns_resolv_conf_parse
-then don't pass
-.Va DNS_OPTION_SEARCH
-(or
-.Va DNS_OPTIONS_ALL,
-which implies it).
-.It
-When calling
-.Fn evdns_resolve,
-pass the
-.Va DNS_QUERY_NO_SEARCH
-flag.
-.El
-.Pp
-The order of searches depends on the number of dots in the name. If the
-number is greater than the ndots setting then the names is first tried
-globally. Otherwise each search domain is appended in turn.
-.Pp
-The ndots setting can either be set from a resolv.conf, or by calling
-evdns_search_ndots_set.
-.Pp
-For example, with ndots set to 1 (the default) and a search domain list of
-["myhome.net"]:
- Query: www
- Order: www.myhome.net, www.
-.Pp
- Query: www.abc
- Order: www.abc., www.abc.myhome.net
-.Pp
-.Sh API reference
-.Pp
-.Bl -tag -width 0123456
-.It Ft int Fn evdns_init
-Initializes support for non-blocking name resolution by calling
-.Fn evdns_resolv_conf_parse
-on UNIX and
-.Fn evdns_config_windows_nameservers
-on Windows.
-.It Ft int Fn evdns_nameserver_add "unsigned long int address"
-Add a nameserver. The address should be an IP address in
-network byte order. The type of address is chosen so that
-it matches in_addr.s_addr.
-Returns non-zero on error.
-.It Ft int Fn evdns_nameserver_ip_add "const char *ip_as_string"
-This wraps the above function by parsing a string as an IP
-address and adds it as a nameserver.
-Returns non-zero on error
-.It Ft int Fn evdns_resolve "const char *name" "int flags" "evdns_callback_type callback" "void *ptr"
-Resolve a name. The name parameter should be a DNS name.
-The flags parameter should be 0, or DNS_QUERY_NO_SEARCH
-which disables searching for this query. (see defn of
-searching above).
-.Pp
-The callback argument is a function which is called when
-this query completes and ptr is an argument which is passed
-to that callback function.
-.Pp
-Returns non-zero on error
-.It Ft void Fn evdns_search_clear
-Clears the list of search domains
-.It Ft void Fn evdns_search_add "const char *domain"
-Add a domain to the list of search domains
-.It Ft void Fn evdns_search_ndots_set "int ndots"
-Set the number of dots which, when found in a name, causes
-the first query to be without any search domain.
-.It Ft int Fn evdns_count_nameservers "void"
-Return the number of configured nameservers (not necessarily the
-number of running nameservers).  This is useful for double-checking
-whether our calls to the various nameserver configuration functions
-have been successful.
-.It Ft int Fn evdns_clear_nameservers_and_suspend "void"
-Remove all currently configured nameservers, and suspend all pending
-resolves.  Resolves will not necessarily be re-attempted until
-evdns_resume() is called.
-.It Ft int Fn evdns_resume "void"
-Re-attempt resolves left in limbo after an earlier call to
-evdns_clear_nameservers_and_suspend().
-.It Ft int Fn evdns_config_windows_nameservers "void"
-Attempt to configure a set of nameservers based on platform settings on
-a win32 host.  Preferentially tries to use GetNetworkParams; if that fails,
-looks in the registry.  Returns 0 on success, nonzero on failure.
-.It Ft int Fn evdns_resolv_conf_parse "int flags" "const char *filename"
-Parse a resolv.conf like file from the given filename.
-.Pp
-See the man page for resolv.conf for the format of this file.
-The flags argument determines what information is parsed from
-this file:
-.Bl -tag -width "DNS_OPTION_NAMESERVERS" -offset indent -compact -nested
-.It DNS_OPTION_SEARCH
-domain, search and ndots options
-.It DNS_OPTION_NAMESERVERS
-nameserver lines
-.It DNS_OPTION_MISC
-timeout and attempts options
-.It DNS_OPTIONS_ALL
-all of the above
-.El
-.Pp
-The following directives are not parsed from the file:
-  sortlist, rotate, no-check-names, inet6, debug
-.Pp
-Returns non-zero on error:
-.Bl -tag -width "0" -offset indent -compact -nested
-.It 0
-no errors
-.It 1
-failed to open file
-.It 2
-failed to stat file
-.It 3
-file too large
-.It 4
-out of memory
-.It 5
-short read from file
-.El
-.El
-.Sh Internals:
-Requests are kept in two queues. The first is the inflight queue. In
-this queue requests have an allocated transaction id and nameserver.
-They will soon be transmitted if they haven't already been.
-.Pp
-The second is the waiting queue. The size of the inflight ring is
-limited and all other requests wait in waiting queue for space. This
-bounds the number of concurrent requests so that we don't flood the
-nameserver. Several algorithms require a full walk of the inflight
-queue and so bounding its size keeps thing going nicely under huge
-(many thousands of requests) loads.
-.Pp
-If a nameserver loses too many requests it is considered down and we
-try not to use it. After a while we send a probe to that nameserver
-(a lookup for google.com) and, if it replies, we consider it working
-again. If the nameserver fails a probe we wait longer to try again
-with the next probe.
-.Sh SEE ALSO
-.Xr event 3 ,
-.Xr gethostbyname 3 ,
-.Xr resolv.conf 5
-.Sh HISTORY
-The
-.Nm evdns
-API was developed by Adam Langley on top of the
-.Nm libevent
-API.
-The code was integrate into
-.Nm Tor
-by Nick Mathewson and finally put into
-.Nm libevent
-itself by Niels Provos.
-.Sh AUTHORS
-The
-.Nm evdns
-API and code was written by Adam Langley with significant
-contributions by Nick Mathewson.
-.Sh BUGS
-This documentation is neither complete nor authoritative.
-If you are in doubt about the usage of this API then
-check the source code to find out how it works, write
-up the missing piece of documentation and send it to
-me for inclusion in this man page.
diff --git a/libevent/evdns.c b/libevent/evdns.c
deleted file mode 100644
index e13357f1596a..000000000000
--- a/libevent/evdns.c
+++ /dev/null
@@ -1,3200 +0,0 @@
-/* $Id: evdns.c 6979 2006-08-04 18:31:13Z nickm $ */
-
-/* The original version of this module was written by Adam Langley; for
- * a history of modifications, check out the subversion logs.
- *
- * When editing this module, try to keep it re-mergeable by Adam.  Don't
- * reformat the whitespace, add Tor dependencies, or so on.
- *
- * TODO:
- *   - Support IPv6 and PTR records.
- *   - Replace all externally visible magic numbers with #defined constants.
- *   - Write doccumentation for APIs of all external functions.
- */
-
-/* Async DNS Library
- * Adam Langley <agl@imperialviolet.org>
- * http://www.imperialviolet.org/eventdns.html
- * Public Domain code
- *
- * This software is Public Domain. To view a copy of the public domain dedication,
- * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
- * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
- *
- * I ask and expect, but do not require, that all derivative works contain an
- * attribution similar to:
- * 	Parts developed by Adam Langley <agl@imperialviolet.org>
- *
- * You may wish to replace the word "Parts" with something else depending on
- * the amount of original code.
- *
- * (Derivative works does not include programs which link against, run or include
- * the source verbatim in their source distributions)
- *
- * Version: 0.1b
- */
-
-#include <sys/types.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef DNS_USE_FTIME_FOR_ID
-#include <sys/timeb.h>
-#endif
-
-#ifndef DNS_USE_CPU_CLOCK_FOR_ID
-#ifdef HAVE_GETTIMEOFDAY
-#define DNS_USE_GETTIMEOFDAY_FOR_ID     1
-#endif
-#endif
-
-#ifndef DNS_USE_CPU_CLOCK_FOR_ID
-#ifdef HAVE_GETTIMEOFDAY
-#define DNS_USE_GETTIMEOFDAY_FOR_ID     1
-#endif
-#endif
-
-#ifndef DNS_USE_CPU_CLOCK_FOR_ID
-#ifndef DNS_USE_GETTIMEOFDAY_FOR_ID
-#ifndef DNS_USE_OPENSSL_FOR_ID
-#ifndef DNS_USE_FTIME_FOR_ID
-#error Must configure at least one id generation method.
-#error Please see the documentation.
-#endif
-#endif
-#endif
-#endif
-
-/* #define _POSIX_C_SOURCE 200507 */
-#define _GNU_SOURCE
-
-#ifdef DNS_USE_CPU_CLOCK_FOR_ID
-#ifdef DNS_USE_OPENSSL_FOR_ID
-#error Multiple id options selected
-#endif
-#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-#error Multiple id options selected
-#endif
-#include <time.h>
-#endif
-
-#ifdef DNS_USE_OPENSSL_FOR_ID
-#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-#error Multiple id options selected
-#endif
-#include <openssl/rand.h>
-#endif
-
-#ifndef _FORTIFY_SOURCE
-#define _FORTIFY_SOURCE 3
-#endif
-
-#include <string.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <limits.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "evdns.h"
-#include "evutil.h"
-#include "log.h"
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#include <iphlpapi.h>
-#include <io.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
-#endif
-
-#define EVDNS_LOG_DEBUG 0
-#define EVDNS_LOG_WARN 1
-
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 255
-#endif
-
-#include <stdio.h>
-
-#undef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-
-#ifdef __USE_ISOC99B
-/* libevent doesn't work without this */
-typedef ev_uint8_t u_char;
-typedef unsigned int uint;
-#endif
-#include <event.h>
-
-#define u64 ev_uint64_t
-#define u32 ev_uint32_t
-#define u16 ev_uint16_t
-#define u8  ev_uint8_t
-
-#ifdef WIN32
-#define open _open
-#define read _read
-#define close _close
-#define strdup _strdup
-#endif
-
-#define MAX_ADDRS 32  /* maximum number of addresses from a single packet */
-/* which we bother recording */
-
-#define TYPE_A         EVDNS_TYPE_A
-#define TYPE_CNAME     5
-#define TYPE_PTR       EVDNS_TYPE_PTR
-#define TYPE_AAAA      EVDNS_TYPE_AAAA
-
-#define CLASS_INET     EVDNS_CLASS_INET
-
-struct request {
-	u8 *request;  /* the dns packet data */
-	unsigned int request_len;
-	int reissue_count;
-	int tx_count;  /* the number of times that this packet has been sent */
-	unsigned int request_type; /* TYPE_PTR or TYPE_A */
-	void *user_pointer;  /* the pointer given to us for this request */
-	evdns_callback_type user_callback;
-	struct nameserver *ns;  /* the server which we last sent it */
-
-	/* elements used by the searching code */
-	int search_index;
-	struct search_state *search_state;
-	char *search_origname;  /* needs to be free()ed */
-	int search_flags;
-
-	/* these objects are kept in a circular list */
-	struct request *next, *prev;
-
-	struct event timeout_event;
-
-	u16 trans_id;  /* the transaction id */
-	char request_appended;  /* true if the request pointer is data which follows this struct */
-	char transmit_me;  /* needs to be transmitted */
-};
-
-#ifndef HAVE_STRUCT_IN6_ADDR
-struct in6_addr {
-	u8 s6_addr[16];
-};
-#endif
-
-struct reply {
-	unsigned int type;
-	unsigned int have_answer;
-	union {
-		struct {
-			u32 addrcount;
-			u32 addresses[MAX_ADDRS];
-		} a;
-		struct {
-			u32 addrcount;
-			struct in6_addr addresses[MAX_ADDRS];
-		} aaaa;
-		struct {
-			char name[HOST_NAME_MAX];
-		} ptr;
-	} data;
-};
-
-struct nameserver {
-	int socket;  /* a connected UDP socket */
-	u32 address;
-	u16 port;
-	int failed_times;  /* number of times which we have given this server a chance */
-	int timedout;  /* number of times in a row a request has timed out */
-	struct event event;
-	/* these objects are kept in a circular list */
-	struct nameserver *next, *prev;
-	struct event timeout_event;  /* used to keep the timeout for */
-				     /* when we next probe this server. */
-				     /* Valid if state == 0 */
-	char state;  /* zero if we think that this server is down */
-	char choked;  /* true if we have an EAGAIN from this server's socket */
-	char write_waiting;  /* true if we are waiting for EV_WRITE events */
-};
-
-static struct request *req_head = NULL, *req_waiting_head = NULL;
-static struct nameserver *server_head = NULL;
-
-/* Represents a local port where we're listening for DNS requests. Right now, */
-/* only UDP is supported. */
-struct evdns_server_port {
-	int socket; /* socket we use to read queries and write replies. */
-	int refcnt; /* reference count. */
-	char choked; /* Are we currently blocked from writing? */
-	char closing; /* Are we trying to close this port, pending writes? */
-	evdns_request_callback_fn_type user_callback; /* Fn to handle requests */
-	void *user_data; /* Opaque pointer passed to user_callback */
-	struct event event; /* Read/write event */
-	/* circular list of replies that we want to write. */
-	struct server_request *pending_replies;
-};
-
-/* Represents part of a reply being built.	(That is, a single RR.) */
-struct server_reply_item {
-	struct server_reply_item *next; /* next item in sequence. */
-	char *name; /* name part of the RR */
-	u16 type : 16; /* The RR type */
-	u16 class : 16; /* The RR class (usually CLASS_INET) */
-	u32 ttl; /* The RR TTL */
-	char is_name; /* True iff data is a label */
-	u16 datalen; /* Length of data; -1 if data is a label */
-	void *data; /* The contents of the RR */
-};
-
-/* Represents a request that we've received as a DNS server, and holds */
-/* the components of the reply as we're constructing it. */
-struct server_request {
-	/* Pointers to the next and previous entries on the list of replies */
-	/* that we're waiting to write.	 Only set if we have tried to respond */
-	/* and gotten EAGAIN. */
-	struct server_request *next_pending;
-	struct server_request *prev_pending;
-
-	u16 trans_id; /* Transaction id. */
-	struct evdns_server_port *port; /* Which port received this request on? */
-	struct sockaddr_storage addr; /* Where to send the response */
-	socklen_t addrlen; /* length of addr */
-
-	int n_answer; /* how many answer RRs have been set? */
-	int n_authority; /* how many authority RRs have been set? */
-	int n_additional; /* how many additional RRs have been set? */
-
-	struct server_reply_item *answer; /* linked list of answer RRs */
-	struct server_reply_item *authority; /* linked list of authority RRs */
-	struct server_reply_item *additional; /* linked list of additional RRs */
-
-	/* Constructed response.  Only set once we're ready to send a reply. */
-	/* Once this is set, the RR fields are cleared, and no more should be set. */
-	char *response;
-	size_t response_len;
-
-	/* Caller-visible fields: flags, questions. */
-	struct evdns_server_request base;
-};
-
-/* helper macro */
-#define OFFSET_OF(st, member) ((off_t) (((char*)&((st*)0)->member)-(char*)0))
-
-/* Given a pointer to an evdns_server_request, get the corresponding */
-/* server_request. */
-#define TO_SERVER_REQUEST(base_ptr)										\
-	((struct server_request*)											\
-	 (((char*)(base_ptr) - OFFSET_OF(struct server_request, base))))
-
-/* The number of good nameservers that we have */
-static int global_good_nameservers = 0;
-
-/* inflight requests are contained in the req_head list */
-/* and are actually going out across the network */
-static int global_requests_inflight = 0;
-/* requests which aren't inflight are in the waiting list */
-/* and are counted here */
-static int global_requests_waiting = 0;
-
-static int global_max_requests_inflight = 64;
-
-static struct timeval global_timeout = {5, 0};  /* 5 seconds */
-static int global_max_reissues = 1;  /* a reissue occurs when we get some errors from the server */
-static int global_max_retransmits = 3;  /* number of times we'll retransmit a request which timed out */
-/* number of timeouts in a row before we consider this server to be down */
-static int global_max_nameserver_timeout = 3;
-
-/* These are the timeout values for nameservers. If we find a nameserver is down */
-/* we try to probe it at intervals as given below. Values are in seconds. */
-static const struct timeval global_nameserver_timeouts[] = {{10, 0}, {60, 0}, {300, 0}, {900, 0}, {3600, 0}};
-static const int global_nameserver_timeouts_length = sizeof(global_nameserver_timeouts)/sizeof(struct timeval);
-
-static struct nameserver *nameserver_pick(void);
-static void evdns_request_insert(struct request *req, struct request **head);
-static void nameserver_ready_callback(int fd, short events, void *arg);
-static int evdns_transmit(void);
-static int evdns_request_transmit(struct request *req);
-static void nameserver_send_probe(struct nameserver *const ns);
-static void search_request_finished(struct request *const);
-static int search_try_next(struct request *const req);
-static int search_request_new(int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg);
-static void evdns_requests_pump_waiting_queue(void);
-static u16 transaction_id_pick(void);
-static struct request *request_new(int type, const char *name, int flags, evdns_callback_type callback, void *ptr);
-static void request_submit(struct request *const req);
-
-static int server_request_free(struct server_request *req);
-static void server_request_free_answers(struct server_request *req);
-static void server_port_free(struct evdns_server_port *port);
-static void server_port_ready_callback(int fd, short events, void *arg);
-
-static int strtoint(const char *const str);
-
-#ifdef WIN32
-static int
-last_error(int sock)
-{
-	int optval, optvallen=sizeof(optval);
-	int err = WSAGetLastError();
-	if (err == WSAEWOULDBLOCK && sock >= 0) {
-		if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)&optval,
-			       &optvallen))
-			return err;
-		if (optval)
-			return optval;
-	}
-	return err;
-
-}
-static int
-error_is_eagain(int err)
-{
-	return err == EAGAIN || err == WSAEWOULDBLOCK;
-}
-static int
-inet_aton(const char *c, struct in_addr *addr)
-{
-	ev_uint32_t r;
-	if (strcmp(c, "255.255.255.255") == 0) {
-		addr->s_addr = 0xffffffffu;
-	} else {
-		r = inet_addr(c);
-		if (r == INADDR_NONE)
-			return 0;
-		addr->s_addr = r;
-	}
-	return 1;
-}
-#else
-#define last_error(sock) (errno)
-#define error_is_eagain(err) ((err) == EAGAIN)
-#endif
-#define CLOSE_SOCKET(s) EVUTIL_CLOSESOCKET(s)
-
-#define ISSPACE(c) isspace((int)(unsigned char)(c))
-#define ISDIGIT(c) isdigit((int)(unsigned char)(c))
-
-static const char *
-debug_ntoa(u32 address)
-{
-	static char buf[32];
-	u32 a = ntohl(address);
-	evutil_snprintf(buf, sizeof(buf), "%d.%d.%d.%d",
-                      (int)(u8)((a>>24)&0xff),
-                      (int)(u8)((a>>16)&0xff),
-                      (int)(u8)((a>>8 )&0xff),
-  		      (int)(u8)((a    )&0xff));
-	return buf;
-}
-
-static evdns_debug_log_fn_type evdns_log_fn = NULL;
-
-void
-evdns_set_log_fn(evdns_debug_log_fn_type fn)
-{
-  evdns_log_fn = fn;
-}
-
-#ifdef __GNUC__
-#define EVDNS_LOG_CHECK  __attribute__ ((format(printf, 2, 3)))
-#else
-#define EVDNS_LOG_CHECK
-#endif
-
-static void _evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK;
-static void
-_evdns_log(int warn, const char *fmt, ...)
-{
-  va_list args;
-  static char buf[512];
-  if (!evdns_log_fn)
-    return;
-  va_start(args,fmt);
-  evutil_vsnprintf(buf, sizeof(buf), fmt, args);
-  buf[sizeof(buf)-1] = '\0';
-  evdns_log_fn(warn, buf);
-  va_end(args);
-}
-
-#define log _evdns_log
-
-/* This walks the list of inflight requests to find the */
-/* one with a matching transaction id. Returns NULL on */
-/* failure */
-static struct request *
-request_find_from_trans_id(u16 trans_id) {
-	struct request *req = req_head, *const started_at = req_head;
-
-	if (req) {
-		do {
-			if (req->trans_id == trans_id) return req;
-			req = req->next;
-		} while (req != started_at);
-	}
-
-	return NULL;
-}
-
-/* a libevent callback function which is called when a nameserver */
-/* has gone down and we want to test if it has came back to life yet */
-static void
-nameserver_prod_callback(int fd, short events, void *arg) {
-	struct nameserver *const ns = (struct nameserver *) arg;
-        (void)fd;
-        (void)events;
-
-	nameserver_send_probe(ns);
-}
-
-/* a libevent callback which is called when a nameserver probe (to see if */
-/* it has come back to life) times out. We increment the count of failed_times */
-/* and wait longer to send the next probe packet. */
-static void
-nameserver_probe_failed(struct nameserver *const ns) {
-	const struct timeval * timeout;
-	(void) evtimer_del(&ns->timeout_event);
-	if (ns->state == 1) {
-		/* This can happen if the nameserver acts in a way which makes us mark */
-		/* it as bad and then starts sending good replies. */
-		return;
-	}
-
-	timeout =
-	  &global_nameserver_timeouts[MIN(ns->failed_times,
-					  global_nameserver_timeouts_length - 1)];
-	ns->failed_times++;
-
-	if (evtimer_add(&ns->timeout_event, (struct timeval *) timeout) < 0) {
-          log(EVDNS_LOG_WARN,
-              "Error from libevent when adding timer event for %s",
-              debug_ntoa(ns->address));
-          /* ???? Do more? */
-        }
-}
-
-/* called when a nameserver has been deemed to have failed. For example, too */
-/* many packets have timed out etc */
-static void
-nameserver_failed(struct nameserver *const ns, const char *msg) {
-	struct request *req, *started_at;
-	/* if this nameserver has already been marked as failed */
-	/* then don't do anything */
-	if (!ns->state) return;
-
-	log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s",
-            debug_ntoa(ns->address), msg);
-	global_good_nameservers--;
-	assert(global_good_nameservers >= 0);
-	if (global_good_nameservers == 0) {
-		log(EVDNS_LOG_WARN, "All nameservers have failed");
-	}
-
-	ns->state = 0;
-	ns->failed_times = 1;
-
-	if (evtimer_add(&ns->timeout_event, (struct timeval *) &global_nameserver_timeouts[0]) < 0) {
-		log(EVDNS_LOG_WARN,
-		    "Error from libevent when adding timer event for %s",
-		    debug_ntoa(ns->address));
-		/* ???? Do more? */
-        }
-
-	/* walk the list of inflight requests to see if any can be reassigned to */
-	/* a different server. Requests in the waiting queue don't have a */
-	/* nameserver assigned yet */
-
-	/* if we don't have *any* good nameservers then there's no point */
-	/* trying to reassign requests to one */
-	if (!global_good_nameservers) return;
-
-	req = req_head;
-	started_at = req_head;
-	if (req) {
-		do {
-			if (req->tx_count == 0 && req->ns == ns) {
-				/* still waiting to go out, can be moved */
-				/* to another server */
-				req->ns = nameserver_pick();
-			}
-			req = req->next;
-		} while (req != started_at);
-	}
-}
-
-static void
-nameserver_up(struct nameserver *const ns) {
-	if (ns->state) return;
-	log(EVDNS_LOG_WARN, "Nameserver %s is back up",
-	    debug_ntoa(ns->address));
-	evtimer_del(&ns->timeout_event);
-	ns->state = 1;
-	ns->failed_times = 0;
-	ns->timedout = 0;
-	global_good_nameservers++;
-}
-
-static void
-request_trans_id_set(struct request *const req, const u16 trans_id) {
-	req->trans_id = trans_id;
-	*((u16 *) req->request) = htons(trans_id);
-}
-
-/* Called to remove a request from a list and dealloc it. */
-/* head is a pointer to the head of the list it should be */
-/* removed from or NULL if the request isn't in a list. */
-static void
-request_finished(struct request *const req, struct request **head) {
-	if (head) {
-		if (req->next == req) {
-			/* only item in the list */
-			*head = NULL;
-		} else {
-			req->next->prev = req->prev;
-			req->prev->next = req->next;
-			if (*head == req) *head = req->next;
-		}
-	}
-
-	log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx",
-	    (unsigned long) req);
-	evtimer_del(&req->timeout_event);
-
-	search_request_finished(req);
-	global_requests_inflight--;
-
-	if (!req->request_appended) {
-		/* need to free the request data on it's own */
-		free(req->request);
-	} else {
-		/* the request data is appended onto the header */
-		/* so everything gets free()ed when we: */
-	}
-
-	free(req);
-
-	evdns_requests_pump_waiting_queue();
-}
-
-/* This is called when a server returns a funny error code. */
-/* We try the request again with another server. */
-/* */
-/* return: */
-/*   0 ok */
-/*   1 failed/reissue is pointless */
-static int
-request_reissue(struct request *req) {
-	const struct nameserver *const last_ns = req->ns;
-	/* the last nameserver should have been marked as failing */
-	/* by the caller of this function, therefore pick will try */
-	/* not to return it */
-	req->ns = nameserver_pick();
-	if (req->ns == last_ns) {
-		/* ... but pick did return it */
-		/* not a lot of point in trying again with the */
-		/* same server */
-		return 1;
-	}
-
-	req->reissue_count++;
-	req->tx_count = 0;
-	req->transmit_me = 1;
-
-	return 0;
-}
-
-/* this function looks for space on the inflight queue and promotes */
-/* requests from the waiting queue if it can. */
-static void
-evdns_requests_pump_waiting_queue(void) {
-	while (global_requests_inflight < global_max_requests_inflight &&
-	    global_requests_waiting) {
-		struct request *req;
-		/* move a request from the waiting queue to the inflight queue */
-		assert(req_waiting_head);
-		if (req_waiting_head->next == req_waiting_head) {
-			/* only one item in the queue */
-			req = req_waiting_head;
-			req_waiting_head = NULL;
-		} else {
-			req = req_waiting_head;
-			req->next->prev = req->prev;
-			req->prev->next = req->next;
-			req_waiting_head = req->next;
-		}
-
-		global_requests_waiting--;
-		global_requests_inflight++;
-
-		req->ns = nameserver_pick();
-		request_trans_id_set(req, transaction_id_pick());
-
-		evdns_request_insert(req, &req_head);
-		evdns_request_transmit(req);
-		evdns_transmit();
-	}
-}
-
-static void
-reply_callback(struct request *const req, u32 ttl, u32 err, struct reply *reply) {
-	switch (req->request_type) {
-	case TYPE_A:
-		if (reply)
-			req->user_callback(DNS_ERR_NONE, DNS_IPv4_A,
-							   reply->data.a.addrcount, ttl,
-						 reply->data.a.addresses,
-							   req->user_pointer);
-		else
-			req->user_callback(err, 0, 0, 0, NULL, req->user_pointer);
-		return;
-	case TYPE_PTR:
-		if (reply) {
-			char *name = reply->data.ptr.name;
-			req->user_callback(DNS_ERR_NONE, DNS_PTR, 1, ttl,
-							   &name, req->user_pointer);
-		} else {
-			req->user_callback(err, 0, 0, 0, NULL,
-							   req->user_pointer);
-		}
-		return;
-	case TYPE_AAAA:
-		if (reply)
-			req->user_callback(DNS_ERR_NONE, DNS_IPv6_AAAA,
-							   reply->data.aaaa.addrcount, ttl,
-							   reply->data.aaaa.addresses,
-							   req->user_pointer);
-		else
-			req->user_callback(err, 0, 0, 0, NULL, req->user_pointer);
-                return;
-	}
-	assert(0);
-}
-
-/* this processes a parsed reply packet */
-static void
-reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply) {
-	int error;
-	static const int error_codes[] = {
-		DNS_ERR_FORMAT, DNS_ERR_SERVERFAILED, DNS_ERR_NOTEXIST,
-		DNS_ERR_NOTIMPL, DNS_ERR_REFUSED
-	};
-
-	if (flags & 0x020f || !reply || !reply->have_answer) {
-		/* there was an error */
-		if (flags & 0x0200) {
-			error = DNS_ERR_TRUNCATED;
-		} else {
-			u16 error_code = (flags & 0x000f) - 1;
-			if (error_code > 4) {
-				error = DNS_ERR_UNKNOWN;
-			} else {
-				error = error_codes[error_code];
-			}
-		}
-
-		switch(error) {
-		case DNS_ERR_NOTIMPL:
-		case DNS_ERR_REFUSED:
-			/* we regard these errors as marking a bad nameserver */
-			if (req->reissue_count < global_max_reissues) {
-				char msg[64];
-				evutil_snprintf(msg, sizeof(msg),
-				    "Bad response %d (%s)",
-					 error, evdns_err_to_string(error));
-				nameserver_failed(req->ns, msg);
-				if (!request_reissue(req)) return;
-			}
-			break;
-		case DNS_ERR_SERVERFAILED:
-			/* rcode 2 (servfailed) sometimes means "we
-			 * are broken" and sometimes (with some binds)
-			 * means "that request was very confusing."
-			 * Treat this as a timeout, not a failure.
-			 */
-			log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; "
-				"will allow the request to time out.",
-				debug_ntoa(req->ns->address));
-			break;
-		default:
-			/* we got a good reply from the nameserver */
-			nameserver_up(req->ns);
-		}
-
-		if (req->search_state && req->request_type != TYPE_PTR) {
-			/* if we have a list of domains to search in,
-			 * try the next one */
-			if (!search_try_next(req)) {
-				/* a new request was issued so this
-				 * request is finished and */
-				/* the user callback will be made when
-				 * that request (or a */
-				/* child of it) finishes. */
-				request_finished(req, &req_head);
-				return;
-			}
-		}
-
-		/* all else failed. Pass the failure up */
-		reply_callback(req, 0, error, NULL);
-		request_finished(req, &req_head);
-	} else {
-		/* all ok, tell the user */
-		reply_callback(req, ttl, 0, reply);
-		nameserver_up(req->ns);
-		request_finished(req, &req_head);
-	}
-}
-
-static int
-name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
-	int name_end = -1;
-	int j = *idx;
-	int ptr_count = 0;
-#define GET32(x) do { if (j + 4 > length) goto err; memcpy(&_t32, packet + j, 4); j += 4; x = ntohl(_t32); } while(0)
-#define GET16(x) do { if (j + 2 > length) goto err; memcpy(&_t, packet + j, 2); j += 2; x = ntohs(_t); } while(0)
-#define GET8(x) do { if (j >= length) goto err; x = packet[j++]; } while(0)
-
-	char *cp = name_out;
-	const char *const end = name_out + name_out_len;
-
-	/* Normally, names are a series of length prefixed strings terminated */
-	/* with a length of 0 (the lengths are u8's < 63). */
-	/* However, the length can start with a pair of 1 bits and that */
-	/* means that the next 14 bits are a pointer within the current */
-	/* packet. */
-
-	for(;;) {
-		u8 label_len;
-		if (j >= length) return -1;
-		GET8(label_len);
-		if (!label_len) break;
-		if (label_len & 0xc0) {
-			u8 ptr_low;
-			GET8(ptr_low);
-			if (name_end < 0) name_end = j;
-			j = (((int)label_len & 0x3f) << 8) + ptr_low;
-			/* Make sure that the target offset is in-bounds. */
-			if (j < 0 || j >= length) return -1;
-			/* If we've jumped more times than there are characters in the
-			 * message, we must have a loop. */
-			if (++ptr_count > length) return -1;
-			continue;
-		}
-		if (label_len > 63) return -1;
-		if (cp != name_out) {
-			if (cp + 1 >= end) return -1;
-			*cp++ = '.';
-		}
-		if (cp + label_len >= end) return -1;
-		memcpy(cp, packet + j, label_len);
-		cp += label_len;
-		j += label_len;
-	}
-	if (cp >= end) return -1;
-	*cp = '\0';
-	if (name_end < 0)
-		*idx = j;
-	else
-		*idx = name_end;
-	return 0;
- err:
-	return -1;
-}
-
-/* parses a raw request from a nameserver */
-static int
-reply_parse(u8 *packet, int length) {
-	int j = 0, k = 0;  /* index into packet */
-	u16 _t;  /* used by the macros */
-	u32 _t32;  /* used by the macros */
-	char tmp_name[256], cmp_name[256]; /* used by the macros */
-
-	u16 trans_id, questions, answers, authority, additional, datalength;
-        u16 flags = 0;
-	u32 ttl, ttl_r = 0xffffffff;
-	struct reply reply;
-	struct request *req = NULL;
-	unsigned int i;
-
-	GET16(trans_id);
-	GET16(flags);
-	GET16(questions);
-	GET16(answers);
-	GET16(authority);
-	GET16(additional);
-	(void) authority; /* suppress "unused variable" warnings. */
-	(void) additional; /* suppress "unused variable" warnings. */
-
-	req = request_find_from_trans_id(trans_id);
-	if (!req) return -1;
-
-	memset(&reply, 0, sizeof(reply));
-
-	/* If it's not an answer, it doesn't correspond to any request. */
-	if (!(flags & 0x8000)) return -1;  /* must be an answer */
-	if (flags & 0x020f) {
-		/* there was an error */
-		goto err;
-	}
-	/* if (!answers) return; */  /* must have an answer of some form */
-
-	/* This macro skips a name in the DNS reply. */
-#define SKIP_NAME \
-	do { tmp_name[0] = '\0';				\
-		if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0)\
-			goto err;				\
-	} while(0)
-#define TEST_NAME \
-	do { tmp_name[0] = '\0';				\
-		cmp_name[0] = '\0';				\
-		k = j;						\
-		if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0)\
-			goto err;					\
-		if (name_parse(req->request, req->request_len, &k, cmp_name, sizeof(cmp_name))<0)	\
-			goto err;				\
-		if (memcmp(tmp_name, cmp_name, strlen (tmp_name)) != 0)	\
-			return (-1); /* we ignore mismatching names */	\
-	} while(0)
-
-	reply.type = req->request_type;
-
-	/* skip over each question in the reply */
-	for (i = 0; i < questions; ++i) {
-		/* the question looks like
-		 *   <label:name><u16:type><u16:class>
-		 */
-		TEST_NAME;
-		j += 4;
-		if (j > length) goto err;
-	}
-
-	/* now we have the answer section which looks like
-	 * <label:name><u16:type><u16:class><u32:ttl><u16:len><data...>
-	 */
-
-	for (i = 0; i < answers; ++i) {
-		u16 type, class;
-
-		SKIP_NAME;
-		GET16(type);
-		GET16(class);
-		GET32(ttl);
-		GET16(datalength);
-
-		if (type == TYPE_A && class == CLASS_INET) {
-			int addrcount, addrtocopy;
-			if (req->request_type != TYPE_A) {
-				j += datalength; continue;
-			}
-			if ((datalength & 3) != 0) /* not an even number of As. */
-			    goto err;
-			addrcount = datalength >> 2;
-			addrtocopy = MIN(MAX_ADDRS - reply.data.a.addrcount, (unsigned)addrcount);
-
-			ttl_r = MIN(ttl_r, ttl);
-			/* we only bother with the first four addresses. */
-			if (j + 4*addrtocopy > length) goto err;
-			memcpy(&reply.data.a.addresses[reply.data.a.addrcount],
-				   packet + j, 4*addrtocopy);
-			j += 4*addrtocopy;
-			reply.data.a.addrcount += addrtocopy;
-			reply.have_answer = 1;
-			if (reply.data.a.addrcount == MAX_ADDRS) break;
-		} else if (type == TYPE_PTR && class == CLASS_INET) {
-			if (req->request_type != TYPE_PTR) {
-				j += datalength; continue;
-			}
-			if (name_parse(packet, length, &j, reply.data.ptr.name,
-						   sizeof(reply.data.ptr.name))<0)
-				goto err;
-			ttl_r = MIN(ttl_r, ttl);
-			reply.have_answer = 1;
-			break;
-		} else if (type == TYPE_AAAA && class == CLASS_INET) {
-			int addrcount, addrtocopy;
-			if (req->request_type != TYPE_AAAA) {
-				j += datalength; continue;
-			}
-			if ((datalength & 15) != 0) /* not an even number of AAAAs. */
-				goto err;
-			addrcount = datalength >> 4;  /* each address is 16 bytes long */
-			addrtocopy = MIN(MAX_ADDRS - reply.data.aaaa.addrcount, (unsigned)addrcount);
-			ttl_r = MIN(ttl_r, ttl);
-
-			/* we only bother with the first four addresses. */
-			if (j + 16*addrtocopy > length) goto err;
-			memcpy(&reply.data.aaaa.addresses[reply.data.aaaa.addrcount],
-				   packet + j, 16*addrtocopy);
-			reply.data.aaaa.addrcount += addrtocopy;
-			j += 16*addrtocopy;
-			reply.have_answer = 1;
-			if (reply.data.aaaa.addrcount == MAX_ADDRS) break;
-		} else {
-			/* skip over any other type of resource */
-			j += datalength;
-		}
-	}
-
-	reply_handle(req, flags, ttl_r, &reply);
-	return 0;
- err:
-	if (req)
-		reply_handle(req, flags, 0, NULL);
-	return -1;
-}
-
-/* Parse a raw request (packet,length) sent to a nameserver port (port) from */
-/* a DNS client (addr,addrlen), and if it's well-formed, call the corresponding */
-/* callback. */
-static int
-request_parse(u8 *packet, int length, struct evdns_server_port *port, struct sockaddr *addr, socklen_t addrlen)
-{
-	int j = 0;	/* index into packet */
-	u16 _t;	 /* used by the macros */
-	char tmp_name[256]; /* used by the macros */
-
-	int i;
-	u16 trans_id, flags, questions, answers, authority, additional;
-	struct server_request *server_req = NULL;
-
-	/* Get the header fields */
-	GET16(trans_id);
-	GET16(flags);
-	GET16(questions);
-	GET16(answers);
-	GET16(authority);
-	GET16(additional);
-
-	if (flags & 0x8000) return -1; /* Must not be an answer. */
-	flags &= 0x0110; /* Only RD and CD get preserved. */
-
-	server_req = malloc(sizeof(struct server_request));
-	if (server_req == NULL) return -1;
-	memset(server_req, 0, sizeof(struct server_request));
-
-	server_req->trans_id = trans_id;
-	memcpy(&server_req->addr, addr, addrlen);
-	server_req->addrlen = addrlen;
-
-	server_req->base.flags = flags;
-	server_req->base.nquestions = 0;
-	server_req->base.questions = malloc(sizeof(struct evdns_server_question *) * questions);
-	if (server_req->base.questions == NULL)
-		goto err;
-
-	for (i = 0; i < questions; ++i) {
-		u16 type, class;
-		struct evdns_server_question *q;
-		int namelen;
-		if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0)
-			goto err;
-		GET16(type);
-		GET16(class);
-		namelen = strlen(tmp_name);
-		q = malloc(sizeof(struct evdns_server_question) + namelen);
-		if (!q)
-			goto err;
-		q->type = type;
-		q->dns_question_class = class;
-		memcpy(q->name, tmp_name, namelen+1);
-		server_req->base.questions[server_req->base.nquestions++] = q;
-	}
-
-	/* Ignore answers, authority, and additional. */
-
-	server_req->port = port;
-	port->refcnt++;
-
-	/* Only standard queries are supported. */
-	if (flags & 0x7800) {
-		evdns_server_request_respond(&(server_req->base), DNS_ERR_NOTIMPL);
-		return -1;
-	}
-
-	port->user_callback(&(server_req->base), port->user_data);
-
-	return 0;
-err:
-	if (server_req) {
-		if (server_req->base.questions) {
-			for (i = 0; i < server_req->base.nquestions; ++i)
-				free(server_req->base.questions[i]);
-			free(server_req->base.questions);
-		}
-		free(server_req);
-	}
-	return -1;
-
-#undef SKIP_NAME
-#undef GET32
-#undef GET16
-#undef GET8
-}
-
-static u16
-default_transaction_id_fn(void)
-{
-	u16 trans_id;
-#ifdef DNS_USE_CPU_CLOCK_FOR_ID
-	struct timespec ts;
-	static int clkid = -1;
-	if (clkid == -1) {
-		clkid = CLOCK_REALTIME;
-#ifdef CLOCK_MONOTONIC
-		if (clock_gettime(CLOCK_MONOTONIC, &ts) != -1)
-			clkid = CLOCK_MONOTONIC;
-#endif
-	}
-	if (clock_gettime(clkid, &ts) == -1)
-		event_err(1, "clock_gettime");
-	trans_id = ts.tv_nsec & 0xffff;
-#endif
-
-#ifdef DNS_USE_FTIME_FOR_ID
-	struct _timeb tb;
-	_ftime(&tb);
-	trans_id = tb.millitm & 0xffff;
-#endif
-
-#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-	struct timeval tv;
-	evutil_gettimeofday(&tv, NULL);
-	trans_id = tv.tv_usec & 0xffff;
-#endif
-
-#ifdef DNS_USE_OPENSSL_FOR_ID
-	if (RAND_pseudo_bytes((u8 *) &trans_id, 2) == -1) {
-		/* in the case that the RAND call fails we back */
-		/* down to using gettimeofday. */
-		/*
-		  struct timeval tv;
-		  evutil_gettimeofday(&tv, NULL);
-		  trans_id = tv.tv_usec & 0xffff;
-		*/
-		abort();
-	}
-#endif
-	return trans_id;
-}
-
-static ev_uint16_t (*trans_id_function)(void) = default_transaction_id_fn;
-
-void
-evdns_set_transaction_id_fn(ev_uint16_t (*fn)(void))
-{
-	if (fn)
-		trans_id_function = fn;
-	else
-		trans_id_function = default_transaction_id_fn;
-}
-
-/* Try to choose a strong transaction id which isn't already in flight */
-static u16
-transaction_id_pick(void) {
-	for (;;) {
-		const struct request *req = req_head, *started_at;
-		u16 trans_id = trans_id_function();
-
-		if (trans_id == 0xffff) continue;
-		/* now check to see if that id is already inflight */
-		req = started_at = req_head;
-		if (req) {
-			do {
-				if (req->trans_id == trans_id) break;
-				req = req->next;
-			} while (req != started_at);
-		}
-		/* we didn't find it, so this is a good id */
-		if (req == started_at) return trans_id;
-	}
-}
-
-/* choose a namesever to use. This function will try to ignore */
-/* nameservers which we think are down and load balance across the rest */
-/* by updating the server_head global each time. */
-static struct nameserver *
-nameserver_pick(void) {
-	struct nameserver *started_at = server_head, *picked;
-	if (!server_head) return NULL;
-
-	/* if we don't have any good nameservers then there's no */
-	/* point in trying to find one. */
-	if (!global_good_nameservers) {
-		server_head = server_head->next;
-		return server_head;
-	}
-
-	/* remember that nameservers are in a circular list */
-	for (;;) {
-		if (server_head->state) {
-			/* we think this server is currently good */
-			picked = server_head;
-			server_head = server_head->next;
-			return picked;
-		}
-
-		server_head = server_head->next;
-		if (server_head == started_at) {
-			/* all the nameservers seem to be down */
-			/* so we just return this one and hope for the */
-			/* best */
-			assert(global_good_nameservers == 0);
-			picked = server_head;
-			server_head = server_head->next;
-			return picked;
-		}
-	}
-}
-
-static int
-address_is_correct(struct nameserver *ns, struct sockaddr *sa, socklen_t slen)
-{
-	struct sockaddr_in *sin = (struct sockaddr_in*) sa;
-	if (sa->sa_family != AF_INET || slen != sizeof(struct sockaddr_in))
-		return 0;
-	if (sin->sin_addr.s_addr != ns->address)
-		return 0;
-	return 1;
-}
-
-/* this is called when a namesever socket is ready for reading */
-static void
-nameserver_read(struct nameserver *ns) {
-	u8 packet[1500];
-	struct sockaddr_storage ss;
-	socklen_t addrlen = sizeof(ss);
-
-	for (;;) {
-          	const int r = recvfrom(ns->socket, packet, sizeof(packet), 0,
-		    (struct sockaddr*)&ss, &addrlen);
-		if (r < 0) {
-			int err = last_error(ns->socket);
-			if (error_is_eagain(err)) return;
-			nameserver_failed(ns, strerror(err));
-			return;
-		}
-		if (!address_is_correct(ns, (struct sockaddr*)&ss, addrlen)) {
-			log(EVDNS_LOG_WARN, "Address mismatch on received "
-			    "DNS packet.");
-			return;
-		}
-		ns->timedout = 0;
-		reply_parse(packet, r);
-	}
-}
-
-/* Read a packet from a DNS client on a server port s, parse it, and */
-/* act accordingly. */
-static void
-server_port_read(struct evdns_server_port *s) {
-	u8 packet[1500];
-	struct sockaddr_storage addr;
-	socklen_t addrlen;
-	int r;
-
-	for (;;) {
-		addrlen = sizeof(struct sockaddr_storage);
-		r = recvfrom(s->socket, packet, sizeof(packet), 0,
-					 (struct sockaddr*) &addr, &addrlen);
-		if (r < 0) {
-			int err = last_error(s->socket);
-			if (error_is_eagain(err)) return;
-			log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.",
-				strerror(err), err);
-			return;
-		}
-		request_parse(packet, r, s, (struct sockaddr*) &addr, addrlen);
-	}
-}
-
-/* Try to write all pending replies on a given DNS server port. */
-static void
-server_port_flush(struct evdns_server_port *port)
-{
-	while (port->pending_replies) {
-		struct server_request *req = port->pending_replies;
-		int r = sendto(port->socket, req->response, req->response_len, 0,
-			   (struct sockaddr*) &req->addr, req->addrlen);
-		if (r < 0) {
-			int err = last_error(port->socket);
-			if (error_is_eagain(err))
-				return;
-			log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", strerror(err), err);
-		}
-		if (server_request_free(req)) {
-			/* we released the last reference to req->port. */
-			return;
-		}
-	}
-
-	/* We have no more pending requests; stop listening for 'writeable' events. */
-	(void) event_del(&port->event);
-	event_set(&port->event, port->socket, EV_READ | EV_PERSIST,
-			  server_port_ready_callback, port);
-	if (event_add(&port->event, NULL) < 0) {
-		log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server.");
-		/* ???? Do more? */
-	}
-}
-
-/* set if we are waiting for the ability to write to this server. */
-/* if waiting is true then we ask libevent for EV_WRITE events, otherwise */
-/* we stop these events. */
-static void
-nameserver_write_waiting(struct nameserver *ns, char waiting) {
-	if (ns->write_waiting == waiting) return;
-
-	ns->write_waiting = waiting;
-	(void) event_del(&ns->event);
-	event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST,
-			nameserver_ready_callback, ns);
-	if (event_add(&ns->event, NULL) < 0) {
-          log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s",
-              debug_ntoa(ns->address));
-          /* ???? Do more? */
-        }
-}
-
-/* a callback function. Called by libevent when the kernel says that */
-/* a nameserver socket is ready for writing or reading */
-static void
-nameserver_ready_callback(int fd, short events, void *arg) {
-	struct nameserver *ns = (struct nameserver *) arg;
-        (void)fd;
-
-	if (events & EV_WRITE) {
-		ns->choked = 0;
-		if (!evdns_transmit()) {
-			nameserver_write_waiting(ns, 0);
-		}
-	}
-	if (events & EV_READ) {
-		nameserver_read(ns);
-	}
-}
-
-/* a callback function. Called by libevent when the kernel says that */
-/* a server socket is ready for writing or reading. */
-static void
-server_port_ready_callback(int fd, short events, void *arg) {
-	struct evdns_server_port *port = (struct evdns_server_port *) arg;
-	(void) fd;
-
-	if (events & EV_WRITE) {
-		port->choked = 0;
-		server_port_flush(port);
-	}
-	if (events & EV_READ) {
-		server_port_read(port);
-	}
-}
-
-/* This is an inefficient representation; only use it via the dnslabel_table_*
- * functions, so that is can be safely replaced with something smarter later. */
-#define MAX_LABELS 128
-/* Structures used to implement name compression */
-struct dnslabel_entry { char *v; off_t pos; };
-struct dnslabel_table {
-	int n_labels; /* number of current entries */
-	/* map from name to position in message */
-	struct dnslabel_entry labels[MAX_LABELS];
-};
-
-/* Initialize dnslabel_table. */
-static void
-dnslabel_table_init(struct dnslabel_table *table)
-{
-	table->n_labels = 0;
-}
-
-/* Free all storage held by table, but not the table itself. */
-static void
-dnslabel_clear(struct dnslabel_table *table)
-{
-	int i;
-	for (i = 0; i < table->n_labels; ++i)
-		free(table->labels[i].v);
-	table->n_labels = 0;
-}
-
-/* return the position of the label in the current message, or -1 if the label */
-/* hasn't been used yet. */
-static int
-dnslabel_table_get_pos(const struct dnslabel_table *table, const char *label)
-{
-	int i;
-	for (i = 0; i < table->n_labels; ++i) {
-		if (!strcmp(label, table->labels[i].v))
-			return table->labels[i].pos;
-	}
-	return -1;
-}
-
-/* remember that we've used the label at position pos */
-static int
-dnslabel_table_add(struct dnslabel_table *table, const char *label, off_t pos)
-{
-	char *v;
-	int p;
-	if (table->n_labels == MAX_LABELS)
-		return (-1);
-	v = strdup(label);
-	if (v == NULL)
-		return (-1);
-	p = table->n_labels++;
-	table->labels[p].v = v;
-	table->labels[p].pos = pos;
-
-	return (0);
-}
-
-/* Converts a string to a length-prefixed set of DNS labels, starting */
-/* at buf[j]. name and buf must not overlap. name_len should be the length */
-/* of name.	 table is optional, and is used for compression. */
-/* */
-/* Input: abc.def */
-/* Output: <3>abc<3>def<0> */
-/* */
-/* Returns the first index after the encoded name, or negative on error. */
-/*	 -1	 label was > 63 bytes */
-/*	 -2	 name too long to fit in buffer. */
-/* */
-static off_t
-dnsname_to_labels(u8 *const buf, size_t buf_len, off_t j,
-				  const char *name, const int name_len,
-				  struct dnslabel_table *table) {
-	const char *end = name + name_len;
-	int ref = 0;
-	u16 _t;
-
-#define APPEND16(x) do {						   \
-		if (j + 2 > (off_t)buf_len)				   \
-			goto overflow;						   \
-		_t = htons(x);							   \
-		memcpy(buf + j, &_t, 2);				   \
-		j += 2;									   \
-	} while (0)
-#define APPEND32(x) do {						   \
-		if (j + 4 > (off_t)buf_len)				   \
-			goto overflow;						   \
-		_t32 = htonl(x);						   \
-		memcpy(buf + j, &_t32, 4);				   \
-		j += 4;									   \
-	} while (0)
-
-	if (name_len > 255) return -2;
-
-	for (;;) {
-		const char *const start = name;
-		if (table && (ref = dnslabel_table_get_pos(table, name)) >= 0) {
-			APPEND16(ref | 0xc000);
-			return j;
-		}
-		name = strchr(name, '.');
-		if (!name) {
-			const unsigned int label_len = end - start;
-			if (label_len > 63) return -1;
-			if ((size_t)(j+label_len+1) > buf_len) return -2;
-			if (table) dnslabel_table_add(table, start, j);
-			buf[j++] = label_len;
-
-			memcpy(buf + j, start, end - start);
-			j += end - start;
-			break;
-		} else {
-			/* append length of the label. */
-			const unsigned int label_len = name - start;
-			if (label_len > 63) return -1;
-			if ((size_t)(j+label_len+1) > buf_len) return -2;
-			if (table) dnslabel_table_add(table, start, j);
-			buf[j++] = label_len;
-
-			memcpy(buf + j, start, name - start);
-			j += name - start;
-			/* hop over the '.' */
-			name++;
-		}
-	}
-
-	/* the labels must be terminated by a 0. */
-	/* It's possible that the name ended in a . */
-	/* in which case the zero is already there */
-	if (!j || buf[j-1]) buf[j++] = 0;
-	return j;
- overflow:
-	return (-2);
-}
-
-/* Finds the length of a dns request for a DNS name of the given */
-/* length. The actual request may be smaller than the value returned */
-/* here */
-static int
-evdns_request_len(const int name_len) {
-	return 96 + /* length of the DNS standard header */
-		name_len + 2 +
-		4;  /* space for the resource type */
-}
-
-/* build a dns request packet into buf. buf should be at least as long */
-/* as evdns_request_len told you it should be. */
-/* */
-/* Returns the amount of space used. Negative on error. */
-static int
-evdns_request_data_build(const char *const name, const int name_len,
-    const u16 trans_id, const u16 type, const u16 class,
-    u8 *const buf, size_t buf_len) {
-	off_t j = 0;  /* current offset into buf */
-	u16 _t;  /* used by the macros */
-
-	APPEND16(trans_id);
-	APPEND16(0x0100);  /* standard query, recusion needed */
-	APPEND16(1);  /* one question */
-	APPEND16(0);  /* no answers */
-	APPEND16(0);  /* no authority */
-	APPEND16(0);  /* no additional */
-
-	j = dnsname_to_labels(buf, buf_len, j, name, name_len, NULL);
-	if (j < 0) {
-		return (int)j;
-	}
-	
-	APPEND16(type);
-	APPEND16(class);
-
-	return (int)j;
- overflow:
-	return (-1);
-}
-
-/* exported function */
-struct evdns_server_port *
-evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data)
-{
-	struct evdns_server_port *port;
-	if (!(port = malloc(sizeof(struct evdns_server_port))))
-		return NULL;
-	memset(port, 0, sizeof(struct evdns_server_port));
-
-	assert(!is_tcp); /* TCP sockets not yet implemented */
-	port->socket = socket;
-	port->refcnt = 1;
-	port->choked = 0;
-	port->closing = 0;
-	port->user_callback = cb;
-	port->user_data = user_data;
-	port->pending_replies = NULL;
-
-	event_set(&port->event, port->socket, EV_READ | EV_PERSIST,
-			  server_port_ready_callback, port);
-	event_add(&port->event, NULL); /* check return. */
-	return port;
-}
-
-/* exported function */
-void
-evdns_close_server_port(struct evdns_server_port *port)
-{
-	if (--port->refcnt == 0)
-		server_port_free(port);
-	port->closing = 1;
-}
-
-/* exported function */
-int
-evdns_server_request_add_reply(struct evdns_server_request *_req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data)
-{
-	struct server_request *req = TO_SERVER_REQUEST(_req);
-	struct server_reply_item **itemp, *item;
-	int *countp;
-
-	if (req->response) /* have we already answered? */
-		return (-1);
-
-	switch (section) {
-	case EVDNS_ANSWER_SECTION:
-		itemp = &req->answer;
-		countp = &req->n_answer;
-		break;
-	case EVDNS_AUTHORITY_SECTION:
-		itemp = &req->authority;
-		countp = &req->n_authority;
-		break;
-	case EVDNS_ADDITIONAL_SECTION:
-		itemp = &req->additional;
-		countp = &req->n_additional;
-		break;
-	default:
-		return (-1);
-	}
-	while (*itemp) {
-		itemp = &((*itemp)->next);
-	}
-	item = malloc(sizeof(struct server_reply_item));
-	if (!item)
-		return -1;
-	item->next = NULL;
-	if (!(item->name = strdup(name))) {
-		free(item);
-		return -1;
-	}
-	item->type = type;
-	item->dns_question_class = class;
-	item->ttl = ttl;
-	item->is_name = is_name != 0;
-	item->datalen = 0;
-	item->data = NULL;
-	if (data) {
-		if (item->is_name) {
-			if (!(item->data = strdup(data))) {
-				free(item->name);
-				free(item);
-				return -1;
-			}
-			item->datalen = (u16)-1;
-		} else {
-			if (!(item->data = malloc(datalen))) {
-				free(item->name);
-				free(item);
-				return -1;
-			}
-			item->datalen = datalen;
-			memcpy(item->data, data, datalen);
-		}
-	}
-
-	*itemp = item;
-	++(*countp);
-	return 0;
-}
-
-/* exported function */
-int
-evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl)
-{
-	return evdns_server_request_add_reply(
-		  req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET,
-		  ttl, n*4, 0, addrs);
-}
-
-/* exported function */
-int
-evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl)
-{
-	return evdns_server_request_add_reply(
-		  req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET,
-		  ttl, n*16, 0, addrs);
-}
-
-/* exported function */
-int
-evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl)
-{
-	u32 a;
-	char buf[32];
-	assert(in || inaddr_name);
-	assert(!(in && inaddr_name));
-	if (in) {
-		a = ntohl(in->s_addr);
-		evutil_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
-				(int)(u8)((a	)&0xff),
-				(int)(u8)((a>>8 )&0xff),
-				(int)(u8)((a>>16)&0xff),
-				(int)(u8)((a>>24)&0xff));
-		inaddr_name = buf;
-	}
-	return evdns_server_request_add_reply(
-		  req, EVDNS_ANSWER_SECTION, inaddr_name, TYPE_PTR, CLASS_INET,
-		  ttl, -1, 1, hostname);
-}
-
-/* exported function */
-int
-evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl)
-{
-	return evdns_server_request_add_reply(
-		  req, EVDNS_ANSWER_SECTION, name, TYPE_CNAME, CLASS_INET,
-		  ttl, -1, 1, cname);
-}
-
-
-static int
-evdns_server_request_format_response(struct server_request *req, int err)
-{
-	unsigned char buf[1500];
-	size_t buf_len = sizeof(buf);
-	off_t j = 0, r;
-	u16 _t;
-	u32 _t32;
-	int i;
-	u16 flags;
-	struct dnslabel_table table;
-
-	if (err < 0 || err > 15) return -1;
-
-	/* Set response bit and error code; copy OPCODE and RD fields from
-	 * question; copy RA and AA if set by caller. */
-	flags = req->base.flags;
-	flags |= (0x8000 | err);
-
-	dnslabel_table_init(&table);
-	APPEND16(req->trans_id);
-	APPEND16(flags);
-	APPEND16(req->base.nquestions);
-	APPEND16(req->n_answer);
-	APPEND16(req->n_authority);
-	APPEND16(req->n_additional);
-
-	/* Add questions. */
-	for (i=0; i < req->base.nquestions; ++i) {
-		const char *s = req->base.questions[i]->name;
-		j = dnsname_to_labels(buf, buf_len, j, s, strlen(s), &table);
-		if (j < 0) {
-			dnslabel_clear(&table);
-			return (int) j;
-		}
-		APPEND16(req->base.questions[i]->type);
-		APPEND16(req->base.questions[i]->dns_question_class);
-	}
-
-	/* Add answer, authority, and additional sections. */
-	for (i=0; i<3; ++i) {
-		struct server_reply_item *item;
-		if (i==0)
-			item = req->answer;
-		else if (i==1)
-			item = req->authority;
-		else
-			item = req->additional;
-		while (item) {
-			r = dnsname_to_labels(buf, buf_len, j, item->name, strlen(item->name), &table);
-			if (r < 0)
-				goto overflow;
-			j = r;
-
-			APPEND16(item->type);
-			APPEND16(item->dns_question_class);
-			APPEND32(item->ttl);
-			if (item->is_name) {
-				off_t len_idx = j, name_start;
-				j += 2;
-				name_start = j;
-				r = dnsname_to_labels(buf, buf_len, j, item->data, strlen(item->data), &table);
-				if (r < 0)
-					goto overflow;
-				j = r;
-				_t = htons( (short) (j-name_start) );
-				memcpy(buf+len_idx, &_t, 2);
-			} else {
-				APPEND16(item->datalen);
-				if (j+item->datalen > (off_t)buf_len)
-					goto overflow;
-				memcpy(buf+j, item->data, item->datalen);
-				j += item->datalen;
-			}
-			item = item->next;
-		}
-	}
-
-	if (j > 512) {
-overflow:
-		j = 512;
-		buf[2] |= 0x02; /* set the truncated bit. */
-	}
-
-	req->response_len = j;
-
-	if (!(req->response = malloc(req->response_len))) {
-		server_request_free_answers(req);
-		dnslabel_clear(&table);
-		return (-1);
-	}
-	memcpy(req->response, buf, req->response_len);
-	server_request_free_answers(req);
-	dnslabel_clear(&table);
-	return (0);
-}
-
-/* exported function */
-int
-evdns_server_request_respond(struct evdns_server_request *_req, int err)
-{
-	struct server_request *req = TO_SERVER_REQUEST(_req);
-	struct evdns_server_port *port = req->port;
-	int r;
-	if (!req->response) {
-		if ((r = evdns_server_request_format_response(req, err))<0)
-			return r;
-	}
-
-	r = sendto(port->socket, req->response, req->response_len, 0,
-			   (struct sockaddr*) &req->addr, req->addrlen);
-	if (r<0) {
-		int sock_err = last_error(port->socket);
-		if (! error_is_eagain(sock_err))
-			return -1;
-
-		if (port->pending_replies) {
-			req->prev_pending = port->pending_replies->prev_pending;
-			req->next_pending = port->pending_replies;
-			req->prev_pending->next_pending =
-				req->next_pending->prev_pending = req;
-		} else {
-			req->prev_pending = req->next_pending = req;
-			port->pending_replies = req;
-			port->choked = 1;
-
-			(void) event_del(&port->event);
-			event_set(&port->event, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port);
-
-			if (event_add(&port->event, NULL) < 0) {
-				log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server");
-			}
-
-		}
-
-		return 1;
-	}
-	if (server_request_free(req))
-		return 0;
-
-	if (port->pending_replies)
-		server_port_flush(port);
-
-	return 0;
-}
-
-/* Free all storage held by RRs in req. */
-static void
-server_request_free_answers(struct server_request *req)
-{
-	struct server_reply_item *victim, *next, **list;
-	int i;
-	for (i = 0; i < 3; ++i) {
-		if (i==0)
-			list = &req->answer;
-		else if (i==1)
-			list = &req->authority;
-		else
-			list = &req->additional;
-
-		victim = *list;
-		while (victim) {
-			next = victim->next;
-			free(victim->name);
-			if (victim->data)
-				free(victim->data);
-			free(victim);
-			victim = next;
-		}
-		*list = NULL;
-	}
-}
-
-/* Free all storage held by req, and remove links to it. */
-/* return true iff we just wound up freeing the server_port. */
-static int
-server_request_free(struct server_request *req)
-{
-	int i, rc=1;
-	if (req->base.questions) {
-		for (i = 0; i < req->base.nquestions; ++i)
-			free(req->base.questions[i]);
-		free(req->base.questions);
-	}
-
-	if (req->port) {
-		if (req->port->pending_replies == req) {
-			if (req->next_pending)
-				req->port->pending_replies = req->next_pending;
-			else
-				req->port->pending_replies = NULL;
-		}
-		rc = --req->port->refcnt;
-	}
-
-	if (req->response) {
-		free(req->response);
-	}
-
-	server_request_free_answers(req);
-
-	if (req->next_pending && req->next_pending != req) {
-		req->next_pending->prev_pending = req->prev_pending;
-		req->prev_pending->next_pending = req->next_pending;
-	}
-
-	if (rc == 0) {
-		server_port_free(req->port);
-		free(req);
-		return (1);
-	}
-	free(req);
-	return (0);
-}
-
-/* Free all storage held by an evdns_server_port.  Only called when  */
-static void
-server_port_free(struct evdns_server_port *port)
-{
-	assert(port);
-	assert(!port->refcnt);
-	assert(!port->pending_replies);
-	if (port->socket > 0) {
-		CLOSE_SOCKET(port->socket);
-		port->socket = -1;
-	}
-	(void) event_del(&port->event);
-	/* XXXX actually free the port? -NM */
-}
-
-/* exported function */
-int
-evdns_server_request_drop(struct evdns_server_request *_req)
-{
-	struct server_request *req = TO_SERVER_REQUEST(_req);
-	server_request_free(req);
-	return 0;
-}
-
-/* exported function */
-int
-evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len)
-{
-	struct server_request *req = TO_SERVER_REQUEST(_req);
-	if (addr_len < (int)req->addrlen)
-		return -1;
-	memcpy(sa, &(req->addr), req->addrlen);
-	return req->addrlen;
-}
-
-#undef APPEND16
-#undef APPEND32
-
-/* this is a libevent callback function which is called when a request */
-/* has timed out. */
-static void
-evdns_request_timeout_callback(int fd, short events, void *arg) {
-	struct request *const req = (struct request *) arg;
-        (void) fd;
-        (void) events;
-
-	log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg);
-
-	req->ns->timedout++;
-	if (req->ns->timedout > global_max_nameserver_timeout) {
-		req->ns->timedout = 0;
-		nameserver_failed(req->ns, "request timed out.");
-	}
-
-	(void) evtimer_del(&req->timeout_event);
-	if (req->tx_count >= global_max_retransmits) {
-		/* this request has failed */
-		reply_callback(req, 0, DNS_ERR_TIMEOUT, NULL);
-		request_finished(req, &req_head);
-	} else {
-		/* retransmit it */
-		evdns_request_transmit(req);
-	}
-}
-
-/* try to send a request to a given server. */
-/* */
-/* return: */
-/*   0 ok */
-/*   1 temporary failure */
-/*   2 other failure */
-static int
-evdns_request_transmit_to(struct request *req, struct nameserver *server) {
-	struct sockaddr_in sin;
-	int r;
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_addr.s_addr = req->ns->address;
-	sin.sin_port = req->ns->port;
-	sin.sin_family = AF_INET;
-
-	r = sendto(server->socket, req->request, req->request_len, 0,
-	    (struct sockaddr*)&sin, sizeof(sin));
-	if (r < 0) {
-		int err = last_error(server->socket);
-		if (error_is_eagain(err)) return 1;
-		nameserver_failed(req->ns, strerror(err));
-		return 2;
-	} else if (r != (int)req->request_len) {
-		return 1;  /* short write */
-	} else {
-		return 0;
-	}
-}
-
-/* try to send a request, updating the fields of the request */
-/* as needed */
-/* */
-/* return: */
-/*   0 ok */
-/*   1 failed */
-static int
-evdns_request_transmit(struct request *req) {
-	int retcode = 0, r;
-
-	/* if we fail to send this packet then this flag marks it */
-	/* for evdns_transmit */
-	req->transmit_me = 1;
-	if (req->trans_id == 0xffff) abort();
-
-	if (req->ns->choked) {
-		/* don't bother trying to write to a socket */
-		/* which we have had EAGAIN from */
-		return 1;
-	}
-
-	r = evdns_request_transmit_to(req, req->ns);
-	switch (r) {
-	case 1:
-		/* temp failure */
-		req->ns->choked = 1;
-		nameserver_write_waiting(req->ns, 1);
-		return 1;
-	case 2:
-		/* failed in some other way */
-		retcode = 1;
-		/* fall through */
-	default:
-		/* all ok */
-		log(EVDNS_LOG_DEBUG,
-		    "Setting timeout for request %lx", (unsigned long) req);
-		if (evtimer_add(&req->timeout_event, &global_timeout) < 0) {
-                  log(EVDNS_LOG_WARN,
-		      "Error from libevent when adding timer for request %lx",
-                      (unsigned long) req);
-                  /* ???? Do more? */
-                }
-		req->tx_count++;
-		req->transmit_me = 0;
-		return retcode;
-	}
-}
-
-static void
-nameserver_probe_callback(int result, char type, int count, int ttl, void *addresses, void *arg) {
-	struct nameserver *const ns = (struct nameserver *) arg;
-        (void) type;
-        (void) count;
-        (void) ttl;
-        (void) addresses;
-
-	if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) {
-		/* this is a good reply */
-		nameserver_up(ns);
-	} else nameserver_probe_failed(ns);
-}
-
-static void
-nameserver_send_probe(struct nameserver *const ns) {
-	struct request *req;
-	/* here we need to send a probe to a given nameserver */
-	/* in the hope that it is up now. */
-
-  	log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntoa(ns->address));
-
-	req = request_new(TYPE_A, "www.google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, ns);
-        if (!req) return;
-	/* we force this into the inflight queue no matter what */
-	request_trans_id_set(req, transaction_id_pick());
-	req->ns = ns;
-	request_submit(req);
-}
-
-/* returns: */
-/*   0 didn't try to transmit anything */
-/*   1 tried to transmit something */
-static int
-evdns_transmit(void) {
-	char did_try_to_transmit = 0;
-
-	if (req_head) {
-		struct request *const started_at = req_head, *req = req_head;
-		/* first transmit all the requests which are currently waiting */
-		do {
-			if (req->transmit_me) {
-				did_try_to_transmit = 1;
-				evdns_request_transmit(req);
-			}
-
-			req = req->next;
-		} while (req != started_at);
-	}
-
-	return did_try_to_transmit;
-}
-
-/* exported function */
-int
-evdns_count_nameservers(void)
-{
-	const struct nameserver *server = server_head;
-	int n = 0;
-	if (!server)
-		return 0;
-	do {
-		++n;
-		server = server->next;
-	} while (server != server_head);
-	return n;
-}
-
-/* exported function */
-int
-evdns_clear_nameservers_and_suspend(void)
-{
-	struct nameserver *server = server_head, *started_at = server_head;
-	struct request *req = req_head, *req_started_at = req_head;
-
-	if (!server)
-		return 0;
-	while (1) {
-		struct nameserver *next = server->next;
-		(void) event_del(&server->event);
-		if (evtimer_initialized(&server->timeout_event))
-			(void) evtimer_del(&server->timeout_event);
-		if (server->socket >= 0)
-			CLOSE_SOCKET(server->socket);
-		free(server);
-		if (next == started_at)
-			break;
-		server = next;
-	}
-	server_head = NULL;
-	global_good_nameservers = 0;
-
-	while (req) {
-		struct request *next = req->next;
-		req->tx_count = req->reissue_count = 0;
-		req->ns = NULL;
-		/* ???? What to do about searches? */
-		(void) evtimer_del(&req->timeout_event);
-		req->trans_id = 0;
-		req->transmit_me = 0;
-
-		global_requests_waiting++;
-		evdns_request_insert(req, &req_waiting_head);
-		/* We want to insert these suspended elements at the front of
-		 * the waiting queue, since they were pending before any of
-		 * the waiting entries were added.  This is a circular list,
-		 * so we can just shift the start back by one.*/
-		req_waiting_head = req_waiting_head->prev;
-
-		if (next == req_started_at)
-			break;
-		req = next;
-	}
-	req_head = NULL;
-	global_requests_inflight = 0;
-
-	return 0;
-}
-
-
-/* exported function */
-int
-evdns_resume(void)
-{
-	evdns_requests_pump_waiting_queue();
-	return 0;
-}
-
-static int
-_evdns_nameserver_add_impl(unsigned long int address, int port) {
-	/* first check to see if we already have this nameserver */
-
-	const struct nameserver *server = server_head, *const started_at = server_head;
-	struct nameserver *ns;
-	int err = 0;
-	if (server) {
-		do {
-			if (server->address == address) return 3;
-			server = server->next;
-		} while (server != started_at);
-	}
-
-	ns = (struct nameserver *) malloc(sizeof(struct nameserver));
-        if (!ns) return -1;
-
-	memset(ns, 0, sizeof(struct nameserver));
-
-	evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
-
-	ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
-	if (ns->socket < 0) { err = 1; goto out1; }
-        evutil_make_socket_nonblocking(ns->socket);
-
-	ns->address = address;
-	ns->port = htons(port);
-	ns->state = 1;
-	event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns);
-	if (event_add(&ns->event, NULL) < 0) {
-          err = 2;
-          goto out2;
-        }
-
-	log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntoa(address));
-
-	/* insert this nameserver into the list of them */
-	if (!server_head) {
-		ns->next = ns->prev = ns;
-		server_head = ns;
-	} else {
-		ns->next = server_head->next;
-		ns->prev = server_head;
-		server_head->next = ns;
-		if (server_head->prev == server_head) {
-			server_head->prev = ns;
-		}
-	}
-
-	global_good_nameservers++;
-
-	return 0;
-
-out2:
-	CLOSE_SOCKET(ns->socket);
-out1:
-	free(ns);
-	log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntoa(address), err);
-	return err;
-}
-
-/* exported function */
-int
-evdns_nameserver_add(unsigned long int address) {
-	return _evdns_nameserver_add_impl(address, 53);
-}
-
-/* exported function */
-int
-evdns_nameserver_ip_add(const char *ip_as_string) {
-	struct in_addr ina;
-	int port;
-	char buf[20];
-	const char *cp;
-	cp = strchr(ip_as_string, ':');
-	if (! cp) {
-		cp = ip_as_string;
-		port = 53;
-	} else {
-		port = strtoint(cp+1);
-		if (port < 0 || port > 65535) {
-			return 4;
-		}
-		if ((cp-ip_as_string) >= (int)sizeof(buf)) {
-			return 4;
-		}
-		memcpy(buf, ip_as_string, cp-ip_as_string);
-		buf[cp-ip_as_string] = '\0';
-		cp = buf;
-	}
-	if (!inet_aton(cp, &ina)) {
-		return 4;
-	}
-	return _evdns_nameserver_add_impl(ina.s_addr, port);
-}
-
-/* insert into the tail of the queue */
-static void
-evdns_request_insert(struct request *req, struct request **head) {
-	if (!*head) {
-		*head = req;
-		req->next = req->prev = req;
-		return;
-	}
-
-	req->prev = (*head)->prev;
-	req->prev->next = req;
-	req->next = *head;
-	(*head)->prev = req;
-}
-
-static int
-string_num_dots(const char *s) {
-	int count = 0;
-	while ((s = strchr(s, '.'))) {
-		s++;
-		count++;
-	}
-	return count;
-}
-
-static struct request *
-request_new(int type, const char *name, int flags,
-    evdns_callback_type callback, void *user_ptr) {
-	const char issuing_now =
-	    (global_requests_inflight < global_max_requests_inflight) ? 1 : 0;
-
-	const int name_len = strlen(name);
-	const int request_max_len = evdns_request_len(name_len);
-	const u16 trans_id = issuing_now ? transaction_id_pick() : 0xffff;
-	/* the request data is alloced in a single block with the header */
-	struct request *const req =
-	    (struct request *) malloc(sizeof(struct request) + request_max_len);
-	int rlen;
-        (void) flags;
-
-        if (!req) return NULL;
-	memset(req, 0, sizeof(struct request));
-
-	evtimer_set(&req->timeout_event, evdns_request_timeout_callback, req);
-
-	/* request data lives just after the header */
-	req->request = ((u8 *) req) + sizeof(struct request);
-	/* denotes that the request data shouldn't be free()ed */
-	req->request_appended = 1;
-	rlen = evdns_request_data_build(name, name_len, trans_id,
-	    type, CLASS_INET, req->request, request_max_len);
-	if (rlen < 0)
-		goto err1;
-	req->request_len = rlen;
-	req->trans_id = trans_id;
-	req->tx_count = 0;
-	req->request_type = type;
-	req->user_pointer = user_ptr;
-	req->user_callback = callback;
-	req->ns = issuing_now ? nameserver_pick() : NULL;
-	req->next = req->prev = NULL;
-
-	return req;
-err1:
-	free(req);
-	return NULL;
-}
-
-static void
-request_submit(struct request *const req) {
-	if (req->ns) {
-		/* if it has a nameserver assigned then this is going */
-		/* straight into the inflight queue */
-		evdns_request_insert(req, &req_head);
-		global_requests_inflight++;
-		evdns_request_transmit(req);
-	} else {
-		evdns_request_insert(req, &req_waiting_head);
-		global_requests_waiting++;
-	}
-}
-
-/* exported function */
-int evdns_resolve_ipv4(const char *name, int flags,
-    evdns_callback_type callback, void *ptr) {
-	log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
-	if (flags & DNS_QUERY_NO_SEARCH) {
-		struct request *const req =
-			request_new(TYPE_A, name, flags, callback, ptr);
-		if (req == NULL)
-			return (1);
-		request_submit(req);
-		return (0);
-	} else {
-		return (search_request_new(TYPE_A, name, flags, callback, ptr));
-	}
-}
-
-/* exported function */
-int evdns_resolve_ipv6(const char *name, int flags,
-					   evdns_callback_type callback, void *ptr) {
-	log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
-	if (flags & DNS_QUERY_NO_SEARCH) {
-		struct request *const req =
-			request_new(TYPE_AAAA, name, flags, callback, ptr);
-		if (req == NULL)
-			return (1);
-		request_submit(req);
-		return (0);
-	} else {
-		return (search_request_new(TYPE_AAAA, name, flags, callback, ptr));
-	}
-}
-
-int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr) {
-	char buf[32];
-	struct request *req;
-	u32 a;
-	assert(in);
-	a = ntohl(in->s_addr);
-	evutil_snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
-			(int)(u8)((a	)&0xff),
-			(int)(u8)((a>>8 )&0xff),
-			(int)(u8)((a>>16)&0xff),
-			(int)(u8)((a>>24)&0xff));
-	log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
-	req = request_new(TYPE_PTR, buf, flags, callback, ptr);
-	if (!req) return 1;
-	request_submit(req);
-	return 0;
-}
-
-int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
-	/* 32 nybbles, 32 periods, "ip6.arpa", NUL. */
-	char buf[73];
-	char *cp;
-	struct request *req;
-	int i;
-	assert(in);
-	cp = buf;
-	for (i=15; i >= 0; --i) {
-		u8 byte = in->s6_addr[i];
-		*cp++ = "0123456789abcdef"[byte & 0x0f];
-		*cp++ = '.';
-		*cp++ = "0123456789abcdef"[byte >> 4];
-		*cp++ = '.';
-	}
-	assert(cp + strlen("ip6.arpa") < buf+sizeof(buf));
-	memcpy(cp, "ip6.arpa", strlen("ip6.arpa")+1);
-	log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
-	req = request_new(TYPE_PTR, buf, flags, callback, ptr);
-	if (!req) return 1;
-	request_submit(req);
-	return 0;
-}
-
-/*/////////////////////////////////////////////////////////////////// */
-/* Search support */
-/* */
-/* the libc resolver has support for searching a number of domains */
-/* to find a name. If nothing else then it takes the single domain */
-/* from the gethostname() call. */
-/* */
-/* It can also be configured via the domain and search options in a */
-/* resolv.conf. */
-/* */
-/* The ndots option controls how many dots it takes for the resolver */
-/* to decide that a name is non-local and so try a raw lookup first. */
-
-struct search_domain {
-	int len;
-	struct search_domain *next;
-	/* the text string is appended to this structure */
-};
-
-struct search_state {
-	int refcount;
-	int ndots;
-	int num_domains;
-	struct search_domain *head;
-};
-
-static struct search_state *global_search_state = NULL;
-
-static void
-search_state_decref(struct search_state *const state) {
-	if (!state) return;
-	state->refcount--;
-	if (!state->refcount) {
-		struct search_domain *next, *dom;
-		for (dom = state->head; dom; dom = next) {
-			next = dom->next;
-			free(dom);
-		}
-		free(state);
-	}
-}
-
-static struct search_state *
-search_state_new(void) {
-	struct search_state *state = (struct search_state *) malloc(sizeof(struct search_state));
-        if (!state) return NULL;
-	memset(state, 0, sizeof(struct search_state));
-	state->refcount = 1;
-	state->ndots = 1;
-
-	return state;
-}
-
-static void
-search_postfix_clear(void) {
-	search_state_decref(global_search_state);
-
-	global_search_state = search_state_new();
-}
-
-/* exported function */
-void
-evdns_search_clear(void) {
-	search_postfix_clear();
-}
-
-static void
-search_postfix_add(const char *domain) {
-	int domain_len;
-	struct search_domain *sdomain;
-	while (domain[0] == '.') domain++;
-	domain_len = strlen(domain);
-
-	if (!global_search_state) global_search_state = search_state_new();
-        if (!global_search_state) return;
-	global_search_state->num_domains++;
-
-	sdomain = (struct search_domain *) malloc(sizeof(struct search_domain) + domain_len);
-        if (!sdomain) return;
-	memcpy( ((u8 *) sdomain) + sizeof(struct search_domain), domain, domain_len);
-	sdomain->next = global_search_state->head;
-	sdomain->len = domain_len;
-
-	global_search_state->head = sdomain;
-}
-
-/* reverse the order of members in the postfix list. This is needed because, */
-/* when parsing resolv.conf we push elements in the wrong order */
-static void
-search_reverse(void) {
-	struct search_domain *cur, *prev = NULL, *next;
-	cur = global_search_state->head;
-	while (cur) {
-		next = cur->next;
-		cur->next = prev;
-		prev = cur;
-		cur = next;
-	}
-
-	global_search_state->head = prev;
-}
-
-/* exported function */
-void
-evdns_search_add(const char *domain) {
-	search_postfix_add(domain);
-}
-
-/* exported function */
-void
-evdns_search_ndots_set(const int ndots) {
-	if (!global_search_state) global_search_state = search_state_new();
-        if (!global_search_state) return;
-	global_search_state->ndots = ndots;
-}
-
-static void
-search_set_from_hostname(void) {
-	char hostname[HOST_NAME_MAX + 1], *domainname;
-
-	search_postfix_clear();
-	if (gethostname(hostname, sizeof(hostname))) return;
-	domainname = strchr(hostname, '.');
-	if (!domainname) return;
-	search_postfix_add(domainname);
-}
-
-/* warning: returns malloced string */
-static char *
-search_make_new(const struct search_state *const state, int n, const char *const base_name) {
-	const int base_len = strlen(base_name);
-	const char need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1;
-	struct search_domain *dom;
-
-	for (dom = state->head; dom; dom = dom->next) {
-		if (!n--) {
-			/* this is the postfix we want */
-			/* the actual postfix string is kept at the end of the structure */
-			const u8 *const postfix = ((u8 *) dom) + sizeof(struct search_domain);
-			const int postfix_len = dom->len;
-			char *const newname = (char *) malloc(base_len + need_to_append_dot + postfix_len + 1);
-                        if (!newname) return NULL;
-			memcpy(newname, base_name, base_len);
-			if (need_to_append_dot) newname[base_len] = '.';
-			memcpy(newname + base_len + need_to_append_dot, postfix, postfix_len);
-			newname[base_len + need_to_append_dot + postfix_len] = 0;
-			return newname;
-		}
-	}
-
-	/* we ran off the end of the list and still didn't find the requested string */
-	abort();
-	return NULL; /* unreachable; stops warnings in some compilers. */
-}
-
-static int
-search_request_new(int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg) {
-	assert(type == TYPE_A || type == TYPE_AAAA);
-	if ( ((flags & DNS_QUERY_NO_SEARCH) == 0) &&
-	     global_search_state &&
-		 global_search_state->num_domains) {
-		/* we have some domains to search */
-		struct request *req;
-		if (string_num_dots(name) >= global_search_state->ndots) {
-			req = request_new(type, name, flags, user_callback, user_arg);
-			if (!req) return 1;
-			req->search_index = -1;
-		} else {
-			char *const new_name = search_make_new(global_search_state, 0, name);
-                        if (!new_name) return 1;
-			req = request_new(type, new_name, flags, user_callback, user_arg);
-			free(new_name);
-			if (!req) return 1;
-			req->search_index = 0;
-		}
-		req->search_origname = strdup(name);
-		req->search_state = global_search_state;
-		req->search_flags = flags;
-		global_search_state->refcount++;
-		request_submit(req);
-		return 0;
-	} else {
-		struct request *const req = request_new(type, name, flags, user_callback, user_arg);
-		if (!req) return 1;
-		request_submit(req);
-		return 0;
-	}
-}
-
-/* this is called when a request has failed to find a name. We need to check */
-/* if it is part of a search and, if so, try the next name in the list */
-/* returns: */
-/*   0 another request has been submitted */
-/*   1 no more requests needed */
-static int
-search_try_next(struct request *const req) {
-	if (req->search_state) {
-		/* it is part of a search */
-		char *new_name;
-		struct request *newreq;
-		req->search_index++;
-		if (req->search_index >= req->search_state->num_domains) {
-			/* no more postfixes to try, however we may need to try */
-			/* this name without a postfix */
-			if (string_num_dots(req->search_origname) < req->search_state->ndots) {
-				/* yep, we need to try it raw */
-				newreq = request_new(req->request_type, req->search_origname, req->search_flags, req->user_callback, req->user_pointer);
-				log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname);
-				if (newreq) {
-					request_submit(newreq);
-					return 0;
-				}
-			}
-			return 1;
-		}
-
-		new_name = search_make_new(req->search_state, req->search_index, req->search_origname);
-                if (!new_name) return 1;
-		log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index);
-		newreq = request_new(req->request_type, new_name, req->search_flags, req->user_callback, req->user_pointer);
-		free(new_name);
-		if (!newreq) return 1;
-		newreq->search_origname = req->search_origname;
-		req->search_origname = NULL;
-		newreq->search_state = req->search_state;
-		newreq->search_flags = req->search_flags;
-		newreq->search_index = req->search_index;
-		newreq->search_state->refcount++;
-		request_submit(newreq);
-		return 0;
-	}
-	return 1;
-}
-
-static void
-search_request_finished(struct request *const req) {
-	if (req->search_state) {
-		search_state_decref(req->search_state);
-		req->search_state = NULL;
-	}
-	if (req->search_origname) {
-		free(req->search_origname);
-		req->search_origname = NULL;
-	}
-}
-
-/*/////////////////////////////////////////////////////////////////// */
-/* Parsing resolv.conf files */
-
-static void
-evdns_resolv_set_defaults(int flags) {
-	/* if the file isn't found then we assume a local resolver */
-	if (flags & DNS_OPTION_SEARCH) search_set_from_hostname();
-	if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1");
-}
-
-#ifndef HAVE_STRTOK_R
-static char *
-strtok_r(char *s, const char *delim, char **state) {
-	return strtok(s, delim);
-}
-#endif
-
-/* helper version of atoi which returns -1 on error */
-static int
-strtoint(const char *const str) {
-	char *endptr;
-	const int r = strtol(str, &endptr, 10);
-	if (*endptr) return -1;
-	return r;
-}
-
-/* helper version of atoi that returns -1 on error and clips to bounds. */
-static int
-strtoint_clipped(const char *const str, int min, int max)
-{
-	int r = strtoint(str);
-	if (r == -1)
-		return r;
-	else if (r<min)
-		return min;
-	else if (r>max)
-		return max;
-	else
-		return r;
-}
-
-/* exported function */
-int
-evdns_set_option(const char *option, const char *val, int flags)
-{
-	if (!strncmp(option, "ndots:", 6)) {
-		const int ndots = strtoint(val);
-		if (ndots == -1) return -1;
-		if (!(flags & DNS_OPTION_SEARCH)) return 0;
-		log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots);
-		if (!global_search_state) global_search_state = search_state_new();
-		if (!global_search_state) return -1;
-		global_search_state->ndots = ndots;
-	} else if (!strncmp(option, "timeout:", 8)) {
-		const int timeout = strtoint(val);
-		if (timeout == -1) return -1;
-		if (!(flags & DNS_OPTION_MISC)) return 0;
-		log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout);
-		global_timeout.tv_sec = timeout;
-	} else if (!strncmp(option, "max-timeouts:", 12)) {
-		const int maxtimeout = strtoint_clipped(val, 1, 255);
-		if (maxtimeout == -1) return -1;
-		if (!(flags & DNS_OPTION_MISC)) return 0;
-		log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d",
-			maxtimeout);
-		global_max_nameserver_timeout = maxtimeout;
-	} else if (!strncmp(option, "max-inflight:", 13)) {
-		const int maxinflight = strtoint_clipped(val, 1, 65000);
-		if (maxinflight == -1) return -1;
-		if (!(flags & DNS_OPTION_MISC)) return 0;
-		log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d",
-			maxinflight);
-		global_max_requests_inflight = maxinflight;
-	} else if (!strncmp(option, "attempts:", 9)) {
-		int retries = strtoint(val);
-		if (retries == -1) return -1;
-		if (retries > 255) retries = 255;
-		if (!(flags & DNS_OPTION_MISC)) return 0;
-		log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries);
-		global_max_retransmits = retries;
-	}
-	return 0;
-}
-
-static void
-resolv_conf_parse_line(char *const start, int flags) {
-	char *strtok_state;
-	static const char *const delims = " \t";
-#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
-
-	char *const first_token = strtok_r(start, delims, &strtok_state);
-	if (!first_token) return;
-
-	if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
-		const char *const nameserver = NEXT_TOKEN;
-		struct in_addr ina;
-
-		if (inet_aton(nameserver, &ina)) {
-			/* address is valid */
-			evdns_nameserver_add(ina.s_addr);
-		}
-	} else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) {
-		const char *const domain = NEXT_TOKEN;
-		if (domain) {
-			search_postfix_clear();
-			search_postfix_add(domain);
-		}
-	} else if (!strcmp(first_token, "search") && (flags & DNS_OPTION_SEARCH)) {
-		const char *domain;
-		search_postfix_clear();
-
-		while ((domain = NEXT_TOKEN)) {
-			search_postfix_add(domain);
-		}
-		search_reverse();
-	} else if (!strcmp(first_token, "options")) {
-		const char *option;
-		while ((option = NEXT_TOKEN)) {
-			const char *val = strchr(option, ':');
-			evdns_set_option(option, val ? val+1 : "", flags);
-		}
-	}
-#undef NEXT_TOKEN
-}
-
-/* exported function */
-/* returns: */
-/*   0 no errors */
-/*   1 failed to open file */
-/*   2 failed to stat file */
-/*   3 file too large */
-/*   4 out of memory */
-/*   5 short read from file */
-int
-evdns_resolv_conf_parse(int flags, const char *const filename) {
-	struct stat st;
-	int fd, n, r;
-	u8 *resolv;
-	char *start;
-	int err = 0;
-
-	log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename);
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		evdns_resolv_set_defaults(flags);
-		return 1;
-	}
-
-	if (fstat(fd, &st)) { err = 2; goto out1; }
-	if (!st.st_size) {
-		evdns_resolv_set_defaults(flags);
-		err = (flags & DNS_OPTION_NAMESERVERS) ? 6 : 0;
-		goto out1;
-	}
-	if (st.st_size > 65535) { err = 3; goto out1; }  /* no resolv.conf should be any bigger */
-
-	resolv = (u8 *) malloc((size_t)st.st_size + 1);
-	if (!resolv) { err = 4; goto out1; }
-
-	n = 0;
-	while ((r = read(fd, resolv+n, (size_t)st.st_size-n)) > 0) {
-		n += r;
-		if (n == st.st_size)
-			break;
-		assert(n < st.st_size);
- 	}
-	if (r < 0) { err = 5; goto out2; }
-	resolv[n] = 0;	 /* we malloced an extra byte; this should be fine. */
-
-	start = (char *) resolv;
-	for (;;) {
-		char *const newline = strchr(start, '\n');
-		if (!newline) {
-			resolv_conf_parse_line(start, flags);
-			break;
-		} else {
-			*newline = 0;
-			resolv_conf_parse_line(start, flags);
-			start = newline + 1;
-		}
-	}
-
-	if (!server_head && (flags & DNS_OPTION_NAMESERVERS)) {
-		/* no nameservers were configured. */
-		evdns_nameserver_ip_add("127.0.0.1");
-		err = 6;
-	}
-	if (flags & DNS_OPTION_SEARCH && (!global_search_state || global_search_state->num_domains == 0)) {
-		search_set_from_hostname();
-	}
-
-out2:
-	free(resolv);
-out1:
-	close(fd);
-	return err;
-}
-
-#ifdef WIN32
-/* Add multiple nameservers from a space-or-comma-separated list. */
-static int
-evdns_nameserver_ip_add_line(const char *ips) {
-	const char *addr;
-	char *buf;
-	int r;
-	while (*ips) {
-		while (ISSPACE(*ips) || *ips == ',' || *ips == '\t')
-			++ips;
-		addr = ips;
-		while (ISDIGIT(*ips) || *ips == '.' || *ips == ':')
-			++ips;
-		buf = malloc(ips-addr+1);
-		if (!buf) return 4;
-		memcpy(buf, addr, ips-addr);
-		buf[ips-addr] = '\0';
-		r = evdns_nameserver_ip_add(buf);
-		free(buf);
-		if (r) return r;
-	}
-	return 0;
-}
-
-typedef DWORD(WINAPI *GetNetworkParams_fn_t)(FIXED_INFO *, DWORD*);
-
-/* Use the windows GetNetworkParams interface in iphlpapi.dll to */
-/* figure out what our nameservers are. */
-static int
-load_nameservers_with_getnetworkparams(void)
-{
-	/* Based on MSDN examples and inspection of  c-ares code. */
-	FIXED_INFO *fixed;
-	HMODULE handle = 0;
-	ULONG size = sizeof(FIXED_INFO);
-	void *buf = NULL;
-	int status = 0, r, added_any;
-	IP_ADDR_STRING *ns;
-	GetNetworkParams_fn_t fn;
-
-	if (!(handle = LoadLibrary("iphlpapi.dll"))) {
-		log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
-		status = -1;
-		goto done;
-	}
-	if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, "GetNetworkParams"))) {
-		log(EVDNS_LOG_WARN, "Could not get address of function.");
-		status = -1;
-		goto done;
-	}
-
-	buf = malloc(size);
-	if (!buf) { status = 4; goto done; }
-	fixed = buf;
-	r = fn(fixed, &size);
-	if (r != ERROR_SUCCESS && r != ERROR_BUFFER_OVERFLOW) {
-		status = -1;
-		goto done;
-	}
-	if (r != ERROR_SUCCESS) {
-		free(buf);
-		buf = malloc(size);
-		if (!buf) { status = 4; goto done; }
-		fixed = buf;
-		r = fn(fixed, &size);
-		if (r != ERROR_SUCCESS) {
-			log(EVDNS_LOG_DEBUG, "fn() failed.");
-			status = -1;
-			goto done;
-		}
-	}
-
-	assert(fixed);
-	added_any = 0;
-	ns = &(fixed->DnsServerList);
-	while (ns) {
-		r = evdns_nameserver_ip_add_line(ns->IpAddress.String);
-		if (r) {
-			log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list,error: %d",
-				(ns->IpAddress.String),(int)GetLastError());
-			status = r;
-			goto done;
-		} else {
-			log(EVDNS_LOG_DEBUG,"Succesfully added %s as nameserver",ns->IpAddress.String);
-		}
-
-		added_any++;
-		ns = ns->Next;
-	}
-
-	if (!added_any) {
-		log(EVDNS_LOG_DEBUG, "No nameservers added.");
-		status = -1;
-	}
-
- done:
-	if (buf)
-		free(buf);
-	if (handle)
-		FreeLibrary(handle);
-	return status;
-}
-
-static int
-config_nameserver_from_reg_key(HKEY key, const char *subkey)
-{
-	char *buf;
-	DWORD bufsz = 0, type = 0;
-	int status = 0;
-
-	if (RegQueryValueEx(key, subkey, 0, &type, NULL, &bufsz)
-	    != ERROR_MORE_DATA)
-		return -1;
-	if (!(buf = malloc(bufsz)))
-		return -1;
-
-	if (RegQueryValueEx(key, subkey, 0, &type, (LPBYTE)buf, &bufsz)
-	    == ERROR_SUCCESS && bufsz > 1) {
-		status = evdns_nameserver_ip_add_line(buf);
-	}
-
-	free(buf);
-	return status;
-}
-
-#define SERVICES_KEY "System\\CurrentControlSet\\Services\\"
-#define WIN_NS_9X_KEY  SERVICES_KEY "VxD\\MSTCP"
-#define WIN_NS_NT_KEY  SERVICES_KEY "Tcpip\\Parameters"
-
-static int
-load_nameservers_from_registry(void)
-{
-	int found = 0;
-	int r;
-#define TRY(k, name) \
-	if (!found && config_nameserver_from_reg_key(k,name) == 0) {	\
-		log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \
-		found = 1;						\
-	} else if (!found) {						\
-		log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \
-		    #k,#name);						\
-	}
-
-	if (((int)GetVersion()) > 0) { /* NT */
-		HKEY nt_key = 0, interfaces_key = 0;
-
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
-				 KEY_READ, &nt_key) != ERROR_SUCCESS) {
-			log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError());
-			return -1;
-		}
-		r = RegOpenKeyEx(nt_key, "Interfaces", 0,
-			     KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
-			     &interfaces_key);
-		if (r != ERROR_SUCCESS) {
-			log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError());
-			return -1;
-		}
-		TRY(nt_key, "NameServer");
-		TRY(nt_key, "DhcpNameServer");
-		TRY(interfaces_key, "NameServer");
-		TRY(interfaces_key, "DhcpNameServer");
-		RegCloseKey(interfaces_key);
-		RegCloseKey(nt_key);
-	} else {
-		HKEY win_key = 0;
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
-				 KEY_READ, &win_key) != ERROR_SUCCESS) {
-			log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError());
-			return -1;
-		}
-		TRY(win_key, "NameServer");
-		RegCloseKey(win_key);
-	}
-
-	if (found == 0) {
-		log(EVDNS_LOG_WARN,"Didn't find any nameservers.");
-	}
-
-	return found ? 0 : -1;
-#undef TRY
-}
-
-int
-evdns_config_windows_nameservers(void)
-{
-	if (load_nameservers_with_getnetworkparams() == 0)
-		return 0;
-	return load_nameservers_from_registry();
-}
-#endif
-
-int
-evdns_init(void)
-{
-	int res = 0;
-#ifdef WIN32
-	res = evdns_config_windows_nameservers();
-#else
-	res = evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
-#endif
-
-	return (res);
-}
-
-const char *
-evdns_err_to_string(int err)
-{
-    switch (err) {
-	case DNS_ERR_NONE: return "no error";
-	case DNS_ERR_FORMAT: return "misformatted query";
-	case DNS_ERR_SERVERFAILED: return "server failed";
-	case DNS_ERR_NOTEXIST: return "name does not exist";
-	case DNS_ERR_NOTIMPL: return "query not implemented";
-	case DNS_ERR_REFUSED: return "refused";
-
-	case DNS_ERR_TRUNCATED: return "reply truncated or ill-formed";
-	case DNS_ERR_UNKNOWN: return "unknown";
-	case DNS_ERR_TIMEOUT: return "request timed out";
-	case DNS_ERR_SHUTDOWN: return "dns subsystem shut down";
-	default: return "[Unknown error code]";
-    }
-}
-
-void
-evdns_shutdown(int fail_requests)
-{
-	struct nameserver *server, *server_next;
-	struct search_domain *dom, *dom_next;
-
-	while (req_head) {
-		if (fail_requests)
-			reply_callback(req_head, 0, DNS_ERR_SHUTDOWN, NULL);
-		request_finished(req_head, &req_head);
-	}
-	while (req_waiting_head) {
-		if (fail_requests)
-			reply_callback(req_waiting_head, 0, DNS_ERR_SHUTDOWN, NULL);
-		request_finished(req_waiting_head, &req_waiting_head);
-	}
-	global_requests_inflight = global_requests_waiting = 0;
-
-	for (server = server_head; server; server = server_next) {
-		server_next = server->next;
-		if (server->socket >= 0)
-			CLOSE_SOCKET(server->socket);
-		(void) event_del(&server->event);
-		if (server->state == 0)
-                        (void) event_del(&server->timeout_event);
-		free(server);
-		if (server_next == server_head)
-			break;
-	}
-	server_head = NULL;
-	global_good_nameservers = 0;
-
-	if (global_search_state) {
-		for (dom = global_search_state->head; dom; dom = dom_next) {
-			dom_next = dom->next;
-			free(dom);
-		}
-		free(global_search_state);
-		global_search_state = NULL;
-	}
-	evdns_log_fn = NULL;
-}
-
-#ifdef EVDNS_MAIN
-void
-main_callback(int result, char type, int count, int ttl,
-			  void *addrs, void *orig) {
-	char *n = (char*)orig;
-	int i;
-	for (i = 0; i < count; ++i) {
-		if (type == DNS_IPv4_A) {
-			printf("%s: %s\n", n, debug_ntoa(((u32*)addrs)[i]));
-		} else if (type == DNS_PTR) {
-			printf("%s: %s\n", n, ((char**)addrs)[i]);
-		}
-	}
-	if (!count) {
-		printf("%s: No answer (%d)\n", n, result);
-	}
-	fflush(stdout);
-}
-void
-evdns_server_callback(struct evdns_server_request *req, void *data)
-{
-	int i, r;
-	(void)data;
-	/* dummy; give 192.168.11.11 as an answer for all A questions,
-	 *	give foo.bar.example.com as an answer for all PTR questions. */
-	for (i = 0; i < req->nquestions; ++i) {
-		u32 ans = htonl(0xc0a80b0bUL);
-		if (req->questions[i]->type == EVDNS_TYPE_A &&
-			req->questions[i]->dns_question_class == EVDNS_CLASS_INET) {
-			printf(" -- replying for %s (A)\n", req->questions[i]->name);
-			r = evdns_server_request_add_a_reply(req, req->questions[i]->name,
-										  1, &ans, 10);
-			if (r<0)
-				printf("eeep, didn't work.\n");
-		} else if (req->questions[i]->type == EVDNS_TYPE_PTR &&
-				   req->questions[i]->dns_question_class == EVDNS_CLASS_INET) {
-			printf(" -- replying for %s (PTR)\n", req->questions[i]->name);
-			r = evdns_server_request_add_ptr_reply(req, NULL, req->questions[i]->name,
-											"foo.bar.example.com", 10);
-		} else {
-			printf(" -- skipping %s [%d %d]\n", req->questions[i]->name,
-				   req->questions[i]->type, req->questions[i]->dns_question_class);
-		}
-	}
-
-	r = evdns_request_respond(req, 0);
-	if (r<0)
-		printf("eeek, couldn't send reply.\n");
-}
-
-void
-logfn(int is_warn, const char *msg) {
-  (void) is_warn;
-  fprintf(stderr, "%s\n", msg);
-}
-int
-main(int c, char **v) {
-	int idx;
-	int reverse = 0, verbose = 1, servertest = 0;
-	if (c<2) {
-		fprintf(stderr, "syntax: %s [-x] [-v] hostname\n", v[0]);
-		fprintf(stderr, "syntax: %s [-servertest]\n", v[0]);
-		return 1;
-	}
-	idx = 1;
-	while (idx < c && v[idx][0] == '-') {
-		if (!strcmp(v[idx], "-x"))
-			reverse = 1;
-		else if (!strcmp(v[idx], "-v"))
-			verbose = 1;
-		else if (!strcmp(v[idx], "-servertest"))
-			servertest = 1;
-		else
-			fprintf(stderr, "Unknown option %s\n", v[idx]);
-		++idx;
-	}
-	event_init();
-	if (verbose)
-		evdns_set_log_fn(logfn);
-	evdns_resolv_conf_parse(DNS_OPTION_NAMESERVERS, "/etc/resolv.conf");
-	if (servertest) {
-		int sock;
-		struct sockaddr_in my_addr;
-		sock = socket(PF_INET, SOCK_DGRAM, 0);
-                evutil_make_socket_nonblocking(sock);
-		my_addr.sin_family = AF_INET;
-		my_addr.sin_port = htons(10053);
-		my_addr.sin_addr.s_addr = INADDR_ANY;
-		if (bind(sock, (struct sockaddr*)&my_addr, sizeof(my_addr))<0) {
-			perror("bind");
-			exit(1);
-		}
-		evdns_add_server_port(sock, 0, evdns_server_callback, NULL);
-	}
-	for (; idx < c; ++idx) {
-		if (reverse) {
-			struct in_addr addr;
-			if (!inet_aton(v[idx], &addr)) {
-				fprintf(stderr, "Skipping non-IP %s\n", v[idx]);
-				continue;
-			}
-			fprintf(stderr, "resolving %s...\n",v[idx]);
-			evdns_resolve_reverse(&addr, 0, main_callback, v[idx]);
-		} else {
-			fprintf(stderr, "resolving (fwd) %s...\n",v[idx]);
-			evdns_resolve_ipv4(v[idx], 0, main_callback, v[idx]);
-		}
-	}
-	fflush(stdout);
-	event_dispatch();
-	return 0;
-}
-#endif
diff --git a/libevent/evdns.h b/libevent/evdns.h
deleted file mode 100644
index 1eb5c382480e..000000000000
--- a/libevent/evdns.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-/*
- * The original DNS code is due to Adam Langley with heavy
- * modifications by Nick Mathewson.  Adam put his DNS software in the
- * public domain.  You can find his original copyright below.  Please,
- * aware that the code as part of libevent is governed by the 3-clause
- * BSD license above.
- *
- * This software is Public Domain. To view a copy of the public domain dedication,
- * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
- * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
- *
- * I ask and expect, but do not require, that all derivative works contain an
- * attribution similar to:
- * 	Parts developed by Adam Langley <agl@imperialviolet.org>
- *
- * You may wish to replace the word "Parts" with something else depending on
- * the amount of original code.
- *
- * (Derivative works does not include programs which link against, run or include
- * the source verbatim in their source distributions)
- */
-
-/** @file evdns.h
- *
- * Welcome, gentle reader
- *
- * Async DNS lookups are really a whole lot harder than they should be,
- * mostly stemming from the fact that the libc resolver has never been
- * very good at them. Before you use this library you should see if libc
- * can do the job for you with the modern async call getaddrinfo_a
- * (see http://www.imperialviolet.org/page25.html#e498). Otherwise,
- * please continue.
- *
- * This code is based on libevent and you must call event_init before
- * any of the APIs in this file. You must also seed the OpenSSL random
- * source if you are using OpenSSL for ids (see below).
- *
- * This library is designed to be included and shipped with your source
- * code. You statically link with it. You should also test for the
- * existence of strtok_r and define HAVE_STRTOK_R if you have it.
- *
- * The DNS protocol requires a good source of id numbers and these
- * numbers should be unpredictable for spoofing reasons. There are
- * three methods for generating them here and you must define exactly
- * one of them. In increasing order of preference:
- *
- * DNS_USE_GETTIMEOFDAY_FOR_ID:
- *   Using the bottom 16 bits of the usec result from gettimeofday. This
- *   is a pretty poor solution but should work anywhere.
- * DNS_USE_CPU_CLOCK_FOR_ID:
- *   Using the bottom 16 bits of the nsec result from the CPU's time
- *   counter. This is better, but may not work everywhere. Requires
- *   POSIX realtime support and you'll need to link against -lrt on
- *   glibc systems at least.
- * DNS_USE_OPENSSL_FOR_ID:
- *   Uses the OpenSSL RAND_bytes call to generate the data. You must
- *   have seeded the pool before making any calls to this library.
- *
- * The library keeps track of the state of nameservers and will avoid
- * them when they go down. Otherwise it will round robin between them.
- *
- * Quick start guide:
- *   #include "evdns.h"
- *   void callback(int result, char type, int count, int ttl,
- *		 void *addresses, void *arg);
- *   evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
- *   evdns_resolve("www.hostname.com", 0, callback, NULL);
- *
- * When the lookup is complete the callback function is called. The
- * first argument will be one of the DNS_ERR_* defines in evdns.h.
- * Hopefully it will be DNS_ERR_NONE, in which case type will be
- * DNS_IPv4_A, count will be the number of IP addresses, ttl is the time
- * which the data can be cached for (in seconds), addresses will point
- * to an array of uint32_t's and arg will be whatever you passed to
- * evdns_resolve.
- *
- * Searching:
- *
- * In order for this library to be a good replacement for glibc's resolver it
- * supports searching. This involves setting a list of default domains, in
- * which names will be queried for. The number of dots in the query name
- * determines the order in which this list is used.
- *
- * Searching appears to be a single lookup from the point of view of the API,
- * although many DNS queries may be generated from a single call to
- * evdns_resolve. Searching can also drastically slow down the resolution
- * of names.
- *
- * To disable searching:
- *   1. Never set it up. If you never call evdns_resolv_conf_parse or
- *   evdns_search_add then no searching will occur.
- *
- *   2. If you do call evdns_resolv_conf_parse then don't pass
- *   DNS_OPTION_SEARCH (or DNS_OPTIONS_ALL, which implies it).
- *
- *   3. When calling evdns_resolve, pass the DNS_QUERY_NO_SEARCH flag.
- *
- * The order of searches depends on the number of dots in the name. If the
- * number is greater than the ndots setting then the names is first tried
- * globally. Otherwise each search domain is appended in turn.
- *
- * The ndots setting can either be set from a resolv.conf, or by calling
- * evdns_search_ndots_set.
- *
- * For example, with ndots set to 1 (the default) and a search domain list of
- * ["myhome.net"]:
- *  Query: www
- *  Order: www.myhome.net, www.
- *
- *  Query: www.abc
- *  Order: www.abc., www.abc.myhome.net
- *
- * Internals:
- *
- * Requests are kept in two queues. The first is the inflight queue. In
- * this queue requests have an allocated transaction id and nameserver.
- * They will soon be transmitted if they haven't already been.
- *
- * The second is the waiting queue. The size of the inflight ring is
- * limited and all other requests wait in waiting queue for space. This
- * bounds the number of concurrent requests so that we don't flood the
- * nameserver. Several algorithms require a full walk of the inflight
- * queue and so bounding its size keeps thing going nicely under huge
- * (many thousands of requests) loads.
- *
- * If a nameserver loses too many requests it is considered down and we
- * try not to use it. After a while we send a probe to that nameserver
- * (a lookup for google.com) and, if it replies, we consider it working
- * again. If the nameserver fails a probe we wait longer to try again
- * with the next probe.
- */
-
-#ifndef EVENTDNS_H
-#define EVENTDNS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For integer types. */
-#include <evutil.h>
-
-/** Error codes 0-5 are as described in RFC 1035. */
-#define DNS_ERR_NONE 0
-/** The name server was unable to interpret the query */
-#define DNS_ERR_FORMAT 1
-/** The name server was unable to process this query due to a problem with the
- * name server */
-#define DNS_ERR_SERVERFAILED 2
-/** The domain name does not exist */
-#define DNS_ERR_NOTEXIST 3
-/** The name server does not support the requested kind of query */
-#define DNS_ERR_NOTIMPL 4
-/** The name server refuses to reform the specified operation for policy
- * reasons */
-#define DNS_ERR_REFUSED 5
-/** The reply was truncated or ill-formated */
-#define DNS_ERR_TRUNCATED 65
-/** An unknown error occurred */
-#define DNS_ERR_UNKNOWN 66
-/** Communication with the server timed out */
-#define DNS_ERR_TIMEOUT 67
-/** The request was canceled because the DNS subsystem was shut down. */
-#define DNS_ERR_SHUTDOWN 68
-
-#define DNS_IPv4_A 1
-#define DNS_PTR 2
-#define DNS_IPv6_AAAA 3
-
-#define DNS_QUERY_NO_SEARCH 1
-
-#define DNS_OPTION_SEARCH 1
-#define DNS_OPTION_NAMESERVERS 2
-#define DNS_OPTION_MISC 4
-#define DNS_OPTIONS_ALL 7
-
-/**
- * The callback that contains the results from a lookup.
- * - type is either DNS_IPv4_A or DNS_PTR or DNS_IPv6_AAAA
- * - count contains the number of addresses of form type
- * - ttl is the number of seconds the resolution may be cached for.
- * - addresses needs to be cast according to type
- */
-typedef void (*evdns_callback_type) (int result, char type, int count, int ttl, void *addresses, void *arg);
-
-/**
-  Initialize the asynchronous DNS library.
-
-  This function initializes support for non-blocking name resolution by
-  calling evdns_resolv_conf_parse() on UNIX and
-  evdns_config_windows_nameservers() on Windows.
-
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_shutdown()
- */
-int evdns_init(void);
-
-
-/**
-  Shut down the asynchronous DNS resolver and terminate all active requests.
-
-  If the 'fail_requests' option is enabled, all active requests will return
-  an empty result with the error flag set to DNS_ERR_SHUTDOWN. Otherwise,
-  the requests will be silently discarded.
-
-  @param fail_requests if zero, active requests will be aborted; if non-zero,
-		active requests will return DNS_ERR_SHUTDOWN.
-  @see evdns_init()
- */
-void evdns_shutdown(int fail_requests);
-
-
-/**
-  Convert a DNS error code to a string.
-
-  @param err the DNS error code
-  @return a string containing an explanation of the error code
-*/
-const char *evdns_err_to_string(int err);
-
-
-/**
-  Add a nameserver.
-
-  The address should be an IPv4 address in network byte order.
-  The type of address is chosen so that it matches in_addr.s_addr.
-
-  @param address an IP address in network byte order
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_nameserver_ip_add()
- */
-int evdns_nameserver_add(unsigned long int address);
-
-
-/**
-  Get the number of configured nameservers.
-
-  This returns the number of configured nameservers (not necessarily the
-  number of running nameservers).  This is useful for double-checking
-  whether our calls to the various nameserver configuration functions
-  have been successful.
-
-  @return the number of configured nameservers
-  @see evdns_nameserver_add()
- */
-int evdns_count_nameservers(void);
-
-
-/**
-  Remove all configured nameservers, and suspend all pending resolves.
-
-  Resolves will not necessarily be re-attempted until evdns_resume() is called.
-
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resume()
- */
-int evdns_clear_nameservers_and_suspend(void);
-
-
-/**
-  Resume normal operation and continue any suspended resolve requests.
-
-  Re-attempt resolves left in limbo after an earlier call to
-  evdns_clear_nameservers_and_suspend().
-
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_clear_nameservers_and_suspend()
- */
-int evdns_resume(void);
-
-
-/**
-  Add a nameserver.
-
-  This wraps the evdns_nameserver_add() function by parsing a string as an IP
-  address and adds it as a nameserver.
-
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_nameserver_add()
- */
-int evdns_nameserver_ip_add(const char *ip_as_string);
-
-
-/**
-  Lookup an A record for a given name.
-
-  @param name a DNS hostname
-  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
-  @param callback a callback function to invoke when the request is completed
-  @param ptr an argument to pass to the callback function
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resolve_ipv6(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6()
- */
-int evdns_resolve_ipv4(const char *name, int flags, evdns_callback_type callback, void *ptr);
-
-
-/**
-  Lookup an AAAA record for a given name.
-
-  @param name a DNS hostname
-  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
-  @param callback a callback function to invoke when the request is completed
-  @param ptr an argument to pass to the callback function
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resolve_ipv4(), evdns_resolve_reverse(), evdns_resolve_reverse_ipv6()
- */
-int evdns_resolve_ipv6(const char *name, int flags, evdns_callback_type callback, void *ptr);
-
-struct in_addr;
-struct in6_addr;
-
-/**
-  Lookup a PTR record for a given IP address.
-
-  @param in an IPv4 address
-  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
-  @param callback a callback function to invoke when the request is completed
-  @param ptr an argument to pass to the callback function
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resolve_reverse_ipv6()
- */
-int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_type callback, void *ptr);
-
-
-/**
-  Lookup a PTR record for a given IPv6 address.
-
-  @param in an IPv6 address
-  @param flags either 0, or DNS_QUERY_NO_SEARCH to disable searching for this query.
-  @param callback a callback function to invoke when the request is completed
-  @param ptr an argument to pass to the callback function
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resolve_reverse_ipv6()
- */
-int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr);
-
-
-/**
-  Set the value of a configuration option.
-
-  The currently available configuration options are:
-
-    ndots, timeout, max-timeouts, max-inflight, and attempts
-
-  @param option the name of the configuration option to be modified
-  @param val the value to be set
-  @param flags either 0 | DNS_OPTION_SEARCH | DNS_OPTION_MISC
-  @return 0 if successful, or -1 if an error occurred
- */
-int evdns_set_option(const char *option, const char *val, int flags);
-
-
-/**
-  Parse a resolv.conf file.
-
-  The 'flags' parameter determines what information is parsed from the
-  resolv.conf file. See the man page for resolv.conf for the format of this
-  file.
-
-  The following directives are not parsed from the file: sortlist, rotate,
-  no-check-names, inet6, debug.
-
-  If this function encounters an error, the possible return values are: 1 =
-  failed to open file, 2 = failed to stat file, 3 = file too large, 4 = out of
-  memory, 5 = short read from file, 6 = no nameservers listed in the file
-
-  @param flags any of DNS_OPTION_NAMESERVERS|DNS_OPTION_SEARCH|DNS_OPTION_MISC|
-         DNS_OPTIONS_ALL
-  @param filename the path to the resolv.conf file
-  @return 0 if successful, or various positive error codes if an error
-          occurred (see above)
-  @see resolv.conf(3), evdns_config_windows_nameservers()
- */
-int evdns_resolv_conf_parse(int flags, const char *const filename);
-
-
-/**
-  Obtain nameserver information using the Windows API.
-
-  Attempt to configure a set of nameservers based on platform settings on
-  a win32 host.  Preferentially tries to use GetNetworkParams; if that fails,
-  looks in the registry.
-
-  @return 0 if successful, or -1 if an error occurred
-  @see evdns_resolv_conf_parse()
- */
-#ifdef WIN32
-int evdns_config_windows_nameservers(void);
-#endif
-
-
-/**
-  Clear the list of search domains.
- */
-void evdns_search_clear(void);
-
-
-/**
-  Add a domain to the list of search domains
-
-  @param domain the domain to be added to the search list
- */
-void evdns_search_add(const char *domain);
-
-
-/**
-  Set the 'ndots' parameter for searches.
-
-  Sets the number of dots which, when found in a name, causes
-  the first query to be without any search domain.
-
-  @param ndots the new ndots parameter
- */
-void evdns_search_ndots_set(const int ndots);
-
-/**
-  A callback that is invoked when a log message is generated
-
-  @param is_warning indicates if the log message is a 'warning'
-  @param msg the content of the log message
- */
-typedef void (*evdns_debug_log_fn_type)(int is_warning, const char *msg);
-
-
-/**
-  Set the callback function to handle log messages.
-
-  @param fn the callback to be invoked when a log message is generated
- */
-void evdns_set_log_fn(evdns_debug_log_fn_type fn);
-
-/**
-   Set a callback that will be invoked to generate transaction IDs.  By
-   default, we pick transaction IDs based on the current clock time.
-
-   @param fn the new callback, or NULL to use the default.
- */
-void evdns_set_transaction_id_fn(ev_uint16_t (*fn)(void));
-
-#define DNS_NO_SEARCH 1
-
-/*
- * Structures and functions used to implement a DNS server.
- */
-
-struct evdns_server_request {
-	int flags;
-	int nquestions;
-	struct evdns_server_question **questions;
-};
-struct evdns_server_question {
-	int type;
-#ifdef __cplusplus
-	int dns_question_class;
-#else
-	/* You should refer to this field as "dns_question_class".  The
-	 * name "class" works in C for backward compatibility, and will be
-	 * removed in a future version. (1.5 or later). */
-	int class;
-#define dns_question_class class
-#endif
-	char name[1];
-};
-typedef void (*evdns_request_callback_fn_type)(struct evdns_server_request *, void *);
-#define EVDNS_ANSWER_SECTION 0
-#define EVDNS_AUTHORITY_SECTION 1
-#define EVDNS_ADDITIONAL_SECTION 2
-
-#define EVDNS_TYPE_A	   1
-#define EVDNS_TYPE_NS	   2
-#define EVDNS_TYPE_CNAME   5
-#define EVDNS_TYPE_SOA	   6
-#define EVDNS_TYPE_PTR	  12
-#define EVDNS_TYPE_MX	  15
-#define EVDNS_TYPE_TXT	  16
-#define EVDNS_TYPE_AAAA	  28
-
-#define EVDNS_QTYPE_AXFR 252
-#define EVDNS_QTYPE_ALL	 255
-
-#define EVDNS_CLASS_INET   1
-
-struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data);
-void evdns_close_server_port(struct evdns_server_port *port);
-
-int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int dns_class, int ttl, int datalen, int is_name, const char *data);
-int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl);
-int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl);
-int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl);
-int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);
-
-int evdns_server_request_respond(struct evdns_server_request *req, int err);
-int evdns_server_request_drop(struct evdns_server_request *req);
-struct sockaddr;
-int evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !EVENTDNS_H */
diff --git a/libevent/event-internal.h b/libevent/event-internal.h
deleted file mode 100644
index 6436b3358bd0..000000000000
--- a/libevent/event-internal.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVENT_INTERNAL_H_
-#define _EVENT_INTERNAL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "config.h"
-#include "min_heap.h"
-#include "evsignal.h"
-
-struct eventop {
-	const char *name;
-	void *(*init)(struct event_base *);
-	int (*add)(void *, struct event *);
-	int (*del)(void *, struct event *);
-	int (*dispatch)(struct event_base *, void *, struct timeval *);
-	void (*dealloc)(struct event_base *, void *);
-	/* set if we need to reinitialize the event base */
-	int need_reinit;
-};
-
-struct event_base {
-	const struct eventop *evsel;
-	void *evbase;
-	int event_count;		/* counts number of total events */
-	int event_count_active;	/* counts number of active events */
-
-	int event_gotterm;		/* Set to terminate loop */
-	int event_break;		/* Set to terminate loop immediately */
-
-	/* active event management */
-	struct event_list **activequeues;
-	int nactivequeues;
-
-	/* signal handling info */
-	struct evsignal_info sig;
-
-	struct event_list eventqueue;
-	struct timeval event_tv;
-
-	struct min_heap timeheap;
-
-	struct timeval tv_cache;
-};
-
-/* Internal use only: Functions that might be missing from <sys/queue.h> */
-#ifndef HAVE_TAILQFOREACH
-#define	TAILQ_FIRST(head)		((head)->tqh_first)
-#define	TAILQ_END(head)			NULL
-#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
-#define TAILQ_FOREACH(var, head, field)					\
-	for((var) = TAILQ_FIRST(head);					\
-	    (var) != TAILQ_END(head);					\
-	    (var) = TAILQ_NEXT(var, field))
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-} while (0)
-#define TAILQ_LAST(head, headname) \
-        (*(((struct headname *)((head)->tqh_last))->tqh_last))
-#define TAILQ_EMPTY(head)               ((head)->tqh_first == NULL)
-
-#endif /* TAILQ_FOREACH */
-
-int _evsignal_set_handler(struct event_base *base, int evsignal,
-			  void (*fn)(int));
-int _evsignal_restore_handler(struct event_base *base, int evsignal);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EVENT_INTERNAL_H_ */
diff --git a/libevent/event.3 b/libevent/event.3
deleted file mode 100644
index 60cd13a3c8a8..000000000000
--- a/libevent/event.3
+++ /dev/null
@@ -1,624 +0,0 @@
-.\"	$OpenBSD: event.3,v 1.4 2002/07/12 18:50:48 provos Exp $
-.\"
-.\" Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\"
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. 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.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
-.\"
-.Dd August 8, 2000
-.Dt EVENT 3
-.Os
-.Sh NAME
-.Nm event_init ,
-.Nm event_dispatch ,
-.Nm event_loop ,
-.Nm event_loopexit ,
-.Nm event_loopbreak ,
-.Nm event_set ,
-.Nm event_base_dispatch ,
-.Nm event_base_loop ,
-.Nm event_base_loopexit ,
-.Nm event_base_loopbreak ,
-.Nm event_base_set ,
-.Nm event_base_free ,
-.Nm event_add ,
-.Nm event_del ,
-.Nm event_once ,
-.Nm event_base_once ,
-.Nm event_pending ,
-.Nm event_initialized ,
-.Nm event_priority_init ,
-.Nm event_priority_set ,
-.Nm evtimer_set ,
-.Nm evtimer_add ,
-.Nm evtimer_del ,
-.Nm evtimer_pending ,
-.Nm evtimer_initialized ,
-.Nm signal_set ,
-.Nm signal_add ,
-.Nm signal_del ,
-.Nm signal_pending ,
-.Nm signal_initialized ,
-.Nm bufferevent_new ,
-.Nm bufferevent_free ,
-.Nm bufferevent_write ,
-.Nm bufferevent_write_buffer ,
-.Nm bufferevent_read ,
-.Nm bufferevent_enable ,
-.Nm bufferevent_disable ,
-.Nm bufferevent_settimeout ,
-.Nm bufferevent_base_set ,
-.Nm evbuffer_new ,
-.Nm evbuffer_free ,
-.Nm evbuffer_add ,
-.Nm evbuffer_add_buffer ,
-.Nm evbuffer_add_printf ,
-.Nm evbuffer_add_vprintf ,
-.Nm evbuffer_drain ,
-.Nm evbuffer_write ,
-.Nm evbuffer_read ,
-.Nm evbuffer_find ,
-.Nm evbuffer_readline ,
-.Nm evhttp_new ,
-.Nm evhttp_bind_socket ,
-.Nm evhttp_free
-.Nd execute a function when a specific event occurs
-.Sh SYNOPSIS
-.Fd #include <sys/time.h>
-.Fd #include <event.h>
-.Ft "struct event_base *"
-.Fn "event_init" "void"
-.Ft int
-.Fn "event_dispatch" "void"
-.Ft int
-.Fn "event_loop" "int flags"
-.Ft int
-.Fn "event_loopexit" "struct timeval *tv"
-.Ft int
-.Fn "event_loopbreak" "void"
-.Ft void
-.Fn "event_set" "struct event *ev" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg"
-.Ft int
-.Fn "event_base_dispatch" "struct event_base *base"
-.Ft int
-.Fn "event_base_loop" "struct event_base *base" "int flags"
-.Ft int
-.Fn "event_base_loopexit" "struct event_base *base" "struct timeval *tv"
-.Ft int
-.Fn "event_base_loopbreak" "struct event_base *base"
-.Ft int
-.Fn "event_base_set" "struct event_base *base" "struct event *"
-.Ft void
-.Fn "event_base_free" "struct event_base *base"
-.Ft int
-.Fn "event_add" "struct event *ev" "struct timeval *tv"
-.Ft int
-.Fn "event_del" "struct event *ev"
-.Ft int
-.Fn "event_once" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv"
-.Ft int
-.Fn "event_base_once" "struct event_base *base" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv"
-.Ft int
-.Fn "event_pending" "struct event *ev" "short event" "struct timeval *tv"
-.Ft int
-.Fn "event_initialized" "struct event *ev"
-.Ft int
-.Fn "event_priority_init" "int npriorities"
-.Ft int
-.Fn "event_priority_set" "struct event *ev" "int priority"
-.Ft void
-.Fn "evtimer_set" "struct event *ev" "void (*fn)(int, short, void *)" "void *arg"
-.Ft void
-.Fn "evtimer_add" "struct event *ev" "struct timeval *"
-.Ft void
-.Fn "evtimer_del" "struct event *ev"
-.Ft int
-.Fn "evtimer_pending" "struct event *ev" "struct timeval *tv"
-.Ft int
-.Fn "evtimer_initialized" "struct event *ev"
-.Ft void
-.Fn "signal_set" "struct event *ev" "int signal" "void (*fn)(int, short, void *)" "void *arg"
-.Ft void
-.Fn "signal_add" "struct event *ev" "struct timeval *"
-.Ft void
-.Fn "signal_del" "struct event *ev"
-.Ft int
-.Fn "signal_pending" "struct event *ev" "struct timeval *tv"
-.Ft int
-.Fn "signal_initialized" "struct event *ev"
-.Ft "struct bufferevent *"
-.Fn "bufferevent_new" "int fd" "evbuffercb readcb" "evbuffercb writecb" "everrorcb" "void *cbarg"
-.Ft void
-.Fn "bufferevent_free" "struct bufferevent *bufev"
-.Ft int
-.Fn "bufferevent_write" "struct bufferevent *bufev" "void *data" "size_t size"
-.Ft int
-.Fn "bufferevent_write_buffer" "struct bufferevent *bufev" "struct evbuffer *buf"
-.Ft size_t
-.Fn "bufferevent_read" "struct bufferevent *bufev" "void *data" "size_t size"
-.Ft int
-.Fn "bufferevent_enable" "struct bufferevent *bufev" "short event"
-.Ft int
-.Fn "bufferevent_disable" "struct bufferevent *bufev" "short event"
-.Ft void
-.Fn "bufferevent_settimeout" "struct bufferevent *bufev" "int timeout_read" "int timeout_write"
-.Ft int
-.Fn "bufferevent_base_set" "struct event_base *base" "struct bufferevent *bufev"
-.Ft "struct evbuffer *"
-.Fn "evbuffer_new" "void"
-.Ft void
-.Fn "evbuffer_free" "struct evbuffer *buf"
-.Ft int
-.Fn "evbuffer_add" "struct evbuffer *buf" "const void *data" "size_t size"
-.Ft int
-.Fn "evbuffer_add_buffer" "struct evbuffer *dst" "struct evbuffer *src"
-.Ft int
-.Fn "evbuffer_add_printf" "struct evbuffer *buf" "const char *fmt" "..."
-.Ft int
-.Fn "evbuffer_add_vprintf" "struct evbuffer *buf" "const char *fmt" "va_list ap"
-.Ft void
-.Fn "evbuffer_drain" "struct evbuffer *buf" "size_t size"
-.Ft int
-.Fn "evbuffer_write" "struct evbuffer *buf" "int fd"
-.Ft int
-.Fn "evbuffer_read" "struct evbuffer *buf" "int fd" "int size"
-.Ft "u_char *"
-.Fn "evbuffer_find" "struct evbuffer *buf" "const u_char *data" "size_t size"
-.Ft "char *"
-.Fn "evbuffer_readline" "struct evbuffer *buf"
-.Ft "struct evhttp *"
-.Fn "evhttp_new" "struct event_base *base"
-.Ft int
-.Fn "evhttp_bind_socket" "struct evhttp *http" "const char *address" "u_short port"
-.Ft "void"
-.Fn "evhttp_free" "struct evhttp *http"
-.Ft int
-.Fa (*event_sigcb)(void) ;
-.Ft volatile sig_atomic_t
-.Fa event_gotsig ;
-.Sh DESCRIPTION
-The
-.Nm event
-API provides a mechanism to execute a function when a specific event
-on a file descriptor occurs or after a given time has passed.
-.Pp
-The
-.Nm event
-API needs to be initialized with
-.Fn event_init
-before it can be used.
-.Pp
-In order to process events, an application needs to call
-.Fn event_dispatch .
-This function only returns on error, and should replace the event core
-of the application program.
-.Pp
-The function
-.Fn event_set
-prepares the event structure
-.Fa ev
-to be used in future calls to
-.Fn event_add
-and
-.Fn event_del .
-The event will be prepared to call the function specified by the
-.Fa fn
-argument with an
-.Fa int
-argument indicating the file descriptor, a
-.Fa short
-argument indicating the type of event, and a
-.Fa void *
-argument given in the
-.Fa arg
-argument.
-The
-.Fa fd
-indicates the file descriptor that should be monitored for events.
-The events can be either
-.Va EV_READ ,
-.Va EV_WRITE ,
-or both,
-indicating that an application can read or write from the file descriptor
-respectively without blocking.
-.Pp
-The function
-.Fa fn
-will be called with the file descriptor that triggered the event and
-the type of event which will be either
-.Va EV_TIMEOUT ,
-.Va EV_SIGNAL ,
-.Va EV_READ ,
-or
-.Va EV_WRITE .
-Additionally, an event which has registered interest in more than one of the
-preceding events, via bitwise-OR to
-.Fn event_set ,
-can provide its callback function with a bitwise-OR of more than one triggered
-event.
-The additional flag
-.Va EV_PERSIST
-makes an
-.Fn event_add
-persistent until
-.Fn event_del
-has been called.
-.Pp
-Once initialized, the
-.Fa ev
-structure can be used repeatedly with
-.Fn event_add
-and
-.Fn event_del
-and does not need to be reinitialized unless the function called and/or
-the argument to it are to be changed.
-However, when an
-.Fa ev
-structure has been added to libevent using
-.Fn event_add
-the structure must persist until the event occurs (assuming
-.Fa EV_PERSIST
-is not set) or is removed
-using
-.Fn event_del .
-You may not reuse the same
-.Fa ev
-structure for multiple monitored descriptors; each descriptor
-needs its own
-.Fa ev .
-.Pp
-The function
-.Fn event_add
-schedules the execution of the
-.Fa ev
-event when the event specified in
-.Fn event_set
-occurs or in at least the time specified in the
-.Fa tv .
-If
-.Fa tv
-is
-.Dv NULL ,
-no timeout occurs and the function will only be called
-if a matching event occurs on the file descriptor.
-The event in the
-.Fa ev
-argument must be already initialized by
-.Fn event_set
-and may not be used in calls to
-.Fn event_set
-until it has timed out or been removed with
-.Fn event_del .
-If the event in the
-.Fa ev
-argument already has a scheduled timeout, the old timeout will be
-replaced by the new one.
-.Pp
-The function
-.Fn event_del
-will cancel the event in the argument
-.Fa ev .
-If the event has already executed or has never been added
-the call will have no effect.
-.Pp
-The functions
-.Fn evtimer_set ,
-.Fn evtimer_add ,
-.Fn evtimer_del ,
-.Fn evtimer_initialized ,
-and
-.Fn evtimer_pending
-are abbreviations for common situations where only a timeout is required.
-The file descriptor passed will be \-1, and the event type will be
-.Va EV_TIMEOUT .
-.Pp
-The functions
-.Fn signal_set ,
-.Fn signal_add ,
-.Fn signal_del ,
-.Fn signal_initialized ,
-and
-.Fn signal_pending
-are abbreviations.
-The event type will be a persistent
-.Va EV_SIGNAL .
-That means
-.Fn signal_set
-adds
-.Va EV_PERSIST .
-.Pp
-In order to avoid races in signal handlers, the
-.Nm event
-API provides two variables:
-.Va event_sigcb
-and
-.Va event_gotsig .
-A signal handler
-sets
-.Va event_gotsig
-to indicate that a signal has been received.
-The application sets
-.Va event_sigcb
-to a callback function.
-After the signal handler sets
-.Va event_gotsig ,
-.Nm event_dispatch
-will execute the callback function to process received signals.
-The callback returns 1 when no events are registered any more.
-It can return \-1 to indicate an error to the
-.Nm event
-library, causing
-.Fn event_dispatch
-to terminate with
-.Va errno
-set to
-.Er EINTR .
-.Pp
-The function
-.Fn event_once
-is similar to
-.Fn event_set .
-However, it schedules a callback to be called exactly once and does not
-require the caller to prepare an
-.Fa event
-structure.
-This function supports
-.Fa EV_TIMEOUT ,
-.Fa EV_READ ,
-and
-.Fa EV_WRITE .
-.Pp
-The
-.Fn event_pending
-function can be used to check if the event specified by
-.Fa event
-is pending to run.
-If
-.Va EV_TIMEOUT
-was specified and
-.Fa tv
-is not
-.Dv NULL ,
-the expiration time of the event will be returned in
-.Fa tv .
-.Pp
-The
-.Fn event_initialized
-macro can be used to check if an event has been initialized.
-.Pp
-The
-.Nm event_loop
-function provides an interface for single pass execution of pending
-events.
-The flags
-.Va EVLOOP_ONCE
-and
-.Va EVLOOP_NONBLOCK
-are recognized.
-The
-.Nm event_loopexit
-function exits from the event loop. The next
-.Fn event_loop
-iteration after the
-given timer expires will complete normally (handling all queued events) then
-exit without blocking for events again. Subsequent invocations of
-.Fn event_loop
-will proceed normally.
-The
-.Nm event_loopbreak
-function exits from the event loop immediately.
-.Fn event_loop
-will abort after the next event is completed;
-.Fn event_loopbreak
-is typically invoked from this event's callback. This behavior is analogous
-to the "break;" statement. Subsequent invocations of
-.Fn event_loop
-will proceed normally.
-.Pp
-It is the responsibility of the caller to provide these functions with
-pre-allocated event structures.
-.Pp
-.Sh EVENT PRIORITIES
-By default
-.Nm libevent
-schedules all active events with the same priority.
-However, sometimes it is desirable to process some events with a higher
-priority than others.
-For that reason,
-.Nm libevent
-supports strict priority queues.
-Active events with a lower priority are always processed before events
-with a higher priority.
-.Pp
-The number of different priorities can be set initially with the
-.Fn event_priority_init
-function.
-This function should be called before the first call to
-.Fn event_dispatch .
-The
-.Fn event_priority_set
-function can be used to assign a priority to an event.
-By default,
-.Nm libevent
-assigns the middle priority to all events unless their priority
-is explicitly set.
-.Sh THREAD SAFE EVENTS
-.Nm Libevent
-has experimental support for thread-safe events.
-When initializing the library via
-.Fn event_init ,
-an event base is returned.
-This event base can be used in conjunction with calls to
-.Fn event_base_set ,
-.Fn event_base_dispatch ,
-.Fn event_base_loop ,
-.Fn event_base_loopexit ,
-.Fn bufferevent_base_set
-and
-.Fn event_base_free .
-.Fn event_base_set
-should be called after preparing an event with
-.Fn event_set ,
-as
-.Fn event_set
-assigns the provided event to the most recently created event base.
-.Fn bufferevent_base_set
-should be called after preparing a bufferevent with
-.Fn bufferevent_new .
-.Fn event_base_free
-should be used to free memory associated with the event base
-when it is no longer needed.
-.Sh BUFFERED EVENTS
-.Nm libevent
-provides an abstraction on top of the regular event callbacks.
-This abstraction is called a
-.Va "buffered event" .
-A buffered event provides input and output buffers that get filled
-and drained automatically.
-The user of a buffered event no longer deals directly with the IO,
-but instead is reading from input and writing to output buffers.
-.Pp
-A new bufferevent is created by
-.Fn bufferevent_new .
-The parameter
-.Fa fd
-specifies the file descriptor from which data is read and written to.
-This file descriptor is not allowed to be a
-.Xr pipe 2 .
-The next three parameters are callbacks.
-The read and write callback have the following form:
-.Ft void
-.Fn "(*cb)" "struct bufferevent *bufev" "void *arg" .
-The error callback has the following form:
-.Ft void
-.Fn "(*cb)" "struct bufferevent *bufev" "short what" "void *arg" .
-The argument is specified by the fourth parameter
-.Fa "cbarg" .
-A
-.Fa bufferevent struct
-pointer is returned on success, NULL on error.
-Both the read and the write callback may be NULL.
-The error callback has to be always provided.
-.Pp
-Once initialized, the bufferevent structure can be used repeatedly with
-bufferevent_enable() and bufferevent_disable().
-The flags parameter can be a combination of
-.Va EV_READ
-and
-.Va EV_WRITE .
-When read enabled the bufferevent will try to read from the file
-descriptor and call the read callback.
-The write callback is executed
-whenever the output buffer is drained below the write low watermark,
-which is
-.Va 0
-by default.
-.Pp
-The
-.Fn bufferevent_write
-function can be used to write data to the file descriptor.
-The data is appended to the output buffer and written to the descriptor
-automatically as it becomes available for writing.
-.Fn bufferevent_write
-returns 0 on success or \-1 on failure.
-The
-.Fn bufferevent_read
-function is used to read data from the input buffer,
-returning the amount of data read.
-.Pp
-If multiple bases are in use, bufferevent_base_set() must be called before
-enabling the bufferevent for the first time.
-.Sh NON-BLOCKING HTTP SUPPORT
-.Nm libevent
-provides a very thin HTTP layer that can be used both to host an HTTP
-server and also to make HTTP requests.
-An HTTP server can be created by calling
-.Fn evhttp_new .
-It can be bound to any port and address with the
-.Fn evhttp_bind_socket
-function.
-When the HTTP server is no longer used, it can be freed via
-.Fn evhttp_free .
-.Pp
-To be notified of HTTP requests, a user needs to register callbacks with the
-HTTP server.
-This can be done by calling
-.Fn evhttp_set_cb .
-The second argument is the URI for which a callback is being registered.
-The corresponding callback will receive an
-.Va struct evhttp_request
-object that contains all information about the request.
-.Pp
-This section does not document all the possible function calls; please
-check
-.Va event.h
-for the public interfaces.
-.Sh ADDITIONAL NOTES
-It is possible to disable support for
-.Va epoll , kqueue , devpoll , poll
-or
-.Va select
-by setting the environment variable
-.Va EVENT_NOEPOLL , EVENT_NOKQUEUE , EVENT_NODEVPOLL , EVENT_NOPOLL
-or
-.Va EVENT_NOSELECT ,
-respectively.
-By setting the environment variable
-.Va EVENT_SHOW_METHOD ,
-.Nm libevent
-displays the kernel notification method that it uses.
-.Sh RETURN VALUES
-Upon successful completion
-.Fn event_add
-and
-.Fn event_del
-return 0.
-Otherwise, \-1 is returned and the global variable errno is
-set to indicate the error.
-.Sh SEE ALSO
-.Xr kqueue 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr evdns 3 ,
-.Xr timeout 9
-.Sh HISTORY
-The
-.Nm event
-API manpage is based on the
-.Xr timeout 9
-manpage by Artur Grabowski.
-The port of
-.Nm libevent
-to Windows is due to Michael A. Davis.
-Support for real-time signals is due to Taral.
-.Sh AUTHORS
-The
-.Nm event
-library was written by Niels Provos.
-.Sh BUGS
-This documentation is neither complete nor authoritative.
-If you are in doubt about the usage of this API then
-check the source code to find out how it works, write
-up the missing piece of documentation and send it to
-me for inclusion in this man page.
diff --git a/libevent/event.c b/libevent/event.c
deleted file mode 100644
index 6eb5db05c87a..000000000000
--- a/libevent/event.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else 
-#include <sys/_time.h>
-#endif
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-
-#include "event.h"
-#include "event-internal.h"
-#include "evutil.h"
-#include "log.h"
-
-#ifdef HAVE_EVENT_PORTS
-extern const struct eventop evportops;
-#endif
-#ifdef HAVE_SELECT
-extern const struct eventop selectops;
-#endif
-#ifdef HAVE_POLL
-extern const struct eventop pollops;
-#endif
-#ifdef HAVE_EPOLL
-extern const struct eventop epollops;
-#endif
-#ifdef HAVE_WORKING_KQUEUE
-extern const struct eventop kqops;
-#endif
-#ifdef HAVE_DEVPOLL
-extern const struct eventop devpollops;
-#endif
-#ifdef WIN32
-extern const struct eventop win32ops;
-#endif
-
-/* In order of preference */
-static const struct eventop *eventops[] = {
-#ifdef HAVE_EVENT_PORTS
-	&evportops,
-#endif
-#ifdef HAVE_WORKING_KQUEUE
-	&kqops,
-#endif
-#ifdef HAVE_EPOLL
-	&epollops,
-#endif
-#ifdef HAVE_DEVPOLL
-	&devpollops,
-#endif
-#ifdef HAVE_POLL
-	&pollops,
-#endif
-#ifdef HAVE_SELECT
-	&selectops,
-#endif
-#ifdef WIN32
-	&win32ops,
-#endif
-	NULL
-};
-
-/* Global state */
-struct event_base *current_base = NULL;
-extern struct event_base *evsignal_base;
-static int use_monotonic;
-
-/* Handle signals - This is a deprecated interface */
-int (*event_sigcb)(void);		/* Signal callback when gotsig is set */
-volatile sig_atomic_t event_gotsig;	/* Set in signal handler */
-
-/* Prototypes */
-static void	event_queue_insert(struct event_base *, struct event *, int);
-static void	event_queue_remove(struct event_base *, struct event *, int);
-static int	event_haveevents(struct event_base *);
-
-static void	event_process_active(struct event_base *);
-
-static int	timeout_next(struct event_base *, struct timeval **);
-static void	timeout_process(struct event_base *);
-static void	timeout_correct(struct event_base *, struct timeval *);
-
-static void
-detect_monotonic(void)
-{
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-	struct timespec	ts;
-
-	if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
-		use_monotonic = 1;
-#endif
-}
-
-static int
-gettime(struct event_base *base, struct timeval *tp)
-{
-	if (base->tv_cache.tv_sec) {
-		*tp = base->tv_cache;
-		return (0);
-	}
-
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-	if (use_monotonic) {
-		struct timespec	ts;
-
-		if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
-			return (-1);
-
-		tp->tv_sec = ts.tv_sec;
-		tp->tv_usec = ts.tv_nsec / 1000;
-		return (0);
-	}
-#endif
-
-	return (evutil_gettimeofday(tp, NULL));
-}
-
-struct event_base *
-event_init(void)
-{
-	struct event_base *base = event_base_new();
-
-	if (base != NULL)
-		current_base = base;
-
-	return (base);
-}
-
-struct event_base *
-event_base_new(void)
-{
-	int i;
-	struct event_base *base;
-
-	if ((base = calloc(1, sizeof(struct event_base))) == NULL)
-		event_err(1, "%s: calloc", __func__);
-
-	event_sigcb = NULL;
-	event_gotsig = 0;
-
-	detect_monotonic();
-	gettime(base, &base->event_tv);
-	
-	min_heap_ctor(&base->timeheap);
-	TAILQ_INIT(&base->eventqueue);
-	base->sig.ev_signal_pair[0] = -1;
-	base->sig.ev_signal_pair[1] = -1;
-	
-	base->evbase = NULL;
-	for (i = 0; eventops[i] && !base->evbase; i++) {
-		base->evsel = eventops[i];
-
-		base->evbase = base->evsel->init(base);
-	}
-
-	if (base->evbase == NULL)
-		event_errx(1, "%s: no event mechanism available", __func__);
-
-	if (getenv("EVENT_SHOW_METHOD")) 
-		event_msgx("libevent using: %s\n",
-			   base->evsel->name);
-
-	/* allocate a single active event queue */
-	event_base_priority_init(base, 1);
-
-	return (base);
-}
-
-void
-event_base_free(struct event_base *base)
-{
-	int i, n_deleted=0;
-	struct event *ev;
-
-	if (base == NULL && current_base)
-		base = current_base;
-	if (base == current_base)
-		current_base = NULL;
-
-	/* XXX(niels) - check for internal events first */
-	assert(base);
-	/* Delete all non-internal events. */
-	for (ev = TAILQ_FIRST(&base->eventqueue); ev; ) {
-		struct event *next = TAILQ_NEXT(ev, ev_next);
-		if (!(ev->ev_flags & EVLIST_INTERNAL)) {
-			event_del(ev);
-			++n_deleted;
-		}
-		ev = next;
-	}
-	while ((ev = min_heap_top(&base->timeheap)) != NULL) {
-		event_del(ev);
-		++n_deleted;
-	}
-
-	for (i = 0; i < base->nactivequeues; ++i) {
-		for (ev = TAILQ_FIRST(base->activequeues[i]); ev; ) {
-			struct event *next = TAILQ_NEXT(ev, ev_active_next);
-			if (!(ev->ev_flags & EVLIST_INTERNAL)) {
-				event_del(ev);
-				++n_deleted;
-			}
-			ev = next;
-		}
-	}
-
-	if (n_deleted)
-		event_debug(("%s: %d events were still set in base",
-			__func__, n_deleted));
-
-	if (base->evsel->dealloc != NULL)
-		base->evsel->dealloc(base, base->evbase);
-
-	for (i = 0; i < base->nactivequeues; ++i)
-		assert(TAILQ_EMPTY(base->activequeues[i]));
-
-	assert(min_heap_empty(&base->timeheap));
-	min_heap_dtor(&base->timeheap);
-
-	for (i = 0; i < base->nactivequeues; ++i)
-		free(base->activequeues[i]);
-	free(base->activequeues);
-
-	assert(TAILQ_EMPTY(&base->eventqueue));
-
-	free(base);
-}
-
-/* reinitialized the event base after a fork */
-int
-event_reinit(struct event_base *base)
-{
-	const struct eventop *evsel = base->evsel;
-	void *evbase = base->evbase;
-	int res = 0;
-	struct event *ev;
-
-	/* check if this event mechanism requires reinit */
-	if (!evsel->need_reinit)
-		return (0);
-
-	/* prevent internal delete */
-	if (base->sig.ev_signal_added) {
-		/* we cannot call event_del here because the base has
-		 * not been reinitialized yet. */
-		event_queue_remove(base, &base->sig.ev_signal,
-		    EVLIST_INSERTED);
-		if (base->sig.ev_signal.ev_flags & EVLIST_ACTIVE)
-			event_queue_remove(base, &base->sig.ev_signal,
-			    EVLIST_ACTIVE);
-		base->sig.ev_signal_added = 0;
-	}
-	
-	if (base->evsel->dealloc != NULL)
-		base->evsel->dealloc(base, base->evbase);
-	evbase = base->evbase = evsel->init(base);
-	if (base->evbase == NULL)
-		event_errx(1, "%s: could not reinitialize event mechanism",
-		    __func__);
-
-	TAILQ_FOREACH(ev, &base->eventqueue, ev_next) {
-		if (evsel->add(evbase, ev) == -1)
-			res = -1;
-	}
-
-	return (res);
-}
-
-int
-event_priority_init(int npriorities)
-{
-  return event_base_priority_init(current_base, npriorities);
-}
-
-int
-event_base_priority_init(struct event_base *base, int npriorities)
-{
-	int i;
-
-	if (base->event_count_active)
-		return (-1);
-
-	if (base->nactivequeues && npriorities != base->nactivequeues) {
-		for (i = 0; i < base->nactivequeues; ++i) {
-			free(base->activequeues[i]);
-		}
-		free(base->activequeues);
-	}
-
-	/* Allocate our priority queues */
-	base->nactivequeues = npriorities;
-	base->activequeues = (struct event_list **)calloc(base->nactivequeues,
-	    npriorities * sizeof(struct event_list *));
-	if (base->activequeues == NULL)
-		event_err(1, "%s: calloc", __func__);
-
-	for (i = 0; i < base->nactivequeues; ++i) {
-		base->activequeues[i] = malloc(sizeof(struct event_list));
-		if (base->activequeues[i] == NULL)
-			event_err(1, "%s: malloc", __func__);
-		TAILQ_INIT(base->activequeues[i]);
-	}
-
-	return (0);
-}
-
-int
-event_haveevents(struct event_base *base)
-{
-	return (base->event_count > 0);
-}
-
-/*
- * Active events are stored in priority queues.  Lower priorities are always
- * process before higher priorities.  Low priority events can starve high
- * priority ones.
- */
-
-static void
-event_process_active(struct event_base *base)
-{
-	struct event *ev;
-	struct event_list *activeq = NULL;
-	int i;
-	short ncalls;
-
-	for (i = 0; i < base->nactivequeues; ++i) {
-		if (TAILQ_FIRST(base->activequeues[i]) != NULL) {
-			activeq = base->activequeues[i];
-			break;
-		}
-	}
-
-	assert(activeq != NULL);
-
-	for (ev = TAILQ_FIRST(activeq); ev; ev = TAILQ_FIRST(activeq)) {
-		if (ev->ev_events & EV_PERSIST)
-			event_queue_remove(base, ev, EVLIST_ACTIVE);
-		else
-			event_del(ev);
-		
-		/* Allows deletes to work */
-		ncalls = ev->ev_ncalls;
-		ev->ev_pncalls = &ncalls;
-		while (ncalls) {
-			ncalls--;
-			ev->ev_ncalls = ncalls;
-			(*ev->ev_callback)((int)ev->ev_fd, ev->ev_res, ev->ev_arg);
-			if (event_gotsig || base->event_break)
-				return;
-		}
-	}
-}
-
-/*
- * Wait continously for events.  We exit only if no events are left.
- */
-
-int
-event_dispatch(void)
-{
-	return (event_loop(0));
-}
-
-int
-event_base_dispatch(struct event_base *event_base)
-{
-  return (event_base_loop(event_base, 0));
-}
-
-const char *
-event_base_get_method(struct event_base *base)
-{
-	assert(base);
-	return (base->evsel->name);
-}
-
-static void
-event_loopexit_cb(int fd, short what, void *arg)
-{
-	struct event_base *base = arg;
-	base->event_gotterm = 1;
-}
-
-/* not thread safe */
-int
-event_loopexit(const struct timeval *tv)
-{
-	return (event_once(-1, EV_TIMEOUT, event_loopexit_cb,
-		    current_base, tv));
-}
-
-int
-event_base_loopexit(struct event_base *event_base, const struct timeval *tv)
-{
-	return (event_base_once(event_base, -1, EV_TIMEOUT, event_loopexit_cb,
-		    event_base, tv));
-}
-
-/* not thread safe */
-int
-event_loopbreak(void)
-{
-	return (event_base_loopbreak(current_base));
-}
-
-int
-event_base_loopbreak(struct event_base *event_base)
-{
-	if (event_base == NULL)
-		return (-1);
-
-	event_base->event_break = 1;
-	return (0);
-}
-
-
-
-/* not thread safe */
-
-int
-event_loop(int flags)
-{
-	return event_base_loop(current_base, flags);
-}
-
-int
-event_base_loop(struct event_base *base, int flags)
-{
-	const struct eventop *evsel = base->evsel;
-	void *evbase = base->evbase;
-	struct timeval tv;
-	struct timeval *tv_p;
-	int res, done;
-
-	/* clear time cache */
-	base->tv_cache.tv_sec = 0;
-
-	if (base->sig.ev_signal_added)
-		evsignal_base = base;
-	done = 0;
-	while (!done) {
-		/* Terminate the loop if we have been asked to */
-		if (base->event_gotterm) {
-			base->event_gotterm = 0;
-			break;
-		}
-
-		if (base->event_break) {
-			base->event_break = 0;
-			break;
-		}
-
-		/* You cannot use this interface for multi-threaded apps */
-		while (event_gotsig) {
-			event_gotsig = 0;
-			if (event_sigcb) {
-				res = (*event_sigcb)();
-				if (res == -1) {
-					errno = EINTR;
-					return (-1);
-				}
-			}
-		}
-
-		timeout_correct(base, &tv);
-
-		tv_p = &tv;
-		if (!base->event_count_active && !(flags & EVLOOP_NONBLOCK)) {
-			timeout_next(base, &tv_p);
-		} else {
-			/* 
-			 * if we have active events, we just poll new events
-			 * without waiting.
-			 */
-			evutil_timerclear(&tv);
-		}
-		
-		/* If we have no events, we just exit */
-		if (!event_haveevents(base)) {
-			event_debug(("%s: no events registered.", __func__));
-			return (1);
-		}
-
-		/* update last old time */
-		gettime(base, &base->event_tv);
-
-		/* clear time cache */
-		base->tv_cache.tv_sec = 0;
-
-		res = evsel->dispatch(base, evbase, tv_p);
-
-		if (res == -1)
-			return (-1);
-		gettime(base, &base->tv_cache);
-
-		timeout_process(base);
-
-		if (base->event_count_active) {
-			event_process_active(base);
-			if (!base->event_count_active && (flags & EVLOOP_ONCE))
-				done = 1;
-		} else if (flags & EVLOOP_NONBLOCK)
-			done = 1;
-	}
-
-	/* clear time cache */
-	base->tv_cache.tv_sec = 0;
-
-	event_debug(("%s: asked to terminate loop.", __func__));
-	return (0);
-}
-
-/* Sets up an event for processing once */
-
-struct event_once {
-	struct event ev;
-
-	void (*cb)(int, short, void *);
-	void *arg;
-};
-
-/* One-time callback, it deletes itself */
-
-static void
-event_once_cb(int fd, short events, void *arg)
-{
-	struct event_once *eonce = arg;
-
-	(*eonce->cb)(fd, events, eonce->arg);
-	free(eonce);
-}
-
-/* not threadsafe, event scheduled once. */
-int
-event_once(int fd, short events,
-    void (*callback)(int, short, void *), void *arg, const struct timeval *tv)
-{
-	return event_base_once(current_base, fd, events, callback, arg, tv);
-}
-
-/* Schedules an event once */
-int
-event_base_once(struct event_base *base, int fd, short events,
-    void (*callback)(int, short, void *), void *arg, const struct timeval *tv)
-{
-	struct event_once *eonce;
-	struct timeval etv;
-	int res;
-
-	/* We cannot support signals that just fire once */
-	if (events & EV_SIGNAL)
-		return (-1);
-
-	if ((eonce = calloc(1, sizeof(struct event_once))) == NULL)
-		return (-1);
-
-	eonce->cb = callback;
-	eonce->arg = arg;
-
-	if (events == EV_TIMEOUT) {
-		if (tv == NULL) {
-			evutil_timerclear(&etv);
-			tv = &etv;
-		}
-
-		evtimer_set(&eonce->ev, event_once_cb, eonce);
-	} else if (events & (EV_READ|EV_WRITE)) {
-		events &= EV_READ|EV_WRITE;
-
-		event_set(&eonce->ev, fd, events, event_once_cb, eonce);
-	} else {
-		/* Bad event combination */
-		free(eonce);
-		return (-1);
-	}
-
-	res = event_base_set(base, &eonce->ev);
-	if (res == 0)
-		res = event_add(&eonce->ev, tv);
-	if (res != 0) {
-		free(eonce);
-		return (res);
-	}
-
-	return (0);
-}
-
-void
-event_set(struct event *ev, int fd, short events,
-	  void (*callback)(int, short, void *), void *arg)
-{
-	/* Take the current base - caller needs to set the real base later */
-	ev->ev_base = current_base;
-
-	ev->ev_callback = callback;
-	ev->ev_arg = arg;
-	ev->ev_fd = fd;
-	ev->ev_events = events;
-	ev->ev_res = 0;
-	ev->ev_flags = EVLIST_INIT;
-	ev->ev_ncalls = 0;
-	ev->ev_pncalls = NULL;
-
-	min_heap_elem_init(ev);
-
-	/* by default, we put new events into the middle priority */
-	if(current_base)
-		ev->ev_pri = current_base->nactivequeues/2;
-}
-
-int
-event_base_set(struct event_base *base, struct event *ev)
-{
-	/* Only innocent events may be assigned to a different base */
-	if (ev->ev_flags != EVLIST_INIT)
-		return (-1);
-
-	ev->ev_base = base;
-	ev->ev_pri = base->nactivequeues/2;
-
-	return (0);
-}
-
-/*
- * Set's the priority of an event - if an event is already scheduled
- * changing the priority is going to fail.
- */
-
-int
-event_priority_set(struct event *ev, int pri)
-{
-	if (ev->ev_flags & EVLIST_ACTIVE)
-		return (-1);
-	if (pri < 0 || pri >= ev->ev_base->nactivequeues)
-		return (-1);
-
-	ev->ev_pri = pri;
-
-	return (0);
-}
-
-/*
- * Checks if a specific event is pending or scheduled.
- */
-
-int
-event_pending(struct event *ev, short event, struct timeval *tv)
-{
-	struct timeval	now, res;
-	int flags = 0;
-
-	if (ev->ev_flags & EVLIST_INSERTED)
-		flags |= (ev->ev_events & (EV_READ|EV_WRITE|EV_SIGNAL));
-	if (ev->ev_flags & EVLIST_ACTIVE)
-		flags |= ev->ev_res;
-	if (ev->ev_flags & EVLIST_TIMEOUT)
-		flags |= EV_TIMEOUT;
-
-	event &= (EV_TIMEOUT|EV_READ|EV_WRITE|EV_SIGNAL);
-
-	/* See if there is a timeout that we should report */
-	if (tv != NULL && (flags & event & EV_TIMEOUT)) {
-		gettime(ev->ev_base, &now);
-		evutil_timersub(&ev->ev_timeout, &now, &res);
-		/* correctly remap to real time */
-		evutil_gettimeofday(&now, NULL);
-		evutil_timeradd(&now, &res, tv);
-	}
-
-	return (flags & event);
-}
-
-int
-event_add(struct event *ev, const struct timeval *tv)
-{
-	struct event_base *base = ev->ev_base;
-	const struct eventop *evsel = base->evsel;
-	void *evbase = base->evbase;
-	int res = 0;
-
-	event_debug((
-		 "event_add: event: %p, %s%s%scall %p",
-		 ev,
-		 ev->ev_events & EV_READ ? "EV_READ " : " ",
-		 ev->ev_events & EV_WRITE ? "EV_WRITE " : " ",
-		 tv ? "EV_TIMEOUT " : " ",
-		 ev->ev_callback));
-
-	assert(!(ev->ev_flags & ~EVLIST_ALL));
-
-	/*
-	 * prepare for timeout insertion further below, if we get a
-	 * failure on any step, we should not change any state.
-	 */
-	if (tv != NULL && !(ev->ev_flags & EVLIST_TIMEOUT)) {
-		if (min_heap_reserve(&base->timeheap,
-			1 + min_heap_size(&base->timeheap)) == -1)
-			return (-1);  /* ENOMEM == errno */
-	}
-
-	if ((ev->ev_events & (EV_READ|EV_WRITE|EV_SIGNAL)) &&
-	    !(ev->ev_flags & (EVLIST_INSERTED|EVLIST_ACTIVE))) {
-		res = evsel->add(evbase, ev);
-		if (res != -1)
-			event_queue_insert(base, ev, EVLIST_INSERTED);
-	}
-
-	/* 
-	 * we should change the timout state only if the previous event
-	 * addition succeeded.
-	 */
-	if (res != -1 && tv != NULL) {
-		struct timeval now;
-
-		/* 
-		 * we already reserved memory above for the case where we
-		 * are not replacing an exisiting timeout.
-		 */
-		if (ev->ev_flags & EVLIST_TIMEOUT)
-			event_queue_remove(base, ev, EVLIST_TIMEOUT);
-
-		/* Check if it is active due to a timeout.  Rescheduling
-		 * this timeout before the callback can be executed
-		 * removes it from the active list. */
-		if ((ev->ev_flags & EVLIST_ACTIVE) &&
-		    (ev->ev_res & EV_TIMEOUT)) {
-			/* See if we are just active executing this
-			 * event in a loop
-			 */
-			if (ev->ev_ncalls && ev->ev_pncalls) {
-				/* Abort loop */
-				*ev->ev_pncalls = 0;
-			}
-			
-			event_queue_remove(base, ev, EVLIST_ACTIVE);
-		}
-
-		gettime(base, &now);
-		evutil_timeradd(&now, tv, &ev->ev_timeout);
-
-		event_debug((
-			 "event_add: timeout in %ld seconds, call %p",
-			 tv->tv_sec, ev->ev_callback));
-
-		event_queue_insert(base, ev, EVLIST_TIMEOUT);
-	}
-
-	return (res);
-}
-
-int
-event_del(struct event *ev)
-{
-	struct event_base *base;
-	const struct eventop *evsel;
-	void *evbase;
-
-	event_debug(("event_del: %p, callback %p",
-		 ev, ev->ev_callback));
-
-	/* An event without a base has not been added */
-	if (ev->ev_base == NULL)
-		return (-1);
-
-	base = ev->ev_base;
-	evsel = base->evsel;
-	evbase = base->evbase;
-
-	assert(!(ev->ev_flags & ~EVLIST_ALL));
-
-	/* See if we are just active executing this event in a loop */
-	if (ev->ev_ncalls && ev->ev_pncalls) {
-		/* Abort loop */
-		*ev->ev_pncalls = 0;
-	}
-
-	if (ev->ev_flags & EVLIST_TIMEOUT)
-		event_queue_remove(base, ev, EVLIST_TIMEOUT);
-
-	if (ev->ev_flags & EVLIST_ACTIVE)
-		event_queue_remove(base, ev, EVLIST_ACTIVE);
-
-	if (ev->ev_flags & EVLIST_INSERTED) {
-		event_queue_remove(base, ev, EVLIST_INSERTED);
-		return (evsel->del(evbase, ev));
-	}
-
-	return (0);
-}
-
-void
-event_active(struct event *ev, int res, short ncalls)
-{
-	/* We get different kinds of events, add them together */
-	if (ev->ev_flags & EVLIST_ACTIVE) {
-		ev->ev_res |= res;
-		return;
-	}
-
-	ev->ev_res = res;
-	ev->ev_ncalls = ncalls;
-	ev->ev_pncalls = NULL;
-	event_queue_insert(ev->ev_base, ev, EVLIST_ACTIVE);
-}
-
-static int
-timeout_next(struct event_base *base, struct timeval **tv_p)
-{
-	struct timeval now;
-	struct event *ev;
-	struct timeval *tv = *tv_p;
-
-	if ((ev = min_heap_top(&base->timeheap)) == NULL) {
-		/* if no time-based events are active wait for I/O */
-		*tv_p = NULL;
-		return (0);
-	}
-
-	if (gettime(base, &now) == -1)
-		return (-1);
-
-	if (evutil_timercmp(&ev->ev_timeout, &now, <=)) {
-		evutil_timerclear(tv);
-		return (0);
-	}
-
-	evutil_timersub(&ev->ev_timeout, &now, tv);
-
-	assert(tv->tv_sec >= 0);
-	assert(tv->tv_usec >= 0);
-
-	event_debug(("timeout_next: in %ld seconds", tv->tv_sec));
-	return (0);
-}
-
-/*
- * Determines if the time is running backwards by comparing the current
- * time against the last time we checked.  Not needed when using clock
- * monotonic.
- */
-
-static void
-timeout_correct(struct event_base *base, struct timeval *tv)
-{
-	struct event **pev;
-	unsigned int size;
-	struct timeval off;
-
-	if (use_monotonic)
-		return;
-
-	/* Check if time is running backwards */
-	gettime(base, tv);
-	if (evutil_timercmp(tv, &base->event_tv, >=)) {
-		base->event_tv = *tv;
-		return;
-	}
-
-	event_debug(("%s: time is running backwards, corrected",
-		    __func__));
-	evutil_timersub(&base->event_tv, tv, &off);
-
-	/*
-	 * We can modify the key element of the node without destroying
-	 * the key, beause we apply it to all in the right order.
-	 */
-	pev = base->timeheap.p;
-	size = base->timeheap.n;
-	for (; size-- > 0; ++pev) {
-		struct timeval *ev_tv = &(**pev).ev_timeout;
-		evutil_timersub(ev_tv, &off, ev_tv);
-	}
-	/* Now remember what the new time turned out to be. */
-	base->event_tv = *tv;
-}
-
-void
-timeout_process(struct event_base *base)
-{
-	struct timeval now;
-	struct event *ev;
-
-	if (min_heap_empty(&base->timeheap))
-		return;
-
-	gettime(base, &now);
-
-	while ((ev = min_heap_top(&base->timeheap))) {
-		if (evutil_timercmp(&ev->ev_timeout, &now, >))
-			break;
-
-		/* delete this event from the I/O queues */
-		event_del(ev);
-
-		event_debug(("timeout_process: call %p",
-			 ev->ev_callback));
-		event_active(ev, EV_TIMEOUT, 1);
-	}
-}
-
-void
-event_queue_remove(struct event_base *base, struct event *ev, int queue)
-{
-	if (!(ev->ev_flags & queue))
-		event_errx(1, "%s: %p(fd %d) not on queue %x", __func__,
-			   ev, ev->ev_fd, queue);
-
-	if (~ev->ev_flags & EVLIST_INTERNAL)
-		base->event_count--;
-
-	ev->ev_flags &= ~queue;
-	switch (queue) {
-	case EVLIST_INSERTED:
-		TAILQ_REMOVE(&base->eventqueue, ev, ev_next);
-		break;
-	case EVLIST_ACTIVE:
-		base->event_count_active--;
-		TAILQ_REMOVE(base->activequeues[ev->ev_pri],
-		    ev, ev_active_next);
-		break;
-	case EVLIST_TIMEOUT:
-		min_heap_erase(&base->timeheap, ev);
-		break;
-	default:
-		event_errx(1, "%s: unknown queue %x", __func__, queue);
-	}
-}
-
-void
-event_queue_insert(struct event_base *base, struct event *ev, int queue)
-{
-	if (ev->ev_flags & queue) {
-		/* Double insertion is possible for active events */
-		if (queue & EVLIST_ACTIVE)
-			return;
-
-		event_errx(1, "%s: %p(fd %d) already on queue %x", __func__,
-			   ev, ev->ev_fd, queue);
-	}
-
-	if (~ev->ev_flags & EVLIST_INTERNAL)
-		base->event_count++;
-
-	ev->ev_flags |= queue;
-	switch (queue) {
-	case EVLIST_INSERTED:
-		TAILQ_INSERT_TAIL(&base->eventqueue, ev, ev_next);
-		break;
-	case EVLIST_ACTIVE:
-		base->event_count_active++;
-		TAILQ_INSERT_TAIL(base->activequeues[ev->ev_pri],
-		    ev,ev_active_next);
-		break;
-	case EVLIST_TIMEOUT: {
-		min_heap_push(&base->timeheap, ev);
-		break;
-	}
-	default:
-		event_errx(1, "%s: unknown queue %x", __func__, queue);
-	}
-}
-
-/* Functions for debugging */
-
-const char *
-event_get_version(void)
-{
-	return (VERSION);
-}
-
-/* 
- * No thread-safe interface needed - the information should be the same
- * for all threads.
- */
-
-const char *
-event_get_method(void)
-{
-	return (current_base->evsel->name);
-}
diff --git a/libevent/event.h b/libevent/event.h
deleted file mode 100644
index 039e4f88bcbf..000000000000
--- a/libevent/event.h
+++ /dev/null
@@ -1,1175 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVENT_H_
-#define _EVENT_H_
-
-/** @mainpage
-
-  @section intro Introduction
-
-  libevent is an event notification library for developing scalable network
-  servers.  The libevent API provides a mechanism to execute a callback
-  function when a specific event occurs on a file descriptor or after a
-  timeout has been reached. Furthermore, libevent also support callbacks due
-  to signals or regular timeouts.
-
-  libevent is meant to replace the event loop found in event driven network
-  servers. An application just needs to call event_dispatch() and then add or
-  remove events dynamically without having to change the event loop.
-
-  Currently, libevent supports /dev/poll, kqueue(2), select(2), poll(2) and
-  epoll(4). It also has experimental support for real-time signals. The
-  internal event mechanism is completely independent of the exposed event API,
-  and a simple update of libevent can provide new functionality without having
-  to redesign the applications. As a result, Libevent allows for portable
-  application development and provides the most scalable event notification
-  mechanism available on an operating system. Libevent can also be used for
-  multi-threaded aplications; see Steven Grimm's explanation. Libevent should
-  compile on Linux, *BSD, Mac OS X, Solaris and Windows.
-
-  @section usage Standard usage
-
-  Every program that uses libevent must include the <event.h> header, and pass
-  the -levent flag to the linker.  Before using any of the functions in the
-  library, you must call event_init() or event_base_new() to perform one-time
-  initialization of the libevent library.
-
-  @section event Event notification
-
-  For each file descriptor that you wish to monitor, you must declare an event
-  structure and call event_set() to initialize the members of the structure.
-  To enable notification, you add the structure to the list of monitored
-  events by calling event_add().  The event structure must remain allocated as
-  long as it is active, so it should be allocated on the heap. Finally, you
-  call event_dispatch() to loop and dispatch events.
-
-  @section bufferevent I/O Buffers
-
-  libevent provides an abstraction on top of the regular event callbacks. This
-  abstraction is called a buffered event. A buffered event provides input and
-  output buffers that get filled and drained automatically. The user of a
-  buffered event no longer deals directly with the I/O, but instead is reading
-  from input and writing to output buffers.
-
-  Once initialized via bufferevent_new(), the bufferevent structure can be
-  used repeatedly with bufferevent_enable() and bufferevent_disable().
-  Instead of reading and writing directly to a socket, you would call
-  bufferevent_read() and bufferevent_write().
-
-  When read enabled the bufferevent will try to read from the file descriptor
-  and call the read callback. The write callback is executed whenever the
-  output buffer is drained below the write low watermark, which is 0 by
-  default.
-
-  @section timers Timers
-
-  libevent can also be used to create timers that invoke a callback after a
-  certain amount of time has expired. The evtimer_set() function prepares an
-  event struct to be used as a timer. To activate the timer, call
-  evtimer_add(). Timers can be deactivated by calling evtimer_del().
-
-  @section timeouts Timeouts
-
-  In addition to simple timers, libevent can assign timeout events to file
-  descriptors that are triggered whenever a certain amount of time has passed
-  with no activity on a file descriptor.  The timeout_set() function
-  initializes an event struct for use as a timeout. Once initialized, the
-  event must be activated by using timeout_add().  To cancel the timeout, call
-  timeout_del().
-
-  @section evdns Asynchronous DNS resolution
-
-  libevent provides an asynchronous DNS resolver that should be used instead
-  of the standard DNS resolver functions.  These functions can be imported by
-  including the <evdns.h> header in your program. Before using any of the
-  resolver functions, you must call evdns_init() to initialize the library. To
-  convert a hostname to an IP address, you call the evdns_resolve_ipv4()
-  function.  To perform a reverse lookup, you would call the
-  evdns_resolve_reverse() function.  All of these functions use callbacks to
-  avoid blocking while the lookup is performed.
-
-  @section evhttp Event-driven HTTP servers
-
-  libevent provides a very simple event-driven HTTP server that can be
-  embedded in your program and used to service HTTP requests.
-
-  To use this capability, you need to include the <evhttp.h> header in your
-  program.  You create the server by calling evhttp_new(). Add addresses and
-  ports to listen on with evhttp_bind_socket(). You then register one or more
-  callbacks to handle incoming requests.  Each URI can be assigned a callback
-  via the evhttp_set_cb() function.  A generic callback function can also be
-  registered via evhttp_set_gencb(); this callback will be invoked if no other
-  callbacks have been registered for a given URI.
-
-  @section evrpc A framework for RPC servers and clients
- 
-  libevents provides a framework for creating RPC servers and clients.  It
-  takes care of marshaling and unmarshaling all data structures.
-
-  @section api API Reference
-
-  To browse the complete documentation of the libevent API, click on any of
-  the following links.
-
-  event.h
-  The primary libevent header
-
-  evdns.h
-  Asynchronous DNS resolution
-
-  evhttp.h
-  An embedded libevent-based HTTP server
-
-  evrpc.h
-  A framework for creating RPC servers and clients
-
- */
-
-/** @file event.h
-
-  A library for writing event-driven network servers
-
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <config.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#include <stdarg.h>
-
-/* For int types. */
-#include <evutil.h>
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-#endif
-
-#define EVLIST_TIMEOUT	0x01
-#define EVLIST_INSERTED	0x02
-#define EVLIST_SIGNAL	0x04
-#define EVLIST_ACTIVE	0x08
-#define EVLIST_INTERNAL	0x10
-#define EVLIST_INIT	0x80
-
-/* EVLIST_X_ Private space: 0x1000-0xf000 */
-#define EVLIST_ALL	(0xf000 | 0x9f)
-
-#define EV_TIMEOUT	0x01
-#define EV_READ		0x02
-#define EV_WRITE	0x04
-#define EV_SIGNAL	0x08
-#define EV_PERSIST	0x10	/* Persistant event */
-
-/* Fix so that ppl dont have to run with <sys/queue.h> */
-#ifndef TAILQ_ENTRY
-#define _EVENT_DEFINED_TQENTRY
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-#endif /* !TAILQ_ENTRY */
-
-struct event_base;
-struct event {
-	TAILQ_ENTRY (event) ev_next;
-	TAILQ_ENTRY (event) ev_active_next;
-	TAILQ_ENTRY (event) ev_signal_next;
-	unsigned int min_heap_idx;	/* for managing timeouts */
-
-	struct event_base *ev_base;
-
-	int ev_fd;
-	short ev_events;
-	short ev_ncalls;
-	short *ev_pncalls;	/* Allows deletes in callback */
-
-	struct timeval ev_timeout;
-
-	int ev_pri;		/* smaller numbers are higher priority */
-
-	void (*ev_callback)(int, short, void *arg);
-	void *ev_arg;
-
-	int ev_res;		/* result passed to event callback */
-	int ev_flags;
-};
-
-#define EVENT_SIGNAL(ev)	(int)(ev)->ev_fd
-#define EVENT_FD(ev)		(int)(ev)->ev_fd
-
-/*
- * Key-Value pairs.  Can be used for HTTP headers but also for
- * query argument parsing.
- */
-struct evkeyval {
-	TAILQ_ENTRY(evkeyval) next;
-
-	char *key;
-	char *value;
-};
-
-#ifdef _EVENT_DEFINED_TQENTRY
-#undef TAILQ_ENTRY
-struct event_list;
-struct evkeyvalq;
-#undef _EVENT_DEFINED_TQENTRY
-#else
-TAILQ_HEAD (event_list, event);
-TAILQ_HEAD (evkeyvalq, evkeyval);
-#endif /* _EVENT_DEFINED_TQENTRY */
-
-/**
-  Initialize the event API.
-
-  Use event_base_new() to initialize a new event base, but does not set
-  the current_base global.   If using only event_base_new(), each event
-  added must have an event base set with event_base_set()
-
-  @see event_base_set(), event_base_free(), event_init()
- */
-struct event_base *event_base_new(void);
-
-/**
-  Initialize the event API.
-
-  The event API needs to be initialized with event_init() before it can be
-  used.  Sets the current_base global representing the default base for
-  events that have no base associated with them.
-
-  @see event_base_set(), event_base_new()
- */
-struct event_base *event_init(void);
-
-/**
-  Reinitialized the event base after a fork
-
-  Some event mechanisms do not survive across fork.   The event base needs
-  to be reinitialized with the event_reinit() function.
-
-  @param base the event base that needs to be re-initialized
-  @return 0 if successful, or -1 if some events could not be re-added.
-  @see event_base_new(), event_init()
-*/
-int event_reinit(struct event_base *base);
-
-/**
-  Loop to process events.
-
-  In order to process events, an application needs to call
-  event_dispatch().  This function only returns on error, and should
-  replace the event core of the application program.
-
-  @see event_base_dispatch()
- */
-int event_dispatch(void);
-
-
-/**
-  Threadsafe event dispatching loop.
-
-  @param eb the event_base structure returned by event_init()
-  @see event_init(), event_dispatch()
- */
-int event_base_dispatch(struct event_base *);
-
-
-/**
- Get the kernel event notification mechanism used by libevent.
- 
- @param eb the event_base structure returned by event_base_new()
- @return a string identifying the kernel event mechanism (kqueue, epoll, etc.)
- */
-const char *event_base_get_method(struct event_base *);
-        
-        
-/**
-  Deallocate all memory associated with an event_base, and free the base.
-
-  Note that this function will not close any fds or free any memory passed
-  to event_set as the argument to callback.
-
-  @param eb an event_base to be freed
- */
-void event_base_free(struct event_base *);
-
-
-#define _EVENT_LOG_DEBUG 0
-#define _EVENT_LOG_MSG   1
-#define _EVENT_LOG_WARN  2
-#define _EVENT_LOG_ERR   3
-typedef void (*event_log_cb)(int severity, const char *msg);
-/**
-  Redirect libevent's log messages.
-
-  @param cb a function taking two arguments: an integer severity between
-     _EVENT_LOG_DEBUG and _EVENT_LOG_ERR, and a string.  If cb is NULL,
-	 then the default log is used.
-  */
-void event_set_log_callback(event_log_cb cb);
-
-/**
-  Associate a different event base with an event.
-
-  @param eb the event base
-  @param ev the event
- */
-int event_base_set(struct event_base *, struct event *);
-
-/**
- event_loop() flags
- */
-/*@{*/
-#define EVLOOP_ONCE	0x01	/**< Block at most once. */
-#define EVLOOP_NONBLOCK	0x02	/**< Do not block. */
-/*@}*/
-
-/**
-  Handle events.
-
-  This is a more flexible version of event_dispatch().
-
-  @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
-  @return 0 if successful, -1 if an error occurred, or 1 if no events were
-    registered.
-  @see event_loopexit(), event_base_loop()
-*/
-int event_loop(int);
-
-/**
-  Handle events (threadsafe version).
-
-  This is a more flexible version of event_base_dispatch().
-
-  @param eb the event_base structure returned by event_init()
-  @param flags any combination of EVLOOP_ONCE | EVLOOP_NONBLOCK
-  @return 0 if successful, -1 if an error occurred, or 1 if no events were
-    registered.
-  @see event_loopexit(), event_base_loop()
-  */
-int event_base_loop(struct event_base *, int);
-
-/**
-  Exit the event loop after the specified time.
-
-  The next event_loop() iteration after the given timer expires will
-  complete normally (handling all queued events) then exit without
-  blocking for events again.
-
-  Subsequent invocations of event_loop() will proceed normally.
-
-  @param tv the amount of time after which the loop should terminate.
-  @return 0 if successful, or -1 if an error occurred
-  @see event_loop(), event_base_loop(), event_base_loopexit()
-  */
-int event_loopexit(const struct timeval *);
-
-
-/**
-  Exit the event loop after the specified time (threadsafe variant).
-
-  The next event_base_loop() iteration after the given timer expires will
-  complete normally (handling all queued events) then exit without
-  blocking for events again.
-
-  Subsequent invocations of event_base_loop() will proceed normally.
-
-  @param eb the event_base structure returned by event_init()
-  @param tv the amount of time after which the loop should terminate.
-  @return 0 if successful, or -1 if an error occurred
-  @see event_loopexit()
- */
-int event_base_loopexit(struct event_base *, const struct timeval *);
-
-/**
-  Abort the active event_loop() immediately.
-
-  event_loop() will abort the loop after the next event is completed;
-  event_loopbreak() is typically invoked from this event's callback.
-  This behavior is analogous to the "break;" statement.
-
-  Subsequent invocations of event_loop() will proceed normally.
-
-  @return 0 if successful, or -1 if an error occurred
-  @see event_base_loopbreak(), event_loopexit()
- */
-int event_loopbreak(void);
-
-/**
-  Abort the active event_base_loop() immediately.
-
-  event_base_loop() will abort the loop after the next event is completed;
-  event_base_loopbreak() is typically invoked from this event's callback.
-  This behavior is analogous to the "break;" statement.
-
-  Subsequent invocations of event_loop() will proceed normally.
-
-  @param eb the event_base structure returned by event_init()
-  @return 0 if successful, or -1 if an error occurred
-  @see event_base_loopexit
- */
-int event_base_loopbreak(struct event_base *);
-
-
-/**
-  Add a timer event.
-
-  @param ev the event struct
-  @param tv timeval struct
- */
-#define evtimer_add(ev, tv)		event_add(ev, tv)
-
-
-/**
-  Define a timer event.
-
-  @param ev event struct to be modified
-  @param cb callback function
-  @param arg argument that will be passed to the callback function
- */
-#define evtimer_set(ev, cb, arg)	event_set(ev, -1, 0, cb, arg)
-
-
-/**
- * Delete a timer event.
- *
- * @param ev the event struct to be disabled
- */
-#define evtimer_del(ev)			event_del(ev)
-#define evtimer_pending(ev, tv)		event_pending(ev, EV_TIMEOUT, tv)
-#define evtimer_initialized(ev)		((ev)->ev_flags & EVLIST_INIT)
-
-/**
- * Add a timeout event.
- *
- * @param ev the event struct to be disabled
- * @param tv the timeout value, in seconds
- */
-#define timeout_add(ev, tv)		event_add(ev, tv)
-
-
-/**
- * Define a timeout event.
- *
- * @param ev the event struct to be defined
- * @param cb the callback to be invoked when the timeout expires
- * @param arg the argument to be passed to the callback
- */
-#define timeout_set(ev, cb, arg)	event_set(ev, -1, 0, cb, arg)
-
-
-/**
- * Disable a timeout event.
- *
- * @param ev the timeout event to be disabled
- */
-#define timeout_del(ev)			event_del(ev)
-
-#define timeout_pending(ev, tv)		event_pending(ev, EV_TIMEOUT, tv)
-#define timeout_initialized(ev)		((ev)->ev_flags & EVLIST_INIT)
-
-#define signal_add(ev, tv)		event_add(ev, tv)
-#define signal_set(ev, x, cb, arg)	\
-	event_set(ev, x, EV_SIGNAL|EV_PERSIST, cb, arg)
-#define signal_del(ev)			event_del(ev)
-#define signal_pending(ev, tv)		event_pending(ev, EV_SIGNAL, tv)
-#define signal_initialized(ev)		((ev)->ev_flags & EVLIST_INIT)
-
-/**
-  Prepare an event structure to be added.
-
-  The function event_set() prepares the event structure ev to be used in
-  future calls to event_add() and event_del().  The event will be prepared to
-  call the function specified by the fn argument with an int argument
-  indicating the file descriptor, a short argument indicating the type of
-  event, and a void * argument given in the arg argument.  The fd indicates
-  the file descriptor that should be monitored for events.  The events can be
-  either EV_READ, EV_WRITE, or both.  Indicating that an application can read
-  or write from the file descriptor respectively without blocking.
-
-  The function fn will be called with the file descriptor that triggered the
-  event and the type of event which will be either EV_TIMEOUT, EV_SIGNAL,
-  EV_READ, or EV_WRITE.  The additional flag EV_PERSIST makes an event_add()
-  persistent until event_del() has been called.
-
-  @param ev an event struct to be modified
-  @param fd the file descriptor to be monitored
-  @param event desired events to monitor; can be EV_READ and/or EV_WRITE
-  @param fn callback function to be invoked when the event occurs
-  @param arg an argument to be passed to the callback function
-
-  @see event_add(), event_del(), event_once()
-
- */
-void event_set(struct event *, int, short, void (*)(int, short, void *), void *);
-
-/**
-  Schedule a one-time event to occur.
-
-  The function event_once() is similar to event_set().  However, it schedules
-  a callback to be called exactly once and does not require the caller to
-  prepare an event structure.
-
-  @param fd a file descriptor to monitor
-  @param events event(s) to monitor; can be any of EV_TIMEOUT | EV_READ |
-         EV_WRITE
-  @param callback callback function to be invoked when the event occurs
-  @param arg an argument to be passed to the callback function
-  @param timeout the maximum amount of time to wait for the event, or NULL
-         to wait forever
-  @return 0 if successful, or -1 if an error occurred
-  @see event_set()
-
- */
-int event_once(int, short, void (*)(int, short, void *), void *,
-    const struct timeval *);
-
-
-/**
-  Schedule a one-time event (threadsafe variant)
-
-  The function event_base_once() is similar to event_set().  However, it
-  schedules a callback to be called exactly once and does not require the
-  caller to prepare an event structure.
-
-  @param base an event_base returned by event_init()
-  @param fd a file descriptor to monitor
-  @param events event(s) to monitor; can be any of EV_TIMEOUT | EV_READ |
-         EV_WRITE
-  @param callback callback function to be invoked when the event occurs
-  @param arg an argument to be passed to the callback function
-  @param timeout the maximum amount of time to wait for the event, or NULL
-         to wait forever
-  @return 0 if successful, or -1 if an error occurred
-  @see event_once()
- */
-int event_base_once(struct event_base *base, int fd, short events,
-    void (*callback)(int, short, void *), void *arg,
-    const struct timeval *timeout);
-
-
-/**
-  Add an event to the set of monitored events.
-
-  The function event_add() schedules the execution of the ev event when the
-  event specified in event_set() occurs or in at least the time specified in
-  the tv.  If tv is NULL, no timeout occurs and the function will only be
-  called if a matching event occurs on the file descriptor.  The event in the
-  ev argument must be already initialized by event_set() and may not be used
-  in calls to event_set() until it has timed out or been removed with
-  event_del().  If the event in the ev argument already has a scheduled
-  timeout, the old timeout will be replaced by the new one.
-
-  @param ev an event struct initialized via event_set()
-  @param timeout the maximum amount of time to wait for the event, or NULL
-         to wait forever
-  @return 0 if successful, or -1 if an error occurred
-  @see event_del(), event_set()
-  */
-int event_add(struct event *ev, const struct timeval *timeout);
-
-
-/**
-  Remove an event from the set of monitored events.
-
-  The function event_del() will cancel the event in the argument ev.  If the
-  event has already executed or has never been added the call will have no
-  effect.
-
-  @param ev an event struct to be removed from the working set
-  @return 0 if successful, or -1 if an error occurred
-  @see event_add()
- */
-int event_del(struct event *);
-
-void event_active(struct event *, int, short);
-
-
-/**
-  Checks if a specific event is pending or scheduled.
-
-  @param ev an event struct previously passed to event_add()
-  @param event the requested event type; any of EV_TIMEOUT|EV_READ|
-         EV_WRITE|EV_SIGNAL
-  @param tv an alternate timeout (FIXME - is this true?)
-
-  @return 1 if the event is pending, or 0 if the event has not occurred
-
- */
-int event_pending(struct event *ev, short event, struct timeval *tv);
-
-
-/**
-  Test if an event structure has been initialized.
-
-  The event_initialized() macro can be used to check if an event has been
-  initialized.
-
-  @param ev an event structure to be tested
-  @return 1 if the structure has been initialized, or 0 if it has not been
-          initialized
- */
-#ifdef WIN32
-#define event_initialized(ev)		((ev)->ev_flags & EVLIST_INIT && (ev)->ev_fd != (int)INVALID_HANDLE_VALUE)
-#else
-#define event_initialized(ev)		((ev)->ev_flags & EVLIST_INIT)
-#endif
-
-
-/**
-  Get the libevent version number.
-
-  @return a string containing the version number of libevent
- */
-const char *event_get_version(void);
-
-
-/**
-  Get the kernel event notification mechanism used by libevent.
-
-  @return a string identifying the kernel event mechanism (kqueue, epoll, etc.)
- */
-const char *event_get_method(void);
-
-
-/**
-  Set the number of different event priorities.
-
-  By default libevent schedules all active events with the same priority.
-  However, some time it is desirable to process some events with a higher
-  priority than others.  For that reason, libevent supports strict priority
-  queues.  Active events with a lower priority are always processed before
-  events with a higher priority.
-
-  The number of different priorities can be set initially with the
-  event_priority_init() function.  This function should be called before the
-  first call to event_dispatch().  The event_priority_set() function can be
-  used to assign a priority to an event.  By default, libevent assigns the
-  middle priority to all events unless their priority is explicitly set.
-
-  @param npriorities the maximum number of priorities
-  @return 0 if successful, or -1 if an error occurred
-  @see event_base_priority_init(), event_priority_set()
-
- */
-int	event_priority_init(int);
-
-
-/**
-  Set the number of different event priorities (threadsafe variant).
-
-  See the description of event_priority_init() for more information.
-
-  @param eb the event_base structure returned by event_init()
-  @param npriorities the maximum number of priorities
-  @return 0 if successful, or -1 if an error occurred
-  @see event_priority_init(), event_priority_set()
- */
-int	event_base_priority_init(struct event_base *, int);
-
-
-/**
-  Assign a priority to an event.
-
-  @param ev an event struct
-  @param priority the new priority to be assigned
-  @return 0 if successful, or -1 if an error occurred
-  @see event_priority_init()
-  */
-int	event_priority_set(struct event *, int);
-
-
-/* These functions deal with buffering input and output */
-
-struct evbuffer {
-	u_char *buffer;
-	u_char *orig_buffer;
-
-	size_t misalign;
-	size_t totallen;
-	size_t off;
-
-	void (*cb)(struct evbuffer *, size_t, size_t, void *);
-	void *cbarg;
-};
-
-/* Just for error reporting - use other constants otherwise */
-#define EVBUFFER_READ		0x01
-#define EVBUFFER_WRITE		0x02
-#define EVBUFFER_EOF		0x10
-#define EVBUFFER_ERROR		0x20
-#define EVBUFFER_TIMEOUT	0x40
-
-struct bufferevent;
-typedef void (*evbuffercb)(struct bufferevent *, void *);
-typedef void (*everrorcb)(struct bufferevent *, short what, void *);
-
-struct event_watermark {
-	size_t low;
-	size_t high;
-};
-
-struct bufferevent {
-	struct event_base *ev_base;
-
-	struct event ev_read;
-	struct event ev_write;
-
-	struct evbuffer *input;
-	struct evbuffer *output;
-
-	struct event_watermark wm_read;
-	struct event_watermark wm_write;
-
-	evbuffercb readcb;
-	evbuffercb writecb;
-	everrorcb errorcb;
-	void *cbarg;
-
-	int timeout_read;	/* in seconds */
-	int timeout_write;	/* in seconds */
-
-	short enabled;	/* events that are currently enabled */
-};
-
-
-/**
-  Create a new bufferevent.
-
-  libevent provides an abstraction on top of the regular event callbacks.
-  This abstraction is called a buffered event.  A buffered event provides
-  input and output buffers that get filled and drained automatically.  The
-  user of a buffered event no longer deals directly with the I/O, but
-  instead is reading from input and writing to output buffers.
-
-  Once initialized, the bufferevent structure can be used repeatedly with
-  bufferevent_enable() and bufferevent_disable().
-
-  When read enabled the bufferevent will try to read from the file descriptor
-  and call the read callback.  The write callback is executed whenever the
-  output buffer is drained below the write low watermark, which is 0 by
-  default.
-
-  If multiple bases are in use, bufferevent_base_set() must be called before
-  enabling the bufferevent for the first time.
-
-  @param fd the file descriptor from which data is read and written to.
-  		This file descriptor is not allowed to be a pipe(2).
-  @param readcb callback to invoke when there is data to be read, or NULL if
-         no callback is desired
-  @param writecb callback to invoke when the file descriptor is ready for
-         writing, or NULL if no callback is desired
-  @param errorcb callback to invoke when there is an error on the file
-         descriptor
-  @param cbarg an argument that will be supplied to each of the callbacks
-         (readcb, writecb, and errorcb)
-  @return a pointer to a newly allocated bufferevent struct, or NULL if an
-          error occurred
-  @see bufferevent_base_set(), bufferevent_free()
-  */
-struct bufferevent *bufferevent_new(int fd,
-    evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg);
-
-
-/**
-  Assign a bufferevent to a specific event_base.
-
-  @param base an event_base returned by event_init()
-  @param bufev a bufferevent struct returned by bufferevent_new()
-  @return 0 if successful, or -1 if an error occurred
-  @see bufferevent_new()
- */
-int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev);
-
-
-/**
-  Assign a priority to a bufferevent.
-
-  @param bufev a bufferevent struct
-  @param pri the priority to be assigned
-  @return 0 if successful, or -1 if an error occurred
-  */
-int bufferevent_priority_set(struct bufferevent *bufev, int pri);
-
-
-/**
-  Deallocate the storage associated with a bufferevent structure.
-
-  @param bufev the bufferevent structure to be freed.
-  */
-void bufferevent_free(struct bufferevent *bufev);
-
-
-/**
-  Changes the callbacks for a bufferevent.
-
-  @param bufev the bufferevent object for which to change callbacks
-  @param readcb callback to invoke when there is data to be read, or NULL if
-         no callback is desired
-  @param writecb callback to invoke when the file descriptor is ready for
-         writing, or NULL if no callback is desired
-  @param errorcb callback to invoke when there is an error on the file
-         descriptor
-  @param cbarg an argument that will be supplied to each of the callbacks
-         (readcb, writecb, and errorcb)
-  @see bufferevent_new()
-  */
-void bufferevent_setcb(struct bufferevent *bufev,
-    evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg);
-
-/**
-  Changes the file descriptor on which the bufferevent operates.
-
-  @param bufev the bufferevent object for which to change the file descriptor
-  @param fd the file descriptor to operate on
-*/
-void bufferevent_setfd(struct bufferevent *bufev, int fd);
-
-/**
-  Write data to a bufferevent buffer.
-
-  The bufferevent_write() function can be used to write data to the file
-  descriptor.  The data is appended to the output buffer and written to the
-  descriptor automatically as it becomes available for writing.
-
-  @param bufev the bufferevent to be written to
-  @param data a pointer to the data to be written
-  @param size the length of the data, in bytes
-  @return 0 if successful, or -1 if an error occurred
-  @see bufferevent_write_buffer()
-  */
-int bufferevent_write(struct bufferevent *bufev,
-    const void *data, size_t size);
-
-
-/**
-  Write data from an evbuffer to a bufferevent buffer.  The evbuffer is
-  being drained as a result.
-
-  @param bufev the bufferevent to be written to
-  @param buf the evbuffer to be written
-  @return 0 if successful, or -1 if an error occurred
-  @see bufferevent_write()
- */
-int bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf);
-
-
-/**
-  Read data from a bufferevent buffer.
-
-  The bufferevent_read() function is used to read data from the input buffer.
-
-  @param bufev the bufferevent to be read from
-  @param data pointer to a buffer that will store the data
-  @param size the size of the data buffer, in bytes
-  @return the amount of data read, in bytes.
- */
-size_t bufferevent_read(struct bufferevent *bufev, void *data, size_t size);
-
-/**
-  Enable a bufferevent.
-
-  @param bufev the bufferevent to be enabled
-  @param event any combination of EV_READ | EV_WRITE.
-  @return 0 if successful, or -1 if an error occurred
-  @see bufferevent_disable()
- */
-int bufferevent_enable(struct bufferevent *bufev, short event);
-
-
-/**
-  Disable a bufferevent.
-
-  @param bufev the bufferevent to be disabled
-  @param event any combination of EV_READ | EV_WRITE.
-  @return 0 if successful, or -1 if an error occurred
-  @see bufferevent_enable()
- */
-int bufferevent_disable(struct bufferevent *bufev, short event);
-
-
-/**
-  Set the read and write timeout for a buffered event.
-
-  @param bufev the bufferevent to be modified
-  @param timeout_read the read timeout
-  @param timeout_write the write timeout
- */
-void bufferevent_settimeout(struct bufferevent *bufev,
-    int timeout_read, int timeout_write);
-
-
-/**
-  Sets the watermarks for read and write events.
-
-  On input, a bufferevent does not invoke the user read callback unless
-  there is at least low watermark data in the buffer.   If the read buffer
-  is beyond the high watermark, the buffevent stops reading from the network.
-
-  On output, the user write callback is invoked whenever the buffered data
-  falls below the low watermark.
-
-  @param bufev the bufferevent to be modified
-  @param events EV_READ, EV_WRITE or both
-  @param lowmark the lower watermark to set
-  @param highmark the high watermark to set
-*/
-
-void bufferevent_setwatermark(struct bufferevent *bufev, short events,
-    size_t lowmark, size_t highmark);
-
-#define EVBUFFER_LENGTH(x)	(x)->off
-#define EVBUFFER_DATA(x)	(x)->buffer
-#define EVBUFFER_INPUT(x)	(x)->input
-#define EVBUFFER_OUTPUT(x)	(x)->output
-
-
-/**
-  Allocate storage for a new evbuffer.
-
-  @return a pointer to a newly allocated evbuffer struct, or NULL if an error
-          occurred
- */
-struct evbuffer *evbuffer_new(void);
-
-
-/**
-  Deallocate storage for an evbuffer.
-
-  @param pointer to the evbuffer to be freed
- */
-void evbuffer_free(struct evbuffer *);
-
-
-/**
-  Expands the available space in an event buffer.
-
-  Expands the available space in the event buffer to at least datlen
-
-  @param buf the event buffer to be expanded
-  @param datlen the new minimum length requirement
-  @return 0 if successful, or -1 if an error occurred
-*/
-int evbuffer_expand(struct evbuffer *, size_t);
-
-
-/**
-  Append data to the end of an evbuffer.
-
-  @param buf the event buffer to be appended to
-  @param data pointer to the beginning of the data buffer
-  @param datlen the number of bytes to be copied from the data buffer
- */
-int evbuffer_add(struct evbuffer *, const void *, size_t);
-
-
-
-/**
-  Read data from an event buffer and drain the bytes read.
-
-  @param buf the event buffer to be read from
-  @param data the destination buffer to store the result
-  @param datlen the maximum size of the destination buffer
-  @return the number of bytes read
- */
-int evbuffer_remove(struct evbuffer *, void *, size_t);
-
-
-/**
- * Read a single line from an event buffer.
- *
- * Reads a line terminated by either '\r\n', '\n\r' or '\r' or '\n'.
- * The returned buffer needs to be freed by the caller.
- *
- * @param buffer the evbuffer to read from
- * @return pointer to a single line, or NULL if an error occurred
- */
-char *evbuffer_readline(struct evbuffer *);
-
-
-/**
-  Move data from one evbuffer into another evbuffer.
-
-  This is a destructive add.  The data from one buffer moves into
-  the other buffer. The destination buffer is expanded as needed.
-
-  @param outbuf the output buffer
-  @param inbuf the input buffer
-  @return 0 if successful, or -1 if an error occurred
- */
-int evbuffer_add_buffer(struct evbuffer *, struct evbuffer *);
-
-
-/**
-  Append a formatted string to the end of an evbuffer.
-
-  @param buf the evbuffer that will be appended to
-  @param fmt a format string
-  @param ... arguments that will be passed to printf(3)
-  @return The number of bytes added if successful, or -1 if an error occurred.
- */
-int evbuffer_add_printf(struct evbuffer *, const char *fmt, ...)
-#ifdef __GNUC__
-  __attribute__((format(printf, 2, 3)))
-#endif
-;
-
-
-/**
-  Append a va_list formatted string to the end of an evbuffer.
-
-  @param buf the evbuffer that will be appended to
-  @param fmt a format string
-  @param ap a varargs va_list argument array that will be passed to vprintf(3)
-  @return The number of bytes added if successful, or -1 if an error occurred.
- */
-int evbuffer_add_vprintf(struct evbuffer *, const char *fmt, va_list ap);
-
-
-/**
-  Remove a specified number of bytes data from the beginning of an evbuffer.
-
-  @param buf the evbuffer to be drained
-  @param len the number of bytes to drain from the beginning of the buffer
- */
-void evbuffer_drain(struct evbuffer *, size_t);
-
-
-/**
-  Write the contents of an evbuffer to a file descriptor.
-
-  The evbuffer will be drained after the bytes have been successfully written.
-
-  @param buffer the evbuffer to be written and drained
-  @param fd the file descriptor to be written to
-  @return the number of bytes written, or -1 if an error occurred
-  @see evbuffer_read()
- */
-int evbuffer_write(struct evbuffer *, int);
-
-
-/**
-  Read from a file descriptor and store the result in an evbuffer.
-
-  @param buf the evbuffer to store the result
-  @param fd the file descriptor to read from
-  @param howmuch the number of bytes to be read
-  @return the number of bytes read, or -1 if an error occurred
-  @see evbuffer_write()
- */
-int evbuffer_read(struct evbuffer *, int, int);
-
-
-/**
-  Find a string within an evbuffer.
-
-  @param buffer the evbuffer to be searched
-  @param what the string to be searched for
-  @param len the length of the search string
-  @return a pointer to the beginning of the search string, or NULL if the search failed.
- */
-u_char *evbuffer_find(struct evbuffer *, const u_char *, size_t);
-
-/**
-  Set a callback to invoke when the evbuffer is modified.
-
-  @param buffer the evbuffer to be monitored
-  @param cb the callback function to invoke when the evbuffer is modified
-  @param cbarg an argument to be provided to the callback function
- */
-void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_t, void *), void *);
-
-/*
- * Marshaling tagged data - We assume that all tags are inserted in their
- * numeric order - so that unknown tags will always be higher than the
- * known ones - and we can just ignore the end of an event buffer.
- */
-
-void evtag_init(void);
-
-void evtag_marshal(struct evbuffer *evbuf, ev_uint32_t tag, const void *data,
-    ev_uint32_t len);
-
-/**
-  Encode an integer and store it in an evbuffer.
-
-  We encode integer's by nibbles; the first nibble contains the number
-  of significant nibbles - 1;  this allows us to encode up to 64-bit
-  integers.  This function is byte-order independent.
-
-  @param evbuf evbuffer to store the encoded number
-  @param number a 32-bit integer
- */
-void encode_int(struct evbuffer *evbuf, ev_uint32_t number);
-
-void evtag_marshal_int(struct evbuffer *evbuf, ev_uint32_t tag,
-    ev_uint32_t integer);
-
-void evtag_marshal_string(struct evbuffer *buf, ev_uint32_t tag,
-    const char *string);
-
-void evtag_marshal_timeval(struct evbuffer *evbuf, ev_uint32_t tag,
-    struct timeval *tv);
-
-int evtag_unmarshal(struct evbuffer *src, ev_uint32_t *ptag,
-    struct evbuffer *dst);
-int evtag_peek(struct evbuffer *evbuf, ev_uint32_t *ptag);
-int evtag_peek_length(struct evbuffer *evbuf, ev_uint32_t *plength);
-int evtag_payload_length(struct evbuffer *evbuf, ev_uint32_t *plength);
-int evtag_consume(struct evbuffer *evbuf);
-
-int evtag_unmarshal_int(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    ev_uint32_t *pinteger);
-
-int evtag_unmarshal_fixed(struct evbuffer *src, ev_uint32_t need_tag,
-    void *data, size_t len);
-
-int evtag_unmarshal_string(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    char **pstring);
-
-int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    struct timeval *ptv);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EVENT_H_ */
diff --git a/libevent/event_rpcgen.py b/libevent/event_rpcgen.py
deleted file mode 100644
index 5503ff8a5c3e..000000000000
--- a/libevent/event_rpcgen.py
+++ /dev/null
@@ -1,1417 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
-# All rights reserved.
-#
-# Generates marshaling code based on libevent.
-
-import sys
-import re
-
-#
-_NAME = "event_rpcgen.py"
-_VERSION = "0.1"
-_STRUCT_RE = '[a-z][a-z_0-9]*'
-
-# Globals
-line_count = 0
-
-white = re.compile(r'^\s+')
-cppcomment = re.compile(r'\/\/.*$')
-headerdirect = []
-cppdirect = []
-
-# Holds everything that makes a struct
-class Struct:
-    def __init__(self, name):
-        self._name = name
-        self._entries = []
-        self._tags = {}
-        print >>sys.stderr, '  Created struct: %s' % name
-
-    def AddEntry(self, entry):
-        if self._tags.has_key(entry.Tag()):
-            print >>sys.stderr, ( 'Entry "%s" duplicates tag number '
-                                  '%d from "%s" around line %d' ) % (
-                entry.Name(), entry.Tag(),
-                self._tags[entry.Tag()], line_count)
-            sys.exit(1)
-        self._entries.append(entry)
-        self._tags[entry.Tag()] = entry.Name()
-        print >>sys.stderr, '    Added entry: %s' % entry.Name()
-
-    def Name(self):
-        return self._name
-
-    def EntryTagName(self, entry):
-        """Creates the name inside an enumeration for distinguishing data
-        types."""
-        name = "%s_%s" % (self._name, entry.Name())
-        return name.upper()
-
-    def PrintIdented(self, file, ident, code):
-        """Takes an array, add indentation to each entry and prints it."""
-        for entry in code:
-            print >>file, '%s%s' % (ident, entry)
-
-    def PrintTags(self, file):
-        """Prints the tag definitions for a structure."""
-        print >>file, '/* Tag definition for %s */' % self._name
-        print >>file, 'enum %s_ {' % self._name.lower()
-        for entry in self._entries:
-            print >>file, '  %s=%d,' % (self.EntryTagName(entry),
-                                        entry.Tag())
-        print >>file, '  %s_MAX_TAGS' % (self._name.upper())
-        print >>file, '};\n'
-
-    def PrintForwardDeclaration(self, file):
-        print >>file, 'struct %s;' % self._name
-
-    def PrintDeclaration(self, file):
-        print >>file, '/* Structure declaration for %s */' % self._name
-        print >>file, 'struct %s_access_ {' % self._name
-        for entry in self._entries:
-            dcl = entry.AssignDeclaration('(*%s_assign)' % entry.Name())
-            dcl.extend(
-                entry.GetDeclaration('(*%s_get)' % entry.Name()))
-            if entry.Array():
-                dcl.extend(
-                    entry.AddDeclaration('(*%s_add)' % entry.Name()))
-            self.PrintIdented(file, '  ', dcl)
-        print >>file, '};\n'
-
-        print >>file, 'struct %s {' % self._name
-        print >>file, '  struct %s_access_ *base;\n' % self._name
-        for entry in self._entries:
-            dcl = entry.Declaration()
-            self.PrintIdented(file, '  ', dcl)
-        print >>file, ''
-        for entry in self._entries:
-            print >>file, '  uint8_t %s_set;' % entry.Name()
-        print >>file, '};\n'
-
-        print >>file, \
-"""struct %(name)s *%(name)s_new(void);
-void %(name)s_free(struct %(name)s *);
-void %(name)s_clear(struct %(name)s *);
-void %(name)s_marshal(struct evbuffer *, const struct %(name)s *);
-int %(name)s_unmarshal(struct %(name)s *, struct evbuffer *);
-int %(name)s_complete(struct %(name)s *);
-void evtag_marshal_%(name)s(struct evbuffer *, uint32_t, 
-    const struct %(name)s *);
-int evtag_unmarshal_%(name)s(struct evbuffer *, uint32_t,
-    struct %(name)s *);""" % { 'name' : self._name }
-
-
-        # Write a setting function of every variable
-        for entry in self._entries:
-            self.PrintIdented(file, '', entry.AssignDeclaration(
-                entry.AssignFuncName()))
-            self.PrintIdented(file, '', entry.GetDeclaration(
-                entry.GetFuncName()))
-            if entry.Array():
-                self.PrintIdented(file, '', entry.AddDeclaration(
-                    entry.AddFuncName()))
-
-        print >>file, '/* --- %s done --- */\n' % self._name
-
-    def PrintCode(self, file):
-        print >>file, ('/*\n'
-                       ' * Implementation of %s\n'
-                       ' */\n') % self._name
-
-        print >>file, \
-              'static struct %(name)s_access_ __%(name)s_base = {' % \
-              { 'name' : self._name }
-        for entry in self._entries:
-            self.PrintIdented(file, '  ', entry.CodeBase())
-        print >>file, '};\n'
-
-        # Creation
-        print >>file, (
-            'struct %(name)s *\n'
-            '%(name)s_new(void)\n'
-            '{\n'
-            '  struct %(name)s *tmp;\n'
-            '  if ((tmp = malloc(sizeof(struct %(name)s))) == NULL) {\n'
-            '    event_warn("%%s: malloc", __func__);\n'
-            '    return (NULL);\n'
-            '  }\n'
-            '  tmp->base = &__%(name)s_base;\n') % { 'name' : self._name }
-
-        for entry in self._entries:
-            self.PrintIdented(file, '  ', entry.CodeNew('tmp'))
-            print >>file, '  tmp->%s_set = 0;\n' % entry.Name()
-
-        print >>file, (
-            '  return (tmp);\n'
-            '}\n')
-
-        # Adding
-        for entry in self._entries:
-            if entry.Array():
-                self.PrintIdented(file, '', entry.CodeAdd())
-            print >>file, ''
-            
-        # Assigning
-        for entry in self._entries:
-            self.PrintIdented(file, '', entry.CodeAssign())
-            print >>file, ''
-
-        # Getting
-        for entry in self._entries:
-            self.PrintIdented(file, '', entry.CodeGet())
-            print >>file, ''
-            
-        # Clearing
-        print >>file, ( 'void\n'
-                        '%(name)s_clear(struct %(name)s *tmp)\n'
-                        '{'
-                        ) % { 'name' : self._name }
-        for entry in self._entries:
-            self.PrintIdented(file, '  ', entry.CodeClear('tmp'))
-
-        print >>file, '}\n'
-
-        # Freeing
-        print >>file, ( 'void\n'
-                        '%(name)s_free(struct %(name)s *tmp)\n'
-                        '{'
-                        ) % { 'name' : self._name }
-        
-        for entry in self._entries:
-            self.PrintIdented(file, '  ', entry.CodeFree('tmp'))
-
-        print >>file, ('  free(tmp);\n'
-                       '}\n')
-
-        # Marshaling
-        print >>file, ('void\n'
-                       '%(name)s_marshal(struct evbuffer *evbuf, '
-                       'const struct %(name)s *tmp)'
-                       '{') % { 'name' : self._name }
-        for entry in self._entries:
-            indent = '  '
-            # Optional entries do not have to be set
-            if entry.Optional():
-                indent += '  '
-                print >>file, '  if (tmp->%s_set) {' % entry.Name()
-            self.PrintIdented(
-                file, indent,
-                entry.CodeMarshal('evbuf', self.EntryTagName(entry), 'tmp'))
-            if entry.Optional():
-                print >>file, '  }'
-
-        print >>file, '}\n'
-                       
-        # Unmarshaling
-        print >>file, ('int\n'
-                       '%(name)s_unmarshal(struct %(name)s *tmp, '
-                       ' struct evbuffer *evbuf)\n'
-                       '{\n'
-                       '  uint32_t tag;\n'
-                       '  while (EVBUFFER_LENGTH(evbuf) > 0) {\n'
-                       '    if (evtag_peek(evbuf, &tag) == -1)\n'
-                       '      return (-1);\n'
-                       '    switch (tag) {\n'
-                       ) % { 'name' : self._name }
-        for entry in self._entries:
-            print >>file, '      case %s:\n' % self.EntryTagName(entry)
-            if not entry.Array():
-                print >>file, (
-                    '        if (tmp->%s_set)\n'
-                    '          return (-1);'
-                    ) % (entry.Name())
-
-            self.PrintIdented(
-                file, '        ',
-                entry.CodeUnmarshal('evbuf',
-                                    self.EntryTagName(entry), 'tmp'))
-
-            print >>file, ( '        tmp->%s_set = 1;\n' % entry.Name() +
-                            '        break;\n' )
-        print >>file, ( '      default:\n'
-                        '        return -1;\n'
-                        '    }\n'
-                        '  }\n' )
-        # Check if it was decoded completely
-        print >>file, ( '  if (%(name)s_complete(tmp) == -1)\n'
-                        '    return (-1);'
-                        ) % { 'name' : self._name }
-
-        # Successfully decoded
-        print >>file, ( '  return (0);\n'
-                        '}\n')
-
-        # Checking if a structure has all the required data
-        print >>file, (
-            'int\n'
-            '%(name)s_complete(struct %(name)s *msg)\n'
-            '{' ) % { 'name' : self._name }
-        for entry in self._entries:
-            self.PrintIdented(
-                file, '  ',
-                entry.CodeComplete('msg'))
-        print >>file, (
-            '  return (0);\n'
-            '}\n' )
-
-        # Complete message unmarshaling
-        print >>file, (
-            'int\n'
-            'evtag_unmarshal_%(name)s(struct evbuffer *evbuf, '
-            'uint32_t need_tag, struct %(name)s *msg)\n'
-            '{\n'
-            '  uint32_t tag;\n'
-            '  int res = -1;\n'
-            '\n'
-            '  struct evbuffer *tmp = evbuffer_new();\n'
-            '\n'
-            '  if (evtag_unmarshal(evbuf, &tag, tmp) == -1'
-            ' || tag != need_tag)\n'
-            '    goto error;\n'
-            '\n'
-            '  if (%(name)s_unmarshal(msg, tmp) == -1)\n'
-            '    goto error;\n'
-            '\n'
-            '  res = 0;\n'
-            '\n'
-            ' error:\n'
-            '  evbuffer_free(tmp);\n'
-            '  return (res);\n'
-            '}\n' ) % { 'name' : self._name }
-
-        # Complete message marshaling
-        print >>file, (
-            'void\n'
-            'evtag_marshal_%(name)s(struct evbuffer *evbuf, uint32_t tag, '
-            'const struct %(name)s *msg)\n'
-            '{\n'
-            '  struct evbuffer *_buf = evbuffer_new();\n'
-            '  assert(_buf != NULL);\n'
-            '  evbuffer_drain(_buf, -1);\n'
-            '  %(name)s_marshal(_buf, msg);\n'
-            '  evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), '
-            'EVBUFFER_LENGTH(_buf));\n'
-            '  evbuffer_free(_buf);\n'
-            '}\n' ) % { 'name' : self._name }
-
-class Entry:
-    def __init__(self, type, name, tag):
-        self._type = type
-        self._name = name
-        self._tag = int(tag)
-        self._ctype = type
-        self._optional = 0
-        self._can_be_array = 0
-        self._array = 0
-        self._line_count = -1
-        self._struct = None
-        self._refname = None
-
-    def GetTranslation(self):
-        return { "parent_name" : self._struct.Name(),
-                 "name" : self._name,
-                 "ctype" : self._ctype,
-                 "refname" : self._refname
-                 }
-    
-    def SetStruct(self, struct):
-        self._struct = struct
-
-    def LineCount(self):
-        assert self._line_count != -1
-        return self._line_count
-
-    def SetLineCount(self, number):
-        self._line_count = number
-
-    def Array(self):
-        return self._array
-
-    def Optional(self):
-        return self._optional
-
-    def Tag(self):
-        return self._tag
-
-    def Name(self):
-        return self._name
-
-    def Type(self):
-        return self._type
-
-    def MakeArray(self, yes=1):
-        self._array = yes
-        
-    def MakeOptional(self):
-        self._optional = 1
-
-    def GetFuncName(self):
-        return '%s_%s_get' % (self._struct.Name(), self._name)
-    
-    def GetDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, %s *);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-
-    def CodeGet(self):
-        code = (
-            'int',
-            '%(parent_name)s_%(name)s_get(struct %(parent_name)s *msg, '
-            '%(ctype)s *value)',
-            '{',
-            '  if (msg->%(name)s_set != 1)',
-            '    return (-1);',
-            '  *value = msg->%(name)s_data;',
-            '  return (0);',
-            '}' )
-        code = '\n'.join(code)
-        code = code % self.GetTranslation()
-        return code.split('\n')
-        
-    def AssignFuncName(self):
-        return '%s_%s_assign' % (self._struct.Name(), self._name)
-    
-    def AddFuncName(self):
-        return '%s_%s_add' % (self._struct.Name(), self._name)
-    
-    def AssignDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, const %s);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-
-    def CodeAssign(self):
-        code = [ 'int',
-                 '%(parent_name)s_%(name)s_assign(struct %(parent_name)s *msg,'
-                 ' const %(ctype)s value)',
-                 '{',
-                 '  msg->%(name)s_set = 1;',
-                 '  msg->%(name)s_data = value;',
-                 '  return (0);',
-                 '}' ]
-        code = '\n'.join(code)
-        code = code % self.GetTranslation()
-        return code.split('\n')
-
-    def CodeClear(self, structname):
-        code = [ '%s->%s_set = 0;' % (structname, self.Name()) ]
-
-        return code
-        
-    def CodeComplete(self, structname):
-        if self.Optional():
-            return []
-        
-        code = [ 'if (!%s->%s_set)' % (structname, self.Name()),
-                 '  return (-1);' ]
-
-        return code
-
-    def CodeFree(self, name):
-        return []
-
-    def CodeBase(self):
-        code = [
-            '%(parent_name)s_%(name)s_assign,',
-            '%(parent_name)s_%(name)s_get,'
-            ]
-        if self.Array():
-            code.append('%(parent_name)s_%(name)s_add,')
-
-        code = '\n'.join(code)
-        code = code % self.GetTranslation()
-        return code.split('\n')
-
-    def Verify(self):
-        if self.Array() and not self._can_be_array:
-            print >>sys.stderr, (
-                'Entry "%s" cannot be created as an array '
-                'around line %d' ) % (self._name, self.LineCount())
-            sys.exit(1)
-        if not self._struct:
-            print >>sys.stderr, (
-                'Entry "%s" does not know which struct it belongs to '
-                'around line %d' ) % (self._name, self.LineCount())
-            sys.exit(1)
-        if self._optional and self._array:
-            print >>sys.stderr,  ( 'Entry "%s" has illegal combination of '
-                                   'optional and array around line %d' ) % (
-                self._name, self.LineCount() )
-            sys.exit(1)
-
-class EntryBytes(Entry):
-    def __init__(self, type, name, tag, length):
-        # Init base class
-        Entry.__init__(self, type, name, tag)
-
-        self._length = length
-        self._ctype = 'uint8_t'
-
-    def GetDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, %s **);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-        
-    def AssignDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, const %s *);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-        
-    def Declaration(self):
-        dcl  = ['uint8_t %s_data[%s];' % (self._name, self._length)]
-        
-        return dcl
-
-    def CodeGet(self):
-        name = self._name
-        code = [ 'int',
-                 '%s_%s_get(struct %s *msg, %s **value)' % (
-            self._struct.Name(), name,
-            self._struct.Name(), self._ctype),
-                 '{',
-                 '  if (msg->%s_set != 1)' % name,
-                 '    return (-1);',
-                 '  *value = msg->%s_data;' % name,
-                 '  return (0);',
-                 '}' ]
-        return code
-        
-    def CodeAssign(self):
-        name = self._name
-        code = [ 'int',
-                 '%s_%s_assign(struct %s *msg, const %s *value)' % (
-            self._struct.Name(), name,
-            self._struct.Name(), self._ctype),
-                 '{',
-                 '  msg->%s_set = 1;' % name,
-                 '  memcpy(msg->%s_data, value, %s);' % (
-            name, self._length),
-                 '  return (0);',
-                 '}' ]
-        return code
-        
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        code = [  'if (evtag_unmarshal_fixed(%s, %s, ' % (buf, tag_name) +
-                  '%s->%s_data, ' % (var_name, self._name) +
-                  'sizeof(%s->%s_data)) == -1) {' % (
-            var_name, self._name),
-                  '  event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-            self._name ),
-                  '  return (-1);',
-                  '}'
-                  ]
-        return code
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['evtag_marshal(%s, %s, %s->%s_data, sizeof(%s->%s_data));' % (
-            buf, tag_name, var_name, self._name, var_name, self._name )]
-        return code
-
-    def CodeClear(self, structname):
-        code = [ '%s->%s_set = 0;' % (structname, self.Name()),
-                 'memset(%s->%s_data, 0, sizeof(%s->%s_data));' % (
-            structname, self._name, structname, self._name)]
-
-        return code
-        
-    def CodeNew(self, name):
-        code  = ['memset(%s->%s_data, 0, sizeof(%s->%s_data));' % (
-            name, self._name, name, self._name)]
-        return code
-
-    def Verify(self):
-        if not self._length:
-            print >>sys.stderr, 'Entry "%s" needs a length around line %d' % (
-                self._name, self.LineCount() )
-            sys.exit(1)
-
-        Entry.Verify(self)
-
-class EntryInt(Entry):
-    def __init__(self, type, name, tag):
-        # Init base class
-        Entry.__init__(self, type, name, tag)
-
-        self._ctype = 'uint32_t'
-
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        code = ['if (evtag_unmarshal_int(%s, %s, &%s->%s_data) == -1) {' % (
-            buf, tag_name, var_name, self._name),
-                  '  event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-            self._name ),
-                '  return (-1);',
-                '}' ] 
-        return code
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['evtag_marshal_int(%s, %s, %s->%s_data);' % (
-            buf, tag_name, var_name, self._name)]
-        return code
-
-    def Declaration(self):
-        dcl  = ['uint32_t %s_data;' % self._name]
-
-        return dcl
-
-    def CodeNew(self, name):
-        code = ['%s->%s_data = 0;' % (name, self._name)]
-        return code
-
-class EntryString(Entry):
-    def __init__(self, type, name, tag):
-        # Init base class
-        Entry.__init__(self, type, name, tag)
-
-        self._ctype = 'char *'
-
-    def CodeAssign(self):
-        name = self._name
-        code = """int
-%(parent_name)s_%(name)s_assign(struct %(parent_name)s *msg,
-    const %(ctype)s value)
-{
-  if (msg->%(name)s_data != NULL)
-    free(msg->%(name)s_data);
-  if ((msg->%(name)s_data = strdup(value)) == NULL)
-    return (-1);
-  msg->%(name)s_set = 1;
-  return (0);
-}""" % self.GetTranslation()
-
-        return code.split('\n')
-        
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        code = ['if (evtag_unmarshal_string(%s, %s, &%s->%s_data) == -1) {' % (
-            buf, tag_name, var_name, self._name),
-                '  event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-            self._name ),
-                '  return (-1);',
-                '}'
-                ]
-        return code
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['evtag_marshal_string(%s, %s, %s->%s_data);' % (
-            buf, tag_name, var_name, self._name)]
-        return code
-
-    def CodeClear(self, structname):
-        code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-                 '  free (%s->%s_data);' % (structname, self.Name()),
-                 '  %s->%s_data = NULL;' % (structname, self.Name()),
-                 '  %s->%s_set = 0;' % (structname, self.Name()),
-                 '}'
-                 ]
-
-        return code
-        
-    def CodeNew(self, name):
-        code  = ['%s->%s_data = NULL;' % (name, self._name)]
-        return code
-
-    def CodeFree(self, name):
-        code  = ['if (%s->%s_data != NULL)' % (name, self._name),
-                 '    free (%s->%s_data); ' % (name, self._name)]
-
-        return code
-
-    def Declaration(self):
-        dcl  = ['char *%s_data;' % self._name]
-
-        return dcl
-
-class EntryStruct(Entry):
-    def __init__(self, type, name, tag, refname):
-        # Init base class
-        Entry.__init__(self, type, name, tag)
-
-        self._can_be_array = 1
-        self._refname = refname
-        self._ctype = 'struct %s*' % refname
-
-    def CodeGet(self):
-        name = self._name
-        code = [ 'int',
-                 '%s_%s_get(struct %s *msg, %s *value)' % (
-            self._struct.Name(), name,
-            self._struct.Name(), self._ctype),
-                 '{',
-                 '  if (msg->%s_set != 1) {' % name,
-                 '    msg->%s_data = %s_new();' % (name, self._refname),
-                 '    if (msg->%s_data == NULL)' % name,
-                 '      return (-1);',
-                 '    msg->%s_set = 1;' % name,
-                 '  }',
-                 '  *value = msg->%s_data;' % name,
-                 '  return (0);',
-                 '}' ]
-        return code
-        
-    def CodeAssign(self):
-        name = self._name
-        code = """int
-%(parent_name)s_%(name)s_assign(struct %(parent_name)s *msg,
-    const %(ctype)s value)
-{
-   struct evbuffer *tmp = NULL;
-   if (msg->%(name)s_set) {
-     %(refname)s_clear(msg->%(name)s_data);
-     msg->%(name)s_set = 0;
-   } else {
-     msg->%(name)s_data = %(refname)s_new();
-     if (msg->%(name)s_data == NULL) {
-       event_warn("%%s: %(refname)s_new()", __func__);
-       goto error;
-     }
-   }
-   if ((tmp = evbuffer_new()) == NULL) {
-     event_warn("%%s: evbuffer_new()", __func__);
-     goto error;
-   }
-   %(refname)s_marshal(tmp, value);
-   if (%(refname)s_unmarshal(msg->%(name)s_data, tmp) == -1) {
-     event_warnx("%%s: %(refname)s_unmarshal", __func__);
-     goto error;
-   }
-   msg->%(name)s_set = 1;
-   evbuffer_free(tmp);
-   return (0);
- error:
-   if (tmp != NULL)
-     evbuffer_free(tmp);
-   if (msg->%(name)s_data != NULL) {
-     %(refname)s_free(msg->%(name)s_data);
-     msg->%(name)s_data = NULL;
-   }
-   return (-1);
-}""" % self.GetTranslation()
-        return code.split('\n')
-        
-    def CodeComplete(self, structname):
-        if self.Optional():
-            code = [ 'if (%s->%s_set && %s_complete(%s->%s_data) == -1)' % (
-                structname, self.Name(),
-                self._refname, structname, self.Name()),
-                     '  return (-1);' ]
-        else:
-            code = [ 'if (%s_complete(%s->%s_data) == -1)' % (
-                self._refname, structname, self.Name()),
-                     '  return (-1);' ]
-
-        return code
-    
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        code = ['%s->%s_data = %s_new();' % (
-            var_name, self._name, self._refname),
-                'if (%s->%s_data == NULL)' % (var_name, self._name),
-                '  return (-1);',
-                'if (evtag_unmarshal_%s(%s, %s, %s->%s_data) == -1) {' % (
-            self._refname, buf, tag_name, var_name, self._name),
-                  '  event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-            self._name ),
-                '  return (-1);',
-                '}'
-                ]
-        return code
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['evtag_marshal_%s(%s, %s, %s->%s_data);' % (
-            self._refname, buf, tag_name, var_name, self._name)]
-        return code
-
-    def CodeClear(self, structname):
-        code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-                 '  %s_free(%s->%s_data);' % (
-            self._refname, structname, self.Name()),
-                 '  %s->%s_data = NULL;' % (structname, self.Name()),
-                 '  %s->%s_set = 0;' % (structname, self.Name()),
-                 '}'
-                 ]
-
-        return code
-        
-    def CodeNew(self, name):
-        code  = ['%s->%s_data = NULL;' % (name, self._name)]
-        return code
-
-    def CodeFree(self, name):
-        code  = ['if (%s->%s_data != NULL)' % (name, self._name),
-                 '    %s_free(%s->%s_data); ' % (
-            self._refname, name, self._name)]
-
-        return code
-
-    def Declaration(self):
-        dcl  = ['%s %s_data;' % (self._ctype, self._name)]
-
-        return dcl
-
-class EntryVarBytes(Entry):
-    def __init__(self, type, name, tag):
-        # Init base class
-        Entry.__init__(self, type, name, tag)
-
-        self._ctype = 'uint8_t *'
-
-    def GetDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, %s *, uint32_t *);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-        
-    def AssignDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, const %s, uint32_t);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-        
-    def CodeAssign(self):
-        name = self._name
-        code = [ 'int',
-                 '%s_%s_assign(struct %s *msg, '
-                 'const %s value, uint32_t len)' % (
-            self._struct.Name(), name,
-            self._struct.Name(), self._ctype),
-                 '{',
-                 '  if (msg->%s_data != NULL)' % name,
-                 '    free (msg->%s_data);' % name,
-                 '  msg->%s_data = malloc(len);' % name,
-                 '  if (msg->%s_data == NULL)' % name,
-                 '    return (-1);',
-                 '  msg->%s_set = 1;' % name,
-                 '  msg->%s_length = len;' % name,
-                 '  memcpy(msg->%s_data, value, len);' % name,
-                 '  return (0);',
-                 '}' ]
-        return code
-        
-    def CodeGet(self):
-        name = self._name
-        code = [ 'int',
-                 '%s_%s_get(struct %s *msg, %s *value, uint32_t *plen)' % (
-            self._struct.Name(), name,
-            self._struct.Name(), self._ctype),
-                 '{',
-                 '  if (msg->%s_set != 1)' % name,
-                 '    return (-1);',
-                 '  *value = msg->%s_data;' % name,
-                 '  *plen = msg->%s_length;' % name,
-                 '  return (0);',
-                 '}' ]
-        return code
-
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        code = ['if (evtag_payload_length(%s, &%s->%s_length) == -1)' % (
-            buf, var_name, self._name),
-                '  return (-1);',
-                # We do not want DoS opportunities
-                'if (%s->%s_length > EVBUFFER_LENGTH(%s))' % (
-            var_name, self._name, buf),
-                '  return (-1);',
-                'if ((%s->%s_data = malloc(%s->%s_length)) == NULL)' % (
-            var_name, self._name, var_name, self._name),
-                '  return (-1);',
-                'if (evtag_unmarshal_fixed(%s, %s, %s->%s_data, '
-                '%s->%s_length) == -1) {' % (
-            buf, tag_name, var_name, self._name, var_name, self._name),
-                '  event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-            self._name ),
-                '  return (-1);',
-                '}'
-                ]
-        return code
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['evtag_marshal(%s, %s, %s->%s_data, %s->%s_length);' % (
-            buf, tag_name, var_name, self._name, var_name, self._name)]
-        return code
-
-    def CodeClear(self, structname):
-        code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-                 '  free (%s->%s_data);' % (structname, self.Name()),
-                 '  %s->%s_data = NULL;' % (structname, self.Name()),
-                 '  %s->%s_length = 0;' % (structname, self.Name()),
-                 '  %s->%s_set = 0;' % (structname, self.Name()),
-                 '}'
-                 ]
-
-        return code
-        
-    def CodeNew(self, name):
-        code  = ['%s->%s_data = NULL;' % (name, self._name),
-                 '%s->%s_length = 0;' % (name, self._name) ]
-        return code
-
-    def CodeFree(self, name):
-        code  = ['if (%s->%s_data != NULL)' % (name, self._name),
-                 '    free (%s->%s_data); ' % (name, self._name)]
-
-        return code
-
-    def Declaration(self):
-        dcl  = ['uint8_t *%s_data;' % self._name,
-                'uint32_t %s_length;' % self._name]
-
-        return dcl
-
-class EntryArray(Entry):
-    def __init__(self, entry):
-        # Init base class
-        Entry.__init__(self, entry._type, entry._name, entry._tag)
-
-        self._entry = entry
-        self._refname = entry._refname
-        self._ctype = 'struct %s *' % self._refname
-
-    def GetDeclaration(self, funcname):
-        """Allows direct access to elements of the array."""
-        translate = self.GetTranslation()
-        translate["funcname"] = funcname
-        code = [
-            'int %(funcname)s(struct %(parent_name)s *, int, %(ctype)s *);' %
-            translate ]
-        return code
-        
-    def AssignDeclaration(self, funcname):
-        code = [ 'int %s(struct %s *, int, const %s);' % (
-            funcname, self._struct.Name(), self._ctype ) ]
-        return code
-        
-    def AddDeclaration(self, funcname):
-        code = [ '%s %s(struct %s *);' % (
-            self._ctype, funcname, self._struct.Name() ) ]
-        return code
-        
-    def CodeGet(self):
-        code = """int
-%(parent_name)s_%(name)s_get(struct %(parent_name)s *msg, int offset,
-    %(ctype)s *value)
-{
-  if (!msg->%(name)s_set || offset < 0 || offset >= msg->%(name)s_length)
-    return (-1);
-  *value = msg->%(name)s_data[offset];
-  return (0);
-}""" % self.GetTranslation()
-
-        return code.split('\n')
-        
-    def CodeAssign(self):
-        code = """int
-%(parent_name)s_%(name)s_assign(struct %(parent_name)s *msg, int off,
-    const %(ctype)s value)
-{
-  struct evbuffer *tmp = NULL;
-  if (!msg->%(name)s_set || off < 0 || off >= msg->%(name)s_length)
-    return (-1);
-  %(refname)s_clear(msg->%(name)s_data[off]);
-  if ((tmp = evbuffer_new()) == NULL) {
-    event_warn("%%s: evbuffer_new()", __func__);
-    goto error;
-  }
-  %(refname)s_marshal(tmp, value);
-  if (%(refname)s_unmarshal(msg->%(name)s_data[off], tmp) == -1) {
-    event_warnx("%%s: %(refname)s_unmarshal", __func__);
-    goto error;
-  }
-  evbuffer_free(tmp);
-  return (0);
-error:
-  if (tmp != NULL)
-    evbuffer_free(tmp);
-  %(refname)s_clear(msg->%(name)s_data[off]);
-  return (-1);
-}""" % self.GetTranslation()
-
-        return code.split('\n')
-        
-    def CodeAdd(self):
-        code = \
-"""%(ctype)s
-%(parent_name)s_%(name)s_add(struct %(parent_name)s *msg)
-{
-  if (++msg->%(name)s_length >= msg->%(name)s_num_allocated) {
-    int tobe_allocated = msg->%(name)s_num_allocated;
-    %(ctype)s* new_data = NULL;
-    tobe_allocated = !tobe_allocated ? 1 : tobe_allocated << 1;
-    new_data = (%(ctype)s*) realloc(msg->%(name)s_data,
-        tobe_allocated * sizeof(%(ctype)s));
-    if (new_data == NULL)
-      goto error;
-    msg->%(name)s_data = new_data;
-    msg->%(name)s_num_allocated = tobe_allocated;
-  }
-  msg->%(name)s_data[msg->%(name)s_length - 1] = %(refname)s_new();
-  if (msg->%(name)s_data[msg->%(name)s_length - 1] == NULL)
-    goto error;
-  msg->%(name)s_set = 1;
-  return (msg->%(name)s_data[msg->%(name)s_length - 1]);
-error:
-  --msg->%(name)s_length;
-  return (NULL);
-}
-        """ % self.GetTranslation()
-
-        return code.split('\n')
-
-    def CodeComplete(self, structname):
-        code = []
-        translate = self.GetTranslation()
-
-        if self.Optional():
-            code.append( 'if (%(structname)s->%(name)s_set)'  % translate)
-
-        translate["structname"] = structname
-        tmp = """{
-  int i;
-  for (i = 0; i < %(structname)s->%(name)s_length; ++i) {
-    if (%(refname)s_complete(%(structname)s->%(name)s_data[i]) == -1)
-      return (-1);
-  }
-}""" % translate
-        code.extend(tmp.split('\n'))
-
-        return code
-    
-    def CodeUnmarshal(self, buf, tag_name, var_name):
-        translate = self.GetTranslation()
-        translate["var_name"] = var_name
-        translate["buf"] = buf
-        translate["tag_name"] = tag_name
-        code = """if (%(parent_name)s_%(name)s_add(%(var_name)s) == NULL)
-  return (-1);
-if (evtag_unmarshal_%(refname)s(%(buf)s, %(tag_name)s,
-  %(var_name)s->%(name)s_data[%(var_name)s->%(name)s_length - 1]) == -1) {
-  --%(var_name)s->%(name)s_length;
-  event_warnx("%%s: failed to unmarshal %(name)s", __func__);
-  return (-1);
-}""" % translate
-
-        return code.split('\n')
-
-    def CodeMarshal(self, buf, tag_name, var_name):
-        code = ['{',
-                '  int i;',
-                '  for (i = 0; i < %s->%s_length; ++i) {' % (
-            var_name, self._name),
-                '    evtag_marshal_%s(%s, %s, %s->%s_data[i]);' % (
-            self._refname, buf, tag_name, var_name, self._name),
-                '  }',
-                '}'
-                ]
-        return code
-
-    def CodeClear(self, structname):
-        code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-                 '  int i;',
-                 '  for (i = 0; i < %s->%s_length; ++i) {' % (
-            structname, self.Name()),
-                 '    %s_free(%s->%s_data[i]);' % (
-            self._refname, structname, self.Name()),
-                 '  }',
-                 '  free(%s->%s_data);' % (structname, self.Name()),
-                 '  %s->%s_data = NULL;' % (structname, self.Name()),
-                 '  %s->%s_set = 0;' % (structname, self.Name()),
-                 '  %s->%s_length = 0;' % (structname, self.Name()),
-                 '  %s->%s_num_allocated = 0;' % (structname, self.Name()),
-                 '}'
-                 ]
-
-        return code
-        
-    def CodeNew(self, name):
-        code  = ['%s->%s_data = NULL;' % (name, self._name),
-                 '%s->%s_length = 0;' % (name, self._name),
-                 '%s->%s_num_allocated = 0;' % (name, self._name)]
-        return code
-
-    def CodeFree(self, name):
-        code  = ['if (%s->%s_data != NULL) {' % (name, self._name),
-                 '  int i;',
-                 '  for (i = 0; i < %s->%s_length; ++i) {' % (
-            name, self._name),
-                 '    %s_free(%s->%s_data[i]); ' % (
-            self._refname, name, self._name),
-                 '    %s->%s_data[i] = NULL;' % (name, self._name),
-                 '  }',
-                 '  free(%s->%s_data);' % (name, self._name),
-                 '  %s->%s_data = NULL;' % (name, self._name),
-                 '  %s->%s_length = 0;' % (name, self._name),
-                 '  %s->%s_num_allocated = 0;' % (name, self._name),
-                 '}'
-                 ]
-
-        return code
-
-    def Declaration(self):
-        dcl  = ['struct %s **%s_data;' % (self._refname, self._name),
-                'int %s_length;' % self._name,
-                'int %s_num_allocated;' % self._name ]
-
-        return dcl
-
-def NormalizeLine(line):
-    global white
-    global cppcomment
-    
-    line = cppcomment.sub('', line)
-    line = line.strip()
-    line = white.sub(' ', line)
-
-    return line
-
-def ProcessOneEntry(newstruct, entry):
-    optional = 0
-    array = 0
-    entry_type = ''
-    name = ''
-    tag = ''
-    tag_set = None
-    separator = ''
-    fixed_length = ''
-
-    tokens = entry.split(' ')
-    while tokens:
-        token = tokens[0]
-        tokens = tokens[1:]
-
-        if not entry_type:
-            if not optional and token == 'optional':
-                optional = 1
-                continue
-
-            if not array and token == 'array':
-                array = 1
-                continue
-
-        if not entry_type:
-            entry_type = token
-            continue
-
-        if not name:
-            res = re.match(r'^([^\[\]]+)(\[.*\])?$', token)
-            if not res:
-                print >>sys.stderr, 'Cannot parse name: \"%s\" around %d' % (
-                    entry, line_count)
-                sys.exit(1)
-            name = res.group(1)
-            fixed_length = res.group(2)
-            if fixed_length:
-                fixed_length = fixed_length[1:-1]
-            continue
-
-        if not separator:
-            separator = token
-            if separator != '=':
-                print >>sys.stderr, 'Expected "=" after name \"%s\" got %s' % (
-                    name, token)
-                sys.exit(1)
-            continue
-
-        if not tag_set:
-            tag_set = 1
-            if not re.match(r'^(0x)?[0-9]+$', token):
-                print >>sys.stderr, 'Expected tag number: \"%s\"' % entry
-                sys.exit(1)
-            tag = int(token, 0)
-            continue
-
-        print >>sys.stderr, 'Cannot parse \"%s\"' % entry
-        sys.exit(1)
-
-    if not tag_set:
-        print >>sys.stderr, 'Need tag number: \"%s\"' % entry
-        sys.exit(1)
-
-    # Create the right entry
-    if entry_type == 'bytes':
-        if fixed_length:
-            newentry = EntryBytes(entry_type, name, tag, fixed_length)
-        else:
-            newentry = EntryVarBytes(entry_type, name, tag)
-    elif entry_type == 'int' and not fixed_length:
-        newentry = EntryInt(entry_type, name, tag)
-    elif entry_type == 'string' and not fixed_length:
-        newentry = EntryString(entry_type, name, tag)
-    else:
-        res = re.match(r'^struct\[(%s)\]$' % _STRUCT_RE,
-                       entry_type, re.IGNORECASE)
-        if res:
-            # References another struct defined in our file
-            newentry = EntryStruct(entry_type, name, tag, res.group(1))
-        else:
-            print >>sys.stderr, 'Bad type: "%s" in "%s"' % (entry_type, entry)
-            sys.exit(1)
-
-    structs = []
-        
-    if optional:
-        newentry.MakeOptional()
-    if array:
-        newentry.MakeArray()
-
-    newentry.SetStruct(newstruct)
-    newentry.SetLineCount(line_count)
-    newentry.Verify()
-
-    if array:
-        # We need to encapsulate this entry into a struct
-        newname = newentry.Name()+ '_array'
-
-        # Now borgify the new entry.
-        newentry = EntryArray(newentry)
-        newentry.SetStruct(newstruct)
-        newentry.SetLineCount(line_count)
-        newentry.MakeArray()
-
-    newstruct.AddEntry(newentry)
-
-    return structs
-
-def ProcessStruct(data):
-    tokens = data.split(' ')
-
-    # First three tokens are: 'struct' 'name' '{'
-    newstruct = Struct(tokens[1])
-
-    inside = ' '.join(tokens[3:-1])
-
-    tokens = inside.split(';')
-
-    structs = []
-
-    for entry in tokens:
-        entry = NormalizeLine(entry)
-        if not entry:
-            continue
-
-        # It's possible that new structs get defined in here
-        structs.extend(ProcessOneEntry(newstruct, entry))
-
-    structs.append(newstruct)
-    return structs
-
-def GetNextStruct(file):
-    global line_count
-    global cppdirect
-
-    got_struct = 0
-
-    processed_lines = []
-
-    have_c_comment = 0
-    data = ''
-    while 1:
-        line = file.readline()
-        if not line:
-            break
-        
-        line_count += 1
-        line = line[:-1]
-
-        if not have_c_comment and re.search(r'/\*', line):
-            if re.search(r'/\*.*\*/', line):
-                line = re.sub(r'/\*.*\*/', '', line)
-            else:
-                line = re.sub(r'/\*.*$', '', line)
-                have_c_comment = 1
-
-        if have_c_comment:
-            if not re.search(r'\*/', line):
-                continue
-            have_c_comment = 0
-            line = re.sub(r'^.*\*/', '', line)
-
-        line = NormalizeLine(line)
-
-        if not line:
-            continue
-
-        if not got_struct:
-            if re.match(r'#include ["<].*[>"]', line):
-                cppdirect.append(line)
-                continue
-            
-            if re.match(r'^#(if( |def)|endif)', line):
-                cppdirect.append(line)
-                continue
-
-            if re.match(r'^#define', line):
-                headerdirect.append(line)
-                continue
-
-            if not re.match(r'^struct %s {$' % _STRUCT_RE,
-                            line, re.IGNORECASE):
-                print >>sys.stderr, 'Missing struct on line %d: %s' % (
-                    line_count, line)
-                sys.exit(1)
-            else:
-                got_struct = 1
-                data += line
-            continue
-
-        # We are inside the struct
-        tokens = line.split('}')
-        if len(tokens) == 1:
-            data += ' ' + line
-            continue
-
-        if len(tokens[1]):
-            print >>sys.stderr, 'Trailing garbage after struct on line %d' % (
-                line_count )
-            sys.exit(1)
-
-        # We found the end of the struct
-        data += ' %s}' % tokens[0]
-        break
-
-    # Remove any comments, that might be in there
-    data = re.sub(r'/\*.*\*/', '', data)
-    
-    return data
-        
-
-def Parse(file):
-    """
-    Parses the input file and returns C code and corresponding header file.
-    """
-
-    entities = []
-
-    while 1:
-        # Just gets the whole struct nicely formatted
-        data = GetNextStruct(file)
-
-        if not data:
-            break
-
-        entities.extend(ProcessStruct(data))
-
-    return entities
-
-def GuardName(name):
-    name = '_'.join(name.split('.'))
-    name = '_'.join(name.split('/'))
-    guard = '_'+name.upper()+'_'
-
-    return guard
-
-def HeaderPreamble(name):
-    guard = GuardName(name)
-    pre = (
-        '/*\n'
-        ' * Automatically generated from %s\n'
-        ' */\n\n'
-        '#ifndef %s\n'
-        '#define %s\n\n' ) % (
-        name, guard, guard)
-
-    # insert stdint.h - let's hope everyone has it
-    pre += (
-        '#include <event-config.h>\n'
-        '#ifdef _EVENT_HAVE_STDINT_H\n'
-        '#include <stdint.h>\n'
-        '#endif\n' )
-
-    for statement in headerdirect:
-        pre += '%s\n' % statement
-    if headerdirect:
-        pre += '\n'
-
-    pre += (
-        '#define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)\n'
-        '#ifdef __GNUC__\n'
-        '#define EVTAG_ASSIGN(msg, member, args...) '
-        '(*(msg)->base->member##_assign)(msg, ## args)\n'
-        '#define EVTAG_GET(msg, member, args...) '
-        '(*(msg)->base->member##_get)(msg, ## args)\n'
-        '#else\n'
-        '#define EVTAG_ASSIGN(msg, member, ...) '
-        '(*(msg)->base->member##_assign)(msg, ## __VA_ARGS__)\n'
-        '#define EVTAG_GET(msg, member, ...) '
-        '(*(msg)->base->member##_get)(msg, ## __VA_ARGS__)\n'
-        '#endif\n'
-        '#define EVTAG_ADD(msg, member) (*(msg)->base->member##_add)(msg)\n'
-        '#define EVTAG_LEN(msg, member) ((msg)->member##_length)\n'
-        )
-
-    return pre
-     
-
-def HeaderPostamble(name):
-    guard = GuardName(name)
-    return '#endif  /* %s */' % guard
-
-def BodyPreamble(name):
-    global _NAME
-    global _VERSION
-    
-    header_file = '.'.join(name.split('.')[:-1]) + '.gen.h'
-
-    pre = ( '/*\n'
-            ' * Automatically generated from %s\n'
-            ' * by %s/%s.  DO NOT EDIT THIS FILE.\n'
-            ' */\n\n' ) % (name, _NAME, _VERSION)
-    pre += ( '#include <sys/types.h>\n'
-             '#include <sys/time.h>\n'
-             '#include <stdlib.h>\n'
-             '#include <string.h>\n'
-             '#include <assert.h>\n'
-             '#include <event.h>\n\n' )
-
-    for statement in cppdirect:
-        pre += '%s\n' % statement
-    
-    pre += '\n#include "%s"\n\n' % header_file
-
-    pre += 'void event_err(int eval, const char *fmt, ...);\n'
-    pre += 'void event_warn(const char *fmt, ...);\n'
-    pre += 'void event_errx(int eval, const char *fmt, ...);\n'
-    pre += 'void event_warnx(const char *fmt, ...);\n\n'
-
-    return pre
-
-def main(argv):
-    if len(argv) < 2 or not argv[1]:
-        print >>sys.stderr, 'Need RPC description file as first argument.'
-        sys.exit(1)
-
-    filename = argv[1]
-
-    ext = filename.split('.')[-1]
-    if ext != 'rpc':
-        print >>sys.stderr, 'Unrecognized file extension: %s' % ext
-        sys.exit(1)
-
-    print >>sys.stderr, 'Reading \"%s\"' % filename
-
-    fp = open(filename, 'r')
-    entities = Parse(fp)
-    fp.close()
-
-    header_file = '.'.join(filename.split('.')[:-1]) + '.gen.h'
-    impl_file = '.'.join(filename.split('.')[:-1]) + '.gen.c'
-
-    print >>sys.stderr, '... creating "%s"' % header_file
-    header_fp = open(header_file, 'w')
-    print >>header_fp, HeaderPreamble(filename)
-
-    # Create forward declarations: allows other structs to reference
-    # each other
-    for entry in entities:
-        entry.PrintForwardDeclaration(header_fp)
-    print >>header_fp, ''
-
-    for entry in entities:
-        entry.PrintTags(header_fp)
-        entry.PrintDeclaration(header_fp)
-    print >>header_fp, HeaderPostamble(filename)
-    header_fp.close()
-
-    print >>sys.stderr, '... creating "%s"' % impl_file
-    impl_fp = open(impl_file, 'w')
-    print >>impl_fp, BodyPreamble(filename)
-    for entry in entities:
-        entry.PrintCode(impl_fp)
-    impl_fp.close()
-
-if __name__ == '__main__':
-    main(sys.argv)
diff --git a/libevent/event_tagging.c b/libevent/event_tagging.c
deleted file mode 100644
index d436e3fd65bd..000000000000
--- a/libevent/event_tagging.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#else
-#include <sys/ioctl.h>
-#endif
-
-#include <sys/queue.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef WIN32
-#include <syslog.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "event.h"
-#include "evutil.h"
-#include "log.h"
-
-int evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf);
-int evtag_encode_tag(struct evbuffer *evbuf, ev_uint32_t tag);
-int evtag_decode_tag(ev_uint32_t *ptag, struct evbuffer *evbuf);
-
-static struct evbuffer *_buf;	/* not thread safe */
-
-void
-evtag_init(void)
-{
-	if (_buf != NULL)
-		return;
-
-	if ((_buf = evbuffer_new()) == NULL)
-		event_err(1, "%s: malloc", __func__);
-}
-
-/* 
- * We encode integer's by nibbles; the first nibble contains the number
- * of significant nibbles - 1;  this allows us to encode up to 64-bit
- * integers.  This function is byte-order independent.
- */
-
-void
-encode_int(struct evbuffer *evbuf, ev_uint32_t number)
-{
-	int off = 1, nibbles = 0;
-	ev_uint8_t data[5];
-
-	memset(data, 0, sizeof(ev_uint32_t)+1);
-	while (number) {
-		if (off & 0x1)
-			data[off/2] = (data[off/2] & 0xf0) | (number & 0x0f);
-		else
-			data[off/2] = (data[off/2] & 0x0f) |
-			    ((number & 0x0f) << 4);
-		number >>= 4;
-		off++;
-	}
-
-	if (off > 2)
-		nibbles = off - 2;
-
-	/* Off - 1 is the number of encoded nibbles */
-	data[0] = (data[0] & 0x0f) | ((nibbles & 0x0f) << 4);
-
-	evbuffer_add(evbuf, data, (off + 1) / 2);
-}
-
-/*
- * Support variable length encoding of tags; we use the high bit in each
- * octet as a continuation signal.
- */
-
-int
-evtag_encode_tag(struct evbuffer *evbuf, ev_uint32_t tag)
-{
-	int bytes = 0;
-	ev_uint8_t data[5];
-
-	memset(data, 0, sizeof(data));
-	do {
-		ev_uint8_t lower = tag & 0x7f;
-		tag >>= 7;
-
-		if (tag)
-			lower |= 0x80;
-
-		data[bytes++] = lower;
-	} while (tag);
-
-	if (evbuf != NULL)
-		evbuffer_add(evbuf, data, bytes);
-
-	return (bytes);
-}
-
-static int
-decode_tag_internal(ev_uint32_t *ptag, struct evbuffer *evbuf, int dodrain)
-{
-	ev_uint32_t number = 0;
-	ev_uint8_t *data = EVBUFFER_DATA(evbuf);
-	int len = EVBUFFER_LENGTH(evbuf);
-	int count = 0, shift = 0, done = 0;
-
-	while (count++ < len) {
-		ev_uint8_t lower = *data++;
-		number |= (lower & 0x7f) << shift;
-		shift += 7;
-
-		if (!(lower & 0x80)) {
-			done = 1;
-			break;
-		}
-	}
-
-	if (!done)
-		return (-1);
-
-	if (dodrain)
-		evbuffer_drain(evbuf, count);
-
-	if (ptag != NULL)
-		*ptag = number;
-
-	return (count);
-}
-
-int
-evtag_decode_tag(ev_uint32_t *ptag, struct evbuffer *evbuf)
-{
-	return (decode_tag_internal(ptag, evbuf, 1 /* dodrain */));
-}
-
-/*
- * Marshal a data type, the general format is as follows:
- *
- * tag number: one byte; length: var bytes; payload: var bytes
- */
-
-void
-evtag_marshal(struct evbuffer *evbuf, ev_uint32_t tag,
-    const void *data, ev_uint32_t len)
-{
-	evtag_encode_tag(evbuf, tag);
-	encode_int(evbuf, len);
-	evbuffer_add(evbuf, (void *)data, len);
-}
-
-/* Marshaling for integers */
-void
-evtag_marshal_int(struct evbuffer *evbuf, ev_uint32_t tag, ev_uint32_t integer)
-{
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-	encode_int(_buf, integer);
-
-	evtag_encode_tag(evbuf, tag);
-	encode_int(evbuf, EVBUFFER_LENGTH(_buf));
-	evbuffer_add_buffer(evbuf, _buf);
-}
-
-void
-evtag_marshal_string(struct evbuffer *buf, ev_uint32_t tag, const char *string)
-{
-	evtag_marshal(buf, tag, string, strlen(string));
-}
-
-void
-evtag_marshal_timeval(struct evbuffer *evbuf, ev_uint32_t tag, struct timeval *tv)
-{
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-
-	encode_int(_buf, tv->tv_sec);
-	encode_int(_buf, tv->tv_usec);
-
-	evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
-	    EVBUFFER_LENGTH(_buf));
-}
-
-static int
-decode_int_internal(ev_uint32_t *pnumber, struct evbuffer *evbuf, int dodrain)
-{
-	ev_uint32_t number = 0;
-	ev_uint8_t *data = EVBUFFER_DATA(evbuf);
-	int len = EVBUFFER_LENGTH(evbuf);
-	int nibbles = 0;
-
-	if (!len)
-		return (-1);
-
-	nibbles = ((data[0] & 0xf0) >> 4) + 1;
-	if (nibbles > 8 || (nibbles >> 1) + 1 > len)
-		return (-1);
-	len = (nibbles >> 1) + 1;
-
-	while (nibbles > 0) {
-		number <<= 4;
-		if (nibbles & 0x1)
-			number |= data[nibbles >> 1] & 0x0f;
-		else
-			number |= (data[nibbles >> 1] & 0xf0) >> 4;
-		nibbles--;
-	}
-
-	if (dodrain)
-		evbuffer_drain(evbuf, len);
-
-	*pnumber = number;
-
-	return (len);
-}
-
-int
-evtag_decode_int(ev_uint32_t *pnumber, struct evbuffer *evbuf)
-{
-	return (decode_int_internal(pnumber, evbuf, 1) == -1 ? -1 : 0);
-}
-
-int
-evtag_peek(struct evbuffer *evbuf, ev_uint32_t *ptag)
-{
-	return (decode_tag_internal(ptag, evbuf, 0 /* dodrain */));
-}
-
-int
-evtag_peek_length(struct evbuffer *evbuf, ev_uint32_t *plength)
-{
-	struct evbuffer tmp;
-	int res, len;
-
-	len = decode_tag_internal(NULL, evbuf, 0 /* dodrain */);
-	if (len == -1)
-		return (-1);
-
-	tmp = *evbuf;
-	tmp.buffer += len;
-	tmp.off -= len;
-
-	res = decode_int_internal(plength, &tmp, 0);
-	if (res == -1)
-		return (-1);
-
-	*plength += res + len;
-
-	return (0);
-}
-
-int
-evtag_payload_length(struct evbuffer *evbuf, ev_uint32_t *plength)
-{
-	struct evbuffer tmp;
-	int res, len;
-
-	len = decode_tag_internal(NULL, evbuf, 0 /* dodrain */);
-	if (len == -1)
-		return (-1);
-
-	tmp = *evbuf;
-	tmp.buffer += len;
-	tmp.off -= len;
-
-	res = decode_int_internal(plength, &tmp, 0);
-	if (res == -1)
-		return (-1);
-
-	return (0);
-}
-
-int
-evtag_consume(struct evbuffer *evbuf)
-{
-	ev_uint32_t len;
-	if (decode_tag_internal(NULL, evbuf, 1 /* dodrain */) == -1)
-		return (-1);
-	if (evtag_decode_int(&len, evbuf) == -1)
-		return (-1);
-	evbuffer_drain(evbuf, len);
-
-	return (0);
-}
-
-/* Reads the data type from an event buffer */
-
-int
-evtag_unmarshal(struct evbuffer *src, ev_uint32_t *ptag, struct evbuffer *dst)
-{
-	ev_uint32_t len;
-	ev_uint32_t integer;
-
-	if (decode_tag_internal(ptag, src, 1 /* dodrain */) == -1)
-		return (-1);
-	if (evtag_decode_int(&integer, src) == -1)
-		return (-1);
-	len = integer;
-
-	if (EVBUFFER_LENGTH(src) < len)
-		return (-1);
-
-	if (evbuffer_add(dst, EVBUFFER_DATA(src), len) == -1)
-		return (-1);
-
-	evbuffer_drain(src, len);
-
-	return (len);
-}
-
-/* Marshaling for integers */
-
-int
-evtag_unmarshal_int(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    ev_uint32_t *pinteger)
-{
-	ev_uint32_t tag;
-	ev_uint32_t len;
-	ev_uint32_t integer;
-
-	if (decode_tag_internal(&tag, evbuf, 1 /* dodrain */) == -1)
-		return (-1);
-	if (need_tag != tag)
-		return (-1);
-	if (evtag_decode_int(&integer, evbuf) == -1)
-		return (-1);
-	len = integer;
-
-	if (EVBUFFER_LENGTH(evbuf) < len)
-		return (-1);
-	
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-	if (evbuffer_add(_buf, EVBUFFER_DATA(evbuf), len) == -1)
-		return (-1);
-
-	evbuffer_drain(evbuf, len);
-
-	return (evtag_decode_int(pinteger, _buf));
-}
-
-/* Unmarshal a fixed length tag */
-
-int
-evtag_unmarshal_fixed(struct evbuffer *src, ev_uint32_t need_tag, void *data,
-    size_t len)
-{
-	ev_uint32_t tag;
-
-	/* Initialize this event buffer so that we can read into it */
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-
-	/* Now unmarshal a tag and check that it matches the tag we want */
-	if (evtag_unmarshal(src, &tag, _buf) == -1 || tag != need_tag)
-		return (-1);
-
-	if (EVBUFFER_LENGTH(_buf) != len)
-		return (-1);
-
-	memcpy(data, EVBUFFER_DATA(_buf), len);
-	return (0);
-}
-
-int
-evtag_unmarshal_string(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    char **pstring)
-{
-	ev_uint32_t tag;
-
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-
-	if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)
-		return (-1);
-
-	*pstring = calloc(EVBUFFER_LENGTH(_buf) + 1, 1);
-	if (*pstring == NULL)
-		event_err(1, "%s: calloc", __func__);
-	evbuffer_remove(_buf, *pstring, EVBUFFER_LENGTH(_buf));
-
-	return (0);
-}
-
-int
-evtag_unmarshal_timeval(struct evbuffer *evbuf, ev_uint32_t need_tag,
-    struct timeval *ptv)
-{
-	ev_uint32_t tag;
-	ev_uint32_t integer;
-
-	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-	if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)
-		return (-1);
-
-	if (evtag_decode_int(&integer, _buf) == -1)
-		return (-1);
-	ptv->tv_sec = integer;
-	if (evtag_decode_int(&integer, _buf) == -1)
-		return (-1);
-	ptv->tv_usec = integer;
-
-	return (0);
-}
diff --git a/libevent/evhttp.h b/libevent/evhttp.h
deleted file mode 100644
index 99d16a2f47ab..000000000000
--- a/libevent/evhttp.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVHTTP_H_
-#define _EVHTTP_H_
-
-#include <event.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-/** @file evhttp.h
- *
- * Basic support for HTTP serving.
- *
- * As libevent is a library for dealing with event notification and most
- * interesting applications are networked today, I have often found the
- * need to write HTTP code.  The following prototypes and definitions provide
- * an application with a minimal interface for making HTTP requests and for
- * creating a very simple HTTP server.
- */
-
-/* Response codes */
-#define HTTP_OK			200
-#define HTTP_NOCONTENT		204
-#define HTTP_MOVEPERM		301
-#define HTTP_MOVETEMP		302
-#define HTTP_NOTMODIFIED	304
-#define HTTP_BADREQUEST		400
-#define HTTP_NOTFOUND		404
-#define HTTP_SERVUNAVAIL	503
-
-struct evhttp;
-struct evhttp_request;
-struct evkeyvalq;
-
-/** Create a new HTTP server
- *
- * @param base (optional) the event base to receive the HTTP events
- * @return a pointer to a newly initialized evhttp server structure
- */
-struct evhttp *evhttp_new(struct event_base *base);
-
-/**
- * Binds an HTTP server on the specified address and port.
- *
- * Can be called multiple times to bind the same http server
- * to multiple different ports.
- *
- * @param http a pointer to an evhttp object
- * @param address a string containing the IP address to listen(2) on
- * @param port the port number to listen on
- * @return a newly allocated evhttp struct
- * @see evhttp_free()
- */
-int evhttp_bind_socket(struct evhttp *http, const char *address, u_short port);
-
-/**
- * Makes an HTTP server accept connections on the specified socket
- *
- * This may be useful to create a socket and then fork multiple instances
- * of an http server, or when a socket has been communicated via file
- * descriptor passing in situations where an http servers does not have
- * permissions to bind to a low-numbered port.
- *
- * Can be called multiple times to have the http server listen to
- * multiple different sockets.
- *
- * @param http a pointer to an evhttp object
- * @param fd a socket fd that is ready for accepting connections
- * @return 0 on success, -1 on failure.
- * @see evhttp_free(), evhttp_bind_socket()
- */
-int evhttp_accept_socket(struct evhttp *http, int fd);
-
-/**
- * Free the previously created HTTP server.
- *
- * Works only if no requests are currently being served.
- *
- * @param http the evhttp server object to be freed
- * @see evhttp_start()
- */
-void evhttp_free(struct evhttp* http);
-
-/** Set a callback for a specified URI */
-void evhttp_set_cb(struct evhttp *, const char *,
-    void (*)(struct evhttp_request *, void *), void *);
-
-/** Removes the callback for a specified URI */
-int evhttp_del_cb(struct evhttp *, const char *);
-
-/** Set a callback for all requests that are not caught by specific callbacks
- */
-void evhttp_set_gencb(struct evhttp *,
-    void (*)(struct evhttp_request *, void *), void *);
-
-/**
- * Set the timeout for an HTTP request.
- *
- * @param http an evhttp object
- * @param timeout_in_secs the timeout, in seconds
- */
-void evhttp_set_timeout(struct evhttp *, int timeout_in_secs);
-
-/* Request/Response functionality */
-
-/**
- * Send an HTML error message to the client.
- *
- * @param req a request object
- * @param error the HTTP error code
- * @param reason a brief explanation of the error
- */
-void evhttp_send_error(struct evhttp_request *req, int error,
-    const char *reason);
-
-/**
- * Send an HTML reply to the client.
- *
- * @param req a request object
- * @param code the HTTP response code to send
- * @param reason a brief message to send with the response code
- * @param databuf the body of the response
- */
-void evhttp_send_reply(struct evhttp_request *req, int code,
-    const char *reason, struct evbuffer *databuf);
-
-/* Low-level response interface, for streaming/chunked replies */
-void evhttp_send_reply_start(struct evhttp_request *, int, const char *);
-void evhttp_send_reply_chunk(struct evhttp_request *, struct evbuffer *);
-void evhttp_send_reply_end(struct evhttp_request *);
-
-/**
- * Start an HTTP server on the specified address and port
- *
- * DEPRECATED: it does not allow an event base to be specified
- *
- * @param address the address to which the HTTP server should be bound
- * @param port the port number on which the HTTP server should listen
- * @return an struct evhttp object
- */
-struct evhttp *evhttp_start(const char *address, u_short port);
-
-/*
- * Interfaces for making requests
- */
-enum evhttp_cmd_type { EVHTTP_REQ_GET, EVHTTP_REQ_POST, EVHTTP_REQ_HEAD };
-
-enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE };
-
-/**
- * the request structure that a server receives.
- * WARNING: expect this structure to change.  I will try to provide
- * reasonable accessors.
- */
-struct evhttp_request {
-#if defined(TAILQ_ENTRY)
-	TAILQ_ENTRY(evhttp_request) next;
-#else
-struct {
-	struct evhttp_request *tqe_next;
-	struct evhttp_request **tqe_prev;
-}       next;
-#endif
-
-	/* the connection object that this request belongs to */
-	struct evhttp_connection *evcon;
-	int flags;
-#define EVHTTP_REQ_OWN_CONNECTION	0x0001
-#define EVHTTP_PROXY_REQUEST		0x0002
-
-	struct evkeyvalq *input_headers;
-	struct evkeyvalq *output_headers;
-
-	/* address of the remote host and the port connection came from */
-	char *remote_host;
-	u_short remote_port;
-
-	enum evhttp_request_kind kind;
-	enum evhttp_cmd_type type;
-
-	char *uri;			/* uri after HTTP request was parsed */
-
-	char major;			/* HTTP Major number */
-	char minor;			/* HTTP Minor number */
-
-	int response_code;		/* HTTP Response code */
-	char *response_code_line;	/* Readable response */
-
-	struct evbuffer *input_buffer;	/* read data */
-	ev_int64_t ntoread;
-	int chunked;
-
-	struct evbuffer *output_buffer;	/* outgoing post or data */
-
-	/* Callback */
-	void (*cb)(struct evhttp_request *, void *);
-	void *cb_arg;
-
-	/*
-	 * Chunked data callback - call for each completed chunk if
-	 * specified.  If not specified, all the data is delivered via
-	 * the regular callback.
-	 */
-	void (*chunk_cb)(struct evhttp_request *, void *);
-};
-
-/**
- * Creates a new request object that needs to be filled in with the request
- * parameters.  The callback is executed when the request completed or an
- * error occurred.
- */
-struct evhttp_request *evhttp_request_new(
-	void (*cb)(struct evhttp_request *, void *), void *arg);
-
-/** enable delivery of chunks to requestor */
-void evhttp_request_set_chunked_cb(struct evhttp_request *,
-    void (*cb)(struct evhttp_request *, void *));
-
-/** Frees the request object and removes associated events. */
-void evhttp_request_free(struct evhttp_request *req);
-
-/**
- * A connection object that can be used to for making HTTP requests.  The
- * connection object tries to establish the connection when it is given an
- * http request object.
- */
-struct evhttp_connection *evhttp_connection_new(
-	const char *address, unsigned short port);
-
-/** Frees an http connection */
-void evhttp_connection_free(struct evhttp_connection *evcon);
-
-/** sets the ip address from which http connections are made */
-void evhttp_connection_set_local_address(struct evhttp_connection *evcon,
-    const char *address);
-
-/** sets the local port from which http connections are made */
-void evhttp_connection_set_local_port(struct evhttp_connection *evcon,
-    unsigned short port);
-
-/** Sets the timeout for events related to this connection */
-void evhttp_connection_set_timeout(struct evhttp_connection *evcon,
-    int timeout_in_secs);
-
-/** Sets the retry limit for this connection - -1 repeats indefnitely */
-void evhttp_connection_set_retries(struct evhttp_connection *evcon,
-    int retry_max);
-
-/** Set a callback for connection close. */
-void evhttp_connection_set_closecb(struct evhttp_connection *evcon,
-    void (*)(struct evhttp_connection *, void *), void *);
-
-/**
- * Associates an event base with the connection - can only be called
- * on a freshly created connection object that has not been used yet.
- */
-void evhttp_connection_set_base(struct evhttp_connection *evcon,
-    struct event_base *base);
-
-/** Get the remote address and port associated with this connection. */
-void evhttp_connection_get_peer(struct evhttp_connection *evcon,
-    char **address, u_short *port);
-
-/** The connection gets ownership of the request */
-int evhttp_make_request(struct evhttp_connection *evcon,
-    struct evhttp_request *req,
-    enum evhttp_cmd_type type, const char *uri);
-
-const char *evhttp_request_uri(struct evhttp_request *req);
-
-/* Interfaces for dealing with HTTP headers */
-
-const char *evhttp_find_header(const struct evkeyvalq *, const char *);
-int evhttp_remove_header(struct evkeyvalq *, const char *);
-int evhttp_add_header(struct evkeyvalq *, const char *, const char *);
-void evhttp_clear_headers(struct evkeyvalq *);
-
-/* Miscellaneous utility functions */
-
-
-/**
-  Helper function to encode a URI.
-
-  The returned string must be freed by the caller.
-
-  @param uri an unencoded URI
-  @return a newly allocated URI-encoded string
- */
-char *evhttp_encode_uri(const char *uri);
-
-
-/**
-  Helper function to decode a URI.
-
-  The returned string must be freed by the caller.
-
-  @param uri an encoded URI
-  @return a newly allocated unencoded URI
- */
-char *evhttp_decode_uri(const char *uri);
-
-
-/**
- * Helper function to parse out arguments in a query.
- *
- * Parsing a uri like
- *
- *    http://foo.com/?q=test&s=some+thing
- *
- * will result in two entries in the key value queue.
-
- * The first entry is: key="q", value="test"
- * The second entry is: key="s", value="some thing"
- *
- * @param uri the request URI
- * @param headers the head of the evkeyval queue
- */
-void evhttp_parse_query(const char *uri, struct evkeyvalq *headers);
-
-
-/**
- * Escape HTML character entities in a string.
- *
- * Replaces <, >, ", ' and & with &lt;, &gt;, &quot;,
- * &#039; and &amp; correspondingly.
- *
- * The returned string needs to be freed by the caller.
- *
- * @param html an unescaped HTML string
- * @return an escaped HTML string
- */
-char *evhttp_htmlescape(const char *html);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EVHTTP_H_ */
diff --git a/libevent/evport.c b/libevent/evport.c
deleted file mode 100644
index dae6900cc10d..000000000000
--- a/libevent/evport.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Submitted by David Pacheco (dp.spambait@gmail.com)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY SUN MICROSYSTEMS, INC. ``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 SUN MICROSYSTEMS, INC. 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. 
- */
-
-/*
- * Copyright (c) 2007 Sun Microsystems. All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * evport.c: event backend using Solaris 10 event ports. See port_create(3C).
- * This implementation is loosely modeled after the one used for select(2) (in
- * select.c).
- *
- * The outstanding events are tracked in a data structure called evport_data.
- * Each entry in the ed_fds array corresponds to a file descriptor, and contains
- * pointers to the read and write events that correspond to that fd. (That is,
- * when the file is readable, the "read" event should handle it, etc.)
- *
- * evport_add and evport_del update this data structure. evport_dispatch uses it
- * to determine where to callback when an event occurs (which it gets from
- * port_getn). 
- *
- * Helper functions are used: grow() grows the file descriptor array as
- * necessary when large fd's come in. reassociate() takes care of maintaining
- * the proper file-descriptor/event-port associations.
- *
- * As in the select(2) implementation, signals are handled by evsignal.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/time.h>
-#include <assert.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <poll.h>
-#include <port.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#ifdef CHECK_INVARIANTS
-#include <assert.h>
-#endif
-
-#include "event.h"
-#include "event-internal.h"
-#include "log.h"
-#include "evsignal.h"
-
-
-/*
- * Default value for ed_nevents, which is the maximum file descriptor number we
- * can handle. If an event comes in for a file descriptor F > nevents, we will
- * grow the array of file descriptors, doubling its size.
- */
-#define DEFAULT_NFDS	16
-
-
-/*
- * EVENTS_PER_GETN is the maximum number of events to retrieve from port_getn on
- * any particular call. You can speed things up by increasing this, but it will
- * (obviously) require more memory.
- */
-#define EVENTS_PER_GETN 8
-
-/*
- * Per-file-descriptor information about what events we're subscribed to. These
- * fields are NULL if no event is subscribed to either of them.
- */
-
-struct fd_info {
-	struct event* fdi_revt; /* the event responsible for the "read"  */
-	struct event* fdi_wevt; /* the event responsible for the "write" */
-};
-
-#define FDI_HAS_READ(fdi)  ((fdi)->fdi_revt != NULL)
-#define FDI_HAS_WRITE(fdi) ((fdi)->fdi_wevt != NULL)
-#define FDI_HAS_EVENTS(fdi) (FDI_HAS_READ(fdi) || FDI_HAS_WRITE(fdi))
-#define FDI_TO_SYSEVENTS(fdi) (FDI_HAS_READ(fdi) ? POLLIN : 0) | \
-    (FDI_HAS_WRITE(fdi) ? POLLOUT : 0)
-
-struct evport_data {
-	int 		ed_port;	/* event port for system events  */
-	int		ed_nevents;	/* number of allocated fdi's 	 */
-	struct fd_info *ed_fds;		/* allocated fdi table 		 */
-	/* fdi's that we need to reassoc */
-	int ed_pending[EVENTS_PER_GETN]; /* fd's with pending events */
-};
-
-static void*	evport_init	(struct event_base *);
-static int 	evport_add	(void *, struct event *);
-static int 	evport_del	(void *, struct event *);
-static int 	evport_dispatch	(struct event_base *, void *, struct timeval *);
-static void	evport_dealloc	(struct event_base *, void *);
-
-const struct eventop evportops = {
-	"evport",
-	evport_init,
-	evport_add,
-	evport_del,
-	evport_dispatch,
-	evport_dealloc,
-	1 /* need reinit */
-};
-
-/*
- * Initialize the event port implementation.
- */
-
-static void*
-evport_init(struct event_base *base)
-{
-	struct evport_data *evpd;
-	int i;
-	/*
-	 * Disable event ports when this environment variable is set 
-	 */
-	if (getenv("EVENT_NOEVPORT"))
-		return (NULL);
-
-	if (!(evpd = calloc(1, sizeof(struct evport_data))))
-		return (NULL);
-
-	if ((evpd->ed_port = port_create()) == -1) {
-		free(evpd);
-		return (NULL);
-	}
-
-	/*
-	 * Initialize file descriptor structure
-	 */
-	evpd->ed_fds = calloc(DEFAULT_NFDS, sizeof(struct fd_info));
-	if (evpd->ed_fds == NULL) {
-		close(evpd->ed_port);
-		free(evpd);
-		return (NULL);
-	}
-	evpd->ed_nevents = DEFAULT_NFDS;
-	for (i = 0; i < EVENTS_PER_GETN; i++)
-		evpd->ed_pending[i] = -1;
-
-	evsignal_init(base);
-
-	return (evpd);
-}
-
-#ifdef CHECK_INVARIANTS
-/*
- * Checks some basic properties about the evport_data structure. Because it
- * checks all file descriptors, this function can be expensive when the maximum
- * file descriptor ever used is rather large.
- */
-
-static void
-check_evportop(struct evport_data *evpd)
-{
-	assert(evpd);
-	assert(evpd->ed_nevents > 0);
-	assert(evpd->ed_port > 0);
-	assert(evpd->ed_fds > 0);
-
-	/*
-	 * Verify the integrity of the fd_info struct as well as the events to
-	 * which it points (at least, that they're valid references and correct
-	 * for their position in the structure).
-	 */
-	int i;
-	for (i = 0; i < evpd->ed_nevents; ++i) {
-		struct event 	*ev;
-		struct fd_info 	*fdi;
-
-		fdi = &evpd->ed_fds[i];
-		if ((ev = fdi->fdi_revt) != NULL) {
-			assert(ev->ev_fd == i);
-		}
-		if ((ev = fdi->fdi_wevt) != NULL) {
-			assert(ev->ev_fd == i);
-		}
-	}
-}
-
-/*
- * Verifies very basic integrity of a given port_event.
- */
-static void
-check_event(port_event_t* pevt)
-{
-	/*
-	 * We've only registered for PORT_SOURCE_FD events. The only
-	 * other thing we can legitimately receive is PORT_SOURCE_ALERT,
-	 * but since we're not using port_alert either, we can assume
-	 * PORT_SOURCE_FD.
-	 */
-	assert(pevt->portev_source == PORT_SOURCE_FD);
-	assert(pevt->portev_user == NULL);
-}
-
-#else
-#define check_evportop(epop)
-#define check_event(pevt)
-#endif /* CHECK_INVARIANTS */
-
-/*
- * Doubles the size of the allocated file descriptor array.
- */
-static int
-grow(struct evport_data *epdp, int factor)
-{
-	struct fd_info *tmp;
-	int oldsize = epdp->ed_nevents;
-	int newsize = factor * oldsize;
-	assert(factor > 1);
-
-	check_evportop(epdp);
-
-	tmp = realloc(epdp->ed_fds, sizeof(struct fd_info) * newsize);
-	if (NULL == tmp)
-		return -1;
-	epdp->ed_fds = tmp;
-	memset((char*) (epdp->ed_fds + oldsize), 0, 
-	    (newsize - oldsize)*sizeof(struct fd_info));
-	epdp->ed_nevents = newsize;
-
-	check_evportop(epdp);
-
-	return 0;
-}
-
-
-/*
- * (Re)associates the given file descriptor with the event port. The OS events
- * are specified (implicitly) from the fd_info struct.
- */
-static int
-reassociate(struct evport_data *epdp, struct fd_info *fdip, int fd)
-{
-	int sysevents = FDI_TO_SYSEVENTS(fdip);
-
-	if (sysevents != 0) {
-		if (port_associate(epdp->ed_port, PORT_SOURCE_FD,
-				   fd, sysevents, NULL) == -1) {
-			event_warn("port_associate");
-			return (-1);
-		}
-	}
-
-	check_evportop(epdp);
-
-	return (0);
-}
-
-/*
- * Main event loop - polls port_getn for some number of events, and processes
- * them.
- */
-
-static int
-evport_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	int i, res;
-	struct evport_data *epdp = arg;
-	port_event_t pevtlist[EVENTS_PER_GETN];
-
-	/*
-	 * port_getn will block until it has at least nevents events. It will
-	 * also return how many it's given us (which may be more than we asked
-	 * for, as long as it's less than our maximum (EVENTS_PER_GETN)) in
-	 * nevents.
-	 */
-	int nevents = 1;
-
-	/*
-	 * We have to convert a struct timeval to a struct timespec
-	 * (only difference is nanoseconds vs. microseconds). If no time-based
-	 * events are active, we should wait for I/O (and tv == NULL).
-	 */
-	struct timespec ts;
-	struct timespec *ts_p = NULL;
-	if (tv != NULL) {
-		ts.tv_sec = tv->tv_sec;
-		ts.tv_nsec = tv->tv_usec * 1000;
-		ts_p = &ts;
-	}
-
-	/*
-	 * Before doing anything else, we need to reassociate the events we hit
-	 * last time which need reassociation. See comment at the end of the
-	 * loop below.
-	 */
-	for (i = 0; i < EVENTS_PER_GETN; ++i) {
-		struct fd_info *fdi = NULL;
-		if (epdp->ed_pending[i] != -1) {
-			fdi = &(epdp->ed_fds[epdp->ed_pending[i]]);
-		}
-
-		if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
-			int fd = FDI_HAS_READ(fdi) ? fdi->fdi_revt->ev_fd : 
-			    fdi->fdi_wevt->ev_fd;
-			reassociate(epdp, fdi, fd);
-			epdp->ed_pending[i] = -1;
-		}
-	}
-
-	if ((res = port_getn(epdp->ed_port, pevtlist, EVENTS_PER_GETN, 
-		    (unsigned int *) &nevents, ts_p)) == -1) {
-		if (errno == EINTR || errno == EAGAIN) {
-			evsignal_process(base);
-			return (0);
-		} else if (errno == ETIME) {
-			if (nevents == 0)
-				return (0);
-		} else {
-			event_warn("port_getn");
-			return (-1);
-		}
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-	
-	event_debug(("%s: port_getn reports %d events", __func__, nevents));
-
-	for (i = 0; i < nevents; ++i) {
-		struct event *ev;
-		struct fd_info *fdi;
-		port_event_t *pevt = &pevtlist[i];
-		int fd = (int) pevt->portev_object;
-
-		check_evportop(epdp);
-		check_event(pevt);
-		epdp->ed_pending[i] = fd;
-
-		/*
-		 * Figure out what kind of event it was 
-		 * (because we have to pass this to the callback)
-		 */
-		res = 0;
-		if (pevt->portev_events & POLLIN)
-			res |= EV_READ;
-		if (pevt->portev_events & POLLOUT)
-			res |= EV_WRITE;
-
-		assert(epdp->ed_nevents > fd);
-		fdi = &(epdp->ed_fds[fd]);
-
-		/*
-		 * We now check for each of the possible events (READ
-		 * or WRITE).  Then, we activate the event (which will
-		 * cause its callback to be executed).
-		 */
-
-		if ((res & EV_READ) && ((ev = fdi->fdi_revt) != NULL)) {
-			event_active(ev, res, 1);
-		}
-
-		if ((res & EV_WRITE) && ((ev = fdi->fdi_wevt) != NULL)) {
-			event_active(ev, res, 1);
-		}
-	} /* end of all events gotten */
-
-	check_evportop(epdp);
-
-	return (0);
-}
-
-
-/*
- * Adds the given event (so that you will be notified when it happens via
- * the callback function).
- */
-
-static int
-evport_add(void *arg, struct event *ev)
-{
-	struct evport_data *evpd = arg;
-	struct fd_info *fdi;
-	int factor;
-
-	check_evportop(evpd);
-
-	/*
-	 * Delegate, if it's not ours to handle.
-	 */
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_add(ev));
-
-	/*
-	 * If necessary, grow the file descriptor info table
-	 */
-
-	factor = 1;
-	while (ev->ev_fd >= factor * evpd->ed_nevents)
-		factor *= 2;
-
-	if (factor > 1) {
-		if (-1 == grow(evpd, factor)) {
-			return (-1);
-		}
-	}
-
-	fdi = &evpd->ed_fds[ev->ev_fd];
-	if (ev->ev_events & EV_READ)
-		fdi->fdi_revt = ev;
-	if (ev->ev_events & EV_WRITE)
-		fdi->fdi_wevt = ev;
-
-	return reassociate(evpd, fdi, ev->ev_fd);
-}
-
-/*
- * Removes the given event from the list of events to wait for.
- */
-
-static int
-evport_del(void *arg, struct event *ev)
-{
-	struct evport_data *evpd = arg;
-	struct fd_info *fdi;
-	int i;
-	int associated = 1;
-
-	check_evportop(evpd);
-
-	/*
-	 * Delegate, if it's not ours to handle
-	 */
-	if (ev->ev_events & EV_SIGNAL) {
-		return (evsignal_del(ev));
-	}
-
-	if (evpd->ed_nevents < ev->ev_fd) {
-		return (-1);
-	}
-
-	for (i = 0; i < EVENTS_PER_GETN; ++i) {
-		if (evpd->ed_pending[i] == ev->ev_fd) {
-			associated = 0;
-			break;
-		}
-	}
-
-	fdi = &evpd->ed_fds[ev->ev_fd];
-	if (ev->ev_events & EV_READ)
-		fdi->fdi_revt = NULL;
-	if (ev->ev_events & EV_WRITE)
-		fdi->fdi_wevt = NULL;
-
-	if (associated) {
-		if (!FDI_HAS_EVENTS(fdi) &&
-		    port_dissociate(evpd->ed_port, PORT_SOURCE_FD,
-		    ev->ev_fd) == -1) {	 
-			/*
-			 * Ignre EBADFD error the fd could have been closed
-			 * before event_del() was called.
-			 */
-			if (errno != EBADFD) {
-				event_warn("port_dissociate");
-				return (-1);
-			}
-		} else {
-			if (FDI_HAS_EVENTS(fdi)) {
-				return (reassociate(evpd, fdi, ev->ev_fd));
-			}
-		}
-	} else {
-		if (fdi->fdi_revt == NULL && fdi->fdi_wevt == NULL) {
-			evpd->ed_pending[i] = -1;
-		}
-	}
-	return 0;
-}
-
-
-static void
-evport_dealloc(struct event_base *base, void *arg)
-{
-	struct evport_data *evpd = arg;
-
-	evsignal_dealloc(base);
-
-	close(evpd->ed_port);
-
-	if (evpd->ed_fds)
-		free(evpd->ed_fds);
-	free(evpd);
-}
diff --git a/libevent/evrpc-internal.h b/libevent/evrpc-internal.h
deleted file mode 100644
index c900f959f973..000000000000
--- a/libevent/evrpc-internal.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVRPC_INTERNAL_H_
-#define _EVRPC_INTERNAL_H_
-
-#include "http-internal.h"
-
-struct evrpc;
-
-#define EVRPC_URI_PREFIX "/.rpc."
-
-struct evrpc_hook {
-	TAILQ_ENTRY(evrpc_hook) (next);
-
-	/* returns -1; if the rpc should be aborted, is allowed to rewrite */
-	int (*process)(struct evhttp_request *, struct evbuffer *, void *);
-	void *process_arg;
-};
-
-TAILQ_HEAD(evrpc_hook_list, evrpc_hook);
-
-/*
- * this is shared between the base and the pool, so that we can reuse
- * the hook adding functions; we alias both evrpc_pool and evrpc_base
- * to this common structure.
- */
-struct _evrpc_hooks {
-	/* hooks for processing outbound and inbound rpcs */
-	struct evrpc_hook_list in_hooks;
-	struct evrpc_hook_list out_hooks;
-};
-
-#define input_hooks common.in_hooks
-#define output_hooks common.out_hooks
-
-struct evrpc_base {
-	struct _evrpc_hooks common;
-
-	/* the HTTP server under which we register our RPC calls */
-	struct evhttp* http_server;
-
-	/* a list of all RPCs registered with us */
-	TAILQ_HEAD(evrpc_list, evrpc) registered_rpcs;
-};
-
-struct evrpc_req_generic;
-void evrpc_reqstate_free(struct evrpc_req_generic* rpc_state);
-
-/* A pool for holding evhttp_connection objects */
-struct evrpc_pool {
-	struct _evrpc_hooks common;
-
-	struct event_base *base;
-
-	struct evconq connections;
-
-	int timeout;
-
-	TAILQ_HEAD(evrpc_requestq, evrpc_request_wrapper) requests;
-};
-
-
-#endif /* _EVRPC_INTERNAL_H_ */
diff --git a/libevent/evrpc.c b/libevent/evrpc.c
deleted file mode 100644
index 8b3b071d0bfc..000000000000
--- a/libevent/evrpc.c
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#include <sys/types.h>
-#ifndef WIN32
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-#ifndef HAVE_TAILQFOREACH
-#include <event-internal.h>
-#endif
-
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <assert.h>
-
-#include "event.h"
-#include "evrpc.h"
-#include "evrpc-internal.h"
-#include "evhttp.h"
-#include "evutil.h"
-#include "log.h"
-
-struct evrpc_base *
-evrpc_init(struct evhttp *http_server)
-{
-	struct evrpc_base* base = calloc(1, sizeof(struct evrpc_base));
-	if (base == NULL)
-		return (NULL);
-
-	/* we rely on the tagging sub system */
-	evtag_init();
-
-	TAILQ_INIT(&base->registered_rpcs);
-	TAILQ_INIT(&base->input_hooks);
-	TAILQ_INIT(&base->output_hooks);
-	base->http_server = http_server;
-
-	return (base);
-}
-
-void
-evrpc_free(struct evrpc_base *base)
-{
-	struct evrpc *rpc;
-	struct evrpc_hook *hook;
-
-	while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) {
-		assert(evrpc_unregister_rpc(base, rpc->uri));
-	}
-	while ((hook = TAILQ_FIRST(&base->input_hooks)) != NULL) {
-		assert(evrpc_remove_hook(base, EVRPC_INPUT, hook));
-	}
-	while ((hook = TAILQ_FIRST(&base->output_hooks)) != NULL) {
-		assert(evrpc_remove_hook(base, EVRPC_OUTPUT, hook));
-	}
-	free(base);
-}
-
-void *
-evrpc_add_hook(void *vbase,
-    enum EVRPC_HOOK_TYPE hook_type,
-    int (*cb)(struct evhttp_request *, struct evbuffer *, void *),
-    void *cb_arg)
-{
-	struct _evrpc_hooks *base = vbase;
-	struct evrpc_hook_list *head = NULL;
-	struct evrpc_hook *hook = NULL;
-	switch (hook_type) {
-	case EVRPC_INPUT:
-		head = &base->in_hooks;
-		break;
-	case EVRPC_OUTPUT:
-		head = &base->out_hooks;
-		break;
-	default:
-		assert(hook_type == EVRPC_INPUT || hook_type == EVRPC_OUTPUT);
-	}
-
-	hook = calloc(1, sizeof(struct evrpc_hook));
-	assert(hook != NULL);
-	
-	hook->process = cb;
-	hook->process_arg = cb_arg;
-	TAILQ_INSERT_TAIL(head, hook, next);
-
-	return (hook);
-}
-
-static int
-evrpc_remove_hook_internal(struct evrpc_hook_list *head, void *handle)
-{
-	struct evrpc_hook *hook = NULL;
-	TAILQ_FOREACH(hook, head, next) {
-		if (hook == handle) {
-			TAILQ_REMOVE(head, hook, next);
-			free(hook);
-			return (1);
-		}
-	}
-
-	return (0);
-}
-
-/*
- * remove the hook specified by the handle
- */
-
-int
-evrpc_remove_hook(void *vbase, enum EVRPC_HOOK_TYPE hook_type, void *handle)
-{
-	struct _evrpc_hooks *base = vbase;
-	struct evrpc_hook_list *head = NULL;
-	switch (hook_type) {
-	case EVRPC_INPUT:
-		head = &base->in_hooks;
-		break;
-	case EVRPC_OUTPUT:
-		head = &base->out_hooks;
-		break;
-	default:
-		assert(hook_type == EVRPC_INPUT || hook_type == EVRPC_OUTPUT);
-	}
-
-	return (evrpc_remove_hook_internal(head, handle));
-}
-
-static int
-evrpc_process_hooks(struct evrpc_hook_list *head,
-    struct evhttp_request *req, struct evbuffer *evbuf)
-{
-	struct evrpc_hook *hook;
-	TAILQ_FOREACH(hook, head, next) {
-		if (hook->process(req, evbuf, hook->process_arg) == -1)
-			return (-1);
-	}
-
-	return (0);
-}
-
-static void evrpc_pool_schedule(struct evrpc_pool *pool);
-static void evrpc_request_cb(struct evhttp_request *, void *);
-void evrpc_request_done(struct evrpc_req_generic*);
-
-/*
- * Registers a new RPC with the HTTP server.   The evrpc object is expected
- * to have been filled in via the EVRPC_REGISTER_OBJECT macro which in turn
- * calls this function.
- */
-
-static char *
-evrpc_construct_uri(const char *uri)
-{
-	char *constructed_uri;
-	int constructed_uri_len;
-
-	constructed_uri_len = strlen(EVRPC_URI_PREFIX) + strlen(uri) + 1;
-	if ((constructed_uri = malloc(constructed_uri_len)) == NULL)
-		event_err(1, "%s: failed to register rpc at %s",
-		    __func__, uri);
-	memcpy(constructed_uri, EVRPC_URI_PREFIX, strlen(EVRPC_URI_PREFIX));
-	memcpy(constructed_uri + strlen(EVRPC_URI_PREFIX), uri, strlen(uri));
-	constructed_uri[constructed_uri_len - 1] = '\0';
-
-	return (constructed_uri);
-}
-
-int
-evrpc_register_rpc(struct evrpc_base *base, struct evrpc *rpc,
-    void (*cb)(struct evrpc_req_generic *, void *), void *cb_arg)
-{
-	char *constructed_uri = evrpc_construct_uri(rpc->uri);
-
-	rpc->base = base;
-	rpc->cb = cb;
-	rpc->cb_arg = cb_arg;
-
-	TAILQ_INSERT_TAIL(&base->registered_rpcs, rpc, next);
-
-	evhttp_set_cb(base->http_server,
-	    constructed_uri,
-	    evrpc_request_cb,
-	    rpc);
-	
-	free(constructed_uri);
-
-	return (0);
-}
-
-int
-evrpc_unregister_rpc(struct evrpc_base *base, const char *name)
-{
-	char *registered_uri = NULL;
-	struct evrpc *rpc;
-
-	/* find the right rpc; linear search might be slow */
-	TAILQ_FOREACH(rpc, &base->registered_rpcs, next) {
-		if (strcmp(rpc->uri, name) == 0)
-			break;
-	}
-	if (rpc == NULL) {
-		/* We did not find an RPC with this name */
-		return (-1);
-	}
-	TAILQ_REMOVE(&base->registered_rpcs, rpc, next);
-	
-	free((char *)rpc->uri);
-	free(rpc);
-
-        registered_uri = evrpc_construct_uri(name);
-
-	/* remove the http server callback */
-	assert(evhttp_del_cb(base->http_server, registered_uri) == 0);
-
-	free(registered_uri);
-	return (0);
-}
-
-static void
-evrpc_request_cb(struct evhttp_request *req, void *arg)
-{
-	struct evrpc *rpc = arg;
-	struct evrpc_req_generic *rpc_state = NULL;
-
-	/* let's verify the outside parameters */
-	if (req->type != EVHTTP_REQ_POST ||
-	    EVBUFFER_LENGTH(req->input_buffer) <= 0)
-		goto error;
-
-	/*
-	 * we might want to allow hooks to suspend the processing,
-	 * but at the moment, we assume that they just act as simple
-	 * filters.
-	 */
-	if (evrpc_process_hooks(&rpc->base->input_hooks,
-		req, req->input_buffer) == -1)
-		goto error;
-
-	rpc_state = calloc(1, sizeof(struct evrpc_req_generic));
-	if (rpc_state == NULL)
-		goto error;
-
-	/* let's check that we can parse the request */
-	rpc_state->request = rpc->request_new();
-	if (rpc_state->request == NULL)
-		goto error;
-
-	rpc_state->rpc = rpc;
-
-	if (rpc->request_unmarshal(
-		    rpc_state->request, req->input_buffer) == -1) {
-		/* we failed to parse the request; that's a bummer */
-		goto error;
-	}
-
-	/* at this point, we have a well formed request, prepare the reply */
-
-	rpc_state->reply = rpc->reply_new();
-	if (rpc_state->reply == NULL)
-		goto error;
-
-	rpc_state->http_req = req;
-	rpc_state->done = evrpc_request_done;
-
-	/* give the rpc to the user; they can deal with it */
-	rpc->cb(rpc_state, rpc->cb_arg);
-
-	return;
-
-error:
-	evrpc_reqstate_free(rpc_state);
-	evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
-	return;
-}
-
-void
-evrpc_reqstate_free(struct evrpc_req_generic* rpc_state)
-{
-	/* clean up all memory */
-	if (rpc_state != NULL) {
-		struct evrpc *rpc = rpc_state->rpc;
-
-		if (rpc_state->request != NULL)
-			rpc->request_free(rpc_state->request);
-		if (rpc_state->reply != NULL)
-			rpc->reply_free(rpc_state->reply);
-		free(rpc_state);
-	}
-}
-
-void
-evrpc_request_done(struct evrpc_req_generic* rpc_state)
-{
-	struct evhttp_request *req = rpc_state->http_req;
-	struct evrpc *rpc = rpc_state->rpc;
-	struct evbuffer* data = NULL;
-
-	if (rpc->reply_complete(rpc_state->reply) == -1) {
-		/* the reply was not completely filled in.  error out */
-		goto error;
-	}
-
-	if ((data = evbuffer_new()) == NULL) {
-		/* out of memory */
-		goto error;
-	}
-
-	/* serialize the reply */
-	rpc->reply_marshal(data, rpc_state->reply);
-
-	/* do hook based tweaks to the request */
-	if (evrpc_process_hooks(&rpc->base->output_hooks,
-		req, data) == -1)
-		goto error;
-
-	/* on success, we are going to transmit marshaled binary data */
-	if (evhttp_find_header(req->output_headers, "Content-Type") == NULL) {
-		evhttp_add_header(req->output_headers,
-		    "Content-Type", "application/octet-stream");
-	}
-
-	evhttp_send_reply(req, HTTP_OK, "OK", data);
-
-	evbuffer_free(data);
-
-	evrpc_reqstate_free(rpc_state);
-
-	return;
-
-error:
-	if (data != NULL)
-		evbuffer_free(data);
-	evrpc_reqstate_free(rpc_state);
-	evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
-	return;
-}
-
-/* Client implementation of RPC site */
-
-static int evrpc_schedule_request(struct evhttp_connection *connection,
-    struct evrpc_request_wrapper *ctx);
-
-struct evrpc_pool *
-evrpc_pool_new(struct event_base *base)
-{
-	struct evrpc_pool *pool = calloc(1, sizeof(struct evrpc_pool));
-	if (pool == NULL)
-		return (NULL);
-
-	TAILQ_INIT(&pool->connections);
-	TAILQ_INIT(&pool->requests);
-
-	TAILQ_INIT(&pool->input_hooks);
-	TAILQ_INIT(&pool->output_hooks);
-
-	pool->base = base;
-	pool->timeout = -1;
-
-	return (pool);
-}
-
-static void
-evrpc_request_wrapper_free(struct evrpc_request_wrapper *request)
-{
-	free(request->name);
-	free(request);
-}
-
-void
-evrpc_pool_free(struct evrpc_pool *pool)
-{
-	struct evhttp_connection *connection;
-	struct evrpc_request_wrapper *request;
-	struct evrpc_hook *hook;
-
-	while ((request = TAILQ_FIRST(&pool->requests)) != NULL) {
-		TAILQ_REMOVE(&pool->requests, request, next);
-		/* if this gets more complicated we need our own function */
-		evrpc_request_wrapper_free(request);
-	}
-
-	while ((connection = TAILQ_FIRST(&pool->connections)) != NULL) {
-		TAILQ_REMOVE(&pool->connections, connection, next);
-		evhttp_connection_free(connection);
-	}
-
-	while ((hook = TAILQ_FIRST(&pool->input_hooks)) != NULL) {
-		assert(evrpc_remove_hook(pool, EVRPC_INPUT, hook));
-	}
-
-	while ((hook = TAILQ_FIRST(&pool->output_hooks)) != NULL) {
-		assert(evrpc_remove_hook(pool, EVRPC_OUTPUT, hook));
-	}
-
-	free(pool);
-}
-
-/*
- * Add a connection to the RPC pool.   A request scheduled on the pool
- * may use any available connection.
- */
-
-void
-evrpc_pool_add_connection(struct evrpc_pool *pool,
-    struct evhttp_connection *connection) {
-	assert(connection->http_server == NULL);
-	TAILQ_INSERT_TAIL(&pool->connections, connection, next);
-
-	/*
-	 * associate an event base with this connection
-	 */
-	if (pool->base != NULL)
-		evhttp_connection_set_base(connection, pool->base);
-
-	/* 
-	 * unless a timeout was specifically set for a connection,
-	 * the connection inherits the timeout from the pool.
-	 */
-	if (connection->timeout == -1)
-		connection->timeout = pool->timeout;
-
-	/* 
-	 * if we have any requests pending, schedule them with the new
-	 * connections.
-	 */
-
-	if (TAILQ_FIRST(&pool->requests) != NULL) {
-		struct evrpc_request_wrapper *request = 
-		    TAILQ_FIRST(&pool->requests);
-		TAILQ_REMOVE(&pool->requests, request, next);
-		evrpc_schedule_request(connection, request);
-	}
-}
-
-void
-evrpc_pool_set_timeout(struct evrpc_pool *pool, int timeout_in_secs)
-{
-	struct evhttp_connection *evcon;
-	TAILQ_FOREACH(evcon, &pool->connections, next) {
-		evcon->timeout = timeout_in_secs;
-	}
-	pool->timeout = timeout_in_secs;
-}
-
-
-static void evrpc_reply_done(struct evhttp_request *, void *);
-static void evrpc_request_timeout(int, short, void *);
-
-/*
- * Finds a connection object associated with the pool that is currently
- * idle and can be used to make a request.
- */
-static struct evhttp_connection *
-evrpc_pool_find_connection(struct evrpc_pool *pool)
-{
-	struct evhttp_connection *connection;
-	TAILQ_FOREACH(connection, &pool->connections, next) {
-		if (TAILQ_FIRST(&connection->requests) == NULL)
-			return (connection);
-	}
-
-	return (NULL);
-}
-
-/*
- * We assume that the ctx is no longer queued on the pool.
- */
-static int
-evrpc_schedule_request(struct evhttp_connection *connection,
-    struct evrpc_request_wrapper *ctx)
-{
-	struct evhttp_request *req = NULL;
-	struct evrpc_pool *pool = ctx->pool;
-	struct evrpc_status status;
-	char *uri = NULL;
-	int res = 0;
-
-	if ((req = evhttp_request_new(evrpc_reply_done, ctx)) == NULL)
-		goto error;
-
-	/* serialize the request data into the output buffer */
-	ctx->request_marshal(req->output_buffer, ctx->request);
-
-	uri = evrpc_construct_uri(ctx->name);
-	if (uri == NULL)
-		goto error;
-
-	/* we need to know the connection that we might have to abort */
-	ctx->evcon = connection;
-
-	/* apply hooks to the outgoing request */
-	if (evrpc_process_hooks(&pool->output_hooks,
-		req, req->output_buffer) == -1)
-		goto error;
-
-	if (pool->timeout > 0) {
-		/* 
-		 * a timeout after which the whole rpc is going to be aborted.
-		 */
-		struct timeval tv;
-		evutil_timerclear(&tv);
-		tv.tv_sec = pool->timeout;
-		evtimer_add(&ctx->ev_timeout, &tv);
-	}
-
-	/* start the request over the connection */
-	res = evhttp_make_request(connection, req, EVHTTP_REQ_POST, uri);
-	free(uri);
-
-	if (res == -1)
-		goto error;
-
-	return (0);
-
-error:
-	memset(&status, 0, sizeof(status));
-	status.error = EVRPC_STATUS_ERR_UNSTARTED;
-	(*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
-	evrpc_request_wrapper_free(ctx);
-	return (-1);
-}
-
-int
-evrpc_make_request(struct evrpc_request_wrapper *ctx)
-{
-	struct evrpc_pool *pool = ctx->pool;
-
-	/* initialize the event structure for this rpc */
-	evtimer_set(&ctx->ev_timeout, evrpc_request_timeout, ctx);
-	if (pool->base != NULL)
-		event_base_set(pool->base, &ctx->ev_timeout);
-
-	/* we better have some available connections on the pool */
-	assert(TAILQ_FIRST(&pool->connections) != NULL);
-
-	/* 
-	 * if no connection is available, we queue the request on the pool,
-	 * the next time a connection is empty, the rpc will be send on that.
-	 */
-	TAILQ_INSERT_TAIL(&pool->requests, ctx, next);
-
-	evrpc_pool_schedule(pool);
-
-	return (0);
-}
-
-static void
-evrpc_reply_done(struct evhttp_request *req, void *arg)
-{
-	struct evrpc_request_wrapper *ctx = arg;
-	struct evrpc_pool *pool = ctx->pool;
-	struct evrpc_status status;
-	int res = -1;
-	
-	/* cancel any timeout we might have scheduled */
-	event_del(&ctx->ev_timeout);
-
-	memset(&status, 0, sizeof(status));
-	status.http_req = req;
-
-	/* we need to get the reply now */
-	if (req != NULL) {
-		/* apply hooks to the incoming request */
-		if (evrpc_process_hooks(&pool->input_hooks,
-			req, req->input_buffer) == -1) {
-			status.error = EVRPC_STATUS_ERR_HOOKABORTED;
-			res = -1;
-		} else {
-			res = ctx->reply_unmarshal(ctx->reply,
-			    req->input_buffer);
-			if (res == -1) {
-				status.error = EVRPC_STATUS_ERR_BADPAYLOAD;
-			}
-		}
-	} else {
-		status.error = EVRPC_STATUS_ERR_TIMEOUT;
-	}
-
-	if (res == -1) {
-		/* clear everything that we might have written previously */
-		ctx->reply_clear(ctx->reply);
-	}
-
-	(*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
-	
-	evrpc_request_wrapper_free(ctx);
-
-	/* the http layer owns the request structure */
-
-	/* see if we can schedule another request */
-	evrpc_pool_schedule(pool);
-}
-
-static void
-evrpc_pool_schedule(struct evrpc_pool *pool)
-{
-	struct evrpc_request_wrapper *ctx = TAILQ_FIRST(&pool->requests);
-	struct evhttp_connection *evcon;
-
-	/* if no requests are pending, we have no work */
-	if (ctx == NULL)
-		return;
-
-	if ((evcon = evrpc_pool_find_connection(pool)) != NULL) {
-		TAILQ_REMOVE(&pool->requests, ctx, next);
-		evrpc_schedule_request(evcon, ctx);
-	}
-}
-
-static void
-evrpc_request_timeout(int fd, short what, void *arg)
-{
-	struct evrpc_request_wrapper *ctx = arg;
-	struct evhttp_connection *evcon = ctx->evcon;
-	assert(evcon != NULL);
-
-	evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-}
diff --git a/libevent/evrpc.h b/libevent/evrpc.h
deleted file mode 100644
index 7c16b95c7755..000000000000
--- a/libevent/evrpc.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVRPC_H_
-#define _EVRPC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @file evrpc.h
- *
- * This header files provides basic support for an RPC server and client.
- *
- * To support RPCs in a server, every supported RPC command needs to be
- * defined and registered.
- *
- * EVRPC_HEADER(SendCommand, Request, Reply);
- *
- *  SendCommand is the name of the RPC command.
- *  Request is the name of a structure generated by event_rpcgen.py.
- *    It contains all parameters relating to the SendCommand RPC.  The
- *    server needs to fill in the Reply structure.
- *  Reply is the name of a structure generated by event_rpcgen.py.  It
- *    contains the answer to the RPC.
- *
- * To register an RPC with an HTTP server, you need to first create an RPC
- * base with:
- *
- *   struct evrpc_base *base = evrpc_init(http);
- *
- * A specific RPC can then be registered with
- *
- * EVRPC_REGISTER(base, SendCommand, Request, Reply,  FunctionCB, arg);
- *
- * when the server receives an appropriately formatted RPC, the user callback
- * is invokved.   The callback needs to fill in the reply structure.
- *
- * void FunctionCB(EVRPC_STRUCT(SendCommand)* rpc, void *arg);
- *
- * To send the reply, call EVRPC_REQUEST_DONE(rpc);
- *
- * See the regression test for an example.
- */
-
-struct evbuffer;
-struct event_base;
-struct evrpc_req_generic;
-
-/* Encapsulates a request */
-struct evrpc {
-	TAILQ_ENTRY(evrpc) next;
-
-	/* the URI at which the request handler lives */
-	const char* uri;
-
-	/* creates a new request structure */
-	void *(*request_new)(void);
-
-	/* frees the request structure */
-	void (*request_free)(void *);
-
-	/* unmarshals the buffer into the proper request structure */
-	int (*request_unmarshal)(void *, struct evbuffer *);
-
-	/* creates a new reply structure */
-	void *(*reply_new)(void);
-
-	/* creates a new reply structure */
-	void (*reply_free)(void *);
-
-	/* verifies that the reply is valid */
-	int (*reply_complete)(void *);
-	
-	/* marshals the reply into a buffer */
-	void (*reply_marshal)(struct evbuffer*, void *);
-
-	/* the callback invoked for each received rpc */
-	void (*cb)(struct evrpc_req_generic *, void *);
-	void *cb_arg;
-
-	/* reference for further configuration */
-	struct evrpc_base *base;
-};
-
-/** The type of a specific RPC Message
- *
- * @param rpcname the name of the RPC message
- */
-#define EVRPC_STRUCT(rpcname) struct evrpc_req__##rpcname
-
-struct evhttp_request;
-struct evrpc_status;
-
-/* We alias the RPC specific structs to this voided one */
-struct evrpc_req_generic {
-	/* the unmarshaled request object */
-	void *request;
-
-	/* the empty reply object that needs to be filled in */
-	void *reply;
-
-	/* 
-	 * the static structure for this rpc; that can be used to
-	 * automatically unmarshal and marshal the http buffers.
-	 */
-	struct evrpc *rpc;
-
-	/*
-	 * the http request structure on which we need to answer.
-	 */
-	struct evhttp_request* http_req;
-
-	/*
-	 * callback to reply and finish answering this rpc
-	 */
-	void (*done)(struct evrpc_req_generic* rpc); 
-};
-
-/** Creates the definitions and prototypes for an RPC
- *
- * You need to use EVRPC_HEADER to create structures and function prototypes
- * needed by the server and client implementation.  The structures have to be
- * defined in an .rpc file and converted to source code via event_rpcgen.py
- *
- * @param rpcname the name of the RPC
- * @param reqstruct the name of the RPC request structure
- * @param replystruct the name of the RPC reply structure
- * @see EVRPC_GENERATE()
- */
-#define EVRPC_HEADER(rpcname, reqstruct, rplystruct) \
-EVRPC_STRUCT(rpcname) {	\
-	struct reqstruct* request; \
-	struct rplystruct* reply; \
-	struct evrpc* rpc; \
-	struct evhttp_request* http_req; \
-	void (*done)(struct evrpc_status *, \
-	    struct evrpc* rpc, void *request, void *reply);	     \
-};								     \
-int evrpc_send_request_##rpcname(struct evrpc_pool *, \
-    struct reqstruct *, struct rplystruct *, \
-    void (*)(struct evrpc_status *, \
-	struct reqstruct *, struct rplystruct *, void *cbarg),	\
-    void *);
-
-/** Generates the code for receiving and sending an RPC message
- *
- * EVRPC_GENERATE is used to create the code corresponding to sending
- * and receiving a particular RPC message
- *
- * @param rpcname the name of the RPC
- * @param reqstruct the name of the RPC request structure
- * @param replystruct the name of the RPC reply structure
- * @see EVRPC_HEADER()
- */
-#define EVRPC_GENERATE(rpcname, reqstruct, rplystruct) \
-int evrpc_send_request_##rpcname(struct evrpc_pool *pool, \
-    struct reqstruct *request, struct rplystruct *reply, \
-    void (*cb)(struct evrpc_status *, \
-	struct reqstruct *, struct rplystruct *, void *cbarg),	\
-    void *cbarg) { \
-	struct evrpc_status status;				    \
-	struct evrpc_request_wrapper *ctx;			    \
-	ctx = (struct evrpc_request_wrapper *) \
-	    malloc(sizeof(struct evrpc_request_wrapper));	    \
-	if (ctx == NULL)					    \
-		goto error;					    \
-	ctx->pool = pool;					    \
-	ctx->evcon = NULL;					    \
-	ctx->name = strdup(#rpcname);				    \
-	if (ctx->name == NULL) {				    \
-		free(ctx);					    \
-		goto error;					    \
-	}							    \
-	ctx->cb = (void (*)(struct evrpc_status *, \
-		void *, void *, void *))cb;			    \
-	ctx->cb_arg = cbarg;					    \
-	ctx->request = (void *)request;				    \
-	ctx->reply = (void *)reply;				    \
-	ctx->request_marshal = (void (*)(struct evbuffer *, void *))reqstruct##_marshal; \
-	ctx->reply_clear = (void (*)(void *))rplystruct##_clear;    \
-	ctx->reply_unmarshal = (int (*)(void *, struct evbuffer *))rplystruct##_unmarshal; \
-	return (evrpc_make_request(ctx));			    \
-error:								    \
-	memset(&status, 0, sizeof(status));			    \
-	status.error = EVRPC_STATUS_ERR_UNSTARTED;		    \
-	(*(cb))(&status, request, reply, cbarg);		    \
-	return (-1);						    \
-}
-
-/** Provides access to the HTTP request object underlying an RPC
- *
- * Access to the underlying http object; can be used to look at headers or
- * for getting the remote ip address
- *
- * @param rpc_req the rpc request structure provided to the server callback
- * @return an struct evhttp_request object that can be inspected for
- * HTTP headers or sender information.
- */
-#define EVRPC_REQUEST_HTTP(rpc_req) (rpc_req)->http_req
-
-/** Creates the reply to an RPC request
- * 
- * EVRPC_REQUEST_DONE is used to answer a request; the reply is expected
- * to have been filled in.  The request and reply pointers become invalid
- * after this call has finished.
- * 
- * @param rpc_req the rpc request structure provided to the server callback
- */
-#define EVRPC_REQUEST_DONE(rpc_req) do { \
-  struct evrpc_req_generic *_req = (struct evrpc_req_generic *)(rpc_req); \
-  _req->done(_req); \
-} while (0)
-  
-
-/* Takes a request object and fills it in with the right magic */
-#define EVRPC_REGISTER_OBJECT(rpc, name, request, reply) \
-  do { \
-    (rpc)->uri = strdup(#name); \
-    if ((rpc)->uri == NULL) {			 \
-      fprintf(stderr, "failed to register object\n");	\
-      exit(1);						\
-    } \
-    (rpc)->request_new = (void *(*)(void))request##_new; \
-    (rpc)->request_free = (void (*)(void *))request##_free; \
-    (rpc)->request_unmarshal = (int (*)(void *, struct evbuffer *))request##_unmarshal; \
-    (rpc)->reply_new = (void *(*)(void))reply##_new; \
-    (rpc)->reply_free = (void (*)(void *))reply##_free; \
-    (rpc)->reply_complete = (int (*)(void *))reply##_complete; \
-    (rpc)->reply_marshal = (void (*)(struct evbuffer*, void *))reply##_marshal; \
-  } while (0)
-
-struct evrpc_base;
-struct evhttp;
-
-/* functions to start up the rpc system */
-
-/** Creates a new rpc base from which RPC requests can be received
- *
- * @param server a pointer to an existing HTTP server
- * @return a newly allocated evrpc_base struct
- * @see evrpc_free()
- */
-struct evrpc_base *evrpc_init(struct evhttp *server);
-
-/** 
- * Frees the evrpc base
- *
- * For now, you are responsible for making sure that no rpcs are ongoing.
- *
- * @param base the evrpc_base object to be freed
- * @see evrpc_init
- */
-void evrpc_free(struct evrpc_base *base);
-
-/** register RPCs with the HTTP Server
- *
- * registers a new RPC with the HTTP server, each RPC needs to have
- * a unique name under which it can be identified.
- *
- * @param base the evrpc_base structure in which the RPC should be
- *   registered.
- * @param name the name of the RPC
- * @param request the name of the RPC request structure
- * @param reply the name of the RPC reply structure
- * @param callback the callback that should be invoked when the RPC
- * is received.  The callback has the following prototype
- *   void (*callback)(EVRPC_STRUCT(Message)* rpc, void *arg)
- * @param cbarg an additional parameter that can be passed to the callback.
- *   The parameter can be used to carry around state.
- */
-#define EVRPC_REGISTER(base, name, request, reply, callback, cbarg) \
-  do { \
-    struct evrpc* rpc = (struct evrpc *)calloc(1, sizeof(struct evrpc)); \
-    EVRPC_REGISTER_OBJECT(rpc, name, request, reply); \
-    evrpc_register_rpc(base, rpc, \
-	(void (*)(struct evrpc_req_generic*, void *))callback, cbarg);	\
-  } while (0)
-
-int evrpc_register_rpc(struct evrpc_base *, struct evrpc *,
-    void (*)(struct evrpc_req_generic*, void *), void *);
-
-/**
- * Unregisters an already registered RPC
- *
- * @param base the evrpc_base object from which to unregister an RPC
- * @param name the name of the rpc to unregister
- * @return -1 on error or 0 when successful.
- * @see EVRPC_REGISTER()
- */
-#define EVRPC_UNREGISTER(base, name) evrpc_unregister_rpc(base, #name)
-
-int evrpc_unregister_rpc(struct evrpc_base *base, const char *name);
-
-/*
- * Client-side RPC support
- */
-
-struct evrpc_pool;
-struct evhttp_connection;
-
-/** 
- * provides information about the completed RPC request.
- */
-struct evrpc_status {
-#define EVRPC_STATUS_ERR_NONE		0
-#define EVRPC_STATUS_ERR_TIMEOUT	1
-#define EVRPC_STATUS_ERR_BADPAYLOAD	2
-#define EVRPC_STATUS_ERR_UNSTARTED	3
-#define EVRPC_STATUS_ERR_HOOKABORTED	4
-	int error;
-
-	/* for looking at headers or other information */
-	struct evhttp_request *http_req;
-};
-
-struct evrpc_request_wrapper {
-	TAILQ_ENTRY(evrpc_request_wrapper) next;
-
-        /* pool on which this rpc request is being made */
-        struct evrpc_pool *pool;
-
-        /* connection on which the request is being sent */
-	struct evhttp_connection *evcon;
-
-	/* event for implementing request timeouts */
-	struct event ev_timeout;
-
-	/* the name of the rpc */
-	char *name;
-
-	/* callback */
-	void (*cb)(struct evrpc_status*, void *request, void *reply, void *arg);
-	void *cb_arg;
-
-	void *request;
-	void *reply;
-
-	/* unmarshals the buffer into the proper request structure */
-	void (*request_marshal)(struct evbuffer *, void *);
-
-	/* removes all stored state in the reply */
-	void (*reply_clear)(void *);
-
-	/* marshals the reply into a buffer */
-	int (*reply_unmarshal)(void *, struct evbuffer*);
-};
-
-/** launches an RPC and sends it to the server
- *
- * EVRPC_MAKE_REQUEST() is used by the client to send an RPC to the server.
- *
- * @param name the name of the RPC
- * @param pool the evrpc_pool that contains the connection objects over which
- *   the request should be sent.
- * @param request a pointer to the RPC request structure - it contains the
- *   data to be sent to the server.
- * @param reply a pointer to the RPC reply structure.  It is going to be filled
- *   if the request was answered successfully
- * @param cb the callback to invoke when the RPC request has been answered
- * @param cbarg an additional argument to be passed to the client
- * @return 0 on success, -1 on failure
- */
-#define EVRPC_MAKE_REQUEST(name, pool, request, reply, cb, cbarg)	\
-	evrpc_send_request_##name(pool, request, reply, cb, cbarg)
-
-int evrpc_make_request(struct evrpc_request_wrapper *);
-
-/** creates an rpc connection pool
- * 
- * a pool has a number of connections associated with it.
- * rpc requests are always made via a pool.
- *
- * @param base a pointer to an struct event_based object; can be left NULL
- *   in singled-threaded applications
- * @return a newly allocated struct evrpc_pool object
- * @see evrpc_pool_free()
- */
-struct evrpc_pool *evrpc_pool_new(struct event_base *base);
-/** frees an rpc connection pool
- *
- * @param pool a pointer to an evrpc_pool allocated via evrpc_pool_new()
- * @see evrpc_pool_new()
- */
-void evrpc_pool_free(struct evrpc_pool *pool);
-/*
- * adds a connection over which rpc can be dispatched.  the connection
- * object must have been newly created.
- */
-void evrpc_pool_add_connection(struct evrpc_pool *, 
-    struct evhttp_connection *);
-
-/**
- * Sets the timeout in secs after which a request has to complete.  The
- * RPC is completely aborted if it does not complete by then.  Setting
- * the timeout to 0 means that it never timeouts and can be used to
- * implement callback type RPCs.
- *
- * Any connection already in the pool will be updated with the new
- * timeout.  Connections added to the pool after set_timeout has be
- * called receive the pool timeout only if no timeout has been set
- * for the connection itself.
- *
- * @param pool a pointer to a struct evrpc_pool object
- * @param timeout_in_secs the number of seconds after which a request should
- *   timeout and a failure be returned to the callback.
- */
-void evrpc_pool_set_timeout(struct evrpc_pool *pool, int timeout_in_secs);
-
-/**
- * Hooks for changing the input and output of RPCs; this can be used to
- * implement compression, authentication, encryption, ...
- */
-
-enum EVRPC_HOOK_TYPE {
-	EVRPC_INPUT,		/**< apply the function to an input hook */
-	EVRPC_OUTPUT		/**< apply the function to an output hook */
-};
-
-#ifndef WIN32
-/** Deprecated alias for EVRPC_INPUT.  Not available on windows, where it
- * conflicts with platform headers. */
-#define INPUT EVRPC_INPUT
-/** Deprecated alias for EVRPC_OUTPUT.  Not available on windows, where it
- * conflicts with platform headers. */
-#define OUTPUT EVRPC_OUTPUT
-#endif
-
-/** adds a processing hook to either an rpc base or rpc pool
- *
- * If a hook returns -1, the processing is aborted.
- *
- * The add functions return handles that can be used for removing hooks.
- *
- * @param vbase a pointer to either struct evrpc_base or struct evrpc_pool
- * @param hook_type either INPUT or OUTPUT
- * @param cb the callback to call when the hook is activated
- * @param cb_arg an additional argument for the callback
- * @return a handle to the hook so it can be removed later
- * @see evrpc_remove_hook()
- */
-void *evrpc_add_hook(void *vbase,
-    enum EVRPC_HOOK_TYPE hook_type,
-    int (*cb)(struct evhttp_request *, struct evbuffer *, void *),
-    void *cb_arg);
-
-/** removes a previously added hook
- *
- * @param vbase a pointer to either struct evrpc_base or struct evrpc_pool
- * @param hook_type either INPUT or OUTPUT
- * @param handle a handle returned by evrpc_add_hook()
- * @return 1 on success or 0 on failure
- * @see evrpc_add_hook()
- */
-int evrpc_remove_hook(void *vbase,
-    enum EVRPC_HOOK_TYPE hook_type,
-    void *handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EVRPC_H_ */
diff --git a/libevent/evsignal.h b/libevent/evsignal.h
deleted file mode 100644
index 9b0405eea095..000000000000
--- a/libevent/evsignal.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVSIGNAL_H_
-#define _EVSIGNAL_H_
-
-#include <signal.h>
-
-typedef void (*ev_sighandler_t)(int);
-
-struct evsignal_info {
-	struct event ev_signal;
-	int ev_signal_pair[2];
-	int ev_signal_added;
-	volatile sig_atomic_t evsignal_caught;
-	struct event_list evsigevents[NSIG];
-	sig_atomic_t evsigcaught[NSIG];
-#ifdef HAVE_SIGACTION
-	struct sigaction **sh_old;
-#else
-	ev_sighandler_t **sh_old;
-#endif
-	int sh_old_max;
-};
-int evsignal_init(struct event_base *);
-void evsignal_process(struct event_base *);
-int evsignal_add(struct event *);
-int evsignal_del(struct event *);
-void evsignal_dealloc(struct event_base *);
-
-#endif /* _EVSIGNAL_H_ */
diff --git a/libevent/evutil.c b/libevent/evutil.c
deleted file mode 100644
index 988da9cb36c4..000000000000
--- a/libevent/evutil.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include <winsock2.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <errno.h>
-#if defined WIN32
-#include <sys/timeb.h>
-#endif
-#include <stdio.h>
-
-#include "evutil.h"
-#include "log.h"
-
-int
-evutil_socketpair(int family, int type, int protocol, int fd[2])
-{
-#ifndef WIN32
-	return socketpair(family, type, protocol, fd);
-#else
-	/* This code is originally from Tor.  Used with permission. */
-
-	/* This socketpair does not work when localhost is down. So
-	 * it's really not the same thing at all. But it's close enough
-	 * for now, and really, when localhost is down sometimes, we
-	 * have other problems too.
-	 */
-	int listener = -1;
-	int connector = -1;
-	int acceptor = -1;
-	struct sockaddr_in listen_addr;
-	struct sockaddr_in connect_addr;
-	int size;
-	int saved_errno = -1;
-
-	if (protocol
-#ifdef AF_UNIX
-		|| family != AF_UNIX
-#endif
-		) {
-		EVUTIL_SET_SOCKET_ERROR(WSAEAFNOSUPPORT);
-		return -1;
-	}
-	if (!fd) {
-		EVUTIL_SET_SOCKET_ERROR(WSAEINVAL);
-		return -1;
-	}
-
-	listener = socket(AF_INET, type, 0);
-	if (listener < 0)
-		return -1;
-	memset(&listen_addr, 0, sizeof(listen_addr));
-	listen_addr.sin_family = AF_INET;
-	listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	listen_addr.sin_port = 0;	/* kernel chooses port.	 */
-	if (bind(listener, (struct sockaddr *) &listen_addr, sizeof (listen_addr))
-		== -1)
-		goto tidy_up_and_fail;
-	if (listen(listener, 1) == -1)
-		goto tidy_up_and_fail;
-
-	connector = socket(AF_INET, type, 0);
-	if (connector < 0)
-		goto tidy_up_and_fail;
-	/* We want to find out the port number to connect to.  */
-	size = sizeof(connect_addr);
-	if (getsockname(listener, (struct sockaddr *) &connect_addr, &size) == -1)
-		goto tidy_up_and_fail;
-	if (size != sizeof (connect_addr))
-		goto abort_tidy_up_and_fail;
-	if (connect(connector, (struct sockaddr *) &connect_addr,
-				sizeof(connect_addr)) == -1)
-		goto tidy_up_and_fail;
-
-	size = sizeof(listen_addr);
-	acceptor = accept(listener, (struct sockaddr *) &listen_addr, &size);
-	if (acceptor < 0)
-		goto tidy_up_and_fail;
-	if (size != sizeof(listen_addr))
-		goto abort_tidy_up_and_fail;
-	EVUTIL_CLOSESOCKET(listener);
-	/* Now check we are talking to ourself by matching port and host on the
-	   two sockets.	 */
-	if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1)
-		goto tidy_up_and_fail;
-	if (size != sizeof (connect_addr)
-		|| listen_addr.sin_family != connect_addr.sin_family
-		|| listen_addr.sin_addr.s_addr != connect_addr.sin_addr.s_addr
-		|| listen_addr.sin_port != connect_addr.sin_port)
-		goto abort_tidy_up_and_fail;
-	fd[0] = connector;
-	fd[1] = acceptor;
-
-	return 0;
-
- abort_tidy_up_and_fail:
-	saved_errno = WSAECONNABORTED;
- tidy_up_and_fail:
-	if (saved_errno < 0)
-		saved_errno = WSAGetLastError();
-	if (listener != -1)
-		EVUTIL_CLOSESOCKET(listener);
-	if (connector != -1)
-		EVUTIL_CLOSESOCKET(connector);
-	if (acceptor != -1)
-		EVUTIL_CLOSESOCKET(acceptor);
-
-	EVUTIL_SET_SOCKET_ERROR(saved_errno);
-	return -1;
-#endif
-}
-
-int
-evutil_make_socket_nonblocking(int fd)
-{
-#ifdef WIN32
-	{
-		unsigned long nonblocking = 1;
-		ioctlsocket(fd, FIONBIO, (unsigned long*) &nonblocking);
-	}
-#else
-	if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
-		event_warn("fcntl(O_NONBLOCK)");
-		return -1;
-}	
-#endif
-	return 0;
-}
-
-ev_int64_t
-evutil_strtoll(const char *s, char **endptr, int base)
-{
-#ifdef HAVE_STRTOLL
-	return (ev_int64_t)strtoll(s, endptr, base);
-#elif SIZEOF_LONG == 8
-	return (ev_int64_t)strtol(s, endptr, base);
-#elif defined(WIN32) && defined(_MSC_VER) && _MSC_VER < 1300
-	/* XXXX on old versions of MS APIs, we only support base
-	 * 10. */
-	ev_int64_t r;
-	if (base != 10)
-		return 0;
-	r = (ev_int64_t) _atoi64(s);
-	while (isspace(*s))
-		++s;
-	while (isdigit(*s))
-		++s;
-	if (endptr)
-		*endptr = (char*) s;
-	return r;
-#elif defined(WIN32)
-	return (ev_int64_t) _strtoi64(s, endptr, base);
-#else
-#error "I don't know how to parse 64-bit integers."
-#endif
-}
-
-#ifndef HAVE_GETTIMEOFDAY
-int
-evutil_gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	struct _timeb tb;
-
-	if(tv == NULL)
-		return -1;
-
-	_ftime(&tb);
-	tv->tv_sec = (long) tb.time;
-	tv->tv_usec = ((int) tb.millitm) * 1000;
-	return 0;
-}
-#endif
-
-int
-evutil_snprintf(char *buf, size_t buflen, const char *format, ...)
-{
-	int r;
-	va_list ap;
-	va_start(ap, format);
-	r = evutil_vsnprintf(buf, buflen, format, ap);
-	va_end(ap);
-	return r;
-}
-
-int
-evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
-{
-#ifdef _MSC_VER
-	int r = _vsnprintf(buf, buflen, format, ap);
-	buf[buflen-1] = '\0';
-	if (r >= 0)
-		return r;
-	else
-		return _vscprintf(format, ap);
-#else
-	int r = vsnprintf(buf, buflen, format, ap);
-	buf[buflen-1] = '\0';
-	return r;
-#endif
-}
diff --git a/libevent/evutil.h b/libevent/evutil.h
deleted file mode 100644
index a6f62dd9b7b6..000000000000
--- a/libevent/evutil.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _EVUTIL_H_
-#define _EVUTIL_H_
-
-/** @file evutil.h
-
-  Common convenience functions for cross-platform portability and
-  related socket manipulations.
-
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <config.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include <stdarg.h>
-
-#ifdef HAVE_UINT64_T
-#define ev_uint64_t uint64_t
-#define ev_int64_t int64_t
-#elif defined(WIN32)
-#define ev_uint64_t unsigned __int64
-#define ev_int64_t signed __int64
-#elif SIZEOF_LONG_LONG == 8
-#define ev_uint64_t unsigned long long
-#define ev_int64_t long long
-#elif SIZEOF_LONG == 8
-#define ev_uint64_t unsigned long
-#define ev_int64_t long
-#else
-#error "No way to define ev_uint64_t"
-#endif
-
-#ifdef HAVE_UINT32_T
-#define ev_uint32_t uint32_t
-#elif defined(WIN32)
-#define ev_uint32_t unsigned int
-#elif SIZEOF_LONG == 4
-#define ev_uint32_t unsigned long
-#elif SIZEOF_INT == 4
-#define ev_uint32_t unsigned int
-#else
-#error "No way to define ev_uint32_t"
-#endif
-
-#ifdef HAVE_UINT16_T
-#define ev_uint16_t uint16_t
-#elif defined(WIN32)
-#define ev_uint16_t unsigned short
-#elif SIZEOF_INT == 2
-#define ev_uint16_t unsigned int
-#elif SIZEOF_SHORT == 2
-#define ev_uint16_t unsigned short
-#else
-#error "No way to define ev_uint16_t"
-#endif
-
-#ifdef HAVE_UINT8_T
-#define ev_uint8_t uint8_t
-#else
-#define ev_uint8_t unsigned char
-#endif
-
-#if !defined(__cplusplus) && defined(_MSC_VER)
-#define inline __inline
-#endif
-
-#if defined(_MSC_VER)
-#define __func__ __FUNCTION__
-#endif
-
-int evutil_socketpair(int d, int type, int protocol, int sv[2]);
-int evutil_make_socket_nonblocking(int sock);
-#ifdef WIN32
-#define EVUTIL_CLOSESOCKET(s) closesocket(s)
-#else
-#define EVUTIL_CLOSESOCKET(s) close(s)
-#endif
-
-#ifdef WIN32
-#define EVUTIL_SOCKET_ERROR() WSAGetLastError()
-#define EVUTIL_SET_SOCKET_ERROR(errcode)		\
-	do { WSASetLastError(errcode); } while (0)
-#else
-#define EVUTIL_SOCKET_ERROR() (errno)
-#define EVUTIL_SET_SOCKET_ERROR(errcode)		\
-		do { errno = (errcode); } while (0)
-#endif
-
-/*
- * Manipulation functions for struct timeval
- */
-#ifdef HAVE_TIMERADD
-#define evutil_timeradd(tvp, uvp, vvp) timeradd((tvp), (uvp), (vvp))
-#define evutil_timersub(tvp, uvp, vvp) timersub((tvp), (uvp), (vvp))
-#else
-#define evutil_timeradd(tvp, uvp, vvp)							\
-	do {														\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;			\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;       \
-		if ((vvp)->tv_usec >= 1000000) {						\
-			(vvp)->tv_sec++;									\
-			(vvp)->tv_usec -= 1000000;							\
-		}														\
-	} while (0)
-#define	evutil_timersub(tvp, uvp, vvp)						\
-	do {													\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {							\
-			(vvp)->tv_sec--;								\
-			(vvp)->tv_usec += 1000000;						\
-		}													\
-	} while (0)
-#endif /* !HAVE_HAVE_TIMERADD */
-
-#ifdef HAVE_TIMERCLEAR
-#define evutil_timerclear(tvp) timerclear(tvp)
-#else
-#define	evutil_timerclear(tvp)	(tvp)->tv_sec = (tvp)->tv_usec = 0
-#endif
-
-#define	evutil_timercmp(tvp, uvp, cmp)							\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?							\
-	 ((tvp)->tv_usec cmp (uvp)->tv_usec) :						\
-	 ((tvp)->tv_sec cmp (uvp)->tv_sec))
-
-#ifdef HAVE_TIMERISSET
-#define evutil_timerisset(tvp) timerisset(tvp)
-#else
-#define	evutil_timerisset(tvp)	((tvp)->tv_sec || (tvp)->tv_usec)
-#endif
-
-
-/* big-int related functions */
-ev_int64_t evutil_strtoll(const char *s, char **endptr, int base);
-
-
-#ifdef HAVE_GETTIMEOFDAY
-#define evutil_gettimeofday(tv, tz) gettimeofday((tv), (tz))
-#else
-int evutil_gettimeofday(struct timeval *tv, struct timezone *tz);
-#endif
-
-int evutil_snprintf(char *buf, size_t buflen, const char *format, ...)
-#ifdef __GNUC__
-	__attribute__((format(printf, 3, 4)))
-#endif
-	;
-int evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EVUTIL_H_ */
diff --git a/libevent/http-internal.h b/libevent/http-internal.h
deleted file mode 100644
index b31e28dc5987..000000000000
--- a/libevent/http-internal.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2001 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * This header file contains definitions for dealing with HTTP requests
- * that are internal to libevent.  As user of the library, you should not
- * need to know about these.
- */
-
-#ifndef _HTTP_H_
-#define _HTTP_H_
-
-#define HTTP_CONNECT_TIMEOUT	45
-#define HTTP_WRITE_TIMEOUT	50
-#define HTTP_READ_TIMEOUT	50
-
-#define HTTP_PREFIX		"http://"
-#define HTTP_DEFAULTPORT	80
-
-#ifndef HAVE_SOCKLEN_T
-#define socklen_t unsigned int
-#endif
-
-
-enum message_read_status {
-	ALL_DATA_READ = 1,
-	MORE_DATA_EXPECTED = 0,
-	DATA_CORRUPTED = -1,
-	REQUEST_CANCELED = -2
-};
-
-enum evhttp_connection_error {
-	EVCON_HTTP_TIMEOUT,
-	EVCON_HTTP_EOF,
-	EVCON_HTTP_INVALID_HEADER
-};
-
-struct evbuffer;
-struct addrinfo;
-struct evhttp_request;
-
-/* A stupid connection object - maybe make this a bufferevent later */
-
-enum evhttp_connection_state {
-	EVCON_DISCONNECTED,	/**< not currently connected not trying either*/
-	EVCON_CONNECTING,	/**< tries to currently connect */
-	EVCON_IDLE,		/**< connection is established */
-	EVCON_READING_FIRSTLINE,/**< reading Request-Line (incoming conn) or
-				 **< Status-Line (outgoing conn) */
-	EVCON_READING_HEADERS,	/**< reading request/response headers */
-	EVCON_READING_BODY,	/**< reading request/response body */
-	EVCON_READING_TRAILER,	/**< reading request/response chunked trailer */
-	EVCON_WRITING		/**< writing request/response headers/body */
-};
-
-struct event_base;
-
-struct evhttp_connection {
-	/* we use tailq only if they were created for an http server */
-	TAILQ_ENTRY(evhttp_connection) (next);
-
-	int fd;
-	struct event ev;
-	struct event close_ev;
-	struct evbuffer *input_buffer;
-	struct evbuffer *output_buffer;
-	
-	char *bind_address;		/* address to use for binding the src */
-	u_short bind_port;		/* local port for binding the src */
-
-	char *address;			/* address to connect to */
-	u_short port;
-
-	int flags;
-#define EVHTTP_CON_INCOMING	0x0001	/* only one request on it ever */
-#define EVHTTP_CON_OUTGOING	0x0002  /* multiple requests possible */
-#define EVHTTP_CON_CLOSEDETECT  0x0004  /* detecting if persistent close */
-
-	int timeout;			/* timeout in seconds for events */
-	int retry_cnt;			/* retry count */
-	int retry_max;			/* maximum number of retries */
-	
-	enum evhttp_connection_state state;
-
-	/* for server connections, the http server they are connected with */
-	struct evhttp *http_server;
-
-	TAILQ_HEAD(evcon_requestq, evhttp_request) requests;
-	
-						   void (*cb)(struct evhttp_connection *, void *);
-	void *cb_arg;
-	
-	void (*closecb)(struct evhttp_connection *, void *);
-	void *closecb_arg;
-
-	struct event_base *base;
-};
-
-struct evhttp_cb {
-	TAILQ_ENTRY(evhttp_cb) next;
-
-	char *what;
-
-	void (*cb)(struct evhttp_request *req, void *);
-	void *cbarg;
-};
-
-/* both the http server as well as the rpc system need to queue connections */
-TAILQ_HEAD(evconq, evhttp_connection);
-
-/* each bound socket is stored in one of these */
-struct evhttp_bound_socket {
-	TAILQ_ENTRY(evhttp_bound_socket) (next);
-
-	struct event  bind_ev;
-};
-
-struct evhttp {
-	TAILQ_HEAD(boundq, evhttp_bound_socket) sockets;
-
-	TAILQ_HEAD(httpcbq, evhttp_cb) callbacks;
-        struct evconq connections;
-
-        int timeout;
-
-	void (*gencb)(struct evhttp_request *req, void *);
-	void *gencbarg;
-
-	struct event_base *base;
-};
-
-/* resets the connection; can be reused for more requests */
-void evhttp_connection_reset(struct evhttp_connection *);
-
-/* connects if necessary */
-int evhttp_connection_connect(struct evhttp_connection *);
-
-/* notifies the current request that it failed; resets connection */
-void evhttp_connection_fail(struct evhttp_connection *,
-    enum evhttp_connection_error error);
-
-void evhttp_get_request(struct evhttp *, int, struct sockaddr *, socklen_t);
-
-int evhttp_hostportfile(char *, char **, u_short *, char **);
-
-int evhttp_parse_firstline(struct evhttp_request *, struct evbuffer*);
-int evhttp_parse_headers(struct evhttp_request *, struct evbuffer*);
-
-void evhttp_start_read(struct evhttp_connection *);
-void evhttp_make_header(struct evhttp_connection *, struct evhttp_request *);
-
-void evhttp_write_buffer(struct evhttp_connection *,
-    void (*)(struct evhttp_connection *, void *), void *);
-
-/* response sending HTML the data in the buffer */
-void evhttp_response_code(struct evhttp_request *, int, const char *);
-void evhttp_send_page(struct evhttp_request *, struct evbuffer *);
-
-#endif /* _HTTP_H */
diff --git a/libevent/http.c b/libevent/http.c
deleted file mode 100644
index 3687698ddb5c..000000000000
--- a/libevent/http.c
+++ /dev/null
@@ -1,2842 +0,0 @@
-/*
- * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- * This file was modified by Oracle on 28-08-2015.
- * Modifications copyright (c) 2015, Oracle and/or its affiliates.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
-
-#ifndef WIN32
-#include <sys/resource.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#endif
-
-#include <sys/queue.h>
-
-#ifndef HAVE_TAILQFOREACH
-#include <event-internal.h>
-#endif
-
-#ifndef WIN32
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef WIN32
-#include <syslog.h>
-#endif
-#include <signal.h>
-#include <time.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#undef timeout_pending
-#undef timeout_initialized
-
-#include "strlcpy-internal.h"
-#include "event.h"
-#include "evhttp.h"
-#include "evutil.h"
-#include "log.h"
-#include "http-internal.h"
-
-#ifdef WIN32
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#define strdup _strdup
-#endif
-
-#ifndef HAVE_GETNAMEINFO
-#define NI_MAXSERV 32
-#define NI_MAXHOST 1025
-
-#define NI_NUMERICHOST 1
-#define NI_NUMERICSERV 2
-#define INNODB_CHANGED
-
-static int
-fake_getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
-	size_t hostlen, char *serv, size_t servlen, int flags)
-{
-        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-        
-        if (serv != NULL) {
-				char tmpserv[16];
-				evutil_snprintf(tmpserv, sizeof(tmpserv),
-					"%d", ntohs(sin->sin_port));
-                if (strlcpy(serv, tmpserv, servlen) >= servlen)
-                        return (-1);
-        }
-
-        if (host != NULL) {
-                if (flags & NI_NUMERICHOST) {
-                        if (strlcpy(host, inet_ntoa(sin->sin_addr),
-                            hostlen) >= hostlen)
-                                return (-1);
-                        else
-                                return (0);
-                } else {
-						struct hostent *hp;
-                        hp = gethostbyaddr((char *)&sin->sin_addr, 
-                            sizeof(struct in_addr), AF_INET);
-                        if (hp == NULL)
-                                return (-2);
-                        
-                        if (strlcpy(host, hp->h_name, hostlen) >= hostlen)
-                                return (-1);
-                        else
-                                return (0);
-                }
-        }
-        return (0);
-}
-
-#endif
-
-#ifndef HAVE_GETADDRINFO
-struct addrinfo {
-	int ai_family;
-	int ai_socktype;
-	int ai_protocol;
-	size_t ai_addrlen;
-	struct sockaddr *ai_addr;
-	struct addrinfo *ai_next;
-};
-static int
-fake_getaddrinfo(const char *hostname, struct addrinfo *ai)
-{
-	struct hostent *he = NULL;
-	struct sockaddr_in *sa;
-	if (hostname) {
-		he = gethostbyname(hostname);
-		if (!he)
-			return (-1);
-	}
-	ai->ai_family = he ? he->h_addrtype : AF_INET;
-	ai->ai_socktype = SOCK_STREAM;
-	ai->ai_protocol = 0;
-	ai->ai_addrlen = sizeof(struct sockaddr_in);
-	if (NULL == (ai->ai_addr = malloc(ai->ai_addrlen)))
-		return (-1);
-	sa = (struct sockaddr_in*)ai->ai_addr;
-	memset(sa, 0, ai->ai_addrlen);
-	if (he) {
-		sa->sin_family = he->h_addrtype;
-		memcpy(&sa->sin_addr, he->h_addr_list[0], he->h_length);
-	} else {
-		sa->sin_family = AF_INET;
-		sa->sin_addr.s_addr = INADDR_ANY;
-	}
-	ai->ai_next = NULL;
-	return (0);
-}
-static void
-fake_freeaddrinfo(struct addrinfo *ai)
-{
-	free(ai->ai_addr);
-}
-#endif
-
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
-/* wrapper for setting the base from the http server */
-#define EVHTTP_BASE_SET(x, y) do { \
-	if ((x)->base != NULL) event_base_set((x)->base, y);	\
-} while (0) 
-
-extern int debug;
-
-static int socket_connect(int fd, const char *address, unsigned short port);
-static int bind_socket_ai(struct addrinfo *, int reuse);
-static int bind_socket(const char *, u_short, int reuse);
-static void name_from_addr(struct sockaddr *, socklen_t, char **, char **);
-static int evhttp_associate_new_request_with_connection(
-	struct evhttp_connection *evcon);
-static void evhttp_connection_start_detectclose(
-	struct evhttp_connection *evcon);
-static void evhttp_connection_stop_detectclose(
-	struct evhttp_connection *evcon);
-static void evhttp_request_dispatch(struct evhttp_connection* evcon);
-static void evhttp_read_firstline(struct evhttp_connection *evcon,
-				  struct evhttp_request *req);
-static void evhttp_read_header(struct evhttp_connection *evcon,
-    struct evhttp_request *req);
-static int evhttp_add_header_internal(struct evkeyvalq *headers,
-    const char *key, const char *value);
-static int evhttp_decode_uri_internal(const char *uri, size_t length,
-    char *ret, int always_decode_plus);
-
-void evhttp_read(int, short, void *);
-void evhttp_write(int, short, void *);
-
-#ifndef HAVE_STRSEP
-/* strsep replacement for platforms that lack it.  Only works if
- * del is one character long. */
-static char *
-strsep(char **s, const char *del)
-{
-	char *d, *tok;
-	assert(strlen(del) == 1);
-	if (!s || !*s)
-		return NULL;
-	tok = *s;
-	d = strstr(tok, del);
-	if (d) {
-		*d = '\0';
-		*s = d + 1;
-	} else
-		*s = NULL;
-	return tok;
-}
-#endif
-
-static const char *
-html_replace(char ch, char *buf)
-{
-	switch (ch) {
-	case '<':
-		return "&lt;";
-	case '>':
-		return "&gt;";
-	case '"':
-		return "&quot;";
-	case '\'':
-		return "&#039;";
-	case '&':
-		return "&amp;";
-	default:
-		break;
-	}
-
-	/* Echo the character back */
-	buf[0] = ch;
-	buf[1] = '\0';
-	
-	return buf;
-}
-
-/*
- * Replaces <, >, ", ' and & with &lt;, &gt;, &quot;,
- * &#039; and &amp; correspondingly.
- *
- * The returned string needs to be freed by the caller.
- */
-
-char *
-evhttp_htmlescape(const char *html)
-{
-	int i, new_size = 0, old_size = strlen(html);
-	char *escaped_html, *p;
-	char scratch_space[2];
-	
-	for (i = 0; i < old_size; ++i)
-          new_size += strlen(html_replace(html[i], scratch_space));
-
-	p = escaped_html = malloc(new_size + 1);
-	if (escaped_html == NULL)
-		event_err(1, "%s: malloc(%d)", __func__, new_size + 1);
-	for (i = 0; i < old_size; ++i) {
-		const char *replaced = html_replace(html[i], scratch_space);
-		/* this is length checked */
-		strcpy(p, replaced);
-		p += strlen(replaced);
-	}
-
-	*p = '\0';
-
-	return (escaped_html);
-}
-
-static const char *
-evhttp_method(enum evhttp_cmd_type type)
-{
-	const char *method;
-
-	switch (type) {
-	case EVHTTP_REQ_GET:
-		method = "GET";
-		break;
-	case EVHTTP_REQ_POST:
-		method = "POST";
-		break;
-	case EVHTTP_REQ_HEAD:
-		method = "HEAD";
-		break;
-	default:
-		method = NULL;
-		break;
-	}
-
-	return (method);
-}
-
-static void
-evhttp_add_event(struct event *ev, int timeout, int default_timeout)
-{
-	if (timeout != 0) {
-		struct timeval tv;
-		
-		evutil_timerclear(&tv);
-		tv.tv_sec = timeout != -1 ? timeout : default_timeout;
-		event_add(ev, &tv);
-	} else {
-		event_add(ev, NULL);
-	}
-}
-
-void
-evhttp_write_buffer(struct evhttp_connection *evcon,
-    void (*cb)(struct evhttp_connection *, void *), void *arg)
-{
-	event_debug(("%s: preparing to write buffer\n", __func__));
-
-	/* Set call back */
-	evcon->cb = cb;
-	evcon->cb_arg = arg;
-
-	/* check if the event is already pending */
-	if (event_pending(&evcon->ev, EV_WRITE|EV_TIMEOUT, NULL))
-		event_del(&evcon->ev);
-
-	event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_write, evcon);
-	EVHTTP_BASE_SET(evcon, &evcon->ev);
-	evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_WRITE_TIMEOUT);
-}
-
-static int
-evhttp_connected(struct evhttp_connection *evcon)
-{
-	switch (evcon->state) {
-	case EVCON_DISCONNECTED:
-	case EVCON_CONNECTING:
-		return (0);
-	case EVCON_IDLE:
-	case EVCON_READING_FIRSTLINE:
-	case EVCON_READING_HEADERS:
-	case EVCON_READING_BODY:
-	case EVCON_READING_TRAILER:
-	case EVCON_WRITING:
-	default:
-		return (1);
-	}
-}
-
-/*
- * Create the headers needed for an HTTP request
- */
-static void
-evhttp_make_header_request(struct evhttp_connection *evcon,
-    struct evhttp_request *req)
-{
-	const char *method;
-	
-	evhttp_remove_header(req->output_headers, "Proxy-Connection");
-
-	/* Generate request line */
-	method = evhttp_method(req->type);
-	evbuffer_add_printf(evcon->output_buffer, "%s %s HTTP/%d.%d\r\n",
-	    method, req->uri, req->major, req->minor);
-
-	/* Add the content length on a post request if missing */
-	if (req->type == EVHTTP_REQ_POST &&
-	    evhttp_find_header(req->output_headers, "Content-Length") == NULL){
-		char size[12];
-		evutil_snprintf(size, sizeof(size), "%ld",
-		    (long)EVBUFFER_LENGTH(req->output_buffer));
-		evhttp_add_header(req->output_headers, "Content-Length", size);
-	}
-}
-
-static int
-evhttp_is_connection_close(int flags, struct evkeyvalq* headers)
-{
-	if (flags & EVHTTP_PROXY_REQUEST) {
-		/* proxy connection */
-		const char *connection = evhttp_find_header(headers, "Proxy-Connection");
-		return (connection == NULL || strcasecmp(connection, "keep-alive") != 0);
-	} else {
-		const char *connection = evhttp_find_header(headers, "Connection");
-		return (connection != NULL && strcasecmp(connection, "close") == 0);
-	}
-}
-
-static int
-evhttp_is_connection_keepalive(struct evkeyvalq* headers)
-{
-	const char *connection = evhttp_find_header(headers, "Connection");
-	return (connection != NULL 
-	    && strncasecmp(connection, "keep-alive", 10) == 0);
-}
-
-static void
-evhttp_maybe_add_date_header(struct evkeyvalq *headers)
-{
-	if (evhttp_find_header(headers, "Date") == NULL) {
-		char date[50];
-#ifndef WIN32
-		struct tm cur;
-#endif
-		struct tm *cur_p;
-		time_t t = time(NULL);
-#ifdef WIN32
-		cur_p = gmtime(&t);
-#else
-		gmtime_r(&t, &cur);
-		cur_p = &cur;
-#endif
-		if (strftime(date, sizeof(date),
-			"%a, %d %b %Y %H:%M:%S GMT", cur_p) != 0) {
-			evhttp_add_header(headers, "Date", date);
-		}
-	}
-}
-
-static void
-evhttp_maybe_add_content_length_header(struct evkeyvalq *headers,
-    long content_length)
-{
-	if (evhttp_find_header(headers, "Transfer-Encoding") == NULL &&
-	    evhttp_find_header(headers,	"Content-Length") == NULL) {
-		char len[12];
-		evutil_snprintf(len, sizeof(len), "%ld", content_length);
-		evhttp_add_header(headers, "Content-Length", len);
-	}
-}
-
-/*
- * Create the headers needed for an HTTP reply
- */
-
-static void
-evhttp_make_header_response(struct evhttp_connection *evcon,
-    struct evhttp_request *req)
-{
-	int is_keepalive = evhttp_is_connection_keepalive(req->input_headers);
-	evbuffer_add_printf(evcon->output_buffer, "HTTP/%d.%d %d %s\r\n",
-	    req->major, req->minor, req->response_code,
-	    req->response_code_line);
-
-	if (req->major == 1) {
-		if (req->minor == 1)
-			evhttp_maybe_add_date_header(req->output_headers);
-
-		/*
-		 * if the protocol is 1.0; and the connection was keep-alive
-		 * we need to add a keep-alive header, too.
-		 */
-		if (req->minor == 0 && is_keepalive)
-			evhttp_add_header(req->output_headers,
-			    "Connection", "keep-alive");
-
-		if (req->minor == 1 || is_keepalive) {
-			/* 
-			 * we need to add the content length if the
-			 * user did not give it, this is required for
-			 * persistent connections to work.
-			 */
-			evhttp_maybe_add_content_length_header(
-				req->output_headers,
-				(long)EVBUFFER_LENGTH(req->output_buffer));
-		}
-	}
-
-	/* Potentially add headers for unidentified content. */
-	if (EVBUFFER_LENGTH(req->output_buffer)) {
-		if (evhttp_find_header(req->output_headers,
-			"Content-Type") == NULL) {
-			evhttp_add_header(req->output_headers,
-			    "Content-Type", "text/html; charset=ISO-8859-1");
-		}
-	}
-
-	/* if the request asked for a close, we send a close, too */
-	if (evhttp_is_connection_close(req->flags, req->input_headers)) {
-		evhttp_remove_header(req->output_headers, "Connection");
-		if (!(req->flags & EVHTTP_PROXY_REQUEST))
-		    evhttp_add_header(req->output_headers, "Connection", "close");
-		evhttp_remove_header(req->output_headers, "Proxy-Connection");
-	}
-}
-
-void
-evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req)
-{
-	struct evkeyval *header;
-
-	/*
-	 * Depending if this is a HTTP request or response, we might need to
-	 * add some new headers or remove existing headers.
-	 */
-	if (req->kind == EVHTTP_REQUEST) {
-		evhttp_make_header_request(evcon, req);
-	} else {
-		evhttp_make_header_response(evcon, req);
-	}
-
-	TAILQ_FOREACH(header, req->output_headers, next) {
-		evbuffer_add_printf(evcon->output_buffer, "%s: %s\r\n",
-		    header->key, header->value);
-	}
-	evbuffer_add(evcon->output_buffer, "\r\n", 2);
-
-	if (EVBUFFER_LENGTH(req->output_buffer) > 0) {
-		/*
-		 * For a request, we add the POST data, for a reply, this
-		 * is the regular data.
-		 */
-		evbuffer_add_buffer(evcon->output_buffer, req->output_buffer);
-	}
-}
-
-/* Separated host, port and file from URI */
-
-int
-evhttp_hostportfile(char *url, char **phost, u_short *pport, char **pfile)
-{
-	/* XXX not threadsafe. */
-	static char host[1024];
-	static char file[1024];
-	char *p;
-	const char *p2;
-	int len;
-	u_short port;
-
-	len = strlen(HTTP_PREFIX);
-	if (strncasecmp(url, HTTP_PREFIX, len))
-		return (-1);
-
-	url += len;
-
-	/* We might overrun */
-	if (strlcpy(host, url, sizeof (host)) >= sizeof(host))
-		return (-1);
-
-	p = strchr(host, '/');
-	if (p != NULL) {
-		*p = '\0';
-		p2 = p + 1;
-	} else
-		p2 = NULL;
-
-	if (pfile != NULL) {
-		/* Generate request file */
-		if (p2 == NULL)
-			p2 = "";
-		evutil_snprintf(file, sizeof(file), "/%s", p2);
-	}
-
-	p = strchr(host, ':');
-	if (p != NULL) {
-		*p = '\0';
-		port = atoi(p + 1);
-
-		if (port == 0)
-			return (-1);
-	} else
-		port = HTTP_DEFAULTPORT;
-
-	if (phost != NULL)
-		*phost = host;
-	if (pport != NULL)
-		*pport = port;
-	if (pfile != NULL)
-		*pfile = file;
-
-	return (0);
-}
-
-static int
-evhttp_connection_incoming_fail(struct evhttp_request *req,
-    enum evhttp_connection_error error)
-{
-	switch (error) {
-	case EVCON_HTTP_TIMEOUT:
-	case EVCON_HTTP_EOF:
-		/* 
-		 * these are cases in which we probably should just
-		 * close the connection and not send a reply.  this
-		 * case may happen when a browser keeps a persistent
-		 * connection open and we timeout on the read.
-		 */
-		return (-1);
-	case EVCON_HTTP_INVALID_HEADER:
-	default:	/* xxx: probably should just error on default */
-		/* the callback looks at the uri to determine errors */
-		if (req->uri) {
-			free(req->uri);
-			req->uri = NULL;
-		}
-
-		/* 
-		 * the callback needs to send a reply, once the reply has
-		 * been send, the connection should get freed.
-		 */
-		(*req->cb)(req, req->cb_arg);
-	}
-	
-	return (0);
-}
-
-void
-evhttp_connection_fail(struct evhttp_connection *evcon,
-    enum evhttp_connection_error error)
-{
-	struct evhttp_request* req = TAILQ_FIRST(&evcon->requests);
-	void (*cb)(struct evhttp_request *, void *);
-	void *cb_arg;
-	assert(req != NULL);
-	
-	if (evcon->flags & EVHTTP_CON_INCOMING) {
-		/* 
-		 * for incoming requests, there are two different
-		 * failure cases.  it's either a network level error
-		 * or an http layer error. for problems on the network
-		 * layer like timeouts we just drop the connections.
-		 * For HTTP problems, we might have to send back a
-		 * reply before the connection can be freed.
-		 */
-		if (evhttp_connection_incoming_fail(req, error) == -1)
-			evhttp_connection_free(evcon);
-		return;
-	}
-
-	/* save the callback for later; the cb might free our object */
-	cb = req->cb;
-	cb_arg = req->cb_arg;
-
-	TAILQ_REMOVE(&evcon->requests, req, next);
-	evhttp_request_free(req);
-
-	/* xxx: maybe we should fail all requests??? */
-
-	/* reset the connection */
-	evhttp_connection_reset(evcon);
-	
-	/* We are trying the next request that was queued on us */
-	if (TAILQ_FIRST(&evcon->requests) != NULL)
-		evhttp_connection_connect(evcon);
-
-	/* inform the user */
-	if (cb != NULL)
-		(*cb)(NULL, cb_arg);
-}
-
-void
-evhttp_write(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	int n;
-
-	if (what == EV_TIMEOUT) {
-		evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-		return;
-	}
-
-	n = evbuffer_write(evcon->output_buffer, fd);
-	if (n == -1) {
-		event_debug(("%s: evbuffer_write", __func__));
-		evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-		return;
-	}
-
-	if (n == 0) {
-		event_debug(("%s: write nothing", __func__));
-		evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-		return;
-	}
-
-	if (EVBUFFER_LENGTH(evcon->output_buffer) != 0) {
-		evhttp_add_event(&evcon->ev, 
-		    evcon->timeout, HTTP_WRITE_TIMEOUT);
-		return;
-	}
-
-	/* Activate our call back */
-	if (evcon->cb != NULL)
-		(*evcon->cb)(evcon, evcon->cb_arg);
-}
-
-/**
- * Advance the connection state.
- * - If this is an outgoing connection, we've just processed the response;
- *   idle or close the connection.
- * - If this is an incoming connection, we've just processed the request;
- *   respond.
- */
-static void
-evhttp_connection_done(struct evhttp_connection *evcon)
-{
-	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-	int con_outgoing = evcon->flags & EVHTTP_CON_OUTGOING;
-
-	if (con_outgoing) {
-		/* idle or close the connection */
-	        int need_close;
-		TAILQ_REMOVE(&evcon->requests, req, next);
-		req->evcon = NULL;
-
-		evcon->state = EVCON_IDLE;
-
-		need_close = 
-		    evhttp_is_connection_close(req->flags, req->input_headers)||
-		    evhttp_is_connection_close(req->flags, req->output_headers);
-
-		/* check if we got asked to close the connection */
-		if (need_close)
-			evhttp_connection_reset(evcon);
-
-		if (TAILQ_FIRST(&evcon->requests) != NULL) {
-			/*
-			 * We have more requests; reset the connection
-			 * and deal with the next request.
-			 */
-			if (!evhttp_connected(evcon))
-				evhttp_connection_connect(evcon);
-			else
-				evhttp_request_dispatch(evcon);
-		} else if (!need_close) {
-			/*
-			 * The connection is going to be persistent, but we
-			 * need to detect if the other side closes it.
-			 */
-			evhttp_connection_start_detectclose(evcon);
-		}
-	} else {
-		/*
-		 * incoming connection - we need to leave the request on the
-		 * connection so that we can reply to it.
-		 */
-		evcon->state = EVCON_WRITING;
-	}
-
-	/* notify the user of the request */
-	(*req->cb)(req, req->cb_arg);
-
-	/* if this was an outgoing request, we own and it's done. so free it */
-	if (con_outgoing) {
-		evhttp_request_free(req);
-	}
-}
-
-/*
- * Handles reading from a chunked request.
- *   return ALL_DATA_READ:
- *     all data has been read
- *   return MORE_DATA_EXPECTED:
- *     more data is expected
- *   return DATA_CORRUPTED:
- *     data is corrupted
- *   return REQUEST_CANCLED:
- *     request was canceled by the user calling evhttp_cancel_request
- */
-
-static enum message_read_status
-evhttp_handle_chunked_read(struct evhttp_request *req, struct evbuffer *buf)
-{
-	int len;
-
-	while ((len = EVBUFFER_LENGTH(buf)) > 0) {
-		if (req->ntoread < 0) {
-			/* Read chunk size */
-			ev_int64_t ntoread;
-			char *p = evbuffer_readline(buf);
-			char *endp;
-			int error;
-			if (p == NULL)
-				break;
-			/* the last chunk is on a new line? */
-			if (strlen(p) == 0) {
-				free(p);
-				continue;
-			}
-			ntoread = evutil_strtoll(p, &endp, 16);
-			error = (*p == '\0' ||
-			    (*endp != '\0' && *endp != ' ') ||
-			    ntoread < 0);
-			free(p);
-			if (error) {
-				/* could not get chunk size */
-				return (DATA_CORRUPTED);
-			}
-			req->ntoread = ntoread;
-			if (req->ntoread == 0) {
-				/* Last chunk */
-				return (ALL_DATA_READ);
-			}
-			continue;
-		}
-
-		/* don't have enough to complete a chunk; wait for more */
-		if (len < req->ntoread)
-			return (MORE_DATA_EXPECTED);
-
-		/* Completed chunk */
-		evbuffer_add(req->input_buffer,
-		    EVBUFFER_DATA(buf), (size_t)req->ntoread);
-		evbuffer_drain(buf, (size_t)req->ntoread);
-		req->ntoread = -1;
-		if (req->chunk_cb != NULL) {
-			(*req->chunk_cb)(req, req->cb_arg);
-			evbuffer_drain(req->input_buffer,
-			    EVBUFFER_LENGTH(req->input_buffer));
-		}
-	}
-
-	return (MORE_DATA_EXPECTED);
-}
-
-static void
-evhttp_read_trailer(struct evhttp_connection *evcon, struct evhttp_request *req)
-{
-	struct evbuffer *buf = evcon->input_buffer;
-
-	switch (evhttp_parse_headers(req, buf)) {
-	case DATA_CORRUPTED:
-		evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-		break;
-	case ALL_DATA_READ:
-		event_del(&evcon->ev);
-		evhttp_connection_done(evcon);
-		break;
-	case MORE_DATA_EXPECTED:
-	default:
-		evhttp_add_event(&evcon->ev, evcon->timeout,
-		    HTTP_READ_TIMEOUT);
-		break;
-	}
-}
-
-static void
-evhttp_read_body(struct evhttp_connection *evcon, struct evhttp_request *req)
-{
-	struct evbuffer *buf = evcon->input_buffer;
-	
-	if (req->chunked) {
-		switch (evhttp_handle_chunked_read(req, buf)) {
-		case ALL_DATA_READ:
-			/* finished last chunk */
-			evcon->state = EVCON_READING_TRAILER;
-			evhttp_read_trailer(evcon, req);
-			return;
-		case DATA_CORRUPTED:
-			/* corrupted data */
-			evhttp_connection_fail(evcon,
-			    EVCON_HTTP_INVALID_HEADER);
-			return;
-		case REQUEST_CANCELED:
-			/* request canceled */
-			evhttp_request_free(req);
-			return;
-		case MORE_DATA_EXPECTED:
-		default:
-			break;
-		}
-	} else if (req->ntoread < 0) {
-		/* Read until connection close. */
-		evbuffer_add_buffer(req->input_buffer, buf);
-	} else if (EVBUFFER_LENGTH(buf) >= req->ntoread) {
-		/* Completed content length */
-		evbuffer_add(req->input_buffer, EVBUFFER_DATA(buf),
-		    (size_t)req->ntoread);
-		evbuffer_drain(buf, (size_t)req->ntoread);
-		req->ntoread = 0;
-		evhttp_connection_done(evcon);
-		return;
-	}
-	/* Read more! */
-	event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read, evcon);
-	EVHTTP_BASE_SET(evcon, &evcon->ev);
-	evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT);
-}
-
-/*
- * Reads data into a buffer structure until no more data
- * can be read on the file descriptor or we have read all
- * the data that we wanted to read.
- * Execute callback when done.
- */
-
-void
-evhttp_read(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-	struct evbuffer *buf = evcon->input_buffer;
-	int n, len;
-
-	if (what == EV_TIMEOUT) {
-		evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-		return;
-	}
-	n = evbuffer_read(buf, fd, -1);
-	len = EVBUFFER_LENGTH(buf);
-	event_debug(("%s: got %d on %d\n", __func__, n, fd));
-	
-	if (n == -1) {
-		if (errno != EINTR && errno != EAGAIN) {
-			event_debug(("%s: evbuffer_read", __func__));
-			evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-		} else {
-			evhttp_add_event(&evcon->ev, evcon->timeout,
-			    HTTP_READ_TIMEOUT);	       
-		}
-		return;
-	} else if (n == 0) {
-		/* Connection closed */
-		evhttp_connection_done(evcon);
-		return;
-	}
-
-	switch (evcon->state) {
-	case EVCON_READING_FIRSTLINE:
-		evhttp_read_firstline(evcon, req);
-		break;
-	case EVCON_READING_HEADERS:
-		evhttp_read_header(evcon, req);
-		break;
-	case EVCON_READING_BODY:
-		evhttp_read_body(evcon, req);
-		break;
-	case EVCON_READING_TRAILER:
-		evhttp_read_trailer(evcon, req);
-		break;
-	case EVCON_DISCONNECTED:
-	case EVCON_CONNECTING:
-	case EVCON_IDLE:
-	case EVCON_WRITING:
-	default:
-		event_errx(1, "%s: illegal connection state %d",
-			   __func__, evcon->state);
-	}
-}
-
-static void
-evhttp_write_connectioncb(struct evhttp_connection *evcon, void *arg)
-{
-	/* This is after writing the request to the server */
-	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-	assert(req != NULL);
-
-	assert(evcon->state == EVCON_WRITING);
-
-	/* We are done writing our header and are now expecting the response */
-	req->kind = EVHTTP_RESPONSE;
-
-	evhttp_start_read(evcon);
-}
-
-/*
- * Clean up a connection object
- */
-
-void
-evhttp_connection_free(struct evhttp_connection *evcon)
-{
-	struct evhttp_request *req;
-
-	/* notify interested parties that this connection is going down */
-	if (evcon->fd != -1) {
-		if (evhttp_connected(evcon) && evcon->closecb != NULL)
-			(*evcon->closecb)(evcon, evcon->closecb_arg);
-	}
-
-	/* remove all requests that might be queued on this connection */
-	while ((req = TAILQ_FIRST(&evcon->requests)) != NULL) {
-		TAILQ_REMOVE(&evcon->requests, req, next);
-		evhttp_request_free(req);
-	}
-
-	if (evcon->http_server != NULL) {
-		struct evhttp *http = evcon->http_server;
-		TAILQ_REMOVE(&http->connections, evcon, next);
-	}
-
-	if (event_initialized(&evcon->close_ev))
-		event_del(&evcon->close_ev);
-
-	if (event_initialized(&evcon->ev))
-		event_del(&evcon->ev);
-	
-	if (evcon->fd != -1)
-		EVUTIL_CLOSESOCKET(evcon->fd);
-
-	if (evcon->bind_address != NULL)
-		free(evcon->bind_address);
-
-	if (evcon->address != NULL)
-		free(evcon->address);
-
-	if (evcon->input_buffer != NULL)
-		evbuffer_free(evcon->input_buffer);
-
-	if (evcon->output_buffer != NULL)
-		evbuffer_free(evcon->output_buffer);
-
-	free(evcon);
-}
-
-void
-evhttp_connection_set_local_address(struct evhttp_connection *evcon,
-    const char *address)
-{
-	assert(evcon->state == EVCON_DISCONNECTED);
-	if (evcon->bind_address)
-		free(evcon->bind_address);
-	if ((evcon->bind_address = strdup(address)) == NULL)
-		event_err(1, "%s: strdup", __func__);
-}
-
-void
-evhttp_connection_set_local_port(struct evhttp_connection *evcon,
-    unsigned short port)
-{
-	assert(evcon->state == EVCON_DISCONNECTED);
-	evcon->bind_port = port;
-}
-
-static void
-evhttp_request_dispatch(struct evhttp_connection* evcon)
-{
-	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-	
-	/* this should not usually happy but it's possible */
-	if (req == NULL)
-		return;
-
-	/* delete possible close detection events */
-	evhttp_connection_stop_detectclose(evcon);
-	
-	/* we assume that the connection is connected already */
-	assert(evcon->state == EVCON_IDLE);
-
-	evcon->state = EVCON_WRITING;
-
-	/* Create the header from the store arguments */
-	evhttp_make_header(evcon, req);
-
-	evhttp_write_buffer(evcon, evhttp_write_connectioncb, NULL);
-}
-
-/* Reset our connection state */
-void
-evhttp_connection_reset(struct evhttp_connection *evcon)
-{
-	if (event_initialized(&evcon->ev))
-		event_del(&evcon->ev);
-
-	if (evcon->fd != -1) {
-		/* inform interested parties about connection close */
-		if (evhttp_connected(evcon) && evcon->closecb != NULL)
-			(*evcon->closecb)(evcon, evcon->closecb_arg);
-
-		EVUTIL_CLOSESOCKET(evcon->fd);
-		evcon->fd = -1;
-	}
-	evcon->state = EVCON_DISCONNECTED;
-
-	evbuffer_drain(evcon->input_buffer,
-	    EVBUFFER_LENGTH(evcon->input_buffer));
-	evbuffer_drain(evcon->output_buffer,
-	    EVBUFFER_LENGTH(evcon->output_buffer));
-}
-
-static void
-evhttp_detect_close_cb(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	evhttp_connection_reset(evcon);
-}
-
-static void
-evhttp_connection_start_detectclose(struct evhttp_connection *evcon)
-{
-	evcon->flags |= EVHTTP_CON_CLOSEDETECT;
-
-	if (event_initialized(&evcon->close_ev))
-		event_del(&evcon->close_ev);
-	event_set(&evcon->close_ev, evcon->fd, EV_READ,
-	    evhttp_detect_close_cb, evcon);
-	EVHTTP_BASE_SET(evcon, &evcon->close_ev);
-	event_add(&evcon->close_ev, NULL);
-}
-
-static void
-evhttp_connection_stop_detectclose(struct evhttp_connection *evcon)
-{
-	evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
-	event_del(&evcon->close_ev);
-}
-
-static void
-evhttp_connection_retry(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-
-	evcon->state = EVCON_DISCONNECTED;
-	evhttp_connection_connect(evcon);
-}
-
-/*
- * Call back for asynchronous connection attempt.
- */
-
-static void
-evhttp_connectioncb(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	int error;
-	socklen_t errsz = sizeof(error);
-		
-	if (what == EV_TIMEOUT) {
-		event_debug(("%s: connection timeout for \"%s:%d\" on %d",
-			__func__, evcon->address, evcon->port, evcon->fd));
-		goto cleanup;
-	}
-
-	/* Check if the connection completed */
-	if (getsockopt(evcon->fd, SOL_SOCKET, SO_ERROR, (void*)&error,
-		       &errsz) == -1) {
-		event_debug(("%s: getsockopt for \"%s:%d\" on %d",
-			__func__, evcon->address, evcon->port, evcon->fd));
-		goto cleanup;
-	}
-
-	if (error) {
-		event_debug(("%s: connect failed for \"%s:%d\" on %d: %s",
-		    __func__, evcon->address, evcon->port, evcon->fd,
-			strerror(error)));
-		goto cleanup;
-	}
-
-	/* We are connected to the server now */
-	event_debug(("%s: connected to \"%s:%d\" on %d\n",
-			__func__, evcon->address, evcon->port, evcon->fd));
-
-	/* Reset the retry count as we were successful in connecting */
-	evcon->retry_cnt = 0;
-	evcon->state = EVCON_IDLE;
-
-	/* try to start requests that have queued up on this connection */
-	evhttp_request_dispatch(evcon);
-	return;
-
- cleanup:
-	if (evcon->retry_max < 0 || evcon->retry_cnt < evcon->retry_max) {
-		evtimer_set(&evcon->ev, evhttp_connection_retry, evcon);
-		EVHTTP_BASE_SET(evcon, &evcon->ev);
-		evhttp_add_event(&evcon->ev, MIN(3600, 2 << evcon->retry_cnt),
-		    HTTP_CONNECT_TIMEOUT);
-		evcon->retry_cnt++;
-		return;
-	}
-	evhttp_connection_reset(evcon);
-
-	/* for now, we just signal all requests by executing their callbacks */
-	while (TAILQ_FIRST(&evcon->requests) != NULL) {
-		struct evhttp_request *request = TAILQ_FIRST(&evcon->requests);
-		TAILQ_REMOVE(&evcon->requests, request, next);
-		request->evcon = NULL;
-
-		/* we might want to set an error here */
-		request->cb(request, request->cb_arg);
-		evhttp_request_free(request);
-	}
-}
-
-/*
- * Check if we got a valid response code.
- */
-
-static int
-evhttp_valid_response_code(int code)
-{
-	if (code == 0)
-		return (0);
-
-	return (1);
-}
-
-/* Parses the status line of a web server */
-
-static int
-evhttp_parse_response_line(struct evhttp_request *req, char *line)
-{
-	char *protocol;
-	char *number;
-	char *readable;
-
-	protocol = strsep(&line, " ");
-	if (line == NULL)
-		return (-1);
-	number = strsep(&line, " ");
-	if (line == NULL)
-		return (-1);
-	readable = line;
-
-	if (strcmp(protocol, "HTTP/1.0") == 0) {
-		req->major = 1;
-		req->minor = 0;
-	} else if (strcmp(protocol, "HTTP/1.1") == 0) {
-		req->major = 1;
-		req->minor = 1;
-	} else {
-		event_debug(("%s: bad protocol \"%s\"",
-			__func__, protocol));
-		return (-1);
-	}
-
-	req->response_code = atoi(number);
-	if (!evhttp_valid_response_code(req->response_code)) {
-		event_debug(("%s: bad response code \"%s\"",
-			__func__, number));
-		return (-1);
-	}
-
-	if ((req->response_code_line = strdup(readable)) == NULL)
-		event_err(1, "%s: strdup", __func__);
-
-	return (0);
-}
-
-/* Parse the first line of a HTTP request */
-
-static int
-evhttp_parse_request_line(struct evhttp_request *req, char *line)
-{
-	char *method;
-	char *uri;
-	char *version;
-
-	/* Parse the request line */
-	method = strsep(&line, " ");
-	if (line == NULL)
-		return (-1);
-	uri = strsep(&line, " ");
-	if (line == NULL)
-		return (-1);
-	version = strsep(&line, " ");
-	if (line != NULL)
-		return (-1);
-
-	/* First line */
-	if (strcmp(method, "GET") == 0) {
-		req->type = EVHTTP_REQ_GET;
-	} else if (strcmp(method, "POST") == 0) {
-		req->type = EVHTTP_REQ_POST;
-	} else if (strcmp(method, "HEAD") == 0) {
-		req->type = EVHTTP_REQ_HEAD;
-	} else {
-		event_debug(("%s: bad method %s on request %p from %s",
-			__func__, method, req, req->remote_host));
-		return (-1);
-	}
-
-	if (strcmp(version, "HTTP/1.0") == 0) {
-		req->major = 1;
-		req->minor = 0;
-	} else if (strcmp(version, "HTTP/1.1") == 0) {
-		req->major = 1;
-		req->minor = 1;
-	} else {
-		event_debug(("%s: bad version %s on request %p from %s",
-			__func__, version, req, req->remote_host));
-		return (-1);
-	}
-
-	if ((req->uri = strdup(uri)) == NULL) {
-		event_debug(("%s: evhttp_decode_uri", __func__));
-		return (-1);
-	}
-
-	/* determine if it's a proxy request */
-	if (strlen(req->uri) > 0 && req->uri[0] != '/')
-		req->flags |= EVHTTP_PROXY_REQUEST;
-
-	return (0);
-}
-
-const char *
-evhttp_find_header(const struct evkeyvalq *headers, const char *key)
-{
-	struct evkeyval *header;
-
-	TAILQ_FOREACH(header, headers, next) {
-		if (strcasecmp(header->key, key) == 0)
-			return (header->value);
-	}
-
-	return (NULL);
-}
-
-void
-evhttp_clear_headers(struct evkeyvalq *headers)
-{
-	struct evkeyval *header;
-
-	for (header = TAILQ_FIRST(headers);
-	    header != NULL;
-	    header = TAILQ_FIRST(headers)) {
-		TAILQ_REMOVE(headers, header, next);
-		free(header->key);
-		free(header->value);
-		free(header);
-	}
-}
-
-/*
- * Returns 0,  if the header was successfully removed.
- * Returns -1, if the header could not be found.
- */
-
-int
-evhttp_remove_header(struct evkeyvalq *headers, const char *key)
-{
-	struct evkeyval *header;
-
-	TAILQ_FOREACH(header, headers, next) {
-		if (strcasecmp(header->key, key) == 0)
-			break;
-	}
-
-	if (header == NULL)
-		return (-1);
-
-	/* Free and remove the header that we found */
-	TAILQ_REMOVE(headers, header, next);
-	free(header->key);
-	free(header->value);
-	free(header);
-
-	return (0);
-}
-
-static int
-evhttp_header_is_valid_value(const char *value)
-{
-	const char *p = value;
-
-	while ((p = strpbrk(p, "\r\n")) != NULL) {
-		/* we really expect only one new line */
-		p += strspn(p, "\r\n");
-		/* we expect a space or tab for continuation */
-		if (*p != ' ' && *p != '\t')
-			return (0);
-	}
-	return (1);
-}
-
-int
-evhttp_add_header(struct evkeyvalq *headers,
-    const char *key, const char *value)
-{
-	event_debug(("%s: key: %s val: %s\n", __func__, key, value));
-
-	if (strchr(key, '\r') != NULL || strchr(key, '\n') != NULL) {
-		/* drop illegal headers */
-		event_debug(("%s: dropping illegal header key\n", __func__));
-		return (-1);
-	}
-	
-	if (!evhttp_header_is_valid_value(value)) {
-		event_debug(("%s: dropping illegal header value\n", __func__));
-		return (-1);
-	}
-
-	return (evhttp_add_header_internal(headers, key, value));
-}
-
-static int
-evhttp_add_header_internal(struct evkeyvalq *headers,
-    const char *key, const char *value)
-{
-	struct evkeyval *header = calloc(1, sizeof(struct evkeyval));
-	if (header == NULL) {
-		event_warn("%s: calloc", __func__);
-		return (-1);
-	}
-	if ((header->key = strdup(key)) == NULL) {
-		free(header);
-		event_warn("%s: strdup", __func__);
-		return (-1);
-	}
-	if ((header->value = strdup(value)) == NULL) {
-		free(header->key);
-		free(header);
-		event_warn("%s: strdup", __func__);
-		return (-1);
-	}
-
-	TAILQ_INSERT_TAIL(headers, header, next);
-
-	return (0);
-}
-
-/*
- * Parses header lines from a request or a response into the specified
- * request object given an event buffer.
- *
- * Returns
- *   DATA_CORRUPTED      on error
- *   MORE_DATA_EXPECTED  when we need to read more headers
- *   ALL_DATA_READ       when all headers have been read.
- */
-
-enum message_read_status
-evhttp_parse_firstline(struct evhttp_request *req, struct evbuffer *buffer)
-{
-	char *line;
-	enum message_read_status status = ALL_DATA_READ;
-
-	line = evbuffer_readline(buffer);
-	if (line == NULL)
-		return (MORE_DATA_EXPECTED);
-
-	switch (req->kind) {
-	case EVHTTP_REQUEST:
-		if (evhttp_parse_request_line(req, line) == -1)
-			status = DATA_CORRUPTED;
-		break;
-	case EVHTTP_RESPONSE:
-		if (evhttp_parse_response_line(req, line) == -1)
-			status = DATA_CORRUPTED;
-		break;
-	default:
-		status = DATA_CORRUPTED;
-	}
-
-	free(line);
-	return (status);
-}
-
-static int
-evhttp_append_to_last_header(struct evkeyvalq *headers, const char *line)
-{
-	struct evkeyval *header = TAILQ_LAST(headers, evkeyvalq);
-	char *newval;
-	size_t old_len, line_len;
-
-	if (header == NULL)
-		return (-1);
-
-	old_len = strlen(header->value);
-	line_len = strlen(line);
-
-	newval = realloc(header->value, old_len + line_len + 1);
-	if (newval == NULL)
-		return (-1);
-
-	memcpy(newval + old_len, line, line_len + 1);
-	header->value = newval;
-
-	return (0);
-}
-
-enum message_read_status
-evhttp_parse_headers(struct evhttp_request *req, struct evbuffer* buffer)
-{
-	char *line;
-	enum message_read_status status = MORE_DATA_EXPECTED;
-
-	struct evkeyvalq* headers = req->input_headers;
-	while ((line = evbuffer_readline(buffer))
-	       != NULL) {
-		char *skey, *svalue;
-
-		if (*line == '\0') { /* Last header - Done */
-			status = ALL_DATA_READ;
-			free(line);
-			break;
-		}
-
-		/* Check if this is a continuation line */
-		if (*line == ' ' || *line == '\t') {
-			if (evhttp_append_to_last_header(headers, line) == -1)
-				goto error;
-			free(line);
-			continue;
-		}
-
-		/* Processing of header lines */
-		svalue = line;
-		skey = strsep(&svalue, ":");
-		if (svalue == NULL)
-			goto error;
-
-		svalue += strspn(svalue, " ");
-
-		if (evhttp_add_header(headers, skey, svalue) == -1)
-			goto error;
-
-		free(line);
-	}
-
-	return (status);
-
- error:
-	free(line);
-	return (DATA_CORRUPTED);
-}
-
-static int
-evhttp_get_body_length(struct evhttp_request *req)
-{
-	struct evkeyvalq *headers = req->input_headers;
-	const char *content_length;
-	const char *connection;
-
-	content_length = evhttp_find_header(headers, "Content-Length");
-	connection = evhttp_find_header(headers, "Connection");
-		
-	if (content_length == NULL && connection == NULL)
-		req->ntoread = -1;
-	else if (content_length == NULL &&
-	    strcasecmp(connection, "Close") != 0) {
-		/* Bad combination, we don't know when it will end */
-		event_warnx("%s: we got no content length, but the "
-		    "server wants to keep the connection open: %s.",
-		    __func__, connection);
-		return (-1);
-	} else if (content_length == NULL) {
-		req->ntoread = -1;
-	} else {
-		char *endp;
-		ev_int64_t ntoread = evutil_strtoll(content_length, &endp, 10);
-		if (*content_length == '\0' || *endp != '\0' || ntoread < 0) {
-			event_debug(("%s: illegal content length: %s",
-				__func__, content_length));
-			return (-1);
-		}
-		req->ntoread = ntoread;
-	}
-		
-	event_debug(("%s: bytes to read: %lld (in buffer %ld)\n",
-		__func__, req->ntoread,
-		EVBUFFER_LENGTH(req->evcon->input_buffer)));
-
-	return (0);
-}
-
-static void
-evhttp_get_body(struct evhttp_connection *evcon, struct evhttp_request *req)
-{
-	const char *xfer_enc;
-	
-	/* If this is a request without a body, then we are done */
-	if (req->kind == EVHTTP_REQUEST && req->type != EVHTTP_REQ_POST) {
-		evhttp_connection_done(evcon);
-		return;
-	}
-	evcon->state = EVCON_READING_BODY;
-	xfer_enc = evhttp_find_header(req->input_headers, "Transfer-Encoding");
-	if (xfer_enc != NULL && strcasecmp(xfer_enc, "chunked") == 0) {
-		req->chunked = 1;
-		req->ntoread = -1;
-	} else {
-		if (evhttp_get_body_length(req) == -1) {
-			evhttp_connection_fail(evcon,
-			    EVCON_HTTP_INVALID_HEADER);
-			return;
-		}
-	}
-	evhttp_read_body(evcon, req);
-}
-
-static void
-evhttp_read_firstline(struct evhttp_connection *evcon,
-		      struct evhttp_request *req)
-{
-	enum message_read_status res;
-
-	res = evhttp_parse_firstline(req, evcon->input_buffer);
-	if (res == DATA_CORRUPTED) {
-		/* Error while reading, terminate */
-		event_debug(("%s: bad header lines on %d\n",
-			__func__, evcon->fd));
-		evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-		return;
-	} else if (res == MORE_DATA_EXPECTED) {
-		/* Need more header lines */
-		evhttp_add_event(&evcon->ev, 
-                    evcon->timeout, HTTP_READ_TIMEOUT);
-		return;
-	}
-
-	evcon->state = EVCON_READING_HEADERS;
-	evhttp_read_header(evcon, req);
-}
-
-static void
-evhttp_read_header(struct evhttp_connection *evcon, struct evhttp_request *req)
-{
-	enum message_read_status res;
-	int fd = evcon->fd;
-
-	res = evhttp_parse_headers(req, evcon->input_buffer);
-	if (res == DATA_CORRUPTED) {
-		/* Error while reading, terminate */
-		event_debug(("%s: bad header lines on %d\n", __func__, fd));
-		evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-		return;
-	} else if (res == MORE_DATA_EXPECTED) {
-		/* Need more header lines */
-		evhttp_add_event(&evcon->ev, 
-		    evcon->timeout, HTTP_READ_TIMEOUT);
-		return;
-	}
-
-	/* Done reading headers, do the real work */
-	switch (req->kind) {
-	case EVHTTP_REQUEST:
-		event_debug(("%s: checking for post data on %d\n",
-				__func__, fd));
-		evhttp_get_body(evcon, req);
-		break;
-
-	case EVHTTP_RESPONSE:
-		if (req->response_code == HTTP_NOCONTENT ||
-		    req->response_code == HTTP_NOTMODIFIED ||
-		    (req->response_code >= 100 && req->response_code < 200)) {
-			event_debug(("%s: skipping body for code %d\n",
-					__func__, req->response_code));
-			evhttp_connection_done(evcon);
-		} else {
-			event_debug(("%s: start of read body for %s on %d\n",
-				__func__, req->remote_host, fd));
-			evhttp_get_body(evcon, req);
-		}
-		break;
-
-	default:
-		event_warnx("%s: bad header on %d", __func__, fd);
-		evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-		break;
-	}
-}
-
-/*
- * Creates a TCP connection to the specified port and executes a callback
- * when finished.  Failure or sucess is indicate by the passed connection
- * object.
- *
- * Although this interface accepts a hostname, it is intended to take
- * only numeric hostnames so that non-blocking DNS resolution can
- * happen elsewhere.
- */
-
-struct evhttp_connection *
-evhttp_connection_new(const char *address, unsigned short port)
-{
-	struct evhttp_connection *evcon = NULL;
-	
-	event_debug(("Attempting connection to %s:%d\n", address, port));
-
-	if ((evcon = calloc(1, sizeof(struct evhttp_connection))) == NULL) {
-		event_warn("%s: calloc failed", __func__);
-		goto error;
-	}
-
-	evcon->fd = -1;
-	evcon->port = port;
-
-	evcon->timeout = -1;
-	evcon->retry_cnt = evcon->retry_max = 0;
-
-	if ((evcon->address = strdup(address)) == NULL) {
-		event_warn("%s: strdup failed", __func__);
-		goto error;
-	}
-
-	if ((evcon->input_buffer = evbuffer_new()) == NULL) {
-		event_warn("%s: evbuffer_new failed", __func__);
-		goto error;
-	}
-
-	if ((evcon->output_buffer = evbuffer_new()) == NULL) {
-		event_warn("%s: evbuffer_new failed", __func__);
-		goto error;
-	}
-	
-	evcon->state = EVCON_DISCONNECTED;
-	TAILQ_INIT(&evcon->requests);
-
-	return (evcon);
-	
- error:
-	if (evcon != NULL)
-		evhttp_connection_free(evcon);
-	return (NULL);
-}
-
-void evhttp_connection_set_base(struct evhttp_connection *evcon,
-    struct event_base *base)
-{
-	assert(evcon->base == NULL);
-	assert(evcon->state == EVCON_DISCONNECTED);
-	evcon->base = base;
-}
-
-void
-evhttp_connection_set_timeout(struct evhttp_connection *evcon,
-    int timeout_in_secs)
-{
-	evcon->timeout = timeout_in_secs;
-}
-
-void
-evhttp_connection_set_retries(struct evhttp_connection *evcon,
-    int retry_max)
-{
-	evcon->retry_max = retry_max;
-}
-
-void
-evhttp_connection_set_closecb(struct evhttp_connection *evcon,
-    void (*cb)(struct evhttp_connection *, void *), void *cbarg)
-{
-	evcon->closecb = cb;
-	evcon->closecb_arg = cbarg;
-}
-
-void
-evhttp_connection_get_peer(struct evhttp_connection *evcon,
-    char **address, u_short *port)
-{
-	*address = evcon->address;
-	*port = evcon->port;
-}
-
-int
-evhttp_connection_connect(struct evhttp_connection *evcon)
-{
-	if (evcon->state == EVCON_CONNECTING)
-		return (0);
-	
-	evhttp_connection_reset(evcon);
-
-	assert(!(evcon->flags & EVHTTP_CON_INCOMING));
-	evcon->flags |= EVHTTP_CON_OUTGOING;
-	
-	evcon->fd = bind_socket(
-		evcon->bind_address, evcon->bind_port, 0 /*reuse*/);
-	if (evcon->fd == -1) {
-		event_debug(("%s: failed to bind to \"%s\"",
-			__func__, evcon->bind_address));
-		return (-1);
-	}
-
-	if (socket_connect(evcon->fd, evcon->address, evcon->port) == -1) {
-		EVUTIL_CLOSESOCKET(evcon->fd); evcon->fd = -1;
-		return (-1);
-	}
-
-	/* Set up a callback for successful connection setup */
-	event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_connectioncb, evcon);
-	EVHTTP_BASE_SET(evcon, &evcon->ev);
-	evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_CONNECT_TIMEOUT);
-
-	evcon->state = EVCON_CONNECTING;
-	
-	return (0);
-}
-
-/*
- * Starts an HTTP request on the provided evhttp_connection object.
- * If the connection object is not connected to the web server already,
- * this will start the connection.
- */
-
-int
-evhttp_make_request(struct evhttp_connection *evcon,
-    struct evhttp_request *req,
-    enum evhttp_cmd_type type, const char *uri)
-{
-	/* We are making a request */
-	req->kind = EVHTTP_REQUEST;
-	req->type = type;
-	if (req->uri != NULL)
-		free(req->uri);
-	if ((req->uri = strdup(uri)) == NULL)
-		event_err(1, "%s: strdup", __func__);
-
-	/* Set the protocol version if it is not supplied */
-	if (!req->major && !req->minor) {
-		req->major = 1;
-		req->minor = 1;
-	}
-	
-	assert(req->evcon == NULL);
-	req->evcon = evcon;
-	assert(!(req->flags & EVHTTP_REQ_OWN_CONNECTION));
-	
-	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
-
-	/* If the connection object is not connected; make it so */
-	if (!evhttp_connected(evcon))
-		return (evhttp_connection_connect(evcon));
-
-	/*
-	 * If it's connected already and we are the first in the queue,
-	 * then we can dispatch this request immediately.  Otherwise, it
-	 * will be dispatched once the pending requests are completed.
-	 */
-	if (TAILQ_FIRST(&evcon->requests) == req)
-		evhttp_request_dispatch(evcon);
-
-	return (0);
-}
-
-/*
- * Reads data from file descriptor into request structure
- * Request structure needs to be set up correctly.
- */
-
-void
-evhttp_start_read(struct evhttp_connection *evcon)
-{
-	/* Set up an event to read the headers */
-	if (event_initialized(&evcon->ev))
-		event_del(&evcon->ev);
-	event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read, evcon);
-	EVHTTP_BASE_SET(evcon, &evcon->ev);
-	
-	evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT);
-	evcon->state = EVCON_READING_FIRSTLINE;
-}
-
-static void
-evhttp_send_done(struct evhttp_connection *evcon, void *arg)
-{
-	int need_close;
-	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-	TAILQ_REMOVE(&evcon->requests, req, next);
-
-	/* delete possible close detection events */
-	evhttp_connection_stop_detectclose(evcon);
-	
-	need_close =
-	    (req->minor == 0 &&
-		!evhttp_is_connection_keepalive(req->input_headers))||
-	    evhttp_is_connection_close(req->flags, req->input_headers) ||
-	    evhttp_is_connection_close(req->flags, req->output_headers);
-
-	assert(req->flags & EVHTTP_REQ_OWN_CONNECTION);
-	evhttp_request_free(req);
-
-	if (need_close) {
-		evhttp_connection_free(evcon);
-		return;
-	} 
-
-	/* we have a persistent connection; try to accept another request. */
-	if (evhttp_associate_new_request_with_connection(evcon) == -1)
-		evhttp_connection_free(evcon);
-}
-
-/*
- * Returns an error page.
- */
-
-void
-evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
-{
-#define ERR_FORMAT "<HTML><HEAD>\n" \
-	    "<TITLE>%d %s</TITLE>\n" \
-	    "</HEAD><BODY>\n" \
-	    "<H1>Method Not Implemented</H1>\n" \
-	    "Invalid method in request<P>\n" \
-	    "</BODY></HTML>\n"
-
-	struct evbuffer *buf = evbuffer_new();
-
-	/* close the connection on error */
-	evhttp_add_header(req->output_headers, "Connection", "close");
-
-	evhttp_response_code(req, error, reason);
-
-	evbuffer_add_printf(buf, ERR_FORMAT, error, reason);
-
-	evhttp_send_page(req, buf);
-
-	evbuffer_free(buf);
-#undef ERR_FORMAT
-}
-
-/* Requires that headers and response code are already set up */
-
-static inline void
-evhttp_send(struct evhttp_request *req, struct evbuffer *databuf)
-{
-	struct evhttp_connection *evcon = req->evcon;
-
-	assert(TAILQ_FIRST(&evcon->requests) == req);
-
-	/* xxx: not sure if we really should expose the data buffer this way */
-	if (databuf != NULL)
-		evbuffer_add_buffer(req->output_buffer, databuf);
-	
-	/* Adds headers to the response */
-	evhttp_make_header(evcon, req);
-
-	evhttp_write_buffer(evcon, evhttp_send_done, NULL);
-}
-
-void
-evhttp_send_reply(struct evhttp_request *req, int code, const char *reason,
-    struct evbuffer *databuf)
-{
-	evhttp_response_code(req, code, reason);
-	
-	evhttp_send(req, databuf);
-}
-
-void
-evhttp_send_reply_start(struct evhttp_request *req, int code,
-    const char *reason)
-{
-	evhttp_response_code(req, code, reason);
-	if (req->major == 1 && req->minor == 1) {
-		/* use chunked encoding for HTTP/1.1 */
-		evhttp_add_header(req->output_headers, "Transfer-Encoding",
-		    "chunked");
-		req->chunked = 1;
-	}
-	evhttp_make_header(req->evcon, req);
-	evhttp_write_buffer(req->evcon, NULL, NULL);
-}
-
-void
-evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf)
-{
-	if (req->chunked) {
-		evbuffer_add_printf(req->evcon->output_buffer, "%x\r\n",
-				    (unsigned)EVBUFFER_LENGTH(databuf));
-	}
-	evbuffer_add_buffer(req->evcon->output_buffer, databuf);
-	if (req->chunked) {
-		evbuffer_add(req->evcon->output_buffer, "\r\n", 2);
-	}
-	evhttp_write_buffer(req->evcon, NULL, NULL);
-}
-
-void
-evhttp_send_reply_end(struct evhttp_request *req)
-{
-	struct evhttp_connection *evcon = req->evcon;
-
-	if (req->chunked) {
-		evbuffer_add(req->evcon->output_buffer, "0\r\n\r\n", 5);
-		evhttp_write_buffer(req->evcon, evhttp_send_done, NULL);
-		req->chunked = 0;
-	} else if (!event_pending(&evcon->ev, EV_WRITE|EV_TIMEOUT, NULL)) {
-		/* let the connection know that we are done with the request */
-		evhttp_send_done(evcon, NULL);
-	} else {
-		/* make the callback execute after all data has been written */
-		evcon->cb = evhttp_send_done;
-		evcon->cb_arg = NULL;
-	}
-}
-
-void
-evhttp_response_code(struct evhttp_request *req, int code, const char *reason)
-{
-	req->kind = EVHTTP_RESPONSE;
-	req->response_code = code;
-	if (req->response_code_line != NULL)
-		free(req->response_code_line);
-	req->response_code_line = strdup(reason);
-}
-
-void
-evhttp_send_page(struct evhttp_request *req, struct evbuffer *databuf)
-{
-	if (!req->major || !req->minor) {
-		req->major = 1;
-		req->minor = 1;
-	}
-	
-	if (req->kind != EVHTTP_RESPONSE)
-		evhttp_response_code(req, 200, "OK");
-
-	evhttp_clear_headers(req->output_headers);
-	evhttp_add_header(req->output_headers, "Content-Type", "text/html");
-	evhttp_add_header(req->output_headers, "Connection", "close");
-
-	evhttp_send(req, databuf);
-}
-
-static const char uri_chars[256] = {
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1, 0, 0, 1, 0, 0, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 0, 0, 1, 0, 0,
-	/* 64 */
-	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 0, 0, 0, 0, 1,
-	0, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 0, 0, 0, 1, 0,
-	/* 128 */
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	/* 192 */
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-/*
- * Helper functions to encode/decode a URI.
- * The returned string must be freed by the caller.
- */
-char *
-evhttp_encode_uri(const char *uri)
-{
-	struct evbuffer *buf = evbuffer_new();
-	char *p;
-
-	for (p = (char *)uri; *p != '\0'; p++) {
-		if (uri_chars[(u_char)(*p)]) {
-			evbuffer_add(buf, p, 1);
-		} else {
-			evbuffer_add_printf(buf, "%%%02X", (u_char)(*p));
-		}
-	}
-	evbuffer_add(buf, "", 1);
-	p = strdup((char *)EVBUFFER_DATA(buf));
-	evbuffer_free(buf);
-	
-	return (p);
-}
-
-/*
- * @param always_decode_plus: when true we transform plus to space even
- *     if we have not seen a ?.
- */
-static int
-evhttp_decode_uri_internal(
-	const char *uri, size_t length, char *ret, int always_decode_plus)
-{
-	char c;
-	int i, j, in_query = always_decode_plus;
-	
-	for (i = j = 0; uri[i] != '\0'; i++) {
-		c = uri[i];
-		if (c == '?') {
-			in_query = 1;
-		} else if (c == '+' && in_query) {
-			c = ' ';
-		} else if (c == '%' && isxdigit((unsigned char)uri[i+1]) &&
-		    isxdigit((unsigned char)uri[i+2])) {
-			char tmp[] = { uri[i+1], uri[i+2], '\0' };
-			c = (char)strtol(tmp, NULL, 16);
-			i += 2;
-		}
-		ret[j++] = c;
-	}
-	ret[j] = '\0';
-
-	return (j);
-}
-
-char *
-evhttp_decode_uri(const char *uri)
-{
-	char *ret;
-
-	if ((ret = malloc(strlen(uri) + 1)) == NULL)
-		event_err(1, "%s: malloc(%lu)", __func__,
-			  (unsigned long)(strlen(uri) + 1));
-
-	evhttp_decode_uri_internal(uri, strlen(uri),
-	    ret, 0 /*always_decode_plus*/);
-
-	return (ret);
-}
-
-/* 
- * Helper function to parse out arguments in a query.
- * The arguments are separated by key and value.
- */
-
-void
-evhttp_parse_query(const char *uri, struct evkeyvalq *headers)
-{
-	char *line;
-	char *argument;
-	char *p;
-
-	TAILQ_INIT(headers);
-
-	/* No arguments - we are done */
-	if (strchr(uri, '?') == NULL)
-		return;
-
-	if ((line = strdup(uri)) == NULL)
-		event_err(1, "%s: strdup", __func__);
-
-
-	argument = line;
-
-	/* We already know that there has to be a ? */
-	strsep(&argument, "?");
-
-	p = argument;
-	while (p != NULL && *p != '\0') {
-		char *key, *value, *decoded_value;
-		argument = strsep(&p, "&");
-
-		value = argument;
-		key = strsep(&value, "=");
-		if (value == NULL)
-			goto error;
-
-		if ((decoded_value = malloc(strlen(value) + 1)) == NULL)
-			event_err(1, "%s: malloc", __func__);
-
-		evhttp_decode_uri_internal(value, strlen(value),
-		    decoded_value, 1 /*always_decode_plus*/);
-		event_debug(("Query Param: %s -> %s\n", key, decoded_value));
-		evhttp_add_header_internal(headers, key, decoded_value);
-		free(decoded_value);
-	}
-
- error:
-	free(line);
-}
-
-static struct evhttp_cb *
-evhttp_dispatch_callback(struct httpcbq *callbacks, struct evhttp_request *req)
-{
-	struct evhttp_cb *cb;
-	size_t offset = 0;
-
-	/* Test for different URLs */
-	char *p = strchr(req->uri, '?');
-	if (p != NULL)
-		offset = (size_t)(p - req->uri);
-
-	TAILQ_FOREACH(cb, callbacks, next) {
-		int res = 0;
-		if (p == NULL) {
-			res = strcmp(cb->what, req->uri) == 0;
-		} else {
-			res = ((strncmp(cb->what, req->uri, offset) == 0) &&
-					(cb->what[offset] == '\0'));
-		}
-
-		if (res)
-			return (cb);
-	}
-
-	return (NULL);
-}
-
-static void
-evhttp_handle_request(struct evhttp_request *req, void *arg)
-{
-	struct evhttp *http = arg;
-	struct evhttp_cb *cb = NULL;
-
-	if (req->uri == NULL) {
-		evhttp_send_error(req, HTTP_BADREQUEST, "Bad Request");
-		return;
-	}
-
-	if ((cb = evhttp_dispatch_callback(&http->callbacks, req)) != NULL) {
-		(*cb->cb)(req, cb->cbarg);
-		return;
-	}
-
-	/* Generic call back */
-	if (http->gencb) {
-		(*http->gencb)(req, http->gencbarg);
-		return;
-	} else {
-		/* We need to send a 404 here */
-#define ERR_FORMAT "<html><head>" \
-		    "<title>404 Not Found</title>" \
-		    "</head><body>" \
-		    "<h1>Not Found</h1>" \
-		    "<p>The requested URL %s was not found on this server.</p>"\
-		    "</body></html>\n"
-
-		char *escaped_html = evhttp_htmlescape(req->uri);
-		struct evbuffer *buf = evbuffer_new();
-
-		evhttp_response_code(req, HTTP_NOTFOUND, "Not Found");
-
-		evbuffer_add_printf(buf, ERR_FORMAT, escaped_html);
-
-		free(escaped_html);
-
-		evhttp_send_page(req, buf);
-
-		evbuffer_free(buf);
-#undef ERR_FORMAT
-	}
-}
-
-static void
-accept_socket(int fd, short what, void *arg)
-{
-	struct evhttp *http = arg;
-	struct sockaddr_storage ss;
-	socklen_t addrlen = sizeof(ss);
-	int nfd;
-
-	if ((nfd = accept(fd, (struct sockaddr *)&ss, &addrlen)) == -1) {
-		if (errno != EAGAIN && errno != EINTR)
-			event_warn("%s: bad accept", __func__);
-		return;
-	}
-	if (evutil_make_socket_nonblocking(nfd) < 0)
-		return;
-
-	evhttp_get_request(http, nfd, (struct sockaddr *)&ss, addrlen);
-}
-
-int
-evhttp_bind_socket(struct evhttp *http, const char *address, u_short port)
-{
-	int fd;
-	int res;
-
-	if ((fd = bind_socket(address, port, 1 /*reuse*/)) == -1)
-		return (-1);
-
-	if (listen(fd, 128) == -1) {
-		event_warn("%s: listen", __func__);
-		EVUTIL_CLOSESOCKET(fd);
-		return (-1);
-	}
-
-	res = evhttp_accept_socket(http, fd);
-	
-	if (res != -1)
-		event_debug(("Bound to port %d - Awaiting connections ... ",
-			port));
-
-	return (res);
-}
-
-int
-evhttp_accept_socket(struct evhttp *http, int fd)
-{
-	struct evhttp_bound_socket *bound;
-	struct event *ev;
-	int res;
-
-	bound = malloc(sizeof(struct evhttp_bound_socket));
-	if (bound == NULL)
-		return (-1);
-
-	ev = &bound->bind_ev;
-
-	/* Schedule the socket for accepting */
-	event_set(ev, fd, EV_READ | EV_PERSIST, accept_socket, http);
-	EVHTTP_BASE_SET(http, ev);
-
-	res = event_add(ev, NULL);
-
-	if (res == -1) {
-		free(bound);
-		return (-1);
-	}
-
-	TAILQ_INSERT_TAIL(&http->sockets, bound, next);
-
-	return (0);
-}
-
-static struct evhttp*
-evhttp_new_object(void)
-{
-	struct evhttp *http = NULL;
-
-	if ((http = calloc(1, sizeof(struct evhttp))) == NULL) {
-		event_warn("%s: calloc", __func__);
-		return (NULL);
-	}
-
-	http->timeout = -1;
-
-	TAILQ_INIT(&http->sockets);
-	TAILQ_INIT(&http->callbacks);
-	TAILQ_INIT(&http->connections);
-
-	return (http);
-}
-
-struct evhttp *
-evhttp_new(struct event_base *base)
-{
-	struct evhttp *http = evhttp_new_object();
-
-	http->base = base;
-
-	return (http);
-}
-
-/*
- * Start a web server on the specified address and port.
- */
-
-struct evhttp *
-evhttp_start(const char *address, u_short port)
-{
-	struct evhttp *http = evhttp_new_object();
-
-	if (evhttp_bind_socket(http, address, port) == -1) {
-		free(http);
-		return (NULL);
-	}
-
-	return (http);
-}
-
-void
-evhttp_free(struct evhttp* http)
-{
-	struct evhttp_cb *http_cb;
-	struct evhttp_connection *evcon;
-	struct evhttp_bound_socket *bound;
-	int fd;
-
-	/* Remove the accepting part */
-	while ((bound = TAILQ_FIRST(&http->sockets)) != NULL) {
-		TAILQ_REMOVE(&http->sockets, bound, next);
-
-		fd = bound->bind_ev.ev_fd;
-		event_del(&bound->bind_ev);
-		EVUTIL_CLOSESOCKET(fd);
-
-		free(bound);
-	}
-
-	while ((evcon = TAILQ_FIRST(&http->connections)) != NULL) {
-		/* evhttp_connection_free removes the connection */
-		evhttp_connection_free(evcon);
-	}
-
-	while ((http_cb = TAILQ_FIRST(&http->callbacks)) != NULL) {
-		TAILQ_REMOVE(&http->callbacks, http_cb, next);
-		free(http_cb->what);
-		free(http_cb);
-	}
-	
-	free(http);
-}
-
-void
-evhttp_set_timeout(struct evhttp* http, int timeout_in_secs)
-{
-	http->timeout = timeout_in_secs;
-}
-
-void
-evhttp_set_cb(struct evhttp *http, const char *uri,
-    void (*cb)(struct evhttp_request *, void *), void *cbarg)
-{
-	struct evhttp_cb *http_cb;
-
-	if ((http_cb = calloc(1, sizeof(struct evhttp_cb))) == NULL)
-		event_err(1, "%s: calloc", __func__);
-
-	http_cb->what = strdup(uri);
-
-#ifdef INNODB_CHANGED
-	if (http_cb->what == NULL) {
-		free(http_cb);
-		event_err(1, "%s: strdup",__func__);
-       }
-#endif
-
-	http_cb->cb = cb;
-	http_cb->cbarg = cbarg;
-
-	TAILQ_INSERT_TAIL(&http->callbacks, http_cb, next);
-}
-
-int
-evhttp_del_cb(struct evhttp *http, const char *uri)
-{
-	struct evhttp_cb *http_cb;
-
-	TAILQ_FOREACH(http_cb, &http->callbacks, next) {
-		if (strcmp(http_cb->what, uri) == 0)
-			break;
-	}
-	if (http_cb == NULL)
-		return (-1);
-
-	TAILQ_REMOVE(&http->callbacks, http_cb, next);
-	free(http_cb->what);
-	free(http_cb);
-
-	return (0);
-}
-
-void
-evhttp_set_gencb(struct evhttp *http,
-    void (*cb)(struct evhttp_request *, void *), void *cbarg)
-{
-	http->gencb = cb;
-	http->gencbarg = cbarg;
-}
-
-/*
- * Request related functions
- */
-
-struct evhttp_request *
-evhttp_request_new(void (*cb)(struct evhttp_request *, void *), void *arg)
-{
-	struct evhttp_request *req = NULL;
-
-	/* Allocate request structure */
-	if ((req = calloc(1, sizeof(struct evhttp_request))) == NULL) {
-		event_warn("%s: calloc", __func__);
-		goto error;
-	}
-
-	req->kind = EVHTTP_RESPONSE;
-	req->input_headers = calloc(1, sizeof(struct evkeyvalq));
-	if (req->input_headers == NULL) {
-		event_warn("%s: calloc", __func__);
-		goto error;
-	}
-	TAILQ_INIT(req->input_headers);
-
-	req->output_headers = calloc(1, sizeof(struct evkeyvalq));
-	if (req->output_headers == NULL) {
-		event_warn("%s: calloc", __func__);
-		goto error;
-	}
-	TAILQ_INIT(req->output_headers);
-
-	if ((req->input_buffer = evbuffer_new()) == NULL) {
-		event_warn("%s: evbuffer_new", __func__);
-		goto error;
-	}
-
-	if ((req->output_buffer = evbuffer_new()) == NULL) {
-		event_warn("%s: evbuffer_new", __func__);
-		goto error;
-	}
-
-	req->cb = cb;
-	req->cb_arg = arg;
-
-	return (req);
-
- error:
-	if (req != NULL)
-		evhttp_request_free(req);
-	return (NULL);
-}
-
-void
-evhttp_request_free(struct evhttp_request *req)
-{
-	if (req->remote_host != NULL)
-		free(req->remote_host);
-	if (req->uri != NULL)
-		free(req->uri);
-	if (req->response_code_line != NULL)
-		free(req->response_code_line);
-
-	evhttp_clear_headers(req->input_headers);
-	free(req->input_headers);
-
-	evhttp_clear_headers(req->output_headers);
-	free(req->output_headers);
-
-	if (req->input_buffer != NULL)
-		evbuffer_free(req->input_buffer);
-
-	if (req->output_buffer != NULL)
-		evbuffer_free(req->output_buffer);
-
-	free(req);
-}
-
-void
-evhttp_request_set_chunked_cb(struct evhttp_request *req,
-    void (*cb)(struct evhttp_request *, void *))
-{
-	req->chunk_cb = cb;
-}
-
-/*
- * Allows for inspection of the request URI
- */
-
-const char *
-evhttp_request_uri(struct evhttp_request *req) {
-	if (req->uri == NULL)
-		event_debug(("%s: request %p has no uri\n", __func__, req));
-	return (req->uri);
-}
-
-/*
- * Takes a file descriptor to read a request from.
- * The callback is executed once the whole request has been read.
- */
-
-static struct evhttp_connection*
-evhttp_get_request_connection(
-	struct evhttp* http,
-	int fd, struct sockaddr *sa, socklen_t salen)
-{
-	struct evhttp_connection *evcon;
-	char *hostname = NULL, *portname = NULL;
-
-	name_from_addr(sa, salen, &hostname, &portname);
-	if (hostname == NULL || portname == NULL) {
-		if (hostname) free(hostname);
-		if (portname) free(portname);
-		return (NULL);
-	}
-
-	event_debug(("%s: new request from %s:%s on %d\n",
-			__func__, hostname, portname, fd));
-
-	/* we need a connection object to put the http request on */
-	evcon = evhttp_connection_new(hostname, atoi(portname));
-	free(hostname);
-	free(portname);
-	if (evcon == NULL)
-		return (NULL);
-
-	/* associate the base if we have one*/
-	evhttp_connection_set_base(evcon, http->base);
-
-	evcon->flags |= EVHTTP_CON_INCOMING;
-	evcon->state = EVCON_READING_FIRSTLINE;
-	
-	evcon->fd = fd;
-
-	return (evcon);
-}
-
-static int
-evhttp_associate_new_request_with_connection(struct evhttp_connection *evcon)
-{
-	struct evhttp *http = evcon->http_server;
-	struct evhttp_request *req;
-	if ((req = evhttp_request_new(evhttp_handle_request, http)) == NULL)
-		return (-1);
-
-	req->evcon = evcon;	/* the request ends up owning the connection */
-	req->flags |= EVHTTP_REQ_OWN_CONNECTION;
-	
-	TAILQ_INSERT_TAIL(&evcon->requests, req, next);
-	
-	req->kind = EVHTTP_REQUEST;
-	
-	if ((req->remote_host = strdup(evcon->address)) == NULL)
-		event_err(1, "%s: strdup", __func__);
-	req->remote_port = evcon->port;
-
-	evhttp_start_read(evcon);
-	
-	return (0);
-}
-
-void
-evhttp_get_request(struct evhttp *http, int fd,
-    struct sockaddr *sa, socklen_t salen)
-{
-	struct evhttp_connection *evcon;
-
-	evcon = evhttp_get_request_connection(http, fd, sa, salen);
-	if (evcon == NULL)
-		return;
-
-	/* the timeout can be used by the server to close idle connections */
-	if (http->timeout != -1)
-		evhttp_connection_set_timeout(evcon, http->timeout);
-
-	/* 
-	 * if we want to accept more than one request on a connection,
-	 * we need to know which http server it belongs to.
-	 */
-	evcon->http_server = http;
-	TAILQ_INSERT_TAIL(&http->connections, evcon, next);
-	
-	if (evhttp_associate_new_request_with_connection(evcon) == -1)
-		evhttp_connection_free(evcon);
-}
-
-
-/*
- * Network helper functions that we do not want to export to the rest of
- * the world.
- */
-#if 0 /* Unused */
-static struct addrinfo *
-addr_from_name(char *address)
-{
-#ifdef HAVE_GETADDRINFO
-        struct addrinfo ai, *aitop;
-        int ai_result;
-
-        memset(&ai, 0, sizeof(ai));
-        ai.ai_family = AF_INET;
-        ai.ai_socktype = SOCK_RAW;
-        ai.ai_flags = 0;
-        if ((ai_result = getaddrinfo(address, NULL, &ai, &aitop)) != 0) {
-                if ( ai_result == EAI_SYSTEM )
-                        event_warn("getaddrinfo");
-                else
-                        event_warnx("getaddrinfo: %s", gai_strerror(ai_result));
-        }
-
-	return (aitop);
-#else
-	assert(0);
-	return NULL; /* XXXXX Use gethostbyname, if this function is ever used. */
-#endif
-}
-#endif
-
-static void
-name_from_addr(struct sockaddr *sa, socklen_t salen,
-    char **phost, char **pport)
-{
-	char ntop[NI_MAXHOST];
-	char strport[NI_MAXSERV];
-	int ni_result;
-
-#ifdef HAVE_GETNAMEINFO
-	ni_result = getnameinfo(sa, salen,
-		ntop, sizeof(ntop), strport, sizeof(strport),
-		NI_NUMERICHOST|NI_NUMERICSERV);
-	
-	if (ni_result != 0) {
-		if (ni_result == EAI_SYSTEM)
-			event_err(1, "getnameinfo failed");
-		else
-			event_errx(1, "getnameinfo failed: %s", gai_strerror(ni_result));
-		return;
-	}
-#else
-	ni_result = fake_getnameinfo(sa, salen,
-		ntop, sizeof(ntop), strport, sizeof(strport),
-		NI_NUMERICHOST|NI_NUMERICSERV);
-	if (ni_result != 0)
-			return;
-#endif
-	*phost = strdup(ntop);
-	*pport = strdup(strport);
-}
-
-/* Create a non-blocking socket and bind it */
-/* todo: rename this function */
-static int
-bind_socket_ai(struct addrinfo *ai, int reuse)
-{
-        int fd, on = 1, r;
-	int serrno;
-
-        /* Create listen socket */
-        fd = socket(AF_INET, SOCK_STREAM, 0);
-        if (fd == -1) {
-                event_warn("socket");
-                return (-1);
-        }
-
-        if (evutil_make_socket_nonblocking(fd) < 0)
-                goto out;
-
-#ifndef WIN32
-        if (fcntl(fd, F_SETFD, 1) == -1) {
-                event_warn("fcntl(F_SETFD)");
-                goto out;
-        }
-#endif
-
-        setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on));
-	if (reuse) {
-		setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-		    (void *)&on, sizeof(on));
-	}
-
-	if (ai != NULL) {
-		r = bind(fd, ai->ai_addr, ai->ai_addrlen);
-		if (r == -1)
-			goto out;
-	}
-
-	return (fd);
-
- out:
-	serrno = EVUTIL_SOCKET_ERROR();
-	EVUTIL_CLOSESOCKET(fd);
-	EVUTIL_SET_SOCKET_ERROR(serrno);
-	return (-1);
-}
-
-static struct addrinfo *
-make_addrinfo(const char *address, u_short port)
-{
-        struct addrinfo *aitop = NULL;
-
-#ifdef HAVE_GETADDRINFO
-        struct addrinfo ai;
-        char strport[NI_MAXSERV];
-        int ai_result;
-
-        memset(&ai, 0, sizeof(ai));
-        ai.ai_family = AF_INET;
-        ai.ai_socktype = SOCK_STREAM;
-        ai.ai_flags = AI_PASSIVE;  /* turn NULL host name into INADDR_ANY */
-        evutil_snprintf(strport, sizeof(strport), "%d", port);
-        if ((ai_result = getaddrinfo(address, strport, &ai, &aitop)) != 0) {
-                if ( ai_result == EAI_SYSTEM )
-                        event_warn("getaddrinfo");
-                else
-                        event_warnx("getaddrinfo: %s", gai_strerror(ai_result));
-		return (NULL);
-        }
-#else
-	static int cur;
-	static struct addrinfo ai[2]; /* We will be returning the address of some of this memory so it has to last even after this call. */
-	if (++cur == 2) cur = 0;   /* allow calling this function twice */
-
-	if (fake_getaddrinfo(address, &ai[cur]) < 0) {
-		event_warn("fake_getaddrinfo");
-		return (NULL);
-	}
-	aitop = &ai[cur];
-	((struct sockaddr_in *) aitop->ai_addr)->sin_port = htons(port);
-#endif
-
-	return (aitop);
-}
-
-static int
-bind_socket(const char *address, u_short port, int reuse)
-{
-	int fd;
-	struct addrinfo *aitop = NULL;
-
-	/* just create an unbound socket */
-	if (address == NULL && port == 0)
-		return bind_socket_ai(NULL, 0);
-		
-	aitop = make_addrinfo(address, port);
-
-	if (aitop == NULL)
-		return (-1);
-
-	fd = bind_socket_ai(aitop, reuse);
-
-#ifdef HAVE_GETADDRINFO
-	freeaddrinfo(aitop);
-#else
-	fake_freeaddrinfo(aitop);
-#endif
-
-	return (fd);
-}
-
-static int
-socket_connect(int fd, const char *address, unsigned short port)
-{
-	struct addrinfo *ai = make_addrinfo(address, port);
-	int res = -1;
-
-	if (ai == NULL) {
-		event_debug(("%s: make_addrinfo: \"%s:%d\"",
-			__func__, address, port));
-		return (-1);
-	}
-
-	if (connect(fd, ai->ai_addr, ai->ai_addrlen) == -1) {
-#ifdef WIN32
-		int tmp_error = WSAGetLastError();
-		if (tmp_error != WSAEWOULDBLOCK && tmp_error != WSAEINVAL &&
-		    tmp_error != WSAEINPROGRESS) {
-			goto out;
-		}
-#else
-		if (errno != EINPROGRESS) {
-			goto out;
-		}
-#endif
-	}
-
-	/* everything is fine */
-	res = 0;
-
-out:
-#ifdef HAVE_GETADDRINFO
-	freeaddrinfo(ai);
-#else
-	fake_freeaddrinfo(ai);
-#endif
-
-	return (res);
-}
diff --git a/libevent/kqueue.c b/libevent/kqueue.c
deleted file mode 100644
index 36eebe5fc6e0..000000000000
--- a/libevent/kqueue.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*	$OpenBSD: kqueue.c,v 1.5 2002/07/10 14:41:31 art Exp $	*/
-
-/*
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#include <sys/queue.h>
-#include <sys/event.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-/* Some platforms apparently define the udata field of struct kevent as
- * intptr_t, whereas others define it as void*.  There doesn't seem to be an
- * easy way to tell them apart via autoconf, so we need to use OS macros. */
-#if defined(HAVE_INTTYPES_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__darwin__) && !defined(__APPLE__)
-#define PTR_TO_UDATA(x)	((intptr_t)(x))
-#else
-#define PTR_TO_UDATA(x)	(x)
-#endif
-
-#include "event.h"
-#include "event-internal.h"
-#include "log.h"
-#include "event-internal.h"
-
-#define EVLIST_X_KQINKERNEL	0x1000
-
-#define NEVENT		64
-
-struct kqop {
-	struct kevent *changes;
-	int nchanges;
-	struct kevent *events;
-	struct event_list evsigevents[NSIG];
-	int nevents;
-	int kq;
-	pid_t pid;
-};
-
-static void *kq_init	(struct event_base *);
-static int kq_add	(void *, struct event *);
-static int kq_del	(void *, struct event *);
-static int kq_dispatch	(struct event_base *, void *, struct timeval *);
-static int kq_insert	(struct kqop *, struct kevent *);
-static void kq_dealloc (struct event_base *, void *);
-
-const struct eventop kqops = {
-	"kqueue",
-	kq_init,
-	kq_add,
-	kq_del,
-	kq_dispatch,
-	kq_dealloc,
-	1 /* need reinit */
-};
-
-static void *
-kq_init(struct event_base *base)
-{
-	int i, kq;
-	struct kqop *kqueueop;
-
-	/* Disable kqueue when this environment variable is set */
-	if (getenv("EVENT_NOKQUEUE"))
-		return (NULL);
-
-	if (!(kqueueop = calloc(1, sizeof(struct kqop))))
-		return (NULL);
-
-	/* Initalize the kernel queue */
-	
-	if ((kq = kqueue()) == -1) {
-		event_warn("kqueue");
-		free (kqueueop);
-		return (NULL);
-	}
-
-	kqueueop->kq = kq;
-
-	kqueueop->pid = getpid();
-
-	/* Initalize fields */
-	kqueueop->changes = malloc(NEVENT * sizeof(struct kevent));
-	if (kqueueop->changes == NULL) {
-		free (kqueueop);
-		return (NULL);
-	}
-	kqueueop->events = malloc(NEVENT * sizeof(struct kevent));
-	if (kqueueop->events == NULL) {
-		free (kqueueop->changes);
-		free (kqueueop);
-		return (NULL);
-	}
-	kqueueop->nevents = NEVENT;
-
-	/* we need to keep track of multiple events per signal */
-	for (i = 0; i < NSIG; ++i) {
-		TAILQ_INIT(&kqueueop->evsigevents[i]);
-	}
-
-	/* Check for Mac OS X kqueue bug. */
-	kqueueop->changes[0].ident = -1;
-	kqueueop->changes[0].filter = EVFILT_READ;
-	kqueueop->changes[0].flags = EV_ADD;
-	/* 
-	 * If kqueue works, then kevent will succeed, and it will
-	 * stick an error in events[0].  If kqueue is broken, then
-	 * kevent will fail.
-	 */
-	if (kevent(kq,
-		kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 ||
-	    kqueueop->events[0].ident != -1 ||
-	    kqueueop->events[0].flags != EV_ERROR) {
-		event_warn("%s: detected broken kqueue; not using.", __func__);
-		free(kqueueop->changes);
-		free(kqueueop->events);
-		free(kqueueop);
-		close(kq);
-		return (NULL);
-	}
-
-	return (kqueueop);
-}
-
-static int
-kq_insert(struct kqop *kqop, struct kevent *kev)
-{
-	int nevents = kqop->nevents;
-
-	if (kqop->nchanges == nevents) {
-		struct kevent *newchange;
-		struct kevent *newresult;
-
-		nevents *= 2;
-
-		newchange = realloc(kqop->changes,
-				    nevents * sizeof(struct kevent));
-		if (newchange == NULL) {
-			event_warn("%s: malloc", __func__);
-			return (-1);
-		}
-		kqop->changes = newchange;
-
-		newresult = realloc(kqop->events,
-				    nevents * sizeof(struct kevent));
-
-		/*
-		 * If we fail, we don't have to worry about freeing,
-		 * the next realloc will pick it up.
-		 */
-		if (newresult == NULL) {
-			event_warn("%s: malloc", __func__);
-			return (-1);
-		}
-		kqop->events = newresult;
-
-		kqop->nevents = nevents;
-	}
-
-	memcpy(&kqop->changes[kqop->nchanges++], kev, sizeof(struct kevent));
-
-	event_debug(("%s: fd %d %s%s",
-		__func__, (int)kev->ident, 
-		kev->filter == EVFILT_READ ? "EVFILT_READ" : "EVFILT_WRITE",
-		kev->flags == EV_DELETE ? " (del)" : ""));
-
-	return (0);
-}
-
-static void
-kq_sighandler(int sig)
-{
-	/* Do nothing here */
-}
-
-static int
-kq_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	struct kqop *kqop = arg;
-	struct kevent *changes = kqop->changes;
-	struct kevent *events = kqop->events;
-	struct event *ev;
-	struct timespec ts, *ts_p = NULL;
-	int i, res;
-
-	if (tv != NULL) {
-		TIMEVAL_TO_TIMESPEC(tv, &ts);
-		ts_p = &ts;
-	}
-
-	res = kevent(kqop->kq, changes, kqop->nchanges,
-	    events, kqop->nevents, ts_p);
-	kqop->nchanges = 0;
-	if (res == -1) {
-		if (errno != EINTR) {
-                        event_warn("kevent");
-			return (-1);
-		}
-
-		return (0);
-	}
-
-	event_debug(("%s: kevent reports %d", __func__, res));
-
-	for (i = 0; i < res; i++) {
-		int which = 0;
-
-		if (events[i].flags & EV_ERROR) {
-			/* 
-			 * Error messages that can happen, when a delete fails.
-			 *   EBADF happens when the file discriptor has been
-			 *   closed,
-			 *   ENOENT when the file discriptor was closed and
-			 *   then reopened.
-			 *   EINVAL for some reasons not understood; EINVAL
-			 *   should not be returned ever; but FreeBSD does :-\
-			 * An error is also indicated when a callback deletes
-			 * an event we are still processing.  In that case
-			 * the data field is set to ENOENT.
-			 */
-			if (events[i].data == EBADF ||
-			    events[i].data == EINVAL ||
-			    events[i].data == ENOENT)
-				continue;
-			errno = events[i].data;
-			return (-1);
-		}
-
-		if (events[i].filter == EVFILT_READ) {
-			which |= EV_READ;
-		} else if (events[i].filter == EVFILT_WRITE) {
-			which |= EV_WRITE;
-		} else if (events[i].filter == EVFILT_SIGNAL) {
-			which |= EV_SIGNAL;
-		}
-
-		if (!which)
-			continue;
-
-		if (events[i].filter == EVFILT_SIGNAL) {
-			struct event_list *head =
-			    (struct event_list *)events[i].udata;
-			TAILQ_FOREACH(ev, head, ev_signal_next) {
-				event_active(ev, which, events[i].data);
-			}
-		} else {
-			ev = (struct event *)events[i].udata;
-
-			if (!(ev->ev_events & EV_PERSIST))
-				ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
-
-			event_active(ev, which, 1);
-		}
-	}
-
-	return (0);
-}
-
-
-static int
-kq_add(void *arg, struct event *ev)
-{
-	struct kqop *kqop = arg;
-	struct kevent kev;
-
-	if (ev->ev_events & EV_SIGNAL) {
-		int nsignal = EVENT_SIGNAL(ev);
-
-		assert(nsignal >= 0 && nsignal < NSIG);
-		if (TAILQ_EMPTY(&kqop->evsigevents[nsignal])) {
-			struct timespec timeout = { 0, 0 };
-			
-			memset(&kev, 0, sizeof(kev));
-			kev.ident = nsignal;
-			kev.filter = EVFILT_SIGNAL;
-			kev.flags = EV_ADD;
-			kev.udata = PTR_TO_UDATA(&kqop->evsigevents[nsignal]);
-			
-			/* Be ready for the signal if it is sent any
-			 * time between now and the next call to
-			 * kq_dispatch. */
-			if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1)
-				return (-1);
-			
-			if (_evsignal_set_handler(ev->ev_base, nsignal,
-				kq_sighandler) == -1)
-				return (-1);
-		}
-
-		TAILQ_INSERT_TAIL(&kqop->evsigevents[nsignal], ev,
-		    ev_signal_next);
-		ev->ev_flags |= EVLIST_X_KQINKERNEL;
-		return (0);
-	}
-
-	if (ev->ev_events & EV_READ) {
- 		memset(&kev, 0, sizeof(kev));
-		kev.ident = ev->ev_fd;
-		kev.filter = EVFILT_READ;
-#ifdef NOTE_EOF
-		/* Make it behave like select() and poll() */
-		kev.fflags = NOTE_EOF;
-#endif
-		kev.flags = EV_ADD;
-		if (!(ev->ev_events & EV_PERSIST))
-			kev.flags |= EV_ONESHOT;
-		kev.udata = PTR_TO_UDATA(ev);
-		
-		if (kq_insert(kqop, &kev) == -1)
-			return (-1);
-
-		ev->ev_flags |= EVLIST_X_KQINKERNEL;
-	}
-
-	if (ev->ev_events & EV_WRITE) {
- 		memset(&kev, 0, sizeof(kev));
-		kev.ident = ev->ev_fd;
-		kev.filter = EVFILT_WRITE;
-		kev.flags = EV_ADD;
-		if (!(ev->ev_events & EV_PERSIST))
-			kev.flags |= EV_ONESHOT;
-		kev.udata = PTR_TO_UDATA(ev);
-		
-		if (kq_insert(kqop, &kev) == -1)
-			return (-1);
-
-		ev->ev_flags |= EVLIST_X_KQINKERNEL;
-	}
-
-	return (0);
-}
-
-static int
-kq_del(void *arg, struct event *ev)
-{
-	struct kqop *kqop = arg;
-	struct kevent kev;
-
-	if (!(ev->ev_flags & EVLIST_X_KQINKERNEL))
-		return (0);
-
-	if (ev->ev_events & EV_SIGNAL) {
-		int nsignal = EVENT_SIGNAL(ev);
-		struct timespec timeout = { 0, 0 };
-
-		assert(nsignal >= 0 && nsignal < NSIG);
-		TAILQ_REMOVE(&kqop->evsigevents[nsignal], ev, ev_signal_next);
-		if (TAILQ_EMPTY(&kqop->evsigevents[nsignal])) {
-			memset(&kev, 0, sizeof(kev));
-			kev.ident = nsignal;
-			kev.filter = EVFILT_SIGNAL;
-			kev.flags = EV_DELETE;
-		
-			/* Because we insert signal events
-			 * immediately, we need to delete them
-			 * immediately, too */
-			if (kevent(kqop->kq, &kev, 1, NULL, 0, &timeout) == -1)
-				return (-1);
-
-			if (_evsignal_restore_handler(ev->ev_base,
-				nsignal) == -1)
-				return (-1);
-		}
-
-		ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
-		return (0);
-	}
-
-	if (ev->ev_events & EV_READ) {
- 		memset(&kev, 0, sizeof(kev));
-		kev.ident = ev->ev_fd;
-		kev.filter = EVFILT_READ;
-		kev.flags = EV_DELETE;
-		
-		if (kq_insert(kqop, &kev) == -1)
-			return (-1);
-
-		ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
-	}
-
-	if (ev->ev_events & EV_WRITE) {
- 		memset(&kev, 0, sizeof(kev));
-		kev.ident = ev->ev_fd;
-		kev.filter = EVFILT_WRITE;
-		kev.flags = EV_DELETE;
-		
-		if (kq_insert(kqop, &kev) == -1)
-			return (-1);
-
-		ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
-	}
-
-	return (0);
-}
-
-static void
-kq_dealloc(struct event_base *base, void *arg)
-{
-	struct kqop *kqop = arg;
-
-	if (kqop->changes)
-		free(kqop->changes);
-	if (kqop->events)
-		free(kqop->events);
-	if (kqop->kq >= 0 && kqop->pid == getpid())
-		close(kqop->kq);
-	memset(kqop, 0, sizeof(struct kqop));
-	free(kqop);
-}
diff --git a/libevent/log.c b/libevent/log.c
deleted file mode 100644
index b62a61915d17..000000000000
--- a/libevent/log.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*	$OpenBSD: err.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
-
-/*
- * log.c
- *
- * Based on err.c, which was adapted from OpenBSD libc *err* *warn* code.
- *
- * Copyright (c) 2005 Nick Mathewson <nickm@freehaven.net>
- *
- * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
- *
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include "event.h"
-
-#include "log.h"
-#include "evutil.h"
-
-static void _warn_helper(int severity, int log_errno, const char *fmt,
-                         va_list ap);
-static void event_log(int severity, const char *msg);
-
-void
-event_err(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_ERR, errno, fmt, ap);
-	va_end(ap);
-	exit(eval);
-}
-
-void
-event_warn(const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_WARN, errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-event_errx(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_ERR, -1, fmt, ap);
-	va_end(ap);
-	exit(eval);
-}
-
-void
-event_warnx(const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_WARN, -1, fmt, ap);
-	va_end(ap);
-}
-
-void
-event_msgx(const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_MSG, -1, fmt, ap);
-	va_end(ap);
-}
-
-void
-_event_debugx(const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	_warn_helper(_EVENT_LOG_DEBUG, -1, fmt, ap);
-	va_end(ap);
-}
-
-static void
-_warn_helper(int severity, int log_errno, const char *fmt, va_list ap)
-{
-	char buf[1024];
-	size_t len;
-
-	if (fmt != NULL)
-		evutil_vsnprintf(buf, sizeof(buf), fmt, ap);
-	else
-		buf[0] = '\0';
-
-	if (log_errno >= 0) {
-		len = strlen(buf);
-		if (len < sizeof(buf) - 3) {
-			evutil_snprintf(buf + len, sizeof(buf) - len, ": %s",
-			    strerror(log_errno));
-		}
-	}
-
-	event_log(severity, buf);
-}
-
-static event_log_cb log_fn = NULL;
-
-void
-event_set_log_callback(event_log_cb cb)
-{
-	log_fn = cb;
-}
-
-static void
-event_log(int severity, const char *msg)
-{
-	if (log_fn)
-		log_fn(severity, msg);
-	else {
-		const char *severity_str;
-		switch (severity) {
-		case _EVENT_LOG_DEBUG:
-			severity_str = "debug";
-			break;
-		case _EVENT_LOG_MSG:
-			severity_str = "msg";
-			break;
-		case _EVENT_LOG_WARN:
-			severity_str = "warn";
-			break;
-		case _EVENT_LOG_ERR:
-			severity_str = "err";
-			break;
-		default:
-			severity_str = "???";
-			break;
-		}
-		(void)fprintf(stderr, "[%s] %s\n", severity_str, msg);
-	}
-}
diff --git a/libevent/log.h b/libevent/log.h
deleted file mode 100644
index 7bc6632b8dd9..000000000000
--- a/libevent/log.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _LOG_H_
-#define _LOG_H_
-
-#ifdef __GNUC__
-#define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
-#else
-#define EV_CHECK_FMT(a,b)
-#endif
-
-void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
-void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2);
-void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
-void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2);
-void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2);
-void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2);
-
-#ifdef USE_DEBUG
-#define event_debug(x) _event_debugx x
-#else
-#define event_debug(x) do {;} while (0)
-#endif
-
-#undef EV_CHECK_FMT
-
-#endif
diff --git a/libevent/min_heap.h b/libevent/min_heap.h
deleted file mode 100644
index edaa5ae12702..000000000000
--- a/libevent/min_heap.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _MIN_HEAP_H_
-#define _MIN_HEAP_H_
-
-#include "event.h"
-#include "evutil.h"
-#include "stdlib.h"
-
-typedef struct min_heap
-{
-    struct event** p;
-    unsigned n, a;
-} min_heap_t;
-
-static inline void           min_heap_ctor(min_heap_t* s);
-static inline void           min_heap_dtor(min_heap_t* s);
-static inline void           min_heap_elem_init(struct event* e);
-static inline int            min_heap_elem_greater(struct event *a, struct event *b);
-static inline int            min_heap_empty(min_heap_t* s);
-static inline unsigned       min_heap_size(min_heap_t* s);
-static inline struct event*  min_heap_top(min_heap_t* s);
-static inline int            min_heap_reserve(min_heap_t* s, unsigned n);
-static inline int            min_heap_push(min_heap_t* s, struct event* e);
-static inline struct event*  min_heap_pop(min_heap_t* s);
-static inline int            min_heap_erase(min_heap_t* s, struct event* e);
-static inline void           min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e);
-static inline void           min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e);
-
-int min_heap_elem_greater(struct event *a, struct event *b)
-{
-    return evutil_timercmp(&a->ev_timeout, &b->ev_timeout, >);
-}
-
-void min_heap_ctor(min_heap_t* s) { s->p = 0; s->n = 0; s->a = 0; }
-void min_heap_dtor(min_heap_t* s) { free(s->p); }
-void min_heap_elem_init(struct event* e) { e->min_heap_idx = -1; }
-int min_heap_empty(min_heap_t* s) { return 0u == s->n; }
-unsigned min_heap_size(min_heap_t* s) { return s->n; }
-struct event* min_heap_top(min_heap_t* s) { return s->n ? *s->p : 0; }
-
-int min_heap_push(min_heap_t* s, struct event* e)
-{
-    if(min_heap_reserve(s, s->n + 1))
-        return -1;
-    min_heap_shift_up_(s, s->n++, e);
-    return 0;
-}
-
-struct event* min_heap_pop(min_heap_t* s)
-{
-    if(s->n)
-    {
-        struct event* e = *s->p;
-        min_heap_shift_down_(s, 0u, s->p[--s->n]);
-        e->min_heap_idx = -1;
-        return e;
-    }
-    return 0;
-}
-
-int min_heap_erase(min_heap_t* s, struct event* e)
-{
-    if(((unsigned int)-1) != e->min_heap_idx)
-    {
-        struct event *last = s->p[--s->n];
-        unsigned parent = (e->min_heap_idx - 1) / 2;
-	/* we replace e with the last element in the heap.  We might need to
-	   shift it upward if it is less than its parent, or downward if it is
-	   greater than one or both its children. Since the children are known
-	   to be less than the parent, it can't need to shift both up and
-	   down. */
-        if (e->min_heap_idx > 0 && min_heap_elem_greater(s->p[parent], last))
-             min_heap_shift_up_(s, e->min_heap_idx, last);
-        else
-             min_heap_shift_down_(s, e->min_heap_idx, last);
-        e->min_heap_idx = -1;
-        return 0;
-    }
-    return -1;
-}
-
-int min_heap_reserve(min_heap_t* s, unsigned n)
-{
-    if(s->a < n)
-    {
-        struct event** p;
-        unsigned a = s->a ? s->a * 2 : 8;
-        if(a < n)
-            a = n;
-        if(!(p = (struct event**)realloc(s->p, a * sizeof *p)))
-            return -1;
-        s->p = p;
-        s->a = a;
-    }
-    return 0;
-}
-
-void min_heap_shift_up_(min_heap_t* s, unsigned hole_index, struct event* e)
-{
-    unsigned parent = (hole_index - 1) / 2;
-    while(hole_index && min_heap_elem_greater(s->p[parent], e))
-    {
-        (s->p[hole_index] = s->p[parent])->min_heap_idx = hole_index;
-        hole_index = parent;
-        parent = (hole_index - 1) / 2;
-    }
-    (s->p[hole_index] = e)->min_heap_idx = hole_index;
-}
-
-void min_heap_shift_down_(min_heap_t* s, unsigned hole_index, struct event* e)
-{
-    unsigned min_child = 2 * (hole_index + 1);
-    while(min_child <= s->n)
-	{
-        min_child -= min_child == s->n || min_heap_elem_greater(s->p[min_child], s->p[min_child - 1]);
-        if(!(min_heap_elem_greater(e, s->p[min_child])))
-            break;
-        (s->p[hole_index] = s->p[min_child])->min_heap_idx = hole_index;
-        hole_index = min_child;
-        min_child = 2 * (hole_index + 1);
-	}
-    min_heap_shift_up_(s, hole_index,  e);
-}
-
-#endif /* _MIN_HEAP_H_ */
diff --git a/libevent/poll.c b/libevent/poll.c
deleted file mode 100644
index 5d496618d29f..000000000000
--- a/libevent/poll.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*	$OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
-
-/*
- * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#include <sys/queue.h>
-#include <poll.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef CHECK_INVARIANTS
-#include <assert.h>
-#endif
-
-#include "event.h"
-#include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-
-struct pollop {
-	int event_count;		/* Highest number alloc */
-	int nfds;                       /* Size of event_* */
-	int fd_count;                   /* Size of idxplus1_by_fd */
-	struct pollfd *event_set;
-	struct event **event_r_back;
-	struct event **event_w_back;
-	int *idxplus1_by_fd; /* Index into event_set by fd; we add 1 so
-			      * that 0 (which is easy to memset) can mean
-			      * "no entry." */
-};
-
-static void *poll_init	(struct event_base *);
-static int poll_add		(void *, struct event *);
-static int poll_del		(void *, struct event *);
-static int poll_dispatch	(struct event_base *, void *, struct timeval *);
-static void poll_dealloc	(struct event_base *, void *);
-
-const struct eventop pollops = {
-	"poll",
-	poll_init,
-	poll_add,
-	poll_del,
-	poll_dispatch,
-	poll_dealloc,
-    0
-};
-
-static void *
-poll_init(struct event_base *base)
-{
-	struct pollop *pollop;
-
-	/* Disable poll when this environment variable is set */
-	if (getenv("EVENT_NOPOLL"))
-		return (NULL);
-
-	if (!(pollop = calloc(1, sizeof(struct pollop))))
-		return (NULL);
-
-	evsignal_init(base);
-
-	return (pollop);
-}
-
-#ifdef CHECK_INVARIANTS
-static void
-poll_check_ok(struct pollop *pop)
-{
-	int i, idx;
-	struct event *ev;
-
-	for (i = 0; i < pop->fd_count; ++i) {
-		idx = pop->idxplus1_by_fd[i]-1;
-		if (idx < 0)
-			continue;
-		assert(pop->event_set[idx].fd == i);
-		if (pop->event_set[idx].events & POLLIN) {
-			ev = pop->event_r_back[idx];
-			assert(ev);
-			assert(ev->ev_events & EV_READ);
-			assert(ev->ev_fd == i);
-		}
-		if (pop->event_set[idx].events & POLLOUT) {
-			ev = pop->event_w_back[idx];
-			assert(ev);
-			assert(ev->ev_events & EV_WRITE);
-			assert(ev->ev_fd == i);
-		}
-	}
-	for (i = 0; i < pop->nfds; ++i) {
-		struct pollfd *pfd = &pop->event_set[i];
-		assert(pop->idxplus1_by_fd[pfd->fd] == i+1);
-	}
-}
-#else
-#define poll_check_ok(pop)
-#endif
-
-static int
-poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	int res, i, j, msec = -1, nfds;
-	struct pollop *pop = arg;
-
-	poll_check_ok(pop);
-
-	if (tv != NULL)
-		msec = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-
-	nfds = pop->nfds;
-	res = poll(pop->event_set, nfds, msec);
-
-	if (res == -1) {
-		if (errno != EINTR) {
-                        event_warn("poll");
-			return (-1);
-		}
-
-		evsignal_process(base);
-		return (0);
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-
-	event_debug(("%s: poll reports %d", __func__, res));
-
-	if (res == 0 || nfds == 0)
-		return (0);
-
-	i = random() % nfds;
-	for (j = 0; j < nfds; j++) {
-		struct event *r_ev = NULL, *w_ev = NULL;
-		int what;
-		if (++i == nfds)
-			i = 0;
-		what = pop->event_set[i].revents;
-
-		if (!what)
-			continue;
-
-		res = 0;
-
-		/* If the file gets closed notify */
-		if (what & (POLLHUP|POLLERR))
-			what |= POLLIN|POLLOUT;
-		if (what & POLLIN) {
-			res |= EV_READ;
-			r_ev = pop->event_r_back[i];
-		}
-		if (what & POLLOUT) {
-			res |= EV_WRITE;
-			w_ev = pop->event_w_back[i];
-		}
-		if (res == 0)
-			continue;
-
-		if (r_ev && (res & r_ev->ev_events)) {
-			event_active(r_ev, res & r_ev->ev_events, 1);
-		}
-		if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
-			event_active(w_ev, res & w_ev->ev_events, 1);
-		}
-	}
-
-	return (0);
-}
-
-static int
-poll_add(void *arg, struct event *ev)
-{
-	struct pollop *pop = arg;
-	struct pollfd *pfd = NULL;
-	int i;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_add(ev));
-	if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-		return (0);
-
-	poll_check_ok(pop);
-	if (pop->nfds + 1 >= pop->event_count) {
-		struct pollfd *tmp_event_set;
-		struct event **tmp_event_r_back;
-		struct event **tmp_event_w_back;
-		int tmp_event_count;
-
-		if (pop->event_count < 32)
-			tmp_event_count = 32;
-		else
-			tmp_event_count = pop->event_count * 2;
-
-		/* We need more file descriptors */
-		tmp_event_set = realloc(pop->event_set,
-				 tmp_event_count * sizeof(struct pollfd));
-		if (tmp_event_set == NULL) {
-			event_warn("realloc");
-			return (-1);
-		}
-		pop->event_set = tmp_event_set;
-
-		tmp_event_r_back = realloc(pop->event_r_back,
-			    tmp_event_count * sizeof(struct event *));
-		if (tmp_event_r_back == NULL) {
-			/* event_set overallocated; that's okay. */
-			event_warn("realloc");
-			return (-1);
-		}
-		pop->event_r_back = tmp_event_r_back;
-
-		tmp_event_w_back = realloc(pop->event_w_back,
-			    tmp_event_count * sizeof(struct event *));
-		if (tmp_event_w_back == NULL) {
-			/* event_set and event_r_back overallocated; that's
-			 * okay. */
-			event_warn("realloc");
-			return (-1);
-		}
-		pop->event_w_back = tmp_event_w_back;
-
-		pop->event_count = tmp_event_count;
-	}
-	if (ev->ev_fd >= pop->fd_count) {
-		int *tmp_idxplus1_by_fd;
-		int new_count;
-		if (pop->fd_count < 32)
-			new_count = 32;
-		else
-			new_count = pop->fd_count * 2;
-		while (new_count <= ev->ev_fd)
-			new_count *= 2;
-		tmp_idxplus1_by_fd =
-			realloc(pop->idxplus1_by_fd, new_count * sizeof(int));
-		if (tmp_idxplus1_by_fd == NULL) {
-			event_warn("realloc");
-			return (-1);
-		}
-		pop->idxplus1_by_fd = tmp_idxplus1_by_fd;
-		memset(pop->idxplus1_by_fd + pop->fd_count,
-		       0, sizeof(int)*(new_count - pop->fd_count));
-		pop->fd_count = new_count;
-	}
-
-	i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
-	if (i >= 0) {
-		pfd = &pop->event_set[i];
-	} else {
-		i = pop->nfds++;
-		pfd = &pop->event_set[i];
-		pfd->events = 0;
-		pfd->fd = ev->ev_fd;
-		pop->event_w_back[i] = pop->event_r_back[i] = NULL;
-		pop->idxplus1_by_fd[ev->ev_fd] = i + 1;
-	}
-
-	pfd->revents = 0;
-	if (ev->ev_events & EV_WRITE) {
-		pfd->events |= POLLOUT;
-		pop->event_w_back[i] = ev;
-	}
-	if (ev->ev_events & EV_READ) {
-		pfd->events |= POLLIN;
-		pop->event_r_back[i] = ev;
-	}
-	poll_check_ok(pop);
-
-	return (0);
-}
-
-/*
- * Nothing to be done here.
- */
-
-static int
-poll_del(void *arg, struct event *ev)
-{
-	struct pollop *pop = arg;
-	struct pollfd *pfd = NULL;
-	int i;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_del(ev));
-
-	if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-		return (0);
-
-	poll_check_ok(pop);
-	i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
-	if (i < 0)
-		return (-1);
-
-	/* Do we still want to read or write? */
-	pfd = &pop->event_set[i];
-	if (ev->ev_events & EV_READ) {
-		pfd->events &= ~POLLIN;
-		pop->event_r_back[i] = NULL;
-	}
-	if (ev->ev_events & EV_WRITE) {
-		pfd->events &= ~POLLOUT;
-		pop->event_w_back[i] = NULL;
-	}
-	poll_check_ok(pop);
-	if (pfd->events)
-		/* Another event cares about that fd. */
-		return (0);
-
-	/* Okay, so we aren't interested in that fd anymore. */
-	pop->idxplus1_by_fd[ev->ev_fd] = 0;
-
-	--pop->nfds;
-	if (i != pop->nfds) {
-		/* 
-		 * Shift the last pollfd down into the now-unoccupied
-		 * position.
-		 */
-		memcpy(&pop->event_set[i], &pop->event_set[pop->nfds],
-		       sizeof(struct pollfd));
-		pop->event_r_back[i] = pop->event_r_back[pop->nfds];
-		pop->event_w_back[i] = pop->event_w_back[pop->nfds];
-		pop->idxplus1_by_fd[pop->event_set[i].fd] = i + 1;
-	}
-
-	poll_check_ok(pop);
-	return (0);
-}
-
-static void
-poll_dealloc(struct event_base *base, void *arg)
-{
-	struct pollop *pop = arg;
-
-	evsignal_dealloc(base);
-	if (pop->event_set)
-		free(pop->event_set);
-	if (pop->event_r_back)
-		free(pop->event_r_back);
-	if (pop->event_w_back)
-		free(pop->event_w_back);
-	if (pop->idxplus1_by_fd)
-		free(pop->idxplus1_by_fd);
-
-	memset(pop, 0, sizeof(struct pollop));
-	free(pop);
-}
diff --git a/libevent/sample/Makefile.am b/libevent/sample/Makefile.am
deleted file mode 100644
index 2f4e26e2f3f1..000000000000
--- a/libevent/sample/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-LDADD = ../libevent.la
-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat
-
-noinst_PROGRAMS = event-test time-test signal-test
-
-event_test_sources = event-test.c
-time_test_sources = time-test.c
-signal_test_sources = signal-test.c
-
-verify:
-
-DISTCLEANFILES = *~
diff --git a/libevent/sample/event-test.c b/libevent/sample/event-test.c
deleted file mode 100644
index 2c6cb93864c7..000000000000
--- a/libevent/sample/event-test.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o event-test event-test.c -L/usr/local/lib -levent
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef WIN32
-#include <sys/queue.h>
-#include <unistd.h>
-#include <sys/time.h>
-#else
-#include <windows.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <event.h>
-
-static void
-fifo_read(int fd, short event, void *arg)
-{
-	char buf[255];
-	int len;
-	struct event *ev = arg;
-#ifdef WIN32
-	DWORD dwBytesRead;
-#endif
-
-	/* Reschedule this event */
-	event_add(ev, NULL);
-
-	fprintf(stderr, "fifo_read called with fd: %d, event: %d, arg: %p\n",
-		fd, event, arg);
-#ifdef WIN32
-	len = ReadFile((HANDLE)fd, buf, sizeof(buf) - 1, &dwBytesRead, NULL);
-
-	// Check for end of file. 
-	if(len && dwBytesRead == 0) {
-		fprintf(stderr, "End Of File");
-		event_del(ev);
-		return;
-	}
-
-	buf[dwBytesRead] = '\0';
-#else
-	len = read(fd, buf, sizeof(buf) - 1);
-
-	if (len == -1) {
-		perror("read");
-		return;
-	} else if (len == 0) {
-		fprintf(stderr, "Connection closed\n");
-		return;
-	}
-
-	buf[len] = '\0';
-#endif
-	fprintf(stdout, "Read: %s\n", buf);
-}
-
-int
-main (int argc, char **argv)
-{
-	struct event evfifo;
-#ifdef WIN32
-	HANDLE socket;
-	// Open a file. 
-	socket = CreateFile("test.txt",     // open File 
-			GENERIC_READ,                 // open for reading 
-			0,                            // do not share 
-			NULL,                         // no security 
-			OPEN_EXISTING,                // existing file only 
-			FILE_ATTRIBUTE_NORMAL,        // normal file 
-			NULL);                        // no attr. template 
-
-	if(socket == INVALID_HANDLE_VALUE)
-		return 1;
-
-#else
-	struct stat st;
-	const char *fifo = "event.fifo";
-	int socket;
- 
-	if (lstat (fifo, &st) == 0) {
-		if ((st.st_mode & S_IFMT) == S_IFREG) {
-			errno = EEXIST;
-			perror("lstat");
-			exit (1);
-		}
-	}
-
-	unlink (fifo);
-	if (mkfifo (fifo, 0600) == -1) {
-		perror("mkfifo");
-		exit (1);
-	}
-
-	/* Linux pipes are broken, we need O_RDWR instead of O_RDONLY */
-#ifdef __linux
-	socket = open (fifo, O_RDWR | O_NONBLOCK, 0);
-#else
-	socket = open (fifo, O_RDONLY | O_NONBLOCK, 0);
-#endif
-
-	if (socket == -1) {
-		perror("open");
-		exit (1);
-	}
-
-	fprintf(stderr, "Write data to %s\n", fifo);
-#endif
-	/* Initalize the event library */
-	event_init();
-
-	/* Initalize one event */
-#ifdef WIN32
-	event_set(&evfifo, (int)socket, EV_READ, fifo_read, &evfifo);
-#else
-	event_set(&evfifo, socket, EV_READ, fifo_read, &evfifo);
-#endif
-
-	/* Add it to the active events, without a timeout */
-	event_add(&evfifo, NULL);
-	
-	event_dispatch();
-#ifdef WIN32
-	CloseHandle(socket);
-#endif
-	return (0);
-}
-
diff --git a/libevent/sample/signal-test.c b/libevent/sample/signal-test.c
deleted file mode 100644
index 9a131cb50c24..000000000000
--- a/libevent/sample/signal-test.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o signal-test \
- *   signal-test.c -L/usr/local/lib -levent
- */
-
-#include <sys/types.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/stat.h>
-#ifndef WIN32
-#include <sys/queue.h>
-#include <unistd.h>
-#include <sys/time.h>
-#else
-#include <windows.h>
-#endif
-#include <signal.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <event.h>
-
-int called = 0;
-
-static void
-signal_cb(int fd, short event, void *arg)
-{
-	struct event *signal = arg;
-
-	printf("%s: got signal %d\n", __func__, EVENT_SIGNAL(signal));
-
-	if (called >= 2)
-		event_del(signal);
-	
-	called++;
-}
-
-int
-main (int argc, char **argv)
-{
-	struct event signal_int;
- 
-	/* Initalize the event library */
-	event_init();
-
-	/* Initalize one event */
-	event_set(&signal_int, SIGINT, EV_SIGNAL|EV_PERSIST, signal_cb,
-	    &signal_int);
-
-	event_add(&signal_int, NULL);
-
-	event_dispatch();
-
-	return (0);
-}
-
diff --git a/libevent/sample/time-test.c b/libevent/sample/time-test.c
deleted file mode 100644
index 069d4f8f7837..000000000000
--- a/libevent/sample/time-test.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
- */
-
-#include <sys/types.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/stat.h>
-#ifndef WIN32
-#include <sys/queue.h>
-#include <unistd.h>
-#endif
-#include <time.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <event.h>
-#include <evutil.h>
-
-int lasttime;
-
-static void
-timeout_cb(int fd, short event, void *arg)
-{
-	struct timeval tv;
-	struct event *timeout = arg;
-	int newtime = time(NULL);
-
-	printf("%s: called at %d: %d\n", __func__, newtime,
-	    newtime - lasttime);
-	lasttime = newtime;
-
-	evutil_timerclear(&tv);
-	tv.tv_sec = 2;
-	event_add(timeout, &tv);
-}
-
-int
-main (int argc, char **argv)
-{
-	struct event timeout;
-	struct timeval tv;
- 
-	/* Initalize the event library */
-	event_init();
-
-	/* Initalize one event */
-	evtimer_set(&timeout, timeout_cb, &timeout);
-
-	evutil_timerclear(&tv);
-	tv.tv_sec = 2;
-	event_add(&timeout, &tv);
-
-	lasttime = time(NULL);
-	
-	event_dispatch();
-
-	return (0);
-}
-
diff --git a/libevent/select.c b/libevent/select.c
deleted file mode 100644
index ca6639fd8299..000000000000
--- a/libevent/select.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*	$OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
-
-/*
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <sys/_time.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#include <sys/queue.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#ifdef CHECK_INVARIANTS
-#include <assert.h>
-#endif
-
-#include "event.h"
-#include "event-internal.h"
-#include "evsignal.h"
-#include "log.h"
-
-#ifndef howmany
-#define        howmany(x, y)   (((x)+((y)-1))/(y))
-#endif
-
-struct selectop {
-	int event_fds;		/* Highest fd in fd set */
-	int event_fdsz;
-	fd_set *event_readset_in;
-	fd_set *event_writeset_in;
-	fd_set *event_readset_out;
-	fd_set *event_writeset_out;
-	struct event **event_r_by_fd;
-	struct event **event_w_by_fd;
-};
-
-static void *select_init	(struct event_base *);
-static int select_add		(void *, struct event *);
-static int select_del		(void *, struct event *);
-static int select_dispatch	(struct event_base *, void *, struct timeval *);
-static void select_dealloc     (struct event_base *, void *);
-
-const struct eventop selectops = {
-	"select",
-	select_init,
-	select_add,
-	select_del,
-	select_dispatch,
-	select_dealloc,
-	0
-};
-
-static int select_resize(struct selectop *sop, int fdsz);
-
-static void *
-select_init(struct event_base *base)
-{
-	struct selectop *sop;
-
-	/* Disable select when this environment variable is set */
-	if (getenv("EVENT_NOSELECT"))
-		return (NULL);
-
-	if (!(sop = calloc(1, sizeof(struct selectop))))
-		return (NULL);
-
-	select_resize(sop, howmany(32 + 1, NFDBITS)*sizeof(fd_mask));
-
-	evsignal_init(base);
-
-	return (sop);
-}
-
-#ifdef CHECK_INVARIANTS
-static void
-check_selectop(struct selectop *sop)
-{
-	int i;
-	for (i = 0; i <= sop->event_fds; ++i) {
-		if (FD_ISSET(i, sop->event_readset_in)) {
-			assert(sop->event_r_by_fd[i]);
-			assert(sop->event_r_by_fd[i]->ev_events & EV_READ);
-			assert(sop->event_r_by_fd[i]->ev_fd == i);
-		} else {
-			assert(! sop->event_r_by_fd[i]);
-		}
-		if (FD_ISSET(i, sop->event_writeset_in)) {
-			assert(sop->event_w_by_fd[i]);
-			assert(sop->event_w_by_fd[i]->ev_events & EV_WRITE);
-			assert(sop->event_w_by_fd[i]->ev_fd == i);
-		} else {
-			assert(! sop->event_w_by_fd[i]);
-		}
-	}
-
-}
-#else
-#define check_selectop(sop) do { (void) sop; } while (0)
-#endif
-
-static int
-select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-{
-	int res, i, j;
-	struct selectop *sop = arg;
-
-	check_selectop(sop);
-
-	memcpy(sop->event_readset_out, sop->event_readset_in,
-	       sop->event_fdsz);
-	memcpy(sop->event_writeset_out, sop->event_writeset_in,
-	       sop->event_fdsz);
-
-	res = select(sop->event_fds + 1, sop->event_readset_out,
-	    sop->event_writeset_out, NULL, tv);
-
-	check_selectop(sop);
-
-	if (res == -1) {
-		if (errno != EINTR) {
-			event_warn("select");
-			return (-1);
-		}
-
-		evsignal_process(base);
-		return (0);
-	} else if (base->sig.evsignal_caught) {
-		evsignal_process(base);
-	}
-
-	event_debug(("%s: select reports %d", __func__, res));
-
-	check_selectop(sop);
-	i = random() % (sop->event_fds+1);
-	for (j = 0; j <= sop->event_fds; ++j) {
-		struct event *r_ev = NULL, *w_ev = NULL;
-		if (++i >= sop->event_fds+1)
-			i = 0;
-
-		res = 0;
-		if (FD_ISSET(i, sop->event_readset_out)) {
-			r_ev = sop->event_r_by_fd[i];
-			res |= EV_READ;
-		}
-		if (FD_ISSET(i, sop->event_writeset_out)) {
-			w_ev = sop->event_w_by_fd[i];
-			res |= EV_WRITE;
-		}
-		if (r_ev && (res & r_ev->ev_events)) {
-			event_active(r_ev, res & r_ev->ev_events, 1);
-		}
-		if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
-			event_active(w_ev, res & w_ev->ev_events, 1);
-		}
-	}
-	check_selectop(sop);
-
-	return (0);
-}
-
-
-static int
-select_resize(struct selectop *sop, int fdsz)
-{
-	int n_events, n_events_old;
-
-	fd_set *readset_in = NULL;
-	fd_set *writeset_in = NULL;
-	fd_set *readset_out = NULL;
-	fd_set *writeset_out = NULL;
-	struct event **r_by_fd = NULL;
-	struct event **w_by_fd = NULL;
-
-	n_events = (fdsz/sizeof(fd_mask)) * NFDBITS;
-	n_events_old = (sop->event_fdsz/sizeof(fd_mask)) * NFDBITS;
-
-	if (sop->event_readset_in)
-		check_selectop(sop);
-
-	if ((readset_in = realloc(sop->event_readset_in, fdsz)) == NULL)
-		goto error;
-	sop->event_readset_in = readset_in;
-	if ((readset_out = realloc(sop->event_readset_out, fdsz)) == NULL)
-		goto error;
-	sop->event_readset_out = readset_out;
-	if ((writeset_in = realloc(sop->event_writeset_in, fdsz)) == NULL)
-		goto error;
-	sop->event_writeset_in = writeset_in;
-	if ((writeset_out = realloc(sop->event_writeset_out, fdsz)) == NULL)
-		goto error;
-	sop->event_writeset_out = writeset_out;
-	if ((r_by_fd = realloc(sop->event_r_by_fd,
-		 n_events*sizeof(struct event*))) == NULL)
-		goto error;
-	sop->event_r_by_fd = r_by_fd;
-	if ((w_by_fd = realloc(sop->event_w_by_fd,
-		 n_events * sizeof(struct event*))) == NULL)
-		goto error;
-	sop->event_w_by_fd = w_by_fd;
-
-	memset((char *)sop->event_readset_in + sop->event_fdsz, 0,
-	    fdsz - sop->event_fdsz);
-	memset((char *)sop->event_writeset_in + sop->event_fdsz, 0,
-	    fdsz - sop->event_fdsz);
-	memset(sop->event_r_by_fd + n_events_old, 0,
-	    (n_events-n_events_old) * sizeof(struct event*));
-	memset(sop->event_w_by_fd + n_events_old, 0,
-	    (n_events-n_events_old) * sizeof(struct event*));
-
-	sop->event_fdsz = fdsz;
-	check_selectop(sop);
-
-	return (0);
-
- error:
-	event_warn("malloc");
-	return (-1);
-}
-
-
-static int
-select_add(void *arg, struct event *ev)
-{
-	struct selectop *sop = arg;
-
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_add(ev));
-
-	check_selectop(sop);
-	/*
-	 * Keep track of the highest fd, so that we can calculate the size
-	 * of the fd_sets for select(2)
-	 */
-	if (sop->event_fds < ev->ev_fd) {
-		int fdsz = sop->event_fdsz;
-
-		if (fdsz < sizeof(fd_mask))
-			fdsz = sizeof(fd_mask);
-
-		while (fdsz <
-		    (howmany(ev->ev_fd + 1, NFDBITS) * sizeof(fd_mask)))
-			fdsz *= 2;
-
-		if (fdsz != sop->event_fdsz) {
-			if (select_resize(sop, fdsz)) {
-				check_selectop(sop);
-				return (-1);
-			}
-		}
-
-		sop->event_fds = ev->ev_fd;
-	}
-
-	if (ev->ev_events & EV_READ) {
-		FD_SET(ev->ev_fd, sop->event_readset_in);
-		sop->event_r_by_fd[ev->ev_fd] = ev;
-	}
-	if (ev->ev_events & EV_WRITE) {
-		FD_SET(ev->ev_fd, sop->event_writeset_in);
-		sop->event_w_by_fd[ev->ev_fd] = ev;
-	}
-	check_selectop(sop);
-
-	return (0);
-}
-
-/*
- * Nothing to be done here.
- */
-
-static int
-select_del(void *arg, struct event *ev)
-{
-	struct selectop *sop = arg;
-
-	check_selectop(sop);
-	if (ev->ev_events & EV_SIGNAL)
-		return (evsignal_del(ev));
-
-	if (sop->event_fds < ev->ev_fd) {
-		check_selectop(sop);
-		return (0);
-	}
-
-	if (ev->ev_events & EV_READ) {
-		FD_CLR(ev->ev_fd, sop->event_readset_in);
-		sop->event_r_by_fd[ev->ev_fd] = NULL;
-	}
-
-	if (ev->ev_events & EV_WRITE) {
-		FD_CLR(ev->ev_fd, sop->event_writeset_in);
-		sop->event_w_by_fd[ev->ev_fd] = NULL;
-	}
-
-	check_selectop(sop);
-	return (0);
-}
-
-static void
-select_dealloc(struct event_base *base, void *arg)
-{
-	struct selectop *sop = arg;
-
-	evsignal_dealloc(base);
-	if (sop->event_readset_in)
-		free(sop->event_readset_in);
-	if (sop->event_writeset_in)
-		free(sop->event_writeset_in);
-	if (sop->event_readset_out)
-		free(sop->event_readset_out);
-	if (sop->event_writeset_out)
-		free(sop->event_writeset_out);
-	if (sop->event_r_by_fd)
-		free(sop->event_r_by_fd);
-	if (sop->event_w_by_fd)
-		free(sop->event_w_by_fd);
-
-	memset(sop, 0, sizeof(struct selectop));
-	free(sop);
-}
diff --git a/libevent/signal.c b/libevent/signal.c
deleted file mode 100644
index 74fa23f688ab..000000000000
--- a/libevent/signal.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*	$OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $	*/
-
-/*
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <assert.h>
-
-#include "event.h"
-#include "event-internal.h"
-#include "evsignal.h"
-#include "evutil.h"
-#include "log.h"
-
-struct event_base *evsignal_base = NULL;
-
-static void evsignal_handler(int sig);
-
-/* Callback for when the signal handler write a byte to our signaling socket */
-static void
-evsignal_cb(int fd, short what, void *arg)
-{
-	static char signals[1];
-#ifdef WIN32
-	SSIZE_T n;
-#else
-	ssize_t n;
-#endif
-
-	n = recv(fd, signals, sizeof(signals), 0);
-	if (n == -1)
-		event_err(1, "%s: read", __func__);
-}
-
-#ifdef HAVE_SETFD
-#define FD_CLOSEONEXEC(x) do { \
-        if (fcntl(x, F_SETFD, 1) == -1) \
-                event_warn("fcntl(%d, F_SETFD)", x); \
-} while (0)
-#else
-#define FD_CLOSEONEXEC(x)
-#endif
-
-int
-evsignal_init(struct event_base *base)
-{
-	int i;
-
-	/* 
-	 * Our signal handler is going to write to one end of the socket
-	 * pair to wake up our event loop.  The event loop then scans for
-	 * signals that got delivered.
-	 */
-	if (evutil_socketpair(
-		    AF_UNIX, SOCK_STREAM, 0, base->sig.ev_signal_pair) == -1) {
-#ifdef WIN32
-		/* Make this nonfatal on win32, where sometimes people
-		   have localhost firewalled. */
-		event_warn("%s: socketpair", __func__);
-#else
-		event_err(1, "%s: socketpair", __func__);
-#endif
-		return -1;
-	}
-
-	FD_CLOSEONEXEC(base->sig.ev_signal_pair[0]);
-	FD_CLOSEONEXEC(base->sig.ev_signal_pair[1]);
-	base->sig.sh_old = NULL;
-	base->sig.sh_old_max = 0;
-	base->sig.evsignal_caught = 0;
-	memset(&base->sig.evsigcaught, 0, sizeof(sig_atomic_t)*NSIG);
-	/* initialize the queues for all events */
-	for (i = 0; i < NSIG; ++i)
-		TAILQ_INIT(&base->sig.evsigevents[i]);
-
-        evutil_make_socket_nonblocking(base->sig.ev_signal_pair[0]);
-
-	event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1],
-		EV_READ | EV_PERSIST, evsignal_cb, &base->sig.ev_signal);
-	base->sig.ev_signal.ev_base = base;
-	base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
-
-	return 0;
-}
-
-/* Helper: set the signal handler for evsignal to handler in base, so that
- * we can restore the original handler when we clear the current one. */
-int
-_evsignal_set_handler(struct event_base *base,
-		      int evsignal, void (*handler)(int))
-{
-#ifdef HAVE_SIGACTION
-	struct sigaction sa;
-#else
-	ev_sighandler_t sh;
-#endif
-	struct evsignal_info *sig = &base->sig;
-	void *p;
-
-	/*
-	 * resize saved signal handler array up to the highest signal number.
-	 * a dynamic array is used to keep footprint on the low side.
-	 */
-	if (evsignal >= sig->sh_old_max) {
-		int new_max = evsignal + 1;
-		event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing",
-			    __func__, evsignal, sig->sh_old_max));
-		p = realloc(sig->sh_old, new_max * sizeof(*sig->sh_old));
-		if (p == NULL) {
-			event_warn("realloc");
-			return (-1);
-		}
-
-		memset((char *)p + sig->sh_old_max * sizeof(*sig->sh_old),
-		    0, (new_max - sig->sh_old_max) * sizeof(*sig->sh_old));
-
-		sig->sh_old_max = new_max;
-		sig->sh_old = p;
-	}
-
-	/* allocate space for previous handler out of dynamic array */
-	sig->sh_old[evsignal] = malloc(sizeof *sig->sh_old[evsignal]);
-	if (sig->sh_old[evsignal] == NULL) {
-		event_warn("malloc");
-		return (-1);
-	}
-
-	/* save previous handler and setup new handler */
-#ifdef HAVE_SIGACTION
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = handler;
-	sa.sa_flags |= SA_RESTART;
-	sigfillset(&sa.sa_mask);
-
-	if (sigaction(evsignal, &sa, sig->sh_old[evsignal]) == -1) {
-		event_warn("sigaction");
-		free(sig->sh_old[evsignal]);
-		return (-1);
-	}
-#else
-	if ((sh = signal(evsignal, handler)) == SIG_ERR) {
-		event_warn("signal");
-		free(sig->sh_old[evsignal]);
-		return (-1);
-	}
-	*sig->sh_old[evsignal] = sh;
-#endif
-
-	return (0);
-}
-
-int
-evsignal_add(struct event *ev)
-{
-	int evsignal;
-	struct event_base *base = ev->ev_base;
-	struct evsignal_info *sig = &ev->ev_base->sig;
-
-	if (ev->ev_events & (EV_READ|EV_WRITE))
-		event_errx(1, "%s: EV_SIGNAL incompatible use", __func__);
-	evsignal = EVENT_SIGNAL(ev);
-	assert(evsignal >= 0 && evsignal < NSIG);
-	if (TAILQ_EMPTY(&sig->evsigevents[evsignal])) {
-		event_debug(("%s: %p: changing signal handler", __func__, ev));
-		if (_evsignal_set_handler(
-			    base, evsignal, evsignal_handler) == -1)
-			return (-1);
-
-		/* catch signals if they happen quickly */
-		evsignal_base = base;
-
-		if (!sig->ev_signal_added) {
-			if (event_add(&sig->ev_signal, NULL))
-				return (-1);
-			sig->ev_signal_added = 1;
-		}
-	}
-
-	/* multiple events may listen to the same signal */
-	TAILQ_INSERT_TAIL(&sig->evsigevents[evsignal], ev, ev_signal_next);
-
-	return (0);
-}
-
-int
-_evsignal_restore_handler(struct event_base *base, int evsignal)
-{
-	int ret = 0;
-	struct evsignal_info *sig = &base->sig;
-#ifdef HAVE_SIGACTION
-	struct sigaction *sh;
-#else
-	ev_sighandler_t *sh;
-#endif
-
-	/* restore previous handler */
-	sh = sig->sh_old[evsignal];
-	sig->sh_old[evsignal] = NULL;
-#ifdef HAVE_SIGACTION
-	if (sigaction(evsignal, sh, NULL) == -1) {
-		event_warn("sigaction");
-		ret = -1;
-	}
-#else
-	if (signal(evsignal, *sh) == SIG_ERR) {
-		event_warn("signal");
-		ret = -1;
-	}
-#endif
-	free(sh);
-
-	return ret;
-}
-
-int
-evsignal_del(struct event *ev)
-{
-	struct event_base *base = ev->ev_base;
-	struct evsignal_info *sig = &base->sig;
-	int evsignal = EVENT_SIGNAL(ev);
-
-	assert(evsignal >= 0 && evsignal < NSIG);
-
-	/* multiple events may listen to the same signal */
-	TAILQ_REMOVE(&sig->evsigevents[evsignal], ev, ev_signal_next);
-
-	if (!TAILQ_EMPTY(&sig->evsigevents[evsignal]))
-		return (0);
-
-	event_debug(("%s: %p: restoring signal handler", __func__, ev));
-
-	return (_evsignal_restore_handler(ev->ev_base, EVENT_SIGNAL(ev)));
-}
-
-static void
-evsignal_handler(int sig)
-{
-	int save_errno = errno;
-
-	if (evsignal_base == NULL) {
-		event_warn(
-			"%s: received signal %d, but have no base configured",
-			__func__, sig);
-		return;
-	}
-
-	evsignal_base->sig.evsigcaught[sig]++;
-	evsignal_base->sig.evsignal_caught = 1;
-
-#ifndef HAVE_SIGACTION
-	signal(sig, evsignal_handler);
-#endif
-
-	/* Wake up our notification mechanism */
-	send(evsignal_base->sig.ev_signal_pair[0], "a", 1, 0);
-	errno = save_errno;
-}
-
-void
-evsignal_process(struct event_base *base)
-{
-	struct evsignal_info *sig = &base->sig;
-	struct event *ev, *next_ev;
-	sig_atomic_t ncalls;
-	int i;
-	
-	base->sig.evsignal_caught = 0;
-	for (i = 1; i < NSIG; ++i) {
-		ncalls = sig->evsigcaught[i];
-		if (ncalls == 0)
-			continue;
-		sig->evsigcaught[i] -= ncalls;
-
-		for (ev = TAILQ_FIRST(&sig->evsigevents[i]);
-		    ev != NULL; ev = next_ev) {
-			next_ev = TAILQ_NEXT(ev, ev_signal_next);
-			if (!(ev->ev_events & EV_PERSIST))
-				event_del(ev);
-			event_active(ev, EV_SIGNAL, ncalls);
-		}
-
-	}
-}
-
-void
-evsignal_dealloc(struct event_base *base)
-{
-	int i = 0;
-	if (base->sig.ev_signal_added) {
-		event_del(&base->sig.ev_signal);
-		base->sig.ev_signal_added = 0;
-	}
-	for (i = 0; i < NSIG; ++i) {
-		if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL)
-			_evsignal_restore_handler(base, i);
-	}
-
-	EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
-	base->sig.ev_signal_pair[0] = -1;
-	EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
-	base->sig.ev_signal_pair[1] = -1;
-	base->sig.sh_old_max = 0;
-
-	/* per index frees are handled in evsignal_del() */
-	free(base->sig.sh_old);
-}
diff --git a/libevent/strlcpy-internal.h b/libevent/strlcpy-internal.h
deleted file mode 100644
index 22b5f61d45ed..000000000000
--- a/libevent/strlcpy-internal.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _STRLCPY_INTERNAL_H_
-#define _STRLCPY_INTERNAL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifndef HAVE_STRLCPY
-#include <string.h>
-size_t _event_strlcpy(char *dst, const char *src, size_t siz);
-#define strlcpy _event_strlcpy
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/libevent/strlcpy.c b/libevent/strlcpy.c
deleted file mode 100644
index 4462db03d7a5..000000000000
--- a/libevent/strlcpy.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifndef HAVE_STRLCPY
-#include "strlcpy-internal.h"
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-_event_strlcpy(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
-#endif
diff --git a/libevent/test/Makefile.am b/libevent/test/Makefile.am
deleted file mode 100644
index 3558d02fd5af..000000000000
--- a/libevent/test/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat
-
-EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c
-
-noinst_PROGRAMS = test-init test-eof test-weof test-time regress bench
-
-BUILT_SOURCES = regress.gen.c regress.gen.h
-test_init_SOURCES = test-init.c
-test_init_LDADD = ../libevent_core.la
-test_eof_SOURCES = test-eof.c
-test_eof_LDADD = ../libevent_core.la
-test_weof_SOURCES = test-weof.c
-test_weof_LDADD = ../libevent_core.la
-test_time_SOURCES = test-time.c
-test_time_LDADD = ../libevent_core.la
-regress_SOURCES = regress.c regress.h regress_http.c regress_dns.c \
-	regress_rpc.c \
-	regress.gen.c regress.gen.h
-regress_LDADD = ../libevent.la
-bench_SOURCES = bench.c
-bench_LDADD = ../libevent.la
-
-regress.gen.c regress.gen.h: regress.rpc $(top_srcdir)/event_rpcgen.py
-	$(top_srcdir)/event_rpcgen.py $(srcdir)/regress.rpc || echo "No Python installed"
-
-DISTCLEANFILES = *~
-
-test: test-init test-eof test-weof test-time regress
-
-verify: test
-	@$(srcdir)/test.sh
-
-bench test-init test-eof test-weof test-time: ../libevent.la
diff --git a/libevent/test/bench.c b/libevent/test/bench.c
deleted file mode 100644
index c976932fa806..000000000000
--- a/libevent/test/bench.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2003 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- *
- * Mon 03/10/2003 - Modified by Davide Libenzi <davidel@xmailserver.org>
- *
- *     Added chain event propagation to improve the sensitivity of
- *     the measure respect to the event loop efficency.
- *
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <sys/socket.h>
-#include <signal.h>
-#include <sys/resource.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <event.h>
-#include <evutil.h>
-
-
-static int count, writes, fired;
-static int *pipes;
-static int num_pipes, num_active, num_writes;
-static struct event *events;
-
-static void
-read_cb(int fd, short which, void *arg)
-{
-	long idx = (long) arg, widx = idx + 1;
-	u_char ch;
-
-	count += read(fd, &ch, sizeof(ch));
-	if (writes) {
-		if (widx >= num_pipes)
-			widx -= num_pipes;
-		write(pipes[2 * widx + 1], "e", 1);
-		writes--;
-		fired++;
-	}
-}
-
-static struct timeval *
-run_once(void)
-{
-	int *cp, space;
-	long i;
-	static struct timeval ts, te;
-
-	for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
-		event_del(&events[i]);
-		event_set(&events[i], cp[0], EV_READ | EV_PERSIST, read_cb, (void *) i);
-		event_add(&events[i], NULL);
-	}
-
-	event_loop(EVLOOP_ONCE | EVLOOP_NONBLOCK);
-
-	fired = 0;
-	space = num_pipes / num_active;
-	space = space * 2;
-	for (i = 0; i < num_active; i++, fired++)
-		write(pipes[i * space + 1], "e", 1);
-
-	count = 0;
-	writes = num_writes;
-	{ int xcount = 0;
-	gettimeofday(&ts, NULL);
-	do {
-		event_loop(EVLOOP_ONCE | EVLOOP_NONBLOCK);
-		xcount++;
-	} while (count != fired);
-	gettimeofday(&te, NULL);
-
-	if (xcount != count) fprintf(stderr, "Xcount: %d, Rcount: %d\n", xcount, count);
-	}
-
-	evutil_timersub(&te, &ts, &te);
-
-	return (&te);
-}
-
-int
-main (int argc, char **argv)
-{
-#ifndef WIN32
-	struct rlimit rl;
-#endif
-	int i, c;
-	struct timeval *tv;
-	int *cp;
-
-	num_pipes = 100;
-	num_active = 1;
-	num_writes = num_pipes;
-	while ((c = getopt(argc, argv, "n:a:w:")) != -1) {
-		switch (c) {
-		case 'n':
-			num_pipes = atoi(optarg);
-			break;
-		case 'a':
-			num_active = atoi(optarg);
-			break;
-		case 'w':
-			num_writes = atoi(optarg);
-			break;
-		default:
-			fprintf(stderr, "Illegal argument \"%c\"\n", c);
-			exit(1);
-		}
-	}
-
-#ifndef WIN32
-	rl.rlim_cur = rl.rlim_max = num_pipes * 2 + 50;
-	if (setrlimit(RLIMIT_NOFILE, &rl) == -1) {
-		perror("setrlimit");
-		exit(1);
-	}
-#endif
-
-	events = calloc(num_pipes, sizeof(struct event));
-	pipes = calloc(num_pipes * 2, sizeof(int));
-	if (events == NULL || pipes == NULL) {
-		perror("malloc");
-		exit(1);
-	}
-
-	event_init();
-
-	for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
-#ifdef USE_PIPES
-		if (pipe(cp) == -1) {
-#else
-		if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, cp) == -1) {
-#endif
-			perror("pipe");
-			exit(1);
-		}
-	}
-
-	for (i = 0; i < 25; i++) {
-		tv = run_once();
-		if (tv == NULL)
-			exit(1);
-		fprintf(stdout, "%ld\n",
-			tv->tv_sec * 1000000L + tv->tv_usec);
-	}
-
-	exit(0);
-}
diff --git a/libevent/test/regress.c b/libevent/test/regress.c
deleted file mode 100644
index 0b7517d3aa4c..000000000000
--- a/libevent/test/regress.c
+++ /dev/null
@@ -1,1703 +0,0 @@
-/*
- * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#ifndef WIN32
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <unistd.h>
-#include <netdb.h>
-#endif
-#include <assert.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "event.h"
-#include "evutil.h"
-#include "event-internal.h"
-#include "log.h"
-
-#include "regress.h"
-#ifndef WIN32
-#include "regress.gen.h"
-#endif
-
-int pair[2];
-int test_ok;
-static int called;
-static char wbuf[4096];
-static char rbuf[4096];
-static int woff;
-static int roff;
-static int usepersist;
-static struct timeval tset;
-static struct timeval tcalled;
-static struct event_base *global_base;
-
-#define TEST1	"this is a test"
-#define SECONDS	1
-
-#ifndef SHUT_WR
-#define SHUT_WR 1
-#endif
-
-#ifdef WIN32
-#define write(fd,buf,len) send((fd),(buf),(len),0)
-#define read(fd,buf,len) recv((fd),(buf),(len),0)
-#endif
-
-static void
-simple_read_cb(int fd, short event, void *arg)
-{
-	char buf[256];
-	int len;
-
-	if (arg == NULL)
-		return;
-
-	len = read(fd, buf, sizeof(buf));
-
-	if (len) {
-		if (!called) {
-			if (event_add(arg, NULL) == -1)
-				exit(1);
-		}
-	} else if (called == 1)
-		test_ok = 1;
-
-	called++;
-}
-
-static void
-simple_write_cb(int fd, short event, void *arg)
-{
-	int len;
-
-	if (arg == NULL)
-		return;
-
-	len = write(fd, TEST1, strlen(TEST1) + 1);
-	if (len == -1)
-		test_ok = 0;
-	else
-		test_ok = 1;
-}
-
-static void
-multiple_write_cb(int fd, short event, void *arg)
-{
-	struct event *ev = arg;
-	int len;
-
-	len = 128;
-	if (woff + len >= sizeof(wbuf))
-		len = sizeof(wbuf) - woff;
-
-	len = write(fd, wbuf + woff, len);
-	if (len == -1) {
-		fprintf(stderr, "%s: write\n", __func__);
-		if (usepersist)
-			event_del(ev);
-		return;
-	}
-
-	woff += len;
-
-	if (woff >= sizeof(wbuf)) {
-		shutdown(fd, SHUT_WR);
-		if (usepersist)
-			event_del(ev);
-		return;
-	}
-
-	if (!usepersist) {
-		if (event_add(ev, NULL) == -1)
-			exit(1);
-	}
-}
-
-static void
-multiple_read_cb(int fd, short event, void *arg)
-{
-	struct event *ev = arg;
-	int len;
-
-	len = read(fd, rbuf + roff, sizeof(rbuf) - roff);
-	if (len == -1)
-		fprintf(stderr, "%s: read\n", __func__);
-	if (len <= 0) {
-		if (usepersist)
-			event_del(ev);
-		return;
-	}
-
-	roff += len;
-	if (!usepersist) {
-		if (event_add(ev, NULL) == -1) 
-			exit(1);
-	}
-}
-
-static void
-timeout_cb(int fd, short event, void *arg)
-{
-	struct timeval tv;
-	int diff;
-
-	evutil_gettimeofday(&tcalled, NULL);
-	if (evutil_timercmp(&tcalled, &tset, >))
-		evutil_timersub(&tcalled, &tset, &tv);
-	else
-		evutil_timersub(&tset, &tcalled, &tv);
-
-	diff = tv.tv_sec*1000 + tv.tv_usec/1000 - SECONDS * 1000;
-	if (diff < 0)
-		diff = -diff;
-
-	if (diff < 100)
-		test_ok = 1;
-}
-
-#ifndef WIN32
-static void
-signal_cb_sa(int sig)
-{
-	test_ok = 2;
-}
-
-static void
-signal_cb(int fd, short event, void *arg)
-{
-	struct event *ev = arg;
-
-	signal_del(ev);
-	test_ok = 1;
-}
-#endif
-
-struct both {
-	struct event ev;
-	int nread;
-};
-
-static void
-combined_read_cb(int fd, short event, void *arg)
-{
-	struct both *both = arg;
-	char buf[128];
-	int len;
-
-	len = read(fd, buf, sizeof(buf));
-	if (len == -1)
-		fprintf(stderr, "%s: read\n", __func__);
-	if (len <= 0)
-		return;
-
-	both->nread += len;
-	if (event_add(&both->ev, NULL) == -1)
-		exit(1);
-}
-
-static void
-combined_write_cb(int fd, short event, void *arg)
-{
-	struct both *both = arg;
-	char buf[128];
-	int len;
-
-	len = sizeof(buf);
-	if (len > both->nread)
-		len = both->nread;
-
-	len = write(fd, buf, len);
-	if (len == -1)
-		fprintf(stderr, "%s: write\n", __func__);
-	if (len <= 0) {
-		shutdown(fd, SHUT_WR);
-		return;
-	}
-
-	both->nread -= len;
-	if (event_add(&both->ev, NULL) == -1)
-		exit(1);
-}
-
-/* Test infrastructure */
-
-static int
-setup_test(const char *name)
-{
-
-	fprintf(stdout, "%s", name);
-
-	if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
-		fprintf(stderr, "%s: socketpair\n", __func__);
-		exit(1);
-	}
-
-#ifdef HAVE_FCNTL
-        if (fcntl(pair[0], F_SETFL, O_NONBLOCK) == -1)
-		fprintf(stderr, "fcntl(O_NONBLOCK)");
-
-        if (fcntl(pair[1], F_SETFL, O_NONBLOCK) == -1)
-		fprintf(stderr, "fcntl(O_NONBLOCK)");
-#endif
-
-	test_ok = 0;
-	called = 0;
-	return (0);
-}
-
-static int
-cleanup_test(void)
-{
-#ifndef WIN32
-	close(pair[0]);
-	close(pair[1]);
-#else
-	CloseHandle((HANDLE)pair[0]);
-	CloseHandle((HANDLE)pair[1]);
-#endif
-	if (test_ok)
-		fprintf(stdout, "OK\n");
-	else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-        test_ok = 0;
-	return (0);
-}
-
-static void
-test_registerfds(void)
-{
-	int i, j;
-	int pair[2];
-	struct event read_evs[512];
-	struct event write_evs[512];
-
-	struct event_base *base = event_base_new();
-
-	fprintf(stdout, "Testing register fds: ");
-
-	for (i = 0; i < 512; ++i) {
-		if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
-			/* run up to the limit of file descriptors */
-			break;
-		}
-		event_set(&read_evs[i], pair[0],
-		    EV_READ|EV_PERSIST, simple_read_cb, NULL);
-		event_base_set(base, &read_evs[i]);
-		event_add(&read_evs[i], NULL);
-		event_set(&write_evs[i], pair[1],
-		    EV_WRITE|EV_PERSIST, simple_write_cb, NULL);
-		event_base_set(base, &write_evs[i]);
-		event_add(&write_evs[i], NULL);
-
-		/* just loop once */
-		event_base_loop(base, EVLOOP_ONCE);
-	}
-
-	/* now delete everything */
-	for (j = 0; j < i; ++j) {
-		event_del(&read_evs[j]);
-		event_del(&write_evs[j]);
-#ifndef WIN32
-		close(read_evs[j].ev_fd);
-		close(write_evs[j].ev_fd);
-#else
-		CloseHandle((HANDLE)read_evs[j].ev_fd);
-		CloseHandle((HANDLE)write_evs[j].ev_fd);
-#endif
-
-		/* just loop once */
-		event_base_loop(base, EVLOOP_ONCE);
-	}
-
-	event_base_free(base);
-
-	fprintf(stdout, "OK\n");
-}
-
-static void
-test_simpleread(void)
-{
-	struct event ev;
-
-	/* Very simple read test */
-	setup_test("Simple read: ");
-	
-	write(pair[0], TEST1, strlen(TEST1)+1);
-	shutdown(pair[0], SHUT_WR);
-
-	event_set(&ev, pair[1], EV_READ, simple_read_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-	event_dispatch();
-
-	cleanup_test();
-}
-
-static void
-test_simplewrite(void)
-{
-	struct event ev;
-
-	/* Very simple write test */
-	setup_test("Simple write: ");
-	
-	event_set(&ev, pair[0], EV_WRITE, simple_write_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-	event_dispatch();
-
-	cleanup_test();
-}
-
-static void
-test_multiple(void)
-{
-	struct event ev, ev2;
-	int i;
-
-	/* Multiple read and write test */
-	setup_test("Multiple read/write: ");
-	memset(rbuf, 0, sizeof(rbuf));
-	for (i = 0; i < sizeof(wbuf); i++)
-		wbuf[i] = i;
-
-	roff = woff = 0;
-	usepersist = 0;
-
-	event_set(&ev, pair[0], EV_WRITE, multiple_write_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-	event_set(&ev2, pair[1], EV_READ, multiple_read_cb, &ev2);
-	if (event_add(&ev2, NULL) == -1)
-		exit(1);
-	event_dispatch();
-
-	if (roff == woff)
-		test_ok = memcmp(rbuf, wbuf, sizeof(wbuf)) == 0;
-
-	cleanup_test();
-}
-
-static void
-test_persistent(void)
-{
-	struct event ev, ev2;
-	int i;
-
-	/* Multiple read and write test with persist */
-	setup_test("Persist read/write: ");
-	memset(rbuf, 0, sizeof(rbuf));
-	for (i = 0; i < sizeof(wbuf); i++)
-		wbuf[i] = i;
-
-	roff = woff = 0;
-	usepersist = 1;
-
-	event_set(&ev, pair[0], EV_WRITE|EV_PERSIST, multiple_write_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-	event_set(&ev2, pair[1], EV_READ|EV_PERSIST, multiple_read_cb, &ev2);
-	if (event_add(&ev2, NULL) == -1)
-		exit(1);
-	event_dispatch();
-
-	if (roff == woff)
-		test_ok = memcmp(rbuf, wbuf, sizeof(wbuf)) == 0;
-
-	cleanup_test();
-}
-
-static void
-test_combined(void)
-{
-	struct both r1, r2, w1, w2;
-
-	setup_test("Combined read/write: ");
-	memset(&r1, 0, sizeof(r1));
-	memset(&r2, 0, sizeof(r2));
-	memset(&w1, 0, sizeof(w1));
-	memset(&w2, 0, sizeof(w2));
-
-	w1.nread = 4096;
-	w2.nread = 8192;
-
-	event_set(&r1.ev, pair[0], EV_READ, combined_read_cb, &r1);
-	event_set(&w1.ev, pair[0], EV_WRITE, combined_write_cb, &w1);
-	event_set(&r2.ev, pair[1], EV_READ, combined_read_cb, &r2);
-	event_set(&w2.ev, pair[1], EV_WRITE, combined_write_cb, &w2);
-	if (event_add(&r1.ev, NULL) == -1)
-		exit(1);
-	if (event_add(&w1.ev, NULL))
-		exit(1);
-	if (event_add(&r2.ev, NULL))
-		exit(1);
-	if (event_add(&w2.ev, NULL))
-		exit(1);
-
-	event_dispatch();
-
-	if (r1.nread == 8192 && r2.nread == 4096)
-		test_ok = 1;
-
-	cleanup_test();
-}
-
-static void
-test_simpletimeout(void)
-{
-	struct timeval tv;
-	struct event ev;
-
-	setup_test("Simple timeout: ");
-
-	tv.tv_usec = 0;
-	tv.tv_sec = SECONDS;
-	evtimer_set(&ev, timeout_cb, NULL);
-	evtimer_add(&ev, &tv);
-
-	evutil_gettimeofday(&tset, NULL);
-	event_dispatch();
-
-	cleanup_test();
-}
-
-#ifndef WIN32
-extern struct event_base *current_base;
-
-static void
-child_signal_cb(int fd, short event, void *arg)
-{
-	struct timeval tv;
-	int *pint = arg;
-
-	*pint = 1;
-
-	tv.tv_usec = 500000;
-	tv.tv_sec = 0;
-	event_loopexit(&tv);
-}
-
-static void
-test_fork(void)
-{
-	int status, got_sigchld = 0;
-	struct event ev, sig_ev;
-	pid_t pid;
-
-	setup_test("After fork: ");
-
-	write(pair[0], TEST1, strlen(TEST1)+1);
-
-	event_set(&ev, pair[1], EV_READ, simple_read_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-
-	signal_set(&sig_ev, SIGCHLD, child_signal_cb, &got_sigchld);
-	signal_add(&sig_ev, NULL);
-
-	if ((pid = fork()) == 0) {
-		/* in the child */
-		if (event_reinit(current_base) == -1) {
-			fprintf(stderr, "FAILED (reinit)\n");
-			exit(1);
-		}
-
-		signal_del(&sig_ev);
-
-		called = 0;
-
-		event_dispatch();
-
-		/* we do not send an EOF; simple_read_cb requires an EOF 
-		 * to set test_ok.  we just verify that the callback was
-		 * called. */
-		exit(test_ok != 0 || called != 2 ? -2 : 76);
-	}
-
-	/* wait for the child to read the data */
-	sleep(1);
-
-	write(pair[0], TEST1, strlen(TEST1)+1);
-
-	if (waitpid(pid, &status, 0) == -1) {
-		fprintf(stderr, "FAILED (fork)\n");
-		exit(1);
-	}
-	
-	if (WEXITSTATUS(status) != 76) {
-		fprintf(stderr, "FAILED (exit): %d\n", WEXITSTATUS(status));
-		exit(1);
-	}
-
-	/* test that the current event loop still works */
-	write(pair[0], TEST1, strlen(TEST1)+1);
-	shutdown(pair[0], SHUT_WR);
-
-	event_dispatch();
-
-	if (!got_sigchld) {
-		fprintf(stdout, "FAILED (sigchld)\n");
-		exit(1);
-	}
-
-	signal_del(&sig_ev);
-
-	cleanup_test();
-}
-
-static void
-test_simplesignal(void)
-{
-	struct event ev;
-	struct itimerval itv;
-
-	setup_test("Simple signal: ");
-	signal_set(&ev, SIGALRM, signal_cb, &ev);
-	signal_add(&ev, NULL);
-	/* find bugs in which operations are re-ordered */
-	signal_del(&ev);
-	signal_add(&ev, NULL);
-
-	memset(&itv, 0, sizeof(itv));
-	itv.it_value.tv_sec = 1;
-	if (setitimer(ITIMER_REAL, &itv, NULL) == -1)
-		goto skip_simplesignal;
-
-	event_dispatch();
- skip_simplesignal:
-	if (signal_del(&ev) == -1)
-		test_ok = 0;
-
-	cleanup_test();
-}
-
-static void
-test_multiplesignal(void)
-{
-	struct event ev_one, ev_two;
-	struct itimerval itv;
-
-	setup_test("Multiple signal: ");
-
-	signal_set(&ev_one, SIGALRM, signal_cb, &ev_one);
-	signal_add(&ev_one, NULL);
-
-	signal_set(&ev_two, SIGALRM, signal_cb, &ev_two);
-	signal_add(&ev_two, NULL);
-
-	memset(&itv, 0, sizeof(itv));
-	itv.it_value.tv_sec = 1;
-	if (setitimer(ITIMER_REAL, &itv, NULL) == -1)
-		goto skip_simplesignal;
-
-	event_dispatch();
-
- skip_simplesignal:
-	if (signal_del(&ev_one) == -1)
-		test_ok = 0;
-	if (signal_del(&ev_two) == -1)
-		test_ok = 0;
-
-	cleanup_test();
-}
-
-static void
-test_immediatesignal(void)
-{
-	struct event ev;
-
-	test_ok = 0;
-	printf("Immediate signal: ");
-	signal_set(&ev, SIGUSR1, signal_cb, &ev);
-	signal_add(&ev, NULL);
-	raise(SIGUSR1);
-	event_loop(EVLOOP_NONBLOCK);
-	signal_del(&ev);
-	cleanup_test();
-}
-
-static void
-test_signal_dealloc(void)
-{
-	/* make sure that signal_event is event_del'ed and pipe closed */
-	struct event ev;
-	struct event_base *base = event_init();
-	printf("Signal dealloc: ");
-	signal_set(&ev, SIGUSR1, signal_cb, &ev);
-	signal_add(&ev, NULL);
-	signal_del(&ev);
-	event_base_free(base);
-        /* If we got here without asserting, we're fine. */
-        test_ok = 1;
-	cleanup_test();
-}
-
-static void
-test_signal_pipeloss(void)
-{
-	/* make sure that the base1 pipe is closed correctly. */
-	struct event_base *base1, *base2;
-	int pipe1;
-	test_ok = 0;
-	printf("Signal pipeloss: ");
-	base1 = event_init();
-	pipe1 = base1->sig.ev_signal_pair[0];
-	base2 = event_init();
-	event_base_free(base2);
-	event_base_free(base1);
-	if (close(pipe1) != -1 || errno!=EBADF) {
-		/* fd must be closed, so second close gives -1, EBADF */
-		printf("signal pipe not closed. ");
-		test_ok = 0;
-	} else {
-		test_ok = 1;
-	}
-	cleanup_test();
-}
-
-/*
- * make two bases to catch signals, use both of them.  this only works
- * for event mechanisms that use our signal pipe trick.  kqueue handles
- * signals internally, and all interested kqueues get all the signals.
- */
-static void
-test_signal_switchbase(void)
-{
-	struct event ev1, ev2;
-	struct event_base *base1, *base2;
-        int is_kqueue;
-	test_ok = 0;
-	printf("Signal switchbase: ");
-	base1 = event_init();
-	base2 = event_init();
-        is_kqueue = !strcmp(event_get_method(),"kqueue");
-	signal_set(&ev1, SIGUSR1, signal_cb, &ev1);
-	signal_set(&ev2, SIGUSR1, signal_cb, &ev2);
-	if (event_base_set(base1, &ev1) ||
-	    event_base_set(base2, &ev2) ||
-	    event_add(&ev1, NULL) ||
-	    event_add(&ev2, NULL)) {
-		fprintf(stderr, "%s: cannot set base, add\n", __func__);
-		exit(1);
-	}
-
-	test_ok = 0;
-	/* can handle signal before loop is called */
-	raise(SIGUSR1);
-	event_base_loop(base2, EVLOOP_NONBLOCK);
-        if (is_kqueue) {
-                if (!test_ok)
-                        goto done;
-                test_ok = 0;
-        }
-	event_base_loop(base1, EVLOOP_NONBLOCK);
-	if (test_ok && !is_kqueue) {
-		test_ok = 0;
-
-		/* set base1 to handle signals */
-		event_base_loop(base1, EVLOOP_NONBLOCK);
-		raise(SIGUSR1);
-		event_base_loop(base1, EVLOOP_NONBLOCK);
-		event_base_loop(base2, EVLOOP_NONBLOCK);
-	}
- done:
-	event_base_free(base1);
-	event_base_free(base2);
-	cleanup_test();
-}
-
-/*
- * assert that a signal event removed from the event queue really is
- * removed - with no possibility of it's parent handler being fired.
- */
-static void
-test_signal_assert(void)
-{
-	struct event ev;
-	struct event_base *base = event_init();
-	test_ok = 0;
-	printf("Signal handler assert: ");
-	/* use SIGCONT so we don't kill ourselves when we signal to nowhere */
-	signal_set(&ev, SIGCONT, signal_cb, &ev);
-	signal_add(&ev, NULL);
-	/*
-	 * if signal_del() fails to reset the handler, it's current handler
-	 * will still point to evsignal_handler().
-	 */
-	signal_del(&ev);
-
-	raise(SIGCONT);
-	/* only way to verify we were in evsignal_handler() */
-	if (base->sig.evsignal_caught)
-		test_ok = 0;
-	else
-		test_ok = 1;
-
-	event_base_free(base);
-	cleanup_test();
-	return;
-}
-
-/*
- * assert that we restore our previous signal handler properly.
- */
-static void
-test_signal_restore(void)
-{
-	struct event ev;
-	struct event_base *base = event_init();
-#ifdef HAVE_SIGACTION
-	struct sigaction sa;
-#endif
-
-	test_ok = 0;
-	printf("Signal handler restore: ");
-#ifdef HAVE_SIGACTION
-	sa.sa_handler = signal_cb_sa;
-	sa.sa_flags = 0x0;
-	sigemptyset(&sa.sa_mask);
-	if (sigaction(SIGUSR1, &sa, NULL) == -1)
-		goto out;
-#else
-	if (signal(SIGUSR1, signal_cb_sa) == SIG_ERR)
-		goto out;
-#endif
-	signal_set(&ev, SIGUSR1, signal_cb, &ev);
-	signal_add(&ev, NULL);
-	signal_del(&ev);
-
-	raise(SIGUSR1);
-	/* 1 == signal_cb, 2 == signal_cb_sa, we want our previous handler */
-	if (test_ok != 2)
-		test_ok = 0;
-out:
-	event_base_free(base);
-	cleanup_test();
-	return;
-}
-
-static void
-signal_cb_swp(int sig, short event, void *arg)
-{
-	called++;
-	if (called < 5)
-		raise(sig);
-	else
-		event_loopexit(NULL);
-}
-static void
-timeout_cb_swp(int fd, short event, void *arg)
-{
-	if (called == -1) {
-		struct timeval tv = {5, 0};
-
-		called = 0;
-		evtimer_add((struct event *)arg, &tv);
-		raise(SIGUSR1);
-		return;
-	}
-	test_ok = 0;
-	event_loopexit(NULL);
-}
-
-static void
-test_signal_while_processing(void)
-{
-	struct event_base *base = event_init();
-	struct event ev, ev_timer;
-	struct timeval tv = {0, 0};
-
-	setup_test("Receiving a signal while processing other signal: ");
-
-	called = -1;
-	test_ok = 1;
-	signal_set(&ev, SIGUSR1, signal_cb_swp, NULL);
-	signal_add(&ev, NULL);
-	evtimer_set(&ev_timer, timeout_cb_swp, &ev_timer);
-	evtimer_add(&ev_timer, &tv);
-	event_dispatch();
-
-	event_base_free(base);
-	cleanup_test();
-	return;
-}
-#endif
-
-static void
-test_free_active_base(void)
-{
-	struct event_base *base1;
-	struct event ev1;
-	setup_test("Free active base: ");
-	base1 = event_init();
-	event_set(&ev1, pair[1], EV_READ, simple_read_cb, &ev1);
-	event_base_set(base1, &ev1);
-	event_add(&ev1, NULL);
-	/* event_del(&ev1); */
-	event_base_free(base1);
-	test_ok = 1;
-	cleanup_test();
-}
-
-static void
-test_event_base_new(void)
-{
-	struct event_base *base;
-	struct event ev1;
-	setup_test("Event base new: ");
-
-	write(pair[0], TEST1, strlen(TEST1)+1);
-	shutdown(pair[0], SHUT_WR);
-
-	base = event_base_new();
-	event_set(&ev1, pair[1], EV_READ, simple_read_cb, &ev1);
-	event_base_set(base, &ev1);
-	event_add(&ev1, NULL);
-
-	event_base_dispatch(base);
-
-	event_base_free(base);
-	test_ok = 1;
-	cleanup_test();
-}
-
-static void
-test_loopexit(void)
-{
-	struct timeval tv, tv_start, tv_end;
-	struct event ev;
-
-	setup_test("Loop exit: ");
-
-	tv.tv_usec = 0;
-	tv.tv_sec = 60*60*24;
-	evtimer_set(&ev, timeout_cb, NULL);
-	evtimer_add(&ev, &tv);
-
-	tv.tv_usec = 0;
-	tv.tv_sec = 1;
-	event_loopexit(&tv);
-
-	evutil_gettimeofday(&tv_start, NULL);
-	event_dispatch();
-	evutil_gettimeofday(&tv_end, NULL);
-	evutil_timersub(&tv_end, &tv_start, &tv_end);
-
-	evtimer_del(&ev);
-
-	if (tv.tv_sec < 2)
-		test_ok = 1;
-
-	cleanup_test();
-}
-
-static void
-test_loopexit_multiple(void)
-{
-	struct timeval tv;
-	struct event_base *base;
-
-	setup_test("Loop Multiple exit: ");
-
-	base = event_base_new();
-	
-	tv.tv_usec = 0;
-	tv.tv_sec = 1;
-	event_base_loopexit(base, &tv);
-
-	tv.tv_usec = 0;
-	tv.tv_sec = 2;
-	event_base_loopexit(base, &tv);
-
-	event_base_dispatch(base);
-
-	event_base_free(base);
-	
-	test_ok = 1;
-
-	cleanup_test();
-}
-
-static void
-break_cb(int fd, short events, void *arg)
-{
-	test_ok = 1;
-	event_loopbreak();
-}
-
-static void
-fail_cb(int fd, short events, void *arg)
-{
-	test_ok = 0;
-}
-
-static void
-test_loopbreak(void)
-{
-	struct event ev1, ev2;
-	struct timeval tv;
-
-	setup_test("Loop break: ");
-
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-	evtimer_set(&ev1, break_cb, NULL);
-	evtimer_add(&ev1, &tv);
-	evtimer_set(&ev2, fail_cb, NULL);
-	evtimer_add(&ev2, &tv);
-
-	event_dispatch();
-
-	evtimer_del(&ev1);
-	evtimer_del(&ev2);
-
-	cleanup_test();
-}
-
-static void
-test_evbuffer(void) {
-
-	struct evbuffer *evb = evbuffer_new();
-	setup_test("Testing Evbuffer: ");
-
-	evbuffer_add_printf(evb, "%s/%d", "hello", 1);
-
-	if (EVBUFFER_LENGTH(evb) == 7 &&
-	    strcmp((char*)EVBUFFER_DATA(evb), "hello/1") == 0)
-	    test_ok = 1;
-	
-	evbuffer_free(evb);
-
-	cleanup_test();
-}
-
-static void
-test_evbuffer_find(void)
-{
-	u_char* p;
-	const char* test1 = "1234567890\r\n";
-	const char* test2 = "1234567890\r";
-#define EVBUFFER_INITIAL_LENGTH 256
-	char test3[EVBUFFER_INITIAL_LENGTH];
-	unsigned int i;
-	struct evbuffer * buf = evbuffer_new();
-
-	/* make sure evbuffer_find doesn't match past the end of the buffer */
-	fprintf(stdout, "Testing evbuffer_find 1: ");
-	evbuffer_add(buf, (u_char*)test1, strlen(test1));
-	evbuffer_drain(buf, strlen(test1));	  
-	evbuffer_add(buf, (u_char*)test2, strlen(test2));
-	p = evbuffer_find(buf, (u_char*)"\r\n", 2);
-	if (p == NULL) {
-		fprintf(stdout, "OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * drain the buffer and do another find; in r309 this would
-	 * read past the allocated buffer causing a valgrind error.
-	 */
-	fprintf(stdout, "Testing evbuffer_find 2: ");
-	evbuffer_drain(buf, strlen(test2));
-	for (i = 0; i < EVBUFFER_INITIAL_LENGTH; ++i)
-		test3[i] = 'a';
-	test3[EVBUFFER_INITIAL_LENGTH - 1] = 'x';
-	evbuffer_add(buf, (u_char *)test3, EVBUFFER_INITIAL_LENGTH);
-	p = evbuffer_find(buf, (u_char *)"xy", 2);
-	if (p == NULL) {
-		printf("OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* simple test for match at end of allocated buffer */
-	fprintf(stdout, "Testing evbuffer_find 3: ");
-	p = evbuffer_find(buf, (u_char *)"ax", 2);
-	if (p != NULL && strncmp((char*)p, "ax", 2) == 0) {
-		printf("OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	evbuffer_free(buf);
-}
-
-/*
- * simple bufferevent test
- */
-
-static void
-readcb(struct bufferevent *bev, void *arg)
-{
-	if (EVBUFFER_LENGTH(bev->input) == 8333) {
-		bufferevent_disable(bev, EV_READ);
-		test_ok++;
-	}
-}
-
-static void
-writecb(struct bufferevent *bev, void *arg)
-{
-	if (EVBUFFER_LENGTH(bev->output) == 0)
-		test_ok++;
-}
-
-static void
-errorcb(struct bufferevent *bev, short what, void *arg)
-{
-	test_ok = -2;
-}
-
-static void
-test_bufferevent(void)
-{
-	struct bufferevent *bev1, *bev2;
-	char buffer[8333];
-	int i;
-
-	setup_test("Bufferevent: ");
-
-	bev1 = bufferevent_new(pair[0], readcb, writecb, errorcb, NULL);
-	bev2 = bufferevent_new(pair[1], readcb, writecb, errorcb, NULL);
-
-	bufferevent_disable(bev1, EV_READ);
-	bufferevent_enable(bev2, EV_READ);
-
-	for (i = 0; i < sizeof(buffer); i++)
-		buffer[i] = i;
-
-	bufferevent_write(bev1, buffer, sizeof(buffer));
-
-	event_dispatch();
-
-	bufferevent_free(bev1);
-	bufferevent_free(bev2);
-
-	if (test_ok != 2)
-		test_ok = 0;
-
-	cleanup_test();
-}
-
-/*
- * test watermarks and bufferevent
- */
-
-static void
-wm_readcb(struct bufferevent *bev, void *arg)
-{
-	int len = EVBUFFER_LENGTH(bev->input);
-	static int nread;
-
-	assert(len >= 10 && len <= 20);
-
-	evbuffer_drain(bev->input, len);
-
-	nread += len;
-	if (nread == 65000) {
-		bufferevent_disable(bev, EV_READ);
-		test_ok++;
-	}
-}
-
-static void
-wm_writecb(struct bufferevent *bev, void *arg)
-{
-	if (EVBUFFER_LENGTH(bev->output) == 0)
-		test_ok++;
-}
-
-static void
-wm_errorcb(struct bufferevent *bev, short what, void *arg)
-{
-	test_ok = -2;
-}
-
-static void
-test_bufferevent_watermarks(void)
-{
-	struct bufferevent *bev1, *bev2;
-	char buffer[65000];
-	int i;
-
-	setup_test("Bufferevent Watermarks: ");
-
-	bev1 = bufferevent_new(pair[0], NULL, wm_writecb, wm_errorcb, NULL);
-	bev2 = bufferevent_new(pair[1], wm_readcb, NULL, wm_errorcb, NULL);
-
-	bufferevent_disable(bev1, EV_READ);
-	bufferevent_enable(bev2, EV_READ);
-
-	for (i = 0; i < sizeof(buffer); i++)
-		buffer[i] = i;
-
-	bufferevent_write(bev1, buffer, sizeof(buffer));
-
-	/* limit the reading on the receiving bufferevent */
-	bufferevent_setwatermark(bev2, EV_READ, 10, 20);
-
-	event_dispatch();
-
-	bufferevent_free(bev1);
-	bufferevent_free(bev2);
-
-	if (test_ok != 2)
-		test_ok = 0;
-
-	cleanup_test();
-}
-
-struct test_pri_event {
-	struct event ev;
-	int count;
-};
-
-static void
-test_priorities_cb(int fd, short what, void *arg)
-{
-	struct test_pri_event *pri = arg;
-	struct timeval tv;
-
-	if (pri->count == 3) {
-		event_loopexit(NULL);
-		return;
-	}
-
-	pri->count++;
-
-	evutil_timerclear(&tv);
-	event_add(&pri->ev, &tv);
-}
-
-static void
-test_priorities(int npriorities)
-{
-	char buf[32];
-	struct test_pri_event one, two;
-	struct timeval tv;
-
-	evutil_snprintf(buf, sizeof(buf), "Testing Priorities %d: ", npriorities);
-	setup_test(buf);
-
-	event_base_priority_init(global_base, npriorities);
-
-	memset(&one, 0, sizeof(one));
-	memset(&two, 0, sizeof(two));
-
-	timeout_set(&one.ev, test_priorities_cb, &one);
-	if (event_priority_set(&one.ev, 0) == -1) {
-		fprintf(stderr, "%s: failed to set priority", __func__);
-		exit(1);
-	}
-
-	timeout_set(&two.ev, test_priorities_cb, &two);
-	if (event_priority_set(&two.ev, npriorities - 1) == -1) {
-		fprintf(stderr, "%s: failed to set priority", __func__);
-		exit(1);
-	}
-
-	evutil_timerclear(&tv);
-
-	if (event_add(&one.ev, &tv) == -1)
-		exit(1);
-	if (event_add(&two.ev, &tv) == -1)
-		exit(1);
-
-	event_dispatch();
-
-	event_del(&one.ev);
-	event_del(&two.ev);
-
-	if (npriorities == 1) {
-		if (one.count == 3 && two.count == 3)
-			test_ok = 1;
-	} else if (npriorities == 2) {
-		/* Two is called once because event_loopexit is priority 1 */
-		if (one.count == 3 && two.count == 1)
-			test_ok = 1;
-	} else {
-		if (one.count == 3 && two.count == 0)
-			test_ok = 1;
-	}
-
-	cleanup_test();
-}
-
-static void
-test_multiple_cb(int fd, short event, void *arg)
-{
-	if (event & EV_READ)
-		test_ok |= 1;
-	else if (event & EV_WRITE)
-		test_ok |= 2;
-}
-
-static void
-test_multiple_events_for_same_fd(void)
-{
-   struct event e1, e2;
-
-   setup_test("Multiple events for same fd: ");
-
-   event_set(&e1, pair[0], EV_READ, test_multiple_cb, NULL);
-   event_add(&e1, NULL);
-   event_set(&e2, pair[0], EV_WRITE, test_multiple_cb, NULL);
-   event_add(&e2, NULL);
-   event_loop(EVLOOP_ONCE);
-   event_del(&e2);
-   write(pair[1], TEST1, strlen(TEST1)+1);
-   event_loop(EVLOOP_ONCE);
-   event_del(&e1);
-   
-   if (test_ok != 3)
-	   test_ok = 0;
-
-   cleanup_test();
-}
-
-int evtag_decode_int(uint32_t *pnumber, struct evbuffer *evbuf);
-int evtag_encode_tag(struct evbuffer *evbuf, uint32_t number);
-int evtag_decode_tag(uint32_t *pnumber, struct evbuffer *evbuf);
-
-static void
-read_once_cb(int fd, short event, void *arg)
-{
-	char buf[256];
-	int len;
-
-	len = read(fd, buf, sizeof(buf));
-
-	if (called) {
-		test_ok = 0;
-	} else if (len) {
-		/* Assumes global pair[0] can be used for writing */
-		write(pair[0], TEST1, strlen(TEST1)+1);
-		test_ok = 1;
-	}
-
-	called++;
-}
-
-static void
-test_want_only_once(void)
-{
-	struct event ev;
-	struct timeval tv;
-
-	/* Very simple read test */
-	setup_test("Want read only once: ");
-	
-	write(pair[0], TEST1, strlen(TEST1)+1);
-
-	/* Setup the loop termination */
-	evutil_timerclear(&tv);
-	tv.tv_sec = 1;
-	event_loopexit(&tv);
-	
-	event_set(&ev, pair[1], EV_READ, read_once_cb, &ev);
-	if (event_add(&ev, NULL) == -1)
-		exit(1);
-	event_dispatch();
-
-	cleanup_test();
-}
-
-#define TEST_MAX_INT	6
-
-static void
-evtag_int_test(void)
-{
-	struct evbuffer *tmp = evbuffer_new();
-	uint32_t integers[TEST_MAX_INT] = {
-		0xaf0, 0x1000, 0x1, 0xdeadbeef, 0x00, 0xbef000
-	};
-	uint32_t integer;
-	int i;
-
-	for (i = 0; i < TEST_MAX_INT; i++) {
-		int oldlen, newlen;
-		oldlen = EVBUFFER_LENGTH(tmp);
-		encode_int(tmp, integers[i]);
-		newlen = EVBUFFER_LENGTH(tmp);
-		fprintf(stdout, "\t\tencoded 0x%08x with %d bytes\n",
-		    integers[i], newlen - oldlen);
-	}
-
-	for (i = 0; i < TEST_MAX_INT; i++) {
-		if (evtag_decode_int(&integer, tmp) == -1) {
-			fprintf(stderr, "decode %d failed", i);
-			exit(1);
-		}
-		if (integer != integers[i]) {
-			fprintf(stderr, "got %x, wanted %x",
-			    integer, integers[i]);
-			exit(1);
-		}
-	}
-
-	if (EVBUFFER_LENGTH(tmp) != 0) {
-		fprintf(stderr, "trailing data");
-		exit(1);
-	}
-	evbuffer_free(tmp);
-
-	fprintf(stdout, "\t%s: OK\n", __func__);
-}
-
-static void
-evtag_fuzz(void)
-{
-	u_char buffer[4096];
-	struct evbuffer *tmp = evbuffer_new();
-	struct timeval tv;
-	int i, j;
-
-	int not_failed = 0;
-	for (j = 0; j < 100; j++) {
-		for (i = 0; i < sizeof(buffer); i++)
-			buffer[i] = rand();
-		evbuffer_drain(tmp, -1);
-		evbuffer_add(tmp, buffer, sizeof(buffer));
-
-		if (evtag_unmarshal_timeval(tmp, 0, &tv) != -1)
-			not_failed++;
-	}
-
-	/* The majority of decodes should fail */
-	if (not_failed >= 10) {
-		fprintf(stderr, "evtag_unmarshal should have failed");
-		exit(1);
-	}
-
-	/* Now insert some corruption into the tag length field */
-	evbuffer_drain(tmp, -1);
-	evutil_timerclear(&tv);
-	tv.tv_sec = 1;
-	evtag_marshal_timeval(tmp, 0, &tv);
-	evbuffer_add(tmp, buffer, sizeof(buffer));
-
-	EVBUFFER_DATA(tmp)[1] = 0xff;
-	if (evtag_unmarshal_timeval(tmp, 0, &tv) != -1) {
-		fprintf(stderr, "evtag_unmarshal_timeval should have failed");
-		exit(1);
-	}
-
-	evbuffer_free(tmp);
-
-	fprintf(stdout, "\t%s: OK\n", __func__);
-}
-
-static void
-evtag_tag_encoding(void)
-{
-	struct evbuffer *tmp = evbuffer_new();
-	uint32_t integers[TEST_MAX_INT] = {
-		0xaf0, 0x1000, 0x1, 0xdeadbeef, 0x00, 0xbef000
-	};
-	uint32_t integer;
-	int i;
-
-	for (i = 0; i < TEST_MAX_INT; i++) {
-		int oldlen, newlen;
-		oldlen = EVBUFFER_LENGTH(tmp);
-		evtag_encode_tag(tmp, integers[i]);
-		newlen = EVBUFFER_LENGTH(tmp);
-		fprintf(stdout, "\t\tencoded 0x%08x with %d bytes\n",
-		    integers[i], newlen - oldlen);
-	}
-
-	for (i = 0; i < TEST_MAX_INT; i++) {
-		if (evtag_decode_tag(&integer, tmp) == -1) {
-			fprintf(stderr, "decode %d failed", i);
-			exit(1);
-		}
-		if (integer != integers[i]) {
-			fprintf(stderr, "got %x, wanted %x",
-			    integer, integers[i]);
-			exit(1);
-		}
-	}
-
-	if (EVBUFFER_LENGTH(tmp) != 0) {
-		fprintf(stderr, "trailing data");
-		exit(1);
-	}
-	evbuffer_free(tmp);
-
-	fprintf(stdout, "\t%s: OK\n", __func__);
-}
-
-static void
-evtag_test(void)
-{
-	fprintf(stdout, "Testing Tagging:\n");
-
-	evtag_init();
-	evtag_int_test();
-	evtag_fuzz();
-
-	evtag_tag_encoding();
-
-	fprintf(stdout, "OK\n");
-}
-
-#ifndef WIN32
-static void
-rpc_test(void)
-{
-	struct msg *msg, *msg2;
-	struct kill *attack;
-	struct run *run;
-	struct evbuffer *tmp = evbuffer_new();
-	struct timeval tv_start, tv_end;
-	uint32_t tag;
-	int i;
-
-	fprintf(stdout, "Testing RPC: ");
-
-	msg = msg_new();
-	EVTAG_ASSIGN(msg, from_name, "niels");
-	EVTAG_ASSIGN(msg, to_name, "phoenix");
-
-	if (EVTAG_GET(msg, attack, &attack) == -1) {
-		fprintf(stderr, "Failed to set kill message.\n");
-		exit(1);
-	}
-
-	EVTAG_ASSIGN(attack, weapon, "feather");
-	EVTAG_ASSIGN(attack, action, "tickle");
-
-	evutil_gettimeofday(&tv_start, NULL);
-	for (i = 0; i < 1000; ++i) {
-		run = EVTAG_ADD(msg, run);
-		if (run == NULL) {
-			fprintf(stderr, "Failed to add run message.\n");
-			exit(1);
-		}
-		EVTAG_ASSIGN(run, how, "very fast but with some data in it");
-		EVTAG_ASSIGN(run, fixed_bytes,
-		    (unsigned char*)"012345678901234567890123");
-	}
-
-	if (msg_complete(msg) == -1) {
-		fprintf(stderr, "Failed to make complete message.\n");
-		exit(1);
-	}
-
-	evtag_marshal_msg(tmp, 0xdeaf, msg);
-
-	if (evtag_peek(tmp, &tag) == -1) {
-		fprintf(stderr, "Failed to peak tag.\n");
-		exit (1);
-	}
-
-	if (tag != 0xdeaf) {
-		fprintf(stderr, "Got incorrect tag: %0x.\n", tag);
-		exit (1);
-	}
-
-	msg2 = msg_new();
-	if (evtag_unmarshal_msg(tmp, 0xdeaf, msg2) == -1) {
-		fprintf(stderr, "Failed to unmarshal message.\n");
-		exit(1);
-	}
-
-	evutil_gettimeofday(&tv_end, NULL);
-	evutil_timersub(&tv_end, &tv_start, &tv_end);
-	fprintf(stderr, "(%.1f us/add) ",
-	    (float)tv_end.tv_sec/(float)i * 1000000.0 +
-	    tv_end.tv_usec / (float)i);
-
-	if (!EVTAG_HAS(msg2, from_name) ||
-	    !EVTAG_HAS(msg2, to_name) ||
-	    !EVTAG_HAS(msg2, attack)) {
-		fprintf(stderr, "Missing data structures.\n");
-		exit(1);
-	}
-
-	if (EVTAG_LEN(msg2, run) != i) {
-		fprintf(stderr, "Wrong number of run messages.\n");
-		exit(1);
-	}
-
-	msg_free(msg);
-	msg_free(msg2);
-
-	evbuffer_free(tmp);
-
-	fprintf(stdout, "OK\n");
-}
-#endif
-
-static void
-test_evutil_strtoll(void)
-{
-        const char *s;
-        char *endptr;
-        setup_test("evutil_stroll: ");
-        test_ok = 0;
-
-        if (evutil_strtoll("5000000000", NULL, 10) != ((ev_int64_t)5000000)*1000)
-                goto err;
-        if (evutil_strtoll("-5000000000", NULL, 10) != ((ev_int64_t)5000000)*-1000)
-                goto err;
-        s = " 99999stuff";
-        if (evutil_strtoll(s, &endptr, 10) != (ev_int64_t)99999)
-                goto err;
-        if (endptr != s+6)
-                goto err;
-        if (evutil_strtoll("foo", NULL, 10) != 0)
-                goto err;
-
-        test_ok = 1;
- err:
-        cleanup_test();
-}
-
-
-int
-main (int argc, char **argv)
-{
-#ifdef WIN32
-	WORD wVersionRequested;
-	WSADATA wsaData;
-	int	err;
-
-	wVersionRequested = MAKEWORD( 2, 2 );
-
-	err = WSAStartup( wVersionRequested, &wsaData );
-#endif
-
-#ifndef WIN32
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-		return (1);
-#endif
-	setvbuf(stdout, NULL, _IONBF, 0);
-
-	/* Initalize the event library */
-	global_base = event_init();
-
-	test_registerfds();
-
-        test_evutil_strtoll();
-
-	/* use the global event base and need to be called first */
-	test_priorities(1);
-	test_priorities(2);
-	test_priorities(3);
-
-	test_evbuffer();
-	test_evbuffer_find();
-	
-	test_bufferevent();
-	test_bufferevent_watermarks();
-
-	test_free_active_base();
-
-	test_event_base_new();
-
-	http_suite();
-
-#ifndef WIN32
-	rpc_suite();
-#endif
-
-	dns_suite();
-	
-#ifndef WIN32
-	test_fork();
-#endif
-
-	test_simpleread();
-
-	test_simplewrite();
-
-	test_multiple();
-
-	test_persistent();
-
-	test_combined();
-
-	test_simpletimeout();
-#ifndef WIN32
-	test_simplesignal();
-	test_multiplesignal();
-	test_immediatesignal();
-#endif
-	test_loopexit();
-	test_loopbreak();
-
-	test_loopexit_multiple();
-	
-	test_multiple_events_for_same_fd();
-
-	test_want_only_once();
-
-	evtag_test();
-
-#ifndef WIN32
-	rpc_test();
-
-	test_signal_dealloc();
-	test_signal_pipeloss();
-	test_signal_switchbase();
-	test_signal_restore();
-	test_signal_assert();
-	test_signal_while_processing();
-#endif
-	
-	return (0);
-}
-
diff --git a/libevent/test/regress.gen.c b/libevent/test/regress.gen.c
deleted file mode 100644
index ff31096a7c28..000000000000
--- a/libevent/test/regress.gen.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*
- * Automatically generated from ./regress.rpc
- * by event_rpcgen.py/0.1.  DO NOT EDIT THIS FILE.
- */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <event.h>
-
-
-#include "./regress.gen.h"
-
-void event_err(int eval, const char *fmt, ...);
-void event_warn(const char *fmt, ...);
-void event_errx(int eval, const char *fmt, ...);
-void event_warnx(const char *fmt, ...);
-
-
-/*
- * Implementation of msg
- */
-
-static struct msg_access_ __msg_base = {
-  msg_from_name_assign,
-  msg_from_name_get,
-  msg_to_name_assign,
-  msg_to_name_get,
-  msg_attack_assign,
-  msg_attack_get,
-  msg_run_assign,
-  msg_run_get,
-  msg_run_add,
-};
-
-struct msg *
-msg_new(void)
-{
-  struct msg *tmp;
-  if ((tmp = malloc(sizeof(struct msg))) == NULL) {
-    event_warn("%s: malloc", __func__);
-    return (NULL);
-  }
-  tmp->base = &__msg_base;
-
-  tmp->from_name_data = NULL;
-  tmp->from_name_set = 0;
-
-  tmp->to_name_data = NULL;
-  tmp->to_name_set = 0;
-
-  tmp->attack_data = NULL;
-  tmp->attack_set = 0;
-
-  tmp->run_data = NULL;
-  tmp->run_length = 0;
-  tmp->run_num_allocated = 0;
-  tmp->run_set = 0;
-
-  return (tmp);
-}
-
-
-
-
-struct run *
-msg_run_add(struct msg *msg)
-{
-  if (++msg->run_length >= msg->run_num_allocated) {
-    int tobe_allocated = msg->run_num_allocated;
-    struct run ** new_data = NULL;
-    tobe_allocated = !tobe_allocated ? 1 : tobe_allocated << 1;
-    new_data = (struct run **) realloc(msg->run_data,
-        tobe_allocated * sizeof(struct run *));
-    if (new_data == NULL)
-      goto error;
-    msg->run_data = new_data;
-    msg->run_num_allocated = tobe_allocated;
-  }
-  msg->run_data[msg->run_length - 1] = run_new();
-  if (msg->run_data[msg->run_length - 1] == NULL)
-    goto error;
-  msg->run_set = 1;
-  return (msg->run_data[msg->run_length - 1]);
-error:
-  --msg->run_length;
-  return (NULL);
-}
-        
-
-int
-msg_from_name_assign(struct msg *msg,
-    const char * value)
-{
-  if (msg->from_name_data != NULL)
-    free(msg->from_name_data);
-  if ((msg->from_name_data = strdup(value)) == NULL)
-    return (-1);
-  msg->from_name_set = 1;
-  return (0);
-}
-
-int
-msg_to_name_assign(struct msg *msg,
-    const char * value)
-{
-  if (msg->to_name_data != NULL)
-    free(msg->to_name_data);
-  if ((msg->to_name_data = strdup(value)) == NULL)
-    return (-1);
-  msg->to_name_set = 1;
-  return (0);
-}
-
-int
-msg_attack_assign(struct msg *msg,
-    const struct kill* value)
-{
-   struct evbuffer *tmp = NULL;
-   if (msg->attack_set) {
-     kill_clear(msg->attack_data);
-     msg->attack_set = 0;
-   } else {
-     msg->attack_data = kill_new();
-     if (msg->attack_data == NULL) {
-       event_warn("%s: kill_new()", __func__);
-       goto error;
-     }
-   }
-   if ((tmp = evbuffer_new()) == NULL) {
-     event_warn("%s: evbuffer_new()", __func__);
-     goto error;
-   }
-   kill_marshal(tmp, value);
-   if (kill_unmarshal(msg->attack_data, tmp) == -1) {
-     event_warnx("%s: kill_unmarshal", __func__);
-     goto error;
-   }
-   msg->attack_set = 1;
-   evbuffer_free(tmp);
-   return (0);
- error:
-   if (tmp != NULL)
-     evbuffer_free(tmp);
-   if (msg->attack_data != NULL) {
-     kill_free(msg->attack_data);
-     msg->attack_data = NULL;
-   }
-   return (-1);
-}
-
-int
-msg_run_assign(struct msg *msg, int off,
-    const struct run * value)
-{
-  struct evbuffer *tmp = NULL;
-  if (!msg->run_set || off < 0 || off >= msg->run_length)
-    return (-1);
-  run_clear(msg->run_data[off]);
-  if ((tmp = evbuffer_new()) == NULL) {
-    event_warn("%s: evbuffer_new()", __func__);
-    goto error;
-  }
-  run_marshal(tmp, value);
-  if (run_unmarshal(msg->run_data[off], tmp) == -1) {
-    event_warnx("%s: run_unmarshal", __func__);
-    goto error;
-  }
-  evbuffer_free(tmp);
-  return (0);
-error:
-  if (tmp != NULL)
-    evbuffer_free(tmp);
-  run_clear(msg->run_data[off]);
-  return (-1);
-}
-
-int
-msg_from_name_get(struct msg *msg, char * *value)
-{
-  if (msg->from_name_set != 1)
-    return (-1);
-  *value = msg->from_name_data;
-  return (0);
-}
-
-int
-msg_to_name_get(struct msg *msg, char * *value)
-{
-  if (msg->to_name_set != 1)
-    return (-1);
-  *value = msg->to_name_data;
-  return (0);
-}
-
-int
-msg_attack_get(struct msg *msg, struct kill* *value)
-{
-  if (msg->attack_set != 1) {
-    msg->attack_data = kill_new();
-    if (msg->attack_data == NULL)
-      return (-1);
-    msg->attack_set = 1;
-  }
-  *value = msg->attack_data;
-  return (0);
-}
-
-int
-msg_run_get(struct msg *msg, int offset,
-    struct run * *value)
-{
-  if (!msg->run_set || offset < 0 || offset >= msg->run_length)
-    return (-1);
-  *value = msg->run_data[offset];
-  return (0);
-}
-
-void
-msg_clear(struct msg *tmp)
-{
-  if (tmp->from_name_set == 1) {
-    free (tmp->from_name_data);
-    tmp->from_name_data = NULL;
-    tmp->from_name_set = 0;
-  }
-  if (tmp->to_name_set == 1) {
-    free (tmp->to_name_data);
-    tmp->to_name_data = NULL;
-    tmp->to_name_set = 0;
-  }
-  if (tmp->attack_set == 1) {
-    kill_free(tmp->attack_data);
-    tmp->attack_data = NULL;
-    tmp->attack_set = 0;
-  }
-  if (tmp->run_set == 1) {
-    int i;
-    for (i = 0; i < tmp->run_length; ++i) {
-      run_free(tmp->run_data[i]);
-    }
-    free(tmp->run_data);
-    tmp->run_data = NULL;
-    tmp->run_set = 0;
-    tmp->run_length = 0;
-    tmp->run_num_allocated = 0;
-  }
-}
-
-void
-msg_free(struct msg *tmp)
-{
-  if (tmp->from_name_data != NULL)
-      free (tmp->from_name_data); 
-  if (tmp->to_name_data != NULL)
-      free (tmp->to_name_data); 
-  if (tmp->attack_data != NULL)
-      kill_free(tmp->attack_data); 
-  if (tmp->run_data != NULL) {
-    int i;
-    for (i = 0; i < tmp->run_length; ++i) {
-      run_free(tmp->run_data[i]); 
-      tmp->run_data[i] = NULL;
-    }
-    free(tmp->run_data);
-    tmp->run_data = NULL;
-    tmp->run_length = 0;
-    tmp->run_num_allocated = 0;
-  }
-  free(tmp);
-}
-
-void
-msg_marshal(struct evbuffer *evbuf, const struct msg *tmp){
-  evtag_marshal_string(evbuf, MSG_FROM_NAME, tmp->from_name_data);
-  evtag_marshal_string(evbuf, MSG_TO_NAME, tmp->to_name_data);
-  if (tmp->attack_set) {
-    evtag_marshal_kill(evbuf, MSG_ATTACK, tmp->attack_data);
-  }
-  {
-    int i;
-    for (i = 0; i < tmp->run_length; ++i) {
-      evtag_marshal_run(evbuf, MSG_RUN, tmp->run_data[i]);
-    }
-  }
-}
-
-int
-msg_unmarshal(struct msg *tmp,  struct evbuffer *evbuf)
-{
-  uint32_t tag;
-  while (EVBUFFER_LENGTH(evbuf) > 0) {
-    if (evtag_peek(evbuf, &tag) == -1)
-      return (-1);
-    switch (tag) {
-
-      case MSG_FROM_NAME:
-
-        if (tmp->from_name_set)
-          return (-1);
-        if (evtag_unmarshal_string(evbuf, MSG_FROM_NAME, &tmp->from_name_data) == -1) {
-          event_warnx("%s: failed to unmarshal from_name", __func__);
-          return (-1);
-        }
-        tmp->from_name_set = 1;
-        break;
-
-      case MSG_TO_NAME:
-
-        if (tmp->to_name_set)
-          return (-1);
-        if (evtag_unmarshal_string(evbuf, MSG_TO_NAME, &tmp->to_name_data) == -1) {
-          event_warnx("%s: failed to unmarshal to_name", __func__);
-          return (-1);
-        }
-        tmp->to_name_set = 1;
-        break;
-
-      case MSG_ATTACK:
-
-        if (tmp->attack_set)
-          return (-1);
-        tmp->attack_data = kill_new();
-        if (tmp->attack_data == NULL)
-          return (-1);
-        if (evtag_unmarshal_kill(evbuf, MSG_ATTACK, tmp->attack_data) == -1) {
-          event_warnx("%s: failed to unmarshal attack", __func__);
-          return (-1);
-        }
-        tmp->attack_set = 1;
-        break;
-
-      case MSG_RUN:
-
-        if (msg_run_add(tmp) == NULL)
-          return (-1);
-        if (evtag_unmarshal_run(evbuf, MSG_RUN,
-          tmp->run_data[tmp->run_length - 1]) == -1) {
-          --tmp->run_length;
-          event_warnx("%s: failed to unmarshal run", __func__);
-          return (-1);
-        }
-        tmp->run_set = 1;
-        break;
-
-      default:
-        return -1;
-    }
-  }
-
-  if (msg_complete(tmp) == -1)
-    return (-1);
-  return (0);
-}
-
-int
-msg_complete(struct msg *msg)
-{
-  if (!msg->from_name_set)
-    return (-1);
-  if (!msg->to_name_set)
-    return (-1);
-  if (msg->attack_set && kill_complete(msg->attack_data) == -1)
-    return (-1);
-  {
-    int i;
-    for (i = 0; i < msg->run_length; ++i) {
-      if (run_complete(msg->run_data[i]) == -1)
-        return (-1);
-    }
-  }
-  return (0);
-}
-
-int
-evtag_unmarshal_msg(struct evbuffer *evbuf, uint32_t need_tag, struct msg *msg)
-{
-  uint32_t tag;
-  int res = -1;
-
-  struct evbuffer *tmp = evbuffer_new();
-
-  if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
-    goto error;
-
-  if (msg_unmarshal(msg, tmp) == -1)
-    goto error;
-
-  res = 0;
-
- error:
-  evbuffer_free(tmp);
-  return (res);
-}
-
-void
-evtag_marshal_msg(struct evbuffer *evbuf, uint32_t tag, const struct msg *msg)
-{
-  struct evbuffer *_buf = evbuffer_new();
-  assert(_buf != NULL);
-  evbuffer_drain(_buf, -1);
-  msg_marshal(_buf, msg);
-  evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
-  evbuffer_free(_buf);
-}
-
-/*
- * Implementation of kill
- */
-
-static struct kill_access_ __kill_base = {
-  kill_weapon_assign,
-  kill_weapon_get,
-  kill_action_assign,
-  kill_action_get,
-  kill_how_often_assign,
-  kill_how_often_get,
-};
-
-struct kill *
-kill_new(void)
-{
-  struct kill *tmp;
-  if ((tmp = malloc(sizeof(struct kill))) == NULL) {
-    event_warn("%s: malloc", __func__);
-    return (NULL);
-  }
-  tmp->base = &__kill_base;
-
-  tmp->weapon_data = NULL;
-  tmp->weapon_set = 0;
-
-  tmp->action_data = NULL;
-  tmp->action_set = 0;
-
-  tmp->how_often_data = 0;
-  tmp->how_often_set = 0;
-
-  return (tmp);
-}
-
-
-
-
-int
-kill_weapon_assign(struct kill *msg,
-    const char * value)
-{
-  if (msg->weapon_data != NULL)
-    free(msg->weapon_data);
-  if ((msg->weapon_data = strdup(value)) == NULL)
-    return (-1);
-  msg->weapon_set = 1;
-  return (0);
-}
-
-int
-kill_action_assign(struct kill *msg,
-    const char * value)
-{
-  if (msg->action_data != NULL)
-    free(msg->action_data);
-  if ((msg->action_data = strdup(value)) == NULL)
-    return (-1);
-  msg->action_set = 1;
-  return (0);
-}
-
-int
-kill_how_often_assign(struct kill *msg, const uint32_t value)
-{
-  msg->how_often_set = 1;
-  msg->how_often_data = value;
-  return (0);
-}
-
-int
-kill_weapon_get(struct kill *msg, char * *value)
-{
-  if (msg->weapon_set != 1)
-    return (-1);
-  *value = msg->weapon_data;
-  return (0);
-}
-
-int
-kill_action_get(struct kill *msg, char * *value)
-{
-  if (msg->action_set != 1)
-    return (-1);
-  *value = msg->action_data;
-  return (0);
-}
-
-int
-kill_how_often_get(struct kill *msg, uint32_t *value)
-{
-  if (msg->how_often_set != 1)
-    return (-1);
-  *value = msg->how_often_data;
-  return (0);
-}
-
-void
-kill_clear(struct kill *tmp)
-{
-  if (tmp->weapon_set == 1) {
-    free (tmp->weapon_data);
-    tmp->weapon_data = NULL;
-    tmp->weapon_set = 0;
-  }
-  if (tmp->action_set == 1) {
-    free (tmp->action_data);
-    tmp->action_data = NULL;
-    tmp->action_set = 0;
-  }
-  tmp->how_often_set = 0;
-}
-
-void
-kill_free(struct kill *tmp)
-{
-  if (tmp->weapon_data != NULL)
-      free (tmp->weapon_data); 
-  if (tmp->action_data != NULL)
-      free (tmp->action_data); 
-  free(tmp);
-}
-
-void
-kill_marshal(struct evbuffer *evbuf, const struct kill *tmp){
-  evtag_marshal_string(evbuf, KILL_WEAPON, tmp->weapon_data);
-  evtag_marshal_string(evbuf, KILL_ACTION, tmp->action_data);
-  if (tmp->how_often_set) {
-    evtag_marshal_int(evbuf, KILL_HOW_OFTEN, tmp->how_often_data);
-  }
-}
-
-int
-kill_unmarshal(struct kill *tmp,  struct evbuffer *evbuf)
-{
-  uint32_t tag;
-  while (EVBUFFER_LENGTH(evbuf) > 0) {
-    if (evtag_peek(evbuf, &tag) == -1)
-      return (-1);
-    switch (tag) {
-
-      case KILL_WEAPON:
-
-        if (tmp->weapon_set)
-          return (-1);
-        if (evtag_unmarshal_string(evbuf, KILL_WEAPON, &tmp->weapon_data) == -1) {
-          event_warnx("%s: failed to unmarshal weapon", __func__);
-          return (-1);
-        }
-        tmp->weapon_set = 1;
-        break;
-
-      case KILL_ACTION:
-
-        if (tmp->action_set)
-          return (-1);
-        if (evtag_unmarshal_string(evbuf, KILL_ACTION, &tmp->action_data) == -1) {
-          event_warnx("%s: failed to unmarshal action", __func__);
-          return (-1);
-        }
-        tmp->action_set = 1;
-        break;
-
-      case KILL_HOW_OFTEN:
-
-        if (tmp->how_often_set)
-          return (-1);
-        if (evtag_unmarshal_int(evbuf, KILL_HOW_OFTEN, &tmp->how_often_data) == -1) {
-          event_warnx("%s: failed to unmarshal how_often", __func__);
-          return (-1);
-        }
-        tmp->how_often_set = 1;
-        break;
-
-      default:
-        return -1;
-    }
-  }
-
-  if (kill_complete(tmp) == -1)
-    return (-1);
-  return (0);
-}
-
-int
-kill_complete(struct kill *msg)
-{
-  if (!msg->weapon_set)
-    return (-1);
-  if (!msg->action_set)
-    return (-1);
-  return (0);
-}
-
-int
-evtag_unmarshal_kill(struct evbuffer *evbuf, uint32_t need_tag, struct kill *msg)
-{
-  uint32_t tag;
-  int res = -1;
-
-  struct evbuffer *tmp = evbuffer_new();
-
-  if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
-    goto error;
-
-  if (kill_unmarshal(msg, tmp) == -1)
-    goto error;
-
-  res = 0;
-
- error:
-  evbuffer_free(tmp);
-  return (res);
-}
-
-void
-evtag_marshal_kill(struct evbuffer *evbuf, uint32_t tag, const struct kill *msg)
-{
-  struct evbuffer *_buf = evbuffer_new();
-  assert(_buf != NULL);
-  evbuffer_drain(_buf, -1);
-  kill_marshal(_buf, msg);
-  evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
-  evbuffer_free(_buf);
-}
-
-/*
- * Implementation of run
- */
-
-static struct run_access_ __run_base = {
-  run_how_assign,
-  run_how_get,
-  run_some_bytes_assign,
-  run_some_bytes_get,
-  run_fixed_bytes_assign,
-  run_fixed_bytes_get,
-};
-
-struct run *
-run_new(void)
-{
-  struct run *tmp;
-  if ((tmp = malloc(sizeof(struct run))) == NULL) {
-    event_warn("%s: malloc", __func__);
-    return (NULL);
-  }
-  tmp->base = &__run_base;
-
-  tmp->how_data = NULL;
-  tmp->how_set = 0;
-
-  tmp->some_bytes_data = NULL;
-  tmp->some_bytes_length = 0;
-  tmp->some_bytes_set = 0;
-
-  memset(tmp->fixed_bytes_data, 0, sizeof(tmp->fixed_bytes_data));
-  tmp->fixed_bytes_set = 0;
-
-  return (tmp);
-}
-
-
-
-
-int
-run_how_assign(struct run *msg,
-    const char * value)
-{
-  if (msg->how_data != NULL)
-    free(msg->how_data);
-  if ((msg->how_data = strdup(value)) == NULL)
-    return (-1);
-  msg->how_set = 1;
-  return (0);
-}
-
-int
-run_some_bytes_assign(struct run *msg, const uint8_t * value, uint32_t len)
-{
-  if (msg->some_bytes_data != NULL)
-    free (msg->some_bytes_data);
-  msg->some_bytes_data = malloc(len);
-  if (msg->some_bytes_data == NULL)
-    return (-1);
-  msg->some_bytes_set = 1;
-  msg->some_bytes_length = len;
-  memcpy(msg->some_bytes_data, value, len);
-  return (0);
-}
-
-int
-run_fixed_bytes_assign(struct run *msg, const uint8_t *value)
-{
-  msg->fixed_bytes_set = 1;
-  memcpy(msg->fixed_bytes_data, value, 24);
-  return (0);
-}
-
-int
-run_how_get(struct run *msg, char * *value)
-{
-  if (msg->how_set != 1)
-    return (-1);
-  *value = msg->how_data;
-  return (0);
-}
-
-int
-run_some_bytes_get(struct run *msg, uint8_t * *value, uint32_t *plen)
-{
-  if (msg->some_bytes_set != 1)
-    return (-1);
-  *value = msg->some_bytes_data;
-  *plen = msg->some_bytes_length;
-  return (0);
-}
-
-int
-run_fixed_bytes_get(struct run *msg, uint8_t **value)
-{
-  if (msg->fixed_bytes_set != 1)
-    return (-1);
-  *value = msg->fixed_bytes_data;
-  return (0);
-}
-
-void
-run_clear(struct run *tmp)
-{
-  if (tmp->how_set == 1) {
-    free (tmp->how_data);
-    tmp->how_data = NULL;
-    tmp->how_set = 0;
-  }
-  if (tmp->some_bytes_set == 1) {
-    free (tmp->some_bytes_data);
-    tmp->some_bytes_data = NULL;
-    tmp->some_bytes_length = 0;
-    tmp->some_bytes_set = 0;
-  }
-  tmp->fixed_bytes_set = 0;
-  memset(tmp->fixed_bytes_data, 0, sizeof(tmp->fixed_bytes_data));
-}
-
-void
-run_free(struct run *tmp)
-{
-  if (tmp->how_data != NULL)
-      free (tmp->how_data); 
-  if (tmp->some_bytes_data != NULL)
-      free (tmp->some_bytes_data); 
-  free(tmp);
-}
-
-void
-run_marshal(struct evbuffer *evbuf, const struct run *tmp){
-  evtag_marshal_string(evbuf, RUN_HOW, tmp->how_data);
-  if (tmp->some_bytes_set) {
-    evtag_marshal(evbuf, RUN_SOME_BYTES, tmp->some_bytes_data, tmp->some_bytes_length);
-  }
-  evtag_marshal(evbuf, RUN_FIXED_BYTES, tmp->fixed_bytes_data, sizeof(tmp->fixed_bytes_data));
-}
-
-int
-run_unmarshal(struct run *tmp,  struct evbuffer *evbuf)
-{
-  uint32_t tag;
-  while (EVBUFFER_LENGTH(evbuf) > 0) {
-    if (evtag_peek(evbuf, &tag) == -1)
-      return (-1);
-    switch (tag) {
-
-      case RUN_HOW:
-
-        if (tmp->how_set)
-          return (-1);
-        if (evtag_unmarshal_string(evbuf, RUN_HOW, &tmp->how_data) == -1) {
-          event_warnx("%s: failed to unmarshal how", __func__);
-          return (-1);
-        }
-        tmp->how_set = 1;
-        break;
-
-      case RUN_SOME_BYTES:
-
-        if (tmp->some_bytes_set)
-          return (-1);
-        if (evtag_payload_length(evbuf, &tmp->some_bytes_length) == -1)
-          return (-1);
-        if (tmp->some_bytes_length > EVBUFFER_LENGTH(evbuf))
-          return (-1);
-        if ((tmp->some_bytes_data = malloc(tmp->some_bytes_length)) == NULL)
-          return (-1);
-        if (evtag_unmarshal_fixed(evbuf, RUN_SOME_BYTES, tmp->some_bytes_data, tmp->some_bytes_length) == -1) {
-          event_warnx("%s: failed to unmarshal some_bytes", __func__);
-          return (-1);
-        }
-        tmp->some_bytes_set = 1;
-        break;
-
-      case RUN_FIXED_BYTES:
-
-        if (tmp->fixed_bytes_set)
-          return (-1);
-        if (evtag_unmarshal_fixed(evbuf, RUN_FIXED_BYTES, tmp->fixed_bytes_data, sizeof(tmp->fixed_bytes_data)) == -1) {
-          event_warnx("%s: failed to unmarshal fixed_bytes", __func__);
-          return (-1);
-        }
-        tmp->fixed_bytes_set = 1;
-        break;
-
-      default:
-        return -1;
-    }
-  }
-
-  if (run_complete(tmp) == -1)
-    return (-1);
-  return (0);
-}
-
-int
-run_complete(struct run *msg)
-{
-  if (!msg->how_set)
-    return (-1);
-  if (!msg->fixed_bytes_set)
-    return (-1);
-  return (0);
-}
-
-int
-evtag_unmarshal_run(struct evbuffer *evbuf, uint32_t need_tag, struct run *msg)
-{
-  uint32_t tag;
-  int res = -1;
-
-  struct evbuffer *tmp = evbuffer_new();
-
-  if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
-    goto error;
-
-  if (run_unmarshal(msg, tmp) == -1)
-    goto error;
-
-  res = 0;
-
- error:
-  evbuffer_free(tmp);
-  return (res);
-}
-
-void
-evtag_marshal_run(struct evbuffer *evbuf, uint32_t tag, const struct run *msg)
-{
-  struct evbuffer *_buf = evbuffer_new();
-  assert(_buf != NULL);
-  evbuffer_drain(_buf, -1);
-  run_marshal(_buf, msg);
-  evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
-  evbuffer_free(_buf);
-}
-
diff --git a/libevent/test/regress.gen.h b/libevent/test/regress.gen.h
deleted file mode 100644
index 09591f0584b3..000000000000
--- a/libevent/test/regress.gen.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Automatically generated from ./regress.rpc
- */
-
-#ifndef ___REGRESS_RPC_
-#define ___REGRESS_RPC_
-
-#include <event-config.h>
-#ifdef _EVENT_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
-#ifdef __GNUC__
-#define EVTAG_ASSIGN(msg, member, args...) (*(msg)->base->member##_assign)(msg, ## args)
-#define EVTAG_GET(msg, member, args...) (*(msg)->base->member##_get)(msg, ## args)
-#else
-#define EVTAG_ASSIGN(msg, member, ...) (*(msg)->base->member##_assign)(msg, ## __VA_ARGS__)
-#define EVTAG_GET(msg, member, ...) (*(msg)->base->member##_get)(msg, ## __VA_ARGS__)
-#endif
-#define EVTAG_ADD(msg, member) (*(msg)->base->member##_add)(msg)
-#define EVTAG_LEN(msg, member) ((msg)->member##_length)
-
-struct msg;
-struct kill;
-struct run;
-
-/* Tag definition for msg */
-enum msg_ {
-  MSG_FROM_NAME=1,
-  MSG_TO_NAME=2,
-  MSG_ATTACK=3,
-  MSG_RUN=4,
-  MSG_MAX_TAGS
-};
-
-/* Structure declaration for msg */
-struct msg_access_ {
-  int (*from_name_assign)(struct msg *, const char *);
-  int (*from_name_get)(struct msg *, char * *);
-  int (*to_name_assign)(struct msg *, const char *);
-  int (*to_name_get)(struct msg *, char * *);
-  int (*attack_assign)(struct msg *, const struct kill*);
-  int (*attack_get)(struct msg *, struct kill* *);
-  int (*run_assign)(struct msg *, int, const struct run *);
-  int (*run_get)(struct msg *, int, struct run * *);
-  struct run * (*run_add)(struct msg *);
-};
-
-struct msg {
-  struct msg_access_ *base;
-
-  char *from_name_data;
-  char *to_name_data;
-  struct kill* attack_data;
-  struct run **run_data;
-  int run_length;
-  int run_num_allocated;
-
-  uint8_t from_name_set;
-  uint8_t to_name_set;
-  uint8_t attack_set;
-  uint8_t run_set;
-};
-
-struct msg *msg_new(void);
-void msg_free(struct msg *);
-void msg_clear(struct msg *);
-void msg_marshal(struct evbuffer *, const struct msg *);
-int msg_unmarshal(struct msg *, struct evbuffer *);
-int msg_complete(struct msg *);
-void evtag_marshal_msg(struct evbuffer *, uint32_t, 
-    const struct msg *);
-int evtag_unmarshal_msg(struct evbuffer *, uint32_t,
-    struct msg *);
-int msg_from_name_assign(struct msg *, const char *);
-int msg_from_name_get(struct msg *, char * *);
-int msg_to_name_assign(struct msg *, const char *);
-int msg_to_name_get(struct msg *, char * *);
-int msg_attack_assign(struct msg *, const struct kill*);
-int msg_attack_get(struct msg *, struct kill* *);
-int msg_run_assign(struct msg *, int, const struct run *);
-int msg_run_get(struct msg *, int, struct run * *);
-struct run * msg_run_add(struct msg *);
-/* --- msg done --- */
-
-/* Tag definition for kill */
-enum kill_ {
-  KILL_WEAPON=65825,
-  KILL_ACTION=2,
-  KILL_HOW_OFTEN=3,
-  KILL_MAX_TAGS
-};
-
-/* Structure declaration for kill */
-struct kill_access_ {
-  int (*weapon_assign)(struct kill *, const char *);
-  int (*weapon_get)(struct kill *, char * *);
-  int (*action_assign)(struct kill *, const char *);
-  int (*action_get)(struct kill *, char * *);
-  int (*how_often_assign)(struct kill *, const uint32_t);
-  int (*how_often_get)(struct kill *, uint32_t *);
-};
-
-struct kill {
-  struct kill_access_ *base;
-
-  char *weapon_data;
-  char *action_data;
-  uint32_t how_often_data;
-
-  uint8_t weapon_set;
-  uint8_t action_set;
-  uint8_t how_often_set;
-};
-
-struct kill *kill_new(void);
-void kill_free(struct kill *);
-void kill_clear(struct kill *);
-void kill_marshal(struct evbuffer *, const struct kill *);
-int kill_unmarshal(struct kill *, struct evbuffer *);
-int kill_complete(struct kill *);
-void evtag_marshal_kill(struct evbuffer *, uint32_t, 
-    const struct kill *);
-int evtag_unmarshal_kill(struct evbuffer *, uint32_t,
-    struct kill *);
-int kill_weapon_assign(struct kill *, const char *);
-int kill_weapon_get(struct kill *, char * *);
-int kill_action_assign(struct kill *, const char *);
-int kill_action_get(struct kill *, char * *);
-int kill_how_often_assign(struct kill *, const uint32_t);
-int kill_how_often_get(struct kill *, uint32_t *);
-/* --- kill done --- */
-
-/* Tag definition for run */
-enum run_ {
-  RUN_HOW=1,
-  RUN_SOME_BYTES=2,
-  RUN_FIXED_BYTES=3,
-  RUN_MAX_TAGS
-};
-
-/* Structure declaration for run */
-struct run_access_ {
-  int (*how_assign)(struct run *, const char *);
-  int (*how_get)(struct run *, char * *);
-  int (*some_bytes_assign)(struct run *, const uint8_t *, uint32_t);
-  int (*some_bytes_get)(struct run *, uint8_t * *, uint32_t *);
-  int (*fixed_bytes_assign)(struct run *, const uint8_t *);
-  int (*fixed_bytes_get)(struct run *, uint8_t **);
-};
-
-struct run {
-  struct run_access_ *base;
-
-  char *how_data;
-  uint8_t *some_bytes_data;
-  uint32_t some_bytes_length;
-  uint8_t fixed_bytes_data[24];
-
-  uint8_t how_set;
-  uint8_t some_bytes_set;
-  uint8_t fixed_bytes_set;
-};
-
-struct run *run_new(void);
-void run_free(struct run *);
-void run_clear(struct run *);
-void run_marshal(struct evbuffer *, const struct run *);
-int run_unmarshal(struct run *, struct evbuffer *);
-int run_complete(struct run *);
-void evtag_marshal_run(struct evbuffer *, uint32_t, 
-    const struct run *);
-int evtag_unmarshal_run(struct evbuffer *, uint32_t,
-    struct run *);
-int run_how_assign(struct run *, const char *);
-int run_how_get(struct run *, char * *);
-int run_some_bytes_assign(struct run *, const uint8_t *, uint32_t);
-int run_some_bytes_get(struct run *, uint8_t * *, uint32_t *);
-int run_fixed_bytes_assign(struct run *, const uint8_t *);
-int run_fixed_bytes_get(struct run *, uint8_t **);
-/* --- run done --- */
-
-#endif  /* ___REGRESS_RPC_ */
diff --git a/libevent/test/regress.h b/libevent/test/regress.h
deleted file mode 100644
index 4060ff5c6ac8..000000000000
--- a/libevent/test/regress.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef _REGRESS_H_
-#define _REGRESS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void http_suite(void);
-void http_basic_test(void);
-
-void rpc_suite(void);
-
-void dns_suite(void);
-	
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _REGRESS_H_ */
diff --git a/libevent/test/regress.rpc b/libevent/test/regress.rpc
deleted file mode 100644
index 65ca95de4cfd..000000000000
--- a/libevent/test/regress.rpc
+++ /dev/null
@@ -1,20 +0,0 @@
-/* tests data packing and unpacking */
-
-struct msg {
-	string from_name = 1;
-	string to_name = 2;
-	optional struct[kill] attack = 3;
-	array struct[run] run = 4;
-}
-
-struct kill {
-	string weapon = 0x10121;
-	string action = 2;
-	optional int how_often = 3;
-}
-
-struct run {
-	string how = 1;
-	optional bytes some_bytes = 2;
-	bytes fixed_bytes[24] = 3;
-}
diff --git a/libevent/test/regress_dns.c b/libevent/test/regress_dns.c
deleted file mode 100644
index 129cdad498f3..000000000000
--- a/libevent/test/regress_dns.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#ifndef WIN32
-#include <sys/socket.h>
-#include <signal.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-#ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "event.h"
-#include "evdns.h"
-#include "log.h"
-
-static int dns_ok = 0;
-static int dns_err = 0;
-
-void dns_suite(void);
-
-static void
-dns_gethostbyname_cb(int result, char type, int count, int ttl,
-    void *addresses, void *arg)
-{
-	dns_ok = dns_err = 0;
-
-	if (result == DNS_ERR_TIMEOUT) {
-		fprintf(stdout, "[Timed out] ");
-		dns_err = result;
-		goto out;
-	}
-
-	if (result != DNS_ERR_NONE) {
-		fprintf(stdout, "[Error code %d] ", result);
-		goto out;
-	}
-
-	fprintf(stderr, "type: %d, count: %d, ttl: %d: ", type, count, ttl);
-
-	switch (type) {
-	case DNS_IPv6_AAAA: {
-#if defined(HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
-		struct in6_addr *in6_addrs = addresses;
-		char buf[INET6_ADDRSTRLEN+1];
-		int i;
-		/* a resolution that's not valid does not help */
-		if (ttl < 0)
-			goto out;
-		for (i = 0; i < count; ++i) {
-			const char *b = inet_ntop(AF_INET6, &in6_addrs[i], buf,sizeof(buf));
-			if (b)
-				fprintf(stderr, "%s ", b);
-			else
-				fprintf(stderr, "%s ", strerror(errno));
-		}
-#endif
-		break;
-	}
-	case DNS_IPv4_A: {
-		struct in_addr *in_addrs = addresses;
-		int i;
-		/* a resolution that's not valid does not help */
-		if (ttl < 0)
-			goto out;
-		for (i = 0; i < count; ++i)
-			fprintf(stderr, "%s ", inet_ntoa(in_addrs[i]));
-		break;
-	}
-	case DNS_PTR:
-		/* may get at most one PTR */
-		if (count != 1)
-			goto out;
-
-		fprintf(stderr, "%s ", *(char **)addresses);
-		break;
-	default:
-		goto out;
-	}
-
-	dns_ok = type;
-
-out:
-	event_loopexit(NULL);
-}
-
-static void
-dns_gethostbyname(void)
-{
-	fprintf(stdout, "Simple DNS resolve: ");
-	dns_ok = 0;
-	evdns_resolve_ipv4("www.monkey.org", 0, dns_gethostbyname_cb, NULL);
-	event_dispatch();
-
-	if (dns_ok == DNS_IPv4_A) {
-		fprintf(stdout, "OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-}
-
-static void
-dns_gethostbyname6(void)
-{
-	fprintf(stdout, "IPv6 DNS resolve: ");
-	dns_ok = 0;
-	evdns_resolve_ipv6("www.ietf.org", 0, dns_gethostbyname_cb, NULL);
-	event_dispatch();
-
-	if (dns_ok == DNS_IPv6_AAAA) {
-		fprintf(stdout, "OK\n");
-	} else if (!dns_ok && dns_err == DNS_ERR_TIMEOUT) {
-		fprintf(stdout, "SKIPPED\n");
-	} else {
-		fprintf(stdout, "FAILED (%d)\n", dns_ok);
-		exit(1);
-	}
-}
-
-static void
-dns_gethostbyaddr(void)
-{
-	struct in_addr in;
-	in.s_addr = htonl(0x7f000001ul); /* 127.0.0.1 */
-	fprintf(stdout, "Simple reverse DNS resolve: ");
-	dns_ok = 0;
-	evdns_resolve_reverse(&in, 0, dns_gethostbyname_cb, NULL);
-	event_dispatch();
-
-	if (dns_ok == DNS_PTR) {
-		fprintf(stdout, "OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-}
-
-static int n_server_responses = 0;
-
-static void
-dns_server_request_cb(struct evdns_server_request *req, void *data)
-{
-	int i, r;
-	const char TEST_ARPA[] = "11.11.168.192.in-addr.arpa";
-	for (i = 0; i < req->nquestions; ++i) {
-		struct in_addr ans;
-		ans.s_addr = htonl(0xc0a80b0bUL); /* 192.168.11.11 */
-		if (req->questions[i]->type == EVDNS_TYPE_A &&
-			req->questions[i]->dns_question_class == EVDNS_CLASS_INET &&
-			!strcmp(req->questions[i]->name, "zz.example.com")) {
-			r = evdns_server_request_add_a_reply(req, "zz.example.com",
-												 1, &ans.s_addr, 12345);
-			if (r<0)
-				dns_ok = 0;
-		} else if (req->questions[i]->type == EVDNS_TYPE_AAAA &&
-				   req->questions[i]->dns_question_class == EVDNS_CLASS_INET &&
-				   !strcmp(req->questions[i]->name, "zz.example.com")) {
-			char addr6[17] = "abcdefghijklmnop";
-			r = evdns_server_request_add_aaaa_reply(req, "zz.example.com",
-												 1, addr6, 123);
-			if (r<0)
-				dns_ok = 0;
-		} else if (req->questions[i]->type == EVDNS_TYPE_PTR &&
-				   req->questions[i]->dns_question_class == EVDNS_CLASS_INET &&
-				   !strcmp(req->questions[i]->name, TEST_ARPA)) {
-			r = evdns_server_request_add_ptr_reply(req, NULL, TEST_ARPA,
-					   "ZZ.EXAMPLE.COM", 54321);
-			if (r<0)
-				dns_ok = 0;
-		} else {
-			fprintf(stdout, "Unexpected question %d %d \"%s\" ",
-					req->questions[i]->type,
-					req->questions[i]->dns_question_class,
-					req->questions[i]->name);
-			dns_ok = 0;
-		}
-	}
-	r = evdns_server_request_respond(req, 0);
-	if (r<0) {
-		fprintf(stdout, "Couldn't send reply. ");
-		dns_ok = 0;
-	}
-}
-
-static void
-dns_server_gethostbyname_cb(int result, char type, int count, int ttl,
-							void *addresses, void *arg)
-{
-	if (result != DNS_ERR_NONE) {
-		fprintf(stdout, "Unexpected result %d. ", result);
-		dns_ok = 0;
-		goto out;
-	}
-	if (count != 1) {
-		fprintf(stdout, "Unexpected answer count %d. ", count);
-		dns_ok = 0;
-		goto out;
-	}
-	switch (type) {
-	case DNS_IPv4_A: {
-		struct in_addr *in_addrs = addresses;
-		if (in_addrs[0].s_addr != htonl(0xc0a80b0bUL) || ttl != 12345) {
-			fprintf(stdout, "Bad IPv4 response \"%s\" %d. ",
-					inet_ntoa(in_addrs[0]), ttl);
-			dns_ok = 0;
-			goto out;
-		}
-		break;
-	}
-	case DNS_IPv6_AAAA: {
-#if defined (HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
-		struct in6_addr *in6_addrs = addresses;
-		char buf[INET6_ADDRSTRLEN+1];
-		if (memcmp(&in6_addrs[0].s6_addr, "abcdefghijklmnop", 16)
-			|| ttl != 123) {
-			const char *b = inet_ntop(AF_INET6, &in6_addrs[0],buf,sizeof(buf));
-			fprintf(stdout, "Bad IPv6 response \"%s\" %d. ", b, ttl);
-			dns_ok = 0;
-			goto out;
-		}
-#endif
-		break;
-	}
-	case DNS_PTR: {
-		char **addrs = addresses;
-		if (strcmp(addrs[0], "ZZ.EXAMPLE.COM") || ttl != 54321) {
-			fprintf(stdout, "Bad PTR response \"%s\" %d. ",
-					addrs[0], ttl);
-			dns_ok = 0;
-			goto out;
-		}
-		break;
-	}
-	default:
-		fprintf(stdout, "Bad response type %d. ", type);
-		dns_ok = 0;
-	}
-
- out:
-	if (++n_server_responses == 3) {
-		event_loopexit(NULL);
-	}
-}
-
-static void
-dns_server(void)
-{
-	int sock;
-	struct sockaddr_in my_addr;
-	struct evdns_server_port *port;
-	struct in_addr resolve_addr;
-
-	dns_ok = 1;
-	fprintf(stdout, "DNS server support: ");
-
-	/* Add ourself as the only nameserver, and make sure we really are
-	 * the only nameserver. */
-	evdns_nameserver_ip_add("127.0.0.1:35353");
-	if (evdns_count_nameservers() != 1) {
-		fprintf(stdout, "Couldn't set up.\n");
-		exit(1);
-	}
-
-	/* Now configure a nameserver port. */
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock == -1) {
-		perror("socket");
-		exit(1);
-	}
-#ifdef WIN32
-	{
-		u_long nonblocking = 1;
-		ioctlsocket(sock, FIONBIO, &nonblocking);
-	}
-#else
-	fcntl(sock, F_SETFL, O_NONBLOCK);
-#endif
-	memset(&my_addr, 0, sizeof(my_addr));
-	my_addr.sin_family = AF_INET;
-	my_addr.sin_port = htons(35353);
-	my_addr.sin_addr.s_addr = htonl(0x7f000001UL);
-	if (bind(sock, (struct sockaddr*)&my_addr, sizeof(my_addr)) < 0) {
-		perror("bind");
-		exit (1);
-	}
-	port = evdns_add_server_port(sock, 0, dns_server_request_cb, NULL);
-
-	/* Send two queries. */
-	evdns_resolve_ipv4("zz.example.com", DNS_QUERY_NO_SEARCH,
-					   dns_server_gethostbyname_cb, NULL);
-	evdns_resolve_ipv6("zz.example.com", DNS_QUERY_NO_SEARCH,
-					   dns_server_gethostbyname_cb, NULL);
-	resolve_addr.s_addr = htonl(0xc0a80b0bUL); /* 192.168.11.11 */
-	evdns_resolve_reverse(&resolve_addr, 0,
-						  dns_server_gethostbyname_cb, NULL);
-
-	event_dispatch();
-
-	if (dns_ok) {
-		fprintf(stdout, "OK\n");
-	} else {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	evdns_close_server_port(port);
-	evdns_shutdown(0); /* remove ourself as nameserver. */
-#ifdef WIN32
-	closesocket(sock);
-#else
-	close(sock);
-#endif
-}
-
-void
-dns_suite(void)
-{
-	dns_server(); /* Do this before we call evdns_init. */
-
-	evdns_init();
-	dns_gethostbyname();
-	dns_gethostbyname6();
-	dns_gethostbyaddr();
-
-	evdns_shutdown(0);
-}
diff --git a/libevent/test/regress_http.c b/libevent/test/regress_http.c
deleted file mode 100644
index f9eba92171eb..000000000000
--- a/libevent/test/regress_http.c
+++ /dev/null
@@ -1,1490 +0,0 @@
-/*
- * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- * This file was modified by Oracle on 28-08-2015.
- * Modifications copyright (c) 2015, Oracle and/or its affiliates.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#ifndef WIN32
-#include <sys/socket.h>
-#include <signal.h>
-#include <unistd.h>
-#include <netdb.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "event.h"
-#include "evhttp.h"
-#include "log.h"
-#include "http-internal.h"
-
-#define INNODB_CHANGED
-
-extern int pair[];
-extern int test_ok;
-
-static struct evhttp *http;
-/* set if a test needs to call loopexit on a base */
-static struct event_base *base;
-
-void http_suite(void);
-
-void http_basic_cb(struct evhttp_request *req, void *arg);
-static void http_chunked_cb(struct evhttp_request *req, void *arg);
-void http_post_cb(struct evhttp_request *req, void *arg);
-void http_dispatcher_cb(struct evhttp_request *req, void *arg);
-static void http_large_delay_cb(struct evhttp_request *req, void *arg);
-
-static struct evhttp *
-http_setup(short *pport, struct event_base *base)
-{
-	int i;
-	struct evhttp *myhttp;
-	short port = -1;
-
-	/* Try a few different ports */
-	myhttp = evhttp_new(base);
-	for (i = 0; i < 50; ++i) {
-		if (evhttp_bind_socket(myhttp, "127.0.0.1", 8080 + i) != -1) {
-			port = 8080 + i;
-			break;
-		}
-	}
-
-	if (port == -1)
-		event_errx(1, "Could not start web server");
-
-	/* Register a callback for certain types of requests */
-	evhttp_set_cb(myhttp, "/test", http_basic_cb, NULL);
-	evhttp_set_cb(myhttp, "/chunked", http_chunked_cb, NULL);
-	evhttp_set_cb(myhttp, "/postit", http_post_cb, NULL);
-	evhttp_set_cb(myhttp, "/largedelay", http_large_delay_cb, NULL);
-	evhttp_set_cb(myhttp, "/", http_dispatcher_cb, NULL);
-
-	*pport = port;
-	return (myhttp);
-}
-
-#ifndef NI_MAXSERV
-#define NI_MAXSERV 1024
-#endif
-
-static int
-http_connect(const char *address, u_short port)
-{
-	/* Stupid code for connecting */
-#ifdef WIN32
-	struct hostent *he;
-	struct sockaddr_in sin;
-#else
-	struct addrinfo ai, *aitop;
-	char strport[NI_MAXSERV];
-#endif
-	struct sockaddr *sa;
-	int slen;
-	int fd;
-	
-#ifdef WIN32
-	if (!(he = gethostbyname(address))) {
-		event_warn("gethostbyname");
-	}
-	memcpy(&sin.sin_addr, he->h_addr_list[0], he->h_length);
-	sin.sin_family = AF_INET;
-	sin.sin_port = htons(port);
-	slen = sizeof(struct sockaddr_in);
-	sa = (struct sockaddr*)&sin;
-#else
-	memset(&ai, 0, sizeof (ai));
-	ai.ai_family = AF_INET;
-	ai.ai_socktype = SOCK_STREAM;
-	snprintf(strport, sizeof (strport), "%d", port);
-	if (getaddrinfo(address, strport, &ai, &aitop) != 0) {
-		event_warn("getaddrinfo");
-		return (-1);
-	}
-	sa = aitop->ai_addr;
-	slen = aitop->ai_addrlen;
-#endif
-        
-	fd = socket(AF_INET, SOCK_STREAM, 0);
-	if (fd == -1)
-		event_err(1, "socket failed");
-
-	if (connect(fd, sa, slen) == -1)
-		event_err(1, "connect failed");
-
-#ifndef WIN32
-	freeaddrinfo(aitop);
-#endif
-
-	return (fd);
-}
-
-static void
-http_readcb(struct bufferevent *bev, void *arg)
-{
-	const char *what = "This is funny";
-
- 	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
-	
-	if (evbuffer_find(bev->input,
-		(const unsigned char*) what, strlen(what)) != NULL) {
-		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
-		enum message_read_status done;
-
-		req->kind = EVHTTP_RESPONSE;
-		done = evhttp_parse_firstline(req, bev->input);
-		if (done != ALL_DATA_READ)
-			goto out;
-
-		done = evhttp_parse_headers(req, bev->input);
-		if (done != ALL_DATA_READ)
-			goto out;
-
-		if (done == 1 &&
-		    evhttp_find_header(req->input_headers,
-			"Content-Type") != NULL)
-			test_ok++;
-
-	out:
-		evhttp_request_free(req);
-		bufferevent_disable(bev, EV_READ);
-		if (base)
-			event_base_loopexit(base, NULL);
-		else
-			event_loopexit(NULL);
-	}
-}
-
-static void
-http_writecb(struct bufferevent *bev, void *arg)
-{
-	if (EVBUFFER_LENGTH(bev->output) == 0) {
-		/* enable reading of the reply */
-		bufferevent_enable(bev, EV_READ);
-		test_ok++;
-	}
-}
-
-static void
-http_errorcb(struct bufferevent *bev, short what, void *arg)
-{
-	test_ok = -2;
-	event_loopexit(NULL);
-}
-
-void
-http_basic_cb(struct evhttp_request *req, void *arg)
-{
-	struct evbuffer *evb = evbuffer_new();
-	int empty = evhttp_find_header(req->input_headers, "Empty") != NULL;
-	event_debug(("%s: called\n", __func__));
-	evbuffer_add_printf(evb, "This is funny");
-	
-	/* For multi-line headers test */
-	{
-		const char *multi =
-		    evhttp_find_header(req->input_headers,"X-multi");
-		if (multi) {
-			if (strcmp("END", multi + strlen(multi) - 3) == 0)
-				test_ok++;
-			if (evhttp_find_header(req->input_headers, "X-Last"))
-				test_ok++;
-		}
-	}
-
-	/* injecting a bad content-length */
-	if (evhttp_find_header(req->input_headers, "X-Negative"))
-		evhttp_add_header(req->output_headers,
-		    "Content-Length", "-100");
-
-	/* allow sending of an empty reply */
-	evhttp_send_reply(req, HTTP_OK, "Everything is fine",
-	    !empty ? evb : NULL);
-
-	evbuffer_free(evb);
-}
-
-static char const* const CHUNKS[] = {
-	"This is funny",
-	"but not hilarious.",
-	"bwv 1052"
-};
-
-struct chunk_req_state {
-	struct evhttp_request *req;
-	int i;
-};
-
-static void
-http_chunked_trickle_cb(int fd, short events, void *arg)
-{
-	struct evbuffer *evb = evbuffer_new();
-	struct chunk_req_state *state = arg;
-	struct timeval when = { 0, 0 };
-
-	evbuffer_add_printf(evb, "%s", CHUNKS[state->i]);
-	evhttp_send_reply_chunk(state->req, evb);
-	evbuffer_free(evb);
-
-	if (++state->i < sizeof(CHUNKS)/sizeof(CHUNKS[0])) {
-		event_once(-1, EV_TIMEOUT,
-		    http_chunked_trickle_cb, state, &when);
-	} else {
-		evhttp_send_reply_end(state->req);
-		free(state);
-	}
-}
-
-static void
-http_chunked_cb(struct evhttp_request *req, void *arg)
-{
-	struct timeval when = { 0, 0 };
-	struct chunk_req_state *state = malloc(sizeof(struct chunk_req_state));
-
-#ifdef INNODB_CHANGED
-	if (!state) {
-		fprintf(stderr, "Unable to allocate memory in"
-				"http_chunked_cb...\n");
-		exit (1);
-	 }
-#endif
-
-	event_debug(("%s: called\n", __func__));
-
-	memset(state, 0, sizeof(struct chunk_req_state));
-	state->req = req;
-
-	/* generate a chunked reply */
-	evhttp_send_reply_start(req, HTTP_OK, "Everything is fine");
-
-	/* but trickle it across several iterations to ensure we're not
-	 * assuming it comes all at once */
-	event_once(-1, EV_TIMEOUT, http_chunked_trickle_cb, state, &when);
-}
-
-static void
-http_complete_write(int fd, short what, void *arg)
-{
-	struct bufferevent *bev = arg;
-	const char *http_request = "host\r\n"
-	    "Connection: close\r\n"
-	    "\r\n";
-	bufferevent_write(bev, http_request, strlen(http_request));
-}
-
-static void
-http_basic_test(void)
-{
-	struct timeval tv;
-	struct bufferevent *bev;
-	int fd;
-	const char *http_request;
-	short port = -1;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing Basic HTTP Server: ");
-
-	http = http_setup(&port, NULL);
-
-	/* bind to a second socket */
-	if (evhttp_bind_socket(http, "127.0.0.1", port + 1) == -1) {
-		fprintf(stdout, "FAILED (bind)\n");
-		exit(1);
-	}
-	
-	fd = http_connect("127.0.0.1", port);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, http_readcb, http_writecb,
-	    http_errorcb, NULL);
-
-	/* first half of the http request */
-	http_request =
-	    "GET /test HTTP/1.1\r\n"
-	    "Host: some";
-
-	bufferevent_write(bev, http_request, strlen(http_request));
-	timerclear(&tv);
-	tv.tv_usec = 10000;
-	event_once(-1, EV_TIMEOUT, http_complete_write, bev, &tv);
-	
-	event_dispatch();
-
-	if (test_ok != 3) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* connect to the second port */
-	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
-
-	fd = http_connect("127.0.0.1", port + 1);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, http_readcb, http_writecb,
-	    http_errorcb, NULL);
-
-	http_request =
-	    "GET /test HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
-	    "Connection: close\r\n"
-	    "\r\n";
-
-	bufferevent_write(bev, http_request, strlen(http_request));
-	
-	event_dispatch();
-
-	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
-
-	evhttp_free(http);
-	
-	if (test_ok != 5) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-}
-
-static struct evhttp_connection *delayed_client;
-
-static void
-http_delay_reply(int fd, short what, void *arg)
-{
-	struct evhttp_request *req = arg;
-
-	evhttp_send_reply(req, HTTP_OK, "Everything is fine", NULL);
-
-	++test_ok;
-}
-
-static void
-http_large_delay_cb(struct evhttp_request *req, void *arg)
-{
-	struct timeval tv;
-	timerclear(&tv);
-	tv.tv_sec = 3;
-
-	event_once(-1, EV_TIMEOUT, http_delay_reply, req, &tv);
-
-	/* here we close the client connection which will cause an EOF */
-	evhttp_connection_fail(delayed_client, EVCON_HTTP_EOF);
-}
-
-void http_request_done(struct evhttp_request *, void *);
-void http_request_empty_done(struct evhttp_request *, void *);
-
-static void
-http_connection_test(int persistent)
-{
-	short port = -1;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-	
-	test_ok = 0;
-	fprintf(stdout, "Testing Request Connection Pipeline %s: ",
-	    persistent ? "(persistent)" : "");
-
-	http = http_setup(&port, NULL);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * At this point, we want to schedule a request to the HTTP
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(http_request_done, NULL);
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* try to make another request over the same connection */
-	test_ok = 0;
-	
-	req = evhttp_request_new(http_request_done, NULL);
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-
-	/* 
-	 * if our connections are not supposed to be persistent; request
-	 * a close from the server.
-	 */
-	if (!persistent)
-		evhttp_add_header(req->output_headers, "Connection", "close");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	/* make another request: request empty reply */
-	test_ok = 0;
-	
-	req = evhttp_request_new(http_request_empty_done, NULL);
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Empty", "itis");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	evhttp_connection_free(evcon);
-	evhttp_free(http);
-	
-	fprintf(stdout, "OK\n");
-}
-
-void
-http_request_done(struct evhttp_request *req, void *arg)
-{
-	const char *what = "This is funny";
-
-	if (req->response_code != HTTP_OK) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (evhttp_find_header(req->input_headers, "Content-Type") == NULL) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-	
-	if (memcmp(EVBUFFER_DATA(req->input_buffer), what, strlen(what)) != 0) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-/* test date header and content length */
-
-void
-http_request_empty_done(struct evhttp_request *req, void *arg)
-{
-	if (req->response_code != HTTP_OK) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (evhttp_find_header(req->input_headers, "Date") == NULL) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	
-	if (evhttp_find_header(req->input_headers, "Content-Length") == NULL) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (strcmp(evhttp_find_header(req->input_headers, "Content-Length"),
-		"0")) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != 0) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-/*
- * HTTP DISPATCHER test
- */
-
-void
-http_dispatcher_cb(struct evhttp_request *req, void *arg)
-{
-
-	struct evbuffer *evb = evbuffer_new();
-	event_debug(("%s: called\n", __func__));
-	evbuffer_add_printf(evb, "DISPATCHER_TEST");
-
-	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
-
-	evbuffer_free(evb);
-}
-
-static void
-http_dispatcher_test_done(struct evhttp_request *req, void *arg)
-{
-	const char *what = "DISPATCHER_TEST";
-
-	if (req->response_code != HTTP_OK) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (evhttp_find_header(req->input_headers, "Content-Type") == NULL) {
-		fprintf(stderr, "FAILED (content type)\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
-		fprintf(stderr, "FAILED (length %zu vs %zu)\n",
-		    EVBUFFER_LENGTH(req->input_buffer), strlen(what));
-		exit(1);
-	}
-	
-	if (memcmp(EVBUFFER_DATA(req->input_buffer), what, strlen(what)) != 0) {
-		fprintf(stderr, "FAILED (data)\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-static void
-http_dispatcher_test(void)
-{
-	short port = -1;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing HTTP Dispatcher: ");
-
-	http = http_setup(&port, NULL);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* also bind to local host */
-	evhttp_connection_set_local_address(evcon, "127.0.0.1");
-
-	/*
-	 * At this point, we want to schedule an HTTP GET request
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(http_dispatcher_test_done, NULL);
-	if (req == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-	
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/?arg=val") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	evhttp_connection_free(evcon);
-	evhttp_free(http);
-	
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED: %d\n", test_ok);
-		exit(1);
-	}
-	
-	fprintf(stdout, "OK\n");
-}
-
-/*
- * HTTP POST test.
- */
-
-void http_postrequest_done(struct evhttp_request *, void *);
-
-#define POST_DATA "Okay.  Not really printf"
-
-static void
-http_post_test(void)
-{
-	short port = -1;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing HTTP POST Request: ");
-
-	http = http_setup(&port, NULL);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * At this point, we want to schedule an HTTP POST request
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(http_postrequest_done, NULL);
-	if (req == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-	evbuffer_add_printf(req->output_buffer, POST_DATA);
-	
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_POST, "/postit") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	evhttp_connection_free(evcon);
-	evhttp_free(http);
-	
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED: %d\n", test_ok);
-		exit(1);
-	}
-	
-	fprintf(stdout, "OK\n");
-}
-
-void
-http_post_cb(struct evhttp_request *req, void *arg)
-{
-	struct evbuffer *evb;
-	event_debug(("%s: called\n", __func__));
-
-	/* Yes, we are expecting a post request */
-	if (req->type != EVHTTP_REQ_POST) {
-		fprintf(stdout, "FAILED (post type)\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(POST_DATA)) {
-		fprintf(stdout, "FAILED (length: %zu vs %zu)\n",
-		    EVBUFFER_LENGTH(req->input_buffer), strlen(POST_DATA));
-		exit(1);
-	}
-
-	if (memcmp(EVBUFFER_DATA(req->input_buffer), POST_DATA,
-		strlen(POST_DATA))) {
-		fprintf(stdout, "FAILED (data)\n");
-		fprintf(stdout, "Got :%s\n", EVBUFFER_DATA(req->input_buffer));
-		fprintf(stdout, "Want:%s\n", POST_DATA);
-		exit(1);
-	}
-	
-	evb = evbuffer_new();
-	evbuffer_add_printf(evb, "This is funny");
-
-	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
-
-	evbuffer_free(evb);
-}
-
-void
-http_postrequest_done(struct evhttp_request *req, void *arg)
-{
-	const char *what = "This is funny";
-
-	if (req == NULL) {
-		fprintf(stderr, "FAILED (timeout)\n");
-		exit(1);
-	}
-
-	if (req->response_code != HTTP_OK) {
-	
-		fprintf(stderr, "FAILED (response code)\n");
-		exit(1);
-	}
-
-	if (evhttp_find_header(req->input_headers, "Content-Type") == NULL) {
-		fprintf(stderr, "FAILED (content type)\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
-		fprintf(stderr, "FAILED (length %zu vs %zu)\n",
-		    EVBUFFER_LENGTH(req->input_buffer), strlen(what));
-		exit(1);
-	}
-	
-	if (memcmp(EVBUFFER_DATA(req->input_buffer), what, strlen(what)) != 0) {
-		fprintf(stderr, "FAILED (data)\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-static void
-http_failure_readcb(struct bufferevent *bev, void *arg)
-{
-	const char *what = "400 Bad Request";
-	if (evbuffer_find(bev->input, (const unsigned char*) what, strlen(what)) != NULL) {
-		test_ok = 2;
-		bufferevent_disable(bev, EV_READ);
-		event_loopexit(NULL);
-	}
-}
-
-/*
- * Testing that the HTTP server can deal with a malformed request.
- */
-static void
-http_failure_test(void)
-{
-	struct bufferevent *bev;
-	int fd;
-	const char *http_request;
-	short port = -1;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing Bad HTTP Request: ");
-
-	http = http_setup(&port, NULL);
-	
-	fd = http_connect("127.0.0.1", port);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, http_failure_readcb, http_writecb,
-	    http_errorcb, NULL);
-
-	http_request = "illegal request\r\n";
-
-	bufferevent_write(bev, http_request, strlen(http_request));
-	
-	event_dispatch();
-
-	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
-
-	evhttp_free(http);
-	
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-	
-	fprintf(stdout, "OK\n");
-}
-
-static void
-close_detect_done(struct evhttp_request *req, void *arg)
-{
-	struct timeval tv;
-	if (req == NULL || req->response_code != HTTP_OK) {
-	
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-
-	timerclear(&tv);
-	tv.tv_sec = 3;   /* longer than the http time out */
-
-	event_loopexit(&tv);
-}
-
-static void
-close_detect_launch(int fd, short what, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	struct evhttp_request *req;
-
-	req = evhttp_request_new(close_detect_done, NULL);
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-}
-
-static void
-close_detect_cb(struct evhttp_request *req, void *arg)
-{
-	struct evhttp_connection *evcon = arg;
-	struct timeval tv;
-
-	if (req != NULL && req->response_code != HTTP_OK) {
-	
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	timerclear(&tv);
-	tv.tv_sec = 3;   /* longer than the http time out */
-
-	/* launch a new request on the persistent connection in 6 seconds */
-	event_once(-1, EV_TIMEOUT, close_detect_launch, evcon, &tv);
-}
-
-
-static void
-http_close_detection(int with_delay)
-{
-	short port = -1;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-	
-	test_ok = 0;
-	fprintf(stdout, "Testing Connection Close Detection%s: ",
-		with_delay ? " (with delay)" : "");
-
-	http = http_setup(&port, NULL);
-
-	/* 2 second timeout */
-	evhttp_set_timeout(http, 2);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	delayed_client = evcon;
-
-	/*
-	 * At this point, we want to schedule a request to the HTTP
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(close_detect_cb, evcon);
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon,
-	    req, EVHTTP_REQ_GET, with_delay ? "/largedelay" : "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* at this point, the http server should have no connection */
-	if (TAILQ_FIRST(&http->connections) != NULL) {
-		fprintf(stdout, "FAILED (left connections)\n");
-		exit(1);
-	}
-
-	evhttp_connection_free(evcon);
-	evhttp_free(http);
-	
-	fprintf(stdout, "OK\n");
-}
-
-static void
-http_highport_test(void)
-{
-	int i = -1;
-	struct evhttp *myhttp = NULL;
- 
-	fprintf(stdout, "Testing HTTP Server with high port: ");
-
-	/* Try a few different ports */
-	for (i = 0; i < 50; ++i) {
-		myhttp = evhttp_start("127.0.0.1", 65535 - i);
-		if (myhttp != NULL) {
-			fprintf(stdout, "OK\n");
-			evhttp_free(myhttp);
-			return;
-		}
-	}
-
-	fprintf(stdout, "FAILED\n");
-	exit(1);
-}
-
-static void
-http_bad_header_test(void)
-{
-	struct evkeyvalq headers;
-
-	fprintf(stdout, "Testing HTTP Header filtering: ");
-
-	TAILQ_INIT(&headers);
-
-	if (evhttp_add_header(&headers, "One", "Two") != 0)
-		goto fail;
-	
-	if (evhttp_add_header(&headers, "One\r", "Two") != -1)
-		goto fail;
-	if (evhttp_add_header(&headers, "One", "Two") != 0)
-		goto fail;
-	if (evhttp_add_header(&headers, "One", "Two\r\n Three") != 0)
-		goto fail;
-	if (evhttp_add_header(&headers, "One\r", "Two") != -1)
-		goto fail;
-	if (evhttp_add_header(&headers, "One\n", "Two") != -1)
-		goto fail;
-	if (evhttp_add_header(&headers, "One", "Two\r") != -1)
-		goto fail;
-	if (evhttp_add_header(&headers, "One", "Two\n") != -1)
-		goto fail;
-
-	evhttp_clear_headers(&headers);
-
-	fprintf(stdout, "OK\n");
-	return;
-fail:
-	fprintf(stdout, "FAILED\n");
-	exit(1);
-}
-
-static int validate_header(
-	const struct evkeyvalq* headers,
-	const char *key, const char *value) 
-{
-	const char *real_val = evhttp_find_header(headers, key);
-	if (real_val == NULL)
-		return (-1);
-	if (strcmp(real_val, value) != 0)
-		return (-1);
-	return (0);
-}
-
-static void
-http_parse_query_test(void)
-{
-	struct evkeyvalq headers;
-
-	fprintf(stdout, "Testing HTTP query parsing: ");
-
-	TAILQ_INIT(&headers);
-	
-	evhttp_parse_query("http://www.test.com/?q=test", &headers);
-	if (validate_header(&headers, "q", "test") != 0)
-		goto fail;
-	evhttp_clear_headers(&headers);
-
-	evhttp_parse_query("http://www.test.com/?q=test&foo=bar", &headers);
-	if (validate_header(&headers, "q", "test") != 0)
-		goto fail;
-	if (validate_header(&headers, "foo", "bar") != 0)
-		goto fail;
-	evhttp_clear_headers(&headers);
-
-	evhttp_parse_query("http://www.test.com/?q=test+foo", &headers);
-	if (validate_header(&headers, "q", "test foo") != 0)
-		goto fail;
-	evhttp_clear_headers(&headers);
-
-	evhttp_parse_query("http://www.test.com/?q=test%0Afoo", &headers);
-	if (validate_header(&headers, "q", "test\nfoo") != 0)
-		goto fail;
-	evhttp_clear_headers(&headers);
-
-	evhttp_parse_query("http://www.test.com/?q=test%0Dfoo", &headers);
-	if (validate_header(&headers, "q", "test\rfoo") != 0)
-		goto fail;
-	evhttp_clear_headers(&headers);
-
-	fprintf(stdout, "OK\n");
-	return;
-fail:
-	fprintf(stdout, "FAILED\n");
-	exit(1);
-}
-
-static void
-http_base_test(void)
-{
-	struct bufferevent *bev;
-	int fd;
-	const char *http_request;
-	short port = -1;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing HTTP Server Event Base: ");
-
-	base = event_init();
-
-	/* 
-	 * create another bogus base - which is being used by all subsequen
-	 * tests - yuck!
-	 */
-	event_init();
-
-	http = http_setup(&port, base);
-	
-	fd = http_connect("127.0.0.1", port);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, http_readcb, http_writecb,
-	    http_errorcb, NULL);
-	bufferevent_base_set(base, bev);
-
-	http_request =
-	    "GET /test HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
-	    "Connection: close\r\n"
-	    "\r\n";
-
-	bufferevent_write(bev, http_request, strlen(http_request));
-	
-	event_base_dispatch(base);
-
-	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
-
-	evhttp_free(http);
-
-	event_base_free(base);
-	base = NULL;
-	
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-	
-	fprintf(stdout, "OK\n");
-}
-
-/*
- * the server is going to reply with chunked data.
- */
-
-static void
-http_chunked_readcb(struct bufferevent *bev, void *arg)
-{
-	/* nothing here */
-}
-
-static void
-http_chunked_errorcb(struct bufferevent *bev, short what, void *arg)
-{
-	if (!test_ok)
-		goto out;
-
-	test_ok = -1;
-
-	if ((what & EVBUFFER_EOF) != 0) {
-		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
-		const char *header;
-		enum message_read_status done;
-		
-		req->kind = EVHTTP_RESPONSE;
-		done = evhttp_parse_firstline(req, EVBUFFER_INPUT(bev));
-		if (done != ALL_DATA_READ)
-			goto out;
-
-		done = evhttp_parse_headers(req, EVBUFFER_INPUT(bev));
-		if (done != ALL_DATA_READ)
-			goto out;
-
-		header = evhttp_find_header(req->input_headers, "Transfer-Encoding");
-		if (header == NULL || strcmp(header, "chunked"))
-			goto out;
-
-		header = evhttp_find_header(req->input_headers, "Connection");
-		if (header == NULL || strcmp(header, "close"))
-			goto out;
-
-		header = evbuffer_readline(EVBUFFER_INPUT(bev));
-		if (header == NULL)
-			goto out;
-		/* 13 chars */
-		if (strcmp(header, "d"))
-			goto out;
-		free((char*)header);
-
-		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
-			"This is funny", 13))
-			goto out;
-
-		evbuffer_drain(EVBUFFER_INPUT(bev), 13 + 2);
-
-		header = evbuffer_readline(EVBUFFER_INPUT(bev));
-		if (header == NULL)
-			goto out;
-		/* 18 chars */
-		if (strcmp(header, "12"))
-			goto out;
-		free((char *)header);
-
-		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
-			"but not hilarious.", 18))
-			goto out;
-
-		evbuffer_drain(EVBUFFER_INPUT(bev), 18 + 2);
-
-		header = evbuffer_readline(EVBUFFER_INPUT(bev));
-		if (header == NULL)
-			goto out;
-		/* 8 chars */
-		if (strcmp(header, "8"))
-			goto out;
-		free((char *)header);
-
-		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
-			"bwv 1052.", 8))
-			goto out;
-
-		evbuffer_drain(EVBUFFER_INPUT(bev), 8 + 2);
-
-		header = evbuffer_readline(EVBUFFER_INPUT(bev));
-		if (header == NULL)
-			goto out;
-		/* 0 chars */
-		if (strcmp(header, "0"))
-			goto out;
-		free((char *)header);
-
-		test_ok = 2;
-	}
-
-out:
-	event_loopexit(NULL);
-}
-
-static void
-http_chunked_writecb(struct bufferevent *bev, void *arg)
-{
-	if (EVBUFFER_LENGTH(EVBUFFER_OUTPUT(bev)) == 0) {
-		/* enable reading of the reply */
-		bufferevent_enable(bev, EV_READ);
-		test_ok++;
-	}
-}
-
-static void
-http_chunked_request_done(struct evhttp_request *req, void *arg)
-{
-	if (req->response_code != HTTP_OK) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (evhttp_find_header(req->input_headers,
-		"Transfer-Encoding") == NULL) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (EVBUFFER_LENGTH(req->input_buffer) != 13 + 18 + 8) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	if (strncmp((char *)EVBUFFER_DATA(req->input_buffer),
-		"This is funnybut not hilarious.bwv 1052",
-		13 + 18 + 8)) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-	
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-static void
-http_chunked_test(void)
-{
-	struct bufferevent *bev;
-	int fd;
-	const char *http_request;
-	short port = -1;
-	struct timeval tv_start, tv_end;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-	int i;
-
-	test_ok = 0;
-	fprintf(stdout, "Testing Chunked HTTP Reply: ");
-
-	http = http_setup(&port, NULL);
-
-	fd = http_connect("127.0.0.1", port);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, 
-	    http_chunked_readcb, http_chunked_writecb,
-	    http_chunked_errorcb, NULL);
-
-	http_request =
-	    "GET /chunked HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
-	    "Connection: close\r\n"
-	    "\r\n";
-
-	bufferevent_write(bev, http_request, strlen(http_request));
-
-	evutil_gettimeofday(&tv_start, NULL);
-	
-	event_dispatch();
-
-	evutil_gettimeofday(&tv_end, NULL);
-	evutil_timersub(&tv_end, &tv_start, &tv_end);
-
-	if (tv_end.tv_sec >= 1) {
-		fprintf(stdout, "FAILED (time)\n");
-		exit (1);
-	}
-
-
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* now try again with the regular connection object */
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* make two requests to check the keepalive behavior */
-	for (i = 0; i < 2; i++) {
-		test_ok = 0;
-		req = evhttp_request_new(http_chunked_request_done, NULL);
-
-		/* Add the information that we care about */
-		evhttp_add_header(req->output_headers, "Host", "somehost");
-
-		/* We give ownership of the request to the connection */
-		if (evhttp_make_request(evcon, req,
-			EVHTTP_REQ_GET, "/chunked") == -1) {
-			fprintf(stdout, "FAILED\n");
-			exit(1);
-		}
-
-		event_dispatch();
-
-		if (test_ok != 1) {
-			fprintf(stdout, "FAILED\n");
-			exit(1);
-		}
-	}
-
-	evhttp_connection_free(evcon);
-	evhttp_free(http);
-	
-	fprintf(stdout, "OK\n");
-}
-
-static void
-http_multi_line_header_test(void)
-{
-	struct bufferevent *bev;
-	int fd;
-	const char *http_start_request;
-	short port = -1;
-	
-	test_ok = 0;
-	fprintf(stdout, "Testing HTTP Server with multi line: ");
-
-	http = http_setup(&port, NULL);
-	
-	fd = http_connect("127.0.0.1", port);
-
-	/* Stupid thing to send a request */
-	bev = bufferevent_new(fd, http_readcb, http_writecb,
-	    http_errorcb, NULL);
-
-	http_start_request =
-	    "GET /test HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
-	    "Connection: close\r\n"
-	    "X-Multi:  aaaaaaaa\r\n"
-	    " a\r\n"
-	    "\tEND\r\n"
-	    "X-Last: last\r\n"
-	    "\r\n";
-		
-	bufferevent_write(bev, http_start_request, strlen(http_start_request));
-
-	event_dispatch();
-	
-	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
-
-	evhttp_free(http);
-
-	if (test_ok != 4) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-	
-	fprintf(stdout, "OK\n");
-}
-
-static void
-http_request_bad(struct evhttp_request *req, void *arg)
-{
-	if (req != NULL) {
-		fprintf(stderr, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-static void
-http_negative_content_length_test(void)
-{
-	short port = -1;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-	
-	test_ok = 0;
-	fprintf(stdout, "Testing HTTP Negative Content Length: ");
-
-	http = http_setup(&port, NULL);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * At this point, we want to schedule a request to the HTTP
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(http_request_bad, NULL);
-
-	/* Cause the response to have a negative content-length */
-	evhttp_add_header(req->output_headers, "X-Negative", "makeitso");
-
-	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	event_dispatch();
-
-	evhttp_free(http);
-
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-}
-
-void
-http_suite(void)
-{
-	http_base_test();
-	http_bad_header_test();
-	http_parse_query_test();
-	http_basic_test();
-	http_connection_test(0 /* not-persistent */);
-	http_connection_test(1 /* persistent */);
-	http_close_detection(0 /* with delay */);
-	http_close_detection(1 /* with delay */);
-	http_post_test();
-	http_failure_test();
-	http_highport_test();
-	http_dispatcher_test();
-
-	http_multi_line_header_test();
-	http_negative_content_length_test();
-
-	http_chunked_test();
-}
diff --git a/libevent/test/regress_rpc.c b/libevent/test/regress_rpc.c
deleted file mode 100644
index 760934766a1b..000000000000
--- a/libevent/test/regress_rpc.c
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#ifndef WIN32
-#include <sys/socket.h>
-#include <signal.h>
-#include <unistd.h>
-#include <netdb.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "event.h"
-#include "evhttp.h"
-#include "log.h"
-#include "evrpc.h"
-
-#include "regress.gen.h"
-
-void rpc_suite(void);
-
-extern int test_ok;
-
-static struct evhttp *
-http_setup(short *pport)
-{
-	int i;
-	struct evhttp *myhttp;
-	short port = -1;
-
-	/* Try a few different ports */
-	for (i = 0; i < 50; ++i) {
-		myhttp = evhttp_start("127.0.0.1", 8080 + i);
-		if (myhttp != NULL) {
-			port = 8080 + i;
-			break;
-		}
-	}
-
-	if (port == -1)
-		event_errx(1, "Could not start web server");
-
-	*pport = port;
-	return (myhttp);
-}
-
-EVRPC_HEADER(Message, msg, kill);
-EVRPC_HEADER(NeverReply, msg, kill);
-
-EVRPC_GENERATE(Message, msg, kill);
-EVRPC_GENERATE(NeverReply, msg, kill);
-
-static int need_input_hook = 0;
-static int need_output_hook = 0;
-
-static void
-MessageCb(EVRPC_STRUCT(Message)* rpc, void *arg)
-{
-	struct kill* kill_reply = rpc->reply;
-
-	if (need_input_hook) {
-		struct evhttp_request* req = EVRPC_REQUEST_HTTP(rpc);
-		const char *header = evhttp_find_header(
-			req->input_headers, "X-Hook");
-		assert(strcmp(header, "input") == 0);
-	}
-
-	/* we just want to fill in some non-sense */
-	EVTAG_ASSIGN(kill_reply, weapon, "dagger");
-	EVTAG_ASSIGN(kill_reply, action, "wave around like an idiot");
-
-	/* no reply to the RPC */
-	EVRPC_REQUEST_DONE(rpc);
-}
-
-static EVRPC_STRUCT(NeverReply) *saved_rpc;
-
-static void
-NeverReplyCb(EVRPC_STRUCT(NeverReply)* rpc, void *arg)
-{
-	test_ok += 1;
-	saved_rpc = rpc;
-}
-
-static void
-rpc_setup(struct evhttp **phttp, short *pport, struct evrpc_base **pbase)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-
-	http = http_setup(&port);
-	base = evrpc_init(http);
-	
-	EVRPC_REGISTER(base, Message, msg, kill, MessageCb, NULL);
-	EVRPC_REGISTER(base, NeverReply, msg, kill, NeverReplyCb, NULL);
-
-	*phttp = http;
-	*pport = port;
-	*pbase = base;
-
-	need_input_hook = 0;
-	need_output_hook = 0;
-}
-
-static void
-rpc_teardown(struct evrpc_base *base)
-{
-	assert(EVRPC_UNREGISTER(base, Message) == 0);
-	assert(EVRPC_UNREGISTER(base, NeverReply) == 0);
-
-	evrpc_free(base);
-}
-
-static void
-rpc_postrequest_failure(struct evhttp_request *req, void *arg)
-{
-	if (req->response_code != HTTP_SERVUNAVAIL) {
-	
-		fprintf(stderr, "FAILED (response code)\n");
-		exit(1);
-	}
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-/*
- * Test a malformed payload submitted as an RPC
- */
-
-static void
-rpc_basic_test(void)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-
-	fprintf(stdout, "Testing Basic RPC Support: ");
-
-	rpc_setup(&http, &port, &base);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * At this point, we want to schedule an HTTP POST request
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(rpc_postrequest_failure, NULL);
-	if (req == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-	evbuffer_add_printf(req->output_buffer, "Some Nonsense");
-	
-	if (evhttp_make_request(evcon, req,
-		EVHTTP_REQ_POST,
-		"/.rpc.Message") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 0;
-
-	event_dispatch();
-
-	evhttp_connection_free(evcon);
-
-	rpc_teardown(base);
-	
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-
-	evhttp_free(http);
-}
-
-static void
-rpc_postrequest_done(struct evhttp_request *req, void *arg)
-{
-	struct kill* kill_reply = NULL;
-
-	if (req->response_code != HTTP_OK) {
-	
-		fprintf(stderr, "FAILED (response code)\n");
-		exit(1);
-	}
-
-	kill_reply = kill_new();
-
-	if ((kill_unmarshal(kill_reply, req->input_buffer)) == -1) {
-		fprintf(stderr, "FAILED (unmarshal)\n");
-		exit(1);
-	}
-	
-	kill_free(kill_reply);
-
-	test_ok = 1;
-	event_loopexit(NULL);
-}
-
-static void
-rpc_basic_message(void)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-	struct evhttp_connection *evcon = NULL;
-	struct evhttp_request *req = NULL;
-	struct msg *msg;
-
-	fprintf(stdout, "Testing Good RPC Post: ");
-
-	rpc_setup(&http, &port, &base);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	if (evcon == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/*
-	 * At this point, we want to schedule an HTTP POST request
-	 * server using our make request method.
-	 */
-
-	req = evhttp_request_new(rpc_postrequest_done, NULL);
-	if (req == NULL) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	/* Add the information that we care about */
-	evhttp_add_header(req->output_headers, "Host", "somehost");
-
-	/* set up the basic message */
-	msg = msg_new();
-	EVTAG_ASSIGN(msg, from_name, "niels");
-	EVTAG_ASSIGN(msg, to_name, "tester");
-	msg_marshal(req->output_buffer, msg);
-	msg_free(msg);
-
-	if (evhttp_make_request(evcon, req,
-		EVHTTP_REQ_POST,
-		"/.rpc.Message") == -1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	test_ok = 0;
-
-	event_dispatch();
-
-	evhttp_connection_free(evcon);
-	
-	rpc_teardown(base);
-	
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-
-	evhttp_free(http);
-}
-
-static struct evrpc_pool *
-rpc_pool_with_connection(short port)
-{
-	struct evhttp_connection *evcon;
-	struct evrpc_pool *pool;
-
-	pool = evrpc_pool_new(NULL);
-	assert(pool != NULL);
-
-	evcon = evhttp_connection_new("127.0.0.1", port);
-	assert(evcon != NULL);
-
-	evrpc_pool_add_connection(pool, evcon);
-	
-	return (pool);
-}
-
-static void
-GotKillCb(struct evrpc_status *status,
-    struct msg *msg, struct kill *kill, void *arg)
-{
-	char *weapon;
-	char *action;
-
-	if (need_output_hook) {
-		struct evhttp_request *req = status->http_req;
-		const char *header = evhttp_find_header(
-			req->input_headers, "X-Pool-Hook");
-		assert(strcmp(header, "ran") == 0);
-	}
-
-	if (status->error != EVRPC_STATUS_ERR_NONE)
-		goto done;
-
-	if (EVTAG_GET(kill, weapon, &weapon) == -1) {
-		fprintf(stderr, "get weapon\n");
-		goto done;
-	}
-	if (EVTAG_GET(kill, action, &action) == -1) {
-		fprintf(stderr, "get action\n");
-		goto done;
-	}
-
-	if (strcmp(weapon, "dagger"))
-		goto done;
-
-	if (strcmp(action, "wave around like an idiot"))
-		goto done;
-
-	test_ok += 1;
-
-done:
-	event_loopexit(NULL);
-}
-
-static void
-GotKillCbTwo(struct evrpc_status *status,
-    struct msg *msg, struct kill *kill, void *arg)
-{
-	char *weapon;
-	char *action;
-
-	if (status->error != EVRPC_STATUS_ERR_NONE)
-		goto done;
-
-	if (EVTAG_GET(kill, weapon, &weapon) == -1) {
-		fprintf(stderr, "get weapon\n");
-		goto done;
-	}
-	if (EVTAG_GET(kill, action, &action) == -1) {
-		fprintf(stderr, "get action\n");
-		goto done;
-	}
-
-	if (strcmp(weapon, "dagger"))
-		goto done;
-
-	if (strcmp(action, "wave around like an idiot"))
-		goto done;
-
-	test_ok += 1;
-
-done:
-	if (test_ok == 2)
-		event_loopexit(NULL);
-}
-
-static int
-rpc_hook_add_header(struct evhttp_request *req,
-    struct evbuffer *evbuf, void *arg)
-{
-	const char *hook_type = arg;
-	if (strcmp("input", hook_type) == 0)
-		evhttp_add_header(req->input_headers, "X-Hook", hook_type);
-	else 
-		evhttp_add_header(req->output_headers, "X-Hook", hook_type);
-	return (0);
-}
-
-static int
-rpc_hook_remove_header(struct evhttp_request *req,
-    struct evbuffer *evbuf, void *arg)
-{
-	const char *header = evhttp_find_header(req->input_headers, "X-Hook");
-	assert(header != NULL);
-	assert(strcmp(header, arg) == 0);
-	evhttp_remove_header(req->input_headers, "X-Hook");
-	evhttp_add_header(req->input_headers, "X-Pool-Hook", "ran");
-
-	return (0);
-}
-
-static void
-rpc_basic_client(void)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-	struct evrpc_pool *pool = NULL;
-	struct msg *msg;
-	struct kill *kill;
-
-	fprintf(stdout, "Testing RPC Client: ");
-
-	rpc_setup(&http, &port, &base);
-
-	need_input_hook = 1;
-	need_output_hook = 1;
-
-	assert(evrpc_add_hook(base, EVRPC_INPUT, rpc_hook_add_header, (void*)"input")
-	    != NULL);
-	assert(evrpc_add_hook(base, EVRPC_OUTPUT, rpc_hook_add_header, (void*)"output")
-	    != NULL);
-
-	pool = rpc_pool_with_connection(port);
-
-	assert(evrpc_add_hook(pool, EVRPC_INPUT, rpc_hook_remove_header, (void*)"output"));
-
-	/* set up the basic message */
-	msg = msg_new();
-	EVTAG_ASSIGN(msg, from_name, "niels");
-	EVTAG_ASSIGN(msg, to_name, "tester");
-
-	kill = kill_new();
-
-	EVRPC_MAKE_REQUEST(Message, pool, msg, kill,  GotKillCb, NULL);
-
-	test_ok = 0;
-
-	event_dispatch();
-	
-	if (test_ok != 1) {
-		fprintf(stdout, "FAILED (1)\n");
-		exit(1);
-	}
-
-	/* we do it twice to make sure that reuse works correctly */
-	kill_clear(kill);
-
-	EVRPC_MAKE_REQUEST(Message, pool, msg, kill,  GotKillCb, NULL);
-
-	event_dispatch();
-	
-	rpc_teardown(base);
-	
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED (2)\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-
-	msg_free(msg);
-	kill_free(kill);
-
-	evrpc_pool_free(pool);
-	evhttp_free(http);
-}
-
-/* 
- * We are testing that the second requests gets send over the same
- * connection after the first RPCs completes.
- */
-static void
-rpc_basic_queued_client(void)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-	struct evrpc_pool *pool = NULL;
-	struct msg *msg;
-	struct kill *kill_one, *kill_two;
-
-	fprintf(stdout, "Testing RPC (Queued) Client: ");
-
-	rpc_setup(&http, &port, &base);
-
-	pool = rpc_pool_with_connection(port);
-
-	/* set up the basic message */
-	msg = msg_new();
-	EVTAG_ASSIGN(msg, from_name, "niels");
-	EVTAG_ASSIGN(msg, to_name, "tester");
-
-	kill_one = kill_new();
-	kill_two = kill_new();
-
-	EVRPC_MAKE_REQUEST(Message, pool, msg, kill_one,  GotKillCbTwo, NULL);
-	EVRPC_MAKE_REQUEST(Message, pool, msg, kill_two,  GotKillCb, NULL);
-
-	test_ok = 0;
-
-	event_dispatch();
-	
-	rpc_teardown(base);
-	
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED (1)\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-
-	msg_free(msg);
-	kill_free(kill_one);
-	kill_free(kill_two);
-
-	evrpc_pool_free(pool);
-	evhttp_free(http);
-}
-
-static void
-GotErrorCb(struct evrpc_status *status,
-    struct msg *msg, struct kill *kill, void *arg)
-{
-	if (status->error != EVRPC_STATUS_ERR_TIMEOUT)
-		goto done;
-
-	/* should never be complete but just to check */
-	if (kill_complete(kill) == 0)
-		goto done;
-
-	test_ok += 1;
-
-done:
-	event_loopexit(NULL);
-}
-
-static void
-rpc_client_timeout(void)
-{
-	short port;
-	struct evhttp *http = NULL;
-	struct evrpc_base *base = NULL;
-	struct evrpc_pool *pool = NULL;
-	struct msg *msg;
-	struct kill *kill;
-
-	fprintf(stdout, "Testing RPC Client Timeout: ");
-
-	rpc_setup(&http, &port, &base);
-
-	pool = rpc_pool_with_connection(port);
-
-	/* set the timeout to 5 seconds */
-	evrpc_pool_set_timeout(pool, 5);
-
-	/* set up the basic message */
-	msg = msg_new();
-	EVTAG_ASSIGN(msg, from_name, "niels");
-	EVTAG_ASSIGN(msg, to_name, "tester");
-
-	kill = kill_new();
-
-	EVRPC_MAKE_REQUEST(NeverReply, pool, msg, kill, GotErrorCb, NULL);
-
-	test_ok = 0;
-
-	event_dispatch();
-	
-	/* free the saved RPC structure up */
-	EVRPC_REQUEST_DONE(saved_rpc);
-
-	rpc_teardown(base);
-	
-	if (test_ok != 2) {
-		fprintf(stdout, "FAILED (1)\n");
-		exit(1);
-	}
-
-	fprintf(stdout, "OK\n");
-
-	msg_free(msg);
-	kill_free(kill);
-
-	evrpc_pool_free(pool);
-	evhttp_free(http);
-}
-
-void
-rpc_suite(void)
-{
-	rpc_basic_test();
-	rpc_basic_message();
-	rpc_basic_client();
-	rpc_basic_queued_client();
-	rpc_client_timeout();
-}
diff --git a/libevent/test/test-eof.c b/libevent/test/test-eof.c
deleted file mode 100644
index 4fc1a19f2241..000000000000
--- a/libevent/test/test-eof.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <event.h>
-#include <evutil.h>
-
-int test_okay = 1;
-int called = 0;
-
-static void
-read_cb(int fd, short event, void *arg)
-{
-	char buf[256];
-	int len;
-
-	len = read(fd, buf, sizeof(buf));
-
-	printf("%s: read %d%s\n", __func__,
-	    len, len ? "" : " - means EOF");
-
-	if (len) {
-		if (!called)
-			event_add(arg, NULL);
-	} else if (called == 1)
-		test_okay = 0;
-
-	called++;
-}
-
-#ifndef SHUT_WR
-#define SHUT_WR 1
-#endif
-
-int
-main (int argc, char **argv)
-{
-	struct event ev;
-	const char *test = "test string";
-	int pair[2];
-
-	if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
-		return (1);
-
-	
-	write(pair[0], test, strlen(test)+1);
-	shutdown(pair[0], SHUT_WR);
-
-	/* Initalize the event library */
-	event_init();
-
-	/* Initalize one event */
-	event_set(&ev, pair[1], EV_READ, read_cb, &ev);
-
-	event_add(&ev, NULL);
-
-	event_dispatch();
-
-	return (test_okay);
-}
-
diff --git a/libevent/test/test-init.c b/libevent/test/test-init.c
deleted file mode 100644
index c368715fd67d..000000000000
--- a/libevent/test/test-init.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <event.h>
-
-int
-main(int argc, char **argv)
-{
-	/* Initalize the event library */
-	event_init();
-
-	return (0);
-}
-
diff --git a/libevent/test/test-time.c b/libevent/test/test-time.c
deleted file mode 100644
index a847d55ef385..000000000000
--- a/libevent/test/test-time.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <event.h>
-
-int called = 0;
-
-#define NEVENT	20000
-
-struct event *ev[NEVENT];
-
-static int
-rand_int(int n)
-{
-#ifdef WIN32
-	return (int)(rand() * n);
-#else
-	return (int)(random() % n);
-#endif
-}
-
-static void
-time_cb(int fd, short event, void *arg)
-{
-	struct timeval tv;
-	int i, j;
-
-	called++;
-
-	if (called < 10*NEVENT) {
-		for (i = 0; i < 10; i++) {
-			j = rand_int(NEVENT);
-			tv.tv_sec = 0;
-			tv.tv_usec = rand_int(50000);
-			if (tv.tv_usec % 2)
-				evtimer_add(ev[j], &tv);
-			else
-				evtimer_del(ev[j]);
-		}
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	struct timeval tv;
-	int i;
-
-	/* Initalize the event library */
-	event_init();
-
-	for (i = 0; i < NEVENT; i++) {
-		ev[i] = malloc(sizeof(struct event));
-
-		/* Initalize one event */
-		evtimer_set(ev[i], time_cb, ev[i]);
-		tv.tv_sec = 0;
-		tv.tv_usec = rand_int(50000);
-		evtimer_add(ev[i], &tv);
-	}
-
-	event_dispatch();
-
-	return (called < NEVENT);
-}
-
diff --git a/libevent/test/test-weof.c b/libevent/test/test-weof.c
deleted file mode 100644
index 5d87ceb8eb77..000000000000
--- a/libevent/test/test-weof.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Compile with:
- * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <event.h>
-#include <evutil.h>
-
-int pair[2];
-int test_okay = 1;
-int called = 0;
-
-static void
-write_cb(int fd, short event, void *arg)
-{
-	const char *test = "test string";
-	int len;
-
-	len = write(fd, test, strlen(test) + 1);
-
-	printf("%s: write %d%s\n", __func__,
-	    len, len ? "" : " - means EOF");
-
-	if (len > 0) {
-		if (!called)
-			event_add(arg, NULL);
-		close(pair[0]);
-	} else if (called == 1)
-		test_okay = 0;
-
-	called++;
-}
-
-int
-main (int argc, char **argv)
-{
-	struct event ev;
-
-#ifndef WIN32
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-		return (1);
-#endif
-
-	if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1)
-		return (1);
-
-	/* Initalize the event library */
-	event_init();
-
-	/* Initalize one event */
-	event_set(&ev, pair[1], EV_WRITE, write_cb, &ev);
-
-	event_add(&ev, NULL);
-
-	event_dispatch();
-
-	return (test_okay);
-}
-
diff --git a/libevent/test/test.sh b/libevent/test/test.sh
deleted file mode 100644
index 506a1988c34b..000000000000
--- a/libevent/test/test.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-setup () {
-	 EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE
-	 EVENT_NODEVPOLL=yes; export EVENT_NODEVPOLL
-	 EVENT_NOPOLL=yes; export EVENT_NOPOLL
-	 EVENT_NOSELECT=yes; export EVENT_NOSELECT
-	 EVENT_NOEPOLL=yes; export EVENT_NOEPOLL
-	 EVENT_NOEVPORT=yes; export EVENT_NOEVPORT
-}
-
-test () {
-	if ./test-init 2>/dev/null ;
-	then
-	        true
-	else
-		echo Skipping test
-		return
-	fi	
-
-echo -n " test-eof: "
-if ./test-eof >/dev/null ; 
-then 
-	echo OKAY ; 
-else 
-	echo FAILED ; 
-fi
-echo -n " test-weof: "
-if ./test-weof >/dev/null ; 
-then 
-	echo OKAY ; 
-else 
-	echo FAILED ; 
-fi
-echo -n " test-time: "
-if ./test-time >/dev/null ; 
-then 
-	echo OKAY ; 
-else 
-	echo FAILED ; 
-fi
-echo -n " regress: "
-if ./regress >/dev/null ; 
-then 
-	echo OKAY ; 
-else 
-	echo FAILED ; 
-fi
-}
-
-echo "Running tests:"
-
-# Need to do this by hand?
-setup
-unset EVENT_NOKQUEUE
-export EVENT_NOKQUEUE
-echo "KQUEUE"
-test
-
-setup
-unset EVENT_NODEVPOLL
-export EVENT_NODEVPOLL
-echo "DEVPOLL"
-test
-
-setup
-unset EVENT_NOPOLL
-export EVENT_NOPOLL
-echo "POLL"
-test
-
-setup
-unset EVENT_NOSELECT
-export EVENT_NOSELECT
-echo "SELECT"
-test
-
-setup
-unset EVENT_NOEPOLL
-export EVENT_NOEPOLL
-echo "EPOLL"
-test
-
-setup
-unset EVENT_NOEVPORT
-export EVENT_NOEVPORT
-echo "EVPORT"
-test
-
-
-
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 043422b9192c..47f506dab3cc 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -20,8 +27,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings
   ${SSL_INCLUDE_DIRS}
-  ${SSL_INTERNAL_INCLUDE_DIRS}
-  ${ZLIB_INCLUDE_DIR})
+  ${SSL_INTERNAL_INCLUDE_DIRS})
 ADD_DEFINITIONS(${SSL_DEFINES})
 
 SET(CLIENT_API_FUNCTIONS
@@ -188,8 +194,12 @@ SET(CLIENT_SOURCES
   ../sql/net_serv.cc
   ../sql-common/pack.c 
   ../sql/auth/password.c
+  ../sql/auth/sha2_password_common.cc
 )
 
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+    ../sql-common/client_authentication.cc)
+
 IF (WIN32 AND OPENSSL_APPLINK_C)
   SET_SOURCE_FILES_PROPERTIES(
     ../sql-common/client_authentication.cc
@@ -218,7 +228,31 @@ ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
 DTRACE_INSTRUMENT(clientlib)
 ADD_DEPENDENCIES(clientlib GenError)
 
-SET(LIBS clientlib dbug strings vio mysys mysys_ssl ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
+SET(LIBS_TO_MERGE
+  clientlib dbug strings vio mysys mysys_ssl
+  )
+SET(LIBS_TO_LINK ${LIBDL})
+
+IF(WITH_ZLIB STREQUAL "bundled")
+  LIST(APPEND LIBS_TO_MERGE ${ZLIB_LIBRARY})
+ELSE()
+  LIST(APPEND LIBS_TO_LINK ${ZLIB_LIBRARY})
+ENDIF()
+
+IF(WIN32)
+  OPTION(LINK_DYNAMIC_OPENSSL "On Windows link OpenSSL dynamically" OFF)
+ENDIF()
+IF(WITH_SSL STREQUAL "system" OR LINK_DYNAMIC_OPENSSL)
+  LIST(APPEND LIBS_TO_LINK ${SSL_LIBRARIES})
+  IF(WIN32)
+    LIST(APPEND LIBS_TO_LINK crypt32)
+  ENDIF()
+ELSE()
+  LIST(APPEND LIBS_TO_MERGE ${SSL_LIBRARIES})
+  IF(WIN32)
+    LIST(APPEND LIBS_TO_MERGE crypt32)
+  ENDIF()
+ENDIF()
 
 #
 # On Windows platform client library includes the client-side 
@@ -227,7 +261,7 @@ SET(LIBS clientlib dbug strings vio mysys mysys_ssl ${ZLIB_LIBRARY} ${SSL_LIBRAR
 IF(WIN32)
   ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
   ADD_SUBDIRECTORY(authentication_win)
-  LIST(APPEND LIBS auth_win_client)
+  LIST(APPEND LIBS_TO_MERGE auth_win_client)
 ENDIF()
 
 # LDAP authentication SASL client plugin
@@ -235,12 +269,22 @@ MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
 ADD_SUBDIRECTORY(authentication_ldap)
   
 # Merge several convenience libraries into one big mysqlclient
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
+TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
 
 # Visual Studio users need debug  static library for debug projects
 IF(MSVC)
- INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
- INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+
+  INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
+  INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
+  IF(WITH_ZLIB STREQUAL "bundled")
+    INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
+  ENDIF()
 ENDIF()
 
 IF(UNIX)
@@ -269,9 +313,10 @@ ENDIF()
 IF(NOT DISABLE_SHARED)
   # Merge several convenience libraries into one big mysqlclient
   # and link them together into shared library.
-  MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
+  MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
     COMPONENT SharedLibraries)
+  TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -349,7 +394,7 @@ IF(LIBRT)
 ENDIF()
 
 IF(DISABLE_SHARED)
-  TARGET_LINK_LIBRARIES(libmysql_api_test ${LIBS})
+  TARGET_LINK_LIBRARIES(libmysql_api_test ${LIBS_TO_MERGE})
 ELSE()
   TARGET_LINK_LIBRARIES(libmysql_api_test libmysql)
 ENDIF()
diff --git a/libmysql/api_test.c.in b/libmysql/api_test.c.in
index 085965b9989b..e8c8fb92ca13 100644
--- a/libmysql/api_test.c.in
+++ b/libmysql/api_test.c.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/authentication_ldap/CMakeLists.txt b/libmysql/authentication_ldap/CMakeLists.txt
index 5ae3b15d4be9..36841986cf9a 100644
--- a/libmysql/authentication_ldap/CMakeLists.txt
+++ b/libmysql/authentication_ldap/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-# 
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+#
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -17,43 +24,78 @@
 # Configuration for building LDAP SASL Authentication Plugin (client-side)
 #
 
-INCLUDE(CheckIncludeFiles)
-
-CHECK_INCLUDE_FILES(sasl/sasl.h HAVE_SASL_H)
-CHECK_INCLUDE_FILES(lber.h HAVE_LBER_H)
+INCLUDE(CheckIncludeFile)
 
 # If cmake was invoked with -DWITH_AUTHENTICATION_LDAP=1
 # then fail if we are unable to build the LDAP plugin.
 MACRO(CROAK_AND_RETURN)
   IF (WITH_AUTHENTICATION_LDAP)
-    MESSAGE(SEND_ERROR ${ARGV})
+    MESSAGE(FATAL_ERROR ${ARGV})
   ELSE()
-    MESSAGE(STATUS ${ARGV} " Skipping the LDAP SASL client authentication plugin.")
+    MESSAGE(STATUS ${ARGV}
+      "Skipping the LDAP SASL client authentication plugin.")
     RETURN()
   ENDIF()
 ENDMACRO()
 
-IF(HAVE_SASL_H)
-  SET(CMAKE_EXTRA_INCLUDE_FILES sasl/sasl.h)
-ELSE()
-  CROAK_AND_RETURN("Required SASL library is missing.")
+IF(NOT HAVE_SASL_SASL_H)
+  CROAK_AND_RETURN("Required SASL header is missing.")
 ENDIF()
-IF(HAVE_LBER_H)
-  SET(CMAKE_EXTRA_INCLUDE_FILES lber.h)
-ELSE()
-  CROAK_AND_RETURN("Required LBER library is missing.")
+
+# On windows the LDAP system header is Winldap.h and is in some Windows SDK.
+IF(NOT WIN32 AND NOT HAVE_LBER_H)
+  CROAK_AND_RETURN("Required LBER header is missing.")
 ENDIF()
 
-# LDAP authentication SASL client will not build on windows, as windows don't have cyrus sasl.
-# IF someone like can build the cyrus sasl library on windows and build LDAP authentication sasl client as well.
-IF (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  SET(SASL_LIBRARY "sasl")
-ELSE ()
-  SET(SASL_LIBRARY "sasl2")
-ENDIF ()
+IF(FREEBSD)
+  # To locate /usr/local/include/sasl/sasl.h
+  INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
+ENDIF()
 
 MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-                 auth_ldap_sasl_client.cc log_client.cc
-                 LINK_LIBRARIES ${SASL_LIBRARY}
-                 CLIENT_ONLY MODULE_ONLY
-                 MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+  auth_ldap_sasl_client.cc
+  log_client.cc
+  LINK_LIBRARIES
+  ${SASL_LIBRARY}
+  # Uncomment to verify that all symbols are found.
+  # ${LINK_FLAG_NO_UNDEFINED} ${SSL_LIBRARIES}
+  CLIENT_ONLY
+  MODULE_ONLY
+  MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+
+# The plugin may need symbols which are not loaded by the client.
+IF(STATIC_SASL_LIBRARY)
+  TARGET_LINK_LIBRARIES(authentication_ldap_sasl_client ${SSL_LIBRARIES})
+ENDIF()
+
+IF(WIN32)
+  GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME)
+  GET_FILENAME_COMPONENT(SASL_SCRAM_PLUGIN_NAME "${SASL_SCRAM_PLUGIN}" NAME)
+
+  MESSAGE(STATUS "SASL_INCLUDE_DIR  = ${SASL_INCLUDE_DIR}")
+  MESSAGE(STATUS "SASL_LIBRARY_DLL  = ${SASL_LIBRARY_DLL}")
+  MESSAGE(STATUS "SASL_SCRAM_PLUGIN = ${SASL_SCRAM_PLUGIN}")
+
+  # Note that "libsasl.dll" and "saslSCRAM.dll" go into the "bin" directory
+  # where "mysql.exe" and other client executables are located.
+  INSTALL(FILES "${SASL_LIBRARY_DLL}"
+          DESTINATION ${INSTALL_BINDIR}
+          COMPONENT SharedLibraries)
+  INSTALL(FILES "${SASL_SCRAM_PLUGIN}"
+          DESTINATION ${INSTALL_BINDIR}
+          COMPONENT SharedLibraries)
+
+  # To run client executables that load the plug-in from the build tree we need
+  # to copy the SASL library DLL and SASL SCRAM library DLL to the
+  # same directory as the client executables.
+  ADD_CUSTOM_COMMAND(TARGET authentication_ldap_sasl_client POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${SASL_LIBRARY_DLL}"
+      "${CMAKE_BINARY_DIR}/client/${CMAKE_CFG_INTDIR}/${SASL_DLL_NAME}"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${SASL_SCRAM_PLUGIN}"
+      "${CMAKE_BINARY_DIR}/client/${CMAKE_CFG_INTDIR}/${SASL_SCRAM_PLUGIN_NAME}"
+  )
+  ADD_DEPENDENCIES(authentication_ldap_sasl_client mysqltest)
+
+ENDIF()
diff --git a/libmysql/authentication_ldap/auth_ldap_sasl_client.cc b/libmysql/authentication_ldap/auth_ldap_sasl_client.cc
index a11c93f48794..49fb5ea847ff 100644
--- a/libmysql/authentication_ldap/auth_ldap_sasl_client.cc
+++ b/libmysql/authentication_ldap/auth_ldap_sasl_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -36,18 +43,18 @@ void Sasl_client::interact(sasl_interact_t *ilist)
       the name of the user authenticating
     */
     case SASL_CB_USER:
-      ilist->result= strdup(m_user_name);
+      ilist->result= m_user_name;
       ilist->len= strlen((const char*)ilist->result);
       break;
     /* the name of the user acting for. (for example postman delivering mail for
        Martin might have an AUTHNAME of postman and a USER of Martin)
     */
     case SASL_CB_AUTHNAME:
-      ilist->result= strdup(m_user_name);
+      ilist->result= m_user_name;
       ilist->len= strlen((const char*)ilist->result);
       break;
     case SASL_CB_PASS:
-      ilist->result= strdup(m_user_pwd);
+      ilist->result= m_user_pwd;
       ilist->len= strlen((const char*)ilist->result);
       break;
     default:
@@ -74,19 +81,46 @@ void Sasl_client::set_plugin_info(MYSQL_PLUGIN_VIO *vio,  MYSQL *mysql)
 */
 int Sasl_client::read_method_name_from_server()
 {
-  int rc_server_read= CR_ERROR;
+  int rc_server_read= -1;
   unsigned char* packet= NULL;
   std::stringstream log_stream;
+  /*
+    We are assuming that there will be only one method name passed by
+    server, and length of the method name will not exceed 256 chars.
+  */
+  const int max_method_name_len= 256;
+
   if (m_vio == NULL)
   {
     return rc_server_read;
   }
   /** Get authentication method from the server. */
   rc_server_read= m_vio->read_packet(m_vio, (unsigned char**)&packet);
-  strncpy(m_mechanism, (const char*)packet, sizeof(m_mechanism)-1);
-  m_mechanism[sizeof(m_mechanism)-1]= '\0';
-  log_stream << "Sasl_client::read_method_name_from_server : " << m_mechanism;
-  log_dbg(log_stream.str());
+  if (rc_server_read >= 0 && rc_server_read <= max_method_name_len)
+  {
+    strncpy(m_mechanism, (const char*)packet, rc_server_read);
+    m_mechanism[rc_server_read]= '\0';
+    log_stream << "Sasl_client::read_method_name_from_server : "
+               << m_mechanism;
+    log_dbg(log_stream.str());
+  }
+  else if (rc_server_read > max_method_name_len)
+  {
+    rc_server_read= -1;
+    m_mechanism[0]= '\0';
+    log_stream << "Sasl_client::read_method_name_from_server : Method name "
+               << "is greater then allowed limit of 256 characters.";
+    log_error(log_stream.str());
+  }
+  else
+  {
+    m_mechanism[0]= '\0';
+    log_stream << "Sasl_client::read_method_name_from_server : Plugin has "
+               << "failed to read the method name, make sure that default "
+               << "authentication plugin and method name specified at "
+               << "server are correct.";
+    log_error(log_stream.str());
+  }
   return rc_server_read;
 }
 
@@ -101,6 +135,36 @@ int Sasl_client::initilize()
 {
   std::stringstream log_stream;
   int rc_sasl= SASL_FAIL;
+#ifdef _WIN32
+  char sasl_plugin_dir[MAX_PATH]= "";
+  int ret_executable_path= 0;
+  /**
+    Getting the current executable path, SASL SCRAM dll will be copied in executable path.
+    Using/Setting the path from cmake file may not work as during installation SASL SCRAM DLL may be
+    copied to any path based on installable path.
+  */
+  ret_executable_path= GetModuleFileName(NULL, sasl_plugin_dir, sizeof(sasl_plugin_dir));
+  if ((ret_executable_path == 0) || (ret_executable_path == sizeof(sasl_plugin_dir)))
+  {
+    log_error("sasl client initilize: failed to find executable path or buffer size for path is too small.");
+    goto EXIT;
+  }
+  char *pos= strrchr(sasl_plugin_dir, '\\');
+  if (pos != NULL)
+  {
+    *pos = '\0';
+  }
+  /**
+    Sasl SCRAM dll default search path is C:\CMU2,
+    This is the reason we have copied in the executable folder and setting the same
+    from the code.
+  */
+  sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasl_plugin_dir);
+  log_stream << "Sasl_client::initilize sasl scrum plug-in path : "
+             << sasl_plugin_dir;
+  log_dbg(log_stream.str());
+  log_stream.clear();
+#endif
   strncpy(m_service_name, SASL_SERVICE_NAME, sizeof(m_service_name)-1);
   m_service_name[sizeof(m_service_name)-1]= '\0';
   /** Initialize client-side of SASL. */
@@ -193,7 +257,7 @@ int Sasl_client::send_sasl_request_to_server(const unsigned char *request,
 int Sasl_client::sasl_start(char **client_output, int* client_output_length)
 {
   int rc_sasl= SASL_FAIL;
-  const char *mechanisum= NULL;
+  const char *mechanism= NULL;
   char* sasl_client_output= NULL;
   sasl_interact_t *interactions= NULL;
   std::stringstream log_stream;
@@ -208,16 +272,25 @@ int Sasl_client::sasl_start(char **client_output, int* client_output_length)
      rc_sasl= sasl_client_start(m_connection, m_mechanism, &interactions,
                                 (const char**)&sasl_client_output,
                                 (unsigned int *)client_output_length,
-                                &mechanisum);
+                                &mechanism);
      if(rc_sasl == SASL_INTERACT) interact(interactions);
   }
   while(rc_sasl == SASL_INTERACT);
+  if (rc_sasl == SASL_NOMECH)
+  {
+    log_stream << "SASL method '" << m_mechanism << "' sent by server, "
+               << "is not supported by the SASL client. Make sure that "
+               << "cyrus SASL library is installed.";
+    log_error(log_stream.str());
+    goto EXIT;
+  }
   if (client_output != NULL)
   {
     *client_output= sasl_client_output;
     log_stream << "Sasl_client::SaslStart sasl output: " << sasl_client_output;
     log_dbg(log_stream.str());
   }
+EXIT:
   return rc_sasl;
 }
 
@@ -278,7 +351,7 @@ static int sasl_authenticate(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   server_packet_len= sasl_client.read_method_name_from_server();
   if (server_packet_len < 0)
   {
-    log_error("sasl_authenticate: method name read from server side plug-in failed");
+    // Callee has already logged the messages.
     goto EXIT;
   }
 
@@ -312,7 +385,6 @@ static int sasl_authenticate(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
       goto EXIT;
     }
 
-    server_packet_len= strlen((const char*)server_packet);
     rc_sasl= sasl_client.sasl_step((char*)server_packet,
                                    server_packet_len, &sasl_client_output,
                                    &sasl_client_output_len);
diff --git a/libmysql/authentication_ldap/auth_ldap_sasl_client.h b/libmysql/authentication_ldap/auth_ldap_sasl_client.h
index 87e41e6f36bf..06470eee6aa8 100644
--- a/libmysql/authentication_ldap/auth_ldap_sasl_client.h
+++ b/libmysql/authentication_ldap/auth_ldap_sasl_client.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/authentication_ldap/log_client.cc b/libmysql/authentication_ldap/log_client.cc
index affd29de54ae..6b630cb03f2c 100644
--- a/libmysql/authentication_ldap/log_client.cc
+++ b/libmysql/authentication_ldap/log_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/authentication_ldap/log_client.h b/libmysql/authentication_ldap/log_client.h
index 0efc45fe1218..148dfc3878c0 100644
--- a/libmysql/authentication_ldap/log_client.h
+++ b/libmysql/authentication_ldap/log_client.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/authentication_win/CMakeLists.txt b/libmysql/authentication_win/CMakeLists.txt
index 447a69bae242..31af67e5d030 100644
--- a/libmysql/authentication_win/CMakeLists.txt
+++ b/libmysql/authentication_win/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -31,7 +38,3 @@ TARGET_LINK_LIBRARIES(auth_win_client Secur32)
 # In IDE, group headers in a separate folder.
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/libmysql/authentication_win/common.cc b/libmysql/authentication_win/common.cc
index 48c400d08cf6..78bb1e7b6898 100644
--- a/libmysql/authentication_win/common.cc
+++ b/libmysql/authentication_win/common.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -52,7 +59,7 @@ int opt_auth_win_log_level= 2;
 
 Connection::Connection(MYSQL_PLUGIN_VIO *vio): m_vio(vio), m_error(0)
 {
-  DBUG_ASSERT(vio);
+  assert(vio);
 }
 
 
@@ -71,7 +78,7 @@ int Connection::write(const Blob &blob)
 {
   m_error= m_vio->write_packet(m_vio, blob.ptr(), static_cast<int>(blob.len()));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (m_error)
     DBUG_PRINT("error", ("vio write error %d", m_error));
 #endif
@@ -120,7 +127,7 @@ Blob Connection::read()
 */
 
 Sid::Sid(const wchar_t *account_name): m_data(NULL)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 , m_as_string(NULL)
 #endif
 {
@@ -134,7 +141,7 @@ Sid::Sid(const wchar_t *account_name): m_data(NULL)
 
   if (!success && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID buffer size, "
                          "LookupAccountName() failed with error %X (%s)",
@@ -156,7 +163,7 @@ Sid::Sid(const wchar_t *account_name): m_data(NULL)
 
   if (!success || !is_valid())
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID of '%S', "
                          "LookupAccountName() failed with error %X (%s)",
@@ -189,7 +196,7 @@ Sid::Sid(const wchar_t *account_name): m_data(NULL)
 */
 
 Sid::Sid(HANDLE token): m_data(NULL)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 , m_as_string(NULL)
 #endif
 {
@@ -201,7 +208,7 @@ Sid::Sid(HANDLE token): m_data(NULL)
   success= GetTokenInformation(token, TokenUser, NULL, 0, &req_size);
   if (!success && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     Error_message_buf error_buf;
     DBUG_PRINT("error", ("Could not determine SID buffer size, "
                          "GetTokenInformation() failed with error %X (%s)",
@@ -217,7 +224,7 @@ Sid::Sid(HANDLE token): m_data(NULL)
   {
     delete [] m_data;
     m_data= NULL;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (!success)
     {
       Error_message_buf error_buf;
@@ -234,7 +241,7 @@ Sid::~Sid()
 {
   if (m_data)
     delete [] m_data;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (m_as_string)
     LocalFree(m_as_string);
 #endif
@@ -247,7 +254,7 @@ bool Sid::is_valid(void) const
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 /**
   Produces string representation of the SID.
@@ -269,7 +276,7 @@ const char* Sid::as_string()
 
     if (!success)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       Error_message_buf error_buf;
       DBUG_PRINT("error", ("Could not get textual representation of a SID, "
                            "ConvertSidToStringSid() failed with error %X (%s)",
@@ -314,7 +321,7 @@ UPN::UPN(): m_buf(NULL)
   {
     if (GetLastError())
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       Error_message_buf error_buf;
       DBUG_PRINT("note", ("When determining UPN"
                           ", GetUserNameEx() failed with error %X (%s)",
@@ -406,7 +413,7 @@ char* wchar_to_utf8(const wchar_t *string, size_t *len)
 
   // res is 0 which indicates error
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   Error_message_buf error_buf;
   DBUG_PRINT("error", ("Could not convert string '%S' to utf8"
                        ", WideCharToMultiByte() failed with error %X (%s)",
@@ -415,7 +422,7 @@ char* wchar_to_utf8(const wchar_t *string, size_t *len)
 #endif
 
   // Let's check our assumption about sufficient buffer size
-  DBUG_ASSERT(ERROR_INSUFFICIENT_BUFFER != GetLastError());
+  assert(ERROR_INSUFFICIENT_BUFFER != GetLastError());
 
   return NULL;
 }
@@ -472,7 +479,7 @@ wchar_t* utf8_to_wchar(const char *string, size_t *len)
 
   // error in MultiByteToWideChar()
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   Error_message_buf error_buf;
   DBUG_PRINT("error", ("Could not convert UPN from UTF-8"
                        ", MultiByteToWideChar() failed with error %X (%s)",
@@ -480,7 +487,7 @@ wchar_t* utf8_to_wchar(const char *string, size_t *len)
 #endif
 
   // Let's check our assumption about sufficient buffer size
-  DBUG_ASSERT(ERROR_INSUFFICIENT_BUFFER != GetLastError());
+  assert(ERROR_INSUFFICIENT_BUFFER != GetLastError());
 
   return NULL;
 }
@@ -504,7 +511,7 @@ const char* get_last_error_message(Error_message_buf buf)
   buf[0]= '\0';
   FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		(LPTSTR)buf, sizeof(buf), NULL );
+		(LPTSTR)buf, sizeof(Error_message_buf), NULL);
 
   return buf;
 }
diff --git a/libmysql/authentication_win/common.h b/libmysql/authentication_win/common.h
index b7525fbda13e..ea6264220d47 100644
--- a/libmysql/authentication_win/common.h
+++ b/libmysql/authentication_win/common.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -59,7 +66,7 @@ void          set_log_level(unsigned int);
   to fprintf() (see error_log_vprint() function).
 */
 
-#if defined(DEBUG_ERROR_LOG) && defined(DBUG_OFF)
+#if defined(DEBUG_ERROR_LOG) && defined(NDEBUG)
 #define ERROR_LOG(Level, Msg)     do {} while (0)
 #else
 #define ERROR_LOG(Level, Msg)     error_log_print< error_log_level::Level > Msg
@@ -92,7 +99,7 @@ const char* get_last_error_message(Error_message_buf);
   unless the dbug library implementation is used or debug messages are disabled.
 */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 #define DBUG_PRINT_DO(Keyword, Msg) \
   do { \
@@ -133,13 +140,6 @@ void debug_msg(const char *fmt, ...)
 #undef DBUG_RETURN
 #define DBUG_RETURN(X) return (X)
 
-#undef DBUG_ASSERT
-#ifndef DBUG_OFF
-#define DBUG_ASSERT(X) assert (X)
-#else
-#define DBUG_ASSERT(X) do {} while (0)
-#endif
-
 #undef DBUG_DUMP
 #define DBUG_DUMP(A,B,C) do {} while (0)
 
@@ -272,7 +272,7 @@ class Sid
     return (PSID)m_data->User.Sid;
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 private:
     char *m_as_string;  ///< Cached string representation of the SID.
diff --git a/libmysql/authentication_win/handshake.cc b/libmysql/authentication_win/handshake.cc
index 7801bb03e017..f8fe786df352 100644
--- a/libmysql/authentication_win/handshake.cc
+++ b/libmysql/authentication_win/handshake.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -35,7 +42,7 @@
 Handshake::Handshake(const char *ssp, side_t side)
 : m_atts(0L), m_error(0), m_complete(FALSE),
   m_have_credentials(false), m_have_sec_context(false)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   , m_ssp_info(NULL)
 #endif
 {
@@ -68,7 +75,7 @@ Handshake::~Handshake()
     DeleteSecurityContext(&m_sctx);
   m_output.mem_free();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (m_ssp_info)
     FreeContextBuffer(m_ssp_info);
 #endif
@@ -163,7 +170,7 @@ int Handshake::packet_processing_loop()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 /**
   Get name of the security package which was used in authentication.
diff --git a/libmysql/authentication_win/handshake.h b/libmysql/authentication_win/handshake.h
index 14b1386ed4d7..0581cd3d5ade 100644
--- a/libmysql/authentication_win/handshake.h
+++ b/libmysql/authentication_win/handshake.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -167,7 +174,7 @@ class Handshake
   /// Write packet to the other end.
   virtual int  write_packet(Blob &data) =0;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 private:
   SecPkgInfo  *m_ssp_info;
diff --git a/libmysql/authentication_win/handshake_client.cc b/libmysql/authentication_win/handshake_client.cc
index 4cf62192d8b3..a8498af562f2 100644
--- a/libmysql/authentication_win/handshake_client.cc
+++ b/libmysql/authentication_win/handshake_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -162,7 +169,7 @@ int Handshake_client::write_packet(Blob &data)
     */
     unsigned block_count= data.len()/512 + ((data.len() % 512) ? 1 : 0);
 
-#if !defined(DBUG_OFF) && defined(WINAUTH_USE_DBUG_LIB)
+#if !defined(NDEBUG) && defined(WINAUTH_USE_DBUG_LIB)
 
     /*
       For testing purposes, use wrong block count to see how server
@@ -176,7 +183,7 @@ int Handshake_client::write_packet(Blob &data)
 
 #endif
 
-    DBUG_ASSERT(block_count < (unsigned)0x100);
+    assert(block_count < (unsigned)0x100);
     saved_byte= data[254];
     data[254] = block_count;
 
@@ -225,7 +232,7 @@ int Handshake_client::write_packet(Blob &data)
 
 Blob Handshake_client::process_data(const Blob &data)
 {
-#if !defined(DBUG_OFF) && defined(WINAUTH_USE_DBUG_LIB)
+#if !defined(NDEBUG) && defined(WINAUTH_USE_DBUG_LIB)
   /*
     Code for testing the logic for sending the first client payload.
 
@@ -352,7 +359,7 @@ int win_auth_handshake_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   // Create connection object.
 
   Connection con(vio);
-  DBUG_ASSERT(!con.error());
+  assert(!con.error());
 
   // Read initial packet from server containing service name.
 
@@ -376,7 +383,7 @@ int win_auth_handshake_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     DBUG_RETURN(CR_ERROR);
   }
 
-  DBUG_ASSERT(!hndshk.error());
+  assert(!hndshk.error());
 
   /*
     Read and process packets from server until handshake is complete.
@@ -387,7 +394,7 @@ int win_auth_handshake_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   if (hndshk.packet_processing_loop())
     DBUG_RETURN(CR_ERROR);
 
-  DBUG_ASSERT(!hndshk.error() && hndshk.is_complete());
+  assert(!hndshk.error() && hndshk.is_complete());
 
   DBUG_RETURN(CR_OK);
 }
diff --git a/libmysql/authentication_win/log_client.cc b/libmysql/authentication_win/log_client.cc
index 6973c95fde3b..a2cc3fee9ef3 100644
--- a/libmysql/authentication_win/log_client.cc
+++ b/libmysql/authentication_win/log_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/authentication_win/plugin_client.cc b/libmysql/authentication_win/plugin_client.cc
index d25aae8854b5..99f890472887 100644
--- a/libmysql/authentication_win/plugin_client.cc
+++ b/libmysql/authentication_win/plugin_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 3d44a811ea60..9f5c8930d1c2 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -1,14 +1,26 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c
index 4209a834d242..abc938e87268 100644
--- a/libmysql/conf_to_src.c
+++ b/libmysql/conf_to_src.c
@@ -1,16 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 5534b6deb808..d86b60b4b0c2 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -1,16 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -88,6 +97,9 @@ const char *client_errors[]=
   "There is an attribute with the same name already",
   "Authentication plugin '%s' reported error: %s",
   "Insecure API function call: '%s' Use instead: '%s'",
+  "'%-.32s' character set is having more than 1 byte minimum character "
+  "length, which cannot be used as a client character set. Please use any "
+  "of the single byte minimum ones, e.g. utf8mb4, latin1 etc.",
   ""
 };
 
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 51aab623a24d..8c24b6bf7315 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -116,7 +128,7 @@ int STDCALL mysql_server_init(int argc MY_ATTRIBUTE((unused)),
     init_client_errs();
     if (mysql_client_plugin_init())
       return 1;
-#if defined (HAVE_OPENSSL) && !defined(HAVE_YASSL)
+#if defined (HAVE_OPENSSL)
     ssl_start();
 #endif
 
@@ -253,7 +265,7 @@ append_wild(char *to, char *end, const char *wild)
 void STDCALL
 mysql_debug(const char *debug MY_ATTRIBUTE((unused)))
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char	*env;
   if (debug)
   {
@@ -1405,7 +1417,7 @@ void set_stmt_error(MYSQL_STMT * stmt, int errcode,
 {
   DBUG_ENTER("set_stmt_error");
   DBUG_PRINT("enter", ("error: %d '%s'", errcode, ER(errcode)));
-  DBUG_ASSERT(stmt != 0);
+  assert(stmt != 0);
 
   if (err == 0)
     err= ER(errcode);
@@ -1432,7 +1444,7 @@ void set_stmt_errmsg(MYSQL_STMT *stmt, NET *net)
                        net->last_errno,
                        net->sqlstate,
                        net->last_error));
-  DBUG_ASSERT(stmt != 0);
+  assert(stmt != 0);
 
   stmt->last_errno= net->last_errno;
   if (net->last_error[0] != '\0')
@@ -1712,7 +1724,7 @@ static void alloc_stmt_fields(MYSQL_STMT *stmt)
   MEM_ROOT *fields_mem_root= &stmt->extension->fields_mem_root;
   MYSQL *mysql= stmt->mysql;
 
-  DBUG_ASSERT(stmt->field_count);
+  assert(stmt->field_count);
 
   free_root(fields_mem_root, MYF(0));
 
@@ -2155,8 +2167,18 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
   {
     if (mysql->server_status & SERVER_STATUS_CURSOR_EXISTS)
       mysql->server_status&= ~SERVER_STATUS_CURSOR_EXISTS;
-
-    if (!res && (stmt->flags & CURSOR_TYPE_READ_ONLY))
+    /*
+      After having read the query result, we need to make sure that the client
+      does not end up into a hang waiting for the server to send a packet.
+      If the CURSOR_TYPE_READ_ONLY flag is set, we would want to perform the
+      additional packet read mainly for prepared statements involving SELECT
+      queries. For SELECT queries, the result format would either be
+      <Metadata><OK> or <Metadata><rows><OK>. We would have read the metadata
+      by now and have the field_count populated. The check for field_count will
+      help determine if we can expect an additional packet from the server.
+    */
+    if (!res && (stmt->flags & CURSOR_TYPE_READ_ONLY) &&
+        mysql->field_count != 0)
     {
       /*
         server can now respond with a cursor - then the respond will be
@@ -2173,13 +2195,29 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
 
       if (is_data_packet)
       {
-        DBUG_ASSERT(stmt->result.rows == 0);
+        assert(stmt->result.rows == 0);
         prev_ptr= &stmt->result.data;
         if (add_binary_row(net, stmt, pkt_len, &prev_ptr))
           DBUG_RETURN(1);
       }
       else
+      {
         read_ok_ex(mysql, pkt_len);
+        /*
+          If the result set was empty and the server did not open a cursor,
+          then the response from the server would have been <metadata><OK>.
+          This means the OK packet read above was the last OK packet of the
+          sequence. Hence, we set the status to indicate that the client is
+          now ready for next command. The stmt->read_row_func is set so as
+          to ensure that the next call to C API mysql_stmt_fetch() will not
+          read on the network. Instead, it will return NO_MORE_DATA.
+        */
+        if (!(mysql->server_status & SERVER_STATUS_CURSOR_EXISTS))
+        {
+          mysql->status= MYSQL_STATUS_READY;
+          stmt->read_row_func= stmt_read_row_no_data;
+        }
+      }
     }
   }
 
@@ -2588,8 +2626,13 @@ static void prepare_to_fetch_result(MYSQL_STMT *stmt)
       cursors framework in the server and writes rows directly to the
       network or b) is more efficient if all (few) result set rows are
       precached on client and server's resources are freed.
+      The below check for mysql->status is required because we could
+      have already read the last packet sent by the server in execute()
+      and set the status to MYSQL_STATUS_READY. In such cases, we need
+      not call mysql_stmt_store_result().
     */
-    mysql_stmt_store_result(stmt);
+    if (stmt->mysql->status != MYSQL_STATUS_READY)
+      mysql_stmt_store_result(stmt);
   }
   else
   {
@@ -3064,7 +3107,7 @@ mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number,
 {
   MYSQL_BIND *param;
   DBUG_ENTER("mysql_stmt_send_long_data");
-  DBUG_ASSERT(stmt != 0);
+  assert(stmt != 0);
   DBUG_PRINT("enter",("param no: %d  data: 0x%lx, length : %ld",
 		      param_number, (long) data, length));
 
@@ -4066,7 +4109,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
   case MYSQL_TYPE_LONG_BLOB:
   case MYSQL_TYPE_BLOB:
   case MYSQL_TYPE_BIT:
-    DBUG_ASSERT(param->buffer_length != 0);
+    assert(param->buffer_length != 0);
     param->fetch_result= fetch_result_bin;
     break;
   case MYSQL_TYPE_VAR_STRING:
@@ -4075,7 +4118,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
   case MYSQL_TYPE_NEWDECIMAL:
   case MYSQL_TYPE_NEWDATE:
   case MYSQL_TYPE_JSON:
-    DBUG_ASSERT(param->buffer_length != 0);
+    assert(param->buffer_length != 0);
     param->fetch_result= fetch_result_str;
     break;
   default:
@@ -4245,8 +4288,8 @@ static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row)
     Precondition: if stmt->field_count is zero or row is NULL, read_row_*
     function must return no data.
   */
-  DBUG_ASSERT(stmt->field_count);
-  DBUG_ASSERT(row);
+  assert(stmt->field_count);
+  assert(row);
 
   if (!stmt->bind_result_done)
   {
@@ -4300,7 +4343,7 @@ int cli_unbuffered_fetch(MYSQL *mysql, char **row)
 {
   ulong len= 0;
   my_bool is_data_packet;
-  if (packet_error == cli_safe_read(mysql, &is_data_packet))
+  if (packet_error == (len = cli_safe_read(mysql, &is_data_packet)))
   {
     MYSQL_TRACE_STAGE(mysql, READY_FOR_COMMAND);
     return 1;
@@ -4434,7 +4477,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
    We could have read one row in execute() due to the lack of a cursor,
    but one at most.
   */
-  DBUG_ASSERT(result->rows <= 1);
+  assert(result->rows <= 1);
   if (result->rows == 1)
     prev_ptr= &result->data->next;
 
@@ -4513,7 +4556,7 @@ static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data)
   MYSQL_FIELD *field;
   uchar *null_ptr, bit;
   uchar *row= (uchar*) data->data;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uchar *row_end= row + data->length;
 #endif
 
@@ -4528,7 +4571,7 @@ static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data)
   {
     if (!(*null_ptr & bit))
       (*my_bind->skip_result)(my_bind, field, &row);
-    DBUG_ASSERT(row <= row_end);
+    assert(row <= row_end);
     if (!((bit<<=1) & 255))
     {
       bit= 1;					/* To next uchar */
@@ -4635,8 +4678,8 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
   }
 
   /* Assert that if there was a cursor, all rows have been fetched */
-  DBUG_ASSERT(mysql->status != MYSQL_STATUS_READY ||
-              (mysql->server_status & SERVER_STATUS_LAST_ROW_SENT));
+  assert(mysql->status != MYSQL_STATUS_READY ||
+         (mysql->server_status & SERVER_STATUS_LAST_ROW_SENT));
 
   if (stmt->update_max_length)
   {
@@ -4876,7 +4919,7 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
 my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt)
 {
   DBUG_ENTER("mysql_stmt_reset");
-  DBUG_ASSERT(stmt != 0);
+  assert(stmt != 0);
   if (!stmt->mysql)
   {
     /* mysql can be reset in mysql_close called from mysql_reconnect */
diff --git a/libmysql/libmysql.ver.in b/libmysql/libmysql.ver.in
index 3b0c3d826868..8b9d83d575cb 100644
--- a/libmysql/libmysql.ver.in
+++ b/libmysql/libmysql.ver.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/mysql_trace.c b/libmysql/mysql_trace.c
index 3073479b2491..7f7138e0c19c 100644
--- a/libmysql/mysql_trace.c
+++ b/libmysql/mysql_trace.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -90,7 +102,7 @@ void mysql_trace_start(struct st_mysql *m)
     is loaded and thus trace_plugin pointer is not NULL. This
     is handled in MYSQL_TRACE_STAGE() macro (mysql_trace.h).
   */
-  DBUG_ASSERT(trace_plugin);
+  assert(trace_plugin);
 
   trace_info->plugin= trace_plugin;
   trace_info->stage=  PROTOCOL_STAGE_CONNECTING;
@@ -143,7 +155,7 @@ void mysql_trace_trace(struct st_mysql  *m,
     function should not be called - this is handled inside MYSQL_TRACE()
     macro.
   */
-  DBUG_ASSERT(trace_info);
+  assert(trace_info);
 
   /* Call plugin's trace_event() method if defined */
 
@@ -181,7 +193,7 @@ void mysql_trace_trace(struct st_mysql  *m,
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /*
   These functions are declared in plugin_trace.h.
 
diff --git a/libmysql/mysql_trace.h b/libmysql/mysql_trace.h
index 6ec4e76262a8..25c21362e3b7 100644
--- a/libmysql/mysql_trace.h
+++ b/libmysql/mysql_trace.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysql/test_trace_plugin.cc b/libmysql/test_trace_plugin.cc
index 4463cabe2491..351f7307679c 100644
--- a/libmysql/test_trace_plugin.cc
+++ b/libmysql/test_trace_plugin.cc
@@ -1,21 +1,28 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#if defined(DBUG_OFF)
+#if defined(NDEBUG)
 // This code can be used only in debug builds.
-#error You cannot use test trace plugin when DBUG_OFF is defined. \
+#error You cannot use test trace plugin when NDEBUG is defined. \
        Test trace plugin will work in debug builds only.
 #else
 
@@ -474,7 +481,7 @@ trace_event(struct st_mysql_client_plugin_TRACE *self,
     {
       LOG(("wrong stage, expected: %s", protocol_stage_name(data->next_stage)));
       if (opt_crash)
-        DBUG_ASSERT(0);
+        assert(0);
     }
   }
 
@@ -617,7 +624,7 @@ trace_event(struct st_mysql_client_plugin_TRACE *self,
   default:
     LOG(("invalid stage %d", stage));
     if (opt_crash)
-      DBUG_ASSERT(0);
+      assert(0);
   }
 
   // Disable invalid event check in certain cases.
@@ -647,7 +654,7 @@ trace_event(struct st_mysql_client_plugin_TRACE *self,
   {
     LOG(("invalid event detected"));
     if (opt_crash)
-      DBUG_ASSERT(0);
+      assert(0);
   }
 
   return 0;
@@ -1419,4 +1426,4 @@ int check_event_DISCONNECTED(MYSQL *conn,
 
 } // namespace test_trace
 
-#endif // #if defined(DBUG_OFF)
+#endif // #if defined(NDEBUG)
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 9f106302fde8..e7750b435734 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -27,11 +34,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/libmysqld
   ${CMAKE_BINARY_DIR}/sql
   ${CMAKE_SOURCE_DIR}/regex
-  ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${SSL_INTERNAL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/sql/backup
-  ${LZ4_INCLUDE_DIR}
 )
 
 # We should generate these separately for libmysqld to avoid
@@ -68,7 +73,7 @@ SET(SQL_EMBEDDED_SOURCES
   libmysqld.c
   ${GEN_SOURCES}
   ${GEN_YACC_SOURCES}
-  ../extra/lz4/xxhash.c
+  ${BUNDLED_LZ4_PATH}/xxhash.c
   ../client/get_password.c
   ../libmysql/errmsg.c
   ../libmysql/libmysql.c
@@ -110,32 +115,29 @@ SET(SQL_EMBEDDED_SOURCES
 )
 
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+INCLUDE_DIRECTORIES(SYSTEM
+  ${BOOST_PATCHES_DIR}
+  ${BOOST_INCLUDE_DIR}
+  )
+
 ADD_COMPILE_FLAGS(
-  ../sql/debug_sync.cc
-  ../sql/handler.cc
-  ../sql/geometry_rtree.cc
-  ../sql/item_geofunc.cc
-  ../sql/item_geofunc_buffer.cc
-  ../sql/item_geofunc_internal.cc
-  ../sql/item_geofunc_relchecks.cc
-  ../sql/item_geofunc_relchecks_bgwrap.cc
-  ../sql/item_geofunc_setops.cc
-  ../sql/item_json_func.cc
-  ../sql/spatial.cc
-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+  ${BUNDLED_LZ4_PATH}/xxhash.c
+  COMPILE_FLAGS -DXXH_NAMESPACE=MY_ -I${BUNDLED_LZ4_PATH}
 )
 
 ADD_COMPILE_FLAGS(
-  ../extra/lz4/xxhash.c
-  COMPILE_FLAGS -DXXH_NAMESPACE=MY_
-)
+  ../sql/rpl_write_set_handler.cc
+  COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH}
+  )
 
 # Fixes "C1128: number of sections exceeded object file format limit" in MSVC /MD
 # The flag /bigobj is not added if the build is not /MD
 IF(WIN32 AND CMAKE_SIZEOF_VOID_P MATCHES 8)
   FOREACH(flag 
+     CMAKE_C_FLAGS_MINSIZEREL
      CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
      CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
+     CMAKE_CXX_FLAGS_MINSIZEREL
      CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
      CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
     
@@ -199,6 +201,14 @@ IF(HAVE_MAYBE_UNINITIALIZED)
     COMPILE_FLAGS "-Wno-maybe-uninitialized")
 ENDIF()
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753
+IF(MY_COMPILER_IS_GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  ADD_COMPILE_FLAGS(
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_hints.yy.cc
+    COMPILE_FLAGS "-Wno-free-nonheap-object -Wno-unused-label")
+ENDIF()
+
 # Handle out-of-source build from source package with possibly broken 
 # bison. Copy bison output to from source to build directory, if not already 
 # there
@@ -270,6 +280,11 @@ SET(LIBS
   sql_embedded
 )
 
+IF(WIN32)
+  LIST(APPEND LIBS crypt32)
+ENDIF()
+
+
 # Some storage engine were compiled for embedded specifically
 # (with corresponding target ${engine}_embedded)
 SET(EMBEDDED_LIBS)
@@ -294,7 +309,7 @@ ENDIF()
 
 IF(UNIX)
  INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME
-  ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
+   libmysqld-debug.a)
 ENDIF()
 
 IF(MSVC AND NOT DISABLE_SHARED)
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
index e49ed4d1e369..88ea4d0b85c3 100644
--- a/libmysqld/emb_qcache.cc
+++ b/libmysqld/emb_qcache.cc
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights
  * reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,14 +33,14 @@ void Querycache_stream::store_uchar(uchar c)
   if (data_end == cur_data)
     use_next_block(TRUE);
   *(cur_data++)= c;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   stored_size++;
 #endif
 }
 
 void Querycache_stream::store_short(ushort s)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   stored_size+= 2;
 #endif
   if (data_end - cur_data > 1)
@@ -56,7 +63,7 @@ void Querycache_stream::store_short(ushort s)
 
 void Querycache_stream::store_int(uint i)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   stored_size+= 4;
 #endif
   size_t rest_len= data_end - cur_data;
@@ -83,7 +90,7 @@ void Querycache_stream::store_int(uint i)
 
 void Querycache_stream::store_ll(ulonglong ll)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   stored_size+= 8;
 #endif
   size_t rest_len= data_end - cur_data;
@@ -108,7 +115,7 @@ void Querycache_stream::store_ll(ulonglong ll)
 
 void Querycache_stream::store_str_only(const char *str, size_t str_len)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   stored_size+= str_len;
 #endif
   do
@@ -396,7 +403,7 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
       }
     }
   }
-  DBUG_ASSERT(emb_count_querycache_size(thd) == dst->stored_size);
+  assert(emb_count_querycache_size(thd) == dst->stored_size);
   DBUG_VOID_RETURN;
 }
 
diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h
index 6ec19c05daac..6ca8477a96f1 100644
--- a/libmysqld/emb_qcache.h
+++ b/libmysqld/emb_qcache.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
@@ -22,7 +29,7 @@ class Querycache_stream
   Query_cache_block *block;
   uint headers_len;
 public:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   Query_cache_block *first_block;
   size_t stored_size;
 #endif
@@ -31,7 +38,7 @@ class Querycache_stream
   {
     cur_data= ((uchar*)block)+headers_len;
     data_end= cur_data + (block->used-headers_len);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     first_block= ini_block;
     stored_size= 0;
 #endif
@@ -43,8 +50,8 @@ class Querycache_stream
       around to the first block again. That means we're trying to write
       more data than we allocated space for.
     */
-    DBUG_ASSERT(block->next != block);
-    DBUG_ASSERT(block->next != first_block);
+    assert(block->next != block);
+    assert(block->next != first_block);
 
     block= block->next;
     /*
@@ -54,7 +61,7 @@ class Querycache_stream
     if (writing)
       block->type= Query_cache_block::RES_CONT;
     else
-      DBUG_ASSERT(block->type == Query_cache_block::RES_CONT);
+      assert(block->type == Query_cache_block::RES_CONT);
 
     cur_data= ((uchar*)block)+headers_len;
     data_end= cur_data + (block->used-headers_len);
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
index c096954a4601..4e3486d41165 100644
--- a/libmysqld/embedded_priv.h
+++ b/libmysqld/embedded_priv.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index 26bd8c0ad2d9..b9cf4835c78b 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/libmysqld/examples/builder-sample/emb_sample.bpr b/libmysqld/examples/builder-sample/emb_sample.bpr
index 100e5b98dfdb..9af97bac24e8 100644
--- a/libmysqld/examples/builder-sample/emb_sample.bpr
+++ b/libmysqld/examples/builder-sample/emb_sample.bpr
@@ -1,15 +1,22 @@
-# Copyright (c) 2002 MySQL AB
+# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/libmysqld/examples/builder-sample/emb_sample.cpp b/libmysqld/examples/builder-sample/emb_sample.cpp
index 0c8f4fa0598d..7692cd10d8ba 100644
--- a/libmysqld/examples/builder-sample/emb_sample.cpp
+++ b/libmysqld/examples/builder-sample/emb_sample.cpp
@@ -1,15 +1,22 @@
-// Copyright (c) 2002 MySQL AB
+// Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 // Use is subject to license terms.
 // 
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
+// GNU General Public License, version 2.0, for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/libmysqld/examples/builder-sample/emb_samples.cpp b/libmysqld/examples/builder-sample/emb_samples.cpp
index aab1385f6e68..e1cfdf73859c 100644
--- a/libmysqld/examples/builder-sample/emb_samples.cpp
+++ b/libmysqld/examples/builder-sample/emb_samples.cpp
@@ -1,15 +1,22 @@
-// Copyright (c) 2002, 2004, 2007 MySQL AB
+// Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 // Use is subject to license terms.
 // 
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
+// GNU General Public License, version 2.0, for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/libmysqld/examples/builder-sample/emb_samples.h b/libmysqld/examples/builder-sample/emb_samples.h
index 3024e75d5333..7dddc23abe0e 100644
--- a/libmysqld/examples/builder-sample/emb_samples.h
+++ b/libmysqld/examples/builder-sample/emb_samples.h
@@ -1,15 +1,22 @@
-// Copyright (c) 2002 MySQL AB
+// Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 // Use is subject to license terms.
 // 
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
+// GNU General Public License, version 2.0, for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run
index 757f4f61a86e..2885b81b3341 100755
--- a/libmysqld/examples/test-run
+++ b/libmysqld/examples/test-run
@@ -1,16 +1,23 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2006 MySQL AB
+# Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 1932176f939e..89c25fd47b47 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -2,7 +2,7 @@
  * Copyright (c)  2000, 2014
  * SWsoft  company
  *
- * Modifications copyright (c) 2001, 2015. Oracle and/or its affiliates.
+ * Modifications Copyright (c) 2001, 2023, Oracle and/or its affiliates.
  * All rights reserved.
  *
  * This material is provided "as is", with absolutely no warranty expressed
@@ -291,7 +291,7 @@ static my_bool emb_read_query_result(MYSQL *mysql)
 {
   THD *thd= (THD*) mysql->thd;
   MYSQL_DATA *res= thd->first_data;
-  DBUG_ASSERT(!thd->cur_data);
+  assert(!thd->cur_data);
   thd->first_data= res->embedded_info->next;
   if (res->embedded_info->last_errno &&
       !res->embedded_info->fields_list)
@@ -388,7 +388,7 @@ int emb_read_rows_from_cursor(MYSQL_STMT *stmt)
   MYSQL *mysql= stmt->mysql;
   THD *thd= (THD*) mysql->thd;
   MYSQL_DATA *res= thd->first_data;
-  DBUG_ASSERT(!thd->first_data->embedded_info->next);
+  assert(!thd->first_data->embedded_info->next);
   thd->first_data= 0;
   if (res->embedded_info->last_errno)
   {
@@ -1312,7 +1312,7 @@ void Protocol_text::start_row()
   data->embedded_info->prev_ptr= &cur->next;
   next_field=cur->data;
   next_mysql_field= data->embedded_info->fields_list;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   field_pos= 0;
 #endif
 
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index f64c17d1ed49..9ca5f3d61f4f 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -164,6 +171,9 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
   if (db)
     client_flag|=CLIENT_CONNECT_WITH_DB;
 
+  if (embedded_ssl_check(mysql))
+    goto error;
+
   mysql->info_buffer= my_malloc(PSI_NOT_INSTRUMENTED,
                                 MYSQL_ERRMSG_SIZE, MYF(0));
   mysql->thd= create_embedded_thd(client_flag);
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 212bbc612d32..8407149b5927 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -1,16 +1,20 @@
-;   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+;   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 ;
 ;   This program is free software; you can redistribute it and/or modify
-;   it under the terms of the GNU General Public License as published by
-;   the Free Software Foundation.
+;   it under the terms of the GNU General Public License, version 2.0,
+;   as published by the Free Software Foundation.
 ;
-;   There are special exceptions to the terms and conditions of the GPL as it
-;   is applied to this software.
+;   This program is also distributed with certain software (including
+;   but not limited to OpenSSL) that is licensed under separate terms,
+;   as designated in a particular file or component or in included license
+;   documentation.  The authors of MySQL hereby grant you an additional
+;   permission to link the program and your derivative works with the
+;   separately licensed software that they have included with MySQL.
 ;
 ;   This program is distributed in the hope that it will be useful,
 ;   but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;   GNU General Public License for more details.
+;   GNU General Public License, version 2.0, for more details.
 ;
 ;   You should have received a copy of the GNU General Public License
 ;   along with this program; if not, write to the Free Software
diff --git a/libmysqld/libmysqld.rc b/libmysqld/libmysqld.rc
index 5b6142faddf7..8df3fadf5fd2 100644
--- a/libmysqld/libmysqld.rc
+++ b/libmysqld/libmysqld.rc
@@ -1,3 +1,25 @@
+//   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
+
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License, version 2.0,
+//   as published by the Free Software Foundation.
+
+//   This program is also distributed with certain software (including
+//   but not limited to OpenSSL) that is licensed under separate terms,
+//   as designated in a particular file or component or in included license
+//   documentation.  The authors of MySQL hereby grant you an additional
+//   permission to link the program and your derivative works with the
+//   separately licensed software that they have included with MySQL.
+
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License, version 2.0, for more details.
+
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
diff --git a/libmysqld/resource.h b/libmysqld/resource.h
index f770fe490a6d..e2c76b6982a2 100644
--- a/libmysqld/resource.h
+++ b/libmysqld/resource.h
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by libmysqld.rc
diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt
index 35a50b93af31..1dfa9e1f377e 100644
--- a/libservices/CMakeLists.txt
+++ b/libservices/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/libservices/HOWTO b/libservices/HOWTO
index ae0e10a993f9..0aaf811d54b6 100644
--- a/libservices/HOWTO
+++ b/libservices/HOWTO
@@ -1,4 +1,4 @@
-Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
 How to create a new service
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/libservices/locking_service.c b/libservices/locking_service.c
index 0ca971d47ae1..719f4fe43b67 100644
--- a/libservices/locking_service.c
+++ b/libservices/locking_service.c
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/my_plugin_log_service.c b/libservices/my_plugin_log_service.c
index 03e7f4e9eeee..b4aae1e6e074 100644
--- a/libservices/my_plugin_log_service.c
+++ b/libservices/my_plugin_log_service.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2011, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/libservices/my_snprintf_service.c b/libservices/my_snprintf_service.c
index 8ac507394b0e..bb7b775bc92a 100644
--- a/libservices/my_snprintf_service.c
+++ b/libservices/my_snprintf_service.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libservices/my_thread_scheduler_service.c b/libservices/my_thread_scheduler_service.c
index 0bbad39dd0aa..7ca749c342d7 100644
--- a/libservices/my_thread_scheduler_service.c
+++ b/libservices/my_thread_scheduler_service.c
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/libservices/mysql_keyring_service.c b/libservices/mysql_keyring_service.c
index 20795c6b0594..517d4c6c5c0f 100644
--- a/libservices/mysql_keyring_service.c
+++ b/libservices/mysql_keyring_service.c
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/mysql_malloc_service.c b/libservices/mysql_malloc_service.c
index 4aac0d49b32b..701419c0efdd 100644
--- a/libservices/mysql_malloc_service.c
+++ b/libservices/mysql_malloc_service.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libservices/mysql_password_policy_service.c b/libservices/mysql_password_policy_service.c
index c38aee1b6fb3..e555ff455eb1 100644
--- a/libservices/mysql_password_policy_service.c
+++ b/libservices/mysql_password_policy_service.c
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/mysql_string_service.c b/libservices/mysql_string_service.c
index f01fa424c797..69d3d9b66888 100644
--- a/libservices/mysql_string_service.c
+++ b/libservices/mysql_string_service.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2012, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */    
diff --git a/libservices/parser_service.c b/libservices/parser_service.c
index d6237783fa85..4e528a7937fc 100644
--- a/libservices/parser_service.c
+++ b/libservices/parser_service.c
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/rpl_transaction_ctx_service.c b/libservices/rpl_transaction_ctx_service.c
index 8e37230716a2..8fed2f13e187 100644
--- a/libservices/rpl_transaction_ctx_service.c
+++ b/libservices/rpl_transaction_ctx_service.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libservices/rpl_transaction_write_set_service.c b/libservices/rpl_transaction_write_set_service.c
index 55319a0ebd91..e17464af7012 100644
--- a/libservices/rpl_transaction_write_set_service.c
+++ b/libservices/rpl_transaction_write_set_service.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libservices/security_context_service.c b/libservices/security_context_service.c
index cedfafa0ee5e..d0441de26e16 100644
--- a/libservices/security_context_service.c
+++ b/libservices/security_context_service.c
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/libservices/service_command.c b/libservices/service_command.c
index 656c92ff8cdf..7d4b13321286 100644
--- a/libservices/service_command.c
+++ b/libservices/service_command.c
@@ -1,14 +1,21 @@
 
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/srv_session_info_service.c b/libservices/srv_session_info_service.c
index bc738930b6ab..393bc0d227e2 100644
--- a/libservices/srv_session_info_service.c
+++ b/libservices/srv_session_info_service.c
@@ -1,14 +1,21 @@
 
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/srv_session_service.c b/libservices/srv_session_service.c
index d0045b6c1cd8..78d069c8f06d 100644
--- a/libservices/srv_session_service.c
+++ b/libservices/srv_session_service.c
@@ -1,14 +1,21 @@
 
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/libservices/thd_alloc_service.c b/libservices/thd_alloc_service.c
index 65e3fc490c80..df16257d8007 100644
--- a/libservices/thd_alloc_service.c
+++ b/libservices/thd_alloc_service.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/libservices/thd_wait_service.c b/libservices/thd_wait_service.c
index 8cec4eecf776..4b6dd7dbdef7 100644
--- a/libservices/thd_wait_service.c
+++ b/libservices/thd_wait_service.c
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 742a5042ee9f..96451bc45dc2 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
index 787b699dee41..a2c2e6228259 100644
--- a/mysql-test/CMakeLists.txt
+++ b/mysql-test/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/mysql-test/asan.supp b/mysql-test/asan.supp
index 41e85f2f72cb..43f4a42a8dc6 100644
--- a/mysql-test/asan.supp
+++ b/mysql-test/asan.supp
@@ -1,4 +1,26 @@
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# ASAN suppressions for gcc/clang
+
 # Warning: this works for clang-3.7 and later
-odr_violation:*yaSSL*
-odr_violation:*TaoCrypt*
 
diff --git a/mysql-test/collections/default.daily b/mysql-test/collections/default.daily
index 384f982c96a4..939aea6ca0a0 100644
--- a/mysql-test/collections/default.daily
+++ b/mysql-test/collections/default.daily
@@ -33,9 +33,11 @@ perl mysql-test-run.pl --force --timer  --parallel=auto --experimental=collectio
 perl mysql-test-run.pl --force --timer  --parallel=auto --experimental=collections/default.experimental --comment=binlog_gtid --vardir=var-binlog_gtid --suite=binlog --mysqld=--binlog-checksum=CRC32 --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list
 
 # Run innodb suite including big-test with innodb-page-size=4k and 8k
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=all_default_4k_size --vardir=var-all_default_4k --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin --suite=innodb
+perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=all_default_8k_size --vardir=var-all_default_8k --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin --suite=innodb
+
+
 # Run innodb_undo suite with innodb_undo_tablespace set to > 0
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=n_mix_4k_size --vardir=var-n_mix_4k --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=4k --skip-test=innodb_ignore_builtin --suite=innodb
-perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=n_mix_8k_size --vardir=var-n_mix_8k --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-daily.list --mysqld=--innodb-page-size=8k --skip-test=innodb_ignore_builtin --suite=innodb
 perl mysql-test-run.pl --timer --force --big-test --testcase-timeout=60  --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=2 --bootstrap --innodb_undo_tablespaces=2 --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=innodb_undo --vardir=var-innodb-undo --experimental=collections/default.experimental --suite=innodb_undo --mysqld=--innodb_undo_tablespaces=3 --mysqld=--innodb_page_size=64K --bootstrap --innodb_undo_tablespaces=3 --bootstrap --innodb_page_size=64K --bootstrap --innodb_rollback_segments=35 --skip-test-list=collections/disabled-per-push.list --big-test noop
 
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 37449cee9d60..bd739bf096eb 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -3,7 +3,6 @@
 
 
 main.func_math @freebsd                  # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
-main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.explain_for_connection_rqg_json @linux # Bug#20697533 2015-03-13 anitha Fails several times each day on linux platforms
 main.explain_for_connection_rqg_trad @linux # Bug#20697533 2015-03-20 erlend Fails several times each day on linux platforms
 
@@ -23,6 +22,8 @@ perfschema.transaction_nested_events     # Bug#17752288 2013-12-17 agopi Fails s
 main.ssl-big @windows                    # Bug#18200216 2014-03-14 horst Fails too often in daily in PB2.
 rpl.rpl_gtid_stress_failover             # Bug#16409537 2014-09-18 Shiv Fails often on weekly and daily trunk branches
 
+sysschema.v_wait_classes_global_by_avg_latency # Bug#21550054 2018-10-08 msundell Fails for 5.7
+
 interactive_utilities.mysql_secure_installation     #Bug19077239 2014-09-18 Sneha Fails often on daily trunk branches
 interactive_utilities.mysql_secure_installation_ssl     #Bug19077239 2014-09-18 Sneha Fails often on daily trunk branches
 
diff --git a/mysql-test/collections/default.push b/mysql-test/collections/default.push
index 0b14846ed3d1..cb029292e064 100644
--- a/mysql-test/collections/default.push
+++ b/mysql-test/collections/default.push
@@ -1,4 +1,4 @@
-perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=n_mix-debug --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --unit-tests-report
+perl mysql-test-run.pl --timer --debug-server --force --parallel=auto  --comment=all_default-debug --vardir=var-all_default --skip-combinations --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --unit-tests-report
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded-debug --vardir=var-main_embedded  --suite=main --embedded --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=innodb_4k_size-debug --vardir=var-innodb-4k --experimental=collections/default.experimental --suite=innodb --mysqld=--innodb-page-size=4k --skip-test-list=collections/disabled-per-push.list
-
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=audit_null --vardir=var-audit_null  --suite=audit_null --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list
diff --git a/mysql-test/collections/default.push-ndbcluster b/mysql-test/collections/default.push-ndbcluster
index ea3edcacf42e..618a58871c46 100644
--- a/mysql-test/collections/default.push-ndbcluster
+++ b/mysql-test/collections/default.push-ndbcluster
@@ -10,7 +10,7 @@
 # build which runs without debug mysqld enabled it will detect any test
 # which does not source the necessary include to skip itself when not in debug mode.
 #
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --unit-tests-report --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=all_default --vardir=var-all_default --skip-combinations --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --unit-tests-report --skip-ndb
 
 # Run the ndbcluster suite only(separately for better report in the CI tool).
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=ndbcluster --vardir=var-ndbcluster --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --suite=ndbcluster
diff --git a/mysql-test/collections/disabled-asan.list b/mysql-test/collections/disabled-asan.list
new file mode 100644
index 000000000000..07153d670efb
--- /dev/null
+++ b/mysql-test/collections/disabled-asan.list
@@ -0,0 +1,2 @@
+# Tests in this file are disabled for ASAN runs in pushbuild.
+# This is in addition to tests disabled by normal disabled.def files
diff --git a/mysql-test/collections/mysql-5.7-stage.push b/mysql-test/collections/mysql-5.7-stage.push
index 417394250c1b..18efb8ab72ac 100644
--- a/mysql-test/collections/mysql-5.7-stage.push
+++ b/mysql-test/collections/mysql-5.7-stage.push
@@ -42,3 +42,7 @@ perl mysql-test-run.pl --timer --force  --comment=memcached --vardir=var-memcach
 perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=test_service_sql_api --vardir=var-test_service_sql_api --suite=test_service_sql_api --experimental=collections/default.experimental --skip-ndb
 # test x plugin
 perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental
+# cross_plugin_test
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=cross_plugin_test --vardir=var-cross_plugin_test --suite=cross_plugin_test --experimental=collections/default.experimental
+# audit_log
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=audit_log --vardir=var-audit_log --suite=audit_log --experimental=collections/default.experimental --force-restart
diff --git a/mysql-test/extra/binlog_tests/drop_temp_table.test b/mysql-test/extra/binlog_tests/drop_temp_table.test
index 25cbfcb7c90b..800cda5f43cc 100644
--- a/mysql-test/extra/binlog_tests/drop_temp_table.test
+++ b/mysql-test/extra/binlog_tests/drop_temp_table.test
@@ -67,8 +67,11 @@ connection con2;
 SELECT GET_LOCK("a",10);
 let $VERSION=`SELECT VERSION()`;
 
-let $wait_binlog_event=DROP /*!40005 TEMPORARY */ TABLE IF EXISTS;
-source include/wait_for_binlog_event.inc;
+if (`SELECT @@GLOBAL.binlog_format != 'ROW'`)
+{
+  let $wait_binlog_event=DROP /*!40005 TEMPORARY */ TABLE IF EXISTS;
+  source include/wait_for_binlog_event.inc;
+}
 
 source include/show_binlog_events.inc;
 DROP DATABASE `drop-temp+table-test`;
@@ -86,27 +89,58 @@ DROP DATABASE `drop-temp+table-test`;
 
 RESET MASTER;
 
-CREATE TABLE t1 ( i text );
+if (`SELECT @@GLOBAL.binlog_format != 'ROW'`)
+{
+  CREATE TABLE t1 ( i text );
 
---connect(con1,localhost,root,,)
-CREATE TEMPORARY TABLE ttmp1 ( i text );
-SET @@session.binlog_format=ROW;
-INSERT INTO t1 VALUES ('1');
-SELECT @@session.binlog_format;
---disconnect con1
-
--- connection default
---let $wait_binlog_event= DROP
---source include/wait_for_binlog_event.inc
---let $mask_binlog_commit_events= 1
--- source include/show_binlog_events.inc
---let $mask_binlog_commit_events= 0
-RESET MASTER;
+  --connect(con1,localhost,root,,)
+  CREATE TEMPORARY TABLE ttmp1 ( i text );
+  SET @@session.binlog_format=ROW;
+  INSERT INTO t1 VALUES ('1');
+  SELECT @@session.binlog_format;
+  --disconnect con1
 
-DROP TABLE t1;
+  -- connection default
+  --let $wait_binlog_event= DROP
+  --source include/wait_for_binlog_event.inc
+  --let $mask_binlog_commit_events= 1
+  -- source include/show_binlog_events.inc
+  --let $mask_binlog_commit_events= 0
+  DROP TABLE t1;
+  RESET MASTER;
+}
 
 # End of 4.1 tests
 
+--echo #
+--echo # Bug 83003: Using temporary tables on slaves increases GTID sequence number
+--echo #
+
+--source include/count_sessions.inc
+--connect (con1,localhost,root,,)
+
+SET @saved_binlog_format= @@SESSION.binlog_format;
+SET SESSION binlog_format= STATEMENT;
+CREATE TEMPORARY TABLE temp_needs_logging(a INT) ENGINE=InnoDB;
+SET SESSION binlog_format= @saved_binlog_format;
+
+# Check with both transactional and non-transactional tables as those are logged
+# separately in close_temporary_tables.
+CREATE TEMPORARY TABLE temp_trx(a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trx(a INT) ENGINE=MyISAM;
+
+CREATE TEMPORARY TABLE temp_needs_logging_in_stmt(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 0;
+CREATE TEMPORARY TABLE temp_binlog_disabled(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 1;
+
+--disconnect con1
+--connection default
+--source include/wait_until_count_sessions.inc
+
+--source include/show_binlog_events.inc
+
+# End of 5.6 tests
 --echo #
 --echo # BUG#21638823: ASSERTION FAILED:
 --echo # THD->GET_TRANSACTION()->IS_EMPTY(TRANSACTION_CTX::STMT) || THD
@@ -133,8 +167,11 @@ XA END 'idle_at_disconnect';
 --disconnect con3
 --source include/wait_until_disconnected.inc
 --connection default
---let $wait_binlog_event= DROP
---source include/wait_for_binlog_event.inc
+if (`SELECT @@GLOBAL.binlog_format != 'ROW'`)
+{
+  --let $wait_binlog_event= DROP
+  --source include/wait_for_binlog_event.inc
+}
 --echo # Dump binlog to show that, either the generated DROP comes after tx
 --echo # commit (stmt or mixed), or there is no trace of the XA txn and
 --echo # the temp table (row)
@@ -151,4 +188,72 @@ XA ROLLBACK 'idle_when_drop_temp';
 
 # clean up the binary log at in the end of the test
 # case as well.
-RESET MASTER;
\ No newline at end of file
+RESET MASTER;
+
+--echo #
+--echo # BUG#28642318: POINT IN TIME RECOVERY USING MYSQLBINLOG BROKEN
+--echo #               WITH TEMPORARY TABLE -> ERRORS
+
+--echo # Test case for DELETE query.
+
+RESET MASTER;
+connect (con1,localhost,root,,);
+
+--echo # Set up.
+--connection default
+--disable_warnings
+SET @save_binlog_format= @@session.binlog_format;
+SET @@session.binlog_format=STATEMENT;
+let $MYSQLD_DATADIR= `select @@datadir`;
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+
+--connection con1
+SET @@session.binlog_format=STATEMENT;
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+
+--connection default
+DELETE d1, d2 FROM t1 AS d1, t1 AS d2 WHERE d1.a<>d2.a;
+
+--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug28642318.sql
+
+--connection default
+DROP TABLE t1;
+
+--echo # DELETE query fails with table re-open error without patch.
+--exec $MYSQL -e "SET SQL_LOG_BIN=0; SOURCE $MYSQLTEST_VARDIR/tmp/bug28642318.sql;"
+
+--echo # Clean up.
+--connection con1
+DROP TABLE IF EXISTS t1;
+
+--connection default
+DROP TABLE IF EXISTS t1;
+RESET MASTER;
+
+--echo # Test case for DROP query.
+
+--connection default
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+
+--connection con1
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+
+--connection default
+DROP TABLE t1;
+
+--connection con1
+DROP TABLE t1;
+
+--connection default
+--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug28642318.sql
+
+--echo # DROP table query fails with unknown table error without patch.
+--exec $MYSQL -e "SET SQL_LOG_BIN=0; SOURCE $MYSQLTEST_VARDIR/tmp/bug28642318.sql;"
+
+--echo # Clean up
+--connection default
+SET @@session.binlog_format= @save_binlog_format;
+RESET MASTER;
+
+--disconnect con1
+--enable_warnings
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
index 8aac9474b578..7e8e55fd5829 100644
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -241,13 +241,16 @@ disconnect con2;
 # Wait until con2 disconnects
 --source include/wait_until_disconnected.inc
 connection con3;
-# Bug #22084462 - MYSQL TEST BINLOG.BINLOG_ROW_MIX_INNODB_MYISAM FAILS
-# Wait to ensure that drop temporary tables events
-# are present in binary log.
---let $event_sequence= (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)
---let $limit= 0,4
---let $wait_for_binlog_events= 1
---source include/assert_binlog_events.inc
+if (`SELECT @@GLOBAL.binlog_format = 'STATEMENT'`)
+{
+  # Bug #22084462 - MYSQL TEST BINLOG.BINLOG_ROW_MIX_INNODB_MYISAM FAILS
+  # Wait to ensure that drop temporary tables events
+  # are present in binary log.
+  --let $event_sequence= (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)
+  --let $limit= 0,4
+  --let $wait_for_binlog_events= 1
+  --source include/assert_binlog_events.inc
+}
 select get_lock("lock1",60);
 source include/show_binlog_events.inc;
 do release_lock("lock1");
diff --git a/mysql-test/extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc b/mysql-test/extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc
new file mode 100644
index 000000000000..9c3f0cdc09f8
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc
@@ -0,0 +1,399 @@
+# ==== Purpose ====
+#
+# Creates a stored routine, stored function, trigger, view, or
+# prepared statement (commonly referred to as "recursive construct")
+# that invokes a given unsafe statement.
+#
+# Then, it invokes the created recursive construct several times:
+#
+#  - With SQL_LOG_BIN = 1 and binlog_format = STATEMENT, to verify
+#    that it gives a warning.
+#
+#  - With SQL_LOG_BIN = 0 and binlog_format = STATEMENT, to verify that
+#    there is no warning and nothing is logged.
+#
+#  - With SQL_LOG_BIN = 1 and binlog_format = MIXED, to verify that it
+#    errors out when the engine is a only statement capable.
+#
+#  - In some cases, the recursive construct can be invoked so that it
+#    has no side-effects but returns a value that may be
+#    nondeterministic.  An example is a function that returns UUID().
+#    The function does not have side effects but its a return value
+#    that may differ on slave.  Such statements are invoked so that
+#    the return value is discarded (e.g., SELECT func()), with
+#    SQL_LOG_BIN = 1 and binlog_format = STATEMENT.  In this case, no
+#    warning should be given and nothing should be written to the
+#    binlog.
+#
+# This is an auxiliary file particularly targeted to being used by the
+# test binlog_unsafe_stmt_capable_engine.  In this context, the purpose is to
+# check how warnings for unsafe statements are propagated in recursive
+# constructs.
+#
+# The statement to invoke ("input") is described using mtr variables,
+# and the resulting recursive construct ("output") is stored in mtr
+# variables in a similar fashion.  To create several levels of nested
+# recursive constructs, source this file once, then copy the values of
+# appropriate output variables to the input variables, and then source
+# this file again.
+#
+#
+# ==== Usage ====
+#
+# See the test binlog_unsafe_stmt_capable_engine for an example of how to use this file.
+#
+# let $CRC_ARG_level= <level>;
+# let $CRC_ARG_type= <type>;
+# let $CRC_ARG_stmt_sidef= <stmt>;
+# let $CRC_ARG_value= <stmt>;
+# let $CRC_ARG_sel_retval= <stmt>;
+# let $CRC_ARG_sel_sidef= <stmt>;
+# let $CRC_ARG_desc= <desc>;
+# source extra/rpl_tests/create_recursive_construct.inc;
+# let $my_stmt_sidef= $CRC_RET_stmt_sidef;
+# let $my_value= $CRC_RET_value;
+# let $my_sel_sidef= $CRC_RET_sel_sidef;
+# let $my_sel_retval= $CRC_RET_sel_retval;
+# let $my_drop= $CRC_RET_drop;
+# let $my_is_toplevel= $CRC_RET_top_is_toplevel;
+# let $my_desc= $CRC_RET_desc;
+#
+# $CRC_ARG_* are used as input parameters (arguments) to this file:
+#
+#   $CRC_ARG_level is the recursion depth: 1 for the innermost
+#   statement created, 2 for a statement that invokes a statement on
+#   level 1, etc.
+#
+#   $CRC_ARG_type is an integer from 0 to 6, indicating what type of
+#   statement shall be created:
+#    0 - Create a stored function where the return value depends on
+#        the value of the given statement.
+#    1 - Create a stored function that invokes the given statement as
+#        a side-effect but may not return a value that depends on it.
+#    2 - Create a stored routine that invokes the given statement.
+#    3 - Create a trigger (on table trigger_table_$CRC_ARG_level) that
+#        invokes the given statement.
+#    4 - Create a view that returns a value that depends on the value
+#        of the given statement.
+#    5 - Create a view that invokes the given statement but may return
+#        a value that does not depend on it.
+#    6 - Create a prepared statement that invokes the given statement.
+#
+#   $CRC_ARG_stmt_sidef is the statement to invoke.  It should be a
+#   statement that can be invoked on its own (not sub-statement),
+#   which causes something unsafe to be written to the binlog.
+#
+#   $CRC_ARG_value is a sub-statement holding the value of the given
+#   statement.  Can be empty if the given statement does not have a
+#   value.  Typically, this is non-empty if the given statement is a
+#   function call or user variable, but not if it is a stored routine
+#   call, INSERT, SELECT, etc (because none of them has a value).
+#   $CRC_ARG_value is used only when $CRC_ARG_type=6.
+#
+#   $CRC_ARG_sel_sidef is a SELECT sub-statement that invokes the
+#   statement as a side-effect, but returns a result set that may not
+#   depend on the statement.  Can be empty if the statement cannot
+#   produce a result set from a SELECT.  $CRC_ARG_sel_sidef is used
+#   only if $CRC_ARG_type=2
+#
+#   $CRC_ARG_sel_retval is a SELECT sub-statement that does not have
+#   side-effects, but returns a result set that depends on the unsafe
+#   statement.  Can be empty if the statement cannot be invoked from a
+#   SELECT.  $CRC_ARG_sel_retval is used only if $CRC_ARG_type=3.
+#
+#   $CRC_ARG_desc is a human-readable description of the statement to
+#   invoke.
+#
+# $CRC_RET_* are used as output parameters (return values) of this
+# file:
+#
+#   $CRC_RET_stmt_sidef is a statement invoking the resulting recursive
+#   construct.
+#
+#   $CRC_RET_value is a sub-statement invoking the resulting recursive
+#   construct and returning the value of the recursive construct.
+#   This is the empty string if the resulting recursive construct does
+#   not have a value.  In particular, this is non-empty only if
+#   $CRC_ARG_value=7.
+#
+#   $CRC_RET_sel_sidef is a SELECT sub-statement that invokes the
+#   resulting recursive construct as a side-effect but where the
+#   result set may not depend on the recursive construct.  This is the
+#   empty string if the recursive construct cannot be invoked from a
+#   SELECT.  In particular, this is non-empty only if $CRC_ARG_value=6
+#   or $CRC_ARG_value=2.
+#
+#   $CRC_RET_sel_retval is a SELECT sub-statement that does not have
+#   side-effects, but returns a result set depending on the unsafe
+#   statement.  This is the empty string if the recursive construct
+#   cannot produce a result set from a SELECT.  In particular, this is
+#   non-empty only if $CRC_ARG_value=7 or $CRC_ARG_value=3.
+#
+#   $CRC_RET_drop is a statement that drops the created object.  I.e.,
+#   it is one of 'DROP FUNCTION <func>', 'DROP PROCEDURE <proc>', etc.
+#
+#   $CRC_RET_top_is_toplevel is 0 normally, or 1 if the resulting
+#   recursive construct can only be called from a top-level statement.
+#   In particular, this is 1 only when $CRC_ARG_value=1, because
+#   prepared statements cannot be invoked from other recursive
+#   constructs.
+#
+#   $CRC_RET_desc is a text string that describes the invokation of
+#   the recursive construct in a human-readable fashion.
+#
+# Assumptions
+#
+#   Before sourcing this file with $CRC_ARG_level=X, you need to
+#   create three tables: tX, taX and trigger_table_X.  These are used
+#   as auxiliary tables.
+
+
+#--echo debug: >>>>ENTER create_recursive_construct
+#--echo debug: level=$CRC_ARG_level
+#--echo debug: type=$CRC_ARG_type
+#--echo debug: stmt_sidef=$CRC_ARG_stmt_sidef
+#--echo debug: value=$CRC_ARG_value
+#--echo debug: sel_retval=$CRC_ARG_sel_retval
+#--echo debug: sel_sidef=$CRC_ARG_sel_sidef
+
+--let $CRC_RET_stmt_sidef=
+--let $CRC_RET_value=
+--let $CRC_RET_sel_retval=
+--let $CRC_RET_sel_sidef=
+--let $CRC_RET_drop=
+--let $CRC_RET_is_toplevel= 1
+--let $CRC_RET_desc=
+--let $CRC_name=
+--let $CRC_create=
+--let $CRC_expected_number_of_warnings= $CRC_ARG_expected_number_of_warnings
+--let $CRC_expected_number_of_warnings_normal_protocol= $CRC_ARG_expected_number_of_warnings
+--let $CRC_expected_number_of_warnings_ps_protocol= $CRC_ARG_expected_number_of_warnings
+--let $CRC_expected_number_of_warnings_after_reset= 0
+
+######## func_retval ########
+# if inside if in lieu of AND operand
+if ($CRC_ARG_type == 0) {
+ if ($CRC_ARG_value) {
+  # It will be safe to call this function and discard the return
+  # value, but it will be unsafe to use return value (e.g., in
+  # INSERT...SELECT).
+  --let $CRC_name= func_retval_$CRC_ARG_level
+  --let $CRC_create= CREATE FUNCTION $CRC_name() RETURNS VARCHAR(100) BEGIN INSERT INTO ta$CRC_ARG_level VALUES (47); RETURN $CRC_ARG_value; END
+  --let $CRC_RET_stmt_sidef= INSERT INTO t$CRC_ARG_level VALUES ($CRC_name())
+  --let $CRC_RET_value= $CRC_name()
+  --let $CRC_RET_sel_sidef=
+  --let $CRC_RET_sel_retval= SELECT $CRC_name()
+  --let $CRC_RET_drop= DROP FUNCTION $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= function $CRC_name returning value from $CRC_ARG_desc
+ }
+}
+
+######## func_sidef ########
+if ($CRC_ARG_type == 1) {
+  # It will be unsafe to call func even if you discard return value.
+  --let $CRC_name= func_sidef_$CRC_ARG_level
+  --let $CRC_create= CREATE FUNCTION $CRC_name() RETURNS VARCHAR(100) BEGIN INSERT INTO ta$CRC_ARG_level VALUES (47); $CRC_ARG_stmt_sidef; RETURN 0; END
+  --let $CRC_RET_stmt_sidef= INSERT INTO t$CRC_ARG_level SELECT $CRC_name()
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval=
+  --let $CRC_RET_sel_sidef= SELECT $CRC_name()
+  --let $CRC_RET_drop= DROP FUNCTION $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= function $CRC_name invoking $CRC_ARG_desc
+}
+
+######## proc ########
+if ($CRC_ARG_type == 2) {
+  # It will be unsafe to call this procedure.
+  --let $CRC_name= proc_$CRC_ARG_level
+  --let $CRC_create= CREATE PROCEDURE $CRC_name() BEGIN $CRC_ARG_stmt_sidef; INSERT INTO ta$CRC_ARG_level VALUES (47); END
+  --let $CRC_RET_stmt_sidef= CALL $CRC_name()
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval=
+  --let $CRC_RET_sel_sidef=
+  --let $CRC_RET_drop= DROP PROCEDURE $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= procedure $CRC_name invoking $CRC_ARG_desc
+}
+
+######## trig ########
+if ($CRC_ARG_type == 3) {
+  # It will be unsafe to invoke this trigger.
+  --let $CRC_name= trig_$CRC_ARG_level
+  --let $CRC_create= CREATE TRIGGER $CRC_name BEFORE INSERT ON trigger_table_$CRC_ARG_level FOR EACH ROW BEGIN INSERT INTO ta$CRC_ARG_level VALUES (47); $CRC_ARG_stmt_sidef; END
+  --let $CRC_RET_stmt_sidef= INSERT INTO trigger_table_$CRC_ARG_level VALUES (1)
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval=
+  --let $CRC_RET_sel_sidef=
+  --let $CRC_RET_drop= DROP TRIGGER $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= trigger $CRC_name invoking $CRC_ARG_desc
+}
+
+######## view_retval ########
+if ($CRC_ARG_type == 4) {
+ if ($CRC_ARG_sel_retval) {
+  # It will be safe to select from this view if you discard the result
+  # set, but unsafe to use result set (e.g., in INSERT..SELECT).
+  --let $CRC_name= view_retval_$CRC_ARG_level
+  --let $CRC_create= CREATE VIEW $CRC_name AS $CRC_ARG_sel_retval
+  --let $CRC_RET_stmt_sidef= INSERT INTO t$CRC_ARG_LEVEL SELECT * FROM $CRC_name
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval= SELECT * FROM $CRC_name
+  --let $CRC_RET_sel_sidef=
+  --let $CRC_RET_drop= DROP VIEW $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= view $CRC_name returning value from $CRC_ARG_desc
+ }
+}
+
+######## view_sidef ########
+if ($CRC_ARG_type == 5) {
+ if  ($CRC_ARG_sel_sidef) {
+  # It will be unsafe to select from this view, even if you discard
+  # the return value.
+  --let $CRC_name= view_sidef_$CRC_ARG_level
+  --let $CRC_create= CREATE VIEW $CRC_name AS $CRC_ARG_sel_sidef
+  --let $CRC_RET_stmt_sidef= INSERT INTO t$CRC_ARG_level SELECT * FROM $CRC_name
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval=
+  --let $CRC_RET_sel_sidef= SELECT * FROM $CRC_name
+  --let $CRC_RET_drop= DROP VIEW $CRC_name
+  --let $CRC_RET_is_toplevel= 0
+  --let $CRC_RET_desc= view $CRC_name invoking $CRC_ARG_desc
+ }
+}
+
+######## prep ########
+if ($CRC_ARG_type == 6) {
+  # It will be unsafe to execute this prepared statement
+  --let $CRC_name= prep_$CRC_ARG_level
+  --let $CRC_create= PREPARE $CRC_name FROM "$CRC_ARG_stmt_sidef"
+  --let $CRC_RET_stmt_sidef= EXECUTE $CRC_name
+  --let $CRC_RET_value=
+  --let $CRC_RET_sel_retval=
+  --let $CRC_RET_sel_sidef=
+  --let $CRC_RET_drop= DROP PREPARE $CRC_name
+  --let $CRC_RET_is_toplevel= 1
+  --let $CRC_RET_desc= prepared statement $CRC_name invoking $CRC_ARG_desc
+}
+
+######## no recursive construct: just return the given statement ########
+if ($CRC_ARG_type == 7) {
+  # CRC_ARG_type=7 is a special case. We just set $CRC_RET_x =
+  # $CRC_ARG_x.  This way, the $CRC_ARG_stmt gets executed directly
+  # (below).  In binlog_unsafe.test, it is used to invoke the unsafe
+  # statement created in the outermost loop directly, without
+  # enclosing it in a recursive construct.
+  --let $CRC_RET_stmt_sidef= $CRC_ARG_stmt_sidef
+  --let $CRC_RET_value= $CRC_ARG_value
+  --let $CRC_RET_sel_retval= $CRC_ARG_sel_retval
+  --let $CRC_RET_sel_sidef= $CRC_ARG_sel_sidef
+  --let $CRC_RET_drop=
+  --let $CRC_RET_is_toplevel= 1
+  --let $CRC_RET_desc= $CRC_ARG_desc
+  --let $CRC_expected_number_of_warnings_normal_protocol= `select $CRC_ARG_expected_number_of_deprecation_warnings + $CRC_ARG_expected_number_of_warnings`
+  --let $CRC_expected_number_of_warnings_ps_protocol= $CRC_ARG_expected_number_of_warnings
+  --let $CRC_expected_number_of_warnings_after_reset_normal_protocol= `select $CRC_ARG_expected_number_of_deprecation_warnings + $CRC_expected_number_of_warnings_after_reset`
+  --let $CRC_expected_number_of_warnings_after_reset_ps_protocol= $CRC_expected_number_of_warnings_after_reset
+
+  --let $CRC_expected_number_of_warnings= $CRC_expected_number_of_warnings_normal_protocol
+  --let $CRC_expected_number_of_warnings_after_reset= $CRC_expected_number_of_warnings_after_reset_normal_protocol
+  if ($PS_PROTOCOL)
+  {
+    --let $CRC_expected_number_of_warnings= $CRC_expected_number_of_warnings_ps_protocol
+    --let $CRC_expected_number_of_warnings_after_reset= $CRC_expected_number_of_warnings_after_reset_ps_protocol
+  }
+}
+
+######## execute! ########
+if ($CRC_RET_stmt_sidef) {
+  --echo
+  --echo Invoking $CRC_RET_desc.
+  if ($CRC_create) {
+    --eval $CRC_create
+  }
+
+  if ($CRC_expected_number_of_warnings_normal_protocol == $CRC_expected_number_of_warnings_ps_protocol)
+  {
+    --echo * binlog_format = STATEMENT: expect $CRC_expected_number_of_warnings warnings.
+  }
+  if ($CRC_expected_number_of_warnings_normal_protocol != $CRC_expected_number_of_warnings_ps_protocol)
+  {
+    --echo * binlog_format = STATEMENT: expect $CRC_expected_number_of_warnings_normal_protocol warnings. $CRC_expected_number_of_warnings_ps_protocol with ps-protocol.
+  }
+  --eval $CRC_RET_stmt_sidef
+  --let $n_warnings= `SHOW COUNT(*) WARNINGS`
+
+  --let $assert_cond= $n_warnings = $CRC_expected_number_of_warnings
+  --let $assert_text= There should be $CRC_expected_number_of_warnings warning(s)
+  --source include/assert.inc
+
+
+  # These queries are run without query log, to make result file more
+  # readable.  Debug info is only printed if something abnormal
+  # happens.
+  --disable_query_log
+
+  --echo * SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+  SET SQL_LOG_BIN = 0;
+  RESET MASTER;
+  --eval $CRC_RET_stmt_sidef
+
+  --let $n_warnings= `SHOW COUNT(*) WARNINGS`
+  --let $assert_cond= $n_warnings = $CRC_expected_number_of_warnings_after_reset
+  --let $assert_text= There should be $CRC_expected_number_of_warnings_after_reset warning(s)
+  --source include/assert.inc
+
+  --let $assert_text= Only two events should exist in the binary log
+  --let $assert_cond= "[SHOW BINLOG EVENTS, Event_type, 3]" = "No such row"
+  --source include/assert.inc
+  SET SQL_LOG_BIN = 1;
+
+  --echo * binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+  SET binlog_format = MIXED;
+  RESET MASTER;
+  --let $CRC_expected_number_of_warnings_after_reset = $CRC_expected_number_of_warnings
+  --error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
+  --eval $CRC_RET_stmt_sidef
+  --let $n_warnings= `SHOW COUNT(*) WARNINGS`
+  if ($n_warnings != $CRC_expected_number_of_warnings_after_reset) {
+    --echo ******** Failure! Expected $CRC_expected_number_of_warnings_after_reset warnings, got $n_warnings warnings. ********
+    --source include/show_rpl_debug_info.inc
+    --die Wrong number of warnings
+  }
+  SET binlog_format = STATEMENT;
+
+  --enable_query_log
+}
+
+# Invoke created object, discarding the return value. This should not
+# give any warning.
+if ($CRC_RET_sel_retval) {
+  --echo * Invoke statement so that return value is discarded: expect no warning.
+  --disable_result_log
+  --eval $CRC_RET_sel_retval
+  --enable_result_log
+
+  # Currently, due to a bug, we do get warnings here, so we don't
+  # fail.  When the bug is fixed, we should execute the following.
+
+  #--let $n_warnings= `SHOW COUNT(*) WARNINGS`
+  #if ($n_warnings) {
+  #  --enable_query_log
+  #  --echo Failure! Expected 0 warnings, got $n_warnings warnings.
+  #  SHOW WARNINGS;
+  #  SHOW BINLOG EVENTS;
+  #  --die Wrong number of warnings.
+  #}
+}
+
+#--echo debug: <<<<EXIT create_recursive_construct
+#--echo debug: stmt_sidef=$CRC_RET_stmt_sidef
+#--echo debug: value=$CRC_RET_value
+#--echo debug: sel_retval=$CRC_RET_sel_retval
+#--echo debug: sel_sidef=$CRC_RET_sel_sidef
+#--echo debug: drop=$CRC_RET_drop
+#--echo debug: is_toplevel=$CRC_RET_is_toplevel
+#--echo debug: desc=$CRC_RET_desc
diff --git a/mysql-test/extra/rpl_tests/gtid_disconnect_drop_temporary_table.test b/mysql-test/extra/rpl_tests/gtid_disconnect_drop_temporary_table.test
new file mode 100644
index 000000000000..efd7bfb71af0
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/gtid_disconnect_drop_temporary_table.test
@@ -0,0 +1,127 @@
+# ==== Purpose ====
+#
+# When a client disconnects, temporary tables created by the client
+# are dropped.  This test verifies that this works regardless of what
+# GTID_NEXT has been set to.
+#
+# The following are tested:
+#
+# - GTID_NEXT is set and no transaction started.
+# - GTID_NEXT is set and transaction started but not ended.
+# - GTID_NEXT is set and transaction committed.
+# - GTID_NEXT is set and transaction rolled back.
+#
+# The test is run both with gtid_mode=on and gtid_mode=off. If
+# gtid_mode=on, it sets gtid_next='UUID:NUMBER'. If gtid_mode=off, it
+# sets gtid_next='ANONYMOUS'.
+#
+# ==== Implementation ====
+#
+# The core of the logic is: Create a connection. Create a temporary
+# table on the connection. Set GTID_NEXT. Disconnect.
+#
+# The test does this four times, each time doing something different
+# between set gtid_next and disconnect.
+#
+# The test uses include/set_gtid_next_gtid_mode_agnostic.inc to set
+# gtid_next to 'UUID:NUMBER' if gtid_mode=on and 'ANONYMOUS' if
+# gtid_mode=off.
+
+--source include/not_group_replication_plugin.inc
+--let $rpl_gtid_utils= 1
+--source include/master-slave.inc
+
+--let $i= 1
+
+CREATE TABLE t (a INT);
+
+while ($i <= 4)
+{
+  if ($i == 1)
+  {
+    --echo ---- 1. Disconnect after SET GTID_NEXT ----
+  }
+  if ($i == 2)
+  {
+    --echo ---- 2. Disconnect in the middle of transaction ----
+  }
+  if ($i == 3)
+  {
+    --echo ---- 3. Disconnect after COMMIT ----
+  }
+  if ($i == 4)
+  {
+    --echo ---- 4. Disconnect after ROLLBACK ----
+  }
+
+  # Create con1.
+  --let $rpl_connection_name= con1
+  --let $rpl_server_number= 1
+  --source include/rpl_connect.inc
+
+  --let $rpl_connection_name= con1
+  --source include/rpl_connection.inc
+
+  # Create temp table.
+  CREATE TEMPORARY TABLE tt (a INT);
+
+  # Set gtid_next
+  --source include/set_gtid_next_gtid_mode_agnostic.inc
+
+  # Execute (partial) transaction
+  if ($i >= 2)
+  {
+    BEGIN;
+    INSERT INTO t VALUES (1);
+
+    if ($i == 3)
+    {
+      COMMIT;
+    }
+    if ($i == 4)
+    {
+      ROLLBACK;
+    }
+  }
+
+  --connection master
+  --source include/save_binlog_position.inc
+  --source include/gtid_step_reset.inc
+
+  # Disconnect
+  --echo # Disconnecting.
+  --disconnect con1
+
+  if (`SELECT @@GLOBAL.binlog_format != 'ROW'`)
+  {
+    # Verify that the binlog contains the expected events.
+    --let $event_sequence= (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)
+    --let $wait_for_binlog_events= 1
+    --source include/assert_binlog_events.inc
+  }
+
+  # Sync with slave and assert slave has dropped the temp table.
+  --source include/sync_slave_sql_with_master.inc
+  --let $assert_text= Slave should not have any open temporary tables.
+  --let $assert_cond= VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = "SLAVE_OPEN_TEMP_TABLES"
+  --source include/assert.inc
+
+  # Verify that one gtid was added if gtid_mode=on
+  --connection master
+  --let $gtid_step_gtid_mode_agnostic= 1
+  --let $gtid_step_count= 0
+  if (`SELECT @@GLOBAL.binlog_format != 'ROW'`)
+  {
+    --let $gtid_step_count= 1
+  }
+  --source include/gtid_step_assert.inc
+
+  --inc $i
+}
+
+--echo ---- Clean up ----
+
+DROP TABLE t;
+
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_end.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test b/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
index db3a40161f07..212ae835131f 100644
--- a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
+++ b/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
@@ -371,7 +371,54 @@ COMMIT;
 --let $diff_tables= master:t1,slave:t1
 --source include/diff_tables.inc
 
---echo ######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+--echo ####### 8 - LOAD DATA INFILE INTO TABLE #######
+
+#
+# This scenario verifies that load data infile fails when
+# binlog cache exceeds max_binlog_cache_size
+#
+--source include/rpl_connection_master.inc
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+
+# Save the current binary log position
+--let $pos_before= query_get_value(show master status,Position,1)
+
+--disable_query_log
+--let $write_var =`SELECT REPEAT('Testing\n', 1000)`
+--let $write_to_file = GENERATE
+--source include/write_var_to_file.inc
+--enable_query_log
+
+# Below transaction generates transaction cache more than
+# the max_binlog_cache_size i.e 4096. Hence results in error.
+--replace_result $write_to_file temp_file
+--error ER_TRANS_CACHE_FULL
+eval LOAD DATA INFILE '$write_to_file' INTO TABLE t6;
+
+--exec rm $write_to_file
+
+# Check that the above transaction has not been logged in the binary log
+--let $assert_text= assert that the above Event has not been added to binlog
+--let $assert_cond= [SHOW MASTER STATUS, Position,1] = $pos_before
+--source include/assert.inc
+
+# Check that the table is empty on master
+--let $assert_text = Check that the LOAD DATA didn't add any data into the table
+--let $assert_cond = [SELECT COUNT(*) FROM t6] = 0
+--source include/assert.inc
+
+--source include/sync_slave_sql_with_master.inc
+
+# Check that the table is empty on slave
+--let $assert_text = Check that the LOAD DATA didn't add any data into the table
+--let $assert_cond = [SELECT COUNT(*) FROM t6] = 0
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t6;
+--source include/sync_slave_sql_with_master.inc
+
+--echo ######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 --echo #########     max_binlog_cache_size crashes slave                ##########
 
 --echo # [ On Slave ]
diff --git a/mysql-test/extra/rpl_tests/rpl_db_stmts_ignored.inc b/mysql-test/extra/rpl_tests/rpl_db_stmts_ignored.inc
new file mode 100644
index 000000000000..1d98c44bcaf3
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_db_stmts_ignored.inc
@@ -0,0 +1,51 @@
+###############################################################################
+# This .inc file is to check that filtering rules on
+# CREATE DATABASE/ALTER DATABASE/DROP DATABASE statements
+# works properly.
+# NOTE: Filter rules should be set in such a way that 'db1'
+# is filtered out on Slave. Setting the filtering rule
+# should be done in the test that includes this .inc file.
+# For eg:
+#    --replicate-ignore-db=db1
+#    --source ../extra/rpl_tests/rpl_db_stmts_ignored.inc
+#  (OR)
+#    --replicate-do-db=db2
+#    --source ../extra/rpl_tests/rpl_db_stmts_ignored.inc
+#  (OR)
+#    --replicate-wild-ignore-table=db1.%
+#    --source ../extra/rpl_tests/rpl_db_stmts_ignored.inc
+###############################################################################
+--source include/rpl_connection_master.inc
+--echo #
+--echo # Execute 'CREATE DATABASE db1' on Master.
+--echo #
+CREATE DATABASE db1;
+
+--echo #
+--echo # Sync with Slave (using gtid values)
+--echo #
+--let $use_gtids=1
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # Check that even after sync is completed 'db1' does not exists
+--echo # on Slave which implies that 'CREATE DATABASE db1' is filtered
+--echo # out.
+--echo #
+--error ER_BAD_DB_ERROR
+USE db1;
+
+--echo #
+--echo # Execute other database commands (ALTER/DROP) on Master.
+--echo #
+--source include/rpl_connection_master.inc
+ALTER DATABASE db1 CHARACTER SET latin1;
+DROP DATABASE db1;
+
+--echo #
+--echo # Check that we are able to sync with slave successfully
+--echo # which implies that those commands are filtered out.
+--echo # If they were executed by Slave, that will break replication
+--echo # as we do not have 'db1' database on Slave.
+--let $use_gtids=1
+--source include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc b/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
new file mode 100644
index 000000000000..c7c3f4836568
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
@@ -0,0 +1,94 @@
+# ==== Purpose ====
+#
+# This include file simulates the scenario of missing relay logs.  This is
+# done by creating gaps in the execution of a Multi threaded slave, killing
+# the slave and removing the relay log that is required to fill the gaps.
+#
+# ==== Implementation ====
+#
+# Creates two databases d1, d2 and create tables d1.t, d2.t in each database.
+# Execute FLUSH LOGS on master so that relay logs are flushed till this point.
+#
+# On slave, copy the newly created relay log to a backup file. Begin a new
+# transaction and do a local insert on d2.t table such that any inserts on d2.t
+# table from master will be blocked. Make other worker to over take the blocked
+# worker and commit a transaction for example here T5 transaction. This will
+# generate gaps.
+#
+# Crash the slave server at this point and delete the relay log that has the
+# above insert operations and copy the backup relay log in its place. This
+# simulates missing relay log scenario.
+#
+# ==== Note ====
+#
+# 1. Source extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+#    in the end of test to perform cleanup of things created by this test.
+#
+# ==== References ====
+#
+# Bug#28830834: MTS NOT REPLICATION CRASH-SAFE WITH GTID AND ALL THE RIGHT PARAMETERS.
+#
+
+--echo # Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
+
+--source include/rpl_connection_slave.inc
+let $MYSQLD_DATADIR= `select @@datadir`;
+--source include/stop_slave.inc
+SET @@global.slave_parallel_workers=2;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+CREATE DATABASE d1;
+CREATE DATABASE d2;
+CREATE TABLE d1.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+CREATE TABLE d2.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+# To ensure one DML in relay log file after rotate events.
+FLUSH LOGS;
+INSERT INTO d1.t VALUES (1, 'T1');
+--source include/sync_slave_sql_with_master.inc
+
+# Create back up for newly created relay log
+--let $MYSQLD_DATADIR= `SELECT @@datadir`
+--let $relay_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
+--copy_file $MYSQLD_DATADIR/$relay_log_file $MYSQLD_DATADIR/relay.backup
+
+BEGIN;
+INSERT INTO d2.t VALUES (2, 'Slave local'); # Hold T3
+
+--source include/rpl_connection_master.inc
+INSERT INTO d2.t VALUES (1, 'T2');
+INSERT INTO d2.t VALUES (2, 'T3'); # This will be a gap when executed on slave
+INSERT INTO d2.t VALUES (3, 'T4'); # This will be a gap when executed on slave
+INSERT INTO d1.t VALUES (2, 'T5');
+
+--source include/rpl_connection_slave1.inc
+--let $table=d2.t
+--let $count=1
+--source include/wait_until_rows_count.inc
+
+--let $table=d1.t
+--let $count=2
+--source include/wait_until_rows_count.inc
+
+# Wait for coordinator to populate worker's queues.
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= = 'Slave has read all relay log; waiting for more updates'
+--source include/wait_show_condition.inc
+
+# Kill the slave server
+--let $rpl_server_number= 2
+--let $rpl_force_stop=1
+--source include/rpl_stop_server.inc
+
+# Wait until the relay log fle is removed
+--let active_relaylog= $MYSQLD_DATADIR/$relay_log_file
+perl;
+my $filetodelete = "$ENV{'active_relaylog'}";
+while (-e $filetodelete) {
+  unlink $filetodelete;
+  sleep 1;
+}
+EOF
+
+--copy_file $MYSQLD_DATADIR/relay.backup $MYSQLD_DATADIR/$relay_log_file
diff --git a/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc b/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
new file mode 100644
index 000000000000..f8282e06f2cd
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
@@ -0,0 +1,14 @@
+# ==== Purpose ====
+#
+# Clean up what
+# extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc created.
+#
+
+--echo # Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+
+--source include/rpl_connection_master.inc
+DROP DATABASE d1;
+DROP DATABASE d2;
+--source include/sync_slave_sql_with_master.inc
+--remove_file $MYSQLD_DATADIR/relay.backup
+--source include/rpl_reset.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test b/mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
index 5ffd4877fef1..b6a34d4afef8 100644
--- a/mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
+++ b/mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
@@ -89,12 +89,31 @@ DELETE FROM d1.t1 where a=1;
 DELETE FROM d2.t1 where a=2;
 DELETE FROM d3.t1 where a=3;
 
-# Restart the salve server
+# Restart the slave server
 --let $rpl_server_number= 2
 --let $rpl_start_with_gtids= 1
 --let $rpl_server_parameters= --skip_slave_start=FALSE --relay_log_info_repository=TABLE --master_info_repository=TABLE --sync_master_info=1 --relay-log-recovery=1
 --source include/rpl_restart_server.inc
 
+# During recovery, slave would have implicitly executed START SLAVE SQL_THREAD
+# UNTIL SQL_AFTER_MTS_GAPS and would have applied all gap transactions left
+# from the previous slave session. Assert that SQL thread is not running.
+if ($auto_position == 0)
+{
+  --let $slave_param= Slave_IO_Running
+  --let $slave_param_value= Yes
+  --let $slave_param_comparison= =
+  --source include/wait_for_slave_param.inc
+
+  --let $slave_param= Slave_SQL_Running
+  --let $slave_param_value= No
+  --let $slave_param_comparison= =
+  --source include/wait_for_slave_param.inc
+
+  # Start slave SQL thread
+  --source include/start_slave_sql.inc
+}
+
 --source include/rpl_connection_master.inc
 --source include/sync_slave_sql_with_master.inc
 
diff --git a/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test b/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test
index ba1395251007..7a35663186c9 100644
--- a/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test
+++ b/mysql-test/extra/rpl_tests/rpl_ignore_super_read_only.test
@@ -16,6 +16,8 @@
 # 11) Execute 'FLUSH BINARY LOGS' command (with GTID_MODE=ON will assert)
 # 12) Execute 'SET GLOBAL gtid_purged='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1''
 # command
+# 13) Restart Slave and verify that slave_master_info table is updated during
+#     shutdown.
 # 14) Check that replication works fine
 # 15) Restore GLOBAL super_read_only to 0
 #
@@ -27,7 +29,8 @@
 #               MANY RPL CMDS.
 # Bug#26414532: MYSQLRPLSYNC ERRORS OUT BECAUSE SLAVE IS USING --SUPER-READ-ONLY
 #               OPTION
-#
+# Bug#27675107: SUPER_READ_ONLY WITH MASTER_INFO_REPOSITORY=TABLE BREAKS
+#               REPLICATION ON RESTART
 
 if (!$autocommit_opt)
 {
@@ -40,9 +43,9 @@ INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
 
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
+--let $saved_value_super= `SELECT @@GLOBAL.super_read_only`
+--let $saved_value= `SELECT @@GLOBAL.read_only`
+--let $saved_autocommit= `SELECT @@GLOBAL.autocommit`
 SET GLOBAL super_read_only= 1;
 --eval SET AUTOCOMMIT= $autocommit_opt
 SHOW VARIABLES like '%autocommit%';
@@ -114,18 +117,40 @@ RESET MASTER;
 --replace_result $master_uuid MASTER_UUID
 --eval SET GLOBAL gtid_purged= '$master_uuid:1'
 
+--echo ####################################################################
+--echo # Test Case9: Server Restart
+--echo ####################################################################
+
+# Restart Slave and verify that slave_master_info table is updated during shutdown.
+--let $io_pos_before_restart = query_get_value("SHOW SLAVE STATUS", Read_Master_Log_Pos, 1)
+--let $rpl_server_number = 2
+--source include/rpl_restart_server.inc
+--let $io_pos_after_restart = query_get_value("SHOW SLAVE STATUS", Read_Master_Log_Pos, 1)
+
+# Assert that IO thread Read_Master_Log_Pos before and after restart are same.
+--let $assert_text= Read_Master_Log_Pos before and after restart are same.
+--let $assert_cond= $io_pos_before_restart = $io_pos_after_restart
+--source include/assert.inc
+
+# Restart slave threads
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
 
 --echo "Clean up"
 # Reset slave to clean state
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+--replace_result $saved_autocommit SAVED_AUTOCOMMIT
+--eval SET AUTOCOMMIT= $saved_autocommit
+--replace_result $saved_value_super SAVED_SUPER_READ_ONLY
+--eval SET GLOBAL super_read_only= $saved_value_super
+--replace_result $saved_value SAVED_READ_ONLY
+--eval SET GLOBAL read_only= $saved_value
 
 # Start fresh slave
 --source include/stop_slave.inc
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 2 ####
---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root';
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root'
 --source include/start_slave.inc
 
 --source include/rpl_connection_master.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc b/mysql-test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc
index dcec98cf48ba..a9d7c33335bd 100644
--- a/mysql-test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc
+++ b/mysql-test/extra/rpl_tests/rpl_multi_source_corrupt_repository.inc
@@ -126,6 +126,7 @@ if ($rpl_corrupt_channel_name)
 
 --echo ===== STOP SLAVE without 'FOR CHANNEL' clause.
 --let $rpl_channel_name=
+--let $slave_sql_errno= convert_error(ER_SLAVE_RLI_INIT_REPOSITORY)
 --source include/stop_slave.inc
 
 --echo === Assert that all channels IO and SQL threads are in OFF state ===
@@ -303,8 +304,25 @@ while ($i <= $number_of_channels)
   #############################################################################
 
   --echo ===== Executing SHOW SLAVE FOR CHANNEL on channel '$channel_name'.
+
   --let $status_items=Slave_IO_State,Slave_SQL_Running_State,Last_IO_Errno,Last_IO_Error,Last_SQL_Errno,Last_SQL_Error,Channel_Name
   --let $rpl_channel_name=$channel_name
+
+  if ($channel_name != $rpl_corrupt_channel_name)
+  {
+  --let $slave_timeout= 60
+
+  --let $slave_param= Slave_IO_State
+  --let $slave_param_value= Waiting for master to send event
+  --source include/wait_for_slave_param.inc
+
+  --let $slave_param= Slave_SQL_Running_State
+  --let $slave_param_value= Slave has read all relay log; waiting for more updates
+  --source include/wait_for_slave_param.inc
+
+  --let $status_items=Last_IO_Errno,Last_IO_Error,Last_SQL_Errno,Last_SQL_Error,Channel_Name
+  }
+
   --source include/show_slave_status.inc
 
   #############################################################################
diff --git a/mysql-test/extra/rpl_tests/rpl_perfschema_order_by.test b/mysql-test/extra/rpl_tests/rpl_perfschema_order_by.test
new file mode 100644
index 000000000000..9f3977e1e1f1
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_perfschema_order_by.test
@@ -0,0 +1,91 @@
+# The test file is invoked from rpl.rpl_perfschema_order_by.test
+#
+# === References ===
+# Bug #22958077: ORDER BY LAST_SEEN_TRANSACTION RESULTS IN EMPTY SET (OR DEBUG
+#                ASSERTION)
+
+--echo # 1) Create a database on server_1.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+CREATE DATABASE db1;
+
+--echo # 2) create database on server_3.
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+CREATE DATABASE db3;
+
+--echo # 3)  sync the slave (server_2) with both masters (server_1 and server_3).
+#sync the slave with server_1
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name= channel_1
+--let $sync_slave_connection= server_2
+--source include/sync_slave_sql_with_master.inc
+
+# sync the slave with server_3
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name= channel_3
+--let $sync_slave_connection=server_2
+--source include/sync_slave_sql_with_master.inc
+
+# Restart slave for channel_3 so that SELECT returns unsorted data.
+--let $rpl_channel_name= channel_3
+--source include/stop_slave.inc
+--source include/start_slave.inc
+
+--echo
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration;
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME;
+
+--echo
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status;
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;
+
+--echo
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status;
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status ORDER BY CHANNEL_NAME;
+
+--echo
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration;
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration ORDER BY CHANNEL_NAME;
+
+--let $is_mts= `SELECT @@global.slave_parallel_workers`
+if ($is_mts)
+{
+  --echo
+  SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_coordinator;
+  SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_coordinator ORDER BY CHANNEL_NAME;
+}
+
+--echo
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker;
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME;
+--echo
+
+# Cleanup
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+DROP DATABASE db1;
+
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+DROP DATABASE db3;
+
+#sync the slave with server_1
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name= channel_1
+--let $sync_slave_connection= server_2
+--source include/sync_slave_sql_with_master.inc
+
+# sync the slave with server_3
+--let $rpl_connection_name= server_3
+--source include/rpl_connection.inc
+
+--let $rpl_channel_name= channel_3
+--let $sync_slave_connection=server_2
+--source include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_row_idempotency.test b/mysql-test/extra/rpl_tests/rpl_row_idempotency.test
index 85b674c78503..2680562cde5c 100644
--- a/mysql-test/extra/rpl_tests/rpl_row_idempotency.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_idempotency.test
@@ -121,6 +121,7 @@ select * from ti1 order by b /* must be (2),(3) */;
 
 --echo *** slave must stop (Trying to delete a referenced foreing key)
 connection slave;
+--let $slave_sql_errno= convert_error(ER_ROW_IS_REFERENCED_2)
 source include/wait_for_slave_sql_to_stop.inc;
 
 let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1);
@@ -155,6 +156,7 @@ insert into ti2 set a=3, b=3 /* offending write event */;
 
 --echo *** slave must stop (Trying to insert an invalid foreign key)
 connection slave;
+--let $slave_sql_errno= convert_error(ER_NO_REFERENCED_ROW_2)
 source include/wait_for_slave_sql_to_stop.inc;
 
 let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1);
@@ -194,6 +196,7 @@ insert into ti1 set b=1 /* offending write event */;
 
 --echo *** slave must stop (Trying to insert a dupliacte key)
 connection slave;
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
 source include/wait_for_slave_sql_to_stop.inc;
 
 let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1);
@@ -229,6 +232,7 @@ DELETE FROM t1 WHERE a = -2;
 
 --echo *** slave must stop (Key was not found)
 connection slave;
+--let $slave_sql_errno= convert_error(ER_KEY_NOT_FOUND)
 source include/wait_for_slave_sql_to_stop.inc;
 
 let $last_error = query_get_value("SHOW SLAVE STATUS", Last_SQL_Errno, 1);
diff --git a/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_logical_clock.test b/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_logical_clock.test
new file mode 100644
index 000000000000..d9decabd13e3
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_logical_clock.test
@@ -0,0 +1,336 @@
+# ==== Purpose ====
+#
+# Verify that Seconds_Behind_Master is calculated correctly on a
+# Multi-threaded Slave when slave_parallel_type = 'LOGICAL_CLOCK'.
+# The test covers these scenarios:
+#
+# 1) With two workers, check if Seconds_Behind_Master is calculated
+# correctly when two statements are applied in parallel on one database
+# and both the workers are blocked to to lock.
+#
+# 2) With two workers, check if Seconds_Behind_Master is calculated
+# correctly when the first worker is blocked.
+#
+# 3) With three workers, check if Seconds_Behind_Master is calculated
+# correctly when two workers working on table from the same database and
+# 3rd worker working on another database.
+
+--source include/start_slave.inc
+
+###############################################################################
+# Scenario 1: On slave, two statements are applied in parallel on one database.
+# Both workers are blocked.
+###############################################################################
+--echo # Scenario 1: With two workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when two statements are applied in parallel on
+--echo # one database and both the workers are blocked to to lock.
+connect (master2, localhost, root, , );
+
+connection slave;
+
+connection master;
+USE test;
+CREATE TABLE t1 (a int);
+CREATE TABLE t2 (a int);
+
+# We need one statement to be commited so that the parallel
+# statements have a common parent commit
+INSERT INTO t1 SET a=1;
+--source include/sync_slave_sql_with_master.inc
+
+connection slave1;
+LOCK TABLE test.t1 WRITE, test.t2 WRITE;
+
+--connection master1
+let $start= `SELECT UNIX_TIMESTAMP()`;
+BEGIN;
+INSERT INTO t1 SET a=2;
+
+--connection master2
+BEGIN;
+INSERT INTO t2 SET a=4;
+
+--connection master1
+COMMIT;
+--connection master2
+COMMIT;
+
+connection master;
+--source include/sync_slave_io_with_master.inc
+
+# Wait until all workers are blocked by locks. It implies that all
+# transactions are registered into the order commit queue.
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+
+# Sleep on slave so we were at least 3 seconds behind the master
+--real_sleep 3
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 3 and upper_bound;
+let $assert_cond= 3 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+# Unlock tables and allow both workers to complete
+connection slave1;
+UNLOCK TABLES;
+
+connection master;
+--source include/sync_slave_sql_with_master.inc
+
+let $wait_condition= SELECT count(*) = 3 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Now both workers have completed. Thus Seconds_Behind_Master shoud be equal to 0.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+###############################################################################
+# Scenario 2: Now only the first worker is blocked. Make sure there is a parent
+# commit
+###############################################################################
+--echo # Scenario 2: With two workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when the first worker is blocked.
+
+connection master;
+INSERT INTO t1 SET a=1;
+--source include/sync_slave_sql_with_master.inc
+
+connection slave1;
+LOCK TABLE test.t1 WRITE;
+
+connection slave2;
+LOCK TABLE test.t2 WRITE;
+
+--connection master1
+let $start= `SELECT UNIX_TIMESTAMP()`;
+
+BEGIN;
+INSERT INTO t1 SET a=2;
+
+--connection master2
+BEGIN;
+INSERT INTO t2 SET a=3;
+
+--connection master1
+COMMIT;
+--connection master2
+COMMIT;
+
+connection master;
+--source include/sync_slave_io_with_master.inc
+
+# Wait until both workers are queued and blocked.
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+
+# Now release one worker
+connection slave1;
+UNLOCK TABLES;
+
+# Wait until released worker completes its taks
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+
+# Sleep for 2 seconds so Seconds_Behind_Master was at least 2
+--real_sleep 2
+
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 2 and upper_bound;
+let $assert_cond= 2 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave2;
+UNLOCK TABLES;
+
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+# All workers should be done by now.
+let $wait_condition= SELECT count(*) = 3 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+###############################################################################
+# Scenario 3: Now there are 3 workers working in pararell. Two workers working
+# on table from the same database and a 3rd worker working on another database
+###############################################################################
+--echo # Scenario 3: With three workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when two workers working on table from the same
+--echo # database and 3rd worker working on another database.
+
+connection master;
+CREATE DATABASE second_test;
+CREATE TABLE second_test.t3 (f1 INT);
+
+# Make sure there is a parent commit
+INSERT INTO test.t1 SET a=1;
+--sync_slave_with_master
+
+# Lock all tables to block all workers.
+connection slave1;
+LOCK TABLE test.t1 WRITE;
+
+connection slave2;
+LOCK TABLE test.t2 WRITE;
+
+connection slave3;
+LOCK TABLE second_test.t3 WRITE;
+
+connect (master_second_test, localhost, root, , );
+
+--connection master_second_test
+BEGIN;
+INSERT INTO second_test.t3 VALUES (1);
+
+--connection master1
+let $start= `SELECT UNIX_TIMESTAMP()`;
+BEGIN;
+INSERT INTO test.t1 SET a=2;
+
+--connection master2
+BEGIN;
+INSERT INTO test.t2 SET a=3;
+
+--connection master_second_test
+COMMIT;
+--connection master1
+COMMIT;
+--connection master2
+COMMIT;
+
+--source include/sync_slave_io_with_master.inc
+
+# Wait for all workers to be queued
+# There should be two workers waiting for locks on test database
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock'
+                                                                             AND Info LIKE 'INSERT INTO test%';
+--source include/wait_condition.inc
+
+# And one worker waiting for the lock on second_database
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock'
+                                                                             AND Info LIKE 'INSERT INTO second_test%';
+--source include/wait_condition.inc
+
+# Make sure that there are 3 overall at the same point in time
+let $wait_condition= SELECT count(*) = 3 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+
+# Wait for 2 seconds so Second_Behind_Master is at least 2
+--real_sleep 2
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 2 and upper_bound;
+let $assert_cond= 2 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+# Lets finish concurrent write on second_test and check if workers on test report
+# correct Seconds_Behind_Master
+connection slave3;
+UNLOCK TABLES;
+
+--real_sleep 1
+
+connection slave;
+# Wait till worker on second_test db finishes
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock'
+                                                                             AND Info LIKE 'INSERT INTO second_test%';
+--source include/wait_condition.inc
+
+# There should be the remaining two workers hanging on test db
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock'
+                                                                             AND Info LIKE 'INSERT INTO test%';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 3 and upper_bound;
+let $assert_cond= 3 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+# Lets finish worker writing to t1
+connection slave1;
+UNLOCK TABLES;
+
+# There should be only one worker left
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+
+--real_sleep 1
+
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 4 and upper_bound;
+let $assert_cond= 4 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+# Release last worker
+connection slave2;
+UNLOCK TABLE;
+
+# Wait for all workers to be done
+let $wait_condition= SELECT count(*) = 3 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+
+# All catched up Seconds_Behind_Master should be 0. Lets wait some more to see if it does not increase
+# Seconds_Behind_Master
+
+--real_sleep 1
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+#
+# Cleanup
+#
+connection master;
+DROP TABLE test.t1;
+DROP TABLE test.t2;
+DROP DATABASE second_test;
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_type_database.test b/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_type_database.test
new file mode 100644
index 000000000000..8cdb35fa3eb1
--- /dev/null
+++ b/mysql-test/extra/rpl_tests/rpl_seconds_behind_master_mts_type_database.test
@@ -0,0 +1,268 @@
+# ==== Purpose ====
+#
+# Verify that Seconds_Behind_Master is calculated correctly on a
+# Multi-threaded Slave when slave_parallel_type = 'DATABASE'.
+# The test covers these scenarios:
+#
+# 1) With two workers, check if Seconds_Behind_Master is calculated correctly
+# when all the workers are waiting.
+#
+# 2) With two workers, check if Seconds_Behind_Master is calculated correctly
+# when first worker compeletes first.
+#
+# 3) With three workers, check if Seconds_Behind_Master is calculated correctly
+# when second worker completes first.
+
+--source include/start_slave.inc
+
+###############################################################################
+# Scenario 1: Slave executes insert to t1 and is blocked due to lock on t1,
+# after 3s another worker on slave starts to execute insert to t2, this worker
+# is also blocked due to lock on t2. After 2 more seconds we check
+# Seconds_Behind_Master. Since 1st worker is still executing insert to t1,
+# this means that slave is at least 5s behind master.
+###############################################################################
+--echo # Scenario 1: With two workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when all the workers are waiting.
+connect (slave2, 127.0.0.1, root, , test, $SLAVE_MYPORT, );
+
+connection master;
+CREATE TABLE t1 (f1 INT);
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE t2 (f1 INT);
+--source include/sync_slave_sql_with_master.inc
+
+connection slave1;
+LOCK TABLE test.t1 WRITE;
+
+connection slave2;
+LOCK TABLE test2.t2 WRITE;
+
+connection master;
+USE test;
+let $start= `SELECT UNIX_TIMESTAMP()`;
+INSERT INTO t1 VALUES (1);
+
+--real_sleep 3
+
+USE test2;
+let $start2= `SELECT UNIX_TIMESTAMP()`;
+INSERT INTO t2 VALUES (1);
+--real_sleep 2
+
+# Wait till all events are written to relay-log
+--source include/sync_slave_io_with_master.inc
+
+# Check that two workers are waiting for metadata lock
+# and no worker is executing the event.
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Calculate the upper bound for Seconds_Behind_Master.
+# $upper_bound = "timestamp on slave after reading Seconds_Behind_Master" -
+#                "timestamp on master before the insert statement".
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 5 and upper_bound;
+let $assert_cond= 5 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave1;
+UNLOCK TABLES;
+
+# Check that one worker is still running (waiting)
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Since we have unlocked test.t1, now the first worker which was 5s behind
+# the master has completed its task. However the second worker is still
+# waiting for lock. This means that Seconds_Behind_Master should now be 2s
+# or slightly more.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start2`;
+let $assert_text= Seconds_Behind_Master must be between 2 and upper_bound;
+let $assert_cond= 2 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave2;
+UNLOCK TABLES;
+
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+let $wait_condition= SELECT count(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Now both the workers have completed their tasks and no new tasks have arrived, thus
+# Seconds_Behind_Master should be equal to 0.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+###############################################################################
+# Scenario 2: In this scenario we check if Seconds_Behind_Master is updated
+# correctly when first worker compeletes its tasks first.
+###############################################################################
+--echo # Scenario 2: With two workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when first worker compeletes first.
+
+connection slave2;
+LOCK TABLE test2.t2 WRITE;
+
+connection master;
+USE test;
+let $start= `SELECT UNIX_TIMESTAMP()`;
+INSERT INTO t1 VALUES (1);
+
+--real_sleep 3
+
+USE test2;
+let $start2= `SELECT UNIX_TIMESTAMP()`;
+INSERT INTO t2 VALUES (1);
+--real_sleep 2
+
+# Wait till all events are written to relay-log
+--source include/sync_slave_io_with_master.inc
+
+# Check that one worker is still running
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# First worker has completed its task, second worker is still executing.
+# This means that Seconds_Behind_Master should now be 2s or slightly more.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start2`;
+let $assert_text= Seconds_Behind_Master must be between 2 and upper_bound;
+let $assert_cond= 2 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave2;
+UNLOCK TABLES;
+
+# Check that all the workers are free.
+let $wait_condition= SELECT count(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+###############################################################################
+# Scenario 3: Three workers are running. In this scenario we check if correct
+# Seconds_Behind_Master is calculated when second worker completes first.
+###############################################################################
+--echo # Scenario 3: With three workers, check if Seconds_Behind_Master is
+--echo # calculated correctly when second worker completes first.
+--connection master
+
+CREATE DATABASE test3;
+USE test3;
+CREATE TABLE t3 (f1 INT);
+--source include/sync_slave_sql_with_master.inc
+
+connect (slave3, 127.0.0.1, root, , test, $SLAVE_MYPORT, );
+
+connection slave1;
+LOCK TABLE test.t1 WRITE;
+
+connection slave3;
+LOCK TABLE test3.t3 WRITE;
+
+connection master;
+let $start= `SELECT UNIX_TIMESTAMP()`;
+
+USE test;
+INSERT INTO t1 VALUES (1);
+--real_sleep 3
+
+use test2;
+INSERT INTO t2 VALUES (1);
+--real_sleep 2
+
+USE test3;
+let $start3= `SELECT UNIX_TIMESTAMP()`;
+INSERT INTO t3 VALUES (1);
+--real_sleep 2
+
+--source include/sync_slave_io_with_master.inc
+
+# Check that two workers are still running
+let $wait_condition= SELECT count(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Only second worker has completed. This means that longest running worker is
+# the first one, thus slave should be at least 7s behind the master.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start`;
+let $assert_text= Seconds_Behind_Master must be between 7 and upper_bound;
+let $assert_cond= 7 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave1;
+UNLOCK TABLES;
+
+# Check that last worker is still running
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for table metadata lock';
+--source include/wait_condition.inc
+let $wait_condition= SELECT count(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Executing event'
+                                                                             OR State = 'update';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+# Only third worker is running. This means that slave should be at least 2s
+# behind the master.
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $stop= `SELECT UNIX_TIMESTAMP()`;
+let $upper_bound= `SELECT $stop - $start3`;
+let $assert_text= Seconds_Behind_Master must be between 2 and upper_bound;
+let $assert_cond= 2 <= $sbm AND $sbm <= $upper_bound;
+--source include/assert.inc
+
+connection slave3;
+UNLOCK TABLES;
+
+# Now all four workers have completed. Seconds_Behind_Master should be 0.
+let $wait_condition= SELECT count(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'Waiting for an event from Coordinator';
+--source include/wait_condition.inc
+--source include/wait_for_mts_checkpoint.inc
+
+let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1);
+let $assert_text= Seconds_Behind_Master must be 0;
+let $assert_cond= $sbm = 0;
+--source include/assert.inc
+
+#
+# Cleanup
+#
+connection master;
+DROP TABLE test.t1;
+DROP DATABASE test2;
+DROP DATABASE test3;
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test b/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
index a0a5e81794e5..c3db91943e4a 100644
--- a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
+++ b/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
@@ -206,6 +206,7 @@ START SLAVE;
 --let $status_items= Last_IO_Errno, Last_IO_Error
 --source include/show_slave_status.inc
 
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
 --source include/stop_slave.inc
 RESET SLAVE;
 
diff --git a/mysql-test/include/allowed_ciphers.inc b/mysql-test/include/allowed_ciphers.inc
new file mode 100644
index 000000000000..a41c22d9075e
--- /dev/null
+++ b/mysql-test/include/allowed_ciphers.inc
@@ -0,0 +1,10 @@
+
+# List of allowed ciphers which will be
+# replaced with "SSL_CIPHER" in the result files.
+# DHE-XXX ciphers are for OpenSSL 1.0.X while
+# ECDHE-XXX for OpenSSL 1.1.X
+# Usage: --replace_regex $ALLOWED_CIPHERS_REGEX
+#
+
+LET $ALLOWED_CIPHERS_REGEX =
+/DHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-AES128-GCM-SHA256|DHE-RSA-AES256-SHA|ECDHE-RSA-AES256-SHA|DHE-RSA-AES256-GCM-SHA384|ECDHE-RSA-AES256-GCM-SHA384/SSL_CIPHER/;
diff --git a/mysql-test/include/assert_grep.inc b/mysql-test/include/assert_grep.inc
index a980a6d73b18..943b6f917c32 100644
--- a/mysql-test/include/assert_grep.inc
+++ b/mysql-test/include/assert_grep.inc
@@ -94,6 +94,10 @@ if ($assert_match != '')
   my $assert_only_after= $ENV{'_AG_ASSERT_ONLY_AFTER'};
   my $out= $ENV{'_AG_OUT'};
 
+  if (!defined($assert_count)) {
+    $assert_count = '';
+  }
+
   my $result= '';
   my $count= 0;
   open(FILE, "$file") or die("Error $? opening $file: $!\n");
diff --git a/mysql-test/include/assert_logical_timestamps.inc b/mysql-test/include/assert_logical_timestamps.inc
index b65e8e1574fb..43513e29b8d1 100644
--- a/mysql-test/include/assert_logical_timestamps.inc
+++ b/mysql-test/include/assert_logical_timestamps.inc
@@ -8,6 +8,8 @@
 # --let $binlog_file= FILENAME
 # [--let $binlog_position= OFFSET]
 # --let $logical_timestamps= LC1 SN1[;LC2 SN2[;LC3 SN3...]]
+# [--let $save_binlog_position= 1]
+# [--let $dont_print_logical_timestamps= 1]
 # --source include/assert_logical_timestamps.inc
 #
 # Parameters:
@@ -26,9 +28,23 @@
 #     integer.  Note that this is whitespace-sensitive so there should
 #     not be any other space characters than those separating
 #     last_committed from sequence_number.
-
+#
+#   $save_binlog_position
+#     If this flag is set, the script will source
+#     include/save_binlog_position.inc after it has finished the
+#     assert, making the next invocation automatically continue where
+#     this invocation ended.  This is convenient if the script is to
+#     be called multiple times in a sequence.
+#
+#   $dont_print_logical_timestamps
+#     By default, $logical_timestamps is printed to the result log. If
+#     this flag is set, that is suppressed.
 
 --let $include_filename= include/assert_logical_timestamps.inc [$logical_timestamps]
+if ($dont_print_logical_timestamps)
+{
+  --let $include_filename= include/assert_logical_timestamps.inc
+}
 --source include/begin_include_file.inc
 
 
@@ -53,5 +69,11 @@ if ($binlog_position)
 --remove_file $assert_file
 
 
+if ($save_binlog_position)
+{
+  --source include/save_binlog_position.inc
+}
+
+
 --let $include_filename= include/assert_logical_timestamps.inc [$logical_timestamps]
 --source include/end_include_file.inc
diff --git a/mysql-test/include/bug13581713.inc b/mysql-test/include/bug13581713.inc
index 023b916c34ab..4007feef5c94 100644
--- a/mysql-test/include/bug13581713.inc
+++ b/mysql-test/include/bug13581713.inc
@@ -1,5 +1,3 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-
 --source include/turn_off_only_full_group_by.inc
 
 insert into t1 values(100,1,2),(200,1,1),(300,2,1),(400,2,2);
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index 9a203c1f5a0a..f357aa48fc2d 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 
 # ==== Purpose ====
diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test
index ef6e637b9e57..868328e59891 100644
--- a/mysql-test/include/check-warnings.test
+++ b/mysql-test/include/check-warnings.test
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This test is executed once after each test to check the servers
 # for unexpected warnings found in the servers error log
diff --git a/mysql-test/include/check_ftwrl_incompatible.inc b/mysql-test/include/check_ftwrl_incompatible.inc
index 4787a69ea9c1..55745866dfe2 100644
--- a/mysql-test/include/check_ftwrl_incompatible.inc
+++ b/mysql-test/include/check_ftwrl_incompatible.inc
@@ -6,6 +6,8 @@
 #   $con_aux1      Name of the 1st aux connection to be used by this script.
 #   $con_aux2      Name of the 2nd aux connection to be used by this script.
 #   $statement     The statement to be checked.
+#   $waitfor       Wait for this statement in process-list. If empty,
+#                  use $statement. Reset at end of include.
 #   $cleanup_stmt1 The 1st statement to be run in order to revert effects
 #                  of statement to be checked.
 #   $cleanup_stmt2 The 2nd statement to be run in order to revert effects
@@ -66,14 +68,26 @@ connection $con_aux1;
 
 --enable_result_log
 --enable_query_log
+if (!$waitfor)
+{
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where (state = "Waiting for global read lock" or
+         state = "Waiting for commit lock") and
+         info = "$statement";
+}
+if ($waitfor)
+{
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
   where (state = "Waiting for global read lock" or
          state = "Waiting for commit lock") and
-        info = "$statement";
+         info = "$waitfor";
+}
 --source include/wait_condition.inc
 --disable_result_log
 --disable_query_log
+let $waitfor=;
 
 if ($success)
 {
diff --git a/mysql-test/include/check_openssl_version.inc b/mysql-test/include/check_openssl_version.inc
new file mode 100644
index 000000000000..0e4bafaf495c
--- /dev/null
+++ b/mysql-test/include/check_openssl_version.inc
@@ -0,0 +1,55 @@
+--disable_query_log
+--disable_result_log
+
+let OPENSSL_VERSION_INFO= $MYSQLTEST_VARDIR/log/openssl_version_info.txt;
+let OPENSSL_CONFIG_INC= $MYSQLTEST_VARDIR/log/openssl_binary_config.inc;
+
+--error 0,1
+--remove_file $OPENSSL_VERSION_INFO
+--error 0,1
+--remove_file $OPENSSL_CONFIG_INC
+
+--error 0,1, 127
+--exec openssl version > $OPENSSL_VERSION_INFO
+
+perl;
+ use strict;
+ my $search_file= $ENV{'OPENSSL_VERSION_INFO'};
+ my $search_pattern_1= "0.9.*";
+ my $search_pattern_2= "1.0.0.*";
+ my $search_pattern_3= "1.0.1.*";
+ my $content= "";
+ my $dir= $ENV{'MYSQLTEST_VARDIR'};
+ open(CONFIG_INC, ">$dir/log/openssl_binary_config.inc");
+ open(FILE, "$search_file") or die("Unable to open '$search_file' : $!\n");
+ read(FILE, $content, 100, 0);
+ close(FILE);
+
+ if ( ($content =~ m{$search_pattern_1}) || ($content =~ m{$search_pattern_2}) ||
+      ($content =~ m{$search_pattern_3}) ) {
+    print CONFIG_INC "let \$STATUS_VAR = 1;\n";
+ }
+ else {
+    print CONFIG_INC "let \$STATUS_VAR = 0;\n";
+ }
+ close(CONFIG_INC);
+EOF
+
+--source $OPENSSL_CONFIG_INC
+
+if ($STATUS_VAR)
+{
+ --error 0,1
+ --remove_file $OPENSSL_VERSION_INFO
+ --error 0,1
+ --remove_file $OPENSSL_CONFIG_INC
+ --skip Test requires openssl version to be 1.0.2+
+}
+
+--error 0,1
+--remove_file $OPENSSL_VERSION_INFO
+--error 0,1
+--remove_file $OPENSSL_CONFIG_INC
+
+--enable_query_log
+--enable_result_log
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index aa74912896e9..35b4b41ff6b5 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -38,17 +38,6 @@ loose-performance-schema-accounts-size=100
 loose-performance-schema-digests-size=200
 loose-performance-schema-hosts-size=100
 loose-performance-schema-users-size=100
-loose-performance-schema-max-mutex-instances=5000
-loose-performance-schema-max-rwlock-instances=5000
-loose-performance-schema-max-cond-instances=1000
-loose-performance-schema-max-file-instances=10000
-loose-performance-schema-max-socket-instances=1000
-loose-performance-schema-max-table-instances=500
-loose-performance-schema-max-table-lock-stat=500
-loose-performance-schema-max-index-stat=5000
-loose-performance-schema-max-table-handles=1000
-loose-performance-schema-max-prepared-statements-instances=100
-loose-performance-schema-max-program-instances=5000
 loose-performance-schema-setup-actors-size=100
 loose-performance-schema-setup-objects-size=100
 
@@ -60,9 +49,7 @@ loose-performance-schema-events-statements-history-size=10
 loose-performance-schema-events-statements-history-long-size=1000
 loose-performance-schema-events-transactions-history-size=10
 loose-performance-schema-events-transactions-history-long-size=1000
-loose-performance-schema-max-thread-instances=200
 loose-performance-schema-session-connect-attrs-size=2048
-loose-performance-schema-max-metadata-locks=10000
 
 # Enable everything, for maximun code exposure during testing
 
diff --git a/mysql-test/include/diff_tables.inc b/mysql-test/include/diff_tables.inc
index 049317b9d29c..563c359d8242 100644
--- a/mysql-test/include/diff_tables.inc
+++ b/mysql-test/include/diff_tables.inc
@@ -10,6 +10,7 @@
 # --let $diff_tables= [con1:][db1.]t1, [con2:][db2.]t2, ... , [conN:][dbN.]tN
 # [--let $rpl_debug= 1]
 # [--let $diff_tables_silent= 1]
+# [--let $mask_column_list= c1, .. cn]
 # --source include/diff_tables.inc
 #
 # Parameters:
@@ -85,6 +86,13 @@ if (`SELECT LOCATE(',', '$diff_tables') = 0`)
 
 # Trim off whitespace
 --let $_dt_tables= `SELECT REPLACE('$diff_tables', ' ', '')`
+--let $mask_column_list= `SELECT REPLACE('$mask_column_list', ' ', '')`
+
+# Add quotes to column names which will be masked.
+--let $mask_column_list= `SELECT REPLACE('$mask_column_list', ',', '","')`
+if ($mask_column_list) {
+  --let $mask_column_clause= AND column_name NOT IN ("$mask_column_list")
+}
 
 # Iterate over all tables
 --let $_dt_outfile=
@@ -137,7 +145,9 @@ while ($_dt_tables)
   # Compute length of ORDER BY clause.
   let $_dt_order_by_length=
     `SELECT SUM(LENGTH(column_name) + 3) FROM information_schema.columns
-            WHERE table_schema = '$_dt_database' AND table_name = '$_dt_table'`;
+            WHERE table_schema = '$_dt_database' AND
+                  table_name = '$_dt_table'
+                  $mask_column_clause`;
   if (!$_dt_order_by_length)
   {
     --echo ERROR IN TEST: table $_dt_database.$_dt_table not found in INFORMATION_SCHEMA.COLUMNS. Did you misspell it?
@@ -160,7 +170,9 @@ while ($_dt_tables)
   let $_dt_column_list=
     `SELECT GROUP_CONCAT(column_name ORDER BY ORDINAL_POSITION SEPARATOR '`,`')
             FROM information_schema.columns
-            WHERE table_schema = '$_dt_database' AND table_name = '$_dt_table'`;
+            WHERE table_schema = '$_dt_database' AND
+                  table_name = '$_dt_table'
+                  $mask_column_clause`;
   # Restore group_concat_max_len.
   if ($_dt_old_group_concat_max_len)
   {
@@ -175,7 +187,21 @@ while ($_dt_tables)
   # the table to a file.
   --let $_dt_outfile= `SELECT @@datadir`
   --let $_dt_outfile= $_dt_outfile/diff_table-$_dt_connection-$_dt_database-$_dt_table
-  eval SELECT * FROM $_dt_database.$_dt_table ORDER BY `$_dt_column_list` INTO OUTFILE '$_dt_outfile';
+
+  # Certain columns which contain current timestamps can be masked out.
+  # $mask_column_list can be set in the test. If it is not defined,
+  # all the columns can be written to the file.
+  if ($mask_column_list) {
+    --let $statement = SELECT `$_dt_column_list` FROM $_dt_database.$_dt_table ORDER BY `$_dt_column_list` INTO OUTFILE '$_dt_outfile';
+  }
+  if (!$mask_column_list) {
+    --let $statement = SELECT * FROM $_dt_database.$_dt_table ORDER BY `$_dt_column_list` INTO OUTFILE '$_dt_outfile';
+  }
+  if ($rpl_debug)
+  {
+    --echo $statement
+  }
+  --eval $statement
 
   # Compare files.
   if ($_dt_prev_outfile)
diff --git a/mysql-test/include/disconnect_connections.inc b/mysql-test/include/disconnect_connections.inc
new file mode 100644
index 000000000000..47225a4916f2
--- /dev/null
+++ b/mysql-test/include/disconnect_connections.inc
@@ -0,0 +1,14 @@
+#
+# SUMMARY
+#    Ensure all the connections are disconnected including default connection.
+#
+# USAGE
+#     This is needed to complete a plugin uninstall
+#
+# EXAMPLE
+#    audit_log_bugs.test, query_cache.test
+#
+--source include/count_sessions.inc
+disconnect default;
+connect(default, localhost, root,,);
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/include/escape_sql.inc b/mysql-test/include/escape_sql.inc
new file mode 100644
index 000000000000..e827ea5a766a
--- /dev/null
+++ b/mysql-test/include/escape_sql.inc
@@ -0,0 +1,60 @@
+# ==== Purpose ====
+#
+# Escape occurences of " or ' in a string, in order to be used inside
+# an SQL statement.
+#
+# ==== Usage ====
+#
+# --let $escape_string= String
+# [--let $enclosing_char= "|' (default is ")]
+# --source include/escape_sql.inc
+# --echo $escape_string
+#
+# Parameters:
+#   $escape_string
+#     String to search for occurences of the $enclosing_char and
+#     escape them according to SQL syntax. It is also the output
+#     parameter.
+
+#   $enclosing_char
+#     The character that will be used to enclose $escape_string when
+#     included in an SQL statement.
+#
+
+if (!$escape_string)
+{
+  --die Error: set $escape_string before sourcing escape_sql.inc
+}
+
+if ($escape_string != '')
+{
+  --let $_enclosing_char= "
+  if ($enclosing_char)
+  {
+    --let $_enclosing_char= $enclosing_char
+  }
+
+
+  --let $_output_filename= `SELECT UUID()`
+  --let $_output_filename= $MYSQLTEST_VARDIR/tmp/$_output_filename
+  --let full_output_filename= $_output_filename
+  --let to_replace= $escape_string
+  --let used_quote= $_enclosing_char
+
+  perl;
+    my $out= $ENV{'full_output_filename'};
+    my $to_replace= $ENV{'to_replace'};
+    my $quote= $ENV{'used_quote'};
+
+    $to_replace =~ s/$quote/$quote$quote/g;
+
+    open(FILE, ">", $out) or die "Error $? opening $output_filename: $!";
+    print FILE $to_replace or die "Error $? writing to $output_filename: $!";
+    close FILE or die "Error $? closing $output_filename: $!";
+    chmod 0777, $out;
+  EOF
+
+  --let $escape_string= `SELECT LOAD_FILE('$_output_filename')`
+}
+# Cleanup
+--remove_file $_output_filename
diff --git a/mysql-test/include/explain_non_select.inc b/mysql-test/include/explain_non_select.inc
index 0e6996b7470a..e5a8c65b0e01 100644
--- a/mysql-test/include/explain_non_select.inc
+++ b/mysql-test/include/explain_non_select.inc
@@ -640,7 +640,6 @@ CREATE TABLE t1 ( a INT, KEY( a ) );
 INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
---error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
 --error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
 UPDATE IGNORE v1 SET a = 1;
diff --git a/mysql-test/include/have_grep.inc b/mysql-test/include/have_grep.inc
index 6d44d286500d..5131029f8837 100644
--- a/mysql-test/include/have_grep.inc
+++ b/mysql-test/include/have_grep.inc
@@ -4,7 +4,7 @@
 123
 456
 EOF
---error 0,1,2,127,512
+--error 0,1,2,42,127,512
 --exec grep -v -e "123" $MYSQL_TMP_DIR/grep_check
 let $status= $__error;
 --remove_file $MYSQL_TMP_DIR/grep_check
diff --git a/mysql-test/include/have_not_yassl.inc b/mysql-test/include/have_not_yassl.inc
deleted file mode 100644
index a5f24d0771f3..000000000000
--- a/mysql-test/include/have_not_yassl.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Only run this test if YaSSL is supported
-let $shavars= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
-if ($shavars != 'Rsa_public_key'){
-  skip Need OpenSSL support;
-}
diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc
index e240d935cb2c..23b93dca75ea 100644
--- a/mysql-test/include/have_openssl.inc
+++ b/mysql-test/include/have_openssl.inc
@@ -2,3 +2,4 @@
 disable_query_log;
 show variables like "have_openssl";
 enable_query_log;
+--source include/allowed_ciphers.inc
diff --git a/mysql-test/include/have_openssl_support.inc b/mysql-test/include/have_openssl_support.inc
new file mode 100644
index 000000000000..1c283125d843
--- /dev/null
+++ b/mysql-test/include/have_openssl_support.inc
@@ -0,0 +1,5 @@
+# Only run this test if OpenSSL is supported
+let $shavars= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
+if ($shavars != 'Rsa_public_key'){
+  skip Need OpenSSL support;
+}
diff --git a/mysql-test/include/have_openssl_version_1.1.0.inc b/mysql-test/include/have_openssl_version_1.1.0.inc
new file mode 100644
index 000000000000..e4de2bc27426
--- /dev/null
+++ b/mysql-test/include/have_openssl_version_1.1.0.inc
@@ -0,0 +1,56 @@
+--disable_query_log
+--disable_result_log
+
+let OPENSSL_VERSION_INFO= $MYSQLTEST_VARDIR/log/openssl_version_info.txt;
+let OPENSSL_CONFIG_INC= $MYSQLTEST_VARDIR/log/openssl_binary_config.inc;
+
+--error 0,1
+--remove_file $OPENSSL_VERSION_INFO
+--error 0,1
+--remove_file $OPENSSL_CONFIG_INC
+
+--error 0,1, 127
+--exec openssl version > $OPENSSL_VERSION_INFO
+
+perl;
+ use strict;
+ my $search_file= $ENV{'OPENSSL_VERSION_INFO'};
+ my $search_pattern_1= "0.9.*";
+ my $search_pattern_2= "1.0.0.*";
+ my $search_pattern_3= "1.0.1.*";
+ my $search_pattern_4= "1.0.2.*";
+ my $content= "";
+ my $dir= $ENV{'MYSQLTEST_VARDIR'};
+ open(CONFIG_INC, ">$dir/log/openssl_binary_config.inc");
+ open(FILE, "$search_file") or die("Unable to open '$search_file' : $!\n");
+ read(FILE, $content, 100, 0);
+ close(FILE);
+
+ if ( ($content =~ m{$search_pattern_1}) || ($content =~ m{$search_pattern_2}) ||
+      ($content =~ m{$search_pattern_3}) || ($content =~ m{$search_pattern_4})) {
+    print CONFIG_INC "let \$STATUS_VAR = 1;\n";
+ }
+ else {
+    print CONFIG_INC "let \$STATUS_VAR = 0;\n";
+ }
+ close(CONFIG_INC);
+EOF
+
+--source $OPENSSL_CONFIG_INC
+
+if ($STATUS_VAR)
+{
+ --error 0,1
+ --remove_file $OPENSSL_VERSION_INFO
+ --error 0,1
+ --remove_file $OPENSSL_CONFIG_INC
+ --skip Test requires openssl version to be 1.1.0+
+}
+
+--error 0,1
+--remove_file $OPENSSL_VERSION_INFO
+--error 0,1
+--remove_file $OPENSSL_CONFIG_INC
+
+--enable_query_log
+--enable_result_log
diff --git a/mysql-test/include/have_punch_hole.inc b/mysql-test/include/have_punch_hole.inc
new file mode 100644
index 000000000000..dd12731d0cdc
--- /dev/null
+++ b/mysql-test/include/have_punch_hole.inc
@@ -0,0 +1,32 @@
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+LET MYSQLD_DATADIR = `SELECT @@datadir`;
+
+--disable_query_log
+--disable_warnings
+CREATE TABLE t1(c1 INT PRIMARY KEY) COMPRESSION="ZLIB";
+let COMPR_ZIP_WARN= `SHOW WARNINGS`;
+--enable_warnings
+--enable_query_log
+
+perl;
+  use strict;
+  my $no_holes = ($ENV{COMPR_ZIP_WARN} =~ /Punch hole not supported/)? 1 : 0;
+### we do not expect any other warning
+  printf("Unexpected warning: %s\n",$ENV{COMPR_ZIP_WARN})
+    if (not $no_holes and $ENV{COMPR_ZIP_WARN} ne '');
+  open(DHF,">$ENV{'MYSQLD_DATADIR'}/compr.inc");
+  printf DHF "let \$no_holes= %s;\n",$no_holes;
+  close(DHF);
+EOF
+
+--source $MYSQLD_DATADIR/compr.inc
+--remove_file $MYSQLD_DATADIR/compr.inc
+
+--disable_query_log
+DROP TABLE t1;
+--enable_query_log
+
+if ($no_holes)
+{
+  --skip Test requires 'Punch hole support'
+}
diff --git a/mysql-test/include/have_slave_repository_type_table.inc b/mysql-test/include/have_slave_repository_type_table.inc
new file mode 100644
index 000000000000..78211ab8f3b3
--- /dev/null
+++ b/mysql-test/include/have_slave_repository_type_table.inc
@@ -0,0 +1,7 @@
+--let $mi_repo= `SELECT @@GLOBAL.master_info_repository='FILE'`
+--let $rli_repo= `SELECT @@GLOBAL.relay_log_info_repository='FILE'`
+
+if (`SELECT $mi_repo = 1 OR $rli_repo = 1`)
+{
+  --skip Test runs only when slave repository type = TABLE
+}
diff --git a/mysql-test/include/have_ssl.inc b/mysql-test/include/have_ssl.inc
index 6f2d5587a756..c0e80691993c 100644
--- a/mysql-test/include/have_ssl.inc
+++ b/mysql-test/include/have_ssl.inc
@@ -2,3 +2,4 @@
 disable_query_log;
 show variables like 'have_ssl';
 enable_query_log;
+--source include/allowed_ciphers.inc
diff --git a/mysql-test/include/have_ssl_communication.inc b/mysql-test/include/have_ssl_communication.inc
index 6f2d5587a756..c0e80691993c 100644
--- a/mysql-test/include/have_ssl_communication.inc
+++ b/mysql-test/include/have_ssl_communication.inc
@@ -2,3 +2,4 @@
 disable_query_log;
 show variables like 'have_ssl';
 enable_query_log;
+--source include/allowed_ciphers.inc
diff --git a/mysql-test/include/have_yassl.inc b/mysql-test/include/have_yassl.inc
deleted file mode 100644
index 554015b0d85b..000000000000
--- a/mysql-test/include/have_yassl.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Only run this test if YaSSL is supported
-let $shavars= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
-if ($shavars == 'Rsa_public_key'){
-  skip Need YaSSL support;
-}
diff --git a/mysql-test/include/if_encrypted.inc b/mysql-test/include/if_encrypted.inc
new file mode 100644
index 000000000000..16a69d516848
--- /dev/null
+++ b/mysql-test/include/if_encrypted.inc
@@ -0,0 +1,36 @@
+#################### Perl module starts ####################
+perl;
+my $d_dir = $ENV{'datadir'};
+my $s_pattern = $ENV{'search_pattern'};
+my $filename = $ENV{'ts_name'};
+my $ts_filename="$d_dir/$filename";
+open TS_FILE, "<$ts_filename" or die "$!";
+@lines = <TS_FILE>;
+close TS_FILE;
+
+my $vardir = $ENV{'MYSQLTEST_VARDIR'};
+my $filename="$vardir/tmpfile.txt";
+open(OP_FILE, '>', $filename) or die "$!";
+
+my $found = 0;
+foreach $line (@lines) {
+        chomp( $line );
+        print OP_FILE;
+        if($line =~ /$s_pattern/) {
+                $found=1;
+        }
+}
+
+if ($found == 1) {
+        print OP_FILE "table space is Unencrypted.\n";
+} else {
+        print OP_FILE "table space is Encrypted.\n";
+}
+
+close OP_FILE;
+EOF
+#################### Perl module ends ####################
+
+--echo # Print result
+cat_file $MYSQLTEST_VARDIR/tmpfile.txt;
+
diff --git a/mysql-test/include/innodb_pk_extension.inc b/mysql-test/include/innodb_pk_extension.inc
index a4f96ed6c17a..2eb3c6dae17c 100644
--- a/mysql-test/include/innodb_pk_extension.inc
+++ b/mysql-test/include/innodb_pk_extension.inc
@@ -263,3 +263,23 @@ CREATE TABLE t1
 INSERT INTO t1 VALUES (point(7, 7));
 SELECT st_astext(a) FROM t1 WHERE st_equals(a, point(7, 7));
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #31617858 INCORRECT RESULTS WHEN USING INDEX ON LONG CHARACTER COLS.
+--echo #
+
+CREATE TABLE t(
+a VARCHAR(256) NOT NULL,
+i VARCHAR(1024) NOT NULL,
+PRIMARY KEY (a),
+KEY (i)) DEFAULT CHARSET=utf8;
+
+INSERT INTO t VALUES
+('aaa12345678','aaa'), ('aaa2','aaa'), ('aaa4','aaa'),
+('aaa3','aaa'),('aaa1','aaa');
+ANALYZE TABLE t;
+
+EXPLAIN SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+
+DROP TABLE t;
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql
index 90983164f4d1..e5717207de02 100644
--- a/mysql-test/include/mtr_check.sql
+++ b/mysql-test/include/mtr_check.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software Foundation,
diff --git a/mysql-test/include/mtr_system_tables_data.sql b/mysql-test/include/mtr_system_tables_data.sql
index 975229b1d4be..aad3507e2c33 100644
--- a/mysql-test/include/mtr_system_tables_data.sql
+++ b/mysql-test/include/mtr_system_tables_data.sql
@@ -1,14 +1,21 @@
--- Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 -- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
--- 
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/mysql-test/include/mtr_test_data_timezone.sql b/mysql-test/include/mtr_test_data_timezone.sql
index 640ed5f52e2d..b17e2255346f 100644
--- a/mysql-test/include/mtr_test_data_timezone.sql
+++ b/mysql-test/include/mtr_test_data_timezone.sql
@@ -1,14 +1,21 @@
--- Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 -- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
--- 
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index d1cd1c8871d6..c67ae76a91b1 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software Foundation,
@@ -215,6 +222,10 @@ INSERT INTO global_suppressions VALUES
  ("==[0-9]*== Warning: invalid file descriptor -1 in syscall write()"),
  ("==[0-9]*== Warning: invalid file descriptor -1 in syscall read()"),
 
+ /* Suppress warnings caused by foreign clients, see Bug#31893901 */
+
+ ("IP address .* could not be resolved.*"),
+
  /*
    Transient network failures that cause warnings on reconnect.
    BUG#47743 and BUG#47983.
@@ -261,6 +272,16 @@ INSERT INTO global_suppressions VALUES
  */
  ("Insecure configuration for --secure-file-priv:*"),
 
+ /*
+   Bug#26585560, warning related to --pid-file
+ */
+ ("Insecure configuration for --pid-file:*"),
+ ("Few location(s) are inaccessible while checking PID filepath"),
+ /*
+   Following WL#12670, this warning is expected.
+ */
+ ("Setting named_pipe_full_access_group='\\*everyone\\*' is insecure"),
+
  /*
    On slow runs (valgrind) the message may be sent twice.
   */
@@ -286,6 +307,15 @@ INSERT INTO global_suppressions VALUES
  ("Member with address .* is reachable again."),
  ("The member has resumed contact with a majority of the members in the group.*"),
  ("Members removed from the group.*"),
+ /*
+   Missing Private/Public key files
+ */
+ ("RSA private key file not found"),
+ ("RSA public key file not found"),
+
+ /* TLS v1.0 and v1.1 deprecated */
+ ("A deprecated TLS version TLSv1 is enabled"),
+ ("A deprecated TLS version TLSv1.1 is enabled"),
 
  ("THE_LAST_SUPPRESSION")||
 
diff --git a/mysql-test/include/not_min_protocol_tlsv12.inc b/mysql-test/include/not_min_protocol_tlsv12.inc
new file mode 100644
index 000000000000..911afd17a816
--- /dev/null
+++ b/mysql-test/include/not_min_protocol_tlsv12.inc
@@ -0,0 +1,37 @@
+#
+# Modern Linux distributions like EL8 and Debian 10 restrict minimum TLS
+# protocol version to TLSv1.2, try to detect this and skip TLSv1/TLSv1.1 tests.
+#
+--perl
+  use strict;
+  use warnings;
+  my $crypto_policy = '/etc/crypto-policies/back-ends/opensslcnf.config';
+  my $openssl_conf = '/etc/ssl/openssl.cnf';
+  my $policy_file = "";
+  if (-r $crypto_policy) {
+    $policy_file = $crypto_policy;
+  } elsif (-r $openssl_conf) {
+    $policy_file = $openssl_conf;
+  }
+  my $min_protocol_tlsv1_2 = 0;
+  if ($policy_file ne "") {
+    open(my $RH, "<", $policy_file) or die "Could not open $policy_file $!";
+    while (<$RH>) {
+      if (/^MinProtocol\s=\sTLSv1\.2/) {
+	$min_protocol_tlsv1_2 = 1;
+	last;
+      }
+    }
+    close $RH;
+  }
+  open (my $WH, ">", "$ENV{MYSQL_TMP_DIR}/crypto_policy.inc") or die "Could not open $ENV{MYSQL_TMP_DIR}/crypto_policy.inc: $!";
+  print $WH "let \$min_protocol_tlsv1_2 = $min_protocol_tlsv1_2;\n";
+  close $WH;
+EOF
+--source $MYSQL_TMP_DIR/crypto_policy.inc
+--remove_file $MYSQL_TMP_DIR/crypto_policy.inc
+
+if ($min_protocol_tlsv1_2)
+{
+  --Skip Test requires TLS protocol <= 1.1, while OpenSSL policy sets MinProtocol TLSv1.2
+}
diff --git a/mysql-test/include/not_sha256_rsa_auth.inc b/mysql-test/include/not_sha256_rsa_auth.inc
deleted file mode 100644
index dfd9634b35a3..000000000000
--- a/mysql-test/include/not_sha256_rsa_auth.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Only run this test if YaSSL is supported
-let $shavars= query_get_value("SELECT COUNT(*) as shavars FROM information_schema.session_variables WHERE variable_name = 'sha256_password_private_key_path'", shavars, 1);
-if ($shavars != 0){
-  skip Need YaSSL support;
-}
diff --git a/mysql-test/include/only_binlog_transaction_dependency_tracking_commit_order.inc b/mysql-test/include/only_binlog_transaction_dependency_tracking_commit_order.inc
new file mode 100644
index 000000000000..1ae9378b80be
--- /dev/null
+++ b/mysql-test/include/only_binlog_transaction_dependency_tracking_commit_order.inc
@@ -0,0 +1,4 @@
+if (`SELECT @@GLOBAL.binlog_transaction_dependency_tracking != 'COMMIT_ORDER'`)
+{
+  --skip Test requires binlog_transaction_dependency_tracking= COMMIT_ORDER
+}
diff --git a/mysql-test/include/only_with_option.inc b/mysql-test/include/only_with_option.inc
new file mode 100644
index 000000000000..c4c2018699b7
--- /dev/null
+++ b/mysql-test/include/only_with_option.inc
@@ -0,0 +1,62 @@
+# ==== Purpose ====
+#
+# Skip the test when the comparision between a given variable and variable
+# value, using a given comparision operator, evaluates to false.
+#
+# ==== Usage ====
+#
+# --let $option_name = <OPTION>
+# --let $option_value = <VALUE>
+# [--let $option_operator = <ANY SQL COMPARISION OPERATOR>, defaults to `=`]
+# [--let $option_scope = GLOBAL|SESSION, defaults to GLOBAL]
+# --source include/only_with_option.inc
+#
+# Parameters:
+#
+#   $option_name
+#     The name of the option to be tested.
+#
+#   $option_value
+#     The value we want the option tested against.
+#
+#   $option_operator
+#     The comparision operator to test the option against value. Defaults
+#     to `=`.
+#
+#   $option_scope
+#     The scope of the option, either SESSION or GLOBAL. Default to GLOBAL.
+#
+
+if ($option_name == '')
+{
+  --die ERRROR: `option_name` parameter must be set
+}
+if ($option_value == '')
+{
+  --die ERRROR: `option_value` parameter must be set
+}
+
+--let $_scope = GLOBAL
+--let $_operator = =
+
+if ($option_scope != '')
+{
+    --let $_scope = $option_scope
+}
+if ($option_operator != '')
+{
+    --let $_operator = $option_operator
+}
+
+--let $_option_name = $_scope.$option_name
+
+if (`SELECT not(@@$_option_name $_operator $option_value)`)
+{
+  --skip Test only executed when `$_option_name $_operator $option_value`
+}
+--echo include/only_with_option.inc [$_option_name $_operator $option_value]
+
+--let $option_name =
+--let $option_value =
+--let $option_scope =
+--let $option_operator =
diff --git a/mysql-test/include/openssl3_legacy_tls.cnf b/mysql-test/include/openssl3_legacy_tls.cnf
new file mode 100644
index 000000000000..54a41cbb24ad
--- /dev/null
+++ b/mysql-test/include/openssl3_legacy_tls.cnf
@@ -0,0 +1,11 @@
+# Allow ciphers by default treated as unsecure in OpenSSL 3.0 to allow use of
+# legacy TLSv1.0 and TLSv1.1.
+# Configuration file should also work for OpenSSL 1.1.1 but will not work with
+# for example OpenSSL 1.0.
+openssl_conf = openssl_sect
+[ openssl_sect ]
+ssl_conf = ssl_sect
+[ssl_sect]
+system_default = system_default_sect
+[system_default_sect]
+CipherString = DEFAULT:@SECLEVEL=0
diff --git a/mysql-test/include/range.inc b/mysql-test/include/range.inc
index 1ff33c0aa2b6..b45f9e4e4d49 100644
--- a/mysql-test/include/range.inc
+++ b/mysql-test/include/range.inc
@@ -2544,3 +2544,150 @@ SET optimizer_trace="enabled=off";
 
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+
+--echo #
+--echo # Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+--echo #                 COMPOSITE INDEX
+--echo #
+
+CREATE TABLE test_ref (
+   a INT PRIMARY KEY,
+   b VARCHAR(20),
+   c VARCHAR(20) DEFAULT NULL,
+   d VARCHAR(3) DEFAULT NULL,
+   id INT DEFAULT NULL,
+   KEY idx1 (id, c),
+   KEY idx2 (id, d)) ENGINE=INNODB ;
+
+--disable_query_log
+INSERT INTO test_ref VALUES
+(   27699, 'D007', 'gheennse', 'S',    7),
+(   34876, 'D003', 'gheennse', 'S',    3),
+(   70714, 'D007', 'gheennse', 'S',    7),
+(   71945, 'D005', 'gheennse', 'S',    5),
+(   95929, 'D003', 'gheennse', 'D',    3),
+(  129342, 'D002', 'gheennse', 'S',    2),
+(  146471, 'D003', 'gheennse', 'S',    3),
+(  186302, 'D003', 'gheennse', 'S',    3),
+(  248098, 'D003', 'gheennse', 'S',    3),
+(  308317, 'D003', 'gheennse', 'D',    3),
+(  317360, 'D005', 'gheennse', 'D',    5),
+(  444176, 'D003', 'gheennse', 'A',    3),
+(  460871, 'D003', 'gheennse', 'D',    3),
+(  462396, 'D002', 'gheennse', 'S',    2),
+(  477701, 'D007', 'gheennse', 'D',    7),
+(  503689, 'D003', 'gheennse', 'S',    3),
+(  505492, 'D003', 'gheennse', 'DD',   3),
+(  516238, 'D003', 'gheennse', 'S',    3),
+(  534333, 'D002', 'gheennse', 'D',    2),
+(  565439, 'D007', 'gheennse', 'D',    7),
+(  577221, 'D002', 'gheennse', 'S',    2),
+(  633762, 'D002', 'gheennse', 'S',    2),
+(  670506, 'D002', 'gheennse', 'D',    2),
+(  676921, 'D007', 'gheennse', 'D',    7),
+(  680607, 'D002', 'gheennse', 'D',    2),
+(  694397, 'D003', 'gheennse', 'S',    3),
+(  714547, 'D003', 'gheennse', 'S',    3),
+(  717856, 'D003', 'gheennse', 'D',    3),
+(  808061, 'D003', 'gheennse', 'S',    3),
+(  864526, 'D003', 'gheennse', 'S',    3),
+(  890043, 'D007', 'gheennse', 'S',    7),
+(  910633, 'D003', 'gheennse', 'S',    3),
+(  948201, 'D002', 'gheennse', 'S',    2),
+(  949220, 'D005', 'gheennse', 'S',    5),
+(  960404, 'D003', 'gheennse', 'S',    3),
+( 1092448, 'D007', 'gheennse', 'D',    7),
+( 1104681, 'D002', 'gheennse', 'S',    2),
+( 1123559, 'D003', 'gheennse', 'S',    3),
+( 1129004, 'D003', 'gheennse', 'S',    3),
+( 1158830, 'D005', 'gheennse', 'D',    5),
+( 1181872, 'D003', 'gheennse', 'S',    3),
+( 1244160, 'D005', 'gheennse', 'S',    5),
+( 1248290, 'D005', 'gheennse', 'D',    5),
+( 1271990, 'D005', 'gheennse', 'S',    5),
+( 1292696, 'D003', 'gheennse', 'S',    3),
+( 1334421, 'D002', 'gheennse', 'S',    2),
+( 1386182, 'D007', 'gheennse', 'S',    7),
+( 1432466, 'D007', 'gheennse', 'D',    7),
+( 1604224, 'D003', 'gheennse', 'S',    3),
+( 1635704, 'D007', 'gheennse', 'S',    7),
+( 1762832, 'D003', 'gheennse', 'D',    3),
+( 1770649, 'D003', 'gheennse', 'S',    3),
+( 1770299, 'D003', 'gheennse', 'S',    3),
+( 1770399, 'D003', 'gheennse', 'S',    3),
+( 1896320, 'D005', 'gheennse', 'S',    5),
+( 1946091, 'D007', 'gheennse', 'S',    7),
+( 1955807, 'D007', 'gheennse', 'S',    7),
+( 1981281, 'D002', 'gheennse', 'D',    2),
+( 1984746, 'D002', 'gheennse', 'S',    2),
+( 2011617, 'D002', 'gheennse', 'S',    2),
+( 2021745, 'D005', 'gheennse', 'D',    5),
+( 2058339, 'D002', 'cheennse', 'D',    2),
+( 2088903, 'D002', 'cheennse', 'S',    2),
+( 2170936, 'D003', 'cheennse', 'S',    3),
+( 2191014, 'D007', 'cheennse', 'S',    7),
+( 2359396, 'D003', 'cheennse', 'D',    3),
+( 2392181, 'D003', 'cheennse', 'D',    3),
+( 2509548, 'D002', 'cheennse', 'D',    2),
+( 2524317, 'D002', 'cheennse', 'S',    2),
+( 2532146, 'D003', 'cheennse', 'S',    3),
+( 2554387, 'D003', 'cheennse', 'S',    3),
+( 2615723, 'D003', 'cheennse', 'D',    3),
+( 2769368, 'D007', 'cheennse', 'S',    7),
+( 2788698, 'D002', 'cheennse', 'D',    2),
+( 2900141, 'D003', 'cheennse', 'D',    3),
+( 2916874, 'D003', 'cheennse', 'S',    3),
+( 2917505, 'D005', 'cheennse', 'D',    5),
+( 3049543, 'D007', 'cheennse', 'D',    7),
+( 3054225, 'D005', 'cheennse', 'S',    5),
+( 3127100, 'D005', 'cheennse', 'S',    5),
+( 3231967, 'D003', 'cheennse', 'DD',   3),
+( 3239080, 'D005', 'cheennse', 'DD',   5),
+( 3245821, 'D003', 'cheennse', 'DD',   3),
+( 3492641, 'D003', 'cheennse', 'DD',   3),
+( 3502099, 'D003', 'cheennse', 'S',    3),
+( 3502400, 'D005', 'cheennse', 'DD',   5),
+( 3652408, 'D003', 'cheennse', 'DD',   3),
+( 3671827, 'D003', 'cheennse', 'S',    3),
+( 3739085, 'D007', 'cheennse', 'S',    7),
+( 3856727, 'D007', 'cheennse', 'S',    7),
+( 3871123, 'D003', 'cheennse', 'S',    3),
+( 3955047, 'D002', 'cheennse', 'DD',   2),
+( 3995249, 'D003', 'cheennse', 'S',    3),
+( 3996816, 'D002', 'cheennse', 'S',    2),
+( 4037006, 'D003', 'cheennse', 'S',    3),
+( 4040042, 'D003', 'cheennse', 'S',    3),
+( 4126972, 'D003', 'cheennse', 'S',    3),
+( 4163290, 'D005', 'cheennse', 'DD',   5),
+( 4170771, 'D002', 'cheennse', 'DD',   2),
+( 4209586, 'D003', 'cheennse', 'S',    3),
+( 4267486, 'D003', 'cheennse', 'S',    3),
+( 4317590, 'D005', 'cheennse', 'S',    5),
+( 4318938, 'D002', 'cheennse', 'S',    2),
+( 4363730, 'D007', 'cheennse', 'D',    7),
+( 4455095, 'D005', 'cheennse', 'S',    5);
+--enable_query_log
+ANALYZE TABLE test_ref;
+
+let query1=
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+
+# test with descending order
+let query2=
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+
+eval EXPLAIN $query1;
+eval $query1;
+
+eval EXPLAIN $query2;
+eval $query2;
+
+DROP TABLE test_ref;
diff --git a/mysql-test/include/read_only_bug28438114.inc b/mysql-test/include/read_only_bug28438114.inc
new file mode 100644
index 000000000000..c641deca1708
--- /dev/null
+++ b/mysql-test/include/read_only_bug28438114.inc
@@ -0,0 +1,36 @@
+#
+# Test that $query correctly checks read_only flag even if this
+# flag is set while the query is blocked waiting for protection
+# global read lock. Used by test for bug#28438114 in read_only.test.
+#
+
+--enable_connect_log
+connection default;
+FLUSH TABLES WITH READ LOCK;
+
+connection con1;
+--echo # DDL statement will block waiting for GRL.
+--send_eval $query
+
+connection con2;
+--echo # Wait until statement is blocked waiting for GRL.
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+  WHERE STATE = "Waiting for global read lock";
+--source include/wait_condition.inc
+SET GLOBAL READ_ONLY= 1;
+
+connection default;
+--echo # Unblock the DDL statement.
+UNLOCK TABLES;
+
+connection con1;
+--echo # Without patch for BUG#28438114, the DDL statement will succeed even
+--echo # though read only mode was set.
+--error ER_OPTION_PREVENTS_STATEMENT
+--reap
+
+--echo # Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+--disable_connect_log
diff --git a/mysql-test/include/rpl_reconnect.inc b/mysql-test/include/rpl_reconnect.inc
index 66a55c458ad5..04e87a83113f 100644
--- a/mysql-test/include/rpl_reconnect.inc
+++ b/mysql-test/include/rpl_reconnect.inc
@@ -98,6 +98,13 @@ if ($rpl_server_number == 2)
   }
 }
 
+if ($using_rpl_group_replication_default_connections)
+{
+  --let $rpl_connection_name= server$rpl_server_number
+  --source include/rpl_connection.inc
+  --enable_reconnect
+}
+
 --let $rpl_connection_name= server_$rpl_server_number
 --source include/rpl_connection.inc
 --enable_reconnect
@@ -141,7 +148,8 @@ if ($rpl_server_number == 1)
     {
       --let $rpl_connection_name= server1
       --source include/rpl_connection.inc
-      --enable_reconnect
+      --source include/wait_until_connected_again.inc
+      --disable_reconnect
 
       --let $rpl_connection_name= server_1
       --source include/rpl_connection.inc
@@ -169,7 +177,8 @@ if ($rpl_server_number == 2)
     {
       --let $rpl_connection_name= server2
       --source include/rpl_connection.inc
-      --enable_reconnect
+      --source include/wait_until_connected_again.inc
+      --disable_reconnect
 
       --let $rpl_connection_name= server_2
       --source include/rpl_connection.inc
@@ -179,6 +188,14 @@ if ($rpl_server_number == 2)
   }
 }
 
+if ($using_rpl_group_replication_default_connections)
+{
+  --let $rpl_connection_name= server$rpl_server_number
+  --source include/rpl_connection.inc
+  --source include/wait_until_connected_again.inc
+  --disable_reconnect
+}
+
 --let $rpl_connection_name= server_$rpl_server_number
 --source include/rpl_connection.inc
 --source include/wait_until_connected_again.inc
diff --git a/mysql-test/include/rpl_set_gtid_mode.inc b/mysql-test/include/rpl_set_gtid_mode.inc
index 2d69e3e5c3f1..5d67f4c9ded4 100644
--- a/mysql-test/include/rpl_set_gtid_mode.inc
+++ b/mysql-test/include/rpl_set_gtid_mode.inc
@@ -16,6 +16,7 @@
 # [--let $rpl_skip_sync= 1]
 # [--let $rpl_only_running_threads= 1]
 # [--let $rpl_debug= 1]
+# [--let $no_extra_info= 0]
 # --source include/rpl_set_gtid_mode.inc
 #
 # Parameters:
@@ -42,6 +43,12 @@
 #
 #   $rpl_debug=1
 #     See include/rpl_init.inc
+#
+#   $no_extra_info=0
+#     Do not print the mode and server after the include file name. This option
+#     allows to easly support tests that may invoke with dynamic parameter
+#     values.
+#
 
 # Get the new gtid_mode
 --let $_rsgm_new_mode= $rpl_gtid_mode
@@ -75,7 +82,17 @@ if ($_rsgm_server_list == '')
   }
 }
 
---let $include_filename= rpl_set_gtid_mode.inc [$_rsgm_new_mode on servers $_rsgm_server_list]
+--let $_rsgm_mute= $no_extra_info
+if ($_rsgm_mute == '')
+{
+  --let $_rsgm_mute= 0
+}
+
+--let $include_filename= rpl_set_gtid_mode.inc
+if ($_rsgm_mute == 0)
+{
+  --let $include_filename= rpl_set_gtid_mode.inc [$_rsgm_new_mode on servers $_rsgm_server_list]
+}
 --source include/begin_include_file.inc
 
 if ($rpl_inited)
diff --git a/mysql-test/include/server_option_test.pm b/mysql-test/include/server_option_test.pm
index 10e25f1cb922..090115567de2 100644
--- a/mysql-test/include/server_option_test.pm
+++ b/mysql-test/include/server_option_test.pm
@@ -1,16 +1,20 @@
 #!/usr/bin/perl -w
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# reserved.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 of
-# the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/include/set_binlog_format_mixed.sql b/mysql-test/include/set_binlog_format_mixed.sql
index 65c779ef141d..d5018a8de86a 100644
--- a/mysql-test/include/set_binlog_format_mixed.sql
+++ b/mysql-test/include/set_binlog_format_mixed.sql
@@ -1,14 +1,21 @@
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
diff --git a/mysql-test/include/set_binlog_format_row.sql b/mysql-test/include/set_binlog_format_row.sql
index 0400ed48be97..cd75f3a2a4bd 100644
--- a/mysql-test/include/set_binlog_format_row.sql
+++ b/mysql-test/include/set_binlog_format_row.sql
@@ -1,14 +1,21 @@
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
diff --git a/mysql-test/include/set_binlog_format_statement.sql b/mysql-test/include/set_binlog_format_statement.sql
index b582230e648f..1f9ac8a1032a 100644
--- a/mysql-test/include/set_binlog_format_statement.sql
+++ b/mysql-test/include/set_binlog_format_statement.sql
@@ -1,14 +1,21 @@
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
diff --git a/mysql-test/include/show_slave_status.inc b/mysql-test/include/show_slave_status.inc
index 47355a2fa863..eac596c5e60a 100644
--- a/mysql-test/include/show_slave_status.inc
+++ b/mysql-test/include/show_slave_status.inc
@@ -100,6 +100,15 @@ while ($_show_slave_status_items)
   --let $_show_slave_status_items= `SELECT LTRIM(SUBSTRING('$_show_slave_status_items', LENGTH('$_show_slave_status_name') + 2))`
 
   --let $_show_slave_status_value= query_get_value($show_slave_status_cmd, $_show_slave_status_name, 1)
+
+  if ($_show_slave_status_value)
+  {
+      --let $escape_string= $_show_slave_status_value
+      --let $enclosing_char= "
+      --source include/escape_sql.inc
+      --let $_show_slave_status_value= $escape_string
+  }
+
   --let $_slave_field_result_replace= /[\\]/\// $slave_field_result_replace
   --replace_regex $_slave_field_result_replace
   --let $_show_slave_status_value= `SELECT REPLACE("$_show_slave_status_value", '$MYSQL_TEST_DIR', 'MYSQL_TEST_DIR')`
diff --git a/mysql-test/include/stop_mysqld.inc b/mysql-test/include/stop_mysqld.inc
new file mode 100644
index 000000000000..d12b732488bd
--- /dev/null
+++ b/mysql-test/include/stop_mysqld.inc
@@ -0,0 +1,38 @@
+# ==== Purpose ====
+#
+# Shuts down the current server in a way that can be started again within
+# an MTR test script.
+#
+# ==== Usage ====
+#
+#   [--let $ss_timeout = <seconds>]
+#
+# Parameters:
+#   $ss_timeout
+#     Amount of seconds to wait for the server to shutdown before erroring
+#     out. This value is passed on to `--shutdown-server`. Default value is
+#     60 seconds.
+#
+
+if ($rpl_inited)
+{
+  if (!$allow_rpl_inited)
+  {
+    --die ERROR IN TEST: When using the replication test framework (master-slave.inc, rpl_init.inc etc), use rpl_restart_server.inc instead of restart_mysqld.inc. If you know what you are doing and you really have to use restart_mysqld.inc, set allow_rpl_inited=1 before you source restart_mysqld.inc
+  }
+}
+
+--let $_server_id = `SELECT @@server_id`
+--echo include/stop_mysqld.inc [server $_server_id]
+--let $_expect_file_name = $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+--exec echo "wait" > $_expect_file_name
+
+--let $ss_timeout = 60
+if ($shutdown_server_timeout)
+{
+  --let $ss_timeout = $shutdown_server_timeout
+}
+
+--shutdown_server $ss_timeout
+
+--source include/wait_until_disconnected.inc
diff --git a/mysql-test/include/uninstall_semisync_master.inc b/mysql-test/include/uninstall_semisync_master.inc
index 2ececc4ac49e..ffd0adf82309 100644
--- a/mysql-test/include/uninstall_semisync_master.inc
+++ b/mysql-test/include/uninstall_semisync_master.inc
@@ -7,6 +7,13 @@
 
 --disable_query_log
 --disable_warnings
+
+# wait till semisync clients are '0' before uninstalling
+# semisync master plugin.
+--let $status_var= Rpl_semi_sync_master_clients
+--let $status_var_value= 0
+--source include/wait_for_status_var.inc
+
 UNINSTALL PLUGIN rpl_semi_sync_master;
 
 --source include/end_include_file.inc
diff --git a/mysql-test/include/wait_for_mts_checkpoint.inc b/mysql-test/include/wait_for_mts_checkpoint.inc
new file mode 100644
index 000000000000..af9cf6006b56
--- /dev/null
+++ b/mysql-test/include/wait_for_mts_checkpoint.inc
@@ -0,0 +1,12 @@
+# ==== Purpose ====
+#
+# Waits until mts_checkpoint_routine has been fully
+# executed - from the beginning till the end
+#
+--let $debug_point= mts_checkpoint
+--source include/add_debug_point.inc
+#If end was hit before start - clear it
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+--source include/remove_debug_point.inc
diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc
index 9efea7aaf9f0..6611bd968b2c 100644
--- a/mysql-test/include/wait_for_slave_param.inc
+++ b/mysql-test/include/wait_for_slave_param.inc
@@ -10,10 +10,13 @@
 # --let $slave_param_value= No
 # [--let $slave_param_comparison= [ < | <= | >= | > | = | != ]]
 # [--let $slave_timeout= NUMBER]
+# [--let $slave_error_param= [Last_SQL_Errno | Last_IO_Errno]]
 # [--let $slave_error_param= [Slave_SQL_Errno | Slave_IO_Errno]]
 # [--let $slave_io_running_check_disable= 1]
 # [--let $rpl_channel_name= NAME]
 # [--let $rpl_debug= 1]
+# [--let $slave_io_errno= NUMBER [, NUMBER ...] [# comment]]
+# [--let $slave_sql_errno= NUMBER [, NUMBER ...] [# comment]]
 # --source include/wait_for_slave_param.inc
 #
 # Parameters:
@@ -39,9 +42,11 @@
 #   setting $slave_timeout. The unit is one second.
 #
 # $slave_error_param
-#   If set, this script will check if the column of the output from
-#   SHOW SLAVE STATUS named $slave_error_param is nonzero.  If it is,
-#   this script will faile immediately.  Typically, this should be set
+#   If set, this script will check for errors in the column of the
+#   output from SHOW SLAVE STATUS named $slave_error_param while
+#   waiting for the parameter. Once finding an error that is not
+#   expected (see $slave_io_errno and $slave_sql_errno parameters)
+#   this script will fail immediately. Typically, this should be set
 #   to Last_IO_Errno or Last_SQL_Errno.
 #
 # $slave_io_running_check_disable
@@ -53,6 +58,12 @@
 # $rpl_debug
 #   See include/rpl_init.inc
 #
+# $slave_io_errno
+#   See include/wait_for_slave_io_error.inc
+#
+# $slave_sql_errno
+#   See include/wait_for_slave_sql_error.inc
+#
 # ==== mysqltest variables configured by this file ====
 #
 # This file sets $slave_param_statement to the SQL statement used to
@@ -84,9 +95,16 @@ if ($VALGRIND_TEST) {
   let $_slave_timeout= `select $_slave_timeout * 6`;
 }
 
-if ($slave_error_param == '')
+if ($slave_error_param)
 {
-  --let $slave_error_param= 1
+  if ($slave_error_param != "Last_SQL_Errno")
+  {
+    if ($slave_error_param != "Last_IO_Errno")
+    {
+      --echo *** slave_error_param = $slave_error_param
+      --die slave_error_param must be null, Last_SQL_Errno or Last_IO_Errno
+    }
+  }
 }
 
 let $_slave_param_comparison= $slave_param_comparison;
@@ -118,6 +136,11 @@ if (!$slave_io_running_check_disable)
   }
 }
 
+
+# Strip away comments on $slave_io_errno and $slave_sql_errno parameters
+--let $_slave_io_errno= `SELECT IF(LOCATE('#', '$slave_io_errno') != 0, SUBSTR('$slave_io_errno', 1, LOCATE('#', '$slave_io_errno') - 1), '$slave_io_errno')`
+--let $_slave_sql_errno= `SELECT IF(LOCATE('#', '$slave_sql_errno') != 0, SUBSTR('$slave_sql_errno', 1, LOCATE('#', '$slave_sql_errno') - 1), '$slave_sql_errno')`
+
 --let $_slave_timeout_counter= `select $_slave_timeout * $sleep_freq`
 --let $_slave_continue= 1
 while ($_slave_continue)
@@ -125,9 +148,29 @@ while ($_slave_continue)
   --let $_show_slave_status_value= query_get_value($slave_param_statement, $slave_param, 1)
 
   # Check if an error condition is reached.
-  if (!$slave_error_param)
+  if ($slave_error_param)
   {
     --let $_show_slave_status_error_value= query_get_value($slave_param_statement, $slave_error_param, 1)
+
+    # Check if the error condition was expected
+    if ($_show_slave_status_error_value)
+    {
+      --let $_expected_error=
+      if ($slave_error_param == "Last_IO_Errno")
+      {
+        --let $_expected_error=`SELECT FIND_IN_SET('$_show_slave_status_error_value','$_slave_io_errno')`
+      }
+      if ($slave_error_param == "Last_SQL_Errno")
+      {
+        --let $_expected_error=`SELECT FIND_IN_SET('$_show_slave_status_error_value','$_slave_sql_errno')`
+      }
+      # If the error is an expected error, just ignore it
+      if ($_expected_error)
+      {
+        --let $_show_slave_status_error_value=
+      }
+    }
+
     if ($_show_slave_status_error_value)
     {
       --echo **** ERROR: $slave_error_param = '$_show_slave_status_error_value' while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value ****
diff --git a/mysql-test/include/wait_for_slave_sql_to_start.inc b/mysql-test/include/wait_for_slave_sql_to_start.inc
index 161c1b8abb5f..81060d74141f 100644
--- a/mysql-test/include/wait_for_slave_sql_to_start.inc
+++ b/mysql-test/include/wait_for_slave_sql_to_start.inc
@@ -32,7 +32,7 @@ let $slave_param_value= Yes;
 # *before* it clears Last_SQL_Errno.  So we have to allow errors in
 # the SQL thread here.
 
-#--let $slave_error_param= Last_SQL_Errno
+--let $slave_error_param=
 source include/wait_for_slave_param.inc;
 #--let $slave_error_param=
 
diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm
index 535df07871de..ac980b8aca64 100644
--- a/mysql-test/lib/My/Config.pm
+++ b/mysql-test/lib/My/Config.pm
@@ -1,16 +1,23 @@
 # -*- cperl -*-
 
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 0c4840de9ebd..feca82d6b0ac 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -1,15 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm
index cfbd267748c9..96268b5db4e7 100644
--- a/mysql-test/lib/My/CoreDump.pm
+++ b/mysql-test/lib/My/CoreDump.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Exec.pm b/mysql-test/lib/My/Exec.pm
index d1468a9d405f..65d8168d7c72 100644
--- a/mysql-test/lib/My/Exec.pm
+++ b/mysql-test/lib/My/Exec.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/File/Path.pm b/mysql-test/lib/My/File/Path.pm
index 19abd95d824b..da7c3c2a79da 100644
--- a/mysql-test/lib/My/File/Path.pm
+++ b/mysql-test/lib/My/File/Path.pm
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2007 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm
index 1f99c470e730..6fcb75d85aa7 100644
--- a/mysql-test/lib/My/Find.pm
+++ b/mysql-test/lib/My/Find.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm
index d120eb7b1d42..b5d68c73edf0 100644
--- a/mysql-test/lib/My/Handles.pm
+++ b/mysql-test/lib/My/Handles.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Memcache.pm b/mysql-test/lib/My/Memcache.pm
index 4f21f24b07d7..ee1938618682 100644
--- a/mysql-test/lib/My/Memcache.pm
+++ b/mysql-test/lib/My/Memcache.pm
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm
index 55d1010aad8a..2480e38310f0 100644
--- a/mysql-test/lib/My/Options.pm
+++ b/mysql-test/lib/My/Options.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -150,7 +157,7 @@ sub is_set {
     foreach my $set_opt (@$set_opts){
       my ($opt_name2, $value2)= _split_option($set_opt);
 
-      if ($opt_name1 eq $opt_name2){
+      if (option_equals($opt_name1,$opt_name2)){
 	# Option already set
 	return 1;
       }
@@ -183,5 +190,14 @@ sub toStr {
 }
 
 
+sub option_equals {
+  my ($string1, $string2) = @_;
+
+  $string1 =~ s/_/-/g;
+  $string2 =~ s/_/-/g;
+
+  return ( $string1 eq $string2 );
+}
+
 1;
 
diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm
index 4f7b5642e876..488addb1d41d 100644
--- a/mysql-test/lib/My/Platform.pm
+++ b/mysql-test/lib/My/Platform.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index 6d1d60c0d8b0..b9aeceacc101 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -1,15 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2007, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -227,6 +233,7 @@ sub shutdown {
   my $shutdown_timeout= shift;
   my @processes= @_;
   _verbose("shutdown, timeout: $shutdown_timeout, @processes");
+  my $shutdown_status = 0;
 
   return if (@processes == 0);
 
@@ -253,6 +260,9 @@ sub shutdown {
     my $ret= $proc->wait_one($shutdown_timeout);
     if ($ret != 0) {
       push(@kill_processes, $proc);
+    } else {
+      my $exit_status = $proc->exit_status();
+      $shutdown_status = $exit_status if $exit_status;
     }
     # Only wait for the first process with shutdown timeout
     $shutdown_timeout= 0;
@@ -271,7 +281,7 @@ sub shutdown {
   }
 
   # Return if all servers has exited
-  return if (@kill_processes == 0);
+  return $shutdown_status if (@kill_processes == 0);
 
   foreach my $proc (@kill_processes){
     $proc->start_kill();
@@ -281,7 +291,7 @@ sub shutdown {
     $proc->wait_one(undef);
   }
 
-  return;
+  return $shutdown_status;
 }
 
 
diff --git a/mysql-test/lib/My/SafeProcess/Base.pm b/mysql-test/lib/My/SafeProcess/Base.pm
index f9eb12c0c75a..0e0884a0ab39 100644
--- a/mysql-test/lib/My/SafeProcess/Base.pm
+++ b/mysql-test/lib/My/SafeProcess/Base.pm
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2007, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/SafeProcess/CMakeLists.txt b/mysql-test/lib/My/SafeProcess/CMakeLists.txt
index 1381d8d4eadd..b1573832cdec 100644
--- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt
+++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
-# 
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+#
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -29,6 +36,42 @@ ELSE()
   MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
 ENDIF()
 
+IF(LINUX AND HAVE_ASAN)
+  MYSQL_CHECK_RPC()
+ENDIF()
+# Sun RPC, and XDR, is being removed from glibc, and into a separate libtirpc
+# library. This is not compatible with libasan. The interceptor functions
+# inserted into the code will segfault.
+# As a workaround, do LD_PRELOAD=/lib64/libtirpc.so
+# For dynamically linked libasan (default for gcc), we must preload that as well
+IF(HAVE_ASAN AND TIRPC_FOUND)
+  TARGET_INCLUDE_DIRECTORIES(my_safe_process
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+  ADD_CUSTOM_COMMAND(
+    OUTPUT asan_test.c
+    COMMAND ${CMAKE_COMMAND} -E echo "int main() { return 0; }" > asan_test.c
+    VERBATIM
+    )
+  SET_SOURCE_FILES_PROPERTIES(asan_test.c PROPERTIES GENERATED TRUE)
+
+  ADD_EXECUTABLE(asan_test asan_test.c)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ldd_asan_test_result
+    DEPENDS asan_test
+    COMMAND ldd asan_test > ldd_asan_test_result)
+
+  ADD_CUSTOM_TARGET(extract_asan_library_name
+    DEPENDS ldd_asan_test_result
+    COMMAND ${CMAKE_COMMAND}
+    -DINFILE=${CMAKE_CURRENT_BINARY_DIR}/ldd_asan_test_result
+    -DOUTFILE=${CMAKE_CURRENT_BINARY_DIR}/asan_library_name.h
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/read_ldd_output.cmake
+    )
+
+  ADD_DEPENDENCIES(my_safe_process extract_asan_library_name)
+ENDIF()
+
 INSTALL(TARGETS my_safe_process
   DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
 )
diff --git a/mysql-test/lib/My/SafeProcess/read_ldd_output.cmake b/mysql-test/lib/My/SafeProcess/read_ldd_output.cmake
new file mode 100644
index 000000000000..a75c33898d7c
--- /dev/null
+++ b/mysql-test/lib/My/SafeProcess/read_ldd_output.cmake
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+FILE(READ ${INFILE} LDD_FILE_CONTENTS)
+STRING(REPLACE "\n" ";" LDD_FILE_LINES ${LDD_FILE_CONTENTS})
+
+SET(ASAN_LIBRARY_NAME)
+FOREACH(LINE ${LDD_FILE_LINES})
+  STRING(REGEX MATCH "^[\t ]*(libasan.so.[0-9]) => ([/a-z0-9.]+)" XXX ${LINE})
+  IF(CMAKE_MATCH_1)
+#    MESSAGE(STATUS "LINE ${LINE}")
+#    MESSAGE(STATUS "XXX ${XXX}")
+#    MESSAGE(STATUS "CMAKE_MATCH_1 ${CMAKE_MATCH_1}")
+#    MESSAGE(STATUS "CMAKE_MATCH_2 ${CMAKE_MATCH_2}")
+    SET(ASAN_LIBRARY_NAME ${CMAKE_MATCH_2})
+  ENDIF()
+ENDFOREACH()
+FILE(WRITE ${OUTFILE}
+  "const char *asan_library_name=\"${ASAN_LIBRARY_NAME}\";")
diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc
index 2ac29c61bc7c..306368e0dbba 100644
--- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc
index 52e0a78477e1..b67807cd80a5 100644
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -54,6 +61,9 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
+#include <string>
+
+#include "my_config.h"
 
 int verbose= 0;
 volatile sig_atomic_t terminated= 0;
@@ -293,6 +303,16 @@ int main(int argc, char* const argv[] )
     // Close write end
     close(pfd[1]);
 
+#if defined(HAVE_ASAN) && defined(HAVE_TIRPC)
+#include "asan_library_name.h"
+    std::string ld_preload = "LD_PRELOAD=";
+    if (strlen(asan_library_name) > 0) {
+      ld_preload.append(asan_library_name);
+      ld_preload.append(":");
+    }
+    ld_preload.append("/lib64/libtirpc.so");
+    putenv(strdup(ld_preload.c_str()));
+#endif
     if (execvp(child_argv[0], child_argv) < 0)
       die("Failed to exec child");
   }
diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc
index 87a14481e258..7f840ddaffd9 100644
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm
index 51f7f326647d..6813ad352786 100644
--- a/mysql-test/lib/My/SysInfo.pm
+++ b/mysql-test/lib/My/SysInfo.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/My/Test.pm b/mysql-test/lib/My/Test.pm
index 895afd210e7a..e7a5dd490f38 100644
--- a/mysql-test/lib/My/Test.pm
+++ b/mysql-test/lib/My/Test.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 65296e92075b..1ab2aaa729f7 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -383,6 +390,17 @@ sub collect_one_suite($)
   my %disabled;
   my @disabled_collection= @{$opt_skip_test_list} if $opt_skip_test_list;
   unshift (@disabled_collection, "$testdir/disabled.def");
+
+  # Check for the tests to be skipped in a sanitizer which are listed
+  # in "mysql-test/collections/disabled-<sanitizer>.list" file.
+  if ($::opt_sanitize) {
+    # Check for disabled-asan.list
+    if ($::mysql_version_extra =~ /asan/i &&
+        !grep (/disabled-asan\.list$/, @{$opt_skip_test_list})) {
+      push(@disabled_collection, "collections/disabled-asan.list");
+    }
+  }
+
   for my $skip (@disabled_collection)
     {
       if ( open(DISABLED, $skip ) )
@@ -649,7 +667,7 @@ sub optimize_cases {
 	# The test supports different binlog formats
 	# check if the selected one is ok
 	my $supported=
-	  grep { $_ eq $binlog_format } @{$tinfo->{'binlog_formats'}};
+	  grep { $_ eq lc $binlog_format } @{$tinfo->{'binlog_formats'}};
 	if ( !$supported )
 	{
 	  $tinfo->{'skip'}= 1;
@@ -667,15 +685,17 @@ sub optimize_cases {
       # Get binlog-format used by this test from master_opt
       my $test_binlog_format;
       foreach my $opt ( @{$tinfo->{master_opt}} ) {
+       (my $dash_opt = $opt) =~ s/_/-/g;
 	$test_binlog_format=
-	  mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format;
+	  mtr_match_prefix($dash_opt, "--binlog-format=") || $test_binlog_format;
       }
 
       if (defined $test_binlog_format and
 	  defined $tinfo->{binlog_formats} )
       {
 	my $supported=
-	  grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}};
+	  grep { My::Options::option_equals($_, lc $test_binlog_format) }
+            @{$tinfo->{'binlog_formats'}};
 	if ( !$supported )
 	{
 	  $tinfo->{'skip'}= 1;
@@ -693,10 +713,11 @@ sub optimize_cases {
     my %builtin_engines = ('myisam' => 1, 'memory' => 1, 'csv' => 1);
 
     foreach my $opt ( @{$tinfo->{master_opt}} ) {
+     (my $dash_opt = $opt) =~ s/_/-/g;
       my $default_engine=
-	mtr_match_prefix($opt, "--default-storage-engine=");
+	mtr_match_prefix($dash_opt, "--default-storage-engine=");
       my $default_tmp_engine=
-	mtr_match_prefix($opt, "--default-tmp-storage-engine=");
+	mtr_match_prefix($dash_opt, "--default-tmp-storage-engine=");
 
       # Allow use of uppercase, convert to all lower case
       $default_engine =~ tr/A-Z/a-z/;
@@ -1081,7 +1102,7 @@ sub collect_one_test_case {
   }
   if ( $tinfo->{'need_binlog'} )
   {
-    if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
+    if (grep(/^--skip[-_]log[-_]bin/,  @::opt_extra_mysqld_opt) )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test needs binlog";
@@ -1214,11 +1235,11 @@ my @tags=
 (
  ["include/have_binlog_format_row.inc", "binlog_formats", ["row"]],
  ["include/have_binlog_format_statement.inc", "binlog_formats", ["statement"]],
- ["include/have_binlog_format_mixed.inc", "binlog_formats", ["mixed"]],
+ ["include/have_binlog_format_mixed.inc", "binlog_formats", ["mixed", "mix"]],
  ["include/have_binlog_format_mixed_or_row.inc",
-  "binlog_formats", ["mixed", "row"]],
+  "binlog_formats", ["mixed", "mix", "row"]],
  ["include/have_binlog_format_mixed_or_statement.inc",
-  "binlog_formats", ["mixed", "statement"]],
+  "binlog_formats", ["mixed", "mix", "statement"]],
  ["include/have_binlog_format_row_or_statement.inc",
   "binlog_formats", ["row", "statement"]],
 
diff --git a/mysql-test/lib/mtr_cases_from_list.pm b/mysql-test/lib/mtr_cases_from_list.pm
index aec9304e77dd..6eed0e5e34c1 100644
--- a/mysql-test/lib/mtr_cases_from_list.pm
+++ b/mysql-test/lib/mtr_cases_from_list.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl
index 6f9e744a548a..bc26b07cfd94 100644
--- a/mysql-test/lib/mtr_gcov.pl
+++ b/mysql-test/lib/mtr_gcov.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_gprof.pl b/mysql-test/lib/mtr_gprof.pl
index 15aad17a3d40..23e3f1a24ce6 100644
--- a/mysql-test/lib/mtr_gprof.pl
+++ b/mysql-test/lib/mtr_gprof.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_io.pl b/mysql-test/lib/mtr_io.pl
index 8c2803f04279..b04aae7d8a7b 100644
--- a/mysql-test/lib/mtr_io.pl
+++ b/mysql-test/lib/mtr_io.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_match.pm b/mysql-test/lib/mtr_match.pm
index 140885b62738..0d104c5d9e66 100644
--- a/mysql-test/lib/mtr_match.pm
+++ b/mysql-test/lib/mtr_match.pm
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (C) 2004-2008 MySQL AB
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
index e50e8cc77df3..74be9442efcc 100644
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -1,15 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 88e714f6f8d0..1e540edfc257 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index 9eca6020b31b..893d0b0a4afd 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -32,7 +39,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
 use mtr_match;
 use File::Spec;
 use My::Platform;
-use POSIX qw[ _exit ];
+use POSIX qw(_exit floor);
 use IO::Handle qw[ flush ];
 require "mtr_io.pl";
 use mtr_results;
@@ -40,6 +47,7 @@ use mtr_results;
 my $tot_real_time= 0;
 
 my $done_percentage= 0;
+my $tests_completed= 0;
 
 our $timestamp= 0;
 our $timediff= 0;
@@ -67,9 +75,11 @@ sub _name {
   return $name ? $name." " : undef;
 }
 
-sub _mtr_report_test_name ($)
+sub _mtr_report_test_name ($$)
 {
   my $tinfo= shift;
+  my $done_percentage= shift;
+
   my $tname= $tinfo->{name};
 
   return unless defined $verbose;
@@ -141,13 +151,13 @@ sub mtr_report_test ($) {
   {
     if ($tinfo->{'name'} && !$retry)
     {
-      $::remaining= $::remaining - 1;
-      $done_percentage = 100 - int (($::remaining * 100) /
-                                    ($::num_tests_for_report));
+      $tests_completed= $tests_completed + 1;
+      $done_percentage=
+        floor(($tests_completed / $::num_tests_for_report) * 100);
     }
   }
 
-  my $test_name = _mtr_report_test_name($tinfo);
+  my $test_name = _mtr_report_test_name($tinfo, $done_percentage);
 
   if ($result eq 'MTR_RES_FAILED'){
 
diff --git a/mysql-test/lib/mtr_results.pm b/mysql-test/lib/mtr_results.pm
index 92b03756c041..8e7f3ac0d7df 100644
--- a/mysql-test/lib/mtr_results.pm
+++ b/mysql-test/lib/mtr_results.pm
@@ -1,14 +1,21 @@
 # -*- cperl -*-
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/lib/mtr_stress.pl b/mysql-test/lib/mtr_stress.pl
index 6ab607e64395..1b1e2b45fa42 100644
--- a/mysql-test/lib/mtr_stress.pl
+++ b/mysql-test/lib/mtr_stress.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/mtr_unique.pm b/mysql-test/lib/mtr_unique.pm
index a5b5c2d227c9..6823c1378413 100644
--- a/mysql-test/lib/mtr_unique.pm
+++ b/mysql-test/lib/mtr_unique.pm
@@ -1,16 +1,23 @@
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/t/Base.t b/mysql-test/lib/t/Base.t
index b540944f3a1f..afef300769e4 100644
--- a/mysql-test/lib/t/Base.t
+++ b/mysql-test/lib/t/Base.t
@@ -1,17 +1,24 @@
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/Find.t b/mysql-test/lib/t/Find.t
index d609fd86dd9b..4684560610a5 100644
--- a/mysql-test/lib/t/Find.t
+++ b/mysql-test/lib/t/Find.t
@@ -1,17 +1,24 @@
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t
index 1c087d11db18..c4ba7c164a7d 100644
--- a/mysql-test/lib/t/Options.t
+++ b/mysql-test/lib/t/Options.t
@@ -1,16 +1,23 @@
 # -*- cperl -*-
 
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/Platform.t b/mysql-test/lib/t/Platform.t
index c78c22ddb5a7..c927ecaebfb9 100644
--- a/mysql-test/lib/t/Platform.t
+++ b/mysql-test/lib/t/Platform.t
@@ -1,17 +1,24 @@
 # -*- cperl -*-
 
-# Copyright (c) 2008 MySQL AB
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/SafeProcess.t b/mysql-test/lib/t/SafeProcess.t
index 0fab69b9088c..629c0a403737 100644
--- a/mysql-test/lib/t/SafeProcess.t
+++ b/mysql-test/lib/t/SafeProcess.t
@@ -1,17 +1,24 @@
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/SafeProcessStress.pl b/mysql-test/lib/t/SafeProcessStress.pl
index a5dbeecfb4ba..3cf1efb4b5cb 100755
--- a/mysql-test/lib/t/SafeProcessStress.pl
+++ b/mysql-test/lib/t/SafeProcessStress.pl
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007, 2008 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/copytree.t b/mysql-test/lib/t/copytree.t
index cdb99b851c49..5531cbc1a90d 100644
--- a/mysql-test/lib/t/copytree.t
+++ b/mysql-test/lib/t/copytree.t
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/dummyd.pl b/mysql-test/lib/t/dummyd.pl
index fae747354d73..0fa5d2504d76 100644
--- a/mysql-test/lib/t/dummyd.pl
+++ b/mysql-test/lib/t/dummyd.pl
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/rmtree.t b/mysql-test/lib/t/rmtree.t
index 8c9863a1eddc..ab0cea58140f 100644
--- a/mysql-test/lib/t/rmtree.t
+++ b/mysql-test/lib/t/rmtree.t
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/testMyConfig.t b/mysql-test/lib/t/testMyConfig.t
index f79e87766767..c27d4234e510 100755
--- a/mysql-test/lib/t/testMyConfig.t
+++ b/mysql-test/lib/t/testMyConfig.t
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/testMyConfigFactory.t b/mysql-test/lib/t/testMyConfigFactory.t
index 9f43bed3d989..554bba9a6863 100755
--- a/mysql-test/lib/t/testMyConfigFactory.t
+++ b/mysql-test/lib/t/testMyConfigFactory.t
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/t/test_child.pl b/mysql-test/lib/t/test_child.pl
index 38d9f906738f..278b7dbde725 100755
--- a/mysql-test/lib/t/test_child.pl
+++ b/mysql-test/lib/t/test_child.pl
@@ -1,18 +1,25 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/v1/My/Config.pm b/mysql-test/lib/v1/My/Config.pm
index cc4c34b2d623..697d8940adeb 100644
--- a/mysql-test/lib/v1/My/Config.pm
+++ b/mysql-test/lib/v1/My/Config.pm
@@ -1,17 +1,24 @@
 # -*- cperl -*-
 
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lib/v1/mtr_cases.pl b/mysql-test/lib/v1/mtr_cases.pl
index baeab24f5190..f10fc7ad2ef6 100644
--- a/mysql-test/lib/v1/mtr_cases.pl
+++ b/mysql-test/lib/v1/mtr_cases.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2005, 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_gcov.pl b/mysql-test/lib/v1/mtr_gcov.pl
index 56942be72a8c..2a167995909a 100644
--- a/mysql-test/lib/v1/mtr_gcov.pl
+++ b/mysql-test/lib/v1/mtr_gcov.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_gprof.pl b/mysql-test/lib/v1/mtr_gprof.pl
index 04c6eced28af..c83121bccaa0 100644
--- a/mysql-test/lib/v1/mtr_gprof.pl
+++ b/mysql-test/lib/v1/mtr_gprof.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_im.pl b/mysql-test/lib/v1/mtr_im.pl
index c34acc9c82ff..3abd008d6af9 100644
--- a/mysql-test/lib/v1/mtr_im.pl
+++ b/mysql-test/lib/v1/mtr_im.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_io.pl b/mysql-test/lib/v1/mtr_io.pl
index 5769240bf7f7..d39f6447c021 100644
--- a/mysql-test/lib/v1/mtr_io.pl
+++ b/mysql-test/lib/v1/mtr_io.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_match.pl b/mysql-test/lib/v1/mtr_match.pl
index 5cc74efb8c90..b2690857b1d9 100644
--- a/mysql-test/lib/v1/mtr_match.pl
+++ b/mysql-test/lib/v1/mtr_match.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_misc.pl b/mysql-test/lib/v1/mtr_misc.pl
index 07b50e865abb..b933b5f2688a 100644
--- a/mysql-test/lib/v1/mtr_misc.pl
+++ b/mysql-test/lib/v1/mtr_misc.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl
index 333f8bcc698d..c39aca0db594 100644
--- a/mysql-test/lib/v1/mtr_process.pl
+++ b/mysql-test/lib/v1/mtr_process.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_report.pl b/mysql-test/lib/v1/mtr_report.pl
index 269b2bb579dd..3e76757bca98 100644
--- a/mysql-test/lib/v1/mtr_report.pl
+++ b/mysql-test/lib/v1/mtr_report.pl
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_stress.pl b/mysql-test/lib/v1/mtr_stress.pl
index 7f92c417271b..c22ba4827d36 100644
--- a/mysql-test/lib/v1/mtr_stress.pl
+++ b/mysql-test/lib/v1/mtr_stress.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_timer.pl b/mysql-test/lib/v1/mtr_timer.pl
index 4fc68afa3644..320b37832a43 100644
--- a/mysql-test/lib/v1/mtr_timer.pl
+++ b/mysql-test/lib/v1/mtr_timer.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mtr_unique.pl b/mysql-test/lib/v1/mtr_unique.pl
index 4e4e720e6892..9a4a8d6f0c71 100644
--- a/mysql-test/lib/v1/mtr_unique.pl
+++ b/mysql-test/lib/v1/mtr_unique.pl
@@ -1,16 +1,23 @@
 # -*- cperl -*-
-# Copyright (c) 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
index b97c420e5eb8..53d503fbeae8 100755
--- a/mysql-test/lib/v1/mysql-test-run.pl
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/mysql-test/lsan.supp b/mysql-test/lsan.supp
new file mode 100644
index 000000000000..7a455c130c7f
--- /dev/null
+++ b/mysql-test/lsan.supp
@@ -0,0 +1,26 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# LSAN suppressions for gcc/clang
+leak:Perl_safesyscalloc
+leak:Perl_safesysmalloc
+leak:Perl_safesysrealloc
diff --git a/mysql-test/mysql-stress-test.pl b/mysql-test/mysql-stress-test.pl
index 0e3b52d7bf55..fe91586d98e4 100755
--- a/mysql-test/mysql-stress-test.pl
+++ b/mysql-test/mysql-stress-test.pl
@@ -1,16 +1,22 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9b49e29381a6..317056bfbe30 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1,16 +1,23 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -78,6 +85,7 @@ BEGIN
 use lib "lib";
 
 use Cwd;
+use Cwd 'abs_path';
 use Getopt::Long;
 use My::File::Path; # Patched version of File::Path
 use File::Basename;
@@ -112,7 +120,7 @@ BEGIN
 $SIG{INT}= sub { mtr_error("Got ^C signal"); };
 
 our $mysql_version_id;
-my $mysql_version_extra;
+our $mysql_version_extra;
 our $glob_mysql_test_dir;
 our $basedir;
 our $bindir;
@@ -137,7 +145,6 @@ BEGIN
 my $start_only;
 
 our $num_tests_for_report;      # for test-progress option
-our $remaining;
 
 my $auth_plugin;                # the path to the authentication test plugin
 
@@ -284,7 +291,7 @@ END
 
 our $opt_check_testcases= 1;
 my $opt_mark_progress;
-our $opt_test_progress;
+our $opt_test_progress= 1;
 my $opt_max_connections;
 our $opt_report_times= 0;
 
@@ -313,7 +320,9 @@ END
 
 our $opt_user = "root";
 
+our $opt_sanitize= 0;
 our $opt_valgrind= 0;
+my $shutdown_report    = 0;
 my $opt_valgrind_mysqld= 0;
 my $opt_valgrind_clients= 0;
 my $opt_valgrind_mysqltest= 0;
@@ -428,9 +437,7 @@ sub main {
 
   #######################################################################
   my $num_tests= @$tests;
-
   $num_tests_for_report = $num_tests * $opt_repeat;
-  $remaining= $num_tests_for_report;
 
   if ( $opt_parallel eq "auto" ) {
     # Try to find a suitable value for number of workers
@@ -458,6 +465,16 @@ sub main {
     $opt_parallel= 1;
   }
 
+  # Shutdown report is one extra test created to report
+  # any failures or crashes during shutdown.
+  $num_tests_for_report = $num_tests_for_report + 1;
+
+  # When either --valgrind or --sanitize option is enabled, a dummy
+  # test is created.
+  if ($opt_valgrind_mysqld or $opt_sanitize) {
+    $num_tests_for_report = $num_tests_for_report + 1;
+  }
+
   # Create server socket on any free port
   my $server = new IO::Socket::INET
     (
@@ -586,17 +603,43 @@ sub main {
 
   push @$completed, run_ctest() if $opt_ctest;
 
-  if ($opt_valgrind_mysqld) {
+  # Create minimalistic "test" for the reporting failures at shutdown
+  my $tinfo = My::Test->new(
+    name      => 'shutdown_report',
+    shortname => 'shutdown_report',
+    );
+
+  # Set dummy worker id to align report with normal tests
+  $tinfo->{worker} = 0 if $opt_parallel > 1;
+  if ($shutdown_report) {
+    $tinfo->{result} = 'MTR_RES_FAILED';
+    $tinfo->{comment} = "Mysqld reported failures at shutdown, see above";
+    $tinfo->{failures} = 1;
+  } else {
+    $tinfo->{result} = 'MTR_RES_PASSED';
+  }
+  mtr_report_test($tinfo);
+  report_option('prev_report_length', 0);
+  push @$completed, $tinfo;
+
+
+  if ($opt_valgrind_mysqld or $opt_sanitize) {
     # Create minimalistic "test" for the reporting
-    my $tinfo = My::Test->new
-      (
-       name           => 'valgrind_report',
-      );
+    my $tinfo = My::Test->new(
+      name      => $opt_valgrind_mysqld ? 'valgrind_report' : 'sanitize_report',
+      shortname => $opt_valgrind_mysqld ? 'valgrind_report' : 'sanitize_report',
+    );
+
     # Set dummy worker id to align report with normal tests
     $tinfo->{worker} = 0 if $opt_parallel > 1;
     if ($valgrind_reports) {
       $tinfo->{result}= 'MTR_RES_FAILED';
-      $tinfo->{comment}= "Valgrind reported failures at shutdown, see above";
+      if ($opt_valgrind_mysqld) {
+        $tinfo->{comment} = "Valgrind reported failures at shutdown, see above";
+      } else {
+        $tinfo->{comment} =
+          "Sanitizer reported failures at shutdown, see above";
+      }
       $tinfo->{failures}= 1;
     } else {
       $tinfo->{result}= 'MTR_RES_PASSED';
@@ -694,13 +737,16 @@ ($$$)
 	      mtr_report(" - skipping '$worker_savedir/'");
 	      rmtree($worker_savedir);
 	    }
-	    else {
-	      rename($worker_savedir, $savedir);
-              #look for the test.log file and put in savedir
-	      my $logf= "$result->{shortname}" . ".log";
-              my $logfilepath= dirname($worker_savedir); 
-              move($logfilepath . "/" . $logf, $savedir);
-	      mtr_report(" - the logfile can be found in '$savedir/$logf'");
+            else
+            {
+              rename($worker_savedir, $savedir) if $worker_savedir ne $savedir;
+
+              # Look for the test log file and put that in savedir location
+              my $logfile= "$result->{shortname}" . ".log";
+              my $logfilepath= dirname($worker_savedir) . "/" . $logfile;
+              move($logfilepath, $savedir);
+              mtr_report(" - the logfile can be found in '$savedir/$logfile'");
+
 	      # Move any core files from e.g. mysqltest
 	      foreach my $coref (glob("core*"), glob("*.dmp"))
 	      {
@@ -769,21 +815,17 @@ ($$$)
 	    # too many times already
 	    my $tname= $result->{name};
 	    my $failures= $result->{failures};
-	    if ($opt_retry > 1 and $failures >= $opt_retry_failure){
+	    if ($opt_retry > 1 and $failures >= $opt_retry_failure)
+            {
 	      mtr_report("\nTest $tname has failed $failures times,",
 			 "no more retries!\n");
 	    }
-	    else {
+	    else
+            {
 	      mtr_report("\nRetrying test $tname, ".
 			 "attempt($retries/$opt_retry)...\n");
-              #saving the log file as filename.failed in case of retry
-              if ( $result->is_failed() ) {
-                my $worker_logdir= $result->{savedir};
-                my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
-                rename $log_file_name,$log_file_name.".failed";
-              }
 	      delete($result->{result});
-	      $result->{retries}= $retries+1;
+	      $result->{retries}= $retries + 1;
 	      $result->write_test($sock, 'TESTCASE');
 	      next;
 	    }
@@ -820,10 +862,15 @@ ($$$)
 	elsif ($line =~ /^SPENT/) {
 	  add_total_times($line);
 	}
-	elsif ($line eq 'VALGREP' && $opt_valgrind) {
+	elsif ($line eq 'VALGREP' && ($opt_valgrind or $opt_sanitize)) {
+          # 'VALGREP' means that the worker found some valgrind reports in the
+          # server logs. This will cause the master to flag the pseudo test
+          # valgrind_report as failed.
 	  $valgrind_reports= 1;
-	}
-	else {
+	} elsif ($line eq 'SRV_CRASH') {
+          # Mysqld detected crash during shutdown
+          $shutdown_report = 1;
+	} else {
 	  mtr_error("Unknown response: '$line' from client");
 	}
 
@@ -1003,10 +1050,15 @@ ($)
     }
     elsif ($line eq 'BYE'){
       mtr_report("Server said BYE");
-      stop_all_servers($opt_shutdown_timeout);
+      my $ret = stop_all_servers($opt_shutdown_timeout);
+      if (defined $ret and $ret != 0) {
+        shutdown_exit_reports();
+        $shutdown_report = 1;
+      }
+      print $server "SRV_CRASH\n" if $shutdown_report;
       mark_time_used('restart');
       my $valgrind_reports= 0;
-      if ($opt_valgrind_mysqld) {
+      if ($opt_valgrind_mysqld or $opt_sanitize) {
         $valgrind_reports= valgrind_exit_reports();
 	print $server "VALGREP\n" if $valgrind_reports;
       }
@@ -1027,6 +1079,60 @@ ($)
   exit(1);
 }
 
+# Search server logs for any crashes during mysqld shutdown
+sub shutdown_exit_reports() {
+  my $found_report  = 0;
+  my $clean_shutdown = 0;
+
+  foreach my $log_file (keys %mysqld_logs) {
+    my @culprits = ();
+    my $crash_rep     = "";
+
+    my $LOGF = IO::File->new($log_file) or
+      mtr_error("Could not open file '$log_file' for reading: $!");
+
+    while (my $line = <$LOGF>) {
+      if ($line =~ /^CURRENT_TEST: (.+)$/) {
+        my $testname = $1;
+        # If we have a report, report it if needed and start new list of tests
+        if ($found_report or $clean_shutdown) {
+          # Make ready to collect new report
+          @culprits     = ();
+          $found_report = 0;
+          $clean_shutdown = 0;
+          $crash_rep = "";
+        }
+        push(@culprits, $testname);
+        next;
+      }
+
+      # Clean shutdown
+      $clean_shutdown = 1 if $line =~ /.*Shutdown completed.*/;
+
+      # Mysqld crash at shutdown
+      $found_report = 1 if ($line =~ /.*Assertion.*/ or $line =~ /.*mysqld got signal.*/
+                            or $line =~ /.*mysqld got exception.*/);
+
+      if ($found_report) {
+        $crash_rep .= $line;
+      }
+    }
+
+    if ($found_report) {
+        mtr_print("Shutdown report from $log_file after tests:\n", @culprits);
+        mtr_print_line();
+        print("$crash_rep\n");
+    } else {
+      # Print last 100 lines of log file since shutdown failed
+      # for some reason.
+      mtr_print("Shutdown report from $log_file after tests:\n", @culprits);
+      mtr_print_line();
+      my $reason = mtr_lastlinesfromfile($log_file, 100) . "\n";
+      print("$reason");
+    }
+    $LOGF = undef;
+  }
+}
 
 sub ignore_option {
   my ($opt, $value)= @_;
@@ -1071,6 +1177,7 @@ sub print_global_resfile {
   resfile_global("debug", $opt_debug ? 1 : 0);
   resfile_global("gcov", $opt_gcov ? 1 : 0);
   resfile_global("gprof", $opt_gprof ? 1 : 0);
+  resfile_global("sanitize", $opt_sanitize ? 1 : 0);
   resfile_global("valgrind", $opt_valgrind ? 1 : 0);
   resfile_global("callgrind", $opt_callgrind ? 1 : 0);
   resfile_global("mem", $opt_mem ? 1 : 0);
@@ -1160,7 +1267,7 @@ sub command_line_setup {
              'record'                   => \$opt_record,
              'check-testcases!'         => \$opt_check_testcases,
              'mark-progress'            => \$opt_mark_progress,
-             'test-progress'            => \$opt_test_progress,
+             'test-progress:1'          => \$opt_test_progress,
 
              # Extra options used when starting mysqld
              'mysqld=s'                 => \@opt_extra_mysqld_opt,
@@ -1204,6 +1311,7 @@ sub command_line_setup {
              # Coverage, profiling etc
              'gcov'                     => \$opt_gcov,
              'gprof'                    => \$opt_gprof,
+             'sanitize'                 => \$opt_sanitize,
              'valgrind|valgrind-all'    => \$opt_valgrind,
 	     'valgrind-clients'         => \$opt_valgrind_clients,
              'valgrind-mysqltest'       => \$opt_valgrind_mysqltest,
@@ -1211,7 +1319,7 @@ sub command_line_setup {
              'valgrind-options=s'       => sub {
 	       my ($opt, $value)= @_;
 	       # Deprecated option unless it's what we know pushbuild uses
-	       if ($value eq "--gen-suppressions=all --show-reachable=yes") {
+	       if (option_equals($value,"--gen-suppressions=all --show-reachable=yes")) {
 		 push(@valgrind_args, $_) for (split(' ', $value));
 		 return;
 	       }
@@ -1440,6 +1548,10 @@ sub command_line_setup {
     }
   }
 
+  if ($opt_test_progress != 0 and $opt_test_progress != 1) {
+    mtr_error("Invalid value '$opt_test_progress' for option 'test-progress'.");
+  }
+
   # disable syslog / EventLog in normal (non-bootstrap) operation.
   push(@opt_extra_mysqld_opt, "--log-syslog=0");
 
@@ -1462,13 +1574,13 @@ sub command_line_setup {
   # --------------------------------------------------------------------------
   foreach my $arg ( @opt_extra_mysqld_opt )
   {
-    if ( $arg =~ /default-storage-engine=(\S+)/ )
+    if ( $arg =~ /default[-_]storage[-_]engine=(\S+)/ )
     {
       # Save this for collect phase
       collect_option('default-storage-engine', $1);
       mtr_report("Using default engine '$1'")
     }
-    if ( $arg =~ /default-tmp-storage-engine=(\S+)/ )
+    if ( $arg =~ /default[-_]tmp-storage[-_]engine=(\S+)/ )
     {
       # Save this for collect phase
       collect_option('default-tmp-storage-engine', $1);
@@ -2359,6 +2471,7 @@ ()
   my $exe;
   # mysql_client_test executable may _not_ exist
   $exe= mtr_exe_maybe_exists(vs_config_dirs('testclients', 'mysql_client_test'),
+                             "$path_client_bindir/mysql_client_test",
 			     "$basedir/testclients/mysql_client_test",
 			     "$basedir/bin/mysql_client_test");
   return "" unless $exe;
@@ -2402,7 +2515,7 @@ ()
    return mtr_args2str($exe, @$args);
  }
 
-sub mysqlpump_arguments ($) {
+sub mysql_pump_arguments ($) {
   my($group_suffix) = @_;
   my $exe= mtr_exe_exists(vs_config_dirs('client/dump','mysqlpump'),
                           "$basedir/client/mysqlpump",
@@ -2419,6 +2532,20 @@ ($)
   client_debug_arg($args, "mysqlpump-$group_suffix");
   return mtr_args2str($exe, @$args);
 }
+
+sub mysqlpump_arguments () {
+  my $exe= mtr_exe_exists(vs_config_dirs('client/dump','mysqlpump'),
+                          "$basedir/client/mysqlpump",
+                          "$path_client_bindir/mysqlpump");
+
+  my $args;
+  mtr_init_args(\$args);
+  if ( $opt_valgrind_clients )
+  {
+    valgrind_client_arguments($args, \$exe);
+  }
+  return mtr_args2str($exe, @$args);
+}
 #
 # Set environment to be used by childs of this process for
 # things that are constant during the whole lifetime of mysql-test-run
@@ -2604,20 +2731,21 @@ sub environment_setup {
   $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
   $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
   $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
+  $ENV{'MYSQL_TEST_DIR_ABS'}= getcwd();
   $ENV{'MYSQL_BINDIR'}=       "$bindir";
   $ENV{'MYSQL_SHAREDIR'}=     $path_language;
   $ENV{'MYSQL_CHARSETSDIR'}=  $path_charsetsdir;
   if (IS_WINDOWS)
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."\\std_data";
-    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
-                              $opt_tmpdir . "\\.mylogin.cnf";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "\\.mylogin.cnf";
+    $ENV{'MYSQLTEST_VARDIR_ABS'}= $opt_vardir;
   }
   else
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."/std_data";
-    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
-                              $opt_tmpdir . "/.mylogin.cnf";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "/.mylogin.cnf";
+    $ENV{'MYSQLTEST_VARDIR_ABS'}= abs_path("$opt_vardir");
   }
     
 
@@ -2693,7 +2821,8 @@ sub environment_setup {
   $ENV{'MYSQL_IMPORT'}=                client_arguments("mysqlimport");
   $ENV{'MYSQL_SHOW'}=                  client_arguments("mysqlshow");
   $ENV{'MYSQL_CONFIG_EDITOR'}=         client_arguments_no_grp_suffix("mysql_config_editor");
-  $ENV{'MYSQL_PUMP'}=                  mysqlpump_arguments(".1");
+  $ENV{'MYSQL_PUMP'}=                  mysql_pump_arguments(".1");
+  $ENV{'MYSQLPUMP'}=                   mysqlpump_arguments();
 
   if (!IS_WINDOWS)
   {
@@ -2762,6 +2891,13 @@ sub environment_setup {
                    "$path_client_bindir/innochecksum",
                    "$basedir/extra/innochecksum");
   $ENV{'INNOCHECKSUM'}= native_path($exe_innochecksum);
+  if ( $opt_valgrind_clients )
+  {
+    my $args;
+    mtr_init_args(\$args);
+    valgrind_client_arguments($args, \$exe_innochecksum);
+    $ENV{'INNOCHECKSUM'}= mtr_args2str($exe_innochecksum, @$args);
+  }
 
   # ----------------------------------------------------
   # Setup env so childs can execute myisampack and myisamchk
@@ -2851,13 +2987,30 @@ sub environment_setup {
   $ENV{'VALGRIND_TEST'}= $opt_valgrind;
 
   # Make sure LeakSanitizer exits if leaks are found
-  $ENV{'LSAN_OPTIONS'}= "exitcode=42";
+  $ENV{'LSAN_OPTIONS'} =
+    "exitcode=42,suppressions=${glob_mysql_test_dir}/lsan.supp"
+    if $opt_sanitize;
+
+  $ENV{'ASAN_OPTIONS'} = "suppressions=${glob_mysql_test_dir}/asan.supp"
+    if $opt_sanitize;
 
   # Add dir of this perl to aid mysqltest in finding perl
   my $perldir= dirname($^X);
   my $pathsep= ":";
   $pathsep= ";" if IS_WINDOWS && ! IS_CYGWIN;
   $ENV{'PATH'}= "$ENV{'PATH'}".$pathsep.$perldir;
+
+  # ----------------------------------------------------
+  # openssl3 helper
+  # ----------------------------------------------------
+  # Provide path to openssl configuration file allowing old TLSv1.0 and TLSv1.1.
+  # In tests that need it add to test cnf-file:
+  #
+  #   [ENV]
+  #   OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
+  #
+  $ENV{'OPENSSL3_LEGACY_TLS_CNF'}=
+    native_path(${glob_mysql_test_dir}."/include/openssl3_legacy_tls.cnf");
 }
 
 
@@ -4040,6 +4193,10 @@ sub mysql_install_db {
   mtr_tofile($bootstrap_sql_file,
              sql_to_bootstrap(mtr_grab_file("include/mtr_check.sql")));
 
+  # Create directories mysql and test
+  mkpath("$install_datadir/mysql");
+  mkpath("$install_datadir/test");
+
   if ( $opt_manual_boot_gdb )
   {
     # The configuration has been set up and user has been prompted for
@@ -4055,10 +4212,6 @@ sub mysql_install_db {
   mtr_tofile($path_bootstrap_log,
 	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");
 
-  # Create directories mysql and test
-  mkpath("$install_datadir/mysql");
-  mkpath("$install_datadir/test");
-
   if ( My::SafeProcess->run
        (
 	name          => "bootstrap",
@@ -4756,7 +4909,11 @@ ($)
 	my $check_res;
 	if ( restart_forced_by_test('force_restart') )
 	{
-	  stop_all_servers($opt_shutdown_timeout);
+	  my $ret = stop_all_servers($opt_shutdown_timeout);
+          if ($ret != 0) {
+            shutdown_exit_reports();
+            $shutdown_report = 1;
+          }
 	}
 	elsif ( $opt_check_testcases and
 	     $check_res= check_testcase($tinfo, "after"))
@@ -5380,7 +5537,7 @@ ($)
 	  return $result;
 	}
 	# Wait for next process to exit
-	next;
+	next if not $result;
       }
       else
       {
@@ -5615,7 +5772,8 @@ ($)
     # In these cases we may want valgrind report from normal termination
     $tinfo->{'dont_kill_server'}= 1;
   }
-  # Shotdown properly if not to be killed (for valgrind)
+
+  # Shutdown properly if not to be killed (for valgrind)
   stop_all_servers($tinfo->{'dont_kill_server'} ? $opt_shutdown_timeout : 0);
 
   $tinfo->{'result'}= 'MTR_RES_FAILED';
@@ -5718,7 +5876,7 @@ ($$$)
   my $mysqld=            shift;
   my $extra_opts=        shift;
 
-  my @defaults = grep(/^--defaults-file=/, @$extra_opts);
+  my @defaults = grep(/^--defaults[-_]file=/, @$extra_opts);
   if (@defaults > 0) {
     mtr_add_arg($args, pop(@defaults))
   }
@@ -5755,9 +5913,6 @@ ($$$)
     mtr_add_arg($args, "--log-output=file");
   }
 
-  # Check if "extra_opt" contains skip-log-bin
-  my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts);
-
   # Indicate to mysqld it will be debugged in debugger
   if ( $glob_debugger )
   {
@@ -5776,6 +5931,7 @@ ($$$)
   my $found_no_console= 0;
   my $found_log_error= 0;
 
+
   # On windows, do not add console if log-error found in .cnf file
   open (CONFIG_FILE, " < $path_config_file") or
     die("Could not open output file $path_config_file");
@@ -5794,6 +5950,7 @@ ($$$)
     # Skip --defaults-file option since it's handled above.
     next if $arg =~ /^--defaults-file/;
 
+
     if ($arg =~ /^--log[-_]error/)
     {
       $found_log_error= 1;
@@ -5808,11 +5965,7 @@ ($$$)
     {
         $found_no_console= 1;
     }
-    elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
-    {
-      ; # Dont add --binlog-format when running without binlog
-    }
-    elsif ($arg eq "--loose-skip-log-bin" and
+    elsif ($arg =~ /--loose[-_]skip[-_]log[-_]bin/ and
            $mysqld->option("log-slave-updates"))
     {
       ; # Dont add --skip-log-bin when mysqld have --log-slave-updates in config
@@ -5940,8 +6093,10 @@ ($$)
   unlink($mysqld->value('pid-file'));
 
   my $output= $mysqld->value('#log-error');
-  # Remember this log file for valgrind error report search
-  $mysqld_logs{$output}= 1 if $opt_valgrind;
+
+  # Remember this log file for valgrind/shutdown error report search
+  $mysqld_logs{$output} = 1;
+
   # Remember data dir for gmon.out files if using gprof
   $gprof_dirs{$mysqld->value('datadir')}= 1 if $opt_gprof;
 
@@ -5988,7 +6143,7 @@ ()
   mtr_verbose("Stopping all servers...");
 
   # Kill all started servers
-  My::SafeProcess::shutdown($shutdown_timeout,
+  my $ret = My::SafeProcess::shutdown($shutdown_timeout,
 			    started(all_servers()));
 
   # Remove pidfiles
@@ -5999,8 +6154,8 @@ ()
   }
 
   # Mark servers as stopped
-  map($_->{proc}= undef, all_servers());
-
+  map($_->{proc} = undef, all_servers());
+  return $ret;
 }
 
 
@@ -6253,17 +6408,18 @@ ($$)
   my ($tinfo, @servers)= @_;
 
   # Remember if we restarted for this test case (count restarts)
-  $tinfo->{'restarted'}= 1;
+  $tinfo->{'restarted'} = 1;
+  my $ret;
 
   if ( join('|', @servers) eq join('|', all_servers()) )
   {
     # All servers are going down, use some kind of order to
     # avoid too many warnings in the log files
 
-   mtr_report("Restarting all servers");
+    mtr_report("Restarting all servers");
 
-    #  mysqld processes
-    My::SafeProcess::shutdown( $opt_shutdown_timeout, started(mysqlds()) );
+    # mysqld processes
+    $ret = My::SafeProcess::shutdown($opt_shutdown_timeout, started(mysqlds()));
 
     # cluster processes
     My::SafeProcess::shutdown( $opt_shutdown_timeout,
@@ -6273,11 +6429,16 @@ ($$)
   {
     mtr_report("Restarting ", started(@servers));
 
-     # Stop only some servers
-    My::SafeProcess::shutdown( $opt_shutdown_timeout,
+    # Stop only some servers
+    my $ret = My::SafeProcess::shutdown( $opt_shutdown_timeout,
 			       started(@servers) );
   }
 
+  if ($ret) {
+    shutdown_exit_reports();
+    $shutdown_report = 1;
+  }
+
   foreach my $server (@servers)
   {
     # Mark server as stopped
@@ -7059,6 +7220,7 @@ sub valgrind_arguments {
 
 #
 # Search server logs for valgrind reports printed at mysqld termination
+# Also search for sanitize reports.
 #
 
 sub valgrind_exit_reports() {
@@ -7071,6 +7233,7 @@ ()
     my $found_report= 0;
     my $err_in_report= 0;
     my $ignore_report= 0;
+    my $tool_name= $opt_sanitize ? "Sanitizer" : "Valgrind";
 
     my $LOGF = IO::File->new($log_file)
       or mtr_error("Could not open file '$log_file' for reading: $!");
@@ -7085,7 +7248,7 @@ ()
         {
           if ($err_in_report)
           {
-            mtr_print ("Valgrind report from $log_file after tests:\n",
+            mtr_print ("$tool_name report from $log_file after tests:\n",
                         @culprits);
             mtr_print_line();
             print ("$valgrind_rep\n");
@@ -7102,9 +7265,13 @@ ()
       }
       # This line marks a report to be ignored
       $ignore_report=1 if $line =~ /VALGRIND_DO_QUICK_LEAK_CHECK/;
+
       # This line marks the start of a valgrind report
       $found_report= 1 if $line =~ /^==\d+== .* SUMMARY:/;
 
+      # This line marks the start of ASAN memory leaks
+      $found_report = 1 if $line =~ /^==\d+==ERROR:.*/;
+
       if ($ignore_report && $found_report) {
         $ignore_report= 0;
         $found_report= 0;
@@ -7114,6 +7281,7 @@ ()
         $line=~ s/^==\d+== //;
         $valgrind_rep .= $line;
         $err_in_report= 1 if $line =~ /ERROR SUMMARY: [1-9]/;
+        $err_in_report= 1 if $line =~ /^==\d+==ERROR:.*/;
         $err_in_report= 1 if $line =~ /definitely lost: [1-9]/;
         $err_in_report= 1 if $line =~ /possibly lost: [1-9]/;
         $err_in_report= 1 if $line =~ /still reachable: [1-9]/;
@@ -7123,7 +7291,7 @@ ()
     $LOGF= undef;
 
     if ($err_in_report) {
-      mtr_print ("Valgrind report from $log_file after tests:\n", @culprits);
+      mtr_print ("$tool_name report from $log_file after tests:\n", @culprits);
       mtr_print_line();
       print ("$valgrind_rep\n");
       $found_err= 1;
@@ -7324,7 +7492,8 @@ ($)
   record TESTNAME       (Re)genereate the result file for TESTNAME
   check-testcases       Check testcases for sideeffects
   mark-progress         Log line number and elapsed time to <testname>.progress
-  test-progress         Print the percentage of tests completed
+  test-progress[={0|1}] Print the percentage of tests completed. This setting
+                        is enabled by default.
 
 Options that pass on options (these may be repeated)
 
@@ -7474,6 +7643,9 @@ ($)
   xml-report=FILE       Generate a XML report file compatible with JUnit.
   summary-report=FILE   Generate a plain text file of the test summary only,
                         suitable for sending by email.
+  sanitize              Scan server log files for warnings from various
+                        sanitizers. Assumes that you have built with
+                        -DWITH_ASAN.
 
 Some options that control enabling a feature for normal test runs,
 can be turned off by prepending 'no' to the option, e.g. --notimer.
diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/r/alter_table-big.result
index d1ec258873f0..687c77b1b363 100644
--- a/mysql-test/r/alter_table-big.result
+++ b/mysql-test/r/alter_table-big.result
@@ -75,3 +75,52 @@ master-bin.000001	#	Query	#	#	use `test`; alter table t2 change c vc varchar(100
 master-bin.000001	#	Query	#	#	use `test`; rename table t1 to t3
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t3` /* generated by server */
 End of 5.1 tests
+#
+# BUG#29375764: SIMPLE ALTER CAUSE UNNECESSARY INNODB INDEX REBUILDS,
+#               5.7.23 OR LATER 5.7 RLSES
+#
+# Copy the zipped 5.7.22 data directory and unzip it.
+# Restart the server with the 5.7.22 data directory.
+# UPGRADE
+mysql.columns_priv                                 OK
+mysql.db                                           OK
+mysql.engine_cost                                  OK
+mysql.event                                        OK
+mysql.func                                         OK
+mysql.general_log                                  OK
+mysql.gtid_executed                                OK
+mysql.help_category                                OK
+mysql.help_keyword                                 OK
+mysql.help_relation                                OK
+mysql.help_topic                                   OK
+mysql.innodb_index_stats                           OK
+mysql.innodb_table_stats                           OK
+mysql.ndb_binlog_index                             OK
+mysql.plugin                                       OK
+mysql.proc                                         OK
+mysql.procs_priv                                   OK
+mysql.proxies_priv                                 OK
+mysql.server_cost                                  OK
+mysql.servers                                      OK
+mysql.slave_master_info                            OK
+mysql.slave_relay_log_info                         OK
+mysql.slave_worker_info                            OK
+mysql.slow_log                                     OK
+mysql.tables_priv                                  OK
+mysql.time_zone                                    OK
+mysql.time_zone_leap_second                        OK
+mysql.time_zone_name                               OK
+mysql.time_zone_transition                         OK
+mysql.time_zone_transition_type                    OK
+mysql.user                                         OK
+my_db.t1                                           OK
+sys.sys_config                                     OK
+SET DEBUG="+d, assert_index_def_has_no_pack_flag";
+# Without the patch, an assert is triggered, indicating that index definitions
+# have changed that would result in a index rebuild.
+ALTER TABLE my_db.t1 COMMENT "No index rebuild necessary";
+# CLEANUP
+DROP TABLE my_db.t1;
+DROP DATABASE my_db;
+# Remove copied files and directories.
+# Restart server with default options.
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index f91e0b3bf60a..c9471b812560 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -3683,3 +3683,159 @@ ERROR 22004: Invalid use of NULL value
 ALTER TABLE t2 MODIFY fld0 POINT NOT NULL;
 ERROR 22004: Invalid use of NULL value
 DROP TABLE t1, t2;
+#
+# BUG#26848813: INDEXED COLUMN CAN'T BE CHANGED FROM VARCHAR(15)
+#               TO VARCHAR(40) INSTANTANEOUSLY
+SET @orig_sql_mode= @@sql_mode;
+SET @orig_innodb_large_prefix= @@global.innodb_large_prefix;
+SET GLOBAL innodb_large_prefix= ON;
+Warnings:
+Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
+# Tests where an error is reported under strict mode when the index
+# limit exceeds the maximum supported length by SE.
+CREATE TABLE t1 (fld1 VARCHAR(768), KEY(fld1)) CHARSET latin1 ENGINE =InnoDB
+ROW_FORMAT= COMPACT;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+CREATE TABLE t2 (fld1 VARCHAR(3073), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+# Test with innodb prefix indexes where the index limit is 767 bytes
+CREATE TABLE t1 (fld1 VARCHAR(767), KEY(fld1)) CHARSET latin1 ENGINE=INNODB
+ROW_FORMAT=COMPACT;
+ALTER TABLE t1 MODIFY fld1 VARCHAR(768), ALGORITHM= INPLACE;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+ALTER TABLE t1 MODIFY fld1 VARCHAR(768), ALGORITHM= COPY;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+# Test with innodb prefix indexes where the index limit is 3072 bytes
+CREATE TABLE t2 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE=INNODB
+ROW_FORMAT=DYNAMIC;
+ALTER TABLE t2 MODIFY fld1 VARCHAR(3073), ALGORITHM= INPLACE;
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+ALTER TABLE t2 MODIFY fld1 VARCHAR(3073), ALGORITHM= COPY;
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+# Tests with innodb_large_prefix disabled and strict mode.
+SET GLOBAL innodb_large_prefix= OFF;
+Warnings:
+Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
+CREATE TABLE t3 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+DROP TABLE t1, t2;
+SET sql_mode= '';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SET GLOBAL innodb_large_prefix= ON;
+Warnings:
+Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
+# Test where the indexes are truncated to fit the index limit and
+# a warning is reported under non-strict mode when the index exceeds
+# the SE limit.
+CREATE TABLE t1 (fld1 VARCHAR(768), KEY(fld1)) ENGINE= InnoDB
+ROW_FORMAT=COMPACT;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+CREATE TABLE t2 (fld1 VARCHAR(3073), KEY(fld1)) ENGINE= InnoDB;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+# Test with innodb prefix indexes where the index limit is 767 bytes.
+CREATE TABLE t3 (fld1 VARCHAR(767), KEY(fld1))ENGINE=INNODB ROW_FORMAT=COMPACT;
+ALTER TABLE t3 MODIFY fld1 VARCHAR(768), ALGORITHM= INPLACE;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+ALTER TABLE t3 MODIFY fld1 VARCHAR(800), ALGORITHM= COPY;
+# Test with innodb prefix indexes where the index limit is 3072 bytes.
+CREATE TABLE t4 (fld1 VARCHAR(3072), KEY(fld1))ENGINE=INNODB
+ROW_FORMAT=DYNAMIC;
+ALTER TABLE t4 MODIFY fld1 VARCHAR(3073), ALGORITHM= INPLACE;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+ALTER TABLE t4 MODIFY fld1 VARCHAR(3074), ALGORITHM= COPY;
+# For unique and primary keys, an error is reported even in non-strict
+# mode.
+CREATE TABLE t5(fld1 VARCHAR(768) PRIMARY KEY) ENGINE= InnoDB
+ROW_FORMAT=COMPACT;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+CREATE TABLE t5(fld1 VARCHAR(3073), UNIQUE KEY(fld1)) ENGINE= InnoDB;
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+# Tests with innodb_large_prefix disabled and strict mode.
+SET GLOBAL innodb_large_prefix= OFF;
+Warnings:
+Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
+CREATE TABLE t5 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+DROP TABLE t1, t2, t3, t4, t5;
+SET sql_mode= @orig_sql_mode;
+SET GLOBAL innodb_large_prefix= ON;
+# Tests added for coverage.
+CREATE TABLE t1(fld1 VARCHAR(3), KEY(fld1)) ENGINE=MYISAM;
+# Conversion of unpacked keys to packed keys reports
+# error for INPLACE Alter.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(10), ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+# Succeeds with index rebuild.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(10), ALGORITHM=COPY;
+# Succeeds since the row format is dynamic.
+CREATE TABLE t2(fld1 VARCHAR(768), KEY(fld1)) ENGINE= InnoDB ROW_FORMAT= DYNAMIC;
+# An error is reported when the index exceeds the column size
+# in both strict and non-strict mode.
+ALTER TABLE t2 ADD INDEX idx1(fld1(769));
+ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys
+SET sql_mode= '';
+ALTER TABLE t2 ADD INDEX idx1(fld1(769));
+ERROR HY000: Incorrect prefix key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique prefix keys
+# Cleanup.
+DROP TABLE t1, t2;
+SET sql_mode= @orig_sql_mode;
+SET GLOBAL innodb_large_prefix= @orig_innodb_large_prefix;
+#
+# BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS
+#
+SET GLOBAL max_allowed_packet=17825792;
+CREATE TABLE t1 (t1_fld1 TEXT) ENGINE=InnoDB;
+CREATE TABLE t2 (t2_fld1 MEDIUMTEXT) ENGINE=InnoDB;
+CREATE TABLE t3 (t3_fld1 LONGTEXT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (REPEAT('a',300));
+INSERT INTO t2 VALUES (REPEAT('b',65680));
+INSERT INTO t3 VALUES (REPEAT('c',16777300));
+SELECT LENGTH(t1_fld1) FROM t1;
+LENGTH(t1_fld1)
+300
+SELECT LENGTH(t2_fld1) FROM t2;
+LENGTH(t2_fld1)
+65680
+SELECT LENGTH(t3_fld1) FROM t3;
+LENGTH(t3_fld1)
+16777300
+# With strict mode
+SET SQL_MODE='STRICT_ALL_TABLES';
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+ERROR 22001: Data too long for column 'my_t1_fld1' at row 1
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+ERROR 22001: Data too long for column 'my_t2_fld1' at row 1
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+ERROR 22001: Data too long for column 'my_t3_fld1' at row 1
+# With non-strict mode
+SET SQL_MODE='';
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t1_fld1' at row 1
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t2_fld1' at row 1
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t3_fld1' at row 1
+SELECT LENGTH(my_t1_fld1) FROM t1;
+LENGTH(my_t1_fld1)
+44
+SELECT LENGTH(my_t2_fld1) FROM t2;
+LENGTH(my_t2_fld1)
+144
+SELECT LENGTH(my_t3_fld1) FROM t3;
+LENGTH(my_t3_fld1)
+84
+DROP TABLE t1, t2, t3;
+SET SQL_MODE=default;
+SET GLOBAL max_allowed_packet=default;
diff --git a/mysql-test/r/ansi.result b/mysql-test/r/ansi.result
index 8ceca9c2b623..3070a5300371 100644
--- a/mysql-test/r/ansi.result
+++ b/mysql-test/r/ansi.result
@@ -2,6 +2,7 @@ drop table if exists t1;
 set sql_mode="MySQL40";
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MYSQL40' is deprecated. It will be removed in a future release.
 select @@sql_mode;
 @@sql_mode
 MYSQL40,HIGH_NOT_PRECEDENCE
@@ -27,6 +28,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`i`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 SET @@SQL_MODE="MYSQL323";
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL323' is deprecated. It will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -34,6 +37,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`i`)
 ) TYPE=ENGINE
 SET @@SQL_MODE="MYSQL40";
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL40' is deprecated. It will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -41,6 +46,8 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`i`)
 ) TYPE=ENGINE
 SET @@SQL_MODE="NO_FIELD_OPTIONS";
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/audit_plugin_bugs.result b/mysql-test/r/audit_plugin_bugs.result
deleted file mode 100644
index fe7948b7da71..000000000000
--- a/mysql-test/r/audit_plugin_bugs.result
+++ /dev/null
@@ -1,37 +0,0 @@
-call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
-#
-# Bug #22142209: MY_MESSAGE FAILS TO ABORT MYSQL_AUDIT_SERVER_STARTUP_CLASS EVENT
-#
-# Shutdown the server
-# Load the plugin at startup and abort on STARTUP with default message
-# Search for default abort message
-# Load the plugin at startup and abort on STARTUP event with custom message
-# Search for custom abort message
-# Startup the server
-#
-# Bug #22136709: INFINITE RECURSION BY CALLING MY_MESSAGE FROM
-#   MYSQL_AUDIT_GENERAL_CLASS HANDLER
-INSTALL PLUGIN null_audit SONAME 'adt_null.so';
-SET @@GLOBAL.null_audit_event_order_check= "MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET";
-SET @@GLOBAL.null_audit_abort_message= "Abort message.";
-# Try to enter error state recursively 2 times.
-SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 2;
-connect(localhost,wrong_root,,test,MASTER_PORT,MASTER_SOCKET);
-ERROR 28000: Access denied for user 'wrong_root'@'localhost' (using password: NO)
-SELECT @@null_audit_event_order_check_consume_ignore_count;
-@@null_audit_event_order_check_consume_ignore_count
-0
-# Try to enter error state infinitely. my_message calls cause stack overrun.
-SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 10000;
-connect(localhost,wrong_root,,test,MASTER_PORT,MASTER_SOCKET);
-SELECT @@null_audit_event_order_check_consume_ignore_count;
-@@null_audit_event_order_check_consume_ignore_count
-0
-SET @@GLOBAL.null_audit_event_order_check= NULL;
-SET @@GLOBAL.null_audit_abort_message= NULL;
-SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 0;
-End of 5.7 tests
-# cleanup
-UNINSTALL PLUGIN null_audit;
-Warnings:
-Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result
index 8c1195c769f2..e12883e2daee 100644
--- a/mysql-test/r/bigint.result
+++ b/mysql-test/r/bigint.result
@@ -550,4 +550,31 @@ SELECT 184467440737095 >= 0;
 SELECT 0 <= 18446744073709551500;
 0 <= 18446744073709551500
 1
+#
+# Bug#22501606 SELECT CAST(100 AS UNSIGNED) BETWEEN 1 AND -1 RETURNS TRUE
+# Bug#79857 select cast(100 as unsigned) between 1 and -1 returns true
+#
+SELECT CAST(100 AS UNSIGNED) BETWEEN 1 AND -1;
+CAST(100 AS UNSIGNED) BETWEEN 1 AND -1
+0
+SELECT CAST(100 AS UNSIGNED) NOT BETWEEN 1 AND -1;
+CAST(100 AS UNSIGNED) NOT BETWEEN 1 AND -1
+1
+SELECT CAST(0 AS UNSIGNED) BETWEEN 0 AND -1;
+CAST(0 AS UNSIGNED) BETWEEN 0 AND -1
+0
+SELECT CAST(0 AS UNSIGNED) NOT BETWEEN 0 AND -1;
+CAST(0 AS UNSIGNED) NOT BETWEEN 0 AND -1
+1
+#
+# Bug #27691347: BETWEEN CLAUSE RETURNS INCOHERENT RESULTS COMPARING
+#                NEGATIVE VALUES
+CREATE TABLE Reservation (id BIGINT UNSIGNED NOT NULL,
+transaction_id BIGINT UNSIGNED NOT NULL DEFAULT '0',
+KEY transaction_id_idx (transaction_id));
+INSERT INTO Reservation(id, transaction_id) VALUES(1, 1);
+SELECT COUNT(*) FROM Reservation WHERE transaction_id BETWEEN -2 AND -1;
+COUNT(*)
+0
+DROP TABLE Reservation;
 SET sql_mode = default;
diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result
index e8531e793536..51ecf55c5a7d 100644
--- a/mysql-test/r/binary.result
+++ b/mysql-test/r/binary.result
@@ -167,6 +167,9 @@ index idx(a)
 INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029087575');
 INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029082020');
 INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029080707');
+ANALYZE table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT hex(a) FROM t1 order by a;
 hex(a)
 1F9480179366F2BF567E1C4B964C1EF029080707
diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result
index fd240bdf6eb5..6e7a1de63ce8 100644
--- a/mysql-test/r/compare.result
+++ b/mysql-test/r/compare.result
@@ -122,3 +122,36 @@ CREATE TABLE t1(a INT ZEROFILL);
 SELECT 1 FROM t1 WHERE t1.a IN (1, t1.a) AND t1.a=2;
 1
 DROP TABLE t1;
+SET NAMES utf8;
+CREATE TABLE t1(id INT, plage TIME, plage2 DATETIME) ENGINE=InnoDB CHARSET=utf8;
+INSERT INTO t1 VALUES(1,'00:00:00', '2018-04-20 00:00:00');
+SELECT (date_format(plage2,'%H:%i:%s')) < plage FROM t1;
+(date_format(plage2,'%H:%i:%s')) < plage
+0
+SELECT plage > (date_format(plage2,'%H:%i:%s')) FROM t1;
+plage > (date_format(plage2,'%H:%i:%s'))
+0
+SELECT (date_format(plage2,'%H:%i:%s')) < plage COLLATE utf8_general_ci FROM t1;
+(date_format(plage2,'%H:%i:%s')) < plage COLLATE utf8_general_ci
+0
+DROP TABLE t1;
+SET NAMES default;
+
+Bug #27452148: ASSERTION FAILED: (SLEN % 4) == 0 IN
+MY_STRNNCOLLSP_UTF32_BIN
+
+SET NAMES latin1;
+CREATE TABLE t1(a CHAR(10) CHARACTER SET utf32 COLLATE utf32_bin);
+INSERT INTO t1 VALUES('a'),('b'),('c');
+SELECT ROW('1', '1') > ROW(a, '1') FROM t1;
+ROW('1', '1') > ROW(a, '1')
+0
+0
+0
+SELECT ROW(a, '1') > ROW('1', '1') FROM t1;
+ROW(a, '1') > ROW('1', '1')
+1
+1
+1
+DROP TABLE t1;
+SET NAMES default;
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index a0f7d52b3b25..8985312724be 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -344,3 +344,32 @@ DROP USER wl6587@localhost;
 # ------------------------------------------------------------------
 # -- End of 5.6 tests
 # ------------------------------------------------------------------
+#
+# BUG#27539838: NOT ALL ABORTED CONNECTS ARE REPORTED TO ERROR.LOG
+#               PROPERLY
+#
+# restart: --log-error=LOG_ERR --log-error-verbosity=3
+SHOW STATUS LIKE 'Aborted_connects';
+Variable_name	Value
+Aborted_connects	0
+
+# Case 1: Connection attempt by an invalid user
+connect(localhost,newuser,,test,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'newuser'@'localhost' (using password: NO)
+
+# Case 2: Connection attempt by a valid user with incorrect password
+connect(localhost,root,1234,test,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
+CREATE DATABASE test1;
+CREATE USER 'new1'@'localhost';
+
+# Case 3: Connection attempt by a valid user with no privileges to access a database
+connect(localhost,new1,,test1,MASTER_PORT,MASTER_SOCKET);
+ERROR 42000: Access denied for user 'new1'@'localhost' to database 'test1'
+
+# Case 4: SSL connection attempt without necessary certificates
+SHOW STATUS LIKE 'Aborted_connects';
+Variable_name	Value
+Aborted_connects	4
+DROP USER 'new1'@'localhost';
+DROP DATABASE test1;
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 57e533332a9b..0a5ae112376d 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1882,3 +1882,198 @@ DROP DATABASE db_with_tables_and_an_unrelated_file_in_data_directory;
 DROP DATABASE db_created_with_mkdir_and_an_unrelated_file_in_data_directory;
 ERROR HY000: Error dropping database (can't rmdir './db_created_with_mkdir_and_an_unrelated_file_in_data_directory/', errno: 17)
 DROP DATABASE db_created_with_mkdir_and_an_unrelated_file_in_data_directory;
+#
+# BUG 27516741 - MYSQL SERVER DOES NOT WRITE INNODB ROW_TYPE
+#                TO .FRM FILE WHEN DEFAULT USED
+# Set up.
+SET @saved_innodb_default_row_format= @@global.innodb_default_row_format;
+SET @saved_show_create_table_verbosity= @@session.show_create_table_verbosity;
+# Current InnoDB default row format and 'show_create_table_verbosity'
+# values respectively.
+SELECT @@global.innodb_default_row_format;
+@@global.innodb_default_row_format
+dynamic
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+CREATE TABLE t1(fld1 INT) ENGINE= InnoDB;
+CREATE TABLE t2(fld1 INT) ENGINE= InnoDB, ROW_FORMAT= DEFAULT;
+SET GLOBAL innodb_default_row_format= 'COMPACT';
+CREATE TABLE t3(fld1 INT) ENGINE= InnoDB;
+CREATE TABLE t4(fl1 INT) ENGINE= InnoDB, ROW_FORMAT= COMPRESSED;
+# Test without show_create_table_verbosity enabled.
+# Row format used is not displayed for all tables
+# except t4 where it is explicitly specified.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t4;
+Table	Create Table
+t4	CREATE TABLE `t4` (
+  `fl1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
+# Test with show_create_table_verbosity enabled.
+# Row format used is displayed for all tables.
+SET SESSION show_create_table_verbosity= ON;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
+SHOW CREATE TABLE t4;
+Table	Create Table
+t4	CREATE TABLE `t4` (
+  `fl1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
+SET GLOBAL innodb_default_row_format= 'DYNAMIC';
+SET SESSION show_create_table_verbosity= OFF;
+# Test with corresponding temporary tables.
+CREATE TEMPORARY TABLE t1(fld1 INT) ENGINE= InnoDB;
+CREATE TEMPORARY TABLE t2(fld1 INT) ENGINE= InnoDB, ROW_FORMAT= DEFAULT;
+SET GLOBAL innodb_default_row_format= 'COMPACT';
+CREATE TEMPORARY TABLE t3(fld1 INT) ENGINE= InnoDB;
+CREATE TEMPORARY TABLE t4(fl1 INT) ENGINE= InnoDB, ROW_FORMAT= COMPRESSED;
+# Test without show_create_table_verbosity enabled.
+# Row format used is not displayed for all tables
+# except t4 where it is explicitly specified.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TEMPORARY TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TEMPORARY TABLE `t3` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t4;
+Table	Create Table
+t4	CREATE TEMPORARY TABLE `t4` (
+  `fl1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
+# Test with show_create_table_verbosity enabled.
+# Row format used is displayed for all tables.
+SET SESSION show_create_table_verbosity= ON;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TEMPORARY TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TEMPORARY TABLE `t3` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
+SHOW CREATE TABLE t4;
+Table	Create Table
+t4	CREATE TEMPORARY TABLE `t4` (
+  `fl1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
+# Clean up.
+DROP TABLE t1, t2, t3, t4;
+DROP TABLE t1, t2, t3, t4;
+SET GLOBAL innodb_default_row_format= @saved_innodb_default_row_format;
+SET SESSION show_create_table_verbosity= @saved_show_create_table_verbosity;
+#
+# Bug#28022129: NOW() DOESN?T HONOR NO_ZERO_DATE SQL_MODE
+#
+SET @saved_mode= @@sql_mode;
+CREATE TABLE t1(fld1 int);
+# NO_ZERO_DATE and STRICT SQL mode.
+CREATE TABLE t2 SELECT fld1, CURDATE() fld2 FROM t1;
+CREATE TABLE t3 AS SELECT now();
+# With patch, zero date is not generated as default.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL,
+  `fld2` date NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `now()` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t2, t3;
+SET SQL_MODE= "NO_ZERO_DATE";
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+# NO_ZERO_DATE SQL mode.
+CREATE TABLE t2 SELECT fld1, CURDATE() fld2 FROM t1;
+CREATE TABLE t3 AS SELECT now();
+# Zero date is generated as default in non strict mode.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL,
+  `fld2` date NOT NULL DEFAULT '0000-00-00'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `now()` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1, t2, t3;
+SET SQL_MODE= DEFAULT;
+# Test cases added for coverage.
+CREATE TABLE t1(fld1 DATETIME NOT NULL DEFAULT '1111:11:11');
+# CREATE TABLE..SELECT using fields of another table.
+CREATE TABLE t2 AS SELECT * FROM t1;
+# Default value is copied from the source table column.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `fld1` datetime NOT NULL DEFAULT '1111-11-11 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
+# CREATE TABLE..SELECT based on trigger fields.
+CREATE TABLE t1 (fld1 INT, fld2 DATETIME DEFAULT '1211:1:1');
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1
+FOR EACH ROW
+BEGIN
+CREATE TEMPORARY TABLE t2 AS SELECT NEW.fld1, NEW.fld2;
+END
+|
+INSERT INTO t1 VALUES (1, '1111:11:11');
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `fld1` int(11) DEFAULT NULL,
+  `fld2` datetime DEFAULT '1211-01-01 00:00:00'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1;
+DROP TEMPORARY TABLE t2;
+SET SQL_MODE= @saved_mode;
diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index d700d13ee963..bda34adc7f3a 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@@ -1706,7 +1706,7 @@ Warning	1292	Truncated incorrect BINARY(0) value: '1.'
 #
 #
 # WL#1213 Implement 4-byte UTF8, UTF16 and UTF32
-# Testing that only utf8mb4 is superset for utf8
+# Testing that utf8mb4 and utf32 are superset for all Unicode
 # No other Unicode character set pairs have superset/subset relations
 #
 CREATE TABLE t1 (
@@ -1725,40 +1725,52 @@ ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (ucs2_gene
 SELECT CHARSET(CONCAT(utf8, utf16)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf8, utf32)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf8, utf32))
+utf32
 SELECT CHARSET(CONCAT(utf8mb4, utf8)) FROM t1;
 CHARSET(CONCAT(utf8mb4, utf8))
 utf8mb4
 SELECT CHARSET(CONCAT(utf8mb4, ucs2)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf8mb4, ucs2))
+utf8mb4
 SELECT CHARSET(CONCAT(utf8mb4, utf16)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf8mb4, utf16))
+utf8mb4
 SELECT CHARSET(CONCAT(utf8mb4, utf32)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf8mb4, utf32))
+utf8mb4
 SELECT CHARSET(CONCAT(ucs2, utf8)) FROM t1;
 ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(ucs2, utf8mb4)) FROM t1;
-ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(ucs2, utf8mb4))
+utf8mb4
 SELECT CHARSET(CONCAT(ucs2, utf16)) FROM t1;
 ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(ucs2, utf32)) FROM t1;
-ERROR HY000: Illegal mix of collations (ucs2_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(ucs2, utf32))
+utf32
 SELECT CHARSET(CONCAT(utf16, utf8)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf16, ucs2)) FROM t1;
 ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
 SELECT CHARSET(CONCAT(utf16, utf8mb4)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf16, utf8mb4))
+utf8mb4
 SELECT CHARSET(CONCAT(utf16, utf32)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf16_general_ci,IMPLICIT) and (utf32_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf16, utf32))
+utf32
 SELECT CHARSET(CONCAT(utf32, utf8)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf32, utf8))
+utf32
 SELECT CHARSET(CONCAT(utf32, ucs2)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (ucs2_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf32, ucs2))
+utf32
 SELECT CHARSET(CONCAT(utf32, utf8mb4)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf8mb4_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf32, utf8mb4))
+utf32
 SELECT CHARSET(CONCAT(utf32, utf16)) FROM t1;
-ERROR HY000: Illegal mix of collations (utf32_general_ci,IMPLICIT) and (utf16_general_ci,IMPLICIT) for operation 'concat'
+CHARSET(CONCAT(utf32, utf16))
+utf32
 DROP TABLE t1;
 #
 # Bug#58321 No warning when characters outside BMP0 is converted to UCS2
diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result
index 191e1adf9b45..66e7068e0509 100644
--- a/mysql-test/r/ctype_uca.result
+++ b/mysql-test/r/ctype_uca.result
@@ -7125,7 +7125,9 @@ DROP TABLE t1;
 # Bug #16204175 : COLLATION NAME MISSING FROM LOG MESSAGES
 #                 ABOUT LDML DEFINITION PROBLEMS
 #
-# restart
+#
+# Restart the server with a collation with invalid grammar rules.
+# restart:--character-sets-dir=MYSQL_TEST_DIR/std_data/bug16204175/
 # Check whether the new collation is loaded after restart
 SHOW COLLATION LIKE 'utf8_test';
 Collation	Charset	Id	Default	Compiled	Sortlen
@@ -7136,7 +7138,9 @@ ERROR HY000: Unknown collation: 'utf8_test'
 # Below error is caused as a result of this test. The error message
 # contains collation name which is added as a part of the fix.
 call mtr.add_suppression("Shift expected at '' for COLLATION : utf8_test");
-# restart
+#
+# Restart server with original character sets dir:
+# restart:--character-sets-dir=MYSQL_CHARSETSDIR
 #
 # End of 5.6 tests
 #
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index 4da1acf58c04..5701e992bcec 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -25,7 +25,6 @@ STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T')
 NULL
 Warnings:
 Warning	1411	Incorrect time value: '22.30.61' for function str_to_date
-Warning	1411	Incorrect datetime value: '2004.12.12 22.30.61' for function str_to_date
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
@@ -390,7 +389,6 @@ str_to_date('15-01-2001 12:59:59', GET_FORMAT(DATE,'USA'))
 NULL
 Warnings:
 Warning	1411	Incorrect datetime value: '15-01-2001 12:59:59' for function str_to_date
-Warning	1411	Incorrect datetime value: '15-01-2001 12:59:59' for function str_to_date
 explain extended select makedate(1997,1), addtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002"),subtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002"),timediff("01.01.97 11:59:59.000001 PM","31.12.95 11:59:59.000002 PM"),cast(str_to_date("15-01-2001 12:59:59", "%d-%m-%Y %H:%i:%S") as TIME), maketime(23,11,12),microsecond("1997-12-31 23:59:59.000001");
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -488,16 +486,12 @@ drop table t1;
 select str_to_date( 1, NULL );
 str_to_date( 1, NULL )
 NULL
-Warnings:
-Warning	1411	Incorrect datetime value: '1' for function str_to_date
 select str_to_date( NULL, 1 );
 str_to_date( NULL, 1 )
 NULL
 select str_to_date( 1, IF(1=1,NULL,NULL) );
 str_to_date( 1, IF(1=1,NULL,NULL) )
 NULL
-Warnings:
-Warning	1411	Incorrect datetime value: '1' for function str_to_date
 SELECT TIME_FORMAT("24:00:00", '%r');
 TIME_FORMAT("24:00:00", '%r')
 12:00:00 AM
@@ -618,3 +612,90 @@ Warning	1411	Incorrect datetime value: '1' for function str_to_date
 do timestamp(date_format('2011-11-11', right("12345" + 1, 3)));
 Warnings:
 Warning	1292	Incorrect datetime value: '346'
+#
+# Bug #25949639: DATE FORMAT 'YYYYMMDD' ISN'T RECOGNIZED IN LEFT JOIN
+#
+CREATE TABLE t1 (a varchar(10), PRIMARY KEY (a));
+CREATE TABLE t2 (a varchar(10), b date, PRIMARY KEY(a,b));
+CREATE TABLE t3 (a varchar(10), b TIME, PRIMARY KEY(a,b));
+INSERT INTO t1 VALUES ('test1');
+INSERT INTO t2 VALUES
+('test1','2016-12-13'),('test1','2016-12-14'),('test1','2016-12-15');
+INSERT INTO t3 VALUES
+('test1','11:13:14'), ('test1','12:13:14'), ('test1','10:13:14');
+EXPLAIN SELECT *
+FROM t1 LEFT JOIN t2
+ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY	PRIMARY	12	const	1	100.00	Using index
+1	SIMPLE	t2	NULL	const	PRIMARY	PRIMARY	15	const,const	1	100.00	Using index
+Warnings:
+Note	1003	/* select#1 */ select 'test1' AS `a`,'test1' AS `a`,'2016-12-13' AS `b` from `test`.`t1` left join `test`.`t2` on((multiple equal('test1', 'test1') and multiple equal('20161213', '2016-12-13'))) where 1
+EXPLAIN SELECT *
+FROM t1 LEFT JOIN t2 IGNORE INDEX(PRIMARY)
+ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY	PRIMARY	12	const	1	100.00	Using index
+1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select 'test1' AS `a`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t1` left join `test`.`t2` IGNORE INDEX (PRIMARY) on(((`test`.`t2`.`b` = '20161213') and (`test`.`t2`.`a` = 'test1'))) where 1
+SELECT *
+FROM t1 LEFT JOIN t2
+ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+a	a	b
+test1	test1	2016-12-13
+SELECT *
+FROM t1 LEFT JOIN t2 IGNORE INDEX(PRIMARY)
+ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+a	a	b
+test1	test1	2016-12-13
+SELECT b, b = '20161213',
+CASE b WHEN '20161213' then 'found' ELSE 'not found' END FROM t2;
+b	b = '20161213'	CASE b WHEN '20161213' then 'found' ELSE 'not found' END
+2016-12-13	1	found
+2016-12-14	0	not found
+2016-12-15	0	not found
+SELECT b, b IN ('20161213'), b in ('20161213', 0) FROM t2;
+b	b IN ('20161213')	b in ('20161213', 0)
+2016-12-13	1	1
+2016-12-14	0	0
+2016-12-15	0	0
+SELECT b, b = '121314',
+CASE b WHEN '121314' then 'found' ELSE 'not found' END FROM t3;
+b	b = '121314'	CASE b WHEN '121314' then 'found' ELSE 'not found' END
+10:13:14	0	not found
+11:13:14	0	not found
+12:13:14	1	found
+SELECT b, b in ('121314'), b in ('121314', 0) FROM t3;
+b	b in ('121314')	b in ('121314', 0)
+10:13:14	0	0
+11:13:14	0	0
+12:13:14	1	1
+DROP TABLE t1, t2, t3;
+#
+# Bug#34704094: Mysql str_to_date can correct convert for '2022-11-30'
+#
+SELECT STR_TO_DATE('31/11/22', '%d/%m/%Y');
+STR_TO_DATE('31/11/22', '%d/%m/%Y')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '31/11/22' for function str_to_date
+SELECT STR_TO_DATE('2023-02-31','%Y-%m-%d');
+STR_TO_DATE('2023-02-31','%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '2023-02-31' for function str_to_date
+SELECT STR_TO_DATE('2004.09.12 10:61:59','%Y.%m.%d %T');
+STR_TO_DATE('2004.09.12 10:61:59','%Y.%m.%d %T')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '2004.09.12 10:61:59' for function str_to_date
+SELECT STR_TO_DATE('0000-00-00','%Y-%m-%d');
+STR_TO_DATE('0000-00-00','%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-00-00' for function str_to_date
diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/r/ddl_i18n_koi8r.result
index 75df3c616bd1..3542bcfa0b72 100644
--- a/mysql-test/r/ddl_i18n_koi8r.result
+++ b/mysql-test/r/ddl_i18n_koi8r.result
@@ -732,7 +732,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT �����1 CHAR(10),
@@ -766,7 +766,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT �����1 CHAR(10) CHARACTER SET utf8,
@@ -808,7 +808,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT �����1 CHAR(10),
@@ -842,7 +842,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT �����1 CHAR(10) CHARACTER SET utf8,
@@ -908,7 +908,7 @@ set names koi8r|
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT �����1 CHAR(10),
 OUT �����2 CHAR(10))
 BEGIN
@@ -929,7 +929,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT �����1 CHAR(10) CHARACTER SET utf8,
 OUT �����2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -950,7 +950,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT �����1 CHAR(10),
 OUT �����2 CHAR(10))
 BEGIN
@@ -971,7 +971,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT �����1 CHAR(10) CHARACTER SET utf8,
 OUT �����2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -1024,7 +1024,7 @@ COLLATION( '
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1042,7 +1042,7 @@ COLLATION( '
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1060,7 +1060,7 @@ COLLATION( '
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1078,7 +1078,7 @@ COLLATION( '
 @@character_set_client AS c8;
 SET �����1 = 'a';
 SET �����2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -1750,7 +1750,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1779,7 +1779,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1829,7 +1829,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1858,7 +1858,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = koi8r */ ;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1908,7 +1908,7 @@ use mysqltest1|
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE �����1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1924,7 +1924,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1940,7 +1940,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE �����1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1956,7 +1956,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1984,7 +1984,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -1996,7 +1996,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -2013,7 +2013,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(�����1));
@@ -2025,7 +2025,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -2042,7 +2042,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2057,7 +2057,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2072,7 +2072,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = '�����';
 SET @a1 =     '�����';
 SET @a2 =  '�����';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2087,7 +2087,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = '�����';
 SET @b1 =     '�����';
 SET @b2 =  '�����';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2494,7 +2494,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2522,7 +2522,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2561,7 +2561,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2589,7 +2589,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = koi8r */ ;;
 /*!50003 SET collation_connection  = koi8r_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2634,7 +2634,7 @@ set names koi8r|
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE �����1 CHAR(10);
 SELECT
 COLLATION(�����1) AS c1,
@@ -2647,7 +2647,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(�����1) AS c1,
@@ -2660,7 +2660,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(�����1) AS c1,
@@ -2673,7 +2673,7 @@ END	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE �����1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(�����1) AS c1,
@@ -2711,7 +2711,7 @@ COLLATION(    '
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2724,7 +2724,7 @@ COLLATION(    '
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2737,7 +2737,7 @@ COLLATION(    '
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2750,7 +2750,7 @@ COLLATION(    '
 COLLATION( '�����') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/r/ddl_i18n_utf8.result
index de715deacf7c..f8bc7df140cf 100644
--- a/mysql-test/r/ddl_i18n_utf8.result
+++ b/mysql-test/r/ddl_i18n_utf8.result
@@ -732,7 +732,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
@@ -766,7 +766,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
@@ -808,7 +808,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
@@ -842,7 +842,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
@@ -908,7 +908,7 @@ set names utf8|
 
 SHOW CREATE PROCEDURE p1|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
+p1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -929,7 +929,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE p2|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
+p2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -950,7 +950,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p3|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
+p3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p3`(
 INOUT парам1 CHAR(10),
 OUT парам2 CHAR(10))
 BEGIN
@@ -971,7 +971,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE PROCEDURE mysqltest2.p4|
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
+p4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p4`(
 INOUT парам1 CHAR(10) CHARACTER SET utf8,
 OUT парам2 CHAR(10) CHARACTER SET utf8)
 BEGIN
@@ -1024,7 +1024,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p2'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1042,7 +1042,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p3'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1060,7 +1060,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE routine_name = 'p4'|
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -1078,7 +1078,7 @@ COLLATION(    'текст') AS c6,
 @@character_set_client AS c8;
 SET парам1 = 'a';
 SET парам2 = 'b';
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	CREATED	ALTERED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION		root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a = '1'|
@@ -1750,7 +1750,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1779,7 +1779,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
@@ -1829,7 +1829,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1858,7 +1858,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
 /*!50003 SET character_set_results = utf8 */ ;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
@@ -1908,7 +1908,7 @@ use mysqltest1|
 
 SHOW CREATE TRIGGER trg1|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+trg1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1924,7 +1924,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER trg2|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
+trg2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER trg2 AFTER INSERT ON t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1940,7 +1940,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER mysqltest2.trg3|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
+trg3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg3 BEFORE INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10);
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1956,7 +1956,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci	CREATED
 
 SHOW CREATE TRIGGER mysqltest2.trg4|
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation	Created
-trg4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
+trg4	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER mysqltest2.trg4 AFTER INSERT ON mysqltest2.t1 FOR EACH ROW
 BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1984,7 +1984,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg2	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -1996,7 +1996,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 use mysqltest2|
 
@@ -2013,7 +2013,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	BEFORE	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 trg4	INSERT	t1	BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 INSERT INTO log VALUES(COLLATION(перем1));
@@ -2025,7 +2025,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	AFTER	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 use mysqltest1|
 
 
@@ -2042,7 +2042,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg2'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2057,7 +2057,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg3'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2072,7 +2072,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @a1 = 'текст';
 SET @a2 =  'текст';
 SET @a3 =     'текст';
-END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	BEFORE	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE trigger_name = 'trg4'|
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2087,7 +2087,7 @@ INSERT INTO log VALUES(@@character_set_client);
 SET @b1 = 'текст';
 SET @b2 =  'текст';
 SET @b3 =     'текст';
-END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
+END	ROW	AFTER	NULL	NULL	OLD	NEW	CREATED	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	utf8	utf8_general_ci	utf8_unicode_ci
 
 
 SET @a1 = '1'|
@@ -2494,7 +2494,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2522,7 +2522,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2561,7 +2561,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2589,7 +2589,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;;
 /*!50003 SET character_set_results = utf8 */ ;;
 /*!50003 SET collation_connection  = utf8_general_ci */ ;;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;;
 /*!50003 SET @saved_time_zone      = @@time_zone */ ;;
 /*!50003 SET time_zone             = 'SYSTEM' */ ;;
 /*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
@@ -2634,7 +2634,7 @@ set names utf8|
 
 SHOW CREATE EVENT ev1|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev1	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10);
 SELECT
 COLLATION(перем1) AS c1,
@@ -2647,7 +2647,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT ev2|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev2	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2660,7 +2660,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2673,7 +2673,7 @@ END	utf8	utf8_general_ci	utf8_unicode_ci
 
 SHOW CREATE EVENT mysqltest2.ev3|
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
+ev3	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	SYSTEM	CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
 DECLARE перем1 CHAR(10) CHARACTER SET utf8;
 SELECT
 COLLATION(перем1) AS c1,
@@ -2711,7 +2711,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2724,7 +2724,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2737,7 +2737,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'|
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	TIME_ZONE	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	SQL_MODE	STARTS	ENDS	STATUS	ON_COMPLETION	CREATED	LAST_ALTERED	LAST_EXECUTED	EVENT_COMMENT	ORIGINATOR	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
@@ -2750,7 +2750,7 @@ COLLATION( 'текст') AS c3,
 COLLATION(    'текст') AS c4,
 @@collation_connection AS c5,
 @@character_set_client AS c6;
-END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
+END	ONE TIME	2030-01-01 00:00:00	NULL	NULL	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	NULL	NULL	ENABLED	NOT PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8	utf8_general_ci	utf8_unicode_ci
 
 -------------------------------------------------------------------
 DDL statements within stored routine.
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index 6e842267ba40..358397bedac8 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -159,8 +159,12 @@ INSERT INTO t1 VALUES(10),(20);
 CREATE TABLE t2(b INTEGER);
 INSERT INTO t2 VALUES(10),(20);
 SET SESSION sql_safe_updates=1;
-DELETE t1 FROM t1 JOIN t2 WHERE t1.a = 10;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+EXPLAIN DELETE t2 FROM t1 JOIN t2 WHERE t1.a = 10;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	DELETE	t2	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+DELETE t2 FROM t1 JOIN t2 WHERE t1.a = 10;
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates=default;
 DROP TABLE t1, t2;
 create table t1 (a int, b int, unique key (a), key (b));
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 8d0d62ab0588..ffcc7eb90f87 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -4129,3 +4129,57 @@ FROM t3 AS subquery4_t1);
 field3
 SET optimizer_switch = default;
 DROP TABLE t1, t2, t3, t4;
+# Bug#30488700: Mysql chooses different execution plan in 5.7
+CREATE TABLE tbl1 (
+id BIGINT NOT NULL,
+rec_id INTEGER NOT NULL,
+id_value2 BIGINT DEFAULT NULL,
+PRIMARY KEY (id, rec_id)
+) ENGINE=INNODB;
+CREATE TABLE tbl2 (
+t_id BIGINT NOT NULL,
+s_date DATETIME DEFAULT NULL,
+PRIMARY KEY (t_id)
+) ENGINE=INNODB;
+SET @ROWNUM = 0;
+SELECT t1.rec_id
+FROM tbl1 AS t1 INNER JOIN
+(SELECT a.id, a.rec_id,s_date
+FROM tbl2 AS b, tbl1 AS a
+WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+ORDER BY s_date DESC) t2
+ON t1.id = t2.id AND t1.rec_id = t2.rec_id;
+rec_id
+UPDATE tbl1 AS t1 INNER JOIN
+(SELECT a.id, a.rec_id, b.s_date
+FROM tbl2 AS b, tbl1 AS a
+WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+ORDER BY s_date DESC) t2
+ON t1.id = t2.id AND t1.rec_id = t2.rec_id
+SET t1.rec_id = @ROWNUM:= @ROWNUM+1;
+explain SELECT t1.rec_id
+FROM tbl1 AS t1 INNER JOIN
+(SELECT a.id, a.rec_id,s_date
+FROM tbl2 AS b, tbl1 AS a
+WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+ORDER BY s_date DESC) t2
+ON t1.id = t2.id AND t1.rec_id = t2.rec_id;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ref	PRIMARY	PRIMARY	8	const	1	100.00	Using index
+1	SIMPLE	a	NULL	eq_ref	PRIMARY	PRIMARY	12	const,test.t1.rec_id	1	100.00	Using where
+1	SIMPLE	b	NULL	eq_ref	PRIMARY	PRIMARY	8	test.a.id_value2	1	100.00	Using index
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`rec_id` AS `rec_id` from `test`.`tbl1` `t1` join `test`.`tbl2` `b` join `test`.`tbl1` `a` where ((`test`.`b`.`t_id` = `test`.`a`.`id_value2`) and (`test`.`a`.`rec_id` = `test`.`t1`.`rec_id`) and (`test`.`t1`.`id` = 6889877970355107670) and (`test`.`a`.`id` = 6889877970355107670))
+explain UPDATE tbl1 AS t1 INNER JOIN
+(SELECT a.id, a.rec_id, b.s_date
+FROM tbl2 AS b, tbl1 AS a
+WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+ORDER BY s_date DESC) t2
+ON t1.id = t2.id AND t1.rec_id = t2.rec_id
+SET t1.rec_id = @ROWNUM:= @ROWNUM+1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t1	NULL	ALL	PRIMARY	NULL	NULL	NULL	1	100.00	NULL
+1	PRIMARY	<derived2>	NULL	ref	<auto_key0>	<auto_key0>	12	test.t1.id,test.t1.rec_id	2	100.00	NULL
+2	DERIVED	a	NULL	ref	PRIMARY	PRIMARY	8	const	1	100.00	Using where; Using temporary; Using filesort
+2	DERIVED	b	NULL	eq_ref	PRIMARY	PRIMARY	8	test.a.id_value2	1	100.00	NULL
+DROP TABLE tbl1, tbl2;
diff --git a/mysql-test/r/events_1.result b/mysql-test/r/events_1.result
index de03462a33be..1af3c966eecd 100644
--- a/mysql-test/r/events_1.result
+++ b/mysql-test/r/events_1.result
@@ -49,7 +49,7 @@ SECOND	10	SELECT 1
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 execute_at IS NULL	starts IS NULL	ends IS NULL	comment
 1	0	1	
-ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02';
+ALTER EVENT event_starts_test ON SCHEDULE AT date_add(now(), interval 5 day);
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 execute_at IS NULL	starts IS NULL	ends IS NULL	comment
 0	1	1	
@@ -62,7 +62,7 @@ SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.even
 execute_at IS NULL	starts IS NULL	ends IS NULL	comment
 0	1	1	
 DROP EVENT event_starts_test;
-CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '2020-02-02 20:00:02' ENDS '2022-02-02 20:00:02' DO SELECT 2;
+CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS date_add(now(), interval 5 day) ENDS date_add(now(), interval 10 day) DO SELECT 2;
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 execute_at IS NULL	starts IS NULL	ends IS NULL	comment
 1	0	0	
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index 3387ef2940ac..198b4f6b63c5 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -40,11 +40,11 @@ Warnings:
 Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 do drop table t' at line 1
-create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ends 10000101000000 do drop table t' at line 1
-create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1
 create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
 ERROR HY000: Incorrect STARTS value: '10000101000000'
@@ -422,16 +422,16 @@ SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 events_test	e1	root@localhost	+02:00	ONE TIME	2000-01-02 00:00:00	NULL	NULL	NULL	NULL	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 SET TIME_ZONE= '-03:00';
-ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
   ON COMPLETION PRESERVE DISABLE;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-events_test	e1	root@localhost	-03:00	RECURRING	NULL	1	DAY	2005-12-31 20:58:59	2030-01-03 00:00:00	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+events_test	e1	root@localhost	-03:00	RECURRING	NULL	1	DAY	2005-12-31 20:58:59	2038-01-03 00:00:00	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 SET TIME_ZONE= '+04:00';
 ALTER EVENT e1 DO SELECT 2;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-events_test	e1	root@localhost	-03:00	RECURRING	NULL	1	DAY	2005-12-31 20:58:59	2030-01-03 00:00:00	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+events_test	e1	root@localhost	-03:00	RECURRING	NULL	1	DAY	2005-12-31 20:58:59	2038-01-03 00:00:00	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP EVENT e1;
 SET TIME_ZONE='+05:00';
 CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY STARTS '2006-01-01 00:00:00' DO
@@ -664,7 +664,7 @@ SET GLOBAL READ_ONLY = 1;
 # Connection: u1_con (mysqltest_u1@localhost/events_test).
 #
 
-CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 
 ALTER EVENT e1 COMMENT 'comment';
@@ -677,7 +677,7 @@ ERROR HY000: The MySQL server is running with the --read-only option so it canno
 # Connection: root_con (root@localhost/events_test).
 #
 
-CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
 
 ALTER EVENT e1 COMMENT 'comment';
 
@@ -749,6 +749,8 @@ DROP USER mysqltest_u1@localhost;
 drop procedure if exists p;
 set @old_mode= @@sql_mode;
 set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
+Warnings:
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40' is deprecated. It will be removed in a future release.
 create event e1 on schedule every 1 day do select 1;
 select @@sql_mode into @full_mode;
 set @@sql_mode= @old_mode;
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 2fd2f8a9fa40..ecddb781fe7f 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -459,11 +459,9 @@ COUNT(*)
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
 INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 INSERT INTO t1 VALUES('testword\'\'');
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
 a
diff --git a/mysql-test/r/func_aes.result b/mysql-test/r/func_aes.result
index 5bede7f2d53d..1c7b5c90d339 100644
--- a/mysql-test/r/func_aes.result
+++ b/mysql-test/r/func_aes.result
@@ -100,6 +100,8 @@ AES_ENCRYPT('a', 'a') = AES_ENCRYPT(REPEAT('a',1000), 'a')
 SELECT AES_ENCRYPT('a', 'a') = AES_ENCRYPT('a', REPEAT('a',1000));
 AES_ENCRYPT('a', 'a') = AES_ENCRYPT('a', REPEAT('a',1000))
 0
+Warnings:
+Warning	3237	AES key size should be 16 bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security.
 #### persistense
 CREATE TABLE t1 (a BINARY(16) PRIMARY KEY);
 # must pass without a warning
diff --git a/mysql-test/r/func_aes_kdf_hkdf.result b/mysql-test/r/func_aes_kdf_hkdf.result
new file mode 100644
index 000000000000..0f1de8ed5795
--- /dev/null
+++ b/mysql-test/r/func_aes_kdf_hkdf.result
@@ -0,0 +1,65 @@
+# Tests of the AES KDF hkdf functionality
+#### AES_ENCRYPT return type
+# must work and return a string
+SELECT TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'))
+9UwMLA5qdPChE0NbqnTYGw==
+# must return 16
+SELECT LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'))
+16
+# must return binary
+SELECT CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'))
+binary
+# must be equal
+SELECT AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf') = AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf');
+AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf') = AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf')
+1
+# Tests of AES strong key generation
+# Strong key generation with KDF, should not be equal keys
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', repeat("y",32), '', 'hkdf');
+AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', repeat("y",32), '', 'hkdf')
+0
+# Strong key generation with KDF, should not be equal keys
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'hkdf');
+AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'hkdf')
+0
+#### AES_ENCRYPT KDF hkdf parameters
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf'))
+9UwMLA5qdPChE0NbqnTYGw==
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt'))
+nmOEqhC+wjUalOcakrMOQw==
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt', 'info'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt', 'info'))
+QzgVeH3yZT7XefHW7G36nQ==
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'), 'my_key_string', '', 'hkdf');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'), 'my_key_string', '', 'hkdf')
+1
+#### AES_ENCRYPT KDF hkdf parameters with incorrect data types
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001), 'my_key_string', '', 'hkdf', 10001);
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001), 'my_key_string', '', 'hkdf', 10001)
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001, 2000), 'my_key_string', '', 'hkdf', 10001, 2000);
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001, 2000), 'my_key_string', '', 'hkdf', 10001, 2000)
+1
+# KDF function name different case.
+select aes_encrypt("foo",repeat("x",16),NULL,'hKdF');
+ERROR HY000: KDF method name is not valid. Please use hkdf or pbkdf2_hmac method name
+#### AES_ENCRYPT KDF hkdf parameters with initialization vector
+SET @IV=REPEAT('a', 16);
+#### aes-128-cbc
+SELECT @@session.block_encryption_mode INTO @save_block_encryption_mode;
+SET SESSION block_encryption_mode="aes-128-cbc";
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf'), 'my_key_string', @IV, 'hkdf');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf'), 'my_key_string', @IV, 'hkdf')
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt'), 'my_key_string', @IV, 'hkdf', 'salt');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt'), 'my_key_string', @IV, 'hkdf', 'salt')
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt', 'info'), 'my_key_string', @IV, 'hkdf', 'salt', 'info');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt', 'info'), 'my_key_string', @IV, 'hkdf', 'salt', 'info')
+1
+SET SESSION block_encryption_mode=@save_block_encryption_mode;
diff --git a/mysql-test/r/func_aes_kdf_pbkdf2_hmac.result b/mysql-test/r/func_aes_kdf_pbkdf2_hmac.result
new file mode 100644
index 000000000000..3db0a6d00ded
--- /dev/null
+++ b/mysql-test/r/func_aes_kdf_pbkdf2_hmac.result
@@ -0,0 +1,103 @@
+# Tests of the AES KDF functionality
+#### AES_ENCRYPT return type
+# must work and return a string
+SELECT TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'))
+44uRAyA9td7Ih/8XyI4paA==
+# must return 16
+SELECT LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'))
+16
+# must return binary
+SELECT CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'))
+binary
+# must be equal
+SELECT AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac');
+AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac')
+1
+#### AES_ENCRYPT KDF pbkdf2_hmac parameters
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac'))
+44uRAyA9td7Ih/8XyI4paA==
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt'))
+gmnbJutgker3Oftr8Bwejg==
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', '10001'));
+TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', '10001'))
+XoWbOI01+edhv7XX2+BKew==
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'), 'my_key_string', '', 'pbkdf2_hmac');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'), 'my_key_string', '', 'pbkdf2_hmac')
+1
+# Tests of AES strong key generation
+# Weak key generation without KDF, should be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '') = AES_ENCRYPT('my_text', repeat("y",32), '');
+AES_ENCRYPT('my_text', repeat("x",32), '') = AES_ENCRYPT('my_text', repeat("y",32), '')
+1
+Warnings:
+Warning	1618	<IV> option ignored
+Warning	3237	AES key size should be 16 bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security.
+Warning	1618	<IV> option ignored
+Warning	3237	AES key size should be 16 bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security.
+# Strong key generation with KDF, should not be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', repeat("y",32), '', 'pbkdf2_hmac');
+AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', repeat("y",32), '', 'pbkdf2_hmac')
+0
+# Strong key generation with KDF, should not be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'pbkdf2_hmac');
+AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'pbkdf2_hmac')
+0
+#### AES_ENCRYPT KDF pbkdf2_hmac parameters with incorrect data types
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, '10001'), 'my_key_string', '', 'pbkdf2_hmac',4000, '10001');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, '10001'), 'my_key_string', '', 'pbkdf2_hmac',4000, '10001')
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, 10001), 'my_key_string', '', 'pbkdf2_hmac',4000, 10001);
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, 10001), 'my_key_string', '', 'pbkdf2_hmac',4000, 10001)
+1
+#### AES_ENCRYPT KDF error conditions
+# Invalid KDF method
+select AES_ENCRYPT('my_text','my_key_string', '', 'invalid');
+ERROR HY000: KDF method name is not valid. Please use hkdf or pbkdf2_hmac method name
+# Warning for big AES key and empty KDF method
+select AES_ENCRYPT('my_text', repeat("x",32));
+AES_ENCRYPT('my_text', repeat("x",32))
+�'���lD5H�����
+Warnings:
+Warning	3237	AES key size should be 16 bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security.
+# No warning for smaller key
+select AES_ENCRYPT('my_text', 'my_key');
+AES_ENCRYPT('my_text', 'my_key')
+~�Zk,Za���=Z�
+# KDF pbkdf2_hmac iterations less then 1000 error.
+select AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', '100');
+ERROR HY000: For KDF method pbkdf2_hmac iterations value less than 1000 or more than 65535 is not allowed due to security reasons. Please provide iterations >= 1000 and iterations < 65535
+# KDF pbkdf2_hmac iterations as text
+select AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', 'aa');
+ERROR HY000: For KDF method pbkdf2_hmac iterations value less than 1000 or more than 65535 is not allowed due to security reasons. Please provide iterations >= 1000 and iterations < 65535
+# KDF function name very large.
+select aes_encrypt("foo",repeat("x",16),NULL,repeat("1",10000000000));
+ERROR HY000: KDF option size is invalid, please provide valid size < 256 bytes and not NULL
+# KDF function name large
+select aes_encrypt("foo",repeat("x",16),NULL,repeat("1",300));
+ERROR HY000: KDF option size is invalid, please provide valid size < 256 bytes and not NULL
+# KDF function name different case.
+select aes_encrypt("foo",repeat("x",16),NULL,'pbkdf2_HMac');
+ERROR HY000: KDF method name is not valid. Please use hkdf or pbkdf2_hmac method name
+# Extra IV
+select aes_encrypt("foo",repeat("x",16),NULL,'pbkdf2_HMac');
+ERROR HY000: KDF method name is not valid. Please use hkdf or pbkdf2_hmac method name
+#### AES_ENCRYPT KDF pbkdf2_hmac parameters with initialization vector
+SET @IV=REPEAT('a', 16);
+#### aes-128-cbc
+SELECT @@session.block_encryption_mode INTO @save_block_encryption_mode;
+SET SESSION block_encryption_mode="aes-128-cbc";
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac'), 'my_key_string', @IV, 'pbkdf2_hmac');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac'), 'my_key_string', @IV, 'pbkdf2_hmac')
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt')
+1
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001');
+'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001')
+1
+SET SESSION block_encryption_mode=@save_block_encryption_mode;
diff --git a/mysql-test/r/func_aes_misc.result b/mysql-test/r/func_aes_misc.result
index 7553b97d95c2..e38aef6def15 100644
--- a/mysql-test/r/func_aes_misc.result
+++ b/mysql-test/r/func_aes_misc.result
@@ -206,6 +206,7 @@ CREATE TABLE t1(f1 varchar(256));
 INSERT INTO t1 values(AES_ENCRYPT(@ENCSTR, @KEYS, @IV));
 Warnings:
 Warning	1618	<IV> option ignored
+Warning	3237	AES key size should be 16 bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security.
 Combination1..............
 SET @@session.block_encryption_mode = 'aes-192-ecb';
 should return NULL
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 6b95880a2ea8..c0c8ffa09577 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -1941,3 +1941,38 @@ FROM t1 t GROUP BY t1.a)
 0
 0
 DROP TABLE t1;
+#
+# Bug#32552332 - CAN'T WRITE; DUPLICATE KEY IN TABLE '/TMP/#SQL...'
+#
+CREATE TABLE tr (c1 INT);
+INSERT INTO tr VALUES (1);
+CREATE FUNCTION seq_1_to_2() RETURNS INT
+BEGIN
+DECLARE limit_value, return_value INT;
+SET limit_value = 2;
+SELECT c1 INTO return_value FROM tr;
+IF (return_value < limit_value) THEN
+UPDATE tr SET c1 = c1 + 1;
+ELSE
+UPDATE tr SET c1 = 1;
+END IF;
+RETURN (return_value);
+END|
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (11);
+SELECT seq_1_to_2() as seq, COUNT(*) FROM t1 GROUP BY seq;
+seq	COUNT(*)
+1	1
+2	1
+SELECT FLOOR(seq_1_to_2() * 2) AS val, COUNT(*) FROM t1 GROUP BY val;
+val	COUNT(*)
+2	1
+4	1
+SELECT val, COUNT(*) FROM (SELECT FLOOR(seq_1_to_2())+1 val FROM t1) x
+GROUP BY x.val;
+val	COUNT(*)
+2	1
+3	1
+DROP TABLE t1, tr;
+DROP FUNCTION seq_1_to_2;
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 13f587a60e51..0dd199ab3f6f 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -1163,6 +1163,31 @@ inet_aton("255.255.255.2551")
 NULL
 Warnings:
 Warning	1411	Incorrect string value: ''255.255.255.2551'' for function inet_aton
+#
+# Bug #26319675:"ILLEGAL MIX OF COLLATIONS" HAPPENS IN CONCAT WITH
+# NAME_CONST
+#
+SELECT CONCAT(NAME_CONST('char_col',_cp932'test' COLLATE 'cp932_japanese_ci'), NAME_CONST('num_col',0)) AS a;
+a
+test0
+CREATE TABLE t1 AS SELECT CONCAT(NAME_CONST('char_col',_cp932'test' COLLATE 'cp932_japanese_ci'), NAME_CONST('num_col',0)) AS a;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(5) CHARACTER SET cp932 DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1;
+#
+# Bug 33334507 - 5.7 - utf8mb4 + REPLACE(UUID(),'-','') returns duplicate UUIDs!
+#
+CREATE TABLE t1(c1 CHAR(10) CHARACTER SET ascii);
+INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
+SELECT COUNT(*) FROM t1 GROUP BY COALESCE(c1, UUID());
+COUNT(*)
+1
+1
+1
+DROP TABLE t1;
 
 # -- Done.
 
diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result
index 8ad6882d8893..8ce38686639c 100644
--- a/mysql-test/r/func_set.result
+++ b/mysql-test/r/func_set.result
@@ -245,7 +245,6 @@ from( make_set( ( extract( minute_second from
 )
 ;
 Warnings:
-Warning	1292	Truncated incorrect date value: '1.01'
 Warning	1411	Incorrect datetime value: '1.01' for function str_to_date
 # Bug#21547779 Assertion failed: select_lex->leaf_table_count == 0
 CREATE TABLE t(a INTEGER) engine=innodb;
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 511d9586622d..6403eb920e4c 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -4810,3 +4810,74 @@ AND trim(trailing 'a' FROM COUNTRY) = 'Australi';
 COUNTRY
 Australia
 DROP TABLE t1;
+#
+# Bug 31320716 - SETTING VARIABLE TO CONCAT('') SETS IT TO NULL INSTEAD OF ''
+#
+SELECT @var:=CONCAT('');
+@var:=CONCAT('')
+
+SELECT @var:=CONCAT_WS('','');
+@var:=CONCAT_WS('','')
+
+SET NAMES utf8;
+CREATE TABLE t(a INT) engine=innodb;
+INSERT INTO t VALUES(1);
+SELECT 1 FROM t WHERE WEIGHT_STRING(CONCAT_WS('1',''));
+1
+SELECT 1 FROM t WHERE WEIGHT_STRING(CONCAT('',''));
+1
+SET NAMES DEFAULT;
+DROP TABLE t;
+#
+# Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
+#                FOR ES_MX AND ES_ES LOCALES
+#
+CREATE PROCEDURE load_locale_format_table()
+BEGIN
+DECLARE locale_list VARCHAR(1000) DEFAULT '
+  es_AR,es_BO,es_CL,es_CO,es_CR,es_DO,es_EC,es_ES,es_GT,es_HN,
+  es_MX,es_NI,es_PA,es_PE,es_PR,es_PY,es_SV,es_US,es_UY,es_VE';
+SET @fmt_stmt = 'INSERT INTO locale_format VALUES
+                   (?, FORMAT(12131254123412541,2,?));';
+PREPARE stmt FROM @fmt_stmt;
+WHILE locale_list != '' DO
+/* get the first locale from the list */
+SET @locale =
+TRIM(REPLACE((SUBSTRING_INDEX(locale_list, ',', 1)), '\n',''));
+EXECUTE stmt USING @locale, @locale;
+/* remove the first locale from the list */
+IF LOCATE(',', locale_list) > 0 THEN
+SET locale_list =
+SUBSTRING(locale_list, LOCATE(',', locale_list) + 1);
+ELSE
+SET locale_list = '';
+END IF;
+END WHILE;
+DEALLOCATE PREPARE stmt;
+END|
+CREATE TABLE locale_format(locale VARCHAR(10), formatted_string VARCHAR(100));
+CALL load_locale_format_table();
+SELECT * FROM locale_format;
+locale	formatted_string
+es_AR	12.131.254.123.412.541,00
+es_BO	12.131.254.123.412.541,00
+es_CL	12.131.254.123.412.541,00
+es_CO	12.131.254.123.412.541,00
+es_CR	12 131 254 123 412 541,00
+es_DO	12,131,254,123,412,541.00
+es_EC	12.131.254.123.412.541,00
+es_ES	12.131.254.123.412.541,00
+es_GT	12,131,254,123,412,541.00
+es_HN	12,131,254,123,412,541.00
+es_MX	12,131,254,123,412,541.00
+es_NI	12,131,254,123,412,541.00
+es_PA	12,131,254,123,412,541.00
+es_PE	12,131,254,123,412,541.00
+es_PR	12,131,254,123,412,541.00
+es_PY	12.131.254.123.412.541,00
+es_SV	12,131,254,123,412,541.00
+es_US	12,131,254,123,412,541.00
+es_UY	12.131.254.123.412.541,00
+es_VE	12.131.254.123.412.541,00
+DROP PROCEDURE load_locale_format_table;
+DROP TABLE locale_format;
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index a6fe4c4b2851..20732c99e1db 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1231,9 +1231,7 @@ DROP TABLE t1,t2;
 set time_zone= @@global.time_zone;
 select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
 str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE
-NULL
-Warnings:
-Warning	1411	Incorrect datetime value: '10:00 PM' for function str_to_date
+22:10:00
 create table t1 (field DATE);
 insert into t1 values ('2006-11-06');
 select * from t1 where field < '2006-11-06 04:08:36.0';
@@ -1403,8 +1401,6 @@ SET GLOBAL SQL_MODE=DEFAULT;
 SELECT FORMAT(YEAR(STR_TO_DATE('',GET_FORMAT(TIME,''))),1);
 FORMAT(YEAR(STR_TO_DATE('',GET_FORMAT(TIME,''))),1)
 NULL
-Warnings:
-Warning	1411	Incorrect datetime value: '' for function str_to_date
 #
 # Bug#11766126  59166: ANOTHER DATETIME VALGRIND UNINITIALIZED WARNING
 #
diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result
index d9088ac7fef7..3727a2082c0d 100644
--- a/mysql-test/r/gis-precise.result
+++ b/mysql-test/r/gis-precise.result
@@ -121,10 +121,10 @@ ST_DISTANCE(ST_GeomFromText('linestring(0 0, 3 6, 6 3, 0 0)'), ST_GeomFromText('
 0.8944271909999159
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
 ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')))
-POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.855421686746986 29.819277108433734,21.951219512195124 27.4390243902439))
+POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.85542168674699 29.819277108433734,21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')))
-MULTIPOINT((21.951219512195124 27.4390243902439),(23.855421686746986 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
+MULTIPOINT((21.951219512195124 27.4390243902439),(23.85542168674699 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')))
 POINT(29.28994082840237 26.36094674556213)
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index d365f0104bc0..6aad2e679d76 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -2284,10 +2284,10 @@ CREATE TABLE t1 (g GEOMETRY);
 INSERT INTO t1 (g) VALUES (ST_GeomFromText("MULTIPOLYGON(((0 7,-3 -14,9 -11,0 7)))"));
 SELECT ST_AsText(ST_Buffer(g, 2)), ST_AsText(ST_Buffer(g, 2)) FROM t1;
 ST_AsText(ST_Buffer(g, 2))	ST_AsText(ST_Buffer(g, 2))
-POLYGON((1.7889 7.8944,1.5815 8.2242,1.3142 8.5076,0.9971 8.7337,0.6421 8.8941,0.2627 8.9827,-0.1266 8.996,-0.5111 8.9336,-0.8762 8.7978,-1.2081 8.5939,-1.4942 8.3295,-1.7235 8.0146,-1.8875 7.6613,-1.9799 7.2828,-4.9799 -13.7172,-4.9971 -14.1077,-4.938 -14.4941,-4.8049 -14.8616,-4.6028 -15.1963,-4.3395 -15.4852,-4.025 -15.7174,-3.6714 -15.884,-3.2921 -15.9786,-2.9016 -15.9976,-2.5149 -15.9403,9.4851 -12.9403,9.8227 -12.823,10.134 -12.6474,10.4091 -12.4193,10.6393 -12.1458,10.817 -11.8357,10.9368 -11.499,10.9946 -11.1463,10.9888 -10.7889,10.9195 -10.4383,10.7889 -10.1056,1.7889 7.8944))	POLYGON((1.7889 7.8944,1.5815 8.2242,1.3142 8.5076,0.9971 8.7337,0.6421 8.8941,0.2627 8.9827,-0.1266 8.996,-0.5111 8.9336,-0.8762 8.7978,-1.2081 8.5939,-1.4942 8.3295,-1.7235 8.0146,-1.8875 7.6613,-1.9799 7.2828,-4.9799 -13.7172,-4.9971 -14.1077,-4.938 -14.4941,-4.8049 -14.8616,-4.6028 -15.1963,-4.3395 -15.4852,-4.025 -15.7174,-3.6714 -15.884,-3.2921 -15.9786,-2.9016 -15.9976,-2.5149 -15.9403,9.4851 -12.9403,9.8227 -12.823,10.134 -12.6474,10.4091 -12.4193,10.6393 -12.1458,10.817 -11.8357,10.9368 -11.499,10.9946 -11.1463,10.9888 -10.7889,10.9195 -10.4383,10.7889 -10.1056,1.7889 7.8944))
+POLYGON((1.788854382 7.894427191,1.581542679896 8.224223325896,1.314233720023 8.5075774372,0.997068110519 8.733740229384,0.642077816799 8.894132011549,0.262729718025 8.982668175784,-0.126585271189 8.995990022299,-0.511098133187 8.933592174749,-0.876222023373 8.797841752145,-1.208105635399 8.593888570044,-1.49415866306 8.329469777619,-1.723529424984 8.014616341882,-1.887516533025 7.661272513837,-1.979898987322 7.282842712475,-4.979898987322 -13.717157287525,-4.997098708684 -14.107688196991,-4.938004155957 -14.494105142143,-4.804872892066 -14.861646008221,-4.602790871498 -15.196269794922,-4.339478143841 -15.48519301849,-4.024993928167 -15.717378073466,-3.67135232515 -15.883954897421,-3.292063347729 -15.978559830006,-2.901616804081 -15.997578721042,-2.514928749927 -15.940285000291,9.485071250073 -12.940285000291,9.822682701181 -12.822962745965,10.134020545528 -12.647421440409,10.409141741794 -12.419267258671,10.639259881667 -12.145786646962,10.817025796986 -11.835713619063,10.936762266449 -11.498950822484,10.994645326203 -11.146253282554,10.98882639386 -10.788884924546,10.91949130576 -10.438258843317,10.788854382 -10.105572809,1.788854382 7.894427191))	POLYGON((1.788854382 7.894427191,1.581542679896 8.224223325896,1.314233720023 8.5075774372,0.997068110519 8.733740229384,0.642077816799 8.894132011549,0.262729718025 8.982668175784,-0.126585271189 8.995990022299,-0.511098133187 8.933592174749,-0.876222023373 8.797841752145,-1.208105635399 8.593888570044,-1.49415866306 8.329469777619,-1.723529424984 8.014616341882,-1.887516533025 7.661272513837,-1.979898987322 7.282842712475,-4.979898987322 -13.717157287525,-4.997098708684 -14.107688196991,-4.938004155957 -14.494105142143,-4.804872892066 -14.861646008221,-4.602790871498 -15.196269794922,-4.339478143841 -15.48519301849,-4.024993928167 -15.717378073466,-3.67135232515 -15.883954897421,-3.292063347729 -15.978559830006,-2.901616804081 -15.997578721042,-2.514928749927 -15.940285000291,9.485071250073 -12.940285000291,9.822682701181 -12.822962745965,10.134020545528 -12.647421440409,10.409141741794 -12.419267258671,10.639259881667 -12.145786646962,10.817025796986 -11.835713619063,10.936762266449 -11.498950822484,10.994645326203 -11.146253282554,10.98882639386 -10.788884924546,10.91949130576 -10.438258843317,10.788854382 -10.105572809,1.788854382 7.894427191))
 SELECT ST_AsText(ST_Buffer(g, 2)), ST_AsText(ST_Difference(g, g)) FROM t1;
 ST_AsText(ST_Buffer(g, 2))	ST_AsText(ST_Difference(g, g))
-POLYGON((1.7889 7.8944,1.5815 8.2242,1.3142 8.5076,0.9971 8.7337,0.6421 8.8941,0.2627 8.9827,-0.1266 8.996,-0.5111 8.9336,-0.8762 8.7978,-1.2081 8.5939,-1.4942 8.3295,-1.7235 8.0146,-1.8875 7.6613,-1.9799 7.2828,-4.9799 -13.7172,-4.9971 -14.1077,-4.938 -14.4941,-4.8049 -14.8616,-4.6028 -15.1963,-4.3395 -15.4852,-4.025 -15.7174,-3.6714 -15.884,-3.2921 -15.9786,-2.9016 -15.9976,-2.5149 -15.9403,9.4851 -12.9403,9.8227 -12.823,10.134 -12.6474,10.4091 -12.4193,10.6393 -12.1458,10.817 -11.8357,10.9368 -11.499,10.9946 -11.1463,10.9888 -10.7889,10.9195 -10.4383,10.7889 -10.1056,1.7889 7.8944))	GEOMETRYCOLLECTION()
+POLYGON((1.788854382 7.894427191,1.581542679896 8.224223325896,1.314233720023 8.5075774372,0.997068110519 8.733740229384,0.642077816799 8.894132011549,0.262729718025 8.982668175784,-0.126585271189 8.995990022299,-0.511098133187 8.933592174749,-0.876222023373 8.797841752145,-1.208105635399 8.593888570044,-1.49415866306 8.329469777619,-1.723529424984 8.014616341882,-1.887516533025 7.661272513837,-1.979898987322 7.282842712475,-4.979898987322 -13.717157287525,-4.997098708684 -14.107688196991,-4.938004155957 -14.494105142143,-4.804872892066 -14.861646008221,-4.602790871498 -15.196269794922,-4.339478143841 -15.48519301849,-4.024993928167 -15.717378073466,-3.67135232515 -15.883954897421,-3.292063347729 -15.978559830006,-2.901616804081 -15.997578721042,-2.514928749927 -15.940285000291,9.485071250073 -12.940285000291,9.822682701181 -12.822962745965,10.134020545528 -12.647421440409,10.409141741794 -12.419267258671,10.639259881667 -12.145786646962,10.817025796986 -11.835713619063,10.936762266449 -11.498950822484,10.994645326203 -11.146253282554,10.98882639386 -10.788884924546,10.91949130576 -10.438258843317,10.788854382 -10.105572809,1.788854382 7.894427191))	GEOMETRYCOLLECTION()
 DROP TABLE t1;
 CREATE TABLE t1(id INT PRIMARY KEY AUTO_INCREMENT, g GEOMETRY NOT NULL,
 SPATIAL INDEX(g));
@@ -3077,3 +3077,20 @@ ST_GeometryType(ST_GeomFromText('POINT(1 1)')) HOUR_SECOND;
 '2010-10-10 10:10:10' + INTERVAL
 ST_GeometryType(ST_GeomFromText('POINT(1 1)')) HOUR_SECOND
 2010-10-10 10:10:10
+#
+# Bug #32975221 5.7.29+ REGRESSION, SPATIAL INDEX NOT USED ANYMORE FOR MBRCONTAINS
+#
+CREATE TABLE t (
+c1 VARCHAR(8) NOT NULL,
+c2 VARCHAR(16) NOT NULL,
+geom POINT NOT NULL,
+PRIMARY KEY (c2,c1),
+SPATIAL KEY coord (geom)
+) ENGINE=INNODB DEFAULT CHARSET=UTF8;
+INSERT INTO t VALUES (1, 2, POINT(1, 2));
+EXPLAIN SELECT COUNT(*) FROM t WHERE MBRCONTAINS(ST_GEOMFROMTEXT('POLYGON((1 2, 2 2, 2 3, 1 2))'), geom) AND c1 <> '10';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	range	coord	coord	34	NULL	##	##	Using where
+Warnings:
+Note	1003	/* select#1 */ select count(0) AS `COUNT(*)` from `test`.`t` where (mbrcontains(<cache>(st_geometryfromtext('POLYGON((1 2, 2 2, 2 3, 1 2))')),`test`.`t`.`geom`) and (`test`.`t`.`c1` <> '10'))
+DROP TABLE t;
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 4a32f5004045..8d053b357c93 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -1881,8 +1881,6 @@ BEGIN
 SET @x = 0;
 REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT;
 END ;||
-Warnings:
-Warning	1404	Failed to grant EXECUTE and ALTER ROUTINE privileges
 SHOW GRANTS FOR 'user1'@'localhost';
 Grants for user1@localhost
 GRANT USAGE ON *.* TO 'user1'@'localhost'
@@ -1892,6 +1890,7 @@ SHOW GRANTS FOR 'user2';
 Grants for user2@%
 GRANT USAGE ON *.* TO 'user2'@'%'
 GRANT CREATE, CREATE ROUTINE ON `db1`.* TO 'user2'@'%'
+GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `db1`.`proc2` TO 'user2'@'%'
 DROP PROCEDURE db1.proc1;
 DROP PROCEDURE db1.proc2;
 REVOKE ALL ON db1.* FROM 'user1'@'localhost';
@@ -2250,32 +2249,6 @@ SHOW GRANTS FOR mysqltest_u1@localhost;
 Grants for mysqltest_u1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
 
-# -- 
-# -- Check that global GRANT OPTION allows SHOW CREATE TABLE.
-# -- 
-
-GRANT GRANT OPTION ON mysqltest_db1.* TO mysqltest_u1@localhost;
-
-SHOW GRANTS FOR mysqltest_u1@localhost;
-Grants for mysqltest_u1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
-GRANT USAGE ON `mysqltest_db1`.* TO 'mysqltest_u1'@'localhost' WITH GRANT OPTION
-
-# connection: con1 (mysqltest_u1@mysqltest_db1)
-
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-
-# connection: default
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;
-SHOW GRANTS FOR mysqltest_u1@localhost;
-Grants for mysqltest_u1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
-
 # -- 
 # -- Check that global CREATE VIEW allows SHOW CREATE TABLE.
 # -- 
@@ -2562,32 +2535,6 @@ SHOW GRANTS FOR mysqltest_u1@localhost;
 Grants for mysqltest_u1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
 
-# -- 
-# -- Check that table-level GRANT OPTION allows SHOW CREATE TABLE.
-# -- 
-
-GRANT GRANT OPTION ON mysqltest_db1.t1 TO mysqltest_u1@localhost;
-
-SHOW GRANTS FOR mysqltest_u1@localhost;
-Grants for mysqltest_u1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
-GRANT USAGE ON `mysqltest_db1`.`t1` TO 'mysqltest_u1'@'localhost' WITH GRANT OPTION
-
-# connection: con1 (mysqltest_u1@mysqltest_db1)
-
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-
-# connection: default
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;
-SHOW GRANTS FOR mysqltest_u1@localhost;
-Grants for mysqltest_u1@localhost
-GRANT USAGE ON *.* TO 'mysqltest_u1'@'localhost'
-
 # -- 
 # -- Check that table-level CREATE VIEW allows SHOW CREATE TABLE.
 # -- 
@@ -3022,3 +2969,10 @@ proxy_native_0123456789	user_name_len_32_012345678901234	user_name_len_22_01234@
 DROP USER user_name_len_22_01234@localhost;
 DROP USER user_name_len_32_012345678901234@localhost;
 DROP USER proxy_native_0123456789@localhost;
+#
+# Bug#33578113: DROP privilege on performance_schema.* can't be revoked
+#
+CREATE USER bug33578113;
+GRANT DROP ON performance_schema.* TO bug33578113;
+REVOKE DROP ON performance_schema.* FROM bug33578113;
+DROP USER bug33578113;
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 986fdb4d8897..28e730d10f0f 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -163,6 +163,7 @@ flush privileges;
 set sql_mode='maxdb';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 drop table if exists t1, t2;
 create table t1(c1 int);
 create table t2(c1 int, c2 int);
diff --git a/mysql-test/r/grant4.result b/mysql-test/r/grant4.result
index 51dc3235e3ec..6b19216f1b01 100644
--- a/mysql-test/r/grant4.result
+++ b/mysql-test/r/grant4.result
@@ -94,10 +94,10 @@ GRANT SHOW VIEW ON v2 to mysqltest_u1@localhost;
 GRANT SHOW VIEW, SELECT ON v3 to mysqltest_u1@localhost;
 use mysqltest_db1;
 ** Connect as restricted user mysqltest_u1.
-** SELECT FROM INFORMATION_SCHEMA.STATISTICS will succeed because any privileges will do (authentication is enough).
+# The user does not have table level grants on table t5. Hence cannot get
+# information about it from INFORMATION_SCHEMA.STATISTICS
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='t5';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	INDEX_COMMENT
-def	mysqltest_db1	t5	1	mysqltest_db1	i	1	s1	A	NULL	NULL	NULL	YES	BTREE		
 ** SHOW INDEX FROM t5 will fail because we don't have any privileges on any column combination.
 SHOW INDEX FROM t5;
 ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't5'
diff --git a/mysql-test/r/grant_alter_user_qa.result b/mysql-test/r/grant_alter_user_qa.result
index 85e5536a2059..43e8a68a37df 100644
--- a/mysql-test/r/grant_alter_user_qa.result
+++ b/mysql-test/r/grant_alter_user_qa.result
@@ -62,7 +62,7 @@ SELECT USER();
 USER()
 u4@localhost
 
-CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string';
+CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SELECT User,plugin,authentication_string FROM mysql.user
 WHERE USER='user4';
 User	user4
@@ -308,7 +308,7 @@ u19@localhost IDENTIFIED BY 'auth_string',
 u20@localhost IDENTIFIED WITH 'sha256_password',
 u21@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string',
 u22@localhost IDENTIFIED WITH 'test_plugin_server',
-u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SELECT User,plugin,authentication_string,ssl_type,ssl_cipher,
@@ -758,7 +758,7 @@ authentication_string	#
 password_expired	N
 password_last_changed	#
 password_lifetime	NULL
-CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string'
+CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
                           REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
@@ -1003,7 +1003,7 @@ u19@localhost IDENTIFIED BY 'auth_string',
 u20@localhost IDENTIFIED WITH 'sha256_password',
 u21@localhost IDENTIFIED WITH 'sha256_password' BY '!Y_TOdh6)',
 u22@localhost IDENTIFIED WITH 'sha256_password',
-u23@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_&string'
+u23@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SELECT User,ssl_type,ssl_cipher,x509_issuer,x509_subject,
@@ -1282,12 +1282,12 @@ CREATE USER u4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
 CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
-CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string';
+CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
 CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'sha256_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user2@localhost;
 CREATE USER for user2@localhost
 CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
@@ -1400,7 +1400,7 @@ u14@localhost,u15@localhost;
 
 # GRANT
 
-CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password'
+CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password'
             AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
@@ -1411,7 +1411,7 @@ x509_issuer,x509_subject,max_user_connections,
 max_questions,max_updates,max_connections FROM mysql.user
 WHERE USER='user1';
 user	user1
-plugin	sha256_password
+plugin	mysql_native_password
 authentication_string	#
 ssl_type	SPECIFIED
 ssl_cipher	
@@ -1486,7 +1486,7 @@ DROP USER user1@localhost,user2@localhost,user3@localhost,user5@localhost;
 # SET PASSWORD Tests
 
 CREATE USER user1@localhost IDENTIFIED BY 'auth_string';
-CREATE USER user2@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string1';
+CREATE USER user2@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string1';
 SELECT PASSWORD('plaintext_pwd');
 PASSWORD('plaintext_pwd')
 *F42EC6870C44E0E26316EC1D4A953A4B9C2D8958
@@ -1652,7 +1652,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1705,7 +1705,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 0.000001	#	Query	#	#	use `test`; CREATE USER 'user12'@'localhost' IDENTIFIED WITH 'sha256_password' PASSWORD EXPIRE NEVER
 0.000001	#	Query	#	#	use `test`; CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*82DC221D557298F6CE9961037DB1C90604792F5C'
 0.000001	#	Query	#	#	use `test`; CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
-0.000001	#	Query	#	#	use `test`; ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string' REQUIRE SSL
+0.000001	#	Query	#	#	use `test`; ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE SSL
 0.000001	#	Query	#	#	use `test`; ALTER USER 'user11'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 0.000001	#	Query	#	#	use `test`; ALTER USER 'user12'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' PASSWORD EXPIRE INTERVAL 90 DAY ACCOUNT UNLOCK
 0.000001	#	Query	#	#	use `test`; CREATE USER 'user13'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' ACCOUNT UNLOCK
@@ -1745,7 +1745,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
            REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1816,8 +1816,7 @@ CREATE USER user16@localhost IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7B
 CREATE USER user10@localhost IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
 SELECT argument FROM mysql.general_log WHERE argument LIKE 'ALTER USER %';
 argument
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
-                         REQUIRE SSL
+ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<secret>' REQUIRE SSL
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
            REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
@@ -1874,7 +1873,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1927,7 +1926,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 0.000001	#	Query	#	#	use `test`; CREATE USER 'user12'@'localhost' IDENTIFIED WITH 'sha256_password' PASSWORD EXPIRE NEVER
 0.000001	#	Query	#	#	use `test`; CREATE USER 'u2'@'localhost' IDENTIFIED BY PASSWORD '*9DEEEFA46E24839BE7F9A49992E9ACA90FE30950'
 0.000001	#	Query	#	#	use `test`; CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
-0.000001	#	Query	#	#	use `test`; ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string' REQUIRE SSL
+0.000001	#	Query	#	#	use `test`; ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE SSL
 0.000001	#	Query	#	#	use `test`; ALTER USER 'user11'@'localhost' IDENTIFIED WITH 'sha256_password' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 0.000001	#	Query	#	#	use `test`; ALTER USER 'user12'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' PASSWORD EXPIRE INTERVAL 90 DAY ACCOUNT UNLOCK
 0.000001	#	Query	#	#	use `test`; CREATE USER 'user13'@'localhost' IDENTIFIED BY PASSWORD '*173F3D05EA1CE4F97ECFD8A770A25A5739FE1EBE' ACCOUNT UNLOCK
@@ -1968,7 +1967,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -2043,8 +2042,7 @@ CREATE USER user10@localhost
 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
 SELECT argument FROM mysql.general_log WHERE argument LIKE 'ALTER USER %';
 argument
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
-                         REQUIRE SSL
+ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<secret>' REQUIRE SSL
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
@@ -2222,6 +2220,6 @@ SHOW CREATE USER bug20625566_user@localhost;
 ERROR 42000: Access denied for user 'bug20625566_dest'@'localhost' to database 'mysql'
 SHOW CREATE USER bug20625566_dest@localhost;
 CREATE USER for bug20625566_dest@localhost
-CREATE USER 'bug20625566_dest'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*64AC67AF30F51749441BE9044F20D83D608F4B33' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
+CREATE USER 'bug20625566_dest'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<secret>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 DROP USER user1@localhost, user1@47.9.9.9, user2,
 bug20625566_user@localhost, bug20625566_dest@localhost;
diff --git a/mysql-test/r/grant_debug.result b/mysql-test/r/grant_debug.result
index b3d77fc51821..3d1b2d23a598 100644
--- a/mysql-test/r/grant_debug.result
+++ b/mysql-test/r/grant_debug.result
@@ -152,3 +152,13 @@ Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 DROP PROCEDURE db_1.p_def;
 DROP DATABASE db_1;
+###
+### Bug#27302337: MYSQL ABORTS WITHOUT PROPER ERROR MESSAGE ON
+###               STARTUP IF GRANT TABLES ARE CORRUPT
+###
+# Shutdown the server
+# Start the server to simulate acl_init() failure
+Pattern "Table 'user' is marked as crashed and should be repaired" found
+Pattern "Fatal error: Failed to initialize ACL/grant/time zones structures or failed to remove temporary table files." found
+Pattern "Aborting" found
+# Restart the server
diff --git a/mysql-test/r/grant_user_lock_qa.result b/mysql-test/r/grant_user_lock_qa.result
index 924217cc7520..336106dc25d7 100644
--- a/mysql-test/r/grant_user_lock_qa.result
+++ b/mysql-test/r/grant_user_lock_qa.result
@@ -266,7 +266,7 @@ SELECT USER();
 USER()
 u4@localhost
 
-CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string'
+CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
 ACCOUNT LOCK PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD EXPIRE INTERVAL 90 DAY;
 SELECT user,plugin,authentication_string,password_expired,
 password_lifetime,account_locked FROM mysql.user WHERE USER='user4';
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index dec56f87be82..4330a7a8e880 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -261,26 +261,35 @@ explain select userid,count(*) from t1 group by userid desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	Using temporary; Using filesort
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select `test`.`t1`.`userID` AS `userid`,count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`userID` desc
 explain select userid,count(*) from t1 group by userid desc order by null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	Using temporary
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select `test`.`t1`.`userID` AS `userid`,count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`userID` desc order by NULL
 select userid,count(*) from t1 group by userid desc;
 userid	count(*)
 3	5
 2	1
 1	2
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select userid,count(*) from t1 group by userid desc having (count(*)+1) IN (4,3);
 userid	count(*)
 1	2
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select userid,count(*) from t1 group by userid desc having 3  IN (1,COUNT(*));
 userid	count(*)
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 explain select spid,count(*) from t1 where spid between 1 and 2 group by spid desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	range	spID	spID	5	NULL	3	100.00	Using where; Using index
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select `test`.`t1`.`spID` AS `spid`,count(0) AS `count(*)` from `test`.`t1` where (`test`.`t1`.`spID` between 1 and 2) group by `test`.`t1`.`spID` desc
 explain select spid,count(*) from t1 where spid between 1 and 2 group by spid;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -300,16 +309,20 @@ select spid,count(*) from t1 where spid between 1 and 2 group by spid desc;
 spid	count(*)
 2	2
 1	1
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 explain extended select sql_big_result spid,sum(userid) from t1 group by spid desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	spID	NULL	NULL	NULL	8	100.00	Using filesort
 Warnings:
 Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select sql_big_result `test`.`t1`.`spID` AS `spid`,sum(`test`.`t1`.`userID`) AS `sum(userid)` from `test`.`t1` group by `test`.`t1`.`spID` desc
 explain select sql_big_result spid,sum(userid) from t1 group by spid desc order by null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	spID	NULL	NULL	NULL	8	100.00	Using filesort
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select sql_big_result `test`.`t1`.`spID` AS `spid`,sum(`test`.`t1`.`userID`) AS `sum(userid)` from `test`.`t1` group by `test`.`t1`.`spID` desc order by NULL
 select sql_big_result spid,sum(userid) from t1 group by spid desc;
 spid	sum(userid)
@@ -320,21 +333,27 @@ spid	sum(userid)
 3	3
 2	3
 1	1
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 explain select sql_big_result score,count(*) from t1 group by score desc;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	index	score	score	3	NULL	8	100.00	Using index; Using filesort
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select sql_big_result `test`.`t1`.`score` AS `score`,count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`score` desc
 explain select sql_big_result score,count(*) from t1 group by score desc order by null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	index	score	score	3	NULL	8	100.00	Using index; Using filesort
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select sql_big_result `test`.`t1`.`score` AS `score`,count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`score` desc order by NULL
 select sql_big_result score,count(*) from t1 group by score desc;
 score	count(*)
 3	5
 2	1
 1	2
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 drop table t1;
 create table t1 (a date default null, b date default null);
 insert t1 values ('1999-10-01','2000-01-10'), ('1997-01-01','1998-10-01');
@@ -638,10 +657,13 @@ userid	count(*)
 3	5
 2	1
 1	2
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 EXPLAIN SELECT userid,count(*) FROM t1 GROUP BY userid DESC;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	Using temporary; Using filesort
 Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 Note	1003	/* select#1 */ select `test`.`t1`.`userid` AS `userid`,count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`userid` desc
 DROP TABLE t1;
 CREATE TABLE t1 (
diff --git a/mysql-test/r/ignore_strict.result b/mysql-test/r/ignore_strict.result
index 3ac496950670..87409a967b0b 100644
--- a/mysql-test/r/ignore_strict.result
+++ b/mysql-test/r/ignore_strict.result
@@ -508,11 +508,9 @@ ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_da
 INSERT IGNORE INTO t1 VALUES(STR_TO_DATE('32.10.2004 15.30','%D.%D.%Y %H.%I'));
 Warnings:
 Warning	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
-Warning	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 UPDATE IGNORE t1 SET col1=STR_TO_DATE('32.10.2004 15.30','%D.%D.%Y %H.%I') WHERE col1='1000-01-01 00:00:00';
 Warnings:
 Warning	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
-Warning	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 DROP TABLE t1;
 #
 #For Error Code : ER_DATETIME_FUNCTION_OVERFLOW
@@ -948,6 +946,6 @@ CREATE TABLE t1(a INT);
 SET @org_safe_updates= @@sql_safe_updates;
 SET SESSION sql_safe_updates=ON;
 DELETE IGNORE FROM t1 WHERE a=1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 DROP TABLE t1;
 SET sql_safe_updates= @org_safe_updates;
diff --git a/mysql-test/r/import_schema_mismatch.result b/mysql-test/r/import_schema_mismatch.result
new file mode 100644
index 000000000000..8b5f6ffd85ef
--- /dev/null
+++ b/mysql-test/r/import_schema_mismatch.result
@@ -0,0 +1,11 @@
+SET GLOBAL innodb_default_row_format = 'compact';
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+SET GLOBAL innodb_default_row_format = 'dynamic';
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+ALTER TABLE t1 DISCARD TABLESPACE;
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_DYNAMIC and the meta-data file has ROW_TYPE_COMPACT)
+DROP TABLE t1;
diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
index 395badc7e5a4..c41ccf5a2e83 100644
--- a/mysql-test/r/index_merge_myisam.result
+++ b/mysql-test/r/index_merge_myisam.result
@@ -2072,19 +2072,19 @@ SET sql_mode = default;
 #
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='index_merge=off,index_merge_union=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='index_merge_union=on';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default,index_merge_sort_union=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch=4;
 set optimizer_switch=NULL;
 ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'NULL'
@@ -2110,21 +2110,21 @@ set optimizer_switch=default;
 set optimizer_switch='index_merge=off,index_merge_union=off,default';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch=default;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set @@global.optimizer_switch=default;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 #
 # Check index_merge's @@optimizer_switch flags
 #
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 create table t0 (a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (a int, b int, c int, filler char(100), 
@@ -2268,5 +2268,5 @@ Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`t
 set optimizer_switch=default;
 show variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 drop table t0, t1;
diff --git a/mysql-test/r/init_connect.result b/mysql-test/r/init_connect.result
index 0ff6c2064228..b3b9099acb95 100644
--- a/mysql-test/r/init_connect.result
+++ b/mysql-test/r/init_connect.result
@@ -134,7 +134,31 @@ x
 17
 19
 drop trigger trg1;
-set global init_connect="set @a='a\\0c'";
 revoke all privileges, grant option from mysqltest1@localhost;
 drop user mysqltest1@localhost;
 drop table t1, t2;
+###
+### Bug#25968185: INIT_CONNECT PREVENTS CONNECTIONS IF PASSWORD EXPIRED
+###
+call mtr.add_suppression("\\[Warning\\] init_connect variable is ignored for user:.* host: localhost due to expired password.");
+CREATE USER user1@localhost PASSWORD EXPIRE;
+CREATE USER ''@localhost;
+UPDATE mysql.user SET password_expired='Y' WHERE user='' AND host='localhost';
+SELECT user, password_expired FROM mysql.user WHERE user='' AND host='localhost';
+user	password_expired
+	Y
+FLUSH PRIVILEGES;
+SET GLOBAL init_connect="set @a=2;";
+Pattern "\[Warning\] init_connect variable is ignored for user: user1 host: localhost due to expired password." found
+SELECT @a;
+ERROR HY000: You must reset your password using ALTER USER statement before executing this statement.
+SET PASSWORD = 'abc';
+SELECT @a;
+@a
+NULL
+Pattern "\[Warning\] init_connect variable is ignored for user:  host: localhost due to expired password." found
+SELECT @a;
+ERROR HY000: You must reset your password using ALTER USER statement before executing this statement.
+DROP USER user1@localhost;
+DROP USER ''@localhost;
+set global init_connect="set @a='a\\0c'";
diff --git a/mysql-test/r/initialize-yassl-warning.result b/mysql-test/r/initialize-yassl-warning.result
deleted file mode 100644
index 67fe4816f1d0..000000000000
--- a/mysql-test/r/initialize-yassl-warning.result
+++ /dev/null
@@ -1,26 +0,0 @@
-# We don't care about innodb warnings at this point
-CALL mtr.add_suppression("InnoDB:");
-# shut server down
-# Server is down
-#
-# Try --initialize --ssl and don't exect a warning
-#
-# create the empty datadir
-# start a server with --initialize --ssl
-# look for "ssl failed". Must get 0.
-ssl failed message found 0 times
-# delete datadir
-# delete mysqld log
-#
-# Try --initialize --ssl --ssl-ca and expect a warning
-#
-# create the empty datadir
-# start a server with --initialize --ssl -ssl-ca
-# look for "ssl failed". Must get 1.
-ssl failed message found 1 times
-# delete datadir
-# delete mysqld log
-#
-# Cleanup
-#
-# Restarting the server
diff --git a/mysql-test/r/innodb_explain_json_non_select_all.result b/mysql-test/r/innodb_explain_json_non_select_all.result
index e00f932a9fa2..ae943260293a 100644
--- a/mysql-test/r/innodb_explain_json_non_select_all.result
+++ b/mysql-test/r/innodb_explain_json_non_select_all.result
@@ -6817,9 +6817,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/innodb_explain_json_non_select_none.result b/mysql-test/r/innodb_explain_json_non_select_none.result
index 1fe1012dc8d6..43ff30a61c7f 100644
--- a/mysql-test/r/innodb_explain_json_non_select_none.result
+++ b/mysql-test/r/innodb_explain_json_non_select_none.result
@@ -6853,9 +6853,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/innodb_explain_non_select_all.result b/mysql-test/r/innodb_explain_non_select_all.result
index 7204763b495b..197bfea97842 100644
--- a/mysql-test/r/innodb_explain_non_select_all.result
+++ b/mysql-test/r/innodb_explain_non_select_all.result
@@ -2658,9 +2658,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/innodb_explain_non_select_none.result b/mysql-test/r/innodb_explain_non_select_none.result
index 1b70a86fa5bc..1c4af517ddcf 100644
--- a/mysql-test/r/innodb_explain_non_select_none.result
+++ b/mysql-test/r/innodb_explain_non_select_none.result
@@ -2660,9 +2660,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result
index 3a400e484f7c..960aec1a3d15 100644
--- a/mysql-test/r/innodb_mysql_sync.result
+++ b/mysql-test/r/innodb_mysql_sync.result
@@ -746,3 +746,22 @@ ALTER TABLE t1 MODIFY fld1 CHAR(20);
 #cleanup
 DROP TABLE t1;
 SET debug="-d,innodb_index_drop_count_zero";
+#
+# BUG#26848813: INDEXED COLUMN CAN'T BE CHANGED FROM VARCHAR(15)
+#               TO VARCHAR(40) INSTANTANEOUSLY
+CREATE TABLE t1(fld1 VARCHAR(5), KEY(fld1)) ENGINE= InnoDB;
+SET DEBUG="+d,innodb_index_drop_count_zero";
+# Without patch, an error is reported.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(7), ALGORITHM= INPLACE;
+# Scenario where non-packed keys is converted to packed keys
+# before the patch, an error is reported.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(9), ALGORITHM= INPLACE;
+SET DEBUG="-d,innodb_index_drop_count_zero";
+# Tests added for covering cases where rebuild is required.
+# Reducing the size of the field.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(3), ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+# Increasing the size of the field to boundary condition.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(256), ALGORITHM= INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY.
+DROP TABLE t1;
diff --git a/mysql-test/r/innodb_pk_extension_off.result b/mysql-test/r/innodb_pk_extension_off.result
index efded8c48387..418f86d70d6e 100644
--- a/mysql-test/r/innodb_pk_extension_off.result
+++ b/mysql-test/r/innodb_pk_extension_off.result
@@ -341,7 +341,7 @@ f6 = 0 AND f7 = 0 AND f8 = 0 AND f9 = 0 AND f10 = 0 AND
 f11 = 0 AND f12 = 0 AND f13 = 0 AND f14 = 0 AND
 f15 = 0 AND f16 = 0 AND f17 = 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	35	const,const,const,const,const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	35	const,const,const,const,const,const,const	#	100.00	Using index condition; Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f17` AS `f17` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f17` = 0) and (`test`.`t1`.`f16` = 0) and (`test`.`t1`.`f15` = 0) and (`test`.`t1`.`f14` = 0) and (`test`.`t1`.`f13` = 0) and (`test`.`t1`.`f12` = 0) and (`test`.`t1`.`f11` = 0) and (`test`.`t1`.`f10` = 0) and (`test`.`t1`.`f9` = 0) and (`test`.`t1`.`f8` = 0) and (`test`.`t1`.`f7` = 0) and (`test`.`t1`.`f6` = 0) and (`test`.`t1`.`f5` = 0) and (`test`.`t1`.`f4` = 0) and (`test`.`t1`.`f3` = 0) and (`test`.`t1`.`f2` = 0) and (`test`.`t1`.`f1` = 0))
 EXPLAIN SELECT f17 FROM t1 FORCE INDEX (k1) WHERE
@@ -369,7 +369,7 @@ EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
 f1 = 'a' AND f2 = 'a' AND f3 = 'a' AND f4 = 'a' AND
 f5 = 'a' AND f6 = 'a' AND f7 = 'a';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	1509	const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	1509	const,const,const	#	100.00	Using index condition; Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f5` AS `f5` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f7` = 'a') and (`test`.`t1`.`f6` = 'a') and (`test`.`t1`.`f5` = 'a') and (`test`.`t1`.`f4` = 'a') and (`test`.`t1`.`f3` = 'a') and (`test`.`t1`.`f2` = 'a') and (`test`.`t1`.`f1` = 'a'))
 EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
@@ -383,7 +383,7 @@ EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
 f1 = 'a' AND f2 = 'a' AND f4 = 'a' AND
 f5 = 'a' AND f6 = 'a' AND f7 = 'a';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	1509	const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	1509	const,const,const	#	100.00	Using index condition; Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f5` AS `f5` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f7` = 'a') and (`test`.`t1`.`f6` = 'a') and (`test`.`t1`.`f5` = 'a') and (`test`.`t1`.`f4` = 'a') and (`test`.`t1`.`f2` = 'a') and (`test`.`t1`.`f1` = 'a'))
 DROP TABLE t1;
@@ -441,4 +441,27 @@ SELECT st_astext(a) FROM t1 WHERE st_equals(a, point(7, 7));
 st_astext(a)
 POINT(7 7)
 DROP TABLE t1;
+#
+# Bug #31617858 INCORRECT RESULTS WHEN USING INDEX ON LONG CHARACTER COLS.
+#
+CREATE TABLE t(
+a VARCHAR(256) NOT NULL,
+i VARCHAR(1024) NOT NULL,
+PRIMARY KEY (a),
+KEY (i)) DEFAULT CHARSET=utf8;
+INSERT INTO t VALUES
+('aaa12345678','aaa'), ('aaa2','aaa'), ('aaa4','aaa'),
+('aaa3','aaa'),('aaa1','aaa');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	i	i	3074	NULL	5	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t`.`i` AS `i` from `test`.`t` FORCE INDEX (`i`) where (`test`.`t`.`a` like '%aaa12345678%')
+SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+i
+aaa
+DROP TABLE t;
 set optimizer_switch=default;
diff --git a/mysql-test/r/innodb_pk_extension_on.result b/mysql-test/r/innodb_pk_extension_on.result
index 7e2c13130187..f318276f0ba3 100644
--- a/mysql-test/r/innodb_pk_extension_on.result
+++ b/mysql-test/r/innodb_pk_extension_on.result
@@ -341,7 +341,7 @@ f6 = 0 AND f7 = 0 AND f8 = 0 AND f9 = 0 AND f10 = 0 AND
 f11 = 0 AND f12 = 0 AND f13 = 0 AND f14 = 0 AND
 f15 = 0 AND f16 = 0 AND f17 = 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	71	const,const,const,const,const,const,const,const,const,const,const,const,const,const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	71	const,const,const,const,const,const,const,const,const,const,const,const,const,const,const,const	#	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f17` AS `f17` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f17` = 0) and (`test`.`t1`.`f16` = 0) and (`test`.`t1`.`f15` = 0) and (`test`.`t1`.`f14` = 0) and (`test`.`t1`.`f13` = 0) and (`test`.`t1`.`f12` = 0) and (`test`.`t1`.`f11` = 0) and (`test`.`t1`.`f10` = 0) and (`test`.`t1`.`f9` = 0) and (`test`.`t1`.`f8` = 0) and (`test`.`t1`.`f7` = 0) and (`test`.`t1`.`f6` = 0) and (`test`.`t1`.`f5` = 0) and (`test`.`t1`.`f4` = 0) and (`test`.`t1`.`f3` = 0) and (`test`.`t1`.`f2` = 0) and (`test`.`t1`.`f1` = 0))
 EXPLAIN SELECT f17 FROM t1 FORCE INDEX (k1) WHERE
@@ -369,7 +369,7 @@ EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
 f1 = 'a' AND f2 = 'a' AND f3 = 'a' AND f4 = 'a' AND
 f5 = 'a' AND f6 = 'a' AND f7 = 'a';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	3015	const,const,const,const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	3015	const,const,const,const,const,const	#	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f5` AS `f5` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f7` = 'a') and (`test`.`t1`.`f6` = 'a') and (`test`.`t1`.`f5` = 'a') and (`test`.`t1`.`f4` = 'a') and (`test`.`t1`.`f3` = 'a') and (`test`.`t1`.`f2` = 'a') and (`test`.`t1`.`f1` = 'a'))
 EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
@@ -383,7 +383,7 @@ EXPLAIN SELECT f5 FROM t1 FORCE INDEX (k1) WHERE
 f1 = 'a' AND f2 = 'a' AND f4 = 'a' AND
 f5 = 'a' AND f6 = 'a' AND f7 = 'a';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ref	k1	k1	2513	const,const,const,const,const	#	100.00	Using where; Using index
+1	SIMPLE	t1	NULL	ref	k1	k1	2513	const,const,const,const,const	#	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`f5` AS `f5` from `test`.`t1` FORCE INDEX (`k1`) where ((`test`.`t1`.`f7` = 'a') and (`test`.`t1`.`f6` = 'a') and (`test`.`t1`.`f5` = 'a') and (`test`.`t1`.`f4` = 'a') and (`test`.`t1`.`f2` = 'a') and (`test`.`t1`.`f1` = 'a'))
 DROP TABLE t1;
@@ -441,4 +441,27 @@ SELECT st_astext(a) FROM t1 WHERE st_equals(a, point(7, 7));
 st_astext(a)
 POINT(7 7)
 DROP TABLE t1;
+#
+# Bug #31617858 INCORRECT RESULTS WHEN USING INDEX ON LONG CHARACTER COLS.
+#
+CREATE TABLE t(
+a VARCHAR(256) NOT NULL,
+i VARCHAR(1024) NOT NULL,
+PRIMARY KEY (a),
+KEY (i)) DEFAULT CHARSET=utf8;
+INSERT INTO t VALUES
+('aaa12345678','aaa'), ('aaa2','aaa'), ('aaa4','aaa'),
+('aaa3','aaa'),('aaa1','aaa');
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	i	i	3074	NULL	5	20.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select distinct `test`.`t`.`i` AS `i` from `test`.`t` FORCE INDEX (`i`) where (`test`.`t`.`a` like '%aaa12345678%')
+SELECT DISTINCT(i) FROM t FORCE INDEX(i) WHERE a LIKE '%aaa12345678%';
+i
+aaa
+DROP TABLE t;
 set optimizer_switch=default;
diff --git a/mysql-test/r/insert_debug.result b/mysql-test/r/insert_debug.result
new file mode 100644
index 000000000000..e5e884339f3f
--- /dev/null
+++ b/mysql-test/r/insert_debug.result
@@ -0,0 +1,24 @@
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+CREATE TABLE t1(c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10) NOT NULL, c3 VARCHAR(10) NOT NULL);
+INSERT INTO t1(c1, c2, c3) VALUES('A1','B1','IT1'), ('A2','B2','IT1'), ('A3','B3','IT1'), ('A4','B4','IT1'), ('A5','B5','IT1'), ('A6','B6','IT1'), ('A7','B7','IT1');
+CREATE TABLE t2(c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10) NOT NULL, c3 VARCHAR(10) NOT NULL);
+INSERT INTO t2(c1, c2, c3) VALUES ('A3','B3','IT2'), ('A2','B2','IT2'), ('A4','B4','IT2'), ('A5','B5','II2');
+CREATE TABLE result(id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10),
+c3 VARCHAR(10), update_count INT DEFAULT 0, UNIQUE KEY uniq_idx (c1,c2), PRIMARY KEY (id)) ENGINE = innodb;
+SET DEBUG_SYNC = "ha_write_row_end WAIT_FOR flushed EXECUTE 1";
+INSERT INTO result(c1, c2, c3) SELECT * FROM t1 ON DUPLICATE KEY UPDATE c2=t1.c2, c3='UT1', update_count=update_count+1;
+INSERT INTO result(c1, c2, c3) SELECT * FROM t2 ON DUPLICATE KEY UPDATE c2=t2.c2, c3='UT2', update_count=update_count+1;
+SET DEBUG_SYNC = "now SIGNAL flushed";
+SELECT * FROM result;
+id	c1	c2	c3	update_count
+1	A1	B1	IT1	0
+2	A3	B3	UT1	1
+3	A2	B2	UT1	1
+4	A4	B4	UT1	1
+5	A5	B5	UT1	1
+9	A6	B6	IT1	0
+10	A7	B7	IT1	0
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE result;
diff --git a/mysql-test/r/join_file_handler.result b/mysql-test/r/join_file_handler.result
new file mode 100644
index 000000000000..9cfa6f8460aa
--- /dev/null
+++ b/mysql-test/r/join_file_handler.result
@@ -0,0 +1,33 @@
+#
+# Bug#28039829: SELECT QUERY WITH COMPLEX JOINS LEAKS FILE HANDLES
+#
+CREATE DATABASE db_28039829;
+USE db_28039829;
+CREATE TABLE t1 (c1 CHAR(36) NOT NULL,
+c2 CHAR(36) DEFAULT NULL,
+c3 VARCHAR(100) DEFAULT NULL,
+c4 VARCHAR(100) DEFAULT NULL,
+PRIMARY KEY (c1),
+KEY idx_1 (c2),
+KEY idx_2 (c3, c4),
+KEY idx_3 (c4, c3))
+ENGINE=InnoDB;
+CREATE TABLE t2 (c1 CHAR(36) DEFAULT NULL)
+ENGINE=InnoDB DEFAULT CHARSET=utf8;
+LOAD DATA INFILE '../../std_data/bug28039829.dat' INTO TABLE t1;
+INSERT INTO t2 VALUES ('63dfcd94-143a-11e7-bec8-fa163e4dd901'),
+('dcda6718-143a-11e7-82e5-fa163e4dd901');
+SET optimizer_switch="block_nested_loop=OFF";
+SELECT t1.c1 FROM t1 INNER JOIN t2 ON t1.c2 = t2.c1
+WHERE (t1.c3 LIKE 'James' OR t1.c4 LIKE 'abc');
+c1
+0e6a4474-9703-11e7-bb28-fa163e8624cc
+116be260-96f2-11e7-bc89-fa163e8624cc
+1b1857e4-8a3b-11e7-9579-fa163e8624cc
+458320fe-0b1e-11e8-b68a-fa163e8624cc
+6f002136-0ff9-11e8-9fab-fa163e8624cc
+767eb9fe-fcfd-11e7-98ee-fa163e8624cc
+98c2aebe-0a57-11e8-8111-fa163e8624cc
+DROP TABLE t1, t2;
+DROP DATABASE db_28039829;
+SET optimizer_switch=DEFAULT;
diff --git a/mysql-test/r/join_outer_innodb.result b/mysql-test/r/join_outer_innodb.result
index af4d9847e15c..80ddb558de15 100644
--- a/mysql-test/r/join_outer_innodb.result
+++ b/mysql-test/r/join_outer_innodb.result
@@ -61,3 +61,22 @@ pk
 
 DROP TABLE t1,t2;
 # End BUG#58456
+#
+# Bug #20939184:INNODB: UNLOCK ROW COULD NOT FIND A 2 MODE LOCK ON THE
+#               RECORD
+#
+CREATE  TABLE t1 (c1 INT, c2 INT, c3 INT, PRIMARY KEY (c1,c2) );
+CREATE  TABLE t2 (c1 INT, c2 INT, c3 INT, PRIMARY KEY (c1), KEY (c2));
+INSERT INTO t1 VALUES (1,2,3),(2,3,4),(3,4,5);
+INSERT INTO t2 SELECT * FROM t1;
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+START TRANSACTION;
+SELECT * FROM t1 LEFT JOIN t2 ON t1.c2=t2.c2 AND t2.c1=1 FOR UPDATE;
+c1	c2	c3	c1	c2	c3
+1	2	3	1	2	3
+2	3	4	NULL	NULL	NULL
+3	4	5	NULL	NULL	NULL
+UPDATE t1 LEFT JOIN t2 ON t1.c1 = t2.c2 AND t2.c1 = 3 SET t1.c3 = RAND()*10;
+COMMIT;
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+DROP TABLE t1,t2;
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index f7b9eac1339d..a949f57a376e 100644
--- a/mysql-test/r/key.result
+++ b/mysql-test/r/key.result
@@ -601,6 +601,8 @@ c1
 1
 1
 1
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b INT, INDEX (a,b)) engine=myisam;
 INSERT INTO t1 (a, b)
diff --git a/mysql-test/r/lowercase_table4.result b/mysql-test/r/lowercase_table4.result
index f896b9008e3c..57fc58683716 100644
--- a/mysql-test/r/lowercase_table4.result
+++ b/mysql-test/r/lowercase_table4.result
@@ -113,3 +113,34 @@ REFERENCED_TABLE_NAME	Customer
 DROP TABLE Product_Order;
 DROP TABLE Product;
 DROP TABLE Customer;
+#
+# Bug#29957361: TABLE NOT IN THE SHOW TABLES WITH LOWER_CASE_TABLE_NAMES=2
+#
+CREATE DATABASE my_db;
+USE my_db;
+CREATE TABLE UPPERCASE_MYISAM (a INT) ENGINE=MYISAM;
+CREATE TABLE lowercase_myisam (a INT) ENGINE=MYISAM;
+CREATE TABLE UPPERCASE_INNODB (a INT) ENGINE=InnoDB;
+CREATE TABLE lowercase_innodb (a INT) ENGINE=InnoDB;
+SHOW TABLES;
+Tables_in_my_db
+UPPERCASE_INNODB
+UPPERCASE_MYISAM
+lowercase_innodb
+lowercase_myisam
+CREATE USER 'test_user'@'localhost';
+GRANT SELECT ON my_db.UPPERCASE_MYISAM TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.lowercase_myisam TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.UPPERCASE_INNODB TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.lowercase_innodb TO 'test_user'@'localhost';
+USE my_db;
+# Without the patch, tables with uppercase table names were not displayed.
+SHOW TABLES;
+Tables_in_my_db
+UPPERCASE_INNODB
+UPPERCASE_MYISAM
+lowercase_innodb
+lowercase_myisam
+DROP USER 'test_user'@'localhost';
+DROP DATABASE my_db;
+USE test;
diff --git a/mysql-test/r/mdl_tablespace.result b/mysql-test/r/mdl_tablespace.result
index 37d422df8fce..47d8b4126037 100644
--- a/mysql-test/r/mdl_tablespace.result
+++ b/mysql-test/r/mdl_tablespace.result
@@ -865,6 +865,8 @@ ENGINE=InnoDB
 PARTITION BY RANGE (a)
 PARTITIONS 1
 (PARTITION P1 VALUES LESS THAN (2) TABLESPACE ts1);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 #############################################
 # Case1: Checking TRUNCATE TABLE
 # Sending 'TRUNCATE TABLE t1;'
@@ -900,6 +902,8 @@ CREATE TABLE t3 ( a INT NOT NULL, PRIMARY KEY (a)) ENGINE=InnoDB PARTITION BY RA
 SET DEBUG_SYNC= 'now WAIT_FOR got_lock';
 SET DEBUG_SYNC= 'now SIGNAL cont';
 # Reaping 'CREATE TABLE'
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 #############################################
 # Case5: Checking CREATE TABLE LIKE
 SET DEBUG_SYNC= 'RESET';
@@ -911,6 +915,8 @@ CREATE TABLE t4 LIKE t3;;
 SET DEBUG_SYNC= 'now WAIT_FOR got_lock';
 SET DEBUG_SYNC= 'now SIGNAL cont';
 # Reaping 'CREATE TABLE LIKE'
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 #############################################
 # Case6: Checking ALTER TABLE ... PARTITION
 CREATE TABLESPACE ts2 ADD DATAFILE 'ts2.ibd';
@@ -923,6 +929,8 @@ ALTER TABLE t2 ADD PARTITION (partition p2 values less than (4) tablespace ts2);
 SET DEBUG_SYNC= 'now WAIT_FOR got_lock';
 SET DEBUG_SYNC= 'now SIGNAL cont';
 # Reaping 'ALTER TABLE'
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 #############################################
 # Case7: Checking LOCK TABLE t2 WRITE
 SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result
index 2ba40d95df7b..83e99b9b6629 100644
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -409,3 +409,19 @@ f1
 DROP VIEW v1,v2;
 DROP TABLE t1;
 # End of test for Bug#22364401
+#
+# Bug #27422376: NEWDATE TYPE IS LEAKING OUT
+#
+SELECT CAST('2018-01-28 00:00:01' AS DATE) UNION
+SELECT CAST('2018-01-28 00:00:01' AS DATE);
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def				CAST('2018-01-28 00:00:01' AS DATE)	CAST('2018-01-28 00:00:01' AS DATE)	10	10	10	Y	128	0	63
+CAST('2018-01-28 00:00:01' AS DATE)
+2018-01-28
+SELECT CAST('2018-01-28 00:00:01' AS DATE) UNION ALL
+SELECT CAST('2018-01-28 00:00:01' AS DATE);
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def					CAST('2018-01-28 00:00:01' AS DATE)	10	10	10	Y	0	0	8
+CAST('2018-01-28 00:00:01' AS DATE)
+2018-01-28
+2018-01-28
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
index 0305fa0b6c84..90cea84e9687 100644
--- a/mysql-test/r/multi_update.result
+++ b/mysql-test/r/multi_update.result
@@ -182,10 +182,10 @@ drop table t1,t2;
 set sql_safe_updates=1;
 create table t1 (n int(10), d int(10));
 create table t2 (n int(10), d int(10));
-insert into t1 values(1,1);
+insert into t1 values(1,1), (3,30);
 insert into t2 values(1,10),(2,20);
 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 set sql_safe_updates=0;
 drop table t1,t2;
 set timestamp=1038401397;
@@ -667,7 +667,7 @@ INSERT INTO t1 VALUES (1), (2), (3);
 SET SESSION sql_safe_updates = 1;
 # Must not cause failed assertion
 UPDATE IGNORE t1, t1 t1a SET t1.a = 1 WHERE t1a.a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 DROP TABLE t1;
 #
 # Bug#54543: update ignore with incorrect subquery leads to assertion
diff --git a/mysql-test/r/multi_update_innodb.result b/mysql-test/r/multi_update_innodb.result
index 591261604599..290d3770322a 100644
--- a/mysql-test/r/multi_update_innodb.result
+++ b/mysql-test/r/multi_update_innodb.result
@@ -109,3 +109,37 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 UPDATE t1,t2 SET t2.b=0;
 SET sql_buffer_result=@old_buf_result;
 DROP TABLE t1,t2;
+#
+# Bug#28716103 - MULTI-TABLE UPDATE OF PRIMARY KEY RESULTS IN ERROR 1032
+# "CAN'T FIND RECORD"
+#
+CREATE TABLE t1 (c1 CHAR(255) NOT NULL);
+CREATE TABLE t2 (c1 CHAR(255) NOT NULL, c2 CHAR(255) NOT NULL,
+c3 CHAR(255) NOT NULL,  PRIMARY KEY (c1, c2, c3));
+INSERT INTO t1 VALUES ('x'), ('x');
+INSERT INTO t2 VALUES ('x', '', '');
+UPDATE t1, t2 SET t2.c2 = 'y', t2.c3 = 'y' WHERE t2.c1 = t1.c1;
+SELECT * FROM t2;
+c1	c2	c3
+x	y	y
+DROP TABLE t1, t2;
+CREATE TABLE t1(c1 VARCHAR(350), c2 VARCHAR(350),
+c3 INT, PRIMARY KEY(c1,c2)) charset=utf8mb3;
+INSERT INTO t1 VALUES ('a','a',1);
+INSERT INTO t1 VALUES ('a','b',2);
+INSERT INTO t1 VALUES ('a','c',3);
+INSERT INTO t1 VALUES ('a','d',4);
+INSERT INTO t1 VALUES ('a','e',5);
+INSERT INTO t1 VALUES ('a','f',6);
+INSERT INTO t1 VALUES ('a','g',7);
+INSERT INTO t1 VALUES ('a','h',8);
+INSERT INTO t1 VALUES ('a','i',9);
+INSERT INTO t1 VALUES ('a','j',10);
+INSERT INTO t1 VALUES ('a','k',11);
+SET @@SESSION.tmp_table_size=1024;
+UPDATE t1 a, t1 b SET a.c3=22 WHERE a.c1 = b.c1;
+SELECT COUNT(*) FROM t1 WHERE c3=22;
+COUNT(*)
+11
+SET @@SESSION.tmp_table_size=DEFAULT;
+DROP TABLE t1;
diff --git a/mysql-test/r/myisam-blob.result b/mysql-test/r/myisam-blob.result
index a528f54b9862..a7b8dae45a91 100644
--- a/mysql-test/r/myisam-blob.result
+++ b/mysql-test/r/myisam-blob.result
@@ -1,3 +1,6 @@
+SET SQL_MODE='';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 drop table if exists t1;
 CREATE TABLE t1 (data LONGBLOB) ENGINE=myisam;
 INSERT INTO t1 (data) VALUES (NULL);
@@ -29,6 +32,8 @@ select length(data) from t1;
 length(data)
 18874368
 alter table t1 modify data blob;
+Warnings:
+Warning	1265	Data truncated for column 'data' at row 1
 select length(data) from t1;
 length(data)
 0
@@ -42,3 +47,4 @@ select length(data) from t1;
 length(data)
 65535
 drop table t1;
+SET SQL_MODE=default;
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 11d19cc2d388..88c4f9234646 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -827,10 +827,6 @@ a	b
 xxxxxxxxx	bbbbbb
 xxxxxxxxx	bbbbbb
 DROP TABLE t1;
-SET @@myisam_repair_threads=2;
-SHOW VARIABLES LIKE 'myisam_repair%';
-Variable_name	Value
-myisam_repair_threads	2
 CREATE TABLE t1 (
 `_id` int(11) NOT NULL default '0',
 `url` text,
@@ -949,10 +945,6 @@ _id
 8
 9
 DROP TABLE t1;
-SET @@myisam_repair_threads=1;
-SHOW VARIABLES LIKE 'myisam_repair%';
-Variable_name	Value
-myisam_repair_threads	1
 CREATE TABLE t1(a VARCHAR(16));
 INSERT INTO t1 VALUES('aaaaaaaa'),(NULL);
 UPDATE t1 AS ta1, t1 AS ta2 SET ta1.a='aaaaaaaaaaaaaaaa';
@@ -1888,10 +1880,8 @@ SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 t1	MyISAM	10	Fixed	1	#	#	#	3072	#	#	#	#	#	#	#		
 # Enable keys with parallel repair
-SET @@myisam_repair_threads=2;
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
-SET @@myisam_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -2409,9 +2399,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	repair	error	myisam_sort_buffer_size is too small
 test.t1	repair	warning	Number of rows changed from 0 to 7168
 test.t1	repair	status	OK
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -2483,28 +2471,6 @@ a	a
 1	1
 DROP TABLE t1;
 #
-# BUG#47444 - --myisam_repair_threads>1can result in all index
-#             cardinalities=1
-#
-SET myisam_repair_threads=2;
-SET myisam_sort_buffer_size=4096;
-CREATE TABLE t1(a CHAR(255), KEY(a), KEY(a), KEY(a));
-Warnings:
-Warning	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Warning	1831	Duplicate index 'a_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(0),(1),(2),(3);
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
-SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
-CARDINALITY
-14
-14
-14
-DROP TABLE t1;
-SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-#
 # BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN
 #                USING MYISAM_USE_MMAP ON WINDOWS
 #
diff --git a/mysql-test/r/myisam_explain_json_non_select_all.result b/mysql-test/r/myisam_explain_json_non_select_all.result
index 04aba419947e..4400aae2383d 100644
--- a/mysql-test/r/myisam_explain_json_non_select_all.result
+++ b/mysql-test/r/myisam_explain_json_non_select_all.result
@@ -6666,9 +6666,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/myisam_explain_json_non_select_none.result b/mysql-test/r/myisam_explain_json_non_select_none.result
index 0e772769be31..5fbfde50689d 100644
--- a/mysql-test/r/myisam_explain_json_non_select_none.result
+++ b/mysql-test/r/myisam_explain_json_non_select_none.result
@@ -6698,9 +6698,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/myisam_explain_non_select_all.result b/mysql-test/r/myisam_explain_non_select_all.result
index e6d4a055e452..5166122e58c9 100644
--- a/mysql-test/r/myisam_explain_non_select_all.result
+++ b/mysql-test/r/myisam_explain_non_select_all.result
@@ -2541,9 +2541,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/myisam_explain_non_select_none.result b/mysql-test/r/myisam_explain_non_select_none.result
index 10ba4bf98197..128bd290bfa7 100644
--- a/mysql-test/r/myisam_explain_non_select_none.result
+++ b/mysql-test/r/myisam_explain_non_select_none.result
@@ -2539,9 +2539,13 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 EXPLAIN EXTENDED UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t11	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	SIMPLE	t12	NULL	index	NULL	a	5	NULL	2	100.00	Using index
+Warnings:
+Warning	1681	'EXTENDED' is deprecated and will be removed in a future release.
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result
index 2bb265dda215..8b687a9683f2 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/r/myisam_icp.result
@@ -599,7 +599,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 3	SUBQUERY	t3	NULL	system	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
 Note	1276	Field or reference 'test.t1.c1' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual))))
+Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual)) and ((/* select#3 */ select min('v') from dual) <> 'w')))
 SELECT i1
 FROM t1
 WHERE EXISTS (SELECT t2.c1
diff --git a/mysql-test/r/myisam_icp_all.result b/mysql-test/r/myisam_icp_all.result
index 9eecf33fae59..572fabea0aa5 100644
--- a/mysql-test/r/myisam_icp_all.result
+++ b/mysql-test/r/myisam_icp_all.result
@@ -599,7 +599,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 3	SUBQUERY	t3	NULL	system	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
 Note	1276	Field or reference 'test.t1.c1' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual))))
+Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual)) and ((/* select#3 */ select min('v') from dual) <> 'w')))
 SELECT i1
 FROM t1
 WHERE EXISTS (SELECT t2.c1
diff --git a/mysql-test/r/myisam_icp_none.result b/mysql-test/r/myisam_icp_none.result
index 963b76853110..da5855bfffe1 100644
--- a/mysql-test/r/myisam_icp_none.result
+++ b/mysql-test/r/myisam_icp_none.result
@@ -598,7 +598,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered
 3	SUBQUERY	t3	NULL	system	NULL	NULL	NULL	NULL	1	100.00	NULL
 Warnings:
 Note	1276	Field or reference 'test.t1.c1' of SELECT #2 was resolved in SELECT #1
-Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual))))
+Note	1003	/* select#1 */ select '2' AS `i1` from dual where exists(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` where ((`test`.`t2`.`c1` = 'v') and (`test`.`t2`.`c2` = (/* select#3 */ select min('v') from dual)) and ((/* select#3 */ select min('v') from dual) <> 'w')))
 SELECT i1
 FROM t1
 WHERE EXISTS (SELECT t2.c1
diff --git a/mysql-test/r/mysql_batch_mode.result b/mysql-test/r/mysql_batch_mode.result
new file mode 100644
index 000000000000..26924768ac24
--- /dev/null
+++ b/mysql-test/r/mysql_batch_mode.result
@@ -0,0 +1,4 @@
+#
+# Bug #32015466: MYSQL BATCH MODE EXECUTE SQL
+#        FAILED WITH MYSQL CLIENT
+#
diff --git a/mysql-test/r/mysql_config_editor.result b/mysql-test/r/mysql_config_editor.result
index 7d2687ca4315..bae2d83e9e1d 100644
--- a/mysql-test/r/mysql_config_editor.result
+++ b/mysql-test/r/mysql_config_editor.result
@@ -100,7 +100,7 @@ user = test_user4
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
-Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
 Oracle is a registered trademark of Oracle Corporation and/or its
 affiliates. Other names may be trademarks of their respective
@@ -319,4 +319,11 @@ DROP USER user_name_len_25_01234567@localhost,user_name_len_26_012345678@localho
 # Restarting the server. Should work
 # restart
 # Cleanup
+#
+# Bug#29861961: MYSQL_CONFIG_EDITOR CAN NOT DEAL PASSWORD WITH "#"
+#
+CREATE USER 'test#user1'@'localhost';
+mysqld is alive
+# Cleanup
+DROP USER 'test#user1'@'localhost';
 # End of 5.6 tests
diff --git a/mysql-test/r/mysql_plugin.result b/mysql-test/r/mysql_plugin.result
index ea09a4f1e20f..16526068d939 100644
--- a/mysql-test/r/mysql_plugin.result
+++ b/mysql-test/r/mysql_plugin.result
@@ -119,7 +119,7 @@ ERROR: Missing --plugin_dir option.
 # Show the help.
 #
 mysql_plugin  Ver V.V.VV Distrib XX.XX.XX
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 
 Enable or disable plugins.
 
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 33a9236fa84e..ac7f74c37b35 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -931,7 +931,7 @@ mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
-The sys schema is already up to date (version 1.5.1).
+The sys schema is already up to date (version 1.5.2).
 Checking databases.
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
diff --git a/mysql-test/r/mysqladmin.result b/mysql-test/r/mysqladmin.result
index 281c7ee9d4f4..4d3c66ba7d65 100644
--- a/mysql-test/r/mysqladmin.result
+++ b/mysql-test/r/mysqladmin.result
@@ -19,6 +19,7 @@ mysqld is alive
 #
 # Creating an empty file 'cnf_file'
 # Using --defaults-extra-file option with 'cnf_file'.
+mysqladmin: [Warning] Using a password on the command line interface can be insecure.
 mysqld is alive
 #
 # Bug#12688860 : SECURITY RECOMMENDATION: PASSWORDS ON CLI
diff --git a/mysql-test/r/mysqladmin_shutdown.result b/mysql-test/r/mysqladmin_shutdown.result
new file mode 100644
index 000000000000..655a619dbd9d
--- /dev/null
+++ b/mysql-test/r/mysqladmin_shutdown.result
@@ -0,0 +1,4 @@
+#
+# Bug#28466137 MYSQLADMIN SHUTDOWN DOES NOT WAIT FOR MYSQL TO SHUT DOWN ANYMORE
+#
+mysqladmin: [Warning] Using a password on the command line interface can be insecure.
diff --git a/mysql-test/r/mysqlbinlog_base64_flag.result b/mysql-test/r/mysqlbinlog_base64_flag.result
new file mode 100644
index 000000000000..b69a32b02c59
--- /dev/null
+++ b/mysql-test/r/mysqlbinlog_base64_flag.result
@@ -0,0 +1,114 @@
+DROP TABLE IF EXISTS t1;
+==== Test BUG#32407 ====
+select * from t1;
+a
+1
+1
+==== Test BINLOG statement w/o FD event ====
+BINLOG '
+SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
+';
+ERROR HY000: The BINLOG statement of type `Table_map` was not preceded by a format description BINLOG statement.
+select * from t1;
+a
+1
+1
+==== Test BINLOG statement with FD event ====
+BINLOG '
+ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+BINLOG '
+TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA==
+';
+select * from t1;
+a
+1
+1
+3
+==== Test --base64-output=never on a binlog with row events ====
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
+DELIMITER /*!*/;
+# at 4
+<#>ROLLBACK/*!*/;
+# at 120
+<#>use `test`/*!*/;
+SET TIMESTAMP=1360247561/*!*/;
+<#>SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
+SET @@session.sql_mode=1073741824/*!*/;
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
+/*!\C utf8 *//*!*/;
+SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
+SET @@session.lc_time_names=0/*!*/;
+SET @@session.collation_database=DEFAULT/*!*/;
+CREATE TABLE t1 (a int) engine = myisam
+/*!*/;
+# at 233
+<#>SET TIMESTAMP=1360247563/*!*/;
+BEGIN
+/*!*/;
+# at 305
+<#>ROLLBACK /* added by mysqlbinlog */ /*!*/;
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC' /* added by mysqlbinlog */ /*!*/;
+DELIMITER ;
+# End of log file
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
+==== Test non-matching FD event and Row event ====
+BINLOG '
+4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAADgJ1hHEzgNAAgAEgAEBAQEEgAATwAEGggICAg=
+';
+BINLOG '
+Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA==
+';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use
+select * from t1;
+a
+1
+1
+3
+CREATE TABLE char128_utf8 (
+i1 INT NOT NULL,
+c CHAR(128) CHARACTER SET utf8 NOT NULL,
+i2 INT NOT NULL);
+CREATE TABLE char63_utf8 (
+i1 INT NOT NULL,
+c CHAR(63) CHARACTER SET utf8 NOT NULL,
+i2 INT NOT NULL);
+BINLOG '
+MuNkSA8BAAAAZgAAAGoAAAAAAAQANS4xLjI1LXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAy42RIEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+BINLOG '
+3u9kSBMBAAAANgAAAJYBAAAAABAAAAAAAAAABHRlc3QAC2NoYXI2M191dGY4AAMD/gMC/r0A
+3u9kSBcBAAAAKgAAAMABAAAQABAAAAAAAAEAA//4AQAAAAMxMjMBAAAA
+';
+SELECT * FROM char63_utf8;
+i1	c	i2
+1	123	1
+BINLOG '
+iONkSBMBAAAANwAAAJkBAAAAABAAAAAAAAAABHRlc3QADGNoYXIxMjhfdXRmOAADA/4DAv6AAA==
+iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
+';
+ERROR HY000: master may suffer from http://bugs.mysql.com/bug.php?id=37426 so slave stops; check error log on slave for more info
+drop table t1, char63_utf8, char128_utf8;
+call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
+#
+# Bug #54393: crash and/or valgrind errors in
+# mysql_client_binlog_statement
+#
+BINLOG '';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use
+BINLOG '123';
+ERROR HY000: Decoding of base64 string failed
+BINLOG '-2079193929';
+ERROR HY000: Decoding of base64 string failed
+BINLOG 'xç↓%~∙D╒ƒ╡';
+ERROR HY000: Decoding of base64 string failed
diff --git a/mysql-test/suite/binlog/r/binlog_hexdump.result b/mysql-test/r/mysqlbinlog_hexdump.result
similarity index 100%
rename from mysql-test/suite/binlog/r/binlog_hexdump.result
rename to mysql-test/r/mysqlbinlog_hexdump.result
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 3df5f5dcb20b..65c7f5465fc8 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -141,6 +141,13 @@ The following options may be given as the first argument:
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
  can increase this to get more performance
+ --binlog-transaction-dependency-history-size=# 
+ Maximum number of rows to keep in the writeset history.
+ --binlog-transaction-dependency-tracking=name 
+ Selects the source of dependency information from which
+ to assess which transactions can be executed in parallel
+ by the slave's multi-threaded applier. Possible values
+ are COMMIT_ORDER, WRITESET and WRITESET_SESSION.
  --block-encryption-mode=name 
  mode for AES_ENCRYPT/AES_DECRYPT
  --bootstrap         Used by mysql installation scripts.
@@ -594,10 +601,6 @@ The following options may be given as the first argument:
  --myisam-recover-options[=name] 
  Syntax: myisam-recover-options[=option[,option...]],
  where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
- --myisam-repair-threads=# 
- If larger than 1, when repairing a MyISAM table all
- indexes will be created in parallel, with one thread per
- index. The value of 1 disables parallel repair
  --myisam-sort-buffer-size=# 
  The buffer that is allocated when sorting the index when
  doing a REPAIR or when creating indexes with CREATE INDEX
@@ -664,8 +667,9 @@ The following options may be given as the first argument:
  firstmatch, duplicateweedout,
  subquery_materialization_cost_based, block_nested_loop,
  batched_key_access, use_index_extensions,
- condition_fanout_filter, derived_merge} and val is one of
- {on, off, default}
+ condition_fanout_filter, derived_merge,
+ prefer_ordering_index} and val is one of {on, off,
+ default}
  --optimizer-trace=name 
  Controls tracing of the Optimizer:
  optimizer_trace=option=val[,option=val...], where option
@@ -849,6 +853,9 @@ The following options may be given as the first argument:
  --performance-schema-setup-objects-size=# 
  Maximum number of rows in SETUP_OBJECTS. Use 0 to
  disable, -1 for automated scaling.
+ --performance-schema-show-processlist 
+ Default startup value to enable SHOW PROCESSLIST in the
+ performance schema.
  --performance-schema-users-size=# 
  Maximum number of instrumented users. Use 0 to disable,
  -1 for automated scaling.
@@ -999,6 +1006,15 @@ The following options may be given as the first argument:
  replicate-wild-ignore-table=foo%.bar% will not do updates
  to tables in databases that start with foo and whose
  table names start with bar.
+ --replication-optimize-for-static-plugin-config 
+ Optional flag that blocks plugin install/uninstall and
+ allows skipping the acquisition of the lock to read from
+ the plugin list and the usage of read-optimized
+ spin-locks. Use only when plugin hook callback needs
+ optimization (a lot of semi-sync slaves, for instance).
+ --replication-sender-observe-commit-only 
+ Optional flag that allows for only calling back observer
+ hooks at commit.
  --report-host=name  Hostname or IP of the slave to be reported to the master
  during slave registration. Will appear in the output of
  SHOW SLAVE HOSTS. Leave unset if you do not want the
@@ -1066,6 +1082,9 @@ The following options may be given as the first argument:
  --show-compatibility-56 
  SHOW commands / INFORMATION_SCHEMA tables compatible with
  MySQL 5.6
+ --show-create-table-verbosity 
+ When this option is enabled, it increases the verbosity
+ of 'SHOW CREATE TABLE'.
  --show-old-temporals 
  When this option is enabled, the pre-5.6.4 temporal types
  will be marked in the 'SHOW CREATE TABLE' and
@@ -1289,6 +1308,8 @@ binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
 binlog-stmt-cache-size 32768
+binlog-transaction-dependency-history-size 25000
+binlog-transaction-dependency-tracking COMMIT_ORDER
 block-encryption-mode aes-128-ecb
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
@@ -1433,7 +1454,6 @@ myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
 myisam-recover-options OFF
-myisam-repair-threads 1
 myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE
@@ -1450,7 +1470,7 @@ old-passwords 0
 old-style-user-limits FALSE
 optimizer-prune-level 1
 optimizer-search-depth 62
-optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 optimizer-trace 
 optimizer-trace-features greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
 optimizer-trace-limit 1
@@ -1498,7 +1518,7 @@ performance-schema-max-mutex-classes 210
 performance-schema-max-mutex-instances -1
 performance-schema-max-prepared-statements-instances -1
 performance-schema-max-program-instances -1
-performance-schema-max-rwlock-classes 40
+performance-schema-max-rwlock-classes 50
 performance-schema-max-rwlock-instances -1
 performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
@@ -1514,6 +1534,7 @@ performance-schema-max-thread-instances -1
 performance-schema-session-connect-attrs-size -1
 performance-schema-setup-actors-size -1
 performance-schema-setup-objects-size -1
+performance-schema-show-processlist FALSE
 performance-schema-users-size -1
 port ####
 port-open-timeout 0
@@ -1539,6 +1560,8 @@ relay-log-purge TRUE
 relay-log-recovery FALSE
 relay-log-space-limit 0
 replicate-same-server-id FALSE
+replication-optimize-for-static-plugin-config FALSE
+replication-sender-observe-commit-only FALSE
 report-host (No default value)
 report-password (No default value)
 report-port 0
@@ -1556,6 +1579,7 @@ session-track-system-variables time_zone,autocommit,character_set_client,charact
 session-track-transaction-info OFF
 sha256-password-proxy-users FALSE
 show-compatibility-56 FALSE
+show-create-table-verbosity FALSE
 show-old-temporals FALSE
 show-slave-auth-info FALSE
 skip-grant-tables TRUE
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index 3ed3d66733f3..24377a2bd6a4 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -141,6 +141,13 @@ The following options may be given as the first argument:
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
  can increase this to get more performance
+ --binlog-transaction-dependency-history-size=# 
+ Maximum number of rows to keep in the writeset history.
+ --binlog-transaction-dependency-tracking=name 
+ Selects the source of dependency information from which
+ to assess which transactions can be executed in parallel
+ by the slave's multi-threaded applier. Possible values
+ are COMMIT_ORDER, WRITESET and WRITESET_SESSION.
  --block-encryption-mode=name 
  mode for AES_ENCRYPT/AES_DECRYPT
  --bootstrap         Used by mysql installation scripts.
@@ -584,10 +591,6 @@ The following options may be given as the first argument:
  --myisam-recover-options[=name] 
  Syntax: myisam-recover-options[=option[,option...]],
  where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
- --myisam-repair-threads=# 
- If larger than 1, when repairing a MyISAM table all
- indexes will be created in parallel, with one thread per
- index. The value of 1 disables parallel repair
  --myisam-sort-buffer-size=# 
  The buffer that is allocated when sorting the index when
  doing a REPAIR or when creating indexes with CREATE INDEX
@@ -606,6 +609,9 @@ The following options may be given as the first argument:
  authenticated accounts to be mapped to proxy users when
  the server option check_proxy_users is enabled.
  --named-pipe        Enable the named pipe (NT)
+ --named-pipe-full-access-group=name 
+ Name of Windows group granted full access to the named
+ pipe
  --net-buffer-length=# 
  Buffer length for TCP/IP and socket communication
  --net-read-timeout=# 
@@ -655,8 +661,9 @@ The following options may be given as the first argument:
  firstmatch, duplicateweedout,
  subquery_materialization_cost_based, block_nested_loop,
  batched_key_access, use_index_extensions,
- condition_fanout_filter, derived_merge} and val is one of
- {on, off, default}
+ condition_fanout_filter, derived_merge,
+ prefer_ordering_index} and val is one of {on, off,
+ default}
  --optimizer-trace=name 
  Controls tracing of the Optimizer:
  optimizer_trace=option=val[,option=val...], where option
@@ -840,6 +847,9 @@ The following options may be given as the first argument:
  --performance-schema-setup-objects-size=# 
  Maximum number of rows in SETUP_OBJECTS. Use 0 to
  disable, -1 for automated scaling.
+ --performance-schema-show-processlist 
+ Default startup value to enable SHOW PROCESSLIST in the
+ performance schema.
  --performance-schema-users-size=# 
  Maximum number of instrumented users. Use 0 to disable,
  -1 for automated scaling.
@@ -990,6 +1000,15 @@ The following options may be given as the first argument:
  replicate-wild-ignore-table=foo%.bar% will not do updates
  to tables in databases that start with foo and whose
  table names start with bar.
+ --replication-optimize-for-static-plugin-config 
+ Optional flag that blocks plugin install/uninstall and
+ allows skipping the acquisition of the lock to read from
+ the plugin list and the usage of read-optimized
+ spin-locks. Use only when plugin hook callback needs
+ optimization (a lot of semi-sync slaves, for instance).
+ --replication-sender-observe-commit-only 
+ Optional flag that allows for only calling back observer
+ hooks at commit.
  --report-host=name  Hostname or IP of the slave to be reported to the master
  during slave registration. Will appear in the output of
  SHOW SLAVE HOSTS. Leave unset if you do not want the
@@ -1060,6 +1079,9 @@ The following options may be given as the first argument:
  --show-compatibility-56 
  SHOW commands / INFORMATION_SCHEMA tables compatible with
  MySQL 5.6
+ --show-create-table-verbosity 
+ When this option is enabled, it increases the verbosity
+ of 'SHOW CREATE TABLE'.
  --show-old-temporals 
  When this option is enabled, the pre-5.6.4 temporal types
  will be marked in the 'SHOW CREATE TABLE' and
@@ -1288,6 +1310,8 @@ binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
 binlog-stmt-cache-size 32768
+binlog-transaction-dependency-history-size 25000
+binlog-transaction-dependency-tracking COMMIT_ORDER
 block-encryption-mode aes-128-ecb
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
@@ -1428,12 +1452,12 @@ myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
 myisam-recover-options OFF
-myisam-repair-threads 1
 myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE
 mysql-native-password-proxy-users FALSE
 named-pipe FALSE
+named-pipe-full-access-group 
 net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10
@@ -1446,7 +1470,7 @@ old-passwords 0
 old-style-user-limits FALSE
 optimizer-prune-level 1
 optimizer-search-depth 62
-optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 optimizer-trace 
 optimizer-trace-features greedy_search=on,range_optimizer=on,dynamic_range=on,repeated_subselect=on
 optimizer-trace-limit 1
@@ -1494,7 +1518,7 @@ performance-schema-max-mutex-classes 210
 performance-schema-max-mutex-instances -1
 performance-schema-max-prepared-statements-instances -1
 performance-schema-max-program-instances -1
-performance-schema-max-rwlock-classes 40
+performance-schema-max-rwlock-classes 50
 performance-schema-max-rwlock-instances -1
 performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
@@ -1510,6 +1534,7 @@ performance-schema-max-thread-instances -1
 performance-schema-session-connect-attrs-size -1
 performance-schema-setup-actors-size -1
 performance-schema-setup-objects-size -1
+performance-schema-show-processlist FALSE
 performance-schema-users-size -1
 port ####
 port-open-timeout 0
@@ -1535,6 +1560,8 @@ relay-log-purge TRUE
 relay-log-recovery FALSE
 relay-log-space-limit 0
 replicate-same-server-id FALSE
+replication-optimize-for-static-plugin-config FALSE
+replication-sender-observe-commit-only FALSE
 report-host (No default value)
 report-password (No default value)
 report-port 0
@@ -1554,6 +1581,7 @@ sha256-password-proxy-users FALSE
 shared-memory FALSE
 shared-memory-base-name MYSQL
 show-compatibility-56 FALSE
+show-create-table-verbosity FALSE
 show-old-temporals FALSE
 show-slave-auth-info FALSE
 skip-grant-tables TRUE
diff --git a/mysql-test/r/mysqldump-binary.result b/mysql-test/r/mysqldump-binary.result
new file mode 100644
index 000000000000..01724ccfee96
--- /dev/null
+++ b/mysql-test/r/mysqldump-binary.result
@@ -0,0 +1,87 @@
+# Bug#22601255 Restoring a dump of binary column, made with mysqldump, warns of invalid string
+CREATE TABLE t1(
+u CHAR(10),
+b BINARY(16),
+blo BLOB,
+g GEOMETRY,
+bi BIT(64));
+INSERT INTO t1 VALUES(
+'basic',
+x'EE0C6D03C34C11E5B1640026B977EB17',
+x'EE0C6D03C34C11E5B1640026B977EB17',
+ST_GeomFromText('POINT(1 1)'),
+x'EE0C6D03C34C11E5');
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+u='basic'	HEX(b)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(g)='000000000101000000000000000000F03F000000000000F03F'	HEX(bi)='EE0C6D03C34C11E5'	ST_AsText(g)
+1	1	1	1	1	POINT(1 1)
+DROP TABLE t1;
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `u` char(10) DEFAULT NULL,
+  `b` binary(16) DEFAULT NULL,
+  `blo` blob,
+  `g` geometry DEFAULT NULL,
+  `bi` bit(64) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+u='basic'	HEX(b)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(g)='000000000101000000000000000000F03F000000000000F03F'	HEX(bi)='EE0C6D03C34C11E5'	ST_AsText(g)
+1	1	1	1	1	POINT(1 1)
+DROP TABLE t1;
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `u` char(10) DEFAULT NULL,
+  `b` binary(16) DEFAULT NULL,
+  `blo` blob,
+  `g` geometry DEFAULT NULL,
+  `bi` bit(64) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+u='basic'	HEX(b)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(g)='000000000101000000000000000000F03F000000000000F03F'	HEX(bi)='EE0C6D03C34C11E5'	ST_AsText(g)
+1	1	1	1	1	POINT(1 1)
+DROP TABLE t1;
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Note (Code 1007): Can't create database 'test'; database exists
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `u` char(10) DEFAULT NULL,
+  `b` binary(16) DEFAULT NULL,
+  `blo` blob,
+  `g` geometry DEFAULT NULL,
+  `bi` bit(64) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+u='basic'	HEX(b)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17'	HEX(g)='000000000101000000000000000000F03F000000000000F03F'	HEX(bi)='EE0C6D03C34C11E5'	ST_AsText(g)
+1	1	1	1	1	POINT(1 1)
+DROP TABLE t1;
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 875f48e4e1ab..7efad44d3c75 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2394,7 +2394,7 @@ UNLOCK TABLES;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg1 before insert on t1 for each row
 begin
@@ -2415,7 +2415,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg2 before update on t1 for each row begin
 if old.a % 2 = 0 then set new.b := 12; end if;
@@ -2432,7 +2432,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg3 after update on t1 for each row
 begin
@@ -2464,7 +2464,7 @@ UNLOCK TABLES;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg4 before insert on t2 for each row
 begin
@@ -2550,10 +2550,10 @@ if new.a > 10 then
 set new.a := 10;
 set new.a := 11;
 end if;
-end	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg2	UPDATE	t1	begin
 if old.a % 2 = 0 then set new.b := 12; end if;
-end	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg3	UPDATE	t1	begin
 if new.a = -1 then
 set @fired:= "Yes";
@@ -2596,7 +2596,7 @@ a2
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 testref	INSERT	test1	BEGIN
-INSERT INTO test2 SET a2 = NEW.a1; END	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+INSERT INTO test2 SET a2 = NEW.a1; END	BEFORE	#	ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 SELECT * FROM `test1`;
 a1
 1
@@ -2670,7 +2670,7 @@ UNLOCK TABLES;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11)
 RETURN a+b ;;
@@ -2687,7 +2687,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` FUNCTION `bug9056_func2`(f1 char binary) RETURNS char(1) CHARSET latin1
 begin
@@ -2724,7 +2724,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)
 BEGIN SELECT a+b INTO c; end ;;
@@ -2741,7 +2741,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug9056_proc2`(OUT a INT)
 BEGIN
@@ -3168,7 +3168,7 @@ CREATE TABLE `t1` (
 
 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-INSERT INTO `t1` VALUES (0x00,'');
+INSERT INTO `t1` VALUES (0x00,_binary '');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -3725,7 +3725,7 @@ create procedure mysqldump_test_db.sp1() select 'hello';
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 CREATE DEFINER=`user1`@`%` PROCEDURE `sp1`()
 select 'hello' ;;
@@ -4192,12 +4192,12 @@ second	ee1	root@localhost	UTC	ONE TIME	2035-12-31 20:01:23	NULL	NULL	NULL	NULL	E
 show create event ee1;
 Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
 ee1		UTC	CREATE DEFINER=`root`@`localhost` EVENT `ee1` ON SCHEDULE AT '2035-12-31 20:01:23' ON COMPLETION NOT PRESERVE ENABLE DO set @a=5	latin1	latin1_swedish_ci	latin1_swedish_ci
-create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5;
+create event ee2 on schedule at '2029-12-31 21:01:23' do set @a=5;
 create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 second	ee1	root@localhost	UTC	ONE TIME	2035-12-31 20:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
-second	ee2	root@localhost	UTC	ONE TIME	2018-12-31 21:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+second	ee2	root@localhost	UTC	ONE TIME	2029-12-31 21:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 second	ee3	root@localhost	UTC	ONE TIME	2030-12-31 22:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop database second;
 create database third;
@@ -4205,7 +4205,7 @@ use third;
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 third	ee1	root@localhost	UTC	ONE TIME	2035-12-31 20:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
-third	ee2	root@localhost	UTC	ONE TIME	2018-12-31 21:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+third	ee2	root@localhost	UTC	ONE TIME	2029-12-31 21:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 third	ee3	root@localhost	UTC	ONE TIME	2030-12-31 22:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 drop database third;
 set time_zone = 'SYSTEM';
@@ -5682,3 +5682,104 @@ master_info_repository	FILE
 SHOW VARIABLES LIKE "relay_log_info_repository";
 Variable_name	Value
 relay_log_info_repository	FILE
+#
+# Bug#27931181: RESTAURE DUMP CREATED WITH 5.7.22 ON 8.0.11
+#
+CREATE DATABASE bug27931181;
+USE bug27931181;
+CREATE TABLE t1 (a INT);
+SET sql_mode='NO_AUTO_CREATE_USER';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+CREATE TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.a = 1;
+SET sql_mode='NO_AUTO_CREATE_USER,ONLY_FULL_GROUP_BY';
+CREATE PROCEDURE p1() SELECT 1;
+SET sql_mode=@@global.sql_mode;
+CREATE FUNCTION f1() RETURNS INT RETURN 1;
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `bug27931181` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `bug27931181`;
+DROP TABLE IF EXISTS `t1`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `t1` WRITE;
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = latin1 */ ;
+/*!50003 SET character_set_results = latin1 */ ;
+/*!50003 SET collation_connection  = latin1_swedish_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = '' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.a = 1 */;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `f1` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = latin1 */ ;
+/*!50003 SET character_set_results = latin1 */ ;
+/*!50003 SET collation_connection  = latin1_swedish_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
+RETURN 1 ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `p1` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = latin1 */ ;
+/*!50003 SET character_set_results = latin1 */ ;
+/*!50003 SET collation_connection  = latin1_swedish_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
+SELECT 1 ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP DATABASE bug27931181;
diff --git a/mysql-test/r/mysqldump_bug29998457.result b/mysql-test/r/mysqldump_bug29998457.result
new file mode 100644
index 000000000000..b751359f1e11
--- /dev/null
+++ b/mysql-test/r/mysqldump_bug29998457.result
@@ -0,0 +1,41 @@
+# Bug#29998457 MYSQLDUMP GENERATES INVALID INSERT STATEMENTS WITH VARBINARY COLUMNS
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE = '';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+CREATE DATABASE test_bug29998457;
+USE test_bug29998457;
+#Pre-test cleanup
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+pk INT,
+v1 VARCHAR(255),
+v2 VARCHAR(255),
+v3 VARCHAR(255),
+v4 VARCHAR(128),
+v5 VARCHAR(64),
+v6 VARCHAR(16),
+v7 VARCHAR(16),
+v8 VARCHAR(8),
+v9 VARBINARY(32),
+v10 VARBINARY(32));
+SELECT '12345678901234567890123456789012345678901234567890' INTO @s;
+SELECT CONCAT(@s, @s, @s, @s, @s) INTO @s1;
+INSERT INTO t1 VALUES (1, @s1, @s1, @s1, @s1, @s1, @s1, @s1, @s1, '','NULL');
+Warnings:
+Warning	1265	Data truncated for column 'v4' at row 1
+Warning	1265	Data truncated for column 'v5' at row 1
+Warning	1265	Data truncated for column 'v6' at row 1
+Warning	1265	Data truncated for column 'v7' at row 1
+Warning	1265	Data truncated for column 'v8' at row 1
+SELECT * FROM test_bug29998457.t1;
+pk	v1	v2	v3	v4	v5	v6	v7	v8	v9	v10
+1	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678	1234567890123456789012345678901234567890123456789012345678901234	1234567890123456	1234567890123456	12345678		NULL
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning (Code 3090): Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SELECT * FROM test_bug29998457.t1;
+pk	v1	v2	v3	v4	v5	v6	v7	v8	v9	v10
+1	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890	12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678	1234567890123456789012345678901234567890123456789012345678901234	1234567890123456	1234567890123456	12345678		NULL
+DROP DATABASE test_bug29998457;
+SET SQL_MODE = @OLD_SQL_MODE;
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
diff --git a/mysql-test/r/mysqldump_bug30042589.result b/mysql-test/r/mysqldump_bug30042589.result
new file mode 100644
index 000000000000..48e94c965e9d
--- /dev/null
+++ b/mysql-test/r/mysqldump_bug30042589.result
@@ -0,0 +1,97 @@
+DROP TABLE IF EXISTS table1;
+drop database if exists database1;
+CREATE DATABASE database1;
+USE database1;
+CREATE TABLE table1(a INT PRIMARY KEY, b INT UNIQUE) engine = InnoDB;
+CREATE TABLE table2(a INT PRIMARY KEY, b INT UNIQUE) engine = InnoDB;
+INSERT INTO table1 VALUES (1, 3);
+INSERT INTO table1 VALUES (2, 2);
+INSERT INTO table1 VALUES (3, 1);
+INSERT INTO table2 VALUES (1, 3);
+INSERT INTO table2 VALUES (2, 2);
+INSERT INTO table2 VALUES (3, 1);
+==== mysqldump with --order-by-primary ====
+--
+-- Host: localhost    Database: database1
+-- ------------------------------------------------------
+-- SERVER VERSION
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `table1`
+--
+
+DROP TABLE IF EXISTS `table1`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `table1` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `table1`
+--
+-- ORDER BY:  `a`
+
+LOCK TABLES `table1` WRITE;
+/*!40000 ALTER TABLE `table1` DISABLE KEYS */;
+INSERT INTO `table1` VALUES (1,3);
+INSERT INTO `table1` VALUES (2,2);
+INSERT INTO `table1` VALUES (3,1);
+/*!40000 ALTER TABLE `table1` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `table2`
+--
+
+DROP TABLE IF EXISTS `table2`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `table2` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `table2`
+--
+-- ORDER BY:  `a`
+
+LOCK TABLES `table2` WRITE;
+/*!40000 ALTER TABLE `table2` DISABLE KEYS */;
+INSERT INTO `table2` VALUES (1,3);
+INSERT INTO `table2` VALUES (2,2);
+INSERT INTO `table2` VALUES (3,1);
+/*!40000 ALTER TABLE `table2` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed
+DROP TABLE table1;
+DROP TABLE table2;
+drop database database1;
diff --git a/mysql-test/r/mysqldump_bugs.result b/mysql-test/r/mysqldump_bugs.result
new file mode 100644
index 000000000000..9d44c7febfd7
--- /dev/null
+++ b/mysql-test/r/mysqldump_bugs.result
@@ -0,0 +1,117 @@
+#
+# Bug #32141046: MYSQLDUMP SHOULD DUMP USERS REFERENCED IN DEFINER
+#                CLAUSE OF STORED PROGRAMS.
+#
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+CREATE DATABASE IF NOT EXISTS db3;
+CREATE DATABASE IF NOT EXISTS db4;
+CREATE DATABASE IF NOT EXISTS mysqj;
+CREATE DATABASE IF NOT EXISTS mysqk;
+CREATE DATABASE IF NOT EXISTS mysqll;
+CREATE USER IF NOT EXISTS view_u1;
+CREATE USER IF NOT EXISTS view_u2@my.oracle.com;
+CREATE USER IF NOT EXISTS event_u1;
+CREATE USER IF NOT EXISTS event_u2@192.1.1.140;
+CREATE USER IF NOT EXISTS trig_u1;
+CREATE USER IF NOT EXISTS trig_u2@xyz.com;
+CREATE USER IF NOT EXISTS proc_u1;
+CREATE USER IF NOT EXISTS proc_u2@localhost;
+CREATE USER IF NOT EXISTS func_u1;
+CREATE USER IF NOT EXISTS func_u2;
+CREATE USER IF NOT EXISTS user_not_referenced_as_definer;
+USE db1;
+CREATE TABLE t1 (i int not null, j int);
+CREATE DEFINER=view_u1 VIEW v1 AS SELECT * FROM t1;
+CREATE DEFINER=view_u1 VIEW v2 AS SELECT * FROM t1;
+CREATE DEFINER=view_u2@my.oracle.com VIEW v3 AS SELECT * FROM t1;
+CREATE DEFINER=view_u2@my.oracle.com VIEW v4 AS SELECT * FROM t1;
+CREATE DEFINER=event_u1 EVENT e1 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u1 EVENT e2 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u2@192.1.1.140 EVENT e3 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u2@192.1.1.140 EVENT e4 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=trig_u1 TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u1 TRIGGER trig2 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u2@xyz.com TRIGGER trig3 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u2@xyz.com TRIGGER trig4 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=proc_u1 PROCEDURE p1() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u1 PROCEDURE p2() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u2@localhost PROCEDURE p3() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u2@localhost PROCEDURE p4() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=func_u1 FUNCTION f1 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u1 FUNCTION f2 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u2 FUNCTION f3 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u2 FUNCTION f4 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+use db2;
+CREATE TABLE t1 (i int not null, j int);
+# ensure that mysql database is dumped first before any other database is dumped.
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysql` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `mysql`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `db1`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `db2`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db3` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `db3`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db4` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `db4`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mtr` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `mtr`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqj` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `mysqj`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqk` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `mysqk`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqll` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `mysqll`;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `test`;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP DATABASE IF EXISTS db1;
+DROP DATABASE IF EXISTS db2;
+DROP DATABASE IF EXISTS db3;
+DROP DATABASE IF EXISTS db4;
+DROP DATABASE IF EXISTS mysqj;
+DROP DATABASE IF EXISTS mysqk;
+DROP DATABASE IF EXISTS mysqll;
+DROP USER view_u1, view_u2@my.oracle.com, event_u1, event_u2@192.1.1.140, trig_u1, trig_u2@xyz.com,
+proc_u1, proc_u2@localhost, func_u1, func_u2, user_not_referenced_as_definer;
diff --git a/mysql-test/r/mysqldump_gtid_state.result b/mysql-test/r/mysqldump_gtid_state.result
new file mode 100644
index 000000000000..0d41991deac3
--- /dev/null
+++ b/mysql-test/r/mysqldump_gtid_state.result
@@ -0,0 +1,75 @@
+#
+# Bug#32843447: GTID_PURGED IS GETTING EMPTY AND GTID_EXECUTED IS
+#               GETTING UPDATED AFTER RESTARTING MYSQL
+#
+CREATE TABLE t (a INT PRIMARY KEY, b INT);
+INSERT INTO t VALUES (1, 1);
+INSERT INTO t VALUES (2, 1);
+INSERT INTO t VALUES (3, 1);
+INSERT INTO t VALUES (4, 1);
+INSERT INTO t VALUES (5, 1);
+INSERT INTO t VALUES (6, 1);
+FLUSH LOGS;
+# BEFORE RESET
+include/assert.inc [Committed gtids :- MASTER_UUID:1-7]
+include/assert.inc [No purged gtids]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+MASTER_UUID	1	7
+# MYSQLDUMP SKIPING THE DROP DATABASE FOR MYSQL SCHEMA USING THE OPTION --skip-mysql-schema
+Pattern "DROP DATABASE IF EXISTS `mysql`" not found
+# MYSQLDUMP WITHOUT SKIPING THE DROP DATABASE FOR MYSQL SCHEMA
+Pattern "DROP DATABASE IF EXISTS `mysql`" found
+# RESET
+RESET MASTER;
+# AFTER RESET
+include/assert.inc [No committed gtids after RESET]
+include/assert.inc [No purged gtids after RESET]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+# DUMP RESTORE WITH THE DUMP FILE HAVING DROP DATABASE ON MYSQL SCHEMA.
+# mysqldump will execute FTWRL when used with --single-transaction,
+# every usage of FTWRL will cause FLUSH TABLES, which causes an
+# extra GTID.
+# AFTER RESTORE
+include/assert.inc [Committed gtids after restore :- MASTER_UUID:1-9]
+include/assert.inc [Purged gtids after restore :- MASTER_UUID:1-9]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+MASTER_UUID	1	9
+# INSERT
+INSERT INTO t VALUES (7, 1);
+INSERT INTO t VALUES (8, 1);
+INSERT INTO t VALUES (9, 1);
+# AFTER INSERTING
+include/assert.inc [Committed gtids after inserting :- MASTER_UUID:1-12]
+include/assert.inc [Purged gtids after inserting :- MASTER_UUID:1-9]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+MASTER_UUID	1	9
+# RESTART
+# restart
+# AFTER RESTART
+include/assert.inc [Committed gtids after restart :- MASTER_UUID:1-12]
+include/assert.inc [Purged gtids after restart :- MASTER_UUID:1-9]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+MASTER_UUID	1	9
+MASTER_UUID	10	12
+include/assert.inc [GTID_EXECUTED is correct after the restart]
+CALL mtr.add_suppression(".*InnoDB: Table `mysql`.`innodb_table_stats` not found.*");
+SHOW CREATE TABLE `mysql`.`innodb_table_stats`;
+Table	Create Table
+innodb_table_stats	CREATE TABLE `innodb_table_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `n_rows` bigint(20) unsigned NOT NULL,
+  `clustered_index_size` bigint(20) unsigned NOT NULL,
+  `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+#CLEANUP
+DROP TABLE t;
+RESET MASTER;
+# restart
diff --git a/mysql-test/r/mysqldump_single_trans_min_privs.result b/mysql-test/r/mysqldump_single_trans_min_privs.result
new file mode 100644
index 000000000000..af5552ba4858
--- /dev/null
+++ b/mysql-test/r/mysqldump_single_trans_min_privs.result
@@ -0,0 +1,42 @@
+# Create the test database
+CREATE DATABASE bug_test;
+USE bug_test;
+# Create the test table
+CREATE TABLE bug(n INT);
+# Enter random data which could be dumped
+INSERT INTO bug VALUES(10);
+INSERT INTO bug VALUES(20);
+INSERT INTO bug VALUES(30);
+# Create the test user
+CREATE USER test@localhost;
+# Grant only SELECT privilege on the test database
+GRANT SELECT ON bug_test.* TO test@localhost;
+SHOW GRANTS FOR test@localhost;
+Grants for test@localhost
+GRANT USAGE ON *.* TO 'test'@'localhost'
+GRANT SELECT ON `bug_test`.* TO 'test'@'localhost'
+# Create the dump file
+# Start the dump tests
+# ----- Test 1 -----
+# GTID enabled on the server, --set-gtid-purged is set to it's default value (AUTO).
+# Should fail because of insufficient privileges.
+# Start the dump
+# ----- Test 1 succeeded -----
+# ----- Test 2 -----
+# GTID enabled on the server, --set-gtid-purged is set to OFF
+# Should succeed
+# ----- Test 2 succeeded -----
+# ----- Test 3 -----
+# Increase the privileges of test user by granting RELOAD privilege
+GRANT RELOAD ON *.* TO test@localhost;
+SHOW GRANTS FOR test@localhost;
+Grants for test@localhost
+GRANT RELOAD ON *.* TO 'test'@'localhost'
+GRANT SELECT ON `bug_test`.* TO 'test'@'localhost'
+# Start the dump with --set-gtid-purged=ON
+# Should succeed
+# ----- Test 3 succeeded -----
+# ----- End of tests -----
+DROP USER test@localhost;
+DROP DATABASE bug_test;
+RESET MASTER;
diff --git a/mysql-test/r/mysqlpump.result b/mysql-test/r/mysqlpump.result
index 59bd16ca5c44..9926fe02371a 100644
--- a/mysql-test/r/mysqlpump.result
+++ b/mysql-test/r/mysqlpump.result
@@ -456,3 +456,30 @@ master_info_repository	FILE
 SHOW VARIABLES LIKE "relay_log_info_repository";
 Variable_name	Value
 relay_log_info_repository	FILE
+#
+# Bug #27096081: MYSQLPUMP VALIDATES ALL DATABASE OBJECTS BY
+#                IGNORING --INCLUDE_DATABASES OPTION
+#
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1(id INT);
+INSERT INTO t1 SELECT 1;
+CREATE VIEW v1 AS SELECT * FROM t1;
+CREATE DATABASE db2;
+USE db2;
+CREATE TABLE t2(id INT);
+INSERT INTO t2 SELECT 1;
+CREATE USER 'u1'@'%' IDENTIFIED BY 'abc';
+GRANT ALL ON *.* TO 'u1'@'%';
+FLUSH PRIVILEGES;
+USE db2;
+CREATE VIEW v2 AS SELECT * FROM t2;
+SHOW CREATE VIEW v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`u1`@`%` SQL SECURITY DEFINER VIEW `v2` AS select `t2`.`id` AS `id` from `t2`	latin1	latin1_swedish_ci
+DROP USER 'u1'@'%';
+FLUSH PRIVILEGES;
+CREATE USER 'u1'@'%' IDENTIFIED BY 'abc';
+DROP USER 'u1'@'%';
+DROP DATABASE db1;
+DROP DATABASE db2;
diff --git a/mysql-test/r/mysqlpump_basic.result b/mysql-test/r/mysqlpump_basic.result
index f4f12e75e33d..b5ecd5916964 100644
--- a/mysql-test/r/mysqlpump_basic.result
+++ b/mysql-test/r/mysqlpump_basic.result
@@ -736,3 +736,36 @@ t1	CREATE TABLE `t1` (
 ) /*!50100 TABLESPACE `mytbsp` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE `test`.`t1`;
 DROP TABLESPACE `mytbsp`;
+#
+# Bug#29023216: MYSQLPUMP SHOULD WRITE USERS AND GRANTS BEFORE VIEWS AND STORED PROGRAMS
+#
+CREATE DATABASE DB29023216;
+CREATE USER 'VIEWUSER'@'LOCALHOST';
+GRANT ALL ON *.* TO 'VIEWUSER'@'LOCALHOST';
+USE DB29023216;
+CREATE TABLE T1 (ID INT UNSIGNED NOT NULL PRIMARY KEY, VAL VARCHAR(10));
+CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY INVOKER VIEW V_T1_A AS SELECT * FROM T1;
+CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY DEFINER VIEW V_T1_B AS SELECT * FROM T1;
+CREATE SQL SECURITY DEFINER VIEW V_T1_A2 AS SELECT * FROM V_T1_A;
+CREATE SQL SECURITY DEFINER VIEW V_T1_B2 AS SELECT * FROM V_T1_B;
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
+USE DB29023216;
+SELECT * FROM V_T1_A;
+ID	VAL
+SELECT * FROM V_T1_B;
+ID	VAL
+SELECT * FROM V_T1_A2;
+ID	VAL
+SELECT * FROM V_T1_B2;
+ID	VAL
+CREATE DEFINER=VIEWUSER@LOCALHOST FUNCTION TESTFUNC() RETURNS BOOL RETURN TRUE;
+CREATE VIEW V_T1_C AS SELECT DB29023216.TESTFUNC();
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
+USE DB29023216;
+SELECT * FROM V_T1_C;
+DB29023216.TESTFUNC()
+1
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
diff --git a/mysql-test/r/mysqlpump_bugs.result b/mysql-test/r/mysqlpump_bugs.result
new file mode 100644
index 000000000000..2037b2c405ef
--- /dev/null
+++ b/mysql-test/r/mysqlpump_bugs.result
@@ -0,0 +1,31 @@
+#
+# Bug #83144: mysqlpump reads mysql_dump group, not mysqlpump in config-group
+#
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+DROP DATABASE db1;
+DROP DATABASE db2;
+SHOW DATABASES like 'db%';
+Database (db%)
+db2
+DROP DATABASE db2;
+#
+# Bug #32067013: MYSQLPUMP SEGMENTATION FAULT
+#
+CREATE DATABASE B32067013;
+CREATE TABLE B32067013.t1(v1 INT, v2 INT);
+CREATE TABLE B32067013.t2(v1 INT, v2 INT);
+CREATE VIEW B32067013.t123 AS SELECT * FROM B32067013.t1;
+DROP TABLE B32067013.t1;
+# Test criteria: shouldn't crash
+DROP DATABASE B32067013;
+#
+# Bug#33866103 : MYSQLPUMP [ERROR] (1356) WITH VIEW CONTAINING FROM SUBQUERY - REGRESSION
+#
+CREATE DATABASE db1;
+CREATE TABLE db1.t1 (c1 int);
+CREATE TABLE db1.t2 (c1 int);
+USE db1;
+CREATE VIEW db1.v12 AS (SELECT * FROM (SELECT * FROM db1.t1 UNION SELECT * FROM db1.t2) AS t12);
+DROP DATABASE db1;
+# End of 5.7 tests
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 9eda0855b8f1..4e0782f72bfe 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -1037,3 +1037,9 @@ mysqltest: At line 1: Missing required argument 'precision' to command 'replace_
 mysqltest: At line 1: A number between 0 and 16 is required for the precision in replace_numeric_round
 # The minimum value which can be passed is 0
 mysqltest: At line 1: A number between 0 and 16 is required for the precision in replace_numeric_round
+#
+# BUG#26630826: MTR: REPLACE_RESULT IS NOT ABLE TO REPLACE LONG
+#               STRINGS IN PATH NAME
+#
+REPLACE_STRING
+mysqltest: At line 1: query 'SELECT REPLACE_STRING FROM t1' failed: 1146: Table 'test.t1' doesn't exist
diff --git a/mysql-test/r/no_engine_substitution.result b/mysql-test/r/no_engine_substitution.result
new file mode 100644
index 000000000000..5212813f253c
--- /dev/null
+++ b/mysql-test/r/no_engine_substitution.result
@@ -0,0 +1,179 @@
+#
+# Bug#27502530: DISABLING NO_ENGINE_SUBSTITUTION DOES NOT BEHAVE AS
+#               DOCUMENTED
+#
+CALL mtr.add_suppression("default_storage_engine is set to a disabled storage engine .*");
+CALL mtr.add_suppression("default_tmp_storage_engine is set to a disabled storage engine .*");
+# Started the server by disabling InnoDB using system variable 'disabled_storage_engines'
+SELECT @@disabled_storage_engines;
+@@disabled_storage_engines
+InnoDB
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+SELECT @@default_storage_engine;
+@@default_storage_engine
+MyISAM
+
+# NO_ENGINE_SUBSTITUTION enabled
+SET SQL_MODE= 'NO_ENGINE_SUBSTITUTION';
+CREATE TABLE t1(c1 INT) ENGINE= MyISAM;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES(1);
+CREATE TABLE t2(c1 INT) ENGINE= InnoDB;
+ERROR HY000: Storage engine InnoDB is disabled (Table creation is disallowed).
+CREATE TEMPORARY TABLE t2(c1 INT) ENGINE= InnoDB;
+ERROR HY000: Storage engine InnoDB is disabled (Table creation is disallowed).
+ALTER TABLE t1 ENGINE= InnoDB;
+ERROR HY000: Storage engine InnoDB is disabled (Table creation is disallowed).
+# Restart the server disabling the myisam storage engine using variable 'disabled_storage_engines'
+SELECT @@disabled_storage_engines;
+@@disabled_storage_engines
+myisam,example
+SET @old_default_engine= @@default_storage_engine;
+# Changing the default engine to InnoDB
+SET DEFAULT_STORAGE_ENGINE= InnoDB;
+SELECT @@default_storage_engine;
+@@default_storage_engine
+InnoDB
+CREATE TABLE t2(c1 INT) ENGINE= MyISAM;
+ERROR HY000: Storage engine MyISAM is disabled (Table creation is disallowed).
+SELECT * FROM t1;
+c1
+1
+# Checking table creation with dynamic storage plugins
+INSTALL PLUGIN example SONAME 'ha_example.so';
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+ERROR HY000: Storage engine EXAMPLE is disabled (Table creation is disallowed).
+
+# NO_ENGINE_SUBSTITUTION disabled
+SET SQL_MODE='';
+# The disabled engine is substituted with the default engine for the table.
+CREATE TABLE t2(c1 INT) ENGINE= MyISAM;
+Warnings:
+Warning	3161	Storage engine MyISAM is disabled (Table creation is disallowed).
+Warning	1266	Using storage engine InnoDB for table 't2'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CREATE TABLE t3 LIKE t1;
+Warnings:
+Warning	3161	Storage engine MyISAM is disabled (Table creation is disallowed).
+Warning	1266	Using storage engine InnoDB for table 't3'
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CREATE TEMPORARY TABLE t4(c1 INT) ENGINE= MyISAM;
+Warnings:
+Warning	3161	Storage engine MyISAM is disabled (Table creation is disallowed).
+Warning	1266	Using storage engine InnoDB for table 't4'
+SHOW CREATE TABLE t4;
+Table	Create Table
+t4	CREATE TEMPORARY TABLE `t4` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CREATE TABLE t5 (c1 INT) ENGINE= ARCHIVE;
+# ALTER TABLE ... ENGINE reports a warning and the table is not altered.
+ALTER TABLE t5 ENGINE= MyISAM;
+Warnings:
+Warning	1286	Unknown storage engine 'MyISAM'
+SHOW CREATE TABLE t5;
+Table	Create Table
+t5	CREATE TABLE `t5` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
+CREATE PROCEDURE p1()
+BEGIN
+CREATE TABLE t6(c1 INT) ENGINE= MyISAM;
+END /
+CALL p1();
+Warnings:
+Warning	3161	Storage engine MyISAM is disabled (Table creation is disallowed).
+Warning	1266	Using storage engine InnoDB for table 't6'
+SHOW CREATE TABLE t6;
+Table	Create Table
+t6	CREATE TABLE `t6` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+CREATE TABLE t7 (c1 INT) ENGINE= EXAMPLE;
+Warnings:
+Warning	3161	Storage engine EXAMPLE is disabled (Table creation is disallowed).
+Warning	1266	Using storage engine InnoDB for table 't7'
+SHOW CREATE TABLE t7;
+Table	Create Table
+t7	CREATE TABLE `t7` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+CREATE TABLE t8 (c1 INT) ENGINE= MyISAM;
+ERROR HY000: Storage engine MyISAM is disabled (Table creation is disallowed).
+CREATE TABLE t8 (c1 INT) ENGINE= EXAMPLE;
+ERROR HY000: Storage engine EXAMPLE is disabled (Table creation is disallowed).
+UNINSTALL PLUGIN EXAMPLE;
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE t5;
+DROP TABLE t6;
+DROP TABLE t7;
+SET @@default_storage_engine=@old_default_engine;
+SET sql_mode= DEFAULT;
+# Restart the server disabling archive engine via '--skip-archive or --archive=off'
+SET @old_default_engine= @@default_storage_engine;
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+SET DEFAULT_TMP_STORAGE_ENGINE= MyISAM;
+
+# NO_ENGINE_SUBSTITUTION enabled
+SET SQL_MODE='NO_ENGINE_SUBSTITUTION';
+CREATE TABLE t1 (c1 INT) ENGINE= ARCHIVE;
+ERROR 42000: Unknown storage engine 'ARCHIVE'
+CREATE TEMPORARY TABLE t1 (c1 INT) ENGINE= ARCHIVE;
+ERROR 42000: Unknown storage engine 'ARCHIVE'
+CREATE TABLE t1 (c1 INT) ENGINE=MyISAM;
+ALTER TABLE t1 ENGINE= ARCHIVE;
+ERROR 42000: Unknown storage engine 'ARCHIVE'
+
+# NO_ENGINE_SUBSTITUTION disabled
+SET SQL_MODE='';
+CREATE TABLE t2 (c1 INT) ENGINE=ARCHIVE;
+Warnings:
+Warning	1286	Unknown storage engine 'ARCHIVE'
+Warning	1266	Using storage engine MyISAM for table 't2'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+CREATE TEMPORARY TABLE t3 (c1 INT) ENGINE= ARCHIVE;
+Warnings:
+Warning	1286	Unknown storage engine 'ARCHIVE'
+Warning	1266	Using storage engine MyISAM for table 't3'
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TEMPORARY TABLE `t3` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+# ALTER TABLE .. ENGINE reports a warning and the table is not altered.
+ALTER TABLE t1 ENGINE= ARCHIVE;
+Warnings:
+Warning	1286	Unknown storage engine 'ARCHIVE'
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+SET @@default_storage_engine= @old_default_engine;
+SET sql_mode = DEFAULT;
+# restart
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index f667df8cc5d1..6e56a5b8df14 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
@@ -109,6 +109,8 @@ Calculator	1	125
 Calculator	2	150
 Calculator	NULL	275
 NULL	NULL	7785
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup limit 5;
 product	country_id	year	sum(profit)
 Calculator	1	1999	50
@@ -764,4 +766,6 @@ GROUP BY 1 DESC WITH ROLLUP;
 NOT EXISTS (SELECT 1)
 0
 NULL
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 DROP TABLE t1;
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index cb5fca0e5e9f..83c5f4001374 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -211,8 +211,6 @@ Variable_name	Value
 Ssl_cipher	DHE-RSA-AES128-SHA
 Variable_name	Value
 Ssl_cipher	AES256-SHA
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES128-SHA
 select 'is still running; no cipher request crashed the server' as result from dual;
 result
 is still running; no cipher request crashed the server
diff --git a/mysql-test/r/opt_hints.result b/mysql-test/r/opt_hints.result
index 8047acffcffa..d4c3173c8640 100644
--- a/mysql-test/r/opt_hints.result
+++ b/mysql-test/r/opt_hints.result
@@ -102,21 +102,21 @@ EXPLAIN SELECT  f2 FROM
 (SELECT f2, f3, f1 FROM t3 WHERE f1 > 2 AND f3 = 'poiu') AS TD
 WHERE TD.f1 > 2 AND TD.f3 = 'poiu';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	ref	PRIMARY,f2_idx,f3_idx	f3_idx	35	const	16	96.43	Using index condition
+1	SIMPLE	t3	NULL	range	PRIMARY,f2_idx,f3_idx	f3_idx	39	NULL	16	100.00	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t3`.`f2` AS `f2` from `test`.`t3` where ((`test`.`t3`.`f3` = 'poiu') and (`test`.`t3`.`f1` > 2) and (`test`.`t3`.`f1` > 2))
 EXPLAIN SELECT /*+ NO_ICP(t3@qb1 f3_idx) */ f2 FROM
 (SELECT /*+ QB_NAME(QB1) */ f2, f3, f1 FROM t3 WHERE f1 > 2 AND f3 = 'poiu') AS TD
 WHERE TD.f1 > 2 AND TD.f3 = 'poiu';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	ref	PRIMARY,f2_idx,f3_idx	f3_idx	35	const	16	96.43	Using where
+1	SIMPLE	t3	NULL	range	PRIMARY,f2_idx,f3_idx	f3_idx	39	NULL	16	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select /*+ NO_ICP(`t3`@`QB1` `f3_idx`) */ `test`.`t3`.`f2` AS `f2` from `test`.`t3` where ((`test`.`t3`.`f3` = 'poiu') and (`test`.`t3`.`f1` > 2) and (`test`.`t3`.`f1` > 2))
 EXPLAIN SELECT /*+ NO_ICP(t3@qb1) */ f2 FROM
 (SELECT /*+ QB_NAME(QB1) */ f2, f3, f1 FROM t3 WHERE f1 > 2 AND f3 = 'poiu') AS TD
 WHERE TD.f1 > 2 AND TD.f3 = 'poiu';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	ref	PRIMARY,f2_idx,f3_idx	f3_idx	35	const	16	96.43	Using where
+1	SIMPLE	t3	NULL	range	PRIMARY,f2_idx,f3_idx	f3_idx	39	NULL	16	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select /*+ NO_ICP(`t3`@`QB1`) */ `test`.`t3`.`f2` AS `f2` from `test`.`t3` where ((`test`.`t3`.`f3` = 'poiu') and (`test`.`t3`.`f1` > 2) and (`test`.`t3`.`f1` > 2))
 # Expected warning for f1_idx key, unresolved name.
@@ -124,7 +124,7 @@ EXPLAIN SELECT f2 FROM
 (SELECT /*+ NO_ICP(t3 f3_idx, f1_idx, f2_idx) */ f2, f3, f1 FROM t3 WHERE f1 > 2 AND f3 = 'poiu') AS TD
 WHERE TD.f1 > 2 AND TD.f3 = 'poiu';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	ref	PRIMARY,f2_idx,f3_idx	f3_idx	35	const	16	96.43	Using where
+1	SIMPLE	t3	NULL	range	PRIMARY,f2_idx,f3_idx	f3_idx	39	NULL	16	100.00	Using where
 Warnings:
 Warning	3128	Unresolved name `t3`@`select#2` `f1_idx` for NO_ICP hint
 Note	1003	/* select#1 */ select /*+ NO_ICP(`t3`@`select#2` `f3_idx`) NO_ICP(`t3`@`select#2` `f2_idx`) */ `test`.`t3`.`f2` AS `f2` from `test`.`t3` where ((`test`.`t3`.`f3` = 'poiu') and (`test`.`t3`.`f1` > 2) and (`test`.`t3`.`f1` > 2))
@@ -133,7 +133,7 @@ EXPLAIN SELECT f2 FROM
 (SELECT /*+ NO_ICP(t3 f1_idx, f2_idx) */ f2, f3, f1 FROM t3 WHERE f1 > 2 AND f3 = 'poiu') AS TD
 WHERE TD.f1 > 2 AND TD.f3 = 'poiu';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t3	NULL	ref	PRIMARY,f2_idx,f3_idx	f3_idx	35	const	16	96.43	Using index condition
+1	SIMPLE	t3	NULL	range	PRIMARY,f2_idx,f3_idx	f3_idx	39	NULL	16	100.00	Using index condition
 Warnings:
 Warning	3128	Unresolved name `t3`@`select#2` `f1_idx` for NO_ICP hint
 Note	1003	/* select#1 */ select /*+ NO_ICP(`t3`@`select#2` `f2_idx`) */ `test`.`t3`.`f2` AS `f2` from `test`.`t3` where ((`test`.`t3`.`f3` = 'poiu') and (`test`.`t3`.`f1` > 2) and (`test`.`t3`.`f1` > 2))
diff --git a/mysql-test/r/opt_hints_pfs.result b/mysql-test/r/opt_hints_pfs.result
index 8a7f2b2a392a..20d56b83a42a 100644
--- a/mysql-test/r/opt_hints_pfs.result
+++ b/mysql-test/r/opt_hints_pfs.result
@@ -8,8 +8,8 @@ SELECT        * FROM t1;
 SELECT /*+ */ * FROM t1;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;
 digest	digest_text
-52efb366ff07b747f41a99d625b6169e	SELECT * FROM `t1` 
-52efb366ff07b747f41a99d625b6169e	SELECT * FROM `t1` 
+23a2bd5d5f00f61920a837cbec0340c8	SELECT * FROM `t1` 
+23a2bd5d5f00f61920a837cbec0340c8	SELECT * FROM `t1` 
 # Digests should be different:
 SELECT * FROM t1, t2;
 SELECT /*+
@@ -33,19 +33,19 @@ SUBQUERY(t1)
 */ * FROM t1, t2;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;
 digest	digest_text
-fec6917f393db4a4ab0aa807a5571b5a	SELECT /*+ BKA ( `t1`@`qb1` ) BNL ( @`qb1` `t1` ) DUPSWEEDOUT FIRSTMATCH INTOEXISTS LOOSESCAN MATERIALIZATION MRR ( `t1` ) NO_BKA ( `t2` ) NO_BNL ( `t2` ) NO_ICP ( `t2` ) NO_MRR ( `t2` ) NO_RANGE_OPTIMIZATION ( `t2` ) NO_SEMIJOIN ( `t2` ) QB_NAME ( `qb1` ) SEMIJOIN ( `t1` ) SUBQUERY ( `t1` ) */ * FROM `t1` , `t2` 
-3a823be8a3decc4895780d814f38c6cb	SELECT * FROM `t1` , `t2` 
+b5dcadc964d9c74aeaafbc7422843058	SELECT /*+ BKA ( `t1`@`qb1` ) BNL ( @`qb1` `t1` ) DUPSWEEDOUT FIRSTMATCH INTOEXISTS LOOSESCAN MATERIALIZATION MRR ( `t1` ) NO_BKA ( `t2` ) NO_BNL ( `t2` ) NO_ICP ( `t2` ) NO_MRR ( `t2` ) NO_RANGE_OPTIMIZATION ( `t2` ) NO_SEMIJOIN ( `t2` ) QB_NAME ( `qb1` ) SEMIJOIN ( `t1` ) SUBQUERY ( `t1` ) */ * FROM `t1` , `t2` 
+b52b5a0d94d733e8e605cd1152080d8a	SELECT * FROM `t1` , `t2` 
 SELECT * FROM t2, t1;
 SELECT /*+ MAX_EXECUTION_TIME(10) */ * FROM t2, t1;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;
 digest	digest_text
-636155394b2f53391a970c2c8c13ed9f	SELECT /*+ MAX_EXECUTION_TIME (?) */ * FROM `t2` , `t1` 
-17ba1f25fb5e2b957bbd51689455864f	SELECT * FROM `t2` , `t1` 
+def05dbaf5e5ab9af48b70c27c603de2	SELECT /*+ MAX_EXECUTION_TIME (?) */ * FROM `t2` , `t1` 
+1613448fc70feba2d3302a92ea1cc139	SELECT * FROM `t2` , `t1` 
 SELECT 1;
 SELECT /*+ bad_hint_also_goes_to_digest */ 1;
 SELECT digest, digest_text FROM performance_schema.events_statements_history ORDER BY timer_start DESC LIMIT 2;
 digest	digest_text
-11f1f8f16ba99049bfabf724f29a195a	SELECT /*+ `bad_hint_also_goes_to_digest` */ ? 
-f29eded39dd5fa102f18987679dd0c14	SELECT ? 
+7936911d8f35e950c5c3bbc98eee3c4f	SELECT /*+ `bad_hint_also_goes_to_digest` */ ? 
+3d4fc22e33e10d7235eced3c75a84c2c	SELECT ? 
 DROP TABLE t1, t2;
 #
diff --git a/mysql-test/r/optimizer_switch.result b/mysql-test/r/optimizer_switch.result
index 8bb974980e77..07e4d07627ad 100644
--- a/mysql-test/r/optimizer_switch.result
+++ b/mysql-test/r/optimizer_switch.result
@@ -3,47 +3,47 @@ BUG#37120 optimizer_switch allowable values not according to specification
 
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='materialization=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='semijoin=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='loosescan=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='semijoin=off,materialization=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='materialization=off,semijoin=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='semijoin=off,materialization=off,loosescan=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='semijoin=off,loosescan=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=off,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=off,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 set optimizer_switch='materialization=off,loosescan=off';
 select @@optimizer_switch;
 @@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=on,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=off,semijoin=on,loosescan=off,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set optimizer_switch='default';
 create table t1 (a1 char(8), a2 char(8));
 create table t2 (b1 char(8), b2 char(8));
diff --git a/mysql-test/r/order_by_limit.result b/mysql-test/r/order_by_limit.result
index 11bf30639700..9f11d7f027c2 100644
--- a/mysql-test/r/order_by_limit.result
+++ b/mysql-test/r/order_by_limit.result
@@ -222,3 +222,146 @@ pk	i1	i2	pk	i1
 8080	80	80	8081	80
 9090	90	90	9090	90
 DROP TABLE t0, t1, t2;
+#
+# Bug 31686878 - BACKPORT MAIN BUG 30348211 TO RELEASE 5.7
+#
+CREATE TABLE t (id BIGINT NOT NULL, other_id BIGINT NOT NULL,
+covered_column VARCHAR(50) NOT NULL, non_covered_column VARCHAR(50) NOT NULL,
+PRIMARY KEY (id),
+INDEX index_other_id_covered_column (other_id, covered_column));
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (10, 10, '10', '10');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (9, 9, '9', '9');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (8, 8, '8', '8');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (7, 7, '7', '7');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (6, 6, '6', '6');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (5, 5, '5', '5');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (4, 4, '4', '4');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (3, 3, '3', '3');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (2, 2, '2', '2');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (1, 1, '1', '1');
+SET
+optimizer_trace = "enabled=on",
+optimizer_trace_max_mem_size = 1000000,
+end_markers_in_json = ON;
+SET optimizer_switch = "prefer_ordering_index=on";
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	index_other_id_covered_column	PRIMARY	8	NULL	2	70.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` where (`test`.`t`.`other_id` > 3) order by `test`.`t`.`id` limit 2
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	range	index_other_id_covered_column	index_other_id_covered_column	8	NULL	7	100.00	Using index condition; Using filesort
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` where (`test`.`t`.`other_id` > 3) order by `test`.`t`.`id` limit 2
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_0 FROM information_schema.optimizer_trace;
+should_be_0
+0
+SET optimizer_switch = default;
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	index_other_id_covered_column	PRIMARY	8	NULL	2	70.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` where (`test`.`t`.`other_id` > 3) order by `test`.`t`.`id` limit 2
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=on";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX(PRIMARY) WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	NULL	PRIMARY	8	NULL	2	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` FORCE INDEX (PRIMARY) where (`test`.`t`.`other_id` > 3) order by `test`.`t`.`id` limit 2
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX(PRIMARY) WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	NULL	PRIMARY	8	NULL	2	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` FORCE INDEX (PRIMARY) where (`test`.`t`.`other_id` > 3) order by `test`.`t`.`id` limit 2
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (10+1+10, 10, '10', '10');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (9+1+10, 9, '9', '9');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (8+1+10, 8, '8', '8');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (7+1+10, 7, '7', '7');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (6+1+10, 6, '6', '6');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (5+1+10, 5, '5', '5');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (4+1+10, 4, '4', '4');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (3+1+10, 3, '3', '3');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (2+1+10, 2, '2', '2');
+INSERT INTO t (id, other_id, covered_column, non_covered_column)
+VALUES (1+1+10, 1, '1', '1');
+SET optimizer_switch = "prefer_ordering_index=on";
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+EXPLAIN SELECT non_covered_column FROM t WHERE id > 8 GROUP BY other_id LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	PRIMARY,index_other_id_covered_column	index_other_id_covered_column	60	NULL	3	60.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` where (`test`.`t`.`id` > 8) group by `test`.`t`.`other_id` limit 1
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=off";
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_0 FROM information_schema.optimizer_trace;
+should_be_0
+0
+SET optimizer_switch = default;
+EXPLAIN SELECT non_covered_column FROM t WHERE id > 8 GROUP BY other_id LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	PRIMARY,index_other_id_covered_column	index_other_id_covered_column	60	NULL	3	60.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` where (`test`.`t`.`id` > 8) group by `test`.`t`.`other_id` limit 1
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=on";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX FOR GROUP BY (index_other_id_covered_column) WHERE id > 8 GROUP BY other_id LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	PRIMARY,index_other_id_covered_column	index_other_id_covered_column	60	NULL	3	60.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` FORCE INDEX FOR GROUP BY (`index_other_id_covered_column`) where (`test`.`t`.`id` > 8) group by `test`.`t`.`other_id` limit 1
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX FOR GROUP BY (index_other_id_covered_column) WHERE id > 8 GROUP BY other_id LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t	NULL	index	PRIMARY,index_other_id_covered_column	index_other_id_covered_column	60	NULL	3	60.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t`.`non_covered_column` AS `non_covered_column` from `test`.`t` FORCE INDEX FOR GROUP BY (`index_other_id_covered_column`) where (`test`.`t`.`id` > 8) group by `test`.`t`.`other_id` limit 1
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+should_be_1
+1
+DROP TABLE t;
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result
index 14e6d866e423..1ec8f61de4e5 100644
--- a/mysql-test/r/parser.result
+++ b/mysql-test/r/parser.result
@@ -1233,3 +1233,24 @@ Warnings:
 Warning	1287	'.<table>.<column>' is deprecated and will be removed in a future release. Please use the table.column name without a dot prefix instead
 DROP TABLE t1, t2;
 #
+
+Bug #27714748: @@PARSER_MAX_MEM_SIZE DOES NOT WORK FOR ROUTINES
+
+SET parser_max_mem_size = 10000000;
+ERROR HY000: Memory capacity of 10000000 bytes for 'parser_max_mem_size' exceeded. Parser bailed out for this query.
+SET parser_max_mem_size = default;
+#
+# Bug#30528450: SPECIAL SYMBOL NAMED COLUMN NOT HONORED IN A SELECT
+#
+CREATE TABLE t1 (c1 INT, `*` INT, c3 INT);
+INSERT INTO t1 VALUES (1, 2, 3);
+SELECT `*` FROM t1;
+*
+2
+SELECT t1.`*`, t1.* FROM t1;
+*	c1	*	c3
+2	1	2	3
+SELECT test.t1.`*`, test.t1.* FROM t1;
+*	c1	*	c3
+2	1	2	3
+DROP TABLE t1;
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index dcb14ec2fe1a..795233e9e9bb 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -916,7 +916,11 @@ partitions 3
 (partition x1 tablespace ts1,
 partition x2 tablespace ts2,
 partition x3 tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 CREATE TABLE t2 LIKE t1;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -953,6 +957,8 @@ partitions 3
 (partition x1 values in (1,2,9,4) tablespace ts1,
 partition x2 values in (3, 11, 5, 7) tablespace ts2,
 partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -976,6 +982,8 @@ partitions 3
 (partition x1 values in (1,2,9,4) tablespace ts1,
 partition x2 values in (3, 11, 5, 7) tablespace ts2,
 partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -998,6 +1006,8 @@ partition by list (b*a)
 (partition x1 values in (1) tablespace ts1,
 partition x2 values in (3, 11, 5, 7) tablespace ts2,
 partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -2132,6 +2142,7 @@ Warning	1287	The partition engine, used by table 'test.t1', is deprecated and wi
 set session sql_mode='no_table_options';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'NO_TABLE_OPTIONS' is deprecated. It will be removed in a future release.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -3168,3 +3179,62 @@ Warning	1287	The partition engine, used by table 'test.t1', is deprecated and wi
 SELECT 1 FROM t1 WHERE EXP(10000);
 ERROR 22003: DOUBLE value is out of range in 'exp(10000)'
 DROP TABLE t1;
+#
+# Bug#28573894 ALTER PARTITIONED TABLE ADD AUTO_INCREMENT DIFF RESULT
+#
+CREATE TABLE t (a VARCHAR(10) NOT NULL,b INT,PRIMARY KEY (b)) ENGINE=INNODB
+PARTITION BY RANGE (b)
+(PARTITION pa VALUES LESS THAN (2),
+PARTITION pb VALUES LESS THAN (20),
+PARTITION pc VALUES LESS THAN (30),
+PARTITION pd VALUES LESS THAN (40));
+INSERT INTO t
+VALUES('A',0),('B',1),('C',2),('D',3),('E',4),('F',5),('G',25),('H',35);
+ALTER TABLE t ADD COLUMN r INT UNSIGNED NOT NULL AUTO_INCREMENT, ADD UNIQUE
+KEY (r,b), ALGORITHM=INPLACE, LOCK=SHARED;
+SELECT * FROM t;
+a	b	r
+A	0	1
+B	1	2
+C	2	3
+D	3	4
+E	4	5
+F	5	6
+G	25	7
+H	35	8
+DROP TABLE t;
+#
+# Bug #25207522: INCORRECT ORDER-BY BEHAVIOR ON A PARTITIONED TABLE
+# WITH A COMPOSITE PREFIX INDEX
+#
+CREATE TABLE t(  id int unsigned NOT NULL,
+data varchar(2) DEFAULT NULL,
+KEY data_idx (data(1),id)
+) DEFAULT CHARSET=utf8
+/*!50100 PARTITION BY RANGE (id)
+(PARTITION p10 VALUES LESS THAN (10) ,
+PARTITION p20 VALUES LESS THAN (20) ) */;
+Warnings:
+Warning	1287	The partition engine, used by table 'test.t', is deprecated and will be removed in a future release. Please use native partitioning instead.
+INSERT INTO t VALUES (6, 'ab'), (4, 'ab'), (5, 'ab'), (16, 'ab'), (14, 'ab'), (15, 'ab'), (5, 'ac'), (15, 'aa') ;
+Warnings:
+Warning	1287	The partition engine, used by table 'test.t', is deprecated and will be removed in a future release. Please use native partitioning instead.
+SELECT id FROM t WHERE data = 'ab' ORDER BY id ASC;
+id
+4
+5
+6
+14
+15
+16
+DROP TABLE t;
+#
+# Bug#29268656: BOGUS CONSTANT, RANDOM OR TIMEZONE-DEPENDENT
+#               EXPRESSIONS IN (SUB)PARTITIONING FU
+#
+CREATE TABLE t1 (c1 INT, c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32))) ENGINE=INNODB PARTITION BY HASH(c1);
+CREATE TABLE t2 (c1 INT, c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32))) ENGINE=INNODB PARTITION BY RANGE(c1) (PARTITION p1 VALUES LESS THAN(100));
+CREATE TABLE t (c1 INT, c2 INT) ENGINE=INNODB PARTITION BY RANGE(c1) (PARTITION p1 VALUES LESS THAN(100));
+ALTER TABLE t MODIFY COLUMN c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32)) STORED;
+ALTER TABLE t ADD COLUMN c3 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32));
+DROP TABLE t, t1, t2;
diff --git a/mysql-test/r/partition_debug.result b/mysql-test/r/partition_debug.result
index 67b30122c57c..1fb6cdbc7ad0 100644
--- a/mysql-test/r/partition_debug.result
+++ b/mysql-test/r/partition_debug.result
@@ -14,3 +14,15 @@ SELECT * FROM t1 WHERE b = "Seven";
 a	b
 7	Seven
 DROP TABLE t1;
+#
+# Bug #30355485	CRASH WHEN DOING ANY OPERATION ON SUB-PARTITIONED TABLE
+#
+CREATE TABLE t1 (a INT, b INT) ENGINE = INNODB
+PARTITION BY RANGE(a) SUBPARTITION BY HASH(b)
+( PARTITION p0 VALUES LESS THAN (10) (SUBPARTITION s0, SUBPARTITION s1));
+# Shut down the server
+# Removing test/t1#P#p0#SP#s0.ibd manually
+# restart
+SELECT * FROM t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+DROP TABLE t1;
diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/r/partition_exchange.result
index 0de6393b6d5a..093ee0560949 100644
--- a/mysql-test/r/partition_exchange.result
+++ b/mysql-test/r/partition_exchange.result
@@ -1647,3 +1647,468 @@ a	b
 DROP TABLE t, tp, tsp;
 SET sql_mode = default;
 SET GLOBAL innodb_default_row_format=default;
+#
+# Bug#19730200: EXCHANGE PARTITION FOR PARTITION WITH DATA DIRECTORY
+#
+CREATE TABLE t1 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir';
+CREATE TABLE t2 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir',
+PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir');
+INSERT INTO t1 VALUES (1, "t1"), (5, "t1");
+INSERT INTO t2 VALUES (3, "p1"), (4, "p2"), (7, "p1"), (8, "p2");
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+# List files from t1_dir/test
+t1.ibd
+# List files from p1_dir/test
+t2#P#p1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SELECT * FROM t1;
+a	b
+3	p1
+7	p1
+SELECT * FROM t2;
+a	b
+1	t1
+5	t1
+4	p2
+8	p2
+# List files from t1_dir/test
+t2#P#p1.ibd
+# List files from p1_dir/test
+t1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/p1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+FLUSH TABLES t1, t2;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/p1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+# List files from t1_dir/test
+t1.ibd
+# List files from p1_dir/test
+t2#P#p1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+DROP TABLE t1, t2;
+# exchage partition with data dir and range
+CREATE TABLE t1 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir';
+CREATE TABLE t2 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+PARTITION BY range (a)
+(PARTITION p1 VALUES less than (10) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir',
+PARTITION p2 VALUES less than (20) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir');
+INSERT INTO t1 VALUES (1, "t1"), (5, "t1");
+INSERT INTO t2 VALUES (3, "p1"), (4, "p2"), (17, "p1"), (12, "p2");
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p1 VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+# List files from t1_dir/test
+t1.ibd
+# List files from p1_dir/test
+t2#P#p1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SELECT * FROM t1;
+a	b
+3	p1
+4	p2
+SELECT * FROM t2;
+a	b
+1	t1
+5	t1
+12	p2
+17	p1
+# List files from t1_dir/test
+t2#P#p1.ibd
+# List files from p1_dir/test
+t1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/p1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p1 VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+FLUSH TABLES t1, t2;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/p1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p1 VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(64) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p1 VALUES LESS THAN (10) DATA DIRECTORY = 'MYSQL_TMP_DIR/p1_dir/' ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN (20) DATA DIRECTORY = 'MYSQL_TMP_DIR/p2_dir/' ENGINE = InnoDB) */
+# List files from t1_dir/test
+t1.ibd
+# List files from p1_dir/test
+t2#P#p1.ibd
+# List files from p2_dir/test
+t2#P#p2.ibd
+DROP table t1,t2;
+exchange subpartition
+CREATE TABLE t1 (id INT, purchased DATE)
+ENGINE = InnoDB
+DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir';
+CREATE TABLE t2 (id INT, purchased DATE)
+PARTITION BY RANGE( YEAR(purchased) )
+SUBPARTITION BY HASH( TO_DAYS(purchased) ) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0 data directory='MYSQL_TMP_DIR/sp0_dir',
+SUBPARTITION s1),
+PARTITION p1 VALUES LESS THAN (2000) (
+SUBPARTITION s2,
+SUBPARTITION s3 data directory='MYSQL_TMP_DIR/sp3_dir'
+));
+insert into t2 values(1,'1987-05-12 '),(2,'1987-05-14');
+insert into t2 values(3,'1997-05-10 '),(4,'1997-05-18');
+insert into t1 values(1,'1987-05-10 '),(2,'1987-05-08');
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp0_dir/' ENGINE = InnoDB,
+  SUBPARTITION s1 ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp3_dir/' ENGINE = InnoDB)) */
+# List files from t1_dir/test
+t1.ibd
+# List files from sp0_dir/test
+t2#P#p0#SP#s0.ibd
+# List files from sp3_dir/test
+t2#P#p1#SP#s3.ibd
+ALTER TABLE t2 EXCHANGE PARTITION s0 WITH TABLE t1;
+SELECT * FROM t1;
+id	purchased
+1	1987-05-12
+2	1987-05-14
+SELECT * FROM t2;
+id	purchased
+1	1987-05-10
+2	1987-05-08
+3	1997-05-10
+4	1997-05-18
+# List files from t1_dir/test
+t2#P#p0#SP#s0.ibd
+# List files from sp0_dir/test
+t1.ibd
+# List files from sp3_dir/test
+t2#P#p1#SP#s3.ibd
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/sp0_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB,
+  SUBPARTITION s1 ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp3_dir/' ENGINE = InnoDB)) */
+ALTER TABLE t2 EXCHANGE PARTITION s0 WITH TABLE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp0_dir/' ENGINE = InnoDB,
+  SUBPARTITION s1 ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp3_dir/' ENGINE = InnoDB)) */
+# List files from t1_dir/test
+t1.ibd
+# List files from sp0_dir/test
+t2#P#p0#SP#s0.ibd
+# List files from sp3_dir/test
+t2#P#p1#SP#s3.ibd
+delete from t1;
+insert into t1 values(3,'1997-05-8 '),(4,'1997-05-16');
+ALTER TABLE t2 EXCHANGE PARTITION s3 WITH TABLE t1;
+SELECT * FROM t1;
+id	purchased
+3	1997-05-10
+4	1997-05-18
+SELECT * FROM t2;
+id	purchased
+1	1987-05-12
+2	1987-05-14
+3	1997-05-08
+4	1997-05-16
+# List files from t1_dir/test
+t2#P#p1#SP#s3.ibd
+# List files from sp0_dir/test
+t2#P#p0#SP#s0.ibd
+# List files from sp3_dir/test
+t1.ibd
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/sp3_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp0_dir/' ENGINE = InnoDB,
+  SUBPARTITION s1 ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/t1_dir/' ENGINE = InnoDB)) */
+ALTER TABLE t2 EXCHANGE PARTITION s3 WITH TABLE t1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/t1_dir/'
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp0_dir/' ENGINE = InnoDB,
+  SUBPARTITION s1 ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/sp3_dir/' ENGINE = InnoDB)) */
+# List files from t1_dir/test
+t1.ibd
+# List files from sp0_dir/test
+t2#P#p0#SP#s0.ibd
+# List files from sp3_dir/test
+t2#P#p1#SP#s3.ibd
+DROP table t1,t2;
+#
+Bug#28687608 exchange partition with different row_format
+#
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (
+col1 INT UNSIGNED,
+col2 DATETIME
+)
+ENGINE=INNODB
+PARTITION BY RANGE COLUMNS(col2)
+(
+PARTITION p0 VALUES LESS THAN ('1960-01-01'),
+PARTITION p1 VALUES LESS THAN ('1980-01-01')
+);
+INSERT INTO t1 VALUES ('1','1958-02-17 06:25:34');
+INSERT INTO t1 VALUES ('2','1962-11-23 11:06:06');
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN ('2000-01-01'));
+INSERT INTO t1 VALUES ('3','1999-10-13 05:28:46'), ('4', '1996-09-26 20:00:00');
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+NAME	ROW_FORMAT
+test/t1#P#p0	Compact
+test/t1#P#p1	Compact
+test/t1#P#p2	Dynamic
+CREATE TABLE t2 LIKE t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+exchange compact partition with dynamic;
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
+ERROR HY000: Non matching attribute 'ROW_FORMAT' between partition and table
+ALTER TABLE t1 EXCHANGE PARTITION p2 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (a INT,
+b VARCHAR(55),
+PRIMARY KEY (a))
+PARTITION BY RANGE (a)
+SUBPARTITION BY HASH(a)
+(PARTITION p0 VALUES LESS THAN (100)
+(SUBPARTITION sp0,
+SUBPARTITION sp1),
+PARTITION p1 VALUES LESS THAN  (200)
+(SUBPARTITION sp2,
+SUBPARTITION sp3));
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN (300)
+(SUBPARTITION sp4,
+SUBPARTITION sp5));
+INSERT INTO t1(b,a) VALUES('first',40),('second',91),('third',140),
+('forth',191);
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+NAME	ROW_FORMAT
+test/t1#P#p0#SP#sp0	Compact
+test/t1#P#p0#SP#sp1	Compact
+test/t1#P#p1#SP#sp2	Compact
+test/t1#P#p1#SP#sp3	Compact
+test/t1#P#p2#SP#sp4	Dynamic
+test/t1#P#p2#SP#sp5	Dynamic
+CREATE TABLE t2 like t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+ALTER TABLE t1 EXCHANGE PARTITION sp2 WITH TABLE t2;
+ERROR HY000: Non matching attribute 'ROW_FORMAT' between partition and table
+ALTER TABLE t1 EXCHANGE PARTITION sp4 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/mysql-test/r/partition_hash.result b/mysql-test/r/partition_hash.result
index eb2338d8da70..3f79b8698e01 100644
--- a/mysql-test/r/partition_hash.result
+++ b/mysql-test/r/partition_hash.result
@@ -207,6 +207,8 @@ partitions 3
 (partition x1 tablespace ts1,
 partition x2 tablespace ts2,
 partition x3 tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 insert into t1 values (1,1,1);
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -255,6 +257,8 @@ partitions 3
 (partition x1 tablespace ts1,
 partition x2 tablespace ts2,
 partition x3 tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 select * from t1;
 a	b	c
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
index 745877df211d..024859410230 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/r/partition_innodb.result
@@ -167,6 +167,7 @@ id	name	myDate
 # No changes.
 COMMIT;
 DROP TABLE t1;
+SET AUTOCOMMIT= default;
 #
 # Bug#51830: Incorrect partition pruning on range partition (regression)
 #
@@ -341,6 +342,7 @@ UPDATE t1 SET data = data*2 WHERE data = 2;
 SET @@session.tx_isolation = @old_tx_isolation;
 Warnings:
 Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
+SET autocommit= default;
 DROP TABLE t1;
 # Bug#37721, test of ORDER BY on PK and WHERE on INDEX
 CREATE TABLE t1 (
@@ -1059,6 +1061,8 @@ PRIMARY KEY (`f1`,`f4`)
 PARTITION BY LIST (`f4`)
 (PARTITION p0 VALUES IN (0) ENGINE = InnoDB,
 PARTITION p1 VALUES IN (1) DATA DIRECTORY = 'MYSQL_TMP_DIR/temp_tblspc' ENGINE = InnoDB);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1131,6 +1135,8 @@ PRIMARY KEY (`f1`,`f4`)
 PARTITION BY LIST (`f4`)
 (PARTITION p0 VALUES IN (0) TABLESPACE ts1 ENGINE = InnoDB,
 PARTITION p1 VALUES IN (1) TABLESPACE ts2 ENGINE = InnoDB);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1169,6 +1175,8 @@ PARTITION BY LIST (`f4`)
 PARTITION p1 VALUES IN (1) TABLESPACE innodb_file_per_table DATA DIRECTORY='MYSQL_TMP_DIR/temp_dir' ENGINE = InnoDB,
 PARTITION p2 VALUES IN (2) TABLESPACE innodb_file_per_table ENGINE = InnoDB,
 PARTITION p3 VALUES IN (3) TABLESPACE innodb_system ENGINE = InnoDB);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1293,3 +1301,75 @@ test_jfg	test_jfg11
 test_jfg	test_jfg12#P#p1000
 test_jfg	test_jfg12#P#pmax
 DROP DATABASE test_jfg;
+#
+# Bug#27073100: PARTITION UPDATE_TIME NOT CORRECT AFTER RESTART/REBUILD
+#
+# Set up.
+CREATE TABLE t1 (fld1 INT(11) NOT NULL, fld2 INT(11) NOT NULL,
+fld3 DATE NOT NULL,  fld4 DATE NOT NULL,
+PRIMARY KEY (fld1, fld3),  KEY(fld1)) PARTITION
+BY RANGE (YEAR(fld3))
+(PARTITION p01 VALUES LESS THAN (1985) ENGINE = InnoDB,
+PARTITION p02 VALUES LESS THAN (1986) ENGINE = InnoDB,
+PARTITION p03 VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+INSERT INTO t1 VALUES('11', '11111', '1984-11-16',
+'2008-11-16'), ('12', '11112', '1985-11-16', '2008-11-16'),
+('13', '11113', '1986-11-16', '2008-11-16');
+# Fetch the count of 'update_time' which is not null.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME) FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1' ORDER BY
+PARTITION_ORDINAL_POSITION;
+TABLE_NAME	COUNT(UPDATE_TIME)
+t1	3
+# Rebuild the table.
+ALTER TABLE t1 ENGINE=INNODB;
+# After table rebuild, the 'update_time' will be set to NULL.
+# Hence the count would return 0.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME) FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1' ORDER BY
+PARTITION_ORDINAL_POSITION;
+TABLE_NAME	COUNT(UPDATE_TIME)
+t1	0
+# Update the table where partition p02 is updated.
+UPDATE t1 SET fld2 = 71000 WHERE fld1 = 12 AND fld3 = '1985-11-16';
+# Without fix, the count for 'update_time' will be 2. After fix,
+# it will be 1 since only partition 'p02' is updated.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME)
+FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA = 'test' AND
+TABLE_NAME = 't1' ORDER BY PARTITION_ORDINAL_POSITION;
+TABLE_NAME	COUNT(UPDATE_TIME)
+t1	1
+DROP TABLE t1;
+
+BUG#26553164 - INNODB PARTITION TABLE HAS UNEXPECTED ROW LOCK
+
+CREATE TABLE `t1` (
+`id` int(11) NOT NULL,
+`dt` datetime NOT NULL,
+`data` varchar(10) DEFAULT NULL,
+PRIMARY KEY (`id`,`dt`),
+KEY `idx_dt` (`dt`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (to_days(dt))
+(PARTITION p20170218 VALUES LESS THAN (736744) ENGINE = InnoDB,
+PARTITION p20170219 VALUES LESS THAN (736745) ENGINE = InnoDB,
+PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
+INSERT INTO t1 VALUES (1, '2018-04-25 10:18:00', '1');
+INSERT INTO t1 VALUES (2, '2018-04-25 10:18:01', '2');
+INSERT INTO t1 VALUES (3, '2018-04-25 10:18:02', '3');
+SELECT * FROM t1;
+id	dt	data
+1	2018-04-25 10:18:00	1
+2	2018-04-25 10:18:01	2
+3	2018-04-25 10:18:02	3
+begin;
+UPDATE t1 SET data = '11' WHERE id = 1;
+begin;
+UPDATE t1 SET data = '22' WHERE id = 2;
+commit;
+SELECT * FROM t1;
+id	dt	data
+1	2018-04-25 10:18:00	11
+2	2018-04-25 10:18:01	22
+3	2018-04-25 10:18:02	3
+DROP TABLE t1;
diff --git a/mysql-test/r/partition_innodb_tablespace.result b/mysql-test/r/partition_innodb_tablespace.result
index 3079710ed246..742413a0f952 100644
--- a/mysql-test/r/partition_innodb_tablespace.result
+++ b/mysql-test/r/partition_innodb_tablespace.result
@@ -391,6 +391,8 @@ PARTITION p3 VALUES LESS THAN (300) TABLESPACE innodb_file_per_table
 (SUBPARTITION sp9 TABLESPACE ts_part4,
 SUBPARTITION sp10,
 SUBPARTITION sp11));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -444,6 +446,8 @@ PARTITION p3 VALUES LESS THAN (300) TABLESPACE innodb_file_per_table
 (SUBPARTITION sp9 TABLESPACE ts_part4,
 SUBPARTITION sp10,
 SUBPARTITION sp11));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
diff --git a/mysql-test/r/partition_list.result b/mysql-test/r/partition_list.result
index 9e7fa9fbd8d9..af110c91d220 100644
--- a/mysql-test/r/partition_list.result
+++ b/mysql-test/r/partition_list.result
@@ -426,6 +426,8 @@ c int not null,
 primary key(a,b))
 partition by list (a)
 (partition x1 values in (1,2,9,4) tablespace ts1);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/partition_pruning.result b/mysql-test/r/partition_pruning.result
index dd36021fd428..d22f561c1ddc 100644
--- a/mysql-test/r/partition_pruning.result
+++ b/mysql-test/r/partition_pruning.result
@@ -47,6 +47,9 @@ PARTITION p4 VALUES LESS THAN (5),
 PARTITION p5 VALUES LESS THAN (6),
 PARTITION max VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (-1),(0),(1),(2),(3),(4),(5),(6),(7),(8);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT * FROM t1 WHERE a < 1;
 a
 -1
@@ -484,6 +487,9 @@ PARTITION p3 VALUES LESS THAN (4),
 PARTITION p4 VALUES LESS THAN (5),
 PARTITION max VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (-1),(0),(1),(2),(3),(4),(5),(6),(7);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT * FROM t1 WHERE a < 1;
 a
 -1
@@ -2114,6 +2120,9 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
 (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-02 23:59:59'),
 (1, '2009-04-03'), (2, '2009-04-03'), (1, '2009-04-04'), (2, '2009-04-04'),
 (1, '2009-04-05'), (1, '2009-04-06'), (1, '2009-04-07');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p20090401,p20090402	index	NULL	PRIMARY	9	NULL	#	33.33	Using where; Using index
@@ -2385,6 +2394,9 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
 (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-03'), (2, '2009-04-03'),
 (1, '2009-04-04'), (2, '2009-04-04'), (1, '2009-04-05'), (1, '2009-04-06'),
 (1, '2009-04-07');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p20090401,p20090402	index	NULL	PRIMARY	7	NULL	#	33.33	Using where; Using index
@@ -2655,6 +2667,9 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
 (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-02 23:59:59'),
 (1, '2009-04-03'), (2, '2009-04-03'), (1, '2009-04-04'), (2, '2009-04-04'),
 (1, '2009-04-05'), (1, '2009-04-06'), (1, '2009-04-07');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p20090401,p20090402	ALL	NULL	NULL	NULL	NULL	#	33.33	Using where
@@ -2925,6 +2940,9 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
 (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-03'), (2, '2009-04-03'),
 (1, '2009-04-04'), (2, '2009-04-04'), (1, '2009-04-05'), (1, '2009-04-06'),
 (1, '2009-04-07');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p20090401,p20090402	ALL	NULL	NULL	NULL	NULL	#	33.33	Using where
@@ -3192,6 +3210,9 @@ PARTITION p20090403 VALUES LESS THAN (TO_DAYS('2009-04-04')),
 PARTITION p20090404 VALUES LESS THAN (TO_DAYS('2009-04-05')),
 PARTITION p20090405 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, '2009-01-01'), (2, NULL);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 # test with an invalid date, which lead to item->null_value is set.
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-99' AS DATETIME);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -3221,6 +3242,9 @@ Warning	1292	Incorrect datetime value: '2009-12-00' for column 'b' at row 1
 DROP TABLE t1;
 create table t1 ( a int not null) partition by hash(a) partitions 2;
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain select * from t1 where a=5 and a=6;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	NULL	Impossible WHERE
@@ -3231,6 +3255,9 @@ create table t1 (
 a int(11) not null
 ) partition by hash (a) partitions 2;
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a=1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	#	50.00	Using where
@@ -3254,6 +3281,9 @@ a int not null,
 b int not null
 ) partition by key(a,b) partitions 2;
 insert into t2 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 explain partitions select * from t2 where a=1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	p0,p1	ALL	NULL	NULL	NULL	NULL	#	33.33	Using where
@@ -3280,6 +3310,9 @@ partition p0 values less than (10),
 partition p1 values less than (20)
 );
 insert into t3 values (5),(15);
+ANALYZE TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	OK
 explain partitions select * from t3 where a=11;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t3	p1	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3309,6 +3342,9 @@ partition p0 values in (12),
 partition p1 values in (14)
 );
 insert into t4 values (10,2), (10,4);
+ANALYZE TABLE t4;
+Table	Op	Msg_type	Msg_text
+test.t4	analyze	status	OK
 explain partitions select * from t4 where (a=10 and b=1) or (a=10 and b=2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t4	p0	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3350,6 +3386,9 @@ partition p0 values in (12),
 partition p1 values in (14)
 );
 insert into t5 values (10,2,0,0), (10,4,0,0), (10,2,0,1), (10,4,0,1);
+ANALYZE TABLE t5;
+Table	Op	Msg_type	Msg_text
+test.t5	analyze	status	OK
 explain partitions select * from t5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp0,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	#	100.00	NULL
@@ -3404,6 +3443,9 @@ partition p7 values in (7),
 partition p9 values in (9)
 );
 insert into t6 values (1),(3),(5);
+ANALYZE TABLE t6;
+Table	Op	Msg_type	Msg_text
+test.t6	analyze	status	OK
 explain partitions select * from t6 where a <  1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t6	NULL	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3479,6 +3521,9 @@ partition p7 values in (7),
 partition p9 values in (9)
 );
 insert into t6 values (1),(3),(5);
+ANALYZE TABLE t6;
+Table	Op	Msg_type	Msg_text
+test.t6	analyze	status	OK
 explain partitions select * from t6 where a <  1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t6	NULL	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3553,6 +3598,9 @@ partition p70 values less than (70),
 partition p90 values less than (90)
 );
 insert into t7 values (10),(30),(50);
+ANALYZE TABLE t7;
+Table	Op	Msg_type	Msg_text
+test.t7	analyze	status	OK
 explain partitions select * from t7 where a < 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t7	p10	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3700,6 +3748,9 @@ partition p70 values less than (70),
 partition p90 values less than (90)
 );
 insert into t7 values (10),(30),(50);
+ANALYZE TABLE t7;
+Table	Op	Msg_type	Msg_text
+test.t7	analyze	status	OK
 explain partitions select * from t7 where a < 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t7	p10	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3844,6 +3895,9 @@ partition p1 values less than (1990),
 partition p2 values less than (2000)
 );
 insert into t8 values ('1985-05-05'),('1995-05-05');
+ANALYZE TABLE t8;
+Table	Op	Msg_type	Msg_text
+test.t8	analyze	status	OK
 explain partitions select * from t8 where a < '1980-02-02';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t8	p0,p1	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3856,6 +3910,9 @@ partition p1 values less than (732468), -- 2005-06-06
 partition p2 values less than (732664)  -- 2005-12-19
 );
 insert into t9 values ('2005-05-05'), ('2005-04-04');
+ANALYZE TABLE t9;
+Table	Op	Msg_type	Msg_text
+test.t9	analyze	status	OK
 explain partitions select * from t9 where a <  '2004-12-19';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t9	p0	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3878,6 +3935,9 @@ partition p1 values less than (6),
 partition p2 values less than (9)
 );
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a1 > 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3905,6 +3965,9 @@ partition p2 values in (3),
 partition p3 values in (4)
 );
 insert into t3 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t3;
+Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	OK
 explain partitions select * from t3 where a=2 or b=1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t3	p0_p0sp1,p1_p1sp0,p1_p1sp1,p1_p1sp2,p1_p1sp3,p2_p2sp1,p3_p3sp1	ALL	NULL	NULL	NULL	NULL	#	75.00	Using where
@@ -3926,6 +3989,9 @@ Note	1003	/* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` fr
 drop table t3;
 create table t1 (a int) partition by hash(a) partitions 2;
 insert into t1 values (1),(2);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a is null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3942,6 +4008,9 @@ drop table t1;
 create table t1 (a int not null, b int not null, key(a), key(b))
 partition by hash(a) partitions 4;
 insert into t1 values (1,1),(2,2),(3,3),(4,4);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions
 select * from t1 x, t1 y
 where x.b = y.b and (x.a=1 or x.a=2) and (y.a=2 or y.a=3);
@@ -3962,6 +4031,9 @@ Note	1003	/* select#1 */ select `test`.`x`.`a` AS `a`,`test`.`x`.`b` AS `b`,`tes
 drop table t1;
 create table t1 (a int) partition by hash(a) partitions 20;
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a >  1 and a < 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p2	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -3996,6 +4068,9 @@ partition p2 values in (2),
 partition p3 values in (3)
 );
 insert into t1 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where b >  1 and b < 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0_p0sp2,p1_p1sp2,p2_p2sp2,p3_p3sp2	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -4014,6 +4089,9 @@ partition p0 values in (1,2),
 partition p1 values in (3,4)
 );
 insert into t1 values (1),(1),(2),(2),(3),(4),(3),(4);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 # This won't do any table access
 explain extended update t1 set a=100 where a=5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -4165,9 +4243,15 @@ a
 4
 4
 insert into t1 values (1), (1);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 # Same as above multi-table UPDATE/DELETE
 create table t2 like t1;
 insert into t2 select * from t1;
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 explain extended update t1,t2 set t1.a=1000, t2.a=1000 where t1.a=5 and t2.a=5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	UPDATE	t1	NULL	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -4267,6 +4351,9 @@ KEY `a` (`a`)
 ) ;
 insert into t2 select A.a + 10*(B.a + 10* C.a) from t1 A, t1 B, t1 C ;
 insert into t1 select a from t2;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 drop table t2;
 CREATE TABLE `t2` (
 `a` int(11) default NULL,
@@ -4293,6 +4380,9 @@ insert into t2 select a,2 from t1 where a >= 200 and a < 400;
 insert into t2 select a,3 from t1 where a >= 400 and a < 600;
 insert into t2 select a,4 from t1 where a >= 600 and a < 800;
 insert into t2 select a,5 from t1 where a >= 800 and a < 1001;
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 explain partitions select * from t2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	p0,p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	#	100.00	NULL
@@ -4747,6 +4837,9 @@ partition part2 values in (1),
 partition part4 values in (null)
 );
 insert into t1 set f_int1 = null;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 select * from t1 where f_int1 is null;
 f_int1
 NULL
@@ -4767,6 +4860,9 @@ partition p2 values in (3)
 );
 insert into t1 values (1,1),(1,2),(1,3),(1,4),
 (2,1),(2,2),(2,3),(2,4);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a=1 AND (b=1 OR b=2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0_p0sp1,p0_p0sp2	ALL	NULL	NULL	NULL	NULL	#	50.00	Using where
@@ -4785,6 +4881,9 @@ partition pn values in (NULL)
 );
 insert into t1 values (1,1),(1,2),(1,3),(1,4),
 (2,1),(2,2),(2,3),(2,4), (NULL,1);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a IS NULL AND (b=1 OR b=2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	pn_pnsp0,pn_pnsp1	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -4817,6 +4916,9 @@ partition p4 values in (4), partition p5 values in (5),
 partition p6 values in (6), partition pn values in (NULL)
 );
 insert into t1 values (NULL), (0),(1),(2),(3),(4),(5),(6);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a is null or a < 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,pn	ALL	NULL	NULL	NULL	NULL	#	41.66	Using where
@@ -4829,6 +4931,9 @@ create table t1 (s1 int) partition by list (s1)
 partition p2 values in (1),
 partition p3 values in (null));
 insert into t1 values (0),(1),(null);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 select count(*) from t1 where s1 < 0 or s1 is null;
 count(*)
 1
@@ -4843,6 +4948,9 @@ create table t1 (a char(32) primary key)
 partition by key()
 partitions 100;
 insert into t1 values ('na');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 select * from t1;
 a
 na
@@ -4854,6 +4962,9 @@ create table t1 (s1 varchar(15)) partition by key (s1);
 select * from t1 where s1 = 0 or s1 is null;
 s1
 insert into t1 values ('aa'),('bb'),('0');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where s1 = 0 or s1 is null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	#	55.56	Using where
@@ -4867,6 +4978,9 @@ subpartition by HASH(b) subpartitions 40
 ( partition p_0_long_partition_name values in(1),
 partition p_1_long_partition_name values in(2));
 insert into t2 values (1,1),(2,2);
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 explain partitions select * from t2;
 id	1
 select_type	SIMPLE
@@ -4907,6 +5021,9 @@ partition p4 values less than (18446744073709551614)
 insert into t1 values (5),(15),(105),(1005);
 insert into t1 values (18446744073709551000+1);
 insert into t1 values (18446744073709551614-1);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a < 10;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	#	100.00	Using where
@@ -4960,6 +5077,12 @@ partition p2 values less than (255)
 );
 insert into t1 values (0x20), (0x20), (0x41), (0x41), (0xFE), (0xFE);
 insert into t2 values (0x20), (0x20), (0x41), (0x41), (0xFE), (0xFE);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 explain partitions select * from t1 where a=0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	#	50.00	Using where
@@ -5042,6 +5165,9 @@ partition p4 values less than (2305561538531950591)
 );
 insert into t1 values (9),(19),(0xFFFF0000FFFF000-1), (0xFFFF0000FFFFFFF-1);
 insert into t1 values (9),(19),(0xFFFF0000FFFF000-1), (0xFFFF0000FFFFFFF-1);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where
 a >= 2305561538531885056-10 and a <= 2305561538531885056-8;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -5070,6 +5196,9 @@ partition p3 values less than (10),
 partition p4 values less than (1000)
 );
 insert into t1 values (-15),(-5),(5),(15),(-15),(-5),(5),(15);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a>-2 and a <=0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p3	ALL	NULL	NULL	NULL	NULL	#	25.00	Using where
@@ -5086,6 +5215,9 @@ INSERT INTO t1 VALUES ('2007-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-07 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-08 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-15 12:00:00');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 must use p0 only:
 explain partitions select * from t1 where recdate < '2007-03-08 00:00:00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -5103,6 +5235,9 @@ INSERT INTO t1 VALUES ('2005-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2005-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2006-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2006-03-01 12:00:00');
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 must use p0 only:
 explain partitions select * from t1 where recdate < '2006-01-01 00:00:00';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
@@ -5123,6 +5258,9 @@ partition p1 values less than (128),
 partition p2 values less than (255)
 );
 insert into t1 select A.a + 10*B.a from t0 A, t0 B;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 explain partitions select * from t1 where a between 10 and 13;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	#	11.11	Using where
@@ -5150,6 +5288,9 @@ PARTITION BY LIST COLUMNS (c2)
 PARTITION p2 VALUES IN (3,4));
 INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
 INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
 c1	c2	c3	c4
 SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
diff --git a/mysql-test/r/partition_range.result b/mysql-test/r/partition_range.result
index 21ff94250e32..5aba1b6a4c0a 100644
--- a/mysql-test/r/partition_range.result
+++ b/mysql-test/r/partition_range.result
@@ -346,6 +346,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than maxvalue tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 INSERT into t1 values (1, 1, 1);
 INSERT into t1 values (6, 1, 1);
 INSERT into t1 values (10, 1, 1);
@@ -374,6 +376,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than maxvalue tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 select * from t1;
 a	b	c
 1	1	1
@@ -402,6 +406,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than maxvalue tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 INSERT into t1 values (1, 1, 1);
 INSERT into t1 values (6, 1, 1);
 INSERT into t1 values (10, 1, 1);
@@ -429,6 +435,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than maxvalue tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 select * from t1;
 a	b	c
 1	1	1
@@ -457,6 +465,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than (15) tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 INSERT into t1 values (1, 1, 1);
 INSERT into t1 values (6, 1, 1);
 INSERT into t1 values (10, 1, 1);
@@ -485,6 +495,8 @@ partitions 3
 (partition x1 values less than (5) tablespace ts1,
 partition x2 values less than (10) tablespace ts2,
 partition x3 values less than (15) tablespace ts3);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 select * from t1;
 a	b	c
 1	1	1
@@ -597,6 +609,8 @@ partition x2 values less than (5)
 ( subpartition x21 tablespace ts1 nodegroup 0,
 subpartition x22 tablespace ts2 nodegroup 1)
 );
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SELECT * from t1;
 a	b	c
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 15eb2124541d..06ae1b8232a4 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -293,7 +293,7 @@ t2	1	t2_idx	1	b	A	0	NULL	NULL	YES	BTREE
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 execute stmt4;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t2	InnoDB	10	Dynamic	0	0	16384	#	0	0	NULL	#	#	#	latin1_swedish_ci	NULL		
+t2	InnoDB	10	Dynamic	0	0	16384	#	16384	0	NULL	#	#	#	latin1_swedish_ci	NULL		
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 execute stmt4;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index fb3732f65cab..c42adf7376ad 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -869,6 +869,8 @@ select '1' || '3' from t1;
 1
 1
 set SQL_MODE=oracle;
+Warnings:
+Warning	3090	Changing sql mode 'ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 select '1' || '3' from t1;
 '1' || '3'
 13
diff --git a/mysql-test/r/range_all.result b/mysql-test/r/range_all.result
index c68ee9b54066..4d8b669fc20d 100644
--- a/mysql-test/r/range_all.result
+++ b/mysql-test/r/range_all.result
@@ -3687,4 +3687,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_icp.result b/mysql-test/r/range_icp.result
index 58d55e7dc221..dc7d45f1a4ee 100644
--- a/mysql-test/r/range_icp.result
+++ b/mysql-test/r/range_icp.result
@@ -1361,7 +1361,7 @@ Z
 In following EXPLAIN the access method should be ref or range, #rows~=500 (and not 2)
 explain select * from t2 where a=1000 and b<11;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	5	const	502	33.33	Using index condition
+1	SIMPLE	t2	NULL	range	a	a	10	NULL	502	100.00	Using index condition
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where ((`test`.`t2`.`a` = 1000) and (`test`.`t2`.`b` < 11))
 drop table t1, t2;
@@ -3687,4 +3687,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_icp_mrr.result b/mysql-test/r/range_icp_mrr.result
index 6ce7f6c981d4..9f512c786148 100644
--- a/mysql-test/r/range_icp_mrr.result
+++ b/mysql-test/r/range_icp_mrr.result
@@ -3687,4 +3687,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using index condition
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_mrr.result b/mysql-test/r/range_mrr.result
index daecc0d27858..299fce6e435e 100644
--- a/mysql-test/r/range_mrr.result
+++ b/mysql-test/r/range_mrr.result
@@ -3687,4 +3687,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_mrr_cost.result b/mysql-test/r/range_mrr_cost.result
index de3d0e46d7c0..73258a9dc922 100644
--- a/mysql-test/r/range_mrr_cost.result
+++ b/mysql-test/r/range_mrr_cost.result
@@ -1361,7 +1361,7 @@ Z
 In following EXPLAIN the access method should be ref or range, #rows~=500 (and not 2)
 explain select * from t2 where a=1000 and b<11;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	5	const	502	33.33	Using where
+1	SIMPLE	t2	NULL	range	a	a	10	NULL	502	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where ((`test`.`t2`.`a` = 1000) and (`test`.`t2`.`b` < 11))
 drop table t1, t2;
@@ -3687,4 +3687,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_none.result b/mysql-test/r/range_none.result
index 047effcc3b6c..ecc67f21c1fc 100644
--- a/mysql-test/r/range_none.result
+++ b/mysql-test/r/range_none.result
@@ -1360,7 +1360,7 @@ Z
 In following EXPLAIN the access method should be ref or range, #rows~=500 (and not 2)
 explain select * from t2 where a=1000 and b<11;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	NULL	ref	a	a	5	const	502	33.33	Using where
+1	SIMPLE	t2	NULL	range	a	a	10	NULL	502	100.00	Using where
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`filler` AS `filler` from `test`.`t2` where ((`test`.`t2`.`a` = 1000) and (`test`.`t2`.`b` < 11))
 drop table t1, t2;
@@ -3686,4 +3686,52 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	range	idx1,idx2	idx1	28	NULL	27	100.00	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+DROP TABLE test_ref;
 set optimizer_switch=default;
diff --git a/mysql-test/r/range_with_memory_limit.result b/mysql-test/r/range_with_memory_limit.result
index 455cd2dc91a4..de71b52bf918 100644
--- a/mysql-test/r/range_with_memory_limit.result
+++ b/mysql-test/r/range_with_memory_limit.result
@@ -4206,5 +4206,59 @@ SELECT @trace RLIKE "uses_more_keyparts";
 SET optimizer_trace="enabled=off";
 DROP PROCEDURE p;
 DROP TABLE t1, transactions;
+#
+# Bug #28086754: OPTIMIZER SKIP THE RANG SCAN ON SECOND COLUMN IN A
+#                 COMPOSITE INDEX
+#
+CREATE TABLE test_ref (
+a INT PRIMARY KEY,
+b VARCHAR(20),
+c VARCHAR(20) DEFAULT NULL,
+d VARCHAR(3) DEFAULT NULL,
+id INT DEFAULT NULL,
+KEY idx1 (id, c),
+KEY idx2 (id, d)) ENGINE=INNODB ;
+ANALYZE TABLE test_ref;
+Table	Op	Msg_type	Msg_text
+test.test_ref	analyze	status	OK
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	ref	idx1,idx2	idx1	5	const	26	11.11	Using index condition
+Warnings:
+Warning	3170	Memory capacity of 50 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c
+LIMIT 1;
+a	b	c	d	id
+34876	D003	gheennse	S	3
+Warnings:
+Warning	3170	Memory capacity of 50 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+EXPLAIN SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_ref	NULL	ref	idx1,idx2	idx1	5	const	26	11.11	Using where
+Warnings:
+Warning	3170	Memory capacity of 50 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+Note	1003	/* select#1 */ select `test`.`test_ref`.`a` AS `a`,`test`.`test_ref`.`b` AS `b`,`test`.`test_ref`.`c` AS `c`,`test`.`test_ref`.`d` AS `d`,`test`.`test_ref`.`id` AS `id` from `test`.`test_ref` where ((`test`.`test_ref`.`id` = 3) and (`test`.`test_ref`.`c` like 'gh%')) order by `test`.`test_ref`.`c` desc limit 1
+SELECT *
+FROM test_ref
+WHERE id=3 AND c LIKE 'gh%'
+ORDER BY c DESC
+LIMIT 1;
+a	b	c	d	id
+1770649	D003	gheennse	S	3
+Warnings:
+Warning	3170	Memory capacity of 50 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+DROP TABLE test_ref;
 SET RANGE_OPTIMIZER_MAX_MEM_SIZE= DEFAULT;
 # End of test for Bug#17769777 and Bug#17413040
diff --git a/mysql-test/r/read_only.result b/mysql-test/r/read_only.result
index 312baf8714a7..20211874d3fb 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/r/read_only.result
@@ -205,3 +205,521 @@ DROP TABLE t1;
 set sql_mode= @orig_sql_mode;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+#
+# BUG#28438114: SET READ_ONLY=1 SOMETIMES DOESN'T BLOCK CONCURRENT DDL.
+#
+# Prepare the sql file for testing DDLS.
+SET @save_read_only= @@global.read_only;
+CREATE USER test@localhost;
+GRANT CREATE, DROP, INSERT, CREATE TABLESPACE, ALTER ROUTINE, RELOAD ON *.* TO test@localhost;
+connect (con1,localhost,test,,test);
+connect (con2,localhost,root,,test);
+# Test CREATE DATABASE statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE DATABASE new;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER DATABASE statement
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER DATABASE test CHARACTER SET utf8;;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP DATABASE statement.
+CREATE DATABASE new;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP DATABASE new;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP DATABASE new;
+# Test CREATE TABLE statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE TABLE t1(fld1 INT);
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER TABLE statement.
+CREATE TABLE t1(fld1 INT);
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER TABLE t1 ADD fld2 INT;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP TABLE statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP TABLE t1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test CREATE INDEX statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE INDEX idx1 ON t1 (fld1) USING BTREE;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP INDEX statement.
+CREATE INDEX idx1 ON t1 (fld1) USING BTREE;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP INDEX idx1 ON t1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP INDEX idx1 ON t1;
+# Test CREATE TRIGGER statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE TRIGGER trg1 BEFORE INSERT ON t1
+FOR EACH ROW BEGIN END;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP TRIGGER statement.
+CREATE TRIGGER trg1 BEFORE INSERT ON t1
+FOR EACH ROW BEGIN END;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP TRIGGER trg1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP TRIGGER trg1;
+# Test TRUNCATE TABLE statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+TRUNCATE TABLE t1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test CREATE VIEW statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE VIEW v1 AS SELECT * FROM t1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER VIEW statement.
+CREATE VIEW v1 AS SELECT * FROM t1;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER VIEW v1 AS SELECT 1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP VIEW statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP VIEW v1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP VIEW v1;
+DROP TABLE t1;
+# Test CREATE TABLESPACE statement
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE TABLESPACE ts1
+ADD DATAFILE 'ts1.ibd' ENGINE=INNODB;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.ibd' ENGINE=INNODB;
+# Test DROP TABLESPACE statement
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP TABLESPACE ts1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP TABLESPACE ts1;
+# Test CREATE FUNCTION statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE FUNCTION f1() RETURNS INT RETURN 5;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER FUNCTION statement.
+CREATE FUNCTION f1() RETURNS INT RETURN 5;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER FUNCTION f1 COMMENT 'test';
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP FUNCTION statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP FUNCTION f1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP FUNCTION f1;
+# Test CREATE PROCEDURE statement
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE PROCEDURE p1() select 1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER PROCEDURE statement.
+CREATE PROCEDURE p1() select 1;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER PROCEDURE p1 comment 'test';
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP PROCEDURE statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP PROCEDURE p1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP PROCEDURE p1;
+# Test CREATE EVENT statement
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+CREATE EVENT event1 ON SCHEDULE
+EVERY 10 HOUR DO SELECT 1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test ALTER EVENT statement
+CREATE EVENT event1 ON SCHEDULE EVERY 10 HOUR DO SELECT 1;
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+ALTER EVENT event1 DISABLE;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+# Test DROP EVENT statement.
+connection default;
+FLUSH TABLES WITH READ LOCK;
+connection con1;
+# DDL statement will block waiting for GRL.
+DROP EVENT event1;
+connection con2;
+# Wait until statement is blocked waiting for GRL.
+SET GLOBAL READ_ONLY= 1;
+connection default;
+# Unblock the DDL statement.
+UNLOCK TABLES;
+connection con1;
+# Without patch for BUG#28438114, the DDL statement will succeed even
+# though read only mode was set.
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+# Clean up.
+connection default;
+SET GLOBAL READ_ONLY= 0;
+DROP EVENT event1;
+# Test case added for coverage.
+CREATE TABLE t1(fld1 INT);
+# FTWRL and FLUSH TABLE..FOR EXPORT is not blocked
+# in read_only/super_read_only mode.
+FLUSH TABLES t1 WITH READ LOCK;
+UNLOCK TABLES;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+# Clean up.
+DROP TABLE t1;
+DROP USER test@localhost;
+SET GLOBAL read_only= @save_read_only;
diff --git a/mysql-test/suite/binlog/r/binlog_variables_relay_log_index.result b/mysql-test/r/relay_log_index_variables.result
similarity index 100%
rename from mysql-test/suite/binlog/r/binlog_variables_relay_log_index.result
rename to mysql-test/r/relay_log_index_variables.result
diff --git a/mysql-test/suite/binlog/r/binlog_variables_relay_log.result b/mysql-test/r/relay_log_variables.result
similarity index 100%
rename from mysql-test/suite/binlog/r/binlog_variables_relay_log.result
rename to mysql-test/r/relay_log_variables.result
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
index 1a98f2f0f36c..63e017683728 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/r/repair.result
@@ -39,17 +39,6 @@ Table	Op	Msg_type	Msg_text
 test.t1	repair	warning	Number of rows changed from 0 to 1
 test.t1	repair	status	OK
 drop table t1;
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES(1),(2),(3),(4),(5);
-SET myisam_repair_threads=2;
-REPAIR TABLE t1;
-Table	Op	Msg_type	Msg_text
-test.t1	repair	status	OK
-SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE		
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-DROP TABLE t1;
 CREATE TABLE t1(a INT);
 USE mysql;
 REPAIR TABLE test.t1 USE_FRM;
@@ -79,13 +68,11 @@ INSERT INTO t1 VALUES
 Warnings:
 Error	1034	myisam_sort_buffer_size is too small
 Error	1034	Number of rows changed from 0 to 157
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	error	myisam_sort_buffer_size is too small
 test.t1	repair	warning	Number of rows changed from 0 to 157
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 CREATE TABLE t1(a CHAR(255), KEY(a));
@@ -107,11 +94,9 @@ INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0');
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 End of 4.1 tests
diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
index f8354ed2f569..99f207a09bbf 100644
--- a/mysql-test/r/select_safe.result
+++ b/mysql-test/r/select_safe.result
@@ -20,15 +20,15 @@ select 1 from t1,t1 as t2,t1 as t3;
 1
 1
 update t1 set b="a";
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 update t1 set b="a" where b="test";
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 delete from t1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 delete from t1 where b="test";
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 delete from t1 where a+0=1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
 ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay
 update t1 set b="a" limit 1;
@@ -95,3 +95,88 @@ select * from (select 1 union select 2 union select 3) x;
 ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay
 drop table t1;
 SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, MAX_JOIN_SIZE=DEFAULT;
+#
+# Bug #28145710: SQL_SAFE_UPDATES ERROR IS INSUFFICIENTLY INFORMATIVE
+#
+CREATE TABLE t1 (c1 INT NOT NULL, c2 VARCHAR(200) NOT NULL,
+UNIQUE KEY idx1 (c1), UNIQUE KEY idx2 (c2));
+CREATE TABLE t2 (c1 INT NOT NULL, c2 VARCHAR(200) NOT NULL,
+UNIQUE KEY idx1 (c1));
+INSERT INTO t1 VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd');
+INSERT INTO t2 VALUES (11, 'a'), (12, 'b'), (3, 'c'), (14, 'd');
+ANALYZE TABLE t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+test.t2	analyze	status	OK
+SET SESSION sql_safe_updates=1;
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 1;
+EXPLAIN DELETE FROM t1 WHERE c1 IN (1,22);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	DELETE	t1	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 1 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+DELETE FROM t1 WHERE c1 IN (1,22);
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Memory capacity of 1 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+EXPLAIN UPDATE t1 SET c1=20 WHERE c1 IN (1,22);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t1	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+Warnings:
+Warning	3170	Memory capacity of 1 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+UPDATE t1 SET c1=20 WHERE c1 IN (1,22);
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Memory capacity of 1 bytes for 'range_optimizer_max_mem_size' exceeded. Range optimization was not done for this query.
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= default;
+EXPLAIN DELETE t1 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	DELETE	t1	NULL	ALL	idx2	NULL	NULL	NULL	4	100.00	NULL
+1	SIMPLE	t2	NULL	eq_ref	idx1	idx1	4	test.t1.c2	1	100.00	Using where; Using index
+Warnings:
+Warning	1739	Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+DELETE t1 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+EXPLAIN UPDATE t1, t2 SET t1.c1=20 WHERE t1.c2 = t2.c1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t1	NULL	ALL	idx2	NULL	NULL	NULL	4	100.00	NULL
+1	SIMPLE	t2	NULL	eq_ref	idx1	idx1	4	test.t1.c2	1	100.00	Using where; Using index
+Warnings:
+Warning	1739	Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+UPDATE t1, t2 SET t1.c1=20 WHERE t1.c2 = t2.c1;
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+EXPLAIN DELETE t2 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index	idx2	idx2	202	NULL	4	100.00	Using index
+1	DELETE	t2	NULL	eq_ref	idx1	idx1	4	test.t1.c2	1	100.00	Using where
+Warnings:
+Warning	1739	Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+DELETE t2 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+Warnings:
+Warning	1739	Cannot use ref access on index 'idx2' due to type or collation conversion on field 'c2'
+EXPLAIN DELETE FROM t1 WHERE c2 IN(1,2222);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	DELETE	t1	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+Warnings:
+Warning	1739	Cannot use range access on index 'idx2' due to type or collation conversion on field 'c2'
+DELETE FROM t1 WHERE c2 IN(1,2222);
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Cannot use range access on index 'idx2' due to type or collation conversion on field 'c2'
+EXPLAIN UPDATE t1 SET c1=20 WHERE c2 IN(1,2222);
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	UPDATE	t1	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+Warnings:
+Warning	1739	Cannot use range access on index 'idx2' due to type or collation conversion on field 'c2'
+UPDATE t1 SET c1=20 WHERE c2 IN(1,2222);
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. Cannot use range access on index 'idx2' due to type or collation conversion on field 'c2'
+EXPLAIN DELETE FROM t2 WHERE c2 IN('a','e');
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	DELETE	t2	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
+DELETE FROM t2 WHERE c2 IN('a','e');
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
+EXPLAIN DELETE FROM t2;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	DELETE	t2	NULL	ALL	NULL	NULL	NULL	NULL	4	100.00	Deleting all rows
+DELETE FROM t2;
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
+SET sql_log_bin= 0;
+DELETE FROM t2;
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
+SET sql_log_bin= default;
+DROP TABLE t1, t2;
+SET SESSION sql_safe_updates=default;
diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result
index 0b343e7262b4..ea196769fc7e 100644
--- a/mysql-test/r/skip_name_resolve.result
+++ b/mysql-test/r/skip_name_resolve.result
@@ -50,10 +50,20 @@ End of 5.1 tests
 #
 CREATE USER b20438524@'%' IDENTIFIED BY 'pwd';
 # set some valid addresses
-UPDATE mysql.user SET host='localhost' WHERE user='b20438524';
+UPDATE mysql.user SET host='localhost1' WHERE user='b20438524';
 FLUSH PRIVILEGES;
 # cleanup
 DELETE FROM mysql.user WHERE user='b20438524';
 FLUSH PRIVILEGES;
 # must find the pattern
+#
+# Bug #23329861: WARNING ABOUT LOCALHOST WHEN USING SKIP-NAME-RESOLVE
+#
+CREATE USER b20438524@'%' IDENTIFIED BY 'pwd';
+# set some valid addresses
+UPDATE mysql.user SET host='localhost' WHERE user='b20438524';
+FLUSH PRIVILEGES;
+# must not find the pattern
+Pattern "'user' entry 'b20438524@localhost' ignored in --skip-name-resolve mode" not found
+DELETE FROM mysql.user WHERE user='b20438524';
 End of 5.7 tests
diff --git a/mysql-test/r/slow_log.result b/mysql-test/r/slow_log.result
new file mode 100644
index 000000000000..3b56aaf2fb6d
--- /dev/null
+++ b/mysql-test/r/slow_log.result
@@ -0,0 +1,53 @@
+#
+# Bug#33732907: Slow query log logs password in plain text on syntax error
+#
+
+SET @save_sqlf=@@global.slow_query_log_file;
+SET @save_sql=@@global.slow_query_log;
+SET @save_lo=@@global.log_output;
+SET @save_lqt=@@session.long_query_time;
+SET GLOBAL slow_query_log_file= '.../slow33732907.log';
+SET @@global.slow_query_log=1;
+SET @@global.log_output='file,table';
+SET @@session.long_query_time=0;
+
+# This succeeds, and the password is correctly obfuscated.
+CREATE USER 'duplicate_user'@'%' IDENTIFIED BY 'mypassword';
+# This fails, but the password is still correctly obfuscated.
+CREATE USER 'duplicate_user'@'%' IDENTIFIED BY 'mypassword';
+ERROR HY000: Operation CREATE USER failed for 'duplicate_user'@'%'
+
+# Since we throw an error during the parse stage, we don't know which
+# part of the statement is the password (or whether there even is one),
+# so we cannot obfuscate it. In that case, the statement should not be
+# logged, either. The general log also behaves like this by default.
+CREATE USER ‘bad_characters’@’%’ IDENTIFIED BY 'mypassword';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '��bad_characters’@’%’ IDENTIFIED BY 'mypassword'' at line 1
+# Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+SELECT "general table>",argument
+FROM mysql.general_log
+WHERE INSTR(argument,"CREATE USER")=1
+ORDER BY event_time;
+general table>	argument
+general table>	CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>'
+general table>	CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>'
+# Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+SELECT "slow table>",sql_text
+FROM mysql.slow_log
+WHERE INSTR(sql_text,"CREATE USER")=1
+ORDER BY start_time;
+slow table>	sql_text
+slow table>	CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '*FABE5482D5AADF36D028AC443D117BE1180B9725'
+slow table>	CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>'
+SET @@global.slow_query_log_file=@save_sqlf;
+SET @@global.slow_query_log=@save_sql;
+SET @@global.log_output=@save_lo;
+SET @@session.long_query_time=@save_lqt;
+DROP USER 'duplicate_user'@'%';
+# Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+slow file>CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '*FABE5482D5AADF36D028AC443D117BE1180B9725';
+slow file>CREATE USER 'duplicate_user'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>';
+TRUNCATE mysql.slow_log;
+TRUNCATE mysql.general_log;
+#
+# Done.
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 8a58830274c4..2c22c8b91757 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -2910,3 +2910,26 @@ drop function test.f111111111122222222223333333333444444444455555555556666666666
 ERROR 42000: Identifier name 'f111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999aaaaaaaaa' is too long
 drop function mysqltest111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjj.test;
 ERROR 42000: Incorrect database name 'mysqltest111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999a'
+#
+# Bug #24357244: CANNOT CREATE A STORED FUNCTION IF A DATABASE IS NOT
+#                SELECTED
+#
+CREATE DATABASE mysqltest;
+USE mysqltest;
+DROP DATABASE mysqltest;
+SELECT DATABASE();
+DATABASE()
+NULL
+CREATE DATABASE mysqltest;
+CREATE FUNCTION mysqltest.f1() RETURNS INT RETURN 0;
+CREATE FUNCTION mysqltest.f2() RETURNS INT RETURN f1();
+USE mysqltest;
+SELECT f1();
+f1()
+0
+SELECT f2();
+f2()
+0
+DROP FUNCTION IF EXISTS f2;
+DROP FUNCTION IF EXISTS f1;
+DROP DATABASE mysqltest;
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 244a2d37a0c3..a6cd3d18a218 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6907,6 +6907,7 @@ set @old_mode= @@sql_mode;
 set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40' is deprecated. It will be removed in a future release.
 select @@sql_mode into @full_mode;
 create procedure p() begin end;
 call p();
diff --git a/mysql-test/r/sp_debug.result b/mysql-test/r/sp_debug.result
new file mode 100644
index 000000000000..89dd34f09f9f
--- /dev/null
+++ b/mysql-test/r/sp_debug.result
@@ -0,0 +1,23 @@
+#
+# Bug#26040870 - ASSERT ON KILL'ING A STORED ROUTINE INVOCATION.
+#
+CREATE TABLE t1 (a INT);
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+INSERT INTO t1 VALUES (1);
+RETURN 1;
+END|
+SET DEBUG_SYNC= "sp_lex_instr_before_exec_core SIGNAL sp_ready WAIT_FOR sp_finish";
+SELECT f1();
+SET DEBUG_SYNC="now WAIT_FOR sp_ready";
+KILL QUERY sp_con_id;
+SET DEBUG_SYNC="now SIGNAL sp_finish";
+# Diagnostics area is not set if routine statement execution is
+# interrupted by the KILL operation. Accessing diagnostics area in such
+# case results in the issue reported.
+# Patch for the bug25586773, checks if diagnostics area is set before
+# accessing it.
+ERROR 70100: Query execution was interrupted
+SET DEBUG_SYNC='RESET';
+DROP TABLE t1;
+DROP FUNCTION f1;
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index 9f146db199da..139b62f0fd31 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -36,6 +36,8 @@ t1	CREATE TABLE "t1" (
   UNIQUE KEY "email" ("email") USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="no_table_options";
+Warnings:
+Warning	3090	Changing sql mode 'NO_TABLE_OPTIONS' is deprecated. It will be removed in a future release.
 show variables like 'sql_mode';
 Variable_name	Value
 sql_mode	NO_TABLE_OPTIONS
@@ -49,6 +51,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `email` (`email`) USING BTREE
 )
 set @@sql_mode="no_key_options";
+Warnings:
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS' is deprecated. It will be removed in a future release.
 show variables like 'sql_mode';
 Variable_name	Value
 sql_mode	NO_KEY_OPTIONS
@@ -62,6 +66,8 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `email` (`email`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="no_field_options,mysql323,mysql40";
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS,MYSQL323,MYSQL40' is deprecated. It will be removed in a future release.
 show variables like 'sql_mode';
 Variable_name	Value
 sql_mode	NO_FIELD_OPTIONS,MYSQL323,MYSQL40,HIGH_NOT_PRECEDENCE
@@ -77,6 +83,7 @@ t1	CREATE TABLE `t1` (
 set sql_mode="postgresql,oracle,mssql,db2,maxdb";
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 select @@sql_mode;
 @@sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
@@ -106,6 +113,8 @@ t1	CREATE TABLE `t1` (
   `c` binary(10) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 set @@sql_mode="mysql323";
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL323' is deprecated. It will be removed in a future release.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -114,6 +123,8 @@ t1	CREATE TABLE `t1` (
   `c` binary(10) DEFAULT NULL
 ) TYPE=ENGINE
 set @@sql_mode="mysql40";
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL40' is deprecated. It will be removed in a future release.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -159,6 +170,8 @@ t1	CREATE TABLE "t1" (
   PRIMARY KEY ("f1")
 )
 set session sql_mode=no_field_options;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -482,6 +495,8 @@ select @@sql_mode;
 @@sql_mode
 STRICT_ALL_TABLES
 set sql_mode=16384+(65536*4);
+Warnings:
+Warning	3090	Changing sql mode 'NO_TABLE_OPTIONS' is deprecated. It will be removed in a future release.
 select @@sql_mode;
 @@sql_mode
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,NO_TABLE_OPTIONS,ANSI
@@ -506,6 +521,8 @@ xb	x
 xcx
 drop table t1;
 SET @@SQL_MODE=@OLD_SQL_MODE;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 create user mysqltest_32753@localhost;
 set @OLD_SQL_MODE=@@SESSION.SQL_MODE;
 set session sql_mode='PAD_CHAR_TO_FULL_LENGTH';
@@ -514,6 +531,8 @@ select current_user();
 current_user()
 mysqltest_32753@localhost
 set session sql_mode=@OLD_SQL_MODE;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 flush privileges;
 drop user mysqltest_32753@localhost;
 SET @org_mode=@@sql_mode;
@@ -526,6 +545,7 @@ SELECT @@sql_mode LIKE '%NO_ENGINE_SUBSTITUTION%';
 SET sql_mode=@org_mode;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 DROP TABLE IF EXISTS t1,t2;
 CREATE USER 'user_PCTFL'@'localhost' identified by 'PWD';
 CREATE USER 'user_no_PCTFL'@'localhost' identified by 'PWD';
@@ -537,6 +557,8 @@ SET @OLD_SQL_MODE = @@SESSION.SQL_MODE;
 SET SESSION SQL_MODE = 'PAD_CHAR_TO_FULL_LENGTH';
 DROP USER 'user_PCTFL'@'localhost';
 SET SESSION SQL_MODE = @OLD_SQL_MODE;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 DROP USER 'user_no_PCTFL'@'localhost';
 FLUSH PRIVILEGES;
 SELECT * FROM mysql.db WHERE Host = 'localhost' AND User LIKE 'user_%PCTFL';
@@ -749,6 +771,8 @@ wxyz\_ef
 DROP TABLE test_table;
 DROP FUNCTION test_function;
 SET @@sql_mode= @org_mode;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 
 #End of Test for Bug#12601974
 #
@@ -781,6 +805,8 @@ ERROR_FOR_DIVISION_BY_ZERO
 # Restore sql mode
 #
 SET sql_mode= @org_mode;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 #
 # Check that NO_ZERO_DATE, NO_ZERO_IN_DATE and ERROR_FOR_DIVISION_BY_ZERO modes
 # are removed in triggers after upgrading to 5.7.
diff --git a/mysql-test/r/sql_mode_default.result b/mysql-test/r/sql_mode_default.result
index 6f584640e956..c4499b34f234 100644
--- a/mysql-test/r/sql_mode_default.result
+++ b/mysql-test/r/sql_mode_default.result
@@ -62,3 +62,19 @@ Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO'
 
 End of wl#8326 tests!
 
+#
+# Bug#29287785: PASSWORD IS NOT UPDATED WITHOUT ERRORS WHEN
+#               SQL MODE IS PAD_CHAR_TO_FULL_LENGTH
+#
+CREATE USER 'user1'@'localhost';
+SET sql_mode= 'PAD_CHAR_TO_FULL_LENGTH';
+SET PASSWORD FOR 'user1'@'localhost'= PASSWORD('abc');
+Warnings:
+Warning	1287	'SET PASSWORD FOR <user> = PASSWORD('<plaintext_password>')' is deprecated and will be removed in a future release. Please use SET PASSWORD FOR <user> = '<plaintext_password>' instead
+SELECT authentication_string FROM mysql.user WHERE user= 'user1';
+authentication_string
+*0D3CED9BEC10A777AEC23CCC353A8C08A633045E
+DROP USER 'user1'@'localhost';
+SET sql_mode= DEFAULT;
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
diff --git a/mysql-test/r/ssl-sha512.result b/mysql-test/r/ssl-sha512.result
index 8ff1be95851e..c87caa2d356f 100644
--- a/mysql-test/r/ssl-sha512.result
+++ b/mysql-test/r/ssl-sha512.result
@@ -5,6 +5,7 @@ Warning	1287	Using GRANT statement to modify existing user's properties other th
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/ca-sha512.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/server-cert-sha512.pem
diff --git a/mysql-test/r/ssl_crl.result b/mysql-test/r/ssl_crl.result
index 5a34bb785464..7aa4f9321fe8 100644
--- a/mysql-test/r/ssl_crl.result
+++ b/mysql-test/r/ssl_crl.result
@@ -2,6 +2,7 @@
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/crl-server-cert.pem
@@ -13,6 +14,7 @@ ssl_key	MYSQL_TEST_DIR/std_data/crl-server-key.pem
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/crl-server-cert.pem
@@ -28,8 +30,8 @@ ssl_key	MYSQL_TEST_DIR/std_data/crl-server-key.pem
 # try to connect with '--ssl-crl' option using tilde home directoy
 # path substitution : should connect
 Variable_name	Value
-Ssl_cipher	DHE-RSA-AES128-GCM-SHA256
+Ssl_cipher	SSL_CIPHER
 # try to connect with '--ssl-crlpath' option using tilde home directoy
 # path substitution : should connect
 Variable_name	Value
-Ssl_cipher	DHE-RSA-AES128-GCM-SHA256
+Ssl_cipher	SSL_CIPHER
diff --git a/mysql-test/r/ssl_crl_clients_valid.result b/mysql-test/r/ssl_crl_clients_valid.result
index 45097aba3bf4..9d5088febddb 100644
--- a/mysql-test/r/ssl_crl_clients_valid.result
+++ b/mysql-test/r/ssl_crl_clients_valid.result
@@ -4,6 +4,7 @@
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/crl-client-cert.pem
diff --git a/mysql-test/r/ssl_crl_crlpath.result b/mysql-test/r/ssl_crl_crlpath.result
index b4b4d13eca10..0ff5181f2cd4 100644
--- a/mysql-test/r/ssl_crl_crlpath.result
+++ b/mysql-test/r/ssl_crl_crlpath.result
@@ -2,6 +2,7 @@
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/crl-server-cert.pem
@@ -13,6 +14,7 @@ ssl_key	MYSQL_TEST_DIR/std_data/crl-server-key.pem
 Variable_name	Value
 have_openssl	YES
 have_ssl	YES
+performance_schema_show_processlist	OFF
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
 ssl_cert	MYSQL_TEST_DIR/std_data/crl-server-cert.pem
diff --git a/mysql-test/r/ssl_deprecated_tls_versions.result b/mysql-test/r/ssl_deprecated_tls_versions.result
new file mode 100644
index 000000000000..82920503f347
--- /dev/null
+++ b/mysql-test/r/ssl_deprecated_tls_versions.result
@@ -0,0 +1,8 @@
+# Bug 32565996: backport of WL#14519: Deprecate the use of TLS v1.[01]
+include/assert_grep.inc [Found a cmdline TLSv1 deprecation warning]
+include/assert_grep.inc [Found a cmdline TLSv1.1 deprecation warning]
+# Test for the connect warning
+1
+1
+include/assert_grep.inc [An old tls version client triggers a warning]
+# End of 5.7 tests
diff --git a/mysql-test/r/ssl_verify_identity.result b/mysql-test/r/ssl_verify_identity.result
new file mode 100644
index 000000000000..56bf02fe6e45
--- /dev/null
+++ b/mysql-test/r/ssl_verify_identity.result
@@ -0,0 +1,22 @@
+### Trying to connect with ssl-mode as DISABLED. This should establish an unencrypted connection.
+Variable_name	Value
+Ssl_cipher	
+WARNING: no verification of server certificate will be done. Use --ssl-mode=VERIFY_CA or VERIFY_IDENTITY.
+### Trying to connect with ssl-mode as REQUIRED. This should establish an encrypted connection.
+Variable_name	Value
+Ssl_cipher	SSL_CIPHER
+WARNING: no verification of server certificate will be done. Use --ssl-mode=VERIFY_CA or VERIFY_IDENTITY.
+### Trying to connect with ssl-mode as VERIFY_CA. This should establish an encrypted connection.
+Variable_name	Value
+Ssl_cipher	SSL_CIPHER
+### Trying to connect with ssl-mode as VERIFY_IDENTITY. This should establish an encrypted connection.
+Variable_name	Value
+Ssl_cipher	SSL_CIPHER
+### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as nonexistent. This should fail.
+#Search for the error in the file
+### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as localhost. This should establish an encrypted connection as localhost is present in Alternative Subject Name in the certificate.
+Variable_name	Value
+Ssl_cipher	SSL_CIPHER
+### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as 127.0.0.1. This should establish an encrypted connection as localhost is present in Alternative Subject Name in the certificate.
+Variable_name	Value
+Ssl_cipher	SSL_CIPHER
diff --git a/mysql-test/r/status_debug.result b/mysql-test/r/status_debug.result
index c879786a7267..c124fbf2ed65 100644
--- a/mysql-test/r/status_debug.result
+++ b/mysql-test/r/status_debug.result
@@ -51,3 +51,28 @@ SELECT (SELECT val FROM t1 WHERE id = 3) - (SELECT val FROM t1 WHERE id = 2);
 set global SHOW_COMPATIBILITY_56=1;
 disconnect con1;
 DROP TABLE t1;
+#
+# Bug#29836204:  P_S TABLE ACCESS HANGS WHILE IN LOCK TABLES MODE
+#
+SET @saved_show_compatibility_56= @@global.show_compatibility_56;
+# Ensures that the P_S is used for the SHOW command.
+SET GLOBAL show_compatibility_56= OFF;
+CREATE TABLE t1(fld1 int) ENGINE=MYISAM;
+LOCK TABLE t1 WRITE;
+ALTER TABLE t1 DISABLE KEYS;
+# Without patch, the SHOW command hangs.
+SHOW SESSION VARIABLES LIKE 'FOREIGN_KEY_CHECKS';
+Variable_name	Value
+foreign_key_checks	ON
+# Wihout patch, the SELECT from P_S hangs.
+SELECT * FROM performance_schema.global_variables WHERE variable_name="read_only";
+VARIABLE_NAME	VARIABLE_VALUE
+read_only	OFF
+# Test added for coverage (Querying from I_S)
+SET GLOBAL show_compatibility_56= @saved_show_compatibility_56;
+SHOW SESSION VARIABLES LIKE 'FOREIGN_KEY_CHECKS';
+Variable_name	Value
+foreign_key_checks	ON
+# Clean up.
+UNLOCK TABLES;
+DROP TABLE t1;
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 118bc30c87ea..3f75ad951da5 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -243,11 +243,11 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR HY000: Incorrect datetime value: '31.9.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR HY000: Incorrect datetime value: '29.02.2003 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -259,11 +259,11 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col2' at row 1
+ERROR HY000: Incorrect datetime value: '31.9.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col2' at row 1
+ERROR HY000: Incorrect datetime value: '29.02.2003 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -275,11 +275,11 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col3' at row 1
+ERROR HY000: Incorrect datetime value: '31.9.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col3' at row 1
+ERROR HY000: Incorrect datetime value: '29.02.2003 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -1152,9 +1152,6 @@ Warnings:
 Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
-Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
-Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
-Warning	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_date
 drop table t1;
 create table t1 (col1 char(3), col2 integer);
 insert into t1 (col1) values (cast(1000 as char(3)));
@@ -1898,3 +1895,68 @@ Level	Code	Message
 Warning	1831	Duplicate index 'in_c2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
 # Clean-up
 DROP TABLE t1;
+#
+# Bug#34704094: Mysql str_to_date can correct convert for '2022-11-30'
+#
+SET sql_mode='NO_ZERO_DATE';
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+select str_to_date('0000-00-00', '%Y-%m-%d');
+str_to_date('0000-00-00', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-00-00' for function str_to_date
+# Not compliant with how CAST works
+select str_to_date('0000-01-00', '%Y-%m-%d');
+str_to_date('0000-01-00', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-01-00' for function str_to_date
+# Not compliant with how CAST works
+select str_to_date('0000-00-01', '%Y-%m-%d');
+str_to_date('0000-00-01', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-00-01' for function str_to_date
+select str_to_date('2023-02-31', '%Y-%m-%d');
+str_to_date('2023-02-31', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '2023-02-31' for function str_to_date
+SET sql_mode='NO_ZERO_IN_DATE';
+Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
+select str_to_date('0000-00-00', '%Y-%m-%d');
+str_to_date('0000-00-00', '%Y-%m-%d')
+0000-00-00
+select str_to_date('0000-01-00', '%Y-%m-%d');
+str_to_date('0000-01-00', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-01-00' for function str_to_date
+select str_to_date('0000-00-01', '%Y-%m-%d');
+str_to_date('0000-00-01', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '0000-00-01' for function str_to_date
+select str_to_date('2023-02-31', '%Y-%m-%d');
+str_to_date('2023-02-31', '%Y-%m-%d')
+NULL
+Warnings:
+Warning	1411	Incorrect datetime value: '2023-02-31' for function str_to_date
+SET sql_mode='ALLOW_INVALID_DATES';
+select str_to_date('0000-00-00', '%Y-%m-%d');
+str_to_date('0000-00-00', '%Y-%m-%d')
+0000-00-00
+select str_to_date('0000-01-00', '%Y-%m-%d');
+str_to_date('0000-01-00', '%Y-%m-%d')
+0000-01-00
+select str_to_date('0000-00-01', '%Y-%m-%d');
+str_to_date('0000-00-01', '%Y-%m-%d')
+0000-00-01
+select str_to_date('2023-02-31', '%Y-%m-%d');
+str_to_date('2023-02-31', '%Y-%m-%d')
+2023-02-31
+SET sql_mode=@org_mode;
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
diff --git a/mysql-test/r/subquery_bugs.result b/mysql-test/r/subquery_bugs.result
new file mode 100644
index 000000000000..3c52d459de88
--- /dev/null
+++ b/mysql-test/r/subquery_bugs.result
@@ -0,0 +1,85 @@
+#
+# Bug#27182010 SUBQUERY INCORRECTLY SHOWS DUPLICATE VALUES ON SUBQUERIES
+#
+CREATE TABLE p (Id INT,PRIMARY KEY (Id));
+INSERT INTO p VALUES (1);
+# Test UNIQUE KEY with NULL values
+CREATE TABLE s (Id INT, u INT, UNIQUE KEY o(Id, u) );
+INSERT INTO s VALUES (1, NULL),(1, NULL);
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s WHERE Id=1 AND u IS NULL)ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s	NULL	ref	o	o	10	const,const	2	100.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s`) where ((`test`.`s`.`Id` = 1) and isnull(`test`.`s`.`u`)) order by '1' desc
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s	NULL	range	o	o	10	NULL	1	100.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s`) where ((`test`.`s`.`Id` = 1) and (`test`.`s`.`u` is not null)) order by '1' desc
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s WHERE Id=1 AND u IS NULL)ORDER BY Id DESC;
+Id
+1
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+Id
+# UNIQUE KEY without NULL values
+CREATE TABLE s1 (Id INT, u INT, UNIQUE KEY o(Id, u) );
+INSERT INTO s1 VALUES (1, 2),(1, 3);
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s1.Id FROM s1 WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s1	NULL	ref	o	o	5	const	2	50.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s1`) where ((`test`.`s1`.`Id` = 1) and (`test`.`s1`.`u` is not null)) order by '1' desc
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s1.Id FROM s1 WHERE Id=1 AND u != 1) ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s1	NULL	ref	o	o	5	const	3	50.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s1`) where ((`test`.`s1`.`Id` = 1) and (`test`.`s1`.`u` <> 1)) order by '1' desc
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s1.Id FROM s1 WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+Id
+1
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s1.Id FROM s1 WHERE Id=1 AND u != 1) ORDER BY Id DESC;
+Id
+1
+# NON UNIQUE KEY Scenario
+CREATE TABLE s2 (Id INT, u INT, KEY o(Id, u) );
+INSERT INTO s2 VALUES (1, NULL),(1, NULL);
+#UNIQUE KEY with NON NULL FIELDS
+CREATE TABLE s3 (Id INT NOT NULL, u INT NOT NULL, UNIQUE KEY o(Id, u));
+INSERT INTO s3 VALUES (1, 2),(1, 3);
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s2 s WHERE Id=1 AND u IS NULL) ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s	NULL	ref	o	o	10	const,const	2	100.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s2` `s`) where ((`test`.`s`.`Id` = 1) and isnull(`test`.`s`.`u`)) order by '1' desc
+EXPLAIN SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s3 s WHERE Id=1 AND u IS NOT NULL)
+ORDER BY Id DESC;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	p	NULL	const	PRIMARY	PRIMARY	4	const	1	100.00	Using index
+1	SIMPLE	s	NULL	ref	o	o	4	const	2	50.00	Using where; Using index; FirstMatch(p)
+Warnings:
+Note	1003	/* select#1 */ select '1' AS `Id` from `test`.`p` semi join (`test`.`s3` `s`) where ((`test`.`s`.`Id` = 1) and (`test`.`s`.`u` is not null)) order by '1' desc
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s2 s WHERE Id=1 AND u IS NULL) ORDER BY Id DESC;
+Id
+1
+SELECT p.Id FROM (p) WHERE p.Id IN (
+SELECT s.Id FROM s3 s WHERE Id=1 AND u IS NOT NULL)
+ORDER BY Id DESC;
+Id
+1
+DROP TABLE p, s, s1, s2, s3;
diff --git a/mysql-test/r/subquery_sj_all_bka_nixbnl.result b/mysql-test/r/subquery_sj_all_bka_nixbnl.result
index cedb2a6734eb..d5549e8890d8 100644
--- a/mysql-test/r/subquery_sj_all_bka_nixbnl.result
+++ b/mysql-test/r/subquery_sj_all_bka_nixbnl.result
@@ -10731,15 +10731,16 @@ FROM t1 AS subquery3_t1
 )
 ;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	subquery3_t1	NULL	index	col_varchar_key	col_varchar_key	9	NULL	0	0.00	Using where; Using index
-1	PRIMARY	<subquery3>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	100.00	NULL
-1	PRIMARY	<derived2>	NULL	ref	<auto_key0>	<auto_key0>	9	<subquery3>.7,test.subquery3_t1.col_varchar_key	2	100.00	Using where
+1	PRIMARY	<subquery4>	NULL	ALL	NULL	NULL	NULL	NULL	NULL	0.00	Using where
+1	PRIMARY	<derived2>	NULL	ref	<auto_key0>	<auto_key0>	9	const,<subquery4>.subquery3_field1	2	100.00	Using where
 1	PRIMARY	table2	NULL	index	NULL	PRIMARY	4	NULL	1	100.00	Using index
+1	PRIMARY	<subquery3>	NULL	eq_ref	<auto_key>	<auto_key>	4	table1.col_int_key	1	100.00	NULL
+4	MATERIALIZED	subquery3_t1	NULL	index	col_varchar_key	col_varchar_key	9	NULL	0	0.00	Using index
 3	MATERIALIZED	t3	NULL	ALL	NULL	NULL	NULL	NULL	0	0.00	NULL
 2	DERIVED	subquery1_t1	NULL	ALL	PRIMARY	NULL	NULL	NULL	1	100.00	NULL
 2	DERIVED	subquery1_t2	NULL	eq_ref	PRIMARY	PRIMARY	4	test.subquery1_t1.pk	1	100.00	Using index
 Warnings:
-Note	1003	/* select#1 */ select `table1`.`pk` AS `field1` from (/* select#2 */ select `test`.`subquery1_t1`.`pk` AS `pk`,`test`.`subquery1_t1`.`col_int_key` AS `col_int_key`,`test`.`subquery1_t1`.`col_varchar_key` AS `col_varchar_key`,`test`.`subquery1_t1`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t2` `subquery1_t1` join `test`.`t2` `subquery1_t2` where (`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t1`.`pk`)) `table1` semi join (`test`.`t3`) semi join (`test`.`t1` `subquery3_t1`) straight_join `test`.`t2` `table2` where ((`table1`.`col_int_key` = 7) and (`table1`.`col_varchar_nokey` = `test`.`subquery3_t1`.`col_varchar_key`))
+Note	1003	/* select#1 */ select `table1`.`pk` AS `field1` from (/* select#2 */ select `test`.`subquery1_t1`.`pk` AS `pk`,`test`.`subquery1_t1`.`col_int_key` AS `col_int_key`,`test`.`subquery1_t1`.`col_varchar_key` AS `col_varchar_key`,`test`.`subquery1_t1`.`col_varchar_nokey` AS `col_varchar_nokey` from `test`.`t2` `subquery1_t1` join `test`.`t2` `subquery1_t2` where (`test`.`subquery1_t2`.`pk` = `test`.`subquery1_t1`.`pk`)) `table1` semi join (`test`.`t3`) semi join (`test`.`t1` `subquery3_t1`) straight_join `test`.`t2` `table2` where ((`table1`.`col_int_key` = 7) and (`table1`.`col_varchar_nokey` = `<subquery4>`.`subquery3_field1`))
 SELECT table1.pk AS field1
 FROM ( SELECT subquery1_t1. *
 FROM t2 AS subquery1_t1
diff --git a/mysql-test/r/temporal_literal.result b/mysql-test/r/temporal_literal.result
index 0fa1b1db3af4..7e246b511f96 100644
--- a/mysql-test/r/temporal_literal.result
+++ b/mysql-test/r/temporal_literal.result
@@ -245,14 +245,14 @@ TIMESTAMP'2010-01-01 10:10:10.123456';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `TIMESTAMP'2010-01-01 10:10:10'` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `TIMESTAMP'2010-01-01 10:10:10.'` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `TIMESTAMP'2010-01-01 10:10:10.1'` datetime(1) NOT NULL DEFAULT '0000-00-00 00:00:00.0',
-  `TIMESTAMP'2010-01-01 10:10:10.12'` datetime(2) NOT NULL DEFAULT '0000-00-00 00:00:00.00',
-  `TIMESTAMP'2010-01-01 10:10:10.123'` datetime(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
-  `TIMESTAMP'2010-01-01 10:10:10.1234'` datetime(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
-  `TIMESTAMP'2010-01-01 10:10:10.12345'` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
-  `TIMESTAMP'2010-01-01 10:10:10.123456'` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000'
+  `TIMESTAMP'2010-01-01 10:10:10'` datetime NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.'` datetime NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.1'` datetime(1) NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.12'` datetime(2) NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.123'` datetime(3) NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.1234'` datetime(4) NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.12345'` datetime(5) NOT NULL,
+  `TIMESTAMP'2010-01-01 10:10:10.123456'` datetime(6) NOT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
@@ -263,9 +263,9 @@ CREATE TABLE t1 AS SELECT
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `{ts'2001-01-01 10:10:10'}` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `{ts'2001-01-01 10:10:10.'}` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `{ts'2001-01-01 10:10:10.123456'}` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
+  `{ts'2001-01-01 10:10:10'}` datetime NOT NULL,
+  `{ts'2001-01-01 10:10:10.'}` datetime NOT NULL,
+  `{ts'2001-01-01 10:10:10.123456'}` datetime(6) NOT NULL,
   `2001-01-01` varchar(10) NOT NULL DEFAULT ''
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
diff --git a/mysql-test/r/timezone.result b/mysql-test/r/timezone.result
index fa89af0d97bd..672f98e25944 100644
--- a/mysql-test/r/timezone.result
+++ b/mysql-test/r/timezone.result
@@ -45,3 +45,20 @@ unix_timestamp('2038-01-19 04:14:07'),
 unix_timestamp('2038-01-19 04:14:08');
 unix_timestamp('1970-01-01 01:00:00')	unix_timestamp('1970-01-01 01:00:01')	unix_timestamp('2038-01-19 04:14:07')	unix_timestamp('2038-01-19 04:14:08')
 0	1	2147483647	0
+CREATE TABLE t1 (c1 TIMESTAMP);
+SET TIME_ZONE = '+00:00';
+INSERT INTO t1 VALUES('2019-10-27 00:47:42'), ('2019-10-27 00:47:42');
+INSERT INTO t1 VALUES('2019-10-27 01:47:42'), ('2019-10-27 01:47:42');
+SET TIME_ZONE = 'SYSTEM';
+SELECT DISTINCT c1 FROM t1;
+c1
+2019-10-27 02:47:42
+SELECT COUNT(*) FROM t1 GROUP BY c1;
+ERROR HY000: Grouping on temporal is non-deterministic for timezones having DST. Please consider switching to UTC for this query.
+SET sql_mode='';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SELECT COUNT(*) FROM t1 GROUP BY c1;
+ERROR HY000: Grouping on temporal is non-deterministic for timezones having DST. Please consider switching to UTC for this query.
+SET sql_mode=DEFAULT;
+DROP TABLE t1;
diff --git a/mysql-test/r/trigger_wl3253.result b/mysql-test/r/trigger_wl3253.result
index 01e86763ed93..3d09bc44f847 100644
--- a/mysql-test/r/trigger_wl3253.result
+++ b/mysql-test/r/trigger_wl3253.result
@@ -322,7 +322,7 @@ CREATE TABLE `t1` (
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1 */;;
 DELIMITER ;
@@ -337,7 +337,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2 */;;
 DELIMITER ;
@@ -352,7 +352,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr1_bu BEFORE UPDATE ON t1 FOR EACH ROW SET @a:=3 */;;
 DELIMITER ;
@@ -384,7 +384,7 @@ CREATE TABLE `t1` (
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr0_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=0 */;;
 DELIMITER ;
@@ -399,7 +399,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1 */;;
 DELIMITER ;
@@ -414,7 +414,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr1_1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=0 */;;
 DELIMITER ;
@@ -429,7 +429,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2 */;;
 DELIMITER ;
diff --git a/mysql-test/r/type_temporal_fractional.result b/mysql-test/r/type_temporal_fractional.result
index 7d36c75d3a00..f46c51d3a584 100644
--- a/mysql-test/r/type_temporal_fractional.result
+++ b/mysql-test/r/type_temporal_fractional.result
@@ -73,13 +73,13 @@ NOW(0), NOW(1), NOW(2), NOW(3), NOW(4), NOW(5), NOW(6);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `NOW(0)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `NOW(1)` datetime(1) NOT NULL DEFAULT '0000-00-00 00:00:00.0',
-  `NOW(2)` datetime(2) NOT NULL DEFAULT '0000-00-00 00:00:00.00',
-  `NOW(3)` datetime(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
-  `NOW(4)` datetime(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
-  `NOW(5)` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
-  `NOW(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000'
+  `NOW(0)` datetime NOT NULL,
+  `NOW(1)` datetime(1) NOT NULL,
+  `NOW(2)` datetime(2) NOT NULL,
+  `NOW(3)` datetime(3) NOT NULL,
+  `NOW(4)` datetime(4) NOT NULL,
+  `NOW(5)` datetime(5) NOT NULL,
+  `NOW(6)` datetime(6) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
@@ -89,13 +89,13 @@ SYSDATE(4), SYSDATE(5), SYSDATE(6);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `SYSDATE(0)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SYSDATE(1)` datetime(1) NOT NULL DEFAULT '0000-00-00 00:00:00.0',
-  `SYSDATE(2)` datetime(2) NOT NULL DEFAULT '0000-00-00 00:00:00.00',
-  `SYSDATE(3)` datetime(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
-  `SYSDATE(4)` datetime(4) NOT NULL DEFAULT '0000-00-00 00:00:00.0000',
-  `SYSDATE(5)` datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000',
-  `SYSDATE(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000'
+  `SYSDATE(0)` datetime NOT NULL,
+  `SYSDATE(1)` datetime(1) NOT NULL,
+  `SYSDATE(2)` datetime(2) NOT NULL,
+  `SYSDATE(3)` datetime(3) NOT NULL,
+  `SYSDATE(4)` datetime(4) NOT NULL,
+  `SYSDATE(5)` datetime(5) NOT NULL,
+  `SYSDATE(6)` datetime(6) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT
diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result
index 03a3cef52607..cfe5094e8bcf 100644
--- a/mysql-test/r/type_timestamp.result
+++ b/mysql-test/r/type_timestamp.result
@@ -407,7 +407,11 @@ drop table t1;
 set sql_mode='maxdb';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 create table t1 (a timestamp, b timestamp);
+Warnings:
+Warning	3226	With the MAXDB SQL mode enabled, TIMESTAMP is identical with DATETIME. The MAXDB SQL mode is deprecated and will be removed in a future release. Please disable the MAXDB SQL mode and use DATETIME instead.
+Warning	3226	With the MAXDB SQL mode enabled, TIMESTAMP is identical with DATETIME. The MAXDB SQL mode is deprecated and will be removed in a future release. Please disable the MAXDB SQL mode and use DATETIME instead.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
@@ -529,6 +533,9 @@ INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
 a
 2010-02-01 09:31:02
@@ -570,6 +577,9 @@ INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 # The bug would cause the range optimizer's comparison to use an open
 # interval here. This reveals itself only in the number of reads 
 # performed.
diff --git a/mysql-test/r/type_timestamp_explicit.result b/mysql-test/r/type_timestamp_explicit.result
index 05cd77973012..719432db3325 100644
--- a/mysql-test/r/type_timestamp_explicit.result
+++ b/mysql-test/r/type_timestamp_explicit.result
@@ -405,7 +405,11 @@ drop table t1;
 set sql_mode='maxdb';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 create table t1 (a timestamp, b timestamp);
+Warnings:
+Warning	3226	With the MAXDB SQL mode enabled, TIMESTAMP is identical with DATETIME. The MAXDB SQL mode is deprecated and will be removed in a future release. Please disable the MAXDB SQL mode and use DATETIME instead.
+Warning	3226	With the MAXDB SQL mode enabled, TIMESTAMP is identical with DATETIME. The MAXDB SQL mode is deprecated and will be removed in a future release. Please disable the MAXDB SQL mode and use DATETIME instead.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (
@@ -521,6 +525,9 @@ INSERT INTO t1 VALUES( '2010-02-01 09:31:01' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
 SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
 a
 2010-02-01 09:31:02
@@ -562,6 +569,9 @@ INSERT INTO t2 VALUES( '2010-02-01 09:31:08' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
+ANALYZE TABLE t2;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	OK
 # The bug would cause the range optimizer's comparison to use an open
 # interval here. This reveals itself only in the number of reads 
 # performed.
diff --git a/mysql-test/r/type_year.result b/mysql-test/r/type_year.result
index 7c1b93070b8d..09edda6c3c0b 100644
--- a/mysql-test/r/type_year.result
+++ b/mysql-test/r/type_year.result
@@ -334,3 +334,22 @@ a
 2012
 DROP TABLE t1;
 SET timestamp=DEFAULT;
+#
+# Bug#28172538 YEAR RANGE CHECK FAILS WITH MAX YEAR FLOAT CONSTANT
+#
+CREATE TABLE t(y YEAR);
+INSERT INTO t VALUES (2155), (2155.0);
+SELECT * FROM t;
+y
+2155
+2155
+Used to fail
+INSERT INTO t VALUES (2155.0E00);
+INSERT INTO t VALUES (2.1550E+03);
+SELECT * FROM t;
+y
+2155
+2155
+2155
+2155
+DROP TABLE t;
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index b70a5f370240..79d5b4ea99c9 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -2750,3 +2750,217 @@ FOUND_ROWS()
 2
 DROP TABLE t1;
 #End of test for Bug#22602381
+#
+# Bug #27068222 CREATE TABLE USING SELECT WITH UNION
+#               FAILS FOR DATE COLUMN
+#
+CREATE TABLE `t1` (`date` date NOT NULL);
+INSERT INTO t1 VALUES ('2017-03-02'), ('2017-06-22');
+CREATE TABLE IF NOT EXISTS t2 AS
+SELECT * FROM t1
+UNION
+SELECT * FROM t1;
+DESC t2;
+Field	Type	Null	Key	Default	Extra
+date	date	NO		NULL	
+SELECT * FROM t2;
+date
+2017-03-02
+2017-06-22
+DROP TABLE t1, t2;
+CREATE TABLE t1 (
+i1 INT NOT NULL,
+i2 INT NOT NULL DEFAULT '1234',
+# non-specified nullability => i3 is nullable
+i3 INT,
+i4 INT DEFAULT NULL,
+i5 INT DEFAULT '5678',
+d1 date NOT NULL,
+d2 date NOT NULL DEFAULT '2018-01-25',
+d3 date,
+d4 date DEFAULT NULL,
+d5 date DEFAULT '2017-11-14',
+g1 geometry NOT NULL
+);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i1` int(11) NOT NULL,
+  `i2` int(11) NOT NULL DEFAULT '1234',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT '5678',
+  `d1` date NOT NULL,
+  `d2` date NOT NULL DEFAULT '2018-01-25',
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT '2017-11-14',
+  `g1` geometry NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SET SQL_MODE='';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+SELECT @@SQL_MODE;
+@@SQL_MODE
+
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1;
+# we see that with CREATE SELECT (no UNION), defaults are inherited.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL,
+  `i2` int(11) NOT NULL DEFAULT '1234',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT '5678',
+  `d1` date NOT NULL,
+  `d2` date NOT NULL DEFAULT '2018-01-25',
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT '2017-11-14',
+  `g1` geometry NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TEMPORARY TABLE t2;
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1
+UNION
+SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL DEFAULT '0',
+  `i2` int(11) NOT NULL DEFAULT '0',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT NULL,
+  `d1` date NOT NULL DEFAULT '0000-00-00',
+  `d2` date NOT NULL DEFAULT '0000-00-00',
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT NULL,
+  `g1` geometry NOT NULL DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TEMPORARY TABLE t2;
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1
+UNION ALL
+SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL DEFAULT '0',
+  `i2` int(11) NOT NULL DEFAULT '0',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT NULL,
+  `d1` date NOT NULL DEFAULT '0000-00-00',
+  `d2` date NOT NULL DEFAULT '0000-00-00',
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT NULL,
+  `g1` geometry NOT NULL DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+# With UNION and UNION ALL, defaults are not inherited; every
+# column gets, as default, NULL (if nullable) or 0 (if not
+# nullable). Exception: if strict mode and a date type,
+# 0000-00-00 isn't given as default
+INSERT INTO t2 VALUES();
+SELECT * FROM t2;
+i1	i2	i3	i4	i5	d1	d2	d3	d4	d5	g1
+0	0	NULL	NULL	NULL	0000-00-00	0000-00-00	NULL	NULL	NULL	
+DROP TEMPORARY TABLE t2;
+SET SQL_MODE=DEFAULT;
+SELECT @@SQL_MODE;
+@@SQL_MODE
+ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1;
+# we see that with CREATE SELECT (no UNION), defaults are inherited.
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL,
+  `i2` int(11) NOT NULL DEFAULT '1234',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT '5678',
+  `d1` date NOT NULL,
+  `d2` date NOT NULL DEFAULT '2018-01-25',
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT '2017-11-14',
+  `g1` geometry NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TEMPORARY TABLE t2;
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1
+UNION
+SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL DEFAULT '0',
+  `i2` int(11) NOT NULL DEFAULT '0',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT NULL,
+  `d1` date NOT NULL,
+  `d2` date NOT NULL,
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT NULL,
+  `g1` geometry NOT NULL DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TEMPORARY TABLE t2;
+CREATE TEMPORARY TABLE t2 AS
+SELECT * FROM t1
+UNION ALL
+SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TEMPORARY TABLE `t2` (
+  `i1` int(11) NOT NULL DEFAULT '0',
+  `i2` int(11) NOT NULL DEFAULT '0',
+  `i3` int(11) DEFAULT NULL,
+  `i4` int(11) DEFAULT NULL,
+  `i5` int(11) DEFAULT NULL,
+  `d1` date NOT NULL,
+  `d2` date NOT NULL,
+  `d3` date DEFAULT NULL,
+  `d4` date DEFAULT NULL,
+  `d5` date DEFAULT NULL,
+  `g1` geometry NOT NULL DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+# With UNION and UNION ALL, defaults are not inherited; every
+# column gets, as default, NULL (if nullable) or 0 (if not
+# nullable). Exception: if strict mode and a date type,
+# 0000-00-00 isn't given as default
+SELECT * FROM t2;
+i1	i2	i3	i4	i5	d1	d2	d3	d4	d5	g1
+DROP TEMPORARY TABLE t2;
+SET SQL_MODE=DEFAULT;
+DROP TABLE t1;
+#
+# Bug#27197235 USER VARIABLE + UINON + DECIMAL COLUMN RETURNS
+#              WRONG VALUES
+#
+SET NAMES utf8;
+SET @advertAcctId = 1000003;
+select @advertAcctId as a from dual union all select 1.0 from dual;
+a
+1000003.0
+1.0
+SET NAMES latin1;
+SET @advertAcctId = 1000003;
+select @advertAcctId as a from dual union all select 1.0 from dual;
+a
+1000003.0
+1.0
+#
+# Bug #29916900 (duplicate of #27903792) [ASSERTION `FIELD_TYPE() ==
+# MYSQL_TYPE_GEOMETRY' FAILED]
+#
+SELECT ST_GEOMFROMTEXT('POINT(0 0)')
+UNION
+SELECT * FROM (SELECT NULL) AS a;
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index acccf56ff1ba..889a75455c91 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -545,7 +545,7 @@ INSERT INTO t1 VALUES (0), (1);
 CREATE VIEW v1 AS SELECT t11.a, t12.a AS b FROM t1 t11, t1 t12;
 SET SESSION sql_safe_updates = 1;
 UPDATE IGNORE v1 SET a = 1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SET SESSION sql_safe_updates = DEFAULT;
 DROP TABLE t1;
 DROP VIEW v1;
diff --git a/mysql-test/r/user_limits.result b/mysql-test/r/user_limits.result
index c1846d29174b..d96a4a9d81eb 100644
--- a/mysql-test/r/user_limits.result
+++ b/mysql-test/r/user_limits.result
@@ -112,6 +112,19 @@ ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource
 set global max_user_connections= 0;
 drop user mysqltest_1@localhost;
 drop table t1;
+#
+# Bug #30578217 : ALTER USER IF EXISTS ... WITH_MAX_USER_CONNECTIONS 9999 NOT APPLIED CORRECTLY
+#
+CREATE USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 2;
+connect(localhost,mysqltest_2,,test,MYSQL_PORT,MYSQL_SOCK);
+ERROR 42000: User 'mysqltest_2' has exceeded the 'max_user_connections' resource (current value: 2)
+ALTER USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 3;
+connect(localhost,mysqltest_2,,test,MYSQL_PORT,MYSQL_SOCK);
+ERROR 42000: User 'mysqltest_2' has exceeded the 'max_user_connections' resource (current value: 3)
+ALTER USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 2;
+connect(localhost,mysqltest_2,,test,MYSQL_PORT,MYSQL_SOCK);
+ERROR 42000: User 'mysqltest_2' has exceeded the 'max_user_connections' resource (current value: 2)
+DROP USER mysqltest_2@localhost;
 set sql_mode= @orig_sql_mode;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 67753de31b55..e680d55364e6 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -334,30 +334,40 @@ select @a:=f1, count(f1) from t1 group by 1 desc;
 3	2
 2	1
 1	4
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select @a:=f1, count(f1) from t1 group by 1 asc;
 @a:=f1	count(f1)
 1	4
 2	1
 3	2
 4	1
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select @a:=f2, count(f2) from t1 group by 1 desc;
 @a:=f2	count(f2)
 d	1
 c	2
 b	1
 a	4
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select @a:=f3, count(f3) from t1 group by 1 desc;
 @a:=f3	count(f3)
 4.5	1
 3.5	2
 2.5	1
 1.5	4
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select @a:=f4, count(f4) from t1 group by 1 desc;
 @a:=f4	count(f4)
 4.6	1
 3.6	2
 2.6	1
 1.6	4
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 drop table t1;
 create table t1 (f1 int);
 insert into t1 values (2), (1);
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result
index dcf2a5b26ba2..417114c01f0c 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -73,8 +73,7 @@ update t1 set c = 'bb' where a = 2;
 update t1 set c = 'aa' where a = 1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 select count(*) from t1;
-count(*)
-2
+ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
 xa end 'a','c';
 ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
 xa rollback 'a','c';
diff --git a/mysql-test/r/xa_deadlock_binlog.result b/mysql-test/r/xa_deadlock_binlog.result
new file mode 100644
index 000000000000..f72c0d100401
--- /dev/null
+++ b/mysql-test/r/xa_deadlock_binlog.result
@@ -0,0 +1,73 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# BUG#32707060: INCONSISTENT BINLOG CAUSES ON REPLICA ERROR 'XAER_RMFAIL:
+#               THE COMMAND CANNOT BE EXECUTED WHEN GLOBAL TRANSACTION IS
+#               IN THE ACTIVE STATE'
+#
+CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY, c2 VARCHAR(5));
+INSERT INTO t1(c2) VALUES("a");
+INSERT INTO t1(c2) VALUES("b");
+XA START 'xa1_t1';
+SELECT * FROM t1 WHERE c1 = 2 FOR UPDATE;
+c1	c2
+2	b
+UPDATE t1 SET c2 = 'c' WHERE c1 = 2;
+[connection master1]
+XA START 'xa2_t1';
+SELECT * FROM t1 WHERE c1 = 1 FOR UPDATE;
+c1	c2
+1	a
+UPDATE t1 SET c2 = 'd' WHERE c1 = 1;
+[connection master]
+SELECT * FROM t1 WHERE c1 = 1 FOR UPDATE;
+[connection master1]
+SELECT * FROM t1 WHERE c1 = 2 FOR UPDATE;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+[connection master]
+c1	c2
+1	a
+UPDATE t1 SET c2 = 'e' WHERE c1 = 1;
+XA END 'xa1_t1';
+XA PREPARE 'xa1_t1';
+XA COMMIT 'xa1_t1';
+[connection master1]
+XA END 'xa2_t1';
+ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
+UPDATE t1 SET c2 = 'f' WHERE c1 = 2;
+ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
+SELECT c1 FROM t1;
+ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
+XA END 'xa2_t1';
+ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
+XA ROLLBACK 'xa2_t1';
+include/assert.inc [Incorrect content in table t1. c2 should contain 'e']
+include/assert.inc [Incorrect content in table t1. c2 should contain 'c']
+[connection master]
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY, c2 VARCHAR(5))
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+master-bin.000001	#	Query	#	#	XA START X'7861315f7431',X'',1
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	XA END X'7861315f7431',X'',1
+master-bin.000001	#	XA_prepare	#	#	XA PREPARE X'7861315f7431',X'',1
+master-bin.000001	#	Query	#	#	XA COMMIT X'7861315f7431',X'',1
+[connection master1]
+CREATE TABLE t2 (c1 int);
+[connection master]
+DROP TABLE t1, t2;
+include/rpl_end.inc
diff --git a/mysql-test/std_data/binlog_56_gtid_reserved_word.000001 b/mysql-test/std_data/binlog_56_gtid_reserved_word.000001
new file mode 100644
index 000000000000..46d5338e0058
Binary files /dev/null and b/mysql-test/std_data/binlog_56_gtid_reserved_word.000001 differ
diff --git a/mysql-test/std_data/bug16204175/Index.xml b/mysql-test/std_data/bug16204175/Index.xml
new file mode 100644
index 000000000000..3aa5537727f6
--- /dev/null
+++ b/mysql-test/std_data/bug16204175/Index.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding="utf-8"?>
+<charsets max-id="99">
+<charset name="utf8">
+  <family>Unicode</family>
+  <description>UTF-8 Unicode</description>
+  <alias>utf-8</alias>
+  <collation name="utf8_test"            id="999">
+    <rules>
+      <reset>A</reset>
+    </rules>
+  </collation>
+</charset>
+</charsets>
diff --git a/mysql-test/std_data/bug28039829.dat b/mysql-test/std_data/bug28039829.dat
new file mode 100644
index 000000000000..2ebf00668b6e
--- /dev/null
+++ b/mysql-test/std_data/bug28039829.dat
@@ -0,0 +1,77701 @@
+000582dc-89a9-4fba-82ad-7fc25d6dc5b6	1	\N	Other
+00097a7d-f0eb-438c-bc27-5eca5a6f79ba	1	\N	Other
+000c07b9-317b-4873-8f8c-76cf5cf94e53	1	James	Other
+0010ab54-8aa8-4e77-bf63-69bc6a778eec	1	James	Other
+001648bb-39cc-4dad-afcc-b576a36266ea	1	\N	Other
+00194317-467d-48f5-908c-13dc5ad048da	1	\N	Other
+001cb3df-20fa-47e6-a9be-349e01c83f7b	1	\N	Other
+001d4d33-078f-4b79-8b46-b271f1f67ae5	1	\N	Other
+001f8e76-0b39-4b8a-9c66-19af2966f4bd	1	James	Other
+00210a9a-1de8-4347-a926-81f0afb3283b	1	James	Other
+00213d0f-10d4-4cf6-88e4-7ac5ff32abf4	1	James	Other
+0027c487-624d-44ec-a080-8e8b6afdf3e4	1	\N	Other
+002a005f-df99-4312-8fea-c060e994f853	1	\N	Other
+002b1999-e6fb-4184-8937-21c80ebc25ab	1	\N	Other
+002ec7b5-974c-411d-bba2-e5b2c55b5997	1	\N	Other
+003019d0-2ed3-4af3-ba30-02ef7386f0de	1	\N	Other
+0030906f-1695-46a0-b07e-c5467aec8b97	1	James	Other
+0031bd2c-8a42-44f2-98f5-261b8a278f51	1	\N	Other
+00330b68-9847-4acc-9603-47d44a65cb8d	1	\N	Other
+00337441-c0fe-4d5b-be29-fa766e00549a	1	\N	Other
+0035449e-d758-418e-9a7d-19b27166d288	1	\N	Other
+003e8d5c-383e-4801-b658-89b39669b4dd	1	\N	Other
+00428dc1-8bc4-4ce5-a7eb-dd7cc21effad	1	\N	Other
+00429fd7-35c0-4fc6-81a1-85f228716dfb	1	\N	Other
+0043e89f-8171-4084-8ab8-4ae740a3fda9	1	\N	Other
+00468604-a36a-45cf-98ee-fac112bebf8a	1	\N	Other
+00518c41-520e-43bc-bba7-820e9da19b18	1	\N	Other
+0052cead-6589-46f6-a773-c45aa9d6d466	1	\N	Other
+0053675e-8e40-4885-9d62-66e277f94378	1	James	Other
+0054e7e3-5be7-4ee4-a324-8de16d6280af	1	\N	Other
+0058a628-5268-4b8e-8996-380847da6413	1	\N	Other
+005babf0-0950-4bce-ab28-2e82e31334f5	1	\N	Other
+005cda18-427b-4160-9e20-4fe75aa0bb34	1	\N	Other
+005e5a42-844b-4777-9775-3373499123c5	1	James	Other
+0064194d-4953-4447-a55a-87031f8f0f0f	1	\N	Other
+00663147-93b9-4b34-add6-e8813ff5dcd8	1	\N	Other
+006a4cc2-56aa-4709-a1db-1c0308254b72	1	\N	Other
+006c0721-c66a-484a-99a8-d1d6f1ad8ce1	1	\N	Other
+006d6bbc-c0f1-4f1e-a1b4-cbb729d8b306	1	\N	Other
+0070809a-37d0-4d19-ac6d-e62841022bdb	1	James	Other
+00742188-2593-40b0-98f2-4ca6da4ecc64	1	James	Other
+0074c8cf-8928-4885-becc-c565d11500fd	1	\N	Other
+00775ca6-6dd0-49f2-9aae-e6ec7be1032b	1	\N	Other
+0079a5ec-184b-4870-a39c-ef017c5947de	1	\N	Other
+0079af35-0e42-48f4-93c5-af48b5926e1c	1	\N	Other
+007f4fc8-3b06-4784-87e2-86d3825cc452	1	\N	Other
+007fc58a-0320-48bb-a884-27104c344f2c	1	James	Other
+00806d6f-6977-4302-b1c8-95d2f26108dc	1	\N	Other
+0080b718-3336-4148-8b69-9120772e1822	1	\N	Other
+0081ca0f-e7de-4060-b1d0-350fd7f5d159	1	\N	Other
+008507fc-6657-4c78-b9a1-80b66345d500	1	\N	Other
+0086c693-086d-47b6-8fc1-e1e357b6c2ef	1	\N	Other
+008cb37a-a0b7-4742-b235-a0ced3316abe	1	\N	Other
+008d0237-67de-4be9-a675-509c03fed32d	1	James	Other
+008f8caf-c164-4eca-a82b-e893750732b7	1	James	Other
+0090c2bc-fc9a-44c3-bd1a-38c3eadca7df	1	\N	Other
+0091fb68-7d08-409c-8db9-f3b166493d0b	1	James	Other
+00926071-839c-4ce4-b46b-b4c2caa17a73	1	James	Other
+00930989-5647-4c1e-98a5-fcee65d0e13c	1	\N	Other
+0098e74f-ba9f-4c61-80c7-447d808d69e7	1	James	Other
+00993e97-30b1-4b46-ab90-31daf44f7757	1	\N	Other
+00994da2-b358-4e0d-ac64-93cbf8b9bdf3	1	\N	Other
+00997f36-bc05-43ce-9efa-075c76ce4ede	1	\N	Other
+009a470e-5305-4e13-a91e-e9b45894c4ff	1	\N	Other
+009c6e82-29b5-4c67-addd-3d7f27be11c2	1	James	Other
+009cab13-6757-4ba8-a318-4d5d93cdbd1b	1	\N	Other
+009e8bee-f7ce-4455-9241-dc8a2e39180c	1	\N	Other
+00a618de-a7b9-4df0-944a-66bea31bc51c	1	James	Other
+00a8d01e-607a-42e1-934a-4192ba344efa	1	\N	Other
+00aade34-6464-44d4-aaf7-ae5855e959f1	1	\N	Other
+00ab7a6e-4fbf-4b43-869d-66eff4e8355b	1	\N	Other
+00adc1e8-93de-42fc-b1d2-d58f3f67f5ad	1	\N	Other
+00ae521d-c910-4187-b8a5-eb6bbf74d322	1	\N	Other
+00b0e14c-03d2-4379-97d1-6a6fafcdfc26	1	James	Other
+00b11668-7499-4660-98ba-92fedae74209	1	James	Other
+00b33e93-65d8-4210-b6bc-09b60eb8e0e6	1	\N	Other
+00b994ba-db93-41b4-8db5-fe371631d8dc	1	James	Other
+00bef118-6461-4e27-bbac-85ad04465e4f	1	\N	Other
+00c104a9-be78-4e2d-9779-6a0344fdc17f	1	James	Other
+00c1a0fc-00ff-4cf1-87eb-e3dff5882e8e	1	\N	Other
+00c2b72d-7485-429e-8791-38eb306f86c0	1	James	Other
+00c5e380-885c-47b9-8031-1e8989054e7e	1	\N	Other
+00c856f8-fcda-4c33-ba6b-5d7740fb4670	1	James	Other
+00c93829-219f-45cf-9f70-649ed273f681	1	\N	Other
+00c9704f-be21-474f-8a74-1c42f79b128d	1	\N	Other
+00ca1da4-c4ff-4368-8499-8026af933b3a	1	James	Other
+00ccc632-41ff-45f6-a356-1591a85b70c4	1	\N	Other
+00cdea0c-c4a0-436b-8c7a-c424f3652bb3	1	James	Other
+00d9ead5-c8b0-445f-917a-ca79086d3175	1	\N	Other
+00dcf306-1890-421f-9f62-e0b5ff2baf48	1	\N	Other
+00e318ff-1ade-432f-9373-2d57972f2962	1	James	Other
+00e45c8b-573c-4e5b-af1f-fb704a3ded1b	1	\N	Other
+00e4edb6-a2d3-4edd-b8f2-5742a3ea5c49	1	\N	Other
+00e6e79f-7b07-419b-969c-0409436005e7	1	\N	Other
+00e93086-0db9-43da-a98e-3c731070da77	1	\N	Other
+00e98311-96d9-4fa7-bc8d-4ec1948db50e	1	James	Other
+00ed91ab-5486-43c3-be30-611f9084dcf4	1	\N	Other
+00ee66bc-41e6-4fce-b852-c74f77f80967	1	\N	Other
+00ef7b75-5a05-425b-bcb6-9bb3caef7535	1	\N	Other
+00f15405-bd9a-43f0-91d9-1e799f8bc961	1	\N	Other
+00f32a1b-b383-4794-8f1c-f118de7b52be	1	James	Other
+00f39214-ba66-4888-abfb-e0dfc174effe	1	James	Other
+00f7828c-0b8c-4506-9f0e-eee0e4c2fc0b	1	\N	Other
+00f9dd73-b60b-41e8-ab68-6c44cbc14412	1	\N	Other
+00fbca7c-617b-4d47-9ac8-6b2208eccf48	1	\N	Other
+010166d6-4356-46d9-a670-83aa9b1cecd8	1	James	Other
+01030849-0d1e-4cb1-8251-eb80df7bc751	1	James	Other
+0103a12f-5084-451e-bf46-152a040c4ca4	1	\N	Other
+0107b352-7445-4d13-8f2d-6aa74c0d5b0c	1	\N	Other
+0111e36a-ca58-4538-965d-f6148f1a62f1	1	James	Other
+0118a59e-abf6-4b19-aabb-465ebecd68e3	1	\N	Other
+0118b633-af00-4bc0-b34b-35b2f7309c18	1	\N	Other
+01201c82-2b3f-11e8-9bdc-fa163e8624cc	1	\N	Other
+01223eb8-381e-47f9-8e42-a2a1b74c53da	1	\N	Other
+01237c2a-1051-4067-925f-7b9e787ff206	1	James	Other
+0128b6e0-b73e-492d-840f-f064ed91ea5f	1	\N	Other
+012ad983-501b-4023-ac57-bd35083c2aee	1	\N	Other
+012cc014-f373-4ac4-8dba-0c04d3508818	1	\N	Other
+0130598f-9544-44e4-b435-cfc242c30f74	1	James	Other
+01311b69-478d-469a-98ed-54730daa6528	1	James	Other
+01345431-cd0f-4e25-8791-2afefdaded8f	1	\N	Other
+0139a5b7-897d-4d1b-8fa4-24e3c758e246	1	\N	Other
+013e7a53-8c63-489f-b914-15c27bc069c5	1	\N	Other
+0144223c-56a9-4733-bd4f-8215a01014f7	1	\N	Other
+014542cc-d637-457b-b302-a3239b08e182	1	\N	Other
+01469039-a5de-496a-ae0d-984ae13f3617	1	James	Other
+0148e7d6-6609-49cb-bc7d-1f5b7727983b	1	James	Other
+014a6baf-a262-4100-9527-f97114189f3a	1	\N	Other
+014dff6c-2b3f-11e8-bff3-fa163e8624cc	1	\N	Other
+01555141-83e9-4c92-8954-ddf9c22613e2	1	\N	Other
+015ac6b1-ee90-4211-91d8-c097846d0de4	1	\N	Other
+015dd924-3a9e-4717-b5c6-af50de6973fb	1	\N	Other
+0160691f-bd3b-48f7-8745-10f56bf91893	1	\N	Other
+0168f752-a2eb-46bf-9a63-51c6afdb65f3	1	\N	Other
+016bb571-4d9c-48a6-8001-dad4f3b88d8e	1	\N	Other
+016c5c5d-78bd-47b6-a621-18fb70033bd3	1	\N	Other
+016dd2f9-bf42-4212-9720-ea8a04867048	1	James	Other
+016f1122-e121-450b-9768-e27c5b25a5ae	1	\N	Other
+01718d45-f2e9-494e-8145-41e2d2919e80	1	\N	Other
+01755c07-d41a-46d4-8c45-9457b33aa11d	1	James	Other
+01763c7e-e674-425e-be8b-091418858cd0	1	\N	Other
+01786fd6-4557-4645-8a76-20723a4aae78	1	\N	Other
+0178ad29-b2ab-483b-ae74-1f703aa34ae8	1	\N	Other
+0184916e-84f4-489a-908f-00407db24b70	1	\N	Other
+018537e7-9834-4267-a4df-55bb47607494	1	James	Other
+0185c549-3d8c-4106-848b-1181bfa3523b	1	\N	Other
+018a72f3-b2b7-4f81-8f91-756a1f605a35	1	\N	Other
+018a85d7-fe01-48c2-a696-4cf225faf538	1	\N	Other
+018be0e7-eaad-4bed-add8-1419583b1f7d	1	\N	Other
+01932fdc-dce4-4011-8aec-7afd2ec71a0c	1	\N	Other
+0196aeaf-b4db-4cb9-87a5-769aacd0439a	1	James	Other
+019758ac-8608-4467-ba9d-0b12dccdd731	1	\N	Other
+019bc4f0-b884-4a13-a0be-43f8b3229409	1	\N	Other
+019c6399-c6de-4289-aac2-2a1651204d5b	1	\N	Other
+019ce311-7dac-4f8b-b0ba-5911eda392f8	1	James	Other
+019f885e-0774-4c13-b350-0e7bef0b425e	1	\N	Other
+01a52dd3-8703-43d8-b38e-73994f69f9a7	1	\N	Other
+01a98834-dd38-4aff-abba-ed82d67c68a5	1	\N	Other
+01aab341-7dc1-449f-a536-63767a1243ea	1	\N	Other
+01ad8af1-f852-4629-9f1d-08a5e871abfd	1	\N	Other
+01af6410-af96-4d70-97ef-d14b24ec11b9	1	\N	Other
+01b607bb-369e-40dc-a22b-1f631b54a3e9	1	James	Other
+01bb3cc0-43f8-43ba-90e4-575d3419546b	1	James	Other
+01bc0663-9864-484c-a3d2-8ecacbc22f6e	1	\N	Other
+01bdb186-ce87-49dd-9486-2e6745137bff	1	\N	Other
+01c1dcab-1a8a-4ad5-94a9-231e63eb6abc	1	\N	Other
+01c40e93-b210-4ee5-8cc1-8fc4a4ce18ff	1	James	Other
+01c5a42b-2c75-44bb-8a3d-1a25c648f4ee	1	\N	Other
+01c7c7d9-4b59-4f53-ab20-04563c1068b0	1	\N	Other
+01c81334-cd78-4dc0-bd46-ed6074941c14	1	\N	Other
+01cb7a0c-d1c4-47f8-b5ea-2b539e285af7	1	\N	Other
+01d2fe51-fc74-42db-a4de-24f5a394ebb2	1	\N	Other
+01ddf6b0-120d-4b68-94fc-b7950d8838f2	1	\N	Other
+01de99ec-e3c5-4589-9c6d-cf2fd22cacb1	1	\N	Other
+01e02ea8-a6fd-42b2-bf96-073367b6facb	1	James	Other
+01e1b988-1ddc-4090-851a-dea7e7e28965	1	\N	Other
+01e1e381-7072-4714-bf87-d01709f7f879	1	\N	Other
+01f32903-1cbf-4b0f-9f41-0a83303809d3	1	James	Other
+01f6102b-c8e9-4b7a-b9e7-75783eef6eca	1	\N	Other
+01f9368c-31d5-4be4-8ecf-28fcfdbd4d04	1	\N	Other
+01fb0ec7-d533-4ecf-ab29-d53e74b93826	1	James	Other
+01fd3534-48a1-419e-b1d0-1d41dc1a1558	1	\N	Other
+01fdc82c-c14c-4bb6-a153-51e49d545801	1	\N	Other
+01fe8935-a512-4ad4-a96f-692c74d5121f	1	\N	Other
+02005e6d-7ea4-438a-b4df-4ca908f0f2da	1	James	Other
+02026128-0d70-4b18-82aa-a68f4bde5328	1	\N	Other
+02036508-154b-4c01-b327-9a463fff4e5f	1	James	Other
+02061365-2664-4953-89bc-6a9caf0ac904	1	James	Other
+020b6240-fd48-4ad0-acde-ada37a88ca64	1	James	Other
+020c3626-7532-4691-9fad-419029c88099	1	James	Other
+020ff506-70af-458a-ae04-7e106546bcef	1	\N	Other
+0210e656-9e63-4335-92e4-2ad91b7dd9ed	1	\N	Other
+0212777c-eb71-44f9-b13e-e6bcd6200c16	1	\N	Other
+0212f052-bada-423b-bfae-81d2a26c19ba	1	\N	Other
+021c0b9a-8ee4-4379-a930-e8efeb3dc3fe	1	\N	Other
+021cc979-f397-4483-a844-91c2791423ce	1	James	Other
+021eb1f6-1f8f-4f38-a63a-702011f32422	1	James	Other
+021efffe-0acb-4283-943f-69123bed960b	1	James	Other
+022090e5-8b8b-4877-9703-92d1fad43d0c	1	James	Other
+02263504-b8ed-490b-ba04-c8ff4f11d78a	1	\N	Other
+02265ec9-88c0-47c6-8095-89a903bd44b7	1	James	Other
+0226cb44-0d64-4815-9962-7069756ad23d	1	\N	Other
+0229c18b-7a29-46d3-af70-7123db390072	1	\N	Other
+022bd9dd-e5c6-4470-8d99-3b3974a6d4ee	1	\N	Other
+022c9924-65e4-4f3e-9087-9083fb20ad34	1	James	Other
+022c9e60-5a29-448b-b53f-5efc315899ae	1	James	Other
+0232437c-844c-45ef-856a-8138983b4a2a	1	\N	Other
+02347b8e-719f-461f-9344-c072428e39ad	1	\N	Other
+02379e50-a8ea-43b1-8f19-f5c506b99f1f	1	\N	Other
+02384990-9180-45df-94f6-5cf03a9fb696	1	James	Other
+023aee03-d815-4eed-910c-b7fcd436fcc9	1	\N	Other
+023b68e9-2ad1-41d3-8ea2-bc8054eea4f5	1	\N	Other
+023cebc6-4573-4469-8d43-5247fd90d37d	1	James	Other
+0245d6f2-eac0-48db-a6db-97a1da4171fb	1	\N	Other
+024ab26e-17a5-4ed3-8ef9-9f8195ca2ae2	1	\N	Other
+024f14ac-a639-460d-a7b1-eb2be3e38e41	1	James	Other
+0256ad9a-645d-4629-8af9-2239e59f56e3	1	\N	Other
+025b1284-8d28-4cae-80bc-5114693a4cfa	1	\N	Other
+02638ede-1b61-462f-90f6-0e9e25ea5ede	1	\N	Other
+02641648-3d00-42ea-a662-8f30e3d18294	1	\N	Other
+0265549c-b2a1-448f-a03d-792136b91f9e	1	\N	Other
+02670fae-c08f-4afe-bdd8-ac3e8a01abd7	1	James	Other
+026c5e75-d6c9-4b77-a66c-05d160171988	1	James	Other
+026cb84e-4815-4e2c-b512-da37ba089156	1	\N	Other
+026d5afa-f612-47e8-b3ec-ad7d39400aaf	1	\N	Other
+026fc12f-8b24-40ea-a5d2-ecc2a0c7095a	1	\N	Other
+027103b1-e623-4320-ab3c-adc8e8c8851e	1	\N	Other
+0273af35-720e-47c8-ba55-b1ca77f07ce6	1	\N	Other
+0277258f-c1a5-4f6c-a75c-c1073c7c018e	1	James	Other
+02776c66-bb83-47b1-b8fc-b063f14ecef9	1	\N	Other
+027db981-4bc0-4c9b-a27a-e2915306aee5	1	James	Other
+027e69e3-58a5-4180-93b4-8b2a7f943341	1	\N	Other
+027e7c21-28ca-4311-8e2e-fc193986347a	1	James	Other
+0280582b-3264-4514-9b7f-70ef36da6280	1	\N	Other
+02805d3f-5e5d-4fc7-9421-1555d026cd75	1	\N	Other
+02812486-b73c-41f4-9b92-001e85bd9488	1	\N	Other
+0283fb87-f822-4513-a348-4167205710ba	1	\N	Other
+0285db76-b2b2-4290-94cb-9e6e8737d8ca	1	\N	Other
+028a1865-ea07-44b0-bd69-69972f2d3523	1	\N	Other
+028b549a-e0d3-4e3f-bcac-7c223655aa80	1	\N	Other
+028cb06a-e4dd-4329-9519-c5ad8e3476f5	1	\N	Other
+0292b2b1-79fd-42a3-8882-a105d8e576ab	1	James	Other
+02943447-4083-456c-ba48-8b35e372df84	1	\N	Other
+029a4809-16b1-4032-a4e2-60ac16eb95cb	1	James	Other
+029c54ff-20f0-4a97-90fe-72c8285e71f3	1	\N	Other
+02a0ec23-52dc-4f72-bf18-5b87ed4ea558	1	\N	Other
+02a100f9-640a-4cae-b328-af29bb773c69	1	\N	Other
+02a38ed9-5c5c-43a9-9783-92ca71b8cc73	1	James	Other
+02a3bb0b-a242-4ba5-8381-1f3e1734fe44	1	\N	Other
+02aa7b34-4526-4471-a576-bac305bf4753	1	\N	Other
+02ad7cff-9ffa-4486-b61f-13e94f0080c0	1	\N	Other
+02b01cc6-f163-4d60-8cad-e30756856b49	1	\N	Other
+02b05aec-69bc-4179-b2e9-cda997b35c05	1	\N	Other
+02b3e51b-e96c-4fa9-a263-7dff55c7785f	1	\N	Other
+02b40e45-34cb-4755-b1f4-9c3098aa3ded	1	\N	Other
+02b5bdbb-753b-4082-9b51-7a273718b021	1	\N	Other
+02b6152d-d88e-4c19-82c2-31f9f5579e78	1	James	Other
+02bbd3bb-56e6-49fa-ab89-7d83edfe4925	1	James	Other
+02c26dcb-bc78-46f8-8042-6ce7c1c382ec	1	\N	Other
+02c3485f-22ad-46a2-82c8-4d7fc14f7df8	1	James	Other
+02c509e7-cc66-4c4a-a3af-57d8dbb268a7	1	\N	Other
+02ca6818-ee2a-4795-8902-5413a1ff2ce5	1	\N	Other
+02cbcfd2-c6c8-450c-a112-c74fa2bec214	1	\N	Other
+02cbf957-671e-4e11-9f35-89d323ac24f1	1	\N	Other
+02cff7d0-f8b1-45b4-a923-a1339788fe8d	1	\N	Other
+02d90e37-edc8-4b7f-a8c0-0200a100d5a0	1	James	Other
+02da9c35-83e5-4ca0-9914-cf70f33f8f36	1	\N	Other
+02daf760-be36-470b-a01c-b7b49edde417	1	\N	Other
+02dc740e-37d5-4c4a-a726-7817f25591e3	1	James	Other
+02ddeb6d-0f7c-4326-9570-e0c1bda419fe	1	James	Other
+02df0232-5a56-430a-b69b-4a5a95b21699	1	\N	Other
+02df639f-7070-4e71-bc62-f07f23c8cb14	1	\N	Other
+02e342d2-32bd-43c3-8c5e-77932ac27e98	1	\N	Other
+02e3c4b7-aafe-410a-a3ea-5994903034f3	1	\N	Other
+02e51feb-f40b-4f6a-8d88-cddb3a56be72	1	\N	Other
+02f4de54-c31d-47f8-a0d5-8e77782453bd	1	\N	Other
+02f91c26-3a4a-4ca5-b775-6ff882f39114	1	\N	Other
+02fc2a37-5758-4099-9641-65abb9acdf1c	1	\N	Other
+02fc7063-d1f6-4c19-8904-d82ffff95e50	1	James	Other
+02fda4f8-9394-46ea-8b2c-04b80e47f4ff	1	James	Other
+02fded98-1bee-4802-962c-25d4a414bdc0	1	\N	Other
+02ffb46f-d2b1-4c46-8d86-4369f23969b4	1	\N	Other
+02ffc6ba-8de1-49a5-93aa-345d91f7496c	1	James	Other
+03015e84-feac-41cb-8ab1-f5f28e5d2d58	1	\N	Other
+03047e60-ae2e-46f6-bfb0-c00ddf383735	1	\N	Other
+0308ab10-cea6-4ad6-86c0-3d65c838fbac	1	\N	Other
+030bf937-b38f-4147-b075-87bd6a375e6e	1	\N	Other
+030e0050-0ad4-4fdb-a85d-4f5e9c96ac7e	1	\N	Other
+03157386-36bd-4a30-b2d0-7b859721bf6e	1	\N	Other
+03169eee-a207-4baa-8d8c-d88f0e5c2fde	1	\N	Other
+0317935a-18ef-459d-9b00-13889d808fcf	1	\N	Other
+031ae134-ebdc-49fd-b1b1-e5f99376b75e	1	\N	Other
+031b5bb0-454b-4eb2-82f5-82a25e055d3c	1	James	Other
+031b7390-519a-4a21-8b93-5b6458e3b766	1	\N	Other
+031b7e6c-2195-4a32-b3e3-8a4198f65ef0	1	James	Other
+031d5cb2-f3d1-4fcb-a2de-917860ea6e86	1	\N	Other
+031f44f5-0e24-4414-be77-fefabed803c9	1	\N	Other
+03209c01-b85d-4a53-8220-49d25b2a1581	1	\N	Other
+0323641a-6a6e-415c-9b53-ce490b5300a4	1	James	Other
+03236fc7-81ca-4328-ace7-a9a64aa15fea	1	James	Other
+0324b04d-5ee3-44dd-b528-1db4b0fd5fec	1	\N	Other
+03276820-5d73-4dbf-b6c9-04afe31ebcf6	1	\N	Other
+0327ab24-75fd-443c-8980-7664ed49da9a	1	\N	Other
+0328712c-8ca6-4f69-8d40-d8054026ae14	1	\N	Other
+03289989-2d09-435f-88fc-9424eea4dd6e	1	\N	Other
+03296cc5-b1db-4220-b31f-96d12ec04fd2	1	James	Other
+032bd0a4-9df5-4b9b-a00e-208220e89787	1	\N	Other
+032d38d5-f101-472c-817a-0fe3f9b77219	1	\N	Other
+032e8f16-97ac-485b-8266-b2369ac16674	1	\N	Other
+03310c47-77b1-4405-ada1-3402ed7f212b	1	James	Other
+03315745-384c-4d37-a029-93c919800349	1	\N	Other
+0334a18b-2f5f-46ca-904a-00ea0acd7f36	1	\N	Other
+033643d5-1683-4fb1-b589-934e616ec94e	1	\N	Other
+033d2e8f-bad9-471a-a329-15060e1487dd	1	James	Other
+0345c46f-813f-4fe6-bd07-5b2621273d5c	1	\N	Other
+034c4573-45de-4626-b096-8f03c0aff262	1	\N	Other
+034c6ab6-680b-4135-90c4-4c82e7913533	1	\N	Other
+034cab76-08fe-4aca-b660-982c436b1dee	1	\N	Other
+035087a6-728b-4ff5-a4cf-4574124502fd	1	\N	Other
+0354c8b4-9443-408f-a6c1-0c3c0c6182ec	1	\N	Other
+0359cda5-425b-4137-8b58-d34a1f9f9268	1	\N	Other
+035e0219-828b-49c5-8d97-9abb5f28d5ac	1	\N	Other
+035eff07-540f-40d7-bff6-bc9a9f60c09f	1	James	Other
+03625f94-36a3-4c10-affb-48af7d717684	1	\N	Other
+03638026-b817-4888-b5bc-a38f781f0d61	1	\N	Other
+036e4a32-c845-4583-b372-46df297a79e7	1	\N	Other
+036e5cff-a6e9-43bf-bc3d-21f0e7a63281	1	\N	Other
+036f6f6a-c477-4a05-b45b-8941861ea5a4	1	James	Other
+0371f943-a7fe-4979-ab8f-3f07349e0255	1	\N	Other
+03739b62-5bb5-4056-adac-fe04c5ad3e42	1	\N	Other
+0374ea02-4eff-4808-bb9f-36064276c437	1	\N	Other
+037b9a83-1a69-45c9-8524-0818e248fd55	1	James	Other
+03800a79-2245-4913-9132-0aa0019ceb68	1	\N	Other
+038155be-1b99-40c6-965d-e455f9daad2b	1	\N	Other
+038156d0-a5fc-4ed0-bce3-8d1a5f2c1717	1	James	Other
+038427bf-3c32-43a2-9d9b-d38c3f721a75	1	\N	Other
+038693bd-78ee-4bd3-a86b-0f1b3e01541e	1	\N	Other
+0386a493-14ee-47d0-8d54-74e75a70d3b0	1	James	Other
+03895281-eac5-4d7e-928c-03222970a8dd	1	James	Other
+038c4c43-bcf4-4313-bd48-cd4e8cf35b68	1	\N	Other
+038e95ba-8cd9-4673-995d-2014f4a50c13	1	James	Other
+038f9876-49a4-44a2-8a1b-772711e00f9f	1	\N	Other
+038fea7b-5f76-4f95-bfb6-50c711a9989e	1	James	Other
+0396254c-8729-4873-ba2b-164415dca344	1	\N	Other
+0397f8eb-f13f-4b07-8244-e06462dbdc4c	1	\N	Other
+039ce1e2-83d6-422c-8045-d1ef5667101a	1	\N	Other
+039fdfca-2700-4b5f-949f-09ddbec8f75e	1	\N	Other
+03a32a6f-7626-4b1c-97e3-1e4bdf6b8016	1	\N	Other
+03adbd88-9c29-439b-bd8e-765f98924495	1	\N	Other
+03af75ab-55ce-4919-ae51-02ddc4ddc700	1	\N	Other
+03b4a272-996d-4621-a79f-1a8f78e66ce4	1	\N	Other
+03b581e6-0a32-4ad8-894f-e9b477bacba3	1	James	Other
+03b5d071-441c-4928-9139-cdeb0acaceda	1	James	Other
+03b5e535-b4c5-446a-b90a-f814cae0a53e	1	James	Other
+03b8515f-8c7b-41aa-b1b8-024ba4222567	1	\N	Other
+03b8d9c3-0698-46ae-bcf5-b9c0a3b4821e	1	\N	Other
+03b908df-2b72-4121-96cd-dcd8aff15e85	1	\N	Other
+03bb0654-d303-47e5-8340-b7e3a49417bb	1	\N	Other
+03bc814d-45e3-419e-aa83-cdc30147456d	1	\N	Other
+03bcafc0-a5fe-45be-82c5-0e6085f4d20b	1	James	Other
+03bcd8da-427b-4e1b-9364-218d7f13af7f	1	\N	Other
+03c43d17-78b4-464b-a62b-4e55d5423ad1	1	\N	Other
+03c526b5-07b9-4cb9-964b-5d797a39ab6e	1	\N	Other
+03cc8713-2b45-48ad-b48e-a597f423ceb3	1	\N	Other
+03cd956f-94f8-421f-875c-bcf65d4bb630	1	\N	Other
+03cde652-d69b-4008-86f6-a87dfeea87ce	1	\N	Other
+03cef858-5dea-4523-9076-2de0e5e73888	1	\N	Other
+03cf9e41-a466-48e6-94f8-caed0c710c99	1	James	Other
+03db18d6-e7fd-4d1b-a9d0-3f52c0856576	1	\N	Other
+03db8e9b-dc3a-473a-a626-81c4df67c7d1	1	\N	Other
+03dde15c-80ac-47dd-8117-1cc4a5af88f9	1	James	Other
+03e2de16-abf0-43db-ae75-eefdb1ea4ad7	1	James	Other
+03e4254a-d8de-4b47-816d-e66d8dcf8a2e	1	\N	Other
+03eb160b-3366-47f1-beae-3752baf0516b	1	\N	Other
+03f25d57-1d4f-4e24-8aa7-52605239a863	1	James	Other
+03f36be6-158c-4f03-84e7-745986f84f61	1	James	Other
+03f4b775-9eaf-4f1c-af80-e81b2b12b08e	1	\N	Other
+03f4fdec-e9c8-4038-bc0d-153c7974560b	1	\N	Other
+03f756e5-f751-4904-8d25-2e583cc0a2f0	1	\N	Other
+03faeb2d-24ff-441e-bd86-aba41c85f4a9	1	James	Other
+03fb9b2f-86cc-4dff-b379-7c9abe5be6fb	1	James	Other
+04072400-50e9-46a6-80d0-006b941f156f	1	James	Other
+0408b21f-ad7a-4171-aeb1-6e221df29bbe	1	\N	Other
+040c8afe-0752-4640-b6dc-ce58940b89b7	1	\N	Other
+040db095-f860-483e-a819-68b02e07e351	1	\N	Other
+04108d4b-f5d8-4d73-a7ca-31421f5d241c	1	\N	Other
+04125317-0883-4857-8d8a-c93e590eccf3	1	James	Other
+04130f30-c173-4134-862f-16c7c9afb590	1	\N	Other
+0413ceef-daf5-442e-92eb-abf2dbff7ea9	1	\N	Other
+04151558-1e74-430d-83da-af56f3e3ad76	1	\N	Other
+0415cba4-2ea5-4877-8572-2bbc6cd23833	1	James	Other
+0415eb61-38dd-43cf-a81a-047ad3b311eb	1	\N	Other
+041a22c9-7fb0-4119-a036-b1b7db132c0f	1	\N	Other
+041dc6c4-731b-4c48-83cb-00882da32f9c	1	\N	Other
+04216152-f084-4d45-a3ff-1f5d7755c564	1	James	Other
+042d034b-d007-4cd5-8c5b-ae83353363e7	1	\N	Other
+042dc737-e846-4030-bd7c-91c01c056ed4	1	\N	Other
+042ec986-d569-4584-9bf9-80661f2bf983	1	\N	Other
+042f3174-c9a4-4100-a24c-d107727a2506	1	\N	Other
+043073a4-7a41-4085-8833-e1921b94c662	1	James	Other
+04329dfe-220f-4cda-a585-1278405043c5	1	\N	Other
+0438b85e-4759-4d87-8374-1dc8064c73fa	1	James	Other
+043f15bb-3691-4b66-9727-4767355bf787	1	\N	Other
+04403131-d63d-48da-84d8-161208627d15	1	\N	Other
+04420514-e9a4-4e3e-ad01-27edf9adf419	1	\N	Other
+04470217-e53c-4706-863d-92ab71b9f3af	1	\N	Other
+044aa03c-898b-4a98-9824-b6395537bf62	1	\N	Other
+044d240f-0374-4427-bcbd-1a052b5761bb	1	\N	Other
+044dae2d-d1ae-4b72-bec3-fe1ff8308116	1	\N	Other
+04503b68-f527-4a44-a754-96d34610151c	1	\N	Other
+0455da68-fea4-44a4-9b09-3dedda1851ce	1	\N	Other
+0459e85b-79ae-41d1-b0e5-9ef0c91aabd8	1	\N	Other
+045ddf9e-52b5-4ef0-8b79-607a54df31b6	1	\N	Other
+0461db6c-22bc-412e-a09f-9487e6579112	1	\N	Other
+0466429a-4797-4480-b28d-fb500d951710	1	\N	Other
+04668f96-32ce-403c-a3d4-62b8c1589101	1	\N	Other
+046ded96-7649-4d28-80a6-a733f962d9d7	1	\N	Other
+04720e02-774a-425a-95a9-c3bf5ffb0bb4	1	\N	Other
+0478f9f2-472f-4d34-922a-778f5faf82e0	1	\N	Other
+047b59b1-ea45-40fd-9571-3e86e75d4114	1	James	Other
+047d3e63-9123-4de2-8c5a-4462cc14772d	1	James	Other
+047de5f8-13c6-4bc3-a8ed-cf64c73e884b	1	James	Other
+0486ab3b-7e19-4482-bf58-34a9b2bcb930	1	\N	Other
+0486e635-9ebc-409a-a155-03ab8505a3bd	1	\N	Other
+049014da-17ce-4c1b-9879-89ce1237852a	1	\N	Other
+04927d8e-504b-4715-b1df-f7c0bc7d849e	1	\N	Other
+049284af-73f8-45d8-aba2-10e3b3d24776	1	James	Other
+04958d2d-d923-49bd-b529-8746827a935c	1	\N	Other
+049c6f6e-f07e-414c-9133-69fea9bab8f2	1	\N	Other
+049ce93c-9773-43db-92e6-5ead9abc981d	1	\N	Other
+04a3763a-49e7-11e8-a193-fa163e8624cc	1	\N	Other
+04a3b41b-aafd-414f-8a94-81dde5c6fdb8	1	\N	Other
+04a550d2-a0ba-4be8-90ee-bcfbfdd6b56c	1	\N	Other
+04aa96c6-f513-42af-82ba-2bc43a5fb156	1	\N	Other
+04ab37ea-0689-466d-9f61-80cf19e2209e	1	\N	Other
+04abfe40-49e7-11e8-ae63-fa163e8624cc	1	\N	Other
+04b69a45-e4a8-43ac-866e-3b9163935eda	1	\N	Other
+04b9b261-d9bd-4d6d-ab7c-3fa38eba6362	1	\N	Other
+04bcc8bd-0925-4f23-afc3-30cdbde69b1f	1	\N	Other
+04bd71cf-1391-45e8-8416-fe877e19bb7c	1	\N	Other
+04bde9c9-cd37-4c23-9a99-dbd134049c9a	1	\N	Other
+04c199f8-d3bf-477b-b70a-daf2d24d5a29	1	James	Other
+04c2cfb8-14ef-4987-9a99-90c0870b7845	1	\N	Other
+04c3b336-1b5d-11e8-9b3b-fa163e8624cc	1	\N	Other
+04c402b0-d48b-4e37-b457-64a97e2f0baf	1	\N	Other
+04ca6c4e-e67f-47d9-a863-52b878a36c3b	1	\N	Other
+04cd5605-1d70-485a-84f8-66bf483a2c3e	1	\N	Other
+04d3f7e3-2580-4b32-9282-b0183a586304	1	James	Other
+04d7b62d-23ce-4629-be03-a37926b82d48	1	\N	Other
+04decf28-196b-4564-8110-44468dd230e9	1	\N	Other
+04df6080-15a8-4434-a4c8-aa972b06c307	1	\N	Other
+04e08be1-83a4-4c68-8b8d-adddae240f26	1	\N	Other
+04e1a210-1b5d-11e8-b2f9-fa163e8624cc	1	\N	Other
+04e2be2d-0aa3-40bf-b1c8-ae676dda7d3e	1	\N	Other
+04e75f73-c0af-4e98-92c5-5e846d9d0803	1	\N	Other
+04e92d74-49e7-11e8-9d0e-fa163e8624cc	1	\N	Other
+04e9a559-e5ee-4652-baf4-02b760359b1b	1	\N	Other
+04ea491d-d105-4d20-bc21-7fd6a737ca80	1	\N	Other
+04ea63ce-c946-4076-b54e-ec5e1056d210	1	\N	Other
+04ea77cf-0b89-420c-939d-6fa2710f85d5	1	\N	Other
+04ee40af-2fe0-48ab-ac99-2a7f7834ac85	1	James	Other
+04f1c2b8-e6c2-4a74-8f0e-089600e2f72d	1	\N	Other
+04f24e67-8ce6-4408-b738-a83cf7c174c3	1	James	Other
+04f27b56-78bd-4b6a-92cf-14d776a04698	1	\N	Other
+04f59339-5d2e-439f-abef-6499f4970d22	1	James	Other
+04f9f1e0-49e7-11e8-a21d-fa163e8624cc	1	\N	Other
+04fa5f7b-a673-49b6-8c90-5fa6c0a8599c	1	\N	Other
+04fb2460-1b5d-11e8-ac82-fa163e8624cc	1	\N	Other
+04fbd6bd-5b4d-4458-8da6-56d18a176771	1	James	Other
+04fcbde0-dda5-4012-9e1d-70e3fbe6c2e2	1	\N	Other
+0501ccfd-cfd7-4017-8dfe-0cbd3e9be984	1	\N	Other
+05021df8-9f28-46e8-a697-e05b15b6bd73	1	James	Other
+050b1071-8ad0-4bf1-b971-1bc8ff76edee	1	\N	Other
+050ffb13-2b42-41c0-86b0-14211a748ee9	1	\N	Other
+05181dfb-c9d1-4c1a-96c4-3724a7f17db2	1	\N	Other
+051a1b18-1b5d-11e8-8584-fa163e8624cc	1	\N	Other
+051dc033-3939-4238-a07b-28600d643a7f	1	\N	Other
+051e732d-f23e-43f7-ac25-dbf61765a627	1	James	Other
+051f802a-6f99-4d79-ac38-54794a9220ab	1	\N	Other
+05201d28-3fa9-4b30-b89d-78dc6f6d7a60	1	\N	Other
+05207bcc-5961-44e5-a9f2-ebbd40683c9f	1	\N	Other
+0520c23c-1d49-496f-810e-20f65ffaf038	1	James	Other
+05224037-a083-4d86-96ad-99d5cee62ffa	1	James	Other
+05225dd0-41fb-4777-82ac-1c78a29bca28	1	James	Other
+05271a5c-042d-4fc8-ab5a-a36b057b7441	1	\N	Other
+05273f40-5536-4235-a708-2360f62380b3	1	\N	Other
+052760bd-2aac-4247-ac33-fe053dcf8e0c	1	\N	Other
+05293c8f-a852-42f0-8076-6127535f772e	1	James	Other
+052dbc24-0c05-43c7-83aa-2fe520a3b9a0	1	\N	Other
+052f0d51-5f2b-401b-8b05-d2ac67804bc4	1	\N	Other
+0536a7fc-fd4f-40b8-9424-cbed40be5097	1	\N	Other
+05374933-a833-468c-84d0-2a69b6b1d285	1	\N	Other
+053a0c55-41a1-4b40-8fef-ec1584ebf3a0	1	\N	Other
+053a9568-10f3-4b2c-a968-e0ad72d77890	1	\N	Other
+053b14c2-a66e-4e45-a070-5dc481b2585c	1	\N	Other
+053c157f-085e-47ca-94fa-feb6d24fd8c4	1	\N	Other
+053c1ab3-4a45-46d9-a1dc-932aa5ecdba1	1	\N	Other
+053ca718-18b7-410e-8953-34292efd80eb	1	\N	Other
+053cf43a-5f62-41cf-bf13-fdcc31684f87	1	James	Other
+054dd0cb-e318-4391-839f-8f2c5586965d	1	James	Other
+0551dd43-c13c-40d8-a799-902cc9cde4a4	1	\N	Other
+0552e59a-306c-4a21-b74a-c275de1e8452	1	James	Other
+05542b0a-14c0-464a-b903-ad0ffbbd271e	1	James	Other
+05567df5-8b59-41c1-a39c-b2934e5a33b8	1	James	Other
+05569b39-3e01-4bf1-a7f6-1c51be86dd58	1	\N	Other
+0559ba52-2165-4dcc-9283-46436448c481	1	\N	Other
+055bc7e6-a9c2-4e5d-a4b4-280cf8a805c7	1	James	Other
+055dbeb6-ae3e-4dc0-b0ac-60619b86cec4	1	James	Other
+055f117d-1fe8-41cc-a426-ba68e425c060	1	James	Other
+0561b379-8e72-4b89-9974-5ed241e42059	1	James	Other
+0562202c-8741-4a59-bcfb-608307843d0c	1	\N	Other
+05643fb9-ff09-43f4-87dd-68b5ccc6b1d7	1	\N	Other
+0564e019-2c20-407f-9263-d5d7b6be7d8c	1	James	Other
+0568b2d5-1ac6-4a8e-a7b4-97aa22228fb4	1	\N	Other
+056a28cb-6615-41c6-8b11-1cbb0a6c8430	1	James	Other
+056b5fe6-b109-4ed0-bd9a-2abd928ba824	1	\N	Other
+056db3ac-65b6-4780-8f84-e4461dd9bc7e	1	James	Other
+056e54b4-6272-4724-98d3-33f8bf601178	1	\N	Other
+057038be-0261-4300-ae82-f7535904a9f0	1	\N	Other
+05709a4a-b8bb-4f90-9c34-a0ecfab6c8ec	1	\N	Other
+0573f3ad-4636-467a-99e1-17916e74c8c1	1	\N	Other
+05768d2e-2911-43d1-ae39-2fce2d99f222	1	\N	Other
+057801fd-f5ea-4f28-a7d2-cc192dcd73a0	1	\N	Other
+057b2aaa-1c34-472b-9bbe-9abc87494019	1	James	Other
+057f7422-a396-43d9-a38d-397cca34549c	1	\N	Other
+05818dc2-9c5d-4f95-aaf1-7a301f87325e	1	James	Other
+0583f33f-b46f-4c18-b7eb-6529aa42a272	1	\N	Other
+05848084-18f9-414c-b43a-80710ebe3cb3	1	\N	Other
+05862365-0f63-4f56-be8e-a654ea68f467	1	James	Other
+058804f5-1c7c-4655-b69e-f2d93ebbe191	1	\N	Other
+058c56a3-3489-47ca-9376-5115190d5cd5	1	\N	Other
+05914449-6751-48a4-996b-2a1b3b5a7152	1	\N	Other
+0598c9b6-1beb-4f6f-9880-760b80f43942	1	James	Other
+0599887f-aaa2-42b3-9ce7-3d869fe98991	1	\N	Other
+059a4646-809c-412d-9c3f-5e139e0028da	1	\N	Other
+059a660c-9ba0-4bb9-bad9-6f3d8950bf7f	1	\N	Other
+059c6bcf-1d9f-4ab3-ba05-11b5c37b99a1	1	\N	Other
+059f41cf-d3d6-40cc-86a3-5e4ebe6040f2	1	\N	Other
+05a0ebd4-e654-41b0-bb49-29c28517eacf	1	\N	Other
+05a416d9-1c99-4859-a756-f58c462b484f	1	James	Other
+05a4a181-bebd-4905-a449-93c88fe19290	1	\N	Other
+05a58e3e-0595-423e-89a6-4a9c3f082bc0	1	\N	Other
+05a7e5bc-50d1-41e3-a4e4-a919bcb17d68	1	\N	Other
+05aca2a3-840e-4356-bf69-3a07c044adbc	1	\N	Other
+05b22047-f74a-4294-8b88-5fb857e63f0f	1	\N	Other
+05b4be6b-af7d-48ba-9170-365827c6397b	1	\N	Other
+05b54499-e4e6-4c39-a610-3182419b89d5	1	\N	Other
+05b8ac93-4494-4c8d-bf35-517bc74619f9	1	\N	Other
+05be2a56-bd1d-4eb4-b98a-c84f38fef8c7	1	\N	Other
+05be6ad2-a052-40ef-8562-4b0242864568	1	\N	Other
+05c3e205-414e-45cf-9c15-70eba2ef684c	1	\N	Other
+05c93660-7d23-408f-86fe-6413ebb6920e	1	James	Other
+05c98142-a63d-472c-a26c-32cdf5e66a00	1	\N	Other
+05cfcac9-d832-4be0-ad28-95be44d11fc3	1	James	Other
+05cfda59-8a23-4697-b1dd-2a81ffafee6c	1	\N	Other
+05d01032-cd63-41ce-acd3-972e1ad148f1	1	\N	Other
+05d0b1c9-080e-4494-be2f-f0dc14ef75d6	1	\N	Other
+05d0c6aa-fcdb-4ede-b7dd-71ed093573e3	1	\N	Other
+05d62b21-dac5-45ae-8344-d8801fb09152	1	\N	Other
+05d893e3-32cc-45b4-ac52-2ddca8d1a12a	1	\N	Other
+05daae12-03ff-48df-94af-0a3147f6dfa1	1	\N	Other
+05dd05cc-0fec-401b-b85c-2fd50c295fb3	1	\N	Other
+05de44df-0030-4650-98fc-228bbe99e8d3	1	\N	Other
+05e1473d-36ce-40e9-b1d2-d764d42a24fb	1	\N	Other
+05e58f45-f67b-4098-bea8-d93539d7c3ff	1	\N	Other
+05e83d94-220a-4c56-87fd-29c6c0fcb588	1	James	Other
+05ea20da-0d47-4b3e-a893-b5d2939e32de	1	\N	Other
+05eacdc6-c63c-4cdc-a498-ceed7efca796	1	James	Other
+05f0569d-3a49-41bb-bdc6-4e36d3593f40	1	\N	Other
+05f418ef-d5f0-424e-ab1e-cc874105388b	1	\N	Other
+05f93941-8dae-48a2-8f0a-9023faeb03fa	1	\N	Other
+05fdbcce-7d0c-4955-af6f-28c9fbf760b0	1	\N	Other
+05fe8550-6b6c-447b-88d7-d0cbe92c7fa6	1	\N	Other
+05ffbede-ce4a-49b7-a592-bb650aa2eef4	1	James	Other
+0607b6b8-7c76-4497-878b-7ba6bf2bc9de	1	James	Other
+0609167a-add0-4182-a2e6-dba44dc5e972	1	\N	Other
+060a25c0-c408-4152-a7c1-190da8ebfccc	1	\N	Other
+06102821-c833-4973-8d6d-a4478112b99b	1	\N	Other
+0610ee84-911d-4ab0-b3cd-f5e4e0df9332	1	\N	Other
+061277bf-ad8f-4201-b030-c24acaa8e331	1	\N	Other
+0612e892-3f36-410c-9bf2-775709b77670	1	\N	Other
+06146c7d-e1bb-4ba6-b70b-9dc5329f2966	1	\N	Other
+061521d4-09c0-4ab4-a299-e1821d7b5a88	1	\N	Other
+06155efd-cdd7-411c-b465-cad2b8e1da1b	1	\N	Other
+06187596-83c8-4d9f-8895-46a94160bebf	1	\N	Other
+061df7d9-d3e7-4cfb-835b-5e73efe347f8	1	James	Other
+061e411e-9c97-45bd-8554-84e45fd61627	1	James	Other
+06237d5a-aaf3-4aa9-a317-551dba0c66d2	1	James	Other
+06253ff7-db3b-4992-8d22-91e583aa6852	1	\N	Other
+06286f12-c0f6-4636-87fc-03becbe7f9fa	1	James	Other
+062b6eab-097a-4b97-b796-6c884322fb0a	1	\N	Other
+062e9d09-27ea-4e9e-952d-905106a3cebd	1	\N	Other
+0630dc0f-c133-4b49-9470-a316f2af9851	1	James	Other
+0632525d-e86b-448b-a4fa-8c9a955c8ef9	1	\N	Other
+0634724a-7f40-4b21-a3e5-7bb62f116b98	1	\N	Other
+0639ca7d-3c06-4648-b303-da4699e0b2ab	1	James	Other
+0639d080-cce1-482c-8042-8c31d4a3bda7	1	\N	Other
+063bb207-eeb7-449d-a3ec-002f142f2c2c	1	\N	Other
+063e33da-2631-4128-bb9c-b470d0994edb	1	\N	Other
+064345cc-6176-4554-91de-b9d1a16454ff	1	\N	Other
+0645543a-2284-4ce6-adc4-59e880efbe11	1	James	Other
+064607b4-e9c1-4d61-9ebd-8f781b5f72dd	1	\N	Other
+0648e1cb-2531-43f6-81b4-2fbbba4475d4	1	James	Other
+064d0bc9-25d9-4415-9c4d-213bc147d2f9	1	James	Other
+064dc7de-1429-437f-a437-016047ddc8d8	1	\N	Other
+065306e1-4dc9-450c-8e31-76a44e1488b8	1	\N	Other
+0655feac-a666-477b-9e9a-9791f5e468d4	1	\N	Other
+0658a305-800c-47a6-9450-b0fbb6a9c1a9	1	\N	Other
+065fc134-ca35-4a00-aab3-635096cbe67f	1	\N	Other
+06624c84-ce59-4337-9e62-e96a3d810a9d	1	James	Other
+066a91fb-485e-4518-849e-c5abc8586d46	1	James	Other
+066aef88-fb34-49e4-8000-097519c82bb9	1	\N	Other
+066ea419-6bb1-4760-84ed-b5a5f018f6f5	1	\N	Other
+066f76fa-ec56-4245-a5fe-0cd5e860fba7	1	\N	Other
+0674c0b0-f875-4f53-8c54-09557a108cbc	1	James	Other
+06754e64-f4d4-4d79-991c-8059aba0b9f5	1	\N	Other
+06757cfd-3c45-4654-b65b-cd22d7bfb571	1	James	Other
+067ede0d-561c-4f06-bd84-1fa5307505f9	1	\N	Other
+067f3473-8fb7-4ed2-bce3-33555fb36509	1	James	Other
+067fc851-267d-45a2-8ed2-e696aea0cda0	1	\N	Other
+06879ee8-8734-4a7f-851d-64e5ce3c700d	1	\N	Other
+068951fe-59d4-4bd3-8e90-693a697f44a4	1	\N	Other
+068a0566-4141-4e89-9ce5-9a1ace690510	1	\N	Other
+068aef62-3b57-4f50-9e45-b14bf59c27a9	1	\N	Other
+068ee843-dd5e-4f2e-918b-4406424bb840	1	\N	Other
+069207a8-5b82-4359-9405-42eeb0f42a68	1	\N	Other
+0698c9ee-8c8c-4f7f-a2d9-94e0693899d2	1	James	Other
+069c9fad-acd5-419f-9356-f768d3a48808	1	\N	Other
+069d12d8-dbce-4d58-a2c9-00e6b2d85c26	1	James	Other
+069e8ae7-977a-456c-812a-d364e282c0e7	1	\N	Other
+069f4788-6a33-4bc2-a133-51df6ef11270	1	\N	Other
+069fece7-6ef4-4958-8916-8f7ddce828c7	1	\N	Other
+06a2ce2d-54df-4652-8511-1bb983238ba9	1	\N	Other
+06a8f412-cb66-4f74-b4aa-b10e410f521f	1	James	Other
+06aa529c-814a-41ce-a8cb-a10d402fcdf1	1	\N	Other
+06abff8d-b441-4d75-9e57-1313a5212588	1	James	Other
+06ac1c26-4934-44b5-aacd-4d4a9c8b3e2d	1	\N	Other
+06ae2a2d-3c92-4ad6-9925-84ce2535e96e	1	\N	Other
+06b4e0c5-88ad-45f3-bf8d-95dba5d802ff	1	\N	Other
+06b544d6-d0f9-45e4-85fd-5e0ff6f3b82f	1	James	Other
+06b5f0aa-3ac9-4586-8770-9f88fc4ac4db	1	\N	Other
+06b7592e-5c09-4b59-9ab5-b944150039f6	1	\N	Other
+06b839a0-7f84-4f82-bdbc-7707c69d6be1	1	\N	Other
+06bedcac-7ba9-4c5b-a2ba-7256576daff0	1	\N	Other
+06c24bbd-0b92-4ff4-b24f-66bc5de4f895	1	James	Other
+06c3da07-8970-4963-8afd-0712ece0d8c1	1	\N	Other
+06c9c60b-1e01-41ca-a530-259bb3c566ef	1	James	Other
+06cf0d25-c624-4127-82a6-cb51e341ff79	1	\N	Other
+06cf0f64-1fa9-4802-a0d1-b7dbd9c78609	1	\N	Other
+06d0e1d9-7b51-436a-bfbf-83b8e1c9ddf7	1	James	Other
+06d129e6-f3db-4be3-b407-7f98d2caacdb	1	James	Other
+06d51240-4355-4344-8170-a72b9c3a7e1a	1	\N	Other
+06d5fddd-e4e0-406a-9501-fc7b76ef38c7	1	\N	Other
+06d6020a-22fe-45e8-b981-c65fa23615ef	1	\N	Other
+06d9992a-2038-4d02-a588-448704f39aae	1	\N	Other
+06d9c5d4-f9f3-4e20-bb49-38fe6658834b	1	\N	Other
+06e1f70d-64d8-4491-8b84-3754b9f12f00	1	James	Other
+06e417b8-f999-4d4a-8992-c257acd10485	1	\N	Other
+06e574a8-4fe9-456d-93c0-75d0c8174ca4	1	\N	Other
+06eaed42-de97-40a4-935b-2843597e2d82	1	\N	Other
+06f249d9-8a2c-4502-8379-86ef46e70902	1	\N	Other
+06f633ea-583d-4c78-8e76-fd1985950d10	1	\N	Other
+06f660ee-cf8c-4d12-a9e4-2b78b1789ad4	1	\N	Other
+06f743b5-e3a7-4851-8952-a9c526e1b1e6	1	\N	Other
+06fabdaa-b836-48a8-92af-7a44d3047725	1	\N	Other
+06fecfda-870a-4a47-a281-7c45ec010018	1	James	Other
+07068fbe-fdbc-4e87-a10f-e074245f6bf5	1	\N	Other
+0706f6b9-2d31-448d-8205-d3dab4a70fc5	1	\N	Other
+070918c0-a474-487b-ad05-af3a70235530	1	\N	Other
+070f83ba-d29d-4c4a-a56b-0abf4fcbd580	1	\N	Other
+0712bebe-0226-491f-88aa-de7890c8fbd0	1	\N	Other
+07180857-7032-44c0-80b0-a444857ac933	1	\N	Other
+071db1d3-43f5-45df-8ed2-a0617a9ba07e	1	\N	Other
+071f457a-fb7f-40db-820e-a3c5e4c8ee66	1	James	Other
+0720eb03-d615-42d3-951c-bd7b28b78490	1	\N	Other
+0723e2a9-8794-403b-8712-66db690d9ef0	1	\N	Other
+07276857-6310-4b71-9b4a-aea9561a3be9	1	\N	Other
+07283f05-4947-41f9-9239-d3d14f00088a	1	James	Other
+072fc31f-d12d-45c3-9439-0ebb1b8252a0	1	James	Other
+0735ad60-c2e9-4f4c-b032-3917bcd7ad76	1	\N	Other
+07393d21-480d-414d-b85f-06e23e8da3db	1	\N	Other
+073cd021-3fca-435c-a70a-320f191a6939	1	James	Other
+073cf71f-5a8f-4329-915a-7f74fc271d31	1	\N	Other
+0741579b-2c4b-4feb-8b86-965388183638	1	\N	Other
+07421de5-2379-457d-8e93-60865006d5b0	1	\N	Other
+07486840-0998-4cdf-af7e-7594f1eb002b	1	\N	Other
+074f39c8-a0c7-4300-b1b6-9da8439a797e	1	\N	Other
+074f86ff-52d1-43b7-a055-f22f6151af0f	1	\N	Other
+07504208-9135-40aa-b77f-4e0a7cbb0c2d	1	\N	Other
+07526bf3-4726-4c7f-bdd6-58cbe3b3fd87	1	\N	Other
+0755c472-b9e1-4c6b-83d2-85b056992856	1	\N	Other
+075a625e-cc71-4f78-857e-a77e8496afa5	1	\N	Other
+075b2800-19c8-4f84-a46e-29519ad76162	1	James	Other
+075c6cf3-149a-498c-a784-5bc5c1acf50f	1	James	Other
+07604e99-a7e8-4fc5-a8aa-d0cb61499410	1	\N	Other
+0769055b-d73c-4fb4-ad33-e1be1700a579	1	\N	Other
+076e0fc6-2367-4fe3-80bd-4908d6b75606	1	James	Other
+076f1810-1834-4b65-be3d-9a94dd54f866	1	\N	Other
+0770da2c-6dcd-47c0-a4d5-29357f629a19	1	\N	Other
+077949f0-b1ce-4b16-a827-d1924478d370	1	\N	Other
+077c1691-448c-46e1-994d-f00fa6a821d8	1	\N	Other
+077d002b-92fc-45bd-9f80-5ec51358aa1a	1	\N	Other
+077d06c0-dee9-4d5f-aa5f-b23189ccf6e6	1	\N	Other
+077f6217-e161-4dd7-b588-a0c1f040717d	1	\N	Other
+0780b8a0-ee3d-4568-8598-f6ce7f134637	1	James	Other
+0788f00f-6c9f-4bb6-9b68-ae9bbe5173f7	1	\N	Other
+0788f2b0-1cff-45f4-9845-b7bf0257fc7c	1	\N	Other
+078d3ff0-bf21-46d1-b6e4-ab8f6c63139b	1	\N	Other
+078fbce4-e80c-4585-b2cf-984079414b9a	1	\N	Other
+079133ad-5028-4551-a365-5edc5d665e0d	1	\N	Other
+079186a4-e3c5-4bf3-803e-c8c4cdafeefc	1	\N	Other
+0791aef5-cf13-4775-aaf9-4e59497cdfb1	1	\N	Other
+0792d5ec-162f-4445-b47e-f360630ace41	1	\N	Other
+07942804-b478-4dd4-bbe8-b05d7ccbe0eb	1	\N	Other
+07976179-d96c-48f9-82eb-3cff7f397077	1	\N	Other
+07980d01-d9a7-4da9-a724-83bdb1813abf	1	\N	Other
+07983f78-100a-4482-ae42-fc4c2dca3c82	1	James	Other
+079ba040-2998-43d3-b92b-866a54106df8	1	\N	Other
+07a18010-2874-4816-be64-cc9ae564f523	1	James	Other
+07a2a72b-7c0f-4f05-a45e-3032a45ae987	1	\N	Other
+07a49b3f-3e8f-4fd5-96b0-9d0dcced8ba3	1	James	Other
+07ac2368-3ac4-499d-8317-a6168d43e271	1	\N	Other
+07ace670-191b-43e5-b38f-8a2e8b509eed	1	James	Other
+07ad0e13-2ff5-48b1-8d81-e8d2c0d3bf5c	1	James	Other
+07b78721-a6d7-4d5b-b6d9-2630b6b3e367	1	\N	Other
+07baa1d7-2479-4d60-932c-3ee013567567	1	\N	Other
+07bb8344-2b6f-468f-91d5-9eb694817d79	1	James	Other
+07bb8e1d-00e5-4e95-813d-9b1d47cb5b4a	1	\N	Other
+07bbc3b4-ff3d-43ec-a280-2cdbde8723ba	1	James	Other
+07c4964d-1cfe-4f15-bea1-c35b17940a61	1	James	Other
+07ca0939-fc94-4bb1-9d85-c327e724cc81	1	\N	Other
+07cfd5f0-0a0a-11e8-a6a1-fa163e8624cc	1	\N	Other
+07d38967-df12-48c0-a310-66697358aa06	1	\N	Other
+07d812dd-7e96-403d-b168-bbde2df4f7ee	1	\N	Other
+07d98012-375c-458b-84e1-945185e345bc	1	\N	Other
+07d98627-2418-44f0-8775-8244f6e3144e	1	\N	Other
+07dbd659-37ef-4f90-8a6e-43378db9dffd	1	James	Other
+07deb704-83cf-46bc-94ba-6f048dc6d67f	1	James	Other
+07e11559-1b62-4a3b-aa93-58c5c7d61d2e	1	\N	Other
+07e1a6aa-1535-4b08-ad36-fdd5f94b3e0b	1	\N	Other
+07e25c5b-cd08-41c0-944f-6169c837210f	1	\N	Other
+07e33fe1-c005-477c-af8a-1a58cc5ac7ee	1	\N	Other
+07e6fa91-5f6e-42b9-9451-2de9c02e2f00	1	\N	Other
+07e90830-d338-4170-92a1-29ae44d71b9c	1	James	Other
+07edd2f2-2403-4c5b-b882-21f3a282ec0b	1	James	Other
+07eddafe-4ee2-48f9-9aac-7d533e040c87	1	James	Other
+07ef9d94-1ce4-402a-8702-6c34828934ee	1	\N	Other
+07f19e95-9675-41a3-a2e7-40826ee39835	1	\N	Other
+07f6a16e-72da-4dc8-8c91-7eb6c2830884	1	\N	Other
+07f70bb8-be4c-4ef3-a5c0-2b9459f3c696	1	\N	Other
+07f8795e-8f67-4f8c-95c3-519934d0df6f	1	James	Other
+07f8d58f-3d3d-47ed-8018-4695ca7c34b9	1	\N	Other
+07fa5f03-810c-4ac7-8b45-1e8afc087cb5	1	\N	Other
+08011645-e714-4fdc-8952-85b894545462	1	\N	Other
+0809ba12-f02a-4151-8280-4e6796bb1c96	1	\N	Other
+080b6913-5bc3-418e-956c-ac74d4f22aa6	1	\N	Other
+080f426c-0a0a-11e8-95d4-fa163e8624cc	1	\N	Other
+0815522e-198b-4c3f-aa73-87b50b40bd12	1	\N	Other
+0815f7f4-e466-4166-9f02-6684026f7681	1	\N	Other
+081a7146-c317-4b4a-bb5c-dddba8faa8e2	1	\N	Other
+081ac3aa-45f6-4284-bf90-c4fdad28aeb1	1	James	Other
+081b4873-6d25-4b61-b5c4-31db38a18197	1	\N	Other
+081ec174-62f6-4a0b-8b38-76e9a8ff18e7	1	\N	Other
+081fbdc4-c60f-40d1-a9ab-3fec8e94321b	1	\N	Other
+08200dd3-a285-407c-bc4d-fd975c2d089f	1	James	Other
+08298af4-cd75-45f2-b650-c843d00eaa28	1	\N	Other
+082b222f-5b47-4f8d-965f-e0bf17562532	1	James	Other
+082e4d09-8c22-412e-acc6-d08f9b017042	1	\N	Other
+08354894-b779-46fc-8d1d-6130fab61813	1	\N	Other
+08356e2a-40df-4efb-b347-cb72938d1ca9	1	\N	Other
+08375dba-1ee6-4d88-884d-1c4e9cd4ee2e	1	\N	Other
+083dae8f-977d-4eb0-9fd3-bbd685de8315	1	\N	Other
+08402cfc-74a7-4a13-8935-f91530752fcd	1	James	Other
+08464840-8deb-4449-8a6a-1fd4514f43c1	1	\N	Other
+0847c1c4-d6f0-4d3b-b7fa-bd3e607e8383	1	James	Other
+084b7fd3-e793-44be-b63a-7feef01df8f7	1	James	Other
+084f7e9b-8ff8-45a4-b21a-a7803895914d	1	James	Other
+0851615a-5d78-4a02-91fb-c2aeb4361f41	1	\N	Other
+0855f8ce-7a32-454b-bad7-f0f2c85dd50a	1	\N	Other
+0856ae4c-ecf0-4e8a-8aa3-858fcd671308	1	James	Other
+085a9e0f-5470-44e4-b96c-5a74b2b25fce	1	\N	Other
+085e5c8d-57e1-4a47-a559-7f3697a5456c	1	James	Other
+08650485-efd6-4e59-b757-f9f64908d10a	1	\N	Other
+0865cb00-5000-4c15-8e04-195155dc8579	1	James	Other
+086b4c31-8206-4ad4-88e6-79c9267297b2	1	James	Other
+086c04c6-9323-4373-8ac3-e5e0667e91ed	1	James	Other
+086f75bc-e0e7-402e-8526-0a5c18f88de7	1	\N	Other
+0876f6a2-cbd7-420d-b12d-8b4202204ddd	1	\N	Other
+087a6496-a7ca-4f28-ba0a-54073d3a47c6	1	\N	Other
+087c8cdc-7ccf-4df7-bf26-9a7994e1ea27	1	\N	Other
+087fe20b-acd6-4531-9ed2-c9c742a02c66	1	James	Other
+088087e1-fad2-43b4-b61c-d87bac427922	1	\N	Other
+0883887e-8800-4628-b2de-44cae85a702e	1	James	Other
+0883e6e2-851f-4050-82e8-3cc65fa0465c	1	\N	Other
+08844d1b-517a-4146-a909-488569c83f26	1	\N	Other
+0888ad75-4972-4a92-9966-e444d3e35f18	1	\N	Other
+088a06ca-171a-4673-9cb2-aa9ef83e7bc3	1	\N	Other
+088a24cb-b120-4d41-95eb-9bbd38404a33	1	\N	Other
+0890bea6-2ddd-407d-8a94-72ee7234a2a2	1	James	Other
+089343ed-0196-47ac-87b7-e571e84d1dd1	1	\N	Other
+08979a9e-acee-4fea-bee0-3b077107e67d	1	\N	Other
+08981e9f-87a4-4339-98ed-b2c40b93f5a1	1	\N	Other
+089fd3cf-5bd6-4844-b691-6efeba686baa	1	\N	Other
+08a07350-8229-4e9b-88fe-6e3de887dca6	1	\N	Other
+08a159d4-0324-4ac0-b4c1-777416356dea	1	\N	Other
+08a35661-85d4-4be1-bde7-0553adb50b94	1	\N	Other
+08a7d8c4-7f1e-4e57-87cb-cf983c9d4243	1	James	Other
+08a8fef6-813f-45ef-99c3-bffb862c46d6	1	\N	Other
+08abcce7-feef-4787-ae89-b0c9fdf00217	1	\N	Other
+08ac1544-6db7-473c-9424-fc7bcf3ab8dc	1	\N	Other
+08aecb94-520a-494a-ad5a-3d8c0147e7fd	1	\N	Other
+08b4824a-dfdb-4e6c-b9f7-c4195e5e1c15	1	James	Other
+08b4867b-be5d-42e6-a369-782dda424952	1	\N	Other
+08b7caf5-a3bd-4493-b623-5eaeb74e8b35	1	James	Other
+08b925ba-7729-46b9-a184-bf3e85121545	1	James	Other
+08baca6d-b2fd-40dc-be12-1577c2b23f42	1	\N	Other
+08bba2d2-222e-4c48-9037-f97ef498c26b	1	\N	Other
+08bc1ede-9ee3-4654-a559-15c4267beb5e	1	\N	Other
+08be4d4b-6224-4309-b973-29950dfec9b7	1	\N	Other
+08c04e42-27d9-46a3-b93e-d724ec343eb2	1	\N	Other
+08c45196-cfa9-4573-b988-46b6f27dd04b	1	\N	Other
+08c54804-148e-45e8-a7ef-2fd45acc7f10	1	\N	Other
+08c60b71-682b-4962-951a-1ddf4406fc55	1	James	Other
+08ca000b-d07e-4e08-8ad1-041174ec8f51	1	\N	Other
+08cd8111-8dc0-47c8-851a-38f6a7db7367	1	\N	Other
+08ce33e5-4f08-4cc0-a770-67fef740f782	1	James	Other
+08cea296-5d8f-4a51-a54e-376667b1032a	1	\N	Other
+08d315a8-0ee6-11e8-8020-fa163e8624cc	1	\N	Other
+08d496b0-ee24-4b56-8302-b8f76097b15f	1	\N	Other
+08d4ae1d-370a-443a-8af9-109bf280b29a	1	\N	Other
+08d6e998-16a3-11e8-a732-fa163e8624cc	1	\N	Other
+08da9264-16a3-11e8-9d7e-fa163e8624cc	1	\N	Other
+08dcac15-7236-4a25-af3e-bd9ca1f58899	1	James	Other
+08e3650b-80b3-4f99-a1e2-f48f33cf0793	1	\N	Other
+08e3e74d-665e-4136-8781-ee4eb7f24f04	1	\N	Other
+08e3e8a6-4bd1-4cce-9dc7-13b59cf114a6	1	\N	Other
+08e539b1-4b6e-448f-832c-501deb549941	1	James	Other
+08e83468-840c-47ae-ac63-568c0b2c409b	1	\N	Other
+08e88d3b-5923-4596-b4fa-cd975c1f74e1	1	\N	Other
+08f0541e-5a43-4e8a-baee-a51d89ca3634	1	James	Other
+08f37ee7-118d-4042-8be4-da3e9dafd014	1	\N	Other
+08f47f30-16a3-11e8-887a-fa163e8624cc	1	\N	Other
+08fc7c0e-0ae8-4a91-9b26-fb885ce22c35	1	\N	Other
+0900abdb-94be-48f5-b9ad-4b703ebc7024	1	\N	Other
+09063f53-6f5b-404e-b459-89c73fda0ffa	1	\N	Other
+09065c3c-cfed-453c-b027-39e8e135afee	1	James	Other
+0907eb00-082f-42f4-9c21-8e8cd673b261	1	\N	Other
+09095cc0-4782-4706-896c-1088a577c962	1	\N	Other
+0909e4e7-d9d4-4e17-965c-09be0ca08d6f	1	James	Other
+090d7af2-fbd7-4185-a271-83d036d8025b	1	James	Other
+09132218-786a-4bdf-a409-738ba557d4b7	1	\N	Other
+0915f5ca-370f-41e7-a118-83939573b14b	1	\N	Other
+09169c24-0ee6-11e8-a7a6-fa163e8624cc	1	\N	Other
+0917bc42-0e8b-4a2c-a2e5-ac3dbcfdbf2f	1	\N	Other
+091bcf40-919e-432f-b62e-4ab0b96f7648	1	\N	Other
+091c6cf5-5373-4ff7-9da3-ef26de221820	1	\N	Other
+091dd244-9d84-48b2-9bc3-4bdc62ab3b11	1	James	Other
+091e4e2e-fae4-435a-a9a3-a1c47f462e7c	1	\N	Other
+091e8149-f519-4aca-a489-486e5c80bd5f	1	\N	Other
+091fbec0-7587-4b9d-b6fb-3de51eccfae5	1	\N	Other
+0925f3bc-c004-4537-948e-88c2f60b8986	1	James	Other
+0929643c-8857-4795-b2ae-2694bb0e6a43	1	\N	Other
+092a54ce-1fdc-4f97-8287-502ec07bd91e	1	\N	Other
+092d4e98-5a33-4011-91e2-b8c5cacf0254	1	\N	Other
+092d9737-3188-44ce-8060-d607df052d04	1	\N	Other
+092fbef3-9c3d-4ecc-aea9-a13e04e8de6d	1	\N	Other
+09328273-40fd-42c9-b804-0f87822f2a5c	1	James	Other
+093686a0-16a3-11e8-ab3d-fa163e8624cc	1	\N	Other
+0939dd74-5e40-487a-94be-48bcf3b9ab94	1	\N	Other
+093e09e7-09c3-47c5-a83b-42684d73df62	1	\N	Other
+093e5b9a-76e3-44c2-b513-4e021d297266	1	\N	Other
+093ecbea-cdd5-40b6-8834-6fa6716d6aeb	1	James	Other
+093fb848-0bf6-410c-b775-26e778d12b03	1	\N	Other
+09407900-d3f6-4dfc-9d38-57c56b54bbc4	1	\N	Other
+0943b55e-dcaa-4a72-94fb-cd0a46af191a	1	James	Other
+0944c436-16a3-11e8-9304-fa163e8624cc	1	\N	Other
+0949abb7-a559-4874-a3eb-361c957e9a1e	1	James	Other
+094a3240-16a3-11e8-9cbb-fa163e8624cc	1	\N	Other
+094fd3be-8ade-458f-ab5b-a34533d161a9	1	\N	Other
+094ff3bd-0f12-488a-beb5-06d9a67588c0	1	James	Other
+0950c96e-a246-4a2c-9782-f3598e5736d9	1	James	Other
+0954260d-5569-4416-b29e-82a6fee53fb6	1	\N	Other
+0959a670-a844-4a5a-9a7a-985ff24bd32b	1	\N	Other
+095a7efe-3712-4e66-accb-817fce69a2c1	1	James	Other
+095c5413-a5b9-4a09-a342-d522f7e580d7	1	\N	Other
+095cbfbb-8c84-4d7d-814f-a2e8edd7d718	1	\N	Other
+095cceaa-40a0-427a-a1bc-89c56a095cc4	1	\N	Other
+095f1fbe-e15c-48f7-806f-51c4a6d373d0	1	\N	Other
+095f59fe-381e-47e6-af57-60436cb8366a	1	James	Other
+09612d4a-bbe2-4daa-9c58-02054a62be2e	1	James	Other
+09636384-c456-4d3b-83e4-984909efb2b9	1	\N	Other
+0964d98a-ece0-41c7-a776-f340273ba548	1	\N	Other
+0966bb70-38b5-11e8-a5b0-fa163e8624cc	1	James	Other
+0966c39c-16a3-11e8-a413-fa163e8624cc	1	\N	Other
+09683d58-16a3-11e8-9c66-fa163e8624cc	1	\N	Other
+096849e1-c51a-4924-9a3e-92568538db8a	1	\N	Other
+0974d0ca-b287-11e7-ac6a-fa163e8624cc	1	James	Other
+0975be45-af19-4b9a-b527-f0c18b956121	1	\N	Other
+09766747-d86e-4019-9526-2ecf57cda4cc	1	\N	Other
+097b20da-44ae-4a38-9b7f-3c2b36efe24d	1	James	Other
+09869a8f-3611-4c66-bf73-e21ba008fe23	1	\N	Other
+0987aea8-aa41-4aa7-aaa5-ed2c795fd0f6	1	\N	Other
+098998a3-3b31-4088-b622-de076cbc634f	1	\N	Other
+0989fd14-6447-4cae-bdbd-cdde38edf87b	1	\N	Other
+098b0aae-2527-4fb2-a8d2-1172194948a3	1	James	Other
+098ba12f-345e-423f-84d4-b490cc2b5110	1	\N	Other
+098c1ff2-7a5f-443a-9fe1-9906727a11b0	1	James	Other
+0993b7b3-4bd0-494f-af9b-3688f7221cb7	1	\N	Other
+0994695a-4f00-4ffa-ae0e-aebfe5cd63bb	1	\N	Other
+09951206-9f5a-4f9f-b071-d11c1251136f	1	\N	Other
+09983310-3c1b-4dca-9d23-424085c585ed	1	\N	Other
+099a8a71-37c1-45e9-8ca3-ae4fbf897fd3	1	\N	Other
+099d6a16-cf76-4c8f-a967-ea54ae60f239	1	James	Other
+09a1e3a3-2c21-4203-82d0-9d6dfecdc2ee	1	\N	Other
+09a51490-87bd-4606-aeb2-ac277e9cb3cf	1	James	Other
+09a6b1e1-684d-4fca-8786-34ad4c359f86	1	\N	Other
+09a86fa2-fad6-4bde-8e9c-b8b06df44048	1	\N	Other
+09aa4d2d-d5b4-4d61-9f81-83b5b83b8854	1	\N	Other
+09afa080-c9ea-4205-a6a8-5233a81cb93a	1	\N	Other
+09b279b1-efdc-4ff2-9f0a-fbf5a8f940a1	1	\N	Other
+09b52c66-2ccb-4ebc-b5c7-0c3f262acecd	1	\N	Other
+09bc75be-a2ca-4d2a-9aef-e1aa392e88ec	1	\N	Other
+09be9b43-7449-46f4-9f1c-795a2287ade1	1	\N	Other
+09bf3a9a-324f-4652-95b8-a8a9220f5763	1	\N	Other
+09c21417-7bf9-4f46-8d32-ebcf88d5048a	1	\N	Other
+09c258b2-b705-4cd9-b865-fd5520cfab58	1	\N	Other
+09c79e2b-9ebe-4840-a8cf-024053971740	1	\N	Other
+09c874a8-81d4-4055-8c80-c5840bf71c20	1	\N	Other
+09ce58ca-0ea3-11e8-a75b-fa163e8624cc	1	\N	Other
+09d0bacf-5e3e-4306-8b9c-14bc220e9a94	1	James	Other
+09d42452-03cc-4288-acad-6c0622266069	1	\N	Other
+09d571a7-658f-456d-a452-c225021fc797	1	\N	Other
+09db214b-2ad5-4761-8a30-5a191e8687e0	1	James	Other
+09db3577-5f0b-467d-b942-b73a6e6c10bd	1	\N	Other
+09dbd423-62be-4c91-940f-407fa899c5ac	1	\N	Other
+09dbd807-412a-41d2-bba1-cdee4b85374b	1	\N	Other
+09df5c43-7d10-4c4b-8182-23f3e2a6b0c1	1	\N	Other
+09e4ea1b-71a5-488b-8db5-c3d5b922e495	1	James	Other
+09e81be5-ee28-40e0-b316-530fb5de34d3	1	\N	Other
+09e82600-354b-40b9-ab68-0a9c246b2138	1	\N	Other
+09e969fe-f1a3-4030-8485-e251728ed1bb	1	James	Other
+09ecd04d-989d-40cf-b650-8abc3a25539d	1	James	Other
+09f1d9d3-41b6-43b7-aca1-793dd3a4c8ac	1	\N	Other
+09f5b69c-76ad-40af-97b2-8aa8f37b5f4b	1	\N	Other
+09f63aad-714e-4ebf-bc05-385b88db47d7	1	\N	Other
+09f7bb8a-0730-4e12-be7f-7753c1b8ec0a	1	\N	Other
+09fb9213-fa03-4a62-8ca4-699811be45fa	1	\N	Other
+0a0062db-306e-4c9a-96ce-e42ff9185112	1	James	Other
+0a00d806-9045-40e9-afb9-a0ae14279089	1	\N	Other
+0a018433-a74f-4247-b1ac-0ecf41500b11	1	\N	Other
+0a028b0e-0ea3-11e8-8073-fa163e8624cc	1	\N	Other
+0a03dd87-ed36-4fed-9461-77b2b50855a2	1	\N	Other
+0a1035f2-a719-4fd5-99d4-b83a4acc7411	1	\N	Other
+0a10f09a-0ea3-11e8-a416-fa163e8624cc	1	\N	Other
+0a164bb2-2537-45d8-97e9-1b6ef513aac2	1	\N	Other
+0a1a0d58-28a0-473e-98e3-a181ea1c5101	1	\N	Other
+0a1c0705-4780-4f0f-86bb-81e80590df36	1	\N	Other
+0a1c356f-716c-46a8-bb5a-5a908c6189b8	1	\N	Other
+0a1fac8b-24b2-40cf-aba0-632aa566e9db	1	\N	Other
+0a21df2d-3e36-435c-80a4-209de546964f	1	\N	Other
+0a232915-ff83-46a2-8d60-eb9da7c19320	1	\N	Other
+0a235d76-ef25-43ea-822a-355c061700fd	1	\N	Other
+0a24a666-5266-45f0-96d6-897b2233c551	1	\N	Other
+0a399c34-0ea3-11e8-9ba6-fa163e8624cc	1	\N	Other
+0a3a1575-e96d-4c9f-bc71-9f236336f70a	1	\N	Other
+0a405f96-87c2-4a43-b3bc-4173280f3df4	1	\N	Other
+0a428e92-c59b-4c00-a5e2-45632b6991d5	1	\N	Other
+0a434087-9ba5-4b2f-9b62-d76097cabf63	1	\N	Other
+0a4a7036-3456-470c-bc54-79893a862efe	1	\N	Other
+0a4a9f60-7908-4aa0-84d3-0c77e6c82e8c	1	\N	Other
+0a4d96cc-359a-47a1-b97f-dbe9293c0632	1	\N	Other
+0a4d9ba3-c991-403e-9f6c-fe983d6420ef	1	\N	Other
+0a50c6af-28d2-4bd8-9801-b4c7db0e5860	1	\N	Other
+0a50da66-b579-42e2-8129-95d40f417976	1	\N	Other
+0a50f7a0-dee8-47ab-94b3-9c734dd53bfa	1	\N	Other
+0a532cec-790a-4287-9051-6f366d9544b3	1	\N	Other
+0a548992-31a8-46f3-891a-19403399732f	1	\N	Other
+0a56c683-6977-4ff5-8f02-8b3429bc0b75	1	\N	Other
+0a578827-8de2-48f2-95dd-ab9ac302d832	1	\N	Other
+0a58d9fc-82b7-4899-974c-f3488f7d6e22	1	James	Other
+0a596d2f-8ec0-4d4c-9adb-a9d16d7b7760	1	\N	Other
+0a5b9e8d-ce40-4214-bc1f-c7d1415213a1	1	James	Other
+0a5bd63c-7e76-44b5-a156-2ebe145a38cb	1	James	Other
+0a61c511-4732-45d8-8661-93d12d2ee77d	1	James	Other
+0a632e48-28d3-413b-9389-1b4cf32906f8	1	\N	Other
+0a6474e2-0ed3-4151-9530-fa7018fa409a	1	\N	Other
+0a65f23c-bc8b-421c-ba0f-9da802d9c81a	1	James	Other
+0a6d56c9-dbc9-4237-9d7a-5c57a7717c3a	1	\N	Other
+0a6dc546-c74f-43e0-9eb2-3ad4fa78c200	1	\N	Other
+0a6e348b-598e-48c1-9e0d-3d103609549f	1	\N	Other
+0a6e559d-f348-4ed4-9d3a-2e98641b0695	1	James	Other
+0a73e179-82bd-4155-b04b-7f898cb127b3	1	\N	Other
+0a76c836-d1ba-4d66-aa15-3c3bc4e7c05a	1	James	Other
+0a7ad143-f689-4afe-a7b1-8480b7691f8b	1	\N	Other
+0a7b9ac0-27cc-4430-a930-da993c107185	1	James	Other
+0a7dd419-ded0-4110-8755-7454f14fc4b8	1	\N	Other
+0a7ec50e-4411-4312-971f-2fdb8e1de3d2	1	\N	Other
+0a80fd29-78b8-47fd-a646-5db902027fcc	1	\N	Other
+0a832d03-321d-45a6-b658-e3438313d557	1	James	Other
+0a83c271-dcd4-44a1-b67b-1cfd2b83a1ba	1	James	Other
+0a846748-c3dc-45c8-99f4-a360edae626c	1	James	Other
+0a847b7f-62f4-4334-b64d-21c5e7f14f98	1	James	Other
+0a86d7ec-8e76-4262-9455-cd23210142aa	1	\N	Other
+0a87fec9-06a7-4fe2-abdd-6441e4633d35	1	\N	Other
+0a883c15-6949-413d-9321-f1a7cd14b84b	1	\N	Other
+0a89ea61-a8bb-4553-81a2-b8ff703cbc56	1	\N	Other
+0a8ad4c0-fe27-4d8c-ad9a-b76470004097	1	\N	Other
+0a8f1aa2-b99b-4981-9721-b5546e983e73	1	James	Other
+0a991ea2-7a71-447f-9df3-9e34f573239c	1	\N	Other
+0a9c24ac-2753-4a40-8d08-ff7f5550a84d	1	\N	Other
+0aa0beaa-9058-47a6-a152-3f7ddd6416b6	1	\N	Other
+0aa3a209-0a65-4819-88c8-65f8f08c1d7c	1	\N	Other
+0aad2f11-65b3-4ca3-9554-d14213b8d7c6	1	\N	Other
+0aaffa20-0dcf-11e8-8fca-fa163e8624cc	1	\N	Other
+0aaffaa0-47e5-4d32-9d24-317375b2c695	1	\N	Other
+0ab15f3e-cee2-4c15-851b-622bce11ffe1	1	James	Other
+0ab1b183-2c04-4fc9-8fdb-0c6db220ed5e	1	James	Other
+0ab1c7f2-e8c7-4626-8aa7-404600cb84be	1	\N	Other
+0ab1fdc4-f84b-4ca7-bcc3-778eb815700f	1	\N	Other
+0ab3f36d-df2b-467d-86f4-e0a20f4775d1	1	\N	Other
+0ab5bc27-7e1b-4bbb-b03c-bb96218b44d7	1	\N	Other
+0ab7a7c8-fd14-4363-8403-e55ef60f0582	1	James	Other
+0ab80af8-bbe2-4c25-8e60-e9c6547b1d89	1	\N	Other
+0ab80c88-ebf7-4b27-8698-1f336a0299ab	1	James	Other
+0aba19b8-ef8a-4227-9f7a-1c9a68b548c7	1	\N	Other
+0aba90de-9c60-4288-943e-b2eecb602d41	1	\N	Other
+0abac568-5756-43a0-a030-a96349f7cec4	1	\N	Other
+0abbf8d7-3086-4edf-bcee-d45aff65ecc9	1	\N	Other
+0abc95d8-9e7a-4571-859f-8f2fe5de7167	1	\N	Other
+0abdacd3-1aec-45f4-a96d-917abc3ccd09	1	\N	Other
+0abdd93b-6487-42cc-aca2-dddff14e8d8e	1	James	Other
+0ac42598-3c6c-40b6-a9a3-19ac20f14db1	1	\N	Other
+0ac9b54a-b16e-4afb-8eda-0bc740d4d36a	1	\N	Other
+0aca1d93-d532-4a85-871d-d7488518d2b8	1	\N	Other
+0ad149c0-5cbe-4708-b0dd-ba1b9ec78224	1	James	Other
+0ad1962a-0ca1-4163-9824-bf801274b1ff	1	James	Other
+0ad6143c-d299-43e1-b7df-ae4bc66f8833	1	\N	Other
+0ada6c79-c09e-4001-a4f3-63b00b52d25b	1	\N	Other
+0adc92a8-0c4b-4327-bce6-2c60014887ee	1	\N	Other
+0add6cec-0e68-49b2-a5f6-d8ac2c6aa1fc	1	\N	Other
+0adf0e7e-3249-4c30-9465-fa8f1d91e787	1	James	Other
+0adfd308-991a-4f59-b504-12207176581d	1	\N	Other
+0ae005c6-0dcf-11e8-8060-fa163e8624cc	1	\N	Other
+0ae3b255-fdb5-4fa7-8d96-4d254d6dbfde	1	\N	Other
+0ae74f77-582b-42e5-b552-ed28cd580fa2	1	\N	Other
+0aea0e78-d340-4f86-afdb-d0dc5da2dc14	1	\N	Other
+0aea9aa6-1ff8-4fec-94a6-26c0a21bcfc6	1	\N	Other
+0aedf63d-1a3f-419f-87a2-d9cf700cb25a	1	\N	Other
+0af347cd-9c8a-4849-9637-fc08f593790a	1	James	Other
+0af432b5-ba0b-4d8b-9966-38a8d1b3ca94	1	\N	Other
+0af4cd99-3b5a-4552-9ac7-57aae6567fcb	1	James	Other
+0af67c78-715f-495c-8f58-b1308a2a4ebf	1	\N	Other
+0afa1e69-148a-4de8-b39d-268785d1b90f	1	James	Other
+0afb35ba-7693-4356-b8ef-68d0e37ab047	1	\N	Other
+0b00f90b-e0a5-4c2c-9f97-81721ec6e1bc	1	\N	Other
+0b033fac-e4a4-475a-bdff-0f3dba442177	1	\N	Other
+0b06f43c-3a65-4fc0-8803-438ec2b3286e	1	\N	Other
+0b07bad9-e188-4678-b238-95a74bdd6863	1	\N	Other
+0b08f68c-2c6e-462d-ad50-df57bb774349	1	\N	Other
+0b0b50ba-57eb-40ab-8d21-95a240dd9a76	1	\N	Other
+0b1023e0-80cc-4cdc-8139-f7f99a7ce09d	1	\N	Other
+0b110be7-77de-465a-a869-2fcdc4283423	1	\N	Other
+0b111999-96c0-48b8-b289-83725cc8e7bb	1	James	Other
+0b124bcd-da07-4886-8cf7-4ac5fdd921b7	1	James	Other
+0b1520fb-1202-4470-bbf8-8fdfe1b60d86	1	\N	Other
+0b15e43d-bbbf-43e3-995e-99b36c87138a	1	\N	Other
+0b19fcff-3b77-4c99-96b5-3caf4e9c5cd4	1	\N	Other
+0b1c2e89-6bbb-4fe3-8238-91dd1b1af859	1	\N	Other
+0b1d5878-7423-41c0-b970-47c208a2e2f5	1	\N	Other
+0b1dce1b-c1b6-45c2-9cae-f1ba6ffacc6c	1	\N	Other
+0b1eb868-e048-48f7-9660-6facbdb67219	1	\N	Other
+0b1ec6e4-441c-4e51-a336-8386b1988d99	1	\N	Other
+0b2142fb-ee5b-4fe6-aeaf-4e8c10baeeb8	1	James	Other
+0b2b7010-d79e-447f-826b-93edace6f5ad	1	James	Other
+0b2bcfda-de6e-4120-9420-1a909a0d74c5	1	\N	Other
+0b2e10c4-baf9-453a-889a-2dc63685e446	1	\N	Other
+0b2e9355-196e-4b22-baa3-9b5712e2276b	1	\N	Other
+0b307af1-8b75-4485-b800-241881449a6c	1	James	Other
+0b349939-472e-4ff1-b95c-f61bad04e850	1	\N	Other
+0b3c617d-4521-49a5-b307-6b1d1a81b8e3	1	James	Other
+0b3d3be9-66da-4433-b0af-5b29b4f25bd3	1	James	Other
+0b44f04b-fa5e-4d75-816a-0d261a2bbe2e	1	James	Other
+0b4d6d90-14f3-405a-825c-73cca5571312	1	\N	Other
+0b5466cc-c6e9-4bda-a66c-8c69b0710f46	1	James	Other
+0b5684bd-8372-4661-a3c4-7eb4ba62096a	1	\N	Other
+0b5b7821-9371-46e9-8774-345e92f6bf13	1	\N	Other
+0b5bf7b0-789d-4aaa-8931-b6b43eb1c5dd	1	\N	Other
+0b5d82f1-2dc9-4c7c-b5b5-d5698dec9396	1	James	Other
+0b61f004-3690-4d77-9901-d7ac0620d848	1	James	Other
+0b6bea24-2c67-41fe-97d4-75e8723b39ff	1	\N	Other
+0b6c97c7-957c-4a9d-bdc2-31668f2e752e	1	\N	Other
+0b6f1561-33f3-4970-bc93-5113b4fff851	1	\N	Other
+0b711bb2-a871-43a4-922c-4c68370b9e35	1	\N	Other
+0b78d8e1-0742-446e-932a-7be73c64f7f2	1	\N	Other
+0b7b152e-6f8f-4d0c-b136-b1fc3eeb4186	1	James	Other
+0b7e0387-becc-499c-abfd-040fb8b2597b	1	James	Other
+0b7f45bc-9804-4897-832c-dd1489e75ddc	1	\N	Other
+0b82dca3-f95c-4f06-ba31-1be99411a7d2	1	James	Other
+0b83f986-36c1-45c0-8a52-d17c8495dce8	1	\N	Other
+0b85eba4-64a6-49c2-8402-73049dc90cd6	1	\N	Other
+0b8783ac-db0c-4517-adf3-4162fd365667	1	James	Other
+0b8dbf55-ad55-451a-a921-e361467735d0	1	James	Other
+0b8fdcc6-f0b5-4df2-a3bd-37ea5f77ed59	1	\N	Other
+0b900cf1-c879-4312-b997-4907198d5b93	1	\N	Other
+0b938571-b833-4a87-afc6-f6cc983db5dd	1	\N	Other
+0b939f39-e923-490e-9e57-650abc11c8c4	1	James	Other
+0b968855-71d2-4d23-b920-394555806b8e	1	James	Other
+0ba0529b-7d71-456e-9955-e76b6c0f27ae	1	\N	Other
+0ba59387-4427-49e1-aa8d-fbab360ef82b	1	\N	Other
+0bab2a6e-cf27-4537-b5a8-b93251be887e	1	\N	Other
+0bbc8473-ed05-4e6a-8e92-876b89d1a8ce	1	\N	Other
+0bc1eb5e-8950-45ca-b988-26a242673200	1	James	Other
+0bcb96e4-6906-4008-a318-b5e4ea6b2e76	1	\N	Other
+0bcd07b7-2595-4332-91d8-772bc326513f	1	\N	Other
+0bcda7c4-29d6-43a3-9797-d4e467eabd64	1	\N	Other
+0bcde6e1-b3f8-4f03-81a1-f85b15b05887	1	\N	Other
+0bce57a4-adf7-4c4e-8eb3-cc50aa90f337	1	\N	Other
+0bdb2c63-7d86-445a-915b-165662b259c4	1	\N	Other
+0bdd5d80-3dfe-417c-84bb-e6b94e362d04	1	\N	Other
+0bdeaa54-3843-409a-b6b2-a425bc7838eb	1	\N	Other
+0bdead9f-97f7-4b2e-a3aa-f8a859b5366b	1	\N	Other
+0be07a2e-616c-43f6-86da-dd3e24320320	1	\N	Other
+0be2cb79-e2e1-4ecc-9af6-7cdd6bc0d70e	1	\N	Other
+0be70757-0ad4-498d-9d77-e5789fb2df01	1	\N	Other
+0be796c1-112f-4e03-9544-40d0e8b224f3	1	\N	Other
+0be9107e-d34f-42e6-8477-51823dbf332b	1	James	Other
+0bebb5a9-5dee-4467-95de-aa144bbd9de9	1	\N	Other
+0beea0b0-361a-42a6-a9df-398892870cd8	1	\N	Other
+0bf468b4-d648-40a7-972d-f372fd4e8d81	1	\N	Other
+0bfd078a-e780-4ae1-8fea-2f4be4dc6ee6	1	\N	Other
+0bfe2225-af10-4e79-b5c2-c2ee2cfc8920	1	\N	Other
+0bfefa7a-82ed-4ed3-b61c-cc0e790b2e3e	1	\N	Other
+0c001bfc-1c01-480a-9109-3cd23da1445d	1	\N	Other
+0c0270bd-519e-439b-83d5-6ad914fd8d93	1	James	Other
+0c03339b-ecc0-4e21-88df-829660bafbb2	1	\N	Other
+0c033f97-62cb-4582-8645-b23ebea0b7ad	1	\N	Other
+0c069cbc-1017-4dcb-af56-ce7c235b17d8	1	James	Other
+0c095d94-8786-47df-a5c9-ba1fe24348c0	1	\N	Other
+0c09b84b-9ca5-4248-815a-83125d10ec8e	1	James	Other
+0c0aeb89-38aa-4767-8a30-514f38bfe02e	1	\N	Other
+0c0d2171-a67f-4338-a7e2-d0ed2d4ff0f9	1	\N	Other
+0c0da27d-c826-4d92-9b00-c93c2ec79e75	1	\N	Other
+0c1100fa-34e1-45d3-96ca-afd6023e6875	1	James	Other
+0c12c796-509a-43ea-bd1e-b84927418de7	1	\N	Other
+0c17a7ee-fd0d-4407-b192-21db14ce9307	1	James	Other
+0c17b285-4e06-4f1d-9d48-f8fc22b0c058	1	\N	Other
+0c190dd7-8018-42ce-8200-ef8ca060805d	1	\N	Other
+0c19a934-281c-42b1-b47d-3f03212184df	1	\N	Other
+0c1dd636-2a06-4b0a-8235-6f9bd2c3bbe2	1	James	Other
+0c1df0fc-f19a-4ed6-9d30-f354de731349	1	\N	Other
+0c1edc30-3f75-4ea1-86a7-09eeb6e44d5a	1	James	Other
+0c247a5b-3b85-4828-93b0-fcaf675ac094	1	James	Other
+0c25fa7b-b63f-4199-b58b-aa814ec51219	1	\N	Other
+0c26075f-512b-42e5-acea-9b62c57cf2dd	1	\N	Other
+0c29a4ca-1aec-4017-b6b2-6429d8b6f783	1	\N	Other
+0c2a44e9-db18-420a-a7b0-a53e9158bd21	1	\N	Other
+0c2cb5d2-2b3f-476c-9b93-089fbfdaf369	1	\N	Other
+0c31d428-9dca-4edc-89cc-4450544ecff8	1	James	Other
+0c366af1-29aa-4c4e-be01-b4905af5f699	1	James	Other
+0c37e9f6-a1c0-4634-9639-335738be6b64	1	\N	Other
+0c38967f-6ef4-4574-8035-d1bc3d2c5a38	1	James	Other
+0c3a32ae-263c-11e8-821d-fa163e8624cc	1	\N	Other
+0c3fb4ee-fef2-4dc7-a6b6-1d1c0e3cc5e8	1	James	Other
+0c4161c5-552d-4353-af46-5b1bd0371aff	1	James	Other
+0c4acec3-20b7-44a3-918d-5c8a0ff8bd09	1	\N	Other
+0c4c3e55-4d50-41fa-847f-7790cbcb2045	1	\N	Other
+0c53918c-fd0b-4a2d-a886-10fdb5e46898	1	\N	Other
+0c567205-12b5-4e74-b29a-032efbe1e796	1	\N	Other
+0c56b4bc-aefd-4420-a388-efdfcfc50fc2	1	\N	Other
+0c611ce9-c072-47dd-bff0-2b48ff3bbb60	1	\N	Other
+0c6848ff-7f8f-425a-b67c-8dde3c4fcd7d	1	James	Other
+0c6bc2c5-c9da-47d9-9dde-cae952cfccc6	1	\N	Other
+0c6ef5c4-44a5-497e-a1da-e3a920553937	1	\N	Other
+0c6f73cf-57b5-414f-b6c0-cbb8ee9ca8fb	1	\N	Other
+0c730c78-d31c-47c4-99a7-bd75f483b882	1	\N	Other
+0c736d22-e88e-4032-a772-81d879f7ee1a	1	James	Other
+0c767e97-30c9-461d-a187-008d64cffd2d	1	\N	Other
+0c7799ab-02c1-4654-98fb-5eaae0ef43a9	1	\N	Other
+0c7a6474-4952-4a7d-a7e3-4ef69e73acb1	1	\N	Other
+0c7c4a40-263c-11e8-a55e-fa163e8624cc	1	\N	Other
+0c857680-1b6f-4a90-8784-03c764b12eda	1	\N	Other
+0c870ec2-79f7-4d70-a763-91c64252b20e	1	\N	Other
+0c8c5fe1-1cb2-4883-9b9d-0e1a9e6b403c	1	\N	Other
+0c8e58fd-93ca-4eeb-a60b-43a182c3ab69	1	\N	Other
+0c90149e-511f-48c5-8b15-0038ea3ee2b0	1	\N	Other
+0c90d736-a61d-410c-9bd2-3088641dea69	1	\N	Other
+0c9366f3-e05d-4518-baf2-2cd8099ea516	1	\N	Other
+0c9523f4-8017-4c26-9efb-4b88670f8860	1	\N	Other
+0c97178c-6de6-4681-b8e8-49e7f6aa5606	1	\N	Other
+0c9918c7-1ac3-48de-92b9-eaf5523e74c9	1	\N	Other
+0c9b7813-d045-42bc-8f6a-a7a4314792de	1	\N	Other
+0c9d0cff-9b58-4397-9adb-f0ce225c40af	1	\N	Other
+0c9e5e42-f1d4-4aac-893f-95345d5922c7	1	\N	Other
+0c9fc607-c100-4c1b-81eb-e2d74ccf6ee0	1	James	Other
+0ca22044-d884-425a-bfdf-f1ccd798e982	1	James	Other
+0ca6b71e-3b37-4202-b299-a50caf1b1693	1	\N	Other
+0caef93f-990a-42c4-bf89-b8c11df7cfc7	1	\N	Other
+0caf80a8-0ddf-4196-9338-7680bae78ff2	1	\N	Other
+0cb3031d-7368-4ae6-afc5-ee64682a2791	1	\N	Other
+0cb3aa5d-60a8-4e06-abfb-6e0acde5de37	1	\N	Other
+0cb4bad4-eaea-4079-84d8-943c7cfad4bb	1	\N	Other
+0cb78489-a0e5-41ee-920e-20b0981f63c3	1	\N	Other
+0cba361a-2732-4a3b-b72f-c8f6242a780f	1	\N	Other
+0cbb027f-a9a2-418b-bf38-6c6c98d04798	1	James	Other
+0cbbd296-88e3-4946-9110-2bcfdd51e8f0	1	\N	Other
+0cbcd100-15ee-4100-aaa6-f4720cb043d4	1	\N	Other
+0cc0a335-cd6e-4a2e-8d7a-86ba0772d79e	1	\N	Other
+0cc31896-4bec-4aac-a5e6-2d8599a60952	1	\N	Other
+0cc83e89-b745-4a80-8815-a5bf4c2d4c80	1	James	Other
+0cc86e9c-5373-4e73-9646-2b760baa9d0d	1	\N	Other
+0cca3248-d685-4239-99b9-3162cee61fd0	1	\N	Other
+0cccf72f-328f-4ddf-9390-3264e4c10ec3	1	\N	Other
+0ccd752e-c4fa-447a-be1d-ff2c7554026b	1	\N	Other
+0cd06992-b2c9-44b4-99e7-a768e9d4c055	1	\N	Other
+0cd2aa64-d874-4055-bad2-2a289231b4f4	1	James	Other
+0cd3bd62-77cb-4b46-8be0-e93386e3b1ae	1	\N	Other
+0cd643f1-f381-4ed5-be94-d4f7d051b068	1	James	Other
+0cd88578-efd1-4e8c-b91a-963274ea88a3	1	\N	Other
+0cda752c-4f98-4615-a7cd-d30a6de38187	1	James	Other
+0cdb4d13-3d60-4b6d-baed-5774ade88739	1	\N	Other
+0cdb9e43-9af5-4534-98ce-d04ad77862cf	1	James	Other
+0cdd9f55-217f-42a9-9f79-957a3c0c5953	1	\N	Other
+0cdec6e4-910e-4f40-82c7-c99fd4f42abe	1	\N	Other
+0ce1628f-e4be-465b-aa98-a9fbabb57f7e	1	\N	Other
+0ce19960-393e-4f6d-8060-19e811bc9255	1	James	Other
+0ce4bc2c-f7cb-4ee3-a3b6-64bc11bf1a34	1	\N	Other
+0ce5eabd-ef5d-4e2d-9cf5-df956d4f4b23	1	\N	Other
+0ce668c0-ea1f-41cd-b403-92b198090f69	1	\N	Other
+0ced19f6-5077-41fa-ad9a-22f9952e5643	1	\N	Other
+0cee30b8-21a2-4211-8420-0da975760780	1	\N	Other
+0cf75262-f92b-46be-b581-ed7292e1d90f	1	\N	Other
+0cf9a8d1-5a0c-4d17-a902-d70c519f3727	1	\N	Other
+0cfb6333-a126-4fbf-a2ba-8ccaccc909e6	1	James	Other
+0cfdca6d-fe88-438e-8b9c-604fdf261b5b	1	\N	Other
+0cffc53b-0796-416e-9fd7-e92a5d161a58	1	James	Other
+0cffdd56-1b3e-484b-b3f8-a6ec20fceb27	1	\N	Other
+0cfff5f4-a43b-42c8-818a-ba33c55f505c	1	\N	Other
+0d018f80-8de2-426b-903e-93e3e603b551	1	James	Other
+0d02cfb0-57a0-4864-be57-1b9ab8d39393	1	\N	Other
+0d053f21-1059-4826-82be-24defc30a30f	1	\N	Other
+0d0e39d9-e445-438b-9305-dc9f1addf3ea	1	\N	Other
+0d11edc8-7f8d-4874-be0f-137cd17aa3b6	1	\N	Other
+0d138bb7-022f-42ae-9997-b3f8de2d7157	1	\N	Other
+0d154e43-72f7-4296-9be5-e30640aff3f6	1	\N	Other
+0d1a670c-3a38-48c5-8d3f-17a4138af889	1	\N	Other
+0d1b8506-a655-4330-84d5-fe546edb34e1	1	\N	Other
+0d1fa3d3-92cf-468d-a71e-97633a2ea55a	1	\N	Other
+0d2687fe-78f1-48e8-9095-e31af0a993a7	1	\N	Other
+0d29ddd2-b63b-4255-bf55-6d8a37149f25	1	\N	Other
+0d33a66b-735f-4ddd-ba1b-4b31646dde8d	1	\N	Other
+0d394ec9-7558-40e8-bfdb-2156c402babd	1	\N	Other
+0d3ca6b3-7354-4046-909b-818a63e8e447	1	\N	Other
+0d3d62a1-72e8-49f2-a339-b1ac66d905b5	1	\N	Other
+0d3dd0de-bcb9-49f3-9bc0-3897c450c47a	1	\N	Other
+0d3ddc6f-211d-478d-9ee8-e3879face5fb	1	\N	Other
+0d40fdd7-dfb4-4a0f-acc9-21c4cda687e5	1	\N	Other
+0d43afa3-8c46-4716-a9bb-1867eaa56f76	1	James	Other
+0d492116-4ba3-42e6-b327-610763b2e0a1	1	\N	Other
+0d4a5353-783e-4000-ad4f-6cd6b1585a6c	1	\N	Other
+0d4a5633-0739-4296-a4e3-62e4457c1d4c	1	James	Other
+0d4ac6c0-b4a1-4022-8dd6-fe7d20fd76d4	1	\N	Other
+0d4e101e-a7e3-4cc7-afd0-ff2f3eb3ae57	1	James	Other
+0d50645c-9765-45ee-994f-43e483df2091	1	James	Other
+0d528caf-4829-45a0-aa1f-1b9d3168a76c	1	\N	Other
+0d53de7f-9ac0-48cf-b3bc-beec41014808	1	\N	Other
+0d5559b2-6b2e-4d19-8731-a5e77684d141	1	\N	Other
+0d59b57d-c1de-456b-8793-a1795b75ea2e	1	\N	Other
+0d5bee6a-70a3-476b-9d50-729c52803ef5	1	\N	Other
+0d63b3a1-31d6-483f-a66f-58f310594df2	1	\N	Other
+0d66b8f6-5ee9-4f84-9955-7df4d3f21454	1	James	Other
+0d684920-35b4-4433-8ca3-2c694e2d45a7	1	\N	Other
+0d6a3048-22ca-47f3-a55c-12fffc2e2ae8	1	\N	Other
+0d6d8b6d-0a5a-468d-8d03-1d4e6ce67af3	1	James	Other
+0d712472-1eb5-4c22-af60-38d234e0b1e8	1	James	Other
+0d726877-7c5f-482a-ae75-6ce3dc0d9261	1	\N	Other
+0d738043-661c-4765-ac74-720fe9a89dd5	1	James	Other
+0d77fefa-62d4-4eec-bf58-dc77ffd1a65c	1	\N	Other
+0d79f77d-6fc1-468d-ab7f-5931a1994a66	1	\N	Other
+0d7c9e7d-ffa0-4f08-b517-d0f30693327a	1	\N	Other
+0d7f59d3-53cf-4001-8294-9bfc1698db56	1	\N	Other
+0d83c3e4-f7a4-4b6a-b707-99a8fc088295	1	\N	Other
+0d864453-82d5-4a0e-9ee6-a85f7b5ae4fc	1	\N	Other
+0d8ab856-d005-4d31-92f0-4d44ea71af8f	1	\N	Other
+0d8d1c1c-0ffe-4bcb-81fc-3b44d9aec32b	1	\N	Other
+0d901304-364f-40fe-8e10-c5a36fe0a383	1	\N	Other
+0d919f62-cd24-4b95-a717-971f847ce8f6	1	James	Other
+0d934bab-b50f-4dcb-88f3-aee23e531eba	1	James	Other
+0d948769-d6b6-4d52-9377-22e78d458a21	1	\N	Other
+0d95f0c2-666a-4a4d-8672-cd31b74e8d1b	1	\N	Other
+0d970754-f876-4e21-977b-54b4faf4a363	1	\N	Other
+0d98f3f5-f631-4cc9-a50b-a8ec943ec93e	1	\N	Other
+0d9a3028-3a69-40ed-8e6a-2705d7c56198	1	James	Other
+0d9b5ee0-bd64-47d0-a2b6-d5e0ca420a13	1	James	Other
+0d9f360a-7aa8-423a-a9bc-be243c39919c	1	\N	Other
+0da16d30-4f39-4727-9beb-380bedc1b3f3	1	\N	Other
+0da6f4be-8622-4f5f-bcee-0608bd48fbc2	1	\N	Other
+0da75b82-e558-4e78-b5a5-29f6425c2e15	1	\N	Other
+0da8e7e6-8b0f-4cee-ad92-97438b15a524	1	\N	Other
+0dae588b-e9c8-4080-a8f0-b21828873886	1	\N	Other
+0db963de-c8ee-4540-bcd0-630ac8ffd85e	1	\N	Other
+0dbbf34a-9fbf-448c-8195-9a49833beda2	1	\N	Other
+0dbc0d85-03bd-446f-b86c-e67bb5f73c1b	1	James	Other
+0dbeb503-b7e0-46ba-bf1c-00a14c100310	1	\N	Other
+0dbf2526-d07d-4efd-a253-580429432c07	1	James	Other
+0dc191a7-7003-4a52-8092-2fc052c40f1c	1	James	Other
+0dc54340-0fec-4881-b4aa-e833579c4ce3	1	\N	Other
+0dc676c0-943e-4fa9-b3e0-82d22f4b1dd6	1	\N	Other
+0dc8347b-9d52-4f01-b85a-a86c2165a322	1	James	Other
+0dce80e3-536c-4057-927c-494ef303289c	1	James	Other
+0dd28cbf-3473-48d4-a0a5-c5bcd58a8af0	1	\N	Other
+0dd388e5-40b6-4482-b40a-709b5731f653	1	\N	Other
+0dd6c50a-b57e-4e7c-9aa4-3efd79fc523c	1	\N	Other
+0dd7aebb-0c92-4c6e-8db3-e98548881897	1	James	Other
+0dd853fe-7af5-4299-81c8-ee8105980796	1	\N	Other
+0dd9312c-59a9-4772-a133-7f35554ad385	1	James	Other
+0de01ac7-7d78-4c37-986d-f9c1142ca7aa	1	James	Other
+0de1a1f6-cc61-44df-a774-fcd8c6c1298f	1	\N	Other
+0de2393e-52be-4c3f-8eac-c5b221eeffea	1	\N	Other
+0de45290-6c70-4ed6-8536-1684e0af43b4	1	\N	Other
+0de8ef7d-228f-4c20-9081-1eaa9ca8fb38	1	\N	Other
+0de8fd1f-31f1-49fa-afe5-bc8a8f048be5	1	\N	Other
+0dea76e2-90fd-49af-a92d-57b1af9469f3	1	James	Other
+0dee76c5-585e-4183-9ff8-ab3d666cdcd6	1	James	Other
+0df175a4-9a2e-40cb-b4d0-19d61a4875c7	1	\N	Other
+0df1fce2-d201-41c5-8726-d3390618f3e7	1	\N	Other
+0df4b153-a061-4795-9fdd-e7f91636f058	1	James	Other
+0df683e0-5dee-4eae-a603-714a9d59b64e	1	\N	Other
+0dff5f1f-5e00-4729-b265-8b9f0256382d	1	\N	Other
+0e00d6f0-8dee-4b21-b834-3657001cbfd2	1	James	Other
+0e011f23-a1ab-46d6-87e4-ee61453db9d2	1	James	Other
+0e065a17-1832-4854-ac17-54928537c5ef	1	James	Other
+0e080755-883d-48bc-9520-28b8d0ecd688	1	\N	Other
+0e0927eb-a4bf-44ba-a674-44fd64026d16	1	\N	Other
+0e096e1b-5a6d-434b-9238-fca00d566f50	1	\N	Other
+0e0ac399-253b-48ee-8734-07d456c23435	1	James	Other
+0e0ed941-45f9-450e-b091-62f2766880ff	1	\N	Other
+0e1a03f7-66f7-4b9f-b959-209d67d6b49b	1	\N	Other
+0e1a5464-2531-4a6e-bfaf-e2ec5c2e2202	1	James	Other
+0e1d5865-b212-4437-a82b-77ca160b5488	1	\N	Other
+0e1dc834-1868-49e9-8de0-6210412204fb	1	\N	Other
+0e1e93f6-ca8d-4a91-8748-2b2ecee406a9	1	\N	Other
+0e1fa0fd-6b9d-49c4-9af3-e21aebef63fc	1	\N	Other
+0e260cb2-6e02-45ed-8d72-a8b984328fb6	1	\N	Other
+0e2ce042-857a-478f-87c5-bc686b82cd33	1	James	Other
+0e2e06e8-dbc7-4e28-83c3-6a0584d51056	1	\N	Other
+0e327ceb-fc90-4939-b46a-0df6eaa59440	1	\N	Other
+0e35ba88-a014-43ef-994c-aabfc308975b	1	\N	Other
+0e395081-9b5b-4e3a-9855-0e0599c4d78a	1	\N	Other
+0e3a39bf-42ad-4bc5-9577-84e4d45551d1	1	\N	Other
+0e40ca7d-969a-4d49-8688-1e085d711551	1	\N	Other
+0e435ed8-f871-4c04-a57d-5f51d3f1edb6	1	James	Other
+0e444792-7b56-4b79-967f-21dc5586d605	1	James	Other
+0e48066d-cd72-491d-a28f-1226288b692b	1	\N	Other
+0e4818cb-901d-482c-9255-c53a0cfa0631	1	\N	Other
+0e483fa8-3482-4c49-8ddd-7acfca9b4e9c	1	James	Other
+0e49aec6-8cf8-4282-9d2d-dd2d2912cc40	1	James	Other
+0e4b58ec-eb37-41c1-8b00-aa068d88e0ef	1	\N	Other
+0e4cecef-504c-40a9-b5ef-d226885f4b4f	1	James	Other
+0e51cda9-2558-4622-adb5-f7feb68980a8	1	\N	Other
+0e53314f-9fa3-40a1-a52e-36ec612dd0a6	1	\N	Other
+0e559945-68b2-48fd-8654-7579083c8a44	1	James	Other
+0e577dce-a715-4f1b-9832-92c631369e9c	1	\N	Other
+0e5a1fd0-bafe-44ff-b80e-551639148605	1	James	Other
+0e5d067e-17d9-4af3-aed2-3c6a34c60774	1	James	Other
+0e5d2005-77bf-44f7-935e-c095effef640	1	James	Other
+0e5e4b6f-3a32-4022-9402-17cfe92b4244	1	\N	Other
+0e60676a-2b49-4ff9-8cb3-c5b1720abcbc	1	\N	Other
+0e6338d1-472c-48ff-855e-766e4befedb4	1	\N	Other
+0e6a4474-9703-11e7-bb28-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+0e6dd60c-887d-42d8-b7c3-2fdcfd793743	1	James	Other
+0e6f952d-1858-426c-9b9f-fe2c37bbfaba	1	James	Other
+0e7183ea-0506-4aa1-a096-1fa3066b17ff	1	\N	Other
+0e743cb4-89e1-49c2-b25e-5667011534fe	1	James	Other
+0e750880-a5cd-4256-b88a-b1a0e6fa746d	1	\N	Other
+0e77bd2f-a312-408a-b144-4dd13c72a341	1	\N	Other
+0e781716-37d5-4212-8a37-9aed02f1411d	1	James	Other
+0e79da58-11f7-4f9b-a7cb-af3660387955	1	James	Other
+0e7a6d16-a91e-458f-b15d-9b693774cc8a	1	\N	Other
+0e7c2c1f-03c2-473e-9aad-6ad62a6610ff	1	\N	Other
+0e7db127-de34-4723-a69b-a31c697be367	1	\N	Other
+0e8627a7-ae9d-4b0a-85bf-2f38f4bd6bd6	1	\N	Other
+0e876013-c79e-4893-b077-a2e1a381c4b9	1	\N	Other
+0e915a91-ebba-4c9f-93a9-7506ab6bab08	1	James	Other
+0e98fe14-b59b-4b4a-a844-21693ad22326	1	James	Other
+0e99aed0-cdf6-48e0-9332-cb3891d5361d	1	\N	Other
+0e9b93b0-fba4-45a5-a36f-89bcd9ac402e	1	\N	Other
+0e9cc6b8-1049-4f2a-b940-e023e3c568d6	1	\N	Other
+0e9eb624-f580-4f4a-bb22-317493fc3d9c	1	\N	Other
+0ea06984-bd27-4e31-9bbd-6058115bb63e	1	James	Other
+0ea43995-33be-4e29-81a2-4d430653a219	1	\N	Other
+0ea76040-522f-46e0-84e1-7fa172f60a75	1	\N	Other
+0ea7d505-f8ca-4ef1-be4a-784905a2bb57	1	James	Other
+0eaad4fe-fdbf-4602-a21d-e5d0f4374d24	1	\N	Other
+0eadcc1a-88e9-41a7-9c1f-9b6c0941c928	1	\N	Other
+0eae6f5e-46e1-48c5-ad52-9696d54635c9	1	James	Other
+0eb4bd6b-a9f8-4793-85d8-64832344b7c3	1	James	Other
+0eb742fe-bc7d-4d57-bf4a-264daa8b030f	1	\N	Other
+0eb798c2-397e-4e5f-a058-ffb257466d09	1	\N	Other
+0eb80e07-f294-4527-b6a1-1e7fe7bc8417	1	\N	Other
+0ebdb98c-ea18-4d5f-98f3-5aa8cf2fbc41	1	\N	Other
+0ec4415f-7973-4b9b-a9a5-afbd69fd046f	1	James	Other
+0ec707db-688b-42e5-bea3-110d8b2922ed	1	James	Other
+0ecd48c0-6c6a-407e-ba5f-2daefbcad756	1	\N	Other
+0eceb18e-a465-4952-ae56-9a125df4f936	1	\N	Other
+0ed2bd21-60cc-4179-8f79-a87b5f8833e3	1	\N	Other
+0ed3cf79-ab90-4055-bd36-7a58988e743e	1	James	Other
+0ed5a867-2cdc-4cd4-9ecb-4908e8b388a4	1	\N	Other
+0ed7d007-98f0-4b2a-8a1e-5968e765ec31	1	\N	Other
+0ed89aae-3461-4388-816c-57b7ca73b12d	1	\N	Other
+0ed9e705-e4a2-40e1-a6b8-7fb8c217e298	1	\N	Other
+0eda8a87-a5fe-4e63-bfdc-24f283e07a50	1	\N	Other
+0edcbbbd-804f-4b14-a25a-78db5d0622f3	1	James	Other
+0eddc08e-be39-4e13-980a-b81c82680d23	1	James	Other
+0eddc592-dee4-4ebd-bf99-1c233a82169a	1	\N	Other
+0ede46af-1f03-47bb-9e0e-06d788103dcc	1	\N	Other
+0ee69259-199b-4a0c-a50e-8cff92b5c74e	1	\N	Other
+0eea9fc7-3a80-4af7-ac59-139a281958d8	1	James	Other
+0eeaf3de-c265-421a-9fa9-683d9120a2e5	1	James	Other
+0eec389a-f3ad-49c8-a0bf-57e9d1d1eeb2	1	\N	Other
+0eef2196-63d4-4076-a76f-7b18256ce26d	1	James	Other
+0eef8785-902a-4e59-9ef3-ab5ea1084916	1	James	Other
+0ef1599a-4fc5-4558-86b0-cdb0768dbbde	1	\N	Other
+0ef1e90d-013f-4c0b-a215-fe2382b2a626	1	\N	Other
+0ef2718b-d031-4f17-8749-52c8a00d5c3a	1	\N	Other
+0ef5fa28-cc69-45e5-8f64-9aa82485502d	1	James	Other
+0ef5fbf0-c21e-43fe-9f50-10771210bfd9	1	\N	Other
+0ef78e72-a4f6-4ffc-be0c-33a1ca476587	1	James	Other
+0efc5f3b-afc8-44ee-908c-29a99c9c2099	1	\N	Other
+0efee260-5edf-4a2b-b57a-23ca9ce70363	1	James	Other
+0f028e94-f711-45cd-98fe-1e3bc180e90c	1	\N	Other
+0f040be4-896b-486e-9f19-48b8981276f5	1	\N	Other
+0f057b32-3010-4eb6-9160-923122b791f4	1	James	Other
+0f0ea716-945c-4841-b674-ab8fa77a2114	1	James	Other
+0f1382fb-a604-4190-93d7-ce2790a276d7	1	James	Other
+0f19eb8b-5bfe-44c9-9c9f-87019edc53da	1	\N	Other
+0f1a843b-489d-4abd-9522-d3244d178692	1	\N	Other
+0f1b2a8c-dcfc-4d20-abe4-818c0ca61e46	1	\N	Other
+0f2058b6-6f75-48de-ae11-3a01cf00fcd4	1	James	Other
+0f221ca8-0b2b-4b86-9201-91d5191a836f	1	\N	Other
+0f26fa21-d26a-401f-8d71-8a265a472589	1	James	Other
+0f27fdd9-27b0-49d8-b142-240a426f7e85	1	James	Other
+0f2a0005-3ca7-42f0-a47c-150fa193b0df	1	\N	Other
+0f2a090d-2854-49dd-8dde-6665760a7788	1	\N	Other
+0f2a1511-952a-4069-997c-cc00ea029d9b	1	\N	Other
+0f2c82b2-1210-4cd9-9c2e-4dd9c82c8b88	1	\N	Other
+0f325260-0dfe-4edd-bca9-0cb5b9f3663e	1	James	Other
+0f336550-2102-40b5-8ab1-b57c7b3bdc03	1	\N	Other
+0f3446dc-3f58-4938-a146-2cd943eca940	1	\N	Other
+0f34ae32-64a5-46c5-91c7-d97835b77780	1	James	Other
+0f352c3a-c259-4790-aee5-075c81c7735d	1	James	Other
+0f36434b-4ef8-488a-9d5f-a62c204b3ca3	1	\N	Other
+0f3adc98-eafe-4c8f-89c3-bb38ef9e4b29	1	James	Other
+0f3c236c-9ce4-41dd-86e3-932e4b82b897	1	\N	Other
+0f4171ed-fec3-4718-ab49-749dd7c72209	1	\N	Other
+0f464ace-9cea-4a70-8c94-9ddceb257755	1	\N	Other
+0f47d87e-484b-4eb2-82e9-95ddd54e6de6	1	James	Other
+0f4ab77e-35fd-4c2e-97ec-1fa64a6455e4	1	\N	Other
+0f4b05db-b112-4196-b97a-2fca0d79978c	1	\N	Other
+0f4bbb8c-45a6-48df-8f1e-a60e26d303e8	1	\N	Other
+0f4d4364-e045-4738-a2fe-4e464edb91e8	1	\N	Other
+0f4e70e6-0389-4eed-b8fc-443255e23bad	1	James	Other
+0f508320-cfb2-4232-ad70-f3ea8216e666	1	James	Other
+0f50a4c0-f6d9-4c24-ba44-24bf7da46c35	1	\N	Other
+0f51f0d2-f575-4238-8e46-482b296896e1	1	James	Other
+0f52f21d-735e-4839-8acd-1bbe1d3fc5a8	1	James	Other
+0f5826e6-7914-4be8-b324-5f3c84823aea	1	James	Other
+0f5b7b71-da3a-476a-8dbb-ccfc1a25bf63	1	\N	Other
+0f5c2c76-a0e3-4648-8917-a366a4e3478f	1	\N	Other
+0f650dcd-d51b-4a5a-ba8c-bd0bff55652d	1	\N	Other
+0f654833-c8fe-44a1-958a-ec2b76af3b07	1	\N	Other
+0f664fcf-78b8-497a-b6bc-d3d753037132	1	\N	Other
+0f6bb70e-cb5b-48f8-a247-17bf9defc58a	1	\N	Other
+0f6fb1ca-f29e-470a-8a30-a2059f5a778c	1	James	Other
+0f70dba3-c120-4511-9843-69530336cb58	1	\N	Other
+0f714477-442d-4c8d-8f93-60d20266d9a1	1	\N	Other
+0f765d6a-b829-4bdb-93c8-db1f7c4b18bd	1	\N	Other
+0f79de65-6a4b-4088-83e9-0c8a0127a119	1	James	Other
+0f7a5106-0f84-4c05-98a4-76b7f166c986	1	James	Other
+0f7bc8c9-948d-4513-8d65-94ad4c077f58	1	\N	Other
+0f7f149a-dae9-4fb3-9368-1e24f28c97da	1	James	Other
+0f82faeb-abfb-4849-8964-b14b5d5c1cf8	1	\N	Other
+0f887897-0450-4b00-b2c6-7dad82856f49	1	\N	Other
+0f8a9b4b-35e6-4362-a5af-b158467a51f0	1	\N	Other
+0f903237-98d7-4fcb-bf3b-a9973fd36f4e	1	\N	Other
+0f925d4d-e78d-4fe5-9d6c-13300339c6b2	1	James	Other
+0f93dee5-c2b0-463e-99fc-ec98d1e973fc	1	James	Other
+0f977180-e8b2-41f1-bb2e-2c4a687e04d2	1	\N	Other
+0f9d9349-0392-43ac-a9e0-9d9c19762b6b	1	James	Other
+0fa10af3-babf-492d-98f1-d3dc12d26056	1	James	Other
+0fa6336f-b90c-4ad9-8983-fd5034381dc7	1	\N	Other
+0fa714c5-42f6-44a3-b446-aef994237f60	1	\N	Other
+0fafd8be-5136-4b71-9a65-66948e3ac8fd	1	James	Other
+0fb668b1-0f73-48b8-9cb2-e9167f1a997e	1	James	Other
+0fb7c9d1-fba6-4114-84ca-310b032aa40a	1	\N	Other
+0fbe70ee-4a1f-4c88-a260-20ad2a6c98f8	1	\N	Other
+0fbf267c-7f8f-4ff7-b393-3b59de0abbbd	1	\N	Other
+0fbf8403-8d62-496d-a67b-082416baa4d0	1	\N	Other
+0fc24bd8-311b-4b2f-b89f-04d01d45e28c	1	\N	Other
+0fc69ecf-9a8a-4ea7-b51a-f75363d80cc6	1	James	Other
+0fcae876-6481-4366-b08d-f0dc5e891a0f	1	\N	Other
+0fcb7e35-1ea3-4c14-872a-9b9134d801df	1	\N	Other
+0fd4d8ca-78f2-4b1b-b0ca-54c021d5b92d	1	\N	Other
+0fd4d8f0-e77a-4990-aec8-406898fd0082	1	James	Other
+0fd8b8d6-e5e4-4f52-a261-caadc923d167	1	James	Other
+0fd95ae8-4766-443f-8c29-714e495db99c	1	\N	Other
+0fe07ecc-0e9b-4553-b7dd-3a34f32bcf79	1	James	Other
+0fe784ee-9b0f-4775-be51-c4d1b43669c4	1	\N	Other
+0fe9367b-18ab-40e2-98e0-8ece7c2fc8b9	1	\N	Other
+0fed0e2d-d091-48b2-b3a1-dc28c4d26a86	1	\N	Other
+0ff024cf-0e3e-42b2-9207-c8359337a873	1	\N	Other
+0ff3bea3-b509-4553-9296-1bb2021f4982	1	James	Other
+0ff7c680-80a1-4f77-9d52-d1ec2be9cf40	1	\N	Other
+0ffe8b5d-a241-486b-b572-5f5c22d4da58	1	\N	Other
+10024212-6bb7-4936-834e-b2c5494c79df	1	James	Other
+1003f16e-9d1a-4812-8b78-03d02ab43b75	1	\N	Other
+100b79a5-4be1-4542-8b12-1d5ba5aefac6	1	\N	Other
+100bc7d0-25dd-456f-8834-2fb6adf4bc6b	1	\N	Other
+1010063f-ac4b-448a-9c8b-05d4527d6295	1	\N	Other
+10185937-2359-4b82-93f0-96f3cb157ed5	1	\N	Other
+1018c920-1ac6-4839-94c9-2fa4e5a5b491	1	\N	Other
+101af3c7-841f-4849-9f12-560125843aaf	1	James	Other
+10205ca2-9ad2-4974-8c32-c05708b744a7	1	James	Other
+10260d7c-e0d8-47ac-970b-07b2312c6c21	1	\N	Other
+1028eb13-a868-48ef-be90-c43258314d78	1	\N	Other
+10327dea-3e43-4e38-9f86-e2199d351a4d	1	\N	Other
+10389b34-881d-433c-9914-efb391dbcdc3	1	\N	Other
+103fe6be-dac8-4121-9718-694a0272c493	1	\N	Other
+1044755e-878f-4e13-b90c-d794c577f566	1	James	Other
+104b6c0e-af55-4b64-8394-04c6d38410b1	1	\N	Other
+104be3a3-4282-493a-8caa-290bc53e14cc	1	\N	Other
+104eecfe-3185-4d3e-aebf-f3992644e42f	1	\N	Other
+104f8ea3-5f9f-4510-8e47-7b08748489f7	1	\N	Other
+1057b65b-eb38-4bfa-8fc9-f333f3ae822c	1	\N	Other
+1057d2eb-519e-4e45-8d4d-096f4699a6e6	1	\N	Other
+105d70de-46cd-47be-8e49-ff8ee31b12eb	1	\N	Other
+10618805-cbf1-4ebb-bc69-edd90cc2595b	1	\N	Other
+10650954-f33b-4feb-bb99-af15541688de	1	James	Other
+106ca2a4-ad02-44aa-b4a1-19285f8b0030	1	\N	Other
+1075a95e-c49c-40b1-83df-a582156b1a96	1	\N	Other
+1077c5ef-a090-4d51-992f-180be10beb71	1	\N	Other
+10788d38-42b8-4521-b427-a89dc629bec1	1	\N	Other
+107af7f6-02ec-404d-a1eb-920aae828431	1	\N	Other
+107f7d93-1cf3-420a-9ebe-77b739517061	1	\N	Other
+1081481d-4bf3-43ab-b705-5c72f2c50e1b	1	\N	Other
+10845ea2-93ef-42eb-bf6f-b7226db86e9e	1	\N	Other
+1087ebd9-ece0-44c8-81ab-5e625ae69584	1	\N	Other
+10880535-bace-4dbb-b5af-fc55fea01f5c	1	\N	Other
+1088bad5-bcf3-4815-903b-2945addc5d45	1	\N	Other
+108b780b-87ff-4890-b2c0-10ab12106fb4	1	\N	Other
+109217eb-e3ca-4183-8f2d-0355edab1e70	1	\N	Other
+1093ddff-6419-41e6-a263-8eacbf24b648	1	\N	Other
+109d6c4b-955f-4400-855d-fca79d91bb08	1	\N	Other
+10a10213-eeb6-498c-8444-8dc13c4109d4	1	\N	Other
+10a27359-f980-4585-a8b5-1b3254f0b4bb	1	\N	Other
+10a52415-5217-4673-b9ef-e3e7299809f3	1	James	Other
+10ab78ed-e1bd-4b85-8f7f-c8bc0445072b	1	\N	Other
+10b2823c-6f37-4498-a95a-bbd2c169c61f	1	\N	Other
+10b34930-8e18-4b9a-a38e-e7e33fb84fbb	1	\N	Other
+10b3eacc-b002-4f1b-9895-94b05fc9bbc6	1	\N	Other
+10ba81fe-02b2-4b24-9301-948813468883	1	\N	Other
+10bbd9dc-2b31-11e8-902f-fa163e8624cc	1	\N	Other
+10bd3df1-4545-4bf1-9286-2982e1e0f531	1	\N	Other
+10bd6e52-7ec7-4fe4-8de7-58f9ba82bd14	1	\N	Other
+10bd7ba5-10f6-41fc-af3d-a72c4d278b8e	1	\N	Other
+10bd99e0-4cbe-4b12-ab00-c26096529b59	1	\N	Other
+10c0e147-f56e-47ea-9bbb-71a1e858c555	1	James	Other
+10c19804-1dcc-4f6a-9836-12c971021df3	1	James	Other
+10c21d12-9299-4e24-bf6f-924e52e0103f	1	James	Other
+10c24c7f-47cb-453f-8972-ed37c9882bf2	1	James	Other
+10c3cada-c581-4c60-ab37-334b6a7e108e	1	\N	Other
+10c723e2-17c9-4980-b0e5-bbf9d62075a7	1	\N	Other
+10c78c00-abd2-4a68-8d45-75f07ebc53f1	1	\N	Other
+10cc7036-2940-491f-b7da-58cb0fa629ed	1	\N	Other
+10cf38f4-5c50-4c75-b718-2640b1d457a3	1	James	Other
+10d0b6b6-872c-4323-a34f-479685cab934	1	\N	Other
+10d1bef9-aa8c-49be-85f1-29c533397f94	1	James	Other
+10d3097f-d408-47e2-aa0c-8797c7f9516b	1	\N	Other
+10d3483a-f280-428a-9330-edc18508cbab	1	James	Other
+10d36ae6-dfc4-4133-bb6e-bf9e01524d6a	1	James	Other
+10d75721-b4b2-4108-bcee-07d2343d0b51	1	\N	Other
+10d7ced1-0adb-4695-8df1-c712ac5a9499	1	\N	Other
+10dfb4ed-b554-455d-8a55-b319158c1aa7	1	\N	Other
+10e1e637-ff8d-456c-bc67-8472e984002e	1	James	Other
+10e54089-d4e3-4e29-868f-694335ded170	1	James	Other
+10e5e345-221f-49be-96c3-72760f7aa6ed	1	James	Other
+10ebd4cd-fe96-4e89-b8ba-618b9c609dab	1	\N	Other
+10ee61a9-94bc-4beb-a1dd-b3b992702142	1	\N	Other
+10eef88d-fa41-49f2-8626-92f404b06bb3	1	James	Other
+10f164a0-f5b7-4e72-b1e4-5ca74f566cd3	1	James	Other
+10f3b829-3c49-4b53-9eee-9515848eb5ae	1	\N	Other
+110199d0-0f1c-4ee2-afb8-eb037ce7dae9	1	\N	Other
+11041237-279e-49b3-b43d-ef5e6efbd9af	1	\N	Other
+11085d02-6a3a-4c7d-99f6-1403491e51db	1	\N	Other
+1109dfd8-2b31-11e8-841e-fa163e8624cc	1	\N	Other
+110dfdff-b10d-4926-bb76-878ec82a0b26	1	\N	Other
+110e7426-f5dc-42bf-aa40-9b2481a6eb4c	1	\N	Other
+111355e8-edc7-49d7-9589-0301dd9396a7	1	\N	Other
+111403b1-5ac2-4dd8-9edb-4221107dbdd9	1	James	Other
+11174414-147a-46c2-ae24-4184ed7b83f5	1	\N	Other
+1119310d-f2b5-4251-98e2-ad47a1faa392	1	\N	Other
+111bd5cf-f4f9-4e4d-8a57-ea53aefb11cc	1	\N	Other
+111d54c1-5400-4307-8e59-ce4ed4251735	1	James	Other
+111f709a-4555-4588-afa9-b3eb6b1cdcda	1	James	Other
+11226a3f-c3e9-4a45-bb81-c51749d0a948	1	\N	Other
+1122f594-17b7-4e99-8fe8-725abb43f647	1	\N	Other
+1122f893-c194-4a23-8302-488703f73aa5	1	\N	Other
+1123455a-61f9-47d5-a689-c00d2ac64e01	1	James	Other
+112463d2-1134-4e38-8192-7ca3e16690e7	1	James	Other
+11273c94-235d-4a95-ba75-757ad012be8c	1	\N	Other
+112b666c-a54f-49cb-896f-81f3abb9ebe8	1	\N	Other
+112c8fa8-1863-48fa-bf8d-2ac775793a4f	1	James	Other
+11317027-f14f-4023-8296-c0e1cee366d4	1	James	Other
+11335c9d-dc7e-4e62-9310-1a1a38dde56c	1	\N	Other
+1137dfae-d947-4d0f-b1e5-ac47be73c173	1	\N	Other
+113ae132-fb12-40d7-865a-01dc66dcacb3	1	\N	Other
+113ca07b-59b3-4a90-aa34-e77a11aa8139	1	\N	Other
+114b66ac-bbb8-4278-ad7d-3293d143f646	1	\N	Other
+1157b6ee-e7b1-4793-bfc2-2a4f1f07941a	1	James	Other
+115b583d-8542-4021-b8cf-83e888cd1dab	1	\N	Other
+115b60b2-7f87-41f5-8711-c6af5e21b74f	1	\N	Other
+1161b9c6-1724-4d11-a049-61cb6c990865	1	\N	Other
+1163ccd8-5864-43d9-b12e-3a4aaad1ed23	1	James	Other
+11640d58-e8b0-452b-b120-429b369e40db	1	\N	Other
+11667b6d-f4df-4c93-8036-c2eaca347600	1	\N	Other
+1167000b-9468-48cb-a5ef-c9944255547a	1	\N	Other
+11677e2a-acd5-401d-aa46-bd0aa8f956f5	1	\N	Other
+116be260-96f2-11e7-bc89-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+116c8628-e331-41f2-8995-907957c7d051	1	\N	Other
+11749c71-9260-4ef4-98e9-b647a7f00d53	1	James	Other
+1178064c-ffc6-4d23-809a-d8efaf04071f	1	\N	Other
+1178b843-4ac8-4974-b5ee-d68de1aed46b	1	\N	Other
+1179cbfd-6ef0-41e0-a875-b173bf6803dc	1	\N	Other
+117ab833-876f-4135-a6d4-b050c5c291fb	1	\N	Other
+117ae85b-dc5d-41eb-b3e8-980022925848	1	\N	Other
+117e39c0-78f4-4f74-841b-67e4c8ea245b	1	\N	Other
+11849651-bea2-4744-a3a5-84e144659cba	1	James	Other
+118ce75d-b2b4-4330-b8c4-6b580e11f399	1	James	Other
+118d4463-c58f-4248-bb69-3def4813b951	1	\N	Other
+11939c86-4e7d-4f8e-b8c9-e3791bfe7cd2	1	James	Other
+1193c05e-1687-11e8-ad3c-fa163e8624cc	1	\N	Other
+119508bf-ab35-471e-99b5-5f47bbb45f13	1	James	Other
+119786e4-6286-4b6a-8111-ec697d6a1510	1	\N	Other
+1198650d-9b6e-41e2-9ff5-c81af53a8a4f	1	\N	Other
+119bf61d-d30a-46c0-ae98-49c2cfadddd4	1	\N	Other
+11a33aca-182b-4c26-8557-ecfdeb1ec03c	1	\N	Other
+11a6be47-8894-4759-bdb0-4b3c0d5f9624	1	\N	Other
+11ada872-8c50-45a9-a775-542bf4ce1723	1	\N	Other
+11b0c316-4c95-4893-b424-42c4431bb477	1	\N	Other
+11b43901-4c2a-49ea-945b-9a6fbea9a8dd	1	James	Other
+11b5d34e-fd61-483b-babf-3208a75180cc	1	\N	Other
+11b7c01d-2f59-4fa3-b758-1142d0452561	1	\N	Other
+11bcbda5-3e99-40c5-b6fb-e53f9a668cb6	1	\N	Other
+11bdd9d5-240d-4d95-8678-d92df4ff09c6	1	\N	Other
+11c0ce18-6788-4ca7-af5e-09ff019dabe0	1	\N	Other
+11c14f89-7782-4755-8458-abb4abd6f029	1	\N	Other
+11c71b95-2073-47f5-86ec-7ec858fffc36	1	James	Other
+11cbc5f4-4b69-40eb-b3c1-60f8d0021a7e	1	James	Other
+11cbff3c-1687-11e8-a8e5-fa163e8624cc	1	\N	Other
+11cc424e-e1c9-4637-8366-2a8f6dce667c	1	\N	Other
+11cdb33b-cd18-404a-a63d-dd3848233234	1	James	Other
+11d0c5e3-0df2-4f81-8a33-b6c7555836c2	1	\N	Other
+11d0d23d-4d67-4e46-8803-c71f2f509029	1	\N	Other
+11de5e16-5152-4525-af96-b5c3f1f4fecd	1	James	Other
+11e349ba-201d-4652-b108-a55498e73535	1	\N	Other
+11e37ae2-4137-47cc-8437-ec6f11c79ec6	1	James	Other
+11e4892a-e276-45e6-ba86-15cdb5b55529	1	James	Other
+11e5a674-90f2-4e53-bfa8-a3940a2673c2	1	\N	Other
+11e71bed-c8f1-4fb0-98b3-671e05852425	1	James	Other
+11e7643c-4167-40bd-9dca-1699e887c45b	1	\N	Other
+11e7c395-a33b-47f8-b603-983b7e0d87b3	1	\N	Other
+11ec654d-f719-4f71-a5a2-668c33b0ba88	1	\N	Other
+11ec6a33-620a-4177-adf1-50682510e6bf	1	\N	Other
+11efd17b-7a69-4676-856e-5b94504dae9b	1	\N	Other
+11f1fba5-de4b-453c-9ce5-04e4a1cbc443	1	\N	Other
+11f58979-afe9-4bfb-8d02-42a27cd24712	1	\N	Other
+11fbb5cb-0e0b-443f-854b-8d4bfe790359	1	\N	Other
+12002ac5-13d2-43d0-8928-3eb5e9cbd905	1	James	Other
+1200771f-7f6d-4bc8-b923-9983291d8bb5	1	James	Other
+12070ca5-0ee9-460d-ac5e-cbc98c6bed30	1	\N	Other
+120a44f1-8d75-46b5-882f-601bc2a873b2	1	\N	Other
+120bcc51-4621-489a-82dd-303e3d545632	1	James	Other
+120bd662-6ac1-4cc1-98c8-3109ecbbba33	1	\N	Other
+120eeb20-5a32-40e6-9e5a-fd4d5a13201e	1	\N	Other
+120f746d-c16f-4f41-aade-e1152d465533	1	\N	Other
+1212c698-eb98-41c0-bdbc-cc8fe4861d96	1	\N	Other
+1215bbb1-9771-4e40-b584-c2ba3041df78	1	James	Other
+12171834-dc57-42c1-b79d-18f7ba02ef22	1	\N	Other
+12195f02-d45b-49dd-b596-13f2006c502f	1	James	Other
+1226347f-3686-4222-856a-2af65af224e4	1	\N	Other
+122ab43b-6b61-458b-9167-393fb48bf6be	1	James	Other
+122b2911-65c7-46f7-ba38-4b7556e167d4	1	\N	Other
+1234fba3-38c1-485a-a9c9-b085224ec30b	1	\N	Other
+12360091-de4a-468e-a334-233b83c75f03	1	\N	Other
+12372f69-4940-42dc-87c4-14b931f99446	1	James	Other
+1237e83c-41ee-42e5-ab52-a14ae1442993	1	\N	Other
+12382d70-0ada-4dfa-b549-e07be2451e5b	1	\N	Other
+123c6e07-38a1-45e0-8e1d-296b9be6abd3	1	\N	Other
+123ea813-37a4-47cb-a44b-9792b0a74a4a	1	James	Other
+12400ea1-1e47-4bf2-a1c4-08497b84f81c	1	\N	Other
+12403420-6ea9-49e9-b95e-ffbe02c8a0a0	1	\N	Other
+124372e7-ac41-4a83-b440-5aee319ca1e3	1	\N	Other
+12440a3a-01cc-4230-a855-a886236e25c4	1	\N	Other
+1245204d-a77e-4867-93af-891c0ffdbb80	1	\N	Other
+12467776-d50e-42eb-8efb-b099f903d20b	1	James	Other
+12495e8b-4b53-4a1f-ac4c-80dcdaea0f68	1	\N	Other
+124a88cb-f13a-4200-a111-62db2c12264f	1	\N	Other
+124dda84-026f-4cdb-b077-2d1cdff0b7b8	1	\N	Other
+124ead7c-e4ff-4172-b4d4-deac98ea6975	1	\N	Other
+12508670-8f9a-49d7-b18b-b4f6740e3b1a	1	\N	Other
+1253be7a-d4c0-4e89-aca9-7861db7320b1	1	\N	Other
+1254b144-6a08-494f-a7b1-13972359dc89	1	James	Other
+1255d82a-feff-4b8d-9977-22557a31b3bc	1	James	Other
+125729cc-634a-41db-b8fc-16ab34772584	1	\N	Other
+12580214-99a4-4247-9576-454ca84575d3	1	\N	Other
+125fc5c9-d49e-4a4f-a845-713d8b501b71	1	\N	Other
+1262d3b5-bde4-4e75-bf15-c46e8623fc7f	1	James	Other
+12697405-ebf5-4cae-a218-573b2c4f88a3	1	\N	Other
+126d5657-23f4-4c83-8244-5691b50f283a	1	\N	Other
+1271cee6-f4e1-427e-bfd8-41e8ee5e4287	1	\N	Other
+1277bedb-194b-425f-9017-31d1f5420606	1	\N	Other
+127960df-1c7a-4f2b-b5c9-edffb8ffc112	1	\N	Other
+1279b4e8-40c4-4553-b3f0-fff2542c3d19	1	\N	Other
+1286a84a-3665-4544-8080-67d5cacd259f	1	\N	Other
+128769a1-dc5d-4db2-a29c-42565bf4db04	1	\N	Other
+1287cda4-976c-4339-b4f5-2a6a0304444b	1	\N	Other
+128a3048-8b1b-4b53-825e-de159e1bc1cc	1	James	Other
+128aadad-c02e-4520-afb4-9ced94309926	1	\N	Other
+128bd435-119b-49d0-a5d8-5f4de7d5251c	1	James	Other
+128d11cd-cd10-4e5b-a4ea-113743bce5e8	1	\N	Other
+12947b2f-08d3-4f60-a14f-74c937712f5c	1	James	Other
+12956ce8-7cc7-4504-a9f1-657681c9dcd8	1	\N	Other
+12967846-ab08-47fe-97c2-1816456c3e0d	1	\N	Other
+129b08a3-25f1-45be-aa08-67f60c536cae	1	\N	Other
+129b6bac-5eec-4b25-8912-44c842c4a92f	1	\N	Other
+129c9923-8ead-4ffd-a226-68079e2daa05	1	\N	Other
+129dddbe-53f6-4108-a723-92aab49c2c3b	1	James	Other
+129e57d4-9a9d-4b75-ac8e-8d34bae7face	1	\N	Other
+129fc0dd-1761-4c28-b9d7-3cc5a68d0465	1	\N	Other
+12a000a7-7687-467f-b59c-ab0ad9377762	1	\N	Other
+12a10da4-d50d-4df7-8b9d-8ffdd1899ae9	1	\N	Other
+12a23e29-4372-45de-91d9-ad90770018ce	1	\N	Other
+12a24c47-32c8-4ce8-b224-d4bf60a64aec	1	\N	Other
+12a3cbb1-54ff-4c46-8169-eb947e1ef995	1	James	Other
+12a4bcd6-7bf1-494a-8539-5f62e579e959	1	\N	Other
+12a4dd92-8407-41ef-ba08-f5e3d2adbbee	1	\N	Other
+12a66ca4-af29-4307-84c8-0264debf195e	1	\N	Other
+12aeeb29-dbc0-4018-bdac-acdfd4262add	1	\N	Other
+12af031d-81c2-4890-8152-6cd7f35fbce4	1	\N	Other
+12af8093-1ca1-4554-b9e7-f2b9718021f6	1	\N	Other
+12b0c2bb-062c-4509-8755-3356d4fb57fd	1	James	Other
+12b30848-aad9-4042-8970-a521c4ea5ba4	1	James	Other
+12b96633-42bb-4fee-afa7-ada47349fa7f	1	\N	Other
+12ba9c64-3921-4465-a159-646e10080f5a	1	\N	Other
+12bd713b-15c6-4903-83c3-f1e1f8ff09d2	1	\N	Other
+12c22bba-b0e0-4b70-a62d-ae2733b0bba5	1	\N	Other
+12c4d920-1c5d-4644-aae1-acd4ba30f7b8	1	\N	Other
+12c66570-1132-4533-9b88-9f7629d603c0	1	\N	Other
+12cae05e-a29a-4944-a41f-4ca7c4461d29	1	James	Other
+12ce139c-6a8d-4219-ba67-f8110bcf475c	1	\N	Other
+12cf6b98-7cce-43a3-8287-448869359881	1	\N	Other
+12d69eaa-22f0-4bab-9fd4-a9de2b8bc633	1	\N	Other
+12d9b019-641a-4432-9aa8-6260852fe55b	1	James	Other
+12dad71e-7914-4dc6-8b1d-b1efe84e1830	1	\N	Other
+12dc747c-fb03-4a65-ac57-47deaabdd269	1	James	Other
+12dcfa99-92a9-4d5e-852b-872913b1aeea	1	\N	Other
+12ddd824-7f27-4996-b80e-ab744c2ad270	1	\N	Other
+12de86ad-833f-4527-98b3-30fcbc264794	1	James	Other
+12e27ab5-dd88-4177-bf54-bc90a936747d	1	\N	Other
+12e4e1a9-472a-4e45-8980-eeaf5d438cd2	1	James	Other
+12e61b9b-8258-41b6-92e1-e7834eb9c5e1	1	James	Other
+12eb27d2-0dfa-40d6-afa0-8146a8a1677f	1	\N	Other
+12ed3822-1622-4b4c-b81a-e8405107c08b	1	\N	Other
+12ef78c4-8f41-46c9-8207-e70c406fb89d	1	James	Other
+12f05661-f5c9-40db-ba3a-57a8ddacf2be	1	\N	Other
+12f41f60-e983-461b-9046-5b23fc7b2b86	1	\N	Other
+12f4ba8c-173a-4b2e-b618-ff68a7960087	1	\N	Other
+12fa4f2e-d404-4e6b-8127-39f67ed0c301	1	James	Other
+12fcc2bf-724e-4394-b6e0-9d43bb29bdc3	1	James	Other
+1303d2cc-f416-4b65-8848-d8db74592fbb	1	\N	Other
+13061c96-cfe1-4687-b81a-0070632078a2	1	\N	Other
+1307ce49-732c-40a1-9a93-4cfbbdb99ea4	1	\N	Other
+130f3143-8614-4ab8-9030-bd297ede0b4e	1	\N	Other
+131657c0-9949-42fe-b030-42b264cee457	1	James	Other
+13183f5d-4606-4870-8c20-c0eb719ceabd	1	\N	Other
+1318b1ba-85bd-4036-bfeb-3b71dc4d9c04	1	\N	Other
+13205ecc-bdd6-47fa-b321-23d981e731c9	1	\N	Other
+13209fac-1d0b-11e8-a10a-fa163e8624cc	1	\N	Other
+13298333-0fde-4abd-bac7-a2279509d832	1	\N	Other
+132a1cc4-d7b7-4ec6-a5fc-578c3bc335fa	1	\N	Other
+132b4a2c-a2e8-4caf-9645-2ae9c7903dda	1	\N	Other
+132d3b5d-c635-4d57-91a8-8d6a437ff309	1	\N	Other
+132ec958-78f6-49dd-b59e-7a6856be35b3	1	\N	Other
+1331b447-7f4e-4f3b-ab55-cc8b97578b7a	1	\N	Other
+133a3e3f-086b-498e-b558-66e9bbd4fda8	1	\N	Other
+133d2208-e248-418e-8be4-fc5f26db4798	1	\N	Other
+133d3f3e-1e24-47c3-8c37-837122d8a570	1	\N	Other
+133d5c6a-93cb-4775-8700-229e226692d1	1	\N	Other
+13450fbc-3933-4783-99bf-754c818e0df0	1	James	Other
+1345a6ca-feb3-4076-93e5-f9e289833716	1	James	Other
+134b30fa-1b80-11e8-8b26-fa163e8624cc	1	\N	Other
+134baeae-dfb6-4247-be57-ebc02e27965f	1	\N	Other
+134bb24b-c45c-47f2-ae98-d6a78a991707	1	James	Other
+134bdf88-fac6-4c6f-bef3-c664116a4e75	1	James	Other
+134f934e-d86d-42e5-a1e6-1f97fd1d51d8	1	\N	Other
+135347b9-9933-49c4-81f8-e4d26b60fd1a	1	James	Other
+1361b0e0-aaf0-4ee1-81cc-7f90647411d9	1	\N	Other
+13623e6a-13b6-4fe8-9407-9200611da176	1	James	Other
+13630e6a-db43-4016-b2e1-e8b16b5edf2d	1	\N	Other
+1364ec70-8e95-40e0-abb5-d06fcbfef702	1	James	Other
+13671d60-1d0b-11e8-b8f1-fa163e8624cc	1	\N	Other
+136c2e05-bc8d-4b66-8006-70bb64088727	1	\N	Other
+1378e865-d51c-48a0-8a30-4c4ebc537c25	1	James	Other
+137979b2-a31b-45e9-900b-e67655cb32ba	1	James	Other
+13803eb2-1b80-11e8-a940-fa163e8624cc	1	\N	Other
+138413c2-2e3a-4e36-886f-1e8e1301e78b	1	\N	Other
+1385ba26-49b4-4646-8682-3056253e1b1e	1	\N	Other
+1387c9e7-fc91-451e-9a7f-734792519051	1	\N	Other
+13899da6-a097-48b3-8c14-dec9992b5253	1	James	Other
+1393aef7-8409-4f09-89fc-c91f974657dd	1	\N	Other
+1398493a-dbd3-4ab3-84d5-bbc314f279ac	1	\N	Other
+139c9c2b-e2fb-4836-831f-d2d2b5ab870d	1	James	Other
+139de5fa-383a-415e-bbc6-a81bccffaaa0	1	James	Other
+13a107a0-35cd-4fa3-9103-c6a15a8efa65	1	\N	Other
+13a54a91-47e3-4648-827e-bcd7709d9c89	1	\N	Other
+13a5d244-542c-4c4f-bad4-2833941a4619	1	\N	Other
+13a674f7-05d3-4790-ad02-0a4ae7422513	1	\N	Other
+13aabebe-3fd5-412a-a2bb-0d1f3bd350d6	1	\N	Other
+13b03bcb-b059-4911-b855-1f898a5f09d5	1	\N	Other
+13b0652e-2cca-4806-8672-5e245538d293	1	\N	Other
+13b3b4b4-8513-4e5a-8c10-4921876aced6	1	\N	Other
+13b47b1d-503b-4b8c-bc17-201c5f5dfefa	1	James	Other
+13b6a846-8ad2-48dd-9f50-9695cb7c5250	1	James	Other
+13b8b5e3-82eb-4b20-bf5b-8a17299af699	1	James	Other
+13bb5324-ab27-49d4-adf8-7fade1a8fc17	1	\N	Other
+13bf0f0f-6f9c-4dbc-8cb0-116d01551f1b	1	\N	Other
+13bfe1f1-7b2d-41df-85ab-0aa469df01e7	1	\N	Other
+13c312ed-c411-4b74-a6ff-93416f08586e	1	James	Other
+13c6af1a-da08-4b1a-82f0-f546c971d708	1	James	Other
+13c77c17-764e-4e0e-8654-9407107923b3	1	\N	Other
+13c833c3-44c3-463d-a1fe-9614668354aa	1	\N	Other
+13cf9225-b14a-4d73-9834-85faf38f68d0	1	James	Other
+13d13c36-d080-4f2e-821a-4cc288198eb0	1	\N	Other
+13d3079d-c60e-4f61-8c01-3a2d2d4061d1	1	\N	Other
+13dadb73-ba68-4b8e-9832-3c6199bb79df	1	\N	Other
+13dd1ae4-f2a9-4819-8961-3439bbd0cdc4	1	\N	Other
+13dfb3ee-054c-43da-8222-90cd595178f8	1	\N	Other
+13e31165-faca-43e5-b488-5c8b2f4e0fb7	1	\N	Other
+13e3f474-a360-4076-90cf-fc522510c6f9	1	\N	Other
+13e84dc5-2af9-4b4e-bf7b-7daaad5e421a	1	\N	Other
+13ea6e8b-073b-43fa-8825-ab51db858e2f	1	\N	Other
+13ec4281-192b-463e-95ef-ac7abd4746fb	1	\N	Other
+13ec9469-1841-4e50-99ef-3b88b6233be1	1	\N	Other
+13ee7c31-f2ea-4824-a8e8-76a6f96d961a	1	\N	Other
+13f3f6fc-7ca1-49d6-a169-af043e716c9b	1	\N	Other
+13f454c2-c498-4da8-b2c4-05b70bee8755	1	\N	Other
+13fc9d58-35b7-41cb-addf-06202b8984e6	1	\N	Other
+13feac5d-21ef-4b4d-857e-6dbea60a6fc8	1	\N	Other
+13ff850a-1531-4732-b35e-2dcd21b8a019	1	\N	Other
+1403b938-2237-4f83-86c8-8bc4e4190d36	1	James	Other
+1403db21-64cf-462d-bc97-5fcd23a01433	1	\N	Other
+14043081-b336-4804-814e-6659e4accffe	1	\N	Other
+14066fa3-af7e-4e08-b940-fb0f1344ac2c	1	\N	Other
+140d2449-3445-4794-ba5c-84b938d2e199	1	\N	Other
+14159f5d-10b7-4972-984f-a68d95d8f94d	1	\N	Other
+1416be4d-9dc9-4b33-8b8c-150cff92c234	1	\N	Other
+1423197e-5367-481c-aba5-5b10cf16a3c4	1	\N	Other
+1424da33-4a05-422e-92fd-67f6b06f240f	1	\N	Other
+142b938c-15a6-481a-b999-550f65071663	1	\N	Other
+1435baae-eda6-4db8-a50d-e43b7edc8093	1	\N	Other
+1436ac03-9d56-4b44-8fce-0f87e024736d	1	\N	Other
+1436f5ba-46fd-429a-b0e9-07fba46ed8be	1	\N	Other
+143963bd-3bcd-4d85-a6a4-e32394e83ab4	1	James	Other
+143edb6a-244e-4963-abb5-3edbbfcf5156	1	James	Other
+143f649e-dda4-42ab-a38c-0d639b001e6e	1	\N	Other
+1442bbfe-3e87-4a1c-9aca-6dc2482a09d7	1	\N	Other
+14436cda-7b20-486b-9d8e-368a37ce70d1	1	\N	Other
+1448aff0-3c40-428f-847b-0f6f543868d5	1	James	Other
+144acf40-2538-4fff-8556-f45166c0309e	1	James	Other
+144cf1c7-023c-43eb-a037-b52603542623	1	\N	Other
+144f8f0e-4202-407b-9689-93f854bc5f4e	1	\N	Other
+1451186f-33dc-45ae-af96-480e2b3bab58	1	\N	Other
+1464dde4-50be-4192-a00e-90faf7d57bdb	1	\N	Other
+146abeeb-a6da-4f81-89ef-84b4e0a88b51	1	\N	Other
+146b173f-c9d0-4b3e-802c-42a38319c76b	1	\N	Other
+146e29db-3228-4003-bd63-72442d186268	1	\N	Other
+146fc7e6-5111-4f9f-bc1b-0c696059673e	1	\N	Other
+14706aff-25c5-40cc-82c1-20618fea80eb	1	\N	Other
+1470e174-07f7-4bcc-8d40-84db91dbea2f	1	James	Other
+14738bdb-e956-4f00-95cd-d457694fda5d	1	\N	Other
+1479f7ba-6942-4815-87ab-63261a8d73a9	1	\N	Other
+147ebc32-4029-44cd-ad3a-9119640aa084	1	\N	Other
+148022c5-8f37-49a0-8d84-5256666b1d00	1	\N	Other
+14863a25-7557-4abd-a2ba-345a03d682e4	1	James	Other
+148a14ff-452a-4e77-ac01-8f064b1724cc	1	\N	Other
+148c73b1-b1fb-4a1b-825e-1bbe0d8c68f1	1	\N	Other
+148db1f9-1660-43c2-96bf-f2db86a3a515	1	\N	Other
+149027cf-4dc3-46e7-946e-94cf4abc4ded	1	\N	Other
+149348db-cc78-41b4-ad3f-646db604e7db	1	\N	Other
+1497f0e4-acdc-4355-b00e-b5354c4b4993	1	\N	Other
+149c26b3-212f-45be-83e3-b031d4f74a27	1	\N	Other
+149d2fce-7ea1-497a-87d8-2d48c39eff14	1	\N	Other
+149de1f6-282d-4648-9854-e28a5b8ae645	1	\N	Other
+14a17e34-64c3-404b-bc59-d1024b6cd783	1	\N	Other
+14a361a7-7a36-4179-99bb-4e6ba465c47b	1	\N	Other
+14a6cee6-bf7c-40a0-a3a3-6f2199fde377	1	\N	Other
+14ad8fd9-e6ed-40b0-aa06-227aaeab9ec6	1	\N	Other
+14adecf8-78f2-47f3-9ccc-91e73857258c	1	\N	Other
+14ae7909-2a4b-4677-bc0b-d6822db56fda	1	James	Other
+14afb626-0b25-4759-ac19-e757d0e97f1c	1	\N	Other
+14b44823-4027-4035-8a02-793cc0e12058	1	\N	Other
+14b552b0-2597-11e8-a235-fa163e8624cc	1	\N	Other
+14bffc95-77ad-4771-9332-d4a01d8ae758	1	\N	Other
+14c2ca6e-b66b-4b04-9943-524334378c5a	1	\N	Other
+14c38d61-a34b-402f-8049-f250650bf6e7	1	\N	Other
+14c3f7d0-3638-444a-aba9-d2d6787ce30b	1	James	Other
+14c6487d-84c7-4498-9b99-0b1638da6300	1	\N	Other
+14c764c7-461d-4c18-9851-e502e98e15da	1	\N	Other
+14c87de6-0d89-4fb6-a14b-2684ed39e22d	1	James	Other
+14c9b02a-2c52-4aa5-835e-7268ca0237a2	1	\N	Other
+14ce9bf8-2597-11e8-b760-fa163e8624cc	1	\N	Other
+14cf5cf5-9be3-42bb-b58e-dffb2baf472c	1	\N	Other
+14d141a0-c1ad-4ee8-b91e-151a0ef6f737	1	James	Other
+14d31a75-f266-4b30-8846-df26bab4f996	1	James	Other
+14d7ce11-75fc-4342-b6ae-71fb1145d625	1	James	Other
+14de0771-094c-403c-89a5-953fa129c5ba	1	\N	Other
+14e9b08b-e428-4935-874f-bc18beb97fdf	1	\N	Other
+14ea2e14-da9c-4a6b-981a-2e87835ea742	1	\N	Other
+14ed2d63-59a9-4bd7-8253-1e553421a0e4	1	James	Other
+14f2afa3-37f8-4e19-ad64-109d91f317ac	1	\N	Other
+14f32e88-3272-4e47-b33c-af1baf7bdabd	1	\N	Other
+14f5927d-277c-499f-9f86-8214b3b732d0	1	James	Other
+14f5ad69-cbd7-4bbe-94e8-e498c7c98ba2	1	\N	Other
+14f64ab8-c4db-414b-b326-fb60b65ca7f2	1	James	Other
+14f8cae8-8abb-4064-bfce-325c77f30008	1	James	Other
+14fbea17-5ca3-43d0-aec8-b5682b60a125	1	\N	Other
+14ff76d3-bd6f-4707-bda8-bf013d9fbc69	1	\N	Other
+14ffde91-3a2b-46dc-9a67-1afdfad36a3e	1	\N	Other
+15012a0b-e39d-4a0a-8ffa-58a2aa0d4376	1	\N	Other
+1505d033-b82d-4bb8-9110-cbba44d71f87	1	\N	Other
+15071c39-5087-4123-a119-75954936a51f	1	\N	Other
+150b1a6b-e3aa-4126-8646-513cfb8ab6dc	1	\N	Other
+150c1f29-b84b-400c-ae9e-fc0ce0987231	1	James	Other
+150f4afb-28d9-404c-a3ff-fedbdfd2049c	1	\N	Other
+150f8013-ae9e-40c5-96f5-58c7cb817450	1	James	Other
+1511d84f-bac5-4362-a0f4-549b719e1a5f	1	James	Other
+15120909-4da5-498b-be94-bfbbccc86403	1	\N	Other
+1512a535-7e2f-4f65-887b-dedd01a8e882	1	\N	Other
+15175c76-2597-11e8-ae3b-fa163e8624cc	1	\N	Other
+151e4eab-72a7-41da-84c4-78c9a031b37d	1	James	Other
+151fc616-1a3a-4455-bdd3-1b51c75cb8f8	1	James	Other
+151fd450-427f-4505-bbb7-153917b045ed	1	James	Other
+15201b23-7e7c-4ff9-93b0-e2abc263643b	1	James	Other
+15219be6-2597-11e8-97f5-fa163e8624cc	1	\N	Other
+152af247-6cad-4b4b-b624-59165289f5a1	1	James	Other
+152b226a-c2df-4068-a413-844bdafc661d	1	\N	Other
+152ba965-f38f-4a16-abe4-1f7b8e098ed0	1	\N	Other
+152c46a2-a898-4f1d-9eed-f8ef41eb318d	1	James	Other
+152cc6b4-5030-43be-ac8a-8c17aed02746	1	\N	Other
+152d69bf-b9ba-4df7-9bff-66f5b11d2799	1	James	Other
+15306470-adb6-4153-8085-a39ae9b030d7	1	\N	Other
+15333334-b980-11e7-97dd-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	James	Other
+1534a189-39e0-41ac-80f5-c37fcd135ca4	1	\N	Other
+153817ce-ee1f-481e-8954-cb62aebbb945	1	\N	Other
+15396063-2e9b-4395-b14a-584f080d6a1e	1	\N	Other
+15396992-58ea-4320-9e6a-312ea592cae6	1	\N	Other
+153d943c-c1f4-41e5-ac12-9364da6acf2f	1	\N	Other
+154c3f92-f20b-4e47-9713-e26baee71fb7	1	\N	Other
+154f8133-80c3-4572-be15-4afda7c1c3e4	1	\N	Other
+155ccdca-9430-4974-93fb-6cd786a6a6c7	1	\N	Other
+155ce3e2-6f8e-4b51-b597-3d03afd1c374	1	\N	Other
+155dccb1-3e1b-4001-b7a8-a311ee5ec695	1	\N	Other
+155e5175-a7fa-4b4d-83a4-1fe59daa50f8	1	James	Other
+155eaeef-a559-4bc8-84c7-810c879b4675	1	\N	Other
+156103d8-767f-4e78-9bf6-58d0435b33e0	1	\N	Other
+15612d43-d2ae-4f67-bf9e-d762da7ea3e3	1	James	Other
+156234ec-6991-49ae-9885-87830a18c63c	1	James	Other
+156869a6-b084-4e56-b2cb-6034c76b47f2	1	\N	Other
+156910a9-a311-4b9b-8a0c-4493d1047c3c	1	\N	Other
+156921e9-528c-4720-b737-c9a41e90bfb0	1	James	Other
+1569b8b6-4dc9-44da-8506-6547d8c6d39e	1	\N	Other
+156bb092-5a0f-4792-b0b2-911880278017	1	James	Other
+156dc91a-7c68-467a-b00c-b6256a01dfc2	1	James	Other
+15762b98-64c4-41c5-840e-466158e37dba	1	James	Other
+1579f8f0-48c8-477d-9a64-4f1826a4decb	1	\N	Other
+157c470f-1194-4ad6-9391-e9f430a29d8a	1	\N	Other
+15814dd6-3148-4f69-b586-256403c1ca0e	1	\N	Other
+1582a7b5-a7b6-4d1c-84bd-1ad488affede	1	\N	Other
+15833ef9-8be6-420e-93a5-1e775612e2fd	1	James	Other
+15836040-984c-46b1-a200-4da22051fd32	1	\N	Other
+1584ba82-d027-45eb-90a9-2886c347bfcf	1	James	Other
+15883b4d-eea6-46a7-aa27-ea6b9eb7c411	1	\N	Other
+1588fe92-c872-4779-a072-94049527a56e	1	James	Other
+158b141e-3b2c-4215-b3d3-28830a6bc2ad	1	\N	Other
+1591b2a7-a299-4e0d-9982-f817c4804515	1	\N	Other
+1594ccee-b179-4c2a-968e-d2e207ff722c	1	\N	Other
+15971e14-affd-4aa4-98c7-534101b4bf72	1	\N	Other
+15978a53-b62e-44c0-b9d8-4f7e25eb4e07	1	\N	Other
+159b5ac2-dcd1-4c6c-adf0-2ce1460e0e04	1	James	Other
+159bd4e2-2ddb-47b8-94e8-2e57043d059c	1	James	Other
+159c1d6a-9ba9-4ae0-a4e6-8185a4ed790c	1	\N	Other
+159d8cf4-f083-4892-a4eb-40a9de367fab	1	\N	Other
+159fa78c-a310-495a-bec4-17e0cfa3acc7	1	\N	Other
+15a56815-5ce1-406a-9d1f-9c15d725aa88	1	\N	Other
+15a7d130-02af-4476-96d9-ec73c7535577	1	James	Other
+15abd3c4-710b-4b4d-b2f1-7ec525b9674c	1	\N	Other
+15abf3cf-4ab3-46a2-bce4-4e5a93bcfcda	1	James	Other
+15ac1066-b7cc-4390-868a-077bfa95254e	1	James	Other
+15b809ac-19fd-4e12-bfb8-1bc6760855e7	1	\N	Other
+15b8b58c-845d-4091-ba12-98cfb43c900d	1	\N	Other
+15bb5b8a-5c43-4d8e-b604-229d1bc91eef	1	\N	Other
+15bb6a60-75f2-4c21-bffe-29049f76ba16	1	\N	Other
+15bbe648-2730-4296-b474-2608d360a43f	1	\N	Other
+15c35e5c-d34d-407b-8e55-c27533a2cfda	1	\N	Other
+15c53e60-0097-4a9f-aa7c-1b6c520bdadf	1	\N	Other
+15c99ce4-234b-4208-bb4b-1ee73e9877d0	1	\N	Other
+15d017de-b52d-42c7-a700-eece69e459c7	1	\N	Other
+15d073e7-891d-4c47-847d-21e06ebd0770	1	\N	Other
+15d0837c-5fec-40eb-880c-6e3859e8a36a	1	\N	Other
+15d11515-48f2-45ed-8df0-d386058ee2a6	1	\N	Other
+15dc556c-715b-414d-982f-09a08679c06c	1	\N	Other
+15e0a6d6-66fd-436c-afd9-fb2f97e6cf9a	1	\N	Other
+15ed1ed6-88d7-48b3-ba05-4ff265283147	1	\N	Other
+15ee12e1-4d73-413f-93b1-100fc682fdb4	1	\N	Other
+15efd02e-4328-4ce7-9eb7-4c0db0d1b3f1	1	\N	Other
+15f09629-c1aa-49de-85d0-fcaafaa415ce	1	\N	Other
+15f0ba69-81dd-420e-83d8-6bd55bb3e584	1	James	Other
+15f4685f-61f5-48a2-9160-74899f2f48d1	1	James	Other
+15f96994-4d2c-46fe-863f-39030fd8262e	1	\N	Other
+1600a386-95b7-4de7-b10c-1cd827c21f71	1	James	Other
+1609f9dc-e0d8-47df-acde-f14c702191ad	1	\N	Other
+160f4364-ebdf-4382-ac7c-1866538913b1	1	\N	Other
+161279dc-90c6-413d-a1dd-6df0f9751a41	1	\N	Other
+16178e3f-973f-4a91-b481-d51da109e82c	1	\N	Other
+1619134e-f323-499a-9d11-518cd511c886	1	\N	Other
+1619579d-5af0-476d-84f6-6d548843756c	1	\N	Other
+161c6bd7-9522-408d-b360-aeb6c1e48c7f	1	\N	Other
+161ed42f-fdc9-42dc-8f21-d337b76ef2e7	1	\N	Other
+161f8d85-ad80-45bd-93ef-1e74141993cd	1	\N	Other
+16230671-f696-4e70-82f4-aa5743d71036	1	James	Other
+1624199f-1c36-4d9c-944c-0980c1d85b77	1	\N	Other
+162b238f-8e89-4d9e-a3a5-467b1b3bbc80	1	\N	Other
+162b6727-23ca-4679-97ca-f7e9a245ee8c	1	James	Other
+162c4769-8998-419c-838e-24653b77727a	1	\N	Other
+16301bb4-91e9-405f-a677-3e198b8c072d	1	\N	Other
+163348dc-b069-491b-8019-e3e99dd82615	1	\N	Other
+163383a2-39d0-473d-95bc-ba00093901dd	1	\N	Other
+16383129-887e-421a-93fb-6df16832e5c2	1	\N	Other
+163f0d4d-a8a0-4196-9e84-b3ebf2ec2373	1	James	Other
+163f2fcd-947d-45fb-8b00-f52162b76f75	1	\N	Other
+1641d982-80f2-4b08-bf11-cb465e01e57e	1	James	Other
+1643ff92-fa6e-439f-a2c8-caf53f6952e6	1	James	Other
+164b37d8-8704-42e4-91be-911752a21a83	1	James	Other
+164d54ef-f74b-416c-803f-9953b86a8dba	1	\N	Other
+164f443a-8ef3-4649-b3ee-9c923af5f3d9	1	\N	Other
+165d5028-e16b-4cfa-9716-c86daf1d8da9	1	\N	Other
+165ed01a-54c7-47b9-97a0-66dcec192115	1	James	Other
+16666871-01bb-4146-b0b8-f1b81444bd43	1	\N	Other
+166c8509-5b2a-4455-a2cf-70ae14bc15ec	1	\N	Other
+16700ff4-e3b3-4e3b-b333-7cf31ffc3dbf	1	\N	Other
+1672e65e-8990-41bf-92f6-fddbc3e65e29	1	James	Other
+16749788-53d5-48fe-aca5-8b563ba5a57d	1	\N	Other
+1676351c-d007-4369-9d75-d495112e7f8f	1	\N	Other
+1676b92a-28d5-45c4-a0f6-81e392663f87	1	\N	Other
+1676f7af-2538-4811-9aa3-1eacb650c09f	1	James	Other
+16775ae9-3a40-4866-b9fa-8749d52e3027	1	\N	Other
+167dba2b-9480-4edd-a501-d2e3f46b7a46	1	\N	Other
+167e8ea6-4205-4b10-ae0a-94371e9a0fdd	1	\N	Other
+167fb411-828c-4864-943a-aab4b5778b4f	1	\N	Other
+168295f7-81ac-4c6b-9015-506191a509d5	1	\N	Other
+168c43b8-91b4-4b6f-90f7-447d322526db	1	\N	Other
+169b79a4-149d-4195-9ecf-85f28ed4ca28	1	James	Other
+169d1d02-3102-409e-b89f-5c43835bcdf6	1	\N	Other
+16a004a7-6fbe-4d9d-92e0-9339b15538cb	1	James	Other
+16a0a47f-8434-4272-9ff1-2b39ec186d15	1	James	Other
+16a27269-62f3-406f-8855-1e33f5b963fd	1	James	Other
+16a6902e-acd5-41bf-ae15-6964c770efef	1	\N	Other
+16aaeb28-3d3b-4dae-bc7e-e50ff9f427e4	1	James	Other
+16accd0b-6ef5-4892-9df0-40b55bf304f8	1	\N	Other
+16ad2d4f-d237-4127-a998-de3a4c255d7f	1	\N	Other
+16afe7f4-dd57-474f-9f03-64ee599be161	1	\N	Other
+16b3c6c4-b383-4f5b-b7d0-385c98d968de	1	\N	Other
+16b7c503-32a7-4a0c-9dac-5b41692ec59b	1	\N	Other
+16b7f6f8-2672-41aa-b647-431d22835b0a	1	\N	Other
+16bdaeec-fcdc-4a80-be60-30bcf7ba8569	1	James	Other
+16c2a831-c9ad-4d27-9860-8ad791de91f2	1	\N	Other
+16c42a12-8035-4599-b9f7-a21bbeee4f72	1	\N	Other
+16c7a5a6-34d4-41bb-8fee-02368a55ca86	1	James	Other
+16c86f6a-2933-4f37-9b19-94074d101c43	1	James	Other
+16c9a9ed-3638-4178-99ac-dd1f5d4ef2f5	1	\N	Other
+16cd84da-d940-4094-b961-734ffd6c45b4	1	\N	Other
+16cfcf48-2850-43ad-8295-64a23eb755f7	1	\N	Other
+16d3bd67-59ff-465d-a99b-f56e418a58e1	1	James	Other
+16dbba0d-5b1f-478f-b0ce-f0740cfdc13d	1	\N	Other
+16df5dde-2cfb-4809-805a-63fce9ca2e9f	1	James	Other
+16e1a547-5bae-4cb4-aa66-d2be3cb527cf	1	\N	Other
+16e1b219-e617-4151-babe-6c3324850e03	1	\N	Other
+16e1d67c-367a-4b55-b439-d941365cee19	1	\N	Other
+16e28356-547a-4717-b0cc-8ca3d05b3180	1	\N	Other
+16e54279-12a8-468b-bd7d-f19a74928bdc	1	\N	Other
+16e72da9-3489-4321-8eb1-d8d9614bedf2	1	James	Other
+16ebc262-c1d1-4814-9800-bdab7713d723	1	\N	Other
+16ec5cad-b79a-445d-b18d-16dd4df2cc2a	1	\N	Other
+16ee006d-b6a2-43f5-85dc-4b3d5f17ec9e	1	\N	Other
+16ef3d6c-08f7-493f-91e5-d7aab6a8d5e9	1	\N	Other
+16f2b8a1-9e1b-420e-b23b-90eb7c8137da	1	\N	Other
+16f50294-5a0f-4fcc-989f-06e4a1fa1286	1	\N	Other
+16fc2a32-fd18-465d-9360-a74592711eeb	1	\N	Other
+16fc2b47-6460-49f1-aaab-1bba618d4954	1	James	Other
+16fca439-e047-4102-9c09-f08479eac437	1	\N	Other
+1701ba47-fc54-41bf-8df7-8023808733d5	1	\N	Other
+17036256-fee6-4644-a56e-e9e85f462de2	1	\N	Other
+1706e27d-a730-4f41-bd9a-85f200c7025b	1	\N	Other
+171084f4-b1ff-4db3-9df3-7dff210fda74	1	\N	Other
+17108bb3-1594-416b-91c8-ebb7a449bc54	1	\N	Other
+1714b12d-bbe7-4da5-8d0d-6d08428d1bfe	1	\N	Other
+171e00cd-fa3c-4f2c-928b-23dd5aea7eb3	1	\N	Other
+171ee390-7095-43b4-9271-7ba7bfd2776a	1	James	Other
+17201bfc-90b1-417a-8f21-6a61dbdec770	1	\N	Other
+172190b3-ab70-4742-8bc0-907c2d7b2374	1	James	Other
+1727d92e-4309-4f5b-883a-56e6a511ab58	1	\N	Other
+172b051f-d072-41e8-a788-93afc5f13073	1	\N	Other
+1738cfad-bb80-4c25-a7eb-cc227a49d1c1	1	\N	Other
+173b7441-f892-44bb-9f69-3b60518c88c2	1	\N	Other
+173c5cc1-60f2-4669-a2e0-2a627722eeae	1	\N	Other
+173e2255-d5ca-4fdb-ba56-f3f837f9e3df	1	\N	Other
+173edf2b-b25f-4acb-a654-d4da32859d50	1	\N	Other
+17401ae6-7988-4201-ab47-5f5c02e27a6a	1	\N	Other
+17459685-92cc-4c85-b0ca-e6e3d2359eb3	1	\N	Other
+174847a2-3876-4e40-b44e-2e6e130fb965	1	\N	Other
+174d74d2-2b8a-4e5f-9816-16638f24c95d	1	\N	Other
+174e04a0-9c75-4852-ad65-7e235db52ff2	1	\N	Other
+174e0635-e6f0-4ed5-a607-335cb6939394	1	\N	Other
+17556d06-159e-489b-8821-3749439372c5	1	\N	Other
+1756525c-0cb8-434d-bcb9-846341fd20a2	1	James	Other
+175f3623-81ca-402c-895f-e700c8f6e8c2	1	\N	Other
+175f3bdb-28d2-4ecb-98ea-395120b420c9	1	\N	Other
+175fc5f1-8b79-4c4a-95c2-6d7907394547	1	\N	Other
+17618667-e1c6-48e2-a8ca-d4f71cf63435	1	\N	Other
+1762976e-a278-4205-a9f5-147915dfb801	1	\N	Other
+1764bd78-8274-41c1-9dd1-02a550be1237	1	\N	Other
+17651a11-1ed5-4ae8-be0a-ea86eccd8f13	1	\N	Other
+1765ad44-dc22-45d0-ba28-cae638f478bd	1	\N	Other
+176cfe1d-e635-4caf-9b7f-ff6482bc2f66	1	\N	Other
+176d0c29-eba1-4313-9c00-9836c7a883d4	1	\N	Other
+1770e152-7c26-4186-86e7-b88feaa9a9c1	1	\N	Other
+17710a72-98d3-41ef-aa12-84e6cb2ee70f	1	\N	Other
+1775f9ef-e635-4b63-bb86-74624917bfb6	1	\N	Other
+17794718-fbbb-41fb-8c79-2fcab3725518	1	James	Other
+177e1a31-1ce9-461b-95b7-8f9e97f957b2	1	\N	Other
+17811c99-808f-40aa-964c-6957b952cf17	1	\N	Other
+1783ccd5-2957-4343-8c5c-8bb38f93faaa	1	\N	Other
+17864ef0-33fb-4c02-96a9-2f7e3d3fff9a	1	James	Other
+1789647e-b12e-4e9a-ac6a-1fcfc2d6ac04	1	\N	Other
+178c1e00-fb6b-4136-b78d-00dc28716d78	1	James	Other
+178c6db7-e204-4f98-8e55-215b92c5bc13	1	\N	Other
+179539cc-430a-4f56-a035-570e575631a3	1	\N	Other
+1798732c-3012-4d8e-ac66-bad50f4ff353	1	\N	Other
+179984bd-69be-4c54-9c09-91cd1367c801	1	\N	Other
+179a103c-3d2f-4ebb-95ff-a12e7b7756ea	1	James	Other
+179acbec-9fad-48ca-9647-d64790b00c5e	1	James	Other
+179e143f-eff6-4400-8aaa-b64388252f36	1	\N	Other
+179fa313-a208-4993-b423-893512f60877	1	\N	Other
+17a09acb-1cbd-44c2-9dc8-458fbb58f19d	1	James	Other
+17a24ca0-9698-436d-9817-dd60287abdc4	1	\N	Other
+17aa1a2c-aac1-4734-bbca-343ca5eac70f	1	James	Other
+17ac6424-8db1-45fa-8946-23727793fb80	1	\N	Other
+17ad3ec6-b74d-41a7-8f57-f8fd21fb0609	1	\N	Other
+17aeebc1-83aa-457b-aa5f-8926993e900d	1	\N	Other
+17b42f5a-af42-4a02-bf7e-31f9700cb461	1	James	Other
+17b65d02-50c6-4318-a077-5bab13376d1b	1	\N	Other
+17b83a4c-a7a0-439c-98f8-7541d0c30d1e	1	\N	Other
+17b89241-110b-43af-81bf-7cdd603efd98	1	James	Other
+17bb1ccf-cda5-40eb-a4b1-f5d3ec24d216	1	\N	Other
+17bd312f-3cc4-46d3-aa11-3a90c2dcac61	1	\N	Other
+17bd4f99-bdaf-4796-a686-9099d3cffaa7	1	\N	Other
+17bdbf56-42dc-4dd1-a14f-cf91bc2cc9fa	1	James	Other
+17c330b5-72a4-4edb-9799-2cb97db7a43e	1	\N	Other
+17c47010-4d0c-4374-a0f2-c7fc59380362	1	James	Other
+17c66d38-fcb5-41b9-a640-25dbd622fbed	1	\N	Other
+17c6e2e4-7f2f-4a84-b5db-406472c9e333	1	\N	Other
+17c7df43-147a-46a0-96be-376760f8b36b	1	\N	Other
+17c8e388-c898-44fd-a300-508b55b5c4d7	1	James	Other
+17c98733-17ce-4948-91d7-46e1fb7aa2f1	1	\N	Other
+17cc2de1-796d-4fe5-85d1-ecbf56488478	1	\N	Other
+17cc8cfe-50c4-4d58-88dc-79ae6074fef3	1	James	Other
+17d7ee89-421d-4bd1-a562-58feac5959f7	1	\N	Other
+17dbdff9-020f-425f-b2eb-b7bd6f620321	1	\N	Other
+17dd5e1f-360f-47af-b001-1a639d0b5fca	1	\N	Other
+17dec2b7-c7ea-48fb-a8a2-af27fe526f8c	1	\N	Other
+17e9cb49-edfb-4833-9d73-667fa5e2f576	1	James	Other
+17ec2f70-ffba-4ab3-8b34-6102002650a2	1	\N	Other
+17ef6830-640f-436b-af96-551444d6bd6b	1	\N	Other
+17f0f06b-4be6-4fd2-93c1-b7a0a699747d	1	\N	Other
+17f11b6a-1c11-11e8-b21b-fa163e8624cc	1	\N	Other
+17f3c800-9a7b-41bf-be19-09bcffe5a098	1	\N	Other
+17f415fd-abdd-49de-b108-4f464faf4f49	1	\N	Other
+17f56a3e-e571-4648-acf0-1245e7711908	1	James	Other
+17fa24a0-71b4-4f10-a85b-038a8ed49b39	1	\N	Other
+17fece50-a517-433d-a4d9-e13d7fcc0a95	1	\N	Other
+17ff23d6-ddbb-4798-bcfd-5e5893d31510	1	\N	Other
+17ff2e48-b64f-4dcb-b0c6-51fb3b29352c	1	\N	Other
+18014b11-6ce6-4818-a5b8-d8b30c57836c	1	\N	Other
+18153b8a-28b8-4f22-9245-e3019b35cfe3	1	\N	Other
+18194806-1c11-11e8-adce-fa163e8624cc	1	\N	Other
+181b92ba-fb51-4846-a967-d962b9fec1fd	1	James	Other
+181c3c7f-f227-483f-9607-e433702f51f4	1	James	Other
+181e1e81-15b5-4eb2-ab9d-2ac86e4b9077	1	James	Other
+181e8910-3441-4f90-b034-6eaa418a04e0	1	\N	Other
+181fc9e0-0fe2-4f35-b2aa-dd076e333542	1	\N	Other
+182bab27-f8ae-4363-8061-7ee7fcd2fba6	1	\N	Other
+182f0bdc-794b-46e6-83a3-b56c215eb7cd	1	\N	Other
+18308f34-87ee-4dfb-9717-6e393884b7c7	1	\N	Other
+1830edcd-f875-4f89-8d08-76fa23f77488	1	James	Other
+1831e84c-8306-4c4c-9aeb-3de36298e0ba	1	\N	Other
+1832c3ab-de15-44d6-b12a-b59bb8c64ffa	1	\N	Other
+1833965a-bc61-4e23-8ce5-bfa26da9af28	1	James	Other
+18342ef0-4879-4ac2-974c-fdf207de37dd	1	James	Other
+1834db9d-a485-4138-8f6a-2b3e8319c0b5	1	\N	Other
+1835ee79-9d9f-48ad-abb6-ac13283e1ecc	1	James	Other
+1836eaa7-f7b9-4954-b0fa-61882e2ad591	1	\N	Other
+1838bcd0-ffe1-4328-b573-c98e2586bb96	1	\N	Other
+1838fe26-978f-4975-9697-e373be57945d	1	\N	Other
+183faf4e-d000-493a-b11c-9c954c1cc21a	1	James	Other
+18481c56-127d-40da-b275-753a725749b9	1	\N	Other
+18548e13-9226-4d88-af8c-bf892dbbf8c6	1	\N	Other
+1857f248-abf6-4b87-8f5c-860c2016b960	1	\N	Other
+185911ca-1c11-11e8-a030-fa163e8624cc	1	\N	Other
+185a9590-1c11-11e8-aeac-fa163e8624cc	1	\N	Other
+185d086a-fc33-4361-b310-1ef144075b50	1	\N	Other
+185faf3e-f3fd-4911-bf93-5a8490f24275	1	\N	Other
+1861a62a-6106-41d3-a56d-5736f5c50379	1	\N	Other
+18648e4d-f016-4a37-9b97-3817a5435d99	1	\N	Other
+18671c0b-6cb4-4587-8fdb-8134fec91a30	1	James	Other
+18679b31-4e6d-412e-b250-b5750ca283b3	1	\N	Other
+1869581e-a1af-427b-8cd7-d07a2f072b88	1	\N	Other
+186a321c-8ebf-41c3-ae15-7864b1c78648	1	\N	Other
+186ff5d8-ba2e-4f16-8ead-e26bf027f58a	1	James	Other
+187348e4-e783-49f4-96da-ad471a844fed	1	\N	Other
+18740680-e189-4619-ad37-ae3ef7a0e540	1	\N	Other
+1879bb49-3e26-4d31-ada5-e1f4287d39a8	1	\N	Other
+188008b1-9946-4a22-b6ac-18e220a4d4ef	1	\N	Other
+1880dd5e-270c-4928-9e09-4584403511a3	1	\N	Other
+1884b449-74f8-487d-ae58-389bcc900131	1	\N	Other
+1885c01f-24f9-4693-bb3b-095f0cf11057	1	\N	Other
+18881704-1c11-11e8-8ada-fa163e8624cc	1	\N	Other
+188a015e-1c11-11e8-b1d7-fa163e8624cc	1	\N	Other
+188c4ee9-a592-4b4f-96de-df659887a1a0	1	\N	Other
+188cd59b-f1b0-4f0b-bdd6-48f97e9ed862	1	\N	Other
+1890188d-4f6c-4ea3-890a-17413cbb7b82	1	James	Other
+189251af-715d-4a14-8086-7b9151fb609c	1	\N	Other
+1892b36d-b5ca-4604-a642-2c34a731f64e	1	\N	Other
+189ac951-c30d-465c-87a5-bbc86a41695d	1	\N	Other
+189b3cc0-9979-431a-bf37-cefe78cedcce	1	\N	Other
+189ea6cb-25ea-4817-b599-9c0fcf32ca6e	1	\N	Other
+189ffe31-285e-48df-913d-b8749e374d22	1	\N	Other
+18a3cd5b-7cf0-48a0-ad76-c27be40afc57	1	\N	Other
+18a55d77-82ec-4e6a-878c-5bc569eeab18	1	\N	Other
+18b09a61-8d1f-4aa5-980c-0d582561cccd	1	\N	Other
+18b98da2-1c11-11e8-83ef-fa163e8624cc	1	\N	Other
+18ba1281-5dcb-4009-a909-fdca8c8c64bd	1	\N	Other
+18ba38f3-bcb5-45b3-acde-b456ee1c6b49	1	\N	Other
+18baf8ef-83dd-41aa-b9f1-3acd2dce16ce	1	\N	Other
+18bbdc89-b041-456d-a4f7-b6b995a93038	1	\N	Other
+18bfec74-ed86-4929-a7eb-c01392c021ab	1	\N	Other
+18c17c41-d646-4160-a491-0cd09a53d327	1	\N	Other
+18c383cd-fd03-4372-a32f-cb542e384bcd	1	\N	Other
+18c3d12c-aeef-41ca-986a-025461a23070	1	\N	Other
+18c890f7-6504-4f08-8730-39149753ef93	1	James	Other
+18c8d63e-e9b3-495a-99be-ae2b3cb5b1e0	1	\N	Other
+18c999bb-bad7-429b-b817-18a0cb90def8	1	\N	Other
+18cdf943-79bf-40f6-9079-384dc3d19637	1	\N	Other
+18cef76f-07c7-4d70-a54b-6404d149534e	1	James	Other
+18d050df-0db7-4ec9-b9b6-66f6b0cf1c51	1	\N	Other
+18d0ec8a-56f1-4b7f-87a3-63d6c9283d07	1	\N	Other
+18d3644e-b00c-4a5d-b788-83973f28d552	1	\N	Other
+18d3df82-0f90-4fa0-95ce-e5f447ff2492	1	\N	Other
+18d5ab86-7d98-4f2e-9dfe-6aef0c522bf1	1	\N	Other
+18da4230-b328-4ad4-8cff-5d5f15008c71	1	\N	Other
+18da7adb-8fa0-4a10-8777-836438a6c483	1	\N	Other
+18e01b6d-583b-4c6a-9465-d41ef29c0f94	1	James	Other
+18e0b47d-be6b-40ff-b74f-84d0ec3e5830	1	\N	Other
+18e1c5fa-c29b-46a5-a827-e13c87001052	1	\N	Other
+18e3a6e7-89b4-4168-84d7-fdc5b8a32d30	1	James	Other
+18e81cd4-d197-4698-ba8f-ff774a572f65	1	\N	Other
+18ea3662-4602-4a13-b4da-5eb4a8692529	1	\N	Other
+18eb0076-1c11-11e8-9ee0-fa163e8624cc	1	\N	Other
+18f246ee-fd28-4c9f-84c9-76b850bff697	1	\N	Other
+18f40c10-ee41-468a-b905-0d72d3bca167	1	\N	Other
+18f4592c-8cdf-40a8-8288-47695c935b9c	1	\N	Other
+18f610f9-a62e-4078-a720-490ca73fc8dc	1	James	Other
+18f81cf6-2c19-4899-9f6c-f0fcd7cd9ec5	1	\N	Other
+18f81f47-48f4-4f58-95f1-c946a1f9a078	1	\N	Other
+18f9c3ba-1236-49b7-8383-46613c431734	1	James	Other
+19034f0f-55a0-4ecf-a2f3-e6e81495e243	1	\N	Other
+190781a0-dfbd-4ccf-a7aa-3ee2166043e6	1	\N	Other
+190a0810-ba9a-465c-ab18-cca5568ef5e9	1	James	Other
+190d3c68-694b-4325-a91a-9bee1cb5f297	1	James	Other
+190d761e-93de-46be-8523-1a7fbe91bd64	1	\N	Other
+19126ccf-dccf-4efa-b855-d2f5e0f1a15e	1	\N	Other
+1914acd1-1af6-4f53-8244-5d76cc54d64c	1	James	Other
+19170583-1087-4670-a64c-21007dedd170	1	\N	Other
+191a918c-8e61-4d10-8c8b-fcb4dc223fe5	1	\N	Other
+191bd315-274a-4854-990c-26f3c9ef2325	1	\N	Other
+19261e74-dfe2-4db8-aa68-802c31b4f382	1	\N	Other
+19276b46-1595-4b7b-b00d-ba2fb4ed0b8b	1	\N	Other
+1927ee3c-47ca-4948-a726-2a159182b886	1	\N	Other
+1929fb2d-e88f-4b9d-be01-ca526ece5b1f	1	\N	Other
+192bbb16-0be7-4208-aded-91c2bf4f4da3	1	James	Other
+19302828-fad7-4227-b579-f7ad126c9e93	1	\N	Other
+19330853-70a1-4c2c-b48c-bfd83d8bffd6	1	\N	Other
+1935b3ac-7df5-498d-a9d4-8f8833a652d7	1	James	Other
+19361e1d-5ce5-4179-a7c9-51d249f47d2c	1	James	Other
+193ad095-c26b-442e-9cc1-eda4f21ec097	1	\N	Other
+193c454f-2cc7-45ab-bae4-9b69d4c37634	1	\N	Other
+193c9bc3-a0ca-4d61-a243-023fbe65df70	1	\N	Other
+1940a1ed-1d76-4b48-93e6-2be20e913d14	1	James	Other
+1942a2a4-3b9d-4999-9868-70ca28c51d40	1	\N	Other
+194318f2-39c7-485a-b255-24512dc27907	1	James	Other
+19453f9e-50ed-467c-9f45-7af252edfadd	1	\N	Other
+19458b2b-ab78-4cdb-a3d4-a89abc95595e	1	James	Other
+1947174a-6f9a-4e1f-8843-65bdeccb0da1	1	\N	Other
+19479376-e588-4a04-93b2-a3b3d348ed33	1	\N	Other
+1948df6f-af50-4741-9659-b46a871a1b96	1	James	Other
+194b1d32-24bc-4306-a196-adfbd556e7bc	1	James	Other
+194b7eba-2600-44c3-9530-0f6f39616fb9	1	\N	Other
+194c8db3-db26-4cf4-a263-bd7412da9ccb	1	\N	Other
+194c95a1-80ec-49ca-9f38-9cc918527fb6	1	\N	Other
+194d6e6e-aa3f-4a84-8d1e-0ad13201e4c4	1	\N	Other
+1952cd25-ee0c-4e31-b724-f8028870b393	1	James	Other
+1953da6b-52dd-47a7-b687-edd8dbd426e5	1	\N	Other
+19568f3b-9eac-4271-8788-c4d40e3909dc	1	\N	Other
+195fce22-edff-4c33-9a58-5a922b5ad36a	1	\N	Other
+195ffd76-2961-43cc-8079-fd86a9276648	1	\N	Other
+196233f1-c129-4b61-a399-c669f944e33d	1	\N	Other
+19661f53-8f48-418d-8cec-1b9a9556a579	1	\N	Other
+196d9586-b183-4b1c-8165-09f28c413572	1	James	Other
+196e4ec7-3c64-4b02-8ffc-652de4af82f6	1	\N	Other
+196f9589-2073-4291-aa48-027a7fe4c59d	1	James	Other
+1970dcf7-ccda-49ea-be4a-c30be8d96008	1	\N	Other
+197502d5-dc3b-43dc-8015-19dfd8ec0372	1	\N	Other
+19752f85-2641-45b7-8f27-faec1af2f5e5	1	\N	Other
+19756033-ddec-4404-923b-c0150d555bc8	1	James	Other
+19779d3d-77f7-4d14-beae-e9018bef6385	1	James	Other
+198fa4cf-b0e3-4001-b8fd-ad88f48eca4e	1	\N	Other
+198fb719-457c-4a38-a26c-801dac783ded	1	James	Other
+198fde2a-0158-4880-8bdb-d70432e2a000	1	\N	Other
+19907ff9-7769-4034-857f-a7125983b441	1	James	Other
+19912641-7f97-447a-b348-d46a88603984	1	\N	Other
+1991524d-84b6-4d3c-8514-54d04b352451	1	\N	Other
+199204be-79dd-4c14-93ea-49e6251763c0	1	\N	Other
+19978357-48fb-4567-a556-c13c763d1e66	1	James	Other
+199c1eac-1035-4b72-93b3-3048de140682	1	\N	Other
+19a16670-5b58-424c-9225-b8a1cb22678b	1	James	Other
+19a91af8-0e35-478b-b4eb-11efe56b8514	1	\N	Other
+19ace40f-7730-4e38-a9f9-38050d6e1740	1	\N	Other
+19ad45c2-b0a7-41c2-8140-7f02e67c1979	1	\N	Other
+19b5eaed-91eb-4001-b07d-2cb90af9c776	1	\N	Other
+19b7b5a8-5f54-4960-ac08-2d189c11506f	1	\N	Other
+19beffa4-1c51-4711-b36a-350a31b20b17	1	\N	Other
+19c05edc-843b-49be-84e8-a0dec86160e7	1	\N	Other
+19c1e768-cc58-46c5-b4b2-0164ec54d9c9	1	\N	Other
+19c359b7-6c76-492f-98fe-0932916477ed	1	James	Other
+19c89e1f-7ed6-4a67-89fd-96bcefa4b769	1	\N	Other
+19ca026d-25f3-4fd3-b10b-68fe26ba1797	1	\N	Other
+19cabc70-de60-4661-9ab6-d8d6f1d88655	1	\N	Other
+19d5c4d9-59de-4b07-ac49-f91ed2aad7e2	1	James	Other
+19d79730-7743-4fdd-8b1c-39e4a018407e	1	\N	Other
+19da185f-35cd-46e5-ad17-a593e3dd5716	1	\N	Other
+19da4380-159b-47ff-befb-d5aa9af33c90	1	\N	Other
+19daa722-fda4-4f8a-aaf9-c15930f920bf	1	James	Other
+19dcfe10-c27e-4da5-bc29-04b121139e6d	1	James	Other
+19df62ce-2c2e-41d4-aee0-1e49e897aa58	1	James	Other
+19df9498-4acc-46e6-809a-7969b9a16345	1	James	Other
+19e21c7b-8371-40ea-b994-5ef8e69d5686	1	James	Other
+19e4cbda-575e-4ebd-9c0e-f9004de1064f	1	\N	Other
+19ebd8e0-de93-4645-9c8c-82359f66b81d	1	James	Other
+19ed78c0-3b9b-457b-9f4e-843444ab9152	1	\N	Other
+19edb841-fd9d-4935-9af5-6c7dfce71b5d	1	\N	Other
+19eedb8e-fa80-412a-98b5-df90fe76a80d	1	James	Other
+19efbf13-194f-4eb6-af5a-e9da23a1b017	1	\N	Other
+19f11184-445b-4aab-991e-e177134af9a8	1	\N	Other
+19f3bdf9-cdc0-4087-b0ed-fea5456bdd2e	1	James	Other
+19f4ce95-55b5-4792-85c7-9befb750cbe5	1	\N	Other
+19f6c08b-c9b2-4a4e-9ae0-2b033bfd08ef	1	James	Other
+19f7544b-0b08-4f22-82a1-5c5cc3b42da1	1	James	Other
+19f90030-2120-4955-bba2-7682fbb3fca0	1	\N	Other
+19fd8862-85ff-4e15-b4ec-5dcb4aaeb669	1	\N	Other
+19ff1ffb-927f-41f9-a774-1df4e2c45515	1	\N	Other
+1a005c1b-7daf-4bfe-80db-d2903fc27be9	1	\N	Other
+1a01329e-e0a0-4d5a-9025-253355dc7728	1	\N	Other
+1a0b22df-7cf4-4827-8f22-476d8c1782f2	1	James	Other
+1a0bdc93-1a52-4dd7-b133-b24f02d6617d	1	\N	Other
+1a0fe8a8-fe70-4a88-b6e7-03d1492e18a8	1	James	Other
+1a106259-108a-4a0d-b860-3cc3bcb6491f	1	\N	Other
+1a11428f-ce5e-4972-aa8a-57b70837ee46	1	\N	Other
+1a12eaa5-ed37-486c-91ce-3c5ed2715983	1	\N	Other
+1a1329f7-67b8-444e-855b-6222bb861f5a	1	\N	Other
+1a156c66-f7ba-469a-ace7-30e3134cd6ec	1	\N	Other
+1a168a27-e06b-4042-940c-bfbb6306d1e0	1	\N	Other
+1a1b67a0-11c9-4782-aaaf-23f15bee3beb	1	\N	Other
+1a2284ab-fd2f-4b4e-96e6-ab7f8abf706e	1	\N	Other
+1a26f59e-e36b-4fd0-ae9f-45b453f67d2d	1	\N	Other
+1a29a8ee-f87b-47f3-a890-6ab9f32255f8	1	\N	Other
+1a2f9a44-dafa-40cb-9ba4-790dd973b6fd	1	\N	Other
+1a33a588-e56f-4ab8-806e-50258fb10852	1	\N	Other
+1a35349c-73e8-4358-b1aa-703872b881b7	1	James	Other
+1a368a0c-b8d1-404d-a5d7-f2314811873e	1	\N	Other
+1a3a11c7-65a4-4c40-bb00-4fa9ccc54762	1	James	Other
+1a40295d-35b6-447d-ac0e-1ab5c8982669	1	\N	Other
+1a40c51b-e0f5-4128-a0c0-d9e6f5f547b7	1	\N	Other
+1a431d22-79a3-4a0e-83d1-2958821eae3b	1	James	Other
+1a4dbc78-90f1-4036-aa07-e66d552bd60f	1	James	Other
+1a52a751-9aab-4afe-8bdc-9cdbacf615a2	1	\N	Other
+1a538839-7b2f-42ce-a260-e129838e906d	1	James	Other
+1a589315-00b3-4bfc-b87c-d6beeb3ba1d9	1	\N	Other
+1a59fd65-5bc1-4e28-9c94-7dbc4ceb1f43	1	\N	Other
+1a5d5224-baa5-43eb-be6c-8b738478f923	1	\N	Other
+1a5de43a-3c55-466f-92aa-e02ea79e76a6	1	\N	Other
+1a69e3e2-ccf5-4021-8303-d5e7df9a93cc	1	\N	Other
+1a6dbde6-9894-4ad5-ac23-175d95491bbe	1	\N	Other
+1a6eff94-b8af-4009-ba3f-a4e48e595e57	1	\N	Other
+1a72e240-0746-466a-bf1f-d021f487a2f6	1	\N	Other
+1a786d55-d488-455a-ad49-dc33a7425966	1	James	Other
+1a7dbdc7-b243-4b0a-a359-08503df2c5e1	1	\N	Other
+1a7f4c43-f333-461e-952a-c7428b37c20a	1	James	Other
+1a83ccf9-3815-44d5-ab78-86380d704dd5	1	\N	Other
+1a865585-9ec0-44a7-8f19-245cf21599e1	1	James	Other
+1a86561f-5915-43be-b787-d44d3abf3060	1	\N	Other
+1a882903-2516-4376-a92c-46204e3f1e8e	1	\N	Other
+1a8a4570-d7e2-4d31-9be6-179a1770a027	1	\N	Other
+1a8b1883-5e6d-465d-bd1a-127956911905	1	James	Other
+1a8e8872-8917-4bfc-86cb-40e8082a7209	1	James	Other
+1a915f86-33aa-4b69-b9bf-36921af3765b	1	James	Other
+1a935589-ad47-49ab-8e2c-bfdbb5fe2b4e	1	\N	Other
+1a980d7b-97fb-4c37-885a-8e436799834a	1	\N	Other
+1a9cd51f-f290-452a-9cb9-bbd707200bc2	1	\N	Other
+1a9ec8c6-99a1-43f9-a18f-66afacf828c1	1	\N	Other
+1a9f1436-c93b-463d-bb83-43817f99af95	1	\N	Other
+1a9fe88d-d7c4-4d64-ba15-1fb68d307397	1	\N	Other
+1aa11990-7e59-4fb3-9846-37c3a4ffc0c8	1	\N	Other
+1aa2839a-985b-4a57-bd62-e82068b494dc	1	James	Other
+1aa2d982-537e-4e28-a03d-385d090a0a98	1	James	Other
+1aa887fb-1f84-4d4d-b05c-edf507169e40	1	\N	Other
+1aa8e010-d8f9-47f8-8444-9fb5a7b2668c	1	\N	Other
+1aaa4016-bf60-4299-8f8a-8c3430888043	1	James	Other
+1aaa756b-f562-43e8-b1e3-a86809afa8fc	1	\N	Other
+1aab99ca-3166-4c00-ba29-c0bd9f120b7a	1	\N	Other
+1ab473b8-611f-481f-bda2-7a9b2cadbd25	1	James	Other
+1ab58de7-df6e-4ca6-accf-3b389d2947ce	1	\N	Other
+1ab890c1-ba04-44ae-9513-a86e1be7734c	1	James	Other
+1abc82b7-d1ee-4e43-bfd7-49bfce0b1f8a	1	James	Other
+1ac1114d-93c5-4bf7-b188-22af7723fac9	1	\N	Other
+1ac66c10-baf9-4630-8c0d-4ebfb3e947b7	1	\N	Other
+1ac7fed4-84b7-494d-a381-bf6af5e72382	1	\N	Other
+1acdb7a8-fc0a-432f-aba6-2b2e91ccccab	1	James	Other
+1ace8306-db64-4a8e-954b-b3c3b0b090a4	1	\N	Other
+1acef1fd-3180-4096-ba67-9af562d43d60	1	James	Other
+1ad248b4-3d5f-4496-8eec-e2dda392318b	1	\N	Other
+1ad255ee-8190-4060-9298-49810e5c6919	1	\N	Other
+1ad6c279-c1d1-4974-932b-e12ba105473f	1	\N	Other
+1ad772b3-d761-461b-bd83-a6d5fb847164	1	\N	Other
+1ad7ed70-17c0-4fbd-893f-4ab8eab790a4	1	James	Other
+1add39f9-cc6e-45b4-b225-327fdc7ffd5d	1	\N	Other
+1ae0ccdd-6e80-46d2-b9a2-2712b36847a9	1	\N	Other
+1ae2414b-37aa-48a9-a49c-5f9e284898a9	1	\N	Other
+1ae29336-9ef4-428f-818b-198fd415bb90	1	\N	Other
+1ae440b3-95fa-4ea9-8e24-8fb0400c7aaf	1	James	Other
+1ae48a8b-07e4-4bbb-b198-87454abdc2d1	1	\N	Other
+1ae5201c-50f4-403f-9b01-093f46265efe	1	\N	Other
+1ae566b2-4978-4a9d-9231-5b1e9c3c17b1	1	\N	Other
+1ae91294-bcd2-45fc-98ac-c0312b8effcb	1	\N	Other
+1aea65c8-467d-44ae-b0de-e458252a8639	1	\N	Other
+1aebc216-eaba-4a65-99ae-fa5451609be1	1	\N	Other
+1aecd505-7267-469e-9dab-1f3c6e294c28	1	James	Other
+1aee3abd-fba2-4f82-a3e9-b16bd769f484	1	\N	Other
+1af35843-d19e-4834-8857-b6cea4b49607	1	James	Other
+1af66562-0c07-4042-b52a-62c88277d753	1	\N	Other
+1afccf6d-28d0-48ff-a618-0d41b02f67b9	1	James	Other
+1aff68ca-fdb8-459d-91ec-1396ccffe77c	1	James	Other
+1b01e09c-c2c6-448f-b548-3bc1089964d1	1	\N	Other
+1b04069b-ec88-4515-b217-b6c88e7bcac8	1	\N	Other
+1b0d85a7-5e76-484a-922d-0b2a0c0b2ea4	1	\N	Other
+1b10af76-1d8b-4206-92ec-38ed1eb654f8	1	\N	Other
+1b184aa3-8e6f-41fe-99a4-77083e398643	1	\N	Other
+1b1857e4-8a3b-11e7-9579-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+1b1bad8c-e4b1-4ea9-9ca8-08941f862012	1	James	Other
+1b1c65c0-e446-419a-b6d8-cd1a5ca051a7	1	\N	Other
+1b24e111-2534-4087-a823-35200a007541	1	\N	Other
+1b2b0dbd-70d1-435f-b755-91466df6e314	1	\N	Other
+1b2d727d-6f18-458a-a25a-f639e964e715	1	\N	Other
+1b2effa9-c864-4cd5-b685-72c1fc4dcd13	1	\N	Other
+1b2f4165-a749-4b05-b545-3b0f8cd4ac24	1	\N	Other
+1b30a6c6-f801-416f-9440-5071c245d4d9	1	\N	Other
+1b3739bd-425f-4eca-bcd5-84827c672506	1	James	Other
+1b3741ee-cc46-48e9-ac3a-cb8af92a389e	1	\N	Other
+1b39f2fc-08f8-4bd8-84ac-efd588bbd4b8	1	\N	Other
+1b3eac09-183a-499c-ae96-2b6e6b7423e0	1	\N	Other
+1b42b7ba-f082-4c1f-a1fb-7ecdac138be0	1	\N	Other
+1b442ce3-9f83-4c3e-9427-1d31a36b3ac7	1	\N	Other
+1b452d48-fb7a-43be-99bd-0082b71e79e2	1	\N	Other
+1b453a01-31c0-4f9a-84a8-4f47a8f0c2cf	1	\N	Other
+1b47d17f-0335-4640-a519-4e9f6049293f	1	\N	Other
+1b484311-4251-4980-96fc-3e6468f578dd	1	James	Other
+1b4cfd54-7324-4f91-8ee3-a0c4a143fee4	1	\N	Other
+1b4e94bb-526b-40f4-9687-e2d506c96439	1	\N	Other
+1b4ead4a-fefa-4bdc-a2f1-9b89f2bbaf69	1	\N	Other
+1b5172b7-f60d-40d4-b1cb-aebc31f929ad	1	\N	Other
+1b53c660-7daf-4c32-a837-0ca93c2f415a	1	\N	Other
+1b54115e-68ba-49fc-a0a5-7f167ef248af	1	\N	Other
+1b5ee209-5cce-45fd-b8dd-2d6066115e67	1	\N	Other
+1b5fb04b-12ba-4ba3-8f97-5790852b3735	1	\N	Other
+1b6cdf3e-635d-4f54-947c-52d0cb99b5a6	1	\N	Other
+1b6d29ec-dcd8-428b-b5ce-b07ac391939a	1	\N	Other
+1b6d8e1c-60ca-46b8-bffe-2c6049761d05	1	\N	Other
+1b6e2f4e-f747-484f-b1e7-dab671f15127	1	James	Other
+1b7031f5-f0ac-4674-b3f4-cf8f8853a41c	1	James	Other
+1b71cef0-34ab-4cdc-a5a7-a201b8ef49be	1	James	Other
+1b72b76f-4df5-4138-a40b-2f413e13a86a	1	\N	Other
+1b78755b-a35d-408c-9b4f-f71e42be395e	1	\N	Other
+1b7ac9ad-4e57-478f-978f-9972d0352449	1	\N	Other
+1b7ae3f5-bbce-486d-a64e-930f06314a09	1	\N	Other
+1b7b12e1-bf3b-4be2-9d1c-96981de28827	1	James	Other
+1b82efc4-ef7b-4d20-98cc-ef4f068749a3	1	\N	Other
+1b8738b5-a08e-4e13-9f09-219d82decca7	1	\N	Other
+1b875e93-ba68-4041-9798-5032af14c039	1	\N	Other
+1b8eb32e-fc6d-4106-ab86-caeb005fdebc	1	\N	Other
+1b918710-2f07-4dbc-bc96-9a2ba5e48173	1	James	Other
+1b92c91a-228a-498d-912e-ed345da6a4d2	1	\N	Other
+1b949ac5-32b6-4903-9787-38ce48156489	1	\N	Other
+1b960ba0-f371-427e-ac64-7e44b45ae80a	1	James	Other
+1ba1eb68-e17b-4f29-98a3-be2e314648c1	1	James	Other
+1ba5f5a5-a238-41e8-a81a-bb61cf5214d8	1	\N	Other
+1bad3f9a-35a1-4537-84c2-5f7710399bd1	1	James	Other
+1bb30ca4-6a80-4b4b-931b-263bf88f04aa	1	\N	Other
+1bb35f96-2536-4a6d-9cf0-c69b1bfa4dad	1	\N	Other
+1bb40edf-b8c1-40b5-9a97-807ed0cc48ad	1	\N	Other
+1bbc28a5-c561-4db2-9e01-3f2829b5acc6	1	James	Other
+1bbd9dac-b1c3-408c-8fd9-7a52796bbdc2	1	\N	Other
+1bc07cef-d115-4146-a933-9dc019b981dd	1	\N	Other
+1bc7bda9-11b8-4318-b992-b721ee445c8e	1	James	Other
+1bc96a00-c274-4d6a-a7f9-78904361c132	1	James	Other
+1bd320fd-7a80-4eca-8264-f8fe421e1b04	1	\N	Other
+1bd7116c-dea1-4f1b-a053-fc6f71fdc1da	1	\N	Other
+1bd7ddcc-6215-4047-a520-451060ad81ed	1	\N	Other
+1bdcfe69-5eee-416b-9340-a4d7ebef97ce	1	James	Other
+1be4e1a5-25c3-4504-9343-47c7c3486ab6	1	James	Other
+1be825b1-c105-4161-9b16-aeff1a4e1568	1	\N	Other
+1be8b19d-489f-4415-9839-92e5e2ebfc59	1	James	Other
+1bf0da68-171a-4306-889a-ab5ea14bb6ee	1	\N	Other
+1bf3d49c-ed12-4770-b9d8-30ce0e774dac	1	\N	Other
+1bf52df2-fa10-424b-9f7f-ee3196f2d900	1	James	Other
+1bfbd29a-332b-4d95-9919-fe8eac46c90a	1	\N	Other
+1c02de2d-c7b1-4b22-92ae-8ebe9620ef87	1	James	Other
+1c0a0212-dacc-46b5-97d4-93f3cf136ddf	1	\N	Other
+1c0b698f-e054-424f-b026-b65d1b553413	1	\N	Other
+1c0cc429-8ec9-4673-8ec2-9522108450cb	1	James	Other
+1c124a04-16de-4ff5-b87d-bac13affc3d5	1	\N	Other
+1c153f77-c7af-4cf7-9fd1-f0fe18fc8dfe	1	\N	Other
+1c195edb-be29-4227-970c-93b4ab9ea17c	1	\N	Other
+1c1a2411-b72b-47da-85c7-822632ddc9a2	1	\N	Other
+1c1e82fa-9cc4-42e8-b298-aaa84d8a6469	1	\N	Other
+1c223192-9668-42a5-b4af-9e15faea7711	1	\N	Other
+1c2469dd-d0f0-4200-b640-febf210f2142	1	James	Other
+1c28db84-d2bf-4541-8506-d6fb8d7017d3	1	\N	Other
+1c2911ac-99ff-40a8-9d28-7338fcdcfddc	1	\N	Other
+1c2e4700-a1b5-4d41-92a5-d2b50d137c02	1	\N	Other
+1c2fb1b7-d927-43ff-ac90-04a54293d63d	1	\N	Other
+1c362e0f-ebf6-42f4-97a3-ca2fb956fb05	1	James	Other
+1c3dbe14-2d43-4b5c-9690-2dee21548b74	1	\N	Other
+1c40df2a-d783-4020-805a-e4fa179ecde6	1	\N	Other
+1c438bfa-6486-475b-a471-9b1299af945e	1	\N	Other
+1c47ccad-a98c-437b-83f4-bf50149467cf	1	\N	Other
+1c544151-6e38-4a17-a2fa-7b2f2598c89f	1	\N	Other
+1c603ad2-7f90-4da8-b82b-34262b49e950	1	\N	Other
+1c61189d-1869-4ea4-9ad3-cb49002201a8	1	James	Other
+1c632a64-4330-477f-9ff6-aa694dc48310	1	\N	Other
+1c635077-e6cf-4d67-bf80-00cb639a7bcd	1	\N	Other
+1c6442ad-1727-436a-8e25-a4adfb3fed1d	1	James	Other
+1c6abbdb-fefb-43cc-ad57-add25281f277	1	James	Other
+1c6ccb53-02a8-4864-b9a4-154e54b0173a	1	James	Other
+1c6e9c2c-1462-4e7a-a80f-8e5bfd436fe9	1	\N	Other
+1c706d84-0df6-43b8-a878-5b14def570d3	1	\N	Other
+1c73a3af-6bdd-4858-a27f-b1fd1368a6bb	1	\N	Other
+1c7d1aa7-ce0b-474d-9fda-53a1e333ad48	1	James	Other
+1c83a067-485c-43eb-9374-8503c466838a	1	\N	Other
+1c875f0b-f6f6-4823-8d99-933ee379af15	1	\N	Other
+1c88f510-d0c3-4170-8f64-111b87748199	1	James	Other
+1c8c6637-89fd-4c1f-ac96-e38599a56dce	1	\N	Other
+1c8e7a84-bc15-40ed-a96c-24ab940a6ece	1	\N	Other
+1c94414f-1195-44fd-9028-c0170391bf67	1	James	Other
+1c944ba4-b159-4e1b-8839-6451e4333265	1	\N	Other
+1c9509b9-b4e2-4c93-ba12-3be1787a1535	1	James	Other
+1c95ad95-fe26-4b46-b1c3-1c1ce9ef5833	1	James	Other
+1c971492-fa3a-4bf7-aaf7-fa1997e53865	1	James	Other
+1c9db08a-3ec9-495a-ba9e-a57f0967ebb5	1	\N	Other
+1c9e6256-a7e2-447f-b964-e02e214e2c4a	1	\N	Other
+1c9f5720-5b8d-4e5c-8830-bb82431e5cfe	1	James	Other
+1c9f9ebd-f7c7-445a-a8df-1d83fb6820ac	1	James	Other
+1ca0d4ff-be2a-469c-999b-8db3f8014277	1	\N	Other
+1ca11195-dcdf-47a7-aefd-5617c73c57cc	1	James	Other
+1ca18c33-caba-4f9a-81fc-65bfd80148c1	1	James	Other
+1ca1ccdf-e941-42d8-a1b4-86fc2ae324c8	1	\N	Other
+1ca28797-7618-417a-a262-2381fc2c7dfd	1	\N	Other
+1ca68a67-0e13-4f64-821d-36e821d4f954	1	James	Other
+1ca7c7de-72c6-4679-8451-f969f1f4311e	1	\N	Other
+1cb33e07-da0f-46b0-ba6a-6648e41bdb88	1	\N	Other
+1cbd5102-ad07-437c-9266-d87362051bdc	1	James	Other
+1cbd72a2-df04-4132-a993-98e06b8426de	1	\N	Other
+1cbeae71-ec8e-40fd-89e2-ba7424f0147a	1	\N	Other
+1cbff42a-cf56-4ac2-b4bf-65df0b89550a	1	\N	Other
+1cc3f992-a74d-46a3-8e4c-7bd3e7ffef5e	1	James	Other
+1cc6f9d7-99e5-45e0-8ab4-869392e0393a	1	James	Other
+1ccc199a-b3fd-40f9-a166-d2cfcd97f9c7	1	\N	Other
+1cd7babb-1026-4015-ba6b-2638ce3695e9	1	\N	Other
+1ce3e272-e582-44b6-89df-be1a6eb177cd	1	\N	Other
+1ce6757c-651c-4220-b026-28a09bd219e2	1	\N	Other
+1ce6ff14-acf2-4f90-9347-d51926219d3f	1	James	Other
+1ce9807a-b56b-4ba3-8134-b8083256c43d	1	James	Other
+1ceac2ae-2ad7-4dc9-9cc0-a6e61b070dc4	1	\N	Other
+1cee2044-fd1a-4c82-8250-c1248bbc797d	1	\N	Other
+1ceff572-daf4-4ee5-b885-314e28f4e199	1	\N	Other
+1cf144a9-6c6a-4ac9-acb9-0cb271c223e6	1	\N	Other
+1cf3243c-9503-4e7f-b989-8dbed937b590	1	James	Other
+1cf450b0-152f-4249-b185-2f2cff4d6f5b	1	\N	Other
+1cf45331-bc24-4062-ab0c-ad45ad9b6e9d	1	\N	Other
+1cf5a568-c9b3-497e-aaf8-41afb747a999	1	\N	Other
+1cf5fba4-9832-46f3-b862-08df40509827	1	\N	Other
+1cf6afd1-d05c-425d-81e5-e66a7520980b	1	\N	Other
+1cf7fa10-70e5-4911-97ec-0a53cfe2a191	1	\N	Other
+1cf8186e-b9ff-4d59-81a2-ed748c7dcd03	1	James	Other
+1d070191-42d5-4bd0-880b-d1a636fd39e9	1	\N	Other
+1d081b06-0ac0-11e8-a5cd-fa163e8624cc	1	\N	Other
+1d0d7dcc-54ce-4b07-8d7e-89a5e60d6a58	1	\N	Other
+1d1754dc-5f6d-41df-aeb2-dbff8238c6b5	1	\N	Other
+1d17e8ea-5193-4ba2-acf4-30d72f913059	1	\N	Other
+1d1a1fd5-eab1-421e-a752-3314efbf1269	1	\N	Other
+1d1cd8c2-1e80-40bc-8408-26591647fce0	1	James	Other
+1d1fcb55-aaf4-49a7-8df8-658ebe32c282	1	\N	Other
+1d233f79-d881-4a8a-8539-8590b86abe0c	1	\N	Other
+1d29b17d-0ba9-41fc-89ed-91959498417f	1	\N	Other
+1d2e02ac-a704-4723-a51a-ae1444d2b148	1	\N	Other
+1d2fc094-1fe9-4511-912e-be1fb688ee7d	1	James	Other
+1d31586c-91f0-4ed5-af61-132f0115393b	1	James	Other
+1d3280fc-6f23-416f-8dfb-7eac6301d6c4	1	James	Other
+1d34b932-7191-4964-a815-9417ce829108	1	\N	Other
+1d353897-64c8-4471-9f72-fd7f0669c13b	1	James	Other
+1d371403-df32-4b46-8782-ee6b698d9a43	1	James	Other
+1d3b5e04-c994-4cc5-b16c-884872a296f5	1	James	Other
+1d3ce256-6523-4ce3-9144-df5e75c0cb1a	1	\N	Other
+1d3e4d9b-f1e4-49d2-8c32-607849d394c3	1	\N	Other
+1d412f59-b623-4de6-a0cd-0359987180b0	1	\N	Other
+1d43368b-44cd-41f0-9ef8-7a1064cb684d	1	\N	Other
+1d44e5dd-0a0b-4b2c-8f74-c4fe173f1ec9	1	\N	Other
+1d467fb1-d57f-4438-9bbd-87066e9b44d4	1	\N	Other
+1d4d3f70-60e8-41b1-89f3-fc517b9d0896	1	\N	Other
+1d4d9a36-527e-462a-9490-ccccc2cd548b	1	\N	Other
+1d4debc3-7fc1-4588-803f-87299858c5ca	1	\N	Other
+1d4efbca-b12f-4993-af9e-2016e25363c9	1	\N	Other
+1d4f19ec-86a0-46f0-92f6-598754193fe9	1	\N	Other
+1d56c03a-ac7e-4d1e-99f5-4b0d540c2912	1	\N	Other
+1d5852d5-f8f0-43e3-b085-09393697d0b5	1	\N	Other
+1d5a9f09-5759-406a-9c69-e2bf426eaa69	1	\N	Other
+1d5c06aa-0ed3-4afe-b205-a4754bf10530	1	\N	Other
+1d5d7a6f-4fa5-43d4-8fc7-005f89e84e56	1	\N	Other
+1d5dac70-4e70-4a21-84f0-df5b1056f49c	1	\N	Other
+1d63b0ea-7b10-4c03-851e-7f3cddf454f9	1	James	Other
+1d67ca74-0ac0-11e8-ad6e-fa163e8624cc	1	\N	Other
+1d6801f2-ac59-4cf5-92dd-f6b6d8064e26	1	\N	Other
+1d68f45a-9c56-4d89-8936-5aa8dabbcfb8	1	\N	Other
+1d69a610-64ce-4d9f-af66-dbb7d6ce5c84	1	James	Other
+1d6ad930-3c67-474a-b1d2-cf49767ee415	1	\N	Other
+1d6e3404-b56d-4e6e-9b63-c17b6b18e699	1	James	Other
+1d6ef5c6-bfd7-41e3-bc80-40b17b79f924	1	\N	Other
+1d716e7c-3b5c-4f85-a3a4-25568250ab96	1	\N	Other
+1d72ae6b-3ed9-4980-b108-d402bd375af1	1	\N	Other
+1d73f8f1-d81e-4364-8960-2d74b1500c55	1	\N	Other
+1d7619f1-e610-4329-9114-f1298b928c0d	1	\N	Other
+1d7ba15a-a29a-4052-bed6-ad74df929586	1	\N	Other
+1d7e6a1a-a25d-4277-bc81-159f711200cd	1	\N	Other
+1d7f0315-649f-4e40-8ea8-7d46b848bd8e	1	\N	Other
+1d801afa-0dd8-4a04-ab71-d92dfc0da2ac	1	\N	Other
+1d835440-8845-4607-ad3d-ff4b5c7cd258	1	James	Other
+1d838391-2bae-46eb-824d-a7dac6c849ad	1	\N	Other
+1d88b7f9-f24f-448b-9540-fe04b366b928	1	James	Other
+1d8a4a0c-a132-4905-b47c-3712d1fd4cfb	1	\N	Other
+1d8b6a6a-5260-47d4-8ef6-43108d5df543	1	James	Other
+1d8b6e8a-1e73-459f-8eab-3488946ae205	1	\N	Other
+1d8dc8f4-c562-4b66-9339-114779dbe5cc	1	\N	Other
+1d8f20e0-ff7d-46ca-9291-ef8b133f3813	1	\N	Other
+1d95f86f-84b9-4df2-a45d-a6f80e830514	1	\N	Other
+1d960f1d-ff4a-4080-9b91-b5a75994ae21	1	\N	Other
+1d96d03c-07d7-458d-9298-54c88da31d92	1	James	Other
+1d993525-ac4f-47e9-9b6d-f11dbe62c70d	1	James	Other
+1d9c4ea3-c5cc-4858-8b16-3f68a5be71ca	1	James	Other
+1d9c9af8-3231-48bf-bdb2-56e5348c76b8	1	James	Other
+1d9da27c-6936-44be-b1db-be52a9aabab1	1	\N	Other
+1da04ba0-afbc-45b7-8470-9f7f45e04281	1	James	Other
+1da6a268-db71-46d0-a94b-58db43f59097	1	\N	Other
+1da6c8ab-c063-470b-8f22-dff08480cc6d	1	\N	Other
+1da7ed7c-bc79-4f79-a858-564e22be1f64	1	\N	Other
+1daa88ba-cca9-4502-9674-a7f4e51277c6	1	\N	Other
+1db12a73-2c17-4d8e-aee9-6aabcd7b026d	1	James	Other
+1db7b14e-3e8d-48ee-90f7-22d508f2e74d	1	\N	Other
+1db9fdc1-fc1f-4984-8bb5-e3220f25e8fa	1	James	Other
+1dbfa5a7-78fe-49f6-a18b-151a2d2ca1d6	1	\N	Other
+1dc2eb1a-6c3c-4b74-a9ca-6af46e0baf48	1	\N	Other
+1dc7d8fc-2914-4419-8719-3a1117f806ef	1	\N	Other
+1dc92bd2-e8ef-4cf7-b74a-d56b5f4adb75	1	\N	Other
+1dcba2bc-5b26-433f-8963-7595d5d56366	1	\N	Other
+1dcd2af5-635f-4c27-8d5d-dae96df24413	1	\N	Other
+1dce2f72-ae73-47a4-9297-01782fb16c92	1	\N	Other
+1dcf336a-c09c-4f65-a381-f5027f47d800	1	\N	Other
+1dcfada0-b060-45a9-b98e-d4570991726a	1	\N	Other
+1dd136c9-9eee-47d1-ba00-59a59c6939c1	1	\N	Other
+1dd511df-3c5a-4a3d-88dd-ec3102b8ea40	1	\N	Other
+1ddb5e3a-8886-44a9-9ff2-424e93c92f42	1	\N	Other
+1ddd4b5a-25e9-4bff-b955-a11bfe8203ea	1	James	Other
+1dddb436-9b1f-4847-b479-a8fb74bf52b6	1	James	Other
+1de05797-9313-4030-a138-0a0f78688beb	1	\N	Other
+1de17d45-69de-4b3c-8954-a1c4d7380a26	1	\N	Other
+1debebba-e5e7-4ad3-8ba9-b46ff5873bb9	1	\N	Other
+1dedbfcb-8e27-41fe-8d60-aa1059fbe1b2	1	\N	Other
+1df06f3f-7930-43e2-91f5-726de1ef4d41	1	\N	Other
+1df0d1f9-e2e6-4038-a218-3f319fdd0203	1	\N	Other
+1df3ddd5-cf4b-401e-b50c-39ceb3a23dfd	1	James	Other
+1df4a16c-768b-4b57-9933-f015b1bbdaef	1	James	Other
+1df6c4eb-6810-468c-b603-fbdf7379bff8	1	\N	Other
+1df8b2a0-d7d5-4167-bca9-2a0fb6ce49de	1	\N	Other
+1df9a254-99af-472e-8e3e-994e6c7ddcd0	1	\N	Other
+1dfd14d8-0601-43e6-884c-c6aea0e2ff98	1	\N	Other
+1e039e61-2e3d-4f22-aece-aea6a6d8434b	1	James	Other
+1e0fc882-3558-4018-a84b-6782183580a3	1	\N	Other
+1e1233ae-35d8-4cb9-b5fb-266d96a68b8b	1	\N	Other
+1e12d845-c4ca-4489-84d2-b489af93241b	1	\N	Other
+1e143617-1a28-4929-818e-929c4332e14e	1	James	Other
+1e14d39e-8f2b-41f7-a074-7cd94415ac7f	1	\N	Other
+1e167def-21d4-4c2a-980f-dc5ee2caff12	1	\N	Other
+1e17d2c5-49fb-4b76-ba7e-62f53507eaaf	1	James	Other
+1e1a1a90-c86d-4792-b3d3-a2ce8cd6e4b4	1	\N	Other
+1e1aa9b6-8318-4f78-9543-9454949227d4	1	James	Other
+1e1ae58e-c4f2-4be5-96f8-2b2906fc3b68	1	James	Other
+1e1e238d-b275-48a9-910f-b84c3d76bde3	1	\N	Other
+1e201806-ac20-4f66-82f7-36b24ce1a3cc	1	\N	Other
+1e23954a-3020-407a-be83-c13a939bc560	1	\N	Other
+1e261800-e517-45b6-856c-d8a6833fb677	1	\N	Other
+1e27c53d-868f-4765-b11d-e9f1d8f281c8	1	James	Other
+1e28aa48-09b4-4038-b404-9275d84b880d	1	\N	Other
+1e2aa544-2761-40ca-b67e-fa0214834886	1	James	Other
+1e3293df-083c-4beb-ad4e-32bdd538c221	1	James	Other
+1e32a8d9-d041-4299-a4ea-f60ef5ba54a6	1	\N	Other
+1e3320b7-8a7d-474e-b185-92b21914ff9f	1	\N	Other
+1e33af05-0313-4e06-8be3-751b3dd9701f	1	\N	Other
+1e34074a-7d92-44c4-96b6-b544e87e0e53	1	James	Other
+1e354111-abab-48bd-b9ea-3b8b87fecb94	1	James	Other
+1e3c0c43-2bfe-4f7a-89d7-2bc6af3576ed	1	\N	Other
+1e3c831b-5972-476e-8bbc-752b995f0e47	1	James	Other
+1e427601-40ac-41e3-a591-dcc44e8ef5a2	1	\N	Other
+1e4343aa-6325-467d-9ee1-4a12ff13d80b	1	\N	Other
+1e43901a-72e7-4b88-922d-9c86b2f0f584	1	James	Other
+1e49c668-6d9b-4aa0-a41c-e04fcea2ec81	1	\N	Other
+1e49d10d-bea3-416a-9caa-c9cd388dde27	1	\N	Other
+1e4c3035-b520-4972-9bd1-f3e059e1631f	1	\N	Other
+1e556d30-8bf9-4a03-9006-17ad7fcd8b2c	1	\N	Other
+1e598215-ade7-4a7f-b324-8cd410090126	1	\N	Other
+1e5b94cc-7717-46a0-81be-355ca272eb7a	1	\N	Other
+1e5bb0d7-b3e6-4b87-9267-3cc7b97493d2	1	James	Other
+1e5f7b78-927e-4d77-b5de-72bd3f03c853	1	\N	Other
+1e654a47-7f9a-4ea4-84b1-ff5bf13b3a6a	1	\N	Other
+1e656f6b-98bf-481d-9409-4841e933cffd	1	\N	Other
+1e69f811-1027-43e6-b770-bcb5b228a52d	1	\N	Other
+1e6b9ba3-b9ce-4c89-8437-5c2634724064	1	\N	Other
+1e6d39ea-8113-4c0d-aa2d-4c2300e6a300	1	\N	Other
+1e6fe6f4-aadd-4a82-b8d7-e33bda57e011	1	James	Other
+1e6ff153-1a85-43b6-9736-f6161a4fc1f6	1	James	Other
+1e73661b-b473-4829-b7ea-2594cb9a6970	1	\N	Other
+1e73b2bc-9c75-4e8b-a42b-a6c259bb15ba	1	\N	Other
+1e775dae-ccbb-4f57-8557-e6d18267dcb8	1	\N	Other
+1e7a7d5c-29e0-46af-b771-77a9fc60dda3	1	James	Other
+1e7e8e5f-67df-4e0f-885e-b8e036bb34af	1	James	Other
+1e7ec2f6-c723-4648-8a74-e5e47aa8cd84	1	\N	Other
+1e800edf-f251-4c6c-8670-beac6a0edc25	1	James	Other
+1e81d126-2418-4b41-bb0f-9d2dcbcdb65a	1	\N	Other
+1e83656f-8a38-480f-8865-39297a7d3a96	1	\N	Other
+1e87c643-aabe-46f7-9018-fee875722418	1	\N	Other
+1e8cd2cb-d490-4c18-abdd-fa3e24e08723	1	\N	Other
+1e8dbebe-5597-4ade-9874-99846adc73be	1	\N	Other
+1e8e0c28-616f-44d9-8306-1f30ae2327a2	1	\N	Other
+1e90b438-d8f0-472e-aa89-fc1090def1c8	1	James	Other
+1e90d00f-50e2-4532-aea0-89dfc2d4c27e	1	\N	Other
+1e99ba3e-9d69-4a7a-b382-052a6ca4ee08	1	\N	Other
+1e9cb056-8d15-4201-9578-deedfe14dab1	1	James	Other
+1e9e13a1-5269-47ec-848a-ae719b219245	1	James	Other
+1e9e8643-20f4-45f4-938b-37781054246f	1	\N	Other
+1ea3214a-ccf9-415d-b013-c74e4ca01d59	1	\N	Other
+1eaa01b2-778c-4310-9bc9-05a5eab4e47a	1	James	Other
+1ead1b62-15f0-42d0-aa6a-0888e8d9a5e2	1	\N	Other
+1eafd489-4d65-4557-83cf-9208b3f62f33	1	\N	Other
+1eb8c4e9-6b80-431d-a2b0-7b72dd39bdd0	1	\N	Other
+1eb9167d-cbfa-41f9-8b37-14651a23ade5	1	\N	Other
+1eb9b242-97da-43de-9970-41e69b7fc4ba	1	\N	Other
+1ebc3385-30b9-4515-ab17-6a809283f254	1	James	Other
+1ebfc280-04cb-4b5a-9ac6-e3bb352e9aad	1	\N	Other
+1ebff96f-6a75-4d39-9729-c43bb4e5bf34	1	\N	Other
+1ec2b45e-92b8-4f4d-a10e-83a51a934eac	1	\N	Other
+1ecf8fb1-87a0-47dc-8fc6-ee353628ab80	1	\N	Other
+1ed11766-f9d7-45ac-9503-60b56e5f0e18	1	\N	Other
+1ed78d5b-0f7a-42b6-b431-82126b2b8515	1	\N	Other
+1ee4cc8c-4f5d-4638-8a1b-7bab28b0ca3c	1	\N	Other
+1ee6159d-3784-493d-be54-4c538487e3b7	1	\N	Other
+1ee6f2ad-b6a5-41b2-bab4-0eefa38aec45	1	\N	Other
+1ee86397-09e8-4b0b-a2dc-c4ebe129e0b7	1	\N	Other
+1ee999ef-4285-47ce-81a3-71dd6695a9ed	1	\N	Other
+1eeb8a41-5ac7-40b5-b78c-809f3462bb1f	1	\N	Other
+1eebd337-1200-4824-9e2b-8fc646957b4d	1	\N	Other
+1eec8f25-a78c-4624-b0ca-f9f102a2827f	1	\N	Other
+1eee033e-9418-4b75-aae2-6c0a18ec0675	1	\N	Other
+1eef0a33-1119-42af-b427-e144a41f294d	1	\N	Other
+1ef1c6a5-2af6-447a-a826-b36fce072bee	1	\N	Other
+1ef2c09f-940c-4f8e-95ec-585cbb4579ca	1	\N	Other
+1ef7d639-078c-4b2e-8af9-b3444e5c51b8	1	James	Other
+1ef87204-0f33-4ead-98aa-66ae6be758a2	1	\N	Other
+1efd1df4-1f17-4b51-92ef-e5a5c10e3659	1	James	Other
+1f019bd0-9cc8-4afc-aa5d-a0fb54aff522	1	\N	Other
+1f023bff-2a46-45f8-bcca-8c793f131d89	1	\N	Other
+1f03eca8-311c-4a15-a7ae-6fcf2e6644a3	1	\N	Other
+1f08552c-0eb9-11e8-bc4f-fa163e8624cc	1	\N	Other
+1f090663-eb48-42a3-ae4c-e22acd140269	1	\N	Other
+1f09161f-e2b9-434b-a32f-b8c7385c3bfa	1	James	Other
+1f09fad2-0f87-40a2-82ae-3a652ae612f3	1	\N	Other
+1f17bbba-30fb-4f05-b24a-486dda572248	1	\N	Other
+1f1bb3e2-3887-42d4-b7f0-aae9ccb0acf3	1	\N	Other
+1f1bf6a8-e1d0-4c92-83a6-97a872e6f4fb	1	\N	Other
+1f1d73ea-ef69-4b61-81e4-ab7ac086c307	1	\N	Other
+1f1f74cd-de39-4ea4-9fbf-50f393dfd606	1	\N	Other
+1f21f979-90b2-4735-9859-a8e7c23aec85	1	James	Other
+1f26eed6-e9d3-471b-ad98-40e2549aac06	1	James	Other
+1f29891a-02a4-480e-af82-02f330ffcebf	1	\N	Other
+1f2a4e99-b9d1-40f0-8546-dd604b42b0b7	1	\N	Other
+1f2e10d6-48cb-47fc-96e4-840ae37b06a1	1	\N	Other
+1f3216d2-0bfb-4ed2-89ce-04dd53519bdc	1	\N	Other
+1f3586e2-ce15-4a71-828d-b1a69d2e0d55	1	\N	Other
+1f35cc90-1c50-4603-a1e7-6743aa81f982	1	\N	Other
+1f3a3e34-0eb9-11e8-8398-fa163e8624cc	1	\N	Other
+1f3a40c9-aff8-49fa-9790-c034804facc8	1	\N	Other
+1f3c3213-a292-45ac-87ed-4bfd0b082c53	1	\N	Other
+1f3c9467-f412-4744-b60b-2028c3351d97	1	James	Other
+1f45a38f-bb0c-4ddd-aa5f-c7f38e3dd9ed	1	James	Other
+1f474464-4d9a-4414-b9a6-56715107c971	1	James	Other
+1f47811d-74dd-472b-9223-a94e2ed9c394	1	James	Other
+1f4c5fe8-bd23-45c8-811f-2c615b04aaa6	1	\N	Other
+1f4f1ab1-98af-44af-9fa9-db76a48371ee	1	\N	Other
+1f5de64b-307e-4b5c-b11c-83178c149c09	1	\N	Other
+1f5e372d-d5bc-4a0b-ae25-d6b78a145fa5	1	\N	Other
+1f5fbd0a-5e94-4e2b-9a40-1d420256c7b6	1	\N	Other
+1f603528-513f-43f1-aa0e-5236e968774c	1	\N	Other
+1f60e4e7-d29d-4b70-839c-f9c219f192d5	1	James	Other
+1f66ad4a-b27e-4fa1-b4ca-472185b46c28	1	\N	Other
+1f685315-ecdb-4f56-b84d-726962a6561e	1	\N	Other
+1f6eb325-7e2d-40d7-a484-9871d0f1de45	1	\N	Other
+1f73e22e-83a3-400f-9284-306de6add2c6	1	\N	Other
+1f7a7e01-fb0e-4aa8-8f2c-8aded16d999a	1	\N	Other
+1f7b7f0f-1682-4b7a-a3ed-fd19be5a3287	1	\N	Other
+1f7cc4b4-fa1e-413b-b131-c4aa35fd52fd	1	\N	Other
+1f7df8f6-e9f7-44ec-a267-b95b74a24205	1	\N	Other
+1f7f2522-842d-4294-a05c-da120e6d34b7	1	\N	Other
+1f80a8fb-ba34-4aa6-91f5-9f398bcf079e	1	James	Other
+1f80c5d9-f728-4541-9773-ff84440e42ef	1	\N	Other
+1f84e121-3004-4611-a5b0-fcf06dc0ebb0	1	\N	Other
+1f860345-379a-4d4e-9c98-26de1fe9aa7f	1	James	Other
+1f90d658-807e-458d-aff6-a37102f21e5c	1	James	Other
+1f955600-c7fc-430e-9d85-0a07afa257aa	1	\N	Other
+1f99f354-305e-4172-972f-ecfdf88a7e99	1	\N	Other
+1f9a0a99-b8af-495b-bb1a-49898f82c4af	1	\N	Other
+1f9c3b9d-0143-41ca-8b4b-3773673f7928	1	James	Other
+1f9c782c-5c6f-4b80-9555-03feb1bfed45	1	\N	Other
+1f9e0fdc-84cc-48bc-bea8-f00403eb6870	1	James	Other
+1fa2c6fd-85e4-47ce-9fcd-4b7dbfb8113c	1	\N	Other
+1fa41707-f4f4-4288-8c95-5a66f5e7286b	1	James	Other
+1fa80c8e-ba34-4f1b-8641-56af2e89694d	1	\N	Other
+1fa84725-cfc4-44de-99f5-99277036e3fd	1	\N	Other
+1fa9282e-447d-4c61-868e-6ec2f72ca568	1	James	Other
+1fa9bad8-52b5-4690-b71a-6b25ca0ba10d	1	\N	Other
+1faa504d-9da8-42c1-9ce4-1ae3640c8286	1	\N	Other
+1faaabd3-a655-47ce-8c1e-1018c5302762	1	James	Other
+1fab86e1-0bed-4338-9307-7d02c0d316ae	1	\N	Other
+1fae1364-c5aa-4186-b8ad-1e4531e085d5	1	\N	Other
+1fb37fc6-1c28-4392-8e76-cc7f29cdf25d	1	\N	Other
+1fb52942-ae68-452e-b23c-c464ca4dbeba	1	\N	Other
+1fb7886e-9d48-4c62-b402-d82c40a35309	1	James	Other
+1fbb085e-3cb1-4779-a991-65a105e326df	1	\N	Other
+1fbb20a3-0f3d-4e3d-bdf3-1e2ca1657be3	1	James	Other
+1fbd3957-1de9-4073-859f-22a73e62e963	1	\N	Other
+1fbe92c7-db83-4026-84a8-fc16968f5863	1	\N	Other
+1fc0f1b2-5f4a-4d49-846a-ea13feeda410	1	\N	Other
+1fc1cb27-9587-4492-9194-e9cd5a5600b0	1	\N	Other
+1fc323d5-5adc-42b1-b0b4-ce44b20a2821	1	\N	Other
+1fc43f71-9db5-4148-addb-61d13f560332	1	\N	Other
+1fc9d2e3-4795-4240-9065-3ce37144481f	1	James	Other
+1fd300d7-4172-4ce4-91c0-5117a5364fd8	1	\N	Other
+1fd380c9-381d-46f6-9010-6bc9df89ab8f	1	\N	Other
+1fd75877-6c00-4d8b-8a3d-20a8b589af33	1	James	Other
+1fdc27c9-4505-48e9-a8b0-46e925c15185	1	James	Other
+1fe140a8-a53a-49ae-8229-4753f56f4395	1	James	Other
+1fe1e65a-1174-4d25-bbed-6e94a532b887	1	\N	Other
+1fe23f77-1f1b-4e4e-8092-c16e1f8c1a9a	1	\N	Other
+1fe6cdc0-0810-4f8c-9f3b-04b9fbb462ac	1	\N	Other
+1fefccea-d37c-4ed4-976d-7217dac709cb	1	\N	Other
+1ff0f93a-90b1-49f9-81c7-74b941824684	1	\N	Other
+1ff13566-9fdb-453f-88cd-d61ebf11df2b	1	\N	Other
+1ff29051-d6ab-44bf-ba6c-46d3a0ce252d	1	James	Other
+1ff9b967-57e1-4c33-bcc2-73658b769b02	1	\N	Other
+1ffc0b67-9750-4f4c-bef4-01afdb4207aa	1	James	Other
+1ffff10a-c5ae-4496-9c04-91ca90ad7546	1	\N	Other
+2001f5fc-ef01-458b-9662-4cdd5bb4a0d4	1	\N	Other
+20033f84-44c0-4584-82e1-d4868c084020	1	\N	Other
+20069693-a7e7-44a6-a99a-c93842926849	1	\N	Other
+20079ec4-d5d1-4842-9e9c-18852b161309	1	\N	Other
+20092868-98ae-4875-8cd4-ebfc3640e442	1	\N	Other
+201a2e50-6d37-48d1-87d8-a89d4679908a	1	\N	Other
+201e532b-db13-40e8-a0af-00e888400e94	1	James	Other
+2020a19c-dad4-42ac-bdd1-278fe9b5ceb4	1	\N	Other
+2021b045-aed9-4cad-b654-35da60a4a4f4	1	James	Other
+20230877-9176-40a7-87bb-42fcca6b7b58	1	James	Other
+2025a854-7456-465f-bcb1-c2f5db61515d	1	James	Other
+202ca397-8802-4dee-ba24-42b0916d56eb	1	\N	Other
+202e8760-8664-443f-917e-bf1151712967	1	James	Other
+202fac43-5e63-4445-b9a3-338a8b9ead94	1	James	Other
+2031de98-6031-4935-b5c5-b0201acd7cc7	1	James	Other
+203360f8-442a-41d9-8252-6018a5f7c394	1	James	Other
+20399d72-37d2-4924-97a7-c0f34226e035	1	\N	Other
+203bb21c-dd6a-4f69-ad07-15633073aa04	1	\N	Other
+203de53a-780d-4805-a526-f1a46b751561	1	\N	Other
+2043c2d0-c814-437b-baf0-213d642e6507	1	\N	Other
+2048519e-c3e8-4f9e-b594-11202657d6a3	1	\N	Other
+204cfa73-1e5d-4236-afdf-4678d3e88a19	1	\N	Other
+2051a0bb-825a-48ee-8964-5415cee0053c	1	\N	Other
+2057ff9e-9446-4f81-9d94-7d91cd34a24c	1	James	Other
+2059c457-b19e-40a0-9bd8-235afdd7a751	1	\N	Other
+205cd1ae-deea-4273-a756-87db3be7441e	1	\N	Other
+205d56f7-e3b4-4771-b064-f4dad6cdd090	1	\N	Other
+20607168-605c-4def-a89f-096fcab0c14a	1	\N	Other
+206257e7-148d-441d-b197-e5a57fa6e8f8	1	James	Other
+206c958c-490a-4a2e-a3ea-9ee012bc5b01	1	James	Other
+206cd105-718f-4f56-80f8-fe200334aacf	1	James	Other
+206dd627-894a-4c01-84d8-6481802483c3	1	James	Other
+206e902a-aa6e-4a7d-9285-1b6a563f294c	1	\N	Other
+207381eb-ba6a-49ec-a46a-e5240b78b77e	1	\N	Other
+207858fe-ea86-4093-9e07-c3153e2c7d84	1	\N	Other
+2078f463-e6fb-4264-a78d-9dd207d1636d	1	\N	Other
+207d2594-e371-4fa0-87d9-2076f7052b94	1	\N	Other
+207e99ff-300a-4374-9c40-8c01b27f7eee	1	James	Other
+208317f9-3b0d-471c-b5f8-0c9c1fbdb647	1	\N	Other
+20834b48-7680-4dbb-87a9-e4bdcbb433ab	1	\N	Other
+208b0065-3c23-45c7-b9b5-bf97d7ae00e3	1	James	Other
+208ef070-8b76-4d7d-9fa6-f5660c453991	1	\N	Other
+208f1166-accf-4c9b-bc87-4bc8d54c72ee	1	\N	Other
+2093140d-1433-4a52-bfcb-e8bf69badf15	1	\N	Other
+2093d538-2da3-4c41-8e1f-ef4a24b950a5	1	\N	Other
+20959f97-76ac-4bf9-8fe2-b04c8490fb43	1	\N	Other
+209a0a07-3e37-402f-9297-ba53fc9dd0cd	1	\N	Other
+209b4ec6-cf2e-40b5-a046-af76bac2e801	1	James	Other
+209d7652-76a1-4439-92df-43687fa27a42	1	\N	Other
+20a0a4bf-d50e-4016-b81d-9fb9adf69d27	1	\N	Other
+20a54d21-0a86-4d24-88b9-890440e17034	1	\N	Other
+20a5640b-5fb0-45d9-90cc-7c333005f36a	1	James	Other
+20a97b31-9d32-4a85-a252-d2263a1721b0	1	\N	Other
+20aa0346-d972-46da-82f8-190ba363d8bb	1	\N	Other
+20aa0f04-9dec-40a8-8cd1-0b93095e7eb0	1	\N	Other
+20aecddc-90ac-42ee-9ce2-f85f655703e2	1	James	Other
+20af4cd3-dd9a-41ff-9585-87013e47d84e	1	James	Other
+20b633ae-4eda-42fe-b6b6-63db1d1544f3	1	\N	Other
+20b8d40f-3a81-4adf-be53-645f0a821af3	1	\N	Other
+20b9448f-0da0-4184-9479-31da661d2169	1	James	Other
+20bb32f9-1619-471a-9371-5c032b99dcd3	1	\N	Other
+20bbcd27-145e-44d1-9672-92b651aa54bd	1	\N	Other
+20bdd4fb-c3c6-4474-969c-b24bbe98d5c1	1	James	Other
+20be1fbf-d117-4a25-8bbb-3d8f17287a8c	1	\N	Other
+20c05b9d-13bd-46f7-ac54-aac9cdd0c974	1	\N	Other
+20c1857b-7825-4496-868a-869513b1a678	1	\N	Other
+20c22760-bd54-4c67-96e9-d254745aa0dc	1	\N	Other
+20c2634d-b77f-423c-bb04-710874da8d04	1	James	Other
+20c295d1-0440-4c00-8429-51d0da7bee6b	1	\N	Other
+20c4285e-4487-43f9-aeb2-b6190b583fc7	1	James	Other
+20c6682d-474e-4108-b2d2-b4ef93b2fcaa	1	\N	Other
+20c6e539-76db-4732-8f66-864a0a4afb3b	1	James	Other
+20cc7c45-7bd1-4bfa-8cf2-43160ff1b221	1	\N	Other
+20d0983e-462c-4abb-9fd7-46b8d8c81a76	1	\N	Other
+20d24a1a-4786-4a54-bc56-bdf39a171782	1	\N	Other
+20d57cf3-31d0-47d7-8d31-d8cf0e10d505	1	\N	Other
+20d815e5-a437-4c3d-aa62-82eb4814e4c7	1	\N	Other
+20da0250-d80f-48ed-bb59-ab611ce720b5	1	\N	Other
+20e5bbd5-c567-409e-97d8-a13f91a3a793	1	James	Other
+20e9183e-3911-4e4b-8050-ff64054c1234	1	\N	Other
+20f26c5d-96a1-4b53-bfb0-8b800431853d	1	James	Other
+20f8ead2-4e8b-49ff-bdfa-bc3b15336b48	1	\N	Other
+20f8f2fa-aaf8-494a-822b-fc91ade5b82b	1	\N	Other
+20fbb3d8-3f66-4579-8b6b-581b8e9b46de	1	\N	Other
+20ffcc8d-6d6e-4311-ac14-4a99042e8aa7	1	\N	Other
+2100991e-5a70-41d4-ae21-cc95be6c4e6c	1	James	Other
+2100e9ff-e822-437a-8ec6-a2ea1bf8c4d3	1	\N	Other
+2102a3b3-144f-4d4a-a7c1-c984419c7544	1	\N	Other
+210475f1-d155-42c6-b07f-d4912299ce63	1	\N	Other
+210a5f60-1f40-4c37-8bdc-bea48e68ebc4	1	\N	Other
+210a6f4f-34c1-4f2f-a0aa-58bb7ef96f7e	1	James	Other
+210ecbfb-a45a-413c-ba54-25ced3357987	1	James	Other
+211308d0-514b-424c-a47f-f9599c91cd89	1	\N	Other
+211cf509-0e6e-4d06-9545-667937e43023	1	James	Other
+211f75f9-0b9b-4047-9465-7a522c58ebd7	1	\N	Other
+211fc219-5a9a-4c85-82aa-44e89d68429b	1	\N	Other
+211fccae-ebb7-42ee-a22b-0e2a7aeec608	1	\N	Other
+2127acd4-ba69-4a3e-94c0-e7fe50d517f3	1	\N	Other
+2127cd25-b1dc-4c93-a93b-dfa3c4b10afa	1	\N	Other
+212e34f9-a2bd-4be7-be3f-5aa37c8bb6db	1	\N	Other
+2135c89f-6392-4c86-b8ac-d9b92fdd4272	1	\N	Other
+21431df3-9d33-4e11-b368-76325d83044a	1	\N	Other
+21436234-f619-4899-b1b7-d57e70d44d16	1	James	Other
+2143f6fc-b42b-4df2-9c3f-57bffea8e822	1	\N	Other
+2149a926-034d-459c-9852-d571dba66eeb	1	\N	Other
+214a158f-f83d-4169-8b33-11afe1d56ed6	1	\N	Other
+214caa6a-c265-4318-a019-04056b8d5a0c	1	\N	Other
+214e2609-98f9-4a09-962e-1f017175c699	1	James	Other
+214e30aa-fb05-4ab2-b40d-3966b76bfbb9	1	\N	Other
+214e4f55-db71-43a3-8342-f9fa4ede50f8	1	\N	Other
+2151f398-f3b8-4604-87ee-56a58e0ac926	1	\N	Other
+21525b0f-9eaf-4802-b5ba-c96c555bf680	1	James	Other
+2152dad7-8af9-4682-8f0e-ec60c6f70bdb	1	\N	Other
+21539c07-c1f0-413b-bdf0-8cb251d1c0cd	1	\N	Other
+2154d03b-cd0b-47e1-9d3d-7f9baf88a5ef	1	\N	Other
+215a8876-05b1-4cb5-88ba-2636924cfcef	1	James	Other
+215af0bc-a378-4e24-9e21-398aa16f5a24	1	\N	Other
+215ccb1a-6d48-41d6-ac96-c2b416b98fa0	1	James	Other
+215ff418-15ab-48d2-bf75-518cec1d659c	1	\N	Other
+21625de2-8a5d-4972-a633-4ed453f0757c	1	\N	Other
+2162e373-4b40-4538-9ee1-aa3885deeb70	1	\N	Other
+216384f8-d7f2-4b77-8b1d-6ed3f6d3f981	1	\N	Other
+2164a0b2-e34a-4d3a-aa21-5d4bd8b11960	1	\N	Other
+21651c5f-2647-4c85-b843-5e65a0bfbb86	1	\N	Other
+2167c47f-477e-4770-a0de-5b16ee0e565e	1	\N	Other
+21685377-3f79-4dae-9f07-fa87e00d7013	1	\N	Other
+216b1c0c-f7c5-439b-8b8d-9420150f9d0a	1	\N	Other
+216c9d7e-fdb9-4412-b59b-0ea830741150	1	\N	Other
+216d83b2-f812-4ad3-a7be-bac630c219a6	1	\N	Other
+2170c9de-9966-43ea-a635-d8780a7739fd	1	\N	Other
+2173a5c8-08e0-471d-be5d-dbfcfde23bd5	1	\N	Other
+21749855-367b-499b-8e38-db8b8cad4c6e	1	James	Other
+2175bab9-e0e6-4c62-9878-c7c0fe3d6275	1	James	Other
+21774cdd-008e-4771-96f7-db4df0c3c6c6	1	James	Other
+217913e3-2103-4704-9c73-763c6b7d530a	1	James	Other
+21794845-e27b-4521-bc27-55f81c4c1019	1	\N	Other
+217d53d7-65e2-4957-a6a4-69ac94648e8a	1	\N	Other
+217de3f7-04c5-4678-acf7-f8334f060729	1	\N	Other
+218087e9-f1ce-4cbc-9c3a-80b523185cdb	1	\N	Other
+21826670-6ad6-4a67-a9f2-71c5264d1a65	1	James	Other
+218e66b8-52fe-40fa-be46-0b039b3876f8	1	\N	Other
+218e96c7-b088-427f-a8ed-335c3fe4b2fc	1	\N	Other
+218f2801-e0d1-488e-934d-8735e3ad4e45	1	\N	Other
+21920d31-164c-4cab-b3b4-5e232935871b	1	\N	Other
+21922761-e33e-4620-a128-2dd958c6bc12	1	\N	Other
+21995795-e7b1-47fe-a21b-1240b39ba533	1	James	Other
+219d74e6-1bac-40c3-a076-9f177369455c	1	\N	Other
+219df0cb-5426-4ca1-b1b3-2692fcbec1b8	1	\N	Other
+21a7a52d-1de5-4302-846f-d0bb297aedbe	1	\N	Other
+21b17c96-89a8-41f9-befc-8184ca6c69fe	1	\N	Other
+21b56945-01ce-4442-b032-8a3856128816	1	\N	Other
+21b7972b-9c44-45c7-98db-375be294ad0c	1	\N	Other
+21bbac43-24d9-4174-b377-3673a700a851	1	\N	Other
+21c1fa20-c9dd-43e6-be0b-b47d442cfd89	1	James	Other
+21c205e1-ad91-46f8-8e69-3eb5ef49f32d	1	\N	Other
+21c69bb1-695e-4f0b-8013-a91b8a585240	1	\N	Other
+21c7e2e4-2e04-4a2b-b122-e15ae751fe39	1	\N	Other
+21ca0109-5700-459f-85d5-da8b32578794	1	James	Other
+21ce679f-2b41-4ddd-8d98-6b027348697b	1	\N	Other
+21d2d78b-5e5e-4542-8210-d8ee8fc975e0	1	\N	Other
+21db5d76-3f05-4103-9b3f-4bf9b9f6390e	1	James	Other
+21dcf643-0556-41d7-96ce-1e47912aa7b1	1	\N	Other
+21dfbc82-0447-4450-88e9-1fef2bc3bb10	1	James	Other
+21e137ea-1656-4bc2-812c-d93ec3948602	1	James	Other
+21e21a9f-dc42-4c49-bb3e-77dedd1e4607	1	\N	Other
+21e411eb-269b-4fa7-bd8e-e4d223a84554	1	\N	Other
+21e5ffce-01b9-4edd-b6cc-459efbb49e45	1	\N	Other
+21e6adc4-badb-4d58-8485-59bf4ff2ff3e	1	\N	Other
+21e6f91e-54b8-48d4-98b7-090e03deae3e	1	\N	Other
+21e8a9f6-21be-4084-931f-eec53a6d3b1b	1	\N	Other
+21f0002f-a601-4774-9f12-dcca8ddd90b1	1	\N	Other
+21f37d5b-9f21-4924-9714-04f3cf2e6e64	1	\N	Other
+21f6f924-9775-420c-9381-dc5a7dfc7c29	1	\N	Other
+21f7d581-2818-445e-ba27-8dcb1c73231b	1	James	Other
+21fb7baf-c0f8-48a0-8199-8952302fb0f6	1	\N	Other
+21fc1dc4-7867-4c2d-8368-7f7e712da458	1	\N	Other
+22028afc-e71e-4473-ac28-9b6bb24f7c2c	1	\N	Other
+2206bb7d-5fc8-4fbc-b94b-5351ee2374e8	1	James	Other
+22076758-c998-4ec6-958e-67d64dca5263	1	\N	Other
+22080728-1c28-11e8-8117-fa163e8624cc	1	\N	Other
+220a720d-5575-4b69-8c01-28e772e29826	1	\N	Other
+2211d8d6-3440-4ddd-8b9a-08c7b6987aab	1	James	Other
+22137184-7204-4580-99c2-813e07d5bb8c	1	\N	Other
+221b3114-919d-4066-9689-1eecc46ad96d	1	James	Other
+221e2f7c-fc19-48b2-8bc7-ec5a8c87b58f	1	\N	Other
+2220251a-0eaa-450b-887a-bd3fa370665b	1	James	Other
+2225f141-4d4e-48df-922b-0b9d8af8363f	1	James	Other
+222940ef-9986-455f-9b81-9f6f3c48a252	1	\N	Other
+22381b5b-402d-451f-b7ec-1f154c3b6dcd	1	James	Other
+223aaa20-1c28-11e8-ae47-fa163e8624cc	1	\N	Other
+2241f261-cab0-4ccd-baa6-8051b25e41ba	1	\N	Other
+2241fd76-d366-4ae4-906b-74fa2d14b622	1	James	Other
+224482d8-ac0c-49fc-9e5a-a656cae91f19	1	\N	Other
+2244bb5a-453e-410b-b07a-9d348705906d	1	\N	Other
+2244c454-3e76-4471-9d09-c6c9bdf6f484	1	\N	Other
+224747ec-8fb5-4e06-b864-2920c5aead1a	1	James	Other
+224cae3a-53ab-42f9-a9e7-ac94eeff3e79	1	James	Other
+224d58b8-f9a7-4829-ace4-7c1f16654c10	1	\N	Other
+224de123-a3e6-46cb-9021-763b251aea9c	1	\N	Other
+224fcaf8-28fb-44a3-ac74-751e75a59794	1	\N	Other
+224fd9cf-6b1e-4cbe-afd0-558929ab1e9b	1	\N	Other
+2254dec1-614e-4e96-adc8-c0b47f2c5321	1	\N	Other
+225887f1-daa4-4adc-bd98-8a867858c194	1	James	Other
+225cbab4-9f3f-4a33-a87c-8027697a793a	1	\N	Other
+225ee842-5afc-4e43-a21d-d67d5aaa135c	1	\N	Other
+225f1217-9ff8-433f-a1c5-7127fc4e7cda	1	\N	Other
+22605cb5-0f1e-4fab-a8c1-77deb1f9eaae	1	\N	Other
+2262d1d4-a817-48c0-90c5-9403a7908511	1	James	Other
+22648c9a-a9f8-4668-a9fb-943978ad74c1	1	\N	Other
+226d0888-62c5-461a-b910-bb3e3a740df5	1	\N	Other
+226e8779-1fef-48fc-a99e-34f9ab6c2857	1	\N	Other
+22755f43-124d-4299-b202-b4b27c72087f	1	James	Other
+227a75d6-563a-4cbd-ad82-019e3731e415	1	\N	Other
+22801431-e7ae-4986-8b08-f12310706163	1	\N	Other
+228458b2-3a48-4d02-b42b-5a8213e49eb4	1	\N	Other
+228a7d80-2259-4968-83a2-c1e8067a03c8	1	James	Other
+22930be5-7aa8-41f4-a54a-f9ae087a7170	1	\N	Other
+229979ff-4655-4cf5-bac2-dc1ad676d6cf	1	\N	Other
+229c4752-1e2a-4548-9c42-633cee209f2a	1	\N	Other
+229e3d38-9957-4b8c-a734-cda52f95cd25	1	\N	Other
+22a0469d-f42a-47fd-96bc-e880644dd052	1	\N	Other
+22a2c7b2-a0b0-49b0-83c7-dd44baceb703	1	\N	Other
+22ae1e24-d9e1-47ca-9c38-b6ea49ded380	1	James	Other
+22aeb472-7474-43d5-9bd8-c64ef022563b	1	James	Other
+22b13341-ef40-4e67-80aa-9f0f86bb0c16	1	\N	Other
+22b5f988-e020-4de3-b9fa-b4e237376cef	1	James	Other
+22b6a7d0-11cf-480e-aa90-26e4d825a8b4	1	James	Other
+22b8a900-f02e-4abd-9d8e-b5d8c4566dd1	1	\N	Other
+22ba58d8-2fcc-47ee-81ad-36774d9f4ebb	1	\N	Other
+22bd2398-61c1-4b06-bd32-4536e261baf3	1	\N	Other
+22bf4379-d556-4d2d-9692-d1905e5145f6	1	\N	Other
+22c01f98-f39a-45c6-9328-9f0deec9d540	1	\N	Other
+22c055d5-535f-49d4-86a4-e19075a0ae9d	1	\N	Other
+22c0c475-7124-4404-a50e-66779cf1fa78	1	\N	Other
+22c1a0e1-b685-4b29-89aa-bfed9b16e013	1	James	Other
+22c3724f-505b-4374-8773-3d4b40ad5c3b	1	\N	Other
+22c484e0-f22c-49c3-9804-cde9f0ea48a1	1	\N	Other
+22c7c107-1d3b-40d1-aad3-ae700c3d05b3	1	James	Other
+22c9375c-dd91-4259-b0b6-b3afb20b890f	1	\N	Other
+22cd145e-11cd-4390-a46b-7649a7446b24	1	\N	Other
+22cea2ac-4ef4-4aab-ad20-c20995c1b45d	1	James	Other
+22d2577f-c803-443f-ba45-b8a0ca223129	1	James	Other
+22d40ca4-7898-40c6-a3c4-4d2192a83e9b	1	James	Other
+22d44984-742c-4db9-a2e8-686f8aa5a474	1	\N	Other
+22d525f4-fceb-4166-b94a-2592a8cbf593	1	\N	Other
+22db35c0-621f-4f7e-9db9-10e3d7d9c882	1	\N	Other
+22e0a04a-fbbc-498a-ba67-d14648a1b194	1	\N	Other
+22e1112e-71b3-41cc-85df-901d98f9bd4f	1	\N	Other
+22e32c2c-a684-4d06-9122-d2793a58776d	1	James	Other
+22e994bf-2e72-434a-b116-ccedebd74cbf	1	James	Other
+22f110c3-589a-4223-b42b-1f6d5cf0d84e	1	\N	Other
+22f19f10-3f16-408d-9723-50a6bca8d40e	1	James	Other
+22f29bc2-489d-49e6-af70-b7b146ccaf0c	1	\N	Other
+22f506ad-c361-4192-8ab0-167f37a5c138	1	James	Other
+22f53c09-6c05-42bb-88f5-2fb589bc267a	1	James	Other
+22f94017-db11-4d5f-b1fc-773c366c539e	1	\N	Other
+22fca3e5-4896-472f-83df-d5494a3af26c	1	James	Other
+22fefcce-6924-432e-980f-f46ff7cc1d49	1	\N	Other
+23052fa1-03b3-4d97-8062-48a58c56ca33	1	James	Other
+230b0b26-008b-4a70-b1fb-ad6a973e7de4	1	\N	Other
+230b65bc-2400-4105-9c39-5540ac0997ba	1	\N	Other
+230c72ff-75d6-4479-8ef4-861baefba0a7	1	\N	Other
+230ead41-9ce5-4ce7-856c-2e2d2c02d75a	1	\N	Other
+2310bb95-59d0-41f5-8e6e-d4918e9e4ced	1	\N	Other
+23138f9a-dd5d-4952-b5e5-279a5f2e764e	1	\N	Other
+2315400c-2748-4070-ac00-10f27cf4af2d	1	\N	Other
+231b9235-8420-4404-9196-d29f18b6e199	1	\N	Other
+23214d36-fc70-47c4-9ce4-7dd0ad9dfc35	1	James	Other
+23328687-eb0f-42ab-b852-75d27ef0211f	1	James	Other
+2337ee80-2f90-443e-bddc-263d52b99b40	1	\N	Other
+233b885b-18c6-436e-8f69-36137656d6cf	1	\N	Other
+233f0533-335c-47e9-a936-b92f03cb6641	1	\N	Other
+23420997-7964-41d7-aece-d0a5abaa5786	1	\N	Other
+2346b7cd-1c63-43b7-bccf-7bea43c22c21	1	\N	Other
+2346c609-1ab1-422e-bf75-9ba71b563cdd	1	\N	Other
+2348ab58-48d3-4755-898b-5e858f7d607d	1	James	Other
+234f4646-1004-46bb-ac11-8959bd9b6377	1	James	Other
+23512463-4414-46d0-aca4-374a9ef23808	1	\N	Other
+23521444-ae5f-4659-858b-008b86e8ddd4	1	\N	Other
+2354ac05-e4e6-4e1c-a6e6-e9671eccd495	1	\N	Other
+23575256-7fcd-438f-aa07-d073f3b98174	1	\N	Other
+2359f916-6135-4a7c-9997-4fbd934048f7	1	James	Other
+23607fe4-4bda-47ca-a566-09f8a7dd4cdf	1	\N	Other
+23613a7a-e4ff-4ce8-9ff9-fd2b4603e388	1	\N	Other
+2362a698-0fa0-47d7-93db-179e1d1e7f9d	1	\N	Other
+23662c12-c307-4512-9336-74f2cc7f9210	1	James	Other
+2367e545-02eb-4375-99a0-a94575d5efbd	1	\N	Other
+2370c743-841c-42b5-84e7-05ee8ab10cb9	1	\N	Other
+2372f592-dea3-4752-a828-0e4130ecdbe7	1	James	Other
+237329c6-c5dd-4883-b7d9-2948015fb9d6	1	\N	Other
+23843ec3-1d94-42f8-badc-8226ae13ad82	1	\N	Other
+23870ef1-092e-4ab5-b54c-7b32a8283f6a	1	\N	Other
+238b4836-90c6-4322-bd5d-d3a174296e28	1	\N	Other
+238f6434-594e-467e-b061-8cd2695fe42f	1	James	Other
+23920815-4ef5-44e5-9aee-9b8a5ebe839e	1	James	Other
+2394271d-a176-478e-8126-1f133a44e1fe	1	\N	Other
+2395ae11-2680-42f5-8719-41b0d2483ed4	1	\N	Other
+23977844-dac8-4d09-9499-b5777c0001d9	1	James	Other
+23987d4f-a76f-42b6-87ff-e5768c0f6736	1	\N	Other
+239df016-1f24-43d0-9816-5014a10dcef4	1	\N	Other
+239ebbf4-abca-45ef-bd29-6893af81c34d	1	\N	Other
+239ec82e-0cc3-44b3-8485-a00519d08dbb	1	James	Other
+23a4bf71-fc8d-485d-af36-f8516de6186b	1	\N	Other
+23abd742-0bc5-47b8-ba86-9051fe43daa5	1	\N	Other
+23abde86-12a5-453e-bf95-5664216e329e	1	\N	Other
+23afccd3-4a99-4b07-ac83-68b9ab491816	1	\N	Other
+23affa8b-da24-4059-b041-ac95b99250ed	1	\N	Other
+23b54353-d442-43e8-b818-0e6d2f70e197	1	\N	Other
+23b7877e-1673-4209-b05b-b0c334ddc9fc	1	James	Other
+23ba4c4d-536f-436b-85b9-f6a81539aa00	1	\N	Other
+23bc17e0-aca0-455f-bb4c-0cd83369e387	1	\N	Other
+23bc735c-ae88-422f-874b-9472207e8a7d	1	\N	Other
+23beaea2-b91c-4df5-bad1-986fa0901f9b	1	\N	Other
+23c39a92-703c-49a2-a022-a8180964706f	1	James	Other
+23c3b7fc-cdfd-11e7-ab3a-fa163e8624cc	1	\N	Other
+23c5fd11-aae8-4fbb-88a5-817f54dbc1a9	1	\N	Other
+23c6b1ee-c1d8-4638-963e-4533a2578d58	1	\N	Other
+23ce9c66-036b-4727-abf7-dd3d3dd98cb9	1	\N	Other
+23d97ffe-4795-4c6d-99a5-e8ab95c66d5a	1	\N	Other
+23da7bab-288f-426b-ac1c-6ab71f648d6a	1	James	Other
+23e48a82-567a-4920-b9d5-b3769ddd6bd8	1	\N	Other
+23e85ae2-1b6b-11e8-a4ad-fa163e8624cc	1	\N	Other
+23e94087-e4a8-428c-b028-e3ecc743bb37	1	James	Other
+23f063d7-965b-45cc-a2fa-1d60645b0d2f	1	\N	Other
+23f0c191-d779-4581-a921-5916b11a7ad1	1	James	Other
+23f1436a-16c5-4164-8318-3cfdc2085dd2	1	\N	Other
+23f1ad02-5cf4-47c4-8469-36088675d282	1	\N	Other
+23f6196d-8ee2-48e5-8fe6-b734eca70c66	1	James	Other
+23f695a9-eb1d-4185-aad2-d9b88bdc567e	1	James	Other
+23f953d2-3d70-49be-bf1d-27169cc50118	1	\N	Other
+23fc3f82-1079-4e89-9646-c9ab0906c70e	1	\N	Other
+23fd5803-9667-40bc-bbdb-fa6ddf0441e0	1	James	Other
+2401bc48-b264-4307-9e49-5dccb3702fee	1	James	Other
+24086b65-3bdd-42d2-b417-3d84e7aa1e1e	1	James	Other
+240ba6a4-912c-4526-b1eb-9ea2285eb71f	1	\N	Other
+240d2551-0be1-4dfc-86bb-91ac9970d475	1	James	Other
+240d8b3c-5666-40a8-90ca-6d9ca81452e1	1	\N	Other
+24101217-ce41-48a6-98e4-08fdae938d59	1	\N	Other
+2412b2fc-f961-47c4-a14e-1c69f7b740a6	1	\N	Other
+24161884-6bb1-499c-9941-a83559e2a6ff	1	\N	Other
+2419f638-1b6b-11e8-9165-fa163e8624cc	1	\N	Other
+241b93cc-ab02-495e-8096-ce1f1be206c3	1	\N	Other
+241bee4b-63ad-4fdc-a417-de500233e42c	1	\N	Other
+241eb2ee-84ae-493d-a853-b3d8bc79d2f3	1	\N	Other
+241f5b5b-cbcb-44d1-91dc-adbf0049cad9	1	James	Other
+24202639-f397-4bf2-bae4-83c26c9c919a	1	James	Other
+242f70c7-8f1e-46d5-8574-9175bf7e4995	1	James	Other
+2434f90c-9fc1-49df-a772-873efbeb4135	1	\N	Other
+24383c3d-d4b6-4853-829e-71e63c2ecc37	1	\N	Other
+243f5dd4-40b7-435e-aa01-d3bb4d5c33bb	1	\N	Other
+244020d4-9038-475a-9824-6239052b10b8	1	\N	Other
+2441bad0-9e82-4cd7-920e-d8453d918674	1	James	Other
+24441815-94a0-4a41-b44d-5a0ac5e119af	1	\N	Other
+2447fff0-2abd-4eae-9759-5b2eafe3a872	1	\N	Other
+24578cc6-8810-44ef-8d80-a018f8567f01	1	\N	Other
+245c37c8-25c7-4a89-b1e1-5b50147f421c	1	James	Other
+245de380-6ac0-4c9a-a8ff-e27ccf0bb40f	1	James	Other
+24624925-7b1f-4480-a6e8-15dc8902d638	1	\N	Other
+24660ad7-4c57-4346-bea5-c2a3c7a67276	1	\N	Other
+2468f5f7-46be-40eb-b793-0db61a035247	1	\N	Other
+2469ceaa-7bf7-4c79-854e-4dacdec98954	1	James	Other
+246f1472-5d18-479e-832f-721edc7cd7c0	1	James	Other
+246fd0fe-632c-4609-861b-f94f3c083d7d	1	James	Other
+2472dc77-00ff-4aaa-9afa-3fd2caf8d267	1	\N	Other
+247392f6-6053-43eb-8a49-28e7a95ee8ac	1	James	Other
+2476b384-2b3f-4801-b0a7-14ae70b4847a	1	James	Other
+24773a1e-ffc9-4724-8499-dccf2253f06e	1	James	Other
+24798810-7de8-4973-8439-e6b7066a7e2c	1	\N	Other
+247a1326-5a72-4f2a-acca-736d669c04a3	1	James	Other
+2480835b-74e8-49ce-9722-26e0a936c2cb	1	James	Other
+2480f7e6-086c-4b5b-b0cd-dc4b68d352ef	1	James	Other
+24816a6b-dddf-4a08-b937-bb3e382082f6	1	James	Other
+24827310-fa87-49f2-a440-a6d99d88e74e	1	\N	Other
+248f4200-27c9-4042-b517-54da720db18e	1	\N	Other
+2492a175-1e61-424e-928a-611dd032baf6	1	\N	Other
+2492afea-b5cc-4a55-901c-8758391785eb	1	James	Other
+2498cf37-7e71-4871-96f2-b88e64222e5b	1	\N	Other
+249b3d0f-05ca-4377-9cea-624e102c4105	1	\N	Other
+249c5581-4a75-4ac0-9133-ba10b8bc6720	1	\N	Other
+24a240e1-33a7-4be7-9f3b-8cf65c2e4f27	1	\N	Other
+24a42ba5-41a6-4d21-802a-972c517fdeb2	1	James	Other
+24a726eb-d7a9-47ae-bec1-b1d8adcc14a2	1	James	Other
+24a75409-55e6-458e-975b-7a7d4323fe0e	1	\N	Other
+24ac752c-0a22-401e-820d-223113903a6c	1	James	Other
+24aee34b-ff89-4752-96fb-9eb8a84e9b71	1	\N	Other
+24b2663a-4b23-4d47-88d3-20a4788f4586	1	James	Other
+24b55746-22b6-48c7-9a7c-81c0bc80edb6	1	\N	Other
+24baad26-e8d9-454e-8f83-f8867713c335	1	\N	Other
+24c1fe6b-3890-4e3d-b390-d6386adb9836	1	\N	Other
+24c30eb0-0e46-449d-bc64-58e7c78afc4f	1	James	Other
+24c35936-e065-4c42-9f05-f2ac48f8f694	1	\N	Other
+24c4a7c3-fb3d-4421-8c41-2e63222bb7ce	1	\N	Other
+24c9eb67-b34c-41b2-92a6-ec6b88f6621c	1	\N	Other
+24cd1145-91e8-4cea-8ed5-c7c6fea1f290	1	\N	Other
+24cd8f13-03ba-4018-98a1-c30a34e4ff70	1	\N	Other
+24cf80c5-71e6-4956-a3f7-9960d0a54ddd	1	James	Other
+24d064ce-711a-4201-a7fc-d2f29df9cb72	1	\N	Other
+24d2889e-09f1-495a-a6de-5eee83d52c18	1	\N	Other
+24d4a422-1e0a-484f-9f93-d96f7a3ab48f	1	\N	Other
+24d5a96b-9743-4287-9db5-669f206b2da4	1	\N	Other
+24d80ec8-72db-4744-b1cd-a26c12f6c84c	1	\N	Other
+24dcda2b-3fea-474d-b387-5599d9f5d85d	1	\N	Other
+24dff8b3-b015-4fe3-b42a-5718a7b78aaa	1	\N	Other
+24e32748-4eed-4604-84dd-a51cdf758779	1	\N	Other
+24e453f4-bad2-4762-ab96-a0c60ab8dd8a	1	\N	Other
+24eb0cd7-54b5-4a86-8471-19d5e4cf056a	1	\N	Other
+24eb8bcd-c3f8-4ab2-8738-12f83741a1f7	1	James	Other
+24ee53e1-89d2-415a-9f93-1582787d35e6	1	\N	Other
+24ef202b-2077-496c-b901-b5c4fd7965c5	1	\N	Other
+24f2c376-9c97-48ea-a911-7340ac787f6f	1	\N	Other
+24f4bd30-af9a-48b8-a13c-69a412823f2b	1	\N	Other
+24f698e4-512e-42ed-b392-533c2652d57b	1	\N	Other
+24f868db-58f9-412b-899c-b5cb02098e27	1	\N	Other
+24fa884f-d15a-4b48-bab3-d73b7c3f0f22	1	\N	Other
+24fea653-39cf-45d0-9da0-52a4da57de66	1	James	Other
+24ff38e2-528a-494b-8fb2-bdb9d8d54d37	1	\N	Other
+25008c85-46f5-488f-bf8f-1e194ef81ccf	1	\N	Other
+2505ec8c-b29e-45fb-86a0-68c5394a0361	1	\N	Other
+2506b7db-ba29-43c4-8094-2c9faa2f4238	1	James	Other
+25093be4-c808-45c6-b08d-6cef24942e62	1	\N	Other
+250c132c-c93b-4786-8a71-81abe928a924	1	\N	Other
+25106c08-2c75-4df4-948f-11a5e4bd143b	1	\N	Other
+2514b2c4-f106-4efe-97de-c4ef862fbc5d	1	\N	Other
+251959ae-4f05-4b06-86e6-d55e88233d65	1	\N	Other
+2520a9d3-fe0c-4531-b11e-a98009687263	1	\N	Other
+2522c7d9-4cad-47e2-9555-b648f8d79d25	1	\N	Other
+252e5c3d-7b51-408d-88a4-8ee9aa8b7024	1	\N	Other
+25337f45-7dfc-4be8-b3ab-644dca97601f	1	James	Other
+2538241b-37e6-47a6-81bd-1f99e13c077a	1	\N	Other
+253e804a-2986-4691-9baa-77face9fe839	1	\N	Other
+25406a04-e4a0-4def-bf78-02d36d6e0526	1	\N	Other
+2543d1bb-41d2-4238-ad3c-25f1c7a4f644	1	James	Other
+25452124-9237-4833-88a6-143d16cb2f3c	1	\N	Other
+254d89ce-0694-4351-b82a-86a46fcad8fa	1	\N	Other
+25541885-909c-47e2-8493-d8a0a86096a2	1	\N	Other
+255778e3-dbd0-440c-8a1e-85a871649482	1	\N	Other
+2557a513-1d7a-4dd2-9fdc-d931f80a4c7c	1	\N	Other
+25586a52-33d5-41f1-aeb9-45068b9c5137	1	\N	Other
+256048bf-6c3e-4245-8c50-43be71bc87b9	1	James	Other
+2561525f-9ffc-4aca-bc74-09e52202ea89	1	James	Other
+25625fc2-3eb7-4cf4-be03-5859aa4a2da2	1	James	Other
+2566a01c-2c4d-4503-be19-35d7adee8aa9	1	\N	Other
+2566ea08-902f-4d01-9de9-84aa770b24b4	1	\N	Other
+2566fb51-0cb4-4858-a46a-e243483e1a3f	1	\N	Other
+256c802c-96a3-4d9f-9c45-951a9c0aa87d	1	\N	Other
+256cf4b7-aec6-4ed5-9db0-574169e87eb6	1	James	Other
+25788d46-80d2-4460-80ff-0409a29d10ae	1	\N	Other
+257c24a9-ef6e-4ac8-a1b5-d4effbab6ffa	1	\N	Other
+257e8c9b-80c7-4e1e-a5ec-794279aca56b	1	James	Other
+25812dc2-be28-4af6-9382-1fc732b0815e	1	\N	Other
+2585ffec-2d0c-4234-a56d-de87ef1100fe	1	\N	Other
+2588937f-e327-4f31-939a-ea2d7692d1d0	1	\N	Other
+258ad4be-2efb-4b0f-af43-237f2dae139c	1	James	Other
+258c1edf-8617-41ae-b0fa-ef9e8d0adc23	1	\N	Other
+258cb3c1-4b94-4b9d-a4c5-41f558ea7e06	1	\N	Other
+258ce425-5977-4650-a0f8-3f0c0c4fa1ca	1	\N	Other
+258d0504-8af3-4cf1-a382-e6ad62911fcc	1	James	Other
+258eeb7c-825d-47f7-8126-4451b73e20c8	1	James	Other
+2590f058-6998-490d-bcea-1565007f0555	1	\N	Other
+2590ff42-0692-4716-af35-2c4b3059df9e	1	\N	Other
+2591d45d-9520-4a3d-b2b8-0dc6bc122bd3	1	\N	Other
+25942dff-5374-4f12-b995-f42290798a9e	1	\N	Other
+2599be7e-4a47-4338-959d-174b4afe905e	1	\N	Other
+259a29cc-b309-49a3-9621-ad85eabe5c7b	1	\N	Other
+259d78c0-a503-4066-8df7-1a167619ca63	1	\N	Other
+259ec77d-d7c4-4e2f-8ae8-68ba8a98a8ad	1	James	Other
+25a31fab-212a-44b7-8fa2-59c59df42d47	1	James	Other
+25a352a8-0427-42ba-bd5c-104f3238e0be	1	\N	Other
+25a462f9-94c5-4330-baee-105e2cad91f1	1	James	Other
+25a94c27-cb19-4773-aa12-74800dd69f56	1	\N	Other
+25aa7b2b-9d26-4786-a952-57a6215ab31d	1	\N	Other
+25ac026b-df8f-4fb2-96ee-d5883970259a	1	\N	Other
+25adb3b4-ca1f-4dd7-bba5-48187da41a8e	1	\N	Other
+25b0dd38-0245-4928-b5dc-8d3276a712eb	1	\N	Other
+25b23363-8068-41a1-87d4-d4dad55f3032	1	\N	Other
+25b366a2-820c-4628-b05e-18c86b67c10a	1	\N	Other
+25b49a4c-ce1a-4677-b562-e316d1d270b4	1	\N	Other
+25b9d963-b3bc-4ebc-8baa-3766c019a06a	1	James	Other
+25ba2f13-0092-4e79-a552-db52872af8b1	1	\N	Other
+25bba676-2fe2-4339-9b7f-08c7792fe0c1	1	\N	Other
+25beb25d-0b07-49ff-81f6-6fd985a3170f	1	\N	Other
+25c0f37d-16fc-478c-9637-19e538c5de55	1	James	Other
+25c1e043-30bd-4eae-9cc8-68d646135463	1	\N	Other
+25c24e9e-3e49-4663-9b45-e8866277975c	1	\N	Other
+25c53b34-c864-4df3-b681-44d83cb2cc7d	1	\N	Other
+25c7ce69-8324-4bc1-ae2a-eac2aac419f2	1	\N	Other
+25c92422-44f0-4214-a30d-370817422d03	1	\N	Other
+25c98457-0aba-4d30-9c01-ec177e3d345d	1	\N	Other
+25cbd70f-2dfb-45ff-9961-8c093bd0eaf0	1	\N	Other
+25cdaf11-6e69-48f7-b112-7fef4b521472	1	\N	Other
+25d16e8e-aa41-4b1c-b2b2-250efdbe239d	1	James	Other
+25d673a8-4b25-4faa-b0ed-2cdbf8701fba	1	James	Other
+25da3499-3bbc-49b0-be4e-db15d1b82981	1	\N	Other
+25df3ecd-9d14-4ee0-bd89-448c8f2d8289	1	\N	Other
+25dff708-b16f-4b19-b65e-a1b53ee52b14	1	\N	Other
+25e2403f-3632-4c37-b3f7-4bf92dd12e68	1	\N	Other
+25e31c94-be81-4560-aea9-8ad30eeb2c94	1	\N	Other
+25e63d5b-fcb1-4543-ae2a-ada47b9b79a5	1	\N	Other
+25e9fc3e-6c3f-4f9b-b0d0-1bb6aaad9a11	1	\N	Other
+25ea8d35-885b-462a-986a-d2df65bebb72	1	\N	Other
+25effb59-6409-4d5e-a2d0-3242653bfe25	1	\N	Other
+25f4551b-dd5a-4c9a-be6d-c0dbaa04a800	1	\N	Other
+25f6049e-171e-4289-9f44-f07006c6aa96	1	\N	Other
+25f7827f-3d12-413c-b879-d4b8487d7876	1	James	Other
+25fa3870-ff66-428f-9700-27ae296a6e9f	1	James	Other
+25fc7d55-889f-48de-8207-5d56da9665d9	1	\N	Other
+25fffb84-382e-4283-952f-f385697d02c6	1	\N	Other
+26024068-59a3-4737-afd7-d5e3e10854ff	1	\N	Other
+26048566-49ed-477b-bf94-28a07d79a7ec	1	James	Other
+260647e8-3a5e-4811-9fcd-3ffc350a37ef	1	\N	Other
+260c319b-5618-4a14-b4a5-e44fb5327a78	1	\N	Other
+260c7cc3-1f8b-447c-b62a-2e0ca40a1009	1	\N	Other
+260d5480-6e74-4af8-9616-726eda8b0709	1	\N	Other
+2617a632-77a4-4db2-8ce2-2c57e8be487b	1	James	Other
+261bed7f-70ba-4bff-90fe-57d49c571159	1	\N	Other
+261c6916-e85d-45e0-8913-b0f2f69defec	1	James	Other
+2627aa86-187e-4235-b902-06d2df1f6970	1	\N	Other
+262841c6-20ac-49c2-ac26-193dd2e4f5d1	1	\N	Other
+26286548-2ab5-41a4-8dea-4ad5c130d6f5	1	\N	Other
+2629578b-934b-441e-8b32-7cd8ab6ce995	1	James	Other
+262dc2ab-7a3d-4c19-a8ae-0938a231aa9c	1	\N	Other
+26325fa9-b41d-4da6-8624-062c566bc729	1	\N	Other
+26339609-75f9-4b58-b9a8-7337f25a6c71	1	\N	Other
+263768ec-f966-4aa5-9052-9563f9287e1e	1	\N	Other
+26391fed-bc7c-4982-b9b5-b99fb8405c39	1	James	Other
+26399b67-14f4-40c5-a379-6214898d9482	1	James	Other
+263ada26-9d46-4e19-b7c8-805f2f92d770	1	\N	Other
+263bea8f-0bc4-4b3b-994b-0bac375da0a1	1	\N	Other
+263dbe2c-bc56-4c8a-8324-28c7e814ff4c	1	\N	Other
+2640e81b-3931-4f8b-aa2b-a867ab2cb753	1	\N	Other
+26412f71-fb14-4048-84fb-bf424f972ee9	1	\N	Other
+26422d9d-9171-47ab-9f50-c2e2ee417bf2	1	\N	Other
+264511c1-d1c3-4478-a974-6562a51facf8	1	James	Other
+2645f717-3a46-43be-ae0a-2a711827a586	1	\N	Other
+2646a54a-4c1f-4b95-8594-c6bab7f73ed7	1	\N	Other
+2647fbaa-7845-43a8-853d-b45795e93463	1	\N	Other
+2648f10b-9f11-4d2a-b2f4-72d43c92b219	1	\N	Other
+2653b7c0-b0ee-4cc1-9c08-cff8c3d68015	1	James	Other
+2655623b-ea21-4ccb-b3fa-53d420596b26	1	\N	Other
+265703f0-cbf0-469d-858b-705a0de0e87e	1	James	Other
+2657daf4-9968-46eb-9f63-0da4e575ec64	1	\N	Other
+265814b6-a61d-4eed-b7eb-5db18756dca9	1	\N	Other
+2658d537-c2f0-4c7b-81c9-bd97b3d5b13e	1	James	Other
+265a3941-b495-44cd-b2a3-c81b2b76d2ee	1	James	Other
+265b3145-5945-4acd-b7d3-f362d25b0cf0	1	James	Other
+265d1606-1db0-4ee4-965a-8c331f244211	1	\N	Other
+265ec096-b59d-4952-ac89-ea762201427e	1	\N	Other
+266853e5-894d-4eed-bd95-531a8f249a9e	1	James	Other
+26690a39-13b6-467d-b855-4791d66a102b	1	\N	Other
+2669eaf2-4337-436a-93a2-69ea884ca1fb	1	\N	Other
+266c8e7f-f676-4092-8d4a-e020ac424de6	1	\N	Other
+267a65c0-3f52-4c6f-b3b9-bd51a4fa707d	1	James	Other
+267a98bd-55dd-41c5-9618-46a34e9396fb	1	\N	Other
+267ad0fc-5186-47f7-96f0-95678099b344	1	\N	Other
+2682810e-5497-4b64-9790-1b7d1c467027	1	\N	Other
+268343b8-c0d0-42cb-8856-05d447985a42	1	\N	Other
+268497ab-44d3-4938-9e93-60f8eae11dfd	1	\N	Other
+26858fb5-c9e1-47d4-b6fe-96015f04392e	1	James	Other
+2691c46b-9367-4075-bccd-64892118b465	1	\N	Other
+2693d0fb-60c2-4353-81e3-0626e1cc9d02	1	\N	Other
+26950529-4ecd-41b5-a7ea-b1ac1e7b3bf4	1	James	Other
+269cc769-45dc-4b70-a84c-83f6a6dddbb4	1	\N	Other
+269d79b2-f9b9-47e5-9315-bdf1718b34e3	1	James	Other
+269f4ae4-6de1-4120-9717-f7f00f2f9074	1	James	Other
+26a0e4f7-18c6-4c50-b563-64200c149e09	1	James	Other
+26a4e76a-7ed5-48ad-9b10-99c7a7af8fc3	1	\N	Other
+26a60571-ee29-4a30-a074-0d9fce6a2fea	1	\N	Other
+26a92c3d-a533-4dd2-8be9-88a78eacd6b5	1	\N	Other
+26b19948-80b2-4fae-abaa-25abc559c198	1	\N	Other
+26b2ce36-d4eb-4100-8a51-b644a0cab832	1	James	Other
+26b77ce9-b8a0-49ad-a575-d10155fc3bfd	1	\N	Other
+26baefde-12eb-434e-8cfc-4698648c38c6	1	James	Other
+26bf1f21-2c29-4c82-bc4d-f22ab33be0e9	1	James	Other
+26c3c684-018e-4231-acf6-9f2bda1b1f74	1	\N	Other
+26cd2be9-3f96-4715-96b2-33c8a0f38117	1	James	Other
+26cd8151-b236-4986-88d5-c20f20ecc008	1	\N	Other
+26d11235-6e65-4fbc-b2ed-a88f9438e05b	1	\N	Other
+26d2ba89-1afc-4b80-a666-4313b278e3fb	1	James	Other
+26d50a42-8523-49c2-b9f9-4bcd08822ad8	1	\N	Other
+26d777ba-48a0-475c-a99f-411db7581ef2	1	\N	Other
+26db652f-3bd9-40ba-93ab-025a3f2c3692	1	\N	Other
+26dd3f26-e0c0-45b3-93d0-2e43912b3e3d	1	James	Other
+26de34cd-f9ae-4dfe-8d7c-74da77d52427	1	\N	Other
+26df11b6-35fd-4947-8e93-aec136c84d4e	1	\N	Other
+26dfa5dd-90ba-463f-be42-26f4d4463c5f	1	\N	Other
+26dfdce8-3cda-43bd-a43d-c0cc1e538bbe	1	\N	Other
+26e11d4e-aefe-47b0-8c50-4293e7b80baa	1	\N	Other
+26e34911-46a2-408b-ad9c-3c83794029a8	1	\N	Other
+26e4d99a-380c-47da-b32a-d28df37153d5	1	\N	Other
+26e847dd-1a87-43a3-93b0-823687e987c6	1	\N	Other
+26ee22c6-5bbd-4de7-9209-dfa7457b2624	1	\N	Other
+26ff22df-844b-4a20-9b0e-72ab7b2dfeb4	1	\N	Other
+27008373-4a73-41e5-a249-b56bffeea733	1	\N	Other
+2700b4e3-d161-4fea-bc17-76b147b1f53c	1	\N	Other
+27020e68-7397-48e6-bf3a-713141a40ef4	1	\N	Other
+27081c93-a28b-4921-9000-c0d5156a46e3	1	\N	Other
+270c1bd5-cc5e-4146-9f95-0cfe15ade927	1	\N	Other
+270ee2be-62f6-4baf-95ea-8ed4b7143121	1	\N	Other
+2711ba99-ca71-4475-91fc-0317977a43a3	1	\N	Other
+27132589-f5ec-4b2c-9cea-225a2694f0b9	1	James	Other
+2715f6a6-9adc-452e-b24d-eec27cfe6a54	1	\N	Other
+2716d173-7920-4c0b-b9fb-f72289a4c590	1	\N	Other
+27189056-8ec8-4524-831f-c9d162a26d71	1	\N	Other
+2718e283-9d1d-45f1-b427-7076a0f81369	1	\N	Other
+27191716-24f4-4e90-ba35-1bfa0f885e37	1	\N	Other
+271abaa1-293f-4b6f-94a9-e99c3d078b49	1	\N	Other
+271e545f-ec46-412d-854b-4f8988474785	1	\N	Other
+271fb83c-8700-40c8-9f1b-787e2543430f	1	\N	Other
+2722aac5-4151-43a3-a8e4-633584b22472	1	\N	Other
+2726697a-f8bb-47c9-8725-eb8d7beb24ef	1	James	Other
+27268f78-c363-4b97-a5d0-ef88cba58f02	1	\N	Other
+27284c75-17af-4bfe-a2b4-a06e89084da8	1	\N	Other
+27295505-2c22-433a-a91d-50fa926f1fc8	1	\N	Other
+273116f5-e5b8-4ef6-8d5d-c00d11ba152d	1	\N	Other
+27312a59-1060-4107-8894-4c89f75a43d8	1	James	Other
+273551e9-521b-4e2d-9e6f-52392b3c357c	1	James	Other
+273668b9-7556-4959-8dc1-873ea62b2417	1	\N	Other
+273c00e3-8e56-48e2-b402-950c54d34760	1	James	Other
+273dc093-10e8-4b81-8caf-9e3d16daedaa	1	\N	Other
+2742511a-6184-4abe-8e0a-ca9955d0f6ad	1	James	Other
+27441a80-b7fa-4b5c-a345-aec0505e9f15	1	\N	Other
+274b0601-9a75-4334-9d40-abc92ea2a7a8	1	\N	Other
+274b74f0-058f-49c0-a707-2905a0d1dc4f	1	\N	Other
+274be7ed-27f4-4d61-b6e8-68c541485ea9	1	\N	Other
+274c8470-e357-43cb-a25d-55f02c28d77c	1	\N	Other
+274f47f7-d616-424f-8168-b835cf9fc6bd	1	\N	Other
+275191b4-6b77-4aba-8e27-136ea03d12e7	1	\N	Other
+27545d06-51b6-4df6-a821-feada848f157	1	\N	Other
+2754761b-d46b-4a49-83c6-33816c62bd44	1	\N	Other
+27558253-9b7c-4a1f-b423-9ac5ac5176bf	1	James	Other
+2755dd8b-d791-4dd5-8ee9-2fc15120c39a	1	\N	Other
+27561e72-0878-11e8-ac1a-fa163e8624cc	1	\N	Other
+27566c40-155f-444a-9162-be4f816dd833	1	\N	Other
+27593515-e4c0-49d3-a3bb-5183bf61dcbd	1	James	Other
+27597543-2fdc-457c-9ec3-d8f3c660ecd3	1	\N	Other
+275d5fe5-19ae-4969-8590-c74aaaac31fb	1	\N	Other
+275f0e56-d55b-4a48-a277-0ce8e9b2bc52	1	James	Other
+275fb5ae-ca77-44e0-b9df-32ead1312b68	1	\N	Other
+2761d87c-76c9-445a-aa3f-172f28368341	1	\N	Other
+2762b4c1-3d85-4e35-9993-140b7e163983	1	\N	Other
+2768b059-2865-4b4b-847a-ff991cfb67fa	1	James	Other
+276b63d0-c7d9-4859-bf8f-d4e2cf978dc9	1	James	Other
+276d1bdb-2f83-4431-932b-4d6a95234d5e	1	James	Other
+276d78d0-fa40-415b-8f4b-e919024b905c	1	\N	Other
+277329f1-59bd-4fbb-b51e-7448c4772207	1	James	Other
+27742649-bdfa-484a-93ed-397518357069	1	\N	Other
+27797afe-47ca-4ab2-9c94-bd52d8bec958	1	\N	Other
+2780b747-864a-4cbd-be31-497f5b387227	1	\N	Other
+2780cf0a-8592-4630-b47e-b72d5e39084a	1	\N	Other
+278226a8-8920-40bd-a311-6bcf837d7942	1	James	Other
+2782a9a0-1ff3-41e1-ba68-fbad3940ed1e	1	\N	Other
+2782b964-bb24-4a90-a359-e1f71b743072	1	\N	Other
+27830c80-04a2-4b6d-ba9b-7094fc2b46d0	1	\N	Other
+278382cc-420c-433d-82ec-a57a54fd94cf	1	\N	Other
+27844582-3e1d-4ab1-ab6d-933db3e70ca0	1	\N	Other
+2787e124-1090-46ef-9788-2de7a7e5c5ab	1	\N	Other
+27887e1a-5763-422b-8b59-9f2bb14af101	1	\N	Other
+278901fd-851d-4468-8c37-e42029124588	1	\N	Other
+278a8ea2-040e-408f-8ad6-cbdbe9a90b1d	1	\N	Other
+278bb286-d807-47e4-b8a3-e293e1a931da	1	\N	Other
+278bcf85-edae-41e7-8e91-f53601c7439e	1	\N	Other
+27920c02-0878-11e8-90f4-fa163e8624cc	1	\N	Other
+2794a5f0-a016-4669-a8f6-41ae106aff36	1	James	Other
+2796c109-3b83-4ad0-bd22-9428877f8bfc	1	James	Other
+279bbb22-e5c7-43af-aaab-377937853b2d	1	James	Other
+279ddd55-37e0-4b78-a4e6-8b3695b884d5	1	\N	Other
+279e0317-982e-4796-88c8-d561df00a9a2	1	\N	Other
+27a105ca-44dd-4dc8-a0e5-f851880a619c	1	James	Other
+27a3b235-2fce-47f9-8823-286a0cf1db77	1	\N	Other
+27a407e6-22fb-4ebb-a8e2-8a40b40906fa	1	\N	Other
+27a64d5e-9999-4788-81b1-38762315fc61	1	James	Other
+27a7aa34-7290-4291-8a0a-9b7627fd149e	1	\N	Other
+27ab4465-4a03-41d2-8160-76ddeff28667	1	\N	Other
+27b0ee5d-34c9-4cc3-bbfb-1a86f7b372c5	1	\N	Other
+27b2ecdb-3f60-46fd-b892-fe25b52502cc	1	\N	Other
+27b42a44-0529-4665-8e8d-1e4d3d645812	1	\N	Other
+27b6ee96-e398-4945-aebb-a69326cfffb4	1	\N	Other
+27b7a8d7-70d3-4fa4-8b71-78d61c8afec5	1	\N	Other
+27c18dd7-1561-4027-84b9-62180c8bf572	1	James	Other
+27c42e07-d2e0-4dcf-84f9-da44ae89a942	1	\N	Other
+27c8effa-8575-4bf3-9d52-11e7ed18ff3d	1	\N	Other
+27d37748-555c-408d-831b-f870ba4f04c0	1	\N	Other
+27d381a1-9083-4c87-a8a8-eacfd1933e62	1	\N	Other
+27e4e7e3-ddde-4fe6-8659-5f8591807578	1	\N	Other
+27e57670-af13-4da5-bccd-cc8a102dc1b4	1	\N	Other
+27e88678-773e-418d-bb9a-bdc36b554251	1	\N	Other
+27f0f968-9d4d-4b8f-b2a6-551e75dcd2a2	1	James	Other
+27f3ca48-0c12-493c-8cc6-1bd51ab862d7	1	James	Other
+27f4098e-7c52-4cf7-89e9-159d7be3f4b6	1	James	Other
+27fc3003-19ef-45c3-9784-7c090d75431c	1	\N	Other
+27fc6b1d-d2cd-42a0-889c-bd90d4856750	1	\N	Other
+27fe6cf2-0617-11e8-8ef2-fa163e8624cc	1	\N	Other
+27ffcbbe-0924-4703-9f35-aefeead272c7	1	James	Other
+28017800-a7ed-465e-b2bd-a10ec4f17541	1	\N	Other
+2803c1f6-e589-4c0a-9f03-d7f98ebd69cf	1	James	Other
+28042ad6-3006-4f04-bc66-3b2353af2357	1	\N	Other
+2805b0fa-8f95-40e7-8d27-df1c11f6a214	1	James	Other
+2817e2fb-410f-4e67-8261-449d30189993	1	James	Other
+281b5805-1c16-4010-9bc2-6a74182b2e6d	1	James	Other
+281c1f01-516f-4e5b-9b3f-93847e62e041	1	James	Other
+28242f82-30de-4228-8b25-87b450529c67	1	\N	Other
+282cc3b9-8f6a-4f1c-9d46-75015634b4cd	1	James	Other
+2836d3fd-47b7-4f90-b7ff-dfd7fe8f07bf	1	James	Other
+28438f34-27fb-4b71-9b58-0e4575fa9b33	1	\N	Other
+284556a7-5557-43f5-8894-e5bcf9c53c65	1	\N	Other
+28488bea-c69b-469d-bd23-37d0e09bfe07	1	James	Other
+284b37d0-be30-4b1f-81ea-d9d2e315fa13	1	\N	Other
+284b643b-7da8-40e9-a8b9-f753ca907f1d	1	\N	Other
+284bd9b8-e99c-48d6-ad07-b3c19f72a4cc	1	\N	Other
+2850572b-8374-4e5e-a39a-98c55d1ce041	1	James	Other
+28507b23-2714-46e6-8696-8ced0107cd56	1	\N	Other
+2851ef0c-1840-420f-b8cf-010aecba7f89	1	James	Other
+2852003a-f982-430f-b797-430aedae9ee8	1	James	Other
+285389f7-2d40-4054-8b82-2a5e471bd928	1	\N	Other
+28542b35-8c44-44c2-ac94-77129cd18082	1	\N	Other
+28577bdf-456d-469a-9de5-ea572bd25fab	1	\N	Other
+285c5618-e18d-445d-9f20-811b84e3ec13	1	\N	Other
+28625145-612a-4689-b47b-785338aeae16	1	\N	Other
+2863efea-e493-42f7-9ac0-2171dac366cb	1	\N	Other
+2866515e-c3e5-4030-b25f-aa05fef2c9be	1	\N	Other
+2867d553-46b7-4d72-be14-c699cff5de6d	1	\N	Other
+28696f75-421f-4c4b-82e4-ae5b4ee2fedb	1	\N	Other
+286b0394-0617-11e8-8ce0-fa163e8624cc	1	\N	Other
+286f0edc-06e7-4cae-90a0-2449e46df12a	1	\N	Other
+2878d536-3a31-43a6-93eb-8dcb18a255f7	1	\N	Other
+287ae4eb-9dbd-4508-b9f2-a530556467a6	1	\N	Other
+28810cd9-1001-4076-b74f-9636eeba5d3f	1	James	Other
+28812356-4a06-459b-b988-e36e6927a19b	1	\N	Other
+2881dbe8-951e-44f4-a11c-1994326701bf	1	James	Other
+28835623-8175-4c11-8473-c831e6a52a60	1	\N	Other
+28845854-ff73-45ba-9622-769dff0781b7	1	\N	Other
+288548f1-f089-45a7-a23f-4e8e6f44a987	1	\N	Other
+288ae5c2-3fae-449a-afe7-ae3e3d5bac43	1	\N	Other
+288b6b55-6c71-4dce-8270-336e83f19281	1	\N	Other
+288d6a56-8b5e-4872-8b41-8a9db516c6af	1	\N	Other
+288fb021-154e-4fc8-8e17-fbba881db27b	1	James	Other
+28922577-a8c0-4662-91ad-f72cf3da5731	1	James	Other
+28927b55-a7b4-4d79-a4b9-b08b22874c9d	1	\N	Other
+28930db6-2bd0-488e-8a18-5e1df81affe3	1	James	Other
+28971ad4-e5fa-47f0-bf87-96b04db05e4b	1	James	Other
+2898f4d9-eacf-4c71-9e0a-1ea43753629e	1	James	Other
+28a1232b-db4d-4035-9e3e-b0ac11681a84	1	\N	Other
+28a598d2-7abd-4bee-949d-13cfaeab7b29	1	James	Other
+28a5b2c1-f909-400a-b465-aa2be075b2f7	1	\N	Other
+28a71102-1c84-4d5d-ae60-ba9d85eb68c4	1	\N	Other
+28a762db-510f-4454-8af5-a34d466ad0e9	1	\N	Other
+28a77029-b552-4ed2-8116-2a19f9b06760	1	\N	Other
+28ac8cfe-7da7-4198-bd04-97e6f632f386	1	\N	Other
+28ae56ba-0ac9-11e8-a688-fa163e8624cc	1	\N	Other
+28afd521-820e-424f-8e6f-61463d2a78ab	1	\N	Other
+28b070cc-d8cc-4621-ac1a-a616d2a48929	1	James	Other
+28b40b5f-28c6-4ab1-a843-0d3c861b8901	1	\N	Other
+28bb669b-6488-49bd-88b0-7c6ec64fa250	1	\N	Other
+28cda1a1-9ccb-49d3-a080-889f4400c1c6	1	James	Other
+28cea4ff-b3b5-40a1-8a8a-3660f6321865	1	\N	Other
+28d07350-4e99-47f6-be43-acdb9a6a03bf	1	\N	Other
+28d76ca2-0b80-4f03-9a26-505d1206006e	1	James	Other
+28d7e371-f346-4a43-bdd4-5e97df0615c7	1	\N	Other
+28d82a2a-8481-40b9-a10b-9e33f77efabf	1	\N	Other
+28d8c9d5-e1ea-4c73-805b-953ac005b21e	1	James	Other
+28e2ed25-7711-4a54-8cbd-c914691785be	1	\N	Other
+28e4c3d0-0ac9-11e8-b614-fa163e8624cc	1	\N	Other
+28e4edf7-c5bb-48f6-abb1-f639d2c56cec	1	\N	Other
+28e59d0a-7415-4c69-94ea-09bab4873934	1	\N	Other
+28e94128-f30b-4169-8da6-aaa40c9dd3eb	1	\N	Other
+28ea1d00-27fe-4118-aa4a-b683da81d99b	1	\N	Other
+28f4d6a5-596e-4ca5-805a-8621fd4c4c16	1	\N	Other
+28f6e3cf-1913-468c-99c5-378397edf7f2	1	\N	Other
+28fa1445-d75a-4ff7-ab3a-fa83df6dec0c	1	\N	Other
+28fb1163-436d-4ec9-9926-800c836ceaec	1	\N	Other
+28fc603b-cd0a-41a6-b54f-f731dda85786	1	James	Other
+28fe8809-32de-42dc-bed6-bb9bc43b70fa	1	James	Other
+28ff7139-73fb-4a58-aebc-8f10fe453211	1	\N	Other
+29018cce-aefb-481b-91b6-fa3515685cb5	1	James	Other
+29060ce4-ce2f-49fe-ab6c-949698e9c228	1	James	Other
+2908fc94-4c66-42f8-b383-37974b6d59e7	1	\N	Other
+290c6ff9-c5fe-48af-9f4b-712fd4f7a975	1	James	Other
+290c9578-3b76-4d0a-bb3e-2d5ae713e428	1	\N	Other
+29155a25-14b3-469b-82b4-4e1c80b82f1b	1	James	Other
+2915d9d2-5409-495a-8c46-14e32001eb12	1	\N	Other
+291930da-4651-4afd-bebf-8ca36219426f	1	\N	Other
+2929db81-4831-4eb5-9969-c726f6b101bd	1	\N	Other
+29308cca-8b88-4d93-bb4e-5873e56fa1a9	1	\N	Other
+293183c3-7e39-4e47-b3ca-0b302d10c8f8	1	\N	Other
+29339d0b-9e0d-4283-a335-a9e63bca458f	1	\N	Other
+293a9573-3f4f-43c2-8cec-b17b3ee8c937	1	\N	Other
+293cb795-1fc7-4819-8094-37b590b17095	1	\N	Other
+294663af-7c30-4dc6-b516-49f747c3aad3	1	\N	Other
+29475c80-768b-4f64-b3e8-1fa4006abca4	1	\N	Other
+294a2840-b231-4d0e-be36-f7ae33507d51	1	James	Other
+294b9ad6-b390-4a16-ab7c-ffe32857dd3b	1	James	Other
+294c7213-9b15-488d-a73a-d5a6afe88497	1	James	Other
+294eadd7-8e66-4602-a52a-89b2a556141b	1	\N	Other
+29500d6a-387b-4797-a6d1-92febd7b5aab	1	\N	Other
+29533f8d-4a08-411f-8368-f797b5d1b39e	1	\N	Other
+295d3da2-84d1-47fe-ad17-ea3f10c1844f	1	\N	Other
+295f00b5-e9ce-4681-8cbd-0c3d56a7a38b	1	\N	Other
+295f66f2-4c5a-4024-8e76-9ce8ac62c6de	1	\N	Other
+2960ca4a-2709-48fe-a7c5-33c55e86573d	1	\N	Other
+296c81c4-d19a-4639-9c30-660a13d29ad6	1	\N	Other
+296e4f7e-eac4-49ef-b2ed-dd1ef2689a66	1	\N	Other
+2971fcd2-1553-4d0c-ad70-9bbfc151e4a0	1	\N	Other
+2972e702-d3fd-47b7-b72d-a2c8250560a8	1	\N	Other
+297985a1-3260-4b0f-9e04-17cfe6c5f8c3	1	\N	Other
+297bc7d5-1a98-4de7-9174-4cdfd9d394e2	1	James	Other
+2982791a-e8e5-4183-8f4b-d7b73fc091b9	1	\N	Other
+2985c34d-5581-45d0-9b37-4ecb4fd777eb	1	\N	Other
+298e5885-6592-4697-a5c7-85d59701f446	1	\N	Other
+299553d2-3f7d-4b1e-a6ce-5fdd1526145f	1	James	Other
+2998d2b5-bb34-4b76-b44f-c1fcb2106b60	1	\N	Other
+299a7eb2-12c7-4107-839b-1193728dd042	1	\N	Other
+299b9f4a-ebd5-4e62-9915-103e5e639918	1	\N	Other
+299bd3f5-074f-4d81-b060-c59de31db830	1	James	Other
+29a19e25-600e-496c-b69f-08aba644b409	1	\N	Other
+29a231b3-25af-4c29-b342-9144a2cde613	1	\N	Other
+29a2c158-db26-4d82-8e60-db779ed9e990	1	\N	Other
+29a98e4b-9a14-4a58-8cce-fa8f3024e3ac	1	James	Other
+29a9b244-f922-4ee9-ab4b-d7557c0cc6bb	1	\N	Other
+29aa0d56-5ddf-436d-995d-5ff0ec60f030	1	\N	Other
+29ac38d1-23b7-4a3c-b4c2-d0256ea062fa	1	James	Other
+29ae0663-1fb3-4e1e-83d7-ab3412065996	1	James	Other
+29af3fbf-c16f-4e40-9872-b2c711c3ab01	1	James	Other
+29b04ccd-2a14-4c79-af35-3bd6f33ea52f	1	\N	Other
+29b354eb-66c6-48ec-a2e2-1300b5c59b21	1	James	Other
+29b50fe2-d0cc-456f-a52f-af5bdb4046db	1	\N	Other
+29b58cd0-4bf2-4ca5-9ab2-17eb4b51454f	1	\N	Other
+29b7c165-cbec-40c4-9618-30465d3a351d	1	\N	Other
+29b8527a-d65b-4173-b988-dcf4c8c537b8	1	\N	Other
+29b92b26-0c54-4430-b851-bdda5f3598d8	1	\N	Other
+29b99806-ff64-40b0-b652-74aec0fb0890	1	\N	Other
+29b9b011-1068-4765-9f5d-21206bb50ecb	1	\N	Other
+29bb4394-29d9-4f5a-b92a-5b63d2bb9486	1	James	Other
+29bd8957-7897-4571-9724-1467654d4082	1	James	Other
+29c9309c-89f2-4d9c-8bad-9fe2d87e0d5e	1	\N	Other
+29cabebe-3d59-464d-a6d4-9a310423a4af	1	\N	Other
+29cc4ae7-44a2-4d4f-b700-2fe2839316b0	1	James	Other
+29d07590-2b13-4095-9438-00effa4a4b00	1	\N	Other
+29d5d324-1bf9-4116-a2e1-e2c2cea6bb7d	1	\N	Other
+29d8d31a-a493-44d6-8405-67fdd05bf4ba	1	\N	Other
+29d97d03-25e2-4216-ae50-e85512ca1897	1	\N	Other
+29da5009-6924-4e34-8453-47c14b0052ec	1	\N	Other
+29dfc1d7-01d2-42f9-a6dd-2efd42d0db75	1	James	Other
+29e09507-8e59-4b56-a07d-c3f62d128f1d	1	\N	Other
+29e7ef00-178b-4b70-ad0d-9bbf2f5bdb49	1	\N	Other
+29ec3c76-3f07-4ddb-9b74-3f00b7191dd2	1	James	Other
+29ed39c7-e837-480a-bea6-e78397b133c7	1	James	Other
+29edd495-2955-4e30-841d-d4f1cd235ae6	1	\N	Other
+29f286f7-6db8-4bb5-a438-0bc492a71cf1	1	\N	Other
+29f40333-7668-47a7-ae7c-64b9c7fa091d	1	James	Other
+29f64126-6695-4306-92fc-6f55cdc740df	1	James	Other
+29fbfea2-ad68-4e33-bed3-21efbf1c0ca0	1	James	Other
+2a00dab5-e831-4fc4-851f-5e6b47858a25	1	\N	Other
+2a0c7fdb-8878-498f-80dd-0b15467c1931	1	\N	Other
+2a0ca655-adb0-4bc0-bb83-a05b9c36a15f	1	\N	Other
+2a0d9022-f61a-4c05-814b-4919987a835e	1	\N	Other
+2a162042-4678-4dd3-945f-80ae6c9d59d3	1	James	Other
+2a16ee88-c5d3-4c91-ad76-e46cfe5cf058	1	\N	Other
+2a188bac-f173-4ffc-ba19-5e19377d1b5f	1	\N	Other
+2a193511-6c4c-46d1-a606-8c58afcc6ff7	1	\N	Other
+2a1d09e6-67cc-4069-8793-cbd194789c5d	1	\N	Other
+2a1e7f44-bdae-4909-9432-57a38b829f59	1	\N	Other
+2a1f599e-3fbe-421e-a248-df1be60afcaf	1	James	Other
+2a2389d6-e0da-49cc-b465-0f446c895916	1	\N	Other
+2a2a0443-9954-4933-9d05-77c57d4b1e5e	1	\N	Other
+2a2cabcc-b6a7-4187-a7ed-844699e581ef	1	\N	Other
+2a2ce74c-9829-488b-9ec9-75514bc4df6c	1	\N	Other
+2a2dd8ff-c2d5-40d2-ad47-2ea4df411c3f	1	James	Other
+2a2e2606-2008-4614-a454-dfb12db33534	1	\N	Other
+2a2ea63a-b12d-4b3b-aefa-b5be441ae63f	1	\N	Other
+2a2f56db-48fe-4db2-87cf-75230079883e	1	\N	Other
+2a3049da-dc93-402f-8fe9-148d23239a1e	1	James	Other
+2a39c352-ffd9-4a48-93f3-b6d3dca234d2	1	\N	Other
+2a3daaaa-3c50-45f3-bd44-58da9ef38d2b	1	\N	Other
+2a3f1991-d554-4aca-b469-b6addee98059	1	\N	Other
+2a408515-e2ba-4c24-abe2-b4a6778244b7	1	\N	Other
+2a454c63-9357-430e-8f4c-418feda9725e	1	James	Other
+2a489beb-6bd1-4bcd-bf87-2d8a3a705dc2	1	\N	Other
+2a48f67b-a0e0-43a7-9719-1e88e5f1d55a	1	\N	Other
+2a4fc155-62c8-49e0-adb0-5fd9a787926f	1	\N	Other
+2a52901f-3b4e-434d-97d2-edcc50c99861	1	\N	Other
+2a52c1c1-1963-4de8-b5bb-7f71a236301b	1	\N	Other
+2a53b78c-7ebf-453a-8f7d-ca6fd98f9145	1	James	Other
+2a55fd20-cc99-413f-9ad2-ae9521d95e5d	1	\N	Other
+2a5623ec-24bd-4333-b731-8e0c03bd4bdd	1	\N	Other
+2a5929c1-51c2-4a27-8f68-93ad1c4cae59	1	\N	Other
+2a5aad0b-a5cc-4b52-b714-06554eb91326	1	\N	Other
+2a5b3442-c900-4f2e-9441-61e9597746e6	1	James	Other
+2a5da151-3c6c-4632-ae45-a86d4344773e	1	\N	Other
+2a6107d6-601c-4f9a-8d27-0851c8147e7a	1	James	Other
+2a61a807-0255-4432-b856-5a25ce3b60a3	1	\N	Other
+2a6221c2-dfc7-4041-9256-0d16bafaf8ed	1	\N	Other
+2a6488ac-74e1-4c8c-a414-64deeb3e75ec	1	\N	Other
+2a64ef93-1f05-4dcd-9a92-548b17365986	1	James	Other
+2a653542-d043-474a-b196-57712db85c52	1	\N	Other
+2a7d4b52-3778-4551-8aff-915cd828939b	1	James	Other
+2a894f2c-c170-4859-910f-1436e69037bb	1	\N	Other
+2a8b6b09-7256-49ac-b92b-d3f7cc4dcb8c	1	\N	Other
+2a8b8931-3553-4932-9423-8654e41ddef0	1	\N	Other
+2a92928b-56d3-4bda-a249-b999ca2648af	1	James	Other
+2a9475f1-a5a0-40f0-9ac4-b83f495de9ad	1	\N	Other
+2a9483ab-5842-470f-9316-37731df03560	1	\N	Other
+2a949a42-522a-4770-a476-e540305362c3	1	\N	Other
+2aa63181-0fa4-41e8-8e0f-2e6938a218e5	1	\N	Other
+2aaa4ff8-a3ab-4f4d-8b4a-d015d65dc887	1	\N	Other
+2aae9c4a-8e44-4091-87f3-746f973d4a5a	1	\N	Other
+2ab15020-9c71-4ec3-883d-c8559d668a0a	1	James	Other
+2ab399ef-2d2b-4d59-afd8-5fd2da728c57	1	\N	Other
+2aba6f27-fadd-4c86-b2b0-6e1141cec1a7	1	\N	Other
+2abb812c-ada3-40e9-a5b0-91fabcbdd704	1	\N	Other
+2abc37cc-5f47-4cd9-9b6a-349326d10d1a	1	\N	Other
+2abd95d8-55c5-475c-8a47-8b8730089b7d	1	\N	Other
+2abda9c4-6789-4f25-a589-4173b3510e4a	1	\N	Other
+2ac20b0e-960a-427e-b7bc-48d8c923cf8f	1	\N	Other
+2ac87888-1da0-41cd-87fc-9992ffcf8335	1	\N	Other
+2acafb67-e90c-4620-a332-125b3d2a1b60	1	\N	Other
+2acfb282-4a14-44d9-ac2e-366889efb1c5	1	\N	Other
+2ad65c0f-a4b7-40b1-abfe-787f17ac81de	1	\N	Other
+2ae480e4-f86b-4e01-a162-264449252cb8	1	\N	Other
+2ae569cb-5e30-4be2-ad6a-aabd2c047bd7	1	\N	Other
+2aee5361-a7ec-4e9c-9bfc-02819c05e6b6	1	\N	Other
+2aee84b9-5200-416b-80d1-15ed3bc626ac	1	\N	Other
+2af5ae8c-1066-4f74-8e7b-3f00d9d1e6d9	1	James	Other
+2af86602-b442-4e92-87a6-3f218ae3e00c	1	James	Other
+2af971c4-4a84-4a23-bc1a-d4296c5bcefd	1	\N	Other
+2afafef3-f189-47bb-916e-fdf203856b62	1	James	Other
+2affc522-798e-4cb2-b64a-7810d88330a1	1	James	Other
+2b00b320-39f6-47ff-86fe-1c423d7aa1d4	1	\N	Other
+2b01176c-763c-4c54-b433-1e46e476654a	1	James	Other
+2b02738c-03b7-41b0-9b93-76d4ff3aee3c	1	\N	Other
+2b032d5b-1f18-4108-aa85-fc23d7be505e	1	\N	Other
+2b06cc5f-ad41-428a-82bd-5dc5b312ff42	1	\N	Other
+2b0ab6d7-7804-45f5-9ce9-13c32d49dfc4	1	\N	Other
+2b0e6752-4bd1-4cc6-a28e-df2c355d9469	1	James	Other
+2b104d5b-2b8a-49eb-85f6-5e3bcbcd3b11	1	\N	Other
+2b12961c-0fe4-4a92-8a50-948088cec174	1	James	Other
+2b14e5d7-ec96-49f1-a084-4111d0676b1f	1	James	Other
+2b1aead3-8c6f-4e79-92e8-e705c8dcdd68	1	James	Other
+2b1cb4f3-92ca-436c-9a93-3f3ee1f6c156	1	James	Other
+2b20c18a-4df5-4eb7-a1b6-35fc67ef7593	1	\N	Other
+2b22f6f9-a8d8-488e-90bd-0f1dbd12585f	1	James	Other
+2b2418ed-6b8b-4c34-9a40-3cefe92dacd0	1	\N	Other
+2b25be59-5e15-4aca-901d-1ae5dbf52aa8	1	\N	Other
+2b2a8ecf-b0b2-440d-b447-6e0ec7042f32	1	\N	Other
+2b2a9557-e435-4f1d-9652-4e0daa34d04b	1	James	Other
+2b317e49-cb7c-4b8a-b4a9-888265ac5456	1	\N	Other
+2b389fab-16db-4179-b20b-9c695c90a5cb	1	\N	Other
+2b439299-3cc4-4cdb-af55-260688a84610	1	\N	Other
+2b4bd18d-f584-4b13-9cc7-ee3677776e22	1	\N	Other
+2b4e291f-c7ad-40f3-9bb9-c8f58ad3b58a	1	\N	Other
+2b506316-ff92-4ee8-a869-b0103b6bac45	1	James	Other
+2b527f20-1091-4855-9503-d5da5d67ca38	1	\N	Other
+2b537762-de7f-4b74-a965-b1ae2cb2701c	1	\N	Other
+2b5648d6-50f5-4875-a59b-2b5da57a6b27	1	\N	Other
+2b56f2e5-8520-4bc9-bf59-337479f84838	1	James	Other
+2b584c21-b023-407d-bb32-6497fd8d29aa	1	\N	Other
+2b5963ff-3c9c-4578-a440-92db8faabd13	1	James	Other
+2b59e14a-3309-4fa3-b999-237f492a5c84	1	James	Other
+2b5ab46d-d978-4f98-adda-01b18726ea19	1	\N	Other
+2b5ed518-7e41-4b0f-9f37-0f8607abce1a	1	James	Other
+2b5f38e9-36f8-4517-a862-93ed66e58779	1	\N	Other
+2b61abab-44b7-4485-a073-0889d08e60e7	1	\N	Other
+2b62458d-1e59-4639-8e61-6a743367354e	1	James	Other
+2b69e82c-c75d-4f9d-8936-cb85c320ee9d	1	James	Other
+2b6aa5c2-4d02-4708-aba8-09c3d09c5912	1	\N	Other
+2b6bdc08-071b-4f8a-8b9a-a8e044ba9c38	1	\N	Other
+2b6fe977-c938-41b0-87ed-44885bae95d6	1	James	Other
+2b746d7f-4f61-4d39-beea-a3b5d596d0bb	1	\N	Other
+2b799d70-6187-41de-ab10-84a6e6dab789	1	\N	Other
+2b7a134b-5659-43ec-859b-f44701e81ad5	1	James	Other
+2b7a1dce-8f1e-4a5f-8810-f51bfc98c72d	1	\N	Other
+2b7db5dd-5f35-466c-83ec-c2569de95a64	1	\N	Other
+2b7fc90d-18cc-423f-a5ac-fa3398fdc301	1	James	Other
+2b81acf8-49e7-48dd-8c96-615c84c0b5da	1	\N	Other
+2b859370-7f70-4587-8dd9-b2f9ecc7dc0e	1	James	Other
+2b8a0ab5-e1b0-417a-9376-c37f1cb44791	1	\N	Other
+2b8ac1dc-6838-4995-a417-79922a7221e6	1	\N	Other
+2b8f9c24-658b-4c47-ad64-09af3cd21d84	1	\N	Other
+2b90ebbc-076b-46a0-8727-9a3386c4acb2	1	\N	Other
+2b92ad0c-25b9-4a4c-830e-a1adfffe8fa0	1	James	Other
+2b9fb68f-8cc9-49bd-b9fb-805748cf20d0	1	James	Other
+2ba1123d-dd32-499e-b991-de431769fe3c	1	James	Other
+2ba4e50c-eaef-4150-bb66-99159a928851	1	\N	Other
+2ba8b8ec-cb26-4dfb-81d7-250b9807ad12	1	\N	Other
+2ba9f262-8d18-4fc0-8904-adf6679187bd	1	\N	Other
+2bac96cd-90ec-45f7-856c-64b732d13488	1	James	Other
+2bafcba0-91d2-4ec3-b8d3-ee146535cfbf	1	\N	Other
+2bb191da-ebb3-48f0-90d3-f61db0eed3cf	1	\N	Other
+2bb68509-16fc-4823-9852-a61a4c89bdc5	1	\N	Other
+2bbacc27-7f3f-4e65-a46f-ba8fc0e3a8d9	1	\N	Other
+2bc236d2-f294-4cc3-b424-5bba056eb508	1	James	Other
+2bc2d45c-4b09-4c6d-bd3e-09fc253790e7	1	\N	Other
+2bc4a4b7-0040-4477-bb13-f63e33120f23	1	James	Other
+2bca8601-2035-458a-9b21-fb012e8ab793	1	\N	Other
+2bcaef62-e5ae-4b28-84b8-1ccd669154bb	1	\N	Other
+2bd56f5d-2938-459e-9ac2-d8312c263ce7	1	\N	Other
+2bd7fc49-0e31-46cf-bbed-0cbbedf48300	1	James	Other
+2bd91d00-7fb1-41cd-8dc9-347e6b910512	1	James	Other
+2bdacc8b-e435-4516-959d-6a3ba51b1972	1	\N	Other
+2be3ad90-085e-4ae1-950f-8aa308adce11	1	James	Other
+2be3c9d3-8ed9-4c6d-9a3b-051f9213b466	1	\N	Other
+2bece78d-06a0-46f0-adef-b74b8ee7738d	1	\N	Other
+2bee68e1-812f-40f7-9eb0-d4e50ddd0589	1	James	Other
+2beefd04-7b56-40de-aef4-fdc332cd9d7b	1	\N	Other
+2bf560fc-6d89-4c7f-98f7-897760489e78	1	James	Other
+2bf619ac-742e-4daa-9b39-a49a9a257a68	1	\N	Other
+2bf765bb-3cb1-4ceb-b1a1-18347743ec97	1	\N	Other
+2bfdbd78-572f-46aa-b80d-0f9ca03d3166	1	\N	Other
+2c001e4c-7733-4274-b312-56dcccdf3c20	1	\N	Other
+2c04c013-8454-4878-8879-8fb10759de10	1	\N	Other
+2c0827ab-3384-4d1f-a678-a17004155105	1	\N	Other
+2c0acbac-abe6-4ef7-be16-6cab75242aa6	1	\N	Other
+2c0c9127-a9d2-4dff-afb2-4304714a40f3	1	\N	Other
+2c0ed05e-0d2f-4907-9876-eec4e8967f8c	1	\N	Other
+2c104c14-7617-4daf-948c-2ba410bc04f9	1	\N	Other
+2c11a966-7c1a-4e0d-ad88-223498ce52c9	1	James	Other
+2c11db7b-220a-4e7a-8263-1451e7420dcd	1	James	Other
+2c132c9e-2a02-4f74-9017-8599699dda05	1	\N	Other
+2c16e795-5c63-439c-90b6-d66d7edd1e43	1	James	Other
+2c195f51-8f16-4ef6-9ec0-17e77cab4241	1	James	Other
+2c1ff012-3f2f-4c80-b5e3-fb683d901c2c	1	\N	Other
+2c24af58-f8fc-4954-aa2c-34afc8736171	1	\N	Other
+2c24d3e1-f75a-482c-a367-e9171cd2829b	1	\N	Other
+2c2527cb-ada2-43b7-ba7e-acf6c0a59528	1	James	Other
+2c26dd68-ddfd-4361-a5b7-7b6438f82bd3	1	\N	Other
+2c28c0d3-0958-438e-80fa-5df67517a7ce	1	\N	Other
+2c2cdb35-9c55-40b6-b5aa-5c2271333ae8	1	James	Other
+2c335e73-3b26-415f-85c0-9da90a43629e	1	James	Other
+2c340c05-f671-47a0-a9cf-1c4d5a390afe	1	James	Other
+2c3441a8-0207-4996-8e91-79691c6561fb	1	\N	Other
+2c35144a-5811-4a61-a823-5cdc61bee2ab	1	\N	Other
+2c38a50e-75d6-4e08-a04e-45c87589db6b	1	\N	Other
+2c3b2bbd-5562-4085-b81f-f69f2093e329	1	\N	Other
+2c40d41a-7329-4f4d-8fce-3f684e90f65b	1	James	Other
+2c41c77f-38e3-45b1-abc5-24c63e9350cd	1	James	Other
+2c42b22b-bfcc-42b7-b357-44edaab35dfb	1	\N	Other
+2c4354c4-03e3-489f-8399-10676ab747ac	1	\N	Other
+2c473777-cb79-418f-8bf1-359aa97bd31b	1	James	Other
+2c4b0a3d-0eca-4c59-9ef3-4d67bc3ca7c8	1	James	Other
+2c4f534a-3ed7-45ba-a8b3-75d16210193a	1	\N	Other
+2c4ffbe2-d8b3-4389-8cac-24e852892f07	1	\N	Other
+2c5413f0-7b28-4db5-899d-4f7f73ca3334	1	\N	Other
+2c543abd-ccd0-46e9-8ce8-2118f3c4a540	1	\N	Other
+2c547f5b-03d3-49dd-a7df-5cf0506bef8d	1	James	Other
+2c553f87-f323-46ec-ab28-3937c33dd395	1	\N	Other
+2c5ae48a-aca1-407b-a0a5-13de8aada585	1	\N	Other
+2c5db04e-c9da-4abc-8a66-af67910a8154	1	James	Other
+2c5ddece-afe6-4736-804e-c9f80ab87e66	1	\N	Other
+2c5fdeec-f146-48fa-a8b5-850eb0d509e6	1	\N	Other
+2c65ebbc-ba80-4cda-848e-e20bdd36baa9	1	James	Other
+2c68c75e-3c66-4c2d-b944-dd29a16d00b5	1	\N	Other
+2c6be875-4ba7-4cf6-aba0-a018fce156a2	1	\N	Other
+2c6d30df-525f-463f-b33e-19ba6118d1d7	1	\N	Other
+2c6d36eb-888e-46d2-800d-94dc07b72202	1	\N	Other
+2c787ab5-abe6-4427-8d17-aaf45cc7fd3c	1	\N	Other
+2c8155b9-b7d9-465b-b435-74477e8e15a1	1	James	Other
+2c85c63a-7de1-4ef7-9f36-9f7b42158c54	1	\N	Other
+2c8b3e9d-a153-47b2-ac1b-3a3d61502a39	1	\N	Other
+2c91c0c7-87f6-4165-81fd-f060a4744a36	1	James	Other
+2c9f06b3-ea0e-4015-9107-b383bfef4d54	1	\N	Other
+2ca1d1cc-488d-4181-9b96-9fe608ea5c71	1	\N	Other
+2ca1f9a3-0cef-4fcc-a5fc-d2fabd6147db	1	\N	Other
+2ca2bc34-3615-43b2-9e1d-d8cb171b45ce	1	James	Other
+2ca526d0-4618-4f64-ad39-c0af8e507415	1	\N	Other
+2ca9fab2-15d6-4235-aab1-8e07c872a968	1	James	Other
+2cabe21b-cb58-4a59-8d5e-de7e21122a67	1	\N	Other
+2cad367b-2912-46f3-b124-06ca6a5836f2	1	\N	Other
+2cadfdcb-f9ff-4d16-b1c0-c855ef309e6a	1	James	Other
+2cba10e1-9e72-48e5-aeaf-a906d003cd59	1	James	Other
+2cba4867-fd27-4853-b908-d125fc9cbe4c	1	\N	Other
+2cbe2db9-a696-47c1-b2f1-93b580bf4038	1	\N	Other
+2cbfca9b-e661-4927-a7e2-95d147eb76b5	1	\N	Other
+2cc07ef2-a405-4913-90b9-4c3542a524d4	1	\N	Other
+2cc22221-ca53-4d7e-b079-ecf9376c5abe	1	\N	Other
+2ccc075a-c3da-429d-8141-96cf8e722fc9	1	\N	Other
+2ccde59c-675a-46bd-8327-793da77a85be	1	\N	Other
+2cd1224e-e505-4047-a490-9a4ed706cfa0	1	\N	Other
+2cd1a5c5-6cc7-4332-b174-d73beb99ccda	1	James	Other
+2cda7fc8-7253-4c50-b740-0809cae02f53	1	\N	Other
+2cdc1147-42bd-4e19-9bce-0314a5b7d2f8	1	James	Other
+2cdcaf45-29ac-4b82-82ab-a8ef70d3ee8d	1	\N	Other
+2cdfb5fa-28ed-4e6b-9527-98ae2aa30582	1	\N	Other
+2ce6399f-69df-4853-823e-77d98a6717c1	1	\N	Other
+2ceee083-d868-4578-9b17-55f83208e6da	1	James	Other
+2cf34ecf-d0b5-4192-9e52-ed3760cafeb9	1	\N	Other
+2cf59351-fe31-40d5-81f4-c0417ff4aa25	1	\N	Other
+2cf5ff2d-7b13-4b1f-b207-f1999a392a20	1	\N	Other
+2cf9ef7d-def5-4e96-af4e-cc4a70d56797	1	\N	Other
+2cfe780a-e5fc-4de7-aa6f-771e323e9ad8	1	\N	Other
+2d02a526-ee1c-4c8f-a2df-471af91f3c14	1	\N	Other
+2d05cb5a-2fa2-4af4-873f-4aaf6375dd12	1	\N	Other
+2d062960-ff4b-4c0c-9632-f7425a98f771	1	James	Other
+2d0729ef-e405-48df-9b63-515d4cc2f749	1	James	Other
+2d09459b-ca4a-4ceb-a043-96078d2d43a9	1	James	Other
+2d09961e-bcd5-4353-b337-098e8f2b3eee	1	James	Other
+2d0c7529-070b-4006-93f3-76d52ff030e2	1	\N	Other
+2d16184e-6b2b-4619-bcc5-7f2d434945d1	1	\N	Other
+2d192c46-0cce-4417-b70b-6f58a264339a	1	\N	Other
+2d1f569f-a155-414c-a952-6a3557474fec	1	\N	Other
+2d217877-f06c-4e68-a52a-d9bc69809742	1	\N	Other
+2d25acde-46fb-4066-a257-24a96d1377c1	1	\N	Other
+2d25b87e-b297-4369-a8f4-17a0a75af446	1	James	Other
+2d284127-35fd-4cb8-9cbf-7f32e43915ed	1	\N	Other
+2d2c7abf-c652-48a5-a4f5-4fa740028cda	1	\N	Other
+2d3119f7-55b6-4de4-9e79-241f78ddcd5e	1	James	Other
+2d341210-7231-4169-8135-565c3fa4930d	1	\N	Other
+2d34b91b-33c3-4eaf-8800-bcdf61b75c74	1	\N	Other
+2d3bde9f-41be-4186-b62b-49c1752502b9	1	James	Other
+2d3cd0a5-e4fa-4476-8f8f-23d11a2b21b1	1	James	Other
+2d3df37b-bf75-46a4-a86b-7d83500c9ab2	1	James	Other
+2d3e2520-0738-4554-bc92-ffc054817e18	1	\N	Other
+2d41039a-60d9-4d71-8b6a-4bd193e23798	1	James	Other
+2d414396-9e9b-4d3c-a7ff-93e0ccd06423	1	\N	Other
+2d452e51-ca10-404a-8e61-9fcd9557a41b	1	\N	Other
+2d47c0fd-178f-457c-abb7-6944981529c5	1	James	Other
+2d4896ae-5fd4-4352-b43c-e8f3e54f19f7	1	James	Other
+2d4da0a3-03c9-4074-a43d-e5beb2a02fb5	1	James	Other
+2d4f92e6-6a2f-4aba-8eeb-e1127c6a12ea	1	\N	Other
+2d532e14-cc96-4d49-9a29-6a02e69db680	1	James	Other
+2d53b7df-8521-47f9-9469-6890b369e53d	1	\N	Other
+2d56d1ad-b655-49ce-b85c-9c513130cb80	1	\N	Other
+2d5866c3-c255-44f8-ad0f-87c9a880bb85	1	James	Other
+2d59762e-c504-4e60-b998-8a8f953632d9	1	\N	Other
+2d636596-0858-48b3-a05a-198a8feb1cb7	1	\N	Other
+2d643a25-f563-4319-8488-e0534671f96a	1	\N	Other
+2d6465a6-a326-4594-8968-02fb51b462ed	1	\N	Other
+2d670d59-73ee-4282-87e5-18cd3be71503	1	\N	Other
+2d695a00-0d8f-4f0d-a02f-c1687efb27c5	1	\N	Other
+2d69d2f4-cb8f-44d5-9866-f60cb0017231	1	James	Other
+2d6b0d25-23f0-417c-8409-4bc0c0d7beb2	1	\N	Other
+2d75718f-9aae-42ef-ba8e-2e8cbc42cf62	1	\N	Other
+2d7cdd0a-ff89-483d-94fc-a011a4c6c1f0	1	James	Other
+2d8489e7-f9ba-4b23-ab18-7570716c26a1	1	\N	Other
+2d862331-7c77-4419-9982-b69e16519f08	1	\N	Other
+2d877a1f-efc4-4d45-abbc-aec7d20e5afa	1	James	Other
+2d88b912-77c6-4d63-a16e-b7fbe429a14d	1	\N	Other
+2d8cf6cc-dc2a-44e6-bf1c-aafe6d4f149b	1	\N	Other
+2d8e60d4-13fd-4468-aa83-ceb4150a315b	1	James	Other
+2d92c9b7-a462-4701-aad3-6bf3c114cc83	1	\N	Other
+2d964bfe-7df0-4509-b011-369a14f9f5ef	1	James	Other
+2d995443-4687-4cd6-b21b-5ebd20c2c139	1	James	Other
+2d9d7df7-2ea7-4437-8978-b1846f445d5e	1	James	Other
+2d9fc71c-fd6c-4b74-bf85-f9e0b71466b9	1	\N	Other
+2da4561f-39ee-4e86-be66-2c58881d2809	1	\N	Other
+2daa5675-319a-4fef-8c6b-71ae1b59fb7b	1	\N	Other
+2daa9033-c4f3-4ffc-9964-9885704d0ada	1	\N	Other
+2db10edf-e5be-4eaa-aab1-8f0a9b2c6656	1	\N	Other
+2db7b2a3-bf9f-4500-8d6a-5e03f133cc1f	1	James	Other
+2db7c12f-f07d-44c4-975d-9c0ead6e9a83	1	James	Other
+2db8fd66-ef08-4540-91ae-1d0406cf8884	1	\N	Other
+2db9f574-22cf-4879-8855-71c198fbcd26	1	\N	Other
+2dbad3e2-094c-4f05-b489-781b61a1eb0c	1	\N	Other
+2dbadc29-69d7-4d93-9085-62c8cd76f155	1	\N	Other
+2dbb4948-dd5a-475a-bdd0-b18a8d2be4db	1	James	Other
+2dc10f47-bb64-488a-b7d4-b457cdd2e836	1	\N	Other
+2dc792ab-8008-41c6-9876-8a156e551baa	1	James	Other
+2dc8d099-59f1-4a8a-8930-d2e04d52b02b	1	\N	Other
+2dd4576c-39a1-405e-ab09-2d9213c4a9a1	1	\N	Other
+2dd4baa4-50bc-4eac-94c8-066b31bb7f0a	1	\N	Other
+2de084d2-3fc5-486b-bc3b-9d4b94897ef5	1	\N	Other
+2de13114-c3a2-4dfa-970b-8f20c7aacded	1	James	Other
+2de25194-1e98-4c7c-83d5-c5a23eef16cb	1	\N	Other
+2de53d13-f1c6-4e7d-a252-ec1581582ef0	1	\N	Other
+2ded4798-0ae8-11e8-8f75-fa163e8624cc	1	\N	Other
+2deddba3-19c4-4d2d-af56-a4851fdd97b6	1	\N	Other
+2df1aab3-e2fe-4474-ad36-e9e2db9ae441	1	\N	Other
+2df3a975-68c9-45b3-ba7b-8d50c1ce38f9	1	James	Other
+2df46445-5751-470e-8034-3b95a9ecf4dd	1	\N	Other
+2df8ede8-ee47-445e-a491-7cf31917d4fb	1	James	Other
+2df95cff-203f-4e97-b378-4d44fa386268	1	\N	Other
+2dfb04e5-f0ce-4896-937e-b5469a1ef2b6	1	\N	Other
+2dfce1fb-d1f9-4d1d-a20d-cb790c54d806	1	\N	Other
+2e09c962-f948-4263-97c9-6021cd6c962c	1	\N	Other
+2e0baa50-90e0-497a-8750-1bc767365ccd	1	\N	Other
+2e0cb0c0-95a3-4cb2-826f-715848b73fec	1	\N	Other
+2e0f0f02-3cc5-48d3-9269-8d6c68498909	1	\N	Other
+2e114281-a812-4f48-9d3e-0683ed33637a	1	James	Other
+2e1468d6-2a8f-4fba-9f7f-8e4dfaf32088	1	\N	Other
+2e152752-9459-471d-999b-a0b92025e852	1	\N	Other
+2e18b022-ee36-416b-9049-52411111cb6e	1	\N	Other
+2e1c8575-fdec-4628-82f6-538f6b2ef25c	1	\N	Other
+2e21cce6-47f1-44ff-91b4-bac384ccf3f2	1	\N	Other
+2e274074-0ae8-11e8-affa-fa163e8624cc	1	\N	Other
+2e275717-eefd-43ff-97a4-4cc65847f763	1	James	Other
+2e286d7a-06ef-11e8-a12d-fa163e8624cc	1	\N	Other
+2e2d24b1-009f-4f24-bd69-a2017191c69e	1	James	Other
+2e2dd705-66a9-4b6d-956e-c5cd9c77c781	1	\N	Other
+2e342099-331c-4efe-a111-6f783b9ff471	1	\N	Other
+2e3804fd-02a7-412a-87d0-b31c1220682e	1	\N	Other
+2e40b0dc-2d01-4401-bbf3-784511aa788b	1	\N	Other
+2e41b47c-f66a-421a-ab6e-3149edd1985f	1	\N	Other
+2e472ca5-197e-4d16-a6bc-b59d13fffb30	1	\N	Other
+2e47347d-72a2-484e-8b05-7d04e4f33f83	1	\N	Other
+2e47c1dd-dd1d-4854-97ed-a91215db1a44	1	\N	Other
+2e49f2e1-8fab-45d9-be80-e294613c54a1	1	James	Other
+2e570f18-d6ea-45df-bcea-4eac60008943	1	\N	Other
+2e585537-c63c-4273-ba2f-07e1d9fd1200	1	\N	Other
+2e5f5814-7e09-40bb-a346-496153c4c297	1	\N	Other
+2e622203-6bf6-49d0-9c6a-fec71e360f41	1	\N	Other
+2e681a85-fa1c-419b-be34-d80e5f33eb65	1	\N	Other
+2e723f1b-9770-499c-9da0-5225d83087ee	1	James	Other
+2e74bf8c-5bf6-44ff-b7c6-7744b1b17ff1	1	\N	Other
+2e792527-9882-4af3-b04d-2588936ffff4	1	\N	Other
+2e7eec0a-8007-4070-947a-849d42503bb3	1	\N	Other
+2e80996a-ee8e-4f52-a269-50fbe1f68bf7	1	\N	Other
+2e865866-83de-4d98-a061-1176ebba2791	1	\N	Other
+2e86f9a3-169e-4f54-84db-35916eaef2ee	1	\N	Other
+2e88b340-0484-45c1-8b95-871a88d3933d	1	\N	Other
+2e8966f6-6e20-4297-9da9-56bdadb3011a	1	James	Other
+2e89d746-6cc8-41fc-9163-ba542185ec04	1	\N	Other
+2e8c7ce8-06ef-11e8-a27a-fa163e8624cc	1	\N	Other
+2e8f28dd-8af0-4281-98da-b12ba73d072e	1	\N	Other
+2e9478ac-0bab-4adc-a82d-21c28eb9d91b	1	\N	Other
+2e9a981a-c15b-41ec-804a-7f883ebc4718	1	James	Other
+2e9bd1a0-9b37-4262-976e-a4a4389d396b	1	James	Other
+2e9deccc-18d6-4ad8-b713-742ae97507ad	1	\N	Other
+2ea04cf3-8a49-473a-a1a6-d795409e9b29	1	\N	Other
+2ea199b6-49a4-4329-9a74-fb7c4193cd41	1	\N	Other
+2ea428e9-6723-498a-8b6c-59a1e8743be4	1	\N	Other
+2ea5caf5-b5bf-47c8-803f-64b94574f494	1	\N	Other
+2ea678db-bd04-4bab-b94e-d7a952e013fd	1	\N	Other
+2ea92488-ae9e-4d4a-8a74-75b7c7808e4a	1	\N	Other
+2eb08349-207a-4957-a5e4-91bd4255e190	1	\N	Other
+2eb76e53-a2d9-47fd-ac22-c1b31587ea56	1	James	Other
+2eb7ffa3-fa9b-42b7-9b7d-3151fc8b8b7c	1	James	Other
+2ebac43a-79dd-4a88-9636-557052fcc6f9	1	\N	Other
+2ebcafe2-9ea0-47f4-aba8-5f5f51347190	1	\N	Other
+2ebe8745-297d-4d7b-b031-9e1233e909da	1	\N	Other
+2ec351ce-e093-4656-8dfc-756557aa344b	1	\N	Other
+2ec4fef0-fd1e-4ba3-9efc-d260e073b92d	1	James	Other
+2ec6116c-9894-4545-9212-f4e243e5146d	1	\N	Other
+2ece70cb-203b-470d-b8ce-fecae5a9308d	1	\N	Other
+2ecf45c6-5d02-46b4-9038-aa75391d3996	1	\N	Other
+2ecf49e3-97cc-4c07-bc7b-3463031a611f	1	\N	Other
+2ed0ea7d-8de4-4573-ab62-5ff30f638660	1	\N	Other
+2ed4b68b-3a8a-44f9-85ee-bf0be9526db2	1	\N	Other
+2ed58e00-edb3-4340-8c6d-7adfc88c2cc0	1	\N	Other
+2ed5bbf2-75eb-4a17-8b04-41019e723989	1	\N	Other
+2ed613e1-40c5-4872-ac90-7c55aca7a979	1	\N	Other
+2edf8b53-00c1-4c9c-9c3a-9076fb7e3941	1	\N	Other
+2ee5d5a6-bcbf-4cdd-b2d5-2ed8346119ca	1	\N	Other
+2ee759a4-c06f-450e-bb8e-6f9c911e796b	1	\N	Other
+2eeafb06-2ac1-445c-813d-40c0132e3b15	1	\N	Other
+2ef0f38f-b566-4359-b95e-cd4f762c4253	1	\N	Other
+2ef2642a-3a1f-401f-87ce-f601006ced96	1	James	Other
+2ef853c9-9ff2-4097-b0a0-ad700062f1fe	1	\N	Other
+2efbf07a-5be8-4a76-84be-b54ce759e37c	1	James	Other
+2efd3fd6-e93a-44ee-9d4d-fe2c095dd2c0	1	\N	Other
+2f01c6d5-c19a-4df7-bba0-99d1bddd3936	1	\N	Other
+2f023891-9476-4d20-857c-22981e97c3d0	1	\N	Other
+2f029000-bdcf-4571-9fb1-eb5607ed058f	1	\N	Other
+2f02cec4-95b3-44db-aa0c-50bf0f7d5f88	1	James	Other
+2f0504f4-3fc9-4eb3-adb3-a16f62129b0b	1	\N	Other
+2f050d74-bcba-4019-83d8-c05f35fda5c7	1	James	Other
+2f05fc2a-9d28-4b8d-88d0-f6a5d74e38ef	1	\N	Other
+2f072ea6-7ce6-4fca-9e46-3a24258c3eda	1	James	Other
+2f07c27e-96e1-4ddd-8d6c-27d823d40712	1	\N	Other
+2f09eb69-79cf-4b34-83b6-e485e0c26447	1	\N	Other
+2f0adb21-8f4c-41a5-90a9-5f1ddc314f55	1	\N	Other
+2f0da70e-f8ae-4b9a-a789-6900fd9aa142	1	\N	Other
+2f109351-30b2-446f-9179-60e3a0251786	1	\N	Other
+2f121894-1ec5-4e67-ad55-ea9acfe62ca7	1	\N	Other
+2f1c95a8-65f2-4039-93ab-6212a8dde2a3	1	\N	Other
+2f1f9f6f-9c12-4feb-bd6d-924ffaca95ec	1	\N	Other
+2f23a753-0d19-41b9-9f3d-acdf9c68b99b	1	\N	Other
+2f276e07-9311-4945-985d-c5dc75f2a759	1	James	Other
+2f28a664-5904-4217-97b1-4545e120a750	1	James	Other
+2f319d7b-e563-4373-bb82-c370934dc5ea	1	\N	Other
+2f358c54-ef03-4a3f-b9a2-3c7ca672d658	1	\N	Other
+2f3bee49-c20f-47d4-ad0d-4b2592836776	1	James	Other
+2f3f0def-ce65-4d7d-87f4-6f99f45742f3	1	\N	Other
+2f41a632-4426-4795-b60b-44626e5c6d5f	1	James	Other
+2f4cca79-d14d-4392-88c9-366f7b55f5c2	1	\N	Other
+2f4d24be-f3f8-4d47-97cb-9000341bb549	1	\N	Other
+2f4defe4-eebe-49d6-917f-65a1b882bde8	1	\N	Other
+2f50cc4e-3df6-4dff-8515-cf3e09b777ef	1	\N	Other
+2f518374-07bd-42b4-8156-1c196ea1e78e	1	James	Other
+2f519a45-b9cc-4d60-afec-2bc844d44a77	1	\N	Other
+2f519f2a-879a-4021-86ed-213c1f8a2695	1	\N	Other
+2f5521d9-8e94-4cd7-a850-2eda5dad370e	1	\N	Other
+2f59d9f1-aa08-45e1-bb66-5ba9b76d8e0e	1	James	Other
+2f621b00-b34c-4241-a906-f94de351fd1a	1	\N	Other
+2f629c94-6b7f-4981-b8ee-ee9204040ff1	1	James	Other
+2f657055-f5e4-4298-bd74-31b1b8e1e3d9	1	\N	Other
+2f65ff58-6bf5-45ec-8bda-735e8d447909	1	\N	Other
+2f6907c2-dd70-4296-9cf6-ae4de99476ed	1	James	Other
+2f6929ec-a925-4c7c-b272-6c4de6b1341f	1	\N	Other
+2f6d16d7-e4ae-4938-a684-bf8f639f7235	1	James	Other
+2f6e0fd2-414e-4629-adb2-7a30015955bf	1	\N	Other
+2f79c125-9b01-4b31-a926-29d3d9e4cc7e	1	\N	Other
+2f7c3e16-9ee9-44a1-a5a0-f14ba0739fdb	1	\N	Other
+2f7daff3-2f5b-4873-83a8-9f2935389a5c	1	\N	Other
+2f8200b2-8992-4b84-bcc7-3f099f7868b3	1	James	Other
+2f88fe52-ae0f-4f12-91a1-7e7a9e749c18	1	James	Other
+2f8aa3ed-3ce3-4171-9bf9-c053a74a2a09	1	\N	Other
+2f8ac29e-ea11-41de-b40a-f3c428c9c0a2	1	\N	Other
+2f8e0d00-f703-4f4e-9b87-ff892feb9f2f	1	James	Other
+2f925c66-719c-411b-8093-445437dae9ec	1	\N	Other
+2f9492a4-943b-4f4c-81fa-61844dd5404a	1	\N	Other
+2f963433-e4bb-42ae-b049-908da5c92f6d	1	\N	Other
+2f964ea3-289c-4b99-9d07-64c75d127460	1	James	Other
+2f9885da-c762-46e6-b2c5-07fca18a64af	1	\N	Other
+2f98cc47-8346-4072-bcb6-6e1b1ffba372	1	\N	Other
+2f9fba7b-1fa7-4056-9102-a9e13d1f99b1	1	\N	Other
+2fa2d86a-bfe6-46cd-9b4b-c045260253ba	1	\N	Other
+2fa71875-a996-4684-8033-2c52a42be139	1	\N	Other
+2fa7ce53-1586-4f61-b5a2-448429f1bdcf	1	James	Other
+2fa86303-5adc-4c56-9879-535802624e0f	1	James	Other
+2fa9499d-389e-4b59-a6c6-5d11256a5b1f	1	\N	Other
+2faa2b8b-9f34-4b83-ac04-e19d3cb63ddd	1	James	Other
+2fae37ff-3541-419e-86d1-dab4526e89dc	1	\N	Other
+2fafe2a7-c097-4c9e-8999-b8c021f75e39	1	\N	Other
+2fb033a9-e307-4595-8ff5-0d577ba1b002	1	\N	Other
+2fb528e8-ad16-4ceb-83e2-715f625452b9	1	\N	Other
+2fb967ed-b929-4753-a569-71d3ed074756	1	\N	Other
+2fb96cb2-d63e-4dc0-ba62-9345b5ba8ec8	1	\N	Other
+2fba852f-953d-439a-8f04-0652da33ede2	1	\N	Other
+2fbccd9c-f524-4a36-ba8a-7aed2c176be2	1	\N	Other
+2fbe1359-c254-4a04-b1ca-cdc44b32d0ae	1	\N	Other
+2fbfee03-82d8-4b17-9dae-def9301f6010	1	\N	Other
+2fc10133-772d-4e93-b806-308ba5057451	1	James	Other
+2fc20abf-a803-42a7-82dc-8d48c07d33cb	1	James	Other
+2fc5220f-0d85-4456-90b3-8ba2ea546dc8	1	james	Other
+2fcccdce-1669-46cf-97b8-86c0a953f22d	1	James	Other
+2fcffadb-afe3-4b10-8977-7411c306ffc2	1	James	Other
+2fd58acb-c63d-4a60-ae82-9bad8b7f27e0	1	James	Other
+2fd92781-94ed-4342-9851-0ac5f50f7f3d	1	\N	Other
+2fdb1310-a9da-442a-8ffe-14ae789b8075	1	\N	Other
+2fe0a403-6f5a-440b-8eb7-3b33abeda935	1	\N	Other
+2fe406d2-057a-4812-8d11-bdb4eae6e137	1	\N	Other
+2fe6cdfb-47d1-4d04-aff8-06eb9d58e2cc	1	\N	Other
+2fedcb58-64bf-471a-af3e-0ea1df135bb9	1	\N	Other
+2fefae32-3da7-441c-91db-03615d1e21ce	1	James	Other
+2ff57b14-f221-4ba2-b659-41081394c089	1	James	Other
+2ff6535e-2339-11e8-8265-fa163e8624cc	1	\N	Other
+2ffcdb09-3977-4e2f-9f54-89fd4f26e613	1	\N	Other
+2ffdb3e4-685b-4e89-859e-5db2ff404dc7	1	\N	Other
+2ffe7cd8-2b3a-11e8-9394-fa163e8624cc	1	\N	Other
+30009d01-0f38-46d5-aada-425ed84269bf	1	\N	Other
+3007de7e-6afe-4dd1-ae11-67ffd8acb8b6	1	\N	Other
+3008fe7a-db2f-4bd4-a5d0-e6a946d6410f	1	James	Other
+300b06c7-3e66-4ccd-84e9-5107792ff9c9	1	\N	Other
+3013fe77-574a-44a0-a88a-39b14b27222c	1	James	Other
+3018e7d3-a4bc-431f-aa4b-166231cd90d6	1	\N	Other
+301d780c-624a-4999-9ef0-0d966a79db53	1	\N	Other
+301d7c9d-0328-465b-a08b-ebc6f46670f7	1	\N	Other
+302075cb-6cbe-4e32-a48f-b81f2f4304e0	1	\N	Other
+30207de0-b0d6-447a-b60c-d61b2e417047	1	\N	Other
+302569c5-6b54-45f2-919c-dee44b10d9e0	1	\N	Other
+30269564-2339-11e8-bbc9-fa163e8624cc	1	\N	Other
+302d94b9-b2e4-4f87-936f-53f181cdc522	1	\N	Other
+302e1f6f-995e-486b-931d-544df2768984	1	\N	Other
+302ebc05-643a-45ed-8186-24be1f105739	1	James	Other
+302ef054-c872-4572-b01c-35f4ab8509bd	1	\N	Other
+30325348-2f5d-4bbb-a50e-2cf14d6fd567	1	James	Other
+30382a6e-b787-449d-be98-2926e8e0ca91	1	\N	Other
+303aae57-b996-40f0-8116-95cce548ecde	1	\N	Other
+303b2265-032a-4316-8848-1533570a4b84	1	\N	Other
+303b4e0c-f961-48e9-944c-e64fc2c79477	1	\N	Other
+303f2e70-6016-4da3-a63b-7e8e6f0e55d4	1	\N	Other
+303f5029-0532-42fa-956c-e06172258fd5	1	James	Other
+30421efb-c754-4452-a422-609dcdee8e3f	1	\N	Other
+30461aa6-2783-46b3-b024-027d5f28b3a2	1	James	Other
+3046a744-222c-4535-932a-ec449eb5f37a	1	James	Other
+3048951e-857f-4d11-9afb-6f5aa8e26101	1	\N	Other
+304b09b2-b38b-4695-83b2-eb0474216f9b	1	\N	Other
+304b162b-dc34-4054-8f5d-d08a2e16535e	1	\N	Other
+304b95d7-99d6-42d5-b0ae-0a7446eff1b2	1	James	Other
+304d4a55-a7e3-42be-a554-9f3b14f92c91	1	\N	Other
+304efb87-122a-496d-aeeb-6f917e53c986	1	\N	Other
+30511c7c-74f3-4a50-af22-a3ef776f8c7a	1	\N	Other
+305a594c-128b-47a9-94b1-2f456eeb86bf	1	James	Other
+305defda-cc24-410d-a62d-24dfdc2be438	1	\N	Other
+305e78ba-bcd1-44f6-9c40-ca4c398c8607	1	James	Other
+3062f2cc-35ba-4d25-ba83-ac842b01559e	1	\N	Other
+3065ea88-0c20-4e7a-a7e9-2db1718ad3ea	1	\N	Other
+3068ecf9-4aeb-437c-a1fd-7cc9804550ed	1	\N	Other
+306d1df8-a061-4c86-8aa0-377798dbfe1e	1	\N	Other
+306ece42-3d4e-493d-b341-93f467b3779a	1	James	Other
+30712e0c-f657-4454-81ec-7b2722df0e10	1	James	Other
+307418e4-ed51-47b9-a12c-5e3f7f445c10	1	James	Other
+3078a004-f3be-4019-aec4-01b9ec1ce063	1	\N	Other
+307962a1-48be-4deb-9810-35b8c6519310	1	\N	Other
+307d1198-4cfa-45f0-b041-7d86173a974d	1	\N	Other
+307dcff1-b708-44b2-9b2b-2480232f3bef	1	\N	Other
+3080f657-ea3d-4cfa-93dc-9ef071a73c37	1	\N	Other
+308875ad-68a6-4ac7-b5a8-5753ff6cef2a	1	\N	Other
+308b9a83-2232-4e84-9470-0f4eb4e74a90	1	\N	Other
+308d934d-6915-49fd-8821-6c426f21826e	1	James	Other
+308e0819-9b30-4f65-b089-e12c338e3900	1	\N	Other
+309c96de-c352-4722-b764-5a03016debba	1	\N	Other
+309d7501-1213-447d-bc7f-d51720cbaf85	1	\N	Other
+309eb8d1-3682-4039-bb84-18214887ffea	1	\N	Other
+30a20d6e-11ae-4e53-87f1-d88eab0b9912	1	\N	Other
+30a302ad-f775-4d2a-8510-25196bb05881	1	\N	Other
+30a80c40-7962-4589-9936-1549a1af04b5	1	James	Other
+30a9eb67-4f17-442e-85f5-7f723d969f3a	1	\N	Other
+30abc3dd-d9ff-4eaf-9584-c0497c487990	1	James	Other
+30aee43e-7aef-42c8-a22a-fc72ce412c97	1	\N	Other
+30b4319c-3692-4f9e-a875-5eb7d740368e	1	James	Other
+30bb01a8-de8b-4859-87b1-21098b7f32ca	1	\N	Other
+30c789d9-8837-4137-abd9-3d46ce811a78	1	\N	Other
+30c7ed77-c36e-499d-9cc4-ef07d62ad75c	1	\N	Other
+30cf6923-9b51-4ee2-b955-555c1e5ba437	1	\N	Other
+30d0d3c1-9249-4ff8-8812-961109b595eb	1	James	Other
+30d3860e-db53-4764-bc61-65daf2c8a085	1	\N	Other
+30d3fb94-fed3-4d41-80dd-769b457a1338	1	\N	Other
+30d594d2-136e-4204-b8a9-7b07189d2f0b	1	James	Other
+30d59c5a-ed23-472f-8c79-815a1ac785e1	1	\N	Other
+30d747ce-1964-4280-b0ab-efb1e8a81108	1	James	Other
+30db51d0-a820-4330-9d56-850c50a331ca	1	\N	Other
+30e0223c-24d4-443a-a052-f88a882f0f81	1	\N	Other
+30e19dc0-35cd-4a6c-9f73-95a1774a90f8	1	\N	Other
+30e4d067-ebc9-443a-8b5c-501f1816f7d6	1	\N	Other
+30e551ca-68c4-4386-98db-c418f30b00f3	1	\N	Other
+30e58589-d7c3-4322-886e-d4531824db48	1	\N	Other
+30e6b95b-c68e-4f67-9fa7-da5fe7ff0810	1	\N	Other
+30e78ce0-55a7-442b-93e5-68e5579b7bab	1	\N	Other
+30e94efb-0b32-4f00-8e9c-ebcc5b4c40b8	1	\N	Other
+30e9758c-26c9-4afb-9b4b-da4259d4d356	1	\N	Other
+30ed4548-06b0-44c4-b9af-ed628936c561	1	\N	Other
+30ee730d-ef9c-42c7-ba9c-dcf233b4ba34	1	\N	Other
+30eea3e2-01fa-4d8b-a858-f013e0cc9bc7	1	James	Other
+30fcca4c-7a6b-4eb2-9086-ed4ee6fdc0d6	1	James	Other
+30ffba0d-d594-489f-893c-659818522784	1	\N	Other
+310aa1a3-60ce-4391-aabc-2ac8c0437cfa	1	\N	Other
+310ebdc5-d923-4a41-8fe3-07251b0e6b29	1	\N	Other
+3114003a-88bc-4ee8-8283-c841e3db4a45	1	\N	Other
+31175f8f-1b70-4584-885f-7bd701a0d5a9	1	James	Other
+31177716-9613-4cc0-b14b-9facb069d81c	1	\N	Other
+31188ec3-766e-4756-84d0-979c33dc82c0	1	\N	Other
+3118d706-7a80-4fb7-999e-da47877f3c2c	1	\N	Other
+311941c9-9fb1-45bc-b033-b1d1877f30c2	1	\N	Other
+3119bab0-d1b9-4521-bfd6-b3246b22fc06	1	\N	Other
+311aeb50-d957-4504-ab79-201bee2c5c69	1	\N	Other
+311dac0e-0dfa-11e8-aee1-fa163e8624cc	1	\N	Other
+3122cf93-be32-4f98-9661-f2e6621edb5a	1	\N	Other
+3127b91f-e93d-403d-8329-f27f17f3e9e7	1	\N	Other
+31290ca8-eff7-457d-96eb-31971924622c	1	\N	Other
+312f1e7b-6aa9-42ef-a018-39f50f56e51c	1	\N	Other
+31309bc4-619b-4a6e-9359-0f20ac704085	1	\N	Other
+3131d5a7-921a-4f71-818e-f88ab0efde3a	1	James	Other
+3133a612-53ac-45b1-86d4-2461f7718f73	1	\N	Other
+31360b21-df2f-402f-9c22-99caf83d0833	1	\N	Other
+3138f06a-fc3b-4a9e-9415-73e25ab8206f	1	\N	Other
+31398145-6b62-4ec3-9cfe-c1a37da75a95	1	James	Other
+3139fbc9-5343-42b8-a3ff-9c5bde662b6f	1	James	Other
+313d10f8-9877-4ffc-a137-f8a994010ede	1	James	Other
+314696ec-d399-473e-a859-b2516a1fba49	1	\N	Other
+31478347-1a2c-405b-bd68-f164683c7ade	1	\N	Other
+3148cb34-309d-468d-a84c-4eb124a200c6	1	\N	Other
+314b8b04-5409-48b4-8dad-ee92d25bb7b3	1	James	Other
+314d884f-677c-4df2-ad09-79fa5b7e8ad5	1	\N	Other
+314ea104-6e77-4079-bdfd-ae588d51c1ce	1	\N	Other
+31565fb7-a107-4c22-96fc-99a34445c12a	1	James	Other
+3157d060-7515-41c9-a7c6-184930f32668	1	James	Other
+315967ff-6b26-4586-bdd9-c79e9cdb8730	1	\N	Other
+315cae2c-0dfa-11e8-8b1d-fa163e8624cc	1	\N	Other
+31656c33-432d-479f-bf19-9d51da8e7a40	1	\N	Other
+316d3fb2-7896-42d1-808d-06ea512640e7	1	\N	Other
+31707c2e-80b4-477c-b167-47fd47484786	1	\N	Other
+31715bea-a138-4498-9f3c-5b508961599d	1	James	Other
+317239b2-1a4c-49bf-ae76-a80322675d41	1	James	Other
+3173b0ee-d9af-4423-bb2a-d29dcf16ed37	1	\N	Other
+3176c221-5150-424e-ba2b-e6420f243e87	1	\N	Other
+3177bf80-4beb-490d-95ea-3ebb7f3eb3b1	1	\N	Other
+317a9593-d77e-4252-aea8-57e3175ec320	1	James	Other
+3180c9f1-6718-44ed-9362-82e022ffb83e	1	\N	Other
+3185fa31-cfb2-4e91-abc3-daa0d4813b66	1	\N	Other
+318a7390-53b5-4c5a-96f5-e8d3a6722076	1	James	Other
+318ec749-885c-4d95-86d3-06dfdabd478d	1	\N	Other
+318f5ec2-95ca-4381-b745-f9ba378fef23	1	\N	Other
+3193783c-2b3a-11e8-9c7c-fa163e8624cc	1	\N	Other
+3196e707-c934-4129-991e-19661b6fef5e	1	\N	Other
+319a3234-2514-4980-85ed-af8fd3e0f7d7	1	James	Other
+319b6a9a-4c41-4778-993d-fef1515be51e	1	\N	Other
+319db208-4797-45e0-979d-897395618156	1	James	Other
+319ddb11-e667-433a-acba-cf3de5bdd1c3	1	\N	Other
+319f4e42-a388-4669-a2c8-121322c708ae	1	\N	Other
+31a21939-629d-438b-b643-19586fd35e5a	1	James	Other
+31a65ae1-89b2-435b-b704-d23be0c1f7ac	1	James	Other
+31a7589c-d198-411a-bd7b-f8adf65f4665	1	\N	Other
+31b0375b-b78f-4e76-96a7-b4e6f95c78b9	1	\N	Other
+31b16af7-c7c7-45f1-ba63-b0bcf86e3872	1	\N	Other
+31b3a99d-673a-4598-b3f3-93858b45b479	1	\N	Other
+31b626da-66f1-4bfd-ad88-267c06e704a3	1	\N	Other
+31b779be-881a-41d8-8f3c-58a6439aa14e	1	James	Other
+31b7e031-6421-4538-9dec-aeb31746c1f1	1	\N	Other
+31c0c5a5-476c-49ea-99b0-589ad260e2e5	1	\N	Other
+31c0e0de-d8d5-4844-a2b5-c89f66545e6e	1	\N	Other
+31c605cc-98d6-4f53-8ec8-62be2340cc8a	1	\N	Other
+31c61aaa-7fc3-4f2b-a2f9-6d6b97cafaf7	1	\N	Other
+31c68e9b-c135-4576-8d78-2261bf6d0526	1	James	Other
+31c92811-668e-4e13-8401-458e1b6ea69a	1	\N	Other
+31caeac8-3d89-4869-85f4-02e709b55236	1	\N	Other
+31cc5007-4d3b-4eaf-a903-109e10121432	1	James	Other
+31cdb612-01fc-487f-804e-af53eda4d457	1	James	Other
+31cec2fe-d308-4602-a91e-d309e30c4421	1	\N	Other
+31d0ca71-404e-4bfb-ae7d-5f41ef42cb23	1	\N	Other
+31d14caa-5eb2-495e-87c0-e4342480cf10	1	\N	Other
+31d70ff1-b94e-41cd-a24e-c7b16509fb4c	1	\N	Other
+31d7ca97-3b3f-4639-9b34-816b8233d899	1	\N	Other
+31da239c-495e-45c5-b6f8-113adb64cdce	1	\N	Other
+31db50c3-a2f1-4190-8ff4-4c92a96bf868	1	\N	Other
+31dc4ed2-55de-46a1-a598-9651203e697e	1	\N	Other
+31f0a2b2-b52d-4666-8409-06ce1e0500e5	1	\N	Other
+31f1c6b8-1adc-486e-aaae-4f5c3c6462c0	1	\N	Other
+31f3f991-eae3-43d3-8580-b236f1ff4d00	1	James	Other
+31fabd6d-2b9e-49ab-8c22-67bff3e51a00	1	James	Other
+31fcf715-dc87-44bd-94a6-1686b81fd843	1	\N	Other
+31fe618c-ab9a-4108-8943-ecdfc674d588	1	\N	Other
+32047923-5261-446b-9141-d056b6079e0f	1	James	Other
+3204d73b-993b-4679-8aef-bec1a1f64c28	1	James	Other
+320a45b2-1097-4f7b-99bc-e4e14bc49d04	1	\N	Other
+320bd233-7ec1-425e-9b23-6e142cd46df2	1	\N	Other
+320c4367-f84a-431a-b675-db6e159d53ca	1	\N	Other
+320cf0a4-df18-4d4f-84b6-c0ed152f3176	1	\N	Other
+320df1e8-3b1c-4f26-a5b4-f370cf5007f9	1	James	Other
+320eb3c7-59c6-4cba-922c-edcb0bed3534	1	\N	Other
+32132945-9810-4f66-96c8-1150761d57c8	1	\N	Other
+321698c7-1842-40e9-ab00-2ee1918cca31	1	\N	Other
+321c5b16-2289-4297-8fa4-dba3635524b7	1	\N	Other
+321ca657-14cd-47c9-90eb-7ac6d07f8955	1	\N	Other
+321db9b0-53c4-48e7-a5ff-405fbf90bea0	1	James	Other
+321de229-124b-4aee-9158-14dc3270b9ca	1	\N	Other
+32244c42-3ff9-4870-b751-3d11c796644f	1	\N	Other
+3228c303-a85a-4b77-a4f1-2a58ba704d50	1	\N	Other
+323c7b35-4363-4f05-8d91-a61f651a3816	1	\N	Other
+323f013b-32c8-44ec-9b51-d1d14700e3fe	1	\N	Other
+32428c7f-fe05-4a57-8210-dcbbfaa10b4f	1	\N	Other
+32441254-6348-45eb-93f4-4ecad6e63129	1	James	Other
+32446e89-f264-4337-a37a-c8ffdf286fdc	1	\N	Other
+32476a3e-0fb7-4c3b-a6ed-6c7281e3a8c5	1	\N	Other
+32486691-da7c-43bf-a354-b9061577824e	1	\N	Other
+324e5c76-c878-4765-a5af-ebc2dcc1116f	1	\N	Other
+324f14c5-29cf-44fa-bfd9-5a9f3fd35ce0	1	\N	Other
+325661fc-225c-4f7e-8263-8cd7b3ca5867	1	James	Other
+325792e8-dac4-4ace-b3af-64deca24a3bc	1	James	Other
+32594e5c-0599-4a2e-98f2-774b90a83cf9	1	\N	Other
+325a4b85-26dd-4a1e-bd4a-a190a7e4851a	1	\N	Other
+325d1fd6-993e-489f-988e-cc0a327dcac3	1	\N	Other
+3262e737-fb23-40c9-98d8-9bea925135c2	1	\N	Other
+3263fc93-6448-43a1-8c61-d5875e642fcf	1	\N	Other
+326786a5-4c3d-4860-aa46-f63f9e80f67d	1	\N	Other
+32688295-f0f6-4995-b772-aca1645d0181	1	\N	Other
+3268ad4b-67cf-4a65-9cab-4f75bc98fb57	1	\N	Other
+326c845b-e61a-470f-867b-58b5540a94b6	1	\N	Other
+326e29c2-96e8-4888-b227-cfdd2c2cf83f	1	\N	Other
+326e5f3e-ab0b-482c-86b3-7ce91d2d19eb	1	\N	Other
+326f58ef-51ce-4512-92eb-d490e2dac9ba	1	James	Other
+32767052-45a6-4be4-a882-8b9b9b6684cb	1	\N	Other
+32771943-4912-4752-8e34-5211352dabf2	1	\N	Other
+32785940-cdc3-4634-87d3-bff819ba3c39	1	James	Other
+327e2b4a-7e27-43dc-91af-0889a80641a8	1	\N	Other
+327ec85c-09cd-4b0a-a6e9-ee5501c20cca	1	James	Other
+3281c7b3-f674-4406-944f-96017a87ad47	1	\N	Other
+32821bcd-071f-4125-aa62-1ffc273679a7	1	James	Other
+32880958-85a5-44a8-a658-dfe584c9b1a9	1	\N	Other
+328dca04-e90b-40ad-bb35-95199214832d	1	James	Other
+328de064-53e9-451c-a5c1-72059690700e	1	\N	Other
+3292a364-b4c7-4977-a80b-fbba91311f69	1	\N	Other
+329434fa-a66b-41a9-8150-5caa02d6a06b	1	James	Other
+32952320-1b0b-4706-9f8e-130b907ae340	1	\N	Other
+3298c1fb-e377-4ea4-afa9-47a6494ecc81	1	\N	Other
+329acb76-bdd1-4962-8138-e776b2525ce2	1	James	Other
+32a0fd39-5219-4649-8386-b06762877032	1	\N	Other
+32a22753-97a2-44e0-be2d-3388623bfebf	1	James	Other
+32a3fbc4-a486-4654-93a9-cc6d625450be	1	James	Other
+32a4e06b-ccfe-40c4-bab0-043de8211103	1	\N	Other
+32a8b13a-96cd-4684-9f30-2b2048411ce4	1	\N	Other
+32a98e75-a2b7-4c3e-9d74-64b3d8e137bb	1	\N	Other
+32ab27dc-3c97-4ff3-abd1-53a5d6b16c8e	1	\N	Other
+32ae2649-3b56-408e-8c8c-368aa9ad1a61	1	\N	Other
+32b5685a-48ef-4c26-a5af-5cfbb32ea972	1	\N	Other
+32b5cc8a-486b-4f1c-b360-b3d5cac9ea6b	1	\N	Other
+32b6a17c-203b-49b5-8944-6be582288d28	1	\N	Other
+32be704c-d67e-4d89-a99a-e93731fafb43	1	\N	Other
+32c6ce67-e3d2-4dc9-a10b-e9f69181b9d9	1	\N	Other
+32cca130-251d-42bf-9467-ad664bd9b6fb	1	\N	Other
+32cd08c1-c0e2-4833-b576-9953c437f715	1	\N	Other
+32cea608-073d-4cec-8578-8fffde598895	1	\N	Other
+32d3d469-3e9c-4bc3-8f4f-c2cee5fa7e31	1	\N	Other
+32d4708b-3c3b-421f-bbdf-2402319fe5b2	1	\N	Other
+32d8431c-82f4-4227-80de-cf3201d8de73	1	\N	Other
+32db02d8-ae96-4895-9c10-56de24393c9f	1	James	Other
+32de6dc2-56bb-47ef-bce8-f82da9b86286	1	James	Other
+32dedaee-488e-4b0b-bd95-70c482d24282	1	\N	Other
+32e446ea-099b-47fe-b167-1f8c972c109e	1	\N	Other
+32e58349-e948-4271-8915-0bf27580df97	1	\N	Other
+32e5b256-bdd5-422f-9499-a27ddb6b5f84	1	James	Other
+32e866bc-7290-4df6-ae42-c0270cad29d5	1	\N	Other
+32ef58bb-86c4-48a4-9579-75999834726d	1	\N	Other
+32f2b36e-2470-42c7-9750-dd581c6f99a7	1	James	Other
+32fad339-39b4-47dc-a960-20166c5ec675	1	James	Other
+32ff3035-4d58-498d-81ae-6a54691c2d4f	1	James	Other
+33022ec3-64f9-48ec-9f9d-c18b3cb2756c	1	\N	Other
+3303dd2c-cd4d-4dfc-9f54-551801f6ea3f	1	James	Other
+33048bdb-b018-4d06-923d-45e87f5497d7	1	\N	Other
+3304f8e3-0e85-4306-a482-620f5a00ecf9	1	\N	Other
+33098056-fe49-4817-907b-7d9601582479	1	James	Other
+330d0f78-a1a2-4c09-8002-36ffa62814b6	1	\N	Other
+330d54a6-4f32-4950-8f51-d30c357938cb	1	\N	Other
+330dcf43-07ba-410e-bc18-3a5b6db97682	1	James	Other
+330e18c7-ef7c-48b9-bdf8-6443beb91546	1	\N	Other
+33103ceb-4cb9-4640-aeaa-01d50d384db8	1	James	Other
+3311428e-c47c-4ef3-b56a-309014e50147	1	\N	Other
+33115c24-d092-4cb9-9aa1-4d3009228dfc	1	\N	Other
+3313a3e3-5b12-471c-813d-ce000fa2d459	1	\N	Other
+3316bc3f-1211-417e-b43e-bc5eade33a92	1	\N	Other
+3316e889-d010-4452-b984-03b3df8848c2	1	James	Other
+331a9ae1-dc9d-403c-8e07-c123e725a32c	1	James	Other
+332557c6-43e8-4521-86d4-56d11da1dc3d	1	James	Other
+33285dac-3ba3-4875-9633-17bcf51c0e16	1	\N	Other
+33299013-c2b8-4447-a490-13df01d1ec29	1	\N	Other
+332e149c-0c29-4e78-949e-873b4e8ca510	1	\N	Other
+3336b3ac-00d7-4d16-858c-5d1605c8ac5f	1	\N	Other
+3336b769-9f12-45f2-a6b9-0cec519fdc42	1	\N	Other
+333dc1a0-bc30-429f-8e86-f32ed740f561	1	\N	Other
+333f63b1-19ac-4431-9f64-3419747acadc	1	James	Other
+333f6da3-720e-4109-861e-3677555b6503	1	James	Other
+333ff139-1e85-4592-8c45-d9a6753fe446	1	\N	Other
+33423110-b6e4-47c6-90bb-4ae0464dd432	1	\N	Other
+334b2000-0b4f-4bcc-9080-d441c998100c	1	\N	Other
+334d422c-fd74-4655-afb5-835af40b5819	1	\N	Other
+334e0d7c-3d87-4455-b860-66ea1cd465c8	1	James	Other
+3350e5dd-d54a-43d7-b56d-eb342440fee9	1	\N	Other
+33532366-7515-4d9d-a1b4-79702614ea11	1	\N	Other
+33569fbe-557b-452d-9134-59fb89ff97d2	1	\N	Other
+335a5734-a05e-477b-8386-b535148ad7d4	1	James	Other
+335b46b5-1849-4882-8bc3-3dd382b52015	1	\N	Other
+335c2f81-4a62-408c-b321-f4ed69f9d7e9	1	\N	Other
+335d8345-b4f8-476d-a27f-3319df61db5b	1	\N	Other
+335f8379-2efa-4700-bd4d-240a1b2b4dca	1	\N	Other
+33601f30-3dc6-4255-8aa1-a239b664a365	1	\N	Other
+33634389-697e-4d7c-95ef-3f9261e1376b	1	\N	Other
+3368643b-0236-44a8-b96f-132209ced62b	1	\N	Other
+336ba4ea-af08-4971-8e7f-54336a2f7e9e	1	\N	Other
+336ea378-2fad-4c6c-a72c-0cfc011d90f4	1	\N	Other
+3375d18b-9373-4e00-a223-e6a2485c475d	1	James	Other
+33773ab1-d4f0-4a80-b3b1-74ddaaba74e2	1	\N	Other
+3377fe1c-a512-4549-baf0-b23ca74d8f33	1	\N	Other
+3379e6c5-2597-4fce-9b19-6f5b6779685e	1	James	Other
+337f5562-a825-4ce2-bb94-80df7b19552b	1	\N	Other
+337fc887-d721-4be0-811a-e66168519f4b	1	James	Other
+33834821-1f35-4efa-8916-96c073cce48d	1	\N	Other
+33861eaf-2f85-4035-92f9-ccd4778cc9f0	1	\N	Other
+3389a891-93a0-4bf6-ade0-b4163b28804e	1	\N	Other
+338ebb76-05d4-4b43-afe4-a50263c908b8	1	\N	Other
+33974709-318d-4fe4-b89d-6379b1653054	1	\N	Other
+339858bf-97f4-4a3c-bdbd-b694cdff17e9	1	\N	Other
+339b4237-d816-4f9d-b6ab-e342e21a128d	1	\N	Other
+339d1afa-f4f7-4341-ba56-ebb83d6d4705	1	\N	Other
+339d268a-8b0d-43c6-af80-1db3f606666c	1	James	Other
+339ebdbd-17f4-48a1-af4f-6dd12841b045	1	James	Other
+339f059e-26a4-4260-8ec7-331780a998a1	1	James	Other
+33a16789-5054-4aee-888d-51be5fe3efde	1	\N	Other
+33a2c606-7630-4e05-a17a-cd5b8e16417a	1	\N	Other
+33a4e39e-1c4d-4dce-91fb-c40f747759a0	1	James	Other
+33a5ada1-3cd6-41f8-a078-55ceff489276	1	James	Other
+33a68aa8-28f8-4520-929b-aaf28159525a	1	\N	Other
+33abc88a-ef19-49fa-9b0c-21c6ae4873eb	1	\N	Other
+33adfb0f-a7e8-4fde-99ab-bf25b9ca0292	1	\N	Other
+33ae90f2-106a-499c-be17-06a67e0d3dae	1	James	Other
+33aee2c5-9527-4c37-add0-89d69a8e01e8	1	\N	Other
+33b017d0-c1f9-4735-a7c4-9f7748b1ccce	1	\N	Other
+33b42853-316b-42d2-a924-f153112d7f97	1	\N	Other
+33b461d2-9769-4e70-ac4c-f37602ad879d	1	\N	Other
+33ba8a58-37f9-42e3-88bf-a08463368af1	1	\N	Other
+33be0b75-4b9e-4f06-b4e2-904cb2853bb9	1	\N	Other
+33c09bd4-d178-470d-ba8f-37523e8eef8a	1	\N	Other
+33c3aabe-edc5-4452-bf15-7501addd3002	1	\N	Other
+33c3c353-7234-46da-9bec-53f70b2417ea	1	\N	Other
+33c77fce-aa07-4e7d-8d10-ae3eef3fcbd7	1	\N	Other
+33c7ab98-32ca-409b-ab19-3e3cbe65fe8b	1	\N	Other
+33ce8602-b614-49bd-ad5d-01ef1383cf66	1	James	Other
+33cf3280-1223-4897-af50-5f4017e0006a	1	\N	Other
+33d23c83-d0d2-4158-8ce8-d3a8f41175ee	1	James	Other
+33d55901-a739-4d40-96ad-36a57da8d0b1	1	James	Other
+33d6819a-88e1-4dfe-8453-20f11dbbb258	1	James	Other
+33d6a566-40d1-4255-bc4d-7f14659078c9	1	\N	Other
+33daf0bf-263c-4668-bf46-97c77ea5030d	1	\N	Other
+33dd2372-1762-11e8-9a6e-fa163e8624cc	1	\N	Other
+33dde34a-f9c4-49f6-9493-ab05b412da58	1	\N	Other
+33e5e3e9-4f8d-469b-a086-5fd2b6392ed4	1	\N	Other
+33e7791d-639c-4253-963c-be46232c9b4b	1	\N	Other
+33ee68c5-1fdb-4432-9029-52c44414fa42	1	James	Other
+33fe9348-5321-4625-8c40-a15002133f30	1	\N	Other
+34015c29-2770-4b0f-8975-eac8c6d101c0	1	James	Other
+3404e025-01c5-4dbb-b698-f143acbc7148	1	\N	Other
+34077082-1762-11e8-b0ef-fa163e8624cc	1	\N	Other
+340b28f8-1762-11e8-abe3-fa163e8624cc	1	\N	Other
+340cc453-1fd4-48b8-931d-4d635c7924cb	1	\N	Other
+340d22c2-9588-49cf-9edc-874494e8fbd8	1	\N	Other
+340d93e2-d235-4517-9a7d-23dc812a8c8d	1	\N	Other
+340de5ba-3e74-4a4f-be31-f11d2df8d863	1	\N	Other
+341243ef-02b1-49d3-aa17-36e8415e1dcc	1	James	Other
+3416aa16-b1b4-40d4-9d83-6cff7ded7064	1	\N	Other
+34187fed-99fd-4865-870e-2d52ce487c65	1	\N	Other
+341a4006-a7f0-47a0-ae17-23376e94445e	1	\N	Other
+341b2752-78b7-4a87-8e1a-8cfd0ce28c54	1	\N	Other
+341ea047-2d90-44c4-8093-c8401f255722	1	\N	Other
+341f84af-d4fb-47d0-b456-7e091b6f75ae	1	\N	Other
+3422956b-525f-4d91-8b78-05c9c31d45ea	1	James	Other
+34262ba5-053e-4fb7-b292-eae5ef1dba25	1	\N	Other
+34285869-a28c-4146-b1bc-7396b978b5e8	1	\N	Other
+342cce8c-748b-4206-913b-7cc4d1b7b723	1	\N	Other
+342e4480-a038-4980-89e4-ac7deb7741f1	1	\N	Other
+342fde0f-fe2a-4725-acf3-2a382efbeac8	1	James	Other
+343055dd-173f-4117-9781-8cc635a79031	1	James	Other
+34315db3-508e-4cb2-a3c1-c67605012fa7	1	\N	Other
+3433565a-319a-4922-9336-51613d2cb4f0	1	\N	Other
+3439db65-3b29-4b37-94f9-701ef8b293c6	1	\N	Other
+343d058a-1762-11e8-b301-fa163e8624cc	1	\N	Other
+343ea8f4-c86b-4e39-8336-c75d90428f51	1	\N	Other
+344693eb-6232-4aba-9e0b-7a0636ea0ed0	1	\N	Other
+3447c3ca-b53c-4d5e-8457-17445138c297	1	\N	Other
+3449a0be-c4d4-4d53-91eb-1df86bd070fe	1	\N	Other
+344f9362-1762-11e8-bf83-fa163e8624cc	1	\N	Other
+3450c90d-eb9b-4467-af17-e8aaa786c137	1	\N	Other
+3451e301-6ca4-4a26-bb81-a7ccf7702e36	1	James	Other
+34569f70-76a4-4a12-870a-076913fbe8ca	1	\N	Other
+345a4d18-a70f-4905-805a-d5800b39de19	1	\N	Other
+345d9220-74c2-4abb-a5ab-525bb1811fb1	1	\N	Other
+345e1c48-8af5-4298-a05f-5402da455888	1	\N	Other
+3461567a-69de-4a27-b453-29af7ead95d7	1	\N	Other
+346b7e32-81a1-447c-899c-54ed8b56b0a8	1	James	Other
+346d4065-4254-465c-97c8-255c831b7bfa	1	\N	Other
+346f84ff-8347-4617-8da3-27e1d6e45397	1	\N	Other
+3470f1d6-39d0-4ca3-8327-5439bce8e9f0	1	\N	Other
+34712ee6-ed12-4267-8212-801440db7e2d	1	\N	Other
+34731038-b9f0-4682-b433-6ef5bc794004	1	\N	Other
+347347fe-946a-404c-b3dc-31082b2ab80f	1	\N	Other
+34736fb1-2646-4702-84a6-69eb5d108c9b	1	James	Other
+3478b9ee-76ad-4dbe-a6db-d2e5835d9b17	1	\N	Other
+347c4b4d-e1a8-4b2b-a1f5-af8096e3640d	1	\N	Other
+34806ba7-1a32-4763-a8d0-5095cf6cbc72	1	\N	Other
+34855722-7427-488d-938c-ecbf16c9c003	1	\N	Other
+3486edaa-fad9-424a-ad18-ff9e67ab74ef	1	James	Other
+3488b72d-425d-4fee-90ff-949f4e5cd292	1	\N	Other
+348a138a-561c-419e-8965-5a1dbae0aaa5	1	\N	Other
+348b7005-2683-4a80-83fd-f89a8ca603f1	1	\N	Other
+348b82f9-8e52-4651-ab25-aa735cbf2f88	1	\N	Other
+348d23e0-0f6d-4294-8918-0f6f4dd756d7	1	\N	Other
+348f8613-d8b8-4bc5-bf4d-bf355f216311	1	\N	Other
+34908386-f8b7-4839-ad26-e5e54f7a18ca	1	\N	Other
+34916423-ea75-4868-bb4c-361db55febb8	1	\N	Other
+34919fe6-06aa-44a5-9d58-fec3a0f4c14d	1	James	Other
+34924d25-4c74-455f-89b4-581a1bc7c626	1	\N	Other
+34931e65-38a4-474d-8ac7-2d8fd8ffb972	1	\N	Other
+3495e2dd-c743-48a4-9a2c-1aab0e99c2de	1	James	Other
+34a0634b-87e6-414f-b28b-ca0513a53889	1	\N	Other
+34a1507d-657c-41b5-8e14-f92bf5de2727	1	James	Other
+34a1d227-ad86-41ed-a44b-235076bd2c1d	1	\N	Other
+34a848d4-fb51-463b-9e8c-b2b48a6b1282	1	James	Other
+34a8dea4-e03e-4f17-97ab-befee3647f33	1	\N	Other
+34aa0168-1214-4505-af05-53cc4f7a1feb	1	James	Other
+34aada7a-0bda-4505-8705-e1d83587769f	1	\N	Other
+34abc300-7270-4e1d-81a7-42651d383fa8	1	James	Other
+34b10149-ddb3-4000-82ad-6b1cd73fff36	1	James	Other
+34b35dec-9381-497b-84fe-c8bf5289d35e	1	\N	Other
+34be8202-1024-46a6-bb4d-429752918012	1	\N	Other
+34c00bdf-8637-4f06-a677-79df21f699ea	1	\N	Other
+34c28c41-0111-468d-a51a-59b8fbfb75a3	1	\N	Other
+34c64d67-e8e7-429a-9303-3cbb73cb90e2	1	James	Other
+34c94cb6-e343-4a67-80c4-471b951894e4	1	James	Other
+34cb6e5f-f8a9-412e-bf2f-90d19cd06b8f	1	\N	Other
+34cfbd08-ab0b-4910-bcd9-c73b58bc122b	1	James	Other
+34db903c-0d17-44ce-906e-b37def25a348	1	James	Other
+34dbedd1-b0e5-4bb8-9afe-bd6bd8076794	1	\N	Other
+34dcc17e-1762-11e8-964e-fa163e8624cc	1	\N	Other
+34deea4b-fb94-446d-a753-23b81a1c4c92	1	\N	Other
+34df24aa-836a-40a2-bdca-39538d267033	1	\N	Other
+34e081b6-7432-4b8d-aeda-72cb03b76b12	1	\N	Other
+34e75c91-8a4c-4039-8e8a-57faea56198f	1	\N	Other
+34ec7dc0-e262-4dcd-968c-6e125f4ed757	1	\N	Other
+34f12256-5cbf-4e67-b329-db44953a646f	1	\N	Other
+34f51bec-1496-41a6-aa4c-d24f1b56134f	1	\N	Other
+34f8307f-8d37-41e3-935f-a7fd7a8e711d	1	\N	Other
+34f85e03-6e5a-47d8-ae44-498d6c4803e6	1	James	Other
+34fb65c3-ddc1-4528-881e-41878cf8afda	1	\N	Other
+34fc9d5a-d385-4307-bb8b-a40b429ec3f5	1	James	Other
+3503a0a4-b137-454f-8bcc-9a497a4815f6	1	James	Other
+3503cb1b-7b70-47c7-9f35-4b167f10d594	1	\N	Other
+3505ff0e-5db3-47f9-9415-834737acb374	1	\N	Other
+3508167a-70f9-41ee-90e3-c20a892fa7c1	1	\N	Other
+350cecb1-5bd1-4281-bf9e-5d4c9b370d7f	1	\N	Other
+3510f900-9a89-4482-91ee-ccdd0404ff16	1	\N	Other
+35123bce-85f5-44a3-854b-6a1ef37a196f	1	\N	Other
+351251b1-8aab-4f51-862c-4250d95aac28	1	\N	Other
+3519a701-11dc-4e29-a42d-1e790801efb4	1	\N	Other
+351d1ca1-d062-4ea2-8543-f3e796e86f6a	1	James	Other
+351d8710-d278-494d-8b48-074f47fedc53	1	\N	Other
+351dfca8-dffc-4e58-9a58-b2073e46c147	1	James	Other
+352591af-d9e6-49ac-9414-236a4c1d9156	1	James	Other
+352e8127-7d54-4c97-9ab9-1fb35620b627	1	\N	Other
+3531959a-c5bf-47a4-a702-c8e3b4c58078	1	\N	Other
+3531b496-f707-4a56-9b30-a2fe2f75c056	1	\N	Other
+35341649-c893-4173-b0b2-b7704726e143	1	\N	Other
+353b3b02-7b3f-4f74-83f5-6f33e65b5bea	1	\N	Other
+353dbf07-486c-4f72-b8d3-42e48fd7d48b	1	James	Other
+353dfec0-287d-4225-88f5-741df9a54b42	1	\N	Other
+35407fb0-eece-4044-82bd-d45ab73ad7d3	1	\N	Other
+35415ff1-d782-4cce-87b7-8a02468c042b	1	James	Other
+35420517-e15b-4221-9175-8f76b40d235f	1	\N	Other
+3546316e-a618-4141-8bfa-b1d833fc9c85	1	\N	Other
+354717a1-7cd7-4c3d-8f43-01b7c816f8a2	1	James	Other
+35478bf5-4c8a-458b-9b4a-ed0d545d848b	1	\N	Other
+354970d2-ec27-48db-a330-1a29ff3e7ce8	1	\N	Other
+35517ee9-f3e9-469e-8f37-5b6adf6a591e	1	\N	Other
+3551d137-fb6b-4c70-afd8-61c2bf515d77	1	\N	Other
+35569bb9-e670-427a-98a2-6f8952f1652c	1	James	Other
+355a6454-5de4-4e0d-be37-bd24c9758cab	1	\N	Other
+355deea5-ee61-45fa-a821-dc72b6bc64e2	1	\N	Other
+355e5828-4d9b-40ae-9b45-cc1a1d00022d	1	James	Other
+356177a5-6832-4740-8089-b60555a77ab1	1	\N	Other
+3561ad37-b938-4484-b078-21989a1d93c1	1	James	Other
+35621aa6-1fd0-4f31-b833-f8dfa2537cff	1	\N	Other
+3562c060-108c-4627-b9d8-9ac8012782d1	1	James	Other
+3567e27b-d43d-4e53-ba4f-22243c2b09aa	1	\N	Other
+3568ddf5-7d14-4a6f-9775-dcaf7753c3c5	1	James	Other
+356b26e3-2735-4358-8640-1ff4771346de	1	\N	Other
+356cd8ae-4682-45c9-b68f-482021603755	1	\N	Other
+356e2338-52db-4869-8109-c886a04134d7	1	\N	Other
+356e668c-c56f-4ace-9630-ac71fe70ae39	1	\N	Other
+35720ce1-b2f7-40dc-abfd-0cc6900ed1cf	1	\N	Other
+357520fa-2e45-402d-a44e-49058a2afdfc	1	James	Other
+3576c512-44a2-4671-9050-d4e3c101e5e5	1	\N	Other
+3579b968-e88b-4fa1-b17e-c6de3601a458	1	James	Other
+3579d304-6c6c-48e5-9bf3-f667b727c932	1	\N	Other
+358617f2-8ab4-4c13-8547-a5c798beda33	1	\N	Other
+3587dabc-6085-45f3-a2bf-065a6a3963fd	1	\N	Other
+358b5f3b-48b4-4f72-9a32-445232f33d38	1	\N	Other
+358e98f7-0602-4ce0-b94c-75481722efe4	1	\N	Other
+35901238-cee4-44e2-b2b0-a6de503b14a5	1	\N	Other
+35912a77-31aa-4689-a579-97287e37cafa	1	\N	Other
+3598ce64-60ca-4e6f-a21e-553301c90e69	1	\N	Other
+359bd5db-a393-444d-94fa-cb43caa9075c	1	\N	Other
+359e647c-ba3c-4cc7-963d-c317e1304f5d	1	\N	Other
+359e7e08-5a65-4f45-917a-501d6130623f	1	\N	Other
+35a0c293-fbae-4895-a89a-e38d3516777e	1	\N	Other
+35a42e58-32a5-4c67-907b-9aeb22ba0cbf	1	\N	Other
+35a770dd-9b65-4d3d-afeb-8eb5a0efe80c	1	James	Other
+35ab79f3-a722-4657-8e3d-3e8c38ba40c6	1	\N	Other
+35ad0bc8-6990-49f0-bf68-4d0394e0aa01	1	\N	Other
+35b5b01e-a489-46f5-9c9a-e7b3c4cb34dd	1	James	Other
+35bf7731-39ac-42fd-a8ca-7c83ff800e34	1	James	Other
+35c4b64b-eb43-43ab-94b4-007efd835947	1	James	Other
+35c55503-fa06-4dc2-9148-47147c128689	1	James	Other
+35c65938-1463-4c53-85d3-6a9c488656b5	1	\N	Other
+35c829cd-3202-447a-a2f9-4d6615182dc5	1	\N	Other
+35cb08b1-ab02-4e38-b55f-ee0bf8b1936d	1	\N	Other
+35cb455f-0dee-4579-ad13-a1dd43af82d9	1	\N	Other
+35cc810c-6035-4998-879c-6293eb73f4c5	1	\N	Other
+35ccdad3-7bd7-4156-8ff5-c2b15627c9ae	1	James	Other
+35d35cf5-a270-4aa5-9f9b-c63d7e8e93b5	1	James	Other
+35d5bb12-61d7-4e44-aa87-a06fae6e8b2b	1	\N	Other
+35db5d65-6b3b-46a3-a347-4b46ca226b04	1	\N	Other
+35df355f-ce70-48b2-855f-5e09de21d51e	1	\N	Other
+35df9a49-afe7-457c-9586-c050cdbe4094	1	\N	Other
+35e00470-15d8-4b50-8940-ee76f56ec815	1	\N	Other
+35e1844b-da2c-480f-bbcc-0d71ea0df5d1	1	\N	Other
+35e551fb-bf6c-451c-ab79-c75393d3784a	1	\N	Other
+35e665e5-1243-4505-9c87-bdc65f72af63	1	\N	Other
+35e71a35-ee08-493f-a639-c679f37465d9	1	James	Other
+35e71f23-ed76-4d85-810b-2eced257b327	1	\N	Other
+35e8a2b0-e5b5-4b93-b0b2-182e6a3ddedd	1	\N	Other
+35edc426-1df9-41ca-aebc-990380da29e8	1	\N	Other
+35f0b4ed-1e58-41e8-aa6e-bc39848b01d1	1	\N	Other
+35f3eb53-09bd-4174-a72b-7814e2d3306d	1	\N	Other
+35f4f6b0-258d-11e8-afea-fa163e8624cc	1	\N	Other
+35f5bf1e-3eb7-466f-8f86-c7c4bd79df76	1	\N	Other
+35fab9c6-be48-46da-a1f7-9ea0ea97431d	1	\N	Other
+35fd2e33-1b39-4762-86ff-e7aacce0a286	1	\N	Other
+3600cec3-ec87-4241-bd87-a086917941a4	1	\N	Other
+36014f2d-9655-4c4a-bc13-6f495f77482b	1	\N	Other
+3605fe99-93f6-46b0-841a-bc6217669f73	1	\N	Other
+360a8f6b-ed44-41dc-b91f-6e5d72928e90	1	\N	Other
+360d6e9e-e06e-48bd-b273-2dcec84d8c6d	1	James	Other
+36153e60-b2ce-412a-b4bd-9e49bfb53407	1	\N	Other
+361632a6-261f-48e0-b4f3-916c81a044d5	1	James	Other
+36180141-bd4b-4083-bb3c-c0d539b2362b	1	James	Other
+361f3939-216b-4656-a5b9-09b590e2d825	1	James	Other
+36204e6e-4780-4f48-9151-5920bff2b61b	1	\N	Other
+3624413b-415d-440d-a406-1401bf190fa0	1	\N	Other
+3628a24c-1d9f-466b-97ae-58d7df693f24	1	\N	Other
+362959f6-b47c-47e9-878f-9d5c0acce07d	1	James	Other
+362a8382-34e9-43bd-aea4-66164172fe5c	1	\N	Other
+362c5a4a-60e5-4ed2-a38b-c00e2022e681	1	James	Other
+362ef2a6-ce55-496f-aa5b-134eab19aa36	1	James	Other
+36312e79-c56e-4529-9fb9-3c8463de4758	1	\N	Other
+36334ab4-258d-11e8-9d30-fa163e8624cc	1	\N	Other
+36376368-99f5-4aaf-bc6b-c661084829fb	1	\N	Other
+363c906c-91ac-4286-96b5-1eaaecffff18	1	James	Other
+363e902d-4f62-4439-8aa6-c7e1dfe81407	1	\N	Other
+36407961-5fe3-4b53-a3fc-d3b9e672cb65	1	\N	Other
+36433583-d1bd-4e48-8ac9-5a79e601cc75	1	\N	Other
+364379d4-7874-48b3-ba29-ce221e8bb57e	1	James	Other
+364ed804-9217-462d-aaea-cc9a323ab7cc	1	\N	Other
+3650ef2f-2d91-436b-8498-81a0630523ae	1	\N	Other
+3652edaa-658a-464c-9262-6c1de313f69b	1	James	Other
+36542475-2aea-406d-a58d-a5deb09d9528	1	James	Other
+36561ffa-d5bd-47fc-80e4-b486b377020a	1	\N	Other
+36591356-6ab0-4d6e-ba2d-c71a665b3998	1	\N	Other
+36638fe1-9c22-47c0-8946-3e44d48e9b16	1	\N	Other
+366548f3-d9bb-4c30-86f2-a021af20bd8f	1	\N	Other
+36698e6c-9775-46b1-8250-aa9623d179f8	1	\N	Other
+366a5517-8053-42e7-a771-91b81822b4f0	1	\N	Other
+366af9c3-2479-461f-b6ca-f25cc0783be0	1	James	Other
+366b0106-9199-42a4-9d07-12f07bba7216	1	\N	Other
+3672fe45-50b3-441c-8936-bcc36f4dfa12	1	\N	Other
+36740d04-ee5f-4009-8e81-f45ba26ba0a0	1	\N	Other
+367c7631-9a8f-4e76-a6db-4d11d84eda1b	1	James	Other
+36835033-71a0-47e0-8522-0660cebfc815	1	\N	Other
+36879614-deef-476d-82f5-4f2626c54228	1	\N	Other
+3688b300-7da9-48af-95f8-852eb56c589e	1	\N	Other
+368932cd-6670-46b9-8cc9-518044cbc6a0	1	James	Other
+3689d6ad-053f-426c-8252-9741860655bb	1	\N	Other
+368d3c5c-b02d-463a-97d8-cd655c081cc9	1	\N	Other
+36914700-8c2d-4687-a814-f21a72005343	1	James	Other
+3691f466-41e4-446b-bbca-566b605a0174	1	\N	Other
+3693022c-bf06-46e4-b870-27fc1f804b65	1	James	Other
+369571ee-1840-11e8-bd01-fa163e8624cc	1	\N	Other
+3696ccf8-a36b-43af-b87a-43e5a2752506	1	James	Other
+36975886-df0d-4503-84a0-5440757bd3c3	1	\N	Other
+36977675-5d78-4ba2-8962-b19d75e01e09	1	James	Other
+36980007-bd5d-4361-b185-f005ed2bbf4c	1	\N	Other
+369a5a20-c554-4c34-a760-cabd9a5e9511	1	James	Other
+369c3fb2-47e2-431b-b401-e8f6cc386db5	1	\N	Other
+369f0020-1ce5-11e8-9265-fa163e8624cc	1	\N	Other
+36a48904-06dc-4406-96a9-e8722de69dc0	1	\N	Other
+36a579d5-3335-4d53-842d-107e99f8c498	1	\N	Other
+36acefe6-dfda-4602-8c8c-f994d30f2167	1	\N	Other
+36b327a7-d27e-4064-b896-c22321f62442	1	\N	Other
+36b4af9e-d35a-48bb-a7e3-3debcc2a34c2	1	James	Other
+36b4fe45-b92b-4e42-a70a-7ec1ae482e2b	1	\N	Other
+36c2388b-ecf3-4501-9591-2483cf2e9c33	1	James	Other
+36c6ba33-576a-4e28-8019-9c89882a6d20	1	James	Other
+36cac6a8-e5fb-4265-9fd3-5c08e1a66677	1	\N	Other
+36ce9226-ff7b-4b4b-9294-5f18ec41473d	1	James	Other
+36ced111-a8df-4e2e-8d81-2c12e372036d	1	\N	Other
+36cefe9e-870e-43c5-95f0-c313a6f10d60	1	\N	Other
+36d062f4-1840-11e8-a44f-fa163e8624cc	1	\N	Other
+36d1017b-868f-46c2-99a1-238b5d2081c5	1	\N	Other
+36d130ac-afa0-4ee3-a8c4-ad95cc7aac6e	1	\N	Other
+36d37744-4916-45a2-ae57-071d46f4a521	1	James	Other
+36d461a1-c0a5-4eac-8cc7-71d640855b36	1	\N	Other
+36d6f2b3-c532-4357-a256-1b9eebab9963	1	\N	Other
+36dc2df6-1ce5-11e8-b060-fa163e8624cc	1	\N	Other
+36dd6275-a1eb-4504-869d-29dbcbd6945e	1	\N	Other
+36defdd0-4c04-44ed-89af-05c666a10379	1	\N	Other
+36e1f142-4692-4175-b5e4-a77871d3dbda	1	James	Other
+36e5bf5c-3e92-45fc-990d-e7e015f56dee	1	James	Other
+36e8b6f9-6db7-4c14-86c1-3502e08907c0	1	\N	Other
+36ec300f-f46c-4eba-8eb6-d6d41a3b4c75	1	\N	Other
+36eecca3-5aeb-4fb4-a572-059d36d86475	1	James	Other
+36f5eb63-2d27-46be-96dd-ebdc17891fc7	1	James	Other
+36fc21c0-d304-4e5f-b467-8eab58c2388e	1	\N	Other
+36fc8aec-670a-46cc-838f-a4795133f15a	1	\N	Other
+3700fb95-cedf-4cd8-a706-6e22d0cba4d1	1	\N	Other
+37090a87-869e-430d-a68f-c49a68231f06	1	James	Other
+37136b52-60d5-4210-8e70-a1a982cf3283	1	James	Other
+37152038-f923-4ad4-8ddb-71fefce0cbac	1	James	Other
+37161f20-dd5a-428a-b6b7-c055587ef2a8	1	\N	Other
+37185af9-fb40-4770-b603-6f1f57bab7f8	1	\N	Other
+37198183-ff8f-405d-b5c3-c3aca46194b2	1	\N	Other
+371dac3c-ec73-4fe3-adc3-3049fcb53bd3	1	James	Other
+371f4f31-cd59-41f7-9053-c669c513c697	1	\N	Other
+37246c89-8bfe-4dde-9310-bc144dab61c8	1	\N	Other
+37298e3a-6bb4-4364-a9d9-9def1fb64c53	1	\N	Other
+37454b57-d937-47be-850d-fddf6a211562	1	\N	Other
+37459a2b-ebb1-469a-896f-44c28b701380	1	\N	Other
+37485d78-f852-4914-bd21-4ea29d7b15b8	1	\N	Other
+3749b1a4-ed48-4b38-acab-f296e6a28608	1	\N	Other
+374e6dfb-98c7-4698-b8d3-7cf0cdf51304	1	James	Other
+374ec36e-fd7a-4e2e-bc0b-c95a502eac07	1	\N	Other
+375203b5-1b39-468a-89ec-3e8205648134	1	James	Other
+37536943-a70d-46ee-9e84-ec4d4c7d4a72	1	James	Other
+3754bd02-5d68-40ed-a94b-4f717e7abbda	1	James	Other
+375918a9-e9db-48e0-a12a-85c2aaf7e873	1	James	Other
+375c9164-38aa-44bd-a626-bbd3a90ab83b	1	\N	Other
+375f322e-7322-4956-8ec2-bab77065a29f	1	James	Other
+376007b1-ca2a-4b6d-a8f0-22d50f93e583	1	\N	Other
+3762992c-b76e-4b49-89b9-fea4878b7c85	1	\N	Other
+37642e12-98d5-4a2c-a490-0d005c33a8e2	1	\N	Other
+376cf7f6-0aec-42f7-a7b9-14711b962b09	1	\N	Other
+376e044d-4396-4ec7-927c-7edf54fb92b4	1	James	Other
+376e15e5-333e-43e1-998f-eee93fdb7e43	1	\N	Other
+37701343-b94d-49f3-99e9-827ef88187b5	1	\N	Other
+377a3647-0405-4600-b0dc-c96813587063	1	\N	Other
+377d1f50-88c2-4ca8-917e-4c48679274a9	1	\N	Other
+377eb425-52f5-4188-8627-ecc25d4cecdd	1	James	Other
+3780f6ec-09dd-4156-97d4-19bc0400f3e0	1	James	Other
+37825f4f-1dd6-4a8f-bcb7-5e07c404dc8d	1	\N	Other
+37840534-d130-4a24-9cdd-3daa8861937e	1	\N	Other
+378e0f63-3df3-4d2d-af5b-5d7a178c666e	1	\N	Other
+37951f8a-12c2-4fb8-9848-08a71f1a670b	1	\N	Other
+379627bb-9e30-4427-a892-30c5aad13b52	1	James	Other
+37964a0b-5018-44ae-bfa2-6b980f23b749	1	\N	Other
+3798fe3f-dfee-4e56-809f-fff192078a30	1	James	Other
+37993325-92b9-490e-be30-7ac8f946c9d1	1	\N	Other
+3799de3a-7c07-4271-9f56-07f04775680e	1	James	Other
+379f05ae-3693-45b4-bd58-2c8c6dc67986	1	\N	Other
+37a066e5-6d62-419d-927f-71e3d13cd941	1	\N	Other
+37a0ddec-64fc-4a88-a012-b46d4ef7daa1	1	\N	Other
+37a14b9f-513b-4421-8261-743a08111f9a	1	\N	Other
+37a5da52-4532-4f57-801b-54d30d57e9f3	1	\N	Other
+37ac1d70-5c86-4e90-9211-d5e5117d8916	1	\N	Other
+37ad0fce-6908-4909-9f1d-8e1cf07252d5	1	\N	Other
+37b1ad84-8215-4e3d-aa2c-d66309326748	1	\N	Other
+37b48e2b-53bb-4410-b1a2-1991ac670ae5	1	\N	Other
+37b4c411-1341-404e-b001-f5fd30790f0d	1	\N	Other
+37b4cb0f-3610-4911-bccd-ec7541c806c7	1	\N	Other
+37b4f4d2-15ee-4d33-b8cb-608b299b8706	1	\N	Other
+37b90f8c-367a-48d1-9f4a-0879556b3918	1	\N	Other
+37ba7ab7-8c89-48a3-929e-b91f2d0e1fce	1	\N	Other
+37bbc074-eef3-48ed-8701-43aa5d95e3d3	1	\N	Other
+37bcd790-a2ed-4f89-823f-5a186aaa8172	1	\N	Other
+37be8334-f01d-4893-8376-4fc4f243d65d	1	\N	Other
+37c24623-ec1f-4b0d-b06a-ac16ae968154	1	James	Other
+37c3e4f7-c93c-47dd-985a-57402d713b0b	1	\N	Other
+37c90e3d-9760-453a-be65-d9e33c5306fa	1	James	Other
+37cbe4d8-3cca-4da6-b8f0-cf148c77a39c	1	James	Other
+37d2f0f8-61ab-4a52-9136-01b1c8019a73	1	\N	Other
+37dbd95c-f003-49f8-8561-91a9d9a3dadb	1	\N	Other
+37dc292d-9572-4500-aef0-35cac5375e30	1	\N	Other
+37dd481d-5c3a-4464-999a-7c80ee9cf8fb	1	\N	Other
+37df8cc3-cb9b-4dd2-84cd-6202423ba08a	1	James	Other
+37e28660-683b-45a6-b7bf-00270dafbd93	1	\N	Other
+37e390a0-9d47-47e6-8942-d78805a08f3b	1	\N	Other
+37e3a54b-7248-4fb1-9a18-57c38a799055	1	\N	Other
+37e4d8c7-beca-425f-b0fa-4b909c47a04a	1	\N	Other
+37e5c97a-1d88-428e-8fb2-cbdee74b839b	1	\N	Other
+37e64aed-ee47-465f-a314-d04a1b476cb1	1	James	Other
+37eaa351-5182-462c-91fe-27010e3f67f9	1	James	Other
+37eca8d4-c6c1-4912-a022-41f74612c178	1	\N	Other
+37ed330c-8b38-4555-904f-6a2312bb0de3	1	\N	Other
+37ef022d-5c56-498e-9cf8-d00aee30bffd	1	\N	Other
+37f1c612-07bf-41ff-b9a3-d63d6b5e5633	1	\N	Other
+37f4d7cb-6230-45f5-974b-f60f44c99d42	1	\N	Other
+37f9ea08-5b25-493c-aaca-baafa56096bc	1	\N	Other
+37fb02d4-6f38-4f85-82f3-e44ec36e67a7	1	James	Other
+37fb2328-cfa5-4af0-bb15-40e4bb2b48a2	1	\N	Other
+37fc1655-7669-46f7-b4b1-5f0e52e65b59	1	\N	Other
+37fc2fbe-aa0b-4aa4-85a6-69a722ffd227	1	\N	Other
+37fd03d9-071b-47c4-b768-28e5ab59e632	1	\N	Other
+37fe2447-de11-4d5b-8e66-517e861b41ca	1	\N	Other
+37fe9c50-7917-42dd-86fe-18c796110c32	1	James	Other
+38004f12-a8ea-46e3-87f9-ecd07e0902c3	1	\N	Other
+38041cb3-36df-45b8-b42e-2f967a3aaf8a	1	\N	Other
+3804b66a-c3b6-48bd-9d5d-ecc81b07e97c	1	James	Other
+380602ef-163d-460d-99d1-add250ccbc08	1	\N	Other
+380c86df-7c48-4b20-9d9b-3d6f65430e85	1	\N	Other
+380d4da5-7017-4a32-bba4-1e1254a00c38	1	\N	Other
+380f556f-04e0-411c-8e5d-5b1e829ba3ab	1	\N	Other
+38108ab9-3b8e-40e5-aca9-b30e69368a9e	1	James	Other
+3816f40d-dba2-4b00-8ddb-7c852212bb17	1	James	Other
+38176c09-42aa-414a-ad6f-258294290757	1	James	Other
+38189b7d-8905-4f9d-aef1-0174275f3a9f	1	\N	Other
+38199450-6518-4d15-ac9a-0b5000a72401	1	James	Other
+381af87c-0932-405a-ac11-662047f72a25	1	\N	Other
+381c3778-529d-4e32-8c8d-ed6ef0681a95	1	James	Other
+3826f1a0-06dd-4945-ac10-1a9fee9c1ee7	1	James	Other
+38315936-a3b8-48e2-aaa3-fa936c1ab7f8	1	\N	Other
+3832de0e-3b8c-44b9-8b71-2216d0a6ba77	1	\N	Other
+3833b675-4b18-4a6b-99b2-b7b33661173c	1	\N	Other
+38340c5e-d8d6-47f7-b613-ecfa7bd8206d	1	\N	Other
+383f5550-8db8-4f9a-b536-66809d001b93	1	\N	Other
+3848e4b1-a379-495e-bfd6-8092e1887d68	1	\N	Other
+385b4a9c-d49c-48be-8a71-171ecd53200d	1	\N	Other
+385fd684-27d6-4112-8f54-c7d4e8e41de7	1	\N	Other
+3865f6c6-efbb-42dd-831a-49d4cca8f216	1	James	Other
+3866162e-b981-4e07-baa2-51d5c923149b	1	James	Other
+386eab92-effd-43a9-8831-21a9a16bba69	1	James	Other
+386ee6bb-a14c-46ee-a019-8a4cab62787c	1	\N	Other
+38737f88-8ba3-4f42-a549-c6270a375701	1	\N	Other
+38760a0c-3fb5-4211-ace4-b12909f6a8fe	1	James	Other
+3877c788-9634-4686-92b7-207866db73f9	1	\N	Other
+387b03c0-140b-4648-be2c-522cbca8d478	1	James	Other
+387d36cb-ef0f-482e-8dbd-0e75a57754cb	1	James	Other
+38813882-6cdf-44be-85c2-b0a589dce80d	1	\N	Other
+38822b70-deae-4438-b62f-e2281c92324a	1	James	Other
+388415c0-4553-46c6-8ab1-cc315fde5668	1	\N	Other
+3886342d-2e1e-4185-abbb-f74b8083480b	1	\N	Other
+388b41cd-6323-4783-b095-e855a8d6fe68	1	\N	Other
+388c2d9b-84b1-4c36-9a14-e865c45410d5	1	\N	Other
+388c4258-6566-44db-ad48-6140d1a724a0	1	\N	Other
+388f3196-5990-4fcf-b9fd-2b9665897cf6	1	James	Other
+3890ccdf-e4ef-4d6e-9e0b-4b3de5632321	1	\N	Other
+38914253-5f9f-4f0a-a70c-798e0635e78d	1	\N	Other
+389177c3-fae2-43a9-b131-68eed5050d89	1	\N	Other
+3894db39-194e-46f6-abf2-ac84b3f353ea	1	\N	Other
+389d2c6a-0db4-4f21-91e1-7807961aa9dd	1	\N	Other
+389e3bf7-5e48-4ff7-aa27-9958060b7f19	1	\N	Other
+38a35da0-6044-4fd6-9bca-66be72fd96b0	1	\N	Other
+38a827ae-aa20-48de-85a9-66b9a11fdb26	1	\N	Other
+38a92948-a501-4775-8e8c-9c34b54857e1	1	\N	Other
+38a97bb6-6d11-4f6b-b7f6-7fc6076d8c7a	1	James	Other
+38aaec6b-d326-4fd1-900a-363042cebfb4	1	\N	Other
+38b051f9-e2aa-4004-8178-6b9bcfb3e459	1	\N	Other
+38b4e738-6951-4ef8-a803-45642ab506ba	1	James	Other
+38b9f6d9-1a25-4942-9c62-d7735d269bba	1	James	Other
+38ba6b71-e63b-4360-a794-61c571e5483a	1	\N	Other
+38bc5dcf-f72b-4fe4-8bc8-d10ecbd552a2	1	James	Other
+38c196bf-b3be-4cb0-87af-5df33e0105b2	1	James	Other
+38c375a0-17b2-4acb-8717-2a26b2d25c3e	1	\N	Other
+38c7805a-105d-11e8-b09a-fa163e8624cc	1	\N	Other
+38c85563-1379-47e5-80c1-2fc122030a50	1	James	Other
+38c97829-ad49-44ed-b6e4-62ed60493b9b	1	James	Other
+38c9b88f-f743-4136-95fd-b2351029f80b	1	\N	Other
+38cb0945-b304-4003-a3e3-d9a36ddcd13b	1	James	Other
+38cb169e-cdf4-45bb-b2d3-d28e3181a4aa	1	James	Other
+38cd2d81-488d-419e-85d5-b69d3254f2c3	1	\N	Other
+38d304ab-594c-47f9-b0f2-3ed6b6d985f4	1	\N	Other
+38d75956-19f9-4f15-b357-965d6cc6ce4f	1	\N	Other
+38e0b650-d0de-40ec-9e70-7a9734aca170	1	\N	Other
+38e85b6c-0d40-4bb2-8de5-2e630c95fa76	1	James	Other
+38e8de0e-3d12-4333-bf08-1a5a93ab617f	1	\N	Other
+38e9d7c7-3325-412f-88fb-82426caa6053	1	James	Other
+38f5c3ea-db72-46dc-9808-88bc28e7390b	1	James	Other
+38f61798-9b78-4324-abb2-0b7b5bbfb89f	1	James	Other
+38f9471b-4344-4b2e-b800-cb614edaec45	1	\N	Other
+38fa3ae0-580f-4cef-a2d6-d77cb7126625	1	\N	Other
+3900bbec-c2fd-4286-9664-78129e8ce66e	1	\N	Other
+39014ea3-c03c-4570-bb50-48929e275a9a	1	\N	Other
+39056887-df0c-499c-817b-65d23b286eca	1	James	Other
+390c919a-fc06-44e2-b826-61504c413521	1	\N	Other
+390e507a-dc78-49d9-8dc5-a92ba5b12d0d	1	\N	Other
+390e542f-7cc6-4d0b-94df-63d64e670c0c	1	\N	Other
+390ffdbf-5a69-42ec-a36e-2f696e67b1af	1	James	Other
+39133a96-7165-4be3-8871-34cfebf7e1ff	1	James	Other
+39146118-105d-11e8-82e2-fa163e8624cc	1	\N	Other
+3917d3e3-c6b7-420b-aec2-545fdc992be9	1	James	Other
+3922a9ab-537a-4b68-bc04-3ac783694e32	1	\N	Other
+3927b29b-005b-436e-9d78-ca89aa0660e5	1	\N	Other
+392a0feb-22ec-4475-8593-781c90e2c45a	1	\N	Other
+392b8434-4085-466e-981b-2531600e68e9	1	\N	Other
+392de12a-d595-4722-bf76-3049176803b6	1	James	Other
+392eb4b3-9ce0-48c6-bafc-0cec134d53ae	1	James	Other
+39391e13-5156-4468-b9dd-1b331435e0c3	1	\N	Other
+393dac52-7770-428b-8690-412001a56b77	1	\N	Other
+39426cb2-c987-4cfc-ac1f-136aa501b7e7	1	James	Other
+39439695-5cb1-4cdc-9cf3-ca8efc6b7119	1	\N	Other
+3944a0b2-24db-486b-921a-22568f93c423	1	James	Other
+39520cc2-d7c2-4ea8-b055-e3fa6bb88c69	1	\N	Other
+395339fc-2669-4661-b68b-21a2d2bb4935	1	\N	Other
+3953ce43-d1c8-4c40-b51e-634d1fcb0db5	1	\N	Other
+3955a6aa-4002-4712-8fdf-dbd68558d57f	1	\N	Other
+39575989-9cc1-4ef8-8d84-e9eb599fa609	1	\N	Other
+395b151f-305f-4943-8627-ef8fd9a60837	1	\N	Other
+395da491-984d-45e0-8dfd-e9dae366a73c	1	\N	Other
+396463ed-c1b8-4567-8df2-bc252013c34a	1	James	Other
+396ccbda-2208-484f-bd32-a9da344327ce	1	\N	Other
+396d8615-5039-41a9-a22b-8d285b217049	1	\N	Other
+396f2c23-faf9-4a4f-8fb7-bf9172ffbc17	1	\N	Other
+3972f4cb-ac12-4292-9db6-2cc8c928d210	1	\N	Other
+39736ba1-f057-4946-ae57-6cf474d083c1	1	James	Other
+3976e2d2-b106-4b5a-a0c1-5003c20d9db8	1	James	Other
+39775155-6c1b-4434-8d01-0d3c000013f1	1	\N	Other
+397972ed-7184-4c9c-a13e-6d4d69f7d5c2	1	\N	Other
+3979e0f6-fff6-45d4-9b92-47b5f37156d3	1	James	Other
+397db734-71b1-4a12-9ef8-feb1b51d4985	1	James	Other
+39806ef2-eab3-4263-b5c8-3f7acecf8110	1	\N	Other
+3988a3b5-0b2d-4d7d-95b5-210dc7a2fc96	1	James	Other
+398b4b9a-edde-493b-9808-b8896faaeee5	1	James	Other
+398fed74-5f76-4351-8342-26a17c89f10a	1	\N	Other
+3990cf94-cc26-4943-9e89-db2c19f90282	1	James	Other
+399309ac-4247-4632-9f24-d1d81c5e81bd	1	James	Other
+3995a13a-caf7-4aa2-b894-6022a0442c78	1	James	Other
+399ca369-5dd7-4589-bdcd-d525e3bdf0c0	1	\N	Other
+39a7ed5b-d989-4f2d-a51e-b749f5b3de2c	1	\N	Other
+39ab3c97-76f5-4f77-9b33-8bab961113de	1	\N	Other
+39aefee5-77a1-4444-8b92-df5a98781421	1	\N	Other
+39b12185-ec20-47dc-8029-4578b9596d0b	1	\N	Other
+39b271bb-1d00-4a80-bb59-03d25d0ef927	1	James	Other
+39b36481-3612-4113-81b9-e819d39e3124	1	\N	Other
+39b521ff-b111-49de-bf1c-902d97b0d77b	1	\N	Other
+39be76ef-5335-4c4f-a504-c418bb681ba6	1	\N	Other
+39c3de02-56fa-418d-8c44-8ba1a74ce12b	1	James	Other
+39c46689-1dfa-4e10-be36-95232fe5f2d6	1	\N	Other
+39c6e9aa-7a74-4770-a5ef-ccc4590179e3	1	\N	Other
+39cc445a-b5b1-4119-abef-d774406fa428	1	\N	Other
+39cc8b88-27da-4c0c-93e7-2f5825519e46	1	James	Other
+39ce14f4-849d-4909-bfff-4b1aecbea318	1	\N	Other
+39d25a2d-f7be-4de1-ae06-660569667456	1	\N	Other
+39d3e53b-cb9d-4ca7-b3d9-4287a2e856cc	1	\N	Other
+39d4b792-74bc-4634-9643-208df90981a1	1	\N	Other
+39df5e7f-12ad-4ee9-b3be-4ef9ff20756d	1	\N	Other
+39e07bad-8944-4277-a887-0543d91ba45a	1	\N	Other
+39e54c34-208c-4b6d-a62f-922bb1d0fa8c	1	\N	Other
+39eb74db-a0b2-479f-a1a0-9881f419e4ad	1	\N	Other
+39f0d362-4ad6-447c-a712-b296cb4a72a0	1	\N	Other
+39f5d27c-1634-4f6b-90c9-e8f1745be158	1	James	Other
+39f88277-fdb3-4d8b-800a-02e57e65aef9	1	\N	Other
+3a040317-71d5-4ed5-9e1f-581e7eab5621	1	\N	Other
+3a06efc4-4e63-421c-b5ab-2d47bd505721	1	\N	Other
+3a0acca1-3d86-4117-91ed-28090976cc2f	1	\N	Other
+3a0d7ba9-d56b-41d6-bc6a-f85243e31554	1	\N	Other
+3a0db2b2-8e3d-44ab-8267-67259fff00ac	1	\N	Other
+3a0f3e44-c5b7-4eb7-9a2c-066acf65d2f7	1	\N	Other
+3a106484-642d-4913-b767-c0bd124ee72c	1	James	Other
+3a1670f2-526e-4e46-a549-3aa74ff35b4b	1	James	Other
+3a16f73e-2a2e-46d7-907a-58941646f63b	1	James	Other
+3a1f01b2-d866-4a22-b6c9-6c94dd567c11	1	\N	Other
+3a250f2d-24b8-4abf-8f1a-742ddf31aafe	1	\N	Other
+3a28ecff-1d74-4729-b91e-232666ee1052	1	\N	Other
+3a2dba3f-e521-4263-ab4e-cd9a4d9ac229	1	\N	Other
+3a317cbc-f5c0-42b8-b010-fb7816bb2b2d	1	\N	Other
+3a3354c2-b6b5-4bd6-a1b0-7481fda92883	1	James	Other
+3a33a3dd-f2c3-4f62-9a1a-e1102c7e4508	1	James	Other
+3a342be3-f216-4f9d-8628-84959f0e5e1f	1	\N	Other
+3a3720ec-a28d-4e71-9377-6858e5b21660	1	James	Other
+3a381af8-aa65-40e0-ba13-152786580194	1	\N	Other
+3a3db37b-3d4a-445d-9c2e-7c19987bcf45	1	\N	Other
+3a43082f-7b35-4d34-b069-3961fd294662	1	\N	Other
+3a454962-e7de-4c16-b5a2-19fb2e9422f3	1	\N	Other
+3a465f7a-2029-4e4a-88a7-816a79607bbc	1	\N	Other
+3a4e3d30-6ae6-404e-a110-ae4a4314eb90	1	\N	Other
+3a4e97ee-9ff8-4e1b-b5f0-3c5edcecc61b	1	\N	Other
+3a4f2adb-2342-41be-9b5b-d1e30b55dfa1	1	\N	Other
+3a510f76-a0a1-4833-a6a2-8756e09f513e	1	\N	Other
+3a520ee6-8046-41ff-98ee-a0984ff7089e	1	\N	Other
+3a565595-1fbb-4b5f-9ae4-cf23f58e5e13	1	James	Other
+3a568b71-5b31-41e4-ad0f-ce91ea72b3be	1	\N	Other
+3a5744ca-1c68-40e1-9fc5-6c937e86d81e	1	\N	Other
+3a5820fb-65bc-4a65-9bce-8d539e75ef7a	1	\N	Other
+3a5e703a-8c0f-4d16-9184-3abbf88c6320	1	\N	Other
+3a5f13b2-32d0-4caa-beda-25055c387062	1	\N	Other
+3a6004dd-3fc0-4bce-b9b4-34e4a13bfb0e	1	\N	Other
+3a647ecf-fc50-4817-bd55-b158234e2429	1	\N	Other
+3a648c38-d235-4a66-908e-4f8005612581	1	\N	Other
+3a72bdcb-2ee1-40f8-945c-517021518035	1	\N	Other
+3a72fb98-2b04-11e8-9399-fa163e8624cc	1	\N	Other
+3a73b727-729e-43ea-aa7c-1b0b93994023	1	\N	Other
+3a73f2e4-33d8-4290-821a-06c16cf9dc24	1	\N	Other
+3a75b8c9-fe72-4fce-b3ba-68162f1cf735	1	\N	Other
+3a775e6a-0fd7-4922-899d-4717100c7f9e	1	James	Other
+3a792f56-eee6-4440-9e8c-4e279e7b363e	1	\N	Other
+3a7b6c36-949c-4b2b-bf00-7cd7e509a534	1	\N	Other
+3a7f464a-df6c-4ba5-a276-09e7558641e0	1	\N	Other
+3a814167-57ff-41fb-827c-607526ac8206	1	\N	Other
+3a872430-2795-4f2c-af3b-f893c6cdc3d3	1	\N	Other
+3a90dcd6-6448-4704-8df0-7f1f0d72594b	1	\N	Other
+3a93e873-da24-45cc-bddc-961046d3aff8	1	James	Other
+3a9c9ae8-2b04-11e8-a1a4-fa163e8624cc	1	\N	Other
+3a9f0e71-9551-4009-a7bb-b93d7830d3bb	1	\N	Other
+3aaa9f69-1b10-432c-9aee-94b9cc89dd76	1	James	Other
+3aaf1521-fbe0-4f22-b6c5-14f7c795ffe2	1	\N	Other
+3aaf4121-3f14-4e4e-8a38-aa88283cce24	1	\N	Other
+3ab0a084-0e71-4d67-bace-25ef105a5bfc	1	\N	Other
+3ab60aa2-4f22-40f5-be41-56605a7bbabb	1	\N	Other
+3ab6b9c3-2eba-419d-b6dc-1e1e34fb4b46	1	\N	Other
+3ab6e5c5-ff32-48d8-abc2-5b86226cc98b	1	James	Other
+3ab7c464-e534-41db-9a69-a6189e30a149	1	\N	Other
+3aba7a0d-3970-45e3-9bb7-3ffd480abf9a	1	\N	Other
+3abce8f8-32b3-482b-837b-899da0afcb2f	1	\N	Other
+3abf75d6-ec6c-4ca0-8317-724276784567	1	\N	Other
+3ac01ef0-724c-4a8d-88d4-a1f6807d9eeb	1	\N	Other
+3ac122b8-59c0-4fde-8f22-152fed43a63c	1	James	Other
+3ac302dc-af45-4956-b0ed-9b73a8e5e5c1	1	\N	Other
+3ac576ad-9f1b-4c28-9088-3f18138f3c02	1	\N	Other
+3ac6c635-f853-40c2-8c79-7ac784416308	1	James	Other
+3ac898ba-0ff2-4fd2-8f32-c1ee9f2e92b6	1	\N	Other
+3ac935df-12ee-4c95-ab53-4638a4b0d449	1	\N	Other
+3acbeb5c-bb3c-4f89-88f5-348d32caadc1	1	James	Other
+3acbfb22-ba56-4cef-80b6-9206b0af63dc	1	\N	Other
+3acfdb27-f5c3-4d12-86cb-14d64cb47df3	1	\N	Other
+3ad07d9d-462b-4771-82e5-40191c5b5907	1	\N	Other
+3ad083c7-42f7-4d74-9b61-1de49bf82d94	1	\N	Other
+3ad27061-a0a5-4303-b9ab-052b03ced9ff	1	\N	Other
+3ad3fcc5-737b-4d36-ba0f-ee447919d6a0	1	James	Other
+3ad4f1b8-2b04-11e8-bc46-fa163e8624cc	1	\N	Other
+3ad5a591-73e8-4fc9-9b78-3d06b65cc64b	1	James	Other
+3ad7350d-755b-413d-a2c1-03b803f156ff	1	\N	Other
+3ad787b6-2b04-11e8-b723-fa163e8624cc	1	\N	Other
+3adfca6c-af1c-47e8-be0f-8e3d314a8912	1	\N	Other
+3adfcdc0-0113-4be1-a6d9-cb3ed59820a4	1	James	Other
+3ae3d471-51bc-43f4-a3b9-bd4990eaf055	1	\N	Other
+3ae3d866-a9a8-477b-b499-12e8a254c564	1	\N	Other
+3ae8a0fd-4dc2-4235-8c4e-3e84c85b1acc	1	\N	Other
+3aea45ad-4970-4ea2-a99a-0e406670cc1d	1	James	Other
+3af16e2d-05ff-45be-82c2-dd16723bc707	1	\N	Other
+3af7d0fa-ba9b-45b8-a6cc-64e80ebeb99f	1	\N	Other
+3af87c8b-cc0c-4fbc-ade4-2ce2badb0a42	1	\N	Other
+3af9d7e5-0b57-44c7-9409-c43dcdf4f7d7	1	\N	Other
+3afe2210-90d1-4600-898e-8de486169830	1	James	Other
+3afe5b26-f386-4a82-8f94-ae4827520a96	1	James	Other
+3afe6c6e-2c09-4eb2-82d2-6a70f1ada498	1	James	Other
+3b02ec31-67ea-4a2e-be64-19e7cf5e28be	1	\N	Other
+3b040f34-85b6-4c98-979e-0b98bb9a42b4	1	\N	Other
+3b05bf75-39ee-4ba5-9b25-48012fb8bddb	1	James	Other
+3b068c1e-6d7a-4d97-809f-891f5adb2d5d	1	\N	Other
+3b08204c-1ede-4f17-8823-b3a2b55cc34c	1	\N	Other
+3b08399d-9579-4f18-8c29-a34b461e18ae	1	\N	Other
+3b087c38-6c0b-4932-9103-dc4c683e18a7	1	James	Other
+3b13be85-2732-4550-b885-30f3a1493880	1	\N	Other
+3b16be93-f12f-4bd5-a9f1-87c5076bd961	1	James	Other
+3b1a20fa-bb61-4401-9d13-be2073fe5a81	1	\N	Other
+3b1bc5b0-7e2b-4ee2-9e43-99535c408ed9	1	\N	Other
+3b1c599c-7f27-41df-b8c9-2bacc1a77bc9	1	\N	Other
+3b1dcc42-7e7e-4fb3-bf39-3515d1895871	1	James	Other
+3b1e1c5c-0c2f-4251-a195-2d8257bd352a	1	\N	Other
+3b209674-9405-47b8-b336-1ea74d862a0c	1	James	Other
+3b20e1d4-3e3d-4e18-80df-b74491ed2618	1	James	Other
+3b2171fb-dbd5-414b-852a-6bd302e906d2	1	\N	Other
+3b236701-3e35-4722-aeb1-19a0f5351d7f	1	\N	Other
+3b253a34-4a22-41ee-898a-ab0d93b64b72	1	James	Other
+3b2761a1-8f33-40d3-8beb-5ebff4973ce1	1	\N	Other
+3b2a5483-dc06-4dfc-8098-dea2afe7dad3	1	James	Other
+3b2e16c7-67a7-4ec3-a86d-98e3d3ccbe72	1	James	Other
+3b31077c-06ac-4f31-a4b0-87f06501f733	1	James	Other
+3b32be27-45a6-4137-b3a4-5e237f615bca	1	James	Other
+3b342694-c9f4-4883-9f38-69bf7d729d97	1	James	Other
+3b36bc58-816e-4379-8767-0c446c3d907e	1	\N	Other
+3b3a33d0-0ed8-4720-b03b-d45308e99c1d	1	\N	Other
+3b41931c-0e13-11e8-9000-fa163e8624cc	1	\N	Other
+3b433610-7a6d-4d48-af7e-adde33d53ab3	1	\N	Other
+3b47ddde-6791-494d-ba65-19f5fcbb4364	1	James	Other
+3b488ead-d3bc-4259-a042-aef7fc997346	1	James	Other
+3b4aa121-e43b-4fca-b027-65fd2c09d623	1	James	Other
+3b4adf9d-3add-4300-9e74-e9695993a5f5	1	\N	Other
+3b4da7e3-760d-407b-b9c6-dde9180c9c43	1	\N	Other
+3b4dc88d-5f63-4b02-b314-5d48c1c8b7a3	1	\N	Other
+3b4f7a1f-7eac-4afd-be6d-9f4d9a7e8ba4	1	\N	Other
+3b529202-0e13-11e8-904b-fa163e8624cc	1	\N	Other
+3b584159-6bee-418f-a6f5-5229314d4fb7	1	\N	Other
+3b592c18-3709-4ae8-ae2b-e15699b8db61	1	\N	Other
+3b5c9b26-0749-46a1-bb98-f1a27c6045a5	1	James	Other
+3b5fe030-9d1d-4b7a-ad67-446ce68ba646	1	\N	Other
+3b60ee1f-7844-43aa-a288-c28aa4b9df26	1	\N	Other
+3b6367b3-ff93-4d22-9e8a-20ed0bd4f92e	1	James	Other
+3b65951d-66ba-441e-b7cc-cfd0da7980f7	1	\N	Other
+3b68bb23-c715-4831-9b7d-bb925cdca188	1	\N	Other
+3b6c9ac5-3b6a-4932-ab1e-b234c92c3957	1	James	Other
+3b753b2c-37e3-4f94-894e-0fc35163776c	1	\N	Other
+3b7ab200-6816-48f6-b746-d1bc01f00234	1	\N	Other
+3b82ad93-c5d2-4689-a08e-bb87b344f221	1	\N	Other
+3b85b050-53ee-4316-9991-f5ea0edb5972	1	\N	Other
+3b863f61-83e0-4421-8907-cb8dee7e22af	1	\N	Other
+3b8678f8-2255-46c7-9966-dbcb44b28893	1	\N	Other
+3b91486c-0e13-11e8-96ad-fa163e8624cc	1	\N	Other
+3b91e5ec-0e13-11e8-a146-fa163e8624cc	1	\N	Other
+3b939c94-28fd-4af4-96b7-52b67d86cefc	1	James	Other
+3b954ea3-9d2b-4cd7-ac34-45bcf5cbf6d2	1	James	Other
+3b95994a-40aa-495a-bdc7-bca63a2cc221	1	James	Other
+3b9952f9-b020-4897-bbcc-c9cfcedda49e	1	\N	Other
+3b9f493c-fb9d-4b73-8f31-6b50fad228d4	1	\N	Other
+3ba33688-9ccc-4b10-a045-3be89d3d202c	1	\N	Other
+3ba47e05-d000-4501-8e56-5bba54f9f492	1	\N	Other
+3ba84ea9-00ab-41c7-8453-4436c21deb51	1	\N	Other
+3baf6243-09f8-4ffe-b5b6-c69030574d0c	1	James	Other
+3bb11579-0b28-4042-9fcc-9142ac025f1b	1	\N	Other
+3bb1e73c-45c6-4a54-b7a2-c9dcff2bb632	1	\N	Other
+3bb28a13-9780-4541-9f81-92c0450e223d	1	James	Other
+3bb2907b-068e-4208-8acb-75307280a415	1	\N	Other
+3bb51f27-3b6e-4609-9168-fbe56ef6c539	1	\N	Other
+3bbfa607-28ae-4013-86ce-de0fb771e153	1	\N	Other
+3bc1b291-57f4-4c48-a622-bde6cb357a18	1	\N	Other
+3bc2709a-477f-4a98-b9e6-774aa815d069	1	\N	Other
+3bc3b978-a3f9-41ee-ba6f-864d38ae1933	1	\N	Other
+3bc9446f-e424-42cf-a27d-c3677fb00642	1	\N	Other
+3bcc91b0-f308-4e07-940b-d69262406c02	1	\N	Other
+3bd1035f-fda8-42bd-8f8d-6d17f361fd69	1	James	Other
+3bd64d24-2ae5-4123-9a4c-5f6840696040	1	\N	Other
+3bda050b-805a-44b8-b9ef-c1556fdaa916	1	\N	Other
+3bdc8569-5bda-4bec-806f-b8f192edc15a	1	James	Other
+3bdccdb7-7480-4bed-99e1-fede167f4fa2	1	James	Other
+3be401c0-3173-4f1b-a500-1581ce42df25	1	\N	Other
+3be418a1-d148-48bd-b6af-a67082e44ea0	1	\N	Other
+3be767fd-ae4f-4afa-b899-78ad440c6ab1	1	\N	Other
+3beb0ffd-2609-497e-b233-8681e5538125	1	James	Other
+3befcfc9-f852-4f26-9479-c348b34c0efd	1	James	Other
+3bf116ba-3658-40d3-bcc8-2fa1c37abe09	1	\N	Other
+3bf2b65c-022a-4cca-84ae-139e08d232f6	1	\N	Other
+3bf61917-9c05-4fbd-82e2-c5ac176cb68a	1	\N	Other
+3bfa0fdf-c00a-4ab7-9c91-14fc8aed4977	1	\N	Other
+3c018c65-5098-46b0-b74b-7f4fd2342531	1	\N	Other
+3c02ad1d-5cda-4803-be1f-3c74f11bba4c	1	James	Other
+3c1086e4-73f1-4b36-a7ad-5cb9f101099c	1	\N	Other
+3c10eea0-da77-4389-8d19-72f11f8dcee8	1	James	Other
+3c11ff3b-c0a5-40de-8d3f-0959c212c9a0	1	James	Other
+3c168926-b99f-457a-b7d5-2e43536dfce7	1	\N	Other
+3c193fb3-a456-4e39-ada0-f993efb52b14	1	\N	Other
+3c200021-d017-45b4-9dcd-a0ed18d10e1d	1	James	Other
+3c29a0e9-5918-4036-9298-7a41b09194ba	1	\N	Other
+3c2e0af0-9633-415e-b24c-ede3f2dce745	1	\N	Other
+3c302660-330a-43e1-8177-23c7e7613a4e	1	\N	Other
+3c305f00-d2a7-4f09-806f-f27ae962797d	1	\N	Other
+3c334e92-d445-406f-b53a-9e368023fb94	1	James	Other
+3c34e71f-9875-4d27-b43f-3df7d590cf3a	1	James	Other
+3c3e785f-7470-4cf1-b859-baa1ad1d87a6	1	\N	Other
+3c3f4e41-841f-4831-997a-7811c2a048c2	1	\N	Other
+3c3fed6f-76dd-49d5-8b99-919d4bb54e1d	1	James	Other
+3c490b67-3b94-49e1-9827-d995205d505e	1	\N	Other
+3c4b04cc-da40-40cb-9bbd-e26099bd03ad	1	\N	Other
+3c52bc70-22ad-435d-97b6-acb8d7ba9658	1	\N	Other
+3c53eb61-8a70-4689-a6a0-2c07fa717a6e	1	\N	Other
+3c5d24ed-f0d2-42ed-97a8-cd3a4e08b0bc	1	\N	Other
+3c69661e-ed9a-408b-aa55-540b4349770c	1	James	Other
+3c6a786b-3aa4-49bd-8d81-2789c8ecd6b9	1	\N	Other
+3c6b2508-6dbc-498b-9809-6e45254624cc	1	\N	Other
+3c6b6ba2-4a3b-42e9-9ac2-a6c0e5972cfd	1	James	Other
+3c6c4964-59b3-48b0-aac9-982a8a89c5ce	1	\N	Other
+3c6cd493-ad26-4e3f-8dae-f94e93ad9260	1	\N	Other
+3c6fe98c-b3e2-48c5-b308-93d67d89d5bc	1	\N	Other
+3c742479-b4cf-4dd3-86b2-6bfda306617a	1	\N	Other
+3c7439cf-a63e-4614-9400-c64e141e6975	1	\N	Other
+3c74bdee-bfe3-4078-aaaf-7db12ce03585	1	\N	Other
+3c760978-c6da-4b3c-a9cf-aeee934ac2f7	1	\N	Other
+3c779f50-ad27-4bef-aced-fbc05ea7e261	1	James	Other
+3c7ba18a-43ae-4ac5-adc5-5d3582f53a57	1	James	Other
+3c82c906-330f-4d2c-ba02-7c8e3f1e925b	1	James	Other
+3c830136-4fe5-4ae1-b991-a5a188008b4c	1	\N	Other
+3c83d8d3-c660-4cde-9139-04797f7784f2	1	James	Other
+3c84d5a1-ccbd-4dcc-a219-13d4847ebf43	1	\N	Other
+3c889d89-d57e-4597-be0f-94ee15a3e7d8	1	\N	Other
+3c8ac684-b369-4e7f-80c0-15550adc2233	1	\N	Other
+3c8f6949-6f02-40f2-adc3-00c407cbcf46	1	\N	Other
+3c928d69-6caa-4eb3-8502-70320ca3ec71	1	\N	Other
+3c95e9bf-890e-41b8-8429-fa0ee31b4153	1	\N	Other
+3c976a80-41e6-47bf-9936-9aaf77d9a42c	1	\N	Other
+3c9938d8-7dcc-4062-96bf-e3fc2ad21bb4	1	James	Other
+3c9b6b99-9744-4174-a794-635172d767c7	1	\N	Other
+3c9c3d70-85e6-4092-b782-d47d6df7505f	1	James	Other
+3c9eda02-1ad9-4edb-8423-dc5396b79c55	1	\N	Other
+3ca135b3-b024-45b7-b9f8-da5d5376c4cd	1	\N	Other
+3ca30a1c-b785-4715-be09-5e092a0a2f8c	1	\N	Other
+3ca8595c-da5c-4bf8-9955-acdbfb3251ad	1	James	Other
+3cace2fb-1dfe-4004-a3c0-81495be86fbe	1	\N	Other
+3cb5c71d-574a-45b8-866d-50203a5a5bf3	1	\N	Other
+3cbba6e4-8ee6-49aa-b9d9-4524c69f5afc	1	\N	Other
+3cbc65a2-8cdb-4b22-bfb8-e5137d4d32e6	1	\N	Other
+3cbdac03-c07f-47ff-b6f6-21d8c25297ee	1	\N	Other
+3cbdf25e-8eae-4d69-95d2-467014b25c08	1	\N	Other
+3cc22dc1-a6aa-45bf-a673-0784b91dc38a	1	\N	Other
+3cc278fd-af86-4d23-b71f-9b4a11e82831	1	\N	Other
+3cc4bf25-95e0-4363-a6f5-1a5818bc9edb	1	\N	Other
+3cc5d537-e448-4e62-931a-2c4f47fbe449	1	\N	Other
+3cc6c25f-4247-413e-9295-61b90a752987	1	James	Other
+3cc8bb4b-87a5-495c-8539-3b623578ff56	1	\N	Other
+3cd6b11f-c74f-440d-9ba9-620f0369869c	1	\N	Other
+3cd7c9ec-ce67-4db0-818a-709ec3eef7e4	1	\N	Other
+3cdb6f02-296a-4a90-940e-d71c1d2a1783	1	\N	Other
+3cdec758-fa67-4578-9f5e-b5fa6197a173	1	James	Other
+3ce4b558-ed39-4e83-91fd-3625f5630f39	1	\N	Other
+3ce87c73-7635-40bd-a152-6eb3ec660032	1	\N	Other
+3ce90d1b-6a5c-4326-855d-108993995910	1	\N	Other
+3ceaebd6-c2c7-421b-94ab-67e90fd8d840	1	\N	Other
+3ced43da-b3bb-422c-b1f3-c30f95636780	1	\N	Other
+3ced713a-b5e1-4d74-b171-924eff655559	1	James	Other
+3cf0bdd4-b70f-4d26-a23c-79fa44230f88	1	\N	Other
+3cf1b2f7-992e-4a6b-b239-daf2b9dc3ad6	1	\N	Other
+3cf35e34-b4c1-47ed-bd03-82d9602a9d25	1	James	Other
+3cf603da-6bc8-45ef-98ec-107c839f3300	1	James	Other
+3cf9c65f-bb2c-45a8-bf4d-298d52df1077	1	James	Other
+3cfcb84a-5679-417f-b34c-511d0a81e3e0	1	James	Other
+3cfec092-e907-45db-9fba-a95f06d05415	1	\N	Other
+3d02920e-80dc-4377-be02-f3312cccff99	1	James	Other
+3d050517-9bb4-4308-bb0d-8c3667be7e46	1	\N	Other
+3d056d16-b1a8-46c1-8436-0c8f6aa4fc20	1	\N	Other
+3d166db3-4cc9-4e19-8805-14677c3d058a	1	James	Other
+3d1e624e-5ab7-4bb0-bba1-7826b43cb0a8	1	James	Other
+3d20732e-2d10-4472-837c-d05681b4c345	1	\N	Other
+3d271762-ccbb-4e19-b4e0-4afec90da94d	1	James	Other
+3d2927da-0f10-4d8b-9297-92104e92da6c	1	\N	Other
+3d2de441-065f-4971-953a-8e7966416ce8	1	James	Other
+3d2f0c02-5aba-48cc-8d24-893391c81866	1	\N	Other
+3d321c7f-46e5-4891-99c6-e8400c0e0fae	1	\N	Other
+3d361aa2-2b64-4e46-b176-b340962c46b2	1	James	Other
+3d3af732-12c8-4d25-9356-f62b687d57c8	1	James	Other
+3d3cee18-480d-40ac-9508-047c0ff67d64	1	\N	Other
+3d3df9b2-48e2-4d6c-bf1e-056986a5d79d	1	\N	Other
+3d414370-0481-4142-81b0-8a788788bca0	1	\N	Other
+3d4409b5-229a-4d3f-844c-ed753a068944	1	\N	Other
+3d4850e0-5862-49e9-ab30-51a628c938f7	1	\N	Other
+3d497525-f0dd-413e-90ed-2c708840f237	1	\N	Other
+3d4b8911-b63b-4eb0-b01b-72007c84d218	1	James	Other
+3d4e01f3-fa90-4384-a676-a0949a8c35aa	1	James	Other
+3d4facd6-d10c-4199-b21d-9fade18cb6fe	1	\N	Other
+3d5abcff-ee2c-4b29-a383-5ce792bd588f	1	\N	Other
+3d5c3f25-f63f-4f41-ad81-deb895f6e910	1	James	Other
+3d5cf7e5-2abd-4499-af53-0f5e8476f34f	1	\N	Other
+3d61879f-33d6-40ec-88b9-72221c897687	1	James	Other
+3d620194-eb61-4c1c-a6a2-bc1c303ed0b9	1	\N	Other
+3d62e3ce-3a4b-4a8e-b9df-b37b8fb0313c	1	\N	Other
+3d6890d2-84ca-48ca-b7c4-f059fcbe16f4	1	\N	Other
+3d6c0623-d8e0-4c7a-ad6e-a22f1c60502f	1	\N	Other
+3d705309-fe01-4417-86de-7551da31cee2	1	James	Other
+3d71c4da-a6b9-42ce-86da-7b0ceb769879	1	James	Other
+3d722670-a544-446e-9096-992316dc5d00	1	\N	Other
+3d74eb89-3790-406d-a78d-29e17bd7abe6	1	\N	Other
+3d757a8a-bf31-42cf-9b12-9e8541557eb6	1	\N	Other
+3d778c06-a0bc-4fd2-8975-64bef0db1a9b	1	\N	Other
+3d789528-7150-428c-a998-86e349209f75	1	\N	Other
+3d7bcfba-cdba-481b-a689-27fa7fce2cab	1	\N	Other
+3d7be34c-623f-4e9a-9116-fe48cda4b913	1	\N	Other
+3d7d9f13-61d0-4bf1-89f5-0a6218616cd0	1	\N	Other
+3d815087-5af7-4747-a965-66c0e6387dcd	1	\N	Other
+3d81ac2b-ffc3-4036-b665-b4c6707561d8	1	\N	Other
+3d887f90-14ed-42d8-908c-a910932686cd	1	\N	Other
+3d8a8001-fed0-4592-8ef1-1dff10c7ce3e	1	\N	Other
+3d8b9042-85b9-4d08-a6d7-075fc815341e	1	\N	Other
+3d8c3651-6a01-4575-b939-07d0c21581f5	1	\N	Other
+3d8d2a85-8e47-421a-9fbf-f1a2ca0bb5c2	1	\N	Other
+3d93b03e-5df8-443d-9751-5acdd1e75127	1	\N	Other
+3d990cc0-5bb4-463a-aa22-123f287635b5	1	\N	Other
+3da52604-447c-424f-b5f6-67fedeba81d6	1	James	Other
+3da5d09e-f6f0-4adc-9a28-3d06f860addc	1	\N	Other
+3dab77c9-cccd-4312-9008-715f10d7fd0b	1	James	Other
+3dae0316-2297-4fc4-beaa-10cb63a0f026	1	\N	Other
+3dae77a6-a5ee-45c9-bd06-e1955b2c8101	1	\N	Other
+3dae919e-b2ee-4766-b466-7b9ac3644974	1	James	Other
+3dafcdee-ce34-4d7d-8355-2fe396640c1f	1	\N	Other
+3db1602d-f9f6-4e25-8c8e-16e0eacaa028	1	\N	Other
+3db3a06c-86e3-4928-bff9-d0d95e4518e7	1	\N	Other
+3db77f9c-c1bc-48b3-b81e-a1519fe0ec4f	1	James	Other
+3db7ba0a-fb30-4b68-ae50-864f6cc1ec46	1	\N	Other
+3db9c851-e914-4306-a7c5-f9edfcf04120	1	\N	Other
+3db9fa6d-6267-468d-9d29-ebe06ab5d95e	1	\N	Other
+3dba7c34-8046-4d4d-a942-114dfbc9127c	1	\N	Other
+3dbab6d9-89ae-4952-a2bf-56af894d57c6	1	\N	Other
+3dbac2e5-3559-43a0-913b-85b9d0e7e75c	1	James	Other
+3dbb70eb-e490-40e3-b192-a4b517e2f18e	1	\N	Other
+3dbc3f75-daf7-4927-9708-f2139cba57d6	1	\N	Other
+3dbd23a6-00d6-4b24-83b5-4dc0ad683fe6	1	\N	Other
+3dbeb65c-4e62-40ca-bfb8-10f74ab778d6	1	James	Other
+3dc22255-a8bc-459e-8c8d-f582c6acc1fe	1	\N	Other
+3dc51ff3-a296-447f-aa6f-bc6625715614	1	\N	Other
+3dc70f5e-d6c2-47cc-ba12-999eb5f8e6b3	1	\N	Other
+3dc8499d-1fb2-4532-b3b4-169506a07b94	1	\N	Other
+3dd13f13-7046-4aa7-8112-4d9563cd9109	1	James	Other
+3dd4e3ed-066b-43c7-82a1-d3da5e8dd703	1	\N	Other
+3dd6af33-a9dd-4f44-aa87-d0adbcc9b0d1	1	\N	Other
+3dd770e4-a4f9-4483-b39f-d02ebe83e8ed	1	\N	Other
+3dd970c2-78c7-4b8b-9670-c12a25498300	1	James	Other
+3dddc19a-83e7-44e0-805e-6a0bffe5f487	1	James	Other
+3ddfc670-832c-4c3c-8a04-794e9b105c7f	1	\N	Other
+3de13ea9-42ac-4e3f-8f21-63e89c856b9d	1	\N	Other
+3de52974-a7c8-49ca-b64e-5bee5207d384	1	James	Other
+3de67642-f229-4255-a16f-1cb368fbccf0	1	\N	Other
+3de6c353-8b0e-4b4a-954a-d139d96357de	1	\N	Other
+3de751bd-0816-411a-a09b-cf4b00ec5db3	1	James	Other
+3de84903-0337-479b-8bee-6cba179c468f	1	James	Other
+3de8a24c-53e9-4b52-83b0-7db0b4a0d7ce	1	\N	Other
+3ded028e-b5b1-4f36-b653-dfb67bfa6312	1	James	Other
+3df4c59d-80f4-4368-b5c3-5f03c6b8d83b	1	\N	Other
+3df50c64-3b77-4887-bf6e-d43649f53eba	1	James	Other
+3df69bdb-9665-435c-b767-148c86458f31	1	\N	Other
+3df8e22d-8255-46e4-85ea-5c4af031aac0	1	\N	Other
+3df9f1f2-2b29-11e8-9d40-fa163e8624cc	1	\N	Other
+3dfa3bb4-6507-4929-bc27-63075137ab50	1	\N	Other
+3e03fbcd-bf4b-4e87-8ec8-06d1a8249a0e	1	James	Other
+3e087ccd-ae50-4566-92d7-382df2a077d7	1	\N	Other
+3e0992b9-c13d-4b8e-8876-c90475434e54	1	\N	Other
+3e0a682d-baf1-42c4-b1ef-d6414669aebd	1	\N	Other
+3e10b630-2b29-11e8-b24c-fa163e8624cc	1	\N	Other
+3e128521-5597-498b-8ec1-c31130cbf772	1	\N	Other
+3e160e87-dc12-4c0a-ad14-f816c4e3f0fc	1	\N	Other
+3e1b43a1-7491-4d89-aebe-3f3a8e5498ef	1	\N	Other
+3e1c31c6-43ca-4d61-a1cb-b3dc3f13f9f5	1	\N	Other
+3e1d7454-d336-44b5-a2e8-33a3fbca6978	1	\N	Other
+3e1dd72d-36be-46f1-845e-f86161ede12d	1	\N	Other
+3e1e40ab-bc4a-4ae1-8815-0b3eda4f1565	1	\N	Other
+3e1ffe8a-6583-402a-8105-36a3cae540ae	1	\N	Other
+3e220745-7a34-4d74-ba30-05571b4b19b4	1	\N	Other
+3e250426-95f8-4c6d-9b72-d485deece349	1	James	Other
+3e281371-2c54-4c12-a626-909b17bd2015	1	\N	Other
+3e28262b-3ea1-49da-bcc0-a4a26247864f	1	James	Other
+3e2ee38b-53d9-40e8-a022-2643ff7be8e9	1	James	Other
+3e32c013-665f-4924-9d5f-54c22d1423f2	1	\N	Other
+3e33d89d-db4f-4a12-9b0d-dbd9a31f30d6	1	\N	Other
+3e348b4a-7d74-4ca8-98a4-24acc6ce9272	1	\N	Other
+3e361120-ab05-49d0-b1e0-db391fe469d3	1	\N	Other
+3e38d05d-82da-4e68-b35f-86ce84f24f1d	1	James	Other
+3e3934f2-fa21-4f98-ad06-aa8e5dd317b8	1	\N	Other
+3e3ca287-0013-44b5-9b6e-cc2dd007e6b2	1	\N	Other
+3e3da32f-058d-4a00-a9ca-0abe29266bcd	1	James	Other
+3e3e003c-689b-4fb9-abb1-10b172d624bc	1	\N	Other
+3e426b04-d843-487a-8d3b-7dce3ffbbb78	1	\N	Other
+3e42ce85-4980-49bc-8a2f-dd066f300f2c	1	\N	Other
+3e4b92e8-e9da-44e9-be4d-9b52d72cd0e0	1	\N	Other
+3e539af2-da13-4d5c-ae08-694fa928fccb	1	\N	Other
+3e571fa8-1e6d-11e8-940e-fa163e8624cc	1	\N	Other
+3e5d12cd-8e79-4dec-b0f8-0dbae606d1fd	1	\N	Other
+3e5fa25f-bdee-4b66-b1d9-266739f7c312	1	James	Other
+3e682d09-5e03-4011-ae33-0f51d1f9eff9	1	\N	Other
+3e6c6d88-509e-4425-b867-1bad3b7a3335	1	\N	Other
+3e6d2759-7cb2-4c78-aa79-7953aaec2eb8	1	\N	Other
+3e7028e9-4835-46db-b3d1-fb4690639a9b	1	James	Other
+3e7171dc-6903-4de2-8061-2b018a9f6a9a	1	\N	Other
+3e71c00c-d22f-4770-a530-fa1777e3437e	1	\N	Other
+3e740899-7401-4d69-a887-62c7eb0277f3	1	\N	Other
+3e796b14-8ff1-45ac-b899-3d9258a59e5d	1	James	Other
+3e7aa81a-c991-4b39-8af8-bdb11ab5672a	1	\N	Other
+3e7d9cc8-f15e-4b24-af1e-0749b999d881	1	\N	Other
+3e824b7e-2b29-11e8-bd66-fa163e8624cc	1	\N	Other
+3e83c36f-637c-4d01-97ae-bf98819fea1b	1	James	Other
+3e84a817-6569-4d71-a57c-ee4f4989aa87	1	\N	Other
+3e85497f-cbbd-42d0-95bf-d999a87f88d1	1	\N	Other
+3e8675fa-2b29-11e8-83b2-fa163e8624cc	1	\N	Other
+3e87bda2-0376-4360-817d-1629eceb5a32	1	\N	Other
+3e8d6618-0ccb-4974-9090-51dd68c70087	1	\N	Other
+3e8f4ec9-434b-4c87-a77e-176ac0d8c38f	1	James	Other
+3e9247f4-1e6d-11e8-b045-fa163e8624cc	1	\N	Other
+3e94031b-5e01-4fd5-9b79-3f4b8a91538c	1	\N	Other
+3e968fc3-5323-4db5-858d-f5acf09a9faf	1	\N	Other
+3e9eed4f-045e-46e5-8249-a62492447fdd	1	\N	Other
+3e9f77be-af5e-401e-8173-675c4ed33046	1	James	Other
+3ea073a2-39ae-47f2-844e-7b102b398373	1	\N	Other
+3ea2e40a-26e8-468f-8389-c9277021a9d9	1	James	Other
+3ea4522d-7ccc-433d-b49d-a3dbaaceeb02	1	\N	Other
+3ea8f6ba-98e5-40aa-b9e4-db40e008c473	1	\N	Other
+3eaa0a06-2093-41dd-a82b-3dec18b6811c	1	\N	Other
+3eae7a4d-2a34-4206-bbf3-c0110eb8324f	1	\N	Other
+3eb019c5-41df-435f-bfcf-f8ff2ee3c634	1	\N	Other
+3eb219af-13c0-42b2-9e63-a3dd746dd57d	1	\N	Other
+3eb60ed0-06c5-4137-9ab7-fe259684faf4	1	James	Other
+3eb6e799-9cb9-4088-957d-fbc2571a6b41	1	\N	Other
+3ebae497-cc7d-458a-bba5-75a588327f8b	1	\N	Other
+3ebcd7db-b659-417c-95da-699b2c64de86	1	James	Other
+3ebf4023-0ecd-47cc-8d57-dc796c1117fd	1	\N	Other
+3ebff177-91b2-46bd-b36c-0397ef4dba39	1	\N	Other
+3ec2606d-4f2c-48c4-a40b-2a378bcd1516	1	James	Other
+3ec811bf-3a32-47ca-b328-131be00b1037	1	\N	Other
+3ec8c48f-0a20-480a-a15c-3ba6b425efb5	1	James	Other
+3ec938e0-198d-47f9-9ea7-9ac68ba22e90	1	James	Other
+3ec9de94-9762-4c15-b7af-f9aca661a593	1	James	Other
+3ed21667-d8c8-4b4d-999b-b7a2d898b2a5	1	\N	Other
+3ed2b9dd-5401-4c75-9a42-808cb8817f36	1	\N	Other
+3ed4a4b5-d8f5-45a3-bc75-e007e0c56b84	1	James	Other
+3eda6c27-865e-47f8-899f-321a813b325f	1	James	Other
+3edaab15-6bc1-4ffb-9aa2-b0c61b2bc44a	1	\N	Other
+3edb90ac-5c2f-46d8-8c6f-599b8d06b5fb	1	James	Other
+3ee1c038-c269-4fc6-9ef6-4ce47e677019	1	\N	Other
+3ee387ea-f690-416b-8241-dcbe7089b4a0	1	\N	Other
+3ee3fb41-21fe-4f3a-8dc7-375b2d213726	1	\N	Other
+3ee432c6-5ce9-415e-be8f-8c144b402873	1	\N	Other
+3ee4583f-8a7a-4c7d-ad24-7d5bf5458911	1	\N	Other
+3ef0558d-3ccb-4b66-8c4f-ec69816efcf5	1	\N	Other
+3ef205c9-a1ca-4d65-acd1-cbc94294a072	1	\N	Other
+3ef33d17-d780-4124-9b27-c7a6edca5cbd	1	James	Other
+3ef9ca0a-6dc3-4df5-8393-7314aeef99a1	1	\N	Other
+3efa21d5-cd3b-4e21-b664-5b9c9b6f5014	1	\N	Other
+3efa321e-a40c-4c6d-b55f-8ca59f5fae99	1	\N	Other
+3f0011a4-742d-4649-a4a6-494495ce850d	1	\N	Other
+3f0b6553-6843-4e39-a576-880721d3c435	1	\N	Other
+3f1184c1-f318-47bc-9f6e-2611aee8045f	1	\N	Other
+3f195d38-a1c4-4665-92b1-8d1c0e569744	1	\N	Other
+3f1a6dea-1819-454c-bf11-4f87bc2decf0	1	\N	Other
+3f1db47f-76dc-4cb5-990b-b79a9b46f86b	1	\N	Other
+3f217687-76b0-4939-a709-0e60b0753f31	1	James	Other
+3f235576-c643-4712-99e9-22c2b293410f	1	\N	Other
+3f23a6c7-096d-4f8d-87de-3117ff9e0aba	1	\N	Other
+3f25399e-dd51-473f-9db5-3cd5a3bf679f	1	\N	Other
+3f2583c0-bcd3-4cc6-b9c5-694002c7cd3f	1	\N	Other
+3f2653e8-a4aa-4350-a8b0-4e9205058341	1	\N	Other
+3f286cc1-49c9-488b-94a7-5e804226b109	1	\N	Other
+3f2d124a-c6a4-4db2-89ab-8d3646ca8394	1	\N	Other
+3f2d65fb-d2e1-4e5f-87b1-84ddff7016fd	1	\N	Other
+3f3046ab-5d2b-4df7-8107-710b2a4a85f8	1	\N	Other
+3f307848-caf2-4d15-9802-156b0a0e5439	1	\N	Other
+3f321c03-80bc-4552-80f0-9a20f1c09abb	1	\N	Other
+3f329245-e209-42fd-bbdb-be962c87ec70	1	\N	Other
+3f360fe0-3878-4065-9c74-52055aefe0ba	1	\N	Other
+3f36c6b3-a926-487d-b0bd-4d4b161fa716	1	\N	Other
+3f385d2c-febf-4860-9a45-67d0b114383a	1	\N	Other
+3f3a9e1a-2b09-11e8-898d-fa163e8624cc	1	\N	Other
+3f3c0dd7-9345-4f86-8a28-df3ebfe12934	1	\N	Other
+3f42259c-6782-4fe9-94da-de2fb5b59bd5	1	\N	Other
+3f423e9a-635f-47bf-a8bb-87f158267e88	1	James	Other
+3f42f924-0979-4b42-bc35-f55ee1fd2b99	1	James	Other
+3f486fb8-c92c-421b-864f-e049f9a78a1f	1	\N	Other
+3f4bc2c2-5702-45d4-a748-83732b75170c	1	\N	Other
+3f4d24c2-376f-4583-b6bb-9962d8756954	1	\N	Other
+3f505606-fde5-4576-8e7a-61ca74722b53	1	\N	Other
+3f51d27c-b201-45cd-8cd4-1a30984ce5c0	1	\N	Other
+3f52dcba-6b25-4dd7-a145-9adb4f807b8c	1	James	Other
+3f546c23-252c-4e18-af14-b4818c966129	1	James	Other
+3f54afce-63c8-44b2-bf6b-c57371e5323b	1	\N	Other
+3f572d2b-cf5c-4292-b57b-92e5bebd107e	1	\N	Other
+3f5cd15c-31ad-4534-9d39-53ec1f780e42	1	\N	Other
+3f5f6ce5-980d-4ae6-8455-a4d2afc2f5a5	1	\N	Other
+3f68416a-7823-429e-8793-cb154d9e57be	1	\N	Other
+3f7667f4-d117-481d-9f37-09808a7cc18a	1	\N	Other
+3f7b8cb4-e004-4837-b064-6e0f38bc2fd4	1	\N	Other
+3f7c3332-1c73-4b2d-a006-9bf700aab349	1	\N	Other
+3f7d3748-956f-42c2-a2fa-edd3dd62614e	1	\N	Other
+3f812830-38a3-406f-b495-48aaae4eaac1	1	\N	Other
+3f82454c-df4b-4639-8630-cc9ef3379608	1	James	Other
+3f828e21-a42e-4889-ad16-b63f29430486	1	\N	Other
+3f845f20-c80b-4240-822e-01970d31ee9f	1	\N	Other
+3f8c1a68-923c-4a55-8748-79b53995fb2b	1	\N	Other
+3f908a0a-2b09-11e8-b00c-fa163e8624cc	1	\N	Other
+3f9f1445-4b09-4414-bae5-e2ebfba41500	1	James	Other
+3fa277f5-c469-4575-a3bc-b4068d9b1eaf	1	\N	Other
+3facd57b-cefb-4f08-a812-d73b9d70fa13	1	\N	Other
+3fadd555-a23f-46fc-89ed-bef0a2427081	1	\N	Other
+3faf08df-e078-4343-a390-d4d85b5841e7	1	\N	Other
+3faf6640-1468-418f-b6e2-d0e90b5d8b24	1	\N	Other
+3fb06571-1fbf-4179-9491-4c3f94b75ebe	1	\N	Other
+3fb0ba67-3861-43d6-80e0-21aa8a869266	1	\N	Other
+3fb5ebcd-05ef-4342-b2e5-dfa1e56b0cbf	1	James	Other
+3fc112d8-d374-456f-a49a-aeff48f1cfdb	1	\N	Other
+3fc2b3e7-c108-41a9-8b11-9ecc4582841b	1	James	Other
+3fc517e4-be9e-4b77-aaea-31088184ba94	1	\N	Other
+3fc63bff-a4a0-4add-b649-4fdf3bf4a1c6	1	James	Other
+3fc6701a-705a-48b3-bc49-dc6f49ee5464	1	\N	Other
+3fc6ee66-7200-4fb9-87dd-3a11a7e9f40a	1	\N	Other
+3fc8652f-52c4-488d-b3e6-de92eae24056	1	\N	Other
+3fc8892b-f5d0-4f89-b266-bc5ea657b3a0	1	\N	Other
+3fca20b7-3333-43b5-99db-888185da882b	1	\N	Other
+3fd91179-acc2-4f12-a376-123a93ff5d64	1	James	Other
+3fde069f-5172-4233-b632-1dd70ae5d97b	1	\N	Other
+3fe280e5-9d76-4c67-a25e-e495412f14e8	1	James	Other
+3fe5d6c2-25d8-4a81-8131-b9a2ab037288	1	\N	Other
+3fe5e7bf-b6ac-4591-8328-a3f98b7e58f6	1	\N	Other
+3feaf977-a68e-46b1-894d-ffc1ff4f746f	1	James	Other
+3ff08ae3-fbc6-41ed-af41-aa0e5946a8c4	1	\N	Other
+3ff246a0-a7ac-4862-9310-ad0430dd76b0	1	James	Other
+3ff63704-e731-496a-8f9a-359c76db33b5	1	\N	Other
+3ff78e64-a632-4ae1-abb4-4b56be8b1c8c	1	\N	Other
+3ff883e7-688b-4879-aea2-f8becc196528	1	James	Other
+3ffb5f2f-3723-4ead-b1df-dfc11bf3f59c	1	\N	Other
+3ffc794a-75e6-42a0-b647-57a1932aa63d	1	\N	Other
+3ffd557f-6794-4d0d-a1ec-181a1080ba77	1	\N	Other
+3ffd9490-7f16-48db-90e3-f0e448424e11	1	James	Other
+40020f9c-63df-45e9-8b71-37b1e51f6598	1	James	Other
+4002493a-7878-4717-90d7-e3a462649143	1	\N	Other
+4005231b-9a8c-4fd8-8006-9ee7a3105631	1	\N	Other
+40072d79-9277-4f37-9d83-8ba720b892b4	1	James	Other
+400a6348-3f37-4426-8e3c-bbc8322fa5ef	1	James	Other
+400aa500-cf1e-42cb-bc52-43f496421367	1	\N	Other
+400dd9cf-f39e-46dc-86f2-3050fe371c31	1	James	Other
+400f162c-42b6-4339-a732-ba4c8438f31e	1	\N	Other
+40114afc-c7e6-4f60-ace2-4e9eb7e6d3de	1	\N	Other
+40119bbf-3db7-4eaf-9559-77a2a367a9ac	1	\N	Other
+4011a53c-50da-4bb1-a9d9-2763e9badc60	1	\N	Other
+40144060-c059-41a1-9711-77ed8028589c	1	\N	Other
+4015350e-dcd5-4a84-ad39-20eb8b016018	1	James	Other
+4015ec60-9382-4522-a261-ea3f5ce57b6f	1	\N	Other
+401d09c2-35d4-40d3-ac01-a84f21f87b47	1	\N	Other
+4023d1d8-13f3-400d-bd7c-5c8ba6d8fea4	1	\N	Other
+40249de4-f521-4d0b-af87-d66ab3d6e7d3	1	James	Other
+4029e67e-0797-4a9c-b6b1-5488de485cda	1	James	Other
+402af189-01fe-4154-85f4-ab4f83a20fa2	1	James	Other
+402afa69-e37c-4a3f-8b39-2bfe624e7e92	1	\N	Other
+402c511d-60c6-4b43-b87f-0bdf35dc07c8	1	\N	Other
+402ce154-b41d-4b5e-a57c-a8e37728993b	1	\N	Other
+402d9ff5-ff3c-4313-adf1-f54b488a893e	1	\N	Other
+402dbf93-d10a-444a-bc18-1fe0eb2d12cb	1	\N	Other
+40353a9e-e6e5-43b7-8f1c-5d127788261e	1	\N	Other
+40367074-aa4c-4bd4-8284-041c01229d2d	1	\N	Other
+404129c1-d8bb-43b8-bee9-303cd96af10f	1	\N	Other
+4041fc0b-7559-4725-8ea5-c4558209fbd4	1	\N	Other
+4048a27a-b4ef-4730-ac88-025191504a9c	1	\N	Other
+4048cc54-9b6e-4af0-b990-85df8fae19d1	1	\N	Other
+404bde48-9c84-4aa7-a93a-7f6a4558b7b4	1	\N	Other
+404d21d1-5421-4325-99e2-4855c34ba94e	1	\N	Other
+405238a3-8410-4587-a288-02153797ba75	1	\N	Other
+405a9e52-9441-4d9e-9b05-3df1f0bd5634	1	\N	Other
+405dbea2-9ef7-41e9-9e9f-691920108a70	1	\N	Other
+405f196c-b3c1-4703-8a5b-23636d7f8ff5	1	\N	Other
+405fdf6d-1ea4-400d-bd01-b962284b5525	1	\N	Other
+40664241-f360-4648-90f3-25dd75221c55	1	\N	Other
+406bdca7-46c2-456c-9276-ad8782fd5aae	1	\N	Other
+406c311a-e705-4511-ada6-92b5cd791e70	1	\N	Other
+4076ecba-a7d9-4abd-bb5d-669e3d0c9311	1	\N	Other
+407726b9-37bb-498f-ae92-ef0fbabedd3b	1	\N	Other
+40777fa8-6a6e-4868-8388-f0faf5e9a733	1	\N	Other
+40790b7c-4d2b-4d15-b18f-cef360abeddd	1	\N	Other
+407f3363-68ac-4d5c-a646-2e2adce89b10	1	\N	Other
+407f925e-fe17-4b2c-ad70-72db14d89c25	1	\N	Other
+4080bdb6-dc42-4dba-9abd-ee845828793c	1	\N	Other
+4080ed7d-2db0-423d-ba88-0506f0945965	1	James	Other
+408154d5-e75b-4b4d-b4d6-82e03d00393a	1	\N	Other
+4083c5f0-1033-4ae4-a415-6642d907be46	1	\N	Other
+408e1816-9dd4-4184-a4d6-072e29873f6b	1	\N	Other
+409475be-4ba7-4574-a07e-b65ac1e6e97d	1	James	Other
+409c65be-8eb1-4e83-8c7c-e3f60b10ba24	1	\N	Other
+409e18da-c3f9-44ae-b2aa-a11240dd1ffe	1	\N	Other
+40a13ca1-500b-4d15-b8c9-5947635b65d6	1	\N	Other
+40a6a6f6-abaf-4d68-a848-17a4b9c4d6f6	1	\N	Other
+40aed739-e925-4b36-87a5-3fb2ede68791	1	\N	Other
+40af84ad-62f4-4203-ba8d-f75b65bfa648	1	\N	Other
+40b0b9ea-1446-4eb6-8b1a-5d37a8c141fa	1	\N	Other
+40b52d8a-4acd-4108-b946-1f5608bf67aa	1	\N	Other
+40b64b1b-ef3e-42c5-bf03-168ebba66888	1	\N	Other
+40bc4ac5-dfea-40f0-8a46-0e1c0c416bcc	1	James	Other
+40bde8f3-39b2-43c4-93b7-3d9b9301fd8b	1	James	Other
+40c0c490-4d4f-4d1b-a612-3ddfef788b8a	1	\N	Other
+40c4f0b0-3934-4e66-b31e-f6758f97a711	1	\N	Other
+40cc5500-22b2-4c51-a08b-3486bc303b16	1	\N	Other
+40ceb4b6-1e21-42ec-9fbb-2b1d4eebf1af	1	\N	Other
+40d3f508-67c4-40cd-94c7-8796870b980a	1	\N	Other
+40dba9fd-2719-40de-97cb-b03c8e036001	1	James	Other
+40e31999-e84d-444e-8971-e9f11d6875e2	1	\N	Other
+40e37bc8-b3c7-4eda-8004-883a6bca85c3	1	\N	Other
+40e5082f-7293-4d6d-ad13-409c755979c5	1	\N	Other
+40e5a72d-72b1-49f4-a4fc-877ef6dfe42c	1	\N	Other
+40e8ac15-3353-49f5-a670-6fdec25dc6c9	1	James	Other
+40ec804f-3e42-4caa-8bd2-1daa8f0b39f4	1	\N	Other
+40ee018c-b033-45fc-8eca-02ea629e8c8b	1	James	Other
+40ef7ab4-f29b-44e6-8f7e-b8a25656cca0	1	\N	Other
+40f67c03-4d28-430e-adb7-1ac980307dd5	1	James	Other
+40f80f10-b47a-47be-87d6-48ba73811894	1	James	Other
+40f9f68b-530b-4ed5-84bb-e1ea1ce3ea35	1	\N	Other
+4100000c-9367-4784-812f-66bd05d16e32	1	\N	Other
+410211ed-9be3-467d-bc9b-848a4ea5f8cc	1	\N	Other
+41046493-4524-43d0-b2ed-41b9509528eb	1	\N	Other
+4105fe81-169d-458f-841d-e480a61dc779	1	\N	Other
+41063119-1e8c-4d2b-b955-553f1e6feac9	1	\N	Other
+41065ea6-5a0d-4199-9d12-f475f91209de	1	\N	Other
+41066ab6-c433-44fc-9518-0d8e8db79d63	1	\N	Other
+4107ccd9-a3ab-42b2-bbd4-bfa7378a90e4	1	\N	Other
+410c5d36-3ad7-4e07-8dbb-c816869fdc97	1	James	Other
+410ce5f0-d556-46c3-b55f-abb1e72825bd	1	James	Other
+41104390-07f3-4d87-a641-1b65ee8dc347	1	James	Other
+41118f99-0918-4a40-9f74-03ea42101df0	1	\N	Other
+41191121-dfa4-4369-845f-69fb84e5d479	1	\N	Other
+411b2e75-aa98-4a0c-b455-84497cba65a3	1	\N	Other
+411c202b-ec35-4f39-a045-3b1ff62adaa2	1	\N	Other
+411e548b-8b65-4504-903f-b6f9de727a10	1	\N	Other
+411e6c81-2cf8-4c39-896d-15150141ceb7	1	James	Other
+41211d4c-7d06-4a8b-901b-3f5bedf6eaba	1	James	Other
+4124125f-e69e-448a-9b84-9df83f4e08db	1	\N	Other
+4124cb51-0541-4abf-b796-2c13a91e79f2	1	\N	Other
+412aa8a5-fcd9-40f9-b586-b22d499b185b	1	James	Other
+412fb9e0-7347-46af-af4f-d831364b0d41	1	\N	Other
+412ff41b-e8aa-4ef0-bb87-613886ffb32c	1	\N	Other
+41330f3e-b6fa-4eed-a61f-8c5a77f0986c	1	James	Other
+413506dc-3596-49f0-889f-fb03806e5209	1	\N	Other
+4137e2cf-5ce0-4363-b3ec-9e892018a1d4	1	\N	Other
+413e2eed-a1b5-40fc-89b7-534c9be75c80	1	\N	Other
+413f6e98-6bbc-4bbf-98c5-fcdd762bbe43	1	\N	Other
+4142be74-2432-4a96-b282-e6a8c2116b2f	1	\N	Other
+414498f1-2b35-4198-8ae2-8f5e3ec0bc0d	1	\N	Other
+4144a80e-3603-4b71-b97a-5b7286b3373e	1	James	Other
+4145b84b-a693-416e-a2b9-35db68de663e	1	\N	Other
+41477e99-8db9-4544-990d-c49b4570338c	1	\N	Other
+4149ac96-c105-4446-9686-692735b9fb77	1	\N	Other
+414b81ef-2db3-498e-a552-dead67228656	1	James	Other
+414bac22-1d25-4660-ab57-590379529105	1	James	Other
+415253f5-0854-4acf-8db6-5d00f084d4e2	1	\N	Other
+4154f593-cdcf-42f1-8ad3-2bb10e3c5359	1	\N	Other
+415644c7-73a9-4c8a-a081-f4260784362a	1	James	Other
+415678dd-5c39-4a8e-a689-0be443cd7c70	1	\N	Other
+415944bc-746b-4348-881a-3e932981b242	1	\N	Other
+415bb7a2-32dd-433c-b0df-abe556b108a3	1	\N	Other
+41664ae4-2349-11e8-94fa-fa163e8624cc	1	\N	Other
+416c3f0b-b22e-46b2-8880-0430e98169be	1	\N	Other
+416d6037-b0ae-4536-ab65-940933f7f01a	1	\N	Other
+416e359c-28bd-42ce-890c-98e361ed1d64	1	\N	Other
+41732c05-0e5c-456c-9e74-a9e404b977c8	1	James	Other
+4177ca2f-3a0e-4412-ac00-c2710f40e560	1	\N	Other
+417ade2a-4b40-45de-84bb-8704b122317e	1	James	Other
+417b6952-57ba-4e02-90ac-80f9895a2b2e	1	\N	Other
+417ba207-1601-46ea-83ac-8a64c9dfa262	1	\N	Other
+417bca3f-7e91-49f2-8f14-0184d30028c2	1	James	Other
+417cdb46-e01d-4bb3-a5e8-978a5aa69c88	1	\N	Other
+417ffdaf-990e-4d04-a08d-84a46e192a1b	1	\N	Other
+4181d1a2-2588-4a7b-bcf3-bd4c1fe9263e	1	\N	Other
+4188e1bf-5f05-4a69-b130-310425a2cc52	1	\N	Other
+41893086-1697-11e8-8c28-fa163e8624cc	1	\N	Other
+418c3fb3-5888-4f09-8537-778575f1a8eb	1	\N	Other
+418dfb87-2ea1-4010-96b0-84f9f127a069	1	\N	Other
+418eccb7-1b00-4642-9da1-c9515262518e	1	James	Other
+418edb94-2ce7-4f33-8077-703e761fd086	1	\N	Other
+418ff0d8-2349-11e8-b993-fa163e8624cc	1	\N	Other
+4191f325-12c6-40c2-b07f-a5312d7662a2	1	\N	Other
+41926cb7-e26a-4820-8671-6be8f3c3e2aa	1	\N	Other
+4193f3a2-0fa2-4f1b-925d-032a9ccbdaa5	1	\N	Other
+4194d34b-ed1a-44b5-a1db-c370871d7e03	1	\N	Other
+4194fe07-7523-4f15-a2f4-511b5c929934	1	James	Other
+419ba6df-396c-4eb8-b696-88de7a274920	1	\N	Other
+419d3d89-4670-490a-86dd-f5f566b504a1	1	\N	Other
+41a147e2-a541-424c-bde6-e861f4d73800	1	\N	Other
+41a34e08-df72-4e2b-831e-7eb448a95f83	1	\N	Other
+41a9fdef-d9f8-4797-8cd4-6f262ea887cb	1	James	Other
+41ae1c87-7800-49d4-8bb5-a22a91fa864f	1	James	Other
+41ae45cf-57be-42d5-96ad-7841116fc0d9	1	\N	Other
+41ae9c92-b582-4403-87db-d0b431a4fef5	1	\N	Other
+41b2e673-fa3f-4e86-89b9-55e5886b2929	1	\N	Other
+41b33f2d-21fe-41dd-829d-c4da334d4500	1	\N	Other
+41b60b44-d5d3-4fa5-aaaa-50d36b4af94c	1	\N	Other
+41b8bb25-6585-49fa-bc79-f67a46e4f70c	1	\N	Other
+41be61b0-a567-496d-a945-df23fe6908ca	1	James	Other
+41c16ab4-1697-11e8-b05e-fa163e8624cc	1	\N	Other
+41c21402-c7ad-46b4-b7fa-f77b3032f50a	1	\N	Other
+41c324f8-21b7-4d45-8a6d-3533ab012647	1	\N	Other
+41c66148-4b1b-4a3f-a60d-97370cd820e0	1	\N	Other
+41c996d8-c9ab-4848-832a-c84c307b2de6	1	\N	Other
+41cbb2e6-0f60-4a70-8be7-09fdff0af630	1	\N	Other
+41cbd94e-fe7f-4d8e-9a4a-f6c056433838	1	\N	Other
+41d06669-7962-4e03-a83a-98a9e2ffcb03	1	\N	Other
+41d3f45f-5883-44ba-9c56-6e547e1fd1e9	1	James	Other
+41d8ff7b-e5c8-4bff-a348-95c24b7e0810	1	\N	Other
+41dc03d2-492d-413d-b487-89fab9b99a85	1	\N	Other
+41dcc1f3-6291-4788-91f1-ed79c8be468a	1	James	Other
+41dead56-732c-4c0b-9dc2-14f88422929c	1	\N	Other
+41df856b-fda1-4bb6-b762-c42d4baaf967	1	\N	Other
+41e2a450-27a3-425d-86fe-642124756bfb	1	James	Other
+41e40e3a-228a-11e8-85d3-fa163e8624cc	1	\N	Other
+41ed92b1-d859-4010-8ca9-e46eb0d7df44	1	\N	Other
+41edf4e4-4c75-4bcb-b62a-707b6bda8349	1	James	Other
+41f0991c-9e2f-439f-b8b6-e9d79ee90624	1	\N	Other
+41f2411b-2fb2-4fef-95df-db522ec75797	1	\N	Other
+41f7b66b-c5fc-4696-94c2-7aeb54aea8ac	1	\N	Other
+41f803cc-891c-4a61-8880-8c2480fc2880	1	\N	Other
+41f90465-eab7-44a0-96d6-9ee8c158f950	1	James	Other
+41f9f5ad-682e-4351-b353-aeb56b0eacab	1	\N	Other
+41fa7da9-7e37-4c70-808a-6e0bf0abf016	1	\N	Other
+41fbbf4a-f29e-4caf-b5dd-c7f1c362fbdb	1	\N	Other
+41fd9e4c-00f0-11e8-a8c6-fa163e8624cc	1	James	Other
+41fdf36d-b5af-412c-9025-903b98a7ed1c	1	\N	Other
+42006caa-c1a6-4cc5-9dc7-c390f5521311	1	James	Other
+42042fd2-0b1b-44ff-a394-7cab9da071e1	1	\N	Other
+4205a5ef-d998-4926-8212-9a001d350db3	1	James	Other
+420b1f9b-aaae-447e-9cc9-9ece1a0baa13	1	\N	Other
+420e2c2c-cc3e-482a-a270-ed7820f51d0d	1	\N	Other
+420e6a7b-46a5-4bf5-a7b4-8292e09b23f4	1	\N	Other
+420f8dcc-390e-4aad-b3a0-1259c6f83e16	1	\N	Other
+4211a3cf-4349-476d-a6fd-d79c0cca4dd2	1	\N	Other
+4213359a-dd97-4273-b723-aa8d52f518d1	1	James	Other
+4213c63a-de08-4c4d-adc4-1202910346ac	1	\N	Other
+42158571-1f4a-44e2-85c6-c6e4db7aa9ca	1	\N	Other
+421c1004-de91-45d0-86c9-4287a52ebadd	1	\N	Other
+421cb48c-dc8a-4212-a1a7-468e7ded9fe6	1	\N	Other
+421d617a-0ae3-4c6d-8433-01b9a4c2273f	1	\N	Other
+421db39a-ee15-47a0-8e48-ab5923bb2d19	1	James	Other
+421dbe64-502d-47ba-9d4f-a793057ba551	1	\N	Other
+421ed538-228a-11e8-a6c7-fa163e8624cc	1	\N	Other
+42254b1d-2297-4209-912e-4232a5b1e6ad	1	\N	Other
+422579fc-dbbc-40cf-bd9c-b5581c942641	1	\N	Other
+4227350a-fb93-4c81-86de-f115e11bd0ae	1	\N	Other
+4229d33a-6926-45b3-83c2-ee19fe7362bc	1	\N	Other
+422caadb-0a08-4df0-9a06-c9ecbcf41905	1	\N	Other
+422e2c15-1a18-4859-b645-f2f051e03979	1	\N	Other
+422f1b8c-b9e2-4907-b373-6af000b09ac1	1	\N	Other
+42317454-228a-11e8-afc6-fa163e8624cc	1	\N	Other
+42322e19-c840-4cc6-9bf0-27bbf37379f1	1	\N	Other
+4233da7e-e754-481e-bbcd-1b973a76425b	1	James	Other
+423d54f5-328e-41ea-b750-22b8adbfab4d	1	\N	Other
+423fc486-3252-4891-919d-70c59c34aa91	1	James	Other
+423fed08-1e97-41d9-8ca0-49c55fde6cc2	1	\N	Other
+4243decd-988b-4464-bf45-34e7af43103d	1	\N	Other
+42440a0c-43ac-43ec-8bf4-94c590748c8c	1	\N	Other
+4252e1e8-8538-4305-bad3-7bff65d6300d	1	\N	Other
+425465cd-07c5-4ace-8274-499a9fcf36e8	1	\N	Other
+42551254-0c4e-415b-8015-8db5a1352549	1	James	Other
+42552e45-d7d5-42e0-85f5-6b37b6fa7751	1	\N	Other
+4257adff-1720-43b4-a74e-df20ceef65e4	1	\N	Other
+425b1bce-228a-11e8-a3cf-fa163e8624cc	1	\N	Other
+425d613f-0541-4add-9041-fced271bd035	1	\N	Other
+425d8340-b45e-4250-863d-a4051338df3d	1	James	Other
+4264f750-b19b-4a8c-9f38-1b042c1cad75	1	\N	Other
+4264fb21-9f2f-4695-8da7-4cfc2e82fc7f	1	\N	Other
+42687503-63dc-4963-b8ce-098877fdcde1	1	James	Other
+426c6439-3614-40ae-9c22-8034ed0f6940	1	\N	Other
+427213f0-05a7-40a1-b02e-3d81da955e47	1	\N	Other
+4272cb50-7d26-4e57-8058-ab87ab6e7ad2	1	\N	Other
+427ca2cd-bcc7-403c-8cfa-f2e4660f1406	1	James	Other
+427de5df-1b9f-4e43-97fa-cbc8b7060a88	1	\N	Other
+427ef253-801a-4ad0-854b-431fbd9ab80f	1	\N	Other
+4286957b-0335-4593-9bc4-38d25482b7d4	1	James	Other
+4287c89a-abbc-4126-a2ed-bc184e21684d	1	James	Other
+428a5088-1045-4cc1-acc2-6b4ba37b0d1f	1	\N	Other
+42921181-aa53-4b4a-b40c-3db26f501c85	1	James	Other
+4293731a-aa87-4d97-a017-7d9e1c52c36c	1	\N	Other
+429ce29f-9ace-4ce6-929d-268b7cc34aef	1	\N	Other
+429f5bad-caac-49db-8fc3-5648d4dca5d6	1	\N	Other
+429f83b3-949b-4e04-bb53-4737c8fd036b	1	James	Other
+42a06247-4e7a-42b5-b5e1-2d3afbc0dfd7	1	James	Other
+42a0b7a1-de14-4ec4-bdef-e6f39441faba	1	\N	Other
+42a14c32-7bb3-4698-849f-e7af00c1e461	1	\N	Other
+42a151b6-d4f2-430a-b2ef-e2055c635377	1	\N	Other
+42a31860-0281-492c-956d-0dcbb7789047	1	\N	Other
+42a52d8c-4ea4-4b87-9772-2128ac937958	1	James	Other
+42a6d784-2fe1-4620-a76b-3d5eea53e163	1	\N	Other
+42a7a300-51d3-4635-b438-4c0b520bfa5b	1	\N	Other
+42ae7b19-04c1-4038-aed7-782d07b21148	1	James	Other
+42b0a7ad-41ba-4583-95ae-a06d33fad287	1	\N	Other
+42b5548f-a66e-4ca4-8779-04a3b5acc18b	1	James	Other
+42b68b49-afd5-400c-8970-76349331d7a5	1	\N	Other
+42b759e6-edb7-4178-b25e-e3ac6b3f6a8d	1	\N	Other
+42ba3ea2-37e2-4e23-bb00-a925e9dc847f	1	\N	Other
+42bb2834-8f60-4990-9069-cd3960f021ea	1	\N	Other
+42bf1fcf-578d-480c-b469-c39277036ecf	1	\N	Other
+42bfed39-7686-46ce-9ae5-8664e5a78fe5	1	James	Other
+42c2f06f-58a0-4a03-a8f6-a313b1e3dd07	1	\N	Other
+42c47cf2-7f39-4c4c-b394-1f45dfcfa242	1	\N	Other
+42c66ab5-53af-4f2a-b0be-c199879ccc86	1	\N	Other
+42c85838-db4a-11e7-9814-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	James	Other
+42ca4fcb-588a-4b66-af1b-d539da28f63f	1	James	Other
+42ca9465-033c-4952-9e99-f984988ccc05	1	James	Other
+42cd5a53-acca-4df7-a7e9-ece5874ce30d	1	James	Other
+42cee429-26ca-43ac-b870-142813c62148	1	James	Other
+42d0c19c-d5ce-4c37-bd9c-0791f00de694	1	\N	Other
+42dcdcb8-cbea-4d4e-aed3-3527edb81ff8	1	James	Other
+42dd5780-8b29-49c5-9093-28b81683c610	1	James	Other
+42e06cb6-44a7-43e1-b832-a683a8c1453e	1	James	Other
+42e1e52f-3223-4fca-949b-47143c69e977	1	\N	Other
+42e4cc0f-e408-4a9c-b3b6-dec7721b1dda	1	\N	Other
+42e8e268-ab9e-4e2d-9e58-8c64f345215a	1	James	Other
+42eab177-4adf-4e9b-b9e1-b226332f2dbf	1	\N	Other
+42edbc23-903c-46a0-a9d3-f7cd00b6e503	1	James	Other
+42ef477a-e2f0-4fbd-a5cc-57ec7cffe07c	1	\N	Other
+42f0800b-ffa1-4ae4-8df6-fd13533c81f7	1	James	Other
+42f0e18e-d2f5-45e3-a7f2-94470849af3b	1	James	Other
+42f152d8-8aa5-4d41-b5eb-cd97a9643340	1	\N	Other
+42f1db7e-77a2-4349-9f61-6a5fa53e6243	1	\N	Other
+42f47264-ddb7-4dfd-8b72-518e4a86c342	1	James	Other
+42f6677d-d310-4011-8697-97ff44b1cb25	1	James	Other
+42fd3dfd-0ba6-457e-989c-e89622a89936	1	\N	Other
+42feb503-8f2a-4c66-b8b3-054f1f3a1156	1	\N	Other
+430154be-67a6-4bee-a579-ed53d139026b	1	James	Other
+43025510-0569-45da-b4e5-256c41dcfd54	1	\N	Other
+43055073-9eb6-4d6d-9171-4b4165f89020	1	\N	Other
+43080406-4988-403d-977a-77934fb6983e	1	\N	Other
+430c4736-ea69-452f-ab98-a368d4ead40d	1	\N	Other
+430eaf3c-4e7b-487d-8b5d-dc9fee987a68	1	\N	Other
+4312c1d4-c03f-410a-a4f6-c40523783cf0	1	\N	Other
+43135ced-2eaa-4b07-9f65-5ea3b69bd950	1	\N	Other
+4313a3b4-85dd-4723-a218-800e5a79a73f	1	\N	Other
+43156f0b-10b9-4536-a61c-27f12951627d	1	James	Other
+431ab2b7-19c3-4136-a9ef-717f009644c0	1	\N	Other
+4320f0b4-e5c9-4735-8b38-9634dfec118b	1	\N	Other
+432e7e65-6487-4eae-9647-d505edad9ffc	1	\N	Other
+432f00c4-abac-483a-ab47-e42b565ea121	1	James	Other
+433197e2-0d9c-49a5-9782-20f73e96166c	1	\N	Other
+433278de-4af2-4a8a-b7aa-857454c7cd8e	1	James	Other
+4332fee0-0508-4d26-9e4e-cdd9ab33d2ab	1	\N	Other
+4333cbd1-c1bb-4316-bfe1-eae40915a36b	1	\N	Other
+4336c1c4-e562-4558-9ece-9d095998b299	1	\N	Other
+433852e0-62b4-4f6b-881b-a0d6a2153352	1	\N	Other
+4338744e-dcee-472e-a0ae-51bf233314b7	1	\N	Other
+433a83c4-9215-4a1a-8439-bb8b3f8855d6	1	\N	Other
+433c4cb4-0224-41b9-95cd-c2ba5442a806	1	James	Other
+433c56c1-7cf8-438c-aa66-591ee7a29361	1	James	Other
+433e5a63-7ec2-435e-a733-43e22b7c935e	1	James	Other
+433f0219-3dad-456b-81c8-84b768acc977	1	\N	Other
+433f03de-c5f6-4fb0-92ff-39a46e1c7108	1	\N	Other
+43405f70-6f8c-4200-8007-d33a1aa4c387	1	James	Other
+4342c2a0-f46f-4746-b106-0b7fd1b868e2	1	\N	Other
+4343dc2e-d11d-4640-a967-4309bf131e8e	1	\N	Other
+4344aedb-5c1c-4cbf-9e6e-77add9dd55f9	1	\N	Other
+43452a7f-2535-4e0e-8c0f-de6775646e41	1	\N	Other
+4347850c-dd7d-4111-8dd4-fa976eb9a524	1	\N	Other
+4349b9b7-3393-44ac-a72d-f315e78e38ee	1	\N	Other
+434ad9a0-6e21-43d6-a604-380cf50c1bb7	1	\N	Other
+434de6b2-2958-4934-8b6e-23308302593c	1	\N	Other
+4352038f-48da-4190-94ab-b8ab7d0c0c38	1	\N	Other
+43598583-aa7c-493f-8808-daf6249bdb0a	1	\N	Other
+435b03b0-b87b-4281-b0f1-8f1a53449b65	1	\N	Other
+4360e942-6d45-476f-8d10-8bef0f703d6f	1	James	Other
+436410ae-7c27-47dc-b478-0da0ba4b81fd	1	James	Other
+43649d3a-3b28-402f-90dd-e19957a4f432	1	\N	Other
+436925b4-b001-4eda-b716-9670fa00533f	1	\N	Other
+436a5c93-c95b-423d-a847-d5d6bc898f98	1	\N	Other
+436aa0f5-a927-4a64-b60b-05e5bac4f2bb	1	\N	Other
+436e4e80-ff84-47c6-bd10-344d8e3ba96a	1	\N	Other
+436f8151-274b-452c-834e-b55325ae44cf	1	\N	Other
+4373ae0f-8681-4366-b67a-3904eeef8e68	1	\N	Other
+43776c85-a20f-4e70-bf5b-d95f2656f42d	1	James	Other
+4379d7dc-0da5-418b-ae89-27f97e3ca83e	1	\N	Other
+437c19b4-e5c9-4fca-bda2-aa8ec8260152	1	\N	Other
+43828026-9e76-4de6-8418-15c629c3a12e	1	\N	Other
+4382d56e-fb27-477f-808b-7cd17c93a3a8	1	\N	Other
+438350fd-70be-463a-9a07-7c358191a3c4	1	\N	Other
+43884e3f-3a47-4baf-a263-8418d6838ab4	1	\N	Other
+43913859-84f5-4474-adfd-c8a4f3b32d45	1	\N	Other
+439167b5-60da-44d0-8487-ca6327940b07	1	\N	Other
+43926115-61cc-4220-8c34-cc07d4bb4cd6	1	James	Other
+439aeae5-c9da-484f-b6ba-23778003eea3	1	\N	Other
+439b3037-9893-4412-a8d2-8c3e5bf1345e	1	\N	Other
+439d4837-93c1-4545-975a-081ca7eceb7e	1	James	Other
+439f20d6-687f-4735-98c9-b69a13e086e0	1	\N	Other
+43a3f4df-deb9-4cdb-b8a2-0684181afee2	1	\N	Other
+43a6e4e6-4bd9-4803-a1ef-f434cad51bf0	1	\N	Other
+43aa6974-ad02-40a5-8687-fc6ac4e1aa74	1	James	Other
+43afdc53-a1e0-4f73-a9df-fc54af726cd0	1	\N	Other
+43b1c70f-509b-4c43-bfe7-df7fbbc5077e	1	\N	Other
+43b346cb-dc0c-4784-841e-7ef29300e411	1	\N	Other
+43b474c6-7ec5-4d2e-97a5-e9969e5b8a16	1	\N	Other
+43b57f2b-9fe0-4d64-a3ac-19eb79da6a0e	1	James	Other
+43b5a320-0460-4fdf-a9f0-91b5c3263cbf	1	James	Other
+43bb6a5f-223c-430a-a775-88df08de3492	1	\N	Other
+43bcb42f-c1a6-46c3-883d-80ca5ba46cc0	1	James	Other
+43c17d48-e057-4016-8933-6acd3e2b529d	1	\N	Other
+43c1e9fc-034c-4e32-8152-419ff30cb4b9	1	\N	Other
+43c2eb9b-913c-46ce-b9c6-e20311b42ac5	1	\N	Other
+43c41743-6bb3-4871-8953-add03ee2c47d	1	\N	Other
+43c60c44-fe61-43cc-8b01-46389b29f78c	1	James	Other
+43c85a93-e8a6-4ec6-b40d-99245f938c5e	1	James	Other
+43c97d3a-41f8-42a9-b2b3-ea50fa68ead8	1	James	Other
+43cae156-da81-4224-b0ca-436080984fdd	1	James	Other
+43d22b44-8952-4645-9b97-b94672e17344	1	\N	Other
+43d67494-f432-41f8-b7ae-1eb6efb706b8	1	James	Other
+43da8899-4c28-4ee4-a8f5-80d8781012f4	1	James	Other
+43e21803-88d6-4e43-a6aa-76d10bafdb39	1	\N	Other
+43e57506-0437-4b28-8aef-0d7c993c20b3	1	\N	Other
+43e686e6-f58c-4880-ae52-13aad79f4487	1	\N	Other
+43e77df2-730c-4964-a82c-df1b88844ad4	1	\N	Other
+43e83368-813d-4699-9324-e17b0ff46053	1	James	Other
+43e93feb-a205-448d-92a4-a888848f6257	1	\N	Other
+43ec42ca-25b8-4a68-9d42-73c71527943c	1	\N	Other
+43f8b9bf-add3-4e1e-8a84-9ba2641a7734	1	\N	Other
+43f907fe-8778-4771-b7b6-01d36ef32458	1	James	Other
+4406b82f-e331-4db4-90e0-0dce946dc3b4	1	\N	Other
+440a87a4-2c74-4868-a8bc-99ffe0b65497	1	\N	Other
+440b6ba8-b9b8-42f9-a953-97a3cb0cd964	1	\N	Other
+440bb1b0-71e5-4b8b-a68b-e2ea77533372	1	James	Other
+440f0c9b-9c78-477b-a638-f67b8f70cd45	1	\N	Other
+44190bb1-b41a-49f3-b065-ebfb0613bd83	1	\N	Other
+441967cf-4b03-490c-858b-3740bb08b763	1	\N	Other
+441e5b83-22c8-4d09-9da1-85f2c63d7428	1	James	Other
+441edd4c-a010-4e56-b6da-81f71f390474	1	\N	Other
+44205478-1368-47a5-bc8a-b59e84d01d2d	1	\N	Other
+44218f0d-2779-46b6-886a-cae6341ab2cb	1	James	Other
+4427f929-5dac-42db-b1ee-dcec05221585	1	James	Other
+4428b1c9-6ac4-4712-a21f-d496a4cf66b2	1	\N	Other
+442a1a12-9e9e-4a2c-bdd4-a55ee3b03ee3	1	James	Other
+442b2f11-a6a0-424d-bd99-0adc9e83bdb5	1	\N	Other
+442b4104-39b4-4799-9662-e4588b96817b	1	James	Other
+442c2797-f225-4c8e-87b5-d9e526da09e0	1	James	Other
+442d1da8-377f-405a-b107-4836060ec512	1	James	Other
+442e79f7-330a-4df6-8d1c-e7b97ba95138	1	\N	Other
+443826d7-51ba-4e79-8951-771620658ae4	1	James	Other
+443983b7-2c5d-4525-8078-fa9a1b9c99b9	1	\N	Other
+443f82ba-905d-4338-93c5-2c1e533b0a53	1	\N	Other
+4440e4cd-1a2a-4c42-a045-e7722da8dd99	1	\N	Other
+4441f5a1-cdd0-4cb0-8a2b-e2f6f3c6268e	1	\N	Other
+444477ea-47af-491a-9e82-8f76fdc7a1f8	1	\N	Other
+4446a8d6-abf5-4317-aa70-bb608854b0b1	1	\N	Other
+444bb5f5-2136-407e-978a-109633917bf1	1	\N	Other
+445074f4-86f4-476b-8f31-73589d3b409d	1	James	Other
+4450dc3c-983b-4ac3-97fd-48abac1179da	1	James	Other
+44556639-d9c1-4c3d-bd03-b2fc1620499d	1	\N	Other
+44562648-cafa-4a57-821f-cfad9c3428c5	1	James	Other
+4456e6eb-66fd-4b59-acef-a6182984ebc1	1	\N	Other
+44588626-db30-41ff-93b4-df2b4656b714	1	\N	Other
+445b8ff8-3920-448a-bbd1-9132bd2db14d	1	\N	Other
+44610c59-eb85-4c10-8104-8a3536df8556	1	\N	Other
+44612ce2-9d5f-4b2d-a8ca-1f968a5518a2	1	James	Other
+4466539b-d7f8-4df3-a550-1c35dfeb0507	1	\N	Other
+446dd8c0-6acd-4de1-a969-0cc31d9562d4	1	\N	Other
+446debf7-f1d0-4407-a699-eba2046362b0	1	\N	Other
+446dff37-ee47-4261-aa48-3326a5ae91ca	1	\N	Other
+447044db-2c8f-48e4-a4a3-1934cf5813f6	1	James	Other
+4470ab73-924d-4f42-a611-fa59fe0e5417	1	\N	Other
+4470aedb-5dcd-4117-8f32-1222ba53e5d3	1	James	Other
+4473be87-c6fa-4da4-9008-2ab3a7c770e0	1	\N	Other
+447516a4-665a-4c66-b1d8-ebb02b5fb8b0	1	\N	Other
+4476ce45-873d-432d-aede-3cb9bb3c6d9a	1	\N	Other
+44784cf6-d30d-44bb-9250-49242b0a829e	1	James	Other
+447b95a2-eaf6-44ca-abd4-9f069f2ceac2	1	\N	Other
+447ce62e-63dc-4b4a-bd9d-37771d809407	1	\N	Other
+447e608d-f88e-49d8-ad4c-e68d198e4797	1	\N	Other
+44850e77-6743-4fc9-8b4e-189bcb945c74	1	\N	Other
+44876b33-351b-491c-b68d-6fb210d98669	1	\N	Other
+44889952-9eed-4688-89ff-2f0512be2f27	1	\N	Other
+4489fbd5-cfda-40f2-aeb8-9eb92c89d07c	1	\N	Other
+4489ffe6-5f73-4c6c-9798-10c3a240fb12	1	\N	Other
+448dc899-b975-45cd-a5f4-b012535cd582	1	James	Other
+448f8b77-03be-45d0-a6ac-be0be60e058b	1	\N	Other
+44918270-fc0f-4a48-a912-17620dbd2a83	1	\N	Other
+44931d2a-6ffd-4ed6-83fd-d460c3db10ea	1	\N	Other
+44968622-6f37-4acb-8929-ef0b400fd59e	1	\N	Other
+449cb6bd-132a-4f0a-b80f-b92d723a86e3	1	\N	Other
+449cda6a-5b42-4bb8-adb6-c0aaef8461c6	1	\N	Other
+44a06c45-09f3-45cd-bfff-39d143d3f99f	1	James	Other
+44a1027b-5dd9-4a9e-ae95-bdf602ab8795	1	\N	Other
+44a1a0d7-760e-4e70-868e-024934a0a0ac	1	James	Other
+44a2ccfe-b11d-4e96-9a51-035530c0726b	1	James	Other
+44a65001-6e38-4e8e-8c96-4f1d60f3e71d	1	\N	Other
+44a782e6-c5d7-4b87-abc4-63eb5fe57afa	1	James	Other
+44a86f58-cb07-4420-a515-242f3678a9ee	1	\N	Other
+44a8cdb4-7ca8-40ee-ad52-a0a0fbaea31e	1	James	Other
+44a9b532-87fe-4ca6-ad9a-7b36d90d1d55	1	\N	Other
+44afe958-ca66-45ca-9ab7-526843e0ea85	1	\N	Other
+44b0f156-c784-4c09-94d3-b5c83850a369	1	James	Other
+44b1b5aa-dabe-447b-ad49-90aa56da744e	1	James	Other
+44b395c0-042d-4e06-8ec0-b237ff3a9c5a	1	\N	Other
+44b44bdf-d97f-4f97-8209-56093271d87f	1	James	Other
+44bf0c43-d26d-4962-8702-92d7c675371e	1	\N	Other
+44bf1016-93fe-4014-ab18-cdc8eb7c42c9	1	\N	Other
+44c25957-d9b1-47d7-aa22-2afe3aa325f7	1	\N	Other
+44c552de-947f-476a-a4e6-f116a35211e1	1	\N	Other
+44c6ca7c-257b-4ff9-a01a-9105648782d6	1	\N	Other
+44c6eac7-274e-455b-8781-313ed803e3f7	1	\N	Other
+44ca4dcb-465e-4208-89da-ae1bf1119f9a	1	\N	Other
+44d1d744-f050-468c-aa19-9d9908e94d81	1	James	Other
+44d3ba7f-8ad0-4899-b6bc-ae0952baabb5	1	\N	Other
+44d4413f-d75e-4d81-93b4-7bf4556a58c5	1	James	Other
+44decbc9-1bc1-4c5f-8bab-dd391df6b6e5	1	\N	Other
+44dfd8d3-0fc9-4809-8b2c-0e234eff0ae7	1	\N	Other
+44e0545a-5014-4b11-b1ae-54ffe9af5cbc	1	\N	Other
+44e80796-0423-457f-a1c0-c66b51e1aca7	1	\N	Other
+44eb8cc5-cb64-41cf-a6b9-778ea9a00ac2	1	\N	Other
+44ed2883-b3ba-48bd-9582-d43fea5cdf25	1	\N	Other
+44ee5ac3-d285-401d-8c9a-1b9829abf098	1	\N	Other
+44ee76f8-5b04-4551-a499-4a4906616265	1	\N	Other
+44efdc01-a2c7-47bc-97c9-5bf5faf377e5	1	James	Other
+44f04147-03c0-4e29-a3ef-adc969f7953c	1	\N	Other
+44f05a4e-36fb-401d-b091-2b43aca24a4f	1	\N	Other
+44f449d9-c2c4-4b02-8441-0290a3b00973	1	\N	Other
+44f7e226-0acc-4174-8448-62058b3ad41f	1	\N	Other
+44f91642-643e-4403-86a5-5e409b2d91ba	1	\N	Other
+44fc9ad2-a0c7-4fc4-b3b0-de57b6670a42	1	James	Other
+44fda522-5b25-4296-b0d7-d533734eb354	1	James	Other
+44fe1e46-381d-4f3d-9453-0c81f14fdb13	1	James	Other
+44ff24c9-fccd-49c5-928a-62aeee268a80	1	\N	Other
+4506c1f5-7230-404d-9595-ab104bb2890c	1	\N	Other
+450cdf52-4b72-4aa8-b162-8998a85ecca9	1	\N	Other
+450eb49a-38e9-4c3b-aed4-72eec886bfbd	1	\N	Other
+450ee8df-033f-4f6f-8e44-60cfeb355412	1	\N	Other
+450f9fb6-bbe2-410c-a217-906959d8db15	1	James	Other
+4510aa25-7991-43d6-92d1-1602d25584dd	1	\N	Other
+4512f96c-8e30-4b79-a3b9-53f300b6a9a3	1	\N	Other
+45147ace-1408-4a9c-a15e-2fb7e7aad055	1	\N	Other
+4515c35e-eabc-412a-971b-452c9cb8d694	1	\N	Other
+4517b1a4-0869-49e6-9bdc-33ce709ca9b6	1	\N	Other
+4518ed0d-be36-4919-bd18-353098a09b86	1	\N	Other
+451e8f8d-2a45-4662-bf28-dba268792824	1	\N	Other
+4521648a-ff1c-4ace-8314-bfe20d9a681e	1	\N	Other
+45229b02-716c-44da-83d3-7414cd75a220	1	\N	Other
+45232e1f-7711-475e-ac74-aa78dbd6dcd7	1	\N	Other
+4525053f-1560-45b5-9b91-0e891ef4c802	1	\N	Other
+4526b0ef-60b1-46ed-a0f6-bdc11ecdeb24	1	James	Other
+45370df9-e30b-4b0f-a7cc-8274850e72ca	1	\N	Other
+453d5360-99f7-43bb-ac27-d35a097446d2	1	\N	Other
+4541b5fa-4340-48ef-9c41-8dc56c915bf9	1	\N	Other
+45435f74-4894-44d5-af1d-d12522db0d5e	1	\N	Other
+454f8837-0cf4-45df-86e2-3d4e29350fcc	1	James	Other
+454ff50d-f50d-4d7e-9b96-92709ebe6ea7	1	\N	Other
+4550a6d1-2f92-4b73-b08c-83e8575b4dc8	1	\N	Other
+45533993-bf29-4208-9fc5-05c6ef1a3f2b	1	\N	Other
+4555feef-e791-4934-9c31-34ff41545781	1	\N	Other
+4559e483-0031-4706-b874-33f98a5e7b0d	1	\N	Other
+455c14b8-25f4-4112-9d63-9a6260a8fa51	1	\N	Other
+455e4993-96dc-4361-9620-fc0dd5f01378	1	\N	Other
+45609be7-591a-4d60-82c6-69e7db0888d0	1	\N	Other
+4565e87c-8981-4ba0-a65a-9e78fbdfae19	1	\N	Other
+456b8a81-4cd6-4a59-8d68-9b34e88eb380	1	\N	Other
+456ca1f5-4309-4b85-957f-fe5fa94378e1	1	\N	Other
+4571d1af-658f-4ddc-bc41-16ebab2a152f	1	\N	Other
+4577d957-760f-439c-8bfc-c29b64abe91e	1	\N	Other
+457b5eee-50c5-4889-baf6-d994566e8da7	1	James	Other
+457db70b-61d0-4cbc-9d05-265c802d3dde	1	\N	Other
+457db937-e2e4-4dd4-8294-01637e87f9b1	1	\N	Other
+457f8107-7888-4f06-aba9-9ce831fb712d	1	James	Other
+4582ba0b-73cb-4998-bdbb-29e6ab7f4b94	1	\N	Other
+458320fe-0b1e-11e8-b68a-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+4585f715-21ac-4be0-992c-cbfc5d0c66cb	1	\N	Other
+458796e1-7914-4de7-8d83-99f50aacf95a	1	\N	Other
+45892de9-b31d-430a-8cad-080209fbe75a	1	\N	Other
+458ce0e4-6963-4006-9fdf-c4d87b71e054	1	James	Other
+4591c878-9d65-4c78-9460-13f51c117e48	1	\N	Other
+4591ec0c-4fb3-4be8-83f0-12d2a3d366ae	1	\N	Other
+459227f5-b83d-4118-830f-8f09c99e9596	1	James	Other
+4592ed83-0897-4ffd-8bec-83240d6aeef4	1	James	Other
+45965f47-b606-4361-9ba9-096cec71fb3d	1	\N	Other
+459a873d-c2d4-4caf-8dac-36a68880adf6	1	\N	Other
+459adbb4-9f40-4b17-b4e7-5f57a3f57137	1	\N	Other
+459b8d72-c825-4267-b28f-833ead0290a3	1	\N	Other
+45a1b36c-19d2-4b42-be89-ce7f2cd67dd3	1	James	Other
+45a5ab10-0376-4884-91ae-678d9a441f84	1	\N	Other
+45a67edb-96f1-4589-a7d9-dec1b0896909	1	James	Other
+45a8c0e1-901a-4442-8613-baa095bad035	1	\N	Other
+45abf0eb-194c-43c1-ac26-0e51049309ef	1	\N	Other
+45ae0fc7-cbef-4a00-ab43-9e8d12a9e55c	1	James	Other
+45aed5fc-7269-400b-ada2-977cc0b82e61	1	\N	Other
+45b02fd8-5672-463f-8712-2d1e781f016f	1	\N	Other
+45b0603b-1f67-4402-be86-4c65f6a27877	1	\N	Other
+45b07c02-cda5-48fd-9dc8-559d4ef159d8	1	\N	Other
+45b19512-1f26-47b3-8ee2-01ae0209ceea	1	James	Other
+45b1a270-98c3-4cce-88be-f627f1d684ff	1	James	Other
+45b3d45e-be9c-4387-90ac-c670152cb116	1	\N	Other
+45b7860a-0cf5-4dd5-a6fa-9e228c108ea5	1	\N	Other
+45b913b6-ad5d-4a86-b102-0b2f087e3808	1	James	Other
+45bef3e0-94f1-4f14-814b-267dc494880e	1	\N	Other
+45c3d438-8290-4e27-9ac2-a53ad4e12279	1	\N	Other
+45c64f7a-885c-4433-a8e8-244b55784a63	1	James	Other
+45c6df58-3897-40f3-957c-f51ba45290a7	1	\N	Other
+45cc8fb1-ee89-4c24-8b33-b83b2945178f	1	\N	Other
+45cc9d9c-a2dc-473e-b924-a576c0867d6e	1	James	Other
+45cf59fd-457a-4c65-abb9-74d02352f6c8	1	James	Other
+45d1eae4-70be-4dbe-8c2e-ea4abb445e40	1	James	Other
+45d2fe9a-466c-46ce-b228-36b1551f2534	1	\N	Other
+45d74f0a-acb1-4432-a991-29d67884e4e1	1	\N	Other
+45d8443e-0c55-4cc9-b5c8-9c4fd441415c	1	James	Other
+45d8c582-0eaa-44df-a12f-f6530439dc3b	1	\N	Other
+45dd727c-35be-4dd5-9344-2dbfae885414	1	\N	Other
+45e18e8b-12c5-4a9c-aa82-c6e7da5f16a4	1	\N	Other
+45e297bb-c227-4175-8d95-99583c7e3714	1	James	Other
+45e2ecb7-c542-4630-9796-e6773b871505	1	\N	Other
+45e45476-b5d9-4be5-865a-cff3687e1589	1	\N	Other
+45f4aa9f-c87c-4b75-baaf-d87754ee038a	1	\N	Other
+45fa2e91-26f9-40ca-996d-fb959996cc59	1	\N	Other
+45fc0114-8d77-4c3f-8b2d-fe5131c014f5	1	\N	Other
+45fdda95-33c3-424d-aa68-b70977535e45	1	\N	Other
+45ff3a2f-e58f-4889-ade8-32a693995f3d	1	\N	Other
+46036ad8-cbc4-4060-9408-e9ec07ec063c	1	\N	Other
+460661f5-3186-42e7-8ece-37508b3a8a80	1	James	Other
+460795dc-374b-474b-b09d-a3f84bcf85df	1	\N	Other
+4609fd2c-83ed-4cbe-86fd-1d91197b46ff	1	\N	Other
+460fdd2a-3878-47a4-b2ed-1821974ba536	1	\N	Other
+4616b829-44b5-4ab5-8bed-d38b9ed68d71	1	\N	Other
+4618f887-aaa4-42e9-a6af-ef2df15ab043	1	James	Other
+4619fb8b-eb70-46f3-ad46-7103341b2f2b	1	James	Other
+46200079-fa7e-47d9-8da4-4a2522f856c0	1	\N	Other
+46241bc3-a0ec-4e35-a1f0-eeb6cea4d771	1	\N	Other
+4627db36-96e8-4318-8b6e-4660daefce13	1	\N	Other
+4629e717-69fb-4b2c-88b4-b113cbf7b682	1	\N	Other
+462a5357-2c16-48d5-b99e-e881ea2600b8	1	James	Other
+462b11e1-50d6-4a6f-80b4-271aadf48dbd	1	\N	Other
+462ee9f9-81bc-4e22-a77f-3bc57107cc8e	1	\N	Other
+4632a1a6-d5f6-4fe4-89b1-27e0a533ee0b	1	James	Other
+4633f987-fb6f-4ec9-96ff-8cab3959ed20	1	James	Other
+46354e4d-9df7-4964-be6a-658dbb8d70fa	1	\N	Other
+463bec1c-cd93-4656-883b-8250c2ccd8d9	1	\N	Other
+463cbe61-64f6-4c44-9270-c2bb0c149d8b	1	\N	Other
+4642538c-48cb-42de-a6a8-33b3621eff6a	1	James	Other
+46437580-9ea7-4463-89fd-12adf3e2a3a3	1	\N	Other
+46453a6a-f3db-4be6-a964-6912cf2766ff	1	\N	Other
+46460b7f-a741-4826-9bab-265df94c0212	1	\N	Other
+46469dd6-9013-40fa-9194-b00a53773c4e	1	\N	Other
+464b25b3-614f-4c86-8de4-b2702316b5e1	1	\N	Other
+464e92f4-3507-43f1-b950-e2ce144a7fd8	1	\N	Other
+465d3398-aad3-4bb5-8681-9c2966b40f48	1	\N	Other
+465db306-06f8-49d9-bf78-3b2dc9984566	1	\N	Other
+465ee10d-569c-4a49-8dea-81cff1b7b8bf	1	\N	Other
+46629754-d1fc-4c8b-8820-026f813fbe0e	1	James	Other
+4662d944-bf51-41d5-908d-8024358d1103	1	\N	Other
+466a27f7-478f-4bb3-a3bf-67d7023c128c	1	\N	Other
+46700b99-8101-48e5-b1fa-41819c4d54db	1	\N	Other
+46716deb-88c9-4f6c-bd35-872a47886cc6	1	\N	Other
+4671e4f2-f649-4b2f-b332-4363446dec18	1	\N	Other
+467d8d86-02f2-4965-a08a-f8f80995de98	1	\N	Other
+4680a904-51f1-46d5-b5c1-bb9e2dcb802d	1	\N	Other
+468227bb-7ac8-4282-8397-04391112c290	1	\N	Other
+46866c00-24c9-4c96-a0b1-d090b22effb5	1	James	Other
+4687967b-0ab8-488d-a631-4dff759ea862	1	\N	Other
+4687d828-805e-426a-a7fa-2326e639ec0f	1	\N	Other
+4688a2da-e23d-4c3e-be83-9241b475d528	1	\N	Other
+46897d48-85c2-4cd2-8ae8-6f6149f9e50e	1	\N	Other
+468c6211-11f4-4ecd-b638-a73cdd8ce7c8	1	\N	Other
+468f27a5-0412-4157-9519-fdf2e7512904	1	James	Other
+468ffb69-16a7-42f7-a36c-860424fd5287	1	James	Other
+46926d33-b994-45a9-ac07-ef2e6f939fa6	1	\N	Other
+4696b859-c73a-49d6-a800-f9248e36e180	1	\N	Other
+46982fb9-2db2-44ab-b23e-311e5564216f	1	\N	Other
+4698727b-2ee6-43e4-879e-1adea96d9a8a	1	\N	Other
+4698e6e6-82d2-4f63-8026-2d1abfba2c8c	1	\N	Other
+469d502a-af69-4139-af94-2577b36490de	1	James	Other
+46a1b1a2-b568-4313-9bfb-e3b60465be14	1	\N	Other
+46a4a590-b43e-40f9-9f42-0412e1781475	1	\N	Other
+46a4b1b3-a29c-40ca-8a75-e82e4205c192	1	\N	Other
+46a9e9a3-aaf4-4e4c-bc81-fb560c129581	1	\N	Other
+46abc973-885b-47e6-8cc7-ec7806b4fdb2	1	\N	Other
+46ace179-c525-4c8f-8cdb-c765a25d5f14	1	James	Other
+46af19c1-2ac3-4f88-931c-6f2fe55f38a2	1	James	Other
+46b147e7-9fb6-4dc4-97a7-3b0b93e378d9	1	James	Other
+46b29be7-55de-4502-b992-5e0b833d6cc2	1	\N	Other
+46b6b698-86e7-47ce-823a-ed63982f3bf2	1	\N	Other
+46b8521b-b4cd-45cd-8287-47ce2c80d2fd	1	\N	Other
+46bbf989-b65f-4e62-804e-259dd9d4bdef	1	\N	Other
+46c30e74-2aa2-4ee4-89a4-b70c7b6b1fc0	1	James	Other
+46c596cb-d38a-47d4-bd2c-c5e4cfa9d4eb	1	\N	Other
+46cce9c5-d0a9-41b2-939f-4192481b12ad	1	\N	Other
+46d03131-40a1-4832-830f-dc8c0fbfec2d	1	\N	Other
+46d18711-e83d-4c73-aa6a-21f1c3d2b177	1	James	Other
+46d1e71b-e1c5-4d59-af85-36baa796d588	1	\N	Other
+46d859fc-5b8e-4b6e-abad-76faeaeba3d2	1	\N	Other
+46dd0162-dca9-48c8-97e9-cd06720e64a5	1	James	Other
+46dd31b6-190a-4f6c-8dbf-139a5070091f	1	James	Other
+46dd807a-88f0-4d62-853f-dcf3c52d79e6	1	\N	Other
+46e5c68a-aab0-42fe-82f2-a45bfa117ff5	1	James	Other
+46e5fd77-d043-4c5e-8318-c38bb1915de2	1	\N	Other
+46e70cb1-61c9-435a-af46-bbdb505a2e02	1	\N	Other
+46ead578-6f3f-4f35-aca9-4eb6c4f0fd78	1	James	Other
+46f2aea2-83cb-4326-bf9a-61d4ef57d32d	1	\N	Other
+46f4d1ad-1ba2-40be-8583-97286a20abfc	1	\N	Other
+46fc79ec-cb1c-4d5f-9e0f-80cadd2eb215	1	\N	Other
+46fcd6ce-07c4-4eb5-8893-b44d062e27b9	1	\N	Other
+46fe2fa2-f1b3-447f-b81f-c768a1fe3ca0	1	\N	Other
+46ff7b53-5c19-4a1e-8cbd-e71a9986aa78	1	\N	Other
+4704a1cf-7bb8-4fd4-9932-e1373a8065ab	1	\N	Other
+47073f9c-1ce9-4f80-8509-cb3ecdb5ef20	1	\N	Other
+470a76aa-324b-4b52-8660-c86e87b18681	1	\N	Other
+4714bc42-45ca-4be5-b624-e057c6cbc654	1	\N	Other
+471653be-0613-43fe-91b9-970f43d7028d	1	\N	Other
+4716758a-3b70-423b-9c04-f9806106fe7a	1	James	Other
+4717f658-3a46-4f01-be4e-fee101776488	1	\N	Other
+47181cd0-3fd2-42b4-a531-fc900bafdcff	1	\N	Other
+47192a1c-703b-4325-a16f-3015bf39ca54	1	\N	Other
+471b2f82-ac0e-4498-a1bf-e6acb978eeec	1	\N	Other
+471c8d31-ad1d-46d4-b963-3174e8a3a375	1	\N	Other
+4721ff17-c628-4142-ada8-ec8f84184dbf	1	\N	Other
+47225d68-47ec-4266-98bc-36504d74364f	1	\N	Other
+4725ba55-423a-4b2d-8e10-2375574ce2f3	1	James	Other
+472fba29-c8f1-4133-9756-b05705cc99ca	1	James	Other
+4733e639-2423-4928-a76a-55ee0dc38e85	1	\N	Other
+473a91d5-4b06-4fc8-8e6e-89d695ef6028	1	\N	Other
+473e7423-ef26-4a4e-8b12-7da42a4e9a22	1	\N	Other
+473e933b-5da9-4665-932b-d7225807c579	1	\N	Other
+473fd9bc-58e4-42ea-8fbe-0cc074ccc628	1	\N	Other
+474196fa-eaf4-47da-8c52-f0615bca02b2	1	\N	Other
+4749c2f6-4f95-4854-9c91-18b5bbf6fffc	1	\N	Other
+474bec04-5b43-45e3-9dc7-de635d976e39	1	\N	Other
+475572b8-716f-44c2-b142-d7dcfb7ce116	1	\N	Other
+475c038b-1cfe-4f47-8550-72692dfb88c5	1	\N	Other
+475c37b4-cd95-4c11-b686-611901097511	1	James	Other
+475d584c-de0f-4839-82af-7c938818947c	1	\N	Other
+475fd0d2-acb7-462c-b630-22ec7f15cea1	1	\N	Other
+47602955-6981-4f89-87b7-b400ddb809b9	1	James	Other
+4761221a-fb42-4f68-9d2f-c3bbdfa7899d	1	James	Other
+47653f25-5d90-4f7d-be43-751a36544979	1	\N	Other
+4769dc8c-1846-4ba2-801c-2a89715f8e06	1	\N	Other
+476b0ab8-55f0-48ed-8978-58ead7484b20	1	\N	Other
+4774926f-b184-46b1-a620-b0873ca56395	1	\N	Other
+47756648-0916-4316-afa7-37b04a3a6e73	1	\N	Other
+4775e59f-4733-4f5a-9845-970a8420e737	1	\N	Other
+477ae4b6-0602-4281-a3fa-624e11946944	1	\N	Other
+477c5102-8c65-4a0d-8df2-fb55fe4ca3a6	1	James	Other
+477cd860-afd7-44c3-ba74-4ff5c3d948e5	1	\N	Other
+477ce6f8-10ac-481b-bcd2-d2fa539db444	1	James	Other
+477d3790-d30b-40ae-bbe8-20c0e88164b0	1	\N	Other
+4782f192-fe5c-4141-a2ee-7e4cc2c17825	1	\N	Other
+4783c141-258c-486c-8b5e-7f32efcb8769	1	James	Other
+478bcd08-2dc2-4ba2-98ad-618094258aaa	1	James	Other
+47926580-aae9-4e94-a2e5-cac7a65ddac2	1	\N	Other
+4797d51d-f99f-4180-aae7-d1284d659975	1	\N	Other
+4798a8d6-3138-4ef6-a017-e89deeace9d4	1	\N	Other
+479a9d5e-3dd7-4aa4-a1ca-84a1fb8cfd07	1	\N	Other
+479d6a6f-2f43-41b7-9bc4-1820a5fc5e1d	1	\N	Other
+479e5fff-1e26-4f82-bde1-22512eb32275	1	James	Other
+479e713b-5e1d-4354-8e0f-0bfd01656ec1	1	James	Other
+47a3d589-c661-4727-9220-103828553ab4	1	\N	Other
+47ac1f3b-53e9-4773-9dc9-f2ede9043aba	1	\N	Other
+47af1a80-fea2-497c-b96e-ca36d0b6a930	1	\N	Other
+47b1e94d-d10e-4317-97ea-00c56be186f6	1	\N	Other
+47b2d2b2-c895-47aa-9d1f-af09d2ef1663	1	\N	Other
+47b31a40-9c5d-4124-9ebf-678a35117455	1	\N	Other
+47b540f7-7298-44c8-a767-97a4dba16493	1	\N	Other
+47b7434f-5c32-41cd-a5a7-43d37fda63d9	1	\N	Other
+47ba4563-cdcd-4e40-bb1e-78608ef1be6e	1	James	Other
+47c2fe78-515c-438f-8806-51d0ef96f489	1	\N	Other
+47c312a0-efe2-44a6-bdee-33ef9b4d85e9	1	James	Other
+47c46e34-c4b4-4b95-893e-ee8fc679c274	1	\N	Other
+47c46fed-c703-4335-aa5c-66da10cdb7f1	1	\N	Other
+47cb85a4-0dde-4d5c-954b-202e3afbcefe	1	\N	Other
+47ccbf8e-52c2-4e88-82a9-3839a81b7f67	1	\N	Other
+47cd7e2b-5e96-49f6-87e7-973ca86a0ff6	1	\N	Other
+47d1d2ae-b6dd-4c53-afaf-c7556921c6f2	1	\N	Other
+47d1f5a1-cc3c-41db-bd4e-0b554d2261e3	1	James	Other
+47d27374-5992-4fdf-bd99-0e082423c94b	1	James	Other
+47d2fe32-b11c-4c6a-b262-a8fa05fad315	1	\N	Other
+47d30942-1c42-4469-be56-d4e02d110cbc	1	\N	Other
+47d58561-6c4a-4f73-ab04-4975bb2ef55f	1	\N	Other
+47d7245f-4a65-440a-84cc-5cdf06b1bdda	1	\N	Other
+47dc3f40-261b-470f-8f9b-f8ddbc732e30	1	\N	Other
+47ddd33e-9b8f-4fea-97a3-226e6fa257aa	1	\N	Other
+47e43dc5-9e2a-431a-9217-73caba2d023d	1	\N	Other
+47e840ab-7556-429a-90c4-bc19ed967548	1	\N	Other
+47e8bb20-aa17-456d-a35b-30fe187b1bd5	1	\N	Other
+47e965a1-1c42-4615-a113-528ff4a8ae9e	1	\N	Other
+47ee4cde-a57f-4880-8fc7-7d83bb4a1e12	1	\N	Other
+47eef5a8-f349-40d9-95d9-b8c0ab8439cd	1	James	Other
+47f21b72-45c6-4801-8811-9e781e9e369c	1	\N	Other
+47f4b50a-cdce-4228-a420-de1470dc3c8d	1	James	Other
+47fbc6dc-e128-44f4-93e5-824253d424bf	1	\N	Other
+47fe8157-58bf-460f-bc24-fc3d76e26f1c	1	\N	Other
+47ffa1eb-0b8d-4a4f-be23-8e3fd37b868c	1	James	Other
+47ffdcbe-4567-402b-b8f4-dc6f8d193e27	1	\N	Other
+48018e54-fd44-466f-9136-00dad82e4b54	1	\N	Other
+48073b22-074d-47c4-8109-d39b2880fdf0	1	\N	Other
+4812c1c8-324b-4d75-a957-f5831ddb8622	1	\N	Other
+4815caf4-5353-4a5d-bd6e-4b65fa4b8b55	1	James	Other
+4817885f-ea4e-487e-a32c-4b6e46235076	1	\N	Other
+481bed1e-8686-49af-a965-f46848ee27e2	1	\N	Other
+481e893d-d456-448a-9602-4334c991b41d	1	\N	Other
+48209531-ce53-4e1c-8958-c70fcbc31187	1	James	Other
+48221e82-fd71-4dda-a9a1-3746b22ef0af	1	\N	Other
+48241767-6aa0-4937-bacc-e0a6a6f82bc0	1	\N	Other
+4826390d-11ca-4457-8d44-c5c27b7fd80f	1	James	Other
+4826e97c-3bd7-4f07-9454-4eb4a249c914	1	\N	Other
+4828069c-f535-4fcb-9538-cc39939a4d70	1	\N	Other
+482c92d7-db4e-4fd6-b049-0a1450ed7b83	1	\N	Other
+482cffef-e884-4deb-9bc2-ad3673a59ab6	1	\N	Other
+482e892b-d74b-45e0-a54b-598174cc7043	1	James	Other
+4835c827-5422-4508-b616-48904985e056	1	James	Other
+48389afe-0fe1-4af5-8f76-8e28aa353f84	1	\N	Other
+4839dfc1-0792-4fb0-acc7-184f4d5494e4	1	\N	Other
+483c36b5-ad5b-4a0e-b8ee-48d8c334fd12	1	James	Other
+483ce69c-5e0d-4683-9632-ea33a90914a2	1	\N	Other
+483e8399-024b-426e-8281-921ca5a489cb	1	\N	Other
+483f9fe1-3d07-4a75-b609-ecd6044cc11d	1	\N	Other
+48432e8c-c107-4a41-be70-eaf67d7fd48a	1	James	Other
+48433ed1-fe15-481c-8e41-9e2f4f69c072	1	James	Other
+48455a0f-cf2c-463a-8e8e-796195fee72d	1	\N	Other
+484c985e-1909-4df2-a5e8-3130ee026014	1	\N	Other
+484ed777-8ec1-40df-9bbe-819cf1b3f944	1	\N	Other
+485618c9-5eba-4d13-9eda-7a0538102020	1	\N	Other
+48561ab2-b2d1-4d0a-bff5-f4a772388270	1	James	Other
+485a098d-ec0b-44cb-ba24-878e0f37bf48	1	James	Other
+485ae702-9c7d-44be-91e2-538ce24490ac	1	James	Other
+485daaaf-ce8e-4427-95f4-41a8ded731a9	1	\N	Other
+48617c49-2ce9-457a-a78d-f7ff6aa4264e	1	\N	Other
+4862d329-fb5a-421d-be34-8b1e1b4ddf03	1	\N	Other
+48672499-6d09-4d3a-9a0e-a23ad6dd872a	1	\N	Other
+4870838c-640b-4b76-97fc-fe474fb9f1ea	1	\N	Other
+4871b048-9465-4168-8f39-57b54a0ba9dc	1	\N	Other
+48788b68-04fc-4d5a-b38e-07bb722c6ca7	1	\N	Other
+487f4198-d874-4b8f-87d0-5554326a2d62	1	\N	Other
+48819212-eb14-47c6-9f82-5f6878abd88f	1	\N	Other
+48826124-28ff-4be7-9239-5ff80ad2cb0d	1	James	Other
+48871777-5a43-4ce8-b7c2-b81dfe13f93c	1	\N	Other
+488b3776-8ac9-41c8-9ecd-af66b42ca1d4	1	\N	Other
+488d0417-9615-4fab-9813-1cf68dcd5805	1	\N	Other
+489cd00c-7bce-404a-9488-ed318fbb7cf2	1	\N	Other
+489e78c5-8480-4bf7-b2db-46448c4c47f4	1	\N	Other
+489ee9f9-7c57-4344-8fa9-59ef2e3d1f34	1	\N	Other
+489ef7d0-5fec-4af8-a44c-256110ebfb9e	1	James	Other
+48a28690-125a-4db7-8cab-cf326fe45d89	1	\N	Other
+48a3c775-1a82-4f67-ba45-da6167340737	1	\N	Other
+48a413d3-7ee3-45f1-8d50-eaee994d42fd	1	\N	Other
+48a7f324-9c6a-481d-b479-a0a7ed675b90	1	\N	Other
+48a81ae5-e7f6-4871-ab84-837de41d6414	1	\N	Other
+48af728e-e68f-407b-9646-ff29f89e8e5b	1	\N	Other
+48b25bea-8f5f-43ae-8112-c18cd0adef8b	1	\N	Other
+48b5bae0-1e3a-44a7-b89a-2bf23ac59672	1	James	Other
+48b63014-3c43-4c5d-ac3b-9fbe570a1b0e	1	James	Other
+48b6c9d2-712f-4fde-b0bc-c2c0d1177af0	1	\N	Other
+48b9c45e-269b-46fc-a5db-d809f695a798	1	\N	Other
+48ba8e50-adb7-4539-b9a9-81461595758b	1	\N	Other
+48bae91e-7cad-4010-a158-245b3e45e137	1	\N	Other
+48bdf6e2-7f7b-410c-abe8-14ad137f1423	1	\N	Other
+48c3502a-5278-4202-9b70-d542a287ca28	1	\N	Other
+48c57c7c-3b25-4c3c-a063-35c8ad82f409	1	\N	Other
+48c645c3-2bd9-4e3d-b3f1-7cc4c5c4f6d8	1	\N	Other
+48c88afc-c489-4cae-a009-05ed36803266	1	James	Other
+48ce8f48-6ecb-49f2-b36f-6b74a4947f31	1	James	Other
+48cf5ba8-4118-4211-abe5-47d078192219	1	\N	Other
+48d1eb22-6300-472a-8289-d21185361153	1	\N	Other
+48d6c510-3c9b-4c6e-829a-eceef5c1f386	1	\N	Other
+48d8d7bd-ad93-4e54-ae89-cd38095ab73e	1	James	Other
+48e146b2-aa9d-4ae6-8560-fce9db10c487	1	\N	Other
+48e8245d-70f9-4327-a5d2-f9964e49edb8	1	\N	Other
+48e85257-0d82-4ee3-98e4-a21f7f7821dc	1	\N	Other
+48e86ef1-1606-4270-b9d9-cc7d21ef10da	1	\N	Other
+48ebd0bd-8779-4d8d-b623-6d7f01dba497	1	\N	Other
+48f42d68-d96d-4744-9645-d08cd12dc518	1	\N	Other
+48f4fde3-f260-4dce-9820-465e6c88f0b5	1	\N	Other
+48f8ea34-9fd4-4107-ba22-52ad0b4ad544	1	James	Other
+48fac6dc-a1a9-42d6-945c-a37747efd91c	1	James	Other
+48fbc1f7-ec74-4cd1-b143-4ec190e1e1bd	1	\N	Other
+48fe2cf9-fc44-47d2-a6bc-9f6e11b39305	1	\N	Other
+49007c0e-7efd-44c3-93d5-af7bd1b6aa02	1	\N	Other
+49023498-a627-4876-96e8-95af617518f7	1	\N	Other
+49053bae-2afd-4d5e-abcd-8830863d4496	1	\N	Other
+4905963d-6569-4bf1-a658-3a16792e7666	1	James	Other
+49063624-93e1-464e-8bf4-a3a849a8f578	1	\N	Other
+4906793e-3372-427d-8920-424268983fb2	1	\N	Other
+4906c6d3-9630-4b28-b9cd-0195dd7400f3	1	\N	Other
+490e260b-7fe4-4fb0-af54-c5aa7b978777	1	James	Other
+49107f28-a0fe-43be-bde1-772afb193891	1	\N	Other
+491484fa-640b-4567-aa88-941bd0f1c3dd	1	\N	Other
+491952ce-17bb-44d1-90da-724d66ae5714	1	\N	Other
+491bd22f-8a10-48ad-8ed2-72585a55af21	1	\N	Other
+492050e1-b321-4bb9-9dc5-596392029293	1	\N	Other
+49216c46-78b1-41f3-8568-65a5f3b15dc8	1	James	Other
+49226e6e-5fec-42c2-9169-34a1a7d18960	1	\N	Other
+49241628-b1eb-4e36-abbc-d4dd9a49837c	1	\N	Other
+49242f0b-b53b-4fa5-b236-f098459a9655	1	\N	Other
+49279fec-33c1-4557-8254-4ffa9c515320	1	James	Other
+4929aa96-0e96-4e4a-972c-520926faef8d	1	\N	Other
+492f71fd-2319-403e-8d53-3eb77b55b28f	1	James	Other
+492feeaf-fd36-4379-9896-de049192557f	1	James	Other
+4931afc0-b01c-4f08-a303-fe0da7f6b75c	1	\N	Other
+493538f2-385b-46bd-96fd-70edcdcb24b9	1	\N	Other
+49361fbd-6745-46cb-bdcf-52d01307742f	1	\N	Other
+49367f49-4d39-4e48-9a17-e70bdd527f08	1	James	Other
+4936f563-0c5a-420b-9e19-6fb94fdd1325	1	James	Other
+4941228c-52d4-4d35-b8f5-8bd9b1486d1d	1	\N	Other
+4948bd91-0e8c-4434-a5b6-3eac61a5c0c7	1	\N	Other
+495374d5-0cd9-4072-b686-c79ec72e0820	1	James	Other
+49546eef-7f28-4e5c-89d1-e988be31bd41	1	\N	Other
+49572aea-72f5-4623-8cf1-5145533352f4	1	\N	Other
+495888ef-f685-4569-b8dc-a4a8de6f81b8	1	James	Other
+495b3c65-ffe1-423e-b291-0d64544d429a	1	\N	Other
+495e49c4-8163-496b-a2cd-6bc90e000571	1	\N	Other
+4967e836-4aca-4b2c-82b5-734f94e27450	1	\N	Other
+49698745-98e9-4cd4-820b-b3dac17062c3	1	\N	Other
+496ab711-dc6d-4616-b744-5ef978e62320	1	James	Other
+496e0eb1-6a6f-45e7-aa9c-c1968820e42d	1	\N	Other
+49748412-58ce-4d61-be6d-4046c943a7a9	1	James	Other
+497a3b6c-0f8c-4975-b3b1-e4047058330a	1	\N	Other
+497b52c5-ac9d-4c66-9b12-47ddef1b4746	1	\N	Other
+497b85ff-7fda-45ef-8889-dc9ec73e71cc	1	\N	Other
+497c3755-2607-4cc0-a1ad-80677733d89c	1	\N	Other
+498307ca-5a0e-4527-9059-4c8527441090	1	\N	Other
+4986c897-01de-4080-a30f-69099d6dd936	1	\N	Other
+4989db5c-8e9e-4d95-ace3-0926d007acba	1	\N	Other
+498a3f7d-de64-4080-b762-fbf924e967b7	1	James	Other
+498df0f1-f9d9-4d2b-aa4c-89395b9bedac	1	\N	Other
+4992f932-cfbe-410f-9f5f-8e6643574310	1	\N	Other
+499321c6-a344-4fe7-95ec-6712d3767a1c	1	\N	Other
+49932f1a-94b2-4c39-9c6e-ebbd991f1113	1	\N	Other
+49943027-22a1-41f5-9680-fbe5651391ef	1	\N	Other
+4998f9ac-5416-4e17-93b0-e94d21eb4006	1	\N	Other
+499a7674-c6bf-478d-9f3d-54b95fc9e532	1	\N	Other
+499ca559-31dd-4d83-8503-76f577a9fbfa	1	\N	Other
+499d8c12-b05e-4253-a1ee-72a906e02251	1	\N	Other
+499dd0f0-e4a9-4587-be68-1fb19179bef9	1	\N	Other
+499def86-613e-4eb5-844c-cb9bd651b9c0	1	JAMES	Other
+49a72ce8-8efd-4f28-ae6f-1b993bbb543c	1	\N	Other
+49ac45ec-90f5-4410-97ce-ef87f4fb7543	1	James	Other
+49ac679c-a9b2-40dc-baee-c2aa50c40aca	1	\N	Other
+49ad88da-22df-49f4-bf85-2acb71f2245b	1	\N	Other
+49b3a345-8283-4dc8-96e9-eaef8d2cd0e4	1	James	Other
+49b9351f-53fc-4ee7-84d5-fe8f3a975b20	1	\N	Other
+49b981ab-bac6-4aee-8afb-187da97bcea5	1	\N	Other
+49bc0dca-cc71-4964-9e8e-9bf18fafc46f	1	James	Other
+49bcab87-24c9-4e66-a1a8-2d2d02ac410e	1	James	Other
+49c2a709-dad3-445c-a78b-eb1f4ada2765	1	\N	Other
+49c5e6cb-0b85-43af-8709-09ecc8a3b4fe	1	\N	Other
+49cc100b-3dae-4631-9a5d-1211395392da	1	\N	Other
+49cc93af-6396-465d-ba32-b30eaf0f645c	1	\N	Other
+49cd02e2-0322-454d-9f01-7b84e0655b26	1	\N	Other
+49d2547d-028d-42a1-8a27-f6c7cc9a9105	1	\N	Other
+49db6bd1-0d78-47eb-9dcb-062f7d549377	1	James	Other
+49de0971-3a8e-4da5-8b73-7e459bcfaf7b	1	\N	Other
+49dec7f9-88ca-4b59-ad76-42a8809ad984	1	James	Other
+49dec996-65ea-41c4-bc62-a54f65def1bd	1	\N	Other
+49ded9d8-e74e-4ebc-b3f9-2f1c31f4ebcf	1	James	Other
+49dfa3f7-ec7d-4788-81e7-b19c5404706a	1	\N	Other
+49e0c55d-ceda-4b7e-ae88-41a5fe86e198	1	\N	Other
+49e2800b-4df8-4385-98ac-8677d36e35d4	1	\N	Other
+49e28cd7-390b-41de-a365-c74d1247b817	1	\N	Other
+49e58d18-b191-4486-8026-5cf947c61572	1	\N	Other
+49e65a53-540c-480c-bed7-4f4b29e19e02	1	\N	Other
+49e8ab87-ed3e-416a-bd06-943680d7cc8d	1	\N	Other
+49ea2c89-f6f2-4e0f-b3fe-e6d3243f4ec1	1	JAMES	Other
+49ea4e9c-8c10-4c5c-8478-ddd2452faa7a	1	\N	Other
+49eb02e0-01c3-4c3f-b382-31f7f3ce2c16	1	James	Other
+49f4a7dd-1638-4e85-ad0b-0af67737ae4a	1	\N	Other
+49f6fe86-1bf4-43b8-bb48-f324c81e6394	1	James	Other
+49f86a8f-50d9-4f79-b73e-455d94bd4c1e	1	James	Other
+49f9cb31-3bba-477b-aed0-29d3cca437cb	1	James	Other
+49fddc14-53ef-4b22-bb11-0e9de57628b8	1	\N	Other
+4a015f22-2330-11e8-bcce-fa163e8624cc	1	\N	Other
+4a02fd87-33ae-49f0-beea-fd25b51ffdb4	1	\N	Other
+4a059737-caca-4cb9-b4d1-d209ff8a9848	1	\N	Other
+4a079122-7369-4a37-af85-3c8641b5c889	1	James	Other
+4a0933a8-8b2e-44f9-89e3-2bb961ff2ddd	1	\N	Other
+4a0e1734-db11-4e97-9499-49bff8722e28	1	\N	Other
+4a109a41-f1ab-44c7-b461-04986533f347	1	\N	Other
+4a1b3e98-c0fa-4496-9fd0-c2511467297e	1	\N	Other
+4a1d80b6-feb6-415b-8cdf-52133e908df3	1	\N	Other
+4a24811a-b0ac-43b9-9e41-d96d6d92dd1f	1	\N	Other
+4a26b767-36c0-4ec9-a675-f94e2fd32f48	1	\N	Other
+4a297d10-bf3f-42ca-b391-097d6ee41f16	1	\N	Other
+4a29ef25-6a0d-4ba2-94ae-81b141d98aab	1	James	Other
+4a2a5b8e-78ee-4d16-ad40-67167cbf2a16	1	\N	Other
+4a2cde17-dc90-4447-acc9-06a20a876e1d	1	\N	Other
+4a2d363e-6b8d-488c-9474-308ce7ec587a	1	\N	Other
+4a2dc73c-0871-4726-8f4c-582c59bf7d6a	1	James	Other
+4a2e512b-79e6-41b0-bb71-bcbfc8ddd15a	1	James	Other
+4a2ffa2f-b6ee-4fc5-97d8-42d13b92a0cd	1	\N	Other
+4a3370a1-0f20-4b08-aacb-496fef1cb54c	1	\N	Other
+4a342bf2-ea91-4cb4-bb2e-7286af9e1c6e	1	\N	Other
+4a35ce5b-a378-40a5-92d9-705c2baf3c79	1	\N	Other
+4a37cb07-f691-4867-96c2-008200ab20b4	1	James	Other
+4a39e6b2-2330-11e8-9c32-fa163e8624cc	1	\N	Other
+4a3e4105-c298-49d6-be40-76b44245c52a	1	\N	Other
+4a401aad-96c6-4107-8ee6-ce2cc3da162e	1	James	Other
+4a424884-a9c6-4bdd-b5ed-5e5da60a1c8b	1	\N	Other
+4a453c54-7dd2-4e73-b9ea-e6a61404d6f0	1	\N	Other
+4a51dc60-6319-4d76-a2b8-e19657ea0738	1	\N	Other
+4a5241c3-01fb-4d99-9f8b-04acf78fcb5e	1	\N	Other
+4a575c1b-65d7-47f4-b54c-e0ed08b302f6	1	\N	Other
+4a5787bd-32da-48cc-9d98-01775a14b8f5	1	\N	Other
+4a5b3132-7f33-4a82-9909-555994475bca	1	\N	Other
+4a5d8e37-529a-45b0-b946-72847d9bec04	1	\N	Other
+4a5e76a5-4829-47e5-b57b-5bb26a387d3a	1	\N	Other
+4a5fc343-0045-4f98-91bc-b25217f4ead6	1	James	Other
+4a60aee7-b18e-4135-a1e2-78116b88e02f	1	\N	Other
+4a67331f-eb88-4779-a299-9ed5fa922869	1	\N	Other
+4a6a39e8-0b83-4a5e-b36f-8c80f5ecf642	1	\N	Other
+4a6bb056-fd51-4c27-ad1d-b9f384ed90de	1	\N	Other
+4a704664-cc44-4458-867f-bd3d2f17c2a1	1	\N	Other
+4a720d9a-c923-456f-ad89-fce50dff4bdb	1	\N	Other
+4a747ff1-b9b5-4649-9108-4b5616737378	1	James	Other
+4a755878-e30a-407b-8db1-c92e248ca918	1	\N	Other
+4a773df5-67af-4bca-ac0e-509e77da24c2	1	\N	Other
+4a7babea-bbaa-44b9-a315-9b56f37c3940	1	\N	Other
+4a7eb888-178b-49ed-8d60-6ca95bc11e6c	1	\N	Other
+4a7fd18b-a845-452a-9c26-d66dec77f384	1	James	Other
+4a82c97f-644d-4fcf-92e2-f1e3f3fe8568	1	\N	Other
+4a87a8c6-d744-4ead-84a1-32cb9925c72e	1	\N	Other
+4a88ecc2-a815-4140-b3e8-516f07e0700a	1	\N	Other
+4a8be7c9-2b48-4379-af56-a65b6ae69f32	1	James	Other
+4a8e2622-5c99-415c-926a-3255bc811417	1	\N	Other
+4a901a2e-55ba-465f-949d-575d7e38cdf1	1	James	Other
+4a94b28f-7117-4c4a-b8f2-be2bd43cec05	1	\N	Other
+4a9d302b-62ed-4107-9358-38e85c219f6b	1	\N	Other
+4a9e79dc-2553-4adb-8591-9b4c4177f614	1	\N	Other
+4aa3a41b-9ac2-4fb8-b81a-0b84360d4a22	1	James	Other
+4aa5d211-8289-4630-9019-0bd624ed690d	1	\N	Other
+4aa5eb89-b04a-40a7-ba78-3a8eafc9c26c	1	\N	Other
+4aa8acf0-7662-4455-98f5-b7f3b5887ab7	1	James	Other
+4aacf9f7-7f12-4f97-9a67-5028a62a78a7	1	James	Other
+4aad6fd1-6014-4221-87e1-70f5f1e2ae41	1	\N	Other
+4aadb0eb-3c0f-44ea-8e6b-020472fcdf2d	1	\N	Other
+4ab35281-d116-4ef1-a2f4-14bd2e049b8a	1	James	Other
+4ab646ea-092a-4719-a58f-a01e84bd0d90	1	\N	Other
+4ab70b6b-575c-4552-8d83-3330424eb127	1	\N	Other
+4ab7b3f9-0452-49a0-9b1c-1d01371129e9	1	James	Other
+4ab9e2db-ba4c-478b-bc50-ec704a96a3f9	1	\N	Other
+4abb0f33-62df-4abf-b091-1810ca7658c2	1	\N	Other
+4abbfef0-ff68-4a9b-ab8f-43d6ee2da6f1	1	\N	Other
+4abc665e-e54f-4274-9bd6-8deab1166543	1	\N	Other
+4ac2c943-4c05-42df-b319-767b2c80de36	1	\N	Other
+4ac59160-bd11-49a2-971a-81ef2c8b9d13	1	\N	Other
+4ac5b060-d32e-4281-a97e-7ef9eba213ed	1	\N	Other
+4ac805f5-a1f6-4c80-a6e4-44ef34974590	1	\N	Other
+4ac8197d-5e3b-42a5-8210-12677afba4e5	1	\N	Other
+4aca71c9-26fa-4485-8aa2-3349670660a0	1	\N	Other
+4ace8b43-3085-4fe8-904a-2db16d00f969	1	\N	Other
+4acfb527-344a-4ef3-8ec1-962602d392a5	1	\N	Other
+4ad4f021-35f2-4a74-863a-14e7447c598b	1	James	Other
+4ad53673-8229-49cf-8bcb-79ec6a0ac01b	1	\N	Other
+4ad54db0-50f7-4743-9fd2-5c62b6536fbb	1	James	Other
+4ad5904e-6392-46df-85fd-2ad924c19319	1	\N	Other
+4ade1c94-57ca-442f-a145-cd90f16908de	1	\N	Other
+4ade94a3-17ee-46c3-8d05-2a82b812a253	1	\N	Other
+4ade9cff-5d1c-49f4-8fe2-8060d1c17cd0	1	\N	Other
+4adeb8a2-e51d-4ba7-aede-b6f10402d256	1	\N	Other
+4ae41730-579b-496d-b206-67eadf820667	1	\N	Other
+4ae4197c-1261-48bf-a64f-981c8c5bd531	1	\N	Other
+4ae61b0f-f134-40b4-8521-d030878696d3	1	\N	Other
+4ae81c19-d1f4-4ee2-9b5f-734620172567	1	James	Other
+4aedaa1f-d6a9-43d3-b013-9e942a9161bb	1	\N	Other
+4aefaf7e-ae9d-4126-9e6c-952119c3e8fe	1	\N	Other
+4af72af0-33b5-4cd9-9d3c-d096ad3c5dc7	1	\N	Other
+4afa1c2f-f07e-46b0-9212-a23c0e6ecebf	1	James	Other
+4afa2f9d-5df7-447c-9078-f1e22a7ecd55	1	James	Other
+4afe8b73-d1b7-4772-b3bc-9ec3f6ce5c17	1	James	Other
+4b00585f-f95d-4ebd-8670-4321b84c05d7	1	James	Other
+4b076706-1901-461d-8bef-5b71a7e5e7ad	1	\N	Other
+4b09a3bf-1a34-43a9-a0e6-a704bc87b128	1	\N	Other
+4b0a5469-50d7-44e3-8cb3-99d359ca4b34	1	James	Other
+4b0e000c-e2f4-4091-b767-2d71d802e07f	1	James	Other
+4b1033d0-bcd3-4e91-ae14-818890514353	1	\N	Other
+4b12f310-7238-4c2e-93d7-71fc3565a124	1	James	Other
+4b1a2d72-2df4-4ff1-aee2-0cec1e2910fb	1	\N	Other
+4b1b847a-0a48-4ce6-8d9c-9945f0208f0b	1	James	Other
+4b1c1e68-d5b6-47f0-aa78-240a883ff512	1	\N	Other
+4b1dce68-d536-463e-93e7-343770a2b7f3	1	James	Other
+4b218a5b-00ab-4d77-a143-f2000024816e	1	\N	Other
+4b27ef95-0114-4538-8493-b73e24dcb578	1	James	Other
+4b29d0f6-a22c-4247-8937-5ce33444f35c	1	\N	Other
+4b2a4ee6-5be8-40a8-992c-6008dcb3b62a	1	\N	Other
+4b2d862f-04bf-42f6-8d18-c8b46119750b	1	\N	Other
+4b2e0edb-b8e1-4ec2-9c62-4b138acfe505	1	James	Other
+4b2ea0ac-877f-4e00-a5fd-e00fe1e93ab3	1	\N	Other
+4b38b27b-3fc5-474a-8da1-cc47a3ecb0be	1	\N	Other
+4b42c36c-bdb7-4f30-b048-c9304e37bfe1	1	James	Other
+4b438d4e-4275-45a9-ab63-cd35b69deedc	1	\N	Other
+4b46e926-a94a-4e27-819b-ea60c42cc65b	1	James	Other
+4b4856da-62d3-4da8-a8b9-bc5a1fb4cd59	1	James	Other
+4b4a0852-006f-4efa-b186-5a6de44e75cf	1	\N	Other
+4b4c24e4-0be0-4fd1-9678-70018ed7f6ac	1	\N	Other
+4b500bbb-80da-4b8b-bd9a-19fe229fd457	1	James	Other
+4b549fc4-c9bc-4bcd-b183-249470bc8d70	1	\N	Other
+4b5ead78-d629-423b-8e09-1fa671913dcb	1	James	Other
+4b5fa51e-63a2-45d5-9b91-2de491e53564	1	\N	Other
+4b6147ab-4c90-43db-b238-a48cb8881cbf	1	\N	Other
+4b624a02-da1a-4bf4-8f33-d0b9c320017f	1	James	Other
+4b6385d3-2a04-4715-b1bf-924506431f0a	1	\N	Other
+4b63cfd6-1160-4064-8d36-6d9c2299fc86	1	\N	Other
+4b695276-5c48-4234-aad6-3092d9b5183f	1	James	Other
+4b69661f-c9ea-4071-9f5c-f31249914aa3	1	\N	Other
+4b6ca779-8184-4743-b685-71bdb303e1e2	1	\N	Other
+4b6d8cbf-cf7d-4ec9-b28e-f7a9825da708	1	James	Other
+4b73df34-9cdb-4ccc-a58d-acfaeeb7ea1b	1	\N	Other
+4b764474-6606-4e00-9f25-ac43c11ac236	1	\N	Other
+4b7ba1eb-cbcc-42ce-b246-7ee53d1a9d82	1	\N	Other
+4b805cb7-5356-4eeb-9c14-85c33bd12232	1	James	Other
+4b80e440-702a-40e3-bbe4-2f53a56974f4	1	\N	Other
+4b81bfd4-f5eb-4174-8328-4999ff421593	1	James	Other
+4b8228af-5656-4b18-85ea-9e1e8a1f6e9d	1	\N	Other
+4b881059-d31c-4949-80c8-ab0aea9bc9bb	1	\N	Other
+4b8ae73b-4688-4375-9905-c40ca07f8c79	1	\N	Other
+4b8c4f25-2751-4c59-bd33-3b2f635eb46f	1	\N	Other
+4b8cd90d-2b31-4180-b156-ccd060f22f77	1	James	Other
+4b8dd365-6c64-4699-8c2e-4543dd061686	1	\N	Other
+4b920c6f-40f7-4ce3-9d79-e4c3ce7cea54	1	\N	Other
+4b926c14-6d72-43c8-9d22-c9950a918297	1	\N	Other
+4b930b84-ee25-428d-8086-d1fe8b07544e	1	James	Other
+4b9538ad-8dc7-40c5-b711-d9dae812cf2b	1	\N	Other
+4b95d61d-2ad8-4e9c-9a0b-326167b352bc	1	\N	Other
+4b96b565-fb3f-4e4f-ad14-cfcc551caaf0	1	\N	Other
+4b9b2614-d137-4102-8743-81aeae7d9efd	1	James	Other
+4b9c3388-5d99-42db-8fdb-5c8a90496f53	1	James	Other
+4ba78246-9288-448c-823f-6673b11ff363	1	\N	Other
+4ba7efcd-f5c3-4ca2-8c68-9d6b91e19a68	1	\N	Other
+4bae453e-8710-4a95-9efb-c43ff2f74ff6	1	\N	Other
+4bae548a-8456-4b16-b50d-08fb509413ec	1	James	Other
+4bb3800d-a8dc-49f6-b1b4-f7101d57c5ba	1	\N	Other
+4bb3f2de-82ca-4009-a42f-94221f9d1346	1	\N	Other
+4bbcb7d0-9686-4463-ae94-63083e96c69d	1	\N	Other
+4bbcfe0b-6bfe-4d5e-8fe3-f236b0397f6f	1	James	Other
+4bbe4790-f4e5-457d-95d8-9cd5108657cc	1	\N	Other
+4bbfc5d0-0fab-45f8-8872-2ce9e6ce8b14	1	\N	Other
+4bc002f0-3a9d-4a79-9bdc-33f32704462b	1	\N	Other
+4bc0c94b-7cdc-44ba-8ef5-7bd63bbc040a	1	\N	Other
+4bc567fc-8ec3-4818-a103-6e4dd94741b8	1	\N	Other
+4bc86fee-05a7-4fd4-8e17-5cd9012b7c07	1	James	Other
+4bc8a4e7-9b13-4804-8f21-e9ea0f732e1d	1	\N	Other
+4bcd979d-2133-455c-97c3-d2f0bbff8cc2	1	\N	Other
+4bcf7eff-88ff-4c67-9c03-f2e8391ec60a	1	James	Other
+4bd98795-7ec2-4f27-a162-130912fe2097	1	\N	Other
+4bdfba34-9f7a-482f-8b84-8efd984b6cce	1	\N	Other
+4be04c67-00d2-42bb-9698-b35e71fc074c	1	\N	Other
+4be244d5-6225-4ba5-b54f-97b304b9ed7b	1	\N	Other
+4bea5217-ae41-4229-980b-9442d427c1b6	1	\N	Other
+4beaec4f-ceab-46ca-bb6f-36eb5f0e97a4	1	James	Other
+4bf433ba-d1f1-49cf-9960-ba83c13f8687	1	James	Other
+4bf5a970-75ed-47db-9db0-3e504158504f	1	\N	Other
+4bfac12f-97fb-4198-9f27-82aa045c13d0	1	\N	Other
+4bfc3507-303f-472c-9dab-a13feadb00b7	1	\N	Other
+4bfd043a-ef9f-48a0-ae45-a6dc1e821865	1	\N	Other
+4bfe0d79-1f31-4cbc-a9af-c6e20a3c0942	1	\N	Other
+4bff3f1a-227c-4c40-8476-81c92a3d336e	1	\N	Other
+4c012ae3-57a5-4d18-953d-07f2f3b6bcb7	1	James	Other
+4c0ade26-1e7e-4d9f-84ad-8d73b1b35902	1	\N	Other
+4c0eeac9-a6f9-42a8-a51c-896d9194b6c8	1	\N	Other
+4c1292a7-10a7-4324-8ba0-7f4680f5eacf	1	\N	Other
+4c1328d2-8bc5-4696-8992-7372e774da62	1	James	Other
+4c18bcfe-30a1-4cd1-a731-2866a0f37a2a	1	James	Other
+4c1991bd-1911-41ee-833f-be3c5f046c8f	1	\N	Other
+4c1afbd1-a692-4f25-8ff5-46ef0bc84cbd	1	James	Other
+4c2266dc-dd1e-4e9e-897c-3c4fad9f5d6d	1	James	Other
+4c24d062-a977-48dc-b788-749eb92510ff	1	James	Other
+4c27e3d2-cbd3-4dc4-a992-adbc3c751da3	1	\N	Other
+4c2967e0-7f4e-4b9a-a350-f0ccdd5a4fd8	1	\N	Other
+4c2ef376-05f4-45ed-9726-3bf1f06e216b	1	\N	Other
+4c315813-665c-42c9-936d-57b02feddcda	1	\N	Other
+4c32e034-3673-4421-a936-51e52c5bc706	1	\N	Other
+4c36544b-7e21-436f-b996-20ef52d83f3c	1	James	Other
+4c384939-e0f9-43b2-a719-875787578474	1	\N	Other
+4c387624-a848-44c4-85be-6631542255f5	1	\N	Other
+4c3f9806-11ae-477e-9709-1a2fe7cee40a	1	James	Other
+4c44897a-c347-4d56-b0f9-ed960aa05208	1	\N	Other
+4c472612-dfd7-4bec-b69c-a1bcbffc7b5f	1	\N	Other
+4c499f4a-41d4-4d07-9bd9-edeebcb682bc	1	James	Other
+4c4a25fb-ff25-4c4b-8cb8-41e645a254ce	1	James	Other
+4c4a5214-096d-4d6d-abf1-96e53600eac6	1	\N	Other
+4c4e139a-b25b-4847-becd-6fb7276adcad	1	\N	Other
+4c50f737-cd51-483e-96de-022e696062b0	1	James	Other
+4c5261ad-1173-4371-ab6a-93c5c1389b54	1	\N	Other
+4c54287a-534a-46aa-a16e-b465d7550dfe	1	\N	Other
+4c5631cb-4750-4c31-9151-580028cef290	1	\N	Other
+4c57f79f-e55d-4199-acf2-02193c87c3b0	1	\N	Other
+4c59a73c-acf6-43d6-87c8-e3442d11cdb7	1	\N	Other
+4c5a78f8-95b3-4c63-903b-c51e8dc07d7d	1	\N	Other
+4c5b20cc-eccf-4db2-b612-d20d48df21bf	1	\N	Other
+4c5b9498-6626-45d4-9dc9-c823c5381104	1	James	Other
+4c5c7695-dc6e-49ec-ba03-3d20bb6e0753	1	James	Other
+4c5ea9cf-a928-4af9-bf07-a70f34bc8874	1	\N	Other
+4c6326ef-aadf-47b0-a6fe-753e48aa0ca3	1	\N	Other
+4c65eedf-e4c7-4e41-ab6f-9fc64d944578	1	\N	Other
+4c6f73a6-39ed-43ef-8808-7f9bd757a47b	1	\N	Other
+4c72b436-fd57-495e-9dcb-087cd30f9112	1	\N	Other
+4c72c066-153d-4c43-8eca-665f028b6a28	1	James	Other
+4c78fb04-0cbd-4b8c-a95d-bd8889afff73	1	James	Other
+4c7c99bb-e7de-4cf8-b17a-b129661246ca	1	\N	Other
+4c7f400f-5824-482f-8257-8ee2dde72ef8	1	\N	Other
+4c7f82ce-88f2-42f3-80ac-fc4b14ba5d25	1	\N	Other
+4c82616f-3c9c-4588-a574-52c9a2228f76	1	\N	Other
+4c8423e3-735f-47e2-a555-002eaca81a2c	1	\N	Other
+4c85a6bf-2324-4cd4-a85f-bd8e2d6afc12	1	James	Other
+4c88d56e-6290-4524-9817-909c2072fcb0	1	\N	Other
+4c8ea0de-5fb3-4e7a-af9a-583a81dab9b1	1	\N	Other
+4c8eba90-5a48-467e-91e6-434dfaafc433	1	\N	Other
+4c940957-1084-4bf3-bdfe-51567be07601	1	\N	Other
+4c992a1e-2d13-471f-9c1d-6f19a25ce5e6	1	\N	Other
+4c99f1fb-64a9-444b-a1b9-c3eca9293f01	1	\N	Other
+4c9ecf4b-6e62-4736-affa-05efed282948	1	\N	Other
+4c9f9168-c0e7-4a4d-ac97-4dabff56920a	1	\N	Other
+4ca16d73-256a-4c44-8531-8eb998afab64	1	\N	Other
+4ca28b84-ca1f-49a0-970a-ad3bc170e779	1	\N	Other
+4ca41f04-453d-43f6-ab14-1dc24bf892c3	1	\N	Other
+4ca7d720-0c5b-4b75-8131-29fde2b693cf	1	James	Other
+4ca89166-6ac7-4c73-ae58-2fa15569c64a	1	\N	Other
+4ca8f17c-95a1-454b-9cd2-0dfc59e493f7	1	\N	Other
+4cad7814-cf42-4499-b81e-105471cac74f	1	James	Other
+4cbbc0dd-75bc-482b-90eb-bc1d6c0441a5	1	\N	Other
+4cc2bfda-bf56-4508-a0de-ae23603e6c0c	1	\N	Other
+4cc412e2-6c3e-41be-816a-bb8276dea8e8	1	James	Other
+4ccc430b-5a62-4acf-a547-409b4d90e3e4	1	James	Other
+4cccf17a-3c0d-4122-9ddf-b56c0eddc6c8	1	\N	Other
+4ccecfd1-95bf-4f55-9776-26849d4b232c	1	James	Other
+4cd68ef7-e951-4912-a926-b4c87fe233a1	1	James	Other
+4cd70f13-e998-43a1-9044-9703e7bb6c93	1	James	Other
+4cd71bc2-4c00-4955-87a7-841eea480897	1	\N	Other
+4cdc5d90-8f03-4d75-bb2b-b454ea3c6deb	1	\N	Other
+4cde557d-2b85-43f6-9fdd-d09932c2f312	1	\N	Other
+4ce0af05-e9f4-4f20-a88f-fa8c9d636a7c	1	James	Other
+4ce37d17-b65e-48a0-97f7-743f632b00c6	1	\N	Other
+4ce730b2-bda3-4b38-ad51-cf880c6779df	1	James	Other
+4ce86fe2-7554-443a-a85d-faaa83957379	1	\N	Other
+4cec0359-dea3-4615-b8fc-03b72bb1cb0a	1	\N	Other
+4cf42173-d9bc-4c6f-8e85-bceedbfe7128	1	\N	Other
+4cf447f7-2356-428a-ae29-c25ef39d8906	1	\N	Other
+4cf7cfab-9c77-4c2c-9ed5-c0d457192cd7	1	\N	Other
+4cfa6531-4ae4-4668-9da2-0fad47c9ab00	1	\N	Other
+4cfd1c3f-bbda-4e1f-84ef-b3c3a39bcb5e	1	\N	Other
+4cfe16d3-6817-4beb-9c58-02b4ae66dc5f	1	James	Other
+4d00516f-1898-4b86-beb4-317f73d0c63e	1	\N	Other
+4d02007e-ef72-45ce-96aa-560284eb2270	1	\N	Other
+4d0436dc-ea47-4bcf-b9e4-3d10b1714d78	1	\N	Other
+4d0a453b-ad43-4f86-8184-75776230fd24	1	James	Other
+4d0abb91-b505-41f4-8931-d61f95ad3c67	1	James	Other
+4d0af56e-9269-45e3-b09d-4488d6da5df1	1	James	Other
+4d0ed68b-5299-43cd-ba67-ad43a5709e8d	1	\N	Other
+4d1675b0-9b63-4709-ba0b-7095816745b2	1	\N	Other
+4d16d1c1-8483-4020-8bde-76f3002a86de	1	\N	Other
+4d1ad56d-19cd-4459-ab3c-98d91d67d46b	1	\N	Other
+4d1bdee2-962f-4b87-93d4-5bdbc5738c3b	1	\N	Other
+4d1ca490-a805-4dc9-badc-f2f4918f3253	1	James	Other
+4d236b88-d507-4d98-9b02-88f3c467554e	1	James	Other
+4d2a0161-b76e-40c7-8483-6ba0640d7f62	1	\N	Other
+4d2db87f-f063-4243-b9c3-b2ea43137f4e	1	James	Other
+4d2e01ea-4257-4b71-b277-aae96f46cfe4	1	\N	Other
+4d2f2738-6e10-4521-95ec-5b240e7626e9	1	\N	Other
+4d33c0e3-d374-49a8-8a90-73fd0f406a7d	1	James	Other
+4d33e719-bc0f-41fc-8682-fd9f819a1ea8	1	\N	Other
+4d33f064-e849-48c0-a93c-aa8c0ee8f379	1	\N	Other
+4d384740-e3de-4a81-85c5-e05e0efaab13	1	\N	Other
+4d385153-81c2-42ae-aedb-20bc718d7a71	1	\N	Other
+4d3a7937-eac9-4efd-8915-915553de7a4f	1	\N	Other
+4d3aef7e-a0b8-4537-bd2c-8af3fb0e891b	1	James	Other
+4d3d2f45-58ad-43d7-9065-f8e6da1a46de	1	James	Other
+4d40e139-7f2a-4fd8-aa2f-9e40ea0277c3	1	\N	Other
+4d4283d3-b539-4fa8-9cc6-f1685e96ba33	1	\N	Other
+4d44617d-810b-49f6-9bc7-8979684051a9	1	James	Other
+4d4475f7-d666-4e3b-bd88-ab13bd2440b5	1	James	Other
+4d45dc81-3201-4b0e-a20c-e1fee857ec62	1	\N	Other
+4d4d8d02-00e6-453d-ae7f-b3b8560e1326	1	\N	Other
+4d539b72-ed0e-4ed8-aaf7-bb3491f1121e	1	\N	Other
+4d588b18-1466-4c89-a516-014e2078d830	1	\N	Other
+4d5a355d-1091-4590-a5fb-e461957dbf3d	1	\N	Other
+4d5e407d-b788-44d0-ae9a-3ba3eb4574f0	1	\N	Other
+4d63ce8b-5de8-4815-bff6-821150848c32	1	\N	Other
+4d6446b0-708f-4490-9617-eba9ce20d808	1	James	Other
+4d6dcd1d-1603-47e7-bf28-461ecdaacb78	1	\N	Other
+4d6e24df-966a-43b6-a86a-476640cc0cdf	1	\N	Other
+4d71ea9d-f9d3-4b4a-8386-aaaa6166b76c	1	\N	Other
+4d74db7c-4433-4f1d-9f4b-f8b1010214dc	1	\N	Other
+4d79d3fc-0943-4d2f-8af0-96827183b154	1	James	Other
+4d79e7cc-e52e-45d0-bf1b-081099cd9d76	1	\N	Other
+4d7e0ade-26c2-4858-ab7d-f45b08bdeed6	1	\N	Other
+4d7fe49d-a652-4e7f-acb0-417ff910ed01	1	\N	Other
+4d82e461-2c5c-40a6-becc-828667d6a910	1	\N	Other
+4d841d6b-838d-45be-9f49-e2e041bfd2ad	1	\N	Other
+4d851176-25ba-4c57-868b-6cc494364dca	1	James	Other
+4d853b19-3a22-480a-a499-12faf6dfe013	1	\N	Other
+4d8887a2-7e5a-4ab7-b931-232913cb5b02	1	\N	Other
+4d8eab48-d1a9-4b2d-a3bb-5979508a9780	1	\N	Other
+4d9130b6-2906-4c4c-9364-5c926848511f	1	\N	Other
+4d933bf0-9fde-4ed0-933b-f1d4293d33ea	1	\N	Other
+4d9378b9-6496-4a95-b793-88b997cc23e6	1	James	Other
+4d9468e4-5729-40f9-ba90-ff4604ead63a	1	James	Other
+4d971cf0-ee7b-425d-acdf-a4c88ff2c9c3	1	\N	Other
+4d973555-7ebc-4892-a30c-482b130ed3e1	1	James	Other
+4d98b167-2c90-4e3f-9f24-12b8ec6165bc	1	\N	Other
+4d9973b2-ebe7-48a5-bb57-9fdfe1b1a971	1	\N	Other
+4d9a4267-9c10-4613-8698-2950bd3f4094	1	\N	Other
+4d9d24d8-ae10-4fea-94d5-88b77b962486	1	\N	Other
+4da29e97-e75e-4ab4-980b-52e91765ad8e	1	James	Other
+4da7a2ff-2fe4-4bce-84f7-414296238535	1	\N	Other
+4da9054d-13d0-4901-b315-d54cde29f5dd	1	\N	Other
+4dab5622-b9ff-4cf1-963a-c203fade7bbe	1	\N	Other
+4dad0430-ea8c-4a71-ae7d-f3dba0b009da	1	\N	Other
+4db01b5b-2112-40b4-8b2c-5f7db64d246c	1	James	Other
+4db6fee8-d6ba-4510-81af-877fe6b6897f	1	\N	Other
+4dba6489-c251-40ec-adf1-9ed5ca0783dc	1	James	Other
+4dc7c3d3-9a97-41fe-b7cf-cec0a95f16a3	1	\N	Other
+4dcda0d0-05a7-4dbb-8c86-16a6f861052d	1	\N	Other
+4dce297a-6b14-48bd-b49e-16392595ec72	1	\N	Other
+4dcf33c5-bac2-4d47-b7a5-dc3b825542f0	1	James	Other
+4dd08db4-626a-41ec-b782-99cb1b51687a	1	\N	Other
+4dd0eae0-1647-4ba8-8d44-876e11621d71	1	\N	Other
+4dd1c7e5-9213-4142-92de-30c864504ea6	1	\N	Other
+4dd4f925-3388-4334-b482-f0c53b3fa4d2	1	\N	Other
+4dd754a1-39c4-4bac-8b8a-f49dc0ea45dd	1	\N	Other
+4dd7b48b-9f15-46c0-b872-278cc576b40f	1	\N	Other
+4ddbf477-b425-4872-9e11-82340b6f8eb7	1	\N	Other
+4ddee41f-a5e1-404f-b82a-041309f3b80f	1	\N	Other
+4ddef2a0-401b-4bd1-94cc-cf993bd3fc32	1	James	Other
+4de44a96-3039-4ce1-afd2-747844328cad	1	James	Other
+4de86b61-60d4-4d14-8293-19472124739e	1	James	Other
+4de8c4aa-8179-4cfd-871b-bc92390f1acc	1	\N	Other
+4de8d367-f732-4de4-867e-4159cb4cbc8f	1	\N	Other
+4deadfd0-f435-4ea2-ba57-144ee924ca0f	1	James	Other
+4def093d-152a-4562-a1f3-1b678f342ebe	1	\N	Other
+4def91c9-46a6-445d-a674-f7add19cdc02	1	\N	Other
+4df6aae1-eb02-40bd-8605-493885c99bda	1	\N	Other
+4df977d8-5257-4336-ac24-858238fb95fd	1	\N	Other
+4dfd311a-0412-4ec4-aaf1-501fe0913eed	1	\N	Other
+4dfd75f0-82c0-407c-a503-b002dc92efd2	1	James	Other
+4dfea147-7201-4565-852e-fe1893e0d1d9	1	James	Other
+4dffefba-f49b-4f70-9ec5-09a970b7f04c	1	James	Other
+4e004001-bfa4-4bec-abb8-168a734774b8	1	\N	Other
+4e01733d-ad72-40f4-ad24-f8fc204626e1	1	\N	Other
+4e06ca1d-c0f3-42a9-ba09-80cc951fdedd	1	\N	Other
+4e0bca0f-cd9b-40c2-9494-cc49c76454f2	1	\N	Other
+4e0e7585-5984-4fed-a35a-756f62cde6b3	1	\N	Other
+4e109550-9e12-49dd-a0e8-f311bccaf2c5	1	\N	Other
+4e123d43-a130-46aa-8ebe-683ee7e9694d	1	\N	Other
+4e152469-e962-43c3-b59a-b203daacb9a6	1	James	Other
+4e156974-8acc-4aa9-b2a5-bed0516434a1	1	\N	Other
+4e15a8b5-e2c6-4325-996b-239e5d41147a	1	James	Other
+4e181d02-c9e0-4632-8a77-482d289341a2	1	\N	Other
+4e1c29fa-b36f-43c8-bdce-cc6b1918c02b	1	\N	Other
+4e1c88e4-39e1-4a69-bf9b-4b5b187eafe9	1	\N	Other
+4e1d57bd-faae-479c-8f3c-27f49627f26f	1	James	Other
+4e1e9553-99a7-4622-92b0-1a729fa87a1b	1	\N	Other
+4e1f069d-6593-4cc8-ac6a-e6aae7200b0a	1	James	Other
+4e23ffcf-e87d-4f8e-a69a-8033a27ba9a4	1	\N	Other
+4e27f892-5715-4441-aeca-c58ce66a29cd	1	\N	Other
+4e295f65-ab7d-400b-ad8b-227a8735cc9a	1	James	Other
+4e2d008a-405c-46c0-a5ae-8e100d170043	1	\N	Other
+4e37ef69-03c0-40a8-94d8-aa8016e5ab62	1	\N	Other
+4e40d46c-dd88-44a3-9b38-f8814deb8184	1	\N	Other
+4e42dd4e-e02e-4cce-be9c-d7143116759c	1	\N	Other
+4e43df22-8a39-4895-9b2c-1070e1a9c85b	1	\N	Other
+4e456eaf-d116-4128-bf78-8a8a75ab93ad	1	\N	Other
+4e470b7a-cf83-4456-9a65-2c5991a084f4	1	James	Other
+4e480be6-ef12-415e-a961-d659099a9766	1	\N	Other
+4e487289-926f-44ab-8bf7-964ac0018909	1	\N	Other
+4e48fc92-a952-4d4f-857a-e59f6d2c8dbd	1	James	Other
+4e4ac4fc-4f93-4d1c-a319-ac549015a941	1	\N	Other
+4e532874-3456-4fa3-8c01-17e36c7a0038	1	James	Other
+4e5745ec-0672-4b38-a43f-10b8ad5a3cf1	1	\N	Other
+4e57892c-47e2-4b74-bc09-029a6560e959	1	\N	Other
+4e58c2fd-17d6-4a93-8539-7a3f79ab57ed	1	James	Other
+4e5bb6fe-5c1e-4f18-8931-014e4c3ac01b	1	\N	Other
+4e5c3ec5-af5c-406e-bfb5-507d8edc8ad1	1	\N	Other
+4e5cc34a-7979-4eca-abf4-f219f8c4dc0c	1	\N	Other
+4e5dcc89-fe2a-4018-8b52-902c8089ec24	1	James	Other
+4e627da8-006d-4e57-97a9-875c4fffcdeb	1	\N	Other
+4e68f50f-49a7-44b2-b980-47285bee42a9	1	\N	Other
+4e69ded4-edd7-420f-8119-69b2d34c4e24	1	\N	Other
+4e6a7150-f594-4864-afe8-e552c72ff659	1	\N	Other
+4e717baf-f649-439d-bca2-1a9bf0bb0491	1	\N	Other
+4e73f4e2-fff7-4170-8041-4f129c87af34	1	James	Other
+4e746514-ba0e-475c-8a6a-4dafa13129b5	1	\N	Other
+4e74730c-3cf6-402d-90d1-5b853af8e5e5	1	\N	Other
+4e75cc09-3379-4faa-91bd-ddf332faea50	1	\N	Other
+4e79ecf3-5ded-4f8b-933a-6eb022d20119	1	James	Other
+4e7b543f-dffb-4cbd-af87-f184aa8c1654	1	\N	Other
+4e7cc882-f0cb-4d8e-af62-7153c7bd12da	1	\N	Other
+4e8005f1-7230-41b0-b837-b842679c5737	1	\N	Other
+4e84a2d7-aa8c-46eb-95fa-421abfc617b4	1	James	Other
+4e896dad-7148-4158-ba66-4a494233ea24	1	\N	Other
+4e8a74c5-e758-4e90-a8e2-54a475ab1c19	1	\N	Other
+4e8a788c-5e58-43bc-a89a-91263fc8fbb1	1	\N	Other
+4e8b2162-6ac8-4693-8112-7571be445d27	1	\N	Other
+4e8d73ee-2ece-432c-8401-b20999d07113	1	\N	Other
+4e903328-b9a8-45fb-8841-80e47abda186	1	\N	Other
+4e934ad0-7ee0-4857-b63a-d74231b88005	1	\N	Other
+4e9d787f-9714-43cd-b3ed-9a275365db3a	1	James	Other
+4e9fbd7f-7ed2-45f8-821a-d8786f7f295f	1	\N	Other
+4ea1b275-712e-41e2-a4b3-dfc789c3403a	1	\N	Other
+4ea23a2e-a244-447f-897c-db33542280aa	1	James	Other
+4ea27ced-2790-4d23-aca0-a24c593d1d99	1	\N	Other
+4ea5537f-24b8-4093-9b0a-11005ae9d87b	1	James	Other
+4ea9ec52-836c-439d-823e-35ac309f7189	1	\N	Other
+4eaa0aea-7c86-4bc2-9ae9-9e150e3835be	1	\N	Other
+4eab2326-d539-42e0-88db-da312dc1a536	1	James	Other
+4eac4197-2cab-4af8-82d7-73646837b650	1	\N	Other
+4eaf2d1f-d53a-4be8-8bd4-e7db8e7d77f1	1	James	Other
+4eb00de2-435c-418d-ba2b-f6348117f30e	1	\N	Other
+4eb0baf1-374a-477e-8269-66672eeaa139	1	\N	Other
+4eb0f27f-0e77-42df-8fd0-75b897d0e1a5	1	\N	Other
+4eb2c88d-9b0c-4ec7-9c88-e5fca6508829	1	James	Other
+4eb3c86f-eeae-4545-85f8-c502ef074489	1	\N	Other
+4ebca245-8d99-4dca-bbb2-81cd7c342ca0	1	\N	Other
+4ebe739f-a0d5-4d99-830a-a36d45741863	1	\N	Other
+4ebefc97-79d7-4a7a-bde7-8f41a8afc8b2	1	\N	Other
+4ec179c6-afd7-4502-b31b-51c1a8af8b42	1	\N	Other
+4ec33129-cbe9-4acb-a2ca-07547f6229c4	1	\N	Other
+4ec841e0-94bd-4d86-9639-d5e6e8e29151	1	\N	Other
+4ec8f374-65a8-4358-8789-b7409684c649	1	\N	Other
+4ecb3d6c-15ce-4b22-b4f2-942b32fc4c1e	1	\N	Other
+4eccb8b0-c357-463b-871f-9fed6dc4ade6	1	\N	Other
+4ecdbed1-c8ce-4bf3-8157-be3db0be1ff0	1	James	Other
+4ece3a9b-7eab-41f3-9823-37ff522c08f1	1	\N	Other
+4ecfe7d1-62a5-4333-9168-0cf1e2de33ef	1	\N	Other
+4ed31768-22d4-46a4-bb0f-2e731b3136a5	1	\N	Other
+4ed61812-8106-4ed5-be96-bbba3122c21d	1	\N	Other
+4edac3bd-23b8-45ce-a106-37ea0f5a32cf	1	\N	Other
+4edb8096-c44a-4e2c-ab81-71c9f8601988	1	\N	Other
+4edbea46-ba60-46b6-9c5d-f8c4624fe0a8	1	\N	Other
+4edfa5b1-6f0a-40cc-965a-3c9aa74be999	1	James	Other
+4ee15ba7-02b2-47e2-a000-e43668470661	1	\N	Other
+4ee51261-6d2a-476b-99f3-9f6cdf095ba3	1	\N	Other
+4ee59cff-d13b-486e-ae8a-42502aef9743	1	\N	Other
+4ee7379c-a599-4a49-86d6-dcd7b77732d9	1	\N	Other
+4ee7b6d8-7675-4cc0-ae81-37d3eecf8242	1	\N	Other
+4ee97070-a1f0-4fdd-bb97-2b86b0341942	1	\N	Other
+4eee85e2-cb0f-401b-8024-c7e4010f2abd	1	\N	Other
+4eef6e3a-6b97-4fa4-bf6b-774fedf347be	1	\N	Other
+4ef13b23-dcfb-445f-9ca8-273fa8d20bfa	1	\N	Other
+4ef359d4-9264-44fc-abc5-ec12880e2d4d	1	\N	Other
+4ef4f67c-007d-4e31-b7ad-7f572e544c4b	1	\N	Other
+4ef71c55-767a-46aa-94ca-a344f60c382b	1	\N	Other
+4efb5a72-3931-40f1-8a41-ee33b3ad825c	1	\N	Other
+4f02fcc9-bc42-4147-9ffa-b82e0fab2a4d	1	\N	Other
+4f05a3b0-710c-4291-847d-5fd2085f0c69	1	\N	Other
+4f06a912-b87f-4828-89be-7f94f75d82f9	1	James	Other
+4f09fc23-6ced-45e5-af84-68812a2ad1a0	1	\N	Other
+4f0a1d92-421b-4f78-9a5b-9e2d85f96132	1	\N	Other
+4f0a3841-0c10-470d-a87b-cf98b7979705	1	\N	Other
+4f0b22d7-6d9f-411e-955d-36ff59b8b9f2	1	\N	Other
+4f0b65b0-f4ff-4388-9b70-d2e556e7c269	1	\N	Other
+4f0d3d0e-c646-4595-89e8-6fa9e212c744	1	\N	Other
+4f0d4b6a-7468-4ffa-8017-8b2ffc1f731c	1	James	Other
+4f0e56ab-b742-4527-a456-94d16853c8d5	1	\N	Other
+4f120ba6-9197-4350-b3d0-0d145192a0d7	1	James	Other
+4f125c44-051d-4670-b18f-796bbb8f2aa4	1	\N	Other
+4f132891-60e5-4da5-8761-a5a35f3c0d04	1	\N	Other
+4f14244f-44fd-4c5d-9d64-b5d252fe0ce8	1	\N	Other
+4f16a3fd-833e-4a00-ad72-a943b2e6ea1b	1	\N	Other
+4f179e29-c2b8-4518-b491-e2a34f3581c7	1	\N	Other
+4f1d33fd-42f3-474d-9a1b-9a81c7f76149	1	\N	Other
+4f218691-9a7d-44bb-ab66-8ecfcf5dfb1a	1	\N	Other
+4f27f76c-82f7-4ece-bb91-83a7f398027a	1	James	Other
+4f2b44fb-44e2-4989-bb63-f73645853eb9	1	\N	Other
+4f2dce40-07ae-44db-8f0e-13c9609169f0	1	James	Other
+4f31a3f9-852a-41fa-b152-e4d87dd1c261	1	\N	Other
+4f331825-af95-4dff-8f69-ae4fa131f831	1	\N	Other
+4f34896a-22f3-410b-822d-42d0e762028d	1	\N	Other
+4f37a16d-9db4-4fd6-b0f4-69959f59ca5b	1	\N	Other
+4f3815e6-6714-4dba-96e0-2f8019163ed8	1	James	Other
+4f39518f-9b8a-4f51-bc01-f1523c624a18	1	\N	Other
+4f3ae1f0-6254-4eb1-a108-edaeb85152dc	1	\N	Other
+4f3f1328-8413-4c70-a1b0-1ebc491822f9	1	\N	Other
+4f3fa1b2-318d-4542-bcb0-3924ffd88e63	1	\N	Other
+4f407343-9e8a-4330-b8ef-b5bdc1ec4de9	1	James	Other
+4f4106f7-4155-47fc-b887-3d2537f37a72	1	\N	Other
+4f417f12-7951-4b8e-9e77-09e6f4bc9ca7	1	James	Other
+4f41a180-a10e-456d-b6e6-713319ecbf3b	1	\N	Other
+4f452689-032a-4177-b6d8-d07845e7b032	1	\N	Other
+4f4721b0-d9d7-4c9a-86a6-7e315c6aa02f	1	\N	Other
+4f474be3-9684-41b1-b554-12b2ff0ea7cc	1	James	Other
+4f494962-bf3f-4092-a69f-31449c26a323	1	James	Other
+4f4bbd3d-bb85-46cd-a24c-0172070ca4af	1	\N	Other
+4f533494-b1a2-4f79-95de-7daa428e99c9	1	\N	Other
+4f5d3757-152e-44a3-8d1b-4ed479d00135	1	\N	Other
+4f65758d-12b6-4e57-85d8-ad1917ecb140	1	\N	Other
+4f67a19e-17e3-49f7-a952-d55f5c88ec74	1	\N	Other
+4f6d0beb-35e5-4426-967e-7c8b2985d48e	1	James	Other
+4f6e8367-0bd6-4fa7-80b4-29dddffcdbdd	1	James	Other
+4f6f2423-2cc7-4d3a-bc8b-3e1238b5e7a0	1	\N	Other
+4f6f2e29-6ffc-41ef-98b5-83d7bef08c98	1	James	Other
+4f6fd396-db4c-4f31-a3dd-9d9ebabec9c0	1	\N	Other
+4f70f322-323c-4a9a-86c3-eac48dbf5b7c	1	\N	Other
+4f75a7c1-f3f1-4573-b061-f4f8a535ca65	1	\N	Other
+4f7603c9-590a-4f86-99c0-124f15b40e1e	1	\N	Other
+4f766e7d-4880-4bd1-83f0-11042a9387d9	1	\N	Other
+4f790958-48e1-40c1-b0cc-d25dfc2f6866	1	\N	Other
+4f7fb3b4-3410-4aff-a39e-8e13bdf37379	1	James	Other
+4f898deb-c91f-433c-918e-cadc638abd09	1	James	Other
+4f8aa6c0-0efc-41ef-ade4-6da14e04804f	1	James	Other
+4f8adf82-2b0a-4c52-8ba4-30a2c2b327ee	1	\N	Other
+4f8b6e95-b434-4669-9a0d-11eb220ef5e0	1	\N	Other
+4f8ca8be-85c6-4926-a747-a3fcf5360ed5	1	\N	Other
+4f8d7d36-dc49-438e-baa5-91c852297653	1	\N	Other
+4f92ba0b-0c50-4194-bb21-21ab0be96845	1	\N	Other
+4f937b0d-3577-43fa-a44a-34aac0645803	1	James	Other
+4f982924-0d4c-48fe-8816-3c28de737652	1	\N	Other
+4f985192-7a81-4489-9e56-2e63eb030cd4	1	\N	Other
+4f98be95-4335-4aed-9194-682032d09d6b	1	\N	Other
+4f9bc049-1f59-4e90-b5c3-b4615c489e8c	1	\N	Other
+4f9fb584-77af-43a6-93bc-2f8af67689b4	1	\N	Other
+4f9fb882-ca7d-4bef-ab2b-2ccc85a78a82	1	\N	Other
+4fa1209d-f450-4226-8e37-3c7acd2df446	1	James	Other
+4fa51cb7-6eed-4455-8462-beeb8a1d9414	1	\N	Other
+4fac27b8-42db-41a2-82c3-6bf3dcedc24c	1	\N	Other
+4faf714d-6836-4a6e-adc9-c3f48fa0a7ee	1	\N	Other
+4fb146e5-7d1e-4fdd-82b1-3ac49ac2ab6b	1	\N	Other
+4fb1b58c-8c37-4bd7-a6e1-8c474aab8105	1	\N	Other
+4fb6de64-9840-4727-9cc8-17961fb2b475	1	\N	Other
+4fb9e006-49e9-41c1-b5fd-941a8dd07e93	1	\N	Other
+4fba4d79-5051-473e-bf98-5345cbd6073e	1	\N	Other
+4fba9398-673f-4675-b969-0908694412fb	1	\N	Other
+4fbdebb9-d3db-48d9-8432-47b6e701ceb1	1	\N	Other
+4fbe1bf3-4c67-43f6-b8f4-49b2bc237881	1	\N	Other
+4fc136ce-b12d-43b2-b6e1-f96293e639db	1	\N	Other
+4fc34d2e-5b4a-4ab9-a64d-64df25075433	1	\N	Other
+4fc3cb8e-1b20-4ed9-a082-0ddf6ad62b12	1	\N	Other
+4fc53d8e-92df-4dc4-bede-a347466aadf7	1	\N	Other
+4fd2fe0e-d9ae-4fd7-a968-184ce0368205	1	\N	Other
+4fd6e4f5-1106-4a0e-b6a0-7289b0318182	1	\N	Other
+4fd70f62-cf11-445b-90ca-c38289c3980d	1	\N	Other
+4fda3672-ea93-4120-9ba7-2c63b7700667	1	\N	Other
+4fda79f6-3221-422a-940f-64b48bb361f1	1	James	Other
+4fdaa00f-f7cf-433f-ad65-9d900d359f9e	1	\N	Other
+4fdc6402-2e59-405d-a849-93a2ace62569	1	\N	Other
+4fddea89-8b3c-4a6b-b567-fac6381a9275	1	\N	Other
+4fdfa03d-7fe0-46cb-bd5f-79ae394a1963	1	James	Other
+4fe8f404-dfaf-47a9-8a51-4af391ca1650	1	\N	Other
+4fe9fcb8-83e0-4388-9b43-4691d9c243a6	1	\N	Other
+4fed27c4-5949-4097-908f-cb9ee05a0241	1	\N	Other
+4ff5929f-97ca-422d-8945-ba37c32adfdf	1	\N	Other
+4ff6e73a-0263-4695-806c-17ea08a79a0c	1	James	Other
+4ff80a64-ac9f-430b-9b0d-64aa438267dc	1	\N	Other
+4ff8f213-c642-4b53-96e8-d3c53af67112	1	\N	Other
+4ffa5e44-72ff-4f1d-a17d-5e45c9f69152	1	James	Other
+4ffc0490-deec-49f4-ab90-433bd7870b29	1	\N	Other
+4fff52b5-0b44-479c-85c7-d8758795ee77	1	\N	Other
+4fffba99-3c89-480b-9871-9790f2f98d8f	1	\N	Other
+50005693-8392-498e-bbb7-f856f61af6ae	1	\N	Other
+50024a2c-879c-4066-8773-fb79bf7a69bd	1	\N	Other
+50041ffe-6932-4c35-8e31-bea078d8fa4d	1	James	Other
+5004cae1-5afe-4e95-8f56-1769aa0f9f47	1	\N	Other
+5005217d-e70a-4ef7-9257-aaa649187a52	1	James	Other
+50091fb1-0327-413c-a87b-80e861a0fbeb	1	James	Other
+500a5735-0dea-4d21-bc5f-3a08589736dc	1	James	Other
+500e95a7-aaa1-4b01-859c-2fbb3c41cb89	1	\N	Other
+5012324d-cb01-49e0-958a-abcb06d0e780	1	James	Other
+50138ebf-c2df-47f6-bdb2-0ca218819de9	1	\N	Other
+502272a7-ce38-4581-8964-219b670a6405	1	\N	Other
+5025b08f-6cf1-4dac-858c-cc6386f7c9e6	1	\N	Other
+50286042-fde5-47a4-b02b-32adb384bcfc	1	James	Other
+50299dab-9809-41b3-85c2-ac3320a186c3	1	\N	Other
+502c96cf-613d-49aa-938d-6564d2b50d52	1	\N	Other
+502ecb2d-e17d-4987-af94-849f90e9c600	1	\N	Other
+5033ab03-c9e7-465c-bd84-a8111b591404	1	\N	Other
+5038ac46-1762-4e6f-933d-5a4455a3aaf2	1	\N	Other
+5038e613-d33b-4c17-a688-6e2a24bc7e6f	1	James	Other
+503ab0bf-425c-4140-92f2-e7ea4261b42b	1	\N	Other
+503cb786-c3d2-4ff2-a77e-c078de26acca	1	James	Other
+503d3da9-6427-4610-a634-9224cb2399be	1	\N	Other
+503dd10f-b2b9-4d2d-aade-f442994b64fa	1	James	Other
+50406563-65ce-4c9f-892a-673f49fc2362	1	\N	Other
+50408a57-e81e-40dd-b06e-99cf2501f1b6	1	\N	Other
+5043135c-0938-425e-846b-ec840ea1c276	1	James	Other
+50442182-7fec-4808-b226-6ea0ff9ceeee	1	James	Other
+50485025-73bf-4e11-a498-2600684a7f1c	1	\N	Other
+504a6f93-9f78-489a-a4ba-fe9fffe4f0ec	1	\N	Other
+504ac232-4239-4819-a837-d9c004a6d0e9	1	James	Other
+504d5cc7-7d30-46a8-86aa-469d00994d54	1	\N	Other
+504dce4a-56f5-418f-abdc-34afd19fe8b4	1	\N	Other
+504f8736-3aea-4b71-9e73-cf2cb1024eba	1	\N	Other
+5057deb0-ba09-41c9-9d03-3315bce4984a	1	\N	Other
+505ab5a7-214b-4346-a177-30fdc72d38f0	1	\N	Other
+50620513-4eac-45e0-a62d-1b474cc30932	1	\N	Other
+5063292a-e865-4d80-9f2a-e8cbd6ae51b2	1	James	Other
+506571b6-14dc-48fe-a71b-7b1137ee4bab	1	\N	Other
+506c369d-8595-4766-b429-4a883738c890	1	\N	Other
+506d1470-3cff-4c28-a014-81d56442d295	1	\N	Other
+506f2eeb-e43c-40ef-8440-b8545ee30723	1	\N	Other
+507369d0-6cf1-40ae-8f14-3764f055b1dd	1	\N	Other
+507622c2-a2f2-4bf8-8234-4e11c826da87	1	\N	Other
+50780f55-dd01-47f3-9863-9aa875ca7bc8	1	\N	Other
+507c3c3c-d057-44ba-bb9a-2f67e843f4aa	1	\N	Other
+5080dc3f-07de-4b6a-b620-6cbae9e46783	1	\N	Other
+5083ef3c-d30a-416c-b0f7-5b5b889b7e03	1	\N	Other
+50859223-2a44-4259-a489-df5cf7432912	1	\N	Other
+50865787-f697-410d-aa55-1d7b1e421724	1	\N	Other
+5088c16a-2194-4e48-87dc-e59fcb11f81e	1	\N	Other
+50893c7f-b3d3-47a3-9e47-551819774046	1	\N	Other
+508ade34-b2ca-4cd0-83a5-c2ebf8000018	1	\N	Other
+508ce5ad-35f3-45f2-bf9b-6ee4fd9e30c7	1	James	Other
+50906a63-3879-4fb2-bd0c-1764bb8bb53a	1	\N	Other
+50907530-6a18-4dc9-8b20-593a05b339f0	1	\N	Other
+50946165-aedd-4d7b-8547-396f73bfd1d6	1	James	Other
+509bd23e-81c9-44d8-87a9-29b2271a89d8	1	\N	Other
+50a3dd24-97a2-40e3-bc4f-2b8e7d8ebdcc	1	\N	Other
+50a6cc61-d957-479b-aacb-53ddfe89965e	1	\N	Other
+50aa39ad-f18d-495b-9b17-259a5a28c7b6	1	James	Other
+50aa8714-8ba6-4801-8d39-dce05a7ece28	1	\N	Other
+50abf49f-1848-4463-bc5c-c868040cac5b	1	James	Other
+50ac7012-2154-402e-8df7-e8846774b7f6	1	\N	Other
+50b1f30d-dcaf-417e-8440-9d7aee441746	1	\N	Other
+50b6352d-8a38-4a95-9428-1317bd6e2c94	1	\N	Other
+50bc7b96-d68e-4f56-815d-1d2cf86f30ee	1	\N	Other
+50bd1dc2-c847-453f-8f35-481135639835	1	James	Other
+50be400b-bb47-4608-b58b-608110ae85ea	1	James	Other
+50c12e2a-5e19-422d-a3c4-d0b09accc738	1	\N	Other
+50c4c1f0-2f55-4cbc-9a4e-61481ef6673a	1	\N	Other
+50c66d0f-7590-45fb-96b6-2686172d53e2	1	James	Other
+50d0237a-82b5-474e-befa-a2293cae4f83	1	James	Other
+50d29dd4-648f-4624-a8ec-5ad8324063e5	1	James	Other
+50d58e8e-bb92-4538-a6fb-b6bc890ab9e0	1	James	Other
+50d730be-76cd-4972-8f3b-0f58db6f7a18	1	\N	Other
+50d7608c-9017-4304-a6b9-eff89d9fc715	1	\N	Other
+50e2a111-655a-40ab-be9b-816c620eeae6	1	\N	Other
+50e3493e-c23f-4c7b-b1d3-825cce3896da	1	\N	Other
+50e58baf-1e3d-4e24-80de-4ccd2206ff6f	1	\N	Other
+50e6ffd5-3122-416e-bbf0-139e07990b35	1	James	Other
+50edfe4b-322f-423b-87b7-a4437fbbc0d0	1	\N	Other
+50f11967-6c9a-4184-bf3d-c8099bf6672f	1	James	Other
+50f1a11c-e57c-44b6-b005-6c31499fb00b	1	James	Other
+50f5c116-8de8-4027-9f04-9851c4964944	1	\N	Other
+50f6c96b-cea1-406d-b4c7-40a721aed348	1	James	Other
+5100cbf5-4b11-46d6-b6bc-f6da55d37c5c	1	\N	Other
+51010a16-588f-465e-81b8-d203bb0e8420	1	James	Other
+5103f46d-f932-4ba6-bdf7-6ae9c2c1b2ad	1	James	Other
+510411f7-4f98-427a-90d7-2726e2514ac0	1	James	Other
+51066b2e-3034-4975-ae7a-e8a2d7a48f40	1	\N	Other
+510a5708-9804-4211-b70c-c3164e49a606	1	\N	Other
+510c572c-99cf-49f7-a49b-f72f13e63ed2	1	\N	Other
+5110bd13-f035-4a73-ba5a-e885fe394231	1	\N	Other
+511525e1-2a94-4de2-ae48-c0e858648d93	1	\N	Other
+51166eec-3554-4ec5-ac3e-cd35adf68d2a	1	\N	Other
+5116ca3a-56ab-4b56-a08f-00fda779548b	1	James	Other
+51178022-ba64-4b68-aaf2-470c646158d7	1	James	Other
+5118af99-85c3-4c1b-a7cb-72f92c987b62	1	\N	Other
+511a93d5-979f-4dcb-9546-73db95dddf50	1	\N	Other
+511f41d4-842a-4422-b720-fc89a4b76959	1	James	Other
+51267d3d-5838-45e4-856f-3e561de0e430	1	\N	Other
+512ef60b-3183-4d8b-9b0b-997442614781	1	James	Other
+51367adb-d019-43f9-828c-64e1eeed89ea	1	James	Other
+5137f099-2339-4d55-ba5e-7884c727dcc2	1	\N	Other
+513915c6-e87e-4352-803f-e632a3da275a	1	James	Other
+513b32d7-756d-4fc6-8c3b-7df7976ad3a7	1	James	Other
+513b5563-e374-4e50-8937-f8ab58998843	1	\N	Other
+513bdb71-576f-4c20-8899-e118cee07819	1	\N	Other
+513ccf61-5344-4c6e-999f-18f67053eaaa	1	\N	Other
+513e1ea1-3946-445f-a380-f48ef4939970	1	\N	Other
+5140188b-6da0-419d-84aa-59b2cecbf08e	1	James	Other
+5144f1bb-2604-4fe0-8854-0ca368d2656b	1	\N	Other
+514b85d7-057c-4707-a6d6-f1ba6d1715ef	1	\N	Other
+514fdec8-005f-4a8f-bd53-c424c9c7a4c2	1	\N	Other
+515201c8-bdcb-48a1-b942-42a1211c2a91	1	\N	Other
+5155c4c0-2533-4131-884f-8302df3bd93e	1	\N	Other
+5155d121-a884-4211-980a-011bef6f8c4b	1	\N	Other
+5157f76e-a988-4be4-a3e9-8a3b862b5e5f	1	\N	Other
+515aec5c-4d45-425a-8686-421186c9655d	1	\N	Other
+515dcc9a-c0b2-4bd8-9f25-677bdf0ba10d	1	James	Other
+515e9ea7-6932-4754-8b1f-151937dde0d2	1	\N	Other
+515f54c5-c88e-46e0-85f5-bcafc32b4f8d	1	\N	Other
+515f984d-89ad-4a83-8d82-8f249ee78051	1	\N	Other
+516ba6d0-ca0c-4011-b1fc-1b80709f4202	1	\N	Other
+516db623-3386-4d58-a7ac-7ae5d332576f	1	\N	Other
+51746ef5-308b-4c3e-89fd-5a28755e7c7d	1	\N	Other
+517512e5-19da-499d-9278-71852095c040	1	James	Other
+51760607-3172-47f1-b69f-69bf8e5a0998	1	\N	Other
+51772c54-2587-449c-bd9e-567ed40758cb	1	\N	Other
+5177437e-dfbc-4f9e-b3f4-2157fb422640	1	\N	Other
+517ac6f1-ffa5-411b-a87d-1da777614653	1	\N	Other
+517cc8a2-4b64-4d35-9f12-ab85e8d14e52	1	James	Other
+51859c60-a550-47a7-8af6-9e6c1437aada	1	James	Other
+51871847-ba09-466c-aa51-15c5dea59457	1	\N	Other
+51877fd4-041a-4001-b158-915115929d2b	1	\N	Other
+518b2d12-7e70-42c7-8af2-600d47d27dd9	1	James	Other
+518b5dc8-92a6-4f1c-85c4-9b3ad23a3b71	1	\N	Other
+51990788-6852-4ecd-8928-6b17289b5940	1	\N	Other
+519de3ed-0f15-4793-9691-fc6f9e1f5765	1	James	Other
+51a6686a-606b-4ae9-867b-9c3cd3d8f430	1	\N	Other
+51ab505b-2404-498a-bba1-bf8aeee14e16	1	\N	Other
+51acc58b-8d27-4f06-afca-beb40f67a806	1	James	Other
+51acd4c7-8eb2-4a5c-ad95-ffe48d2a1b73	1	\N	Other
+51acdebe-54d4-49d8-8920-b05a6a3c3321	1	\N	Other
+51afd692-7d65-4d1e-b597-1f6843e27ae9	1	\N	Other
+51b509c1-ab20-4f6d-a71e-1711e81b9392	1	\N	Other
+51b6055b-518d-4d53-82a8-2e69deb22b10	1	James	Other
+51b6bb72-e564-454b-aa45-4db2ab3fc4e8	1	\N	Other
+51bbeec0-26ed-4000-9e47-a96b95ef4bf0	1	\N	Other
+51bedbd7-0a7b-4d83-a69c-d5822e71da4f	1	\N	Other
+51c142fb-6dad-4e83-8b2c-088453131b2b	1	\N	Other
+51c1d3a9-6b03-480c-a6ef-c12961fa557d	1	\N	Other
+51c48d6b-75b0-4130-ae2e-a4dfd68af3f5	1	\N	Other
+51c7857d-2a29-4174-a9f0-25d7843f75d1	1	\N	Other
+51cf30bf-750d-4a0e-8230-2130f2560c97	1	\N	Other
+51dbba70-c4e8-46f2-8fd4-6fa9a29a87c6	1	\N	Other
+51de499d-27de-4131-a362-2d6dc329bb05	1	\N	Other
+51e3ac44-520b-4df8-991f-8ee000cfe2ed	1	\N	Other
+51e40c47-9a10-46e2-9601-c1589d75fe50	1	James	Other
+51e80343-b5b1-49d4-9364-afdb376f5113	1	\N	Other
+51f2458e-d0f6-4675-b7a7-30ac1f644130	1	\N	Other
+51f89dff-3bf4-4346-a3da-d24c5179c1c0	1	James	Other
+51fbab56-0296-4b64-bf79-733f8fddd2e1	1	James	Other
+51fe2ba4-bc02-42c6-8591-618cda76e5d1	1	\N	Other
+52009aa3-f1f4-429d-b98f-78fcd109515a	1	\N	Other
+52082e65-237d-4df3-96cd-2c35c6ea277e	1	\N	Other
+5209e8b7-8560-4553-97bc-faceb8764016	1	\N	Other
+520beae1-a3d4-49ea-b4b7-6714e6879943	1	James	Other
+520e560b-83fe-42cf-a191-323377610516	1	\N	Other
+5219e1cc-26d7-4fa8-ac30-f8c4840457aa	1	James	Other
+5225512e-28f6-409e-a09a-a31dd354a732	1	\N	Other
+5225ac64-2c89-4593-b3ea-3bdda0e4d323	1	\N	Other
+5225bcbb-439a-49b9-bf3c-343e665a75c4	1	\N	Other
+522852a0-4401-44a5-b732-89a9701894a2	1	James	Other
+522ae3de-7a93-4cfe-81b4-e7441472ac05	1	James	Other
+522c7f6c-5ef4-4ba6-9c19-1f447d7c8efb	1	\N	Other
+522e6a7c-3ba0-48ac-b80e-1fa96dd5e1b7	1	\N	Other
+522f5e41-6ff6-4ef6-80c3-5ad5b78b86f7	1	\N	Other
+52301a83-aab7-46ba-acef-f17f5087a4f8	1	\N	Other
+5236fca5-6586-4696-9c77-b359f7177020	1	\N	Other
+523981ab-c34e-480f-9e4e-fcd0ea8d4da0	1	\N	Other
+523a03b1-9d79-47db-bcc6-b2cea27036ef	1	\N	Other
+523c3437-94dc-4034-93af-ce0bd59de8c3	1	\N	Other
+52429b8e-6304-4bdd-b3c7-4bf96bfc3d8e	1	James	Other
+5245468a-ad7b-4b57-b2b3-41320c7bf7a3	1	James	Other
+5246ac78-b611-4141-b33c-f01d97199274	1	James	Other
+52485356-cc51-4921-bf5f-c87b12cbcd2e	1	\N	Other
+524b8085-48f0-4e7b-b08a-43bd4f4a7e6b	1	\N	Other
+524cffa1-9fd5-4f38-a2fd-fca5ecf9120b	1	\N	Other
+524fd0b9-39bd-407e-9ac8-51dff05c940c	1	James	Other
+52506823-93f3-42be-9705-3d5d1663b875	1	\N	Other
+5250e24b-7096-4958-bfc7-cf977507e573	1	\N	Other
+525147f3-e829-42da-bf1f-e2c053d54a9a	1	\N	Other
+5252d0ad-a542-4304-bfe7-2c8de1e036c8	1	\N	Other
+52560538-db17-4e53-9b0e-c623364b805c	1	\N	Other
+525d6ca3-9971-46dc-b7c0-08f5cbe3295b	1	James	Other
+525fc601-bc65-4056-a767-42088e0650e4	1	\N	Other
+52632a72-a478-456a-939b-df026d1ca047	1	\N	Other
+52656d66-5468-11e8-b95a-fa163e8624cc	1	\N	Other
+526721ec-9e1d-4588-8b10-aa41e6f05c4b	1	\N	Other
+5269b88a-a1ed-4cea-9942-2b77c8313cd7	1	\N	Other
+526a3a95-2111-44b5-8ed6-68b88535a045	1	James	Other
+526da9ba-cd4d-4726-8ff1-be89544b6c21	1	\N	Other
+526ffc9c-0b00-11e8-8cee-fa163e8624cc	1	\N	Other
+5271e702-75a7-4c81-b601-a98ea48814e1	1	James	Other
+52776919-98fe-40ce-a222-2c12c2a95878	1	\N	Other
+527adb61-cfe5-430e-98e2-8a7b782f8b30	1	\N	Other
+527fc9dc-0121-417c-ad77-29b9382e28a0	1	\N	Other
+528287da-e12d-4313-8c6f-64497d90f67f	1	\N	Other
+52830e7d-71b3-4cef-a7eb-e94d5c171a76	1	\N	Other
+5288ed38-0b00-11e8-bb7c-fa163e8624cc	1	\N	Other
+528afb76-a474-4fce-a892-98737e1270c0	1	\N	Other
+528b285d-bbf1-4f05-9e67-1b05d31e901e	1	\N	Other
+528d3944-02d6-45fd-8701-472f85240ec3	1	James	Other
+528e3732-d8f6-40d2-ac51-7100d049640c	1	James	Other
+529aea64-b9b3-4fac-a180-5ec77aedcde2	1	James	Other
+52a30c18-0b00-11e8-b670-fa163e8624cc	1	\N	Other
+52a71b9a-ecf5-4ec0-8542-201e29f16ebf	1	\N	Other
+52a7d651-20d2-428e-bc53-17b1d64c95a9	1	\N	Other
+52aa794f-b9da-46a5-b4e9-31ec1f4b78db	1	\N	Other
+52ac48d0-7afb-4879-ba3c-4cdaf7ae3b20	1	\N	Other
+52af3770-fdf0-485d-9845-daf8b5abf29c	1	\N	Other
+52aff090-0b00-11e8-b67e-fa163e8624cc	1	\N	Other
+52b23e4c-1b70-11e8-9d76-fa163e8624cc	1	\N	Other
+52b488e2-5468-11e8-8237-fa163e8624cc	1	\N	Other
+52b93db0-a26b-4da6-978c-5ccd3d2411bd	1	\N	Other
+52c077a3-3aa5-4e05-a66c-7603c1933748	1	James	Other
+52c1281d-16fc-4679-a461-b76880bff7db	1	James	Other
+52c34f71-60e6-4daa-aaef-6d97132d7d9c	1	James	Other
+52c60ecc-fc5a-4ff1-9360-3f18b7c1d8ec	1	James	Other
+52c62044-8ba9-40ec-9def-4b55d1b27d9e	1	\N	Other
+52c7c90b-a55d-477a-adc3-7ab2d76a547a	1	\N	Other
+52cc9fc1-997f-4b44-91e7-13e23df5bbb8	1	\N	Other
+52d12b6d-8fa8-4cba-ad76-146fcd062603	1	James	Other
+52d2cc0d-8dce-4da7-a7c2-8bfa8b9c5d7c	1	\N	Other
+52d677e5-c02a-43c1-aec3-398ce85cd5a1	1	James	Other
+52d8168e-68d8-4121-a81c-37a3c95e85d6	1	James	Other
+52da421c-5de8-4dbf-bf4e-98eddd50d03e	1	\N	Other
+52e5208d-76b8-46b7-97ef-98d78cc9d939	1	James	Other
+52e585c0-8511-4e34-a1f2-1a19e6da2fc4	1	\N	Other
+52e6c2d1-f447-4277-baff-5dbdc77163cd	1	\N	Other
+52e71632-196f-4e64-877a-32d04efa6035	1	\N	Other
+52e720f2-191a-421c-8419-b81c5a402322	1	James	Other
+52eb84b1-9ef0-46f2-836c-8af9c659606b	1	\N	Other
+52edba31-bc31-43a8-be7b-d988cd110021	1	\N	Other
+52f3c16d-778c-45d6-b6d0-317c0e9e7b10	1	\N	Other
+52f407e5-136e-40a1-961d-7ef937aabbab	1	\N	Other
+52fab8df-ead7-4e4c-950a-8e652668fee9	1	\N	Other
+52fec47d-fb2e-48c0-92ba-a9a2dec98d59	1	\N	Other
+53030fb0-2b3d-44d9-901c-ae4a5e3f4a96	1	\N	Other
+53057423-2aa0-444d-8646-dfcb60fd60a9	1	\N	Other
+53063d72-def5-4df6-abc3-d5853fd69539	1	\N	Other
+530ce5d0-4475-11e8-85e6-fa163e8624cc	1	James	Other
+530d66a0-1b70-11e8-8ec7-fa163e8624cc	1	\N	Other
+530e14dd-1c09-4256-9d26-0857eb6fe4af	1	\N	Other
+530e5225-da56-435f-987d-951c3f50910a	1	\N	Other
+5313a316-113a-11e8-89a9-fa163e8624cc	1	\N	Other
+53159a4f-8b33-4ad5-92e8-2a392c8514e2	1	\N	Other
+53176017-a420-4931-a3bf-b29e78739c7a	1	\N	Other
+5317a390-1023-4f93-815f-6a740e0fe8fd	1	\N	Other
+531b2493-0a60-496b-b72d-e14e363dddfb	1	\N	Other
+531b43b6-ffdc-402d-82f2-56e4da587b75	1	\N	Other
+5322d83f-c6a8-451f-a02c-1bccbcb069a3	1	\N	Other
+532ae958-ac85-45df-937e-cf548f1b3345	1	James	Other
+532aefe0-bcdb-400d-89a5-55fdc49fbab1	1	\N	Other
+532d1f8f-10fd-4fc3-aa28-4142f5324b67	1	\N	Other
+5330553f-832e-421f-91d5-a8044035bab9	1	\N	Other
+533887c4-5ac3-47e6-8bc5-01eaab5bb800	1	\N	Other
+533def85-74ee-45d4-b837-88e7e3a00227	1	\N	Other
+533fe2dd-3484-40ff-bea7-de2bb05091b4	1	James	Other
+534d9377-df1c-4496-840f-d5d16995c852	1	James	Other
+534dbf37-5e13-401d-a700-5ac7577de84f	1	\N	Other
+534dfe13-44d8-4d0d-a194-acb7080c6a11	1	\N	Other
+5351a938-6fa5-4959-a0cd-6111cca170f7	1	\N	Other
+5352d545-72d3-4228-b2c0-2fe345a8a5e8	1	\N	Other
+5357f60f-a6b8-4fd2-907b-29eb2ac00e9b	1	\N	Other
+53598e49-aeee-4d45-bab1-31fc4dc38039	1	\N	Other
+535ec3cc-e54d-4fbd-bc46-b0b746829275	1	\N	Other
+53633afd-4cd7-42c7-b84c-f2faabc2f50f	1	\N	Other
+536446bf-2298-4dd6-a97e-125898315d81	1	\N	Other
+536e8195-9ec7-4fc5-ab05-762e7a55731b	1	James	Other
+536f16da-7a40-414e-be44-6997b486e42c	1	\N	Other
+536f9608-a169-4341-a638-1c0cb9d64672	1	\N	Other
+53711c8b-c4c3-46b2-8fb5-32628f0d2af3	1	\N	Other
+5371abc1-2f07-4bf3-9a11-b32ab704dd61	1	James	Other
+53744bcd-dd8e-4616-b9aa-236ebcc00fd9	1	\N	Other
+5379d216-38b7-4526-a268-43c7ba706bdf	1	\N	Other
+537ab7f0-d0d8-401f-838e-3ce84df70027	1	James	Other
+537abb80-d0f6-4c54-81e7-d4fb87d776fa	1	\N	Other
+537caf83-e1ed-42fc-85b4-e168b00b73c2	1	\N	Other
+537e3f9a-90f1-480a-affd-42ff431eb80e	1	\N	Other
+537f305d-a9a5-4f19-909a-ffea076bdcfa	1	\N	Other
+5384bc50-2599-4b70-a808-19714137510b	1	\N	Other
+53866dee-443b-4092-8a88-1c42cb3194ac	1	\N	Other
+53876f5d-ad47-43e1-9735-266a5ec99c08	1	\N	Other
+538a0660-d02e-4e70-96c4-e1c470485eb4	1	James	Other
+538b2408-7704-498f-89c2-5e9c03d89186	1	\N	Other
+538c9d1a-bef0-486e-9976-086e401d5f8e	1	\N	Other
+538d0cec-113a-11e8-a30f-fa163e8624cc	1	\N	Other
+538d62b6-0025-4882-b124-1f46ef8782dc	1	\N	Other
+53916ab5-b7af-4bc6-9617-be7a9420e9cd	1	\N	Other
+539534a4-2554-4141-a547-f4f4636b3ae2	1	\N	Other
+53955b4a-8134-4f10-baf0-057181bb6d8b	1	James	Other
+539823cd-222b-4780-b1c3-c279323ee985	1	\N	Other
+539b2588-6742-4f71-b571-2159c9baefcc	1	James	Other
+539ce5cf-f3b8-4f57-a624-712cfbc09401	1	\N	Other
+539d8d09-4181-46a0-8b74-6c70750813d9	1	\N	Other
+53a18ef9-ce8a-440c-9274-79d67fe3add4	1	\N	Other
+53a8caa0-3883-4e0a-995b-224a06ca718d	1	James	Other
+53ad3144-f374-493e-bdf5-393ba4911798	1	\N	Other
+53b0e490-da2d-4323-b217-6f18d6db3963	1	James	Other
+53b2722f-7c0d-40fe-bdf5-089cc6ecd3bc	1	\N	Other
+53b9c3cd-a363-4e22-b2df-32e5adbac52f	1	James	Other
+53c2f115-80cf-4877-835a-2e181f6065f9	1	\N	Other
+53c548e0-e43a-48c7-9a28-5d6f92f24e63	1	James	Other
+53d26630-977e-45ed-aa42-4e6e4a1ae704	1	\N	Other
+53d7a6a1-1d05-4251-a6d5-9c81d4c9d791	1	\N	Other
+53d7cf2b-dc45-4b49-af59-30592993c5c7	1	\N	Other
+53d84376-1f9a-4c98-8d6d-02608d93af0d	1	\N	Other
+53d86095-8d83-4dc5-8197-5f8be7b3a97c	1	James	Other
+53dbe05f-c826-4d63-83b6-0166ecea2e42	1	\N	Other
+53ef294c-3765-4b5d-9e75-a35c68ad1f06	1	James	Other
+53f2e740-ff07-4d4f-b3c6-69ff58fb752e	1	James	Other
+53f5dde8-e586-4a46-90bc-1deb5143044f	1	James	Other
+53f69b2b-9bd3-4708-ac92-fc039d3ca64f	1	\N	Other
+53f9f44c-2396-11e8-b424-fa163e8624cc	1	James	Other
+53fc501c-d545-4158-b0f3-c89709ffac4e	1	\N	Other
+53fc5dec-b4f8-4dc1-99a7-a147e29bf87a	1	James	Other
+53fc8d34-644b-4d10-9b5e-8be81e53d989	1	\N	Other
+53fcd425-24ee-41e9-8097-9e5f5355406c	1	\N	Other
+53fe382f-cfd3-4017-be3f-9e5425f2b671	1	James	Other
+54034e33-8f42-492a-b909-59f8e384e834	1	\N	Other
+540759ff-7221-4e2e-a5ea-48f49b09b849	1	\N	Other
+5409e68e-8140-47a0-b3ca-afcd11c28255	1	James	Other
+540b1dcb-e7a8-4f0c-8346-4d8912b9596a	1	\N	Other
+5411f5cf-fb48-498d-b75f-b83fcdbd68e3	1	James	Other
+54136425-750d-495b-b210-e57481ec86e0	1	\N	Other
+54148fd9-eae5-4ee8-9ba9-cb80104590a2	1	James	Other
+5414d7e4-ce09-49c4-b9b9-2c2b65172922	1	\N	Other
+54159d8d-e886-4f4d-8d10-019dd0695517	1	\N	Other
+541785af-a3b1-47a3-ae5a-bbe3b702b567	1	James	Other
+541a0ae3-9adf-404c-8eb0-5228a975bbde	1	\N	Other
+541e36ae-edcd-4147-82cc-f0d8c973651c	1	\N	Other
+541e5b2c-1239-41aa-ac1e-3c943bd07232	1	\N	Other
+54207898-96ed-4749-9bc5-05171b408056	1	\N	Other
+54210ae1-cbc9-488e-850c-c66155aa14de	1	\N	Other
+5422be23-1d13-4afe-b4e4-9b88459144ca	1	James	Other
+5423940e-39a6-49e7-839a-b62d8fd9e53c	1	James	Other
+54247c6d-2fdb-4e33-81cc-7e3c165b4a72	1	\N	Other
+5427c505-191e-4040-a28a-7f6523e26b36	1	James	Other
+54294430-df2a-4f6f-ba7a-911abc0d5329	1	\N	Other
+542a0367-4286-469c-ad2c-794dfbdaa42b	1	\N	Other
+542a3816-bcbf-435d-a433-83a16e88b6d3	1	\N	Other
+542b2bb6-c574-4269-9c78-f356828b9355	1	\N	Other
+542bc136-e19d-4842-90a0-3b9af8db0227	1	\N	Other
+542d58cd-319e-4b6c-9a73-14aafd3a3b4d	1	\N	Other
+542ebbb1-8dd4-4a3a-81af-ea2e2540ab16	1	\N	Other
+543525be-6a09-4b65-8130-37b754027662	1	\N	Other
+54406bc6-5b07-4071-9ef3-595a6ce514c0	1	\N	Other
+5443c209-8954-4ef4-b4f2-76bc36ab708a	1	\N	Other
+54479e00-196c-4260-9c23-ea147a4af7fa	1	\N	Other
+5448abcf-82be-41fd-9222-4e964ce56321	1	\N	Other
+54498e12-377a-4fa0-977f-bd18718bbc07	1	\N	Other
+544a9c1d-dbb5-4144-9da3-74078840f24d	1	\N	Other
+544ea4a3-ee0e-48d3-bee6-dcd282dca2e1	1	\N	Other
+54552232-e719-4410-a49e-3715eaf02b6a	1	\N	Other
+545d6674-10fe-4603-94ae-51c152249f34	1	\N	Other
+545dc3c9-7bd1-4e37-888d-5e776f729ae4	1	James	Other
+546196f3-dc93-4f43-beeb-b07cbe003d37	1	\N	Other
+54641ac3-aac1-40da-98c6-262134920acc	1	James	Other
+5465c0de-806d-4140-8a09-2044e36660d1	1	\N	Other
+5465d5fd-87dd-4765-bf53-5987ab1e3ecb	1	James	Other
+5465fe20-0f76-46d2-9915-cb2a696e13d5	1	James	Other
+5466a4c0-2eb6-4619-bbeb-811ec9d95e34	1	\N	Other
+5469db0b-7bd3-4a8f-988a-0051b536e8f2	1	\N	Other
+54714da6-af9a-4168-a688-e20159aaa9c8	1	\N	Other
+5471e316-3e0c-4896-8a6f-b6d76bf7224e	1	\N	Other
+5474788b-f343-4074-ab30-c82359382343	1	\N	Other
+5476bf01-2754-4e78-bd97-a7d735bdfe9e	1	James	Other
+547866e0-429f-4317-baa7-e4a4cd3635e4	1	James	Other
+5479331e-2ef2-43e0-b5bd-f0b66a342d52	1	James	Other
+547badbc-49f1-49bd-b3bc-d83d75f7c6f7	1	James	Other
+547c0479-51d2-4e46-9684-5e78de816052	1	\N	Other
+547d990b-6ea0-4628-9bbf-fedbefdbbaee	1	\N	Other
+547e4799-1c79-4922-9026-79ff4a0b063a	1	James	Other
+547e64f9-c346-43a1-ac80-22f72921c38f	1	\N	Other
+547f845a-2867-4a69-8a5c-0e144b22a944	1	\N	Other
+5481408b-e423-4596-ac54-964c7fb6e217	1	\N	Other
+54815404-fc6b-44f9-b1c1-88b82ad0fd37	1	\N	Other
+5482fa07-4dc6-4732-a1c8-8458635637e6	1	\N	Other
+5488ba82-7a11-463f-87dc-e91e7f44199a	1	\N	Other
+548c9aca-f491-4e45-a136-0163f7f55dc3	1	\N	Other
+548df1ab-ba8f-45af-8a46-815c47f89ea0	1	James	Other
+54911d1f-96ac-4422-8fe9-cc8860c9022b	1	James	Other
+549bd7dc-e28a-44ee-af80-71cd04370f17	1	\N	Other
+549d0457-3caf-4e3b-907b-dba5eec14793	1	\N	Other
+54a1234b-677b-4f09-bda7-94194d7377d3	1	James	Other
+54ace7c6-0c89-4065-b9e1-9a852a75e059	1	\N	Other
+54b08537-d3de-4be6-b5b2-2b7e2b309066	1	James	Other
+54b33b2d-2860-4a3f-959d-e88424366d12	1	James	Other
+54b67135-9402-453d-a0f4-6abf7ffb3136	1	\N	Other
+54b6bcf1-d4a2-4eeb-ae4f-915fed53a34c	1	\N	Other
+54c0a367-7585-412e-ab2e-af79dc67c865	1	\N	Other
+54c54f73-899c-413a-9e28-950ccdcb7ac8	1	\N	Other
+54c9e064-e061-4735-85d7-f7b037e5b325	1	\N	Other
+54ccf9b3-4f97-4f0e-987e-ac0be03bc2d0	1	\N	Other
+54cda236-86d9-4ad9-918d-b7372c0c96cd	1	JAMES	Other
+54d23dd3-0c7b-4205-bb44-e3e7be5a1a4b	1	\N	Other
+54d81147-3ae6-4d66-9718-76d724575b75	1	\N	Other
+54e0189e-e631-42b0-8d56-0b54cad6a090	1	James	Other
+54e3a6c2-1897-4f1f-b44b-74518776a9ca	1	James	Other
+54e604e6-4311-43ca-ab87-60075258afe5	1	\N	Other
+54e6061e-f106-42e1-bffb-8d094c53b82a	1	James	Other
+54e657ab-41b8-4338-88c0-05b38f37ca16	1	\N	Other
+54f2bff7-bc97-4453-b3f7-9774f1939be9	1	\N	Other
+54f32c33-34d4-4ae1-9539-ade6a24d7458	1	\N	Other
+54f68e34-8cba-43a4-a7f2-2fe6b84f0cdb	1	\N	Other
+54fc0940-db55-4498-8c9f-d67b491ecfb8	1	\N	Other
+54fcf8ae-5f86-432f-807a-c6106f1277da	1	\N	Other
+5500d6d7-25c6-44c3-96b2-06feddba43c1	1	\N	Other
+55021ff8-5394-44cb-aaa2-3b946d5c7afb	1	\N	Other
+5502eaa2-3fac-4332-a107-8e5823b3f060	1	\N	Other
+55076d17-93ac-47e7-9165-17556287cd4f	1	\N	Other
+5507cf78-f476-4b1b-8a1e-a363b9f99c44	1	James	Other
+55095938-4a10-4072-93bd-83379313b896	1	James	Other
+5509d2eb-39dd-46f0-ac67-8c2c686544e1	1	\N	Other
+550afd06-050b-4513-a044-8f1b96dc4612	1	\N	Other
+55131473-aa59-4667-9267-1050a938e264	1	\N	Other
+55140e9b-e21e-4621-91e8-30632a2aecba	1	\N	Other
+5514564e-8d4e-4988-9973-4c579ebe29ad	1	\N	Other
+55183b17-cb86-420d-9381-5100da4620b5	1	\N	Other
+551cad2b-faaa-4765-92b8-10ecddba2077	1	\N	Other
+551d1ed4-0647-40b5-9bf1-e5b64fcdbca3	1	\N	Other
+552836ba-4faf-4a5c-b691-2878945349a5	1	\N	Other
+5528f61a-2ba1-4e80-842c-1ef60b4ca89b	1	\N	Other
+552c20e0-2832-40ff-93df-70d31730b45f	1	James	Other
+552cf18d-39c1-4b8d-a830-8c4915653e1d	1	\N	Other
+55327f08-ed18-4456-9606-193631375c86	1	\N	Other
+553310dc-c7cb-4b41-b4f2-fd95adccc808	1	\N	Other
+5534a860-3c79-4700-9be1-b4db398f5e75	1	\N	Other
+5539e255-7d67-4220-b74d-70c327ac2df9	1	\N	Other
+553aa350-f905-4f38-9ba0-a158cdc9b272	1	\N	Other
+553ba742-2f93-4d70-9277-c7dc8f469ec6	1	\N	Other
+553e171a-72a0-4a91-a524-7eab469f0ffe	1	James	Other
+553e7672-7fe4-4f4a-819b-255f1578d670	1	\N	Other
+55404130-d6dd-4f3e-bc76-94ace6f18954	1	\N	Other
+5540979c-86e7-47ab-aa0c-82f8db04a820	1	\N	Other
+55418a69-020d-4bad-a54f-f24fba8d0e4e	1	\N	Other
+554452a0-6ee9-46f5-861a-c42e113f2517	1	\N	Other
+5548d14a-5887-47af-be5b-d3a8be8205ff	1	\N	Other
+554a508a-a348-41ee-b546-d914c417a50a	1	James	Other
+5552d8a1-0afb-4613-836c-fed2eae1f3ab	1	\N	Other
+55536418-7432-4c6a-ba0d-dac5c9f658c2	1	\N	Other
+55565ac6-1135-4ea4-96a5-093ff2126467	1	\N	Other
+55573c0e-970c-4b32-9377-12fb53e8794c	1	James	Other
+5557a696-1b35-4049-99fc-826097d8fd03	1	\N	Other
+55584d04-fb7d-4f61-8f8a-760cc04e34f1	1	\N	Other
+55593544-0ece-49ff-91f0-8363c7a32c67	1	\N	Other
+555b976e-918e-4e17-bfcd-99433d5482aa	1	\N	Other
+555fba82-1d24-48c8-921c-58479e33b451	1	\N	Other
+5566fd51-00a7-49ab-b271-f0118707a7fe	1	\N	Other
+556c717b-13f3-4fc7-9390-3164b8ed1257	1	\N	Other
+55712902-7aba-45d1-91a6-a251293283e0	1	\N	Other
+55780dd4-3dd3-42a5-97b4-047b65d7b5e0	1	\N	Other
+557b5754-4d00-4413-aaaf-a8800f9c6054	1	James	Other
+557d6341-b98e-47f2-8706-ac866681be78	1	\N	Other
+557fa5fb-4049-4357-9977-3e4c0b6d00e9	1	\N	Other
+55874d44-e1ce-41d8-bfd2-41083ef90bf1	1	\N	Other
+558e806b-3af1-4adc-8f6e-c0e7a58d09fd	1	James	Other
+558f1e48-1023-493a-adf5-85e5817f8062	1	\N	Other
+559118a6-0638-11e8-b83b-fa163e8624cc	1	\N	Other
+55930793-d71e-4f80-aa37-3acd392a6cf6	1	\N	Other
+5594d1b6-a260-4dd1-a104-dfd69a472d43	1	\N	Other
+559646cf-7eb6-407d-bed1-60280167980c	1	\N	Other
+559652df-1d93-48db-ad57-bae2951950fd	1	\N	Other
+5598e340-bdc9-4909-a107-75d3f28ed24c	1	\N	Other
+559ac16c-0479-42f3-8064-c28fcd0ebbb4	1	\N	Other
+559b2104-5b69-41d6-9c16-de5971b4629a	1	James	Other
+559b85ed-5b24-4fea-84ed-676c10839e76	1	\N	Other
+559d0798-f1f3-4211-8e7d-cb554b247134	1	James	Other
+559f1422-f61e-430c-bb54-bc846043f00f	1	James	Other
+55a89983-d8e3-4ac5-8359-ae529afcbfb8	1	\N	Other
+55b69648-df82-4850-a3a7-ca484dc16901	1	\N	Other
+55bb9d03-874e-4163-ac08-b66dcb9243b1	1	\N	Other
+55bc8a32-ac60-4350-b930-229f24e2d304	1	James	Other
+55befd8d-a2af-4167-8dc6-c2da0a062c29	1	James	Other
+55c0c11c-982f-4dbc-93e4-0e22e19ebab1	1	\N	Other
+55c3793e-f2af-4cd9-9e6d-dde6ebc14906	1	James	Other
+55c5adc2-103b-4817-b416-047a628e8653	1	\N	Other
+55c77681-58cb-49f2-a5cc-a46b88c87723	1	\N	Other
+55c8d35e-0638-11e8-a7b0-fa163e8624cc	1	\N	Other
+55ca7d14-489c-4794-8027-3ec17e971aba	1	\N	Other
+55d1f9ee-55b7-401c-9a8b-2e215c2ed8f9	1	\N	Other
+55db7d72-369c-4342-aa7b-4f1d560c5e94	1	James	Other
+55e42dac-335a-448f-96ef-0a1ad9db360f	1	James	Other
+55e569be-28df-4b77-a094-3df2e5372933	1	\N	Other
+55e5efbe-f99e-452e-bf34-7c8a1bbea267	1	James	Other
+55e80d40-3e76-44dd-87ea-b26d07a0f868	1	\N	Other
+55e9490c-c219-40d3-8a52-74478bf31d45	1	\N	Other
+55ea82c0-97d9-4164-82bd-01842cb6fe98	1	\N	Other
+55ece6f5-9c73-4153-b90e-05502d0b8da1	1	\N	Other
+55ed5860-33df-4eca-affb-a84387ba6818	1	\N	Other
+55f18cb5-20a3-4dd6-a891-002ff499d755	1	James	Other
+55f7fba7-0ff8-4902-9d35-d3bff4ab766a	1	\N	Other
+55ff2804-bdaa-44cd-aa70-b0f4dfffae88	1	\N	Other
+56001d54-6fb5-46a8-9cd0-011039335b75	1	\N	Other
+560311af-b3e6-4237-a6f1-ad2c1ae48f73	1	\N	Other
+5603959a-63cb-4026-aa8e-0ad52ec0092c	1	\N	Other
+560c84cf-20b6-4742-985f-563a37ace7b0	1	James	Other
+56122b08-0948-43d5-b01e-f0ba264ccad7	1	\N	Other
+5615fb88-fecb-4984-b6c6-50b97d2ee7df	1	\N	Other
+56169df8-2c32-4a2f-8c19-eaf696eb81fd	1	\N	Other
+5618296b-61ff-4052-848f-552f03eaad15	1	\N	Other
+561b8bac-4df0-4f54-857f-39c2861333c0	1	\N	Other
+561d71e3-2183-4a24-a846-ff2ad24fcd64	1	\N	Other
+56250ab8-5801-46bb-93ac-372ed3736cf4	1	\N	Other
+5627b7ce-fdae-4ea7-9db8-20ad381898bf	1	\N	Other
+5627ef1c-8d47-44a7-8cf5-10561446a3da	1	\N	Other
+5628474b-7313-4902-a258-77e5ebbdd3c8	1	\N	Other
+56287b91-2919-49fa-b638-fffffabb19b2	1	\N	Other
+5628de6d-58ba-487d-aab5-fb2a0306e553	1	James	Other
+5629a156-2fbb-4d4c-93df-a5ef10fdea4f	1	\N	Other
+562bce8f-e1df-49eb-8eab-d5494f5fcd14	1	James	Other
+56310978-f018-402b-8709-0b16938ea256	1	James	Other
+56314c81-76f9-42bc-b3a5-359bde02aa35	1	James	Other
+56334385-e944-44ca-a10a-a8c4a1e512e4	1	\N	Other
+56344d59-c011-40d3-8386-b596a8e93db7	1	James	Other
+56367fb6-91ab-40aa-9b2d-61f2ddd3cb60	1	James	Other
+563a8762-7882-4f1a-a527-23767483942f	1	\N	Other
+563dd55e-db60-422d-a96e-f30e565e7eeb	1	James	Other
+563fcea0-e8d3-4d34-be39-f0c9413a9910	1	\N	Other
+5644149a-fb77-4580-bf0e-1c36d383fa0f	1	\N	Other
+56456a8d-d367-451f-b5f7-a4e0463788c3	1	James	Other
+56499596-c9bd-4841-85af-ebbc53002834	1	\N	Other
+5649c39b-4371-4840-9831-6e658202c0cb	1	\N	Other
+564cea38-bf98-42d3-affd-8d31ea6a83d5	1	\N	Other
+564e4345-06c6-4b50-8463-093e3fcf8e9d	1	\N	Other
+56543e6c-c643-498e-8b34-091b0e5bed13	1	\N	Other
+565bb4c2-5425-4619-9bbd-293651989f07	1	James	Other
+565cdd68-7174-4367-ad30-6681ef6a36a6	1	James	Other
+56624ce1-1acd-4234-b551-7de6393aa38e	1	James	Other
+56667b61-32ff-472c-b754-f0ccac681675	1	\N	Other
+56675fb1-e97c-4021-8171-b72a12442d6e	1	\N	Other
+566b00a7-b56c-4661-96db-490f6e3b7a13	1	James	Other
+566b1119-f870-4e1c-8ce9-2994e21974ab	1	\N	Other
+566e0c68-7e70-4199-83f5-83cef54a7049	1	\N	Other
+56736aa9-f6be-409f-ae7b-91967b9e3e2e	1	James	Other
+5674dbb5-17da-4685-953b-4592b3d4ada3	1	\N	Other
+567938d2-0cdf-4765-8bdc-0cf37b37631b	1	\N	Other
+567d58c8-b748-4968-98ec-402453cd0260	1	James	Other
+567fb33f-180d-466a-8c18-cd658d70d39d	1	\N	Other
+5682982d-92c2-4b25-adbe-15b0e63811e2	1	\N	Other
+5683bfa1-f2c1-4f99-b1b5-e9ea8c982067	1	\N	Other
+5683eca9-37de-4e52-8e98-2d755bf1d5b5	1	\N	Other
+56886629-41b8-457f-a64c-7b6a176ecfca	1	\N	Other
+56889fcc-39e6-4852-98dd-4726c2d2a71f	1	\N	Other
+568b8963-c272-4c16-bd04-2214b0eae036	1	\N	Other
+568cbce3-6576-4a93-904c-1a0ae1e04fed	1	\N	Other
+568d59b0-a179-42e0-9c0e-07b4feb609e1	1	\N	Other
+568d694c-1901-4949-b104-080ee8b0580b	1	James	Other
+56913687-5e03-4c3b-a5f9-eb2f051f2737	1	James	Other
+56918f75-91fa-40fb-8196-997fda6016b5	1	\N	Other
+56922c0a-71c9-4d13-a36f-cf4606ba5809	1	\N	Other
+56933d2e-de35-42fe-84eb-426ed9c4cbb8	1	\N	Other
+56939167-3aa2-465c-b222-49725f352b59	1	\N	Other
+569ccd3c-fbdd-4114-894a-1e18cfab91b8	1	\N	Other
+569f4623-9b82-4692-b9c8-1f7957b94a8b	1	James	Other
+56a2bc8c-ae30-47b5-be2a-9b4346686afe	1	\N	Other
+56a5c1e6-cfb2-4bca-9ac7-48d734cf31d7	1	\N	Other
+56a6c0a5-d617-42f2-84fe-a917cb6e8b16	1	James	Other
+56abfca9-a7af-4f56-8dfb-d40cebc0b7a3	1	\N	Other
+56af6864-1dbe-48bd-a36b-8028ddccbaf2	1	\N	Other
+56b04a87-76dd-4079-ac2a-d1712f2a594d	1	\N	Other
+56b2709b-cc44-446c-95a6-28d96c3c2056	1	\N	Other
+56b4559d-f31e-4c8f-9376-ff901feb63f5	1	\N	Other
+56b4c5fa-f84f-4daf-95bd-fe9a9136aaf0	1	James	Other
+56b61aae-620d-4446-847e-7714e5b7224f	1	James	Other
+56bc582d-ca9f-4212-874a-d8ee7463ee39	1	\N	Other
+56be5035-7d29-4022-8a64-033c32f5eca7	1	\N	Other
+56c43ae4-3de0-499a-9bc1-5f9462d1d76d	1	James	Other
+56c63a70-9122-4ba3-af25-54e38c4c4eff	1	\N	Other
+56c9d083-1ec3-4ab9-aa24-a0301d2f4120	1	\N	Other
+56cb36dc-3990-4d48-ba35-59f1b3776712	1	James	Other
+56d6309e-b07b-41ba-bf2d-a2e7e3df8cfa	1	James	Other
+56dc0565-b351-4060-a8cc-63985b15aa43	1	James	Other
+56dca62a-11e8-434a-af63-5e3570261961	1	\N	Other
+56e0a33e-6b67-476f-be28-5968abcad3f1	1	\N	Other
+56e0fa89-647e-4fcd-b205-b55648048531	1	\N	Other
+56e8b883-dd64-4fd1-82e2-68f3b232f732	1	James	Other
+56e96925-0982-4283-ae41-a45ea29cd862	1	\N	Other
+56e9d072-459c-47a6-80fd-9261929fd6ff	1	\N	Other
+56ec34c4-836d-4dd3-a8bb-8f4990744034	1	James	Other
+56f31ead-a1eb-454e-b0a4-22d528bb4f37	1	\N	Other
+56f6cdf1-b61d-4317-af76-f61304441086	1	James	Other
+56f74337-5209-41ce-bcae-1f8a6098d0df	1	\N	Other
+56f8fb6c-549c-49cd-8c1c-fec3c6b795a3	1	\N	Other
+56fa1f76-cc76-474f-a210-2493c1a3970d	1	\N	Other
+56fc50d7-a4f3-4ce7-b0f7-b014d4c8c738	1	\N	Other
+56feb7f7-bb0f-46f0-afa3-12ffdc17c2de	1	\N	Other
+5700acd8-87e8-4354-bf4f-bd2d44a28ff3	1	\N	Other
+57023232-4f82-4bc8-8e93-7638f085c47c	1	James	Other
+5704d29e-f181-4029-ae85-63c3dbafc98b	1	\N	Other
+57084f06-95e4-4a93-b2cb-477de7d8c987	1	\N	Other
+57091f72-ed07-49d7-bfc4-7d0e63890f24	1	James	Other
+570f26bb-ce56-4093-aec2-4b4393f35236	1	\N	Other
+570f70ae-e37e-4291-8445-f4f954227d38	1	James	Other
+5716c0a0-88cc-4d87-9fe1-df68149c2f2c	1	\N	Other
+571c3b42-39a8-44f6-b7ac-e6ff31e66d88	1	\N	Other
+571ca9f6-e031-4f72-927b-cb3b89fa67c2	1	\N	Other
+571efddf-be59-4600-9d31-5c19ed7d52cb	1	James	Other
+571fc90f-cffc-45a6-a8cb-b2f108c25dda	1	\N	Other
+57201c3e-c671-4fae-ba2d-5180a2b0a818	1	\N	Other
+57215304-1f9c-410f-a1a2-ba6fe784e3e7	1	\N	Other
+57228d3a-4e90-4dd5-aeb8-4dc24ef2eff9	1	\N	Other
+57264c1a-e2ea-4b92-b6cc-94ebfc03d3e5	1	\N	Other
+572bbede-61ed-4957-9109-d14e8dbb60d8	1	\N	Other
+5735764b-1d6c-40d7-94a7-aaa59863c617	1	James	Other
+57370fc9-d412-4a68-b88a-b5663ecb940f	1	\N	Other
+573ecf7f-f1a1-446b-a6ae-dea2c17e8d35	1	\N	Other
+57404576-a105-44d6-8aba-80c21f5034f2	1	\N	Other
+5746be19-e1bc-4e00-b06d-2f245a10510e	1	James	Other
+574754a9-49e7-4795-aa22-233908531a87	1	\N	Other
+574fca6b-2446-467b-99da-566152c28067	1	James	Other
+575081ad-39f4-42c0-8927-922a8072ea8f	1	\N	Other
+57510ef9-0c53-45e4-b5c6-35796c9fec90	1	\N	Other
+575668a7-974a-431c-b723-586910e804eb	1	James	Other
+5757f8e0-b868-4a29-af39-73c2d05151c7	1	\N	Other
+57584a80-8c1b-472a-ba32-5d4ea79599a0	1	James	Other
+575d7f53-6422-4422-bbc3-83fc842b9e0f	1	\N	Other
+5762d6af-6894-4923-a2dd-b9cefbfcce67	1	James	Other
+57656fd2-1e5d-4ec5-959d-0b5555601316	1	\N	Other
+5766236e-a45f-4cdf-b182-2b0dfa425b91	1	\N	Other
+57665d75-98d5-4675-b2db-f6aaa9224999	1	\N	Other
+5767a9df-efcc-4cb0-907b-dbb467c81d1e	1	James	Other
+576aeafc-75b8-408a-b83a-0d6269730b63	1	\N	Other
+576c2ece-ab4d-4f0b-ba59-a64d1ef1ce4a	1	\N	Other
+576fa322-2973-4c56-b52a-a5c79d790655	1	James	Other
+57746289-ccd8-4f18-9567-a2e3ddf62c0a	1	\N	Other
+5776e4bf-622b-4b40-b6f0-e45c0a224004	1	\N	Other
+57775304-6ac3-4713-b6a8-31e3b7228161	1	\N	Other
+577a6945-8dbd-4bed-9732-eba581f2270f	1	\N	Other
+577b5fd3-ddd6-4796-badf-031b32f4e75e	1	\N	Other
+577b9f0e-00ae-46f1-8590-d50114e13457	1	\N	Other
+577cd78c-9bc5-4205-b195-9536f0244b80	1	\N	Other
+5783cb88-10ef-4ab8-a217-41210825e745	1	\N	Other
+5783d516-6b77-416e-ac6a-5502d2309f49	1	\N	Other
+578e7426-065a-4e94-8bbf-092d6afbe0a1	1	\N	Other
+5790bba9-afe0-47ab-b7de-5a00e42d4d8c	1	\N	Other
+579a05fc-1a36-4be7-b7de-87c84af037f2	1	\N	Other
+579cb72e-1ff8-4fcf-b9fe-c9876d41e7bd	1	James	Other
+579cccc4-5092-43f2-b723-060b9fcf3db8	1	\N	Other
+579f643b-5a1c-442d-a43a-8913541c2b6b	1	James	Other
+57a06dab-160f-4766-b82e-27c05f0573b6	1	James	Other
+57a0d2e5-18c0-437e-86a8-e1fd6a7f3592	1	\N	Other
+57a22c1b-b9a6-401f-9cc1-76a992757d4f	1	James	Other
+57a318d5-de24-4245-81a8-77a6ad7e1859	1	\N	Other
+57a639c5-54ad-4710-b5da-b81efcae1a3f	1	James	Other
+57a732d2-3e55-4be9-bf81-e7e4c7932e69	1	\N	Other
+57a7907b-af77-4620-8ae7-4df3d773ac36	1	\N	Other
+57b50066-2c34-423d-944a-3bec05678714	1	James	Other
+57b6fc45-9b66-4405-9e01-362c5190c941	1	\N	Other
+57b9f818-1832-47ee-a7fb-a6ae2541915f	1	\N	Other
+57ba25e3-e170-4425-a50d-4e2f85927ad7	1	\N	Other
+57baa32a-2ef3-492a-8d1c-2ead51d5dffd	1	\N	Other
+57bb3f13-8a29-4b9a-9760-71f89d36a6c0	1	\N	Other
+57bc9ec8-0362-40c2-9f03-225780995a0f	1	James	Other
+57bf5502-9d10-4c72-a2dc-4dd08d9ed83a	1	James	Other
+57c48f87-4f24-4337-b8f8-7f518c98db28	1	\N	Other
+57c60728-730c-4a77-bab8-3d0b2a39ac48	1	\N	Other
+57c6632c-0266-4d1a-b38c-3661f9a0a9df	1	James	Other
+57c80d37-1b2c-4e99-b633-a9b572a8e0a5	1	\N	Other
+57ca7e20-a47b-40e6-94bc-aafc10c14122	1	\N	Other
+57cace1c-fc76-4680-b798-24e8e5ab946d	1	\N	Other
+57cffcbb-b6ba-43b8-9561-043a20cb7913	1	\N	Other
+57d05875-ffca-4264-8457-36d161b9014c	1	\N	Other
+57d75e6b-fcf4-4290-a3f2-93378408e3a8	1	James	Other
+57da8064-8ce5-462a-ab80-eef06b6dc874	1	James	Other
+57dcdb60-4087-42ab-ad7d-bdbc1900ee56	1	\N	Other
+57ddff27-6278-48a4-9249-aac786525a4e	1	\N	Other
+57e47fbe-267a-11e8-ae61-fa163e8624cc	1	\N	Other
+57e507c2-32cd-4e8d-b483-1a03d672585d	1	\N	Other
+57e6345c-2b2b-11e8-9868-fa163e8624cc	1	\N	Other
+57e67a87-a61b-4b55-bc79-a69c14324af2	1	James	Other
+57e68870-72d5-4b9f-8d09-4eba03bd8b78	1	\N	Other
+57e6bd3d-4ebb-482c-b601-f79aa1a30ff7	1	\N	Other
+57e73eda-229b-11e8-9567-fa163e8624cc	1	\N	Other
+57ee77a8-4378-4fa7-b16b-0f4eb5330bed	1	\N	Other
+57ef7e48-3145-49bf-8f19-9529ad3fe5a0	1	James	Other
+57f496ea-e728-45f0-9f39-4d0215d11982	1	\N	Other
+57fcdc9b-ae50-4d35-841f-5909b4943b9d	1	James	Other
+58068296-66d5-4885-962b-9e080a781231	1	James	Other
+580d5bb5-ae54-4aed-8cb1-51297cc73195	1	James	Other
+5810b4a7-347e-4b95-a614-31627b60f994	1	\N	Other
+581226e3-6539-46f9-97ca-a6307e2f5fa8	1	\N	Other
+58128f7d-99a8-43ea-8346-22f956bedc21	1	James	Other
+5813b80c-c933-46d8-8c1b-ed9a06c7419a	1	\N	Other
+5817d752-229b-11e8-b9cf-fa163e8624cc	1	\N	Other
+581a445f-566f-4c1f-ac96-ae26875aba56	1	James	Other
+581ab0b3-ba3e-4c48-8c11-44389b2d9147	1	\N	Other
+581ea337-77a4-4779-9843-dabc0ad3247d	1	\N	Other
+581ee7e8-4890-4464-a985-ab269afe3bce	1	\N	Other
+5823b8a2-8d03-44cc-a647-2d9c4760f4ef	1	\N	Other
+5825f917-ec00-4755-a137-763346210dab	1	\N	Other
+582ef3eb-07de-44df-b93e-f6377bc4fe7a	1	\N	Other
+5830ffc1-6628-4d77-9f6d-372142fd5fa3	1	\N	Other
+5834d219-a88d-4f19-a2cc-4ca8c2eedaa0	1	\N	Other
+58379b70-ebb0-4d66-9e29-c1c5f5f086b4	1	\N	Other
+58395f01-9942-42f2-a7ce-103348f3e27e	1	\N	Other
+583965d4-49da-4700-b2dc-77397d4ac658	1	\N	Other
+583af07d-1267-4957-acc5-25bbdca8164f	1	\N	Other
+583d0a3a-a410-424f-ae10-bc3d3be6e5db	1	\N	Other
+583f7170-b86b-4923-abd2-d5989b3e01e2	1	James	Other
+58439115-7c04-4318-ab41-e44fbc32f38e	1	\N	Other
+58458f0c-7a16-41ec-a5b4-7dba1ff8c025	1	\N	Other
+5846cecb-db67-4a0d-b4d7-58188b22e896	1	\N	Other
+58472478-3d95-4d52-96fe-eb4ba21dc283	1	\N	Other
+5848011f-4448-479c-b330-13eb2365a09c	1	\N	Other
+584ac489-eb55-4324-9530-2551a1bd6fc9	1	\N	Other
+584b50c4-7980-46ba-a46c-1ee28d869898	1	\N	Other
+58503160-1190-4291-9b9c-56f2850019b9	1	\N	Other
+5854bb8f-07d8-4375-82be-92c667d72445	1	James	Other
+585b1643-c156-491e-9141-51e0a010ec10	1	\N	Other
+585e7ed7-4c52-4085-933f-c51e26347149	1	James	Other
+58633815-71bc-4e32-be6a-fbb03c78c887	1	\N	Other
+586463d6-6590-462b-b7e3-fd03f59d2468	1	\N	Other
+586524d7-8822-4c7c-8b12-4cf340d21851	1	James	Other
+58668e87-6093-4f5f-9fc4-969d5e0095b0	1	James	Other
+5866b17b-65e2-4e1f-a830-a302eec345c5	1	\N	Other
+58699f7b-1da5-4f34-9723-40c4c7faf655	1	\N	Other
+586b9189-826a-434b-9ef5-0751a59ce75f	1	\N	Other
+586e92f3-dd7d-4755-a1a7-91144dbdeb48	1	\N	Other
+586eb877-b1ff-4898-ba85-596ca189ba75	1	James	Other
+5872f2e9-7b2f-43eb-8cb0-fe54ef51dd9f	1	\N	Other
+5873d1bf-d734-4f96-a399-0b507e3080e7	1	\N	Other
+58741806-8254-414e-8890-a3312dfbafcd	1	\N	Other
+587516ee-116b-4bf6-afba-f1adc31602e5	1	\N	Other
+5878d5f7-f071-47aa-aadc-d34481585ca5	1	James	Other
+587943f4-50f5-4e97-9b84-ce69abf980e8	1	\N	Other
+587986f0-96f1-47ca-a27e-6745e1183324	1	James	Other
+587a3a95-5ab0-4bec-b35e-1c19b12e726f	1	\N	Other
+587b2cb6-267a-11e8-99ab-fa163e8624cc	1	\N	Other
+588027fb-0deb-4523-b0e9-b321c9b098aa	1	\N	Other
+58828e65-f710-4e99-b5f3-d771ac6847ed	1	\N	Other
+58854031-6287-4e34-ad8c-4f3e4272c9db	1	\N	Other
+5887e410-2375-4483-bebf-965999740bfd	1	\N	Other
+58883823-20ce-457d-b0e5-d2b4e0ababc6	1	\N	Other
+58886c6d-2075-4927-a9b1-11f2b8db78fd	1	\N	Other
+5889deae-2e42-4de7-87d9-d431115860df	1	\N	Other
+588e7ede-229b-11e8-a432-fa163e8624cc	1	\N	Other
+588f74bc-9b19-4e07-90f9-f794a87f3244	1	James	Other
+58980d86-274b-4d6d-bd6f-847f57e115cc	1	\N	Other
+58994cf4-a47f-44f6-8f40-3a0f26feac71	1	\N	Other
+589a5a58-27cd-4921-812d-4951ac3d79a6	1	\N	Other
+589a7e21-ab59-473a-a85e-466b8a0cdc73	1	James	Other
+589b5387-53fa-4d9f-abf2-4b274945838b	1	James	Other
+589bc305-7637-4c27-9463-40dab6bb270b	1	\N	Other
+589bebf7-03a9-4a26-94ee-f1e70c35da4b	1	\N	Other
+589e7ce7-3d50-4697-886f-6c26e65247fc	1	\N	Other
+589e8499-de06-4b68-88cd-27d5e11b38f2	1	\N	Other
+589fd37f-b871-4ed7-b3f3-afd254f2311f	1	James	Other
+58a0073c-8183-45cd-8f6a-b9b0c6f8be4b	1	\N	Other
+58a27996-0517-4111-acdf-6ad92baef192	1	James	Other
+58b6828a-ddcd-41ba-bc22-e24e66320c25	1	\N	Other
+58b738a6-1647-450a-b8b9-3d7674860671	1	\N	Other
+58b7db26-229b-11e8-9f95-fa163e8624cc	1	\N	Other
+58b7f5e9-d730-41a2-8e3e-e863ab873eb3	1	James	Other
+58b8d561-9667-4e35-9ced-f3f38ce5dcd7	1	\N	Other
+58bae1a7-cb5d-4aab-95ff-30be9d0746b7	1	\N	Other
+58bdde00-07f3-4873-9340-af9f163fbd8f	1	\N	Other
+58c4a24e-2fb3-4b7c-8e90-b29083ebdc52	1	\N	Other
+58c55843-4650-426b-bb32-d5f6ad917944	1	James	Other
+58c6e0b2-1b20-4d0e-a049-5f447fd50555	1	\N	Other
+58ca6bee-9e23-4600-aeb8-5ee0e5ffe331	1	\N	Other
+58cdca15-c052-4adf-9bd2-e21d2a6ec1c8	1	\N	Other
+58d9c2de-a3df-4a05-a97f-4304eea3e2d5	1	James	Other
+58dbcdbe-21d9-40a7-b028-d8fea5cef2a7	1	\N	Other
+58e34e2f-e1f9-4d50-8485-ec710380beb3	1	\N	Other
+58e616cd-d50a-428a-92ba-4770529d097e	1	\N	Other
+58e79180-7359-4c14-abf8-2e8441267357	1	\N	Other
+58e8a29f-d2da-4564-aa39-c26e0cf290b3	1	\N	Other
+58ee1b8f-82e8-43d7-a5ca-78a170e4b82d	1	\N	Other
+58f2ce22-0518-4d7b-b276-c37c79f1bc1e	1	James	Other
+58f60581-e9be-408f-93d2-4644998a6f89	1	\N	Other
+58f61cd4-643a-4a17-a556-643bfb1fee93	1	\N	Other
+58f66d8e-8f43-4227-8731-5efcb599ed48	1	\N	Other
+58f67208-cf3c-4f9e-ae13-95cb426791bc	1	James	Other
+58f7b8ef-0a9e-40ca-8a03-dbdc32f0f547	1	\N	Other
+58fa5a78-7404-4a21-ba9d-ac4cf7372fa0	1	James	Other
+58fa7893-c01f-401d-8f8b-8c0a726ef778	1	James	Other
+58fa7e6b-9251-4f91-886c-6e27ddb98fc4	1	\N	Other
+58fc2e52-2055-40ba-ae85-ba42b28f1067	1	\N	Other
+58fcb59e-9bb4-40d3-9610-4c021a6cb587	1	\N	Other
+58ff4f8c-7f1a-4eca-b798-df9a0942cce9	1	James	Other
+590636b6-010b-435f-a1f9-c4a90dd413da	1	\N	Other
+59096877-046d-4442-b2c7-3f9e5de7f224	1	\N	Other
+590d2150-01af-41a3-a464-74c523d8ab32	1	\N	Other
+590f7274-afdc-4cb0-ad4c-54ad83c3a06e	1	\N	Other
+59130840-d438-4763-97b5-4f1008233aae	1	\N	Other
+5914ae0b-0c2d-4475-a9fe-3c88cf6bda4b	1	\N	Other
+59159fed-674f-437a-a3ca-b0cc3b5796ff	1	\N	Other
+5919e9a7-3394-496a-9772-f54d240ab16f	1	\N	Other
+591c4a80-54fc-41c2-aefc-e213d751790e	1	\N	Other
+591f14ac-940c-4cad-b098-1bd5c836f7bc	1	\N	Other
+59211808-3332-426a-9e2d-1bd11ddd727a	1	James	Other
+5929d83e-c96c-43f5-bd55-6afa2bcc5ccc	1	\N	Other
+592d85ed-f5bd-47fc-b8ff-5b56bf26a76d	1	\N	Other
+593064d1-538c-4eb6-99a6-0dd546d611e1	1	\N	Other
+5933d397-f289-4d3b-a5d9-55dc074f7342	1	James	Other
+5936becf-d893-4adf-8577-0b0b98f0fa32	1	\N	Other
+593dfdb0-993a-49ac-99cd-cb1868091b31	1	\N	Other
+593e5861-1bd4-464a-a941-f9264da0e9eb	1	James	Other
+593eae42-f38a-4c82-9800-325731783941	1	\N	Other
+5942aef5-2340-4d9c-9488-cdfcf4b50b53	1	\N	Other
+5948976d-66af-4b0f-9947-6db9df09746a	1	\N	Other
+5948b7f8-3e27-4762-b22b-804267a74c0d	1	\N	Other
+594cbabf-25f3-4f60-aa6d-df1a2e2ef868	1	\N	Other
+594d7007-3add-429d-a37e-0c722f50389b	1	\N	Other
+594f4a15-d15d-47db-b59c-94bb7204929e	1	James	Other
+595008ec-7899-4c86-bd45-0e8244f117c5	1	\N	Other
+5950cd08-30c2-4fdb-9c15-83f98e88104d	1	\N	Other
+59510a65-f09f-46ba-8150-a05059255f80	1	\N	Other
+59533ace-2b2b-11e8-aa5e-fa163e8624cc	1	\N	Other
+5955956e-b2fc-4c84-a904-f6f2e0b015c2	1	\N	Other
+595b9488-01cc-41cf-959d-c59b6a221427	1	James	Other
+595ce70d-7532-45ab-bdd1-f6aeb80f0324	1	\N	Other
+595ce8b0-c463-480c-94b5-777cce4d5938	1	\N	Other
+595e57ab-bd32-4285-875a-209fb0d39a3a	1	James	Other
+5961c346-fa36-4b39-a223-d7ad76d6741a	1	\N	Other
+5963b343-e89c-48cb-ac2d-dbcd4db97bb3	1	\N	Other
+596607a6-44c5-43ea-bb38-a313c053a0f9	1	\N	Other
+59689e0c-7668-4bf2-9c72-78259f668d21	1	James	Other
+596a5ba0-efb8-4f61-9fb2-f11eb7a0feac	1	James	Other
+596b0dcd-c36e-4a95-b88d-c30097b31fb8	1	James	Other
+596dbbcf-0b22-46b4-9050-0ecf53a29dc8	1	\N	Other
+596fd228-10ce-49b1-b15a-0bac120c6cda	1	James	Other
+59787b3f-f685-46f9-9f44-a7d223deda79	1	James	Other
+5979bf20-eacb-4226-adb7-f0fd47886d02	1	\N	Other
+597b8523-2b90-4672-a7c3-f1b3cb09c67d	1	James	Other
+597d69f4-2684-40ed-a03a-189eb8578e1f	1	\N	Other
+597d9e8c-2450-4cad-9d05-b39e4c4cddc0	1	James	Other
+59810f43-7418-4f88-89ce-23970de9b91a	1	\N	Other
+5982df38-23aa-4844-b8a0-ce2bef108798	1	\N	Other
+598444c1-a2c2-4e9b-a8a5-ec51ece6c218	1	\N	Other
+598569ff-e1e8-4440-88ee-06b909617129	1	\N	Other
+598821cb-709c-42fb-b9ec-c3c7d849d190	1	\N	Other
+59907540-5ac3-48d7-9854-019f0495068f	1	\N	Other
+599393e4-d63c-4cdb-9de3-8d07f9704eb2	1	\N	Other
+5993bfa1-ef55-4324-a177-aa7525295e62	1	\N	Other
+59982974-8aea-4dfc-bbef-a896f31beb78	1	James	Other
+599c258b-0149-4e09-8bc0-9d778720b6ae	1	James	Other
+599db9c4-6d97-486f-ad9b-980219be3517	1	James	Other
+599f25bc-1bf9-4e08-8fcd-f26d0fa80bf7	1	\N	Other
+59aafbaa-215b-41d9-888f-92f8347e1c20	1	\N	Other
+59acb18b-a618-4049-b4a4-33adf0ed9085	1	James	Other
+59ad1276-f21e-49af-9947-c11a43905b06	1	\N	Other
+59ad3177-764e-4447-bc85-0ea7d0f9a61d	1	James	Other
+59af6702-92fe-429b-999a-4e50c0d0b273	1	James	Other
+59afccfb-5082-46f4-a1fa-a16a4b6819a4	1	James	Other
+59b2d039-89de-496f-9503-291408268155	1	\N	Other
+59b771ed-0633-44ef-816b-0cf1586396b0	1	\N	Other
+59ba66ca-3c99-464b-a108-32090d1a7e41	1	\N	Other
+59bd5501-d2f1-4d3f-bc40-7af25e4b3d65	1	\N	Other
+59bd7d8f-4df8-44e2-b58e-bb7ff023ea7b	1	\N	Other
+59cca9cc-3b12-405e-808e-25be0fff5bad	1	James	Other
+59d20938-d14b-49c1-91cc-0ecaad36d006	1	James	Other
+59d4d050-6794-4dca-853c-56f6d2af3a1d	1	\N	Other
+59d54e03-2586-4e8f-ae02-205750711f9b	1	James	Other
+59d7ba40-758b-4747-80d8-056b5604c6e9	1	James	Other
+59dbc863-1adc-4a36-a5a1-45e69600e7f9	1	\N	Other
+59e39bdd-51b8-43f1-a2c9-a9da2bb508a4	1	\N	Other
+59ec6b5c-c8d4-409e-9d9d-0bb10091e2ba	1	James	Other
+59f1b271-650b-4d66-bca4-56c22a494489	1	James	Other
+59f5f1b9-6a8f-416d-8669-784259f7bb7a	1	\N	Other
+5a00f0b1-c2d6-4b6e-96ef-a3af39edbb1e	1	James	Other
+5a0890f1-03ea-4128-b093-579def1d6773	1	\N	Other
+5a0c4d49-606b-4d08-a341-da67656e4456	1	\N	Other
+5a0cdf25-2932-4ce6-8af8-79b01e1c9b8d	1	\N	Other
+5a0dac67-48e9-432c-aa80-447d05d0cae4	1	\N	Other
+5a0f2aa1-98f7-4065-9f73-b31ddcfdbfae	1	\N	Other
+5a0fd748-84c4-4a26-aae6-6da19bcbb9d6	1	\N	Other
+5a147aaa-deea-4644-9c2b-23f37f780269	1	\N	Other
+5a151cb1-72aa-4471-ac25-728da69049bb	1	\N	Other
+5a15b608-0962-431f-90f7-0c7992780dec	1	James	Other
+5a177fc0-f57c-4913-ad1d-c4d4c6351abb	1	\N	Other
+5a1c02aa-acaf-4ba0-adf4-4467be1645b9	1	\N	Other
+5a1d9a0d-7b74-4914-b7b2-3ae45abeb9a1	1	\N	Other
+5a23f772-f4c5-46ce-84b2-de7bbbb4f1cf	1	\N	Other
+5a2688a5-a1fc-4282-90f0-1e4834c565d2	1	\N	Other
+5a2769e2-2eb6-4680-8766-33a8ad1fef68	1	\N	Other
+5a296206-962d-47f8-bd85-30b49f84e617	1	\N	Other
+5a2c64e4-7f2e-4b80-97b3-138102d41eb5	1	\N	Other
+5a2eda30-92ad-4dfe-839a-bafcb1ae554d	1	James	Other
+5a301348-2056-4be4-a62b-f1f17f5e15d3	1	\N	Other
+5a3087b7-2e59-4989-9a32-4503a93635f0	1	\N	Other
+5a312e69-1a79-4b33-872c-b60d0e6a41e7	1	\N	Other
+5a3b99a8-84dc-410c-b900-104e4e211b6d	1	James	Other
+5a3c5ffd-acc2-4430-a297-78dcd6042876	1	\N	Other
+5a44fe83-b231-43b0-a86e-8c977e02ff4d	1	\N	Other
+5a4715bb-981d-4ea0-9f4b-089eae6ca148	1	James	Other
+5a4bf369-5710-4db8-89fd-afcd3507e8e7	1	\N	Other
+5a4c07ce-42a7-4f63-9e9d-a506f240cb4a	1	James	Other
+5a4dc7c3-ad67-4ffd-9e76-1ca334aed97e	1	\N	Other
+5a4e330a-cae8-43d9-b4cf-943adf8418b3	1	\N	Other
+5a4f5b70-ba66-4799-8175-7c0446f5be4b	1	\N	Other
+5a50d2ff-0f73-40b5-920a-067b369a6c50	1	\N	Other
+5a535162-e190-4725-b7db-18618ae6e733	1	\N	Other
+5a576517-75f5-43bd-b02f-9cbbf0804bec	1	\N	Other
+5a58cccc-ee99-450c-b8d8-5add5f3bf38c	1	James	Other
+5a58f29d-fda1-4466-8549-6c1d57e1f3a6	1	\N	Other
+5a59dc89-92b2-45b1-ad17-87fdd8be2a9d	1	James	Other
+5a5be683-887b-4a38-b552-a66b4d8889be	1	\N	Other
+5a628b69-1509-4971-9a24-324daf067d23	1	James	Other
+5a649cbf-05ac-4118-a652-16d8c937673a	1	\N	Other
+5a654f3e-afea-46eb-a17f-7527e3a1df61	1	James	Other
+5a6ae83d-cbcc-44cc-9970-b78d3e202dbb	1	James	Other
+5a6d274f-a468-4b3f-b2f8-e4851b1e9cdb	1	\N	Other
+5a6f9bb1-f12f-4461-8f5f-b10e1204f7ca	1	James	Other
+5a704a8e-08d2-4a6d-84b2-854c7c565b0c	1	James	Other
+5a71c83a-d1f2-4576-ae79-c35c175d5b39	1	\N	Other
+5a73c7b6-9a9b-4fbc-a724-b800e18ea1d0	1	\N	Other
+5a757580-291b-46a7-85b1-f98e6feb98f9	1	\N	Other
+5a75bbe2-c248-4311-858c-a50db47beff1	1	\N	Other
+5a7b1e5a-a223-4b61-9392-de69b0e9174b	1	\N	Other
+5a85ed41-01b6-4860-a315-18a28ae43fc8	1	James	Other
+5a8627e1-fe2b-4c3d-806e-3ba07011af0d	1	\N	Other
+5a86cb69-0e93-4da7-96e8-1dc525fb790e	1	\N	Other
+5a8ab068-e80e-46fd-b475-07845cb53506	1	\N	Other
+5a8d0f95-ade0-43c2-bc0b-e4cd2d39c091	1	\N	Other
+5a925b91-1ee8-41d3-8faa-c076ce9b54a2	1	James	Other
+5a92c29d-7601-4029-b85a-a89308ebb4f0	1	\N	Other
+5a931796-ed73-43a7-b427-5d2f3a78b279	1	\N	Other
+5a9623c8-3af6-4ec1-872e-991a968f06ce	1	James	Other
+5a9b9c5e-1728-454d-878c-4b105c274bf4	1	\N	Other
+5a9e1a84-6b38-4f8b-9d44-bbdfd28d79f4	1	James	Other
+5a9ffc9f-521f-4d85-b236-7428d5a9c534	1	James	Other
+5aa071c0-3e88-4048-8ff3-5b30a0fcd85e	1	James	Other
+5aa5bc04-76ca-4f3f-be5a-e40e668bff4e	1	James	Other
+5ab06b14-ff46-46a0-be52-3651d147ae05	1	\N	Other
+5ab0d271-a73a-4d5d-89b3-efa4dc21e823	1	\N	Other
+5ab1456b-7b7b-4521-8ec7-db49511144af	1	James	Other
+5ab32e76-b55c-4ca0-bddf-3fbb4d0a037b	1	\N	Other
+5ab46698-76ed-4f26-a906-76cfcccd76f0	1	\N	Other
+5ab59852-8cf7-46a0-ae8a-54d88b617b2b	1	James	Other
+5ab64ada-55be-41fb-a1e4-bf4a3e838a84	1	\N	Other
+5ab734d7-5561-4af6-8afc-f9a754f4ec3c	1	\N	Other
+5ab906ba-66b1-4714-b0ad-840aebac254d	1	\N	Other
+5aba3aa4-6e72-4e67-ae6a-d14990461d09	1	\N	Other
+5ac4c35f-955e-4643-8add-973b92015384	1	\N	Other
+5ac8cd5d-6b64-41d4-b7cb-82291d3fd9b9	1	\N	Other
+5aca975b-b3ac-4779-b4fc-6be81039627a	1	\N	Other
+5acc99eb-db37-414f-96aa-fab339171cc8	1	\N	Other
+5acf2a85-bb2b-4ad0-b627-42724825e0cd	1	\N	Other
+5ad77a8d-d181-448d-a39d-922791acb959	1	James	Other
+5adb532c-b086-42b6-aa61-26ddd83c57bb	1	\N	Other
+5ae0bd81-3654-4f47-a841-6d7bb4befeaf	1	James	Other
+5ae30a68-3d00-4a51-bfe3-ab9777e4a84b	1	\N	Other
+5aed7d2f-179f-40e5-a4fd-3ec90f01e08d	1	James	Other
+5af7788e-0293-4bf9-8dfc-776e7afcdb57	1	\N	Other
+5af7a75f-436c-4f33-8544-f515693dae1d	1	\N	Other
+5afa9e61-ef3c-4552-8152-aea7f3c6ff2f	1	\N	Other
+5afaab64-cd7d-493c-a2ed-c1b6887366d3	1	James	Other
+5afb7446-6f73-4618-b43e-7b462787eb32	1	\N	Other
+5afcba32-fe7b-48bc-9c96-a78658c4b104	1	\N	Other
+5afd2c78-dd44-4b3e-822f-0d04dba1513f	1	\N	Other
+5affc21d-2193-4d14-9ae7-e1732a74f522	1	\N	Other
+5b03b209-ccda-4da3-bb68-6ab7a25b0f91	1	\N	Other
+5b07ac97-0d71-4b7e-a155-3a5d3108ff2b	1	James	Other
+5b07df2f-5d5a-4ad7-8cca-b75e3ed6d4d3	1	\N	Other
+5b0911aa-1fcb-4a63-b10a-a76ed6ee417e	1	\N	Other
+5b098a80-45c0-4e43-b3c3-3a3a0a53d2db	1	James	Other
+5b09ac8a-0f3c-4fe9-8dc4-658b0f1106c6	1	\N	Other
+5b0d8318-36af-4725-aae3-59b082e7bda4	1	James	Other
+5b0e3622-6ab9-4bd6-9140-268b2f14a49d	1	\N	Other
+5b10b9b5-5731-4027-8c3d-543313e1b5b2	1	\N	Other
+5b11974a-5626-4e92-a4a5-51b0ef9493a2	1	\N	Other
+5b191875-5dde-470f-b5ec-dc018d0f3ffe	1	\N	Other
+5b19911a-efcb-4d0b-ba99-2e41b5ba56ce	1	\N	Other
+5b1afd4b-5174-4c1c-8ab5-52d622f95d8a	1	\N	Other
+5b20012d-38ad-4f90-8fa4-9135f52582bf	1	\N	Other
+5b22182c-57a4-4ed9-804d-58c96d2eed3e	1	\N	Other
+5b223dd3-90a4-43f6-bfd6-24845e039130	1	James	Other
+5b25e36f-9380-4698-b406-ab178e60fc90	1	\N	Other
+5b278f96-c334-4c21-95bc-3ce9498abd71	1	\N	Other
+5b2c4414-a810-4e77-a8bd-d476d5c2c3be	1	\N	Other
+5b2c6d2c-a520-40bc-b9de-5cdc2d50db6d	1	\N	Other
+5b2e4c8f-a2a3-41b7-a53d-3fffb7e8316a	1	James	Other
+5b2ee63f-946a-49ca-ab59-f5b05e51d86e	1	James	Other
+5b2f6164-b83d-4d3d-820c-4fdff3268541	1	James	Other
+5b31d7ad-9987-4130-8274-c47f245b87b8	1	\N	Other
+5b3850e5-6131-4649-993a-60c8daa41e5a	1	\N	Other
+5b3a6bff-c531-4a73-b9d0-68608ebf49f8	1	\N	Other
+5b3b3c7f-3220-4b04-a889-be0c0eff09a4	1	\N	Other
+5b439d6b-6804-4551-b779-30aed4fcef70	1	James	Other
+5b487278-7ef2-436a-921e-a09fb315bed5	1	\N	Other
+5b4b44da-8643-4d10-bb3b-669066b5578e	1	\N	Other
+5b4ee7ae-f90c-4677-a826-fefc123efb07	1	\N	Other
+5b5022ca-491c-4031-955a-5cd8ee891e27	1	\N	Other
+5b52e44d-1feb-4c1c-9156-65b0b1c2ccc9	1	James	Other
+5b57a0ba-e9f8-41bd-9a54-437a301baba9	1	\N	Other
+5b5ad12d-2e77-4ff3-953f-26cc5dd7b1bc	1	James	Other
+5b5e1bc7-575c-4d61-8bff-e5fde6ccb62c	1	James	Other
+5b6337c1-a240-4e11-8067-5a72c1a97ce7	1	\N	Other
+5b67e821-c4d0-4608-9666-2fb35f05a33b	1	\N	Other
+5b684dba-f652-4b00-875f-89345fb7511d	1	\N	Other
+5b69d36b-534e-4433-be1c-485003aaa436	1	\N	Other
+5b6a308e-1118-4967-b407-a39ee1d7986b	1	James	Other
+5b709d98-8dbc-4c23-ae8d-69799ee7d361	1	James	Other
+5b715151-f497-42fd-82d5-4d596c86c47c	1	\N	Other
+5b739968-1f24-4939-ae4b-83ad50cdc80b	1	\N	Other
+5b75f8d3-0846-4269-ba0b-a41c67552769	1	\N	Other
+5b77af71-25a0-4349-b211-46fc5080bbbe	1	\N	Other
+5b7b76ac-0727-46b9-9199-a6059dadf114	1	\N	Other
+5b7f6964-bff4-4ace-a7d8-34eacf986d59	1	\N	Other
+5b821d52-8ed6-4c1a-9199-89d6cbefbc29	1	\N	Other
+5b84aee7-5a36-4109-8bcf-0e79ffaea1a3	1	\N	Other
+5b8bfa4e-0865-11e8-b2a7-fa163e8624cc	1	\N	Other
+5b8c68b6-04ac-4a8a-858c-165c86085b0d	1	\N	Other
+5b8ded3b-52c5-4e17-ae9c-efff6cee2c9c	1	\N	Other
+5b90e91c-5342-4dea-94e1-05a41865b626	1	\N	Other
+5b95bb4e-cab1-47e1-88ac-6db337fe60d1	1	\N	Other
+5b965c99-35c2-4bf6-8bb3-0611db417579	1	\N	Other
+5b98e65c-77f8-4e58-9c17-17e96f1679a5	1	James	Other
+5b9a5459-d231-492e-8316-e16084266b53	1	James	Other
+5b9b560d-8941-41f1-af17-9b1a6c15c834	1	James	Other
+5b9e38c4-9ce1-469d-8157-c3f010283c8b	1	\N	Other
+5b9e59d9-638c-4e8d-95de-bb95dd63fa1c	1	\N	Other
+5ba15e63-d5cc-4762-83c3-8b30bcb90ef2	1	\N	Other
+5ba420a3-46ba-4b61-ae5a-a7f71307c8cc	1	James	Other
+5ba68cb9-04a1-45f3-b644-94bc6aa0852e	1	\N	Other
+5ba7be7e-67e5-4ac6-8e58-95c11385bd50	1	James	Other
+5ba8a297-72f0-4dec-bcaa-9d45220eb6f1	1	\N	Other
+5baa009e-e308-4cb0-b906-f5579467fe1b	1	\N	Other
+5bb0ee79-18a7-42e3-ad54-b3913126c251	1	\N	Other
+5bb4c80a-49b4-44f4-ae77-dfdc82c2068e	1	\N	Other
+5bb71320-cf98-4fcc-bdf6-fb240891808f	1	\N	Other
+5bbbe471-b1ba-400e-a6d6-574f176e0ed1	1	James	Other
+5bbd2f8e-833c-4b20-8ac7-5a7b80b93dbe	1	James	Other
+5bbdb77f-8005-4383-9dbb-8e4efb6815cd	1	\N	Other
+5bc1cf7b-964b-4838-9387-6d3d55a29d18	1	\N	Other
+5bc8a749-1556-49e2-a73e-a0e5eca8620f	1	\N	Other
+5bca2dc0-d813-417d-b250-13fc3a779b9e	1	\N	Other
+5bcaae49-377f-47c6-8e43-e424366ebc87	1	James	Other
+5bcb351a-5d54-4ad0-a68d-ecfab225110a	1	\N	Other
+5bcb4175-e62f-4983-9d57-9cde1c033086	1	\N	Other
+5bcd10f2-1f24-47f4-86bf-fbe7e10bd87c	1	\N	Other
+5bcef52e-bbd4-4876-b24d-13035ba61ae6	1	\N	Other
+5bcfff52-b3e1-4105-a35a-ab7d147e6618	1	\N	Other
+5bd17964-613c-4c89-a106-25012e1a79e6	1	James	Other
+5bd210f4-debf-4a98-9284-f4b64a3294f9	1	James	Other
+5bd37428-0865-11e8-837a-fa163e8624cc	1	\N	Other
+5bd3e3ef-69d6-4a63-9bcc-3496e2da7154	1	\N	Other
+5bd4a60f-0684-493d-b02c-8991fc64d25f	1	\N	Other
+5bd6be70-b41e-404f-b6f7-bf00f554e01e	1	James	Other
+5bd7a266-3d1a-42dd-97b0-441d992b5b0e	1	\N	Other
+5bd900e5-3024-43a2-a0e2-9c5c94d956d7	1	\N	Other
+5bddd24e-5891-4a6f-bfe0-2a26bb7890b6	1	\N	Other
+5be0c271-3391-4253-8532-d8b616a06c5e	1	\N	Other
+5be798d5-c0aa-4b96-bc7c-07efd05ed50e	1	\N	Other
+5be8bc25-eede-4d45-8d0b-bfb453426480	1	\N	Other
+5be8d5a8-996b-4ee5-b88f-322979e18184	1	James	Other
+5be9ca21-1d6e-472b-a650-539f3d271473	1	\N	Other
+5bed8d50-ae57-4409-9a06-bfa2a78399e4	1	\N	Other
+5bf14aeb-a39a-4a9a-a9c5-c8aa1e8f666c	1	\N	Other
+5bf17f4d-72d9-40fc-9ad7-a3a33b7b3968	1	James	Other
+5bf247e6-a33c-4ed5-b2e7-96e5f42e02bf	1	\N	Other
+5bf415f1-0713-4066-811a-a41e54ab6a39	1	\N	Other
+5bf98058-7968-48a2-a036-ab0f922e9459	1	\N	Other
+5bfa6829-18a1-4ddb-81a6-838ee60f1c62	1	James	Other
+5bfe5a85-177d-482f-ae57-2dc2b0735ffb	1	\N	Other
+5c0120b6-a6cd-4eb7-8356-27214b046583	1	\N	Other
+5c049a02-4326-4388-89fe-1055dc3e6fb1	1	\N	Other
+5c04dca1-a65d-446e-af46-a3e9abd4604b	1	\N	Other
+5c07474c-c1d4-4d54-9852-1b75af07789c	1	James	Other
+5c0823ea-54db-4c92-b671-6df7e5661f0c	1	\N	Other
+5c0e29b2-41a6-426b-9f78-9bd19e55f4ae	1	\N	Other
+5c1204eb-1148-4efa-8ef6-8fa9df503a13	1	James	Other
+5c181237-040f-4827-bdf2-bc0e77176504	1	\N	Other
+5c18edbe-630b-4b9c-ae30-e9aebb980a07	1	James	Other
+5c1bb6fb-843f-4dc5-b4ae-8b410f5a63ae	1	James	Other
+5c22c7ee-5bc7-48c5-a9b1-7b94dd53d568	1	\N	Other
+5c23a76e-bb46-490f-9dc3-d7d696260af9	1	\N	Other
+5c240f32-15da-11e8-b956-fa163e8624cc	1	\N	Other
+5c2d34ac-ee66-4b91-ac89-2f9c3d38f26b	1	James	Other
+5c30e576-a413-42d1-b145-d3279eecc0f2	1	\N	Other
+5c339822-4125-4df8-aa46-023b317717fe	1	\N	Other
+5c360ba6-aefc-4107-980a-83c5a69c2967	1	\N	Other
+5c3c1806-50ee-4e05-90d8-272c7e307fb3	1	James	Other
+5c41345d-7e7d-4b69-84b5-49f4ab90591b	1	James	Other
+5c44b626-07e0-4e63-89b2-13347fb53994	1	\N	Other
+5c45915b-db09-42e4-925a-f4deb90a0363	1	\N	Other
+5c4f579b-4a82-4d0e-bfa5-8a76b321644f	1	\N	Other
+5c52b49e-bbd1-4a9a-bbed-47a84774dc6e	1	\N	Other
+5c53dedb-a635-4418-a535-ff83aa62bcc2	1	\N	Other
+5c5d7ebc-5f73-47c9-a624-290667108590	1	James	Other
+5c5fb432-2a80-4284-a729-6d1560e50c20	1	\N	Other
+5c69b84f-a0fb-4f0f-a3b0-56128ac47e88	1	\N	Other
+5c6f0646-bb25-4cbd-a825-7f3f52b9bf06	1	\N	Other
+5c6fe9e1-4630-460e-9050-9c0e892e4fda	1	\N	Other
+5c7327a2-4815-48ff-aaab-ab68170c229d	1	\N	Other
+5c74c5c8-6f8a-4628-a132-153b5f5f7bc3	1	James	Other
+5c7503ed-45aa-4d30-b6c4-47a6bde4dd0c	1	James	Other
+5c763862-7439-4145-a335-2fc51ffd4376	1	\N	Other
+5c78a253-a54c-4bdb-8168-211418273d97	1	\N	Other
+5c7d52d8-82f9-4bc5-890c-ebf1c5f41414	1	\N	Other
+5c7f6401-4ce8-4aa9-a64f-baa9e8f5a57b	1	\N	Other
+5c804917-15fd-4a79-897d-89f37714ce37	1	\N	Other
+5c80c465-6f05-41e9-a7d2-414ab3071aa3	1	James	Other
+5c84f949-2efa-4476-ba11-4f01b99ce5ce	1	James	Other
+5c89fad0-e0cd-4d19-80cc-3757b3217401	1	\N	Other
+5c8a4a44-7262-4550-9ac6-28dc0e8cc91d	1	\N	Other
+5c8b7301-c9a5-4a07-88c6-6876aa3809fe	1	James	Other
+5c8c4ec8-2a90-4894-b41b-88c48e9b05c3	1	James	Other
+5c8fc176-4c47-43ca-8fd4-82e431752012	1	\N	Other
+5c904cd9-d842-4d6a-8a9b-5ebcd22fe56c	1	\N	Other
+5c9134d6-e186-45fe-a3d0-6f2baf81ea87	1	\N	Other
+5c94c12d-dee4-4e22-889b-c98e9f46a224	1	James	Other
+5c9713f2-e757-4014-a58e-092b2b05fcf1	1	James	Other
+5c99cd17-e84e-4387-8a67-ca7efe28ec6c	1	James	Other
+5c9cb70e-534b-43d7-ab24-ed36b0d673fd	1	\N	Other
+5ca427a0-992b-4c3f-ba70-07e290825f5a	1	James	Other
+5ca4d090-0531-4fad-896f-71c8b7bc855c	1	\N	Other
+5cabd0ab-5e16-44a2-a44e-5dc91187945d	1	\N	Other
+5caeb53e-91f7-4977-add0-fab60c19038b	1	\N	Other
+5cb06b00-9ed2-11e7-a2f7-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	\N	Other
+5cb3aeee-2abc-44d8-892d-b8858f757812	1	James	Other
+5cb4f28f-e8ff-44f7-b765-d6a892058a0f	1	\N	Other
+5cb64cd9-4224-4971-9cf1-f7651451593b	1	\N	Other
+5cb7789f-af4d-4fc2-9f70-59bf920b6543	1	\N	Other
+5cbe2044-acb0-445a-ade9-458132d78667	1	James	Other
+5cc02de7-6cc8-4e80-a30d-fef76860dc39	1	James	Other
+5cc06f2f-d960-402b-90ea-3055771751d7	1	\N	Other
+5cc36010-9675-417f-87fd-758b91cb9a99	1	\N	Other
+5cce7aa4-2bdd-439d-a1f1-84db56eec4f7	1	\N	Other
+5ccf98c0-c024-4550-83d4-b4ff0b215942	1	\N	Other
+5cd3b541-7bb5-44fa-8982-71c1593b8562	1	James	Other
+5cdc9f4c-4fc1-4d26-ba51-09fb6a441642	1	James	Other
+5ce3cb88-977f-4a67-9680-bc56d11dd156	1	\N	Other
+5cea28ba-4500-4796-96f3-1941b3ea1282	1	James	Other
+5cea3218-1a2e-4157-9c65-626498d320fa	1	James	Other
+5cedd1b4-b76b-4d4e-b3d7-44910d9dc080	1	\N	Other
+5cf5e8c6-0e10-4f22-ac66-4fb30c1f1ff1	1	\N	Other
+5cf7c76a-5370-4453-881b-8128e2452d67	1	James	Other
+5cf84892-bce8-431b-8db1-8396b5a78a83	1	\N	Other
+5cf9ccd7-0e0b-4ed2-b8bd-3e52c38a9da1	1	James	Other
+5cfb11ce-683c-432e-8746-e6d4d44f924d	1	\N	Other
+5d086b53-ccca-4e44-9e81-b3b0e8f53268	1	\N	Other
+5d0884cc-54fe-4578-a1d9-e58fc211be0e	1	James	Other
+5d0cbbef-a4b3-4e5c-9d68-838a349bd701	1	James	Other
+5d0d04d0-5cce-4841-b874-6d3a7b6d1d42	1	\N	Other
+5d0e489a-ba95-4e80-92fa-e0cf47be5e14	1	\N	Other
+5d111fe7-55b2-49c9-a0d5-1a2c93867a2d	1	\N	Other
+5d13041e-902a-4685-83c6-96ff5713ceef	1	\N	Other
+5d174ed4-9a9c-4100-9079-a5218a17dae0	1	\N	Other
+5d180bed-a2bd-4f08-82c1-756d2a5002bb	1	\N	Other
+5d1ac893-5905-46a8-bfb4-feb4f74fa194	1	\N	Other
+5d21ccad-1fbb-4fcb-9278-3ff80572689e	1	James	Other
+5d291738-2e04-4fd9-a0f2-e1e3c8689d72	1	\N	Other
+5d2fbf33-d7cd-4459-bdcb-82a1241a9220	1	James	Other
+5d2ff7bb-2427-44dc-963b-b8e4250f231e	1	\N	Other
+5d317991-c133-4a76-9806-f2b650610dcc	1	James	Other
+5d32f344-43f3-401f-bf2b-7bf1748800e4	1	James	Other
+5d3581d2-3215-4f6b-b49d-8284489c9a9b	1	\N	Other
+5d39d691-850c-44ed-893b-d1d27afbe880	1	James	Other
+5d3be827-74b4-4364-96be-c625a3380d90	1	\N	Other
+5d400b5a-ea37-406a-b0fa-e97cd716f55f	1	\N	Other
+5d41002b-f97b-473f-8152-f7866e67acca	1	\N	Other
+5d4265c9-add4-4b20-86d7-8925ef991b08	1	\N	Other
+5d45ba23-676b-4775-a657-c28487aff0a9	1	\N	Other
+5d48154b-737a-4446-9348-fefbb88e15b2	1	\N	Other
+5d4e1577-58cf-4822-9bc5-be50a45f43bf	1	James	Other
+5d51402a-1dcc-442b-a514-5c545f6e6005	1	\N	Other
+5d51e3bd-c966-4fbb-9086-aa826fc70515	1	James	Other
+5d58508a-9e74-4edd-8d66-4879fa7912d0	1	\N	Other
+5d589194-6b3c-43ce-b9ce-e1bf9bc9804f	1	\N	Other
+5d5e3370-27d9-4e43-86fe-5d718e2fd6dd	1	James	Other
+5d618ab6-cb91-4e92-8733-8ac645d17fcb	1	James	Other
+5d6696d1-012b-4bb2-801e-8b0a4cf8c515	1	\N	Other
+5d686b46-5d50-4e75-bdda-c02e66656012	1	\N	Other
+5d6dbd56-1efd-4fa5-a58d-12c93801fd61	1	\N	Other
+5d72f415-b4b4-4a4f-8905-6217e3adf3d5	1	\N	Other
+5d78c80e-bd3c-4a1b-b3ed-5beed503d37a	1	\N	Other
+5d79abd0-a1b4-44ce-934d-46cf84f59626	1	\N	Other
+5d7a7e32-45c9-4c44-935b-8bba2f8ac101	1	\N	Other
+5d7cba65-5033-4b48-8f0a-a3bbaf09f264	1	\N	Other
+5d7edd08-7513-41a7-8fae-2f89bd6b7f88	1	James	Other
+5d80b0ca-5f4c-41ff-a91b-1be0c323d91a	1	\N	Other
+5d812ed4-6e98-4148-a1ca-f694ec1044a3	1	James	Other
+5d815ce3-c34c-4d27-8378-c0e890f95fa5	1	James	Other
+5d82c4c9-9bcc-4c19-90d6-8a842dddb35c	1	\N	Other
+5d853b1f-c776-40de-a04b-606245e3c3fc	1	\N	Other
+5d8909e5-8e88-4f58-8d0c-e5905316f570	1	James	Other
+5d8bc026-c151-457d-bc49-8fae2a6806c8	1	\N	Other
+5d8cf419-ccbe-4512-a419-0d6ba1166001	1	\N	Other
+5d9683ac-79ef-4a21-a73d-5a78cbbee234	1	\N	Other
+5d9743de-15da-11e8-a2ee-fa163e8624cc	1	\N	Other
+5d9b72e1-6e72-4ef5-b1bd-a8baec3d3048	1	\N	Other
+5d9b7e07-20cf-48d8-96c3-f99999514ef1	1	\N	Other
+5d9fb7e7-4c43-4286-acb2-b5eee3ce2864	1	James	Other
+5da01c1c-ddb3-43b0-894d-46fa85ddf6c7	1	\N	Other
+5da069ff-6342-4306-a0fc-56833c9e855f	1	\N	Other
+5da24818-a6a0-45a0-b2d7-53f710a84b86	1	\N	Other
+5da2c647-ae87-44d5-a890-e8c3bfd38b09	1	James	Other
+5da3d7fa-67ce-4e5d-9a68-0fd0ba5cab44	1	\N	Other
+5db1b395-f7c9-4652-bd69-5b0e723c61ed	1	James	Other
+5db1e0a8-f8f2-43f6-bd53-3d3b0f71a83f	1	\N	Other
+5db1f1ab-7004-45ae-83f8-e19c0c80252e	1	\N	Other
+5db55c86-a08a-4348-9bfe-94dd505fc454	1	\N	Other
+5dbae55d-eadd-4800-86d7-20ae24028d23	1	\N	Other
+5dbb29d7-9627-4e44-b921-1eb9b5afec16	1	\N	Other
+5dbd7d73-d44c-41d7-9638-df022b945030	1	\N	Other
+5dbdf581-a558-4b57-bfda-89fbcd7ec902	1	\N	Other
+5dc0d51b-155a-478a-b3fb-534bd567324f	1	James	Other
+5dc1b8e0-75f1-49e1-bdfc-6a213b10ea85	1	\N	Other
+5dc39ba2-621a-4460-83d7-77e2699b0a73	1	\N	Other
+5dc418be-8dcb-4f3b-bbd4-3ace4da10b6c	1	\N	Other
+5dc4ff5e-331f-4bbf-9ca1-d8e399573e60	1	James	Other
+5dc6cfd7-b08f-4335-84ed-d03d3ac733a3	1	\N	Other
+5dccd6b7-f373-402f-9e2d-0664fb563653	1	\N	Other
+5dd3871c-96e5-4b50-bfac-4ffbd11e22ac	1	\N	Other
+5dd7ddcc-758c-4f02-9007-6d4499926ef9	1	\N	Other
+5dd85c5f-77dd-4007-b6a0-530f05e8a2ec	1	\N	Other
+5dd98899-2e69-4e0a-9125-75252c83e114	1	\N	Other
+5ddd450c-db1f-4edd-907c-6b6d4fb0fe6c	1	James	Other
+5ddd8b33-228b-4ed8-80cc-a24b198e0cc5	1	James	Other
+5de1fcab-3cde-44cf-ae91-fc95fd13a53e	1	\N	Other
+5de22614-f1f1-4971-8ba4-c338f74e9a45	1	James	Other
+5de62bec-3a24-42cd-be7b-553b41a94b31	1	\N	Other
+5de86209-7021-48dd-b7d0-d1b0348090fe	1	James	Other
+5de8b3ba-c86c-4347-93ab-dfc52d39cf33	1	\N	Other
+5de955a4-e13e-4f1b-b018-ee6cd0d1d749	1	\N	Other
+5dedadf7-f850-4f18-b106-c10179fe1af5	1	\N	Other
+5def0907-3526-4459-8aa9-ef9da896a89b	1	\N	Other
+5deffe9a-8bf5-4c34-b030-1c9836d0a691	1	\N	Other
+5df1b630-1695-4857-9b25-3d6335779a96	1	James	Other
+5df591d7-5964-4108-9109-69aad2cf7bc5	1	\N	Other
+5df8a45f-437a-42d3-aa67-1f5c71347be9	1	\N	Other
+5dfa8c0d-e587-4a10-a693-6df1c275ee7c	1	James	Other
+5dfccfd8-e2c5-46ac-8c20-16887db87ec2	1	\N	Other
+5dfcdf46-f311-446c-9878-db02b5279c68	1	\N	Other
+5dfd690b-6da8-4aed-9a23-b012feb1b487	1	\N	Other
+5dfe01f4-f28f-49e8-b2a1-b79fd750dd63	1	\N	Other
+5dfe3dc6-9e6e-4f4e-acb6-f2e77b5f03e5	1	\N	Other
+5dfeaf65-ca41-49d1-92cd-ca30f87edc51	1	James	Other
+5dff3a64-646f-48d4-a174-c93f78fd8b18	1	\N	Other
+5dff42e1-b3b0-457a-8bdd-f5c26f70a740	1	\N	Other
+5e00550d-200e-4ec9-929a-e1928e23d833	1	James	Other
+5e014296-6839-4e70-af83-727ffc1f966f	1	\N	Other
+5e01db19-f6d7-454f-a66a-90eac3e4d811	1	\N	Other
+5e023797-c7de-4f8c-931b-143a8d7aa0b3	1	James	Other
+5e06f548-1c69-403c-b726-350614affc3c	1	James	Other
+5e07367e-906b-46d2-ab71-2c1aa92a245d	1	\N	Other
+5e08bacc-f46c-4e19-83c3-a48b88dd400f	1	James	Other
+5e0c90bc-f632-41e0-bef3-0a1a86817b89	1	\N	Other
+5e0ca21f-3903-44b5-9012-c3feadff08a4	1	James	Other
+5e0f3f07-815c-4af9-a0d4-899f65ab035b	1	James	Other
+5e1195ab-04a2-4368-845f-8599fd697454	1	\N	Other
+5e15063f-8bd5-4aa1-bb2f-8ae963076563	1	\N	Other
+5e181c71-e1c6-4068-9655-20f744624d04	1	James	Other
+5e1aa1f9-1c17-4604-8c73-f8ff22fa3b31	1	James	Other
+5e1ad70f-6771-4a03-9d3a-f828a91b932d	1	\N	Other
+5e1c352d-2996-47a0-b55b-6a3797746552	1	\N	Other
+5e1cdb9a-abb2-4a53-ac7e-2402c02ec15e	1	\N	Other
+5e1fdeb7-747e-4fc2-ac94-be7fcfb71002	1	James	Other
+5e214fcf-08a2-4d77-9ecb-14a8c38cc7bc	1	James	Other
+5e22af63-fb25-4ba0-b41a-9de52f0e1a80	1	\N	Other
+5e234fb3-6086-4166-8b9b-9ace4d7c6787	1	\N	Other
+5e25e60a-1e2f-4504-bbb7-14c4e5fb429b	1	\N	Other
+5e27d4ca-cf05-40ec-8639-cf6422dc0125	1	\N	Other
+5e29dac0-a52f-4a1e-9123-829969decdf9	1	\N	Other
+5e2f700e-3702-4172-b5b6-1ec4bc3f6ac7	1	\N	Other
+5e309b4c-efd2-44dc-bdfd-70161f6b8f9b	1	\N	Other
+5e35973d-f416-4729-a6bf-78425fa425d9	1	\N	Other
+5e37ad19-9023-419d-9e12-762321e09375	1	James	Other
+5e3a73a3-d095-4942-b2e4-c118ebeb7bed	1	\N	Other
+5e40aa4d-5ad2-4b72-ad7a-23cac5f7d54b	1	\N	Other
+5e45e358-81b3-4377-9b99-6027d8d6c0f5	1	James	Other
+5e4711bc-b27c-414d-9813-9b16ef89f9f0	1	\N	Other
+5e476087-ad08-4f42-96e8-81108b2a8a50	1	\N	Other
+5e4be848-14eb-405d-8cf0-369df8d9d9cd	1	James	Other
+5e4ea104-affe-4e57-b21d-d47d16b2dec6	1	\N	Other
+5e4f8d8f-2a57-406e-80a4-7fc5fb6ded26	1	James	Other
+5e54fd3c-2538-4c0a-a7fe-99414ffc9a02	1	\N	Other
+5e569610-0172-4de4-8854-ef117af06a46	1	\N	Other
+5e5b095d-ea8a-4c4e-a934-e782762a817a	1	James	Other
+5e5d1f4c-d8ac-4e9a-9131-512b92b2bb12	1	\N	Other
+5e5fb788-79b0-4d6d-b194-42076dafa42e	1	\N	Other
+5e5fcf40-59d5-49be-a909-3e5ee462f8f3	1	James	Other
+5e634571-639a-4b66-9522-a92db98f0db1	1	\N	Other
+5e63d77f-036e-420a-8efc-62d744e9eb9a	1	James	Other
+5e664472-6910-4b86-99b7-edc95ffabc9d	1	\N	Other
+5e673123-d210-479b-8752-66aa88c85ed8	1	\N	Other
+5e6da707-d694-4d8d-ad14-ebd2e743ae5f	1	\N	Other
+5e740317-9119-4091-8544-536353cfe2be	1	\N	Other
+5e757f32-9534-4ed9-85a8-b656be72f2af	1	\N	Other
+5e75e835-0463-4af1-a531-340aa2089f1a	1	James	Other
+5e791d61-97b6-4840-8bd7-c257b2cd68d6	1	James	Other
+5e7c960a-6657-456d-8b01-4bf4d7bd594d	1	\N	Other
+5e816ac0-9457-4831-a8ab-645880a64417	1	\N	Other
+5e83a851-a70a-44dc-91b3-35ce23f65b85	1	\N	Other
+5e8589b6-c7f8-4bbc-885d-10376320156d	1	\N	Other
+5e8606dc-a1eb-413c-85e9-621871b0315e	1	\N	Other
+5e863d89-c69e-4151-9a93-9b812b6668eb	1	\N	Other
+5e868987-c836-4e2e-a468-049bdde568c7	1	James	Other
+5e8f4b57-b286-4f28-b3e4-650065442646	1	\N	Other
+5e9075aa-4a28-44d5-9125-d2959f755568	1	James	Other
+5e92aeb1-ab45-46d0-bb70-84b3010ea566	1	\N	Other
+5e932a21-bde0-4857-9160-e3ceb6f5971a	1	James	Other
+5e986f95-7edd-481a-a1cb-f2ba8adfc4f3	1	\N	Other
+5e99eda6-58a3-4ab1-be6d-18ea2ddd57e1	1	James	Other
+5e9adbed-f105-45d0-97d5-0905f1066d28	1	\N	Other
+5e9b50da-2460-4393-9457-13060d5a923c	1	\N	Other
+5e9f1367-aa46-4a94-baf2-e7cd35ef1fde	1	\N	Other
+5e9f3e7e-c50c-419c-8b86-f48ac94660aa	1	\N	Other
+5ea00e51-08a0-4db6-a567-fcc154a0e1b5	1	\N	Other
+5ea1afd7-30ec-4a3f-a87b-b230774d546e	1	\N	Other
+5ea1b1fa-ffa1-4ca8-b5a5-57ba2cfdf50a	1	James	Other
+5ea22ccd-9c3f-42b3-83f3-6a5217889daa	1	\N	Other
+5ea63815-4123-411a-b7d5-7e42308f96a4	1	\N	Other
+5ea7c486-65f7-40a4-820b-43adf1fe22a9	1	\N	Other
+5eab4e7d-d66e-49c8-b0f0-837977a025f0	1	\N	Other
+5eab7086-d0f7-4d89-bef2-0259d47b3555	1	James	Other
+5eb2e3bb-f7d9-442e-b051-3c25c75d7d34	1	\N	Other
+5eb3d71a-4523-48ae-945f-729dd387aa56	1	\N	Other
+5eb5bcf8-94cc-44b8-ac1c-4fba0e4516bb	1	James	Other
+5eb7dee9-67e3-49cd-8859-0d8dd0c3b966	1	\N	Other
+5ec15758-40e5-42c7-ad97-5b4268dfed6c	1	James	Other
+5ec33adf-14b8-46e3-8e37-5d7a9c607e75	1	\N	Other
+5ec49c2a-0ca8-4fc7-baaa-6cac2d97b28c	1	\N	Other
+5ecfd046-d8c0-4909-b3ae-c54bd3866af8	1	\N	Other
+5ed40e5c-3b2e-4e82-af17-f323d9b73f8b	1	\N	Other
+5ed4d740-1bb4-49fc-bfb4-636952438d98	1	\N	Other
+5ed4d7bf-154f-4b28-8517-c8768116245c	1	\N	Other
+5ed60f43-7eae-4e5e-8eb6-2ff6d763eb2a	1	James	Other
+5ed6b236-5d73-4749-b8d0-6346d4cb0d56	1	\N	Other
+5ed9e575-2854-4a85-a538-3bcc3113f54d	1	\N	Other
+5ee67186-7642-4567-8031-75c1c4f056d2	1	\N	Other
+5ee6d62b-5aa1-44f2-bd26-8b7f87797c7e	1	\N	Other
+5ee8fde3-0817-4954-8dcc-10b8b572bd18	1	\N	Other
+5eec07ed-a2c6-4a71-aaf8-15dac4866aee	1	\N	Other
+5eefd8bc-8d00-4c20-8125-950d5560f90d	1	James	Other
+5ef0f6b8-b159-45b0-a45c-4e4f3a7a1c5b	1	\N	Other
+5ef1876d-dca1-4088-b8c9-c4d1e34b27a0	1	\N	Other
+5ef8d917-674b-4ac1-9cf0-6e450046d90d	1	James	Other
+5ef97201-73cd-47ca-b80c-c150991a4ab8	1	\N	Other
+5ef999d0-64f7-4c04-8c34-1a68159cdcf6	1	\N	Other
+5efbb8b4-f630-4602-a440-ffd567196587	1	\N	Other
+5f008d40-f624-478a-89a1-cbc2825e451b	1	\N	Other
+5f02f5b4-1619-4487-a7d8-f686ecdf69c8	1	\N	Other
+5f02ff04-4af7-410a-8b7c-181a75c1692e	1	James	Other
+5f03b63a-2b2e-11e8-aa92-fa163e8624cc	1	\N	Other
+5f05aa5d-28ab-4fff-a4ba-09ee00625c7f	1	James	Other
+5f07d86c-c25b-42fb-a2b1-b5356c2e0d38	1	\N	Other
+5f08abd7-854a-49c5-ab48-a1e0d54588a4	1	James	Other
+5f0a0ec8-43ca-45d3-bb6c-5168a00e9a80	1	\N	Other
+5f0c3f44-483f-49b2-ae2b-453db9910513	1	James	Other
+5f0d16c1-1a4e-4e98-9390-4e56121b5512	1	\N	Other
+5f0fd836-ef32-488c-aec6-876b9cdd6761	1	\N	Other
+5f1492ce-24cd-4a8a-b800-23c2bd924198	1	\N	Other
+5f1a09d2-96a8-45b8-9e1e-e0304d1c2cdd	1	\N	Other
+5f1cba6b-be78-4953-86d8-c0f79ca53a9a	1	\N	Other
+5f21a4e9-84f9-4437-90d9-31cc9537d29d	1	\N	Other
+5f2222bc-a7f6-4361-ae54-53564b887e9a	1	\N	Other
+5f223251-b345-4afe-b302-ce321b239cb9	1	\N	Other
+5f294f5a-aeb1-493a-80ce-d504c1b60ba1	1	\N	Other
+5f2b2c71-b77f-49f0-b464-db41a24fdc52	1	\N	Other
+5f2ba987-8596-4030-9b74-eb588d4cde83	1	James	Other
+5f2c6bf6-6b39-4c57-ab9f-b80a3d9a9b18	1	\N	Other
+5f3094ee-bd25-456b-9422-9c82b9b9507a	1	\N	Other
+5f30bc51-a246-4303-aeaf-1665daa9efc6	1	James	Other
+5f34b50b-3a94-41bf-80f1-408753c2053e	1	\N	Other
+5f3a4c6c-f776-491c-9d42-c0469fee5ef6	1	\N	Other
+5f3bbf16-aef3-42c7-9ca7-4c810ec5c55c	1	\N	Other
+5f43b80b-db70-451d-bf05-50fc08c76b82	1	\N	Other
+5f44d9a0-3adc-4893-8ece-9e068989a2b3	1	\N	Other
+5f45754d-68ee-411b-aa67-5773137fda4d	1	\N	Other
+5f45e1a1-0216-4dc3-be63-0c22651fc84b	1	\N	Other
+5f4b1cfc-2c8b-4ede-b039-581a23ac4d54	1	James	Other
+5f4bed53-5ea1-41d2-9d5e-aff772c53c42	1	\N	Other
+5f4e5ae1-4744-4199-931c-6ff6410297e5	1	\N	Other
+5f5579a1-a8d3-4d42-8a70-c6753a3d7cda	1	\N	Other
+5f5a8074-89f0-47e6-a1e6-22260a3da70c	1	\N	Other
+5f5b3cce-be9f-487a-b0f5-a0383057de74	1	\N	Other
+5f5bb4fc-2b2e-11e8-b241-fa163e8624cc	1	\N	Other
+5f5d5627-eba5-4768-9ea0-509f86e45059	1	James	Other
+5f5ebcd1-4d58-40d4-9406-a627b9c8baa1	1	\N	Other
+5f60956d-d86d-46ec-8b18-d6f3d039d832	1	\N	Other
+5f60a193-c0ac-4cb8-839a-ae249ff2ca7d	1	\N	Other
+5f60d85b-cb9d-4e18-9014-1cd1a75e6f59	1	\N	Other
+5f64d8a7-c348-4192-8cb7-b3bf7bcbb7ed	1	James	Other
+5f6dac3a-8c39-4093-9cfd-f660d899e6cd	1	\N	Other
+5f6f5380-557a-4e50-bf1d-98d0f9579f80	1	\N	Other
+5f72724a-0f1b-4928-8586-e511aab6e89a	1	James	Other
+5f80ad60-3287-4c69-bfdc-daf6330b708c	1	James	Other
+5f823ea6-d1fd-4acf-ba2d-8361bdd91f34	1	James	Other
+5f8a4f88-d9c7-45ad-9843-d0bfc0ccbaaf	1	James	Other
+5f8b9fe1-2549-4aee-ad7e-b8f89e675960	1	\N	Other
+5f8cd6b1-24fa-46d7-b125-878076353a92	1	\N	Other
+5f8d1cf2-8167-4afd-b6c5-212a5c8e54f0	1	\N	Other
+5f8f3393-94d9-4de2-9db8-7493a71128a4	1	\N	Other
+5f927580-494e-4772-931b-0d596eebc83e	1	\N	Other
+5f988fa0-6a48-4d57-bd32-eecd1bb214c4	1	James	Other
+5f98aba0-3424-46ff-9cf1-f8a126342684	1	\N	Other
+5f9c79df-1acf-4ef4-9fbe-769f9f83287a	1	\N	Other
+5f9f8a2a-f5ec-425b-9c88-7a383dad321c	1	\N	Other
+5fa5ebd1-771c-4382-a5d5-776ed8429bcc	1	\N	Other
+5fa99f86-93d7-4aff-8fb0-4472b471c6dd	1	\N	Other
+5fb0b8f8-07d9-11e8-86a6-fa163e8624cc	1	\N	Other
+5fb0d48a-8ecb-4efc-bb88-2ca337690ee6	1	\N	Other
+5fb45f0b-2753-472a-b39c-8741487401d6	1	\N	Other
+5fb5bfd2-0641-4930-9900-93a43c002597	1	\N	Other
+5fb7e21c-7ec6-474f-8ae4-cf212a4b8311	1	\N	Other
+5fbdd327-82fd-4b83-9e7f-df50ed82e06f	1	\N	Other
+5fbfd6d3-24f9-481a-9b98-7d072b748d30	1	\N	Other
+5fc46d85-6dec-4357-a65f-bbbe13e04554	1	\N	Other
+5fc73a17-c08a-4d28-a5aa-feda43ffdc39	1	\N	Other
+5fcb2995-5519-4c67-a06b-8e6570d12eef	1	\N	Other
+5fcd9f51-b4e0-4045-9cdd-7021286f1ce4	1	\N	Other
+5fcf5365-e723-46fc-ab62-abc73389ad6f	1	\N	Other
+5fcfd7d7-8ced-4c60-a14b-23795db321ac	1	\N	Other
+5fd4c3fc-3b0b-4534-9375-ec469c8cb72a	1	\N	Other
+5fd735db-e77a-497e-b104-cbd16ac17969	1	\N	Other
+5fd84902-3776-45bb-9327-1868f9a94a8b	1	\N	Other
+5fdaed6c-07d9-11e8-8c0b-fa163e8624cc	1	\N	Other
+5fdd2977-8256-4bdb-915b-0dee4fc7cea6	1	\N	Other
+5fe2b575-2bd1-4184-a66c-983127f67aee	1	\N	Other
+5fe333e6-3bfb-43cb-b6fd-78cf725a85ab	1	\N	Other
+5fe764d7-9d00-431e-95b4-5238231e5d6f	1	James	Other
+5ff0fcd6-c119-4771-80bc-fa7b06f11b2c	1	\N	Other
+5ff3d9ef-bb77-47d6-98c0-9a55de88de74	1	\N	Other
+5ff558f4-ba18-41cc-a8ff-08b420c857ed	1	\N	Other
+5ff75819-f129-4fde-9e9b-47cd512d2b67	1	James	Other
+60042d5d-bec4-4ead-b1ed-d9b7e600399b	1	\N	Other
+60067d2e-4bb6-430c-9e90-95672e5b5efa	1	\N	Other
+60069042-f1ec-49db-a158-0b6a3c55a388	1	James	Other
+60084efd-2f67-47a2-9a9f-82e44b59f411	1	\N	Other
+600dc862-3e31-401c-ab8c-1dc3e99fe7ab	1	James	Other
+6010e0cd-ee00-4d64-9572-f4e68a8a81e0	1	\N	Other
+6011ae9f-c83f-40d2-8224-a81276389544	1	\N	Other
+6012587e-c3b6-42e0-b14c-ea57c510742f	1	James	Other
+601452c8-045b-41fb-97b0-e2ca3a5240d2	1	James	Other
+6019af30-0859-497d-8542-8fcfeabcccc2	1	\N	Other
+601a5df8-dbfb-4220-9c3a-24683f524d7e	1	\N	Other
+601d0d79-03dc-4e94-a609-acd537101ee0	1	\N	Other
+60241fdd-5982-4a05-8a39-6d6d8e41fbfe	1	\N	Other
+6025b122-900b-4a25-9025-3ed37c6be271	1	James	Other
+602695fb-71ee-49c6-ab19-244e54f89497	1	\N	Other
+6034e64a-11f8-11e8-b95d-fa163e8624cc	1	\N	Other
+603841e3-e4db-42d2-ba54-d08bb8a2e15e	1	James	Other
+6038c57c-3894-4154-b7a3-39e780cb4323	1	\N	Other
+603bdc13-6bc8-4366-a6f1-749600e2d941	1	\N	Other
+603f315f-da4f-4851-b28b-4b20e564c729	1	\N	Other
+603f54ba-4e17-4bce-aa2f-1894d2740dcc	1	\N	Other
+6047c1d1-1e40-47f0-9877-b7b88d8e4852	1	\N	Other
+604aeec3-220a-4f5e-ba33-d782a9d1c2a1	1	\N	Other
+604bd091-07f8-4c15-8c03-0456c1adac49	1	\N	Other
+604bd4e9-8421-4207-9860-3547075d1619	1	\N	Other
+605007af-3fc5-47f2-b7a1-1fea4f0ed4f0	1	\N	Other
+6052dea6-8d88-49d3-a6f8-a97acfccb49f	1	\N	Other
+6053b1e9-a951-48dc-ae95-f71d0b438296	1	James	Other
+60561df9-402d-41fb-bfb8-78a75555f440	1	\N	Other
+605662fe-c238-40e9-ae3c-c82d032e1722	1	\N	Other
+605d5e5c-a87c-45af-b687-d6249ad2ee1d	1	James	Other
+605f3d69-a19d-4384-821c-ab741580a1cb	1	\N	Other
+6061264f-d5c1-4a66-bb2a-8f36b839bb14	1	\N	Other
+6061ac73-f484-4d77-b844-9dfc5aa7361b	1	\N	Other
+60621375-5085-482e-a80f-415f8b7e3140	1	\N	Other
+6063c734-78ec-4541-a8cd-52fe590c2a25	1	\N	Other
+60677cef-220f-4cde-be47-9ae15d57222a	1	\N	Other
+606c5472-9e85-4233-9209-bb3ccead438c	1	\N	Other
+606c65c7-ea03-4475-bfa7-96cdb5b16ffc	1	James	Other
+6075f2a6-6179-488b-9485-24441b67ee7f	1	\N	Other
+607606e5-4272-44fe-8ced-e2d3e3083b09	1	James	Other
+6076b4eb-e95b-4ab4-a2a1-52ad94f507cb	1	\N	Other
+6078cdc7-08aa-4d4b-90dd-9f0a0306628a	1	James	Other
+607ac87f-3ce8-4d6c-a3c4-ef19ff537d69	1	James	Other
+607efd29-f17c-4ac8-880f-7f636a51e6ea	1	\N	Other
+608320d1-93e3-4b79-9f23-990a33a8ce58	1	\N	Other
+6083e3d4-1470-40ef-8b2d-92c5d2eedb8c	1	\N	Other
+60845924-591d-42d4-b457-19d7ad81f8ed	1	\N	Other
+6085bd8c-de2f-40a5-a4ca-3ebe9876c1a7	1	\N	Other
+608da1ca-b112-4b5f-97ff-8e3c55f8c706	1	\N	Other
+608de704-c770-4d9a-b58f-88de0d5b28df	1	James	Other
+608ec2ce-f299-4128-b478-bf7c8036ce7b	1	\N	Other
+608fd695-0279-4497-a394-7f8840ab871c	1	James	Other
+6090c860-94dc-4a80-8c37-5fdc3acb3efc	1	James	Other
+60917937-0371-40df-86f5-b9b5cb37667d	1	\N	Other
+6093c0b0-ed47-4e69-ba91-85a5a1b65419	1	\N	Other
+60943620-0cf2-4954-88c5-2105af00537a	1	\N	Other
+60963e04-1b22-4075-94ee-b2b286d9c784	1	\N	Other
+6099257e-11f8-11e8-aa3e-fa163e8624cc	1	\N	Other
+609b6b3f-8943-45c4-8a4f-baf3feacd81c	1	\N	Other
+609bda20-ffa9-48b0-b3d5-af3a329c1b04	1	\N	Other
+609ef2b0-a6be-4045-b574-fcabc4b84fc6	1	\N	Other
+609fae98-6d2f-44e0-bd92-4f12f7cbe1c1	1	James	Other
+60a052e2-4e01-477e-bdd4-e439bb34af03	1	\N	Other
+60a215a2-a833-447a-b326-a1d660bf155f	1	\N	Other
+60a3548d-eb04-4898-a9d4-2de669de82c6	1	James	Other
+60add864-33e8-4cf3-a2eb-db2b42816919	1	\N	Other
+60b14f07-5338-4f47-bdaf-f9297c471d8b	1	\N	Other
+60b2720c-3aec-42e1-9b8f-f1af61a3162b	1	\N	Other
+60b73018-510e-4d80-8e8e-ce909112aacc	1	\N	Other
+60b9b406-a651-4927-98d4-a2259bb53509	1	\N	Other
+60bb089e-b897-4d71-884e-30100e5c30dd	1	James	Other
+60bda166-81d8-4dac-b88e-3be54bc3e444	1	\N	Other
+60bdec0b-552b-45a0-96d5-4097bcc67761	1	\N	Other
+60beb2a8-9138-46b8-a8ef-50aa130d884a	1	\N	Other
+60c18f4f-857a-4988-ae63-a9f107d42bbe	1	\N	Other
+60c25341-cdf8-454d-a3af-67380ab9eda0	1	\N	Other
+60c5c59a-147a-4329-89ae-082ada8ae8a9	1	\N	Other
+60c94ac1-b0aa-4aef-9cd9-b8eefa15b2a1	1	\N	Other
+60d5de3f-a8db-4e74-b1d5-15f41f31bef4	1	\N	Other
+60d81d1a-1103-11e8-9f75-fa163e8624cc	1	\N	Other
+60d98c9a-4f00-4252-960a-c35459008301	1	James	Other
+60db1f47-d11d-491a-ae17-ba25bd2f3f40	1	\N	Other
+60e03063-6f34-4757-a822-498782aae948	1	\N	Other
+60e0417f-c8d3-4310-89d5-e60e71068d2b	1	\N	Other
+60e0bdcb-0092-48ce-ae53-e6f455d6b442	1	\N	Other
+60eaeeb9-c2bb-4fdc-b306-0f2dfe55c409	1	\N	Other
+60f08734-4082-4b22-b085-60587c823a87	1	\N	Other
+60f4e8a3-0b4a-4fe4-9a10-5d997ee354a7	1	\N	Other
+60f93ad2-0b61-43f3-ab1d-5c0d8f3e8b06	1	James	Other
+60f96209-3689-4534-88ed-3cf6da1fbe23	1	\N	Other
+60fd052e-dbbe-4cd6-a1ce-725067f59405	1	\N	Other
+60fec6a1-4f88-4732-a797-e81267ec99f1	1	\N	Other
+6107f7bc-1e0e-4b25-a870-1b7f7104f1ae	1	\N	Other
+61091ede-029f-4dfb-b87c-2ef76df3b73d	1	\N	Other
+610e163e-0a6c-4c32-b43e-f20cb63d557a	1	James	Other
+6110e040-5272-4706-a12e-544cc095f589	1	James	Other
+611310c5-31e9-43a0-aef5-38a55473b732	1	James	Other
+6113c2de-fafa-4533-a90f-20d1f948abf2	1	James	Other
+6119e296-66c7-4afb-b4c0-f7201853d21a	1	\N	Other
+611bf915-851e-450c-ab6a-ada0902b52a3	1	James	Other
+611cb565-2917-40da-9f81-360de2ccd164	1	\N	Other
+611dc9d1-1a70-43c0-8c24-204db5727573	1	\N	Other
+6121d37c-f593-4dd0-909b-e668266c746a	1	James	Other
+6127a9c3-fba5-4fab-bb59-6374fc50a8c1	1	\N	Other
+612f4b2d-c8b7-4d48-9a20-973349afc7da	1	\N	Other
+6130c4f2-49b2-4003-95bf-ba0e4166bd3d	1	\N	Other
+6131d086-594b-4f1f-a6ff-766afbd5acff	1	\N	Other
+6135337d-fc9d-4d70-9618-3adc6b9419ac	1	James	Other
+613cfd3e-c4af-425e-ab7a-a9c383b5a14b	1	\N	Other
+613fac78-d3bb-45b2-a672-306bdc23a726	1	\N	Other
+6141d0db-85fc-4903-9657-1fa85d9f9bb0	1	\N	Other
+6147c0fb-a981-4d8d-a05a-0652caaa73b0	1	James	Other
+61489d8a-9cc7-42d4-bf2b-b45df6fbb005	1	\N	Other
+614bb876-9831-412a-969f-d488b293923a	1	\N	Other
+614c7016-c9d2-4642-9c29-f8a8c33582ef	1	\N	Other
+614f1a06-8eb5-4dd2-a958-595e4e36108b	1	\N	Other
+61517dda-20b5-4b3e-bc75-6fb92eb0ba9a	1	\N	Other
+6151873c-8901-4ffe-8f76-65cc107e1aeb	1	James	Other
+61524eb3-41a7-434c-8385-9d0fb51e4be1	1	\N	Other
+61535e03-2b04-4b2b-893a-57448abd441f	1	James	Other
+6158bdad-1bd5-4c7d-a668-72fd25f6dbb3	1	\N	Other
+615c1f8e-3bb2-41d6-8d2e-f9fbb6f3c1d9	1	\N	Other
+615fb870-0339-4452-b89a-0dbd16cabbb2	1	\N	Other
+6169f94d-516e-4a1e-afe6-30af3bb89e21	1	\N	Other
+616a90fd-8a0b-4b8e-a5e3-e14dddaf3766	1	\N	Other
+616de6b0-5ee9-4a77-bc7e-6c280cfb8a2b	1	James	Other
+6170127c-14c0-4d00-b76f-cdcab045bbc4	1	\N	Other
+6170297e-0b91-11e8-8c80-fa163e8624cc	1	\N	Other
+6171355e-40af-47ef-81f7-b36c88aa9dc9	1	\N	Other
+6171e978-88c6-4c00-9072-8346080bc779	1	James	Other
+617505a0-8194-4a43-94bf-3ba0be917c52	1	\N	Other
+61770f90-8a92-4f3c-9132-1edc2cb73c19	1	James	Other
+6178fcb5-45a3-48f0-9a1f-02b4bfcf8b23	1	\N	Other
+617b69c7-2e31-4352-a646-359ade3a07a2	1	\N	Other
+617f4f3f-178f-4fce-abe2-d2f6d7a3153c	1	\N	Other
+617f780a-feb8-41bb-a224-04c5be7db6cc	1	\N	Other
+6182b788-0b91-11e8-892b-fa163e8624cc	1	\N	Other
+6186fc00-ead0-4017-9797-c15d1b3f1eea	1	\N	Other
+61872477-ce51-4073-b7c2-aa503d02e595	1	\N	Other
+618cfe43-dc69-41e1-9aac-3411c9bd85b3	1	\N	Other
+619010a0-1103-11e8-b214-fa163e8624cc	1	\N	Other
+61912a8b-459d-43a9-97ca-94a207ffd625	1	\N	Other
+61977d13-f4aa-4f92-a0c4-7e5495bd6a27	1	James	Other
+619d0b55-452c-4a2c-8e07-13d97b4cf866	1	James	Other
+61a17c0b-c597-42ba-9585-a63fed2eac1f	1	\N	Other
+61a2a36a-9e21-46bf-b08a-c7d2ab028448	1	\N	Other
+61a94af0-8fe4-4ef6-8f2c-8b1db18fca1c	1	\N	Other
+61aaa2a7-c6ff-44c4-b531-2d08ef7ab4d2	1	\N	Other
+61abff67-8eab-4028-a697-b6bc396a8eaa	1	James	Other
+61af3339-1c8f-41db-a33f-cc1e5f6af5a5	1	\N	Other
+61b0e8d3-e1da-4013-bd80-15977d4dd9a0	1	\N	Other
+61b5e5fe-0b91-11e8-8957-fa163e8624cc	1	\N	Other
+61b9ded4-0b91-11e8-a8af-fa163e8624cc	1	\N	Other
+61bcc77a-082d-46fe-91e7-8fa755a164c7	1	James	Other
+61c0247c-98bc-4ab4-addf-f3ed0f1254ff	1	\N	Other
+61c11de9-f35f-4aca-a2c1-2bb636c3a552	1	\N	Other
+61c3f09c-8113-4b1f-af08-ef4903306393	1	\N	Other
+61c5a169-20b8-4228-832c-cfca9e18205b	1	\N	Other
+61c6976d-1512-4c35-809e-04421089dcbd	1	\N	Other
+61c71f89-8bff-4d05-b3ee-d2a8f4067bd1	1	James	Other
+61c9298b-628d-4d5a-b1d6-86cd19f39af7	1	\N	Other
+61c95f8b-540c-457e-9345-e44c8ce256da	1	James	Other
+61cbac9a-7014-4a1f-870a-6799e08c5324	1	James	Other
+61cea5f5-a609-4a9e-8025-0868abb82bc8	1	James	Other
+61cfd4f8-040e-48a7-8949-4b925040f7f0	1	James	Other
+61d31f83-c812-4a2c-94dd-b74d820d1995	1	\N	Other
+61d36eb2-0b91-11e8-9322-fa163e8624cc	1	\N	Other
+61d3b250-2a30-402f-9e56-d024c752a080	1	James	Other
+61d70a30-4300-4e00-80d1-6264428e6272	1	\N	Other
+61da36e9-c2a4-4334-a690-2d8326555ab9	1	JAMES	Other
+61dc1129-e588-4980-9b49-938cba38e0ee	1	James	Other
+61dddcc2-e013-4616-91d4-96032ba4b7ae	1	\N	Other
+61e10c2d-20e6-4ffa-8ea0-5e134383fd6a	1	\N	Other
+61e5c88e-deb7-4ccf-857f-314e18505397	1	\N	Other
+61ed44c8-8a4c-4acf-9f5c-7efa53ab5bbf	1	\N	Other
+61ee9e1f-552c-4a61-8847-900618fbecd2	1	James	Other
+61eec0ab-c168-4240-a736-022a46b6304e	1	\N	Other
+61f3f254-33c4-48e4-a273-9c9794435e22	1	\N	Other
+61f6533d-978b-4057-bb01-6f135b905efc	1	\N	Other
+61f97b09-7ebc-4549-8849-b9a665777e10	1	James	Other
+61fd498f-1ba9-4eaf-9504-400c2ba9ba91	1	\N	Other
+62014a61-de15-44b0-b947-444ab6d8b9a7	1	James	Other
+62090427-647b-49c4-8258-5151f8e05a04	1	\N	Other
+6209ac66-8b40-4580-bfb8-965f02f23d02	1	\N	Other
+620a2a6b-caa4-4a13-8b28-689068caaf32	1	\N	Other
+620d19ba-4c0a-42d0-9e05-d49c8b63fd62	1	James	Other
+620d24bf-0e15-42b7-85db-532e72dc8df0	1	James	Other
+620d3ec6-96ae-49e9-b1e7-03d9fb3a6cfa	1	\N	Other
+620e5689-ad6a-48ae-8714-3874848db435	1	James	Other
+620fb7ed-a535-42cb-a39d-b649ac72a183	1	\N	Other
+62136c3b-2087-46f6-8ccb-1510c0825b92	1	\N	Other
+62155559-3580-4f6e-b303-693ad41f93bd	1	\N	Other
+621aca86-d429-4eb3-be2a-9cefdb992bb1	1	\N	Other
+621ce10a-0b91-11e8-8345-fa163e8624cc	1	\N	Other
+621d5eaf-476f-41af-9def-32839adc0e53	1	\N	Other
+6221389c-f8dc-425f-959a-4a709544c930	1	\N	Other
+622142d7-7862-481e-add4-15721e7db505	1	James	Other
+62257bc8-d987-44f1-b911-830b851fccbb	1	\N	Other
+622837d8-d226-423e-8e23-58ad166c7c77	1	\N	Other
+622a0f82-766f-4502-94ee-a0be139497e4	1	James	Other
+622aad3d-7af1-4ba8-b775-d75388991848	1	James	Other
+62306263-d7e7-4cc1-b326-ee84c76d0f1e	1	James	Other
+6230b6d2-39d5-4741-9902-3e6ecfebef6e	1	\N	Other
+62313c86-88d6-4372-a91e-29712a57cb01	1	\N	Other
+6231b808-6b18-4ab3-bdf5-a75a4b2c6cfb	1	\N	Other
+623f9182-96dd-477a-b747-b000b6836f2d	1	James	Other
+62432da8-9b9b-4310-925e-41638b72a4d1	1	\N	Other
+6245c21e-9c02-4b94-b9da-8ca4e96d46b9	1	\N	Other
+624b4a39-340c-4133-86ff-0662645b470a	1	James	Other
+62500040-761a-424e-800a-daadc19df6f5	1	\N	Other
+62549ca4-f415-4829-b683-b5d1c08b935c	1	\N	Other
+625a09a3-d563-4ddc-bbe1-6f4635e8c4a9	1	\N	Other
+625b4400-19be-4405-ad54-4c32abdbf25d	1	\N	Other
+625c7fba-a902-4671-abc5-84106a9c1308	1	James	Other
+625cd6e5-d8f5-4e75-a694-c0c817513250	1	James	Other
+625d3543-e3f7-4b8f-8abf-77e67f336eda	1	\N	Other
+625e03bd-bb28-486a-8b27-74e92bce3d4e	1	\N	Other
+62652ed3-cca5-41ca-9a9f-3232a60b9f5a	1	James	Other
+6266333b-5b41-47b4-92fa-bd66e69dfe4b	1	James	Other
+6266ba62-e0b9-4fab-8bdd-ebe644f3e2fc	1	James	Other
+62672d46-c700-464f-978a-9129a2b814eb	1	\N	Other
+62692e90-4241-4279-a185-2379a7fd8d33	1	\N	Other
+626ad986-f371-479b-810a-a0f1dfc307f3	1	\N	Other
+626beb50-9c81-44f8-81c3-7e2668a4532e	1	James	Other
+626d42b1-da81-47e6-9853-bc8965e27da2	1	\N	Other
+62705f86-062d-4087-80c1-b8e886df8989	1	\N	Other
+6273111e-bff4-489c-bbc0-821bf8de47a6	1	\N	Other
+62734528-ad50-47d4-839e-240ed31058d5	1	\N	Other
+62738bab-14d6-46e9-a0ce-5990f6e2a9e6	1	James	Other
+62759c42-c012-42df-858e-8ee7374769c6	1	\N	Other
+6277ac67-222b-4ea3-8de0-0be164db0a33	1	\N	Other
+627afd80-3d43-4d12-8fc9-23d0366e346c	1	\N	Other
+627fb05c-2b7b-41b8-b858-d4e3def42ebc	1	\N	Other
+6286526d-7e91-45f2-ad56-2c92d3f8584a	1	\N	Other
+6289fa52-a609-42df-85c5-33b906fcaf4b	1	\N	Other
+628c7e39-ce71-4b50-a38e-8d53bd5533e1	1	James	Other
+6290dd8f-2659-4a33-bafc-b51a7b45060c	1	\N	Other
+62933086-dfaf-4abf-adf7-a93800543bb2	1	James	Other
+62963e08-e415-4c23-a3be-07fa1b9d9f3e	1	\N	Other
+629cfe8e-be82-46fc-a4ca-f5c846b0dd42	1	\N	Other
+62b8715b-f577-47c6-ac53-b5bad09e095c	1	\N	Other
+62bc97fc-08e8-4235-b481-ef5f006fb152	1	\N	Other
+62bcd91a-4ea5-4e37-b72d-3cc4d8cde063	1	\N	Other
+62bef87d-7bb6-4176-8bff-90c6c5783f4b	1	James	Other
+62c58d81-ef6f-4637-9f43-9c420d84eb1a	1	\N	Other
+62c72de2-3725-4591-959d-9242aed152d0	1	James	Other
+62c92c29-2e3a-4fc2-b784-1a3321e85dd2	1	\N	Other
+62ccddc3-45f8-40d5-99c9-c41217908f4d	1	\N	Other
+62cf7b15-ebae-4cd8-a1cb-8ff4eb510e87	1	\N	Other
+62cf93d8-2397-4c56-805f-0dc16860fa80	1	\N	Other
+62d26f56-ed31-4d60-84e8-eb58c02a9867	1	\N	Other
+62d7e330-0206-4243-b369-03e237ca6f11	1	\N	Other
+62d9531d-d561-475c-aae5-a60aca4a8704	1	\N	Other
+62ddf9ef-ecf0-46a7-b4e9-627e442e4c78	1	\N	Other
+62dfb3d1-831a-4cc1-941e-0dc8f9816c63	1	\N	Other
+62e0c050-58db-4339-8434-977a6b62bfb2	1	\N	Other
+62e15ac9-39b7-4e75-bde3-d4572c3aec03	1	\N	Other
+62e77432-2bef-4e12-a333-95702dfffda3	1	\N	Other
+62eaabe5-efa4-4bd9-96fc-afa0d9681445	1	James	Other
+62f11019-2481-4ae7-a425-b1af920d6072	1	\N	Other
+62f49f09-ce0a-4155-83ed-f2a8ee967d38	1	\N	Other
+62f657ec-fd43-43aa-8099-bcc613a914e8	1	\N	Other
+62ffccec-6447-420b-b6ad-d982fae979a7	1	\N	Other
+630083f4-cb91-447e-adaf-4aeb79679b85	1	James	Other
+6301c467-ebeb-4756-9a4a-15759db61169	1	James	Other
+6301d51f-3d36-46a9-a581-f37a9c524e25	1	\N	Other
+63029092-59e9-4e0b-93ac-5f15436c75db	1	James	Other
+630a71e1-a0d6-4365-8a7e-4c45c37b904c	1	James	Other
+630e7757-36a9-4813-a0ae-bf0e6f04a336	1	James	Other
+63137af3-ed5c-4e2e-a7d0-1ace0fa2830f	1	James	Other
+631495c3-dbed-479c-ad73-b661f654b0f1	1	\N	Other
+6316e901-dec6-4e1c-aec5-05b1e83969f2	1	James	Other
+6317fc45-df0c-42c2-8e2e-70acddbfd210	1	James	Other
+632020b8-cdbf-472f-b676-f29fb1a005a6	1	\N	Other
+632bc98a-e30a-470a-996d-630eac45dd0c	1	\N	Other
+63398487-2146-4b5b-a50d-b7c3a5092d9e	1	James	Other
+633baa6c-a167-48ce-8c30-0881625b1b85	1	\N	Other
+633be276-3152-48d0-9558-6c3330ce2f67	1	James	Other
+633d5bbc-19be-497a-9f16-b324f35e85f8	1	\N	Other
+6345e09b-9d09-41de-bf17-9e0ac203a363	1	\N	Other
+6348b508-beb4-4643-84f9-8d1ab7c00e31	1	\N	Other
+6349db00-7d39-4272-90ea-f37ef38e77ba	1	\N	Other
+634bae77-686d-4058-9208-7bb4c4d3d0b0	1	James	Other
+634d68ea-566c-454b-bd93-7e8173fe76c5	1	James	Other
+634d71c2-a461-4ada-a732-90508020bc56	1	\N	Other
+634f2d44-ea8b-41e7-a89f-2afc6997481f	1	\N	Other
+634fdaba-7c52-41f7-b2e7-c02bbf2b3a3f	1	\N	Other
+635cd0a1-006d-4a89-8996-a655c16cd13a	1	\N	Other
+635f6df4-d7ff-4f8d-87a9-7fa459d792ef	1	\N	Other
+63629240-4a55-42cd-b376-4a77f1598200	1	\N	Other
+63654bc2-9ada-4570-840a-fca30d0603f2	1	\N	Other
+6365ee51-583e-4236-84c0-ae0908ba1594	1	\N	Other
+636c0a05-7ea4-4728-b796-43a9c1966394	1	James	Other
+6370da8e-291d-4d47-bfec-510a0dbea96d	1	\N	Other
+63719173-14c5-488b-8951-7d964d62b535	1	\N	Other
+637225c2-54e5-442d-948a-3cf7202eb330	1	\N	Other
+6372f2b5-52c1-4a16-88a8-693d32bd24e3	1	\N	Other
+63777020-1856-4950-be80-4dd58c97ac87	1	\N	Other
+63777242-616c-487e-a8ca-14ce5a930932	1	James	Other
+63797c33-04c4-46d6-bf4c-2be9fdb206d4	1	\N	Other
+6379e534-aa8f-4910-9995-c4ffa1f6076c	1	\N	Other
+637ac3a5-8745-4170-887e-902d18423dc0	1	\N	Other
+637d87b1-af69-4183-9de7-a370253410e9	1	\N	Other
+637f6ce3-029d-4499-be93-34c80890f2d5	1	\N	Other
+637f733b-27db-412f-9fc5-245f67ee3e32	1	\N	Other
+63865e1e-bde0-4022-8316-e06f7091cfc5	1	\N	Other
+63877535-b274-4636-903c-8caaafd7b5ef	1	\N	Other
+638aee2c-1efa-4f1f-aecc-3db853cc610b	1	James	Other
+6396f0e0-53dc-4080-be63-4b40336dfa8d	1	\N	Other
+6397a609-e2cc-470e-8abd-c54cc2f5dbf3	1	\N	Other
+6399935f-3f94-4c9a-a061-0e144f5e4114	1	\N	Other
+63a4b0f8-3151-4e8b-b8cb-a6ae3c058d9e	1	\N	Other
+63a5f831-0966-4f2e-b7c3-7d9fedb6cf15	1	\N	Other
+63a87ccf-1d4d-465e-85e8-8f8665dc660d	1	James	Other
+63aa18b8-facd-462c-a1f9-df774d2cdc58	1	\N	Other
+63ae84b0-a3fc-4aab-9aaf-dbcec228d37a	1	\N	Other
+63b1392a-5f6a-41e3-abc9-a1d8b26eeb0d	1	\N	Other
+63b27b6f-beb8-49dc-b5dc-07d5136d19d6	1	\N	Other
+63b2a492-1ba0-42a1-9240-885ee45a59b5	1	\N	Other
+63b2ea16-161d-4217-bd44-a8b743b4ec8f	1	\N	Other
+63b54199-80c5-4325-9f0e-e6310ab2d886	1	\N	Other
+63b599e9-0399-4d79-b775-4ee452b8e155	1	\N	Other
+63b62627-0cf9-44fc-9f90-6bd71c865fa8	1	\N	Other
+63b7f3eb-dfd5-4dd8-a61b-1c8d20d6414e	1	James	Other
+63ba9699-49d8-4902-8378-ababe36ca480	1	\N	Other
+63c17dce-5090-433e-af3d-283d9de32ff0	1	\N	Other
+63c2e4d7-d4d2-4636-a7b0-01f73190845c	1	\N	Other
+63c655cf-3357-484d-9487-f95f48c75d5d	1	James	Other
+63c71a24-49cf-46b7-90f7-e0b728367f8a	1	\N	Other
+63cdb2dc-35ac-4d74-a75a-675aad33657e	1	\N	Other
+63ce4238-5ada-4159-bcce-6000fddee4d6	1	\N	Other
+63d01bed-24c8-489c-b198-eb6ee860f728	1	James	Other
+63d15140-d4ba-4857-90e6-5a25da0d3da6	1	James	Other
+63d38a45-b28b-4d16-8f6f-76420bf8102f	1	\N	Other
+63d8016c-0167-4cdf-865d-d3ec18515c1c	1	James	Other
+63d9bc32-0c59-4f8c-b875-9bdf8aecc821	1	\N	Other
+63da7ea5-cde9-4b57-b38e-b159535dcee6	1	James	Other
+63dacc84-48bf-4a9d-84b9-6e2f55de12fc	1	James	Other
+63e1fc16-4097-45ce-97d1-f740af606e21	1	James	Other
+63e547db-d638-4e65-b656-687d0ecd0dca	1	\N	Other
+63ea7bdc-ac86-40b4-9656-791c7bc497ab	1	\N	Other
+63ec692c-6634-48ee-9a59-650656e041d4	1	\N	Other
+63ed8028-8391-4c95-ab7e-0a2834c64fb9	1	James	Other
+63eef12c-d845-4e8c-ab01-d8967b026552	1	\N	Other
+63f419c9-92cd-48de-8f76-05a10e383dd3	1	\N	Other
+63fc3b5b-0cd1-4373-b092-b781d0aacca2	1	\N	Other
+63fd574a-163e-4d9a-a5b9-0ef5747249a5	1	\N	Other
+6404441b-f8d5-4b5f-b275-fd017206f858	1	\N	Other
+64113ce2-f17e-464a-bbb3-cbe9cdf8fd88	1	\N	Other
+6412908f-951c-44ae-bbca-2516cd0b2650	1	James	Other
+6418b1b8-255f-11e8-9020-fa163e8624cc	1	\N	Other
+641c9785-5418-427e-b670-e2edee7124ff	1	\N	Other
+641fe9c0-8e21-4dd2-ae96-f1986e111239	1	James	Other
+6420f755-4e66-4341-a57f-f315bd45ae62	1	James	Other
+64262cdd-bbb7-4f7e-88fa-364cbd67f34b	1	James	Other
+642b010c-35ed-433e-b1f1-68cde8602e6b	1	\N	Other
+642ec99b-f00d-497a-8e33-fc52cfc1a504	1	\N	Other
+643112a0-8890-4940-a4d2-453082aa8398	1	\N	Other
+6432f03d-99bc-47cb-9755-3b66395119f3	1	James	Other
+643af7c4-66d9-428e-82a8-11d669bdab64	1	James	Other
+643d4686-467b-48b6-9df9-0560ebd3a80f	1	James	Other
+643dcb13-efc9-41e4-8df8-d208159dd507	1	\N	Other
+643df6ce-816a-4cac-9bf9-1d1ce8a8714e	1	\N	Other
+6440f3c5-7c43-4c3b-9143-1182cbdaa115	1	James	Other
+644148d7-8fc0-4a6b-9564-b73c7b7ab3a1	1	James	Other
+644165cc-4df2-4b57-ac52-90e16818c8e0	1	\N	Other
+6441693a-ac7e-4c00-88a3-202ab3aab458	1	\N	Other
+64485a80-255f-11e8-8755-fa163e8624cc	1	\N	Other
+644a90a1-c3eb-4750-9834-93377d857fe5	1	\N	Other
+644c63a1-0f82-427a-b603-642f15627949	1	\N	Other
+644cf553-28ec-4338-9598-7f2f05f829ec	1	\N	Other
+644d664a-fff0-4b8c-bd7c-65a484877b80	1	James	Other
+644eceb6-610b-4e12-9c89-44a3dce3afae	1	\N	Other
+644f8307-7836-4a19-99bf-d723be09e4e5	1	\N	Other
+64502ed2-49b6-4719-a248-eb6922dc6e82	1	\N	Other
+6451d91b-887b-4129-a886-3c09d113fbf3	1	James	Other
+6453b787-3865-4b23-aff2-a2e2811bb582	1	\N	Other
+645a7488-25c6-430e-90d1-cce9b3fea932	1	James	Other
+645da619-b0bf-47b4-a821-dddd5c87a959	1	\N	Other
+645f3215-e526-4a9e-9e08-b31160305623	1	\N	Other
+645fd1a8-e8e3-4ab6-80f0-23366f2d6333	1	James	Other
+6460abc1-1d6d-41c3-8be8-c83f135dddf9	1	\N	Other
+64635efa-acce-4db3-aa0d-629004eaebaa	1	\N	Other
+6464d213-a0c2-4152-85d3-d93fb1be6428	1	James	Other
+6465ee59-f4ce-4418-9057-ba7fd9cfaff5	1	\N	Other
+6467e5db-3d1c-4cab-9bf1-ff24e37c38d1	1	\N	Other
+646ee05e-1bcb-402d-ba30-626c3b864310	1	James	Other
+646fbd22-df11-4312-bfe6-5b0f970c78b5	1	\N	Other
+6470ba8a-e423-4b4e-b9df-7d082cd64d58	1	\N	Other
+6475934f-3576-431a-b05c-4dcd8159366e	1	\N	Other
+647645c1-4b73-458d-8035-21ec85bde636	1	\N	Other
+6478b65c-9c3d-4e6f-b5c1-cedb562909f4	1	James	Other
+6479de5c-7f8b-4d74-80a5-70e1642a0081	1	James	Other
+647a36e8-f3c0-4c03-9089-91799b3152af	1	\N	Other
+647b0f57-5dc2-40b0-b9cd-43d16da7c511	1	\N	Other
+647d20b6-ba44-4762-b5e6-5c0b9524abd7	1	\N	Other
+647db60e-9e62-40b1-8328-a32e02f0ea8d	1	\N	Other
+64823e29-193f-4c5a-a7e7-4ef7ab898170	1	\N	Other
+64831a22-6828-4ba9-a6ee-a231e1c91545	1	\N	Other
+648552ff-a446-4dff-8dc3-d134ae640ccf	1	\N	Other
+648967f4-4f52-4839-a2c6-a44543a2d3d3	1	\N	Other
+648a8522-2697-4500-ae6d-ca9f0c7867cd	1	\N	Other
+648be4cf-b69c-40f2-9f36-24f3d15aa5c5	1	\N	Other
+649220a5-a377-4387-b497-04d818b73cb9	1	\N	Other
+64945e04-8e6f-4569-8e67-ee056e2af31d	1	\N	Other
+649730e5-d81c-4984-a022-113fd9402337	1	\N	Other
+6498d400-575e-443d-b330-af6d5b0d6e2e	1	James	Other
+649a97a7-fdf3-4138-b251-6e46bb569bc2	1	\N	Other
+649f426c-2055-4a3c-9e44-d69794a750eb	1	\N	Other
+64a36713-2c9b-4280-9f75-66a8ce979e85	1	\N	Other
+64a869f3-d3d8-4478-a0e0-19e79018aad3	1	\N	Other
+64b0ac99-fd60-4fb7-94c4-57efb29ef5e4	1	\N	Other
+64b5e31e-aa37-4335-8bb4-61fadee9daf2	1	\N	Other
+64b86318-6ad6-40e7-84b5-e424fa19f3df	1	James	Other
+64bd9d26-2ab7-4f41-8607-377c75e3fd1b	1	\N	Other
+64c2bda8-8b42-4bb0-ba43-c0c81d0faedc	1	\N	Other
+64c53396-c310-4643-8c17-5888f0144146	1	\N	Other
+64cf26de-ad5c-4022-8df5-76e7c7ce5b05	1	\N	Other
+64d26637-9fe1-418a-b6b5-2f2b834f7666	1	James	Other
+64d921fe-2809-43a2-882a-dfeb73ff053d	1	\N	Other
+64dd164d-5b7d-4b80-b04e-b12ac7d471c8	1	\N	Other
+64dec972-20ea-4d7f-9235-187abf8ed10b	1	\N	Other
+64e17377-eee9-47a6-8a87-bbb5b6faa706	1	James	Other
+64e48084-31cf-4b5a-ad78-a7ab7982dc36	1	\N	Other
+64e915e1-ba4d-4b52-98f1-a3b6a6f19b87	1	\N	Other
+64ecc747-d83e-4a8e-ad09-848df1708866	1	\N	Other
+64f096ad-8430-48d1-81eb-6d12be68096f	1	James	Other
+64f14df2-51b7-48d8-9be1-8160bb013052	1	James	Other
+64f1ce23-ab98-47ac-bf95-531382e7ebd6	1	\N	Other
+64f29d15-6fdd-4e53-8b9d-21a82388c240	1	\N	Other
+64f5fd98-297e-4c1f-bb89-0fa44bcf5675	1	\N	Other
+64f9e9e7-89f9-4809-b561-6448c9865d4a	1	\N	Other
+64feebad-311b-4665-8864-08c3a8269eb1	1	James	Other
+64ffe9cc-1612-4b23-9d97-d45a05eb3e83	1	James	Other
+65008328-8bc3-40ae-8754-823b5117c019	1	\N	Other
+65021f01-cef8-4c5a-86c5-c6c9e628bdcb	1	James	Other
+65035065-574b-48ce-8c99-7f7c4fc783a1	1	\N	Other
+65041ec3-59f6-4343-ba43-7de652cf0998	1	James	Other
+6505a638-4a27-492a-9217-efe3d0a35b97	1	\N	Other
+65083520-9623-460a-88a6-5cb3693a23cb	1	James	Other
+650b7ae5-4b3d-45bf-8df3-e6dfb05ed3ef	1	\N	Other
+650bb1e2-edaf-4d01-aaf9-ecf45f0d7c83	1	\N	Other
+650edba2-d93c-48e7-8046-d23db8197c31	1	\N	Other
+650f1afe-f796-4c6b-9264-51d4a046ff09	1	\N	Other
+650fd526-4adc-46c0-a3cb-64110da15c8e	1	\N	Other
+6511f8a4-ca77-4c29-85e1-53d14c769ebc	1	\N	Other
+65135bbb-03a8-4000-b914-f6942d383356	1	James	Other
+65168d6e-e06e-4396-9dce-a4bc8a437b68	1	\N	Other
+65173bfc-de80-4504-9633-a8f9680e5ba3	1	James	Other
+651b5cf3-85dd-49f7-8fcc-ef1ea451f541	1	\N	Other
+651f4346-6e58-4709-8e1c-f2405c4dcac9	1	\N	Other
+651f5fb7-98c1-4cc6-9394-2af5c623f2cb	1	\N	Other
+6524bdd0-c5d0-450e-bd16-ca60007ef3d6	1	\N	Other
+65255334-e156-401c-abc8-786d55364b09	1	James	Other
+65267ed5-7859-4dcb-aa94-036ffd0aa315	1	James	Other
+6527b0a4-bc2e-4801-b401-ac2f6336a4f3	1	James	Other
+65289c1a-4e2c-4144-a6a8-dc342c4f0318	1	\N	Other
+652a7bde-b1f7-4b23-9ec5-93529ac1554d	1	\N	Other
+652c5d9b-6a3b-4b50-9199-3972be2a97b1	1	James	Other
+652cc9c4-c676-4317-bdeb-ddff4e2ddeff	1	\N	Other
+653112bc-088d-4e46-a822-17934d2a33c1	1	James	Other
+65313db5-1442-4097-8244-9caeb8f4ff6a	1	\N	Other
+653780db-49df-47a8-9215-962d93664aca	1	\N	Other
+65380515-274b-4215-8870-eeb51d63fcc8	1	\N	Other
+653a4914-ee00-42b9-b674-e1bd1993c995	1	\N	Other
+653bdb28-395d-4576-8549-c5d17322be5e	1	\N	Other
+653f88b3-6e7e-49b7-a787-e574c69ae6d8	1	James	Other
+65426989-6f61-41a5-80c1-04ac915e2383	1	\N	Other
+65431169-1071-4392-b615-f266c34e1782	1	James	Other
+65431ea0-e9a3-45ce-8abc-538b299398fd	1	\N	Other
+65513c98-861f-48c6-bb8c-6619870da802	1	James	Other
+65571f1a-689e-46bd-a462-91581ff4e7e0	1	\N	Other
+6559a1b1-b87b-46fe-b462-c2628bf67165	1	James	Other
+655bd419-daca-4d5a-94d3-00fe3eefa94a	1	\N	Other
+65611042-6b9a-44e8-90f1-7bdd243b4ec2	1	James	Other
+6568d617-a405-40e2-90a6-4ee7b8e75e75	1	\N	Other
+65691118-090a-405c-add6-64c4cb158da3	1	James	Other
+656d4203-d454-496b-b354-9d65cb8917d8	1	James	Other
+65714f8d-2449-4c18-a58f-54568bd16a4f	1	\N	Other
+65728f76-20e9-4051-b362-041b53952c24	1	James	Other
+657828ac-61f6-4222-89d9-2f6a2af4377f	1	\N	Other
+6582c5f6-359b-466d-b218-ddc3e9e381f5	1	\N	Other
+65847958-7174-48cd-9eeb-9971305b0d2b	1	James	Other
+658746b7-f8d1-4800-bf08-4cec8d440435	1	James	Other
+6587d036-4d05-4c4a-b96e-c8fe2a95eab8	1	\N	Other
+658bc759-83eb-4409-b078-0c99e1dc5b3d	1	\N	Other
+658cf4d3-b270-4916-9235-31cf5bcb0a6e	1	\N	Other
+658dc639-f231-46bf-870b-3aff02b7f5d9	1	\N	Other
+658f1301-0449-4578-985e-f11d647ec1d0	1	\N	Other
+65930a9e-2867-483d-81b6-0d55680153e3	1	\N	Other
+659716bd-0f2e-4590-b54e-00b2cdf1e52a	1	James	Other
+659e2393-b4fb-459f-9e97-75c07962800c	1	\N	Other
+65a812eb-b091-432d-940a-83d394fa6733	1	\N	Other
+65a8d8f5-6cf5-474e-a9c6-5388b15f461d	1	\N	Other
+65a9ca92-c9a4-4c7e-9029-61a6ac180095	1	\N	Other
+65ae7e6d-2eb9-4d78-98f0-8b714ced6bee	1	\N	Other
+65b26fa5-d181-436a-820a-11013976c4b3	1	\N	Other
+65bbee49-206b-4e5f-b6ef-6dfaead961af	1	\N	Other
+65bcd675-d171-4568-a76a-2ed42c10a10c	1	\N	Other
+65c073b0-994f-414a-815f-41a36a05efd2	1	\N	Other
+65c7f164-0da5-4d9c-aec0-40be43b02cb8	1	\N	Other
+65c836fe-961a-4abb-886f-d9c57c44dc71	1	James	Other
+65cd0800-6543-4e83-8cdf-b4280bba2970	1	James	Other
+65d099f2-b880-49c7-8801-ec8219d92461	1	\N	Other
+65d3c150-1f30-4a3a-8417-7e13b40a30a6	1	\N	Other
+65d4a275-471f-4cd9-81e5-1871e632fe45	1	\N	Other
+65dbbf9f-bea9-4d7c-97b6-91055cf8898b	1	\N	Other
+65de159e-a7b4-4fae-8daf-d7a1d25a42cf	1	\N	Other
+65e10f67-97ee-40f5-8879-aad60631046b	1	\N	Other
+65e446a1-2cae-4f35-a427-61536e4a0a2d	1	\N	Other
+65e8e378-0862-4163-8b29-ac8c99f5e2db	1	\N	Other
+65eae0c9-f30f-4f23-a7a2-cb2ca1a9298f	1	\N	Other
+65eb0da8-d653-4479-a041-9e8d64c25ec6	1	James	Other
+65eb5bd2-cc5f-42de-af03-e425cd6a1bdd	1	James	Other
+65ec1dea-da30-447c-8550-cd42a1041468	1	James	Other
+65ede0fb-95e4-4142-b692-45ec4fdf2a98	1	\N	Other
+65ee53ee-d354-45e1-9426-defbbf83527d	1	\N	Other
+65ef1810-ddd9-404c-9dd0-bd870c705ceb	1	\N	Other
+65f217dd-f8af-4b9f-9eaf-3b76bcf54022	1	\N	Other
+65f311f5-303e-483c-af3c-b1b78e567024	1	\N	Other
+65f4300e-ea9d-4d77-9446-0490cbd1dfba	1	\N	Other
+65f6d848-bb66-4ca3-b2db-2ef151025ccb	1	\N	Other
+65f830c2-ae2f-4f8f-9d43-9c094ccab00d	1	\N	Other
+65fa2abf-6d25-4e47-9b0a-431503ef5965	1	\N	Other
+65fb5613-d1d1-4d31-a3a0-88a44995857b	1	James	Other
+65fd3f9b-f2df-4418-a2a2-760d476d9cfe	1	James	Other
+660537bd-241b-4412-a369-977b9c5ac4ab	1	James	Other
+66090420-712e-4fcf-ba9a-a535c7782405	1	\N	Other
+660a8d1a-0f3d-4856-8716-b963e40a9067	1	\N	Other
+660e0bd1-3dac-4f28-886a-7d36a7f08dd8	1	\N	Other
+6613286e-d49c-49ea-aadc-ca15fa9170cc	1	\N	Other
+66135095-93cc-4aed-a575-5120632b1c5b	1	\N	Other
+6615b582-0643-4f70-a335-e0cfafc1ca74	1	\N	Other
+661b9853-a455-4255-99fc-561dcd0c64f1	1	\N	Other
+661e5937-c9a3-470b-a9c9-d33ecf68b7df	1	\N	Other
+661f5896-5efe-4b99-b1e7-be50c905b9a1	1	\N	Other
+6623fd9a-985d-425d-b6b6-358a22625b38	1	\N	Other
+662416dd-a997-4693-ae03-bfc07f5d6df2	1	\N	Other
+662862d3-f5c9-4dda-a321-10bbfc161c66	1	\N	Other
+662adc38-89d3-4c23-8965-20481bf86498	1	James	Other
+663217bc-f1f0-4c96-9329-e2be484efd84	1	\N	Other
+663649ae-3646-4cd1-b45e-706a64879abb	1	\N	Other
+663748bc-9727-4203-b6b7-34d6a7c94ed0	1	\N	Other
+663a8072-8d67-4b95-a73f-8361640bcea5	1	\N	Other
+663aabbc-5ab8-456e-9a6f-d8373a746227	1	\N	Other
+66435428-efce-4598-a2c3-a87d26aef2e1	1	\N	Other
+66439c26-a014-42e0-8551-b9c28564a293	1	\N	Other
+664422ec-8ffe-4176-b9f6-1dce6eab6a67	1	James	Other
+664452ec-5048-4648-82b4-0a97ea57cecc	1	James	Other
+6649e5f8-c7e6-4ab7-9c65-4edbd2ebb527	1	James	Other
+6653adf4-b357-4283-9a26-049444ebf02f	1	\N	Other
+6654566a-685d-4413-b0d3-7abe1eed1f81	1	James	Other
+66548687-f9bd-4db1-946a-3b377808b41f	1	\N	Other
+66571048-c94a-407d-a1de-b4ee8b87c692	1	\N	Other
+665821f2-c74e-470e-a6a0-2277e951404b	1	\N	Other
+66599a07-ef70-4ce7-ab46-0c80e914d09a	1	\N	Other
+665d1d17-7c75-4065-b631-d99dc3415bfd	1	\N	Other
+665e1103-e0b0-4358-9efd-5b7771da6a53	1	\N	Other
+665f0f6f-7aea-4fb6-af56-c359d00d2976	1	\N	Other
+665fd3cc-8bb8-4f04-b8a5-d294cb0793ce	1	James	Other
+6661db60-04ab-485e-be0d-4a908edbd35b	1	\N	Other
+6664cb9f-d191-44c8-8b92-8f56d9c98065	1	\N	Other
+66663f42-e1f6-45cd-9bb3-f4ab1c58880d	1	\N	Other
+666727fe-1ef0-467a-9b21-0705eac93194	1	James	Other
+666802c6-2996-11e8-9b57-fa163e8624cc	1	\N	Other
+6669a12a-ccbb-46b2-a883-f10ab5df2ad4	1	\N	Other
+6669b715-d842-4b09-8b79-71d35f36b4f2	1	\N	Other
+666ad108-fda4-4777-a6d4-2157331d1b6c	1	\N	Other
+666f01eb-9c57-4cb7-8a31-0ae840096d23	1	\N	Other
+6674e02c-0a3c-4670-b0dc-3be21398109e	1	James	Other
+66777190-f3cd-4825-9645-3b484efe2717	1	\N	Other
+667955fe-88ba-4e8f-b8e0-ad9d0a309100	1	James	Other
+667e0e64-6663-4a06-b720-5c569262addb	1	\N	Other
+667e8942-22d6-4ccc-b129-280cd3888530	1	\N	Other
+667ed237-d1a0-4999-b26a-65f9b9d4aa32	1	James	Other
+6685ae7e-6a92-4db2-99e9-dc870d0047d4	1	\N	Other
+6691f0ed-7d0e-4ef1-ac3e-4c741e47b645	1	James	Other
+6692244a-89c7-4a3c-a919-2a34d41347c1	1	\N	Other
+66976218-58e3-4efc-8b54-7f94a6fe2025	1	\N	Other
+6697e494-7a2c-41ef-8fef-11952487f371	1	James	Other
+6697e916-56da-4775-9541-3cc3efb5474f	1	\N	Other
+669c37ad-da72-45f7-a5de-e2be90dcdebd	1	\N	Other
+66a4546b-fabf-4f71-9174-7d9d95433243	1	\N	Other
+66a6bd4c-65dc-4ae6-a7e8-40c1c764a14c	1	\N	Other
+66a8b149-18ea-4c2d-802b-22cfa8332e25	1	\N	Other
+66add08f-9e48-434c-9697-6ed4007af772	1	James	Other
+66af040e-93cd-41cf-864e-2a35a10b37b6	1	\N	Other
+66bc9cc5-5dba-49e3-86be-db2f2ad3f862	1	James	Other
+66bef1aa-8f47-4dd2-94a1-57a9a2defced	1	James	Other
+66bf47f8-819d-42be-bac7-62859a4a23fd	1	\N	Other
+66c20075-ad66-4dc1-910b-2cb10a771684	1	James	Other
+66c5cd02-ce00-436c-9350-92fbc5301c53	1	\N	Other
+66c65cbc-b5f8-4b54-a039-c6e3a5293cd4	1	\N	Other
+66c6e363-0885-4362-a4aa-e9b23933dc1b	1	\N	Other
+66c7d07a-b252-4809-8474-fb76849c3acc	1	\N	Other
+66c84ac1-f340-416a-8e61-440a82f00e92	1	\N	Other
+66d56992-833b-44b0-8634-7f53d712531b	1	\N	Other
+66dcbd1a-f09b-4a1f-9311-55f047c8c962	1	James	Other
+66dcda9c-2996-11e8-9c11-fa163e8624cc	1	\N	Other
+66e528f5-7c08-455c-9c65-c7c4346dff43	1	\N	Other
+66e62230-5bca-4690-b5ad-e9aabdf6077b	1	\N	Other
+66e74c8c-3d01-48c7-ae03-b14d277453bf	1	\N	Other
+66e78f1d-025c-4626-87d1-b396e74ec754	1	\N	Other
+66e82667-a474-4e13-831c-1fa6773e7198	1	James	Other
+66ed9fc3-5759-49fa-925c-0658372e6380	1	\N	Other
+66eed2ad-f4e0-4cfa-9f02-983f2dfb640c	1	\N	Other
+66f1d0a4-d1d5-4532-848d-cc3ce92444eb	1	\N	Other
+66f3e50e-c5b2-4452-bd66-acc66530f6c6	1	\N	Other
+66f984bd-2d1c-40c7-a0f2-ec0b9648af10	1	James	Other
+66fa3998-e48f-4dfe-b070-92c02f998798	1	\N	Other
+66fb34bc-571d-4d65-8372-96ef6b0f57d3	1	\N	Other
+66fb96b0-1672-4204-aea5-9c2c272e922d	1	\N	Other
+66fdc9c4-2044-48dd-8d09-ae603dee3e13	1	\N	Other
+66fe5a18-68fd-40b5-b831-8a9661d5d53c	1	\N	Other
+67011e8c-594e-46dd-9327-20ba7120b226	1	\N	Other
+6701db2b-1878-49b0-82a4-f3afbf5fda42	1	\N	Other
+67038f34-ef33-47f9-8c5f-baa35c3c2d93	1	\N	Other
+670735be-5778-4452-b0ba-fb2afe4ba3c5	1	James	Other
+67118bb3-34dc-467a-8292-f0529027c35e	1	\N	Other
+6711912b-a046-4fb1-8bd4-809d6097d558	1	\N	Other
+67158e4f-737a-4d35-b6f2-3b4d9f435b84	1	\N	Other
+671da85c-5e48-421c-8b63-95896f461dd2	1	\N	Other
+671e9fb1-5517-4da3-8555-1f847bd2268c	1	\N	Other
+671f4bc2-467a-4fe5-a061-56267a22d44c	1	\N	Other
+6720abf2-eab4-4b91-a38e-ea4acb6066a4	1	James	Other
+67328cc5-f175-42b1-99a1-3007014aa224	1	\N	Other
+67387e54-d47b-4b4c-848a-459be0d09cac	1	\N	Other
+673af214-f44c-4761-8889-2b2b894073d4	1	\N	Other
+673e6408-2526-4010-be7d-1f3ae4a0fef5	1	\N	Other
+6740689e-c941-4ca0-b62c-7bcd07a020fa	1	James	Other
+67414c3e-32e9-47dd-938f-a579692e038e	1	\N	Other
+67461c39-d2fa-46ef-9842-3020f5e98590	1	James	Other
+674691e0-1abd-4d76-9c77-c5f5d95d9b96	1	\N	Other
+6749f1db-53d6-45b5-9d5e-43c7aa061ebf	1	\N	Other
+674b5372-45b4-44b7-8885-04225fec45cd	1	\N	Other
+67536f7e-3b8f-496b-981a-6f30f65149b3	1	\N	Other
+67547506-1b95-4908-9584-14809e254000	1	James	Other
+675c638a-3cba-4573-b43c-9a33db407725	1	\N	Other
+6766c34b-d87f-4dec-a3e3-744bc8619449	1	\N	Other
+6767ece8-12ac-4e87-8346-88a1e500bb2e	1	\N	Other
+6768c659-4f10-463b-aa83-24a0723b45ed	1	\N	Other
+67693211-6594-423e-98b3-5e8736fe3a64	1	\N	Other
+676ebe17-fab9-4f80-abc2-1717cf651ab3	1	\N	Other
+6775a468-e292-4212-b539-996227dcb8c4	1	\N	Other
+6776523a-6fd3-4abb-ac59-543dd9e83a87	1	\N	Other
+6778d398-4313-4437-8c43-c360aa12c8db	1	\N	Other
+6779a02f-8a84-4640-b3aa-44ed61bb5e2f	1	\N	Other
+677af32d-05f0-4f99-a894-46f9566012cc	1	James	Other
+67806ae0-f119-461e-baf1-024dd1e77929	1	James	Other
+678256d0-99aa-4709-b251-764432a2bb5a	1	James	Other
+678571ba-4606-4537-b7ba-a2813bf339d0	1	\N	Other
+67865df4-fc07-4d0c-9b97-99a87a56cc29	1	\N	Other
+67890151-86d8-4be5-bac3-bb232dde034c	1	\N	Other
+6790bb0e-e1de-4d6a-af22-e63d8a5bc5ac	1	\N	Other
+67970d64-b11e-4303-88df-4918d150c548	1	\N	Other
+6799fa2a-c5a1-4e39-ad13-e5b0dfca2208	1	\N	Other
+679b4db3-38cf-4604-b684-dff8558c5079	1	James	Other
+679cdecf-29b5-47a4-a6ea-379922ed9054	1	\N	Other
+67a4d6b3-77fc-422e-9768-1fb84fba0609	1	James	Other
+67a53c7c-44a0-43de-b46f-dfaeb4a418dd	1	\N	Other
+67a70b59-0e45-46e9-a81c-0f77a15288fe	1	James	Other
+67a77976-7f2e-498b-ab7e-e0708e786e02	1	James	Other
+67ae193a-6052-4b19-b970-43462404eb6b	1	\N	Other
+67b13ad0-5adb-4404-9102-fd413f48dda0	1	\N	Other
+67b9197d-3bfd-4a10-a268-39d163036699	1	\N	Other
+67bebe30-e04e-4f6c-ae03-0f33945f55c5	1	\N	Other
+67bf26eb-2c9f-47e4-984d-e738704b7850	1	\N	Other
+67bfbb20-8733-422e-86c6-bb64124b3dbc	1	\N	Other
+67c062ae-9203-4be7-8465-20a04c18a7e0	1	\N	Other
+67c132cb-40b0-4ab1-93c0-e3703791c9e7	1	\N	Other
+67c86d75-7999-490f-b5b7-60ea524a5f3e	1	James	Other
+67c8b0c6-6516-4e17-ba54-9d3343ea8cb6	1	James	Other
+67c928e5-fb10-46db-915c-9757817cdc60	1	\N	Other
+67c9891a-2778-49ad-ac4e-6639ab6be803	1	James	Other
+67d04d7f-0497-4f7c-9e72-4340ffc684e7	1	\N	Other
+67d3243d-a3c8-46a6-a6ff-4d3edf234eb3	1	James	Other
+67d94ccc-5c22-4f1d-987b-6a821a2f6cab	1	\N	Other
+67dda09a-8612-403b-9a05-483f7884a43f	1	James	Other
+67ea7b9e-cd77-41b7-8bf8-59270c49d419	1	\N	Other
+67eda6c9-35b9-4465-8951-3d92e2733a94	1	\N	Other
+67eddc33-b20d-4e5f-a69a-2518e0461831	1	James	Other
+67ee0926-a296-41dc-8772-43997e285655	1	\N	Other
+67f18a08-8a89-4af4-82f3-ddc130c824b3	1	\N	Other
+67f2ad57-79d4-438c-9038-54fa9bc6b180	1	James	Other
+67f38994-b167-42c6-9158-28b672f69db2	1	James	Other
+67f50fda-ab5b-46d3-a692-3a08008467d7	1	\N	Other
+67f6ae9a-c2f1-410f-a849-a91d5cf47e68	1	\N	Other
+67f957df-e1c6-43d4-88ad-5c62b3729ea3	1	\N	Other
+67f98d4d-e46a-48f2-9f4e-ed7833ed1bd1	1	\N	Other
+67fd46ab-f33a-42f7-8e36-4994d804061e	1	\N	Other
+67ff1e64-d7ad-4d56-888f-c7a6459e1c92	1	\N	Other
+680051f1-38d9-4b0d-9272-55d7e84ea224	1	\N	Other
+68028607-3d56-44ca-a2bf-54f7e5a433eb	1	\N	Other
+68038a6b-f033-41c0-8cea-a2eee600e9af	1	\N	Other
+6807aa7d-1122-4164-bc78-f13daec74d29	1	\N	Other
+680e438d-bdd2-45a0-899b-1be85510937c	1	\N	Other
+68122421-165a-473c-af1e-28c56db57322	1	\N	Other
+6812d42a-21c9-4208-a209-8bf83b1b6529	1	\N	Other
+68177b9e-f58d-46eb-9429-0536c30304a3	1	\N	Other
+68179610-a3e7-4d4e-86b3-244dfa922a64	1	\N	Other
+681fe3f9-e5b8-4f2b-9798-b75177fcd0d1	1	James	Other
+68212437-089c-49e9-aa3b-c846b36f88e2	1	\N	Other
+682655db-7086-4efc-bfc5-f3f17426f15c	1	James	Other
+6828ed29-1d12-47c6-8978-0fb1a4be8ae4	1	\N	Other
+682d1b75-2aa4-4743-ad6c-075bb516c7bc	1	\N	Other
+68321b71-d3d9-4ff4-a3b1-f878cefbd43d	1	\N	Other
+6833d311-fde9-412b-b188-aa0e4b3de023	1	\N	Other
+68341d35-4199-45b8-b7bf-bcc45b248790	1	\N	Other
+68394e8d-1ade-4b52-8839-f07217535c8c	1	\N	Other
+683b2da7-b63c-4444-8555-868af290b8c1	1	\N	Other
+683c712d-bd67-479f-a8cd-bbabf386f757	1	\N	Other
+6843f28f-c5aa-47d0-8477-2ab79c8e4dff	1	\N	Other
+68442fb5-72e0-4ad3-b80f-ed72282f3f27	1	\N	Other
+684657c1-2c83-40ea-b835-1c534301d736	1	\N	Other
+68468e06-772e-4167-9e45-cca0d50819ba	1	\N	Other
+68483a2e-ae52-45bb-b16b-2d60af35b19b	1	James	Other
+68486fbf-8a87-45f7-81ed-d69d595d4a21	1	James	Other
+68489ec9-1564-49c6-b348-64455c8d26c4	1	\N	Other
+684d823e-4187-47e5-af6d-8369737b1d5f	1	James	Other
+684f9d37-be1b-4555-804c-5bf3fe3fcd62	1	\N	Other
+6852af1b-af55-41be-8c04-353ac9866d53	1	\N	Other
+6855752e-ecd5-425e-9218-2586cae3d281	1	James	Other
+6858a794-0f15-4138-9a97-e3b4d97b9d7b	1	\N	Other
+68594916-200a-49d4-9b65-a784e5863918	1	James	Other
+685b236b-5e8d-401a-ae3d-076f41a5a05f	1	\N	Other
+685c9a1e-3185-45cd-9637-2e9b8151d0f8	1	\N	Other
+685d92a7-3749-48e1-8c79-65b80940c0f9	1	\N	Other
+685ef779-7275-440a-bbff-ed45991552f6	1	\N	Other
+685fc384-81fe-4936-a433-e9ed7553d663	1	James	Other
+686047f7-2765-4728-bb9a-c9f7aa1b5e3e	1	\N	Other
+686101e7-8c03-4ac7-b516-c9df09f264ab	1	\N	Other
+6861ee48-b14c-4597-b442-ba0e94e5bd7a	1	James	Other
+68637ba8-ba7e-44aa-ac32-6bb1966e7dcd	1	James	Other
+6867b952-ade3-42ab-9b38-e35ff9de58e5	1	\N	Other
+686ba20a-11ea-45b9-889c-edb15488e185	1	\N	Other
+686dc214-647c-4e33-992a-7b0483708a6a	1	James	Other
+686e2600-fe47-4b4c-8265-39ff2052115b	1	\N	Other
+686f6f60-4150-42a4-a0d0-5592a523271e	1	\N	Other
+68735083-9b5d-459f-b860-55ef28979207	1	\N	Other
+68746992-839f-4ac0-8c32-2c679714cb90	1	\N	Other
+687510b8-75ae-4003-a6cc-21711d3a2158	1	\N	Other
+6875e9f6-7f7d-4fa1-ab56-6b5b0c2a9413	1	\N	Other
+68765391-59e2-43af-ba46-834a9802708c	1	\N	Other
+6877dcf3-0b52-4063-bb5a-899a62cd8f3d	1	\N	Other
+6877f991-c06e-43dd-81e8-fac7dfec552d	1	James	Other
+6878b66c-17d2-4f6e-ada8-3544bfcc255e	1	\N	Other
+687e0e07-e7fe-46ae-b9eb-c4a9e13e8c8d	1	\N	Other
+687f03ed-a3c5-406d-889f-e53b52609219	1	\N	Other
+68833b11-6553-41d1-8525-ea91b880a52b	1	\N	Other
+68850941-3a6f-495e-b26b-6327ef8f92c9	1	\N	Other
+688822f3-4d68-4da5-9054-143ee6dc310d	1	\N	Other
+688c3b70-908b-4886-bd8b-33799f732f49	1	\N	Other
+68910229-7d24-4118-8b1a-905eeeaa24d1	1	James	Other
+6891f15e-f8de-44e5-958d-461ad541f1c4	1	James	Other
+68947401-d3db-4f46-999a-7742640f0ba6	1	\N	Other
+689afaa1-232b-46f9-acb8-541f294b4fce	1	\N	Other
+689dba21-6266-4e6f-92fb-0e6d43629bfb	1	\N	Other
+689fdebf-b938-4bde-9d38-62b879a6d285	1	James	Other
+68a81dfe-57d6-4b24-a1f4-ca75d028dc70	1	\N	Other
+68a8a99e-06b0-4b34-a30a-6ab344714542	1	\N	Other
+68a90367-6dcb-4e0e-ab9b-ac752356be64	1	James	Other
+68ace23e-fb39-4b74-819b-d3a9ee81d109	1	\N	Other
+68adba27-2fad-49e0-9bee-14c95df5c6b9	1	James	Other
+68adf7ae-3575-40e6-a560-34014d608d7b	1	\N	Other
+68af7904-5e67-4615-afde-9a877a0fff25	1	\N	Other
+68b071e0-0ff6-4a25-8963-988ca83df36e	1	\N	Other
+68beb4df-b6a8-42d6-84b0-90e0fd2990d3	1	James	Other
+68cff252-bc0a-4074-ab60-c86f3e4f1ac1	1	\N	Other
+68d03337-ab89-4e42-a757-a10ee4e8de8c	1	\N	Other
+68d0b394-9c9a-4b04-9800-fff27de34850	1	\N	Other
+68d3b885-5c64-4cde-8043-402b53b518e3	1	\N	Other
+68d4b61c-0cf2-46c5-aad0-a6cb4d9d7bea	1	James	Other
+68d69dee-cc77-4598-b0bc-4b85f53cd6a5	1	\N	Other
+68d71548-bee0-4703-84f3-7d9df3532d54	1	\N	Other
+68dc799f-83f1-415b-aa73-a58bde0741cd	1	James	Other
+68de21e4-0128-45f3-b3ce-b200138bf1bc	1	\N	Other
+68e1ff17-909c-46f5-be40-988488120965	1	\N	Other
+68e214d9-dd0e-48e5-ba51-52445c833aec	1	James	Other
+68e5b584-269b-47b9-a96a-dd20fc1c69ac	1	James	Other
+68e788c5-604d-40d9-9b93-68c829516fd0	1	James	Other
+68ee0963-aa91-4fee-aa53-0a51fe6df1ff	1	\N	Other
+68efdfe5-424c-48fa-9d35-3b3449d5e71e	1	\N	Other
+68f43b69-22f5-43cd-be38-9bbf98fa25c4	1	\N	Other
+68f7d9be-abe8-4856-aea4-85115c9458a3	1	\N	Other
+68f8367c-0c63-4c5b-8214-bd56d468813c	1	James	Other
+68f9cb28-2c49-43e4-af52-b1c92a3d3a7b	1	James	Other
+690037bd-1edb-456b-a6a0-af1dcacfbf02	1	James	Other
+690947c9-6807-4a6f-8ede-6d7b42202ccd	1	\N	Other
+69094fe3-7d59-47ff-b1ad-430c01622198	1	James	Other
+6909dbcf-99e4-4da7-96ef-df4b0e94ddb8	1	\N	Other
+690c00b3-ca4a-48bf-83d6-9a570a3cf1f7	1	\N	Other
+690d7e0c-6e22-4ceb-8de9-86214f0bf6c8	1	James	Other
+690ea8c0-c7a8-4e3d-93a1-fd37970f0e7e	1	James	Other
+690f2451-4d1b-4801-bffe-dee6eab5fb1c	1	\N	Other
+6910097c-6fe0-422a-9494-919d63709bdd	1	\N	Other
+6910e4cf-ac3e-4128-a88b-de735a38c7a1	1	\N	Other
+6912a0e7-e9b4-446e-8f3c-bbcac9d70c9a	1	James	Other
+6918edb7-b12a-450e-9002-959128b2f036	1	\N	Other
+6920c542-dfe8-41c0-835e-06df36ce290e	1	\N	Other
+6921476d-503b-40f1-b914-75f1e05f5fb7	1	James	Other
+69242636-6695-43bd-ac31-739fec7b6b9c	1	James	Other
+69244bcb-adef-4580-b7c3-2f623f2df318	1	\N	Other
+69270c30-7d97-42e9-b131-0367a7b90a34	1	\N	Other
+69292582-efbb-4eee-8c9b-cf9c52909fe5	1	James	Other
+6929fe64-7987-429a-bdf7-604db1e77f29	1	James	Other
+692e44a2-6786-4529-a020-3e33fdeb8a66	1	James	Other
+692f1290-8893-4a47-b2ff-a2fda1d3c426	1	\N	Other
+692f7ace-f94c-4ac4-b649-ce6b5ede08b2	1	\N	Other
+692fb03d-847c-48cb-b283-b7ff7983628f	1	\N	Other
+6933ef30-2382-4d7c-9036-8708c0d782fa	1	\N	Other
+6935d36a-16c3-4dbc-ac34-9cb6e3b8a4e4	1	\N	Other
+69383700-f6bb-4c0c-8f87-328ccdd25cf0	1	\N	Other
+6939c84e-1ec5-4806-8d4f-9c709e8ab1d7	1	\N	Other
+693a47dc-8ffb-483c-99fd-9790ce65d145	1	\N	Other
+6940893f-9ea6-4a31-822a-b7fa62b10b62	1	\N	Other
+6941b5e1-f96f-4b03-b0e7-80df20808f52	1	James	Other
+694c4892-7206-42b1-bb19-eec3f73a4b4f	1	James	Other
+69511c69-b6ce-4312-95d8-60f04081e8d1	1	James	Other
+6953d090-74f1-4415-9591-38f2ac824dcf	1	\N	Other
+695414e0-f42a-40e5-b71c-2d8688122d1c	1	\N	Other
+695496ba-ffd3-45ba-bec6-71fe0a847ec2	1	\N	Other
+69558e03-e400-48c2-8d6a-c60b42f88458	1	James	Other
+69637417-7c55-4dd8-b459-a09a6054d0a6	1	\N	Other
+696433be-6b4e-4ef2-9c28-7190fc8ac56e	1	\N	Other
+69656b32-47dd-4d1f-bbb1-660d793e194d	1	James	Other
+6966e891-9c99-42a7-bf8a-a432e6212503	1	James	Other
+696818d7-eabc-4fe1-beee-10a933a749cb	1	James	Other
+696b20c4-5ff2-4da4-a9d0-9e7a81394b0f	1	\N	Other
+696fc91e-fd4c-4063-a33d-f86a5d7efb3f	1	James	Other
+6970f703-6b5f-437d-a058-590ff0a8f4c9	1	\N	Other
+69776411-c3d4-4a2b-bcae-51d1de28ee19	1	James	Other
+697e30a6-c64a-4f59-aee4-1a883eb5e48b	1	James	Other
+697ee8e6-f5b9-4b72-a2dd-47dd77839887	1	James	Other
+697f0c8c-1452-407b-a782-8ffa8977dc08	1	James	Other
+6982c8f5-3d55-475a-9b75-b202842cd588	1	\N	Other
+69830467-7ea0-45b1-83c9-9e9f4272404a	1	\N	Other
+69856845-220f-492f-a02d-cc7d89c850b6	1	\N	Other
+6985fe41-54cc-429f-b11c-d92a2ff3edbf	1	\N	Other
+6989191c-87d1-4bc3-be89-dc6f8a042b4b	1	James	Other
+69899c4b-cbaf-4fb6-85c5-50445c78f76f	1	\N	Other
+698b3c30-6bc9-49b0-afe8-ec0e943434b3	1	\N	Other
+698d8502-9c58-4a6b-b6da-200855b7c87b	1	\N	Other
+698ec9fa-97d2-418c-9bec-158413da0b03	1	James	Other
+69900052-42a9-44e2-95d7-e708ced405d4	1	\N	Other
+69910746-3d9e-4d34-9c25-22b2c56beb41	1	\N	Other
+6991246c-60ec-4706-ad66-3ec4e842f389	1	\N	Other
+6997dd0d-a320-40bd-856c-aa21128ce83b	1	\N	Other
+69a2c432-e387-4530-be18-211c8a440264	1	\N	Other
+69a9224e-3f40-460b-b7fe-b4c69055e73a	1	James	Other
+69a9def8-ca21-4cef-a1ad-0006bc3d4bad	1	\N	Other
+69afae23-54c1-40f0-b323-1b000900eb5a	1	James	Other
+69afea86-e95d-49d9-a6c3-00ac83baaefb	1	\N	Other
+69b55292-9ba5-46f6-85a0-ab6e94ab3464	1	\N	Other
+69b68d61-0b9b-438f-8d9a-99b2515cc501	1	James	Other
+69b93e7b-9069-41f1-be4d-a3448b87774f	1	\N	Other
+69be7c0c-664b-4e54-993d-be12f1d1212d	1	\N	Other
+69bf909a-5ff0-44bc-8a28-acdfe6f538f0	1	James	Other
+69c25921-0498-489e-a86e-5c70367847d6	1	\N	Other
+69c2d50f-e7b2-4d3c-a484-1d89b60267c4	1	\N	Other
+69cb5483-88a0-4708-bffe-dfda9e406523	1	\N	Other
+69cd22d4-e60d-4d31-9f9a-236fd4852f95	1	\N	Other
+69cdc135-94da-4872-a4fa-b5346bb3d0c2	1	James	Other
+69cf6c62-b630-4d58-853c-b069aca330dd	1	\N	Other
+69d01a3a-27c2-45c2-9886-ebd6e11d5b9d	1	\N	Other
+69d4d807-ad26-49c9-94d5-482a0a1d1b24	1	\N	Other
+69d8e615-7240-4798-9488-0e95ae881484	1	\N	Other
+69dcb0ae-c36c-4704-b2b8-d30a60668d3f	1	James	Other
+69df39eb-a8d8-4113-ae7b-e404fe325126	1	\N	Other
+69e29c7d-5b67-4605-a28b-45206b8747ae	1	\N	Other
+69e3e60c-71ce-4c1a-ae90-95fe607ef3c1	1	James	Other
+69e88787-aef4-4ede-9236-d55e4af1a11a	1	\N	Other
+69e95717-21c4-4d34-8aa6-bd7ebb64668a	1	\N	Other
+69ecb310-8bcc-49c2-b268-29f0b938e50c	1	James	Other
+69f00ea0-e296-440a-bd98-acf9c2a15d33	1	James	Other
+69f1d3ff-f58b-406c-b585-84f71933e16a	1	James	Other
+69f548f5-ef01-4a03-88eb-55e4acacf6f3	1	James	Other
+69fe722b-a72f-43fd-8e52-4fffdc8e6fb4	1	\N	Other
+6a00049d-7f23-4708-8672-64717115a52d	1	\N	Other
+6a01af49-e766-41d6-af6d-3ab33dafbd38	1	James	Other
+6a021863-5d30-4ed2-81ed-dd11d66d2831	1	\N	Other
+6a04c3fa-e687-4675-b82e-80cd39ab89e7	1	\N	Other
+6a04c526-39dd-4a28-b627-01d9ebd1b163	1	\N	Other
+6a082ecc-c356-4726-92c5-133d98d1dfa7	1	James	Other
+6a0cad13-496e-4e5d-a26b-ea506e5f457d	1	\N	Other
+6a0de0b1-4b27-4a5e-b8b6-4d49a84ae00a	1	James	Other
+6a123c06-1388-40b3-aae2-88f03e5662e4	1	James	Other
+6a131734-8ad5-4ac9-80f9-b8e59ce16b1a	1	\N	Other
+6a1aa814-ed60-4c19-a9ad-d48650bbcf07	1	\N	Other
+6a1e6103-62eb-48cb-9681-9bc11ac940c4	1	\N	Other
+6a1fda48-ed03-4dcb-88dd-d39fa498a382	1	James	Other
+6a2087c0-23cf-4008-87f1-08293371e379	1	\N	Other
+6a2864e9-2e81-4287-a2b9-055986601fcb	1	James	Other
+6a2873b7-f557-4b64-99b8-bdca86441664	1	\N	Other
+6a28b24e-66fc-4fd2-8d93-a2a6928eec1e	1	\N	Other
+6a2a725c-f321-46ca-8902-874dbf7f30ed	1	James	Other
+6a2ade30-c6d4-49bc-92df-b19abd5fc229	1	James	Other
+6a2ca06d-ed67-4150-9aa1-32f20feb5154	1	\N	Other
+6a2fd07b-100e-48b2-91f9-fb92057f0eb5	1	James	Other
+6a34e632-34d3-4d12-9847-b08e05e4ecaa	1	James	Other
+6a3aa34d-37ca-435f-be1e-0a9d60c35017	1	\N	Other
+6a3dee1d-5eb2-47a3-bc4a-255f0cdd482a	1	James	Other
+6a401c0f-a129-402f-9291-0a657b5e105b	1	\N	Other
+6a43542a-4c6e-45c2-9b46-28cd6266d2a5	1	\N	Other
+6a441a23-dd8b-43cd-9573-f68adaf16258	1	James	Other
+6a47efad-fbf9-46aa-a23f-83926927a0e4	1	James	Other
+6a57ce7a-4199-4254-a3a2-f40bc4964050	1	\N	Other
+6a5a4f2e-f4b3-4e52-8716-0fc7510f95c2	1	James	Other
+6a5defe6-b62d-49d7-b6a7-218bc07ae0a3	1	\N	Other
+6a5f8015-420d-4634-8f9c-4605b91b72a1	1	\N	Other
+6a655ae7-ab72-466d-b3cd-ef3f084e4fbb	1	\N	Other
+6a6a6788-e0d7-4ff2-9066-a45108c0850a	1	\N	Other
+6a6c4755-e0c5-4bac-aca2-abf1ee27a02e	1	\N	Other
+6a6fc914-024c-4923-a18a-e3ec97bc60d1	1	\N	Other
+6a7606de-5a31-4d25-a70a-d2090b5f5426	1	\N	Other
+6a77abf4-cf9f-4c68-b22a-292527590e07	1	\N	Other
+6a79713b-82fe-4361-b1ff-de004df15b93	1	\N	Other
+6a7c417b-e6f6-4937-abe9-a5b95687e18f	1	\N	Other
+6a835d2a-2330-4c06-be9b-250c82936e3d	1	\N	Other
+6a96a6b6-4f38-4a38-81ff-99f46dfc4648	1	\N	Other
+6a9b87a9-43f4-4f88-ba14-e437ff303c47	1	\N	Other
+6a9e7be7-232b-4825-a757-2a7911dda936	1	\N	Other
+6aa58393-bc99-4ad6-8d13-02e9481ecefb	1	James	Other
+6aa97ad0-251d-4f58-bfab-caac86a3d902	1	\N	Other
+6aaab725-9da1-4928-999b-930f20594be8	1	\N	Other
+6aac83a3-920b-498f-9e2a-fa917518eee4	1	James	Other
+6aadd4d5-7019-41b3-8fb7-10529d056391	1	\N	Other
+6aaff438-f5cc-4d37-8b33-1d2377430337	1	\N	Other
+6ab11b88-0e74-4edb-ac04-527440f3f7d0	1	\N	Other
+6ab4ac5b-afd6-49ff-9acf-366127993c4a	1	\N	Other
+6ab7e16e-c961-4f3a-aa4b-ed24e6f15c91	1	\N	Other
+6ab869ab-3f54-4d6b-8779-16925d3a2f96	1	\N	Other
+6ac0818f-d7d3-4127-b278-6f44c1e84ed1	1	\N	Other
+6ac1aafd-84d7-4c23-bb2a-b26e9c52bab8	1	James	Other
+6ac1b96d-9fc9-466e-99f3-a87dda0f7c25	1	\N	Other
+6ac1da5e-099c-4773-82dc-903dbb37d719	1	James	Other
+6accd68e-abab-4551-8f31-a56053661d14	1	\N	Other
+6ad5acbf-1125-438d-a37a-62bad4b5d91e	1	\N	Other
+6ad89e2d-b39c-4636-b8e8-6851ea0d9758	1	\N	Other
+6adc2b44-1b11-4172-9585-5b4597a013b0	1	James	Other
+6add8e81-f9fe-4dda-ac49-c0da6306e29a	1	\N	Other
+6adffd2d-362a-45c5-8032-e49b9391bca9	1	James	Other
+6ae051fb-798d-4997-8529-676e738a821f	1	\N	Other
+6ae183e3-a52c-4f10-8254-90e13a45f7bf	1	\N	Other
+6ae1d390-2fcf-4668-97f5-ef703cc6d5b6	1	\N	Other
+6ae1f459-d9c6-41f3-ae04-eff828e5f6fd	1	James	Other
+6ae33d90-6b3a-44b3-b6e5-8b809e3a228a	1	\N	Other
+6ae422e8-14f7-11e8-9120-fa163e8624cc	1	\N	Other
+6ae53baf-a148-40e2-a174-19933af66f4d	1	\N	Other
+6ae8ae74-8a17-453a-87c6-58577aca52a7	1	\N	Other
+6ae8f2eb-d064-4ff7-be6c-3fa4ca8d1a7e	1	\N	Other
+6aead3ad-4dc9-49ee-91c7-7cb4ab57e820	1	\N	Other
+6aeb1e8d-bd33-49f9-94dd-9c58d6d90507	1	\N	Other
+6af28f50-1888-4ea1-85d2-dbccfcd5c8af	1	James	Other
+6af38cb3-f4ef-4bdc-9b48-8a85aaa05d89	1	\N	Other
+6af40453-1c04-4488-ad92-c08c65fec47e	1	\N	Other
+6af52a61-c743-433d-84b5-557691541f2e	1	James	Other
+6af6dd6d-9fe9-4aad-913a-1df16ba76664	1	\N	Other
+6af93088-f527-4e45-9d52-96ba6e191c2e	1	\N	Other
+6afb391b-34e4-4574-b7b4-f6ee74b4284b	1	\N	Other
+6afec015-d99e-4eb4-98ef-75a2354026ec	1	\N	Other
+6afff579-7515-42b7-a072-c565c4e188e7	1	\N	Other
+6b0281d9-5177-44c1-b95c-92a821b10c55	1	\N	Other
+6b0320c8-0514-47c9-b66c-ff4e5b50bb0d	1	\N	Other
+6b034f0c-177a-4588-817c-7400004710d4	1	James	Other
+6b037ffa-89bd-47ea-9d22-c31170f0ff97	1	James	Other
+6b06097a-afd7-44bf-97bb-188af45e3c88	1	\N	Other
+6b06a6b5-9291-432a-acfe-719ef7df4356	1	James	Other
+6b0710a7-3ca2-4706-9707-fd7e2787e3d0	1	James	Other
+6b0cc369-8c66-4b05-9f08-5e65ffdcd069	1	James	Other
+6b0d3f7b-0c76-4082-952e-52f5a309507d	1	\N	Other
+6b0d827b-38c8-4ea3-b171-648acfc1c6e7	1	\N	Other
+6b0ea139-83b3-4069-ad29-6d70fe99fed6	1	\N	Other
+6b1366fe-16d6-4ee6-b746-58a87cdba665	1	\N	Other
+6b13b3ab-1e15-48b0-911f-a90975a170db	1	\N	Other
+6b144f42-8ca7-47d8-b864-54610a6535d4	1	\N	Other
+6b151c0f-7a56-49f4-9992-74ee64e3badd	1	\N	Other
+6b1551f5-d523-4391-9d9d-27a7f7c8f2f5	1	James	Other
+6b15b995-9dd3-48ce-86be-b1282f763355	1	\N	Other
+6b172943-acd5-4730-a154-14ed9ba73e5a	1	James	Other
+6b192e39-73df-489a-bc48-073e3c42616b	1	\N	Other
+6b1a570e-14e6-419a-9ba8-29bcfcea999b	1	\N	Other
+6b1af0f1-eddd-47cc-ad8d-d4298b12c723	1	\N	Other
+6b1ebcff-f1d8-4442-8c4d-8859193e0410	1	\N	Other
+6b211c0f-d4fd-4382-9410-33ac3fdda2bc	1	\N	Other
+6b23e938-58d0-4f9a-8a79-86c6c41ecb0b	1	\N	Other
+6b25be31-5e70-4e4a-9db8-516897e75028	1	James	Other
+6b2b9128-9151-4b0f-905d-b3cd1c4bec1f	1	\N	Other
+6b2dd2ed-2780-4f7c-bcb3-e49eb73d7003	1	\N	Other
+6b331615-d038-4308-804a-fba4289d39c6	1	\N	Other
+6b36450c-1c7e-402b-9405-40922063eccd	1	James	Other
+6b3a97c3-07fb-465b-9116-31bf12287f6b	1	\N	Other
+6b3d0776-5d6d-4416-b321-43fa5814810d	1	\N	Other
+6b3daf62-db40-45bc-b39d-d3277b7d0b33	1	\N	Other
+6b3e04ae-5486-4306-98ad-265f64ffd27d	1	\N	Other
+6b408d7b-3142-4599-940d-2687f98c046b	1	\N	Other
+6b411891-3178-428e-bb9d-3d035e758cb2	1	\N	Other
+6b41cdc7-72fc-4070-8aed-f40e9b4b0371	1	\N	Other
+6b44dbed-241a-4022-a21e-6f95f018058b	1	\N	Other
+6b44e469-ee90-47a9-a6a2-5447f8f6da90	1	\N	Other
+6b50addb-4b58-47d9-add3-d8081321689c	1	\N	Other
+6b520b0b-76ba-403b-87ea-152d20361d44	1	\N	Other
+6b526c32-ab56-4805-b780-46da6c23ed84	1	\N	Other
+6b56e281-1a98-4906-b0b0-e191ac931260	1	James	Other
+6b5b77d7-0751-42f5-b58c-073b71a9db09	1	James	Other
+6b60d56f-c28e-49b9-9eb0-8dffaebb5f0d	1	James	Other
+6b614c60-9f17-4184-a602-358baaa21830	1	James	Other
+6b661294-7254-4d58-839b-0c0fa9b2ef62	1	James	Other
+6b6dcff2-0561-48a5-bd8b-20c4c4a74f9e	1	\N	Other
+6b6f1589-389e-44b4-960d-51afbcc2ef84	1	\N	Other
+6b76e010-5bbf-47d1-893e-31c9b984b66f	1	James	Other
+6b7cf815-0018-483c-bd32-376599ae058a	1	\N	Other
+6b84fad1-6ef2-497a-8999-b0ca9398c8e7	1	\N	Other
+6b86c0c0-5ec9-4c92-9ce4-be372f5178cb	1	James	Other
+6b8ef9a2-9784-4e6f-9dfd-622f1863903b	1	\N	Other
+6b90c675-4045-4eb3-ad0b-a156100f02f9	1	\N	Other
+6b9823d1-feeb-4ede-b771-30fe05a49810	1	James	Other
+6b9937bd-07ad-4101-88fa-87dab1bdcce9	1	\N	Other
+6b99d5e5-c33c-4581-97c1-ba8c9f062319	1	\N	Other
+6b9dfd13-540b-4945-af4e-287dab090e1c	1	James	Other
+6b9ed222-4f70-425c-b754-43659ae12423	1	\N	Other
+6ba3c8b5-efce-4b7d-a3a2-401371f89656	1	\N	Other
+6ba7b044-3961-400b-96fc-b08255423008	1	\N	Other
+6ba828b4-df05-4db5-aa73-358a75e95542	1	James	Other
+6ba95c97-03d4-445b-b8cd-ce32ff2c43b8	1	James	Other
+6baedb62-f78d-4b2c-a867-988fe318bc9a	1	James	Other
+6bb600aa-3647-49bb-8148-bc5da774c014	1	\N	Other
+6bb67f10-2e47-4647-a680-e5f88747e8fd	1	\N	Other
+6bb865dc-e0a3-4d46-825d-c600903632ae	1	James	Other
+6bb9a3db-5880-4d49-a23c-c1a77195b028	1	\N	Other
+6bbb2d61-9a18-42de-bf19-cf11c15bcfd0	1	\N	Other
+6bc585a5-be66-4965-bc85-b44d01c8acc4	1	\N	Other
+6bc86d18-4c46-4976-9d20-6a15d80f9a4d	1	\N	Other
+6bcdadde-76dd-45e3-9777-e91dc5bf278a	1	\N	Other
+6bcf3c37-4fa7-48b8-881f-37d28c6d0d14	1	\N	Other
+6bd11896-14f7-11e8-8f6b-fa163e8624cc	1	\N	Other
+6bd3b79e-d068-4ff7-b5da-dfb44e2cc7f3	1	James	Other
+6bd4c440-da1e-4c04-907d-c275cbeececd	1	James	Other
+6bdc6b35-c574-42b4-b71f-1297def95131	1	James	Other
+6be00f2e-593d-4f6b-bd63-03c79d519ba2	1	\N	Other
+6be0aef9-fd83-487f-8bd5-021ac50319bc	1	\N	Other
+6be879ce-775d-4082-8e8b-4a827a4fbbfb	1	\N	Other
+6be94581-3493-4281-b00d-51f864a381e9	1	\N	Other
+6bea4563-8781-4925-9358-684c8efc9e97	1	James	Other
+6becb991-2855-4250-b87e-84b4f1bf38ed	1	\N	Other
+6bed75dd-fabe-4398-9966-b4674ed2b50a	1	\N	Other
+6bef552c-c426-49ec-b10b-c151fbea6c7c	1	James	Other
+6bf56a0e-9bd6-4fcd-8d9a-528e158e4e49	1	James	Other
+6bfd2cd3-2b08-40cf-b9e8-c38a80ea5fd3	1	\N	Other
+6bffc6a7-6a0e-42f2-969a-8b584bc06abe	1	James	Other
+6c01027c-5fd5-4ec7-818c-e76264962734	1	James	Other
+6c01d197-acd6-46b3-bf73-c6bab740d2bb	1	\N	Other
+6c0366e4-2244-4ee5-b9b5-8abdda7f3260	1	\N	Other
+6c061899-61e8-431b-b4a3-18ba72d075c0	1	\N	Other
+6c06d28b-b3f2-4a90-a4d7-7ce67e4a8193	1	\N	Other
+6c0bb248-aacc-4fbf-b1e1-e549cbd20848	1	James	Other
+6c0e7046-ce06-4d36-8ffd-3fef89d350fd	1	James	Other
+6c11b78f-b35b-46dd-b6b7-13499d9487b1	1	\N	Other
+6c1299a9-43a3-4ef5-8a76-e0dfb40bcd69	1	James	Other
+6c1acd69-1726-4778-b4df-45b367e28c53	1	\N	Other
+6c1e04a3-7140-44c6-9ad7-c08a80f9e22d	1	\N	Other
+6c285267-0c95-40dc-9476-5cf679c788a0	1	\N	Other
+6c2968fe-bc78-4e72-ae53-d318fc5014a9	1	James	Other
+6c2aa526-0e20-4a46-ba70-1536c641f46a	1	\N	Other
+6c2f313c-5cb0-4f5a-93cd-75d845a6c454	1	\N	Other
+6c2f803c-381c-40cf-8e02-cab7af3eb9ad	1	\N	Other
+6c3025c1-149c-4b1e-b5ae-44311669a29d	1	\N	Other
+6c3261f1-e8b9-41b0-8d0a-2c2a5fba9c38	1	\N	Other
+6c357fa2-d21f-406b-9c6b-3550f28fec99	1	\N	Other
+6c387070-4a9d-418f-b4b3-e6b5e36960c1	1	\N	Other
+6c3b4a0f-628a-44dd-a76f-80c063c1148a	1	\N	Other
+6c3b551b-5d2d-48d8-bda6-2c32bd9774ee	1	\N	Other
+6c3c678f-0999-451a-946c-737241e4d2db	1	\N	Other
+6c3df07b-0145-4985-a273-82aa17574d34	1	\N	Other
+6c436956-fc1c-4202-bea4-dde88d3b12ce	1	\N	Other
+6c45320d-5dc5-4ec3-bb65-ea194df2a431	1	\N	Other
+6c4b1a12-413d-47f3-8bba-78e13b6bbf27	1	\N	Other
+6c4c0663-7085-4cf5-bc93-77f6600896a3	1	\N	Other
+6c4d40ca-1f51-4061-a311-c4b8410fcddf	1	\N	Other
+6c4e7f5e-1191-416f-8cc4-c7af11d14972	1	James	Other
+6c53d53d-4fa9-4b2a-bbcd-10e9dafbcf1a	1	\N	Other
+6c5d2b09-a1a7-4f4d-b1b3-ee4c1092ebd2	1	James	Other
+6c5e82ef-b45a-474f-9abb-5f3feb5cff26	1	\N	Other
+6c5e8638-098c-4988-a1f6-1a926b5d55b4	1	James	Other
+6c61e02e-83ed-440d-ae3c-3d8eb1679b09	1	James	Other
+6c6292f2-124f-410a-9ce7-0b289718670d	1	James	Other
+6c630432-9021-4eeb-88c5-78ee020d00ee	1	\N	Other
+6c635d8a-140e-4aa9-a43b-0ed07d2570b0	1	James	Other
+6c6ead8c-d739-4abe-9a01-5701d2cb8fe6	1	\N	Other
+6c74a02b-18c3-4e49-8870-c7f907579d82	1	\N	Other
+6c7b6866-61de-4669-a6ab-da6f57478469	1	James	Other
+6c7b9f7c-0929-4dae-8938-e72146bad08a	1	\N	Other
+6c7bee14-ad42-42be-847e-b2be8d0d9fc9	1	\N	Other
+6c7ddabf-b4a4-4a12-abbd-6a4c64351ec4	1	\N	Other
+6c85e59e-fe6a-434e-815a-452b662ecf32	1	\N	Other
+6c8f853d-1d7f-43cb-a3ac-d7bb7a7ce784	1	\N	Other
+6c963f58-c7a7-4839-a108-f6ba895dd07e	1	\N	Other
+6c969f04-0300-4722-ae00-74ce0ed7ea64	1	\N	Other
+6c983855-b79d-4c21-9ebc-2341b89fe1e6	1	\N	Other
+6c9b3b5c-9f7f-4fdf-baac-4159608f5e14	1	James	Other
+6ca05e0a-2d6f-4bad-84a3-20063723e7c6	1	\N	Other
+6ca08673-1019-4c6e-8de7-fe272dd8e050	1	\N	Other
+6ca122df-174e-4498-95bd-4a873884001e	1	James	Other
+6ca48235-f154-4f67-b150-fc72befbd0e1	1	James	Other
+6ca79a69-6717-4276-948d-6c711b221781	1	\N	Other
+6ca91b81-1c23-41c2-8a49-9184676cfb27	1	James	Other
+6caa18f8-cc54-479e-a4a2-5de9c354d2c1	1	\N	Other
+6cb0000d-0d57-44ef-9a33-8cbaed628030	1	\N	Other
+6cb353f0-f152-4575-8aad-5131b1e11f08	1	\N	Other
+6cba773d-69d7-4db7-a0f6-8290e0e4c91b	1	\N	Other
+6cba90b2-abf8-4fb5-b238-31f9f72ecb44	1	\N	Other
+6cbf6439-9b63-492e-ba26-456597c0afdc	1	\N	Other
+6cc0776a-1a16-4d98-8541-a9b48f5e8bce	1	James	Other
+6cc19bed-ff3d-459f-97c4-ceaf3724df9a	1	\N	Other
+6cc8b792-c8f4-446e-9f4b-c672cdc54c7b	1	\N	Other
+6cca2d3d-4233-4a1f-86c4-f3b4b8650bc8	1	\N	Other
+6cd0b492-a45b-44b7-9961-9d7b55a0d245	1	\N	Other
+6cd2c4db-ec58-4ada-803f-607cc62b80b0	1	James	Other
+6cd31b81-5638-4230-804a-1436fb327347	1	James	Other
+6cd46627-a674-4b6d-89ea-36da05d9a63b	1	\N	Other
+6cd8ef9f-5655-4964-b020-f8cf9f16e03a	1	\N	Other
+6cda5ed4-a43d-47f2-9828-22080d488686	1	\N	Other
+6cdd4cf4-ba7e-4d69-a361-bbbd0a90d265	1	\N	Other
+6ce0c9fd-8853-49e6-ac9f-320d7dfe9b77	1	James	Other
+6ce5e2c5-26e7-4b5a-b68f-540d82d51f97	1	James	Other
+6ce957fa-a1d8-4244-a39f-bb4253c73fab	1	\N	Other
+6cea71fd-0517-411b-be9f-2d6e090f40c3	1	James	Other
+6cf15054-3d16-4857-bb3a-9d3594372a02	1	\N	Other
+6cf66fcf-1f60-4ad5-acc8-06f6542b9b80	1	James	Other
+6cfa1d4f-a433-4155-8b08-7fadffe9ca5b	1	\N	Other
+6cfb5133-a182-4bd5-9319-1b8947a47838	1	\N	Other
+6d0513e5-c837-40d3-98dc-405c4159daab	1	\N	Other
+6d05d1ad-0126-4ac6-9200-ba2a6333cdf0	1	James	Other
+6d079f76-d5d7-4206-b338-bdff9fac6d58	1	\N	Other
+6d0bd99e-e355-4e57-8f5c-974a8b11e965	1	\N	Other
+6d0c5cc8-329b-45c6-9e38-266af0fb1137	1	James	Other
+6d0e608b-42c4-4095-8cdc-73d20ca5b168	1	James	Other
+6d0f70d2-9f0c-427b-85c4-ddcd0a3efb49	1	\N	Other
+6d116aa7-4eb2-4f90-9d60-50bec7978112	1	\N	Other
+6d141ad1-14e0-49f0-82d9-d441091c0681	1	\N	Other
+6d145487-b5df-4aa6-8299-9c4bb321c0ff	1	\N	Other
+6d15f603-6fa2-4a43-9d54-bf2b69f1c6e2	1	\N	Other
+6d183133-206e-48b9-8b96-d87ad19e209a	1	\N	Other
+6d1a37e7-da28-469e-a53b-e309c9a51e9a	1	\N	Other
+6d1d20f4-9cb6-4891-862b-00a29105e5b1	1	James	Other
+6d1d902f-e551-488a-b50d-7ba46c7aef89	1	\N	Other
+6d23e255-323e-4c7e-ba47-d66e82a7d03a	1	\N	Other
+6d258d8d-cbe7-41b8-99ef-268b6625f516	1	James	Other
+6d2c21e8-b41c-4db6-90ee-0b0a193dc2de	1	James	Other
+6d2ce707-6693-45b2-aa22-32b4dfa679ca	1	James	Other
+6d2e9218-0c05-4a7e-8695-327da994db73	1	James	Other
+6d310914-97a9-45ae-b285-e87c80020e45	1	\N	Other
+6d36e0cb-ffb0-468f-9ea8-c934177f578b	1	\N	Other
+6d3d56ac-64f8-4fd5-a0b3-d90678353866	1	\N	Other
+6d3d6569-1dad-4ee4-86d1-e59cfad90abc	1	\N	Other
+6d3e88e7-0b18-4380-a62e-fa2de1ad7b32	1	James	Other
+6d3eda69-d503-4a3e-8797-448764f446f3	1	James	Other
+6d41e65b-4d3f-4b15-b76c-2dfe474ebe4a	1	\N	Other
+6d427e08-6d29-4ccf-95fa-7c4712be7012	1	\N	Other
+6d4910a8-f383-4cbf-a3ea-0f02a3967f00	1	James	Other
+6d4ade91-1f79-4f80-a6e5-0aab1df3e9cc	1	\N	Other
+6d512a5e-74bd-4f2b-9979-3e09ec32c13d	1	\N	Other
+6d53978e-3844-448a-a445-f5f3b4fb7ca1	1	\N	Other
+6d544be9-4538-4997-8276-d8f7467cbe37	1	\N	Other
+6d5ee256-51d1-4a89-a3df-cf9af736087c	1	James	Other
+6d64eb5c-e562-4c22-9c19-ceabdc4db07c	1	\N	Other
+6d651d3d-836f-4664-8755-5b37129922d4	1	\N	Other
+6d699a48-fc87-43e7-817b-7759669c09cd	1	James	Other
+6d6bbb2a-3d72-475d-8835-70e9b1b861dc	1	\N	Other
+6d6ccca6-5480-43eb-aa1a-c7ddd2da0165	1	\N	Other
+6d7132a8-0afb-4541-bcf4-db6abbc508ad	1	\N	Other
+6d789ba6-295f-4fca-b0dc-03584a0bc08b	1	\N	Other
+6d79c047-102b-489a-a776-3d8fc23ca15f	1	James	Other
+6d7dee12-f5e0-456e-ab10-8a91db7f7392	1	\N	Other
+6d7dfb33-7313-423b-b78b-6c82b8c5f446	1	\N	Other
+6d81a92b-6099-4594-af8c-3cef6a8663af	1	James	Other
+6d856541-28ea-45e3-9758-7cef01b836e2	1	James	Other
+6d8ad8ff-1999-4d9e-91bd-dc0329ccd684	1	James	Other
+6d8bd06f-6b55-4235-a289-d11bf3cf89a8	1	James	Other
+6d8dd2ee-0eda-4a51-830f-a56c3f43d1a0	1	\N	Other
+6d8e6544-e9ab-4e43-90d2-a5fa6853fc83	1	James	Other
+6d8efa1f-74c7-4821-84ee-3e7c386f5a47	1	\N	Other
+6d8f34eb-1c8e-4705-b8f7-4796385c5b0b	1	\N	Other
+6d8f952d-fd1f-4a66-959a-1def8b027d71	1	\N	Other
+6d90c297-2d80-48ec-b292-99ba916fe976	1	James	Other
+6d9655ca-88bd-4511-8f0f-a20a64cb263b	1	\N	Other
+6d987f5f-cbbb-40bc-85fb-a89167ab3e94	1	\N	Other
+6da04e06-4e7b-46fb-983a-3180a1b05f4a	1	\N	Other
+6da0c729-c2e5-4c48-a621-b2dc537b808d	1	\N	Other
+6da69805-b08c-41f2-9c69-d88cf947f8b7	1	James	Other
+6da6d01b-e734-49a4-a551-bdec799776c2	1	\N	Other
+6da7dfc3-3403-4cae-961f-b543b03e09ac	1	\N	Other
+6da9fba6-4b2e-465b-b3d8-48e667534555	1	James	Other
+6db06f5b-bdf8-4971-a420-a2de5b162653	1	\N	Other
+6db3b956-e47b-42d8-aede-1a55cfa191aa	1	\N	Other
+6db42ea3-7f9c-4a1f-8331-e39386748298	1	\N	Other
+6db56fbb-55ee-4687-bc45-7821dbb2b1f2	1	\N	Other
+6dbbb9be-cb54-4089-8db1-57edf0ab05bc	1	\N	Other
+6dbd1b3a-8eeb-4f8f-91c6-8ba7384ad325	1	\N	Other
+6dc39e62-3b0a-412e-853b-4efc0f56602c	1	\N	Other
+6dc41473-6427-4279-8610-3e4fba5d310a	1	James	Other
+6dc49d6c-b7fb-49f1-ba9b-7de30ed0c326	1	James	Other
+6dc7524c-c5e4-4e01-81a3-2bfc56c653d7	1	\N	Other
+6dc82ffd-bb4e-4aab-a33c-66267ea73822	1	\N	Other
+6dcaae65-11e7-4213-a974-ae15e3df59c6	1	\N	Other
+6dcdb8bd-e5ff-48e3-a7fe-98090cc5a94f	1	\N	Other
+6dd23ea8-8d5c-456c-b250-0c220c6153c8	1	\N	Other
+6dd267d4-a9d4-44f7-b2fe-0d09f77deae2	1	James	Other
+6dd2cc96-c514-4bb9-86b7-0236dd4afec7	1	James	Other
+6dd2d99f-3df7-40f2-b032-8d8711030773	1	\N	Other
+6dd41c38-b33f-4f98-9a21-cb6c6afbf2d3	1	James	Other
+6dd4dd04-6f95-4a1e-a7d0-7eff3c369dfb	1	James	Other
+6dd59adf-0ec2-43d6-b23b-0f1cd1ba22e8	1	\N	Other
+6dd74234-387b-4d5f-b0af-7370d3855a15	1	\N	Other
+6dde8eba-cf9b-46cc-9e2f-9e1412bc0444	1	\N	Other
+6ddef022-3797-482f-86a5-26a3a4b149d1	1	\N	Other
+6de072ea-86b4-417b-80c0-955049917926	1	\N	Other
+6df29c27-5972-4864-8fc0-bbb1281fe19a	1	\N	Other
+6df7ffe6-2305-4f87-8cf3-c5cf29312262	1	James	Other
+6dff4340-93dc-4d5a-a4c9-592e098d05ff	1	James	Other
+6e013bde-6396-4993-9d0e-45edc05f84f3	1	\N	Other
+6e047d2a-d958-442b-a594-a0f73927d7e0	1	\N	Other
+6e04a19a-dcdb-4cfc-9d3c-1c3da84d610b	1	\N	Other
+6e05c16d-1ffd-4213-b93c-335aa2caf069	1	\N	Other
+6e0f3629-e602-496f-91d0-39d30e2c9f27	1	\N	Other
+6e106533-8ea7-4414-9f9e-b473a430e666	1	\N	Other
+6e11e383-a338-494e-830c-f37fb3792a8b	1	\N	Other
+6e13d3c9-56d6-48a8-8644-7fcf1088ff0c	1	\N	Other
+6e1d957f-9f17-4ce2-a403-0cd086f8bc58	1	\N	Other
+6e1fb006-853c-4a8c-8388-5f7b7aa003f4	1	\N	Other
+6e241cac-ce34-4aea-9606-1e788d866ea3	1	\N	Other
+6e252df1-9966-4413-a187-7bf1801f06e0	1	\N	Other
+6e2ad63f-d060-48ab-81ff-14efa4920167	1	\N	Other
+6e2cb864-69d6-4284-a954-02db5f9055de	1	James	Other
+6e2e57a5-d0fa-400e-8f14-063581195d9e	1	\N	Other
+6e30ae53-0891-41c7-b317-c1a6b0657c5d	1	\N	Other
+6e3aef63-10aa-4bf2-80b4-acc646794173	1	James	Other
+6e3d2f93-beb1-4b95-973e-0046b17845d9	1	James	Other
+6e4603fe-e272-47b9-98fd-cc59002df823	1	\N	Other
+6e48509e-a819-4a9a-8da0-f7ce3475694e	1	James	Other
+6e48bfc8-f42e-413f-9d54-e1484fe320a2	1	James	Other
+6e5608ba-db28-45f3-a3c2-3ebb24edc916	1	\N	Other
+6e561364-0bd6-421d-ab10-012475cab057	1	James	Other
+6e56da33-cd38-40ab-a353-3f3bb2f0c51b	1	\N	Other
+6e57e59b-ccdb-4d9e-be63-00aad95333a5	1	\N	Other
+6e5b1b16-910e-4e17-b746-0fe1397d8882	1	James	Other
+6e5d210e-e553-4f8b-897d-d90f40efeb00	1	James	Other
+6e60f68c-92a0-46df-9ff6-329e9f8a9778	1	\N	Other
+6e61c8ac-c133-45c7-a29c-a0cff377d279	1	\N	Other
+6e63dae7-817d-474b-a11f-43911a716b4d	1	\N	Other
+6e647335-ea2d-4e0a-8189-b7d1a615990d	1	\N	Other
+6e64eb9a-d345-431d-983c-41418f4e364b	1	\N	Other
+6e6781ca-1700-4475-ba38-1b999257887e	1	\N	Other
+6e67babe-def5-4f73-855c-5e53766d2c78	1	\N	Other
+6e67e49c-8b0e-4ea4-bdb0-456a1d3920f8	1	James	Other
+6e683eb5-418f-460d-8878-c99230235679	1	\N	Other
+6e6c37f7-126f-4e64-b81f-afe0094e146e	1	James	Other
+6e6f2208-8b28-4786-ac28-fee577e58736	1	James	Other
+6e718eb9-ea15-4c47-b597-74a61c3823ad	1	\N	Other
+6e71a0a3-00e5-4f60-b515-2536e74c8f4d	1	\N	Other
+6e72da49-afee-4544-886f-6d68057fbe50	1	\N	Other
+6e775fb9-491f-44e0-92d3-4567948c3fd0	1	James	Other
+6e799a67-524d-4e64-bae4-c9971981f521	1	\N	Other
+6e7e5cc9-f425-4858-b767-fa9d78c2164a	1	\N	Other
+6e7f67f7-3173-447f-8d7c-d39ba246d877	1	James	Other
+6e9030f1-2b64-4815-a57b-aafdfd76d721	1	\N	Other
+6e91a3d5-d629-49d7-ac03-60a1b639303e	1	\N	Other
+6e95859e-466d-41ab-84cd-34a5e8cdffc3	1	\N	Other
+6e98ef9b-4427-424a-861a-4c1cc40dd865	1	James	Other
+6e991099-1aa1-472a-9030-92c6db703ce6	1	\N	Other
+6e99f27e-743e-4bd6-be02-8f084bdce3c2	1	James	Other
+6e9aea26-29e0-4680-b543-6cddb003aa78	1	\N	Other
+6e9dcf56-3ef0-4673-92ef-290e006c3dc9	1	\N	Other
+6e9dd35e-a1b0-4d83-abd1-222fb0d2de1a	1	James	Other
+6ea3045c-c313-4dbf-b2b1-ceb540bd74e4	1	\N	Other
+6ea455ed-88ed-46a3-b796-866bf54682bd	1	\N	Other
+6ea7a18e-afe4-484b-b8ea-38cd52da8da2	1	\N	Other
+6ea8ddfd-3556-438c-b78f-5085ef97b7f0	1	James	Other
+6eabb921-c943-4e78-aaae-e20f2fec96e3	1	\N	Other
+6eaeb55c-5a23-49a9-8cc5-1a281d0b934a	1	\N	Other
+6eb4a603-32a9-46d9-ac65-93e52f90c610	1	\N	Other
+6eb4f477-3e39-4ae4-bb6f-14a602770503	1	James	Other
+6eb89680-28d3-4a3a-ac13-2be526e53dd0	1	James	Other
+6eb8b53e-3933-4794-987a-7ed0d50515a4	1	James	Other
+6eb90af8-29cf-4686-b213-1b0ca8b70ee4	1	James	Other
+6eb9f191-0eff-4d5e-a02c-8ded476612fa	1	\N	Other
+6eba56ff-09a0-4722-9189-2664ba37b823	1	\N	Other
+6ebd4f24-216a-4e97-85aa-9b9097cd20c8	1	\N	Other
+6ec02b51-404f-44b3-a24a-b42aa098cec8	1	\N	Other
+6ec3a4e3-c42d-4e95-b95f-3efdcfbee6fc	1	James	Other
+6ec7a8f1-7bd1-4d0b-a646-ecc5f2f04878	1	\N	Other
+6ec7f230-ccff-43e9-a529-9643fb16d2b5	1	James	Other
+6ec9bb14-bb24-4cc7-9bf6-ee46bcd189bb	1	\N	Other
+6ecfa3fe-7f2b-44dd-8f82-6a3b29bab285	1	James	Other
+6ecff45c-d1cf-4783-b3d6-9c14a7d70732	1	\N	Other
+6ed065a6-55c8-4c03-b4b2-eccc0b611457	1	James	Other
+6ed0a3bc-4dc6-4845-b1d7-25c4567488f8	1	\N	Other
+6ed0e8cd-880e-4d5c-91a1-597d0a631c5e	1	\N	Other
+6ed5de98-9391-4c7d-a5d4-4ddcb8719254	1	\N	Other
+6eda4dcb-5ee7-4f0a-8e99-5e212fc2867a	1	\N	Other
+6ee477b5-3a87-4c8b-9469-ed0d4588432d	1	\N	Other
+6ee8fd00-dba6-4dcb-81d6-db5bba36551d	1	\N	Other
+6eeac023-039c-47a2-b3d5-02a97220c6c6	1	James	Other
+6ef13905-d846-40bd-be1f-d315e542efd2	1	James	Other
+6ef4d4ee-c75f-4b5c-9c10-0ebdbccaf5d1	1	\N	Other
+6ef6698a-872c-405f-878e-86ef869153b0	1	James	Other
+6ef6c309-c1a0-4fce-b593-4fd375f73182	1	James	Other
+6ef82c59-26f6-42f1-a4cc-0609ede3dc1b	1	\N	Other
+6efd824c-ec10-408a-ad28-9fac35d991ac	1	\N	Other
+6efff70d-ceaf-415d-90c3-3a81354b238e	1	James	Other
+6f002136-0ff9-11e8-9fab-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+6f06809a-9ed8-4c70-b582-d46edf740d9f	1	\N	Other
+6f12145b-764f-4cde-8112-9b1699f0ab12	1	\N	Other
+6f16b035-ddc0-43f8-8321-8a498ae5469d	1	James	Other
+6f1b2dd1-54c4-4d7c-aa00-64d4b817d92b	1	James	Other
+6f1ebf33-64a1-4921-a024-8a4185ad2389	1	\N	Other
+6f1f1283-6dc7-403e-aa0e-e7cd5b30c6d4	1	\N	Other
+6f23f79c-7ff4-4b26-b33d-8a5cacb65e85	1	\N	Other
+6f25cee8-02ee-4cb8-b6e4-e139a18177c4	1	James	Other
+6f270dcf-e7c2-40fe-9e77-acc2a7907271	1	\N	Other
+6f28b366-5bc9-4127-8da6-a5ac63a65862	1	\N	Other
+6f3517cf-5519-4caa-ba8b-a927d8078841	1	James	Other
+6f37287a-8531-403c-8930-0ab21b884504	1	James	Other
+6f37c245-c65b-4eb4-accf-b8223e741ab5	1	\N	Other
+6f3807ed-66cf-4f0f-ba04-b5f0bd12c92e	1	\N	Other
+6f3c404f-8d51-419e-8ea2-9d9590af3f3d	1	\N	Other
+6f3c44e8-c50e-4dd1-9730-7eaf74ad1107	1	James	Other
+6f43bad2-5fa3-445f-b464-b587cebe015e	1	\N	Other
+6f440964-8bf3-4293-a36c-359548e4c059	1	\N	Other
+6f452e4a-c5ee-4ea1-b1d4-68d9ce5ede0c	1	\N	Other
+6f462129-f69a-4ef2-9b43-eca72e010b40	1	James	Other
+6f4675e9-4444-41e2-a105-f6661d4b84aa	1	\N	Other
+6f4a9810-885b-45b9-bc77-3347206b92aa	1	James	Other
+6f4b1797-eaa4-462b-9935-31434c030dbd	1	\N	Other
+6f4e10bb-26d0-4ce5-a604-89a98e0a305a	1	\N	Other
+6f556e60-05e1-4562-afd1-1556a4ad035a	1	\N	Other
+6f6265e7-5862-46cf-9ba3-7c7755ba4a01	1	James	Other
+6f635a48-4c57-49ef-9263-7e07f1fee871	1	\N	Other
+6f63f6b0-101d-42ca-92b7-6de808fff01b	1	James	Other
+6f65d4b1-03be-45c0-abc6-da8b361129eb	1	\N	Other
+6f6651b9-ce12-49e7-84e3-f6033c84a672	1	\N	Other
+6f678357-b2ab-4836-b5cb-fa25fd9e23fc	1	\N	Other
+6f6824ee-30f8-48d2-8b5b-e0173be9d8e5	1	James	Other
+6f6ab11e-cdc5-4348-9ddc-ea87bc42caef	1	\N	Other
+6f6b2e64-a7c8-408d-b5de-682e585e9ade	1	\N	Other
+6f6cbf2e-ccec-4531-b572-52cd697918c7	1	James	Other
+6f704d16-6f7c-4816-a251-88070ca5e7c8	1	James	Other
+6f7d89fb-9792-439b-a22c-a1cda6fd312f	1	\N	Other
+6f7da50e-a892-4120-9ff6-95c15fee2fca	1	\N	Other
+6f7fd643-f55e-4bec-ad11-34c38f3eff36	1	James	Other
+6f8292bb-b276-4e51-b1c6-6a04c65b833c	1	James	Other
+6f853fef-5430-42be-9193-0382adfd770d	1	James	Other
+6f8742e8-d225-4147-a522-97140f10011d	1	\N	Other
+6f87eec5-79fa-409d-896a-b2f48e66e6be	1	\N	Other
+6f8a03de-60bb-4505-b3d1-2e63494e5bca	1	\N	Other
+6f8dda83-da98-427a-b287-69f0931b4de2	1	\N	Other
+6f8e8668-8353-4a83-b644-d56607091e4a	1	James	Other
+6f90bf06-7386-4db8-b517-0d8263ca585b	1	\N	Other
+6f915ee1-c2b7-437c-ae12-89f3aef8eb62	1	\N	Other
+6f924edd-0c06-4286-b26d-552169ca3409	1	\N	Other
+6f985534-feb7-450c-a9e8-f94d65967fee	1	James	Other
+6f998b98-daf1-4eed-8b2c-98474a4cd8eb	1	\N	Other
+6f9a32f6-cece-43d4-ab3d-4536ce140440	1	James	Other
+6fa2c4a2-ddb0-4b27-8eb5-bc20af0fffc7	1	\N	Other
+6fa3dee9-2ca3-4b76-8598-bb1f1c8e6ce2	1	\N	Other
+6fa4df7e-d023-4a88-af6a-aca67c866610	1	\N	Other
+6fa69b3a-0bcc-4538-b4b4-25877e06cd12	1	\N	Other
+6fa74e4e-bc61-4086-a6d6-bc506ed2e53a	1	James	Other
+6fa88758-6fa0-4bd6-9b15-0ee571e76494	1	\N	Other
+6fa8ea64-a8c3-43ed-8fa4-9c44a2736627	1	\N	Other
+6faca584-8f17-4207-a55b-86402fba2de6	1	James	Other
+6fb13cd3-5901-472b-95b4-89acc7aba2cc	1	\N	Other
+6fb3d059-3762-4a94-945a-e3d495c2678b	1	James	Other
+6fbe3f7e-30d1-494b-bde5-0ab25705fd8c	1	\N	Other
+6fbeffa1-4bda-463a-9534-e9d2aa946620	1	James	Other
+6fbf806d-92ac-4d7f-91fa-8e948547b418	1	\N	Other
+6fc15910-0d2d-4582-821b-9de252aa6b25	1	\N	Other
+6fc47a11-a9c5-4f3e-8ad1-37f467abe6b9	1	James	Other
+6fc4b554-7cbe-458c-ba6d-c4dfd44fba51	1	James	Other
+6fcd8ab9-1a3d-42f9-acff-9ba62772112e	1	\N	Other
+6fd069ed-08ef-4c94-bc3d-abde86b574eb	1	\N	Other
+6fd27dca-22c0-4bb4-b198-014f8a76f40e	1	\N	Other
+6fd4e173-b79a-4f42-8181-47c08a2ac217	1	James	Other
+6fd54d1e-4911-49f6-9952-6facaf1021be	1	\N	Other
+6fd9826e-e529-4396-89c0-9dd17eae004f	1	\N	Other
+6fdf3333-10b3-4d2e-a001-15279b64086d	1	\N	Other
+6fe07928-b460-4c70-9c82-6c83197ca113	1	James	Other
+6fe0fb5a-ec0b-4a95-ae04-f4deadc6a480	1	\N	Other
+6fe1aa34-6716-448b-aa4a-3af8b7313517	1	James	Other
+6fe3343d-d791-4ea8-83d6-9c324fbf339d	1	\N	Other
+6fe4fcbc-118a-42bf-b7dc-5ed3c575dcac	1	\N	Other
+6fe7ee59-b9d4-4e7d-84e8-b43cdeeae53a	1	James	Other
+6fe8d140-58ba-4e16-a716-39c3b3fdbff6	1	James	Other
+6fe8f409-0871-4c31-aa4e-ebf06f857304	1	James	Other
+6ff16fa4-3f7c-4457-b9c2-ca7b8fbd1e2f	1	James	Other
+6ff1fdea-b195-43c5-8a1c-6f712f6a3ec0	1	\N	Other
+6ff2b844-ce03-4bee-a178-2cdde16551f6	1	James	Other
+6ffa815e-2875-4717-9007-a768fb1ffa6c	1	\N	Other
+70080932-1a6d-405d-9c2d-79164ef85296	1	\N	Other
+700d7b74-e3f5-4736-9d73-df3111bc4b5c	1	\N	Other
+70102be5-6a75-4216-8666-ba55268e04a0	1	\N	Other
+7011e913-56c1-4d07-99f5-31c9d3175886	1	James	Other
+701279b3-e024-4707-ba97-8fe367f1e567	1	James	Other
+70151f0c-abf9-48ef-9f65-d2b718ca6e7a	1	\N	Other
+701c1076-ec3a-4b9a-856a-059930d81381	1	James	Other
+701ec564-fcd3-432f-ae97-bf1c0ac13f79	1	\N	Other
+701efbbd-a7ef-442a-9333-0617179e167a	1	\N	Other
+701ff124-6d0a-4bb6-847e-695af100d0d1	1	James	Other
+70244c4d-fda4-47d1-be73-f745eab13a50	1	\N	Other
+70264a0a-1dd0-4e08-b9ae-7b72c6c81c4c	1	\N	Other
+7026e3ab-82f5-47e0-9f18-60e63b98c68c	1	\N	Other
+7027101d-ba2a-44cf-8b97-8a9a5fcbeddb	1	\N	Other
+7029703d-1ed3-41c6-97dd-35d114ad0d2e	1	\N	Other
+702ab273-fd90-4e37-bb1b-9cab0dcf78ac	1	\N	Other
+702d293b-3dea-41e0-9635-412b21541e37	1	\N	Other
+7038e887-8df5-4b29-b238-38d3570ef258	1	\N	Other
+703c4a0c-ecbf-4199-8991-4f2c1b9d8e24	1	\N	Other
+703e56de-708c-4d59-8ebc-b9c08e81586a	1	\N	Other
+7041ca22-c988-44dc-b21d-22f6083fd5ea	1	\N	Other
+7050ab15-e2ce-4f24-a55f-5bb7268e7cb6	1	\N	Other
+705226f4-3e65-45e3-a3e1-124d51c6639a	1	James	Other
+7052df0d-418c-4ab3-b276-b6d98ae0203c	1	\N	Other
+7057ad60-8df9-4a60-b9aa-93852340f90e	1	\N	Other
+70580183-a47a-4265-adb8-064f10b36f62	1	\N	Other
+705a5408-6249-44d2-834b-4cf02b0857be	1	James	Other
+705f02c9-ee58-41f5-b199-337abb0dccc3	1	\N	Other
+70601747-3c5e-41ae-a3a4-52b6ef8365fb	1	\N	Other
+70610f8d-b182-4718-9c15-2f1eb0c37e70	1	James	Other
+70670a36-13e4-4ec8-9686-e8e6f71b13a8	1	\N	Other
+7067220b-1c21-4045-912c-602d288bc1cc	1	\N	Other
+706baef8-c175-4d33-8f4e-3242f1e5db8f	1	\N	Other
+706e136b-0290-4fd7-b40f-1a0bbaae33a5	1	\N	Other
+707524c0-522a-4cd8-b36d-9e1e81aeec0e	1	\N	Other
+7076a38a-1542-4e15-8f32-077e12f02257	1	\N	Other
+7076b02e-c3b2-406b-b477-8db9250e4884	1	\N	Other
+707ae81e-5aa3-494e-b311-5deee1296158	1	James	Other
+707bce3d-3f23-4403-aea0-1b2c9ccf7524	1	\N	Other
+707bee7b-ed27-4139-8f3a-74db7a2b9241	1	\N	Other
+707d0ecd-6511-429d-b79f-00d763e7e344	1	James	Other
+7080c2f6-66c5-4d02-82d7-55a7340dcb57	1	\N	Other
+70880a65-9523-4191-b535-6004553d1f73	1	James	Other
+7089bee6-ce2f-4cab-84a4-e2e44acf9c0a	1	\N	Other
+708db10f-b5dd-4596-8b91-2dfbe8dc4c4a	1	\N	Other
+708e8552-dc43-4480-9beb-ba7222ba6ad4	1	\N	Other
+709617a4-0ce1-4d15-87c1-7772428caaaf	1	James	Other
+70965cd4-94ec-4ebb-922f-3130911d1c27	1	\N	Other
+7097bbf7-32fe-4b20-bdc0-040347b25155	1	James	Other
+709a2452-12c1-49f0-91a5-0be1095400ac	1	James	Other
+709a9300-cdc2-4c57-bee6-18b2b911b5a7	1	\N	Other
+709d5d50-71f9-4e2f-87a5-ceead4358a47	1	James	Other
+70a67bf7-1bea-4f18-b7a5-2758edd6b0c3	1	\N	Other
+70a7349e-0e22-11e8-b7da-fa163e8624cc	1	\N	Other
+70acde82-f0f8-429a-a859-de0c97de156c	1	\N	Other
+70aece1d-4c77-4d06-b20e-070c26e0bb59	1	James	Other
+70afe8f6-0d3f-4d04-a6c1-0cd8bed116eb	1	James	Other
+70b4c266-efb9-41da-a55f-272db67bc003	1	\N	Other
+70b6eae3-98bf-472f-96ab-a2e139260603	1	\N	Other
+70b6f675-baad-4465-b2d7-db0ba64af5dc	1	\N	Other
+70b75ff4-1e99-484e-b62e-f91e4ff416aa	1	\N	Other
+70b7bb43-dd97-456c-856a-d52b2f17d884	1	\N	Other
+70be1310-a4d5-458c-b752-97a1b8a339ba	1	\N	Other
+70c27927-a320-4324-95f6-97d90eb85b92	1	\N	Other
+70c50a27-2b4d-4348-9356-b66ead1ac11e	1	\N	Other
+70c53552-77c3-4efd-8dfd-6ddd13792111	1	\N	Other
+70c783e3-1a29-4ffc-a0a0-a92be6e3f1d7	1	James	Other
+70ca644e-5fea-4efe-afb9-81fce9510d6a	1	\N	Other
+70ce3e18-30b8-4b75-87ba-83b2d70d4f10	1	James	Other
+70d10490-0e22-11e8-a7d9-fa163e8624cc	1	\N	Other
+70d358a4-b9a3-43ab-bb7b-2520256a40f6	1	\N	Other
+70d57947-fe49-46ee-a97b-f0a2c652d722	1	\N	Other
+70d9026c-ed09-497b-8303-e1cd163667a3	1	\N	Other
+70ddd3ca-44db-4207-a474-f2be81e3a74f	1	James	Other
+70de818d-5e64-4b7d-9ba4-ea7494850c6f	1	\N	Other
+70e0fe3d-8063-41c1-9ba0-8948026fcce3	1	\N	Other
+70e1f06d-166c-45f8-ae86-8a062ab41a0e	1	\N	Other
+70e4fb00-660f-4a44-8424-83febbc3761c	1	James	Other
+70eb0248-340f-4dd6-9ad5-f9b494ad2af8	1	James	Other
+70f7cd30-8997-4f41-b40c-a6528222ebd6	1	\N	Other
+70fb3e7c-9158-479d-a871-9a3fcbd34bbe	1	James	Other
+710470b8-6754-4743-b022-22f52f0c0fea	1	\N	Other
+71084065-4cc4-4d7a-82ed-629568f84beb	1	\N	Other
+710d8b0f-a61a-45b0-b003-2b56e0b5df64	1	\N	Other
+710e9021-a0bb-49df-ad06-d774e7d66d39	1	James	Other
+71155b68-9edd-4b4d-b9bd-a874d364816f	1	James	Other
+71160fd6-49b7-4027-a022-caceba869482	1	\N	Other
+7119ce93-7b55-4f78-bbf2-d914a3d67137	1	\N	Other
+711a1e22-12c9-4583-800b-dba93843f36d	1	\N	Other
+711caf8c-d2a3-4de0-9f5a-6d7b1410e443	1	\N	Other
+711d4f08-496e-4c48-9b93-669fd3ec5cf6	1	\N	Other
+71257236-9948-4c97-a7f7-76e2b290cc48	1	\N	Other
+7125dce6-1465-41f7-b0cd-c5596435a27a	1	\N	Other
+71260f25-a0a6-4dd0-bd56-3255c2e6738e	1	James	Other
+71287b19-e1f9-4083-9be2-0118235710e0	1	James	Other
+712bb65b-0478-4c9a-a7d0-2ece6684054f	1	James	Other
+712da0c8-d473-495f-82f8-471c912d9481	1	\N	Other
+713064c1-77e1-45cd-88ca-c39b7a8b16c6	1	\N	Other
+713592dd-31d7-4e5c-a9cd-4d1c58f5f912	1	James	Other
+7135d32f-d19a-4eee-893d-930eb642ecd3	1	\N	Other
+7136fe47-1a5c-49f9-bd04-4f4993911fd5	1	\N	Other
+713c1977-343e-4731-96f7-bcffa74afb05	1	\N	Other
+713ea963-f42d-4e4b-81aa-9c71583d7327	1	\N	Other
+7141e32c-ae56-495e-a1b6-3149c6771d84	1	\N	Other
+7145e37e-8f2f-466b-b9ba-72aba3180d84	1	\N	Other
+714630ce-3d67-42ca-b1ad-2f17dc14520c	1	James	Other
+714c27a7-a162-4381-9698-01d70c47805e	1	\N	Other
+71504c4d-d1b2-4da2-95b9-53dce2565766	1	\N	Other
+715128d8-7a65-4468-a57d-268ceb9887b3	1	James	Other
+7152e484-973f-4316-8541-b182f2d6ccdf	1	\N	Other
+71540674-2953-4559-8a04-7fbd5989ea0f	1	\N	Other
+7156198f-f777-480d-b515-7635980ffc44	1	James	Other
+716032a9-ff25-4b0f-bb13-88a80b62268a	1	James	Other
+7163bf86-5d58-4ed5-8b21-f9f9994360aa	1	\N	Other
+71669022-9110-4349-bfee-01e8d45cd465	1	\N	Other
+7169fd46-e038-4ede-b515-d31f50021905	1	\N	Other
+716cdf89-0a18-438e-bdda-f2dc8998592b	1	\N	Other
+71706000-196b-4a03-a653-23a6e7585324	1	\N	Other
+7175bab2-49d5-4787-aee8-18b534367777	1	James	Other
+71760a29-5ce6-4fb6-bd65-2c338370bde0	1	\N	Other
+71766b8c-3a98-4e93-9994-2f74fea51f79	1	James	Other
+71784892-6c41-482e-a004-8ada9be40774	1	James	Other
+7178c3f1-7e9e-4923-962f-79d4048469d8	1	\N	Other
+71797252-b7ec-4e45-9e91-9505436f012f	1	\N	Other
+717bb946-e63e-4f39-a3f3-a057bd1ac58c	1	\N	Other
+71812b53-19d5-44ca-baf1-ffc5f63c9307	1	\N	Other
+7182321a-05e9-4f30-8c97-783eb5bf3b63	1	\N	Other
+7183e506-a704-46d3-a9b3-5c0c59d7adaa	1	\N	Other
+718589c2-0f74-42e4-b569-b32f9242e358	1	\N	Other
+7185b925-0864-4e66-8d3c-d36401ce710c	1	\N	Other
+718845e9-d3e4-4e01-9e59-2c810237b2a6	1	\N	Other
+7189d7c5-7919-4faf-b9f6-1bf15aa79a4a	1	James	Other
+718a424f-5d8a-41b1-be39-72e7700bf5c9	1	\N	Other
+71986145-72c7-4b0a-a55c-5b6cf429ce4e	1	James	Other
+7199f587-b4ef-42cb-86ce-22fd3d5a9f90	1	\N	Other
+719a215f-30ff-4371-a662-ba092b0cf640	1	\N	Other
+719a5be4-c5b4-4d34-a268-334122cbf13e	1	\N	Other
+71a3add2-a82a-4d15-a08e-69637b0b23ac	1	\N	Other
+71a734df-8f1f-482e-8147-4d55f35a0fc6	1	\N	Other
+71aa6b4b-770f-4cf3-8ad3-5e715b17eef4	1	\N	Other
+71ad9f0f-c8a8-464c-b5da-b6a052f64ea6	1	\N	Other
+71af42aa-7df2-48d9-a685-fd6a9589c0d1	1	\N	Other
+71af5fbc-6650-4fe7-b25b-90665901b78d	1	James	Other
+71b10a25-cbfd-41bb-a9c9-979d884697ac	1	James	Other
+71b485d7-763a-4481-a872-adb54e16a73f	1	\N	Other
+71bd0da0-2e0c-4eb9-8607-7dc764d99c00	1	\N	Other
+71bd1ea7-41ca-4b97-acee-c65b02b0b620	1	James	Other
+71bef233-1c94-4a9f-9d4d-a00f7e9509bb	1	\N	Other
+71c99f01-4678-4995-81db-b27c06cda5a9	1	\N	Other
+71cacb0a-5a01-4628-8357-80bad451320f	1	\N	Other
+71cb2636-8383-4a8b-9cbc-bf387c4a9fad	1	James	Other
+71d382c3-cb8f-4cd5-90e3-3bc199a64a98	1	\N	Other
+71d50389-27f6-417e-ab05-4435192777bc	1	\N	Other
+71da5668-9830-4023-8011-963c182923f5	1	\N	Other
+71db1c78-d493-474a-8e0f-cd71a71c7c98	1	James	Other
+71dc72be-18fd-4caa-8e64-5dfca31c9e10	1	James	Other
+71de02b0-0e79-49dd-9482-562cf035de99	1	\N	Other
+71de2b2f-2667-4daf-a533-3d289280926a	1	\N	Other
+71dfd4a5-70e5-434e-a462-40ef76837faa	1	\N	Other
+71e3fb3a-4302-4e4f-945a-4f38f75ab26e	1	James	Other
+71e5cbc8-765a-471d-ad7d-1bde0d8bb589	1	\N	Other
+71e71623-763d-44ab-a9ca-fc14e7839094	1	\N	Other
+71e84f7f-8bf1-4a52-a4c6-2917c77e51ae	1	\N	Other
+71e887a2-b9c6-4be7-8b3f-196e7f084b77	1	\N	Other
+71f0b98d-222c-45a1-b627-df3cc5a5bf24	1	\N	Other
+71f2e571-9f11-4323-8c5c-6dc7dd5d428b	1	\N	Other
+71f97868-ae04-4897-bb1d-a071f0998f95	1	James	Other
+71f9ad74-c4bb-405e-b571-6a30f2d0f803	1	\N	Other
+71fb7aaf-7963-4533-be2a-89e2f278c4c6	1	\N	Other
+71fc572d-cc6a-49ad-9290-a0a87bcbb25a	1	\N	Other
+72067166-e757-4011-9027-a435e0105054	1	\N	Other
+721099cc-c5ce-4638-999f-30f3f3e12ccf	1	\N	Other
+72131559-a5f1-4ad2-8e5b-246c246da3e3	1	James	Other
+721f220f-1c19-4fc1-a842-f59793f72b97	1	\N	Other
+722168b6-5ea6-482a-96a9-71fa98df799d	1	\N	Other
+72257006-de16-45d9-beaa-ecbab310cc1a	1	\N	Other
+7228c602-62a6-4a8e-9899-b12316be05e5	1	\N	Other
+722b6282-4cb7-47d2-8f98-d764bccef5a9	1	\N	Other
+7231bde0-defc-4c83-832e-d97b1d09528b	1	\N	Other
+7233cebb-bab6-4bdc-9774-8d744cac2ec3	1	\N	Other
+723522b0-10f4-11e8-9157-fa163e8624cc	1	\N	Other
+72369a37-1957-46c4-abd1-3d3330bcd714	1	\N	Other
+72398889-eebd-463f-8844-d910646128b2	1	\N	Other
+724616cf-1409-49a6-b00d-04bdebc58c37	1	James	Other
+724885c4-dee5-45c8-8667-a0326b3000ac	1	\N	Other
+724a8310-d91d-4baf-8b5d-db6c773df327	1	\N	Other
+724ac444-caae-11e7-8ffe-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7250364d-2f03-423a-b1e0-bc6aa6163e1a	1	James	Other
+7250e1d4-2e1e-406b-8d2f-fdd77bc8771b	1	\N	Other
+7251b7cc-3f94-47a9-8dd4-5888489b1e67	1	\N	Other
+7256eb10-cabb-46c0-904b-0ea573eb16b6	1	James	Other
+7258d3ad-2b3e-41ca-bdda-432ce3aee8a5	1	\N	Other
+725a6f45-a2be-41c9-845d-b5d3695dca94	1	\N	Other
+725e85fe-df20-4447-a4a1-8b41f867221d	1	\N	Other
+725fd067-4ca4-43ae-9bf5-020dcf44f9db	1	\N	Other
+726468b5-e9ff-46ac-996c-1e147604b0c2	1	\N	Other
+726554c8-0509-42f0-8ccc-c87990be160a	1	\N	Other
+7269c501-3052-4ae8-a512-bfa5f3a019be	1	James	Other
+726dbe7b-df99-4a15-ac69-526218f5ba72	1	\N	Other
+7272928e-5639-49b8-aa1c-938c8dadd3a2	1	James	Other
+72770b12-c3ad-43c5-a639-60a7834cba94	1	James	Other
+727944a3-098f-473c-b0d4-0c6efc49017b	1	\N	Other
+7279dd08-9e75-4e4f-b5e9-8ad6b177e1e2	1	\N	Other
+727e10b9-7a74-48f4-af7d-42685e0da07d	1	\N	Other
+7280fbdc-fae5-4e50-ae0a-08153f9614c1	1	\N	Other
+72813e26-5eb5-43e9-b5bc-b5d3b7992901	1	\N	Other
+72843ebb-033e-4263-b261-cbb773cf41e4	1	\N	Other
+7284d1b2-e4e4-4bf2-b6b3-58e6276ffe82	1	\N	Other
+7287d9ff-56af-4838-9272-7c0cdf94a67c	1	\N	Other
+729724d4-5ad4-467f-957c-085f63966985	1	\N	Other
+7298eedb-efe5-49bb-a839-94539fa143e6	1	\N	Other
+729c362f-3429-47b7-8b4f-f3a49b68affe	1	\N	Other
+729dac6f-8c4f-417c-83da-edcbc41558ee	1	\N	Other
+729f5c5a-9d4a-4bc1-9a4a-083045ff86bd	1	James	Other
+72a1495e-780b-4937-b4c9-71ad4c26d369	1	\N	Other
+72a29f41-e09d-4a6e-bd1b-6823f6a1ef24	1	James	Other
+72a371f9-79cf-476f-94b5-d5240c41557a	1	James	Other
+72a417f9-bac9-4ae4-b253-faad5cdb866d	1	\N	Other
+72a531c7-fa53-4428-a061-a7aa322e4b5f	1	\N	Other
+72a5a0ff-8c7e-4c98-819a-23b163a9b30b	1	\N	Other
+72a5bd11-6129-417b-9c8c-11a086e9d201	1	James	Other
+72a5f043-7420-46e7-bdc5-ecbe577f5e30	1	\N	Other
+72a6956a-1f56-4dbc-ac73-944de6e35eea	1	James	Other
+72a7929d-ff0d-4d30-80c0-5aad72425191	1	\N	Other
+72a897ad-d032-4adf-a682-63b8323f1627	1	\N	Other
+72af17f7-66ed-4dc9-998d-eb9308bc1bdd	1	\N	Other
+72b0b4fc-10f4-11e8-8632-fa163e8624cc	1	\N	Other
+72b279db-f345-4fd8-8a8b-d84e2a37f0b3	1	\N	Other
+72b4694a-d515-4a87-a129-6e912b7478ee	1	\N	Other
+72b58110-6cf6-41ec-ba5d-e4258ffeac7e	1	James	Other
+72b80c19-587f-4525-82c7-ea2f3b8ad0d7	1	\N	Other
+72b8248c-2bd5-4212-a576-f82ea3ce6cd4	1	James	Other
+72bc56ed-aeba-4080-ae70-8d83a83a4b04	1	James	Other
+72bc89ff-7d08-4f3d-a820-b615ca57badd	1	\N	Other
+72bf9801-013b-416a-9b45-9ce4bc9b07a3	1	\N	Other
+72c4f1db-42eb-4952-84b0-3b28694182eb	1	James	Other
+72ca5f39-93a2-4e02-a4fd-4c6cd5de24bd	1	\N	Other
+72ca6727-feea-4f2b-bb3d-314be56a51ab	1	\N	Other
+72cf8b6f-f8db-4049-9d92-eb00bd0f9a1d	1	\N	Other
+72d283a3-18a0-4641-b465-6886859d1a7b	1	\N	Other
+72d30ac6-b423-4286-bb5b-23af48d72392	1	James	Other
+72d57899-e748-4668-aec4-e662d253cdc5	1	\N	Other
+72d6c976-6227-4b31-aef7-c0e7a556cc45	1	\N	Other
+72d8ffdc-bcc8-4f22-bb6c-8ce8c0cb8609	1	\N	Other
+72db0d35-943c-44a0-a535-b949ea15d015	1	\N	Other
+72dc4c23-d4d5-4e13-8ec7-c25994fb46e2	1	\N	Other
+72dc6985-dde7-49ea-8d29-72cfa3d3f52a	1	\N	Other
+72df1079-40c9-4b69-9caf-da2a7588c62f	1	James	Other
+72e3436f-3585-4b0e-864f-cb0ded9f49fb	1	\N	Other
+72e57ff2-fc90-45c6-aa4e-8ddde5edfcae	1	James	Other
+72e5da1a-02cb-4b94-bc83-3042dd32577f	1	\N	Other
+72e777ed-9942-4544-b617-43f85b8532ca	1	\N	Other
+72ebcc11-276a-4cd3-a0db-1173726d23ea	1	\N	Other
+72ec7e0f-2ef7-4f66-811f-ac26a501ce9c	1	\N	Other
+72ed220c-3022-4c95-b588-5307466fa796	1	\N	Other
+72ed42e2-a505-4ada-86c3-0e4dca566eaf	1	\N	Other
+72ee9f0e-818b-40a5-84e2-051daa7235ad	1	\N	Other
+72f2a880-2b1c-42a7-8f45-6b660bffb107	1	\N	Other
+72fafeda-bd32-4fce-8324-d1b19913250b	1	\N	Other
+72fccf0a-52ee-49a8-a16d-c4081fc5c67e	1	\N	Other
+73059081-6dfe-4ead-a199-3a97742f00ba	1	\N	Other
+73085b9c-b842-4517-8ed5-fbe46c673021	1	\N	Other
+730ca358-efc8-40a1-8663-3478e282c469	1	James	Other
+7316b85f-2223-4efc-b70a-5a42fb91ef2d	1	\N	Other
+731899f1-9f15-4da1-be85-96f22b797b2c	1	\N	Other
+731ee9e4-ae98-4d36-b7c8-01aae05382bb	1	\N	Other
+731fa8fb-3a48-43b9-b438-8bb0924e0d1a	1	James	Other
+73226367-dc00-42c7-8c86-969c5bcad45c	1	James	Other
+732484ee-1618-11e8-97e4-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7325ce36-bd75-4389-bd08-695323aa233b	1	\N	Other
+7326e0c6-d51b-44b8-9a5d-068da479aeaf	1	James	Other
+732c5e93-33f9-424e-bfb6-c45133419f93	1	\N	Other
+732ddaa9-b119-4158-bd5b-dfa40167e510	1	\N	Other
+732fb402-9c49-11e7-b8fd-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+73334a4b-dc13-41a8-841a-b6cd49db3ab8	1	James	Other
+7335ac16-2c60-4562-a0cd-61d779be393a	1	\N	Other
+73363aea-3abb-4174-8e38-3ea30e4b26c4	1	James	Other
+7336dd70-3e7f-4ab6-8838-610031626b1c	1	James	Other
+7336e6ca-83e5-44c9-b53f-2d40f7ccd54d	1	\N	Other
+73384e0f-1c54-40d4-9cf7-2665a7e8434f	1	\N	Other
+733b12a4-9672-427f-b01b-68bdc2733f1a	1	James	Other
+733fbbf8-3998-419e-b96a-4f8492d9ccc1	1	\N	Other
+7340c41d-100b-4a65-83aa-f6ec03aa9997	1	James	Other
+73463444-3971-4ab7-963e-847a29541888	1	\N	Other
+7347f354-51d6-47dc-a90a-ea052cff356e	1	\N	Other
+734b332f-84a0-45dc-bfee-5efea5f5d059	1	\N	Other
+7353364b-7055-4f2d-9055-b05b7febcb2f	1	\N	Other
+7353fd72-e2fc-4495-8a2c-3b1cafedeed6	1	\N	Other
+7354e37b-286f-4072-a85e-25328af7160c	1	\N	Other
+735565b8-3eb1-4ef7-8fed-1176cef17733	1	James	Other
+7358a654-4575-4e2d-a957-5483a3fd2f4c	1	\N	Other
+73597b19-2dfc-4016-a63f-25cb486c30cc	1	James	Other
+7359f304-9031-4a18-a83a-ebe20285c9d7	1	\N	Other
+735d9164-2d97-4816-9a45-9fa8e6448639	1	\N	Other
+735dd27a-3ae8-44f3-be44-54cb7aa08577	1	James	Other
+73601561-2ca9-4ff7-81bd-e7a251495519	1	\N	Other
+7360204a-4daa-41a2-973f-fb2e05034412	1	\N	Other
+736359b4-7440-49c0-9a48-8735bbd6d0d9	1	James	Other
+7365694f-db2b-4909-b92a-4d5cc61be4c0	1	\N	Other
+7366c437-b1eb-4c86-9982-63c4c7853c09	1	\N	Other
+7366ca8e-13fd-4e14-8eeb-0a2010f6f263	1	\N	Other
+73678a8f-64c1-4752-a88b-b58c54b78095	1	\N	Other
+73702f18-d24f-4d7f-9058-00e53c548f3f	1	\N	Other
+73720283-e795-4a2a-8af6-7694351d65ee	1	\N	Other
+73725185-c1cc-4ad2-b2f4-65e94638d805	1	\N	Other
+7372876c-a33f-4448-94df-57298d19e337	1	\N	Other
+7379de6e-dd45-4cc6-a9a7-f758af499553	1	\N	Other
+737b8559-44a9-40b6-a677-b883ca464903	1	\N	Other
+7380f509-3d2b-4e8c-9e65-4b6cfc7e7bf4	1	\N	Other
+738289b6-c4b9-4f42-853f-68b861204710	1	\N	Other
+7383b469-2df7-49b0-872e-15f5c8f33a7a	1	James	Other
+7383c5ab-eaf9-49da-883d-15127ef41a9a	1	\N	Other
+738573f6-557a-496e-b840-33bbaeda68bf	1	\N	Other
+7385b06c-e843-4a3d-b31f-5ed6ace247e2	1	\N	Other
+7386c7d4-1c45-4140-a311-6ef2f2ea9ed9	1	\N	Other
+73894b05-dcb9-4700-b0cb-76b52d9932ed	1	\N	Other
+738ef49a-1ae7-48d6-9b2a-211fb95bc9c9	1	\N	Other
+739132c7-d424-480d-ae86-e9cb94a69eea	1	\N	Other
+73916f7f-2a43-484f-9732-47a3384c6c1d	1	\N	Other
+739245fe-339d-486e-a021-3371177dcb82	1	\N	Other
+7393050a-95b8-4e7d-8125-8b4d13f316b0	1	\N	Other
+7396b5aa-b696-4124-ad27-ec2ba0cd9bca	1	\N	Other
+73972a45-95a6-4301-9d06-1f75bd1ce7bb	1	\N	Other
+73997012-a375-11e7-ba98-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+7399f748-e915-455a-b527-5226c387b45a	1	\N	Other
+739ac021-416a-4fed-a4f1-c71a9625aabb	1	\N	Other
+739ad08d-1959-42e3-8e10-1347fc59e754	1	\N	Other
+739be383-2bbe-403c-86c4-cd2d89a58d7d	1	James	Other
+739d64b3-2d59-4a76-9872-0d03cee37541	1	James	Other
+739f32c0-d6fc-41aa-b15b-b5ea68235f0d	1	James	Other
+73a7708c-fc74-4354-ab14-6ad7f007cc44	1	\N	Other
+73a8a556-48b8-4704-9b97-cc1397e710b8	1	\N	Other
+73aefade-59cb-42d3-9f9d-1789d71eff71	1	\N	Other
+73af229f-118d-416a-9389-49faba188858	1	James	Other
+73b26870-19d7-42ee-b45a-7d65f9a37c0e	1	\N	Other
+73b6a676-c276-488b-942f-17638c15e812	1	James	Other
+73b6a7bc-966e-4afb-a269-06c6cd68e4b4	1	\N	Other
+73b8777a-275e-487f-a195-c0196aefd932	1	\N	Other
+73b946a9-5794-4a0c-9864-c3786df0aaa3	1	\N	Other
+73bd8d8c-0b1f-11e8-8397-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+73be17f5-7eaa-4a56-ab4a-690a52bdbd80	1	\N	Other
+73c1abda-1349-40df-befb-a153d24f3268	1	\N	Other
+73c3e940-793f-4980-9b18-879eeab0172f	1	\N	Other
+73c495b7-2109-43b3-a3d6-208a0411ff5c	1	James	Other
+73d73c35-5aa0-426e-9ebb-e06139b60f69	1	\N	Other
+73dc7fa5-335d-4d94-9080-deaa18ae698b	1	\N	Other
+73dd771e-e0a9-11e7-9f2d-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+73dfc948-aa3d-44ba-a3f5-af21aa31560e	1	\N	Other
+73e139d2-759a-414a-a7bc-60ef0b068d81	1	James	Other
+73ed7203-5ef6-460a-85f4-f682e8af0686	1	James	Other
+73eef8cd-2aeb-41d9-a720-52245dad9601	1	James	Other
+73ef79e2-aa46-40aa-8106-4a9552245317	1	\N	Other
+73efc92e-0823-42cf-a413-a9abb23bd9ae	1	James	Other
+73f67546-fbef-11e7-ab06-fa163e8624cc	1bad3dee-1440-11e7-b97d-fa163e4dd901	\N	Other
+73f87f2d-9515-46f5-b62a-a764eda94428	1	\N	Other
+73fe1439-01f5-4f63-9e66-a23b37a86ca5	1	James	Other
+73fe2e3d-3c94-4a45-9de8-407bc0384235	1	\N	Other
+73fe425e-1b96-469d-b46a-0fcfb91deb68	1	\N	Other
+73fef125-4aac-43cf-a330-278fdd2ef038	1	\N	Other
+74057928-88db-4690-add2-2e3a7692f693	1	\N	Other
+7405d3ec-5f56-4df2-92bd-6aeb8d0335fc	1	\N	Other
+74065818-6d0c-44f7-81e1-f62bcd4b38a2	1	James	Other
+74132808-fb1f-44e6-8675-e0225b9415f5	1	\N	Other
+74162444-8e62-4183-b29c-99ddbf984827	1	\N	Other
+74172733-fffe-4560-854f-6751f246f0ee	1	\N	Other
+7417d4c0-c082-4ddf-a95e-8159b36ce3b6	1	\N	Other
+7418dcb0-bda1-4f23-9108-d768d4b3f80f	1	James	Other
+7419454f-8855-4eab-b500-9df987682034	1	James	Other
+741b3769-35ca-4418-809e-08ed415cf010	1	\N	Other
+741dad40-eb27-458a-bd24-384ae6836dbe	1	\N	Other
+741ec620-25c9-42e3-aade-664c25842b7c	1	\N	Other
+74218545-d127-4a38-8aae-66803b4cd0ba	1	\N	Other
+742401d2-c09a-4b55-8936-27a964608902	1	James	Other
+74250f53-4a84-44a7-b172-be658f08ab46	1	\N	Other
+742c0dce-af27-11e7-b74a-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+742cbf03-b193-47d2-81a8-3466a96deb6d	1	James	Other
+742d18e3-287a-4dbe-a995-a264540f5fc2	1	James	Other
+742f0924-cab7-4ec2-83e6-909f0c948d78	1	\N	Other
+74306ac6-1cc2-4ae5-99b0-35fcdc56ef5a	1	\N	Other
+74315e56-1376-45c5-90b2-67c5677098f8	1	James	Other
+743316ac-bdfa-4b30-b511-9e95ea3f4171	1	\N	Other
+7433f317-8585-478c-968f-64a8a972644c	1	\N	Other
+743492c6-4797-4ec0-bdd7-2a1b5f58cc41	1	James	Other
+74379803-4ca4-43ec-bb9a-4d9b244c1ee5	1	\N	Other
+743fb4f1-28c3-4cc1-8cd3-7dbdcfad4379	1	James	Other
+7440a719-9e17-4b5b-ad34-f6227fb07631	1	\N	Other
+744264f6-538f-43f0-bca3-0780f157e44a	1	\N	Other
+7443b7bd-a1e8-480d-97c0-b93b19384bf6	1	\N	Other
+744944c4-bb05-4ceb-946f-a9e0458f23b1	1	\N	Other
+744f229f-e43b-4135-8383-ed900b549bd5	1	James	Other
+744f22c4-4e03-4854-8df1-d15003913d7a	1	James	Other
+74577dff-9320-4a04-9f7c-9363136d238c	1	\N	Other
+7458a489-f7cb-4549-93ab-3a9445bdc457	1	James	Other
+745ae40f-5bf2-41a0-bc74-4d73b1c55a35	1	\N	Other
+745befcc-a677-403a-8d55-adc8ed7de88d	1	James	Other
+745d3693-ca2a-4ae7-8c58-8b5255f6023a	1	\N	Other
+745ebd50-0ce0-456e-acd5-36f94536e53f	1	\N	Other
+74610b62-6fe3-430f-a9d5-e380f08a88c7	1	\N	Other
+74666ef8-0614-4ca4-acd7-6a34491f3363	1	\N	Other
+746ce901-a5eb-4a08-8e59-9238bdaf136b	1	\N	Other
+74704494-477c-408b-8dc3-45c67598eab4	1	\N	Other
+74715dd6-3cab-11e8-bd2e-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7471edd3-a979-4459-ab93-1fb0881ab409	1	James	Other
+74728b4c-444d-460d-a724-7cffe395da05	1	\N	Other
+74732ba6-98c6-4a7b-aea1-40658778d8c9	1	\N	Other
+747438d5-cbe7-467b-8b3c-bd456276ae50	1	\N	Other
+7477ce71-7c9e-4deb-9cbd-a46e7307c090	1	\N	Other
+747868a6-168c-4937-9d4b-8c14bfa82829	1	\N	Other
+74788077-b4da-4418-a58f-83b4d2671d6a	1	James	Other
+747acaf3-0fa7-4a05-9988-0ff8fa4916b1	1	\N	Other
+747acee5-a661-4cb3-a5f7-fbd974ab8581	1	\N	Other
+747cc59a-1794-11e8-a2c8-fa163e8624cc	1	\N	Other
+74817e72-2714-45fd-8855-a898d3ffa850	1	\N	Other
+74826e60-23d3-4e0f-9061-d46610df0b65	1	\N	Other
+74831c4b-a064-44ae-ad44-9d3c80546b95	1	James	Other
+74834c94-2c48-441a-a960-c5d179bbd6d5	1	James	Other
+7483ed46-d5d1-42ab-aaf5-282eb412a6d2	1	\N	Other
+7484db59-5898-40ac-b5b2-f5018d52c57e	1	\N	Other
+7485455e-8d1b-436f-8e28-df7756c0d5bc	1	\N	Other
+7489b327-68ab-4898-8b45-b20128ffcf90	1	James	Other
+748a1676-25ae-42b0-9ed0-81747239ec54	1	\N	Other
+748a63a5-c895-41ca-8365-b2ddae6462f0	1	\N	Other
+748aab2a-4273-48e8-a029-608d94e73617	1	\N	Other
+748b9c99-b836-4141-b171-c7def7ddb581	1	\N	Other
+7490807f-f351-4827-85fa-49c2c0cae86b	1	\N	Other
+7493ad80-0ac3-49e6-949e-bcbdbee2a88f	1	\N	Other
+74948319-6dcb-4a7d-acf7-6e98bbb3cf33	1	\N	Other
+749ad5b3-f2fe-479e-a1c9-5bf07ccdade4	1	James	Other
+749d17ce-6c02-4d6a-9e03-45ad6b59fd55	1	\N	Other
+749e4546-d69e-465f-a0c1-8bb3326adfc1	1	\N	Other
+74a1fa55-44c3-4134-aee5-0513ccc70666	1	\N	Other
+74a22881-f36c-4279-aa3f-a2fbcd15532c	1	\N	Other
+74a2a650-d238-4f32-9cec-42a7df8b91df	1	\N	Other
+74a34be2-e860-4553-8ce0-40b2a4ac9c20	1	\N	Other
+74a83c20-1794-11e8-b891-fa163e8624cc	1	\N	Other
+74aa99fe-fcea-4dfe-805d-d1e06d65545f	1	James	Other
+74b0fbfe-dca3-4c01-9902-9ed4652cc222	1	\N	Other
+74b1b046-6d2c-48cd-841f-737d226e9adf	1	James	Other
+74b700ae-cb4f-4316-83e3-0c952ae721a5	1	\N	Other
+74b7ca05-db91-4599-ad8f-5e8addde0b25	1	\N	Other
+74b8e68e-0103-4951-8532-0fd9b57fa570	1	\N	Other
+74c9360f-1fe5-458f-b027-e1a069e32d8d	1	\N	Other
+74cdd7de-5484-4eb7-980c-c4040a1740bd	1	\N	Other
+74cde966-0462-463d-addc-bb14eb65736d	1	James	Other
+74ce2528-14a0-42ea-85b6-bc6d694a1f76	1	\N	Other
+74ce64fc-ae6b-48be-b210-0002b893ab28	1	\N	Other
+74d28a8f-69e1-4e7c-a6e7-1b1b5496d848	1	James	Other
+74d28c72-58d0-4e8c-99df-98e47205ebac	1	\N	Other
+74d544c0-4704-4f37-b573-ffdb149c9142	1	\N	Other
+74d82bba-8728-44bd-858d-a52323200dcd	1	James	Other
+74dd9fdc-9cba-44a7-92e4-4141bf8e075f	1	\N	Other
+74df30e1-ace3-476e-ab28-676856ef08e9	1	James	Other
+74e16dcc-d1f3-4ec4-b273-f22d09d4c63c	1	James	Other
+74e4d30f-9ea7-425b-b26b-2ae794c6245a	1	James	Other
+74e7778f-6d44-4e55-8d0c-8dc0194ad354	1	\N	Other
+74e7aacd-655f-431b-a27a-56069cb03525	1	\N	Other
+74e85130-74f3-4328-a4dc-0fb19f8acda7	1	\N	Other
+74e8c9b9-3f61-43ee-a495-6d88cff1d0d6	1	James	Other
+74e99da7-006a-462b-a91a-74075bb9060e	1	\N	Other
+74ed614c-7393-446a-ac15-4bdce8696ad6	1	\N	Other
+74edc60c-250a-4e4c-9102-2706a794af88	1	\N	Other
+74efc038-c069-42cc-b105-38ab3701b3c0	1	\N	Other
+74f07505-408d-4b36-9f75-c4ac5533bfee	1	\N	Other
+74f11cdd-89dd-40e5-8cb9-7af55341e573	1	\N	Other
+74f1e0b2-2acc-412a-858d-8dfd7834db2f	1	James	Other
+74f3f01f-843d-4d59-92cf-a398523ee0e3	1	\N	Other
+7501338e-6e0e-44ce-9463-e56ab1538bda	1	James	Other
+750422d7-8119-43a2-be71-72f9392afd65	1	\N	Other
+7506babf-fb98-4fda-83b9-e4f267655514	1	James	Other
+75074406-8fc9-432a-88eb-1ad604d04358	1	James	Other
+750abf3b-bebf-4871-bed5-4c9181b90259	1	James	Other
+750ce4e4-ce31-4497-aa03-118fb3b12795	1	\N	Other
+75148322-1d7d-4c1a-bdf4-319bfbf34f08	1	\N	Other
+75175703-42ec-4929-b510-400bf111a372	1	\N	Other
+75193545-7d0e-40fa-a18c-5437c0238ba1	1	\N	Other
+751b0b21-2643-4df2-bd52-7ddca8bd42c4	1	\N	Other
+751cd3eb-d481-44a3-a36b-5ebe116fb720	1	\N	Other
+7520e3be-60b5-46e1-ab4e-8f09717d0e46	1	\N	Other
+75210d7c-122a-11e8-8082-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7524ea77-4bb3-4bb9-98e5-f9262a06b22d	1	\N	Other
+752a59b0-ad51-422f-b77a-04d6581223f3	1	\N	Other
+752ca87d-8557-47bb-8ca6-200c7d95fc58	1	\N	Other
+752e907c-9ae6-4907-860c-ea9b1ef64f50	1	\N	Other
+75312805-3701-4d7e-9116-6b84870d7401	1	James	Other
+75328eef-70ca-4550-8ddb-6cc1f1493507	1	James	Other
+7536df49-a429-44fc-b696-bc8ab7e9379d	1	\N	Other
+7538a5f6-72e0-463d-a12f-dc9499db3173	1	\N	Other
+75396dee-5528-4fa2-b1a5-b04d857ef5c7	1	\N	Other
+753b8a2a-17c7-4bd7-b868-9e347a99f0a8	1	\N	Other
+753f0a05-aa1f-4357-b12d-d32bb5688791	1	\N	Other
+753f3cb8-bc83-463a-8959-74d7a5b34959	1	\N	Other
+75435d27-e738-49f1-816c-fe2a31ee071a	1	James	Other
+7544f81c-f45b-4977-bc18-d85ed6dcfb44	1	James	Other
+754806d9-14da-4b0d-b5b3-aeb841b3559a	1	\N	Other
+754a12f4-1e96-4bd4-98bc-99c7d3833d3c	1	\N	Other
+7552376d-cccc-443d-bfaf-0870a38a5fcd	1	\N	Other
+75526ebb-1330-4689-a0c0-1b0fecd1bebb	1	James	Other
+7557829e-a0bb-42c1-89b4-64f729298a6e	1	\N	Other
+7559c9ac-06dc-486d-8ff1-0ea151e5ff3d	1	James	Other
+755a949a-366b-4bba-93ed-4072478954be	1	\N	Other
+755c5d99-8aa5-4199-b77c-17e7856eba8a	1	\N	Other
+7560f0dd-9108-4066-a30e-1b76a27dccc0	1	\N	Other
+75610ef0-d0f1-4c4f-9180-9031cbaba13d	1	\N	Other
+75631892-fcd7-48f8-940a-7e8f97613dd0	1	\N	Other
+7566a9d7-0f55-4b6c-b000-0727a8f01fec	1	\N	Other
+7566bacc-98bb-423b-a637-23d85580865f	1	\N	Other
+75689846-9a76-4962-b972-f66825ef22be	1	\N	Other
+756c7313-8499-40fe-b04d-5edce761322c	1	James	Other
+756d6f5e-0ae5-4e60-82b7-778885aaf670	1	James	Other
+75700331-2837-4947-9212-30665964a708	1	\N	Other
+7571dc3b-2ef7-4df7-a2d6-fd4d793b78e1	1	\N	Other
+7573fac2-9af5-4391-8694-76f6fd277351	1	\N	Other
+75750b6c-95a0-4074-8349-cabb9e8c18d4	1	\N	Other
+75764134-b1ad-45ef-b489-6b948e6041a8	1	\N	Other
+75765c6d-b68d-4702-9bd5-ab30a2e021ef	1	\N	Other
+757960ba-172e-4038-a47a-36506d078eb8	1	James	Other
+7579c95a-f99a-496c-86f0-89e770980b3a	1	James	Other
+75805ef8-47af-4cfb-a4c2-6d5f48e2f130	1	\N	Other
+7586c0de-b73f-4bd9-a359-8e875486e8ff	1	\N	Other
+758a8ff3-bbc8-412e-b3d9-58357ccce3e4	1	\N	Other
+758db406-17aa-11e8-a4ca-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+758ffc0b-52e8-4583-b5d6-1eaccd6b968f	1	\N	Other
+75920242-272e-4e08-ace2-09c05239f7b4	1	\N	Other
+759861f6-8d48-4dc5-81f5-349ee2e9fa32	1	James	Other
+759f74c9-3026-4340-b87d-4e45160813f9	1	\N	Other
+75a75ac0-a923-4831-8761-fd85657fb5c3	1	\N	Other
+75a9a0ec-d9b6-4d60-be52-60ef9a5be3ab	1	\N	Other
+75a9a8cf-5562-4280-a700-201cd67e4603	1	James	Other
+75b109fb-8c1e-4e0a-8aa3-4f0dff32217e	1	James	Other
+75b13b19-5f93-4c57-8cc2-de17091d58ed	1	\N	Other
+75b2e553-2ab6-4548-8e15-42f572fce829	1	\N	Other
+75b5e3d2-2859-4264-a51c-d0c18176b248	1	\N	Other
+75b5e562-f5da-46ec-a19e-a5b55e80133a	1	James	Other
+75b7424f-a68e-45cb-b54c-8da87e0b8a90	1	\N	Other
+75b8feb9-75d4-4313-b4f3-8759a9d668c3	1	\N	Other
+75b9ab18-ebd8-49ea-a98b-0a27fcb2e2a1	1	James	Other
+75ba4dbc-c444-4c57-8e03-0597b35c73fc	1	\N	Other
+75babe8a-30be-41c9-b819-5a1ae70509b9	1	James	Other
+75bae2af-886e-464e-a43b-fe7e26577b5e	1	\N	Other
+75bd5db5-7731-4f80-a18e-7ee981455fda	1	James	Other
+75bef217-ef13-4ed7-b8d4-8e41c007849e	1	\N	Other
+75c10a32-8814-4ee5-aa8f-4c72f6635f84	1	\N	Other
+75c49ddf-53be-4c47-ae35-105d8ca18ace	1	\N	Other
+75caf6b4-5acf-437a-bca1-89877c264f2e	1	\N	Other
+75cc5dcb-093f-4593-8a7c-ac9b7ae1a069	1	\N	Other
+75cd50dc-a629-49a7-a3b9-97deab5b71e4	1	\N	Other
+75d006b0-7dea-45a0-b63b-01bc2577da60	1	\N	Other
+75d250c7-081d-4857-b94f-c71f223349cf	1	\N	Other
+75d27ad8-a711-430c-b656-222ee1ed9728	1	James	Other
+75d2e989-b35e-41ed-8e0e-33627034c16f	1	\N	Other
+75d605d3-454d-4ea0-83d9-482b0f8a4859	1	\N	Other
+75db5e48-97db-4d7b-805b-663f8ae872d2	1	James	Other
+75de20bb-e003-4fa2-9a62-c92df13633db	1	\N	Other
+75e4ec78-e660-47f1-85c9-4bed8de98ed1	1	James	Other
+75e6c36e-76f1-44e6-a07f-7ecc3f73c24a	1	James	Other
+75e785b9-3131-4c23-a216-8319a2275305	1	James	Other
+75e882e9-7d89-4783-87e4-87650f1fe3da	1	James	Other
+75ea2261-bf07-41a0-ae46-ebc0aebd61ca	1	James	Other
+75eb58a5-fd14-4fb6-a610-44769835d58b	1	\N	Other
+75ed7641-6a8b-4b1d-89d1-08a0fe5a945a	1	\N	Other
+75ee58a1-944f-4b41-8712-a4bf471d6f69	1	James	Other
+75f29430-b1f3-4ddb-b196-d3b7099ff513	1	James	Other
+75f3f0b0-d2e2-487f-969b-1c8ccf5f2bb0	1	\N	Other
+75f8de28-d775-4a60-858a-45c13bfd1ebf	1	\N	Other
+75f96aae-6952-43dc-b454-6a11c4a35cf2	1	\N	Other
+75fa9a4c-7bbb-4bc0-a4c7-0fa7287dfdb1	1	\N	Other
+75ffe86f-a0d1-448d-9f42-5c9142bbdbf5	1	James	Other
+7604d5c7-e20a-420e-a970-b94faf74ef1d	1	\N	Other
+7606409f-8d7c-4afc-9cc9-b889c8b7c147	1	\N	Other
+760759bd-a69b-498f-ba17-c0500e81de15	1	\N	Other
+7608f697-3456-4b00-b98f-0d4941aab4c3	1	\N	Other
+760d57ea-9d76-47d1-8e39-f79dabc17bb9	1	\N	Other
+760fa895-9c7d-451e-8a8e-5337ed3fb2d5	1	\N	Other
+761035fd-2193-46d8-958d-262f9d1e7760	1	James	Other
+7610445c-390d-417a-97b5-4d1c815033d7	1	James	Other
+76129d35-af89-4820-a371-43c2a17d34fa	1	James	Other
+7612db09-9548-4b07-8a65-e5bc5fc5cb9d	1	\N	Other
+761430e3-b94f-4ec0-b3de-7e7353f77774	1	James	Other
+76163805-36ce-4c27-a16e-424dd7fe0ad3	1	\N	Other
+7618bc6c-10ea-4e62-b209-0eaf5a35823d	1	\N	Other
+761a24a3-68fe-408d-aaf1-ee360aaa98c3	1	\N	Other
+761ee496-659f-4556-a8d1-042726e4f326	1	\N	Other
+7627d627-59d2-43b6-93e3-26ac39a92269	1	\N	Other
+762912b0-164a-4d06-a3e5-a0586d13c3f8	1	\N	Other
+762a994b-ae8f-44ed-aea7-5acb911e31a6	1	\N	Other
+762b2fc2-4f56-4cc9-af6a-a093a3735417	1	\N	Other
+762d851e-0508-4631-a498-975b254e8378	1	\N	Other
+762ffd8e-0081-4769-9243-a4c000474997	1	James	Other
+76319273-42e1-4814-ac71-6d5fcc8f77f9	1	James	Other
+763320c6-0ffb-46a1-b208-d28f8ca331a0	1	\N	Other
+76375543-f89f-49c1-ad83-549de601ba0f	1	\N	Other
+763dc6fc-5c6d-48b2-8e2b-032ddb81cff9	1	\N	Other
+763e0565-cfe3-4b6a-8b43-9f6df7150a51	1	\N	Other
+763e94d7-b320-4a32-82df-139916fa7639	1	\N	Other
+763f9404-dce8-4fac-9e6e-de2379436e14	1	\N	Other
+76410048-115f-11e8-9cc0-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7644bcbe-89ff-4983-abbd-6240fc1e2455	1	James	Other
+7644bf5f-3097-4cf9-be35-09f44d611a9a	1	\N	Other
+7647d9e1-4696-4be9-aa7d-b49c4b2df279	1	\N	Other
+7649b75c-10c3-4d0f-bbdc-e956e5270a41	1	\N	Other
+7649fbbb-1616-4fe3-9c6b-a5d37f64cc3c	1	\N	Other
+764c32aa-c6fb-4cda-8279-de2bbcb676a5	1	\N	Other
+765021dc-6853-454b-a73f-294fa62774ed	1	\N	Other
+765337af-fb6e-4674-99c5-2d139d45ee37	1	James	Other
+7653933b-4b89-4a6a-8f3e-7d3f76e82d1f	1	James	Other
+765580cf-7936-4352-a99f-c85782912345	1	James	Other
+765b395a-1782-46c4-a1a4-9842e45f1517	1	\N	Other
+765cd3e8-3e3a-413a-80d2-004a5b2710bf	1	\N	Other
+765e241f-6cb4-4f31-bf00-128cb1095139	1	\N	Other
+765e74a7-4038-4692-b21b-2e9e74949bd1	1	\N	Other
+7667a280-14fb-11e8-a15c-fa163e8624cc	1	\N	Other
+766f721a-c0bf-495b-ad14-c9e4cbd2fcd8	1	James	Other
+76713a62-3c4d-4777-8edc-9b5a9ecf914f	1	James	Other
+767444b5-9f1c-4c4d-8b42-4e0fed82c97f	1	James	Other
+76768ed1-ded4-4724-b7ad-58be8976d0f8	1	\N	Other
+7676a6f1-a5ab-4eb9-ac03-57f5ba953dd9	1	\N	Other
+767936b2-0ffb-11e8-9274-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+767ae6cf-03a7-4d26-9585-ba8612271f9a	1	\N	Other
+767eb9fe-fcfd-11e7-98ee-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+76802b7b-08f7-4e36-8dca-3090ea82811e	1	\N	Other
+7681130b-9190-4027-85e4-3cfb8a9745ad	1	James	Other
+7683fd0e-8576-422f-bbb5-b40da29f4ecb	1	\N	Other
+768ba4a0-864e-46dc-bf59-df2bb8eeceac	1	\N	Other
+768e193c-9348-49eb-97af-0cce7a38cb0e	1	\N	Other
+768e254e-aafd-45b1-8499-18751ac1c29c	1	\N	Other
+769310e1-e768-4f96-b3cf-6ae60ea6ee6b	1	\N	Other
+7693e7fa-675f-49da-8bd2-301beaa2ef18	1	\N	Other
+7694803b-5b4d-419f-8997-5008e029f8f2	1	\N	Other
+769650a9-201f-4b97-b9ca-be4aa8b02b16	1	\N	Other
+769798be-00c5-47d6-a8ae-b7a531612235	1	\N	Other
+769afa35-1e97-4280-981e-43a97b9f6262	1	James	Other
+769bf42c-264d-4f53-8793-e03628c2cd9a	1	James	Other
+76a3125e-0e49-4285-9b19-24cac1280007	1	\N	Other
+76a478e7-c356-41a3-a176-639a5b30c202	1	\N	Other
+76a55388-1519-457f-b3f5-46824d2cb1ea	1	James	Other
+76aa954d-87f2-4935-9683-2f4bb7bacb09	1	James	Other
+76ab519d-e2bf-47b3-ace1-a8a363ad5f30	1	\N	Other
+76ab55de-9f08-4f6b-a28b-447cebd9c43b	1	\N	Other
+76b00e98-d6fc-4947-8357-25a565e5246d	1	\N	Other
+76b05a64-1d9f-11e8-9286-fa163e8624cc	1	\N	Other
+76b15c07-4a04-4b5b-84ef-8fdf1ced981c	1	\N	Other
+76b54073-84d1-4404-96f9-5910b400d647	1	James	Other
+76b773cc-dce0-424b-bfa2-ddb58feef0ec	1	\N	Other
+76b94d26-5ba0-4f5d-b110-8a31aaa9acfb	1	\N	Other
+76ba166c-601b-4768-a7a6-1f6e745feafa	1	James	Other
+76ba8d00-291d-4902-a6e6-f2ab7eb32fa5	1	James	Other
+76bc42ff-a86c-4de2-9b27-68393ab9248e	1	\N	Other
+76bde61b-2517-41be-aaef-139b7f590929	1	\N	Other
+76bf9455-b47a-407c-9023-56a491eacee1	1	James	Other
+76c239a3-1d31-4f41-9189-ca7b028a47e9	1	\N	Other
+76c29c22-90ba-4bca-abe6-b1f680159aa8	1	\N	Other
+76c57ad3-cca7-44b5-abe8-4d274fe23376	1	\N	Other
+76c57fa6-ca31-450b-94b1-ef455bf07065	1	Other	Other
+76c58229-29be-4bf9-b14f-d4c3fc72cd56	1	Other	Other
+76c591dc-704c-4b3b-bfd4-8fdc53e6508c	1	Other	Other
+76c5e02f-b16e-4d70-96c7-11228505cfe7	1	Other	Other
+76c6ac93-c937-4bab-96c3-d3e362839b1b	1	Other	Other
+76c6dae9-e97f-4411-aa36-6a50e06e8d5e	1	\N	Other
+76c6ee42-785f-4b35-ba23-828bc605b269	1	Other	Other
+76c7434b-fcc8-44dc-ac65-c98b8691ebcf	1	Other	Other
+76c77237-7747-40e5-835d-74b4687cafbf	1	Other	Other
+76c79d3b-884d-44df-be4c-190fdebd6eb7	1	James	Other
+76c7ef18-8a61-4ba2-b409-0d04bd45582a	1	Other	Other
+76c802a5-1492-4fb4-8507-174d2b537060	1	Other	Other
+76c82d0a-d252-49c4-8edb-e339f7c20223	1	Other	Other
+76c865d5-3564-4faa-adb6-0e5f01793e54	1	Other	Other
+76c87a24-6a7e-405d-9051-a05e25bcc035	1	Other	Other
+76c89d6c-6d14-479e-b6b0-d6d542f026fb	1	Other	Other
+76c8af8e-df48-425a-9347-e719f388d4dc	1	Other	Other
+76c8e1c5-ac22-42a5-afd0-6a2e651b9fb5	1	Other	Other
+76ca386d-8304-43a0-bbb9-dec05e00faf6	1	Other	Other
+76ca7cdc-e6ba-4080-9899-a4f6534893ad	1	Other	Other
+76ca8952-7c7d-4c57-b6e2-7f15a42c5ac2	1	Other	Other
+76cab17d-04f2-482b-85d8-5c105a6e77d3	1	Other	Other
+76cac149-615a-491b-a979-ff6e4142494c	1	Other	Other
+76caffbc-70bb-4148-bc6b-4e10046e7c59	1	Other	Other
+76cb6127-7e1b-4a9a-a652-4b645907050a	1	Other	Other
+76cb7563-3cab-4660-8c47-807b417ec004	1	Other	Other
+76cbc7d5-1f0e-4f7c-9915-66a3aa006ff0	1	Other	Other
+76cbdd2a-30e8-4856-b113-98a7d5116e87	1	Other	Other
+76cc61c4-056f-4e5e-90a1-b66445290381	1	Other	Other
+76ccc721-2490-4381-a2ee-1001beb2e27e	1	Other	Other
+76ccd1b0-5c51-42b9-8017-db574004bd5a	1	Other	Other
+76ccf4db-8eba-40dd-8412-ba1feff24737	1	Other	Other
+76cd9439-341f-45ce-91b3-a6e2f6e920e6	1	Other	Other
+76cda0df-4db0-4e79-a81b-83fb91215a45	1	Other	Other
+76ce286e-1d36-4e0f-aeb6-09a567afc49f	1	Other	Other
+76ce4f7e-f6a6-419d-ad59-412b906f7c2c	1	Other	Other
+76ceb426-e09c-4eb7-b1fb-205dd608de39	1	Other	Other
+76cebfc9-d8a4-4222-aa9c-0571118978b5	1	Other	Other
+76cef5d9-9ccd-4136-9c64-3be1a41eea9b	1	Other	Other
+76cf85da-c9fe-4d61-b375-42403ddcf8a2	1	Other	Other
+76cfe5e8-6924-4f7d-98ce-5e80d0950fbe	1	Other	Other
+76cff591-1ba6-483d-82a9-d811473f9f99	1	Other	Other
+76d02076-d1c2-4102-abc5-12189491d6b3	1	Other	Other
+76d0649c-5705-4656-bcde-a6a0deebc9ed	1	Other	Other
+76d09ba9-51cd-4923-8c67-3be7f2e55f46	1	Other	Other
+76d1526d-6f9d-4900-8480-e48f77ecf942	1	Other	Other
+76d1658a-f161-42a7-adac-bbcfef901cc1	1	Other	Other
+76d186dc-ba39-4e78-837f-70735f1df0f0	1	Other	Other
+76d1c423-af67-4344-83e5-8977b167dc67	1	Other	Other
+76d1c93e-e741-4933-b0d8-6f28cf5ab09e	1	Other	Other
+76d231e9-9c58-4097-9d78-bff3c24532ff	1	Other	Other
+76d24897-bfe0-46da-bc79-e80b95c90e5a	1	Other	Other
+76d2696f-817c-4359-a3c5-e2ebbb27b57e	1	Other	Other
+76d2c504-36cd-45b3-8702-07b4f6840628	1	Other	Other
+76d30c2b-ea5f-4bc7-9d66-ef39acfe59dc	1	Other	Other
+76d33bff-f68a-4a8f-ad42-e88ace76c83c	1	Other	Other
+76d3d8d4-cba0-4909-9175-103ed82bf57e	1	Other	Other
+76d43a3d-5349-4a9c-bc20-bb9f34c1e349	1	Other	Other
+76d47ec1-b859-446f-bf42-43695351d2d9	1	\N	Other
+76d4f9fd-3ee7-4769-abf9-cd07cb61bf05	1	Other	Other
+76d517de-ef04-42ba-9aa8-3ac594644c4b	1	Other	Other
+76d5190c-5984-40a7-92d4-24a2582d9793	1	Other	Other
+76d552c3-4e68-4326-8007-16942d3d4f23	1	Other	Other
+76d59f5e-b86d-48dd-a6ee-84657cbd33bf	1	Other	Other
+76d5c8c9-2bd7-4ad7-b0cd-b81510deee95	1	Other	Other
+76d5cd40-bc1d-4d59-b0ea-b15d1984339c	1	Other	Other
+76d5d9e7-1737-4988-bae9-b1f95b0f4e9e	1	Other	Other
+76d5f5bf-6a7a-4659-a944-f69316ece1bc	1	Other	Other
+76d65de8-5369-4cea-b5b4-e1a36486878e	1	Other	Other
+76d6a05b-1e56-4dd2-a8da-646943303605	1	Other	Other
+76d6a4fe-ea0b-429d-974e-ccbceb31b22e	1	Other	Other
+76d6cc14-c02e-42f4-85d1-7e6f21e4d834	1	Other	Other
+76d71dee-b64d-4727-af9c-15b15037fcf7	1	Other	Other
+76d792f5-ff42-4fe1-92f2-2b2353985dcb	1	Other	Other
+76d7aafc-eadc-4bb7-a476-f09927823a02	1	Other	Other
+76d7b51d-eac7-4ff6-ba49-e5adaa5a9948	1	Other	Other
+76d7f966-8739-44f3-95b3-387d52e0d0fa	1	Other	Other
+76d82d07-0838-4bac-b0cc-02a15866e1e4	1	Other	Other
+76d82d3b-914d-4ce0-a244-8f63b2d672c0	1	Other	Other
+76d8368a-d39f-4e8c-8897-eb0370d59ea4	1	Other	Other
+76d841ea-1965-426f-8722-26634261820e	1	Other	Other
+76d85c14-f8d0-4346-ba0f-d7f91e3d6546	1	Other	Other
+76d886e6-0046-4c98-8d08-30955e4bba37	1	Other	Other
+76d8d0a1-7be0-469f-b889-2875735dd450	1	Other	Other
+76d8e5d0-1ddd-42c8-8f6e-a2ccfd49c595	1	Other	Other
+76d92a23-6d09-4da1-8098-a83e4c1c4361	1	Other	Other
+76d92d11-4ebe-4718-96a1-24025820a32b	1	Other	Other
+76d94e40-f911-4da6-a0d4-7b897720aa9f	1	Other	Other
+76d9563e-5b73-47fd-bda3-4c4e98f94d73	1	Other	Other
+76d9a7b4-f38e-438a-b103-6da8abe5c19c	1	Other	Other
+76d9cfb4-f665-4581-b8f8-853ab1950875	1	Other	Other
+76da4d6f-f8a5-4f48-9dc3-39ee4423e82f	1	Other	Other
+76dae8fe-7fc7-4838-9a38-3d684b7e340f	1	Other	Other
+76db0b7d-8bd8-4098-a830-b3862ed60b8e	1	Other	Other
+76db3614-146b-45a4-b11e-7235eccddcaf	1	Other	Other
+76db5e0e-1cd0-4749-ac67-ff359bef0b45	1	Other	Other
+76db7ba4-a0ba-4946-a2a5-353c4c9c4b73	1	Other	Other
+76dc71ba-bf8b-41e8-9e03-000f7f62a1df	1	Other	Other
+76dce3b9-fdf9-402c-a4d5-3f3aab242bb5	1	Other	Other
+76dcfca0-c3c0-4a83-9236-bfec32eb0a4e	1	Other	Other
+76dd09a6-362e-4aec-a5e0-d9bdb0bfba19	1	Other	Other
+76dd5779-4783-49b6-b35d-3b28d9cee5ee	1	Other	Other
+76dd6ffc-a636-45ee-b156-2c089d4a7686	1	Other	Other
+76dd7dbc-13b5-4494-aa9a-5273c5285afe	1	Other	Other
+76ddbae1-7f73-4de9-8f9b-37c76b8751d4	1	Other	Other
+76ddc014-a589-4afe-85f0-7d24843bbbd5	1	Other	Other
+76de075a-1fe6-445d-9bc9-5fc2890f9c1e	1	Other	Other
+76de0e64-8cf5-4b8e-b6f6-2785341e1d31	1	Other	Other
+76de404c-0a27-4459-a560-a9ff031a8a1a	1	Other	Other
+76de4c2e-9f5e-4767-8487-23cfa9600aee	1	Other	Other
+76de74d2-bf98-4d44-83ee-3b1a27188374	1	Other	Other
+76de876b-97f9-4deb-a9b7-61ab6c79958c	1	Other	Other
+76dea002-a6fb-44c4-bc19-8c6573a92943	1	Other	Other
+76deb083-8858-4867-ba0f-08fbd69dac5d	1	Other	Other
+76df0f81-29a7-4a65-bcba-2534e9f1a0a7	1	Other	Other
+76df45cf-24bd-47b8-a8c6-ac9facdede7e	1	Other	Other
+76dfc6bd-8f07-47a6-bb23-db3d68c534cf	1	Other	Other
+76dfc7ce-3177-45e7-b666-79c575a77c55	1	Other	Other
+76e010ee-c451-4c7c-9bc0-16cac1d0d63d	1	Other	Other
+76e02fdb-680d-4d54-b5c2-f5c364e543f5	1	Other	Other
+76e086cc-7469-462a-ac57-63d3af5f819e	1	Other	Other
+76e0943b-6915-444d-9751-18d0f6ebce10	1	Other	Other
+76e09e1b-f623-4628-87a2-df6f2aee59f2	1	Other	Other
+76e0acb1-9c85-40a4-9468-9dce825443a2	1	Other	Other
+76e0f88c-22f2-4e9a-bae2-1b897c7206b8	1	Other	Other
+76e115d1-9fc1-4acb-8c9a-7eec0266e2a9	1	Other	Other
+76e11cd2-b047-4a4b-9c12-ab9d9cabbebc	1	Other	Other
+76e15399-95d9-4f56-bf4f-e82942f592b4	1	Other	Other
+76e1777b-5900-4e14-87f4-445d30509b1c	1	Other	Other
+76e1c7c7-f489-44a9-8961-6068b4a6fafe	1	Other	Other
+76e1cdc5-18f5-49be-99e8-234c48405ca8	1	\N	Other
+76e239be-ab1d-44a0-8eab-00fe7b8c5038	1	Other	Other
+76e266e5-bf60-4040-a736-16d31829c61a	1	Other	Other
+76e2d5f7-c1b9-4866-833d-1f8d2bc62e7f	1	Other	Other
+76e2fcd2-3933-4c93-952d-dfee75dd3902	1	Other	Other
+76e2fdeb-8dc9-4230-9436-65c2dd36d45e	1	Other	Other
+76e31bef-274a-473a-aa41-fce922ce84ff	1	Other	Other
+76e32a84-6eae-45b9-b289-149b0f784c0e	1	Other	Other
+76e39dc5-f968-4195-af30-e2fa6fb4b049	1	Other	Other
+76e3ad54-6bb9-4102-8a18-19823a69cdc6	1	Other	Other
+76e3bc30-9537-46b2-a2a9-0dd1d43e723f	1	Other	Other
+76e4b55e-1120-405e-904a-ac9859486981	1	Other	Other
+76e4bd39-9fe7-44ee-8096-809c4c52680c	1	Other	Other
+76e4be4d-8413-4317-b09b-19a5d345f287	1	Other	Other
+76e4df88-3182-4804-9efe-b83a7146f3ae	1	Other	Other
+76e4f76b-3361-4bbb-849e-5eafeb092cab	1	Other	Other
+76e50d12-389c-4c56-8418-174a907f8088	1	Other	Other
+76e578dc-da02-4ad5-9278-4f96622b6c66	1	Other	Other
+76e597d8-d958-4498-b4af-0c04870f1a53	1	Other	Other
+76e5a6df-bdff-48af-872c-a337727d9126	1	Other	Other
+76e5b4f4-f771-4e59-aa21-7c9d82ca9731	1	Other	Other
+76e5b544-652e-43d0-8b20-c84c561ceac9	1	Other	Other
+76e5e87b-d4c3-4321-b4e2-43453352eba7	1	Other	Other
+76e655fe-f352-4b02-98a4-cb614834cbc3	1	Other	Other
+76e66fed-0eb5-44d8-a773-24431edd5208	1	Other	Other
+76e68325-637e-4b92-882d-28aa19bdf250	1	Other	Other
+76e68e9b-13ad-4253-88ea-f9c2890a05eb	1	Other	Other
+76e6c0ef-faf4-4d50-bd5e-17b68b3fbde7	1	Other	Other
+76e6c181-5d2f-4a91-9195-2ec928c328a3	1	Other	Other
+76e6e1d8-ccb3-4193-a1bc-88ec3bd69aa8	1	Other	Other
+76e716d2-12a9-472d-8081-e619db1e7edb	1	Other	Other
+76e72ccc-e13d-4132-8d80-64f8ae19b76f	1	Other	Other
+76e77e96-6932-4609-b88b-b7c79971d470	1	Other	Other
+76e79e25-1cef-4811-b884-f0933f96aabf	1	Other	Other
+76e80986-a1b5-4ae0-940a-ee808fe52106	1	Other	Other
+76e84405-5a7a-4358-be51-025699922f8c	1	Other	Other
+76e85355-93e1-4bf4-9937-5334b3711355	1	Other	Other
+76e86fe0-c36f-4620-8239-9335391436ab	1	James	Other
+76e87153-169a-4d70-a315-7c793d4a51b5	1	Other	Other
+76e891fd-ca03-45f8-95f1-2cbf98ef0bc5	1	Other	Other
+76e8a301-e37d-4190-9f70-d3681d64a0a0	1	Other	Other
+76e8b93c-a64d-486d-9f95-3056099ccf1a	1	Other	Other
+76e90a14-7162-40cd-9cf6-1c4407e9ec86	1	Other	Other
+76e927a7-731e-4078-8bca-1a185fb2298c	1	Other	Other
+76e93fe7-7828-42d4-9181-948558b434ae	1	Other	Other
+76e9b5b5-01d2-444e-be18-d51277735fe9	1	Other	Other
+76e9ee06-ed02-44ae-ab73-5284f9e6d880	1	Other	Other
+76ea0427-60e6-4ca5-a2db-5dedcb72ac94	1	Other	Other
+76ea2a80-027a-45ba-9bb4-5544755886cf	1	Other	Other
+76ea3362-1e71-44cc-b814-509188b3d2c3	1	Other	Other
+76ea649c-ef09-4204-b9f6-1391353654af	1	Other	Other
+76ea9d0c-4d74-4409-b428-b4fa92ce87f2	1	Other	Other
+76eaa31a-273d-4dfe-bc39-291a2c2ffa59	1	Other	Other
+76eabdcb-a5fd-4c19-b687-5612b3654e94	1	Other	Other
+76eb17e7-9b5c-4b1b-8a3a-318dbe6ea114	1	Other	Other
+76eb3b4e-9e69-4e3c-8883-52045af34d3f	1	Other	Other
+76eb9b5d-aa32-4182-a502-7dba46fe25f1	1	Other	Other
+76ebde44-c292-4e8c-b227-3ef4fc820ba9	1	Other	Other
+76ec4bbe-67ce-40c3-bf46-29dd73566e6d	1	Other	Other
+76ec5161-8fd0-4a8b-942c-9b59d7a3fff4	1	Other	Other
+76ed278f-97be-499e-ba23-a4f5f1687e74	1	\N	Other
+76ed322b-9a87-4b43-a80e-798f2350e07c	1	Other	Other
+76ed4924-0e78-4cad-bda3-caed42b79c82	1	Other	Other
+76ed5894-18ff-41fa-b661-878f0d633679	1	Other	Other
+76edcdc3-cb18-41a7-b9b5-044d8def6f60	1	Other	Other
+76ee454e-b298-4534-8ad7-04f00be4b3d6	1	Other	Other
+76ee711f-1b1e-4172-9bf8-b7e573be158d	1	Other	Other
+76ef280b-8037-40d8-8d38-ef9029b050cb	1	Other	Other
+76ef7219-b533-4ed7-a78a-953e5e1ec76e	1	Other	Other
+76ef8a9d-c50d-40af-b1a3-45e9a91adba3	1	Other	Other
+76efc0f8-3fa6-4551-81ab-ba711ca4fef1	1	Other	Other
+76effff0-11cd-4f34-be62-e077108e5c7d	1	Other	Other
+76f079df-0291-4b91-aea8-6175197e24c7	1	Other	Other
+76f09613-2d99-4df1-9129-5e6398f06a0a	1	Other	Other
+76f114c0-85ae-43a0-802a-8221e4512630	1	Other	Other
+76f14da8-353e-4662-b219-0b992f049579	1	Other	Other
+76f16916-d585-4686-8208-0907b178c654	1	\N	Other
+76f1b60f-bb01-4ca2-9d5a-9598db949aa1	1	Other	Other
+76f20701-f142-430f-a5cc-f01b1a6a1ee8	1	Other	Other
+76f2730e-d046-4b34-80ba-42d6f1fa1c9c	1	Other	Other
+76f27dfb-2de3-4f2f-97cd-98649ab6c7ac	1	Other	Other
+76f2b045-fee8-439b-ae22-6fc34bcd992d	1	Other	Other
+76f2c852-526f-4d76-a5c2-10b7dfcfb305	1	Other	Other
+76f2e79e-7783-4f11-bd1b-4199328e820b	1	Other	Other
+76f2ed35-6009-45bd-888a-bcd9954fbac4	1	Other	Other
+76f31337-f9a8-436f-8570-d2aae6b0cb1f	1	James	Other
+76f351de-a3ec-4d78-928e-708dac10a7b9	1	Other	Other
+76f36ac8-8c77-48b2-a88d-98f9facf1c05	1	Other	Other
+76f38884-6f9c-478b-bfd9-3dd0b3f41090	1	Other	Other
+76f3d902-11d8-495a-83a6-3b6c0ed14656	1	Other	Other
+76f420d1-03f4-4f7c-9563-361d13885d9c	1	Other	Other
+76f42845-e8e8-4a38-b28c-c92e247c2c4f	1	Other	Other
+76f43c1b-89ba-4fee-aa5f-cd3dea8acb06	1	Other	Other
+76f4f239-05f8-466f-b6f6-702a3143e72f	1	Other	Other
+76f4fddf-2e7e-487b-bdcb-74bcba68ddfb	1	Other	Other
+76f51721-9511-4eaf-89c4-f95bee6b2e22	1	Other	Other
+76f5329e-7566-4532-9eae-73c31511c86f	1	Other	Other
+76f5abcb-107b-4a6d-8d56-ae30124a7b67	1	Other	Other
+76f5b71f-3eb4-4b5b-9444-9a7bd4ae5ff7	1	Other	Other
+76f5df2e-c4d8-4ede-97c5-724396ddb3a3	1	Other	Other
+76f5f137-f9a4-4e14-baa4-78f4fff83070	1	Other	Other
+76f60c8d-eaac-409a-8d38-45509cdfa436	1	Other	Other
+76f60e9b-5f2b-455c-a0a7-7b9b521686ae	1	Other	Other
+76f6551d-59fc-4804-b973-5d8b2382f5ad	1	Other	Other
+76f6b5cf-a5b7-450d-bc1f-8e8708055e8b	1	Other	Other
+76f72488-36fc-4760-9da1-a595010d604c	1	\N	Other
+76f76e82-3b02-442a-aa0e-28a0903e86e2	1	Other	Other
+76f789bb-2d0c-48c3-90c6-ee6599979aa1	1	Other	Other
+76f7b776-8875-430a-84de-37dc8715cc1f	1	Other	Other
+76f7c262-0ebe-40bc-a9fd-ad5d40ee10c0	1	Other	Other
+76f82ce1-6e41-4558-bdf8-45eda2f7163f	1	Other	Other
+76f834e0-57ce-41a5-9e50-fceabbd38e23	1	Other	Other
+76f83e47-36e9-4461-8799-fb3113fd1e42	1	Other	Other
+76f85827-84dc-43d1-ad99-51bf6a200ec3	1	Other	Other
+76f8c5c5-383c-415d-87d6-183b249262e1	1	\N	Other
+76f8d6a7-81e6-4e08-aefb-24a58e2a5d0a	1	Other	Other
+76f935c4-9bbe-40da-a9df-746a739e6bf5	1	Other	Other
+76f94afd-210c-4b7b-bc6f-05e2aa2ec2b5	1	James	Other
+76f98bdf-60a4-467a-81c0-5058b89aab6e	1	Other	Other
+76f9f3a8-8fc6-46cb-bca9-de7db413d0ea	1	Other	Other
+76fa44aa-aaa4-4f14-b971-87b7924c0fd5	1	Other	Other
+76fabfbb-5224-4dfb-b3c4-2b5dc7cb9ad9	1	Other	Other
+76fb7418-59ee-4d85-9e0c-c2ef7a208399	1	Other	Other
+76fb8993-08d7-400e-b030-d02e12e1e313	1	Other	Other
+76fba029-221b-4cca-99ac-5450469236da	1	Other	Other
+76fbedf5-678d-497a-82e9-42d3fa790ed8	1	Other	Other
+76fc0477-3256-4a1f-b6b4-308e37c4cdfb	1	Other	Other
+76fc0538-fad3-4091-9900-74e693463ae2	1	James	Other
+76fc1111-996d-433d-9802-6d94e41d816c	1	Other	Other
+76fc37b2-35c3-4c78-b649-fb4825a36605	1	Other	Other
+76fc398a-be2e-4727-8939-86f078f3036b	1	Other	Other
+76fc882b-3374-4560-ad76-13ad84a39a77	1	Other	Other
+76fcc2fb-26e2-40bc-a8c4-63aed61aa657	1	Other	Other
+76fcc629-6013-418c-8058-a234f05394e4	1	Other	Other
+76fcde93-678e-4690-9273-c4a5c3e35604	1	Other	Other
+76fd3a67-f31e-4f52-a166-1d2935c7f939	1	Other	Other
+76fd3acb-caf6-4c52-bbf1-de7cc2eade87	1	Other	Other
+76fd6f08-feae-406f-9b67-1e91eb1ce3e8	1	Other	Other
+76fd8040-c1ce-4e1f-8dd5-559b836e81a3	1	Other	Other
+76fd9456-e09c-4169-9483-2cc42fb4079c	1	Other	Other
+76fd9740-6461-43e8-9825-4f694d899a47	1	Other	Other
+76fd999a-520a-4662-ba2c-e8aabd19fe11	1	Other	Other
+76fe07e1-9091-4d74-b3fe-ed06e3c07e9e	1	Other	Other
+76fe537c-f295-4042-94ca-c2c19dfa3e25	1	Other	Other
+76fe6e4b-4a95-43ba-a683-ec8de5c9a751	1	Other	Other
+76fe9292-c832-4a32-9cc0-546248be6804	1	Other	Other
+76fecafd-f7eb-464d-ad36-9f8d6ff05ff1	1	Other	Other
+76fecc67-b146-453a-8629-36b15b39ecce	1	Other	Other
+76feed85-b3fc-4b21-8584-13afae1f60c1	1	Other	Other
+76fef2b9-5646-49dd-91ba-d4ab301f4540	1	Other	Other
+76ff3823-9b21-48a9-9b8c-3bb4e4e13c94	1	\N	Other
+76ff5cb5-a72d-4751-83a7-3073c7bd725b	1	Other	Other
+76ff7109-94b7-468e-b5f1-723974b99bea	1	Other	Other
+76ff931a-d001-4b84-8356-e6241414711b	1	Other	Other
+7700afc7-8cdc-4cf7-ae5d-9354f2ecda33	1	Other	Other
+7701db33-3e89-428e-bf15-bc5847ee8e69	1	Other	Other
+7701e1be-68ef-4878-9dfe-b8d2e3f953bc	1	Other	Other
+7701e8ad-3bdf-4b7c-acc4-e07f32b8e150	1	Other	Other
+7701f0b2-5dde-4b9a-94eb-71251d8100bb	1	Other	Other
+7701f6b6-aa0b-4099-b654-5599cefa9676	1	Other	Other
+77021b72-a647-4a8f-b247-bf5a0bb0bfef	1	Other	Other
+770243eb-9fb5-4de3-ab85-575a5e38adcb	1	Other	Other
+7702a6a7-f673-4699-8c6f-ae2ea1a78afc	1	Other	Other
+7702b1a4-f633-48c4-83c6-0de838ef7ab8	1	Other	Other
+7702b5c3-fcf2-4c39-9e6e-3bf430e9be7b	1	Other	Other
+77030966-a6cf-4bc3-99b3-de2e67a22f9b	1	Other	Other
+77031042-70ab-40ac-b875-20dd6c57511b	1	Other	Other
+77031e7d-81aa-4ebc-b07d-8a217b63e1db	1	Other	Other
+77035258-af10-477d-968e-54c5402eeff6	1	\N	Other
+77036068-856e-41fc-8bf4-381bbb42c5d6	1	Other	Other
+770366d1-9c3a-433c-8f14-e1b8b29e3f70	1	Other	Other
+77038223-8552-4c4e-be76-dd0dee3c7bc6	1	Other	Other
+7703a416-e966-45a0-9938-969ec8a93ccc	1	Other	Other
+7703a516-4c27-425d-a393-5f4a5752a5a0	1	James	Other
+7703e6ce-473f-4553-8432-9a186f362fc0	1	Other	Other
+77045ced-cd2e-4d15-8cd2-4636722227db	1	Other	Other
+7704ac44-fedc-436f-a1f3-95dd74309ebe	1	Other	Other
+7704ce21-7201-4364-bf3a-f92123b0fee4	1	Other	Other
+77054d6e-8380-4e09-968b-6c3973dfd1bf	1	Other	Other
+7705a7d6-06ec-45c6-94dd-fe0b2c2f3c81	1	Other	Other
+7705c8cd-cab2-4b4f-bcb1-b92c6ae02052	1	James	Other
+7705d133-a7e5-40a1-9313-552fad7f77c8	1	Other	Other
+7706bb8f-c241-4795-9d75-92c5566d188b	1	Other	Other
+7706c278-1ae4-480c-860f-291a6ed1a4f9	1	Other	Other
+7706d4af-0746-4f05-a317-0fcb40cb6deb	1	Other	Other
+7706f3bc-c9f7-4b60-a09e-5003ddced49f	1	Other	Other
+77072c77-69a8-45c5-aea3-0472c12717c9	1	Other	Other
+770753ad-2d61-42c7-baef-4addd572e65c	1	Other	Other
+77078e46-bf27-4e06-ae8e-a5f39326497e	1	James	Other
+77079b39-f7cc-48a6-9cca-40ec7de8a3ec	1	Other	Other
+7707ce15-5f7b-4eb9-a081-99c04bf3dde6	1	Other	Other
+7708a1e6-0cdd-475c-b458-eb32c67eef9e	1	Other	Other
+7708aa40-b2ed-45a1-b95d-9d6e25a8510d	1	Other	Other
+7708aa49-5cad-42c0-9f20-d892185042da	1	Other	Other
+7708f889-cb24-4a3d-b14e-0d86bde5ced3	1	\N	Other
+7709557a-7f7b-4dda-88f9-c3ddc3d21d00	1	Other	Other
+77095d8d-89e3-46a3-9c63-f9fa3208f0fb	1	Other	Other
+770995ce-7616-4af3-80cb-8201851b3f7c	1	Other	Other
+7709b6b1-b919-4e58-b923-2c77d6ccd35c	1	\N	Other
+7709b98a-f751-4316-8e97-660d99976a61	1	James	Other
+7709d976-b7a7-4cbd-8431-59cddea2bf0c	1	Other	Other
+770a6a20-0e48-4232-9215-836dbf53ec48	1	Other	Other
+770a7735-2af8-4da9-a732-0e04a06228cb	1	Other	Other
+770aa79e-b931-44dc-a581-f753ac7ac991	1	Other	Other
+770ade2c-704b-4c14-9dc6-1525576f8689	1	Other	Other
+770b03f9-5458-4fad-b94f-34413898efa9	1	Other	Other
+770b28b0-1621-4a86-981e-97ca2765afcd	1	Other	Other
+770ba075-275b-40bf-8771-0d71ac9f6bae	1	Other	Other
+770bbdc5-3e92-4f5e-a10d-d7496a1591cd	1	Other	Other
+770c386a-2e5f-4822-b38d-43841a4aac05	1	Other	Other
+770cb926-9901-469b-8dca-3e27a7f8987a	1	Other	Other
+770d926f-41a1-4845-be35-2742acd34a78	1	Other	Other
+770dfdad-3c29-4959-a961-c0b839ed9313	1	Other	Other
+770e617d-e07f-4ff5-886c-f67913e690b6	1	Other	Other
+770e70fb-bc8c-484d-a553-d4e5e8322895	1	Other	Other
+770ea565-97ec-4cc8-9966-4bc68c1cc51e	1	Other	Other
+770f6947-dfe4-460b-ba8c-14ff71b92b49	1	Other	Other
+770fa718-701c-4de3-90bb-70b344de328a	1	Other	Other
+770fe8b1-22c7-4851-8141-d711aa80cb34	1	Other	Other
+770fec91-8df4-462b-8df5-464f4a49e427	1	Other	Other
+77100d89-1d45-4bd7-9770-0d7d189d3903	1	Other	Other
+77101621-49ff-45be-a6b9-fb281e4f402a	1	Other	Other
+77103e0f-2e12-49cf-9b17-a471ed1bea84	1	Other	Other
+771063f3-7623-4228-8f36-f0c99168b52b	1	Other	Other
+771086c4-4d31-45e8-87f6-ef26aa24b304	1	Other	Other
+77109f99-6ae2-43d4-9302-dcb4791660d8	1	Other	Other
+7710a6db-b01d-45ed-aca2-47588765dedb	1	Other	Other
+7711006f-49b4-41a4-8d83-0556346c7988	1	Other	Other
+77112b59-83f1-4200-91c4-aef541be05b5	1	Other	Other
+77112f61-3c63-41ac-9d60-7ce062df67c4	1	Other	Other
+77113240-a416-4151-bbd6-385c2df0e2c5	1	Other	Other
+771138a0-2974-479b-bbee-fd10869e295d	1	Other	Other
+77114da0-3b13-4e8c-bcaa-5064ade54642	1	Other	Other
+77115abc-34c5-4044-aecc-8b43809f5a7e	1	Other	Other
+77120354-1b1d-4ac9-93de-c920a0a0821e	1	Other	Other
+77121818-814a-40fe-acb1-7c03965d06bd	1	Other	Other
+77128d5a-5cd7-43cd-89ff-fe6b06af1026	1	Other	Other
+771296a9-e17a-4abb-982b-6970023c94b6	1	Other	Other
+7712b6e0-aeaf-47fe-b07e-c49ea4741fe6	1	Other	Other
+7712ef06-f051-4288-8da7-a14b033d2ac8	1	Other	Other
+7713482b-d90f-41c0-838d-d018c98cc7e2	1	Other	Other
+7713531a-7e2f-44d8-b9b1-58c4ef96e86b	1	Other	Other
+77135a11-0bfc-46ce-be3f-4238905c5179	1	Other	Other
+77139270-138c-4afb-bc41-1072adeefcfb	1	Other	Other
+7713d056-b72c-4e18-b16c-ce0467b0fd4f	1	\N	Other
+7713e005-8567-4936-a882-01ec6ca0152a	1	Other	Other
+7713eb60-3324-4d21-b36e-b841e91ccc66	1	Other	Other
+771447eb-9422-427b-bb2f-9b7a86de8d87	1	Other	Other
+77145b49-c707-4ecb-be60-fde45f1133a3	1	Other	Other
+7714be51-bae3-4379-b1ac-6650df880cd7	1	Other	Other
+7714e365-52f2-4939-8158-1806148521f7	1	Other	Other
+7715190a-dce6-4cc2-bcbb-8f19c21b225d	1	Other	Other
+77156c84-4c69-485c-8f1d-b299d63f84cd	1	Other	Other
+771573e4-d513-40cd-9fa0-9756f990e818	1	Other	Other
+77160fc5-d5ba-4195-b9ae-8c157609ffe5	1	Other	Other
+7716902b-8b74-4c75-ba1b-8385c213ea27	1	\N	Other
+771693a5-34bb-40af-9bea-275858db4a3f	1	Other	Other
+7716b391-9c18-4d3e-8b53-dc211fe9a659	1	Other	Other
+7716c44d-7dbb-4eb2-9d69-11f950f42268	1	Other	Other
+7716cedd-164e-47ae-8fec-da4e4630e9b4	1	Other	Other
+7716d694-a0be-4322-bde5-0cba2a6932b3	1	Other	Other
+7716ed26-b9ea-412f-a9c3-4c7228687d73	1	Other	Other
+77170379-6a5e-48a4-b4ca-4b16252cfa0d	1	Other	Other
+77171597-72b4-46d2-b9f1-afe6de3799b6	1	Other	Other
+771757a1-de1a-4a06-bd5b-670aa41241b3	1	Other	Other
+7717db6e-d865-4674-bdcf-396f4fff037a	1	Other	Other
+7717df92-ea1b-41dc-b38a-879ef7bc5c86	1	\N	Other
+7717eae2-6fd1-4f9e-95d7-e1196aff6ef3	1	Other	Other
+77185200-f5d3-4ace-8b34-f2d6eac737fa	1	\N	Other
+77185820-2c05-4f28-b17a-01dc59811f54	1	Other	Other
+7718e489-9809-4b57-a0f2-118643c18032	1	Other	Other
+7718edb4-445d-45b5-aae5-80cdc31062cd	1	Other	Other
+77190cad-b7fa-42e0-8adc-332c0d01ceae	1	Other	Other
+771967fa-654e-4c78-b2d2-238fd7299661	1	Other	Other
+7719830c-f892-4e6a-889c-565319245651	1	Other	Other
+77198f78-8819-44cf-89d9-a9c15ed70924	1	Other	Other
+7719dae1-9f58-46cc-a67b-629586719a1c	1	Other	Other
+7719ee74-649f-4167-8dac-655e80cb55ef	1	Other	Other
+771a0e91-5aa0-489d-a0fa-3d1ec72d603d	1	Other	Other
+771a469f-81c7-4ab0-bedb-51b69d69b132	1	Other	Other
+771a60f6-0016-4a45-a68d-a6e05bfd9963	1	Other	Other
+771a7651-a632-4250-a501-680847a0e7e2	1	Other	Other
+771aa014-78bc-4c6f-b2b7-f621bedafa34	1	Other	Other
+771b17cc-1bb0-45ae-90b9-b285c971c50a	1	Other	Other
+771b3429-05f2-4f39-b0cd-e7203631506e	1	Other	Other
+771b38ee-9a6b-422a-8f65-a3f3f8107562	1	Other	Other
+771b40c0-5c04-416d-bf34-5ad9808d0f07	1	Other	Other
+771be8b5-adc2-4c6d-99e1-3b6876c829f2	1	Other	Other
+771c26c7-5a57-4b4a-b953-19137fc057f2	1	Other	Other
+771c294a-ef32-4398-8d04-52c8647dea32	1	Other	Other
+771c345e-ce87-482b-9803-305465f9e859	1	Other	Other
+771c35e5-d25e-407f-8888-014c5bd5d040	1	\N	Other
+771c4297-5440-4a47-8476-0e64a261f408	1	Other	Other
+771c79ce-5774-11e8-a02b-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+771ca2cd-7285-40e1-b010-6cf784a4b11a	1	Other	Other
+771d10dc-8d0e-4e9a-972d-6ef2646ea227	1	Other	Other
+771d50b8-d953-4779-af97-0fb03a7d9ea6	1	Other	Other
+771d70b6-1b6b-4143-88ee-47df06089ec2	1	Other	Other
+771d9bae-1d65-420b-93b3-e5a04b24b154	1	Other	Other
+771dd0eb-4051-4a28-bbfc-fee97f94835b	1	Other	Other
+771e00fe-bbf0-4c87-8a30-3b04b94396bc	1	Other	Other
+771ea8e5-596b-4a87-b502-de4180ff6762	1	Other	Other
+771ec802-b35d-469b-a540-548ab11a0885	1	Other	Other
+771f11bf-5ce2-4e71-8e88-40dbdcdae032	1	Other	Other
+771f251d-ccce-44ed-beb7-3ceaae35c42a	1	Other	Other
+771f3625-2a1a-42cd-bfa7-2b299a0ce0cd	1	\N	Other
+771f4ae9-214f-4c3d-84a5-b26b109c0dae	1	Other	Other
+771fc41b-6df7-49f4-9f0d-ee8036b46bde	1	Other	Other
+771fe007-0862-4264-bf15-b6125ace7c17	1	Other	Other
+7720005a-2604-4b9d-9b9c-b32c886a70ef	1	Other	Other
+77200885-2848-40e0-9a13-2ce3ee16ddab	1	Other	Other
+77201be8-2a2c-49ab-9bae-7c4d079fd6cf	1	Other	Other
+772060af-69a0-4a08-a0f9-0d6bc050154c	1	Other	Other
+7720b6fa-2dfe-4d11-b34c-9dfe02642ea7	1	Other	Other
+7720dc81-2b63-46da-b0e6-711f08847919	1	Other	Other
+77213731-3eb2-42f6-9fff-727e87f8a93f	1	Other	Other
+7721493e-2529-44a8-9df5-97e8d59433fe	1	Other	Other
+772151cd-a4c0-4d23-b3a2-d5ffe8465aef	1	James	Other
+7721524e-b4c3-4959-8d22-9b9598327015	1	Other	Other
+77217931-432b-4b25-84a1-3c7f65209bee	1	Other	Other
+7721c0f9-f12d-44c3-a65b-806de5a25929	1	Other	Other
+772229f1-7803-4c5a-bda0-14dc79d4960e	1	Other	Other
+77226a2f-4a2d-4015-b1b8-2aaac7fb904e	1	Other	Other
+77228de4-fd72-49df-a0ff-6b94bd4e87d9	1	Other	Other
+77229348-f308-4c34-be86-e58deb77695d	1	Other	Other
+77229da6-dd2b-4771-8a45-ba76d4757dd1	1	Other	Other
+7722ca25-a577-4835-aad7-56c7601b3872	1	Other	Other
+77233a57-8a9c-46fe-abe9-41d82d86d5b3	1	Other	Other
+77233aab-c92a-4824-a014-0ed9c6aea2e3	1	Other	Other
+772364df-8755-4d69-83e1-d5ef547eb206	1	Other	Other
+7723a96d-2337-460b-b66a-bc50f66cfbe1	1	Other	Other
+7723b279-6dd4-4186-a4d3-5a4cb6733971	1	Other	Other
+7723bf84-ea27-4fe4-840d-0a70b54c209b	1	Other	Other
+7723c594-4a49-4e8b-a459-3b2d0a1a5f4d	1	Other	Other
+7723e6cf-93c2-4681-8b94-bb6c34e83fcc	1	Other	Other
+77240683-040c-4f8f-9102-ff9161d88d21	1	Other	Other
+77243d4e-fb25-4013-9feb-9bca4fb9097f	1	Other	Other
+7724534d-be9f-485a-9be3-60743f03f1f1	1	Other	Other
+77246ee5-bf2b-4019-a79e-721202f96da6	1	Other	Other
+772475fc-1fd4-4586-98d6-2b34220f0050	1	Other	Other
+7724e7a0-64d6-4581-bbab-25b8a041fe5e	1	Other	Other
+7725656c-b05c-4462-9136-3e7d6e02ab99	1	Other	Other
+77257665-7ead-4df1-93b3-7d1009279afe	1	Other	Other
+77257f75-650e-40db-ae1d-f3d7ae4edd9d	1	Other	Other
+77258935-dcf8-4553-aa49-9841534b2181	1	Other	Other
+7725bf89-825b-43fe-8fc3-dc3093bd31b1	1	Other	Other
+7725e03b-84a8-4c51-b630-3d30ffbad0e4	1	Other	Other
+7725f7e3-76d2-4c23-af16-e6c8c0302750	1	James	Other
+77264834-c38b-4f37-84f5-57a23f428189	1	Other	Other
+77264cc9-390a-4c27-8f8e-f0be5b6bb9fa	1	Other	Other
+77270242-79e1-4952-922b-facee029c9f6	1	Other	Other
+77270770-d200-4548-847a-58bedac61c36	1	Other	Other
+77270f10-6328-4149-bb7e-9b97979984ec	1	Other	Other
+77275415-816d-439d-aa89-ff3811db0eee	1	Other	Other
+772760ee-af84-452d-8a6a-8caade75b20d	1	Other	Other
+7727d1b1-8827-4b02-bc0b-1f7de22c798d	1	Other	Other
+7727dc0a-1fa3-492a-a16b-8c34473e36a6	1	Other	Other
+7727e2a9-bbf1-4f2d-8d57-085293e723d3	1	Other	Other
+7727f8cf-1369-49b0-9417-27295cd579ea	1	James	Other
+772835ca-d42c-41fd-8479-18c80c868bea	1	Other	Other
+77283d5a-4cb6-4bf2-9096-aade5c4b0b87	1	Other	Other
+772876a3-40b9-4206-9a0e-b9ad812fe700	1	Other	Other
+77289487-ac1b-4e66-a46b-f38d7e47c6e3	1	Other	Other
+7728a37b-92c9-4a23-9aeb-b11cff923b36	1	Other	Other
+7728bb88-cdf3-439a-95c9-6c6f67c06966	1	Other	Other
+772932cd-326e-448d-bcf8-9f936dd293ed	1	Other	Other
+772937cf-6410-4908-8f97-2ee2509b0d44	1	Other	Other
+7729619e-5f2c-4646-ac54-a0d1e4727644	1	Other	Other
+772961cc-6a68-4482-afd4-ae20a607d67e	1	Other	Other
+7729ffc1-444d-4f1e-bb6a-8840499199f7	1	Other	Other
+772a0001-c2d6-4b04-82fe-cd5c4930e469	1	Other	Other
+772a1cc9-b16a-4847-9538-2165d26a6c5a	1	\N	Other
+772a5240-335e-4297-a8fd-f6dc3f8c4c13	1	Other	Other
+772a7885-5f12-4d60-aa9d-4f1578cccce9	1	Other	Other
+772a9bc7-284e-49b7-982b-e45b6a13e443	1	Other	Other
+772ad8d5-efd0-4257-b043-886c36ebd7ff	1	Other	Other
+772b368d-4dfe-4534-ae12-d0dfb605989c	1	Other	Other
+772b5ac9-4ebc-4a63-ac44-f36ab866a8c9	1	Other	Other
+772b71d0-9ad6-4df7-af0e-d864afca7439	1	Other	Other
+772ba21d-06df-4421-903b-766ebfcb937b	1	Other	Other
+772bed9e-5b82-40a9-b321-6258d0fa956a	1	Other	Other
+772c04d3-88cb-40f0-8bda-324baa298957	1	Other	Other
+772c4e94-e07f-4648-a2c7-d098f4593712	1	Other	Other
+772c5054-2f85-40f0-96af-1c4cef27112c	1	Other	Other
+772c96db-cf91-4fbb-96a4-29a86419cfaf	1	Other	Other
+772ce5d6-8d09-40a4-a7e8-11a8e650f374	1	Other	Other
+772d1165-9e4e-48b0-aedb-f23161815953	1	Other	Other
+772d3bca-434c-4776-8eb4-6b999c3ec4b4	1	Other	Other
+772d5ba1-5a15-456f-b0f3-2296cdc906ca	1	Other	Other
+772d7d7d-5617-498e-bb69-97a35c631a94	1	Other	Other
+772d878c-0d25-409c-82dc-4eb82be70cd9	1	Other	Other
+772d8d53-6c9d-495f-bfed-df68b6799c20	1	Other	Other
+772d9de1-f9f4-475f-8924-0b1b0c76a366	1	Other	Other
+772dfedd-7989-4ea5-98fd-b565e11710b1	1	Other	Other
+772e2575-48af-4670-9a0b-66cbef177f2b	1	Other	Other
+772e40d2-4f70-4016-984d-d36f33304659	1	Other	Other
+772e58cc-90f6-432f-9d19-81cf93097de3	1	Other	Other
+772ec847-5f94-453e-afe2-2dd8c599f04e	1	Other	Other
+772ec91c-84c4-4ece-9dfe-c151d4908dfe	1	Other	Other
+772ed593-9c7b-4c20-b839-4c6171c5f94b	1	Other	Other
+772ef209-7f9a-4c90-a026-24d4cd4d48d6	1	Other	Other
+772efe02-81aa-4b8b-84b6-9625de04b0aa	1	Other	Other
+772efe12-3351-4ea4-aeb2-0fd2f4b1ff4e	1	Other	Other
+7730330d-7873-4c5e-ab08-ecb138916fc3	1	Other	Other
+7730345d-38cb-4153-b603-c4d76a1f2608	1	Other	Other
+77303e1a-ca4c-459b-8ec4-510b0262b96c	1	Other	Other
+7730460f-a124-4891-99a5-7da6cc7b16d1	1	Other	Other
+77306083-1612-4172-b507-d9cfdb3bfa04	1	Other	Other
+7730751a-b792-44ec-b68f-aa3142c8e48b	1	Other	Other
+77307f5c-964c-4b1b-816a-0e4756f7c919	1	Other	Other
+77308be0-70bf-4b36-8b05-f3fe6d26b65f	1	Other	Other
+7730d52d-2b28-4848-9042-6a0ec8c7c154	1	Other	Other
+7730e5c3-0fda-4edf-b8d9-452436d7ac1a	1	Other	Other
+7730eb82-1be7-4046-916d-4034c0c81a40	1	James	Other
+7730efe4-38b8-4fed-98fd-9849e331e24e	1	Other	Other
+7730fea2-3234-4caa-8b1a-8b67a48d267d	1	Other	Other
+77311452-2393-4d0b-a290-fb68df24e186	1	Other	Other
+77317a82-70c0-4ba5-bcaa-b2bc75e284f8	1	Other	Other
+7731b2cd-ae2b-4c31-801d-b124cd7e56c8	1	Other	Other
+7731e695-a56c-42e5-8a14-2293e8a7893c	1	Other	Other
+77321436-b179-40fb-a11b-7c3c29a371dd	1	\N	Other
+77321791-5a81-4cd3-80df-7cad9d6c5ee4	1	Other	Other
+773250bd-900a-4157-bea7-83e03f6a2057	1	Other	Other
+77328600-e0f3-409b-9fca-6b9d9bd65b8d	1	James	Other
+7732882e-f224-4e47-b376-ba0a6e15a7b8	1	Other	Other
+7732a041-4908-4295-8df2-50f84df76df4	1	Other	Other
+7732ee74-0b79-4d73-b2ba-351c6635884e	1	Other	Other
+77332e8b-e718-4d8e-9562-e387008f1493	1	Other	Other
+77339140-ca54-4d88-83aa-68bcee598801	1	Other	Other
+773394de-40bb-47d5-b424-a3d28803b1c3	1	Other	Other
+7733a56c-79a6-447e-8ff3-161d98b23ebd	1	Other	Other
+7733b967-525f-4258-b8bc-8f60a28b9365	1	Other	Other
+7733e33d-4107-45be-acc6-cd9c68cedc04	1	Other	Other
+7733fe56-048b-4d97-8b10-0d8f4c51794d	1	Other	Other
+773439d9-a32b-4f2f-90f9-b0ddbbe1c343	1	Other	Other
+77346e28-6c8a-42f5-b11b-f39ca6326276	1	Other	Other
+773477a0-6522-4c50-92b7-ec60bc337ebc	1	\N	Other
+773477ff-e525-477d-9d05-b3323cdee0a3	1	Other	Other
+7734a096-92dd-11e7-a724-fa163e8624cc	1	Other	Other
+7734c283-6f0d-4269-8e10-4539b611b76a	1	Other	Other
+7734c69d-ded4-4dca-ad06-5f7a48b7a2cd	1	Other	Other
+773544af-8455-4ab2-aca2-4756add09b68	1	Other	Other
+77358635-480f-4121-8bf1-ec536a9d0af8	1	Other	Other
+773593f9-4aa6-4f96-a882-f8e7f2c041d0	1	Other	Other
+7735947a-9d80-42ec-bb25-a16442654fc9	1	Other	Other
+7735c764-5179-488b-b37e-9a1a49cdc54b	1	Other	Other
+7735f5a1-1d4e-44c0-ad58-be154bc86c23	1	Other	Other
+7735fa86-c1c9-48ef-8a35-f84eb3022520	1	James	Other
+7735fe23-82a4-4686-852c-bc71e0068482	1	Other	Other
+773675f8-0056-4d5b-8d5b-33da0a2422e7	1	Other	Other
+7736807e-9f95-4fc2-a825-e83f702a3009	1	Other	Other
+7736c006-b2fb-466d-b5e7-a9d376ccf6b0	1	Other	Other
+77373d6b-c9b1-4951-8677-7a91bc37b4c1	1	Other	Other
+773755ec-11e3-445b-9a47-8f786ef9e341	1	Other	Other
+7737b317-3c01-491a-9a4c-29871267c05f	1	Other	Other
+7737dc90-953d-4844-8578-327f746e0d32	1	Other	Other
+7737dd06-65bf-4b33-a4a0-7ca4322e617f	1	Other	Other
+7737e9b6-9c73-42fc-a9c6-ee641209e6d8	1	Other	Other
+773826c3-a051-4606-95e6-718460367ccb	1	Other	Other
+773950d4-71e0-4a08-9e3e-aecea1fc76e5	1	Other	Other
+77395167-30dd-4243-ae98-dc09060d18ac	1	Other	Other
+77396696-436c-4507-893d-7cbdb8a267ca	1	James	Other
+77397616-9ce7-4e50-a3e4-ece5e620ca02	1	Other	Other
+7739af9a-fde6-4429-9646-90ff9874e424	1	Other	Other
+773a5f7f-1069-42a2-b147-e0aa58aea8f4	1	Other	Other
+773b155c-4aa0-40da-a029-be67229ad7ee	1	James	Other
+773b422f-16fd-4660-a0d4-df575eb7ec71	1	\N	Other
+773b43e0-65e7-49e5-a32d-648545f8a984	1	Other	Other
+773baf3d-a1a8-4b8f-9c9e-fb90f98e34d2	1	Other	Other
+773bccbe-3203-46dd-b3d8-ffa338279242	1	Other	Other
+773bcd62-a303-4f30-b921-17c5ffc22283	1	Other	Other
+773bee84-c584-44fa-8c7b-f9f7be5d0cc2	1	Other	Other
+773bf640-ecd9-4a1e-b58f-81e6fcebf003	1	Other	Other
+773c40df-261f-4bdf-a15b-467ec08f953b	1	Other	Other
+773c6378-45af-464c-8d2a-4ba0c0110b1a	1	\N	Other
+773cbcc9-5bd3-4536-9c76-9c5c64352d5c	1	Other	Other
+773cd3be-9889-4e5a-88d9-275b6e0a4a00	1	Other	Other
+773d0655-47dd-4579-86e4-ff211d121c5a	1	Other	Other
+773d5109-1768-460a-b7bc-cffb9ae93b12	1	Other	Other
+773d9133-4ade-4952-8a27-8a6a0490f863	1	Other	Other
+773dc237-febc-4ca7-ad5e-d4a3a9c529f4	1	Other	Other
+773df059-5e8f-4aef-ae10-38b7f44c8f27	1	Other	Other
+773e0666-5227-41bc-a090-2d0ad0dba2e5	1	Other	Other
+773e2c39-6b98-43ad-b02d-09283cfad3eb	1	Other	Other
+773e3064-2a93-46f1-9694-4bbf6948f47b	1	Other	Other
+773e4bb4-d462-4d21-9967-4f1a70426cfc	1	Other	Other
+773e529e-48a8-4e88-8668-13f3b159434a	1	Other	Other
+773e725b-83bd-4682-8b74-388fe9fca177	1	Other	Other
+773eb915-00c6-4e06-829d-48164db48cd3	1	Other	Other
+773edecd-5ed2-4649-bc49-dc9b42482551	1	Other	Other
+773f6d9f-be4e-470b-8ecf-e8c4c2aa5157	1	Other	Other
+773f8ae2-88e1-4c36-96f7-84fad1ef369f	1	Other	Other
+773f9dd3-d651-4497-bf5a-ba77cde10292	1	Other	Other
+773fb823-12f0-441f-9c8e-56de79e5fd50	1	Other	Other
+773fe7d7-a573-4474-86ce-3db1f145fdf3	1	Other	Other
+77400fb6-de49-4af9-bc86-0b4c68e44efc	1	Other	Other
+77402097-8a42-407b-97f9-8a94d5864daa	1	Other	Other
+77402945-791b-4a80-98ff-e18c280fcc86	1	Other	Other
+77405729-5a80-4316-9056-75068e93a290	1	Other	Other
+774078db-4764-4800-9165-15c06037b689	1	Other	Other
+77408318-5bc0-4f08-af5d-d803e9eebfc9	1	Other	Other
+77410384-07f5-4dcb-8a20-7d3ba1174c7f	1	Other	Other
+774109a0-10a0-442c-b9a5-8a1b01dc8f58	1	Other	Other
+77415126-1c39-45b6-b1e9-3bbe886fcc5e	1	Other	Other
+7741716d-980b-4243-9e84-b1860064415d	1	Other	Other
+7741c5e0-7891-4a3a-a839-684083b06a2d	1	\N	Other
+7741c65a-ae20-4c9c-83da-7edc9efe94ce	1	Other	Other
+77421acd-44b7-4028-a7b9-e43685246e63	1	Other	Other
+7742311f-b70b-4d93-998f-5059e1f6203d	1	Other	Other
+77423cac-735d-40d4-a415-b803883f8c92	1	Other	Other
+77426284-e66d-4862-9f82-8e93da067332	1	Other	Other
+774284d8-ff3b-4096-86dc-f90f55894094	1	James	Other
+77429437-4f86-4fac-b750-96824dc2eb70	1	Other	Other
+7742f023-6f20-4c78-b715-a2e718ce60f2	1	Other	Other
+7743519a-b486-4c4a-8feb-7fa8c528dc4d	1	\N	Other
+774449f6-967f-471c-aba5-9dd867182b05	1	Other	Other
+77447adb-8c52-405b-9509-ab705cda92f7	1	Other	Other
+774483b7-ee3d-4ac2-9c80-d7e6626d657b	1	Other	Other
+7744b26f-5cfd-4820-b2ff-2d7fcc63986a	1	Other	Other
+7744fdb8-a3fa-4c86-acb7-f0c81d5752c9	1	Other	Other
+77451ace-132d-409a-970f-2a8b2e315d1d	1	Other	Other
+774544ed-173b-4557-87e2-bf5878f9d574	1	Other	Other
+77456ec1-9a07-48dd-98f5-2bd92e86fb41	1	Other	Other
+7745d3b3-e29f-401a-ad65-05fde40ec238	1	Other	Other
+77466f21-8da8-4754-bef3-da1a0b563e25	1	Other	Other
+77467854-ee3c-4b08-829b-6f6cfb692b00	1	Other	Other
+77469e9a-c68d-43a0-a312-29887e7498ca	1	Other	Other
+7746ea2a-4a17-45ec-96c6-370350c6d28e	1	Other	Other
+7746f32c-bf95-42f8-9617-76b7079ff536	1	Other	Other
+77472478-9e02-4b64-898f-9306d473ec44	1	Other	Other
+7747f7a0-df56-4389-a8b0-848c8aad734a	1	Other	Other
+77481f8a-23a3-4c85-a96a-14fa3201a0be	1	Other	Other
+7748441b-42c2-42ad-836c-46f0f2f5334f	1	Other	Other
+7748b1f4-2875-43ec-9293-587c0c98a95b	1	Other	Other
+7748bff9-f013-4148-9891-4872e1787662	1	Other	Other
+7748d8b6-be9c-46bf-ae22-89edefd6d9ec	1	Other	Other
+7748ee74-a708-4298-9fb4-a81ee175242f	1	Other	Other
+7749830f-de75-404b-b75c-78de51f3073f	1	Other	Other
+7749b81c-9ea5-4d9e-96df-bf5458df624f	1	Other	Other
+774a13ab-6f9a-4b13-8348-74bee3537a01	1	Other	Other
+774a6daf-cd91-4b08-9617-073a60ce6fb0	1	Other	Other
+774a98ed-e513-416f-84e3-e4706f25f34d	1	Other	Other
+774b74b7-8731-4531-919e-32709d63c02c	1	Other	Other
+774b9f1e-c319-4871-bd4e-10b8b504ccab	1	Other	Other
+774bfdd5-9942-483a-aec2-e6ffb7b686d3	1	Other	Other
+774c2a8d-ed7c-4159-ae80-841d41c529e0	1	Other	Other
+774c31f2-28f4-4642-8239-f2b46a411cdb	1	Other	Other
+774c6330-fcfc-482d-9c00-540b8bf5b085	1	Other	Other
+774c8515-55ea-4207-b328-e1a51809efbf	1	Other	Other
+774ca617-3c66-4be7-9c94-b7b8430b8bbe	1	Other	Other
+774d5f70-56e9-4712-a8f5-18f3ef541162	1	Other	Other
+774d796e-beef-4c95-876f-79bed3b76d1c	1	Other	Other
+774d8048-9fb4-4599-9d91-4c8d94b52f81	1	Other	Other
+774d9c37-f7a6-4f59-8e42-0e4b00e81c7a	1	Other	Other
+774d9eda-890b-4529-91ab-6f4f2df4f55a	1	Other	Other
+774e3236-e914-4897-99aa-438da6af0115	1	Other	Other
+774e4816-b470-4b33-901f-089a8ba4a874	1	Other	Other
+774eb037-2075-49f9-b5ee-1d33b13aec9d	1	Other	Other
+774eb389-e743-4d06-afc1-ed2b8dfaf1c4	1	Other	Other
+774ecf36-be2e-4f03-90bd-c81e423fcf45	1	Other	Other
+774edc2e-ed1b-46b8-b9f7-603c0fa181e2	1	Other	Other
+774efb40-7718-455d-b7d9-9f13ee7ded89	1	\N	Other
+774f0fee-24ad-4502-9913-9cc7a85ffcc4	1	Other	Other
+774f7b38-7750-44ea-9189-a2dbf68bfd76	1	\N	Other
+774f8265-5fd9-4400-b734-e17eb3fcc630	1	Other	Other
+774f832e-6288-4904-bc1d-b4c4a2121e35	1	Other	Other
+774fbed4-3482-4010-8144-08b599c1563a	1	Other	Other
+774fd052-f0b4-456e-93b2-41702e4ed9e4	1	Other	Other
+774fdc91-766e-44da-ac06-80cd9c5f5177	1	Other	Other
+774fdd51-5672-40c6-81cd-3f5bd18fa785	1	Other	Other
+774fe583-7c14-434e-9f12-b52482c2a05f	1	Other	Other
+7750341c-c997-4127-bab2-53d464e7863c	1	Other	Other
+77503ead-9621-4752-984f-74eb8d44f1e9	1	Other	Other
+77506a52-8614-4dd6-937c-d18fbcac2f09	1	Other	Other
+77509ab0-2037-489d-9499-4979e7ca6e8b	1	Other	Other
+77512233-917b-46e4-8022-a6808524d23e	1	Other	Other
+77514b95-9993-4fe1-aef3-a509f805bd44	1	Other	Other
+7751b9ba-0529-43fb-ba07-9f0a4bf6f621	1	Other	Other
+7751c4f9-8167-4dda-9dda-d6c8f79f66ae	1	Other	Other
+7751de2d-9500-47cd-89f4-be9a877b6a1e	1	Other	Other
+7751f875-12ba-414a-a35c-c21814033f3c	1	Other	Other
+775233a6-c621-4db0-aa87-88be5a3036da	1	Other	Other
+7753b255-1d08-4901-8d44-6dd889095f20	1	Other	Other
+7753fef7-8e72-4580-abde-df464653062a	1	Other	Other
+77548734-bf1b-4900-b5a3-24f491cfc861	1	Other	Other
+77549556-7c5b-4d35-b9c0-f515f60f38e1	1	Other	Other
+77550f49-2854-4bb2-a9aa-25c9183e0653	1	\N	Other
+77552ddd-3630-4f8b-9097-f54481956dd2	1	Other	Other
+775560de-7d53-43cc-be23-9fbba2f0e2ee	1	Other	Other
+77557a2b-9a4c-47c2-b3a0-10c309be4f7e	1	Other	Other
+775585b5-7db6-4a3d-954f-cc8a3168206b	1	\N	Other
+7755876d-6315-4e42-91ac-59e5fcdd69ba	1	Other	Other
+7755c435-ad88-4357-9e13-a2b89857860d	1	Other	Other
+7755c7c5-0410-4bd9-9c2c-019cc94d89c1	1	Other	Other
+7755c8e7-d977-4c25-95c7-7064a09ff3f0	1	Other	Other
+77567d3a-742b-453b-9d82-44bba3efb700	1	Other	Other
+77568744-c2ce-4802-be57-06a265604432	1	Other	Other
+7756b60d-a84b-405c-b71b-1c712bd5746a	1	Other	Other
+7756c1d7-9c28-46dd-b056-15f0c8ff86f5	1	James	Other
+77572a87-2917-4d53-83a7-ed591ad56918	1	Other	Other
+7757971c-0b1a-11e8-8493-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7757a27f-743b-4cff-86ea-3aeb070674fe	1	Other	Other
+7757a643-5eb6-4d3d-b11f-c9a52df27fb9	1	Other	Other
+7757b653-799a-46c5-aa0a-3f4ca09bfcdf	1	Other	Other
+7757c842-e3bc-44fa-a5eb-57df89ec9e36	1	Other	Other
+77580896-b72c-47e2-a532-71732939a215	1	Other	Other
+775814c7-88dd-4b48-a796-8ea658e64fa1	1	Other	Other
+7758309f-7e8a-4596-a8a6-f6b611af5801	1	Other	Other
+77584704-e483-46ae-bbfd-7c5b32c2660d	1	Other	Other
+775875d8-4d18-4f95-b16d-8ade7464bf5a	1	Other	Other
+775875ea-3fbb-4d8c-bd98-b130357a3ae1	1	Other	Other
+77587652-0c22-4669-b0b1-5420cc3bcba0	1	Other	Other
+7758ca95-fd0b-4ff5-9578-1c155cf6b521	1	Other	Other
+775936b7-03d5-4ba3-bc53-e4b922c3458b	1	Other	Other
+77598af1-1c13-403f-93df-0f43d0e23942	1	Other	Other
+7759a867-2f63-40f5-a0fc-7a0f7c9e7c14	1	Other	Other
+7759a97d-2e1e-4eb8-998d-5552d5d60e5f	1	Other	Other
+7759f2fb-1c84-49e1-bc01-c6f95b0c53f4	1	Other	Other
+775a7a16-eddf-4044-b8c1-f7030e5a9a58	1	Other	Other
+775a8e88-949b-4ec0-8b82-fedfe3a476a6	1	Other	Other
+775aa7c2-e816-4169-b0d5-f34339a8043c	1	Other	Other
+775ac0a9-62e2-46c6-b173-a126dff050b8	1	Other	Other
+775be0a8-856b-4eee-9f5a-b20c375221bd	1	Other	Other
+775c1d66-e86f-4cbd-b1ed-08fc2e7b4be1	1	Other	Other
+775c3790-62d6-475b-999d-828aa1560cd2	1	Other	Other
+775c4dd8-34e2-4ee8-83a8-34e42f2c95e1	1	Other	Other
+775cb603-453d-4d60-86d9-f01332dd2e32	1	\N	Other
+775cc8b6-7316-4560-ae3c-753625f0778b	1	Other	Other
+775ccbb0-16be-11e8-a87b-fa163e8624cc	1	\N	Other
+775ce81d-3609-482f-8f1e-d5199e28cc11	1	Other	Other
+775cf5e7-f90e-4f9b-811f-549e525d229f	1	Other	Other
+775d39c6-ddc1-47b4-8851-2a18e9fd1d11	1	Other	Other
+775dea6f-61c2-431d-b043-c052214c8e14	1	Other	Other
+775df1e3-e35a-4117-8d73-5bbd533785d2	1	Other	Other
+775dfe17-866f-4613-a923-c6b60c8ed434	1	Other	Other
+775e14fc-8329-4c83-8a49-2a2552f53a0a	1	Other	Other
+775e1c8a-abeb-49c2-b632-4ff08bb57321	1	Other	Other
+775e1ec5-45a3-4933-b056-5f2f618e556d	1	Other	Other
+775e33aa-ef1e-4e63-9ad4-e2f4dd830934	1	Other	Other
+775e47ea-8287-4f2f-957b-be2614f8b850	1	Other	Other
+775e4d9e-c3c3-4f73-9a46-a1f7db673362	1	Other	Other
+775e6625-33f3-4e6f-94f8-92628c5b5aaa	1	Other	Other
+775ec6e7-dc04-479a-8a41-b1f92090ccfb	1	Other	Other
+775f7526-abf6-417a-b432-e7715f75c0dc	1	Other	Other
+775fa1e9-be0f-4b41-b93a-a13d94e3b777	1	Other	Other
+775fbb95-efaf-4afc-84bf-8a8a4f158580	1	Other	Other
+77602803-5115-41ab-8e43-afdbe2a1e096	1	Other	Other
+776065e8-d4e9-40ed-9373-118779f3a65c	1	Other	Other
+776092bf-cd1b-4af3-811a-68ab307c0794	1	Other	Other
+77609c7a-fc2e-437e-8d3d-df299e724164	1	Other	Other
+7760c64b-9967-4de8-b971-62fb729bbb1d	1	Other	Other
+7760d25f-fa9e-4519-af84-bf9a5413d2b4	1	Other	Other
+7760ebab-c8f0-4af1-90e6-33279e3cf24a	1	Other	Other
+77611b76-6ac4-4cc8-a88d-ddd2a5c8ba8c	1	Other	Other
+77616490-16be-11e8-bb45-fa163e8624cc	1	\N	Other
+77616cbb-3a9a-4e11-ba75-2ccd8a704678	1	Other	Other
+7761773b-5fe6-4e75-8616-e385d44e0513	1	\N	Other
+77619900-dbda-4e1f-954f-9970d6e9c48e	1	Other	Other
+7761b8ac-706a-4687-afcb-f234ceb7388f	1	Other	Other
+7761fd0c-d69a-4d62-a700-e2a0951752bc	1	Other	Other
+77625077-bb83-4fba-bfdc-e7440694ff72	1	Other	Other
+77625308-0f63-4175-b912-5f9b9038c539	1	Other	Other
+7762543b-692b-4c92-86f0-7d09c20c45a4	1	Other	Other
+77625627-3b40-484b-ac5d-9f64e7da4f00	1	Other	Other
+77626a56-5fc3-4370-a75a-bd2a7111ed5a	1	Other	Other
+7762aaf7-78fd-4f2f-8fee-5b8f3549fe31	1	Other	Other
+7762bb4f-84ca-4e7e-aaa6-68b9c023897d	1	Other	Other
+7762c703-2e1c-4d80-bacc-36ee5fce46d4	1	Other	Other
+77632f8f-384c-4d44-b4a3-ca9550dff12c	1	Other	Other
+776335a1-b826-4fcf-9561-e62da8645f19	1	Other	Other
+77634ff3-5402-4905-bfaa-4d8f2ed863b5	1	\N	Other
+7763825e-0ed2-4670-a592-482aea37c50e	1	Other	Other
+7763bd25-1960-4932-98e6-3d4610a2d6dc	1	Other	Other
+7763f338-5cfe-4a12-b79d-f926db2b1be8	1	Other	Other
+77644d62-84bf-438e-b4b8-b97304a03584	1	Other	Other
+77647f43-6c71-4018-833a-510c032aa935	1	Other	Other
+77648758-b0a7-462a-946c-c9ebc74d06c8	1	Other	Other
+7764b214-c200-42eb-a34a-2e2b8887f341	1	Other	Other
+776511d6-14fb-11e8-8228-fa163e8624cc	1	\N	Other
+776536f7-84d8-4048-bdda-ad723a22b44c	1	Other	Other
+77653eaa-0ad9-44cc-a0b2-ac0b45f52bba	1	James	Other
+7765c651-66a9-43ce-8d51-94b1376e851b	1	Other	Other
+7765c8e9-5b83-4596-8123-50cc366e9e3c	1	Other	Other
+7765df26-9c89-4bfe-b8ce-f18b759c5319	1	Other	Other
+77667f3b-743a-4c6b-9683-43ab5355246a	1	James	Other
+776759fc-6a0e-4ca9-97aa-27cc7cab6d5c	1	Other	Other
+7767d421-09c8-4972-b336-25c9bf40b4e7	1	Other	Other
+7767dcc1-33d1-4d4c-b54c-be515e0b0ef5	1	Other	Other
+7767e0a5-c77a-4610-b678-b1a51669df83	1	Other	Other
+77681e73-479f-4cc8-8a47-571c7b62d8bc	1	Other	Other
+7768343e-6f40-48e5-8823-89e503b9a494	1	Other	Other
+77684ad9-7be6-46d7-8d97-11ba052fdaa7	1	Other	Other
+776884c5-10b7-4264-b500-7a186c92d82d	1	\N	Other
+7768b832-122f-11e8-8329-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7768cd52-ad6f-4b6a-95d7-e14a536ecb41	1	Other	Other
+7768d6c9-a6a2-47d7-b97f-415a212123c3	1	Other	Other
+7768fd24-7ccb-499f-bec2-7c532a7e5987	1	Other	Other
+77692ae8-b54a-4253-becf-4449bcc1e744	1	Other	Other
+77692cc1-816c-4d1e-ad72-522450c966b2	1	Other	Other
+77693318-21e9-461e-8a5f-c0728f35523b	1	Other	Other
+77693d9c-8469-4087-ae79-dd909d69d50b	1	Other	Other
+77695b2d-e654-4842-9a0a-81c8a168da64	1	Other	Other
+77696b79-f0ad-4dcf-8563-009fdfb7ed89	1	Other	Other
+77698ad0-0c2b-4795-ad78-cdef01fd912f	1	Other	Other
+7769d21a-1a5a-41b3-9ac7-6282ac76e70a	1	Other	Other
+776a0a34-0054-439c-a2c4-76b83457ba9b	1	Other	Other
+776a46d9-5bff-4691-ada8-41ab2abf6f43	1	Other	Other
+776a9060-ca41-43f8-92e3-365d00293c76	1	Other	Other
+776b4f36-8972-4023-af35-c6a259806a76	1	Other	Other
+776b592a-ad4a-4737-be05-f616f718332b	1	Other	Other
+776ba69d-0edf-4032-a793-4db0078d658b	1	Other	Other
+776be849-08b0-41bd-b5b9-a68b11dc63e8	1	Other	Other
+776c3159-6d3c-4e00-984c-e561c7f707eb	1	Other	Other
+776c3e28-fab9-46c8-a4a8-6a98cf66ab66	1	\N	Other
+776c573f-3c14-4b51-92cb-3e0df4ee7f01	1	Other	Other
+776c8a18-a30c-4038-a819-be161abdcdb8	1	Other	Other
+776c8f6a-e2ae-4490-94ff-54204606dec9	1	Other	Other
+776c9d38-5f09-422d-ae89-ac9afe5b7a3a	1	Other	Other
+776c9e9e-0e21-4f6b-ac20-1563d6db60bd	1	Other	Other
+776cca03-f57c-4e44-8f6e-2657f4872fb5	1	Other	Other
+776ce591-5646-4a23-a4eb-26bdbe67afba	1	Other	Other
+776cf884-7cc0-4353-a1b9-b0c4f84217cc	1	Other	Other
+776dea45-f040-4990-80d9-f75110b682ae	1	\N	Other
+776e30cb-5128-4f7b-99be-4eac8306f320	1	Other	Other
+776e495f-d849-4d02-946b-0e020e680e76	1	Other	Other
+776e4dc7-2fc5-4746-bab7-7ce64b0af50a	1	Other	Other
+776e5d21-699d-4ba8-ba77-ba186ceb45ad	1	Other	Other
+776e5d85-e9df-46b8-8d4d-334e1e5b586c	1	Other	Other
+776e7d27-7db4-4818-a4d5-a8e8d910eb6e	1	Other	Other
+776e88fd-6467-42fc-8986-e69fb1dd7aa3	1	Other	Other
+776f1754-f699-4b0c-961b-067bd1955c46	1	Other	Other
+776f3fcd-364d-403f-a856-9e86fd62131e	1	Other	Other
+776f71c0-1993-4aae-a41f-ea7de59a01c6	1	Other	Other
+776f7e9a-aa5b-4ded-8530-f9d5a8ef7be9	1	Other	Other
+776fc7ff-9be2-4f96-8a0a-c730410c747d	1	Other	Other
+776fd030-be2c-449a-b4d0-fd8239499e45	1	Other	Other
+776fdc64-4ed1-4d61-8db0-459d1182950b	1	Other	Other
+77702951-7bc9-4957-9a2c-871086d96581	1	Other	Other
+777087a0-c9ab-46fc-be19-42e49196ee32	1	\N	Other
+7770d041-c984-4e0b-a9bb-2c53deed5ba9	1	Other	Other
+77714c0a-f264-42b7-87d4-245c7ab07120	1	Other	Other
+7771718f-035a-4d90-9341-2d98f0ebf418	1	Other	Other
+77719ab9-40d2-4bbf-94ef-79675a672106	1	\N	Other
+7771f0cb-8373-4c61-90c2-d9e28814a395	1	Other	Other
+77720460-8af9-492e-9cbb-3fb7a3262af3	1	Other	Other
+77720e2f-24be-443e-8bef-5154507c9bdc	1	Other	Other
+777210af-b4bc-4a33-81d1-e460d8e42915	1	Other	Other
+777231fb-c10d-41d9-901f-1a4defb86f93	1	Other	Other
+77726b95-d26f-41d8-b63f-4c1b2606f531	1	Other	Other
+7772a75c-288b-4817-87eb-b5201d053952	1	Other	Other
+7772d1cf-3c96-4da9-b7bd-d5fabe73b58b	1	\N	Other
+7773066b-8297-4e03-bdba-365eaf757e4b	1	Other	Other
+77730adc-5edb-46b6-a790-902b6eb6a3c6	1	Other	Other
+77737fa8-3291-4d29-a84d-c3f4a332bf45	1	Other	Other
+77738c18-2fc2-419b-8eee-9a3d96cd2e06	1	Other	Other
+7773f5c1-937d-4f92-8c0b-8c38f1f8476e	1	Other	Other
+7774adc6-e148-4043-92fd-5fbd3d815162	1	Other	Other
+7774c092-5028-4d06-a61d-ab3295a0a10f	1	Other	Other
+7774e764-d1b0-4b8a-9ade-96c925607054	1	Other	Other
+77750be6-3022-4c12-b150-d9cabe00c2c4	1	Other	Other
+77754c2b-59bc-48b3-b256-f4ee392ceab3	1	Other	Other
+77759291-3511-487a-be1d-7043e2180db6	1	Other	Other
+77759dd6-ca90-494c-ab51-52d3b0e5b277	1	Other	Other
+7775ad69-179b-4373-bb9f-ed84fdf5cb9e	1	Other	Other
+77761a5e-6ebe-4166-ad2e-08d55c5bf6ec	1	Other	Other
+77762af4-a86d-4430-acde-a7402c6500b5	1	Other	Other
+77762d5d-d0f4-4182-a7be-5ae2944ea733	1	Other	Other
+7776493d-2530-4ed4-8e53-305b6ee3a347	1	Other	Other
+77768882-fe7c-40d5-a64d-2a52e8ffbf15	1	Other	Other
+77772c53-8d4a-4491-894d-d058ded852a5	1	Other	Other
+7777d982-0d28-4746-be49-bd7f97ed3777	1	Other	Other
+7777f5d3-f84c-4796-9a9d-8612cac4595d	1	Other	Other
+7778214b-df78-4930-ac70-640c71f5ed61	1	Other	Other
+77783ef7-af5e-43a4-b670-ba976457bbea	1	Other	Other
+77785184-bff6-499e-b6e8-ce0c6f21cdef	1	Other	Other
+7778aabb-6669-41b5-9d82-20456ddf1082	1	Other	Other
+7779161d-7ae5-4f50-b933-e8ac2af91b64	1	Other	Other
+77799411-fc0d-4001-bade-80488946d81b	1	Other	Other
+77799ae4-f6fc-430f-9a88-1d01d3556d55	1	Other	Other
+7779afe4-646e-413e-8ca3-b9bacf8dad96	1	Other	Other
+7779b031-1dd5-4924-b1b6-45f7443d8f0b	1	James	Other
+7779bd76-4f79-4a8e-9c8b-244b41a444e1	1	Other	Other
+777a00e2-1252-4b4f-b305-9ac39356ea22	1	Other	Other
+777a5067-d997-4248-9708-1870b056919b	1	Other	Other
+777a8e32-23d1-491c-b08d-a4fcfda20fea	1	Other	Other
+777abbeb-2a05-403a-84af-055a225383f6	1	Other	Other
+777ac58e-f0e5-48c5-8942-30263e35b0f3	1	Other	Other
+777b1930-566c-4e9a-af74-03c64e94ff38	1	Other	Other
+777b2343-da1a-4705-b288-280362b5b1a9	1	Other	Other
+777b2ba3-dc1b-4fc5-8483-2ec55e63d973	1	Other	Other
+777b6b49-b1e7-40de-abe0-268ea1eb9228	1	Other	Other
+777bbfba-7416-42d7-913b-a089b7fab7bd	1	Other	Other
+777bf9ea-cd31-4858-9a5a-79a4d1fdadcf	1	Other	Other
+777c00b9-2c52-48a5-a40c-f139180bbd6d	1	James	Other
+777c1edb-57a2-4e6d-886d-f3f6df99ac78	1	James	Other
+777cb8a9-faa8-42e7-8b86-4c7b50a1b102	1	Other	Other
+777ce7fe-cffc-4819-a53a-a3283a3216e7	1	Other	Other
+777d1d8d-497c-4715-b706-9a2d2413cb33	1	Other	Other
+777d2306-3f0c-43b0-8dda-6fc884ccea61	1	Other	Other
+777d2f2b-7e5a-44d2-9490-37ffd67fcd4c	1	Other	Other
+777d94ee-6312-4847-9e77-637feebe91dd	1	Other	Other
+777df8fd-b913-41a4-87a3-4d9882c4d4ec	1	\N	Other
+777dfc1e-b6fe-4142-864d-c99cdd40c9d3	1	Other	Other
+777e0905-17b1-44e6-ab25-2b38e84823e1	1	Other	Other
+777e30a2-045f-456c-b0ec-23729a1d1c12	1	Other	Other
+777e3cb9-80a6-4fa5-acbf-11128526ab3d	1	Other	Other
+777e7a9a-0787-4fa8-80ec-dcc4bbe50085	1	Other	Other
+777e972a-2376-44c3-a48c-b820f9193d3f	1	\N	Other
+777eab76-b2c9-41eb-8017-ec59de711924	1	Other	Other
+777ec0c9-a0f0-48de-80d4-43fe396c7018	1	Other	Other
+777ee119-04e2-4e5d-981b-7de80412489d	1	Other	Other
+777eea25-914d-4c26-8190-589f00a7814f	1	Other	Other
+777f3fa6-abd8-42df-844e-900fda8b2d99	1	James	Other
+777f67b2-23b1-40f4-bfc5-60dd8cc1a786	1	Other	Other
+777f8201-9c15-44b8-b9f2-bd3f0923da9c	1	\N	Other
+777fa52d-fad4-4515-a23a-844753b7f914	1	Other	Other
+777fa99b-4bbb-4c47-bf61-1b71dcb9596f	1	Other	Other
+777fe9bc-7daf-4ee8-8d48-0989f7de5f5e	1	Other	Other
+77802983-8f61-4850-a2ad-2b398522b746	1	Other	Other
+77802ba1-d4a1-413c-9215-6d884cec3422	1	Other	Other
+77804da6-3ee2-49b1-8a1d-d6f67c678089	1	Other	Other
+7780ba49-0249-4e76-b4a1-835e80e5e8b1	1	Other	Other
+7780cdb9-554a-47ee-a3a9-4984d6743ace	1	Other	Other
+77810261-c049-4e41-b095-9eb021d6d820	1	Other	Other
+77812ec1-ec2b-41aa-a282-525e37ebc09e	1	Other	Other
+77814c52-b43a-4a88-a720-84ff970cb0c7	1	Other	Other
+77816584-026c-492f-b89a-e3e7344a4ce5	1	Other	Other
+77821767-49f8-47df-96ac-2622e28f7517	1	Other	Other
+77826abf-a764-49fd-994d-0c15f360c148	1	Other	Other
+7782f0c3-8c69-4e7d-9c3c-f9ce2846da3c	1	Other	Other
+7783135e-d9d3-495e-bc74-8034ebba1b7a	1	Other	Other
+77835f4c-1646-43d5-ab2a-4a78675c89bc	1	\N	Other
+7783a685-0171-4bb6-8e54-d19ee039f5f4	1	Other	Other
+7783bf24-fb13-48c7-9e02-d802a03d8b7d	1	Other	Other
+7783dede-53f1-472c-9181-432d05f4c743	1	Other	Other
+7784143a-37d7-4c07-b6b5-75a0d115f8d2	1	Other	Other
+77843159-2e2a-4310-a580-6a98953b1233	1	Other	Other
+77846995-5b0d-4d7d-aa64-a419ff765061	1	Other	Other
+77849e28-84b9-4a15-b767-95d92802e1a1	1	James	Other
+7784aa6d-f891-412e-aa55-11377aa3fee9	1	Other	Other
+7784cf7b-3602-4eae-85a1-103cd74a0077	1	Other	Other
+7784dc8f-d39c-4bfc-8167-fb8a241f40f1	1	Other	Other
+7784e47d-081e-453f-af74-4e6f84cd119c	1	Other	Other
+7784f756-9575-4eb6-9030-3319c786bbf4	1	Other	Other
+7785023d-021e-4503-b9d2-b31b30bc4f56	1	Other	Other
+77852c04-e932-42f0-b4b1-38e2ae2610a2	1	Other	Other
+77854faf-cb74-4534-8e3f-4c79191b565e	1	Other	Other
+778571b1-c43f-4b04-abd7-d67e9f8f23fc	1	Other	Other
+77858425-8e29-415d-a6b8-a63b5b29e9fe	1	Other	Other
+7785c870-196b-4edc-873b-955209cd9eb7	1	Other	Other
+77861824-f69f-4448-a3cb-9b2b6d6b7fde	1	Other	Other
+7786fa10-2f2c-4d65-8653-01018fdd5353	1	Other	Other
+7786fda5-d747-4fa9-b9e2-876aca6f988d	1	Other	Other
+77871ecd-2139-452c-b187-d2283c04ae00	1	James	Other
+77873039-5d00-4240-8404-4f07f1a26ddd	1	Other	Other
+77873f06-098a-451e-8610-92cc7e4593cd	1	Other	Other
+77875a2d-4b6e-424a-b9a4-54dfdb0edd63	1	Other	Other
+77878e05-621d-4123-9bb8-c99499a583ef	1	Other	Other
+7787afcb-cd5c-49ac-8f5c-3c267b467be5	1	Other	Other
+7787fefe-ff3e-4649-b8c9-d5676012403f	1	Other	Other
+77885dbc-95dc-420a-815a-7d581efed96d	1	Other	Other
+77889047-6a3a-4cc3-b09c-bac0bd56b51b	1	Other	Other
+7788a105-bb37-4d80-ba7b-d45a9595ec5a	1	Other	Other
+7788ac72-df6b-45db-b38a-46da4b9f5656	1	Other	Other
+7788c74a-5342-4587-b6c3-763e7f9f6f5b	1	Other	Other
+7788f0b5-5d48-4b02-be7b-eb3c69eb8187	1	Other	Other
+7788f544-59ce-4f7f-bf34-91ff282c6992	1	Other	Other
+77890e88-b5e6-4cff-b0b5-617052612ec7	1	Other	Other
+7789667a-16be-11e8-b34f-fa163e8624cc	1	\N	Other
+7789c076-65ca-4d5a-90e8-4bd06959b201	1	Other	Other
+7789c303-49ff-4dd1-b33c-95f93db5c69a	1	Other	Other
+7789d5d3-d8a5-4a37-8a6b-5765347801cc	1	Other	Other
+778a0f39-25df-4364-ad0e-be17c2e2d0cc	1	Other	Other
+778a33e0-231c-4165-9a06-469bd951080a	1	Other	Other
+778a43a9-8f72-4b95-bcdf-b8c20175d463	1	Other	Other
+778ac8dc-7273-46b2-8d43-9e26babe9a40	1	Other	Other
+778b48a5-e4ec-4cdc-8064-986ec7b3c1d1	1	Other	Other
+778b736b-9965-4de7-acf9-07ef40032655	1	Other	Other
+778ba329-6498-4916-897a-68d5b9d964b1	1	Other	Other
+778bd71f-d5dd-470d-8fb9-ae61e848768e	1	Other	Other
+778bfb0d-5fb7-42c2-91dc-1ff79e0073d2	1	Other	Other
+778c3bd9-1f7b-49e5-a554-ca1a79d8c42a	1	Other	Other
+778c44c5-70e4-4687-bb73-27837201cc04	1	Other	Other
+778c4dd7-d99c-4c2f-bc0a-e3e0c87b5c94	1	Other	Other
+778c603b-6e6f-43a6-910a-25c25ded2dcb	1	Other	Other
+778c9dd9-afa0-44d2-8547-6594da1a28dd	1	Other	Other
+778ce65b-254b-4a7a-b822-6083f338811c	1	Other	Other
+778daa89-05d8-4038-a131-358aa71b095f	1	Other	Other
+778e08d5-26ca-4933-beba-79b40a67569b	1	Other	Other
+778e44cd-8fa5-48b9-9851-3ab4b5ab01ca	1	Other	Other
+778e93ba-4258-427c-897e-969e59fa0aed	1	Other	Other
+778ec0fd-d072-4930-a531-daf00cf7b856	1	Other	Other
+778f283a-b9e9-48f4-98d4-0f437781dbe7	1	Other	Other
+778f43ed-4843-48e0-8155-322d989cae3e	1	Other	Other
+778f8636-0431-40da-84d5-e6b1b5d9df28	1	Other	Other
+778fb7ce-5fe5-4a82-b34f-02d4d69c4a6e	1	Other	Other
+778fbff5-fe62-4c59-9496-e6a3ce123bfe	1	Other	Other
+7790292d-e284-48db-a55c-3efc52cf9f9e	1	Other	Other
+77907110-6d14-4e37-879e-e1de81a0425b	1	Other	Other
+7790bf30-a503-4315-8706-b97a15f1b8e5	1	Other	Other
+779163b0-0126-43ea-a1a1-06f2ede8714c	1	Other	Other
+77918a92-ec41-4498-b72a-3f10349d30f9	1	Other	Other
+7791aa4d-534d-47c4-ad10-bf2120d1135e	1	Other	Other
+7791c0fb-4e8e-4ede-8933-34e800f31cec	1	Other	Other
+7791c1c6-c5cd-46b8-9f41-8d3c77f920f7	1	Other	Other
+7791dcbc-1948-4f26-ba04-d2b926ba1143	1	Other	Other
+7791f903-e6b2-4091-97d9-1897d15afb41	1	Other	Other
+77920b00-e8ee-4b1a-913c-58de750bdec1	1	Other	Other
+77922a7d-d984-4357-b42c-3ec32fb3a27b	1	Other	Other
+77922d0b-264a-4746-83e7-248db33ba118	1	Other	Other
+779304d4-8b1d-463e-903e-eb6fa0bc17bc	1	Other	Other
+779309d8-d4ba-4a60-8228-8c3ada2d15e8	1	Other	Other
+779337e8-1df4-4bab-a6a6-2d7e3932ff35	1	\N	Other
+779351e9-7339-4dc3-83f0-68e6b62d1f70	1	Other	Other
+7793889b-75d2-4a46-8e92-afe4bb2c5bf3	1	Other	Other
+77939a92-879a-4cfb-9065-028f558dae05	1	Other	Other
+7793c364-8d8e-494d-97d2-94d29dc6587d	1	Other	Other
+7793d8fd-4ca5-419e-849a-1b1063369b6d	1	Other	Other
+7793e4d3-7ce5-4517-bbe9-411a487198bf	1	Other	Other
+7793fad3-aef3-4815-8ecb-2887bcbfc058	1	Other	Other
+77947b10-418b-4395-9c4b-e00c91ac8784	1	Other	Other
+77949af4-0f18-48a0-a545-3c62931b02f3	1	Other	Other
+7794c713-0a66-4bcc-bf4e-8411c39bf26a	1	Other	Other
+779507d6-6428-4a2e-b183-1bdf5a065154	1	Other	Other
+77951a8f-2723-4cfd-9cf5-efca2a91eae3	1	Other	Other
+77957fe0-3876-4dac-9047-f161ec1b9f56	1	Other	Other
+7795d338-53e2-43dd-9413-5d9a826b1118	1	Other	Other
+7795e7c3-dc83-4e67-b72b-2bdd1357a1e9	1	Other	Other
+7795fd8a-57a4-45c5-9bbf-8144450831c8	1	Other	Other
+77960713-dd09-4424-9604-76ae52736458	1	Other	Other
+779622bc-d64a-4a3f-874c-a1aff9337570	1	Other	Other
+77963c1e-e898-4e27-af51-53769be5aa02	1	Other	Other
+77964306-44c9-4cba-af88-2947b235d470	1	Other	Other
+7796c611-d9c7-4437-bc1b-cd36d0f7de13	1	Other	Other
+7796c6bf-2564-48ce-bf6c-9db9127aef93	1	\N	Other
+77975c3d-e89c-4f00-83a4-e4ad1beca194	1	Other	Other
+77976711-9423-438f-9212-41e3a62cafe4	1	Other	Other
+7797870d-4145-41b9-b95e-2b976673cc0c	1	Other	Other
+779795b5-a348-40ed-8927-aa77ed763262	1	Other	Other
+7797979e-7ea6-4723-b11a-d8d2564bb309	1	Other	Other
+7797a8f2-91e4-4602-b0aa-ec48ae5a030a	1	Other	Other
+7797cb34-3225-4c5a-87fc-0abde56fe22c	1	Other	Other
+7797e525-5a04-4728-9831-fe5b29101b2a	1	Other	Other
+7797e9c2-41ed-41d7-ba47-0cafde3e7111	1	Other	Other
+77980e76-160a-4aec-9f61-845467aa8c46	1	Other	Other
+77980f75-8778-4c11-afa2-1cdb2d15a34d	1	Other	Other
+77984677-2974-4dfa-b6f3-378171e37714	1	Other	Other
+779846d7-57da-4f4b-b310-fa11fc7ea196	1	Other	Other
+779856ea-9bf1-4321-a6f4-6a6de8373c9c	1	Other	Other
+7798c3af-7c13-4fce-a385-afaa7aefa771	1	Other	Other
+77990d5b-9ce9-4959-9cd7-05e8644bee59	1	Other	Other
+77992daf-63f9-46b2-bef9-842b699c7187	1	Other	Other
+77994e80-b243-4629-a775-ba97d30c39c9	1	Other	Other
+77996b4c-3e77-4b95-929c-0e4f8f218603	1	Other	Other
+779974df-ba1f-4617-8007-1619ccd84bc8	1	Other	Other
+7799921d-f993-45fc-9acd-293f65c444b5	1	Other	Other
+779a0e18-c748-44c3-9a67-e64ade83d304	1	Other	Other
+779a37eb-1b5d-4e56-8b9d-5222656478be	1	Other	Other
+779a4ff5-7b58-4527-85d0-45ace75ad2cf	1	Other	Other
+779a5f96-9e20-47c6-b478-0b9e716225fc	1	Other	Other
+779a8405-6785-485b-a84e-2829d8e9231d	1	Other	Other
+779abc92-8c7d-4ec5-b9d8-8acf50dcfc48	1	Other	Other
+779ae868-e1b3-4534-942f-938ba0f304ef	1	Other	Other
+779af113-1dba-4233-9a2b-cb9f1df14442	1	James	Other
+779b0236-71e0-402c-881a-804892d7cf6c	1	Other	Other
+779b73c7-587c-40de-971d-db4e984dc2e9	1	Other	Other
+779bccef-2188-45a3-89a0-f012be34d022	1	Other	Other
+779bd60b-09f7-497f-bcdf-2c89ab7a0c7c	1	Other	Other
+779be988-0cbb-49a1-832d-5f042958c834	1	Other	Other
+779c110a-f793-4e5e-9d0b-630bf0607895	1	Other	Other
+779c249b-d169-42b1-9e4d-3eb24b78c3e2	1	Other	Other
+779c5eac-1b36-4c8f-ab21-e7b483a05df4	1	Other	Other
+779c85e5-4e9c-4d5d-a377-11754ebb8454	1	Other	Other
+779c89cb-265d-4e85-a68b-ff7afd448d40	1	Other	Other
+779cc011-1503-4d09-a38e-d7f65917456a	1	Other	Other
+779cd0a7-8def-4c47-9cf4-9a2e286d57b2	1	Other	Other
+779d3764-0a85-44f2-a922-de9df64a67b0	1	Other	Other
+779d567d-4802-4ef0-baba-17cd2bd09e67	1	Other	Other
+779d7688-b862-459b-b428-214749aebc7b	1	Other	Other
+779de06b-cfd7-4ed8-ac1c-af4323398ad0	1	Other	Other
+779de831-d939-40dc-b812-7a55453e6ece	1	James	Other
+779df9ef-fcd4-432d-b5da-7e50e5cfb2c2	1	Other	Other
+779dfed1-772e-4c3a-bfcc-6aaa43f5a7fb	1	Other	Other
+779e087d-1335-4c27-9e95-f9d1bce6bf76	1	Other	Other
+779e280f-f151-48c5-9cc4-13ed147fd567	1	Other	Other
+779e3ef7-18a4-4807-8d4c-818680a00e83	1	Other	Other
+779eeeca-2e13-4e10-8516-94547e9fff32	1	Other	Other
+779f28a2-7074-4b2d-8981-5fe7b160463a	1	Other	Other
+779f3b8b-8079-47b3-a484-6d4596415083	1	Other	Other
+779f9017-eab9-4b47-b918-2ae374c9ae79	1	Other	Other
+77a0324d-4270-4ace-8cea-38ae53cc6391	1	Other	Other
+77a03c29-6117-40c9-b1a1-f7e7fb635d51	1	James	Other
+77a04901-0c57-4402-b912-987ac96d75d8	1	Other	Other
+77a04b70-b307-4f7d-afd1-db7749245acc	1	Other	Other
+77a07dc9-e073-42ca-825d-be7dba1c6c8c	1	Other	Other
+77a085d5-ff8e-48ac-bbaa-93b91f65ec74	1	Other	Other
+77a09859-ef6e-43d3-b02a-1ef1be372a12	1	Other	Other
+77a0b357-bca5-4225-b9ab-9a9f14053f88	1	Other	Other
+77a1039a-4ab6-4429-b690-dd326b29041d	1	Other	Other
+77a1657c-6145-40fd-9074-a08e23436079	1	Other	Other
+77a1f352-16be-11e8-ad1c-fa163e8624cc	1	\N	Other
+77a20e38-fd0c-471e-b8a5-02e2d81fe7a7	1	Other	Other
+77a216ae-8a5e-4f88-80a5-2aa5e50ddb9a	1	Other	Other
+77a21ccf-ce4d-42d8-b325-58442c8589cc	1	Other	Other
+77a21f23-7f03-4b01-8cef-2bc547696192	1	Other	Other
+77a2256b-0180-43b9-8c7e-9ae9992d60ca	1	Other	Other
+77a2465a-4f0a-4b28-a218-a1bfc7ccc157	1	Other	Other
+77a26361-7386-4676-bf10-6ebb0cd4b283	1	Other	Other
+77a274da-a19d-4375-851c-a1445d5ed13b	1	Other	Other
+77a2baee-b6ab-4d69-a188-f9eb2db6a1b4	1	Other	Other
+77a2d26e-6e6b-406f-82bf-a470dd53ec66	1	Other	Other
+77a2eaff-0451-4906-9ed8-b502896f76a4	1	Other	Other
+77a30884-eb38-4e13-897a-f7b61d789301	1	Other	Other
+77a36643-583d-4c08-8f46-fe385ddec05d	1	Other	Other
+77a39da6-ddf7-413c-ae07-2aa01ff4c6fe	1	Other	Other
+77a3a093-e170-4d6b-a291-455d9e78856d	1	Other	Other
+77a3adf7-f2b4-4f5d-b57a-242a4a2e3bbb	1	Other	Other
+77a3d87b-e1da-433a-ac5c-ef4caed051ff	1	Other	Other
+77a40386-f0e0-4dd3-935f-2d3f927c784a	1	Other	Other
+77a4465b-552f-406f-b8d2-53f957f085f4	1	Other	Other
+77a46c03-03b9-427e-bb42-7cb6d79f36c5	1	Other	Other
+77a48be9-f787-4c66-a221-4461ae4874b6	1	Other	Other
+77a4bfa3-fcba-446d-97d0-ff111ec9d714	1	Other	Other
+77a4f87e-244c-4580-ba7a-534f5aecf682	1	\N	Other
+77a51138-2c1f-4584-9702-ff4bf1d687c3	1	Other	Other
+77a523b9-4884-4723-b9d2-1942cc34ec04	1	Other	Other
+77a58798-f7f9-4953-90d1-550f081b3c07	1	Other	Other
+77a5fcab-a32c-4f28-99bd-44cc45516896	1	Other	Other
+77a60a15-4410-4ae4-bc9c-3ccbb624130a	1	Other	Other
+77a61ed3-e2fe-4d0f-8c22-db76c4c4b2a7	1	Other	Other
+77a6255b-0049-48fa-b92b-6a92f4c2b26c	1	Other	Other
+77a62db6-7de5-4dd5-8d9e-68e73863b2dc	1	Other	Other
+77a65c46-e5c1-499c-8608-a382788fea87	1	Other	Other
+77a71a50-fdf5-4cd8-a0d3-bd0888b54403	1	Other	Other
+77a723dc-99e7-4a76-8e56-e9c141f4844f	1	Other	Other
+77a7571c-7c36-4243-9a45-1ff0d29c55eb	1	Other	Other
+77a78d08-a131-4fc9-a7c5-b0935026631c	1	Other	Other
+77a791e2-c17d-4569-9b7a-f9aa5c183902	1	Other	Other
+77a7a377-7ffb-405d-a289-1b223faf900e	1	Other	Other
+77a7da08-cd8c-4804-a656-810d3c8e015e	1	Other	Other
+77a81d90-7c9a-44eb-911d-eb721b44c71d	1	Other	Other
+77a81fc9-5fb6-4d45-80ef-393a2c93c61e	1	Other	Other
+77a82ab1-5d16-4a6f-aa83-7190d2a3c414	1	Other	Other
+77a84126-2470-48d2-8db5-75346a627542	1	Other	Other
+77a8b7f7-c935-4bb2-ad8d-2c138149915e	1	Other	Other
+77a8bbb5-daaf-44f4-903d-ee79b00e226e	1	Other	Other
+77a92077-37c7-4d6a-a076-174708cee0d8	1	Other	Other
+77a92b05-d0d9-4ee5-bf57-161442510d77	1	Other	Other
+77a93aa9-8b72-4ba9-a60c-29dcfaa82275	1	Other	Other
+77a95a0a-fcf9-4305-bb2d-95a0c9943e3d	1	Other	Other
+77a98b01-acef-4a19-8db0-85c4fcc7f2cc	1	Other	Other
+77a9a843-1d27-4ee6-8586-58da01efe613	1	Other	Other
+77a9bb97-e301-497a-b0a7-cac081f85a7f	1	\N	Other
+77a9c2d2-a87c-401b-8b0a-6ae6e0c30809	1	Other	Other
+77aa18a1-87c9-4e8b-8d79-c6cba2d533e8	1	Other	Other
+77aa37a7-97a8-4186-990d-bb6d6bef9e05	1	Other	Other
+77aa5181-57c3-40c4-a115-30af5e4013eb	1	Other	Other
+77aa8a59-2b3c-4ee9-9233-4e851f5063c7	1	Other	Other
+77aacf22-eed9-4d2d-bd4b-9b3cbe787dbc	1	Other	Other
+77aae9f3-2f32-4216-965b-58ace0b967b4	1	Other	Other
+77aaec43-176a-416d-bd24-35c701e3f52b	1	Other	Other
+77aafcc3-1449-4884-9bac-04a910a54278	1	Other	Other
+77ab17e5-1978-4d2d-9844-f50cd243b4be	1	Other	Other
+77ab4009-5bba-4a39-a287-671b623ac0a6	1	Other	Other
+77ab734f-e9db-41e1-85b3-5412474703d1	1	Other	Other
+77ab8a88-60bd-4ff3-b232-576946c81c45	1	Other	Other
+77abbc0f-5b1a-43a7-86df-b637a09c1e36	1	Other	Other
+77abd306-1d68-451a-9eae-c2134b21b50b	1	\N	Other
+77ac1f04-02f0-4140-8422-f94949d3f0c5	1	Other	Other
+77ac2bbf-2d56-456a-b77e-439f0a7ba770	1	Other	Other
+77ac3f4e-df13-4088-8ef9-516e345551c0	1	Other	Other
+77ac51d6-f948-4d6a-b1f2-03f6b41a2b20	1	Other	Other
+77ac6df6-5df9-44d7-b630-8a53d05a31f3	1	Other	Other
+77ac8584-23ec-487d-83b5-46f465aff471	1	James	Other
+77acd3df-98df-42e5-b62e-b2da30fb01b9	1	James	Other
+77ad8074-a9ee-44c2-b76f-20a01fdcdc95	1	Other	Other
+77adf87e-d1b0-4702-8b23-52602a2db043	1	Other	Other
+77ae4c17-06c2-42cc-831a-faa1ed251293	1	Other	Other
+77ae88f8-2581-4805-b842-382a798a2419	1	Other	Other
+77aebe41-c766-4138-a25a-c2aef2bb524d	1	Other	Other
+77aef5da-605c-4b14-895d-44aaefb2cd4b	1	Other	Other
+77af2766-1d93-43c1-a4e1-ac83a0cc5180	1	Other	Other
+77af3c83-9ec8-4a4b-9c79-2004c55f6029	1	Other	Other
+77af90e1-7433-491d-a754-2e9f40b12522	1	Other	Other
+77af95e2-7d50-4e64-acc1-546c2ae88946	1	Other	Other
+77afa4fb-030d-4811-a500-f84b044992f6	1	Other	Other
+77afb537-5200-4614-bcad-9defbea9b376	1	\N	Other
+77afc91c-c0d8-47db-afe3-27a5c10f76aa	1	Other	Other
+77afe7f1-f3a9-42ed-b84d-fe202482d0b0	1	Other	Other
+77afec37-81cb-4a66-98ac-686d75483fe1	1	Other	Other
+77b0181e-0299-4c37-af4e-0b0431a06c02	1	Other	Other
+77b03cf0-d293-450c-b066-26889f178858	1	Other	Other
+77b084ba-a9bf-42b2-be06-39b2f5d5fd7a	1	Other	Other
+77b08976-16be-11e8-b789-fa163e8624cc	1	\N	Other
+77b08a9e-63a5-49e7-9ceb-01d1aee7e030	1	\N	Other
+77b0970f-23be-418c-8bca-f373f93b4676	1	Other	Other
+77b0a352-f55a-4554-9e5e-9ccfa9b0a371	1	Other	Other
+77b0d2b2-118d-4ad4-87f3-b583fe65b343	1	Other	Other
+77b0f191-7662-4ca7-80c8-126309e0d058	1	Other	Other
+77b11cd6-3441-4e03-8697-4f5fa8cd9900	1	Other	Other
+77b13d79-4c2b-45ad-aa98-2c99efd2d760	1	Other	Other
+77b155b7-2480-4598-8ae8-57cbd8af033c	1	Other	Other
+77b1e9fb-59a3-4712-bc07-5d9b6cecce51	1	Other	Other
+77b1f13b-b56e-44e3-9eda-93e46bc7ab66	1	Other	Other
+77b2210d-44c4-4f1a-90df-1ad912481dcb	1	Other	Other
+77b23a22-13ff-472a-9d3d-a547b930fa9d	1	Other	Other
+77b245d3-bf35-4a76-9351-8dc946792291	1	Other	Other
+77b271ae-19cd-4c5e-ab81-80747acc86e0	1	Other	Other
+77b274f4-1df3-433a-9453-1b7ab13732ee	1	\N	Other
+77b29d84-01d9-4ef0-8c3d-175d34806759	1	Other	Other
+77b2a07e-dfc7-4137-a87a-12beb409a81c	1	Other	Other
+77b2a417-9c63-4484-a14d-962ccfa62abf	1	Other	Other
+77b31a45-789f-4e0e-b2df-99ffc09ae225	1	Other	Other
+77b330c7-9e9e-46a6-aba7-41195cd7798a	1	Other	Other
+77b33e70-97f9-4897-9591-0ca72aab8244	1	Other	Other
+77b3733e-8b56-44d6-9e3b-8b3999e6c611	1	Other	Other
+77b3749c-867e-4e36-bd2f-f54ca47aa234	1	Other	Other
+77b3755a-6dea-4b24-b635-7ef5331d388a	1	Other	Other
+77b38ae0-5401-458a-8aca-ac04431c8a1c	1	Other	Other
+77b38d10-61ce-4095-9f5d-1f7ae96cdad5	1	Other	Other
+77b3b596-d88a-4b99-b545-be8cbad3fd38	1	\N	Other
+77b3fb92-8af4-4d8a-a806-bf5ed762ca51	1	Other	Other
+77b46552-5976-4871-aec9-137149e46e64	1	Other	Other
+77b48fe9-72c3-4c9b-852a-c2880a7d34ec	1	Other	Other
+77b51089-3d02-46a7-bfd2-e19472e704b3	1	Other	Other
+77b51a5b-2084-4d96-8c97-06fe9c24ca98	1	Other	Other
+77b574d3-f6d1-45b4-bf39-15045358fe63	1	Other	Other
+77b5bf18-eb66-428e-8349-1bec1cce1cd1	1	Other	Other
+77b5c48a-7632-47bd-8ee4-dfd5f37cbbda	1	Other	Other
+77b5d27d-243b-48cd-9e5a-f0891fabfdc9	1	Other	Other
+77b5ee18-705d-495d-8dbb-0eb5415e5091	1	Other	Other
+77b628d9-c024-45cc-851f-cba85629a04a	1	Other	Other
+77b645cb-f586-4fc4-8ad9-4daf86a33686	1	Other	Other
+77b64bbb-5a96-47e3-9117-8df9ec7d00f4	1	\N	Other
+77b6d80e-3862-407e-b509-681034539e8f	1	Other	Other
+77b6f001-aa97-415d-afb8-90e1da0a7994	1	Other	Other
+77b6f272-08a4-444d-90b4-a21e2c578205	1	Other	Other
+77b7655b-45b0-47cb-93fe-52bd556f774f	1	Other	Other
+77b7d212-5323-4429-b489-4036bf117fb0	1	Other	Other
+77b7df78-7e12-428a-a545-55dd7eea160b	1	Other	Other
+77b815bd-2e66-4dd5-8ce1-8abf0348d34d	1	\N	Other
+77b81c29-e9a5-497a-b0c1-79a802baf0dd	1	Other	Other
+77b820f1-27b1-4bb7-84cc-b191ebbd4582	1	Other	Other
+77b8495e-16be-11e8-a981-fa163e8624cc	1	\N	Other
+77b8618c-e215-47af-9279-35de17497376	1	\N	Other
+77b929a7-d3b8-4ef1-bbbf-5c9214350c84	1	Other	Other
+77b970ed-a14e-428a-a490-789f23663b4e	1	Other	Other
+77b9b3db-1875-4c5c-82b6-87e7a51d5c89	1	Other	Other
+77ba120c-5544-4fe8-9ff1-2008e5a28981	1	Other	Other
+77ba17c4-40dc-426d-9e2f-8d9844e547bc	1	Other	Other
+77ba5458-88c4-49e1-aa06-13c76bb1e647	1	Other	Other
+77ba89a4-1845-4d12-851d-4c0e2310170c	1	Other	Other
+77bb0796-9eeb-4482-ba32-3501c9e8f60d	1	Other	Other
+77bb6416-362b-42e9-9eed-137a78724e2e	1	Other	Other
+77bba2ed-729f-4953-9c0f-c7a9ee655c27	1	Other	Other
+77bbb7d8-e55f-4d28-9036-7b4a803ab11d	1	Other	Other
+77bbe37e-78fd-482d-b6ca-75190aef7a41	1	Other	Other
+77bc202c-2130-4aac-b690-5801d13732bd	1	Other	Other
+77bc668e-2d30-4c55-915a-208c8d047d23	1	Other	Other
+77bcadd2-95a9-4ab2-abf3-1edae7f25b19	1	Other	Other
+77bcaffa-9977-471b-9c7d-4382ed31f65b	1	Other	Other
+77bcb04a-6784-4d22-b19a-c4661a7227b9	1	Other	Other
+77bcb256-71a9-4740-ad17-7a9a8da1be24	1	Other	Other
+77bcda89-a8de-4bd2-9f3c-efdc95043464	1	Other	Other
+77bd1c07-c5a2-428f-9423-ba1de69ffec2	1	Other	Other
+77bd41c8-1929-4533-93cb-a846a42e870a	1	James	Other
+77bd53d7-c919-4783-b2e7-e4e0b5f770a4	1	Other	Other
+77bd5ae5-f645-46a3-a354-1ef91ab476b6	1	Other	Other
+77bd61ec-9ef5-4d38-9c52-76c11b234dc5	1	Other	Other
+77bd8cc4-eb9e-49bc-b701-2f96036993b2	1	Other	Other
+77bdb36e-ec16-4b4a-b85b-65edd2b753fa	1	Other	Other
+77bdddd8-a2f3-49c7-a940-9c37656c9e7d	1	Other	Other
+77be0e1b-30ed-4aec-98ac-e42ae34e594f	1	Other	Other
+77be42af-b5e6-46d4-84ca-b1fe246f7a5e	1	Other	Other
+77be55ce-2351-4eb2-a7cb-f5938db86f01	1	Other	Other
+77be91ec-ec77-4c5a-aa8c-bdb5dfbfa557	1	Other	Other
+77be94d4-ebe3-4bde-8f09-8d1a9cd5ef71	1	Other	Other
+77bea1c5-0c82-4cb5-82c3-460c908dd37f	1	Other	Other
+77bed46d-81a5-47f8-9916-86bff0dad945	1	Other	Other
+77bed81f-1277-47e8-bdd9-2bcfb5980ef7	1	Other	Other
+77bf41c5-0b76-4268-a996-f4f8a88ffc77	1	Other	Other
+77bf6e56-81f5-44d8-b988-e742835ef0cd	1	Other	Other
+77bfc6c1-a98b-4e2b-9836-cc56a75ebb9a	1	Other	Other
+77c01a6b-3912-4f40-8e3f-64c5c8c088ee	1	Other	Other
+77c03d70-0d20-4f84-98a0-02971abb868c	1	Other	Other
+77c04618-5775-4e42-adab-7a9a2f1bfdfe	1	Other	Other
+77c088e3-1e27-46b6-8579-4d9fcc861aee	1	Other	Other
+77c11392-666b-41bb-bd37-86f1791ade3b	1	\N	Other
+77c12e5a-0d31-4797-a1b9-6df745768013	1	Other	Other
+77c156ef-2ead-40b1-a748-10bc73adf062	1	Other	Other
+77c18e52-5d47-43f8-b86d-20a1231d4a54	1	Other	Other
+77c1b4cc-fe6d-4908-910f-98ae8ca5a73f	1	Other	Other
+77c1e58f-e30f-46ed-a10a-41b87f1e0e62	1	Other	Other
+77c1fdec-a585-4214-a819-96d0ca4b0706	1	Other	Other
+77c219f2-5545-40fb-a7cb-f3f1a25f7cf9	1	Other	Other
+77c22249-22bc-498b-8588-55268bc358bc	1	\N	Other
+77c2326c-71f5-45a7-b4f9-87246232612d	1	Other	Other
+77c24063-ec8a-4725-bfc1-b9c4cb8fb951	1	Other	Other
+77c28ecd-fbba-4186-944e-25658b569e08	1	Other	Other
+77c2adce-c782-4fd5-b317-6b8717f29b6e	1	Other	Other
+77c2c4b1-480f-4569-aeca-95dc33fe810f	1	Other	Other
+77c2d5e4-c9ad-4de2-b34a-37a9eddd99e6	1	Other	Other
+77c2e513-6269-4daa-a386-dc5d2a7266cf	1	Other	Other
+77c30a88-dc82-46ac-92d1-190db686c5e1	1	Other	Other
+77c33214-0958-4a7c-86f3-150d2a68c557	1	Other	Other
+77c3fd4e-1e40-4735-a773-b5c09b578d3b	1	Other	Other
+77c402f3-06d6-42c2-80b3-a2ef5bb21792	1	Other	Other
+77c429cd-ee30-40d3-99ba-55fa9c2faa4d	1	Other	Other
+77c44fb8-995d-468f-9bee-d71459b0e0dc	1	Other	Other
+77c453cc-634f-4c6a-803f-64d99221e039	1	Other	Other
+77c47692-900e-4f23-b4df-a014345204b6	1	Other	Other
+77c483cf-b6d8-40da-862d-2a5f8a2f5736	1	Other	Other
+77c4c940-052f-4959-8cd2-1ff8d0812de7	1	Other	Other
+77c4e8e4-155c-44d7-b962-9d40df4992a1	1	Other	Other
+77c4fca1-ad6d-4857-b7e6-7db839f1e0ae	1	Other	Other
+77c5afbb-6078-40fd-a19b-8101ea1a0387	1	Other	Other
+77c631fb-17d7-496b-b8a0-7efde0ecd0e9	1	James	Other
+77c67487-d70f-4511-98fd-d7252df18947	1	Other	Other
+77c6970c-b7b1-4a2c-b512-2a4a1fb3d890	1	Other	Other
+77c6ab9b-65f0-43b0-b8db-889920b8239e	1	\N	Other
+77c6d55a-f9fe-4205-9d27-d8a9ac02172c	1	Other	Other
+77c6f0cb-5e56-455e-9b79-218c89bae3f1	1	Other	Other
+77c71422-7031-4359-80dc-8ceb9a8a5cc5	1	Other	Other
+77c750af-e852-4f4c-9782-0ff0623a537d	1	Other	Other
+77c76b44-3843-4bb2-b112-84ae174312f0	1	Other	Other
+77c79e19-4bcd-4e2b-b05c-4b1e4d6734db	1	Other	Other
+77c7cb37-550a-4a34-8f5f-0c81d7601eb5	1	Other	Other
+77c7cfc5-2fae-4fec-8ef7-074adc20f097	1	Other	Other
+77c805a1-3033-4b55-a530-8c60955c1e7c	1	Other	Other
+77c829cc-16fb-4ba5-b013-9f9d7ed78dd3	1	Other	Other
+77c8398b-4f40-4d03-bef4-25f674e2b985	1	Other	Other
+77c86148-5fd0-46cc-adc9-bc949d316c67	1	Other	Other
+77c887b9-e4df-48e0-a452-ec9097733a7b	1	Other	Other
+77c8d7e0-47ad-4e38-a271-984002d5c813	1	Other	Other
+77c90646-c5ef-4637-8625-a60613476403	1	Other	Other
+77c910b0-fd57-4d76-8b0b-c9782143cece	1	Other	Other
+77c96a24-5bdb-4a6a-92e5-32886eb7ff48	1	Other	Other
+77c96ba6-8f83-4174-890c-52aabe96e536	1	Other	Other
+77c989dc-ed9f-4316-ada5-a00e26b9cdf5	1	Other	Other
+77c9c1fd-9085-4f5d-b342-33fc4d1a7658	1	Other	Other
+77ca0db2-e2ee-4443-9c4e-1227b43623d8	1	Other	Other
+77ca2b13-667b-413d-bbe3-56a9006e4a30	1	\N	Other
+77ca3fe0-350c-4950-9376-b4fad833ef4e	1	Other	Other
+77ca6709-c577-45d2-93d7-660d253b6136	1	Other	Other
+77ca7e04-9a9f-490f-99ff-9b2831d447f6	1	Other	Other
+77ca8a6e-639e-42c2-ad93-56a7190df32f	1	Other	Other
+77ca8ede-0c99-47dc-b5cc-58d20dd95435	1	Other	Other
+77ca9dd7-7170-45b9-9b0e-7dabeba5cadc	1	Other	Other
+77caf7cd-6fa8-48ec-aa67-b6508e553fac	1	Other	Other
+77cafcae-3522-4505-bfb6-1f81bae4ef60	1	\N	Other
+77caff06-133c-4378-9a17-f0edc95a81d8	1	Other	Other
+77cb2382-a02f-47d5-aef6-c9f66d6e1dcd	1	Other	Other
+77cb5b66-9a88-48b4-b76b-dd2d5a5e389c	1	Other	Other
+77cb8213-6886-4b76-99eb-2c17fb9cf736	1	Other	Other
+77cbdcb9-fbba-424d-b8b6-6ab0adb795e7	1	Other	Other
+77cc2566-d66c-47ca-a9cf-d490dc8eea18	1	James	Other
+77cc431e-8ee0-4c26-969c-3f7d2ead7962	1	Other	Other
+77cc4b39-0019-4c45-984b-f8784ba7425f	1	James	Other
+77cc4d93-2933-4ca5-a880-ac8d92f08aef	1	Other	Other
+77cc7fc1-0a85-4cfb-8273-a553b7da4ddf	1	Other	Other
+77cc8bdc-4b35-4867-b8a3-c8e85c27fea3	1	Other	Other
+77ccb569-d200-4a43-8c34-9a8b8bc78d0b	1	Other	Other
+77cccb76-94dc-4707-9487-5c0bf480da70	1	Other	Other
+77ccfa6d-27e4-4144-a0d5-fffe60ca8458	1	Other	Other
+77cdbc42-c033-4368-a85e-9bc7fe28c285	1	Other	Other
+77cdf666-d7c4-490a-838a-9ad3351a0957	1	Other	Other
+77ce3f61-841c-40fb-bf35-31e615636985	1	Other	Other
+77ced332-525c-4a57-89f7-3da21829f71f	1	\N	Other
+77cf0d89-3151-45ae-9fb7-dadce1ea436c	1	Other	Other
+77cf3432-0638-4b48-af7b-56fbe567036e	1	Other	Other
+77cf525e-c14d-4e22-b38b-d9c345e7a5d2	1	Other	Other
+77cf564f-feb6-40c7-811e-40d32e2f1e7d	1	Other	Other
+77cf572e-464b-4544-bea6-11875b2b7e90	1	Other	Other
+77cf6c7f-0a38-45e9-b55d-7ae2431dd445	1	Other	Other
+77cf911f-9e9c-4eee-9a2d-306b3d0755f5	1	Other	Other
+77cfa30b-4ee9-49ac-946d-d6906f4a1a9e	1	Other	Other
+77cfb782-b5d2-4d18-911c-8153f052efba	1	Other	Other
+77cfc31c-67fa-46e4-aacd-925a710721af	1	Other	Other
+77cff3f7-219e-460c-986a-a7c327d78198	1	Other	Other
+77d003a1-94b1-4d6d-b05d-b69bba0606d5	1	Other	Other
+77d0209f-940b-405d-8ede-970fdfcc4004	1	Other	Other
+77d04546-dae7-4578-83ac-2343d09cec18	1	Other	Other
+77d05dfd-6501-4d0f-a2b3-867ca112d274	1	Other	Other
+77d0691e-c0f5-460f-bfcf-f974050e0eec	1	Other	Other
+77d09752-5773-4259-ad3c-9e6573b7c702	1	Other	Other
+77d0ab3f-466e-4a7a-a531-6868b4bb1076	1	Other	Other
+77d0d529-e132-4858-9b6d-4ec50dd8a966	1	Other	Other
+77d10c73-65cb-4512-aa49-3ab32b3c7785	1	Other	Other
+77d133a6-3af9-4628-9be9-d7f2d4a25d45	1	Other	Other
+77d18aa0-1ec9-47a4-8ca9-9bb0307dff46	1	Other	Other
+77d1c9a6-d651-4a31-b154-8c034ced1d02	1	Other	Other
+77d1e3b5-8ac0-4f1a-921b-bd127351ccab	1	Other	Other
+77d1f51c-146a-4f3c-a78f-ec1fea432891	1	Other	Other
+77d1f821-0e16-42d8-8863-28de0fa38133	1	Other	Other
+77d1fdae-f21a-45bb-bb70-51bd96903f5b	1	Other	Other
+77d22fa4-bc2b-4b11-a586-c8ef6b94b053	1	Other	Other
+77d26551-840c-4b32-9171-700dc7b58691	1	Other	Other
+77d2f46e-4e5e-4d68-bce1-535d52011e37	1	\N	Other
+77d2f478-b2eb-4925-b18e-984b33a71f85	1	Other	Other
+77d31462-96fe-4a94-8301-5de08df34d4f	1	Other	Other
+77d352b2-643f-4320-9122-1151ee4881eb	1	Other	Other
+77d3e7b3-a5b9-4ab9-9f2d-910f4467580b	1	Other	Other
+77d3f45a-ba82-4beb-9f81-9e6b05175369	1	Other	Other
+77d439b3-b251-4a09-a4e2-1a20293175bd	1	Other	Other
+77d44259-f0e3-45b5-aea5-250ad80c65c2	1	Other	Other
+77d46502-bc8a-48eb-8cd8-94f86db19a06	1	Other	Other
+77d4875b-893c-4fc5-a26f-75867bf48d9e	1	Other	Other
+77d49975-6fae-4676-8700-4f14c6d51dfb	1	Other	Other
+77d49aa2-a001-4aef-9da0-d35659de327f	1	Other	Other
+77d49fd1-e584-4e1b-b6f5-9c049a3896a6	1	Other	Other
+77d4d1fd-4c91-4a9a-b316-0c6dfe5729f2	1	\N	Other
+77d59716-3bc2-45ff-af9f-41d5cd4c24e6	1	Other	Other
+77d6472c-dc51-42e1-b158-571a47335109	1	Other	Other
+77d67882-28e6-4d16-9b8d-07f8f8daed6e	1	Other	Other
+77d6a8eb-4e01-4170-bc7e-b190ad72ccd9	1	Other	Other
+77d6b2dc-d529-4264-9145-510df6dd9adf	1	Other	Other
+77d7852a-cba0-4e3d-aa31-05c35b1d7c5f	1	\N	Other
+77d7b024-3732-4418-94b6-9f1652aa3aea	1	Other	Other
+77d7ea71-f401-4914-91f0-1dd7749ad07f	1	Other	Other
+77d86165-16c3-4abe-99ba-36192ba519bf	1	Other	Other
+77d868c4-984c-4622-b748-bead7ad0391c	1	Other	Other
+77d89d7b-4dd8-4dcd-9ad3-6523d45678a1	1	Other	Other
+77d8ac76-813c-4319-87fd-0f466c959490	1	Other	Other
+77d8aea3-3296-4418-b3cc-f0b4c40471af	1	\N	Other
+77d90a2f-f907-4bbe-8280-27d46528f617	1	Other	Other
+77d92828-7571-4f3c-bf8c-40b7eab79146	1	Other	Other
+77d975e9-b7be-469e-85c2-cec7f3f34185	1	Other	Other
+77d976bb-48c2-41fe-9672-a81c857d607b	1	Other	Other
+77d97dcb-4ff1-4330-8e2a-3b07a417fdd9	1	Other	Other
+77d9c06d-33d7-415b-a923-558b0e606c21	1	Other	Other
+77d9c214-b41e-4366-acf4-64ba93d3a2e2	1	Other	Other
+77d9c57e-32c3-4ca4-a183-8343df401379	1	Other	Other
+77d9db0a-a075-4cea-b4fd-94f5ea96d2bd	1	Other	Other
+77d9fb07-b515-4c2f-8d38-ae830b5d6b68	1	Other	Other
+77da5147-c9f8-488c-96ff-c314a84954fc	1	\N	Other
+77dac716-ffb4-4428-8d7b-fc55e1950efa	1	Other	Other
+77dae596-e363-4738-b9a2-3de3fec518b7	1	Other	Other
+77db0796-ad7b-4d87-971f-944ce5155ae2	1	Other	Other
+77db13d2-f6d7-490f-9b13-7b207a1fa710	1	Other	Other
+77db29a4-1758-4ee7-8206-a8c323ec69e0	1	Other	Other
+77db447f-8c76-4321-a070-715c1c87823c	1	Other	Other
+77db82e6-fcda-4603-9b99-8440a4fb4017	1	Other	Other
+77dbf640-bd36-4589-a07e-368aec01149f	1	Other	Other
+77dc20ca-453e-43b2-a790-1f2155f8ba8d	1	Other	Other
+77dc6f0d-8ac2-410b-9080-6a4d6e546fb8	1	Other	Other
+77dcb609-640f-47b0-ab0f-a4be6772b860	1	Other	Other
+77dcf419-7660-45b0-8d24-7c3db94dcc6b	1	Other	Other
+77dd3d44-b869-4162-a299-5f2c585f3533	1	Other	Other
+77dd712a-81c9-4cd8-90af-c65ea7cb7364	1	Other	Other
+77dd8c73-4165-4b73-90d4-7f944dc0bd6b	1	\N	Other
+77ddc35a-6be6-4ade-b079-da52a78a9f65	1	Other	Other
+77ddccac-4866-4ad1-a4fd-3f45889e4ee7	1	Other	Other
+77dddc36-f977-4f93-8ed4-470569f38df0	1	Other	Other
+77ddee81-8c7d-464f-bd77-9f5e2c73df0c	1	Other	Other
+77ddf5e9-4857-4b29-b4e7-54f3abd064cb	1	Other	Other
+77de0bbb-cc17-4bcd-849a-83e87ab027e5	1	Other	Other
+77df199d-c269-43c7-be20-0da47b11c694	1	Other	Other
+77df2b96-d6b6-4a24-b79c-8078e80e04d9	1	Other	Other
+77df374f-9eb1-4a80-bd98-18532dc4e6ac	1	Other	Other
+77df5de7-c0ea-4edc-9f06-f5878782ee83	1	Other	Other
+77df661f-2b25-4e07-b52b-a2e810ae1b06	1	Other	Other
+77df7571-d3b9-4469-8436-63cd07b824f4	1	Other	Other
+77df76d2-517c-4a66-bf22-c4e7c9e5fe85	1	Other	Other
+77df8ee7-f673-45e3-8c24-d80bad1b2a7d	1	Other	Other
+77dfc361-1dc8-4b1f-ad5f-22b4e011bb1b	1	Other	Other
+77dfc590-5d3a-4d06-b9fe-894c4d3084e6	1	Other	Other
+77dfcd00-bd00-4d58-b783-a8333da83b05	1	\N	Other
+77e00e3a-644e-46ff-88fa-222c07bbf745	1	Other	Other
+77e01ca5-f5ea-42c5-8323-ba101bf1aebc	1	Other	Other
+77e04720-2268-42fe-b6e9-56a21c85cd07	1	Other	Other
+77e08f00-e009-4239-b181-799873985210	1	Other	Other
+77e09cf1-5551-4ed7-8163-03963032f439	1	Other	Other
+77e0b232-159f-4c64-bc4d-61910edb09c5	1	Other	Other
+77e0cce2-193f-43e0-b9f4-3d8a5f0a09e8	1	Other	Other
+77e0df74-4322-4acb-b965-de4608b7c832	1	Other	Other
+77e0e8aa-170e-11e8-b8c8-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+77e0f26d-9d08-4ee0-8afa-77ef9d559834	1	Other	Other
+77e13cac-6e8c-4e89-972f-2f8bc61221c2	1	Other	Other
+77e152e9-b577-4664-8ac4-9818df84965c	1	Other	Other
+77e17fc9-5db2-4022-8819-e63e3c65f6b7	1	Other	Other
+77e19900-4fee-44b7-abde-0bfe3d19e314	1	Other	Other
+77e1d9fc-af18-4fc8-8195-7d8f7e9fad05	1	Other	Other
+77e22c92-a3bd-4d5d-8e8c-e749bf220092	1	Other	Other
+77e23296-4505-4540-ba5b-1a41bf843847	1	Other	Other
+77e23915-1801-488f-9917-08cab1b840de	1	Other	Other
+77e26428-2f98-4169-891e-d156f00674ea	1	\N	Other
+77e27c9e-62d2-4998-a8f9-1a2ee02f4c57	1	Other	Other
+77e2ab8f-8842-4c99-9150-74f79d812239	1	Other	Other
+77e2e5a8-8011-483e-b8e4-be2c7aa0af8b	1	Other	Other
+77e31fa6-4ad8-4a9c-8e43-200daff2f78e	1	\N	Other
+77e37a26-90ef-44d3-ae64-673155903755	1	Other	Other
+77e39617-a8fe-4e57-9bc6-e49f64ccb76f	1	Other	Other
+77e3e11a-ae2f-42c0-9b00-5afcc39338cb	1	Other	Other
+77e40815-0fe8-4998-b6cb-89f5bf2b43e0	1	Other	Other
+77e40a1f-84f0-4662-9586-8650baab5160	1	Other	Other
+77e432e0-81d7-4421-a805-cd083fff165e	1	Other	Other
+77e44a02-7a86-46f8-8965-673367c1bcba	1	Other	Other
+77e44a13-a098-4af1-93c8-90b2a8e5b9b6	1	Other	Other
+77e45d9a-2039-413e-9822-175293b0a7e7	1	Other	Other
+77e4a379-de36-42c2-ac5a-cadd7aae9817	1	Other	Other
+77e4be54-44a7-4bf0-9aab-4ae5e95ba4bb	1	Other	Other
+77e54fdb-021b-4978-9892-6af86cc5cf01	1	Other	Other
+77e571df-df89-404a-8ad7-1b4e756cf817	1	Other	Other
+77e5a05f-ac43-464c-9862-d93823e109e6	1	Other	Other
+77e5c8d3-f45b-44af-a1f4-cb44c576eac7	1	Other	Other
+77e61e29-0eaa-48e6-9c9f-056668ea9881	1	Other	Other
+77e6839c-5ee7-4e93-ad4f-010b68370dae	1	Other	Other
+77e68c5b-35ac-4b70-bc38-79e569ea17b3	1	Other	Other
+77e6a5c4-bb23-4f57-b9fa-cbe3dcf24374	1	Other	Other
+77e6c128-b34b-4040-8dfb-b9b1ff12d9bc	1	Other	Other
+77e6e7a1-d9aa-4fab-bf52-461f51cacb11	1	Other	Other
+77e6f37b-8898-47cb-b7d0-dd3120cdbf7b	1	Other	Other
+77e72cc7-542a-4f9d-a76f-2cd85ef04f33	1	Other	Other
+77e73612-4baf-4327-9ea5-c38847ad88c7	1	Other	Other
+77e7539e-5ce3-4d3a-8bdb-c1136e7aa158	1	James	Other
+77e79bb5-9735-494a-a447-069dc889aa01	1	Other	Other
+77e7c3bc-5475-481b-af64-1ed834beec16	1	Other	Other
+77e7e5d5-f217-4afa-8711-717d83736845	1	Other	Other
+77e7fb44-2fdb-4143-88f8-81c9085c8bec	1	Other	Other
+77e85000-f2aa-4a3c-aeb1-7d2a6a640839	1	Other	Other
+77e8749a-b0bb-49dc-a4f7-efa21e311bb3	1	Other	Other
+77e89115-0eff-4a7e-8ac6-a0eca4f21d67	1	Other	Other
+77e918af-fa08-41a0-8fc9-245f83949553	1	Other	Other
+77e99e39-321c-43cb-b8b5-b83e59863409	1	Other	Other
+77e9a6a2-79db-47cb-85bf-0dcc67bef3fd	1	Other	Other
+77e9c312-3d78-4e57-98c0-d83898c3ab9b	1	Other	Other
+77e9c42e-24da-4e06-806b-2276da63a872	1	Other	Other
+77e9e804-be4e-4798-a821-36d0a4d12189	1	Other	Other
+77ea189b-8426-4d17-8a1e-c31681b5dc36	1	Other	Other
+77ea4909-8fe3-40a9-9ce5-2a4e1865eeb1	1	Other	Other
+77eabf16-adab-4d8f-9cb9-de2887827841	1	Other	Other
+77ead37b-d86b-4a6a-ab6e-5d365148c6fd	1	Other	Other
+77eb6d93-27bd-4b64-a94c-189c97fade64	1	Other	Other
+77eba76f-9016-4f82-817d-985d3fe15061	1	Other	Other
+77ec0702-55d7-43d1-a988-551325621a2a	1	Other	Other
+77ec1925-ced9-46b2-8426-862f691b0db7	1	Other	Other
+77eca646-5a00-4fcc-97c2-40b37ebc49cb	1	Other	Other
+77eca746-1e43-421e-b43a-7bbda57f8a5a	1	Other	Other
+77ecda47-57f1-48e6-97d1-12f1e68755df	1	Other	Other
+77ece529-12bb-444a-aec7-fb055aa414ef	1	Other	Other
+77ed205b-a700-4769-b969-9422fd201017	1	Other	Other
+77ed370f-d464-4a34-90a4-4bf3eb9a1436	1	\N	Other
+77ed4a03-b0d2-41ab-98e6-faf50cc8e32d	1	Other	Other
+77ed4e06-3317-4f0e-bf9e-97daf2617be4	1	Other	Other
+77ed62e5-b034-49f0-8a6d-f1f694b40dd4	1	Other	Other
+77ed8b34-b6f5-46ba-bd01-5e284ca0bd43	1	Other	Other
+77ed8bf3-de49-44db-bddd-fe43ef08964d	1	Other	Other
+77eda75f-e2bf-45df-9151-75d2b7579269	1	Other	Other
+77edac63-983d-41fe-bd29-40aac16395bb	1	Other	Other
+77edebdc-311a-4dd4-bbfe-2f26018559ee	1	Other	Other
+77ee6bfe-9576-418a-bfe5-c1d9742be4fd	1	Other	Other
+77eeb076-9b64-4302-9e49-c12d7c19919c	1	Other	Other
+77eec12a-111f-460c-8750-2bcb3cfc23f4	1	Other	Other
+77ef07c9-5899-4cb5-9804-d44b5af9a048	1	Other	Other
+77ef15f4-fcf3-4333-8c3b-a5e515e1396f	1	Other	Other
+77ef2e08-8870-45c3-ab34-1e6f0b39f371	1	Other	Other
+77ef2f22-220a-47fd-9a81-066107abecb5	1	Other	Other
+77ef3748-e9d9-416e-b1f7-0586e314ae29	1	Other	Other
+77ef418d-9bb5-4279-ac9e-ea336f936ba0	1	Other	Other
+77ef7dbd-7204-4e33-881a-33631bfa1df2	1	Other	Other
+77ef8814-c89d-47b8-9a3a-a4207dad9aa0	1	Other	Other
+77efb3bd-8036-422a-9dfa-025ed3feccb3	1	Other	Other
+77efdf96-b591-415e-9200-64a6d40210ce	1	Other	Other
+77f013d1-6531-4400-aa79-f85f679b7de2	1	Other	Other
+77f0508f-7db7-4213-9bca-0ec450e88a29	1	Other	Other
+77f067d9-cc06-4432-b097-f623604bd1ce	1	Other	Other
+77f09653-0301-4996-8ef8-05ea80539d5d	1	Other	Other
+77f0ed6b-3b8f-4213-952d-2ec5e8ceefb5	1	\N	Other
+77f110fc-d89f-443a-a434-b98f6ea2f631	1	Other	Other
+77f112ae-021a-49ee-aa0e-611dc2125fd2	1	Other	Other
+77f12b05-91c5-46ee-98a7-83721feb3453	1	Other	Other
+77f12fb8-1cec-4e07-8cca-12ec66f74f26	1	Other	Other
+77f13a54-1199-4fca-bb2f-198156b08a17	1	Other	Other
+77f14c70-a16c-401f-b576-d8a974e1da9a	1	Other	Other
+77f1565e-cc12-4260-81ee-4e4c73f56f83	1	Other	Other
+77f17066-ea12-4302-8466-85d944628f64	1	Other	Other
+77f194e1-5285-4285-9789-41f7d2706d46	1	Other	Other
+77f1d5f2-4df6-43fb-8537-130241faaa97	1	Other	Other
+77f219f5-00de-4606-a9b0-4f1da662e119	1	Other	Other
+77f21fad-7673-4259-8c25-2637cc86e623	1	Other	Other
+77f22a65-82bc-4fde-abed-29adb060507d	1	\N	Other
+77f250f5-fb66-40df-bf5e-68ed6890b06e	1	Other	Other
+77f25fff-c823-46af-a293-23a8157ca2a5	1	Other	Other
+77f28d5b-bc11-44d4-80e0-5fa55c387bcd	1	Other	Other
+77f28e3b-5167-4c11-b9a8-a9bc88a0ca7a	1	Other	Other
+77f2ba55-31d8-4221-ac4b-a5b4dc16bbea	1	Other	Other
+77f2c540-5211-497e-b794-9e0e19f9ae75	1	Other	Other
+77f2e9be-ded7-4563-9fc7-9503c2a51bd4	1	Other	Other
+77f3328c-6166-48ed-95ed-905428760abe	1	\N	Other
+77f33d0f-2af8-4d73-ab99-0f9b519a421c	1	Other	Other
+77f3a49e-0526-4698-82aa-1ffed62624e7	1	Other	Other
+77f3b319-1ebf-4b73-8e8a-534ffc6721db	1	Other	Other
+77f3ffcf-5a6b-4d3d-80e8-586e65d11234	1	Other	Other
+77f4650a-9bbb-4600-bf66-f896dae807ae	1	Other	Other
+77f57f38-1fa6-46b8-a096-e3c37b0e5e5f	1	Other	Other
+77f5b9f5-9e41-41db-a167-fe212a6f8a17	1	Other	Other
+77f5bef8-0cb8-4f35-bd8d-d021bc5af23d	1	Other	Other
+77f64b86-c4a9-444f-af26-d4c24f2b8c9f	1	Other	Other
+77f6bf67-2baa-4015-90b6-bf7a84f686a6	1	Other	Other
+77f72bdc-51bf-40de-92c9-86aa6a20e52f	1	Other	Other
+77f74624-5979-4b76-9949-3df703a07d0c	1	Other	Other
+77f75106-12f8-481b-8398-893f46697473	1	Other	Other
+77f75eab-8f35-4f63-b8fb-36da0466b669	1	Other	Other
+77f7b040-73ef-4bcc-9833-0670b8d9983f	1	Other	Other
+77f7b6d9-74a6-4c9a-9beb-4615b979fadb	1	Other	Other
+77f7cb23-95cc-48ff-92e6-840323c4f13f	1	Other	Other
+77f7d54d-ecd4-46c4-9535-82ff27fe1773	1	Other	Other
+77f7f889-d3cf-49a2-966e-6a786352f118	1	Other	Other
+77f8b77b-632d-40a0-b574-788cc0a16043	1	Other	Other
+77f8cf25-ba79-4e08-b13b-0630cddb83e9	1	Other	Other
+77f92c07-b25d-43b1-ae9e-d692d556d333	1	James	Other
+77f97154-40b0-4d34-a7b5-c451f44000ca	1	Other	Other
+77fad715-04ee-437c-b69e-27844adb0b09	1	Other	Other
+77fb07b9-1d96-4b37-9cb9-0385ea040237	1	Other	Other
+77fb0f3e-5ddb-4c40-a78d-7fd676638f47	1	Other	Other
+77fb3262-cf3e-4b77-ae1d-725bd87b4116	1	Other	Other
+77fb62d3-2953-46db-a852-8880bdfbe4b7	1	Other	Other
+77fce21f-19e0-4f4c-99fc-bbcc5708051b	1	Other	Other
+77fd124a-2dbf-4f32-b463-6d09d4f55fa7	1	Other	Other
+77fd25c3-b925-4467-9faf-5f4e2e160928	1	Other	Other
+77fdc19d-6f46-4bdf-8c8d-bca88dc05cd1	1	Other	Other
+77fdc774-9021-4811-a307-df03d8ba6545	1	Other	Other
+77fdd2c0-0b5c-4cba-a948-2871f2ea29b4	1	Other	Other
+77fde379-444d-4c92-9663-8af8b54a5afe	1	Other	Other
+77fde41b-2410-45c8-8b77-7df1c3b9cb5f	1	Other	Other
+77fdfa0c-09de-45d2-bcd8-3329f43013c6	1	Other	Other
+77fe25aa-0f44-4fb2-9810-ba065d0eae1b	1	Other	Other
+77fe2ca4-e83d-46ff-9e93-8dea44797c8e	1	James	Other
+77fe4f02-9f31-45d9-85d1-b9ee8a736fdf	1	Other	Other
+77fe6175-7479-466a-9fa7-4941b643bc69	1	Other	Other
+77fe6fc0-9c4a-473e-aa7d-f3b69e1db30c	1	Other	Other
+77fe7445-4328-4fb7-9b74-ba42b76d0d88	1	Other	Other
+77fef37e-bfb5-40d3-9a04-0d4e299fc416	1	\N	Other
+77ff1508-7f21-4153-bcb7-c7f0f4b940f6	1	Other	Other
+77ff79c8-5020-423b-96c0-85e63f25331b	1	Other	Other
+77ff945b-bcac-4354-a385-38a6f59fa9ea	1	Other	Other
+77ffb8e4-01ae-4bea-a912-c635f5cd4081	1	Other	Other
+77ffd217-a0b9-485f-bb4a-fbe4c7054cfd	1	Other	Other
+78005f38-ba88-4848-b6be-29e4a72fbd98	1	Other	Other
+7800644d-1bd5-4b9b-a421-16973bf62664	1	Other	Other
+7800a459-a75d-4866-8004-588a3689d7b0	1	Other	Other
+7800b4ea-c0e8-4ae5-862c-55e325ea08c2	1	Other	Other
+7800d73c-ee3f-4a3f-82b0-0cbec0cf8790	1	Other	Other
+7800fc0c-9cd7-4986-ab5f-1f96a338e891	1	Other	Other
+78016c5d-6ac4-4620-b5ed-d7871ec4bcc9	1	Other	Other
+78017361-dcc7-4921-89e3-ec1f8c439321	1	\N	Other
+78018797-23da-4f8b-bfb7-1234b9ba5c7e	1	Other	Other
+7801d9fe-bb13-4bae-8436-e26d6113a574	1	Other	Other
+7801fbdc-e40e-409f-8b09-65d87ad1f3bd	1	Other	Other
+78021e1d-f956-4498-98bd-42f1688c896a	1	Other	Other
+78022937-0154-4b01-93aa-eeb359ad3faf	1	Other	Other
+78034746-f762-461d-bf45-5e54c27ee993	1	Other	Other
+78036a6c-2363-49e0-ad19-fea1946647d2	1	Other	Other
+78038c14-e070-4596-8b2c-556385d00700	1	Other	Other
+7803bd8a-bd04-48cc-9db7-9141aebab127	1	Other	Other
+7803e0ea-d7da-4aa3-be0f-a62e29b514b0	1	Other	Other
+7803e800-f240-41d1-8ffe-65af58630e23	1	Other	Other
+78042014-d1b2-4313-8635-799056fd289c	1	Other	Other
+78042ba4-e278-49ec-8210-19c4ff10c11f	1	Other	Other
+7804b1bc-b7f7-4464-9000-186c1c3134f7	1	Other	Other
+7804b706-e76d-4a16-9fe3-d24c9a1df0ee	1	Other	Other
+7804d4c7-a513-4096-a87a-15f214edca81	1	Other	Other
+7804dbbb-950f-4c75-8433-e46372e539f4	1	Other	Other
+78051c23-95b7-4a58-ac1b-3412db00bb4a	1	Other	Other
+780540ba-ab9e-40df-9c8c-82246374a025	1	Other	Other
+78063194-e016-4d10-8311-a98cd1ae7061	1	\N	Other
+7806781a-e60e-489e-8fc6-d312dfce1e0e	1	Other	Other
+7806e9d4-bcc1-415c-8989-ea943bbe8409	1	Other	Other
+78070a0e-d24a-47a9-bb6c-5821e60225be	1	\N	Other
+780728ef-773a-465a-842c-33e674fab014	1	Other	Other
+7807311d-ae7d-453f-9a81-f802a631544d	1	\N	Other
+780733f8-4edf-4de6-bc1b-341c86d21090	1	Other	Other
+78073993-524a-452f-a36e-2de73d7df8c8	1	Other	Other
+780772a1-3bf9-4d34-844e-428b10310b7e	1	Other	Other
+780777a4-89dc-4549-8f83-d79f7b89b867	1	Other	Other
+7807a0a3-7553-4ec0-aff2-a02bdd3b3c4c	1	Other	Other
+7807b13f-6443-4fd9-9ea4-2309228e62f1	1	Other	Other
+7807d37b-5ca8-4da1-b0f8-7385b72e60e7	1	Other	Other
+78082cce-26be-456d-b6ce-57b29a18858c	1	Other	Other
+78083eef-b008-4a6f-986c-11d2d65a8ef6	1	Other	Other
+78086a7b-1358-43a1-9cf5-509c7b8bebe0	1	Other	Other
+7808dd65-5323-44c4-9b04-aec51daf9ce7	1	Other	Other
+7808eea0-cfc0-46f3-b9d0-a4ecd498f7d5	1	\N	Other
+7809752e-b690-47d3-9cbc-1eb867458988	1	Other	Other
+7809977e-1286-466b-be57-ac2828a095d7	1	Other	Other
+7809b9c7-91ba-4f84-b6a8-848be633c4c5	1	Other	Other
+7809f98f-a39f-4fba-9f79-eb4634a42a5a	1	Other	Other
+780a3270-6ddc-455a-b100-325320159fe0	1	Other	Other
+780a640b-2e32-40ac-87e0-675fdf3d70ba	1	Other	Other
+780a7303-0116-4f20-ad25-c3fc4d138378	1	Other	Other
+780a9359-9d5b-4380-95cf-bceca39705c5	1	Other	Other
+780a9504-cd82-4ea1-9326-858639c039b7	1	Other	Other
+780aebdd-693f-48ea-b434-a4e7594a2801	1	Other	Other
+780af828-5e00-4398-87db-563bbd494100	1	Other	Other
+780ba3f5-d911-48b2-8d92-d3525b521290	1	Other	Other
+780bdb68-9f74-47ef-af94-30ed123446e8	1	Other	Other
+780c0e15-596e-458b-bd38-4c45924bd7e0	1	Other	Other
+780c10be-90b1-438a-814a-7fd76d36f54e	1	Other	Other
+780c2269-54c9-4e41-b489-7df19d632706	1	Other	Other
+780c492c-5a36-4c13-be39-faa48cb2d74f	1	Other	Other
+780c84e1-7a5a-4523-8858-abf85dfa7cd6	1	\N	Other
+780caad1-84e7-4bf7-a4fe-f7076afdae50	1	Other	Other
+780cec16-6572-479a-9759-ea7498687ffd	1	Other	Other
+780d3992-0b22-4f5d-a87b-ac987fad68f6	1	Other	Other
+780d3d1f-1257-44db-9a00-24e674dc6f12	1	Other	Other
+780d6b49-419d-4f64-bb87-02011da4e42e	1	Other	Other
+780d7a08-e45f-40ad-8b43-605758a743bb	1	Other	Other
+780e0800-961e-4d6d-9e45-8d3250bdc885	1	Other	Other
+780e4fd4-829b-4f84-9e03-a74b1557ef97	1	Other	Other
+780e8f1e-7f75-4578-933f-d4cf6555547c	1	Other	Other
+780ec0c2-700c-4cae-a635-3f1db5b25602	1	Other	Other
+780ed9ae-f4e2-40f6-8909-9adc3d858fd9	1	Other	Other
+780f7a57-f1be-4c73-ac36-8a1eedc0aa50	1	James	Other
+780fa551-9a52-4ca4-97b3-a9e24d471573	1	Other	Other
+780fd2e0-d8d5-48c5-a886-84adf67da9ed	1	Other	Other
+780fdac3-bc33-4146-8ec0-98562215dbed	1	Other	Other
+78100222-cc05-4414-b18d-efbfaf315b66	1	Other	Other
+781006e4-c497-419a-bfed-2d62433f88c6	1	Other	Other
+78101299-1cb8-4879-9a4e-799b862229a2	1	Other	Other
+78102dac-e412-45fd-a392-492a5098ae93	1	Other	Other
+78103abc-0766-49b2-af5a-340877e8fbe7	1	Other	Other
+7810463a-99bb-4958-9b38-7500dc8e7e73	1	Other	Other
+78109959-7354-4013-a02d-b7346d98fd08	1	Other	Other
+7810b8af-5d7a-4724-86bc-7c3ce9c9776d	1	Other	Other
+781110ae-38f6-49ed-bb66-9b3c2d16a6c1	1	Other	Other
+781122dd-dcf3-429b-8525-22758a60a6fe	1	Other	Other
+78113bc6-c07c-431f-be13-f6871ac31696	1	Other	Other
+78114eee-9268-48b3-a85f-7839b441933a	1	Other	Other
+7811837e-ebc7-47a1-b487-f250a6a80610	1	Other	Other
+7811a473-3c08-47b2-b811-da4d444e2b0b	1	Other	Other
+7811f6d7-a060-4592-8b00-6eb56f44fb72	1	Other	Other
+78120274-6d3f-4e32-a8d5-5b2731f636f3	1	Other	Other
+78120bdb-9d71-422f-9240-0a21c016cf97	1	\N	Other
+78120e3e-12a0-4ce4-b06e-74789f7f11d0	1	Other	Other
+78132235-a671-4f4d-b776-f5e23e1fab52	1	Other	Other
+7813da31-99c8-4db6-8a72-db3b9b8cbcef	1	Other	Other
+7813e34a-62e6-49b6-80b0-9e786b3e1251	1	Other	Other
+7813f4fb-5a21-4ea1-902c-a91d78ba751f	1	Other	Other
+7813ff6d-9b2d-47a1-a53d-4ccf0fd89ce2	1	Other	Other
+78140f95-bb55-4b92-9314-de2277a4067c	1	Other	Other
+78141d81-5938-4042-9499-7e985b68a9c4	1	Other	Other
+78142b9e-cfd0-4355-bc49-2073da280ea0	1	Other	Other
+781459c5-e131-425d-a3f6-dc166164eca8	1	Other	Other
+78145e97-e22f-4f0c-8d2e-04349cb1b8d6	1	Other	Other
+7814c420-242f-4694-a56a-c93276ecfb97	1	Other	Other
+7815b605-4b65-441c-bf56-b3d180fb20f9	1	Other	Other
+7815f853-aa12-4075-83a5-c130ace038c0	1	Other	Other
+78164153-8a0c-4d5e-b1a3-6920542c6a9c	1	Other	Other
+7816668a-7951-4f5e-a4fd-fc58934b83e5	1	Other	Other
+7816b20d-7fd8-4c7f-97d4-49478f85bd68	1	Other	Other
+7816c718-563f-46b9-bd5a-96c6a26ef5c7	1	Other	Other
+7816d4f9-f6a6-4619-98a7-b12d472b603f	1	\N	Other
+7816e352-e1ea-4d1d-96a6-ad709aa95db8	1	Other	Other
+781716ae-6027-4311-a166-c6982c61b6c1	1	Other	Other
+781730a9-9286-4ff0-82dc-54932a032457	1	Other	Other
+78173613-c68d-4412-917c-6e3484193278	1	Other	Other
+78178af0-6dcb-46e7-b200-6d5921794e08	1	Other	Other
+7817a147-f368-453a-b16e-f55152e568eb	1	Other	Other
+7817b9ae-e3cc-4bcf-951d-a4a208b1803b	1	Other	Other
+7817da5c-6725-40d2-a0f9-567f65d31c3e	1	Other	Other
+7817f6ab-1347-48c9-9ba7-f258360f630f	1	Other	Other
+7817f811-810d-4ca6-a722-359d41e54936	1	Other	Other
+7817fa1f-270d-41d0-830c-93719cc87657	1	Other	Other
+7817fa88-57be-4363-9b03-6dcba4dbffae	1	Other	Other
+78183da9-d34d-4fbb-a386-b3dcb73b3b2b	1	Other	Other
+78184d9c-ea85-4bc2-aad4-5e45596e992b	1	Other	Other
+78188be9-19ed-4190-b6ff-0365dcb566d8	1	Other	Other
+7818946f-e0e8-4268-85d6-48379e8ad46a	1	Other	Other
+78189985-6c00-4ad3-8350-2b48e291c166	1	Other	Other
+7818f4f6-2306-4004-8e1f-bbe2635cdf35	1	Other	Other
+781911f2-1ca0-4391-a2bc-09bb3f6bd509	1	Other	Other
+78194dea-6ecd-44bd-81ae-c595372f8600	1	Other	Other
+781954a9-5e57-4e54-8828-1f226eefd564	1	Other	Other
+78195c8a-ce66-48ce-9483-99d86ec28a3c	1	Other	Other
+7819bb38-e06b-40ba-ada5-33689fdca1ca	1	Other	Other
+7819c0f9-e39e-49f2-a9b0-103f7dd93e24	1	Other	Other
+781a4d18-3bf4-45ea-894f-45317c832580	1	Other	Other
+781a5793-8755-453a-b6bf-f42bce110d57	1	Other	Other
+781ae898-be38-459c-8990-7c2b11f5d6fd	1	Other	Other
+781b0a74-955b-423a-bcf8-166412c3af86	1	Other	Other
+781b3f56-8db5-42bf-b380-74477229d60a	1	Other	Other
+781b6eb7-ec7a-436b-9dbe-cc87cd939033	1	Other	Other
+781b7c8a-fc74-4d48-9cbd-060ef31c0c4c	1	Other	Other
+781bd2f2-d6ab-4301-99e7-13b38f4cea59	1	\N	Other
+781bff50-973d-48a9-b451-62432fcded70	1	Other	Other
+781c1bd7-3e99-4b1b-b2c4-3baca9391c58	1	Other	Other
+781c1f0f-2b39-4732-8711-30a08889576a	1	Other	Other
+781c71ec-a10b-49e6-8113-aca9bcdabc47	1	Other	Other
+781c882c-80b4-400d-a71f-c5bda4ecc2c2	1	Other	Other
+781cac2b-11e6-4bb2-aa7a-8e82a20ba6cf	1	Other	Other
+781cbb29-8cb0-4ca3-ad79-fad138c9e245	1	Other	Other
+781cf78a-3f35-4221-b5c6-0474a8d80043	1	Other	Other
+781d03f8-273c-437b-a8ab-e092b3bdafd9	1	Other	Other
+781d0647-17b6-448f-93dd-7eaf0b0c2762	1	Other	Other
+781d1c00-6253-48d3-8e96-f1ecb5fbe9f9	1	Other	Other
+781d2a79-7d52-4b7f-894e-bd50b01f5450	1	Other	Other
+781d30ad-1c80-4cfd-9062-178989c16aaa	1	Other	Other
+781d315c-6544-4678-b67a-59fde4d2a40a	1	Other	Other
+781d79f2-1d1f-482b-acc6-b69ef40ed4bc	1	Other	Other
+781d964d-7acd-4a78-b5b7-0c09e585b633	1	Other	Other
+781da0fb-f559-41d7-9682-1321308e2ec8	1	Other	Other
+781da735-28a3-4dab-95df-2480dda1aea5	1	Other	Other
+781e2038-3f8a-4752-bee3-bb434272cae0	1	\N	Other
+781e3928-66f1-4ab6-8ed0-85f63d0cbbae	1	Other	Other
+781eb7a7-be4f-4fa8-95cb-db20c36ce2fb	1	Other	Other
+781ef72a-26f0-400a-ba1b-14aea6abcfff	1	Other	Other
+781ef8af-c3e4-4566-b005-1f4f498cee7a	1	Other	Other
+781f55fa-9e1b-4deb-abd1-1a7b960185ce	1	Other	Other
+781f7b5d-ffcc-48cb-8dbb-dec4be0041ac	1	Other	Other
+781f8334-9d2e-4b8d-8aba-487a00ea9471	1	Other	Other
+781fc55f-69df-4c19-a177-7a81c68f70c2	1	Other	Other
+781fc608-6f95-45c1-a672-3e87e8f9435b	1	Other	Other
+781fd22b-ecf9-4efd-b54b-ef76f374d980	1	Other	Other
+781fe359-c11c-468f-b824-39c6ade05506	1	Other	Other
+781fef73-999d-4ff8-bbef-2ca19a82f06d	1	Other	Other
+782030a6-868c-4127-8a25-f40000b01bbb	1	Other	Other
+78208b3f-80f8-458f-8699-94902826cb16	1	Other	Other
+78209d44-c431-46fd-8a9f-d0a8405c1cf7	1	Other	Other
+7820b2bb-c820-44f5-a501-c0ff7aa8b06e	1	Other	Other
+7820bb7a-0353-4e6c-88fa-c507d47c1bbe	1	Other	Other
+7820c0f7-75f3-48e5-9082-c03529cf821f	1	\N	Other
+7820f7a8-233c-11e8-ada0-fa163e8624cc	1	\N	Other
+7820fa70-ee4f-4622-8589-fed41aded5e1	1	Other	Other
+78212820-5865-4cfc-9e7c-4c0759fa613c	1	Other	Other
+78214ba2-c3eb-4563-a481-bcb3d775de70	1	Other	Other
+782162c4-a62a-4d42-aa0f-00f48886db5f	1	Other	Other
+7821cd7a-373d-439b-ad30-fab12a172709	1	Other	Other
+7821d3c9-cf73-432b-8258-82317aa1b613	1	Other	Other
+7821f2ec-77fe-4f63-9dd1-0181640cc727	1	Other	Other
+7822382f-6031-4a25-bc75-cdf69ad62213	1	Other	Other
+782248ef-7f94-453d-bd01-7f0f80ddbc54	1	\N	Other
+78225c10-af53-4133-abf5-b71a9c429188	1	Other	Other
+7822a369-4e0f-47a1-9cb2-ebd52200683b	1	Other	Other
+7822bb1f-f41b-4647-8bcb-015375379d9f	1	Other	Other
+7822bfdd-fd23-424f-aca4-cc814bcb23c7	1	Other	Other
+7822f482-a9b3-4ed0-9871-ae65fb9579ca	1	Other	Other
+782324f8-8a71-4e8e-b5e5-94fef61e9b50	1	Other	Other
+782346bb-6b99-4b3b-80f7-9a82da08cb0f	1	Other	Other
+78236d44-1d62-407b-905c-6701ff3256cb	1	Other	Other
+78243492-cd14-44c6-ad88-f15b229284c2	1	Other	Other
+78243792-ef6f-499c-a944-3107ccdf16e0	1	Other	Other
+78244097-459d-48a8-84cd-e40122dcb2ba	1	Other	Other
+78244179-6580-4068-9abf-c79b38a326aa	1	Other	Other
+7824467e-6a09-470e-a9fa-fc444bb16e2e	1	Other	Other
+7824d299-dae5-4bc7-a609-f954c65adb7d	1	Other	Other
+7824e086-ab57-432f-95dc-d03b751c66aa	1	Other	Other
+7825009e-8f57-482d-9ebb-606dbee9d637	1	Other	Other
+78251d42-46d8-4d65-afb5-d1b5461eb850	1	Other	Other
+7825fb7c-a82e-4fc3-9121-50a0f60e5ec1	1	Other	Other
+7825fdec-1b67-4793-8c26-5c00f000729a	1	Other	Other
+78260de9-6b1d-4dfe-864f-0d9bbb9d98af	1	Other	Other
+78260f40-b390-4ff6-94a2-d26eaf1e0a9a	1	Other	Other
+78262f1f-f297-42a0-b2c5-cc336f29602e	1	Other	Other
+78268418-8a5f-4e03-bfb0-bbd1d3d81a9c	1	Other	Other
+7826c602-7348-463e-bae7-b3921a54054f	1	Other	Other
+78271919-2bf8-470a-8263-5f767d0d18a8	1	Other	Other
+7827238b-2cce-480e-afa3-f2e636b157f5	1	Other	Other
+782731b8-71ec-465d-ab4c-422bfff6220f	1	Other	Other
+7827c90d-9db1-4b76-a663-ef58bdb6a329	1	Other	Other
+7827dd6a-7a96-405d-8a57-96374c3ac53e	1	Other	Other
+78282e43-bf22-4a12-80f0-bf0e0fa7e118	1	Other	Other
+78287aa4-aaee-4538-a573-aac7629b5d3a	1	Other	Other
+78288251-eeff-4dd3-9a2d-0b879caf725e	1	Other	Other
+782892b9-dbcf-4087-b1cd-e4151d377417	1	Other	Other
+7828eb72-854d-4aef-898c-8d1a15e59795	1	Other	Other
+78292554-547c-49c1-934f-7373bf568dd7	1	Other	Other
+78296ce9-8cf8-45b4-9b97-091949affe00	1	Other	Other
+78299eab-d507-446e-8f07-c8eadb0699bb	1	Other	Other
+782a05e4-a2d5-45dc-a04f-c3dcc854fd5d	1	Other	Other
+782a0ec8-9079-4b49-9579-05f9103204ed	1	Other	Other
+782a2eb3-a5ff-4783-9b61-163667bfc6fc	1	\N	Other
+782a3bcd-a87a-45f5-bad4-0565632aa267	1	Other	Other
+782a5850-662f-47cb-afcb-ef37d4b7e8fa	1	\N	Other
+782a9624-9565-485b-acbd-b152f83750db	1	Other	Other
+782a9b50-6f1f-4e62-b406-b133ad1eec7c	1	Other	Other
+782a9bb8-c9b0-4f78-9fd1-bde3dac7aa2a	1	Other	Other
+782ad6b3-7f7e-4578-9539-6c5f348f78ca	1	Other	Other
+782af577-5556-4595-b3d4-eb609be9a111	1	Other	Other
+782b0361-9d68-4dfb-b27d-4a8f8ad5a6be	1	Other	Other
+782b16b0-c331-4ce5-9cc2-be5f4c351a8d	1	Other	Other
+782b36ba-a751-4d5d-85f3-004a6aeadf89	1	Other	Other
+782b6aab-9497-4e79-b4c0-53e28f409471	1	Other	Other
+782beb3b-962e-4013-8394-ea43a09a2b3a	1	Other	Other
+782c0d60-c43a-47ea-86be-c5f36e7a867c	1	Other	Other
+782c2d2f-cf8d-42db-8ee4-e7480fa6bf72	1	Other	Other
+782c3317-4f14-48f0-83d1-d1f16a010a2c	1	Other	Other
+782c6ad9-4d20-4508-bc2d-7b662a5aed9a	1	Other	Other
+782c6da1-55a1-45f2-93ee-17acc98d696d	1	Other	Other
+782c799f-53cc-4539-b9e3-10d0cf2958ab	1	Other	Other
+782d1fb2-6d26-4947-a68a-eba352ca2273	1	Other	Other
+782d3a11-b407-428d-85eb-96aaac613037	1	Other	Other
+782d432a-c44f-4ce5-891b-6aed95be6739	1	Other	Other
+782d679f-4fb1-4c56-a4d5-b0e81a7dabe1	1	Other	Other
+782d7e78-d1b0-4d3a-a1ab-f0af7f1d6d34	1	Other	Other
+782d8506-ca99-4ccd-8a26-5d643bcb5c9e	1	Other	Other
+782e05ac-de54-4626-b864-cd48e23f811b	1	Other	Other
+782e27c9-59f9-4e30-80ec-52f212c651b3	1	Other	Other
+782e4b98-539c-11e8-928c-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+782e4fd1-5a01-4402-bfe8-afff04929669	1	Other	Other
+782e7e2e-884e-404b-95bd-6a91c94a36dc	1	Other	Other
+782e9021-a63f-490a-85dc-fc7b38fea578	1	Other	Other
+782e9055-1d6b-4678-a921-ca94f099d320	1	Other	Other
+782f4d35-560d-4d23-96df-54d29f8d371e	1	Other	Other
+782f5c12-183c-4ec3-9ae3-eb32d52e704e	1	Other	Other
+782f88d4-3751-4ed8-b338-b5e5f8654242	1	Other	Other
+782f9a0d-98e3-4e67-aeca-8885ee669b2b	1	Other	Other
+782fba73-480d-4e5b-80c3-4767faaa5fb2	1	Other	Other
+782fc95a-48e2-464f-be45-f628147b1fe4	1	Other	Other
+782fd38a-ce23-4cd6-aa3b-ca3da9bc991e	1	Other	Other
+782fff91-9e5c-418d-ae96-97997c2e0a6e	1	Other	Other
+78301694-2468-4211-b751-a031f4f9462d	1	Other	Other
+783025c2-8e64-4ee4-b3b3-f0c0e34d073d	1	Other	Other
+783028d3-bb1c-4ff6-9991-dcb7e9f3dd3f	1	Other	Other
+78303b45-18ec-46b4-b603-c7230a7916dc	1	Other	Other
+78307193-26f7-476c-a5c7-50c21063a154	1	Other	Other
+7830d5bc-f217-47cb-bec9-4ef75f6b9c9c	1	Other	Other
+78313443-0bea-495c-a272-3ff7df194147	1	Other	Other
+78316005-5311-42ec-8739-afc146fdfb20	1	Other	Other
+78316fec-2790-4309-8c0c-41fbdb342409	1	Other	Other
+7831873c-ece9-4e01-8391-e7bfbc7aa272	1	Other	Other
+78318f43-c81b-4c5d-af08-90b24d9f2ce9	1	Other	Other
+7831977b-66ab-4348-ba7b-d5d593c5e507	1	Other	Other
+78320b7b-e698-49d2-be54-12fa1a315ce4	1	Other	Other
+78323b77-a462-4690-b2c5-07bb40bb93d0	1	Other	Other
+783290a9-fdde-4e83-9c73-aef8d1568358	1	Other	Other
+7833475b-baf2-460f-823a-578f89b031ee	1	Other	Other
+78334e8b-cad9-41e0-a1dc-c4177e22b486	1	Other	Other
+78335d49-ff7b-4854-b079-50beab705882	1	Other	Other
+78335d8c-8088-4309-86e3-4b9749a22834	1	Other	Other
+78338605-36ef-4985-a568-3bd258ffc224	1	Other	Other
+78338fa7-7832-4c39-8319-adf90856b357	1	Other	Other
+78339500-df3d-42b4-a908-2e873f0a5918	1	Other	Other
+7833a13c-27d9-43a7-af76-fc5032afaef4	1	Other	Other
+7833d802-004d-4372-9ac0-853765f4003a	1	James	Other
+78341adb-6289-4d4e-8e22-2a22aea4f211	1	Other	Other
+7834cab8-9984-49a3-a7f3-4cee5f69889a	1	Other	Other
+7834e1a1-640c-4584-987a-3b0baf50c159	1	Other	Other
+783500be-24b8-4ea7-8df6-eabb58baf23a	1	Other	Other
+7835284d-d9e9-4d2b-88fa-deafc382f649	1	Other	Other
+783533c1-768d-4cd3-9a7b-82aa0d2be51b	1	Other	Other
+78358c5a-3936-403e-9dfc-63fc13d9f908	1	Other	Other
+78359df2-a5d0-4c16-8260-a9b8f576b7fa	1	Other	Other
+7835f5c8-5fc2-425f-b60c-78418a89cdcd	1	Other	Other
+783628e1-09b8-43ba-8a5a-57481cfcd557	1	Other	Other
+7836bbff-0b3b-4ea2-bc21-3347b686107d	1	\N	Other
+7836d453-d7c4-46cd-8c51-3ee0cf01f5d5	1	Other	Other
+78372ba6-844b-4166-b7c3-ce795f8e19ef	1	Other	Other
+78372bd7-72b3-43c8-8484-39689f885397	1	Other	Other
+78374060-e2b1-4d5d-bf24-01813d519c09	1	Other	Other
+78378b1b-f262-46eb-b5b4-20643f850d88	1	Other	Other
+78379727-3a91-47c9-92b1-56a4f839a0de	1	Other	Other
+78379917-deb4-44d3-b27b-a66bb32acc4e	1	Other	Other
+78379d42-6e71-426e-81b5-0beaa0619503	1	Other	Other
+7837c3fb-e3f0-4525-9a72-11265a121a8c	1	James	Other
+7837dd55-f97a-43a2-a2d8-acdde44f5ab2	1	Other	Other
+7837e3f7-66df-4d09-845f-250d59ac9fab	1	Other	Other
+7837fc01-b56e-4896-8aab-e3cbfb3b2b52	1	Other	Other
+78381da6-2c82-4b61-9106-255fe7517dda	1	Other	Other
+78382273-ce64-4ba5-b91b-669f7b160ed2	1	Other	Other
+78389e4e-2e40-4ad5-bbfa-1e994a668042	1	Other	Other
+7838af32-6040-4cbd-8e9b-496458607594	1	Other	Other
+7838c6e8-5578-4dff-b49c-4d237805306f	1	Other	Other
+7838d192-8389-4863-91d6-d4b383ec3614	1	Other	Other
+7838e7b2-f421-45bc-a679-495b0bb27537	1	Other	Other
+7838f4c2-02a6-449a-bade-1500eeca38b2	1	Other	Other
+78394602-5eee-4907-8698-438d15cd3c3c	1	Other	Other
+78395146-34dc-4c07-938c-9281aafdd189	1	Other	Other
+78396813-a726-40c3-8f4a-80435cc39943	1	Other	Other
+7839687d-859c-41b7-9466-b7a89461a792	1	Other	Other
+783a2253-1383-4f25-8295-3fca30ce4654	1	Other	Other
+783a25bb-0bfa-4020-b369-1ddf87cdd7d1	1	Other	Other
+783a3150-1517-443a-8272-6ad3ed144fb2	1	Other	Other
+783a706b-8557-4f2d-88a7-8ef271e836f4	1	Other	Other
+783a914c-c2be-4877-a354-0788b03a9127	1	Other	Other
+783ad9bf-9608-496c-9cdb-c18578071487	1	Other	Other
+783b5209-d572-47d6-9c9b-433cb541be5e	1	Other	Other
+783ba34c-1ab4-4770-865b-9c58ea2b4f8f	1	Other	Other
+783be609-44cf-422c-8ae5-1f6fd73e6578	1	James	Other
+783bea85-59a0-4c78-9a1b-2d5313272c3a	1	Other	Other
+783bf5a2-d049-41b9-b88f-2982b67b2170	1	Other	Other
+783c0087-3667-429c-bdad-ca7019f598c0	1	Other	Other
+783c4874-2ec6-45b2-8eda-a6b6ff4f5be8	1	Other	Other
+783c514a-d29e-4cd7-997f-7451cd788307	1	Other	Other
+783cd108-ec52-481e-8043-03f5c42e66bc	1	Other	Other
+783cf369-3bac-4a3a-a692-b9aaeca5b1a4	1	Other	Other
+783d0521-8f4b-4ebd-91c5-5bfd9766e8ed	1	Other	Other
+783d5ad4-c79d-442b-99ea-6309b8429cf5	1	Other	Other
+783d61bc-a68e-4845-847c-2ab905fd676d	1	Other	Other
+783d7253-d45a-4254-959e-258974bb5e86	1	Other	Other
+783d8997-0187-432e-a8d6-bd482426e9f2	1	Other	Other
+783e29b3-7608-4cff-8471-f7c2be5eee3b	1	Other	Other
+783e39a0-922d-40c6-8668-074f6a3f2155	1	Other	Other
+783e4a60-9696-4ba9-8c90-ac5154501b23	1	\N	Other
+783e50ed-05bc-4605-99e8-a96784e1475a	1	Other	Other
+783e55ae-22b9-4cdb-96fc-a71eb54da8e1	1	Other	Other
+783e6216-48ae-49fa-9a0e-176be987874a	1	Other	Other
+783e8c4d-0adb-48b9-a216-d259bf125336	1	Other	Other
+783e8d77-c426-498a-a96d-495aec287b3e	1	Other	Other
+783e8dc1-d565-4f46-a4e5-43b725069d32	1	Other	Other
+783e9aee-cc4c-4e8b-a7f8-4d35db7d9068	1	Other	Other
+783eb305-2c3e-4471-8ab3-a9855d7de694	1	Other	Other
+783eeafa-6cf1-4548-b3f9-ded2b45d8127	1	Other	Other
+783eed60-d6ef-43c6-a061-4549ac8bb8a1	1	\N	Other
+783f08c9-8ae2-483f-a9ce-fcc52cb4d13f	1	Other	Other
+783f18ca-7acb-4ff2-9dbb-3e52d00e977e	1	Other	Other
+783f4c7c-b080-4b60-ad17-4c4a5a6d6e77	1	Other	Other
+783fd228-0a1f-4c31-92d4-e514abf748cc	1	Other	Other
+783fd8d3-41b8-4260-bf01-5de55c6f7482	1	Other	Other
+784060e0-d71a-4a87-924a-fdee1258085c	1	Other	Other
+784072f1-cfa9-4f1a-9de5-5ec104a4fd1f	1	James	Other
+78408404-155d-46f8-b89a-86e19ef1cdf9	1	Other	Other
+784087c9-3e6f-4955-a1a7-875c7f40da1a	1	Other	Other
+7840c19e-21e5-415c-8f0f-50741df9b03b	1	Other	Other
+784157d4-6c7c-488e-beee-7e7aad0ae727	1	Other	Other
+7841a57a-52cd-4035-a5b9-0b9141824fe7	1	Other	Other
+7841b7d1-5b34-462d-8f71-1da212016075	1	Other	Other
+7841ddc3-8768-42df-9e33-d40c909635a3	1	Other	Other
+78422495-d138-4a60-bbf8-564d62f9e2ff	1	Other	Other
+7842b955-6a02-4e60-81c8-2cd493bd0107	1	\N	Other
+784304ae-cd8b-49bb-9e55-9152635b4382	1	\N	Other
+78430655-8e8c-4451-9958-1ed76d77625f	1	Other	Other
+784327ee-43e7-43f7-9d43-cda3f47afb3b	1	Other	Other
+784346be-1d9c-45b1-9b08-c12e0e53e462	1	Other	Other
+784385d5-e626-4fcb-9e22-bae616ea8cf3	1	Other	Other
+784389ff-82ca-47aa-aef9-690dadd20697	1	Other	Other
+784392d1-9e5f-49d6-bc01-df95ec45eb38	1	Other	Other
+7843b237-9325-4f63-88b1-b4e69609e18b	1	Other	Other
+7843b2c5-1edf-4892-9201-74ea3bc1b858	1	Other	Other
+7843be7a-b872-4327-939c-0c2d21106011	1	Other	Other
+7843f33a-3c17-4aca-bace-dd95962ccf55	1	Other	Other
+78441544-f23b-4278-ad9e-8222c650a1c7	1	Other	Other
+78442fed-769b-4a53-99e2-ad68c1cede96	1	Other	Other
+784439e4-6a02-4c03-a84b-52cfa686f9d5	1	Other	Other
+78449ed9-2d6c-41c6-b884-e3883a68fd79	1	Other	Other
+7844ce7e-05a4-47f3-9ddb-da4c74bf0fa1	1	Other	Other
+7844d479-c2c6-4bea-a024-b9c4767a438d	1	Other	Other
+7844e2b0-d5f7-4397-ba21-fff0bcd74204	1	Other	Other
+784537eb-a2f8-4296-9dc0-39cd8d6ee9dd	1	Other	Other
+78459bf7-0f85-45d1-82c6-57ef358f8330	1	Other	Other
+7845b88a-a3b6-4504-af35-a7b64f1fc639	1	Other	Other
+784634c2-f994-48df-9826-f2a56412f521	1	Other	Other
+78465bc6-4402-4895-8338-91b148b82281	1	Other	Other
+7846ae8a-018e-4524-a2bf-ea383bdfb8ef	1	Other	Other
+7846c391-bf52-48c6-b96e-fef31b569372	1	Other	Other
+7846d74a-b62a-4eba-81c0-70d6a839d746	1	\N	Other
+7846eeb1-fe02-4822-82c6-fdc02aefa22a	1	Other	Other
+7846fd42-3b5a-4b54-b630-1547f38d64be	1	Other	Other
+784768df-3abe-4de5-b6db-0aa3842a87c1	1	Other	Other
+7847f2e6-757e-4c90-9c86-da5878e32167	1	Other	Other
+78492f3e-5386-4e83-a035-b71665721536	1	Other	Other
+784940ea-0d98-46d9-b891-4358aae8d501	1	Other	Other
+78494cc8-f347-468b-8a91-aa285c92771f	1	Other	Other
+784989ea-bcb6-467e-b4af-40c73d47ceb7	1	Other	Other
+784abd6d-82a7-4cc6-b365-ff087063598b	1	Other	Other
+784ac9f1-c632-417c-ad9e-55c1759225d5	1	Other	Other
+784aeb55-78d4-4e20-b2ad-cd9bc8a5804f	1	Other	Other
+784b1787-4152-4173-9f61-f0bcdd46d769	1	Other	Other
+784b6c68-8d81-4900-97a9-0a4d95b737de	1	Other	Other
+784b77be-11a9-46d7-a2c9-213211bf088f	1	Other	Other
+784b7f0d-754d-49b3-95a8-59597e7bb107	1	Other	Other
+784b95af-eca7-47f4-b090-b503ce616ac6	1	\N	Other
+784bd66d-758a-458a-8798-a8d7bf1620a8	1	James	Other
+784cc87c-e96b-4eee-b165-abdb9d040bb9	1	Other	Other
+784d2e49-d5dc-4ef4-9dbb-77700113b2a6	1	Other	Other
+784d4803-b752-4c62-ab3a-935efb05fe7e	1	Other	Other
+784d4b96-ecb2-4042-bba7-d9359aefc13d	1	Other	Other
+784d5180-f700-4869-8c9d-f3cf896215f3	1	Other	Other
+784d7f69-a775-4af5-a0c5-1828c13118ac	1	Other	Other
+784dcc31-b5f0-4f77-8d64-28b25867e1c7	1	Other	Other
+784dd928-3e8e-43a9-ab19-3e3b30b01ee1	1	James	Other
+784dea06-0533-4544-b1fa-84d4723b36fd	1	Other	Other
+784e4f74-23be-4076-b548-bc48cf66e723	1	Other	Other
+784ece86-2eb3-4604-ab63-be1f3616195a	1	Other	Other
+784eced4-b296-431a-9a0e-a274f815fc01	1	Other	Other
+784eeaaa-70e2-4342-8859-33c33c811bf5	1	Other	Other
+784f26b4-7b96-4033-87b9-14b9b375f33a	1	Other	Other
+784fab1f-707e-46ff-a1b4-f704aa4928bc	1	Other	Other
+784fcc69-6e97-44b2-b62c-9924cf9f5c3c	1	Other	Other
+784ffb89-4be9-4719-bc8d-3278464d046b	1	Other	Other
+78500a79-fabf-4845-8673-52034039dacd	1	Other	Other
+78500b8e-e4ad-44d3-9348-e5c601643675	1	Other	Other
+7850861f-75fd-4df1-9a73-9a740cc61c2f	1	Other	Other
+7850b5bb-2172-43c9-a02d-261a34cdcddc	1	Other	Other
+7850c6b7-2d37-4979-a5cf-70a451080fb0	1	Other	Other
+7850db5b-8547-4c7b-9a02-aeed09af2fed	1	James	Other
+7850efd8-31b7-4499-966a-de648813a76a	1	Other	Other
+7850fbfb-893e-4d59-8700-a9767adf7821	1	Other	Other
+78510d89-130e-400d-b4be-3b0ce37c826d	1	Other	Other
+785156a2-89bd-42de-9130-eac92af1f3cd	1	Other	Other
+78515ac8-ed51-464e-8ebd-76502561920c	1	Other	Other
+78516bcb-5b95-42d0-9394-7a3e814615f5	1	Other	Other
+78519489-c9ab-4bd4-aed0-750590e02bda	1	Other	Other
+7851a85a-d6a6-43b6-bda1-8d6002319346	1	Other	Other
+7851b37c-8252-4cb3-bafd-eb8ca3fb7812	1	Other	Other
+78522242-1f32-4dcf-ab65-ed8364f2c3c2	1	Other	Other
+785239b0-a7df-41af-a655-a21b47a41bdf	1	Other	Other
+78532747-979a-4800-a26f-62e633e2938c	1	Other	Other
+7853796f-2e49-47c3-b3b7-07acb1f07082	1	James	Other
+785419e7-fc81-4f9d-ac86-12ed8552a0d0	1	Other	Other
+785438cb-181d-4657-b5b8-c96a62515cfa	1	Other	Other
+78545620-4e6d-4860-a8d7-7503818e871a	1	Other	Other
+78546361-8dea-4b9a-ba42-bb5a187de9cb	1	Other	Other
+7854b578-cedc-49d8-8db9-7e205ab9cf43	1	Other	Other
+7854de51-9e15-41ac-9b71-f2deda8820ac	1	Other	Other
+7854e6c2-626e-414c-b15c-16b4952d3bb1	1	Other	Other
+785528e3-4251-40fe-baeb-beb458b8842a	1	Other	Other
+785533c9-2b70-4a7f-9c7d-5a2f890c73fa	1	Other	Other
+7855b813-306d-40d9-80f3-616eb8159ca9	1	Other	Other
+7855baac-561d-406d-9526-a7b51c795b99	1	Other	Other
+7855e934-0142-4685-a7c1-8eb2aa78ea94	1	Other	Other
+7855ed07-b986-4a5f-b19a-c9373bb9f14e	1	Other	Other
+78560fc9-b526-4351-b4f2-0c5b851e871b	1	\N	Other
+785620d5-4122-4412-9865-70f36847af60	1	Other	Other
+78565a77-cc9c-42af-906e-31d7caca84bf	1	Other	Other
+785660a8-946f-4e09-bfe9-e9428780e600	1	Other	Other
+78566faf-aba6-453d-99ef-19d38935c93f	1	Other	Other
+78567313-7ec2-49d1-9f1c-641388fd2140	1	Other	Other
+7856a51f-dfb3-47ed-9444-1e1f4e2133b6	1	Other	Other
+7856d999-d180-4611-9afb-92d2d551797b	1	Other	Other
+7856e6ac-ec43-41c4-bcc8-a51484a9627d	1	Other	Other
+78576b38-9fa9-4314-b3a3-1db8495b2294	1	Other	Other
+785822c4-db02-4cfb-8d66-fc9f19a03102	1	Other	Other
+78584f2f-e70b-45f8-b6b3-729d97b7a5d4	1	Other	Other
+785876ec-2f01-47ba-9cd0-21a10ca3e598	1	Other	Other
+785880c4-a0e8-4de9-a6c0-3a6e5ddbbd1e	1	Other	Other
+7858d84d-6f4b-4e12-8283-78b8d25c2cd5	1	Other	Other
+7858f115-e2aa-468e-ae3c-d8b253ea7960	1	Other	Other
+7858f483-c898-4933-9390-5c3d8fe6d8ac	1	Other	Other
+7859304a-5046-42e0-bfe6-80eda6346bd3	1	Other	Other
+7859ee58-3bf5-4073-9382-635b4f4b113e	1	Other	Other
+785a63e6-d982-4bbe-a8e3-93b0707a3300	1	Other	Other
+785a8650-0a4a-40bd-8694-9aec0940c129	1	Other	Other
+785af3bd-5197-4424-af6a-cda02f23bead	1	Other	Other
+785af99a-3e6a-4654-af9a-0ffd46122263	1	Other	Other
+785b126b-f148-4325-a9a8-8ec44bc783fc	1	Other	Other
+785b1fa7-f963-4762-8839-bdc35d46184b	1	Other	Other
+785b608a-6e7f-4d1c-943a-5628e6987631	1	Other	Other
+785b76b7-d40b-4c39-b8ac-480a77276fee	1	Other	Other
+785b78e5-4c21-4d4a-8317-b1df88fee3ba	1	Other	Other
+785b86e1-a89f-4a42-837c-5347336baf9b	1	Other	Other
+785ba510-9f84-44f1-908e-3ae5612f2098	1	Other	Other
+785bb448-8f99-4e57-ba9c-933a20fbcbfd	1	Other	Other
+785bbdaa-668b-49f2-873a-7a7b0fac33f6	1	Other	Other
+785c1f8a-1e89-4231-897a-df73eca6b23f	1	Other	Other
+785c455b-72d7-4e68-859c-8d10390b4a45	1	Other	Other
+785c9316-a072-4c76-ace9-9161c9ccb5b3	1	Other	Other
+785c939f-07b3-4a9a-80c9-aacb0d8e1749	1	Other	Other
+785ca6c0-1c3c-4b01-b54c-91dec41631ad	1	Other	Other
+785cadca-4936-4e0f-bc32-1945572ab69f	1	Other	Other
+785cc62b-11b0-4996-ba2e-7bd6f0cef529	1	Other	Other
+785d1dac-8c48-4a79-8956-e2d03974b7fa	1	Other	Other
+785d8420-3528-41d2-8b49-a73fb31f18d3	1	Other	Other
+785e048b-4b27-49e6-ba61-67a745ad1697	1	Other	Other
+785e7122-26af-4c0d-a6ef-7a461dd80343	1	Other	Other
+785e7ff1-46e4-4ad2-9cf1-1fe15cbc6dae	1	Other	Other
+785eeae6-4748-4651-990a-fe5988677604	1	Other	Other
+785f7727-b1ba-4d77-aabe-4dbaa6d22632	1	Other	Other
+785fc239-788b-49bb-a78d-d5bb5c3fc736	1	Other	Other
+78606558-a866-462c-8be9-a2c44e53d93d	1	Other	Other
+78606867-fa6d-4162-b510-26a2f1d2e6b5	1	Other	Other
+7860b01c-b8db-4dbe-a563-ab9d907fa235	1	Other	Other
+7860e041-9d62-47ef-b1c1-37ceed61e1e7	1	Other	Other
+7860e636-5d4b-454b-a7dd-6d0352589112	1	Other	Other
+7860f606-9037-45d3-b548-df4f1b8604c1	1	Other	Other
+78610e44-e2ba-416f-8d16-21bc90476a3c	1	Other	Other
+78614913-cb35-436d-9431-cd194c864d36	1	Other	Other
+786152ab-a42c-4675-a885-79f935a7342c	1	Other	Other
+78615de9-283f-4152-88b9-3ae83fede3dc	1	\N	Other
+786193c6-25ee-4482-a6c4-7a74626113e1	1	Other	Other
+7861a80e-c724-47e3-8ba8-5f492ec24c8d	1	Other	Other
+786230dd-f731-450f-846a-6245e51dd520	1	Other	Other
+78628d81-3e72-4c33-b4b4-6cffb32d8ea1	1	Other	Other
+7862a907-1b9a-4ccb-a79a-22c2fd6d5fcc	1	Other	Other
+7862ded6-d23e-48de-84ca-df89653c29b7	1	Other	Other
+7862e2bc-0727-449f-901a-5e929e302f83	1	Other	Other
+7862fb9c-1cb5-478f-9ef2-d91d43e917cf	1	Other	Other
+786386f3-631c-450f-a74e-b9e6bf6badc3	1	Other	Other
+7863b10f-409a-4250-8421-efa0bd2c9491	1	Other	Other
+7863b6b4-e9a1-40dc-8db2-645d28a82f13	1	Other	Other
+7863d036-6374-4676-8145-6ea349c86ef0	1	Other	Other
+7863d4bc-bae0-4915-8523-f6c8f5259ff9	1	Other	Other
+7863ea0e-0756-46bf-ad4d-5cf8bff975b5	1	Other	Other
+786417a3-40b7-4267-ac37-4843ee3786ad	1	Other	Other
+78641d46-f197-46aa-aecd-a97570321733	1	Other	Other
+78642f76-9a0b-4154-a12d-15e1128c6736	1	Other	Other
+78646bae-ec99-4ac9-a3d2-7245c0d11fea	1	Other	Other
+78647ec0-9b4c-4a4d-b1d4-844a031bb4a8	1	Other	Other
+78647f72-29a6-4df5-aa3b-664a01b98787	1	Other	Other
+7864834c-2611-4b3a-8bd0-b51014b32d2d	1	Other	Other
+7864bcc5-894c-4140-8199-417189f7b455	1	Other	Other
+7864c150-eda2-42e9-8158-665cdc4de096	1	Other	Other
+7864c564-233c-11e8-82d9-fa163e8624cc	1	\N	Other
+7864ebb9-d97a-46e1-8931-e036da4ac5e1	1	Other	Other
+7864eceb-5327-4ff5-97ff-e6185ef3f967	1	Other	Other
+7864ed11-a5a5-49d5-b0f8-1b260cf31369	1	Other	Other
+7864fa24-c333-415a-b778-1c5fd4ddf9a5	1	Other	Other
+786551a2-5f1c-4490-bd42-343ff80e284c	1	Other	Other
+7865860c-515a-48b3-bc18-fa441e9676f0	1	Other	Other
+7865c7e8-8561-4d77-8c91-8f0c941b2e20	1	Other	Other
+7865e684-77bf-4f3d-abab-d8bdadde851f	1	Other	Other
+786650b9-2437-4bea-85ad-31d6615b63fb	1	Other	Other
+78665741-9d8e-42ce-b815-7b5153f2ddd7	1	Other	Other
+7866c950-ec53-48f6-8994-e917462037b3	1	Other	Other
+7866d63f-3b76-422f-8f5e-1f6d1b441130	1	Other	Other
+7866ea67-42ab-48e1-94e3-7226ee8bc155	1	Other	Other
+786718d8-24a8-4b91-ba8c-2a7747b20f7e	1	Other	Other
+78678f33-e188-4349-9008-dfe84667ffad	1	Other	Other
+78679809-8fb4-4cb4-b0fc-dbe36b5fc3e4	1	Other	Other
+7867ae7b-2db5-4fb1-a404-146745f517cd	1	Other	Other
+7867b0d8-2574-4380-a051-b78f74ef9533	1	Other	Other
+7867e9be-439b-4114-80d0-eeb41f931b85	1	Other	Other
+7868137f-4f46-4c0e-b46d-aad091ea0490	1	Other	Other
+78685231-f033-4ae2-bbea-3596aecc9cb1	1	Other	Other
+786899ce-5c1e-4f0b-b4ef-cb8da825e6ab	1	Other	Other
+7868db8c-b73b-49e8-982e-855d0e372182	1	Other	Other
+7868ef92-afaa-4728-9143-ddd8464dd8bf	1	Other	Other
+78690bc3-fc57-47e5-b075-ffb310e4b414	1	Other	Other
+78691b29-cc9c-4770-97d2-921ec659c3e5	1	Other	Other
+786961eb-fb68-4f2d-80cd-73880adc9387	1	Other	Other
+7869ab44-1b0a-49b8-91b5-e7ae6c4cfe6a	1	Other	Other
+7869f62a-1aa5-4999-b9e0-3fbbadcc88c6	1	Other	Other
+786a06e6-a5a6-458b-bb78-d4c549901be9	1	Other	Other
+786aa71f-075d-4a35-b65f-468340714884	1	Other	Other
+786ab136-5235-4e93-a000-6f73948aeba0	1	Other	Other
+786ac8dc-9738-4e31-a75b-32f2f9bc72b4	1	Other	Other
+786b61cd-18b1-456d-a57f-c01e10a02aa9	1	Other	Other
+786b8778-c19b-47e3-8dbd-ede6af9171e0	1	Other	Other
+786bbcae-5fe7-467d-9c44-14142e51b11d	1	Other	Other
+786c3d41-d0c3-435b-a19a-6d050b2b59f4	1	Other	Other
+786c498a-5f79-477e-b879-30d23bbad55b	1	Other	Other
+786c5dc1-b3fc-4624-84f5-d26045bc9909	1	Other	Other
+786c6638-cfd6-463a-9e2e-d135b7c55c2f	1	Other	Other
+786c8432-a8af-4b18-b96d-6c745100cb95	1	Other	Other
+786cb210-a0f2-4b5f-961a-187f32007a5a	1	Other	Other
+786cb55c-2904-4373-8e2d-587f423c0b2c	1	Other	Other
+786cda81-4267-41ee-a7b7-5f66830c25a3	1	Other	Other
+786d64b7-5ae2-4674-be60-3c858cf3e92c	1	Other	Other
+786dbc11-f587-4764-884e-7ade67a8744e	1	Other	Other
+786eca14-2896-4812-a286-dcfaf893461c	1	Other	Other
+786ed12d-fb2f-4274-b5d6-3d8f6e9e493c	1	Other	Other
+786f506d-709b-4e53-ba02-1eaf5021b483	1	Other	Other
+786fb01c-2185-44e7-b74a-0bb589fec7be	1	Other	Other
+786fc167-bf34-4aef-98d2-1264b16fabc2	1	Other	Other
+786fe9b5-7c17-4d9d-9ce5-50ecd3c8d84f	1	Other	Other
+78700c58-bf99-444d-a414-69bad4d20d15	1	Other	Other
+78704284-3aec-4d7d-9f35-005e974be0a3	1	Other	Other
+78704be7-2ffe-45ec-b28d-471197985690	1	Other	Other
+78705bed-7624-404b-ac56-573ca65a38fc	1	Other	Other
+78706cdb-9f46-478f-bf7b-17861ebf978f	1	Other	Other
+7870730d-283f-43c1-8f7f-6a04d30dbfee	1	Other	Other
+7870c308-21f5-45b2-a925-3342e041dd79	1	Other	Other
+7870d372-cc0b-4fd3-914a-641569ee40cf	1	Other	Other
+78710041-a3e2-4324-b7c3-b1896597c82e	1	Other	Other
+787108ca-6c01-4765-a6ba-4ec4fac5bad8	1	Other	Other
+78711677-5978-42e2-bf36-4e4efd5bd90a	1	Other	Other
+78716410-b2d3-462c-b8ff-89f93baf1dd4	1	\N	Other
+7871948f-a69c-4a45-b8ee-415cbcbca932	1	Other	Other
+7871c039-833e-451e-bc3e-b794bbb0aa1e	1	Other	Other
+7871f82b-aac4-4214-be1f-590d901858fd	1	Other	Other
+7871fcd0-305f-4700-beda-818f25c7dacb	1	Other	Other
+78720596-672f-4149-ba73-c2dbdc529f38	1	Other	Other
+787254c6-6d27-4780-ba38-5263c2dbc0ff	1	Other	Other
+7872ddad-a87f-4fb7-9bdd-2cadf97b22f0	1	Other	Other
+787300a2-e543-4e3d-a577-9c3f38213d36	1	Other	Other
+78736524-6cae-4d39-9a0f-cb18929af184	1	Other	Other
+78738268-114d-4198-b751-7c5c331122e9	1	Other	Other
+78745d33-06c7-45ec-837c-62f137d05d5a	1	Other	Other
+7874971d-ceb8-4fe9-981f-f6cacbb95125	1	\N	Other
+7874db32-1515-4f22-aab3-db523972d5e3	1	Other	Other
+787533b3-e547-4279-a017-5eba61201516	1	Other	Other
+787569ec-f861-455f-93e8-899f839707d8	1	\N	Other
+78759f02-b5d4-4959-a2dc-e18a6208da7f	1	Other	Other
+7875c4eb-477c-4a47-b90c-b62a31698f02	1	Other	Other
+7875c9c9-dd8f-4f90-ba8d-db73cca926dd	1	Other	Other
+7875cb4a-1dd3-466a-b921-8ff59394b1b2	1	Other	Other
+78763b5d-14d8-4906-9a9f-943de5bcc926	1	Other	Other
+78768caa-7871-42a9-99bf-cabff5634201	1	Other	Other
+787692da-4e96-41c5-b426-ebf5718ee448	1	Other	Other
+7876b0f1-dfa9-4529-97bf-86389663bd2b	1	Other	Other
+7876b1a9-ff3d-4e9a-add5-2f25678c0285	1	Other	Other
+7876c353-09d3-47be-805f-133eaa3b5290	1	Other	Other
+7876f907-1007-40e3-9ab4-e2f75c489570	1	Other	Other
+7877381e-cf51-441c-8532-3c6587b77674	1	Other	Other
+787749c2-edbb-40ed-841d-e70668f384d9	1	Other	Other
+78778006-bb66-43d4-8249-f34286d61a21	1	Other	Other
+78779027-ff06-4cb0-b7c4-9af75229d3e5	1	Other	Other
+7877b2db-6f2c-492f-a584-2ec05b26c6cc	1	Other	Other
+7877cc0e-a276-4888-ae14-fd01c77c281a	1	Other	Other
+7877efef-d67e-4335-9ed7-134ac22e701e	1	Other	Other
+7878a316-4c48-4c6c-82c5-5a84419869b8	1	Other	Other
+78790edd-8dbb-439c-858e-d8e8a91b225a	1	Other	Other
+787932c9-2cb7-4288-84ca-2c0abcddd256	1	Other	Other
+7879b342-325a-4357-ac63-5c8456665dc7	1	Other	Other
+7879ecca-29f9-439d-b4b0-090ad2a8a9cd	1	Other	Other
+787a28ab-d856-49fc-b666-8dd6e231d462	1	Other	Other
+787a36b7-a065-4a61-a58a-d5d2727cc893	1	Other	Other
+787a6c62-76a8-465e-8dfe-08ecbd13f38f	1	Other	Other
+787ab670-858f-4362-a5dc-ed2b51898980	1	Other	Other
+787b7de6-fe2a-4d98-87bb-51795ef89279	1	Other	Other
+787bb1d6-8c7d-4c11-aeff-fa9032dbb542	1	Other	Other
+787bb54a-7e34-4334-8ad6-1e6309a74efd	1	Other	Other
+787bf205-a281-49a3-ba13-dd3c52799b9d	1	Other	Other
+787c128c-f223-4b98-bfa0-b6d885943b40	1	Other	Other
+787c5774-5961-42b4-bc9c-4ef873dd6a10	1	Other	Other
+787c5dcf-0f1a-47d2-a328-55f97dc84c22	1	Other	Other
+787cd6e2-4ba1-4413-810d-42b8773be395	1	Other	Other
+787cd87a-a145-4e5d-94a9-0ac9bed2ff3b	1	Other	Other
+787cf3b9-d011-456b-900a-8301f8e5cf31	1	Other	Other
+787d1ddf-5696-4fb7-a54b-257162aa7f38	1	Other	Other
+787d20be-aa4e-488f-bcef-0b20400e1a2d	1	Other	Other
+787d7d5e-56fd-40d4-a588-7ad0bf8a5d89	1	Other	Other
+787dc619-141c-4d05-aa3e-523180d81243	1	Other	Other
+787de474-7da5-42ae-b0a5-5393e84c7837	1	Other	Other
+787e0561-2468-4afd-b12e-809fc5a7e86d	1	Other	Other
+787e35c0-8a3f-48dc-84af-0aa23a87d8f8	1	Other	Other
+787e57cf-3c49-4b2d-ad0b-e45d0fb06fad	1	Other	Other
+787e5c8d-7871-472e-b699-944191eed912	1	Other	Other
+787e87cb-5a48-4943-9462-2ccbd753fb41	1	Other	Other
+787eaef7-f6d2-4f69-9eb1-3ee2bda6173c	1	Other	Other
+787f0fc7-faad-4925-b46c-6898c20b22aa	1	Other	Other
+787f2a5e-2c55-4501-bf59-a8bda15874af	1	Other	Other
+787f66e1-567b-47c9-be71-f0ac20d060bc	1	Other	Other
+787fa4fe-1d02-4077-a028-88ecbc880586	1	Other	Other
+7880029f-2f1c-4555-b983-bad424c60cda	1	Other	Other
+78804f6e-3b4f-4afc-92f6-f2e52545f389	1	Other	Other
+78809ae6-d2be-4199-835f-48f43cfa4769	1	Other	Other
+7881240e-5330-43db-a8b5-de2fb03e9e6d	1	Other	Other
+78813b44-ea2d-4999-aec6-e226f4f57eb3	1	Other	Other
+788143ac-5b62-46e8-a3dc-3e426190ec38	1	Other	Other
+78816d12-1ee5-4380-b75f-9d630b26127f	1	Other	Other
+7881d684-20e4-4db8-bdf1-d329b8933c1a	1	Other	Other
+78822a89-9219-4c07-bc81-2970a4316248	1	Other	Other
+78822b19-fbeb-4f2f-a9b1-49d59309e377	1	Other	Other
+78825318-ac17-40e2-ac1b-0cb6da6be620	1	Other	Other
+7882cd4a-e61e-4a49-8e4a-d90b39761f64	1	Other	Other
+7882dfe0-3907-4779-b610-856f12e4f044	1	Other	Other
+78834d77-254f-4bca-ac2e-47178cbc936c	1	Other	Other
+788364ea-3162-429a-8943-9360a9b4c11a	1	Other	Other
+788386a8-4d18-488a-aba4-9aa8ab4de086	1	Other	Other
+78839fbb-e633-4792-9d2b-2e8e4947f477	1	Other	Other
+7883ab76-d823-4499-86a0-6256a6bab8cd	1	Other	Other
+7883eb27-8216-49b6-944e-829c72c3764e	1	Other	Other
+78843dee-a16a-4c8f-b82d-4a372cc35a91	1	Other	Other
+7884732a-9dfd-40e0-90b3-f662e61ad537	1	Other	Other
+7884a98c-1eb7-4b88-8f45-01e12544a25f	1	Other	Other
+7884e623-39dc-4e13-867a-46549285627b	1	Other	Other
+7885160c-2387-4a76-8e6b-4a5a764b8868	1	Other	Other
+78857bd5-2d22-4674-9c2e-23044817aab5	1	Other	Other
+7885c668-afb9-4f48-897e-c957bb64f013	1	Other	Other
+7885ca61-720a-4740-a1da-b99ed45575b1	1	Other	Other
+7885d6d4-c519-4d75-becb-593b27d56100	1	Other	Other
+7885faed-c093-4580-8c9f-5e7214807746	1	Other	Other
+788675f3-bbe4-4aa3-bbd5-8940f36121e8	1	Other	Other
+7886c8ab-40a1-4e1d-990a-497e9d7a7a2b	1	Other	Other
+7886fd69-07f5-4d8a-91b1-b979fe941adf	1	Other	Other
+788702f1-b30e-4a86-84b5-68f23eb7a047	1	Other	Other
+7887ce07-90b2-475c-a027-38d549d21380	1	\N	Other
+7887da47-6549-4657-afaf-dcc4425f9b16	1	Other	Other
+7888367b-98e5-4623-bbd0-0e4d6a5e25d5	1	Other	Other
+788849b7-5864-4c61-9512-036aabe87a98	1	Other	Other
+78885c07-22ec-4842-adf1-bea67c236a19	1	Other	Other
+788870ea-aa9c-444d-b6e3-03092a54e60f	1	Other	Other
+7888b31a-b286-4bc9-bcae-dbc1e63a91bd	1	Other	Other
+7888c360-6094-4b7f-9573-5747ab11df5a	1	\N	Other
+7888dec3-9c13-42e9-a787-16018eba87a8	1	Other	Other
+7888e9ec-853e-4724-96ab-67112c8de905	1	Other	Other
+7888ec9a-18f3-4ef1-9ad0-d261b6c5949d	1	Other	Other
+78893715-9533-4471-bd7e-760994e91786	1	Other	Other
+788942d1-7050-49ac-8dc9-268e5f2518e1	1	Other	Other
+7889c8e0-de0e-45ec-93db-abf26f441ccb	1	Other	Other
+788a5335-455d-4b19-a588-58a15b407fed	1	Other	Other
+788a712b-0bec-4c88-90d8-a283da26984f	1	Other	Other
+788b0467-6f9f-403a-bebf-b366affc58ac	1	Other	Other
+788b394b-4a2c-48de-b61f-b5d21b4849b4	1	Other	Other
+788b5a1c-fd63-4224-a298-f8bbe083e629	1	\N	Other
+788b7c17-d07a-4830-bd2c-2ad7a61ca757	1	Other	Other
+788b8908-9173-463c-be73-98b95fe48b55	1	Other	Other
+788bcbe7-df7c-451e-893b-fd1f3463795b	1	Other	Other
+788be921-09df-4631-a667-ab1210cdd3ce	1	Other	Other
+788c30e9-44be-45df-abc6-e66d86d971bf	1	Other	Other
+788c355c-56af-42df-ade6-977dfcd09b02	1	Other	Other
+788c701c-da33-4943-8481-6430055a03c0	1	Other	Other
+788c784e-a53f-4203-a338-d1ec0b5be0cf	1	Other	Other
+788c7db2-2bdb-4f71-95f9-811b939500c1	1	\N	Other
+788cc260-5fd7-4aea-8f07-f1e90c7a392d	1	Other	Other
+788cea35-3fb8-4b16-9f2b-ce5ec6e3eaf7	1	\N	Other
+788d6fbc-8ac4-4466-a1ba-56b9bff16909	1	Other	Other
+788db279-5298-4f0d-bfe1-b610fd26bb0f	1	Other	Other
+788de563-63de-4992-ac83-b5dbc1f995a3	1	Other	Other
+788e70f3-b118-48ad-bdd7-9e78e6d0df8b	1	\N	Other
+788e9ed8-8b05-4466-b13a-13b702d53c95	1	Other	Other
+788ea724-b1fe-4054-b6c0-336140fb91ea	1	Other	Other
+788ed08e-61c1-47cb-ab6b-9120971c34fe	1	Other	Other
+788ed25b-ae6e-4e5a-9d61-ead16facf276	1	Other	Other
+788ef204-44b8-4d39-aef5-b257a5740559	1	Other	Other
+788ef794-8762-48e6-ae44-a95c18483b8d	1	Other	Other
+788fcd87-6335-4195-a8a2-6116a3acd417	1	Other	Other
+789013d5-7f91-4f16-8cbf-ad4e83cebfb6	1	Other	Other
+7890234b-74ab-42f9-b327-b567b910ae78	1	Other	Other
+7890f4f8-e133-49d8-aee7-405525860705	1	Other	Other
+78912eb9-b063-40c9-83ec-b01622524817	1	Other	Other
+78912ed6-00f2-11e8-8c81-fa163e8624cc	1	Other	Other
+78913e7c-335b-4815-b804-b55bada58560	1	Other	Other
+789152c1-7bfa-408f-8399-f7e6d8db2e6c	1	James	Other
+78917da4-853b-4379-aa02-7d3906be77b0	1	Other	Other
+789195bf-2b8e-418d-8c9c-b4e7d8d26e64	1	\N	Other
+7891a4c4-cceb-498a-bd7e-3f91ed3c741c	1	Other	Other
+7891aac4-a1d3-4cf6-a7b6-8191b8f756ce	1	Other	Other
+7891cf5d-dfd2-460c-8878-3d288300e75f	1	Other	Other
+7891d814-12bb-4066-999e-b685ea3d9d54	1	Other	Other
+78922bfe-4084-4a6d-a1b1-1828ae38b691	1	Other	Other
+78924dee-80b6-4bca-9b27-12d06cf47a05	1	Other	Other
+7892545f-749a-41ef-b60d-b1656bf15608	1	Other	Other
+7892585d-a828-4458-ad57-e7b83e676a00	1	Other	Other
+78926653-b44e-4738-89f9-54cd5351ad4e	1	Other	Other
+7892a870-c1d6-4040-a1e3-b7961ab05a53	1	Other	Other
+78932920-b7f5-4b57-979f-e0fb1363b200	1	Other	Other
+7893326f-6040-4ba2-8044-426ecd5e1afd	1	Other	Other
+78933507-2614-47ee-8220-e6767eccec76	1	Other	Other
+78934579-120c-4676-93f2-6e33c11cc211	1	Other	Other
+78937afc-19c6-4b72-8ff1-1227a5d67e87	1	Other	Other
+78939867-a98d-4460-bd91-48113b17aed6	1	Other	Other
+7893989c-7537-48e9-8d12-23493fd1a7e8	1	Other	Other
+7893a0ac-f9c5-40c2-b009-c39b8c4acfd4	1	Other	Other
+7893c0c5-8a58-4245-b6b8-5057b3d21dd4	1	Other	Other
+7893c517-c5de-4994-8fe4-fb4ed7071b07	1	Other	Other
+7893d576-60f7-4a0e-b664-e2b1570e6087	1	Other	Other
+78940c07-53ff-4376-8ce6-4786cc29e2cd	1	Other	Other
+78943d63-31cc-4c7b-8b6e-cb7f3f73beb1	1	Other	Other
+78949ed0-098a-4510-9c86-aa2b905deeae	1	Other	Other
+7894aa51-570c-4a16-a071-c343cbede5bf	1	James	Other
+789507fd-6763-48d3-89df-802ad8aeed70	1	Other	Other
+7895a6c3-26c7-41be-8638-8a00000dd7d3	1	Other	Other
+7895dd0e-601e-4a51-aab2-582a55436ef9	1	Other	Other
+789632cf-1b97-4fa4-ab62-65d80e7b5e7b	1	Other	Other
+7896a547-a899-4e0a-8596-a877b344bbae	1	Other	Other
+7896b955-0ea8-4b3c-9a07-1ca330333a9d	1	Other	Other
+7896f166-c648-40cd-b27e-0c4ad29463a9	1	Other	Other
+78973bd9-957a-4c08-b364-5cede33d144f	1	Other	Other
+78977d3c-ecb3-4d09-9d16-566ec376b580	1	Other	Other
+78978b1c-c583-4d39-b33f-611251a9da2c	1	Other	Other
+7897bbcf-1a25-463e-bcf5-3ee9e8d157bc	1	Other	Other
+78981576-a05d-4d6a-9721-41c11f7fd46a	1	Other	Other
+78985e94-f42b-4a46-bbe8-fb9de422d783	1	Other	Other
+7898996f-2249-45d3-adac-c56a6afdd972	1	James	Other
+7898b0bf-b854-4236-a064-f147c95b6460	1	Other	Other
+7898c559-87e2-4ea8-a3c3-f6042620523f	1	Other	Other
+78992d0c-a60a-48f6-aedd-09032d02ce53	1	Other	Other
+789952de-c8e3-404e-b01f-3672dc63c853	1	Other	Other
+789979ca-35ec-46fa-9d3d-68fcdde6ced6	1	Other	Other
+789986f0-2503-488a-a993-ed80bee5ae14	1	Other	Other
+7899e669-319b-4a9b-a32a-3697445218db	1	Other	Other
+789a1182-504b-4bea-8982-c20678812e3b	1	Other	Other
+789a16fd-3da3-4c6f-bfb3-3345e7a4f87e	1	Other	Other
+789a1e4f-8268-4828-861b-17c0e27e99aa	1	Other	Other
+789a6326-ab18-4d6c-a5ba-df2779962bbe	1	Other	Other
+789ad74f-0705-4d77-89cb-93cba6756dfc	1	Other	Other
+789aff43-bf1e-4ecc-942a-dd3ad19647ec	1	Other	Other
+789b1523-b174-46da-ac79-ca29b04368ff	1	Other	Other
+789b2ecc-d41c-40ca-b5f7-5c561f6c8f20	1	Other	Other
+789b4358-91b7-47a2-9f06-4fe755390b60	1	Other	Other
+789b73e4-87b1-4fa2-84a2-d9178c129257	1	Other	Other
+789b8374-736f-429c-a871-54d0db41b6b5	1	Other	Other
+789b84a2-a99c-4966-8315-4445d4f4175c	1	Other	Other
+789bc331-e1e6-43df-9dbf-fa062ba2c877	1	Other	Other
+789c1a8e-b6b2-48dc-a310-11f26684863c	1	Other	Other
+789c2448-bed0-4ac0-8c31-292e60e07a92	1	Other	Other
+789c4277-f73f-4c37-9781-47db8fb71164	1	Other	Other
+789c6663-ee50-40d0-a8af-55b3b914de32	1	Other	Other
+789c8dc6-bc4a-4a0b-b4fb-77f82a3b6ae9	1	Other	Other
+789cbb2e-dd19-437f-b996-7b62aa3641ce	1	Other	Other
+789cc02d-327f-49f0-8672-816eb86334e1	1	Other	Other
+789cdf73-cc7b-4946-8f16-e70e62649f89	1	James	Other
+789ced54-8424-49c5-9e77-1ededf0a41da	1	Other	Other
+789cfa47-5701-49c1-8bb8-ec77e8e311c0	1	Other	Other
+789d247b-7ab1-498a-90d3-300ce764edb7	1	Other	Other
+789d27c0-d1fb-43dd-b34c-fc4c9955946f	1	Other	Other
+789daf7b-98cf-4ca7-9e4c-a99346c382c4	1	Other	Other
+789dfa1a-5837-4670-b1a6-0b27ce3b1ff9	1	Other	Other
+789e312b-4da0-438b-b85c-049cc830c5ba	1	Other	Other
+789ea3f0-df1c-4268-99a4-cb3563b56fc6	1	Other	Other
+789eb03a-ee85-44ca-8841-3eca1e4bfc74	1	Other	Other
+789eb232-0cb0-4b37-b448-ccec88d36ec3	1	Other	Other
+789edae7-b7de-4cf7-b7a0-c9c75b14e528	1	Other	Other
+789f2caa-cec7-4556-848e-06ef8bcefb16	1	Other	Other
+789f3dab-cdda-4b67-82a8-7d9304d3a485	1	\N	Other
+789f79eb-96dc-4764-babd-69bb4b8ccbc2	1	\N	Other
+789f95d9-5e13-4455-b59e-f68d5239937c	1	Other	Other
+789f9f68-c413-4cb5-9aba-498a9af1c243	1	Other	Other
+78a06ac9-ef6c-44c1-908d-53d09fcb06fd	1	Other	Other
+78a0bf70-de1d-4070-a5b5-e287496b7f61	1	Other	Other
+78a0c419-49f9-4315-997b-ff4cfb9b6bf7	1	\N	Other
+78a11fc7-da76-4a69-972b-4d2022222590	1	\N	Other
+78a16b31-2f34-49ef-b877-b26334dc1aae	1	Other	Other
+78a1cbcb-1737-4cfe-9567-0fc0e3e5aad2	1	Other	Other
+78a1ec00-7dc0-4729-91d1-b6bf00b233f0	1	Other	Other
+78a290e0-2139-4b34-9b56-343aa8ae5e04	1	Other	Other
+78a2b89e-fd88-487b-8cab-b33990e47103	1	Other	Other
+78a2d54a-5d30-4bce-86b3-1df9c7e34cea	1	Other	Other
+78a31e8a-2d61-456b-815d-0cde994f96bd	1	Other	Other
+78a3690d-e388-45d1-9d88-abe3bb002f5b	1	Other	Other
+78a3ae31-d910-4563-99be-07a096c36251	1	Other	Other
+78a3d1ab-b594-4f45-81ba-7235c43cb1dc	1	Other	Other
+78a3e98f-9c8f-42a8-8b0f-bb481292f2bf	1	Other	Other
+78a473ad-87de-4847-a09b-610af25c82d4	1	Other	Other
+78a4c469-b007-48b5-99d4-74d37274c4e7	1	Other	Other
+78a4d240-4cea-4263-b239-fba5807c1183	1	Other	Other
+78a4fa53-a1d6-4f92-97e2-6347199ea23b	1	Other	Other
+78a52cc2-873a-453a-96cc-0aafe2571ac0	1	Other	Other
+78a5558b-34cf-44a6-8670-c9e33abc61ef	1	Other	Other
+78a56643-6552-470f-ad02-95de02a0505c	1	Other	Other
+78a574fe-f0ac-4e02-bd1b-a1c1ea897de5	1	Other	Other
+78a59ce7-4f02-4f5f-8db8-4e23fc98a2db	1	Other	Other
+78a5b792-87e8-448c-8d2a-7414c72234be	1	James	Other
+78a5b7db-9e13-4a0e-8919-4d604b92a860	1	Other	Other
+78a5bb42-fbbd-4bb3-ae00-75f158e33e4c	1	Other	Other
+78a63df6-b21f-4105-ae9b-ea89dcc78a35	1	Other	Other
+78a66a57-3c47-4dce-9109-142f8151af29	1	Other	Other
+78a67955-4a67-41d6-8cb9-ce91669dc019	1	Other	Other
+78a67d1e-9d34-45bd-95ec-235aa929ea54	1	\N	Other
+78a7039e-14b4-4f0c-b9ed-01faa81ebc7d	1	Other	Other
+78a72572-b55f-4600-a9d5-e00d1b053e47	1	Other	Other
+78a740e3-f1ed-482b-83dc-d0306a9889a7	1	Other	Other
+78a748cb-af8e-4098-bc4f-695c1ee7713d	1	Other	Other
+78a769a0-405b-44cf-a5b5-a09c24f55db1	1	Other	Other
+78a78ee0-e395-43f0-91a9-b0d293906a66	1	Other	Other
+78a7b811-5b5b-4768-8754-64fc9304add0	1	Other	Other
+78a7b8c1-cb87-415a-b555-2258e751a12b	1	Other	Other
+78a7e226-e790-45f3-beb3-25efaee1cf6c	1	Other	Other
+78a7e2ff-486b-4f75-8ea9-b72d0ea77ead	1	\N	Other
+78a85c7e-036d-4260-afcf-e87d0664a145	1	Other	Other
+78a8e3f6-e480-4c76-89da-6fb402fbbf7a	1	Other	Other
+78a909bc-be7e-4272-94b0-8c83e1eba863	1	Other	Other
+78a9ad79-2ce1-4b43-9241-e43df2622639	1	Other	Other
+78a9d547-7888-4e38-86a7-f8c586365b57	1	Other	Other
+78aa1d53-d100-4ab7-9b6c-4c3ffd28965b	1	Other	Other
+78aa525e-7257-4bd0-8b26-cb5498321ccc	1	Other	Other
+78aa5ff3-723d-4a3c-8457-29f6eacf72dc	1	Other	Other
+78aa81b8-9a7c-4fa5-9f7b-b4364a363d7e	1	Other	Other
+78aa86af-1ca3-40ec-9c74-ba0088f70f25	1	Other	Other
+78aad281-a195-4b48-9d51-15c008777ad7	1	Other	Other
+78aad6d8-7d7b-48bd-9822-5087957aa8d1	1	Other	Other
+78aad893-ca08-48fa-b16e-b3051369e26a	1	Other	Other
+78abd434-d793-444e-949a-6f254d443725	1	James	Other
+78ac05af-13df-40b4-a7c9-a5adccc8f78d	1	Other	Other
+78ac5053-3472-446f-96b3-92b689e9b0eb	1	Other	Other
+78ac73b5-bffc-4fca-99e4-4e03673b1824	1	Other	Other
+78ac95db-f335-447e-8736-135d88a5aab2	1	Other	Other
+78aca25b-15d1-4c7e-97ce-99bb29ed3e69	1	Other	Other
+78acf720-bdc2-4d9d-a915-2344402572dc	1	Other	Other
+78acffdf-ac88-4fe5-982a-d20d8a0add2b	1	Other	Other
+78ad10ec-9799-4ff7-b174-1b3d016408b7	1	Other	Other
+78ad5fd1-2537-49d1-b5e1-9f086de894fb	1	Other	Other
+78ade1fe-ac08-4a22-afd5-29cda6d0debe	1	Other	Other
+78adfbe2-f05b-4003-ae0f-c2812d5a1bcd	1	Other	Other
+78adfe40-78e0-432b-9f4c-76eb47901dc3	1	Other	Other
+78ae2bcb-8df7-4086-97b9-1077b5f59937	1	Other	Other
+78ae774e-b889-48f5-a744-252afbd77fab	1	Other	Other
+78af2eed-7aa1-4acc-b61e-ff6f03792ece	1	Other	Other
+78af451b-c4a2-4ec6-84d0-1373ccfa9394	1	Other	Other
+78af714a-5b50-418b-9594-f91cfc4ba0ce	1	Other	Other
+78af816a-a40a-4a98-b365-34be262e1eba	1	Other	Other
+78af996b-bbc8-4f13-a05f-64526df0c3a5	1	Other	Other
+78afb4f5-e6cf-442f-bed2-3edf9b28e11c	1	Other	Other
+78afba97-6aa2-4cc3-aca3-c40e9b927454	1	Other	Other
+78afbbb2-f0ca-4cc5-b876-8813dde2598e	1	Other	Other
+78b015ff-74dd-46d8-ba54-f390c085526d	1	Other	Other
+78b05d36-cefd-431f-8974-567ba8f491c9	1	\N	Other
+78b0bd0a-828a-47db-b458-60e090381716	1	Other	Other
+78b1b57e-57f1-48db-85c2-2284587a6712	1	Other	Other
+78b221f0-ba7d-45fb-b4ff-33763c8d48e2	1	Other	Other
+78b223e8-357e-4d84-ad49-403a1e478d8c	1	Other	Other
+78b24200-1a42-42b3-9bb5-f62a09ab0b7b	1	Other	Other
+78b25a88-dc33-418a-ae43-46563cf39401	1	Other	Other
+78b27663-4bc2-4f58-b5bd-af32662f7411	1	\N	Other
+78b29ce7-e330-46af-865d-bd59228d62a9	1	\N	Other
+78b2ad2b-8671-49ea-8ae1-0eafe5bd450e	1	Other	Other
+78b308ae-1456-4554-9925-eee99bcda534	1	Other	Other
+78b31454-ab67-4be4-90c4-850fe23b02b0	1	Other	Other
+78b37ade-95f8-4ad9-8cb8-46888a589a6f	1	Other	Other
+78b3986b-1bcd-4b3e-8adc-a49e54ca680b	1	Other	Other
+78b3a4ec-b8ca-47da-8b55-004e9751ab2b	1	Other	Other
+78b3b277-30c2-47f2-a2fa-efc00e50a62d	1	Other	Other
+78b3bbfb-686b-4d16-a4e7-88388ac845bf	1	Other	Other
+78b412c8-be21-4062-92d2-9cba1ef543c7	1	James	Other
+78b46e47-a6ee-4f89-a46c-994db6c5a183	1	Other	Other
+78b47098-f67d-4544-b6df-550e62aeca72	1	Other	Other
+78b4882b-3681-4094-9ab2-3c3de44532ae	1	\N	Other
+78b49302-eb81-498d-af9e-c334fd7bc5c2	1	Other	Other
+78b4dcc5-6b9e-4659-b5ff-f93140f16b5f	1	Other	Other
+78b4ec8b-3c59-4d60-995d-c8f5b8e8d825	1	Other	Other
+78b5a19b-9e9f-4824-8bc4-05bbe8dfbb6d	1	Other	Other
+78b5e280-20c9-4eeb-b909-f08913e78549	1	Other	Other
+78b60780-1c4a-4215-a119-1d92308813cb	1	Other	Other
+78b650dc-666a-42bc-bb44-0b3bc1c92340	1	Other	Other
+78b6bb26-0c00-42c4-8edd-350526d20c86	1	Other	Other
+78b708db-999b-4d41-b247-e5a37c4eb425	1	Other	Other
+78b71967-461b-4def-9bd5-ef2b1f1ea664	1	Other	Other
+78b73149-25fd-486e-be04-907db116af28	1	Other	Other
+78b75ed5-f029-400d-8c98-332df2bd3efd	1	Other	Other
+78b79090-7d96-475d-9d7c-72d6b8b5b938	1	Other	Other
+78b80c96-13d7-45de-a068-8143d4218606	1	Other	Other
+78b8209b-82d2-4dac-8578-7c1704a8053e	1	Other	Other
+78b824a4-63ee-4281-aa98-247737fe4228	1	Other	Other
+78b956e4-9a8d-465b-9781-19823bb1c845	1	Other	Other
+78b9649a-6cb0-4a99-87a2-15d870d62666	1	Other	Other
+78b990d2-06fe-453b-bb6c-00709c52c691	1	Other	Other
+78b9bd01-d5f3-4382-930c-636d777e185c	1	Other	Other
+78b9d38f-f2d4-488a-a062-384bd0505389	1	Other	Other
+78b9e5dc-6a33-4f67-8142-cd2034a27174	1	Other	Other
+78ba2a58-fa10-4de3-917b-1a51361e2212	1	Other	Other
+78ba86e8-2243-49a3-8ae4-18e3117f0500	1	\N	Other
+78ba8ad1-c1ea-46eb-8183-7410037a7010	1	Other	Other
+78ba9453-5cd2-412d-bb50-d1991a1d57d6	1	Other	Other
+78bb7ee8-eb75-4b92-b74e-61bd2c2a9e68	1	Other	Other
+78bb9e91-8ada-4915-986e-b1823c99a6a9	1	Other	Other
+78bba56f-72e3-42f7-8ed5-1d1d390f29be	1	Other	Other
+78bbc76c-4005-499e-917b-a20b9a1d295d	1	Other	Other
+78bbf460-47d0-45cf-ab6f-e05e11be2a70	1	Other	Other
+78bc4306-8e8d-4b8b-ad44-3ff0d20a7ce6	1	Other	Other
+78bcb625-edb3-4353-beb3-e52de7c1e350	1	Other	Other
+78bcbf83-d64c-4a4e-9a2c-d080bb4734fd	1	Other	Other
+78bcde93-0201-4a9f-8cb6-977ac9abe7a2	1	Other	Other
+78bd6b7a-96ab-4c1b-84b7-68abfc1b217d	1	Other	Other
+78bdc305-d808-41da-87e8-9f277abe1ef2	1	\N	Other
+78bdcd7d-867f-43a5-b4fb-4c96e41cd042	1	Other	Other
+78bde505-1699-414c-9b64-2bd90505783b	1	Other	Other
+78be0915-6eae-4027-b4cb-77d6dcfff99f	1	Other	Other
+78be7c31-da75-4a79-8a23-d334df4cc4c6	1	\N	Other
+78be945e-7f05-41e8-a146-dc7f82477464	1	Other	Other
+78be97e9-c801-43c9-8709-6c18f54ee1db	1	Other	Other
+78bebd70-97b9-4d78-a68e-1ea66bfdf6af	1	Other	Other
+78bf1ded-fd3d-48ce-b3df-470afb484d15	1	Other	Other
+78bf38cf-43a9-425d-bb05-36ed2870b832	1	Other	Other
+78bf4041-b16e-43a4-9d76-10bfcd927788	1	Other	Other
+78bf458a-25e3-4b12-a0d0-dc5783b11020	1	Other	Other
+78bf8e7b-ac8e-4314-87ab-d92fa9021a50	1	Other	Other
+78bfac21-9865-4c7c-b1e2-7a0731c90d51	1	Other	Other
+78bfc7a5-41a5-45cc-9928-381ba566001d	1	Other	Other
+78c09786-e977-49e7-be37-64649e93a445	1	Other	Other
+78c0b035-72b2-498a-b68e-495a762b5286	1	Other	Other
+78c0c0bc-6fce-48d1-b855-177472d19adc	1	James	Other
+78c0d6da-fdea-48b4-84b7-372a896329f8	1	Other	Other
+78c0e2b7-7275-4c47-b303-0ea05195550d	1	\N	Other
+78c139f5-3c9e-4452-bf84-19f764e06c11	1	Other	Other
+78c14e33-ff17-4547-a9bf-e7e57c4eddf2	1	Other	Other
+78c1e579-cddb-45d3-b949-dffd0caa1694	1	Other	Other
+78c21815-37e2-4776-ac14-3aa9fcc7b1a2	1	Other	Other
+78c2550a-abfe-499a-b08e-b34f59447734	1	Other	Other
+78c260d4-8b04-4c96-b2dd-98c4b4e3a3dd	1	Other	Other
+78c2e0fc-fb45-423e-9124-6694efff2101	1	Other	Other
+78c2eb35-bde1-4bf6-a82a-b0de76eb04e5	1	Other	Other
+78c31c02-b4eb-40ad-98c6-0cd4e3491b2d	1	Other	Other
+78c3298d-80f9-47ae-bbdc-062c6652e7f2	1	Other	Other
+78c3381a-0ea3-4eee-8552-42c7a362c64e	1	Other	Other
+78c37475-47c8-4490-aa54-209bd087f5c7	1	Other	Other
+78c37515-50a7-4173-9608-68ee38212d5b	1	Other	Other
+78c395b0-c806-4191-932c-f231e00949d4	1	Other	Other
+78c3b5fc-7d47-41af-92e6-45b6d0c31697	1	Other	Other
+78c3f1e7-09c5-4263-bbb9-649ec7fad628	1	Other	Other
+78c4048c-f1a0-4bcd-a3c2-027cd72ba884	1	Other	Other
+78c432ad-5fc3-4ab4-a415-0b721ed84606	1	Other	Other
+78c47ddf-14ee-48c8-a885-92a13f40630d	1	Other	Other
+78c48639-d954-43d2-9efa-62f5ca7c3464	1	Other	Other
+78c55fc0-25c7-4661-a3dc-79a69c3fe0c1	1	Other	Other
+78c5d6e9-d933-44c2-93cc-d3bfa3258243	1	Other	Other
+78c608e9-50df-4d7e-8c87-44477a8eaefe	1	Other	Other
+78c681db-85de-43d7-a85f-f29087db458e	1	Other	Other
+78c6ec66-bbe0-4f4d-ba2c-f7ece0d1a8f3	1	Other	Other
+78c6f8b1-e45f-47c1-99a6-cb09c6f0f00b	1	Other	Other
+78c77d7f-0cb6-4dae-bc14-c6574f065ec1	1	Other	Other
+78c7d96c-1e21-41bc-9b18-39b3cd415501	1	Other	Other
+78c7de92-98d3-442d-9087-f20016c83435	1	Other	Other
+78c81275-2604-4a63-831c-34380913fc89	1	Other	Other
+78c8439e-9d3b-415d-a876-74d51751d0e1	1	Other	Other
+78c86a05-9b66-4c27-8669-06322e8555fc	1	Other	Other
+78c886bc-bbbf-4324-adc8-fae308d6e862	1	Other	Other
+78c8c6bc-bd43-4e29-8726-bb06a6a41761	1	Other	Other
+78c8f7f3-3e7d-4e7f-b8d5-74acd5cf9114	1	Other	Other
+78c8fd4e-5bd3-4db8-9eef-f5611adf53f3	1	Other	Other
+78c95c31-4204-4088-9a17-6ae07493baa6	1	Other	Other
+78c98aaf-7639-4da1-9b72-dff8b583f966	1	Other	Other
+78c9b41e-8a0c-48f0-96e4-e483166546f7	1	Other	Other
+78c9b84b-e731-4552-ae39-f60b9fed4248	1	Other	Other
+78c9cc72-5d56-4532-b4e8-e18cb64bb8c7	1	Other	Other
+78c9ccd1-09f2-430c-9cac-e2e4ae9d8e97	1	Other	Other
+78c9de36-3c4d-4148-b07f-ea047e5f76d7	1	Other	Other
+78ca17e4-7e69-4c64-bedd-380fa209cbcf	1	Other	Other
+78ca20ce-61e2-48a2-8c07-7d204e904aa4	1	Other	Other
+78ca2475-24b1-4f70-8791-ba6c66509931	1	Other	Other
+78ca2eff-f20f-44f4-b1ac-9300d2c9e97f	1	Other	Other
+78ca5564-4ee1-4264-ae52-c982e4e990d5	1	Other	Other
+78ca65a7-e51f-42b3-88b2-ae5b8ed97902	1	Other	Other
+78cac49b-a96d-4353-a643-595244c3c11e	1	Other	Other
+78caccf5-c419-43e8-a507-4aa819d1881c	1	Other	Other
+78cadac9-9d8b-49ad-be12-2c71db7c66fb	1	Other	Other
+78caed26-40e2-4581-922f-f94b704041c6	1	Other	Other
+78caf984-a492-4492-9d56-5b885cbcf8eb	1	Other	Other
+78cba732-813a-4f9d-a385-2be5c8cbcf3b	1	Other	Other
+78cba9d4-5644-4682-97f3-c319182fa7d8	1	Other	Other
+78cc1565-d73c-4cf4-93f3-dc48282a735f	1	Other	Other
+78cc1e3f-64c3-4121-85c5-8a88bcf0495c	1	Other	Other
+78cc210a-6939-4d98-ac05-36f9bbfd60d1	1	\N	Other
+78cc6cc7-1d3b-49d5-8553-f0e8d168a605	1	\N	Other
+78cc7090-8622-468c-a4fc-429bf848df92	1	Other	Other
+78cc8561-5847-4674-8ab9-081143a02eb6	1	Other	Other
+78cc871f-11c0-4473-8563-a4865eb65b21	1	Other	Other
+78ccdc1d-87b6-423a-ae74-4d4f4d2f8336	1	Other	Other
+78cd2a87-0e24-4428-bb28-a79e91c55471	1	Other	Other
+78cd5f00-37ab-48d5-8e9c-312502961f86	1	Other	Other
+78cdbd1b-f3cd-4c1b-9093-e8940c1d635e	1	Other	Other
+78ce0c33-8ea0-46a7-9303-60d12f75812a	1	Other	Other
+78ce1cc3-453c-4ed4-b6a9-7384e87d07ed	1	Other	Other
+78ce92ff-fe66-4b89-b130-1a234c4961b3	1	Other	Other
+78ce9a49-89d8-4654-84ad-0c0d1959e68f	1	Other	Other
+78ced806-c34c-476f-93f6-19b7a2237b46	1	Other	Other
+78cee5e8-1032-4ef9-80bd-abb339ff26e1	1	Other	Other
+78cefcf2-3be4-47cf-85df-bd9e33c396a1	1	James	Other
+78cf1906-5e93-46b2-b509-7e994eea8ae0	1	Other	Other
+78cfc5fd-4095-4390-a9cd-f253505c254d	1	Other	Other
+78d0921e-1588-4964-bf2b-11a8cb75bae8	1	Other	Other
+78d0a90b-99db-4b64-b07a-593d79ac71b8	1	Other	Other
+78d0d316-2a9b-4db4-ba13-89461c049b2c	1	Other	Other
+78d0df53-0a50-4723-b53e-7d99baa6876c	1	\N	Other
+78d1459a-3d9f-475b-8762-50020dcb5b4c	1	Other	Other
+78d153bd-152b-401f-af2c-bb4d0b68a1b5	1	Other	Other
+78d153e8-3fba-49cb-aa93-53e4551b26e9	1	Other	Other
+78d22ddd-7fe2-421a-807c-77729faa963b	1	Other	Other
+78d25d30-e852-4982-a31f-dfb2818200b0	1	Other	Other
+78d2715b-1311-4155-a294-6929a330662c	1	Other	Other
+78d2985b-129b-4b94-89cf-fd5728b10ff0	1	Other	Other
+78d2a282-c123-441b-806f-cb5b0bb12109	1	Other	Other
+78d2eec4-8043-4c30-b678-a4e4f3cc7812	1	Other	Other
+78d30a86-03c2-4bec-ab79-97b46bbc1b20	1	Other	Other
+78d319ba-56aa-4023-963d-97838e4b9114	1	Other	Other
+78d336ab-21bd-4232-84cf-9373745759b5	1	Other	Other
+78d3a802-1b22-4b2a-b392-66d0ecbe942e	1	Other	Other
+78d3be64-fd7b-4a3e-9357-e5b31fd4d13d	1	Other	Other
+78d3db68-d394-463b-ab05-3ea5dfb9ed4b	1	Other	Other
+78d43e22-3051-41b1-a1ab-b07da4064bf5	1	\N	Other
+78d49cc6-58b0-44e4-8b34-ad50f6240f7e	1	Other	Other
+78d4bd88-aa92-4108-bc22-30b63505490e	1	Other	Other
+78d4fd0f-6740-4379-b076-ce0774d661eb	1	Other	Other
+78d516b5-e032-4532-a499-fe4c2aed2054	1	Other	Other
+78d57a83-6a05-4d22-9958-9dc6892a6e70	1	Other	Other
+78d57ff6-65ff-4ffc-89a2-69c22c090751	1	Other	Other
+78d58790-d105-4b99-b887-14b88ca5f1c0	1	Other	Other
+78d58c11-e02b-404d-a563-3a3b87bcf62c	1	Other	Other
+78d5fb7c-da98-4499-a65b-4bde51bb63ba	1	Other	Other
+78d6143c-a60e-476c-8f30-fc1ecbcc157a	1	Other	Other
+78d62aea-bc79-46b2-a2b9-c78d447dd5f0	1	Other	Other
+78d63e46-fe4b-451c-b053-c9d693fbff9a	1	Other	Other
+78d69b6c-1de7-4a44-bc65-4e4db0586f7d	1	Other	Other
+78d6e1cc-dc5d-43ab-8d35-059f2a45e9d2	1	Other	Other
+78d70d23-1cb3-47c7-8110-764a1fb16265	1	Other	Other
+78d717f4-a4e9-41cc-9e1c-71286d403950	1	Other	Other
+78d71aaa-81f6-4961-a24f-3fe274ba6820	1	Other	Other
+78d71b92-c3e0-4916-a9f5-fbaaee339b01	1	Other	Other
+78d7439d-7f24-4145-981d-f6b4b9b48040	1	Other	Other
+78d7505d-9ce0-4e6e-b9e0-afc7ac3a0596	1	Other	Other
+78d7683c-9d20-4582-ac38-c353ca71e023	1	Other	Other
+78d78a6c-eb66-4353-842f-64f4aef9495d	1	Other	Other
+78d79266-9fdd-4f14-99ef-479f930e754d	1	Other	Other
+78d797f9-e623-4ccf-aa8f-70fab6b99f08	1	Other	Other
+78d7b702-feaa-4fda-acad-f8548fd9bd71	1	Other	Other
+78d8189d-4b5c-490e-b55c-339d0eeec0ec	1	Other	Other
+78d8439f-14df-43b5-a612-fb461774f8ad	1	Other	Other
+78d8531e-24cc-41db-af02-796d85f95322	1	Other	Other
+78d8e1c0-3334-4b11-9045-b4559c430d2f	1	Other	Other
+78d91c73-74f7-4c64-b013-4491009e4fd6	1	Other	Other
+78d9a1a9-3a04-475d-8f02-446741087494	1	Other	Other
+78d9b3ba-3d01-419a-91a3-2c0a0eca4c03	1	Other	Other
+78d9f40d-8522-439c-a792-1515564a7c66	1	Other	Other
+78da24cf-465c-413f-a637-7e6465e37cd6	1	Other	Other
+78da3c37-ad19-439d-acb2-9da807b688a9	1	Other	Other
+78da6d12-26bd-4040-a696-d23d164f55d2	1	\N	Other
+78da8774-f45d-45cb-95fe-b87177c3f405	1	Other	Other
+78da94d3-7a05-4924-8e91-e4f7e27a86e0	1	Other	Other
+78dad790-ea9b-4123-b508-ced8b375a0e4	1	Other	Other
+78dadd31-f513-4ecc-a233-c651856b87f3	1	Other	Other
+78db19bd-3811-4387-8f34-0830d7e14e13	1	Other	Other
+78db6ba8-0123-41dc-988c-ca8405b9c999	1	Other	Other
+78db9e2f-1652-421d-8418-d3cd32a55414	1	Other	Other
+78dbd9d6-9168-4f0d-bff0-944eac4ad835	1	Other	Other
+78dbe87a-1092-4957-b496-7a52c9851810	1	Other	Other
+78dc0c7c-81ea-49a1-b03d-fd0b4ee3e64e	1	James	Other
+78dc3d7a-82f9-46cd-8f52-85b6c1470552	1	\N	Other
+78dc7c2c-7b89-4c1a-b68c-07598aab0aad	1	Other	Other
+78dd1b83-a37a-4a43-bc41-58a30b5b49af	1	Other	Other
+78dd7b27-d34e-4bfd-a148-0bd5c5b3ae2b	1	Other	Other
+78dd95fc-1f85-4520-a161-bb95a3b43aaf	1	Other	Other
+78dd9617-b24d-44c0-bcec-c2b85fb67fba	1	Other	Other
+78de1ce0-9fe7-4423-b7cf-fedb79844a57	1	Other	Other
+78de8406-5b28-4b2e-9dc5-7d4d816a4786	1	Other	Other
+78debd74-dbb9-400d-926c-fef0185e07b1	1	Other	Other
+78df580a-915b-4ee6-a573-dae696581aee	1	Other	Other
+78dfc321-67e8-41aa-8646-c2a932ffa5e0	1	Other	Other
+78dfd338-59b8-464b-bc41-73f7d321170c	1	Other	Other
+78dffe9f-bf7f-4a4d-b268-7630be31712f	1	Other	Other
+78e0bb32-7eed-4c0f-8109-b062fc69fd76	1	Other	Other
+78e0ea3c-be3f-4f82-abc4-f3f6389be9b1	1	Other	Other
+78e10943-0f0f-4794-bec1-90ecf5c6b01c	1	Other	Other
+78e1739f-c5d5-4f86-bcae-3bdedeaa899b	1	\N	Other
+78e1833d-3e5b-4264-8e8a-60406a408412	1	Other	Other
+78e18657-0332-4f2c-a0bd-6e3a293aabd8	1	Other	Other
+78e1a6d8-16cf-404a-8041-682e2ad82a98	1	Other	Other
+78e1c5b6-b12c-4d91-b0aa-f1fedc014052	1	Other	Other
+78e1dbe6-8c81-407f-ad2f-a0a15a663d1a	1	Other	Other
+78e20d84-f976-4752-a827-5dbcc4ef1708	1	Other	Other
+78e25c0e-5d17-4008-a1fb-d3cfafaa35e4	1	Other	Other
+78e29fba-1568-41ef-8c99-fa1bc3f182a7	1	Other	Other
+78e2a9e7-1c0a-4bc9-a9e9-0b6f277432b7	1	Other	Other
+78e2c4d5-c503-4b6d-a1cf-5c40fa8a59bc	1	Other	Other
+78e2d02f-4b5b-4057-b514-0ea2257283e9	1	Other	Other
+78e300b2-29c6-403e-954f-8c26609f88d7	1	Other	Other
+78e32333-6719-4d19-9626-04469c119852	1	Other	Other
+78e325ac-2059-11e8-ae9a-fa163e8624cc	1	Other	Other
+78e331c3-c105-4816-a343-00bff59cc607	1	Other	Other
+78e34159-7a40-4758-9966-d86b6f155d83	1	Other	Other
+78e36943-8cb0-4f61-8c1f-ab053a9b7797	1	Other	Other
+78e38782-2b85-49fb-bea2-73d307cbd2b7	1	Other	Other
+78e3b224-fe3a-4dab-a5cb-ff60979616d1	1	\N	Other
+78e3d071-96e4-4208-939f-ad4021ce7d50	1	Other	Other
+78e3e223-48d3-4f51-a185-9864afa179d6	1	Other	Other
+78e44991-0ce6-46f9-8070-0732e29301bb	1	James	Other
+78e48469-c8dd-4f0f-9f7d-ef4d71ae10e4	1	Other	Other
+78e4b5c7-6786-41ac-b2bb-51405b881d7e	1	Other	Other
+78e51080-5765-4fa1-86e1-422b369a2fa3	1	Other	Other
+78e55d8b-f26e-42bf-900a-211478f3889c	1	Other	Other
+78e57e8a-3a03-4cec-ad56-9d87aac8cb24	1	Other	Other
+78e5800e-51fa-4da5-afa0-7b6b7e30104d	1	Other	Other
+78e582ba-e0aa-4754-8c03-4796cc1da400	1	Other	Other
+78e5e936-aec1-4201-845b-a7aae1970aa4	1	Other	Other
+78e5eb02-5099-4d29-8386-79248e1097c7	1	Other	Other
+78e5f624-6c6b-4c2f-b761-0e96067c79fb	1	Other	Other
+78e5fff2-1375-4a69-b8ea-383893cb2f5d	1	Other	Other
+78e64987-2174-4cb7-ab93-94748cf0fb4e	1	Other	Other
+78e667b4-d7d3-4840-86d6-e0cf419971c6	1	Other	Other
+78e6db4f-eab4-4210-ac1f-aa9154e1e35f	1	Other	Other
+78e6e7b0-659d-47ef-bf31-915c4ac91bb6	1	Other	Other
+78e737cb-8912-47ba-a5d2-911c57393811	1	Other	Other
+78e7615e-dba5-4c5f-a150-d74f2bf3a8ab	1	Other	Other
+78e789c7-37a2-4af3-91c8-52cc0deaccd1	1	Other	Other
+78e79020-1ce0-4de4-9a73-1f725349d43c	1	Other	Other
+78e793e3-c265-405d-85c9-e2a2c3994c88	1	Other	Other
+78e7adec-954b-41ab-9435-ff01a97af0a6	1	Other	Other
+78e81b13-96f3-48d9-aec6-7d5b085db7c3	1	Other	Other
+78e863d1-85db-48f0-b8b8-883a6ce4a23d	1	Other	Other
+78e881cd-a970-45ec-92f9-bec6d02410c1	1	Other	Other
+78e8cc5d-70d8-4444-8e13-51ce269fcc1b	1	Other	Other
+78e8e611-fa58-4f5a-bff4-3241a6a304a2	1	Other	Other
+78e8f1f4-668a-4403-9a0d-5a16f5283136	1	Other	Other
+78e90b4a-4541-439a-8e32-9d8c89d15d22	1	Other	Other
+78e9460c-b2f5-467b-9793-887338ca2f30	1	Other	Other
+78e950ad-4ed7-45c3-93ea-5d0c576e3254	1	Other	Other
+78e95e6d-d091-44cc-9840-6d19f41988e7	1	Other	Other
+78e9ee90-edcc-4264-9ae4-9731db30f9ee	1	Other	Other
+78ea4667-8602-4432-9211-5df4f9baa2c5	1	Other	Other
+78ea94c4-9c7d-4556-85a1-ca3173a70275	1	Other	Other
+78eab7f9-f0f0-4222-a20e-829f011941a4	1	Other	Other
+78eab9b5-08b0-438e-81b6-2a4e5a6b4844	1	Other	Other
+78eaf6d7-ad2e-495a-ba78-c928fcec797a	1	Other	Other
+78eb089a-27b4-4961-9d1f-8593a80532a6	1	Other	Other
+78eb7c67-1190-4cb0-8640-5c614beab33c	1	Other	Other
+78ebcd1b-93da-4ce5-8d08-d2e2eb831e1c	1	Other	Other
+78ec05d1-39f0-4ed2-8c01-295dc4af1970	1	Other	Other
+78ec1bc4-c8ca-4900-b942-a87e28c669bb	1	Other	Other
+78ec29b4-380e-4887-b169-6ee907a3c349	1	Other	Other
+78ec81ad-187e-480d-9eaa-2a851846b7db	1	Other	Other
+78ec879e-990b-4b91-9be9-5ba5a544c7f0	1	Other	Other
+78ec9ea7-3574-426a-978d-bbc4820156de	1	Other	Other
+78ecda7f-8a79-41d7-b3cd-b33b810bba7e	1	Other	Other
+78ecff84-4990-4fc9-bb43-fb0f97c0a9b6	1	Other	Other
+78ed710e-85e5-4bc1-a88e-4aa83fc6bd16	1	Other	Other
+78eda27e-ab85-4cf9-9ed6-16221dcf4acb	1	Other	Other
+78ee3bf4-ae5e-4e78-8fe7-5e2c0dcb3695	1	\N	Other
+78ee82d5-8179-4233-8edf-237aaefce76b	1	Other	Other
+78ee872e-76b7-4b79-b7f5-4937e2389fa1	1	Other	Other
+78eea363-6a75-4f5a-a406-5ad17ed83df1	1	Other	Other
+78eec5ec-1b30-4b1b-8110-eb2e4a5c743e	1	Other	Other
+78eefb3e-fc6d-45f7-99d7-6b5565be5d6a	1	\N	Other
+78ef07f5-da8a-45ff-b414-30920c9794a4	1	Other	Other
+78ef1da6-c8e4-4c0a-a959-a96f5a8cfce6	1	James	Other
+78efa861-bf56-43e9-be55-625c88fb1f1c	1	Other	Other
+78efe480-fdd8-4a6b-9baf-ac1ff4777f8f	1	Other	Other
+78f0c004-576d-4fad-9bc7-ee4cbe59f691	1	Other	Other
+78f0d0a7-a2c6-45c4-bafa-b9ab9cd68ebd	1	Other	Other
+78f0dcd0-149a-4d8f-a9bd-55c4d351d085	1	Other	Other
+78f103df-8475-450e-8c45-8f95434b8ea8	1	Other	Other
+78f10815-196a-4f11-83fc-843fb990f4cb	1	Other	Other
+78f12b82-6e3c-4089-a37c-3a588dd4c145	1	Other	Other
+78f1485c-4994-44e3-96ca-d856eadcaf0f	1	Other	Other
+78f1b5b2-5779-4e6e-bd83-770ae006574e	1	Other	Other
+78f21f24-a64c-4659-a362-b6467bc34d82	1	Other	Other
+78f2252b-b79d-4724-8bd5-41f4df81ea43	1	Other	Other
+78f2256b-2469-4427-97f9-62d11ccf7e29	1	Other	Other
+78f23f86-6b17-45f8-96b6-3ec086d66d69	1	Other	Other
+78f25465-be6b-4e25-a6c8-b30d5fee2aa0	1	Other	Other
+78f26772-8d98-49da-b68e-6482ff875d22	1	Other	Other
+78f269f1-0a05-4caf-87e6-160f7be70ce8	1	Other	Other
+78f298a7-950a-4848-a3aa-b7311cbfa5ed	1	Other	Other
+78f2ad7c-df78-472f-ba28-7363d0f59b67	1	Other	Other
+78f2c4c9-8f46-4e54-af0c-712b8552c838	1	Other	Other
+78f2e788-a445-4a7d-891e-541f8cd1ce38	1	Other	Other
+78f2ec76-5130-4ee5-a367-23dd3e3b3184	1	Other	Other
+78f32d69-be2a-47f3-887e-124aa75c8d05	1	Other	Other
+78f335aa-98cd-438f-a048-bde8310f8227	1	Other	Other
+78f349d3-ab8a-410c-9deb-a69fdaf91f8f	1	Other	Other
+78f34e30-d354-4ae7-adbc-5c89a283afa2	1	Other	Other
+78f361e0-4244-46fd-ba3f-b16d1e8ae1a0	1	Other	Other
+78f371f4-50eb-417d-b908-ac2047658bd9	1	Other	Other
+78f3739e-eded-4cf2-afd4-48c91f78eea1	1	Other	Other
+78f37789-65ae-429f-b697-184f578fe8b0	1	Other	Other
+78f3a6c7-f88c-4a15-83a5-a6070d5956b5	1	Other	Other
+78f4043c-0f08-4387-8221-f86a482cc686	1	James	Other
+78f40a88-daf1-40d7-9f92-e0e24323be5a	1	Other	Other
+78f42c42-45c4-4409-95b3-a9c563eb44ec	1	Other	Other
+78f46dbf-e434-496c-9b44-41933d7824ff	1	Other	Other
+78f474db-3070-45fb-a849-01c1d16daafb	1	Other	Other
+78f4a2f8-b548-4254-bf9b-632df17cfe68	1	Other	Other
+78f514f5-6864-4c97-a3d0-e33a87e584b6	1	Other	Other
+78f54c0c-95bb-4b95-b18f-7f713a5c968e	1	Other	Other
+78f5774a-5008-4734-973d-81066b9e9c9c	1	Other	Other
+78f59640-3f1c-4b36-9150-22820d92fd0b	1	Other	Other
+78f5a8bc-de24-4e11-8a1b-a3014127a929	1	James	Other
+78f5c4ec-897d-42b0-a35e-214d46ae5595	1	Other	Other
+78f6386b-823a-4e77-8939-777f23d4a358	1	Other	Other
+78f68459-7cc4-4ba5-a3a3-ce1300ab0ea6	1	James	Other
+78f68908-8cc0-472f-9985-3b301b18e6c9	1	\N	Other
+78f6aeb2-01f2-4bb6-b710-00f0897fc453	1	Other	Other
+78f73c25-a664-4010-9a82-12c2ae86a766	1	Other	Other
+78f769c2-1f0d-4c34-b941-a7d519689387	1	Other	Other
+78f7770b-f2ec-4f09-9663-b0e8b3439313	1	Other	Other
+78f78e67-a88d-4312-9f2d-5a903b9eae9c	1	Other	Other
+78f7a60f-f6cb-4a36-8fa6-5c68d65b4db1	1	Other	Other
+78f7ad69-6ff9-49a4-9d97-1440f2aa6995	1	James	Other
+78f815e4-6954-4670-8a52-320f51474c2c	1	Other	Other
+78f844ac-69a2-4574-9494-5f0ee4516d2a	1	Other	Other
+78f85950-5006-45bb-ac33-6c9ce789b0e9	1	Other	Other
+78f8676b-7214-4159-bd02-19089037c5f5	1	Other	Other
+78f86f02-253a-45ae-b0e9-61a514da4f9c	1	Other	Other
+78f8d391-9748-4052-a755-cb85c66b3387	1	Other	Other
+78f8dc45-f88a-4de8-9bd8-38364262c462	1	Other	Other
+78f9017a-4702-40d7-86b6-fd39406d5b38	1	Other	Other
+78f949a7-1271-4770-bed9-19e97a8e3dec	1	Other	Other
+78f9d51c-6470-4f37-a7b8-a6c5ab13731f	1	Other	Other
+78fa7628-5afa-4b53-a810-5944c39b4b46	1	Other	Other
+78fa890a-abee-40bb-997d-48b50fec1635	1	Other	Other
+78fac95a-05b4-47e8-9111-e47cd96b810a	1	Other	Other
+78faf381-48ea-4a0f-87d7-8c8f73cbdfa7	1	Other	Other
+78fb7040-48f2-4d61-a76b-d3ce9a2b13ba	1	Other	Other
+78fb721f-d22b-480f-a921-789ab2978e26	1	Other	Other
+78fb985d-30d4-4948-809d-1ad53e1e8cf6	1	Other	Other
+78fbae95-73ea-419d-9583-d22578491138	1	Other	Other
+78fbc6e1-323e-4299-a40c-f2c3d0b23705	1	Other	Other
+78fbd74f-031f-4863-9966-289a0afc046f	1	Other	Other
+78fc4ac8-03ac-4a90-80f4-2e97027462a3	1	Other	Other
+78fc626e-0849-4890-8859-d9c3e5891db9	1	Other	Other
+78fc68ee-dec7-4841-8105-52b144839115	1	Other	Other
+78fd6686-30a6-45d4-aa44-0fe00530cd39	1	Other	Other
+78fe3a01-9f4e-45c1-8a5b-61d8fb1e4848	1	Other	Other
+78fe8178-5ffe-464e-8efd-67212e7fd731	1	Other	Other
+78fe95b7-f4c8-4dd1-8748-b6ea31988431	1	Other	Other
+78fea75a-73a0-42fd-8ca2-eaa101c8dc89	1	Other	Other
+78fef434-3d79-4683-b01b-25f2cbbf6b26	1	Other	Other
+78ff0c07-7997-4885-a25f-d4155e29a999	1	Other	Other
+78ff10a3-97ac-476c-8592-3597aa80c614	1	\N	Other
+78ff1b82-16fa-4017-9e82-bcd50b4a569c	1	Other	Other
+78ff3b8c-7fac-4cf4-953b-9e1e8ccf729f	1	Other	Other
+78ff6187-2ae4-41dd-9865-78fc7ca08c97	1	Other	Other
+78ff6aa3-c754-41a1-8e90-33560e0c2dd4	1	Other	Other
+78ff70ca-4d07-4a41-be27-7468fdb29f15	1	Other	Other
+78ffa50e-5c94-4a55-a9f8-c91d4adff431	1	Other	Other
+78ffa795-b57c-450e-aa2d-6fa6386632ab	1	Other	Other
+78ffb017-3a95-44a4-b9d7-cd56075e79ec	1	Other	Other
+78ffb417-c67a-4e15-a766-8f377ef0aa2a	1	Other	Other
+79002215-5b6f-4c3d-8533-a4d9b70eadeb	1	Other	Other
+79003c3b-caef-46a1-941f-22acbbec7aec	1	Other	Other
+790096b0-7827-4ae4-9fd3-57be0ccc7b97	1	Other	Other
+7900bd94-0004-4679-908d-13c648887cd2	1	Other	Other
+7900c91d-2955-4d40-ad13-b88983a1b183	1	Other	Other
+7900dce2-0cf1-49c2-ad4d-3e48bc225049	1	Other	Other
+7900e14d-5286-4f62-bb5d-ccaa20440fd0	1	Other	Other
+7900efed-72a0-4a27-8250-aa10260cf175	1	Other	Other
+7901336f-66ce-45a9-8ba9-44b491f5f899	1	Other	Other
+7901ffe4-df38-4180-87f2-9aa9713c59ba	1	Other	Other
+7902b948-1f70-4bd1-8c60-a777e87de168	1	Other	Other
+790392e4-e0f7-49f1-95f1-db0e1b367e0b	1	Other	Other
+7903dfaf-e7c7-4784-bdf4-e70ff833ed70	1	Other	Other
+7903f73e-d4cc-4f21-b2ac-e374802e2df5	1	Other	Other
+7903f87d-12d9-4537-961d-3a847b7cf278	1	Other	Other
+7904242d-228a-4656-8c41-ae3cb87dd2ce	1	Other	Other
+7904323d-72c0-41c9-aceb-e84953f0d1a5	1	Other	Other
+79047941-f2c2-4a0c-8e48-bde8d95244fd	1	Other	Other
+7904b978-8fbd-4e7e-bae7-f5319fb7a4ed	1	Other	Other
+7904c4a3-8e44-41c2-bf52-894722c76de8	1	\N	Other
+7904d0cb-8e8f-456a-9054-257c384ff4b8	1	Other	Other
+7904ee44-18df-42c2-be3d-c5937b5a75c3	1	Other	Other
+79052bb5-117e-4c97-9d3c-fa7cbe1db459	1	Other	Other
+79053ea2-4521-4a25-8eb7-8e37ceb06d99	1	Other	Other
+790550a5-d50d-4877-bf0e-886807d353f2	1	Other	Other
+790597f2-8ca6-4d42-a713-c44fa578c82c	1	\N	Other
+7905b716-ef61-4b1d-9fca-4691a81dba17	1	Other	Other
+7905da58-41c7-4c74-91e4-1be569fdc27d	1	Other	Other
+79060b85-1367-43b9-b5eb-4443db5d19b0	1	Other	Other
+79062ed7-5406-466b-92f9-b1841a831127	1	Other	Other
+7906435a-9e33-483f-90d7-3d1e6ba3e3e9	1	Other	Other
+79064843-45e0-44f8-b330-4100e4060418	1	Other	Other
+7906ac04-f620-4129-8a1a-32e83d4d154b	1	Other	Other
+7906d5d1-d578-4831-8eb4-fa484035ae89	1	Other	Other
+7907817b-419e-4ffc-ade9-51a31196eb95	1	Other	Other
+790792c7-0777-428f-b4bc-3b90c9a3aaf3	1	Other	Other
+79081884-bcbb-4797-baf8-221980a5b24b	1	Other	Other
+79081ac1-5220-45c5-9828-3a32c80e354f	1	Other	Other
+79081cd3-e6af-43bd-ba41-e1b8484a5169	1	Other	Other
+79083dde-029e-45d0-b2c8-c899da43f389	1	Other	Other
+79085e33-a850-433b-961e-762b0d34de45	1	\N	Other
+7908eeeb-ce5e-4f1e-a287-1587062f2918	1	Other	Other
+790928af-7ff6-48cf-8247-53fc5900d1b7	1	James	Other
+790933cd-a6dd-4f1d-a987-b0ee2b3ad8e3	1	Other	Other
+79093ad7-ea37-41ae-9d59-b4911d156a55	1	Other	Other
+79098b31-830a-4944-aa4f-e9ec1052de90	1	Other	Other
+790abd73-f5ec-4b63-823a-ee8e84374191	1	Other	Other
+790b103d-3e5e-4cb0-8a12-01c5cf169584	1	Other	Other
+790b1e38-fcf1-47e0-bc97-8b2e410cf2b8	1	Other	Other
+790b2e72-31f9-4ca3-a3fa-823823dd89c6	1	Other	Other
+790b36c3-f33a-419c-b9aa-b855925554bd	1	Other	Other
+790b8072-b76c-47bf-b6e5-a2c7427a4163	1	Other	Other
+790ba1a8-9ce9-4493-b2f2-37d8ca0d64d3	1	\N	Other
+790c401d-8f2f-4c42-9a09-646a1d6358cc	1	Other	Other
+790c42c3-1375-410f-ab82-bb64ab5206b7	1	Other	Other
+790c722f-dc8a-4f3b-86c7-7ceefbeff6df	1	Other	Other
+790cb4c2-a063-4d56-a754-e143044cfa56	1	Other	Other
+790d312f-25e2-43d1-b733-d9eb12fb7fc2	1	Other	Other
+790d8c48-191e-4c41-ad8c-bffe01f56a06	1	Other	Other
+790da631-eae8-49c9-a3d8-7c2862f18966	1	Other	Other
+790dee5e-c12c-489a-9718-c01666dc8bc9	1	Other	Other
+790e0879-202e-43a3-8140-d7cd619595f3	1	Other	Other
+790e2e00-c7f2-423d-86f0-7f22e75503d8	1	Other	Other
+790e9c21-6354-49f5-91d5-9c72a4221324	1	Other	Other
+790ec957-f891-439a-8d3a-05bbad9c7df7	1	Other	Other
+790f26c1-5831-4671-8eb6-ccf7034430e8	1	Other	Other
+790f35bf-8800-4b26-9b0a-674c669d2e2a	1	Other	Other
+790f8daa-85a5-4e73-be19-5e21145f9855	1	Other	Other
+791037cd-c75d-4b97-b4a3-42bc1a03d422	1	Other	Other
+79103a2f-aaee-4860-95df-c1f6833b76de	1	Other	Other
+79103aa0-d97d-43e4-8240-d6b6cd583200	1	Other	Other
+79104b79-58e3-4baf-8999-7616e2b3dd9e	1	Other	Other
+79105865-71e5-42f2-bd20-82e1bbccbfd2	1	Other	Other
+79105db1-3dfd-425a-bb31-03fb7ebe860c	1	Other	Other
+7910669a-165f-4c20-9995-0ea4b6f2dbf2	1	\N	Other
+791069a3-39d8-458e-9456-ec072653ad26	1	Other	Other
+79109de0-3613-417c-8f62-7dfd4d4bd2e4	1	Other	Other
+7910b262-c8b4-4fe6-ba73-6ece73e2a605	1	Other	Other
+7910b938-29d0-459a-aba8-cd33ac41671b	1	James	Other
+7910c6b5-0bdc-4d4e-a3e1-9db70c4b39a4	1	Other	Other
+7910d2df-0723-4c44-87f6-08b45a43aa40	1	Other	Other
+791133d1-5caf-4daa-a34e-c62f701980ad	1	Other	Other
+79115b31-cb9e-4263-af56-1c9712799f99	1	Other	Other
+79116418-2b47-4002-ab95-e09cfdef4c7b	1	\N	Other
+7911e890-aac3-4802-8e97-bf4cac89b7f4	1	Other	Other
+791238b7-4113-403b-b0ba-3f6293e0e62f	1	Other	Other
+79123ce3-0322-487d-8451-79e7e2d11439	1	Other	Other
+79126342-28e1-4ae2-b1ed-c3be04221441	1	Other	Other
+7912d049-6735-4956-9561-2a1a46fbd3e4	1	Other	Other
+7912ee3a-2b25-450a-bb0b-adc737ac2243	1	Other	Other
+7913acd9-8765-405e-951e-03a45e0fc717	1	Other	Other
+7913ae06-c602-420e-b188-0c648284c31b	1	Other	Other
+7913efd4-c996-487a-bbcd-0e105cb3766b	1	Other	Other
+79140b18-a29e-4394-b480-f4c1885bef86	1	Other	Other
+79141628-49a6-4410-b7a2-f28f02ad91a2	1	Other	Other
+79142e5e-4746-4079-bbe0-e5b1c05c2021	1	Other	Other
+79146c4e-8a0a-4a24-89c4-65a04284f281	1	Other	Other
+79147024-8a12-4107-b945-3700bfcae103	1	Other	Other
+7914cbc2-942b-4237-8a6b-167e8a1ab823	1	Other	Other
+7914d3a2-a09c-4d6b-932a-e572a7f879ba	1	Other	Other
+7914e9b2-26e2-4227-b03b-25cd75e664b7	1	Other	Other
+7914f2c6-50b1-4c71-a8cc-6a977cef9429	1	Other	Other
+79153afb-1e9e-4a0b-abd8-3c66e41734b8	1	Other	Other
+79154544-3938-4bb2-8ac5-3f1b8c6d04a0	1	Other	Other
+79157841-0e6c-42e8-8125-1619d0cc0610	1	Other	Other
+79158a1d-0d63-44c2-9078-006c23d79f64	1	Other	Other
+79158ed5-d8f9-4c73-808e-8006c8c814d8	1	Other	Other
+7915d208-d3e9-476d-9bd7-e20b16213845	1	Other	Other
+791659c3-7239-4d99-84a5-e9eef85a8fd6	1	Other	Other
+7916793b-8025-4375-b80a-6a54c3abf647	1	Other	Other
+7916aa9c-2bb3-4386-883c-843f219d2057	1	Other	Other
+7916c709-8fcc-4507-b6bc-b1f263cba195	1	Other	Other
+7916dbf4-4172-44c1-9c42-16714a6ae9a6	1	Other	Other
+7916e1b1-346d-4ff6-bf2e-9322a62cbac8	1	Other	Other
+791749fd-d4a2-4b3a-b967-60e4dc0ae17b	1	Other	Other
+79175730-4d72-473a-8121-e172f8e74ee9	1	Other	Other
+791776fd-aad7-4249-b9c2-13f906b7396a	1	Other	Other
+7917ea81-3491-4da0-b61d-8b33bc420b7d	1	Other	Other
+79181a57-a29d-4ad4-8c51-4c25f809f365	1	Other	Other
+7918888c-7f67-4206-a199-a9c27adc0a55	1	Other	Other
+79188c1f-166f-4aab-b820-883d5ea63b12	1	Other	Other
+79188edb-0396-44de-b235-67a37f88da61	1	Other	Other
+7918ab56-99ef-41a5-a9e1-eabb98447a49	1	Other	Other
+79194bc5-a210-45f1-bc88-7657acbf405c	1	Other	Other
+7919b25b-f76f-4d85-8c92-acb0bec219cc	1	Other	Other
+7919cf91-3848-47b3-b1e9-a298bb0a4afb	1	Other	Other
+7919e736-2df3-4c65-b8d2-f7054d3c5486	1	Other	Other
+791a29ab-1b14-41f3-8cfc-43b23aad2ac5	1	Other	Other
+791a53e7-88f5-4cbf-add0-188e03fe0fd4	1	Other	Other
+791aa05a-bc0d-43a7-af0b-df44c826c964	1	Other	Other
+791ae7c0-de02-40b8-9147-bfeb75664e9c	1	Other	Other
+791b1ca5-f382-47f5-b07c-61157aa8a4fa	1	Other	Other
+791b39a1-83d0-450b-9b79-4b7857aeb199	1	Other	Other
+791b8314-3e0a-46cc-9b18-846fdbcd20e5	1	Other	Other
+791b8b26-7ffa-406f-bc86-d162a82a0383	1	Other	Other
+791b8fe5-b391-43bb-a91d-4ede2de3c288	1	\N	Other
+791bd575-4895-4ef6-9452-d1a380c50cba	1	Other	Other
+791bfa6c-e2fa-41ef-ab60-4d4560c88896	1	Other	Other
+791c0d24-2d5e-4d84-be4a-32cff681bdfd	1	Other	Other
+791c0e16-ab52-49f2-be6e-0e7bd56d04de	1	Other	Other
+791c3e86-f68b-453f-9186-ae25b5f6f649	1	Other	Other
+791c40d9-980d-48a6-b0e1-903ae24f5314	1	\N	Other
+791c4b1c-985b-4b6b-a0b6-ea6c1923a025	1	Other	Other
+791c7bc3-d870-42e6-925d-314c389d06e3	1	Other	Other
+791ca9f1-d01f-494b-8a05-cca6aaf43470	1	Other	Other
+791cceab-613e-4fce-bffa-0336c5bbb996	1	Other	Other
+791ce3ff-135c-41ab-9c94-6e792c9acb83	1	Other	Other
+791d0737-1c11-48b3-afd7-80119e8b5de5	1	Other	Other
+791d2dd1-71b2-4df1-b471-cee75d2dcbd1	1	James	Other
+791d3c54-f441-44ca-9d29-62e2887e10ca	1	Other	Other
+791d5b0c-924f-44ce-b57e-7cec269750d2	1	Other	Other
+791d963f-66e8-4b3b-a6ad-02b5bac6300b	1	\N	Other
+791daf83-a875-45e1-8472-11851b5fd2ab	1	Other	Other
+791e7582-a5ad-4c2c-a52f-1be35ce3d380	1	Other	Other
+791e975e-aa09-4dae-8d86-0ec6cfccfbe2	1	Other	Other
+791eaadc-ef34-44d0-a140-b6279144abcd	1	Other	Other
+791ec8df-1511-4a15-b70d-b8596f63cda5	1	Other	Other
+791ee505-265a-4fef-a7be-ebb359390963	1	Other	Other
+791f3f6a-6a42-476b-852e-2f6df8414ef2	1	\N	Other
+791f4e22-c585-4ae4-9faf-e15140144027	1	Other	Other
+79204578-0716-44fe-83f7-a981b13c3bc7	1	Other	Other
+79207baa-0f27-4352-9f26-f6a134df8108	1	Other	Other
+792103f2-b2dc-4feb-8077-248854b9d292	1	Other	Other
+7921e5e1-10a1-40ef-97cb-04feeb582f94	1	Other	Other
+7921f1c5-fdcf-4e81-b8bf-47ed8eb8cab0	1	Other	Other
+7922439d-3c38-42d3-8691-fcc88b76e7dc	1	Other	Other
+79224f16-2409-43d3-b6a4-e067f40f8da8	1	Other	Other
+7922d71e-2ad1-4396-8c4c-a7e030a7c19a	1	Other	Other
+79230ffa-f463-4fe5-8d54-df2d59e178d4	1	Other	Other
+79231724-3f82-4408-ba62-df635cf2e9fb	1	Other	Other
+79246ec2-069d-40eb-a629-c58f99ad03a1	1	Other	Other
+792474ab-c942-4519-9d2c-edca61e9009c	1	Other	Other
+7924abef-4095-4a42-b07e-06ddd64f2d3e	1	\N	Other
+7924ad5b-1919-430a-9522-65c870b62699	1	Other	Other
+7924caa2-49bc-426e-8a85-92dbbf4b97de	1	Other	Other
+7924cb0b-a52c-4f09-a006-0e7bbe8b5319	1	Other	Other
+79252b20-8b9a-4c4e-bbf0-4e775a5e5471	1	Other	Other
+7925332b-0413-4b93-b827-42a45cc12741	1	Other	Other
+792589d4-4771-445f-bc10-fc6f80da266f	1	Other	Other
+79259785-1218-4962-8bd8-a14b4472bf59	1	Other	Other
+7925b2a2-11dc-4e88-96d6-f8aeadb4ca6c	1	Other	Other
+7925b5c5-9615-4529-9f21-d63d24b46f57	1	Other	Other
+7925dc88-edca-4d6b-ba0f-b7856a8ccc4c	1	Other	Other
+792623c5-1be6-4073-a54a-da7af95da770	1	Other	Other
+79262b07-093d-44fd-aeff-2e6c167142ee	1	\N	Other
+79263194-6c64-433f-8499-eeb52473b0c2	1	Other	Other
+79263bd6-14a6-437c-be71-e1e646ed0177	1	Other	Other
+79264464-fb89-45ee-8db4-10f922bb96fe	1	Other	Other
+792645da-acf1-49c7-bcd8-66fda4ec9aae	1	Other	Other
+79264e8d-dc48-49c5-bc56-30ae64c77231	1	Other	Other
+79267ca3-b5fa-4197-85d1-68cafdda5be2	1	Other	Other
+7926f51a-48c1-4ebf-9c82-809dbc37a9ae	1	Other	Other
+79272f02-1f45-4428-b448-9137fc2e0003	1	Other	Other
+79278a8f-033e-4573-a777-06bac8c3d1d7	1	Other	Other
+7927a835-860e-453a-91dd-20b615358c3b	1	Other	Other
+7928361e-96d4-4b63-9925-0a68139eeae5	1	Other	Other
+79286788-7a0f-4811-a6ed-029352c247e5	1	Other	Other
+7928bf3f-af37-4c7a-a6db-0de214b06619	1	Other	Other
+7928c4f6-5934-43dc-9188-45c379f95875	1	Other	Other
+792933af-51ab-4611-bc5e-8bba71628cdf	1	Other	Other
+79294b60-27fe-4f65-ad4c-e393980710fe	1	Other	Other
+7929556b-9fd1-4828-bcaa-ae08ccb2fa07	1	Other	Other
+792985f4-bc03-4425-877d-7e3aa009dbd7	1	Other	Other
+79299302-6416-4b60-ab16-b0a3af7c2ab2	1	Other	Other
+7929b471-6134-4c32-810f-2bb4a25bcbfd	1	Other	Other
+7929c521-cef5-4310-8ed1-bb5a122d3eb4	1	Other	Other
+7929fb23-697f-4247-8a6d-f1278b718852	1	Other	Other
+792a70f8-3500-447b-9177-59fcff6cdf76	1	Other	Other
+792a86e3-ebf2-4fc5-b880-fef0e7750cf9	1	Other	Other
+792ab234-0a4d-4131-9032-9bb41808a24d	1	Other	Other
+792ab65e-397c-4ec6-9e3f-214f8e8b3561	1	Other	Other
+792ac1c4-2b63-4343-bebf-c5892347c5b5	1	Other	Other
+792ae7fc-60db-429c-a136-7aa3137e8046	1	Other	Other
+792af71c-51d0-4d77-b02e-edf8d89e6f97	1	Other	Other
+792b0133-40c9-4054-98e3-4c876c9ca19a	1	Other	Other
+792b22f6-0e8b-4a02-880a-0dcdb87d5776	1	Other	Other
+792b73c9-f1f4-4cb4-aa81-abeb57b99e63	1	Other	Other
+792b7425-347c-4c28-b96e-f00b6642069c	1	Other	Other
+792bd518-c43a-413a-bb6d-bca0959e902e	1	James	Other
+792bee61-29c5-4979-8576-41d1c4b90a02	1	Other	Other
+792c2918-f33a-4c8a-b4c7-ea000a9ed205	1	Other	Other
+792c48bc-33bb-4297-a925-c8c15f0b59dd	1	Other	Other
+792c5998-3fad-4e95-917b-22a29ba3dd46	1	James	Other
+792c616a-be1e-4f58-818b-2ed81f93088a	1	Other	Other
+792cc0a3-672c-4e36-9b03-7b4d8ae0f1a9	1	Other	Other
+792cc12a-9c00-479d-8e35-e23fd7a2a937	1	Other	Other
+792cd10e-2568-4d18-9248-b884ce7a6983	1	Other	Other
+792d0acc-6726-4fd1-a69b-e050149b5596	1	Other	Other
+792d1753-669f-4fdf-bd73-32bd488d1f67	1	Other	Other
+792d3214-3d7e-43c1-923e-558ba5a84763	1	Other	Other
+792d523f-79ec-4915-b783-0088e1cfec86	1	Other	Other
+792d65e7-c24f-4564-a119-d26553b57219	1	Other	Other
+792d9728-8c9c-43d5-9429-a6d030aa53de	1	Other	Other
+792df6af-e118-4481-97ca-9218ac93c176	1	Other	Other
+792ed5d5-448e-4b7e-bd8c-c533bb288165	1	Other	Other
+792ef76c-b036-49a9-bb00-f8dfed4dd574	1	Other	Other
+792f38a7-4cca-4933-80b6-050fa2812ebf	1	Other	Other
+792f6193-7875-405f-b740-70b63e645ed2	1	Other	Other
+792fa49a-5ad9-4d9c-877c-0239c6bbf660	1	Other	Other
+792fbd88-10dd-46be-9799-d3e8b9930541	1	Other	Other
+79300537-91b8-4d04-97d5-ddd3b2002e45	1	Other	Other
+7930061d-aaac-481a-b108-b8cea8bcd82e	1	Other	Other
+7930487a-7256-4562-97dd-966ebf5fed15	1	Other	Other
+79306194-94e7-4364-a4f9-8746496f87c4	1	Other	Other
+7930b1da-a93e-48b6-b367-26b2ab78b170	1	Other	Other
+79313911-9075-4eb5-93ff-4fb280e2877b	1	Other	Other
+79317013-f014-4056-99c3-7fb5aa610b60	1	Other	Other
+7931bdcf-8fc5-43cf-8e56-8179c48e6eef	1	Other	Other
+79324fa2-71cf-49c7-a010-96240d758a74	1	Other	Other
+79326219-825a-4972-83f8-fb0f177cf995	1	Other	Other
+79326412-e56c-4d41-bdca-64aca6c4ca61	1	Other	Other
+79327b03-fd11-43e6-84e7-bad7a4019a98	1	Other	Other
+79330e46-7b15-4f70-987d-6ea64e32b4fe	1	\N	Other
+793350bf-619f-404f-a929-69142971a38f	1	Other	Other
+793385e4-18ba-4091-b2b5-b2e70dc4f8b1	1	Other	Other
+793465df-683a-4bbd-808c-b0c2ad06baac	1	Other	Other
+7934a1bd-f227-446a-9b05-f8b0732838f4	1	Other	Other
+7934a719-16f3-4414-956a-09537d064c83	1	Other	Other
+793557fc-7b5f-4e38-adf1-56c6f10e929e	1	Other	Other
+79355b1c-4105-4e3e-8b03-d51a3bf00db7	1	Other	Other
+79359757-d919-4697-8777-2ddab03ffe63	1	Other	Other
+7935ae45-53dc-42e9-8681-c12e6c5a0b72	1	Other	Other
+7935ccab-4ed0-4d68-b71e-8104dbfb84bc	1	Other	Other
+7935f81c-340a-45ec-b144-20e53a76511c	1	Other	Other
+79362330-0dba-437c-be60-37476db7f193	1	Other	Other
+79364a45-0c21-4992-9b91-0ee6abd3b467	1	\N	Other
+793651c2-75ce-4533-a2aa-10afff6996e2	1	Other	Other
+7936899c-e7d3-451f-bcab-48a090fed4cb	1	Other	Other
+79369567-cbd6-4150-b8bd-3b651b9d75b8	1	Other	Other
+7936a66b-b476-4844-956b-8382b99e96f8	1	Other	Other
+7936c6e1-8020-4700-bd6e-ceaaed035855	1	Other	Other
+7936d847-6459-46ae-9dff-c744c23a35ff	1	Other	Other
+793767f9-db5e-4b25-9c76-f4c50fd153be	1	Other	Other
+79377fbe-d3f7-416b-acff-cfb85a125d7f	1	Other	Other
+79378cf9-eced-4297-a437-0d2093d5736a	1	Other	Other
+793793f0-b5ec-491c-ba51-96f30a9f8ead	1	Other	Other
+79379ed9-8c34-4e52-b91b-4d679b3edb37	1	Other	Other
+7937e4ba-d87d-42b6-8e25-25a7bd8fec7f	1	Other	Other
+7937e84b-4ff7-459a-a3fa-8fab3e8c8d9f	1	Other	Other
+79382cd9-bb4f-4932-9d97-df69fe6ff532	1	Other	Other
+793836f5-5517-46a9-9c0a-ebae1208d6dc	1	Other	Other
+793861b8-d02a-40ea-a6e7-466d921a92f2	1	Other	Other
+79387ed0-2194-4355-8838-0736b50c91c4	1	Other	Other
+7938c879-eb04-4869-9ff5-f2be8997e97c	1	Other	Other
+7938e392-d0f8-41d5-b1b6-543b375673e2	1	Other	Other
+79390f97-5b3c-4676-9ce4-a483236ea525	1	Other	Other
+7939750a-4235-4f69-8b24-59573e304bba	1	Other	Other
+7939ccb4-cb1a-4d72-acaa-1d7ff52990a9	1	Other	Other
+793a07e3-1dbb-4385-8dd5-cfcf118d2cd8	1	Other	Other
+793a08d9-74d9-483c-8f43-6cb233ec083d	1	Other	Other
+793a275a-a907-4d53-bfaa-5d148aa7950c	1	Other	Other
+793aae9c-67a1-42f6-91f1-e610cdb781cc	1	Other	Other
+793ad744-a12b-4c0f-bab1-e8b05f11a32d	1	Other	Other
+793b5046-078f-437f-b626-2e661f0a5bf7	1	\N	Other
+793b6ccf-71ff-4079-8830-0f2b88e6c59f	1	Other	Other
+793b72fd-075e-48ee-86bd-4c9623f078a6	1	Other	Other
+793c1a45-7344-4a06-94e8-d4cc690446f0	1	James	Other
+793c1c6e-cc86-4626-be46-73e90c4f0b18	1	Other	Other
+793c676b-1a53-49fb-85f2-17daf204dc6a	1	Other	Other
+793c95f3-b77d-4d0b-9a8e-604c19d398c3	1	Other	Other
+793cffb3-a0be-4e9b-9cfb-579fd98598b7	1	Other	Other
+793d12a6-4120-4bc1-b1e3-3652bb902f4e	1	Other	Other
+793d3af3-4d64-4a55-9427-b543cf53ca6c	1	Other	Other
+793d591a-6adc-4d1b-9d76-a9904e90adb1	1	Other	Other
+793dc1c0-d03d-4c89-ad54-88d41b86c299	1	Other	Other
+793dc750-80b9-414c-b1c7-47af4d2100f5	1	Other	Other
+793dd825-0721-4f24-a4f9-6bc8865af771	1	Other	Other
+793ddfe7-97f3-4640-8827-754db90de3d9	1	Other	Other
+793e0a8f-7877-4637-b807-5ae8d0c48270	1	Other	Other
+793e3d0b-aca9-44ec-8c13-48adde59059b	1	\N	Other
+793e86dd-6e55-45ff-aa03-fa3ce159bf14	1	Other	Other
+793ee500-77c3-4067-93d6-d38883d526cb	1	Other	Other
+793f10ca-62a2-46e8-816d-5a1fca5cc133	1	Other	Other
+793f1d31-c3db-4b01-8f95-3215f206ff71	1	Other	Other
+793f31ca-8af4-4442-a065-04c14376cb99	1	Other	Other
+793f3d9b-73a7-4fac-af77-597f2b72b337	1	Other	Other
+793f5057-7ac8-4b16-8563-daed69248dec	1	Other	Other
+793f5355-90ee-47a6-bbc8-48aca840cae4	1	Other	Other
+793f9903-3e8e-4467-b93d-d43a193168ad	1	Other	Other
+793fd6eb-6278-4b8f-a571-eb4624de81e7	1	Other	Other
+793fdc64-6e00-4edc-bc73-1f53f5170e9f	1	Other	Other
+793ff641-7888-4d14-8b64-92ed6455b55a	1	\N	Other
+79400aac-2ccd-4034-b129-fbd97437d7f1	1	Other	Other
+79400ae8-90d7-4050-a2ae-b2f11fd64263	1	Other	Other
+79412a15-a0e8-4a30-a189-52fd618aec23	1	Other	Other
+79414e33-78ec-4efc-bf06-3ae39450af56	1	Other	Other
+7941ce42-a9a0-4c41-ba60-532e95637fdb	1	Other	Other
+7941e4f8-6ae7-4f91-b50f-8de04275a5c7	1	Other	Other
+7941fbb5-95fd-4923-a0d0-c7b60895aae4	1	Other	Other
+7942012e-4092-4ae5-a6b9-5dbc735f53c8	1	Other	Other
+79421326-37df-468d-9806-a7f96081f44d	1	Other	Other
+794298ab-56d2-4c3c-9057-d89e23e4aa3a	1	Other	Other
+7942cf5a-8f7d-4337-977c-0a40009a3163	1	Other	Other
+7942e207-10ad-4ae5-a258-35f844fbddcc	1	Other	Other
+7942f46d-56e0-4c14-bea0-134340e62a2f	1	Other	Other
+794319c7-2f9f-438a-8e73-1af5ff7bdacc	1	Other	Other
+79432e76-fbdd-4c7c-b3b8-224205aeaf12	1	Other	Other
+79436163-6fa3-4260-bcaa-9c53a489617f	1	Other	Other
+7943926c-f052-4dd3-b1bd-be775b245a9e	1	Other	Other
+7943a646-f44c-464b-9f81-9b222494090d	1	Other	Other
+79440d1e-f613-4e8e-b316-7fefc84b11a2	1	Other	Other
+7944142d-eb6b-4844-a974-2f2a116cc751	1	Other	Other
+794490b9-963f-4acd-9489-95fd75827a7e	1	Other	Other
+794490f8-2f77-4cff-86c7-59e9b2a0b1a3	1	Other	Other
+79449d32-ce96-40a2-9ec0-bb7ef6ea7a5b	1	Other	Other
+7944d1a5-1a42-45f2-841c-4a81e700aa59	1	Other	Other
+7944e9d6-0073-4796-a892-4127b03c3c04	1	\N	Other
+7944f0a6-f9a0-459b-8c3c-6a74c54bfe10	1	Other	Other
+79452c5d-024f-46b9-bf0f-6588af075089	1	Other	Other
+79453e07-f10b-4325-9de8-8be13e51326c	1	Other	Other
+7945831c-1022-4507-bb59-7d1dfad3eb15	1	Other	Other
+79458337-ce11-458a-8920-f14de7d8dcd4	1	Other	Other
+79458b4f-80df-4c78-9746-e7bb5a917772	1	Other	Other
+7945d251-0ef0-41ab-b878-2e81d93da90b	1	Other	Other
+7946476c-ca20-4105-b397-1e65c55ebaf0	1	Other	Other
+79468ef0-16c9-4171-b8b1-21fb6072372d	1	Other	Other
+7946a09e-f75b-4e46-a5fe-ecb0a0ca00f2	1	Other	Other
+7946cd0f-602e-466f-bd4f-5d0d3ea38bad	1	Other	Other
+7946fa0b-7ab4-4035-8469-3fbbcd9ea6bc	1	Other	Other
+79470faa-e078-4edf-a107-4514d1bef029	1	Other	Other
+7947545a-6bf7-433b-bb66-e2b8dead5a83	1	Other	Other
+79476ca9-2727-4683-a757-16379f7ecafb	1	Other	Other
+79479030-ef43-4f1b-937b-041b0017225d	1	Other	Other
+7947a029-7ff6-4e2d-baec-f6a9d0dcb378	1	Other	Other
+7947b72e-e09d-4d24-8cb9-ce63294ff46a	1	Other	Other
+7947c244-2b3b-4f7c-bcc0-05eeea02185f	1	Other	Other
+7947ec7a-98ef-44fb-97c0-5936a0981467	1	\N	Other
+7947ed98-66af-4f95-903a-f08a80ddcf20	1	Other	Other
+794838b8-76eb-4283-aed0-77a081e99c12	1	Other	Other
+7948728c-3df3-4c85-ab7b-bc84f79596b1	1	Other	Other
+794873b6-8d8c-433d-93ed-f5192dcf450e	1	\N	Other
+7948c713-dee6-4c44-8dab-2723d34756db	1	James	Other
+7948e5a9-06da-4ed2-afcc-0f9c66723fa2	1	Other	Other
+794915d9-7ec3-4744-90da-3cc1e9279697	1	Other	Other
+7949e439-fb7b-4033-ab57-edfec004e20e	1	Other	Other
+7949e80d-e199-4711-9ce4-72a539632b11	1	Other	Other
+794a209d-3ea5-467a-b60c-27482a60d720	1	Other	Other
+794a37c1-d12d-468d-be76-e4d6585f7c2e	1	Other	Other
+794a6c3a-60e2-4127-b8f7-d62364bb4c02	1	Other	Other
+794b1eb7-7ca8-43af-9a99-033d0fb482f6	1	Other	Other
+794b4cc2-156e-11e8-aca0-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+794bbe24-e670-44c3-8917-bf2253cf3d81	1	Other	Other
+794bff8c-9acc-4c2a-b48e-7825fc995ce1	1	Other	Other
+794c065e-f93c-4536-987c-bb977aa47d05	1	Other	Other
+794c3b79-87d1-495b-be76-2434982e8215	1	Other	Other
+794c3f47-2993-46f6-8eda-a97e6f8650b5	1	Other	Other
+794c56dc-448a-4ff3-b663-95ae351e6fc0	1	Other	Other
+794c59e2-02bd-4649-98d2-60a224bd027f	1	Other	Other
+794c89bf-ad96-466a-8ee6-d53f7a590df6	1	Other	Other
+794d4841-3158-492e-a822-ed75fa550b9b	1	Other	Other
+794d83bb-0dc0-4635-9b38-b9a39b5f2815	1	Other	Other
+794d9712-08b3-451c-a3db-3eb453318360	1	Other	Other
+794db2fc-fe7c-43e1-94cf-1c53eb5d8453	1	Other	Other
+794df60a-d4c8-4986-b133-ca0818e07964	1	Other	Other
+794e15af-33a1-4e6a-8813-7c87872a2e13	1	Other	Other
+794eb309-e6fb-4ab3-8d57-b48a8bd9f988	1	Other	Other
+794ec036-b696-4046-bb58-7822683de008	1	Other	Other
+794edd19-4f2d-4bcf-8086-a26a2ecfb627	1	Other	Other
+794f2e71-6e77-4f2b-b72b-99d8c05a0bb0	1	Other	Other
+794f4787-3617-4bc9-a29a-5ad4f3fd8d92	1	Other	Other
+794f4d44-7aa2-4b0b-961c-0938e606d283	1	James	Other
+794fbf15-f88c-4718-804d-ef56d902821f	1	Other	Other
+794fe8cd-bb8b-4ed2-8c0d-627fff983584	1	Other	Other
+79502db6-d5af-49a4-b856-325da91c282b	1	Other	Other
+79503811-88ba-43a4-8c6a-595f24a013b8	1	Other	Other
+795041c2-0b3e-4a26-bbaa-76274e73bcaa	1	Other	Other
+79506b43-c186-4ef8-9e7a-0660b368c0c1	1	Other	Other
+79506e75-bb33-4262-9f37-a76de2d56577	1	Other	Other
+79508722-e99a-4818-863b-95d64657bace	1	Other	Other
+7950cf29-9b52-4b46-91b3-f08c59dc6710	1	Other	Other
+79513c53-1be2-4425-8b37-3ec86a46ea2f	1	Other	Other
+79515e97-cc29-4b4c-b19a-6cb32bb7f118	1	Other	Other
+79517a47-7d77-439a-bd50-d18b9a1a34b9	1	Other	Other
+7951dcdb-065b-4252-9a16-332d351b7df3	1	Other	Other
+7952422a-8a4c-42d5-bf84-947aa0636631	1	Other	Other
+7952f36c-8395-4031-8b74-9111a3f9add6	1	Other	Other
+7952fb0a-84bc-4628-8b0e-9cb4e33de9dc	1	Other	Other
+79531cdf-e6ce-4784-900a-d434bd5b07ef	1	Other	Other
+79537e19-1157-4422-a1a2-726b7797b7be	1	\N	Other
+79538bea-d9cf-4b72-90fd-9f756162ac83	1	Other	Other
+79539cfc-df32-4ef9-b36a-67d8b81e14b8	1	Other	Other
+7953a632-4d84-4f50-80c3-167a51912034	1	Other	Other
+7953be69-07fa-4271-bf3a-4f5cca5d3806	1	Other	Other
+79541d08-bc56-4728-910a-590cca79ed65	1	Other	Other
+795439ab-6669-430d-a5c2-fdc8c0322c97	1	\N	Other
+79543d7c-69a0-4cb9-acda-f51855ec4d94	1	Other	Other
+795449b3-5715-4ed3-96a3-5e3cf3f3f50f	1	Other	Other
+7954704d-4850-4a41-9f54-ab0641e71387	1	Other	Other
+7955ad1d-d54e-4e05-b6c7-bd39b01342df	1	Other	Other
+7955ba93-eabe-46ef-816f-b47776e1031d	1	Other	Other
+7955bea4-9708-4dc9-bf43-643b92917d45	1	Other	Other
+7955cdd9-56c5-4461-b748-667da7453f10	1	Other	Other
+7955ed4b-d452-4bee-a537-918d8db75605	1	James	Other
+7956154a-068b-40b9-b316-7d7a51f889a3	1	Other	Other
+79562093-d1e8-43c4-ae85-11acc814d6c4	1	\N	Other
+795649a0-08cd-4a9d-9099-912c5ec50f61	1	Other	Other
+7956522b-26a7-45eb-b606-bf74ce99d007	1	Other	Other
+7956737b-6017-45b3-a3ef-afa0de460b42	1	Other	Other
+795697d5-4560-4961-afd2-dd079c989da1	1	Other	Other
+79569e41-a9d4-4ce9-bd01-ea6721902844	1	Other	Other
+7956a67a-ed31-46db-bb39-7775cbe0b6a4	1	Other	Other
+7956ea45-2cf5-458a-94df-12a19b1773c5	1	Other	Other
+79577df2-eabc-4043-8a98-b6b820e7206c	1	Other	Other
+7957a06e-9e0a-4e95-9a06-15f928ce72cd	1	Other	Other
+7957f213-bb51-4c92-8c2f-7cf5d8c07b72	1	Other	Other
+79580206-ea10-44a5-a797-a656c6567381	1	Other	Other
+79580218-27ca-400c-b4aa-fcce689fadca	1	Other	Other
+79580616-0a6d-412d-a87d-1a8916d779a7	1	Other	Other
+79582215-0ec2-4bfc-bc66-a53d6df16fc1	1	Other	Other
+79587bdb-baa9-45b9-8459-fef8e0b987aa	1	Other	Other
+79589f11-f996-428b-b4bf-2ecf83faf580	1	Other	Other
+7958a7cf-56cc-41f4-8c29-008dbde186ad	1	Other	Other
+7958dfe2-a610-4662-a8db-051655b68380	1	Other	Other
+79590e88-a6a8-4092-8a1d-88c942852528	1	Other	Other
+79591e4e-f604-458a-8c12-2710b1d361bd	1	Other	Other
+795934bb-a01d-49ea-9f46-a545942c70fa	1	Other	Other
+79593c88-c1ab-4f20-8272-83ca40ee468a	1	Other	Other
+79597103-d79b-4716-a3ec-fe5fb322ddbf	1	Other	Other
+7959c107-09c7-42b9-b452-f920fa108fc0	1	Other	Other
+7959e4d9-97e9-4011-9da4-32c2e44c3ea0	1	Other	Other
+795a196b-aeae-406e-9f82-4e66fc0aed02	1	Other	Other
+795a1a29-51b1-4259-ac3d-4292c1065f14	1	Other	Other
+795a629a-c9a9-4aaf-87f8-6f5f82698c3a	1	Other	Other
+795a707e-ac22-4aec-b72d-2bc8c64cc017	1	Other	Other
+795a7ff2-96b6-488e-acc4-0018238fed71	1	James	Other
+795aad30-7550-4d46-a910-ed34c9252976	1	Other	Other
+795ac78a-166f-499e-8e1c-0cecb9b9d838	1	Other	Other
+795acec4-026a-4f44-a634-c9f1e6ff167a	1	Other	Other
+795ad3f9-61ab-476f-a63a-0142406f5a76	1	Other	Other
+795ae1ee-e021-4f79-b326-fa001d94cf14	1	Other	Other
+795b3aee-5f32-4981-8697-426c1d312fb8	1	Other	Other
+795b6166-bbba-415e-a001-e77f4d523b2c	1	Other	Other
+795ba931-3b8e-4e24-a68b-63d63b38bbc9	1	Other	Other
+795baee6-895e-46fb-8082-f42f6141ef8d	1	Other	Other
+795bb3a1-67d2-46ed-8a3b-c6c5a64e1cda	1	Other	Other
+795bf624-f9f5-435a-8b63-176ef7220f69	1	Other	Other
+795c2484-4531-4e07-b30c-fe6f6f4b376c	1	Other	Other
+795c2631-6e3e-4e9e-85f8-edf532807ed2	1	Other	Other
+795c359d-dc28-47eb-81f4-65992c814d31	1	Other	Other
+795c40ca-43a8-45bd-a539-fb8e90c3ed90	1	Other	Other
+795c5d90-64c8-4fae-b9f2-cfbc6aa24f95	1	Other	Other
+795c7a19-2cfd-4d5a-aabe-ffdfa35e2132	1	Other	Other
+795c8318-4147-41fd-b9ea-2a84de5c3309	1	Other	Other
+795cc166-c419-4b2a-a8a9-8aeae880a29e	1	Other	Other
+795d6917-802b-4b5c-8cd2-c9fa4cbb0a70	1	Other	Other
+795d87d8-b27b-4687-91b2-4a973a29a792	1	Other	Other
+795d9dc8-e0a2-4c1b-a5fe-668da643d361	1	Other	Other
+795dcdc6-fe57-42a8-a8eb-aa368f9a5e8a	1	Other	Other
+795df047-50f3-4d3b-ae65-552a15a9df3e	1	Other	Other
+795df4d9-4f42-410f-8502-77c98d481466	1	Other	Other
+795e36e5-186e-4f73-abad-8a7d94ece092	1	Other	Other
+795e6eb5-3521-4bb4-9749-848837f0d3eb	1	Other	Other
+795e74f5-e378-4569-952b-5155630e1d21	1	Other	Other
+795e783e-78ff-46ce-b59f-941a7d05b89c	1	Other	Other
+795e7af6-9b9a-4236-b3b6-2f41bbad0305	1	Other	Other
+795ed87d-91a4-4629-977f-75d06421ccd1	1	Other	Other
+795ee465-df7e-4a1a-927f-081d1e2a158d	1	Other	Other
+795f139b-7c16-42d8-877c-ba8ee8bb8776	1	Other	Other
+795f65fd-5fc8-44a4-9878-a58142c5637b	1	Other	Other
+795fae46-3d67-42d9-a928-286adb505cdc	1	Other	Other
+795fb054-ff5e-4d6b-83d0-a4be572e9c64	1	Other	Other
+795fe7eb-364d-4150-864f-51d262969ea5	1	Other	Other
+79603f6f-5857-413a-8ccf-891347285d45	1	\N	Other
+7960d8ac-c98e-446a-93f0-d745cd07ac15	1	Other	Other
+796111d0-4868-41af-b499-2248c19b99e4	1	Other	Other
+79614fda-3b83-4984-8b17-9db088758b6b	1	Other	Other
+796160c6-642e-49b1-84dc-4c0d1783ac94	1	Other	Other
+79616cab-344d-4aed-baa2-4bcf8b23e773	1	Other	Other
+796177de-4d6d-4045-a0e9-5b7fa1c4aed6	1	Other	Other
+7962a0c2-9dad-4555-99e3-7f05bd884521	1	Other	Other
+7962fb6f-f8f8-48f9-9b66-6c448eb5ce10	1	Other	Other
+7962fd5b-0a52-4546-a74e-64465da23c97	1	Other	Other
+79632b41-a8c8-4268-ac36-1629ade1491f	1	Other	Other
+79632bec-8a54-43d7-acf0-7083fbb83ca3	1	\N	Other
+79637deb-eb2f-4931-a770-5a12299996a7	1	Other	Other
+7963a8a3-576a-47db-8ed4-c94299177a84	1	Other	Other
+7963c019-ca39-4bbe-bd76-924e886f7143	1	Other	Other
+796448b9-8b72-4f03-98a9-fcff57606c63	1	Other	Other
+79646b49-8499-4453-9110-01a5fc7049af	1	Other	Other
+7964817d-4e76-4f8b-8538-85225235ac55	1	Other	Other
+7964854b-778b-4afc-91a8-51af35aac394	1	Other	Other
+7964900e-c8e2-476d-a67a-331eea04e194	1	James	Other
+7964b463-f059-4044-9d29-1fe654de2e0f	1	Other	Other
+7965803f-f62f-45e3-aee7-0abe927b1a77	1	Other	Other
+7965fec6-245c-48cb-b02e-97f666cdf521	1	Other	Other
+79660fb0-6270-4604-a091-639ac39edb3a	1	Other	Other
+7966d57b-a960-4c41-bbed-865610fe1370	1	Other	Other
+79670ad5-5c23-4469-a842-3bdf37b5acb8	1	Other	Other
+7967c8bd-24de-43a0-a3bb-58423cbd313e	1	Other	Other
+7967e31e-acc3-44f7-8880-ef277523b9d1	1	Other	Other
+7967f93a-9dfe-4308-82e8-64304cdf48a7	1	Other	Other
+79681831-8052-4c1b-bf8f-7e4a8dbd4d06	1	Other	Other
+79682e24-d109-4d4c-8f6c-b5eb604954f3	1	Other	Other
+79685980-b181-4eb4-b262-33cf307cd5b2	1	Other	Other
+796876ba-e126-432e-85ec-7cc9c1d865aa	1	Other	Other
+7968bf5e-b7dd-4506-800b-015a9db3a325	1	Other	Other
+7968f3d4-bc44-4902-857a-56efd20eb95e	1	Other	Other
+7968f9fb-6558-44c4-bd2e-519bb4e78805	1	Other	Other
+79690158-f23d-4b3d-ad6f-bbe03b8fce30	1	Other	Other
+79692526-f793-48d6-bd66-4ad43d5c6f66	1	Other	Other
+796929ba-936b-4ce2-853e-6144044e6744	1	Other	Other
+79693795-e77a-4a5e-8d22-441c51aee682	1	Other	Other
+79695609-9ffb-48d7-848d-128cdbf0635a	1	Other	Other
+79697273-baee-4d3f-9214-ef9e1d32113a	1	Other	Other
+7969c671-a8b9-4c43-a1a9-e4bcaf7ee7f7	1	Other	Other
+7969e407-f48b-4d51-ab59-20e8187182b8	1	Other	Other
+796a6349-5c20-44ba-a150-e118b32839ea	1	Other	Other
+796a74ae-16e6-44d3-a76b-fe160619f53e	1	Other	Other
+796aab7c-452b-4059-bfe8-e63eb08a228e	1	Other	Other
+796b2c7b-348f-4723-91d9-b5392ba88acb	1	Other	Other
+796b52c4-7c46-415c-94b0-dbe589fde382	1	Other	Other
+796b81a5-9fe9-443d-80c5-0c91e0242b31	1	Other	Other
+796bb43d-ecac-4899-a4e1-1b2b1d13cc48	1	Other	Other
+796bb720-8c6f-4418-b736-e0a774ad6598	1	Other	Other
+796bcfd6-9e37-4ea1-af5a-8edd0acbf3cb	1	Other	Other
+796c3d0c-ba42-4e78-91eb-1e773736a70f	1	Other	Other
+796c43cd-da17-48f8-9695-93ed1a634c8c	1	Other	Other
+796c4490-3acf-48d2-91c8-356975112e02	1	Other	Other
+796c5723-6bae-453b-89be-2e2bc25eda6c	1	Other	Other
+796ccd60-6130-4a63-82a5-8ed03f880b2a	1	Other	Other
+796cdace-3d2c-436d-97f0-20dfa844784a	1	Other	Other
+796ce770-b332-4ce5-8884-86abf956624b	1	Other	Other
+796cf8f6-604e-49b7-8e23-59f0f0c51ccd	1	Other	Other
+796d263a-1050-47aa-bd74-e51e4345324e	1	Other	Other
+796d5451-83db-4377-9679-b74757f06d9c	1	Other	Other
+796e0866-c5bb-43ab-8e6d-1e992c8f8f51	1	Other	Other
+796e088d-d9d7-4ac8-9f42-21eaa4f8dc6e	1	Other	Other
+796e6047-a5c6-4f9c-a7f9-3866c465cc0b	1	Other	Other
+796e8c56-1416-4b9e-9ff4-80c5ce645e7a	1	Other	Other
+796eb972-8a98-4769-a2fd-6b26abdda25f	1	Other	Other
+796ee661-78ab-4535-9e1f-75f2cbbadfb2	1	Other	Other
+796ee792-1bc6-4c69-b0cc-f6d8e3c51ab6	1	Other	Other
+796f1787-5c4a-46b3-ae8a-e79a84ec7c8e	1	Other	Other
+796f2894-3f5e-4de8-90d4-eeeed7b76909	1	Other	Other
+796f3e46-3e4a-432a-8906-37eeccc7b37c	1	Other	Other
+796f664b-2304-41bd-93c9-af053089bdd1	1	Other	Other
+796f87c5-128d-487d-8803-161d5cc7a15d	1	Other	Other
+796fb892-f3f2-4c5b-9b71-ecd43f0b099f	1	Other	Other
+796ff390-5022-4661-b8a2-70e2ea76b9d4	1	Other	Other
+797035e4-d537-4894-9bcf-39784b502aa3	1	Other	Other
+797039e9-f2f4-4d8f-8cb0-1286c433aab3	1	Other	Other
+7970a594-8704-4313-b70b-ca98706ec068	1	Other	Other
+7970b17c-eccf-4640-ba54-5ec945e61208	1	Other	Other
+7970e13f-0736-4561-aa55-ee7b6edf48d6	1	Other	Other
+7970ec00-30c5-419d-92ac-c8818f675a82	1	Other	Other
+7970ff33-ba3e-4efe-9683-446207d475dc	1	Other	Other
+79712822-cad5-4c65-ad60-1e1b41d46a65	1	Other	Other
+79721e6d-27e2-4fde-ad13-69f7d33aa22c	1	Other	Other
+7972654c-c127-4647-b4f7-3ba89a65832e	1	Other	Other
+79728437-f69d-4378-b044-9bed646072d4	1	Other	Other
+7972bb2d-f994-475b-8e55-de660905f5bc	1	Other	Other
+7972de64-532e-4d7d-a7a0-6903cc64267e	1	James	Other
+797315b2-ba13-4541-9ef2-4d747be07be1	1	\N	Other
+79732c7b-fc8d-411b-9f95-831d12677e35	1	Other	Other
+7973752d-6f59-49ca-a8f7-269d0dab7502	1	Other	Other
+7973a50d-f8b8-4361-93a3-b7a717118a06	1	Other	Other
+7973bc91-8a3b-4b6f-b7b7-2ff33cc963cd	1	Other	Other
+7973c5fb-d56d-4d8f-87b5-67e403714e3c	1	Other	Other
+7973cd81-fa20-4255-be55-59f55a27a43d	1	Other	Other
+7973d6d1-881a-4ccd-a836-74bab8cc9ad6	1	Other	Other
+79743ee8-5bbf-4a21-80da-6b4ddb4cd1aa	1	\N	Other
+7974492f-f79d-418d-988a-cf12515363c6	1	Other	Other
+797450aa-b64f-49fd-8a8f-874db5c7f58a	1	Other	Other
+7974e4f3-bf0f-428f-a472-501fe77d3ce2	1	James	Other
+7974fc6c-d2d9-4713-96ea-480666c66d3d	1	Other	Other
+79751e78-8255-447d-bf53-9a4c54b898a7	1	Other	Other
+797522c1-3e4d-4e40-9fde-50350d456268	1	Other	Other
+797529a8-5c6a-4d81-a683-715f6f6206aa	1	Other	Other
+7975bc33-dd44-47ae-b80d-56be25236e26	1	Other	Other
+7975bf60-1ab8-4ad0-baa4-e2ec454a4450	1	Other	Other
+79760f98-987c-486e-8cc6-4db9cea815ce	1	Other	Other
+79768ed6-1db9-470b-8494-4c7a7f97817d	1	Other	Other
+7976bcd2-97b4-4917-9e2e-1cdd81fc6be1	1	Other	Other
+7976e17b-786c-4abb-ab8f-c82a209d8e33	1	Other	Other
+7976e5ee-2a4d-4c8e-822a-e12c6f5d9af6	1	Other	Other
+79771081-722d-4e10-93b7-0118e09bffe9	1	Other	Other
+797726db-1e61-40fd-b5d3-01d984c2b7eb	1	Other	Other
+79774b9a-64bf-4981-870b-a2d96c0087cd	1	Other	Other
+79779568-52ab-4906-8919-d8d9ccf8b326	1	Other	Other
+7977997f-f727-416c-b080-2979c80c9de7	1	Other	Other
+7977c026-51ef-40e5-925b-3105a951e727	1	Other	Other
+7977c200-f701-43dc-be77-a77216e20991	1	Other	Other
+7977fb91-bdf5-4e64-84aa-c1f04ee99d7f	1	Other	Other
+79784902-5af3-4339-b5da-87fa5ea0b96d	1	Other	Other
+79785016-279b-463a-a221-29d515158701	1	\N	Other
+79787647-ed8f-4ebb-93ad-0d5c60b58ca9	1	Other	Other
+7978a3e0-08c6-4c84-8e24-c3486d3dfe6d	1	Other	Other
+79790bf0-2fe6-401d-921e-b8a7fc745aa4	1	\N	Other
+7979a3ab-7265-482c-9577-1db7b42d7b30	1	Other	Other
+7979b611-287e-4f3b-abdb-bf7ea941f0e9	1	Other	Other
+7979b74b-dd96-4445-8e1e-15852244ca92	1	Other	Other
+7979e2b3-9964-4bb3-8cec-c8293459e461	1	Other	Other
+797a135e-5f31-4bd9-97e0-59fb25e156e9	1	Other	Other
+797a2c49-3de6-4ad2-9c90-c7282e378a60	1	\N	Other
+797a32c6-af3f-4748-8e79-6c002dc8a4c0	1	Other	Other
+797a5c9e-3c3b-4fee-b68d-d817b7d65c3b	1	Other	Other
+797aa9e1-a32b-4f96-afa2-ea7165a861bf	1	Other	Other
+797b2f86-b58c-44c9-80ab-deb715264816	1	Other	Other
+797b7cbe-184a-4c2c-af8d-1a449c9a95c0	1	Other	Other
+797ba765-915e-4e57-911d-efc9e161d0a4	1	Other	Other
+797c86fb-1c95-410f-b8af-1f8be9db434e	1	Other	Other
+797c9346-5274-46fb-b39e-442bc6a83da1	1	Other	Other
+797cbb63-83d6-447d-ab7b-98c58a806d55	1	Other	Other
+797d0f0e-6215-42ac-b7ad-13242080e527	1	Other	Other
+797d1689-1f96-4cd0-8339-6cad090b6f1f	1	Other	Other
+797d36f6-e714-4080-9574-7fab39546050	1	Other	Other
+797d3700-4f0a-4734-80a6-7d1dfd42b8d3	1	Other	Other
+797d5491-6790-4ff5-b67b-5dc1ab80912a	1	Other	Other
+797d6eeb-4cf7-4823-8709-c9d6e291298e	1	Other	Other
+797d8f42-81cc-4b9c-93ed-be037177be0a	1	Other	Other
+797dc870-bf64-455f-b6e9-6a6449398934	1	Other	Other
+797dc9c3-f92d-41a9-a3b8-9e44dd109974	1	Other	Other
+797e01d4-dcf2-4c09-b2ce-dce865a88f5d	1	Other	Other
+797e3166-9a8e-4de3-af8b-ee2e5ca301d9	1	Other	Other
+797e9c7e-e3ea-40a8-8770-9855c114a218	1	Other	Other
+797ec1bd-c35f-4d1b-a628-83b4b5f1d56c	1	Other	Other
+797ec9b2-4ee0-44ca-8a4b-757a26ac3000	1	Other	Other
+797ee47c-a0ea-4ef1-89e0-d03cae872729	1	Other	Other
+797f0b63-81f3-4d40-ad46-fb40b87935e8	1	Other	Other
+797f4a37-7432-414b-a1bf-602475210202	1	Other	Other
+797fd559-5082-4059-95dd-ede142816bc7	1	Other	Other
+797fd694-0b50-4023-a272-297c23312e37	1	Other	Other
+798001aa-014f-4dd7-9f17-e9ec57cc961d	1	Other	Other
+79801b12-48df-4027-8b74-9c92def25257	1	Other	Other
+79802531-a883-495a-b82c-360de9f458bf	1	Other	Other
+79803597-3793-4479-a8b7-8508c21100ca	1	Other	Other
+7980b05e-6cc2-4742-800c-1c4d11a42288	1	Other	Other
+7980b813-15c4-40d1-a383-18decf9740c6	1	\N	Other
+7980defe-b4a9-49c4-8ca8-b9ff088afa2b	1	Other	Other
+7980e639-8e36-4620-8711-31dd7169f518	1	Other	Other
+7980e793-6f1c-4155-a1f3-c87bbd2727f6	1	Other	Other
+79810991-115d-4ba4-84d5-426576493232	1	Other	Other
+79811203-e324-47a2-bf7b-08f4a06a0156	1	Other	Other
+79811b9e-414d-4257-9bb5-4223c08b9d8f	1	Other	Other
+79813c59-6d4d-435a-972a-a12b27de46ba	1	James	Other
+7981a5cd-2391-4fbe-b3db-9ced36150ef1	1	Other	Other
+798207fc-56c0-45db-b440-69279346e2c6	1	Other	Other
+798228b0-75da-4438-9948-1a708b5ec735	1	Other	Other
+79827cbe-b1bc-4bf1-90b3-b40996c25391	1	\N	Other
+79828a1d-e5cb-4171-8946-b7333fc82713	1	Other	Other
+7982ec0c-3759-4aba-a42a-13bd39f25e16	1	Other	Other
+79830158-c999-4df4-bae8-b6de863185d6	1	Other	Other
+79832a7c-dd1b-4577-89bd-adecc79c4cab	1	Other	Other
+79833522-3122-487e-bf86-3aae214158e3	1	Other	Other
+79834b3e-773f-4dae-8742-4f769bcbf36a	1	Other	Other
+798365ad-317f-4930-81fb-bc02bc54aa9b	1	Other	Other
+79838a0b-3a2d-4623-a865-0aa2767aef56	1	Other	Other
+7983c2f9-5fd9-40ec-865c-990e1f8c09d1	1	Other	Other
+79844d9f-3dec-47e3-a8fc-895ae7bd1aa9	1	Other	Other
+798480f2-ee9c-4776-b8a1-2bfd90115e2d	1	Other	Other
+7984b592-0a4a-4be0-b4e7-a1d164f25477	1	Other	Other
+7984f2e5-2b66-415a-aaaf-3ae9349c12e5	1	Other	Other
+7984fa0a-f21d-4e33-9992-881612e12e1e	1	Other	Other
+79850830-805e-4e8e-ba4f-487a2d8a5670	1	Other	Other
+7985263d-9efb-4793-8e53-f5e138cacdca	1	Other	Other
+7985373e-70b0-4f85-8d4a-51573cc5bfa0	1	Other	Other
+79854890-98ee-4c68-9e87-a0ac52b68c50	1	Other	Other
+798644ec-b837-40c1-b1ba-4d36b0b8a340	1	Other	Other
+798647b4-f82d-48ba-96e2-c54a9eb493f3	1	Other	Other
+79864850-31d0-42de-821b-442a34c004b3	1	Other	Other
+79870179-9d2e-4802-85e2-64a0bc397bf5	1	Other	Other
+7987e9c1-9697-4fd9-8186-ef7e3e73f761	1	Other	Other
+7987ece9-db21-47db-8c7d-04c54d6fc511	1	Other	Other
+79885348-f3cc-4279-abf1-f77ff2cc0688	1	Other	Other
+79887fff-86ab-477f-955d-77580bda4b86	1	Other	Other
+79889c36-2377-4309-899e-97a23a7987f6	1	Other	Other
+79891526-56f3-4b66-b7a6-74eba0156fa5	1	Other	Other
+79891f3b-b0ec-415c-a11b-c95be37b983d	1	Other	Other
+7989500b-0cfb-4cc9-bc2b-768aa5da8486	1	Other	Other
+7989b21d-9bfc-4ced-9399-3e383dc3a32d	1	Other	Other
+7989cf13-71e3-4df8-899d-7cd39e56b809	1	Other	Other
+7989f237-c022-453c-89b1-248aacd69774	1	Other	Other
+7989fd32-adb7-425e-b375-032a8ec73cbb	1	Other	Other
+798a2d88-1928-4dd1-8bf4-f8f6e45fb748	1	Other	Other
+798a4b7a-83de-4db3-9182-3c95e8800523	1	Other	Other
+798a7df5-3888-44f3-83d6-2c1dd4a061d2	1	Other	Other
+798a9966-6939-4df0-9f6a-ff1fb7f21f92	1	Other	Other
+798b4010-ddf1-4027-9ca7-b9e80b73b73a	1	Other	Other
+798b582d-6e43-4512-a60c-d0c1182d8a0f	1	Other	Other
+798b5cf1-0bd0-464a-ab5e-b6bf3fdddad0	1	Other	Other
+798bd16d-4bbd-46a8-ac59-d87127ba059f	1	Other	Other
+798be378-e927-41c7-afa6-313c1b56687d	1	Other	Other
+798be716-25c2-49f7-a306-e62fa60dca45	1	Other	Other
+798be8a8-f7df-4f93-b9ba-b63577130431	1	Other	Other
+798bf71c-c86f-44b3-ad0b-f2b28452a31a	1	Other	Other
+798c52f7-4161-47b6-9283-04f63573b71e	1	Other	Other
+798c6c69-ffaa-464a-afad-0292968a86e4	1	Other	Other
+798c75e6-8472-4633-9e21-b7196a13b35b	1	Other	Other
+798c760e-809f-4da9-bdc8-499c724d9c46	1	Other	Other
+798d0e3d-f507-4ed2-8f18-365a5e507d27	1	Other	Other
+798d27b0-7c4e-44cf-affe-07e3656ab312	1	Other	Other
+798d7600-bb25-4b1c-9368-f7ee4fb6d9eb	1	Other	Other
+798da67d-4352-46a1-8931-3f972ecd17cf	1	Other	Other
+798db885-7a21-4cb8-952e-6615391df110	1	Other	Other
+798ddd46-5f30-4d3f-8ffc-827d4a4f1d20	1	Other	Other
+798e165f-536b-4c92-964c-591c80cbc46e	1	Other	Other
+798e1839-d15b-40bb-95b3-4544263f1b05	1	Other	Other
+798e3bbf-ed3c-41c4-a4f2-a41f29f6540b	1	Other	Other
+798eaaa7-fe41-4b6c-8f71-8ef847eaaf63	1	Other	Other
+798eb3ae-46d4-4e1e-8d34-3056225f5489	1	Other	Other
+798ec7cc-5c83-4b93-ad49-ef1e5dad8eb5	1	Other	Other
+798f0c56-680f-4142-9124-5dba5be48c6e	1	Other	Other
+798f1e09-ed06-4fdd-a78f-440b362e8104	1	Other	Other
+798f270c-bebe-4867-a39b-22c0d36dd125	1	Other	Other
+798fe05f-8048-47c8-8b1b-65cef8a6425b	1	Other	Other
+799028e7-c7ab-4e3d-b1ae-bce90a31b302	1	Other	Other
+7990389b-531c-46b8-8116-708c7b018bb9	1	Other	Other
+79904d6b-fc05-47af-9af3-fdddb01d74da	1	Other	Other
+79905142-cd35-4557-bc97-f5a000008cf4	1	Other	Other
+79905ef6-2b33-43aa-91f8-b48b166fd74c	1	James	Other
+7990c5a1-5334-439b-abeb-fa70523d185d	1	Other	Other
+7990c9a4-7289-4fc7-b45c-fb2b26579def	1	Other	Other
+79913228-1ce2-4d5e-8fb5-9e3a2c64d7a5	1	Other	Other
+79916305-16e6-4c3f-8ece-d77b8489d6ba	1	Other	Other
+7992170d-61a9-440c-ba6e-f0bf77f2fede	1	Other	Other
+799232ed-6600-40f1-a0d3-305de037b503	1	Other	Other
+799258b8-db4c-498f-ab01-495b66a69444	1	Other	Other
+79926ff7-47e5-4030-97ec-4a7ea86b4e79	1	Other	Other
+7992acfd-4b4e-4ef9-b1a2-eda46fbc3fd0	1	Other	Other
+7992dc60-e6cc-4b88-b86e-e82ecb579aa0	1	Other	Other
+7992e91a-733b-4003-a2fb-249c08b3138e	1	Other	Other
+7992f9d1-bb0a-420c-b15f-d389ac550a91	1	\N	Other
+79932621-0c74-4537-980e-c4a31bb4320c	1	Other	Other
+79933f21-e82b-4dca-999f-4ef984042243	1	Other	Other
+799363cd-2fce-499c-9dfc-7cf30d226df5	1	Other	Other
+79941cb2-7d2e-4748-b5fa-82f84a13c95e	1	Other	Other
+79943df7-cff4-4b16-86ac-be4a52b9a483	1	\N	Other
+79946486-33c2-4d9e-8eb2-b908b619baee	1	Other	Other
+79949212-43e2-4ac4-b58d-54b3c126fb2a	1	Other	Other
+7994a791-8c8e-4e72-81ea-d00bb305e189	1	Other	Other
+7994d4ff-1bc2-438d-bde9-c97880a79bce	1	Other	Other
+7994f229-d351-4221-952f-dc52cb3f51bc	1	Other	Other
+799520f8-7637-40b0-a568-b93c20dfb69b	1	\N	Other
+79952350-5955-451a-8e6c-f2f8d40613c4	1	Other	Other
+79956250-684c-4b85-82c0-0a595ea72304	1	Other	Other
+799563e7-fa2e-4a13-9254-e7bfbe6678c0	1	Other	Other
+799571b4-30cd-4d85-84d5-569fd896f444	1	Other	Other
+79957e0c-9890-4e36-9c00-899a9495376c	1	Other	Other
+79959f40-bc4b-4802-a989-db8aa9b29ec6	1	Other	Other
+7995ba45-13f0-4ec3-9754-8cb0d8cf6883	1	\N	Other
+7995d650-c3c4-47fe-9b4d-97c14463baba	1	Other	Other
+7995fab6-f399-4d60-9a38-62d99c7ae314	1	Other	Other
+799638f8-b1eb-433e-bf4e-4e3c0cb65d48	1	Other	Other
+79963e83-6172-4f9b-95c8-8a803c472a70	1	Other	Other
+799659b2-a6e9-4ffc-bc56-c9f9fbe757b4	1	Other	Other
+79966744-e6d7-4744-9e54-393b757e43bd	1	\N	Other
+799691f8-875d-41a6-8819-621f175c81fe	1	Other	Other
+79969c67-4707-4679-a4b1-f53b2e2afb22	1	Other	Other
+7997066b-3ecc-4dc9-80e1-84da8283ef11	1	\N	Other
+79974410-2517-4bf3-9079-86a67042dc6d	1	Other	Other
+7997a581-b5ab-416a-9a29-128157c89f1d	1	Other	Other
+7997aaff-3d1e-472f-9d3c-053574ac673b	1	Other	Other
+7997f79f-c19a-4ccd-a4ed-27289663fb1b	1	Other	Other
+79983c98-5a9d-4abd-b3c2-c475ba2ce467	1	Other	Other
+79984429-156d-42aa-8111-037a0b0a18ae	1	Other	Other
+799870d5-2499-4bfa-8cf1-da5e78c8bb49	1	Other	Other
+7998a8a8-d9d8-44f5-bc0c-1137d796f227	1	Other	Other
+7999153c-b332-4c80-86da-8ec08722fb20	1	Other	Other
+799947b8-d053-49e5-9737-da28f54a7f26	1	James	Other
+7999684f-8a50-45a1-a106-b50cfb098a9d	1	Other	Other
+7999d6ad-f79e-4ff0-8b20-b2343eb91996	1	Other	Other
+7999def7-996c-43f1-ab99-ad14617f7fe6	1	Other	Other
+799a3e29-a832-496b-9d3b-7763ebe85a4a	1	Other	Other
+799a457e-8407-4793-91e0-86c96c96fb89	1	Other	Other
+799a77b6-8493-4f71-a999-fe09c20f9da2	1	Other	Other
+799a98dd-afa5-4cd7-a340-157fb30e9e36	1	Other	Other
+799bace3-f0a3-4407-8272-4bf573a6fc6f	1	Other	Other
+799c177b-89c8-4c67-b6ba-a8fc7d9d3cd5	1	Other	Other
+799ce459-6ee1-4f0d-b9cb-b63cc7a720f1	1	Other	Other
+799cfe4c-d0fc-4342-af52-215e33c65ca2	1	Other	Other
+799d2ac6-79f5-489a-9d4a-0041fdf57366	1	Other	Other
+799d2fa0-0934-4e25-9721-bb54b03eb8e6	1	Other	Other
+799d6577-fdfd-4be4-8250-008a247df7f2	1	Other	Other
+799dde24-93b9-4d8c-8a6d-c1ca63219f98	1	Other	Other
+799def86-a497-488b-bd84-983fb175c228	1	Other	Other
+799e222e-407a-422f-a19e-655edf1b692c	1	Other	Other
+799e3e72-91e6-4c06-82f7-83db518fcb32	1	Other	Other
+799e4cbe-9daf-46bd-9879-fd37219381bb	1	Other	Other
+799e53db-ce5e-4d2c-8720-6d0c9ced8e58	1	Other	Other
+799e5edc-8787-493d-9310-452a3ead2f88	1	Other	Other
+799ea838-2c0d-4fff-b0bb-1317c31a6f3c	1	Other	Other
+799ecb75-172c-4d46-a385-befa8feea198	1	Other	Other
+799ed7f0-502a-470b-901d-7c6dd65be30d	1	Other	Other
+799f469d-72ff-4d38-a924-a15f9e6bebe4	1	Other	Other
+799f4e20-77a2-4b52-8113-28f223a75d3c	1	Other	Other
+799f60a7-ba7c-4431-8316-0e04a0141522	1	Other	Other
+799f7e0b-4bb5-4c1f-ac18-55eac3d87696	1	Other	Other
+79a04ea1-652c-4d46-9cef-7b4c6f68d12b	1	Other	Other
+79a06688-ceac-489d-a3c7-29712963c503	1	Other	Other
+79a06842-96ca-11e7-b44d-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+79a11094-a495-4157-806f-baa1dbe7dfb2	1	Other	Other
+79a14b04-1aff-4965-a131-4a477f2c191a	1	Other	Other
+79a150c6-1c96-4db0-823f-5e2b92560e37	1	Other	Other
+79a16cba-ede5-4634-acd3-4e8fe1204292	1	Other	Other
+79a1f771-007a-4336-ab6b-9dd148559b7f	1	Other	Other
+79a23115-8c85-4bd5-9f06-fa5f893d95e0	1	Other	Other
+79a24264-7c9d-44be-a877-45b5cf4bec63	1	Other	Other
+79a24305-1d51-4caf-9187-bba5f6e4e3ba	1	Other	Other
+79a2751c-0e94-4ea3-a3d9-d5f6f6faafdc	1	\N	Other
+79a28abd-12b6-43fe-8bfd-f0e23afe8259	1	Other	Other
+79a2ab3e-685c-42e5-b732-292f46adc163	1	Other	Other
+79a38be7-04a1-44fb-81d9-cca1a4bfa58b	1	Other	Other
+79a3c12e-5adc-40ea-ab3b-5076c9272930	1	Other	Other
+79a49d85-b7da-4c50-ba47-68e7d676f976	1	Other	Other
+79a4aea8-649a-4c46-9019-33067e168f17	1	Other	Other
+79a4c07a-9a88-493e-969c-22ececc98752	1	Other	Other
+79a4cf8a-8264-4220-a1c2-84df3d5d3e38	1	Other	Other
+79a4e434-d003-4c5f-91a6-620925875aad	1	Other	Other
+79a4e8b6-fd1e-45b3-a77b-873a3a422d18	1	Other	Other
+79a520bb-7b02-4a1b-8542-1312ffec2486	1	Other	Other
+79a548d9-53c4-434e-9145-6b81b7558b3d	1	Other	Other
+79a556da-784f-42a9-81c6-da720b59c288	1	Other	Other
+79a55c4b-5065-431d-a1fe-11d625041d64	1	\N	Other
+79a59305-07d9-46db-acdc-ffa1ed46bd50	1	Other	Other
+79a5a47f-2bf3-4acf-babc-713670b0f1da	1	Other	Other
+79a5bf24-57ef-4299-a21e-fc5a4a55c768	1	Other	Other
+79a5fd78-2b32-11e8-8743-fa163e8624cc	1	\N	Other
+79a68174-0621-412d-966d-f629f1e6fe21	1	Other	Other
+79a689f1-7545-49ac-9649-82b18b231d62	1	Other	Other
+79a7833d-c20f-4240-a24f-fbbe52f50d5f	1	\N	Other
+79a7b795-818c-4f3b-b6a8-11f152bec203	1	Other	Other
+79a7d3b1-bb80-4480-aedf-4fb7b0b6dc97	1	Other	Other
+79a81775-910a-4baa-87da-16baf4e89913	1	Other	Other
+79a8453f-658f-45cd-aefc-07555bb6af34	1	Other	Other
+79a8a373-da04-4a92-8919-3f838ad2104f	1	Other	Other
+79a931db-f2fc-44a1-a69e-a71709624c0d	1	Other	Other
+79a94e19-bc0d-4784-8a5e-0cab7496df88	1	James	Other
+79a97a12-cad7-4efb-ade3-a3e4b8eeaf82	1	Other	Other
+79a987a0-8964-46c5-ae5c-63daec143076	1	Other	Other
+79a9f0ed-1e1b-4b2a-a19d-1e238cabf85d	1	Other	Other
+79a9f950-8cef-4608-8717-43e6c297aa38	1	Other	Other
+79aa1f95-253b-4e5b-a0d5-b17bd9247e93	1	James	Other
+79aa2221-6a0e-44dd-a9ff-3fa5898a29cf	1	Other	Other
+79aa248d-3d83-4677-b19b-645fab3e3b16	1	Other	Other
+79aa5088-de46-435d-bbca-a42a495627a0	1	Other	Other
+79aa5e42-cd0f-4b7c-91af-04aa51fc3998	1	Other	Other
+79aadcf5-deef-4ed9-8038-124508dfa5ee	1	Other	Other
+79aae2ec-d473-40b3-9ae5-f78497725852	1	Other	Other
+79aaeb03-ebf5-4bed-9e8f-0437f0699c1e	1	Other	Other
+79aaf505-03fa-418b-9c65-93546050927e	1	\N	Other
+79ab2ab0-2035-4578-9b47-dcb188ae2c9c	1	Other	Other
+79ab49c3-48cd-4c69-9f63-25ba80f32235	1	Other	Other
+79ab5b4f-b037-4bf2-9dd3-b41ddbd60402	1	Other	Other
+79ab78bb-4454-4bf1-978d-3d83462c6cfc	1	Other	Other
+79ab852f-5ef0-4f07-beb0-64bf44baa2e4	1	Other	Other
+79abb5d3-394b-4263-bf60-b2c9c545bdfb	1	Other	Other
+79abc358-5111-455e-be5b-7b81057a5a78	1	Other	Other
+79ac10e7-130d-4b69-834a-bf698b716642	1	Other	Other
+79ac2799-c905-44dd-997b-32a37b04e6b5	1	Other	Other
+79ac8799-4f04-46e8-adec-8009afe41bc3	1	Other	Other
+79ac9dde-b776-48d8-8326-db7f319cdf75	1	Other	Other
+79acc94f-a364-41e8-abab-49e7c94333c4	1	Other	Other
+79ace4c2-08bd-11e8-a3b8-fa163e8624cc	1	Other	Other
+79ad183f-39d8-434a-898c-d8857cb45e98	1	Other	Other
+79ad512d-24d2-4dc4-98f3-8a0516410121	1	Other	Other
+79ae09b3-0b1f-4597-816f-f1a79d886ebd	1	Other	Other
+79ae3376-5841-4385-92c7-0655b2c93e11	1	Other	Other
+79ae8d92-1244-490b-9bfc-c65fa85dbc3d	1	Other	Other
+79aeafa7-6921-4793-9f73-3c0d123e395a	1	Other	Other
+79aeb0bc-cf04-4cdc-8f5e-af2927b0248c	1	Other	Other
+79af2eac-cd87-4216-b20e-aeed087d2c09	1	Other	Other
+79af4bb9-4d10-4c23-86ac-aa6be42d0c06	1	Other	Other
+79af8d00-352c-487d-8e7a-2a0484c94bc0	1	Other	Other
+79afa61a-27d6-4266-a7c6-0d5434033118	1	Other	Other
+79afa6d7-1479-485c-a710-abe6bd3a5ff7	1	Other	Other
+79afda78-49f2-4817-b98f-9135fe59dc50	1	Other	Other
+79afec3d-2984-49bd-a0e8-affb015c6411	1	Other	Other
+79b02b3b-8a46-4be7-bea7-bb12c04afaee	1	Other	Other
+79b035e6-65c2-46ff-a474-2bec0806cd4f	1	Other	Other
+79b07e0a-c198-49c8-9f20-6bf7b9d7c9e1	1	Other	Other
+79b0b4d5-1bae-4cc8-a8c0-1ceea711ac5f	1	Other	Other
+79b0e576-d591-4ee0-b443-01bc7ced849d	1	Other	Other
+79b18314-a98d-4301-bcf4-32450d1f4562	1	Other	Other
+79b1efd4-a076-4f19-bbea-6edd9f20b32e	1	Other	Other
+79b226af-fa5b-4a11-9948-af13e4e7ac8c	1	James	Other
+79b26a9a-90a1-4d8d-b456-1a8ff83414c3	1	Other	Other
+79b28ca1-9c3c-4fc3-9a86-5e73fa4f4dd9	1	Other	Other
+79b31308-c4a0-4057-ad67-f94c8812f8f4	1	Other	Other
+79b364ee-8e02-4e6a-ac0b-113eee89bb46	1	Other	Other
+79b378b8-89a6-48c1-8b16-2cf60c19a429	1	Other	Other
+79b3ab8e-0c4d-4305-824e-eb1c7c4ed627	1	Other	Other
+79b3e30e-a3d0-4364-9788-4d7d0b6311dc	1	Other	Other
+79b3f5c5-974d-4f08-9363-0a338956eb43	1	Other	Other
+79b40bf9-bcee-4079-a7c3-8a8556197541	1	\N	Other
+79b418b5-4097-4491-8efc-d503b6a82a26	1	Other	Other
+79b4724e-0b29-4123-910a-645534b8134e	1	Other	Other
+79b49853-2c1c-4d9c-8660-6b112fbbf9e2	1	James	Other
+79b4c5e2-e680-469f-9453-5314debca1ec	1	Other	Other
+79b554c4-5bc7-47be-959d-7b67a210c686	1	Other	Other
+79b555be-9e0c-49cb-bbe0-5c06b029374c	1	\N	Other
+79b563a8-d3f3-483e-b113-805c5c2dc1c8	1	Other	Other
+79b58be5-7cc5-449f-b815-6bbf21e3f05d	1	James	Other
+79b5a126-4380-4c8c-a105-94d3939bb906	1	Other	Other
+79b5a3ad-5def-40ca-aff3-1b5a6dfe34af	1	\N	Other
+79b5bc0f-ccc2-41d6-b439-137ddd135986	1	Other	Other
+79b5c549-0b16-4505-af1b-53212b5f7772	1	Other	Other
+79b63b14-ee7f-494b-bb66-2454d6ffa61a	1	\N	Other
+79b6c3ca-f02b-4315-9fb1-aeb0be4f216b	1	Other	Other
+79b7049d-6d1e-41ee-b500-4255241ec128	1	Other	Other
+79b70f33-f2a7-424c-80d4-0cc5ce7eb89c	1	Other	Other
+79b74646-0427-476f-b5a7-609fa987ccfd	1	Other	Other
+79b78193-539e-4d1b-a493-6eb4338b2f20	1	Other	Other
+79b7bd46-f441-463a-a343-24593a1a0209	1	Other	Other
+79b7cc4c-e606-4279-ab54-3b70cd481c6e	1	Other	Other
+79b85f74-cb59-4775-a329-421f61c9d8de	1	Other	Other
+79b89167-5583-41d7-a071-b9debc006ec4	1	Other	Other
+79b9367d-4f2b-4a18-aa4d-4285a820f9ec	1	Other	Other
+79b9ca09-2a10-41a6-aeb1-202c204bec2a	1	Other	Other
+79ba1d6c-6cce-41db-bc18-6b739471c19f	1	Other	Other
+79ba24b8-3467-4ede-8e3d-345f3c54ce32	1	Other	Other
+79ba6245-becf-440c-8e46-2eccd1def203	1	Other	Other
+79ba858a-d35f-4130-bada-72735e072c02	1	Other	Other
+79ba9517-3f26-403d-b0dc-2ef13596fbeb	1	Other	Other
+79baa28b-b61b-47f4-9400-4d6ceed0deac	1	Other	Other
+79bb0303-de68-4f0c-9f0e-31ae7d84e260	1	Other	Other
+79bb3c04-f41f-421c-ad56-ca82e43ba9cb	1	Other	Other
+79bb436f-f578-42e3-a466-2976abb57623	1	Other	Other
+79bb91c5-b0a0-400c-89a5-36b80f752ecf	1	Other	Other
+79bb95a6-b558-41d1-86a1-f806042d6d09	1	Other	Other
+79bba414-37fa-4ff9-983d-39908a5e3df5	1	Other	Other
+79bba5fe-442e-4e3e-880c-7a2a9603d9b5	1	Other	Other
+79bbc5c6-141e-4b80-9cc0-e276fce6c44f	1	Other	Other
+79bbed1c-46f9-40c4-9bde-a1b04ce50b9c	1	Other	Other
+79bc0542-9126-4d01-8022-e2b9bc66b040	1	Other	Other
+79bc2592-d8ac-483d-b21b-a9168e962606	1	Other	Other
+79bca44c-c97e-4540-92c2-36cb788767af	1	Other	Other
+79bd0153-3783-4ca1-b51c-cb4d3eed959a	1	Other	Other
+79bd0892-b430-40f4-935a-1b670a4772f2	1	Other	Other
+79bd2b5e-255f-430d-8844-d645ff508076	1	Other	Other
+79bd3be8-f329-49e7-93cd-2bc205a87204	1	James	Other
+79bd5252-b3ac-4b4c-a9ba-a6aedef6140b	1	Other	Other
+79bd576d-99b3-47c0-946f-1aa2335de834	1	Other	Other
+79bd69fc-5856-4d11-95d9-755c325ed9e0	1	Other	Other
+79bdfb39-e736-406c-80c1-a5c6702c1646	1	Other	Other
+79be153a-dd1e-4639-8682-bf45056817c6	1	\N	Other
+79be2286-fe7f-462e-8a2e-539bd9d54169	1	Other	Other
+79be3022-1112-4948-98ce-92f9fa8f1ca6	1	Other	Other
+79be79f7-4b68-419c-825a-d102935e2b47	1	Other	Other
+79be87fc-d76d-4b45-8d1e-89dac72ebfd7	1	\N	Other
+79be90e3-3c70-4e26-a246-2571328f4e2c	1	James	Other
+79beab2b-2d21-4a42-bf33-b3dd03ee4b6b	1	Other	Other
+79becc4a-5f36-41d5-9221-c40a3e637b65	1	Other	Other
+79bf0d0f-f428-4b4c-8ba9-d4b16aecb4f5	1	Other	Other
+79bf8007-9898-47dc-bf9b-a63e7aa25311	1	Other	Other
+79bffbaa-fd6e-4efa-b158-726cad9f08a1	1	Other	Other
+79c0b174-3410-494a-9fa3-72104a5d36a6	1	Other	Other
+79c0bdc5-e13f-4470-8ab6-4ff6059938a8	1	Other	Other
+79c0c7c2-5fff-4bd2-b192-62cf4008c8ff	1	Other	Other
+79c0c8c3-ceda-4f82-8b86-58f1f245f21d	1	Other	Other
+79c0d2d4-ab79-4800-8353-506dcff26103	1	Other	Other
+79c10dd7-3715-47e9-90b4-29aee9c99168	1	Other	Other
+79c12b63-28d4-4e71-9685-ec209d5915d4	1	Other	Other
+79c146ce-c75c-4aa2-a0d7-3682803c7369	1	Other	Other
+79c17573-3fbf-443c-a194-37a11b1bfc52	1	Other	Other
+79c17625-c22a-4d26-8739-dc48f6da22a5	1	Other	Other
+79c2099e-7e2d-4b33-8731-d9f87e69f6d3	1	Other	Other
+79c26a64-8a52-43de-bbe3-d275446ff1ec	1	Other	Other
+79c27acf-8714-4b0f-93ea-9ad354680b96	1	Other	Other
+79c296e6-3795-4a95-a8b5-22b7a35196de	1	Other	Other
+79c2f304-a0eb-4857-bb8c-6fab7467f390	1	Other	Other
+79c32017-dae1-4ab7-b3a8-a96bd39a6c45	1	Other	Other
+79c3223d-a65f-4190-9c52-eda53bea063b	1	\N	Other
+79c3355c-ec5b-4fa3-b713-e64abacd0f65	1	Other	Other
+79c39015-60be-4f03-a50b-d01c7246bd90	1	Other	Other
+79c3e72d-0df0-4698-a80a-3eb2539fb20c	1	Other	Other
+79c40651-de53-4704-8a08-27f38b6b1bd4	1	Other	Other
+79c48dc5-b6a6-4baf-b0dc-6a6b310fc941	1	Other	Other
+79c494f3-93d1-4ec2-81b3-f5ad611a413b	1	Other	Other
+79c4a08a-0705-4f69-98f1-c815430bcac2	1	Other	Other
+79c4e0e6-5728-4f09-8b3b-bd750c7e3304	1	Other	Other
+79c50172-740a-4f30-955e-e13539e110d0	1	Other	Other
+79c56a14-3e8c-4ac8-a11f-702b85243d72	1	Other	Other
+79c596b2-d742-48d0-98ea-8c48ed7b094a	1	Other	Other
+79c5c4c8-a873-474a-8883-03476cb33571	1	\N	Other
+79c5e522-f97f-4f81-a6e7-5e56f56e4fba	1	Other	Other
+79c608d0-546b-47d9-a26e-97f55151e2c6	1	Other	Other
+79c6324a-a5da-4a5c-a03c-46b55eb6de0d	1	Other	Other
+79c63a30-0dac-4aa1-afd2-a89d4b9521e3	1	Other	Other
+79c64545-92df-40d1-ab2c-dc9f2325cf92	1	Other	Other
+79c65a63-3c65-453c-8996-1a7af02fea8b	1	Other	Other
+79c6b179-f227-42ff-85ff-b204681ea955	1	Other	Other
+79c6b940-3127-44fc-bc42-9f59853bf234	1	Other	Other
+79c6c935-0656-419a-90c7-e57829c8cdfb	1	Other	Other
+79c6e9ab-31dc-4a22-8dc9-211f608081c1	1	Other	Other
+79c6ede0-7423-4a28-8c84-cf2d68fecb60	1	Other	Other
+79c74ccd-12f1-47cf-a737-0b22183b5dc1	1	Other	Other
+79c7780e-9aad-42c4-b2f9-cbace55ae796	1	Other	Other
+79c78a31-e2cc-47a7-9103-01a504d7598e	1	Other	Other
+79c790eb-4c5d-4cca-a8d5-7dcb9d64c32a	1	Other	Other
+79c79225-4791-479c-bd25-b0dd41976c0b	1	Other	Other
+79c7a03b-804d-4786-8b4e-b3caea2c7a5f	1	Other	Other
+79c7ea14-0b0f-47a2-a15e-9cb10ef9c635	1	Other	Other
+79c7f856-6eb1-46f2-b81d-f8c217e49eec	1	\N	Other
+79c89e16-b96f-4251-9f90-8fe6711e413f	1	Other	Other
+79c8db1e-d57d-4fde-9041-066e24675c2c	1	Other	Other
+79c96ee1-b33c-407e-8f0c-9af25af46730	1	Other	Other
+79c9beb1-4c64-4152-8e96-25fb42737369	1	Other	Other
+79ca2a39-d8b2-4019-be75-224dfe2971c5	1	Other	Other
+79ca3a59-8d7e-48d0-adb3-b0c59dae52ea	1	Other	Other
+79ca6beb-34c1-4842-b697-fcd1fad2c3b4	1	Other	Other
+79ca7cf6-4aa4-4676-9a14-981cc4b705b8	1	Other	Other
+79ca873b-ee01-465d-b733-2552b8e51cbc	1	Other	Other
+79caa04a-2061-4bf6-b785-1b7370945adf	1	\N	Other
+79cabf7a-18d4-439d-8a32-22d578c5abbd	1	Other	Other
+79cb3340-ee66-4886-9d6a-be8e70c346c4	1	Other	Other
+79cba969-f713-428e-becb-653fa7a3ab96	1	Other	Other
+79cc03dc-5a73-4e7d-8732-21c17574bb2b	1	Other	Other
+79cc15ee-2ccd-48ee-afae-1096bb111dc8	1	Other	Other
+79cc2144-0a0f-4c20-bcee-6ad6f64b3049	1	Other	Other
+79cc2776-5761-4512-ac2c-aaedfa8225d7	1	Other	Other
+79cc48ca-696e-4837-8129-e6d2cbef5cf9	1	Other	Other
+79cc6778-5bcc-4d20-9291-00b6f9680846	1	Other	Other
+79cc7a64-3cc4-4025-8ea2-31e7eef770ab	1	Other	Other
+79cca1b7-84f3-4161-9f0d-55e9d4cd0ca7	1	Other	Other
+79ccb1ec-2ccb-4daf-81d5-f2711f49ce86	1	Other	Other
+79cccd34-e678-4c33-9c64-c3837e4db072	1	James	Other
+79ccd989-82e5-4b61-90ef-51db8cb8a99a	1	\N	Other
+79ccdcc3-1c7e-4dc2-bb01-a4dbc5399935	1	Other	Other
+79cd12e4-00bb-44fc-bf03-c68e12a42aad	1	Other	Other
+79cd1d99-ac72-4eaf-bd4f-89c2bdfc641b	1	Other	Other
+79cd5ab2-f806-4f48-9f10-e20de907f2ea	1	Other	Other
+79cd65cf-1e77-46ee-a7de-6f496abe7965	1	Other	Other
+79cd9112-05eb-46fd-a914-6ab3e3ab627a	1	James	Other
+79cdd0ec-20d4-40c9-a206-c4e427fd51a8	1	Other	Other
+79cdd9be-a281-42e7-aa3f-55ab57bf863b	1	Other	Other
+79ce0557-c978-4fee-a99c-ff3ace2b4fd1	1	Other	Other
+79ce56f7-0a76-4258-9877-ec2001a07626	1	Other	Other
+79ce7453-480a-439c-a1ec-f085ade0aaa5	1	Other	Other
+79cea350-c6b2-4726-9cef-48df07978c43	1	Other	Other
+79cec089-eb13-4a5c-88c7-9862d27b1a04	1	Other	Other
+79cec655-9f8f-4d50-a04d-52fb92fbe13d	1	Other	Other
+79cf43ec-4d23-4c93-a706-8401afae344c	1	Other	Other
+79cf7e39-0b16-466a-af6c-19391d97b5a9	1	Other	Other
+79cf9524-f904-4d34-8bfe-ea5ec299fd49	1	\N	Other
+79cfe38b-61c0-4a2d-b68e-048038d32893	1	Other	Other
+79cfebe1-dd79-42b2-beb6-d45fc3145e0b	1	Other	Other
+79d0104d-f7d4-446b-ae50-53a4940a2332	1	Other	Other
+79d04d0a-8f9a-44e7-b79b-011ba70f8eef	1	Other	Other
+79d0c4b4-a00d-4e72-8d72-57eaf3d30928	1	Other	Other
+79d0f0d2-1d6d-4322-9ad2-68b4e8b77564	1	Other	Other
+79d1a517-dbeb-46c5-97a4-60b0023049e8	1	Other	Other
+79d1c3be-b2ca-48bd-986f-2eb9d5801fd8	1	Other	Other
+79d1c90b-c149-4e44-a618-e2ba90990091	1	Other	Other
+79d2ad6b-4ca4-4ed7-8d31-cd80f8e949c6	1	Other	Other
+79d2cae3-b9f6-4d51-a5da-07ec755863db	1	Other	Other
+79d2d5d3-8bf9-4555-b355-605ef6d7872b	1	Other	Other
+79d2f919-0c28-4fda-b12f-e2a95e3e0015	1	Other	Other
+79d30c21-a7f7-467e-ab78-ad91dc8155f7	1	Other	Other
+79d37c51-668b-40ab-a141-eac3b9491490	1	Other	Other
+79d38761-c2e5-4069-a9a0-a98a7398dccf	1	James	Other
+79d3bcd4-26c8-4ec1-974f-8131d20bb1f5	1	Other	Other
+79d43c3f-e8ce-4240-b63f-0f20578304bb	1	Other	Other
+79d45dcd-ae6b-4ae7-b590-cdd62b345e37	1	Other	Other
+79d46126-5bd0-49c4-a853-7d628923619a	1	Other	Other
+79d47e22-560f-424d-a886-414e7bc821e8	1	Other	Other
+79d489c0-9e83-40b4-b024-2b393b613696	1	Other	Other
+79d4ae42-3c11-47af-875d-722c530238d4	1	Other	Other
+79d4dc7e-1347-455a-ace1-ee19ca2b36aa	1	Other	Other
+79d4fb75-7606-4653-ae99-ba74e5cf712f	1	Other	Other
+79d5450d-241e-4428-8704-4d0dde4bd9df	1	Other	Other
+79d5483d-2dff-41e6-bfd8-8f4944b27488	1	Other	Other
+79d5d687-5753-48a7-b8c4-2f80ed4dfcb3	1	\N	Other
+79d5dfa7-a695-4aef-9bc2-de6118cd88a6	1	Other	Other
+79d5e2dd-9241-4560-9358-061531a53991	1	Other	Other
+79d65f1b-d1f6-4d23-9c55-2b00aab90b42	1	Other	Other
+79d66715-a55a-4ac3-bf40-2e41a3f43728	1	Other	Other
+79d6be96-a1b7-4158-a4cd-b3b38c9b6865	1	Other	Other
+79d741c4-4e62-4fed-a4fa-f6d40107a75a	1	Other	Other
+79d7cf70-a23a-446c-b891-2914bcd05216	1	Other	Other
+79d8152e-dc3c-4b1c-8358-b983ef70b320	1	Other	Other
+79d85fd9-9ec5-4969-8df2-0fb66375aa59	1	Other	Other
+79d8d56e-bb80-42ea-b852-490a28096832	1	Other	Other
+79d8e761-f549-4c0e-83dd-314598a79cc9	1	\N	Other
+79d8f175-2ae6-4ce9-be48-8138384131b5	1	Other	Other
+79d90d49-2e71-421b-ae5e-ef7e98b2c4af	1	Other	Other
+79d9a47a-d82b-4eff-94f7-f8de295482d1	1	Other	Other
+79d9d4d6-7214-48f5-84ed-bbe8435be171	1	Other	Other
+79da26b0-d9e7-4e30-b0f7-4ad3ab2ecb86	1	Other	Other
+79daa059-9292-41b8-a454-45bc70b0e74a	1	Other	Other
+79dace8d-98f7-4e93-81ee-1b356a63a7a5	1	Other	Other
+79dbd54c-2b01-4c43-a6c5-096e11bb360e	1	Other	Other
+79dc1c75-820c-42c2-9108-39b3657669f2	1	Other	Other
+79dc4d99-d034-4656-a6fa-d0b958d2ab29	1	Other	Other
+79dca2d7-0a28-45bd-bfb6-135e8b5ecc81	1	Other	Other
+79dcc6dd-6cd0-4dc6-844f-d4f8e842fca4	1	James	Other
+79dcc8dc-bd17-4dc0-95d4-b3060d97c09b	1	\N	Other
+79dce8ba-82bd-456e-baf6-ee7475603f9c	1	Other	Other
+79dcf148-6013-4b30-8c26-7d3572d87ddd	1	Other	Other
+79dcf664-59cd-4671-9bb4-4608020f2714	1	Other	Other
+79dd0b1e-7a56-4e2a-92e5-4fa6390b7b88	1	Other	Other
+79dd1dab-1726-452c-8d46-546ab97255eb	1	Other	Other
+79dd33a9-09b2-4d43-8e7e-8894ec229d0c	1	Other	Other
+79dd60df-5e23-45ef-b19e-f1ca72aeaa47	1	\N	Other
+79dd81bc-13e3-4a16-9f90-8b9ff309bfcd	1	Other	Other
+79dd89ec-6bf4-4776-9c8e-6998ad5ff0dc	1	Other	Other
+79ddd5d5-996f-4cd4-808f-ef0e5e4d05ff	1	Other	Other
+79ddfa94-82f5-48b9-a408-189dd89b0d70	1	Other	Other
+79de2464-cf66-4f25-adad-f2dc69cb2cff	1	Other	Other
+79de2987-f92c-4059-902d-33772ce2aa1f	1	Other	Other
+79de886d-3bcf-4750-8636-3fa48f539746	1	Other	Other
+79dec2d3-594d-4787-9fb0-6e1673afcb33	1	Other	Other
+79defb7a-b20c-4e33-a098-3070c03dd0f6	1	Other	Other
+79df7785-37af-4ee3-99c4-640b3f2648b7	1	Other	Other
+79df8708-d363-4073-bd07-f1452e9c70cb	1	Other	Other
+79df931c-98d2-42b0-875e-4348c2af1721	1	Other	Other
+79dfba03-cea7-4dff-a646-f708c7e3eb93	1	Other	Other
+79dfbfd5-eae5-4bbd-adfa-ca924a223457	1	Other	Other
+79dfd1fd-ec6a-45e7-947a-110e22ba92a0	1	Other	Other
+79dfdffd-463a-4d75-a6b0-6be5c63d7f31	1	\N	Other
+79dfe49b-0981-46d5-94e5-e5ce9f5a3092	1	Other	Other
+79e0337b-0fed-4a66-9915-a4c5193b427d	1	Other	Other
+79e03d08-ce3c-41f9-a651-08f527b9b6c4	1	Other	Other
+79e08daa-5a28-4620-8600-02eac76eb72c	1	Other	Other
+79e0f337-c527-4284-92e1-6c9507e70f18	1	Other	Other
+79e102ba-2391-4f2a-9960-a65f09342dd1	1	Other	Other
+79e1333b-67e4-4b49-9976-ed1212cb9196	1	Other	Other
+79e14ace-e46f-4eff-9e16-fc49da4c3b6e	1	Other	Other
+79e1a8c2-0da9-4236-b5ba-e509e2169385	1	Other	Other
+79e1c4d4-626b-44e5-8b35-79312babbf4c	1	Other	Other
+79e205a1-c178-409a-9831-746488d19da6	1	Other	Other
+79e240e7-81e3-4c15-81cd-404d3603fbb3	1	Other	Other
+79e2465a-42c1-483b-a791-0a9e5b86288d	1	Other	Other
+79e26ffb-b80b-4d77-88a3-78d6d9013764	1	Other	Other
+79e272c9-5e6b-474a-b8b3-7040c1b4b416	1	Other	Other
+79e27b01-e781-4faa-b2fc-931a83acfe32	1	Other	Other
+79e2aa95-80ba-4c02-ad1d-995d7a87be43	1	Other	Other
+79e30c19-c19f-41ca-ac74-bbb2742e5673	1	Other	Other
+79e31f3d-c535-47e8-8970-b9232439b4ff	1	Other	Other
+79e333f0-2685-4372-91cf-6a4c587e054d	1	\N	Other
+79e33da2-0c75-4c2c-b522-bd2d06483980	1	Other	Other
+79e36509-d04a-4e8a-9b86-39ce668b1b45	1	Other	Other
+79e3942c-8e45-42f6-9df2-f816134c0298	1	Other	Other
+79e3f49f-6c17-40b9-b385-edf4ac6b9303	1	Other	Other
+79e3fcf2-67ea-4f61-b14f-cba0198ccac5	1	\N	Other
+79e4196a-709b-4e8f-bd8e-27c83a62368c	1	Other	Other
+79e4230c-6b53-4f5a-80f5-8fb64fc52c64	1	Other	Other
+79e47393-3bd3-4d73-b2d7-9dcadc77f125	1	Other	Other
+79e4a444-03f9-4d5a-b953-c17a29007a12	1	Other	Other
+79e4dd5d-6952-48a9-8492-75aa9b32bfac	1	\N	Other
+79e4f86e-d559-4957-b58e-c3559677ef5c	1	Other	Other
+79e5d4ce-47af-4f5a-b96f-0a0fbfe6d92b	1	Other	Other
+79e61329-224b-491e-8769-d38e89414ab9	1	Other	Other
+79e633a3-a6ee-42b6-8c0b-4e85f0100281	1	Other	Other
+79e635e1-bf6d-4fab-923f-caa146af9b6c	1	Other	Other
+79e693d3-7e92-4fc2-b6d1-a66dd5ee6217	1	Other	Other
+79e696c3-bc72-488e-bfb5-ab0e13f54b61	1	Other	Other
+79e69b91-be62-414f-b144-ad990866bb99	1	Other	Other
+79e6df59-a6c1-4588-a313-8ebc30ffa210	1	Other	Other
+79e707b0-3a17-46c0-a43e-5a85dac57dec	1	Other	Other
+79e72fc4-31ca-46ca-9d10-4c7011a37d7a	1	Other	Other
+79e77739-56dd-4a4b-83b6-451dd8a4663b	1	Other	Other
+79e79478-ee49-4c7f-8c58-696a6c3ad803	1	Other	Other
+79e809d1-c0f0-4400-8d92-b6c809cdad9c	1	Other	Other
+79e81209-642c-4a88-b037-f707b29990c5	1	Other	Other
+79e84623-c7b4-4d3b-abf1-d3ed4d86f4c0	1	Other	Other
+79e86330-1300-4ef7-bb82-3846d9b543a9	1	Other	Other
+79e88174-395a-42de-941a-240add0e8fcf	1	Other	Other
+79e923ff-b279-4a45-896a-b31c81cbe389	1	Other	Other
+79e949c3-b51b-424c-836f-61a91128276c	1	Other	Other
+79e956b6-4790-484e-ba99-215bcc7d3e7d	1	Other	Other
+79e9a6a1-c87f-48e1-b9a2-c76665c0a2d0	1	Other	Other
+79e9bbe4-b504-415d-8f42-ae232b376e0b	1	Other	Other
+79ea02ed-78dc-4225-b171-e0ca21befb79	1	Other	Other
+79ea53b0-0b59-4d78-b75c-5f0204639af4	1	Other	Other
+79eb23ed-b4db-462f-9b6a-d6de1217a7b6	1	Other	Other
+79eb2531-0035-4ff0-aaf4-f939e75c9f86	1	Other	Other
+79eb2ddd-bd99-49b2-b2fd-762a0f8b1093	1	Other	Other
+79eb3f46-b8c9-4234-a38c-5382cea1d83e	1	Other	Other
+79eb570d-4eff-406b-9816-d070ca30d45c	1	Other	Other
+79eba5be-5712-4eac-8bab-1761f2e42fb3	1	Other	Other
+79ebb4c1-b3fa-4678-9f4e-8165b37d8ccd	1	Other	Other
+79ebbe42-7ab8-454b-913a-222f44a96d1a	1	Other	Other
+79ebd75b-9960-4cfa-9295-3ed5df36b4f5	1	Other	Other
+79ec06b3-af30-4087-afad-8891a1580951	1	Other	Other
+79ec3df5-d6d9-404b-9d8d-d2fb9fb28e0e	1	Other	Other
+79ec3fc6-39b4-440e-b44f-00f1d4c5431e	1	Other	Other
+79ec662d-d647-41a4-b6de-4d7abbfbc076	1	Other	Other
+79ec6d48-ca0b-424a-b5b7-aae9d126be06	1	Other	Other
+79eca668-a56a-4ace-9336-9412d565b87e	1	Other	Other
+79ecb28b-74a4-40f0-9fda-4f72976df164	1	Other	Other
+79eccb17-4d20-4e61-abde-a4d2da6c32d5	1	Other	Other
+79ecf969-6ace-4ba9-90c7-d1fbdf582be6	1	Other	Other
+79ed3c4d-c0f9-434d-a9c6-43b044f8d00c	1	Other	Other
+79ed43fc-8365-4a9f-ac05-467d32b0e513	1	Other	Other
+79ed473d-9af7-4b2e-8e7f-10bf0761233a	1	Other	Other
+79ed5c5d-af87-41f0-879f-037ca1fbf483	1	Other	Other
+79ed723c-b8e8-4cda-ae74-7a20f38662a1	1	Other	Other
+79ed7e69-64a2-4e0b-a269-747519eb5e2e	1	Other	Other
+79eda47c-7761-460d-a6d9-023f3e40a958	1	Other	Other
+79edcfdc-08aa-4f58-a3b7-3ae06a812454	1	Other	Other
+79ee033a-000e-44f1-9f12-13021cb8267c	1	Other	Other
+79ee0b27-a3fe-4cfd-acfc-b172496ee4d8	1	Other	Other
+79ee60bb-9bae-4714-a103-f476567f00e2	1	Other	Other
+79ee74bf-c3db-4e55-bd77-2ab03c36841c	1	Other	Other
+79ee94eb-2f71-4e44-be90-4267768baef8	1	Other	Other
+79eeb23c-161e-42d0-b146-7e16f69411cd	1	Other	Other
+79ef1eb1-7ba1-426d-beb3-5fc3650125bc	1	Other	Other
+79ef6032-d738-4dee-b5bd-401f570cdbf3	1	Other	Other
+79efc188-13a3-44ce-ac9e-80ef68de012f	1	Other	Other
+79efe5a9-aeec-4bfc-83aa-191f57921b4b	1	Other	Other
+79f0e3d9-2951-40ba-9782-bf3ddc30beea	1	Other	Other
+79f11ce0-74af-4c07-84c6-1f5aeace10e1	1	Other	Other
+79f1400a-8661-4c7d-90a4-d7a97000f1e9	1	James	Other
+79f1a885-b607-45ad-86ff-c66e465279af	1	Other	Other
+79f1fb64-474a-46d3-b4a2-b38ed056e30e	1	\N	Other
+79f26024-8f97-4a58-9cf8-6ccd211c8e17	1	Other	Other
+79f27b64-c4e2-43bc-959b-81053334eacb	1	Other	Other
+79f2d074-c479-47f3-b0ad-d9811d1aa3c6	1	Other	Other
+79f2de07-dd6c-4e8f-b163-4ac9c5ea4d9a	1	Other	Other
+79f2f102-72d0-402a-9b84-1465aee37fbe	1	Other	Other
+79f38b8b-155b-427c-a4c1-1ea82f7d1235	1	Other	Other
+79f3b0f6-6c79-4319-9b8c-8b10f32b926e	1	Other	Other
+79f427f7-8f9b-4506-89ca-2c98fbb996fa	1	Other	Other
+79f43322-d252-42f1-8412-b71dab3701d5	1	Other	Other
+79f4a060-e969-472f-b83f-34cfb994d41e	1	Other	Other
+79f4baf9-ced5-4249-8178-c8fe23335eaf	1	Other	Other
+79f4c448-bb10-41f4-970e-b71acb1037fa	1	Other	Other
+79f4f65e-c399-40c4-a933-f8047b93be8a	1	Other	Other
+79f54822-6f81-4a28-924c-5ab1c3f21c12	1	Other	Other
+79f55b92-0692-446c-8731-2a6a4ec23f9f	1	Other	Other
+79f592b7-cd94-4b83-82e0-e923169cb08d	1	\N	Other
+79f593e0-7441-4446-aadd-953680b32627	1	Other	Other
+79f5a158-ba4e-4fb5-97da-1b5e730c3847	1	Other	Other
+79f5c081-7454-430e-b5ed-2957453f9d76	1	Other	Other
+79f5d6a4-00ea-4e8b-abd0-6fb5fe41e22f	1	Other	Other
+79f5ee97-f11f-4f7f-a6b5-2c8847f394d4	1	Other	Other
+79f5fb08-328b-4147-8491-260289d16e0f	1	Other	Other
+79f60b89-d891-4020-8795-c074627107d5	1	Other	Other
+79f664bc-2309-4c26-9dfe-e99ba7d386f8	1	Other	Other
+79f68300-774c-4a6e-a10f-a022e35b3efe	1	Other	Other
+79f6d2d3-2bcb-44be-ac7e-b6a56f73fcdc	1	Other	Other
+79f6dc2c-e225-4f67-8ffa-3e67b4b76bfe	1	Other	Other
+79f70a32-5d63-4bae-a518-0d0bca57154e	1	Other	Other
+79f71bfd-177f-406c-b635-04630190463a	1	Other	Other
+79f74d5d-ed09-48e8-afe2-3049d5e2dbf1	1	Other	Other
+79f7cfdb-4d71-45ab-9cf1-0f611ad49f47	1	Other	Other
+79f7d25b-ff4b-4151-9241-01e6b6dc8576	1	Other	Other
+79f7fae9-8cbe-4532-9b7d-be5c1a175586	1	Other	Other
+79f800c4-c03b-4a3f-93b2-ed313ed381c6	1	Other	Other
+79f807a2-03fb-49ee-a7ac-b1d80e1b65fe	1	Other	Other
+79f82d3b-89f3-4c84-8c2a-1f54986750a9	1	Other	Other
+79f8a3f1-ccfc-4833-99f1-f1a9e779158f	1	\N	Other
+79f8bbb9-8483-44ff-8a70-e5acc0ffc098	1	James	Other
+79f92a01-0c9d-41d4-8478-0333602d8634	1	Other	Other
+79f92f9b-0959-4185-bc9e-4b07d377cd20	1	Other	Other
+79f9731e-8403-482d-a9c4-2ffffb79133e	1	Other	Other
+79f97f22-72ed-4654-b2c4-ee5d48c7d565	1	Other	Other
+79f9b140-0afc-4932-a2e0-742a42961be5	1	Other	Other
+79fa551c-6aa2-4064-8745-9c3986057625	1	Other	Other
+79fa77bb-b8f1-457f-8063-e5014acf67f0	1	Other	Other
+79fa8854-203d-4fa3-a4e3-03ebe4e87574	1	Other	Other
+79faa0e8-82d5-4fbb-bf6f-3ac77d78d60a	1	Other	Other
+79fabbe9-503f-45da-ab84-45634fb4bc9c	1	Other	Other
+79faca2c-ba59-4d92-bfbe-8651163cd546	1	Other	Other
+79fb191c-8693-4693-a420-e9d4886f9c5f	1	Other	Other
+79fb536e-9c23-4f12-a555-8ea78e11ed1a	1	Other	Other
+79fc483f-5223-4d5e-8420-e141ba78e0fc	1	Other	Other
+79fc4a36-8a00-4d53-9abe-4757c09662b8	1	Other	Other
+79fc5368-0457-4dd7-8ab0-40ab8bd1bbb6	1	Other	Other
+79fc5538-fde2-46ca-ac9f-81743f95e893	1	Other	Other
+79fc5c00-3228-42dd-8f9a-e1e48dc32aea	1	Other	Other
+79fc5c9a-75f8-40d6-af40-dc1129e405ac	1	Other	Other
+79fc75e3-deac-43f4-9a97-e12bb07f4fe9	1	Other	Other
+79fc7f55-4087-4b43-8504-aa40eaccc0d7	1	Other	Other
+79fcd913-24bc-45e3-90d0-b6f45028b63d	1	\N	Other
+79fced3c-d4c0-476d-9593-a788b020f80b	1	Other	Other
+79fcf6e0-1697-4ebd-883f-b3885e18b01d	1	Other	Other
+79fd4006-50b5-4c06-8c9c-d38d5be2efe8	1	Other	Other
+79fd5b5c-38e1-4d41-8f21-976af565d3b7	1	Other	Other
+79fd6d46-1781-4b43-b894-997c2d484896	1	Other	Other
+79fd8221-d9be-4ae1-be6d-31e8d1781829	1	Other	Other
+79fd83ad-c70b-4408-a295-9e9cabc86eaa	1	Other	Other
+79fdb00e-0701-494c-89cc-fce758b64064	1	Other	Other
+79fdefc7-bd9e-4963-90e8-e125a0d03211	1	Other	Other
+79fe43b1-3f05-488a-abbf-498c3bcdaaed	1	Other	Other
+79fe5448-8ff9-4480-bc7f-c130871d0428	1	Other	Other
+79fe6f14-06b0-4703-80eb-a6538f52a711	1	Other	Other
+79febf56-943f-409e-8d03-0ce05e4ae686	1	Other	Other
+79fece08-bebd-4e73-912a-dd8f8989295d	1	Other	Other
+79fef567-1950-444b-a002-8dcead115b10	1	Other	Other
+79fef87d-17f3-4b25-8c7f-ef62fb656a96	1	Other	Other
+79ff714b-513d-4c83-91ea-4643f04bf03c	1	Other	Other
+79ff7bb7-a205-4199-878f-c0b04e612cd7	1	Other	Other
+79ff8022-6aec-4055-a272-15bb861e8d71	1	Other	Other
+79ffe7af-a41a-4f03-961c-5ae86b193f22	1	Other	Other
+79fffb0e-7cc0-455e-9220-69557b281876	1	Other	Other
+7a000139-df6d-441e-9d94-3ba8c217dbab	1	Other	Other
+7a003123-9fa2-405b-a305-f4d7d84a5e38	1	Other	Other
+7a00372a-f6a6-4e0d-ab02-f235a531bb07	1	Other	Other
+7a003d3f-c1d4-4f28-97fb-142a1c8d3a1f	1	Other	Other
+7a0041c5-98aa-48ed-8a81-b67e8135e545	1	Other	Other
+7a0044d5-8b6a-4725-b235-0746911aeb1e	1	Other	Other
+7a008b30-68e6-448c-90e0-c124bfcb6560	1	\N	Other
+7a01015a-2b32-11e8-853c-fa163e8624cc	1	\N	Other
+7a015f65-0763-40d5-8fb4-5c232a66afbf	1	Other	Other
+7a01cdc4-10f9-4a32-a507-bf03df9e66e0	1	Other	Other
+7a01e005-aaca-40a2-97ae-e30960dcb665	1	Other	Other
+7a01e4ea-8112-46cf-aa62-cecf977bbe21	1	Other	Other
+7a01f3c3-13c6-481b-aa43-b86772f44f1f	1	Other	Other
+7a021a94-f0ef-4255-9dd0-20fdad33a02f	1	Other	Other
+7a02271e-5c97-4b14-b2e3-e6633947aa87	1	Other	Other
+7a029f04-a855-4c21-a75f-b91762207b3d	1	Other	Other
+7a03c143-6a3f-477e-af6c-1e91dcd0e850	1	Other	Other
+7a040206-55aa-4838-b534-576d9b870cf7	1	Other	Other
+7a04179c-53a7-4596-88fd-c96e246af43a	1	Other	Other
+7a044dbd-7958-4723-943e-53b50fa1a0bc	1	Other	Other
+7a0459cf-dde5-42f1-ba96-eba0103f2cbe	1	Other	Other
+7a04fd1d-6bc5-43c0-97ce-d9119febe0a7	1	Other	Other
+7a05437f-b1ba-4c63-920c-43769adcea31	1	Other	Other
+7a057ef2-3525-41a1-bc18-3d6bf0af7501	1	Other	Other
+7a0580d0-a25e-4f86-bdfe-dc1290ddd6bf	1	Other	Other
+7a05df7d-3389-4e2d-8ad2-0cc2b28e551d	1	Other	Other
+7a0601a6-c265-49ac-99d6-e3729d97fbfe	1	Other	Other
+7a061986-391f-450e-9ea5-4438bfbaeab2	1	Other	Other
+7a062fbf-e74d-4788-a24f-272e8792e5b6	1	Other	Other
+7a066795-11a9-4fbe-acd0-2c15fbeb707f	1	Other	Other
+7a066e99-92ea-4fe6-b39a-f37ef4b80a26	1	Other	Other
+7a068753-a76e-4518-adf7-ca720cacbeb0	1	Other	Other
+7a068f23-51fe-4422-a71f-6b3f3c97d1c6	1	Other	Other
+7a07031b-3a51-492f-91f1-920ac723663f	1	Other	Other
+7a074b64-11df-433e-bb6d-e8b3d6247204	1	Other	Other
+7a07620e-1e9e-473a-b25e-88f7401bb6f4	1	Other	Other
+7a0789d6-6c95-478b-b134-50755bd3253c	1	Other	Other
+7a0795b9-7eb4-4f17-8719-488460d1bf2f	1	Other	Other
+7a079d73-f8b7-41c1-84f9-0fb74b7b3aa4	1	\N	Other
+7a081bb0-9073-45c4-8818-1a9626c8107d	1	Other	Other
+7a085063-b24f-451e-848e-65b4d5cb9911	1	Other	Other
+7a085291-0c70-4039-957f-4a884874abe1	1	Other	Other
+7a085710-4d6c-4774-9146-67d20e8e0e2c	1	Other	Other
+7a087b06-d992-4e55-b533-edba9d9134e3	1	Other	Other
+7a08f526-d4b9-4a9e-84ea-adc4e3c31b05	1	Other	Other
+7a0910e1-c818-4a60-8ad2-5ebecbc1c6d9	1	Other	Other
+7a09c320-1904-45e9-8101-b2e45877c1d7	1	Other	Other
+7a09ecf7-7ef0-4547-9cbc-0679e2ffebf0	1	Other	Other
+7a0a0ef6-ca62-4dcb-9b19-3f7a2347ce0f	1	Other	Other
+7a0a634a-16fe-4319-bc42-d943f6055cb8	1	Other	Other
+7a0a9dcb-cab3-49be-95c2-961b9d6f1f1f	1	Other	Other
+7a0ac5ec-5f19-4577-a2e2-0dc8944ca445	1	Other	Other
+7a0af1ce-f6e5-471e-8549-4e711bb676e8	1	Other	Other
+7a0bee1b-467b-49e4-8828-c38873fc2653	1	Other	Other
+7a0c11f5-4bb7-40a1-9177-60d088ff3234	1	Other	Other
+7a0c2264-68ed-42bf-879b-2b4c1cff72ab	1	Other	Other
+7a0c2665-2ec2-4ab3-8dc7-4d420263e5e8	1	Other	Other
+7a0c28fc-c63e-4c56-b954-4b4f096d9a80	1	Other	Other
+7a0c600e-a62f-40db-a532-17c3310b3e78	1	Other	Other
+7a0cb0ed-877d-4a7e-a531-39913caae749	1	Other	Other
+7a0cb4a0-09a7-4a43-ae95-69624db0864f	1	Other	Other
+7a0cec3e-9a6c-4c95-8a26-64a9bb427267	1	Other	Other
+7a0cf4ac-f0bd-4005-8946-85dce6179a64	1	Other	Other
+7a0d08f1-7572-4f0b-88b3-67642381f3dd	1	Other	Other
+7a0d0efa-cc10-493d-b5e7-1f671053efca	1	Other	Other
+7a0d1a27-6bc5-4a3e-8cac-49e4e72ec16d	1	Other	Other
+7a0d36b1-b0f3-4f2e-a4fa-43b8f03c4c64	1	Other	Other
+7a0d853d-ab5b-4296-b0f8-a987723e0197	1	Other	Other
+7a0d98ca-2bb5-4564-af38-971f865a8e57	1	Other	Other
+7a0d9b13-1313-4fe7-a972-701d298a6a14	1	Other	Other
+7a0da7ef-8ba3-4f0f-b18f-7e1646961848	1	Other	Other
+7a0db71e-7521-405c-884b-c2564ed40e44	1	Other	Other
+7a0defeb-28ee-4043-a754-9f3f6c806017	1	Other	Other
+7a0e0b8d-c4f7-4a5e-b588-07d08170a1d8	1	Other	Other
+7a0e253e-9445-4776-bb57-d01ab717e75f	1	Other	Other
+7a0e53b7-45d7-434e-9f73-dcddfb1fbffd	1	Other	Other
+7a0e6afc-c30f-4bea-9501-38dc300d1347	1	Other	Other
+7a0e9d42-74f0-40bc-8738-4360492daa12	1	Other	Other
+7a0eaf09-24e8-462f-a057-9cba261659f2	1	Other	Other
+7a0edd90-207a-4ffe-ad7f-d60948da3fd1	1	Other	Other
+7a0ee017-8e4c-411f-9e33-8b377719c94d	1	Other	Other
+7a0ee074-8416-43cc-b5a1-0f9db5bf2ed9	1	Other	Other
+7a0ef1a7-1fe2-4cf0-b26b-f24125117bcc	1	Other	Other
+7a0f3412-d26f-4b12-8089-e30f91a45c2b	1	Other	Other
+7a0fb683-5a9f-49bb-8af5-a27332928543	1	Other	Other
+7a0fc05b-26f5-4478-bc7f-d8b8b2237da9	1	Other	Other
+7a0fcf2a-fd09-432f-9fd7-07d7eedc151a	1	Other	Other
+7a0fd794-6187-437a-a7f8-facc3cd38f49	1	Other	Other
+7a0fd81e-f9a9-47c9-a32c-cf6007c192f8	1	James	Other
+7a1025ce-7f2b-4e0c-969a-9cf487827f0f	1	Other	Other
+7a105dc4-1f0f-43ff-81d6-559b8e7a9c66	1	Other	Other
+7a109158-e2a8-4af4-9890-20b872fde5df	1	Other	Other
+7a10e9fd-b9da-4fec-a293-b4a9d19c7530	1	Other	Other
+7a11244b-f3ec-4a81-b054-4ad31fb44e1c	1	Other	Other
+7a11b10d-06f0-4178-a99e-70a257f071a4	1	Other	Other
+7a11bdb2-8f04-4724-aaa9-473af5857ff6	1	Other	Other
+7a11e9ff-35f6-47fd-bf0b-257f98b7f3c1	1	Other	Other
+7a121be6-4b72-4e5f-af4b-b8b892065056	1	Other	Other
+7a1257af-d03d-4930-afc0-f2dea46f068b	1	Other	Other
+7a12640d-2e69-40e1-bc06-b39dbcc12b1b	1	\N	Other
+7a1285a0-a295-45ca-bd6a-59396b62ae4f	1	Other	Other
+7a12ddbe-9f78-4efc-9739-46bd508efd75	1	Other	Other
+7a12e81e-567a-47ef-8503-c45dc2d80d54	1	Other	Other
+7a1322de-f8a0-41a8-b331-e52290d3b057	1	Other	Other
+7a1336ea-8abb-47ab-864e-376c14643f27	1	Other	Other
+7a137b94-c466-4dbc-bddf-bcc8350e77a1	1	Other	Other
+7a13ade4-ba3c-48fd-8d0d-37f9927d54e4	1	Other	Other
+7a13b686-43db-40f1-a17d-5ba2262bbec3	1	Other	Other
+7a1459ec-c9ee-41e2-b710-eb93a2ca7c1e	1	Other	Other
+7a1470eb-aba9-4497-a84d-d074b485542e	1	Other	Other
+7a14c90e-09ea-4bb6-9ad2-5111e095fef8	1	Other	Other
+7a14d106-0fb1-4c03-8284-8bc5df0857b8	1	Other	Other
+7a14e569-4c93-4343-8472-36e6b4915560	1	Other	Other
+7a14f6b0-f9f7-40b0-b7e6-c8fb7077297e	1	James	Other
+7a156ec2-8892-448b-b804-e8c62b78fe21	1	Other	Other
+7a159a40-e3c4-40e0-89c5-7a8da90fa34a	1	Other	Other
+7a15e0a1-b051-4d02-8d96-9ccc4c10456e	1	\N	Other
+7a1604ca-df08-4126-8d36-024de6a2eeef	1	Other	Other
+7a16761b-8919-4265-8952-b851b2713503	1	Other	Other
+7a16a2ae-1a71-4929-acb7-26917fd4593a	1	Other	Other
+7a16d9f0-f5e9-4aba-808a-43ead83db28d	1	Other	Other
+7a16e3f5-60a2-4a01-bb9e-9c27019fcb46	1	Other	Other
+7a16f53b-b708-42d4-8893-9f5f5b9d8098	1	Other	Other
+7a16fde0-c898-4bd0-ba77-fbc35686cead	1	Other	Other
+7a17130a-07fc-410a-94f4-66519a24a1f5	1	Other	Other
+7a171a6a-83bc-4c83-a881-1faa173b5663	1	Other	Other
+7a177507-5020-4ad2-aacf-db9af6b5c9f1	1	Other	Other
+7a17a810-4fe6-4883-9fe7-9345652a5d4c	1	\N	Other
+7a17abd1-eb57-41ef-929a-62962c22bb40	1	Other	Other
+7a17ac36-8652-4e46-980d-c77e6219a93b	1	Other	Other
+7a17c134-9fd1-4a51-97f4-b19cde229259	1	Other	Other
+7a17c2e1-5b11-4853-9ae5-0897492f0807	1	Other	Other
+7a17de1d-2c0b-4090-8eae-54591028ced6	1	Other	Other
+7a17ebcc-8a39-4493-a642-426b4767a45e	1	Other	Other
+7a1808ab-ad56-4818-9e18-6f8c109968d3	1	Other	Other
+7a183260-94b1-499c-8cfe-4adb2f87f96c	1	Other	Other
+7a185c48-0534-4baf-b7d0-bbd312ba8f0f	1	Other	Other
+7a18a59b-4eb8-4cc8-bdc0-44357758d120	1	Other	Other
+7a18c31d-7526-4aae-9b03-570a232d5551	1	Other	Other
+7a18e54b-9471-4ba5-9aba-ccda7bbd3d1e	1	Other	Other
+7a193fc2-b139-4dac-a11d-8b19dde1fcf2	1	Other	Other
+7a194049-03b4-4f8a-bd1a-0f17e05efc8e	1	Other	Other
+7a1957b8-e0f6-4ad8-aa1e-db7e8f7c5f1d	1	Other	Other
+7a19593c-6acb-4b91-8d06-0cc30137b051	1	Other	Other
+7a19e3fb-8031-4c4a-98dc-61af25d71b20	1	Other	Other
+7a19fab8-84f1-4461-a1b3-8cef0497858b	1	Other	Other
+7a1a3d5f-b1a9-4b0f-a964-8dc7a662ed9e	1	Other	Other
+7a1a4a90-8792-4a90-8a37-89a9effd76ed	1	Other	Other
+7a1a75c8-9efd-4a81-a153-b3558f245fe7	1	Other	Other
+7a1aa780-4162-4efd-80da-419e6b22e204	1	Other	Other
+7a1b71f8-09c0-4c1e-9dd7-82cc5ae06297	1	Other	Other
+7a1bc8f8-9511-43e4-bdf8-a94e247528e5	1	Other	Other
+7a1bd0cd-5d17-4eb4-81d4-5be390535163	1	Other	Other
+7a1c0aac-5cbe-4ae2-a025-b2362ac00ff9	1	Other	Other
+7a1c2d87-cb6c-4992-b949-e0a4ec1a0418	1	Other	Other
+7a1c692f-bec2-42ab-ace2-a0a3d58a97ba	1	Other	Other
+7a1c96d4-93e8-42a1-8b82-1b2d4830ab8b	1	Other	Other
+7a1caec0-baa8-48dc-a645-65eb6821ffcb	1	Other	Other
+7a1cce1d-a8b2-42d7-9f01-e460f81b8d93	1	Other	Other
+7a1d0b39-528a-459d-abb2-a5528c69ab2c	1	Other	Other
+7a1d2248-8385-444a-97d0-19ae1307f03e	1	Other	Other
+7a1d4170-ec55-4fab-82d8-fa4d6c77ddfc	1	Other	Other
+7a1d4e4a-1b76-4796-beca-97f458c7cfbd	1	Other	Other
+7a1d627b-866a-4033-9897-ccef950aafc5	1	Other	Other
+7a1d666c-f6c9-4fdc-adc8-eb06c0f79c59	1	Other	Other
+7a1dd5b8-4e22-4527-a216-e36e393a0392	1	Other	Other
+7a1e3798-ea05-4c35-969b-dd8066534304	1	James	Other
+7a1e4073-4bad-4c99-9dbc-198797419d55	1	Other	Other
+7a1e7701-6923-4e81-9784-dc5d7a94db2c	1	Other	Other
+7a1eb1b6-3553-4f89-903d-cbd08eb837c0	1	Other	Other
+7a1ecfdd-3c08-4998-b315-a2def273268c	1	Other	Other
+7a1f6386-7a9d-4a7b-b025-384498027356	1	Other	Other
+7a1ffc3f-e938-48d4-9f83-78e22f42ad6b	1	Other	Other
+7a20275f-7e21-4cce-92bb-ac0b351f7f35	1	Other	Other
+7a208816-f17c-41a7-9f05-becdeff8a9e4	1	Other	Other
+7a20b36c-c316-4f25-b569-b5043d50f9db	1	Other	Other
+7a215e91-2a27-4f68-a08a-dfd3c9d613a2	1	Other	Other
+7a219ce3-9af7-49de-bc80-485e26d1b75b	1	Other	Other
+7a21cb2a-22b2-4f7a-b799-8de975fcd196	1	Other	Other
+7a21cd6b-8831-4e4d-b2fb-f149cde14488	1	Other	Other
+7a21e313-6f7f-4d26-8c99-3a3ce3519f8c	1	Other	Other
+7a2210fc-1689-4838-88d5-5ade84ff8649	1	Other	Other
+7a223724-57f1-4c46-8427-438ecfe4cf5d	1	Other	Other
+7a224fdc-065d-4b73-a2ea-4124ee3e171f	1	Other	Other
+7a225699-49fe-4b83-9102-d03bc03eea98	1	Other	Other
+7a2291c8-902a-45af-a579-c7bf60e5b96b	1	Other	Other
+7a22937d-e3ae-403d-a26d-a21353196335	1	Other	Other
+7a22b392-489e-4158-b8a9-dac4a4e19023	1	Other	Other
+7a22c86a-d984-44d0-b73d-9856dd0df3b8	1	Other	Other
+7a22dde2-1b9e-46b6-a2e2-e4b54cbbd2fc	1	Other	Other
+7a22eccc-3596-4464-9817-0fbc67a7f97e	1	Other	Other
+7a233532-06a7-4ab9-9941-2cc05194589c	1	Other	Other
+7a233db8-3214-40ce-bf96-b2aaec1c9bcd	1	\N	Other
+7a239277-ee2b-4e86-9e50-e875fecd7173	1	Other	Other
+7a23c0b6-2c4d-4f1a-855b-e2230b2ca59d	1	Other	Other
+7a240274-82b4-4f01-b882-2167dfd3dafd	1	Other	Other
+7a2413a7-efc2-4754-b315-874c780bfc06	1	James	Other
+7a243403-2e79-483b-b50f-2308c657d331	1	Other	Other
+7a243e3a-bbd5-4278-b6f1-abacf07ab36f	1	Other	Other
+7a24a342-b479-4c51-bb36-d865df129f64	1	Other	Other
+7a256ac7-eb64-4fab-90c9-198e7baba8af	1	Other	Other
+7a256d87-234d-467d-88cc-e30f3d8fa80a	1	Other	Other
+7a257011-dacd-4b35-922a-8a5bf0261f0f	1	Other	Other
+7a257918-9e50-4bc5-b420-100fbd3d9ce2	1	Other	Other
+7a25aaf6-c51a-41ef-8424-bc4114730a45	1	Other	Other
+7a25c41e-6fce-49e8-9353-c17a36262ac8	1	\N	Other
+7a2616ef-452e-4b97-a926-f66da667f59c	1	\N	Other
+7a2655ad-8d33-40b9-bfb4-b5b0b5b5101d	1	Other	Other
+7a268255-fb80-46a6-a3b7-4cf1f51b3ff1	1	Other	Other
+7a268f7d-672f-4092-a4e0-efb951e5975a	1	Other	Other
+7a26a635-ba34-4305-96d3-e4bb6898c839	1	Other	Other
+7a26ecec-3ae0-4700-918f-24620f99307c	1	\N	Other
+7a2711a3-3824-4a18-ba91-c1d9257dcc63	1	Other	Other
+7a2719f7-135f-45a9-ab35-c01ca1e5175d	1	Other	Other
+7a271f02-e6ca-4025-b06b-236be077cdec	1	James	Other
+7a2749a4-2890-4fb0-b611-e22859c098d7	1	Other	Other
+7a275f51-8e12-4602-ba80-5bae5c9df641	1	Other	Other
+7a2763dc-42c8-439a-b0ae-ada9dc7831e3	1	Other	Other
+7a277015-b1c9-4b22-b86f-15791538ebb4	1	Other	Other
+7a278622-173d-4a4f-8902-c4b457150bc3	1	Other	Other
+7a27e5c3-8047-48e9-bc59-e1c9549f3ccf	1	Other	Other
+7a27ef41-4811-488f-891c-22ae61aee440	1	Other	Other
+7a280214-cc9a-418c-b0f8-65afc35b9009	1	Other	Other
+7a281922-90f9-48a5-a3a4-f53d64751a88	1	\N	Other
+7a282f9d-b01b-4cb9-9caa-f0f797a1c358	1	Other	Other
+7a285ae2-4b56-418c-8f68-27ff4c3afe77	1	Other	Other
+7a28a455-fd79-4817-8d7b-c95a2f7b47b6	1	Other	Other
+7a28a995-a5cb-4df3-88e5-ae701d2355af	1	James	Other
+7a28ce44-e36b-4cc2-9df1-25a8f78f169f	1	Other	Other
+7a28e69a-5467-4d39-98be-70d3220c2a66	1	Other	Other
+7a293424-7744-45ba-86fa-cf037535b754	1	Other	Other
+7a294f46-b048-481e-b60f-f357e56d9061	1	\N	Other
+7a29631e-ab0d-4720-ba34-5c6de78f0a28	1	Other	Other
+7a29ba54-f662-4bd4-b9d4-3e2f1d407174	1	Other	Other
+7a29d732-7946-40e1-9e4a-1ead74d10625	1	\N	Other
+7a29efce-ec49-4d00-8b26-a0b7ec8fe15e	1	Other	Other
+7a2a176b-377f-4caa-8f61-dcb496124971	1	Other	Other
+7a2a2026-bfba-41bd-b06d-e2328e19fdee	1	Other	Other
+7a2a3379-687c-435d-99af-07c23973dbab	1	Other	Other
+7a2a51b6-6098-4b3e-811f-976a500b6492	1	Other	Other
+7a2a5372-7d5f-475d-9581-d47da9ee7859	1	Other	Other
+7a2a94e3-8ea0-41e1-bf19-f1908dd3ce15	1	Other	Other
+7a2ac04b-b2da-4cd4-88e7-237d58cdeabc	1	Other	Other
+7a2ad36c-e070-4bc1-b331-12bd5905a0b8	1	Other	Other
+7a2b22c2-4cce-4593-9a17-7fa52feca274	1	\N	Other
+7a2b5b48-d870-4276-bb81-63c40efe5ae8	1	Other	Other
+7a2bfe4d-7b33-4579-b2e1-5e34ad256915	1	Other	Other
+7a2c0297-5087-45c2-bcb2-bb96f53e6fcd	1	Other	Other
+7a2c572e-1b05-4209-91df-1f6c99d03bb6	1	Other	Other
+7a2cb37e-9cb3-412f-9e9a-46bd88208895	1	Other	Other
+7a2cfb3e-c547-4098-89af-85c077c046e3	1	Other	Other
+7a2d0200-927d-4726-b28f-6494a2028ce6	1	Other	Other
+7a2d997d-a499-4c73-8b7d-156812320359	1	Other	Other
+7a2e55f3-a631-4866-87f2-5d089b52077f	1	Other	Other
+7a2e5799-d656-4df8-b5a8-9c35c0b2aa08	1	Other	Other
+7a2eb098-973b-4a19-b5ae-ad57dbdfb16f	1	Other	Other
+7a2ec2dd-1a52-403b-8a06-f2b0e1214a04	1	Other	Other
+7a2ece30-093f-4441-a51f-997e9e4d396c	1	Other	Other
+7a2f9266-389c-43f8-b712-009cc4473b6e	1	Other	Other
+7a30054f-a934-4fcc-8325-bfe4ccc3f56a	1	Other	Other
+7a302a23-849a-4d55-8cf1-01f1e0583621	1	Other	Other
+7a3034d6-49ef-40f6-aa10-b55d3deba720	1	Other	Other
+7a306b84-2883-4b43-bf9d-addb35240052	1	Other	Other
+7a3077de-367b-44ca-bb4b-128da6ebda86	1	Other	Other
+7a3092cc-5fdc-4e3a-8194-16262a08c1d0	1	Other	Other
+7a30d0ed-a1e2-4b7f-8662-acf0698c7f4a	1	Other	Other
+7a30da5e-3dd9-4f74-ab9a-588e542081d4	1	Other	Other
+7a30fd1b-f1c5-4c98-82ad-de7dc59fe614	1	Other	Other
+7a3146c6-4b97-488b-bca0-5e18e04c1238	1	Other	Other
+7a315c45-bfba-43cf-85a1-11bc10680b8a	1	Other	Other
+7a31a108-4ef6-406a-8c59-d3ea8b090449	1	Other	Other
+7a31c65a-dc0a-48b2-9fbf-da2bde7316a4	1	Other	Other
+7a322e3c-53aa-4275-a784-4caa4ae0427f	1	Other	Other
+7a32ea71-8677-4367-ae46-e61b12769ddd	1	Other	Other
+7a334b29-5e10-473e-b98a-29d7be529f14	1	Other	Other
+7a33515b-4e02-4f2b-887e-3214cc3df908	1	Other	Other
+7a337471-d475-4b5c-9939-7c3e305c6680	1	Other	Other
+7a338b55-46dc-40f2-ad34-4033e9d7fa71	1	Other	Other
+7a3398dd-10cb-43c3-bbf4-efde1f459ecb	1	Other	Other
+7a33a9ed-bd56-4f6f-aa5b-c3f22e099a71	1	Other	Other
+7a33c9a2-f636-4173-a294-5d5a4c674f02	1	Other	Other
+7a33d769-9dfa-4399-914a-660f38bb5597	1	Other	Other
+7a340a55-c99e-4187-a561-62e8393e0186	1	James	Other
+7a340c35-6e28-4970-a63a-036065d72ea8	1	Other	Other
+7a347e64-9e58-4216-aa08-20a1e2422118	1	Other	Other
+7a34b13f-e79b-49c9-a1b0-9396646be933	1	Other	Other
+7a34b40e-ef49-4caa-ae6d-03df282c7a0b	1	Other	Other
+7a34dd7e-df2a-4d9a-b6ea-7027c72f7803	1	Other	Other
+7a34e63c-2be9-4388-b670-fd4bda2fd5cd	1	Other	Other
+7a359665-2400-40a4-9318-b7c6ceff3c0d	1	Other	Other
+7a35bac0-1bfc-4b03-85db-f6c15a94d4fe	1	Other	Other
+7a35ec62-4a85-44ac-84ef-3f1f272bbb5f	1	Other	Other
+7a35f5a2-4b18-4aac-8d42-abb9fe39a9eb	1	Other	Other
+7a36458d-04ec-4136-8b80-563da8eba5a0	1	Other	Other
+7a36611a-ecba-4af2-82b0-edcc29d0badf	1	Other	Other
+7a366d07-f5f9-4f29-8607-bb5956226278	1	Other	Other
+7a36ada4-4c02-4a16-98be-644d2c6c013d	1	Other	Other
+7a36cc23-8cc5-4fcc-a619-2dad5a460247	1	Other	Other
+7a36e8c9-09d9-4a62-b124-b223533ab2a0	1	Other	Other
+7a3711de-1566-4d51-a189-3cc1c541c9dc	1	Other	Other
+7a374a7b-bf83-436f-ad0a-19cab82c0250	1	Other	Other
+7a375edc-8ea4-4a9e-8193-004d41614e95	1	James	Other
+7a376689-6c25-4a2c-b9ca-a68828e201d1	1	Other	Other
+7a37bc95-d1bb-47b7-8ca9-f139cdf53d14	1	Other	Other
+7a384fc8-670a-42a5-98df-13391abeb70b	1	James	Other
+7a387c83-9a28-4b61-ba04-76518fe39dc5	1	Other	Other
+7a389a49-da95-44a5-aac3-7d1d6c1ae48c	1	James	Other
+7a38b144-9d80-4b4e-9dd6-f76a46219076	1	Other	Other
+7a38c2e4-1373-41cd-ac0f-3ff822fbe042	1	Other	Other
+7a390401-d7ae-469a-9db4-c0c7a54cc81f	1	Other	Other
+7a393147-afff-47ca-a184-41da2ebac449	1	Other	Other
+7a39520f-0d15-4ef9-85bb-526de00d3c80	1	Other	Other
+7a3960c2-e37a-439f-9cf5-bfec4870495e	1	Other	Other
+7a3976b5-0e07-414b-8117-8219cc51795b	1	\N	Other
+7a398ee7-dadb-41bc-a1a5-6710a04d2979	1	Other	Other
+7a39983f-995a-4c17-92c4-127a054a3de1	1	Other	Other
+7a39d02c-354b-4da0-a2da-ea8923d60154	1	Other	Other
+7a39ff9d-d8ea-4b1a-9ff2-f7cd62986c92	1	Other	Other
+7a3a4eb1-5f63-4003-a74b-33e2596f3be4	1	Other	Other
+7a3a982f-dc46-4f88-bb3d-4fd08326b8fa	1	Other	Other
+7a3b18d1-14c3-4cc4-a935-d7cb9161ebc5	1	Other	Other
+7a3b2889-aa7b-4597-b11d-405ed18e3a24	1	Other	Other
+7a3b62bb-a994-4abe-8fb9-0fee29667f70	1	\N	Other
+7a3b76b7-d960-44cd-a0e4-3e7fec6795fc	1	Other	Other
+7a3baa83-4ca9-4999-96c5-73139a0ccf1d	1	Other	Other
+7a3bbd2d-d09a-4eda-a8ca-b1f7187d7b18	1	Other	Other
+7a3bc7c7-0c80-4eca-ac3c-229c9ce252cf	1	Other	Other
+7a3be308-2a5c-4374-9d6a-6e69cdbbc9b0	1	Other	Other
+7a3c3238-9199-492a-a9a3-5029533bf3cd	1	Other	Other
+7a3c3f32-d043-424f-9a71-109ff612f585	1	Other	Other
+7a3c538c-10fa-4968-8c08-3f6c1578e606	1	Other	Other
+7a3cedca-22ba-44c8-8023-d1d0bb470f8d	1	Other	Other
+7a3d22bb-b066-430e-a5d6-c3835c647ece	1	Other	Other
+7a3d2d68-ff57-4867-b658-e4278b7be452	1	Other	Other
+7a3d38fb-304e-4e7e-a6ae-07842b4ba613	1	Other	Other
+7a3d53f6-a2ac-438e-944c-d220c62cc8a1	1	Other	Other
+7a3d65ac-9019-4837-80c5-d9d56e3ab0e7	1	Other	Other
+7a3dd3c3-f3dd-44b1-a407-a9ca5e410c81	1	Other	Other
+7a3df9fb-0e34-4f49-9b55-3fb6473f3ae7	1	Other	Other
+7a3dfff1-493a-4f7a-8014-cc4ff094ddd8	1	Other	Other
+7a3e5444-53a2-4a7f-b3d2-1c16302cea34	1	Other	Other
+7a3f37e7-54da-420c-ba78-72fba7bf4aea	1	Other	Other
+7a3f6140-bdd2-490c-a3d4-d8ddb37c86c0	1	Other	Other
+7a3f93e6-c75b-4c9a-a0be-88517741e3f1	1	Other	Other
+7a3fb796-1489-4df1-9b67-ca3e7b2a7269	1	Other	Other
+7a406098-99be-484c-b36c-ea5f35582787	1	Other	Other
+7a4064bb-a4c9-4d4e-896c-6f367cfa363d	1	Other	Other
+7a408623-167a-475d-b012-9ce047c00d69	1	Other	Other
+7a408d73-b12d-478f-ac04-33eaa3b51b34	1	\N	Other
+7a40b0eb-b4d6-4153-9609-4fb148a0559a	1	Other	Other
+7a40b54b-8718-4e34-8486-7d84de7175e3	1	Other	Other
+7a40cbf3-970c-4c5d-8ae4-2ae49346c072	1	Other	Other
+7a40de6e-477a-42ba-8ab4-a72382910559	1	Other	Other
+7a40e467-8261-4a0b-b32d-33b14f094f4b	1	Other	Other
+7a4158cd-dcb8-46d5-aaf0-2e333bb882de	1	Other	Other
+7a418bdd-a819-4965-b0c6-93a0a253dfb3	1	Other	Other
+7a419b5c-0df6-4727-9687-bb9a4ceea189	1	Other	Other
+7a41d85b-b011-42a8-9963-2087495b877c	1	Other	Other
+7a41dfab-bd71-464b-8dd9-2a4cd99bf259	1	\N	Other
+7a420490-b67d-4326-9c34-4b2ba5fcde97	1	Other	Other
+7a426852-7deb-47b2-9873-1d5c411f1c4c	1	Other	Other
+7a43176b-dec7-4cca-8f86-2738542dc162	1	\N	Other
+7a4317b8-83a3-404c-8e2d-098300cc0c09	1	Other	Other
+7a438f09-d184-4db7-a54d-28ac1f202523	1	Other	Other
+7a440e7a-bdbd-4a7a-8b95-60fe2f9c7a91	1	Other	Other
+7a4420a7-8b75-44f8-9034-f3cfbbe0ff99	1	James	Other
+7a443326-4a8d-4fab-a065-839cd47bec28	1	Other	Other
+7a443c63-4934-4110-9826-e8d0ef2c5799	1	Other	Other
+7a444211-3bf7-43fb-a034-80c0f35d18a0	1	Other	Other
+7a447f48-d05b-45ba-a20f-40e2057248d2	1	Other	Other
+7a448af8-cc74-424c-bdd0-711921d7b77c	1	Other	Other
+7a44a088-5c7e-434b-a569-fee7617be152	1	Other	Other
+7a450c49-60cc-4218-b4e2-c98f2ca186ca	1	Other	Other
+7a4519ff-3abc-4544-a31c-e1ec9e4a9709	1	Other	Other
+7a45202f-ab30-41bb-90c6-8c237d1d10f3	1	Other	Other
+7a456b97-f592-4db4-92e9-b28d36260369	1	Other	Other
+7a458073-4a2e-452f-b383-1a41dae4f0da	1	Other	Other
+7a460b5e-8669-4f4a-9925-516c5da7224b	1	Other	Other
+7a460b8f-ee94-4027-a30c-c31369d94656	1	James	Other
+7a462bb2-3fd5-47fa-9780-b99771c0e821	1	Other	Other
+7a4652b4-b1ab-4483-947a-b62c78123ad6	1	Other	Other
+7a465f81-8b18-4165-8c5c-8e938db95efc	1	Other	Other
+7a469b60-ae55-415a-b176-7eb6a6d528ee	1	Other	Other
+7a46aa22-cf23-4ecd-a998-09344cc2ee42	1	Other	Other
+7a47153a-5e66-4156-8d66-fc775b5b7119	1	Other	Other
+7a473fd2-4f7c-40e4-bd6a-d2ba97f710c7	1	Other	Other
+7a47403c-8bcd-48b2-9871-64d98604410b	1	Other	Other
+7a474b78-83d5-4fca-b1a9-42d35970b622	1	\N	Other
+7a476854-a0b0-47e2-a400-c32c44ca55ed	1	Other	Other
+7a477aa3-72b9-4f4a-97f3-9aa2fc8f0d1e	1	Other	Other
+7a47a722-fd64-489b-b43f-ecf30f093f39	1	Other	Other
+7a47feb5-1ba1-4813-8fc7-a9b68c5db892	1	Other	Other
+7a4838ca-8df5-4c69-a6c9-c606cbb35010	1	Other	Other
+7a485318-7fbd-4793-89f4-97bfa14c7696	1	Other	Other
+7a486c95-3f1b-4646-a46b-18f51e171555	1	Other	Other
+7a487321-a33c-42ac-a60c-bea1a2eb47fd	1	Other	Other
+7a487547-e227-4976-b2d2-f2d83662fb4d	1	Other	Other
+7a48c345-a838-4d0a-b713-971af8614c5b	1	Other	Other
+7a48ed30-3758-43b5-8c4e-ef41955f2949	1	Other	Other
+7a49474f-2445-46af-80c8-9405fde92b91	1	Other	Other
+7a495441-6e05-441d-a28b-e2bf9b46766d	1	Other	Other
+7a497d4b-bce0-4732-b32a-9df113ef5b92	1	Other	Other
+7a49c446-c475-4d06-b560-b0dc8a09a295	1	Other	Other
+7a49d62c-31e0-47b2-9bbe-2ede189b973b	1	Other	Other
+7a49ebb0-3d21-4f23-a8bf-68d4846ed38b	1	Other	Other
+7a4a0af4-98e5-4a76-9235-e77125a574d1	1	Other	Other
+7a4a0bf0-4a59-4f58-bdb7-b88374cc964a	1	Other	Other
+7a4a21c7-6a8a-418f-b9d9-b79e6a9fade3	1	Other	Other
+7a4a5a6d-c4a1-4f76-a0a3-d08dd717c7bd	1	Other	Other
+7a4afe38-0075-4948-b75d-ad6391d5c137	1	Other	Other
+7a4b25e3-7afc-4e26-9113-089a9c79eb32	1	Other	Other
+7a4b27cb-e894-428c-b37b-79b3bf0de8ed	1	Other	Other
+7a4b3f92-8600-4641-b88a-fae4f1e12ee7	1	Other	Other
+7a4b9e2c-c217-4132-bf34-bb359b489db6	1	Other	Other
+7a4bf5bb-6c57-4d4c-b1af-75be44f4af39	1	Other	Other
+7a4c2f3f-6f0d-44d4-91a7-b7faca238eb0	1	Other	Other
+7a4d4cb6-554c-4ee1-9af5-d0d2c5ddde2d	1	Other	Other
+7a4d51db-c734-46b3-b8fe-d75e232d8818	1	Other	Other
+7a4d7702-ac53-40e9-b12b-c5d53cfd4393	1	Other	Other
+7a4de17a-3727-4499-9ac1-6415d7ceea7d	1	Other	Other
+7a4e7b3b-5234-418b-b794-050e810e27e5	1	Other	Other
+7a4f0559-dae3-4164-b946-51f59be938d4	1	Other	Other
+7a4f21ee-304c-45bd-b4c6-e7533919c1aa	1	Other	Other
+7a4f82fb-0d46-4a28-8ae2-33c2ae413014	1	Other	Other
+7a4f8942-6080-4e34-af7d-3a6f2a0b572c	1	Other	Other
+7a4fa92a-c28a-44b6-b814-9c2cde8b6650	1	Other	Other
+7a4fc504-6285-40fd-9363-375cba3c40f2	1	Other	Other
+7a4ff0aa-5063-4baa-9b1c-6a3d1b98b0df	1	Other	Other
+7a501354-f1bd-471f-94e0-641aebf49b98	1	Other	Other
+7a505629-e963-448d-b085-1f862fa3ccc2	1	Other	Other
+7a5073c0-22dc-48b0-ade0-4142d3d91a58	1	Other	Other
+7a50973d-77e1-485a-aa37-7ef4323a1d85	1	Other	Other
+7a50e80b-0b23-4086-b158-582af67703b3	1	Other	Other
+7a512ea2-9cbb-4ae6-a5b2-3d2873322523	1	Other	Other
+7a516a58-9625-405c-aa8e-e6c70d6dda96	1	Other	Other
+7a516d17-acf3-4a1a-9a4a-b8f780200646	1	Other	Other
+7a51817f-1f50-4ac1-810d-48ec605b6e87	1	Other	Other
+7a519542-b2d2-4e3f-a412-c127872b5c71	1	Other	Other
+7a51b6e5-9935-4ff6-8448-36acd1bdd5bc	1	Other	Other
+7a520512-e3f8-49d4-a5f8-aca8695fd37f	1	Other	Other
+7a52061b-5278-4fe5-833c-1a24fe3765a5	1	\N	Other
+7a5257c9-295e-4dfc-8ab0-0d74b3ef566b	1	Other	Other
+7a5299dc-b892-450a-a69a-b6b4e6a1e762	1	Other	Other
+7a52b709-b102-4c5b-927f-0994100fa34c	1	Other	Other
+7a532dd5-0045-4b8b-b90e-0956d10b2690	1	Other	Other
+7a534025-61a0-4fdf-8231-8a0519d4c022	1	Other	Other
+7a537671-afff-42a5-a59c-34a9380790b5	1	Other	Other
+7a53aecf-ec91-4a13-b36f-8fde2609d973	1	Other	Other
+7a5407ce-32fb-4113-b50c-d60d908f8519	1	Other	Other
+7a543ecd-df61-4797-afa5-140bfefcfa71	1	Other	Other
+7a544be9-79cc-418f-b4d3-fb61b35e1687	1	Other	Other
+7a547b36-1574-406d-a4fe-db94663cfd4f	1	Other	Other
+7a5480b7-4196-4883-9c33-372ad8fa61cb	1	Other	Other
+7a54a3c0-09fb-44ed-aad6-c5d1a73c99ed	1	Other	Other
+7a54c43c-58d3-4eed-b0ed-6092c84947ce	1	Other	Other
+7a54d65d-c7fc-495a-beb0-bfc36ea45486	1	Other	Other
+7a54d6f3-c22b-4c5b-9da1-158d91887e6a	1	Other	Other
+7a54dd46-29bf-48d4-b196-32e425af9044	1	Other	Other
+7a54fcd0-ac5a-4c4a-8b8d-4d118757cafd	1	Other	Other
+7a550436-a178-40a0-9c4b-bb782003822a	1	Other	Other
+7a551685-3205-4aeb-a7e6-fafc99077054	1	Other	Other
+7a552289-cfb1-45d6-83bb-ce1c0a508e50	1	Other	Other
+7a552381-b284-47ef-bd82-6037b47de950	1	Other	Other
+7a55340c-fb65-4692-b2f5-2dc3d8e4f252	1	Other	Other
+7a553c9d-627a-41c5-b19a-526b4d44cc50	1	Other	Other
+7a55735e-59bd-4204-bfdb-fdc533952b4d	1	Other	Other
+7a558536-d7e3-4df0-a6bd-94f515394e21	1	Other	Other
+7a55e2f4-8adf-4cda-890b-2e61e1673afa	1	Other	Other
+7a55e665-53ed-45a3-97d8-ece33ad161c7	1	Other	Other
+7a55f6d3-026c-4535-8701-72f13dd4e741	1	Other	Other
+7a562fff-8169-4892-ba1e-bfd0a3e5f313	1	Other	Other
+7a56344a-5d31-4412-9b94-425b8dd7fcc3	1	Other	Other
+7a56c6a5-fc99-4b42-bc6c-267a463efb4d	1	Other	Other
+7a56e2d6-638e-438e-8e97-2ec6b6883e27	1	Other	Other
+7a56f06a-8ca6-4a07-a56f-65bd0cf64deb	1	Other	Other
+7a571f81-17f8-4bf8-a152-3a7eaceadddb	1	Other	Other
+7a574b69-146d-49a4-b066-a7010e645cef	1	Other	Other
+7a575c6f-89ef-47f0-8baf-90430dae8df6	1	Other	Other
+7a5768bd-5f30-45b0-92f0-93ecb0fe3e89	1	Other	Other
+7a579eba-d31d-4df6-a318-fc725fc573ec	1	Other	Other
+7a57ad46-674a-4032-991f-f630c28de894	1	Other	Other
+7a580610-fc6c-4339-8fcd-d8d6c9399b94	1	Other	Other
+7a585513-d191-42a0-b2e1-308a2f102ce8	1	\N	Other
+7a588805-e762-47a2-b8c7-93f9b1665935	1	Other	Other
+7a58a66b-16ec-4f06-972e-275a306f2eb1	1	Other	Other
+7a58b515-4924-4efc-bdb5-ede30513b4a8	1	Other	Other
+7a59b77c-a8cc-4ff1-90e0-bb4ac85f0c27	1	Other	Other
+7a59bb1e-a8cf-4027-8daa-778a5e9de53c	1	Other	Other
+7a59c9af-4804-4181-93d2-9c9286aceb0e	1	Other	Other
+7a5a1c02-4253-40b9-86c4-11cdf1e546ed	1	Other	Other
+7a5a4473-92cf-44a6-8d87-71dd1342acbb	1	Other	Other
+7a5a5fcc-aad3-45d6-83d0-840075c70ab7	1	Other	Other
+7a5a8745-7c75-4543-a95c-c2b205518b92	1	Other	Other
+7a5a993f-b99f-4d67-bbac-4a3d560b608f	1	Other	Other
+7a5acf1d-86f4-4bc4-93c7-11e8db90a9ad	1	Other	Other
+7a5ad999-fb88-4689-bb68-2a301a7cfdb8	1	Other	Other
+7a5b1566-8616-4d80-92be-6b8b3749b915	1	Other	Other
+7a5b2f43-98e3-4f5c-a396-ad4623182f16	1	Other	Other
+7a5b7e14-3dd5-4f5e-b071-554d649576a6	1	Other	Other
+7a5b7ec7-7b15-410d-813a-4cb60f8dd564	1	Other	Other
+7a5bd899-d362-4947-a718-6811fa60312c	1	Other	Other
+7a5bf80e-a5d2-4f96-a3e3-8e797c3047d3	1	Other	Other
+7a5bf881-fbf0-42fb-b770-c7ea5495b6b8	1	Other	Other
+7a5bfbb7-6bce-4f3e-90d2-93cd8ecaaba1	1	Other	Other
+7a5bfcc6-9250-4415-92c2-7a7e6cb19e83	1	Other	Other
+7a5c093d-617a-4e30-a302-34e068887be6	1	Other	Other
+7a5c1542-749c-4303-990d-1b3fa2b219d0	1	Other	Other
+7a5c20a9-c07a-4d45-b684-4db1ef523936	1	Other	Other
+7a5c2d03-3d31-4fe8-9ccb-70e0639685c4	1	Other	Other
+7a5c3c90-b1e5-404d-8774-6a9ffa0b2cbf	1	Other	Other
+7a5c580b-a528-4883-8496-928131d1323f	1	Other	Other
+7a5c7e4f-d021-4b8a-a5df-da17140b1b00	1	Other	Other
+7a5cca75-bb2e-4c53-8c0c-db5d349afbdb	1	Other	Other
+7a5ccb9f-2ba9-4511-bbc9-df3034874c4d	1	Other	Other
+7a5cccc7-2bf5-4d14-ad51-a6effda4f765	1	Other	Other
+7a5d45fe-21e1-47ed-a86b-db96f90451f9	1	Other	Other
+7a5da1b8-2c34-4ecb-8851-b1dae5e23c72	1	Other	Other
+7a5e0150-1e28-4341-a51a-59f082c78380	1	Other	Other
+7a5e2c32-5dc6-44e6-b67c-7092e7c54614	1	Other	Other
+7a5e31d3-0f28-46a0-ad10-e450bb05c2be	1	Other	Other
+7a5e3929-f646-4cf0-bf00-3d46cf8fdbdf	1	Other	Other
+7a5eb984-8e97-4c76-b8b1-9700fc0c8757	1	Other	Other
+7a5ec9d1-32cb-42ae-b118-bac75c530703	1	Other	Other
+7a5ecada-948e-4033-8c97-b0caca586bf8	1	Other	Other
+7a5eee5b-df51-49d3-87c3-78ea0d49113f	1	Other	Other
+7a5f106c-dd5e-4a15-981b-5b6982c3d531	1	Other	Other
+7a5f51ef-4e0a-4d29-b7da-c3fd711959df	1	Other	Other
+7a5f582d-b63b-416d-a9e4-60665b6731ee	1	Other	Other
+7a5fbd9f-2783-4fa0-ad58-4491a569accb	1	Other	Other
+7a5fc6f4-52c0-4f85-addc-60baf571525b	1	Other	Other
+7a5fd3a9-2957-47f9-b5ca-6227fd162964	1	Other	Other
+7a5fdb42-bd5b-42aa-8f5b-0cf7c416fdf3	1	Other	Other
+7a600f88-6484-43fe-8b08-ff97c05e28a9	1	Other	Other
+7a60140b-3b5e-4b8a-8070-585f525f2b93	1	Other	Other
+7a603f8d-d0f5-41c4-9e63-9aa3e315276e	1	Other	Other
+7a6060c7-0cf2-4600-ad65-1e97fd98df7c	1	Other	Other
+7a60621f-6757-40c2-96e3-c230e692e09f	1	Other	Other
+7a60b029-bc5b-45c9-ac70-5c1df21d2402	1	Other	Other
+7a60eefb-69fa-4d27-b9df-c979b9cbbfe7	1	Other	Other
+7a612adb-4b5f-4d19-8a2e-f9bc1914de27	1	Other	Other
+7a612c45-051c-4885-b5c2-f6a07a78d76d	1	Other	Other
+7a61a039-c2ba-4c23-b351-1513336ce671	1	Other	Other
+7a61e2be-596c-4f9e-b4d8-1ceed6af4133	1	Other	Other
+7a624c71-891e-4d07-9f58-30ea8b0152d4	1	Other	Other
+7a624d1a-140c-4cc6-af3f-e3a2a9217fdd	1	Other	Other
+7a628beb-0501-4826-8bd3-0a74751ad948	1	Other	Other
+7a62dae9-702a-4680-a319-20d6ad1793d7	1	Other	Other
+7a6322e6-8321-4caf-8b2f-2b39fd23af0a	1	Other	Other
+7a632552-91c4-49d3-a198-b3b7fa96f656	1	Other	Other
+7a63587f-3194-4284-8328-f52db5456066	1	Other	Other
+7a635b39-c684-4842-a93f-832bd81670ba	1	Other	Other
+7a637530-94cb-44ac-9e88-1b5c0b03e610	1	Other	Other
+7a63f182-4559-42ef-8396-a55065a5c63d	1	Other	Other
+7a643fc4-7ec4-4356-8f70-558850d7b505	1	Other	Other
+7a645a49-479c-40e0-b5c6-02520723d387	1	Other	Other
+7a64855c-fa9d-49a4-a75c-075ed12f028f	1	Other	Other
+7a6485fd-4098-49fd-8420-29621b2459f8	1	Other	Other
+7a64969c-37fa-4c3a-91eb-11a6041c3362	1	Other	Other
+7a6498f8-d1a2-4904-8880-4117129521e8	1	Other	Other
+7a649b57-9fcc-49de-aa1c-43d4786d1526	1	Other	Other
+7a64ac97-d998-4595-8f81-e099736fb2c1	1	Other	Other
+7a64b05c-37d4-4632-9258-eed44981f4e4	1	Other	Other
+7a64c519-bc66-468e-8247-ae199e8036ae	1	Other	Other
+7a64f429-9d15-4ebb-b419-a6c2eb5a6194	1	Other	Other
+7a6506b4-9043-4977-a110-89775e8b086a	1	Other	Other
+7a651a64-8de3-4ec1-9726-867806e2615b	1	Other	Other
+7a652f54-a349-4435-b7ed-7a2fe66de376	1	\N	Other
+7a6541b8-19a4-4d96-83cc-20bc96cf58c6	1	Other	Other
+7a655ed4-3a14-4843-8b01-7e389682666b	1	Other	Other
+7a6597b8-9520-4ccd-b2a1-fae28132fd1e	1	Other	Other
+7a65b157-2905-4250-b6af-9a47979ab705	1	Other	Other
+7a661646-7b17-48cd-9845-c024ee21d799	1	Other	Other
+7a662bae-6ba7-4c0e-ae4f-f76b814353db	1	Other	Other
+7a6643d8-203b-44af-b865-d77be44b2e8f	1	Other	Other
+7a667f90-f1fb-4bb1-9e58-e005e001c9d7	1	Other	Other
+7a66dc33-a0e9-4b8b-b5df-0c914f9e65e7	1	Other	Other
+7a670f8c-783a-4c56-bb91-67073a486864	1	Other	Other
+7a676745-a40e-41d4-8fc2-22f2a247dbe2	1	Other	Other
+7a67b59b-46d1-4ab5-82cf-2a3b0d846072	1	James	Other
+7a67e2da-cb4d-42a5-920b-aa4f47338c31	1	Other	Other
+7a6806ca-1f3c-4dfc-bb61-2107b50ae4d4	1	Other	Other
+7a6831d6-db33-417f-8001-a23b170671ea	1	Other	Other
+7a684caa-d065-4363-874a-ddbe4d49baba	1	Other	Other
+7a685090-af0a-4edb-926a-191bde0b9ce1	1	Other	Other
+7a68d541-9926-456c-9e2f-d3410591049e	1	Other	Other
+7a68e2f5-9fed-4a38-81e7-c5a9deced622	1	Other	Other
+7a69176c-752b-49b7-8f81-9773aa09fb7e	1	Other	Other
+7a6963e0-c234-434a-8527-acf328b0a3bb	1	Other	Other
+7a697ffb-f07b-4bfb-b780-9a1373f7113b	1	Other	Other
+7a69a526-2d68-46b4-ba2d-f51e99d49b94	1	Other	Other
+7a6a0c39-b716-4f5d-a1cf-8a197e56a5a1	1	Other	Other
+7a6a66ac-34b8-42fa-8d9c-f1e6d329406d	1	Other	Other
+7a6a8886-f39e-4221-ab49-bf31be8b4cb1	1	Other	Other
+7a6aa42a-5b10-4472-96ef-2eb970eba11d	1	Other	Other
+7a6adff9-b764-4566-b9bc-a5003b1a809e	1	Other	Other
+7a6b0260-b6e8-4ec7-83f2-29d173f3bda1	1	Other	Other
+7a6b11ed-ff61-4f4b-95e7-c92b142e18e6	1	Other	Other
+7a6b13c9-9de0-46ca-928a-12fffa29c81c	1	Other	Other
+7a6b377c-bf7c-4431-8a5e-dd41180a6e91	1	Other	Other
+7a6b591a-6376-4ec5-b8e9-9d8401f9b141	1	Other	Other
+7a6baf07-e1dc-4c1f-b0c3-5327c7047c08	1	Other	Other
+7a6bb1df-b3f7-4120-b36c-5c1ece4ffce5	1	Other	Other
+7a6bc02e-5248-4584-bb02-5ddd8d9e18bd	1	Other	Other
+7a6bc7b7-3775-4b50-9dba-a9245221e062	1	Other	Other
+7a6bd26a-15ee-462c-8cc2-2a36d044c51e	1	Other	Other
+7a6bd587-e414-4b5d-8bda-bac9191f17d6	1	Other	Other
+7a6bfc4a-f95e-4c89-ae6c-3bd22f97e258	1	Other	Other
+7a6bff73-54e3-4518-8cc0-d47aa1fd9742	1	Other	Other
+7a6c3fa9-06c5-4501-b4e0-fa18b7b94a9a	1	\N	Other
+7a6c5936-2bb5-468d-8e68-d952ab22f89e	1	Other	Other
+7a6c844c-99ce-4ec9-bbfc-09dd24bdf024	1	Other	Other
+7a6c9dea-cab3-409a-be10-c53e838e677e	1	\N	Other
+7a6c9e25-42cb-4889-ada4-4da5823595b6	1	Other	Other
+7a6d3bea-7b27-4bcb-884d-6d26b42f8b07	1	Other	Other
+7a6d5e36-8493-4141-9c85-9c130ef91368	1	Other	Other
+7a6dc025-767e-4b58-aebd-2ce1ee485658	1	Other	Other
+7a6e844f-18e2-4bf2-acc5-c7ab63e65d98	1	Other	Other
+7a6e88d6-00c9-4a8d-998b-79a29f1fc6fd	1	Other	Other
+7a6ef8d8-2f4e-4de0-994f-a008e78f5c3b	1	Other	Other
+7a6f26b2-d215-4979-9db6-e5ce8f024fed	1	Other	Other
+7a6f2e2e-73ac-4962-939f-29a3e8221a40	1	Other	Other
+7a6f61de-54e8-467f-aa13-3a3e9abc0565	1	\N	Other
+7a6fa069-c5ea-436d-9852-2bd45e1a32eb	1	Other	Other
+7a6fbed9-1f1c-4625-94e7-6d356ccdb241	1	Other	Other
+7a6ffabe-6d86-4762-be9e-f6681be9dea3	1	Other	Other
+7a7008d8-191e-4353-b663-3886ef32d83d	1	Other	Other
+7a703097-3983-4645-ad97-7544512467d4	1	Other	Other
+7a7035b3-91ce-45ea-945a-4d06fc00d618	1	Other	Other
+7a703f25-2fdd-4e63-8c17-eb18149fe469	1	Other	Other
+7a7066c5-71b5-4479-a19e-68d87a7b6706	1	James	Other
+7a7095b0-abea-43fe-bc3a-49085c674668	1	Other	Other
+7a70a364-58f9-4a28-8740-9db4947411a2	1	Other	Other
+7a70a9d8-fa88-4c6d-9900-53e30dcca26b	1	\N	Other
+7a70ba88-dd83-4cc1-9fa9-2d9ead9399f9	1	Other	Other
+7a70c02d-280c-40bc-ab6e-919520be357b	1	Other	Other
+7a70c0c3-f0e3-4463-a40b-c63c741f88fb	1	Other	Other
+7a712b42-2c9f-453c-b390-9397df64fb42	1	Other	Other
+7a7130a9-0a2d-458a-b5eb-1a257239c601	1	Other	Other
+7a716fb3-0c03-480f-bab7-690ff636cc4f	1	Other	Other
+7a717a36-7570-4572-ba1f-82833812b137	1	Other	Other
+7a71da31-1004-44a8-8996-168ef0605097	1	Other	Other
+7a71e06e-d177-47e2-95ca-2e8a95cbcb1d	1	Other	Other
+7a724318-3eb3-4582-abcf-dc2aec64b981	1	Other	Other
+7a72510c-34d8-4e73-b754-f17826b8fbf7	1	Other	Other
+7a728d63-b812-4ded-ac5b-37c32134bc66	1	Other	Other
+7a72a586-a262-41fb-b273-180106066ec7	1	Other	Other
+7a72a8e8-5c04-42fc-8a23-2f710d350c2c	1	Other	Other
+7a72f27b-2dd4-476a-a9b6-75c20afb4512	1	Other	Other
+7a72fc58-a18e-4f61-8feb-c0c4322f5037	1	\N	Other
+7a72fe6b-fde0-41e5-95d0-3531d68b63d5	1	Other	Other
+7a7300af-416d-41ab-8fa9-3782180072b8	1	Other	Other
+7a731955-eb24-43f5-8013-7cdc315bfaab	1	Other	Other
+7a732f02-12cd-4009-ac0d-9747c7ad5ca7	1	Other	Other
+7a7332e1-c275-4448-b830-7ff6357a1364	1	Other	Other
+7a73b3ab-0d33-405c-864d-ada8782f4aa3	1	Other	Other
+7a73c5f7-739f-4554-b9ac-d29b9b4097ef	1	Other	Other
+7a7480b3-b13b-4b42-8031-d340d7ce3a86	1	Other	Other
+7a74967c-384e-400d-957b-7d5c95f88696	1	Other	Other
+7a749e56-054a-433a-a71b-d2d8c0c58e1b	1	Other	Other
+7a750b5b-a049-44ca-8ecc-b25848145d48	1	Other	Other
+7a751987-d425-41d7-8baf-d1f5e6a2f293	1	Other	Other
+7a75cb63-691b-4634-9b38-4bc60600cf45	1	Other	Other
+7a75fe25-b952-41b8-ab28-c23aecce259b	1	Other	Other
+7a76715b-f4db-441b-8c01-d026275f030c	1	Other	Other
+7a76765c-9416-49ea-a867-2daed946ae88	1	Other	Other
+7a76782b-ed5e-437f-a6a2-1c860bb1b099	1	Other	Other
+7a771970-f9e0-458f-a967-bca332ede7f7	1	Other	Other
+7a77d677-9a3e-44e4-bf34-5ea3eed30f09	1	Other	Other
+7a77e0ba-6001-46be-ba93-eb308ce6fc63	1	Other	Other
+7a781f7b-a0bd-45a0-88bd-bdec5d287f81	1	Other	Other
+7a78666b-8aea-434a-be64-b1e1ad67ca73	1	Other	Other
+7a788928-d8c7-4417-b1c8-fb8ea5030bfb	1	Other	Other
+7a78b5af-9d4e-401a-bc34-c6630c1f811b	1	Other	Other
+7a791e24-f96f-4dda-8783-eb894ae6aa87	1	Other	Other
+7a793cc9-e546-4786-9e2d-ba36d887231f	1	Other	Other
+7a794417-0428-4616-af8d-0f12319940b9	1	Other	Other
+7a796e6c-d619-4368-b04b-9161714baa4c	1	Other	Other
+7a79bd6c-2a84-4d79-84cb-dc35b72a2d62	1	\N	Other
+7a79d48f-80ad-4679-87ce-1098b7f32551	1	Other	Other
+7a7abdce-e58f-4e74-b608-a0838d00dd99	1	Other	Other
+7a7ac4f4-6199-4efc-958b-a6a2fdec8a48	1	\N	Other
+7a7b04b8-83a3-4ff2-9dd2-b1880e89642b	1	Other	Other
+7a7b21da-3d35-4f27-90cb-76c15cca6e77	1	Other	Other
+7a7b4197-151c-4957-b685-c1f6f815b67e	1	Other	Other
+7a7b44bf-3a30-4880-b922-c3f9063da7f3	1	Other	Other
+7a7b4e26-5fa6-4254-9e9c-b0f071e0fb0b	1	Other	Other
+7a7b7d7b-5ee8-4639-97bc-7f6f8b8429aa	1	Other	Other
+7a7ba20c-1330-4f10-8d61-4b40f0e6c64f	1	Other	Other
+7a7bd17b-0333-4410-ab72-d16738378a65	1	Other	Other
+7a7c01b1-45eb-4a54-b796-cbf26422bf1d	1	Other	Other
+7a7c4e7b-b8fa-436c-ae2f-42b02a14d0d9	1	Other	Other
+7a7ccf94-7e55-42cc-943e-1477882dc84c	1	\N	Other
+7a7ce1a6-408a-4434-85e1-9dba945ab44b	1	Other	Other
+7a7ce80a-ab29-464d-8670-e31b5afa9c0c	1	Other	Other
+7a7d0b63-6253-4052-8140-9d470c9d100d	1	Other	Other
+7a7d2dd6-137d-48a0-a684-8171e3ba5c2c	1	Other	Other
+7a7da1f3-5f05-4ebb-8dd8-54908d174a8f	1	Other	Other
+7a7e71ac-af8d-41e0-847f-903565d780c4	1	Other	Other
+7a7e8c4e-9f61-412d-a7e6-12cb66442c92	1	Other	Other
+7a7eeed5-634d-4ccd-ba8e-e4be32caaaf3	1	Other	Other
+7a7f056d-1664-42f8-8450-deddde5e54d0	1	Other	Other
+7a7f2473-3ad6-48aa-8b8c-8e2a0f6a2362	1	Other	Other
+7a7f6cf0-4853-4b17-a986-b0ef5f645fa0	1	Other	Other
+7a7f8276-f9a5-4ddb-9db6-50eff968bd5a	1	Other	Other
+7a7f966d-b416-436a-9438-6bcb95783017	1	Other	Other
+7a804dbc-aa3c-4603-ac86-e02d2285ab51	1	Other	Other
+7a805bc9-4540-4c89-ad0e-97abcb880b42	1	Other	Other
+7a808241-3592-40c8-aa78-be8e8a0d8203	1	Other	Other
+7a80840c-626a-4373-a368-28a31f0f2f46	1	Other	Other
+7a81357b-3a01-446d-a5c5-3a12a95eae1e	1	Other	Other
+7a81499d-75c3-4b0a-97ab-9d003c0c331b	1	Other	Other
+7a819927-6fc1-402c-94d1-3849697f50cb	1	Other	Other
+7a81f05c-d39c-454d-ab75-0819b23f38e4	1	Other	Other
+7a820caf-71a3-4c61-8a57-35ac3bce7cd8	1	Other	Other
+7a82323e-a535-4136-b882-554cc8791609	1	Other	Other
+7a825143-7cf5-47b9-a60d-4818ce98b94c	1	Other	Other
+7a8264e9-91ed-4b23-9258-fa4477007ebc	1	Other	Other
+7a829c2f-0213-47f7-8b03-648df08f8623	1	Other	Other
+7a82eca5-557a-48a9-af91-5087e2a7117a	1	Other	Other
+7a82f0c8-69a7-447d-955d-e2bfe007cad2	1	Other	Other
+7a830c66-3c00-4003-999d-ca36bb106fa1	1	Other	Other
+7a83162c-8596-4f3b-9071-6ae7ec6670a6	1	Other	Other
+7a831664-082f-450c-9181-dd8173469502	1	Other	Other
+7a831ed1-c994-4771-acc3-489277ff5817	1	Other	Other
+7a83bd40-85a2-4265-9f33-d6d74ed10c3f	1	Other	Other
+7a83d269-3a18-437d-89bf-307e5999bc18	1	Other	Other
+7a83f462-3a49-451d-990e-496e314df8b1	1	Other	Other
+7a8405ce-b4b1-4ff9-ad0b-d0f20cc0cac1	1	Other	Other
+7a841a08-f27c-445d-a1a6-e7800e06a0ed	1	Other	Other
+7a8481de-b8a2-490e-97fc-f1b3cd056fdb	1	Other	Other
+7a84a77d-4053-4111-8f00-d92610dde18e	1	Other	Other
+7a84e613-c875-4ee2-8f76-a271e8500d87	1	Other	Other
+7a84f70a-a207-46a8-9326-c3421e9e03b6	1	Other	Other
+7a85272d-58af-4892-8a91-3fbb1ff494ee	1	Other	Other
+7a855824-39c3-4dd5-a23a-c7a95b996d48	1	Other	Other
+7a857975-9dbb-4233-9753-b2aa51dc7f32	1	Other	Other
+7a85df19-f41f-4d0f-8fb3-f8a123dd6822	1	Other	Other
+7a85f7d4-0f35-4510-9246-98ea65f0701b	1	Other	Other
+7a860471-1e55-4056-a581-72d1d2878305	1	Other	Other
+7a8633ee-074b-4b7b-be71-737f493910b9	1	Other	Other
+7a867801-4641-478f-aa69-32ef23d00eb5	1	Other	Other
+7a86bd15-6e7b-44c3-9397-ec8a3aff11e1	1	James	Other
+7a86e9da-0b74-4a79-97a5-9390b6f76bfc	1	Other	Other
+7a86fa88-b46c-4c83-ba6d-a23483f98772	1	Other	Other
+7a871453-6cf2-4d3b-a672-7139b803dd1b	1	Other	Other
+7a877061-e438-4faa-a915-5b7aa1c74bb6	1	\N	Other
+7a878a29-bfa0-4988-bdc4-6e9b9cd1e7a2	1	Other	Other
+7a87dfa5-de2c-4253-a790-5455a492e15d	1	Other	Other
+7a87f28f-81a4-4f6a-97b2-c220ee3e80db	1	Other	Other
+7a8804fb-6a29-47e2-bda0-d259bb28fdff	1	Other	Other
+7a880ef5-557d-482d-b3c7-b1f40d20c37f	1	Other	Other
+7a8819c3-2362-4b7b-bd0e-78a8cab951db	1	Other	Other
+7a8883c0-0c82-4b03-be67-9c11f60505e2	1	Other	Other
+7a88b835-3ee0-48b3-862e-713044c8bc38	1	Other	Other
+7a88e397-2253-427a-9f7e-f7af4dd42fad	1	Other	Other
+7a88fb08-4cdc-446c-bb5b-28a88d772eb2	1	Other	Other
+7a890db5-7ade-4616-8772-28e1196436bb	1	Other	Other
+7a8946f3-77a1-4811-a17a-cceb1811f06e	1	Other	Other
+7a895244-0120-497b-9d6d-44b95f9c0341	1	Other	Other
+7a89d26a-0e47-4443-9bf4-02f4884c9e4f	1	Other	Other
+7a89d515-b9a7-4fd7-aa77-18bf2044f4cc	1	James	Other
+7a89de36-b098-49da-826b-42c896e54566	1	Other	Other
+7a8a114f-12c5-4e52-bcf0-b4be4f64ed6b	1	Other	Other
+7a8a1235-a4ae-44f3-8286-5dde50886fd3	1	Other	Other
+7a8a28aa-4ea9-47a0-ac40-f9c9898bb617	1	Other	Other
+7a8a3db9-ce1b-4db0-9ef7-6fcbaae04581	1	Other	Other
+7a8adf81-34ce-4238-94dd-5f2c150d945e	1	Other	Other
+7a8adfb5-5eb5-459f-a140-357b18128054	1	Other	Other
+7a8b1610-aaa2-473b-876d-2988018760a5	1	Other	Other
+7a8b7d45-64d5-46d0-9256-13305f5a3ee8	1	Other	Other
+7a8b8d61-a7fc-4a96-92dc-1eee81e24a39	1	Other	Other
+7a8c3532-304a-44cd-b560-7ceb3f1c9da0	1	Other	Other
+7a8d3f29-72f5-41d5-9c48-da5265ff11c5	1	Other	Other
+7a8e306f-447e-4352-bcfc-3b6db9ca3baf	1	Other	Other
+7a8e5bd7-a7f7-440e-8ace-a7d1904eb80c	1	Other	Other
+7a8e79a3-f342-4b16-9e03-f5fc05058de9	1	Other	Other
+7a8e7a40-7159-4424-9245-da674f0ca6a8	1	Other	Other
+7a8ea79c-494b-48a2-ac30-cda4bc654000	1	Other	Other
+7a8f1d9f-33f9-41d4-a004-b83c86fd0883	1	Other	Other
+7a8f9863-bf9d-48ad-b5a6-eea901c5cc32	1	Other	Other
+7a8fb685-f42d-4dff-a363-a37d56e6c200	1	Other	Other
+7a8fc326-4653-43b6-bbd1-e13a65c59714	1	Other	Other
+7a903ec4-62d2-42dc-94e6-64acac353cf4	1	Other	Other
+7a9046b6-1a76-4062-8e12-f9fb12e7211f	1	Other	Other
+7a906a07-4307-432c-9a51-be00c0dafcfb	1	Other	Other
+7a90a932-2c76-4709-9f04-728368a36886	1	Other	Other
+7a90abb9-9fec-4085-bb96-612d42dab409	1	Other	Other
+7a90f3e0-05d4-49e8-94cb-cfd220a18bfe	1	Other	Other
+7a911802-28a0-451e-a3c9-27791eddef8b	1	Other	Other
+7a91295d-078d-4a0f-99cc-2629a769f2ed	1	Other	Other
+7a913747-d953-49f9-aae9-e52b100d70d2	1	Other	Other
+7a919433-46ea-4485-8543-5550dfd48531	1	Other	Other
+7a919796-cf5e-4037-be95-08ec5a50c011	1	Other	Other
+7a91a925-2ca2-4ead-9401-2447fc9c5f77	1	Other	Other
+7a91c164-bf0c-479b-a5c8-54cff2656845	1	Other	Other
+7a91fb85-0388-40b3-957c-d52bbcf3dc5e	1	Other	Other
+7a9237da-76c6-4fdf-928b-a412f2351ed0	1	Other	Other
+7a92bf3b-f655-4c7b-b12c-89ebf2998e19	1	Other	Other
+7a92dc04-dae0-41fd-8909-96682f8219e3	1	Other	Other
+7a932288-c95c-40b6-a5c9-8e497c8305ae	1	Other	Other
+7a932f11-4061-4306-848b-1e578e0463f3	1	Other	Other
+7a93b122-c976-4d08-9a13-c253a3ea31a5	1	Other	Other
+7a93df5b-7db0-4b16-9317-67b6b8d4e0eb	1	Other	Other
+7a9400b8-0265-462a-a312-22c64e5fd300	1	Other	Other
+7a946bda-0878-4075-9d93-c80ad94ed663	1	Other	Other
+7a94d9f9-14f0-4f5a-95ab-9e4efd2ca23b	1	\N	Other
+7a95668f-9dc3-4f7a-9584-311c32d93e6b	1	Other	Other
+7a966e6f-0a60-42a8-bd32-a94b7bccb193	1	Other	Other
+7a96887b-ea68-433c-9a06-90a4aadb6d75	1	Other	Other
+7a968932-10bf-40fa-9d81-c9b395a0b3a6	1	Other	Other
+7a96a27c-b8f4-4b04-b9e9-6604164f3f10	1	Other	Other
+7a96d0df-460a-4f90-9b84-31fa7547b212	1	Other	Other
+7a96da4c-473a-4b7d-87d4-051560c01898	1	Other	Other
+7a974405-0c26-4978-985f-e34337486c62	1	Other	Other
+7a974d3b-beb9-4e98-af84-eb58ffdac172	1	Other	Other
+7a9757cc-99eb-49e8-943e-93552541a4a2	1	Other	Other
+7a98241f-912d-4fee-9701-c6604f9b279f	1	Other	Other
+7a988515-5132-4e73-b568-e33631e57d29	1	\N	Other
+7a988bf7-a558-417e-b0c3-1bf2aa75bdde	1	Other	Other
+7a98cf71-d69d-47cf-925a-740d2f8b45a8	1	Other	Other
+7a98d110-1a39-4089-97ff-8b3f5758d747	1	Other	Other
+7a98e177-c955-4014-a022-87e9de44e65d	1	Other	Other
+7a9921f6-c680-437d-a0ae-53ba25905808	1	Other	Other
+7a99416f-3e9d-4597-a3f7-1599d6a9ea33	1	Other	Other
+7a998193-2ca6-4b39-9fe1-b6d1739c7b6e	1	Other	Other
+7a998d95-f42b-4567-af10-1e6dae74c759	1	Other	Other
+7a99bc4e-e056-4e3f-998a-7eef0fa167fd	1	Other	Other
+7a99ddbb-3de2-42b5-b26f-9ad65b6d7707	1	Other	Other
+7a9a1791-8e00-4bd0-a8e4-ac0686b2b0e7	1	Other	Other
+7a9a1acb-9b05-4e5c-8107-e76ca2dc2245	1	Other	Other
+7a9a58ef-9055-4140-af94-a8307b53a686	1	Other	Other
+7a9ac657-d1cf-4fd2-a552-0e7421483e6f	1	Other	Other
+7a9afcfa-6382-46ad-9c81-cfd57cc68ce6	1	James	Other
+7a9b1334-d045-43b2-be3d-6f503058e630	1	James	Other
+7a9bbde2-be9d-4946-a321-4d2dcd5bfaf1	1	Other	Other
+7a9c2cda-a436-48fe-9ee5-6f20dc41f947	1	Other	Other
+7a9c43c0-ef6b-4543-8763-e52a54d5aa26	1	Other	Other
+7a9c5a8d-3140-4458-974b-ba2fa1460005	1	Other	Other
+7a9c641b-b3a2-4035-a538-acc1f7f3f7f9	1	Other	Other
+7a9c846e-49f2-4c2f-bd0c-5f57710cfdcd	1	Other	Other
+7a9c9ac1-4633-413a-9af8-a487cfd477b7	1	Other	Other
+7a9c9b6c-ea92-47c2-b47d-d7ed9ccd78cb	1	Other	Other
+7a9cd34d-3cfd-49f4-a6a3-68f49d9ec31a	1	Other	Other
+7a9ce39c-db00-4148-b785-81c3e52f736d	1	Other	Other
+7a9d10db-880b-49d4-a8ec-13b2686f0a55	1	Other	Other
+7a9d9bdb-83f7-4a6d-b04e-68c729022d78	1	Other	Other
+7a9dcd8e-aac0-4d56-8e84-885a779284f1	1	Other	Other
+7a9dd767-943d-482f-af5d-b1a527ba22c5	1	Other	Other
+7a9e2642-ce98-4bbf-8e60-356d88487e82	1	Other	Other
+7a9e5009-3429-479c-a19a-8ef455933ed0	1	Other	Other
+7a9e6dfe-7faf-4778-ad27-c094c776dfce	1	Other	Other
+7a9e9562-82b5-4378-9e51-13d97d81aaf1	1	Other	Other
+7a9eac92-4cf9-4836-a832-f2018dcabe4d	1	Other	Other
+7a9ec63f-ef3a-44e7-a36d-ce36d0a03cdb	1	Other	Other
+7a9f1d2b-1a1f-44c4-beda-c3354431fb19	1	Other	Other
+7a9f2829-e221-476d-8f53-55af33f47c78	1	Other	Other
+7a9f32e1-9e02-4918-b227-1de518c9f8bb	1	Other	Other
+7aa00b33-dcf4-4ec1-80c8-5d02d79ac09e	1	Other	Other
+7aa0280c-a302-4967-a97b-c34fea148c8f	1	Other	Other
+7aa02da3-9c72-47de-94b5-27e8fe4f5c9b	1	\N	Other
+7aa03ba2-cb50-4d80-b437-f496ebd9bd8b	1	Other	Other
+7aa04b37-5738-4488-bffe-ce59034053b8	1	Other	Other
+7aa0db23-9335-4227-a238-d20ef54fa5d9	1	Other	Other
+7aa12f3f-9713-4ff3-b9e0-20214dea8412	1	James	Other
+7aa15172-a65e-47a9-a2f4-14c98df5ce87	1	Other	Other
+7aa1733e-e282-4573-afe0-0cf18f05d0b0	1	\N	Other
+7aa17bd6-03a8-4829-ad46-b3e4ffe4231b	1	Other	Other
+7aa19764-2266-4c32-b01e-d2f6ce50382a	1	Other	Other
+7aa1b5dc-08c6-484c-98d9-f1da25e80726	1	Other	Other
+7aa25988-df6c-4f56-be8f-9d1aca740a5f	1	Other	Other
+7aa26fcb-be10-4e18-b3ba-58318b436385	1	Other	Other
+7aa2743b-b5d5-4a7a-874d-393f9f25ba31	1	Other	Other
+7aa29bb9-9811-486e-81bb-f5c7992479a7	1	Other	Other
+7aa31df6-f1ba-4132-bc98-24fb22535e56	1	Other	Other
+7aa32b25-55e1-4373-9158-0c998eae083f	1	Other	Other
+7aa33059-7e50-48db-b93b-9af8bbfc1ea6	1	Other	Other
+7aa349dd-26fb-42be-b8b5-f1bea749fd4b	1	Other	Other
+7aa36d37-1a93-4e07-b802-195668369fcb	1	Other	Other
+7aa39ac9-798e-4a6e-91ae-48f72ec7214d	1	Other	Other
+7aa3c86f-8c0a-4ec6-918f-37ea8cd1bb0e	1	Other	Other
+7aa3ef73-e445-4ae8-b0c4-f2f2b8c1e8bf	1	Other	Other
+7aa3f5bc-b954-4268-9144-58a20486448c	1	Other	Other
+7aa404f0-16d0-4320-b864-ca0e79781722	1	Other	Other
+7aa40e09-5d58-4d0d-9919-8c7f16ee5004	1	Other	Other
+7aa43605-3469-4d5f-80d2-c870d1153228	1	Other	Other
+7aa43714-856a-4ffb-a3b4-bcd6b3e9cc8a	1	Other	Other
+7aa4486a-5bf9-49a2-bd67-6632c193be8a	1	Other	Other
+7aa44f56-d959-46e4-8a07-c2dc9cd26d12	1	Other	Other
+7aa46494-c75e-439c-83b7-d728b0d038e0	1	Other	Other
+7aa52b38-27c1-4eab-9c20-fe53e208bf16	1	Other	Other
+7aa59376-457d-4542-8e6c-8c2eb5e9b905	1	Other	Other
+7aa5e5e9-7470-41a6-aa1d-9b30359c6165	1	Other	Other
+7aa5f4ca-2498-4569-83c8-397cfd00e57e	1	Other	Other
+7aa62c44-7c5c-452f-92d2-cf2d8dfcbcd5	1	Other	Other
+7aa655c6-4fa7-4443-b810-53f55e5f6c2c	1	Other	Other
+7aa65f4b-cde6-4fa2-b4a6-a05637f2fd01	1	Other	Other
+7aa66206-66cd-4162-b1d1-dcda43147496	1	Other	Other
+7aa67285-fc02-4918-93a5-3a5453608e75	1	James	Other
+7aa6a24c-9161-4cd2-a655-790581f14e0a	1	Other	Other
+7aa6cf8d-76c9-4074-bb88-907f82e644b8	1	\N	Other
+7aa6d0ba-abd9-4639-bdaf-a497a672a2eb	1	Other	Other
+7aa7cf47-7b2f-4945-a789-8d84d5325cd2	1	Other	Other
+7aa7f7c7-f469-44af-8489-6eea9fefbeeb	1	\N	Other
+7aa80b47-31f2-4b75-ab15-64e74e857900	1	Other	Other
+7aa817a0-950c-4518-a132-79b4691126b0	1	Other	Other
+7aa81e7d-38dc-4248-9828-dfbde992a04e	1	Other	Other
+7aa842be-6ca4-41a6-bfac-5ca11d0e07c1	1	Other	Other
+7aa87586-1280-4475-9b64-61273fc13e4b	1	Other	Other
+7aa899d1-e89c-4860-95be-8306b5a1361f	1	Other	Other
+7aa8b536-6908-4bd3-a467-beb98ea48c1e	1	Other	Other
+7aa99f71-8c31-49c9-b905-825d33dfefd9	1	Other	Other
+7aa9aee0-e97e-45fa-93bf-ef5176e5c7a1	1	Other	Other
+7aa9c1eb-0635-4844-b0a9-438284f378e1	1	Other	Other
+7aa9c9f0-d5fa-40b3-a3cf-5cc1991c68f6	1	Other	Other
+7aa9cfb0-3c06-4bb1-a916-a72d9e95d123	1	Other	Other
+7aa9e546-e15e-49e8-be8d-d463e3e026be	1	Other	Other
+7aaa4e48-68f2-439e-b0e4-62054431f308	1	Other	Other
+7aaa500f-5132-4165-8d23-0e1102c3badf	1	Other	Other
+7aaa5ce4-b012-431c-8108-ff30774abdb5	1	Other	Other
+7aaa5eca-9360-4bef-9277-0db71777f498	1	Other	Other
+7aaa7434-802a-4e59-95e7-3d281c556d0a	1	Other	Other
+7aaa7b7c-3677-4cf6-a55e-e432d0696c02	1	Other	Other
+7aaa90d1-7d6c-4b9a-9576-11791d7ef379	1	Other	Other
+7aaacf10-1e01-4eb2-b639-240dfc9f4b19	1	Other	Other
+7aaae948-7983-483f-9af0-f2ad730e4c21	1	Other	Other
+7aaaf9c8-4f91-4113-951c-a57f293b2756	1	Other	Other
+7aab02c3-6327-4aa7-91eb-dda1370d6875	1	Other	Other
+7aab22db-eab0-4d03-b1af-75e2db5692aa	1	Other	Other
+7aac076f-97aa-4f85-beb6-ff6aa3ec4c43	1	Other	Other
+7aac4830-ab82-4a16-a5ec-0931dc974b82	1	Other	Other
+7aace2e2-660b-4160-9ffa-89456f082cd0	1	Other	Other
+7aace3ae-8b75-4bd3-a6cf-dbf657f80e57	1	Other	Other
+7aad2137-395a-4652-9aa0-48e5a694c57b	1	Other	Other
+7aad2a5d-97b2-4ce6-8fac-5971f016180e	1	Other	Other
+7aad3b0f-9497-40be-b15e-243dd9e23209	1	James	Other
+7aad614e-a419-46b9-8bb4-bd76bcd93f3d	1	Other	Other
+7aad6208-0c32-46dd-ae36-952bc5bd9eea	1	Other	Other
+7aadab25-ec57-4350-9bfb-693febf52f70	1	Other	Other
+7aadc24c-f480-4c70-8fe8-7652ed366144	1	Other	Other
+7aade79a-2502-4fdc-b3f3-ec8ff859c325	1	\N	Other
+7aadf948-014e-433b-8023-8fd14cb19876	1	Other	Other
+7aadffb4-5492-4405-a8b9-4947f220dad4	1	Other	Other
+7aae462c-11d6-4b7d-8a39-ca110d981eb2	1	Other	Other
+7aae74c2-c0ea-49ca-81aa-0c78f17567ba	1	Other	Other
+7aae90fd-c113-494e-9976-cdc293c22e10	1	Other	Other
+7aaedd66-4256-4127-b250-7fa005f073d1	1	Other	Other
+7aaee985-883c-455a-8106-836ed9e7bb16	1	Other	Other
+7aaf0e4d-c441-4ab9-aff8-58bca519de0a	1	Other	Other
+7aaf69bd-c1ae-490d-93c9-44376d39b359	1	Other	Other
+7aaf87ed-5d6c-481a-8294-b18ba74c515b	1	Other	Other
+7aafa450-8e80-408a-bb08-3ffade4a495b	1	Other	Other
+7ab04e37-995c-473b-89f9-dd742290e27b	1	Other	Other
+7ab06221-450f-465c-8c6e-d168bee50cf6	1	Other	Other
+7ab0d7e9-630e-4e54-ac84-a7835e45b3af	1	\N	Other
+7ab0fedb-0d66-4c8e-a8d2-190b8c6102fe	1	Other	Other
+7ab10b2f-002c-4642-b41b-0ff204c25373	1	Other	Other
+7ab1392e-f6c9-4f73-8241-f4fdf5e2f95d	1	Other	Other
+7ab15f78-3ce4-4568-8b79-ca2d7d22d44b	1	\N	Other
+7ab1afb1-8292-4196-803b-ded76c0a57c8	1	Other	Other
+7ab1bd00-59a4-4e0b-9fa8-97778bbc56f3	1	Other	Other
+7ab1e116-0e8d-4e97-ac2f-9f152f577b94	1	Other	Other
+7ab1e27a-21b3-4d87-b020-db2e03ffc21c	1	Other	Other
+7ab22085-f479-4195-8d38-9d0cda86150f	1	Other	Other
+7ab2252b-659b-4363-afa6-50dc0c602acf	1	Other	Other
+7ab22923-a3f5-4c38-88ec-0e8927e86c26	1	Other	Other
+7ab23123-f6d1-4d21-a3ea-ff46db622542	1	\N	Other
+7ab24f09-b6e2-4ec4-aae4-dd98ba2b4849	1	Other	Other
+7ab25a6e-4a40-4b69-9b5d-98333e2f4d7d	1	Other	Other
+7ab2711c-9fb4-4354-8c44-9538d699dfed	1	Other	Other
+7ab29604-bf3b-4e76-ae68-2ddee5556f81	1	Other	Other
+7ab2fbfe-6274-46a8-9de5-8404134139fc	1	Other	Other
+7ab37378-f643-43c0-a0f0-ac7e5968f9fd	1	Other	Other
+7ab397cf-e22c-40df-a4e6-933c0cc91f99	1	Other	Other
+7ab3c93a-9128-41f4-87b6-c522222fd46d	1	Other	Other
+7ab47859-83c3-44dd-9f94-5328691db5ec	1	Other	Other
+7ab4a067-24cd-4301-8f66-e403e7e23857	1	Other	Other
+7ab4c381-8f33-47f8-bb93-7b1c194105f2	1	Other	Other
+7ab50969-6cf0-44cd-abde-fc059e53ef9a	1	Other	Other
+7ab50b54-f603-4a88-b9af-d23674dc8d35	1	Other	Other
+7ab513d5-ccbd-4216-b612-9268fb9c8456	1	Other	Other
+7ab53167-a81f-44e2-8eff-950cdb9b6252	1	Other	Other
+7ab53bf0-12ad-4ac1-afd9-aa1d6b3fb056	1	Other	Other
+7ab5558f-e890-418d-8df9-c7f7d25afeb5	1	Other	Other
+7ab55789-9a28-4cff-b85a-dc6369d5063d	1	Other	Other
+7ab56e2f-b6e6-49fb-95b4-1c1f6f0f39c1	1	Other	Other
+7ab5775e-04fd-40c0-bde6-82716e6ec561	1	Other	Other
+7ab5cc46-3e8d-48c1-89cc-96f9e068af08	1	James	Other
+7ab5e1ab-5ec4-43fa-8421-26d635b8bc65	1	Other	Other
+7ab5ec8c-3056-420c-818b-ad469d3bed9a	1	Other	Other
+7ab666cb-02f7-4629-971c-8716cb1c7a35	1	Other	Other
+7ab67307-c7ec-432a-bd22-74717a1420d2	1	Other	Other
+7ab6793c-bf19-4f6a-b75c-649adc3dfd8c	1	Other	Other
+7ab6c6cc-9d14-11e7-88e6-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7ab70f92-f49d-4a35-bf7a-4846e9ef0452	1	Other	Other
+7ab772f0-ca17-42c3-a628-d6247819290c	1	Other	Other
+7ab7b817-ee9a-4c7b-8434-9bcc941fed8e	1	Other	Other
+7ab7e387-9815-4e6d-b4a8-2b98f160ea5c	1	Other	Other
+7ab824ef-3827-43b2-a810-855465faa004	1	Other	Other
+7ab8704e-77bb-4d20-84ad-7672c97ccc5e	1	Other	Other
+7ab8d935-d8f9-448f-89ab-f600001ddb01	1	Other	Other
+7ab8e640-ec40-4dcb-92df-1978db1d6bdf	1	Other	Other
+7ab98455-1680-4914-b8b8-52dbfd2c3605	1	Other	Other
+7ab98547-ab7b-4f47-b5f4-1fca1eee6219	1	Other	Other
+7ab989d3-af88-4490-9ee3-f29e6c0edc45	1	Other	Other
+7ab9a88e-8bdb-4f87-9721-1b7585a54b05	1	Other	Other
+7ab9f6ff-802a-41cd-aa95-6946ffa62ac7	1	Other	Other
+7aba18d1-2102-474b-b319-2ce0902f5ef1	1	Other	Other
+7aba4fb9-d2d0-4998-b8ab-84935c843274	1	Other	Other
+7aba63d7-db92-425c-98eb-81a0a6089d4d	1	Other	Other
+7aba648d-599a-4fa2-a510-48475814c425	1	\N	Other
+7abad522-e973-44a1-9291-6a02aec914d5	1	Other	Other
+7abb005d-b364-415c-a3f9-d2f2b12f0320	1	Other	Other
+7abb1469-af57-4d0a-842e-d6053c0aa56a	1	Other	Other
+7abb1f28-16f8-4d93-8fbd-f120e62946d2	1	Other	Other
+7abb590a-9866-43c8-afcd-37c8c6cd2431	1	Other	Other
+7abb83a3-57e2-4466-aa7a-5fd041e44dbc	1	Other	Other
+7abbbaf6-3c8c-4299-8388-4bb0d67bacae	1	Other	Other
+7abbbd0d-19f5-4951-b3b9-beb5a1fba748	1	Other	Other
+7abbe34c-1f35-488c-b0ae-326ca1bbfcd9	1	\N	Other
+7abbf693-2f3d-49b8-b509-8b2bd58aacb4	1	Other	Other
+7abc42dd-0905-4439-83be-c5e656862d28	1	Other	Other
+7abc6ea6-dc67-4bc3-bb7e-6eb8bd25ab7e	1	Other	Other
+7abc75fc-e0bb-4864-b1f1-ceb6ecbe9f86	1	Other	Other
+7abca068-e32d-4f76-a686-6e6fd65c4e4d	1	Other	Other
+7abcbe90-55ee-46d1-a936-af0c508e1419	1	Other	Other
+7abd9316-d623-432e-9b7d-c0e813c9047e	1	Other	Other
+7abd9a89-2b94-4aea-8ae4-ce7065cfa69e	1	\N	Other
+7abdc07e-2ae2-4041-a677-bbd6a404f5be	1	Other	Other
+7abe0090-319a-441e-8200-51d7318f9b7e	1	Other	Other
+7abe123f-97b3-4e96-a5ec-436483d8f6ce	1	Other	Other
+7abe82b3-244c-4269-a398-e7b47c65abde	1	Other	Other
+7abe9ecb-157a-4636-bd0b-d0a2b24c6cfe	1	Other	Other
+7abeb091-875b-4773-b0c0-2251bdc153c6	1	Other	Other
+7abed526-035c-4bbd-97fa-dbcf47805040	1	Other	Other
+7abf2f86-2c44-409f-a60f-1e0f776369df	1	Other	Other
+7abf9cd1-d9bb-4418-9883-2acb0f7cbe6b	1	Other	Other
+7abfc241-70f9-4753-8d63-2936ef9d1044	1	Other	Other
+7abfd064-5249-4b66-af0f-00325db2bf59	1	Other	Other
+7ac00b16-f635-4a59-af6d-6dc0c2ad19de	1	Other	Other
+7ac023f0-6454-417a-b465-774149e72c0b	1	Other	Other
+7ac02c24-daf4-4df2-82da-df710121c042	1	Other	Other
+7ac03f09-b5aa-439a-a8e3-d903974dd564	1	Other	Other
+7ac0a08c-a437-4220-b81f-58b91fecd76a	1	James	Other
+7ac0cbfb-72e9-4110-9247-617395b88bd4	1	Other	Other
+7ac0e6cd-d7cf-4cbb-b857-ab681506666b	1	Other	Other
+7ac13c43-43a1-4aec-bc50-d30e56a11766	1	Other	Other
+7ac18142-1ace-4f0c-aee2-1b60f315f1cc	1	Other	Other
+7ac1a0e4-08d8-4cd9-9718-28788ee0a550	1	Other	Other
+7ac22ced-cc21-4e2d-8ed6-56aa1953dc55	1	Other	Other
+7ac23016-296f-4faf-b612-bed5f32e743f	1	Other	Other
+7ac2334e-2da1-4745-ab25-3d9f4eb3c853	1	Other	Other
+7ac2b9f5-7064-4644-b21a-f0ba1f6a2c3a	1	Other	Other
+7ac2f4d6-a1c3-479d-8bb0-9dde4c23fc3c	1	Other	Other
+7ac32684-f6da-4025-a57d-5ea0200a8dc2	1	Other	Other
+7ac39134-28ea-43b1-a2af-206f6f8badf1	1	Other	Other
+7ac39d39-d76a-4109-8b70-985280605fd2	1	Other	Other
+7ac3ea24-003d-412b-a94a-21fd86f7c6c9	1	Other	Other
+7ac416b9-8ddb-456d-b26f-ac31c7f0f2f7	1	Other	Other
+7ac4286c-7342-4987-b963-d34da28151fb	1	Other	Other
+7ac43dc2-74bd-44d7-a955-600a9afd33d9	1	Other	Other
+7ac47c27-1e72-4771-a331-e3ff8b807d08	1	Other	Other
+7ac4c375-dec7-4152-80b4-0337d47db417	1	Other	Other
+7ac4e399-91d8-4d4f-ab6d-3410dce821c9	1	Other	Other
+7ac4f04f-fc8a-4bcb-b362-ffdb759e72e0	1	Other	Other
+7ac4f4ed-db39-4986-b911-fd0e82529e7f	1	Other	Other
+7ac51b41-1128-42f2-8340-d60d686d5e8d	1	Other	Other
+7ac5265b-f5a3-47d3-a910-f40510b3f671	1	Other	Other
+7ac52935-15e1-46c0-86ef-13ff8d4abb10	1	Other	Other
+7ac53e65-cfc9-4fde-8a5e-48bd86822d2a	1	Other	Other
+7ac54fb4-130d-40bb-8fd1-acce381fcbd5	1	Other	Other
+7ac56463-8b52-46f5-805f-a35fbc8f0967	1	Other	Other
+7ac58958-c969-4400-9236-95cd0357a0de	1	Other	Other
+7ac58b0e-234b-4ff5-965f-5058be642311	1	Other	Other
+7ac59c5b-eb78-483a-9401-e56925a1759a	1	Other	Other
+7ac5b5bc-a776-48f9-8b32-7e44e11084cb	1	\N	Other
+7ac5b689-8c6e-4eb0-9929-50ef780377a6	1	Other	Other
+7ac5cdd9-9130-4013-9854-801056655235	1	Other	Other
+7ac61f9a-2ab7-423c-a5fd-34d074858c56	1	Other	Other
+7ac641f8-8d32-49c2-8ad9-47ac0cfa3f77	1	Other	Other
+7ac6a422-7122-4ec2-9f5b-9ac5a10cb7fa	1	Other	Other
+7ac6b32c-aba3-4d42-ada9-437fda431a1c	1	Other	Other
+7ac6b39c-57a3-4b34-9e87-4e9876359253	1	Other	Other
+7ac6f5ba-fb94-405d-be96-298196685fda	1	Other	Other
+7ac6f718-87b5-41c7-9a72-b70b3a2674bc	1	Other	Other
+7ac7416b-e843-4443-8771-00546e70d9c2	1	Other	Other
+7ac74e04-e4f9-4838-99c0-a36f8a89506d	1	Other	Other
+7ac798a0-1994-448c-9405-6b2b61aaa33b	1	Other	Other
+7ac82e0a-3ffe-4018-930b-baf0e1133e1b	1	Other	Other
+7ac8b34c-ef29-43f9-a46f-cf77bd4f0262	1	Other	Other
+7ac8c76a-2082-4f8b-b724-44406e65cd29	1	Other	Other
+7ac8d7fa-2a88-4c7c-9110-c7fab19c7e36	1	Other	Other
+7ac8e01d-017f-4292-84ea-e03dbd345ffd	1	Other	Other
+7ac90078-14ac-453d-b806-1dc5a54c099f	1	Other	Other
+7ac917cd-f3cb-4414-b17b-ff0e536e471d	1	Other	Other
+7ac9565b-ab8f-459e-b42b-b028b3f78f3d	1	Other	Other
+7ac9795c-978f-4d62-8728-2fb89cc90b69	1	Other	Other
+7ac9861d-e7f0-4fc2-98f2-a9a72371c297	1	Other	Other
+7ac99070-a2ac-4d29-afa8-00620f476ae7	1	Other	Other
+7ac9a1d8-3242-4ca2-accb-550873d594d8	1	Other	Other
+7ac9ebaf-28f7-42bb-9d97-09f8c4df8b5e	1	Other	Other
+7ac9ec8c-54f1-40c1-8c6c-5d0bbefafe9f	1	Other	Other
+7ac9ee19-b91f-4f35-97e1-ad93d9b843cc	1	Other	Other
+7aca0f27-2757-410c-bfeb-66dad01b6f6d	1	Other	Other
+7aca6c0c-d4d6-4913-8c78-e2ca1fa6f11f	1	Other	Other
+7aca90f8-0d7e-4900-b983-dcc135cc36d1	1	Other	Other
+7acab217-beec-4c88-9b86-66bab60129c8	1	Other	Other
+7acb0606-7756-4a5a-b8be-f90722cd9093	1	Other	Other
+7acb1f97-3f4a-4735-b94b-e631af9cbebc	1	Other	Other
+7acb6ef8-15a8-485f-9ab7-d5ca86232526	1	Other	Other
+7acba385-5caa-409f-95f1-6413bbc03a54	1	Other	Other
+7acbbccf-efaf-48bb-938b-cc1eae82f699	1	\N	Other
+7acbdebd-4e03-4b41-8a74-073c016d85d6	1	Other	Other
+7acd1ee7-f615-41e0-8f46-33b8e99e34b1	1	Other	Other
+7acd4b65-9051-4702-9934-5188d5acb1ed	1	Other	Other
+7acd517f-87e7-466b-81b2-742cd92d6d9a	1	Other	Other
+7acdb458-4b1a-4793-b1f7-69f7d22f9108	1	Other	Other
+7acdb545-304b-4096-b170-ac3252365b67	1	Other	Other
+7acdb555-3b4c-46e6-8a43-451e93d9a667	1	\N	Other
+7acdfc1b-24c2-48f6-9a93-98b18fc3cf42	1	Other	Other
+7ace2349-29fe-4ab1-b8af-9f24d1deddb3	1	Other	Other
+7ace4a16-b5a2-48a9-81a5-18a75decbc80	1	Other	Other
+7ace526f-cf10-4b32-b181-4fe9811c7214	1	Other	Other
+7ace8bf9-2a01-4463-a7a1-602f672c20e8	1	Other	Other
+7aced786-6e04-44c1-ba95-1a24d710b677	1	Other	Other
+7acee43f-3eec-4ca8-b5ca-b8c615775ae9	1	Other	Other
+7acef41d-91ee-431d-bbea-1e2bd29f9b86	1	Other	Other
+7acf2654-1eae-43e8-ae9d-954eed44a81e	1	Other	Other
+7acf70a5-4a4d-415f-8c1e-4d8a1eb2afc2	1	Other	Other
+7acfb263-b315-4288-8dcc-00a741eb8032	1	Other	Other
+7acfd6e8-ffa5-4d45-a5b1-353ac7664bae	1	Other	Other
+7ad009aa-470e-4f64-a5c5-5cbf37cae150	1	Other	Other
+7ad017b8-aaaf-4aef-9583-87a4787a177d	1	Other	Other
+7ad02f0b-abcc-48c8-ac73-68a06e031b71	1	Other	Other
+7ad039d8-c75d-4f4c-9d68-e347dd08b14f	1	Other	Other
+7ad03ca2-1cfd-4b9e-8696-d78002832045	1	Other	Other
+7ad0452a-1dd3-4afa-ad1d-5ca7ca8202d3	1	Other	Other
+7ad05dde-7ccb-43c1-989f-148b373a4fac	1	Other	Other
+7ad06d03-25cc-4cc4-a4e5-50ef852113f5	1	Other	Other
+7ad09608-6374-4cb6-8302-82443f8f6cf8	1	Other	Other
+7ad12e16-64f1-48fc-aff8-46a9197e06ed	1	James	Other
+7ad178a1-dcc4-4d42-a186-539c2dd5a92a	1	Other	Other
+7ad18650-2041-4050-8237-bf0f04df7c23	1	Other	Other
+7ad1b537-9a3d-43b8-991a-9561fda2d33d	1	Other	Other
+7ad1ce77-0d79-48da-9445-a4b67bbb5e07	1	Other	Other
+7ad1e062-8af3-4667-bbe8-93d23ba858aa	1	Other	Other
+7ad22b9b-00f7-49d6-aa13-0a4e7c520eb6	1	Other	Other
+7ad25fac-c221-4dcf-8c19-8f31e84850a7	1	Other	Other
+7ad27c46-94d4-4f78-b749-56aefdda7530	1	Other	Other
+7ad286c8-7895-4d6f-bae7-cfc4a229f93c	1	Other	Other
+7ad289ff-da46-40e4-bac9-d125cf491998	1	Other	Other
+7ad2afbd-f29b-49e1-b5d4-c6cdad90eb7a	1	Other	Other
+7ad2b944-9f5f-4d61-b3d7-d63d48858c72	1	Other	Other
+7ad2b981-3907-4ab5-be73-0fa48ec222e3	1	Other	Other
+7ad360ad-3003-4c88-9565-8b54e7de0def	1	Other	Other
+7ad36d91-cf21-40a5-bdc0-d3c46866a4e4	1	Other	Other
+7ad3a862-884c-410b-8cc5-1de829c23f87	1	Other	Other
+7ad3b151-c799-44e5-9d96-e52b580d9101	1	Other	Other
+7ad3b2e7-955f-4c95-8329-ac5afad1aa30	1	James	Other
+7ad3fa73-a535-4f12-8ce3-0b03dd1c4396	1	Other	Other
+7ad42235-53e5-4700-81ad-1a9b091b86db	1	Other	Other
+7ad43ec9-465f-4f3f-ae4b-700282ea73c1	1	Other	Other
+7ad49eec-b78b-48cd-905e-651938a89aa8	1	Other	Other
+7ad4aa74-6041-4d96-a01c-1e05967b0c23	1	Other	Other
+7ad4ae5a-da48-448e-a7f2-5d5e3a57f0f8	1	Other	Other
+7ad4bb24-a584-434f-a31c-e965b46c8dfc	1	Other	Other
+7ad4eb4c-c46d-4c10-9cd0-2b29b7b554e5	1	Other	Other
+7ad50342-99ec-4751-946f-621e5cb2fb7f	1	Other	Other
+7ad53667-8be6-4ce2-adb8-71b3ca9c48d1	1	Other	Other
+7ad5caec-84e7-41bb-bfc9-d967edc21f93	1	Other	Other
+7ad61785-cef0-44e3-8881-26321cf87163	1	Other	Other
+7ad65341-51ad-4821-a363-51f7004a51a4	1	Other	Other
+7ad6ce0d-3d2e-4838-8612-edaf4c806e6c	1	Other	Other
+7ad6ced9-4b0e-4027-abf9-884045328f85	1	Other	Other
+7ad6e431-54b3-43fc-a564-532f5ffd750b	1	Other	Other
+7ad71cd2-bcac-4e4d-b1ea-15415596f94c	1	Other	Other
+7ad71f9c-0e85-4257-b471-9d0e8dab1e76	1	Other	Other
+7ad72fa5-679d-4d40-99f3-ed32a1d3cc93	1	Other	Other
+7ad736a8-ed6d-49eb-b07e-272c2f9defec	1	Other	Other
+7ad747a6-1bae-4ed8-8985-bf5f87f89c34	1	Other	Other
+7ad7640a-2f64-4ca2-bfdf-cc94ebaaa798	1	Other	Other
+7ad76795-90d0-459d-af17-369210aa9aa2	1	Other	Other
+7ad7bcd0-80be-475f-8572-653dc7736f74	1	Other	Other
+7ad82eae-fa71-498d-82cf-5d6560d740e8	1	Other	Other
+7ad851cd-15b4-4703-9494-f2eea9893964	1	Other	Other
+7ad8673d-9e46-46a3-92d8-39979e79217a	1	\N	Other
+7ad89515-1998-44d6-b094-3163d41aa232	1	Other	Other
+7ad8b59d-0941-4587-9e35-2cd951469142	1	Other	Other
+7ad9528a-0763-4b1f-93e2-df252f679f25	1	Other	Other
+7ad960e4-aaf4-4d3e-93af-dfbddd6e5d21	1	Other	Other
+7ad97bc3-d1da-4670-b70c-57dd27762c32	1	Other	Other
+7ad97e7a-5997-4410-b297-a7d89a091670	1	Other	Other
+7ad9c06c-e558-4fae-930a-85657a676659	1	Other	Other
+7ad9e521-b300-4fb0-b4e8-bd83b44b48e1	1	Other	Other
+7ad9eb39-9d09-4599-9529-04a6f116faa8	1	Other	Other
+7ada0360-d38d-42c9-9557-c6873d87addd	1	Other	Other
+7ada508e-d694-4cc2-acc3-a110343881e7	1	Other	Other
+7ada5493-d6b2-4363-96ae-8ae144514b72	1	Other	Other
+7adabdeb-2cfc-43f3-894c-bd224faaf296	1	Other	Other
+7adad388-855e-4f66-838a-5a221afd19d1	1	Other	Other
+7adaeac1-ddad-4eff-a9c2-c89a35aea2fd	1	Other	Other
+7adb02d9-09d4-4625-9df2-20d97f5ef51e	1	Other	Other
+7adb094d-e6d2-48f4-b8ed-fcea8956b69b	1	Other	Other
+7adb151c-35ed-4fbc-91f5-7efd80558baa	1	Other	Other
+7adb1e37-2104-43da-bf3a-11e9ead2ecab	1	Other	Other
+7adbbbf5-7d9d-4533-9a8e-a0d96cbbeb79	1	Other	Other
+7adbd82b-85e3-4208-8023-742e47cd3871	1	Other	Other
+7adbe35c-3e32-11e8-8c66-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+7adc16b1-0b85-4bd3-876f-1684e91e14a7	1	Other	Other
+7adc5d7c-440e-4de7-bde2-3357811e98f2	1	Other	Other
+7adc814a-a554-49f2-8f9e-04fdb6d4a363	1	Other	Other
+7adc9e5e-631e-4a63-9cad-f3ae66a11234	1	Other	Other
+7add14fa-614f-4f7e-90f4-227e6a7993c8	1	Other	Other
+7add8226-77da-46e0-8446-a377863fbad8	1	Other	Other
+7ade0761-fcca-4093-be98-56c785d11a20	1	Other	Other
+7ade302e-8493-45ca-a472-928fe0e85fae	1	Other	Other
+7ade6858-540c-4b44-93a4-11afd507bdfb	1	Other	Other
+7ade6bcd-745d-44d5-afc6-693934ef42a9	1	Other	Other
+7adf02d6-59fb-4824-b36c-9ff37088695c	1	Other	Other
+7adf1868-af0b-4628-ac0d-443dddec536e	1	Other	Other
+7adf4174-d442-4ff2-953c-53fa505098bb	1	Other	Other
+7adfbf9e-5d1a-4dec-88f2-963ce3a31b98	1	Other	Other
+7ae04fa8-49c1-4f6b-a3b7-74291c5cd67c	1	Other	Other
+7ae052c3-7d97-417f-8346-75e3f92cd75c	1	Other	Other
+7ae0b0c3-3d8d-40b8-b956-0623b62a654e	1	Other	Other
+7ae0d6df-69da-42a8-bd23-4ffdbf198696	1	Other	Other
+7ae114f3-87ad-4a7a-af81-388cbd9a4cd8	1	Other	Other
+7ae118cc-1a9d-4352-bff9-08db5fb0c216	1	Other	Other
+7ae16586-790c-4805-8660-460f1fb7e08b	1	Other	Other
+7ae1779b-de04-4055-a3f9-80b44a6e866b	1	Other	Other
+7ae1976d-6a44-4634-b128-9ef64c0bbdd9	1	Other	Other
+7ae1a1a5-6fba-4304-a45e-d82b08166242	1	Other	Other
+7ae1aa62-5b91-49e2-921f-dcf78ec06d47	1	Other	Other
+7ae1f79f-3793-450d-97d9-4d56d798a997	1	Other	Other
+7ae20fe9-7316-4a7d-b07e-60d1ad420e84	1	Other	Other
+7ae25be1-e7e6-4271-83cb-616bb8f880df	1	Other	Other
+7ae2d031-1db3-4369-a0ed-9845d0eb5be0	1	\N	Other
+7ae303d6-29bf-466d-8747-15a7b33b5485	1	Other	Other
+7ae315e3-5536-4310-9934-513ab59eaa93	1	Other	Other
+7ae3c295-f23a-444e-8935-78036b39263f	1	Other	Other
+7ae3f966-68f0-4e83-b414-b49d3663c527	1	Other	Other
+7ae40c67-4804-415b-806e-9296dd757f3f	1	Other	Other
+7ae46a77-7cbc-4d0d-85ab-9b6abbc11ff0	1	Other	Other
+7ae470ea-c705-4529-8a88-97542e7f7fae	1	\N	Other
+7ae48d45-9425-4d63-89aa-306d8e4bbd96	1	Other	Other
+7ae4f158-b602-4974-9fdc-697ffe0810ac	1	Other	Other
+7ae5233b-a805-4a77-80cb-f8dd46551177	1	\N	Other
+7ae53f05-345a-44ce-8cde-6c27dba2c7d0	1	Other	Other
+7ae5595a-fba0-4cc9-b38b-5a8771139f8d	1	Other	Other
+7ae59d68-73ec-4a10-9ef0-afd0182bd3ed	1	Other	Other
+7ae5a958-899c-4ef4-8869-9d86aea3e647	1	Other	Other
+7ae61452-7f17-4727-8a2e-763095fe863d	1	Other	Other
+7ae660db-2786-43e8-8a57-072da3eec563	1	Other	Other
+7ae6af19-ad3d-4892-a5b5-e30b33553e5c	1	Other	Other
+7ae6c3ed-f3fb-4189-8c6e-6f2002572d47	1	Other	Other
+7ae6de2b-d55d-4800-afef-ad1d2e960b76	1	Other	Other
+7ae6f122-4dd0-4a81-b92e-1d0bfd52728d	1	Other	Other
+7ae74c1e-140b-4577-a3b7-1bee1b9520b9	1	Other	Other
+7ae76190-d83f-4092-9a62-2d0206caef09	1	Other	Other
+7ae77b71-3864-4be2-ad71-23ed00795114	1	Other	Other
+7ae78696-b2f2-41f5-908f-bc394192d521	1	Other	Other
+7ae79be4-d94c-4626-a7e4-81af3b3712e7	1	Other	Other
+7ae7ed76-f1e2-44a2-bc8e-c40a2b899c8d	1	Other	Other
+7ae81486-f9b0-4d29-9330-54cc1ed1edf2	1	Other	Other
+7ae826d4-c58d-4293-95ce-d767de717ace	1	Other	Other
+7ae89b9a-eefd-4fbf-80b0-4f1fbb35bd41	1	Other	Other
+7ae91fb3-134e-4808-afbc-34a6b8496694	1	Other	Other
+7ae96840-cfd4-4b56-be85-2fa96d7d58b7	1	Other	Other
+7ae9a5ed-c4d3-4b8b-ba79-fc6c6629307b	1	Other	Other
+7ae9b722-25c3-4c4c-8280-0b21ca75cc3f	1	Other	Other
+7ae9e52c-5ea3-4af2-8b81-aafc5ee649a1	1	Other	Other
+7aea03ed-0c5f-4ffe-9dbf-336a0c1869ca	1	Other	Other
+7aea49b1-c3f8-4081-87f4-7fc183a1aa2c	1	Other	Other
+7aea6e9f-324d-403a-aadb-13dbea66bfb8	1	Other	Other
+7aeaa4b6-3d04-48ec-b90d-b7fa60b792c0	1	Other	Other
+7aeb08c0-d412-4434-99b1-f1e793b4a055	1	Other	Other
+7aeb3b6a-bb85-41b9-ac83-7ca1bb4ee547	1	Other	Other
+7aeb4277-ecbc-43ee-95ea-a9200b4a7208	1	Other	Other
+7aeb4ed3-209e-4426-baea-8c027c230507	1	Other	Other
+7aeb5f44-38c4-48b7-aa9e-8c2410d1759e	1	Other	Other
+7aeb973f-e492-44d9-a7bf-fc33344d1648	1	Other	Other
+7aec503f-0d74-4f0c-95dd-0a70c2e7f3a4	1	Other	Other
+7aed07cb-42f6-4fa5-a891-77ec17b9e428	1	Other	Other
+7aed0c42-da41-4f28-aa7c-6d22ed3922c4	1	\N	Other
+7aed15d0-aecb-402a-bd83-ac11eb614f36	1	Other	Other
+7aed3a24-4490-49d0-a744-d7af79a69337	1	Other	Other
+7aed90eb-d17f-4580-92a2-f9a151fb60f6	1	Other	Other
+7aed91cf-c52a-4f06-93a1-725d00dec146	1	Other	Other
+7aed9a51-42ef-4e10-b4d0-8e0ddcbecfff	1	Other	Other
+7aedbd1a-63b3-4915-8970-efda38709e13	1	Other	Other
+7aedbdd5-41ee-41aa-a5d9-0c65903ef4e3	1	Other	Other
+7aedc3f9-85be-4c1e-a00d-e6cac43cdc2e	1	Other	Other
+7aee0a5d-d136-46ca-85ee-dd8ec63b587f	1	Other	Other
+7aee2573-891e-4f09-b74a-9b01cae63708	1	Other	Other
+7aee5aa2-c6db-45c8-9a97-666e4d772c88	1	Other	Other
+7aee816e-535d-4c8f-b6de-f1b9f3f9a578	1	Other	Other
+7aef1acc-5011-4156-97e0-8a58ec043a57	1	Other	Other
+7aef53b1-7be7-499e-ace7-81a8b128c1b7	1	Other	Other
+7aef5c16-6c0e-4216-8bd4-c78786519726	1	Other	Other
+7aef5e78-c740-414d-a9fb-64116074cc1c	1	Other	Other
+7aefe4aa-5b52-48b4-afca-abdbfd076460	1	Other	Other
+7aeffefd-6106-4520-a6aa-7e14071c39aa	1	James	Other
+7af0046e-5081-4883-be45-db848cffa87b	1	Other	Other
+7af0341c-f2cb-41ad-965b-097504ac0f9c	1	Other	Other
+7af058c9-8e95-4f23-94ae-3c30099fc236	1	Other	Other
+7af0792f-ca0f-4458-a3cc-d88b6f3f6bd8	1	Other	Other
+7af07bb6-8170-40da-9d6c-9849df764bfe	1	Other	Other
+7af08ffb-5e2e-4819-8b0b-4916322a7cc7	1	Other	Other
+7af0b3f8-7fa1-4ff9-a44d-ff3014f7312c	1	Other	Other
+7af0f2e4-2f1e-4f42-a490-c62f6ce4588c	1	\N	Other
+7af1029e-b411-411d-95e4-6be17eb8b76a	1	Other	Other
+7af1289a-474d-4b61-9c53-df3598037f4a	1	Other	Other
+7af13912-0e84-44aa-8a1c-d7601944e90c	1	Other	Other
+7af1df5e-d6e7-4266-b1e6-bfd2a62ef228	1	Other	Other
+7af2615f-3932-4267-a1af-1e763db40dd9	1	Other	Other
+7af2711d-83f8-4cbe-904f-e728e4f5ad6e	1	\N	Other
+7af2c0f8-be8a-4e5f-bd6f-3af2e5971e34	1	Other	Other
+7af2d408-9822-43e2-a833-85ae9b5f2775	1	Other	Other
+7af2d6a0-690c-4afb-b703-1f85da8731ec	1	Other	Other
+7af2daf8-fe28-42db-8f36-241c7520d130	1	Other	Other
+7af2dbde-f645-4aad-84db-407f1c17e2fd	1	Other	Other
+7af2e8d5-1684-44e6-9ca6-1d1311242031	1	Other	Other
+7af2ed41-e3dc-407d-9888-ffb7c999c0ef	1	Other	Other
+7af2f99d-e114-4ecc-8e9e-4687d697f802	1	\N	Other
+7af2fcbd-3498-4f2d-bc02-66ae3cdf2897	1	James	Other
+7af30518-8ff1-11e7-a698-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7af33c11-eec7-49bb-8ba0-36eac308fa07	1	Other	Other
+7af34702-b57c-11e7-b75e-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7af35319-1add-4268-acf7-ce172c3bb0fd	1	Other	Other
+7af3a649-0ad8-46ea-9a53-878c833a9871	1	Other	Other
+7af3ae13-68e6-4954-b246-2126e744fd93	1	Other	Other
+7af3c6d1-e71f-414e-a3e0-e7e821217abf	1	Other	Other
+7af401eb-71f4-41df-9dda-6a2ea9e38fc1	1	Other	Other
+7af50aa7-cd68-45dc-8e31-2d24729c6b69	1	\N	Other
+7af50e7b-49fd-4f80-9f8e-23357a7a290a	1	Other	Other
+7af57bfd-d70c-4341-8123-b7d60a9e8f7a	1	Other	Other
+7af58f6a-13d1-4316-ab9b-3398ab8d39ec	1	Other	Other
+7af61412-b340-4464-b893-cce0e255d975	1	\N	Other
+7af6bce9-64ec-4a98-9f91-4960c5332436	1	Other	Other
+7af70284-2938-4286-9f4b-fa273b691a6f	1	Other	Other
+7af73934-2d0c-4070-a06c-4e23463628be	1	Other	Other
+7af75fb4-3892-49d1-bed4-995b03341cf2	1	Other	Other
+7af7a941-aa08-4b68-8804-ce917f9ecae6	1	Other	Other
+7af880a0-a287-4647-b16d-84b5e205b85b	1	Other	Other
+7af89da6-a7f6-4da3-8d20-2c9786ddfcb9	1	Other	Other
+7af8a2e6-8a50-4305-8ab7-490bfa549469	1	Other	Other
+7af8b26b-6f50-4c24-83ed-a174003f5cb8	1	Other	Other
+7af8ceb7-24b2-4413-9521-1f27c2a825f2	1	Other	Other
+7af8f344-91ae-49fe-9c53-be28ba1e27a4	1	Other	Other
+7af8f46e-4736-4c19-907f-2196e1a66f8d	1	Other	Other
+7af8fff7-cec3-4960-babc-3cf1833076ba	1	Other	Other
+7af92380-096d-45f4-9573-21d5f05e51ff	1	Other	Other
+7af98e63-a085-492b-97f6-dcd2170ee02b	1	Other	Other
+7af99a24-ac92-493f-8835-20a548758088	1	Other	Other
+7af9b1e8-8ad4-482f-abee-c974481a3c80	1	Other	Other
+7afa4c72-c855-4b0a-a67f-791801ef5d9f	1	Other	Other
+7afa5e43-4985-4755-ac8b-067d792905a5	1	Other	Other
+7afa7527-6795-4581-91f8-37bc19427a6d	1	Other	Other
+7afa89a2-346b-4b29-a206-9d0c459e7f0a	1	Other	Other
+7afaaba6-ba7b-44cd-a33a-c66eec69f8ba	1	Other	Other
+7afac51d-de0f-410d-ab9a-e35ba9b35ed8	1	Other	Other
+7afaf078-9529-4559-ab31-68feb646e94a	1	Other	Other
+7afb391a-8b86-41a6-8dac-b6f2d250aacb	1	Other	Other
+7afb7814-ac37-4ac7-9064-97a0b6feb47d	1	Other	Other
+7afbde0c-da75-4cf5-aa92-b734da05075d	1	Other	Other
+7afc0c6c-a26b-4aba-9a13-63d4a31a4a75	1	\N	Other
+7afc18e0-4d5e-45f1-a688-9761f724dafb	1	Other	Other
+7afc45a5-c2d3-41c6-97b1-2d83e22e4396	1	Other	Other
+7afc92a6-b25d-4b53-b489-d7d91a68a8b9	1	Other	Other
+7afcb4fb-be0e-4092-9fe9-68c629fd698d	1	Other	Other
+7afcdc11-9da8-4a79-918c-9d053c0643bc	1	Other	Other
+7afce7eb-dcad-47c9-91fc-e647a5369002	1	Other	Other
+7afcf7a2-234e-4f10-9066-5f8a4ec542a5	1	Other	Other
+7afd093d-d131-4666-9657-701d4a7d3871	1	James	Other
+7afd767b-bfa1-4ccc-969c-2c04f226bb6d	1	Other	Other
+7afd8814-ba35-45ef-9296-3f2dda8fba14	1	Other	Other
+7afda38b-ab12-41da-aabb-886778ca641e	1	Other	Other
+7afdb855-b2d4-4870-a68e-5376b28be169	1	Other	Other
+7afe897e-c745-4d45-9e01-1e3c6bb9f397	1	Other	Other
+7afefb75-f7bd-4b0e-8a21-554c07eef177	1	Other	Other
+7aff2787-1f18-4532-ba17-c2a8ab9b1a6c	1	Other	Other
+7aff5ffa-9085-4c75-986d-ad8c3b5bba3e	1	Other	Other
+7aff8b74-0a33-4c59-9490-1198fcfecde0	1	Other	Other
+7aff9ef8-ce2f-46f0-9e34-1c62e8bd1b09	1	Other	Other
+7affcb43-d5f1-4284-bed9-e93f283dad5e	1	Other	Other
+7b0026c6-e9fa-4aac-8806-c65d84a5554b	1	Other	Other
+7b003904-2af0-4c13-a6d7-735cda21f23e	1	Other	Other
+7b004a9b-7bc2-4bb9-849d-597f0b6ef41e	1	Other	Other
+7b00734e-9bb4-410f-ab89-bb520de27408	1	Other	Other
+7b01affa-dd29-4273-8c46-d39811906a05	1	Other	Other
+7b01f996-909d-48ae-93b0-a3f220c221cd	1	James	Other
+7b01f9da-6db7-4bed-848f-dff21f27dba5	1	Other	Other
+7b0206bb-3c3b-4475-a842-de5355e6b1f9	1	Other	Other
+7b023e33-9068-4461-b97b-40ebcfa42138	1	Other	Other
+7b02eedc-1d5d-44c0-9e1e-07773175f049	1	James	Other
+7b0310a3-7ef4-49a0-935e-95e5f66d61b4	1	Other	Other
+7b03557d-520f-4913-9581-dd00c7d079ce	1	Other	Other
+7b03bc8f-76c4-411a-8373-51c443809295	1	Other	Other
+7b03e503-98cc-443e-8c91-d90b5270f8b9	1	Other	Other
+7b044337-002a-412e-8f7a-1f7fd72c5356	1	Other	Other
+7b0447ee-6e70-4146-9ed2-bdfcd05a3506	1	Other	Other
+7b049e60-17b3-4120-91a4-c03de7d0d38a	1	Other	Other
+7b04b1d2-68f2-4c93-b7bb-92c3cd0e3a5c	1	\N	Other
+7b05103c-f94c-4c9c-a300-2faf6aca50a6	1	Other	Other
+7b051e7c-3448-438d-81e0-7bb59cddb07f	1	Other	Other
+7b052901-9acb-4fbc-b70e-93d1284e0e46	1	James	Other
+7b0544f1-e070-439c-b03b-32656587a860	1	Other	Other
+7b055dca-6037-430e-a64b-bba39604fdf9	1	Other	Other
+7b059a47-0f29-406a-83dc-b86cdbec04cb	1	Other	Other
+7b05d7f3-cee2-4e5c-8af0-40b7fba25f68	1	Other	Other
+7b060cdd-a472-45fd-85d2-20f86da59be2	1	Other	Other
+7b066701-ca12-4105-9430-a516468a82ae	1	Other	Other
+7b06b888-15dd-4c5c-bbb9-9375ac984b50	1	Other	Other
+7b06b979-4d0e-4507-9faa-32b8b6e79ed1	1	Other	Other
+7b073fb4-fb7d-4ff0-970c-6054754685c9	1	Other	Other
+7b075185-9b73-4bf5-9909-0b2507fe5f15	1	Other	Other
+7b080070-68eb-412e-a86d-28ae6e4c3dde	1	Other	Other
+7b0806c9-a5cd-48a7-bbde-17ed7c0f8dab	1	Other	Other
+7b087ae1-48db-4cfc-b733-5f911faad543	1	Other	Other
+7b08bb73-32cc-4c7c-8714-bc3e52259d34	1	Other	Other
+7b08bc93-2fd9-4c7b-957c-cc8e852f8110	1	Other	Other
+7b08f4c5-7ceb-4902-aea2-7dd4a5ed262a	1	Other	Other
+7b090c7f-91d2-4724-8cfd-d2b2984352ad	1	\N	Other
+7b09513f-0009-48e8-b75a-cc1cff60225e	1	James	Other
+7b098e0b-9fd9-4f19-a721-9a9ad7023eb9	1	Other	Other
+7b0a13cd-a162-4922-b0fa-167d975293bb	1	Other	Other
+7b0a1909-d747-4064-9ede-9a84c8364b27	1	Other	Other
+7b0a37db-9957-4998-b1cf-4ebd80a529b1	1	Other	Other
+7b0a479d-9080-450c-928e-aa56645117b0	1	Other	Other
+7b0a6e7a-c36d-4358-8401-157d30ee11a7	1	Other	Other
+7b0a7d10-1cbc-4c3e-91fd-c2bea4eb543d	1	Other	Other
+7b0b34d7-de1f-40bd-9ac1-665720b347b4	1	Other	Other
+7b0b6209-26de-4ddb-82a1-4ac59f04071a	1	Other	Other
+7b0b6e1b-5288-455b-a8fb-4d337ed141bf	1	\N	Other
+7b0b7d90-83f8-49b2-8f54-faff81cd5766	1	Other	Other
+7b0b8961-1e4a-4e12-81c9-0d8a766298d9	1	Other	Other
+7b0b903e-c849-4af2-a2c9-28c6001187f7	1	Other	Other
+7b0ba080-7283-4299-90fa-05b3204e82e2	1	Other	Other
+7b0bad61-932b-4b03-9fa1-31a274642cdb	1	Other	Other
+7b0bbb04-9222-44e5-9e67-dc5a2881fab3	1	Other	Other
+7b0bbfb0-4727-4e98-ad40-1d10111995b5	1	Other	Other
+7b0bc2b8-a03a-4fca-8fd3-2422e37b007f	1	Other	Other
+7b0c4993-1285-4a8d-bf66-659f4ffe35c6	1	Other	Other
+7b0cc50c-c8cc-4212-9a75-4a24d371b61e	1	Other	Other
+7b0cca69-8437-4f95-8e95-09f92ef7e6c1	1	Other	Other
+7b0d1a32-c89d-4461-9774-b674a70f2caa	1	Other	Other
+7b0d2216-db37-4cff-a50b-1023c2171c1b	1	Other	Other
+7b0d4697-bb0e-4b3e-a152-900ff591930f	1	Other	Other
+7b0d4fa7-2b1b-4b7e-ba3e-502e63756bec	1	Other	Other
+7b0d5a7f-d589-48d8-baa5-29b472fdf1c3	1	Other	Other
+7b0d66fa-ee9c-4189-be3c-89988dd88d6d	1	Other	Other
+7b0db6e4-130f-4a91-aaed-b8202fe015ce	1	Other	Other
+7b0e217f-073d-4806-b99a-58103f91450f	1	Other	Other
+7b0e237d-c74a-41aa-b270-e23331e070de	1	Other	Other
+7b0e9798-bc91-4265-85f3-ad36fa9f1756	1	Other	Other
+7b0ef7cf-3ef5-4909-a72d-f6c36ec46282	1	Other	Other
+7b0f31b7-d947-4250-8734-953a820bfe78	1	Other	Other
+7b0f577b-b110-41e6-8342-561bce9bad7a	1	Other	Other
+7b0f60fc-4f5d-499c-9f96-186875a0af33	1	Other	Other
+7b0f8df7-2fd7-444d-869c-7b0c4354bbd2	1	Other	Other
+7b0f9841-c975-4e4e-a793-5fbe54a850c3	1	Other	Other
+7b0faf0e-788e-4f68-bd34-989a99849934	1	Other	Other
+7b0fd398-8b5e-4272-ae1d-29c3ad137ca1	1	Other	Other
+7b10234f-fd7b-4427-844b-e95befc86722	1	Other	Other
+7b10cded-9d79-447e-9472-0b9786afa38a	1	\N	Other
+7b10e0e0-f737-4799-a67c-8145eac77284	1	Other	Other
+7b1124f4-f73a-4b61-a575-a4411a52590b	1	Other	Other
+7b113eb7-1e02-4ff5-98e0-e9d7fbcaa981	1	Other	Other
+7b114403-b570-4339-a54c-6b5e70d96fde	1	Other	Other
+7b1158d8-c2f8-46f1-98cd-6dac5713be64	1	Other	Other
+7b11662c-cf2d-44b9-bd8a-52b978b658eb	1	Other	Other
+7b118a60-970c-4e15-912d-45f8c8cca2ac	1	Other	Other
+7b119a3b-56e7-4414-b2ee-565e5d697c36	1	Other	Other
+7b11a281-11bf-4b11-be50-d727d5468fa1	1	Other	Other
+7b11aff0-a8fc-474b-8ae5-16ca6ca3c85d	1	Other	Other
+7b11bc0f-8e5c-48f6-bc48-625748cbeac3	1	Other	Other
+7b11c61b-1979-48f7-8a05-03868c5385aa	1	Other	Other
+7b11d80d-815f-4949-a45c-7faddc5f3a55	1	Other	Other
+7b11d9c3-33c8-4a48-9fee-d4b03f58b3cb	1	Other	Other
+7b121654-1838-40c9-9c56-b80059645c72	1	Other	Other
+7b125ec0-bde3-4e96-bbbf-ec4ea5e47f5c	1	Other	Other
+7b127859-eac4-49cd-a0b1-47fd74b87f67	1	Other	Other
+7b12ff0c-ba44-4e31-ab89-3385ab863b05	1	Other	Other
+7b131225-9708-4bd4-9870-cbb437e1cd00	1	Other	Other
+7b1316c2-a949-4b6e-a543-c9e59007b4ee	1	Other	Other
+7b132754-2017-49b0-b56b-f994a06163c6	1	Other	Other
+7b132e68-ee48-4607-bba9-253bca032be1	1	Other	Other
+7b133313-99c3-4197-930c-c1152211f725	1	Other	Other
+7b1388b1-b79c-4121-b03c-f8f60a5d1dc5	1	Other	Other
+7b14079b-655a-4c07-90cb-799820148b85	1	\N	Other
+7b142db2-24f9-447a-be7a-26faead4b6f9	1	Other	Other
+7b148d4e-97ca-4adf-a7c9-72503d1651aa	1	Other	Other
+7b151090-334d-4cd5-97e0-684e05b11c70	1	Other	Other
+7b157dc2-8d1f-41f3-b91c-4242c0bea4c9	1	Other	Other
+7b15d5d3-3b96-402a-b0a5-66eb86d23cdd	1	Other	Other
+7b15de85-aedd-46fd-9943-5759689b12fa	1	Other	Other
+7b1653af-14d9-4b7c-add0-ccd812ee9ad9	1	Other	Other
+7b16699f-195f-4592-8170-3640e6874438	1	Other	Other
+7b16b192-1b6b-11e8-9b3d-fa163e8624cc	1	\N	Other
+7b16b19d-cf91-4328-a518-916ff314d524	1	Other	Other
+7b16d724-070c-4391-95fb-81924d2d6b83	1	Other	Other
+7b16f7f6-99eb-4767-b3fa-d0daa738f469	1	Other	Other
+7b174cf6-e62c-4ccc-a75c-17a4d2da5ff2	1	Other	Other
+7b179091-a00d-4b4b-95cd-03ba9895f96b	1	Other	Other
+7b17ed04-6c9b-4aed-97c4-4b0bd204ae50	1	Other	Other
+7b181b63-756d-4ac7-a783-9f756c8b3563	1	Other	Other
+7b1831c8-d33f-4921-98fc-dbec8ef709c3	1	Other	Other
+7b1839cb-cbf4-471d-b72c-379ba388f873	1	Other	Other
+7b1844a3-dbbd-417d-83f8-44f2bcacf2c5	1	Other	Other
+7b18830b-f3cb-4d81-91c3-f6f4c29acc37	1	James	Other
+7b18c7c8-5e82-43c4-8280-e4fc00093e2e	1	Other	Other
+7b191693-7d8d-4746-830d-9321cf60dc03	1	Other	Other
+7b1930ba-56d4-4744-b870-a6c1063c42e9	1	James	Other
+7b196c3f-5d7e-46bf-91fc-037dc500c17c	1	Other	Other
+7b199230-12bc-4bde-aa00-d04e83e659f2	1	Other	Other
+7b19ac93-cfb8-47d5-b054-200b08006bb3	1	Other	Other
+7b19c91a-3c2f-487a-a700-a4f6f203190e	1	Other	Other
+7b1a5c99-faa8-4e65-a8ff-b2cf9a8bed9b	1	Other	Other
+7b1a89e3-91da-420d-9a68-c674a1503f3b	1	Other	Other
+7b1ab1ff-ea27-4b28-a5de-46ee16b8741a	1	Other	Other
+7b1ad73a-d033-4c0b-b8b2-84882ba11855	1	Other	Other
+7b1b2e5f-582a-4dea-9ed0-9f38486a6485	1	Other	Other
+7b1bd515-fbd3-49c2-a367-9cbac4104747	1	Other	Other
+7b1c1123-e68a-4176-a61e-c0d092afdfab	1	Other	Other
+7b1c4632-3c76-4d09-952d-7438cd760833	1	Other	Other
+7b1c5e50-9912-4428-9872-372b438395dc	1	Other	Other
+7b1c6de9-bfb5-450b-ac7d-5ddd17de5714	1	Other	Other
+7b1d0ac7-9bc4-4797-a442-99ebc6e55d9c	1	Other	Other
+7b1d0d88-76ff-421a-bfd8-9a69ebf215be	1	\N	Other
+7b1d28aa-beb4-45ca-99b9-3b02642d9e1c	1	Other	Other
+7b1d54c5-8376-4460-8df7-158ec311f53b	1	Other	Other
+7b1d59f6-84d4-424b-8dfb-9ec7aaa50ad9	1	Other	Other
+7b1d622e-97a7-4817-a268-8c0de2f9d7ce	1	Other	Other
+7b1db119-5dc0-4cef-9899-50f0bd7f6396	1	Other	Other
+7b1dda2c-f36e-4f48-ae1c-29e421758945	1	Other	Other
+7b1df434-bdb0-4b11-a5a9-840a49202d7b	1	Other	Other
+7b1df80d-2111-41d0-8416-e08a4120ed79	1	Other	Other
+7b1e218c-caa7-4a23-bd39-ddd17e6ce901	1	Other	Other
+7b1e45bd-e4ab-499b-ab28-e1f9bb3303a0	1	Other	Other
+7b1ec60e-0f67-40c4-a09b-03b1b8d81a85	1	Other	Other
+7b1ed0fd-d239-474d-baa7-f84fc6d8912d	1	Other	Other
+7b1f1a36-fae9-4aaa-ab3e-d2249d4e0938	1	Other	Other
+7b1f38bf-9e2d-4109-b581-0c1be1e6633e	1	Other	Other
+7b1f4aad-0713-4c07-9386-f574293b02ca	1	Other	Other
+7b1f8436-065c-4cff-9f2d-f6a6c37108e5	1	Other	Other
+7b1fa968-e3ed-432e-a42a-c29750e6e030	1	Other	Other
+7b1fd80f-3c0f-467e-8a91-fd56cfc3bfe4	1	Other	Other
+7b20ba75-2186-4a8f-a832-df78b083a891	1	Other	Other
+7b20bb1c-aaaf-4585-9413-f89e0e64e2f9	1	Other	Other
+7b21168c-e4b9-4976-b34b-57ae2b88a987	1	\N	Other
+7b211eeb-bad6-4702-820d-a0b7f6d41ee3	1	Other	Other
+7b214524-254c-445d-89d3-654193939c13	1	Other	Other
+7b21793b-30c7-4f18-97e6-e31306a26a59	1	Other	Other
+7b217a59-aaa8-4b51-89b1-5c1e32f1f271	1	Other	Other
+7b217f17-3b36-43ee-af13-2717be3b80e2	1	Other	Other
+7b21951e-c73f-4971-9930-8ae0369273c2	1	Other	Other
+7b21be90-217b-470a-ae4a-4b99a9dd9f1d	1	Other	Other
+7b21ead2-e07c-4915-a0c4-5294da75176a	1	Other	Other
+7b223c4e-fbf3-4592-be0e-51d0b6e5529f	1	Other	Other
+7b22f1d2-3fcc-4779-8fac-90008307d666	1	Other	Other
+7b23171c-16c5-45fa-8cc9-47807770d142	1	Other	Other
+7b233eea-d830-4105-bd66-f7b0891b70a0	1	Other	Other
+7b23cd9e-965b-4ca9-a52c-58c59dc25dd3	1	Other	Other
+7b23d339-4f50-455a-9509-ca7d158e4099	1	Other	Other
+7b23e64b-ce6a-4e58-81cf-26990de5a82b	1	Other	Other
+7b23edc1-c59d-4b58-a08e-97b4e41219cc	1	Other	Other
+7b240ce6-edc1-4fbe-8973-85e3cc81d2ad	1	Other	Other
+7b242dcc-12cb-4ffc-9c76-bc422821d8d1	1	Other	Other
+7b2446eb-92b6-442b-ac1f-011210f7ce0b	1	Other	Other
+7b246ced-1de8-4b65-9a1b-fcb0d2fe7575	1	Other	Other
+7b246f7b-4a20-466f-b850-eea4a4c1aed3	1	Other	Other
+7b247cd5-22d4-4423-a975-bb707472dad3	1	Other	Other
+7b24ddb8-1f0c-471f-b62c-b9748254fbfb	1	Other	Other
+7b24ee94-ad91-4646-86d5-032440fe1d65	1	Other	Other
+7b253f61-e44e-484c-8a92-6a6b597114dc	1	Other	Other
+7b254e59-ca10-4fb7-95f0-7b783c097534	1	Other	Other
+7b258070-1eb2-4367-8ecb-75cb271d88f9	1	Other	Other
+7b25cdf3-4642-4b4d-98d3-576df396a0a7	1	Other	Other
+7b260958-0ff6-4e70-a614-1371f545a0f7	1	Other	Other
+7b261da1-54b3-4b66-ac2c-9856e1753179	1	Other	Other
+7b2667d1-2df0-477f-beed-cbdfb2c3457f	1	Other	Other
+7b2696d1-ba1e-4fae-aaf5-277c3e981761	1	Other	Other
+7b26d876-da66-4d9d-b2b5-aea5b037b0c5	1	Other	Other
+7b272917-8644-4743-a416-73d83e9cc187	1	Other	Other
+7b272be4-e33d-439c-bcb1-b8c1cb38e46f	1	Other	Other
+7b2738a9-223a-45d5-9df0-2fc23f4994bd	1	Other	Other
+7b273bab-9e31-4d26-b8a5-fc72e94b6ba1	1	Other	Other
+7b27652e-498e-4c99-8aa6-ecae4c22afe9	1	Other	Other
+7b277c6d-74cb-47e6-98f2-c6c40a6d5e3d	1	Other	Other
+7b27eba0-cfd8-45f0-8947-0b7fe684d897	1	Other	Other
+7b27f562-27ea-4b77-9637-69e74a616da6	1	Other	Other
+7b2828e0-b6ed-4385-8106-35f20b440799	1	\N	Other
+7b282f0d-5a10-4367-8900-bd0a0a69f633	1	Other	Other
+7b28496c-1346-49d3-9f73-ff80af2c8ad3	1	Other	Other
+7b286171-a533-492a-bcf8-57626930e1f1	1	Other	Other
+7b2878cc-0052-421f-9d74-cb69705c3aa4	1	Other	Other
+7b28953d-3e97-4fe2-bbc3-81126f096251	1	Other	Other
+7b28ae89-1fc7-4372-a333-127213a52371	1	Other	Other
+7b291adb-de12-40b9-aed8-be6de530f785	1	Other	Other
+7b295d60-41e6-4ffc-a6ba-53767df6a41c	1	Other	Other
+7b297026-3231-40d3-bc68-77148509a704	1	Other	Other
+7b29a88a-1fb7-48e9-9c14-bb7d78a1350e	1	Other	Other
+7b29fec9-a290-47fd-8545-fcdea5562fff	1	Other	Other
+7b2aa63a-2d73-4e3d-b4ae-5d6255966395	1	Other	Other
+7b2aaa9c-022a-4142-a9bc-ff492451ed45	1	Other	Other
+7b2ac93c-5f77-4253-b813-123043b51849	1	Other	Other
+7b2adff3-4a9c-48e2-9218-8e43a1f9d42f	1	Other	Other
+7b2b150d-8d51-4fb4-905b-12aa5d58c25d	1	Other	Other
+7b2b29d5-d3dc-4f36-8abb-4cde5b131948	1	Other	Other
+7b2b41e9-31f0-48a4-b605-2b4f76830185	1	Other	Other
+7b2b7fec-04e4-4d8b-a106-d11fe78819dc	1	Other	Other
+7b2b9970-7bab-4c1e-b87e-b7877b4caff0	1	James	Other
+7b2bd2e4-cdb6-4042-9191-b482021d348a	1	Other	Other
+7b2c7a31-6ddc-4700-af39-e4d35f4e9cf8	1	Other	Other
+7b2d1363-f46d-4dbb-80d5-6f3f28d8d8be	1	Other	Other
+7b2d2876-ef91-403a-a428-3a9fe50ec8ae	1	Other	Other
+7b2d739b-5b2a-4a80-b513-ed48a76252b8	1	Other	Other
+7b2d9427-6524-42e8-88be-5fa09ecb95ad	1	Other	Other
+7b2db293-e447-4a2a-aced-6a1af20e5ad2	1	Other	Other
+7b2dd68f-54aa-478b-835a-a8f8c13fa5ee	1	Other	Other
+7b2dd9b7-cc59-401a-b321-d830efffa7d8	1	Other	Other
+7b2e33e7-7fc1-449e-8fb4-d01a0cf281a4	1	Other	Other
+7b2e3b45-0d60-431d-8ec3-76e499eaefca	1	Other	Other
+7b2e4a9f-e3da-4d07-afd2-8a3cf03d6301	1	Other	Other
+7b2f019a-c60e-4863-91ac-f62a39a78bbf	1	Other	Other
+7b2f2cba-0851-43e3-b9a0-ca6286f0d18a	1	Other	Other
+7b2f2d20-1438-4254-b0f8-9ced6834ec47	1	Other	Other
+7b2fc22e-2ce7-4c21-8ca5-804698c1e1b8	1	Other	Other
+7b2fd605-39f9-497e-8a79-0f05a8465dea	1	Other	Other
+7b301c01-052e-40b8-b627-bb7ff3bfc3e6	1	Other	Other
+7b3041fc-9a74-4851-b481-bdd6d1979602	1	Other	Other
+7b307ff6-5876-4d5c-84c7-f5c91d8accb3	1	Other	Other
+7b30a2d0-b27b-44ba-b6ca-0b3f03457b00	1	Other	Other
+7b30c5ce-9085-4db3-88d0-8a1d23137830	1	Other	Other
+7b315c60-a7c5-4704-8dcd-d3cee87acbee	1	Other	Other
+7b3183ff-91ad-46e4-bc87-932f38620057	1	Other	Other
+7b318d60-5f33-4be2-a4e8-41ff94902686	1	Other	Other
+7b321218-9ebf-40d0-9264-6e65b4279884	1	Other	Other
+7b333f53-fda0-4906-b676-ac9006862667	1	Other	Other
+7b335838-64a9-466d-9b9c-10c0c037f4b3	1	Other	Other
+7b3374e6-0f8a-4e49-8103-7bad8e373c25	1	Other	Other
+7b33ccd1-fcb9-4577-aebd-61b88d62af02	1	Other	Other
+7b345993-dba2-44a7-9783-3da0b637c4c0	1	Other	Other
+7b346b4c-966c-4e26-91f9-5862313e4a44	1	Other	Other
+7b348081-1cc7-4471-9da3-a6bbf55ed6b1	1	Other	Other
+7b3492dc-1d5d-4250-bb7b-39835b70a033	1	Other	Other
+7b34a2af-9a74-4001-89f8-bb0361df8a09	1	\N	Other
+7b34caa9-f407-46b6-8f0c-b40dccae3224	1	Other	Other
+7b34d219-2d13-498f-9c00-797d519433c3	1	\N	Other
+7b34dc8a-94fb-46a3-a798-d056cdfa5d2d	1	Other	Other
+7b350ae3-063e-4682-aa85-331c0f6339c6	1	Other	Other
+7b3516e7-4018-4625-ad64-ac2d8496cba2	1	Other	Other
+7b3535b8-abbb-4712-bb30-c4e0b072eb17	1	Other	Other
+7b3538a1-880f-479f-9e92-30ed689e8f48	1	Other	Other
+7b355529-eb8d-409b-bea1-8572bb8aebc3	1	Other	Other
+7b35582a-8dd3-47f7-9f86-b1cc62f7205a	1	Other	Other
+7b3558ce-0297-46cb-a452-ff14d4387525	1	Other	Other
+7b35793d-5c00-4cb3-aaa8-0edecd7f585c	1	Other	Other
+7b35c49b-4e20-4fa6-a142-97c5ce89a314	1	Other	Other
+7b360410-c192-42aa-b13c-3bf87696ea7a	1	Other	Other
+7b36751b-2fcb-4707-864f-4b12c2a767a4	1	Other	Other
+7b36a1e8-4eb2-43ba-880f-7e6d96f633a0	1	Other	Other
+7b36a4e0-3ad1-4a93-b5dd-32c3abf1eb93	1	Other	Other
+7b36b1ff-523f-4626-b088-33da8d8db14a	1	Other	Other
+7b3715d3-f85b-4cf1-b4db-334a4f1029ce	1	Other	Other
+7b373527-b544-4470-9ea1-fd5fe42ac7d3	1	Other	Other
+7b38716e-e0e1-4882-b7ce-cefcf4af9e0b	1	Other	Other
+7b3887fd-88e1-45dc-ba83-21ed07e73b60	1	Other	Other
+7b388e1c-1961-470a-b03b-2a6827e91451	1	Other	Other
+7b38ec44-8e8f-4662-8bd6-20bcaba4b368	1	Other	Other
+7b38efe6-5d0e-487b-a6dc-6c41993aebb5	1	Other	Other
+7b38f250-65ac-43ac-8fde-85bb9f5174db	1	Other	Other
+7b3907ea-1a0c-4f27-a8b1-14b563251d5c	1	Other	Other
+7b393cd8-e8f4-450e-addd-97c4aa75a8a4	1	Other	Other
+7b393dd0-1837-4cee-875a-fbaeff57d371	1	Other	Other
+7b395d34-616c-496b-bfe5-d4705bac5fa1	1	Other	Other
+7b39de51-7373-4fa7-83ec-ccfa67e17cc4	1	Other	Other
+7b39e31a-ec9a-477a-a3b5-aeba47aebe37	1	\N	Other
+7b3a2e2b-ef2b-4670-8c02-256927f32f53	1	Other	Other
+7b3a5df0-e909-4007-a5a7-599066967c57	1	\N	Other
+7b3adafd-421d-4058-a662-b00878788f3d	1	Other	Other
+7b3af189-fe44-4f19-9ef6-efa5862f1ba6	1	Other	Other
+7b3b052a-2776-471a-8b9e-939925c57b07	1	Other	Other
+7b3b20c8-2ede-41b0-bb0f-0ee1f5c82d8c	1	Other	Other
+7b3b3194-e159-48d1-8715-bf3406a6c153	1	Other	Other
+7b3b706a-8cfd-4a73-a91c-0e2977d8218c	1	Other	Other
+7b3b716c-837a-4bb9-82a7-ddbe08fd6f97	1	Other	Other
+7b3bb431-49ab-40c9-b5b0-02aa1eecae35	1	James	Other
+7b3cd07b-8077-4f6d-b4de-8c453c7dbf33	1	Other	Other
+7b3d020c-82a6-43aa-9879-b4ac897899ab	1	Other	Other
+7b3da74b-40c3-439d-83d7-dab414950396	1	Other	Other
+7b3e437a-ca42-431d-945b-50799b38f414	1	Other	Other
+7b3e79e4-7e13-4c5b-938f-9b48cc1e5287	1	Other	Other
+7b3e974c-5130-4e28-a271-2a57fa53ff79	1	\N	Other
+7b3ea30c-23c1-4f8b-b79d-69d292564a30	1	Other	Other
+7b3eb08f-36da-40f7-a950-24583b6882d8	1	Other	Other
+7b3ec61a-41f7-49d7-be84-711d8eb9e48f	1	Other	Other
+7b3f028c-0164-4916-a1bd-ed41d4041f65	1	Other	Other
+7b3f27f8-cc8d-4201-9cd6-85c5d8347c24	1	Other	Other
+7b3f2f52-1045-4f3c-bff5-8008ac73e6e3	1	Other	Other
+7b3f7955-5c7d-44ad-8307-1adc699ec54a	1	Other	Other
+7b3f988f-3915-4007-b8d8-7ff6f41e0278	1	Other	Other
+7b3fab94-9fd0-4c1f-b486-7a6d517a9603	1	Other	Other
+7b3fad55-9135-4457-bbf9-98a77ff846dc	1	Other	Other
+7b3fe2e5-66ec-4ef3-a0ab-866e4313c300	1	Other	Other
+7b3fec56-64f4-436a-9790-3042e620f4a8	1	Other	Other
+7b401b42-71d6-4a05-85c5-845e4e3f677a	1	\N	Other
+7b4038ae-29b7-4bcf-8bb8-201df0e594f3	1	Other	Other
+7b40ab0d-3879-4fd2-891f-ad2441ec8357	1	Other	Other
+7b40e015-54c8-45fc-82d9-34c7f77f78a1	1	Other	Other
+7b415331-9527-41ff-94ff-d4299cc731ab	1	Other	Other
+7b418902-3e1e-4b0e-bed6-586d74ea2d67	1	Other	Other
+7b41a503-7003-44eb-b403-7f259e50a272	1	Other	Other
+7b4209e8-9a56-49d3-b749-b8681a620729	1	Other	Other
+7b4242ad-95b8-4a2b-b32c-c0a3f67e04a4	1	\N	Other
+7b427058-a819-4ffc-8e2c-f9289814c826	1	Other	Other
+7b42eefd-9490-4ca3-baca-699faf594d98	1	Other	Other
+7b431f66-c4b6-485f-b289-e32fa396e279	1	Other	Other
+7b43acfb-8dee-4d2d-8a45-9b76d008e403	1	Other	Other
+7b43bde6-b3df-48c5-bfae-4ca7c0fefbcc	1	Other	Other
+7b43c25a-3bad-492a-9e21-b20be30d70c0	1	Other	Other
+7b43c3d2-58d3-48a6-8dcf-000d3a12a8a7	1	Other	Other
+7b43c534-79e4-4297-935d-5db0dde44bef	1	Other	Other
+7b43c71b-72f0-447f-9029-f9618cf6b010	1	Other	Other
+7b441c00-0258-4134-b955-f14fe5ce27ff	1	Other	Other
+7b445030-e83e-404e-8b46-721aa9ab652b	1	Other	Other
+7b446c9d-5d3e-4768-aa42-536635b71bb0	1	Other	Other
+7b447d39-c763-46cf-a9ce-00649e9e1d57	1	Other	Other
+7b44ab73-1732-48f4-82e3-85f36d859ccf	1	Other	Other
+7b44ca5e-3ffb-4d55-96e6-79347c79299e	1	Other	Other
+7b4509dd-1fa4-4461-a7bb-1602229cacbf	1	Other	Other
+7b45176d-2a51-494a-b15a-98151954e2cf	1	\N	Other
+7b45779f-f1f5-478a-baa6-4b82e0109dc5	1	Other	Other
+7b4595d9-e2d8-41a2-a3b7-a7b934b16f81	1	Other	Other
+7b4599e0-e369-48d6-9fa1-bcaae52eba85	1	James	Other
+7b459dfd-b15d-4193-8d82-7727c6245a70	1	Other	Other
+7b462f1a-b9cc-4c8b-858d-a74f522222b9	1	Other	Other
+7b464e6e-94a6-44a3-ad93-65ebd94a535b	1	Other	Other
+7b465a96-396b-4369-8509-bfe3b54e3972	1	Other	Other
+7b468859-a659-4fb0-ac09-1c8a571bc907	1	Other	Other
+7b46d250-2940-4ba7-aba2-0db6d2905cc3	1	Other	Other
+7b46d667-ecce-4372-bffb-fbb1da42020d	1	Other	Other
+7b46e62b-0779-4c6f-92f8-04f2a7ae54c4	1	Other	Other
+7b474e88-8025-4abd-bb22-d9050dc99e8e	1	\N	Other
+7b479e01-41c7-4769-8ad1-cb6cbae5c090	1	Other	Other
+7b47a092-2868-43a8-8d64-1fb9d84b2726	1	Other	Other
+7b47e9b9-9bda-4228-816f-ccc0001acf8e	1	Other	Other
+7b487b57-0d5f-42b0-b198-d32e24d28ef2	1	\N	Other
+7b48e572-1b29-4e20-85cd-00ff7a2e1b57	1	Other	Other
+7b493231-b5c8-4b70-b1d3-7e62c75ba0fa	1	Other	Other
+7b493e9e-e8da-4363-afba-13891242a551	1	Other	Other
+7b494cee-050a-47c6-be3c-2b817ca8dc21	1	\N	Other
+7b494f9e-789a-41d5-86d1-5fbb0ef908f4	1	Other	Other
+7b496a66-f219-498a-bd19-f70785108f3f	1	Other	Other
+7b497ca1-b030-4690-a035-279429624b70	1	Other	Other
+7b49bf48-9601-4ecc-b888-5166b2cc7892	1	Other	Other
+7b49c4fe-1edb-49d8-aa26-3d9c15d3a89e	1	Other	Other
+7b49c5d8-c13c-4e4e-b0a2-962900628f35	1	Other	Other
+7b4a7837-f325-42f5-99aa-decd2b8e8756	1	Other	Other
+7b4a890c-b81c-41f2-9e75-b4b593615908	1	Other	Other
+7b4a9a4f-9a66-4484-af60-7b8848d8e999	1	Other	Other
+7b4aa1d1-ea0a-4585-8916-cfcc2fe681e8	1	Other	Other
+7b4ab4d3-b0dc-4f55-8e3a-ceedad97a18d	1	Other	Other
+7b4acc70-99b4-4695-aee9-88358ce35093	1	Other	Other
+7b4af3d9-26d8-450d-ae42-5231978e3c36	1	Other	Other
+7b4b04bb-4cc5-445f-8bcf-55333110d15d	1	\N	Other
+7b4b2fea-0a1e-4ab7-8fca-0dab1302cd01	1	Other	Other
+7b4b31c3-dde5-4b3f-89e2-cced66eaf024	1	Other	Other
+7b4b71bc-3f23-485d-86d5-f16ff1525d54	1	Other	Other
+7b4ba33e-f504-4a6f-b655-feb25477768b	1	Other	Other
+7b4be1c3-7de2-4624-80d5-22d8d9754fc0	1	Other	Other
+7b4bf4dc-7d4e-4e70-acd1-001cb97babdf	1	Other	Other
+7b4c9d1a-790c-4d8f-abb3-b59904d72fcc	1	Other	Other
+7b4ca012-981b-455a-b933-8ef79e169eb6	1	Other	Other
+7b4cb793-5eef-4fe3-8e44-190db09f979b	1	Other	Other
+7b4cdb0b-9ebe-40d9-b3f1-c801544c0d0c	1	Other	Other
+7b4cdfee-b78d-4a5f-8f3d-fd8d0d932aad	1	Other	Other
+7b4d2cf3-957e-4f14-a2be-1eba1fd37e08	1	James	Other
+7b4d3cee-b5f6-405e-9b95-90b557f7462b	1	Other	Other
+7b4d43dd-e712-43dd-891a-f2fe4f858fcf	1	Other	Other
+7b4d9574-bf6e-4795-9f6c-0beab5675916	1	Other	Other
+7b4e14ed-764b-4d4f-8094-b39d56979c53	1	\N	Other
+7b4e1c8a-03ed-4084-b4d2-f7d00f25e895	1	Other	Other
+7b4e6d7a-35a4-4dc2-9d99-144ad8b2aef5	1	Other	Other
+7b4e8648-068e-46cd-88fc-527a24217481	1	Other	Other
+7b4e947c-19c7-48e0-bc52-3ef7dee2a67f	1	Other	Other
+7b4ef068-6da6-48a9-abe8-07bb784cf957	1	Other	Other
+7b4f2f65-d6b2-4b61-b453-bd5ff8e2e10b	1	Other	Other
+7b4ffa7e-eacf-4b6d-b968-f53c4123076a	1	Other	Other
+7b50756e-0634-46d6-bd5f-e20047db12e4	1	Other	Other
+7b5085fc-1273-4ec0-aedd-3f5b7370c86d	1	Other	Other
+7b50e968-a171-4163-8236-a600ca63195f	1	James	Other
+7b50f0fb-73b6-48c4-b340-480cd9104091	1	Other	Other
+7b5105fa-e2cc-4ebe-be82-140cb1f02951	1	Other	Other
+7b51185b-03eb-4b3f-abe0-2c3265e5dc72	1	Other	Other
+7b5120b5-951c-41d8-a99b-69b2da2385ce	1	Other	Other
+7b513bfd-7332-4628-ad85-6bb367bb498b	1	Other	Other
+7b51a1e4-b96c-4904-b56d-0cd3ace1d82b	1	\N	Other
+7b51c002-251f-47ce-8d2c-ee89a80261e5	1	Other	Other
+7b51cd2c-ae38-444a-a5c1-4e0c18c7d5f3	1	Other	Other
+7b51edfc-da83-459d-986c-654dd4feedba	1	Other	Other
+7b5226a7-b872-43db-8fc4-2aad9a17178b	1	\N	Other
+7b5255af-53ad-4f80-806a-295201ecb4dd	1	Other	Other
+7b525671-e9b7-4b6b-a8b5-96fe4390e849	1	Other	Other
+7b527551-0686-4165-995b-8d1c0e2006ec	1	Other	Other
+7b52843c-83f9-4ecf-8ec9-b17d01ba1d8f	1	Other	Other
+7b52b1b1-888a-4b95-bfb6-6c3949df676b	1	Other	Other
+7b52ea59-9207-4621-8750-c1b9c6c70de1	1	James	Other
+7b52ed0c-9881-4675-bd01-89eac18c98f2	1	Other	Other
+7b5332ef-0124-48f6-8960-e07cfe061965	1	Other	Other
+7b54dbad-52df-46b2-bb15-aeb6f66b3c56	1	Other	Other
+7b5595e7-dfa0-44e0-b5f3-9f130e8153a3	1	Other	Other
+7b56564a-98bb-459a-98ca-423cd41d0b87	1	Other	Other
+7b56d519-7d08-4fd5-8230-c73f3a9ca91a	1	\N	Other
+7b57267a-041d-48da-8dff-1b4a4a5876e6	1	Other	Other
+7b575f04-c992-419f-9cd6-2a2c4027035c	1	Other	Other
+7b576183-27dc-4a20-aad6-ac1f56acff95	1	Other	Other
+7b580189-5ee9-49c9-84c4-987e158f554e	1	Other	Other
+7b583727-6dc7-4c3d-9210-871feab7f246	1	Other	Other
+7b58f3e4-2301-43c8-99f8-683d9b24833b	1	Other	Other
+7b590f5a-2225-4406-a434-34f2d2dc163a	1	Other	Other
+7b595ea3-1cec-4493-849b-7b220bc9294e	1	Other	Other
+7b5978f7-4644-46aa-9659-bc179655a754	1	Other	Other
+7b59a664-9ec7-49e8-9fa2-0e85a8ed9605	1	Other	Other
+7b59dc98-c628-4ae3-bae8-0385087395bf	1	Other	Other
+7b5a2713-3a10-482e-964c-78f962d17d72	1	Other	Other
+7b5a408c-3d06-4e1a-8257-d6e531f2191e	1	Other	Other
+7b5a71b5-e6f2-414d-9440-d84b560dcfb8	1	Other	Other
+7b5a987b-20c5-4e9d-8b06-721f365c25b6	1	Other	Other
+7b5aa04b-5292-4661-a3d4-9ba140130496	1	Other	Other
+7b5ab014-ffd7-4110-aadf-4a273d9402fe	1	Other	Other
+7b5ab3ae-fd4b-4cba-9481-9293fa72ba55	1	Other	Other
+7b5acf5b-b7b8-431e-b662-383d02b80deb	1	\N	Other
+7b5afb38-564b-4d90-b439-72a4bffb9227	1	Other	Other
+7b5b189f-8fea-40b6-bbc2-853c0bb95274	1	\N	Other
+7b5b6040-f295-431c-96b7-7e47194636a4	1	Other	Other
+7b5b8db9-c0d2-42b3-92e4-9d4a12df814a	1	Other	Other
+7b5ba49c-0b3e-11e8-8bda-fa163e8624cc	1	Other	Other
+7b5bf819-2fff-4e77-8162-d26b9c0d7dba	1	Other	Other
+7b5c297d-6a9c-4beb-a165-5a129b7e007c	1	Other	Other
+7b5c7774-3501-404a-bf95-3abd686ab520	1	Other	Other
+7b5ca550-2e8f-49f0-8eeb-3b25366be5e7	1	Other	Other
+7b5ceff0-3926-475b-a030-f285f8b4f522	1	\N	Other
+7b5cf293-af73-4f40-8006-553049cb9feb	1	Other	Other
+7b5d0f8e-f224-4435-9250-a8ee1728fc54	1	Other	Other
+7b5d57f2-b554-4c33-ba1e-82b27bbb626c	1	Other	Other
+7b5d7caa-4142-4cc5-8f5b-5773c3c1aca7	1	Other	Other
+7b5d7ced-973b-4bc5-a60b-8ca2d820e836	1	\N	Other
+7b5db518-bbeb-40cf-ba1c-21cdf98d5a03	1	Other	Other
+7b5dfc2d-32d9-4783-b1a9-3bfe0008f513	1	Other	Other
+7b5e29dc-cf09-4147-94be-83df64f12616	1	Other	Other
+7b5e35df-4085-451c-a9fc-6bc63c22d1ad	1	Other	Other
+7b5e418f-674f-4ea2-9e48-53d165017c8e	1	Other	Other
+7b5e99c3-31be-44a5-8532-e79f11d43a18	1	Other	Other
+7b5ea3d9-ab4e-4b63-b49a-9a16a4f552e5	1	Other	Other
+7b5f13c9-0d46-49bb-86f9-14a9bc6baa2b	1	Other	Other
+7b5f2ef6-616b-4176-bd7f-45421142501c	1	Other	Other
+7b5f4f6f-d069-491a-a835-864bf832a341	1	Other	Other
+7b5f5cfa-0259-4c6f-83ea-8b1d0b0d4ad1	1	Other	Other
+7b5f962a-77af-4a5f-9ef5-58af9c90f2f8	1	Other	Other
+7b5f970c-1fd5-450c-b478-416b23f3cf8e	1	Other	Other
+7b601aa6-63fa-4459-8c9d-1c34533ebc23	1	Other	Other
+7b607662-f5f4-4b4f-83c8-29c904b8e7b7	1	Other	Other
+7b607754-cce9-4c09-9da6-9d1bd63a2bb8	1	Other	Other
+7b60b615-affb-4ad9-94cb-8e99f038c863	1	Other	Other
+7b60ebe1-d7dd-4271-b90f-cb4cb4f57146	1	Other	Other
+7b6123c9-a7d8-461b-af24-3c8f93b0956a	1	Other	Other
+7b614926-e509-4bb2-b2e0-f7be0866d983	1	Other	Other
+7b616227-6bc6-42a4-b286-17c964a5bade	1	Other	Other
+7b6166cd-6878-48e7-bc8a-d7a3dacdd262	1	Other	Other
+7b6168f0-1542-496c-9c15-167227ac49cf	1	Other	Other
+7b618981-a274-4918-ba36-0d58fce34faf	1	Other	Other
+7b6279a9-a1de-4fa6-aa89-09b2ab661387	1	Other	Other
+7b629aa2-c5f5-4c77-bd0f-fbb875925e31	1	Other	Other
+7b62d42c-3a3f-42ae-b99e-8bf23e163557	1	\N	Other
+7b632a86-cc75-4a60-838e-3c668b15d242	1	Other	Other
+7b633702-6f16-4f8a-8a94-c98dc83a6bc1	1	Other	Other
+7b6357d1-e01e-4307-bd3f-56188ee677e4	1	Other	Other
+7b63ab3c-f31b-4168-8203-828b627753ae	1	Other	Other
+7b63f301-ee81-41c3-8e38-e1fff694ba99	1	Other	Other
+7b6484e1-6b6f-41cb-884e-37c3dc6e3b96	1	Other	Other
+7b648bcc-f3bc-4256-8bb0-3518047bebff	1	Other	Other
+7b64b008-f735-4475-8408-21a4331638b3	1	Other	Other
+7b64bb57-637d-4948-afb0-380d4d175f07	1	Other	Other
+7b6511fe-3afe-4196-901c-948784bb4479	1	Other	Other
+7b6532c6-55c0-4c62-b556-c2a4f25ecd2c	1	Other	Other
+7b654b47-5ac5-49d5-bb18-748a773d216b	1	Other	Other
+7b654e21-1ff5-4827-a776-428aad50dd2a	1	Other	Other
+7b657196-a11c-4e9c-a1d2-c84a601b7e0e	1	\N	Other
+7b65760e-fa7b-43ad-9b9c-c898ea539801	1	Other	Other
+7b65848b-7bb1-4923-87f0-b7da28c73410	1	Other	Other
+7b6591e0-a48b-4c01-98fd-bb92ba83efc0	1	James	Other
+7b65a33e-a872-4ea7-87a5-d03c7632b39f	1	Other	Other
+7b660ce4-c7cd-4117-9e50-550223fbd1e1	1	Other	Other
+7b6619f1-4348-4e21-b49d-4fea0494e61e	1	Other	Other
+7b662431-55de-44ae-a1b2-e6a524df342e	1	Other	Other
+7b665872-1c14-40c3-a78a-da7892a9dc75	1	Other	Other
+7b666b81-e8aa-428d-89c4-2449f2723fc7	1	Other	Other
+7b666ead-8d49-4e62-8ead-a4ec9a841294	1	Other	Other
+7b667696-1754-46c1-a15c-a51e5fc2103d	1	Other	Other
+7b668e14-8fc9-4914-b2ef-e5b845dec79d	1	Other	Other
+7b66b01f-7021-464a-bb2d-5b7ab93b7270	1	\N	Other
+7b66b287-faa6-4b11-a820-01d6cf38d2bd	1	Other	Other
+7b66c016-57b6-466c-a00c-5c6385bc19c1	1	Other	Other
+7b66d332-ee44-46d5-a2dd-d05d28879a21	1	\N	Other
+7b66fffd-04a4-49d8-9876-096bfdf96252	1	Other	Other
+7b67b540-d79d-493e-8263-f8986ff10bf0	1	Other	Other
+7b67d136-818c-438f-a6bc-6a896662aaf3	1	Other	Other
+7b67ffdb-7831-4c45-8c7e-92b94408cce8	1	Other	Other
+7b68409e-194c-4d9e-80c7-0e97c2ab1b9a	1	Other	Other
+7b686848-95a4-4447-a6e9-c6ea6aa7c9ec	1	Other	Other
+7b686877-e88e-4fd4-ad2a-8844b210cd54	1	Other	Other
+7b6881c7-d51c-4c72-803b-6edddd594d94	1	Other	Other
+7b689390-1b6b-11e8-869b-fa163e8624cc	1	\N	Other
+7b68b725-7c85-45ed-86c7-9a0cc7838c34	1	Other	Other
+7b68bbb0-af74-4090-b16f-a6514ab01d8e	1	Other	Other
+7b68e179-3bb1-4005-bfee-9d813d161df0	1	Other	Other
+7b68e6e9-71b4-45bd-9fae-ae420a663fa7	1	Other	Other
+7b68e9c4-6344-400e-bd4f-8610f188d4bc	1	Other	Other
+7b69345e-c64d-4ea6-91a2-78bd3e6c55b9	1	Other	Other
+7b69419d-a5fd-427d-8c63-97bcb8f75aa4	1	\N	Other
+7b695975-41f0-4f53-9158-d375d5053d7e	1	Other	Other
+7b6984cf-c0f1-4f61-903e-1371f6b6c145	1	Other	Other
+7b69a171-966a-453e-9a2b-8bf1331d70fc	1	Other	Other
+7b69f441-8a40-409b-a8de-5efaba6d9c8e	1	Other	Other
+7b6a01e5-0858-4659-9b6d-90310ae0f9db	1	Other	Other
+7b6a498c-5d3b-4bba-a446-24284454abcc	1	Other	Other
+7b6a62f4-f371-45ef-9cbf-2694a55513e1	1	Other	Other
+7b6a6a14-b418-467c-85a5-5092aa5a2bcf	1	Other	Other
+7b6a7866-a184-44f5-9487-8d75e6a165ea	1	Other	Other
+7b6a8019-38d2-4404-86c7-ba20ea488e4f	1	Other	Other
+7b6a8e0b-7e9e-43d3-85c1-045bdabd1d34	1	Other	Other
+7b6af909-c1ca-4992-bb02-1ef10fe5cbfc	1	Other	Other
+7b6b0221-7d71-4ea7-aeab-8dba064bdf59	1	Other	Other
+7b6b155f-84e8-4ef1-a0fe-daedba074756	1	Other	Other
+7b6b6a99-46be-4467-a131-5afb70187429	1	Other	Other
+7b6b6f60-303d-4121-a528-387c6dd410e6	1	Other	Other
+7b6b8d52-7098-4e1e-9b56-6b3059e734f1	1	Other	Other
+7b6befb6-fd03-45e7-952b-c0fa363936f3	1	Other	Other
+7b6c674e-c923-4111-8640-cd2a6b68433c	1	Other	Other
+7b6ca5e2-150f-49c7-a3ef-4ec9db4838ec	1	Other	Other
+7b6cd6aa-24be-4c11-b9b6-809a172eb30f	1	Other	Other
+7b6ce76f-da74-4c0a-a0c1-3e5bf20e52a8	1	Other	Other
+7b6d1a7d-5ee8-42d3-aabe-e1644160baef	1	Other	Other
+7b6d332e-063c-4c0e-bd9f-75cce027aba7	1	Other	Other
+7b6d3691-6afb-4a90-8a05-b800bda92c0c	1	Other	Other
+7b6d4daa-dd6e-4c95-aa66-d6b258f17490	1	Other	Other
+7b6d7812-4aea-48e5-b89d-bff9385f9359	1	Other	Other
+7b6ded01-e957-40a5-bf16-c9ec1b6450b3	1	\N	Other
+7b6e1a9c-d34e-4d0c-9c7b-fa4cc941edd4	1	Other	Other
+7b6e497b-6cb3-46a6-8092-0951626082a6	1	Other	Other
+7b6e746b-d7a6-4d45-954d-edaece8478f1	1	Other	Other
+7b6e764c-1914-4ef1-857e-c035b8279912	1	Other	Other
+7b6e941d-36a4-4549-8951-d6ae8ee4f464	1	Other	Other
+7b6ebc60-7234-463f-92a2-1e22e7086887	1	\N	Other
+7b6ed249-ffd7-46e8-a4ad-ad107474ed84	1	Other	Other
+7b6ef479-39d5-435e-86d9-e17d311e61d2	1	Other	Other
+7b6efe80-2658-49ef-96f7-323bece31cdb	1	Other	Other
+7b6f1dc3-19a6-466b-ad9b-4b34d59a2b78	1	Other	Other
+7b6fdc57-15b1-4854-9739-ebbad67986fb	1	Other	Other
+7b6ff6ac-f6be-4b19-b137-f6a5c652f7df	1	Other	Other
+7b703f2e-6dad-4262-a00e-7a0d958af870	1	Other	Other
+7b703ffe-ed65-4868-96fe-23e271505741	1	Other	Other
+7b7044e1-b553-4c43-9009-ac21d5d2146e	1	Other	Other
+7b707d40-c5c3-4713-b3ae-7a75d120ceff	1	Other	Other
+7b70c940-eaa8-4ca9-95d6-134df4ccb5fc	1	Other	Other
+7b7119a4-8018-4f09-8a37-da7f77aed188	1	Other	Other
+7b711ea5-ebe4-4a04-a67a-77503f179083	1	James	Other
+7b714164-86ac-43f7-8fcd-390b54250cc8	1	Other	Other
+7b715aca-1785-46a6-820d-48138019dbed	1	Other	Other
+7b716661-2a27-4573-8218-8295ef650e5e	1	Other	Other
+7b71d140-a507-4533-8704-3b69b7544f50	1	Other	Other
+7b71ff74-9fac-4496-b2a7-8c497298392c	1	Other	Other
+7b7285e4-fbff-4f4e-a74d-d96be6993887	1	Other	Other
+7b733d8a-5054-47d4-ad01-cb56dfcb10de	1	Other	Other
+7b735758-7d2c-4f60-8a10-258f56c53c36	1	Other	Other
+7b744ca8-d21a-4994-a20c-441f0ec228a1	1	Other	Other
+7b745ea8-d33a-48e6-a8a4-28987ff4ad3e	1	Other	Other
+7b74630b-9347-4138-bc3a-2ef73c1ff186	1	Other	Other
+7b74b0f5-d79d-42f8-8c09-dcf61c0420f0	1	Other	Other
+7b74d252-6140-4568-9e05-62c38111ff4b	1	Other	Other
+7b74d55f-3bf6-4461-931f-dc36cdab1a4c	1	Other	Other
+7b750ead-e8c7-4320-b3c4-d902ab270311	1	Other	Other
+7b751df1-1ff6-4d4c-adbf-c638a5b77464	1	Other	Other
+7b751e9d-64ad-480b-87fc-95d7f27d115f	1	Other	Other
+7b7584c7-512a-49e9-bb27-8db51f73bde3	1	Other	Other
+7b759317-1f09-4c8b-9513-75268c5443c2	1	Other	Other
+7b7598cf-75b2-4916-b043-bcf56ef44e8b	1	Other	Other
+7b75b298-ac16-4629-96e2-dd9bcfd758b5	1	Other	Other
+7b75ed84-03da-4cdd-9b66-7d9eaca51d88	1	Other	Other
+7b7624cd-2a22-4b80-a2d9-05664b58d222	1	Other	Other
+7b767023-abb1-4a7c-bae9-8aaa943adddf	1	\N	Other
+7b76a907-d084-4b56-acdf-278118f5c348	1	Other	Other
+7b76ad59-8d54-4538-8ace-06bb65b04017	1	Other	Other
+7b76d127-d065-4a8d-a1a7-2bc3d6c52183	1	Other	Other
+7b76d66d-981f-4ac9-b177-532d04b1e445	1	Other	Other
+7b774fc1-991c-403c-86d5-582b9fb50814	1	Other	Other
+7b7762f4-434d-40bf-bd34-b8adb7fab6c4	1	Other	Other
+7b78152e-cc66-425d-ae57-e33c4bb5b56b	1	Other	Other
+7b7829f7-3696-4c4a-8a53-d2cc9287b288	1	Other	Other
+7b78425d-be2c-45e5-b0c7-a42f7a8ce31a	1	Other	Other
+7b78a14b-dba5-4a61-8823-435e7fee4eb9	1	Other	Other
+7b78b381-4ee2-4cd6-924d-ebb21edac232	1	Other	Other
+7b78fe80-5828-49af-9f95-2549948a0e65	1	Other	Other
+7b791ad9-e9b1-4fc1-b7a1-48ae11d2d048	1	Other	Other
+7b79b4cf-6c2e-4baa-a3b4-066af7bffec7	1	Other	Other
+7b79ba84-98f5-4245-8a0e-7b6ccb001d74	1	Other	Other
+7b7a8450-7a35-46c7-8182-2d645aef3650	1	Other	Other
+7b7abb9d-af10-4824-85dc-4bc6f1ce87d9	1	Other	Other
+7b7aeacc-5feb-4e5f-8c7f-0dcb72413bf9	1	\N	Other
+7b7b0915-8eab-4bf7-835f-c5f3e9eba4b3	1	Other	Other
+7b7b5ed0-1e8f-40e5-a6e1-c81f98a0a14d	1	Other	Other
+7b7bba60-cd09-47df-b762-4867ff5aaf18	1	Other	Other
+7b7bd90e-0ef3-4c9b-8004-5aaffcd90580	1	James	Other
+7b7c09fd-01cd-47a2-888e-5e354763a1da	1	Other	Other
+7b7c150e-c76e-4d99-99cc-023a076cc3e6	1	Other	Other
+7b7c1d77-669d-440e-a796-56b583b3e584	1	Other	Other
+7b7c2f0c-e8e4-4d6f-8edc-2cc8d7e8343c	1	Other	Other
+7b7c45e9-e07b-401d-ba7b-4f7aac70fa51	1	Other	Other
+7b7ca531-d18f-4c6b-98ae-2c623c5c8efd	1	Other	Other
+7b7ca83f-bf5e-4c76-b7ab-00592aca8436	1	Other	Other
+7b7cefbb-a554-4c78-a761-d1b7e238ad40	1	Other	Other
+7b7cff27-8202-4cc9-9f5e-bd0120b02841	1	Other	Other
+7b7d2060-d5be-4941-a93a-7d4c7a750595	1	Other	Other
+7b7d2706-1b6b-11e8-8a6e-fa163e8624cc	1	\N	Other
+7b7d7e74-ba9c-4345-9af7-46e4f1d77268	1	Other	Other
+7b7d7f71-7ebf-4309-8a1b-1211da96b2bd	1	Other	Other
+7b7d8014-b43c-48d8-958a-e72375299ef5	1	Other	Other
+7b7de5b5-ccec-49fe-9563-e8ed947e964c	1	Other	Other
+7b7e041d-283b-4cde-82b0-31630e3a2bf1	1	Other	Other
+7b7e2f87-e377-400e-8a81-a81a6853b484	1	Other	Other
+7b7e7018-58f0-484f-9040-3804ca9e7ab2	1	Other	Other
+7b7e871e-7527-4107-a295-6e5c4efccbb7	1	Other	Other
+7b7ea405-9f27-46f6-b1cd-3f8a9384db8f	1	Other	Other
+7b7ec56c-bfc1-11e7-b9ef-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+7b7f2a33-e196-46ff-b3af-b5b348457489	1	Other	Other
+7b7f3a3d-f411-488c-98c1-0ca54a07be23	1	Other	Other
+7b7f7fe3-ec2b-4b98-8135-666284fc420b	1	James	Other
+7b7fa147-f3b1-40d6-8df2-796382ff78b4	1	Other	Other
+7b7ff973-2031-49c9-af43-2ec3c169473e	1	\N	Other
+7b801b7a-7e1f-46f2-8e3c-171ce2c35626	1	Other	Other
+7b805f26-6a4d-4a38-8c2c-ac46ef5e8a33	1	Other	Other
+7b807fd7-5af3-4e10-a97f-43129d1ce60f	1	Other	Other
+7b808a97-7edf-4517-87dd-4a65de24548a	1	Other	Other
+7b80a34d-8406-4ce5-a285-34a1a45cb15c	1	Other	Other
+7b80a5af-3ade-4526-965a-c1a9b1f58ec4	1	Other	Other
+7b80ba64-3e75-4647-8d5b-26316f4fb455	1	Other	Other
+7b80c7c1-404b-4557-bd56-a8c655cb27d7	1	Other	Other
+7b81054a-005d-4afd-be65-598c6aa45dd9	1	Other	Other
+7b8108e6-eac2-4f80-a881-7bbf994a77ad	1	Other	Other
+7b8136e5-f7c0-4e23-ad92-0f9d56c7a42e	1	Other	Other
+7b8142e3-a253-4c31-be4d-1d7b05ed1cff	1	Other	Other
+7b818d4c-1c0a-4e61-a2cb-132b580ef502	1	Other	Other
+7b81f305-94c1-4d1b-9bd8-ff370439bd7c	1	Other	Other
+7b81f32d-7f6c-4d7e-9784-dfce0fcc12ed	1	Other	Other
+7b826698-7075-4cb7-b54a-7f0d97d0b005	1	Other	Other
+7b8277e5-eb0a-4098-8a48-a0096fa18d6d	1	\N	Other
+7b82bc0d-7cdd-4c44-be9f-8677840dc89c	1	Other	Other
+7b832162-74b5-419c-99b8-6a8e739df8a8	1	Other	Other
+7b8391fe-c922-4a8e-82b0-c0af0304024e	1	Other	Other
+7b83f3e1-9718-45e0-ba7f-b4c33e2ed565	1	Other	Other
+7b84061d-1778-41ff-95e9-108eba2735a3	1	Other	Other
+7b8472ad-f8fb-487a-ab5a-ee462af87d48	1	Other	Other
+7b84b1ad-aeb2-4ed9-8565-8ec0a5cb25ef	1	\N	Other
+7b84b35f-7091-4a66-8cf9-757d8c89440b	1	Other	Other
+7b84cdc3-1bcd-4385-8601-2000f75f6d6a	1	Other	Other
+7b84ef7d-72ed-40fe-9c98-76ea55de9ded	1	Other	Other
+7b85066c-4f3b-42e2-bb4b-92a9012c8863	1	Other	Other
+7b850eb0-e6e7-4598-b9c5-53cbe764ded4	1	Other	Other
+7b85503e-55e8-425d-af3d-364b1fcf1bb0	1	Other	Other
+7b855e9b-d6b4-481e-aa33-7ac84058951b	1	Other	Other
+7b858313-1631-4ac2-8d6b-e69ac2d965d3	1	Other	Other
+7b85d12a-36a1-4a43-8d5f-fe9d25eccd4f	1	\N	Other
+7b85dc8f-17ef-4a01-afee-556d341cfebb	1	Other	Other
+7b85eb5b-7763-453c-b4bc-5ca2aeff2d4a	1	Other	Other
+7b8649ac-a83e-45f1-87e0-0083add8364c	1	Other	Other
+7b86613e-9abb-45bd-ada8-d9f7a0c5255b	1	Other	Other
+7b868bff-f98b-4c97-9e18-e1dd0c4bcd16	1	Other	Other
+7b86e02a-2995-4841-8d8f-ee9a7b53659d	1	Other	Other
+7b86e36b-ef9f-4bdc-9592-3d6769c7e253	1	Other	Other
+7b86f5fa-db10-45da-9fb5-98039db823e7	1	Other	Other
+7b8701ed-a522-441c-ac4c-469abb3992d1	1	Other	Other
+7b872f84-8ffd-4728-9941-3888c5250ed9	1	Other	Other
+7b876e99-b2ea-499d-8f28-be36f6686957	1	Other	Other
+7b8785f8-0c4b-4875-ad18-e8767a29fbd8	1	Other	Other
+7b87deac-753a-4cb9-a94e-1ef76b2e88c8	1	Other	Other
+7b87e999-e92e-4852-9b39-4309928f2374	1	Other	Other
+7b881647-80a0-43fa-a26e-ed80546e9160	1	Other	Other
+7b882ade-3bac-4e49-8ffb-3373490cb744	1	Other	Other
+7b88432b-d8c7-486a-8e0d-cf92841a9aa7	1	Other	Other
+7b88714d-8953-4afa-8407-f50d8ac8893b	1	Other	Other
+7b887303-0bd7-49f8-acad-e40ac220ac65	1	Other	Other
+7b887ea9-aafc-48cf-8d7a-3685ef273270	1	Other	Other
+7b88cef8-24c2-4fef-bc18-7a8a022bb933	1	\N	Other
+7b88fbdc-5fb3-43cf-86a9-65b35c9d9e1a	1	Other	Other
+7b890626-80c5-4dba-bb55-f286ea0cc1a5	1	Other	Other
+7b8913d9-4888-498c-a120-1c37bc2913d0	1	Other	Other
+7b894cd9-72bd-4c81-a786-e00ef397c670	1	Other	Other
+7b896041-fb30-49d7-82f9-ed4ff18053c5	1	Other	Other
+7b897395-8147-4257-9d41-e2902069ebc6	1	\N	Other
+7b8a0333-dcf5-4c30-8fd9-fb265a048c8e	1	Other	Other
+7b8a0351-32f9-4fef-9993-2f954b6c240a	1	Other	Other
+7b8a059e-ee67-4d02-8980-5ac317087af8	1	Other	Other
+7b8a1b49-eff4-4951-a496-79e3e6131cc4	1	Other	Other
+7b8a4ff2-7025-44ef-9612-1db12678a1a7	1	Other	Other
+7b8a5070-35c8-43d8-93af-90010f54f525	1	Other	Other
+7b8ac925-a54e-4e74-8409-9b9183435cf6	1	Other	Other
+7b8af38b-55da-4dda-9430-e15821ecd844	1	Other	Other
+7b8b03a1-f990-4711-8dfb-dd031dc9eda5	1	Other	Other
+7b8b191e-b53f-4aa4-9c82-1a8ef900cab4	1	Other	Other
+7b8b4edd-669a-4206-a013-9ea0ecf8934e	1	Other	Other
+7b8b5eb2-747c-48cc-bc03-35fa22b731b7	1	Other	Other
+7b8b6bc0-51a9-4bf4-81de-c5bc523b1ad2	1	Other	Other
+7b8b7146-5205-4ddf-8515-0f7cdeceaf74	1	Other	Other
+7b8bf3d7-ae30-4439-b1c7-223cac62e2fb	1	Other	Other
+7b8c1651-057a-4938-923a-62411ae3131d	1	Other	Other
+7b8c4580-db21-4fbc-baff-726d3df9bd6a	1	Other	Other
+7b8c6cb0-ddd2-4a5a-894a-653c7c27cf72	1	Other	Other
+7b8c7d44-122f-4d0a-b4b4-a8403e3587fb	1	Other	Other
+7b8ca16a-c575-4334-99ca-7fecd3b59667	1	\N	Other
+7b8cb08a-8315-474a-8711-2dc663f00ae9	1	Other	Other
+7b8cbd7f-ac45-4835-b008-6721092f18fc	1	Other	Other
+7b8cc4d6-c48b-42bf-92e0-31e0669ccf7c	1	Other	Other
+7b8d39b5-3407-4deb-ba62-0d482140c4f2	1	Other	Other
+7b8d5b47-b117-492d-bf4e-b324f1db252b	1	Other	Other
+7b8d603a-a773-4183-83aa-25f04a94647c	1	Other	Other
+7b8d9ef0-b0fa-4dc2-b5ff-d9d62f2866a0	1	Other	Other
+7b8dedd3-6328-435c-8c91-57f2796b93be	1	Other	Other
+7b8e32d0-ed13-4435-8115-c25d4cc8a98a	1	Other	Other
+7b8eb5d2-726c-4e7b-8157-b9aa045b964a	1	Other	Other
+7b8ece48-d6ef-44b6-af54-2910c774b149	1	Other	Other
+7b8ed55d-a89c-46eb-9254-d907201669cb	1	Other	Other
+7b8f2070-ffbe-454a-a842-f66f462f45ae	1	Other	Other
+7b8f23ac-a80d-47be-9085-5cea16a56c1c	1	Other	Other
+7b8f3a40-54a3-400f-906c-6b39e30ff909	1	Other	Other
+7b8f8553-cdd5-47c3-a5b7-3b4427bb6002	1	Other	Other
+7b8f8afe-1dc0-4c40-a043-4fa14e92f907	1	Other	Other
+7b8fa6dd-93fb-43b9-91aa-f5f5c76be035	1	Other	Other
+7b8fbd54-66ce-4030-a52b-2383d3358b74	1	Other	Other
+7b901965-f8a3-44c4-b4d7-37d3104d1eb8	1	Other	Other
+7b903f8a-1201-40e5-b811-c63dd3b99291	1	Other	Other
+7b90b377-a101-4cd1-9321-798a21be7837	1	Other	Other
+7b90eead-2278-4321-aa5d-c247f9068b54	1	Other	Other
+7b9115fc-6c9b-4b55-87d4-c9a2c5275278	1	Other	Other
+7b911f58-e7c5-4af3-9270-1082abf333d9	1	Other	Other
+7b915730-b511-4404-a02a-6bf18f296673	1	\N	Other
+7b918fce-664d-4c87-a24f-f17f857985f2	1	Other	Other
+7b91b850-21cb-4c14-b73c-8420538d13e6	1	Other	Other
+7b91c3ae-15ee-4909-b3f7-9a9e048c0169	1	Other	Other
+7b91cfee-9cb8-4f17-a0c7-0e80dc6f8b86	1	Other	Other
+7b91e4c5-ebf3-4419-93c0-baa1d6dfb48b	1	Other	Other
+7b91f479-b81f-431c-89af-732b65e67260	1	Other	Other
+7b922405-9373-4d8f-b628-98b43b96291b	1	Other	Other
+7b92253b-c840-4cfb-9db3-62a4ee3a555e	1	Other	Other
+7b922ca2-6edc-478f-97f2-89d5267d66f8	1	Other	Other
+7b92597d-407b-459e-aff2-ee6439732c61	1	Other	Other
+7b925d61-a84b-48b3-b11e-e13cd1b809f5	1	Other	Other
+7b931edc-cf53-4349-a920-2308a04f316f	1	Other	Other
+7b931ee7-1f44-46ed-acc9-b102f3482d5e	1	Other	Other
+7b933e47-0a9c-48b0-9f2c-f924fadf4b0d	1	Other	Other
+7b934ffb-07a1-4d7a-b19a-71348f20ab84	1	Other	Other
+7b93b308-49ed-40ff-88aa-615ace5593a3	1	Other	Other
+7b93ed59-9ad9-4032-be67-2eb7dbb4f134	1	Other	Other
+7b93ff37-b5ee-4f6f-a4b3-595b29b1c82f	1	Other	Other
+7b9414d7-3ed8-47e0-b212-8826f9457461	1	\N	Other
+7b947f03-04d7-4dcf-85ce-b08c69323ff2	1	Other	Other
+7b94a197-38e2-4cd7-b1cf-229349e4a68b	1	Other	Other
+7b94f3b8-f3e5-4706-bd8d-e1c16a084cb5	1	Other	Other
+7b94fd66-bde2-46ae-83ff-d98785e1e25a	1	\N	Other
+7b95627f-a319-4447-9d2c-aaaafff483a9	1	\N	Other
+7b95a234-86cb-4d21-bb0d-baa8fc97f0c1	1	Other	Other
+7b95da95-be76-46ba-859c-82f0a193d768	1	Other	Other
+7b95fd90-b5b5-439e-a9dd-aa460ed9e0e7	1	Other	Other
+7b961161-6ec9-43e6-989e-d19e218facc1	1	Other	Other
+7b9686e7-b7b1-4758-af91-71994ec267ba	1	Other	Other
+7b97c706-1912-4663-9b11-d8c7e9f96261	1	Other	Other
+7b97ead4-42d8-4569-af92-58343e90315a	1	\N	Other
+7b9821a3-973d-452e-8402-7cfe46f23fdc	1	Other	Other
+7b98523e-4e29-4867-87d7-693fa0993845	1	Other	Other
+7b9854bb-ab3b-43d2-9c1a-ae37ec561382	1	Other	Other
+7b99af0d-7be5-41fd-b7d9-7af4ca061fe7	1	Other	Other
+7b99cfc9-356d-4e9b-a75a-d3de9f55c310	1	Other	Other
+7b99f516-9bc1-4a2a-a8c4-68ceed85da1f	1	Other	Other
+7b9a1f06-57af-4a99-a33e-a9ac1d3923a3	1	Other	Other
+7b9a2e4a-deed-4cd0-a4a2-304831ff3044	1	Other	Other
+7b9a6346-2fd2-4847-8125-7328566fa46b	1	Other	Other
+7b9a8938-8390-4617-ba3e-d1f3beeff388	1	Other	Other
+7b9aaa0e-58d8-4cd5-ab8b-b2b22bc59193	1	Other	Other
+7b9abe21-2c21-4420-8003-df54694baf3e	1	Other	Other
+7b9ad7b0-9692-425b-bd92-a66e136a321c	1	Other	Other
+7b9b99b5-5092-4409-8b93-c721081b1b4a	1	Other	Other
+7b9babd9-7a43-4aa0-9eb0-baf51826759c	1	\N	Other
+7b9bc07a-eb95-41a9-a12c-35620fd0728b	1	\N	Other
+7b9bd418-3d22-4a39-ba5c-e602414a4d9f	1	Other	Other
+7b9bea99-daad-47e4-9483-86f8a98219ac	1	Other	Other
+7b9beba4-6adc-4a74-9b01-22781cf45f30	1	Other	Other
+7b9bf313-8126-4658-ae09-c6cc990d9596	1	Other	Other
+7b9bf571-fb77-4261-a816-c93e38d0f7bd	1	Other	Other
+7b9c13b8-6237-42a7-a48d-51f7a23a775b	1	Other	Other
+7b9c3460-9f56-48f9-84c0-c0301f24588a	1	Other	Other
+7b9c3e5d-6fd2-434f-ac95-48a0641826f8	1	Other	Other
+7b9c6bab-4e29-4884-8d9f-7708e3d53fb1	1	Other	Other
+7b9c9456-1b6b-11e8-91bf-fa163e8624cc	1	\N	Other
+7b9cb36e-2dc4-4ac3-b229-9ca3dc05451e	1	Other	Other
+7b9cd69f-aa42-49ab-99de-19ff1cf8d662	1	Other	Other
+7b9ce15b-458f-446b-8cfa-df055dd81759	1	Other	Other
+7b9cf5b2-be70-4ba0-9e9a-72241a4a49d7	1	Other	Other
+7b9d20c3-6a83-436a-a662-b2d84047a29f	1	Other	Other
+7b9d71a1-1f8f-41b5-b51a-daf5399703e9	1	Other	Other
+7b9d7478-beba-452a-8aae-ddedf2a3f468	1	Other	Other
+7b9d8148-9358-439a-8ce6-1336511b09c7	1	Other	Other
+7b9da16b-c7ce-4a21-a1b2-3c1fc9c69c31	1	Other	Other
+7b9da5ca-274c-4f3c-83ee-3af3bbde692a	1	Other	Other
+7b9de12b-7764-4085-9a27-5fd1d2f64e5d	1	Other	Other
+7b9e0101-3716-4006-b33d-53878f08c1d0	1	Other	Other
+7b9e15ff-2496-4526-bfaa-858d1d06909a	1	Other	Other
+7b9e9477-d84b-4c1a-8a51-a0dba0a0d3b2	1	Other	Other
+7b9e9967-9224-482c-aea4-404f3c2423bd	1	Other	Other
+7b9ed055-c85d-45ad-aedc-3c1afcbfa674	1	Other	Other
+7b9ee000-5ddb-4e8c-80d3-4f7809f5c5fd	1	Other	Other
+7b9efbca-8a3c-4416-9449-2b7c0ead19b9	1	James	Other
+7b9f44a9-d108-45d3-bdb9-44ad7b3a67de	1	Other	Other
+7b9f58ac-b53a-48cb-9372-d5e527feec44	1	Other	Other
+7b9f7965-5ac2-40b0-8806-1f132b914f84	1	Other	Other
+7b9fa127-977b-4710-a4fc-478a8ebad2e9	1	James	Other
+7b9fe5e3-c895-4d4c-8d93-d6b92aa9ef6f	1	Other	Other
+7ba02b47-1cdc-4241-b12b-b1886d4bdb34	1	Other	Other
+7ba070aa-28b7-45f8-ba49-a1b5f57944f6	1	Other	Other
+7ba07b1c-f891-4c39-9ec3-f905b25f6ee0	1	Other	Other
+7ba0b943-ebeb-434c-9bbd-c52a18b464b8	1	\N	Other
+7ba0fd31-ef73-4d71-8a6f-7cfe0d6dcf9c	1	Other	Other
+7ba1f5cf-b490-41ba-8efb-1743c48e127e	1	Other	Other
+7ba26ae3-c963-431e-92cd-dd5b9ebb01bc	1	Other	Other
+7ba29313-8a9e-4d51-a63c-3116f02e3a74	1	Other	Other
+7ba2a585-99be-4629-8abe-2be187042841	1	Other	Other
+7ba300ae-a23f-44d7-b58f-e83a3bb3bf55	1	Other	Other
+7ba32d7a-8983-4416-ae03-3278cd6f23fc	1	Other	Other
+7ba33b8f-9236-45e5-9748-57491a2f01c8	1	Other	Other
+7ba3662f-8af5-49dc-80e0-902366da4f78	1	Other	Other
+7ba380d3-d02b-4894-8ca4-e520c3cf00a0	1	Other	Other
+7ba3aa6d-2b36-4be9-90e3-9045657b5ead	1	Other	Other
+7ba3b638-4b3e-49de-bb06-6c087f979c9b	1	Other	Other
+7ba3d495-f2e7-463a-8d38-608f3ceef126	1	Other	Other
+7ba4173a-88be-425a-af4e-ab47138ad162	1	Other	Other
+7ba41a62-e72d-405d-9a62-447273311e4c	1	Other	Other
+7ba4686b-4a12-49a5-ab0c-3037a627151a	1	Other	Other
+7ba4a43d-e11f-481d-b9ca-8fd5b38733f4	1	Other	Other
+7ba4b8bb-6d2c-48d0-be61-05ed9eba996e	1	\N	Other
+7ba4c476-08f1-4044-a30e-6fe603a172fa	1	Other	Other
+7ba51bfc-073e-4617-bdde-da8d4ed77da8	1	Other	Other
+7ba55238-7cf9-4a5c-8c63-d43f0f4cab7c	1	Other	Other
+7ba55ada-d43c-4c2b-9120-18015693acfc	1	Other	Other
+7ba61ae9-e693-41fc-8b13-f45f9f1a0ef0	1	Other	Other
+7ba6228b-22c1-4af5-80da-d561b98a2d7d	1	Other	Other
+7ba63772-3ec0-4164-b1ec-d4d186ddf600	1	Other	Other
+7ba658d6-8ba1-4027-b31b-b5cbc42b2d3b	1	Other	Other
+7ba6880f-6fff-4c43-990f-ae3d3d29fe5b	1	Other	Other
+7ba6b253-24bb-43b5-8bb1-33bad69a77cd	1	Other	Other
+7ba74d42-d0b2-42d1-a5d4-c857b192d32f	1	Other	Other
+7ba7e808-18bd-4ecb-982c-3cd94db24e17	1	Other	Other
+7ba80e5f-bfc2-47b9-b6e9-8fa8d8b01a0d	1	Other	Other
+7ba82043-9488-4545-a6e4-fae89cead202	1	Other	Other
+7ba85013-1cfd-484c-95a6-54b9f914d604	1	Other	Other
+7ba8560c-fa84-4972-8e94-df06d97992a3	1	Other	Other
+7ba8916c-1d9f-11e8-b1f8-fa163e8624cc	1	\N	Other
+7ba8a9bc-e20a-4a67-99bd-2b6a8b89263f	1	Other	Other
+7ba8aed3-4f80-4a7e-9d6d-0df8f786756e	1	Other	Other
+7ba8c1ad-4a85-4cc6-84a8-15cb2e4e9b3e	1	Other	Other
+7ba8c794-33ff-41d1-ab79-9e0c3af66bd4	1	Other	Other
+7ba8d279-9aa1-4baa-bd33-4319ec1c60a7	1	Other	Other
+7ba8d325-d122-4bf5-9e8a-38dae2db910f	1	Other	Other
+7ba8e134-7723-483a-979c-ec75ea9a793e	1	Other	Other
+7ba8e39e-9d87-474b-bae9-83e0d7c59a35	1	Other	Other
+7ba91691-c199-4d7a-adf3-3844ec2be0c7	1	Other	Other
+7ba98bff-d57f-436d-b381-148ae8876f62	1	Other	Other
+7ba99071-7a9d-4271-962e-bb56111fd0bd	1	Other	Other
+7ba99704-cd0d-4118-93fa-9e3c913b3389	1	Other	Other
+7ba99aac-8f77-4481-a6f1-648cf96c4455	1	Other	Other
+7baa0a3f-4831-4f17-ba34-7fad8ce2b502	1	Other	Other
+7baa20a3-59b9-4579-b149-898cffd1f1ad	1	Other	Other
+7baa5da9-a619-415f-a08d-23779477cec3	1	Other	Other
+7baaece6-3942-4c91-9235-d1245bdb3d77	1	Other	Other
+7bab167f-e3c0-4ee6-ac0e-c2931791b269	1	Other	Other
+7bab2152-ae13-4d71-b5dd-63988f13c278	1	Other	Other
+7bab2349-5bd7-4e2a-a5d2-55e7e7a1407d	1	Other	Other
+7bab46ac-6596-4193-a4ab-6db18d8c5dd2	1	Other	Other
+7bab6242-3c85-4f74-965d-c4fa2a29d1bd	1	Other	Other
+7bab66c7-add1-41df-b5cb-1ae66ba5c330	1	Other	Other
+7bab9286-716c-439c-9214-b7f45663e5e3	1	Other	Other
+7babb48e-2373-436b-85bf-345863b7f7b4	1	Other	Other
+7babb862-ddc4-4bc6-a8a5-52ca07911316	1	Other	Other
+7babf35d-04f8-48fa-acf2-102d2196a0a9	1	Other	Other
+7bac43ad-bd5d-4d2d-b18e-5080315354ad	1	Other	Other
+7bac5103-4810-4014-906d-3c8a7847e60f	1	Other	Other
+7baccb7d-e190-4e21-9f91-fe961d6ea98a	1	Other	Other
+7bad1f65-0e90-4dbb-aa0b-0cb3c3314607	1	Other	Other
+7bad69e1-f1cf-4812-b33a-b20efffbbf06	1	Other	Other
+7badab32-dd1f-409a-ba64-faa699eafe22	1	\N	Other
+7bade52a-e4ff-4366-b889-050358af4e7d	1	Other	Other
+7bae1fe4-12a2-44cf-880b-6c99a70f17cc	1	Other	Other
+7bae20fe-a4e3-4d8e-8a1d-8e9324fb6d0d	1	Other	Other
+7bae56af-fdb6-4ece-b6e4-34eda5ae1f38	1	Other	Other
+7baec92d-f103-4b3a-9ca2-e2e0be3198af	1	Other	Other
+7baf1039-daf2-45ae-a255-32a34c03cdc4	1	Other	Other
+7bafcf17-5afb-4082-9e36-3be8ffdb11b5	1	Other	Other
+7bafd89b-6d92-476a-bf70-6b3d38334f15	1	Other	Other
+7bafd8f7-e95c-46e6-891a-3e0436418ea0	1	Other	Other
+7bafed26-aba2-4bc0-8515-25514b03a410	1	Other	Other
+7baffb2a-8fa9-4563-b598-9b785f06a3e5	1	Other	Other
+7bb0103d-0cbf-4dc6-8ea5-bee75f0c2db3	1	Other	Other
+7bb04b55-9006-4679-b624-9d314302c442	1	Other	Other
+7bb060bd-93c0-4576-8020-c8f13e468c0f	1	Other	Other
+7bb064e9-b273-481b-b550-107508a22ca0	1	Other	Other
+7bb078f5-a72f-4dee-b611-d909fba1a77d	1	Other	Other
+7bb09eef-54c5-4208-b768-dfc89558b457	1	Other	Other
+7bb0b8c1-1baa-4181-963a-6392aa728a34	1	\N	Other
+7bb0ce3a-e1df-454f-b05d-a6545a3cab46	1	Other	Other
+7bb11bb2-46e8-40af-993f-beca9e27f8b1	1	Other	Other
+7bb13ed2-90c0-4223-82f3-2b3cf11bc8a8	1	Other	Other
+7bb15cbc-5048-4bcc-83ea-36c2117e28d7	1	Other	Other
+7bb186e1-0cde-42ae-a68c-6d96f37438d5	1	\N	Other
+7bb18dce-05e2-4d69-ba79-7a81c0e90b50	1	Other	Other
+7bb1bb97-1ffa-452a-bc93-4875a80044e0	1	Other	Other
+7bb1d5bf-3348-4689-b8c8-cc01ff1bd14b	1	Other	Other
+7bb1da80-21f6-4707-aaf2-5555d869713d	1	Other	Other
+7bb229b2-0be5-4872-9611-c041a684d79c	1	Other	Other
+7bb23069-6740-4a05-b8ae-d2d5e0252dff	1	Other	Other
+7bb27be7-b127-4ba2-83be-d2cbfc2fb31d	1	\N	Other
+7bb29682-bcaf-4850-b14a-17e053e0c051	1	Other	Other
+7bb2ce5e-4fa7-425d-b7c2-e6d20d51d1ae	1	Other	Other
+7bb30524-dfdd-4f01-b2bc-0c2a988c9237	1	Other	Other
+7bb30c92-a8f0-4f73-807b-6ed481f876bd	1	Other	Other
+7bb31d20-3b75-4cf1-b950-44afd31a5965	1	Other	Other
+7bb33c5b-72c7-4eb1-9849-e22efe539a31	1	Other	Other
+7bb3d238-7661-42ee-8357-6b9d6ab4adc7	1	\N	Other
+7bb40ebd-72b5-4278-b031-eb54fde8e66c	1	Other	Other
+7bb42025-9ac8-42ce-bea9-fdfa05bf35bf	1	Other	Other
+7bb43d70-53bd-4be7-9c97-347434f5cc69	1	Other	Other
+7bb45eab-badf-4eb6-b16f-3b3c1053e7e5	1	Other	Other
+7bb46313-9d5e-461e-b856-de364b6af6f1	1	Other	Other
+7bb46bd0-c181-44a0-be10-cfb14aacea61	1	Other	Other
+7bb49211-8365-4734-8ca0-7e00922ec26a	1	Other	Other
+7bb4f2eb-95bf-4114-b09e-87e78b56660c	1	Other	Other
+7bb4f2f7-86c9-4c8f-bb42-948f986e8347	1	Other	Other
+7bb536e8-35a5-4bf7-812c-ff464820f219	1	Other	Other
+7bb56a7a-dcbf-4e95-a321-bf0b3bfa86e3	1	Other	Other
+7bb56a95-37c3-4091-ba84-22b4626cb264	1	Other	Other
+7bb5951c-1fd5-4ff1-adc1-2b907faa9c10	1	Other	Other
+7bb5e123-e9df-418b-84ae-ebff1e80f8b5	1	Other	Other
+7bb61ee1-70f5-4303-a68c-55169ffe33e9	1	Other	Other
+7bb678f2-302e-4022-9a60-9e713a239c7f	1	Other	Other
+7bb68581-fafa-468f-82c2-683a8ceaf0a2	1	Other	Other
+7bb6d085-6b67-43e7-ac6a-d885e4feff74	1	Other	Other
+7bb6fcc4-c2c6-4d9a-8bcd-208f67bae002	1	Other	Other
+7bb7086e-9796-44b2-a79e-974611351173	1	Other	Other
+7bb7291a-d463-4cc8-a4b1-e4ce680a0275	1	Other	Other
+7bb76508-1d9f-4706-a551-3480906a1cc0	1	Other	Other
+7bb78cf7-7d32-42e5-b6b7-4f04dae57e9d	1	Other	Other
+7bb7d104-cae0-43e3-be10-fef25de91bd8	1	Other	Other
+7bb7e398-3c3a-48ff-9bdf-aaec6fc94940	1	Other	Other
+7bb82809-4b46-44e1-a792-76f7fab07bb5	1	Other	Other
+7bb84beb-345c-43bf-86c9-3f78aeee2be7	1	Other	Other
+7bb858d7-61d2-48f5-bb44-97aa761167cf	1	Other	Other
+7bb86efd-f803-4cf9-879c-8f418c97748c	1	Other	Other
+7bb8b30f-cb88-4299-83f0-7f8c1481d3c0	1	Other	Other
+7bb92151-041d-4b11-91c0-071acfcc3d54	1	Other	Other
+7bb9d537-222f-4250-b296-b70c5b2d4b86	1	Other	Other
+7bb9e07d-2f00-4b29-9be4-dc9b22705ae6	1	Other	Other
+7bba20aa-c8e8-4519-81b9-34a47bb4d86a	1	Other	Other
+7bba78d7-b7b7-4c92-a196-465d741be583	1	Other	Other
+7bba9180-858f-43d2-b3d4-ee4373933f6b	1	Other	Other
+7bbab5cc-f1c8-4b74-909d-1b6d6c7b9b41	1	Other	Other
+7bbb07ef-8f17-4754-ab5d-3efb88474b21	1	Other	Other
+7bbb2696-ecf4-45ed-a94b-5b7b0474f5dc	1	Other	Other
+7bbbc566-8a2b-442a-a3d5-fc8af38245bd	1	\N	Other
+7bbbe0c8-0060-46e9-8c28-65a6a45cdbcb	1	Other	Other
+7bbbe8e7-0d7a-4402-b8fd-418f4c410330	1	Other	Other
+7bbc1950-9005-45b5-b09c-d5f5e8f9e71f	1	Other	Other
+7bbc877c-11bd-41cf-9982-8a2f5b8e7709	1	Other	Other
+7bbcd92c-aeb9-4748-af8d-b0c80eac8cff	1	Other	Other
+7bbcdf6f-baf1-457e-8a66-60d6a743decb	1	Other	Other
+7bbce415-4423-4c1e-b59b-fd80a2370332	1	Other	Other
+7bbd0c35-4105-4347-a449-a89626cfabd0	1	Other	Other
+7bbd1725-c561-43cf-bfbd-c8e00917bf2a	1	Other	Other
+7bbd1ade-0660-4ff7-9e9a-ca53a03b9b03	1	Other	Other
+7bbd3ba7-8e4c-4d86-acb8-13de24ca2b9a	1	Other	Other
+7bbd6938-a438-4696-ac34-8f234e9de50d	1	Other	Other
+7bbd769a-fb67-43fa-bb18-dbf86bbcef8b	1	Other	Other
+7bbda1eb-e9b5-4d5c-80a2-6b3639a1b922	1	Other	Other
+7bbde44e-9e7c-427b-9ae3-64a1f37e897a	1	Other	Other
+7bbde469-1786-423c-b0a2-3bd442a53aa7	1	Other	Other
+7bbe262f-1188-4b76-9fab-382bc8b5c8d0	1	Other	Other
+7bbebbce-d493-4167-abc5-ce1526b9f28f	1	Other	Other
+7bbed7a4-bb21-4f33-a33b-0b8fee97b684	1	Other	Other
+7bbf0234-2fe4-442f-be3b-926f5e60aeab	1	Other	Other
+7bbf359b-0022-43b5-814b-cb382540b02c	1	Other	Other
+7bbfbfd9-607b-4207-9253-c62863a12d38	1	Other	Other
+7bbfd702-6b43-42e1-8e14-98160dc03b38	1	Other	Other
+7bbff25d-ea3e-4f90-ae10-07ab309ab38a	1	Other	Other
+7bbff690-0f36-4dcf-a202-1e13db970708	1	Other	Other
+7bc03445-a295-4c35-a6d9-e5dc90a37058	1	Other	Other
+7bc03900-f637-4d57-b0b8-785a502eb0a4	1	Other	Other
+7bc07f2e-4a7e-44c8-874d-e2579769a757	1	Other	Other
+7bc0a477-f75d-4874-b4a2-32cf0e2e4711	1	Other	Other
+7bc11f92-92eb-40d4-b6c2-fdd24d14e93d	1	Other	Other
+7bc13034-ede2-4010-ac81-0a04ed6ae757	1	Other	Other
+7bc19000-0db2-4ab3-8ef7-d96c8b4a996f	1	Other	Other
+7bc1f8ef-70e4-44cb-8033-e91064eb59a4	1	\N	Other
+7bc2256e-1285-4c4c-808e-490b9690e47b	1	Other	Other
+7bc2a459-072c-4dfe-8426-52c06a2de604	1	Other	Other
+7bc2cca5-4ece-49bf-ac41-aab0da4016d9	1	Other	Other
+7bc2cfaa-3bea-449f-b1b9-624bb69c82f7	1	Other	Other
+7bc30bf6-6361-47b2-b067-28a8eb089ad5	1	Other	Other
+7bc34a23-be8a-445c-8916-3e16139a4855	1	Other	Other
+7bc357fe-ac2c-4141-9788-eed45123f4fb	1	Other	Other
+7bc3a5d6-14dd-46ba-aac1-205aae65f3c7	1	Other	Other
+7bc3cbba-a85e-413e-9b32-623196c8de41	1	Other	Other
+7bc3cbff-a789-4768-9ece-fe17e305c549	1	Other	Other
+7bc42a1d-294a-4ce7-8777-bb5faae881ad	1	\N	Other
+7bc4ad50-9a44-4dbe-880d-2ec2122cf794	1	Other	Other
+7bc4b5c4-7f00-4e93-a6c5-c444e146d016	1	Other	Other
+7bc4fba6-35bc-463f-bd79-148990c89a04	1	Other	Other
+7bc59338-271e-4bce-b0c5-22db242d5e34	1	\N	Other
+7bc5a719-c342-47af-ba26-e179b8b8b060	1	Other	Other
+7bc5b4cf-9d7d-4564-a3ac-b2661335b4f9	1	Other	Other
+7bc5ba23-6d67-4ae0-bac2-b5b62198cb02	1	Other	Other
+7bc5eeb4-b3fe-49c5-955a-e07e855fba27	1	Other	Other
+7bc60350-2623-407b-81b7-802315a3b72e	1	Other	Other
+7bc67307-79d5-46bf-8c05-b1a2c91f33b6	1	James	Other
+7bc6f258-3643-448e-be5d-19d95db9fbcc	1	Other	Other
+7bc70994-b7ba-487c-a7cf-949ef9765ae5	1	Other	Other
+7bc73c79-f2ff-40d2-8b9d-b3257d36433f	1	Other	Other
+7bc7aea2-e606-4963-a6df-d36cf1ff2eba	1	Other	Other
+7bc81884-f650-41c3-bcde-91cc29a75fe0	1	Other	Other
+7bc86c9f-7ee0-4939-bd09-20423bc19dec	1	Other	Other
+7bc88473-f2fa-4017-9c60-9eda2d7defd9	1	Other	Other
+7bc8e0cf-b537-4235-9e16-038691a250e2	1	Other	Other
+7bc8f685-b9c9-44a9-9424-ea6c264622ec	1	Other	Other
+7bc970a2-2c3f-4409-a79f-d7688a5bfba5	1	Other	Other
+7bc98be6-17f3-46d9-9093-5d6a52da7989	1	Other	Other
+7bc9a262-04ff-4583-8847-2488f30cd5d9	1	Other	Other
+7bc9a989-1ce9-4b58-a6dd-48f1d1c39af3	1	Other	Other
+7bc9ad24-1ac1-11e8-bd63-fa163e8624cc	1	\N	Other
+7bca1185-0299-452b-8fa7-0feac6d94bec	1	Other	Other
+7bca1320-e612-4a71-9091-3d812f7b428d	1	Other	Other
+7bca8d56-1e6d-497b-bb30-dbb3c2be5973	1	Other	Other
+7bcabb1c-0ef2-468f-9ce9-5685a39f0361	1	Other	Other
+7bcae087-a0c3-4528-86cc-b182f7993216	1	James	Other
+7bcae4bf-43ea-4ea1-a2ac-4edc2a4ea5c1	1	Other	Other
+7bcb0f58-9990-4454-b87e-f5ff071db73e	1	Other	Other
+7bcb3b22-3238-450d-92f2-f97319e293ab	1	Other	Other
+7bcb4c5a-81ab-4228-a09a-0d72e2d9b20b	1	Other	Other
+7bcb6113-8531-4217-982f-d4e830cc5e43	1	Other	Other
+7bcb77ec-9f61-4354-b58e-f9ea8bbd9f75	1	Other	Other
+7bcb9d24-2df6-4a89-9a3d-eb57b6d5ce9b	1	Other	Other
+7bcc1420-e9e7-4c31-ac45-e53d508f9e9f	1	Other	Other
+7bcc19da-15a1-46e6-883f-83d83198420d	1	Other	Other
+7bcc69ec-350d-444a-963e-134c02e31e17	1	Other	Other
+7bccd38c-d505-42a0-8203-d3920b0e0d81	1	Other	Other
+7bcd1795-1341-42ac-ae94-365b833d244a	1	Other	Other
+7bcd4436-405a-48f1-8666-7a386d2ae3ff	1	Other	Other
+7bcd742b-5fcc-47b1-987b-ce5f3aad9372	1	Other	Other
+7bce1d08-5faa-4b8e-aabd-0b0d76ed4ada	1	Other	Other
+7bce36eb-3f8c-4dcf-8dde-fac2e6a772a0	1	Other	Other
+7bce54af-9e95-46ef-b306-5356be16195e	1	Other	Other
+7bce9a19-d5f6-49c5-ac31-3526728026dd	1	Other	Other
+7bce9a94-9056-496b-95d6-f46365af49ef	1	Other	Other
+7bcf4ca8-7acb-4727-b8f9-365dfacc5ec7	1	Other	Other
+7bcf5cb3-8acc-45fb-8681-10f7ec9028ea	1	Other	Other
+7bcf7749-9a3f-4c7b-9af9-14c15c58f07a	1	Other	Other
+7bcfece6-a24b-4588-9766-cad9a0e7f9c2	1	Other	Other
+7bd02024-ea73-47b2-b48e-e6bf7f11dab4	1	Other	Other
+7bd03abe-f494-4b90-8a11-d1d9a38701fb	1	Other	Other
+7bd04bc1-b92b-4fc4-a8df-595a03618c59	1	Other	Other
+7bd08baf-68ba-489c-9e41-cce68f0b1900	1	Other	Other
+7bd0ac2d-99f2-4e15-a84d-7556daa699cd	1	Other	Other
+7bd0cda9-cf52-4018-b4d6-8722bcdb0244	1	Other	Other
+7bd1b034-e26f-4147-9695-6c29e6899b88	1	Other	Other
+7bd21081-91eb-48cf-814d-2fa4c533199c	1	\N	Other
+7bd21eca-b019-4bd3-8dae-76900e1bc6fc	1	Other	Other
+7bd22657-3c92-4f17-ae70-e0d92f6723c3	1	Other	Other
+7bd24594-35ef-43cb-84b9-7f6e10e13f9a	1	\N	Other
+7bd2f6e9-4c01-4514-a7c9-c7eb53b212fe	1	Other	Other
+7bd308e4-56e6-41ac-b55c-a4b497ddcb21	1	\N	Other
+7bd31b72-a1e5-4c1b-b1ae-5b7ea3cb6315	1	Other	Other
+7bd37c23-f744-4035-b9b2-306c04737903	1	Other	Other
+7bd3f5f6-a967-43cb-941a-6933f24d9ab1	1	Other	Other
+7bd41821-f966-450e-8336-23254cf4ba61	1	Other	Other
+7bd46f4e-e64d-42c6-9633-779c5ae1b228	1	Other	Other
+7bd4ea67-9c1c-45dd-9826-982f699028bd	1	Other	Other
+7bd4f68b-1eaf-4049-9c4b-037d52202a49	1	Other	Other
+7bd4f7bf-d335-4ba1-bc9b-d7e31348f926	1	Other	Other
+7bd50266-bf62-42ee-8364-8305a9c23c37	1	James	Other
+7bd581c9-546a-45db-a5e4-4fd744ef21bb	1	Other	Other
+7bd595d8-e976-4007-9ec2-d077f0eb0350	1	Other	Other
+7bd5b3f1-2c18-489e-8935-71f773c4d51f	1	Other	Other
+7bd6659b-8c2e-4f4a-a3c0-7d0dc8babacf	1	Other	Other
+7bd759a2-f6fc-4544-8ab1-6b292dd2c267	1	Other	Other
+7bd794a9-3ed2-46fb-b6c5-5bf454384589	1	Other	Other
+7bd79935-ce9a-4dcc-bc51-70ac826514ce	1	Other	Other
+7bd7b90b-f883-4749-94ff-01a182513187	1	Other	Other
+7bd7d1f3-4af5-4cbd-9e0f-8031ee93ecea	1	Other	Other
+7bd7dade-1d1a-4e46-8fe1-baf09d6d3e46	1	Other	Other
+7bd8258c-fa47-4496-854e-e96225b6a1b8	1	Other	Other
+7bd88556-352a-4825-99e3-10c0555bd50f	1	Other	Other
+7bd889fa-dcfd-4ab0-bb1a-f2a8ef63493a	1	Other	Other
+7bd896d2-4911-44e0-88ed-00fdcbe7d707	1	Other	Other
+7bd8df3c-981a-4870-8773-486879e238fa	1	Other	Other
+7bd91f00-21d5-4ad8-a946-db485684db7e	1	Other	Other
+7bd929bb-31af-4d16-89a1-c53b9d9322d7	1	Other	Other
+7bd94c6c-3082-4212-8fb9-da4352d054ba	1	Other	Other
+7bd95ec7-3b9d-4e9b-b352-897a133c57d6	1	Other	Other
+7bd99af5-1a8e-4cec-9d82-3711c5316ffa	1	Other	Other
+7bd9b384-07df-4692-ae35-4f1a390c0127	1	Other	Other
+7bd9cad9-8f7d-4ecf-8a6c-2d50ca5fc6d8	1	Other	Other
+7bd9de82-004a-40af-b415-60057db817ac	1	Other	Other
+7bd9eabd-9d46-4cf7-9819-f0f84ff7b9bf	1	Other	Other
+7bd9fe1f-f2f8-42df-a6e6-ad41fe266570	1	Other	Other
+7bda2df1-af14-457d-93fe-c1273200888c	1	Other	Other
+7bda98aa-a0ac-4dc4-aedb-de9f4c019508	1	Other	Other
+7bdaa55f-4bc5-4361-9451-503503d04738	1	Other	Other
+7bdaa573-6a98-4cc6-82c7-33bd3a064f07	1	Other	Other
+7bdaea73-372d-403a-8fa3-57052a063914	1	Other	Other
+7bdaeffe-cd08-4230-8cde-ecd9b2e06471	1	Other	Other
+7bdaf990-5674-4d2f-a840-247d02f4157f	1	Other	Other
+7bdb6196-1c8f-4b68-9327-2de339e2da66	1	Other	Other
+7bdb8abf-9a38-49f5-9f80-d724c93596d7	1	Other	Other
+7bdbe146-d70b-440c-bd6d-fe37fb3f7e4a	1	Other	Other
+7bdbfa63-a9fa-40bc-a283-980df3ffc007	1	Other	Other
+7bdc056a-0927-4f1f-b0f2-9d13a24287c6	1	Other	Other
+7bdc3b06-fb92-4ccd-81b6-b464f30264cf	1	Other	Other
+7bdc6921-208e-4e3b-98a5-9c329d1c7e67	1	Other	Other
+7bdc6e74-42d4-4fa3-acdd-126d636ab1c6	1	Other	Other
+7bdcec57-f0c3-4b37-9ffa-84fea70219c8	1	James	Other
+7bdcf510-42a3-403d-9fc0-b76faa87355e	1	Other	Other
+7bdd0817-94e6-4268-96e9-124d8dea01e1	1	Other	Other
+7bdd09ee-0ab5-4ec1-b61c-8eb167b527c2	1	Other	Other
+7bdda651-8446-40e5-9be7-4261ff109fd8	1	Other	Other
+7bddc187-217a-43f5-a0ab-fa93b4d074a2	1	Other	Other
+7bddcea2-4d50-4f03-863c-b667038587f9	1	Other	Other
+7bdde034-670b-4b6a-9693-c64ed7647eb9	1	Other	Other
+7bdde742-ced3-41f1-8ef8-579b8ceee588	1	Other	Other
+7bde2959-4c65-4237-8c9c-9931758623d5	1	Other	Other
+7bde3e43-3395-4de3-87ed-8f2a4e43802c	1	Other	Other
+7bdea0ad-17b7-458d-8b14-2f1cfe0fc3f8	1	Other	Other
+7bdeb4db-c16c-424d-adc4-e6511a15d074	1	Other	Other
+7bdeefa3-5216-4b95-9ec8-199f2d0dc03c	1	Other	Other
+7bdef2c3-a1e1-4ee0-90f3-7e62e7dabd21	1	Other	Other
+7bdf081e-30d2-44ba-a2af-83ed0993fce5	1	Other	Other
+7bdf18b9-042d-4a74-b41a-e537d72699cd	1	Other	Other
+7bdf2b29-6edf-43f2-9962-f6bb948ff0cc	1	Other	Other
+7bdf428c-0009-40db-ab9b-06c5b2e474ab	1	Other	Other
+7bdf63c0-eb08-49e4-938e-d7ba2e41709d	1	Other	Other
+7bdf72d8-80aa-4a39-9ba9-d9cc61979113	1	Other	Other
+7bdf7ab3-71e5-482f-9864-d6e476abda38	1	Other	Other
+7bdfb351-5783-4d31-ac00-166676340bc3	1	\N	Other
+7be00e6c-2252-445a-bbcc-61acc19fae6e	1	James	Other
+7be01c4a-e8fd-4260-b938-69d66bf308a0	1	Other	Other
+7be0b623-2e16-4403-bebb-242672c9fa1a	1	Other	Other
+7be0cbf4-80f1-4288-97a0-251ac2b66ed3	1	Other	Other
+7be0ecc7-ff38-4719-bed8-db7389b5da2c	1	Other	Other
+7be1153e-dcb3-4d10-9915-4850fc9de1c5	1	Other	Other
+7be13f8d-e811-4f57-b3b1-8f1fc3e54331	1	Other	Other
+7be16545-80b1-493f-b4f6-8f07eee90ca3	1	Other	Other
+7be1b5ba-80af-4163-9cb0-248a7a167f3e	1	Other	Other
+7be1bf7b-fbb6-4c0a-9f42-1ecaef48cec6	1	Other	Other
+7be20405-e595-4c30-acc5-17e2313d4a75	1	Other	Other
+7be2553f-08fd-4e4a-a507-2ce5bec2c8f0	1	Other	Other
+7be278d8-615e-45fe-9423-c3361170bb65	1	Other	Other
+7be286d8-eccb-4ad6-8070-e257b38eb198	1	Other	Other
+7be297e4-d6ba-43df-879f-80c6b4581d69	1	Other	Other
+7be2b418-9f55-4216-899b-7b43c9330bc9	1	Other	Other
+7be2d2c9-50b3-43f9-a47a-f594c233d67c	1	Other	Other
+7be31743-5297-456a-94ed-3c0af8b25588	1	Other	Other
+7be3206e-af08-4856-bc75-865daf2117f0	1	Other	Other
+7be32176-de76-49b5-844e-fbf588011da3	1	Other	Other
+7be32967-aeb5-401f-8544-5e3365399323	1	Other	Other
+7be32f09-5e0d-4996-9c74-fe7b87726d72	1	Other	Other
+7be34f04-a628-48d7-9a99-ff51e9f743be	1	Other	Other
+7be37cb7-4ff7-4539-b474-7f0fa8baafa6	1	Other	Other
+7be3908c-cbfd-4d8d-a2d9-395bc62a183a	1	Other	Other
+7be3992c-371c-4895-bee4-8b9a5ffca691	1	Other	Other
+7be3dc6c-4342-43de-b501-8f72dce975d0	1	Other	Other
+7be435a7-0dff-443e-b7a3-3d4523e25a09	1	Other	Other
+7be46158-ee2d-4e52-b68d-b2b55f5e3ade	1	Other	Other
+7be473ac-3b05-4e6e-b102-ebb94726552b	1	Other	Other
+7be473c3-c575-472c-8ea3-a720956ccb19	1	Other	Other
+7be47f66-742d-4c06-a033-907e57ea3542	1	Other	Other
+7be4f60b-c087-49cc-860b-f9a61a391a9c	1	Other	Other
+7be4fe5c-29ff-425d-91cd-dcf8889b96f3	1	\N	Other
+7be58acb-b844-4ada-952d-0a1e841cc5f9	1	Other	Other
+7be59ddf-df38-4dd7-b981-b10a61024b7e	1	Other	Other
+7be631ab-af72-4ec8-b140-92d572115344	1	Other	Other
+7be67014-d4e9-48f1-92ae-334900f89af7	1	Other	Other
+7be6b2cc-2889-4ead-a25b-112da6084e8c	1	Other	Other
+7be71332-bf7e-4b08-af66-7f9a49ecd33e	1	Other	Other
+7be7d499-1efe-4513-aaf6-8969371d5065	1	Other	Other
+7be7edc7-23f2-42b2-ae76-ccd618f3b32d	1	Other	Other
+7be807f3-c039-4b6c-89cd-7fc4aa01be32	1	Other	Other
+7be82528-76eb-404c-bb12-5f14e4ddddbc	1	Other	Other
+7be82fad-de00-42fa-a978-8a6f0506a775	1	Other	Other
+7be85417-8c9e-45a4-9dbf-afdfaf5e6dfc	1	Other	Other
+7be8767b-1959-4b92-9fea-2740928a802d	1	Other	Other
+7be97d1d-3d4c-4597-9aab-a53d12bd3d17	1	Other	Other
+7be97e00-079d-4049-951b-03ee81e986e1	1	Other	Other
+7be98ca6-c3b4-45f3-86f5-30e9baa726cc	1	Other	Other
+7be9c3f8-4e7e-42b5-b85e-ba4b4f20163a	1	Other	Other
+7be9cd6d-55e9-4fe1-ae13-ecfe95fe3752	1	Other	Other
+7be9f6d2-043a-47a6-b339-5c803fc063c8	1	Other	Other
+7bea368f-ddb5-44b8-bde5-09ec80a6c1da	1	James	Other
+7bea423e-062c-4fbf-a49e-138136d2eae6	1	Other	Other
+7bea902d-28b6-4092-a5f0-c474afa5eda9	1	Other	Other
+7beaab04-4a4c-49e0-99ee-1fd9b57af26d	1	Other	Other
+7beabf79-ca02-451c-87ae-efe00e4e275b	1	Other	Other
+7beaef83-258a-4f0b-82f5-795f50b6e7d6	1	Other	Other
+7beaf420-d38d-4b91-bbe8-e81b060145e4	1	Other	Other
+7beb0bc7-7ff6-4acd-a850-08a3b906cb8e	1	Other	Other
+7beb3091-3f77-4f1d-8f50-3ce7eac2c2c8	1	Other	Other
+7beb313b-ec8f-4629-b8e9-80cf5d86c344	1	Other	Other
+7beb99fa-0228-4aea-9573-5a70af63785f	1	Other	Other
+7beb9a69-8d4e-4856-b28d-fd9581afad81	1	Other	Other
+7bec08e7-ee1d-4630-8ac2-d1a46e45d97b	1	Other	Other
+7becf3fd-e069-47bb-9711-a5959f6d8e04	1	Other	Other
+7bed0ca7-9afe-4be1-8488-9139f98f1f8a	1	Other	Other
+7bed1089-0224-4d27-b9da-c0d5d4d43da0	1	Other	Other
+7bed2dd2-0ac3-4241-8d56-3b376dcc6ab7	1	Other	Other
+7bed46f9-98f8-491f-b139-d4f8f5952945	1	Other	Other
+7bed930e-e28c-464b-8dad-9cbe78b3307a	1	Other	Other
+7bed9dd0-0305-4c0f-a1f9-00b1a64e0e50	1	Other	Other
+7bedcb31-e2ad-43e9-813e-c31c38057580	1	Other	Other
+7bee3b3f-0687-4af7-baa6-aef7dedb89ba	1	James	Other
+7bee4e85-9ba9-4023-a8a6-c2c874a7d750	1	Other	Other
+7bee6bec-5947-4b25-846b-ed53702c9f4a	1	Other	Other
+7bee77f3-6f5a-4732-8b83-78e7cac49820	1	Other	Other
+7beeb9eb-b25a-4828-878d-0d850afd7da0	1	Other	Other
+7beecd01-01fc-43e6-befa-3fdaa612a62f	1	Other	Other
+7bef1889-5d0c-411d-8397-60fc1b0a257c	1	Other	Other
+7bef6c3b-8fa7-43f1-afc0-16fe7a06d526	1	Other	Other
+7bef722f-5fe5-4077-99f3-f52f951fd311	1	\N	Other
+7befabc6-5ee3-486a-a3ee-e1294951d1a1	1	Other	Other
+7befe11c-1093-4e33-880b-91c731fd4c68	1	Other	Other
+7bf08b25-1152-4ccc-8794-e334432d32c4	1	Other	Other
+7bf0accf-72e5-4dca-acba-4f4ad9e9020d	1	Other	Other
+7bf0bdea-c3ed-4f8e-9fa9-159e4fffdea4	1	Other	Other
+7bf0c92c-5056-4a0f-8d3f-b8dc157df3c2	1	Other	Other
+7bf0ef70-1ad1-4e45-ac57-16af5db424da	1	Other	Other
+7bf129be-b7e9-40d3-8297-c16e5db800b7	1	Other	Other
+7bf1567a-de92-41a2-a2ec-f2b83957c2b8	1	Other	Other
+7bf157d9-d443-4669-aae4-4694bcdfb337	1	Other	Other
+7bf16571-6b08-4010-904e-64befc3ff74f	1	Other	Other
+7bf1848c-098c-40b6-9e08-981a84225f98	1	Other	Other
+7bf1fae0-ace0-4e32-8e96-68cfc4ea9dce	1	Other	Other
+7bf2014b-99e3-4158-9b0b-7bd68ee5b759	1	Other	Other
+7bf21876-5c51-464e-8704-e4fde42de0ed	1	Other	Other
+7bf270e6-7df0-4088-aa0d-9983f43bb8c9	1	Other	Other
+7bf2a49c-b6ad-426d-abbd-d92d259e2d86	1	Other	Other
+7bf2fc66-e658-40d3-9342-fbf5cff1f84c	1	Other	Other
+7bf3105a-b024-4567-aeb2-2312ac6c521f	1	Other	Other
+7bf32f48-3e8b-45e9-acf6-5efc6c8af5ba	1	\N	Other
+7bf341ff-d6dc-4ec3-9c79-630f2517cbfa	1	Other	Other
+7bf363c9-9282-4321-bf33-68678f9fda32	1	Other	Other
+7bf36d6e-7890-42fb-bcf2-b987459d0940	1	Other	Other
+7bf38c9c-3778-463c-82c5-4148e7a9ca6b	1	Other	Other
+7bf39a74-b411-475a-9f67-02fb8c070187	1	Other	Other
+7bf3b0fa-8b65-4296-8096-b25e85e09d91	1	Other	Other
+7bf3d457-323c-4fc8-8731-9cd4267ece81	1	Other	Other
+7bf3d764-b322-42dc-a78f-95834789acb5	1	James	Other
+7bf3ddea-d3d5-480d-a32e-f83437eaf91f	1	Other	Other
+7bf427ad-c102-46f6-8cb1-2630ce45d91a	1	James	Other
+7bf43a37-03e6-4a4b-9979-13da35209f71	1	Other	Other
+7bf46655-ed46-4516-82bb-99f8b8ef82f1	1	Other	Other
+7bf4cfc5-9931-41ad-9321-3efcad930079	1	Other	Other
+7bf4d595-9cf0-4a1e-af30-874ac565f400	1	Other	Other
+7bf4e8d4-e726-4cda-90b3-7285ebca24d5	1	Other	Other
+7bf51ecb-01d5-4008-aaa6-d24761da415b	1	Other	Other
+7bf5ac83-4d9a-4c3e-b0f6-51b49650df55	1	Other	Other
+7bf5b1a5-40a2-4701-ae8f-c073a92ac862	1	Other	Other
+7bf5c821-c0e6-45f4-9561-d19c1b628b04	1	Other	Other
+7bf5cb87-43db-47de-b240-81011784f421	1	Other	Other
+7bf5da9f-a090-45f4-a310-4d6f9b3eac1c	1	Other	Other
+7bf5db88-d75a-4cec-911d-bb5c9d386b4a	1	Other	Other
+7bf5dfec-1460-4e3c-af05-0f8d30c8fb8c	1	Other	Other
+7bf61979-d09a-413b-82cd-09a8073fa271	1	Other	Other
+7bf6290b-237f-4914-9ea0-cdba47800dfd	1	Other	Other
+7bf62c45-1123-4e26-90ca-976e943d3a75	1	Other	Other
+7bf62c5d-3bae-491e-9e5b-0f7661932317	1	Other	Other
+7bf699a8-c2e0-4e12-91f6-94ab30e497ad	1	Other	Other
+7bf71bc7-176d-4ad9-b2b6-f60fdd2538cd	1	Other	Other
+7bf74c8f-3774-4635-be74-605bc3162e0e	1	Other	Other
+7bf76e94-e9df-4f2e-ae35-22a18bb002b7	1	Other	Other
+7bf78d10-648c-4825-bbfa-788413c6ab6b	1	Other	Other
+7bf7914c-4b64-4fc5-b37e-01d571a861c4	1	Other	Other
+7bf7ab6d-8a41-4785-84a7-bce32fa0a9a5	1	Other	Other
+7bf7abc2-8ed9-4d55-b2d0-8fba4746e26a	1	Other	Other
+7bf7af54-b1da-4f26-b745-9f28e340debc	1	Other	Other
+7bf7ca24-e594-4848-99bc-b95f371fa2d7	1	Other	Other
+7bf7cccd-6a2d-4178-a65a-d84a85138960	1	Other	Other
+7bf7d266-92b4-4f11-9230-c88f57225aab	1	Other	Other
+7bf7e3aa-b8cb-4838-93a2-e5df6bc1746a	1	Other	Other
+7bf7e818-cc86-4cf9-80c4-6743c991fdc3	1	Other	Other
+7bf7ff96-4ddd-4ffc-84c9-b6be0d6fbc40	1	Other	Other
+7bf83c29-5ea1-4efb-8199-ab919dbcb689	1	Other	Other
+7bf8427c-773d-4094-a740-69ff8a8265d1	1	\N	Other
+7bf8c824-abb5-4a91-89d6-d1c550d0fca7	1	Other	Other
+7bf8ca6c-0f76-4c73-9de3-ae9089b57cb5	1	Other	Other
+7bf8d210-a18f-4af3-b1a2-9a00df5c4f31	1	Other	Other
+7bf8e588-d62f-4711-8b9b-6b91c6dda49c	1	Other	Other
+7bf96501-8d12-4026-b7f4-e3763f029c67	1	Other	Other
+7bf98a81-372c-4d3b-ab4d-81fd1cdca2e7	1	Other	Other
+7bfa08b5-7e08-4015-a86e-3786e58e2ccc	1	Other	Other
+7bfa5fa9-e9eb-496b-bbb2-3e1d5fdeb360	1	Other	Other
+7bfa8916-e6d2-4f5e-960d-6a67c5c570c2	1	Other	Other
+7bfa963f-f43f-412f-a9d0-a64a90903855	1	\N	Other
+7bfabc98-5976-442f-b1b5-f5b6af3c59c1	1	Other	Other
+7bfac43f-9ea7-4e0a-9c46-c6413436807b	1	Other	Other
+7bfb3823-68db-42ae-98c6-f4574fabc2c5	1	Other	Other
+7bfb9a14-4631-4784-9369-a5f89679e6c8	1	Other	Other
+7bfba2e8-2de1-4892-988f-e3c903885cb4	1	Other	Other
+7bfbb8e0-f536-4708-9724-d40b7c545a9e	1	Other	Other
+7bfbc908-d9a6-4f04-b4e6-358c7f5eeb13	1	Other	Other
+7bfbd8bb-0984-4f9f-9c5d-506bcee4da71	1	Other	Other
+7bfc4bff-acd9-419c-a7ef-2b7d54c93929	1	Other	Other
+7bfc7ce7-8f02-403c-b575-8cc8cbd34159	1	Other	Other
+7bfc7cee-2a22-4f77-be17-07a8206053f4	1	Other	Other
+7bfc9bd5-1a00-4826-8d66-9aa45ab09a44	1	Other	Other
+7bfd9934-9310-4b76-a8ad-62e1c41745a9	1	Other	Other
+7bfdf97f-382b-46af-a16e-cdfce626c42c	1	Other	Other
+7bfe0d5e-280b-47cd-b029-6c1f0258a959	1	Other	Other
+7bfe2d74-b540-41cb-93e4-b0d17398029a	1	Other	Other
+7bfe58c3-93a7-4353-9d36-c29d0a40a04b	1	Other	Other
+7bfe658b-52e4-4b5c-9044-fcc63a24e579	1	Other	Other
+7bfe77b2-5289-4433-858f-1fbf57e4e9c7	1	Other	Other
+7bfe98e2-fa67-4764-9295-650133be1411	1	Other	Other
+7bfea736-e081-4d72-a51b-1bf37a5d18f8	1	\N	Other
+7bfed6c7-f3c4-460c-bfe5-22b985261999	1	Other	Other
+7bff1a79-80db-43c4-8ffe-fe74383e557b	1	Other	Other
+7bff6d12-8afc-45de-a016-b52e30f5ab1d	1	Other	Other
+7bffdddd-af01-43cf-a719-7fb7e2732975	1	Other	Other
+7bffe472-ab37-40fc-b7b5-8995b8323076	1	Other	Other
+7bffe6ff-d0f5-4b78-8c47-5e6f747e97a8	1	Other	Other
+7c00222a-4f06-43f9-92ab-90f088963fc5	1	Other	Other
+7c005282-0f03-4a68-a90c-0d2bd6b66491	1	Other	Other
+7c006b7e-a181-49a8-a08d-7ca626de14b6	1	Other	Other
+7c00b6c5-52fb-4d53-b44a-745bebcb9616	1	Other	Other
+7c00bbc1-1682-4b77-b55b-2992b786be47	1	Other	Other
+7c015dfc-cf28-49c3-a5c8-c29fda6a15ae	1	Other	Other
+7c01aae6-c9a1-40af-b5a8-5c58184f81eb	1	Other	Other
+7c01add2-5cf5-4df6-864b-414f0b478b72	1	Other	Other
+7c021efe-4b6c-4245-9f3f-a1fe360f5623	1	Other	Other
+7c02631a-8898-498e-9f8b-b0b723f61b53	1	Other	Other
+7c026bd8-5bf5-4e97-b438-6e47646c4111	1	Other	Other
+7c028036-9acd-4800-992a-4cee2d955b33	1	Other	Other
+7c02cb95-dadc-4689-a7be-acde3f81da71	1	Other	Other
+7c02f51d-2b62-4663-9d9a-96fd43003735	1	Other	Other
+7c030944-c8e8-4c03-8a51-00cb0aeb44ca	1	Other	Other
+7c0309ea-aa9d-4bc0-93f1-356d0ef75ea7	1	Other	Other
+7c03534e-a866-44f5-81bf-dabced2a850f	1	Other	Other
+7c037e55-6685-44d9-846d-cb1241380ee7	1	Other	Other
+7c03b0ac-3994-4c46-ad60-61c747aef7e8	1	Other	Other
+7c03b4a8-3239-4fd6-a91a-02a4b7c0eff8	1	Other	Other
+7c03c2da-730f-445b-b700-28348c87ecb2	1	Other	Other
+7c042604-3200-4c7c-87b6-13ce806985a1	1	Other	Other
+7c044ccc-8e9a-41d5-bef0-b81b6c48624d	1	Other	Other
+7c047792-1f3b-489e-91d1-54ab3a516c65	1	Other	Other
+7c047fda-0290-494c-92eb-2a7be8a36ec5	1	\N	Other
+7c0481aa-3bb9-46ba-b72a-da4a5459b2fd	1	Other	Other
+7c04834b-5b12-4eb1-b397-c41382defd0a	1	Other	Other
+7c04e427-f308-4c74-8edc-ef0edddb1d58	1	Other	Other
+7c0500ef-a0f7-4497-93a3-d309ba3a6c79	1	Other	Other
+7c056d8b-8edc-4e09-aefb-5a6c4d4cf02e	1	Other	Other
+7c05dfd9-66fd-4b30-88d8-2dbce20b3f29	1	Other	Other
+7c05f7d6-1e36-4b84-988e-2442adfd9e7f	1	Other	Other
+7c062207-29b9-44e6-9ae2-c36fa9d66e4b	1	Other	Other
+7c0626c4-c618-4158-8a6a-90e3843a4a78	1	Other	Other
+7c0649f1-adc9-4f6c-8aa7-5537b696494c	1	\N	Other
+7c06759d-c9cd-4e32-9c61-558a18634be0	1	Other	Other
+7c070db3-c76a-43d7-973c-6c7df133b9df	1	Other	Other
+7c071b3e-dac4-442a-8e7b-00c630061f75	1	Other	Other
+7c08bad2-1ac1-11e8-8835-fa163e8624cc	1	\N	Other
+7c08ebd3-0bc4-4647-b091-440648d6731b	1	Other	Other
+7c08f3fb-04d5-4869-b615-ebf1c883d302	1	\N	Other
+7c090232-97b6-4982-8b39-fad6c5b07d3b	1	Other	Other
+7c094110-1740-4f4c-8058-2569c697c2cb	1	Other	Other
+7c09e6e0-21ab-44fd-ab02-d8ea756c23fe	1	Other	Other
+7c0a062b-a5e3-48b2-a450-dbcbd757eeb9	1	Other	Other
+7c0a22d3-7cea-4138-ad88-395f7f101c0d	1	Other	Other
+7c0a30a5-ee27-4475-b895-c5adc8bc0c64	1	Other	Other
+7c0a902f-b920-42c1-bddb-d07fa532e566	1	Other	Other
+7c0a9a56-27eb-490c-9c69-dadb00e0fc96	1	Other	Other
+7c0aab0a-82ef-44d1-9a02-3a6c3178c324	1	Other	Other
+7c0ab356-d369-43d5-958b-29b0a42db343	1	\N	Other
+7c0b1424-96dc-45da-9ad7-d653f7fab11e	1	Other	Other
+7c0b1560-d030-4f3e-be59-f25b2979d1f1	1	Other	Other
+7c0b2553-f509-4e71-9faf-b0b3b2c4d9c8	1	Other	Other
+7c0b63f7-5198-43a7-a161-c72692fca1f4	1	Other	Other
+7c0b6992-215e-483b-9523-ccc577a93247	1	Other	Other
+7c0b8bd0-d1cb-4fe7-9e48-274fbb72ba79	1	Other	Other
+7c0b97a4-4c37-4a34-a180-c0a848df0175	1	Other	Other
+7c0bf30e-a0f7-4bf5-a671-685acbdca842	1	Other	Other
+7c0c329d-dbc9-4677-81e9-4bd15bc684ae	1	Other	Other
+7c0c4bb6-4c73-4471-95ef-2a589c852b3c	1	Other	Other
+7c0c56e3-9aef-45c6-af25-f6a2f2d15453	1	Other	Other
+7c0d2c50-0828-409d-9659-37755d2aa289	1	\N	Other
+7c0d9dcf-fcaa-43ed-aa98-e18adfb60720	1	Other	Other
+7c0dadb9-b596-4805-8569-c8ce555497e1	1	James	Other
+7c0dcc7b-ad77-4486-877f-aacf2b86c544	1	Other	Other
+7c0e008d-4d15-4000-878f-14194c24bbbe	1	Other	Other
+7c0e7450-237a-4914-b13f-2ceeffd066d7	1	Other	Other
+7c0e7dec-cf43-4a75-a8d3-aad58fc0d58c	1	Other	Other
+7c0e7e92-ae75-4500-9d67-81f423ed194a	1	Other	Other
+7c0ecfa6-47a9-4e3e-b34c-331abd38dfbc	1	Other	Other
+7c0ed49c-a90c-418c-80d4-b2f6c9a2f8b4	1	Other	Other
+7c0f01eb-4bc1-4313-8993-5a3c384a52ac	1	Other	Other
+7c0f61c9-2d96-43c6-a2a5-18000f264b41	1	Other	Other
+7c0f66b7-ee86-40af-8471-f5e009662c25	1	Other	Other
+7c0f70e6-08f0-4712-903d-64af7beb2694	1	Other	Other
+7c0fe903-d325-4988-89e9-befdae1512f7	1	Other	Other
+7c102d77-132a-482a-9c57-73920ecfc27f	1	Other	Other
+7c11522a-46e6-452a-8277-dd0d50648aae	1	Other	Other
+7c1171a4-22cf-4e40-b051-fc839301f534	1	Other	Other
+7c11a1ed-eb4f-44b1-bf89-fc4359a74eea	1	Other	Other
+7c11cb72-7ca2-488a-9c7d-8ed8242bc4e5	1	Other	Other
+7c11d5af-fa7e-4aec-81ed-5211420132cc	1	Other	Other
+7c11db50-9d14-42f3-9bab-98a69d2136d2	1	Other	Other
+7c120b03-918a-4755-ae82-257cc4e4483f	1	Other	Other
+7c120f87-9cfd-4517-ba03-da29fd9002da	1	Other	Other
+7c12c3d6-520a-4401-b5dd-3b102d6ba3c6	1	Other	Other
+7c12edfa-fe4c-4c45-a341-f3e80748d1f9	1	Other	Other
+7c132a59-7b2f-4b94-a93b-f5c43505236c	1	Other	Other
+7c139e2f-0b87-41ba-a94f-ece91654ad96	1	Other	Other
+7c142e6b-df79-4408-af68-c6bcca2e7183	1	Other	Other
+7c1443c6-0b92-4c16-ad8e-42437f0f21f3	1	\N	Other
+7c14440b-6d50-419e-86fd-e1e4f9f306b8	1	Other	Other
+7c146b59-34e4-4de7-9f1a-62c1c6ecc7fd	1	Other	Other
+7c14900f-5325-4615-822a-12e3a7418235	1	Other	Other
+7c14a06b-5f92-4cd6-91d6-b89075062a1d	1	\N	Other
+7c14af9e-150f-4e8c-8e97-2cace71f702d	1	Other	Other
+7c14c548-4c41-487e-9afb-272122dd6686	1	Other	Other
+7c152f47-da51-49de-8805-3ab1d0e90833	1	Other	Other
+7c1532ab-ffd0-4960-832f-93cd35fa4437	1	Other	Other
+7c1540bf-3f8a-4965-a61d-79a65a2ebff4	1	Other	Other
+7c15465a-5f87-4435-86c2-f24f00d0ce21	1	Other	Other
+7c1569ee-e594-44d5-8614-ed7f8aacec60	1	Other	Other
+7c160db5-afad-451b-8d15-213332df32cc	1	Other	Other
+7c16105d-bce1-4663-9afe-b6e9033b1832	1	Other	Other
+7c162236-f11c-41e9-bbe7-d27fac5189a4	1	Other	Other
+7c165b66-c2c4-46ef-bd9b-f9e0b5767ad2	1	Other	Other
+7c166cef-f36e-4f9d-97f0-8fc0482afe10	1	Other	Other
+7c16b23a-bfd9-4616-bc5c-e2f528cda6ba	1	Other	Other
+7c16d47b-75e2-4a05-961b-7e7e58b62c4f	1	Other	Other
+7c16efe0-2937-45cc-b4f9-f7a4550d5f89	1	Other	Other
+7c16f3fc-c3e5-4040-88c3-10a3e51d6538	1	Other	Other
+7c16f8cd-0a04-43c4-afa5-88b31fce6323	1	Other	Other
+7c172380-840a-45f4-b5d4-d261949b0041	1	Other	Other
+7c17727d-a85a-47ef-aad2-2fac8acf020f	1	Other	Other
+7c17a78c-40ca-4e45-a625-f1124433397a	1	Other	Other
+7c17adf6-aba2-41a6-b754-9d3358dcf2b5	1	Other	Other
+7c1802dd-4e69-4850-bd09-d20c2651a32b	1	James	Other
+7c18afb3-bbdd-434b-8393-9ec8cbdd5e1d	1	Other	Other
+7c197430-e7ce-40da-a940-c3bb51b0804b	1	Other	Other
+7c199fc4-f6c8-49ad-bf68-3c470e479e3f	1	Other	Other
+7c19ae69-27da-4b14-8c97-a7f7773fda79	1	Other	Other
+7c19faa1-9107-40d0-a863-8c7c8974477b	1	Other	Other
+7c1a535e-811e-4dca-8a9c-188f0a9129ac	1	Other	Other
+7c1a6dc0-9b3c-4972-99bc-f8edaabda669	1	Other	Other
+7c1b38a1-d5e3-4322-933c-bc6429de9c44	1	Other	Other
+7c1b8bca-caa5-4dd0-9fb0-b9d4c9b679c4	1	Other	Other
+7c1bbdd8-c748-4a94-a03a-6fed6657f3be	1	Other	Other
+7c1bdcf0-60ea-44b0-a985-58924ecae8b2	1	Other	Other
+7c1c0a80-50c9-47a4-b5a7-e55dbd821db4	1	Other	Other
+7c1c177a-c69c-4a3a-ac87-27e888e5728e	1	Other	Other
+7c1c5bc5-254e-465f-80ac-e1166fbb0ad1	1	Other	Other
+7c1c8eaf-18ec-4171-af94-a68096614207	1	\N	Other
+7c1ca156-04b9-4eff-b4f0-179a07dce051	1	Other	Other
+7c1cbffd-a9c3-4e84-a48d-1e438695a9cf	1	Other	Other
+7c1cc826-8380-48e7-89a7-93def0e03c22	1	Other	Other
+7c1d21f6-4e7b-464d-8b2c-1cf372a134ba	1	Other	Other
+7c1d41cd-e9d0-48c8-8e28-f255af462668	1	Other	Other
+7c1d58da-78ab-46e1-82df-cf39e1255b41	1	Other	Other
+7c1d6fde-388c-4147-b78b-5af390cc51f8	1	Other	Other
+7c1d83c0-1e9c-4a86-8ca0-0b4ff0ac2fb9	1	Other	Other
+7c1da223-3484-4af3-bc8b-09e6b6657370	1	Other	Other
+7c1dc14d-37ea-4e10-94de-51a033301fc6	1	Other	Other
+7c1dcb1c-4725-47f2-8307-9f7e7219f7a8	1	Other	Other
+7c1e00af-9d6d-473a-af85-d0008fa457cc	1	\N	Other
+7c1e3af8-d5d2-4974-9033-cdc9d6ce7265	1	\N	Other
+7c1e649b-175b-40ec-8eb2-fd9231cc9ea2	1	Other	Other
+7c1e68e1-1a61-45c5-915d-423dd611d8c9	1	Other	Other
+7c1e8d32-e0c4-4919-9af7-5e93496548a4	1	Other	Other
+7c1effcf-023c-4f45-87f7-6ca3e34adebd	1	Other	Other
+7c1f0420-f600-49f3-a120-c3999560e6a2	1	Other	Other
+7c1f100e-b615-40f0-8064-857f5a3d5352	1	Other	Other
+7c1f2f93-d460-4ed5-9478-bd38495e6c01	1	Other	Other
+7c1f37ff-5f02-4d8a-9774-fead175085e9	1	Other	Other
+7c1f412a-c17b-447c-a86b-722770a38086	1	Other	Other
+7c1f66b2-2fd2-4c48-a9bc-ece7ca3e58cd	1	Other	Other
+7c1f867f-be66-417f-93a2-7973d3fba3ab	1	Other	Other
+7c1f872c-345e-423e-b268-e172edc3fa09	1	Other	Other
+7c1f969a-296e-42fc-a0d0-57d2b42e1f23	1	Other	Other
+7c1fab15-0f38-4fe5-a788-0b0f6fba3ad2	1	Other	Other
+7c1fc4f8-8663-4bbc-b57f-4b7eda6f724a	1	Other	Other
+7c203d9f-f9c9-47d0-ba15-1a2114806db0	1	Other	Other
+7c203e5a-be0b-4be1-95cb-3dec01471a45	1	Other	Other
+7c205bee-bebb-4a7c-963f-67091d526c7e	1	Other	Other
+7c2063a9-4275-403b-9ab4-bf206b9b4331	1	Other	Other
+7c207014-504c-43c0-a6c4-04eeb5b46e31	1	Other	Other
+7c20785b-4c74-4398-92cb-e1b97d514c86	1	Other	Other
+7c20d8c2-a989-4d7b-9856-d9b586013579	1	Other	Other
+7c20e976-03dd-4bba-966f-8ece5ebfd1cb	1	Other	Other
+7c210ad7-b752-45f6-a545-4b4d7383f3db	1	Other	Other
+7c212c13-5361-4766-a091-677f41977daa	1	Other	Other
+7c212e67-ef0a-406e-9926-9a319f8ce07e	1	Other	Other
+7c214337-34df-4f8e-b7a4-7f66016a28fc	1	Other	Other
+7c2165cb-f2e0-44c1-a015-7023526fbb85	1	\N	Other
+7c21b15f-6066-4586-8a1d-d8742dc78e47	1	Other	Other
+7c22916d-38e5-4561-9fd1-b7e6debbe264	1	Other	Other
+7c22d4a0-2730-485c-ac31-3b5e02cb7d4b	1	Other	Other
+7c22da32-7e63-47ff-98d2-c7a465f770c3	1	Other	Other
+7c22e7b3-b002-48ef-a8dd-35a4c09a9790	1	Other	Other
+7c230eb0-4ebc-4361-a7e3-872a8ff95b32	1	Other	Other
+7c2335d9-b807-4e37-9e15-a61f9eee3327	1	Other	Other
+7c235796-8ebd-4e67-8891-9a73de6d8c01	1	Other	Other
+7c2367ed-08f1-4ac9-b915-3e752c766eb0	1	Other	Other
+7c237094-e6cf-4482-b5e8-e9aff284c656	1	Other	Other
+7c23e2f8-599f-434e-9f77-dda28b0f56bf	1	Other	Other
+7c243073-300a-444a-a8ac-fcc4e7a8c496	1	Other	Other
+7c243e7c-f239-4891-b4ce-86055c8efcc6	1	Other	Other
+7c248ef1-0e8c-4ac0-8f09-63e8ea98e806	1	Other	Other
+7c24d773-1820-479b-909d-f167706bf778	1	Other	Other
+7c24df4f-bc94-478b-86d4-8fd81ed692f8	1	Other	Other
+7c26151a-e2a4-4134-bf02-85b26c1cb645	1	Other	Other
+7c264465-7b4f-4860-a56b-ee91806ee02a	1	Other	Other
+7c26a9ae-9511-43dd-a6e9-25e7bf0f910b	1	Other	Other
+7c26d6fb-7ede-4edf-afca-86e65a3b78e9	1	Other	Other
+7c279ac1-2873-4c16-9d0c-4a064d2ed671	1	Other	Other
+7c27b716-31c2-4ace-848a-c8b57f070d7f	1	Other	Other
+7c27e94e-4aab-469d-ae7e-6ad2eaefc982	1	Other	Other
+7c280662-2027-4219-a6bb-06419eb43402	1	Other	Other
+7c2837a5-5c87-44a3-a76e-7c20820c8d05	1	Other	Other
+7c28634f-051d-4497-85eb-6e98a2935f6d	1	Other	Other
+7c286c72-2c83-4a0c-9050-ae739b6ee774	1	Other	Other
+7c28a37e-60fa-476b-b275-147f00023cd4	1	Other	Other
+7c28debb-d0fb-4b6e-8923-43b3833a1d67	1	Other	Other
+7c28ef61-12be-4ecd-ad43-52fdd21c0b61	1	Other	Other
+7c28f2cd-a6a0-4812-8898-3fa1270e1c75	1	Other	Other
+7c294ff8-e033-45ec-9483-8af796ca2805	1	Other	Other
+7c298d08-083a-4e46-97f9-efa92bef9cb5	1	Other	Other
+7c29c327-c562-4d2c-9430-4c26a8709e08	1	Other	Other
+7c29c78f-84a7-495a-90d0-6465fd22ddee	1	Other	Other
+7c29d0ca-32c5-4e09-b48f-6a4cd8324ab1	1	Other	Other
+7c2a26d9-a102-4abb-8a24-5445c2baa6d9	1	Other	Other
+7c2a9428-ee70-44b5-bc64-7dce8937e04a	1	Other	Other
+7c2a9fb9-5443-4b61-872a-54cf5f0aad9d	1	Other	Other
+7c2ae31e-91b6-4de1-8ca7-59c12a819d8c	1	Other	Other
+7c2ae579-4cc0-4b24-958a-b4cb396868a0	1	Other	Other
+7c2c28ff-b025-4001-880f-deeacef2a726	1	Other	Other
+7c2c2b84-e5bc-4ad5-a399-3acf231c15de	1	Other	Other
+7c2c46cc-d71a-4caa-b0b3-84d4063a4f95	1	Other	Other
+7c2ce69f-3e49-446a-be5f-259fe327df1b	1	Other	Other
+7c2d0064-0383-4409-be32-94e8ec478796	1	Other	Other
+7c2d52ac-6715-43ef-ab9e-13a05a17bbaf	1	Other	Other
+7c2d72a5-ce9a-4cdf-b161-3e958b36ddcf	1	Other	Other
+7c2db3ce-b04e-4b40-bedf-2d55e349dc9b	1	Other	Other
+7c2de932-ee3e-46cb-8c34-0c20db5fb613	1	Other	Other
+7c2ded1e-31cf-4b57-952b-93715089edbb	1	Other	Other
+7c2e4a16-fc57-45c9-8f44-564381b95976	1	Other	Other
+7c2e8ee3-f69b-46a3-b0f5-f8f0c43dbf65	1	Other	Other
+7c2e98ff-71d5-4e34-a482-6943dc4708b0	1	Other	Other
+7c2eaa18-16df-41ac-8db2-f62c4a2941a1	1	Other	Other
+7c2ec254-139b-4d09-b2f3-72e057d34be7	1	Other	Other
+7c2f04e3-477c-4a0c-88f1-19ef2a82fa4c	1	Other	Other
+7c2f074e-cd0c-4f93-a095-37110078778c	1	Other	Other
+7c2f2133-3260-4fb0-9796-68a1ce621846	1	Other	Other
+7c2f5183-a173-4354-96ee-0f4055151352	1	Other	Other
+7c2fa53f-8213-453c-be69-33810c042f59	1	Other	Other
+7c2fa7b2-1b17-47b9-b15e-b8028ed09cd2	1	Other	Other
+7c2fb61a-bc9d-4d30-b383-91f5c857a09e	1	Other	Other
+7c302b62-483f-4d71-847b-b05673c9f9be	1	Other	Other
+7c3065df-6a13-4460-92d2-42f54a19618c	1	Other	Other
+7c306683-7bdd-439a-b6b2-737346fcb390	1	Other	Other
+7c309a4a-99ae-4b7e-b16f-6e9fc38e67b8	1	Other	Other
+7c30a135-6eef-4286-8980-01a82766f3f7	1	Other	Other
+7c30b040-12d6-4535-ae4a-0d581e22f7ce	1	Other	Other
+7c30ff71-8a7a-4cfa-b509-65874786deee	1	Other	Other
+7c3116fb-944e-4918-9fd2-88b0518d655f	1	Other	Other
+7c314c24-44ab-46f7-a9ed-de8a3b995f6f	1	James	Other
+7c316af7-7b1a-4016-8905-247268130e32	1	Other	Other
+7c31946f-ab48-4a0c-8907-17bcf898c868	1	Other	Other
+7c31c7dd-3e1a-4891-bb8c-1769d53af6da	1	Other	Other
+7c31f4f8-33ff-47b2-b253-eef68e58aff5	1	Other	Other
+7c320639-4712-482e-8e75-559175864b1a	1	\N	Other
+7c324c3d-c3b8-400c-afbf-52cae09fc74b	1	Other	Other
+7c327fbc-a600-4184-8b72-924fd6b195d5	1	Other	Other
+7c328807-491b-422b-b529-7e7182175c71	1	Other	Other
+7c32a8f1-ffd4-4ad7-a672-dacd3fdbecbb	1	Other	Other
+7c33c3f7-b36a-41d7-888c-3949639e24f1	1	Other	Other
+7c33c860-8d15-4c64-97a3-e4a93e245ae7	1	Other	Other
+7c33ca30-c1cf-493d-a6d9-f03a5f007ab5	1	Other	Other
+7c33f94a-9515-45a2-aab5-49efef5b827f	1	Other	Other
+7c341b5f-dea1-41b4-a145-03833206adf9	1	Other	Other
+7c342856-a864-4022-939b-7b8266100946	1	Other	Other
+7c346ec8-1250-45e8-9b24-470ae88767ba	1	Other	Other
+7c3487b5-9027-4dd2-83c0-e92fbac9d626	1	Other	Other
+7c34a54a-c5db-4a94-8b03-3b4ca750902f	1	Other	Other
+7c34b23b-a29e-4135-a235-89355c671189	1	Other	Other
+7c34f920-4e6d-4a23-a04f-ea907633ad92	1	Other	Other
+7c350217-bb84-460d-9ab6-d664926b2eb7	1	\N	Other
+7c3558a9-6a09-402b-b6f4-2fa83104aaac	1	Other	Other
+7c36023f-4507-4a01-9cf6-2022b241b780	1	Other	Other
+7c361a67-6a6f-4275-a1fc-101a768206cd	1	Other	Other
+7c361b06-6421-4388-9ed1-6ffb31b5bcdc	1	Other	Other
+7c362030-532f-4066-8cb1-6558ed6a0a25	1	Other	Other
+7c3658a5-5522-4033-be8a-90facff7b6f4	1	Other	Other
+7c366d01-4daf-4601-ab7c-dc3489d0c056	1	Other	Other
+7c367935-1fd9-45a5-83f0-52350e628040	1	Other	Other
+7c3705e9-ba75-4ba9-88ce-99b3a7240e2f	1	Other	Other
+7c37487b-9d2f-49ee-ac42-27086ef7bfa0	1	Other	Other
+7c37765c-58c6-4375-afb5-05763df8facc	1	Other	Other
+7c37f71b-4430-4b8f-9647-0eefdaac03ac	1	Other	Other
+7c384ae9-9780-42cb-ad81-7ea21573c4f2	1	Other	Other
+7c386a70-23fd-42df-ae7c-5c7110049589	1	Other	Other
+7c38bf26-d3da-471b-857d-dea475818262	1	Other	Other
+7c38cd41-1b0c-4c9d-a15f-d3380325db71	1	Other	Other
+7c38e457-fb70-46dd-a01f-d7e15a5d321f	1	Other	Other
+7c391b8e-4f72-4d6f-ad0c-e6e5105532f6	1	Other	Other
+7c3950c9-0e9a-4200-ba05-05edf4c4d05d	1	James	Other
+7c396306-9b36-4e74-b74d-6f2c664dd7d5	1	Other	Other
+7c39cc7b-7ddf-4d55-9783-3f210ddab360	1	Other	Other
+7c3a2a63-5894-4244-9029-034e81194838	1	Other	Other
+7c3a5683-5187-4953-851c-9059a7938e4c	1	Other	Other
+7c3aa0f5-150c-4803-8ffb-1b95dbe3f536	1	Other	Other
+7c3ad1dd-0870-4de5-b548-012cb63268e6	1	Other	Other
+7c3b1788-e8cf-4ec5-8c4a-e5039d27360b	1	Other	Other
+7c3b4ca7-a71e-410f-a579-c1b468a3327f	1	Other	Other
+7c3b5ca8-6a09-445c-b5a2-8d5908af2171	1	Other	Other
+7c3b68f0-5cc2-4b73-9e51-7857f60d3c4b	1	Other	Other
+7c3b9e79-48c7-4fef-b513-3f674a4c5259	1	Other	Other
+7c3bb217-597b-4494-b409-276742521194	1	Other	Other
+7c3be6ca-b66f-11e7-8f5c-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7c3bf38f-b824-4e0c-9915-aad196f033d4	1	Other	Other
+7c3c61de-8606-4177-9dd7-2bb419f64eb2	1	Other	Other
+7c3c7505-5d19-4f3b-b7e9-be202fd5a6ef	1	Other	Other
+7c3c7b54-bf97-496c-9647-91c011d0702e	1	Other	Other
+7c3c841b-7998-493d-99d8-9c9b50190257	1	Other	Other
+7c3cad74-ce3b-4021-a671-dbcf090c906a	1	Other	Other
+7c3d659c-0bb8-4297-9969-20ca074fc840	1	\N	Other
+7c3d9ecf-81b7-4f1a-bf12-1e7fb7ca811e	1	Other	Other
+7c3db0b8-1c45-4776-a296-c2d5715a7594	1	Other	Other
+7c3dff22-d1dc-46c5-859b-2f4d07f93f2b	1	Other	Other
+7c3e1501-2cf0-480f-9080-70a860d8dce2	1	Other	Other
+7c3e3106-e252-4576-8c17-45f3931b7f65	1	James	Other
+7c3e3cbf-7f04-4e35-9d9c-5d0fbd637b31	1	Other	Other
+7c3e6f7d-dbf4-45d8-bfa2-ddbcaa65aeb5	1	Other	Other
+7c3e8ee6-3ca0-4234-b97e-f025c3509a95	1	Other	Other
+7c3e952e-e1a5-4ece-af80-1ef54dcabf50	1	Other	Other
+7c3ece3c-2474-40c8-a297-b16112bd2115	1	Other	Other
+7c3ef6de-4690-4049-bffe-31e049248d80	1	Other	Other
+7c3f3feb-932f-4f03-8466-9953ca115c57	1	Other	Other
+7c3fcb28-ae97-4d05-a3fc-fca87e997ee2	1	Other	Other
+7c3fcc9a-a86c-4eac-b661-287aff855602	1	Other	Other
+7c3fd490-e1c0-4ea9-baac-1d13c31330d6	1	Other	Other
+7c400ceb-8a4d-4e49-a7a5-fa56ae574e75	1	Other	Other
+7c402783-9233-41dd-b4aa-c74c3e930e14	1	Other	Other
+7c40349f-8a2a-4814-bf45-16428030a52d	1	Other	Other
+7c407c13-5ad6-40c0-8e0f-bb19e17956d1	1	Other	Other
+7c40a211-6557-4f2f-8f29-fc86cbaa55de	1	Other	Other
+7c40b4b7-ffda-4d60-86d2-94155d142a6b	1	Other	Other
+7c40f2ac-e87f-47ff-9229-e38d8a6eb7cc	1	Other	Other
+7c4107c1-4b38-4dd7-95fd-b847cb7fd540	1	Other	Other
+7c416583-7867-4e27-a3e5-6c600b9e86fe	1	\N	Other
+7c418775-4f7c-4b05-bbf1-060064f41460	1	Other	Other
+7c418cad-6137-4f5c-bff8-91641e6b6e37	1	Other	Other
+7c421433-76b5-4f49-9633-778d7fa802c9	1	Other	Other
+7c4256c6-42e7-4800-ac08-9298dda126ae	1	Other	Other
+7c42754a-7ceb-45d1-a8c8-d53ee843310f	1	Other	Other
+7c42d10a-a658-41f8-ade1-53d5ad309e89	1	Other	Other
+7c42e19b-9733-4ec6-a888-2637bcb3b793	1	Other	Other
+7c42ff61-c0ee-4190-a859-c41514fe072f	1	Other	Other
+7c4382d7-b39c-4d27-abe4-3a3650ce5ad9	1	Other	Other
+7c440105-e295-4a08-950e-69d79c0b41db	1	Other	Other
+7c445451-52bc-431e-8c18-e0f6cadeecaa	1	Other	Other
+7c4457fe-1617-49e0-a410-e8ddbeffb128	1	Other	Other
+7c449034-d72f-4f2a-aee8-942084fd4637	1	Other	Other
+7c449986-4586-4b8e-931b-4b604015206a	1	Other	Other
+7c44ae2e-56b4-40cc-9249-77f6b1b75700	1	Other	Other
+7c44bb2d-7c27-46f3-9ac3-23415afc1f9f	1	Other	Other
+7c44cdb3-01cc-4aa0-ac0a-dfe14c37da8c	1	Other	Other
+7c44e820-ebe0-4380-a94c-4443a02fcc82	1	Other	Other
+7c452a21-3b2b-470f-a659-e65c22907f52	1	Other	Other
+7c453aab-7e2b-43e1-8780-c4790cd57e9d	1	Other	Other
+7c45481e-138f-4c4c-8e60-664e09ee189e	1	Other	Other
+7c458cf8-1cb6-4b85-8e11-5fefea8986bc	1	Other	Other
+7c45b2ad-1fa4-4534-949b-75bdb68b146c	1	Other	Other
+7c45d10a-e4df-4285-8f5e-87d2b715adea	1	Other	Other
+7c45f390-968e-415f-99d9-4547dcddbcfd	1	Other	Other
+7c460f98-fefa-4e92-a68c-02eaa932e03f	1	Other	Other
+7c461ef4-5056-4dcc-84f9-b0b828781663	1	Other	Other
+7c463f46-8fff-484c-b91e-c88acfdb0fb5	1	Other	Other
+7c47252c-3bd6-415b-a475-36b165db9bd5	1	Other	Other
+7c475176-84db-4a0e-9528-8c173513a706	1	Other	Other
+7c47a5da-05ed-4460-b180-b469690a3841	1	Other	Other
+7c47c7d9-0750-4fbb-ba45-16512916563d	1	Other	Other
+7c47eb1a-050c-413c-b638-5f0804e04413	1	Other	Other
+7c481a5e-6c10-4535-b8f7-205be0220683	1	Other	Other
+7c4820dd-3cf6-4de5-a426-91efd2477e0c	1	Other	Other
+7c4835d6-c56d-417b-8b6f-da577bb00933	1	Other	Other
+7c483dee-17ef-455c-89d5-5d03c5624322	1	Other	Other
+7c486477-c3ee-4e9e-b826-491dfe97de3e	1	Other	Other
+7c48cd4b-5d4b-450c-8b00-3231c055b82f	1	\N	Other
+7c4983fa-c78a-442e-a04f-bb76fd1d201d	1	Other	Other
+7c4991ff-4396-4430-ac93-8352a8686341	1	Other	Other
+7c499559-e4fb-4f33-9b7c-6bb0dd1bd156	1	Other	Other
+7c49b449-3f18-4820-8bc2-4abb293153f0	1	Other	Other
+7c49bde1-4c9b-481b-b4a6-8245642d0ac8	1	Other	Other
+7c49df32-16df-42be-b7fa-96d2c7478ddd	1	Other	Other
+7c4a4944-521c-46cc-9ba0-0947380fec2e	1	Other	Other
+7c4a994f-ea9a-43a3-9612-d511b5e58d02	1	\N	Other
+7c4ab8bf-90df-4a68-ab8d-39a37528f34d	1	Other	Other
+7c4acc9b-39ef-40bf-89fd-afde91f5e4ed	1	Other	Other
+7c4ade2a-d8b5-4d74-88b3-ec68974e9f44	1	Other	Other
+7c4b253e-8bae-4ad5-a183-62a8cef596a7	1	Other	Other
+7c4b9af5-2076-4028-9754-a7464e73ac6f	1	\N	Other
+7c4bb532-6ecd-4414-9127-01878e1d44c2	1	Other	Other
+7c4bb8a2-c28d-4104-879d-146e8f0cd20e	1	Other	Other
+7c4bd84b-7a91-46ab-96b5-3995bbcee27c	1	Other	Other
+7c4bdaab-d9a5-42f0-bf4d-c7653970d178	1	Other	Other
+7c4bdfab-65c0-4d37-bed9-e3464774f5af	1	Other	Other
+7c4bfa08-426e-407e-b37d-ed04234828bd	1	Other	Other
+7c4bfd35-b56e-49be-8b83-e26830e32a41	1	Other	Other
+7c4c1b5b-7006-4f9e-9790-ac362010b6a9	1	Other	Other
+7c4c357a-77b9-4a70-8058-44a013245d96	1	Other	Other
+7c4c46c8-fe9b-41fb-a577-2f0e29be7b86	1	Other	Other
+7c4c64f3-90e3-431f-9eda-c04aecc40e11	1	Other	Other
+7c4c6e3a-7bc5-4bd4-9506-d68b1705c024	1	Other	Other
+7c4c6ffa-519d-4520-96a9-41de12417f9a	1	Other	Other
+7c4cc285-dbf4-4b98-b59d-c3f0f53c92b9	1	James	Other
+7c4cc8cf-39b5-4835-826d-fad1f7a0e193	1	\N	Other
+7c4cfe0c-73dc-49a5-8a26-09dc9ec46822	1	\N	Other
+7c4d1e32-65f3-4a72-b769-1395322fd185	1	Other	Other
+7c4d2cd6-9399-48f8-98b1-16fb6259f501	1	Other	Other
+7c4d3635-aa4b-450c-a351-d084964c5c81	1	Other	Other
+7c4d9ca8-2075-431d-91c8-2b50f59c9b0d	1	Other	Other
+7c4dc5cb-9320-4e02-b6e9-d9d9a4394fab	1	Other	Other
+7c4e10bd-cf0a-410d-a4d0-7a3bc84495f0	1	Other	Other
+7c4e180a-c31c-46dc-ab51-9739be61d66a	1	Other	Other
+7c4e388a-6bdc-4f6c-b25a-5ed8006fbd00	1	Other	Other
+7c4e95f3-2f2b-4e9e-beea-3105fa232ca3	1	Other	Other
+7c4ec47e-a344-45a5-82f9-562f0c8dc7c4	1	Other	Other
+7c4ecbbb-9e20-4fd9-a17a-d54db1a593b4	1	Other	Other
+7c4edc39-5edc-4701-a0e8-9c5967a7cb45	1	Other	Other
+7c4ee3b6-9a97-4294-a63f-c7f5f27e5435	1	Other	Other
+7c4fc125-0368-4ff4-a2a4-7e29ab720b67	1	Other	Other
+7c4fc17d-184c-4c7e-b60b-18f984bd53ab	1	Other	Other
+7c50026a-6445-4e36-bc9c-d1e38c7a4225	1	Other	Other
+7c502cd3-55d1-49d5-8cee-46c46e594740	1	Other	Other
+7c50426a-8695-42e3-96da-b6951631419b	1	Other	Other
+7c509ccf-c164-401f-930d-463fd7adc3a2	1	Other	Other
+7c50cc02-4341-452d-a29d-ca111a114d3b	1	Other	Other
+7c512f91-f4d0-49d4-9acb-aef5bda39b36	1	Other	Other
+7c5133ef-131f-489f-92bb-149d0230021d	1	Other	Other
+7c5159d9-1793-44f3-9187-814ae4d037e9	1	Other	Other
+7c516298-9772-4c4f-a953-84e745ee9c37	1	Other	Other
+7c5207fa-7747-4328-9383-c0e0303f3c06	1	Other	Other
+7c5230b3-a621-4aa9-9dd2-6ad9b0525858	1	\N	Other
+7c523a6c-204e-4930-a4e9-79eb897f09bc	1	Other	Other
+7c525fb5-e1b5-4f04-a6b7-5dffef56cbee	1	Other	Other
+7c527210-c19a-4b89-82ca-a5a8508cf521	1	Other	Other
+7c52af89-982d-446d-9070-a52026a7aa17	1	Other	Other
+7c52d6a5-1751-438a-9801-4d244d6f7cae	1	Other	Other
+7c53d83b-d2a4-40a4-84e7-396c89aa4fa7	1	Other	Other
+7c5404ef-01ae-47bd-8fbe-fc80701d4a91	1	Other	Other
+7c542611-aa7b-4121-b30b-049c7b2f281d	1	Other	Other
+7c5440a8-f9b2-477d-93ca-4fa54b6f30a8	1	Other	Other
+7c544a68-6733-49a8-a6a3-5614a96438d6	1	Other	Other
+7c548610-2ea3-4be1-8ca4-404228394d0d	1	Other	Other
+7c54d427-6d33-43c4-9f1a-6221af3c95d0	1	Other	Other
+7c551cf1-9dc7-4a5d-8245-f5cbd443bbb5	1	\N	Other
+7c552ad6-8954-47a3-951b-604aa49de473	1	James	Other
+7c554f61-3a12-4557-bd60-1fa93870cec3	1	Other	Other
+7c55a6a0-8d2d-4a95-99fc-7938de034ba5	1	Other	Other
+7c55f2a7-0389-45d8-9255-3d9b26b79327	1	Other	Other
+7c56414e-6ccc-4bc7-baef-c83419103dc3	1	Other	Other
+7c5657b9-c998-483d-a79b-3f64c5b60520	1	Other	Other
+7c5686cd-9e7a-439e-9e01-43bbcc9b64b4	1	Other	Other
+7c568f23-9b31-4252-9a5f-281d0cc5da81	1	Other	Other
+7c56ba1a-ab5c-46ea-bfa3-16986e2ef260	1	Other	Other
+7c56dcb6-cdc4-4e2c-a317-87c0062c235c	1	Other	Other
+7c570253-e5ac-41da-a6ba-92421e57872d	1	\N	Other
+7c577b63-c40d-4c17-a569-4f440d81cb85	1	Other	Other
+7c5790e1-9321-4174-a2e5-2a02e8c5fc63	1	Other	Other
+7c57ca74-566c-434d-a549-ce04cd57e7cc	1	Other	Other
+7c57dcfa-6b9a-4be5-927d-a5a51106b802	1	Other	Other
+7c57f680-ed1d-4181-88a8-76ec74fff96c	1	Other	Other
+7c580d40-5c67-4490-a8f4-c9c9b25edc76	1	Other	Other
+7c583584-2e81-4bb0-94e6-10e01ecfc8b7	1	Other	Other
+7c5852bb-e7f8-473c-8aba-86bd28c5fdf6	1	Other	Other
+7c587ce5-59b3-4fc0-b10f-8b36d08eb709	1	Other	Other
+7c587e68-d92d-44d8-9f3f-89aa147be72c	1	Other	Other
+7c58f032-1f05-4007-9f63-260dd8ccc00b	1	Other	Other
+7c5932b2-d94e-431f-bac2-03db4061bc77	1	Other	Other
+7c598a9d-4b6a-4fdd-a0ff-fa64f5461daa	1	Other	Other
+7c598ff9-dc3c-4029-a2d4-791048999707	1	Other	Other
+7c59c577-a891-4a2e-8d6f-4bb768e48bce	1	Other	Other
+7c59c737-b458-486c-babe-5179c43fe1ae	1	Other	Other
+7c5a080c-0c58-4698-a8b6-eb3f2494aa48	1	Other	Other
+7c5a1f65-3e35-4748-af2e-a3a5dca1e909	1	Other	Other
+7c5a5bf8-69bf-4383-9d75-9d8b6d534dd9	1	Other	Other
+7c5acb55-e3a0-4917-a660-d42f51ee89eb	1	Other	Other
+7c5acf7c-485f-4f8e-ac2b-f0e3abe9e5a4	1	\N	Other
+7c5b11bc-0dac-4848-8b6c-fb307d3cbe06	1	Other	Other
+7c5ba1b7-7ea7-4beb-a568-9038ee242f1d	1	Other	Other
+7c5bb8c2-aadc-45fa-9dba-75378f0bef74	1	Other	Other
+7c5bcdb1-c3b7-4479-9706-ec4bab79266c	1	Other	Other
+7c5bedf1-cd91-4cb2-843f-129df74e500a	1	Other	Other
+7c5c14a2-e68e-41fb-ab8a-59609057d9a2	1	Other	Other
+7c5c2483-8153-43a6-8914-f4100a8b7d38	1	James	Other
+7c5c2fdb-da33-4f01-9475-1392451a1187	1	Other	Other
+7c5c58dd-1099-4018-8945-9455efdb4577	1	Other	Other
+7c5c7896-7576-491f-b05e-42f07729ee7d	1	Other	Other
+7c5cfe9c-beca-4202-8df2-d0d3d1e8e873	1	Other	Other
+7c5d13dc-dfb6-4511-803f-b298027395f7	1	Other	Other
+7c5d79a0-fcff-4aea-a64f-e9fe394cbce0	1	Other	Other
+7c5dfc89-82ab-4f48-9fd9-a1fd83f22340	1	Other	Other
+7c5e0308-f5f6-438f-af5e-4ab92b10930b	1	Other	Other
+7c5e2f5d-63e4-41b2-897f-2eeb176c1072	1	Other	Other
+7c5e3d1c-71d3-4dbc-83e4-cbba55dda04f	1	Other	Other
+7c5e600f-20dc-47d5-ba5e-a1c7b7552222	1	Other	Other
+7c5ea6a1-5bb8-476a-b492-5d3c78afc5b8	1	Other	Other
+7c5eb5a5-9e36-425b-93ff-a66abe3f1d7f	1	Other	Other
+7c5eb65d-4402-4540-8196-68a5a494f754	1	\N	Other
+7c5ec0b5-2c70-4fb8-8ece-212caa125836	1	Other	Other
+7c5ed036-77ca-4202-bcfd-fa4aa715b920	1	Other	Other
+7c5edf68-6341-4a9c-805e-cfa4380e35b2	1	Other	Other
+7c5ef3ee-c47f-4e40-8fdc-b0df2ea167d3	1	Other	Other
+7c5f3a2c-aaf0-4144-8e98-7d08c0a3792d	1	Other	Other
+7c5f65c2-9e53-434d-beaf-02579c7f3f30	1	Other	Other
+7c5fc8eb-6afd-42f7-b4e9-2a0199599c4a	1	Other	Other
+7c6029ff-03e8-40ab-aec0-3b509fe53caa	1	Other	Other
+7c602cba-ed17-439c-b4bb-559f04218d3d	1	\N	Other
+7c60a473-71f4-4e1b-ac9e-ef48ad709c23	1	Other	Other
+7c60acc8-c1d4-454c-a99a-1f69c21412f4	1	Other	Other
+7c60af8b-fa2e-4638-a5c3-823e772ba897	1	Other	Other
+7c60d79a-1ee9-46fe-9d99-66fbaf92f889	1	Other	Other
+7c60ff28-deba-47dc-b389-fb4c7119e937	1	Other	Other
+7c610d1c-80b4-4266-8e4c-1d4835bf3650	1	Other	Other
+7c611aec-5a34-4ebf-9ad9-46c658341a46	1	Other	Other
+7c6200f2-b39f-4059-aea6-2510f01ead47	1	\N	Other
+7c623e83-9389-4c91-b9a9-33b425d21f0f	1	Other	Other
+7c628a10-5f5e-4cf3-9c1f-eec7546caf04	1	Other	Other
+7c629556-a28c-43e8-a307-e35819784772	1	Other	Other
+7c62dc09-2629-4f4c-9fe4-b00e7ec291ce	1	Other	Other
+7c63745b-bb80-4f50-bee4-c9b8d8356e26	1	Other	Other
+7c637a06-0a20-4bc8-bb65-736257d60643	1	Other	Other
+7c637c94-3d6b-47a6-846d-727a6a8582b9	1	Other	Other
+7c63da07-bbda-4b91-b551-271b4d7c1f34	1	Other	Other
+7c63e8ce-57c5-40c0-a4d1-4cabd28ee9cb	1	Other	Other
+7c642123-2c2c-4c85-a724-3f591e960f88	1	Other	Other
+7c64363f-379a-4a6e-b737-c5242012a1d9	1	Other	Other
+7c6442d0-109e-4900-a243-739ab1428d42	1	Other	Other
+7c649191-d97a-4192-8b6c-0181dcc3ff68	1	Other	Other
+7c64ad28-76f2-4b5d-b5c7-e302d89fef2a	1	Other	Other
+7c651cbe-0e87-4ae9-aab1-d88547a9d928	1	Other	Other
+7c659f82-f834-41c4-b577-57cec8e5f15a	1	Other	Other
+7c65a158-37a1-471b-965c-e4906e78cec6	1	Other	Other
+7c65adb5-46f9-42d2-80ab-a444ab94faf2	1	Other	Other
+7c65b229-a2bc-41ca-9cfd-1caf3c629bee	1	Other	Other
+7c65c4b4-c065-4260-a768-8a1925c185c0	1	Other	Other
+7c65e431-7fd9-4c86-893f-ef468a7195f0	1	Other	Other
+7c660d8f-72df-4a51-89ab-1aab9cd9d8d5	1	Other	Other
+7c664ab3-2b1d-43b9-a083-1acee550a101	1	Other	Other
+7c66ab1c-23bb-41e3-a714-bb98459a9542	1	Other	Other
+7c671110-9b94-4ec9-89d2-cdec4d9b3282	1	Other	Other
+7c671f76-97d3-4928-aede-698fdc79bb6a	1	Other	Other
+7c679460-99c9-49bd-9707-511a27249b37	1	Other	Other
+7c67abb4-8c71-4204-8003-9bca6a4efbf4	1	Other	Other
+7c67c1a4-f13d-4a77-ba0b-59795caeea29	1	Other	Other
+7c67c36f-a34f-4931-b2f8-1c5253836b5b	1	Other	Other
+7c67d756-d24a-49a2-9779-bffd2e82ba98	1	Other	Other
+7c67fb56-cb1c-46c4-bc38-5a9dee2ddf24	1	Other	Other
+7c683d7e-0c42-4f21-b65f-b097121513f9	1	Other	Other
+7c68cc30-9d62-4358-b93d-391ad08083b1	1	Other	Other
+7c68e5b4-27ae-4b36-a74c-97891c79a83c	1	Other	Other
+7c68ee64-5c93-449e-b1b1-645945ea555b	1	Other	Other
+7c692191-03e6-47ed-bdfc-eed69ee701c5	1	Other	Other
+7c6930fe-18f6-45ec-92bc-3ebefaa59f4d	1	Other	Other
+7c69f2ae-8404-46fb-bb23-be6429bb1658	1	Other	Other
+7c6a6022-745b-4804-981f-b60f22e770eb	1	Other	Other
+7c6abf06-6655-4ec0-b825-3443cd8b2fc4	1	Other	Other
+7c6acc78-dbfa-43d2-a14a-6458d2a2b27d	1	\N	Other
+7c6b49e3-d08e-44f0-97a5-d184193f512c	1	Other	Other
+7c6bb48d-2df0-41cb-b4fa-71579197e5df	1	Other	Other
+7c6c038d-e874-41e3-b59e-2df23048911a	1	Other	Other
+7c6c1866-0f4e-47e8-972f-1c23bdcc1959	1	\N	Other
+7c6c60b5-9826-44cb-b416-3776f689ae8a	1	Other	Other
+7c6ca5f5-4f66-4a0b-9741-9a73ceb10a65	1	Other	Other
+7c6d2125-744f-4e50-8605-17b91b9c2f56	1	Other	Other
+7c6dc841-3057-48c2-9e92-f9b6a9278571	1	Other	Other
+7c6de5f2-92a7-47ea-a201-b2d276e8886f	1	Other	Other
+7c6df401-8655-4211-82a5-3ac7c27a55e4	1	Other	Other
+7c6e0120-e213-4161-9628-3f6e1de9990e	1	Other	Other
+7c6e2f7a-32b4-4ddf-8683-cae74130fc95	1	Other	Other
+7c6e8923-c42d-46b1-8074-30bc403c0d0d	1	Other	Other
+7c6ef13a-6fad-47f1-9087-eb2dc1b7028b	1	Other	Other
+7c6f3356-0a7b-4cab-90f9-de167859811b	1	Other	Other
+7c6f5b53-686e-4c51-8864-268ea92153a7	1	\N	Other
+7c6f6b0d-6f74-4784-86b9-f2df1fae3464	1	Other	Other
+7c6f8371-457a-4345-8027-0fa1dbc74652	1	Other	Other
+7c6f8ed3-b394-451a-8069-6549bd118c79	1	Other	Other
+7c6faf79-b2b4-4842-a740-985c4e3b688d	1	Other	Other
+7c6fd27c-8e2b-47de-a51b-311db585c2c3	1	Other	Other
+7c700c1a-d2e5-4e17-996d-7c93aca345e9	1	Other	Other
+7c703b69-c683-40cb-ad99-9d5f78b362e7	1	Other	Other
+7c708ca9-ed9c-4d84-8a14-e76e36a90543	1	Other	Other
+7c70933f-7acc-47f9-b231-6cf9aa4490f6	1	Other	Other
+7c7099da-19fa-4798-bdab-e46f1bc22327	1	Other	Other
+7c70dd56-5ba0-42ab-b69c-648752058e3c	1	Other	Other
+7c70e27e-69c1-48d6-8462-057da50acad3	1	Other	Other
+7c70e2c2-9452-47c1-8435-307eca7c17a2	1	Other	Other
+7c70f998-5048-439f-8b2e-a43c21c0ae1c	1	Other	Other
+7c70fdaa-fd7d-4151-b9b9-c56c7d9beeae	1	Other	Other
+7c71052d-ae51-48fd-ae8b-da65dcb7f89e	1	Other	Other
+7c7122f9-03ca-434c-bcef-e0a0f638ce95	1	Other	Other
+7c7124ed-cbf7-439e-9ef4-b0a5c1940c4e	1	\N	Other
+7c712b03-d33d-4487-b234-bbec7042e9d7	1	Other	Other
+7c7145f7-7b40-49e9-ab0a-f3dbdd8335e6	1	Other	Other
+7c717c1e-fd56-46de-a91a-3aeb722e9d7c	1	Other	Other
+7c71cfb5-5a3d-480b-8350-9df30db63376	1	Other	Other
+7c72a23e-9612-4528-91a2-c94d7b491354	1	Other	Other
+7c72be36-3527-48f8-8c07-ac7df1c85659	1	Other	Other
+7c72d3f9-d051-47c9-adf4-9012a127c0ac	1	Other	Other
+7c72f06a-ee8e-4fb3-b1d7-03ebc9318f6d	1	Other	Other
+7c7310dd-5b5c-4495-a34f-255b9e146661	1	\N	Other
+7c734d81-0962-47d1-80af-7da28fcfd257	1	Other	Other
+7c73c17f-621d-4f0f-ab09-9d377a1dab75	1	Other	Other
+7c740d5d-1de6-4a68-ba83-ecfc470f2166	1	Other	Other
+7c740df5-9d00-45cc-92ef-aec96b581b47	1	Other	Other
+7c74397e-9bb4-45ae-aa17-2ec216d22bd2	1	Other	Other
+7c74823f-c36c-4eae-a0cf-423e0f92aafc	1	Other	Other
+7c7482a2-db79-44a6-af86-212c045b0eb2	1	Other	Other
+7c74b43d-3f0e-4ead-8755-c5a939b3b61b	1	Other	Other
+7c74ca2a-c6e6-4535-aa2c-5062d604cdf5	1	Other	Other
+7c74f215-12fc-4578-b8b6-e76cff9b0c96	1	Other	Other
+7c751d67-726f-410c-bea0-7a7e6ab5d3a3	1	Other	Other
+7c75204e-4428-4004-9742-fbb2600ffaae	1	Other	Other
+7c752424-0e72-4e88-ac06-d9995c19fea6	1	Other	Other
+7c75cac3-a25f-4bba-aa26-c774745ca38b	1	Other	Other
+7c765fad-1f40-464d-92c4-7a3e05989d8b	1	Other	Other
+7c767e7a-2fb8-408a-8acc-2bcc74807799	1	Other	Other
+7c7688b7-517e-4901-b0ed-a021d89325a7	1	Other	Other
+7c76edc2-503e-4b37-93f3-a523e9d5005b	1	Other	Other
+7c773262-0722-435e-ba3d-6dd1431286d0	1	Other	Other
+7c7753c9-5677-4048-99cd-1c8aa739a2c9	1	Other	Other
+7c776715-f999-46f0-a66b-5e39bfee7b35	1	Other	Other
+7c7808df-efc7-4eb0-8574-065648063a24	1	Other	Other
+7c7809ad-cbc1-4358-95fc-8151fa1c6c4e	1	Other	Other
+7c7823ad-0d56-4ecc-a070-eff4819a88ff	1	Other	Other
+7c7865d8-3817-4c50-a0df-f6ffc1421105	1	Other	Other
+7c78944e-6dcd-432d-a4b4-16da4155e0a5	1	Other	Other
+7c78b5e6-def0-4a1e-960c-d33f8cb57e3e	1	Other	Other
+7c78d34f-5322-42b9-9e14-6bb958ffb075	1	Other	Other
+7c794d3d-8d13-44f3-bb1f-e7dd389357bd	1	Other	Other
+7c797167-4c2f-48f9-a761-2d375fa85899	1	Other	Other
+7c798ace-c605-4ed1-bf0f-5eaf1677d0b2	1	Other	Other
+7c79c891-7bea-41f6-9b73-f4b50184adb2	1	Other	Other
+7c79f1ec-58bb-4a24-85cb-c060c3572199	1	Other	Other
+7c7a11f0-a81e-427b-9cf3-258f34c88bf5	1	Other	Other
+7c7a25a2-dfec-47ea-9908-0573a234eede	1	Other	Other
+7c7a6958-01bc-4677-bdd9-3981605546ea	1	Other	Other
+7c7a903a-9904-49d8-b803-7d3f05830bc1	1	Other	Other
+7c7aa1d9-29e8-4b70-be97-85a8d92b20be	1	Other	Other
+7c7ae361-fa3a-4e28-ac5b-11597ad4f37a	1	Other	Other
+7c7ae70c-a95e-4e34-a6bf-2855c6823b4c	1	Other	Other
+7c7b7fb4-f46d-42db-88bd-3558b528fb4f	1	Other	Other
+7c7bb6aa-8453-4a5e-814f-c776031318e3	1	Other	Other
+7c7bbad6-a607-4ed1-b9e7-3f98c19fab2a	1	Other	Other
+7c7bcf4d-226c-481c-90c2-3e0d84236d59	1	Other	Other
+7c7bcfa8-23b6-44a2-bd4f-b74b3762c2f1	1	Other	Other
+7c7be258-4e95-4fb2-9386-4abd6e3de9da	1	Other	Other
+7c7cb2de-d40b-44fc-a5f5-a0aef5e7fe6e	1	Other	Other
+7c7cc512-e2b6-486f-b076-23dbed78ed82	1	Other	Other
+7c7d7765-50ab-42e3-9d33-647052a1f2a7	1	\N	Other
+7c7d8c82-0013-4446-b8f6-c2a1c9a90727	1	Other	Other
+7c7d9d74-7b0d-451f-8aa6-6492602bcb63	1	Other	Other
+7c7e0f1a-76ce-4cfd-960b-9afdbb74ba05	1	Other	Other
+7c7e2c85-0b51-474c-9712-c5c025da6ec0	1	\N	Other
+7c7eddb0-b697-4922-bf95-46876c96c8e0	1	Other	Other
+7c7efc0f-881c-4c6d-a823-736ecbc077d4	1	Other	Other
+7c7f0ef7-b8d7-4afc-a7f7-3fa2f6116803	1	Other	Other
+7c7f285a-6997-4649-88b7-428e28a5b49a	1	Other	Other
+7c7f4a11-dbde-463d-9205-7236029f41b3	1	\N	Other
+7c7f9c27-ec90-442e-955b-4cf27f0eb0d1	1	Other	Other
+7c7fb7bb-0c27-41b8-aa3d-5f03c049303b	1	Other	Other
+7c7fbfde-f18e-4c53-bda2-badb4b91e2ee	1	Other	Other
+7c7fc871-e385-43c7-b97c-c19eeb412945	1	Other	Other
+7c7fd296-c289-45d7-9182-f4f8540713eb	1	Other	Other
+7c7fe0b8-2f9c-4e24-acd0-5081caac2d9e	1	Other	Other
+7c811b91-4bb3-4193-ae61-091154a6236a	1	Other	Other
+7c818d42-9f2e-4c2b-8b90-9f87fa47a29a	1	Other	Other
+7c81a244-94a5-4587-b68e-ad86f27ee4c9	1	Other	Other
+7c81ecb5-a5ea-46ca-9374-8443ae51f392	1	Other	Other
+7c8205b3-3f88-4be6-b3b4-5230f521b18f	1	Other	Other
+7c820e48-fef0-40ba-b66e-ea39115a8cee	1	Other	Other
+7c82211d-849e-44f6-a3d6-5a024baed810	1	Other	Other
+7c828b8e-150c-4577-8910-72e9b4e12f38	1	Other	Other
+7c836266-3abc-49d3-9816-e7491a7aceed	1	Other	Other
+7c83caab-a4be-4e56-afa9-d6c675837fac	1	Other	Other
+7c83cfc1-0806-4d0c-aee5-240fb38f3a57	1	Other	Other
+7c83f79d-95bc-41ec-bf69-f88823dc52dd	1	Other	Other
+7c844a13-4bf4-460a-9c7b-15bf39a79ec8	1	Other	Other
+7c844e63-9991-4755-8285-13eeaf4bd1f5	1	James	Other
+7c84a561-74b5-4de3-a100-0d5b969a2883	1	Other	Other
+7c84aff3-a8d0-4fce-ab18-a45fd351fb22	1	Other	Other
+7c850d6a-bdf7-4cc0-a5e8-8e115b49c54d	1	Other	Other
+7c8561bd-bcba-4ea6-8909-7e58e3359a72	1	James	Other
+7c857aeb-918b-4444-9be2-1c75c3a36bef	1	Other	Other
+7c859c2d-a43e-4483-af16-93ab21904688	1	Other	Other
+7c85a52b-5a43-4bc3-963f-93a74c30fd09	1	Other	Other
+7c863c4f-6eb0-4507-93b2-e47af0a927d8	1	Other	Other
+7c869d65-8853-42bb-8146-42148ad44531	1	Other	Other
+7c86e81a-228d-49bc-a05a-4a85d6a2f4fb	1	Other	Other
+7c870d5f-5108-49a9-afce-3be4ec0c6421	1	Other	Other
+7c877c29-9773-4734-bb7b-456b8ee6000a	1	Other	Other
+7c87a5fc-0aa6-4278-98e5-79b531883050	1	Other	Other
+7c87adfa-6593-4bcd-ac9e-4c73313b51cb	1	Other	Other
+7c87b2bc-0d43-4638-8373-9f1046ecae40	1	Other	Other
+7c87c12c-2a52-4185-bb79-b1a6397c180b	1	Other	Other
+7c87f3d6-40fa-4277-954c-e7ea2a845855	1	Other	Other
+7c88095f-ae10-4d0f-b2c7-b589cd1126bb	1	Other	Other
+7c885fc2-fbb9-4d9c-a48d-f7a99a6dfb15	1	Other	Other
+7c8862f8-797f-4817-a815-40f794ce7f3c	1	Other	Other
+7c888dcb-bc1f-4a54-bc70-ee4e5fd6ae57	1	Other	Other
+7c891896-41aa-42a3-acd3-7997f3a6ebc3	1	Other	Other
+7c892153-14b0-4fd3-a0f0-5b095d44e9a9	1	Other	Other
+7c894f75-28e5-4a9f-af5f-0cc7843da1a4	1	James	Other
+7c897ee5-e97b-443c-88ab-74efbabf1dbd	1	Other	Other
+7c8a353e-174b-40b7-b976-a8d6059190fa	1	Other	Other
+7c8a7974-dda6-4dfb-a177-2ea49e1fbccf	1	Other	Other
+7c8a7f70-062e-4bc7-8e8e-83f82b909c95	1	Other	Other
+7c8a8d31-8c06-4590-88e1-8a187fa696d1	1	\N	Other
+7c8a92da-0a75-4015-b9b1-e1cbf2155018	1	Other	Other
+7c8acc61-8a5d-4814-afe9-a52af11615b5	1	Other	Other
+7c8b1a28-60d4-4d6b-b104-3779c8d37317	1	Other	Other
+7c8b3174-285a-484a-a0c7-ca13bc61ead2	1	Other	Other
+7c8b33f3-8f95-4101-ac10-eb20db7c2606	1	Other	Other
+7c8b409e-82d2-4ebb-9d4e-c3d92fddb67f	1	Other	Other
+7c8b706f-9bf5-46b4-913b-bd47b6a95b26	1	Other	Other
+7c8b7a47-0ba6-4b7a-85d0-87a9351574cb	1	Other	Other
+7c8b99ff-9d7e-4382-b372-944a2e7fb569	1	James	Other
+7c8baa31-2f5f-4e10-9178-0370263506ee	1	Other	Other
+7c8bac59-7b0b-433b-b53f-fc78feed0df6	1	Other	Other
+7c8bbd45-f2e1-497f-ab42-387c14cf7e0c	1	Other	Other
+7c8c29ac-8759-4638-b246-0868820872f3	1	Other	Other
+7c8c3eed-4d6f-45fc-886f-aac1a005cc6c	1	Other	Other
+7c8c6302-c04f-4924-9a45-1e4585008572	1	Other	Other
+7c8c85aa-66c9-4d44-9908-92e138e1c5b7	1	Other	Other
+7c8c9de3-97b3-4660-84bb-62296d5152cd	1	Other	Other
+7c8ccd20-da2d-4d62-ae7f-095953b94987	1	Other	Other
+7c8cf25a-04aa-4057-94b7-8c7a2750dc62	1	Other	Other
+7c8d4256-632e-4a0d-8d20-c94b20ddba8d	1	Other	Other
+7c8d5334-cc64-4211-9ecc-653f5c16ff14	1	Other	Other
+7c8d5ed5-74cf-4163-b61f-fa167593fcaa	1	Other	Other
+7c8d9b19-05e4-4d1a-b6e9-cd469233cf0d	1	\N	Other
+7c8e0f18-5ca8-4a7e-97d7-ad2dd720522f	1	Other	Other
+7c8e439d-6ba4-4fc5-884e-0ba0da068244	1	Other	Other
+7c8e453d-fc4b-4787-8669-fe7f7f60bb1c	1	Other	Other
+7c8e6109-cc45-4d1a-89e2-39a7e034c29e	1	Other	Other
+7c8e6564-9356-4258-84c4-856b7d288fcc	1	Other	Other
+7c8eb677-e3f0-447f-beef-9c018a7701ad	1	Other	Other
+7c8ebdc6-7715-4f10-98c8-e30bbb9b3a41	1	Other	Other
+7c8ee49b-f3b0-41cc-b9a0-6338748cafb1	1	Other	Other
+7c8f6967-8786-4f84-a55d-c9fe7e6a6caf	1	Other	Other
+7c8fa2e9-5922-474e-b894-0c8568a1a737	1	Other	Other
+7c8fcdee-297c-4ec9-984d-9df6762fafd4	1	Other	Other
+7c9017ba-d8b4-4d73-9887-11a100fcd575	1	\N	Other
+7c902ff1-dfce-4217-8158-302ee650f668	1	Other	Other
+7c906631-6942-4bbc-afbf-96da0f819fdf	1	Other	Other
+7c90b0fb-6f7a-44e0-a869-140eecd7fcbf	1	Other	Other
+7c910260-c3ab-45b7-a784-688bfc61115b	1	Other	Other
+7c9131cf-55b2-4613-a338-3fceca06c03d	1	Other	Other
+7c91742f-034d-4c0b-9a8f-818e6d1c54a9	1	Other	Other
+7c91b528-997c-464b-b2b0-1f9ad7f7b37b	1	\N	Other
+7c924d84-9a33-4a36-bfa6-76d007839f2e	1	Other	Other
+7c9264b3-3fc2-41c7-9a26-e8a9fbc08bba	1	Other	Other
+7c926f70-7998-42a5-ae28-07e4048b1054	1	Other	Other
+7c927bf4-fa4f-481c-b35c-593d36bac2ed	1	Other	Other
+7c928aec-c38e-410e-8262-002232affef2	1	Other	Other
+7c92d0c6-f6a7-40cb-9bd5-fd46ba5bea8d	1	Other	Other
+7c930ad6-a1fe-4988-a78e-76d1296d79c8	1	Other	Other
+7c933c6e-9c27-4505-bf1a-3a11f669ce5b	1	Other	Other
+7c933e66-8d38-487a-971f-349c432db72d	1	Other	Other
+7c9365de-7e00-42a9-befc-acdfc7c43010	1	Other	Other
+7c937fbd-4e22-4c69-8a7b-7eaa3509db0d	1	Other	Other
+7c939835-17eb-474f-8ead-e5f232cbcc0a	1	Other	Other
+7c93d2a6-2e8e-4fed-af25-f595a29f8c8c	1	Other	Other
+7c94156d-0aab-487f-ba8e-cae2123494c4	1	Other	Other
+7c94223b-b5cb-4920-b4fd-2aadfc362f24	1	Other	Other
+7c943dcb-3393-4a43-8c44-57f7fea788fb	1	Other	Other
+7c94608e-5817-43ab-87c6-e5d0658f3428	1	\N	Other
+7c947aad-bc68-4181-911d-4a9c264c522d	1	Other	Other
+7c948a95-12a1-420e-8f7f-336705216c6f	1	Other	Other
+7c94c38b-e0f6-460e-ba2b-1a879ac962be	1	Other	Other
+7c94eba4-5972-4dc8-8b41-86be8bc494c1	1	Other	Other
+7c95131f-5086-4552-be63-2fa26964b255	1	Other	Other
+7c95319c-855f-4d50-9437-6a1643b8d933	1	Other	Other
+7c954284-e6d4-43be-8e43-f1e078bf4c8e	1	Other	Other
+7c954dec-302a-48a9-b0fe-1434b371be13	1	Other	Other
+7c954fdf-f598-479b-9a41-133f6a2818db	1	Other	Other
+7c9553ed-e557-43b5-9621-753edd370eca	1	Other	Other
+7c95625b-16ec-4587-8ffd-ef8ad708dcc8	1	Other	Other
+7c956d28-ca44-4674-ba92-aa7a356d79e6	1	Other	Other
+7c956e34-5884-4697-b063-091e2331d9e1	1	Other	Other
+7c959caa-6ea8-438d-bad9-dc6732cf864e	1	Other	Other
+7c95ae0f-3d86-478c-9e6e-4c466e4de467	1	Other	Other
+7c95cd53-5665-457d-9697-3aa8e180bb52	1	Other	Other
+7c95fd1a-2414-4162-9e2a-5fa88b526b0f	1	Other	Other
+7c961e93-33e1-435d-a2c4-b5635efa33e4	1	Other	Other
+7c962b0c-5dfd-4c7a-9012-c6ebc21e6cfd	1	Other	Other
+7c96452d-5ab5-4729-9af3-b92e7958b201	1	Other	Other
+7c966b8d-2b0a-48d9-87fe-514e38b2d776	1	Other	Other
+7c96b79e-6c1e-4fbb-9be2-d265e20f13b6	1	Other	Other
+7c96c7ad-cfa6-409c-8fc4-d68b121d54ae	1	Other	Other
+7c96cf4d-7719-4dbb-b19c-e1fb678e85e9	1	Other	Other
+7c96d048-70b3-4b4a-9cc9-9f104728b47f	1	Other	Other
+7c96d4c6-7469-4ddc-a106-50e4053d5ddb	1	\N	Other
+7c9736f9-9aee-409a-9ade-7034a79ab451	1	Other	Other
+7c97749f-a7c7-4414-97d0-5d8c04b4acca	1	Other	Other
+7c97a4e6-8f7f-44ba-ba1f-d5e22634cb60	1	Other	Other
+7c97b6b7-5f21-49f9-b147-c257738bcec9	1	Other	Other
+7c97c13d-9e13-42df-bab2-ac4ed85b6985	1	Other	Other
+7c97cc61-a2a1-446e-bb05-b0db36ec77e4	1	Other	Other
+7c97cf66-e267-4505-82ca-d11897dc61fb	1	Other	Other
+7c9838a2-9b48-420f-820a-4da7c149a1a4	1	Other	Other
+7c987311-704a-4b88-9832-369ec9aea671	1	Other	Other
+7c98d1f9-b049-4ba5-8665-516b9652148b	1	Other	Other
+7c98eb2d-98cd-4171-b1b0-73455b13893d	1	Other	Other
+7c995258-0426-40c1-9923-928f10b2c283	1	Other	Other
+7c995696-5f22-4845-a6a4-2036507a139c	1	Other	Other
+7c999a87-9819-4686-8b58-38ad3f7f623e	1	Other	Other
+7c99baf2-954b-4bec-b3fe-c605391dce1c	1	Other	Other
+7c99c2d4-a47a-40d6-866a-7246b84a1d7a	1	Other	Other
+7c99d196-88c9-4835-beda-a79b18e25979	1	Other	Other
+7c9a30b1-80b3-41d9-9515-19b2750cb678	1	Other	Other
+7c9a788a-780c-4854-92d8-0ada4a7bb7fe	1	Other	Other
+7c9a7a39-b66a-4f08-a1d3-06e535ae2239	1	\N	Other
+7c9a857d-8009-4576-9476-14123f42d960	1	Other	Other
+7c9a9971-7333-410f-8778-1f65ef41724e	1	Other	Other
+7c9a9ec2-ab4f-45fc-85c7-5c198e8e1004	1	Other	Other
+7c9af14e-155a-4121-9ea4-38f64cbf41fd	1	Other	Other
+7c9bbb1a-b902-4325-91fe-68c935151433	1	Other	Other
+7c9bd094-35d0-43a1-86fc-9906e7efad2f	1	Other	Other
+7c9c39cf-277f-467e-b13f-d315aa850aa9	1	Other	Other
+7c9c3bd1-a976-4a4e-a2a7-54e2605960a8	1	Other	Other
+7c9c530a-1d02-44ce-87d2-f66676769478	1	Other	Other
+7c9c5e95-5dbf-4826-a81f-4b18bca26164	1	Other	Other
+7c9cb54e-f23a-43f4-8055-87047a368d8e	1	Other	Other
+7c9cc8b3-5fee-4d4e-a6d8-765d8d35d097	1	Other	Other
+7c9ce9dd-3922-4042-b6e4-0ed9c22d2942	1	Other	Other
+7c9cfd04-8004-48b5-91f2-e7c64d442314	1	Other	Other
+7c9d43b0-91cd-41b5-9be2-63bf58e72b72	1	Other	Other
+7c9e3367-4179-4eca-abd1-89981c32f366	1	Other	Other
+7c9e6844-efe0-4c50-bc4f-f91b732b3d8e	1	Other	Other
+7c9e7398-167a-435c-8155-7588b5c8dbf6	1	Other	Other
+7c9ed5b1-c61d-40a8-882c-4b3296ff4df6	1	Other	Other
+7c9eede6-1bbb-4ad3-821f-ca7c45cbdd5b	1	Other	Other
+7c9f1afb-7aef-4d0f-a5e3-57da53bc40af	1	\N	Other
+7c9f2b41-b05c-4ae2-9662-67af9050d708	1	Other	Other
+7c9f8bb1-fefc-4c85-8d56-490a8c70c2fe	1	Other	Other
+7c9fabbc-170e-4e51-88e2-978a5d78b52a	1	Other	Other
+7ca024ca-29b4-4082-a9fa-d889d2988acf	1	Other	Other
+7ca0400d-2656-45b7-9dd4-8987e1c155a5	1	Other	Other
+7ca06096-c7b6-43e5-9ba0-ef4088ac7c8f	1	Other	Other
+7ca08a71-c607-4823-b805-ff5f9d595263	1	\N	Other
+7ca09631-10d7-4292-a4a9-7abbab335ce3	1	Other	Other
+7ca0bd25-11b6-4970-bbf7-d8e5710a769c	1	Other	Other
+7ca0e680-5f73-49f4-8865-5b24c4c16469	1	Other	Other
+7ca0ec5c-9c04-4702-aa1d-a4d501a67b3c	1	Other	Other
+7ca0fcef-e90b-496a-b31a-8f436d8fb8c1	1	Other	Other
+7ca113a5-e716-412e-bda9-284e6fa8a2c5	1	Other	Other
+7ca118d1-dca0-4645-9070-74ccd188624d	1	Other	Other
+7ca1b241-d6d3-44fb-b87e-649b57f5fbde	1	Other	Other
+7ca1c50a-f8f8-49a8-8907-7ae4230a7654	1	Other	Other
+7ca24d94-39b1-43bd-947d-b2b15fa648c9	1	Other	Other
+7ca2e733-463b-4ef6-9276-54bf6e48bf09	1	Other	Other
+7ca30500-a6bb-4cff-8c2a-959a1a7e48fa	1	Other	Other
+7ca37f6f-18ff-4590-bf1d-7829f1fad78b	1	Other	Other
+7ca3800e-49fd-4a3d-a405-0105ebded304	1	Other	Other
+7ca3cab6-9456-4d62-8de8-b92dba3de173	1	Other	Other
+7ca3db01-a17d-44df-8c4e-0ddc1ec24d21	1	Other	Other
+7ca41593-6998-488c-9a9b-805adb45db0d	1	Other	Other
+7ca4be98-0e9c-4891-b329-189989c86b46	1	\N	Other
+7ca4c84a-c304-4c94-9994-73fa489cd16e	1	Other	Other
+7ca515ba-c768-4b84-b4ae-fc0537cb74ae	1	Other	Other
+7ca56764-0371-4861-89a6-1ae9c1df7ee6	1	Other	Other
+7ca5bc97-3729-45a4-b5e6-003516b08605	1	Other	Other
+7ca5d92a-df92-4837-a01c-1272675f28ed	1	Other	Other
+7ca5ed18-171b-4914-9d76-3161062e5beb	1	Other	Other
+7ca5f3b0-0554-4841-a914-62c3eb50446d	1	\N	Other
+7ca5fd5e-1a87-4b83-bfec-c066549b176f	1	Other	Other
+7ca61d7b-a546-4e0a-a11e-16d1732e09de	1	Other	Other
+7ca62cf7-adc3-4483-b05c-d49f150188c9	1	Other	Other
+7ca62dcc-2cab-4a79-8ad5-55dc074c2732	1	Other	Other
+7ca652db-c5c1-4324-b73d-0f9323ca8bce	1	Other	Other
+7ca65c41-508d-4199-8b16-e5df311c6a45	1	Other	Other
+7ca66478-34b0-423e-8ecb-3ee3d007ab31	1	Other	Other
+7ca67aa9-3074-4230-9629-61c7221d624c	1	Other	Other
+7ca6ab12-2854-4d4a-9d26-d7b4cce2a2c0	1	Other	Other
+7ca6c295-cf18-442c-ab01-d17003e174b3	1	Other	Other
+7ca6d56d-32d0-41d7-ae59-22bf4c62c33e	1	Other	Other
+7ca6f58b-4e07-4300-9cd3-efd01f016df5	1	Other	Other
+7ca71b14-3de0-4052-a92f-a9c3bb24ce58	1	Other	Other
+7ca74c66-f89d-412a-bb2c-8aea8ebaa083	1	Other	Other
+7ca7c854-5535-4425-b9bc-5d7ae7704fdf	1	Other	Other
+7ca7f0fa-e389-4b9c-83eb-e64ba7bd6d53	1	Other	Other
+7ca8920f-86e9-43ba-9f8d-0d366b6e381c	1	Other	Other
+7ca8d073-84cd-4d5c-a80b-c07a2bd0f824	1	Other	Other
+7ca8e481-92c4-40d9-a2e3-b5718ae20064	1	Other	Other
+7ca8f8ed-68a1-4920-a75f-a8a1f42b3465	1	Other	Other
+7ca94d95-61bb-4ea5-81da-9463089ae53b	1	Other	Other
+7ca969c0-56d3-4237-9bdc-23f92609951d	1	Other	Other
+7ca96ff9-ed61-467a-8bca-ede2a51e60f7	1	Other	Other
+7ca99047-ee3f-4f1c-8493-13b8d712eeff	1	Other	Other
+7ca99204-bf72-4043-bba2-7685e65e64ea	1	\N	Other
+7ca99f00-8563-4f3b-b629-e2f4abc0ea30	1	Other	Other
+7ca9a6a7-d1d7-4511-b883-415ac01a59fd	1	Other	Other
+7caa3a9f-9eae-4efc-ba78-ecca6b25b635	1	\N	Other
+7caa4e9f-1211-4500-9c68-74da8dba46e3	1	\N	Other
+7caa5d4d-a1a1-4eb8-a14a-a7894482859d	1	Other	Other
+7caaa5bd-2918-4a5a-9b37-c66ca9a09f10	1	Other	Other
+7caaa6bf-09ab-44b2-a633-fd236ce7f3be	1	Other	Other
+7caaa973-9675-436d-94c2-7187005b84be	1	Other	Other
+7caaaa3e-1530-4dee-9387-8dca024181e5	1	Other	Other
+7caad23a-cb2c-43a0-bada-566a0e6e36cb	1	Other	Other
+7caae066-7f61-4f21-9c48-4ecc55b6e511	1	Other	Other
+7cab0c02-b38c-494e-acda-7b43f06bc043	1	Other	Other
+7cabdeca-3dd6-4be4-a533-689f901f48a3	1	Other	Other
+7cabfcc5-f82b-43b1-bdda-57293687cda6	1	Other	Other
+7cac50ec-e970-4f3e-935c-8536afc68d81	1	\N	Other
+7cac9685-bf4d-4313-aaf1-dd87b39e80fa	1	Other	Other
+7cacba03-1aae-48f1-99e2-7245bab0a525	1	Other	Other
+7cad95ae-daf4-4e8c-9fc0-85f1cfdfc094	1	Other	Other
+7cade3ff-04ea-48e5-b8c2-9f8218e8524f	1	Other	Other
+7cadfad9-8e4f-4f18-bbfe-8fc0daf4ece2	1	Other	Other
+7cae0ab4-6cf6-40e2-bfa6-f10c8a92bed2	1	Other	Other
+7cae1e76-45e2-45c7-b279-8d68a1ac4ad2	1	Other	Other
+7cae221b-4a07-4e5c-9b6f-454013a28e3b	1	Other	Other
+7cae349a-bbff-46e7-a726-4479a50851a6	1	Other	Other
+7cae7d3e-2e08-4d4e-b220-c497b17d6296	1	Other	Other
+7caeb4fe-e754-4f90-885b-9c9715832813	1	Other	Other
+7caf5437-02a5-43d8-aa01-03c5a738d76c	1	Other	Other
+7caf7d29-e053-444f-ba0b-10017ae8279e	1	Other	Other
+7cafd0e7-4e32-4632-8de5-11d3df375c18	1	Other	Other
+7cafee07-eb62-4f1f-b711-88868fad5b60	1	Other	Other
+7cb0193a-3ae0-48bb-8c1d-85b6700992a8	1	Other	Other
+7cb02d2b-c2af-4c95-8999-70c97af001e3	1	Other	Other
+7cb03c57-985f-4d54-ae5d-1381da95f64b	1	Other	Other
+7cb0760d-c7a2-4a9c-a3d3-a8eca7defb43	1	Other	Other
+7cb0792d-8f3a-4aeb-b560-bd71c8b1385b	1	Other	Other
+7cb0d0bb-4223-415d-95c0-c7f7f371607b	1	Other	Other
+7cb11d32-82c6-4d56-beb5-4127bc4f0ed9	1	Other	Other
+7cb16bff-af07-4c50-a8c5-14e5249bab76	1	Other	Other
+7cb16db7-1a0a-4005-a2c2-e016630a6649	1	Other	Other
+7cb17287-d8a9-496f-bf37-7aa1f301b905	1	Other	Other
+7cb184c2-c827-4ae9-88c9-6b492db0666a	1	Other	Other
+7cb19fdc-4434-4463-ad42-3d94d6aa67fd	1	Other	Other
+7cb1bddc-f46f-4a0e-8329-1dfb7e387cc3	1	Other	Other
+7cb1ef08-4af6-4176-9ce7-5fa228e019e7	1	Other	Other
+7cb20224-6d5c-413e-ba44-0bc6b5f2c881	1	Other	Other
+7cb244b3-4469-4d3d-a513-93d3bacea721	1	Other	Other
+7cb278a4-d5a0-4373-9ed1-4e3cee96d914	1	Other	Other
+7cb279a5-59e2-4459-873f-e2009248cf93	1	James	Other
+7cb2aa36-497a-4713-98b6-82cf1d8c01f8	1	Other	Other
+7cb2e1ec-f45b-4d4e-89b3-4454f552111d	1	Other	Other
+7cb306b8-1d69-4f4a-b977-89d51e06ad28	1	Other	Other
+7cb32e09-6825-4e00-bfba-4c43fe2ace01	1	Other	Other
+7cb33bb8-2806-45bf-9714-e967413dbcb7	1	Other	Other
+7cb37300-e9e3-430d-baaf-2ee0e34c4fbf	1	Other	Other
+7cb3754d-be2e-4f38-aa25-0a547cd78184	1	Other	Other
+7cb391e5-4d4f-4fbe-a39a-affc3f506ac4	1	Other	Other
+7cb3d3de-0fc4-45f2-a1e3-85ac7342ef70	1	Other	Other
+7cb3e0c5-a5ec-4cc3-a139-cf36ab6d002f	1	Other	Other
+7cb3ec12-3c21-41e3-aa4d-b2a446ebbf1f	1	Other	Other
+7cb406d6-25c7-49ea-b316-fcf587a5a7d7	1	Other	Other
+7cb42731-9b4c-4273-bb2a-92cf13e55ef6	1	Other	Other
+7cb44724-ec12-40cc-8d89-b701ddedeb60	1	Other	Other
+7cb4a6db-3b2e-4527-95c0-2755f7e29e9a	1	Other	Other
+7cb4bd5b-6374-4fee-a104-a62ae5355b55	1	Other	Other
+7cb5330e-d398-467e-88b9-e0c31e0b4077	1	Other	Other
+7cb5851c-273e-4fa9-abc3-2135f5845f48	1	Other	Other
+7cb5cc62-3794-4ea1-9413-9e3b02f01ea2	1	Other	Other
+7cb5ccac-1aa4-4b32-b54f-b564dc7509eb	1	Other	Other
+7cb5e058-1ed5-440d-9890-0d728a23c7f1	1	Other	Other
+7cb68c3c-293e-4b04-bd76-dacf9c4b96c6	1	Other	Other
+7cb6b4d1-bfcf-478b-9017-92ceaff891eb	1	Other	Other
+7cb6de25-634a-45e0-a1b9-1f402c6c128f	1	Other	Other
+7cb70df2-e951-4109-a995-8aac24d2ba68	1	Other	Other
+7cb7270e-6dd4-4c85-bf40-83b1cffd86e3	1	Other	Other
+7cb72d2d-56c7-4236-bb72-d398f2ff3f75	1	Other	Other
+7cb748e7-22cb-4d95-a7b9-ff9f55932bbd	1	Other	Other
+7cb7d98d-a609-4c76-bfdd-b951224c06d5	1	\N	Other
+7cb911d4-1f85-4b48-8bac-804132f0b691	1	Other	Other
+7cb94c07-b0fd-419e-b430-1f5a1ce25d62	1	Other	Other
+7cb9537c-4327-41e9-aaa2-16ab9334e7b4	1	Other	Other
+7cb95990-8e32-42e8-b9ce-542e70ca09dd	1	Other	Other
+7cb9d813-6ab9-417d-be8e-5ca38071868b	1	Other	Other
+7cb9eceb-ca23-40bf-b68e-7d6aeeabacfb	1	Other	Other
+7cb9f614-ea5c-458c-9a7b-4ee9c5bbcc18	1	Other	Other
+7cba0a02-4a06-4ce5-bd21-65b94e4a670e	1	\N	Other
+7cba2a00-cb54-41ac-becc-412f399c4dbb	1	Other	Other
+7cba314a-2717-4b8c-bb9c-b68806fdc8d9	1	Other	Other
+7cba37f0-7f7c-4378-80a6-fd04d3da26cb	1	Other	Other
+7cba676a-0179-4b8e-9559-c7ee371270bd	1	Other	Other
+7cba88d1-a425-4cef-9a50-9407195a2921	1	\N	Other
+7cba9177-cadb-48b3-9ffa-992ad897f2d8	1	\N	Other
+7cbacd9f-aab9-4304-ab6d-e61f9397eb37	1	Other	Other
+7cbad8cf-7186-4c4d-a99a-f80ec5af7e91	1	Other	Other
+7cbb0058-e301-4ce0-b673-1b6b773aa536	1	Other	Other
+7cbb3167-cd39-45a0-8f0d-1a96a7c0c953	1	Other	Other
+7cbb3f08-1009-4b31-b6c8-74011da6625c	1	Other	Other
+7cbb52ff-5fa3-4ef8-a747-102e1beab5cc	1	Other	Other
+7cbb7050-91cc-4942-a480-8ab7df80e927	1	Other	Other
+7cbb7896-4760-4647-a15d-97dd410c07fa	1	Other	Other
+7cbb7bd7-8b2e-4855-87fc-4a013925c8ca	1	Other	Other
+7cbb9f68-8a67-494a-9cd0-6067dd23c5ca	1	Other	Other
+7cbba4d3-c09c-4fc6-a0a6-2137693aff28	1	Other	Other
+7cbbb6f0-3413-47ee-8624-c8fc93a5723a	1	Other	Other
+7cbc03dd-56f0-4acc-9cfc-8fc9a5628882	1	Other	Other
+7cbc0edf-9c69-440f-8449-159f845823a3	1	\N	Other
+7cbc1fdd-941c-46b8-b760-5fd4638050bb	1	Other	Other
+7cbc4a8f-255f-4f75-88b3-ed8300edf661	1	Other	Other
+7cbc949d-2de1-49ca-bd7e-3f06de12be64	1	Other	Other
+7cbc9752-d346-4314-abf3-ed15a68407f7	1	Other	Other
+7cbca2e0-1ac4-4647-a614-58d291f60735	1	\N	Other
+7cbd06b3-5eb5-4df2-9b8d-b46bc9909dfc	1	Other	Other
+7cbd21c8-a1c7-45da-a4d6-85beacf096a3	1	Other	Other
+7cbd51ea-a009-4f73-a499-0fef8418fdb3	1	Other	Other
+7cbd6af8-17ed-44e9-a26d-1492979aa516	1	Other	Other
+7cbd6bd6-392f-431b-9638-e49c985e80c6	1	James	Other
+7cbd9da2-c166-40d8-965a-352c3eb1baff	1	Other	Other
+7cbdb3ce-b8f5-4714-9abc-be710b31061a	1	Other	Other
+7cbdbc75-1aa1-4b53-80b9-98aa5a8689d8	1	Other	Other
+7cbdf807-ac53-4984-ada6-adf6baceb403	1	Other	Other
+7cbe0f93-6376-441b-bd52-4b38434f2a46	1	\N	Other
+7cbe4710-6126-4545-b8c9-0b104ba1365e	1	Other	Other
+7cbe4d28-befb-43b6-9c54-455f5f36e0cc	1	Other	Other
+7cbe7aa4-66f1-4034-9f5b-b53024996940	1	Other	Other
+7cbeaf70-e426-4d44-98e2-d81ce9e10160	1	Other	Other
+7cbed7e3-08b9-42c2-ae56-55280a717b2e	1	Other	Other
+7cbf1f58-9663-416b-90f6-730061d4ed1f	1	Other	Other
+7cbfc0c4-b90d-4a30-8a30-cae32fd7526f	1	Other	Other
+7cbfd1d6-2bc1-4007-a881-02bc0f8d69e1	1	Other	Other
+7cbfd798-d9e9-4a1b-8c82-ebddc1c25322	1	Other	Other
+7cc00e80-5a88-4943-8044-694762bbb35b	1	Other	Other
+7cc017b3-84d4-4f5d-abe8-c618062ecb01	1	Other	Other
+7cc0537c-90ef-4f6e-a648-b0c1dd681468	1	Other	Other
+7cc05608-ae5f-4128-8d4a-a861d59f8afd	1	Other	Other
+7cc0a5ec-d030-11e7-952e-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7cc0c432-32db-4de4-8f86-d213a958ecd2	1	Other	Other
+7cc0ccdf-c596-420e-a934-be070a7322dd	1	Other	Other
+7cc0d6aa-3709-44fe-9909-5c1290604a6e	1	Other	Other
+7cc0fd71-66ce-4c3c-92b0-3c586d3a0764	1	Other	Other
+7cc14ab6-7e66-4672-b598-0e6c1a8fdb8b	1	Other	Other
+7cc14cab-eb6f-4918-a8ee-f84fc45c7195	1	Other	Other
+7cc176c9-666b-421e-b6fa-d46e9402ab0b	1	Other	Other
+7cc2231a-d25e-4d74-9ff7-384c842b0a95	1	Other	Other
+7cc27bc0-653e-4e34-a3cf-2959e1030c93	1	Other	Other
+7cc2840c-1261-4f01-bf52-6025fbafb3e0	1	Other	Other
+7cc2bf21-c7d8-44eb-9c92-429985d10479	1	Other	Other
+7cc2cdbb-8e40-4147-a02a-3fa0b4d3befa	1	Other	Other
+7cc337b6-9a01-4124-82fb-c786be75ad7f	1	Other	Other
+7cc38fae-6bcf-4e60-9b54-e5aab9fc4fc7	1	Other	Other
+7cc3d827-da22-4512-8d28-511f8f65a8a2	1	Other	Other
+7cc42e06-20ce-4943-9589-d0f720f05a45	1	Other	Other
+7cc45d84-875f-416d-b78f-461b4731fd2e	1	Other	Other
+7cc49a6f-880f-43f3-bb5a-f894ba3e75cf	1	Other	Other
+7cc4d8ba-8224-444a-a016-2af9c45531bb	1	Other	Other
+7cc51f08-2e29-411c-a16a-5a0b664d0e28	1	Other	Other
+7cc5229e-57a3-4df0-bbc8-4ce3af1f72d2	1	Other	Other
+7cc53eb7-7b9c-488f-93a7-9b62e7e59f1d	1	\N	Other
+7cc58eaf-2ad8-4c5c-9bef-1e9ae3c4195e	1	Other	Other
+7cc5d77f-1411-42bf-b4fd-5c52c246af89	1	Other	Other
+7cc6137d-9778-4275-98d9-810c87fc5232	1	Other	Other
+7cc6ae1b-6722-43df-930b-74dddd7c49b2	1	Other	Other
+7cc6b1dd-2a5c-414c-b05e-31f421fe8739	1	Other	Other
+7cc6f366-559e-4e09-9d91-6566ef874e5c	1	Other	Other
+7cc7122b-a12b-4a97-ab92-0c2a7e312e89	1	Other	Other
+7cc71821-16b1-4357-aff2-26b52fe644c5	1	Other	Other
+7cc72874-1a19-4234-b970-605a3c369205	1	Other	Other
+7cc729d0-f93b-401a-be00-4e5bce7701f5	1	James	Other
+7cc75542-c60e-440e-a27a-87608afce402	1	Other	Other
+7cc76469-03b1-433d-94f7-7266d00e00d5	1	Other	Other
+7cc7b00c-ebd5-4e0c-8913-713243f6a6f5	1	Other	Other
+7cc7cbf6-89b1-428e-85dd-19136206d846	1	Other	Other
+7cc7eabc-7870-46fd-a20f-25644870b6a1	1	James	Other
+7cc7eb03-441f-4cd3-af2f-e56f31bbbd00	1	Other	Other
+7cc82910-d15e-4452-b38f-4e03f39bc532	1	\N	Other
+7cc87c71-133c-4c0e-80d9-11eaf48300c2	1	\N	Other
+7cc8a2ca-f91c-4618-bf9b-244ef9609fa8	1	Other	Other
+7cc8b1b3-1e25-4783-a27c-c5540b4cb63a	1	Other	Other
+7cc9390e-0cfd-44bf-9cbf-360026bd9df5	1	James	Other
+7cc95fc9-e980-4249-bb4d-50f320775878	1	Other	Other
+7cc98275-fb3f-4261-95e3-ce94cc02a9c8	1	Other	Other
+7cc98cfd-7eaf-475b-9faf-427d74076ed4	1	\N	Other
+7cc9b9ab-3d46-41ab-a6de-6d3a3e78b09a	1	Other	Other
+7cc9d8a5-c4c1-44f7-91de-72da07e6eced	1	Other	Other
+7cca8e9d-ede7-4421-a7c2-2bd902753fc6	1	Other	Other
+7ccab5a3-69e2-45e4-a1a0-a447b69fd585	1	Other	Other
+7ccacf65-043c-4ead-a8df-4656d8db1aa4	1	Other	Other
+7ccae124-6849-4e74-bb6f-d6119bd4a576	1	Other	Other
+7ccb1faf-f332-4e0f-90e6-c1377f4970d4	1	Other	Other
+7ccb37ad-b5ef-4778-80dc-434e371778a3	1	Other	Other
+7ccb5e36-5ef2-4ba5-a2d6-269ff407fb1f	1	Other	Other
+7ccbc38d-cfc1-4c9a-846a-8a535c43f419	1	\N	Other
+7ccbe1c1-9d00-4913-86ba-4a73111e87ca	1	Other	Other
+7ccbfafc-37a3-4a6c-b12b-3445a49ad120	1	Other	Other
+7ccc15ee-1be6-41d4-85c9-fd88c93d095d	1	Other	Other
+7ccc3838-c4c2-4eb7-83a1-6cc36aa26cca	1	Other	Other
+7ccc85b1-4843-4c62-bd96-2c71b4330f61	1	Other	Other
+7ccc9f2a-09c6-4a8f-a764-061f22c566c8	1	Other	Other
+7ccca3a9-7818-4f3f-8248-018a84a340b7	1	Other	Other
+7cccaccb-2f1e-4a5c-b5d4-14fe369ccd03	1	Other	Other
+7cccd0ad-9aeb-4fbf-bcd7-52d12b92a3c7	1	Other	Other
+7cccd4cf-e4a0-4d23-ac92-3266790c5163	1	Other	Other
+7ccd5c36-0657-4547-b48d-55eff5dae8b4	1	Other	Other
+7ccd84e2-6443-49f9-b08e-1ce9f31c10a4	1	Other	Other
+7ccde773-f08c-4f90-b865-47a47302be38	1	Other	Other
+7ccdec58-8e59-4411-9c25-395fa28cd916	1	James	Other
+7cce0a9b-3d57-4beb-ad8b-847d7a30e312	1	Other	Other
+7cce6f14-14a7-4b63-9964-5e4a50f4f8d9	1	Other	Other
+7ccee99d-56b3-4865-aaec-81b38efe9b94	1	Other	Other
+7cceed5f-09c0-44fa-9409-aad167732a82	1	Other	Other
+7ccf00a4-1edb-459d-b003-e64c6fa022c6	1	Other	Other
+7ccf68b2-9dba-4c7a-8209-534da34a3153	1	Other	Other
+7ccf75d8-c958-4908-bceb-eaa9da6828c4	1	Other	Other
+7ccfbc77-8d26-4535-af84-d80dc3df5b72	1	Other	Other
+7ccfe0c0-bcdb-4e1f-879c-a2c3a01c6043	1	Other	Other
+7ccfe6c0-3625-4497-bc2d-4c8d4f59839c	1	Other	Other
+7ccff743-9698-4089-ad4d-480eaee8d566	1	Other	Other
+7cd05929-ebcf-43e0-bcad-46ebbf831b4b	1	Other	Other
+7cd0b1d3-f7a1-4d40-9470-90cfb30290c0	1	Other	Other
+7cd11282-64e9-47c7-8b5a-44cb1104d179	1	Other	Other
+7cd11f47-55b3-42da-912b-0a255bbab783	1	Other	Other
+7cd1232c-2080-4300-ba57-df55f447171b	1	Other	Other
+7cd13c40-c55e-405e-8ede-50253167fc23	1	Other	Other
+7cd161c4-109b-4ca7-a43e-778f95e0216b	1	Other	Other
+7cd17abc-ec3f-4633-bef4-ff454accf9f2	1	Other	Other
+7cd1b1f0-ed12-4bce-943c-5363444a5b0f	1	Other	Other
+7cd1c5ac-1a55-44d6-b9af-1400b8acbdce	1	\N	Other
+7cd1f7a3-4b06-418b-b40f-aaceeb1d9427	1	Other	Other
+7cd21705-7fb8-423e-b72f-31dae3628441	1	Other	Other
+7cd230b9-bc2f-4ad4-af6e-cdc138864118	1	Other	Other
+7cd23e9f-bf6c-4e99-8671-fe9a5852dfc2	1	Other	Other
+7cd26f75-4e24-4b30-a83d-f2ac6fc63436	1	Other	Other
+7cd2c734-c16c-4926-a2ed-d5f64ed33759	1	Other	Other
+7cd2c7fe-e8c9-4fb8-9d00-e20241405b20	1	Other	Other
+7cd2e47e-465e-4dd7-b231-5e37396a533d	1	Other	Other
+7cd339be-f46c-4a42-b24f-a5e4c253bd7f	1	Other	Other
+7cd3405e-43df-47fa-b7e3-03d4504bde6b	1	Other	Other
+7cd3441b-5257-4ea9-96cc-c6d864ebadc5	1	Other	Other
+7cd3827a-67a4-4c14-a34a-5bae27f6cd26	1	Other	Other
+7cd39ac4-d8ad-49c5-9618-d896cd4976dc	1	Other	Other
+7cd3b61e-e963-4fc7-bad2-f0800f81826c	1	Other	Other
+7cd3db2b-6352-4108-b024-9405d8b4832b	1	Other	Other
+7cd42f75-b558-4132-a111-4ed1e89fb7a5	1	Other	Other
+7cd46e80-5206-4cc5-a811-b631b8414ed3	1	Other	Other
+7cd4804e-9503-4a9a-87cd-93c7cdb32011	1	Other	Other
+7cd48194-55c0-4767-95d2-683fc41169f1	1	Other	Other
+7cd49bdc-76f6-4b17-b1e9-ef8dedb37483	1	Other	Other
+7cd4c8c5-82ef-47e0-b469-ceb47a735897	1	\N	Other
+7cd504ee-96ee-40f5-97bf-3b3667a72dc5	1	Other	Other
+7cd51da0-cb36-46d8-a256-823bdc9099b7	1	Other	Other
+7cd54249-3187-4880-983b-46320eba6d17	1	Other	Other
+7cd56c9d-c5dd-4c0f-8fb0-f989efc56eef	1	Other	Other
+7cd576f5-6a8d-476c-8309-7d12e764dffd	1	Other	Other
+7cd5909c-9a6d-457b-b6c1-7fad0c898d6e	1	Other	Other
+7cd59ff1-e3bc-4452-9d3c-fb0e1fbdf7c4	1	Other	Other
+7cd5b432-ed5b-485d-a0b4-dbc8480e084e	1	Other	Other
+7cd5da44-7c89-4b74-8bc4-902a4af890ab	1	Other	Other
+7cd5ed98-c370-4e28-b714-2c8c557f9716	1	Other	Other
+7cd63680-f6a6-46e8-9e82-5f86d0e7d98b	1	Other	Other
+7cd63ee3-a49a-4f46-9374-b048fc2336b1	1	Other	Other
+7cd641a3-6102-4d71-907e-4c6eaf806a47	1	Other	Other
+7cd65855-9c86-47ba-9a2a-e264d1cafee9	1	Other	Other
+7cd65bab-7695-4285-af89-16e61136ac87	1	Other	Other
+7cd6643a-6afc-47b1-9976-6d079b589c8d	1	Other	Other
+7cd69763-39ec-4833-9537-d9eaadcb312f	1	Other	Other
+7cd7092c-97a6-49f7-b363-e2138476b462	1	James	Other
+7cd71163-84a8-49d0-adb9-f87d2ce37760	1	\N	Other
+7cd77a51-5747-4037-b438-05043cd84fc9	1	Other	Other
+7cd78d39-e2cb-4cb2-a6e5-864bb9cc65d5	1	Other	Other
+7cd7ae88-5920-47dc-890d-51b5cb527ee8	1	Other	Other
+7cd7c6f1-36d1-4e20-8856-1acdb640080a	1	Other	Other
+7cd7d43d-408a-45ca-8c8f-df563cede9b1	1	Other	Other
+7cd7edb0-14f5-4a8c-bcb1-b3388c8f3225	1	Other	Other
+7cd800be-1f5f-41b0-9bb8-2815cdf16b0b	1	Other	Other
+7cd8240c-9374-43e6-ab70-ddec72d25fa0	1	\N	Other
+7cd845e2-127b-4457-a98f-eff656bc78e1	1	Other	Other
+7cd85e08-51fa-4462-b4d1-164a4c6e5797	1	Other	Other
+7cd89cf3-571e-4d61-8e1f-0452c0cdb505	1	Other	Other
+7cd8a82a-b628-48ae-af8b-4c2929ebadc7	1	Other	Other
+7cd94b86-caae-402f-96a3-329a66dd8dd3	1	Other	Other
+7cd9c4af-0ff3-4470-a626-d5a2d70f564f	1	Other	Other
+7cda6f54-d993-4385-88d7-5e94ee3f34ad	1	Other	Other
+7cdac0c9-0dd3-4e6b-acbc-c938e8f2d3d6	1	Other	Other
+7cdadfc9-9c14-467b-b4b7-46f690ad06a0	1	Other	Other
+7cdb59e7-b3fd-4d8c-8193-27b836a585b0	1	Other	Other
+7cdb934d-b6b8-4fa7-8125-fe64614df474	1	Other	Other
+7cdbb673-975a-450b-bf00-43bd99df92e4	1	Other	Other
+7cdbedbe-f347-4738-94ac-1366b7bd967d	1	Other	Other
+7cdc32c9-3e66-4107-895d-2963a7fce824	1	Other	Other
+7cdc4683-9372-48cf-aa88-05f02051f04b	1	Other	Other
+7cdc4926-6f01-46b6-a148-4aec1bbf6d1c	1	Other	Other
+7cdc802c-875e-434a-8c7c-ab3456444e84	1	James	Other
+7cdc85ee-5ae6-4599-ac0b-6f351b152895	1	Other	Other
+7cdc8ec5-85b2-440b-b869-c437c9f43cfe	1	Other	Other
+7cdccb74-c902-4cc9-8d98-187286ea6b39	1	Other	Other
+7cdd2ef4-18a4-40ec-8368-041ceedd5a3e	1	Other	Other
+7cdd45e1-0232-4f1c-85cf-bb06cf96df83	1	Other	Other
+7cdd6007-e9e4-4371-bf68-67609031ddfd	1	Other	Other
+7cdd68a8-de3b-4786-8613-2f7d4734afdf	1	Other	Other
+7cdd7dac-2671-4951-9e84-c409d9c8c5e5	1	Other	Other
+7cde00d8-a0e2-45db-93d8-db116358608f	1	Other	Other
+7cde22ec-6bf4-4b55-8080-f129b4457985	1	Other	Other
+7cde2467-462d-4e70-bb65-9e94a0cd23d9	1	Other	Other
+7cdeb19d-9f78-4482-9d3a-1a43482836d6	1	Other	Other
+7cded1a7-ece8-432f-8d5e-b01bcf63759d	1	Other	Other
+7cdef74f-4621-4405-bd00-936e6b8b41a9	1	Other	Other
+7cdf032b-ced3-4af3-bb8b-50fc48a3b1d9	1	Other	Other
+7cdf406e-a8d7-4170-b4e3-ebb5ca9e359e	1	Other	Other
+7cdfd5e8-3bc6-4ad4-9819-a2ee5cc4c15b	1	Other	Other
+7ce02304-2010-4fe9-8d29-5d5b6ba66b1c	1	Other	Other
+7ce026f5-482b-46e2-b1f3-41cf0d540655	1	Other	Other
+7ce06489-d479-4317-a650-531d56a1a42c	1	Other	Other
+7ce0d0f8-028f-421c-8da3-380c8b72a452	1	Other	Other
+7ce1360b-b2d9-4baf-af76-9d96fd528cd6	1	Other	Other
+7ce1809d-8952-49e4-9a3d-4c037689d15f	1	Other	Other
+7ce196d0-a074-4259-9d7c-b538aa67c894	1	Other	Other
+7ce19b62-1912-4013-ac46-b2e681ad6302	1	\N	Other
+7ce1bcb3-a0a4-441a-b2fa-5fef38361d95	1	Other	Other
+7ce21477-b4c9-4472-ba2f-dfb6a5c2ac80	1	Other	Other
+7ce226af-0add-4f8f-be05-d28bea3849e0	1	Other	Other
+7ce27bdd-84c0-4244-b11b-29c4b551fabb	1	Other	Other
+7ce30cd2-595e-4eb1-a6fe-f290bbcc99ca	1	Other	Other
+7ce32be8-3764-4d29-acee-9df66b630d2f	1	Other	Other
+7ce33417-70d1-4e13-81ea-d6dd0574edd1	1	Other	Other
+7ce38076-5833-4c70-880e-910306b5bba0	1	Other	Other
+7ce3963b-efee-445a-8c83-194fa7ad6251	1	Other	Other
+7ce3a07a-3f1e-4fcd-ab1d-ab14bef37548	1	Other	Other
+7ce3d2a7-e14b-4ae8-945e-69ca55b918ed	1	Other	Other
+7ce4b21e-083f-45da-b222-9c11bfe9486a	1	Other	Other
+7ce4fa53-1c9b-49c1-b1b3-73b54db7fcf4	1	Other	Other
+7ce50ab2-ff40-4bc5-9e96-15f50355bdb8	1	\N	Other
+7ce5696f-c94c-42de-9081-48f5d31da958	1	Other	Other
+7ce591ee-c65f-42a2-8846-9409fc7fce11	1	Other	Other
+7ce5d859-0ece-4e84-819c-83d7b577f51d	1	Other	Other
+7ce5e91c-7ddd-423f-b298-78351697f699	1	Other	Other
+7ce627cf-6f71-4f73-b8c2-a814a2747592	1	Other	Other
+7ce62c25-edaf-498e-bba0-b0648241366f	1	\N	Other
+7ce62f02-b80d-4893-a8cf-5e417ccba3e4	1	Other	Other
+7ce6358e-de30-4ba3-93ad-278748f440eb	1	Other	Other
+7ce67a67-3a62-4178-9a6b-017dfc0616f8	1	Other	Other
+7ce67b91-55b9-487d-b055-d7a024ea4265	1	Other	Other
+7ce68191-dc10-401a-b07d-fc99ef39ae80	1	Other	Other
+7ce69da1-03c0-4c3a-a01a-9c500c361bbb	1	Other	Other
+7ce6a24a-a1d9-47e9-a789-6e92b0caf70b	1	Other	Other
+7ce6a821-9392-496a-b556-e37ba8308a26	1	Other	Other
+7ce6ab76-fb01-4270-8588-39d7766288dc	1	Other	Other
+7ce6ddac-d07f-455d-9a85-588c21b198fc	1	Other	Other
+7ce6f0e5-02fc-44c0-ba83-3f439b9e3d5e	1	Other	Other
+7ce6fc81-475d-4c2c-9cec-82233ea6f8f9	1	Other	Other
+7ce73057-969b-4445-a411-b3b2bf0035ff	1	Other	Other
+7ce74b6c-64fc-4adf-a122-3605bdcb46f3	1	Other	Other
+7ce7c75c-4d8b-4d15-bffc-6da03be26c7e	1	Other	Other
+7ce8c3e6-08b8-4ff3-950d-b75886208eda	1	James	Other
+7ce90aee-5bca-46c5-969b-d0164183e11e	1	Other	Other
+7ce9a75a-614d-4ce7-8f3c-33c80fbc774f	1	Other	Other
+7ce9cfbb-ebe6-4157-9a14-529db17b1124	1	\N	Other
+7cea6a21-ab08-417b-a27f-91803f488a53	1	Other	Other
+7cea8e90-e6bb-4e4b-8e7b-6974a4b0b1ef	1	Other	Other
+7ceaae5a-c111-4f98-8cc4-42aaa372549b	1	Other	Other
+7ceabc06-bbe8-4b20-a40a-f3dbc3f17bd1	1	Other	Other
+7cead2cf-2cfb-4864-9bc2-7e5966397b86	1	Other	Other
+7ceb1deb-21bb-4d89-982c-ff6f95fcd2ce	1	Other	Other
+7ceb1f9b-ed11-444e-a93c-1a9d4f6f4881	1	Other	Other
+7ceb3476-e577-4375-bf9b-70e25018847f	1	Other	Other
+7ceb5e5c-7c92-4313-8b6c-cb2fbf3faadd	1	Other	Other
+7ceb7f52-fe0b-4558-9712-5577bc8ceccd	1	Other	Other
+7ceb969b-5a00-4be3-b0a3-d568cfaff14a	1	James	Other
+7cebec26-c705-4c9b-acec-8e21167b5c78	1	Other	Other
+7cec2910-ba9f-4b7e-a150-1caada6ebaa0	1	Other	Other
+7cec603d-ddcb-47a9-b2ba-8f50261c8218	1	Other	Other
+7cec6c90-0b3d-406c-ad76-f9e7b0e92193	1	Other	Other
+7cecbc65-94b0-4269-8624-e5d7a740cc33	1	Other	Other
+7cecdf2f-bd6c-4638-9904-1ed6e2a25943	1	Other	Other
+7ced2319-10f3-4c54-98e0-fcd1f1078f10	1	Other	Other
+7cedb864-95eb-48cb-9197-024507c9d940	1	Other	Other
+7cedf5dd-85ce-4fa3-b4e8-8591ac6e7929	1	James	Other
+7cedfcb8-06dd-4937-b360-0f8a22f3f3e9	1	Other	Other
+7cee5009-1b84-4f8a-85db-87708a7ebe32	1	Other	Other
+7cee805c-c02d-49b5-9bff-346dbf342434	1	Other	Other
+7cef2e08-23e7-4888-983c-2d4938aba5fa	1	Other	Other
+7cef9728-f519-42bf-9283-bd54534124f9	1	Other	Other
+7cefab5e-8548-4f3c-a209-6772f89e6963	1	Other	Other
+7cf02bf4-0689-4982-be4c-f2a839344224	1	Other	Other
+7cf07f5d-468a-44b6-b4cd-ac79c76b3771	1	Other	Other
+7cf08dde-2ebc-4428-ba80-a6e61c899405	1	Other	Other
+7cf0a569-f311-404a-b1e3-1108414d70ca	1	Other	Other
+7cf0fbed-819f-4a64-9854-2ad83cd3207e	1	Other	Other
+7cf10015-a5a5-4471-a0ce-f2862bf713dc	1	Other	Other
+7cf113a7-6fe6-402d-95d9-90855747ef34	1	\N	Other
+7cf1557e-49ab-46f0-8b58-3d34113a7147	1	Other	Other
+7cf172d3-2cc2-4c53-966d-045ebdef6282	1	Other	Other
+7cf1fa4d-c634-4d0f-9fb2-a3f238192327	1	Other	Other
+7cf20b7d-c93e-476c-8bd6-aba73dc49986	1	Other	Other
+7cf22337-c31f-4d2b-9c47-ad478a5a7f47	1	Other	Other
+7cf231a3-6926-480d-96fe-69f86a20895f	1	Other	Other
+7cf26deb-90c7-48a3-831a-ae0fd7808219	1	Other	Other
+7cf2cc68-9e43-41fd-99b1-c71039c7378b	1	Other	Other
+7cf2d049-65ff-4c21-9d9b-e13ff2d62908	1	Other	Other
+7cf2f575-bce6-439f-8892-d063bfe38f37	1	Other	Other
+7cf3487b-43a7-4c09-b2d0-ea86c0d52f5f	1	Other	Other
+7cf35614-ae7e-4ae6-83d4-a72fa9a7b535	1	Other	Other
+7cf3c110-6a6f-4c39-9366-28a432cb3881	1	Other	Other
+7cf3efa7-a5fe-4833-b81c-59965e710863	1	Other	Other
+7cf43c96-c9e0-46de-9102-ec928d3c6026	1	Other	Other
+7cf47f02-0b0b-4156-b089-b0a755a18aa6	1	Other	Other
+7cf4f11b-36cb-4fb3-876c-ccabc6167edd	1	Other	Other
+7cf5066e-cdaf-48d5-9d21-d15ec6c18c6b	1	Other	Other
+7cf5b40c-7801-4a7f-b9a3-94f388d80e00	1	Other	Other
+7cf5ec5d-3e49-4949-8755-59e19adaa7a9	1	Other	Other
+7cf5fb6b-7182-4b44-8b9f-2c37cf3c99d6	1	Other	Other
+7cf6017a-9689-4b53-ab53-450343339384	1	Other	Other
+7cf6180b-2fd9-49c7-9033-2b2a210394a0	1	Other	Other
+7cf627a9-7eee-45cf-9ea3-b511e5d41879	1	Other	Other
+7cf63c99-31be-46e3-903d-ee2b527d7594	1	Other	Other
+7cf67ff3-1f81-4a0e-8584-9e6e8b678018	1	Other	Other
+7cf695f5-c192-4c0a-8308-5532a81d4f82	1	Other	Other
+7cf69ef7-8d2c-4b83-8f57-911e3c90ff86	1	Other	Other
+7cf6b55b-ed4b-41da-86f2-5f02b91ffabd	1	Other	Other
+7cf70318-80b5-4eb4-8b47-01c063c1347a	1	\N	Other
+7cf7432e-13c8-4a6c-8f49-b10315368852	1	Other	Other
+7cf75c54-88b9-4391-82c0-be4441edd3d0	1	Other	Other
+7cf76d26-1fd6-47d1-9389-24d31d597853	1	James	Other
+7cf7a10d-fd09-49b7-bb67-e8a6ea311a16	1	Other	Other
+7cf7d3f0-08c7-49c9-8f4d-133c241e653b	1	Other	Other
+7cf7def0-8aeb-4513-b451-44288a1c004b	1	\N	Other
+7cf8511a-bf56-4f4a-9e1b-a5fe8c263dc4	1	Other	Other
+7cf863a6-f86e-4cdc-b462-35b38286f1d6	1	Other	Other
+7cf8cdb9-c3d6-4b07-8a6a-d6912369a656	1	Other	Other
+7cf91f59-b5f3-46cc-8ba6-31f547687936	1	Other	Other
+7cf9900c-e161-4c4a-ae76-cb1fde2e5bf4	1	Other	Other
+7cf9923b-5bed-418c-8a1e-f0e35f217091	1	Other	Other
+7cf9ff9b-665a-4879-b461-ef73bb7f38e7	1	Other	Other
+7cfa14ca-75bd-4f48-ac48-2c0df3cb6d3b	1	Other	Other
+7cfa2bb8-0b08-4004-a42c-91a437bb0f0a	1	Other	Other
+7cfad4d7-3f7b-4a5a-9a7e-72fe4e1b4ff1	1	Other	Other
+7cfada65-95c2-4a29-9e8f-f7d938e260e9	1	Other	Other
+7cfb0afe-fa18-4753-b9be-cabeea54a4a3	1	Other	Other
+7cfb0f43-b2a8-4775-84f4-355d2a48baba	1	Other	Other
+7cfb63e8-eb14-4195-91fc-ad38e63a1cd8	1	Other	Other
+7cfc06d1-0f4d-4dc9-9abe-6e776554e001	1	Other	Other
+7cfd4c91-1e9f-430a-883f-f1375e818b27	1	Other	Other
+7cfd5b02-6326-4570-bccd-a41126438ba7	1	Other	Other
+7cfdc511-e963-4036-bd6f-e274fc2011ec	1	Other	Other
+7cfdd810-09cd-42f8-818b-977087c892c1	1	Other	Other
+7cfe2078-6c0c-4e42-99de-5eb66f737c2d	1	Other	Other
+7cfe3cc9-7afc-4ad7-822f-7f8de1e3f883	1	Other	Other
+7cfe5e1e-dd90-41c9-ae2c-f56b978cc816	1	Other	Other
+7cfef867-b562-49a3-9033-921527761174	1	Other	Other
+7cff0283-062d-4538-b82e-ad53aea588ce	1	Other	Other
+7cff13f4-fffd-4cd3-8a06-df696c8158e8	1	Other	Other
+7cff4af4-8e49-45a0-9449-0d132892721a	1	Other	Other
+7cff8111-ae74-40a0-a31f-d8217c256939	1	Other	Other
+7cff9f1d-7960-4a11-b153-285add31a081	1	\N	Other
+7cffcddf-284f-4582-84f7-a21373ed7c9e	1	Other	Other
+7cffd3c0-6ff4-469d-a23c-6199ca42cd53	1	Other	Other
+7cfff842-086a-49dc-a101-9877630c2e8b	1	James	Other
+7d002500-cd45-4943-ac64-52c4e3fd90a8	1	Other	Other
+7d003048-6f55-4513-a894-fa569b7194d5	1	Other	Other
+7d005568-4c53-4d35-aa7d-4cb26bc6f635	1	Other	Other
+7d00937c-6b53-4ee4-b88e-4e0d1d4fb7f9	1	Other	Other
+7d00cbc1-be8d-4fca-8628-9646ca2c9891	1	Other	Other
+7d0102ba-29a7-4400-bfaa-23810aa0ef22	1	Other	Other
+7d012a07-c1eb-4e7e-8eb6-8eadcf242090	1	Other	Other
+7d013239-dec3-4d37-be16-0933cece0ae3	1	Other	Other
+7d0156c5-5a78-48b8-a282-ddf66abfc76d	1	Other	Other
+7d018571-7f81-4710-98ef-71dc6d1be0fb	1	Other	Other
+7d01af44-fa4a-4e34-9f5f-218fd579e227	1	Other	Other
+7d01b734-d079-4db4-becc-187b977c31c0	1	Other	Other
+7d01be3e-4008-4ebe-943e-d2b8fdf5aeea	1	Other	Other
+7d01da23-4259-4bf5-81ee-0529ab0c083e	1	Other	Other
+7d01fc70-15f1-4c56-9abb-bc500381b4d5	1	Other	Other
+7d02158e-3fda-4df8-a7f9-3b9350c5f1da	1	Other	Other
+7d027b89-4f0d-46fb-bbe9-2d92707eddd3	1	Other	Other
+7d02bb96-525c-40f3-a5a6-8722f4348bb2	1	Other	Other
+7d02c521-c532-43ea-a6c1-35cde1b65dcc	1	Other	Other
+7d02d89a-04ca-4b43-912d-e9d4f1990111	1	Other	Other
+7d031fcf-a0c1-4348-9bc4-f40eea39ea6c	1	Other	Other
+7d0327ed-0716-464a-9042-bcaf6c82dc7d	1	Other	Other
+7d03305f-5f9a-4595-914a-7c06a7f5514c	1	Other	Other
+7d0330f0-57f6-4b16-b164-237e77ae4d48	1	Other	Other
+7d0365e9-1dd1-4c16-9da1-8081357e1fec	1	James	Other
+7d0377b6-800b-473f-8c66-7c77389607e4	1	Other	Other
+7d03ace6-f3e5-4370-93c7-b2f35ec9438d	1	Other	Other
+7d03c912-0a4d-4cf1-a43e-65b7cd7dd52c	1	Other	Other
+7d03e87e-1c39-483f-b2a9-3c5c6aea4832	1	Other	Other
+7d040909-5ea3-47b6-86ed-ccf5456f1cec	1	Other	Other
+7d04262f-fbe1-4855-818c-351e2296e966	1	Other	Other
+7d04b0ef-67b8-4e0b-8c38-03c30c1823cd	1	Other	Other
+7d04c9b7-b223-4ebc-a8d4-2007285e9eba	1	Other	Other
+7d04cb64-cc3e-42d2-a200-e917efb0c4a6	1	Other	Other
+7d04e946-fb83-4d0f-8e73-bb2bcb9dc484	1	Other	Other
+7d053c65-bfd5-4491-83b1-faf67c963702	1	Other	Other
+7d057696-9145-4a9b-b8e3-b4f783935f42	1	Other	Other
+7d057876-bd9e-408d-9a6a-c205db82f266	1	Other	Other
+7d057934-2ea9-4ed8-98bd-daac4d5d13f3	1	Other	Other
+7d0580b7-1b77-445d-a372-89b7787226c0	1	Other	Other
+7d05820d-9986-4b55-a806-bc67420d5ecd	1	Other	Other
+7d05968c-d379-432a-9c4b-e0e096971ad9	1	Other	Other
+7d05fd72-6bfc-4c7f-918d-753147549b83	1	Other	Other
+7d062353-2663-42c6-bd43-451b8d52c155	1	Other	Other
+7d063733-4901-4a97-92e2-3e15ecd7f7a0	1	Other	Other
+7d0665a9-003e-438c-afd9-c4d0b9860df2	1	Other	Other
+7d067299-7cbb-420b-ac56-29652044d38a	1	Other	Other
+7d068d76-56a1-4993-8135-25d73ef34c8e	1	Other	Other
+7d06911c-b2c3-4f13-8748-ddf36e3d6bce	1	Other	Other
+7d06a253-791b-45ee-95e0-f337872c6456	1	Other	Other
+7d06d9d0-c930-4099-905a-e0ceb7f9c931	1	Other	Other
+7d0752b1-6d66-4a57-aa34-6b38535ae503	1	Other	Other
+7d076752-1b99-4a8a-a92c-b278ce401181	1	Other	Other
+7d07a5f6-287d-4b9a-ab93-cf329f332ffc	1	Other	Other
+7d07b5b7-eed2-4a60-8650-2e7e69a09d15	1	Other	Other
+7d0840d6-78c1-46ef-a935-f96f1096f455	1	Other	Other
+7d085dcc-c623-4298-a764-adf803af9ac6	1	Other	Other
+7d087fd0-14d2-449b-9430-12eda912a566	1	Other	Other
+7d088f7f-5a9c-4a1b-b5ce-aa32ac9d1f18	1	\N	Other
+7d08c461-cf0a-4c2d-9ac1-fe76cdeb2a34	1	Other	Other
+7d09269e-926e-435f-8373-292dadf08882	1	Other	Other
+7d09508b-d39e-42fb-b3b6-baa1c073ee44	1	Other	Other
+7d0956cc-cfad-40a6-9245-9fd9ef535206	1	Other	Other
+7d0963b3-d292-445f-84ad-09a1cf288b04	1	Other	Other
+7d0976a9-722b-42f1-a8d3-1d1ea67adab0	1	Other	Other
+7d099780-fc0a-415c-9c39-6a8a8e69eabc	1	Other	Other
+7d099a63-f93b-4da5-91c1-afa088321d00	1	Other	Other
+7d09d565-9a45-4c7d-8e69-0154d33d0de5	1	Other	Other
+7d09d580-725f-4449-9d92-66d8b0348d30	1	Other	Other
+7d0a1033-e2f9-4c34-b462-4a35b0f30ab1	1	Other	Other
+7d0a889d-96c4-48bb-aabe-feec4ad42455	1	Other	Other
+7d0b01b3-6272-46ff-9b22-f490c81c8ead	1	Other	Other
+7d0b20d7-a888-4ad8-9d6b-d7f4910e2c81	1	Other	Other
+7d0b2ba2-5868-4339-8838-0fbf3a71b76b	1	Other	Other
+7d0b3a30-4411-48ce-9588-40c8a208ce08	1	Other	Other
+7d0b4d0f-b08f-47db-a857-6649ff4921e9	1	Other	Other
+7d0b4d25-c414-4c95-a7af-54d2c88aebd2	1	Other	Other
+7d0bfb5c-8f44-4f13-a543-d5fccb0f831e	1	Other	Other
+7d0c9ab5-205d-4745-8cf8-f0f05b78c78f	1	Other	Other
+7d0cd6b5-e105-4da2-9477-3d6957c75f63	1	Other	Other
+7d0cd9e7-e8b0-40f1-8545-7fb37019edab	1	Other	Other
+7d0ce948-7d59-438d-b035-da9f50ef33eb	1	Other	Other
+7d0d0e24-2656-486f-a2b5-bd657399ad04	1	Other	Other
+7d0d349d-e9fb-4a48-b191-c772eb58e8dc	1	Other	Other
+7d0d88d9-0cfe-43d7-bab4-8f8962850c7f	1	\N	Other
+7d0e1ac9-a8c4-4e96-8128-1d02a64af7e2	1	Other	Other
+7d0e39f3-3b6a-40b9-8580-0827b836c92b	1	Other	Other
+7d0e4142-7985-405b-930a-91f13f3552d7	1	Other	Other
+7d0e44fb-3aaa-42ee-a3d1-a73bd7951b14	1	\N	Other
+7d0e4b57-2f84-4e6c-891d-f3012a1e294e	1	Other	Other
+7d0e7ee2-bfcc-4996-9fe2-018b1abc4a5b	1	Other	Other
+7d0ebeef-31c0-4fdb-8cd0-e9359ffa7cc9	1	Other	Other
+7d0f3838-5341-47af-99cb-5e93b6b9a636	1	Other	Other
+7d0f5854-9f9d-418a-857a-693357d24547	1	Other	Other
+7d0f5ec5-da29-4cbe-b646-456ddb5cda7f	1	Other	Other
+7d0f68d5-4e90-4375-ad63-d42c97ce3bf3	1	Other	Other
+7d0fd513-326b-4b7b-9ea5-8686af11567e	1	Other	Other
+7d100867-6c18-4f03-bfa1-d907605fe907	1	Other	Other
+7d101484-52a9-4b9c-b88e-c14cdfb59a26	1	Other	Other
+7d10240f-4356-4940-8bec-44589518b60e	1	Other	Other
+7d102f49-eb65-49b1-ae75-559f5a0ed7c6	1	Other	Other
+7d106921-a353-4449-b3ff-c0a24d568994	1	Other	Other
+7d107530-be5c-4c48-aa70-fbeba8154953	1	Other	Other
+7d107ebf-354c-47ce-b543-ef0d6394ffc7	1	Other	Other
+7d10d701-ba8a-47c9-92a4-20883ec375e2	1	Other	Other
+7d10ffe4-6d7d-4dc8-a9ce-822fbb8e7f6f	1	Other	Other
+7d11065c-6c65-464e-ba22-ccaa41efe7d8	1	Other	Other
+7d112f57-cfbc-4f14-95d1-9aa7f21fd363	1	Other	Other
+7d116f82-92db-11e7-aeae-fa163e8624cc	1	Other	Other
+7d1175dd-76c0-48dc-99fc-a48a34b624cf	1	Other	Other
+7d11ba3d-be72-496e-b106-36cdcb163f47	1	Other	Other
+7d11cfc3-d5b9-42a1-aa89-d24f45eaffa6	1	Other	Other
+7d11dcfe-6ce8-414f-a8ea-797352d73593	1	Other	Other
+7d11e181-6624-4c3d-ba9c-c99bb8666a52	1	Other	Other
+7d126886-5c27-4404-ba2e-71f6d937baaa	1	Other	Other
+7d12a936-5c58-46a9-b08b-c0bc3e09233d	1	James	Other
+7d12bb62-26f2-46c6-a625-606401a1883a	1	Other	Other
+7d131d6e-e387-493b-b412-5e86f62e3c19	1	Other	Other
+7d1353a6-55d2-4c3e-82b0-22526019e497	1	Other	Other
+7d1389ac-7f23-44e5-880d-cafcefa15a7c	1	Other	Other
+7d13a8eb-e0f9-4c50-9697-62fa8086760a	1	Other	Other
+7d13a995-4e7e-4538-9382-dfc464070d99	1	Other	Other
+7d13ada2-69ae-4e58-9e5e-e42548e70593	1	Other	Other
+7d13b68a-4243-4b52-8ac3-c81f1fe4fa49	1	Other	Other
+7d13e703-b235-400e-bef1-29989ad7eba6	1	Other	Other
+7d14156c-24f7-41f5-9645-cd3bdb6cfccf	1	Other	Other
+7d14ab80-bd0b-4728-841c-1fd9ae96bf90	1	Other	Other
+7d14bb2f-9e09-46c0-8cb0-a2875d3d9113	1	Other	Other
+7d14d098-c3ac-48f7-bb2d-a30d13a6e930	1	Other	Other
+7d1521ba-bacb-4390-9dc0-b2b863d80a3c	1	Other	Other
+7d155ecf-ba8d-4563-8ff8-8ba5a8d32fad	1	Other	Other
+7d156521-7d62-4a01-92c9-4d5ab67bd946	1	Other	Other
+7d15a1ec-ed20-4dc9-8ee6-705db118bae2	1	Other	Other
+7d15f81f-196f-489a-afae-d1f0b29746b6	1	Other	Other
+7d1607f4-9341-4885-9628-baeab5f273c0	1	Other	Other
+7d167591-b01b-4b9a-947d-cb2c81f7e4c7	1	Other	Other
+7d16c2bf-4852-4e10-ab9c-64da979953de	1	Other	Other
+7d1702ec-7f11-4a81-8a5f-183d1afc4d36	1	Other	Other
+7d170708-3539-4be7-b13e-6fdd20d6b7f1	1	Other	Other
+7d170dac-2d64-4422-b13e-dea8c5861aa0	1	Other	Other
+7d17476d-0dc2-433f-a471-270d14354908	1	Other	Other
+7d174882-c688-4f00-bb58-2ca91f29c577	1	Other	Other
+7d1762d1-2c61-420f-8480-761efd93c6cf	1	Other	Other
+7d17cbe7-6f65-4877-8e82-b75c5228881b	1	Other	Other
+7d1804c4-7678-450a-a811-9f6aa18a3db3	1	Other	Other
+7d18184f-d1c3-4f9f-96c3-8060129cd14c	1	Other	Other
+7d18379c-6d86-4fdf-a0e9-1fffd3d84a02	1	Other	Other
+7d18716d-2f77-4e10-8da7-37c4cd32b560	1	Other	Other
+7d1872b7-c768-45e3-8fce-8ec74d747039	1	Other	Other
+7d18c267-00a6-47fa-8e9d-987be183b7d1	1	Other	Other
+7d1910bc-08a9-41b8-a4b3-4cd26ac5ba08	1	Other	Other
+7d191f34-8aa9-4fec-9777-f09446ffb3c1	1	Other	Other
+7d193287-b687-49ad-a2cb-e651ee8be026	1	Other	Other
+7d1946f7-ddd9-4f76-ab49-ae24fffa3247	1	Other	Other
+7d196a31-c9fd-4fe5-9790-3104483f4124	1	Other	Other
+7d196a85-8534-498f-9563-d0f9917292c0	1	Other	Other
+7d1987c2-7926-455b-bc9e-326283cc6f7c	1	Other	Other
+7d198a81-f6f8-49f7-814d-6b8c651e2b59	1	Other	Other
+7d199e07-7116-49ff-9259-bef215f209a1	1	James	Other
+7d19c4ce-b26c-4a8a-a723-94b49010ef8f	1	Other	Other
+7d1a1ad0-2a98-438f-b428-b5fa081c1524	1	Other	Other
+7d1a222f-4c55-4b9f-a1be-da1e126b72c4	1	Other	Other
+7d1a23ee-d5e0-452d-b079-d73668074dc5	1	Other	Other
+7d1a2e94-3576-486c-a4f1-3a489fb1a04f	1	Other	Other
+7d1ad629-31e6-4c67-bb1c-754e2782f67e	1	Other	Other
+7d1ae778-88c1-421d-bbef-7b5a235b9e6f	1	Other	Other
+7d1b3057-5c25-4a71-88d8-140392b90cd9	1	Other	Other
+7d1b3273-d6fa-4e02-be40-f20f87e2e831	1	Other	Other
+7d1b45df-d34a-4f23-935b-1f60aac9e7cb	1	Other	Other
+7d1b4f33-5768-498b-ad38-2ab933642374	1	Other	Other
+7d1ba709-69c1-4976-8576-2eb1976ebb74	1	Other	Other
+7d1baaed-d5f2-428f-8eac-60bd48419277	1	Other	Other
+7d1c2c31-3615-4671-8dbd-1a63e6c25ea4	1	Other	Other
+7d1c7fef-b520-4f60-a413-a0e93332148f	1	Other	Other
+7d1cd496-24d0-44e3-923d-9e0583918980	1	Other	Other
+7d1cebbf-c7e4-41e6-8cfb-8fff7e54c496	1	Other	Other
+7d1d0f71-f07c-4bba-8a96-61eb6350980a	1	Other	Other
+7d1dac3e-b985-4c8f-bd89-ed7443a2e6e0	1	Other	Other
+7d1dbfd7-db3b-47ed-a50e-54d1b300b367	1	Other	Other
+7d1e7bf3-8915-49e5-859d-603537dc0ae0	1	Other	Other
+7d1e953e-cfc5-4ba2-b9ee-4c96bfc07027	1	Other	Other
+7d1eaa1a-48c4-43ee-9b5a-e7f71def3823	1	\N	Other
+7d1f9c6f-2748-41cc-91b4-6047eb5f971b	1	Other	Other
+7d1fd23e-2467-452b-9e41-20eec0fb9e9e	1	\N	Other
+7d202019-026b-43e3-979d-53d58a139bc2	1	Other	Other
+7d207a29-0392-4573-852a-a9036009103c	1	Other	Other
+7d20a9e9-c7b6-4d7f-a9e9-61e0abcd23f2	1	Other	Other
+7d20fea8-7285-4277-9a9b-c7686ba78a07	1	Other	Other
+7d21429f-43ed-40b3-9f34-233d075223ef	1	Other	Other
+7d21493e-b3c4-40c5-b34a-4f3c05be5c81	1	Other	Other
+7d216031-3131-436a-a81e-ba2f9761685a	1	Other	Other
+7d219251-481f-476e-a72e-f0a2e71aeb9f	1	Other	Other
+7d220ae1-9213-4040-b102-c05085099cc1	1	Other	Other
+7d223812-ff09-4be1-ac1a-29434e3012c0	1	Other	Other
+7d22454c-3184-47c5-b03a-bdc06a796da9	1	Other	Other
+7d22c123-fb95-45cf-8db9-1fa38d42d0c9	1	Other	Other
+7d22c340-51c3-4541-87b1-6bc43bc691e0	1	Other	Other
+7d22dfda-6b40-442b-a810-ecc345415121	1	Other	Other
+7d22f24b-4d93-491f-acd2-a8464be92f5f	1	Other	Other
+7d232860-6362-4f4c-af76-cfe34f9e1fa7	1	Other	Other
+7d2338b9-e98d-409f-b3aa-cba5354a8545	1	Other	Other
+7d233b5f-0ea5-49da-b732-e9d3b099bfe6	1	Other	Other
+7d238da4-e255-443d-a5ff-cf0fd5d34726	1	Other	Other
+7d23b9f4-5a9c-4c1f-9497-018ae4b26e4c	1	Other	Other
+7d23c8ee-7ed4-47ee-ae0f-9811198d7bb1	1	Other	Other
+7d23e50a-11b1-46d4-92b9-57ee82b18993	1	Other	Other
+7d23f5a4-0c67-4796-bd02-a7d2c29ae2d9	1	Other	Other
+7d2421fc-a269-4296-8f69-538e921c31d4	1	Other	Other
+7d2435f1-a3b9-4d58-ba0b-6d435cba79ad	1	Other	Other
+7d244e1e-1a30-461c-ac18-fc5f38cd0fea	1	Other	Other
+7d245552-bc1b-404f-b65f-cf43281363a3	1	Other	Other
+7d24ef09-7be1-4d75-9c15-829e82ef49bd	1	Other	Other
+7d250edd-726c-4f3c-9976-adcfee487f57	1	Other	Other
+7d251558-863f-438c-83b2-79184ce793fe	1	Other	Other
+7d253faa-be5f-43aa-af89-97b7ad5cd327	1	Other	Other
+7d2578f3-2f78-4500-898d-ca7e364805d4	1	Other	Other
+7d25ba97-ccab-4da5-81dc-39d0467b5dbd	1	Other	Other
+7d25d331-c6bf-42d7-a1f0-67727b2b5ee5	1	Other	Other
+7d25e385-fb49-4216-bfba-f04bf9faad00	1	Other	Other
+7d25e568-6d4c-4aaa-9341-16403a6e7757	1	Other	Other
+7d261e62-2cc1-4322-8b55-0306587e81b0	1	Other	Other
+7d262d48-4b30-4c5d-929c-b03fd073069e	1	Other	Other
+7d264a9c-eeee-44ff-b5f0-70cde3d85b13	1	Other	Other
+7d2663d2-ece1-4575-9e45-b648f1edd0ba	1	Other	Other
+7d270360-afad-4897-a8b9-6d0b0652e895	1	Other	Other
+7d27333b-9a51-426c-94a2-c5d5a4f2c605	1	Other	Other
+7d27356a-f67e-418d-ae7a-97ea97c74c8c	1	Other	Other
+7d278dd8-8b51-4c36-a0c8-3b2229425167	1	Other	Other
+7d27a912-b2cc-47f7-a83d-df533281350d	1	Other	Other
+7d27ccd1-f7c8-4931-ae4a-ff5a17d6a77f	1	Other	Other
+7d27ea78-f258-4e72-81a4-c82e61110d68	1	Other	Other
+7d282e37-9595-40b7-bca2-91918fbdb90c	1	\N	Other
+7d283608-6ab8-4645-8de3-2b8afe5afe3e	1	Other	Other
+7d284304-a4d0-4ecf-a4fa-662ba3006a30	1	Other	Other
+7d286710-2cf8-481a-bdaf-9992bf1c23d4	1	Other	Other
+7d2910d2-7e39-4bfb-9853-c7227468192e	1	Other	Other
+7d29aa1e-623c-4689-bf8c-267b8786a305	1	Other	Other
+7d29de3a-51e4-42e7-8bf3-d28a190dafbb	1	Other	Other
+7d29de63-9f06-499a-af37-3b995c19383e	1	Other	Other
+7d2a292f-aa85-4897-9ce9-ed6d8a24bdec	1	Other	Other
+7d2a29c6-32f9-4c3a-9f76-003848f9a166	1	Other	Other
+7d2a3b5b-39dc-405f-8ed2-e3aee1adcabb	1	Other	Other
+7d2a6552-b473-4475-b192-cbce2758173b	1	\N	Other
+7d2ad7b4-41b4-4e89-ada7-31c68c390005	1	Other	Other
+7d2b20ca-0c96-4bc3-ab9d-403002d6f398	1	Other	Other
+7d2b4e77-3c68-4bf4-bd8a-e1e200a841d8	1	Other	Other
+7d2b8b89-cfb0-4326-97ca-5abdb0cd17bd	1	Other	Other
+7d2b9c2a-aed7-44c5-9586-8ea940809004	1	Other	Other
+7d2bcb5b-fe83-49e0-a619-d94317451d08	1	Other	Other
+7d2c264e-1a92-4bf9-9db7-f4ce38473856	1	Other	Other
+7d2c4d1f-cb26-4a09-9bec-7797cbff050b	1	Other	Other
+7d2c537f-c470-4dca-bbf3-8f668de35ea5	1	Other	Other
+7d2c880e-f869-4785-9439-e8ad0e1bf85f	1	Other	Other
+7d2cfaaf-65a6-4f47-b567-4e1b6dff180a	1	Other	Other
+7d2d0108-82b3-4b9e-b764-eba94f9f1f87	1	Other	Other
+7d2d41eb-989d-4c4b-b597-0aad4c29b475	1	Other	Other
+7d2d4819-8849-44b6-90e5-c3c54a8ff195	1	Other	Other
+7d2d8bc9-6a48-4595-99fa-803826554e5a	1	Other	Other
+7d2d8c65-c052-406b-ae9a-76d1ca81b0b2	1	Other	Other
+7d2d9a32-e781-4da3-9061-c881ab6edaad	1	Other	Other
+7d2db8b0-a7bb-4879-8831-6a05371e21e1	1	Other	Other
+7d2e1cb5-19e1-4c19-8958-934e67becf0d	1	Other	Other
+7d2e59ca-13a8-4d61-ab3a-c32a25d886a8	1	Other	Other
+7d2ea0d1-cb72-4ba8-a824-21205e8d65c2	1	Other	Other
+7d2ed2e1-0932-46f8-80ca-8a1cc9991286	1	Other	Other
+7d2f1e9d-8b8a-47df-9ef4-3f5cc8e9eb31	1	Other	Other
+7d2f5d77-0486-48bd-bc2a-4b9e2f20bc47	1	Other	Other
+7d2f77a6-2145-456b-a522-9ec6d84e58cc	1	Other	Other
+7d2faf5a-72c1-47b7-8f76-e47427709efe	1	Other	Other
+7d2fe7fd-aa63-43da-804c-bf3200e7b334	1	\N	Other
+7d302177-35ec-44aa-9f6f-bd5ad749f652	1	Other	Other
+7d305443-544b-4f43-848f-6d1265bc9566	1	Other	Other
+7d30bf10-4335-4e29-92ca-3a5d562bfea8	1	Other	Other
+7d30ca56-3d25-4a31-96d4-8bd2c59ce8c9	1	Other	Other
+7d30fd2b-34e8-4358-b2a1-296f9981eb6c	1	Other	Other
+7d310b94-f339-4372-864b-04b271c82042	1	Other	Other
+7d31b8e5-dd55-484d-8ab5-c81955634ae3	1	Other	Other
+7d31cdbb-6af5-41af-943c-2b921581af16	1	Other	Other
+7d31e2e3-2d9f-4dab-af29-8bfc297c8ee9	1	Other	Other
+7d31e963-8d9f-4251-b8f4-05e9624adc5a	1	Other	Other
+7d322e64-263d-465b-a427-a01e74048194	1	Other	Other
+7d3255b2-ab5c-4bef-a38d-f0db4d3f77de	1	Other	Other
+7d32565d-608d-4cdc-ae60-5c1dd8b75a56	1	James	Other
+7d32610b-3a07-4c2b-8939-8d9230e6f234	1	Other	Other
+7d328b8a-f9b2-4303-8a82-fab56fe5c423	1	Other	Other
+7d32adb1-2a99-4059-bd8a-e25e7241073f	1	Other	Other
+7d32ccf8-d680-4e40-a31b-07ece774b673	1	Other	Other
+7d32e853-27e8-493c-b0f0-fc03685002fb	1	Other	Other
+7d331f14-d272-40c8-9b56-1d60ffd0a6d4	1	Other	Other
+7d338048-845f-4741-aed1-45bbb36ac288	1	Other	Other
+7d33dd51-623d-467b-b213-f4ecc87244be	1	Other	Other
+7d3423df-5682-4cad-afd1-a3bda5d740ae	1	Other	Other
+7d342f7f-b69d-4249-b3c8-d95f32ff9901	1	Other	Other
+7d345281-6a3c-40e0-9bb7-3b3fcf910f37	1	Other	Other
+7d3492cc-0658-41d9-8dfe-f4af7b4e9239	1	Other	Other
+7d34a15a-ba99-44ce-9388-5d62fdc89eca	1	Other	Other
+7d34b27a-8206-417c-a5f8-fdb342655967	1	Other	Other
+7d34c8ab-d3e9-4214-b416-92b0eca66107	1	Other	Other
+7d351902-7105-4dc6-969a-f1c9472c102c	1	Other	Other
+7d353b57-f6dd-459e-900a-cfba71a5d454	1	Other	Other
+7d354293-2603-4128-b33a-09d17842354f	1	Other	Other
+7d35433c-3476-4c6f-a26c-7c2b93d1cbb6	1	\N	Other
+7d357da8-2f67-41fb-afeb-1a9cb7f9089c	1	Other	Other
+7d359655-46a3-4dbe-8b61-e514ab2e7fe2	1	Other	Other
+7d35b823-cc11-4b96-ae8f-47b0a29f3693	1	Other	Other
+7d35bd17-e75c-4058-aed2-45eb2145b156	1	Other	Other
+7d35da46-399d-43c2-ba85-029c953af07f	1	Other	Other
+7d36068a-48b5-4c7e-8923-da0411203be3	1	Other	Other
+7d360949-9ef2-4a5e-bbde-553e7748cb91	1	Other	Other
+7d3615d2-6cd0-40ca-accc-5075279c8e86	1	Other	Other
+7d364259-0b81-42d1-8d81-0e2f89fb8b7a	1	Other	Other
+7d3649c8-f0b2-41ff-b218-8af1f74d976e	1	James	Other
+7d368d47-e6c8-4189-aeb7-bc3cac5808dd	1	Other	Other
+7d36ba37-cd9f-45bb-b13b-f292d986442d	1	Other	Other
+7d36c474-b48b-46ae-90af-91eab139c8dd	1	Other	Other
+7d36edfc-4157-4816-be92-75834435d011	1	Other	Other
+7d370d88-4788-4d65-842a-9b20600f82db	1	Other	Other
+7d37137d-31fa-400c-b39a-8036a8195b41	1	\N	Other
+7d37500e-2e79-4677-8262-4623a1835aec	1	Other	Other
+7d376503-5b38-4c55-bd6d-4d7c7fcc0585	1	Other	Other
+7d377508-9076-4db3-9826-d94aeea25584	1	Other	Other
+7d377f5d-b257-4148-96ce-a2b156b3ab19	1	Other	Other
+7d37d812-4545-11e8-891f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7d381359-e1e1-460c-a1db-95cddbafa431	1	Other	Other
+7d383093-bfcd-4f47-81f7-0670d0b275e2	1	Other	Other
+7d3854dd-8865-40ae-a83a-2cab8fd08d8d	1	Other	Other
+7d386104-cde7-4612-89e7-aa130f742ab2	1	Other	Other
+7d386cc3-5836-4a0e-856b-0b66156bc239	1	Other	Other
+7d389e00-016a-44f1-8d4b-00bd7703d3d3	1	Other	Other
+7d38fe15-f940-4e81-9bd0-8603759f83a6	1	Other	Other
+7d391ff0-3971-475c-be2a-f803483422c4	1	Other	Other
+7d392467-65f8-46a7-a1c7-3241a62670fd	1	Other	Other
+7d3953b1-c50f-49f9-9da4-dacb9e064427	1	Other	Other
+7d396c4c-788d-4038-aab1-239049d9ddfd	1	Other	Other
+7d39885e-9444-4485-a639-b47f28227004	1	Other	Other
+7d39aa04-3793-4219-8084-ca8761303fe8	1	Other	Other
+7d39b4da-93a2-49d4-864e-c266d3ced464	1	Other	Other
+7d39c296-d758-46ae-9ca0-04bbd78be59f	1	Other	Other
+7d39ed9b-1317-4b72-838e-6c8e0943c09d	1	Other	Other
+7d3a2516-0a81-45f8-9ea6-6a258ee36796	1	Other	Other
+7d3a6787-acd2-40e2-8ea7-f55e839b938f	1	Other	Other
+7d3a8466-edef-420f-90b8-405381ac9383	1	Other	Other
+7d3a8686-9d4c-4bd3-b243-ade9b256e700	1	Other	Other
+7d3ab964-9213-4c2d-811b-be9b8dfd337d	1	Other	Other
+7d3b2b85-a890-4f6f-8f14-5febc7b318fa	1	Other	Other
+7d3b48e8-813c-4c09-a9a7-5df904c5bdf3	1	Other	Other
+7d3b8131-ed80-4d0f-904b-e70549c71ee2	1	Other	Other
+7d3b8352-47e5-409b-9557-c9700864dcf6	1	Other	Other
+7d3b8410-4a16-4b5e-bd4a-50c55d5de507	1	Other	Other
+7d3b8bc5-35a6-4d4b-bee3-eb6248517521	1	James	Other
+7d3b8f1a-83fd-46c0-95d5-8c28c4ad5b88	1	Other	Other
+7d3becf4-ee2f-4f48-bd27-4c895020543c	1	Other	Other
+7d3c0272-7c73-4251-a9e5-ea2a3aff0c97	1	Other	Other
+7d3c2905-e60f-440c-9aaf-3a241866b6ad	1	Other	Other
+7d3c4440-0015-4574-a4d0-e77b6ad449d4	1	Other	Other
+7d3c5d82-33d6-4bd4-b431-ceca2ed7a373	1	Other	Other
+7d3cb28a-e050-4fd3-b233-3716810ebabe	1	Other	Other
+7d3cc849-7a08-4f11-b524-eb631cd1ea6a	1	Other	Other
+7d3d06bd-3b19-46ca-80ea-f82160565597	1	Other	Other
+7d3d1adb-2438-49b0-aa36-a88f2b28fd82	1	Other	Other
+7d3d2b7a-fa11-4d6e-a6b3-0a682bc11f83	1	Other	Other
+7d3d3e54-2d48-4cdf-b557-f295709fd3dc	1	Other	Other
+7d3d716c-5e61-4ee7-8cb8-a2d1de64a0df	1	Other	Other
+7d3d8ac6-0602-48b9-9ec1-b8e494daa013	1	Other	Other
+7d3d8b83-354a-4a8c-a334-90f7a4c01f54	1	Other	Other
+7d3db70b-8766-474e-bc85-dbd2d1880a66	1	Other	Other
+7d3df07a-9a3e-4ad4-8f0a-48dc3c85b069	1	Other	Other
+7d3df60f-e35f-4e3a-96a0-db57f85a739c	1	Other	Other
+7d3e1ceb-d794-42d1-891f-f45034808266	1	Other	Other
+7d3eaba3-8e46-4fd6-ad1e-498dfa87960f	1	Other	Other
+7d3ededa-e20c-4d90-a216-88e646cbf59f	1	Other	Other
+7d3edf53-dcb0-401a-b3f7-5e620b59b112	1	\N	Other
+7d3ef63f-2039-4d87-90a8-c3b3ab54d107	1	Other	Other
+7d3f0275-d8cd-4e05-9044-63d4705c7547	1	Other	Other
+7d3f047f-3804-498d-b0e8-68e8e9429d48	1	Other	Other
+7d3f5525-ee8f-4fd5-beff-1a45f53db279	1	Other	Other
+7d3f7b1c-2816-446d-a6b0-fa551c9f0b70	1	Other	Other
+7d3f896c-9892-4c13-881f-cca3c99660ce	1	Other	Other
+7d3f8a21-e646-4ef9-a8c8-beef3ee7bfdf	1	Other	Other
+7d3fdcc1-6ab0-4347-bcbc-f6fe10d37e2e	1	Other	Other
+7d3ff762-a6e9-431a-8f5d-9e434d0c8d50	1	Other	Other
+7d400e31-b3c8-4237-bd1c-70ccb366712c	1	Other	Other
+7d4046ba-84e2-4ebb-a856-6c8663c7f021	1	Other	Other
+7d405874-394b-40bd-bdd9-a054c72fffbc	1	Other	Other
+7d40bf0c-e026-473a-a8fe-ad4ebe576f2d	1	Other	Other
+7d40e90d-f3c8-4ac4-bed6-9603a750ea74	1	Other	Other
+7d41286c-25f9-494e-944b-7111ddf4d06e	1	Other	Other
+7d412a43-29f2-4727-aece-941bcb7291d9	1	Other	Other
+7d41340e-0a64-4120-889d-fa773248e28a	1	Other	Other
+7d414140-1cca-4a47-8464-9bb5b1bf6fba	1	Other	Other
+7d41e6d4-5e6f-4297-b3e0-8ed1965c2ae3	1	Other	Other
+7d41f455-345c-488f-a615-298d4d820a92	1	Other	Other
+7d42170f-be0e-4207-b05d-7bc0d46cba71	1	Other	Other
+7d421eef-cef8-4436-81b0-50a8f9ded7bc	1	Other	Other
+7d429581-ff8f-435b-a0ea-65b76e86f199	1	Other	Other
+7d430e70-102b-4ff3-9265-074c49f979c2	1	Other	Other
+7d4317a3-e9f0-4625-8928-208f5a3af1cd	1	Other	Other
+7d432387-b5ac-4b17-acbc-042ab8e4a900	1	Other	Other
+7d4335e3-74cd-448c-917a-3eca7a75d8e4	1	Other	Other
+7d436317-4d62-469c-a14c-c85e26f5339c	1	Other	Other
+7d436a5c-c608-447f-85bb-581231257ecf	1	Other	Other
+7d4376ba-87a7-479c-bc60-c22a15834985	1	\N	Other
+7d43d505-78b7-4f26-9a30-1a27e8c510f8	1	Other	Other
+7d43d7c3-e36a-45e1-ad11-db4267137e4c	1	Other	Other
+7d440dfa-17c6-11e8-9ae9-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7d449870-a18f-4ad0-aad4-94bc1d4d540a	1	Other	Other
+7d449f0e-386a-40ad-a59b-6e6f67bdc77e	1	Other	Other
+7d452137-5e1b-45b7-8f8c-969f0aa0189f	1	Other	Other
+7d4566dc-dd1d-460d-85a5-31f8b140f5ab	1	James	Other
+7d458d9f-f060-41ac-a1de-53cc8385ffdc	1	Other	Other
+7d4616f8-c0be-41fa-b5d9-69485534213a	1	Other	Other
+7d462b8e-c5ce-4841-a27e-5298a6d20738	1	Other	Other
+7d463648-8840-4b5c-8390-5aed68087105	1	Other	Other
+7d46530a-da27-47bb-8e9e-0e835d1508af	1	Other	Other
+7d466810-cb5f-49ff-85f0-c68de06bbec9	1	Other	Other
+7d46788e-82a2-47b1-8e7b-3b30f78c458e	1	Other	Other
+7d468a64-d4ab-49f4-8b7e-80a05182b88a	1	Other	Other
+7d469c69-8672-4563-81e0-edc8dfe32d06	1	Other	Other
+7d46ac95-9897-4918-ae11-1908697192b0	1	Other	Other
+7d46b01a-241e-42b7-8a7b-8116aa562087	1	Other	Other
+7d46c426-1fbe-4a0e-a34d-c3da7f02cb43	1	Other	Other
+7d46e344-6246-4d82-860b-8e671bc13c32	1	Other	Other
+7d46e705-6e85-4ccb-9de5-ab5d8b3551a8	1	Other	Other
+7d4721a0-181c-47c5-acd9-4a09d5756af6	1	Other	Other
+7d47397f-43a3-484d-9a4c-23c33b39c167	1	Other	Other
+7d477277-8dd0-49bf-8cd4-f1c5881e9667	1	Other	Other
+7d478c14-c256-4abe-ae68-bd69f14a65fd	1	Other	Other
+7d47acf8-12e7-4b41-9241-212e7b834129	1	Other	Other
+7d47f6a8-879a-432c-a768-dd2a613bd64b	1	Other	Other
+7d47ffc4-6a0a-4648-9c8b-ac3488f45a9f	1	Other	Other
+7d483a96-02a4-4d37-b226-8a84d82034f0	1	Other	Other
+7d487381-6990-4106-81ff-a5fe69276c9b	1	Other	Other
+7d487ed9-4497-4feb-92a0-e06c35dccd11	1	Other	Other
+7d48ad89-0d7b-41c0-a458-a998310b6beb	1	Other	Other
+7d48ae37-b886-4d0e-add8-971698f51835	1	Other	Other
+7d492f6a-45d6-443f-8907-e68f6f80e3ea	1	Other	Other
+7d4961b2-657b-4341-9f3b-b98dfee4eecb	1	Other	Other
+7d497c69-8b48-41f5-8419-23bea09e0315	1	Other	Other
+7d49969c-9c95-4e51-945b-46860c01b936	1	Other	Other
+7d49e981-df11-44cf-894c-d480ebec67ce	1	Other	Other
+7d4a2b89-322c-4a2d-b76c-0c79ee96d445	1	Other	Other
+7d4a4156-56b3-47b2-bebb-a02de9d1b698	1	Other	Other
+7d4a6f39-13b6-4693-adb6-c6ce3676af86	1	Other	Other
+7d4a945c-7c3d-4bb6-9ef9-9324e3b2e80e	1	Other	Other
+7d4a9a1c-6f1e-48be-82a2-8420728af3d0	1	Other	Other
+7d4a9ae0-4d3b-4ee3-8c3a-2b87135a7eb6	1	Other	Other
+7d4ab59a-e919-4443-bf35-3884c8a6a3f2	1	Other	Other
+7d4ac23f-09c5-4348-b8f1-0b1f1ac8ed4f	1	Other	Other
+7d4aef40-1dad-4d14-b2b1-19908d43d410	1	Other	Other
+7d4b3885-1c78-43fc-8eb7-2fd7b7a48dec	1	Other	Other
+7d4bb1a1-47ab-4628-a208-219b1b4b8634	1	\N	Other
+7d4bd443-16d6-4a8e-9b0f-1cda82a45cb9	1	Other	Other
+7d4bd50f-9ba7-431b-8c5e-6839e474b2e1	1	Other	Other
+7d4c4000-5df7-4005-bead-efb54296410a	1	Other	Other
+7d4c543e-d93c-44f5-be7a-9246fe538ef3	1	Other	Other
+7d4c5482-05f1-42be-a54b-15cb12a2feab	1	Other	Other
+7d4c6915-51d6-4c8b-997f-0c4ad2a61a1a	1	Other	Other
+7d4c9ce2-c25a-4dfe-a891-27bb94433a52	1	James	Other
+7d4cb666-789c-4eb7-af7e-10d8e5a42936	1	\N	Other
+7d4cffa6-d12c-4a01-b0a8-7799065d3d99	1	Other	Other
+7d4d4777-9631-4e09-8fdd-392094a5a983	1	Other	Other
+7d4d76e4-c250-472e-b037-f1649858f103	1	Other	Other
+7d4dd86c-b8f7-4d4e-8897-65b1376b858d	1	Other	Other
+7d4ddc82-b079-43d5-beb6-5da4bfb8d0db	1	Other	Other
+7d4de538-4c69-42c7-8b35-7e6f101d0562	1	Other	Other
+7d4de86d-0a8f-4ec5-94a6-784b90ee1ed6	1	Other	Other
+7d4e5dfe-67e6-4cf9-b509-674dc01a5d58	1	Other	Other
+7d4e6ddb-daf5-4399-adb3-f1fa12ff7d52	1	Other	Other
+7d4ef7d5-0d4f-4ced-befe-91a73c523468	1	Other	Other
+7d4efbeb-ff88-402b-a33d-004e12ba3f0e	1	Other	Other
+7d4f5741-2c58-491a-bcb0-216025df1e23	1	Other	Other
+7d4f8836-4f55-4950-8e04-e0c516956de9	1	\N	Other
+7d500d51-23e4-44e8-982d-7cf597381113	1	Other	Other
+7d503f60-75f7-4f6a-a305-adf024990fc0	1	Other	Other
+7d50521e-9aa2-4733-b4f9-c162354610ae	1	Other	Other
+7d50997b-2615-4603-8a28-d6c18e6f1dde	1	Other	Other
+7d50a965-44ad-4be4-bc80-052f211a9ceb	1	Other	Other
+7d50b17f-dfd3-494a-a0d8-dcfaaaf6d7ea	1	Other	Other
+7d50e358-a68b-4869-b9a8-9d70ac440d2d	1	James	Other
+7d50ec4a-8086-40c0-8811-7509dc39a85c	1	Other	Other
+7d513005-56e2-4f6f-932f-50b1bb266a75	1	Other	Other
+7d518b6f-41fc-473e-8219-81fd8e21ba35	1	Other	Other
+7d51a491-d71d-41a4-9b9b-f7d05b3e1590	1	Other	Other
+7d51c999-8728-48e5-950b-6d6c8652e9d6	1	Other	Other
+7d51eeb4-8b3d-437b-aa08-df7baebaf34b	1	Other	Other
+7d520284-ed6f-4613-8917-b04988e8a851	1	Other	Other
+7d520ae2-ec40-46e5-a73e-2c10c55a6636	1	Other	Other
+7d520af3-37a2-4d45-a670-333abd3a4b6a	1	Other	Other
+7d522c1b-08db-47ae-a5d3-69c6b1af29a8	1	Other	Other
+7d5239d4-68c0-41fc-b416-143eec75ca3f	1	Other	Other
+7d52454a-a5d8-4b60-9f1c-a95be11caa7c	1	Other	Other
+7d527096-8aa5-4948-b65b-75167d2f27a2	1	\N	Other
+7d52a349-2ea9-4cd3-b557-bb44df59439d	1	Other	Other
+7d52aafd-e582-4159-9d49-781b36c30017	1	Other	Other
+7d52d0f0-b370-4dd6-9a27-065620d62599	1	Other	Other
+7d5305c8-e4de-4431-b58c-e8c57da48cc3	1	Other	Other
+7d535733-5207-438b-bedf-e9a2dd384482	1	Other	Other
+7d539c35-1ee7-4431-8508-4ddb2072038b	1	Other	Other
+7d53cd25-11d9-41ff-8133-7eda01c8316c	1	Other	Other
+7d54137c-6177-420e-9814-7f49cea64233	1	Other	Other
+7d541544-fe0c-44bc-abc8-a3d3ca9a0af9	1	Other	Other
+7d543204-6947-4326-be4b-3a49928a241c	1	Other	Other
+7d54faa6-6923-4372-a74f-1c9d0fb37566	1	Other	Other
+7d550658-a85f-4cf9-a436-bb8224318efb	1	Other	Other
+7d553942-0576-45b5-8b4d-a09811e8cd7d	1	Other	Other
+7d55540f-6c80-451b-afc5-25861c6c8a31	1	\N	Other
+7d559049-4466-45b0-8efc-ba98fa740a11	1	Other	Other
+7d55f8b5-3f16-4e58-ab0b-c0da64cf50e7	1	Other	Other
+7d56977e-02e5-4b69-9e8b-a85b2d09d293	1	Other	Other
+7d569d31-9806-43f6-8328-7d0581cc42aa	1	James	Other
+7d56f0c6-4d94-4daf-b068-520af938f772	1	\N	Other
+7d583e19-a577-4c16-beb6-054b0494267f	1	Other	Other
+7d58668e-8d06-4d1e-999d-6701096428a7	1	Other	Other
+7d587544-c4f7-4130-801c-3ea36c8a0ea7	1	Other	Other
+7d58b3a8-c21c-4e1f-9c6d-b92f8ec67fcd	1	Other	Other
+7d58b734-b437-4f41-9ba2-21de2c47edc3	1	Other	Other
+7d59082d-2afc-44b1-935e-87d6f29b52a9	1	Other	Other
+7d59135a-cb5a-400b-b7ac-a50b4d66ddb8	1	Other	Other
+7d594076-cc39-47a0-ab31-6dad978d3735	1	Other	Other
+7d596970-d850-4206-809f-57dcc08a2c02	1	Other	Other
+7d59d9ac-acb2-43d4-8c6c-01e41033a324	1	Other	Other
+7d5a2082-6264-47a0-8bc1-aaf3ff1e47ae	1	Other	Other
+7d5a233a-e462-459d-aa7c-e92842e7dd55	1	Other	Other
+7d5a6573-bc84-4650-a463-43b58839f981	1	Other	Other
+7d5a6b88-8dda-4b4f-b9a0-df91e83f7dc9	1	Other	Other
+7d5a82c8-3a98-4baf-994f-b736ca61d7dd	1	Other	Other
+7d5a9dd3-663b-40ad-93e8-a4e261ebf221	1	Other	Other
+7d5ab738-0be2-45e1-b543-0bcf8618a6a6	1	Other	Other
+7d5b15a9-2ac9-4e35-b83b-ae5889286d1b	1	Other	Other
+7d5b3400-cb2d-4a68-a491-2802b7e09ed4	1	Other	Other
+7d5b584f-b242-487f-90a8-4545ee0eb3f9	1	Other	Other
+7d5bf7bf-4c30-4dfc-a8d8-c2af33206fad	1	Other	Other
+7d5c33b6-0ccc-49b8-9e01-51fc46039c3c	1	Other	Other
+7d5c5836-df31-47eb-8f7d-f0ac4b92a1e3	1	Other	Other
+7d5c5f9c-75ab-4e14-94dc-0d977c1b40b8	1	Other	Other
+7d5c9eec-92af-46ae-ad1c-2a4dac3af564	1	Other	Other
+7d5cd78b-355c-4aeb-81cd-c21d22737d49	1	\N	Other
+7d5d4209-a4ff-454f-a7e4-78318086638b	1	Other	Other
+7d5d8922-21ad-4894-aa6c-cb18e9b4d952	1	Other	Other
+7d5e19b8-cb97-486a-8183-7318eedad545	1	Other	Other
+7d5e474d-9a3f-4aa8-a3c6-f1978d366ecc	1	Other	Other
+7d5e4886-1570-4419-9064-6b562f3662f4	1	Other	Other
+7d5e5fb9-763a-484d-864e-a8b74f33c203	1	Other	Other
+7d5e8d06-323d-4442-8e95-e27e5df698e1	1	Other	Other
+7d5ecaa9-86e5-4210-bee2-b385b3864e80	1	Other	Other
+7d5ed246-2c2b-429b-95c0-fa4b7054ca76	1	Other	Other
+7d5ee209-93cb-424c-9252-10fdb4a78682	1	Other	Other
+7d5ee28b-f889-42db-8bc0-af6e89aea866	1	Other	Other
+7d5efc79-6fe6-487f-a452-e9b04f80e7e1	1	Other	Other
+7d5f1740-659f-469a-8e13-09d84301f7d7	1	Other	Other
+7d5f2c09-76a8-431e-b507-4504acc96b8c	1	Other	Other
+7d5f4264-2c5b-4a9e-8e25-dc1cc8488c1d	1	Other	Other
+7d5f5d64-bc6e-41d6-b1b3-8e5f44d85771	1	Other	Other
+7d5f6d53-8498-4973-944e-8c34cd9b9785	1	Other	Other
+7d5f7a3e-3b40-4a1e-8868-7277565813a4	1	Other	Other
+7d5fb3ed-b4a4-49d0-bd61-86733d908ff0	1	Other	Other
+7d5fc6e7-0d82-4b8a-b32d-67faf07496b3	1	Other	Other
+7d5fd362-1295-4644-b58d-1a59d689621f	1	Other	Other
+7d60192f-cfa5-47a0-a364-1981a03078b1	1	Other	Other
+7d602ec8-c2f4-4f13-b2cf-e8bb2a66863c	1	Other	Other
+7d603ee8-35f8-4924-8f84-d2413fb4bd04	1	\N	Other
+7d60ad9a-9e6d-4d78-ac89-e7e058dad0c2	1	Other	Other
+7d60b7cc-b5f1-4298-b5b5-21d3b6c7356c	1	Other	Other
+7d60f8de-b5fa-46f8-bff6-9a0c84c7a46b	1	Other	Other
+7d610e58-37cc-422d-aedb-5b553235dfc9	1	Other	Other
+7d612d86-8973-4e92-97d6-4d2984760e32	1	Other	Other
+7d617cb9-d182-4b93-95e0-01d478055068	1	Other	Other
+7d617e51-6e6d-4fc2-999c-a90f9248240d	1	Other	Other
+7d61bf84-380d-4363-a826-9effaee041e1	1	Other	Other
+7d61f089-74f2-4afe-99e8-62578bb06c68	1	Other	Other
+7d6208ac-02e5-463f-9d09-30df11afd888	1	Other	Other
+7d62b18e-ba82-4098-8001-02ddce7ecb4d	1	Other	Other
+7d62b96f-2a56-48d6-bbd9-e2f10ce746d4	1	\N	Other
+7d630a6f-c2cd-4f08-9511-3e4f17f966d5	1	Other	Other
+7d633b0d-afdf-4b00-9997-02d33abc7680	1	Other	Other
+7d634bae-d186-47d6-b706-aeaf69ffec51	1	Other	Other
+7d635041-17aa-4f33-bb21-ab9763723b8f	1	Other	Other
+7d641514-62e5-44ff-969a-f137224e4430	1	Other	Other
+7d6438dc-92e7-4ef9-8eb9-8b06acb42ec4	1	Other	Other
+7d645165-d69d-475f-87b2-0ed361521f60	1	Other	Other
+7d645b6e-4198-4adc-bc62-2342132862e6	1	Other	Other
+7d64b943-f13d-45b4-9869-135dad8c25c9	1	Other	Other
+7d64bb17-0226-4e45-afa0-385eac4b69d3	1	Other	Other
+7d64d143-132f-4ede-b484-598d04eeed73	1	Other	Other
+7d64d62f-4998-4d57-b0b3-28397333b43f	1	Other	Other
+7d64da0f-890a-49a6-b7c6-763b626e3a44	1	Other	Other
+7d64e327-74d0-45de-bafa-c088e41aae6f	1	Other	Other
+7d6500c6-f46a-4922-aa51-a13a56d61b9b	1	Other	Other
+7d652111-d8a9-45ef-9ead-99ba633bbc8c	1	Other	Other
+7d652139-deda-4ea1-a3c8-f6d167ae8bfb	1	Other	Other
+7d65229b-9388-45bb-bb7c-850300de3ec0	1	Other	Other
+7d65e343-bc24-40c4-8538-b4ab182ea794	1	Other	Other
+7d65e4ed-445d-4984-b79c-31fef4b74f79	1	Other	Other
+7d65f38d-0091-434f-828c-a77613052584	1	Other	Other
+7d65f775-c822-49be-91cf-fd504f7ee3aa	1	Other	Other
+7d65ffa7-4c90-4cbb-a1c1-a667c9bb142c	1	Other	Other
+7d660930-69cd-4dd7-a668-c8eafbde69e1	1	Other	Other
+7d6625fb-609a-4033-a86d-256ae609db32	1	Other	Other
+7d666d31-1c9c-40d4-812d-1f42c3297fdd	1	Other	Other
+7d668ad5-5abe-4853-b53c-97533b39ee3e	1	Other	Other
+7d66dd73-0502-4335-959d-a21bff55b8ec	1	Other	Other
+7d66ed50-c5f2-4f49-ba4f-7787633a587a	1	Other	Other
+7d66f7eb-a518-42cb-888c-e8405bf6eb11	1	Other	Other
+7d67083e-3603-4ad4-b4cd-368ac7c2032a	1	Other	Other
+7d671b01-2658-4d70-a4f5-735ea46f1f88	1	Other	Other
+7d6722ab-d9f4-4026-bfce-780db3666383	1	Other	Other
+7d674705-168c-42a8-b861-6b68151c19bc	1	\N	Other
+7d6781f7-a2e5-4ee4-b6fe-19dabac3d0e8	1	Other	Other
+7d6792d8-9319-40e6-839b-2953975bb89e	1	Other	Other
+7d67c673-c53b-482c-af8d-376c3b59cb57	1	Other	Other
+7d680a7a-d04d-409a-b820-44b353ae52f3	1	Other	Other
+7d683ae9-0701-407f-94ea-87a576fe3d49	1	Other	Other
+7d68445b-61fa-4b7e-aca4-62a009bd9c71	1	Other	Other
+7d68662c-99fa-11e7-b994-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7d68cc07-7a33-48da-867f-a0478e05d787	1	Other	Other
+7d68ccec-bd39-4094-943f-e2235b15e5c3	1	Other	Other
+7d690a87-55ec-4af0-8c11-84146c8d1640	1	Other	Other
+7d6945cd-e160-41aa-a7dd-5922e153c896	1	Other	Other
+7d6968b6-fd58-4bb6-8b5a-383e575a4ef1	1	Other	Other
+7d698c83-d2f2-4197-a997-8e01bcdf118b	1	Other	Other
+7d69e0b4-74f4-4578-af00-245e01ae15d3	1	Other	Other
+7d69f1dd-2d0d-41b6-b2ff-e5d790f2c4a1	1	Other	Other
+7d6a4cb0-80ee-4758-b181-fd435cc3dc90	1	\N	Other
+7d6a9add-83d6-469c-ae27-6f8c33384cc2	1	Other	Other
+7d6ac482-2832-4888-8a4b-97bdcbc692bf	1	Other	Other
+7d6ad390-3699-4d13-8880-a6eddb2dbc99	1	Other	Other
+7d6b5b47-05b8-45d3-a5df-787f14ff64cf	1	\N	Other
+7d6b7107-8d22-47d8-a269-daa79f6af785	1	Other	Other
+7d6ba465-105d-444d-9c4c-9e74e4e062fe	1	Other	Other
+7d6baf0b-5e28-4918-878a-0e44d67a9b1e	1	Other	Other
+7d6bc3e2-3ed8-4b7d-beb5-4fb104e41d7a	1	Other	Other
+7d6bd744-9978-479e-8e2b-0b85296d6a79	1	Other	Other
+7d6bf311-1987-49b3-b131-7fd9ca1d6e4a	1	Other	Other
+7d6bf566-f437-4b30-acc0-32e1fe97073e	1	Other	Other
+7d6c472c-181f-4b21-a69a-6d822d5fcbe1	1	Other	Other
+7d6c4bbb-0d5f-420c-a747-5ff028b81f45	1	Other	Other
+7d6c950b-6603-4830-a8a8-c3dabcacb7d0	1	Other	Other
+7d6d1577-daa7-4d32-a36f-f5a3af2c5d62	1	Other	Other
+7d6d193b-4840-4fe9-926c-1b4d8bdc5a8f	1	Other	Other
+7d6d4c28-a708-4586-8aa0-d1a73544adb3	1	Other	Other
+7d6d86a9-10c1-49ed-a4e4-48300034b982	1	Other	Other
+7d6da2f2-ff29-453e-979c-c5abb4dbfec5	1	Other	Other
+7d6dbed2-5418-4463-b7d6-4685f915592e	1	Other	Other
+7d6dc777-ae3d-47fa-b68d-e94e6e26b222	1	Other	Other
+7d6dd2d1-87fc-4543-bae6-124b72680f6a	1	Other	Other
+7d6dd87d-ec7f-49d8-b5fd-494d20ac8c1f	1	Other	Other
+7d6de8bd-4ac3-4807-acd8-35b0126b0ee6	1	Other	Other
+7d6dfbde-fd9a-4956-81cb-35e87c4e5ff9	1	Other	Other
+7d6e258a-4ac1-432d-beca-4710e072ba76	1	Other	Other
+7d6e42e0-dfe2-44b4-beb9-5c2c54b89af3	1	Other	Other
+7d6e6e65-8c28-4806-bd91-2c1442564678	1	Other	Other
+7d6e87bc-30a5-45f5-92d2-2c949bb1e6b9	1	Other	Other
+7d6f38ec-7236-419a-bd56-37b31237ae10	1	Other	Other
+7d6f782d-c716-404c-b9a4-4163c03f051f	1	Other	Other
+7d6f8c97-cd13-470f-8bc2-3eb5b8a75f48	1	Other	Other
+7d70062f-b937-4a7b-8a95-e41e6839a479	1	Other	Other
+7d704a64-e3c4-4878-aadb-5ee100a3489f	1	Other	Other
+7d707141-0ced-4068-87d1-54699ca33422	1	Other	Other
+7d7076b2-9e79-433a-bdb6-c3f96673cd8b	1	Other	Other
+7d70878e-1805-4fde-9df0-6e88ec1abfd6	1	Other	Other
+7d7087e2-4ee6-44cb-90ae-d5e02bf19d7b	1	Other	Other
+7d70afe9-36bc-403b-a21b-da16e8e09d0b	1	Other	Other
+7d70f95a-f671-4702-8443-dd642ee5d0c0	1	Other	Other
+7d710f09-8173-4adb-811a-58ef2c520897	1	Other	Other
+7d7117c4-866e-48f3-82bc-d6ab5c1270b5	1	Other	Other
+7d71e94a-a4d8-4c71-b6c4-1d1bab9fa0bc	1	Other	Other
+7d726732-be7a-4c7d-b33f-b59302ae524b	1	Other	Other
+7d7275dc-97d8-4d56-9115-9512b2e09567	1	Other	Other
+7d73089e-4589-4fbe-b039-2e5f66341e49	1	Other	Other
+7d730911-7019-40b6-bd33-ea2e5cbe4ec9	1	Other	Other
+7d7345a8-14f1-4f8f-a889-5fd305c5a1b8	1	Other	Other
+7d73599c-8aad-4524-a9b9-cbc14a48f68d	1	Other	Other
+7d737e42-886d-4306-a373-639c52348a38	1	Other	Other
+7d73cb1d-33f0-4c44-a178-abcf0f851c81	1	Other	Other
+7d741814-9928-11e7-9712-fa163e8624cc	1	Other	Other
+7d742295-60f2-4f2a-8dab-e77ff03339dd	1	Other	Other
+7d743522-7226-40d7-aa2b-0e113f7a81c7	1	Other	Other
+7d7477b2-b40c-4ff6-98e6-0489e88dcfb7	1	Other	Other
+7d74ee31-e95e-493b-ab2c-d0ca671408ac	1	Other	Other
+7d750353-37b8-445b-a947-89d529868647	1	Other	Other
+7d752ad3-9f1a-48d3-a245-f64011b8c4fb	1	Other	Other
+7d754c9e-9bcb-4737-a5b2-6913d2c45e92	1	Other	Other
+7d7563c8-6b7b-43f0-b943-d245eaae83e3	1	Other	Other
+7d75c069-069b-4bb7-a046-90ed1d56917e	1	\N	Other
+7d762126-1652-4e13-a162-9b8581d4d45f	1	\N	Other
+7d7697f0-8e3e-471e-8e75-ac0a6b7bdc03	1	Other	Other
+7d76f01e-d88e-4624-b0db-e42d7e4c0b20	1	Other	Other
+7d76fbe9-c055-47d5-a1c3-085b0b7f2f25	1	Other	Other
+7d772cac-334f-44dd-948c-670a4d9151f6	1	Other	Other
+7d7740c3-b34f-4234-96ad-2c142bd867e2	1	Other	Other
+7d777295-5640-41a5-8176-06cd97c68bc0	1	Other	Other
+7d77f2be-b2c7-4bcd-b3fd-1947aefd535c	1	Other	Other
+7d781a20-326b-44c3-8038-17b3157629c3	1	Other	Other
+7d78bf0e-8dcd-48ae-988b-e3ed6ecb5e08	1	Other	Other
+7d7931f6-b651-46c4-a99a-13f210dd0dd3	1	Other	Other
+7d79b416-2f76-4ae4-a1ad-cdd2614e27a4	1	Other	Other
+7d7a2a0f-3ee3-45b8-85c1-c853836f55b1	1	Other	Other
+7d7a9313-a571-4028-b5b4-3e94aed777b1	1	Other	Other
+7d7a9e4e-51c8-49c5-b112-fc49812ef72a	1	Other	Other
+7d7adc4c-fde8-443f-9847-1d9c9c46a78b	1	James	Other
+7d7ae576-fba3-4439-b3b8-855a641143ae	1	Other	Other
+7d7b8a47-2b2f-4fcb-aa77-e144640d9eec	1	Other	Other
+7d7bd38e-5447-4e0d-bb25-db98e97a6d07	1	Other	Other
+7d7bf2a7-b9cf-407e-9cd3-48d7d4595c1c	1	Other	Other
+7d7c0672-b350-11e7-a5e6-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7d7c6295-dbe0-49e2-84a7-b08aa670a7f1	1	Other	Other
+7d7c932b-ec38-4f3a-89b5-709fd146c3a8	1	Other	Other
+7d7c9ce9-748e-432a-a4bf-20455cbdc07e	1	Other	Other
+7d7cf354-f5fd-4c4c-ba7e-04ffdfe57dfa	1	Other	Other
+7d7d059e-ef9d-4d8b-aebc-881adb3329c9	1	Other	Other
+7d7d0df7-bcf4-4e48-8c4a-fbb7caf30e8f	1	Other	Other
+7d7d3fbb-8ad2-45d3-9a70-48846fedf036	1	Other	Other
+7d7d7313-750b-407e-bbea-8347c367bb70	1	Other	Other
+7d7dc833-1003-45f9-ad39-4ee2c32ad4e7	1	Other	Other
+7d7e1290-1aaf-4806-9f90-66587d8c3fb8	1	Other	Other
+7d7ff5bb-7455-4ee3-b9eb-e00ca9586c65	1	Other	Other
+7d7ff7a7-1efa-432a-bc87-e61d80892779	1	Other	Other
+7d80a4c7-f537-439f-af3a-05b53b59debd	1	Other	Other
+7d80b001-46c1-4d0f-8ca3-51d2fd9b983a	1	Other	Other
+7d80bee4-6f46-4426-bbc5-b4466a9b804a	1	Other	Other
+7d80e42d-fb85-4864-8801-61e899d7bbb5	1	Other	Other
+7d8124a9-0968-40c0-81f5-f840d7a801e9	1	Other	Other
+7d815ecb-201d-41f8-bde7-9f11e89efed4	1	Other	Other
+7d816163-0cb3-4892-bb52-90702330b6ea	1	Other	Other
+7d818229-2add-470c-9aca-8716c28c6c77	1	Other	Other
+7d823d34-b006-4aab-90f5-ad2b0479b7f7	1	Other	Other
+7d82478e-ef0f-4d47-8bbf-9b029a49e507	1	Other	Other
+7d824925-4b27-4e52-949c-c65da47280dc	1	Other	Other
+7d824ede-568d-4e95-adbd-7cd25b0356f4	1	Other	Other
+7d82976d-799a-42cf-82f9-47f0421c8597	1	Other	Other
+7d82cbb1-35e9-43b6-8055-81533a46a49f	1	Other	Other
+7d82f6b0-6e46-4f5f-9e6b-a5ea638b052d	1	Other	Other
+7d8352cf-9dce-4d68-a91c-98a96dfe1cc4	1	Other	Other
+7d83da06-b403-4ae5-bb84-0f2f64791051	1	Other	Other
+7d83e321-3755-4d6d-a2b3-c6ac589a73e0	1	Other	Other
+7d83e791-23d4-4726-a483-8009ef5430eb	1	Other	Other
+7d84039b-4313-41ce-92e3-4bf81f60e599	1	James	Other
+7d848005-cefb-4200-adca-c56271c02c37	1	Other	Other
+7d848bdd-b80b-49c0-b644-9300d0205999	1	Other	Other
+7d84fbaf-a679-406c-9203-1648d87a1efa	1	James	Other
+7d85b07b-b970-49bb-8858-c569f62627e6	1	Other	Other
+7d85de8e-b775-4b14-8d28-2d8caa082a70	1	Other	Other
+7d85e399-2bfc-4860-b488-638b7ec4f5a5	1	Other	Other
+7d8618db-a14c-41e6-9a14-98f95b8f8f3c	1	Other	Other
+7d8647bb-34f8-49d5-91bd-3ba842a7c9ce	1	Other	Other
+7d864c29-fd6d-4bcb-9d0b-065cb07997d9	1	Other	Other
+7d866313-3929-449b-b584-7015349d2d33	1	Other	Other
+7d86690c-4235-4ea4-8ddc-84c98181f4bb	1	Other	Other
+7d86d0d3-bfcb-4090-8ba7-93b8408d2969	1	Other	Other
+7d871044-be68-4ea3-89dc-b0c8bb548191	1	Other	Other
+7d8722ff-8050-41ba-8cfb-ce1966629b8c	1	Other	Other
+7d877263-d886-4ae6-bc96-ddd05f4018f4	1	Other	Other
+7d87f3ad-8037-48c2-9f8b-b03875763d4d	1	Other	Other
+7d88bdb1-d807-4b06-834e-eb59385622dd	1	Other	Other
+7d8906b2-12c2-43ee-8bed-b585ad09d755	1	Other	Other
+7d890eaf-7b14-44cd-9d25-65f57bfa2737	1	Other	Other
+7d892728-a3f9-41c5-b415-91ec5e87eb9f	1	Other	Other
+7d894f38-060d-46a8-b51c-60ca99da029f	1	Other	Other
+7d895b9b-4212-4748-a6b0-b716c2ee2709	1	Other	Other
+7d8982c5-426f-4455-bcbb-ae944bc928b4	1	Other	Other
+7d89900c-2e02-49cf-90d9-15e287227964	1	Other	Other
+7d89a865-6e23-4daf-83c3-ecc5e0b33007	1	Other	Other
+7d89dd1b-8c2a-4931-b669-c807462079bb	1	Other	Other
+7d8a0756-ec51-4669-8616-1f5a74bb1760	1	Other	Other
+7d8a6a7d-4b38-4241-ab81-2724f4533317	1	Other	Other
+7d8a87e2-955e-470a-bdd1-43fc42e8635e	1	Other	Other
+7d8ab7d8-0b31-4802-b6d0-28303b733ab4	1	Other	Other
+7d8ac17f-936b-43e1-a2e5-0b1f14563f2b	1	James	Other
+7d8ae7df-3d1c-4f27-8f8e-6af87d50797e	1	Other	Other
+7d8b30a1-6b40-4fa8-be2a-8689ec845055	1	Other	Other
+7d8b3d3d-a6a1-45ca-ad7c-8116a0e8efc0	1	Other	Other
+7d8b6460-399f-4fc3-9f27-7066cabfdf83	1	Other	Other
+7d8b8b98-55a3-4a4b-87a3-38d91547322b	1	Other	Other
+7d8c0127-1516-4f2b-9dbf-5cb9d91c0177	1	Other	Other
+7d8c0180-dd85-4a8d-9cae-2fea177f1db8	1	Other	Other
+7d8c0944-0747-4cae-a318-f7996877e71b	1	Other	Other
+7d8c47a5-72d9-4e4b-a237-f6901830fbb9	1	Other	Other
+7d8c5501-72e2-450d-ae78-734a4fb5509a	1	Other	Other
+7d8caa15-a867-44d1-b3ea-9470df0d7ed9	1	Other	Other
+7d8cc3cd-1d93-468e-9419-a0a82b5becd4	1	Other	Other
+7d8d07ce-f4d1-46f0-9ae4-14701d71ab41	1	Other	Other
+7d8d7d65-44f0-40c4-9512-82852180a23e	1	Other	Other
+7d8db871-c829-4aa8-9aca-35c68b908dd2	1	Other	Other
+7d8dca26-72ce-4b38-aa1d-d034a21eb1e8	1	Other	Other
+7d8de066-cbdf-4ead-b2b7-e996ac19abf6	1	Other	Other
+7d8ec474-d39c-4476-ad37-e95f70e4544a	1	Other	Other
+7d8ed5c3-ea3f-40d2-8d36-61aac23969c7	1	Other	Other
+7d8f3843-b7ff-44d6-9339-e74f29f1f521	1	\N	Other
+7d8f3aa4-ff7a-415a-9051-ca9da05dc2e5	1	Other	Other
+7d8fa86d-d6da-4c3d-ba64-6586ecee7f22	1	Other	Other
+7d8fd153-e6ad-4fba-8295-a7ae03c30aa3	1	Other	Other
+7d8fdc30-da45-4897-867a-3d6544a89fd1	1	Other	Other
+7d8ff24d-4d03-4147-bd29-a8cfac5566c0	1	Other	Other
+7d8ffc9d-2141-484c-a5a9-6c0c4763729e	1	Other	Other
+7d901852-b3fb-475f-9c85-045f50d8aa35	1	Other	Other
+7d902aaf-2d93-4afe-bd8e-ee1a3824a4a4	1	Other	Other
+7d904958-9c25-48a5-bc3f-89fc796d4b4c	1	Other	Other
+7d91b152-9b34-4b57-8962-1d8be93aef76	1	Other	Other
+7d920440-2c6c-4eff-b846-b4da40910928	1	Other	Other
+7d9248d3-b7c9-4a8a-b0ea-3830e5824b1a	1	Other	Other
+7d92c1ea-40b1-489f-954e-860dab86d614	1	Other	Other
+7d92cb6e-c557-499c-8180-fbf677cd6d5a	1	Other	Other
+7d92e383-ebf4-4c44-8b9b-c4e23ddcef5b	1	Other	Other
+7d930d94-16d7-4218-bf4d-d0747923540b	1	Other	Other
+7d9310dd-e857-4163-b26c-f0d22155a04b	1	Other	Other
+7d9349be-6939-427a-86b9-a676494bd53c	1	Other	Other
+7d937fa7-30ca-4a61-9b7d-33036a1e5039	1	Other	Other
+7d93a027-cb3d-44eb-8bce-4c80e1c9736c	1	Other	Other
+7d93a9ba-c7e7-4c86-87b8-398aa10c543d	1	Other	Other
+7d93aeae-7714-4305-a4d5-cdd563fab0ca	1	Other	Other
+7d93d279-5333-491e-abaf-c76a232b2aa0	1	Other	Other
+7d93f20b-bae5-4468-8b82-1d85c31fc1b1	1	Other	Other
+7d942c02-0a9b-4e16-bf9e-9b7be9d908b3	1	Other	Other
+7d943721-523e-4b48-a0d9-15e7f58131ab	1	Other	Other
+7d948f5c-b9a2-460f-b4c9-0f050a3eda71	1	Other	Other
+7d94a10f-4da5-4a6d-9d5a-d68a94562a1e	1	Other	Other
+7d953464-654c-45b7-a475-bf81c30fd344	1	Other	Other
+7d953fdc-c77b-43be-9e4f-4df239b921d8	1	Other	Other
+7d957904-5a54-4b19-917f-c272089b0517	1	Other	Other
+7d95f252-0db8-44b1-b909-acfece979e42	1	Other	Other
+7d95fd52-8c8a-484f-9f9d-de7500a242d8	1	Other	Other
+7d9609e5-e627-48e5-83c2-4d3037329e8a	1	Other	Other
+7d960b6e-10b9-412f-906d-49444a8a9814	1	Other	Other
+7d96489a-8cb4-409b-b82b-2ff65fa18084	1	Other	Other
+7d964ade-42fb-4175-87da-4c7f410b9072	1	Other	Other
+7d968ca9-4f4d-4a4d-9bfd-8c1e50e3a56c	1	\N	Other
+7d96c5a3-1030-47e2-bd4e-377384b843ce	1	Other	Other
+7d971da5-b675-4ce1-87a3-0d640badabfe	1	Other	Other
+7d975834-e942-4023-95d7-834be2aec08d	1	Other	Other
+7d978f4d-3421-4268-b3f1-fa6b50d049cc	1	Other	Other
+7d97b84a-ac0e-4734-9462-12f29ceb01a5	1	Other	Other
+7d97ba85-a86f-4a9e-bd6a-8afac86bdc71	1	Other	Other
+7d97cb3c-8a6c-48bc-bd9d-1f30b0963f92	1	Other	Other
+7d97cb8c-598c-427a-9185-87d6919219fb	1	Other	Other
+7d9800f7-c9aa-4a6b-8fb9-f8a52ea39078	1	Other	Other
+7d981031-c637-4f5c-ae56-07c8a52b7315	1	Other	Other
+7d981285-aa9e-4aaf-acfc-7ecb78ab28c3	1	Other	Other
+7d982324-7ae9-4140-af30-0d151c8e1a15	1	Other	Other
+7d982c21-868d-404e-86a5-ef79f64cd79c	1	Other	Other
+7d9838af-3154-40f5-9589-dbcabb4a5edd	1	Other	Other
+7d986b21-b025-47ad-9cbc-32bd7428943b	1	\N	Other
+7d989931-825c-49bd-8a98-3672272e938c	1	Other	Other
+7d98a97b-cbf5-4195-a1d0-43a58a1bd10c	1	Other	Other
+7d98ae85-f79f-4ad0-b5b7-51ed68d354d5	1	Other	Other
+7d98c05c-c5e7-491a-a207-2a3c155334f3	1	Other	Other
+7d99069e-065f-4e04-9ebc-0755ccf2774f	1	Other	Other
+7d991534-0f22-47ca-85c1-6a5fa29614bd	1	Other	Other
+7d9943d3-d783-48f0-8098-4f468914025d	1	Other	Other
+7d999e64-140e-469b-b0db-794d73824510	1	Other	Other
+7d99bba2-fe59-447e-9b31-071ec3f81f30	1	Other	Other
+7d99db34-86e6-40d9-ba69-c1b535706b3e	1	Other	Other
+7d99f264-07e6-4c28-96d5-bb42e0fb8164	1	Other	Other
+7d9a5f2b-bb94-45dd-ace4-d26163aed86c	1	Other	Other
+7d9a7262-1b66-4949-a254-c80b19c89887	1	Other	Other
+7d9a849a-f9e7-4b07-97b7-4289252a1e99	1	Other	Other
+7d9aae53-b352-4379-b706-c2f1be487ed1	1	Other	Other
+7d9ab2ec-3851-4f9a-93f2-f05771efb354	1	Other	Other
+7d9acb0d-9fd6-444e-9126-1483c84ba3ee	1	Other	Other
+7d9af680-1024-439c-afc2-b7b0e1dff992	1	Other	Other
+7d9b52ff-c346-4647-b547-e9c27ed0f431	1	Other	Other
+7d9b80e3-c8d9-4813-b0d9-ca3f16a82c45	1	Other	Other
+7d9b98dc-6373-4097-9a52-227a8242a8f1	1	Other	Other
+7d9bb55f-0b93-432d-b6a1-c498a187dfa5	1	Other	Other
+7d9c82a2-ea83-4bd3-8f53-b1dbd4d64d96	1	Other	Other
+7d9c94b0-0e9a-459c-8538-971e4c45276f	1	Other	Other
+7d9c9647-1f3e-4819-af94-a6a817bfa919	1	Other	Other
+7d9c9835-a3a5-4dbe-b9a2-324f7078176e	1	\N	Other
+7d9ceaa3-3cb1-4fb1-a551-3f8bd93001a4	1	Other	Other
+7d9d0c65-e210-4c69-bcd7-e15fb9d6e57f	1	Other	Other
+7d9d1fb4-dfea-44aa-b0e0-b8b6d80baaec	1	Other	Other
+7d9d8af5-24db-4e83-b5d5-cdd939c52fa3	1	Other	Other
+7d9da9f2-9516-430e-873d-e024b7589db5	1	Other	Other
+7d9dab02-c4ca-4ca8-8276-4d158499e5b6	1	Other	Other
+7d9deed0-6ee3-4189-b5dd-4a8bcd642cb5	1	Other	Other
+7d9df48a-df15-4968-9527-f5ce3cb44210	1	Other	Other
+7d9e149a-1dcc-436a-acaa-b0a28a7d70f4	1	Other	Other
+7d9e4ce1-63ef-4d58-b26b-dad00e7b22db	1	Other	Other
+7d9e74ec-539d-4326-8956-9778066adaaf	1	Other	Other
+7d9ec066-fc2d-488d-8e44-02545beff48f	1	Other	Other
+7d9ecb6d-85e5-419c-8ff7-968196cd45b5	1	Other	Other
+7d9edaa1-9891-447f-86d5-3558650f0f87	1	Other	Other
+7d9f1feb-6995-4beb-af7d-a061bebb5d9f	1	Other	Other
+7d9f3660-3051-4917-8c69-6063e31335bc	1	Other	Other
+7d9f422c-839a-44db-9d3e-d89d05d5b56d	1	Other	Other
+7d9f4355-5359-44cc-a5ac-b706db23941a	1	Other	Other
+7d9fce6a-5fbe-4872-a66d-d185c613fb3d	1	Other	Other
+7d9fd1eb-c1ae-4f48-89c1-f38a43b54947	1	Other	Other
+7d9fe68b-a8f6-4f54-b6ad-2c1389773f6f	1	Other	Other
+7da00e79-b9eb-41ac-95b6-ca100873d94a	1	\N	Other
+7da046e8-e4c7-4a38-98df-ef58310a1529	1	Other	Other
+7da071d2-6f59-4d4f-9231-a4e7289fd62a	1	Other	Other
+7da0a986-db1d-439e-a61b-09bf74930588	1	James	Other
+7da0c69a-f727-45f9-b488-ee43783366d5	1	Other	Other
+7da0de30-5864-425b-b5d5-36b6928e7580	1	Other	Other
+7da0e1e7-edcf-46fb-a02b-ea36d11414d7	1	Other	Other
+7da0f42f-fcd6-41fc-89a7-61ade4e6e3d8	1	Other	Other
+7da18a57-527f-472b-ac7c-ad2e18365989	1	Other	Other
+7da19512-5ebe-42fa-9afa-02934088c216	1	Other	Other
+7da1bda7-f4fc-4e2c-8eb7-908dcc85d4fa	1	Other	Other
+7da1ca47-32bf-4edf-880b-430c2638712a	1	Other	Other
+7da1cb92-def4-4e25-ae69-fd4d8fac3667	1	Other	Other
+7da22fab-bf17-4030-81c2-1c69459f29e0	1	Other	Other
+7da3229e-d34c-4599-bb98-0885eef0ae4b	1	Other	Other
+7da34183-d6b7-4dc1-baa8-0f5a9c3fd5c4	1	\N	Other
+7da34767-f7e2-4c0b-bbae-7fcb0a7deaa1	1	\N	Other
+7da3541d-5595-4c97-a381-cd3bd08ee768	1	\N	Other
+7da39ff9-4690-48cf-9e53-9f3ee3cc6c21	1	Other	Other
+7da3b39f-ccde-4176-8076-85f9e2e3ad49	1	Other	Other
+7da3c79d-3876-486f-b4cb-a92e3780e409	1	Other	Other
+7da3e1f8-008c-4d84-9141-e4ec8cb5c215	1	Other	Other
+7da3fbc9-cb50-489e-a6cd-859c50bdd3ac	1	Other	Other
+7da4533f-4003-46d5-9fe7-432364e55c08	1	Other	Other
+7da45f2a-8da9-42a4-a2bf-9f845f1e313a	1	Other	Other
+7da49863-79ab-4d57-aac4-5d50533dbe71	1	Other	Other
+7da4c834-79c6-4c84-b1b7-4623008298fe	1	Other	Other
+7da4ebf5-d51e-4178-b6b2-a93aaaab8d67	1	Other	Other
+7da50743-447e-4b9f-b211-4e92f51990e2	1	Other	Other
+7da53be0-b1be-4c6e-b028-cab0c088050d	1	Other	Other
+7da5524e-f438-477d-9c77-d72093ba928c	1	Other	Other
+7da5e01e-284c-4eaf-ba18-5a07aa94e123	1	Other	Other
+7da5e026-bdf3-4700-9b3b-083b82b2e25f	1	\N	Other
+7da5f605-bf85-4c5b-a233-a445353b345f	1	Other	Other
+7da62d8d-42b7-4bc7-a132-e84da700d03e	1	Other	Other
+7da637a5-10fc-4156-9d10-9460b6c36a39	1	Other	Other
+7da65b10-da60-4fd7-88aa-5fec94fb6401	1	Other	Other
+7da67068-ebe4-4411-92d9-7f386ec02d5b	1	Other	Other
+7da6a14b-752d-4d26-881b-88ff8f57bb01	1	Other	Other
+7da6b392-32c1-443e-9a2b-7b154bda6c91	1	Other	Other
+7da6c508-a63e-46e6-a1fc-43f136b484f7	1	Other	Other
+7da6c953-800a-44ce-b60b-36c372296a35	1	Other	Other
+7da701d7-ad8a-4211-bf73-bc3690e8ff43	1	Other	Other
+7da710de-3589-4513-8ecd-67b76ceef4bc	1	Other	Other
+7da73f78-116c-45cc-aad7-db618a534a6e	1	Other	Other
+7da74fb4-6c3d-40f6-b3df-04cea888dff3	1	Other	Other
+7da76b0b-dcb7-4e3b-8b85-532cc85ab468	1	Other	Other
+7da7af18-ed3b-4b62-a325-3da6fe2b5e3d	1	Other	Other
+7da85c6b-4f6b-46a6-b635-22433a7f2446	1	Other	Other
+7da89b4c-6a9b-40e9-862b-6a861889d163	1	Other	Other
+7da8b7c8-4f5b-45ba-9997-a3b0b53ad180	1	Other	Other
+7da8e6dd-a4f3-447e-9b77-07ba2264e591	1	Other	Other
+7da94925-e053-4595-a4df-710cab55a28e	1	Other	Other
+7da975f9-8211-467b-8dca-4846bf409a98	1	Other	Other
+7da979a2-9256-4d48-addf-0bfbeda356b0	1	Other	Other
+7da9c12a-6bd5-40cc-91af-69884fbb3e4d	1	Other	Other
+7daa7558-0bf5-4812-bc7c-8e1d86ecee3d	1	Other	Other
+7daa779d-fc23-441f-9fed-843ecba3f381	1	Other	Other
+7daa9119-131f-4404-aeac-eb14ac2cc16b	1	James	Other
+7daa9c3e-70f3-43b6-b032-3a7e0ae31e1e	1	Other	Other
+7dab625d-af4f-4d31-b4a2-67b6f46aad81	1	Other	Other
+7dab8c9f-3263-4d71-9a16-eec3432caea2	1	James	Other
+7dabc6ff-8ad5-4601-9b1e-8272122d5fd6	1	Other	Other
+7dabcf6f-ad5b-41f7-8334-f22333707c85	1	Other	Other
+7dabdfd9-048d-4341-bed3-021bf9b90944	1	Other	Other
+7dac35b4-2016-4d39-b277-c0c9088d1611	1	Other	Other
+7dac4906-3b7d-4810-94a6-6e105c1b941a	1	Other	Other
+7dac61bf-b2ac-4df4-b10a-755062699607	1	Other	Other
+7dacb797-09c0-40b9-b085-d7adbe6d0f6b	1	Other	Other
+7dacf06f-5abd-489b-81cd-e6a8353a791c	1	Other	Other
+7dacf30d-e955-4aab-a860-6a8c5ebcacf3	1	Other	Other
+7dad33a7-abde-4963-bdb9-5bd8e9f8b5b7	1	Other	Other
+7dad4f73-8a72-42de-8903-c98be0d9a25d	1	Other	Other
+7dad86f2-932b-4b24-8f23-e58d893f19d8	1	Other	Other
+7dada715-0d6f-4264-9cb9-9e8577cf7376	1	Other	Other
+7dae768b-ce9d-43c6-8f70-67d798ac94cb	1	Other	Other
+7daea775-90de-4fd2-af9a-5e2ec4fc2b12	1	Other	Other
+7daeb802-49f2-4c7a-8e2c-f1cf16736eee	1	Other	Other
+7daec758-d28b-49d6-a2dc-0148eff8e41b	1	Other	Other
+7daefed9-a082-4169-a444-99dc36743c20	1	Other	Other
+7daf247c-2511-484e-befd-1fe9787d7033	1	Other	Other
+7daf54fc-c309-4384-9096-a70965228360	1	Other	Other
+7daf8c59-6b0f-4533-a1c0-fb28ea42fcaf	1	Other	Other
+7dafa77f-d9f9-476f-a846-37e28c48cdbc	1	Other	Other
+7dafb924-c9ff-4fb5-835c-0aab655a059c	1	Other	Other
+7dafba62-8772-444b-9133-ee281d74c70a	1	Other	Other
+7dafbcdd-957f-45aa-8504-d481d33bc4ff	1	Other	Other
+7dafd28d-20f6-4629-b2bf-1c0c2a692170	1	Other	Other
+7daffe21-8d3f-4319-aaf9-c2df2fa6ac4c	1	Other	Other
+7daffe44-3db4-454d-b503-9b78f2f969bd	1	Other	Other
+7db0665b-614e-4533-845c-481893bdaecf	1	Other	Other
+7db0a85d-47c7-4aaa-8f02-eabe93f71be1	1	Other	Other
+7db0c596-8b8a-4199-88b4-9d966a2e601b	1	Other	Other
+7db0df6d-a302-4f02-838f-25c0f3e1ff97	1	Other	Other
+7db0dfee-4754-4bdd-90e1-d48eb3658b3a	1	Other	Other
+7db0e491-8278-4afd-90f6-73a87541c1cf	1	Other	Other
+7db0e89e-3fe4-4af3-8de2-bf8abd0f6408	1	Other	Other
+7db0fdb9-6c42-40e2-958b-8bed8b45ae7f	1	Other	Other
+7db10f59-84a3-4a51-81af-86099f7faa71	1	Other	Other
+7db11308-a973-43d6-9f59-624a272d45e1	1	Other	Other
+7db1273a-893b-4dd3-a930-8351f6c2e366	1	Other	Other
+7db1557f-c250-4d62-ab50-ba916a0b9636	1	Other	Other
+7db1784e-f914-432c-a44b-b21122b52e94	1	Other	Other
+7db17917-c9dc-4f8f-a785-0cc4e616842d	1	Other	Other
+7db17e5f-e2d8-4f8f-806c-65c2f5f8430f	1	Other	Other
+7db19aad-2d7f-4fc4-8a14-b7b129fe7307	1	Other	Other
+7db1b949-13f7-47b4-bc23-8ba058774005	1	\N	Other
+7db2010b-9df2-43c9-8ee7-5ab96130fe8a	1	Other	Other
+7db264a6-fc93-44b8-8788-1ff3c988d9d3	1	Other	Other
+7db26619-7d53-41d7-99c9-5355a1ef1890	1	Other	Other
+7db2bc46-3e98-4323-877c-775f9c22f3a3	1	Other	Other
+7db2ff2d-7904-4f2e-9eb0-ab393a0ddcef	1	Other	Other
+7db33666-8f10-4fbc-817a-152340a92904	1	Other	Other
+7db33ece-1566-4233-99f7-65253c17ac32	1	Other	Other
+7db35568-ab03-49c2-af74-e0544f01e695	1	Other	Other
+7db35612-358f-4a40-87c8-f15a2ed695d4	1	Other	Other
+7db360f0-c825-44d5-a6be-f2fe97b169da	1	Other	Other
+7db368b5-713e-4992-a0ef-44a4891e4ae3	1	\N	Other
+7db3ba2f-1356-4bb5-9caa-b0d8da052e38	1	Other	Other
+7db3bc9a-28fe-497f-ad73-e572f6c055c4	1	Other	Other
+7db4147c-1e36-4fc7-a82b-acd42ac8b8ba	1	Other	Other
+7db41efb-c48f-4cbb-8ede-dbe34b5a7569	1	Other	Other
+7db451a2-4d77-4057-ad76-05f28427fb52	1	Other	Other
+7db492df-6bda-4972-8420-435b2a5cac56	1	Other	Other
+7db4a659-d6fc-4a69-9949-a3f8bf604e72	1	Other	Other
+7db5a189-3839-43bd-a7b0-b03a8fac5d79	1	Other	Other
+7db5dc16-63ab-4e7e-907e-e38d44020bde	1	Other	Other
+7db609ba-0032-11e8-869b-fa163e8624cc	1	Other	Other
+7db65e8b-7932-42b9-9702-d16fb53b6ce4	1	Other	Other
+7db669d7-a851-4102-98f6-b4834c572348	1	Other	Other
+7db70530-5e66-4478-9609-b66206da35e9	1	Other	Other
+7db7369b-d114-4632-9c24-053281be7940	1	Other	Other
+7db7547a-4add-44ef-8bf4-6e7d11e5d4d6	1	Other	Other
+7db7632e-96b3-4474-9778-ccb1f72bea88	1	Other	Other
+7db77aac-a5b1-4396-9ecd-71e8f6d00fe1	1	Other	Other
+7db7a81b-45c4-4fbe-856b-13f9c6a70519	1	Other	Other
+7db81bb7-defa-4fbb-84ba-6e1f1c268bd5	1	Other	Other
+7db82ea6-f717-4cec-bb81-75bdba53ab6b	1	Other	Other
+7db8379c-6d7f-45c2-a4be-bde9a533cb85	1	Other	Other
+7db88d0b-f05f-4a9b-bd49-20ab44f40373	1	Other	Other
+7db8a252-2bb1-4520-816d-86b2c3d55061	1	Other	Other
+7db8ba14-7512-4efb-bd20-58b7d6538500	1	Other	Other
+7db8c8fa-68e7-4334-8988-ad50c36c66f8	1	Other	Other
+7db91975-500f-4a31-b801-19150e2c6042	1	Other	Other
+7db92894-3a90-41f3-b1ce-661808572ade	1	Other	Other
+7db94c26-287f-4834-a139-b4670b3daebe	1	Other	Other
+7db99174-e7be-47c3-ba1d-37d49ff30352	1	Other	Other
+7db9c68a-d632-4fcd-aaa8-0da4d68a49ce	1	Other	Other
+7db9cc7b-51d7-4270-a9de-9af294793b79	1	Other	Other
+7db9d57b-bd06-42f8-adf5-ad577dc335d8	1	Other	Other
+7db9e1e0-6764-44cc-994a-20f2ff95055e	1	Other	Other
+7db9ee14-f24c-4e58-9e5b-d6a542dfd769	1	Other	Other
+7dbb1142-7a7d-4406-9dce-2b976ebf52e3	1	Other	Other
+7dbb7fb9-5e38-4c03-9648-060202601944	1	Other	Other
+7dbbed49-6934-4d21-ae5a-a3413c983a59	1	Other	Other
+7dbc1682-005f-465e-a661-03dc5309454f	1	Other	Other
+7dbc3fc9-8b05-4c6e-a736-05720b9d48d0	1	Other	Other
+7dbc7197-c038-40c8-93c2-ee147dece3a1	1	Other	Other
+7dbc79b0-e70e-4e50-aee0-883535a4c9a9	1	Other	Other
+7dbc7b52-9092-471b-8f13-5131dc735390	1	Other	Other
+7dbce231-f22f-4ed4-a651-3bca79e55314	1	Other	Other
+7dbd2cac-941e-4410-8c21-9c203df55e3c	1	Other	Other
+7dbd7612-9695-4eab-8e5a-aecd703fd899	1	Other	Other
+7dbd79fc-85cb-4285-8a01-a1149119d86b	1	Other	Other
+7dbe2b0d-24fd-4a76-a120-03527e97ca70	1	Other	Other
+7dbe2bec-d0bd-467e-8b5a-51269c6ad269	1	Other	Other
+7dbec0c9-faaf-47fa-a726-b4057a1fae85	1	Other	Other
+7dbed8da-dbf8-4b79-baec-66beb601d280	1	Other	Other
+7dbf467f-0ec5-4127-b4ad-c645ba847d6c	1	James	Other
+7dbfa7b1-5150-47d6-a7d3-a62e86921461	1	\N	Other
+7dbfabde-3d42-40cd-9174-12ef5c8fc755	1	Other	Other
+7dc00264-56d5-473d-bf00-3a01f872f814	1	Other	Other
+7dc00f88-1dca-4e65-b30c-ed751fb9b50e	1	Other	Other
+7dc0600f-46e5-44bc-96b1-917edce193e0	1	Other	Other
+7dc0c168-fe65-451e-a568-df8e02d9adfb	1	Other	Other
+7dc12524-8e8a-4102-8ac2-5987bf747da9	1	Other	Other
+7dc1a27a-a911-47d1-9f96-5fcb337d4fc0	1	Other	Other
+7dc1e578-eb10-4511-8948-66fee6e0abf9	1	Other	Other
+7dc258ae-fefc-4618-bc48-44425df20e43	1	Other	Other
+7dc275db-e9d1-4097-b9bb-7c1ae93ea418	1	Other	Other
+7dc2c13b-e882-437f-a6c9-dbd84e71e770	1	Other	Other
+7dc2e37c-7020-43a3-af9a-09b530154281	1	Other	Other
+7dc30683-42e9-4873-9674-d66c2ed2ca35	1	Other	Other
+7dc32b31-b8cc-4c9a-8792-8b6839a2fabc	1	Other	Other
+7dc373a4-6412-4fd7-9c4f-52e1a6e6f817	1	\N	Other
+7dc37a0e-0bbf-4721-8003-1c99ead14629	1	\N	Other
+7dc37ab0-7fb4-42d4-b977-2eaf01692593	1	Other	Other
+7dc38f02-04a0-4777-b46e-d5a0cb24c905	1	Other	Other
+7dc3a4fe-9cd1-4411-b515-ecfbf0adabc9	1	\N	Other
+7dc3da5d-6b9e-4983-ae7b-e0134e49354d	1	Other	Other
+7dc3dbb3-833a-4e6c-a29f-8414d1e1f598	1	Other	Other
+7dc415b4-5065-47c9-a959-e28a0e3ef550	1	Other	Other
+7dc432cf-c29d-4090-b9da-06dcc1cc02d2	1	Other	Other
+7dc44af4-35de-478b-9499-e9905a05baaf	1	Other	Other
+7dc45145-3207-4385-8994-7a6be88ccb16	1	Other	Other
+7dc46fe8-b698-4783-be61-3cac8bca0cbe	1	Other	Other
+7dc504e9-f294-428d-b601-c539363fa651	1	Other	Other
+7dc51712-d60b-4c85-b02c-dceb0f7903c8	1	Other	Other
+7dc520b9-3fe8-4394-859f-9480b582f2ac	1	Other	Other
+7dc53810-6a5c-49f9-b665-cfb64103449f	1	Other	Other
+7dc580a2-a969-4778-806a-3bebb6b199aa	1	Other	Other
+7dc599c6-0f66-452f-9836-799487269252	1	Other	Other
+7dc5b56b-2dbc-4c43-b949-e4946d72d2ad	1	Other	Other
+7dc5e33e-f2d2-4b71-b382-5c7ea370a802	1	Other	Other
+7dc6ada9-5fed-4df1-bedb-2f6155037ee1	1	Other	Other
+7dc75692-d276-4cad-b7fd-f10e52abc97d	1	Other	Other
+7dc78c48-d408-4687-9d61-b65aff122c78	1	Other	Other
+7dc79875-59b1-48d8-b0fe-92a5f726a38d	1	Other	Other
+7dc7ab74-99f8-4a64-9b70-450504deb5fd	1	Other	Other
+7dc83d9a-59ea-430c-b677-65cb07370408	1	\N	Other
+7dc83fc3-41f8-4325-b041-731994c4b678	1	Other	Other
+7dc87607-f5ad-479c-ab78-43c3128d31c2	1	Other	Other
+7dc8f718-d134-4030-a897-9645bdecb62d	1	Other	Other
+7dc92d3d-12ae-468e-96a9-bd2a6f32f70d	1	Other	Other
+7dc94943-94ab-442c-9f2d-9ee9531dbc43	1	Other	Other
+7dc94b1a-97a5-415b-a00b-34fb008d3bac	1	Other	Other
+7dc965cc-d626-40fa-b931-39cd46bec7b5	1	Other	Other
+7dc98d45-aca4-4b49-b091-d4f1649c5f91	1	Other	Other
+7dc9c215-666f-4a19-858a-73cac01eb457	1	Other	Other
+7dca67b7-c0fc-429f-9cd0-1c2e00624f73	1	Other	Other
+7dcaefca-5599-4529-86d0-e08b000a738c	1	Other	Other
+7dcafaf6-2143-4eaa-9a5c-4d1f08e64b66	1	Other	Other
+7dcb17dd-2bc0-4769-b8be-bd26337e264a	1	Other	Other
+7dcb2f40-e9ec-4c40-96ae-678467cdbb85	1	Other	Other
+7dcb402c-a97a-4d3e-8b7d-ae1238691b07	1	Other	Other
+7dcb4a21-8209-47ef-8946-d873651de78b	1	Other	Other
+7dcb9534-bb35-4d2b-a397-d6d5a6bf0333	1	Other	Other
+7dcc1fd4-99f3-430a-b4e4-6003f92b99e4	1	Other	Other
+7dcc8db8-faba-41f0-b936-e1ac6da426bd	1	Other	Other
+7dccef69-9b20-4513-b99e-31e3e2271052	1	Other	Other
+7dcd1a75-c67c-4567-b48f-1cde481a755c	1	Other	Other
+7dcdcff3-6ed7-406f-95e4-eb926f18b149	1	Other	Other
+7dcde0ee-76ea-4ed4-a7f2-917706590cc5	1	Other	Other
+7dce25a5-8635-4c7f-9d55-98ca027c1460	1	Other	Other
+7dce47a1-3dbe-4d8a-bdc1-23615746f84e	1	Other	Other
+7dceddd4-b31b-45d0-af01-04ee5d8f86e9	1	Other	Other
+7dcf2b9a-4128-4cf0-b77f-b2588102fcae	1	Other	Other
+7dcf6683-d981-4a1c-9e18-8e306ab1f374	1	Other	Other
+7dcf92f5-58ed-48e6-b073-ff9a4d406f35	1	Other	Other
+7dcf9ce2-dc7f-4530-9379-34738385a5f1	1	Other	Other
+7dcfc3a9-286b-4703-9930-089ae9dd6f37	1	Other	Other
+7dd0076e-adfe-4faa-954a-64afb85d7303	1	\N	Other
+7dd00ac5-44e5-48f4-aa95-44f68ce809ea	1	Other	Other
+7dd026b3-58c1-4c98-84b3-59bdd291a0f4	1	Other	Other
+7dd02cfb-58d2-4313-abab-431b5620b1c5	1	Other	Other
+7dd07f0c-d250-4a13-a395-f03b3908c91b	1	Other	Other
+7dd0a970-eac9-4a12-b5c3-5d7609c890af	1	Other	Other
+7dd0c634-49bb-4b26-82b2-6caac83ca816	1	Other	Other
+7dd0facb-3bc7-47ad-8edc-689ac026b398	1	Other	Other
+7dd10434-26d8-4851-853b-a5b1fd008f8c	1	Other	Other
+7dd10917-f3fa-420b-ab36-0513cd80d965	1	Other	Other
+7dd13cd4-638d-489f-9cb3-c661b8fe2f9d	1	Other	Other
+7dd15c38-70c5-466d-80be-b497c7ce0eb2	1	Other	Other
+7dd16a18-56ff-41e1-95d0-36ad219ad0fc	1	Other	Other
+7dd1936f-392e-4df6-b1f3-821c4e76ad2d	1	Other	Other
+7dd1b2c2-c728-48aa-b87e-4064c8f82751	1	Other	Other
+7dd1c34d-eefa-4b26-b12f-6e6fb2106ce6	1	Other	Other
+7dd1f1ec-317f-4ffb-8893-c63eae2602df	1	Other	Other
+7dd224f5-f286-455d-a82c-e819673ccaa3	1	Other	Other
+7dd291bc-a641-4b34-915e-956cd01cab84	1	Other	Other
+7dd29795-000e-4575-b1cf-e983863fbd72	1	\N	Other
+7dd2b996-a4cb-4640-ac60-ce0322285a87	1	Other	Other
+7dd2e613-7de0-4c71-88d1-c710f9ffd8b2	1	Other	Other
+7dd2e8a8-9f1a-4a0e-a09f-2a48f4cee88d	1	Other	Other
+7dd318eb-8d18-4f59-82b6-0fbc093ecf7b	1	Other	Other
+7dd335ae-0fe9-43b5-8e8e-1b7bd27a3cfb	1	Other	Other
+7dd3bdf7-b373-4259-9050-adb50ec3639d	1	Other	Other
+7dd3c008-cdf5-464d-b856-bb8497c181d6	1	Other	Other
+7dd3d384-358f-4cdc-9b0b-794e4e4e761c	1	Other	Other
+7dd3ee31-d06c-4988-a2fc-018b82a27f98	1	Other	Other
+7dd43a74-5bbd-4b9c-9bdf-e37c94b00d6a	1	Other	Other
+7dd47974-f32f-4300-9946-ff91382d46fc	1	Other	Other
+7dd47f9e-fae2-47af-867c-d2c286a4d080	1	Other	Other
+7dd4c45f-73d4-4f16-8cf6-32d6a07bf6e2	1	Other	Other
+7dd4c742-2cd2-412e-a9c8-8a39c74a65f1	1	Other	Other
+7dd4f513-0770-4e38-a579-2a1e796fbe53	1	Other	Other
+7dd51fc1-2a28-4c60-b8a9-aecf49512776	1	\N	Other
+7dd52749-4996-4ce7-b6b2-28d19798fa26	1	Other	Other
+7dd580e9-31b3-4190-90f9-f28d79402b62	1	Other	Other
+7dd58d6b-07f2-4a12-ac27-8db6e972370d	1	Other	Other
+7dd5ab9d-8029-49c2-8284-d97d5887eb88	1	Other	Other
+7dd5e6f9-c741-4b7c-ad16-21284fcb6208	1	Other	Other
+7dd6184f-7918-48b3-9428-367a5e96f3f5	1	Other	Other
+7dd63dba-b237-49c9-bd64-1869d7f1fc37	1	Other	Other
+7dd64ab1-384b-4766-b5de-28981778fcfc	1	Other	Other
+7dd6615d-f3a6-4fc8-a095-bc47d3341891	1	Other	Other
+7dd6d2e9-98da-4dda-a0b7-ba2f1eca48b8	1	Other	Other
+7dd6df74-2d21-4d9b-a4d3-08bce0419f08	1	Other	Other
+7dd72e15-7d16-4200-b55f-28088adcc57e	1	Other	Other
+7dd73da1-fa80-4589-a83f-6bd602f8bfa9	1	Other	Other
+7dd77efb-76da-4830-b9d0-fec45576aedf	1	Other	Other
+7dd783df-e997-4b9f-9889-ae1def1cc2ef	1	Other	Other
+7dd78c24-1f4e-4fe3-80dc-bbf6c21aba1d	1	Other	Other
+7dd78df4-e9d2-4e9b-83d0-bb1070041a0f	1	Other	Other
+7dd7cfb8-55fd-40fc-b1ba-344603c987f9	1	\N	Other
+7dd7eba1-9392-4c49-a0a8-4e0f3d98796a	1	Other	Other
+7dd7f6f4-d51f-43fe-84fd-351632bbd023	1	Other	Other
+7dd83dd6-b498-42b7-bb3d-2b25bae421cc	1	Other	Other
+7dd85250-6a11-4296-b44a-5105a23de446	1	Other	Other
+7dd8a0a0-ae97-4f36-b864-00a914ac8a89	1	Other	Other
+7dd8e03c-c18c-4f1c-a869-2ebfe3cea159	1	\N	Other
+7dd955df-ca6d-454d-bd80-8f58fdacd7dc	1	Other	Other
+7dd99eaa-e09c-4675-9593-aa1f0850b1b5	1	Other	Other
+7dd9cae8-311e-4816-a120-9d895ebda5e6	1	Other	Other
+7dd9e77a-fca8-4ca4-95d1-c21cc586237b	1	James	Other
+7dda0591-d299-43d1-ae1e-7aed10befda3	1	Other	Other
+7dda1b04-b47b-4577-8a43-0f9c45a96a35	1	Other	Other
+7dda73d2-12eb-43cd-8a85-458dcde144d5	1	Other	Other
+7dda97d0-a283-4da7-b079-7588184b92b3	1	Other	Other
+7dda9f64-d953-4863-bbbc-626b90779e79	1	James	Other
+7ddafe4c-e303-483b-a6ab-4304768067b4	1	Other	Other
+7ddb2da4-53bc-4ad2-85a6-b141beb3f92c	1	Other	Other
+7ddb33b3-d4fb-4fe0-9a15-fbd318dae325	1	Other	Other
+7ddb4fa0-9dc5-4c9a-a721-963d52429702	1	Other	Other
+7ddb729b-c2f0-4dce-b3be-726043807977	1	Other	Other
+7ddbfae2-cc06-4576-a3b9-bd52202bd12b	1	Other	Other
+7ddc5263-3b7f-44ca-9008-937553939e85	1	Other	Other
+7ddc5780-61d3-4e78-9024-6b3f3040039a	1	Other	Other
+7ddc58fe-d1bb-4952-83f1-2202c5611c6e	1	Other	Other
+7ddc9dad-3bf7-472b-b73d-a9a5083bce47	1	James	Other
+7ddcc382-2034-4fc4-b4f8-de5757b66672	1	Other	Other
+7ddd0cac-351b-4163-8892-7ca364ef4453	1	Other	Other
+7ddd4466-ac2c-46bf-869a-49ccd4baff12	1	Other	Other
+7ddd6bd0-48c9-4f47-a4e3-f8b63e5f37a1	1	Other	Other
+7dddf0b0-c229-46d5-9240-491dc81da1a2	1	Other	Other
+7dde3b35-2855-41eb-bf16-2d94198e0d1a	1	\N	Other
+7dde4a3a-49d5-4823-b26e-b18df3392adc	1	Other	Other
+7dde8759-bdde-46cf-8e4a-5f2e41d20ab7	1	Other	Other
+7dde930c-0698-487d-9488-8b69655a0d8a	1	Other	Other
+7ddea7e7-1db6-4738-96a9-a78483ff5403	1	Other	Other
+7ddecee9-a857-49d2-b108-fe82fa339ea8	1	Other	Other
+7dded900-1564-4c87-8592-56560f06a91f	1	Other	Other
+7ddedec7-4c52-47c7-b37f-c6e094d6363e	1	Other	Other
+7ddf3a3f-2c1a-424f-bdd1-0ca1d920e76f	1	Other	Other
+7ddf73c6-3c8e-4695-8772-bb039f4a9e99	1	Other	Other
+7ddf9bc2-164c-4326-b9d1-7f46dc23cedc	1	Other	Other
+7ddfa9c2-818c-4ac1-9003-e91e838ec55b	1	Other	Other
+7ddfaba5-a2b3-4d4f-83e5-9b45760dfa53	1	Other	Other
+7de003d9-d1f0-4ca0-88eb-02067973a112	1	Other	Other
+7de00a25-a6ff-4bb4-bf0c-57d21e5c26e7	1	Other	Other
+7de03c4c-2ec1-4aa1-a13c-2d8268084985	1	Other	Other
+7de03d92-c09d-48b9-8fd3-587365e90c40	1	Other	Other
+7de055a8-7cfd-4ed9-b9ec-ff2ff9c213a3	1	Other	Other
+7de06798-63ff-4722-803f-3449cf45120d	1	Other	Other
+7de0f466-9454-44f8-bbf6-90865c54161a	1	Other	Other
+7de0fb57-8f9f-4e52-a57c-6bd155cf9b5e	1	Other	Other
+7de1065a-7c19-477c-925f-fa51e8dcaecf	1	Other	Other
+7de10e9b-4a93-4fda-81ea-343dfb2ca3de	1	Other	Other
+7de11223-55cd-45ee-8cc7-5841ada3f419	1	Other	Other
+7de16553-9256-44d9-9844-b6ffda3e8b0e	1	Other	Other
+7de1931f-986d-4855-ba63-313c8234ebda	1	Other	Other
+7de1a02b-b2c1-4b3c-8f9e-d676f4782da2	1	Other	Other
+7de1b48f-a30e-410a-8482-9c12abff0f4c	1	Other	Other
+7de2260f-e25d-4396-9d34-ca159baa0db6	1	Other	Other
+7de2503d-4484-4baf-8a1a-9c17b9425c7b	1	Other	Other
+7de26206-7d61-423c-91c1-d48f6fc42115	1	Other	Other
+7de27636-35bb-4943-bfd6-fc6074f0e4cc	1	\N	Other
+7de297d6-7538-40a6-9d18-f45315da41cd	1	Other	Other
+7de29aed-27d8-4103-a38e-756663823913	1	Other	Other
+7de2a8f9-85b7-4eb5-a3cb-fd3c821d0b83	1	Other	Other
+7de33af1-2dc0-4344-bb81-05a3921fa1b1	1	Other	Other
+7de34ace-f87a-42d9-b78c-fbebfec4ec6c	1	Other	Other
+7de3710e-7e13-4175-8534-dbe746909fa3	1	Other	Other
+7de39c2c-66cf-476f-aa8f-78b41cb0898c	1	Other	Other
+7de3cd34-b3aa-4f6c-b372-93e46fac1606	1	Other	Other
+7de42b46-6dfa-4d3c-b654-c56a800b9242	1	Other	Other
+7de42e0c-a703-4ed0-ad69-ae3ec2788f67	1	Other	Other
+7de469d3-f64f-4080-9ca7-23de5fec5677	1	Other	Other
+7de480d4-e960-444c-9204-699c7f6532fc	1	Other	Other
+7de48102-0358-4284-aa7c-0e15c12d0309	1	Other	Other
+7de497d2-d505-4f9b-b54b-ad42cc4e7792	1	Other	Other
+7de4d6b5-b350-40d9-979a-bfd302ef6772	1	Other	Other
+7de5448a-cfa9-44b7-840a-859b9634f277	1	Other	Other
+7de58cf8-9ad0-4720-958a-807eb5ffce0a	1	Other	Other
+7de5f316-82b7-49a0-bc5e-4cd25132df45	1	Other	Other
+7de650d8-7391-4839-88e1-29a3ac6e855d	1	Other	Other
+7de6b22f-7c4c-438c-9245-7de336c4b33c	1	Other	Other
+7de6d028-eddc-4e47-a56b-a021ad0c47f0	1	Other	Other
+7de6ed88-c400-4512-b75a-388b37079adc	1	Other	Other
+7de786e6-a88a-4b9a-bea0-09ed617a4996	1	Other	Other
+7de791b2-9e0a-4fde-9ae5-127d0cbdf529	1	Other	Other
+7de7a49d-06dc-47f0-be85-1c18fda29a10	1	Other	Other
+7de7ae2e-2ce7-4c35-a6df-bdfdeb6b97d6	1	Other	Other
+7de7bb9c-6ffe-4066-a2ca-09792686bd38	1	Other	Other
+7de7cd34-9aaa-4f04-a30a-506f32e16f31	1	Other	Other
+7de7f355-1e17-4af5-8796-fc11498becbb	1	Other	Other
+7de7f39a-eed6-435e-9273-70f7d948ac63	1	Other	Other
+7de7fd88-a6ac-4ec5-9cdb-744f2d5bc791	1	Other	Other
+7de84d94-d644-4221-80ce-33e1d79042c8	1	Other	Other
+7de8502f-6d05-4199-813a-551b1864165b	1	Other	Other
+7de859ce-e28f-4ca7-880c-a24a5687955f	1	Other	Other
+7de8abcf-eede-46d9-be82-d84989daf1ff	1	Other	Other
+7de8b504-2c85-42ec-9360-2a651f5d3f89	1	Other	Other
+7de8eeb5-8d60-4a9a-9014-74a4c97a4977	1	Other	Other
+7de90f9a-f2f7-4787-a660-08a85140a457	1	Other	Other
+7de944eb-a1d0-43b9-af30-42c88faff95c	1	\N	Other
+7de95ea9-7736-40f5-9d3c-05881d0a52d7	1	Other	Other
+7de9f1ff-ee23-468e-8d01-03e294c0e4e9	1	\N	Other
+7de9f49e-76c5-40e7-980c-1814604b7a0d	1	Other	Other
+7dea0520-0839-4dff-b368-1c714b52a0a8	1	Other	Other
+7dea1c63-a291-439b-b7aa-286f5e88d769	1	Other	Other
+7dea5b62-6353-4da2-8bc9-8467793f5ee4	1	Other	Other
+7dea9e58-632a-43f5-b999-39af35fce165	1	Other	Other
+7deab08c-7f15-4e37-8c69-1cf2cf13ed56	1	Other	Other
+7deb546e-1f31-43b3-972d-467daac35656	1	Other	Other
+7deb8c09-fa45-488d-a75f-ede2aa2d8c2e	1	\N	Other
+7debe521-951c-4e4c-9d10-ba08f1d926cb	1	Other	Other
+7dec0a25-eb7b-4909-ac73-418908130ee7	1	Other	Other
+7dec3f4e-8033-4f4b-9ab8-25c9a44bacd4	1	Other	Other
+7dec51dc-a36f-40e9-8526-a3d1636b1ce3	1	Other	Other
+7dec7b2f-00ae-475d-8454-40924e349f96	1	Other	Other
+7dec7d3b-bb3a-4263-b16a-b4057953f6b7	1	Other	Other
+7decb84c-23da-436c-aba3-0fd84e613b63	1	Other	Other
+7ded337e-6952-44c1-9b10-9b7feeebbded	1	Other	Other
+7ded880a-8173-470b-896d-22fc31856871	1	Other	Other
+7dedb0e1-65d5-4776-80ae-d79ab63ce4e3	1	Other	Other
+7dee0c3b-ee43-485e-a1d5-49d876760d5d	1	Other	Other
+7dee0f67-a636-4fdf-9114-df1b5060982b	1	\N	Other
+7dee5968-7429-4697-a9b6-9327bb8e98b4	1	Other	Other
+7dee7071-2fd2-466f-abff-3f7a101a2235	1	Other	Other
+7deeb5f2-9189-4462-94be-4af6a848d6e9	1	Other	Other
+7deecaee-9909-48d1-8080-21123d68e990	1	Other	Other
+7deeda93-f560-401f-987a-41849255ac24	1	Other	Other
+7deef64b-0107-4cc3-96cf-311f67702e42	1	Other	Other
+7def4c73-c12b-4a56-bf9f-7dbebf0a1fff	1	Other	Other
+7def6758-249c-4fd1-950a-654e0d991abe	1	Other	Other
+7def77a8-00d1-4c12-97fa-f8ae62f5a0aa	1	Other	Other
+7def9c06-8b4c-4aac-bcf5-c077855fe0e8	1	Other	Other
+7defb957-dee2-406a-ad2b-943fd3b94d93	1	Other	Other
+7defbea4-287c-4dd8-a841-47ed47cc86c6	1	Other	Other
+7defe281-eeb7-44be-a203-c89d71a5140d	1	Other	Other
+7defed18-95e1-4a3e-9a1f-8e3f8f41cc66	1	Other	Other
+7df02834-6a79-4bff-9030-c6caa3a09c8d	1	Other	Other
+7df05bc4-0989-479e-b5c8-746929bb603b	1	Other	Other
+7df06f28-b938-460e-b997-f2b6beb79b1e	1	James	Other
+7df070ba-9917-4aa4-8704-0b887f1f7e5b	1	Other	Other
+7df0d5fb-4aa0-479f-887b-c624f1752b7b	1	Other	Other
+7df13f75-4211-4052-9f49-d4cd2997b672	1	Other	Other
+7df16ec8-c981-460c-8548-6978f70d3025	1	Other	Other
+7df175d9-00a6-4e0f-85d4-f2d859582ac8	1	Other	Other
+7df1b6cf-0355-4100-bb17-edac0bbbcea0	1	Other	Other
+7df1cf68-bfc0-42f2-ac1e-a621a169a64e	1	Other	Other
+7df1eb77-7574-4d3b-a245-f77fc2f12529	1	Other	Other
+7df23c67-0125-491e-84d6-6caf42630ba9	1	\N	Other
+7df24ae1-d50b-4df8-b7df-d4ba15091ade	1	Other	Other
+7df26729-9035-457b-bf07-9f8ee1311b54	1	Other	Other
+7df277d6-aa20-4413-accb-a39c5699100e	1	Other	Other
+7df2a15a-d9a5-4256-84c7-3134c0d6e039	1	Other	Other
+7df2acd8-a4d6-48d1-b347-c87a0cbaf998	1	Other	Other
+7df38ad3-0eab-4516-a4fd-c7b539a866bf	1	Other	Other
+7df46bee-16f8-4cf7-b206-2682f204bebb	1	Other	Other
+7df4f37d-f9cb-4718-b9a7-26bdd846a9e4	1	Other	Other
+7df516be-f779-4d75-b507-03e3b8687f17	1	Other	Other
+7df54a8d-b7b4-4214-b9ce-7a5f0a202ce4	1	Other	Other
+7df569d7-92d0-4b97-ad8f-1aa592924714	1	Other	Other
+7df5772d-f3d7-469e-9fb9-11db7c03c457	1	Other	Other
+7df59a3f-14ec-4ffd-ad9d-bd8c35a2c226	1	Other	Other
+7df5b291-e516-4cf6-aa1f-c932dd84d31c	1	\N	Other
+7df605c1-f326-4409-8e93-1f9a2e77e1a7	1	Other	Other
+7df61830-6bd6-467f-9fb2-bba642b549fe	1	Other	Other
+7df618a9-ecb1-4f05-92d8-213a8f16f531	1	Other	Other
+7df624bf-0eea-4620-905f-ecebe3bba9f0	1	\N	Other
+7df63f7b-beee-4aae-9756-5c1d7e8fd94a	1	Other	Other
+7df6e605-7d00-4907-838a-91fd39183fc9	1	Other	Other
+7df796e7-2f57-4e9a-ba24-b3cafecc443f	1	Other	Other
+7df7b231-da2f-4302-b9f3-7ea6be5086b9	1	Other	Other
+7df8074d-aeb8-400a-a3cf-e88d9e71c70a	1	Other	Other
+7df810f8-8f00-46f0-afb1-5bbdd5ab5ff8	1	\N	Other
+7df84d22-ef7d-415e-9b8e-522777a07446	1	Other	Other
+7df8836b-22e5-433b-a4ba-96579aa8a395	1	Other	Other
+7df8b263-0d7c-4d0a-8650-cd6d4adfb9bd	1	Other	Other
+7df8e9c6-c89d-4aa4-97d7-0977f5d2f948	1	Other	Other
+7df903a3-acd4-4f83-82d8-cdf3232c107f	1	Other	Other
+7df91922-89ab-4c28-8bea-420dce2f460e	1	Other	Other
+7df96732-ce54-444a-9fce-adf02bb90a82	1	Other	Other
+7df97dda-7679-477e-b6a2-57b785d3b77a	1	Other	Other
+7df998ea-5b32-4894-a0da-1fe3b9b71cf0	1	Other	Other
+7df99ec2-f485-4703-af3a-f8b98de1159f	1	Other	Other
+7df9a263-e453-4668-a94d-bdb8d5e47e6f	1	Other	Other
+7df9bedc-9af5-4fd0-8429-b996bb1bd8b9	1	Other	Other
+7df9bf9a-5500-4e90-919d-db07ef40e9bf	1	Other	Other
+7df9cacc-544f-4cee-b164-eb08af5058fd	1	Other	Other
+7dfa40e0-7367-4161-8e29-1500710921d5	1	Other	Other
+7dfa9ffe-3c15-435c-930a-e8277355ad2a	1	Other	Other
+7dfabab2-3d0f-480d-85db-33cadd38a2ac	1	Other	Other
+7dfad59b-692e-43bc-9ff5-9a2d96ee7a0c	1	Other	Other
+7dfafef8-0607-45b8-9317-a0fda4ed3a0e	1	Other	Other
+7dfb08f5-8855-4ec6-8889-d605cada3a51	1	Other	Other
+7dfb205d-d015-402b-a926-93db53983834	1	Other	Other
+7dfb43f9-2733-461a-a2de-dd64d31bab34	1	\N	Other
+7dfb5ccb-8ade-4a71-81e1-93bfe4666afc	1	Other	Other
+7dfb69d1-e716-4d68-ab79-9347f428db90	1	Other	Other
+7dfb7b8b-bc34-4c9c-b005-fb31d472e6d4	1	Other	Other
+7dfb9e34-9a70-4fc3-bb83-1fcf65feb68f	1	James	Other
+7dfbc7e1-1058-4ebb-8a79-924dfb2fb5e0	1	Other	Other
+7dfbc98b-b75d-439d-a276-8b09cebe9b6b	1	Other	Other
+7dfbd65e-4115-40f5-984b-9d331969c6eb	1	James	Other
+7dfbfa2c-71ec-4d6a-b2f8-222363239900	1	Other	Other
+7dfc180d-241e-4c6b-b678-9dda2ead9c93	1	Other	Other
+7dfc1d1a-6bdf-444f-8dd5-a2c63bdb840c	1	Other	Other
+7dfc270d-859a-477b-85f6-e1c7d6b7351b	1	Other	Other
+7dfc3de5-4c6e-41b1-b9d4-017514d4f0a3	1	Other	Other
+7dfc4af5-c83d-4691-959d-a21d9a45a8f6	1	Other	Other
+7dfc6ead-00f4-4c56-b7f9-29984cfe4cac	1	Other	Other
+7dfc73b4-35f7-41c8-9687-5f3396183ae4	1	Other	Other
+7dfcf65d-08af-4af1-9de3-64b944ee81c1	1	Other	Other
+7dfd1f97-7569-49f9-8324-f9b86748a2b2	1	Other	Other
+7dfd76fa-d9af-4d0d-9fe0-b718899b9e59	1	Other	Other
+7dfd9e01-13c4-4cfd-89ad-3eab9b206853	1	Other	Other
+7dfe4572-3f10-44de-8e8a-09b295dc19a2	1	Other	Other
+7dfe847c-e92e-4fa7-b5a6-88e0ad431481	1	Other	Other
+7dfea5df-6d46-41b8-935d-c1373687a8d3	1	Other	Other
+7dfee5cc-c22a-4836-95a2-42e4e0bd82f9	1	Other	Other
+7dff3253-bd01-44b2-b13b-29047a131964	1	Other	Other
+7dff457d-74c4-4293-9b8f-a075450ba2d9	1	Other	Other
+7dff5c84-0981-4396-88ec-7d3110d6a7c6	1	Other	Other
+7dff67bb-262c-4f3d-8c13-1105777be93a	1	Other	Other
+7dff6b12-351a-4478-9c50-366130560f09	1	Other	Other
+7dffe1ac-7e40-470b-be81-24cfba96247b	1	Other	Other
+7e003cac-6aac-4855-aad6-8d4bfdd1d842	1	Other	Other
+7e003cdb-7710-4848-9e7e-19668b10bce7	1	\N	Other
+7e004012-6f4d-484f-90f2-7b7942215622	1	Other	Other
+7e005439-4049-43e3-97c7-3ad19390b61b	1	Other	Other
+7e008dfa-1de8-46b3-9cd3-c3e61d94ccf2	1	Other	Other
+7e00bb99-9ec0-4b10-8497-5a8015b88370	1	Other	Other
+7e00ca19-dfe5-499b-9bd4-d655772b4960	1	Other	Other
+7e010c89-13d7-4b7d-afb9-15629972fc22	1	Other	Other
+7e01a669-5f91-46fd-bcec-1863c3b227ee	1	Other	Other
+7e01a919-c7ff-43bd-8e04-1ad2e3d120ab	1	Other	Other
+7e021d08-b59d-4b2c-8bcb-0b94844c2e5d	1	James	Other
+7e029d42-144d-49e9-b22b-f370632c7dba	1	Other	Other
+7e02ca3d-d4a3-49d9-ad9f-a9277edb6146	1	Other	Other
+7e02d5de-5420-40a0-8f6e-0a7a2e960135	1	Other	Other
+7e02e60b-b597-4fae-8529-891971d071f7	1	Other	Other
+7e02fb80-e3e8-4e21-90de-c53a6fec98fb	1	Other	Other
+7e031c01-a038-4271-a21f-64f005b30eac	1	Other	Other
+7e03652b-7558-4601-9803-f2ea43a0ded8	1	Other	Other
+7e036759-1d63-4680-8509-b8adae5b2f69	1	Other	Other
+7e037ad5-868c-465d-94cd-d50e5281191b	1	\N	Other
+7e037e8c-8346-4161-a0b1-3c376cea889d	1	Other	Other
+7e039ef5-f333-4c6e-8d7b-8d62becb428a	1	Other	Other
+7e03cb87-0877-43d4-a812-d5fb25c8fc42	1	Other	Other
+7e03d663-7075-41b4-bff3-adae61e089b6	1	Other	Other
+7e03d66c-1f8d-4151-837b-83e4305a9418	1	Other	Other
+7e03de1b-0182-48c9-8bfe-52bfca63db7e	1	Other	Other
+7e03e0d2-e31f-4b49-a3b0-cc61011baeeb	1	Other	Other
+7e03e642-b584-4a96-8648-e2695045cb7c	1	Other	Other
+7e044866-92da-11e7-a17c-fa163e8624cc	1	Other	Other
+7e0489d6-4b80-43cd-9785-deefe6722601	1	Other	Other
+7e04e39f-f466-4ae2-b462-35babb4870f1	1	Other	Other
+7e04f5b0-dcd8-4105-86a7-cd29a6bf62e3	1	Other	Other
+7e051e6c-e1b2-4e8d-95a6-571895df283a	1	Other	Other
+7e0526a5-5fca-413f-969a-a3b3835cd4a9	1	Other	Other
+7e05523e-4850-430b-be67-a5026281e277	1	Other	Other
+7e05723d-1dc4-426e-84a6-b73c7a99e2c4	1	Other	Other
+7e058f8c-a41c-4015-94d3-20a746146ad2	1	Other	Other
+7e06551e-ff5d-4485-b47f-a1ff6c00cf83	1	Other	Other
+7e06dc1f-0a59-4f15-8813-79797f745261	1	Other	Other
+7e0718d7-971a-4ffc-866e-2a014e1587d4	1	Other	Other
+7e07241c-13a0-4d89-be3d-10ae55314a29	1	Other	Other
+7e07414f-90f7-4990-9689-f123f3dc93ee	1	Other	Other
+7e074460-c5a6-4818-b52c-5eb3333a35f3	1	Other	Other
+7e07ca9d-2b11-4b79-83c4-c7d1cad23dee	1	Other	Other
+7e07d4fa-7152-4e10-b4a3-955b853aeb9d	1	Other	Other
+7e081de5-12c4-4e37-b525-d79cd0de324d	1	Other	Other
+7e081e8c-2d19-47f6-92a1-91d1f72db708	1	Other	Other
+7e09a04a-a361-4689-a433-c4a8a7b059ef	1	Other	Other
+7e09a251-faff-4902-92cf-b6416ba70cfc	1	Other	Other
+7e09f5ca-54e1-4924-85c3-8e4b87f26ece	1	Other	Other
+7e0a0924-810e-4d9b-a79f-a46914fd6907	1	Other	Other
+7e0a4c38-b770-4f46-965d-6b948af963de	1	Other	Other
+7e0a914d-b474-4a2e-9d02-c596fcf5475c	1	Other	Other
+7e0abdb7-f10f-48ec-a95a-73702393c8c6	1	Other	Other
+7e0ae18d-93d7-4f96-b781-71748d0d3dd9	1	Other	Other
+7e0ae500-75ab-4417-9a4e-0aaa3d327aff	1	Other	Other
+7e0b0367-ae1d-40f7-a5ee-2648fc64045c	1	Other	Other
+7e0b3a99-4c38-47ab-9aee-335bc273d4bd	1	Other	Other
+7e0b518e-9e67-4cb4-b94f-7e22e2c36d56	1	Other	Other
+7e0ba4a0-8ecf-455f-8b92-a3c70533031c	1	\N	Other
+7e0bbb9f-ad11-487a-974d-b30a54a9bfa2	1	Other	Other
+7e0bcd5b-e57b-45df-803b-bef43b26f1d7	1	Other	Other
+7e0be076-9d20-41dd-a3f9-9ac0719c626b	1	Other	Other
+7e0bf2f4-1464-495e-b5e4-7788485af94d	1	Other	Other
+7e0c1b06-2195-4e40-8957-da59e54fbfad	1	Other	Other
+7e0c3e5a-8db7-4589-8d6f-7f233fa68212	1	Other	Other
+7e0c8077-4a66-401c-822e-5eb55275cf26	1	Other	Other
+7e0cdde0-09e5-464f-96bb-4a5e19b4b0a9	1	Other	Other
+7e0d1819-7ea8-4c10-9056-a173a3f5201e	1	Other	Other
+7e0d29b6-f3af-4750-a504-6173a59cc148	1	Other	Other
+7e0e3bef-1662-4672-9880-faa0e6fa048e	1	Other	Other
+7e0e5e88-0661-4fdd-8499-074e85d65d9a	1	Other	Other
+7e0e8977-15e4-4b32-b4a5-e29219260ef0	1	Other	Other
+7e0ef78a-3e1d-4c17-bb93-4aa5db168e46	1	Other	Other
+7e0effaf-a040-47d6-8b64-6ab01cb3d3aa	1	Other	Other
+7e0f07da-0942-489d-adf6-c1988b2c1191	1	Other	Other
+7e0f5b64-673d-43d1-923f-861b7fbc80c2	1	Other	Other
+7e0f5d43-fddf-4385-b01f-abc1c3704d11	1	Other	Other
+7e0f91f8-87a2-4f5f-8aba-80c837016eee	1	\N	Other
+7e0fa0b9-9cbb-4270-9dc6-b33030d6b0b8	1	Other	Other
+7e0ff63a-5114-4b6d-b1d7-87bc692a7fc5	1	Other	Other
+7e101b5e-2f4d-4760-9851-5040f2f070af	1	Other	Other
+7e103ffa-9c82-4371-a561-f70fc567ecc5	1	Other	Other
+7e107aa4-f865-4932-8f50-328f9622ea19	1	James	Other
+7e109ea0-f1cb-453e-896e-9ec1d304c1bb	1	Other	Other
+7e10cb22-5617-4f9c-914c-609be1591987	1	Other	Other
+7e10cdff-a9ec-4c72-8daa-0c85f8943369	1	Other	Other
+7e10e2df-b606-48c9-b711-7e6882b64171	1	\N	Other
+7e114a6f-8e9a-437b-afeb-3075c522d4f5	1	Other	Other
+7e115d67-4f71-4388-88c0-d87fddf71c12	1	Other	Other
+7e116d1f-fea5-453d-87bc-e07dccc8d69d	1	Other	Other
+7e1173ff-2e39-4a68-8f04-0c418644c657	1	Other	Other
+7e11a020-4372-458c-a637-a22397403545	1	Other	Other
+7e11ed0c-678a-4b7c-b52d-8f61cadbb531	1	Other	Other
+7e11fb9d-883e-486d-9fd6-ddbaf4a656d4	1	Other	Other
+7e126660-c9f9-48ef-8e43-1eaa54f0077a	1	Other	Other
+7e126ced-7765-4a31-b35c-3a24695e533c	1	Other	Other
+7e126cfa-ed8b-42d4-89f2-d38b8489e59c	1	Other	Other
+7e12774a-48d5-4a4b-971f-b620d515dfdd	1	\N	Other
+7e127f9d-1dee-488d-844e-c86dd640b2d9	1	Other	Other
+7e12c673-e2e0-4af0-995a-0add859b0a85	1	Other	Other
+7e12cdc0-8ce3-4aaf-875a-af37ab002a64	1	Other	Other
+7e12f587-8baa-4c26-a521-004840a8b7a4	1	Other	Other
+7e12fcab-7eb4-4348-843a-be30ced51bbd	1	Other	Other
+7e13456b-bf6d-4305-967b-3510a4465f23	1	Other	Other
+7e134b25-044a-4551-9a05-619822069436	1	Other	Other
+7e13935f-cb96-46cb-ada2-203e31cfde94	1	Other	Other
+7e139c18-368b-4b4e-9840-82241c440485	1	Other	Other
+7e13a312-d3d3-4bac-a226-53323b684073	1	Other	Other
+7e13c310-927c-4e6d-87cd-699bfc3d9029	1	Other	Other
+7e13dbdf-2d75-44a6-bedb-fb32ec970e94	1	Other	Other
+7e13f866-c90f-4a80-ab7e-d59a4a13e8c4	1	Other	Other
+7e14331f-e98c-4bd5-a01a-0a93228c208e	1	Other	Other
+7e14c851-a026-4bf2-887e-a0e5f0e0e8a8	1	Other	Other
+7e14dfe1-d045-40c5-96ca-d8802c5497e1	1	Other	Other
+7e14e205-e1b9-42ec-93b2-c440e26f6548	1	Other	Other
+7e14e3bc-581b-4075-8b76-1a12040efff0	1	Other	Other
+7e1550fd-3641-4a00-a060-18003fa6292e	1	Other	Other
+7e156188-781a-4650-945a-ff4c4c1a2ce8	1	Other	Other
+7e15626d-e980-469c-8f48-1b88e6f42447	1	Other	Other
+7e1587e1-d74f-4852-bd13-764476bd610c	1	Other	Other
+7e15a73c-ae38-4176-8d77-10d1f44643d3	1	Other	Other
+7e16235d-197e-4cf6-bde1-3230a919d7e2	1	Other	Other
+7e1637ba-c18c-46c9-a701-776d1b39eca0	1	Other	Other
+7e1666ad-2488-4452-bfc7-039b7725a38d	1	Other	Other
+7e167ee9-2314-49c3-8d02-be200da49e82	1	Other	Other
+7e169087-de91-4572-b1e1-e04d563b91bf	1	Other	Other
+7e16a897-bc19-45ea-8578-faa78b20c20d	1	Other	Other
+7e16c56a-15da-46e9-a029-2390d3fa8027	1	Other	Other
+7e1716e0-db4d-419a-9efa-256ca23580f4	1	Other	Other
+7e171cb2-a0e5-47fd-b87f-c6e053671141	1	Other	Other
+7e17233f-bf41-4aec-8143-8c39f1d73e23	1	Other	Other
+7e17362e-ceb3-4ca2-b469-2c788153ea5a	1	Other	Other
+7e173963-44e4-46bf-8180-d48b757f6464	1	Other	Other
+7e175ee1-f420-4a09-8068-16f51cd9a4fe	1	Other	Other
+7e177985-9790-4b2c-aa1d-5543cddc0f37	1	Other	Other
+7e17827c-b63f-4b03-b31a-19f996596d96	1	Other	Other
+7e1782c9-09f7-4493-9c07-df6e7d501a61	1	Other	Other
+7e1792e6-a3b6-4fa6-b779-866af47bffb3	1	Other	Other
+7e1794b9-5455-4d34-89bf-8ffd0e336a4b	1	Other	Other
+7e17c064-aae6-437b-a088-6091820dfd4b	1	Other	Other
+7e17c6dd-1cf5-417d-a5af-3ef447930b6b	1	Other	Other
+7e17d36f-c0e9-49e1-bcac-828e6b79cf8a	1	Other	Other
+7e1809cb-cb72-4f08-843e-65558f503e80	1	Other	Other
+7e1813e7-649f-426f-bd36-995c1b07a393	1	Other	Other
+7e18522c-91bd-4ebe-b43d-1005d7d06170	1	Other	Other
+7e187af0-b05a-43c3-a059-8711ae776123	1	Other	Other
+7e18f2bd-d996-4d97-a076-aa1606cde0de	1	Other	Other
+7e1949a3-e92b-49db-a383-70118a419a8a	1	Other	Other
+7e195f9f-0f7e-4569-816b-5cdd48b947b4	1	\N	Other
+7e19605f-9326-4118-9769-b6281fee2523	1	Other	Other
+7e197bf8-f807-431c-939f-7f22c629270f	1	Other	Other
+7e198304-e590-4ee1-b48c-99c1cc47f0a5	1	Other	Other
+7e19be58-1e79-44c7-b7e6-13a6d743a376	1	Other	Other
+7e19e429-cb53-4459-8527-aea5744f9914	1	Other	Other
+7e1a31d9-3e39-48af-b5b8-0871ffe20820	1	Other	Other
+7e1a49b3-f4ad-4dfc-a411-0a010ab33c28	1	Other	Other
+7e1a5753-992a-4708-bef2-140b60000fe7	1	Other	Other
+7e1ab337-965e-4aaa-aba2-938142812662	1	Other	Other
+7e1aee73-9455-48e2-afeb-d20bb442bf32	1	Other	Other
+7e1b7117-6496-49db-ab72-dbf199771916	1	Other	Other
+7e1b9d7e-ccb3-4f16-bd94-f43dfcab60a2	1	Other	Other
+7e1bf63c-a6ae-471a-8541-26c780dd2a87	1	Other	Other
+7e1c05d3-4b45-4f2c-b919-665cea919e57	1	Other	Other
+7e1c0982-4429-4c2f-83ce-f7430efc3112	1	Other	Other
+7e1c1c6c-d7e0-4d79-ab5f-70bb75b4efde	1	Other	Other
+7e1c9430-038a-4069-a58c-488e22e7467f	1	\N	Other
+7e1cd932-c7b9-411d-8c3f-767437dde969	1	Other	Other
+7e1d52bb-11c4-4cac-bf67-d8951d1aeb74	1	Other	Other
+7e1d6c1d-2259-4938-a895-1bf96af509c9	1	Other	Other
+7e1d78d8-94f9-484b-af54-caac8092119f	1	Other	Other
+7e1dc223-0f49-4d00-a32d-ca583474b62c	1	Other	Other
+7e1dd2dc-05e3-4e33-837c-e24ba289aef1	1	Other	Other
+7e1e0cc4-75f6-4186-b9d2-585dae84c03d	1	Other	Other
+7e1e3035-99f3-4bf5-ac8b-0dff3a2adea3	1	Other	Other
+7e1e49f5-2349-478d-a449-53663be4f2b4	1	\N	Other
+7e1e6c00-d146-4722-95ec-6f0110cbf0eb	1	Other	Other
+7e1e87a7-eaa8-4852-b730-d51f6c6912c5	1	Other	Other
+7e1eb0b5-7572-4951-95a0-14a844736d9a	1	Other	Other
+7e1ed0c2-4713-49cc-b4b0-f3187bdeacc1	1	Other	Other
+7e1ee5ae-729d-4b83-9bbe-dae0d2ce7db1	1	Other	Other
+7e1ef0f9-626f-4808-82ec-5f4704c5736a	1	Other	Other
+7e1f13da-c95a-4c74-96d6-26fac8da707d	1	Other	Other
+7e1f2ce5-dc68-4e72-9a3d-51a5159e865f	1	Other	Other
+7e1f7447-962f-42e7-954e-d9087146c0ce	1	Other	Other
+7e1f76f8-bb4d-49c6-9466-504f2e959b65	1	Other	Other
+7e1fb853-4f55-4c5a-a909-29d3926e3345	1	Other	Other
+7e1fd5fa-9615-49cf-9143-f25aa56850ee	1	Other	Other
+7e201d51-c559-46a7-84f5-1d2b5f261213	1	Other	Other
+7e2036b4-9d71-447e-aa25-d010891d2de4	1	Other	Other
+7e205a5a-58aa-4abe-880c-65ba45ec9fe6	1	Other	Other
+7e205f03-f175-425c-a8f2-06d48c9efedc	1	Other	Other
+7e20babe-cf2e-4d6a-b928-8833133990bc	1	Other	Other
+7e20bd72-df53-4b43-96b6-a84f395daf33	1	Other	Other
+7e20dfcd-3cc4-460a-acf4-50768248b36e	1	Other	Other
+7e20f0ad-8bb6-4a31-9104-4baaf6eb61e7	1	Other	Other
+7e210d66-bf20-4f96-9b57-8b2b48023607	1	Other	Other
+7e212a99-7db9-432e-94d4-e04452211e5b	1	Other	Other
+7e212f6c-b408-40b8-927c-380ddd310036	1	Other	Other
+7e215dba-0607-4f54-9c10-b2268e7c953a	1	Other	Other
+7e219d4b-249b-4686-9d28-ad7c9bce9df5	1	Other	Other
+7e21df79-6015-4443-b29d-7204dd680f5e	1	Other	Other
+7e21fcc5-6759-4abe-9cd3-5976225e88f9	1	Other	Other
+7e225926-32ff-4260-9dcd-540f3b72d06c	1	Other	Other
+7e22d7a7-b052-4d23-8bd6-eb7cd20c7a23	1	Other	Other
+7e22e954-3d2c-46eb-96b0-86d201270418	1	Other	Other
+7e231144-5ab6-49e3-8de6-bc3f1ae52300	1	Other	Other
+7e2347b0-157c-4802-9340-8af25b959def	1	Other	Other
+7e235588-35eb-40b3-9c4a-fbd67cc4a983	1	Other	Other
+7e23761d-a204-4774-bbcc-b68f4e74623a	1	Other	Other
+7e23a286-3385-4d21-8eb0-445efaceb9c2	1	Other	Other
+7e23a6ff-d131-4829-afbb-c0aee2486ba7	1	Other	Other
+7e23b247-fcde-4ade-ac76-3b3d4ab0895f	1	Other	Other
+7e23c0ef-15d4-4c37-8651-2d38ae0c4870	1	Other	Other
+7e23ed2f-a0fd-4169-9218-ac3b04b1e6ad	1	Other	Other
+7e243408-cf67-4f75-8da9-d89abf9a9829	1	\N	Other
+7e2486c5-604c-4c2e-bdef-7373cab014b5	1	Other	Other
+7e24a553-6108-4edd-939d-da3c15c8d4de	1	Other	Other
+7e24ac55-85c9-48dd-b65a-7c2eefa7dbaa	1	Other	Other
+7e24bdef-0936-4111-8226-d635294aeff2	1	Other	Other
+7e24c761-cc7f-4c10-ae92-1ada03cdd5ea	1	Other	Other
+7e253305-a901-4682-a640-f4949f568267	1	Other	Other
+7e257412-cc43-447a-8f6b-00d4f5e0a63d	1	Other	Other
+7e259ef5-6be5-4131-9952-1647f134d291	1	Other	Other
+7e25e5e6-ce3f-4b6c-8dde-3f8ff8cdcb18	1	Other	Other
+7e261868-ef56-43b0-acd4-a225967ec0b2	1	Other	Other
+7e263630-e0a7-4d72-b882-00d4ea8daf4e	1	Other	Other
+7e26830d-19a7-4586-90c9-603b8d80b1cb	1	Other	Other
+7e26b080-a24e-47a5-bd12-26cb04c43f65	1	Other	Other
+7e26b4f5-a957-4e53-9548-2ddac731e827	1	Other	Other
+7e26c488-ce64-4de8-a76c-5eca844c9e7d	1	Other	Other
+7e26d8d6-79d4-4327-aed0-a0b1635ecec8	1	Other	Other
+7e26e1c7-54a9-4ca4-9df1-86341533a8fa	1	Other	Other
+7e26f442-1752-4124-bd88-50724e9b6499	1	Other	Other
+7e26f51e-7562-4e3b-930d-dd0edf295140	1	Other	Other
+7e26f6c7-71a3-463f-bdba-9afb5daf19e1	1	Other	Other
+7e271917-aa06-43fa-a6de-afa65600e9aa	1	Other	Other
+7e27283c-2eeb-4732-bcf4-24a403033448	1	Other	Other
+7e273574-1d67-44f7-894e-f4ee99167b22	1	Other	Other
+7e275e68-c1e2-4b20-bcc7-c4f4058c7f2b	1	Other	Other
+7e27799e-f5fc-422f-bf44-c8cb85b50134	1	Other	Other
+7e27b3c7-5135-47f0-9c5d-6268672ce287	1	Other	Other
+7e2832b4-6be1-4e1b-99a8-53ba1f396ca1	1	Other	Other
+7e288375-b4f3-45af-bb42-50580af4e696	1	Other	Other
+7e28fbb5-9436-4442-bbf3-51706361d8bf	1	Other	Other
+7e29e088-65cc-46a2-aea6-bc833aedb565	1	Other	Other
+7e2a1599-d268-4f14-8d2d-bf67c4e0a137	1	Other	Other
+7e2a1f47-2b05-433a-8daa-7109344045b4	1	Other	Other
+7e2a5928-e1fb-49ce-8216-a0e6154ffe71	1	Other	Other
+7e2aad2c-6fad-4eea-9944-4d95ef5ea9b7	1	Other	Other
+7e2aea56-2542-43cc-9dcb-404881191fad	1	\N	Other
+7e2b1d39-7e92-481c-b145-4aa08953bc9d	1	Other	Other
+7e2b5a0b-8c56-45cb-855e-28e02a03c306	1	James	Other
+7e2b7290-e707-4b6d-bcdb-08baa20080fe	1	Other	Other
+7e2b81ff-cf7b-4296-be57-d0e79136409e	1	Other	Other
+7e2bbfff-ecc9-45a4-a71c-f50ac31558ab	1	Other	Other
+7e2bc3eb-783b-410e-93c2-fe287ae0ea9a	1	Other	Other
+7e2bc778-eb64-48b9-b675-7ac23d855413	1	Other	Other
+7e2bd9fa-4823-4775-b7ab-12011720cf41	1	Other	Other
+7e2bdf2b-0f58-4507-a04e-42018117aae7	1	\N	Other
+7e2c2e45-4a63-41af-a8b6-e448e120b8a4	1	Other	Other
+7e2c4233-6230-44c5-8e92-5ac0c3ff8e1b	1	Other	Other
+7e2c46bc-d40a-46db-a8b3-f5c780eb613b	1	Other	Other
+7e2c51c8-e832-4db5-a411-a7aac0989ba2	1	\N	Other
+7e2c74f4-1136-45f3-ab7a-6450392ab84f	1	Other	Other
+7e2cc2fe-690b-4e2f-a20c-3bb3c986f0b5	1	Other	Other
+7e2ccf59-621d-46f4-bd08-6af9e8e5ac12	1	Other	Other
+7e2cf92b-b698-4bb8-9560-3922f4ce886b	1	Other	Other
+7e2d4936-8f8a-4730-8e77-fa811662ec30	1	Other	Other
+7e2d4d06-3a8d-4c54-9a67-872c5dfebbd7	1	James	Other
+7e2d5b97-2418-426d-8919-c5ea542b352b	1	Other	Other
+7e2d7e3f-12b6-4026-b61a-c01ca96a1677	1	Other	Other
+7e2d9b8d-f08f-41bc-808f-bac32e6f8258	1	Other	Other
+7e2de66f-fa99-44da-982b-f47805ca6f3a	1	Other	Other
+7e2e3756-f241-430f-8384-2faff043c20a	1	Other	Other
+7e2e5525-9243-4928-9e5f-6bc22c01fe4b	1	Other	Other
+7e2ed91e-6e4f-455a-aca8-0217ca7877b2	1	Other	Other
+7e2ef310-6393-4324-8ebd-8b238e2695b6	1	Other	Other
+7e2f1dc5-c1c7-45d7-a6a8-32dbbaecb667	1	Other	Other
+7e2f297a-2bcc-410b-9ab7-36335533f3b0	1	Other	Other
+7e2f47e3-fd9b-4f53-8f14-4f2c4f37df1f	1	Other	Other
+7e2f7850-d966-4f52-90dd-d12e8d74b0e9	1	Other	Other
+7e2f8cc6-0217-43d5-aad8-674955786e60	1	Other	Other
+7e2fb279-c39c-40fa-9f46-e8204da102c4	1	Other	Other
+7e2fd6b9-4e1c-4a73-b97b-e1b7d82f236c	1	Other	Other
+7e300cea-a7bb-4c20-a71a-18b7d1f08230	1	Other	Other
+7e3012bd-866d-4ccd-a014-e8c1a824ecdb	1	Other	Other
+7e303ede-6465-4659-b341-7cefc63394c6	1	Other	Other
+7e308700-60a1-4791-8a85-311927679b27	1	Other	Other
+7e309a7a-168d-4c90-b8e7-7eb7e2a7067a	1	Other	Other
+7e30de38-18c3-4e21-b80c-8dea386e0d48	1	Other	Other
+7e311a76-2ec5-4d75-be95-0853f6813630	1	Other	Other
+7e311b10-2698-40c2-aa5f-d382846d27ad	1	Other	Other
+7e31352b-5747-47bc-a4a6-9c12e43fd135	1	Other	Other
+7e317f80-e729-4c0e-9a24-fd7a9eb98067	1	Other	Other
+7e31b5bd-ec42-4989-bfbf-6a70804518ba	1	Other	Other
+7e31d40d-f466-4601-b30c-f6694a37bc55	1	Other	Other
+7e3233ac-29a3-4b0e-af2a-af70875076d3	1	Other	Other
+7e32526b-ad12-4c10-8770-9c039d2bdfcb	1	Other	Other
+7e326689-3a9b-4bb2-8442-87d8eb4727ed	1	Other	Other
+7e33653a-7a27-49ac-901e-f4896860229f	1	Other	Other
+7e344242-28f8-4882-8784-41c63f5bc945	1	Other	Other
+7e34499e-9368-4872-80de-7131e119bb08	1	Other	Other
+7e346078-fcba-4c9a-9761-fe2d9f2e62ac	1	Other	Other
+7e349784-939f-4a45-b61d-79e70feded89	1	Other	Other
+7e34f188-a203-4252-a6de-1f56c19d3861	1	Other	Other
+7e34fecf-e304-4cfc-a3e2-019856013cf5	1	Other	Other
+7e351e84-6461-4ce3-9421-5df689e811d8	1	Other	Other
+7e3525cb-b830-4a9b-8a37-cd60580ec8ce	1	Other	Other
+7e353060-7e4c-454c-9ac6-54fb744cb694	1	Other	Other
+7e3577be-4808-4097-ade4-bc1beeacb3c9	1	Other	Other
+7e35838b-523b-4e00-9689-4e00da1d87f5	1	Other	Other
+7e359034-7f8d-44e3-8401-c7240ebf92d8	1	Other	Other
+7e363c4f-fe6a-4e2b-8ee9-af49cc8625b3	1	Other	Other
+7e3650af-1ed1-44c6-9821-a6f63d71b396	1	Other	Other
+7e367041-e794-4ab5-bef3-976786790242	1	\N	Other
+7e36ac5e-0ff8-4a64-83d1-933e915595c3	1	Other	Other
+7e36ff5f-2ef4-4cbd-8743-23b56fa773e9	1	Other	Other
+7e373b79-4992-4f1c-8df1-2ec7411c65bf	1	Other	Other
+7e377415-d72d-4963-b544-33a718d37a9e	1	Other	Other
+7e3775f7-97cb-4f0f-be5c-34037939e69d	1	James	Other
+7e3780fc-7a4a-4858-aae3-2946668cb41e	1	Other	Other
+7e378191-f333-4f1a-91ba-0281b1a27673	1	Other	Other
+7e37ce90-c0a5-4de8-832c-cf61efed585a	1	Other	Other
+7e37d3b9-45bb-49c6-b82e-ed2938af73c0	1	Other	Other
+7e37d48e-1a3a-419f-bb46-1b626fe292cb	1	Other	Other
+7e37d85b-b30f-4472-8740-c43b5034154e	1	Other	Other
+7e37de13-f307-4ff9-959f-b2cc089ab5f7	1	James	Other
+7e37e622-3d27-4cd6-8358-277a6ae492ff	1	Other	Other
+7e37ea4d-7298-4b24-9e84-c857c243c122	1	\N	Other
+7e380f20-67e1-4a81-8279-f65ada36b850	1	Other	Other
+7e382714-0e40-4a60-b54c-43962d26881c	1	Other	Other
+7e387189-da86-448c-a146-ec3f2499952a	1	Other	Other
+7e389ab7-03cf-4a1d-a721-293fe7a2a51c	1	Other	Other
+7e391378-60a3-4e2b-93c6-e9ccaaa90fe6	1	Other	Other
+7e3953d4-7bf4-4001-91c5-4da6f051baa9	1	Other	Other
+7e39637f-7601-4971-9361-627d16012210	1	Other	Other
+7e3966ee-8018-46bd-ac30-cfec04a464e1	1	Other	Other
+7e397032-11c4-41aa-b484-15c4d4ee0f8c	1	Other	Other
+7e39bd7d-db62-4b96-94f0-b4df262b9f2a	1	Other	Other
+7e39fff3-a613-4222-a47a-b66379ee257c	1	Other	Other
+7e3a406e-57ff-492a-b370-ac9b36004ce5	1	Other	Other
+7e3ad4b2-6100-4c7e-a781-2dac08637a19	1	Other	Other
+7e3af16f-c7f8-4e68-85fa-74d78266c94f	1	Other	Other
+7e3afd9e-fc9c-4fc9-b7d3-52abe7a62aee	1	Other	Other
+7e3b229f-393e-4b6f-9ba2-b4f005f5ac65	1	Other	Other
+7e3b5c7e-4d9f-4637-8036-d643fbc2ecd2	1	Other	Other
+7e3b9dd6-e9b2-44c3-9442-3ecf70d0da68	1	Other	Other
+7e3bb0fd-aabf-49f6-bc35-5b7d2d0cfc8b	1	Other	Other
+7e3bc28c-0c9f-4b39-9b83-314e95903fa0	1	Other	Other
+7e3bce8d-f638-4697-ab34-1541e37edc89	1	Other	Other
+7e3be914-e5aa-4605-8678-5b65a08f2fe5	1	Other	Other
+7e3c0ae6-2b04-4d7f-b38b-1bbe69eae35d	1	\N	Other
+7e3c301c-050e-4cdf-b625-3d069d762644	1	Other	Other
+7e3c3385-f8b5-48c6-b2f8-c4a6bd5eee13	1	Other	Other
+7e3c5575-a59f-475e-bec0-5a5596be9595	1	Other	Other
+7e3c8240-d5e9-4ad6-af83-d5c34c3c0f97	1	Other	Other
+7e3caa94-387e-4a7a-8ffd-ea7dd79da844	1	Other	Other
+7e3cc45f-1e9f-4007-bc29-2207958f473d	1	Other	Other
+7e3ceb73-9832-40c3-9b61-f239bbd9f544	1	Other	Other
+7e3cfc6a-b571-478a-91d1-370aceaec714	1	Other	Other
+7e3d1005-a54d-4999-b187-97a5271de803	1	\N	Other
+7e3d1429-eda7-41a7-b3dc-ee8f86081810	1	Other	Other
+7e3d7f86-2a7f-41df-871c-1e0e0cb1fa7c	1	Other	Other
+7e3d98bd-c388-48f5-9567-08d0ae1af791	1	Other	Other
+7e3da5fc-62a5-428d-8678-504293e7433b	1	Other	Other
+7e3da848-a069-4f0c-b672-5d45947affd6	1	Other	Other
+7e3e0516-4ea3-4965-8f49-9b4e303710cf	1	Other	Other
+7e3e0529-cf9b-45da-afd7-649a10a183cd	1	Other	Other
+7e3e2c39-9d50-4fd2-b37b-3c9454d2db89	1	Other	Other
+7e3e2eb0-5ead-411b-9077-7dcc69822119	1	Other	Other
+7e3e89c9-a0c4-4410-970c-0820f823f33e	1	Other	Other
+7e3f170a-dfe2-4498-9291-2f1427317f10	1	Other	Other
+7e40204d-9125-4241-a875-ad1ca940cdb7	1	Other	Other
+7e4030df-6009-4c3b-9aef-89cecdfd8b60	1	Other	Other
+7e42222c-b363-4553-b060-bfab3bfd7553	1	Other	Other
+7e4250bb-d940-454d-8f0e-af20cbfdee8d	1	Other	Other
+7e42959e-09a5-4a49-a9c9-aaf065e7300c	1	Other	Other
+7e42e44d-05b1-47ee-b0b8-ad31f65d870e	1	Other	Other
+7e42e8d6-bf0d-4d6d-9b26-472d3cf165fc	1	Other	Other
+7e430845-0d75-4d1d-852e-c1e7fd0d0130	1	Other	Other
+7e433e9f-c440-43ee-a594-e05c65d99142	1	Other	Other
+7e43aeca-3fa3-4cd7-8dde-67dbae0be557	1	Other	Other
+7e43c470-17cf-4b33-a622-c4530df0f005	1	Other	Other
+7e43eb10-06e4-4685-ae81-18ce265f1086	1	Other	Other
+7e43f438-d41a-4145-838c-3d200bae7a98	1	Other	Other
+7e440d6f-f643-4bdf-8922-39af0551c1fe	1	Other	Other
+7e440f70-f4eb-4fd5-a509-d814347186fe	1	Other	Other
+7e4415ad-a8d0-42a7-9b9c-0550f73b8d17	1	Other	Other
+7e4480a7-86a4-4192-9e2f-64ce3cd8c5cd	1	Other	Other
+7e44a340-296a-42e3-9b18-29740c72777e	1	Other	Other
+7e44a8ba-52d0-4ecf-b296-5b771262aa4f	1	Other	Other
+7e44dc73-f7b1-438c-b2b6-73bc60be9d31	1	James	Other
+7e450726-8553-44fa-bb8f-9fdcf22ffa0f	1	Other	Other
+7e458073-212f-4064-87d7-92d0ebc8e2ab	1	Other	Other
+7e458e1d-e3ef-4820-b378-cb8d800a08ba	1	Other	Other
+7e45c36f-fe15-4893-a195-b9aaccf079af	1	Other	Other
+7e466fca-399c-43c1-a79d-9175c696999c	1	Other	Other
+7e467f36-35ff-435d-8fbb-c4350accb6cc	1	Other	Other
+7e46d075-c9c6-4070-bcfb-c0374f49b756	1	Other	Other
+7e46d971-5a4e-47ff-ae54-5773fdb2885b	1	Other	Other
+7e46dcf1-aa75-4c92-a122-2131ca4e22f0	1	Other	Other
+7e46f127-8ba9-41e0-9aa3-193a1cdc68d6	1	James	Other
+7e46f13e-20c9-4edb-9a3e-60b87d73f4bc	1	Other	Other
+7e471aee-767f-4adf-b044-4f25a0c070d5	1	\N	Other
+7e473142-f158-465f-9fb4-1d243a9a3886	1	Other	Other
+7e47435b-b42f-4f72-8661-de319712ad63	1	Other	Other
+7e478526-4246-4cf5-8124-0669d8b9f0b7	1	Other	Other
+7e47a740-924b-4f9a-8c02-9b131bc6992e	1	Other	Other
+7e47ff19-80d2-4d92-8002-a3079470b6b0	1	Other	Other
+7e487a63-d60c-4f6e-a2de-57835763a7eb	1	Other	Other
+7e48e17e-fda5-420c-9f5a-8e49a7d460bd	1	Other	Other
+7e48f47f-4862-4021-9a62-dc4c9bd0dbdb	1	Other	Other
+7e48fff1-f262-4cdf-9146-935a1510c404	1	Other	Other
+7e490d72-a735-47d4-92fa-f856b438787e	1	James	Other
+7e491929-8b01-4174-a1d8-b74d7eb7cad6	1	Other	Other
+7e498161-6eec-4dd7-9dea-d43bdc4ea553	1	Other	Other
+7e49850d-c3cd-42ad-82b7-57717c263d3e	1	Other	Other
+7e4998ee-971d-483f-a60c-fc95c263ec92	1	Other	Other
+7e49fd27-aeef-42dc-9078-0f3705640324	1	Other	Other
+7e4a34b3-99ff-40f3-8b32-01c374c5fb99	1	\N	Other
+7e4a3b11-3def-4c50-a2a1-05950dbff74e	1	Other	Other
+7e4a3f07-5aad-4ff9-8499-b4fffd8731d1	1	Other	Other
+7e4a45a0-4a9f-4c19-9266-65b194b548c0	1	Other	Other
+7e4b3716-8130-42a1-9c72-8569d85db1c7	1	Other	Other
+7e4b3941-6e56-4b88-b45e-58c8721f4677	1	Other	Other
+7e4b621f-51ae-467c-bdbe-9f553ed6f1d1	1	Other	Other
+7e4b792f-2d28-4c1d-91fe-0b4240b0fcc8	1	Other	Other
+7e4b85bc-ae97-43cd-8704-c7de31fcebb8	1	Other	Other
+7e4c320f-f962-4d77-978b-f0311b326ee4	1	Other	Other
+7e4c4157-0422-4e91-8564-1e1de6ccba40	1	Other	Other
+7e4c4173-5b20-4e30-a0af-c042aa2406ba	1	Other	Other
+7e4c4fbd-ce2e-4eb7-ade1-29b4c74582dc	1	Other	Other
+7e4c7470-ad31-4a31-b0ba-118b29ee9da3	1	Other	Other
+7e4cee54-d7f3-47ce-8707-85ce0fef016a	1	Other	Other
+7e4d108b-6f03-428d-bd5a-e78559682230	1	Other	Other
+7e4dcbc3-b2b0-45bb-ac9d-d15e8d78ee6b	1	Other	Other
+7e4dd8dd-6757-44ae-94ff-b37d71e6b92d	1	Other	Other
+7e4dec6c-d7df-4279-914a-bc25efd09346	1	Other	Other
+7e4e187d-6497-4fe5-847c-2b875d4710b6	1	Other	Other
+7e4e514d-0c6a-46f3-a416-fe01745f79cb	1	Other	Other
+7e4e742e-c25a-4d70-82d8-1f38540cca69	1	Other	Other
+7e4e9415-40f7-40fb-a3fe-b7dffcbcfe53	1	Other	Other
+7e4ee8da-58f0-4277-bc97-93fa964c1213	1	Other	Other
+7e4f1f53-8e66-451b-99be-5c73b2a6e694	1	Other	Other
+7e4f70a3-9a0d-4dbe-aa4a-5b927222768c	1	Other	Other
+7e4fe29f-4b05-4380-8d3a-c92f68fa5d14	1	Other	Other
+7e4fe8ac-cc11-4221-b09e-84ccf63aea9c	1	Other	Other
+7e4ff71f-877c-4a10-95c5-4220f67d6b6a	1	Other	Other
+7e5003a6-973e-4f01-be3c-b3f2c6e7d6cb	1	Other	Other
+7e507b79-cc8b-4a99-88bc-b6b332d3f390	1	Other	Other
+7e508715-5540-44b8-a30a-5cf1b760aac2	1	Other	Other
+7e508a5b-53d0-493d-a2c3-334a17ecbeca	1	James	Other
+7e5102c8-1a6c-476d-b076-5270c5984a76	1	Other	Other
+7e515e5a-bc1c-439f-b8a1-7099f8e599c8	1	Other	Other
+7e51c001-55d5-4fc0-b5ac-835c3ba94c92	1	Other	Other
+7e51fd08-ff3a-476a-9608-0d93aced95f3	1	Other	Other
+7e5216b1-b2f1-4a62-948c-cd9da87e156a	1	Other	Other
+7e521907-f50d-402f-b5f6-0fd107319931	1	Other	Other
+7e527307-e3e7-4c90-a7e1-e9cec3622029	1	Other	Other
+7e52fb02-ba0d-4ef6-8121-923027438347	1	Other	Other
+7e5339b7-28bb-4254-b8b7-1b644f0a4262	1	Other	Other
+7e535886-f190-4e98-96ce-da88e16b67f5	1	Other	Other
+7e538a2d-a97f-4aa9-8917-15c622b899e5	1	Other	Other
+7e53c665-f896-49b9-b4af-40339ae6f0e2	1	Other	Other
+7e53c8f4-4c82-4d71-86bf-e2c3ee65378d	1	Other	Other
+7e53d2aa-c8d1-48e7-ad5f-e6cc25b7380e	1	Other	Other
+7e53d821-6e09-4145-b51d-5d02526001f9	1	Other	Other
+7e53e1ad-373f-4ad5-a2da-317ff3754d49	1	Other	Other
+7e53e74a-87ad-4034-a314-b2883f78a2fd	1	Other	Other
+7e548bdb-2a39-4002-8251-a715d7045ca4	1	Other	Other
+7e54df00-49e9-4d08-84b3-ef5c4cb5128b	1	Other	Other
+7e54ff10-8626-4a7f-af67-3f1b4682bedc	1	Other	Other
+7e552fc2-f7f9-430f-b432-ad6d523464c1	1	Other	Other
+7e5537df-22aa-4683-b4d6-3574127ddc42	1	Other	Other
+7e556c63-6dd1-436d-9964-6f6e950de48c	1	Other	Other
+7e558f2c-52b2-4516-87fd-21e880000707	1	Other	Other
+7e55a9e7-6c6b-41cc-9939-c9d601e09ec6	1	James	Other
+7e55d4b2-ac9e-4fde-91b0-fc1c0cdc52d5	1	Other	Other
+7e55f6a4-3037-41bc-a220-bafac62eb4c4	1	Other	Other
+7e566dcb-6fea-4151-896b-50f974aef868	1	\N	Other
+7e57ab6c-2e3d-447c-bfbf-de7cadadc8b6	1	Other	Other
+7e57abd0-deae-463d-ad72-389e0e024193	1	Other	Other
+7e57cc77-e175-4710-9dd8-1f5c28ff5264	1	Other	Other
+7e580220-dc29-4888-be34-47d6872d6de1	1	Other	Other
+7e58614c-504b-4928-b549-9abd232ed935	1	Other	Other
+7e5873a8-6a02-49c9-8436-2fa869ee396e	1	Other	Other
+7e587f64-2984-4f9d-943e-42a7df0a184b	1	Other	Other
+7e589759-8d47-43a0-a674-9f493993b6dd	1	Other	Other
+7e590ec1-5092-44f1-8d11-a33474f6699e	1	Other	Other
+7e591d07-6844-42ba-84e3-c8350e1a5a11	1	Other	Other
+7e595a67-ae53-4646-9f23-cd6d503ae135	1	Other	Other
+7e599ccb-13b2-42ca-8737-7d5c85281e10	1	Other	Other
+7e59ac65-8f1d-41c0-b4c2-3b55e76ee52f	1	\N	Other
+7e5a5f77-9e12-4a08-9ac4-95ffa3e98ea0	1	Other	Other
+7e5a6ab5-31fb-4934-8d40-bf46cb478998	1	Other	Other
+7e5aa7f2-b64b-4dee-b25d-76cd549c855c	1	Other	Other
+7e5ac710-2524-4e95-8895-0d923058fda6	1	Other	Other
+7e5b9b32-8d23-4be4-9745-7aff0ef5583c	1	Other	Other
+7e5b9ed9-aa6e-48c6-b60e-38816caaf55b	1	Other	Other
+7e5bb1f6-d5f3-4127-9d3c-78c456470c86	1	Other	Other
+7e5c554b-66f5-413d-aa3d-1318baa16c98	1	Other	Other
+7e5c8425-034a-490a-8629-57fb1b85a351	1	Other	Other
+7e5c8e8f-9a5c-4bf8-a251-b49f13fe511c	1	Other	Other
+7e5c99eb-26d1-4239-95b0-d74c598e07be	1	Other	Other
+7e5ca2d5-4728-4ea4-a773-40c61e9d93c7	1	\N	Other
+7e5cc209-1a92-4d55-bd88-9c9d17f5b334	1	Other	Other
+7e5cebfa-91d9-45d0-abb5-e77fc4c3e8f7	1	Other	Other
+7e5cf1cd-076f-4086-bea1-9fc2cfff39d1	1	Other	Other
+7e5d4408-3172-4b3b-a122-e9f9397a7892	1	Other	Other
+7e5d6439-e648-4227-8fb7-71c8e8e922d3	1	Other	Other
+7e5da206-2785-43be-9c4e-2d93147c2dec	1	Other	Other
+7e5daca6-5b4c-4d84-8c48-f068a462fb27	1	Other	Other
+7e5dc92c-b2ef-4616-bae1-6e8150bacb89	1	Other	Other
+7e5df37d-a383-43d1-9bce-0a40fa8e0354	1	Other	Other
+7e5e0014-4940-11e8-bcdc-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7e5e5b30-0e92-44c3-8d76-189bdb8f0708	1	Other	Other
+7e5e6e96-fcfb-11e7-9a12-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7e5f54ed-00af-4e20-8feb-616d4919cbda	1	Other	Other
+7e5f9500-1f5c-4f70-9349-a6a4f38c7881	1	Other	Other
+7e5f9610-4f18-4bf3-b9f3-2993b7533373	1	Other	Other
+7e5feb53-e1e2-496b-aa0d-0bca7f6565fd	1	Other	Other
+7e60292f-8ded-487e-895f-4b9dc0a2b929	1	Other	Other
+7e604890-86d0-4f62-94bf-54011fe84e93	1	Other	Other
+7e608da3-e0f6-4875-9b91-75892a84906a	1	Other	Other
+7e613141-67d3-4554-8d0c-e37fe8bd0eca	1	Other	Other
+7e618a45-8e1f-4215-9dee-9853962db9d2	1	James	Other
+7e61d548-ce0d-4ab7-8350-d3d1a2705552	1	Other	Other
+7e61eafd-1c0b-418e-a45c-4007ba5f9e8e	1	Other	Other
+7e62618b-143e-4e85-9242-e2efb41d15d8	1	Other	Other
+7e62af70-355f-469e-ac2b-aaee3cff2c33	1	Other	Other
+7e63076f-a1c8-4867-be0a-81a13efa0bcf	1	Other	Other
+7e63a073-75c3-4de3-b1c9-4986256da2d1	1	Other	Other
+7e63e6d4-7ad1-4a16-b925-7a18010f5b36	1	Other	Other
+7e640888-2e8d-4bec-8b05-394d279cd2eb	1	Other	Other
+7e6411eb-2425-4a84-8537-8b53864874dd	1	Other	Other
+7e642cd4-ab8b-473c-9b14-d087b475ff3c	1	Other	Other
+7e6448fb-e231-48b6-90eb-2eccbc779c01	1	Other	Other
+7e648ac2-757d-4f98-946a-69cbd8b4d7c0	1	Other	Other
+7e64d27c-235f-4f39-8678-7945fd44acc6	1	Other	Other
+7e64ec06-8470-46ab-b421-8e46808453cd	1	Other	Other
+7e650ccf-290d-4d69-bf3a-9fe4f2015787	1	Other	Other
+7e6526f7-fe7c-4abb-ac6c-eb595bd10f61	1	Other	Other
+7e652f8c-341b-4cc7-8cf4-8dfb49f174ed	1	Other	Other
+7e6553d8-b70a-454a-83d5-6b7548961f56	1	Other	Other
+7e655b53-f2ea-488e-9c2e-a788ac1c4911	1	Other	Other
+7e656b4a-c1e6-46bb-850d-2255945aeda8	1	Other	Other
+7e65c5a3-8c59-430f-93ce-dc3182958f5b	1	Other	Other
+7e65cca1-4204-4db4-bdf1-189ac22d1a00	1	Other	Other
+7e662271-c5dc-41c6-a519-241d0c9b6885	1	Other	Other
+7e666030-349c-4f3a-a7d5-7030e650f896	1	Other	Other
+7e66c18d-d2f3-4866-9d8d-03efb3e34bce	1	Other	Other
+7e66c22c-0d92-48cb-9dec-f91c62068944	1	Other	Other
+7e66cac0-c12e-4cea-b031-199cea7a8a8f	1	\N	Other
+7e66d547-a80c-4f6d-ba70-1f09c6032d81	1	Other	Other
+7e66d800-2d19-4480-be59-31f764cb14c1	1	Other	Other
+7e66f525-e0c2-480c-8c7a-c960f84ce3f8	1	Other	Other
+7e67187b-eff1-4ab9-b186-ed08033248b4	1	Other	Other
+7e67a951-c8ab-409f-8f92-923107e8b1de	1	Other	Other
+7e67aab5-1ea2-4627-8848-4e75f31e070e	1	Other	Other
+7e67bd0a-857d-4b55-9f40-eb9ea356d033	1	Other	Other
+7e67c651-5fc1-412c-9b71-e7da7307a432	1	Other	Other
+7e68111f-f100-43f9-a19c-d4232c9c3984	1	Other	Other
+7e684fd8-5a87-47f4-9677-413095510915	1	Other	Other
+7e68dd5a-69e1-4eff-85e5-1e43a9f88d78	1	\N	Other
+7e68ecce-b52a-4141-a96b-f1cec2558bad	1	Other	Other
+7e6930b5-34f1-4bf9-968b-d2f502f61a70	1	Other	Other
+7e6948ff-2be8-40be-8f4f-e9db4f91f350	1	\N	Other
+7e695b35-d460-4c21-b471-ddce2ee4c4ad	1	Other	Other
+7e699e61-504c-476a-a2e4-fe91183dea81	1	Other	Other
+7e699f08-d00f-4319-b950-981247bf1757	1	Other	Other
+7e6a30ed-bfee-4bd8-bff6-aabb35114bf3	1	Other	Other
+7e6a649c-47ed-4d25-8c56-cc9d0d136834	1	Other	Other
+7e6a7a20-f9da-471f-a9c1-cbcbd5024175	1	Other	Other
+7e6a91af-a3d7-4b2e-acaf-55009f862803	1	Other	Other
+7e6af78d-f200-4552-97c7-35e4052f0dfd	1	Other	Other
+7e6b3c12-f71a-4e8c-960e-5b4c2f26eb10	1	Other	Other
+7e6b840a-96f0-4f3e-9c4a-08e5f87feeb2	1	Other	Other
+7e6bd816-6c25-48f2-84fa-d80cfd0c52ff	1	Other	Other
+7e6beffe-1595-461c-9b59-887d1d03465f	1	Other	Other
+7e6c0bab-cb66-4e15-8c49-73e55079aa15	1	Other	Other
+7e6c3900-4e49-4c98-9821-5fe8daf9381e	1	Other	Other
+7e6cd6fa-6c48-4d31-bd5b-24c4208005ca	1	James	Other
+7e6cffed-18e9-46ec-b427-e5366026ae01	1	Other	Other
+7e6d1ba2-3f91-44d9-ad6f-63becfd25f1b	1	\N	Other
+7e6d470f-a5d3-4b40-93b4-88d49b1d8b8a	1	Other	Other
+7e6d701f-d7a5-4c0e-8f66-b39d04a11dd2	1	\N	Other
+7e6d86cb-70cb-4ad5-9c38-9ce1bc7295c3	1	Other	Other
+7e6dec28-db43-490f-9f26-1dada9a5f400	1	Other	Other
+7e6df4a7-e219-442b-a27d-569873947128	1	Other	Other
+7e6df4e1-b253-455d-95ab-0b303e80ea29	1	Other	Other
+7e6e1e35-2135-4d7a-8f36-5194b069e328	1	Other	Other
+7e6e4023-5574-4aae-ba6d-35e646fc5f47	1	Other	Other
+7e6e581e-7acd-4503-b11f-b31bc68b250a	1	Other	Other
+7e6e8b96-9517-4b7b-b35f-0d4e04f7e5c1	1	Other	Other
+7e6eac56-189e-4694-b7a8-8ba5d68096a0	1	Other	Other
+7e6f27a6-0291-41c1-9625-8b55f40192c5	1	Other	Other
+7e6f3950-1c7f-4f07-a8e4-b9ae4a732c94	1	Other	Other
+7e6f504d-4bd6-4fb2-bad0-1799421add5b	1	Other	Other
+7e6f5d70-a927-4835-8629-3d63baba393d	1	Other	Other
+7e6f688a-9e49-482f-bd78-de24c392cff1	1	Other	Other
+7e6fd58c-4d2f-4097-8f8b-1313ffe35376	1	Other	Other
+7e6fe62b-dcb8-4079-bb6c-f7493c9d60f5	1	Other	Other
+7e700178-d907-495d-8a5e-468a8938a7b8	1	Other	Other
+7e703778-9be7-4f79-8e07-2c2315e5fa44	1	Other	Other
+7e703b06-4a54-4cc6-b0b4-a386918db1fa	1	Other	Other
+7e70c6f6-8a78-4015-8ae0-5bcdbefde317	1	Other	Other
+7e70e510-ffd5-49ea-b6b9-7a1ca84d25b6	1	\N	Other
+7e7146ea-ea26-4353-b406-98282e17ff65	1	Other	Other
+7e71757a-66d9-4462-b9b2-ff583c102863	1	Other	Other
+7e7177e1-6f5e-4e4f-8c6d-ed5f2b9565d3	1	Other	Other
+7e71b594-a30a-491c-a243-fbb8d82519ce	1	Other	Other
+7e71ce33-cc5f-4ab9-8c93-97ae41bd5d67	1	Other	Other
+7e7206bb-e32a-4f90-99d2-aa84e1a46d8d	1	Other	Other
+7e724872-cc74-45cb-9323-f1af9634d0f0	1	Other	Other
+7e729023-1ec3-4420-97ee-6d03cca92489	1	\N	Other
+7e72950c-8ee8-4c8e-b762-c7d9d11de5ea	1	Other	Other
+7e733b1a-da1f-420c-b0d1-219bb63f9733	1	Other	Other
+7e735e6c-3ecd-477e-a16a-8ed32856cbd5	1	Other	Other
+7e73b7ac-6634-4b0b-9b14-76ac3dc344a6	1	Other	Other
+7e73eebf-8594-44f6-8edf-bc9b66615fb5	1	\N	Other
+7e747231-26cb-4a85-a319-5be9ad316a3a	1	Other	Other
+7e74a944-d799-4b4d-9a21-2a0127564348	1	Other	Other
+7e74e666-e482-4e69-8f5f-642b696dbdd4	1	Other	Other
+7e74e69d-32a9-4ae3-8960-3e72bba828e5	1	Other	Other
+7e7521cc-27cb-47ba-ae1e-31ef4bdc4e5c	1	Other	Other
+7e754ecf-9fdd-4500-8b94-3879c0a823da	1	Other	Other
+7e757df8-61db-438c-9858-e943e34910e1	1	Other	Other
+7e759623-e83f-42c3-80f6-1b2f54470ae6	1	Other	Other
+7e75a9e7-46aa-4e2e-8c54-ac3a1f4e6ff2	1	James	Other
+7e75ebed-23a8-4221-8152-e72e7f4d02d9	1	Other	Other
+7e75f9ea-43e0-47e3-9346-66c0888af648	1	Other	Other
+7e76031d-1ec3-4a9b-90e6-37a0d803e465	1	Other	Other
+7e7617cf-685e-459b-8276-f45bf716dc3d	1	Other	Other
+7e767ac6-b59f-4548-95f7-917996de3b1d	1	Other	Other
+7e768cd4-ec4b-4a7c-b854-ded1062aba7c	1	Other	Other
+7e77119e-9ff6-485b-8afb-32d2d6f45f63	1	Other	Other
+7e7731ae-a38e-4182-bfc5-c9c52675dc78	1	Other	Other
+7e775618-f7d7-42ab-be2a-f9e8c31f4ec6	1	\N	Other
+7e780175-3981-4b1e-a9e5-74fb6cb03541	1	Other	Other
+7e782139-66d7-4d51-b8ae-9e66a8053bcf	1	Other	Other
+7e789c62-1824-494c-ad29-07d5ac032375	1	Other	Other
+7e78db30-7fe4-4833-8b09-e377fd5e9ed0	1	Other	Other
+7e78f1d1-9f3d-44e3-bf6c-715d326cded4	1	Other	Other
+7e792ef8-add3-4f53-bc57-7a775388f6be	1	Other	Other
+7e79bc20-7f49-4601-9058-951fb249f0d5	1	Other	Other
+7e79fa53-3dae-4f66-8702-0b68d92fc192	1	Other	Other
+7e7a5518-26d7-4d30-88c8-705f00fc2a7a	1	Other	Other
+7e7a59dd-8d4e-4538-b361-379380e13b08	1	Other	Other
+7e7a5fd9-fe20-4b7c-b665-3f55967ba851	1	Other	Other
+7e7a9768-e1e5-4964-b79a-5bccc26c497c	1	Other	Other
+7e7ab474-c033-4e35-8c86-31538b37f529	1	Other	Other
+7e7ab964-b2b6-47af-a4be-831d34e7844a	1	Other	Other
+7e7ad9ff-ee9d-4649-9c8a-af49c0fbe242	1	Other	Other
+7e7ae4e9-7047-441e-844f-4f3a94c32fa2	1	Other	Other
+7e7af8ea-be0e-417f-8c25-edc35566ec2e	1	Other	Other
+7e7b0492-7f03-4ac1-b42d-d625ed9d946f	1	Other	Other
+7e7b6815-e86e-428b-8f7d-40651acee909	1	Other	Other
+7e7b8f95-627e-43e2-b879-c54343923084	1	Other	Other
+7e7bae48-c1bb-462e-87ce-ae5066b8e47f	1	Other	Other
+7e7c2740-4ff6-41c3-bc6e-5a9234b12ba7	1	Other	Other
+7e7c519a-a514-4668-9861-da0126b3d8c3	1	James	Other
+7e7c5654-b2e4-4277-92b1-bc0351a99d92	1	Other	Other
+7e7c859a-ee9d-4839-a580-543c85a8e5da	1	Other	Other
+7e7c97e4-7b93-4b97-8d72-29281d620fc6	1	Other	Other
+7e7c9959-e5d6-4648-9152-aeb262edaa4c	1	Other	Other
+7e7ccaa8-6bfa-40b3-bc5b-1555aa757db1	1	Other	Other
+7e7d7556-653c-4f8b-ac8d-89eb26570fb5	1	Other	Other
+7e7da869-8a7d-49bf-a117-54829b0a04f4	1	Other	Other
+7e7db083-c4ba-4d25-81b4-23fef41278a0	1	Other	Other
+7e7e1b49-5a7a-4f5e-8d22-5a92d6186f9b	1	Other	Other
+7e7e5eda-1baa-41bb-8f2e-0a3886aadb2c	1	Other	Other
+7e7e98df-88ae-4702-8e55-5c83f2227a53	1	Other	Other
+7e7ed66f-683e-4194-81ae-925317d15e0e	1	Other	Other
+7e7ede5e-744a-4585-bbdc-1759037e0480	1	Other	Other
+7e7ef442-4b18-4847-93db-a7746e888be3	1	Other	Other
+7e7f171b-cea1-4c36-aacc-5c66d9fa5dbd	1	Other	Other
+7e7f9574-0e4c-40d6-acab-20a73db6cf0c	1	Other	Other
+7e7fa496-620b-4c26-b925-d0461ed5f576	1	Other	Other
+7e7fb0b2-5b63-4c64-8efa-d94792a1a265	1	Other	Other
+7e7fdc88-cadf-46ff-ba5a-503db6f84473	1	Other	Other
+7e8031c6-6f91-40e6-a333-ff57620421a6	1	Other	Other
+7e804b43-1971-4d33-8e12-dce408a1319d	1	James	Other
+7e807394-78fa-4307-aef7-154159b41000	1	Other	Other
+7e8073cf-d889-4271-8377-2190eb5347da	1	Other	Other
+7e80a730-d0f4-46ab-94cb-dca8ea2d77ed	1	Other	Other
+7e80a7aa-4afe-4826-8074-acc18a7eb880	1	Other	Other
+7e81b98b-1893-441f-a00c-8004dabdcec7	1	Other	Other
+7e81c52e-bb01-463d-987b-4b06b7d3d48c	1	Other	Other
+7e81ca64-0793-427c-9fc6-9e1c6d1b07be	1	Other	Other
+7e81db73-285b-43db-a827-591d7eccc53d	1	Other	Other
+7e8229e3-b41f-4c68-8583-67faffd3cfd6	1	Other	Other
+7e82325c-939d-43e6-8042-7ec8c1a741b4	1	Other	Other
+7e82eebc-0ede-4f2f-a94d-7d5347b2a10c	1	Other	Other
+7e833801-4997-4a4b-9b05-8f69e4b2afa0	1	\N	Other
+7e8368cc-937b-442f-966b-bab20babbdfb	1	Other	Other
+7e839679-0cfb-402b-b492-297df99985e5	1	Other	Other
+7e83d02c-2d25-43ea-b52b-cf630437b1eb	1	Other	Other
+7e8447a3-41d6-4ded-91b5-503df797abc6	1	Other	Other
+7e845a83-e76c-4edc-a756-bfdfb812ed41	1	Other	Other
+7e848a87-736c-4c24-9d60-679469ed2979	1	Other	Other
+7e84a4fe-d13c-41d9-a85f-a897cb41db7f	1	Other	Other
+7e84aefc-4600-4dff-9287-ce6c9d37d2c9	1	Other	Other
+7e84b7ce-13a1-4414-b6c2-544ae4926632	1	Other	Other
+7e84f3dc-60e7-4440-a835-cf7bad1757a3	1	Other	Other
+7e84f482-7588-4463-bebc-2083c43d8da7	1	Other	Other
+7e8520d0-f0e3-4b6d-8cc4-f12a762aad10	1	Other	Other
+7e85562c-045d-42d6-86f2-6dc5305f6afa	1	Other	Other
+7e8556bc-d497-47d1-8035-8fcb6b0adf8a	1	Other	Other
+7e85b14d-3d8a-4074-b293-2949b05e7299	1	\N	Other
+7e860eb4-e362-477f-8961-5c33cb70cbea	1	Other	Other
+7e863206-aebf-457e-82bb-50def1a472de	1	Other	Other
+7e865fef-7d51-47ba-971d-65ceffa84be9	1	Other	Other
+7e866ecd-7b5a-44d6-a291-08a93ba70c2a	1	Other	Other
+7e8690aa-e97e-4e28-8fc1-641c81e7f3ab	1	Other	Other
+7e86c735-3646-4d61-80b2-be5577f2ae39	1	Other	Other
+7e86d3f6-4dd5-4376-ab43-7ed08395b01e	1	Other	Other
+7e8702f4-d9c3-46a8-884f-19409767b46c	1	Other	Other
+7e870478-c4c2-4da5-8043-f4767f38df15	1	Other	Other
+7e871821-c5f5-43a1-b443-8a7dcd0ed583	1	Other	Other
+7e873c03-6e17-4015-a21f-acf7750934e0	1	Other	Other
+7e877203-f2bf-4a01-9cd0-f0701fb5ea8e	1	Other	Other
+7e87e1b9-fc6a-4f58-9ac9-a2690e0dca6b	1	Other	Other
+7e880516-57b8-4bbe-832a-4453cfbd9cc6	1	Other	Other
+7e8841e4-cf75-4bc9-a568-feb0eeb71a90	1	Other	Other
+7e8887ad-dce5-43b7-8b1a-484f3e61230e	1	Other	Other
+7e88d3e9-b084-4831-9b8e-0568db1a0da1	1	Other	Other
+7e88ddcd-3bd0-4295-b299-be3173c34811	1	Other	Other
+7e892284-bc3a-407c-99cf-8f30e4c12bd0	1	Other	Other
+7e8931b0-6c85-4774-bade-e80ab47e4aae	1	Other	Other
+7e89328f-7bec-4eb9-9ff8-73ac752c0053	1	Other	Other
+7e898eaf-86a7-4f01-b591-54a8bfee9838	1	Other	Other
+7e899028-8fc5-4ab5-a696-2f6fe45ad9d0	1	Other	Other
+7e899c84-0ada-48e3-9122-7114a75b1231	1	Other	Other
+7e89f57a-aa89-4036-900f-7f97b7534527	1	Other	Other
+7e89f6f8-fab6-438c-b8a3-367dc83710d2	1	Other	Other
+7e8a0af3-35a4-404d-8c33-165ff6e77c4f	1	Other	Other
+7e8a17ab-5f1c-43cf-b6cf-a9d013c8ba57	1	Other	Other
+7e8a1a3e-fab1-41dd-a0bc-6624cb422b78	1	Other	Other
+7e8ae2ca-6da4-400c-bd03-e21755a84553	1	Other	Other
+7e8b0a29-1592-4d0f-a700-c5d2e98823e1	1	Other	Other
+7e8b143c-e561-401d-867a-18842f125bbb	1	Other	Other
+7e8b2401-d7e4-43af-b71e-dba0d425442f	1	James	Other
+7e8b4eea-39e0-4f05-b15f-21ec7084a738	1	Other	Other
+7e8b623b-e3df-4ee5-9fc1-cf72da67539d	1	Other	Other
+7e8baa88-5f55-43cd-986c-e1c70c276588	1	Other	Other
+7e8baf61-6921-4e5b-a91f-311f5ce28f48	1	Other	Other
+7e8bca54-5952-4a8c-b254-41057c637461	1	Other	Other
+7e8c19da-94b1-4120-94e5-52c3924347e6	1	Other	Other
+7e8c61c5-c0e6-4eec-acde-743d314f68dd	1	Other	Other
+7e8c9e84-dc5b-4041-9fbd-5b82b848363c	1	Other	Other
+7e8cdabc-1249-4706-9a75-b7a4f4d1a4f1	1	Other	Other
+7e8d164c-bd16-48d6-a053-3cdf5d21b7d9	1	Other	Other
+7e8d435a-85ec-4e23-a91e-8ea03442abaf	1	Other	Other
+7e8d6028-3416-4a82-b5b1-e04b812bd06b	1	Other	Other
+7e8d607d-b3c0-4c66-80d2-1aefc23b733f	1	Other	Other
+7e8deda6-3488-4f82-ac0a-b2c7eb8e9121	1	Other	Other
+7e8e082e-605b-469e-9852-6d51e02065ec	1	Other	Other
+7e8e122d-1d3b-4595-9e53-fdb61429bfc6	1	Other	Other
+7e8e1f63-5296-4eee-b5dc-f75f1318417e	1	Other	Other
+7e8e536a-8dc5-4129-bdd3-c761cdbb644f	1	Other	Other
+7e8e76df-3dea-4e87-b843-75397593cd77	1	Other	Other
+7e8f238b-a33c-422f-a16a-7808d691b150	1	Other	Other
+7e8f30d1-790b-46b1-a459-53deda883046	1	Other	Other
+7e8fc5e3-3c04-48ba-adf1-1fb138a17e6e	1	Other	Other
+7e8fd033-479e-49b4-b16f-4b96020e1bcf	1	Other	Other
+7e8fd585-05eb-4c0c-96b3-231bb8707f17	1	Other	Other
+7e8ff910-719d-4fc3-af4e-2d9cfae0851e	1	Other	Other
+7e901494-483e-4055-815b-29b4bec7083c	1	Other	Other
+7e901807-2e37-47e3-b3cb-36479d755ad7	1	Other	Other
+7e903282-fb82-496a-b933-6d2265bae2f9	1	Other	Other
+7e905a52-7622-4ad6-beda-a52c6c5e9ced	1	Other	Other
+7e906d57-6419-43f1-94ab-580deba3f0c0	1	Other	Other
+7e90be09-3a67-4802-a3b8-ede32bdd9e1f	1	Other	Other
+7e90cf00-d621-4256-b84b-cf2512076f7e	1	Other	Other
+7e9170b0-b537-4265-ba32-285c2c490566	1	Other	Other
+7e91b5c2-1f7f-4c5c-8458-526616ee233b	1	Other	Other
+7e91c72d-4b90-4aa4-9462-f43cc4eeaecf	1	Other	Other
+7e91fb48-9236-4297-842d-760fa29609f3	1	Other	Other
+7e91fccf-ca73-4a0a-ace2-ab565505aac7	1	Other	Other
+7e9214f4-a73a-4892-8753-a5355e2bd606	1	Other	Other
+7e925391-e3cc-42f8-98ac-ee931eab8c20	1	Other	Other
+7e92606e-66d8-4030-b8c2-7878181c945d	1	Other	Other
+7e9275fd-6682-46f3-a622-bb88daebaaa7	1	Other	Other
+7e92f39e-3ec9-4b08-8547-36003fb94836	1	Other	Other
+7e9306fb-4eed-4b08-9b01-f7c0654fceb4	1	Other	Other
+7e931119-c0d3-4a10-b59c-76409167f730	1	\N	Other
+7e93825d-c9c9-4708-be32-521eb489cdba	1	Other	Other
+7e938ce6-03fb-4490-9855-1a2c6518e1f3	1	Other	Other
+7e9394ba-fe89-4a19-82c6-3887a7476962	1	Other	Other
+7e93ce92-082a-43d4-9bf4-32d9f7302d68	1	Other	Other
+7e948734-0dde-4625-aadb-1c97fbc924c1	1	Other	Other
+7e94be2d-2c04-4964-8481-cc266c8d4704	1	Other	Other
+7e94c154-3ba2-46f5-8ada-367e593722e7	1	Other	Other
+7e94d5c8-5565-4c3e-8fe2-56c3c20cfed9	1	Other	Other
+7e94d879-bbbf-4ba8-a376-417b93922d56	1	Other	Other
+7e953836-07a2-4f9c-8bc0-a5e473e6bc42	1	Other	Other
+7e957573-4158-4b00-83aa-f2bfdf8118dd	1	Other	Other
+7e960dfa-8d50-4072-be1c-4735055d5ae4	1	Other	Other
+7e961a62-a4e3-4780-99e5-7031d34a6a96	1	Other	Other
+7e9632c7-f34e-4961-a4e4-40fca3c3fe4d	1	Other	Other
+7e965cd3-89e6-4ac0-ae90-ca0d3f45b78f	1	Other	Other
+7e96ae12-0473-4d37-9843-5339de2421ca	1	Other	Other
+7e96ef27-ac93-44f3-ad6c-2936dca65b19	1	Other	Other
+7e97160a-daf4-4610-8cb9-cc9a073bf876	1	Other	Other
+7e978d91-526e-4782-8f6e-5ebafaecc279	1	Other	Other
+7e97ba00-254b-4848-ad88-50eac6b033b9	1	Other	Other
+7e97d069-1ecf-46ff-8808-76bb3900c0f3	1	Other	Other
+7e985b77-93c8-45ce-be82-b200235aea39	1	Other	Other
+7e98f628-aa18-4544-8de8-8d0d74e86535	1	Other	Other
+7e990c2c-caf8-4c40-b06b-4b34f45a1a3a	1	Other	Other
+7e994ea7-f4d0-4ff5-a98f-992d223a1dac	1	Other	Other
+7e996fdd-92a7-4dd7-8035-00a1c0903e2e	1	Other	Other
+7e999ece-b34e-4c53-a182-f71c8db52eab	1	\N	Other
+7e99c4ae-de01-4d76-a478-e19f896720df	1	Other	Other
+7e99c633-e28f-481c-ac3c-028bf66f3e4c	1	\N	Other
+7e99ee8e-e037-4da9-b8be-f40c4581f9d6	1	Other	Other
+7e9a29be-5b9b-4097-8a14-ff7e12a2a4ea	1	Other	Other
+7e9a2deb-6bde-4566-9a68-8af42e911895	1	Other	Other
+7e9a3a66-4b3d-46ad-96da-3da757a2fed0	1	Other	Other
+7e9a4ec4-c2fa-4297-ac09-cb39ed33175a	1	Other	Other
+7e9ad4fc-4190-4d3d-af5f-c6c08e22b067	1	Other	Other
+7e9b03a6-6539-4bd4-abdf-ce4da153594b	1	Other	Other
+7e9b1e4d-006d-42f2-b8ea-5647e11b9b33	1	Other	Other
+7e9b9212-a7a1-426c-8b63-42e7f89ad25b	1	Other	Other
+7e9b922b-1932-4ea6-9343-07397e23743e	1	Other	Other
+7e9bbfe9-1b2b-44cf-ac8b-e35d1f984f2f	1	Other	Other
+7e9c165d-81dd-4dcf-9905-c890ebd29b5a	1	Other	Other
+7e9c5401-9edf-40c7-89ce-5a5f51dfd7d0	1	Other	Other
+7e9c8256-d624-4a77-ab2c-c9f74cd905b4	1	Other	Other
+7e9c8508-dd64-4cce-8fcc-fbdd2122f511	1	Other	Other
+7e9c8e1d-4ac0-4f39-bb07-55ce501e494e	1	Other	Other
+7e9c9ecc-27a5-4776-ad36-2e9fd1c3f96e	1	Other	Other
+7e9ca9b6-e687-48fd-b581-08f9d9fbd724	1	Other	Other
+7e9d54f6-c3d5-496a-8873-1725d4ae52b1	1	Other	Other
+7e9db9fa-ea48-4071-aa5f-1ad05f1f8733	1	\N	Other
+7e9dd91a-db18-4b1c-a4db-ed21571b3ae7	1	Other	Other
+7e9dfde3-df08-4e6c-8129-ac561475b82e	1	Other	Other
+7e9e0e5e-f01d-4600-a221-85c0f13fc654	1	Other	Other
+7e9e2eae-e2bc-489e-a4ce-5b67703d15b4	1	Other	Other
+7e9e326e-b790-4be7-87b6-bc197600ba0c	1	Other	Other
+7e9e403d-f476-4d2f-aa32-cdd602d7bdd3	1	Other	Other
+7e9e56cf-9eed-4035-b7d5-a0bc9fc21590	1	Other	Other
+7e9e7e52-3854-4c7f-8dff-a29c924e8bd2	1	Other	Other
+7e9e8d60-bb7c-45cb-ac63-8e80c9e7a381	1	Other	Other
+7e9edaf6-0c9a-41a8-b1aa-983d6702fda6	1	Other	Other
+7e9f4b33-b8c4-45ea-a8e2-f57cbee52175	1	Other	Other
+7e9f5ef0-f8c3-479f-91f8-4a4e1e2a7b74	1	Other	Other
+7e9f68c3-41e6-438f-a9f3-c2cee273809c	1	Other	Other
+7e9f6f04-130f-4738-89ee-516bb454de6d	1	Other	Other
+7e9f7f28-55ea-409c-baa5-f2dac801dd9b	1	Other	Other
+7e9fd5a1-e40f-4b59-a2eb-0d90fc1a0ebd	1	Other	Other
+7ea03791-278b-4afd-8f97-eb9216e54796	1	Other	Other
+7ea04560-2b90-47c7-a814-0e9098cec903	1	Other	Other
+7ea076b2-eb29-4719-a501-5c6cdc6acc78	1	Other	Other
+7ea0d4b7-cea0-43a5-b18e-4ccee281ab10	1	Other	Other
+7ea1031b-1270-4e7c-9106-bd9fcac79b19	1	Other	Other
+7ea12c40-90ab-4f54-aece-4a8833aed798	1	Other	Other
+7ea15c8b-1422-495f-b083-0e7de85b3a66	1	Other	Other
+7ea16cc9-cbda-4e28-bec7-5171597420a4	1	Other	Other
+7ea17928-3ca9-4a3b-9d56-c44c7403f7c6	1	Other	Other
+7ea1847e-2739-4912-9ca7-889b965fef49	1	Other	Other
+7ea19b8a-e4cd-4319-8052-d15bc5134c9c	1	Other	Other
+7ea1a125-80ac-4457-b06d-5778376c0893	1	Other	Other
+7ea1a8e8-4506-4ffe-9ab7-615922df34fa	1	Other	Other
+7ea1aee6-3969-429c-af7c-ba8e2f69c622	1	Other	Other
+7ea1e7bc-18b3-425a-b4e8-035395ba7fa0	1	Other	Other
+7ea1e846-6e78-4a88-9085-5f5c0e5028fe	1	Other	Other
+7ea22252-f239-4881-b6c0-e6dc1757c5a9	1	Other	Other
+7ea22c40-fa06-4399-8123-687984b914ed	1	Other	Other
+7ea23ece-c72c-4472-9ee9-969383e2a02f	1	\N	Other
+7ea2a618-b988-404d-88cb-48ee517079e6	1	Other	Other
+7ea2b836-fdcb-4ca3-974d-78e8ce48e8cb	1	Other	Other
+7ea2f29e-36c1-455e-8a3a-7e5ea4374384	1	\N	Other
+7ea2f5b5-9962-4469-8abb-f1892012f2d3	1	\N	Other
+7ea308d4-1a84-4a70-a955-8098c251f168	1	Other	Other
+7ea325dd-0a28-442d-b094-232bef9262be	1	Other	Other
+7ea37cd0-5fef-4537-9751-e4e168ca9c49	1	Other	Other
+7ea3ccac-575a-40fe-aa24-c32d94c6615f	1	Other	Other
+7ea3e87c-06e2-4391-a51f-34b1a35e15ca	1	\N	Other
+7ea3f82d-fb76-4ff3-a529-a165841b278a	1	James	Other
+7ea40a20-b4de-4aae-adee-4d1aba66d6a3	1	Other	Other
+7ea45145-3609-4e05-8736-b4399ab6a2b0	1	Other	Other
+7ea46c77-5d49-4157-9919-65337b0f6d55	1	Other	Other
+7ea49adc-ef9e-467a-9bb0-9a4a4ebd6e3d	1	Other	Other
+7ea4a398-e730-49d2-922c-939550d300a8	1	Other	Other
+7ea4cf88-4ce7-4877-9597-db317123c9bf	1	Other	Other
+7ea4f5c0-0d90-4048-aa5f-e04df9c563d5	1	Other	Other
+7ea5013f-0efa-4b80-8dda-40204c1cf163	1	Other	Other
+7ea516e9-24d6-4418-921e-bb0766cbd985	1	Other	Other
+7ea530cd-757c-4673-a0ed-b2cb3fef2384	1	Other	Other
+7ea5f062-98c4-4100-9ba2-89dfaa861372	1	Other	Other
+7ea6153c-fb1e-4909-bd99-27fff8a36dc3	1	\N	Other
+7ea6248b-719d-43d5-8bbb-4dd09f773ee8	1	Other	Other
+7ea70bb9-40e4-4e9d-b629-87c51cf0262d	1	Other	Other
+7ea7212c-68fe-476c-be9b-b1077fa5e006	1	Other	Other
+7ea73638-2aec-4ed2-9fe8-4b37aef350cc	1	Other	Other
+7ea73a67-ac16-431f-9afd-2ac8741444a3	1	Other	Other
+7ea74597-a264-4c34-ae3c-22968b8dd4e4	1	Other	Other
+7ea7af1e-cb9c-470c-a6e3-6aacc7569cb1	1	Other	Other
+7ea7bb97-04b5-4727-864a-19213ceb4174	1	Other	Other
+7ea7bdd3-8597-46b5-84bf-4738dd51564a	1	Other	Other
+7ea7ce1c-5bad-41e9-a9c9-5492b4da5810	1	Other	Other
+7ea7d34d-363e-4594-a23c-65972746832a	1	Other	Other
+7ea7d5c2-fa74-4623-9f33-6b8ee71dea22	1	Other	Other
+7ea7db3f-4e34-4d92-9a8c-c03f59b1767d	1	Other	Other
+7ea7f3d1-8e2b-4de8-b441-51001a249280	1	Other	Other
+7ea8438a-b6cf-49e9-aa7d-022a32cf5ca9	1	Other	Other
+7ea862d7-2321-4ef1-afe2-6a62c635c80b	1	Other	Other
+7ea88a5f-b266-414a-ac37-b29daf21a2f5	1	Other	Other
+7ea89109-f809-411a-9534-e3a66c7e49b7	1	Other	Other
+7ea920f1-434d-404d-b414-559578a22117	1	Other	Other
+7ea95ed7-db6a-4b4b-b8ae-826dc9694541	1	Other	Other
+7ea9f3d6-ae93-4c74-9735-5af7f9c1abaf	1	Other	Other
+7eaa619f-1c41-428c-8308-6572a8ce41bc	1	Other	Other
+7eaa657f-cc52-4152-b52e-e86b4980e0df	1	Other	Other
+7eaa6a94-599b-47f4-8390-fde74608e123	1	Other	Other
+7eaa6b80-3c4a-442b-8c89-f45fc41f5a09	1	Other	Other
+7eaa6e12-ddf0-4c13-bc21-a1f82e96483e	1	Other	Other
+7eaa729c-51cb-47b0-87ec-d8c1bc1692c7	1	\N	Other
+7eaabe3b-d136-4e6b-a96b-57fe41276340	1	\N	Other
+7eaabf71-0abf-4817-abd4-c37373e6b33f	1	Other	Other
+7eaaf8f0-b2be-494d-bf08-c38f192440ea	1	Other	Other
+7eab46e1-aac7-4b18-a515-98c0d1927cba	1	Other	Other
+7eab51c9-2328-4e39-9ba3-4a56ac14fc2d	1	Other	Other
+7eab5e79-158e-47d8-b899-2003458bcd22	1	Other	Other
+7eab88ee-5e6e-41bd-9c68-b268493f7bf1	1	Other	Other
+7eabb229-480d-465f-afe6-9e504ab9ff67	1	Other	Other
+7eabd291-ac58-4309-bd33-3e33952713cc	1	Other	Other
+7eabe9ab-bc5a-4f40-acf2-d61fb42c737f	1	Other	Other
+7eabfd50-10b2-4ec9-a04f-a4f7d0e40cdd	1	Other	Other
+7eac288f-5c71-42b1-8daf-9dbed3097c95	1	Other	Other
+7eac93f5-415e-4614-ab98-e81a9f108d2d	1	Other	Other
+7ead2e10-d20d-4e87-88cf-dd705e3c2902	1	Other	Other
+7ead3629-5879-4609-b3ce-26857c6178dd	1	Other	Other
+7ead6adf-f282-4211-97af-c5af4756259b	1	Other	Other
+7ead79d8-c43f-43e4-aea0-d189b23f1060	1	Other	Other
+7ead841d-0f73-4e45-b916-1a94d5b4b87d	1	Other	Other
+7eaddd54-ae4c-4378-862b-4c957903ace6	1	Other	Other
+7eae046f-94c2-464a-87a4-5c9451fe462c	1	Other	Other
+7eae1bc0-44a1-4978-afc4-6dc0c4c23410	1	Other	Other
+7eae5515-0806-49d1-a0f6-b869bea1f097	1	Other	Other
+7eae9181-fc69-4a9a-81ac-735e8fb80d55	1	Other	Other
+7eae9189-bb38-4131-b907-f01304b14ee3	1	Other	Other
+7eaea979-80ce-4776-b5ea-bd408f81b493	1	Other	Other
+7eaec544-8533-427d-96ba-70a4ca912268	1	Other	Other
+7eaee61c-5d96-4ac8-95c5-92e3e4670c58	1	Other	Other
+7eaeed9f-0e46-4672-adb2-73e6d114e2be	1	Other	Other
+7eaf1378-8744-4e58-99d7-fee677305f65	1	Other	Other
+7eaf3a49-ec82-47c4-b753-e12b665b1072	1	Other	Other
+7eaf600f-b81f-45f7-9bfa-afd397134830	1	Other	Other
+7eaf88c7-9273-435f-8660-ce834bde3016	1	Other	Other
+7eaf9937-6669-4c8c-ad19-1def111b51ef	1	Other	Other
+7eafaaac-04b8-4dd3-bbc4-b216c815604f	1	Other	Other
+7eafbe6a-fb3f-4a96-abb4-3c0b149bb0d2	1	\N	Other
+7eafdcd2-7041-47db-8eda-57b3481b6e93	1	Other	Other
+7eafe065-1582-4344-a7b8-b823a634025c	1	Other	Other
+7eb0e80b-cf79-42c8-9481-1f708feb1200	1	Other	Other
+7eb107a1-5673-477d-877a-8d3a3555d9ff	1	Other	Other
+7eb1a778-df64-457c-95ac-045f20c62efb	1	Other	Other
+7eb1bd4d-83c0-41a9-ac72-5a1754ad787d	1	Other	Other
+7eb1ecb3-356f-4f4d-b300-9febe68de4e8	1	Other	Other
+7eb1fc3f-6ace-4169-a160-a88066d55852	1	Other	Other
+7eb20675-30cb-4b01-ba02-7b1c48fd7c5e	1	Other	Other
+7eb27f83-be36-4e15-a22e-1f9c66e034f3	1	Other	Other
+7eb29f1c-2a0c-4ceb-9f06-a18e49097705	1	Other	Other
+7eb2cab6-879a-485f-b94a-3f260a2f111e	1	Other	Other
+7eb2eed2-06ff-4c8a-b9cb-4f1c20c4a199	1	Other	Other
+7eb3059f-a3a3-43fa-8770-bf7d64db0253	1	Other	Other
+7eb322b2-74d3-4c95-862a-acf9b7905f59	1	Other	Other
+7eb340af-dddd-465c-9ee9-95214ee92578	1	Other	Other
+7eb3b8ea-f659-4083-ae8f-d8109e1757e0	1	Other	Other
+7eb4475b-2c9b-4c72-bfc2-5ddbdf92365d	1	Other	Other
+7eb479bb-83f9-41ec-9bb1-c703aaeeac3f	1	Other	Other
+7eb4cedd-0575-434c-b1d4-adb3fd6ef74e	1	Other	Other
+7eb5382a-6322-438a-a71e-2980b79e9753	1	\N	Other
+7eb572ef-dcd0-463c-a1a0-91e2589e88fe	1	Other	Other
+7eb589e8-a3bc-47e6-b047-9a4d9a8d3ff8	1	Other	Other
+7eb58f24-9b7c-4e47-bc66-7f4ad375932a	1	Other	Other
+7eb5aa1c-35bd-4f7f-a2af-85251a7a0dfd	1	Other	Other
+7eb5ef41-1a13-4841-9e4c-6712bc4ba19e	1	Other	Other
+7eb60a2b-1655-48fe-88b6-629918475321	1	Other	Other
+7eb692ef-db7c-461d-b43f-7448c5c50df2	1	Other	Other
+7eb69602-6e52-4dce-ae95-f761d587569f	1	Other	Other
+7eb69632-ff4f-43a2-b0f6-65df593a6033	1	Other	Other
+7eb697e7-62b6-4bec-b8ec-fe5af143ca22	1	Other	Other
+7eb6f82b-3245-49a6-9ce9-fc6c96cd8c35	1	Other	Other
+7eb70b96-778b-4e55-8fc8-5388bde4a397	1	Other	Other
+7eb74c4a-3878-4ad1-9996-4552ad38aa15	1	Other	Other
+7eb7e8ed-e585-414e-8924-6063f0e2d7db	1	Other	Other
+7eb81a50-9bc3-40f1-b559-7415039ab981	1	Other	Other
+7eb85374-5eb2-4234-abe0-a18d9d523482	1	Other	Other
+7eb85e12-1158-42f0-900b-584680cc6ad6	1	Other	Other
+7eb8ea70-27f9-4303-ab68-18dcd4bdca9f	1	Other	Other
+7eb8ef62-52a0-4142-a4ca-95218220debf	1	Other	Other
+7eb96043-af90-4cfd-8c52-838aba27ad3a	1	Other	Other
+7eb9ab5b-2062-4c75-b58e-db07ec771cf3	1	\N	Other
+7eb9b919-8a79-4b1f-88f7-f75809f0dbc8	1	Other	Other
+7eb9ebfa-e220-4438-aaec-ec2cd49c80ae	1	Other	Other
+7eba235d-baba-4f08-9bb2-5317d703929f	1	Other	Other
+7eba352b-8ee2-4252-8ac6-e9932fd801f3	1	Other	Other
+7eba3ec0-4e8c-4106-b538-beed93d4b54e	1	Other	Other
+7eba663d-1c13-4f9b-abaa-d1a901b49cc8	1	Other	Other
+7eba8b00-70b7-4909-8d35-3c77a03116ea	1	Other	Other
+7eba9b6d-e876-49c4-a991-53d7a9aecc80	1	Other	Other
+7eba9de1-6b03-4a4f-b4de-72f9b8f0c7a8	1	Other	Other
+7ebaf0a6-7443-453a-8429-212d7f4afda9	1	\N	Other
+7ebb288e-836c-4aa5-8dfe-4a98364678ff	1	Other	Other
+7ebba4bc-c5dd-49d3-8b72-bf8315a62715	1	Other	Other
+7ebbae9b-7fcb-4f49-b922-f89c8c4f12fd	1	Other	Other
+7ebbb539-b0ea-4284-969c-9f7990ca80c1	1	Other	Other
+7ebbb715-f355-4c48-a103-a492442ed197	1	Other	Other
+7ebbc172-710a-492d-a778-b0664cba250f	1	Other	Other
+7ebbdb27-1285-4ff0-bfa5-60765ad04810	1	Other	Other
+7ebc241b-c72c-4b80-b750-a1b78ef550a7	1	Other	Other
+7ebc38ce-e241-4eaa-ba9a-3bb2ec1e05d8	1	Other	Other
+7ebcd661-769b-4068-b819-7c48033db28a	1	Other	Other
+7ebcfc5a-c788-498a-979d-d8d7b68b1988	1	Other	Other
+7ebd0f50-2614-403c-960f-415ce76a2f83	1	Other	Other
+7ebd18cc-c8e4-41f4-90a4-26177002f66f	1	\N	Other
+7ebd680d-7332-4126-8e56-ff7e5e0abd5d	1	Other	Other
+7ebda2ce-fba9-4396-81e2-da91ce5a0b9e	1	Other	Other
+7ebdd938-b5bd-43ba-b1ee-9db6939f0e19	1	Other	Other
+7ebdf1a2-854c-485b-b815-2c1793e98747	1	Other	Other
+7ebe03e4-2d8b-42e2-9330-3639a79e074f	1	Other	Other
+7ebe6ce2-9770-491a-bf72-6c941b679209	1	Other	Other
+7ebf0fd4-4402-4d90-8f34-af4d5caa5d4c	1	Other	Other
+7ebf2fef-6ace-4123-ad53-77ee12ca4fbe	1	Other	Other
+7ebf8ad1-a012-4c44-b8c7-ae9c3450e0a5	1	Other	Other
+7ebfb6d4-bee1-49ea-94ca-66a6d9bb9456	1	Other	Other
+7ec01838-03e4-476b-9acc-ff9847593a6e	1	\N	Other
+7ec02cd9-3236-49f3-99a0-bd604d88d201	1	Other	Other
+7ec033f4-e6f6-4ad4-946a-3f4a7300acf9	1	Other	Other
+7ec038c3-f962-4b50-be72-1a7c34ccbabe	1	Other	Other
+7ec051ec-d983-47e6-9fa1-217b11c8b43e	1	Other	Other
+7ec0890e-d748-4402-99cc-ef0a6507a8d4	1	Other	Other
+7ec0b495-dc36-4d37-8b1a-bf27357f76cf	1	Other	Other
+7ec0d291-726c-4449-8cd1-d616285151b0	1	Other	Other
+7ec0d2c1-6439-4ae1-abb0-f98bca7da87a	1	Other	Other
+7ec0da26-03d7-4aae-92b4-4b316ee6cc1c	1	Other	Other
+7ec15f54-5738-47af-9e5f-f633c9349b71	1	Other	Other
+7ec18e1e-711c-47d9-b3c5-6d2c25f8ae36	1	Other	Other
+7ec192a3-40bc-4544-83a2-c65bbbef77cc	1	Other	Other
+7ec1a573-e94e-4c59-bb0a-1f17578d4eeb	1	Other	Other
+7ec1dc84-5c66-4486-90b5-f4f46e2f74e7	1	Other	Other
+7ec2293a-cec4-4031-8cc7-baf331ea898f	1	Other	Other
+7ec24481-36b2-4be1-990b-1249ae2f23b6	1	Other	Other
+7ec2c391-98d9-4e8d-ab58-52ceb737a733	1	Other	Other
+7ec2d8f3-2995-4649-8242-36357880d740	1	Other	Other
+7ec353f4-dd28-43a8-bf6f-beaba6912693	1	Other	Other
+7ec35d79-ed60-4bf1-be80-c34faf437575	1	Other	Other
+7ec3a9db-a9bb-4755-a94b-8ebd147aeb6a	1	Other	Other
+7ec3c6a9-6e3e-4472-824e-3654aa0e20ea	1	Other	Other
+7ec3ea0e-4642-4b2b-9861-ba89c53cc57c	1	Other	Other
+7ec3ff4a-616d-4f2e-90fc-d349a2fededd	1	Other	Other
+7ec41181-b2e8-456a-9293-fe50c842fafd	1	Other	Other
+7ec458bc-5b00-4b8e-82cb-0e01528989ee	1	Other	Other
+7ec45cba-f512-43bf-b692-25bdd4bf72da	1	Other	Other
+7ec46dce-4460-4ab5-b31d-4b8393ba69ee	1	Other	Other
+7ec4e1c7-409a-4068-8519-bf33f507bd2f	1	Other	Other
+7ec51d6a-1821-4267-b243-1f291d8be165	1	\N	Other
+7ec57c2d-4cbc-4439-b30d-17fdeb60391b	1	Other	Other
+7ec58413-c0b1-4062-957a-b5d1bb34d12c	1	Other	Other
+7ec59d3f-bdea-46f6-9bd1-981495d33177	1	Other	Other
+7ec5c417-43fc-48c0-a773-0497164ba8ec	1	Other	Other
+7ec5d31a-4b11-448e-a6d1-40d73edf5c16	1	Other	Other
+7ec5dd22-26b4-4ec4-b315-fe10b9c00bf7	1	Other	Other
+7ec5ef5e-967d-4667-aacb-d630a89eeb8a	1	James	Other
+7ec64258-0879-4fb1-87c2-b65539ad71ca	1	Other	Other
+7ec6626d-557b-4ea0-89e2-7b49c0bfaab3	1	Other	Other
+7ec68ace-20a2-4287-85b2-bc8fdeac0693	1	Other	Other
+7ec6a9ad-0345-40a4-9a5e-63519ece510a	1	\N	Other
+7ec70faa-d00c-4be3-9a79-eb10abd1e780	1	Other	Other
+7ec750e4-31aa-470e-a531-6fa3ecafe681	1	Other	Other
+7ec76669-b2a9-4ec0-a639-ef4e7d903df8	1	Other	Other
+7ec78303-7bff-4fb0-b459-55b050b75115	1	Other	Other
+7ec79bcf-fd53-4121-bb28-968e783ddd3b	1	Other	Other
+7ec7a574-217a-40c1-8d70-5a442ddc73c7	1	Other	Other
+7ec7c1dd-009d-4b09-a5a9-f4eeab5cafc6	1	Other	Other
+7ec7cb0e-1d61-40e1-9224-0a04917eb2f2	1	Other	Other
+7ec8c40a-e534-480d-8e67-7e120c37af00	1	Other	Other
+7ec8c79e-4f3a-4fb7-a769-6fbe95e2105b	1	Other	Other
+7ec9011c-dffa-4500-9ca8-bc15573b6774	1	\N	Other
+7ec91290-8177-4811-8010-54bf68c7be0e	1	Other	Other
+7ec91bd1-a3c0-4296-94b3-86d8cbb0a4a5	1	Other	Other
+7ec92caa-929e-4639-ba5c-3118a08a412d	1	Other	Other
+7ec98c57-1944-40d9-8f72-5a07771dc565	1	Other	Other
+7ec9c33b-ccd7-4994-a732-06546df3a92f	1	Other	Other
+7ec9c3e1-3391-480c-9daf-f1146ede3ed1	1	Other	Other
+7eca144e-a54f-4313-a5d3-3dba75f58a03	1	\N	Other
+7eca2df4-67ea-449c-abe7-b0fe5dd23882	1	Other	Other
+7eca7d79-77ac-41d4-80c0-2704e0a4023b	1	Other	Other
+7eca8d61-7282-4823-9f90-00a4dcb0d5aa	1	Other	Other
+7eca92b0-6d13-4f77-aeed-6a45db132301	1	Other	Other
+7ecac055-86ef-4d32-aea8-591fd9fe7601	1	Other	Other
+7ecaf218-7fe1-4173-a018-ec65fa84d3e2	1	Other	Other
+7ecb02f6-40cd-43bb-a89d-5adc1379e7ba	1	Other	Other
+7ecb0f78-587c-46d8-865a-7b6e38bb6848	1	Other	Other
+7ecb2372-251f-4f2f-9f6c-687e397414fa	1	Other	Other
+7ecb2372-5b0c-4975-b98a-0210ecb79983	1	Other	Other
+7ecb288a-bd51-4794-a36a-c6ad4610c60a	1	Other	Other
+7ecb2acb-f3a9-4b42-aacd-919d9be1b60b	1	Other	Other
+7ecb2d5c-1176-43dc-aa4c-10bd0faee031	1	Other	Other
+7ecb331a-91bb-49ee-9ed7-b160397cb2f9	1	Other	Other
+7ecbad23-fd00-4d8f-9f02-b341b36e7b15	1	Other	Other
+7ecc104d-ca7c-45eb-9dfb-aa125f6e2eb5	1	Other	Other
+7ecc392f-8638-4d83-8897-c90d19edec77	1	Other	Other
+7ecc7d46-3f58-45bf-8714-a96b625d7b6d	1	Other	Other
+7eccaf32-70b6-4ac4-8196-c9a488710164	1	Other	Other
+7eccee53-f775-453c-ba92-c9e82d5d3439	1	Other	Other
+7ecd31a2-c120-4cbf-959e-88bc2de06afd	1	Other	Other
+7ecd3f36-d619-43aa-8598-d6949836d652	1	Other	Other
+7ecd469f-d06a-4015-b575-93c7415b6c0b	1	Other	Other
+7ecd709e-f93f-4c1d-b4db-7e399549ec04	1	Other	Other
+7ecda25c-3f56-42f6-9a6e-d757dc96e958	1	\N	Other
+7ecda983-2edd-4995-a2ab-c0ee70897f8f	1	Other	Other
+7ecde6a6-bc6a-4440-bb49-2cfab894f1e2	1	Other	Other
+7ece1315-e33d-4f5c-91a4-d57f5e9f76c2	1	Other	Other
+7ece3bd5-caf0-4c9f-aa75-94e9a1629911	1	Other	Other
+7ece4075-bb15-49c6-bf3a-3915e2d5b560	1	Other	Other
+7ece6ff1-1bb1-4541-a90f-5eefe6ae6ee0	1	Other	Other
+7ecec3ce-ea21-42bb-912e-fe889c81dc01	1	Other	Other
+7ecf0061-1b8a-44bd-b537-910afc0814ae	1	Other	Other
+7ecf59f6-0138-42a4-bd55-2938c95aa33d	1	Other	Other
+7ecf7df7-4f94-4564-bd62-4c6bdc1a724d	1	\N	Other
+7ecf94c3-8956-4c54-ab2a-ee10b057ae62	1	Other	Other
+7ecfd63e-e876-4388-bee4-b12841cb0617	1	\N	Other
+7ecfeb62-8f37-465a-8fdf-fae746e9f863	1	James	Other
+7ecfec72-5f17-4699-bfa1-2d4fbef14847	1	Other	Other
+7ed00d25-1670-4a5b-8b03-89efcafc0589	1	Other	Other
+7ed0209e-afc6-4f3d-a449-bc796836a44e	1	Other	Other
+7ed080f3-0667-4a16-8281-5b831666d872	1	James	Other
+7ed0b1a4-b340-4a32-b55a-147e4954ab3f	1	Other	Other
+7ed0c555-b0c8-4b5c-81fe-cd9d1a3b7124	1	Other	Other
+7ed0f436-732d-4cbd-bdb6-e5e6f02fa752	1	Other	Other
+7ed13545-9682-4a78-b161-5b1d33f1eae4	1	Other	Other
+7ed13b0a-db86-4275-b609-a60eca98c310	1	Other	Other
+7ed15f05-64ca-4575-8c2e-5f093116560a	1	Other	Other
+7ed17dc8-547f-451b-906e-abe45a627374	1	Other	Other
+7ed1b93c-afe4-4fc1-9135-9edaa61c467a	1	Other	Other
+7ed1bd90-85e9-4f26-99ba-c682f80d6827	1	\N	Other
+7ed1cd02-172a-4bf2-8ecd-d34f453be913	1	Other	Other
+7ed230c2-5af3-429a-a0ca-c4b49f07c665	1	Other	Other
+7ed27902-5eb3-4405-9619-d4b30c4a48bd	1	Other	Other
+7ed2ecb0-6f1b-48a7-889e-5bacb43d3aea	1	Other	Other
+7ed3ad34-8b68-45d9-ab4f-a199d40decb7	1	Other	Other
+7ed3f2f2-8485-449d-84db-b6199f4a8c28	1	Other	Other
+7ed400a4-bf94-43cb-aa96-8b8d98e188c6	1	Other	Other
+7ed42a06-1f72-49b6-acb5-cc1f7c9bfc38	1	Other	Other
+7ed46aea-04be-4147-b6f0-59e42f91e535	1	Other	Other
+7ed4e551-8f41-4b7d-9d6a-02ff551f35dc	1	Other	Other
+7ed59436-a6f1-43d7-84c3-4bdd81dcc291	1	Other	Other
+7ed5d5d9-da05-4099-b6b7-8005d0e9f5e0	1	Other	Other
+7ed6053d-0c45-4e0a-b528-901b37cdf0b1	1	Other	Other
+7ed63469-65ba-441d-84d6-ed92d8d48c70	1	Other	Other
+7ed65308-fffd-4f9a-b476-f8cd7d4f0e1b	1	Other	Other
+7ed67e4c-e731-435f-ab9d-2caee0125f05	1	Other	Other
+7ed6b4bb-71a1-41e6-aa2f-7d58491c6216	1	Other	Other
+7ed6d436-c2ee-4776-9e01-08a08f9ab0f3	1	Other	Other
+7ed71476-8a8e-4509-8558-4031168cb60b	1	Other	Other
+7ed73966-792d-4ddc-a59e-78f9ae912d95	1	Other	Other
+7ed74bf7-3bb6-4d8c-895f-a54377bb9ddd	1	\N	Other
+7ed76c7a-43ae-4535-bdeb-c49827cc6b75	1	Other	Other
+7ed77e7d-7b77-457b-9c46-2cfd32492904	1	Other	Other
+7ed78338-042c-46cb-ac54-d630fd613398	1	Other	Other
+7ed7b4db-067a-4ad4-9dcb-32d9bff36ba8	1	Other	Other
+7ed7c5b6-8692-417d-8cbf-1b6074ffedb8	1	Other	Other
+7ed823d3-467f-45c8-a22c-12d1b1a8f473	1	\N	Other
+7ed86c6e-93df-4e45-b354-12a696627818	1	Other	Other
+7ed8b83b-cc25-4023-813a-0c28c40f2220	1	Other	Other
+7ed8d8b6-3391-4321-9e4a-60eb71bfac28	1	Other	Other
+7ed8dd0c-d43f-461a-b738-f51a90ecf541	1	Other	Other
+7ed92015-babc-46ec-a2fc-81930980bbdf	1	Other	Other
+7ed92315-e6ce-42f4-9e48-30e68890ec4e	1	Other	Other
+7ed92fb1-2608-4d6e-a201-568de9f5139b	1	Other	Other
+7ed99c78-80c8-4688-a8f5-ae17a5b42633	1	\N	Other
+7ed9d2fa-8ecd-41c6-98fd-5441580427dd	1	Other	Other
+7ed9f799-e54e-45bf-85ab-849ba09a977b	1	Other	Other
+7eda1180-aab6-4e24-8743-b411d00496d7	1	Other	Other
+7eda198c-c181-440a-84d7-289224c28bd8	1	Other	Other
+7eda444b-a04c-4d58-8839-ea457174ae55	1	Other	Other
+7eda7101-5d9a-40e5-b8e1-af8fc50030f3	1	Other	Other
+7edadd47-ae9c-45bf-967a-242e92bcb7fe	1	Other	Other
+7edaf784-991b-471b-a6a2-cd7413140417	1	Other	Other
+7edb1fbc-ca1e-4b90-b3f0-860321302586	1	Other	Other
+7edbbe0a-bfaf-44b4-bcd3-16f5bce3d3ea	1	Other	Other
+7edc42a6-2ded-4885-8341-9212c9691b92	1	Other	Other
+7edc5097-4496-4e18-97db-e2b769daf257	1	\N	Other
+7edc5be3-6383-4a4e-a68d-89ae8ea5c7e6	1	Other	Other
+7edc5cf9-261d-4a04-8841-110ed3d1bc58	1	Other	Other
+7edcb771-00ee-4a8b-9cb4-dacef5e28494	1	Other	Other
+7edcc589-e5ba-458b-9e4c-cef88b6573ab	1	Other	Other
+7edd4173-02a4-4566-baae-b3f6234dd619	1	Other	Other
+7edd5f76-976f-4904-9f2b-840899a5424c	1	Other	Other
+7edd7dd4-ef0c-4c19-b25e-64671b51c1e3	1	Other	Other
+7eddd0db-c7b7-431b-8512-e8e529d038aa	1	Other	Other
+7eddddcd-13dc-4276-a3dc-1d58e449e91c	1	Other	Other
+7edde950-e86d-4171-8d93-4af339e2e7ea	1	Other	Other
+7eddfdd1-7ba6-4f21-b699-414b29ae2f80	1	Other	Other
+7ede272b-c6cb-4074-bbe0-7f65fdd09b03	1	\N	Other
+7edef090-671e-415a-85de-50e23dba4999	1	Other	Other
+7edf15bf-6ddd-4c3f-bd13-3b3684785869	1	James	Other
+7edf6025-133a-44d5-85ab-c1bb27511e24	1	Other	Other
+7edf9ca0-6ddd-4072-b442-ceb39eced573	1	Other	Other
+7edfa06e-9791-4480-ac5c-74a204e5690e	1	Other	Other
+7edfe046-6223-490b-b176-0673426760d3	1	Other	Other
+7ee00444-2c2e-11e8-b6e7-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+7ee03427-5894-4892-a40c-1aa5d08b3d84	1	Other	Other
+7ee06c17-396d-4851-b740-a305ba0873f6	1	Other	Other
+7ee07d07-703e-4e29-ad03-420d347ecb10	1	Other	Other
+7ee084af-456c-420b-9c56-143caf39159a	1	Other	Other
+7ee09415-27ac-4fcc-bcd2-0318e4488204	1	Other	Other
+7ee174d2-83a8-45df-8c73-e9c827dc01ca	1	Other	Other
+7ee17d57-feda-4591-bded-2d6dbdd708dd	1	Other	Other
+7ee1d8e9-a420-4aed-9c75-8b4a36e379b9	1	Other	Other
+7ee205b8-ed76-4f01-91e9-1d96340b2b60	1	Other	Other
+7ee2180b-0270-446d-8693-20d46bb80548	1	Other	Other
+7ee242d9-aab5-4685-a262-393509cfcad0	1	Other	Other
+7ee24ea0-51e6-4274-87c7-94eec279f7ce	1	Other	Other
+7ee2654e-d754-4c0a-9a1c-5fcf80373863	1	Other	Other
+7ee2d6a3-d6f7-4708-a64f-3ad426f719f0	1	Other	Other
+7ee2f305-f60e-408e-a2f8-18f30676ffad	1	Other	Other
+7ee2fb9c-43a8-4798-9757-ee50e4d33067	1	Other	Other
+7ee3070b-eec8-4ec2-ba6b-932264a49f8b	1	Other	Other
+7ee31caf-3092-46a1-876f-cfd7e9df29a8	1	Other	Other
+7ee39a6b-1027-4440-aaf2-089746a777ba	1	\N	Other
+7ee3f3b0-905e-40ab-922f-90e031270680	1	Other	Other
+7ee4465a-cca9-4410-9926-a62f79ef1d60	1	Other	Other
+7ee45a17-a518-4b25-9cd3-fdc4e38c43dd	1	Other	Other
+7ee4a2be-b919-4811-b9dd-a0d4f876e5c6	1	Other	Other
+7ee4c296-7a8a-48b2-ad39-516b618c802e	1	\N	Other
+7ee4e1d7-7645-41ca-9dc2-86c8dfcec91b	1	\N	Other
+7ee4e9e6-519a-42ac-bfc1-0a6dfb3268f2	1	Other	Other
+7ee4f6d5-6fa7-4f9d-8aed-85e15baa4f35	1	Other	Other
+7ee522f7-4824-48d2-9c64-2fa230137fd6	1	Other	Other
+7ee532c9-8f71-4c92-b4f7-2f261a9cfa97	1	Other	Other
+7ee59cae-1e0f-46bc-9331-1ddb92455e0e	1	Other	Other
+7ee5bfda-d440-4e57-b9ab-18293a7520a2	1	Other	Other
+7ee5c47c-1d60-4274-ad4d-3dabb6b3b0f8	1	Other	Other
+7ee619ed-2979-4f6f-8c13-076834738510	1	Other	Other
+7ee64a44-e3a6-4acd-8efb-d7b9cfb33cdd	1	Other	Other
+7ee68cdc-11f9-43e9-bc85-29475cf7f1bd	1	Other	Other
+7ee6c6b1-2dc8-4c6a-a9a4-f5a94659fddd	1	Other	Other
+7ee6fda8-4143-423a-91d1-579351021735	1	Other	Other
+7ee7102e-b894-4b08-aecd-7e75e7b5ae77	1	Other	Other
+7ee71d9e-ad14-4919-9ae1-5c1d72f013e0	1	James	Other
+7ee72a3c-a868-49b4-9ff3-ccc117ab2ab9	1	Other	Other
+7ee74fba-526a-42e2-a08f-e038faf055dc	1	Other	Other
+7ee752cf-cb9a-41f3-89b6-1dda5d161935	1	Other	Other
+7ee768d2-e23d-4758-8b01-ef17a260cc1a	1	Other	Other
+7ee78e9c-2a02-44d5-912f-c419eb710c09	1	Other	Other
+7ee792f1-aa4b-479f-b0ae-cc859182507e	1	Other	Other
+7ee79845-0527-4ed1-866f-bbde847108d1	1	Other	Other
+7ee7b345-df9f-4e63-896a-c7ad83c5b2bd	1	Other	Other
+7ee7df04-ee18-4f45-a42e-b5ad712a3604	1	Other	Other
+7ee7fa23-c035-4c81-bfd0-56f73a292fce	1	Other	Other
+7ee87433-eb93-43fe-8f20-eedf51f858c3	1	Other	Other
+7ee89239-03cd-4c04-97ee-63293186cd76	1	Other	Other
+7ee8c414-be6e-4f8c-8737-adb3f082ed98	1	Other	Other
+7ee8df24-2f45-4986-8242-ce3c531bbcd8	1	\N	Other
+7ee8e5d8-7eb5-492b-9ab2-d8723cff6074	1	Other	Other
+7ee9158d-71ab-4ab9-b10b-12d2e8137e62	1	Other	Other
+7ee92283-d61e-4022-a9f7-5291bba4876b	1	Other	Other
+7ee926fc-9dd2-4005-8e43-95897a54ef81	1	Other	Other
+7ee9cfba-5c99-4dfb-95d7-c3c75edf9490	1	Other	Other
+7ee9e279-7d8a-40f1-b1fa-f7b2cff1e40c	1	James	Other
+7ee9fdfa-ec17-407b-a3d7-3c42d01cdb42	1	Other	Other
+7eea7428-9ce1-4181-a0aa-4f69e32d9e92	1	Other	Other
+7eea9e64-b1a3-48c5-8396-826c176a3285	1	Other	Other
+7eeaa9f7-171f-485e-97c4-4f47676849a8	1	Other	Other
+7eeaad48-8b90-49ef-b45e-2120d80f1abc	1	Other	Other
+7eeab6fb-3fea-45a9-bddb-a949e07f34f0	1	Other	Other
+7eeabfc7-0e65-4944-9a11-61f2f43c6e7a	1	\N	Other
+7eeae3e2-eea6-46d4-950d-b6738e36e5cb	1	Other	Other
+7eeae76a-d2d2-4b9e-a9ba-1b8081fbbcdb	1	Other	Other
+7eeb2226-fcf8-11e7-b398-fa163e8624cc	1	Other	Other
+7eeb2326-d308-4e55-9d19-3af7a369d136	1	Other	Other
+7eeb4b2f-cc9d-4c00-ba44-c8b0131d046a	1	Other	Other
+7eeb5a2a-9e5a-42bc-bcc8-049e16b948be	1	Other	Other
+7eeb8512-2c69-440a-9766-3da7d034c663	1	Other	Other
+7eeb91a4-4f30-4609-bb54-49147c99feb4	1	Other	Other
+7eebaedf-6da1-4ed8-bb1b-b3b1d5fd1823	1	Other	Other
+7eebbbd8-8662-4194-a978-3eca88edb76e	1	Other	Other
+7eebd523-0d5e-4dc7-95de-31c6efa573a6	1	\N	Other
+7eec02d0-407d-4fbb-af03-c28986851a76	1	Other	Other
+7eec1c1a-cd46-4ec7-ba24-725ec295d4b5	1	Other	Other
+7eec8fc4-2080-4c06-b9c4-3a6cde199982	1	Other	Other
+7eecce93-13ab-423b-8184-89ac4ed8bf79	1	Other	Other
+7eecfc01-b427-441c-8b8b-ca53fe672613	1	Other	Other
+7eed12c3-e836-49d6-bcdb-2580b597006a	1	Other	Other
+7eed4397-97d0-4c7d-a40c-56e02ad86786	1	Other	Other
+7eee4c23-287d-4dc7-917a-9a08d9b9a153	1	Other	Other
+7eee51a1-6e08-4eba-966f-00a4ac531e6e	1	Other	Other
+7eeeae53-6786-487d-99c5-94af3b7794f2	1	Other	Other
+7eeed4f3-2365-422e-8948-c76f94c9a619	1	Other	Other
+7eeeec74-5a06-46cf-a835-6031a984381f	1	Other	Other
+7eef2102-b339-4aae-ab92-96ea3f4df599	1	Other	Other
+7eef2325-3e06-476c-9e9e-35dd05463cbc	1	Other	Other
+7eef5cf8-48a0-44a7-8b85-8b169dd3b822	1	Other	Other
+7eef68bc-c7e5-47ad-a7c7-aaf83407d86f	1	Other	Other
+7eef9ad4-b2d2-4412-997d-de1ecd8fcd88	1	Other	Other
+7eefacc9-0266-4727-b7e3-771157407779	1	Other	Other
+7eefd9a0-0622-4b7c-9c88-ac911ff28022	1	Other	Other
+7ef05748-8fcc-4423-97c3-60ef98524e60	1	\N	Other
+7ef05a4c-2833-44b8-a2d4-592f98f19ee2	1	Other	Other
+7ef0a567-c01f-4eb4-a0c2-e2ed68b79142	1	Other	Other
+7ef0b3ba-59cf-4a8c-b195-81911febb9ac	1	Other	Other
+7ef151a9-b377-4ee1-b38a-09749da51f65	1	Other	Other
+7ef17204-478d-4e90-925b-d9bea7179ef0	1	Other	Other
+7ef173bc-ff02-4807-92a8-1960c5112d6e	1	James	Other
+7ef1b4b6-ad0b-4893-be5e-6121347cca6f	1	James	Other
+7ef1d281-d4e8-46e3-b8a3-578bc82c33a3	1	Other	Other
+7ef1d4c4-2030-4df0-b4fd-b53515507e4a	1	Other	Other
+7ef1e331-0ae4-4d82-978c-61a575770bd2	1	Other	Other
+7ef1e381-37ee-431e-97f2-97b2824d4d49	1	Other	Other
+7ef1ee78-b64e-405d-8bf9-335127d80b93	1	Other	Other
+7ef21cdd-ceb9-4d05-a367-a53f3c0822ec	1	Other	Other
+7ef24cc9-ed76-49ea-a448-92b3027d9d1b	1	Other	Other
+7ef251ba-6f40-4762-b084-36f3ff0102a6	1	Other	Other
+7ef2aea4-64b8-49e3-82c9-6e7a8449f52d	1	Other	Other
+7ef32189-2227-4ba7-80db-ad6216317f16	1	Other	Other
+7ef38695-ecdf-42eb-a84b-5e68b77526f7	1	Other	Other
+7ef4ac37-f7e2-48f6-9b18-0788a0d9b4c2	1	Other	Other
+7ef4eeaa-55e8-4cd6-b198-1f7808d68642	1	Other	Other
+7ef57c66-464c-49f7-b9fc-b30b62f732b3	1	Other	Other
+7ef59bb2-bc6d-40e8-baef-a8bf4104c643	1	Other	Other
+7ef64e31-3a4b-490d-9e09-7a179ef56e1f	1	Other	Other
+7ef6581e-257d-473c-be75-e46242147103	1	Other	Other
+7ef66c7f-e726-4337-a836-2fb78b026018	1	Other	Other
+7ef67b56-d69f-454f-bad2-50ad3d2774a5	1	Other	Other
+7ef680fc-0174-45f4-a3a0-c2ec798eb3ec	1	Other	Other
+7ef6e5ef-c145-41af-9333-7f369b820075	1	Other	Other
+7ef7019e-43ad-46b3-807b-930a69fa99f2	1	Other	Other
+7ef727d9-44da-4bca-923e-4e9537d7a7a5	1	Other	Other
+7ef73db4-1d96-4b61-aca3-e039d9d5f8d1	1	Other	Other
+7ef7ca06-750e-4672-83ad-5de4f097e366	1	Other	Other
+7ef7d821-5671-43e5-981a-6ff2c7f1cbd7	1	Other	Other
+7ef81a05-4c3f-43f8-8a5a-2ea808f5ec1e	1	James	Other
+7ef831b6-ecd6-4ddc-889f-e87065ce2ddf	1	Other	Other
+7ef872ac-673f-48a5-9163-45fcf5f02350	1	Other	Other
+7ef8e11f-7f1c-4918-8c46-4c6af2dbedeb	1	Other	Other
+7ef8f0cc-2d74-4e77-91ef-6978e6a92430	1	Other	Other
+7ef9e138-7afa-4dc1-9e2d-48a46e71adf4	1	Other	Other
+7efa19eb-b8f7-4f74-96df-96f5bb68f079	1	Other	Other
+7efa9746-96d6-4114-a291-f30bf1051f51	1	Other	Other
+7efb1cd3-ff01-45c8-84e0-55e4e12f854d	1	Other	Other
+7efb4f53-7cb4-4025-86d5-fbe415d524c6	1	Other	Other
+7efb62ce-da9a-46d3-a054-e73c072ad32b	1	Other	Other
+7efb859b-b481-45cb-a795-a43a205e0067	1	Other	Other
+7efb8c02-26da-4d72-8977-ef5865991e04	1	Other	Other
+7efba905-f10c-41c9-a86a-1cdf9e8978c8	1	Other	Other
+7efbce3d-e65b-4757-879f-30a536fc32f0	1	Other	Other
+7efbdf3b-27e0-4930-b441-8f1c1016b7ea	1	Other	Other
+7efbff4a-7472-4d72-9133-9d8ef69dfbee	1	Other	Other
+7efc1564-1d60-4348-aa7a-6cb8ec51688b	1	Other	Other
+7efc390d-e62f-45ab-840e-e69243cff09c	1	Other	Other
+7efc4ec7-6d74-4536-9ec1-2c44ee5a85ff	1	Other	Other
+7efc6fa0-5603-4406-8c3a-4cbc47b06da7	1	Other	Other
+7efccd39-3197-43b8-97d2-63195eca8f37	1	\N	Other
+7efcd218-75cc-435a-8931-a3ee9465fef8	1	Other	Other
+7efce2e2-454c-4b0e-a010-4e33e13761a5	1	Other	Other
+7efd1294-0672-484e-8de4-67ad5bbe2890	1	Other	Other
+7efd1a2f-3a77-4f86-9ec8-f6e7dfdd7d45	1	Other	Other
+7efd5e94-d8b3-4c8d-b21e-c3abb8e27f5a	1	Other	Other
+7efda57d-0459-480b-93fb-ba28406d9727	1	Other	Other
+7efda9e9-83c7-4a37-b86a-557cd362b689	1	Other	Other
+7efdb877-0737-4ed8-aa6b-779d09301d3a	1	Other	Other
+7efded47-31c1-4510-acf5-a7094f2eff0c	1	Other	Other
+7efe1790-31f1-4bbe-8796-e4709375ae39	1	Other	Other
+7efe229b-e21e-4f3a-84a0-9f91e7a5e08b	1	Other	Other
+7efe891a-aa7c-42e3-a4d1-5a6e9edec6bc	1	Other	Other
+7efe8d62-faa2-470a-bcdb-37465339fe3d	1	Other	Other
+7efe99f7-5801-4e86-b711-1547cd99f91d	1	\N	Other
+7efea66e-5447-4813-8517-05a4ab1c1634	1	Other	Other
+7efecbee-c396-48d8-bd64-8eaabe1a7403	1	Other	Other
+7efef94e-7775-44fa-98fe-7daa5eff64f5	1	Other	Other
+7eff15bf-cda4-4c33-b69e-5e272fb6b62f	1	Other	Other
+7eff6d22-bc66-4c65-9fb1-9a0cecd67edb	1	Other	Other
+7effabd4-fbe0-4e53-a596-24f4ce06d6b8	1	Other	Other
+7effbdb4-aa09-42c2-9bad-12b4f7b34665	1	Other	Other
+7f00740e-b953-44b3-b2da-552c9fccddef	1	Other	Other
+7f00a30e-1418-416d-8d1f-8dd0d1a20c26	1	Other	Other
+7f00a4fd-f97c-44dc-9355-053ec2af24c2	1	Other	Other
+7f00d880-7b76-440b-8fd7-092257dd4b26	1	\N	Other
+7f0109ff-8344-4bf2-a958-562f9fc938b8	1	Other	Other
+7f013e4a-b183-4214-93b1-0a2cfed101e0	1	Other	Other
+7f017027-aa6b-4407-b3ba-933264376530	1	Other	Other
+7f0184af-6ad0-4fd8-b710-7039ef91de4c	1	Other	Other
+7f018d9a-b0b4-42b4-a5b2-aad50baedb81	1	Other	Other
+7f019009-9fb0-4508-99bd-d4e78f02615b	1	Other	Other
+7f01919b-ff17-466f-b4a6-59ac433fb22b	1	Other	Other
+7f0196f5-e5a3-4d93-9a3e-96bcebb65fd5	1	Other	Other
+7f019ff6-0f1e-46b4-9e04-ae592fdaba6a	1	Other	Other
+7f01fd34-684d-4813-9ec5-79b29143be79	1	Other	Other
+7f01febb-4fc6-4bd7-8636-62b042a723eb	1	Other	Other
+7f024e9d-8fa8-4053-9d59-fd43881d7ed0	1	Other	Other
+7f02538b-1835-49ea-8255-a4bf01af702d	1	Other	Other
+7f026e44-7299-4907-9a6e-81fdfa60eef3	1	Other	Other
+7f029579-a2b3-41a5-9a97-fb3b94fdc1fa	1	Other	Other
+7f02d8a8-f36e-4a07-b1a0-5a34303fc2e0	1	Other	Other
+7f02df45-c81e-4b43-a667-95044d630a0a	1	Other	Other
+7f02e23c-c02c-446f-a655-b9f33acf29f0	1	Other	Other
+7f034f38-b0bd-478a-b26d-eb1412d028da	1	\N	Other
+7f03e41b-ea0d-4b05-82bb-9b3f1e618926	1	Other	Other
+7f044a31-6ca0-4818-b880-1d964447db6e	1	Other	Other
+7f04a3e9-4b86-42b0-b500-1545fd8f97d4	1	Other	Other
+7f04a6f1-906c-4140-9928-38cd8f7162a2	1	Other	Other
+7f04aedc-a882-473c-877f-afb5ab5d8f38	1	Other	Other
+7f04d154-dacc-4a01-8112-29204b2cd8da	1	Other	Other
+7f04d9bf-6874-4ec4-b107-89af48743fec	1	Other	Other
+7f04e88a-7031-493c-9947-abc7d316beab	1	Other	Other
+7f0515f5-e44e-4b14-908f-ed2bd8f2c9c0	1	\N	Other
+7f053035-cb1f-4833-b870-5b0aaba3735f	1	Other	Other
+7f054fe2-8350-4296-aec3-fd8e3010caf8	1	Other	Other
+7f0598c1-bfe1-4050-ba32-37975fbf2a81	1	Other	Other
+7f05d987-01db-4ed3-b316-85c56466808f	1	Other	Other
+7f05db51-20fa-441a-a05b-3c91db6a80ba	1	Other	Other
+7f060891-0495-42fe-a5c2-8f00fab35a32	1	\N	Other
+7f0674e1-d32b-403d-baa7-23447755148d	1	Other	Other
+7f0679dc-2cd8-4213-b6c8-86109cf70685	1	James	Other
+7f068728-3183-4995-b926-0132b463580f	1	Other	Other
+7f069775-4fa3-4143-b634-1a17fc1c7ae7	1	Other	Other
+7f069b20-218c-465f-bdb9-72033f57c460	1	Other	Other
+7f06b087-a6e5-4859-86ff-cc7b68f91d29	1	Other	Other
+7f06ede3-ed4b-4524-ac93-67f5935a861b	1	Other	Other
+7f071734-0f82-4864-9197-7970039c7158	1	Other	Other
+7f0748b7-4168-4620-be21-7cae7ffa54ab	1	Other	Other
+7f07787a-e0fe-471c-ba2e-50b605a380d5	1	Other	Other
+7f077f98-a732-482d-be3c-d395a90b4775	1	Other	Other
+7f07abff-7896-4dee-b4cb-38670b28ec21	1	Other	Other
+7f07df3f-8e2c-4849-87b2-1ca0866f3284	1	Other	Other
+7f0859cc-7bc4-4569-ada6-d8859c3dbc5a	1	Other	Other
+7f0862c8-2ccd-4603-bec7-9ad10a5e131c	1	Other	Other
+7f088aa9-7f65-4118-a01f-82147815db49	1	Other	Other
+7f090879-8ff0-4675-a528-c0e691af9787	1	Other	Other
+7f09fc61-7ad9-4498-8d25-8975371c1537	1	Other	Other
+7f0a1279-d74b-476b-bdf1-65a59a06cb5c	1	Other	Other
+7f0a9558-3896-4b43-9157-7ded402821b5	1	Other	Other
+7f0ad022-eca5-4a7f-b578-bea47ed26538	1	Other	Other
+7f0ad412-0f49-47fc-ad70-b0550a9762f7	1	Other	Other
+7f0ae4b2-5c93-4ce8-b258-1e79beabcf28	1	Other	Other
+7f0b1235-d054-4945-a4e0-8e166fd0bcf3	1	Other	Other
+7f0b5a6b-befb-48b7-9050-90b1c6295728	1	Other	Other
+7f0b717d-140e-4ba7-bd1d-bde7d093290d	1	Other	Other
+7f0b78bd-50b3-45e6-bc49-c59585b4ae4e	1	Other	Other
+7f0c7604-3643-4e20-ae32-2ef2a55e9afa	1	James	Other
+7f0d8367-8714-4ac9-9191-14ba9d51dc08	1	Other	Other
+7f0d96e6-210f-499b-8e08-2d3ead53a7b9	1	Other	Other
+7f0e6ed4-a833-4f12-a230-e663f330e219	1	Other	Other
+7f0e7e66-518e-48e7-a66b-ef9545a87e30	1	Other	Other
+7f0e87f0-1bfa-4326-8c0a-491e2725db04	1	Other	Other
+7f0eb07f-e91a-4e92-8676-cc2337eb9bc2	1	Other	Other
+7f0f43bb-c2d3-4f88-9dc2-169d1edda545	1	Other	Other
+7f0f4897-c8e7-4002-b79c-165def25cb2d	1	Other	Other
+7f0f8f50-de56-11e7-a6ff-fa163e8624cc	1	Other	Other
+7f0fa9f4-62fd-4f8a-b29f-977525e557d6	1	Other	Other
+7f105c58-0bf2-48c0-acf7-6878470259d2	1	Other	Other
+7f10722e-322e-4b19-8d6c-65285344864e	1	Other	Other
+7f10b75e-2c89-437b-b20b-687954304388	1	Other	Other
+7f117719-39eb-44e1-8c38-9b7717c4ccd2	1	Other	Other
+7f11c352-9fb4-4e8d-8cee-5245b08a438f	1	Other	Other
+7f1228a2-99ab-4dc7-ab4f-b8a58262553f	1	Other	Other
+7f12fb2e-63a5-4705-8b2a-3c105bd5145b	1	Other	Other
+7f1345fb-5d61-4d13-9097-d9c656e95ce9	1	Other	Other
+7f136b7c-07c2-40ab-8cef-f2d2fada5546	1	Other	Other
+7f138b14-4a46-410c-b43b-2d78f53fb00e	1	Other	Other
+7f139080-0c97-4715-b602-1a0dde1a132d	1	Other	Other
+7f13e18e-fb0f-4ba0-9fbd-5c26cc7c2157	1	James	Other
+7f14226e-e117-4397-9470-f4546db3ce10	1	Other	Other
+7f1432c3-8a87-4173-80e5-1d5b2b1fd695	1	Other	Other
+7f149eae-5c34-4441-b8cd-b53b246ac142	1	Other	Other
+7f14c553-6387-44a0-8508-f75f97a1b8e3	1	Other	Other
+7f14e8c3-2726-4cc0-bdd2-bf594ed4bfd3	1	\N	Other
+7f1514b9-fdb1-48ff-89d9-8fdba204dc29	1	Other	Other
+7f156ec8-bcbd-43e5-b4b5-bd52ab946074	1	Other	Other
+7f158cf1-8369-4b88-9c83-344a3915d19e	1	Other	Other
+7f15b4a1-24ba-4bee-b36a-5cd3e5ae3203	1	Other	Other
+7f15d6c3-6008-40e3-b44e-9bdb892cf2a5	1	James	Other
+7f161bc2-3b3e-4b7f-8139-3128a56e0d20	1	\N	Other
+7f163b79-46dd-4b33-84b8-d78cc2014dc5	1	Other	Other
+7f166c8e-c108-4456-abe0-f6f8cfe00c33	1	Other	Other
+7f169a5c-f077-4218-9ea2-283a37e0d652	1	Other	Other
+7f16cc58-22fb-4574-b2a3-027c3f40b543	1	Other	Other
+7f171750-a395-4e6a-b965-9060a358f5ae	1	Other	Other
+7f17436b-f88a-44dc-a473-5e9a135778ec	1	Other	Other
+7f17876f-e703-4c31-ad50-a856c69d791d	1	Other	Other
+7f17adcf-93ac-409b-a673-9fa07dbb2419	1	Other	Other
+7f17c160-fea4-4d0d-b789-5fb3d64ccde8	1	Other	Other
+7f180194-fa61-4aa2-a87b-a558da86bb60	1	Other	Other
+7f187891-4c4e-40fb-a533-5e6a97206495	1	Other	Other
+7f192a94-1e69-418f-be5e-2a617c88d007	1	Other	Other
+7f192fe8-21ed-41e1-9773-6bac57acac65	1	Other	Other
+7f1a1600-766f-40a3-81b6-a418096300ad	1	Other	Other
+7f1ab0f8-f613-4fee-9474-fdbcf0aa94a0	1	Other	Other
+7f1b0d82-844b-4fa2-8f64-9675e7ee14bd	1	Other	Other
+7f1b38cb-bf84-4242-9800-6bb5aa983c48	1	Other	Other
+7f1b62bb-5e44-4202-996c-8d583f93c134	1	Other	Other
+7f1b7e6b-39d6-4802-b96c-3abe18eaa0df	1	\N	Other
+7f1c22ec-76d8-4635-a0d0-71d083b1fa4d	1	Other	Other
+7f1c5c27-7e3c-4bae-820d-820e278cf177	1	Other	Other
+7f1c6e28-d793-4815-b970-df5e8cc6d728	1	Other	Other
+7f1c8285-a231-4295-bed8-4385d84c8088	1	Other	Other
+7f1cce2d-62f6-41b8-8394-cdffedf24912	1	Other	Other
+7f1cdea3-d043-4086-9591-08c3e9652320	1	Other	Other
+7f1cfbf9-4007-43b3-86d6-58755fc17115	1	Other	Other
+7f1d245e-dd21-4072-ac58-a92de2ded4a3	1	\N	Other
+7f1d9930-0d26-430b-8128-31ad333b46e3	1	Other	Other
+7f1dc3ad-c76b-4fb4-8f0c-b8e5f17eb135	1	Other	Other
+7f1dcb8a-d05a-4eff-ab4a-905992a2972f	1	\N	Other
+7f1e3bc6-f04b-495d-93bb-345edae03132	1	Other	Other
+7f1e429c-bf83-429c-9ebd-9e6e4a35d624	1	Other	Other
+7f1e66f9-66d5-4554-af6b-e727a5c6c61b	1	Other	Other
+7f1e67c9-c564-495e-85cb-7aff2f10f9f7	1	Other	Other
+7f1e69e3-4ff0-4852-9fa1-6e5eb2643d22	1	Other	Other
+7f1e80c7-48a9-4fe4-971d-35b8a957922f	1	Other	Other
+7f1ec77b-df40-4859-866c-f2170a559dc0	1	Other	Other
+7f1ecfe0-e74c-4d5b-a7ea-e33eafba10f1	1	Other	Other
+7f1ed3bd-1a8c-41e0-971b-f9817ae61114	1	Other	Other
+7f1ee780-70fd-4020-98ee-df47668539b3	1	James	Other
+7f1f631a-c41e-4df9-9acb-5662f7af5400	1	Other	Other
+7f1fe08d-263b-4ab1-a020-078740a34aa8	1	Other	Other
+7f200548-2511-40d4-9513-9d45a7e1fc58	1	Other	Other
+7f20f5de-109b-427e-b79b-c19fb1687f68	1	Other	Other
+7f2118fe-c57b-4949-88f2-b6569edab0c2	1	Other	Other
+7f21348f-bdde-4101-aa64-18b150231efd	1	Other	Other
+7f21aa61-a340-4107-aa05-ea118910314b	1	Other	Other
+7f21e5e1-fe8c-4ebb-9cde-bec4913819ea	1	Other	Other
+7f21f2b3-aaab-4adf-add2-e11e68ab6e64	1	Other	Other
+7f222e13-6cd5-4ef5-8810-bec06b43ad45	1	\N	Other
+7f2260c1-de7b-4be6-a909-3753c8c293a5	1	Other	Other
+7f22b3a1-ad3f-4897-9d4e-62146fc929e1	1	Other	Other
+7f230a3d-f394-4b2e-b7a0-1a880fa70226	1	Other	Other
+7f233855-27f7-4265-b7f0-c5f3b4023b3d	1	Other	Other
+7f234cfc-01f9-42c6-b23a-a497b894d26c	1	Other	Other
+7f23b346-480e-4b07-835c-6663c2508718	1	Other	Other
+7f23bedf-1141-45db-b086-1a12aeae9b66	1	Other	Other
+7f23bf69-2ef7-41ee-8c0d-402bf2d3723a	1	Other	Other
+7f23d91a-b460-44d9-b6f2-1446679e0fe6	1	Other	Other
+7f240326-f2cc-429e-b993-2202c875436d	1	Other	Other
+7f244531-4ba0-4472-b3d0-aff0819d91cb	1	Other	Other
+7f244d88-0b53-4ccd-a4f0-68aee9842ba3	1	Other	Other
+7f24638d-24a0-4416-b942-1f6890d6548a	1	Other	Other
+7f2464d4-9376-4977-93d7-20f843183c08	1	Other	Other
+7f248a4c-4a38-4b40-b373-3fc6bbcf7d3d	1	Other	Other
+7f249c96-7234-499d-baf4-dbcb0e3b9508	1	Other	Other
+7f24b054-8156-40de-b302-e3b1c1d6b669	1	Other	Other
+7f24f179-91fa-4743-b828-c7ceb3c4a222	1	Other	Other
+7f2530c6-f496-4047-9628-e6bcb6c9bc2d	1	Other	Other
+7f258e05-ee54-4c37-aa8c-4caf66343965	1	Other	Other
+7f25bef7-40dc-4481-bbf8-564fb563e95d	1	Other	Other
+7f25db50-740c-4b17-ae79-0277accf7111	1	Other	Other
+7f25de9a-7e5a-4fa5-9330-f3bcc58a2670	1	Other	Other
+7f25e47c-c1c4-4986-a32e-362f95e407f4	1	Other	Other
+7f25e965-5d74-4ee3-834b-39a8491a5238	1	Other	Other
+7f25f541-eb7a-4d1a-bcab-2f36a342109e	1	Other	Other
+7f2652be-020b-4a5b-9c61-ff7f00b57d1c	1	Other	Other
+7f266518-003f-4632-95dc-dc6addeeb83e	1	James	Other
+7f268575-f8f4-4670-81a2-59d741be6e26	1	Other	Other
+7f26c01c-e1bf-4518-b43c-8a9833aab753	1	Other	Other
+7f27b45b-9828-449f-a170-71183fd5a1f6	1	Other	Other
+7f284a03-ac0a-45b9-b94b-86096c848d79	1	\N	Other
+7f287146-ba1a-4036-b29e-cb3a63466398	1	Other	Other
+7f2918ad-2a7c-4cf5-a0ad-b07fb0e51f0f	1	Other	Other
+7f294595-421c-4b74-9785-6229b2dfe219	1	Other	Other
+7f298638-deb4-4c9e-bb26-71e9cb0498d7	1	Other	Other
+7f29e6a1-a06a-4ab6-9f7b-edf6c3ddd768	1	Other	Other
+7f2a03f2-2eff-414a-9479-7ccf682425cf	1	Other	Other
+7f2a1938-9a98-4d94-a8da-7a662be993ea	1	Other	Other
+7f2a67d2-3234-4c29-8ad4-27ea69f80997	1	Other	Other
+7f2a79c1-0178-4cb3-bd54-ee5e529efb03	1	Other	Other
+7f2ab20b-cb4f-4b45-a7d0-ff4953646e79	1	Other	Other
+7f2b7f1d-0169-4740-8037-c7000ae89bda	1	Other	Other
+7f2bc34e-0efb-4037-bad0-e654a29080ba	1	Other	Other
+7f2bfc57-acd1-4c2d-a5a8-474b23d2dc3d	1	Other	Other
+7f2c0445-129c-434d-bff2-61f5d9ef582d	1	Other	Other
+7f2c9f06-eb61-4907-b413-1367ac1cee76	1	Other	Other
+7f2ca2f7-e3c2-4510-8ea0-1b80f8389e68	1	Other	Other
+7f2cbe8d-7090-46ea-9432-60172e3deb6f	1	Other	Other
+7f2ce045-2eb5-41c1-8e0a-f2a280118cd2	1	Other	Other
+7f2ce099-a6d0-4d8b-88ab-b8f9b31b4ada	1	Other	Other
+7f2d177c-1ede-43eb-a341-0dee269fa2a3	1	Other	Other
+7f2d1e44-75a6-4c1f-941b-805afe4c0319	1	Other	Other
+7f2d27b4-f637-49d8-bae7-db2aeeb0f206	1	Other	Other
+7f2d4566-f9fc-470f-8968-8bc3b9d08e59	1	Other	Other
+7f2da751-cd6a-4005-a429-4fa599b0f935	1	Other	Other
+7f2db904-dc19-45e9-b65a-df5ee082b5ee	1	Other	Other
+7f2e4fef-a23e-4dab-bba1-dd2e1a87de98	1	\N	Other
+7f2e67c2-76b4-4d95-9410-529195e714b0	1	Other	Other
+7f2e8844-2fce-40cb-87c6-5cd6f066492d	1	Other	Other
+7f2ea05b-dd46-4ec9-8fd2-f451e54e6817	1	Other	Other
+7f2f0059-2ee8-4a77-b0fe-b4d3143d31c7	1	Other	Other
+7f2f1cb9-114b-49fa-9362-d5a33c16a9a5	1	Other	Other
+7f2f6db5-d6f4-425b-9079-7d1bf66b4d43	1	Other	Other
+7f2f9574-646a-47ad-a2db-7d9121e1485c	1	Other	Other
+7f2fd661-f353-4607-b601-831d0a354b2d	1	Other	Other
+7f2ff406-4d1a-44a0-af7f-a1d134276db9	1	Other	Other
+7f300f82-84ce-4157-8de6-a274742b5b14	1	Other	Other
+7f3024b6-cc73-4abf-b469-0eb1c3542bb4	1	Other	Other
+7f308bbd-b1e7-4248-959d-7bc4e9bb2d85	1	Other	Other
+7f30a1ad-c617-41b1-ae91-290b082ec14d	1	Other	Other
+7f30ba25-a207-41d2-a2c4-075c7ccd48f7	1	Other	Other
+7f30be61-7f95-426f-8369-6c5769114c59	1	Other	Other
+7f30be80-573a-46ab-aac8-78e55b638354	1	Other	Other
+7f3112fa-f3ad-42e2-afd0-591a6013d49c	1	Other	Other
+7f31248f-d600-4d49-b72c-9b98989066d6	1	Other	Other
+7f31c011-15e2-49d7-a9d1-ae9d18700f67	1	Other	Other
+7f31f841-9c02-4f05-989b-1e4cca22c408	1	Other	Other
+7f32259d-d547-4f50-9560-070c771081dd	1	Other	Other
+7f327858-0bd2-498b-83f2-9673a637d843	1	Other	Other
+7f32852e-4d56-41f2-8f95-89cba6009426	1	Other	Other
+7f330281-ff00-4b7f-931e-3931bce16818	1	Other	Other
+7f332866-2b4d-4503-a918-077924162b7f	1	Other	Other
+7f338151-a628-4772-8f03-028616f77736	1	Other	Other
+7f33a05e-b324-4c17-8431-838141ff1957	1	Other	Other
+7f33b54e-d765-449a-b82b-3ae2929ab646	1	\N	Other
+7f33c49b-cfd5-406c-a813-1e02291bdcc6	1	Other	Other
+7f33e925-0f25-48ee-b963-a77c616d5dd3	1	Other	Other
+7f3417a9-8f1a-43ab-b903-79a1329131a3	1	Other	Other
+7f347816-087c-400a-bd73-fd3b6eef77bb	1	Other	Other
+7f34aaef-4540-4966-9067-8676382b7ba4	1	Other	Other
+7f34c5bb-b83a-46d1-b369-73f5c5f8801b	1	Other	Other
+7f34c910-4374-4fa4-beb6-3fb6f11051d0	1	\N	Other
+7f34d673-cd40-4490-864f-d5ac2f9d5f7c	1	Other	Other
+7f365032-7e1d-412b-b0cf-6b0cde05e762	1	Other	Other
+7f3679c4-74d9-4a67-9e65-4710003d76ec	1	Other	Other
+7f369868-0e0a-421a-9ed1-fa10a6f1461d	1	Other	Other
+7f36c237-5767-42f4-b476-2928afa0d222	1	James	Other
+7f370acd-c7b8-4f35-8220-6f1a4c3e5892	1	Other	Other
+7f375eaa-f120-4ed9-ae2c-6b0f1a800b4e	1	Other	Other
+7f37d3f5-4505-4dfe-b326-7a500ab4224d	1	Other	Other
+7f37eee7-b34f-446b-a86d-442822236af5	1	Other	Other
+7f381d0e-465c-4b77-91a1-4e2235735527	1	Other	Other
+7f38b292-f484-4ee7-a69a-f731a70f0cdb	1	\N	Other
+7f38d28d-b1f2-415e-939a-d69e2d961c98	1	Other	Other
+7f38e8eb-2325-46b6-9399-549d510508d6	1	Other	Other
+7f38f1ab-b506-4f1a-ac27-a205805f0c66	1	James	Other
+7f3913f4-38c5-4d5a-9f32-8952d27f9f91	1	James	Other
+7f391ad7-0bea-44b3-a767-96653a29b690	1	Other	Other
+7f395469-acdd-4515-b740-a9ce3cca49f7	1	Other	Other
+7f3988a6-9e88-4c97-9f03-c65e3b24de86	1	Other	Other
+7f398d73-46f9-4879-b6af-1762315264b9	1	Other	Other
+7f3a0f90-11ed-49de-80ad-9b22c63d5fd4	1	Other	Other
+7f3a64ba-9808-4f6c-8f21-23a5af13fcc8	1	Other	Other
+7f3a765e-c02c-4d61-8423-4ee3cbc93513	1	Other	Other
+7f3add18-5711-4dc7-9142-b58f40b433a0	1	Other	Other
+7f3b072e-7046-43aa-819e-d1adb4a4f642	1	James	Other
+7f3b133b-673a-41dc-8b7f-aa514eb36cc6	1	Other	Other
+7f3b1891-637c-4ea8-802a-baf226560ede	1	Other	Other
+7f3b7b7b-d478-4ca4-867c-66323c33f9e7	1	Other	Other
+7f3be074-3eff-40b7-a7f9-a285aedf3dc8	1	Other	Other
+7f3c41b7-0772-4a30-8d03-5b7bce415d83	1	Other	Other
+7f3c46a7-f6c0-4595-be30-8d9951f4467a	1	Other	Other
+7f3c4fb9-0229-42f4-a465-2d4bd4675998	1	\N	Other
+7f3c9682-35f9-4d09-84c2-3cc387ad1865	1	Other	Other
+7f3c9800-a79b-4195-b921-57d14593cc49	1	Other	Other
+7f3ccfcb-c2d6-421f-ab72-466066b4ed60	1	Other	Other
+7f3cd401-6b6e-4c34-b91f-a9a873229fbd	1	Other	Other
+7f3d0e5f-8206-49aa-a99d-6dbf8f9680ca	1	Other	Other
+7f3d325d-533c-475e-88fd-1d3109ef07fc	1	Other	Other
+7f3d679c-14d4-4634-9eca-768e6c5d813d	1	Other	Other
+7f3d6869-ac34-4ad8-b20c-16fbd4621772	1	\N	Other
+7f3dffed-b43d-4dd5-b096-af28b3e21fb7	1	Other	Other
+7f3e34e6-12d9-49f2-bd6a-2789de35c6c8	1	Other	Other
+7f3e34e9-612c-4265-bf5a-a4b363eb5816	1	Other	Other
+7f3e4134-fba6-4b65-a473-d12f0c4bd9d6	1	Other	Other
+7f3e74c2-5889-4df7-87c0-0c9e7442227f	1	Other	Other
+7f3edae3-e377-475e-b1a1-1ca77f79cfe4	1	Other	Other
+7f3ede01-f27d-495e-a7c8-b5e4587d0f61	1	Other	Other
+7f3f7b80-dc72-4faf-95bc-5925fb56e9f5	1	Other	Other
+7f3f7db6-ed72-11e7-91b8-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7f3fd9c1-b6a0-4a78-ae1e-32c0ee49ecc1	1	Other	Other
+7f403872-812f-4d20-bec5-57de525bbcad	1	Other	Other
+7f404bc1-b7ac-4fa7-a929-59ec3ca26458	1	Other	Other
+7f405e4e-d521-4b68-90b3-fc2aff53b0bb	1	Other	Other
+7f40ff3e-4a8b-4cb7-b83c-1ad3c6c867dc	1	Other	Other
+7f411d6b-0ac1-418c-b850-e6595e5d9367	1	\N	Other
+7f41708e-e806-493a-94a7-24fb8ce0b060	1	Other	Other
+7f418e3d-6868-4b6b-bc8b-79f7908b98a6	1	Other	Other
+7f41aa4b-7a92-4d1b-83fd-e316900e5b8f	1	Other	Other
+7f41ea59-d534-4e29-bade-a4153e79117c	1	\N	Other
+7f41eb27-fbc2-4fb1-a21c-856b5db3299e	1	Other	Other
+7f422344-f493-4170-be6e-125d1aa27561	1	Other	Other
+7f425108-f469-403e-9c42-c3c3008a3019	1	Other	Other
+7f4255fe-fbb1-4be3-aad0-4044eb09d7ac	1	Other	Other
+7f42786d-42d5-468d-9c59-6876f07dab99	1	\N	Other
+7f42b041-fcd9-408d-b42b-31c9c0e469e3	1	Other	Other
+7f42cb34-d8f7-479c-acb2-8ed071beeed5	1	Other	Other
+7f430ded-a2bd-4b20-a4d5-e60128363cc3	1	Other	Other
+7f432c48-0de2-4953-b8cc-444b1cffdf1c	1	Other	Other
+7f4333f1-6a25-453f-8175-549659c0d8d9	1	\N	Other
+7f4362f3-67e6-4ced-a9f9-7f80c48f23de	1	Other	Other
+7f4375ae-3fc4-4cec-9267-4a78fbf71883	1	Other	Other
+7f43ac0a-ad21-46de-a02b-41dc74637655	1	Other	Other
+7f43d081-861b-483d-81b0-59e5851394d3	1	Other	Other
+7f43f923-7a27-4703-921c-e80a95899e1d	1	Other	Other
+7f440d09-e0f3-4753-99b2-5dbcac961379	1	Other	Other
+7f44205d-1046-430e-b1f8-9c009447fab4	1	James	Other
+7f44e274-1566-4cdf-9f2d-c3a56d14cd88	1	Other	Other
+7f450f04-3fb4-45d9-8bb4-5089df191e51	1	Other	Other
+7f4529cf-6124-46e4-ba7c-2a8f82f16a21	1	Other	Other
+7f45ead6-d025-4567-91a9-02552dfb5a60	1	Other	Other
+7f463d07-dec7-4c1d-9423-c2e4ccb70a73	1	Other	Other
+7f4659a4-5e8d-43ff-b958-147f64435106	1	\N	Other
+7f469734-1d83-4ab3-bfe3-779a1078957e	1	Other	Other
+7f46c8f8-dc9e-486e-88cf-df661bba9540	1	Other	Other
+7f46d05a-a5e3-4211-8455-49bbb1266953	1	Other	Other
+7f46dc73-a30f-47ac-8aa5-e8c11698de35	1	Other	Other
+7f471f51-9057-4a8a-b3d3-f28da3215fe6	1	Other	Other
+7f472e13-6f77-4c4c-9d93-24aec697feaa	1	Other	Other
+7f4735ee-a082-4fec-a88e-7d4745bb0707	1	Other	Other
+7f47cc7a-a244-4ba9-9c39-849c1aa707b2	1	Other	Other
+7f47f2a9-76ee-4e57-b3e4-49484ebdc7bd	1	Other	Other
+7f480887-fca0-4b0a-a52b-f122ab557a43	1	Other	Other
+7f48d1fb-0880-4fbe-bf70-0bd2326745e3	1	Other	Other
+7f492fbf-d926-45e5-9005-54663891b7df	1	Other	Other
+7f49c0fa-bb20-4a4a-b0fa-77a525d339f8	1	\N	Other
+7f4a5a62-6e50-405c-bcf9-56e71638eec4	1	Other	Other
+7f4a6403-9a3c-427c-97c7-fe7a81f801c1	1	Other	Other
+7f4a8d81-d626-4835-b861-7abc7518a426	1	Other	Other
+7f4aa4eb-8515-46cb-aedb-598bcc8a7105	1	Other	Other
+7f4acef6-05fc-449b-91e9-1153bc8ddaf2	1	Other	Other
+7f4b666f-1934-47aa-89e0-56816a2c7df4	1	Other	Other
+7f4b6747-98c2-4a24-aaef-729bac695f33	1	Other	Other
+7f4b7a01-c4f0-4779-984a-469c3b1c543d	1	James	Other
+7f4b854b-3545-4047-be2a-9a112ca4edf6	1	Other	Other
+7f4b9bd3-4652-4837-a265-b55f2dceb7bd	1	Other	Other
+7f4b9bef-eede-4f54-8115-f0972197116b	1	Other	Other
+7f4c0ade-d698-46c9-b78c-f443a4e3f866	1	Other	Other
+7f4c13f4-847a-487e-afa6-00b9133ae532	1	Other	Other
+7f4c9bac-5866-4a87-b35e-1c3e669afb21	1	Other	Other
+7f4cb60c-28cf-4f42-978a-c076678c2683	1	Other	Other
+7f4d4eeb-a727-4af2-8c8a-a5b3bfe6b333	1	Other	Other
+7f4d5f96-dbb3-411a-a457-aad8511f3246	1	Other	Other
+7f4d6526-a8c9-48e5-9818-41bdf2fcba0b	1	Other	Other
+7f4d7154-ef0f-4239-b5d2-b39e098986cb	1	Other	Other
+7f4d874a-af8b-4cbb-8611-614a27c1846d	1	\N	Other
+7f4d8b2a-2c33-4573-a5fd-3390f5c09438	1	Other	Other
+7f4ddd25-cbf0-453b-84a7-195684854803	1	Other	Other
+7f4e0442-f304-4318-8395-a9d54e82f7f5	1	\N	Other
+7f4e8351-bc7a-424f-a5b0-19143497b42d	1	Other	Other
+7f4eb0a8-4d3d-4e95-9811-5f38573eed1f	1	Other	Other
+7f4edbf3-4564-43cb-970d-01038fe5f7ed	1	Other	Other
+7f4edc3b-88bd-4c7d-8e0a-ef838a7d3f10	1	Other	Other
+7f4f0477-29c3-4be0-8dba-62d936347add	1	Other	Other
+7f4f1401-e641-466c-8f12-3e126357e7a8	1	Other	Other
+7f4f4d20-ee86-4e11-af7e-afe8b8cb4066	1	Other	Other
+7f4f617b-1c04-42b5-9c8d-41c2faf5c623	1	Other	Other
+7f503cb3-c018-408e-ae1c-bf143ea2f607	1	Other	Other
+7f50515b-603e-4f2f-85e5-57d160e15562	1	Other	Other
+7f5087ee-9d37-40e8-a340-21c0f8af2163	1	Other	Other
+7f513835-f1ff-4bcf-9e0c-4dfdeac0a492	1	Other	Other
+7f516992-7196-4589-a1b5-cdc1ddd3e4ce	1	Other	Other
+7f516d6a-77dd-446e-b623-9d1f1ba246c2	1	Other	Other
+7f5190b4-db21-4996-ad5d-2c90f5d3d34e	1	Other	Other
+7f51e2fe-9080-419a-8dde-ddd40cff675b	1	Other	Other
+7f51fbdd-f251-4b90-8adb-04cf4ad80739	1	Other	Other
+7f521856-b8df-4a3f-947a-599181ce513c	1	\N	Other
+7f52286b-190a-414f-b2ec-b7eeb9eb2d45	1	Other	Other
+7f523485-2887-4167-8775-8cecf9765da1	1	Other	Other
+7f5297fd-efc8-4995-82c3-0e5bf82e3ed1	1	Other	Other
+7f52b384-852e-44b2-9b26-ecbcc9c887f8	1	Other	Other
+7f52bea9-b8eb-42aa-9f7e-c0818fb82b40	1	\N	Other
+7f5352a0-0232-405b-8fd8-c1bf688567ad	1	Other	Other
+7f53a7d7-22d4-41a3-9e9b-186bfa8fec8f	1	Other	Other
+7f53ce80-e84b-4b46-9d68-000014d74117	1	Other	Other
+7f545873-d5e8-4556-81db-2439e841048a	1	Other	Other
+7f547a9a-cced-43e4-babe-ac082b9f8221	1	Other	Other
+7f54f6ae-17cf-4c1d-9e54-b77c87896c8d	1	Other	Other
+7f5552c5-aa36-4eac-9ddd-46a8953f0fd6	1	Other	Other
+7f55ad4e-2c47-4f6a-b22d-1a839565675f	1	Other	Other
+7f55f062-681f-41d8-a771-0a02c26b2c00	1	Other	Other
+7f55fe51-1a5d-4d12-8c46-88f378d2164a	1	Other	Other
+7f569cea-2197-4d53-8878-ed65334e96bd	1	Other	Other
+7f56a32b-7dc6-4bdc-ac5b-b247beadf15e	1	Other	Other
+7f56b8c0-b39d-4959-ac7b-8f11903dbade	1	Other	Other
+7f56e4b5-d019-4bf8-930f-6d9b0a2cf4ce	1	Other	Other
+7f573d44-5e6f-44d2-9c28-95828071d061	1	Other	Other
+7f5749a4-cae5-4ecd-8104-abefc8ed2e25	1	Other	Other
+7f57657d-3fc9-4052-b411-23667aba05fa	1	Other	Other
+7f57804d-5721-4a69-92a1-dc5cef090141	1	Other	Other
+7f579616-ea66-4f23-b2f2-dc00b679bdd6	1	Other	Other
+7f57d776-5639-4078-9a38-bfa9034bcb7d	1	Other	Other
+7f57dad9-7668-485e-83c7-2ea608aadc00	1	Other	Other
+7f584055-84b7-43be-b683-8170b800b00b	1	Other	Other
+7f58532a-52b9-45b4-8cc2-b8ef4df81de6	1	Other	Other
+7f5859cf-698f-4fae-9907-78b5f4a51444	1	\N	Other
+7f585eb8-4067-4a8c-b5d0-06943ab472d8	1	\N	Other
+7f593db0-bc4d-4e05-957a-dc260051d2d6	1	Other	Other
+7f595270-0730-4ea6-9699-a4216850b286	1	Other	Other
+7f59a16d-48ec-4845-91d9-eac6a6f867f4	1	Other	Other
+7f59ca61-3404-456f-8295-4425bd32c4a6	1	Other	Other
+7f59dae4-5855-4c09-b048-5d57df588813	1	Other	Other
+7f5a00a2-610d-45ee-955d-c5dc979d9106	1	Other	Other
+7f5a1a7c-0451-4811-9b10-72e47d82ae3b	1	Other	Other
+7f5a2447-a8b8-4822-b805-65c7d36af160	1	Other	Other
+7f5a8711-5a95-4074-a7ef-f44bada2bf27	1	Other	Other
+7f5ac65e-8791-472f-8b3d-298e3b03c251	1	Other	Other
+7f5adca0-f53e-4f72-b2db-9b99fe4823d2	1	Other	Other
+7f5b1147-0ee3-4865-8086-4d1425671fa9	1	James	Other
+7f5b34f5-7733-4278-8d97-18c6a3cf6abc	1	Other	Other
+7f5b40c8-16fe-4602-ac2c-83334c8fac5d	1	Other	Other
+7f5b50ee-b78e-47ca-985f-672f08650c00	1	Other	Other
+7f5b55ba-7552-4889-9b1b-a5bf031a9061	1	Other	Other
+7f5c046b-9610-4dea-8000-8ec1931bfd7f	1	Other	Other
+7f5c0646-739d-495b-b267-8330a79cfa14	1	Other	Other
+7f5c0d2d-be07-42ca-8bf2-9f9c8a961e2a	1	Other	Other
+7f5c1fe0-cadc-4ebb-a27c-96dfd60ab4f7	1	Other	Other
+7f5c35bf-aa90-4f10-96d7-6799f2804a57	1	Other	Other
+7f5c3ea7-fb5a-4dcb-a90f-097895478014	1	Other	Other
+7f5c9291-9817-47c7-8cb4-975dcc503b59	1	Other	Other
+7f5c9892-8be6-43a5-8f76-d155a5c32368	1	Other	Other
+7f5cda8a-8952-4408-9775-ca095893714b	1	Other	Other
+7f5cde3d-f359-4c7b-8d86-aeeb4b06da3f	1	Other	Other
+7f5ce988-dbf6-11e7-a68e-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	Other	Other
+7f5d33bb-c057-4c63-932b-0d169799cba4	1	Other	Other
+7f5d3cc5-f8cb-437f-885b-b69238e4a9d9	1	Other	Other
+7f5d438c-c499-4c93-b371-03f8e704a3a9	1	Other	Other
+7f5d71a2-a71f-45f8-8436-50b1a2d20db6	1	\N	Other
+7f5d768a-75f2-4a07-bb0e-cfd5b730d478	1	Other	Other
+7f5de7c3-1bce-47ba-be0e-6d0ea628c1f0	1	Other	Other
+7f5de856-95f2-4ea6-a08b-d22faf4854fd	1	Other	Other
+7f5e13ba-e5e8-4ed3-8763-dea89f62df63	1	Other	Other
+7f5e1ae0-4d84-48c8-b6f7-7e693fe3a7ae	1	Other	Other
+7f5ea8e8-efc6-482e-970e-4d323ae73b5f	1	Other	Other
+7f5ec102-9ae7-4b62-83c5-4d8ace857e12	1	Other	Other
+7f5eec62-72f5-4ca2-9a5d-dd2ef97f855c	1	Other	Other
+7f5f140a-b541-41a0-9d45-935318c18f3c	1	Other	Other
+7f5f1c0b-d250-488f-bbfe-2f18b7fd5c89	1	\N	Other
+7f5f36d4-2056-4e3d-a04e-04524abc2e3e	1	Other	Other
+7f5f4811-c7b6-4df0-a0f9-ef4b5b08dc40	1	Other	Other
+7f5f5e9f-ca88-413d-b1c6-b009a340b360	1	Other	Other
+7f5f9290-4e59-4511-b311-2c9d48686158	1	Other	Other
+7f5fab53-8a38-4b2a-b04c-aac6ca25e4b9	1	Other	Other
+7f5fb288-c3df-44a5-a1ab-f6c6e04d8175	1	Other	Other
+7f600676-9e39-4952-adfd-565e29097f8b	1	Other	Other
+7f6029c5-d73c-4756-ae96-5a8ea6afd055	1	Other	Other
+7f603a49-6039-4afc-8e09-5b8433f0903a	1	Other	Other
+7f60728c-4475-11e8-aa5a-fa163e8624cc	1	Other	Other
+7f60bea1-678e-4595-947d-6b92e73ff807	1	\N	Other
+7f60ed1b-55ff-47a2-8240-df384986339f	1	Other	Other
+7f60fc59-5dc7-448d-b190-b39939edad2d	1	Other	Other
+7f615f19-1d55-473e-918d-18a35f42ea7f	1	Other	Other
+7f616cd4-c0e1-4554-83d0-af6f1b9347fc	1	Other	Other
+7f61714d-7985-4ff2-9ce6-8ea17566f37a	1	Other	Other
+7f619765-b21e-43b9-b94e-0efdf33703f5	1	Other	Other
+7f619dba-0b80-46cd-bf1c-ee8f7a969487	1	Other	Other
+7f61b2ec-8c17-493f-b23d-e29088f6fc4f	1	Other	Other
+7f61b35a-1760-4e3a-8149-7e4e5ca4dfb2	1	Other	Other
+7f620ef5-50de-4457-a92a-01843aaebd3e	1	Other	Other
+7f6287e6-8d68-47e7-aa1b-d0f2c57a5119	1	Other	Other
+7f629da2-be6f-447c-9d56-68ea14f760fd	1	Other	Other
+7f62d26a-e72b-4320-b07a-9f7fddff9b6a	1	Other	Other
+7f62d3cb-fde5-4888-8d3a-9279bc45804c	1	Other	Other
+7f62f1b1-8937-4d98-aba7-ac13f963e761	1	Other	Other
+7f631413-30d4-47db-a187-629d21e8e1fc	1	Other	Other
+7f631868-1ac3-4bff-bab3-235605546d17	1	\N	Other
+7f6321e7-07a5-4378-a72e-e574a2209fbc	1	Other	Other
+7f637082-96c9-47c1-9e68-b963580703c9	1	James	Other
+7f639b85-7cdd-4501-9abb-cc9ed405975c	1	Other	Other
+7f63e73a-8c7b-490c-aa93-9c8a2e94eccf	1	Other	Other
+7f640b1e-8a82-4e20-abb6-963b61c070bd	1	Other	Other
+7f642281-a359-4e9b-87d9-5d98ab59e5e4	1	Other	Other
+7f646b6a-a3d5-49d7-9844-d30bbdeaf692	1	Other	Other
+7f647891-e3e1-403d-8702-32e96837a0ea	1	Other	Other
+7f64800b-e71f-4d9a-a52d-2255676a458c	1	Other	Other
+7f648cd6-4f03-404e-aed4-348baea8762c	1	Other	Other
+7f64a0e1-66e6-4c95-8622-56221839c8c1	1	Other	Other
+7f651c7a-d0ca-44ef-9cb7-cde50c900bef	1	Other	Other
+7f652ab0-a236-4273-87d0-eabec5039f29	1	Other	Other
+7f65a230-e1a4-488b-87b5-a0f3c102e696	1	Other	Other
+7f65b7ac-bb61-404d-b891-44743dad5fb5	1	Other	Other
+7f65dc64-af33-46a0-8eb4-96cf94a17cf9	1	Other	Other
+7f65ff1e-e99a-4129-ad81-54c79a33d9a4	1	Other	Other
+7f66245c-1b1f-49a0-97cc-954ad04e0fe1	1	Other	Other
+7f665523-58cf-49aa-80c5-1d7c45eef4da	1	Other	Other
+7f66b856-afd5-46d4-a6f8-1b51c181205c	1	Other	Other
+7f66dcc2-4d2c-424a-b53d-b43ed9c1816a	1	Other	Other
+7f66ea96-d6a9-41dc-b8e5-8b2113b0a3d3	1	Other	Other
+7f672d52-7739-4e6f-aed1-2f2add366f50	1	Other	Other
+7f67b2bf-8e58-4ac8-a791-b549866caea3	1	Other	Other
+7f67c35b-9655-4e7f-a2bc-a37854a96f22	1	Other	Other
+7f67e001-de80-427b-ac86-8d748b5ee627	1	Other	Other
+7f67f957-ef94-4ef4-86fb-56d663a86c1a	1	Other	Other
+7f684600-12d2-498f-b82d-894bd028799b	1	Other	Other
+7f68ab07-eb32-46da-9ddc-c7eabb07f753	1	James	Other
+7f68ba88-1511-48d1-8aa1-6dfa1f3c6522	1	Other	Other
+7f68cbd7-cd5a-4555-878c-35310813797d	1	\N	Other
+7f68e994-019b-4b84-b01f-5e72e8cf2258	1	Other	Other
+7f692b38-226a-4886-9885-26b01818f1b5	1	Other	Other
+7f694b1b-581f-4ef5-bc72-25c56f7c87ea	1	\N	Other
+7f697e91-d3e3-4180-bf13-2b30ee6d21f9	1	Other	Other
+7f6a38d9-c50c-49fd-9b03-158feb85d141	1	Other	Other
+7f6a43a7-a7a2-4c0c-8dab-3494e3020b6c	1	Other	Other
+7f6a5351-f873-417c-b10a-c927a46cd8bd	1	Other	Other
+7f6b0cf1-ec63-4cb5-8d62-81e6605d41ec	1	Other	Other
+7f6b0f46-963f-4132-a34f-3b2d546390e0	1	Other	Other
+7f6bfe86-c4c5-402e-a8ad-82e77af704a8	1	Other	Other
+7f6c05a2-2186-4649-882b-570a91955fce	1	Other	Other
+7f6c42ba-b197-41c7-95cf-ae8e4f21e455	1	Other	Other
+7f6c62e8-8a0b-4fa0-87de-3a250aa6551e	1	Other	Other
+7f6c98a1-b73b-49c8-a3f7-9b041ef6b6fd	1	Other	Other
+7f6d44e4-b348-4758-8ca8-31de1ebd1f22	1	Other	Other
+7f6d4551-305e-4e9c-b25a-72ad2c28471f	1	Other	Other
+7f6d646d-f521-4996-91e6-c0a70f541ee5	1	Other	Other
+7f6d7f7d-5e9b-4b81-9acf-b79dbe083e09	1	Other	Other
+7f6dc099-19cd-43af-bb69-4a786f0778e2	1	Other	Other
+7f6df85c-28d9-4857-b605-9a224927536a	1	Other	Other
+7f6e1e83-6059-4a89-b45c-954b6a366ffd	1	Other	Other
+7f6e406a-9264-4c57-9350-f180239ca131	1	Other	Other
+7f6ebc60-355a-45b4-bec8-708790d7fb6e	1	Other	Other
+7f6ec044-9e17-4209-855d-b5cacbd4e9d9	1	Other	Other
+7f6ed5ee-4abb-4cde-8260-9bdc2ba047a9	1	Other	Other
+7f6f1911-383f-4cea-bff4-1f2fe58ebb65	1	Other	Other
+7f6f8a79-40bc-4d4f-a985-5e179988ea31	1	Other	Other
+7f6fe4e9-777b-4c1d-a576-f590838cf450	1	Other	Other
+7f6ffc9b-33e9-47b8-bc14-caf208bec1d3	1	Other	Other
+7f701d21-e34c-44e7-addf-c64a46b7a7e5	1	Other	Other
+7f7023b5-204a-4609-bb3b-2ae72ca84992	1	Other	Other
+7f703544-81b8-40e1-8025-8087104edcd7	1	Other	Other
+7f7035b8-cebe-433f-845c-80dea831a905	1	Other	Other
+7f7081a9-9bb0-41e7-bebd-ee358e934c55	1	Other	Other
+7f7084e8-60a0-4546-abd3-1b88a2417fe5	1	Other	Other
+7f708882-96fe-4445-b268-453f8960debd	1	Other	Other
+7f709cfd-6408-4fc7-aea9-128a7888012b	1	Other	Other
+7f70a295-4b54-496e-88d1-069f81b67acb	1	Other	Other
+7f70a3e4-dca0-404d-bf79-fc4161d8688f	1	Other	Other
+7f70d646-0921-4545-919f-021a73275d7d	1	Other	Other
+7f711a99-cfb9-4c6c-8938-935c2ebdb06c	1	Other	Other
+7f7141b9-a449-48b5-b172-16bdb08146cf	1	Other	Other
+7f7144e5-b8ad-4d55-a1cd-102d4c0875b1	1	Other	Other
+7f7156b9-219b-43e4-b96c-1f4e82c17707	1	Other	Other
+7f7167a0-2d4f-4a79-bec3-4bc0889bb416	1	Other	Other
+7f717adc-c154-4d45-a24d-494ccca811b1	1	James	Other
+7f719215-47a2-4828-b36f-d553503c6be1	1	Other	Other
+7f71dad3-3215-4b6b-b030-ed1e55731a4b	1	Other	Other
+7f72176b-d76f-4cd7-95cb-7dd0dfe4e3f4	1	Other	Other
+7f7262a8-4df7-4aeb-9a17-44c650bd22ee	1	Other	Other
+7f72853e-911f-455b-8fc7-3f4a22f02d02	1	Other	Other
+7f72f928-c0c2-4ed7-b628-88968d8d6627	1	Other	Other
+7f730367-f8a8-4397-9318-f3413646fc75	1	Other	Other
+7f730a32-5ee9-428f-b40e-c1d11e520427	1	Other	Other
+7f736977-c1a5-4226-89fe-f5a37d557671	1	Other	Other
+7f739838-37fd-4b6e-b11e-03f5308e876c	1	Other	Other
+7f740e5e-e4f5-4375-993c-6db1dd006d50	1	Other	Other
+7f741b50-3880-4401-931f-ccc9b1145e40	1	Other	Other
+7f744d19-049e-40dd-b33a-13c4855b0501	1	Other	Other
+7f747089-dbb9-479a-a687-ea51c3d327de	1	Other	Other
+7f749793-53e5-4e0e-9298-039c8f06b74e	1	\N	Other
+7f749c67-838e-4c6e-a143-4f187e173718	1	Other	Other
+7f74a7a0-772e-49a0-8fa0-08507a501e66	1	Other	Other
+7f74a848-cf9f-44f4-a634-f7161b4952d8	1	Other	Other
+7f74b256-182c-49a8-bca2-f9be65153333	1	Other	Other
+7f74d48f-b2ab-4d69-9124-c0bfba4a5a7c	1	Other	Other
+7f75202e-e8c1-4b9a-96f8-83017f3bd9ad	1	Other	Other
+7f753399-8448-4ef6-91cd-03153598d85d	1	Other	Other
+7f75522c-1515-4a0e-9008-5b86fce9f1eb	1	Other	Other
+7f7562d4-f4fa-45b0-8044-b7388d331a30	1	Other	Other
+7f757067-bee9-4083-b47d-3015062e483f	1	Other	Other
+7f75781d-eedb-4c75-a2be-dec360252c35	1	Other	Other
+7f75793c-019d-4bbd-a1bc-59ffc2bf088f	1	Other	Other
+7f7581a2-8a71-4314-ab09-00726c1e883a	1	Other	Other
+7f75b6b7-d208-41bf-b305-0edb6e0b4279	1	Other	Other
+7f7622dc-5cef-4e84-9745-dca0fe1f22f0	1	Other	Other
+7f766d9c-b861-4d8f-8a09-32156d007d4e	1	Other	Other
+7f766ec2-4349-46a4-aaae-2038952f3f69	1	Other	Other
+7f767541-cf7a-4b7e-a667-b926324a8dc1	1	Other	Other
+7f76b3bc-e5ef-4a63-b174-47ba102b9da0	1	Other	Other
+7f76bb50-6521-4ea6-b8ba-7d3c998a8998	1	Other	Other
+7f76bc99-9fcc-4ca8-8915-47310699b52e	1	Other	Other
+7f76cc5e-5803-480d-a6d7-0d1a247bb85c	1	Other	Other
+7f77592b-728a-4956-9a38-534baf2d025e	1	Other	Other
+7f77602e-e09c-45eb-911f-29eb0156c027	1	\N	Other
+7f7783cf-b37d-4c4c-a01b-4710ac372335	1	Other	Other
+7f77c629-e384-4e43-bf96-ca7d1d030846	1	Other	Other
+7f77d486-5224-41f1-a21e-f756e1bb1d88	1	Other	Other
+7f7846c6-897e-475a-a474-8557244f7c24	1	Other	Other
+7f78da65-7d2b-4f41-8578-ad80d91bf612	1	Other	Other
+7f792bf0-955b-4ee3-a72a-8a3ea71f1d3f	1	Other	Other
+7f796274-d15d-4164-b64c-9d5a9b25c89b	1	Other	Other
+7f79e606-a694-4d21-b77d-b1285feb56f2	1	Other	Other
+7f79f828-ede6-4504-a589-dfb51443f4b0	1	Other	Other
+7f7a00f2-284b-4cb1-9050-69814958972e	1	James	Other
+7f7a0b51-83d6-441a-8f5c-b8bf7f2ed01a	1	Other	Other
+7f7a3333-6278-480a-9529-8d2812493eb7	1	Other	Other
+7f7a588d-10b9-4dc0-ba36-babe53a80be0	1	Other	Other
+7f7a7bf3-d72d-4685-aa04-f582e554c886	1	Other	Other
+7f7a8975-9a38-49ff-8de9-36a3e3c82332	1	Other	Other
+7f7b733a-4310-4a5e-aa8f-c820a6e8ef76	1	Other	Other
+7f7b89bd-7e38-45b9-937f-df1ef88336fb	1	Other	Other
+7f7bbdc5-c755-4531-939f-70a4dcafc509	1	Other	Other
+7f7bd0b8-1891-4b41-afa8-8e4d5b569633	1	Other	Other
+7f7bd779-dd98-4ce0-bef4-390c51fdec48	1	Other	Other
+7f7bfd8e-2f63-4ea5-8f81-7bdb3b8308a0	1	Other	Other
+7f7c1995-55f1-45df-b301-389eaebfadab	1	Other	Other
+7f7cc401-2b06-4d2f-87af-e1462f008316	1	Other	Other
+7f7ce061-ac2f-4dac-9b7e-a60ab6d63381	1	Other	Other
+7f7d288a-c69a-4312-8cf1-5c6bbb6c5d4f	1	Other	Other
+7f7d6077-44d4-4d7e-b744-c8bf5923cc98	1	Other	Other
+7f7d8b49-a366-421f-bb39-0707c0ecc462	1	Other	Other
+7f7e120e-bf32-40a5-8a37-c4f01345a400	1	Other	Other
+7f7e18bf-6eec-49d2-9e3b-a1ed198f4f43	1	Other	Other
+7f7e788a-6c1d-47f8-ba5e-8e296634aaae	1	Other	Other
+7f7eaeb2-a2b8-4d28-bb21-d32b86126c20	1	Other	Other
+7f7edcf0-5058-48f8-8402-89efe33bee2b	1	Other	Other
+7f7ee590-29df-4c30-a7a1-3271c8416214	1	Other	Other
+7f7eed88-bc9a-4cce-95de-400521f3c041	1	Other	Other
+7f7ef30e-ff97-411d-9346-f6ebb04c811e	1	Other	Other
+7f7ef7de-78f3-45a9-920e-772a5babc005	1	Other	Other
+7f7f2435-8be2-4a6e-97f9-2404a2556311	1	Other	Other
+7f7fb18a-c8d9-433f-92b9-6cea1bf6405f	1	Other	Other
+7f801323-f17f-4664-9bdb-afe6a78ac788	1	Other	Other
+7f801f1f-8c08-4545-87a9-4401230cde9f	1	Other	Other
+7f804716-5473-4da9-b469-0b4fe8b6f102	1	Other	Other
+7f809072-39a8-4833-9fe3-7c6c6763317e	1	Other	Other
+7f80a77e-f785-45a8-8ac2-fc19e5df3ac2	1	Other	Other
+7f80f663-11b5-45b0-8584-e77bb03efd8c	1	Other	Other
+7f81122a-28a0-45b0-9a1d-4ea0b8b0b579	1	Other	Other
+7f814c74-7853-4115-a00f-280b83c7a75a	1	Other	Other
+7f816912-4a0f-4c20-9650-602f16c71253	1	Other	Other
+7f818c07-0c75-4d1d-92dc-ab5ef22b063d	1	Other	Other
+7f819be0-64be-4432-95fb-de59a889066b	1	Other	Other
+7f81ee13-d1a5-4847-a227-c91773083528	1	Other	Other
+7f81f3b8-26e8-48f7-a7d9-7dff0c5b7a19	1	Other	Other
+7f82170c-9bf1-4aba-be9a-67e598cbb442	1	\N	Other
+7f821c95-8daa-4b8f-a76a-1a0dc6e8b86f	1	\N	Other
+7f823fe3-8adb-4ed9-ae51-ff9bbd1d541f	1	Other	Other
+7f826869-d70c-4391-ab28-1e6c580398b8	1	Other	Other
+7f827d6e-05e0-4de9-8ccc-aec6a2c06af9	1	Other	Other
+7f8294ec-63c4-40ba-aa5e-58f5fdf64664	1	Other	Other
+7f82bace-8bfe-4ba0-9248-fc0d701da1d7	1	Other	Other
+7f8341a8-5e61-4594-a253-8b45705f758f	1	Other	Other
+7f83a15d-641d-4bf2-88e1-d0a6ee353c7c	1	Other	Other
+7f83b629-8261-43b2-ace0-f74cee868189	1	Other	Other
+7f84056c-8a64-45d4-bba3-8aa69c076ced	1	Other	Other
+7f84651d-dd4a-41d5-bd0a-264c2490553b	1	Other	Other
+7f851d0d-de94-4c91-bb5a-6204bcd9554c	1	Other	Other
+7f852528-9592-4f0b-b03d-4ac638d48390	1	Other	Other
+7f854d30-8947-4269-9483-b484b724ead9	1	Other	Other
+7f8572f0-699a-4126-95b9-162d8ff5a6a5	1	Other	Other
+7f859d33-cab5-4669-9fc1-41f7923577de	1	Other	Other
+7f85b352-0bb2-4a7d-9b63-cabcde856ddc	1	Other	Other
+7f8600ce-1c6f-487c-ae30-f67ebf598c03	1	Other	Other
+7f8625bd-9552-4055-b9c3-3cec0badfcfe	1	James	Other
+7f8653fe-0636-449a-81ef-4950e51722fa	1	Other	Other
+7f866019-edac-4a73-ba51-6a15fa14dca9	1	Other	Other
+7f868ef9-9e96-4623-88ee-4ec6eb56cf16	1	Other	Other
+7f874cd5-1635-4111-83c9-fae2e9539501	1	Other	Other
+7f875e3f-3466-4afa-90e8-5aa6db4d2e3b	1	Other	Other
+7f8779c6-95d3-4ec9-9c4a-beb6461934fe	1	Other	Other
+7f87b1ec-a728-4ca8-a695-12fc75781d73	1	Other	Other
+7f87d26e-3ebe-4b6d-8efb-9eb3d006e75b	1	Other	Other
+7f87e194-7933-48d3-86d1-ebb88a310644	1	Other	Other
+7f882056-f54a-4e60-a1b7-599723386ad7	1	Other	Other
+7f882730-c0b5-4c57-ad4f-6ac4d1e92369	1	Other	Other
+7f883dfe-8a84-4c28-923e-b7069125532f	1	Other	Other
+7f88594b-d617-44be-8ed7-95776dae6ade	1	Other	Other
+7f88fb3c-e333-4856-b004-001b4df0166e	1	Other	Other
+7f892022-293c-4563-8d84-13a67d62a482	1	Other	Other
+7f89363a-a3aa-4404-ac0c-78d398af0a1a	1	Other	Other
+7f897507-3279-4efd-9a21-0b5ab69b9399	1	Other	Other
+7f89bd0c-304c-44e9-8231-6d9509c7d236	1	Other	Other
+7f8a0e19-34a2-472f-9470-aebb3364e561	1	Other	Other
+7f8a3a56-0bd8-45fa-8de2-8484cdcba0d0	1	Other	Other
+7f8a5030-e8b6-425d-906e-2238252f2088	1	Other	Other
+7f8a73bc-b59b-4a59-84a2-e058eae73206	1	Other	Other
+7f8a7800-2841-4994-b0cc-d4eb0ac3f324	1	Other	Other
+7f8ae0e3-060e-44f7-9b48-babfe121d56f	1	\N	Other
+7f8b8cd3-9d79-4b24-81ae-24a58e2b4673	1	Other	Other
+7f8ba295-96f2-414d-a132-2aa2bdf3c1e5	1	Other	Other
+7f8ba339-a027-4959-bb2e-fc0f5a6cf6a2	1	Other	Other
+7f8bb1b1-6698-42a5-a534-cba2ac16276a	1	Other	Other
+7f8bbd5d-3172-4ec2-9beb-f2dfe380628b	1	Other	Other
+7f8bfa12-76ff-4ea1-a2b3-33e573b0c7af	1	Other	Other
+7f8c004a-9302-46ce-b5a9-a6891aafa057	1	Other	Other
+7f8c025b-a010-4c58-9ebd-dd050427b92f	1	Other	Other
+7f8c70c1-83f6-4f2c-9148-7617557f38b1	1	Other	Other
+7f8cecb1-f227-4b2a-9538-1fa7e8141cba	1	Other	Other
+7f8d3843-ebb4-425d-b252-d317b4fb189d	1	Other	Other
+7f8d57de-0d8d-4b07-9351-50110a1eab1e	1	Other	Other
+7f8d7275-be06-4b63-8e5b-409425b77c35	1	Other	Other
+7f8d738c-b13d-44ba-8793-2cdcc88026c9	1	Other	Other
+7f8da0e6-486b-4a36-8ebf-4a36217e7c9f	1	Other	Other
+7f8dadc6-34f9-4ec4-a6b8-c30b0fbc6d77	1	Other	Other
+7f8dcbd9-1349-4251-85dd-be0542944dfa	1	Other	Other
+7f8dda2e-3f8a-4383-b750-78338f57441a	1	Other	Other
+7f8de3e0-27ea-48e8-83fd-6dc0d7ec0a65	1	Other	Other
+7f8e0382-9c8d-431e-9cba-458b5ca59111	1	Other	Other
+7f8e5ad6-2790-4412-809c-fb630afccffe	1	Other	Other
+7f8e9eeb-b747-45fd-b913-bba1185cb105	1	Other	Other
+7f8ea1bd-aced-4b88-bcf5-18a76f9c5f1f	1	Other	Other
+7f8ec11a-539d-4832-8a56-8aeeb9ba34ef	1	Other	Other
+7f8ee283-52e8-4de4-bf6a-bb09862f37a7	1	Other	Other
+7f8efd89-d51d-4313-8842-79c3f64d2e9f	1	Other	Other
+7f8fdcdb-ca8b-41ad-9777-c40281c27376	1	Other	Other
+7f904b71-779c-41a6-bcbb-42fcb55687cb	1	Other	Other
+7f90898c-d5a8-4d8d-afb3-46559f2f11d1	1	Other	Other
+7f90d923-fffa-4a20-abf1-80dbbb89edd7	1	Other	Other
+7f90e723-71c9-49e7-be3f-4c680c781fa7	1	Other	Other
+7f910978-1678-4e18-a4a7-e2e73575dfc0	1	Other	Other
+7f9120fb-9d61-40e5-95bd-90e38bf96029	1	Other	Other
+7f9167ff-89f0-4f9f-b1c0-03e5cb595ca7	1	Other	Other
+7f91684c-7705-4a08-b074-ad65bd55027f	1	Other	Other
+7f9173d9-b500-4f8d-b32f-d5df72656e42	1	Other	Other
+7f91928c-1f1f-4198-b3b3-4628a461d412	1	Other	Other
+7f91dcf3-4fe1-4cb7-9799-9468041b959b	1	Other	Other
+7f91e201-0e23-4b74-a7de-d1709448fdce	1	Other	Other
+7f920c59-40ea-4901-9b09-f03cbcf49a1c	1	Other	Other
+7f92bc5c-4ee3-4c50-845d-b9b411ce09fa	1	Other	Other
+7f92f0bc-1371-4461-93a7-d06b486ce492	1	Other	Other
+7f9313b8-3b31-46f4-8180-cec6efa20109	1	Other	Other
+7f9378cb-8827-433b-86be-ec42f2e1dd2f	1	\N	Other
+7f93892f-3955-4640-a7b1-f58f992b9ffb	1	Other	Other
+7f93d556-00ad-433d-95a2-707e07df11ef	1	Other	Other
+7f94135b-58b1-4468-80bf-4c5f86c8c341	1	Other	Other
+7f941c41-43af-49db-b68e-60dc0b03dfa1	1	Other	Other
+7f943b84-ef59-464e-9ff0-d267df104058	1	Other	Other
+7f948578-9d73-4fda-881e-60732f3b89c8	1	Other	Other
+7f94c51f-e93e-4d0e-9ca3-61a2a4b30b47	1	Other	Other
+7f94e65a-b668-4ba5-ad3f-5ffa343485db	1	Other	Other
+7f950a38-c23a-43fd-b7fe-6eaf8f8d5fc6	1	Other	Other
+7f952d0b-3cf2-4333-a891-a0d5efb27abc	1	Other	Other
+7f953e81-5a95-4ded-8e6f-1e3c8b22ea06	1	Other	Other
+7f95f55f-e778-4297-badf-ed84d17fa86b	1	Other	Other
+7f960d14-3e72-451d-9981-77c26469e78a	1	Other	Other
+7f963a87-3290-4f25-a1ab-09b7d76404f5	1	Other	Other
+7f9674d4-01ab-11e8-aa3f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+7f96adaf-2791-40af-a6dc-bad0a6c0e15c	1	Other	Other
+7f96e29d-dc25-43ba-a5fd-c818d5409a78	1	Other	Other
+7f96e673-357b-4a1a-8536-e9ba2686898b	1	Other	Other
+7f96eb60-34b6-442b-803d-ee473669e9df	1	Other	Other
+7f970f3b-4de4-426e-ae04-f4a8306cf816	1	Other	Other
+7f9745dc-9335-4888-b513-d8fd0426816a	1	Other	Other
+7f979150-d682-475a-b546-ad2be91739f8	1	Other	Other
+7f97a521-cdb9-4c10-952c-e9f9eca33939	1	Other	Other
+7f97bf7d-3312-4ffa-a656-2db8f9ced69c	1	Other	Other
+7f97fefd-afbd-4876-bb1c-743fc0401fd4	1	Other	Other
+7f9801ae-52ad-4688-95d2-7ac8e9052125	1	Other	Other
+7f981361-c1e2-4817-aad0-9e68df349781	1	Other	Other
+7f983ca8-560b-4c83-807d-c4d787ddc00f	1	Other	Other
+7f983ea5-36fb-4abe-94e5-68471d6b3bdd	1	Other	Other
+7f984468-1fdc-4a91-95ee-e56b87e327fc	1	Other	Other
+7f987d1c-394e-420f-a4ca-b63d424c5d0e	1	Other	Other
+7f9886b0-980d-425f-82bb-ec6e037c3e68	1	Other	Other
+7f98ca92-71fe-441e-b70b-805d3e99b90b	1	Other	Other
+7f992dce-ae75-4517-aa12-53f20acfdb5a	1	Other	Other
+7f998936-5ee4-4d17-a16a-196a3930f406	1	Other	Other
+7f99a2ee-010c-4c2f-9505-85255cb1f9ca	1	Other	Other
+7f9ad098-1407-4c37-b50b-e86a98add993	1	Other	Other
+7f9af6a5-f470-4d69-8cb7-5c36925c364e	1	Other	Other
+7f9b1f73-293b-4eb1-8a9e-3e8f22e2201f	1	Other	Other
+7f9b2d4d-170f-49ac-961d-8b3deefbb987	1	Other	Other
+7f9b97d9-6a79-4ba2-8c16-ff7794e18ee2	1	Other	Other
+7f9bc26d-60de-4dd7-8c98-67fa11a264fc	1	Other	Other
+7f9beee1-6756-480a-b776-5e157909cfb5	1	Other	Other
+7f9c24c3-70f3-43f7-ba9b-62839c56deba	1	Other	Other
+7f9c24fe-cb0e-49cf-be6b-34d44dc7e641	1	Other	Other
+7f9c63db-a805-410c-a6ed-f3d814e8efd9	1	\N	Other
+7f9c71c5-de4e-47b9-93e1-282fc7bd1d7e	1	Other	Other
+7f9c8abd-b715-49a7-8932-84cbf81d5f82	1	Other	Other
+7f9cb0d4-19d8-4f54-be64-0449253f76b6	1	Other	Other
+7f9cc1d1-9cbe-4733-aa66-c02e995280b2	1	Other	Other
+7f9cff0e-3d29-49ec-ab7e-8107225c38b9	1	Other	Other
+7f9d4102-c24d-4d98-b798-9acfadb073c2	1	Other	Other
+7f9d4962-e865-4d6b-a3b9-1cbe2d256a47	1	Other	Other
+7f9d6429-279b-4542-9d62-7b3ce5d52504	1	Other	Other
+7f9d72b0-cdb4-4262-a285-b72432722c6d	1	Other	Other
+7f9d9109-6e6d-4029-9dc1-b7779014ee7f	1	Other	Other
+7f9d985f-92e3-4781-be9b-0cb6926bbf12	1	Other	Other
+7f9dcefa-991e-473d-8341-9e85352f05fe	1	Other	Other
+7f9e112c-f1a6-4318-97bb-5537c435513f	1	Other	Other
+7f9e130e-3cc2-4edd-be5f-5fc8bcaa8c5c	1	Other	Other
+7f9e5e65-cad5-4394-8191-f39dc3d472e0	1	Other	Other
+7f9ec561-f7de-4691-ac64-179a7d8c0f40	1	Other	Other
+7f9ee2f1-a346-4a8f-9a32-01e1dbb3d5be	1	Other	Other
+7f9ee4b5-7369-4860-acd1-339640325a5d	1	Other	Other
+7f9ef06e-9702-4f7f-940b-56fd29649646	1	Other	Other
+7f9ef4b9-d585-489f-9621-fce9583af84b	1	Other	Other
+7f9efb3e-a0cc-47e6-a596-452ae3ceb2bf	1	Other	Other
+7f9f6b17-4ae4-433d-a10f-6b5f6cbbd07c	1	Other	Other
+7f9f95cb-dea6-4dcb-969d-7ab5b357a860	1	James	Other
+7f9f9f0c-4568-4d5e-8e59-2876e6589cec	1	Other	Other
+7fa0026d-068d-45ca-bfef-f47fd6d1d180	1	Other	Other
+7fa00b3b-92ed-4987-ba0d-10589ddee0bc	1	Other	Other
+7fa039a3-4526-4f10-88a9-3a30db6d27a7	1	James	Other
+7fa05266-d8b0-4c6c-a4b5-cc2760b0e573	1	James	Other
+7fa064ff-95b9-4fa6-b1e9-18b9273c714e	1	Other	Other
+7fa088a3-b7e2-482b-95db-aacd24d8f9eb	1	Other	Other
+7fa113cc-17f6-4d36-b6c0-52713b13a515	1	Other	Other
+7fa122a8-c986-42fa-a3be-169d36f4871e	1	Other	Other
+7fa131be-7253-4756-9335-eb9a5d59b730	1	Other	Other
+7fa15d54-8f43-4f0e-936e-085fe3fdba8f	1	Other	Other
+7fa19273-adb3-47b9-8bc7-0c6c5338203c	1	Other	Other
+7fa1b07b-8308-4d8e-9f04-f358471f2262	1	Other	Other
+7fa1b5e4-fbb8-4756-a479-2d3f3d741f04	1	Other	Other
+7fa1fb2c-68e1-4a0a-87e7-be16dff87df4	1	Other	Other
+7fa21231-86a6-41cf-bfba-73f91b37e078	1	Other	Other
+7fa22908-7183-4373-a79d-fe4e8539a43c	1	Other	Other
+7fa256d9-0bad-47de-8ea1-89d8def36abc	1	James	Other
+7fa2828a-bfcf-4076-bc50-31e54d751fbb	1	Other	Other
+7fa29280-6490-4154-94df-b261736ce587	1	Other	Other
+7fa2a82e-f447-4692-8274-5c0e905de056	1	Other	Other
+7fa2fa33-65c5-43b7-89c9-fc78b2271e59	1	Other	Other
+7fa35966-0cfc-4437-9b9c-3ac756824453	1	Other	Other
+7fa38dea-5b97-4ff4-ba98-186a6e526b6f	1	Other	Other
+7fa3c1e2-1883-4982-8ced-e6b8f2d24749	1	Other	Other
+7fa3e2f9-03d2-4d14-b1ae-efcd0593604c	1	Other	Other
+7fa41fc2-a6d7-4267-9bd1-98cee5f07284	1	Other	Other
+7fa441ce-7d86-497f-a101-785b99174043	1	\N	Other
+7fa47f49-ed9e-433a-923c-d3fba7ce50b0	1	Other	Other
+7fa49061-3cfe-4c93-b89a-2cc0b1484cb6	1	Other	Other
+7fa4913a-209a-4960-8375-98c3580d559a	1	Other	Other
+7fa494e3-1555-45a6-91fb-96935f643b29	1	Other	Other
+7fa4968b-2f28-4708-87dc-7fd6de0ddbb6	1	Other	Other
+7fa4973a-99b3-418b-b4e3-ab0e3357266b	1	Other	Other
+7fa4b9d0-cb57-405e-ae4b-398b2c1d6e8b	1	Other	Other
+7fa4be78-d724-469b-89bf-31ef6e06cf01	1	Other	Other
+7fa4d6db-9f05-4ec2-a534-3da94f66e322	1	Other	Other
+7fa52d7b-8bc2-4b57-b712-86873e25a8b9	1	\N	Other
+7fa54a39-4a11-4458-8879-60ba7b1a1899	1	Other	Other
+7fa57a93-8eaf-4692-b9ef-fe75b7e86746	1	Other	Other
+7fa588c0-17da-43b9-93ce-f07b11450a11	1	Other	Other
+7fa5cff3-7b3e-4cdb-af41-3980660f9c41	1	Other	Other
+7fa6205c-00ab-44ca-be99-e917d7940c95	1	Other	Other
+7fa62ae9-ee7a-4aff-8b5b-ed3730507754	1	Other	Other
+7fa64d77-0b79-4482-bd1d-ec74cbe79e55	1	Other	Other
+7fa65ee7-19d8-4b02-8ee5-57cefeddc8f6	1	Other	Other
+7fa661a6-48ef-4513-8bba-e05ccf96a51d	1	Other	Other
+7fa69757-c5d9-4460-8a47-e6bcbcf9cafd	1	Other	Other
+7fa6af4f-59d5-4e26-8981-a646caa46ba5	1	Other	Other
+7fa6e6cc-ef8d-4c9e-a98e-f18376b08651	1	Other	Other
+7fa72824-1152-40fe-aa74-e6cb944706c5	1	Other	Other
+7fa780e3-b868-4acf-94e2-89c00a79e5a5	1	Other	Other
+7fa78108-8686-4932-9242-a8ab5501cacf	1	Other	Other
+7fa84191-5553-4c76-bee3-1d22a986565d	1	Other	Other
+7fa890d0-adad-49ad-a47a-61393c3d3638	1	Other	Other
+7fa89c0d-9e0d-4a25-90a6-aab580b7f57c	1	Other	Other
+7fa8b392-f58e-48c9-b69c-be58d7e5a54e	1	Other	Other
+7fa8da32-d4d0-4e89-ade8-9dd363b46016	1	Other	Other
+7fa8ec8f-73c0-4bbc-822d-545f941452f6	1	\N	Other
+7fa938f4-2736-49d7-ac05-d0816ce10a8d	1	Other	Other
+7fa949fd-0cce-4874-bf90-124997813c39	1	Other	Other
+7fa98527-a312-44f2-80bb-f8c37ba541f4	1	Other	Other
+7faa5088-2c25-4256-82bd-c6f8fe568549	1	Other	Other
+7faac4f9-296e-45ff-ba76-98b97642b7fb	1	Other	Other
+7fab2b09-693e-44cb-9e3e-28f3dc62ddd4	1	Other	Other
+7fab4919-82ae-42a3-8728-26701deeed05	1	Other	Other
+7fab831d-71b0-4adb-993d-65030b058a3f	1	Other	Other
+7fac228d-4822-4c4e-8f95-769ea4e8e060	1	\N	Other
+7fac4056-e38a-4074-9b96-72392b059e53	1	Other	Other
+7fac4c6f-6cac-4ec2-86d5-ca737284057c	1	Other	Other
+7fac4fd5-27b2-494e-a8d5-c8e486d1f5d1	1	Other	Other
+7fac5213-231a-4106-a19b-bfd9d06f24ff	1	Other	Other
+7fac71bc-4255-479e-b6df-00779fcbbafb	1	Other	Other
+7fac88ac-6c35-46bb-97a8-5890cbac280b	1	Other	Other
+7faca5c4-c0af-4166-a390-178e5b53dec0	1	Other	Other
+7facf75a-e43f-4f20-8c18-4caab696a4d0	1	Other	Other
+7fad109e-de75-4ad7-ba21-362b4ecf3209	1	Other	Other
+7fad3551-c972-4e6d-9f6e-a2946457adda	1	Other	Other
+7fad7ac3-a807-42d5-81cb-4edf6407773f	1	Other	Other
+7fad9095-e00c-4e97-80e8-98a8b11d6ed0	1	Other	Other
+7fad9b33-7e3e-4617-ba64-8d396db11606	1	Other	Other
+7fae17bf-263b-4533-92c8-d590732e4d68	1	Other	Other
+7fae3a64-3e63-4fe2-955e-a88bed82f575	1	Other	Other
+7fae71ca-c334-435d-9c17-e2b7473f7417	1	Other	Other
+7fae7442-86f9-4798-9205-2b572103ee90	1	Other	Other
+7fae77ed-b318-4a68-beae-1a0d2f690f31	1	Other	Other
+7fae7d56-221b-4524-8a4f-057f5422e3b9	1	Other	Other
+7faea36e-de37-410e-b091-1f30abc1daa1	1	Other	Other
+7faeb99e-4057-4cfd-9923-0f024dd07a0e	1	Other	Other
+7faed6cb-c312-4bd4-a77d-368a4266166a	1	Other	Other
+7faf6769-5323-4e18-8b48-996ba35e69cf	1	James	Other
+7fafd8f0-aae5-4cd3-aa72-d7974eac4a13	1	Other	Other
+7fafffd7-9083-46a1-a99e-311725dc7370	1	Other	Other
+7fb020ac-6b9a-4537-88f8-67cddffb0d2e	1	Other	Other
+7fb02d79-b9db-4ac3-978c-df42e32074c5	1	Other	Other
+7fb02fef-c360-4b9f-933e-37453561510f	1	\N	Other
+7fb03a38-8106-4b9b-8e1f-bf206173d9b4	1	Other	Other
+7fb0b4af-4a83-4cbc-8b6d-21c989d9597e	1	Other	Other
+7fb0beb7-0ee9-4e8c-986f-52767dbf2118	1	Other	Other
+7fb0fd60-f8f0-453c-a6c8-1c811bd3f8a6	1	Other	Other
+7fb10805-d5c2-4456-8668-887089c7ea9c	1	Other	Other
+7fb13ada-d07c-4e79-ae43-7146d735d2e3	1	Other	Other
+7fb1527d-5ade-47d8-a14e-2735d2584905	1	Other	Other
+7fb18ea4-808c-43db-9c9c-4cf00bced1fb	1	Other	Other
+7fb21cd8-fea4-49f0-a809-3b8f3ca8d065	1	Other	Other
+7fb24f05-b409-4b9f-bcc6-b98db5b92097	1	Other	Other
+7fb28d67-ffbe-4800-b70a-ed54f85314ba	1	\N	Other
+7fb299ab-ed6e-4689-a2d0-06a48fdc9302	1	\N	Other
+7fb2b98f-a36d-40a8-9208-66baa91c8120	1	Other	Other
+7fb32326-703d-4d89-bc32-a973f71eaf89	1	Other	Other
+7fb3e0f6-e7d8-4fa2-8276-606d54c18f77	1	Other	Other
+7fb3ea2e-6db6-43da-b4a0-1ea9d422a0ca	1	Other	Other
+7fb41937-a466-4b9b-96cc-92317a6dd4b9	1	Other	Other
+7fb441ca-7463-4435-b9ad-e6d3ab64605b	1	Other	Other
+7fb48bc5-5847-4627-a7d0-9e53b1d1d60e	1	Other	Other
+7fb5510d-cc2b-48e1-8fc2-57298e6135c8	1	Other	Other
+7fb56608-2c3d-4553-86e2-6ffdc952db7b	1	Other	Other
+7fb593d9-098f-481c-af0c-3be33e00b2ec	1	Other	Other
+7fb5d140-531c-4035-bbef-9025f3524a90	1	Other	Other
+7fb68dea-dcc9-4eda-98d2-2df9d2192171	1	Other	Other
+7fb71d34-f8c2-4583-b2bb-435228cdc867	1	Other	Other
+7fb72da5-8687-4f3b-9f98-0d664cc5a585	1	Other	Other
+7fb76b48-988e-4728-b5e7-0914235e6b4c	1	Other	Other
+7fb76c23-d911-4b00-a177-f0d760c5bcad	1	Other	Other
+7fb7fe57-5dd6-4c36-9d3e-3e4d5de63907	1	Other	Other
+7fb89ab6-494e-41c6-be46-6a654663be72	1	Other	Other
+7fb8aace-cbec-4dbb-9ff5-3b84dbf5185e	1	Other	Other
+7fb8db82-c14f-4210-83d6-152b05fa3cdf	1	Other	Other
+7fb9788a-9694-4d32-9c9b-c206155a6183	1	Other	Other
+7fb98f96-7edf-436c-8501-9d296e5e37b0	1	Other	Other
+7fb99fae-98fe-4c02-9533-760ef3045483	1	\N	Other
+7fb9baab-9c2f-4e5a-ab07-e92ea070e014	1	Other	Other
+7fb9ca4a-887d-4cf7-b1c8-d5fc3d823843	1	Other	Other
+7fb9ec97-aade-4387-a375-39c18a10829e	1	Other	Other
+7fba2b81-80da-4fd2-ab6d-86c6d015f544	1	Other	Other
+7fbaa61d-5b31-446c-b9f9-c196e4d55b51	1	Other	Other
+7fbad18c-5cd4-4979-9a87-bdf1395e4e32	1	Other	Other
+7fbaf794-0193-433f-bb24-6d5df98347b1	1	Other	Other
+7fbb2de9-aee6-4607-b06a-963f43870b69	1	Other	Other
+7fbb6b0c-56e8-4d55-b82b-e9fc81f93583	1	Other	Other
+7fbb77fb-7e0b-4e78-b00b-34d91a5090f4	1	\N	Other
+7fbb7896-7a4f-4071-b69a-7ed5da643086	1	Other	Other
+7fbbe6ed-ac68-4f1f-80e0-494da97ca70b	1	Other	Other
+7fbbfdf5-0894-4f1f-80b1-077121c9c731	1	Other	Other
+7fbc206b-c579-405b-8d4d-0fd0c2ddccd1	1	Other	Other
+7fbc552b-33eb-4a8f-83cc-40a2565e8c34	1	Other	Other
+7fbc76af-befb-4c1e-a12b-c9ef98e5551b	1	Other	Other
+7fbc8e97-3209-4fef-91c4-491f3ac65696	1	Other	Other
+7fbca95f-e9cc-4498-9ddd-6c8760eef315	1	Other	Other
+7fbcbf75-51a7-42da-91c2-59f4523b4c9a	1	Other	Other
+7fbccd6e-2310-455c-b4d0-dcaaeb75ed15	1	Other	Other
+7fbcdb9b-0f0e-4570-876b-21d7d9f7d50d	1	Other	Other
+7fbd46f1-1a83-40c3-bf2e-1f40b16b34ad	1	Other	Other
+7fbd834d-7eb0-40cb-87de-0724be039b50	1	Other	Other
+7fbd8538-6f1a-48c6-88e2-dbd61e318337	1	Other	Other
+7fbdbe1e-01b1-4336-956a-e08f9192f28b	1	Other	Other
+7fbde9f6-a2d0-4d47-b59e-7620ceb59832	1	Other	Other
+7fbe19ab-9fef-48a1-92c8-7429ba18428c	1	Other	Other
+7fbe6c52-4c19-42ab-9004-be8505b177bf	1	Other	Other
+7fbec560-eefd-4d46-a9f1-db6c6ab4212d	1	Other	Other
+7fbf55a8-426b-4c16-aa41-8a76040040c4	1	\N	Other
+7fc0bc06-8bf1-4d32-a02d-2e5acb203a39	1	Other	Other
+7fc0dc6b-3f5f-4221-804e-e5c30fb552f9	1	Other	Other
+7fc138e1-1b4e-4268-a623-821ae1799e83	1	Other	Other
+7fc19bd5-2caa-47b4-990e-d80bd6e1a39f	1	Other	Other
+7fc1b20f-2a55-4919-865d-3238441dc7bf	1	Other	Other
+7fc1e1fd-81f9-4bad-99af-4f9ba6d5cb97	1	Other	Other
+7fc21a5c-e7d6-4297-b796-4a396ac04483	1	Other	Other
+7fc32370-dc39-4474-934c-3f1a4f270f8d	1	Other	Other
+7fc32c12-d795-4e08-89d1-e8a4b6919cf0	1	Other	Other
+7fc3418c-2536-4941-9838-91b244db22da	1	Other	Other
+7fc367bb-fcf6-4e29-ac44-1787bebf4a99	1	Other	Other
+7fc38ddb-e261-46fc-be48-458b53afd741	1	Other	Other
+7fc3f6ca-3c70-4ced-92a3-dd0674e7d829	1	Other	Other
+7fc43a87-07f9-45e1-aa34-44d274d2cd13	1	Other	Other
+7fc43d31-2956-42b8-b99d-9ddd33730d75	1	Other	Other
+7fc4481a-bbf8-4b83-933c-af50eb66e16d	1	Other	Other
+7fc48e90-7807-4c1a-bcf4-4ac9c9a5845b	1	Other	Other
+7fc4cb06-7a4d-4700-9f67-bfbdf147c166	1	Other	Other
+7fc4cb29-40e4-4b2d-a06d-2083a1dfaf5c	1	Other	Other
+7fc4d2ab-d9d5-4d58-849a-a85e21a63845	1	Other	Other
+7fc4e562-e80a-465e-89e5-f6caca2222d7	1	Other	Other
+7fc4f9dc-6769-47e9-930f-ef74e6b7aee6	1	Other	Other
+7fc4fd31-fc0d-4cba-ba80-5e0c700c9cc9	1	Other	Other
+7fc5774b-5e10-4089-8086-145a32cff00e	1	Other	Other
+7fc66e72-b900-47cd-bfda-388d7a3fdf1e	1	Other	Other
+7fc72189-3880-427b-9440-f35e25c60574	1	Other	Other
+7fc72ea3-f31a-4143-951a-55ea859f6709	1	Other	Other
+7fc7a111-9e7b-4c7c-9e27-40442dca3515	1	Other	Other
+7fc8037a-a9f8-4811-b300-06b7320909ce	1	Other	Other
+7fc8324a-9bdd-49a5-87c0-4984a48bec14	1	Other	Other
+7fc8430c-8c21-470b-99b5-ae4a2d051014	1	Other	Other
+7fc84730-4b14-4678-8e34-2d71abf18331	1	Other	Other
+7fc898df-6e72-452c-8c64-da5696a8871c	1	Other	Other
+7fc8a3d0-b532-431a-9b0b-3d6a315c00cb	1	Other	Other
+7fc8d66b-dedf-4f3b-b74b-f753f8c1b971	1	Other	Other
+7fc8f235-ff2e-4337-947e-eeb7e5457d2c	1	Other	Other
+7fc8f447-cfbf-4a6a-a4b1-85df5ee8def6	1	Other	Other
+7fc924a7-dad6-47f4-8fc9-5ec018c9c874	1	Other	Other
+7fc95c36-6d70-4bd5-a926-daea43dad35a	1	\N	Other
+7fc9a50a-26ff-46ba-ac27-e49243383bd1	1	Other	Other
+7fc9c770-b6a6-4d64-9fb4-f9a11f353d76	1	Other	Other
+7fc9cffc-bf3a-4aef-834b-d462d6cea380	1	Other	Other
+7fca12f6-f353-4237-b214-d2fed8c3ed4c	1	Other	Other
+7fca15ee-52b6-4362-95c8-39f386dd0486	1	\N	Other
+7fca5af3-6fe9-4295-b719-ed14824fd762	1	Other	Other
+7fca6f09-4c98-472d-9e8a-c5c460b5cef7	1	\N	Other
+7fca8282-0d4e-4029-b4df-126cc8d70904	1	Other	Other
+7fca9e00-1b70-4f5c-9601-a50d604a07fa	1	Other	Other
+7fcab10e-cbe5-4cc0-b773-511e7a726de4	1	Other	Other
+7fcad0ec-7ccb-4514-9cc4-d810405266f9	1	Other	Other
+7fcafcba-e4d9-4714-802f-c11a3200a1ca	1	Other	Other
+7fcb0b9f-a3aa-4b9d-bd02-060aadaea386	1	Other	Other
+7fcb9057-aa8f-4805-8fff-7ba338296657	1	Other	Other
+7fcbb75c-f158-4336-b7eb-b37bcc2d5bf1	1	Other	Other
+7fcbea71-8c9d-40f9-9e12-0b9cb30a1dff	1	Other	Other
+7fcbfc4f-733d-4b79-b665-52f94702e4bc	1	Other	Other
+7fcc7c40-716e-4129-9b10-0b218c882bb5	1	James	Other
+7fcc838f-3889-455d-8fc8-01d01b16cd64	1	Other	Other
+7fccca42-795d-47e7-9a83-84999e079b88	1	Other	Other
+7fcccca3-091f-444a-98a0-6de06b007fe2	1	\N	Other
+7fcd1fab-589e-463c-8621-cfe947d2d077	1	Other	Other
+7fcd21f5-9c1b-458e-adf0-393ad15d65b0	1	Other	Other
+7fcd786b-24fb-4208-93f1-2defa7749e2d	1	Other	Other
+7fcd8535-1be9-4390-9e45-21533de330bd	1	Other	Other
+7fcda961-09b4-42e1-9b22-da8f81e7eb85	1	Other	Other
+7fcdc9bd-8c06-4371-a530-578127c00d72	1	Other	Other
+7fce265d-f6cf-4b6b-be13-54b7c12b582d	1	Other	Other
+7fceb359-5abc-4340-a236-84fe55d12285	1	Other	Other
+7fcf1923-8d8d-48b0-8942-0b4a9a3fdffb	1	Other	Other
+7fcf383f-596a-4916-803b-356c97b8f8a0	1	\N	Other
+7fcf4e69-903b-4421-9b4a-09478b699353	1	Other	Other
+7fcf4e6a-5f02-432b-9091-63bd6bb11aa6	1	Other	Other
+7fcf91c4-2af7-4c3c-a0da-f3c109f20fc6	1	Other	Other
+7fcf96a4-34af-406f-b400-7305f0eb4944	1	Other	Other
+7fcfd625-7f77-4737-aeb8-ca2eee78b3fe	1	Other	Other
+7fd00dc7-c684-4410-b16c-6970338c5681	1	Other	Other
+7fd03ed5-ebc8-44e0-8539-f4075052e9b8	1	Other	Other
+7fd04dfd-daf5-436b-880c-783d7f01c5e2	1	Other	Other
+7fd05287-8ad6-43ea-bfe4-ad8794f88756	1	Other	Other
+7fd066ff-1d5f-42ea-b108-6cc75b20afd0	1	Other	Other
+7fd0a6ea-65f4-491b-843e-74c665aa44ca	1	Other	Other
+7fd0d964-04a0-4778-b5b0-e9fd5eba7b53	1	Other	Other
+7fd153a1-5af5-4832-a76d-8db8131c777d	1	\N	Other
+7fd16441-3360-40cd-aa32-2a705d966b69	1	Other	Other
+7fd16547-75e3-4228-ae9f-ed7fb3b2c030	1	Other	Other
+7fd17825-2e16-44bc-a4a7-8ec486408c64	1	Other	Other
+7fd18630-b3ee-4ed0-8af0-8e14eae44629	1	Other	Other
+7fd1b975-2567-4b7a-a1c1-47a62e568677	1	Other	Other
+7fd20736-25ee-48b8-85cd-a077d2d938d1	1	Other	Other
+7fd2197b-5afa-4b65-ac4b-a5008db54db2	1	Other	Other
+7fd23669-12cb-4cc5-a85b-f96e6ff48e6d	1	Other	Other
+7fd2550b-5c39-495c-a14f-44ff0a403573	1	Other	Other
+7fd2d93e-9922-4803-b2f2-40a18763e349	1	\N	Other
+7fd31b57-bf04-4c80-a303-160d8b16c7fb	1	Other	Other
+7fd347f5-b20c-4c82-af03-2e8f69f7e0f0	1	Other	Other
+7fd34873-f04a-4eb2-b4be-e90bae3ea62e	1	Other	Other
+7fd35609-bc27-4e19-9091-433e4951755c	1	Other	Other
+7fd3f60f-4095-4b59-88e0-387341bfcb3e	1	Other	Other
+7fd42871-7f1b-48e8-9d25-7563052456db	1	Other	Other
+7fd44738-0b90-4dec-869a-ca9180750d08	1	Other	Other
+7fd47545-ebd9-4ec9-b18e-5ec6253895a2	1	Other	Other
+7fd4a691-9389-4c35-bd7e-c76e9b15f73a	1	Other	Other
+7fd4ce64-f38a-4c2c-a643-ba73e834bc8e	1	Other	Other
+7fd50a33-bfa1-4758-a1b1-1dce5bdfbf80	1	Other	Other
+7fd600e5-5db0-48cf-a795-b32819db6155	1	Other	Other
+7fd64bc8-57ee-47a9-bfd1-d94587db899f	1	Other	Other
+7fd66a7a-b6fe-481f-beee-422cbd4976a2	1	Other	Other
+7fd68028-ed36-4159-9085-e746a4e13223	1	Other	Other
+7fd683bd-1542-447d-a991-e6ef5cbee2e9	1	Other	Other
+7fd6ba82-868c-4ee9-bc05-d0aec8ad259a	1	Other	Other
+7fd6bdad-eac5-403c-8ec2-ebdc5fea152f	1	Other	Other
+7fd6d4fa-3ff3-43f1-a42c-c45f3d999ea2	1	Other	Other
+7fd6faa2-94cc-4dea-816d-9d3db2bc33ab	1	Other	Other
+7fd744c7-d836-467e-8a2f-7b9b512cbeea	1	Other	Other
+7fd7f694-91b0-48a8-a4d2-5c31f9fce874	1	\N	Other
+7fd852dd-4dc6-4e69-80c5-01f2f3d2a97d	1	Other	Other
+7fd8b7a5-ea6e-4353-927d-6f21ad7e560d	1	Other	Other
+7fd8b963-7f57-40ef-895f-5cc476ebf4c7	1	Other	Other
+7fd8cefc-7800-4b42-b7c3-ad973f2e18fa	1	Other	Other
+7fd911f8-160d-4853-8bd9-76c3df62fa4b	1	Other	Other
+7fd96071-db91-454e-8e29-09c93a5c34f4	1	Other	Other
+7fd961d9-1bff-4f8f-8287-494082a28b96	1	Other	Other
+7fd969e0-9278-48bd-9a84-c554c124fc54	1	Other	Other
+7fd96be5-1824-44d4-9c42-f07dea510469	1	Other	Other
+7fd9937b-6cc0-4029-9204-361a642bf8ff	1	Other	Other
+7fd99a48-8d80-49ab-bbc8-340dad371efb	1	Other	Other
+7fd9e4ad-19e8-45a2-aeab-6404ead73511	1	Other	Other
+7fd9edec-5e7e-4c46-9e34-4c7e9ae7f49a	1	Other	Other
+7fda587f-73a7-4561-94f2-274eea0f464e	1	Other	Other
+7fda96bd-11df-4dd5-b132-5b679a335b90	1	Other	Other
+7fda9e49-c55b-4914-84c0-973d7053a622	1	\N	Other
+7fdae13f-d69c-4293-bc99-00671e510eed	1	\N	Other
+7fdb1c73-5928-4c42-be56-0f9742207f4d	1	Other	Other
+7fdb29bd-c06f-4c31-8467-0a32ba26198f	1	Other	Other
+7fdb302b-50e5-4bb8-80c2-0c6acefeb1d2	1	Other	Other
+7fdb415b-9b19-4598-904a-6d0626d07d80	1	Other	Other
+7fdb6df3-a441-4f6d-a8a2-c460adfd5afe	1	Other	Other
+7fdb7bb2-482c-4296-93f1-ff1113e6b46e	1	Other	Other
+7fdbbcfa-3d4b-4b65-bfdf-d5cabc267cde	1	Other	Other
+7fdbed29-81f9-4ec3-a6f6-781b486a93cb	1	Other	Other
+7fdbf112-cd8a-42c9-9e17-df2790561b9b	1	Other	Other
+7fdc8403-9e0a-4c1b-9741-88e742131f5c	1	Other	Other
+7fdcbe2c-806e-4a25-9c70-9a85a7705fc0	1	Other	Other
+7fdce585-145a-429e-9829-10e024b4c9c4	1	James	Other
+7fdcefe2-6666-4584-a7f1-4e35c5be54db	1	Other	Other
+7fddc5d4-f495-4acc-ba1d-29482de9a1eb	1	Other	Other
+7fde079f-a789-4837-be3e-d24aefa1de5c	1	Other	Other
+7fde17bc-4884-437c-b0b1-f9b11cb1b4b2	1	Other	Other
+7fde4e41-dccf-476b-83a6-8c390baabbad	1	Other	Other
+7fdee3d7-ad21-492f-9b1c-11a3e1d93c75	1	Other	Other
+7fdf15cb-c97e-4df4-84a4-fcab919eff54	1	Other	Other
+7fdf506c-47d7-4177-b7db-7c82eadbeb34	1	Other	Other
+7fdf698e-6c0c-4eec-8ad6-307ded695d28	1	Other	Other
+7fdf755e-ff51-4f63-a428-e538fea01693	1	Other	Other
+7fdf87ba-f074-4760-a32b-b99823c8f3e0	1	Other	Other
+7fdf9ed8-4cfc-49b1-8859-d21191c6735d	1	Other	Other
+7fdff1ae-043f-4726-bf66-dfa8e72c1282	1	Other	Other
+7fe01fbe-b530-4c88-9eb9-03cc59f5cc8b	1	Other	Other
+7fe09696-1634-4e34-98c4-0b432192a844	1	Other	Other
+7fe0bdcb-02f0-4209-b8ea-d52038fbe8f6	1	Other	Other
+7fe10b75-8e68-4aae-9a87-59d89877dfac	1	James	Other
+7fe13784-6947-4a0e-a2b4-d6d77932065e	1	Other	Other
+7fe141a3-e00a-4f37-8ab2-26883fd79d41	1	Other	Other
+7fe1586b-3ad6-4f6c-8665-8fdfd3b36906	1	Other	Other
+7fe16c61-d28a-4f71-a9bd-2995daac0a0c	1	Other	Other
+7fe18255-f0af-4f0a-b078-bd01598efec8	1	Other	Other
+7fe1addf-1bb6-455d-a37c-aa62fdb5b470	1	Other	Other
+7fe1bdbb-d342-403e-bcc4-cd6733e8410f	1	Other	Other
+7fe1d267-3a4e-4f40-a646-67978261ee9c	1	Other	Other
+7fe1fbdb-085e-4991-b09b-8b3d83f668f4	1	Other	Other
+7fe1fc61-a365-4786-8f10-544cf68f8ef3	1	Other	Other
+7fe21538-5a79-4c0d-90d3-eac350e20ae0	1	Other	Other
+7fe22fb6-427a-4256-9a6f-51f94a12d034	1	Other	Other
+7fe2472a-705d-4b0c-adf7-16982f946748	1	Other	Other
+7fe2750d-efda-446e-88b0-a4d1b54ee0de	1	Other	Other
+7fe2a1f9-2228-4293-9f41-ddca27435fa5	1	Other	Other
+7fe2c939-e405-427f-ac47-df3713469185	1	Other	Other
+7fe2e57b-e10c-4547-bf45-4f15b93853a6	1	Other	Other
+7fe2e8e0-9e3f-4bf7-9dfb-99136b1f5968	1	James	Other
+7fe2ffbb-195d-4998-9ad1-5bf00b372ddb	1	Other	Other
+7fe3200a-562d-4b64-9b82-8947b1156965	1	Other	Other
+7fe3392f-719b-419d-90f6-c10950d48724	1	James	Other
+7fe3873a-b021-4e80-b8c6-6e43c0a25c77	1	Other	Other
+7fe395dd-041b-46fc-a8dc-e78ff7b6b6b2	1	Other	Other
+7fe3aa8b-3fab-4e5c-a627-cf8067df2573	1	Other	Other
+7fe3c0bd-d921-4086-8bc6-f7665b99f0ad	1	Other	Other
+7fe3eff6-a45e-49c5-ac94-e6554ee52c8e	1	Other	Other
+7fe3f95d-d7d7-4dbd-997d-efc7fcd3a54b	1	Other	Other
+7fe408bd-a704-40a1-9e9b-5ded2ae668e4	1	Other	Other
+7fe435a8-b323-4e22-b757-2da2681040c7	1	Other	Other
+7fe495ec-f020-48d4-9661-b07a2ebc79c7	1	Other	Other
+7fe4b876-ce89-4acc-9225-c9cfc78623c8	1	Other	Other
+7fe4ec0e-17d6-4e48-b1b6-2627c687bdb9	1	Other	Other
+7fe50beb-9631-46ae-970f-3d0ac2440f70	1	Other	Other
+7fe54eaa-3859-49a2-958b-a7ae3cd2a4fa	1	Other	Other
+7fe58ffb-04c1-42f4-a21e-568123394132	1	Other	Other
+7fe595c9-be5a-4123-99ad-e62af7eb10b0	1	Other	Other
+7fe5b03b-9f6f-405d-acb4-6eef9aa0d78a	1	Other	Other
+7fe5b2bd-94e0-46f0-a95a-c0d8458bc6ed	1	Other	Other
+7fe6adb9-5fc7-47e4-8696-24aacc0d6df5	1	Other	Other
+7fe6bc8d-84f7-4279-9ff0-8e0f5c6053dd	1	Other	Other
+7fe6bc90-4e49-497e-94bc-77928502c00f	1	Other	Other
+7fe6e4ad-2a43-4e98-b1e0-a94c34583e69	1	Other	Other
+7fe6e70b-0359-4528-88a4-ebb2552551b3	1	Other	Other
+7fe701b3-8d7d-4893-9fc6-b41f3c9df6f4	1	Other	Other
+7fe70213-0f57-420a-8e51-9ada5200f3c3	1	Other	Other
+7fe78a50-2a2b-45a5-b73a-f163fff007bd	1	Other	Other
+7fe81604-45a1-4b7d-b3e2-56e6db6e3b03	1	Other	Other
+7fe8204f-7fa2-4b88-9677-8525fb9c914b	1	Other	Other
+7fe84eae-0fc9-4c4c-9aa1-6df3f4b20dde	1	\N	Other
+7fe84f5c-9ded-4549-a8d7-d9c75a79316e	1	Other	Other
+7fe85c48-3137-4c6a-bb72-3bd65ee7346d	1	Other	Other
+7fe8f263-47eb-4e8a-aba6-9f4d34f99257	1	Other	Other
+7fe8f917-be5a-431e-a06f-8cc9ad7abc24	1	James	Other
+7fe900ea-c3c4-40f2-924e-49d449a1a4e7	1	Other	Other
+7fe93178-8b93-4895-8e49-4c44566a8b48	1	Other	Other
+7fe93807-873d-48a2-9468-1e37122dc70c	1	Other	Other
+7fe9425a-ccd6-48c0-a132-ddc990021e1e	1	Other	Other
+7fe9a48a-7746-421e-8877-3157ef4c42a7	1	Other	Other
+7fe9c1ef-56ca-4da6-a0ac-b3ace8229908	1	James	Other
+7fe9fd3f-fec0-42d3-bb06-5fe285cd7024	1	Other	Other
+7fea419c-21f4-4ef6-b277-f804ab3c4c5c	1	Other	Other
+7fea555f-7f53-4984-ae8b-9384174927d9	1	Other	Other
+7fea8440-0a2c-4254-832c-3c71894a0f7c	1	Other	Other
+7fea9422-5281-4512-8c2b-ed8c4f583ba8	1	Other	Other
+7feaacd1-675f-478b-b869-d275dabce693	1	Other	Other
+7feae44a-a2ea-48f8-909a-1df50152ca39	1	Other	Other
+7feafcb9-f048-41fb-895c-3e03662a49c1	1	Other	Other
+7feb06b9-7725-47bf-83b4-764a971c2dcf	1	Other	Other
+7feb442d-673b-417a-b6de-ee8a9dd93243	1	Other	Other
+7feb504d-b255-46cd-8c8c-25594964ac82	1	Other	Other
+7feb6b3a-c212-46f0-9d84-fad4a9f4e19d	1	Other	Other
+7febe81b-ca4a-4e55-9515-4cf600718f25	1	Other	Other
+7febf956-58c9-4d04-8244-6e83547b349d	1	Other	Other
+7febfb39-4405-43fb-9a9f-967e024c2243	1	Other	Other
+7fec3fb8-00e8-4265-854c-05cf804ed543	1	Other	Other
+7fec8743-e08e-4dac-ba83-ffc26e854250	1	Other	Other
+7feceb57-7bc1-4899-8cd8-f80c3677cb3d	1	Other	Other
+7fed6447-29a8-4c84-b437-f9b15d59a761	1	Other	Other
+7fedfa94-4f16-4ffa-930d-6559b04ab616	1	Other	Other
+7fee1378-8dbe-4baf-a79b-e80fc06272c7	1	Other	Other
+7fee1902-498f-472a-a6a6-d2b73ae7b219	1	Other	Other
+7fee62ed-f26c-4155-9eb7-0063683c19b9	1	Other	Other
+7fee7468-db9e-4cc3-964e-c7e676dfa587	1	Other	Other
+7feede6a-3a56-4ce0-af10-d66d17e3ec40	1	Other	Other
+7fef50b8-155b-45ed-851b-a87369705c56	1	Other	Other
+7fef7631-76a9-4569-a21e-6ae41a8e2b25	1	Other	Other
+7fefb000-9abb-479e-bd4d-2280626a6900	1	Other	Other
+7fefb27e-6863-4230-96b9-7850b51e29cb	1	Other	Other
+7ff00ebf-1eca-4a0b-9a3d-8c4de16fee00	1	Other	Other
+7ff07925-abb5-4ada-a0aa-77eb664ef657	1	Other	Other
+7ff0aa79-01df-4d81-a5ef-0a8a4331159b	1	Other	Other
+7ff0ac7c-53e2-4063-97c3-c3ca173ab007	1	Other	Other
+7ff0bc50-f2ec-4e83-a699-9d06278f1135	1	Other	Other
+7ff11763-c383-4954-9bf1-74342a1ea0bd	1	Other	Other
+7ff144c9-636b-4686-8992-2809a1dc11a9	1	Other	Other
+7ff176ad-062a-48b2-b411-4c342f5b28e8	1	Other	Other
+7ff177d1-cc11-4db2-88a7-04d106bf5f07	1	Other	Other
+7ff17dbb-b0f6-4137-80e6-d3eec6373ae2	1	Other	Other
+7ff1d9df-8650-41e7-b5a2-e780838c1018	1	Other	Other
+7ff24786-f2b6-44ba-8387-19b5a062302d	1	Other	Other
+7ff28cf9-4842-4a64-b5aa-dc53e5f64d41	1	Other	Other
+7ff2b203-2152-49c0-a7b8-0ba118b4a55d	1	Other	Other
+7ff2b33b-aae8-4100-b613-75f7e33aa6c8	1	Other	Other
+7ff357d8-3754-4d94-aced-f86f86f35001	1	\N	Other
+7ff35878-bb31-4cd0-9911-6cb40c84dfd9	1	Other	Other
+7ff3635a-1ec3-4497-b18d-ddc1bda6eb17	1	Other	Other
+7ff364a6-69fb-46b7-8d3c-3050e1473d78	1	Other	Other
+7ff37f8c-73a2-4d79-ac35-dd64a33430c3	1	Other	Other
+7ff39cea-e226-4b8b-824d-38a3a64cff82	1	Other	Other
+7ff3b0dd-c581-41ff-b7c5-babfa22fd848	1	Other	Other
+7ff3d698-7cd7-492c-b101-8304ea9902bd	1	Other	Other
+7ff40ab3-0163-4050-90f0-c4acb9ed46be	1	\N	Other
+7ff42dae-5ca1-4ab3-b7b8-477fcc0be56f	1	Other	Other
+7ff446aa-18be-4c18-8cf8-900139cd8d04	1	Other	Other
+7ff47cdd-b4d7-4d0d-9f88-9b58d3c00a4a	1	Other	Other
+7ff4ce55-f98f-463d-85a3-6cc48c4e7648	1	Other	Other
+7ff4cfbd-1944-4b98-878d-aaa637f0951c	1	Other	Other
+7ff4fd24-fc85-4fe7-979e-ca4c2ba7f082	1	Other	Other
+7ff52792-e058-4cbf-a148-7fdc21cae2c1	1	Other	Other
+7ff52944-d0b4-4f60-9cc2-1ed54b444cc8	1	Other	Other
+7ff58fd6-867d-43a2-a8f8-ef8a99bfc512	1	Other	Other
+7ff5dd30-0183-4522-acd2-f14e7230b02c	1	Other	Other
+7ff5e882-4b6a-4079-a877-8309f9792d7d	1	Other	Other
+7ff6050c-5f1f-4072-9296-ad209ecd8a17	1	Other	Other
+7ff67a0b-4e79-4d23-a3ec-285945105f81	1	Other	Other
+7ff69352-20df-4ec7-8336-03831f093f2c	1	Other	Other
+7ff6c996-4bde-4405-931e-e50fa8616ca5	1	Other	Other
+7ff6cf9e-7d7e-4fa0-b369-4fae36296f11	1	Other	Other
+7ff6e698-5c9a-429e-b266-bda56ddf7d42	1	Other	Other
+7ff732c1-a52f-4b7c-91c6-55941f64f287	1	Other	Other
+7ff73b65-4b92-4e5e-86c3-627d29ae8a1d	1	Other	Other
+7ff7885c-8b39-44d5-99dd-57586ec5109d	1	Other	Other
+7ff7b65a-729f-4127-abff-78a1c8ac5020	1	Other	Other
+7ff7f8ae-e4bb-40ca-bfcb-c62faa230ea4	1	Other	Other
+7ff88ed1-26ac-4670-81e7-093ef72c6436	1	Other	Other
+7ff8f63b-2bc1-4ef2-80aa-523879018297	1	\N	Other
+7ff91399-778e-4a22-b6fd-3c0fdb5f8196	1	Other	Other
+7ff951e1-8aa0-4313-9b2c-3bb561794856	1	Other	Other
+7ff95656-3125-4252-b7e8-5e9ca5dfcfdd	1	Other	Other
+7ff9660c-4d01-4c20-88ec-7be6977a7597	1	Other	Other
+7ff9efe1-2539-4649-abaa-865d84c9cfa0	1	Other	Other
+7ff9f752-f995-49a4-9a33-42d46c3f0a5c	1	Other	Other
+7ffa020d-19e5-43c6-8184-8e3497d4f968	1	Other	Other
+7ffa0970-af78-4835-9fd0-b53cebb754db	1	Other	Other
+7ffa12bc-9e34-4867-b7f7-7b3041b7aa7f	1	Other	Other
+7ffa2148-a196-4ba8-8264-aeb654577f30	1	Other	Other
+7ffa40f0-92b6-421e-935d-98af83fbb73a	1	Other	Other
+7ffaa88a-4f2c-4490-b294-b483a6fb874a	1	Other	Other
+7ffad632-a4d7-4099-82eb-f566c701a973	1	Other	Other
+7ffb30a9-76cb-45af-9c5a-e7d40ba3f320	1	Other	Other
+7ffb965d-1890-4022-99f6-4602660e7b71	1	Other	Other
+7ffc7409-3cd9-4c1f-9054-c93cc1dae094	1	Other	Other
+7ffcb644-4e4d-47f8-8600-140e93a07101	1	Other	Other
+7ffcbc17-70a2-45f9-beff-34483a1fb080	1	Other	Other
+7ffcd4cd-66c9-4ba6-b06c-b1f523a0a281	1	Other	Other
+7ffceb3b-98ae-44db-95a4-3377058bc2e2	1	Other	Other
+7ffd1d6c-5cfd-4590-8874-9c4825abc2ed	1	Other	Other
+7ffdc3ab-4be6-4825-9097-61291ae4e4ef	1	Other	Other
+7ffe6209-8642-4f85-a7fc-b0263455ffe1	1	Other	Other
+7ffe9e07-470f-473a-8526-dc12d1267d01	1	Other	Other
+7ffed492-17b1-48cc-afcf-a4cd329071bb	1	Other	Other
+7ffee56c-af88-4eb3-8f3e-fbf0e8057960	1	Other	Other
+7fff5b79-172f-4c33-8773-7d32e540dcd6	1	Other	Other
+7fff5cea-10d0-4e33-bc8e-f032ab5b0b38	1	Other	Other
+7fff61d5-3b81-4360-a1d3-44eff3934a12	1	Other	Other
+7fff6651-01e4-461d-8816-95d206eb12f4	1	Other	Other
+7fffd1f7-3b49-49f1-8d04-583c05ac739f	1	Other	Other
+7fffef33-5f80-46f2-a368-72246bc7d4e1	1	Other	Other
+800004ab-4859-4b0b-ac20-cf921c6bddfd	1	Other	Other
+80001195-f475-41d4-8bec-20185ed44fa7	1	Other	Other
+8000170d-c319-43d7-b9c5-f528677bf5e1	1	Other	Other
+800024f3-b524-4310-9761-1282385c6663	1	Other	Other
+800067da-c5cc-46ac-a3a2-b6ffc92dcc9e	1	Other	Other
+80007623-d0cf-4a93-8aaa-f5f84e9c1b96	1	Other	Other
+800079fb-0e96-43b3-a9f5-1e7175fb8948	1	Other	Other
+8000a1a2-7ebf-4ad0-b32b-c7baaafcd843	1	Other	Other
+8000cfd4-7147-40dd-b8a9-f652e3e8230c	1	Other	Other
+8000ee9b-efc6-4eec-9360-c044b0a380d2	1	Other	Other
+80012885-8be8-4604-8816-0ebf8f70bcdd	1	Other	Other
+80013561-8501-4e1c-a634-c3b984046e0f	1	Other	Other
+80017ea7-d26a-43ef-9730-56c8fe93cb67	1	Other	Other
+8001b2ff-76f8-4a35-a665-17ab5cec8969	1	Other	Other
+8001c99f-1f54-4197-afda-3f49fd139d3a	1	Other	Other
+80022242-46e0-4d88-82a9-0d6240e15b3b	1	Other	Other
+80027750-bdbe-45f8-800f-3f5438136c0f	1	Other	Other
+80027e75-8c91-45df-85f9-c00d0f99afc0	1	Other	Other
+8002e6c3-2bb6-406f-af17-f703cad9ad09	1	Other	Other
+80030c34-6fe4-40e2-aa45-cc85f5d818e6	1	Other	Other
+800371dc-f9b4-4aa8-8227-8fe424681ffc	1	Other	Other
+8003c0d5-d248-43c8-9c51-5d1b29d7477b	1	Other	Other
+8003ca4a-cef2-4dc2-9851-585d24fa81e8	1	Other	Other
+80041a2f-c8c4-4398-beba-00836a773dbe	1	Other	Other
+800455f5-ed48-4d2f-b2ad-fd51b2c94706	1	Other	Other
+800474eb-e848-485a-9cc5-a784d03113cd	1	Other	Other
+8004c4c7-14c1-4599-be12-d9fe41e7d028	1	Other	Other
+800504d1-9473-47a8-a8ab-1aa9728632f0	1	Other	Other
+800533f3-d56c-4eed-a43d-a82b78577193	1	Other	Other
+80056212-b0ea-4a2d-a3e7-b0930fb0d6ea	1	Other	Other
+80056cf7-c5c7-48b4-b7cc-c4c48dc2e986	1	Other	Other
+800589db-a5e6-46f2-a945-fc0ffcda3555	1	Other	Other
+80061ef5-71a2-419d-89d0-2530bc83b852	1	Other	Other
+80067186-bfa0-4393-858e-516cdef4e650	1	Other	Other
+80067e24-50ea-4c2f-b945-044e9b37291b	1	Other	Other
+8006a155-75f7-40f3-8b94-901b8eb258c2	1	Other	Other
+8006a970-cee7-4cce-846d-ab7a2dfd7b8c	1	Other	Other
+8006efea-80d1-4982-b746-f29a1cb2e907	1	Other	Other
+80070c83-5eb0-4b90-a04e-c6f316005495	1	Other	Other
+8007ecef-6d37-40b0-b5a7-0eb89b329a3f	1	\N	Other
+800827a3-a912-41e6-9a1e-14f26f602bbc	1	Other	Other
+8008d006-4b63-4c0c-aef9-cd9ad400b106	1	Other	Other
+8008d9a0-1e2a-4f4e-af07-9f14ddccf67e	1	Other	Other
+8008e829-6e5e-4710-a8b5-aaacc1e3dae9	1	Other	Other
+8009449d-b068-401f-9ebd-c623251bf111	1	Other	Other
+80094e6a-1478-4651-809b-1e3db910d4ce	1	Other	Other
+8009df16-0248-491c-94a8-093f822e05b7	1	Other	Other
+800a066a-4953-47a2-902d-8e7103b1e40f	1	\N	Other
+800a0ef7-518f-442d-8c55-36c64da4edf7	1	Other	Other
+800a3598-fc53-4e5f-aec1-20ea997c2887	1	Other	Other
+800a7d6f-9a82-4930-b08a-679886dafc72	1	Other	Other
+800a8756-5ed8-4929-8698-53b212686d13	1	Other	Other
+800a9d53-13e0-4e1c-a762-d244af281d1f	1	Other	Other
+800b0a42-a635-4428-ab29-cc92e077f718	1	Other	Other
+800b3068-6c20-429e-b0f9-99d512684de6	1	Other	Other
+800b3268-e4fd-4ff1-9abb-7b80c4f59f90	1	Other	Other
+800b3e78-c896-4db8-ad2f-20ea58506bae	1	\N	Other
+800b6644-b569-47fc-943a-97bcfd92ec9c	1	Other	Other
+800c36da-2054-4a61-98c6-5464e9351b6d	1	Other	Other
+800c73ac-22eb-4ca8-ab31-04763949a839	1	James	Other
+800c7d56-1153-4baf-a0a0-187ca9c7c722	1	Other	Other
+800cfc56-2bac-4353-bc18-3be789c8f010	1	Other	Other
+800d0bc9-ffed-4d59-a700-7c0e7bd96652	1	Other	Other
+800d42df-de6c-4ee5-92c1-897ca34873ff	1	Other	Other
+800dba04-5aa1-480f-bc38-abd3fafe0edb	1	Other	Other
+800dcedc-7b78-4e31-a2cf-80814118db2e	1	Other	Other
+800dd047-c21d-4f4a-85af-6a28074d8dbc	1	Other	Other
+800ddeb0-81bc-4609-8e51-9e63cd8c3e02	1	Other	Other
+800df8da-9e78-4d3b-a548-12b48a84e875	1	Other	Other
+800e1444-bb29-4f8f-a6e1-e3eefd28619d	1	Other	Other
+800e260b-3078-4ba9-a877-c86de42d6e2d	1	Other	Other
+800f32f0-cef7-4443-b57b-ecde2b1ddbe0	1	Other	Other
+800f37e1-aa25-42d7-831a-8099342c5ee0	1	Other	Other
+800f4a75-0523-4131-8f76-979e467bb3a3	1	Other	Other
+800f6015-5f71-45d6-ba1f-5fd4c1fdd171	1	Other	Other
+800f8aa2-eb22-4343-b129-c23aa461dfd8	1	Other	Other
+800f8fb9-202f-4dc3-97e3-b50fde1fd363	1	Other	Other
+800fa3bc-2f28-4dd2-96f9-e9659913a2a9	1	Other	Other
+800fbb83-fc7c-4401-8fc7-2c0baec39cb3	1	Other	Other
+800fd923-3b76-4acf-aec9-0f14fb325a9d	1	Other	Other
+800fe607-9518-4e9a-867d-f7403cfaf487	1	Other	Other
+80101af4-0b7e-4ce0-8ff8-9114e48e9ec6	1	Other	Other
+80104473-d450-4ab4-8dca-c5415118187e	1	Other	Other
+801050f5-8d88-4bf6-8649-b015dddeb777	1	Other	Other
+8010850b-c3b1-4fc2-b733-9187e3f10b43	1	Other	Other
+80108f38-ff6e-4fae-ae98-6ba8f1b0a5fa	1	Other	Other
+8010a4d1-0afc-4e9d-b41e-69e38c6cdcd5	1	\N	Other
+8010b89a-9eec-4232-943a-15594213e592	1	Other	Other
+80110c54-3c7a-4020-923b-3286db1f6cc5	1	Other	Other
+8011192d-ea69-4c4e-9edb-8c129213ad62	1	Other	Other
+80114a02-4291-46a0-8266-cd5615748287	1	Other	Other
+80116121-b53b-48d0-afeb-bff8ee685785	1	Other	Other
+80117db0-49d9-4ce0-ac8d-4c31975984ce	1	Other	Other
+8011aadd-4b7d-4296-b64f-ac938e6c6a0f	1	Other	Other
+8011bd90-dc5b-4055-b36f-1b4e6c1abf15	1	\N	Other
+8011e174-9d44-4b8d-92cc-0e316b6ca7cb	1	Other	Other
+8012300d-8e90-4f82-b123-2987f592d7e9	1	Other	Other
+8012ad61-3e9e-4ddd-95a2-937bf67a17b8	1	Other	Other
+8012b969-4d2d-4157-8d32-10f61da18359	1	Other	Other
+80132a8f-8c3a-40da-88bf-6ca0ebdcf574	1	Other	Other
+8013723e-a8e8-48d5-a917-5ac7a0f57d18	1	Other	Other
+8013aca7-363a-4519-88b1-a120a6af9d26	1	Other	Other
+8013b783-2287-4db3-8661-98f2cdddab9f	1	Other	Other
+80140b62-c117-4b2e-9374-512c138f88cc	1	Other	Other
+80140e69-cc47-453b-b825-68a3c2b694b9	1	Other	Other
+8014be1a-ddb8-47be-8d7b-ce69295efc79	1	Other	Other
+801543fc-c7ec-49ee-8190-c302a6e8f22e	1	Other	Other
+80157fc5-621e-4cc8-a334-5804473fd558	1	Other	Other
+8015fc6e-c263-4317-9c28-d613026362c0	1	Other	Other
+8016844f-3980-40d6-9d6c-45d74dda47fa	1	Other	Other
+8016845e-122b-42fd-af62-baeaeb9ab385	1	Other	Other
+8016d3f7-4620-4031-9380-97a3c91deb67	1	Other	Other
+8016e6d7-05c0-4aea-a5e9-674b8bc5aeba	1	Other	Other
+80172aa7-6744-4122-abc8-87786f4dee4a	1	Other	Other
+80172e96-52d1-4474-b2b1-007844f13cff	1	Other	Other
+8017776b-f344-41f6-864e-ad3bbf9053c8	1	Other	Other
+8017d9f3-808f-482a-b0f0-4213a588d53c	1	Other	Other
+80183469-75a1-4a50-b3ec-e117cefd026e	1	Other	Other
+80185e38-c496-4f1c-a9ff-d978a1a866fa	1	Other	Other
+80187b8d-ffc4-414a-90e2-1706dd944dbe	1	Other	Other
+801968d4-92cf-4875-82f5-99dfc93862e7	1	Other	Other
+80197262-8542-4465-a456-6c60ef8960cb	1	Other	Other
+8019c5b4-3ef2-4438-b601-9cf4aa05f8d8	1	Other	Other
+801a07c7-acfb-4b78-b2fd-5b4f8947b29e	1	Other	Other
+801a08db-946d-476e-b7d7-3c7297d91830	1	Other	Other
+801a2468-e275-4f7a-9165-6bbe76c26a35	1	Other	Other
+801a625c-b04c-4e0c-ba39-d4b042f6457b	1	Other	Other
+801ac7f8-5112-4100-875a-bc1dea751e03	1	Other	Other
+801b4be4-476e-4fe1-8f66-badf961e9d61	1	Other	Other
+801b8453-5e2f-4750-9c6e-9f0d755c2501	1	Other	Other
+801bc7d5-ce3d-45c1-8a58-fdf0a565eb9c	1	Other	Other
+801bce66-5bc1-4e88-8d39-a72b747b2f96	1	Other	Other
+801c3db6-f399-4700-ad4e-7cf088aa997c	1	Other	Other
+801c4241-5a38-40d2-b3a2-9944ee4fb2f8	1	Other	Other
+801c4e17-94b2-4119-ad2b-4fe99b7b6e39	1	Other	Other
+801c9b40-9b0c-4035-a44a-21532e278d8b	1	Other	Other
+801d15d5-b9be-4601-90ea-f331522aab53	1	Other	Other
+801dd2c5-18b1-4add-b673-86fb107485a9	1	Other	Other
+801e173a-a03b-427d-bcdc-c49885e598ee	1	Other	Other
+801e4df2-848c-4e4d-a802-fb77d0b2e2fe	1	\N	Other
+801e72eb-9462-4b84-ac47-30f547f4bc4e	1	\N	Other
+801eaf9d-acb9-4808-ae13-19ab300db575	1	Other	Other
+801edc0b-7112-464c-ac3e-a9cd95282f39	1	Other	Other
+801edd6e-7adf-4c37-b432-3d2d3e8a4c73	1	Other	Other
+801f1b4d-ca88-4be7-a2eb-56b1ec4fa4cf	1	Other	Other
+801f4db1-f1d0-46a7-9b74-5cc20ce3cda9	1	Other	Other
+801f9207-e541-4e02-8526-9bae2feb89b1	1	Other	Other
+801fe199-65da-4c3a-8791-1ed345dc84a3	1	Other	Other
+80203c35-faed-4d1f-bb60-ff5597678f69	1	Other	Other
+80204689-dea4-4200-941a-221ad3480fab	1	Other	Other
+80210fbf-b88c-43bf-8da8-6d7c5f47f9c8	1	Other	Other
+80216603-cc17-432d-a09b-1f8aa344e527	1	Other	Other
+80217dad-855c-48d2-8f59-ae8ae6e45e6f	1	Other	Other
+8021cace-c9c5-41ef-84c5-8ad7004e343d	1	Other	Other
+80220594-2527-44e5-ba99-8a88a8a70784	1	Other	Other
+80221b94-50d4-40e9-9d9e-085b9a139221	1	Other	Other
+80222259-6718-41e8-82ff-0f710835a1e0	1	Other	Other
+8022458e-237a-4435-8fd7-ec9ec2f03683	1	Other	Other
+8022bfac-55f2-4c64-b0c3-b8d76100fcb6	1	Other	Other
+8022cabd-79f3-4619-9843-d95baf6e377d	1	Other	Other
+8022e6ce-cca3-4447-805c-e7bf41b45354	1	Other	Other
+802315bf-67d1-47c9-a419-4f0ea11a5ca3	1	Other	Other
+8023a773-4e62-4881-a4e8-cf7559e59062	1	Other	Other
+8023f699-553c-40d8-aa78-7589939f06bc	1	Other	Other
+8024230e-1dee-4bf2-8bfd-b47301b571c1	1	Other	Other
+80250d05-240f-4eaf-9386-6e1a6121b190	1	Other	Other
+802520fc-a275-4659-8bbd-0bdfe67db252	1	Other	Other
+80255320-0820-448f-9f59-118341132052	1	Other	Other
+80259ea2-8660-49bb-b7d7-871c33903227	1	Other	Other
+8025c30b-4f64-4039-a653-aa711f68e2de	1	Other	Other
+8025cfd4-60a0-41ea-a0c9-b5a7d4c6c423	1	Other	Other
+8025dd51-59a3-46fa-9465-55357d73b36f	1	Other	Other
+8025e456-e6d5-4c40-80df-9abea69160a2	1	Other	Other
+8025f9f6-7e54-4a07-8fee-af2d7f08b8bc	1	Other	Other
+80261cbd-d926-4b68-a765-c82e742ac7a9	1	Other	Other
+8026348c-539b-487c-8341-d5086419deb9	1	Other	Other
+8026beea-2c11-4144-9cc4-1ea881998b95	1	Other	Other
+8026c6ee-c658-407e-bea0-7fdfaf302cd9	1	Other	Other
+8026f0b2-db8f-4024-b784-afa603d06c28	1	Other	Other
+8026fe60-7d36-462d-aa14-96e4207a4388	1	Other	Other
+8026fea0-ad4e-48be-86a9-c48caacf4773	1	Other	Other
+80275246-bd8e-4ebc-9251-872b675a0fdf	1	Other	Other
+80276fa8-bb69-4f92-8282-53bdf5329ce9	1	Other	Other
+80277148-eed6-4364-a560-94ca9347852e	1	Other	Other
+80279c00-56e0-4868-b909-b8fc98ba46fe	1	Other	Other
+8027a9ea-fd6c-4f4e-b7fe-fc7756b1f18f	1	Other	Other
+8028a41d-3ab4-495f-8c90-50638a369737	1	Other	Other
+8028ae72-855f-4f9d-8120-2d7ab41c92ee	1	Other	Other
+80293975-140c-4340-a2e9-ff8172b84d93	1	Other	Other
+80293c9b-0d96-4352-bdeb-b5c2863239f2	1	Other	Other
+802991c1-3f2e-4f60-b824-2b69fda5c716	1	Other	Other
+80299fbe-2f53-4065-a916-fa402badce72	1	Other	Other
+80299ff1-2035-47b9-af1e-fcb2cc682202	1	Other	Other
+8029b7a7-4de1-43a8-92c4-ad0ab97c0b04	1	Other	Other
+8029dced-3742-4a01-aa45-d9a980cb9a2a	1	Other	Other
+802a68c9-6f19-4d4f-a0f6-b969c1366a50	1	Other	Other
+802a8167-e675-45a9-bf83-7b33175f7d8f	1	Other	Other
+802ab662-e636-4040-8b39-cf2388701694	1	Other	Other
+802adbbe-c503-41f2-9b5a-c291f8540e6c	1	Other	Other
+802b7b20-2ec1-4267-8ecd-32b05ad4b992	1	Other	Other
+802b7c30-f1b5-43fd-8151-fa77dc4195d4	1	Other	Other
+802b7f68-f946-4d8f-a15c-37476f0aedbc	1	Other	Other
+802bc4de-1c59-4006-a18b-3c08973d257c	1	Other	Other
+802c7e1c-aad0-490c-a2e8-7f5226d9fa56	1	Other	Other
+802ca2b7-b07a-4a02-8f73-b837b8628ac0	1	Other	Other
+802cc13a-eea1-4e26-a47f-77e85bfd69d0	1	Other	Other
+802cccb0-77f5-4b61-b3a6-dc08e3b35053	1	Other	Other
+802cf5e4-6105-4596-84c8-a9e750538455	1	Other	Other
+802d2360-e7ed-42b7-a8fc-83d2da136d5a	1	Other	Other
+802d8913-c321-4a6d-b233-0cdcf81b65c7	1	Other	Other
+802dad0e-4e4e-4928-a117-a2a0f8c5ad27	1	Other	Other
+802dae89-c2b2-4ee4-9e3c-3053c45a3dbd	1	Other	Other
+802db06a-87ec-4348-b8a6-b96c775fd686	1	Other	Other
+802dfcb2-e37c-4b05-a065-ab17ae979d0a	1	Other	Other
+802e0d1a-d03b-40cb-aab6-4c7a21c97cf1	1	Other	Other
+802e73b1-0965-46cf-ba3a-f2963f5080b4	1	Other	Other
+802eb4f6-5189-4029-beb7-ff41672340b2	1	Other	Other
+802ebf78-e932-4651-986c-e8d3c5e71d29	1	Other	Other
+802ef63e-d1d7-42ae-a09b-85c611cbf452	1	Other	Other
+802f6a72-92f3-4a23-9022-a1e7c0c07971	1	Other	Other
+802fa6d8-c323-4717-9e2c-214e2afd98dc	1	Other	Other
+802fb6af-5750-4f23-aa05-d6f71513b90e	1	Other	Other
+802ffd19-c155-4b4c-a175-91f7bf548ea4	1	Other	Other
+803007f2-0d46-4f08-83c1-f111877536aa	1	Other	Other
+80304316-fa82-4b13-82e9-bc5524a1614f	1	Other	Other
+80305f73-8324-4220-adca-f00d5eff040c	1	Other	Other
+803065ad-bc83-442e-b24a-4d76d99112f2	1	Other	Other
+8030bfc9-d8b0-4cb9-bd19-68b3e41b097a	1	Other	Other
+8030ea2a-ae72-4ba7-8754-51e7e8a11c30	1	Other	Other
+80310b16-5445-46f6-ab3e-2295408af755	1	Other	Other
+80311ec7-8025-4652-85e1-506acbf639a3	1	Other	Other
+803149b1-7a6d-46c9-86ca-fc34c543445f	1	Other	Other
+803184d0-6864-4eb8-9a47-c04316412bb8	1	Other	Other
+8031b139-8465-454b-b78f-1f248993a1b5	1	Other	Other
+8031cf96-b162-4216-94ac-f63cd53cecdc	1	\N	Other
+8031f833-83d6-440d-9bae-163e927b2371	1	Other	Other
+80321d44-b8a5-4628-a673-e00c43ef2430	1	\N	Other
+803240ae-5330-4be6-8594-278d278ff7b3	1	Other	Other
+8032806d-f6e5-45f4-b189-8ad64e914a4d	1	Other	Other
+8032811a-3ec6-495d-b4ae-cb6db6950e41	1	Other	Other
+80328f6c-4481-409c-9cf8-d24fb061c7b6	1	Other	Other
+8032916f-8e11-4812-a6d1-0fe1d5bf624c	1	Other	Other
+8032b9f2-d2b3-40b6-99dd-4f2d4fc11f4d	1	Other	Other
+8032e76a-8415-4a16-9f42-0bca5a65bfde	1	\N	Other
+8032f239-f037-4678-863c-7199036a95ac	1	\N	Other
+80332045-126b-4980-98fe-9781ff60b925	1	Other	Other
+80335455-0717-49bd-972f-8019107dd4f3	1	Other	Other
+80335ca9-b0ca-424b-a3fe-1b685938ce4e	1	Other	Other
+803368c8-7707-485d-8c97-69a1257817d8	1	Other	Other
+8033727b-3e72-458b-9e5c-f857a250d613	1	Other	Other
+8033c24e-f495-40d5-86dd-8b6c93c5e8ec	1	Other	Other
+8033f029-43c4-4010-bd5e-556ef755ffdc	1	Other	Other
+80349507-5857-4253-b5ea-05183bac816f	1	\N	Other
+8034aa65-f0fe-4606-8fc7-f08be952e83f	1	Other	Other
+8034cf9a-29d1-45e3-a861-3cdcc65a84d5	1	Other	Other
+8034f92b-8ed1-4e57-ba8a-c92f29c71ab6	1	Other	Other
+80357a5c-593e-4b77-adce-db4106eda070	1	Other	Other
+80357d77-8e0f-453d-b6c9-b77c5779d230	1	Other	Other
+80359f1a-9731-4370-a1a6-eed712785272	1	Other	Other
+8035dba5-0f10-4778-8d9f-811c4efddb13	1	Other	Other
+8035e9a6-ee06-4e8c-a36f-fe4588e56a4d	1	Other	Other
+80369aa9-13bb-49d1-9f55-1e32c621903c	1	Other	Other
+8036cd4a-ebb3-47be-860e-ac49b9a413be	1	Other	Other
+8036d183-9dea-412b-9bf1-d8bf60870c6c	1	Other	Other
+8036df9f-42f9-4684-80e8-dd317fd6c470	1	Other	Other
+8037372f-43ec-414e-a8db-5d4aa0e0d12c	1	Other	Other
+80379d08-db54-4573-82b2-5ecd77613a6c	1	Other	Other
+8037efc2-e297-4535-8fa9-3b02bba69c92	1	Other	Other
+80380c87-06be-4122-8f4b-6acb179e24a7	1	Other	Other
+80381eb8-1471-43c7-bb25-1493ad34ecea	1	Other	Other
+803874b7-3b32-4bb0-8c59-626fe03f4c90	1	Other	Other
+80389c3d-70b7-4255-9535-576ab14ce709	1	Other	Other
+8038b364-0421-4a54-9595-de2e3d3fc481	1	Other	Other
+8038e28d-41c5-4087-9444-73bde86cb784	1	Other	Other
+80391efa-10a4-4239-bd0a-5248c79d119c	1	Other	Other
+80399844-2514-41e2-9ba7-b1d36fd21fe3	1	Other	Other
+8039b797-e154-4333-ab5d-ce66bc27aadb	1	Other	Other
+8039c3f6-be02-405e-8a6d-ec276b246848	1	Other	Other
+803a58b6-60a1-4a93-b344-7967f9e86ed1	1	Other	Other
+803a6e1a-3c7d-4f98-8927-198d4f3cfdcd	1	Other	Other
+803a7a04-244a-4f48-8f92-56008079af10	1	Other	Other
+803a9f76-ce65-49e5-9c57-7fdc06231443	1	Other	Other
+803af39f-68bb-4979-8649-cb15688d203c	1	Other	Other
+803b57ae-6f1a-4a47-b52a-a1f8b1d99c44	1	Other	Other
+803b7eb3-cdce-4b85-8fe6-e3adb3222fd3	1	Other	Other
+803bad24-5685-4fa4-a519-334f12b9a8dd	1	Other	Other
+803c1330-bbda-4658-82ca-fb2580549d2a	1	Other	Other
+803c308f-d221-4616-8404-c0831d940e7d	1	Other	Other
+803c4a10-1b54-49df-ad07-816acb4f78c3	1	Other	Other
+803ca731-b9e1-4a04-859b-f9109dd5ee0b	1	Other	Other
+803cdd84-bcf3-4a81-889b-635fd733a8d9	1	Other	Other
+803d2a46-6b60-45c0-adf5-65049d8c5b9a	1	Other	Other
+803d5440-8e13-4eba-929b-7e32b3f8cf6d	1	Other	Other
+803d606e-cd0e-45e9-97e8-8d959c1c87ee	1	Other	Other
+803d873e-f4bc-45bb-a747-c535726352e7	1	Other	Other
+803dcfba-a25f-4512-a549-73a4d1bc0ef3	1	Other	Other
+803e105a-efa4-433e-b77b-e31ca2685cad	1	Other	Other
+803e3a91-b8b5-46c0-b5b7-56208b766542	1	Other	Other
+803e498d-001d-441e-a9fc-95fa02663959	1	Other	Other
+803e683b-0cae-4219-99f2-4222f5fd0da3	1	Other	Other
+803ef50b-274a-424a-95c8-d564c3c40df8	1	Other	Other
+803f4b99-64d7-4253-81a7-25be333fcf4d	1	Other	Other
+803f681b-df05-41f5-b616-d6868e5b2bdf	1	Other	Other
+803f79e7-e8b0-4e9a-85e1-091327106c29	1	Other	Other
+803f7a72-7cf6-4e9e-88ab-4fb221b978e6	1	Other	Other
+803f9b80-1124-4818-b6aa-5649ec34dfe5	1	Other	Other
+803fb492-ec98-4963-b37a-da8eba7c37c0	1	Other	Other
+803fd35f-cf0b-4dde-baef-c3b3e1b3e7ff	1	Other	Other
+803ff069-64f5-43cd-970b-0ed41b593be3	1	\N	Other
+80402877-948f-43f1-bc8c-1d674adfa731	1	Other	Other
+80403457-192f-467a-9cf0-941b773097b1	1	Other	Other
+804070eb-796f-4603-9f42-59aed9a7331d	1	Other	Other
+8040a1ad-3166-4872-b6da-fe1237012871	1	Other	Other
+8040dae2-2c3d-4574-a13d-26333848459d	1	Other	Other
+8041140b-2842-46ad-90f3-4e37001591e6	1	Other	Other
+80411cdd-8d0f-4e10-b834-8707cfe6c577	1	Other	Other
+80411f8c-8cbb-4978-ad42-f0e9f4d392d7	1	Other	Other
+804191ec-9fe2-4908-ae48-c7b100aaaa93	1	\N	Other
+8041cca4-2c56-46d7-9bf5-5b820a498277	1	Other	Other
+8041e26b-a46b-437c-8b1f-24553175a24a	1	Other	Other
+8041ea7b-0bc0-422f-953f-9c18bbdadb84	1	Other	Other
+80431189-2456-417a-ba59-659122ada1d0	1	\N	Other
+80434cdd-f7dc-4c54-a53b-4c1b87e33aa5	1	Other	Other
+80439a58-405d-4c42-85ac-965cd53786ae	1	Other	Other
+8043b4a9-5822-46fc-9c32-952329e93d11	1	\N	Other
+80440a6c-8c52-46e6-a42a-499085c087b1	1	Other	Other
+804446b0-7792-4279-af16-d5d451e97028	1	Other	Other
+804460c2-5b46-457c-a359-e2811896d513	1	Other	Other
+80448e58-1e9f-4fb3-8224-dfbbe382b54d	1	Other	Other
+8044b296-710f-46f0-a824-b820b92eb137	1	Other	Other
+8044f189-adc6-4c43-8bbc-824fb8841f07	1	Other	Other
+80450444-f3c0-4932-8852-6ed558d3fc52	1	Other	Other
+8045625a-7762-4b52-8232-b0d63910179f	1	Other	Other
+80457ee8-a0f8-408a-9dde-d5a324895dd6	1	Other	Other
+8045a329-6dbf-4e5a-b964-4ef1cef0d36b	1	Other	Other
+80462952-4567-4490-a33e-870964b9f3d1	1	Other	Other
+80464cd8-6dc9-4946-ae37-d7dcbb6f20f9	1	Other	Other
+8046c5b9-f60b-4ee9-8653-50a909a16399	1	Other	Other
+8046f1b9-b870-43e2-8db8-287e08422fde	1	Other	Other
+80474d88-70fc-4bf8-94fb-41a5eb3e55af	1	Other	Other
+80474f9c-2940-40bf-8ee8-81865a00397c	1	Other	Other
+8047cc74-a3e0-48ee-8c29-b0db33893990	1	Other	Other
+804870f7-72a2-445a-b0f4-863cac748692	1	Other	Other
+80487a65-057f-47e8-b4ed-165bb13ece26	1	Other	Other
+8048ad83-5f78-4e45-8864-374dfd3c135d	1	Other	Other
+8048f34c-cfd5-4f85-80e1-9bf18e1c16f8	1	Other	Other
+804905a8-9aa0-4f89-911f-b3ac70401fb7	1	Other	Other
+8049227e-9f53-4cf9-9100-acd2adaf5897	1	Other	Other
+804937c4-758a-4790-a895-df7587209d1a	1	Other	Other
+80496466-50c6-4eb8-9e5e-26feda4b4add	1	Other	Other
+80497291-4436-47d1-a15c-1fec5b81c61c	1	Other	Other
+80497735-7d11-405e-a3b9-3da99166f052	1	Other	Other
+8049b243-7bd1-40fa-b075-9f4417589a83	1	Other	Other
+804a0164-7e9c-463f-84a5-83e656b23c0f	1	Other	Other
+804a4df5-38be-45c3-81af-63a8b0725195	1	Other	Other
+804a7cce-828e-4fea-99c2-ab91127781db	1	Other	Other
+804ad8da-4757-4c8a-be52-cc91e43d6b58	1	Other	Other
+804ae33f-b37f-48cd-b03c-631994164a23	1	Other	Other
+804b2722-0265-4a16-9211-95cbd00c2d27	1	Other	Other
+804b4e1a-e077-4896-9a62-064f071eb569	1	Other	Other
+804b55a0-a6b8-4595-b0d5-d90fff0fa3f1	1	Other	Other
+804b7936-86f4-4679-9deb-b9c56518553c	1	Other	Other
+804b8dbe-62de-4b33-bd0c-80fb11e3c13a	1	Other	Other
+804ba0ed-2958-479b-ac0a-4d025ad5cce4	1	Other	Other
+804bde44-5bfe-4560-8962-9c6a96c44d83	1	Other	Other
+804bfe0f-42f0-47e1-a4ef-9a8d805c9c8d	1	Other	Other
+804c2116-6e2b-4041-83b2-72bd84d8f8fd	1	Other	Other
+804c48f9-5ae3-4f8a-9af8-a23655ba659f	1	Other	Other
+804c9397-eaad-4316-8c62-74d9b5374c81	1	Other	Other
+804cdc9d-fbd2-4f78-9a52-450b9a6d7c86	1	Other	Other
+804cf068-4e04-48ec-9d96-160381ccc463	1	Other	Other
+804d102b-4d65-4ba3-8dd5-c61ad3d504e2	1	Other	Other
+804d2f57-e297-4205-852f-3b613ffc11e0	1	Other	Other
+804d31e1-f577-4072-98b7-278ca56c78eb	1	Other	Other
+804d8603-cd6c-410e-8dc9-dea562697137	1	Other	Other
+804de14c-4547-4b54-9cac-9c6f34c7e092	1	James	Other
+804dffde-0211-4da0-98cc-8ba976f79009	1	Other	Other
+804e00f6-b848-4148-bbd6-09dbe931df80	1	Other	Other
+804e0f8a-f134-41db-bb15-8fdad1245ba3	1	Other	Other
+804e4e38-0d2e-4b8b-951c-d3beca06ad87	1	Other	Other
+804ea1a9-4a1d-4e10-b7fc-be4f8bd68306	1	Other	Other
+804f39f0-5486-4f8a-8955-e406463d7c20	1	Other	Other
+804f6fab-26e5-4cc5-ad31-048c11372aa1	1	Other	Other
+804fe9fa-24fa-4ca8-9010-33a03be8bbf5	1	\N	Other
+804ff5a2-868e-44a7-8f64-12b7752da6cb	1	Other	Other
+804ffaa5-848d-46c2-8a56-3b4a8104a9ec	1	Other	Other
+8050135f-f347-45cb-8c12-471d6845319d	1	Other	Other
+80504caf-f155-4a58-bbcf-50e1dc0da906	1	Other	Other
+8050504f-172f-45e5-9d3b-36849115face	1	Other	Other
+805056b2-d398-4b52-983b-cca7c66e7a5b	1	Other	Other
+80505943-fa2a-4d44-8135-98ffcfb32108	1	Other	Other
+80505e40-8933-4bcf-955a-5bbbed922a4a	1	Other	Other
+805099e3-8997-4dc5-9090-8b513c58ec8d	1	Other	Other
+8050a1b4-b8a5-4add-9b5d-b42425409fc8	1	Other	Other
+8050bed8-ab02-4e5a-8bd7-d2d35b781608	1	Other	Other
+80512dd3-d6ab-4c66-b526-c8dfab475267	1	Other	Other
+805190ef-7abf-4f11-b611-f6ad3bd2d56c	1	Other	Other
+8051cf39-70ed-4436-b5d9-ba0eb52b015c	1	Other	Other
+8051d324-66fb-41cf-ac50-73b3933301af	1	Other	Other
+805210f4-baa1-4567-98ca-905e254a19a1	1	Other	Other
+80527426-60c8-42fa-a3dc-600854c09082	1	Other	Other
+8052aba1-ed54-44df-8fe9-206d917db14a	1	Other	Other
+8052df96-9cfa-46e8-b0d3-4e72119d2fad	1	Other	Other
+8052f6d9-2e00-410f-9f2b-e355c87e5ed6	1	Other	Other
+8053469d-296c-44f4-9b9b-e46b48f1ccc1	1	Other	Other
+8053a739-b537-4466-a126-139eac51cf95	1	Other	Other
+8053fd9e-d0ca-4abf-af73-67f73d63b59b	1	Other	Other
+80541dc7-9bc4-4c71-b90e-c10018d0722f	1	Other	Other
+80545afb-8b05-456b-9ac0-e32fd5e9bd8d	1	Other	Other
+80545e84-3e69-4ef3-a973-0c4e95320f8d	1	Other	Other
+80547f4e-d586-44ed-b326-7f9a13a1ba72	1	Other	Other
+80550aae-8b95-42f4-97cd-f3fe0a785baa	1	Other	Other
+80550cc9-6c6e-4503-a299-d96ead6a1153	1	Other	Other
+80550d9b-4af1-49b2-845b-aa98001d142d	1	Other	Other
+80553c8f-231b-48f7-8a92-db52dd98df82	1	Other	Other
+80555179-4f9d-4aa7-a04b-14bad07c1683	1	Other	Other
+805566db-3c47-47e8-9bda-05570360cb7d	1	\N	Other
+8055e17c-bfb6-4ab8-836d-e61fe9c911c9	1	Other	Other
+805686fc-900b-4740-b4a4-4aedb6884c0d	1	Other	Other
+8056aa5e-36e3-49d2-aa53-009bb2dd8656	1	Other	Other
+80571d1e-f9ba-48bb-8dd9-df15841b4328	1	Other	Other
+80579fa1-0d19-4ff8-9244-52ddebc01827	1	Other	Other
+805818f4-a345-478c-b1c6-b460d81fb96c	1	Other	Other
+805823f8-344f-4d11-8ff3-0cd0fafc700a	1	Other	Other
+80586441-b07f-4e55-9b90-3092a45c4c3f	1	Other	Other
+805889db-5aae-4bbd-935d-539092128630	1	Other	Other
+80589ba6-a8fc-412e-bde3-6fbdef4f775f	1	Other	Other
+8058a2ce-1af8-4eb6-b074-a293604e5021	1	Other	Other
+8058c425-3101-4dfd-998b-688888f41fca	1	Other	Other
+80592715-923c-4d38-9195-2700fcb87050	1	Other	Other
+8059502b-7a5c-49b7-90b7-a88ccef08a87	1	Other	Other
+8059bf3f-2a14-40c2-95c3-3b95c83b288f	1	Other	Other
+8059e984-f1ee-4f70-8bf8-6460336edf2e	1	Other	Other
+805a23fc-b514-44d5-86f3-9ad3d2de9c3e	1	Other	Other
+805a2bd1-9867-4e3b-8ab4-c2ff7d4455e0	1	Other	Other
+805a3148-6e80-42e8-9631-d8407d1b9ade	1	Other	Other
+805a69a0-9d78-45c5-883c-58c416f10da2	1	Other	Other
+805a8539-d2be-4489-b41d-75780397dcbb	1	Other	Other
+805a8ff1-52fe-4700-915a-20124bb670bc	1	Other	Other
+805b3270-ffe6-41c2-b0cd-40edf95397e5	1	Other	Other
+805b5a8d-ee2d-4d79-9a6d-c367e9210da8	1	Other	Other
+805b5f26-fe8e-4d22-ae7a-ca2889c97456	1	Other	Other
+805b6f1e-1cba-4111-8b65-13bca077c39a	1	Other	Other
+805b8277-de42-4a1d-b233-dae99568a7df	1	Other	Other
+805bdb2a-e076-4b8a-abf9-adf8e4d6049a	1	Other	Other
+805c03d7-8455-4ac8-8823-bec262dc4c86	1	Other	Other
+805c24f2-d8d2-474a-aa4f-673b9a71e4bd	1	Other	Other
+805c6a8a-e2b4-42da-bd5c-d1abc5316efe	1	Other	Other
+805c6ab6-9fb8-4947-81d8-023d7c4fd8e5	1	Other	Other
+805c87f1-8b98-4908-85aa-4894f51d9303	1	Other	Other
+805ca5a9-2d4b-4a71-88aa-83bb5b286fc1	1	\N	Other
+805cece6-f88c-4282-a227-9d2ad3b7fcd4	1	Other	Other
+805d0409-5951-424a-a95f-15ea20576490	1	Other	Other
+805deda0-6b0b-4698-ba18-0bd88135cb28	1	Other	Other
+805df3d9-eacd-400c-8270-c0ebfe8de08c	1	Other	Other
+805e3c0b-d2e8-4855-b2e3-f096ad10ff6e	1	Other	Other
+805e4f9c-c2b8-4c0b-a26c-d2a8f8a24370	1	Other	Other
+805e912a-16d7-4fab-8956-f55f6db28dbd	1	Other	Other
+805eebdc-de5d-4a19-9599-bbb115179bc6	1	Other	Other
+805f34a0-6420-4a94-a0fe-be5261a0511d	1	James	Other
+805f5cfe-ff84-4b74-8aa7-12a8b894e8cb	1	Other	Other
+805fc3e6-195b-4b61-9267-fc825ed03bb1	1	Other	Other
+805fcd92-3150-4ff2-a395-6d602f63721e	1	Other	Other
+80601efb-0401-4f2e-b2a3-cd9e4a2bf01c	1	Other	Other
+8060479b-cd22-48f3-8934-1623fc28caa0	1	Other	Other
+806052ba-5efe-4d7b-9e07-bfdd6c1f2d28	1	Other	Other
+80607cb7-6631-492c-bbb1-ca5be0e99a44	1	Other	Other
+80608346-bb68-42dc-a850-b34d06af5c03	1	\N	Other
+806090bd-a3dc-4b41-926c-6fa8a0b7414e	1	Other	Other
+8060b235-8e9c-4f68-abb2-03de3407941c	1	Other	Other
+80610362-62a3-4ec1-a7e6-4a8eb044b868	1	Other	Other
+80610b48-9e51-488a-ac87-1ee6fe57a306	1	Other	Other
+80614d76-42c6-49cf-96be-32ac664b817c	1	Other	Other
+80615616-edd2-45b9-ac62-3787dabc545d	1	Other	Other
+8061eed5-1e10-402d-8615-a6c0d4a8a88d	1	Other	Other
+806213a8-d0f0-4838-8a7c-2f8d56f7bd5b	1	James	Other
+80621665-0f74-4cb4-a719-712be7f9cc8b	1	Other	Other
+80624366-88f2-4bae-a69c-d141352d3a12	1	Other	Other
+80627b19-e12d-47b6-adff-cc6a3ab0b93e	1	\N	Other
+8062ac3f-401f-4e95-8c6c-95a5d63c7d1a	1	Other	Other
+8062ac82-4914-4868-89bb-f863752ba43e	1	Other	Other
+8062e04c-ae9d-4b40-9acb-139aa9259a55	1	Other	Other
+80630470-374f-4dc5-bc28-0353d4ba0d65	1	Other	Other
+80630b1b-9ffa-4447-962c-e61f86e9d218	1	Other	Other
+80637d46-8870-462c-aa57-1d9044909b5b	1	Other	Other
+8063be56-b917-4092-8b73-38c3dd0b792c	1	\N	Other
+8063d1a5-fd59-4ee6-96a7-b0fa47468dfa	1	Other	Other
+8063faf3-21f3-4281-ba3c-f17c640f9ee4	1	Other	Other
+806482bc-7339-4591-9bd8-a972b586e44d	1	Other	Other
+8064e142-e793-4bff-a0e6-c95583972ac2	1	Other	Other
+8064e147-fb98-4c5a-9051-45ae83c93b0d	1	Other	Other
+8064fec6-5bd4-44c8-b8c4-5c6e53f105e7	1	Other	Other
+80655a1d-4ee7-4144-84c8-7b8cf7838a43	1	Other	Other
+80655d34-11e8-4ed1-a93a-77aea9c8ca42	1	Other	Other
+80656f17-1936-4f27-9e30-835546cee097	1	\N	Other
+8065d835-f14a-4d00-8a13-169a1f32c3b1	1	Other	Other
+80663a09-a89c-4230-b963-3c8e2af97efd	1	Other	Other
+8066aea1-008f-4347-a304-615e8b8ff633	1	Other	Other
+8066b55c-03c5-4a44-8deb-f440738c9516	1	Other	Other
+8066cfe7-5057-4861-abf1-2619869635bd	1	Other	Other
+8066e6fd-c973-4bd6-af21-fa135667a0e3	1	Other	Other
+80672384-4cef-4114-8b7f-28ec74e79bad	1	Other	Other
+80674afb-cce9-4c65-8b63-0eaec58417c8	1	Other	Other
+80675913-eff9-492a-a1d9-df675c0b8462	1	Other	Other
+80675b96-c5b1-45cc-b7ac-ab07c457ce89	1	Other	Other
+80678d58-d11f-47fc-9a4f-3ac40406b7c6	1	Other	Other
+8067c5c7-982b-4f55-8397-2fca5bbb70c7	1	Other	Other
+80688cf3-1512-4d99-b748-4687d0f78cbf	1	Other	Other
+80690c7f-5a7d-44ce-870a-4ce6ce6eeafa	1	Other	Other
+806995ee-213f-4fe9-be0a-4d8c691c5c62	1	Other	Other
+806a53c8-b086-41f0-b7f2-646888f217dd	1	Other	Other
+806a6605-e27f-45a3-93b2-a8db12985f13	1	Other	Other
+806ac021-19aa-4ad5-a71b-395eaba06a21	1	Other	Other
+806adecc-97b5-423c-bbaf-91d9ebe11dab	1	Other	Other
+806af117-ad44-4cab-b858-6a157b150e91	1	Other	Other
+806af2a0-6487-4796-a932-5775a4b9db02	1	\N	Other
+806b047c-cb9f-4e83-8d7e-25358971e1d0	1	Other	Other
+806b86ed-11a4-4ba8-8c10-f455e7b7195b	1	Other	Other
+806b880a-cdd9-4790-9c57-780443e37fdc	1	Other	Other
+806bb9e1-2013-4627-bd70-a13113390b8a	1	Other	Other
+806bcefe-a5da-487d-bc8b-794789994a05	1	Other	Other
+806bde14-fb37-4461-b9c5-c2efe4710edc	1	Other	Other
+806be32a-15ec-43e9-9bc6-d617c24a9ed4	1	\N	Other
+806bed54-8604-4e3c-bcc1-0b6ad1b5e906	1	Other	Other
+806c525b-d72b-4a21-af27-4700e63ca149	1	Other	Other
+806c5d7c-f5b3-4c78-bd14-349da37661c3	1	Other	Other
+806cb6e8-cf92-4a4b-bf89-7f9be94e691b	1	Other	Other
+806cc9ef-1043-4953-80ea-839d237a01a9	1	Other	Other
+806d8171-31a9-4a8b-b066-6f2fb88c09fb	1	Other	Other
+806e049a-ee06-489e-83f1-c4ccaf72665c	1	Other	Other
+806e09ce-adce-427d-b1d1-3a3524da20b4	1	Other	Other
+806eaa70-7512-424f-ac4d-ce8610b7d39f	1	Other	Other
+806fa0d8-ed4f-499d-8d4a-aeba71171d54	1	Other	Other
+806ffda0-3504-4818-bd7d-e1e23a4a4c69	1	Other	Other
+807017fe-5b01-4b09-90e6-3949534559ae	1	Other	Other
+80703b6f-47b4-4821-bb5c-5a302943c7e2	1	Other	Other
+80703c1e-df02-4227-8e27-a62262671139	1	Other	Other
+80704d7d-051a-4e5c-b3f8-46777a0b4c04	1	Other	Other
+807088de-0870-4743-8a0c-e7f26dc46e34	1	Other	Other
+80709f2e-052f-48ab-99f8-ca47f7d9d8a1	1	Other	Other
+8070ab94-2426-41cc-94e5-c0346d41f7d4	1	Other	Other
+8070bd74-ff95-4aaa-94ca-36843434490d	1	Other	Other
+8070df13-e8ff-457d-bd7f-aacb67146d37	1	Other	Other
+8070f760-42c4-4098-b138-ec3cf36be2dc	1	Other	Other
+8071107b-6f93-4097-8e0d-c82365e6f681	1	Other	Other
+8071591a-97d8-49d2-b8cf-a5799259dbcb	1	Other	Other
+80716cf3-2171-4941-9a24-dfbf8cb1f361	1	Other	Other
+8071a01f-2870-4d73-90e5-d396d45a68bf	1	Other	Other
+8071c88a-6e41-4eb2-9db7-8a216f1175ff	1	Other	Other
+807204b3-adf1-470f-b752-44af8b1d9830	1	Other	Other
+80726a23-2aa6-4e51-94cb-b95b00fcfb7d	1	Other	Other
+807284da-b446-486e-ab67-be9667e5577a	1	Other	Other
+8072afc3-d6a1-4ec6-92d5-272a164931ff	1	Other	Other
+8072b0c8-63f4-480c-864d-96d47bf2c516	1	Other	Other
+8072b1d4-e59c-43c4-b662-efa8169c5d2f	1	Other	Other
+8072c8c3-cfb9-4f7b-b3a1-fae602fa0615	1	Other	Other
+80732d01-7432-472f-8098-1fe59b24e579	1	Other	Other
+80734b58-8f37-4353-99fc-493a07c52c91	1	Other	Other
+807358a0-5b14-4925-a704-dd1e6009fa3f	1	Other	Other
+80735a8c-584f-4bc6-ad35-0c9cd737d2b9	1	Other	Other
+8073789d-b85b-48fa-b1d6-da5b8aa957d6	1	Other	Other
+8073b79f-2559-4a62-b3af-c5663f65fff6	1	Other	Other
+8073c4e0-a951-4baa-b491-1a6c87d58ecf	1	Other	Other
+8073de7c-618c-4ea5-9033-c957123145c5	1	Other	Other
+8073fa9c-1e2b-4f99-96dd-5663f8f58504	1	Other	Other
+8074069a-f055-4d84-acc4-2acfc3060ead	1	Other	Other
+807408c2-aaf5-4a51-a6b4-d12425452069	1	Other	Other
+80740f83-2864-4edd-9b05-dde96e95becb	1	Other	Other
+80741f59-9902-4aac-b4c8-b39ecdcbadfc	1	Other	Other
+8074d5c8-fef9-497b-a117-6febd978f4a2	1	Other	Other
+8074eec5-e3c9-47ca-9a90-e8af7a9705c6	1	Other	Other
+80755d39-a69d-4ba2-988a-3ea0e3f5f5f4	1	Other	Other
+8075a5e9-6dc0-4043-9574-49380d30e96e	1	\N	Other
+8075d1e0-2e74-41c2-a06e-e7656f504605	1	Other	Other
+8075db01-b191-4f89-b4f3-b26161b140da	1	Other	Other
+8075e4c7-06d8-4c16-8ff8-e6757c91520b	1	Other	Other
+8075f7f4-227c-4292-a532-4af064392186	1	Other	Other
+807692ee-a7fc-44c3-a877-f675b2b4fa1e	1	Other	Other
+80769da7-a77d-4767-888f-ef71b19f3a9b	1	Other	Other
+8076c08e-9e32-41c8-a751-580436ee0ec4	1	Other	Other
+8076ffc0-a41a-4ef0-b047-daa980182005	1	Other	Other
+80773bb3-d059-4b10-924d-b00ea7c61208	1	Other	Other
+80774d74-cb73-4d58-9fa8-76c3c8abf630	1	Other	Other
+80783251-e98c-46ad-a37a-c95126386b56	1	Other	Other
+80783b9f-5f73-46cd-a816-c96d08ffec07	1	Other	Other
+80784200-83c6-4904-9e7e-e51b99e12262	1	Other	Other
+80789031-4b42-481b-a5b4-ca656293d856	1	James	Other
+8078a0a8-fc5b-4625-8799-8f9f26b56527	1	Other	Other
+8078b85b-8b28-48ef-84f9-45cbe21582a5	1	\N	Other
+8078c2b0-2437-4462-bc6f-9844c37ffa1e	1	Other	Other
+8078e989-8e48-4e03-95c9-f11a3a5b6c8d	1	Other	Other
+80791246-7609-4afa-85ac-73c95d9ba0d6	1	\N	Other
+807932ff-e26d-4c13-a02b-a7d7a49bf4f3	1	Other	Other
+80793cd3-0272-4fd8-b31f-594812980142	1	Other	Other
+8079851a-7f33-42fa-8688-994295eee856	1	Other	Other
+80798fc8-ce3a-4eec-80bc-4519a05b7dee	1	Other	Other
+8079e5ef-d16a-4c3f-85a8-9d43d4fd6b64	1	Other	Other
+8079e7e1-ae8b-455a-a16b-14615e56dfaa	1	Other	Other
+8079eda4-1125-4764-b9b3-2dd251b250e7	1	Other	Other
+807a08fd-5bdf-4891-a385-bdc861445a84	1	Other	Other
+807a31e3-910a-4c8d-9978-f58045c2f20e	1	Other	Other
+807abff4-14ab-4817-9a3e-9c7fd389a899	1	Other	Other
+807ad8e7-9314-4dfb-83c6-2f097c4bddc4	1	Other	Other
+807b2c50-96f0-4bc6-b3d9-f66fc0429055	1	Other	Other
+807b55c7-063a-4ef9-87cc-dc89fb2f495e	1	Other	Other
+807bb8bd-a4b9-4000-a2d2-aa3343cc3dae	1	Other	Other
+807bd54c-4986-4c5a-b1b2-eae2108d6437	1	Other	Other
+807be42e-04bb-4e73-baa0-e6366aea2c0b	1	Other	Other
+807bea08-dc0f-4a8e-a7d6-71f6af4995fe	1	Other	Other
+807c8dfd-463a-45ae-a05e-5725aa75cb37	1	Other	Other
+807c95d7-46e4-47d6-b510-28315c3d74eb	1	Other	Other
+807ceeb4-7b94-4e84-a74a-6443f91e535d	1	Other	Other
+807cf55d-5fa2-4291-b057-a2b265d062e3	1	Other	Other
+807d0b34-8826-49b7-827f-e5b3784c4da5	1	Other	Other
+807d2fbb-63dd-45c0-b582-2e6a60fc7b19	1	Other	Other
+807d3544-33ac-4006-90c1-7409e0a1fc37	1	Other	Other
+807d72d6-92ea-43f1-bac0-c2b11f838854	1	Other	Other
+807db7c0-785b-4f31-8abd-c262d4cd51c9	1	Other	Other
+807dc7b7-9e1a-4a7f-92f6-c74040ad650c	1	Other	Other
+807ded17-ceea-4fcb-870c-6637dc087b1b	1	Other	Other
+807def8c-598a-4d84-aebe-6b5865066820	1	Other	Other
+807e115a-c2c7-49e9-99c8-c0edc06b90de	1	Other	Other
+807e31d4-030b-4d41-985c-bf6a812200bb	1	Other	Other
+807f1c84-97e2-4902-8f48-1b5c6d802db9	1	Other	Other
+807f2116-c100-45ee-b11c-1f529a38c3c6	1	Other	Other
+807f3988-d056-4761-886f-f08998e95136	1	Other	Other
+807f49bb-a872-49ec-8375-69751c4c3807	1	Other	Other
+807f9a04-0c39-4780-ac63-e0db790c17ce	1	Other	Other
+807fc727-fc93-434e-8602-b9c8cc39122c	1	Other	Other
+807fd4b9-a4b7-40e3-8961-99cd145dd16e	1	Other	Other
+80801ecb-95b9-4671-863b-3c8792a365e2	1	Other	Other
+80804033-1851-4302-94c5-5d2c62ed7b11	1	Other	Other
+808062ed-09ac-4f93-a072-bf9ee507c696	1	Other	Other
+80808070-9a5a-4b42-a3f3-9446696b8ab0	1	Other	Other
+8080b324-6a7c-4f63-9389-efbe80373b76	1	\N	Other
+8080e229-4599-49cc-97f1-c7b8a32d8f85	1	Other	Other
+8080f94d-89fe-40a2-a7a9-0c23e990b423	1	Other	Other
+8080f990-4d2a-4f09-82bc-bb365ea1b43a	1	Other	Other
+808101e6-0f44-4544-8c3b-6a57af417d36	1	Other	Other
+808117b0-6864-4210-88cd-582e65e1bf6e	1	Other	Other
+8081273a-b9ef-4f61-8cff-5f5e7c7ddcdc	1	Other	Other
+8081390f-dc2a-4c3c-ad92-312f0fdfd2ba	1	Other	Other
+80819304-0091-458d-82e4-ad7d13014d43	1	Other	Other
+80819d1c-2b78-4cc8-b275-4a3fa7203624	1	Other	Other
+8081ee0b-89bf-476a-b35f-ed512a3fd75f	1	Other	Other
+808236d2-be23-4656-a48b-cbd5c80eb2b9	1	Other	Other
+80824ba9-77a4-4901-89f9-c0150fe530df	1	Other	Other
+8082924a-afce-413b-b14d-a9a2951c5cd1	1	Other	Other
+8082d778-d694-4df6-a1af-ecf8d9e35060	1	Other	Other
+8082fcaa-70ed-44e2-aeff-81d0c7a26249	1	Other	Other
+808328e5-e855-4cbc-8845-c75b35a43783	1	Other	Other
+80835af9-ddf8-426c-acb8-82a4b5161650	1	Other	Other
+80836ec7-64dd-4024-82fa-14aaa7b64e2a	1	Other	Other
+80836f59-68cd-473f-a165-72fc07b38465	1	Other	Other
+8083e419-816b-4620-8fd2-3ffefb38129b	1	Other	Other
+8083e4e7-59fe-4446-8fc3-36ce6d986d8a	1	Other	Other
+80849a63-d075-426b-acc5-8f6c40d5a7ad	1	Other	Other
+8084bd71-4074-4696-9595-36756af43274	1	Other	Other
+8084c61d-1b17-4315-9431-9104606174fd	1	\N	Other
+80850c95-9d6f-4d69-8caf-1871be947ff7	1	Other	Other
+80851f64-14f7-4265-82a9-f97c3df4e71b	1	Other	Other
+808538bf-37ad-4a0e-8885-6dfb11cb6178	1	Other	Other
+80857a33-3e13-4ab8-a175-9a4d881f7cf5	1	Other	Other
+8085e779-90a6-4b0e-afb9-8be6d1960b70	1	Other	Other
+808652cd-f73c-499f-bffc-112229723fb7	1	Other	Other
+8086a7b7-5d0f-4146-a282-3e0cdfdd817d	1	Other	Other
+8086c8f8-b756-4bdd-9d91-25f4a4384932	1	Other	Other
+808765ef-e601-4df7-8b60-99df6ad8256e	1	Other	Other
+8088320f-bd0a-4b0f-a4bd-4cfab543c6a9	1	Other	Other
+80884f71-9dda-4f44-b8a4-bf67c658456f	1	Other	Other
+80886f66-f3df-40d2-badb-3613c0ca3787	1	Other	Other
+808872bd-fa5b-4d1d-9ef4-1e57a7381d02	1	\N	Other
+8088af77-f1a8-4255-9baa-f75e967bea2c	1	\N	Other
+8088cd5c-109b-4c0b-919d-f299d50fa704	1	Other	Other
+8088f8d9-3413-4f27-b79f-df5c0f5339b7	1	Other	Other
+80892365-a59c-4864-bea0-d809eae8f68c	1	Other	Other
+80894e4f-7998-48fe-b1f3-5200e64383f8	1	Other	Other
+80897f72-a9c0-4403-85dd-5c0e54435df1	1	Other	Other
+8089808f-ab20-4c85-aecf-1741665a812c	1	Other	Other
+8089a576-cbbc-45dc-a4bd-2f160796f63b	1	Other	Other
+8089c8b3-70d9-436e-86f7-c8c0c34de064	1	Other	Other
+808a1f29-33ca-40e4-909f-c1ecddc6e80d	1	Other	Other
+808a8b2e-37d1-4593-b4fd-11d700a79275	1	Other	Other
+808aa81f-8fa3-495a-b635-81cab8a75138	1	Other	Other
+808ac9f8-0d4d-4d19-be68-ff9ec1bee663	1	Other	Other
+808ae10b-1140-4dd6-ab9c-eef3757eff21	1	Other	Other
+808aee6b-7a68-4cb9-9d49-627004bb344e	1	Other	Other
+808b0980-1f4b-4fb1-ad31-c9c712f4a5b4	1	Other	Other
+808b1e19-4d67-4dee-a554-48f0ee96652f	1	Other	Other
+808b4891-be10-4956-92d3-8fcac8e46cb7	1	Other	Other
+808b4f0e-fe19-4031-a0ff-bff2e6482e62	1	Other	Other
+808b543f-1f11-4646-8810-dd51b1ddc0a9	1	Other	Other
+808b6708-d47f-452c-a434-2308bb07aff0	1	Other	Other
+808ba21c-0154-4b9b-9fae-6db3c0401cc6	1	Other	Other
+808ba749-ca82-489e-a989-47b8366b70e5	1	Other	Other
+808bb363-a122-4432-8879-336b7418578c	1	Other	Other
+808bc723-8b5f-4c18-88b0-e5c02f0b254c	1	Other	Other
+808c0c3f-4297-4f76-aa08-e89edc901731	1	Other	Other
+808c63b7-9839-4025-b8b2-eba4507b60ea	1	Other	Other
+808c68e7-61f2-4781-bbe3-53ee0cc95660	1	Other	Other
+808cb8c8-538a-472a-9d70-6487fbf69f3a	1	Other	Other
+808ce378-1996-4ce4-9e05-4a4f5c527a69	1	Other	Other
+808cee1b-cf87-4973-9111-d986aad4ff44	1	Other	Other
+808cf687-ef8c-41dd-aa39-8661a4134954	1	\N	Other
+808d19cd-9512-4467-bb93-1ad696466ebd	1	Other	Other
+808d37f0-2dc0-4640-bb02-6c165310e25c	1	Other	Other
+808d5ba8-6d79-4b96-a8dc-e952640cdb75	1	Other	Other
+808d6c68-5571-4436-bcbb-2d743b8ffc71	1	Other	Other
+808dc77b-644f-48a4-a553-9a8ba36f474d	1	Other	Other
+808dd392-00c2-4767-b137-3fa4a10522de	1	Other	Other
+808de349-74af-43c2-a951-aabcbd135bd5	1	Other	Other
+808e0169-7f35-4ceb-999d-2f1186e61ae5	1	Other	Other
+808e0630-297f-4ea8-8e48-9fb56387b55a	1	Other	Other
+808e586b-2bd2-4883-a5a2-56220f680ae1	1	Other	Other
+808ed635-2af4-4159-abe5-014fc893d4ee	1	Other	Other
+808ee93c-919e-481c-891c-c2c1389c3d1e	1	Other	Other
+808f2b0e-a905-4538-9c3d-38b02d5da21b	1	Other	Other
+808f43ff-c538-4dae-a6b3-fd3599853d8b	1	Other	Other
+808f8579-807c-4689-8d62-d33c8ed36e48	1	Other	Other
+808f867f-12e2-4a77-80e5-3a60dc8213c3	1	Other	Other
+808f94a5-851c-4b6a-ab34-edc23454c040	1	Other	Other
+808f9de7-8f02-44bc-bb41-0fd93097e698	1	Other	Other
+808fb34b-6b04-43b0-b20b-359b720e8f8d	1	Other	Other
+80900de9-5cd5-4542-9386-8e85d14305c7	1	Other	Other
+809014c4-f07c-4c46-9e8e-ae69d86bb9bd	1	Other	Other
+80902116-4e5f-485d-a898-1df5d48b90bc	1	Other	Other
+80903e8d-44eb-486c-8a94-5ae36509d0bf	1	Other	Other
+8090909e-2d38-49ad-b862-cec1e851ec15	1	Other	Other
+8090bac7-75e6-4d92-84f9-b4f9ffb1e745	1	Other	Other
+8090bde5-9725-4e8b-beb1-93cd2edeb3e7	1	Other	Other
+8090c14c-e4b0-4443-b306-ff709d6d097a	1	Other	Other
+8090e62c-3fcb-46fa-b263-18a1a85ca697	1	Other	Other
+80911851-e184-42a3-a8ff-f9b7939854a3	1	Other	Other
+809132c4-f032-42e1-970e-81744dc219b8	1	Other	Other
+80913aaa-9d0f-4eb5-a0d7-663cadadadcc	1	Other	Other
+80917b8f-d6d1-4dfd-85fc-dc06a2e9e885	1	Other	Other
+80919599-cd1c-43b0-ad5b-ac85dce75e79	1	Other	Other
+8091d16c-242b-4202-b6c4-5ed798a1d015	1	Other	Other
+80920c89-a918-4f73-872a-d80019710f67	1	\N	Other
+80935bea-b7ef-4734-952c-d381482fdfaf	1	Other	Other
+80937c10-a589-4eab-bbd8-3302f5d0ef1e	1	Other	Other
+80937d20-49cd-42a7-8cd3-622c574ec7ae	1	Other	Other
+80938569-70fa-44f0-bb77-e4d1af1aabe0	1	\N	Other
+80939ad4-fa61-4212-896f-331e6ea19fe0	1	Other	Other
+8093bd44-f0b1-4930-90cf-f26eae38f623	1	Other	Other
+8093bf96-384f-4c26-8169-6a90e6122b13	1	Other	Other
+8093c9b0-9b00-4386-bbde-b82cf3ccfc90	1	Other	Other
+80942b5d-a137-489e-ab36-e8ec9877a9ce	1	Other	Other
+80942c3a-44d9-48d4-a51b-fb7467168a52	1	Other	Other
+80945047-94fd-44ad-b6b3-f2b89e124773	1	Other	Other
+8094ccc6-61b9-4649-b784-81f511f9da45	1	Other	Other
+809506ec-5cc8-4bf0-9176-4c303d4e657a	1	James	Other
+80950ae3-eda1-46d9-bb9d-3056ee43a515	1	Other	Other
+80956f26-89f2-4478-aaca-74a471157d89	1	Other	Other
+8095742d-edf3-4f60-98a5-8e2e5e5860eb	1	Other	Other
+8095860d-fb88-4d29-a2ff-e3a37974d129	1	Other	Other
+809599b3-490d-4277-b445-136667006b9e	1	Other	Other
+8095a30f-f2ee-4329-ae3b-7f32595af278	1	Other	Other
+8095bf09-049b-40dd-97c0-7a93a2f1d9d3	1	Other	Other
+80960ea5-665b-4ee2-bc79-1f0f0527e5b6	1	Other	Other
+80965fa7-6f9d-4510-9940-812bcb886b54	1	Other	Other
+8096b99b-285d-4e5d-ac89-e2a2cae2882d	1	Other	Other
+8096c3bc-d095-4219-b2ae-0164b9acce06	1	Other	Other
+809705cb-99b6-45c2-8d3f-a7d41830367e	1	James	Other
+8097351d-6c52-4fb2-bedd-cbb754255670	1	Other	Other
+8097582f-24ce-4352-ada4-097cccf5eff6	1	Other	Other
+80978aca-9b45-4cce-9d35-fbcfc7560bb1	1	Other	Other
+80981d1d-a4df-4668-a8fc-595411a5b86a	1	Other	Other
+80983deb-069a-4cc8-b865-8bafa21bb2bb	1	Other	Other
+80984e55-e335-4e75-b76d-3765fb8a6b95	1	Other	Other
+8098e0de-8bda-4fe0-b272-efbaef1bdbc5	1	Other	Other
+80992895-8544-4a5a-9fd0-7c4cdc385599	1	Other	Other
+80994752-bbd2-4c13-a697-d99014bf10f0	1	Other	Other
+80995abc-cf4e-48c6-b09c-7be5462cac51	1	Other	Other
+8099f1b6-5fc2-4444-95cd-b879a1204070	1	Other	Other
+809a26f6-bec8-4f93-992c-eed9bbf13519	1	Other	Other
+809a3106-224b-4d29-a8ad-c544996ce367	1	Other	Other
+809a6b27-c10c-45a6-8c0c-0383713c1e05	1	Other	Other
+809a833d-c655-4da2-8e27-6427fd18f138	1	Other	Other
+809ad696-251d-4358-8283-e118e9601ec1	1	Other	Other
+809af469-d82f-4ec0-84bd-e2f319bf1c6a	1	Other	Other
+809b014a-666e-4347-bf04-eadf2970f146	1	Other	Other
+809b0543-2d40-4f97-b223-e092f08367c7	1	Other	Other
+809b0978-ba0d-4721-b780-2e3d60db31b4	1	Other	Other
+809b207f-2819-4c78-8038-9f17a8c2e463	1	Other	Other
+809b5a73-6ce0-4374-bf20-96823f68285c	1	Other	Other
+809b6419-fc39-4e0e-8635-2cfa27970c4e	1	Other	Other
+809bc1f5-0e06-4c21-97f6-ea0356247e96	1	Other	Other
+809be6cb-9d6c-40a5-b80d-66af897b2e5a	1	Other	Other
+809c21ec-8e27-48c3-bff2-d06f098d3a15	1	\N	Other
+809c515f-d746-4581-bf30-119acf319f3a	1	Other	Other
+809c52b5-699b-4166-b0c3-c1857dbce954	1	Other	Other
+809c5c5f-dd27-422f-af16-d117924444ee	1	Other	Other
+809c8799-9953-4fc1-80e6-2958e1bba90f	1	Other	Other
+809ca73e-3526-4ef4-88f5-3334a15e15a4	1	\N	Other
+809d227a-9a50-4e7e-8c17-db7714ae221d	1	Other	Other
+809d58d2-2316-4890-814d-8ffd4eb6d636	1	\N	Other
+809d6079-e13f-4ceb-b630-08efb0516884	1	Other	Other
+809db312-ef32-4092-b990-aaf8d3d02ba9	1	Other	Other
+809deb58-b8b6-4a50-b02a-2eba2536fb52	1	Other	Other
+809e37eb-0ce1-4dea-81ee-15b571fb07b9	1	Other	Other
+809e43e9-09f8-4b12-8986-de763c6fec28	1	Other	Other
+809e49bf-063d-453c-b4cf-e541cb67de4b	1	Other	Other
+809ece9f-4dd3-4085-a986-de0194fee5d8	1	Other	Other
+809edf41-06d0-4d93-b261-7921955fc8e7	1	Other	Other
+809ef04a-ced6-4fe6-8514-7de6c2c3b988	1	Other	Other
+809f1bba-da80-49fc-9c25-95d8b3cdcf4b	1	\N	Other
+809f2692-1f23-45d6-bf37-c4f957461a99	1	Other	Other
+809f393a-53c5-4cff-b196-4c3ddacb0eed	1	Other	Other
+809f5b79-edf3-40a2-8548-fa72d2a64e57	1	\N	Other
+809f92b5-9377-492b-a66d-22023901d468	1	Other	Other
+80a00716-508d-41c4-9c91-e135b8830350	1	Other	Other
+80a03274-f363-49df-9037-a87d692f2b34	1	Other	Other
+80a0468f-aad5-42f3-bafa-c6505abdcfe0	1	Other	Other
+80a0775e-09d0-4ac9-b06e-c86f0bb77aab	1	Other	Other
+80a07e60-dbaa-4ba2-9bed-6c873f7566ae	1	Other	Other
+80a0969f-2999-4eae-90a3-a03ee47258d9	1	Other	Other
+80a0b2fe-8cc5-4645-82d3-22ace86dff8b	1	Other	Other
+80a10d42-5299-4c13-8eb8-0e1d81e5c8e8	1	James	Other
+80a140f2-19ce-45ea-b7a3-48c2c78dd07c	1	Other	Other
+80a14c07-632d-444d-b140-f4dbc6556dfc	1	Other	Other
+80a15f57-c1d1-4ba2-ab97-9b8eeb0a6e25	1	Other	Other
+80a19569-ee8b-4862-a6bb-ad0b1f91d909	1	Other	Other
+80a1d200-561a-4b50-9a4b-1df4dd4325b9	1	Other	Other
+80a1d58c-7a95-4000-8cbe-0eeb634d2d59	1	Other	Other
+80a20131-f74a-46cf-8eb6-463ed3dc7ba5	1	Other	Other
+80a223a5-9aa4-4bd6-a732-94dd41566a3f	1	\N	Other
+80a22643-b7a2-42b6-8985-83b135d63ef1	1	Other	Other
+80a2a393-6194-4133-800a-3cb40ec20a67	1	Other	Other
+80a2c8ee-b48c-4a4e-b58b-9ad2d72f74b0	1	Other	Other
+80a2eae8-d5f2-46aa-96cc-fa44eeda8bb0	1	Other	Other
+80a33b1f-ede0-49db-8fa0-4203bd0c5273	1	Other	Other
+80a3809d-8bc2-486a-9ca5-5bcbf12364ec	1	Other	Other
+80a3914e-963a-4d8a-91ee-f1357d3fd45f	1	Other	Other
+80a3b3a2-6769-4103-b10b-d637dad8dda7	1	Other	Other
+80a3cdac-20ad-449a-bd35-0331d1837b92	1	Other	Other
+80a3fe86-6dc4-48c2-82f4-92210f9fce87	1	Other	Other
+80a40b62-4954-42b5-86b2-a7c778562739	1	Other	Other
+80a4223b-2ba9-4e51-afb8-d5e6cb326a81	1	Other	Other
+80a4431b-fadd-44ff-98cf-1b85328d535e	1	Other	Other
+80a45a80-22db-4cc9-abc0-273292eaab30	1	Other	Other
+80a460cf-d6f2-4eb5-b62f-fbb05ed238e1	1	Other	Other
+80a4931f-031e-4a95-b79a-41cdb427854f	1	Other	Other
+80a49b25-5daf-45b5-9fb4-2a9d1057446a	1	Other	Other
+80a49caf-e751-4986-8bd3-c1f890576e70	1	Other	Other
+80a4bb8b-2a2e-4974-9043-f86b0b0167b2	1	Other	Other
+80a4f6c3-0538-4c06-aeb7-73f8ac76ad56	1	Other	Other
+80a54609-6d44-4cdf-a666-bead54f937a5	1	Other	Other
+80a55c76-848a-49b0-baad-aeb0b700fe78	1	Other	Other
+80a5895d-af91-4895-aa7e-5d39e9d2c448	1	Other	Other
+80a5fda3-17b5-4be1-84f5-cb97ca2c4dd5	1	Other	Other
+80a61570-e378-48fd-9cad-c49c15b30be2	1	Other	Other
+80a65f45-7c54-43fb-ad81-fe101e6fcb50	1	Other	Other
+80a67c3c-7ca2-4f15-8589-0f8b782e3656	1	Other	Other
+80a68667-91b5-478e-a3f8-8919538ae186	1	Other	Other
+80a69b21-a9e5-4064-a7df-31eaa7103327	1	\N	Other
+80a6b01e-b229-4331-b116-712435683771	1	Other	Other
+80a732fa-0764-406c-8857-23f3330aa914	1	Other	Other
+80a7638b-a72c-4ed1-a04c-9fc1a7a5efb6	1	Other	Other
+80a7c4dc-8d4c-4a18-9d39-316ff18175d3	1	Other	Other
+80a7cdb5-4d75-4597-a497-63c83854e3ca	1	Other	Other
+80a88af5-564d-43f6-a781-51da2522df5c	1	Other	Other
+80a89808-f0d6-416a-aa33-b7be60a3f8f3	1	\N	Other
+80a8a7cf-f205-44c1-84c9-ae85a83acbfd	1	Other	Other
+80a8c9d7-9213-42f5-9f2e-068ffd0175c0	1	Other	Other
+80a91fad-f734-42a4-b107-f3defa3ac6ed	1	Other	Other
+80a9507e-f5c0-4234-ac67-384765fbeb4d	1	James	Other
+80a95be9-fb1f-49c4-b746-54a4f834dad5	1	Other	Other
+80a97458-0d10-433c-ac92-776d95341e59	1	Other	Other
+80a9b898-027f-421b-a375-c246e32c7d77	1	Other	Other
+80a9d12d-3d8a-4c81-893a-de2200ac3cd4	1	Other	Other
+80aa4036-e3a9-4bc0-a2fb-a02ce8c58e0f	1	Other	Other
+80aa4c6f-78c3-4f6d-8136-ccac3f1dc441	1	Other	Other
+80ab0287-c516-4aa7-9cb3-3ea8774b1c9a	1	Other	Other
+80ab494f-dd95-4b74-9d06-3cc0aced78c2	1	Other	Other
+80ab892e-58d8-471e-96d9-8c03219438a5	1	Other	Other
+80abb914-dfee-4656-82ed-7e8807c7c2bb	1	Other	Other
+80ac06ac-e29c-4ca1-b66e-89e2af77a177	1	Other	Other
+80ac0ad2-bcca-450d-932c-cc627621ab7e	1	Other	Other
+80ac6120-f230-454f-8307-53534b2d968c	1	Other	Other
+80ac8851-67d9-4f6b-8055-0ac9accf4220	1	Other	Other
+80acd43e-c1c9-46ab-9cfb-9d315e63e3f0	1	Other	Other
+80acf916-46f7-4c5e-80ba-e2b726f86aa7	1	Other	Other
+80acf974-ccdf-41da-8801-9b4169e7e681	1	Other	Other
+80ad0462-c155-4def-a76c-5698f63b236c	1	Other	Other
+80ad2373-8eb1-4019-bb49-11eaf14dea7d	1	Other	Other
+80ad4e7f-158a-4fb5-a8bc-eb64997d97bd	1	Other	Other
+80ad5fac-6fdc-4d32-9082-764d366e7bec	1	Other	Other
+80ad631d-03b5-459d-992f-d9c0be547ae7	1	Other	Other
+80ad7f97-aee3-4c67-b695-331999769c9e	1	Other	Other
+80ad980b-9ac6-4cfb-bad1-a9a23f6237e5	1	Other	Other
+80adf76f-5179-43c2-bac1-d9fc0ce83406	1	Other	Other
+80adf874-ba5a-48d5-abdf-bbe5478cd5fe	1	Other	Other
+80ae290a-e7ea-4acc-9d34-06f2d74595a7	1	Other	Other
+80ae5711-2c48-4ea1-b4c9-0d6d1ca7801b	1	Other	Other
+80ae5736-5bcf-44f7-bdd9-8d3b6185b35e	1	Other	Other
+80ae6fa7-5281-4abe-8427-028431e47ac5	1	Other	Other
+80ae70d8-9470-4ea1-b3a2-64a49bc215dd	1	Other	Other
+80ae7ad9-b18a-4f3b-985b-b24b5f3c9fe8	1	Other	Other
+80aef66e-d1bc-4d91-a309-ef8b0d455743	1	Other	Other
+80af0f60-6664-4c36-a6e5-27acf86152ef	1	Other	Other
+80af1a82-f11a-4a2a-95f8-0c40922863a2	1	Other	Other
+80af7108-26eb-4187-bcd8-e31e765d5405	1	Other	Other
+80af7446-a1bf-4897-86c6-b2f773be0976	1	Other	Other
+80af7b19-59bf-4377-a8a3-2ffa06a02e37	1	Other	Other
+80af8c99-5286-4749-9f48-52cbbea26467	1	Other	Other
+80af97e0-9f61-48d7-9a77-4c758610e21d	1	Other	Other
+80afa77a-4118-4fbe-97e3-7246b134db23	1	Other	Other
+80afa9b2-48b1-417f-a3c4-4e563fdc6e49	1	Other	Other
+80afdee8-5860-41b8-95a1-2ce8d215bd66	1	Other	Other
+80aff0db-c45e-4898-9f49-ca844aad5569	1	\N	Other
+80b06cd8-f470-42f8-b6ef-4cd3ff96593e	1	Other	Other
+80b0c9da-b288-4c9b-8689-e33a5e050cb1	1	Other	Other
+80b108c3-465a-4c7e-bd5d-83e739516cd6	1	\N	Other
+80b1c9c8-9765-421c-82c9-553c0b2efcb9	1	Other	Other
+80b1d49b-1be5-4458-9310-376d6d0b471b	1	Other	Other
+80b21181-e485-47ec-9b65-7aefb279b4fc	1	Other	Other
+80b23f98-ff80-4eed-8622-ec2593ee2f4c	1	Other	Other
+80b2535c-2cdd-49f1-92d8-0af6fbebdd43	1	Other	Other
+80b27f90-1194-4444-ab1a-59a84f3d6576	1	Other	Other
+80b2dbe7-4386-4125-a0aa-c0a081ec737e	1	Other	Other
+80b310d0-eb08-40c5-a449-052c25c19a63	1	Other	Other
+80b36099-34bb-44f2-b0f4-b78e1a550a27	1	Other	Other
+80b376ac-8d04-4fc0-8881-f3d971edb2f9	1	Other	Other
+80b377db-e334-4e74-9543-405f8da3adae	1	Other	Other
+80b38015-8178-48f7-81e0-ebb76cbb0184	1	Other	Other
+80b3ba00-a2be-4d2c-a88b-9b36854efac4	1	Other	Other
+80b3cbfd-6489-4e04-92d2-cebe64b6961e	1	Other	Other
+80b3fb9a-4a77-4a1a-a02a-f6c2840369ea	1	Other	Other
+80b4218f-9a09-421f-a999-7e8069de6839	1	Other	Other
+80b43a97-3f38-41c7-b8a0-9738d907e10a	1	Other	Other
+80b456db-0051-4d4c-bdf3-e495cffd587a	1	Other	Other
+80b46f5a-bf74-44ca-9e04-0f024e1c7fe2	1	Other	Other
+80b48194-1aed-42d8-835b-0852525f1732	1	Other	Other
+80b4a411-c0ec-462a-a307-cc8a49ae1b52	1	Other	Other
+80b4de93-6ff0-4888-b21b-133c04c3ee2e	1	Other	Other
+80b50d06-6510-4cf4-912b-d9cfaf28124d	1	Other	Other
+80b56aca-1c7e-41dd-9460-e574cd70b7e0	1	Other	Other
+80b6218e-b870-430c-a865-406aad94b3ce	1	Other	Other
+80b63d4b-75d8-4601-82a9-8aa5dee60ba3	1	Other	Other
+80b64443-0b03-4755-894f-d6a7c3019104	1	Other	Other
+80b65c42-298e-40b5-8110-ee262f0ff6d4	1	Other	Other
+80b68788-a267-46c5-a263-10356850eb8d	1	Other	Other
+80b6fe07-0cc1-4529-8978-fbf59057ec27	1	Other	Other
+80b799e1-f89b-48e9-82ce-528279d2aa26	1	Other	Other
+80b79e93-00c3-4a52-a086-1264fd46e81d	1	Other	Other
+80b7b056-4b09-4616-9797-4c8fcad74127	1	Other	Other
+80b7b538-a720-4de4-97ca-3646b618303c	1	Other	Other
+80b7b850-07ec-4790-a131-165bf18d358d	1	Other	Other
+80b7ce00-6555-4acc-b056-aba2b96f0537	1	Other	Other
+80b7f424-24bb-4b2b-949e-73e549e1f3c2	1	Other	Other
+80b7f6d4-5d0f-4b8b-9a3f-80e024432ec6	1	Other	Other
+80b82b13-58af-4f19-b3f2-8012322dabdd	1	Other	Other
+80b830e4-fc36-4006-a833-f93441b506d2	1	Other	Other
+80b840f4-f9a7-454d-945e-6ce00ac62a2c	1	Other	Other
+80b866d8-47b7-4942-adff-364f58958cd9	1	Other	Other
+80b8bf89-ece4-4106-869a-dfc52f5b30d3	1	Other	Other
+80b8cbcd-9229-49ac-99db-a5fe2d4e1bc0	1	Other	Other
+80b8e958-4217-4ac5-8882-fd810497d8ba	1	Other	Other
+80b9bbb2-80c8-41b6-bb53-6664fe02e815	1	Other	Other
+80b9d976-fbae-4f20-b2b7-e889d407a7ad	1	Other	Other
+80ba058a-8307-4478-b00f-fa57c056c85c	1	Other	Other
+80ba0de3-d94c-4ff9-9a34-18ea971f0d55	1	Other	Other
+80ba7987-0079-4216-886e-3fb69c246e9f	1	Other	Other
+80bab26d-e264-4c8b-b32a-02ef29fd59e4	1	Other	Other
+80bac748-b7bc-4b67-b395-33a7ecb021be	1	Other	Other
+80bb429a-3a49-40af-a9f4-9578c15e319a	1	Other	Other
+80bb4932-77e5-4946-8548-48286f844192	1	Other	Other
+80bb500a-adae-440b-b50b-4fc93a5c076d	1	Other	Other
+80bb83d6-95ca-418d-9195-b8ed08f39f2a	1	Other	Other
+80bb8900-e8e8-4cf6-a73e-a04c29dd953b	1	Other	Other
+80bb9be7-cf84-4512-b722-2c815310f086	1	Other	Other
+80bbcd7b-a93c-43a8-b51b-dfef3310440b	1	Other	Other
+80bbda86-874a-4066-8e43-0b708fce7394	1	Other	Other
+80bc03a3-83d5-4e31-a31c-02322a391a83	1	Other	Other
+80bc5fe3-e0f1-45c2-8616-c73b0528a729	1	Other	Other
+80bc6ae1-d2ae-4161-b22d-832033d55d3f	1	\N	Other
+80bc777b-b32a-4249-b2fd-922f5b7fcb27	1	Other	Other
+80bc7fb8-de68-418f-a49b-cd60cde1cf04	1	Other	Other
+80bcd074-2327-48d9-b8b6-bc9c59578da1	1	Other	Other
+80bcdc42-29a6-4e40-bcdb-35971fe490bd	1	Other	Other
+80bce83b-2383-460a-afaf-97c3cf2ca667	1	Other	Other
+80bd3f5e-29f1-48a1-ae90-bee3d3df47dd	1	Other	Other
+80be55da-5732-44b1-b56d-3197e62fd973	1	Other	Other
+80be83b6-eabb-4380-aa0f-5b89d265e9fa	1	Other	Other
+80be8806-0d3d-42b8-af84-cda7f4c8546e	1	Other	Other
+80bf1649-1273-4f6f-9a80-02c8482ee3c6	1	Other	Other
+80bf2ea8-1527-4839-a792-1dcf002788c0	1	Other	Other
+80bf48f5-82bd-4f39-8e89-391e3ef032be	1	Other	Other
+80bf78e2-b3f8-45bf-bbdf-7b2d119edf5c	1	Other	Other
+80bf7a86-4ebd-415e-99e9-54bfccbfbfbf	1	\N	Other
+80bf7ca1-9b95-4ae2-a9a1-8164b79d124f	1	Other	Other
+80bf91ce-9e03-495f-84c9-fcdc06cb7c26	1	Other	Other
+80bf9a78-bad6-47c3-a87e-05408f7b1bb3	1	Other	Other
+80bfe351-8a7a-41ba-8d1b-0a4726b449a5	1	James	Other
+80bfe66d-109a-4bd8-a88b-07122c6d4ecf	1	Other	Other
+80c0245f-11e5-46a7-a56d-116be42af24a	1	Other	Other
+80c07ef4-4bed-4a51-8036-87cca0529f40	1	Other	Other
+80c097e2-20c2-43b9-95f0-73c410d3c002	1	Other	Other
+80c0d64d-1aef-4589-8a2e-a8cce024ac0f	1	\N	Other
+80c0e64b-8a1c-44b0-b938-d1a8cb31ae26	1	Other	Other
+80c10044-29a2-4005-82be-4a0ea0c71a2b	1	Other	Other
+80c15768-cf8d-475c-ad22-e5949e99ddc9	1	Other	Other
+80c1e9d8-0c83-48a6-85ce-c8a7c21e11b5	1	Other	Other
+80c1fbb4-1a4c-4acd-b85c-0616d0c7e6fd	1	Other	Other
+80c21dd4-818f-4eda-a6bc-0d2450121826	1	Other	Other
+80c238e0-b910-4d86-a8cb-4c671b855f5a	1	Other	Other
+80c2514b-1474-4e92-8290-b7321bf8c1e2	1	Other	Other
+80c280ee-2d48-46d3-acef-3a16c5a168d2	1	Other	Other
+80c2afa7-8fbc-4c8f-9209-8d59c58cf6b8	1	Other	Other
+80c3447d-dd4a-46bc-8c52-29cbd0a01142	1	Other	Other
+80c3463d-1482-4e8f-b385-58fc02696661	1	Other	Other
+80c36277-c0c3-4474-a535-781ba8574b9f	1	\N	Other
+80c380c8-bbbc-42f1-b634-13969ae644b7	1	Other	Other
+80c43ae2-0bfe-40b5-983a-dde7c41d9b3e	1	Other	Other
+80c444ab-909a-41f4-9bc9-e8a62bdaf07a	1	Other	Other
+80c4bd18-bf4a-4fb6-ad1d-f6ef1d9ece6e	1	Other	Other
+80c4d620-3426-4823-b7d6-31317d7264bd	1	Other	Other
+80c5594e-6afe-4d5c-add3-10f922a9fe65	1	Other	Other
+80c5b32e-b776-4694-b238-82a0d33ae27e	1	Other	Other
+80c5c409-c1c3-4c5a-8ee0-e86283166822	1	Other	Other
+80c5d3d6-72c0-4074-9c6f-e7e1003e95d1	1	Other	Other
+80c5e01e-2ee3-4819-9528-b2621a4a5247	1	Other	Other
+80c60673-6c31-4b87-81f3-6ea222d60c4d	1	Other	Other
+80c642f7-aaf4-47c6-88b6-419952193dc4	1	Other	Other
+80c69029-87d2-4988-9772-4b33e65e5d63	1	Other	Other
+80c6a6bf-fa7e-4c78-9926-e4accbd0471f	1	Other	Other
+80c707a6-8edb-4536-9f17-77aef01e4220	1	Other	Other
+80c712dc-7e65-4ba9-89b9-f346f30c7b93	1	Other	Other
+80c719d8-1a4b-4571-8376-8e34069c5fb2	1	Other	Other
+80c78325-c774-4569-890e-f69138dd62bd	1	Other	Other
+80c79878-feb4-4bfa-ba38-a7b3bd5f1795	1	Other	Other
+80c7bb16-615d-4051-9306-1299d88c5fa3	1	Other	Other
+80c7faf9-06b6-4f26-ba2a-78d14bb42b54	1	Other	Other
+80c85269-37a4-4d5b-8c86-b2b051e77595	1	Other	Other
+80c85a41-d6bd-4ab0-a201-98481ffae510	1	Other	Other
+80c86af5-8367-4a74-b520-4ce77638db79	1	Other	Other
+80c874bd-2141-4e72-a903-44fa5a3f27dd	1	Other	Other
+80c9573b-7722-45e3-b003-a9d1c1a721e8	1	Other	Other
+80c96cbc-7f15-4abd-841f-a00ce6737a34	1	\N	Other
+80c98317-7bd7-4292-bc9c-cfdeba20eaa7	1	Other	Other
+80c9d925-588e-4bcd-9b78-3a25d2b49e9f	1	Other	Other
+80c9db85-e617-4d0f-b1cf-127e9ddd893a	1	Other	Other
+80c9e3e0-6976-4771-8ffb-257190263055	1	\N	Other
+80ca0c46-c7ac-42ea-9812-6fd7f65cd506	1	Other	Other
+80ca33c8-207d-4cac-b132-5a184378f0ca	1	\N	Other
+80ca372a-d82b-494b-8281-f8f4cee9b80b	1	\N	Other
+80ca3c44-03e7-4eda-8689-cc30df9f8532	1	Other	Other
+80ca3e43-b73f-4668-b67a-b80ab84470a3	1	Other	Other
+80ca501b-c478-4e56-a09f-ac68f6b026cf	1	Other	Other
+80ca54e6-1459-4da5-9913-b94c989eb52c	1	\N	Other
+80ca6c93-a659-44a8-9891-6cea5f64b6bf	1	Other	Other
+80ca7e17-e7d8-4b52-9b84-8ded28b4bfc0	1	Other	Other
+80ca9e03-81f8-47e9-b177-9356b529e935	1	Other	Other
+80caa53e-f08e-446e-8b3c-8543210cba66	1	Other	Other
+80cab8b5-e86c-41ba-99a8-d0220aaae0f2	1	Other	Other
+80cb3d10-bd02-46c4-9bcf-05bbbbaa2e8c	1	Other	Other
+80cb520a-f4dc-4a56-9920-068ca7e24e88	1	Other	Other
+80cba822-b57e-48ba-88c7-42a65eb0c2ab	1	Other	Other
+80cbcf63-1014-4566-9870-b4775e00e1fa	1	Other	Other
+80cc0e50-865b-4636-84f5-0dab0b246e4a	1	Other	Other
+80cc5a20-3e0a-4d9c-b480-2b6b380d3857	1	Other	Other
+80ccd146-afc6-42cc-9740-74804a976506	1	Other	Other
+80ccd697-9b7f-4db9-90a3-01b541a300ec	1	Other	Other
+80cce524-6af5-4490-8724-5b6c76cefcdf	1	Other	Other
+80ccf549-81a2-4137-9878-791d10952648	1	Other	Other
+80cd5914-5fc9-4fe0-9575-a349a8abb7ae	1	Other	Other
+80cdadcd-a9fe-424c-8755-69a7b3f6eb9d	1	Other	Other
+80cdb6d8-91df-4ccb-9505-60aa220da502	1	Other	Other
+80cdbe06-3f66-47ba-97c1-9f57e3480bb7	1	Other	Other
+80cdce4f-0b7d-4c67-aaea-26f3deb1b0a6	1	Other	Other
+80ce300e-af96-4a38-bbb0-b076c928740a	1	Other	Other
+80cee17c-eb3d-4de5-b60b-cfa09c1c52d6	1	Other	Other
+80cf15b3-cbd5-4f0e-b860-39ed3e279869	1	Other	Other
+80cf1df6-a8fc-4378-a110-30068cbd09ba	1	Other	Other
+80cf3381-1769-4d05-95c6-1dbf8a8da27e	1	Other	Other
+80cf7041-c403-4132-aa20-6157059ece5f	1	Other	Other
+80cf73ea-4375-4ec1-8743-f3d63e3438bf	1	Other	Other
+80cfa9a4-1b5a-4874-9584-94b109b10abb	1	Other	Other
+80cfb4d6-ed01-4158-804c-99b3465ea773	1	Other	Other
+80cfb4f8-5cb4-4739-9e59-4cd30116ebd5	1	Other	Other
+80d01f29-baaf-4a74-8e3f-2ebda3674065	1	Other	Other
+80d0590e-8219-465c-8acb-f7afd15f7a2e	1	Other	Other
+80d1ae86-7ed6-4bef-abca-8106df274eee	1	Other	Other
+80d1aebf-2090-40ed-aa7f-1887fe579dd3	1	Other	Other
+80d1cda9-3657-42c7-aee1-adbfc2829e2e	1	Other	Other
+80d1d4e1-bdaf-4461-9dbe-d8ca8be18150	1	Other	Other
+80d23100-078b-4e00-ba42-e9ac2b634d51	1	Other	Other
+80d2534a-f4de-4af3-be32-b6639a550042	1	Other	Other
+80d285e8-c74d-41a1-9864-b5f11f5c96aa	1	\N	Other
+80d2a2b7-1be5-4a82-add2-a3caa260296d	1	Other	Other
+80d2e24f-11ac-4ff8-99d2-748755fe1f3b	1	Other	Other
+80d2f4a5-1dea-4eff-9896-e3400c5c4edd	1	Other	Other
+80d32acf-9c61-48a3-9d75-45bf7a56bd86	1	Other	Other
+80d3460a-5db0-49db-a7ac-22195662af19	1	James	Other
+80d34e55-99a1-4218-a058-01859e2cae08	1	Other	Other
+80d3512a-7c21-489b-aff0-28564cf46d2a	1	Other	Other
+80d37323-4eb6-413f-ae5b-90368fe458fe	1	Other	Other
+80d3917b-0eea-4398-a385-bedc9557ec09	1	Other	Other
+80d39b36-c918-11e7-9e5f-fa163e8624cc	1	Other	Other
+80d3a3ab-8d4f-4c56-a127-0a4d07cfb6b8	1	Other	Other
+80d3b367-d73e-45d3-a591-0e44af8070e8	1	Other	Other
+80d3b755-aa68-4574-b22f-2969e83a8f1b	1	Other	Other
+80d3d8aa-aff1-4af3-86d0-15635e01648e	1	Other	Other
+80d41ecf-dfa9-41dc-9d46-44a5e5270ba2	1	Other	Other
+80d44b39-6b4f-4ced-bd14-51b956051f69	1	Other	Other
+80d45899-e7cb-4f1f-bbc1-dcd301d57c7a	1	Other	Other
+80d46b1a-5d6d-4009-ba65-e8d5426b2464	1	Other	Other
+80d482d1-9073-4504-93e4-5af78f4a702d	1	Other	Other
+80d49a38-e077-4293-b030-d77584288882	1	Other	Other
+80d4cf57-8a09-4cda-8891-0c87155e2c22	1	Other	Other
+80d4fd74-5dd5-458e-88d6-8853543983d5	1	Other	Other
+80d531a2-7427-4622-97fa-36af2af3f96a	1	Other	Other
+80d56aba-7b95-4d54-88d2-a65635cb421a	1	Other	Other
+80d572cf-fb53-49ca-b936-f5dbf91a2204	1	Other	Other
+80d57ddc-6f18-49ef-8aa2-049d93d2fb37	1	Other	Other
+80d62bfe-7bb9-4f82-925f-b32bdbae6677	1	\N	Other
+80d64eaf-fa1e-43e6-b5fa-b0f173ccd934	1	Other	Other
+80d6b27d-e9b6-4af8-8a14-ffcbf358a57d	1	Other	Other
+80d6db0a-a78a-43e4-8a26-4baffbcb8465	1	Other	Other
+80d6dfe0-944f-4222-b31c-86eeb7b337a9	1	Other	Other
+80d6e83f-50d1-4f65-ad35-b4818bd70f9f	1	Other	Other
+80d6e850-1391-4378-88ff-a8f2839c7060	1	Other	Other
+80d72e1c-2a61-45f9-a4ca-ebdf266ace8f	1	Other	Other
+80d737d2-4b02-4d37-8ca6-75118ca883ce	1	Other	Other
+80d7386e-e085-4355-b1a9-0dbce288df90	1	Other	Other
+80d77c31-cb16-469f-b52c-a98be18cd2f0	1	Other	Other
+80d7b392-f650-4302-a370-f08c3887941f	1	Other	Other
+80d7ccc0-2ca7-4d9c-81c7-37d46821296c	1	Other	Other
+80d7cf17-97e2-4682-a096-c0f76723e574	1	Other	Other
+80d7f28a-8a27-4833-b999-f3c7a0881c89	1	Other	Other
+80d81a7b-5c25-40b5-b69f-409a7df38382	1	Other	Other
+80d82556-2889-4bef-83ae-c31f8214a2d6	1	Other	Other
+80d8320c-c3c6-4450-b850-24a79cc1aa92	1	Other	Other
+80d83247-233f-4c29-af6a-91d60956e987	1	Other	Other
+80d85cb4-2ece-4b22-8992-b1f39353fceb	1	Other	Other
+80d871c7-49e2-4f89-8740-f9ecbb25d047	1	Other	Other
+80d977c0-37aa-4893-a20c-14bcb04ed024	1	Other	Other
+80d9be4d-5916-43da-bb1d-a8ce0bcf0c18	1	Other	Other
+80d9ca0c-c656-4e81-bcca-f25d1faba88a	1	Other	Other
+80d9e421-a7a6-4ab8-a898-a8994b46634a	1	Other	Other
+80d9e815-4f37-4c67-8e04-22a1cde46756	1	Other	Other
+80da54c3-6e25-4c1c-b086-5687fd4df615	1	Other	Other
+80da6459-2fa7-4651-ae07-2380ba44cd38	1	Other	Other
+80dab94f-79da-49c7-b001-e85b675205f7	1	Other	Other
+80dadd4c-2484-4467-8d44-a6a75666bce0	1	Other	Other
+80db1b7e-7383-4908-a51b-cd78f995deac	1	Other	Other
+80db4a5b-506d-4bca-8b68-d839034fe0ea	1	Other	Other
+80db53e1-d359-4dd4-92b6-8fc20ade4f59	1	Other	Other
+80db760c-b70a-4d73-b8a3-11a25c4acc2f	1	Other	Other
+80db7f43-dbaf-4ded-a114-1e1707c58376	1	Other	Other
+80dbc8cb-b3e2-4a26-bbf0-f504285477ab	1	Other	Other
+80dbce2c-5eba-49f0-b265-c91ce6a3ff1e	1	Other	Other
+80dbd2e8-c5dd-4baa-8e13-a0a59fce22ad	1	Other	Other
+80dbf9d5-bac0-4d1b-b80a-2cbd55faf329	1	Other	Other
+80dbfc07-ba3a-49e5-81f3-04e6df983136	1	James	Other
+80dc2453-afb0-4ee0-89d7-c3ba024e5e5a	1	Other	Other
+80dc60ea-7f4b-4aa4-a194-f539c70387c0	1	Other	Other
+80dc8c38-6efb-4654-9636-937f6721310e	1	Other	Other
+80dcca4b-1fd5-4c2c-bf15-ef2b1874bb1d	1	Other	Other
+80dcd82d-ef50-4642-bff3-defcbec79836	1	Other	Other
+80dd0c74-68da-458c-be1b-4c34e8722ccb	1	Other	Other
+80dd474c-eb40-4145-bdd3-191cfd882022	1	Other	Other
+80dd735a-51c6-4011-8cc4-1714d2062411	1	Other	Other
+80dd74aa-6242-4b3b-9c61-3f5640bd94bd	1	Other	Other
+80dd774c-5001-49e6-9256-3d521e54c9f9	1	\N	Other
+80ddc58e-fc5e-437e-a645-d6f318302e90	1	Other	Other
+80dde094-44fb-43d2-bcb2-7bf131c6938d	1	James	Other
+80ddf579-23aa-426d-9612-89ce3fd15a2b	1	Other	Other
+80ddf904-e199-44ca-863f-5567ac1a670c	1	Other	Other
+80de14e7-92e2-4c54-bb7e-179e1a357430	1	Other	Other
+80de1642-9304-4abf-89ad-41415efe357c	1	Other	Other
+80de29dd-f05d-42c1-ab49-4976e7b76ada	1	Other	Other
+80de2fd0-c87f-401f-aa6d-fd54c2ebbfe7	1	Other	Other
+80de6ff8-8072-4890-ba0b-3321ad35dad8	1	Other	Other
+80dea557-dc2f-4cef-a171-6c823903e713	1	Other	Other
+80dee696-b317-44c3-9542-8aa383f4da20	1	Other	Other
+80df26ef-11ec-4677-bd46-f719c1021ca9	1	\N	Other
+80df4ceb-f22c-48d3-9d7d-66a1eb7a82c2	1	Other	Other
+80df5160-43f9-4708-a9db-abf54e77efbf	1	Other	Other
+80df602e-659a-4d89-bc1d-a751a0c0f3d8	1	Other	Other
+80df6b13-7688-486a-af0d-59bfdb6f1eda	1	Other	Other
+80df81cf-f307-404d-a76e-6a079ff14857	1	Other	Other
+80df89a2-e8d6-40ca-97a6-c1689dcab289	1	Other	Other
+80dfb93e-acc4-4dbc-94d3-505aa6720099	1	Other	Other
+80e00ccb-7ba6-4edd-9dd4-a5a719d51abb	1	Other	Other
+80e065ba-d19d-47bd-839a-dc56bcb4e45d	1	Other	Other
+80e08f7b-cefe-4118-a8ec-8de255412590	1	Other	Other
+80e0e2e0-c331-434d-aaf0-4f136cf4c69f	1	Other	Other
+80e0f902-572f-4275-8bb7-8c5057c37454	1	Other	Other
+80e107c1-04c8-4532-bf6d-9141296b01c8	1	Other	Other
+80e113a6-c789-4825-8ad1-ea4fddff36a0	1	Other	Other
+80e1440f-f7a6-4e5c-9318-0893fddc2d3d	1	Other	Other
+80e148e6-02f2-4714-9808-9cae7cc93eac	1	Other	Other
+80e19980-18a1-45ae-9490-f18488cc8e98	1	Other	Other
+80e1c180-61fd-422f-93c9-dfde00ecdebb	1	Other	Other
+80e1ea35-3b81-4505-a2b6-cea23411c118	1	Other	Other
+80e20b0f-bb9f-4dea-856f-54fa1747f65d	1	Other	Other
+80e2192c-8de2-4249-a51f-d76fcc1170e3	1	Other	Other
+80e22d5d-d77b-4620-8308-299a22559409	1	Other	Other
+80e27bfb-458f-4cfa-b79b-4ea7f24f81b3	1	\N	Other
+80e283da-cb42-4cdd-af83-8edaf43948c1	1	Other	Other
+80e2a42c-a032-4689-a806-0e279d900e8c	1	James	Other
+80e2ddf3-6093-4a98-9d96-c00f5b92e791	1	Other	Other
+80e345a0-174d-47d2-b582-a6bd5bb97d98	1	Other	Other
+80e3b64f-2d9a-4732-879b-d29c2d83ade0	1	Other	Other
+80e4147e-0f44-472e-8f09-3cd5cd0823a3	1	Other	Other
+80e42364-af8c-43e5-a4a0-ce1bf9afef93	1	Other	Other
+80e47a5e-98cf-44fa-b302-69d51add9a8d	1	Other	Other
+80e49590-8617-460f-85e4-c72e55ad482b	1	Other	Other
+80e4ce62-3f2e-4d3f-960f-60e138fe5556	1	Other	Other
+80e58492-abb4-4ee3-8a2f-de0cbb5f76aa	1	\N	Other
+80e58c49-c78d-4a44-bdd3-48c15b8daa8d	1	Other	Other
+80e603b7-d299-4c74-b068-55d404de9baf	1	Other	Other
+80e60967-feae-4333-8627-88ebbe0689d3	1	Other	Other
+80e69768-c5b7-44f6-8d43-5ba8450516d9	1	Other	Other
+80e6a0ca-893f-4a14-94dd-53a7466c5dd1	1	Other	Other
+80e70ab8-2421-4f23-86b4-51e57e7bbcb9	1	Other	Other
+80e70f35-dc42-4d2c-9489-a8a8797c60ea	1	Other	Other
+80e756d0-1581-40a7-bf0e-d6f9e29b9ac4	1	Other	Other
+80e79e59-8d4b-4ec4-9dbc-cc6522bbc205	1	Other	Other
+80e7b16a-c8bd-4290-bc25-c726e3328966	1	Other	Other
+80e7bf16-350c-4d3b-937f-a5db4381347d	1	Other	Other
+80e7dd6f-6b3e-454a-9d90-916e84f40eae	1	Other	Other
+80e87d58-51e1-404a-9b2f-67c526815ca7	1	Other	Other
+80e8a4b4-62cc-4d2c-95b6-3be7181dab73	1	Other	Other
+80e8b044-8238-4434-8b27-434b12b9e39a	1	Other	Other
+80e8b368-bd55-4bd4-8a3f-83de6d4a3792	1	Other	Other
+80e8fe03-9a51-450d-90f6-441e3d0fa06f	1	Other	Other
+80e91344-ff9d-4d4f-9f87-252c26ff816e	1	Other	Other
+80e94557-13c1-4c91-8979-44dc30028d5c	1	Other	Other
+80e96867-9f25-4513-9c1b-9f21fc408309	1	Other	Other
+80e98d20-27b5-431b-a6a8-cb512e7aac17	1	\N	Other
+80e99daa-1b53-4d40-aef0-7c490f410e4b	1	Other	Other
+80e9cac1-2b10-4476-a8a4-c165e65d343b	1	Other	Other
+80e9cd37-df3a-471c-9c94-502ae9dfc854	1	Other	Other
+80ea0bc3-1baf-48e9-a6c8-c5124e7a257b	1	Other	Other
+80ea14e2-dca4-4a08-966d-e96eef779e62	1	Other	Other
+80ea51ed-0c3b-41f8-9d72-8238ef6ef339	1	\N	Other
+80ea5d1a-c0a8-440c-83a7-2c667d52c1a5	1	Other	Other
+80ea7e87-c585-4be6-8b49-c2051edd7504	1	Other	Other
+80ea86ca-9ba5-4af6-8dec-546bfec7f8f3	1	\N	Other
+80ea9148-231b-45f7-ac52-1abd5debad45	1	Other	Other
+80ea9e93-e592-41ea-a6d0-2adcaa6bff84	1	Other	Other
+80eac842-40a2-44c7-bfe5-74f319a3c115	1	Other	Other
+80eaeaa0-a57f-4530-8556-2a1614656429	1	Other	Other
+80eb2ffe-977e-402e-a844-bb7a3d6af63e	1	Other	Other
+80eb33ba-9c4a-4915-a0cf-3a2ce05ed5ce	1	Other	Other
+80eb63b2-bed8-4223-a03f-07e40b6101ea	1	James	Other
+80eb88ce-5ba3-4b93-a01a-ccee752e3914	1	Other	Other
+80eb9b8e-d5d5-484f-aef6-fa4fa223fd94	1	Other	Other
+80eba99c-9ebc-4c21-9e2c-3edb817bd980	1	Other	Other
+80ebdd97-77cc-43e7-95da-c66180d7d4b2	1	Other	Other
+80ec0961-5cd6-4f96-b455-65dd0db4ac36	1	Other	Other
+80ec198e-1947-408b-acb2-c0633a0cdf0d	1	Other	Other
+80ec57fd-112d-4193-9479-6d80868412cd	1	Other	Other
+80ecda95-6511-44e6-9994-667e436d018f	1	Other	Other
+80ecdbaa-e2dc-401c-ba0c-0e97db4492fb	1	Other	Other
+80ececc8-5a29-4db5-9329-13d2ad4a64eb	1	Other	Other
+80ed0559-93df-44b5-be37-2d5feb89be0b	1	Other	Other
+80ed12c2-6b75-4d3d-bb84-3f17769a645b	1	Other	Other
+80ed3189-c7f7-4f0d-989a-bc7923316e79	1	Other	Other
+80ed58e3-d8da-4bb0-9ae5-ec2f1d8294e0	1	Other	Other
+80edc286-1768-4c4c-b47c-ceca79f81009	1	Other	Other
+80ee18d0-a11f-488f-9855-5d7d6a35fe83	1	Other	Other
+80ee2f7f-a6da-4be7-ae28-0157fa8ac9b6	1	Other	Other
+80ee3e24-10d9-4579-b397-b52e764fc699	1	Other	Other
+80ee678f-5fbd-4a28-ac34-2a9b02d9409f	1	Other	Other
+80ef1736-5329-40af-9a5d-5c8d54cadb2c	1	Other	Other
+80ef996a-ee94-46e3-ae09-b1998ead6bcd	1	Other	Other
+80efa59d-0248-4e62-b2bf-84b9b68b6494	1	Other	Other
+80efc6c6-2e43-40d7-9364-89535c9c418a	1	\N	Other
+80efec3d-2b87-40f2-b885-57c5882f164e	1	Other	Other
+80f082d5-be94-4fe6-856e-80f2ee8fc5f5	1	Other	Other
+80f0ef74-61cf-4344-a1ac-3560919ab45d	1	Other	Other
+80f139a3-4e41-4c9a-96dd-5a33f2763e70	1	James	Other
+80f154d0-b1ac-4f2c-84e5-fb4c529332e8	1	Other	Other
+80f19436-0d28-4fef-bb63-ff299feff977	1	Other	Other
+80f19658-4aad-4946-975a-6e9ded4a0266	1	Other	Other
+80f1cb02-4f0d-4c52-9f0f-bd1f9bcf2cbe	1	Other	Other
+80f22ff1-2857-44ea-b134-84a15d78fbc3	1	Other	Other
+80f28394-816f-4114-91c6-df18cfa87a49	1	Other	Other
+80f29fa8-daa5-45ad-9f6f-e7f471a003c9	1	\N	Other
+80f2ad7c-fa68-48b0-8972-7ef103658cf4	1	Other	Other
+80f3375a-29d4-4fd7-ba27-37a7fc920202	1	Other	Other
+80f34c78-8d53-4109-bf16-faefc33ab15f	1	Other	Other
+80f37e81-3e4d-4c57-b6c6-5bdd33b9c91c	1	Other	Other
+80f39901-cae0-4a1e-931f-92c389b09ff9	1	\N	Other
+80f39d89-7dd8-4bd0-b7d7-2727fd294633	1	Other	Other
+80f3ca0e-1920-4946-a85e-1f4e2b59e519	1	Other	Other
+80f3cb3e-389b-4855-9948-4983fff13f8a	1	Other	Other
+80f40488-d4f9-4dd6-9dd8-06f2e18cfbab	1	Other	Other
+80f46fc1-d65f-42b7-b4d3-9700cb5dc2b2	1	Other	Other
+80f4dfbf-af00-47a1-82af-b0c803bfae53	1	Other	Other
+80f506a2-3e6d-4dea-9c6d-176eab1f8e4d	1	Other	Other
+80f51092-0262-4fe1-84df-f7cc136e15e4	1	Other	Other
+80f52f56-40f1-4d39-9c94-47bdb1e5aef7	1	Other	Other
+80f56438-e0a7-45c0-a167-38685bc06522	1	Other	Other
+80f5734b-51ac-4993-adeb-dbad1ab72917	1	Other	Other
+80f5b893-1f17-4bef-a299-056e3651c503	1	Other	Other
+80f5fe5f-bd91-4ec5-be53-c57c0f3ab4fe	1	Other	Other
+80f60955-c77b-4a51-b144-765169536682	1	Other	Other
+80f65b0d-0623-4ba8-a818-e2a82f4ae121	1	Other	Other
+80f65c3f-753e-4de9-8801-102073b2f287	1	Other	Other
+80f69af6-82e7-41c2-816d-3e68a9d4337f	1	Other	Other
+80f6cab6-4fad-4e98-b2a4-81cf5a6fe237	1	Other	Other
+80f70799-6615-4d86-b935-d9c2869e1dc9	1	Other	Other
+80f70c8f-e86e-4943-be63-3ca85dc2b44e	1	Other	Other
+80f7174f-3831-4a32-b9bf-08ee68fafe78	1	Other	Other
+80f753f8-7afa-45d6-be01-b7afcf8cd3c3	1	Other	Other
+80f77481-d61b-444e-aa49-9355a73ede38	1	Other	Other
+80f7ba36-a631-4992-9546-380e2281e3d1	1	Other	Other
+80f7c076-adcd-46a9-8b47-4ff20b8a2731	1	\N	Other
+80f83c44-d44f-4af1-9a0c-3ac618a8afea	1	Other	Other
+80f84d57-c205-42cb-aec9-3d5e4be61c56	1	Other	Other
+80f85b56-ae67-4146-a7fc-7c355785ceae	1	Other	Other
+80f88ee3-8cbc-442f-9e97-983059a2808a	1	Other	Other
+80f896d7-6f08-4132-81a4-83bd25c10150	1	Other	Other
+80f8b36d-76dd-44ce-9ae1-422da93a425e	1	Other	Other
+80f8b7d0-dbf7-11e7-b325-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	Other	Other
+80f8bb0d-89e4-486b-9822-631e164896d9	1	Other	Other
+80f95d7e-146d-4b59-9edc-66e4bfb66857	1	\N	Other
+80f9737e-e6b1-4ee6-918a-7445a0fd9e5b	1	Other	Other
+80f9e003-a865-4e9a-b40a-b27b78064b7a	1	Other	Other
+80fa0a75-e187-4189-b807-e37ea1adb87d	1	Other	Other
+80fa3fbb-09ad-4133-9338-c48662f3ea99	1	Other	Other
+80fa611a-b01b-470d-8210-dd322ab3113d	1	Other	Other
+80fb0b25-6ccf-4b1f-a813-2b35cce5a1d7	1	Other	Other
+80fb36d3-0b15-463b-beee-cdc099952339	1	\N	Other
+80fb3f72-5187-49b1-902d-fb22b38c32a5	1	Other	Other
+80fb63e4-eb8b-4772-998a-458744b0399f	1	Other	Other
+80fb7d81-959a-4b0a-b16b-fc6d507f3c98	1	Other	Other
+80fbf400-fa4d-46f1-aa6c-3e176b9e18b3	1	Other	Other
+80fc21fb-e5e5-4d31-b529-d01004d77cb6	1	Other	Other
+80fc4c6f-a228-42c1-a35b-821ec89c657f	1	James	Other
+80fc5a0b-8c09-4501-9510-55e107099a63	1	Other	Other
+80fc9fac-d68f-42b7-b26a-e34b3297a866	1	Other	Other
+80fcb82e-b7f2-4572-808f-189a255b5303	1	Other	Other
+80fcf79f-2320-485c-bbaf-7f6b9c657fd0	1	Other	Other
+80fd1bdf-5365-4745-825b-8df5d73315ec	1	Other	Other
+80fd375a-1513-4a78-a044-a50e237f24ec	1	Other	Other
+80fd38ec-8abb-4216-a11c-c78b93d58cd0	1	Other	Other
+80fd6295-0c3a-48b9-812e-b73b4cdec9c5	1	Other	Other
+80fd800e-744b-4597-8a14-9ad6bf9b976f	1	Other	Other
+80fdd907-9fcb-4642-9c33-83d1e81fd839	1	Other	Other
+80fde094-c964-4303-bf0d-0f10cdbaab34	1	Other	Other
+80fe12a2-54c3-49d6-b2fb-36d25336a650	1	\N	Other
+80fe138c-a481-400a-b6fd-0bd7e93c9396	1	Other	Other
+80fe1c62-7ca7-4e6c-a062-34d162355e11	1	Other	Other
+80fe754e-015d-415f-8a17-272f177bc777	1	Other	Other
+80fe8550-8356-4e47-abc7-6de083892026	1	Other	Other
+80feaeee-71fc-498f-b0f5-d1ed692be233	1	Other	Other
+80febce8-f9ac-4be1-9287-5866f516e001	1	Other	Other
+80ff0dde-0fcb-4d71-8652-61e8aeeef132	1	Other	Other
+80ff47f4-87b1-4d2a-a615-80a56a61836a	1	Other	Other
+80ff645d-919b-44fa-a4d5-e64403d9744f	1	Other	Other
+80ff7c09-1efe-4a04-8d2b-1e04ec2ac000	1	Other	Other
+80ff8bc7-4531-4c2c-997c-a6db653ff303	1	Other	Other
+80ff9abe-af24-4ace-9f2e-ad2d59029a9b	1	Other	Other
+8100a25b-cee1-4a29-b8e5-b5b249f8870b	1	Other	Other
+8100a324-47b6-44cc-9c6f-d80bac61f418	1	Other	Other
+8100a4b3-8a54-4015-ae87-563c4d03fecd	1	Other	Other
+8100afd8-7afa-4900-a8ea-3d62ebb0ad3f	1	Other	Other
+8100ecf6-cda2-43f1-9b1e-3a832f8d10ab	1	Other	Other
+810116f9-c31a-47ec-b164-2cb38b73f25d	1	Other	Other
+81011a08-a269-46e5-8f70-6114530356d4	1	Other	Other
+8101263e-f637-48b7-8680-3f89701a6ead	1	Other	Other
+810158f0-6ceb-4491-8f4d-33a661467493	1	Other	Other
+8101eded-f1aa-4e2e-a09d-377ab3d5fc8b	1	Other	Other
+8101fae5-d61e-4932-85fa-adf98554e832	1	Other	Other
+810252c3-a2cb-4ad5-a6b5-25a168a03e48	1	Other	Other
+81025b7c-5282-4493-8687-7a5a2a2d6f8a	1	Other	Other
+81025da3-9ef3-4c6f-ba6d-1f64f44944c4	1	Other	Other
+810266b6-ccd4-4c14-9c3f-dfe8ed382a9a	1	Other	Other
+810283ea-fefe-4ee6-8b59-9159a4521cae	1	Other	Other
+810329ab-d705-4c66-a8d2-ccf2ec26d7e8	1	Other	Other
+81033901-55ba-4469-ae2f-357bb132a87c	1	\N	Other
+8103413f-5f23-4fa0-9e76-a983de4f4a46	1	Other	Other
+8103653f-67ac-4bc8-8e50-ff639cd49950	1	Other	Other
+810375d3-995b-4919-b762-f276fc8ec9c8	1	Other	Other
+8103aea4-9161-42bf-b6d5-efe4cb9289bc	1	Other	Other
+8104534f-6b58-48ba-abad-5e85cad1f0d4	1	Other	Other
+81049144-2c12-418c-ba02-ed3a122c84c9	1	Other	Other
+81049c1f-99d1-4e23-a308-3791bd12ee59	1	Other	Other
+8104a487-6179-4c96-8c82-d9f9b0227b8d	1	Other	Other
+8104b7b5-b680-4b30-836e-956476575eba	1	Other	Other
+8104c8d8-a760-4661-b8b3-ffee0c324464	1	Other	Other
+8104d0fb-5c09-4fb5-8892-7116b3050a61	1	Other	Other
+8104f575-008f-480a-b857-14fe828023f3	1	Other	Other
+810527a9-4c11-49c6-b8c9-8143b6ca898f	1	Other	Other
+81055fc3-0690-4381-a4a5-7759a996c22e	1	Other	Other
+81058967-dd0b-4537-b6b8-fb3ecb6658dd	1	Other	Other
+8105896b-312b-4727-a97e-4eff91c559e1	1	Other	Other
+81059836-0437-4923-9535-dbe9fe92097e	1	Other	Other
+8105b89c-4fbc-4b0a-8db8-8038c3f9a6a0	1	Other	Other
+810637f3-aa90-43f3-9ccb-27e6464b6e77	1	Other	Other
+81065211-381d-47a7-8a61-bfa3e60051bc	1	Other	Other
+810652f8-5a3b-4948-862d-883e5fa544dc	1	Other	Other
+81065cc1-5f18-47a5-9e0b-e46c319a1fcc	1	Other	Other
+81067a93-153f-446f-86f1-c108ae25c6ab	1	Other	Other
+81068eec-7795-4e8c-bcec-792705b31ab4	1	Other	Other
+8106c36d-4b14-418d-9d45-24bcc517c38d	1	Other	Other
+8106cc2c-4ff0-49cd-827e-f8b073e71852	1	Other	Other
+8106cc85-ace6-4dfe-87be-c25278badae5	1	Other	Other
+8106eb25-3297-404a-b78a-61170c23162e	1	Other	Other
+81072c67-0bd7-49dd-b765-9b3f8c29e3c0	1	Other	Other
+81073452-25d9-4e31-9048-4967aac2e236	1	Other	Other
+81077097-92b5-43a4-9b29-00e42ef14b8a	1	Other	Other
+81077702-c33f-49bd-9177-9080ec3eabd8	1	\N	Other
+81077bfe-ac4c-4aa2-86ce-398d14cb34ab	1	Other	Other
+8107dde0-8864-4c1c-8f18-04670df99255	1	Other	Other
+8107fa58-da48-4060-8987-093d8ed652cc	1	Other	Other
+810835c2-9758-4f74-8d75-16a9de2160cc	1	Other	Other
+8108669f-6cb8-4442-bfb3-54f5e655e2ed	1	Other	Other
+8108739e-db56-4b81-8ec5-27f7a4c3b84a	1	Other	Other
+81087f16-9bcf-43dc-923c-224fca2eeec7	1	Other	Other
+8108bd50-3dcc-4abe-b7de-106d6b99a7be	1	Other	Other
+8108c40f-7e92-4c94-ad9b-736d23ae56aa	1	Other	Other
+8108cdea-ca93-4426-95d9-74f73776db5b	1	Other	Other
+8108ea95-2084-4d9c-add1-780da80adf3c	1	Other	Other
+8108fd5a-be0b-4526-8507-2de6a3f89b1e	1	Other	Other
+81091be9-5581-4c3f-afcb-cfb8a01e6348	1	Other	Other
+81092fdc-cb4a-471d-9b5c-b42504447025	1	Other	Other
+81093978-88bf-4cc3-88c7-a42f6f74f52c	1	Other	Other
+810989d9-bfde-410b-8fcc-042be74ac988	1	Other	Other
+8109a591-5cb7-43ab-a33a-88420ee1154c	1	Other	Other
+8109b280-7029-4fc6-b531-a15e92cdf040	1	James	Other
+8109d87b-2a0d-41fe-9107-5a56b0e94166	1	Other	Other
+810a115d-a6a8-4dcd-9a3a-f6105efd1f7b	1	Other	Other
+810a26f4-886c-4bc0-b6a3-0deb854c10b2	1	Other	Other
+810a29a6-e237-40d9-a470-717aa6a300ef	1	Other	Other
+810af6d6-dcb4-4aa0-913b-93ac188703c8	1	Other	Other
+810b0bac-f8ac-45b3-8cb6-05c32e3d2858	1	Other	Other
+810b209b-9d0e-4ed2-ae2c-cc25005f5086	1	Other	Other
+810b39a5-97e9-4e42-98de-da2a35f3b97f	1	James	Other
+810b4d68-46c2-43fc-87d4-8f3d2db5f360	1	\N	Other
+810b5490-8fef-40c7-85cc-25b2f25a53a0	1	\N	Other
+810ba5d7-226c-42a9-b7ec-89906993f4ba	1	\N	Other
+810c1e89-9d30-4c36-ae1d-26c017d78451	1	Other	Other
+810c2b01-7e32-4aa3-b7a7-2a008d5d6366	1	\N	Other
+810c430d-cab0-48b6-b939-47ff604f64d7	1	\N	Other
+810c8cfa-c080-4a59-be9e-57188a6cd099	1	Other	Other
+810c9a3f-1fc2-49b8-8b1f-3c57d490d697	1	Other	Other
+810cb5ae-ec9c-459f-a862-e55a55cfe9c3	1	Other	Other
+810cd675-a270-47d3-89a2-a69b6e2aa6dd	1	Other	Other
+810ce10c-6265-448e-abc6-871fa350c4c0	1	Other	Other
+810cf8da-e1e8-41ba-9394-9adb2d24808d	1	Other	Other
+810d1498-0592-4c54-b4bc-f91be8f6c39c	1	Other	Other
+810d5ca0-6db6-48a9-b16e-b33a49249604	1	Other	Other
+810da269-18d4-43ab-bd63-b42fd65752b5	1	Other	Other
+810e0017-6a9e-4ca8-870f-51fb9c1af4a7	1	Other	Other
+810e2d30-d655-45dc-9811-d8c7d67a3595	1	Other	Other
+810e37f8-489a-4acf-9185-c62376040dd6	1	Other	Other
+810ef944-0181-4a88-b41a-4efd66fefc84	1	Other	Other
+810f506b-2a32-4fc2-9c0c-86cb240fa906	1	Other	Other
+810f56f6-9a55-459f-9a9b-cc5252500a0c	1	Other	Other
+810fb41f-0cef-4f10-9921-df689372de00	1	Other	Other
+810ff400-39c1-4d37-bb9a-0d64b7afc927	1	Other	Other
+81109497-e51f-4607-ba01-0a0ba518682d	1	Other	Other
+81113b91-4876-4efb-a147-3592599ee195	1	Other	Other
+81115d08-9a4c-406d-a231-d78c2438f7ca	1	Other	Other
+811175a2-d081-4f7d-ab53-aa70548cfa28	1	Other	Other
+8111f052-3f6a-47b4-b85f-1e419451df8c	1	Other	Other
+811206d5-cfe9-4a12-91f6-48f4dc7cf151	1	Other	Other
+81120953-20c3-4c9a-9db7-59524b9fa457	1	James	Other
+81120e87-4c5a-4ff3-9790-125df15ea7f7	1	Other	Other
+81123d4b-d872-405c-b605-b83b32b66972	1	Other	Other
+811283f7-4eee-49ba-ade1-01ba1cef2af6	1	Other	Other
+8112def5-01c1-4f23-88c1-c93dcf0b02b9	1	Other	Other
+81130e1a-f8f3-4767-bbc1-3b51d9a1d443	1	Other	Other
+81132704-c902-43bf-be9d-b34955e9a3b4	1	Other	Other
+81133203-cdbb-4646-a38e-ba88125499de	1	Other	Other
+811381cc-f2dd-4fd0-9a1d-dc533fd71f5d	1	Other	Other
+81138eab-667e-4d7b-962c-804394a57b08	1	Other	Other
+81139ed5-64cf-4052-b910-2748ed449f88	1	Other	Other
+8113e63a-233b-4d7b-8d78-db32a8abb985	1	Other	Other
+8113e6aa-e5e7-40be-b0a2-9f29fde942dd	1	Other	Other
+81146fb4-2577-4ede-a668-ef5a6b2e8299	1	Other	Other
+811474c6-9827-4efc-92b0-2b394a941cd8	1	Other	Other
+8114764a-c6fe-4c9a-90c7-5dcd9c7e3b05	1	Other	Other
+811520d5-f788-440f-93e0-1149bc76f4d9	1	Other	Other
+8115439e-3355-45aa-b534-4559a389ee21	1	Other	Other
+81155666-f7dd-4f8e-8f19-b833a030dd2c	1	Other	Other
+81162c0f-ec59-427b-9cb6-f74263b895da	1	Other	Other
+81162cfb-e9f7-454b-8a94-1a7552d17cca	1	Other	Other
+811634a5-7380-4fe1-a5c7-659259c3770a	1	Other	Other
+811739fd-bbb6-4d1a-aa36-7be47403d6c0	1	Other	Other
+8117630a-4fc4-457b-ba14-4b0e41e8c403	1	Other	Other
+8117995c-c465-4b02-a0c8-26a04cc5352e	1	Other	Other
+8117a747-3841-469a-a72a-0c3d16697dd4	1	Other	Other
+811828ef-8bf1-4203-857a-bf6963361c00	1	Other	Other
+81184be1-3343-4635-b1e1-91adb5949fc0	1	Other	Other
+81190ba3-39e9-4fd5-8330-8f6009118797	1	Other	Other
+8119a8d6-d682-4dbc-9caa-51ee6ee59ba9	1	\N	Other
+811a1560-fc4a-4d8d-9e4d-92e17846b3a2	1	Other	Other
+811a5659-c275-4257-a626-f2419a2d8073	1	\N	Other
+811a68dd-5468-4f65-928a-184ef52cf1fc	1	Other	Other
+811aa7ee-cdf0-418d-b2a7-16dfc561d871	1	Other	Other
+811afbb5-8e8a-4a3e-a85d-66d7ff51b1fc	1	Other	Other
+811b4ad9-2bcd-4619-96f9-eab9a7f9ea37	1	Other	Other
+811b83bd-c6c9-4eb3-953e-7718078581c8	1	Other	Other
+811c1f17-9782-40ff-a58d-229f5d9f1747	1	Other	Other
+811c877b-2711-4a7e-b88b-df0777af96fe	1	Other	Other
+811c9bd1-3d9a-4f3e-bd13-055a092550a4	1	Other	Other
+811caca2-405d-45a4-89a6-920dc779203a	1	Other	Other
+811cd2c0-0717-440f-a003-7a03ff7c6597	1	Other	Other
+811cd603-a745-4de9-9b60-aeedb7c7e411	1	Other	Other
+811cfabc-3d33-4a8e-b5a9-b0720fb788d1	1	Other	Other
+811d57a9-19c8-441e-80ef-f48150f9f660	1	Other	Other
+811dc690-c2c5-43de-84ab-e89f35b8cbe1	1	Other	Other
+811dce24-5249-4c3a-b4c2-8ae93f5d1671	1	Other	Other
+811e0727-cbf5-43c8-9d05-ae6013b27076	1	James	Other
+811e1fdb-361f-4c22-9c63-242470639d72	1	Other	Other
+811e23d2-5173-4d39-a82f-e0d0465ead0f	1	Other	Other
+811e798c-85f3-4f51-af91-157fb1f9a902	1	Other	Other
+811e8887-cfcf-4bc9-a4f8-84cafc90ce2f	1	Other	Other
+811ecd6d-35d4-4078-84ff-b42288e737ae	1	Other	Other
+811ed2ab-e75e-45d3-b477-6d2d7858fd4e	1	Other	Other
+811f0064-9495-4c1d-a389-a9cc4a7fd507	1	Other	Other
+811f14af-8fb4-47b8-8028-fa96fddec72e	1	Other	Other
+811f2ad0-d621-4220-9fe3-9d193c4e427c	1	Other	Other
+811f516b-35dc-462a-be6b-bbdb36424cb2	1	Other	Other
+811f7369-bbd2-4777-b72c-795f7468c9f3	1	Other	Other
+811f7b43-4f37-4e37-881e-9a65dd159059	1	Other	Other
+811f9138-f5ea-497a-b651-745c8e8b1bc4	1	Other	Other
+811fa904-b6da-4bd9-90a3-5c7ea148bcec	1	Other	Other
+811fb904-6888-459e-a9fb-5d437dafcb70	1	Other	Other
+811fc7f6-55e3-44d8-a75c-183fa4589549	1	Other	Other
+8120100e-1957-4d6f-8d7f-a38b5ddb139a	1	Other	Other
+812018eb-a386-40bd-83a4-2733a0dd15a3	1	Other	Other
+812022e9-49c5-4ecc-be26-6fca9b324877	1	Other	Other
+8120bd96-5f93-4f52-afee-ecec075f2380	1	Other	Other
+8120c78e-2d71-4a44-9870-edca79db4f1e	1	Other	Other
+8120d0f3-2ce5-488e-a51a-0d162f0f98d4	1	\N	Other
+8120e3d2-4642-4ccd-b3bd-632b841a8696	1	Other	Other
+8120f2d4-b837-4689-a82e-5415d89a5656	1	Other	Other
+81211cd6-f4cc-4f5e-9f09-632e5f2b3a22	1	Other	Other
+81211fa2-9dfa-4ff8-8c80-c0e476dffd93	1	Other	Other
+81212277-be50-44fa-aa61-1a6fb5aa72e5	1	Other	Other
+81214180-a4fc-4fe2-bd03-ec1e51e6cbbd	1	Other	Other
+81218e66-0cc6-4489-8d78-c508c7caa9b5	1	Other	Other
+8121b653-30e5-43f5-ac0e-9acc7b1277d7	1	Other	Other
+8121cff7-c832-40a8-83ce-de598843561a	1	James	Other
+8121d4c6-03cc-45ac-8bf4-d5cff46f5c8f	1	Other	Other
+8121f990-282e-4549-b254-8223f016b594	1	Other	Other
+812239f6-628c-43be-80e3-740a10f9f928	1	Other	Other
+812245a3-183f-48a3-9e30-964f41ab2543	1	Other	Other
+812276d6-fcc2-4900-a353-db6fe4715b55	1	Other	Other
+81228c5f-508c-49b6-9217-c4c6c0ec5a20	1	Other	Other
+81229373-3cf3-4359-b10d-d49380cc4061	1	Other	Other
+8122e6f8-de7d-4ac3-9616-3fb67b600067	1	Other	Other
+81232785-7994-4ac0-bdbd-e34a975e1822	1	Other	Other
+81233d87-c523-4b7f-a730-869b7cd04a0f	1	Other	Other
+81236271-28d2-47d0-a9a1-5f39a17f85cd	1	Other	Other
+81237f0e-1ccf-4c45-b174-c98f25a6b345	1	Other	Other
+8123a17d-24a3-4a27-a0c3-f2d2528ddbcc	1	Other	Other
+8123b5f9-4026-4cde-a29c-bed16c57f0bd	1	Other	Other
+81243cbf-4df7-4a9b-bc62-4b25bb0260a5	1	Other	Other
+812443e8-3537-4c1a-b4e0-4f364e158dbe	1	Other	Other
+8124aaf9-6b43-43f0-8b4a-e6df055c0e05	1	Other	Other
+812554a4-54d7-4c44-be54-692d76ee638c	1	Other	Other
+812572d7-74ff-49e8-b3d8-999a5b8a1310	1	Other	Other
+8125c216-84ca-42a4-8a79-2255f895b9cd	1	Other	Other
+81261c6c-e91b-477f-89cf-cb32fd54722f	1	Other	Other
+8126271d-160a-4238-85a2-92affc8d8cbf	1	Other	Other
+81263db8-4ed4-4c22-bd2f-03f38f675619	1	Other	Other
+81266e88-da0b-49a3-80fe-07b0fd5f367e	1	Other	Other
+81273e77-627a-4a58-9b3e-d28aa1bb4f4c	1	Other	Other
+812776b5-e5c2-4650-b096-ecc321bd8d5f	1	Other	Other
+81278c66-8d28-4c04-b6b7-159034716ef0	1	Other	Other
+81279824-80f1-40d7-a928-6f1b928db769	1	Other	Other
+8127bd2e-facd-4603-934b-74908915c6dd	1	Other	Other
+8127f116-35c5-47f6-9651-7516ffb2ba76	1	Other	Other
+8128207b-010c-4138-92cf-d19b14917a2e	1	Other	Other
+8128333d-af7a-4c99-8365-8f702c5ca77d	1	Other	Other
+812841f1-d0fe-470b-b195-ff7d2c5b856e	1	Other	Other
+812849e5-0259-4b81-8cdd-a97023a151ab	1	Other	Other
+8128ef70-913c-46fd-aaae-3af250b76a38	1	Other	Other
+81297e70-b89f-40a7-8ee4-8108199e5a9d	1	Other	Other
+8129812d-11ee-4b47-a37a-fec1a89ccde0	1	\N	Other
+812a13ad-b872-4592-adf9-90d3193bb4db	1	Other	Other
+812a3286-d883-479a-b9cb-a0ae82a49a18	1	Other	Other
+812a5f9e-89bf-4bd5-8883-e3739c60b4d6	1	Other	Other
+812a717a-4f23-4983-9b68-016ccf24f1c7	1	Other	Other
+812a9d62-f6dc-4835-a4c4-023cec28141e	1	Other	Other
+812b1516-b633-4f26-915c-919c0a69c84e	1	Other	Other
+812b8228-a051-4440-86c3-fce5f23f7bab	1	Other	Other
+812b8632-c015-40cf-8e3c-1f0568f894c5	1	Other	Other
+812ba6fc-425a-4f06-aba6-297340f1bc83	1	Other	Other
+812bbb14-d4bb-4b65-8d3a-908031e94afe	1	Other	Other
+812c2aa1-b0a5-4c86-adcd-0ef34939bcfd	1	Other	Other
+812c2b6a-2068-4be1-8bbf-6e1ebb051cec	1	Other	Other
+812c564b-d4b9-4114-9dc0-5f58c941aa36	1	Other	Other
+812c5bd4-8ef9-4e33-99ca-0b1fbb476da8	1	Other	Other
+812c8b66-821b-4df1-90f7-44ebcca375fc	1	Other	Other
+812ce0aa-d574-48ea-8798-66a6ace38f78	1	Other	Other
+812d2cbc-35dc-41aa-ae5f-30d097d54d7e	1	Other	Other
+812d7f93-795c-401b-a351-dae11c4aec8f	1	Other	Other
+812dac04-5070-4afd-9d52-c22268215d85	1	Other	Other
+812ddcec-00dc-4b59-8d88-e5f36ed6badd	1	Other	Other
+812de8da-3089-4f1d-9611-4b62af62974e	1	Other	Other
+812e3784-afbb-4992-85d1-94da58db1170	1	\N	Other
+812e6911-1aa2-46cc-8325-3ed92daa8af1	1	Other	Other
+812ef044-63f5-4802-9393-096559c04926	1	Other	Other
+812f77c3-a2ef-4fa6-88e0-d8469351398a	1	Other	Other
+812fef18-5e52-4765-b7df-9f4204afdf80	1	Other	Other
+813009ee-4b3d-4029-bcfb-328fec8c3389	1	Other	Other
+81307fbf-8454-401e-9186-0aac2dd6ee96	1	Other	Other
+813084ba-1928-43ea-b91f-4f28e2cc05a2	1	Other	Other
+813089d5-597b-461d-8440-7a9b7da30e67	1	Other	Other
+8130bc2c-68fa-4580-ab4e-30856b879e8f	1	Other	Other
+8130c247-05dc-4a28-b367-bbd4d56094c9	1	Other	Other
+8130ce9f-2d81-450f-9ff8-b528248bcee2	1	Other	Other
+81316bf9-de29-4859-b618-17d6f19673f5	1	Other	Other
+813179f0-eb94-4136-abb3-600f76ce46cc	1	Other	Other
+81319164-ce0c-4c52-b350-f39123412c57	1	Other	Other
+8131f82b-c7af-4d78-bda2-b43aca09b301	1	Other	Other
+81320a0c-4efa-44e2-ad57-adf3a2b7f68b	1	Other	Other
+813214f1-7c02-4424-bf34-1c3d9087cba6	1	Other	Other
+81323f38-a3bc-4a83-852b-2766d4b8ec6e	1	Other	Other
+81324537-9f72-4e1f-b0ab-f53bcfa9ad3a	1	Other	Other
+81328e74-a342-4490-94de-7ea994376d64	1	Other	Other
+81329965-a135-46f2-a448-f3438f1100a1	1	Other	Other
+8132d55f-90ba-4ecd-8032-adb5b8fa2241	1	Other	Other
+8132ff8e-fda3-4d74-80d9-f6ff09d26f2d	1	Other	Other
+813379de-7e4f-4602-af92-9ee4ecd7bd80	1	Other	Other
+8133af97-eb87-4eb1-a2ad-fc36240f45de	1	Other	Other
+8133dabc-d223-4aa2-aeef-e4621036dc85	1	Other	Other
+813407ea-de63-4dd1-9d25-f934e1737488	1	Other	Other
+81340bfa-fe61-4124-892e-e80498eb0786	1	Other	Other
+8134201c-250c-499a-b7d2-fd072b6679fd	1	Other	Other
+81342274-7969-4a10-87d0-69e73cee8efd	1	Other	Other
+81345d55-eee8-4de7-835e-359c0b36b456	1	Other	Other
+81348895-dca8-4784-bb4e-fde8a68cbf94	1	Other	Other
+8134bda9-62c8-426e-9da3-882d1cba1b39	1	Other	Other
+8134cb0f-af30-425d-917b-1d8fffc83eb1	1	Other	Other
+8134fd66-0257-41a6-89a6-1cddb6c251f3	1	Other	Other
+813503d6-669d-4bf3-bb21-334a0cc9e64b	1	Other	Other
+81351a93-570d-494f-b7eb-68581271c666	1	Other	Other
+8135618e-d119-4913-9458-45ff5873479f	1	Other	Other
+81358bd3-97ac-4ed1-942c-4c6ea3f4d2ea	1	Other	Other
+81359578-b979-49be-b789-33c1f89edb65	1	Other	Other
+81359bda-02a5-4d8c-b4f7-a8e40e2325a9	1	Other	Other
+8135e7b7-d9da-4d6b-b13f-db407a7fb94e	1	Other	Other
+8135ea90-13c1-11e8-9f18-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+813640c8-9f36-4619-ab7c-4816fbd5d105	1	Other	Other
+81368ff7-2c38-4d41-8b4f-628502271610	1	Other	Other
+8136e5f3-95f3-420f-85e0-d0990065e09e	1	Other	Other
+8136eac5-9925-4615-9a0a-3a06c5f0e4d0	1	Other	Other
+81372c17-e365-497e-a33a-3959b6d8c73d	1	Other	Other
+81372f00-7047-47d1-abb1-62663a3cadb4	1	Other	Other
+81375273-d351-4d74-b658-8c70bebe71a1	1	Other	Other
+8137909b-5759-4d3d-88f9-f8479ebc6254	1	Other	Other
+813791e2-5ef0-46a0-8922-694d6d8f8069	1	Other	Other
+8137ba31-e793-45b4-8442-4d45eed84cbd	1	Other	Other
+8137f974-6661-4964-b009-9123d488b419	1	Other	Other
+81384c82-be6f-4966-ba0f-1a4f9aba17c6	1	\N	Other
+81384e8d-025a-4f0b-83db-55c5fbbc070d	1	Other	Other
+813898d4-abcd-4cf1-ab4e-dbf1677b4b8c	1	Other	Other
+8138a498-b6f4-4ff0-bd0a-49bfa7d51c35	1	Other	Other
+8138f2d0-b90a-4be8-8387-8b40990f1db1	1	Other	Other
+8139107f-e2d5-4703-bd8d-7a8c561d20f6	1	Other	Other
+813934c3-ded6-4945-9a23-87f2cc13884c	1	Other	Other
+81393db2-646f-4d3d-9a2b-d32f757d4b50	1	Other	Other
+81398525-a196-437d-9674-83231f38aff9	1	Other	Other
+81399259-69df-4d5e-a579-1f013936c962	1	Other	Other
+8139c925-72fb-459f-b27d-bf084508011e	1	Other	Other
+813a73d2-e16f-4b27-9014-79ac1fbf3f6d	1	Other	Other
+813ac0f3-c6c5-4d16-995f-bac0ff815abf	1	Other	Other
+813ad3e5-5b0c-42d9-a0a0-d9a65745813b	1	\N	Other
+813ae8da-7ae5-4552-87f0-b8a7e1d53e18	1	Other	Other
+813b4c3b-7a7e-4280-8007-cc158d76cdf0	1	\N	Other
+813b6ce9-2626-4737-a6ca-38029a6ec244	1	Other	Other
+813bac18-963e-485e-aa26-79f9c0dd6198	1	Other	Other
+813bb54c-ca26-432b-ac6d-a7cf7891671a	1	Other	Other
+813be236-69cc-4780-ba1a-a97505f2c0ce	1	Other	Other
+813c6279-9006-4e65-89b4-2b80e58b3397	1	Other	Other
+813d0f2d-9776-4f4d-968e-d581a6da0766	1	Other	Other
+813dca2f-a34a-44d3-ab35-55dea1eeb985	1	Other	Other
+813dd36c-ccf2-4802-a79e-4f17cb458a6e	1	Other	Other
+813e91df-2184-47ea-8c9f-542d03da459b	1	Other	Other
+813e9203-8825-4c3a-ba2e-0b5cea99a859	1	Other	Other
+813ecdf8-3ac2-49e9-9750-8e47d0b89d97	1	Other	Other
+813ee297-f369-4d87-aed0-4bd7b9a292ec	1	Other	Other
+813ee44d-cd6c-4858-b193-a4db063e4b31	1	James	Other
+813eed5f-b423-41c9-bb2b-813382fb5b2c	1	Other	Other
+813f0055-0c91-4a92-82ed-46a22caed221	1	Other	Other
+813f2703-8eb6-44c7-815e-e7ac50c825e0	1	Other	Other
+813f378e-7511-4b9b-9283-b341fec507da	1	Other	Other
+813f68ba-9b82-441d-99a7-bfd440860ace	1	Other	Other
+813fe533-b4b9-4d20-a296-0e8c410b816f	1	Other	Other
+8140173e-1caf-417d-8973-41c3bcc69d3f	1	Other	Other
+81404988-19a4-4a74-9648-a8fbbf0a0f51	1	Other	Other
+8140acbd-5919-4a59-a6a4-e03c2f9e6d19	1	Other	Other
+8140dd47-82ef-4beb-a288-97de0259e8e8	1	Other	Other
+8140de1e-f84a-498b-8cae-593164d04b2d	1	Other	Other
+8140f1ad-b1cb-470b-b283-1dfe0778d34b	1	Other	Other
+8140f21c-403c-442b-8e4c-5d725601b8a9	1	Other	Other
+8141000c-bff7-4a1e-a842-b2ace14681c8	1	Other	Other
+814165ad-bda6-48ba-916d-88c45a710919	1	\N	Other
+8141ddaf-def4-4b7f-b45c-7b2a08a2a0a2	1	Other	Other
+8142393b-a5a8-40ac-91f3-052c5d88fe5d	1	Other	Other
+8142bb7e-14cd-4746-83a5-68962277be87	1	Other	Other
+814303e5-312c-4c78-ba50-5f0e95374513	1	Other	Other
+8143337e-2b47-479c-b037-4f31d31b8f3a	1	Other	Other
+81436829-85f6-4440-883c-525fa775c507	1	Other	Other
+8143a120-c177-4ca1-acf5-e241659211a1	1	Other	Other
+8143be02-1d08-4feb-8526-8e321e599e00	1	Other	Other
+8143f0d9-25fb-4a4e-a930-9e9d0a86fcbb	1	Other	Other
+8143fa99-996f-4a4c-a493-706125463d81	1	Other	Other
+8143fc6e-fb31-4182-a5fa-ab8a10062321	1	Other	Other
+81440508-1240-4514-82d8-a17e87b2e094	1	Other	Other
+81444166-7d8d-4262-93e1-0e81535290f2	1	Other	Other
+8144891f-fa1e-4edc-b5d6-edf5bc65e775	1	Other	Other
+8144a0df-d242-4791-9ad4-c8ac9ee12a45	1	Other	Other
+8144d96d-208f-4cb5-a8a4-13d818d6caeb	1	Other	Other
+8144f312-8e30-4793-af4d-7fbfe0003ccf	1	Other	Other
+8144f7cf-97ae-4a8d-8c03-8828f21a9157	1	Other	Other
+814509f3-5d1b-493b-b46a-b6d23606a00e	1	Other	Other
+81459c3d-e819-4971-93cf-cddfe6acc16d	1	Other	Other
+8145a89b-41a5-4504-9e46-0e7539f82018	1	Other	Other
+81464ae0-8927-4137-9e1b-786bec034298	1	Other	Other
+81465801-2522-4167-978a-679e58fdbcb5	1	Other	Other
+814711ea-06ec-49f1-ae6e-ca53ecaa967b	1	Other	Other
+8147210f-ddba-4ae0-81ed-8e9ac323a67f	1	Other	Other
+81474756-6222-434a-b2c1-ce28eb1cc931	1	\N	Other
+81474de6-70ef-4028-bdb8-8b786e22d692	1	Other	Other
+814784a6-912a-4379-890e-a7495e8ca75e	1	Other	Other
+814831ca-9ee8-4533-961b-1e657f3aa366	1	Other	Other
+814873d4-4547-4e9a-9d3f-7ee659fe25ae	1	Other	Other
+81487f95-e4d4-4509-ae27-ee65b243290d	1	Other	Other
+8148c382-3943-4863-a9ca-c28f9b848296	1	James	Other
+8148de8e-e1b4-4085-bd63-94062548c474	1	Other	Other
+8149cd51-9a72-4fe9-9805-af8415ecd86f	1	Other	Other
+814a031b-4080-4b47-b183-cb873b997296	1	Other	Other
+814a6923-ba28-40c3-91d5-87e2570666a0	1	James	Other
+814a9e94-0e1b-4c24-ace5-bf9f18e805c4	1	Other	Other
+814acde9-c595-4a0b-bd52-e8db24f95b1b	1	Other	Other
+814af45a-d79e-4486-9f29-e9f3a0d15a5a	1	Other	Other
+814b0c4e-3088-481d-b149-de7f03b42d4d	1	Other	Other
+814b1a93-f2f1-4c53-8d00-2b2a33e2b065	1	Other	Other
+814b2855-f376-41f5-abd8-dc3455edd31f	1	Other	Other
+814b3724-4be9-4c2c-88ce-5d24663c54a2	1	Other	Other
+814b3f8b-038c-4d33-a2bf-15707893dd81	1	Other	Other
+814b9a20-e3ec-42dc-8965-33fa8950cab6	1	Other	Other
+814bb77a-3c80-4616-9825-e1be4a646c9d	1	Other	Other
+814bef33-daaa-4bee-ada8-9c30c523fe25	1	Other	Other
+814bf8a9-f573-4dee-a23b-0db1e4ee5c54	1	Other	Other
+814c0c0a-4871-4797-b9fa-1f911e51e36d	1	Other	Other
+814c3a3d-3d40-4c38-9ad3-4e941ef6ec1c	1	Other	Other
+814cbc78-38ad-4a63-b196-8dd8c0aa3296	1	Other	Other
+814cdb4d-6263-4497-ad27-c82df11427fe	1	Other	Other
+814d28bd-3c44-4bc1-b6dd-ec4041d82b43	1	Other	Other
+814d3145-3c3b-44e7-a7f8-fbda7d97ec2f	1	Other	Other
+814d8216-29b9-4613-9299-be5756f29182	1	Other	Other
+814da657-682d-4f00-9b15-5f2c62734be2	1	Other	Other
+814da752-0cff-436b-836c-bfd375408def	1	James	Other
+814dc47d-5a80-4c0c-9a2f-8621768cd375	1	Other	Other
+814dcf6a-ad63-46dc-8178-049684b18bef	1	Other	Other
+814dff70-5168-4798-8ab1-1ff24d308e27	1	\N	Other
+814e47c7-478f-4e49-a9a9-0a3a95fd227c	1	Other	Other
+814e72b7-6d21-4c71-babe-6418f5bdd83a	1	Other	Other
+814e9b27-f169-4195-ba7d-9fc602d2a5f2	1	Other	Other
+814eaad7-34ef-4721-8911-80e2b41cb7ea	1	Other	Other
+814eae53-902b-4873-a104-e135e68cc3b1	1	Other	Other
+814ed1c2-fa7c-4cd3-abbf-bd06ec6f6207	1	Other	Other
+814efb17-3b0a-4182-a8b1-2ede88a45d2a	1	Other	Other
+814f0017-71bd-4b61-a64c-8f5cece71f71	1	Other	Other
+814f80bc-77b7-4d84-b4d3-35e0fb8fd55e	1	Other	Other
+814fa383-dd52-4d13-9d2c-e89d1af03e9d	1	\N	Other
+814fd5f3-d63c-4562-859b-617fc9292f54	1	Other	Other
+81500ebc-d719-4c04-864a-b64566e7effa	1	Other	Other
+81502fd8-f867-4a88-be39-c86096017696	1	Other	Other
+8150449a-08aa-4cf2-b1d2-0f2567e5d031	1	Other	Other
+81506b16-df8b-4a7b-aa40-eae0a8d6c357	1	Other	Other
+815073e8-d167-424a-b05f-7beba58a20cf	1	Other	Other
+8150ec2d-a78e-43d3-b563-a5ebb6e4c1f3	1	Other	Other
+81511660-9e01-4a2a-9319-d6361effc2c7	1	Other	Other
+8151816d-c142-406e-b1a3-f8dca20e6662	1	Other	Other
+815190d9-ae2f-41af-8f7f-a68dbb157352	1	Other	Other
+81519b9b-4edf-4b98-83f3-f4ba68962fef	1	Other	Other
+8151cf8b-99ac-4cc3-81f4-c51c70e880ff	1	Other	Other
+8151eadb-b8dd-4514-8a23-7cdc4f38bdf7	1	Other	Other
+8151f279-48ea-4004-8e57-4860be5fbff2	1	Other	Other
+81523dc8-0315-420d-bf67-a8fb3b30717a	1	Other	Other
+815254ed-9c19-4254-a2bd-4dcf6db13562	1	Other	Other
+815291f3-d5b0-429e-80f9-c6184e61b955	1	Other	Other
+81534937-f5bb-46b1-9d3c-20db3dbf8561	1	Other	Other
+8153ea84-3a80-4466-a19f-f19f4d89dc04	1	Other	Other
+81540a56-9140-4ae2-a752-e50c5cb5d812	1	Other	Other
+81544a65-80c4-4e2d-af58-37a211071cce	1	Other	Other
+81544b1c-0c54-491c-9ffe-e2c02a61f5c3	1	Other	Other
+815452eb-7207-4c3d-9509-4a6eecc4a237	1	\N	Other
+8154ab8f-6333-468d-b838-37a4385258f7	1	Other	Other
+81551683-9235-4af5-aac1-43c6226004b4	1	Other	Other
+815524f7-4a69-4eb1-bcad-67032232d252	1	Other	Other
+8155456a-9daa-4250-a16f-d1dce5ef8ae6	1	Other	Other
+81558ba9-7bcd-465d-85ad-c55e5a3027b6	1	Other	Other
+8155a981-8d77-455a-847f-264d3c5ddaae	1	Other	Other
+8155f1ab-3ca0-4982-b956-47aa982621f7	1	Other	Other
+815613fb-f98d-4080-aa2c-40218a2f3f9c	1	Other	Other
+81566b61-adaa-4ee8-8208-a47d63343ce6	1	Other	Other
+815670a8-18a4-42cf-a37b-b51483876fd7	1	Other	Other
+81568853-cb22-4784-bd0a-0a54fbf35756	1	Other	Other
+8156b8de-f134-4414-836b-a96ff8313a32	1	Other	Other
+8156d8d0-3491-4b68-aaf2-40f07cacdbe5	1	Other	Other
+8156ee2b-2c0d-4533-a28f-866c54093beb	1	Other	Other
+8156fecf-ba4e-49a0-b3ef-2a6aac5aac97	1	Other	Other
+81570cff-2221-438a-a114-c29b8f3b9bf3	1	Other	Other
+81571eb2-700d-44ee-b76f-d0de81f10707	1	Other	Other
+81574286-973c-4d90-b696-08f9a1ff785f	1	Other	Other
+815765c2-bb52-45d6-bc41-73aa3f4295d5	1	Other	Other
+81577447-6482-432b-a988-ee48daa9556f	1	Other	Other
+8157e666-77b8-448c-837a-d4a81843c008	1	Other	Other
+815877cd-ca27-4f20-8e8b-37f79ead7961	1	Other	Other
+815904b9-b764-4598-9793-5111a426bbef	1	Other	Other
+81595677-4810-4e10-bed6-31ba127405f1	1	\N	Other
+8159709f-dfee-4127-b96a-5fe98fc166be	1	Other	Other
+81598c3c-9017-491e-ad3a-b2cf76e03270	1	Other	Other
+815a063f-5dce-4a69-a86c-d4faf47624c0	1	Other	Other
+815a34ec-c8ae-4cfe-b8f3-a1f2d41bab4c	1	Other	Other
+815a4792-09eb-4ad4-a6e0-5ff4820123e7	1	Other	Other
+815a47c7-8933-4fd7-8680-ad5b6eba1a29	1	Other	Other
+815a5727-87c9-4662-adf3-1f1dc1996cb1	1	James	Other
+815a97d5-d2df-4946-97ff-5d9bb53b346c	1	Other	Other
+815ae523-c7ea-45d0-a55e-de78f30ccaae	1	Other	Other
+815b0aa4-4ac1-4e07-820f-b811298d83c6	1	Other	Other
+815b158c-9eac-4952-ab6c-b38b20394ceb	1	Other	Other
+815b1b7b-b9d0-42a0-9db4-30ea96dd2b46	1	Other	Other
+815b7cb7-470b-4601-a9ef-9b618e603bd9	1	Other	Other
+815b842a-d3ef-4f67-89dd-72d007251850	1	Other	Other
+815b847f-0c6a-411a-ae50-e636fdcdca3c	1	Other	Other
+815c5695-4f99-4e49-9ccb-f7266096ae28	1	Other	Other
+815cc827-8460-4606-8a45-d9adfbeda726	1	Other	Other
+815cf2c5-0ef3-46c5-8be0-9a9a78d1abb3	1	Other	Other
+815d0a2a-47d3-4e17-8632-38b8829a0328	1	Other	Other
+815d127c-8f21-407a-be18-3fd83ca63c74	1	Other	Other
+815d13fd-264f-4a61-b19c-cd407f39c96d	1	Other	Other
+815d1ab6-1e99-4666-9b87-f45fd642cd3a	1	Other	Other
+815d2d2b-7154-4f7a-ae43-21fcabefd70c	1	Other	Other
+815d5a46-c312-4a10-9ea2-e818e0b9eb8a	1	Other	Other
+815d78c2-396d-45d8-8903-f94588d17b4e	1	Other	Other
+815d7d23-46a2-4747-af2e-7ef06cea67c4	1	\N	Other
+815d9935-91d8-4467-81de-322d3eddc91a	1	Other	Other
+815dfd21-4a3e-4f2c-b20e-98215b167143	1	Other	Other
+815e0099-e1d0-4913-b348-f1dee3e9f4ab	1	Other	Other
+815e2cd2-b368-4fba-baa6-6a61dc411eee	1	Other	Other
+815e5c70-fc4e-419b-b4a7-c515bdda2843	1	Other	Other
+815e8ed0-1877-4297-aa28-22363944e9cd	1	Other	Other
+815f21ba-eb5b-4144-b094-a143a4d86138	1	Other	Other
+815f4328-9f13-4a42-a0b7-91bc1a3f5abf	1	Other	Other
+815f483d-7c5d-4d06-a9b1-9e95ecdfd54c	1	Other	Other
+815f527e-2298-48ac-81c6-a3883a4f9221	1	Other	Other
+815f577d-4f8e-49dc-b3c9-9093a433932f	1	Other	Other
+815f6a90-85d9-421f-926e-360ceb1dc131	1	Other	Other
+815f7dbc-f099-4c00-8e1f-0a8935f5ab4a	1	Other	Other
+815f953f-27e7-47c3-997d-79a51362336e	1	Other	Other
+815f9e6c-2416-4abe-aadc-f1fa9904cc1a	1	Other	Other
+815fab51-1adc-4581-aa9c-dbdc56e7be86	1	Other	Other
+815fc5c9-f0d7-45d8-8ff7-85269ef1be6c	1	Other	Other
+816039be-2a5c-4c58-bb45-92f0f669ff3b	1	Other	Other
+81607173-af6d-4b04-aae5-e9bee1a17b3e	1	Other	Other
+81608883-2395-46c3-bb3d-2a3198f5364a	1	Other	Other
+816092cd-7acf-4099-b4d5-774621b8171c	1	Other	Other
+8160a858-5bf6-4ee4-97d8-deada436336c	1	Other	Other
+8160cf4c-261e-4416-a598-81e61b69bb59	1	Other	Other
+8160d027-0607-43fb-bd40-2be13ca7ce11	1	Other	Other
+8160f728-5215-4399-9908-84e6b98f1120	1	Other	Other
+81611b14-1200-489e-92a5-9009700e1150	1	\N	Other
+81611b66-40bb-419e-8f7d-1434aa813f4a	1	Other	Other
+816120d6-52cf-4246-bbd3-d1f223eff637	1	Other	Other
+81617d3c-c67a-4d60-9b23-d423bf356f65	1	Other	Other
+81618fd7-f5a2-4e34-8e00-b87524fea2fe	1	Other	Other
+8161e1b4-d8ef-4383-a01f-3bf26de17bab	1	Other	Other
+8161f05b-d7c6-40fb-b473-dd680e8658dd	1	\N	Other
+81621eb5-ced4-4d94-ac41-d3d5f3f61ec9	1	Other	Other
+81621fef-da57-4408-89ee-b6fda89ece5a	1	Other	Other
+816253a4-c048-490e-8177-910dc737698e	1	Other	Other
+81625913-d7c7-4e9c-aca0-342d5e46a5eb	1	Other	Other
+8162698f-a020-4bad-ad9f-9f2a5deee98a	1	Other	Other
+81626e4c-d5e9-433d-828c-f6e9d81d4f20	1	Other	Other
+81627bb6-bb2b-4816-9df9-06b6450405d4	1	Other	Other
+816297cd-0462-48bb-9c8a-32a137016831	1	Other	Other
+8163061a-7556-468b-a329-0dfa1e7a15a3	1	Other	Other
+81631a94-d65e-45c8-8a8b-02bcf74126ab	1	Other	Other
+81634894-4904-483d-9c90-b6115a2b4755	1	Other	Other
+81635eed-4c36-4311-8060-4b58115d448b	1	Other	Other
+816368cd-1668-4ae5-9a01-b82357f90464	1	Other	Other
+81637278-c945-4f3f-ad10-8480835bfe1c	1	Other	Other
+81639f38-8b3a-43f1-8713-173791c55078	1	Other	Other
+8163e4c2-af16-4971-a18b-433879f87548	1	Other	Other
+8163edec-a00b-4e92-bbf4-e43c6456c090	1	Other	Other
+81642c7b-5775-4cd6-9376-47d60b497a5b	1	Other	Other
+8164ee90-68f8-4032-b48e-e8bbc1ea6b12	1	Other	Other
+816540ba-44a2-4852-892d-294e74cef016	1	\N	Other
+8165717d-91d8-4ef0-a2f5-19afaef7979e	1	Other	Other
+816571d5-6bfb-46ff-a5d6-4ece18633ece	1	Other	Other
+81657861-50d0-4089-b588-e190dbb84d27	1	Other	Other
+81657b87-7a3c-4a13-8c4a-7981b1e3af7b	1	Other	Other
+8165e127-fc20-44a0-a920-42232473f1de	1	Other	Other
+8165e77b-9b24-41f3-ae7a-c47a9436aa22	1	Other	Other
+81668726-639d-460c-9f0c-81d4d7b1b7ee	1	\N	Other
+816689ad-2cc3-4c27-8b87-0e4bdc9b1d1f	1	Other	Other
+81668fd2-b69c-4f08-91e9-410edfc0dc88	1	Other	Other
+8166e4f2-8dcb-468a-a069-5b3c9aeb456a	1	Other	Other
+8167565d-b3d7-4a48-8b92-1eca268b48c8	1	Other	Other
+8167a2cf-6c35-4da5-a674-36798e4df5f9	1	Other	Other
+8167b93d-00c8-41fc-bd65-d4185efce19b	1	Other	Other
+8167fd9c-9802-4b7b-8cb4-31be2f836eb3	1	Other	Other
+81681a82-6740-4105-8090-21e4e3066f3d	1	James	Other
+8169074f-131a-4eaa-bac1-800240041a55	1	Other	Other
+81690872-a5f0-42ff-be32-9a6bc5a37391	1	Other	Other
+81693510-41d4-4961-9985-6ebcedc078ae	1	Other	Other
+81694282-34ac-4939-80f9-e848fa6f80cc	1	Other	Other
+81694c55-e79f-4e0e-81f7-bb75fcc3a523	1	Other	Other
+8169a5ed-8435-42f4-8e39-14ba3280d758	1	Other	Other
+816a1eae-e450-463f-bd50-b30402db9254	1	Other	Other
+816a2693-dfa6-46bf-a64e-13fa2bb1fc12	1	Other	Other
+816a4bf9-c455-4c1e-8fe1-9772b77269f8	1	Other	Other
+816a9c5c-c97a-4020-b08d-7ce84de9de4b	1	Other	Other
+816ab5f5-4755-47a7-9f5f-74f94a7eecd4	1	Other	Other
+816abe37-2d11-473c-9f2d-64d0ac4712a2	1	Other	Other
+816af208-fe4a-49bc-bc87-15483080de55	1	\N	Other
+816b10c6-e7c3-4a74-95f2-6f1b00507d81	1	Other	Other
+816b81c2-d699-43a4-bc87-796c0a6acc81	1	Other	Other
+816bc425-3a73-48f4-9abd-4e982b516502	1	Other	Other
+816bcf27-9638-4b49-86ad-8df8b6d92bbf	1	Other	Other
+816c34b7-944e-455c-bd59-b8848644b67f	1	Other	Other
+816cacea-b9dc-4f97-8875-8f1524552c05	1	Other	Other
+816ce4c4-1301-445c-9350-da33af0e0dae	1	Other	Other
+816d4136-68ac-461b-93af-f00333186cdc	1	Other	Other
+816d56e4-1888-4282-b8f4-df24f2c28e71	1	Other	Other
+816d9dfc-69dd-4d0a-ab86-a0f42383c020	1	Other	Other
+816e283a-1126-456c-a783-e9ee45eb3824	1	Other	Other
+816ebef3-8b62-4af2-a7ed-30cb56743a45	1	Other	Other
+816ef820-3c54-45cc-98b1-21607dd99c86	1	Other	Other
+816f07c9-3f24-4dc4-9fcb-2a63789fa89b	1	Other	Other
+816f0d2a-6f13-42c9-88f1-6407fb54c085	1	Other	Other
+816f11f5-9653-4e9a-b682-cdb74989301b	1	Other	Other
+816f3994-e532-4de1-89d4-454483888e20	1	Other	Other
+816f69e8-d30e-4e1e-b9b7-afebb0ecb718	1	Other	Other
+816fcc6c-2c4e-49bd-aee8-6ca91015d669	1	Other	Other
+816ffd25-4130-4f1c-9949-78134793409f	1	Other	Other
+8170abbd-e16b-4e7f-abf4-940414a86fe9	1	Other	Other
+8170cd28-7a93-462d-bcfa-79d55beea1a3	1	Other	Other
+8170d555-ade2-4ff3-9e14-5ce5db4f5eb2	1	Other	Other
+8171461e-8518-42f1-9add-2345f7fe8e13	1	Other	Other
+817150d7-52d0-40fb-9e77-f13872292681	1	Other	Other
+81717555-907b-4b7e-b27a-a8340e83e8bd	1	Other	Other
+8171a089-af15-42b3-85af-80387ac3fc7a	1	Other	Other
+8172426b-7ea5-4f5d-8ef4-75db02161da1	1	Other	Other
+8172b7e3-ba61-45fd-ab93-ef091efe04a3	1	Other	Other
+8173012e-854a-4cb6-8775-b761aba9923f	1	Other	Other
+81732448-14a5-4f5c-bf8c-61635d87c3d3	1	Other	Other
+817360ee-2e3d-4210-b2a7-6119f04e331a	1	Other	Other
+817377bd-020c-4b7a-b091-d78a8da5d586	1	Other	Other
+81741803-9cfd-4660-8c97-6663aafe1f10	1	Other	Other
+81743cf1-bcb3-455d-b49f-a665e82f51c5	1	James	Other
+81744d6f-beb0-44e4-b04e-991f5e18ba5d	1	Other	Other
+81748b38-98f1-4c0d-a0b6-aa314acf50e7	1	Other	Other
+8174b89c-59a1-42bc-9c3c-28f6b9c4cb28	1	Other	Other
+8174dcb4-e8b4-41bb-81e4-d9c9c1b68699	1	Other	Other
+8174e963-17e4-4949-a3f3-9422e4742c1b	1	Other	Other
+8174f945-ee36-4e73-b7b0-847c28130971	1	Other	Other
+81752418-c13b-4b6c-ae6f-e2b2d52eb0c0	1	Other	Other
+817554e1-8a70-469f-8452-a33f3ccec488	1	Other	Other
+81756564-f49e-4bb3-813f-c695896731e6	1	Other	Other
+8175672d-5838-4e0b-a2d2-4d0c86829590	1	Other	Other
+81756eca-545f-48a4-9694-34b30c2a2b24	1	Other	Other
+817696e3-ecd6-46a5-a66e-d536f24cb67a	1	Other	Other
+8176b089-60ae-426a-bcae-4da9ab2d901b	1	Other	Other
+8176e249-e799-4707-943a-491aa73a10cc	1	Other	Other
+81774b21-5c7a-4873-8502-d3ad6420aae7	1	Other	Other
+81776f75-0ea7-441b-8faa-69e929f9989f	1	Other	Other
+81777486-5b4c-4e8b-afb6-ab6475c8ed48	1	Other	Other
+817819f8-773d-47cc-bd11-e5ca90d5d6ab	1	James	Other
+8178580e-d475-4fac-bc3f-259f1b296d27	1	Other	Other
+81787883-589a-4c26-b369-6b2fcd917c4e	1	Other	Other
+8178cbc7-f0d0-4a98-8465-b81bfe36da5e	1	Other	Other
+8178f15c-4a2d-4ea0-bf80-0b2701849a79	1	Other	Other
+81799e2e-7aae-467b-bf90-2242698359fb	1	Other	Other
+81799f49-c57c-4d46-9f92-b4ac9e4b0347	1	Other	Other
+8179c3ad-97a8-4ac0-af38-22d27015760b	1	Other	Other
+817ab52d-4490-4dff-94da-100a13da3076	1	Other	Other
+817b4ebd-f6a7-4a8c-8e5a-a691cee54288	1	Other	Other
+817b5fba-e1ae-45ce-a372-c10f1c8f0c0d	1	Other	Other
+817b7575-bf11-4b19-b149-e35680764f1c	1	Other	Other
+817bb4a1-efbc-41eb-a023-7b7686e2419a	1	Other	Other
+817bc14c-7c8c-4dcf-8792-787ebb43e680	1	Other	Other
+817bc5aa-2186-4cef-91bf-40717d8b472b	1	Other	Other
+817bd876-2ed2-4c17-8994-58741e3cceb7	1	Other	Other
+817bef26-d6d9-4e4d-a62b-b94ea3240f3c	1	Other	Other
+817c879f-918a-4437-a9be-2f95ca477d3c	1	Other	Other
+817c9fac-eb14-445b-bb3d-6bb9adb2d2a9	1	Other	Other
+817ccb36-79b5-45d9-8ff8-ea8bc3330a83	1	Other	Other
+817d41c8-ea55-4bf1-a2a9-7574089b8060	1	Other	Other
+817d9dfd-d150-4320-a766-7f5cb65cd1d9	1	Other	Other
+817df761-a9a9-4012-94ce-cc2a92378c62	1	Other	Other
+817e0961-c009-465b-bbbd-34558fc534d3	1	Other	Other
+817e1b65-e59c-4614-b053-2ec18671cdf2	1	Other	Other
+817e3685-fc67-4380-9014-6dc77bf07596	1	Other	Other
+817e510d-01aa-4ece-bff0-459561608ae9	1	Other	Other
+817e5f36-f1e3-446d-9fa3-7d505f441703	1	Other	Other
+817eb3eb-4697-4154-8aa5-fd41291507d0	1	Other	Other
+817ec466-5585-4564-b6a9-8eb89bf41e33	1	Other	Other
+817edca0-51a1-4f13-91b3-fcc8b1307cd5	1	Other	Other
+817f2b58-75fd-463f-93be-cb315bb3d0b5	1	Other	Other
+817f4606-393b-4cf5-86b6-535558c6e2b9	1	Other	Other
+817f549b-8a2e-4a05-aa61-83ba107e26ff	1	Other	Other
+817f5635-c67f-4cf4-99e7-6678d603fe0c	1	Other	Other
+817f624e-8732-4c1b-ba96-fd6324159ead	1	Other	Other
+817f6bb7-7af2-420d-a38a-38f020036489	1	Other	Other
+817f7222-ddaa-4888-8e9a-bb9fec03e41d	1	Other	Other
+817fbcd6-eced-48f2-8ae8-eed2e028e4d3	1	Other	Other
+817fcf40-0d3e-43a3-902c-1e88a96ee86f	1	Other	Other
+817fd934-657a-4606-8919-46802ec8d3dc	1	Other	Other
+817fdaf6-d3de-40c1-b43c-56c4892cc432	1	Other	Other
+81800396-91b1-435d-88b4-aae443502ec5	1	Other	Other
+818022ba-82a1-4dd1-a8a2-043870110f9e	1	Other	Other
+81803522-9bf6-4d51-afdb-6066e804e2ee	1	Other	Other
+818042c2-4220-4fed-b4dd-55d874bfeb5c	1	Other	Other
+818073cf-e888-4561-a663-08f2b260cf92	1	Other	Other
+81808be1-d856-48ba-ad67-101d5c308ab7	1	Other	Other
+818099d5-ff5a-47fc-a263-fb1f0a53988f	1	Other	Other
+8180a2cb-791a-4528-a39d-e5f7fbd15527	1	Other	Other
+81812dd7-6554-47be-8e52-71146dce8375	1	\N	Other
+81816141-4060-4528-afac-dbe07abdb12f	1	Other	Other
+81818ace-0e1d-4684-b991-cfdaf789796e	1	Other	Other
+818218f6-d218-419a-b953-306b82591e83	1	Other	Other
+81822533-9aff-4ab2-aafc-fea1382ff4d3	1	Other	Other
+81822737-0a34-4285-a7cd-914fa9068fae	1	Other	Other
+81829a47-0e64-4685-ba81-cc57315be70b	1	Other	Other
+8182e1d2-9802-4eac-a211-f46988d480d4	1	Other	Other
+81831798-25a6-4d17-badf-8a3422f91475	1	Other	Other
+81833d17-45ec-4e28-992f-4ad92a7c2c09	1	Other	Other
+81835023-76c1-43a6-a845-ba1fa37df406	1	Other	Other
+8183882f-ac58-4ae4-b3c5-76dde52c3b2c	1	James	Other
+8183c87f-1a03-4828-9201-62b815bd1719	1	Other	Other
+8183e345-0090-4b2c-a445-a975ea21bc93	1	Other	Other
+8183f134-e7e7-4acb-9140-c8943f3e28c6	1	Other	Other
+8183f81a-b02f-4552-90b7-b89471377350	1	\N	Other
+81843d09-b566-478e-9b1c-c1242509b16a	1	Other	Other
+818462b5-7ed3-492a-a17f-9571ff6c70b4	1	Other	Other
+81847541-6460-4409-9d85-c3c3a93eff3d	1	Other	Other
+81847712-36af-42a2-8f86-2431c0d02c98	1	Other	Other
+81847c32-6c0c-4ab3-b61b-807b9fcb00d4	1	Other	Other
+81848e7b-60b3-42cb-a9f4-06d41464db74	1	Other	Other
+81855116-395a-4bb0-90d5-a9b0f66e9b41	1	Other	Other
+8185de54-bb0b-4ef4-9c7f-ee2ffc76199a	1	Other	Other
+8185df57-d0b2-4c36-99ea-cb76dd49b624	1	James	Other
+8185f8fe-1312-431a-ae9c-a0082f730a93	1	Other	Other
+818626e4-f2ee-434a-b2a2-53b64dec1461	1	Other	Other
+818633d6-aec3-4d67-b8ff-356b0f8d69bc	1	Other	Other
+818634a4-c95b-4ca6-99ee-5b659e589f03	1	Other	Other
+81867a6a-c5c0-45a6-a2fd-9f4681f5e5f4	1	Other	Other
+8186866f-020b-4865-ad8d-81f59bd3c7b8	1	Other	Other
+8186b4e0-8660-4f15-a753-77effef1d322	1	Other	Other
+8186d394-8d6c-4432-964c-c6e70e1aad66	1	Other	Other
+8186e301-0281-4e4f-b68d-7dcc801add4d	1	Other	Other
+8186ecd0-c327-419f-af5c-a74ac0bcbcdf	1	Other	Other
+818711a5-92b4-41b6-a76e-c3b0ae33ddad	1	Other	Other
+81871c86-16f5-47bd-b881-951558388c57	1	Other	Other
+81873a9d-c328-43c1-a2ba-184c103d96de	1	Other	Other
+81876442-caaa-4c03-8981-5d7ae7449e0d	1	Other	Other
+8187b141-4fdc-42ad-bfd6-bd80a0d62e95	1	Other	Other
+8187e2eb-a042-4188-aa87-3d5293588aeb	1	Other	Other
+8187e5f9-a9a2-4a0f-9324-701d05530dc3	1	Other	Other
+81882b8e-8e95-4921-b9f2-2246b0374179	1	Other	Other
+81883d96-bc73-4fe3-b710-d9fa1f7cb81a	1	Other	Other
+8188713e-8f83-42e6-8423-24d517997006	1	Other	Other
+8188a936-cd8b-4e7f-a20e-8425f03f1861	1	Other	Other
+81890e79-2e64-4c74-8088-32bf524146f1	1	Other	Other
+8189224c-5412-44ef-96c3-4e21d245abcb	1	James	Other
+818946f4-bbb0-4038-bbd6-ad073bb77d76	1	Other	Other
+81896c6c-6a02-483e-8b46-852a47bf37f1	1	Other	Other
+8189a683-93be-4850-beba-23e5c333d31c	1	Other	Other
+8189cd0a-4525-4562-b61b-3e5744ae226f	1	Other	Other
+8189e36e-6cc4-42e2-87f0-70e86c25564a	1	Other	Other
+8189e950-7c32-4eb0-b6e4-0461946bee1f	1	Other	Other
+818a0b0d-6be7-42ad-a125-421b26eb2f27	1	Other	Other
+818a46b1-bc84-4e68-920c-88c9fdcd9954	1	Other	Other
+818a471e-5bad-4a53-9da0-b0f359e7c490	1	Other	Other
+818aaed4-e905-4a1d-8a79-c2e96911f8c3	1	Other	Other
+818ad186-a3bb-40e8-813d-edc46e5f9af7	1	Other	Other
+818ad7d4-9d74-48a9-8b6e-4551402e5312	1	Other	Other
+818ae64a-8e84-44b9-ae88-e9a6f9c8252e	1	Other	Other
+818af1bb-85d9-4cf5-bb2d-d758edbdf954	1	Other	Other
+818b0b4d-5131-42df-a3bc-6370a7b41ba6	1	Other	Other
+818b19e3-267d-48e8-b056-d448c924cfbe	1	Other	Other
+818b7924-7d7e-46ef-ba88-6a694cb149bd	1	Other	Other
+818b9ad5-79be-4ba9-a7a4-b92c9937f0ed	1	Other	Other
+818c302b-91a7-48f7-8baf-633ccacb06c5	1	Other	Other
+818c3845-fe86-4a92-a346-5a768569693c	1	Other	Other
+818c3c29-33e9-40e7-a078-ffa3a2de34b6	1	Other	Other
+818c6ebb-bb8f-4476-b98d-5ef57f03d616	1	Other	Other
+818c7ee0-ef78-4f4b-9b26-e5d84dc7a1ca	1	Other	Other
+818cb3a3-6d6a-4ccc-9108-fe4b65d55d4b	1	Other	Other
+818cca33-bd6d-4767-99b3-b8ca85622ef3	1	Other	Other
+818ccded-30dd-4e96-905d-3fe83f3f258d	1	Other	Other
+818cd603-e0cc-4a05-98f2-56b04610d150	1	Other	Other
+818ceefa-b3d2-4a8a-860d-208b7235480b	1	Other	Other
+818cf944-e97a-40a3-9d80-65566578026b	1	Other	Other
+818d117e-229b-4245-95e7-7f0376e17880	1	Other	Other
+818d13e5-4409-4201-a2a4-0ed40bd94b2d	1	Other	Other
+818e003f-85d2-4944-8d26-63ddb2568ad5	1	Other	Other
+818e13f3-6999-456d-b4d8-28472344ed45	1	Other	Other
+818e5241-2889-4f1b-a157-804b1fa68d73	1	Other	Other
+818e7310-f05e-48c8-ba9d-fbd5d708a538	1	Other	Other
+818e913c-e6a8-4bc4-a106-7d520997526d	1	Other	Other
+818e9460-2ad7-416b-ac87-170a94472f4f	1	Other	Other
+818eb1eb-9062-48f8-9584-e58d548a02bb	1	Other	Other
+818ebb75-734d-4f65-9b93-f8100bcefc7c	1	Other	Other
+818ebbe5-bdd6-44cf-9ec7-72a2d8825fd2	1	Other	Other
+818ef6fe-0dba-43a4-9da7-509768f60aaa	1	Other	Other
+818f17d7-c044-44ee-a3c5-19f98c247c0b	1	Other	Other
+818f24b3-66bf-4781-806b-4508c1989fbe	1	Other	Other
+818f74a8-ef26-48c9-9554-69bd7a76ccbc	1	Other	Other
+818f75d2-a53f-41ba-9804-4ae053701beb	1	Other	Other
+818f88d3-e5e6-4d6b-bb92-1283c62519e5	1	\N	Other
+818fa09a-78a2-40ca-b820-22b1653067e4	1	Other	Other
+818fa711-2698-43b6-b3ca-8ba6d5a90142	1	Other	Other
+818fb19b-5fd0-464d-b6fe-b35bae8feaf1	1	Other	Other
+818fb2c8-15d1-4904-878f-0dc573f1ac74	1	Other	Other
+818fdf0e-b870-403f-81ce-b3b8773d952d	1	Other	Other
+81901b95-9e80-41f8-99c1-4f7d5327e85b	1	Other	Other
+8190372d-e8ad-4092-9367-481ba4705a07	1	Other	Other
+8190616f-f368-4026-8e12-9a3a8bf97d63	1	Other	Other
+81908b95-a31d-439a-bc66-6944e36aee17	1	Other	Other
+819090d8-d718-4210-82ef-5a5bb20409ce	1	Other	Other
+81909680-8182-4cdc-8f71-1299115df1e4	1	Other	Other
+8191312c-ce10-4e06-93ca-233febac1c89	1	\N	Other
+81915a1e-a661-4205-9077-9ed5272c8d59	1	Other	Other
+81918f70-6282-42b0-8d10-0a43afe99738	1	Other	Other
+8191ac97-3421-436f-922d-e2e6d5449560	1	Other	Other
+8191b6f7-80c6-4e20-bf50-c61e82a4e743	1	Other	Other
+8191c3dc-f242-44ca-b949-ce6dc8f64999	1	Other	Other
+8191d231-444f-4d72-a142-c66c89528254	1	Other	Other
+8191d47f-78d7-4eba-8768-0f833302a44e	1	Other	Other
+8191df27-67a3-4d36-bdc5-c32261555e98	1	Other	Other
+8191fda9-5457-4f09-8095-3bc20f432096	1	Other	Other
+81921a8b-0b7b-4296-a9ad-51a94bbd3516	1	Other	Other
+819244f9-b3e8-4448-b058-c00d7f2b3249	1	Other	Other
+8192527b-c649-44d5-aa05-7ea72150c7e7	1	Other	Other
+8192750a-e1f7-48ad-b41b-9499ae99dcba	1	Other	Other
+81927d6f-c57e-42b8-8370-617be965b1ed	1	Other	Other
+819288b7-a672-4888-92fb-742511284858	1	Other	Other
+8192f270-d82b-442c-a101-03d45ca85edc	1	Other	Other
+81930b07-c247-4ad6-954d-699fca776b9b	1	Other	Other
+81941b0e-47cb-4cdb-9fe6-47b395b1be51	1	Other	Other
+819463e5-1a87-482a-bc7d-9bed14bd90a4	1	\N	Other
+819464e1-324c-4e54-b692-7359be7227ea	1	Other	Other
+819482dc-7e95-48bf-8ac4-6fbf5acabc43	1	Other	Other
+81949125-0131-4e45-b6c2-200b83ab6795	1	Other	Other
+8194cb9d-5ca5-4466-a571-fe38fcfa18a3	1	Other	Other
+81951feb-43a9-4437-a679-460c6d75f434	1	Other	Other
+8195233d-fbcc-4e5a-bf87-8bf360ba1e40	1	Other	Other
+81956972-42e2-4ab0-93ba-39d1926f236f	1	Other	Other
+819579a6-da64-42e8-b488-ac546dc81e53	1	Other	Other
+81958d6b-ce20-45c9-8bba-abef8a69761b	1	Other	Other
+819595b7-2079-4a0f-b657-5293cfcda768	1	Other	Other
+8195bbbd-c7d9-46c7-a32a-a5ef3e493307	1	Other	Other
+8195ed2e-8738-4268-8f79-0e5b2fe66c05	1	Other	Other
+81967296-113a-44df-b26a-06b55bc73680	1	Other	Other
+819694e2-d6eb-4c5c-a292-e445a146f7da	1	Other	Other
+8196ce6c-39e4-4cb0-a846-2b53143c6275	1	Other	Other
+8196e1e0-cf30-44b6-bfff-15081ac80ddf	1	Other	Other
+8196e5dc-711b-4854-a7c6-214a097c5250	1	Other	Other
+81973dc7-40e0-4c58-ac26-4f550605d0c9	1	Other	Other
+819749ec-31fd-49e1-afa1-0638aac336e1	1	Other	Other
+8197936f-7b32-45ee-879d-f70b5ea8d8b0	1	Other	Other
+8197fa50-aa46-4877-9604-a8c43cd3c05d	1	Other	Other
+81980594-931d-4fcd-913a-df085cc66f65	1	Other	Other
+81981c31-4401-4e93-86a8-d7eeb1880ea0	1	Other	Other
+819848ca-76bc-4ef3-b778-2f330a2ae58f	1	Other	Other
+8198bb91-0bd6-4bfb-800c-2dbc6440427f	1	Other	Other
+819912e4-b808-40af-9d25-0bcd1609071a	1	Other	Other
+81992a24-e761-44e9-a2cd-eda1ed839774	1	Other	Other
+81998a7d-938a-4817-9b91-9f9aeda8938a	1	Other	Other
+8199d42d-d2d0-443e-8026-31310a7e71ff	1	Other	Other
+8199d86a-81a0-4b7c-ab8b-b80670f59997	1	Other	Other
+819a1a8e-2546-4485-8880-a3e29346151a	1	Other	Other
+819a76e6-275f-463e-bb0e-ed8b2260f038	1	Other	Other
+819a83fb-5a80-4e60-88c1-f2357f9bf19e	1	Other	Other
+819ac8e3-04d7-4f00-95b5-4e68d14d7317	1	Other	Other
+819af98f-c973-43a6-b005-48f9e453c6e0	1	Other	Other
+819b418c-3f93-4441-ba87-2afdef83a014	1	Other	Other
+819c2a08-6bff-4d04-a414-1815d8efc772	1	Other	Other
+819c3dfc-0387-4bdf-b1de-2688d51644c4	1	Other	Other
+819c4f4a-e573-4a85-a6a0-f77d695af130	1	Other	Other
+819c4f7c-a514-496d-aa2f-954eedd1d0f5	1	Other	Other
+819c52cc-6f76-4fed-91e7-a8ae58d7ff63	1	Other	Other
+819c7bc1-69cc-49bb-8140-f800639b7439	1	Other	Other
+819d2b2e-178e-469b-a01b-5152ac2998e7	1	Other	Other
+819da36b-d593-4fee-85d2-13b23c87801c	1	Other	Other
+819dc402-4ee3-4f36-ac7e-8eed270b335c	1	Other	Other
+819dfd46-9062-4ccb-99c4-56fc5f196843	1	Other	Other
+819e87b1-2c10-4c1e-9f45-e8a4a5cca000	1	Other	Other
+819f32e1-4416-41e9-b239-7f541b22a7c1	1	Other	Other
+819f9328-7d8b-4684-b5e0-44c8c4cb8fd6	1	Other	Other
+819ff705-d24d-49ee-b6e2-b4c047589729	1	Other	Other
+81a031b5-733b-46e4-bbb5-fab775313086	1	Other	Other
+81a0c601-3c61-4bc3-94f8-d663ab945b9d	1	Other	Other
+81a0c871-98e2-4efc-a6f4-6bbafff4702b	1	Other	Other
+81a17ead-1914-4ec2-a44b-6342535ee317	1	Other	Other
+81a19b49-a2cd-48a2-b8e1-e2a3051c41c5	1	Other	Other
+81a1b7a7-20de-44dd-9d61-3dbd4b9a6b6d	1	Other	Other
+81a1d4e0-c99e-4cd7-8f8f-6c9061dccb66	1	Other	Other
+81a21677-dc6d-43cb-ad69-a7be0c7f9aa4	1	Other	Other
+81a22fce-a54c-4740-afae-02fc2c95391e	1	Other	Other
+81a23b13-b5fe-49ea-a82a-97ce7e603eae	1	Other	Other
+81a2c0bb-acf7-416c-af38-00118c1345e3	1	Other	Other
+81a2e7aa-dffd-4767-a24e-96feac463a08	1	Other	Other
+81a2fb14-db99-4d24-97a3-27b9e40ad3c5	1	Other	Other
+81a3043a-9561-42e4-92c0-9420dfbd1215	1	Other	Other
+81a3229b-7809-435f-b186-b0aa9c704b69	1	Other	Other
+81a3271c-dcd5-4ec2-b102-b9b4c2c775e6	1	Other	Other
+81a3c80d-fc84-4689-b8e6-d01b435205a8	1	Other	Other
+81a3c936-2295-42bd-b2c1-ca7feb891da7	1	Other	Other
+81a4017b-74fe-4c8e-913c-70ee94837f24	1	Other	Other
+81a48a06-c467-4487-85b7-2e517981d201	1	\N	Other
+81a48c11-645c-4344-8e40-a78917bbe632	1	Other	Other
+81a4e350-f04e-46cb-aa2c-f01f053a48dc	1	Other	Other
+81a59f74-47da-45a5-8108-0c8da2ad92a3	1	Other	Other
+81a5be8c-7ad1-4acd-b963-e8b09ac1443c	1	Other	Other
+81a61bdb-c718-4c37-97c6-20e128322c17	1	Other	Other
+81a68884-e123-4f6f-99fe-b914cd83e615	1	Other	Other
+81a6a361-8eac-46be-913b-1603f25c4569	1	Other	Other
+81a6ddd1-1d76-4e11-9286-c1000945fc08	1	Other	Other
+81a72196-ccdf-4576-925f-05f393edf54e	1	Other	Other
+81a7509b-d06a-405d-bbde-d62ae45ce0f8	1	Other	Other
+81a83e3c-3f01-4246-9034-1d2912ec9cc5	1	Other	Other
+81a8a940-9856-4155-8be7-2c8f453dc991	1	Other	Other
+81a8b3dd-855f-4ce7-9a72-8ac130d5f040	1	Other	Other
+81a8d9c6-77d7-4468-8131-9ac83df0bacd	1	Other	Other
+81a8ea39-aca6-4312-ada7-c8d77f945d39	1	Other	Other
+81a8f233-a2c8-4ea9-bbcd-67821fdcb247	1	Other	Other
+81a93811-3f9a-42cd-96b9-6df569380373	1	Other	Other
+81a96738-e36e-4b55-b53c-edfbcac81b79	1	Other	Other
+81a97596-2691-401d-b978-fe40b3007ffd	1	Other	Other
+81a9d6f3-3396-4f2c-b1f1-7701254d564a	1	Other	Other
+81aa0322-fdc3-4107-9e1e-439724ab909f	1	Other	Other
+81aa03a5-3fc1-4301-affe-415a57ff3b7b	1	Other	Other
+81aa043b-2b5b-4b68-bdff-b033eb053cce	1	Other	Other
+81aa3255-cb16-4485-a3fa-a571252f8917	1	Other	Other
+81aa532d-cdd5-4682-8484-41531cbd6d47	1	Other	Other
+81aab0bf-432f-4615-954d-ed4f00f50219	1	Other	Other
+81aae9dc-333c-4c63-8091-aff7593d28af	1	Other	Other
+81ab5641-e04d-4cfd-bd7b-8f42d0711e8c	1	Other	Other
+81ab5869-feae-4a17-beff-1e0ce010f18b	1	Other	Other
+81ab7dda-3ef9-426c-9f47-fc6789868d54	1	Other	Other
+81ab8ca5-4b1f-4932-926e-297c2b60689b	1	Other	Other
+81abad87-c6b9-4741-83f0-7d647d8e8414	1	Other	Other
+81abaf67-7f68-4aab-9634-eeb5ad6ca3d2	1	Other	Other
+81abd39c-6d2d-40db-a14c-9df375a580c8	1	Other	Other
+81abde5a-0119-4740-b322-6cda287a8944	1	Other	Other
+81abea83-fac3-4d52-94a8-4df942cf6edf	1	Other	Other
+81abfc9c-2f4a-4e34-a38a-e8de18f798bb	1	Other	Other
+81ac5535-2063-4ec0-8352-c21e2e295bd0	1	Other	Other
+81ac8d7d-7815-48ce-a1ef-c0f6dd54bb1b	1	Other	Other
+81ac9e2b-96d8-4ac3-b2fb-d9d9aea6d055	1	Other	Other
+81acf45a-4bec-4b1c-a88c-b2962be4a06c	1	Other	Other
+81ad0a46-65ec-4c7a-b527-c1ab089e8595	1	Other	Other
+81ad8c20-1c9f-444e-b666-a960ccb313d6	1	Other	Other
+81adabd8-f3ec-40e8-abcf-bc27d4fe9404	1	Other	Other
+81adc759-2089-4bbb-8ae3-589731524426	1	Other	Other
+81adcc36-0347-42df-8679-8280b4c1fae7	1	Other	Other
+81ade19d-984b-4666-a766-445ab2731260	1	Other	Other
+81ade5cc-097d-486d-907c-20fa83d5041a	1	Other	Other
+81ae1842-ff14-4eff-8474-035f946e49a0	1	Other	Other
+81ae7ac0-7839-4128-bd51-676de58a3c44	1	Other	Other
+81aee3b2-97ef-4f23-89f4-2bf94c73e792	1	Other	Other
+81aefb83-d2ae-4a44-bddd-8bcc0d1c6209	1	Other	Other
+81af6cfb-803b-4bc0-81e8-0aede8d4f5cc	1	Other	Other
+81af7c8d-4eb4-4b72-946f-0005eebb72df	1	\N	Other
+81af9242-c1f0-44ab-ac1f-a8d1591f39ad	1	Other	Other
+81afd676-5b59-43f5-bc41-2a18c58e604c	1	Other	Other
+81b03677-12b2-46fd-9104-e6ea7c0127bc	1	Other	Other
+81b04119-b206-42f7-8fbf-496797e9f97b	1	Other	Other
+81b041d4-c4b6-48e5-94ec-b7941bc553f8	1	Other	Other
+81b04ca3-429f-4812-8c92-dd34361a5330	1	Other	Other
+81b05f63-a95f-48c5-9f38-268f0603a7e7	1	\N	Other
+81b07ab9-344b-4188-bc91-804951f330e0	1	Other	Other
+81b0c8d9-35c8-417c-a2df-e69c41dc351e	1	Other	Other
+81b0d4cb-a203-4ef8-95d4-21aa6da9238c	1	Other	Other
+81b12a2f-e177-4d20-a501-51e2fd7e2d2b	1	Other	Other
+81b13175-0d0b-4147-8085-c304c1345549	1	Other	Other
+81b18f03-bed6-4126-8135-68825af56b4d	1	Other	Other
+81b1efa0-549b-4321-bc22-3dcdca8acb01	1	Other	Other
+81b20ed9-3ce5-46a5-83de-162bc6b24097	1	Other	Other
+81b21d67-1754-4f0a-85c5-9b9fd9337001	1	Other	Other
+81b24a4e-c236-4abe-a5f2-1b8e195b975c	1	Other	Other
+81b252e6-0738-40cb-9bfa-b558918f5fee	1	Other	Other
+81b2882f-69c9-448d-869a-64934783529a	1	Other	Other
+81b306a7-e48c-483b-a2e8-df84a8ecbcca	1	Other	Other
+81b349f0-0081-44f8-8cab-2207d5867a0f	1	Other	Other
+81b39ddf-1bfd-4ebc-9837-36f730b194e3	1	Other	Other
+81b3bafa-71e0-4b44-9c5b-7b69335bfa90	1	Other	Other
+81b40dc7-dd01-4c53-9dbe-6d8cb4e9094c	1	Other	Other
+81b4164e-65d0-4886-baaa-5cc10ab5180c	1	Other	Other
+81b497fd-101e-4e6a-be3f-b6e8edd44d13	1	Other	Other
+81b4ec1b-31d3-4074-9066-f3a2bc1de9d6	1	Other	Other
+81b541e4-0af7-41e9-8815-5b184210091c	1	Other	Other
+81b56751-1456-44b8-ab22-90ac2b0edc7c	1	Other	Other
+81b5e525-2a51-4603-bca4-3500d176782e	1	Other	Other
+81b618fd-52dc-477e-9680-8e014d454023	1	Other	Other
+81b643c3-f350-47d4-8311-b8ae70e6e0d3	1	Other	Other
+81b64c10-9b32-4ffa-bd19-26c5a7a846f4	1	Other	Other
+81b6536a-de9c-47f2-8a41-775141b4e983	1	\N	Other
+81b653f1-76e8-4e63-8e7e-4ddc2149821b	1	Other	Other
+81b671f1-caff-4de7-8c17-1c1c69e17afc	1	Other	Other
+81b676e7-77bf-4e01-9783-33136921a4ae	1	Other	Other
+81b67866-5a82-4f95-a7d0-2906cbb33404	1	Other	Other
+81b6790c-3196-4658-8dc4-12104b7f0fa5	1	James	Other
+81b69b02-f2b0-4c7f-878d-e295edc87fa3	1	Other	Other
+81b6a6e4-6d62-4d14-8e40-12390b12dff7	1	Other	Other
+81b7154f-3e73-420e-bc10-cd2585fbd679	1	Other	Other
+81b73551-e2db-4b37-92d8-e6d4cc9914a2	1	Other	Other
+81b77785-9b7e-4641-8274-8bd446ccaadc	1	Other	Other
+81b77820-3a6b-49a0-afaf-b83e36f30c5b	1	\N	Other
+81b7ce23-d7cf-4660-b9d0-e7cc7719c350	1	Other	Other
+81b858b4-325e-46c7-8baa-8d7f40aa4377	1	Other	Other
+81b8997c-22bf-4ade-b5aa-444d56b4466a	1	Other	Other
+81b902d5-da7d-4b34-9d23-5794e4e9010a	1	James	Other
+81b983fc-1236-403d-b209-4b49263cdf0c	1	Other	Other
+81b988c9-4b5c-4bff-b8b6-57237c432baa	1	Other	Other
+81b9b271-cfaa-47f3-8226-6832ab6ba385	1	Other	Other
+81b9fd14-d2a6-4a15-91fe-38a2c16ddfc0	1	Other	Other
+81ba2456-0b08-4fb8-a209-1f87a345ea36	1	Other	Other
+81ba28ea-2322-4981-b962-879649675447	1	Other	Other
+81babbcd-d7ae-472c-8fa3-ecdd2ca3098d	1	Other	Other
+81bac817-0abf-4a86-8fc7-f213a2bcdab9	1	Other	Other
+81bacf3f-8c7e-4884-b553-3d9a60bd009a	1	Other	Other
+81bae5a6-2d2d-4204-aeb7-25537054e0a5	1	Other	Other
+81bb31db-fd7c-4376-8471-9263ee1131ff	1	Other	Other
+81bb3223-d5b2-455a-8ee8-c2fe55e7f621	1	Other	Other
+81bb42f9-11c2-44af-b04f-d644050d03c1	1	Other	Other
+81bbb9bb-572c-4213-b66f-0e83c2470770	1	Other	Other
+81bbfee4-3450-488a-a7d0-2a693e9e55bb	1	Other	Other
+81bc34a1-03fc-4410-a408-f147529316f6	1	\N	Other
+81bc5750-e5e9-401b-bdf9-7fa0fe400833	1	Other	Other
+81bcf78c-7604-412c-ba8c-d100d40329e9	1	Other	Other
+81bd0eae-6aac-44fb-812d-10270c0b0ef3	1	Other	Other
+81bd3180-0e50-4ec4-9f54-d2ebe26656e0	1	Other	Other
+81bd3cd9-ea1e-4dec-82d6-ac00a436457e	1	Other	Other
+81bd82de-51ed-4ab1-8109-9fc0a93b351e	1	Other	Other
+81bd9d38-52ed-40de-a605-91935292c499	1	Other	Other
+81bdaa90-798d-4d73-8505-5446acfae277	1	Other	Other
+81bdc107-dee7-4e14-bb3c-594ac9524f1b	1	Other	Other
+81bdd75d-f7a5-42eb-b23a-eb2780d658a5	1	Other	Other
+81bdfe4d-56a8-44f7-88cc-9bb927e631d5	1	James	Other
+81be0289-106d-4356-ae0b-d82bc8ada619	1	Other	Other
+81be2a65-b986-411a-89f8-de8cf37f1e2b	1	Other	Other
+81be45f0-5059-473e-98f3-131bd7c87ac9	1	Other	Other
+81be7a03-c986-4f7b-9a2f-ba9ab3534796	1	Other	Other
+81be93b2-03dc-4094-b46a-e2f50fe30cf4	1	Other	Other
+81bec9bc-1b73-49da-a5f2-254e1c7af831	1	Other	Other
+81becbb9-4917-498e-bf61-d9df3b5b23f2	1	Other	Other
+81bf3be0-efc4-45f0-bcdc-e2131a73989c	1	Other	Other
+81bf653c-ecef-4105-bd6d-c98bdc817c1f	1	Other	Other
+81bf875d-4e4b-4097-bf18-581203e450a4	1	Other	Other
+81bf8d7e-b6ef-485f-8328-4f6c763de6b6	1	Other	Other
+81bfdbb9-1868-441e-8658-c04b8e067f54	1	James	Other
+81c01eaf-ae42-4d85-b57c-932c472b1ddc	1	Other	Other
+81c088ac-c8e9-4234-91a5-2e45266ea387	1	Other	Other
+81c16abb-31cd-4f66-b234-06e1b6826bf4	1	Other	Other
+81c1c3d5-d503-40b6-8833-ba0ba592b709	1	Other	Other
+81c1cdba-8b37-40bd-8f20-e63c5eb84bfb	1	Other	Other
+81c20434-f94c-4908-abc6-697f06280878	1	Other	Other
+81c2126a-0371-4103-9120-51820591acda	1	James	Other
+81c218d6-c35a-4814-8912-1f7f6e9455de	1	Other	Other
+81c261c7-04e9-4ab5-84b1-bf5085b2992f	1	Other	Other
+81c27b5a-2e4d-4c99-aadc-2ea74c381c7a	1	Other	Other
+81c2b6b0-07f9-456e-9ceb-9fd495cd56bb	1	Other	Other
+81c300c8-ea10-4180-bf33-149bc2bb5f87	1	Other	Other
+81c31e1b-a6bc-48f0-93ab-dcc4be412cfa	1	Other	Other
+81c33d0b-430d-4024-a67f-dc0b94afaf7d	1	Other	Other
+81c37ee0-0d8f-40fb-93b9-4d2cf41a3d9e	1	Other	Other
+81c38262-da93-4f34-9173-17aa67065e07	1	Other	Other
+81c3db9f-61dc-4ba9-876e-020c5dc52f3d	1	\N	Other
+81c4507f-4b9d-425e-8c46-da7bd64550bf	1	Other	Other
+81c45bf6-baf0-4363-ad1a-7a902641c971	1	Other	Other
+81c46364-e8c1-48d2-84e7-6340e64e2105	1	Other	Other
+81c47245-8922-4c10-8bc6-b44c3352685c	1	Other	Other
+81c47c5a-3e14-4330-9aab-c6629a0afca3	1	Other	Other
+81c49486-d26d-4caa-a242-39b91879aac9	1	Other	Other
+81c4c7ed-f5c9-4214-a162-084bdc6cb9f8	1	Other	Other
+81c4cbdb-267d-4bdb-8579-9ae3d1c8b8b0	1	Other	Other
+81c4dd18-3add-4c0d-9a57-f2c2556a0524	1	Other	Other
+81c50dfa-794c-4cee-b457-8bf0fb9caa70	1	Other	Other
+81c57bb3-bba5-4aa8-9805-73323b80d2e0	1	Other	Other
+81c596cf-7ca8-4548-905f-b982331b9c1c	1	Other	Other
+81c5ff39-a91a-46e7-95cc-fdce3e42127c	1	Other	Other
+81c5ff53-5743-4d44-a9df-1089300dc2cb	1	Other	Other
+81c6236b-73a1-4a16-8763-0bd15af3a343	1	Other	Other
+81c6879a-951e-4ac9-b472-aab45e0f9a82	1	Other	Other
+81c6a5d6-2dec-4d88-979e-31064af694df	1	Other	Other
+81c70c3c-20d3-446a-a3ee-df6d792536d0	1	Other	Other
+81c7421e-157a-4e23-ac94-a7dbe275e6a3	1	\N	Other
+81c77a00-149f-41f2-a143-59e7e38b89b8	1	Other	Other
+81c7a555-be3d-427b-beb2-4b5757d07e65	1	Other	Other
+81c7a8d4-0f53-4c8c-9b68-ad4bacfa414f	1	James	Other
+81c7d16b-6c5f-44f0-a7a0-a9eb0709f434	1	Other	Other
+81c861e5-07e9-4962-a3fb-0a6b5d401567	1	Other	Other
+81c8c222-5e57-45c3-be22-6fe9ac8da2bb	1	Other	Other
+81c8e627-5704-4742-a4da-659146db747c	1	Other	Other
+81c906ab-f717-4a4f-82eb-99f3fc4d702a	1	Other	Other
+81c927bb-2556-4910-ba8a-131af8c28fb6	1	Other	Other
+81c96824-26e7-4133-88c9-f5fc7b7279fc	1	Other	Other
+81c96bf0-b388-47a6-9d23-46348fe290ae	1	Other	Other
+81c9bb87-5fea-4fef-9a43-161ea6dc3b9e	1	Other	Other
+81c9f39f-78b7-45ef-8abb-b8c5dea0772b	1	Other	Other
+81c9f68e-a432-49b1-ae45-2d3e2a386826	1	Other	Other
+81ca1f5b-ac96-4c68-80da-b0b13aa61a92	1	\N	Other
+81ca3cf9-6ccc-498e-8037-bbfac749fc83	1	Other	Other
+81ca4d81-c579-49da-be8d-125a113380e0	1	Other	Other
+81ca983b-77fc-4e00-a041-a4fbc835b789	1	Other	Other
+81ca9bdf-2a17-46dd-a0c6-e809c053312e	1	Other	Other
+81cacf65-eac0-4a39-b45a-3c3ad366f704	1	Other	Other
+81cb47f4-4fc5-4716-9a57-c557d35ee112	1	\N	Other
+81cb9309-993f-498e-b21a-559474d032fb	1	Other	Other
+81cb9cdf-e28a-4f29-98b1-2a8887e7bc4e	1	Other	Other
+81cc3ebb-82e2-4831-a492-597eea1cef06	1	Other	Other
+81cd053c-5c69-4333-8ef3-161509572616	1	Other	Other
+81cd1009-40d7-491e-b785-d4399c61b475	1	Other	Other
+81cd2e2d-a48d-4697-ad87-e2755716dfea	1	Other	Other
+81cd3225-9fdf-4a22-a776-90cace083a7d	1	Other	Other
+81cd5f57-aa22-4d71-b14b-cec3068e3240	1	Other	Other
+81cd6793-13e9-4e99-8b6a-3260cbaba918	1	\N	Other
+81cd8b21-fd0c-4a6f-b0ed-a421a1a69a6b	1	Other	Other
+81cda4b7-3810-4667-8d1b-c3f246e385d5	1	Other	Other
+81cdbe79-f0e5-452c-ab0a-b31f0c157614	1	Other	Other
+81cdbf6c-23e6-4078-9a81-d3d188c40ab4	1	Other	Other
+81cdbf73-f0bf-4402-8370-b5f5680e2699	1	Other	Other
+81cdd277-826d-494b-b542-e1e474d8b043	1	Other	Other
+81cdfef5-61c3-4573-b1f1-2b651b38f509	1	James	Other
+81ce12a6-2dc7-4089-900e-acc5c666bfb2	1	Other	Other
+81ce6d29-5a8f-44dd-b9e6-fa6173123397	1	Other	Other
+81ce7953-dc18-4ae7-9b1e-bf639731d644	1	Other	Other
+81ced078-5065-4399-8cfe-492031ae2017	1	Other	Other
+81ced361-1f66-48cd-995e-8ac26e405b51	1	Other	Other
+81cf1c33-0ad6-4863-8ddd-d9acc6971e7f	1	Other	Other
+81cf4729-d344-4bf8-9023-22af732875f9	1	Other	Other
+81cf4862-b32d-42bf-bd12-e7de8a791fac	1	\N	Other
+81cf93c9-c46e-4c0b-9a40-d7028ab1cb2f	1	Other	Other
+81cfc552-25dc-4430-bd91-b04df9803422	1	Other	Other
+81cfd23b-ac27-49a4-9ff0-2215632011ae	1	Other	Other
+81d00fee-0f79-4e22-bae4-2e51247ee50e	1	Other	Other
+81d0bb87-3fe1-4707-a1a6-7d56b9ef1532	1	Other	Other
+81d0e258-06af-405b-9fe7-d9c7f8f6a01f	1	Other	Other
+81d12df9-58c1-415c-bedf-280dd9968ef8	1	Other	Other
+81d16c96-8229-41d0-a22e-0181a9482b2e	1	Other	Other
+81d17532-316e-4243-8a1e-d4480da1d439	1	Other	Other
+81d23495-e313-4c05-8e7d-db0a0add169d	1	Other	Other
+81d24260-40b8-4c15-b746-7fb249c680b0	1	Other	Other
+81d314cf-8a8f-4181-b135-9ee1dcd6c1d7	1	Other	Other
+81d387f4-7009-48bf-a30e-7de6734b6e50	1	Other	Other
+81d388f4-611a-40a4-9a44-f120cb26cb1b	1	Other	Other
+81d3ac0d-f5b4-4631-8499-37c9c52e05ce	1	Other	Other
+81d3cfba-0565-4f1d-b50a-1de947285fd1	1	Other	Other
+81d41bbc-1892-4b49-af70-e40c87299492	1	Other	Other
+81d46d12-2423-4dcc-bb8c-7144a700bfad	1	Other	Other
+81d48b82-ed5d-438f-9b9d-6cfe618360fb	1	Other	Other
+81d4fce9-f83d-4045-833a-6e134dfe7766	1	Other	Other
+81d53ae4-e8f1-4668-a2b9-ea788fc79f3a	1	Other	Other
+81d59fb0-451e-446a-b73e-c1736fad0c46	1	Other	Other
+81d59ff8-b087-4e0f-bfb4-e412db641b6f	1	Other	Other
+81d5e33b-87a0-4685-a418-dfe8efb0b9d7	1	Other	Other
+81d62df5-29ee-4e9b-a5f1-ab85405c1771	1	Other	Other
+81d692d6-46e1-4b98-b50c-c4e1141e5038	1	Other	Other
+81d69e5a-be06-49c4-a84e-84c0a2a612f2	1	Other	Other
+81d6ed3d-8e13-445e-9738-35236ac68298	1	Other	Other
+81d6f4c1-0339-412c-9db8-39d82e79016b	1	Other	Other
+81d72d56-f812-4a8f-8649-7b020d76006c	1	Other	Other
+81d73c97-7574-41a2-8668-fd65602cfe2b	1	Other	Other
+81d77558-dd35-480c-9050-b3682f3a045c	1	Other	Other
+81d7cf8b-2e1c-4a30-91a1-2a76c76337bf	1	Other	Other
+81d83ee6-7fec-4ee2-a8c0-c3ab94df956b	1	Other	Other
+81d8668b-570c-4cde-9565-e991c7df2913	1	Other	Other
+81d8b2b7-dcad-4854-8c5a-c93aa7020c10	1	Other	Other
+81d8d09f-b462-4c45-a108-3b8a83d6590a	1	Other	Other
+81d912d1-9226-46a4-b4a3-3026e25cc3ab	1	Other	Other
+81d92d3d-bd23-41e0-ba4d-6d722166f6f2	1	Other	Other
+81d95f56-6258-4857-981d-6b059e84e40d	1	Other	Other
+81d9998d-af75-4bf3-9c02-880774a9897b	1	Other	Other
+81d99ef5-c7fc-44a6-87da-d2520e925416	1	Other	Other
+81da0dcd-25d0-47de-bbc4-96127a55bed7	1	Other	Other
+81da9a8c-85fa-45f1-b667-410b79d8f352	1	Other	Other
+81db03b9-8e66-48cb-a288-b98c63d2e027	1	Other	Other
+81db30b1-5284-459f-aa1b-413cdbcc76e7	1	Other	Other
+81db5d5c-78b9-4845-9b07-8d94855bef44	1	Other	Other
+81dbf741-ed54-4bf7-b68b-d168acaa1da7	1	Other	Other
+81dbf933-5430-4232-8eef-7c38dd68ff1b	1	Other	Other
+81dbfecd-dea1-458e-8d70-20bd52213bcb	1	Other	Other
+81dc04b4-c9de-439b-8bc9-eb0d01f2f850	1	Other	Other
+81dc09d1-183c-487a-b1b8-a26db82cfa0b	1	Other	Other
+81dc1df4-03cb-40b2-90d1-b1d252c1516f	1	Other	Other
+81dc31a7-1659-4f05-82b4-822c2ad29be8	1	Other	Other
+81dc5afc-347e-44ef-9eac-f17334b3a4cd	1	Other	Other
+81dc7bbe-bf45-4b1a-8f3b-a29078c4fd30	1	Other	Other
+81dc8325-891f-47ac-9311-49852ac5600c	1	\N	Other
+81dc84e5-5c65-4118-85ff-ec98bee3f92f	1	\N	Other
+81dcb266-e5a9-44a3-9a82-8372382b5a79	1	Other	Other
+81dd1153-42c6-4df9-995e-17c20b8ad216	1	Other	Other
+81dd19d1-48da-48c5-a2a5-11b033a8c8c1	1	Other	Other
+81dd3840-d244-438e-8f4f-52a4a5803c2b	1	Other	Other
+81dd884c-cbc4-4871-a9bb-f19bcbf92482	1	Other	Other
+81de16f8-45c3-4d2a-9570-ad03bd6068c6	1	Other	Other
+81de46c0-dd1e-4dd5-802e-81cff0126784	1	Other	Other
+81de89be-62e3-4fea-87ef-162b0fa93060	1	Other	Other
+81def75a-9e59-4960-b48f-1c663d912e8d	1	Other	Other
+81df14be-5c9e-41a0-b7ed-1570a9073a6d	1	Other	Other
+81df3813-0fd1-4b94-94f7-c6b0114d5613	1	Other	Other
+81df52e6-45a0-4561-89dc-9645404c4d00	1	Other	Other
+81df84c8-00fb-4a71-aba0-8684e817a40d	1	Other	Other
+81dfbaaa-cf15-4098-9956-cd5f703d6e0f	1	\N	Other
+81dff15f-4b43-479f-91c2-3b9de9acb853	1	Other	Other
+81e003c9-ff8e-4f55-9269-597a8dbcf51d	1	Other	Other
+81e025ca-5d40-4330-850f-3d08345515e4	1	Other	Other
+81e026f7-b9db-45f2-842f-b03c1e420f35	1	Other	Other
+81e06410-06dc-4b01-baa3-44a61458b8fb	1	Other	Other
+81e06b3b-b7f9-4e0b-9ab2-c73cba1bffea	1	Other	Other
+81e0743a-8619-44b2-9365-67a8de305cc6	1	Other	Other
+81e08825-0d71-4355-8f06-c7d85eccd5ab	1	\N	Other
+81e0a61e-e2f1-4ffc-92d3-63500678524f	1	Other	Other
+81e0af47-a5f0-4cc8-8f9d-13778b169619	1	James	Other
+81e0c6f3-f69f-473b-9ced-b63771163cac	1	\N	Other
+81e0c7a8-fc77-40a0-949c-2ea6ab2147b2	1	Other	Other
+81e0dd10-4ac0-4e0e-b4f9-c1a667caede1	1	Other	Other
+81e1318a-affb-4f3b-a1f0-cfaf74684cf9	1	Other	Other
+81e14320-28a4-4e1e-91bf-36e3e994353c	1	Other	Other
+81e1559d-9841-40d8-b3d9-091cad9b1cce	1	Other	Other
+81e17fe0-d0c0-4f96-adc7-c4272e7d4a4c	1	Other	Other
+81e1cd66-c6ff-406c-b668-dd566e42863c	1	Other	Other
+81e242d6-46f8-4c52-abd8-441d58ba0d81	1	Other	Other
+81e2a6fe-a996-4a05-a2bf-9d481241186e	1	Other	Other
+81e2aebd-b9bf-4b33-a321-654fa7c3d003	1	Other	Other
+81e2b6f3-a791-4a7a-9efe-e869d2085f9a	1	Other	Other
+81e2e6b0-7430-4b91-87ac-2e5c0c7ef3b6	1	Other	Other
+81e2fd9c-f562-4bea-b942-b5b0b17f3054	1	Other	Other
+81e31951-5224-432c-9bc1-adaa6f990460	1	Other	Other
+81e32c93-c1d0-48e6-8534-b3127a6b8770	1	Other	Other
+81e32e19-63cf-4703-befd-2614c8e132a0	1	Other	Other
+81e335b0-cc5e-48f7-81aa-ba77c979d601	1	Other	Other
+81e34b36-3148-47dc-acfe-727609300d39	1	Other	Other
+81e37ac0-1f4a-4997-a459-5a0a4468a658	1	Other	Other
+81e40491-95d7-43c9-8607-6515abce55f1	1	Other	Other
+81e426e0-c2e0-4171-9f04-598c24fdbae8	1	Other	Other
+81e4f30b-b2dc-4e50-af40-fde2d7548b60	1	Other	Other
+81e510a6-cef3-4c0b-9377-a47ad85131d8	1	Other	Other
+81e51ee4-d680-11e7-9961-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	Other	Other
+81e52694-0548-48ec-9bba-2578f0eefd1e	1	Other	Other
+81e55b6b-ad52-4b04-9c2f-51110bc6f9de	1	\N	Other
+81e57d27-06b6-4d1a-a48d-684f5fdeee66	1	Other	Other
+81e5c5e5-dd8d-436e-a775-ae8bd76c0b6d	1	Other	Other
+81e5cff4-9f76-4519-99a9-6d8a10bd5198	1	\N	Other
+81e681a2-8023-4ca8-a99d-db564f56033c	1	Other	Other
+81e6a422-c7e5-4a14-8837-03e6fe7f915d	1	Other	Other
+81e6d1c0-2399-4f4e-9b7d-853751fc325a	1	Other	Other
+81e6eaaa-2246-4648-8ed2-7b4f54a6de35	1	Other	Other
+81e6f0e8-44a2-4e20-be38-61c4ea219b64	1	Other	Other
+81e71615-7e30-4383-970b-424c4a330a1e	1	Other	Other
+81e7295b-ee6e-4cd0-a747-83a4668f0f7b	1	Other	Other
+81e74098-b6fb-4669-b8b4-388e721c272c	1	Other	Other
+81e7c5a4-4d3a-4d7d-8b03-f53d0f63b64f	1	Other	Other
+81e7d0b9-81a1-4a02-8106-af9eb0f9e386	1	Other	Other
+81e7d510-46a7-43e9-8be9-5ff3fc36e14b	1	Other	Other
+81e87b42-39b9-4d1c-8aba-83cbc084d943	1	Other	Other
+81e87bb7-cc22-4928-b7fb-01e9c8bb4102	1	Other	Other
+81e8a2bc-5413-44af-bc0b-1ac631ac0070	1	Other	Other
+81e8f14c-c0af-4fb2-95e8-883b76197944	1	\N	Other
+81e90ad7-8ac6-462e-bb1e-1e8e707e6d91	1	Other	Other
+81e99cb6-dcbc-49a3-882e-b619268081f6	1	Other	Other
+81e9c280-8787-4161-a2f7-f06d801a3d2b	1	Other	Other
+81e9e36d-dbae-435e-9e08-7952721dee6a	1	Other	Other
+81e9e917-4c4d-4ac7-a159-83cc3ffc35b1	1	Other	Other
+81e9fbd3-909c-42de-944a-71be24b15287	1	\N	Other
+81ea00f8-9a68-4fa2-afbd-5080ea560941	1	Other	Other
+81ea1ce6-330d-4e36-b154-44423d4a2106	1	Other	Other
+81ea1e34-6380-4163-a11b-77c9996993e6	1	Other	Other
+81ea60d2-f2fe-42d2-ac38-74a8387fae92	1	Other	Other
+81ea66b0-e3df-4974-aca6-985dc8f7d6b4	1	Other	Other
+81eae2b2-e2c2-483e-a180-04a6bc2b8a54	1	Other	Other
+81eb4105-8d95-4770-a322-c50f40e45f11	1	Other	Other
+81eb57c4-6430-42a3-a1af-673d0e5784a5	1	Other	Other
+81eb9e00-2606-4964-b030-66b0c11938e7	1	Other	Other
+81ebf274-7abf-4880-b29b-ba9dfe59014f	1	Other	Other
+81ec5a7e-a885-402f-acbe-b452e8d990cd	1	Other	Other
+81ec5e37-7502-4307-910a-845b30a438ba	1	Other	Other
+81ec850b-ecf4-47b9-b07c-3f90e4c44e67	1	Other	Other
+81ec9290-c573-4cb0-963a-2a7607a75df7	1	Other	Other
+81ecba4a-cca4-450c-ace5-01321f0daee4	1	Other	Other
+81ece02b-cd78-4816-9935-867a33a46009	1	Other	Other
+81ed5971-260d-4a36-906b-dd9b00000557	1	\N	Other
+81ed9a7f-5c43-43a6-8303-c95f02e749e6	1	Other	Other
+81ee5ea4-775f-4142-8a8c-fcc46d8b9c2e	1	Other	Other
+81ee687d-cbaa-421f-9c11-01664754a91b	1	Other	Other
+81eedfd4-c022-4b16-8081-192557737dae	1	Other	Other
+81ef0543-31dd-4acb-b677-62d03a9df121	1	\N	Other
+81ef4eed-5eee-46d4-8ea8-4ec0855eab05	1	Other	Other
+81efae35-bdf4-4f0c-8b3a-bfb644ca8f82	1	Other	Other
+81efbdcb-3b0b-482a-8ce5-dbad61ecdceb	1	Other	Other
+81efcc76-5bf7-41ed-9a1f-4609cbd85b67	1	Other	Other
+81efeaa6-45bb-4c49-8485-61f67de5d4c2	1	Other	Other
+81eff781-b2f8-49f4-ae9f-d11648c70e15	1	Other	Other
+81f01255-26c6-4636-ae9b-032117f0a990	1	Other	Other
+81f086b2-fbf0-46f4-a448-dc7efaaa30a4	1	Other	Other
+81f0924d-e830-4cf3-ba11-64d8edfc47e0	1	Other	Other
+81f09aef-9426-48c1-8b8b-766799af8515	1	Other	Other
+81f0abec-e3cd-40b1-93e3-ed8745e9eb80	1	Other	Other
+81f0b575-f000-407c-affe-e4d6fb74d06e	1	Other	Other
+81f1866f-7646-4082-a5ce-b28d15f5dccc	1	Other	Other
+81f1a620-0a86-4751-a7ae-609088ceacf9	1	Other	Other
+81f1ef3a-e79a-4dfd-8005-c03e4681850a	1	Other	Other
+81f1fc5c-a9d4-4abc-a46c-2e6cf2aab108	1	Other	Other
+81f223f0-2ee5-41a5-8fc6-df2689c6010b	1	Other	Other
+81f2c3d4-d5f3-45b6-b9a2-8882121a28b6	1	Other	Other
+81f2d4f6-4203-4a3c-81ac-8c2007eace39	1	Other	Other
+81f3050d-9b9d-4f60-a5bb-dd10f040a657	1	Other	Other
+81f33621-576c-432e-8e5d-1da9570ccd64	1	\N	Other
+81f336c6-f55c-4aca-a561-bcefce8e7e8a	1	Other	Other
+81f33fe8-15dc-4510-8949-20af3c32614f	1	Other	Other
+81f383c8-b391-4df9-9292-e4457de98636	1	Other	Other
+81f392af-70ab-4729-bb3b-7c28e8bca333	1	Other	Other
+81f43084-3676-4668-8eca-3386456d639d	1	Other	Other
+81f43cbf-6c35-4ac2-988d-234a592d449c	1	Other	Other
+81f4763e-1bf4-4c7c-a3b3-f50603c35f87	1	Other	Other
+81f477ad-73eb-4db2-8028-b9d8349efd2b	1	Other	Other
+81f4b8e2-650e-486d-a0c4-0dbb0ad972ab	1	Other	Other
+81f4db06-185a-41fe-a00c-8a26273e950a	1	Other	Other
+81f5067c-4970-4fce-8f27-5c5891e54077	1	Other	Other
+81f53e05-a7c7-420c-9d44-cd2ba4cffdb4	1	Other	Other
+81f5438c-d033-4245-bada-b5ceb61d12b0	1	Other	Other
+81f54a2a-dd05-410f-9cf2-2ea173a31fbb	1	Other	Other
+81f56d10-e03c-456f-b561-032b35cdfae3	1	Other	Other
+81f57ebf-d12e-41cc-bbe8-1fdd8030b200	1	Other	Other
+81f5a526-491f-49e8-8169-092111b59320	1	Other	Other
+81f5d363-e3d5-42b3-b2d0-9f1557cb239b	1	Other	Other
+81f5d7d9-2f25-4a30-83ca-54f17a6575d5	1	Other	Other
+81f5dd6f-2cd8-42b6-adf7-d4dc3b161529	1	Other	Other
+81f5de34-afa4-43ce-8bce-c4e809af4d1f	1	Other	Other
+81f63dfb-9aa5-407d-918b-392626fd99bf	1	Other	Other
+81f653e2-686b-4566-928c-0501aa056c26	1	Other	Other
+81f68335-a41d-42b8-8957-44b0aa083215	1	Other	Other
+81f69d30-5d4d-4e5f-b602-7bb1322bdb10	1	Other	Other
+81f6a2bd-a901-42dd-a291-b5caa08508a5	1	Other	Other
+81f6ba9e-6ed9-4067-900d-2c768263b554	1	Other	Other
+81f76356-4854-402b-8acc-48bf60edfdb8	1	Other	Other
+81f7764b-6b00-4dce-8c77-571b4e353443	1	Other	Other
+81f79a08-05c2-4d50-ab8b-7ba8f268b90d	1	Other	Other
+81f7d369-3669-4b44-95e5-0ee86edac265	1	Other	Other
+81f7e58e-74c9-4b8f-97eb-554558f2a868	1	Other	Other
+81f826e6-f2b8-422a-a5b8-ae0fa8e0c485	1	Other	Other
+81f8565c-3752-499d-aa71-adb24a45fb7e	1	Other	Other
+81f8a897-be82-4828-82fa-12f732570ef8	1	Other	Other
+81f8aec3-d6e5-4a24-80b8-9dd818001f2a	1	Other	Other
+81f8d806-9bc0-4205-b7b6-2a80cda7672b	1	Other	Other
+81f906b8-221e-4210-a3b6-0e432d25c522	1	Other	Other
+81f90a02-a331-4941-b77a-944c93f4a7d9	1	Other	Other
+81f926f3-eb18-4706-93d0-2d21644d8394	1	\N	Other
+81f93747-675d-403b-845e-ace337d7e27b	1	Other	Other
+81f988e9-6f02-4b84-a346-b1f1f312ad49	1	Other	Other
+81f9aad9-66b6-4833-b61f-0d106785c1e9	1	Other	Other
+81f9b3bf-b425-4226-a0e0-616e3ecf8836	1	Other	Other
+81f9f1d4-30ad-441f-bb9f-9de501f3925e	1	James	Other
+81f9f245-a053-48b4-ac56-285006bf7c21	1	Other	Other
+81fa3a12-1972-4b85-9ead-d6b491469bdf	1	Other	Other
+81fa51eb-dc8e-4a25-a83c-e92aee40842d	1	Other	Other
+81fa61b7-3294-4fed-9f33-650d8249b5f9	1	Other	Other
+81fa73d9-3cb6-4cee-9341-3272861a5a1c	1	Other	Other
+81fa8e08-ab85-458d-b7f3-bde71d7f4fe0	1	Other	Other
+81fa957c-ed8e-446c-8599-5c709652fc85	1	Other	Other
+81fac46e-e604-4106-b9e0-95537c901349	1	Other	Other
+81fad714-5a1e-42b6-b78a-3009e5045184	1	Other	Other
+81fb0aa7-4470-45d4-898f-b528d2ce3114	1	Other	Other
+81fb234e-2de9-4882-a52c-4ad4a1fc01e9	1	Other	Other
+81fb5394-50c8-479c-9f6e-331d426f54e6	1	Other	Other
+81fb92aa-61e6-43ba-8421-f091a5df1260	1	Other	Other
+81fba931-d78b-4822-b110-1bc632becfb1	1	Other	Other
+81fbb0a1-fb82-436a-a137-c420e44a01ae	1	Other	Other
+81fbc7eb-949b-4bc8-a34d-c4f5f5550fe9	1	Other	Other
+81fbf2c7-d3a0-4fc9-9b04-bb53f42ddb50	1	Other	Other
+81fc230c-dca5-459f-8c13-7626d80a02d3	1	Other	Other
+81fccf7d-6870-485d-af1b-fb8f76dc0b6c	1	Other	Other
+81fd4e2f-a6ea-4c2d-8d82-e5cbe011b42f	1	Other	Other
+81fdc019-223d-4691-a5ac-f00ef2dffe5d	1	Other	Other
+81fdce94-a35f-4e4d-b8f4-dced818347b7	1	Other	Other
+81fdec3a-0865-4df7-97f7-4ea2a40bf179	1	Other	Other
+81fdef9d-be9e-4655-8fdf-d14fc9234c90	1	Other	Other
+81fe2492-7c5b-433a-81c9-4e0f9542310f	1	Other	Other
+81fe30c2-86c3-4582-b43a-c19f71e6369f	1	Other	Other
+81fe4818-1d83-4405-a397-af87e0454fce	1	Other	Other
+81fe62ab-d678-430c-9d77-61b94ae04105	1	Other	Other
+81fe74e0-8927-4151-aacb-6f0ac32f5575	1	Other	Other
+81fe8490-779a-4b51-84a5-18d01a9c8663	1	Other	Other
+81fe87ee-0d5e-4300-a433-1ab87512e805	1	Other	Other
+81febf5f-0cd8-4cf1-9790-88fd6b869640	1	Other	Other
+81ff3aad-e063-4933-a53a-89cf91f54f10	1	Other	Other
+81ff96ee-f04b-4982-ad0e-60aaf9b143b0	1	Other	Other
+81ffd299-a304-4819-826f-a355a8df3d5d	1	Other	Other
+81ffd803-5b4e-45da-a3b6-150132df45e7	1	Other	Other
+81fffed3-89f6-4ac4-a180-24c073097605	1	Other	Other
+82001f18-c9a4-4985-acc9-f1de1368dd65	1	Other	Other
+82004659-10fd-4a9e-97fd-0a1f257eaefd	1	Other	Other
+8200b70c-2c9d-465a-8ac2-1427dac3a0f6	1	Other	Other
+8200e2b5-f507-422d-92ad-2e74ead3b420	1	Other	Other
+820101be-8957-4392-bb0e-a1cf0090bf2b	1	Other	Other
+8201037b-3248-4616-ab06-5f297a6fb9c5	1	Other	Other
+8201285d-4c98-4674-a0b8-57fdd85875be	1	Other	Other
+82017897-2839-46bc-87cd-47d526914171	1	Other	Other
+8201c4fb-efb4-423d-962b-2d040fcd1cbf	1	Other	Other
+8201ce7b-3337-419f-8ebd-fce9c36f18a8	1	Other	Other
+8201fe06-bb8f-4685-8865-d0dfd6b10e33	1	Other	Other
+82020579-bbfb-480a-89f0-cfac39e01bfb	1	Other	Other
+82023c40-46f5-4dcc-bbce-bc52065842ae	1	Other	Other
+82024453-217a-489f-8ee5-aa2643c75aea	1	Other	Other
+82024d98-2d65-48d5-8e56-83b2d852b156	1	Other	Other
+820259ae-a74e-47fd-95e8-683d7c34eb41	1	Other	Other
+82027b10-fe5c-4f68-ae07-c0cbe2566c82	1	Other	Other
+8202b49a-258d-4792-ad2a-a1d365010438	1	Other	Other
+8202d44c-fbf9-4256-944b-0647486400be	1	Other	Other
+820369c8-6e2e-40c4-9665-10edd9d69eed	1	Other	Other
+820385b5-e2a0-49dd-8810-230f00ab1f3d	1	Other	Other
+8203969f-fe57-4d2c-9aeb-eaaeb9c38939	1	Other	Other
+82039f6f-56cb-457d-a206-e25845ed584a	1	Other	Other
+8203d319-77dc-42db-8f5d-3f9ded607dc3	1	Other	Other
+8203d6cf-7337-4bf2-a609-6ca80b2e88b1	1	Other	Other
+8203e64a-7ead-4e94-af07-8b14331c6593	1	Other	Other
+82041c39-82f3-4125-b4d8-5c9847db919b	1	Other	Other
+82044260-de3e-46c5-b061-18fbd99fca9f	1	Other	Other
+8204446d-d84d-463b-b9ee-4abc102ccb52	1	Other	Other
+8204c1be-ecc3-45e3-92cb-9237c065c1e8	1	Other	Other
+82055581-df40-4ebb-a7fe-8b671298eb76	1	Other	Other
+8205586f-cf33-4183-895e-bb3c4fdca1a7	1	Other	Other
+8205780f-77f6-44b6-b2f2-e26753c06f35	1	Other	Other
+82059469-2eb4-430c-b5c9-a94a5adc4ce8	1	\N	Other
+8205a4be-661b-4eaa-aaf4-6dde44701ddf	1	Other	Other
+8205a85a-e635-4a5c-938d-366a4d9e3eb0	1	Other	Other
+8205d211-d5d7-411a-bb9c-e9bdbfba8bfc	1	Other	Other
+820632e5-da73-4179-a886-bc21206f05c7	1	Other	Other
+82064bc2-c95c-406a-b248-1d2e2925a1c0	1	Other	Other
+820663fc-45d5-4dcb-9675-193d633a4802	1	Other	Other
+820668b0-d52d-4b00-874c-9bdcbd683072	1	Other	Other
+8206a735-c0b2-467c-9155-0bb34085d484	1	Other	Other
+8206ef28-a20a-4225-8774-504c873d5a78	1	Other	Other
+8208058d-78dc-4c7c-96a9-6d6b1985cfa4	1	Other	Other
+82081360-b8b5-4a02-9b5f-84f0972b62a0	1	Other	Other
+82088f28-4b3a-47b5-bdf5-c8e5a70fe020	1	Other	Other
+8208a74f-cde9-4d62-bd30-4dc2aa6c7a67	1	Other	Other
+8208c6bb-9246-465f-a428-3fb3471218f2	1	Other	Other
+8208f555-a607-4804-bdfd-65d89bccf980	1	Other	Other
+82091589-414d-4200-af60-2586260adff0	1	Other	Other
+82092b13-cbb8-43d4-b8a9-ea05615ab414	1	Other	Other
+82092d5f-dfee-44b1-a789-f2cd7c613801	1	Other	Other
+820940ef-5588-47fa-b71a-c680cfa9862d	1	Other	Other
+8209593f-d1ef-4ca6-91de-d0743a0b5e13	1	Other	Other
+820a42c4-05f8-44fb-9ed7-b47f3ebc1c3d	1	Other	Other
+820a7a4a-7c92-47e3-9fc3-6c4cd85ea929	1	Other	Other
+820a7f5d-b3fe-4827-8cde-3ff612d777af	1	Other	Other
+820a95e3-f66a-4289-ac44-477d8e6dba50	1	Other	Other
+820ae03a-5a29-485d-9b4f-0b644abd5e12	1	Other	Other
+820b1c01-b856-48e4-9697-3299d28c6c24	1	Other	Other
+820b2cba-ecee-4c42-a6c1-2e1e488e27c0	1	Other	Other
+820b8923-9f4f-46fc-9f84-bbd839fffd4a	1	Other	Other
+820bf8da-37b3-425e-94ff-662b06a3438e	1	Other	Other
+820bfe17-7b50-4233-9c83-07a006cad0da	1	Other	Other
+820c3230-e880-4ff2-b4d9-d65b3ff088c8	1	Other	Other
+820cd948-5af4-4271-b433-11faef5f7f72	1	Other	Other
+820ce79d-ca06-4290-87f7-5c65a8637d48	1	Other	Other
+820cf440-dc0d-4d6b-8ce6-bc069eed9cb8	1	Other	Other
+820d87d9-0118-4154-a222-ef05a45da959	1	Other	Other
+820d9ee6-bc02-44ec-ae81-3e0b772652f1	1	Other	Other
+820e3c58-bbe1-4d7f-a8c7-95e9f724afd8	1	Other	Other
+820e4329-44e9-4468-a1de-ea4d6ec8af0e	1	Other	Other
+820e6944-98d7-4fe3-885e-250796a2b1d7	1	Other	Other
+820eac48-246f-43fe-8928-049789db4f34	1	Other	Other
+820ef77a-7b4a-41fa-b5cd-1055264b8cee	1	Other	Other
+820f2748-4027-4596-90e4-38a9401be4d8	1	Other	Other
+820f42d5-a494-40c4-bdc4-1eba2c159e5c	1	Other	Other
+82102d5a-4bf3-4dab-b24a-cb40cfe117fa	1	Other	Other
+82104041-4b2c-4b28-aa27-f509e773d8c1	1	Other	Other
+82108a8c-3a9f-40c9-a984-429e48790da4	1	Other	Other
+8210bc2c-f1c1-4719-9e21-266b5f9674dc	1	Other	Other
+8210fb8b-5ded-465e-8935-087bd88625ce	1	Other	Other
+82110042-bbe7-4923-b988-5975e4615b51	1	Other	Other
+82110dbf-3804-4c84-b3a4-5ec1f0fcdff8	1	Other	Other
+82111d35-094a-4a00-9aef-b1347b5cf5ed	1	Other	Other
+82114f31-481c-4794-a357-2e818a600714	1	Other	Other
+82119674-3464-4749-b4be-a25ae1267c36	1	\N	Other
+8211a8ea-1af7-4888-9500-d6723ded9225	1	Other	Other
+82128d40-ff0f-4ca7-9322-b6c37db52d6d	1	Other	Other
+82128f82-f637-4d88-8b08-05926f153062	1	Other	Other
+82130954-b636-48c2-8bea-8f6701b1833b	1	Other	Other
+82137f81-1835-4403-a6f1-ce4ee3e827c2	1	Other	Other
+82139e16-2984-49f4-9b0e-7a7e712242ad	1	Other	Other
+82141eaf-7767-4377-80f2-a4347c266bae	1	Other	Other
+82146423-c6d0-41cd-8bc5-3ea35d318b59	1	Other	Other
+82148196-fe17-4b04-9651-12d14ab9d81f	1	Other	Other
+8215222b-7d3c-406b-b359-80ccf35d46c9	1	Other	Other
+82154187-c1bf-45eb-be09-9451468daa43	1	Other	Other
+821597d8-8acd-4af6-afc0-27675078de5a	1	Other	Other
+8215d607-1f97-4400-bb02-7a4d0661eadf	1	Other	Other
+82162441-95fe-4e6e-b908-15d5da4d040c	1	Other	Other
+82167690-21b5-4af3-8d38-00034101a3ac	1	\N	Other
+8216ad88-a496-4ab3-b696-59a4d6deb5f7	1	Other	Other
+821701cb-4e0f-42e9-81f0-05a1bc77822a	1	Other	Other
+82170e20-a9ff-45c3-989b-b6d4ff0bb7ed	1	Other	Other
+821777c2-04a9-4c4e-8e73-a1080680330d	1	Other	Other
+8217927c-3871-4fec-bb11-1743a7fbf2a4	1	Other	Other
+8217c0b0-416e-4936-98f9-1306b4fff731	1	Other	Other
+8218072b-dfb7-49c3-ad97-194323be3253	1	Other	Other
+82186c9a-cbb6-47c9-b0c4-70a3714933d9	1	Other	Other
+82188c99-5eff-4532-9024-9577c0f00171	1	Other	Other
+82189a66-177e-4984-8208-cd95b109d832	1	Other	Other
+8218a797-f1f8-4115-8f58-f37c173a762f	1	Other	Other
+8218ff5a-a891-4919-a621-4c8b55b346e2	1	Other	Other
+82191adc-227d-4e28-b25c-2e823659251c	1	Other	Other
+82194e7e-acfd-4e3d-89ca-d9ef04fab516	1	Other	Other
+821970b9-7de8-4526-9de9-6d6937b9e695	1	Other	Other
+8219a003-e69d-4e8f-b4a3-10111138f487	1	Other	Other
+8219a5ba-8284-4f5f-827e-f47c6309de6e	1	Other	Other
+8219d1bf-0de9-4f40-8304-b0c097a0a885	1	Other	Other
+8219e0c1-f4a7-49c0-9eef-c62725c0a82a	1	Other	Other
+821a0107-8bca-4cca-85f9-4838f278083b	1	James	Other
+821a4570-7074-4fd7-9262-dec428523d0f	1	Other	Other
+821a5671-7d19-4c9e-85d3-36608fa669dd	1	Other	Other
+821a5707-376c-4e60-967b-4164d38f2691	1	Other	Other
+821a696b-299a-4902-92a8-8a55edd889b0	1	Other	Other
+821aa871-3589-415a-baa4-0132fd6563ce	1	Other	Other
+821acbe8-7603-430e-a238-997eff4aff27	1	Other	Other
+821ad9b1-07e1-4c18-9463-6b90d4afac93	1	Other	Other
+821af4d6-d4e0-486b-8526-0636f76149f8	1	Other	Other
+821b1449-ca53-4c5f-a279-9229293d20c3	1	Other	Other
+821b3a65-a361-46d3-92af-434156fdfa12	1	Other	Other
+821b709b-3db9-49d1-a78e-826ebe8783ee	1	Other	Other
+821bc5b9-ab6f-4c0b-bce7-b921d7ebc94f	1	Other	Other
+821c16e9-9740-492e-8c40-e0ef29688173	1	Other	Other
+821c2258-e88d-4572-973e-40d90cd569a4	1	Other	Other
+821c35aa-d5f0-417b-bee9-58c895b2b9cc	1	Other	Other
+821c79c4-77dc-4bd8-abe3-cda1020efdde	1	Other	Other
+821c82a1-2fdb-48d5-831c-9b25ee6e2fad	1	\N	Other
+821cbb25-74a3-4262-ab0e-e990d7a55fdc	1	Other	Other
+821cceda-315c-48b8-bbe7-f0e3be0b13f4	1	Other	Other
+821cf99a-f7ad-40fe-935c-f676963765f5	1	Other	Other
+821d3ca0-c4ba-4565-b635-408bc049e311	1	Other	Other
+821d65da-b2b4-4ea4-adfc-1c34a62eb270	1	Other	Other
+821da4f0-aa9c-4f9d-b231-10fa591a0950	1	Other	Other
+821dc22f-baa7-47bb-9f01-1f8a387f6db7	1	Other	Other
+821dcee4-87a5-4a16-888c-1872b89e4679	1	Other	Other
+821f0188-8659-48b4-b731-0319bb567d32	1	\N	Other
+821f0618-fd23-41cc-bb74-51c6c603ce97	1	Other	Other
+821f5ad0-c3f7-48a0-8ea8-765beaa4c7be	1	Other	Other
+821f9f13-92d0-4020-8240-7bf07e4505f3	1	Other	Other
+821fee3c-e8e7-4f49-8aff-4e26b5667e31	1	James	Other
+82200e61-f06a-453d-80bc-60ed3fbb649c	1	Other	Other
+82204ad4-4b3d-4577-bdbb-5ea70a520590	1	Other	Other
+8220588b-71fd-47bf-aafd-7c9d322f30f6	1	Other	Other
+82208b27-3a4e-4f95-aecc-97d8fb350c0b	1	Other	Other
+8220dbb1-be16-4075-aa82-cb322e7a0f53	1	Other	Other
+8222187a-b180-4db3-a4e7-00d501dcbac1	1	Other	Other
+82227e74-c26f-47ac-aa0f-8cc2cb7be5e6	1	Other	Other
+8222b610-a394-4ae6-80c3-66c4a6647f54	1	Other	Other
+8222bfcc-7b72-4c36-8f0f-d80c1f693628	1	Other	Other
+82236340-de1e-45d3-ac9b-553ea0d4b0bc	1	Other	Other
+8223936f-53a5-4357-adbd-1c7a97ece4eb	1	Other	Other
+8223d0c7-a66a-4326-a06d-fde3ff4cdab9	1	Other	Other
+8223e431-1494-4e98-93c2-52e4c4491f97	1	Other	Other
+82243206-6c27-46b1-a4fd-3be7c177aa9a	1	Other	Other
+82246dea-a926-4bdf-89e8-0d7b9d0fd1dd	1	Other	Other
+82247858-08e9-4543-8aa1-d72ff2b20ee9	1	Other	Other
+8224c1ac-4232-43c1-9094-76016e4714f0	1	Other	Other
+8224c477-fdfb-464c-90d6-60086593e6aa	1	Other	Other
+8224c4ad-21a2-489c-b92d-4e2efbeb1c21	1	Other	Other
+822531dc-df53-48ee-ba8c-1dfbd38ab397	1	Other	Other
+82253d07-4ea2-4a10-9f6c-1c4bd7cf627f	1	Other	Other
+822566d1-d0bc-4f74-bd43-5e4a9843c50b	1	Other	Other
+82258cc6-cc8b-40fe-8e2d-1aa52aa5234c	1	Other	Other
+8225beda-d835-4f9c-bd72-3c0098f578f7	1	Other	Other
+8225d2a5-0dce-4314-b4bd-121fb2bf8cc2	1	Other	Other
+8225f0a0-0cdd-429d-9de2-c309db2cdb01	1	Other	Other
+8225f7a2-6733-4342-9353-a10f00be288b	1	Other	Other
+8226793e-f9da-4b62-a8bc-ef463174e91c	1	Other	Other
+822699d2-9db5-4ffe-913f-77b7a5bce440	1	Other	Other
+8226cd27-b382-4cd1-8099-545cec939706	1	Other	Other
+822705fe-4143-4abf-9ae7-a77e4e632285	1	Other	Other
+8227329b-63ad-441c-a35f-b6a7760c116a	1	Other	Other
+822736ec-5b7c-4bd9-a2ed-b3f883572603	1	Other	Other
+82273749-5e5d-41c7-a1c4-bc6f059fe806	1	Other	Other
+8227585c-3143-4e13-be37-1a8dfbde03bb	1	Other	Other
+82280559-4a39-4e58-ba9e-575968def7f5	1	Other	Other
+82282729-ec5c-46df-b70f-772c82743983	1	Other	Other
+8228ac8e-1ef6-4ffb-a3c2-4c1269223a76	1	Other	Other
+8228c1a3-1319-43df-99d3-6a525963390e	1	Other	Other
+8228dade-2c80-46a5-a2ae-3b55d48f260b	1	Other	Other
+82290a31-f3c7-4d0a-ba94-fa4291e901cd	1	Other	Other
+822931ab-74ce-4333-9624-d97ad79c02cb	1	Other	Other
+82294372-d658-40f2-bf76-82d6bb00642d	1	Other	Other
+82294edf-5ff0-421f-95fb-1759644e5eae	1	Other	Other
+822954d7-0e41-4f68-87fc-f7ea6fdf6787	1	Other	Other
+822961e0-8958-4435-af1a-45a2a32814bd	1	Other	Other
+82298e29-0f0f-4df2-ac01-9acc862f74f1	1	Other	Other
+8229a011-6897-4fde-baef-7ef0f8de451b	1	Other	Other
+8229cf3b-78b4-4cf3-bf0f-b05518c9dcbc	1	Other	Other
+8229e26e-3cb8-43ec-8729-3f7ed2ae0400	1	Other	Other
+8229f605-02a4-47eb-ac04-cb7e898b7406	1	Other	Other
+822a37ce-93ac-4399-b987-da844773ae6d	1	Other	Other
+822ac37e-8900-42fe-96ef-d508c4f2ec5c	1	Other	Other
+822ad32b-fc15-4c13-8aa9-d7f88f30e880	1	Other	Other
+822b2681-e750-4cab-81d3-00f91b6df5b2	1	Other	Other
+822b3746-ca2b-465f-ad70-5894cd6ff752	1	Other	Other
+822b66a8-9579-441b-bb5a-b80c86f5a453	1	Other	Other
+822c18d0-014b-44e1-bb0e-4885208bf2c2	1	Other	Other
+822c2434-e905-4142-83fc-a380463e3de2	1	Other	Other
+822c83ad-9679-46c6-8324-ee7d2d58e3b5	1	Other	Other
+822cae24-1f95-4162-82fb-0e8cca0cd5ef	1	Other	Other
+822cc070-bd54-4266-8ea6-ef623df4fbcd	1	Other	Other
+822d41c4-0143-4a2b-a916-e4575755e584	1	James	Other
+822d66d6-6b98-49e2-a9de-2330a5737e53	1	Other	Other
+822dd5d8-b1bd-4d70-9c0b-3a2c398aae2d	1	Other	Other
+822e247a-2b0b-451d-959c-12d27ea6e42b	1	Other	Other
+822e9471-a08a-4034-acb3-033809180c83	1	Other	Other
+822ef18b-5578-4932-a14f-95ade0b320e5	1	Other	Other
+822f3907-9f0c-45b4-a6c2-705a1e86d905	1	Other	Other
+822f7e9e-16cc-4e1d-8e6f-3f5a49a886bf	1	Other	Other
+822fa32d-05bd-4f20-95f8-9e052268fdbf	1	Other	Other
+822fb90a-282c-4721-94a5-67d08d63c606	1	Other	Other
+82300a67-026e-42de-97ca-c134260b6269	1	Other	Other
+82303e21-1087-4797-b6a2-9e87f156e935	1	Other	Other
+823054d6-2c6a-42fa-9689-d168224f0d93	1	Other	Other
+823063fd-0ca7-4a0c-9349-32665ae10d5c	1	Other	Other
+82308e41-bd62-4658-83c3-13be6ac0c5a7	1	Other	Other
+8230a707-6b01-4abf-af87-de512737f9e7	1	Other	Other
+8230f3bd-a958-4b03-9854-ed9a48bbca1f	1	Other	Other
+8230f6c1-c421-4234-a02f-9e31787f76a7	1	Other	Other
+8231526e-e43b-4a8b-9e59-b076c1771251	1	Other	Other
+82315ac2-2bef-444f-aa1f-2945b8065007	1	Other	Other
+823233cf-4997-4421-9c99-21974eaab812	1	Other	Other
+82324c0c-c428-4fa3-af04-79875d431776	1	Other	Other
+823261a6-c3ec-47ae-9b9d-aa6131a58168	1	Other	Other
+82326b4e-b959-4359-baa3-83c5786846f6	1	Other	Other
+82327d4e-97f9-4a53-bc46-90b4480baaf7	1	Other	Other
+823353bb-b6bf-49aa-9cc0-5399199ae8c6	1	Other	Other
+8233c1e8-2363-4d89-b836-ab1dbd7e77c2	1	Other	Other
+8233fef0-d2a1-4592-9fef-8d265824c74e	1	Other	Other
+82343da4-e6eb-44f2-b6f8-70307f83a128	1	Other	Other
+82346093-cc6b-405a-9977-f7c51d566f33	1	Other	Other
+823470c2-ee1a-472a-9a65-5cae358fc892	1	Other	Other
+8234af3e-b29a-4604-bfbf-7da8472687f4	1	Other	Other
+8234fff8-8728-451f-864a-e01059aaedf5	1	Other	Other
+82351298-8ca2-45de-b36d-d2afb9bb3dd9	1	Other	Other
+82351f35-8a2a-41da-a142-30d0b31e0257	1	Other	Other
+82354b1f-ebe1-4d0f-b0be-e75fd3fc83c2	1	Other	Other
+82356112-edba-409f-86da-ecf64e0a8d2d	1	Other	Other
+8235696c-d322-47af-a35a-179af778b889	1	Other	Other
+8235cd93-28eb-4ca6-9ed2-43cfa8cb392c	1	Other	Other
+8235dd65-4867-4764-bfdb-c5f68c957821	1	James	Other
+8235f6ca-884f-40c7-98e6-30d6e24ef32c	1	Other	Other
+82362397-6e11-43e7-9b49-fb782481ff5d	1	Other	Other
+823623e4-e0eb-4ebc-a499-649bbcd4bcb3	1	Other	Other
+8236246b-734f-4ada-b377-afeb2d726dda	1	Other	Other
+82364eae-1481-4c1c-8fb7-01b548005069	1	Other	Other
+82365518-0d61-4171-9a55-b2b8beb2e3a0	1	Other	Other
+82365da4-07a7-4dd9-819b-b99a65bdac87	1	Other	Other
+82366b87-e019-4c8a-b7c2-1d2e760f7948	1	Other	Other
+8236837c-7bb7-4b89-ad6a-9e9cf9323cb0	1	Other	Other
+8236ac74-978d-45f8-878a-0b4679be96c5	1	Other	Other
+8236d805-1b06-4045-973a-ff30f2baf2ea	1	Other	Other
+8237864c-4eda-4cbc-a6ac-b3b5ac020be4	1	Other	Other
+8237c59d-09d1-4717-a170-9fd505cf5271	1	Other	Other
+8238036c-cad4-411c-9f5e-9d0d3dab75ca	1	\N	Other
+82381ba6-05b8-433d-9c8c-9579ff78e593	1	Other	Other
+8238344b-e042-42e2-a82e-592a7d26bea6	1	James	Other
+82386aab-447e-4387-b9f8-eb72423dde6b	1	Other	Other
+82390980-a0d3-4910-81b4-0086e85724e8	1	Other	Other
+823942bb-b47c-41db-b4fa-77e6f3eab10a	1	Other	Other
+82399803-469d-4ae3-a5b3-3bb0cb1e338d	1	Other	Other
+8239befb-7da8-4857-9955-483d84986ea9	1	Other	Other
+823a3603-d74b-42e5-bc37-768a766c3df9	1	Other	Other
+823a3e90-6104-4129-8926-763a421ada01	1	Other	Other
+823afef3-9cd3-486b-9ace-f26d891ebb41	1	\N	Other
+823b2a50-3d71-4dc8-b208-8e913ab9489c	1	Other	Other
+823b4e17-6884-412b-b572-1b15ac5c7b2e	1	Other	Other
+823b6a41-32bb-4217-950b-eab6ad986010	1	Other	Other
+823b7ff6-a6be-4b11-b803-78222de431bc	1	James	Other
+823cb0fd-cdf6-4478-a416-48565ae57e2d	1	Other	Other
+823d0290-a3d2-49ac-8579-34b1c1692eb3	1	Other	Other
+823d4d5d-a8ee-4f1e-8265-b6214cc544bd	1	Other	Other
+823d59b3-dd73-45e1-b04c-5ba8de67708e	1	Other	Other
+823dab8d-faf1-46f2-8db1-15b08384007c	1	Other	Other
+823e1c59-9081-48b4-bd72-725ee04c327b	1	Other	Other
+823e4f17-a364-4b18-a19b-22a94d5acde8	1	Other	Other
+823e8887-0c90-41d2-b9a4-ebd99699ac55	1	Other	Other
+823eb46c-356c-492d-8dea-63e008dc7e56	1	Other	Other
+823ed1b0-9b4c-4a78-9fc9-352378d30c2d	1	Other	Other
+823f0427-70b0-4ad8-9ead-d6eb878b5bef	1	Other	Other
+823f55eb-be3f-4c95-95b1-b629eb6cdfb2	1	Other	Other
+823f6ad3-933e-4058-b3f1-0fe61cedb6ae	1	Other	Other
+823f6d6b-f4b7-49a7-acb0-434983a7007a	1	Other	Other
+823f996a-957b-48fc-8038-41b2d2a84dde	1	Other	Other
+823fe7a4-4339-4972-a601-589c6e4a3869	1	Other	Other
+823fec30-7a35-4398-837a-7fffeb3917ad	1	Other	Other
+8240354d-6cd0-496a-872b-7fd63079d6c1	1	Other	Other
+8240e780-ce53-48bb-a811-4bda44be02ff	1	Other	Other
+8240fd63-c833-41ea-91e6-52229d9a1a3b	1	Other	Other
+82412765-eccf-437e-999b-1d8ddbf04554	1	Other	Other
+824133c3-c47e-4ec0-ae38-f99368fc720a	1	Other	Other
+82416210-32aa-4ec4-911f-c710c4fb4330	1	Other	Other
+82419073-dbac-4860-b1f0-95c616fe7f5b	1	Other	Other
+8241a013-ffa0-4664-9c0f-dfa122e2ce85	1	Other	Other
+8241bed6-5a38-4972-b8eb-3fe41527088e	1	Other	Other
+8241cf8f-f434-4aa7-b4ca-e909698a2ff4	1	Other	Other
+8241fe09-f261-48ea-98f8-901ba05011da	1	Other	Other
+8242a380-a60a-4e4b-ac84-05bdc324fc5a	1	Other	Other
+82432c61-f069-4d66-ac98-02ec70bd1fe3	1	Other	Other
+8243314f-a79e-4a8c-8628-8f28e346b62c	1	Other	Other
+82434762-0f75-445d-8013-f16674704cf2	1	Other	Other
+82434a38-3961-4e9c-bf24-78e568b4939d	1	Other	Other
+824367b9-b1e1-46a9-adf8-420ecdc3c99e	1	Other	Other
+82436ee8-c583-4384-adcb-8d5c17e22c2a	1	Other	Other
+82437159-ca72-48c5-9f13-7186b8b8d0b9	1	Other	Other
+82438388-3e13-4685-8093-33b0ef69fe49	1	Other	Other
+82438718-f047-468d-aebd-24611f7bc5fb	1	Other	Other
+8243c837-1152-4856-9190-fb3bda072cd5	1	Other	Other
+8243d8f9-4417-485b-987f-3e57ae2246bb	1	Other	Other
+82448033-99c5-4375-9e20-ff57d3f23bfe	1	Other	Other
+82449cfa-9c39-4073-8744-83565ba773c1	1	Other	Other
+824504ff-9e52-43f0-a79a-41f448c8de4c	1	Other	Other
+8245ea5d-7138-4a15-8004-354d4889cda8	1	Other	Other
+82460fec-daed-48ee-be6a-2851cd118c05	1	Other	Other
+82461b08-4c40-400a-ae3c-da460a08441e	1	Other	Other
+82461d3b-a187-41da-b13b-9d708e7a12a1	1	Other	Other
+824629d8-a9fd-4666-a6f9-48654dc589a0	1	Other	Other
+82464314-6200-434a-b1df-db102b55a8e2	1	Other	Other
+8246f688-0771-41a5-a631-8e50f90a3113	1	Other	Other
+82470acf-b82d-43f7-bc48-f97b030459cb	1	Other	Other
+82474be5-b7e0-4e8d-a7df-73e7f329d478	1	Other	Other
+82475eb0-5463-4399-a553-8387cd76a220	1	Other	Other
+82476695-c652-40c6-ae23-71a5a12fe2f8	1	Other	Other
+82477092-308f-42e9-9fd1-abd3a1bfc1b0	1	Other	Other
+8247fbbf-8407-4891-84d5-f00e3dc4b0a6	1	Other	Other
+82480e28-a03f-40dd-b3d5-6e426b6c9614	1	Other	Other
+82483ca4-7ee0-4065-94d4-ccb970860ac1	1	Other	Other
+824884d3-5241-4910-bf1a-be4d48765c78	1	Other	Other
+8248b06d-f8d4-46a2-8f0f-04f077054757	1	Other	Other
+82490478-4026-48e8-9ecb-0da1e3a04bb0	1	\N	Other
+824934bc-fa56-4b9a-af7b-a8bd8d4650ab	1	Other	Other
+82497e40-a12a-40cc-ba9c-6efde9f49fc0	1	Other	Other
+8249a0c3-90d3-4d87-891a-eafb16416641	1	Other	Other
+8249a5ce-9dca-4691-bf03-c1a39109199a	1	Other	Other
+8249cb5b-90a6-441e-a5c3-d71472c43597	1	Other	Other
+8249cc0c-eed7-43e9-ad71-275722b24ec6	1	Other	Other
+8249d29c-eaca-4b52-a6d2-13637e409f68	1	Other	Other
+8249de49-c4c9-4615-9fa0-b2909571fd15	1	Other	Other
+824a3eda-3a61-46ab-b28d-8d9d57f44098	1	Other	Other
+824a4e62-a3a9-4c1d-a49e-24fd62aa2653	1	Other	Other
+824a6220-45fe-411c-8963-e2ab6716a8f1	1	Other	Other
+824ac52a-8d41-475c-9864-14a07add0582	1	Other	Other
+824b749f-f0d3-4660-9f20-2d8da2dc56fd	1	Other	Other
+824c0edc-145d-4399-be16-97832b94e752	1	Other	Other
+824c26bd-a326-4049-8eb7-fe7edf9061ee	1	Other	Other
+824c3ab6-0fff-476c-9111-7e6d7cbf0ff7	1	Other	Other
+824c9c9b-d904-4f15-9b74-c29f7ba20d75	1	Other	Other
+824ccfe9-d30e-4dca-b657-24855cfa8b6b	1	Other	Other
+824d0306-77b5-4c29-8b51-fcdd4fd5bbd2	1	Other	Other
+824d1358-2bc7-4038-b2ae-b5809978f0e0	1	Other	Other
+824d5cc6-0841-411e-8a55-6d33e913084f	1	Other	Other
+824d7555-ac7b-4258-88bb-47f51ab0ed5c	1	Other	Other
+824d8a3c-3588-411e-be9a-08fbf96655bd	1	Other	Other
+824d92d8-628c-45cd-a391-2352c0b9a3e8	1	Other	Other
+824da7a1-3192-4a91-bfef-9552d040ccea	1	Other	Other
+824dcd8b-0c45-492d-9803-200ee6651123	1	Other	Other
+824e121d-493d-41c7-995e-ecf6f73af021	1	Other	Other
+824e5cbc-abb6-40df-8b1d-b3fd25703f51	1	Other	Other
+824e9157-f6f8-40c2-8b36-06d220bfa8ee	1	Other	Other
+824eb240-a528-4ef2-8152-4ffe1090f1ee	1	Other	Other
+824ed240-214d-4b4f-9a53-a846b7e86bb0	1	Other	Other
+824f10ed-361e-4c7b-ab48-ee191a69c669	1	Other	Other
+824f5406-3c27-4f9f-9c14-9786f7ec0a7c	1	Other	Other
+824f5ab4-2034-47dc-91ca-7fc1c45d9f61	1	Other	Other
+824f9d83-1abd-47e0-98dd-168b67b4393b	1	Other	Other
+824fbf43-b1d6-4a64-8f85-fbaad277bde4	1	Other	Other
+824fdf5b-7a7e-4040-8bb1-1272c98ad955	1	Other	Other
+82500f51-0305-4d23-8bd5-6db7e15cd463	1	\N	Other
+82505c89-8e09-48cf-8ad6-eec4f65b9a81	1	Other	Other
+8250a950-8daf-4755-9374-bec2e7331aa5	1	Other	Other
+8251297c-07f0-432d-bcf2-2cd2d948c69d	1	Other	Other
+82513500-73fc-40ca-9723-71205bc6fff3	1	Other	Other
+825153b9-eb77-4130-bc89-5f9696b25583	1	Other	Other
+825171a0-b6b4-4d89-af2f-413881075d9f	1	\N	Other
+8251dd35-4507-4f5c-bacd-f95c1b83d648	1	Other	Other
+8251fca7-d665-400c-ac19-88740757c46f	1	Other	Other
+82523ac3-3bce-4f2e-b5f5-0d38f73ff440	1	Other	Other
+82523b33-d729-40c4-a9b3-c97d8f8a7563	1	Other	Other
+825269fd-bdbf-491b-a99e-249da4aa7c96	1	Other	Other
+82529b10-5a31-4218-acc5-29b1591f34d9	1	Other	Other
+8252b51a-f12e-4424-ac83-2b7062a08faf	1	Other	Other
+8252cfea-c19d-41a0-a246-bead42b724d6	1	Other	Other
+8252e277-90d3-4ab1-8514-5b6e5dd7a2a9	1	Other	Other
+8252e3cb-2812-4cc9-8725-56c0fb1bf892	1	Other	Other
+8252e92c-3222-4301-b5e4-9be40807a31c	1	Other	Other
+8252f5ea-b770-4564-a982-4c3cad43f862	1	Other	Other
+825362b8-2000-4d12-9a75-08b893af9dc2	1	Other	Other
+8253865a-22e3-4ad2-815f-b8e371509ce0	1	Other	Other
+8253b196-d524-433c-8791-2220f5ab117d	1	Other	Other
+8253b197-43ab-4e3b-84cc-9a9d5aeae9e7	1	Other	Other
+8253c8e1-b3dd-42ba-8ec1-30c9273fff02	1	Other	Other
+8253e76d-4c09-4aa6-8c3b-c31fb0a1d855	1	Other	Other
+825456e0-a0c8-4e30-80ca-83e9e334200e	1	Other	Other
+8254923c-7f62-4f72-84c0-46d22c868232	1	Other	Other
+8254ab09-b12f-495e-a87c-e5369ee4fa0c	1	Other	Other
+82550219-cb40-4549-b9d2-5c49297c6505	1	Other	Other
+82553d07-9451-428b-afd7-3b21af7236e7	1	Other	Other
+8255402e-8e16-48d6-a1e4-f12ab94c40b4	1	Other	Other
+8255940f-89db-4ea1-bda4-c1b63121df50	1	Other	Other
+82562638-ee60-4955-8225-f8fc4c00eb81	1	Other	Other
+82562998-81cf-4037-93d7-4076beb55dba	1	Other	Other
+8256aa9a-aa45-4642-902a-c1dc6e8cc987	1	Other	Other
+8256d124-17d0-4492-9427-d48993acba4e	1	Other	Other
+82575bab-ea6a-4dbf-9bbb-dc96959f482a	1	Other	Other
+825778a1-8189-4d91-8c29-92cef6b4d76e	1	\N	Other
+8257b8b8-90a8-4b86-94c9-1898c8ec984c	1	Other	Other
+8257c7e1-998f-4658-ad88-f970915f699e	1	Other	Other
+8257f17c-22c2-4964-a846-2585ffdf8106	1	Other	Other
+8257fc79-fed7-4ba6-af14-b606e8d0739b	1	Other	Other
+82584f05-700b-48e3-b4e8-e0b56ed5f13c	1	Other	Other
+8258a80e-44af-47da-89ad-1d044c69380c	1	Other	Other
+8258aaad-d942-4c14-a0ec-7684b6f39129	1	Other	Other
+8258c0b2-722a-4323-a705-7bf1802f870b	1	Other	Other
+82591852-91ad-494f-836d-4c4868cacaa4	1	Other	Other
+82595df9-6dd5-4a51-bd13-f26947ffc924	1	Other	Other
+8259dad8-4663-4916-a41c-39a4f87cf1e6	1	Other	Other
+825a02cc-d456-4574-b850-7f7defa9fe55	1	Other	Other
+825a07c3-f46a-4d98-a15a-30c81bf42c22	1	Other	Other
+825a3081-6bd2-48df-b35b-33a46935444b	1	Other	Other
+825a4fd7-fe59-4a4a-b7ae-b50775b77029	1	Other	Other
+825a7d00-fe22-428f-b98e-ec76e051c332	1	Other	Other
+825aba2a-039e-4a3f-9f02-2c53d58417e0	1	Other	Other
+825b12ed-f871-4a42-9a0b-ebf784dffdf0	1	Other	Other
+825b14e6-343f-4ca6-ba35-b3a58f388240	1	Other	Other
+825b1cdd-e800-4f35-b3aa-093bd42dada6	1	Other	Other
+825b2cb4-4f2b-4568-bcce-418aa53b5845	1	Other	Other
+825b5409-9f7a-460b-abc1-f7e1fe635634	1	Other	Other
+825b9344-1f40-43ce-9911-c204d91f5c93	1	Other	Other
+825bdb61-056e-4e09-bd86-834f9b60dff7	1	Other	Other
+825c2eff-9851-47e5-a77f-7de3fc61350c	1	Other	Other
+825c30ae-804d-485c-b8e0-4bca8e123de6	1	Other	Other
+825c3bdf-990a-4c68-a113-bd4bbb8a03f8	1	Other	Other
+825c4810-f929-4cd5-bffd-2a113c01f5ae	1	Other	Other
+825c5955-abe0-48a4-bde5-6e064a7eac12	1	Other	Other
+825d1ef1-5071-4368-aa83-130ea3045e53	1	Other	Other
+825d293a-7982-42f7-9ce0-ff7a0be69aee	1	Other	Other
+825d4385-b10c-432d-a276-0932f03d2283	1	Other	Other
+825d4bbe-c3ff-4add-bd48-f843018e88c3	1	Other	Other
+825d4ee1-3309-46a9-8a44-74d4cf7fbcc9	1	James	Other
+825d93d3-8a1f-4315-8547-8a2d5ff7443f	1	Other	Other
+825dc2ca-70d4-47b2-9bfd-fe9365a1eab5	1	Other	Other
+825df197-db7d-4112-8b5a-ec424d0f7d26	1	Other	Other
+825e13a9-63f5-47f0-9cfd-b60cd4008764	1	Other	Other
+825e5425-d3df-4d4c-9191-f1edcc8fcff9	1	Other	Other
+825e5696-989e-417c-a825-3564ff4dee56	1	Other	Other
+825f1b4c-6eda-4005-ba37-d4aa6eedd138	1	Other	Other
+825f2080-5b86-416e-840d-fae9830160a7	1	James	Other
+825f3237-c45b-409d-96ca-4974b1dbc9bc	1	Other	Other
+825f5e78-1a7d-47e3-b622-e8d16ce8eefc	1	Other	Other
+825f9458-421a-46de-8986-feee5ba37913	1	Other	Other
+825f9720-face-45f7-a65b-71b9c76f429c	1	Other	Other
+825fc327-9a5c-481c-839d-2a5fc110df8a	1	Other	Other
+825fd801-73f4-431a-863f-a6113ae2a8c3	1	Other	Other
+825fe4f0-0881-4d43-80c0-dd39336cbf28	1	Other	Other
+82600e80-5b0f-487a-988c-8c396ff348a5	1	Other	Other
+826096f6-3a41-42e2-8d67-e419b70fe278	1	Other	Other
+8260afe7-ec09-447b-9168-b6a1caf2a62f	1	Other	Other
+8260f311-e929-4309-82ca-b21a69278fc6	1	Other	Other
+82610050-81b8-4649-b83d-c937eec43d11	1	Other	Other
+826199e3-8e5c-417f-af72-682c0eaefc8d	1	Other	Other
+8261b067-ab16-40c6-a554-a48618bbf72f	1	Other	Other
+8261ea12-340c-4586-9cfc-1ccb0d72011c	1	Other	Other
+8261eb57-cfa1-4da4-b8e8-2d1569b4057d	1	Other	Other
+82621b78-82c6-4d2e-a44d-ee73b36da392	1	Other	Other
+826230cc-3f6b-48a3-995e-e70f6b91e78e	1	Other	Other
+82624243-bfff-46e8-8dfb-f36f974b6266	1	Other	Other
+82624340-0b93-40ad-925d-4cd28ad24684	1	Other	Other
+8262435a-0584-4b2d-b889-6488fc1a6867	1	Other	Other
+8262646f-3809-4f80-84e1-ce210ddb5b4d	1	Other	Other
+8262949d-5898-4f71-b5a5-20ffdca8582a	1	Other	Other
+8262b68f-aafd-4750-b7b1-b20d131fcdfc	1	Other	Other
+8262ba20-cd55-44f4-bdfd-dcae1c6754d9	1	Other	Other
+8262e22c-c09f-4ad7-a697-19e68f5b9d4e	1	\N	Other
+82632a31-dbdb-4cb4-9f73-98f03b723044	1	Other	Other
+82634998-3dad-4149-8b15-283f2a9b4573	1	Other	Other
+82635495-f548-49b3-8cb1-c4ffae52f4f7	1	Other	Other
+82636ebf-89a7-46a8-948f-116f3bc4e240	1	Other	Other
+8263a909-0a20-4e87-a43c-c2d05382f3f5	1	Other	Other
+8263b9f1-d939-450d-9de5-5d35441c7f64	1	Other	Other
+8263d7ab-19f2-46d2-9688-07f05a2b8875	1	Other	Other
+82646217-5726-42cf-acea-3ee4278e2813	1	Other	Other
+82647c4f-da28-4ffd-a009-3e8789012dc3	1	Other	Other
+82649bae-0d74-4d0c-8f5b-6c4bc317e757	1	Other	Other
+8264ad82-0ab4-488c-99c7-e1bf39f38363	1	Other	Other
+8264d888-791c-4000-9cff-d3cee0f2aada	1	Other	Other
+8264daac-7559-4146-9b35-da1689ab5fe2	1	Other	Other
+82658ae9-ee29-4beb-8ecd-00db9cd93259	1	Other	Other
+8265de4f-962f-4003-a513-ac6d4297ae01	1	Other	Other
+8265e603-1f00-4ea6-b70a-65620434303e	1	James	Other
+8265f77e-8b19-4944-afa5-59e64733e617	1	Other	Other
+82661a66-7da9-4558-b70c-922b2f9b6d46	1	\N	Other
+82662c14-1230-47df-833c-4487bf5d3a7e	1	James	Other
+826635a9-8bc4-40ae-b80d-41401bb5438f	1	Other	Other
+82663b03-e659-4b74-8942-2dabea79218f	1	Other	Other
+8266c9ff-bb98-4942-a832-320c52433746	1	Other	Other
+8266d337-e9ea-42f6-afaf-c4699cac7d51	1	Other	Other
+8266d67e-c245-44bb-a922-7106867cb83e	1	Other	Other
+826768dc-721d-4105-87d7-44506318250c	1	Other	Other
+826770f9-ab17-4953-bb3d-009915b14303	1	Other	Other
+826790ed-235e-4c28-9f4b-389c494244cc	1	Other	Other
+82679643-4d7e-49c8-8c82-5ca16736f3ac	1	Other	Other
+8267bc76-b47f-474c-b7b2-add39b4e3eb2	1	Other	Other
+8267c906-3dd0-49fb-8763-de463085fa26	1	Other	Other
+8267e713-026f-46e0-bf15-eff55f6f4076	1	Other	Other
+8267ffb4-7db0-4f00-8abe-e2586356290b	1	Other	Other
+82680008-317c-4259-b12b-c20a9c0ba27c	1	Other	Other
+826876ce-dfe9-4927-867f-773e6ed8fc2b	1	Other	Other
+826899bd-ed1a-42af-8cd9-522f3f0d67b6	1	Other	Other
+82689d0d-0ce2-4d98-9318-f60f7a41b252	1	Other	Other
+8268a7ed-d992-41b1-a23c-a7bf6c85813a	1	Other	Other
+8268bc16-16da-4fef-a574-86f386db9714	1	Other	Other
+8268c264-c360-4d16-ac9a-8b97e0b7fe9c	1	Other	Other
+8268c704-d054-4408-85ac-500b17bc12e2	1	Other	Other
+8268ce12-cc01-4a57-9e64-63181f261f8f	1	Other	Other
+8268d6e1-2c28-4add-9a7f-bb65c02a17fc	1	Other	Other
+82693fa5-72da-4079-9afa-9000b3a5494c	1	Other	Other
+82695a45-351b-4a19-a8ca-3cce9c4a28ed	1	\N	Other
+8269b372-ede3-4898-9e78-73d63ee04155	1	Other	Other
+8269c807-9565-48dc-a544-1cfebe55eefe	1	Other	Other
+826a0c59-1221-4d1c-b4db-82818f0be724	1	Other	Other
+826a3b01-f19d-47b6-8142-69e4ac63c01a	1	Other	Other
+826a488f-ec17-42ff-acdc-94bcf4bb586d	1	Other	Other
+826a59f3-e548-47e1-baef-5d25dc54377f	1	\N	Other
+826a62a5-9880-49b8-806b-2b45139c607f	1	Other	Other
+826a878f-8e77-4aec-9419-50d51a44b4f5	1	Other	Other
+826ab18f-b915-4781-831a-483b1e6a99cd	1	Other	Other
+826ae190-7ade-4d95-98a8-b390e39ef4d0	1	Other	Other
+826b28b1-8d53-4139-ad34-8d49902104aa	1	Other	Other
+826b57f3-5af4-4c33-a583-4417c7e90602	1	Other	Other
+826b66cb-9c19-4064-8f1d-f9d7e2542597	1	Other	Other
+826b8120-1795-4054-8a26-a9e843da0139	1	Other	Other
+826b87c6-0fc6-4e6a-aca5-ccd4d6f773f9	1	Other	Other
+826b8990-37ec-46dd-991d-d0a59902d4b2	1	Other	Other
+826bb2af-2ea3-466f-9a48-886d6f4eed04	1	Other	Other
+826be4b5-9cf7-4387-9f70-438e8ce2a1f5	1	Other	Other
+826c1b76-fca8-437c-a887-1c84b2b55282	1	Other	Other
+826c7555-aa02-4e0b-823c-11dedec7fa29	1	Other	Other
+826c802d-3beb-401f-a7cd-afd7583c8a37	1	Other	Other
+826ca9c4-8f75-4961-ad1e-0529c268fb0f	1	Other	Other
+826d43a5-40a1-453a-9476-c9e0c248fcfe	1	Other	Other
+826d5b3b-3b36-4c0f-8dd2-92152e31fc8d	1	Other	Other
+826d6ac0-a0b8-4c0a-86da-421db8b56adc	1	Other	Other
+826dfd3d-a7f1-48f8-a755-c0262f694bc1	1	Other	Other
+826e1599-8fa8-4f81-bd94-23258dfc9e6e	1	Other	Other
+826e2a25-c21d-4680-a045-8b539794e93c	1	Other	Other
+826e6386-5844-40d9-bd85-d5b056dffe8c	1	Other	Other
+826e7a10-473f-4d7f-8144-469a80aa62a5	1	Other	Other
+826ee8de-e684-48fa-93ca-cef3eb5c2e97	1	\N	Other
+826f0ab0-1822-471b-881f-48be7d6d0691	1	Other	Other
+826f1bb2-92db-4fa9-b72e-85ec5df91384	1	Other	Other
+826f2121-3296-4214-ad97-1140f1102c29	1	Other	Other
+826f330c-5055-4959-9fcc-e072c4bf8271	1	Other	Other
+826f6e21-41bf-4023-8f4c-065018330b6a	1	Other	Other
+826f79f6-caf9-429a-b688-bf414047ddbe	1	Other	Other
+826fd4f7-9238-4b48-810b-74ea6eccdacc	1	Other	Other
+826ffce2-df29-47bf-98d0-1b34adaa3375	1	Other	Other
+82706837-71a8-495b-9e07-edc546ada4bf	1	Other	Other
+8270808f-0d70-4840-9b90-38407b178031	1	\N	Other
+82709a6d-fbd5-411e-a41b-ce80c1d69657	1	Other	Other
+8270b13f-aa73-4766-8964-f55eabbf6877	1	Other	Other
+8271032b-d534-40c2-a4a1-5fe407969a5e	1	Other	Other
+82711144-5490-4d68-8ec7-c189b54c45c9	1	Other	Other
+82716bbc-37b4-4067-80e7-33907d15ec1b	1	Other	Other
+82719d5a-fe5c-498c-a2d8-06b0d45e0491	1	Other	Other
+8271bc4d-d460-4db7-8cd5-609771ebc62b	1	Other	Other
+82726d3e-adb8-4b12-852a-e2512f4d5f9e	1	Other	Other
+8272bcc5-71f9-4e40-ac3f-7c7d7b37d7f9	1	Other	Other
+8272c570-7a67-4a8c-9ba1-09a71b040fd8	1	Other	Other
+8272c7d1-edc9-4cb9-b3e8-9b64e34fdbf0	1	Other	Other
+8272f7ae-2293-4006-81eb-dadffae69296	1	Other	Other
+82730b97-879d-4289-b744-6e3935cacea6	1	Other	Other
+827342a1-44dd-46c1-9831-47b73816db01	1	Other	Other
+8273474f-9391-4136-80f3-870ad268bda4	1	Other	Other
+8273884f-89d6-4c8a-b2a6-a1b51f71df30	1	Other	Other
+8273aab0-7893-4f89-bdcc-a31656cb7e40	1	Other	Other
+8273b670-a29c-499a-aa54-ec99bc3b773e	1	Other	Other
+8274524f-27bc-4078-bab0-dd1baa33a27f	1	Other	Other
+82745b0a-bfaa-4cf1-aab8-4dbe13843aa3	1	Other	Other
+82748084-ac72-4abf-90e4-21f413f78039	1	Other	Other
+827496e7-74d7-4220-b229-a49d83c02dc1	1	Other	Other
+8274b071-4202-4fd8-993f-9a04e9d238ee	1	Other	Other
+8274eebe-ab16-43ea-8aab-4613578f9043	1	Other	Other
+827519a8-b837-4383-bef9-3877929d280d	1	Other	Other
+82751d55-0761-45e3-89c9-ed58a98604a3	1	Other	Other
+8275647e-e540-4f20-a9c2-917827c87e5a	1	Other	Other
+82757d9f-e7cf-49ab-bf5a-a3fdb1a5962f	1	Other	Other
+8275998d-56e0-4914-b63a-4ccd2ab8769e	1	Other	Other
+8275c08a-abde-42ad-baa6-12134ef25d78	1	Other	Other
+82761cad-d04d-4bc3-94a2-6b238ccb4b23	1	Other	Other
+82762704-8dea-4a39-85e4-1a5518995177	1	Other	Other
+8276405f-bc07-4973-a0d7-14a039698533	1	Other	Other
+827667af-7d68-4e8e-ab51-7d9ce80c23cf	1	Other	Other
+8276a093-25ef-43f7-b0b4-c6d73ed179e7	1	Other	Other
+8276d4cb-4e4e-428d-b9f5-fe2078ca7db7	1	Other	Other
+8276ff63-9979-4090-a1ee-06d869dd3d33	1	Other	Other
+82772f92-2d5e-4120-9ac1-fbeed82246ff	1	Other	Other
+8277a1fa-c33c-40ec-95ce-64e1bcef1fa7	1	\N	Other
+8277a455-ceb5-40a4-8aaf-30a809a137bc	1	Other	Other
+8277a61f-0bde-4533-84b1-0afd97a25540	1	Other	Other
+8277c7ce-6037-4209-a61f-276ec277c634	1	Other	Other
+82782566-0b87-4820-b2d0-af6abfc78512	1	Other	Other
+827849f3-a699-4275-96e2-ef03f2ec57e1	1	Other	Other
+82787cda-48b0-4cdf-981e-3ff049f4e744	1	Other	Other
+8278a603-8f38-465b-8fec-a2c1768f5413	1	Other	Other
+8278b022-cdd9-4fa0-8189-881b2c1d129b	1	Other	Other
+8279a603-a225-48d1-9a30-3580092e978f	1	Other	Other
+827a020d-bcf1-4703-8077-a9b20b43bc38	1	Other	Other
+827a22a7-6275-4152-8f36-ba1bb098ff45	1	Other	Other
+827a49fc-e4cf-4029-829d-2d62c6a1d1a5	1	\N	Other
+827a6e44-f7e3-4f8f-adf9-efac56603d44	1	Other	Other
+827a872a-01cd-49a0-a025-5c6d49eb3f4b	1	Other	Other
+827acaaa-7e4d-4724-a129-0cff4320800c	1	Other	Other
+827aef59-e0ba-4834-8abd-b35fb15a47e1	1	Other	Other
+827b23ea-3401-4f0f-bfc1-8c92b44f8f99	1	Other	Other
+827b2b04-3fa8-455c-8a56-e48da8fc69ee	1	Other	Other
+827b8b78-f872-4744-85f0-95ec26441c49	1	Other	Other
+827c0c7b-582d-45e8-a9aa-8fa2212fbede	1	Other	Other
+827cda18-422d-4e1c-809a-43e39d8b83cc	1	Other	Other
+827d13af-d290-43e7-b84b-dc222f976b09	1	Other	Other
+827d13db-e15d-4996-aa3b-f678e5e437de	1	Other	Other
+827d7cef-7f9d-4f60-9dce-19ef05e0a369	1	Other	Other
+827ddde9-42d0-4dcf-acb0-6cd67d995c98	1	Other	Other
+827df5a6-3a05-41e8-8c60-cdf433a86376	1	Other	Other
+827dfdd0-7ccc-48a0-95d0-3155d4b91a50	1	\N	Other
+827e220c-f5cf-4c41-a55d-f38d5b4b23b7	1	Other	Other
+827e310c-4ee3-4d8f-aa6d-51946b97857c	1	Other	Other
+827e3d70-0c9a-4e2f-ad5a-d474a8b200a4	1	Other	Other
+827e4e56-59cc-4153-83a9-2969c32e4f52	1	Other	Other
+827e8212-c7bd-4c6a-bbc8-0da00fd6f22a	1	Other	Other
+827e98fb-6a60-4273-b3eb-5aaedee25b02	1	Other	Other
+827e9cba-27f4-4416-86db-794b313aa98f	1	Other	Other
+827ea431-eeb6-435e-a518-d372ce1972bd	1	Other	Other
+827eb742-1acb-4270-be98-8949d0be76f2	1	Other	Other
+827f31a8-4386-4245-8c8e-1376eb6d9dc4	1	Other	Other
+827f690c-e7d1-4ca3-be54-1f42a174037d	1	Other	Other
+827f7b78-17a2-4f00-a9ce-54128f782518	1	Other	Other
+827f988c-d294-4e20-90dc-2db7f2d5a12e	1	Other	Other
+8280594e-06e1-4016-a16e-ef5ef2572f53	1	Other	Other
+8280667e-7223-4cc0-8058-a781c07b16e6	1	Other	Other
+828087bd-4743-4999-a67d-2d46a5b3e62f	1	Other	Other
+8280a74c-7cdc-419f-8f73-6cf04e81fe23	1	Other	Other
+8280d9ea-7598-49cf-9793-0a764ba3b61b	1	James	Other
+8280eb1b-210d-4979-a2d0-87c86dd93036	1	\N	Other
+8281191a-c1b3-4d54-8cdc-add2ee33c50e	1	Other	Other
+82812295-365e-4d08-88bb-3e28024d12bd	1	Other	Other
+82812d5d-d385-46e8-8025-9545ca4a0b9e	1	Other	Other
+828130b0-1343-4a10-981e-2173b7b86281	1	Other	Other
+82813d8d-aebe-4ae8-9ffb-1ee037db4c20	1	Other	Other
+828160db-e9a2-457a-a3eb-660fedd31d2b	1	Other	Other
+82819c1e-f058-4b7e-b033-13b372247d7f	1	Other	Other
+82821a15-0780-4e7e-b734-c648837911c3	1	\N	Other
+82822357-0856-45f8-84e8-fca2bfc67d2b	1	Other	Other
+828289a3-b346-42f7-a956-db0d3daf894c	1	James	Other
+82828a27-b32f-4141-a4c4-770344a56c83	1	Other	Other
+8282993c-112f-470e-8e74-0e23b836125a	1	Other	Other
+82830b78-c114-4688-881e-cb394485137b	1	Other	Other
+82832a55-0bb3-4502-be3d-108a6e4a4161	1	Other	Other
+82834942-2f9c-435c-aaf1-d6271ca2624d	1	Other	Other
+8283821f-8196-4a3e-bef5-f74234afc9b6	1	Other	Other
+8283f1cf-d58a-4faa-a12b-689bd962e5d4	1	\N	Other
+82844095-a853-412f-b2f2-5d9489e9ccdd	1	Other	Other
+8284a24d-7610-41a4-b7a9-45561a8a691d	1	Other	Other
+8284d29e-6965-4159-a4d6-872ed7c98478	1	Other	Other
+8284d542-f03d-40b1-82c1-87536b14dc29	1	Other	Other
+8284da72-5ea4-42fe-97cc-faef6560069e	1	Other	Other
+8284e01e-2ad4-4cbd-8af1-f7a209b2f317	1	Other	Other
+8285287a-acc3-4663-bd66-404526d43d44	1	Other	Other
+82853402-7bb6-4edf-9c74-a9a805a9d80f	1	Other	Other
+82854987-7e89-4998-9a79-729d8f68d67e	1	Other	Other
+828557a5-0a6a-489a-91ad-74cfbe07a00d	1	Other	Other
+82859711-b521-4b34-bcb6-69f9a8e5275b	1	Other	Other
+8285fcfd-dcd6-4fd8-8898-604bf527a66f	1	Other	Other
+82860460-1c4b-4cc6-aab5-79a7b8233654	1	Other	Other
+82860cb4-ff86-47ca-8922-de3086b11387	1	Other	Other
+82862b1b-1dde-4492-a4a6-ef0a95ec9d41	1	Other	Other
+8286446f-c640-4b0a-b5a2-5728888de6bf	1	Other	Other
+82864d3b-7717-436f-b194-eff3c0061986	1	Other	Other
+82865bcf-4ddf-43ce-aa1d-fb9c78212106	1	Other	Other
+82866e54-e0a8-4c5e-84d5-c81ce61429b8	1	Other	Other
+8286926c-6ef1-4a46-bdf6-7714f69a8795	1	\N	Other
+82869fb4-a040-47c8-9cf6-9067c8a1d48a	1	Other	Other
+8286c8ba-2a8c-4aba-9609-be0ab1c3f1a6	1	Other	Other
+82872bbf-a884-4eeb-bcb2-490abeb22cc0	1	\N	Other
+8287460b-bc7f-4552-b8e4-cf4c6f8ffe54	1	Other	Other
+8287e088-7113-4021-800d-0342cfb2ac04	1	Other	Other
+82882f3e-308c-429a-82c8-a76e59ec7c08	1	Other	Other
+828840c4-2e9e-44f4-a189-dc8547ed989d	1	Other	Other
+82887605-cf1b-4edd-b9ff-12c79a89b69c	1	Other	Other
+82888375-ca5b-45d6-ae37-d690c5fb16b9	1	Other	Other
+8288b7b7-6752-4948-9c22-e85d80016c52	1	Other	Other
+8288c82b-30e2-41ee-a9db-b9d850a95580	1	Other	Other
+8288dc8c-94af-4f90-963e-c745c4d2eff7	1	Other	Other
+8288f444-4c07-424e-8193-842f35f2cbd2	1	Other	Other
+8289310c-d972-473d-ac0a-83543b8ae756	1	Other	Other
+82894dea-2477-43ef-a363-1b736b036f66	1	\N	Other
+828981f2-dec6-43f1-9d60-5e7b45a1bed7	1	Other	Other
+828a5d09-2071-41a5-b47c-d3b51d7391ba	1	Other	Other
+828ad87e-4181-4ed2-97eb-42ed33ee388d	1	Other	Other
+828af2ae-12ce-478c-842b-d101e8d6f99d	1	Other	Other
+828af87c-faf9-4824-8271-c6c1bbf67645	1	Other	Other
+828b403f-0b74-4ba7-9c19-f81a82571257	1	Other	Other
+828b5582-c6e2-496c-9e83-c755503942d4	1	Other	Other
+828b6693-6cd4-43ff-8443-e8e811311b5b	1	Other	Other
+828b92e2-ed24-46e0-8145-f20d86c238de	1	Other	Other
+828ba9c0-5934-4980-9bcf-62c8c80280de	1	\N	Other
+828bd1ec-92d3-47cc-855f-ae8d0e6cb9b9	1	Other	Other
+828bf0a0-a704-4c51-ba85-951d32a4bbfc	1	\N	Other
+828c158a-636a-4754-a2da-9184917029a9	1	Other	Other
+828c6e91-946b-4f40-8f30-c7b13dcfe2a8	1	Other	Other
+828c9885-3d18-4a3f-86e8-2598911e1e34	1	James	Other
+828d2336-1f61-4472-af11-0447c53ce3d8	1	Other	Other
+828d483c-2b9c-4924-a492-5a23510f4bad	1	Other	Other
+828e0706-b30f-426b-bd1a-61d338a320fd	1	Other	Other
+828e3e30-83ee-4a1c-818f-8c2a81af1af1	1	Other	Other
+828e453a-d756-457c-b889-3528e5d30b4f	1	Other	Other
+828e5d8f-9117-4b7f-a4f9-b5915f078aa3	1	Other	Other
+828e750f-f321-40ae-a65b-861f145f6ac3	1	Other	Other
+828ec16b-54c0-4134-8005-81efb4f80fe7	1	Other	Other
+828f33b4-cb16-4f16-bd1e-7d7c32310c78	1	Other	Other
+828f5b4e-41eb-45db-babc-377326158b3e	1	Other	Other
+828f80f9-4358-435b-a4fa-96461d319ed6	1	Other	Other
+828fdd5c-c2fe-4547-8fc2-e4f05a0953c7	1	Other	Other
+828fde84-a8a2-454e-a94a-3ed0b2ff035a	1	Other	Other
+828ff883-0dbf-46f6-a0d7-4364c52d48a8	1	Other	Other
+82902487-3dc2-4f0c-ac2c-df615a342654	1	Other	Other
+829038ef-17a6-4237-a651-5df748bedd44	1	Other	Other
+8290757e-9328-47c1-918b-a5b572deeba3	1	Other	Other
+82908360-0705-4d85-b23a-36c2960eeb5d	1	Other	Other
+8290c439-474d-492c-948f-d36b32e4aeaf	1	Other	Other
+8290c742-ebdb-4626-8ee8-4a0a30f72729	1	Other	Other
+82915061-ed7e-45af-b500-3d05a40b53ce	1	Other	Other
+82915176-6420-48f2-9c04-8c9a65f86143	1	Other	Other
+82915eea-ee4c-4d51-b670-8f500a8566bf	1	Other	Other
+82917d81-71da-4bb2-95ae-fdc9e43364e0	1	Other	Other
+8291cce1-2a4d-4fb9-a287-ab1ff4a2d6e4	1	\N	Other
+82923c68-5f24-485f-88d2-dd8e14b857af	1	Other	Other
+829250c9-cae9-4919-9a8f-57245ca685fe	1	Other	Other
+829255f7-e087-41c0-a1fd-c7990b4a37ca	1	\N	Other
+82926224-e30e-4f6b-8119-6321e05dda10	1	Other	Other
+82927820-e67b-4abc-a739-8127e11c1c9e	1	Other	Other
+82927afd-269b-45b1-b7a0-f0948a846361	1	\N	Other
+82932d9e-1d07-45a6-a687-15df494945a0	1	Other	Other
+82938bf4-c897-4dfd-a56b-cae009d8afa0	1	Other	Other
+8293ab98-d898-414a-9a8a-a6b5841ae5f9	1	Other	Other
+8293b43c-1987-4b41-9a3a-c0e690bb71c4	1	Other	Other
+8294cb94-93f7-4a00-bb9e-8f03453426a1	1	Other	Other
+8294f1f6-cd35-4e65-a56a-5977ce37f155	1	Other	Other
+82953ce0-f711-49dc-ab70-54323de3d362	1	Other	Other
+82955ab3-cae5-4795-b41b-9873dd46d5c2	1	Other	Other
+8295d900-2a91-447c-84ad-2b67ae2d554f	1	Other	Other
+8295da7b-dc9e-4f87-b378-92f56d60e065	1	Other	Other
+82960ff2-5689-4cf0-97c2-d93b9def1157	1	Other	Other
+82962235-2b9d-4882-87d6-9e3d0f66df87	1	Other	Other
+829650a6-f8c5-4cef-8e14-2503c8b6cd31	1	Other	Other
+829658ed-c65e-4bf7-837a-f6a9adc519d1	1	Other	Other
+82967e65-d458-4681-ac75-60fedb4f1187	1	Other	Other
+829680dd-e580-4dcf-9e74-40d5976e2d1f	1	Other	Other
+8296b6bf-a1ad-4f59-8b6a-3dce36c2a775	1	Other	Other
+829708c7-3d57-4e2f-a67f-9753fc3d2ed8	1	James	Other
+8297205e-8927-430a-8db3-3fc09a8309ed	1	Other	Other
+82975b89-6d20-4e3a-846a-de78e7c6dcc5	1	Other	Other
+82979c8c-5b1d-4b54-92c8-e688f4eb44de	1	Other	Other
+8297d904-0f10-4c7f-a858-15205f8923a3	1	Other	Other
+8297ee5a-ead8-4183-9af6-1909ab00bcac	1	Other	Other
+82982457-1673-40dd-be11-4085938d6e2d	1	\N	Other
+82984818-add1-45cb-9bc4-24eb02112c61	1	Other	Other
+8298958e-e5fe-4702-bd3a-52b1e3260856	1	\N	Other
+82989968-0f47-4f99-a24c-155bba6a3d7d	1	Other	Other
+8298f14d-6e68-491d-8a4d-eeb83390600c	1	Other	Other
+82990cc9-4c9c-433b-ac4f-68cb5947fa74	1	Other	Other
+82990d93-0d94-4739-9bf3-8b76df24fbff	1	Other	Other
+829943dc-2716-4b96-bff6-f09bbc5dc751	1	Other	Other
+82994464-92c9-4eb7-bf5d-3860f511d81c	1	Other	Other
+8299a1ce-ce3b-4054-88c1-02fe85f8a668	1	Other	Other
+8299d4e4-d06c-4023-aafb-d5217ab852fe	1	Other	Other
+8299dd53-7f44-4238-b118-c21873ed339e	1	Other	Other
+8299e125-2dc6-47ce-8944-a1326ece9e15	1	Other	Other
+8299fe78-d26c-4601-bf70-6781f9236a17	1	Other	Other
+829a0716-22aa-4ec9-bd11-8665d12e6f89	1	Other	Other
+829ae8f1-aeb1-43c5-a03b-a7d4d887443d	1	Other	Other
+829aea3c-3759-4070-a69b-17e33956e5b3	1	Other	Other
+829b5f18-a3dd-4e7f-b188-67e6ae22f61b	1	Other	Other
+829b6d5d-0c10-4abc-8a0a-6b8adc0a8766	1	Other	Other
+829b830a-3164-4ba5-b4f0-d038cd122e8b	1	Other	Other
+829b8531-6c09-4498-bbe9-07e9baad7c8e	1	Other	Other
+829bb667-9979-4329-a2fb-b0ee76c37c68	1	Other	Other
+829bc4ae-0e0b-4e04-9ee1-8a9e3b17168b	1	Other	Other
+829bd0e8-6068-4918-90c7-99a0549cef5c	1	Other	Other
+829bda7d-01fd-4bfa-95a5-7e852169cf1b	1	Other	Other
+829bffc6-174e-4404-8e24-00420a804082	1	Other	Other
+829c010a-877b-40b3-b57d-b34d878ffd64	1	Other	Other
+829c27df-923a-4a87-9d8f-b752fc8452c2	1	Other	Other
+829c64a7-da0c-440f-b958-46b59e97b52a	1	Other	Other
+829c6bc5-dbfb-46a9-bf75-21adf1490bec	1	Other	Other
+829c90de-51df-4e86-9e43-0231e2d0eef6	1	Other	Other
+829cb619-0689-4599-a5b6-7f50f74756be	1	Other	Other
+829cb667-3d02-43a8-bf0e-8530870d12e7	1	Other	Other
+829cb673-7b96-463f-aaaa-57ed0da246c7	1	Other	Other
+829cbf47-3901-46aa-b994-a18153b2dfbe	1	Other	Other
+829d0650-7549-4e40-9818-1df1499d4e28	1	Other	Other
+829d3cb5-8380-49ea-8194-90bceb49ec51	1	Other	Other
+829d9c2e-872f-4094-b74e-4274c1dc4f53	1	Other	Other
+829dae7f-f53a-4a6a-9a0f-0de711df0f87	1	Other	Other
+829db8ed-4e97-430f-b5c7-c67f919d948c	1	Other	Other
+829dffb1-89a5-48cd-8367-2048a2a98c6b	1	Other	Other
+829e2db2-b3c5-4019-85df-0ce757ed6f08	1	Other	Other
+829e560b-5918-4bfa-822c-428f6b86654e	1	Other	Other
+829ef0b1-7bdf-4a52-92c8-e951f3cc0609	1	Other	Other
+829efb45-1d64-46a8-b85d-3f78f59fbfa5	1	Other	Other
+829f10e3-ac26-4ed3-a389-11788d1d2d43	1	\N	Other
+829f2e2f-5ed3-437f-ac70-7a77652b2a33	1	Other	Other
+829f4e81-04ae-4454-814a-6cb6cc904d22	1	Other	Other
+829f774f-9f43-4762-b976-91f34ba6e858	1	Other	Other
+829f8fd9-1dbe-49c6-87f6-706a4325aee6	1	Other	Other
+82a01668-dea2-46e3-b542-ef98e314056b	1	Other	Other
+82a05017-9dbf-458b-8a96-561f64de649e	1	Other	Other
+82a0519a-0bfe-4bd2-9f11-8982b06bc3ff	1	\N	Other
+82a11870-b1ea-430f-8013-613298095e9f	1	Other	Other
+82a17c40-6038-4d87-b955-fc2a380c4fe6	1	Other	Other
+82a1cc5e-9afa-4cda-a265-b614813f4755	1	Other	Other
+82a1dcd1-6697-479a-86f0-8ece7831c522	1	Other	Other
+82a1e780-8d50-498a-9632-6a4d1f33f5c8	1	Other	Other
+82a23cad-8fb5-45b0-b5cd-cad01ae5fc67	1	Other	Other
+82a24234-80e0-4aa2-af5c-ee1d89c987b4	1	Other	Other
+82a32281-f1a6-4483-ad08-2df0af42312e	1	Other	Other
+82a33f2d-2381-4850-9992-784fa4bdf1d8	1	Other	Other
+82a3ba59-6665-4838-87e3-c76e0e437a44	1	Other	Other
+82a3d404-9b01-4982-8792-a0eb0936b1d2	1	Other	Other
+82a4151b-3fca-4d1d-b45a-163267da2351	1	Other	Other
+82a41e26-d279-46f6-90a2-3a733a6bf342	1	Other	Other
+82a4a749-2f8f-4449-9eae-d04fd5312100	1	Other	Other
+82a4b7d9-91d4-4eda-86da-8c14499ddd4a	1	Other	Other
+82a4cfb0-714a-431d-8e3b-fd23661476b5	1	Other	Other
+82a4d5b0-3ad3-4427-95d5-ae2140df6ee4	1	Other	Other
+82a50b40-433e-4fab-85ab-9da7ce16948c	1	Other	Other
+82a55588-fee2-4a78-abfc-8322e66c4de4	1	Other	Other
+82a5816a-2262-49ae-a588-330d0d58537b	1	Other	Other
+82a593a2-e0ca-459a-8a14-6f451bb399ef	1	Other	Other
+82a598d3-c952-4bd2-a40a-ab369aab7da9	1	Other	Other
+82a5a6d2-f908-47c5-97e7-c0726b9d894b	1	Other	Other
+82a5b266-fd80-4bc5-be33-4c1ecb69d3ea	1	Other	Other
+82a5b4a1-a85e-4a9e-bcd6-775cb39115ca	1	Other	Other
+82a5cc4d-d38e-47d3-9687-6cbbc2a6bb4c	1	Other	Other
+82a5e706-f265-4853-aa13-371b6f9c2415	1	Other	Other
+82a5f94f-46a6-4099-9fd3-77dcc52b6bdf	1	Other	Other
+82a620b9-9b7e-44cd-85c7-7f10aac16f95	1	Other	Other
+82a685eb-6725-4ef9-acd5-71e5b8c81a98	1	Other	Other
+82a68833-64a0-48be-948e-ae21e26dfd5f	1	Other	Other
+82a6988b-163f-477e-adec-0a6cce4de6c8	1	Other	Other
+82a6df83-c2d3-410a-af69-f36939c0368d	1	Other	Other
+82a71559-413c-4e70-a120-aee8b020352a	1	Other	Other
+82a71999-e528-4909-9bfc-59e0e32b5400	1	Other	Other
+82a77e20-8fcc-46f4-a6d5-1564cedf813c	1	Other	Other
+82a81027-d1bb-4efc-8ab6-f7811c8963a6	1	Other	Other
+82a817ce-bbec-44a4-8cca-28f8a747bd83	1	Other	Other
+82a82927-9346-4475-859e-9bd8cf78a03a	1	Other	Other
+82a866e1-102b-4060-8c0d-c85848e0c8b6	1	Other	Other
+82a89eeb-326f-4f4c-a561-1294ba0e053d	1	Other	Other
+82a8dfe5-9d6f-403a-a91e-d4b03cbe25ad	1	Other	Other
+82a8e3a2-579e-47a5-91c0-c1a11629f174	1	Other	Other
+82a8e86f-46bc-4473-8994-b20261e5152c	1	Other	Other
+82aa003d-1fd5-436b-973b-0f843ff158f6	1	Other	Other
+82aa1808-0d09-40f9-8ca0-94513a32ccd3	1	Other	Other
+82aa1f7a-a136-4c6b-8b66-be2e6e5a0f99	1	Other	Other
+82aa35fe-29b8-4ee2-a4fd-bde34d2fa59f	1	Other	Other
+82aa546b-6f65-4c72-9272-e9df8a387ae8	1	Other	Other
+82aa6b21-dc03-4808-8f3e-223ee699fe0c	1	Other	Other
+82aacec7-4aca-49a7-935c-463c094f09bc	1	Other	Other
+82ab23b2-8064-4f51-b5c9-1092f1292344	1	Other	Other
+82ab39f4-7512-4239-b7b0-18078c36ebc9	1	Other	Other
+82ab47eb-34fc-4e5e-af22-35e6e12afbec	1	Other	Other
+82ac91e8-c650-48b7-8a59-2d3410edb315	1	Other	Other
+82ac9b45-b615-4252-9f0e-2850517315db	1	Other	Other
+82ad0998-e113-44ed-9b37-5d1378c1db30	1	Other	Other
+82ad1f09-04e8-46e6-aa3a-c50e883f5c08	1	Other	Other
+82ad2bd2-911a-4908-9248-a655c9444830	1	Other	Other
+82ad3e4c-1c9f-4245-a700-39158f879145	1	Other	Other
+82ada3c9-0aad-4d8e-86e3-7ade28d92419	1	Other	Other
+82adb30e-214f-4a5c-80b8-2e0c0d7601a4	1	Other	Other
+82adb6f6-aeb0-4f88-8fbf-a4f005332988	1	Other	Other
+82adf624-ba72-4d54-8132-676a93a3b357	1	Other	Other
+82ae2077-5341-4f16-a3d3-bd824d0aa2ae	1	Other	Other
+82ae2e8d-4bf4-4415-8877-65a1a7349dbb	1	Other	Other
+82ae866b-bd29-4aa7-9b6d-f1ce33de832b	1	\N	Other
+82aed54c-0b9e-4211-9630-ad387eadea7a	1	Other	Other
+82aeee39-2c8d-4af5-b6c1-831e35126e9a	1	Other	Other
+82aef6ff-f1bb-4d1a-aba0-0179cfd15c9e	1	Other	Other
+82af314f-9234-4444-b9fc-51ff83ce3e44	1	Other	Other
+82af4e9a-b195-4548-860f-fc86d283ecad	1	Other	Other
+82af7bb1-f608-4a0d-a19f-70bd5c1a4e8c	1	James	Other
+82afc7c9-63cf-43e3-a4d1-84a706c28256	1	Other	Other
+82b00315-5864-4476-bcb9-b93481538a13	1	Other	Other
+82b03ac4-b3e6-4a2f-913d-38fd56cc91aa	1	Other	Other
+82b09863-dd18-4abc-83e4-95f6a68e0105	1	Other	Other
+82b0cc06-18a3-4ddb-94be-29a35bd267f3	1	James	Other
+82b0f449-dc97-4471-a589-ca5c26def82d	1	Other	Other
+82b122b8-ec41-4b3d-8d78-2255b2efbf4d	1	Other	Other
+82b164bb-14dc-4fbf-93b7-2045abcedd87	1	Other	Other
+82b1a23d-2ffe-4150-b4a4-a6bc23cbaf0f	1	Other	Other
+82b1b19d-c147-4d47-9900-3e77cd2268ab	1	Other	Other
+82b22ba5-aea4-40c2-9b5d-992df5055a9e	1	Other	Other
+82b24161-bb2b-4224-a597-27bed6b1ae1b	1	Other	Other
+82b2843b-a15f-4681-a5db-5a6552e6bdc5	1	Other	Other
+82b29a20-d520-45c7-a72e-1d5ea09f9e58	1	\N	Other
+82b2de58-964d-4168-8509-828af23183cf	1	Other	Other
+82b31885-3e79-49d8-9bde-e4d9be1ceadc	1	Other	Other
+82b32a7b-b824-453e-8f2d-41ab48d13c81	1	Other	Other
+82b37abb-e722-4c4d-a2bb-e195c3c0af7f	1	Other	Other
+82b3ab9b-af77-426b-a632-b46c37b55157	1	Other	Other
+82b3bd4d-71a8-4243-aebd-2df498a5af13	1	Other	Other
+82b3dd5f-b3a5-4cc5-8744-2e5f83a41961	1	Other	Other
+82b40879-6a72-4cdc-b9e2-92988abed155	1	Other	Other
+82b40c05-f59e-45ea-8b4a-71e70ae9ae65	1	Other	Other
+82b4134e-635f-4970-9461-525c343eadca	1	Other	Other
+82b456ee-004d-49a6-89cd-dd03c13509ff	1	James	Other
+82b46fde-1f8b-4ba2-893e-18536ff4c127	1	Other	Other
+82b473b3-4fea-4969-8cd6-a78497daaa11	1	Other	Other
+82b4a2bc-a79d-44f7-8b68-a895d46a87f5	1	Other	Other
+82b4be12-39fe-498e-995e-c99bab815b0a	1	Other	Other
+82b4d052-a406-4e1e-973e-5e205ffe7657	1	Other	Other
+82b502ec-8b48-4a4b-a7b2-ef3aeb2f73f0	1	Other	Other
+82b5207b-abe4-4589-82d8-a8c1f30b9b19	1	Other	Other
+82b53571-9b08-433a-af02-c59e46b558fa	1	Other	Other
+82b5397b-e122-4f71-8417-dee4f09b3468	1	Other	Other
+82b572f9-0b34-48e0-a227-f7803a8c9c9e	1	Other	Other
+82b5875c-410c-47e4-af4e-136efc2cda4d	1	Other	Other
+82b5a1fc-3775-4e46-8c38-99807c4e16d7	1	Other	Other
+82b5a42d-6f3e-4523-acc5-e71b4d41588a	1	Other	Other
+82b5a9e5-9832-48ec-885c-cd0f21118ea5	1	Other	Other
+82b5e3d6-fa02-481d-82de-7725a5aba0df	1	Other	Other
+82b5e9de-be1f-4e07-b43b-ee319d33683c	1	Other	Other
+82b60077-7657-4aba-a836-545b5ac7f440	1	Other	Other
+82b61a91-3d59-47c1-a8a8-e037c8ea46ec	1	Other	Other
+82b62f1c-2746-4423-9b5d-a8b1eb8a22ba	1	Other	Other
+82b6498c-6fcf-4b77-8372-4591337e1e2a	1	Other	Other
+82b6519b-e81e-4535-9870-9e74b213791a	1	Other	Other
+82b65a00-cd83-48db-b6b7-4ce14294892f	1	Other	Other
+82b65c1e-8013-4754-8b57-86a6285744cc	1	Other	Other
+82b65f9f-972a-4af1-9c18-e50ee0c7d20c	1	Other	Other
+82b692a4-a1e4-4f42-9b95-fda0d83f9195	1	Other	Other
+82b694a6-16c3-4c15-a220-a4dbec774c44	1	Other	Other
+82b6a06f-c516-46a7-8818-f367d811af89	1	Other	Other
+82b6fc98-6fbb-4213-9aa6-c6978966aab3	1	Other	Other
+82b723c3-b029-406e-aef4-daedc570593e	1	Other	Other
+82b74e0d-d07e-4168-ad47-66dc48d259e7	1	Other	Other
+82b7a5d2-a41a-413a-b46a-3b22441385fa	1	Other	Other
+82b7ce00-d047-4fc0-bd71-62cd4e9ca5ce	1	Other	Other
+82b7e3c9-c3de-485b-9b94-0dcaf58ccc3e	1	Other	Other
+82b81d46-e336-439d-83f1-e8a0bf31e5d2	1	Other	Other
+82b86405-3093-4007-a422-ec0899b498ec	1	Other	Other
+82b8bfb3-103e-44ec-83bc-0a742063b901	1	Other	Other
+82b8fe39-8047-403a-bc52-0287c5195c59	1	Other	Other
+82b940ff-1edd-4012-8aa5-7ea77c91e7d6	1	Other	Other
+82b95df9-6480-4d56-a4f7-73e5cd5fab53	1	Other	Other
+82b97089-55ec-4707-b509-02f732b2e01d	1	Other	Other
+82b98dfd-37b2-4956-a121-d2b25fb37539	1	Other	Other
+82b9a888-a677-40c5-9a0c-4290a3779fc1	1	Other	Other
+82b9abf1-3624-4508-af42-c9edee6662ff	1	Other	Other
+82ba040c-380c-487b-ad5d-0a92c738e97d	1	James	Other
+82ba34fe-d86a-4b93-8dc0-19ebdd0e5a1c	1	Other	Other
+82ba35e6-433b-4fdd-958b-3c14b225a9ed	1	\N	Other
+82ba6042-1a6b-4646-8cd8-936dc0c8f7f9	1	Other	Other
+82ba9fa6-97ae-4fa4-a67f-a451a878107d	1	Other	Other
+82bb1ef3-2a67-4df7-9cc8-854434249c91	1	Other	Other
+82bb40a2-4dfe-41a1-8bbd-760f095cec2e	1	Other	Other
+82bb48d1-0126-4ea5-b631-9cfeab18852f	1	Other	Other
+82bb85b7-5500-4d46-9ad3-be519d692f8c	1	Other	Other
+82bb8c5b-113a-41e2-a32f-448371991831	1	Other	Other
+82bbb981-00b5-4f22-b131-875ccfe2f40d	1	Other	Other
+82bbf1a4-7a15-46b2-8760-efe4a345fe2b	1	Other	Other
+82bbf623-f9bf-40dd-b5b1-4dafee0e9884	1	Other	Other
+82bc518d-3403-468a-9820-3723cb4064dd	1	Other	Other
+82bcbdf2-e968-4c86-ba79-cee8be53150b	1	Other	Other
+82bcdbbe-2040-4806-82f5-7a1d14dec28b	1	Other	Other
+82bcdd3d-a753-4a54-a2f6-8352c38007fc	1	Other	Other
+82bcfc19-2e16-49d3-b6bd-8a014fd48db1	1	Other	Other
+82bd2ac4-cd61-4303-b592-d5fb3c4aa833	1	Other	Other
+82bd42ef-dd40-4275-858d-527f4cb6ce82	1	Other	Other
+82bdd156-44c9-4245-91d5-eebbf9ba1e98	1	Other	Other
+82be514a-b8ce-4a05-b755-9729f5ca7030	1	Other	Other
+82bee8b5-c65e-47bc-97db-ff120a7c80eb	1	James	Other
+82bf427b-62fd-41be-8162-71450dbfa9d4	1	Other	Other
+82bfbfe3-9ad9-4bc2-9e5f-7defda853bf6	1	Other	Other
+82bfcde2-b2d3-454f-9b18-4a18ea5a53bc	1	Other	Other
+82bfd7aa-62f0-4fa4-8b23-e260a10ad3c9	1	Other	Other
+82c04379-068a-4661-8efd-c7258fe0e254	1	Other	Other
+82c0e0ea-350e-4561-9a11-7cc2fc738e95	1	Other	Other
+82c0e774-a9d7-4c14-b979-bf332843ea74	1	Other	Other
+82c0f7df-ac00-45ea-bc1d-5b20bc6eb7c7	1	Other	Other
+82c0fa60-aa16-485e-b589-74265b7e7d6e	1	Other	Other
+82c0fb91-4c70-4b23-80af-7e04b4548844	1	Other	Other
+82c1224f-b496-4921-b99c-096395acaad6	1	Other	Other
+82c1a9f6-e0eb-42f9-8c0f-ec6b8439831d	1	Other	Other
+82c1b34c-2817-4495-b1ec-ab00e44b8431	1	Other	Other
+82c1c270-0075-4393-abf3-d6d625ce44b8	1	James	Other
+82c1ce7b-554f-454e-bd12-8278684ad029	1	Other	Other
+82c1dbed-32ce-4b4a-a68b-ffa546e776de	1	Other	Other
+82c1efc4-ee08-4780-ac3a-311770c561cb	1	Other	Other
+82c21667-f341-46ab-9805-d8a3bff37b59	1	Other	Other
+82c25af2-8956-4f8a-aec4-a16e0e2a1860	1	Other	Other
+82c2f688-071c-442c-83db-b3f018062448	1	Other	Other
+82c3068f-2952-49ad-9d2c-98f23c5ac318	1	Other	Other
+82c32d7d-fc25-4b6e-88fd-f1af01c0acde	1	Other	Other
+82c33493-9eb0-42b9-b46f-53712663cefa	1	Other	Other
+82c338fd-08cb-4669-8876-e504ca60f5f7	1	Other	Other
+82c3478d-cda4-487a-833c-de85a9c0cff8	1	Other	Other
+82c37607-d83e-4d3a-82dd-a93f4222e4aa	1	Other	Other
+82c3aa38-c51c-4eb9-8d34-652368d00cb1	1	Other	Other
+82c3bfa8-0b2b-4a93-9198-765c53ec9ab4	1	Other	Other
+82c3c4c0-5b7b-4485-91ae-e1fc3eaf9a73	1	Other	Other
+82c3ff39-5df1-49e6-ad07-69eccca4ffd6	1	Other	Other
+82c43101-24df-46ce-b63a-4088460b996d	1	James	Other
+82c45837-2702-4223-8b5f-cc8a410bf365	1	Other	Other
+82c4d4c5-1522-439d-b7ca-d5fe62fd79bf	1	Other	Other
+82c51789-0a56-49b6-ac7a-15bfeb08cb86	1	Other	Other
+82c566e5-d520-485f-9eab-8a6456e271a0	1	Other	Other
+82c57265-1cfd-4036-ad4d-93c785da3591	1	\N	Other
+82c5b4e1-0316-4bd3-845e-9e7fd1f71cba	1	Other	Other
+82c6896a-c229-42be-8261-e776dc874f9e	1	Other	Other
+82c68c5a-9e99-462e-8daf-2cbd5067ec0e	1	Other	Other
+82c6a967-34ca-484e-8707-9cd9f98ff014	1	\N	Other
+82c6b6d9-81b2-4ec7-b16d-57e11dff3e7c	1	Other	Other
+82c6b7bc-e0ca-48b0-a314-03b1322a95e2	1	Other	Other
+82c6d85b-6d4e-4721-9e3f-a6295d59bfbf	1	Other	Other
+82c6fe7a-94ea-4423-b462-7912c7409161	1	Other	Other
+82c736ba-bdb8-406e-ba4a-050e139d918d	1	Other	Other
+82c737a6-4a17-4b24-ab67-97ec71f015b5	1	Other	Other
+82c77059-920e-4ef8-bbc9-aaeb16efd8ed	1	Other	Other
+82c79106-279b-4ce2-8875-c52d35d40088	1	Other	Other
+82c7bf4a-6bac-48af-af28-a21bb444464e	1	Other	Other
+82c7c87b-bbb0-4ae0-983d-350f61f0863e	1	Other	Other
+82c822be-2791-42ae-a9df-fb3a2622dfbd	1	Other	Other
+82c88d87-1834-4c21-91c7-15053f6aa5af	1	Other	Other
+82c8dbbc-12a6-47a0-a61b-f36f79f887a0	1	Other	Other
+82c8f6e4-b675-4fc0-a993-431370973cf4	1	Other	Other
+82c911b6-251a-427e-b112-3c8f6057166d	1	Other	Other
+82c9123d-6346-4c06-88f3-986d13c9513a	1	Other	Other
+82c9311a-b90b-4e11-b2a0-f20fbfa1df52	1	Other	Other
+82c94550-6435-4577-ab5e-025873c7fbc9	1	Other	Other
+82c9d03d-eaee-4e0d-8db8-1b64a4766a3a	1	Other	Other
+82c9de88-3cfb-47b8-a4d6-a5a9a25da933	1	Other	Other
+82ca08be-5b7f-458c-9219-e14cf6aec895	1	Other	Other
+82ca2a17-75d8-461e-a712-a9a484c0114c	1	Other	Other
+82ca2e90-3fe8-4ab0-8df1-96ac666e00a9	1	Other	Other
+82ca3696-64c9-4364-b8d0-2433dde0bee3	1	Other	Other
+82ca5edb-5535-4a2f-8bed-d465b0f44814	1	Other	Other
+82ca7a85-8df9-4648-9db2-4afb3a4bd30a	1	Other	Other
+82ca7de7-8e0c-4915-8b77-a69f651ed809	1	Other	Other
+82cae4a3-8647-4142-ae62-d41489919058	1	Other	Other
+82cae978-8978-4ae3-ba9e-f4153d6c36d2	1	Other	Other
+82caea4c-8571-4eef-9e8d-6e2a4ce41833	1	Other	Other
+82cb5bea-522a-4ae3-8bfe-b79b0e777029	1	Other	Other
+82cb7f3f-8896-4d0d-8dca-e4a6d8b8fb1e	1	Other	Other
+82cbf2f6-bff6-4f8e-bf1a-22cbb1d94c56	1	Other	Other
+82cc12c0-06f8-4a39-9c58-efe575ab7c57	1	\N	Other
+82cc357b-b68b-4124-a938-d47bc53089d8	1	Other	Other
+82cc3fb9-ee49-412e-9802-b1f2228d5202	1	Other	Other
+82cc7b2a-9452-4bec-81eb-30e8453d58d7	1	Other	Other
+82cc7ea9-c77c-4c41-9f5d-af44fcd9b56c	1	Other	Other
+82cc8692-8941-46a5-9454-0253c9656774	1	Other	Other
+82ccfdaf-b7f1-46c8-a63d-1443c4479d34	1	James	Other
+82cd1922-14ff-48ee-919c-21e089992cad	1	\N	Other
+82cdfcd0-7639-455b-96a8-714a7cdb6d42	1	Other	Other
+82ce88be-be59-458a-8b7a-39ca7a6f1eb6	1	Other	Other
+82ce8e5e-369c-4ac1-8737-e6480fadca49	1	Other	Other
+82ceb56d-0ee8-4d7f-8745-08ec16607fc1	1	Other	Other
+82ceb5e6-7cd9-442f-918a-afda3e62d861	1	Other	Other
+82cedd9f-8549-4f12-a731-a835284bce26	1	Other	Other
+82cf1596-120e-4746-856f-4417a9533c3b	1	Other	Other
+82cf26f4-473e-4a45-8c8d-690bec08f34f	1	Other	Other
+82cf3f98-49b3-43b4-b825-fcd21b6a88b4	1	Other	Other
+82cf4159-4169-41eb-aabf-14eebc8c8ad5	1	Other	Other
+82cf4323-1d0c-4943-96b3-981297ffaf76	1	Other	Other
+82cf86f7-0c4d-46e7-8567-4f59e59f5ed0	1	Other	Other
+82cfb584-14fd-4111-b84f-8856d4211ecd	1	\N	Other
+82cfcd66-c00b-41de-83b5-3ce331641d86	1	Other	Other
+82cfdfbf-964d-430c-9733-8e1cc3425f77	1	Other	Other
+82cfec1e-387b-47f3-bd87-fe66bdf90558	1	Other	Other
+82cfedd8-494b-4104-9424-cde5fb12feb6	1	Other	Other
+82cfedeb-6915-4732-abdd-05563e747248	1	Other	Other
+82d0104c-29a9-494a-a4bc-529cda01f3fe	1	Other	Other
+82d0546d-8e0f-4037-b8f6-021b8c2aab6e	1	Other	Other
+82d091c4-c5f9-4a6e-9563-029dca9c52f3	1	Other	Other
+82d0b7b6-31e5-4988-9b87-ee61a2478515	1	Other	Other
+82d0ba07-04d5-40b2-a113-9a6277294b21	1	Other	Other
+82d0c117-f53d-4ae2-85d8-1c3a79e5d16c	1	Other	Other
+82d0df03-cddf-4fb0-ba1e-15a6d5515f59	1	Other	Other
+82d0f5d5-4bd5-4d04-8578-0e4b77db9f7c	1	Other	Other
+82d188ea-375e-4fca-aa75-688bbe6747fb	1	Other	Other
+82d18d93-9c3f-4c7c-9a5a-5ccf8242ecb1	1	Other	Other
+82d18f26-36c7-4195-8647-875b4eed67f2	1	Other	Other
+82d1a5ce-8272-4e2b-ab14-8506f2d3c1b3	1	Other	Other
+82d1e4e4-f5d1-47ae-bbb9-ea49dc5c315b	1	\N	Other
+82d1ec8d-4d3f-44e2-8b60-e1e02d4da340	1	Other	Other
+82d1f950-4eaa-4cc9-b1a8-adf4da1bf6cb	1	Other	Other
+82d22561-6618-40b3-8253-e496adc3054b	1	Other	Other
+82d249b8-b38c-4115-9575-52fa305c13b2	1	Other	Other
+82d25960-3cbb-4956-a6b0-b47f8c27def0	1	Other	Other
+82d27d0b-69c7-4d64-b34b-d6fe620c86a4	1	Other	Other
+82d2ad73-c952-4f4a-b300-5aba6dfdaeb7	1	Other	Other
+82d2d91e-30b5-44b4-abdd-03cb9303af65	1	Other	Other
+82d2e780-3390-4aee-8715-b256f9b1c96c	1	Other	Other
+82d30f0a-3cdc-4d61-889e-b7212c7e1015	1	Other	Other
+82d32450-e66b-4c18-8c3e-68766363b31c	1	Other	Other
+82d358fb-fe58-4c6a-b6d7-f7246a89a8cb	1	Other	Other
+82d3a0c2-3c8d-41f3-b434-411ae6f1cf6e	1	Other	Other
+82d3abbc-c488-4477-a8ad-f9ab891c8cc6	1	Other	Other
+82d40aee-92de-11e7-a65b-fa163e8624cc	1	Other	Other
+82d476e3-f5b2-40b5-a9d8-141885b11f66	1	Other	Other
+82d490c8-b991-4a35-940d-858be10a025e	1	Other	Other
+82d49ac3-972f-4be1-b042-3702fd4f6aa1	1	Other	Other
+82d4b390-5c6a-4907-a831-a2edfc8782d0	1	Other	Other
+82d4da65-5968-498a-94a0-eee8697df98e	1	Other	Other
+82d51130-001b-4489-a7c3-5be9e277e0ef	1	Other	Other
+82d53f2e-4dab-41c0-84d5-c78e17d48015	1	Other	Other
+82d57bef-9763-4bff-b46e-504e8b56a11a	1	Other	Other
+82d583c0-a010-4bbd-8843-e045bbdd1fb3	1	Other	Other
+82d58da6-242c-475a-bb0c-774ab05e96c2	1	Other	Other
+82d59aa3-832d-4561-ae2a-dd9de09b02a6	1	Other	Other
+82d5b186-4bc6-4666-85fb-c880a079aae1	1	Other	Other
+82d5dbd3-77a4-495f-ab0c-970cd4843eb4	1	Other	Other
+82d5e4d3-9161-4383-8a1e-ea5f003ddc17	1	Other	Other
+82d63acf-934c-49dc-a48e-af886762a3bb	1	Other	Other
+82d64752-9ddf-486c-903e-4a6f21a0f7b6	1	\N	Other
+82d64c70-3b6d-4425-bad5-c6b92817c2c6	1	Other	Other
+82d66aeb-616f-44f1-ab8c-8d82cbb14c67	1	Other	Other
+82d68f2e-5111-4295-872e-01dcdcc7f529	1	Other	Other
+82d6999a-551c-466e-95cb-229c6cf4daf2	1	Other	Other
+82d72bae-298f-4d65-91fd-c39d7f43c341	1	Other	Other
+82d73f15-fe5c-4002-b437-2dc43e582d11	1	Other	Other
+82d74c51-7573-46ce-82ad-ef548014be22	1	Other	Other
+82d7a7ee-c6fa-4db2-9715-18354c5eca3f	1	Other	Other
+82d86d89-4963-4e97-8264-4dacb8da7c66	1	Other	Other
+82d87152-5588-4c9c-a1d8-f0a0614f2970	1	Other	Other
+82d89ed3-f3d8-47a0-a202-48505f73576b	1	Other	Other
+82d8c3a2-f23e-4007-a4fd-b543aaf3232e	1	Other	Other
+82d8e398-2419-431a-9271-6cb0eded4080	1	Other	Other
+82d937ff-d5b1-4121-8887-f272d875eb44	1	Other	Other
+82d956e6-7d31-4f29-aea4-f1a3c3e78b88	1	Other	Other
+82d966cc-1cae-434a-b5ec-454be7d9a375	1	Other	Other
+82d9715a-a346-453e-8e29-c7b4e643c48b	1	Other	Other
+82d9a0c5-8992-4ea7-a976-6e7ecd295c0d	1	Other	Other
+82d9cf02-cd01-425b-83c5-49e6f9807ecb	1	Other	Other
+82da1905-878f-41f2-83bb-5f9810619be6	1	\N	Other
+82da2fea-1c80-4cf7-a8d6-e10ca6a5bc0e	1	Other	Other
+82da817c-1fdb-49cc-8d6b-74d78f38db3e	1	Other	Other
+82da91f3-ba31-497f-b6ab-998aaf87a547	1	Other	Other
+82dab80c-c6bc-4c93-8ff1-a363c3748c4a	1	Other	Other
+82dacb4b-370d-4df6-bb22-bf6645b5515e	1	Other	Other
+82db5764-3551-4f44-8eaf-340436fb46fa	1	Other	Other
+82db681b-b57b-4436-9c27-916bdbe57d5b	1	Other	Other
+82db9db3-b715-4110-8c41-a122fbdeb185	1	Other	Other
+82dbc909-d54f-4d0d-b147-cc07853a4d5c	1	Other	Other
+82dbcdb0-1801-4a93-b807-1c77bb902e67	1	Other	Other
+82dbde25-b7fc-41ab-b085-f479fde546a4	1	Other	Other
+82dc296a-eb2d-4503-a53f-f8104d26e1c4	1	Other	Other
+82dc50a4-06a1-4717-8da4-7e8360d1f414	1	Other	Other
+82dcb1d8-8a9f-401c-8479-86e674f65671	1	Other	Other
+82dcb5c2-c574-4722-9408-f543ba4f104d	1	Other	Other
+82dcd952-a82d-4bfb-8b47-7c719664e934	1	Other	Other
+82dd35f2-ab4b-43db-8734-74369f5f56ad	1	Other	Other
+82dd4de9-ff98-4264-9152-aa5a498f05f2	1	Other	Other
+82dd8136-0c92-482d-b4af-38f1f5711ef4	1	Other	Other
+82dde143-b139-41b0-a551-2914208a59aa	1	Other	Other
+82ddee12-be24-4da1-9706-a1beb4b1f6f0	1	Other	Other
+82de5646-5da8-4358-9c7a-4a0d7ff46633	1	Other	Other
+82de72a5-e384-4da3-8085-21d6b02e166c	1	Other	Other
+82de76cb-515d-48e9-a5ba-f51d709c53c9	1	Other	Other
+82de7a05-0cbd-4cd7-97a2-0a637667a63a	1	Other	Other
+82deb711-cec8-45cd-81ad-48b64bc30c0a	1	Other	Other
+82df022e-aa2d-492b-bc00-bebf1d0bff82	1	Other	Other
+82df6218-2be0-4ee2-aef6-60af3cb94155	1	Other	Other
+82df6d76-4a78-4dfb-af9a-cee8e55a4d89	1	Other	Other
+82df8d34-32c3-41a2-b044-8c296502e87c	1	Other	Other
+82dfc903-5135-4a4f-a79a-c4e98d973b7b	1	Other	Other
+82e01f6d-2d98-46eb-b8e0-6300b4ac895f	1	Other	Other
+82e08546-0ba1-4bdd-9362-fa5fea1d5aae	1	Other	Other
+82e0ceab-d234-41cb-89dd-02f62d004ddd	1	Other	Other
+82e0ef1f-3cc3-42a0-818a-90fdfa158791	1	Other	Other
+82e127bc-f61a-416c-884b-9821e4048305	1	Other	Other
+82e147b0-12fa-4b24-865e-abeeecfe515f	1	Other	Other
+82e15067-c5be-459f-ae0e-d6056618b311	1	Other	Other
+82e1650a-50cc-4de6-9d13-8a4f90fbc886	1	Other	Other
+82e1de9b-6743-4e6d-b53e-e1a5d2a9b773	1	Other	Other
+82e2121d-2d23-42b5-b0bf-06b16148d8ca	1	Other	Other
+82e229a2-efb5-4ff6-82ee-153f676d0090	1	Other	Other
+82e25ca4-fb83-4999-ab09-37753d816a59	1	Other	Other
+82e271ea-e349-4a17-917f-207227674da1	1	Other	Other
+82e28451-2145-4345-bae2-45a6a862de70	1	Other	Other
+82e314d9-4449-4381-a664-cf7f9e7e13cc	1	Other	Other
+82e31696-16cc-496b-8f32-cdfc2e6917ce	1	Other	Other
+82e3ec9a-1355-411c-8624-363f43fc1ff2	1	Other	Other
+82e3faa8-a369-4af5-83ca-ca8d1d81d36f	1	Other	Other
+82e408b4-2019-477e-9f69-a0db59d92aba	1	Other	Other
+82e41976-7554-40cb-a0d1-bcb0bfdeedfa	1	Other	Other
+82e4412f-e36f-4f26-b599-6b9bcc5148aa	1	Other	Other
+82e441d5-fea5-43a8-b033-c923bb5ea71a	1	Other	Other
+82e4ab2d-cbe3-48fc-8424-ee95911b0c07	1	\N	Other
+82e4d5e0-f9fc-4e1b-b0ea-a1903619d1b2	1	Other	Other
+82e51d9b-2f9e-44a5-9202-27632c4fa456	1	Other	Other
+82e52488-535e-4b7a-98dc-430b08fc1b5c	1	Other	Other
+82e55db8-a890-4ef7-af85-36babe2a78e5	1	Other	Other
+82e56e19-9c26-4f1c-983b-733b2e1c6974	1	Other	Other
+82e5a258-477e-44b7-b057-20197272636e	1	Other	Other
+82e5a279-ec84-45e4-bf08-cf968bd6d175	1	Other	Other
+82e5a588-d3fc-4ba8-a570-310ccb05a6a6	1	Other	Other
+82e5c2b0-f447-4f99-a143-953dc77e5ec9	1	Other	Other
+82e5ddca-605c-4400-a062-ae5748a5cb0e	1	Other	Other
+82e600cc-c64e-4408-9a88-835e5cae9cef	1	Other	Other
+82e65fcf-e638-4127-8f57-b94a0ff75a5d	1	Other	Other
+82e6b8fa-613f-4aad-9041-039a678c0f33	1	Other	Other
+82e6c595-11fb-4ff8-9c2e-7e3c79516402	1	Other	Other
+82e6f613-d50b-4380-a640-4d38d1c127b8	1	Other	Other
+82e71f9a-d933-4eb1-bed0-d1ada486cc81	1	Other	Other
+82e75b91-8fb5-40cf-87b5-3ed1e7a17290	1	Other	Other
+82e783c5-7dfa-4509-9887-487647a75361	1	Other	Other
+82e7a089-8732-4489-b810-09d265f21967	1	Other	Other
+82e7cb1b-c29d-4383-9c01-5eb0c56d6208	1	Other	Other
+82e7d0a5-6f7f-49de-9f40-d477078833de	1	Other	Other
+82e82ab3-060b-4163-8b87-80384f76ede0	1	Other	Other
+82e83f2d-e225-4018-a780-9257c9a107f1	1	Other	Other
+82e85cb6-7d88-46e2-9833-82b04984fa93	1	Other	Other
+82e89e32-b1d9-454e-8c6d-a5145b0c61e3	1	Other	Other
+82e930de-c215-40fa-be0a-6fa4802d0156	1	Other	Other
+82e97052-53bc-46ee-8b7b-6c7e087d8910	1	Other	Other
+82e97555-2c05-41c8-a823-356adab58cfa	1	Other	Other
+82e9e7bc-bd94-44c5-8a45-a1664c63f51a	1	Other	Other
+82ea2e8c-1f94-4630-9ee6-51d8d2db8e08	1	Other	Other
+82ea4069-de88-4b70-a592-559b7e0e21a3	1	Other	Other
+82ea5608-bed0-44e7-9175-e3b7c68ebb42	1	Other	Other
+82eae7c4-5400-464d-83a6-b792118bfec1	1	Other	Other
+82eb0827-9e23-41ee-b1c3-4e96564773f1	1	Other	Other
+82eb39fc-521b-422f-b999-ac73a345f26a	1	Other	Other
+82eb3a75-5d59-4619-8ead-62f24f399495	1	Other	Other
+82eb3e11-08ec-4e11-8330-ab1e057b30e0	1	Other	Other
+82eb62ee-9e1f-4ed1-a93d-31d45290f6f2	1	Other	Other
+82eb66d2-0b7b-45a2-ad17-cf5ad75153a7	1	Other	Other
+82ebb997-2a35-46f9-9203-9f1388ce286a	1	Other	Other
+82ebbb45-851e-4e99-b2e1-54ba4cfef380	1	Other	Other
+82ebc16b-0130-4d6b-8dfb-428a4be605cc	1	Other	Other
+82ebeed4-d7aa-4aa1-a7b1-abf35fce0bbe	1	Other	Other
+82ec4c8e-1ad4-4199-b364-a27e50462527	1	\N	Other
+82ec69bb-dcaa-43a5-8c21-4abd6dd53088	1	Other	Other
+82ec9ed7-5380-4706-b820-ead6b362b46d	1	Other	Other
+82ecbbdf-0bbf-4e64-9b11-6631b14e7bbc	1	Other	Other
+82ecc51f-7523-438e-892c-ef54f296ac9e	1	Other	Other
+82ecd356-ffbd-47ad-abc0-658dbb7407c2	1	Other	Other
+82ed0eb6-fd23-4a74-881a-04dd347550da	1	Other	Other
+82ed3d61-f861-4e79-b608-de8da80fa199	1	Other	Other
+82eddbdf-7b2c-4d8e-b75b-cbbb33fe3364	1	Other	Other
+82edf85f-40d9-4fef-9507-a96fa52ffdd1	1	Other	Other
+82ee6bad-386e-45c4-804b-aaf4a5e44caa	1	Other	Other
+82ee799a-78cf-4ac6-820b-d255708320ee	1	Other	Other
+82eea717-b6d5-4775-b961-02ae6ed1f6e5	1	James	Other
+82eeda90-452d-4151-b363-7ec9ad4966a0	1	Other	Other
+82ef05a2-41f5-42af-b9c4-f222d77da319	1	Other	Other
+82ef2c49-04b9-42e0-bdf3-cb25b1f4064d	1	\N	Other
+82ef7cbe-687e-43e6-93fb-b096a2efa075	1	Other	Other
+82ef89a4-5b39-41d9-9fe9-6f2e498016ef	1	Other	Other
+82ef89ce-ad4b-45a5-8053-264144d34a49	1	Other	Other
+82ef92e2-8210-4e38-b649-e9fd6f7dea9c	1	Other	Other
+82eff34d-4f3d-426b-b0dd-44f12cca9645	1	Other	Other
+82f026e7-40b5-4dcd-9f6b-44ec88650c80	1	Other	Other
+82f054bf-5d28-46c0-89e1-bf25b094231f	1	Other	Other
+82f0678e-1718-4dc3-b206-2f93ba2cbc5a	1	Other	Other
+82f111b9-4da7-4d97-890d-1c9a3d03bdcf	1	Other	Other
+82f12f6e-2ca1-4c24-b513-3b8d2b7b6aa4	1	Other	Other
+82f1975f-c296-4b66-883c-10e241abde9f	1	Other	Other
+82f1e3eb-39ac-4e8a-903d-9c56e1c66bcc	1	Other	Other
+82f1f999-b082-40b8-b285-6f29d2e4bfef	1	Other	Other
+82f21584-ae44-452d-9d2d-25f93a3945f8	1	Other	Other
+82f27f7f-f775-476b-9da6-6c89f353d2be	1	Other	Other
+82f30068-89d0-40e2-9b6d-ff00e0408d11	1	\N	Other
+82f319c5-32b3-4ba0-b146-e8fe37cdcdea	1	Other	Other
+82f33664-7227-422e-b842-77a0fda0f199	1	Other	Other
+82f393b2-f64f-47d7-b97d-a6e82ed7395f	1	Other	Other
+82f3b49d-7bbf-46b6-a2db-69cfe7a4ec46	1	Other	Other
+82f3ddd6-552c-48b1-9b46-48c20d70dcc7	1	Other	Other
+82f3f7d9-b61a-49fd-8409-474ce40355af	1	Other	Other
+82f43c2c-d25e-4691-9c2d-c59e6a9efb83	1	Other	Other
+82f48256-336b-4806-81e5-debb4325a601	1	Other	Other
+82f48b88-bd77-46bc-81b3-7d1d210b9c5c	1	Other	Other
+82f50a1e-c685-44f5-9b01-5c790694aac8	1	Other	Other
+82f52421-ecf6-47a3-878d-7ce072336458	1	Other	Other
+82f53545-0d7d-442a-adac-5be72cc193f0	1	Other	Other
+82f546d5-e02d-42d7-b655-f6812fc19570	1	Other	Other
+82f55878-d722-4032-8c1f-95d709bf88ae	1	Other	Other
+82f56524-b8f8-47d1-ab65-c85f5eeae34b	1	Other	Other
+82f597df-b3ae-4d7f-b173-328889ddb592	1	Other	Other
+82f5dee2-ca8f-429c-8205-8450cb40ef82	1	\N	Other
+82f6002b-35e2-45cb-bb47-c8dd5d232592	1	Other	Other
+82f64035-5244-4bfc-8f90-f894683e1058	1	Other	Other
+82f66eca-ab0b-427d-afbc-ddc699ae60b3	1	Other	Other
+82f6bb06-1821-4177-a677-1f0900ef40ea	1	Other	Other
+82f6c79a-2579-4aa7-8ab9-76ace79cd27e	1	Other	Other
+82f6c7b3-abdb-49bd-befc-3052fbdf67a5	1	Other	Other
+82f6c8df-5049-4c57-bea8-19e40f646832	1	Other	Other
+82f7115f-c0df-4e7b-a465-0ecfd4e0938a	1	Other	Other
+82f768d9-5412-40ff-9c89-40eecb74f760	1	Other	Other
+82f7d4ef-072b-4d2d-9be7-89e5bf43fdbf	1	Other	Other
+82f80f71-d3bd-42fd-a7e5-d905f9ed3c1f	1	Other	Other
+82f82367-f733-44af-8aef-993ee166ed0f	1	Other	Other
+82f823cb-098f-47cf-b3b8-ccdb55de0ce7	1	Other	Other
+82f830df-e144-4389-ad1c-556a4885e3e6	1	Other	Other
+82f88521-b44c-4336-874b-2a869fbd6a16	1	Other	Other
+82f8d9d8-5477-4047-bd88-28215dd8ebe3	1	Other	Other
+82f8de22-542d-4e33-b0ea-be8a02b6aad8	1	Other	Other
+82f8e097-c407-447b-9afb-60e10c628bb2	1	James	Other
+82f8ebd8-ce09-4edf-8fbb-071dfbcdf3e9	1	Other	Other
+82f8ecaa-ccd7-4acb-b4a9-c813d6e55247	1	Other	Other
+82f95553-a177-40ed-81f9-f89f35eb7725	1	Other	Other
+82f95f8b-ecbd-4177-89f0-fb90b08dc1f9	1	Other	Other
+82f96c1f-e274-4e91-be74-617401f74c3c	1	Other	Other
+82f96d63-1234-478a-94af-cd0cb9119af6	1	Other	Other
+82f9e7b6-ef98-11e7-9aeb-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+82fa30d4-e915-4445-96bf-effe72e003e1	1	Other	Other
+82fa4803-5baf-4ba6-aba2-bc8624eec50b	1	Other	Other
+82faa2fc-268a-4b6b-af51-50e2d54e54a2	1	Other	Other
+82fac424-e5e2-46ca-9d54-374cb0bc99b7	1	Other	Other
+82fad30f-2504-4ad1-8a46-3c7df4c9b05f	1	Other	Other
+82faed3c-7d9c-4939-a159-a78010b6be55	1	Other	Other
+82faf849-109b-476a-b40f-5632808e5fd1	1	Other	Other
+82fb10ae-7d6e-4990-8421-7a7ced2107eb	1	Other	Other
+82fb185a-4257-4c13-bca9-7346e3608c39	1	Other	Other
+82fb30c7-0bec-47b7-9472-10ff636bebde	1	Other	Other
+82fb3955-79dd-4909-92fd-f5ce3f236948	1	Other	Other
+82fb8e23-bbbb-4308-850c-7051757f29c6	1	Other	Other
+82fb9a8a-cc5a-44c3-a97f-99be0f8a0f71	1	Other	Other
+82fba409-3d60-4515-b78e-06d0cf98b0b4	1	Other	Other
+82fbd19d-8d6a-40af-8bf7-f56965e3f602	1	Other	Other
+82fbfd32-7491-4fcc-ba2b-aacafc9b430e	1	Other	Other
+82fc33f6-750a-4978-bf55-f6055a67868a	1	Other	Other
+82fc4848-92bf-49c4-9c56-b9ef0afada75	1	Other	Other
+82fc49c9-fd0b-4bec-8fef-dd30bed7fc57	1	Other	Other
+82fc985f-a9a6-4930-b79e-77f3918b102a	1	Other	Other
+82fcc85e-e44f-4e26-ac1d-45520b093679	1	Other	Other
+82fcf489-667c-443b-ba82-b677bd16ebfe	1	Other	Other
+82fd2207-98e0-4eb1-9989-f4217a180904	1	Other	Other
+82fd818b-ded6-454d-8418-65237e11ab90	1	Other	Other
+82fde4e9-d728-44fa-8db7-dc93be200dc5	1	Other	Other
+82fdfd3b-7aec-4c05-bbf9-b0dfd8f83916	1	Other	Other
+82fe4850-ad15-4f4b-beb7-7f420aa15752	1	Other	Other
+82fe4d2e-3c37-4b4d-ae86-aef3af96e3a5	1	\N	Other
+82fe555b-ec97-4966-bc82-57cb18e7efea	1	Other	Other
+82fe5913-8120-4dcf-ac91-cbcb6a447fc9	1	Other	Other
+82fe9672-f29c-479f-95df-d99923c45e42	1	Other	Other
+82fecc7a-ba5e-4567-bc7e-f1ed6fb2ef7f	1	Other	Other
+82fee033-7f68-4ffc-ab32-77bc05eb8966	1	\N	Other
+82fefcb9-0882-4faf-afa1-f14cb567b383	1	Other	Other
+82ff3688-34a2-4cee-83f9-39b9c6bc0f1c	1	Other	Other
+82ff3c72-eaba-4cd8-b181-ab5c09ef618f	1	Other	Other
+82ff3fa1-d9ca-4a35-a023-abcf9b77ac52	1	\N	Other
+82ff5b2c-2e3b-4369-9216-bfb5c5861564	1	Other	Other
+82ff64a0-de40-4bfc-a093-ef7e7ba14fa2	1	Other	Other
+82ff7c34-60f0-4b5f-a61e-89e5b2a16ccc	1	Other	Other
+82ff96f7-73ba-4f6b-ac8b-8ecae725e79f	1	Other	Other
+82ffb31e-3a80-419e-934d-6074e1083940	1	\N	Other
+82ffeb88-ce30-489a-8ea7-e3f0296f35c5	1	Other	Other
+83001fcc-4c54-4afe-bfbc-817ec3b44f27	1	Other	Other
+83007e91-6598-45b6-b501-1e6554d84cc3	1	Other	Other
+8300caf8-2c7f-4dd5-8081-ed2cb4143290	1	Other	Other
+8300f358-7416-4803-98c0-fbf299893df4	1	Other	Other
+8301caad-a88f-42a4-b2fb-ce81796200ea	1	\N	Other
+83025722-0dfb-47ad-bdc7-33ebe4f45166	1	Other	Other
+830275f9-1e78-4546-b9cd-d1d8a88b60c0	1	Other	Other
+83027786-eb47-425b-9e9e-b7df7f11e470	1	\N	Other
+830289d9-2f1c-4966-ac58-d3650d4cba06	1	Other	Other
+8302a30c-db4a-423d-a49e-6036d9dd3519	1	\N	Other
+830310b2-de12-4f10-ab16-04e8f7b02cf5	1	Other	Other
+83032066-ad7d-4a81-9d28-17065cdf672a	1	James	Other
+83032d96-07ac-4062-bd88-74574e69ba98	1	Other	Other
+830365d3-5540-4c7b-b5cb-f51adc53eeeb	1	Other	Other
+8303ea5a-66a9-49bc-9f70-ce9866eceb63	1	Other	Other
+83040ec2-5c91-467b-ae98-cf2330e69b82	1	Other	Other
+83041b0f-1b19-4b77-8f28-a0128bd30fcc	1	Other	Other
+830464a3-0751-47c2-8f80-f8d944a8f51e	1	Other	Other
+83046ede-8b44-4de5-b2cd-251d0f8398a5	1	Other	Other
+83047b4f-2add-4201-a52a-ab729f145f79	1	Other	Other
+830484ca-2183-421e-8ffb-def4449ad545	1	Other	Other
+8304a3b9-349c-4ba3-a01a-0ce7a34a4f3e	1	Other	Other
+8304f64b-335d-4ce9-8077-a784d4897668	1	Other	Other
+83052b27-7049-4465-9c66-3904563a13f9	1	Other	Other
+8305562b-0eee-41fa-9932-8ca25727885b	1	Other	Other
+83056449-04fb-47b8-8880-03476398badf	1	Other	Other
+8305c715-5b32-4b83-99bf-20d75fcbc9d4	1	Other	Other
+830621de-2ae0-49c8-816d-b2594cb65afb	1	Other	Other
+83064dd6-0738-449a-bf56-b14f6d965e06	1	Other	Other
+830663de-a61b-481d-8536-5c01dc466670	1	Other	Other
+830686e6-45c1-4568-b2c9-e4d80af19e85	1	Other	Other
+8306dc96-9678-40a9-98c4-1691638691dc	1	Other	Other
+8306e71a-a405-451b-a7f1-3a6eebea12f7	1	Other	Other
+830778c8-8fd2-4e73-aeaf-86780f142f6a	1	Other	Other
+8307827a-ea5e-4c12-b79e-aff84eea6c7b	1	Other	Other
+8307ef87-b1a4-48ec-b489-2124b05b0e55	1	Other	Other
+83081079-7493-452a-a8dd-6bc6ebd85492	1	\N	Other
+8308158d-e376-4322-a1ce-95128957e2ae	1	Other	Other
+830880f4-b981-49f1-aa18-5ceee12a3ab3	1	Other	Other
+8308c892-87a3-4eb1-b780-99dd504aa5b8	1	Other	Other
+8308d784-2fd9-416b-80b1-d8b052ab265d	1	Other	Other
+83092111-3337-48aa-aaf4-3e68c72f2f3f	1	Other	Other
+83092373-1a4e-499d-9196-3cf157bdd04c	1	Other	Other
+83092e0c-a4ee-45aa-9cad-7d583cda77c0	1	Other	Other
+83093503-5383-4a73-ab0b-521abf73284c	1	Other	Other
+8309615f-9860-4ed9-bb39-e64297d6b47d	1	Other	Other
+8309d1ad-9d13-45c7-b27f-d610edd345bd	1	Other	Other
+8309e255-d462-4b58-ae25-087d57602e35	1	Other	Other
+8309eaed-d9c1-403f-bc9a-da14042f77ea	1	Other	Other
+8309f06d-dc18-44f1-b3b2-546b2bc60e03	1	Other	Other
+8309f6cd-9366-4872-8c36-398925562ba3	1	Other	Other
+830ab842-a19d-4ba1-b5d5-5714ae0722b5	1	Other	Other
+830abe39-ecf4-41a1-a2fb-1a248c8302bd	1	Other	Other
+830ac026-1a24-4b7d-90da-7d8a21bacc39	1	Other	Other
+830aeb0e-6e87-4531-a544-6163d2e471c9	1	Other	Other
+830af296-1d40-4088-878a-fe0a7169c6a2	1	Other	Other
+830b19c3-2d6e-42b3-b5d2-6c0b1bf1d9b3	1	Other	Other
+830b4393-f438-49e3-9e1d-c065ff79c1a1	1	Other	Other
+830b43f9-5845-40bc-934d-99236ed83ce7	1	Other	Other
+830b49c8-8845-4f00-9117-0e52c7a186f1	1	James	Other
+830b6267-1261-450a-9ecb-bab41f9df15c	1	Other	Other
+830b69a2-5755-4a44-8cbb-8dc429c4ca74	1	James	Other
+830b7487-388e-48e7-950c-0cbcb0d337b8	1	Other	Other
+830b92c3-6cc8-470e-b84e-b10f2919fc5f	1	Other	Other
+830bfbd2-fafc-4501-8160-f9fa066d8076	1	Other	Other
+830c3fae-310e-42b8-a33c-5c70c5a46788	1	Other	Other
+830c5806-12fc-4fbd-b918-0a86f07e3885	1	Other	Other
+830c8a58-440d-4338-af37-7b5bb2596b85	1	Other	Other
+830c9c0f-8dad-4579-9f49-8809479992ea	1	Other	Other
+830caca4-948d-4268-b4c8-58291640d605	1	Other	Other
+830ce825-e8de-4ad8-a01f-76ebd1d74635	1	Other	Other
+830d0f40-348a-400e-a740-88ebd2a4d52a	1	Other	Other
+830d2af4-00ba-4519-aae1-0277cc8b018d	1	Other	Other
+830d4ba5-fedf-4194-99ee-32cc3bd3a41a	1	Other	Other
+830d802f-b1ed-40f7-9ccf-1cc8b6e647e3	1	Other	Other
+830d89be-227c-4502-b4a0-9bacfed50cf2	1	Other	Other
+830dc507-2510-4a7d-b44d-98087de12980	1	Other	Other
+830dfcfa-900d-4f4f-a362-02ddbe89c72f	1	Other	Other
+830e0d90-56d1-4db3-8568-b16a9deb1192	1	Other	Other
+830e1bb2-e817-4cf8-bfb0-e84e69188fac	1	Other	Other
+830ec84b-5917-4476-b1c7-86394bd1b411	1	Other	Other
+830f8c8f-30b3-4b96-b30a-4fc5f8da23ce	1	Other	Other
+830fb2cb-c623-4438-9d1d-9e52b8897129	1	Other	Other
+830fdf0f-34a1-4072-a5e3-ed83bdae7ebb	1	James	Other
+830fe1d9-a2e8-4541-a5a4-3d12f62c7ce9	1	\N	Other
+830ff89b-6ea6-47c1-b72f-8727670f7461	1	Other	Other
+831042a8-f7b1-4e55-b701-5cd29fa3fd94	1	Other	Other
+83106f01-1b16-42a4-9384-0560bca496d3	1	Other	Other
+8310775d-febd-40e3-b812-48e72e4248ae	1	Other	Other
+8310bfa3-3111-4ac7-abbb-a45037a3a830	1	Other	Other
+8310ca26-ad23-4c14-81f6-747f8596518f	1	Other	Other
+8310d6b2-1995-413f-8560-157a6c2aa8f2	1	Other	Other
+831123b1-8786-43b0-96be-f54b61fae243	1	Other	Other
+83114f24-0389-4f23-8f6c-b332bb17615c	1	Other	Other
+83119b25-44c5-4eed-ada9-e50d06295cba	1	Other	Other
+831215d6-f10c-40d5-82a7-20dfeef993f4	1	Other	Other
+83122baa-7d55-42bc-b433-450510b98c7f	1	Other	Other
+83127ca9-73e3-4d36-8b36-d0d69a697b87	1	Other	Other
+8312975d-ddc8-40c1-8026-7b828c58b3dd	1	Other	Other
+8312b983-def6-4d87-820d-92a74a3daf0f	1	Other	Other
+83136cef-8624-4e23-96ad-e6f20aba4a93	1	Other	Other
+83137f6c-1739-4c57-a77e-621ebff2d666	1	Other	Other
+8313897c-741a-4371-856f-08ec62c9be83	1	Other	Other
+83138f2e-1f2e-4474-b0bf-a05b5937aa16	1	Other	Other
+83139e87-3889-42a1-ae87-a1e44de87cf8	1	James	Other
+831415d3-d4ba-49c8-849c-186a1746c36f	1	Other	Other
+8314386a-5306-431c-bf00-a82f6a0ba589	1	Other	Other
+83144618-3309-4d90-84b2-d1d61f1f4acc	1	Other	Other
+8314469b-4495-4e7a-bd73-29df4bc36d8e	1	Other	Other
+83144e44-324b-493e-ada7-4f482c4b3a4e	1	Other	Other
+83147132-c19f-4352-b1ec-b28ce01ed7d6	1	Other	Other
+831478e0-8346-49dd-9ae7-5cc7d9fc0a55	1	\N	Other
+83148647-614d-4aa3-baab-766775def408	1	\N	Other
+831492ee-06c8-467b-bc3a-46ed841c625c	1	Other	Other
+8314cc28-191a-4671-b04b-22295de3312b	1	Other	Other
+83150e9b-06e4-4bf7-95c5-1d3db12435d9	1	Other	Other
+83154bc4-2a1e-40f8-8ecf-affd73421b04	1	Other	Other
+83154f02-0d8a-434f-92dd-bcfd6fb6c3de	1	Other	Other
+831572b6-74ef-49b8-a7c8-013918621f64	1	Other	Other
+83158c2f-c2b3-4587-a0d7-256c05267b72	1	Other	Other
+8315a134-cf81-4af5-a547-dc4388d5f62e	1	Other	Other
+8315b5df-9ed9-481f-b960-d126e8d68ad4	1	Other	Other
+8315cadd-e74e-4890-b07a-dad77c73212d	1	Other	Other
+8315d4eb-c0cf-4d1f-8dac-a43759491b0e	1	Other	Other
+831613f5-4151-45bc-a55b-7001bfe4b2e2	1	Other	Other
+83162bba-bfc4-4027-b71f-0a2fd67878d4	1	\N	Other
+83167fce-c795-46b4-ba9c-25c8a0454940	1	Other	Other
+83168d0f-ed49-46a8-ab14-00a1d1e8c534	1	Other	Other
+83169c44-855c-413a-8cac-7d7073ba57a4	1	Other	Other
+8316ca1b-6623-4aa2-8a4d-671127855466	1	Other	Other
+8316d841-481f-461e-8bda-8fe2ea69dca3	1	Other	Other
+8316d925-c7f5-4829-babd-4374666535e6	1	Other	Other
+83178424-5183-4030-b40d-7692aadc06d5	1	Other	Other
+831830b6-6a95-483b-a858-2f2a69e79dd9	1	Other	Other
+83188b56-c79f-47e0-83db-bb0fc198c2e5	1	Other	Other
+8318ca74-ebde-4eab-86e3-37c1debd8f0d	1	Other	Other
+8318e000-322e-42cb-9d71-911fab2710e5	1	Other	Other
+83194052-634f-4e07-be7b-94d2af66a55e	1	Other	Other
+83197de7-3f14-44ad-8f89-9303b62226a6	1	Other	Other
+83198e97-b3f9-4404-86bd-1a11a021d518	1	Other	Other
+8319a581-e22e-44ad-bd2e-e7367a7d36d8	1	Other	Other
+8319c6f8-1729-4f90-90a8-1095e1950286	1	\N	Other
+8319c7e7-f68e-4c63-8a93-60d151bea463	1	Other	Other
+8319ca5e-cf5d-4f68-8836-122741869a87	1	Other	Other
+8319e9a9-5f04-4c6a-bef2-92ed12a4927c	1	Other	Other
+8319f67b-da8b-4e0b-bea2-e2c492337d5e	1	Other	Other
+831a05f9-504a-4056-953b-db73733b3e1d	1	Other	Other
+831a1112-d5fa-41c1-bdbd-3a365e4a1dc3	1	Other	Other
+831a4f7d-c292-46da-bc54-704a051d5306	1	Other	Other
+831a547f-641e-4335-a717-1e9192d4e930	1	Other	Other
+831b01cd-eb7b-49e6-8001-7ff66cb92531	1	Other	Other
+831b213c-362a-4372-b9a0-758336539f23	1	Other	Other
+831b662e-b24f-4b8f-b74a-696f20caf47d	1	Other	Other
+831bce1f-8260-431e-9cc3-2621e8a9da0b	1	Other	Other
+831be5dd-3254-4aa5-af16-51f4b6cd063b	1	Other	Other
+831bf33e-9a42-4059-80de-903661c01ca0	1	Other	Other
+831c5d9c-e3e7-4105-b9b6-2ca6737b3d45	1	Other	Other
+831cd5fb-6c3b-4a14-ba92-f49b790caefe	1	Other	Other
+831cfe79-4274-4dd5-a4d0-00767b3ce7fe	1	Other	Other
+831d6592-ae4a-4069-a2e2-c2bb8cb1f926	1	Other	Other
+831d7ef0-cc3b-4568-9926-5d68a89ba4cb	1	Other	Other
+831deefc-fb12-420c-b706-c5cde5f0d7a2	1	Other	Other
+831e552a-8f9c-4e66-b0ca-074019f0d116	1	Other	Other
+831e9cfb-8da6-4fa4-97cf-32ad573747bc	1	\N	Other
+831ebb5b-c356-4d7d-a64e-9550f00529b0	1	Other	Other
+831ebc6a-d16a-4a1b-badd-e4a6d9810f10	1	\N	Other
+831ec1e4-90d5-4356-ae5f-c55c68fc26dc	1	Other	Other
+831f3e75-2948-4bce-915e-f1deeaca663b	1	Other	Other
+831f4cb6-21fa-4a05-8a4d-100f284fbbd8	1	Other	Other
+831f84af-b1b7-4127-8225-fa06daef36e6	1	Other	Other
+832022bc-7110-4131-bbe2-154488fd4ce1	1	Other	Other
+83202d61-599f-4313-83b9-eae69a1b07aa	1	Other	Other
+83202f20-2bbb-4872-83d6-ed69f8d76742	1	Other	Other
+83214ad5-73f3-48cd-9120-b55c44658eed	1	Other	Other
+83215f79-abde-4180-9b67-89f05d31e4d9	1	Other	Other
+8321a0e0-1b9d-4f23-aebe-c0035dcc85f4	1	Other	Other
+83221d05-e6af-414e-8d9e-ac87f26467a9	1	Other	Other
+8322347d-96e5-46d8-87e0-40fb333717d6	1	\N	Other
+83225928-e65c-4235-bfe0-d0170f8739db	1	Other	Other
+83226db1-101e-46d6-94a9-91c0684546b6	1	\N	Other
+8322832e-51aa-472a-928e-56b8a00d6041	1	Other	Other
+83228fd2-5842-449b-9074-6c134f6e04af	1	Other	Other
+8322c3a8-01b6-4a5d-8484-76441ce9eb1e	1	Other	Other
+8322d22a-dc66-4ed7-b198-9d2b3fd823e9	1	Other	Other
+8322df34-dd7f-4b79-a149-c4bd9bf9b31f	1	Other	Other
+83234a0b-03be-487a-ae5c-1362d60195da	1	Other	Other
+832350b9-bc46-4d55-98ee-7c31688ced67	1	Other	Other
+832395ba-87c3-410a-a40c-5297ca120734	1	Other	Other
+8323e75a-b296-4916-aa4a-7c3f7438fb99	1	Other	Other
+83240762-2992-46c3-b384-9e8581b67e02	1	Other	Other
+8324277a-a94a-4666-980c-2d4039376eac	1	Other	Other
+83243944-b4e7-45d3-ae4d-f9596c72c674	1	Other	Other
+8324abb5-791c-438d-a009-c14cb2e812a5	1	Other	Other
+83257c87-4dec-4286-a877-c4bd7bc1ebd8	1	Other	Other
+8325a478-a519-410b-a864-3c7dd8fa2ae2	1	Other	Other
+8325b04f-c91f-471d-b381-875bb2dabdfc	1	Other	Other
+83263645-acbf-478d-ac44-789d545f8000	1	James	Other
+83266f8a-a907-4cde-b648-abf394693434	1	Other	Other
+83267489-ac3a-4017-8312-888db0d8f3ba	1	Other	Other
+8326c870-76b8-4ae0-b57f-2787423e7c03	1	Other	Other
+8326eb84-b410-4636-a352-813729a8130a	1	Other	Other
+83270754-7789-4c63-83ee-7feb4040585b	1	Other	Other
+8327588a-0897-45a5-a21c-19718fcf6537	1	\N	Other
+8327957d-dc42-4b20-a9c1-d72b2a6dccf5	1	Other	Other
+83283846-39eb-4879-8e73-090d116f6da9	1	Other	Other
+83283a80-a280-465f-a0b6-5fa3f7b767c3	1	Other	Other
+8328422c-ab59-4258-ac40-2eed75530cc0	1	Other	Other
+83286089-335d-4c6b-88bf-8907f9753815	1	Other	Other
+83286606-a481-4e57-9219-27b5696217ac	1	Other	Other
+832898f3-53b8-463d-ac84-b0700820dbf3	1	Other	Other
+8328afd8-bde1-4ba5-b8ac-077027860d0f	1	Other	Other
+8328b311-5e74-491f-a016-19f7360e78cb	1	Other	Other
+8328bed5-ce11-44c8-a33d-fedddd615b90	1	Other	Other
+8328d4ad-864e-43aa-aa58-b6b83b245c60	1	Other	Other
+832907de-9c52-4b5c-a121-799dce66b5bc	1	Other	Other
+83290cc1-e47b-40de-9c5d-a90e2238c2e8	1	Other	Other
+83291323-d906-49d5-b8b6-c3bc672727fe	1	Other	Other
+83291efd-5bc7-42be-8833-fc7bcfc57618	1	Other	Other
+83295361-4b4d-4ebd-813e-64602b7043b6	1	Other	Other
+83298857-1b49-4bf9-bc0f-80b6591dcb0f	1	Other	Other
+8329d93e-5203-427c-b3a7-e83d8cf72bd4	1	Other	Other
+832a2e3d-874f-4ed8-bb2c-5daf7ad519d9	1	Other	Other
+832a5660-3f9c-41d0-9f35-fe01bc3bd48c	1	Other	Other
+832a920b-8cf6-4d6a-9072-0c7b516fd873	1	Other	Other
+832abf0f-3d8a-4509-89ba-7392cce6c227	1	Other	Other
+832ac579-ea8a-4d1a-85a6-0c1a9d3b238a	1	Other	Other
+832ad1ae-f105-450f-acef-a67828456089	1	Other	Other
+832ae125-a83d-452c-b384-432835f241ab	1	Other	Other
+832af132-d421-4402-a99a-2f8f39168235	1	Other	Other
+832b0447-bbac-4db4-8100-43abfe571506	1	Other	Other
+832b345a-c848-480d-bcd0-a7762a1219be	1	Other	Other
+832b77fd-b8a5-46bf-bfff-0b7430ed6313	1	Other	Other
+832b7b37-3323-47ec-b526-1378c09651d0	1	Other	Other
+832b855f-6f0f-4b5c-ab06-213244727885	1	Other	Other
+832b9e11-4fa4-47db-be0c-bcb8efcd15ee	1	Other	Other
+832bd799-4ade-4512-8833-f30e15ce7d9d	1	Other	Other
+832bdc4c-4b7f-4da4-8cbf-bef00e2ab33c	1	Other	Other
+832c37d5-4cce-4869-8706-b5110ba7da80	1	Other	Other
+832c4f6e-2191-44ba-89d0-98cdcc0177f2	1	Other	Other
+832c6e55-0a8c-4366-b951-1d0379985c14	1	Other	Other
+832cd4ad-f78a-46e6-b615-d5e3977e1ef5	1	Other	Other
+832cf25d-8d93-4453-8449-1db2e64e9db5	1	Other	Other
+832d7744-cd5c-4ddc-8b36-af261e43b23b	1	Other	Other
+832d7d7d-d2aa-4802-b656-f9047a72cc9c	1	\N	Other
+832d8bdc-5771-4348-b4ff-d3eedaf114cd	1	Other	Other
+832d8f9f-6c50-4ec6-86c1-f94a4e26361f	1	Other	Other
+832dbf02-fb62-4dec-8be8-2cbe33038c7b	1	Other	Other
+832dc9f6-46c7-497e-a497-1910144d5663	1	Other	Other
+832de87c-0808-4ca3-b29a-2d7c00e448e6	1	Other	Other
+832e1531-dfdc-40d1-98a0-32dc21e1e726	1	Other	Other
+832e337f-b58d-48df-8413-679b76556620	1	Other	Other
+832e7662-0d19-4f0f-bc21-1b52a4350678	1	Other	Other
+832eb207-2c3d-45ab-807f-04c09607dcf3	1	Other	Other
+832ec56c-b1f2-4d76-9ec4-b1a38fbcfded	1	Other	Other
+832f0227-2e7c-4c02-a976-8f40f4d40fb4	1	Other	Other
+833002d6-5c38-49b3-ba93-59cf6ac6959c	1	Other	Other
+833058de-6cf2-468b-8ec2-7802cdd381a6	1	Other	Other
+833072bf-8a79-42bb-ba97-d16ef311d1a1	1	Other	Other
+83308f45-cdd8-4ab0-b604-0f20cced8460	1	Other	Other
+8330b0ff-9e7a-4bda-bd07-d8380a03ab98	1	Other	Other
+8330d0e7-59b1-4dd3-810b-d826538ecdd7	1	Other	Other
+8331310a-3450-4216-b49a-98e71436adf8	1	Other	Other
+833165cc-47f9-49f3-97fb-e9eaa22632c2	1	Other	Other
+83319926-8506-4666-9789-9e92a933a2ba	1	Other	Other
+8331d5a3-4061-4ba2-a5e1-facf575cc5a1	1	Other	Other
+833206b1-a692-4d27-b4a6-3c8ae49b215c	1	Other	Other
+83325575-1097-4ae0-ad39-7fe3181e4a86	1	Other	Other
+83328bfa-7f39-4bd3-ac71-3fad591252d5	1	Other	Other
+8332e3ea-b073-4495-a5ea-b8a24dfa2e62	1	Other	Other
+8333d049-cf41-4a8d-8e3c-fbc39a14a12c	1	Other	Other
+8333f887-37c3-4f2f-b578-3015a9a64540	1	Other	Other
+833418d5-4851-4cee-bb0a-ebc07f2591af	1	Other	Other
+833420a6-a2de-4169-923f-34290119e445	1	Other	Other
+83347ccd-b0a2-4c1d-8c7b-5ead79306758	1	Other	Other
+833480b2-d86b-46d8-9d54-27e31bdab430	1	\N	Other
+8334ab38-dc2a-4f37-b394-1c789870a80f	1	Other	Other
+8334ad41-6a12-456b-a4ba-203187d76b0c	1	\N	Other
+8334c15f-ec53-4ba1-9bd6-58dc9de29d61	1	Other	Other
+8334c1a2-846e-402d-914b-ec65765f3b3c	1	Other	Other
+8335109b-6d6c-4a7c-8c52-01301bb38847	1	Other	Other
+83353927-b2cd-41da-8476-25f441eb4fda	1	Other	Other
+83354ac3-f076-4da6-b06f-b611b0d8e303	1	Other	Other
+8335a4dc-2a98-4561-b641-2d6c4b87e5fc	1	Other	Other
+8335d005-9523-4cfe-b2b0-70efebfd41b0	1	Other	Other
+8335dc67-8642-4c1b-9fd1-67eacdf900e6	1	Other	Other
+8335deb3-e1d0-41b9-a19f-9ef6be34b0ba	1	Other	Other
+8335f880-d9b2-4a5e-8b19-f0dd7fe767b0	1	Other	Other
+833662a7-67cf-4352-ab19-3aa964e0459a	1	Other	Other
+8336938e-b7a3-43fa-b718-f7f1ab07ea67	1	Other	Other
+8336e56c-bf1e-40d1-87c4-8e88e87f00ae	1	\N	Other
+8336ecef-9a94-4281-8508-2d93ea3fbfcd	1	Other	Other
+8336f2fe-8c9f-4e11-aafb-7a063d05b708	1	Other	Other
+833757c1-48a1-4aba-973f-e83cd612a02a	1	Other	Other
+83376658-e7cc-4726-ba25-9791ecc01afa	1	Other	Other
+83379412-2ed8-45d7-bd1c-15555e411086	1	Other	Other
+8337946b-0503-4ce7-afa6-137b0558a825	1	Other	Other
+833798a7-f989-463d-9244-c57577ba8150	1	Other	Other
+8337dc56-af3b-49ec-b90d-db893b4d131d	1	Other	Other
+833802dc-02ac-483d-ae29-c251942af74c	1	Other	Other
+8338447b-1298-4e1a-ab02-8294a9901f80	1	Other	Other
+833845f7-a8fc-4898-9c8b-21202bc136ea	1	Other	Other
+83385adf-06ff-42fb-b9e0-27c45473acbd	1	Other	Other
+8338ebf8-bd8f-408c-b22a-ec1a466bb7f9	1	Other	Other
+83392c43-e443-40f8-ad84-1a141c58e428	1	Other	Other
+833956b5-c185-4d60-b0ec-0b5e220e5941	1	Other	Other
+83395ec6-dde3-48b6-bc08-ae18289d4f0f	1	Other	Other
+8339ab6b-45dd-4014-8845-18d46745a0df	1	Other	Other
+833a019f-81c4-4a75-8fec-26a7869cce49	1	Other	Other
+833a0d98-38cb-4425-b2c6-9b41b2dbfa1d	1	Other	Other
+833a1957-f810-42a2-8ce3-f0e64164f648	1	Other	Other
+833a22ff-a979-4329-8187-dee7428804af	1	Other	Other
+833a31e5-d6d7-4fb2-93b8-ef8717b1edd7	1	Other	Other
+833a5080-9c77-4e31-97a1-9cb83b6b0624	1	Other	Other
+833a527b-0740-4196-a4ee-dafa2b293871	1	Other	Other
+833a65e7-dd8a-470c-bf77-0409069600ba	1	Other	Other
+833a7340-d255-40ce-86dd-0b094b84b3f4	1	Other	Other
+833af9a8-ad3f-4f05-97bb-9a342a114f77	1	Other	Other
+833b050f-77f6-4300-91eb-2053463745b5	1	Other	Other
+833b397a-ab0d-4591-b17f-9e2ffb10f7c5	1	Other	Other
+833b63a4-0668-4644-a222-8a32cbcc35b6	1	Other	Other
+833b7017-ad9e-441e-a300-3cee236bfd8c	1	Other	Other
+833ba7b3-608c-4321-8515-6f890fb5fc76	1	Other	Other
+833bb94c-aabb-485e-bee5-8d0e76222ae1	1	Other	Other
+833bfe75-60eb-4d70-bdb7-3f6e40267b2f	1	Other	Other
+833c08d1-f330-4d7b-9466-916d5c99aac2	1	Other	Other
+833cc0a0-20d1-4fa5-bdf5-3fdd9c682124	1	Other	Other
+833cc101-c605-4ab1-81ef-0083d81af2d5	1	Other	Other
+833cc2c6-0a46-4719-b0ed-5049522a06ed	1	Other	Other
+833cc9bc-1d20-469a-a106-78a62bc1f73f	1	Other	Other
+833ceb6b-aa5c-4fc4-a837-b3a1d7b690c9	1	Other	Other
+833d133c-a0ef-4262-88e4-39e69ca709aa	1	Other	Other
+833d4ca9-3da9-411c-9d79-eefc9451d01b	1	Other	Other
+833d4efd-e5ad-43dd-a29a-23ef5326d3f3	1	Other	Other
+833d5d24-22e8-4d48-99ab-3494dfd58a2f	1	\N	Other
+833d5f67-5076-4baa-a6d0-baa7780edc3f	1	Other	Other
+833d6fa9-6f8a-4726-947b-757235fe23f3	1	Other	Other
+833db340-d116-4f2c-96bc-c6d92f7d18b5	1	Other	Other
+833e0108-ff61-4232-b30f-9000a6f97fae	1	James	Other
+833e1f82-cc9d-4344-81e3-ac2388050530	1	Other	Other
+833e3f70-209f-460f-a1bb-754b20009985	1	Other	Other
+833ecba9-4c97-41d7-a921-cd6ae64f052e	1	Other	Other
+833ee83f-ec70-4b61-904d-660ce265ac3d	1	Other	Other
+833efb9d-2930-46f9-bf68-1b2ef46ee61c	1	Other	Other
+833f787f-9cce-46bd-941d-fb1d1ca4a4e3	1	Other	Other
+833fb583-f685-4b93-9674-31393098792c	1	Other	Other
+833fbd77-fc06-4e2f-87ba-ecf9f7742ffd	1	Other	Other
+833fd4eb-6008-45e2-a101-571f9410cddf	1	Other	Other
+833fdcb2-14f7-4e22-98c1-26d19a8a743c	1	Other	Other
+8340a276-67fa-4130-a9b0-60b9f6eceb36	1	Other	Other
+8340cd08-da9c-438a-ac19-6d3478927dd8	1	Other	Other
+8340e359-ddc1-4a0a-a9ce-7938988b4b38	1	Other	Other
+83414931-3baf-414e-ab92-e694ea03dfa5	1	Other	Other
+83419c72-7812-4080-a333-8278e62c4585	1	Other	Other
+8341d022-a885-4170-bee7-56b75b6b4f28	1	Other	Other
+8342147a-1fba-40b4-b97b-5dbbca8a4724	1	Other	Other
+83423c20-af73-4226-b276-4e0b0bde422a	1	Other	Other
+83428b73-8ac1-42f7-b912-8fd4345d004f	1	Other	Other
+83429830-0526-4056-ae81-b9c931e7fa67	1	Other	Other
+83429a1e-6efb-4b3d-926c-7feb89200b26	1	Other	Other
+83431663-0a58-4fa0-8839-61d2b01ae8ec	1	Other	Other
+83432b04-18e6-433a-bf89-44113f3002f9	1	Other	Other
+83434092-c7d4-437c-8fb3-e2148beb566c	1	Other	Other
+83434f33-207a-42e1-8393-011a70dd7e20	1	Other	Other
+83435052-c99c-4b9a-bb06-9b91f591c38a	1	Other	Other
+83435ef9-17e2-4093-b470-d1e60a2ccab2	1	Other	Other
+834361fd-879e-44c9-94de-9cfa38f03615	1	Other	Other
+8343697f-04bc-446e-be00-2ab425ff3d6e	1	Other	Other
+8343765c-1ee2-4e45-a4af-bbd8956d63e0	1	Other	Other
+8344964f-dc3e-4f54-92a2-990809482cfe	1	Other	Other
+83449d03-f3d2-4155-b1d0-52f762b0191a	1	Other	Other
+8344a0bb-930b-4678-ab18-d6324bb1c2d0	1	Other	Other
+834565bb-de08-41b3-b593-5af1c36b729e	1	Other	Other
+83459104-19f2-43b6-9783-b9db3c0c20c5	1	Other	Other
+8345997e-0498-4db1-b501-64db6ca9bee0	1	Other	Other
+83459b61-71de-43e2-9be5-3c7fd3e5fe1c	1	Other	Other
+8345a1f5-8211-4fbc-af37-6b3bfa84a8dd	1	Other	Other
+8345ab37-1e4a-4aa0-855b-a31e0b263477	1	Other	Other
+8345b8eb-0703-4234-8bb8-527de1784374	1	Other	Other
+8345ca26-954c-4114-8dd7-0be4e5aef346	1	Other	Other
+83461fc6-6744-4812-add8-6ed67eca8dfd	1	Other	Other
+834622f8-f92c-4cca-bb40-a82fe540519e	1	Other	Other
+8346497f-f664-4868-9b89-dc290943a223	1	Other	Other
+83465f42-63c6-42ec-994a-47468375456e	1	Other	Other
+8346ba89-87c8-4337-bfe5-40c9ead5fc92	1	Other	Other
+8346de5b-e2ef-4f89-8773-d796f4224f6c	1	Other	Other
+83470462-dff2-498e-a597-4e10642ee87f	1	Other	Other
+8347cd8d-4e34-4da4-94d5-94c6fc42e1e8	1	Other	Other
+8347eae3-90c1-4679-b2d1-2877d12b0b3b	1	Other	Other
+83483ee9-553e-4d53-81f5-c5673c9f1eae	1	Other	Other
+83484b18-10e0-447f-a388-31b0fc9a21e3	1	Other	Other
+83486d6f-a877-41af-aa34-58b6d70354c0	1	Other	Other
+83488545-02de-4c48-aa6f-da592e61ecdb	1	Other	Other
+8348c674-00eb-47c5-9f14-1ea83fe765d6	1	Other	Other
+8348d1b2-96a6-4da7-8f5f-0682ca87c782	1	Other	Other
+83490701-2004-4976-a7cf-390fdf8fb15f	1	Other	Other
+8349137c-792d-47c5-9ee1-3eaa1be60437	1	Other	Other
+83493da3-9641-42ef-8655-96a94680532e	1	Other	Other
+83498da8-95cb-41e6-96f1-8047cf31f18f	1	Other	Other
+83498fbd-c834-41e4-a67d-bec86d128386	1	Other	Other
+834995e0-6f6d-40c9-824a-bbffc055939c	1	Other	Other
+8349f4c9-9580-469f-8d61-07df50fd046c	1	Other	Other
+8349fb3f-4b0b-4a4e-9df0-c725fdc7889b	1	\N	Other
+834a573a-5a82-46f4-8574-87d311d91c79	1	Other	Other
+834a625d-f889-4f5a-9709-d4383a39b8bc	1	Other	Other
+834a69a6-46d1-4153-ae97-7503d452273c	1	Other	Other
+834a85f9-18d2-4d92-ab4d-26e524a975cd	1	Other	Other
+834a8648-1a36-4439-9dcf-1452af328267	1	Other	Other
+834aa3d5-f617-43ca-a3a0-07e77ebc3702	1	Other	Other
+834af3a4-cabb-4c3d-a678-7757ac55c8bb	1	\N	Other
+834b1089-c5b8-4de0-98ed-e03377e5f6fd	1	Other	Other
+834b14c6-78d0-41a5-806e-a748ec7ee055	1	\N	Other
+834b24c3-5325-44a9-b59d-f1339c347161	1	Other	Other
+834b2cbb-28a4-4e65-b27f-ae853dd4c742	1	Other	Other
+834bbe56-9ead-4286-9767-c305d11dbf16	1	Other	Other
+834bee53-af7d-4fa8-b108-c29f1e0fbd03	1	Other	Other
+834bf992-f6ce-40c7-85dc-ac6170c71376	1	Other	Other
+834c11a3-9902-472f-9e62-4ac6a482c91a	1	Other	Other
+834c19b9-5005-40c2-94cf-71cb02b7f664	1	Other	Other
+834d40a2-76fb-4b87-aa28-144e1ccf491e	1	Other	Other
+834d6a2a-e5bd-4090-b19e-c735d0bae7f1	1	Other	Other
+834dc8a2-faac-4e05-8feb-a9c7e28d207c	1	Other	Other
+834e1868-5243-4b7a-8478-1558b200671f	1	Other	Other
+834e4815-c191-4662-a9de-3ac7d4528f13	1	Other	Other
+834ec7cc-a207-4dbc-9cbd-9568c04a6dfb	1	Other	Other
+834ecf07-eb7d-4cd5-86df-e115a9ecd5b7	1	Other	Other
+834eea7d-a087-4ac6-8bd4-6248139653e8	1	Other	Other
+834eeb5d-cbf9-43af-a71d-c01569fd3435	1	Other	Other
+834eede7-d559-402e-971d-087f4779d0d6	1	Other	Other
+834ef6d0-bcd1-4d9b-92bc-c6aa80fceda4	1	Other	Other
+834f2c75-4d87-47bb-8c15-900ade50d87b	1	Other	Other
+834f503f-734e-4095-8409-42d7eda6639e	1	Other	Other
+834f930d-4576-43ff-818d-4a089b63d97e	1	Other	Other
+834fc266-9a06-47cb-b029-32400fcfe9d2	1	Other	Other
+834ffcaa-859d-4ca2-bd0c-a4276db837cb	1	Other	Other
+83502ef9-29e7-4ec3-aabf-472371c5d752	1	Other	Other
+835033aa-e847-48a1-b8ed-01ee5ac3bf6b	1	Other	Other
+8350adea-8a16-4b09-86b7-3713791e2f19	1	Other	Other
+8351e097-4b4d-4865-aa1d-2c67c61b69ae	1	Other	Other
+8352834c-20c4-45ce-bd39-180ecba19b01	1	Other	Other
+8352fbdf-234a-4c23-8376-4575222c0a88	1	Other	Other
+835387e6-b1df-45d1-9e8a-7558fd2ed97d	1	Other	Other
+8353982e-1ee2-4c57-b444-3d4107a69bd3	1	Other	Other
+835412c9-b1a9-4ab3-ad79-2f6b59f7d4ee	1	Other	Other
+83541823-3b2b-4170-b57e-be5efc271389	1	\N	Other
+83541a85-6ce9-455e-a53b-3e8a2e42c608	1	Other	Other
+83542343-48d5-4bde-b609-fca49a239872	1	\N	Other
+835495d0-9795-479f-8ea5-3387b6bbcce0	1	Other	Other
+8354e12f-ae8e-4f03-a72c-db7dd8576d56	1	Other	Other
+83552dcb-485d-40d6-b288-81e773ade357	1	Other	Other
+83554567-e84f-4124-93b5-a5db89f1afbb	1	Other	Other
+83554f0b-20ce-4a79-b334-4065853fa546	1	Other	Other
+8355c57b-ced9-44f2-9409-6b0a5e61ea50	1	Other	Other
+8355ddc1-a25f-4ae3-87f7-4b4a2162f43d	1	Other	Other
+835651e5-7e91-41c8-821d-ca7aa4e8f797	1	Other	Other
+8356a16a-162f-4c8b-9cc0-414cde88ac97	1	Other	Other
+8356eed1-021a-41f7-bc98-787de9d6f320	1	Other	Other
+83570d63-5203-419b-9eda-26c3d658be9b	1	Other	Other
+83575139-2c8f-4e74-b7a4-0f5611712eba	1	Other	Other
+83579b84-d747-471a-a3cd-2c8002057f91	1	Other	Other
+83579c79-2534-4498-a638-18e09f4ffeea	1	Other	Other
+8357da7b-41c0-4d13-95f7-239b48ad8083	1	Other	Other
+8357ebde-8962-4a7d-8de8-357d6a36d708	1	\N	Other
+83580c5a-7804-4f8a-a99f-df93ccb6c07e	1	\N	Other
+83580df0-7400-4ee9-8f37-63dc9cd9c898	1	\N	Other
+835819c0-cc38-4855-a62c-b98f7a824eee	1	Other	Other
+8358311a-dbe5-4927-a7db-a5d1f264273c	1	Other	Other
+83587102-d584-45c2-b597-115aed37adb4	1	Other	Other
+8358be3d-15b3-4116-b7d3-5e3d23aa7fd3	1	Other	Other
+8358cfd8-cecd-46bc-8402-bbec4f139152	1	Other	Other
+8358f532-e493-4324-96af-e9c0e40a87d0	1	Other	Other
+83590b06-f904-48fe-9c35-c970987d35de	1	Other	Other
+8359683f-fb7e-48e8-96ca-721b5b02da99	1	Other	Other
+83596af9-b424-4cb8-992f-38f246f64cf7	1	Other	Other
+83599116-d430-4fa7-b788-bc978953e0cf	1	Other	Other
+8359d264-5165-4c6b-8e01-3a86531516ca	1	Other	Other
+835a6b11-2e37-45cf-b590-2c793945ae18	1	Other	Other
+835a7395-2bef-47ef-81bb-f503730f3faa	1	\N	Other
+835a8170-9230-41cb-9c83-86992c23dd4e	1	Other	Other
+835a85ac-95a4-4616-b0b3-1e172b81479e	1	Other	Other
+835ad960-b229-45be-a6b3-9e024e865790	1	Other	Other
+835b1197-23cd-4d95-bf68-c38d3336b9f7	1	James	Other
+835b576d-0ac8-4793-a5c2-a2f3fb1e8830	1	Other	Other
+835b8088-da03-474b-9812-80fabce40355	1	Other	Other
+835b9218-944b-454a-9cac-0fb14296e221	1	Other	Other
+835b94b1-fd98-43b0-b56f-765429b9539f	1	Other	Other
+835babe5-3b5c-4feb-bb6a-cdf2a63b0b6f	1	Other	Other
+835bb48e-8b24-484d-bd8d-96d6b0c300b3	1	Other	Other
+835bc424-9a39-4e96-83a4-a7b45972c4f6	1	Other	Other
+835c068e-964f-4b63-ada0-f3075e1299fb	1	Other	Other
+835c100c-ef22-40e6-bbad-4330292342c7	1	Other	Other
+835c491d-cf5c-4a8f-98e6-bf6d14ce547e	1	Other	Other
+835c677b-9e46-4ab1-bb2a-138f3f9fbdbe	1	James	Other
+835caf34-ce98-4bbb-827a-eca9505e8772	1	Other	Other
+835d48a2-9180-4e75-8c98-c93107ae3ac5	1	Other	Other
+835da2bc-357a-4cbd-ad2c-12b7b4bb1d65	1	Other	Other
+835dbbad-6529-4eeb-b0d6-bd6ef0526e14	1	Other	Other
+835def63-4312-4cc9-95b3-4885e1a093eb	1	Other	Other
+835df97e-6908-4f09-a5d6-4563d27bedea	1	Other	Other
+835e0563-8e8f-4eef-b8cf-ba6327cced89	1	Other	Other
+835e3d78-fbb1-4ac0-9874-8a62b29f60d7	1	Other	Other
+835e3ffc-2d8b-4a57-a57e-1249255239f3	1	Other	Other
+835e4bf5-d99a-477b-8d82-8bad6da3c9b5	1	\N	Other
+835e5ad2-69b0-47c4-bb59-ac07ee0c1b62	1	Other	Other
+835ec566-6ebc-43f0-a61f-0329a1546733	1	Other	Other
+835f029d-0dba-4c09-b1f1-5d51099ffb51	1	Other	Other
+835f544a-1788-41ef-91e9-7cd60f90e06d	1	Other	Other
+835f7da6-9775-4e4d-993a-73bb37d2af22	1	\N	Other
+835fff52-ef6d-4660-b063-de9cc5b38390	1	Other	Other
+83601185-48ec-4b15-a5d8-5a8876e64b89	1	Other	Other
+83601e94-1578-414f-b393-c47b4ac29ca1	1	Other	Other
+83602b02-6b98-4af4-9b43-21b16324924b	1	Other	Other
+83604159-d6ca-4741-a882-5c012ce6855f	1	Other	Other
+8360ad61-045f-4067-be6d-619ab0fc8876	1	Other	Other
+8360ef8d-bee4-4341-be80-c2915cd976cc	1	Other	Other
+8361a621-9152-49b8-a5d1-edefe5dc1079	1	Other	Other
+8361b899-8255-49d8-a852-1954eb880d19	1	Other	Other
+83620103-6cd9-4201-aa38-0699f341e53f	1	\N	Other
+836215ab-fecd-4a79-8703-5c7c93c47055	1	Other	Other
+8362225a-a2ae-418e-9323-5f989bcf82a8	1	Other	Other
+83622975-9ecd-4d51-821e-f0a054add119	1	Other	Other
+83626d28-569b-49b1-8725-7b20774057e9	1	Other	Other
+83629211-c5e6-4a4e-9dd2-458915579ed5	1	Other	Other
+8362daf3-bf77-415c-8315-ed2a0c588c67	1	Other	Other
+8362e45a-9d55-4f32-a1b3-dd62d932ff82	1	Other	Other
+8362e5fd-7197-43da-b901-e70b1ad44634	1	Other	Other
+8363233f-67ea-4d01-a313-56c9c1e09721	1	Other	Other
+8363375b-d4fc-427c-852a-3dfb2c6059b0	1	Other	Other
+83633a77-d206-4790-a7b8-2e86454e9680	1	Other	Other
+836358b6-f1cc-48f7-8e09-63f1bab596f2	1	Other	Other
+83638453-9c00-402e-9bc7-6276871f17cb	1	Other	Other
+8363b554-f6e0-45cd-9d3d-866c7e3cbbfd	1	Other	Other
+8363cf3c-98ba-4d26-b90c-a5516b1b05c2	1	Other	Other
+8363d069-f956-4dec-81fc-11ec6e54a364	1	Other	Other
+8363d0dc-cc0b-4bb4-9c52-5c8610a70aa7	1	Other	Other
+8363d27b-58d0-4762-8a46-4c6a68b01018	1	Other	Other
+8363e834-3be8-434f-95ea-c489fdd33ba5	1	Other	Other
+836407e3-d9ae-4c5c-a25c-e005888ea7ca	1	Other	Other
+836453ed-a2de-497b-87f1-63695b2f40da	1	Other	Other
+8364c09e-408e-414c-b26c-90f9453b080b	1	Other	Other
+8364deb5-84e9-4b68-9a62-e6a1bce08c21	1	Other	Other
+8364fdf1-6544-4e9a-864d-6cf4a095eda6	1	Other	Other
+83654251-b944-45cd-9a82-1337a9cccea9	1	\N	Other
+8365cd1f-d0cb-4d4d-a75d-1fe27c725665	1	Other	Other
+8365dfdb-98e5-41fa-8ee2-f127cab5e083	1	Other	Other
+836636fa-f43e-457c-80c0-6a9a547563ff	1	Other	Other
+8366a3f5-9c89-4b50-b116-13056ec50875	1	Other	Other
+8366b107-edb5-4dc6-94b3-d2420eefd1e2	1	\N	Other
+8366bf08-8062-4940-b4ca-dbdce8a024da	1	Other	Other
+8366c589-afc4-4f71-a41b-c00d7856b7e3	1	Other	Other
+83674fc8-8822-467e-9411-f3bf7d3de761	1	Other	Other
+83676303-7110-4d09-a36b-49f1cfaafe42	1	Other	Other
+83676a67-71a1-4e7f-8394-3b4369ecf317	1	Other	Other
+83678112-9554-4913-9ee8-6b26bfed5222	1	Other	Other
+8367b1f2-18d3-4bf2-b139-d8896fa5dc6d	1	Other	Other
+83680201-e726-4e89-ad18-c791dd883a9d	1	Other	Other
+83680306-fa9d-49d8-b72c-dc95654f6bae	1	Other	Other
+8368694f-e826-44ac-9fdf-a18d6a436a1d	1	Other	Other
+8368b59b-f09c-45c2-b984-7d67bf5a68ed	1	Other	Other
+8368e993-6d7c-4775-8321-aa4773025d29	1	Other	Other
+83690804-3363-479e-85ad-993ea33b6d27	1	Other	Other
+836932e9-94f8-48b5-8e6b-06b824f1ef2b	1	Other	Other
+83694a1c-9bc7-46bb-8160-04b016f986e5	1	Other	Other
+836953c7-68c1-428d-a1ef-684b637d744c	1	James	Other
+836969c3-9ecf-4e60-820c-da7d511dbfa8	1	Other	Other
+836976d6-b08d-4fd5-b3c2-cddda71d594d	1	Other	Other
+83699723-7be2-4c7e-8177-63781f8039ce	1	Other	Other
+8369ad87-6175-4ad2-8cfa-9f388860f95c	1	Other	Other
+8369b546-0ad8-478c-ae8e-a26de89e421f	1	Other	Other
+836a1dec-8b6a-4cb5-89a1-6ab73a810c73	1	Other	Other
+836a51ba-b998-4332-a4f5-d975e7231874	1	Other	Other
+836a8aca-c360-42a7-b56b-ee24166b6dab	1	Other	Other
+836aa250-84e7-483e-ac5e-e830839652aa	1	Other	Other
+836ab2f0-61a6-438a-b45c-9260c1cba3e6	1	Other	Other
+836b44fa-d68e-4d24-84e4-e684d223ef74	1	Other	Other
+836b5f76-2f04-4d70-aa5a-1b12a3239b0c	1	Other	Other
+836b5fdb-42e9-423e-ba6f-c19cbaa4ba81	1	James	Other
+836b6231-e160-4387-be9a-7f74bcd4261f	1	James	Other
+836c2155-51a3-4afc-94e6-4cd0ffbb37aa	1	Other	Other
+836c7476-4d17-4188-b591-e1edf7930e84	1	Other	Other
+836cb318-8a0c-4da8-b38d-b2272b68568e	1	Other	Other
+836cc586-7742-43e6-8ecb-38fb1ba97908	1	Other	Other
+836d42f9-e2a0-4c6e-8b6e-41025f38561e	1	Other	Other
+836d761e-2c39-4130-bbb0-31c589cbb1fc	1	Other	Other
+836e70b6-4a1a-4fef-b7ff-1f5506b57df6	1	Other	Other
+836e8ea2-a372-4e80-a5d4-a22a34418ee5	1	Other	Other
+836ebf6d-83ae-4c60-8f11-d9e466193d06	1	Other	Other
+836f10a5-7d5d-48b0-b580-3aa4a1c531d5	1	Other	Other
+836f5f85-6eba-463b-95ac-5f3179f07ccf	1	Other	Other
+836f6e52-a2c1-4166-9f34-dc65d71e53ef	1	Other	Other
+836f747f-00d3-4dcc-a849-6a7f8a45481c	1	James	Other
+836f9216-68e2-4fbd-8336-05dafba44046	1	Other	Other
+836f99de-d3ef-4d64-a535-dbabfb90e30b	1	Other	Other
+836f9ad8-e80a-4f31-8e7a-babe41e86722	1	\N	Other
+836fa168-82ab-4c7d-b291-11d3abccd400	1	Other	Other
+836fd23a-2863-45a9-9ba7-24d39f28793a	1	Other	Other
+836fed4e-c264-4960-bf5c-c273a64bc41a	1	Other	Other
+837078f3-3c37-49b9-a3a5-195e47a12de0	1	Other	Other
+8370a698-825e-4098-8dd3-de9f0302a028	1	\N	Other
+8370ec58-e0bc-4dce-807b-7f44e986fb36	1	Other	Other
+8370ee56-b2c7-4283-9dfa-35418acd6dfa	1	Other	Other
+8370f84d-022b-455c-9fd1-5075599b992b	1	Other	Other
+8371faca-d4ee-4960-b20e-d321356efe96	1	Other	Other
+83720288-e4ab-4b0c-9e17-b27c26bd523f	1	Other	Other
+8372351d-e8b9-4b23-9299-97bf050519a5	1	\N	Other
+837257a7-c9dc-4b87-88af-4dada4b6c3e4	1	Other	Other
+8372d7bb-c7cf-4ec3-9860-75c9ed8a48fc	1	Other	Other
+8372d880-47bb-4d24-8e78-0f675edd803e	1	Other	Other
+837310bd-c10f-47b1-9ba2-678b703a5ac4	1	Other	Other
+83732e36-7c22-46ee-a8d5-ec48a89441f2	1	Other	Other
+8373514a-49b2-4700-8030-5a4c40a84895	1	Other	Other
+83737323-e390-4c49-9e2e-31048040aab6	1	Other	Other
+83739e5c-c576-446a-be6a-e12bbb55f229	1	Other	Other
+8373ab75-eeb5-4d49-aa36-a668e3c3e2d5	1	Other	Other
+8374447d-25fd-4644-ade6-563643a836b8	1	Other	Other
+837472f6-f59a-4f1c-af38-ba8a60f20147	1	Other	Other
+837483d4-b81d-4b7d-89b0-eaf8d02ee9d5	1	Other	Other
+8374f32f-20fe-4ac1-abbf-eaa860d4c3aa	1	\N	Other
+83750928-85bb-4c10-be2b-0bb34913952c	1	Other	Other
+83752c6d-697b-49d1-8c44-d4b8bd2422fa	1	Other	Other
+83754ef4-1a3d-4814-8b7c-6f33ce7d06bb	1	Other	Other
+837552d3-a362-4c27-bb71-9099234db86c	1	Other	Other
+837558c7-ca65-426d-b0a3-239a472e35c0	1	\N	Other
+83755b71-8d38-4ba8-8df1-0d1e6919e0ce	1	Other	Other
+837566d2-b4f9-4868-8918-bd59b09f603a	1	Other	Other
+837572f8-0dc9-4c3b-8a0b-2508fddc6f3d	1	Other	Other
+83757c44-af4e-4eaf-ba29-0cde8bbf688c	1	Other	Other
+8376491d-1d30-4928-9f65-ea8cdff28900	1	Other	Other
+8376cbdb-b284-4f93-adc4-6217e0c240e0	1	Other	Other
+8376df93-fe99-41aa-b1b7-0a1ee3f41443	1	Other	Other
+83770116-bb76-480a-a649-3b3eddb7a236	1	Other	Other
+83773c02-edce-4ae5-8458-0922745128fa	1	Other	Other
+837848c6-3d2c-4918-acc0-d5a2e362d8ba	1	Other	Other
+837857ba-2aec-4ad7-94a2-fa1dca136cfe	1	Other	Other
+837862af-6ffa-4bff-81db-58b5a7f23bbf	1	Other	Other
+837885e2-5f02-4211-b96c-9f9a344c640d	1	\N	Other
+83795cdb-30bb-4a69-b3a5-31f05bb14076	1	Other	Other
+83795cdf-d904-441f-9f54-4e997c858c80	1	Other	Other
+8379e2a4-ae99-4a0e-ae08-439e91c15381	1	Other	Other
+8379ec90-abe0-49f5-af89-ff284d6dec6d	1	Other	Other
+8379fac8-2d24-4259-ba49-e69ead8b017c	1	Other	Other
+837a2671-8c29-487e-b392-a3bfee05655a	1	Other	Other
+837a3fee-d078-4799-ac29-7d2b6712db3b	1	Other	Other
+837a5f9c-8828-4bbc-b320-15fdfd32cf80	1	Other	Other
+837a877b-9abe-4114-bf0c-e6153e8eff76	1	Other	Other
+837acc5f-91a9-4436-9393-20e61a42fb7a	1	Other	Other
+837ae4dc-d195-4738-aad9-e5882d6028f6	1	Other	Other
+837ae982-8c52-4b60-804f-96040e2df4a4	1	Other	Other
+837b2a3f-a0fb-4d8c-9340-1a9797a9caed	1	James	Other
+837b5e0a-2522-487c-8035-181ac0abd6b5	1	Other	Other
+837b61da-7c13-443b-9618-42730df391ea	1	Other	Other
+837b97da-dd51-46a0-b93b-6d95e39c534f	1	Other	Other
+837bab0e-ac8e-4e8b-96ed-448b265cd0e3	1	Other	Other
+837bc76d-123c-4c45-866f-e3704929db76	1	Other	Other
+837c0785-3748-4117-aee8-3c1ad863abde	1	Other	Other
+837cb976-fd40-468a-9051-1851e6834514	1	Other	Other
+837cc472-4a73-4417-976a-77289ed5031e	1	Other	Other
+837cc84d-202e-4210-b8b7-ddded2b09b03	1	Other	Other
+837ce1f2-57d5-4468-a51a-47a1d89dd78e	1	Other	Other
+837d03e3-0a11-4bd8-b1f0-8cac07fa38c0	1	Other	Other
+837d0403-f27c-48f0-86ff-c1166e904530	1	Other	Other
+837d0dd9-18c8-4f23-96d2-97765480b8da	1	Other	Other
+837dae8c-f7dd-44ca-ae2d-e2471cb4bef9	1	Other	Other
+837dc47c-2003-4539-b7b8-4834f567491f	1	Other	Other
+837df8cd-c47b-4f5f-ba88-95fec786e54d	1	Other	Other
+837e1a6e-750f-4b86-8079-6dfcdfcf277f	1	Other	Other
+837e2f0c-c1a7-400c-a48b-6bb7dca6c3b5	1	Other	Other
+837e45b1-1168-4074-be92-30a4e166cf4d	1	Other	Other
+837e4c5f-207f-4057-a38e-19486536d8cc	1	Other	Other
+837e62df-cab4-49cb-b9d6-1ae7ebcf4101	1	Other	Other
+837e7fa1-3fd6-402c-8dc7-3d81ef76efae	1	Other	Other
+837efc68-6ee7-45cf-8da4-089cbf9a8e35	1	Other	Other
+837f6181-36d3-49cb-ae62-86296dfd801f	1	Other	Other
+837f6933-50e5-49bb-bf0b-800700ec9425	1	Other	Other
+837f6abf-329f-4377-a0d5-3e440849b83e	1	Other	Other
+837f6b0e-7222-4c02-be7d-611cf1e6981f	1	Other	Other
+837f8457-5a7a-4f8b-8d1a-4ba4946371ad	1	Other	Other
+837f94e9-d1b4-46da-a0b2-4ced3ddc444d	1	Other	Other
+837faf90-0e21-4071-b047-4ddc014746af	1	Other	Other
+837fef7c-7a5b-4faf-b5de-0322dcef86f8	1	Other	Other
+83805ad4-b689-43c0-a2dd-1f84c8d299b0	1	Other	Other
+83805f13-4f6c-4c25-af36-33736dcc36f9	1	Other	Other
+83806572-eed9-4f5b-9202-ef4d67928546	1	Other	Other
+83806f7b-48d4-40a4-aadd-c023a2472987	1	Other	Other
+838080d6-f7ee-4e6b-8a6d-4a90165a03b8	1	Other	Other
+8380c395-b2f0-444e-a796-b200297222aa	1	Other	Other
+8380ff6b-11e1-4a3e-9675-26fc3c888356	1	Other	Other
+83811c08-d146-414e-9ef8-2aeaecf6b7c3	1	Other	Other
+838161ad-388f-4f8a-af6a-62b6401a4bfc	1	Other	Other
+8381b3a5-c2d5-42de-a02c-7e82402cb1cd	1	Other	Other
+8381ba41-2780-4bf9-8dc8-f6ec9fc242ca	1	Other	Other
+8381da64-a820-446b-91eb-7ec217d4e062	1	Other	Other
+83822c90-1a83-42ac-9921-f80cf861228d	1	Other	Other
+83822edf-08cd-4fd8-8b14-4969e5eabfdc	1	Other	Other
+83823c40-2e24-486c-ab64-ebe8e93f4933	1	Other	Other
+838269ec-5d18-4f56-8dab-a7598421bf38	1	Other	Other
+838363c0-28cc-4b44-8368-a0e097187ddc	1	Other	Other
+8383c4f0-e696-4b2a-b73e-39afacf6a5eb	1	Other	Other
+8383d42e-179d-4ebb-8f2d-73e189379997	1	Other	Other
+8383e103-8750-4859-9a64-7d61593065e0	1	Other	Other
+83840a1d-c6c3-44e1-8b46-1e164f68f1db	1	Other	Other
+838425cd-538c-4962-8445-635e1564c58d	1	Other	Other
+838446dc-8919-4dab-8aa3-2e49515a7824	1	Other	Other
+83845882-7211-4210-8c3a-f1714d270bd2	1	James	Other
+83847e07-cb71-4395-b633-124c3ffc5a19	1	Other	Other
+838482b7-a9f0-454d-9cee-7d2fb9e3f38f	1	Other	Other
+83853a1d-de03-4d85-9179-252d41090e33	1	Other	Other
+8385c865-f00f-41b5-bcd0-ef31a75198b0	1	Other	Other
+8385fd64-2cb8-42d2-84a8-1859c1dc8887	1	Other	Other
+83860cbe-ee61-442e-aee9-f0d31f68ef03	1	Other	Other
+838684d5-fdb8-45ce-92bf-1aa82505a3c7	1	\N	Other
+8386957e-3578-441e-8172-f5a8c7ffd2b6	1	Other	Other
+83871e56-5547-44ed-a714-fc4b2a76bf9a	1	Other	Other
+83876edd-9a6a-48dd-aa2f-2ad70d97fc03	1	Other	Other
+83878966-a6ab-40d2-85e5-8b810a76d70f	1	Other	Other
+8387ae44-407c-4419-86d5-d269f2e933a7	1	Other	Other
+8388c21c-8a50-4657-8c12-15ce95a99200	1	Other	Other
+83893926-5c88-4b6d-a3d0-64b0dfd0cacd	1	Other	Other
+8389468d-68dc-4f1d-aa90-f495f58327c8	1	Other	Other
+83894b66-8ce6-447f-9c87-82229a34547f	1	Other	Other
+8389785d-df67-480c-80fb-6ec97951f452	1	Other	Other
+8389a036-2ca0-43e9-b603-78ce3a073b88	1	Other	Other
+8389a25c-2963-4cfb-ac35-628bd02ff971	1	Other	Other
+8389b3e2-4587-49e5-919c-293ffbe583b0	1	Other	Other
+8389eed2-a0fc-47f3-8b29-c6b1b78dd42e	1	\N	Other
+838a66c6-d898-42f2-9993-c42a62890da7	1	Other	Other
+838a926e-c459-4b78-8341-86bf6526758f	1	Other	Other
+838abc16-48aa-4834-a167-49c465164a51	1	Other	Other
+838ad368-0df0-46a7-acfb-5496c263d7df	1	\N	Other
+838ad673-024c-460d-9f14-6cb72aeed351	1	Other	Other
+838b3438-8f70-4887-a6f3-d5d19e99c37f	1	Other	Other
+838b7d75-d914-4da1-a497-16336386ef15	1	Other	Other
+838b845c-c173-4760-b9a5-49ba047308db	1	Other	Other
+838bd9b5-64c3-4850-995c-559fbee887d0	1	Other	Other
+838bf2f8-f4b0-41d3-8979-364c61d734af	1	Other	Other
+838c2322-9eb9-46bd-b23a-cffb11974253	1	Other	Other
+838c79e3-56a7-4ecf-806f-1219bad03b74	1	Other	Other
+838c9c3e-8359-4806-8274-be1ed549f934	1	Other	Other
+838cd336-655d-4463-b59d-170be77cdbe1	1	Other	Other
+838d0fcd-7038-4b51-99e3-da96e911d707	1	James	Other
+838d3ee8-b123-468b-a923-35badf98d938	1	Other	Other
+838d449a-525e-4b8f-a99b-a5b0eebdc3da	1	Other	Other
+838d601d-6b4c-4379-8cc5-7989a787675f	1	Other	Other
+838d6f46-0aad-4bfb-9c5a-e5e6d8927872	1	Other	Other
+838d8b58-754b-4a8d-8dbb-9f82db3ecb5f	1	Other	Other
+838daa48-44e1-4f6b-95bb-635e11152af9	1	Other	Other
+838ded36-87fb-40e1-9af0-2bc28e9cbce6	1	Other	Other
+838e2a7a-2874-42b7-8306-671f163b8b19	1	Other	Other
+838e9f73-84b1-4f0b-9388-a68fafbbbc01	1	Other	Other
+838ee7ea-de37-420b-befe-6e2bea6b073f	1	Other	Other
+838ef86a-d8c9-4831-b16b-cfe9dfa3c350	1	Other	Other
+838f1ab5-6ac8-4d3a-8e21-47d474136909	1	Other	Other
+838f2fa2-77b3-46fd-b545-36f70cee29c5	1	Other	Other
+838f3754-a605-4c2d-9f78-536ce3496ed2	1	Other	Other
+838f8a9b-d7dc-47d9-ada3-955f24c409fd	1	Other	Other
+838fa51c-72bb-42ef-a62d-e97c77b80505	1	Other	Other
+83905fc9-04bc-4054-8451-777e7ec832e9	1	\N	Other
+83908f31-cd9f-4e1d-ae1c-e2ba61274f6b	1	James	Other
+8390e5aa-b08c-45a6-868a-9ffefb8e61a9	1	Other	Other
+8391133b-d857-4d5b-a331-ec247a5556f9	1	Other	Other
+83916d84-af4a-4ec7-9acc-efe2a38615ab	1	Other	Other
+8391d930-02cd-4943-93da-bd776ca2c7e6	1	Other	Other
+8391e4ff-17fe-4510-bcac-e7c2b98d22a8	1	Other	Other
+8391fc3f-cfce-4783-973f-fd33239a1e8d	1	Other	Other
+83928bda-1570-4881-a1fd-5877fcbd906f	1	Other	Other
+8392c427-214b-4754-96f0-aaf8613fef29	1	Other	Other
+8392e633-2732-4ff3-b0a9-a4ce5d37d9e8	1	Other	Other
+8392ea49-b8be-497a-b9b4-c2e4e8a01cdd	1	Other	Other
+839305cc-9bbb-4e48-a2da-63a2bc1c4959	1	Other	Other
+839367c7-0bee-4a52-9ae1-d662fe033f08	1	Other	Other
+83938abc-66c1-4bea-ab28-f835cd002c36	1	Other	Other
+8393ac99-46a5-4c26-b5c8-a9990f63b42f	1	Other	Other
+8393f615-7e2e-436c-abd3-07ec86056a94	1	Other	Other
+8393f9b0-dfa9-4f79-b78e-c39d9fe83155	1	Other	Other
+8394757d-2e90-4850-a3d3-b50a3b77c5d0	1	Other	Other
+83948c3b-3b36-4050-8ab5-12d1872d9b8d	1	Other	Other
+8394dfce-7435-4943-8167-eef32eed2600	1	\N	Other
+8394f02d-37cc-4199-9d5e-4bf5ab47b28d	1	Other	Other
+8394fc90-5d5f-4873-b1ac-639cb589c6a7	1	Other	Other
+8395386d-77a0-4bcc-a2b1-02fc592bb836	1	Other	Other
+83956779-10e1-49e9-9292-0f41718cbaa0	1	Other	Other
+83958f6c-8273-4f09-87f2-5f3167551689	1	Other	Other
+83959a7f-90e8-41ce-8cb8-5e6aa12208a5	1	Other	Other
+8395dba5-f492-4682-9bde-1bfc90ffe5da	1	Other	Other
+8395ecac-6ce0-4bc4-8756-45d86560dc68	1	\N	Other
+83961b7e-9ad2-4e72-9214-e4e33a9d3a3f	1	Other	Other
+83968c22-306a-4339-80e0-01171b4cd5b7	1	Other	Other
+8396a1da-8d0e-425a-950f-4b733f629963	1	Other	Other
+8396b7b4-dc01-4ac2-b588-24c767b4ecf5	1	Other	Other
+8396cf25-fd60-4760-86cf-c3bb166cd5e5	1	Other	Other
+8396d3a8-3474-4966-8604-866489a277f9	1	Other	Other
+8396deb1-46a7-4656-95a6-e8a6134550d0	1	Other	Other
+83974334-a399-48b3-b7a0-325424eea3c2	1	Other	Other
+839769f6-26f0-42ab-9e9c-c599c2c26fd5	1	Other	Other
+83976daa-52c2-4ffb-8dae-7b2bdbecce06	1	Other	Other
+8397a316-6baf-4af8-824a-b1db5e9f98ad	1	Other	Other
+8397c124-e516-476b-8932-443eb350eb34	1	Other	Other
+8397d0bc-a6f9-4aa5-8e65-728d89a2d276	1	Other	Other
+8397df1a-d42b-4e84-bf55-a7272ada7e2d	1	Other	Other
+83985aa7-9b7c-4e2e-a1bc-461970211796	1	Other	Other
+8398952b-2ed2-4444-8ed2-26047473e521	1	Other	Other
+8398e5bb-8471-454b-89ed-4f9ef4107840	1	Other	Other
+8398f323-12ca-411a-af35-55b5ef0d2df4	1	Other	Other
+8399040e-e315-4304-b16e-61cb27efaa3e	1	Other	Other
+83994855-26d0-42aa-8541-0d2a8251a6d6	1	Other	Other
+8399a992-2d49-4f40-8c25-00bcbb40c5c8	1	Other	Other
+8399b8af-50d2-4de7-a57b-5a99644b1a3c	1	Other	Other
+8399ede8-f92b-4c42-af57-1b8fab358807	1	Other	Other
+8399f964-cfdd-4ab1-9ad4-eb62f58ad13a	1	Other	Other
+839a15ca-0da1-4bf5-bb28-4b84f9b8910f	1	Other	Other
+839a37e8-11da-4393-81a6-17d5a883951d	1	Other	Other
+839a3e2c-aff8-4bd9-8c95-d6ec6a027c07	1	Other	Other
+839a75ab-bf17-4355-aa76-e16376b44a22	1	Other	Other
+839a7745-7889-4676-912c-30c4e1cc2104	1	Other	Other
+839a98df-b5c5-41cc-b283-6da65ff1d30d	1	Other	Other
+839ab694-394b-4f19-8ad2-06dc559953b1	1	Other	Other
+839b2366-0b0f-4519-9cac-4d134c519df4	1	Other	Other
+839b471f-7b0a-4ce9-b329-3cb0e8951c93	1	Other	Other
+839b5a4e-6114-43e2-86f4-03f399298720	1	Other	Other
+839b6427-ca50-4463-b789-23d4f9ee104e	1	Other	Other
+839b7e19-a53c-4ecd-b0c2-32799e759162	1	Other	Other
+839ba9c7-54cc-4a8b-b6d4-4009973b0173	1	Other	Other
+839bba68-e729-4c8f-a3ae-39730136010b	1	Other	Other
+839bd670-aa09-412c-8a52-1fa7c59e0423	1	Other	Other
+839c1021-4897-44a2-9bd3-8a22a1886255	1	Other	Other
+839c13af-9a8a-4343-bb3c-9384045e508e	1	Other	Other
+839c324c-dbb0-49a9-8418-c22abb88d879	1	Other	Other
+839c66a4-aa7a-4284-b811-bd390bfa4dbb	1	Other	Other
+839cff42-4a85-4e4f-9799-a3bc306bea60	1	Other	Other
+839d097d-c28c-4eda-907b-340e9e36c491	1	Other	Other
+839d6aaf-1f3a-4453-9998-c88b2c661acb	1	Other	Other
+839def8f-eacf-4d1f-960b-ef7de4866157	1	Other	Other
+839df761-e77a-4907-81e1-60c065c3f533	1	Other	Other
+839dfcec-2021-4063-bebb-02eab9186c5f	1	Other	Other
+839e72b9-07d9-4ba4-a88d-d6948c7912d6	1	Other	Other
+839e93bc-702f-4142-b83c-4f218f39b405	1	Other	Other
+839eb265-8838-42a2-a6d1-1d0c5a8fe1f9	1	Other	Other
+839f2f46-c45e-4e65-9e19-61a07f8da93e	1	Other	Other
+839f34d1-8534-4e1b-a9e4-01ecbda59232	1	Other	Other
+839f4cfd-c09b-4cba-a215-51460d03a0fb	1	Other	Other
+839f8490-6be4-4389-8d7f-77f076aa4bc5	1	Other	Other
+83a00952-27a1-485c-b484-b221a53e48a4	1	Other	Other
+83a033af-a480-492a-95e1-3adc1e626467	1	Other	Other
+83a05f18-a23d-4e58-a3d9-10694267eac5	1	Other	Other
+83a077b2-6caf-4353-8e86-4894b8fe5824	1	Other	Other
+83a0af6d-b2e4-4742-bfff-f82585cfd1ad	1	Other	Other
+83a153e5-8ee0-42e9-bbf4-2e468e557233	1	Other	Other
+83a186f5-f94e-4a2a-a40a-bced40c42ba4	1	Other	Other
+83a19a7b-952b-4429-a92e-b6c3ac6b5f6c	1	Other	Other
+83a1a81c-0dca-4597-9df3-81ba4a02f59c	1	Other	Other
+83a1a938-da0f-40d4-a8ed-d0f5d9c84413	1	Other	Other
+83a1baa2-f5fd-47d4-be10-17582c9ed9cc	1	Other	Other
+83a1ce9b-c664-4b06-a47a-481b32b97af7	1	Other	Other
+83a1e008-5797-4924-9753-98055b1e33ad	1	Other	Other
+83a1e661-bd38-4ba3-90dd-70fdb1817802	1	Other	Other
+83a1e760-b4ab-475b-82ce-695328c60cbc	1	Other	Other
+83a21ff7-b39c-4b83-a80f-9955c235d259	1	Other	Other
+83a248e8-c866-40a1-ab7f-3cba3c86b35c	1	Other	Other
+83a27946-c937-4523-8bdb-8379d2ace2ca	1	Other	Other
+83a2a2df-ae22-4ba9-81b7-e605a0c1245c	1	Other	Other
+83a2dd6e-bf64-411a-a579-c1459ce81185	1	Other	Other
+83a2e12e-5bd6-446a-990e-ee6bd2cc6352	1	Other	Other
+83a2fdf8-dea8-4d37-92ae-39fa28511fe4	1	Other	Other
+83a30dd2-a27b-4181-9a9f-3589672d9d31	1	Other	Other
+83a3433c-75d1-4a83-b78b-f2b8dc833b6b	1	Other	Other
+83a39369-85ea-4728-b645-1eaef7b21edc	1	Other	Other
+83a3ba50-125b-4fea-8ff8-3a5ef75f9ea4	1	Other	Other
+83a3e75a-0116-40f1-91f1-2fdf094aa248	1	James	Other
+83a40aa7-d1c8-4de3-86d2-cee08465fe6e	1	Other	Other
+83a40c9d-48ca-42e4-8b14-b197be5b352b	1	Other	Other
+83a41e02-6a48-4315-995a-10fd217a4f5c	1	Other	Other
+83a434c4-18ac-44a5-a215-70047d02e702	1	Other	Other
+83a435c7-652e-460c-a4ac-53db142b9beb	1	Other	Other
+83a44ede-cb56-4c6a-ad46-e6a3368c7825	1	\N	Other
+83a45994-45a4-4342-baf9-6f67915cbf9c	1	Other	Other
+83a4cb68-2520-4656-bee4-27627437a8a6	1	Other	Other
+83a4f66e-a769-48df-ad3c-576458244f0d	1	Other	Other
+83a50cf8-ec95-4328-9264-532d21cb3b82	1	Other	Other
+83a51cfd-e99a-478d-aa95-d43d0dd54437	1	Other	Other
+83a58b46-d831-4e26-a444-8aa4d25b55c3	1	Other	Other
+83a5acdc-4973-4d76-8475-3ab9b6c9fb7c	1	Other	Other
+83a5d8b0-3b1e-4194-9a5e-40fbf9201921	1	Other	Other
+83a5e2e1-792c-4f6e-945a-cd3217ee2ff1	1	Other	Other
+83a60a13-82c4-49bf-85ad-e4e42908cd17	1	Other	Other
+83a62a34-b680-4f84-bfbe-bdf5a984bb5a	1	Other	Other
+83a6865b-43e0-4b22-8166-6ff2395d8416	1	Other	Other
+83a6a742-5c8c-4391-b020-06b6252b67a4	1	Other	Other
+83a6ed52-9194-4fd9-a524-ac0f47e909ae	1	Other	Other
+83a703b5-37a6-4934-be7b-82a6cff2fa56	1	Other	Other
+83a70544-221c-43b5-a70c-188d72e88888	1	Other	Other
+83a72361-69c8-44fc-834a-5f94c58f737a	1	Other	Other
+83a72bc2-cc11-46b2-8b3c-6046d8ff6ce3	1	Other	Other
+83a74dae-e143-40dd-ab03-8f5101203f7d	1	Other	Other
+83a7b96a-422d-485c-b019-2c96b450e5cc	1	Other	Other
+83a7cc7a-dc32-4822-bdb7-ac6fd16ef659	1	Other	Other
+83a7e1dd-69ac-430c-90f7-282a68a43d3a	1	Other	Other
+83a84bfd-0e60-4a24-a811-0377c825ee1c	1	James	Other
+83a86a62-a840-441f-87d9-e1a3dfc0a8a3	1	Other	Other
+83a87c3e-413e-4eed-954b-7273fa9557d9	1	Other	Other
+83a8884e-4f00-4cfb-a96c-abc8bd09e447	1	Other	Other
+83a8b3cd-fd3e-4c34-9dbd-11f30f5770ec	1	Other	Other
+83a8f9a2-6bb9-44db-b01b-cf0f63c7fa3b	1	Other	Other
+83a99707-e907-431e-9b2d-c8fee68e8202	1	Other	Other
+83a9cb63-e8bc-41b8-ae33-96e998d826e6	1	Other	Other
+83a9f371-00a3-433e-ba09-b5366385b720	1	Other	Other
+83ab02f5-3ee1-4e0c-83b1-eb2fcf5b1b42	1	Other	Other
+83ab3c15-f262-4543-91d3-f49f6cd1fbef	1	Other	Other
+83ab64ce-616d-4664-9271-39a7d3e18eeb	1	Other	Other
+83abcb96-e967-4440-b908-e2c7cd036b09	1	Other	Other
+83abe79e-58fe-4aa1-8f88-b1ba660b2ffe	1	Other	Other
+83ac003a-ceab-4083-933b-fff82317e00f	1	Other	Other
+83ac0874-729c-4532-8d35-5ae2fe901eed	1	Other	Other
+83acbbb5-4342-4fe0-819e-501efe9e5df1	1	Other	Other
+83acc401-1184-4bbe-bd76-6b53ba62cb8d	1	Other	Other
+83acd70e-50b8-4d1c-b718-5a72709ea58e	1	Other	Other
+83ace062-71a1-4826-94c7-e649074ba4d8	1	Other	Other
+83acfbbc-c8c6-480e-bbbd-f90fde6a54db	1	Other	Other
+83ad2ad3-61df-46ba-861e-f4d4197c1f28	1	Other	Other
+83ad6085-aee5-4cc5-847b-79ea0318d568	1	Other	Other
+83ad6538-3de8-4855-bf32-3bab3d56cd94	1	Other	Other
+83ad8b50-8404-4cbd-b54f-c2c51e0bfa08	1	Other	Other
+83adc279-0b12-481e-8110-72efc2287eca	1	Other	Other
+83ae32d4-eed6-4f06-b0c4-96549213f461	1	Other	Other
+83ae6efd-7dbf-4219-be31-d579028d45bd	1	Other	Other
+83ae7716-17f6-4ab9-b74a-be94f5c689a6	1	Other	Other
+83ae7845-03f8-4256-9f0e-0796d219d471	1	Other	Other
+83aebea0-5316-41c7-bdaa-40b4f243fa3e	1	Other	Other
+83aee4c3-8c67-484d-a510-8d342468bf97	1	Other	Other
+83aef362-c2c2-4395-bd30-9bde92eb69a1	1	Other	Other
+83af0bd0-b41b-4ec4-98c1-aaf19aaff913	1	Other	Other
+83af1463-0af2-4f2d-a525-5bc35cc03586	1	Other	Other
+83af4d00-f42e-44f5-a393-b0e66a7adb7c	1	Other	Other
+83af6a5e-f6b8-4136-89ab-be062f315c84	1	Other	Other
+83af76e8-0d68-4aad-994a-02988e1c91d0	1	\N	Other
+83af8dca-9a6b-4d1b-a019-e71404ccb853	1	Other	Other
+83af9aa7-b64f-4bc5-ae42-e499bc689ebb	1	Other	Other
+83afb85e-20c4-4560-a78b-7d9be2309c49	1	Other	Other
+83afd95e-c52f-4bbb-8155-4c3e3cfe655f	1	Other	Other
+83afdd42-af6a-4f7a-a61b-8ca3f7163f0d	1	Other	Other
+83b00bdf-4ef9-477c-babf-a07a53e4ba94	1	Other	Other
+83b02d28-514a-40ff-bd5e-7913cec6b18d	1	Other	Other
+83b087a3-97a7-4104-97f6-a6a30a3995cf	1	Other	Other
+83b095e1-9506-49f0-9e79-065f79e5f533	1	Other	Other
+83b0aa76-b1e3-46cf-9e41-3e9b6c9cffa9	1	James	Other
+83b0e020-bebb-43ce-bff9-29377eb141d1	1	Other	Other
+83b1898b-fe41-4b58-adc8-022b7f566555	1	\N	Other
+83b1ad55-a8b7-4e40-af24-6ed9a89408f6	1	Other	Other
+83b1e48b-26cf-4795-93f8-04b6d4fcd71b	1	Other	Other
+83b1f8c6-ba63-4c3c-8888-b939831f8a94	1	Other	Other
+83b235e4-df57-4187-a0af-44fec8360a21	1	Other	Other
+83b2f1fc-87b3-49da-b47e-2c54f8170151	1	Other	Other
+83b34342-a32d-4579-8b22-f023304c2d81	1	Other	Other
+83b3f85c-5c1c-46d7-a8fa-6e5657ffc07f	1	Other	Other
+83b40047-139a-43ff-816b-1f9578d15614	1	Other	Other
+83b41530-342d-4589-8815-d99bf47078d9	1	Other	Other
+83b4d599-e08a-4d55-aa4c-be695a441879	1	Other	Other
+83b4d6de-d8c3-4662-8807-32aaed7fe66f	1	Other	Other
+83b5141b-fb3c-4783-a913-c843d929d9e4	1	Other	Other
+83b58b1c-b0db-462f-851a-38d2e78004ba	1	Other	Other
+83b61341-d2bc-42a5-a936-6807b11f50cf	1	Other	Other
+83b613de-ed4f-4d2f-8e73-edd52ea9cd5d	1	Other	Other
+83b61fe6-8890-422e-ac83-97827f049c39	1	Other	Other
+83b62399-1ba3-480d-8697-873bee0ad23a	1	Other	Other
+83b6335a-a088-4893-8f26-ca770c650b47	1	Other	Other
+83b64e5b-cf01-429e-aba6-5785db3f4426	1	Other	Other
+83b6d10e-94ce-4387-8069-96205a511695	1	Other	Other
+83b6f191-997f-40e4-9a1d-e12e75937d19	1	Other	Other
+83b75393-58dc-4b93-b777-243b4c2e99bc	1	Other	Other
+83b76483-b0d8-467e-b815-d232ab96acda	1	Other	Other
+83b770b9-270b-4a65-a8f2-1602e33c25d8	1	Other	Other
+83b78b35-d271-4a8a-b347-ed5c6f950ecb	1	Other	Other
+83b7a81c-99d9-45e9-9981-9afb4c2900f7	1	Other	Other
+83b7f5a1-a1d5-4284-b5ad-902f84246cf0	1	Other	Other
+83b7fc2d-1998-432a-a2e5-327773c8169b	1	Other	Other
+83b80528-c624-4a67-918d-b3329d6874d2	1	Other	Other
+83b814ba-f2ca-4dd8-b6ef-c9914952dc89	1	Other	Other
+83b897cf-eb08-452b-b120-e75964e62ce2	1	Other	Other
+83b8aeee-5b4d-44a8-a4e6-5d7130904c4b	1	Other	Other
+83b8c02e-9795-11e7-85b4-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+83b90878-fb35-42e3-b541-898278bab24d	1	Other	Other
+83b91a91-6f94-4a9d-a8bf-e83ef0da5511	1	Other	Other
+83b96012-963e-4aeb-880d-ff2da10ec184	1	Other	Other
+83b96507-bd83-4eff-a008-702f331d750c	1	Other	Other
+83ba1342-6e30-40fe-9a77-9136fc8d9d5e	1	Other	Other
+83ba22b9-5ee6-4e17-838f-721c1eb84a48	1	Other	Other
+83ba3e14-928a-4a0d-bf49-48096d3203b1	1	Other	Other
+83ba61f5-4b9a-4992-bec3-ae9a64e9c0f7	1	Other	Other
+83ba8e33-f7bd-42d1-b2cb-9027a136a170	1	Other	Other
+83baa8fb-264a-4214-9e5e-f0bed147be82	1	Other	Other
+83bac2f6-a102-45d0-82c9-5592cd91b14e	1	Other	Other
+83bada06-899a-427c-96d9-a5ef73bf4ec7	1	Other	Other
+83bade72-7ac8-406e-bf2d-7d6c94457536	1	Other	Other
+83bb1514-2fbb-4394-bfc3-0a61ea0f112f	1	James	Other
+83bb1717-ac6b-44bf-9dbf-67fb05d76cbf	1	Other	Other
+83bb6b83-9eab-4d2d-8874-9c7a4215d887	1	Other	Other
+83bb8310-555d-43b9-8536-1e1b7200f8cf	1	Other	Other
+83bbb7e5-15c2-47de-9810-f6c79f3a5269	1	Other	Other
+83bbbefc-58a9-4cc4-98fd-9331cacb2679	1	Other	Other
+83bc368a-5dd4-47a9-a8da-c9727c6e4b17	1	Other	Other
+83bc3927-3b0e-4c92-bfd6-35b2c7e2ab50	1	Other	Other
+83bcc305-9ae0-40e0-8f8e-e1567930e287	1	Other	Other
+83bcd919-3af8-4dff-bb63-ae17e1ec8315	1	Other	Other
+83bd01b4-755c-48ad-b5f7-37d610e04fd3	1	Other	Other
+83bd637e-9b24-4380-8898-62508af6db29	1	Other	Other
+83bd737b-4281-423b-8518-b535e20543c5	1	Other	Other
+83bd95c7-7521-4855-bd96-ddad7d89e735	1	Other	Other
+83bdbd43-96bb-4a4b-9eab-25b02bd473db	1	Other	Other
+83be3b0c-ce38-49c7-9a09-09207a2e758e	1	Other	Other
+83beef4d-5f59-4ba4-ad2e-48b69689b706	1	Other	Other
+83bf1405-ceff-4a96-a940-7806c4d50b9d	1	Other	Other
+83bf3ba6-7b8d-42cc-b2b0-74adc36423bc	1	Other	Other
+83bf4a92-274a-4436-94e0-9a956705314a	1	\N	Other
+83bf4bd0-be21-48d9-80a2-aa3be8c51b48	1	Other	Other
+83bf6198-044e-4528-83ee-6419c3c05d9f	1	Other	Other
+83bf9920-d797-4f8c-834d-a0cc7d649880	1	Other	Other
+83c044fc-c29f-4747-9621-22f7d61d246e	1	Other	Other
+83c0bc34-ca3a-44e7-abf4-bcc9dc867c0d	1	Other	Other
+83c0f0f8-288b-4060-a7e5-098e4fdbca6b	1	Other	Other
+83c13b55-d612-4822-9d43-8a9bf2aa6f4c	1	Other	Other
+83c13e58-6e35-43ba-be8f-c637e3de40a5	1	Other	Other
+83c169e5-8a4b-4f88-9083-8f207eb00e18	1	Other	Other
+83c1a90d-988b-44e2-a54f-4e6a5d08f4f4	1	Other	Other
+83c1abe9-9795-47e2-99dd-affb5a2a5182	1	Other	Other
+83c1deab-2e2f-4d5e-a817-673aa5d14c4a	1	Other	Other
+83c1e060-8788-4b8f-b3ae-44a403607f64	1	Other	Other
+83c1eaf7-6cde-4816-be55-ebb0142478a9	1	Other	Other
+83c21c9d-45b7-4d61-82a7-c492e8452533	1	Other	Other
+83c23d50-fb9a-4699-9b2e-c1f4b940262c	1	Other	Other
+83c252d1-46b9-4366-866e-c808177a5421	1	Other	Other
+83c26b77-f169-41a7-8b18-7595d6ac2f80	1	Other	Other
+83c26edd-e991-412f-a059-57277b364a93	1	James	Other
+83c2781b-bc64-4b57-a986-e76be22b77f5	1	James	Other
+83c2f203-a9b2-42ff-ae69-a4d3a5471521	1	Other	Other
+83c36a78-80f4-4a53-8d70-e32adf7e663f	1	Other	Other
+83c390fb-1051-4cef-9f31-f6689a026004	1	Other	Other
+83c39734-bc8a-4ef5-bec6-d7df1943c39e	1	\N	Other
+83c3de24-9865-4850-a214-058efb62bbc5	1	Other	Other
+83c3e5a1-49ce-496b-9265-f6a05df60640	1	Other	Other
+83c425e5-bdcd-43d0-9071-171ce1340265	1	Other	Other
+83c439ba-a51a-4bc6-ac78-d6ce4e4fa165	1	Other	Other
+83c456c3-47e5-4e9f-8a2c-d1147350f2a8	1	Other	Other
+83c47b65-2891-411d-988b-54ae0306d4da	1	Other	Other
+83c485ee-4113-45dc-a553-a5b8484d181f	1	Other	Other
+83c49a74-4caf-4e24-bb4e-45da80a85557	1	Other	Other
+83c5890d-c394-4d78-b6a5-4cd917d5b3c2	1	Other	Other
+83c5a406-49d9-47b1-bfda-3e70d19a0593	1	Other	Other
+83c5c0f5-6ccb-4b21-b38f-d547d3d68b9a	1	Other	Other
+83c6522b-f5aa-4f57-8253-9ea6d56157a6	1	Other	Other
+83c72727-8131-40e5-84b9-321e07e9cdc9	1	Other	Other
+83c72734-a18f-415b-b41b-53f3fb3797ed	1	\N	Other
+83c7534d-7e57-4aba-892d-4f7d3af60230	1	Other	Other
+83c7d004-27ed-491c-9539-55efaaa70d5f	1	Other	Other
+83c7e8c9-a52e-4a61-b632-b0a3cdd5cd99	1	Other	Other
+83c7f416-9843-4e44-8463-6e51447e259a	1	Other	Other
+83c814cb-2ed6-405a-8153-46b7521acba6	1	\N	Other
+83c85816-8da7-4487-b688-9453f808c769	1	Other	Other
+83c8638a-9142-428d-99cc-5eff5f6a0ed0	1	Other	Other
+83c8b109-10d0-4ad7-a812-a4970ec8ddf5	1	Other	Other
+83c8e9a3-9352-4468-9895-15207e8d24cb	1	Other	Other
+83c8ff42-756c-4c0f-bb07-aa1a4b8f0bb0	1	Other	Other
+83c9680a-4833-4a1b-8f0c-922773dcdd19	1	Other	Other
+83c9d5f9-070d-4845-beb6-408ce34fad92	1	Other	Other
+83ca4d0e-0f88-4dec-8ebe-44f6fb911eda	1	Other	Other
+83ca569c-97ad-4e3c-8e34-8564a67cdd5a	1	Other	Other
+83caae83-919a-4b33-bd59-579f46855b89	1	Other	Other
+83cab7c4-2da2-4e00-a354-1b53797e7c0a	1	Other	Other
+83cad133-3303-479e-8d99-4f8f06659d71	1	Other	Other
+83cb0363-ac5e-4723-a4c8-c6374448cc25	1	Other	Other
+83cb1e5e-5b81-4c3b-8f7f-a85be6f5c435	1	Other	Other
+83cb1f4b-6a52-443b-9723-27f97b08347e	1	Other	Other
+83cb82e3-bff2-41eb-b3ee-25b9d57a72a2	1	Other	Other
+83cb86dc-2179-4b3d-acb6-3234afe5be93	1	Other	Other
+83cb9668-5fa8-46bc-b8ee-e1569c1d6adc	1	Other	Other
+83cbde0d-6166-4e87-a084-edb6337cff97	1	Other	Other
+83cbec4d-e98d-4f1c-a5b4-183b1415e4b8	1	Other	Other
+83cbfabb-cbc6-4652-9edb-601fe03e801f	1	Other	Other
+83cc48d4-d856-415b-9f2e-cc7d5a610fdf	1	Other	Other
+83cc64bf-e677-41af-8a57-dc090bca8675	1	Other	Other
+83cc9cc4-e983-4dd6-8965-c9dccd91044b	1	Other	Other
+83ccac30-ae48-4c51-a529-d64875ef9213	1	Other	Other
+83ccd4c5-a514-46cb-a3f3-6108a54167e1	1	Other	Other
+83ccecf3-16f8-4932-add1-3cfef60910f0	1	Other	Other
+83cd21e6-81ba-4600-9d3d-fa508373e0a2	1	Other	Other
+83cd8d5f-30b5-4804-b3d8-1ac2bb3e5ad1	1	Other	Other
+83cd9402-c127-4d91-bddc-bbe8ae914e42	1	Other	Other
+83cdc266-0779-48f2-bb6a-52408bfd912b	1	Other	Other
+83cdca16-1b5b-46de-84eb-7ac3df61937d	1	Other	Other
+83ce1834-1fca-4ac0-af65-381cc3152193	1	Other	Other
+83ce1d08-ab48-4969-a16c-9d25cd736db9	1	Other	Other
+83ce26c9-6ce3-492d-82c6-367477b3a737	1	Other	Other
+83ce41d7-6e8f-4c89-9d87-b711cb4bc2b7	1	\N	Other
+83ce7e0c-d70c-4620-bdc7-723e5ff55693	1	Other	Other
+83cedd19-2760-4daa-85ec-b67cd1c2bccd	1	Other	Other
+83cf0179-14e2-4ca7-ad54-8c2868ed7db6	1	Other	Other
+83cf387b-c143-469a-a584-ce6fd92ae95e	1	Other	Other
+83cfc79d-77a3-4ed5-8324-1f29427ce34e	1	Other	Other
+83cfcd52-e2b9-4944-8baf-1b2d5d98c09b	1	Other	Other
+83cfea9f-5ae3-4699-8468-d8ae2cdab9b9	1	Other	Other
+83d0746b-0687-46d3-907e-5a5aa1ecb6e6	1	Other	Other
+83d097a2-6711-4bdc-b85e-b214a25c28f9	1	Other	Other
+83d0e1a1-4460-4850-bd96-4e7762732f90	1	Other	Other
+83d0f73a-d518-4e00-bda8-f4a65eaa85b9	1	Other	Other
+83d0f7c7-bde3-4e5e-9ee0-b6c984cbc18c	1	Other	Other
+83d0fae8-aefe-4920-932d-8ddb3be7cebd	1	Other	Other
+83d0fcad-3f90-4df9-af10-23fa79eb331f	1	James	Other
+83d1282e-1cad-4a26-bd71-069a8c830776	1	Other	Other
+83d13f81-8c68-4785-adba-02a60993bc36	1	Other	Other
+83d17edf-4db5-4212-940b-766b221696cc	1	Other	Other
+83d195f1-799a-482e-ae1a-8817fdad2307	1	Other	Other
+83d1a1d3-d31e-4d42-b5e7-c152f9ab88ec	1	\N	Other
+83d1e16d-890c-4409-bcbb-37586cc5a90f	1	Other	Other
+83d1f8cc-4d79-4cb3-a98e-056fcba08717	1	Other	Other
+83d20713-6511-4313-9675-202d5cee826c	1	Other	Other
+83d26619-a78c-43c0-8987-d5c5ae82749c	1	Other	Other
+83d27078-2608-49ac-a201-de2d0ab78a35	1	Other	Other
+83d30bca-1b5c-4652-ad3f-9c7800f35dff	1	Other	Other
+83d351ad-4087-4c96-93ee-7b7f7191a3fe	1	\N	Other
+83d36731-e5cd-4cb1-b6c5-9bd7c9b4cabe	1	Other	Other
+83d37a46-e16c-4ef9-84e1-33825e0d455a	1	Other	Other
+83d3aec4-106b-429f-bb90-cc589e5fd053	1	Other	Other
+83d3b369-f78a-414d-96af-b7b803b18815	1	Other	Other
+83d3e6d7-c5d8-4624-b3a7-31b56a663bc0	1	Other	Other
+83d3f858-135c-480a-98b9-752c05606e05	1	Other	Other
+83d44032-14f1-444a-862b-74a11792db96	1	Other	Other
+83d49bac-6f0b-4d94-8ebe-3662099b826d	1	Other	Other
+83d4e8af-d479-4cf4-a033-408db2a5d53f	1	Other	Other
+83d5036f-2c61-4bad-92ad-2e66921f477b	1	Other	Other
+83d525a6-37b7-4c18-8387-6b0710cfe7b0	1	Other	Other
+83d54d58-03ef-4c25-936b-06413b2e510a	1	Other	Other
+83d55204-7b94-471c-a07a-61fb0813fdca	1	Other	Other
+83d57586-963e-456e-8993-edd524009737	1	Other	Other
+83d58276-e375-4bb2-a68c-9641b381cf95	1	Other	Other
+83d59652-6206-4f6a-94ab-6e399ece07b7	1	Other	Other
+83d5a1ca-a56c-4601-9814-6e9295f1d6e0	1	Other	Other
+83d5a28c-b443-4b92-b572-6f90d7dc36e4	1	Other	Other
+83d5aa91-89b5-481e-9664-f80fc9b186e5	1	Other	Other
+83d65194-7896-4ef2-ae80-b8c4659a0e14	1	Other	Other
+83d68c1c-4109-44bd-98ad-bee052502926	1	Other	Other
+83d6b28f-d622-403e-9b99-3b83e29279df	1	Other	Other
+83d6d6b9-4d78-40ec-a0dd-4a78f2179f36	1	Other	Other
+83d6fd27-2fef-441d-bde6-28911a10441a	1	Other	Other
+83d728aa-edda-4ee6-974e-bb069517db4a	1	Other	Other
+83d73079-9111-4257-9578-9d1b162e6a9a	1	Other	Other
+83d74b8d-0d74-4a6f-96f9-67bf41f8f29b	1	Other	Other
+83d74fa0-e195-4fbb-98a7-1e76801285de	1	James	Other
+83d76a7a-c536-4b46-895b-8c6123b88e80	1	Other	Other
+83d76b04-c082-418d-9388-76a21c3fd779	1	Other	Other
+83d76cfd-8629-4795-9452-f60d0deefda6	1	Other	Other
+83d7907d-13cb-48cb-98ea-56a4d77b55f7	1	Other	Other
+83d7a334-deb9-4633-8f39-33aadcb43c6c	1	Other	Other
+83d7fa6e-ccfb-4b83-bd56-92e6f28789a7	1	\N	Other
+83d81e99-7426-46b8-93f0-2b6954a48726	1	Other	Other
+83d83634-56f3-43fc-8c87-3572e82930fe	1	Other	Other
+83d84434-82a6-4a21-a984-227863f34fd2	1	James	Other
+83d84814-efc3-4282-a45a-51bfab206125	1	Other	Other
+83d8a1c8-72dc-4a31-8549-1acf70ae49bb	1	Other	Other
+83d8c8bb-0d6f-428c-9d48-19d1436c4555	1	Other	Other
+83d8fe55-26b6-4590-bd8a-309b0cfecc72	1	Other	Other
+83d9a69e-e179-4f2c-8ba0-5daa9a2f4dc1	1	Other	Other
+83d9b769-1c1e-47cc-bb4a-fa86446867eb	1	Other	Other
+83da129b-1b0c-480d-b42d-edbb6712e052	1	Other	Other
+83da1de9-cf10-4abf-a04e-38e65bd8fab3	1	Other	Other
+83da3491-ceea-4385-9a7a-ed76b48cdf92	1	Other	Other
+83da4362-e9c2-4b10-8133-06517915e580	1	Other	Other
+83da8192-2d5b-4102-8a1b-49acd6f3a9cd	1	\N	Other
+83dab1f4-10ed-430c-aff8-6807b75bb971	1	Other	Other
+83daf935-288c-40e4-bf0c-f02dceea71d2	1	Other	Other
+83db25e2-bc6c-4cd4-88b0-dfb2da9a40ee	1	Other	Other
+83db3d23-3b31-4f62-bf21-2f7173e3dbc2	1	James	Other
+83db5105-54b4-49d1-b2e6-2670c9a47c04	1	Other	Other
+83dbca64-d229-451a-9759-7214fabebceb	1	Other	Other
+83dc0302-27c5-4b35-880e-cbe29388bcbb	1	Other	Other
+83dc1495-8ed4-4f00-824a-9432fe20bc17	1	Other	Other
+83dc26fd-e5c7-4317-b0ed-0f107324eaa5	1	Other	Other
+83dc7034-bbd6-4e15-8284-41dd8d85567d	1	Other	Other
+83dc7075-e294-470a-ba6b-cc56df17c166	1	Other	Other
+83dc7a1b-903b-4e3f-a3f6-06ad71c1cdae	1	Other	Other
+83dcba88-0ef6-459e-b7fb-9cf6c826573a	1	Other	Other
+83dcc676-7533-4e9e-a17b-6235594129b0	1	Other	Other
+83dcdd75-b87d-4b7e-8b13-1afd496f5ff4	1	Other	Other
+83dce9c2-18f9-4bf8-8628-6d1bc36134df	1	Other	Other
+83dd245e-5310-440d-85cf-3f36965aaa21	1	Other	Other
+83dd401e-93d2-459a-9662-9094a80f767f	1	Other	Other
+83dd72fe-4ee1-4d33-b070-41978da7c464	1	James	Other
+83dd80bf-321d-4c8d-93ce-bbc8f583731b	1	Other	Other
+83ddad3b-01db-4b85-8945-bd90bdfdb5a0	1	Other	Other
+83de2979-06c1-488c-8196-7b9c71b7ea6d	1	Other	Other
+83de3367-e95f-492b-be50-17b1541bc85d	1	Other	Other
+83de3aa6-5cf1-41e0-9c37-2b577e66ef21	1	Other	Other
+83de811f-8270-4ff5-9ca7-e92151813d08	1	Other	Other
+83de8730-70c9-4067-ad92-c1ea6c398546	1	Other	Other
+83debb30-f1fb-4233-ae20-018c526f6be5	1	Other	Other
+83debbc2-158f-4bf2-bb61-51f9433692d6	1	Other	Other
+83dec7de-de91-4053-a6d0-bccce494977d	1	Other	Other
+83dedcd9-7350-4f42-addf-fa3715fc224f	1	Other	Other
+83df0c73-36f4-47e9-8294-366e74361dcd	1	Other	Other
+83df0c9c-c79c-4f8b-9032-0d4f8327805c	1	Other	Other
+83df1b1d-d825-4195-a9fe-c32c2e74843a	1	Other	Other
+83df5148-7e94-441e-bc24-07e2364c9319	1	Other	Other
+83df5d87-a66d-4593-b91b-03157fe7cc01	1	Other	Other
+83dfd256-6d0e-443d-9d28-f719000ea382	1	Other	Other
+83dffba5-443f-4456-902c-4bbe50299fc9	1	Other	Other
+83e0492f-0b15-4f38-9d58-bb9f41c9ba85	1	Other	Other
+83e0517a-66e2-49de-a798-d95c1ab2aa16	1	Other	Other
+83e06ab2-5c67-4678-b281-f07a7af0218c	1	Other	Other
+83e0717c-4e26-4cbe-a8a5-53d5a95ff950	1	Other	Other
+83e08244-d795-4a42-9ef7-d0ba55ba686a	1	Other	Other
+83e09536-3f3f-44a6-a96f-9f29127c85d3	1	Other	Other
+83e0fb11-698a-4f82-9eb3-966a44fae94a	1	Other	Other
+83e11588-70a0-4821-b364-f847642377be	1	Other	Other
+83e14622-73a7-459f-9519-29645f14590b	1	Other	Other
+83e154b8-71a0-4379-8a6b-6c6f1ee284b6	1	Other	Other
+83e20d8d-4da0-4f90-b10a-3ef018cb8c26	1	\N	Other
+83e249d1-3330-4305-8de4-72ba4866797a	1	Other	Other
+83e26f24-454c-41b3-96a6-4216f9d26c46	1	Other	Other
+83e2a279-d1e3-4c7d-9d3e-7d3ddf655631	1	Other	Other
+83e2ce47-8fc4-4807-af28-9514b8827e31	1	Other	Other
+83e2fcf6-1a76-445c-86c0-55f5dca4e57c	1	Other	Other
+83e39154-9618-4d79-8b00-f6d02c07c0eb	1	\N	Other
+83e395c0-f9f8-4eb7-9fa7-0860aa3b0694	1	Other	Other
+83e3a821-9b62-4c77-91f7-59118d7b912b	1	Other	Other
+83e47075-2e6f-421a-b52d-20217b909bd2	1	Other	Other
+83e4d591-0729-4813-bb7d-d62833b373a0	1	Other	Other
+83e50eed-eb9d-495f-a624-fde1e1cf8c78	1	Other	Other
+83e54801-2ae4-48f2-a12a-f9ca49322115	1	Other	Other
+83e572c1-30cf-4cdf-b6c5-d7f901736ad0	1	Other	Other
+83e63c3f-bb8f-4f71-8c46-e58e2626170b	1	Other	Other
+83e66024-223b-4e91-9520-e8b7d722ccba	1	Other	Other
+83e67e49-eaf0-4dc0-8f12-ffcb1df430fe	1	Other	Other
+83e6a03d-e8ff-4b52-80b2-a83168741296	1	Other	Other
+83e6cd3e-6bfc-4578-a476-4861898924c7	1	Other	Other
+83e6fd12-6043-44fe-bdd4-8c3bfa550fc9	1	Other	Other
+83e75b51-88aa-435c-a033-e545ab1129d2	1	James	Other
+83e7a185-3bd3-4609-803e-68ee284121a9	1	Other	Other
+83e80115-1d49-4004-8ed6-cf55893cc0ca	1	Other	Other
+83e83a8d-623b-47a7-9fd5-5126823c5f79	1	Other	Other
+83e84017-2ab1-455b-b4f5-7aff8ff3373d	1	Other	Other
+83e85a49-847d-48f4-970d-c551cf40046d	1	Other	Other
+83e896bd-49f8-4354-b89b-6af251b06c29	1	Other	Other
+83e97950-2658-4042-871d-e7e0ee53168a	1	Other	Other
+83e9d91e-4408-4e21-9e1e-360502f2022d	1	Other	Other
+83e9fcd5-c1c7-4975-82c3-e95d0567c78c	1	Other	Other
+83ea1f99-ccfe-4ea5-9ddc-5f619ef4d508	1	Other	Other
+83ea331b-20f9-4a1d-98ed-fe081fc18007	1	Other	Other
+83ea4b88-21dc-4f11-8867-15806c930eac	1	Other	Other
+83eb189a-b9bb-4d82-981c-b48793c9356a	1	Other	Other
+83eb4259-683b-4ff5-9fc7-6d0d7245c06d	1	Other	Other
+83eba0f5-e562-4a39-a4cd-8b366484335b	1	Other	Other
+83ebd181-4878-4601-8356-eca69db412dd	1	Other	Other
+83ebdd50-9fd9-47fe-be27-42a777832321	1	Other	Other
+83ebe19b-7ad7-4379-ae45-01c3d2641e54	1	Other	Other
+83ec2a72-7b1b-4f97-bcb8-1da5412b1c13	1	Other	Other
+83ec9da8-27d4-4950-b46c-7c63ded8fc60	1	Other	Other
+83ecaaa0-a69d-4c9f-9db2-8efa49601831	1	Other	Other
+83ece681-94d4-4c65-80d4-27528de961df	1	Other	Other
+83ed1846-6055-415f-9b9a-2737474aa5c0	1	Other	Other
+83ed3e7f-13e7-40b1-b19b-101578a1d97c	1	Other	Other
+83ed8856-319a-43aa-8129-df29adc99f85	1	Other	Other
+83edbc0d-aca1-4fe2-9da5-4918a5cd575c	1	Other	Other
+83ede757-be5c-4d14-9b3f-99b6aa9042ce	1	Other	Other
+83ee6d3c-5104-4160-9a16-ab34533c69cb	1	Other	Other
+83eea0d5-760a-45ba-8fdf-f6c684f26042	1	Other	Other
+83eea2aa-41f6-4099-aa62-7891b3422068	1	Other	Other
+83eeb637-ad62-40b9-bf3d-de134d2f3c8f	1	Other	Other
+83eef335-105d-41fd-b981-cebc9303cb62	1	Other	Other
+83ef3113-5aa1-4edd-bcd8-f67b26ea46c3	1	Other	Other
+83ef5ab2-f902-47ac-b599-1532a5e7a7c3	1	Other	Other
+83ef82fd-6e2a-4507-ae79-7e93edbe3b36	1	Other	Other
+83ef8861-6cb0-4517-a94b-ba098f1e65d8	1	Other	Other
+83ef8f77-9f3b-4a5d-9097-c951b4e3fa32	1	Other	Other
+83efad28-b624-4e4d-81f8-4bccdf8dc236	1	Other	Other
+83f0327f-10e0-4525-9e0b-900b75008187	1	Other	Other
+83f0358b-882e-4ac2-882a-211c168321ae	1	Other	Other
+83f08724-c7e3-4d47-a107-58f9916a62cd	1	Other	Other
+83f0efb0-e1cc-445b-acc7-e02911d1bdf8	1	Other	Other
+83f1252b-8771-45c4-ba56-1cfad6439e89	1	Other	Other
+83f183c1-4d4e-4941-a1c6-743ed695f530	1	\N	Other
+83f1cb20-ddc6-4c67-a721-7d49caa4e43f	1	Other	Other
+83f21c4c-1a5c-48e1-8661-bd6afbf01eb3	1	Other	Other
+83f224ae-c865-44a5-8b7c-ee232152b25d	1	Other	Other
+83f239bd-b823-4426-b5e2-939f4a6f6821	1	Other	Other
+83f2a7cf-ba3f-48fa-beb9-223760b7694c	1	Other	Other
+83f2c7fc-b2fc-46c3-9e9e-5f75eb04c614	1	Other	Other
+83f2d9e0-fc7b-4dca-b8a5-aa8ca9c14bed	1	Other	Other
+83f2e180-4b20-4605-a333-dc514a17f8bb	1	Other	Other
+83f31a29-f144-4955-85dc-0fe216e1727e	1	Other	Other
+83f33de8-fac9-4741-b1e9-c30af35847da	1	Other	Other
+83f3407b-aa0c-45a6-aa01-6cf06cce262c	1	Other	Other
+83f349ac-5640-4a73-a167-7eb3fe62ebc2	1	Other	Other
+83f3d5bd-ecad-4028-a16b-d15b311067ea	1	Other	Other
+83f3ef95-b17e-4adf-a949-1e8d920b90f6	1	James	Other
+83f45d25-8050-41eb-b468-08138addcaee	1	Other	Other
+83f4a3d3-e686-4287-ba1e-ce1462c555f9	1	Other	Other
+83f51aa5-0f12-4e76-a6be-17d7c5f88ef0	1	Other	Other
+83f5297e-59a7-4072-a8a2-6e34e4cc9d01	1	Other	Other
+83f53b78-8274-4dc0-8403-270d42c379d4	1	Other	Other
+83f5428b-eec0-4f3d-9297-84969eb40df0	1	Other	Other
+83f563ae-6b70-4601-b8a4-b9cd893bf982	1	Other	Other
+83f577f1-695e-4454-a543-11e567229dc1	1	Other	Other
+83f5ac32-917d-4a1c-bc9f-ab734d79ea6e	1	Other	Other
+83f5b8c1-0ace-41e0-8e17-6d0dd2573c92	1	Other	Other
+83f5f928-8470-4b17-8e63-c19c2d4967c0	1	Other	Other
+83f60e28-dfa7-48c7-8c55-7a6a91afc3e1	1	Other	Other
+83f624ca-255c-4784-8e76-c27f8a4e4d93	1	\N	Other
+83f64c6c-70b8-499c-8399-6ac2d526a777	1	Other	Other
+83f75525-7ab4-4239-8a09-f7bd412170ce	1	Other	Other
+83f766eb-35eb-44ae-9367-9d2c15061992	1	Other	Other
+83f78b0a-f06b-4fe9-8cc1-f66f7ccdeaa8	1	Other	Other
+83f7bd97-fe36-4d08-aad9-a46fe98ee4ed	1	Other	Other
+83f82329-d5de-464c-8817-c73725f7981f	1	Other	Other
+83f855e4-46a5-4ccf-871d-af8a75d1a7a8	1	Other	Other
+83f86580-c63c-42f2-89ab-a7970536faef	1	Other	Other
+83f89c97-6921-4d12-ab11-0d517e57d799	1	Other	Other
+83f8b687-318b-419b-9f1b-d7fc4d674cc7	1	Other	Other
+83f8e199-181d-45cc-94bb-b9d75a3ce2c9	1	Other	Other
+83f93f02-cd70-46ec-b33e-8a33c39056c8	1	\N	Other
+83f94c7c-925d-4a7e-b96c-a384662d78e7	1	Other	Other
+83f9587f-a349-4b77-a457-c890fe1275cd	1	Other	Other
+83f96393-1012-4045-945c-68e6ac51316f	1	Other	Other
+83f98d62-ffc9-4d68-b6f3-652b2473d220	1	Other	Other
+83f9b11c-068e-431d-bc70-c46cbbd26534	1	\N	Other
+83fa39ea-f3d7-4449-83f4-146dd88c1f79	1	Other	Other
+83fa5d28-ce81-43de-9e3c-60b4c92a6cf2	1	Other	Other
+83fa9f32-1f03-4041-9962-f8f12cbb4e34	1	Other	Other
+83faa0c0-c95f-4c36-ab69-99a17219708f	1	Other	Other
+83faacf4-0574-4ff7-bd2e-06537e71e716	1	Other	Other
+83facba1-6d84-4ade-9f8d-1f1f7c560443	1	Other	Other
+83fad8d2-dc0c-4bf1-9cdf-c7ee3e8b3935	1	Other	Other
+83faf75f-1268-49e4-abf8-103209667330	1	Other	Other
+83fb6177-1488-4519-b2f1-985c9529be87	1	Other	Other
+83fb63de-bf76-4a43-b03d-0e4c3456431e	1	Other	Other
+83fb9670-606b-46b8-ae37-c10b68291e48	1	Other	Other
+83fb9ea0-7987-4ecb-b7c2-50c250b7d262	1	Other	Other
+83fbbed8-a774-4867-a8c3-8674e4f264c9	1	Other	Other
+83fbf490-55b0-4c88-b0b2-0aff5c967224	1	Other	Other
+83fc13ad-0f3f-4471-8e35-3f933077483c	1	Other	Other
+83fc28da-68ba-45f1-86f3-e98587ee3625	1	James	Other
+83fc5430-adbe-4486-9b73-6676a69eca21	1	Other	Other
+83fc5458-781a-4495-985e-cfc8c8eeff0d	1	Other	Other
+83fc57f7-53ef-45fa-8e3c-612badea7092	1	Other	Other
+83fc5fe3-0036-49a2-b316-c7cf6d7f1979	1	Other	Other
+83fc9d8a-336e-4572-a0af-2c1e640c5ca8	1	Other	Other
+83fcc148-c22f-4d2c-b247-ce36d6477132	1	Other	Other
+83fcc301-de7f-4ae0-aef5-fb7de6d9dc6d	1	Other	Other
+83fccd41-3614-433b-8a33-714be6d4e537	1	Other	Other
+83fd0618-9f7e-433b-aa56-427d200aa551	1	Other	Other
+83fd4ab6-6208-40e2-83f2-2d5fa0cf8da2	1	Other	Other
+83fd87fd-e37c-412b-9aca-fa2896406d01	1	James	Other
+83fd925e-32a3-495e-9f3b-8b79e81944d3	1	Other	Other
+83fdb0ea-810c-4a18-b45e-bb2b74749d26	1	Other	Other
+83fdb97e-0035-4c48-b198-8fb06d0219b4	1	Other	Other
+83fdd9d4-bc54-4f8e-9bac-683d6b1dc1f4	1	Other	Other
+83fde4a2-4cba-4d1f-8188-36531cbb68c3	1	Other	Other
+83fdfca1-7047-4467-b19f-0226ce864d77	1	Other	Other
+83fe9a43-441f-4e7a-9f39-d3228e634b45	1	Other	Other
+83fea415-ff38-4718-8c38-fb8f2ac86af5	1	Other	Other
+83fea90f-1e57-4e0a-aec3-8cae929c6776	1	Other	Other
+83febc97-8b20-495d-acb8-a62f83501e87	1	Other	Other
+83ff34ff-494c-4c34-8cef-c35620166b87	1	Other	Other
+83ff38c5-5697-4373-ad44-09bddb572285	1	Other	Other
+83ff8672-21fb-464c-a3c1-f8261c39481c	1	Other	Other
+83ffd82b-922c-45d2-9639-a2193e494454	1	Other	Other
+83ffdb57-5318-410b-871a-0128ffdb8a7f	1	Other	Other
+83fff7d1-f85c-4879-99c1-420e2e2e1a70	1	Other	Other
+840004e1-f3f6-4560-8898-06cb100df2d4	1	Other	Other
+84004e85-39ff-4ef4-8a52-50f2e89efeaf	1	Other	Other
+84005612-c3a6-4468-9cee-e0966b6c0dc8	1	Other	Other
+8400acf6-6d99-452f-aca5-7287bf5e3aae	1	Other	Other
+8400c6e6-f03f-49fb-b359-512ceb4b07b0	1	Other	Other
+8400c9ef-37b8-4ac4-806f-c2aa43658824	1	Other	Other
+8401353a-936c-46f1-b457-0d35703feff9	1	Other	Other
+84022429-9896-4201-8533-c1799696e720	1	Other	Other
+84026438-6788-4635-bc4a-097e4f45f46c	1	Other	Other
+84028e59-9180-430d-973a-326617f69e35	1	Other	Other
+84029e81-63f6-4179-a873-8974ef0236d2	1	Other	Other
+8402a05c-c16c-4ca2-a0fe-94e3f24e83c5	1	Other	Other
+8402ac2d-b5fa-405b-8bb6-370b5480ba8f	1	Other	Other
+8402bcfb-3e55-4267-bb42-8b723d3198b5	1	Other	Other
+84031181-418d-4b3a-a521-d5f5eb4c81b2	1	Other	Other
+84038f7f-0eb5-40fc-a81f-5da6f7ee644e	1	Other	Other
+84038ffc-c433-48aa-80c1-1f8819f65b98	1	Other	Other
+84040a6a-c6c3-496b-a995-94d34bf229d3	1	Other	Other
+8404431a-ce16-43f0-961e-777bc5369b29	1	Other	Other
+84045f16-3dba-409f-a35a-44ccb8fd4bb3	1	Other	Other
+84046d4c-2402-4295-80f2-ca203eb75208	1	Other	Other
+84048e0e-1804-4768-b78d-f951c84d87bf	1	Other	Other
+8404b9c6-69bd-46ce-81c1-bf87be781758	1	Other	Other
+8404dd36-0ea8-4b0b-90b0-ae7c905e0b9c	1	Other	Other
+8404f2a9-43dc-4584-8d38-a7230243e3e8	1	Other	Other
+84050a9c-34ed-4935-9298-9e0ad68be468	1	Other	Other
+84051a8c-57c7-454d-9665-e11bb1b7b603	1	Other	Other
+84055feb-a8da-4181-bc3c-ec7815aab565	1	Other	Other
+84058a9b-47a7-486e-b5f4-753cb08c43e4	1	Other	Other
+8405cfed-5757-4f6e-9390-8acea6ebf9cf	1	Other	Other
+8405e5ae-21bc-4f5c-b8e6-68c25a2375c1	1	Other	Other
+84067725-8362-4456-a537-aafbce4c9ac3	1	Other	Other
+840678da-0e6e-43e0-9ee3-c9afc3cb118a	1	Other	Other
+84069be6-5ec6-46fb-b34d-059c6254ba50	1	Other	Other
+8406b9e6-2940-470c-a011-355a74118e95	1	Other	Other
+8406e386-39d6-4a62-a106-aa2371b18dc3	1	Other	Other
+84072f76-e657-40e7-8b85-b9733f503e33	1	Other	Other
+840741b4-273e-4c31-a76f-c59664466a38	1	Other	Other
+84079032-06d7-4b49-9923-7be67b771e1a	1	Other	Other
+8407f077-a255-4dfc-99f9-bfa42683c49d	1	Other	Other
+84080de7-24ff-425f-ae13-5a1b4cbcf6c9	1	Other	Other
+8408127f-bc47-453f-80e2-30f5a0a85d55	1	Other	Other
+84083999-8aea-4152-821b-d6a167e1f2e4	1	Other	Other
+8408b6bb-ed48-4a59-aa54-18d05cb2455a	1	Other	Other
+84094c61-cd10-4c6b-9ebe-820e7b9724d9	1	Other	Other
+840964da-0245-4561-a1d2-22450e1c16c1	1	Other	Other
+8409b6be-6064-424d-89eb-5b01bdc2fa77	1	\N	Other
+8409e9a8-76f0-42e8-b097-9813b07a2115	1	Other	Other
+840a1f25-9380-4c22-907f-350b40786913	1	Other	Other
+840a9728-a42f-409e-8f24-66b033256832	1	Other	Other
+840a9f00-d234-4a77-86ac-94b79a4554cf	1	Other	Other
+840acf8b-e78c-4ba6-83a2-b1e760797e1e	1	Other	Other
+840ad6fb-504e-4c02-a7b5-3825e8ef66f0	1	Other	Other
+840ad91c-5210-4c6d-9066-64520d78306c	1	Other	Other
+840af0a5-52ad-4a0a-aebc-a01c7cf4a2d9	1	Other	Other
+840b2da7-9350-41be-b89c-87c99ecd235d	1	Other	Other
+840b2eaf-6f36-4a1e-8f86-9ef6245d09f3	1	Other	Other
+840b50de-7d0a-4dcf-9c53-ad840eb35521	1	Other	Other
+840bcb06-a898-4e96-adbb-10ce7cad06f0	1	Other	Other
+840c30e6-03b5-45e6-bda2-e3f2f8515ccc	1	Other	Other
+840cc8ea-964c-42a1-bff1-139bce1077ec	1	Other	Other
+840cc971-f844-4b33-9872-4ed79fc823bd	1	Other	Other
+840cd053-aead-4556-88a8-4c764daf5a71	1	Other	Other
+840d3c98-6c32-4cb8-b551-c5c38fbc1225	1	Other	Other
+840d990e-dd30-434c-b7cb-37d727b1bcf5	1	Other	Other
+840e0190-d28a-4378-ba18-5134d6ae805f	1	Other	Other
+840e21a7-7870-4ea4-b90a-064882686148	1	Other	Other
+840e3b70-91aa-4be1-be9f-c6ad0e8acdf8	1	Other	Other
+840e5429-e35e-4f31-bb20-1c3b2e529898	1	Other	Other
+840e6e8e-c216-4aa6-a7c7-f67e21503e07	1	Other	Other
+840e84bf-dff7-4f8b-a524-081a8d2c6507	1	Other	Other
+840e9e43-f394-4684-919d-489659360b08	1	Other	Other
+840ec861-397f-4265-8988-3a545f895a73	1	Other	Other
+840ee7f0-5830-4cf4-9c91-46c27db6f536	1	Other	Other
+840ef553-7da2-48d0-882a-8152c458d421	1	Other	Other
+840f102e-2f92-401e-9a23-f6e27252db74	1	Other	Other
+840f2035-5ef6-412e-a4bb-2dd8df11cdff	1	Other	Other
+840f2850-8d94-4911-95e3-1b871e70106b	1	Other	Other
+840fa275-0bef-4c1d-bd33-ac95ffaf28a2	1	Other	Other
+84101c5e-88ef-4eb4-9d98-89cc7ec68d66	1	Other	Other
+8410282e-57ad-4b83-b182-2db8752a1bf0	1	Other	Other
+84103319-2a9d-435f-9ad5-c39650456dc0	1	Other	Other
+84105a41-1f28-4f45-91f9-cb8d45ee9433	1	Other	Other
+84105b7e-4be1-4ad0-a051-76091c166e76	1	Other	Other
+8410656d-bd65-41fa-874e-2ddaac1d63f0	1	Other	Other
+8410af2a-fff9-4c7b-85b0-f8731e495ff4	1	Other	Other
+8410d787-6341-49e3-b2c5-59ee80bb4ce1	1	Other	Other
+84111d1a-d2f7-4c33-8386-7bc7c0e13ac0	1	Other	Other
+8411643c-831f-403c-ade4-e23be9ea624b	1	Other	Other
+841168c2-8239-476b-bc6e-2d6a45185fa0	1	Other	Other
+841189f5-d93f-40e7-a676-be4be87d287f	1	Other	Other
+84118e4e-8efd-4753-b2c2-15a9c28cb536	1	Other	Other
+8411c887-8ab5-497a-85e5-0e283df585bc	1	Other	Other
+8412321b-67a0-49a0-acd0-7c56059cc06b	1	James	Other
+84123e9e-7fee-47d7-b915-fd2898aaf617	1	Other	Other
+841287a0-cd4f-4fb6-b2ac-052b0d6b2ec9	1	Other	Other
+84129576-309f-4021-99b2-169f6e99bd0c	1	Other	Other
+8412a8f7-d1c5-4e1e-8e6b-2ead1103e58f	1	Other	Other
+8412b2a5-a49b-4b2d-b378-84c85b58abc0	1	Other	Other
+8412ded1-379d-4f6d-bc9e-38079501fec0	1	Other	Other
+8412e272-f23a-43e2-a055-8ed7dffc84aa	1	Other	Other
+841362cf-1085-45fc-aba6-a8cf9af528ae	1	Other	Other
+8413a8fd-86c2-43ba-a63c-3b5a42e6e4e2	1	Other	Other
+84140bd8-ca77-4b62-b5e5-53629679a66a	1	Other	Other
+84142419-63c8-4d56-8c88-0dc48853fe37	1	James	Other
+8414467a-ca72-4064-9f04-2ae4cae7a12e	1	\N	Other
+84145044-e85c-4f69-9b4e-41357f186b42	1	Other	Other
+8414c273-fbe6-4de9-8d9d-28c7130d20c1	1	Other	Other
+84157ac1-bd44-498d-ab41-e1e607bf4d8d	1	Other	Other
+8415c04e-2bfe-49e7-a79b-b8f98c771ca0	1	Other	Other
+8415d8cb-d9a0-492d-a776-4dd5948e36ce	1	Other	Other
+841601af-9d82-41c0-b425-02679b23eeb5	1	Other	Other
+84161e6f-9b05-4cc6-8fed-d88f1a0dc467	1	Other	Other
+8416473e-5254-4746-8369-11232fc4b51a	1	Other	Other
+84168b45-2699-421f-9816-f271227865c7	1	Other	Other
+84169dbf-5b05-45f1-82f0-2cce18737311	1	Other	Other
+8416b79c-df4c-4059-a24e-21536ff151e6	1	Other	Other
+8416dd05-ff61-43b7-9677-b43f10f258d2	1	Other	Other
+84172408-b101-4b8e-96fb-8986d902591d	1	Other	Other
+8417a38e-6122-4956-a165-c41b80c67a8a	1	Other	Other
+84180891-843b-4148-a794-06eae7b1fa61	1	Other	Other
+84187515-288d-45d2-a178-4afdf3816e34	1	Other	Other
+8418efe0-eb42-4b73-af0d-6aa816dbc184	1	Other	Other
+8419103d-eebf-4075-b6e7-8f0fc6eec120	1	Other	Other
+84199a55-63f6-4838-b866-38435baa5613	1	Other	Other
+8419e707-fb1c-485d-b57b-bb8a71654c65	1	Other	Other
+8419ea85-3d7e-450e-8b9a-0be1fe15d6a2	1	\N	Other
+8419f84e-80a6-41ca-a22c-2801ce5a90f5	1	Other	Other
+841a23e1-773d-43e3-9f77-8a8f2039c175	1	Other	Other
+841aae70-3692-43f2-8b55-0d2a0c7848b6	1	Other	Other
+841ad343-c97e-4ff9-b9ff-339accd4096c	1	Other	Other
+841ade3a-72be-49c6-a98e-4dbe04a5014d	1	Other	Other
+841b3942-6d49-42e8-a69e-993b7d8ac310	1	Other	Other
+841b997b-9ce7-42bd-b253-4009b63eb34b	1	Other	Other
+841bc96c-5e4f-44b4-8068-131753a57174	1	Other	Other
+841c33b5-665e-4b37-a8e7-fc94299ba63e	1	Other	Other
+841c3f06-adf6-41f6-a74b-5e5ff44894c2	1	Other	Other
+841c400a-4a7c-4902-b24e-b97a2b224124	1	Other	Other
+841c5b2d-7010-4082-b228-ad00ef4fdf06	1	Other	Other
+841cef0c-37bc-463e-9f1e-e503fbdc8d28	1	\N	Other
+841d4041-2068-43c0-8149-79f69554104a	1	Other	Other
+841d9785-2d65-4e2a-ace9-c4d3d1648c64	1	Other	Other
+841dd383-3a1f-4c24-ad4c-bc1d197f17b1	1	Other	Other
+841dd810-22f4-4688-974f-e043950c58bb	1	Other	Other
+841e4a87-ac37-48f8-9e1c-4aa9791d20c9	1	Other	Other
+841e95d0-5aba-4a07-942e-de1bcf2b5b0b	1	\N	Other
+841ebc8d-4fcf-4e34-bd08-6135523cb52d	1	Other	Other
+841f48eb-582b-4ee6-b5be-3e120d2ec84a	1	Other	Other
+841f6a7e-3828-4c11-873b-03392ea303e1	1	Other	Other
+841fcfef-6a7f-4ffa-8c6b-80cef1cc0dbb	1	Other	Other
+84205b05-5de0-411e-b828-4816dc6597e1	1	Other	Other
+84205d88-3412-43bc-b463-ca2fe59e4242	1	Other	Other
+842065a4-5a3e-4e29-a8fd-d231d5faf484	1	Other	Other
+8420b157-be8f-43b6-b185-cdbbcfd17f59	1	Other	Other
+8420d056-d7e9-4d5f-8d07-5b827f6f6082	1	Other	Other
+8420f3d2-a321-42c1-b889-eb221311683b	1	Other	Other
+84210f60-44ce-426f-9142-1e85476b8325	1	Other	Other
+84211cbd-f122-448d-b337-60a8027559e2	1	Other	Other
+842133ed-dd0d-44e0-b04d-542a80a5253f	1	Other	Other
+84214beb-5bc0-46dc-8d48-9582d29a026c	1	Other	Other
+8421eaf9-4686-4af1-9f10-7f6a938abe94	1	Other	Other
+8421fac9-8c13-4016-917a-4c4211b800df	1	Other	Other
+8422058f-8307-437f-873e-60c84422bc13	1	Other	Other
+842254d6-9d49-4ebb-82b3-f077f78906cd	1	Other	Other
+8422b9f6-e0fe-48fc-b4b8-f548d9b31295	1	Other	Other
+84232084-99c1-4d5c-a729-f85b64ca9a57	1	Other	Other
+84233056-7bd1-4d0a-91da-a374035e669b	1	Other	Other
+8423a651-c1ae-43ff-9217-261eaff1dda8	1	Other	Other
+8423af58-310c-4c58-8b1d-3c2cabeb7d6e	1	Other	Other
+8423d9cf-a1a5-42cf-b868-ddc4a31a5d87	1	Other	Other
+8423f36f-f21b-414d-9cf5-19c13f11af31	1	Other	Other
+84245b53-ccdf-4c7a-820c-17241db4cc52	1	Other	Other
+84246d96-dbaf-49db-bda8-bb8000788fe2	1	Other	Other
+8424c10d-37b1-4729-9cdb-2fd8f416e187	1	Other	Other
+8424c4d0-8c46-429e-b43e-3d47266709a4	1	Other	Other
+8424ea68-79d1-47c4-a9a7-2c5d121ee94e	1	Other	Other
+842517d7-e889-46c0-b296-07b1b100ae86	1	Other	Other
+84255dd2-c63d-4a00-b3dd-cd74148f05b2	1	Other	Other
+8425a2a0-02ed-484d-9c9c-22eda0ea10fb	1	\N	Other
+8425b266-6656-4b8a-b4de-99ca4e16c2fd	1	Other	Other
+8425f3b2-fae6-487a-9833-2e0a26172a12	1	Other	Other
+8426262f-1753-4e5b-b898-7716b01fbbe5	1	Other	Other
+842657b8-96ed-11e7-a227-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+84269df6-015b-41a3-922b-b7e85c9383da	1	Other	Other
+8426d773-e7d8-40bb-84fe-9bdd593cd8c0	1	Other	Other
+8426fa23-4134-4846-b448-e182ec2b7b40	1	Other	Other
+842736cc-f1a4-49ad-9b5f-f6ac703c8282	1	Other	Other
+84275edb-bea9-40d8-bbf8-ad79d49384c3	1	Other	Other
+8427c2ce-06ca-414d-acc2-367982e6bc54	1	Other	Other
+8427d030-b0e8-4299-8be1-d6c42ba30ac7	1	Other	Other
+842853e1-ab1c-46ec-9522-fd8aa35435d6	1	Other	Other
+8428ad32-6787-4e66-9577-fc610150cfd6	1	Other	Other
+8429165c-fc85-4b9c-8c92-9e09a4cc07ae	1	Other	Other
+8429391a-bd35-46eb-ad97-cc64ee8d78a5	1	Other	Other
+84295656-157a-460d-ad3c-4c476630a07c	1	Other	Other
+84299bf4-afc0-4df6-9720-bfdee591fe7e	1	Other	Other
+8429a5c0-7f41-4cf3-9f7a-7caaeb5b487e	1	Other	Other
+8429b35b-5551-447a-a01b-3cc25ff7644c	1	Other	Other
+8429d941-d8c2-4115-8ca3-e240aa451b7c	1	Other	Other
+8429f323-d6f9-432f-a4f4-0888e3ccdf9b	1	Other	Other
+842a1235-c761-4b73-a6d4-f9eae3942d63	1	Other	Other
+842a2e73-e031-432d-8cfa-d38e42d86e81	1	Other	Other
+842a3e18-6ecf-4d54-90e2-6cf69c0f569b	1	Other	Other
+842a432f-afd6-48fd-80f7-e78337f0c911	1	Other	Other
+842a4823-ea22-4be3-8efd-d47e18a5f089	1	Other	Other
+842a6fc5-7d83-4e6e-9b4f-137f74e5394b	1	Other	Other
+842a74a4-46c4-4461-b924-07fb01fed4b3	1	Other	Other
+842ae545-2723-4a82-ba80-55b69c43839b	1	Other	Other
+842b0619-bcc3-40a1-bbd6-a3b7dd7d3ce7	1	Other	Other
+842b2d22-6a20-4df6-8eb2-15b0199ab20f	1	Other	Other
+842b8976-43a4-4116-92fd-29aa5846f246	1	Other	Other
+842b98c9-118c-43cb-86bb-bc4cb7f4e28b	1	Other	Other
+842bf297-28be-459f-a8c0-4a6545d33d32	1	Other	Other
+842c12dc-7789-4f04-ae1a-95e8235e244f	1	Other	Other
+842c20d7-b134-4d42-92fc-12e35a54065c	1	Other	Other
+842cb80c-71b7-46c3-8fdc-23d875a03b3c	1	Other	Other
+842cef25-2fa2-4e4b-bd3e-4a8652c6bbe2	1	\N	Other
+842d78bd-0793-4dc0-b723-da90ff54f5f3	1	Other	Other
+842d8a20-7a32-4d0c-982e-f6deefda1acb	1	Other	Other
+842dc023-558d-44be-95a8-dc10d5d32e78	1	Other	Other
+842de9a1-6bec-4075-8a12-dbcdbef5d5bf	1	Other	Other
+842dee13-116d-4d97-8768-89e1147664d4	1	Other	Other
+842e04a7-5297-4976-8124-fd2060ba4ee0	1	Other	Other
+842eb46c-608e-4621-8558-4144cf26c718	1	Other	Other
+842eda26-a6d3-4202-ad51-7ef962807688	1	Other	Other
+842f0a22-16ed-4ce2-8a89-1a6fc1efd4ed	1	Other	Other
+842f0e0a-9949-496e-94e8-bac8d06bf188	1	Other	Other
+842f1835-c262-40dc-9e9a-c790d887b9a7	1	Other	Other
+842f1d60-c99e-4b1b-941c-9532fd7b66cc	1	Other	Other
+842f5a50-8e1d-4f78-a3f4-cbb4069da173	1	Other	Other
+842f8613-7e08-4a1d-9006-8257399d19b0	1	Other	Other
+842fc771-de7b-425e-83d8-e446874f2565	1	Other	Other
+842ffdcb-0423-4fa8-a06f-497f8c7c9b3e	1	Other	Other
+84303f27-d6b4-4535-9f34-d9f775a4dabc	1	Other	Other
+8430457a-1315-4bb3-87a0-db6538e41032	1	Other	Other
+843052b3-3ce4-4783-8504-31dee4b3112a	1	Other	Other
+8430ac9f-1874-4f4b-84fd-11877ee853f5	1	Other	Other
+8430ce23-bf43-4136-8860-ac4012c164de	1	Other	Other
+84313e3d-bb30-4d42-a20e-d297e9a2dc0a	1	Other	Other
+843153d2-fa0b-486e-a450-fa65d4a69de4	1	Other	Other
+8431b4d5-052d-4e8b-9441-c451ba7c2998	1	Other	Other
+84320b41-3000-439f-8cd6-199ea6bbad87	1	\N	Other
+84323569-c6b1-47e8-b6ec-850033cf40a8	1	Other	Other
+843273dd-de8e-4182-9df1-96e32b0ebb44	1	James	Other
+84329440-79d1-4abb-b5ae-e6f068ef1c3e	1	James	Other
+8432e827-3fd5-4b99-806a-a2bd73ab4253	1	\N	Other
+8432f756-146f-4bde-a8f8-33fbb915cbaa	1	Other	Other
+8433c080-6797-4ffa-8ae4-62b8c1b5d0ee	1	Other	Other
+843432fd-a076-410d-805a-b0839d087fdc	1	Other	Other
+843485df-c939-468a-8d83-f16dc712530e	1	Other	Other
+84349101-2976-4c8f-9498-056d15d227d8	1	Other	Other
+8434d56d-2d13-4691-9c7c-cb63ecfdf7b4	1	Other	Other
+8434dcbb-412b-4391-b097-5ec9cd291f4c	1	Other	Other
+8435e2fb-4cb6-4635-9480-de687196d5c9	1	Other	Other
+84360010-19fa-4ee4-b69b-56f38c4a6bb4	1	Other	Other
+843628a6-4584-4eb8-a545-11243b802848	1	\N	Other
+84364441-cd6d-49fb-a200-4ecccdb2615a	1	Other	Other
+843676a7-2f19-464e-bc92-9e105ff8d6ed	1	Other	Other
+8436e686-5fbc-4ce1-9734-a1df8be8e8fe	1	Other	Other
+8437d7a1-41e6-48ae-906c-7cc49d0513a2	1	Other	Other
+843831d7-573d-463a-bd3c-12c6aa67fb61	1	Other	Other
+84387489-98c8-4d19-a382-c58eb5512bb3	1	Other	Other
+84389a19-99a0-4713-9e63-1a192f3d4e54	1	Other	Other
+84392ec5-e76b-4d3e-b773-c02fe42f9a6f	1	Other	Other
+84398dd8-2c4a-4a46-8f90-4b0b11bd8aa0	1	Other	Other
+84398fe6-8f0e-4f7d-a892-1500e7166c0f	1	Other	Other
+84399dbf-3f69-40b4-a568-6a9e46a31617	1	Other	Other
+843a06ba-897a-49ba-ab14-2f3d1af5cabe	1	Other	Other
+843a4a87-9ae4-4286-9bb5-2f91a277bb0e	1	Other	Other
+843af9c6-21df-4276-8c3b-40d28568f944	1	Other	Other
+843b82c1-a783-4f98-817c-a69146dcbd78	1	Other	Other
+843b88c0-b545-4632-bd9a-602e467eab3b	1	Other	Other
+843bb04b-0e73-4558-a693-d6737b902b23	1	Other	Other
+843c7cf6-678d-45ba-9730-fe7fd4a9b3cb	1	Other	Other
+843c923f-b083-44ad-87de-3a36849783ab	1	Other	Other
+843c9cb2-5098-4dce-ae60-87f87a29a672	1	Other	Other
+843ca6b1-e1cd-4a7d-a975-c78d2fa41124	1	Other	Other
+843cfc47-06d3-491d-b4ee-96a52232290e	1	\N	Other
+843d1d39-e66d-4f7b-b1f5-b8638f399612	1	Other	Other
+843d4850-c781-488c-a973-10b800571b49	1	Other	Other
+843d5b71-7bac-4688-93f8-545f9a39e846	1	Other	Other
+843d8c05-f471-4b04-8028-93d2680cec10	1	Other	Other
+843dc739-8a1f-4e8b-8820-437ff974ce0d	1	Other	Other
+843dd7e8-d22a-4a2f-a7fc-34de74504004	1	Other	Other
+843de363-c0c9-4c4c-a58c-40407bd318ab	1	Other	Other
+843df9d7-2cf0-4bb7-af43-da4ad6a174e7	1	Other	Other
+843e0fc8-f1a4-44a4-8d34-acc4a7ff2469	1	Other	Other
+843e6714-616c-493d-b9c5-35f3ec5d5dd8	1	Other	Other
+843e7696-32ae-407d-8e0c-4e432c03688a	1	Other	Other
+843ee074-ae7c-4d1e-84bb-6005d4f745d7	1	Other	Other
+843effc4-f261-4a43-8677-fa96d2b688b1	1	Other	Other
+843f4fc4-32d5-4050-b84a-7f613c3dc39d	1	James	Other
+843fb0f6-dac7-4ff4-b03d-ec9602201c54	1	Other	Other
+843fc07c-e43e-4dc4-9885-cabd571ca675	1	Other	Other
+843fc626-1e87-4334-89ee-36e69fc68084	1	Other	Other
+843fe861-47ac-422d-973f-39fb5af1c28a	1	Other	Other
+8440028b-d56f-4d2a-894b-588c8215edf4	1	Other	Other
+84403fb6-3eaf-4ed0-a914-0e3e062e6e9b	1	Other	Other
+8440aaae-d474-4120-9179-6e8f52ac37af	1	Other	Other
+8440b3c7-e478-4710-a5f4-7b74fea23802	1	Other	Other
+8440ba11-7020-4b25-9ebb-9b78304cd7c5	1	\N	Other
+8440e90e-a891-4227-bc7c-ad6642ea4179	1	\N	Other
+8440f410-de07-4d2d-ae63-35788bfb132e	1	Other	Other
+844139a2-bb43-45d4-9378-7afabd51cd27	1	Other	Other
+84416bca-57c0-4178-b0d0-5495680112fd	1	Other	Other
+844206f4-6584-46f2-b514-8ebe00809b43	1	Other	Other
+84423a10-4b7f-4c98-b483-38596f8bc6e6	1	Other	Other
+84425d3e-20d2-453e-a84a-9d74b19adf9b	1	Other	Other
+84426d00-6d3b-4de5-83c8-13120d0db989	1	Other	Other
+8442a5db-1de4-49ab-b292-5efcbe450e94	1	Other	Other
+8442e730-fa48-453e-b9e5-48452801453b	1	Other	Other
+8443209f-fe7f-47a3-a832-db902051655b	1	Other	Other
+8443a27d-4e79-4064-bb79-2e6c58d3ede8	1	Other	Other
+8443c9a6-83c1-4c57-bd21-ff89a4d26905	1	Other	Other
+8443cfc8-927b-46e5-9c23-b6c237ecca89	1	\N	Other
+844429d4-3937-4001-8f51-1264877d6b22	1	Other	Other
+84445ff6-7cac-4d1d-97b9-c7af05f455f6	1	James	Other
+84446968-d847-443e-bbaa-08a4f3a3e89b	1	Other	Other
+8444e744-70a6-4232-8bc7-7efef1f891ca	1	Other	Other
+8445371b-4a94-45a3-ad71-7344e4a6bff0	1	Other	Other
+84454dae-fa8f-4910-a358-eedd9b96e708	1	Other	Other
+84459986-6e9e-4639-8b10-89caf6298109	1	Other	Other
+844620f8-f4a1-4025-8bbf-4fc7cbc7354b	1	Other	Other
+8446218e-39a1-4c0a-bd69-102946cb5e21	1	Other	Other
+84463ae9-915b-418f-883f-5a76b87305fc	1	Other	Other
+84465a5c-e475-41ba-bd39-33a5425f1616	1	Other	Other
+84467dd0-204c-48a4-b5df-2d1fd84f104f	1	Other	Other
+8446895d-fb78-4fd9-9d7f-094c481b8b58	1	Other	Other
+8446e782-94ab-4ba2-a5f5-a23cdb2eba03	1	Other	Other
+8446f921-980d-4ce4-8d4a-9419a7a30081	1	Other	Other
+844751c6-6644-4f03-b833-86b4218bb76c	1	Other	Other
+844755f2-072b-4355-a669-c9b923a6c0aa	1	James	Other
+84476463-e5a8-48b1-a273-732fc917ee6a	1	Other	Other
+844782f1-178d-4fe8-9061-7c5727c435c7	1	Other	Other
+84478d73-57bd-49ab-b368-184ce71b405e	1	Other	Other
+8447a415-72bf-41e7-8e43-93d8ee4d2dd6	1	Other	Other
+8447b13d-1ea1-445e-a61e-26ed0536d9b4	1	Other	Other
+8447bd5f-cdfc-4657-8092-609098e489a5	1	Other	Other
+8447cc9d-ae51-4654-927d-64f597e53f8a	1	Other	Other
+8447d7b4-3d47-42c3-ad9d-241337c0e7a4	1	\N	Other
+844813dd-d0e8-40fe-bcde-acd8f33e10a9	1	Other	Other
+84483028-08e5-49b4-b292-2569cb730a1d	1	Other	Other
+8448368c-875c-43b7-982c-7707dae8faf7	1	\N	Other
+84483c12-bafd-4543-95c2-adb45f39d652	1	Other	Other
+8448693d-15c4-49d4-b8d0-78ab1436a425	1	Other	Other
+8448cc34-5669-470f-8893-12119d93b704	1	Other	Other
+844912a9-049e-4f26-bb39-9c40d16104cb	1	Other	Other
+84491d21-7f13-4529-97e0-acf2f8e7d4a7	1	Other	Other
+84493ed5-1d81-4b69-b047-0b0848193f02	1	Other	Other
+8449608e-2d56-429a-99c8-0e4c450d2c39	1	Other	Other
+844979e8-82a3-4a0d-82df-28632b6f193e	1	Other	Other
+8449e9ae-d145-4cac-9904-6ee7fa82e1a6	1	Other	Other
+8449f728-7f96-4e77-852e-c7db698cec12	1	Other	Other
+844a3f6f-9428-4f38-9452-f03cb3953ad1	1	Other	Other
+844a3fb9-07f4-49f4-8b11-ec1ab8a6451b	1	Other	Other
+844a488d-e425-45cb-ad9c-10b00f677c05	1	Other	Other
+844a6d7a-1b40-4470-b407-1f0344478bc7	1	Other	Other
+844a7d59-c8ea-428b-b327-be81f0b67dd3	1	Other	Other
+844a89b3-94ea-4cf6-a043-f5bff56d0dd7	1	Other	Other
+844a994a-8a0c-45a3-894a-233a7a116d19	1	Other	Other
+844a9afc-3cce-4af1-80ca-12bcd18957ae	1	Other	Other
+844aa6c3-e493-47d2-90da-15b257091a11	1	Other	Other
+844aa8f5-8ce4-4f7c-be8e-ddcbe18aec44	1	Other	Other
+844ab59f-144e-4226-b8a9-886378372e1d	1	Other	Other
+844ad61f-d3f0-44f1-be36-ac0bb84b5234	1	Other	Other
+844ad83d-5832-4cdb-8b8c-832d1e24f37e	1	Other	Other
+844b1a11-291f-416b-911c-22ad99e75e55	1	Other	Other
+844b4c5c-522a-4447-9594-629bc66d3593	1	Other	Other
+844b4eb1-d03e-4700-8573-45c9e0b3f3c3	1	Other	Other
+844b5f7b-3e54-4474-9912-3de950d4093a	1	Other	Other
+844b930f-7d9b-4b69-be13-4425261c2513	1	Other	Other
+844c38e0-5695-4cba-a88b-e695878a75ae	1	Other	Other
+844c636c-2605-4621-a4a9-77d5ce5c4eb3	1	Other	Other
+844c6db1-7932-423c-bc54-f8838b21f78b	1	Other	Other
+844c7000-cea9-4d1c-91bb-6f4bc4b88ae9	1	Other	Other
+844cac56-fcd3-492a-8e38-5ceaaaca11f0	1	Other	Other
+844d1b23-626d-4513-9bf0-5bc63cc82c93	1	Other	Other
+844d76d6-f469-475a-9143-bb5254e46e64	1	Other	Other
+844dc691-c31c-4376-826b-3387f40310de	1	Other	Other
+844dda68-edeb-48bb-9283-3533b5542aba	1	Other	Other
+844ddf6e-ae52-41ae-b524-33cc2c6b72c3	1	Other	Other
+844e18e3-1700-42cf-9421-d024c8575b25	1	Other	Other
+844e8d1c-d10c-490a-a85d-dd93202d8325	1	Other	Other
+844eb5d7-8759-4fbe-96b4-8361453b198b	1	Other	Other
+844f01a3-c98b-4538-bf1f-0540eeeb75e5	1	Other	Other
+844f203d-cdf7-4c1f-b2d8-0a034d2829a1	1	Other	Other
+844f572b-291b-451b-b9bf-d86071751108	1	Other	Other
+8450682d-4305-4585-b923-75dccd462315	1	Other	Other
+845077a4-577d-4a37-b077-b3ee72aa29c4	1	Other	Other
+84507eaf-6ed5-4b61-b52b-449e13abb678	1	Other	Other
+845154cd-308d-4856-8485-accfd561e921	1	Other	Other
+8451a4da-f6d8-48ab-a650-2f3bae87fade	1	Other	Other
+8451aad9-d988-461f-8cc4-e90807955277	1	Other	Other
+8451aee6-b73c-426c-b65e-26f0d775339a	1	\N	Other
+8451c2f7-6eb3-4270-818c-cecced3ee2cb	1	Other	Other
+84525055-5629-4c69-92e1-a690cfba516e	1	Other	Other
+84526329-0a70-4f87-bbc6-704b27346032	1	Other	Other
+845300aa-4702-47cd-8233-20ffc4ac33d9	1	Other	Other
+84538955-2a0e-40b7-9a63-3e2f6aff8cfb	1	Other	Other
+8453c17c-12f2-4922-86cc-8528cc95e9b4	1	Other	Other
+845410bf-14d9-49e9-b27b-521d551ec44c	1	Other	Other
+84544a12-97fc-4188-aa43-ddfa48b14b83	1	Other	Other
+84544c90-b1e9-450a-bd4b-b7ed7ce913e1	1	Other	Other
+84547dce-a438-4842-a2f1-2ab1c641659e	1	Other	Other
+845497f5-6ffc-4ee0-aba3-d386741d18c2	1	Other	Other
+84549bda-f563-4de6-991d-a2397ef94d9b	1	Other	Other
+84559669-bf47-4ca3-920a-ad8ef7f37630	1	Other	Other
+8455d0ec-a9b1-4ac4-a812-f6513a0ea85e	1	Other	Other
+84565d2d-32de-46fd-8b87-21cd405036ee	1	Other	Other
+845682e6-9612-442a-a67e-43ba78e13a93	1	Other	Other
+8457264e-29a8-44d2-a229-af2ca5e5ab39	1	Other	Other
+84573e9d-4a68-4599-9ed9-37a24658e0e8	1	Other	Other
+845789c3-6ff8-46b2-a581-ef5465f4de19	1	Other	Other
+84579ce4-f218-45ff-9a0d-9a31d4492e35	1	Other	Other
+8457acc2-7482-4d51-acf3-3ad9f731e356	1	Other	Other
+8457c1aa-fd28-4e75-acf8-9819bab990aa	1	Other	Other
+8457c7fb-ccfa-478c-8dcd-b10c2bbbd966	1	Other	Other
+84580419-3fb1-459a-b383-050be67ab1a3	1	Other	Other
+84580c98-39ec-44b7-a5af-c5dbfc848124	1	Other	Other
+84584c7d-80bd-4c80-9dbc-7abfc1cea08c	1	Other	Other
+84589172-860e-4656-820a-dbbdd9ce903f	1	Other	Other
+8458f1dd-062a-4ee2-9755-9db99296fb0d	1	Other	Other
+8459a8c3-84a4-4263-a387-70c2ef0b5ad7	1	Other	Other
+845a272d-9bfe-4b22-9670-0b597576fcbb	1	Other	Other
+845a3518-3bdd-4211-ab5e-ef451d8b1b5d	1	Other	Other
+845a49fb-2a0c-41ae-8c53-bf875dd7bdb0	1	Other	Other
+845aad78-ffbf-4aef-8cd9-bc7b4f810266	1	Other	Other
+845b0388-7197-4e62-a477-a0929a45e3de	1	Other	Other
+845b129d-6f31-4863-9de6-859bb657bfc6	1	Other	Other
+845b1591-27a1-4072-afe7-149c8ffd6208	1	Other	Other
+845b2f34-5a66-4c31-8d49-572acfff8a86	1	Other	Other
+845b3dfb-bcf7-4427-b5f5-db102710d313	1	Other	Other
+845b92ac-713c-4f72-9821-67c9b40d43ad	1	Other	Other
+845bbe78-0a81-4431-872b-561ecc0f5ad7	1	Other	Other
+845c315c-679e-43e2-b293-fd6e5926becc	1	James	Other
+845c3792-037c-4887-85e6-571a6f13311d	1	Other	Other
+845c5041-ca35-4f7e-9fab-2fc05d9872b4	1	Other	Other
+845c6a6c-8935-490d-bdfd-44fa889f63f7	1	Other	Other
+845cb398-58d6-43ec-b57b-4d6d8c31d809	1	Other	Other
+845cdbb6-551e-4c45-9cf2-66024dd7f7ac	1	Other	Other
+845d0aec-6ff9-4ab6-a82b-dc3b648638a4	1	Other	Other
+845d5982-8325-46f5-b0b8-cda25eb2886e	1	James	Other
+845de2b1-c9e9-4830-a1a0-ab474d6d0709	1	Other	Other
+845e0d5b-0b28-41be-9698-c8f44eeb79fa	1	Other	Other
+845e12d9-a4a2-4725-8f81-0412f315e6cb	1	Other	Other
+845e2597-2b8d-4b20-a620-bda1fa0dd3ac	1	Other	Other
+845e8140-3560-4775-8160-02341ce5377e	1	Other	Other
+845e846f-a3fa-478d-9c2e-d9ae134413ff	1	\N	Other
+845ea155-8b7c-489c-a1be-9d36985004bb	1	Other	Other
+845ea587-45d2-49c8-b25f-c01fb34ec528	1	Other	Other
+845ebe07-9be7-4dcf-b1be-282306a2c16b	1	Other	Other
+845ed47a-04ce-4840-95ec-793784876707	1	Other	Other
+845f05a7-92dc-42b1-b68d-513dbcee84e8	1	\N	Other
+845f32f8-1a8e-400a-b8d8-e404c4b9bc6d	1	Other	Other
+845f7812-1dd6-4334-bce7-2ecef26ddcb1	1	Other	Other
+845f7959-e369-4f00-bac1-7acd372325cd	1	Other	Other
+845f8896-0256-495b-8202-a8a45b96d0a8	1	Other	Other
+845fb3fb-dcf8-4fe1-b2a0-3eb01c0cbff5	1	Other	Other
+84600f9b-160f-4aa2-b174-a4e09efefce0	1	Other	Other
+84602a57-ed1a-426f-9377-420d960b3f8e	1	Other	Other
+84602a80-835f-474c-b124-e74050fb9aff	1	Other	Other
+84603a52-ccb1-43f4-86fa-c596165957b1	1	Other	Other
+84607716-8afc-4b45-900c-eec5ddcced16	1	Other	Other
+84609299-4378-4d68-ae5f-ab940ff37892	1	Other	Other
+8460feb2-1901-476e-8800-b71b0def80ca	1	Other	Other
+846109e9-cc4b-409f-a570-b3a47caea8b0	1	Other	Other
+84610d71-c4fc-4ecc-a881-cdc67fac8bbb	1	Other	Other
+84615814-bd3f-4626-a686-46a27cbae21a	1	\N	Other
+84616555-3b2d-4eba-9b87-fa9810d8da3d	1	Other	Other
+84618b6f-b456-44c1-977e-69afccb87b2e	1	Other	Other
+8461da42-1138-4393-aab9-af4376ec8ecb	1	Other	Other
+8461f8e3-f9b8-4dab-a5b0-c29dd6d73548	1	Other	Other
+846200a0-9b1f-4b2a-beb8-2caf32deef84	1	Other	Other
+84621b0f-6b5e-443c-aa56-0253e49a0e3d	1	Other	Other
+846295d0-7626-4696-89bc-1ce71f96d325	1	Other	Other
+8462a80e-fb49-43fb-b438-c3c77eee775e	1	Other	Other
+8462c2ca-f5bd-411f-b30b-2cff10ede330	1	Other	Other
+8462d7a1-563d-4ebb-a9cd-075f3de25347	1	Other	Other
+846303c3-f6f2-481f-a108-306c632b516f	1	Other	Other
+84631ab4-5631-4eae-abd4-c8b13617ef03	1	Other	Other
+84633422-ea18-479d-be4c-98a4d980ed52	1	Other	Other
+84633c07-44fd-45d6-b136-1f1348be57d9	1	\N	Other
+846368d7-eb9c-4ebd-9c6d-6c8d828f0ca3	1	Other	Other
+846373c9-6ae6-449f-8e7a-9bc635411f92	1	Other	Other
+846398ed-91c5-4615-ae14-03d15686abab	1	Other	Other
+84639fb2-462c-436f-9692-8f6d47c74046	1	Other	Other
+8463c53a-b27e-481a-b494-600b31cb73f1	1	Other	Other
+8463e839-dc20-428c-b7a6-19b66160130c	1	Other	Other
+84641fe9-ea3f-49fa-ad22-50c1c2a78656	1	Other	Other
+8464d6ee-8a03-4131-9cb9-783e2cbc7bfd	1	Other	Other
+8464fc4c-518c-4792-8a43-23c45875a2cb	1	Other	Other
+846507a6-73b9-4188-b0e6-143ef3f7373d	1	Other	Other
+84650938-ff44-4fd7-998a-bcf3b09519ba	1	Other	Other
+84650f8a-4580-40bb-8bd0-632f129ce3f4	1	Other	Other
+846557a3-9d88-4b3e-b449-ed0b873f4191	1	Other	Other
+84656e64-1d75-4100-a6a6-f338950d2140	1	Other	Other
+84657696-a635-4f9d-af48-1d8841453bcd	1	Other	Other
+84659a6a-247c-49cc-93a3-e74e90c86365	1	Other	Other
+8465dabb-6f69-4998-a365-cb06b6e46c7b	1	Other	Other
+8466354f-241e-4d9c-b825-a5666a373564	1	Other	Other
+84665c81-61c1-42a8-974c-a13d9433fe25	1	Other	Other
+8466605e-2ffb-4bf4-9c42-ff01bd048bbb	1	Other	Other
+84667ae7-8ec9-4c4d-b32b-99ac8eb78697	1	Other	Other
+84668f9c-14b3-456a-9c69-73451f46565f	1	Other	Other
+8466d00b-5483-42d7-b2f6-b12dbe8b0410	1	Other	Other
+8466d7fb-1e92-4eec-834e-171134e058e7	1	Other	Other
+8466f3f0-ebec-4436-a173-f68fc5309e40	1	Other	Other
+8467007a-c0e9-4cd8-92e7-8aa02017c487	1	Other	Other
+84673d2a-c2f2-4b3e-a8ec-be161a3a8dfd	1	Other	Other
+84675939-ecec-4924-8aa7-723bf431230b	1	Other	Other
+84675f01-e38d-4ecb-83e7-93758ad68c7c	1	Other	Other
+84678202-1cc2-4803-9b00-3ebf3894af37	1	Other	Other
+8467a9bb-e64b-4803-bf77-63361ff3c7be	1	Other	Other
+8467b421-7384-48c7-80a7-bf0db6b07793	1	Other	Other
+8467c197-a6be-472c-87ab-ce1ed28cbb95	1	Other	Other
+8467d21b-2d98-4942-9904-5106e1b60d3d	1	Other	Other
+8467da5d-423a-4f63-8532-dd1d31dc342e	1	Other	Other
+8467e843-2d0c-4e44-a005-4bd3d295eb27	1	Other	Other
+846818be-06b6-46a8-9256-ffa195b21d1d	1	Other	Other
+84684c68-536d-4936-9362-33238e9879d3	1	Other	Other
+8468a493-95fe-4f8c-8e11-8975eb7c1b9f	1	Other	Other
+8468a983-8f92-410d-8350-3af7c88683fa	1	Other	Other
+8468ea59-5d2f-4dc5-8b6a-ea98ce49d478	1	Other	Other
+846940d6-8d83-4f21-b5e3-8fe77502b208	1	Other	Other
+84699284-9de2-40c4-bc14-14ee4591a91e	1	\N	Other
+8469aaa4-bd8d-4d1c-8388-a6f90e0b667c	1	Other	Other
+8469bf2e-e52c-4149-87e0-33a79e7438f4	1	Other	Other
+8469d7e0-75ed-424a-9682-a9ef881b8ac9	1	Other	Other
+8469ee96-112b-49e1-be79-b5a46b97c52c	1	Other	Other
+846a1aa1-c7f1-4237-9360-ee2d714079d7	1	Other	Other
+846a9171-05c8-495a-8194-2e802e785d6b	1	Other	Other
+846a9463-8cbf-4e32-ac65-028bfb997240	1	Other	Other
+846aadd7-6e14-47c8-85c7-23a0c39404df	1	Other	Other
+846ab676-e726-407a-ac06-3dd1a3b9489d	1	Other	Other
+846ae654-9ce8-4867-917e-5ce0b960ba11	1	Other	Other
+846af2d8-49f7-4eaa-8105-2533a755ff7b	1	Other	Other
+846b21bc-48b5-4041-b33e-14ea4e01bf8b	1	Other	Other
+846b30a2-fa29-49c2-9ab5-6dd4ebff3474	1	Other	Other
+846bcd3f-b568-4d56-aea2-6d732f182d25	1	\N	Other
+846beb87-6a05-4c4f-81f7-0229787d22df	1	Other	Other
+846c0188-9479-425f-8ab1-3fe85235a6d0	1	Other	Other
+846c4953-092e-443f-a0e0-e517f666a510	1	Other	Other
+846c98b3-1e85-4944-ae4c-3b42af080fa0	1	Other	Other
+846c9a5c-ec58-4ce2-a90e-7bea7cddf92b	1	Other	Other
+846ccc55-3536-41d0-9005-a154ec054f2e	1	Other	Other
+846d16ef-69ae-49ac-bba1-63e2119e19b3	1	Other	Other
+846d1826-a23f-4bab-acf6-19df613a92ff	1	Other	Other
+846d19a1-6bea-4cc4-ac67-a36743b8cd2c	1	Other	Other
+846d23b7-2460-4024-b49f-ef0dcf2eb026	1	Other	Other
+846d46e5-2bcc-4417-a9bf-11697fcce727	1	Other	Other
+846d598f-81e8-4d72-8637-22687cc3dcde	1	Other	Other
+846db7f4-ce59-44d8-b1a1-0e6738ec945f	1	Other	Other
+846dd6b0-65bb-4c43-881f-fadea3e6f701	1	Other	Other
+846df0a0-66e4-4fd4-aff5-3dbc58289c15	1	Other	Other
+846eb721-d187-4477-b6e1-4e54695224f9	1	Other	Other
+846f2026-3fc4-47a5-93de-d8906b6c470d	1	Other	Other
+846f88da-58cb-479f-a188-630280109145	1	Other	Other
+846fd614-0fd9-4766-ae99-e8dd582639cb	1	Other	Other
+846fe610-ab7a-4814-94e6-c9ed045e20b3	1	Other	Other
+84703269-df94-4c07-98dd-fbb9a175be7e	1	Other	Other
+84703943-813c-42c6-95e0-6634d8471f00	1	Other	Other
+8470d4de-86df-4602-814e-75ca4ec57c29	1	Other	Other
+8470de2b-b84d-4052-87a4-82a0f7feb086	1	Other	Other
+8471814b-4f17-48b2-9140-445ffe94be2b	1	Other	Other
+8471a874-7dd7-4630-883d-477d05a0e015	1	Other	Other
+8471cb48-2aa2-4c4d-a97d-7df3c22ee547	1	Other	Other
+8471e6dd-6d66-450f-90b5-434fffa5b7b7	1	Other	Other
+8471f9ab-8bf7-40cb-b7a0-e2ff3873e261	1	Other	Other
+84720271-2283-437c-9028-3f61c6a91135	1	Other	Other
+84724774-07e5-4e0f-a984-77d256b52d98	1	Other	Other
+84724923-1120-454b-91e7-cdda81527abf	1	Other	Other
+847257c9-9d82-4666-b68d-28fe694e3e3e	1	Other	Other
+84725e53-0dfc-418c-91fc-02528e662803	1	Other	Other
+847262e6-d0da-4316-8838-a4bcc6206899	1	\N	Other
+84727176-ac62-44a1-b43d-b32d1d915ff8	1	Other	Other
+84728d22-5888-4055-9c0d-da4e12feb873	1	Other	Other
+84729c24-7ecd-40ac-9349-97cc9d83950d	1	Other	Other
+84729d52-53b8-478a-8bdb-4dbc36618da4	1	Other	Other
+8472aca7-9ffd-4f45-a90e-d30826532fab	1	Other	Other
+8472b00d-e461-4e5f-8c53-2bc2fd38a7b8	1	James	Other
+8472d1c4-8df9-455d-82aa-e1d2ebbac1c1	1	Other	Other
+8472d35a-ad17-42a5-b25c-890bbfa12008	1	Other	Other
+8472de3c-c228-4b83-8348-bff172f414af	1	Other	Other
+8472eb42-2060-4a8d-b3ee-c3df8ed67caf	1	Other	Other
+8472f115-c4bc-4236-9c71-3bf38ccc2435	1	Other	Other
+84735492-784f-453d-94bf-d79001fbb42d	1	Other	Other
+8473907b-b6ad-4f7c-8b47-ca26c1142e2a	1	Other	Other
+8473a184-cbde-43ce-b2cd-ba93d7064217	1	\N	Other
+8473b1ca-8f33-4677-a7e8-86d589defc28	1	Other	Other
+8473ceb4-cdfe-418b-b49d-6880373be582	1	Other	Other
+8473e85a-6650-4990-8fc3-51304781efa8	1	Other	Other
+8473ec3c-e96a-4324-9b07-c256a38712e5	1	Other	Other
+84740383-8a34-4f5c-852b-b2214328e401	1	Other	Other
+84741f27-09e8-4ed3-8def-ec64fe7d21df	1	Other	Other
+847442e6-5335-4082-b384-fc0f35328a1b	1	Other	Other
+84744f5d-35b0-4809-9495-9db971f926b9	1	Other	Other
+8474945d-c8b8-4ed8-90e8-c2cb1aa14b67	1	Other	Other
+8474cd34-c2e0-48d2-83f3-56a9ee206a23	1	Other	Other
+8475988b-2a95-4795-939c-c2404431f535	1	Other	Other
+84760e6a-9dfb-482b-8783-9db0945237dc	1	Other	Other
+84763559-5254-45d0-b75a-328c48d32a08	1	Other	Other
+84765566-bec9-43ab-9e24-dc285248cfe1	1	Other	Other
+84765c12-bd79-4f27-a48f-6d22017891f4	1	Other	Other
+8476b81d-a719-4b65-bc7b-2b1afb72cc08	1	Other	Other
+8476befb-6b0c-4ff0-b052-a45457cc6596	1	Other	Other
+8476c37b-c0bc-45c7-97c9-9e1b282ede87	1	Other	Other
+84770e3f-5778-4622-bc2b-6ff2c6a1eb54	1	Other	Other
+84774c98-d240-4982-8e4e-c4c1617a0b28	1	Other	Other
+84774eae-aa9b-4fa6-af2f-8cc5caa21c01	1	Other	Other
+8477733a-62b3-40d8-9fca-331dc5a909dc	1	Other	Other
+84779f80-4a05-4512-951e-7addf35f377e	1	Other	Other
+8477aeff-66fd-4b8d-8155-d8553d6c1567	1	Other	Other
+8477d443-682b-490e-a035-ded1e972d446	1	James	Other
+847816dd-be62-48b3-a911-4f634cce8e3b	1	Other	Other
+8478202d-40e1-4ace-b225-3003145eb528	1	Other	Other
+84788050-f076-4233-88e0-f712e0f2ba9e	1	Other	Other
+8478d871-d122-48a7-95a1-c77dc374ae41	1	Other	Other
+84795c4b-8fc8-49c7-ac8e-e28a01967e04	1	Other	Other
+84798a30-7160-4c96-a420-ee8fd5437fe4	1	Other	Other
+8479b5af-5a82-4768-a3f3-1e7ba33530d6	1	Other	Other
+8479b5e5-311a-48ee-b90a-b16a3ccb13b5	1	\N	Other
+8479c35b-fbff-49b4-8ab6-90682e8ea783	1	Other	Other
+8479cdfe-bc59-4a26-80f9-e3ea8f354091	1	Other	Other
+8479d829-5f5e-435e-a103-ffc18e8b208c	1	\N	Other
+8479f375-ced9-4f25-a4bd-d548880fa15d	1	Other	Other
+847a0450-7dc1-40ad-9c1d-6bb528463092	1	Other	Other
+847a1d95-899c-4dd8-b8cc-9a89159123e3	1	Other	Other
+847aae7f-b38c-42fb-87f2-f36e739ebdfb	1	Other	Other
+847b2cfe-b563-476f-9dae-a157a475b9d2	1	Other	Other
+847c291a-e582-4cf2-8832-431c24c84eb6	1	Other	Other
+847c9951-d01f-49b2-8a84-77f1a9f7533a	1	Other	Other
+847caa4a-d2ac-49b2-a4fc-3b4148854f03	1	Other	Other
+847cb778-df4b-47af-9b7d-65fcaeda416f	1	Other	Other
+847d1927-05e2-4784-84fb-61918f478b74	1	Other	Other
+847d5b25-6f71-472f-a561-ec07514d4d9c	1	Other	Other
+847dcc56-add5-428f-861d-a3d50e16d027	1	Other	Other
+847de4a6-1d78-4657-a6bb-d916b61fd0ec	1	Other	Other
+847e31b6-126b-472a-b4f2-e1118a1aed4c	1	Other	Other
+847e710a-3224-46b0-841b-01cb42de5001	1	Other	Other
+847e9a5d-783a-4b0c-9769-2c9661c0fe86	1	Other	Other
+847eaddf-7d3c-48bd-a701-700aaeb9e537	1	Other	Other
+847ed1d9-47f2-46ca-8586-fc4a60abfb71	1	Other	Other
+847ef56a-9d98-494a-9c69-ebd786b7ddf1	1	Other	Other
+847f4011-5240-4193-b2fe-bf9285188c40	1	Other	Other
+847fba9b-882f-4196-ac19-f8c87663324b	1	Other	Other
+847fd01d-4773-4e69-9967-71d84ea94dcf	1	Other	Other
+847fe529-e0a3-4901-8fda-b64a8e419a20	1	Other	Other
+847ffcf6-d121-4585-af8a-c2f91fee8b4e	1	Other	Other
+848014da-6868-48fa-971d-4a42a3a259d5	1	Other	Other
+848023ad-4891-4c23-9775-cb15f942e65f	1	Other	Other
+8480468f-e90f-40fa-963d-69d3269b11da	1	Other	Other
+84807023-f1c7-4816-891c-5923b10a03b6	1	Other	Other
+84807528-bf80-4523-94e6-f6778438ce1a	1	Other	Other
+84807fa2-c630-4afa-b32e-a199ad04648e	1	Other	Other
+8480f864-712e-43d2-abe5-2c8c112dfcae	1	Other	Other
+84810dbd-45dc-449f-b9fa-de656fc9d971	1	Other	Other
+84812bac-580d-4df9-8ad5-b5f44d0dd302	1	Other	Other
+848179ba-8956-4688-8852-d16ada916a5b	1	Other	Other
+848190c0-cd0c-487d-95a3-723cbf390c0d	1	Other	Other
+8481f086-c5e8-4d0e-8f25-3e2328c985cb	1	Other	Other
+848205a9-e3a1-4ca3-b77a-202b8211b484	1	\N	Other
+84820b4a-5e9a-41f9-b21c-275f652871aa	1	\N	Other
+84829eba-cdac-4685-9d8d-fad27c8d9b5c	1	Other	Other
+8482e8f9-3aa8-403d-8252-9487733f468b	1	Other	Other
+8483589f-6de2-4a4c-baa1-a3e4d022b869	1	Other	Other
+8484291d-0b0b-4e50-a7f7-6be4ba9b0e78	1	Other	Other
+84842c0a-259a-457e-8bc1-d8250f617074	1	Other	Other
+8484740e-09fa-4451-8eb7-991c11db0e75	1	Other	Other
+8484b36d-b142-436f-a9f5-dde6a43a30fc	1	Other	Other
+8484dbda-8e65-445b-ad36-d45d5614ec12	1	Other	Other
+8484ec1e-1399-4aee-9574-0b3932161e6c	1	Other	Other
+84852dd0-b0c5-4e9a-ace5-c30f3d57e3c2	1	Other	Other
+8485985b-56a4-4703-8231-bd30493a34fb	1	Other	Other
+84859bac-cd20-414c-aa6a-adeb667e9e0d	1	Other	Other
+8485a719-b9a4-4cf6-93c3-ceb682d08078	1	Other	Other
+8485aa1a-25ab-4f64-bd23-9f6b3b0fcab7	1	Other	Other
+8485bd09-59bb-4504-bd44-2776f09cb742	1	Other	Other
+8485be72-29cf-4c85-becf-059e058eed01	1	Other	Other
+8485c473-ea54-42eb-a99a-f3c1dde69e63	1	Other	Other
+848659e6-fc53-4722-a474-69b73f05dd19	1	Other	Other
+84866315-dc8a-437b-bbf6-9e8f07b3453c	1	Other	Other
+84868672-429a-434d-be01-69207a762dfd	1	Other	Other
+8486cb72-6b84-4b05-8eeb-8c50d69ef168	1	Other	Other
+848708e6-0463-4eca-bd8b-76ddc6af5ebd	1	Other	Other
+84872ec1-013c-431e-b72e-2ff4392dfc40	1	Other	Other
+84872fef-4ebd-406e-a59d-600bb9e888ad	1	Other	Other
+8487396e-28b8-44ce-92b6-e9dcc8296255	1	\N	Other
+848749d7-1921-4e4a-a8a5-7e2c9a067fb5	1	Other	Other
+84876c4c-de6e-4dd0-8c89-1ca686335494	1	Other	Other
+8487a6dd-0015-4d40-9eb8-c844338abed2	1	Other	Other
+8487dd82-6ebd-4c85-b6e5-37ec25c6994f	1	Other	Other
+848804c8-fe91-4dce-8236-b4adc38e0b3f	1	Other	Other
+84882ea8-7381-4630-a95b-037f1c79ed2d	1	Other	Other
+848848d8-b266-4a96-b14d-ebfbc4a9dd97	1	Other	Other
+84884a2a-b6f5-475b-af36-4ee08bb01c35	1	Other	Other
+848858fa-7d1e-4901-b7c9-29323f9143f4	1	Other	Other
+84886f24-2696-4b8f-85ae-25e58989e39d	1	Other	Other
+8488c028-617e-4bf8-887e-9d44144e6b3c	1	Other	Other
+8488d39a-45dc-49b5-8a7c-eaa11d6e6252	1	Other	Other
+8488e5cc-6c3e-4521-b66c-04b78859a7f3	1	Other	Other
+8488edc9-e949-4c7f-b00a-9045dab758d1	1	Other	Other
+8489093e-1c51-4b62-a51f-ea119cb5575f	1	Other	Other
+84894f48-28bb-4f99-a98b-d4a3321bc2e5	1	Other	Other
+848a02c2-1910-4e25-aa2e-930edc7a8541	1	Other	Other
+848a1b9a-e0a8-418e-af64-68947d7f1b4d	1	Other	Other
+848a47bd-89c2-47ba-ae98-48ef3ec8a6fb	1	Other	Other
+848ab9a7-3cf4-4c13-917a-d2f2ebb006c1	1	Other	Other
+848abfde-4d93-4c82-a16b-19c6d7f306c5	1	Other	Other
+848b563f-509f-4ad8-9873-959f39157eef	1	Other	Other
+848b63d8-dfaf-4bc1-abf2-4d407767a0d4	1	Other	Other
+848d0c2f-87e4-4148-b00c-ad41739a3525	1	Other	Other
+848dabc7-d190-4592-94cc-2aa2eb3f8a67	1	Other	Other
+848daf74-883e-4b0e-b401-efd097f6ad0e	1	\N	Other
+848db787-641b-423d-9726-3f5586374832	1	Other	Other
+848dc2f0-dca4-4e3a-acf3-1a6fffbc5ba8	1	Other	Other
+848decb0-0ab1-4b16-880d-f528cf63deea	1	Other	Other
+848e14c2-0bfe-456a-b6e8-edd7b4e23700	1	Other	Other
+848e550e-388d-4878-a5a9-8df58bb7df2e	1	Other	Other
+848e6511-c67f-4a81-888f-328310c931a1	1	Other	Other
+848e6cb5-206c-4445-9f79-87c927f68d0c	1	Other	Other
+848e8461-d740-45d4-9d58-83191e3adfaa	1	Other	Other
+848f0137-ce51-4a62-872e-622fedde35e5	1	Other	Other
+848f03b1-3bd4-4362-b6dd-b86b5182b973	1	Other	Other
+848f2dfb-4bfc-4cba-a148-f7cbed7ec35b	1	Other	Other
+848fa27b-2bfd-45a1-9b9e-40e311b432b8	1	Other	Other
+848fb802-e6a0-45c4-bb9d-a51a4e7760b9	1	Other	Other
+848fb9be-c66e-46de-8b64-986d14d17f17	1	Other	Other
+848fbf01-feb0-45cb-a2b4-275c6b048288	1	Other	Other
+848fe4e3-6828-4afd-8cec-f32ecc8e3a45	1	Other	Other
+848fef57-dd68-42cd-8c2f-21d0388467b1	1	Other	Other
+848ff63e-b4d1-4ca7-bc57-a1041e26b3a3	1	Other	Other
+84903adc-c40b-4b33-8d53-d68e1c843443	1	Other	Other
+849047de-4644-400b-8de2-3f2b9ac90158	1	Other	Other
+84904b15-382b-4e34-b14b-01b7a6587819	1	Other	Other
+8490551a-dd82-4288-9a06-3b1d2259d9fe	1	Other	Other
+84906fd1-bb6f-4300-b7f0-7e7b8ce3e405	1	Other	Other
+849071c3-1d17-4b36-bdf8-d974311caf9e	1	Other	Other
+8490848f-7f2a-4dd8-9e3e-9765c4b685cf	1	Other	Other
+8490950c-05f2-4bf3-8a01-e85bf6bc1bff	1	Other	Other
+84909811-7804-4c1e-bdfe-4c68bfc96201	1	Other	Other
+8490c2bb-93a5-498b-865b-00e30a1acc58	1	Other	Other
+8490f51e-10e7-4f86-91d0-9690b4aa5186	1	Other	Other
+8491053f-7d66-4700-b7c0-def23646ef5f	1	Other	Other
+8491106a-db24-4be0-bb1a-76a5f59327a2	1	Other	Other
+849122d4-51e8-447d-9782-a99654eaf03f	1	\N	Other
+84913706-d013-43ad-bca5-cb68b02b8948	1	Other	Other
+8491970c-5a76-4871-9121-ae6641d0251e	1	Other	Other
+8491b0ac-0157-451f-aaae-1c2f0709df7e	1	Other	Other
+84920ecf-ca1e-4771-81e3-8575161cc4bc	1	Other	Other
+849236f4-9b05-46da-b344-19ec999a8d71	1	Other	Other
+84923d6d-db65-40f6-aba0-2406af110ab5	1	Other	Other
+849272cc-dde3-41d1-a666-46a878dae3ab	1	Other	Other
+84929785-18d4-431e-9840-4a2580b50f36	1	James	Other
+8492a4fe-e581-4747-a858-4c0db8237eae	1	Other	Other
+8492dfc6-0663-4386-9df7-d503cd6ee98a	1	Other	Other
+8492e6d7-f379-4313-bd50-76f8dd012938	1	Other	Other
+84930fb8-08a3-4e2e-9c88-b5a66043004a	1	Other	Other
+849337de-0a30-4a1a-9861-0e7b8f3e42f8	1	Other	Other
+84938899-aaf6-432d-b8f2-5fb53c855e2b	1	Other	Other
+8493d4b9-80d2-46e1-b55a-ee23d3b61dd6	1	Other	Other
+84941d4c-8a00-4e37-8c61-ebdad6abbcf5	1	Other	Other
+84947ab4-7273-4da2-bda4-ef0b5e5dd09d	1	\N	Other
+84949ee9-db10-4abd-a98d-46eed80d5b30	1	Other	Other
+8494ea85-6da9-4d06-a19c-b79cc66a1e59	1	Other	Other
+8494f52d-4a29-4cbf-ac61-d153e196d089	1	\N	Other
+8495004a-45f3-499c-9161-f71f79a6b1c7	1	Other	Other
+8495a576-fd8b-4f2b-88d6-3621c8db3e06	1	Other	Other
+8495a982-0b58-45ad-ae38-b62db2cb2aa0	1	Other	Other
+8495fa30-0b41-4ac4-8fe4-3de9a04fb87f	1	Other	Other
+84964ed3-0b12-4cf1-9909-892321a05705	1	Other	Other
+849673a2-fb3e-4618-8e37-344c69878eca	1	Other	Other
+84977c89-897f-45dd-ba95-461ebb2c5e47	1	Other	Other
+84977f5f-6983-41f8-8fe8-91615530e14c	1	Other	Other
+8498190a-7d46-4236-b68a-01c7d1968c7b	1	Other	Other
+849821ea-d4eb-4d6a-a95e-c45f8d5fb5d6	1	Other	Other
+84983d34-8509-49d2-948b-402b33c905d3	1	Other	Other
+849860bb-18f9-4973-b176-313e05ff3624	1	Other	Other
+849895ed-8d7a-47c6-afb0-989216c6629c	1	Other	Other
+84989663-8f34-4be9-a1ea-7448a87cd91a	1	\N	Other
+8498c1fe-9241-4596-a5e2-b0a838fb72a6	1	Other	Other
+84990194-ec26-445e-9c94-34451798a85b	1	Other	Other
+84994e62-e033-4dc3-8288-f0fd33133c6c	1	\N	Other
+84997c5e-c9ae-454f-9439-4955c780a8ee	1	Other	Other
+8499d93e-18d7-4a1a-87d5-c657f53b7ee9	1	Other	Other
+8499eab8-02df-4f24-a736-6169c08dbe70	1	Other	Other
+849a2615-9218-4526-9f1b-1c3900c03a8d	1	Other	Other
+849a79c3-34ef-4b4f-a26d-a916b0e7ce92	1	Other	Other
+849ad45e-7c12-4243-a219-6dba73398591	1	Other	Other
+849aff23-60d8-49d2-ba08-a0df43da1be7	1	Other	Other
+849b6540-ef2c-4def-81c9-0675b5f750bf	1	Other	Other
+849b7e40-b868-4178-86eb-f52d0affb2d0	1	Other	Other
+849ba637-5be2-4382-a088-f4f63179fdc4	1	Other	Other
+849be29f-92c1-4f15-873a-bcb46a152b23	1	Other	Other
+849bfb05-68c0-4ce8-bb58-cc00e8992da5	1	Other	Other
+849c2d85-427e-4a69-94f7-734c5e6d7cc2	1	Other	Other
+849c6ac2-0940-4348-9b5c-acbe33ceacd1	1	Other	Other
+849caa39-a746-4385-bb0c-2b2fbbe42168	1	Other	Other
+849cabf1-51b2-4303-92f6-a247c8db29a8	1	Other	Other
+849ce233-18e3-41c6-9ef1-05e0165bd3cd	1	Other	Other
+849cfd09-2ffc-4ee0-99b4-8176e3c81e4d	1	Other	Other
+849d2b6c-c2dc-4d81-8771-0f218be40dce	1	Other	Other
+849d5a0f-afd6-4269-a517-eb60e1faac55	1	Other	Other
+849d7089-68a1-45d9-9c2f-dd66156fc726	1	Other	Other
+849d882d-5690-4b11-88b6-c8c1b96c04c1	1	Other	Other
+849db2e6-f4bd-4610-b82c-1ca8d796faf0	1	Other	Other
+849e10d9-c362-45af-bc66-9898e44abc0e	1	Other	Other
+849e22ec-6b07-48dc-bb85-594158a270eb	1	Other	Other
+849ec9c2-04c7-4d20-82fb-ddf634705f51	1	Other	Other
+849f2ffe-605f-405a-b0f4-7ffb02d18a46	1	Other	Other
+849f3939-3d42-47ee-bd55-43a65d7d30f7	1	Other	Other
+849f3a15-633c-4f7f-9675-cb0207efc829	1	Other	Other
+849f612f-d778-45e6-9a02-2e32ed4f5858	1	Other	Other
+849fabe5-1c99-436f-a88c-8f87a18d241c	1	Other	Other
+84a03eaa-3d77-450a-8843-fc94a4dab58e	1	Other	Other
+84a04d8c-b62d-40e6-b03a-f349dd831324	1	Other	Other
+84a08717-d7b2-4232-acd3-e3aefa7f9ae2	1	Other	Other
+84a0888b-09c6-4804-83cc-2c0ef7d39636	1	Other	Other
+84a0a1b1-aff0-45d7-a161-bfa9f9cfed23	1	Other	Other
+84a0ba89-727d-41ad-b8b6-8ac7e8f7daba	1	Other	Other
+84a0d979-6bcd-44ee-b9f5-fa877e604600	1	Other	Other
+84a0ff0a-dc5e-48b0-a9d3-9701b14fdf86	1	Other	Other
+84a102be-1524-4229-9a45-47ffe9f7d199	1	Other	Other
+84a11574-66f5-4222-8df4-fafee8b69e3c	1	Other	Other
+84a1255d-d8cf-4989-a59e-535929d5aead	1	Other	Other
+84a12af4-85f9-4b0a-9390-56b2952047a0	1	Other	Other
+84a18042-b28e-4f2e-bba5-c4adeaf51cf8	1	James	Other
+84a18517-f96e-48ed-a95e-a41ad9c89cf6	1	Other	Other
+84a193c8-07f5-46f7-8a5c-7d8f8d2823cd	1	Other	Other
+84a1a377-453c-4725-830b-5699fea07109	1	Other	Other
+84a1e0c9-2477-47bb-a83e-c58db85ecb90	1	Other	Other
+84a210bf-eddf-41c7-be2f-57eedddaba25	1	Other	Other
+84a26164-7574-485f-a420-36884de13060	1	Other	Other
+84a297ca-258a-4064-9a4a-eba62e4206a8	1	Other	Other
+84a39a47-5273-4033-abf8-19d8a2e4cd79	1	Other	Other
+84a3c569-d76f-4a5a-afee-2e3e92bd4ad0	1	Other	Other
+84a430b8-f3d7-46cf-975f-f199dea31f6b	1	Other	Other
+84a45c99-0ec7-4e28-bad7-e161f2b4c96c	1	Other	Other
+84a4616e-7cff-4b97-983f-a73add572afc	1	Other	Other
+84a483e6-adcf-450c-b970-bb662ac21df7	1	Other	Other
+84a4b882-7b22-45e1-b550-a4698d4c2fdd	1	Other	Other
+84a4e41e-aa1e-44f7-9c77-db9d2915136b	1	\N	Other
+84a5157a-1029-424d-a76f-199076526322	1	Other	Other
+84a54f73-c31d-47d9-b206-0bcba702368d	1	Other	Other
+84a5fde6-7a43-4484-8d3d-c86818232082	1	Other	Other
+84a60d5c-b75f-4b1b-891e-0b1a7fee25bc	1	Other	Other
+84a63459-6d9c-4d52-ae11-1da0d2e2f640	1	Other	Other
+84a67dce-d3c1-4049-9529-b6ca2628290e	1	Other	Other
+84a69af4-f171-4b3d-896c-5c788ce78abb	1	Other	Other
+84a6c797-d8e4-4caf-a0c5-7cb0bb7ce694	1	Other	Other
+84a6d2a9-35dc-45ed-9929-f8b166fa23a4	1	Other	Other
+84a6ef6e-7a19-4de6-b0a6-772e7d016264	1	Other	Other
+84a7246d-ceb9-4cc0-8906-5688f9c6f70d	1	James	Other
+84a760d8-2274-45dd-a1a3-74a7f68d7870	1	Other	Other
+84a851ca-d134-44af-a40a-6aa1bd60d09b	1	Other	Other
+84a85705-b77d-4401-9373-8e95dc48b1e9	1	Other	Other
+84a90fc8-3745-418d-b136-4c5579444331	1	Other	Other
+84a9a951-f7e9-43cd-bdc3-54b3266eb20e	1	Other	Other
+84a9b531-5443-4831-981f-8e19d6e5b70f	1	Other	Other
+84a9b831-d9fb-4c47-bf98-3e32337ed2b8	1	Other	Other
+84a9bc1e-9430-4e49-a8e2-901a348ba856	1	Other	Other
+84aa2dae-7324-4730-9140-36f6157c38af	1	Other	Other
+84aa700c-59db-498d-92b0-3ac23f660e5a	1	Other	Other
+84aab121-ba36-4ed7-8db7-a8d12c156373	1	Other	Other
+84aab844-7fe4-4fcf-a768-dca6d8c664c1	1	Other	Other
+84aaf50b-c14e-4975-89f0-1394714cdcb6	1	Other	Other
+84ab0a42-7aa5-4fa3-a2e6-346f1c1700e4	1	Other	Other
+84ab87cc-4a93-4e8b-b710-e20c8e659d7f	1	Other	Other
+84ab923d-28de-49eb-80af-f7a86277d99c	1	Other	Other
+84ab9a99-6ba6-499d-ae5e-0f7d0f38b520	1	Other	Other
+84ab9d4b-4332-4470-a585-96fde03672e8	1	Other	Other
+84abde8e-60fc-44ad-9380-e8b3ce35dc54	1	Other	Other
+84abf5eb-62a3-4be9-9292-9c679ccfbc60	1	Other	Other
+84ac05c5-b334-4034-a4ec-7201b835edf9	1	James	Other
+84ac262f-a105-420e-b883-76517f0b0bca	1	Other	Other
+84aca74a-99ea-4efe-8209-fd8389ac30bd	1	Other	Other
+84acfd8e-c192-4158-8413-9419f3a0dbc6	1	Other	Other
+84ad0484-104f-4625-a15f-a5fcbc0651a2	1	Other	Other
+84ad2f99-2766-4232-a451-3fd406323502	1	Other	Other
+84ad7234-ce8d-41a7-9d5d-dd7d5652cb11	1	\N	Other
+84ad7444-e725-40be-9cd7-9fd1c0a0dd42	1	\N	Other
+84ad7853-a700-4583-b982-075c3de27b99	1	Other	Other
+84ae3bc0-15eb-4985-851c-9795e3633d5a	1	Other	Other
+84ae54ac-831e-49a4-8855-3cec5f0fb99d	1	Other	Other
+84ae7d08-caa7-4b39-a606-a9f7c1dfcc42	1	Other	Other
+84aebd1d-8e9e-49d3-a537-ab91006d0e3b	1	Other	Other
+84aebe26-9787-4eb4-a201-ff9e5a826218	1	Other	Other
+84af11fb-ff84-481e-8b6e-1384d381fc29	1	Other	Other
+84af59dd-00ec-48f8-95a7-ca9d84a59386	1	Other	Other
+84af5b0d-1475-47ff-9ed4-69094ac75160	1	Other	Other
+84af6e9d-3caa-4bb9-b8bf-7294365567ad	1	Other	Other
+84afb614-78c3-43f5-b8b5-882d51f96bc1	1	Other	Other
+84afb6a4-5469-4fcd-a291-5a6753da1022	1	\N	Other
+84afbca1-f68f-40d2-9d85-aea4e6eab1b1	1	Other	Other
+84afc706-e544-44e4-bec1-dc29fc5ecfec	1	Other	Other
+84afeff3-6928-4f9b-b8e4-edb9bd5072a1	1	Other	Other
+84b06b59-5add-4a8e-a7e1-f78ad35a4ceb	1	Other	Other
+84b07187-225a-4fea-8157-d0cc9ba06f6c	1	Other	Other
+84b07db6-5dd1-4dd0-9d71-6df1628cc0d3	1	Other	Other
+84b0f917-318f-4fd0-a252-1c9c4a8aa47d	1	Other	Other
+84b107cb-e016-421f-a620-d83175d380f4	1	Other	Other
+84b11739-3776-4ef5-841a-3733c46f93a0	1	\N	Other
+84b126f9-1f31-4514-9349-21ce39a93d7c	1	Other	Other
+84b144dd-a54a-4867-b3c1-35f7ad03e9b1	1	Other	Other
+84b14ea6-78b7-4fe2-9bec-387bc292174d	1	Other	Other
+84b1dd13-bb22-4ce9-b26f-338d9f4a1a75	1	Other	Other
+84b1fb70-e095-4969-b351-37bff3db9a5f	1	Other	Other
+84b23468-53e9-4925-8187-58fec2bfac61	1	Other	Other
+84b29f0c-d978-402c-b9aa-954407b7107d	1	Other	Other
+84b2c1a4-f465-4687-9b8a-5f12ad331a94	1	Other	Other
+84b2f5ba-f34e-4818-8f53-027b109d6768	1	Other	Other
+84b2fb46-0f24-4a9d-906c-3c4d6bbd6a96	1	Other	Other
+84b31007-c856-4457-aab4-7bd6d0707676	1	Other	Other
+84b31b81-3094-4552-ae0d-be1bff7d5a1a	1	Other	Other
+84b35e88-14aa-4905-a533-1595bca5de74	1	Other	Other
+84b36f8d-796f-4476-84e4-e9da6be4d484	1	Other	Other
+84b38012-97e2-4448-9025-4b5d275b71d8	1	Other	Other
+84b39c98-cbb4-4560-8756-8fe8c08e8ed3	1	Other	Other
+84b3accf-77cc-4780-b0c4-21aa05d78578	1	Other	Other
+84b3ea88-2cde-489c-a4c4-7c8d9207e4c7	1	Other	Other
+84b420d0-d244-4f08-aab0-2b83d97e930f	1	Other	Other
+84b437ce-44f1-4326-b3db-561eea21e8b8	1	Other	Other
+84b4db27-d77c-4f38-a930-678737a8d36b	1	Other	Other
+84b51c1b-ad6f-4dc6-a30a-7780c07298fa	1	Other	Other
+84b54cfc-cbd3-47c7-a2ec-5fe2f4f971c0	1	Other	Other
+84b5933e-d4fa-4b88-9ecf-aa2744c57b62	1	Other	Other
+84b5fee0-58b4-4477-96b9-48d8fd432319	1	Other	Other
+84b625da-acd5-4571-a366-0a0ee8409e92	1	James	Other
+84b637be-bb59-41df-8c8c-080be6ca86bc	1	Other	Other
+84b6508f-f5ba-4617-90c9-f325e6fc067e	1	Other	Other
+84b657bd-49ae-45c3-9502-7580ffd63ade	1	Other	Other
+84b66669-df66-4bf9-bcf7-729b6b5d040a	1	Other	Other
+84b68738-a65a-4623-8317-d9c5c9021949	1	Other	Other
+84b6a38c-ead3-42f0-90f3-c28c8901ff4f	1	Other	Other
+84b6e63b-c8d8-4312-9a12-eef2b7068835	1	Other	Other
+84b72b89-a485-444c-9b90-43b3f948aae3	1	Other	Other
+84b73725-2ece-46bc-985e-bb8c89d0e8ac	1	Other	Other
+84b73e42-f759-405e-9a96-d1cdb9b549c7	1	Other	Other
+84b74768-20ce-4100-a7d8-4e9034e54581	1	Other	Other
+84b76d4d-448b-413b-b6e5-b3b78671b77e	1	Other	Other
+84b7a080-17fe-4865-bb3a-1aa06c64c833	1	Other	Other
+84b7b4d7-cf0c-43a7-86ab-6e57c719a864	1	Other	Other
+84b7c148-5875-4a05-a95c-cf9c0222d5e1	1	Other	Other
+84b7d3c3-3562-4280-81c3-84218df3b5af	1	Other	Other
+84b80255-a6cd-4491-b562-54ae77cda86d	1	Other	Other
+84b83101-dee6-4a7f-b7e9-3902522416cd	1	\N	Other
+84b86cfe-b720-417a-a650-e65682531988	1	Other	Other
+84b880d4-c77d-4919-81e2-23a4059f9fa5	1	Other	Other
+84b89f88-3332-4b9f-8986-fbd023e6b618	1	Other	Other
+84b8a415-0999-484d-a718-2b6c48e5b4ca	1	Other	Other
+84b90cc7-74f2-481a-9446-b2b0538f938f	1	Other	Other
+84b97c27-4c65-4cb8-836d-27031b11c6ad	1	\N	Other
+84b9a702-b16b-4197-bee8-5b524b7d7da8	1	Other	Other
+84b9ba5e-9a5f-47a6-bc1e-7ec47175bc19	1	Other	Other
+84b9e1f0-7509-4ed9-b193-c30e1b46ea27	1	\N	Other
+84ba14c7-7aef-488f-807d-110a62ddf6b4	1	Other	Other
+84ba4180-173f-4e52-bc1f-a915168a2ab0	1	Other	Other
+84ba799d-1c65-472b-8e8b-8194e1f93727	1	Other	Other
+84babef4-39fd-4c51-8fc4-2d80aa7286ff	1	Other	Other
+84bb3a1a-7fa3-4457-82fd-eda3b726a0b2	1	Other	Other
+84bb8451-410f-43d9-ad36-07e78440172f	1	Other	Other
+84bb98c2-a3bc-409c-a818-188ba26e771f	1	Other	Other
+84bbf00f-efd1-4ca0-9255-109721311a15	1	Other	Other
+84bc46b0-c669-47ca-be62-cec46aacff62	1	Other	Other
+84bc8159-8c97-46ed-a4d3-a89c80ff31b0	1	Other	Other
+84bcb390-0559-490f-90e6-8be53a740f2a	1	Other	Other
+84bccef6-acf3-4f2f-ab26-93b3403ae9a1	1	Other	Other
+84bd1a46-88ff-448f-b260-cc35f4200ac1	1	Other	Other
+84bd2d03-615f-4843-830d-6a17871c8ab7	1	Other	Other
+84bd6571-c247-4588-97a1-5c9794b032a7	1	Other	Other
+84bda38e-a8af-49ee-a945-495aa53dea6e	1	Other	Other
+84bdc466-502f-4c75-874c-826477cf0123	1	Other	Other
+84bde54e-80c0-4df0-98f5-8d09a04c78ec	1	Other	Other
+84be4315-3fa7-4dc4-afc1-03bb0c9e916f	1	Other	Other
+84be55cd-ecdf-4d87-bc7d-bae5dc9d607d	1	Other	Other
+84be693d-32f1-4d5b-8d11-d412b194f6a2	1	Other	Other
+84be74fc-6b29-41b4-ad48-6266c427ccc0	1	Other	Other
+84bea683-aca7-4686-9284-af9f7680b044	1	Other	Other
+84bef52c-20f7-4f68-bd89-1a04d04dd309	1	Other	Other
+84bf20c0-1da8-41d0-a113-ed6467d2c4e5	1	Other	Other
+84bf3f9c-8a33-4c0c-9405-b27944ca23c1	1	Other	Other
+84bf424b-ea81-4eb2-bfbd-095f59e12932	1	Other	Other
+84bf43e9-c581-433f-baf7-98b5de474672	1	Other	Other
+84bf9806-75c9-4cdb-8a5c-ec0f1925bd27	1	Other	Other
+84bfbabc-eb76-4968-b839-72df17bdaa00	1	Other	Other
+84bfd97f-0842-4b93-aee4-a464ce749da8	1	Other	Other
+84bfda22-aab4-4814-a316-95bc28c81f9a	1	Other	Other
+84c001c3-3e86-4601-9b23-8459b86a9fd2	1	Other	Other
+84c0897e-10f9-4955-acfc-dda790733d76	1	Other	Other
+84c09013-0e6a-46c0-acab-dceeabf251b4	1	\N	Other
+84c09079-a207-4316-8c04-eaf9c5394182	1	Other	Other
+84c0b806-5c2c-4bed-bba1-e6188ad62521	1	Other	Other
+84c0e4e0-aca6-4ccd-aead-5d768fd4bb29	1	Other	Other
+84c12667-3aa9-4cd8-b4bf-528f0a112946	1	Other	Other
+84c16d30-f694-4964-be96-3e5e3c738059	1	Other	Other
+84c18fa6-ab4c-4afa-8139-ca852a50c7b3	1	Other	Other
+84c1b4c3-2ba1-4221-9ec8-04ea0353fd5a	1	Other	Other
+84c230c6-15bb-4723-bf4c-afb15f844124	1	Other	Other
+84c26b0b-e10e-47ee-940c-290a23c8bb80	1	Other	Other
+84c28267-fb22-4821-8706-b39986032a27	1	Other	Other
+84c29fec-8d4e-4fd7-a712-ed623228efe3	1	Other	Other
+84c2aacc-45c6-47a9-8244-c31d40691c79	1	Other	Other
+84c2b836-90d5-439a-b622-76e5ec966583	1	Other	Other
+84c31514-7260-41a0-be97-4d902bb6165c	1	Other	Other
+84c3b16e-4c5c-4690-a989-b9fc324d3558	1	Other	Other
+84c3c266-7fa0-49c1-a3f2-f58f1d757006	1	Other	Other
+84c3d650-ee16-4c64-afac-ad49e1630591	1	Other	Other
+84c3e9d9-67db-4d4b-be6f-da0b96968518	1	Other	Other
+84c41065-15a9-4807-8c27-5450ed60020a	1	Other	Other
+84c44264-0a2f-4215-bc72-9f1aa10f9bfb	1	Other	Other
+84c4591d-28df-43da-9c37-0c72845828b8	1	Other	Other
+84c48fd5-0fa4-4de6-b262-84206a251bd3	1	Other	Other
+84c491c6-c82d-4d22-9216-5822223d30cf	1	Other	Other
+84c54fee-8982-11e7-aba1-fa163e8624cc	1	Other	Other
+84c60e46-21f9-4393-945e-2e363f00798d	1	Other	Other
+84c62a8d-7c6f-4c3d-81cd-477d11ad3f28	1	Other	Other
+84c62df1-8773-4cae-9de8-745721dbb486	1	Other	Other
+84c670b8-63d9-40c7-9425-f3958a6d7fe6	1	Other	Other
+84c6d5be-879f-4f4d-83ed-55b2170de53a	1	\N	Other
+84c6e907-e13c-47aa-bf08-032999ca3fe0	1	Other	Other
+84c6f712-7d89-46a9-8768-66a439c76e56	1	Other	Other
+84c72191-1b98-4b1f-b302-424db3e2bc51	1	Other	Other
+84c74764-e91c-4c9f-8317-c2eeb855565b	1	Other	Other
+84c76bd3-056b-4e3e-85d5-417432820f70	1	Other	Other
+84c77194-13b8-423d-b9f9-3b455d5c204a	1	Other	Other
+84c77918-7ee2-473e-b65b-a8f6f0653a22	1	James	Other
+84c8234d-fc59-4796-99d4-58777c1ae71b	1	Other	Other
+84c8d8e4-87da-4997-8945-0c4e094fd262	1	Other	Other
+84c8f806-b3ee-4f9a-98d0-54be545815fa	1	Other	Other
+84c9218b-d87e-4efb-8fe0-1a4b62f53483	1	Other	Other
+84c94dcd-b84e-4f34-98f7-da82625ca2d5	1	\N	Other
+84c97263-321a-44d3-9593-f560350dd3f4	1	Other	Other
+84c9c49c-7fe8-454b-a988-f16b9d450125	1	Other	Other
+84c9cdac-f345-4b00-9c7c-7541b499e152	1	Other	Other
+84ca1153-8242-4596-9bc0-806521d5367c	1	Other	Other
+84ca41ce-d370-44a5-810e-ac5cabe3fa8a	1	Other	Other
+84cae055-221f-4985-91ea-ebbf2440b2c3	1	Other	Other
+84caf516-7bf5-4583-bbcf-a2e8d8746a46	1	Other	Other
+84cafdae-2411-47ac-8b7a-1c6cbfe03360	1	Other	Other
+84cb1668-1bfc-44c8-8163-37bcc1367ed8	1	Other	Other
+84cb2b6f-e656-4608-a7bc-95296a094919	1	Other	Other
+84cb3483-3959-4c7c-a234-dcdbc986a293	1	Other	Other
+84cb3e1c-40ac-4a99-b13d-cd70d59ac4b4	1	Other	Other
+84cb666b-e485-4f61-8795-9d6a0e173e4b	1	Other	Other
+84cb878b-55e8-4fa7-a886-21e8bd494e4c	1	Other	Other
+84cbcb05-5fcc-4266-b2ed-038b90736b63	1	Other	Other
+84cbfa91-7600-4fee-9dc7-ceaab971be28	1	Other	Other
+84cc0aa1-cc39-4647-9bae-f81c2a505f8b	1	Other	Other
+84cc4299-8477-4f27-a7b2-119fbc697afa	1	Other	Other
+84cc5ea0-e625-44a1-a7c1-4454cdc085db	1	Other	Other
+84cc701a-e0d0-4b25-88bc-e2f2507d10aa	1	Other	Other
+84cc79ef-c147-4661-99a1-5900ff72ce2f	1	Other	Other
+84cc871b-e11a-4524-b606-795c672fd2cd	1	Other	Other
+84cc96a5-c61d-4302-a909-9f62739cbb24	1	Other	Other
+84ccc97d-6fca-41a7-b259-e0fb9533a909	1	Other	Other
+84cd6a56-94a0-4a39-830f-1583cae05ddd	1	Other	Other
+84cdfb02-92bf-4387-9f3e-f9704f7bc16a	1	Other	Other
+84ce0c93-66c3-4873-8b12-56ea8ca8bbda	1	Other	Other
+84ce26be-6c7e-4fe3-a3a9-4dedfb891e68	1	Other	Other
+84ce2d95-8587-4d54-bcf4-30050dee1a02	1	Other	Other
+84ce517f-42e7-4d52-9539-7fae8c287502	1	Other	Other
+84ced607-9143-4d0a-bfa5-c1c37e32c397	1	Other	Other
+84cee37c-779d-408a-a543-72c7bddc2feb	1	Other	Other
+84ceea63-c52b-4cbb-8b15-1fa6916c2e50	1	Other	Other
+84cf0675-b50e-4ddc-95b3-4280c881c364	1	Other	Other
+84cfd77e-ef9b-4475-8e8e-4f9ab4a11f01	1	Other	Other
+84cfefd1-d8e0-4500-a41e-56aa73994708	1	Other	Other
+84d00723-92b6-4885-ae81-12aa4da57440	1	Other	Other
+84d00818-84c1-4dee-8b56-6e08402c8fff	1	Other	Other
+84d018fc-154d-46a0-8c12-a83634adce4b	1	Other	Other
+84d058c6-879b-40f2-996f-e405d483f470	1	Other	Other
+84d0b115-a428-4990-adbf-66176952c92b	1	Other	Other
+84d0dbad-86e9-40cf-b8fd-8906bd867b8d	1	Other	Other
+84d10bc2-bb89-4e5c-8f29-c94d09c10380	1	Other	Other
+84d12c14-4515-4e68-815b-6ec109ab7b9f	1	\N	Other
+84d14c00-15fa-49ea-a9b0-94275d12f246	1	Other	Other
+84d16d4b-4301-4bf6-b501-932e328db4ca	1	Other	Other
+84d1a039-c2c6-4336-a263-00554121aebe	1	Other	Other
+84d2e6fa-2bb5-4b8c-9dfe-655b7bb3de83	1	Other	Other
+84d36f46-9a26-46a5-aa2e-e7d45827c248	1	Other	Other
+84d3ea51-0aaa-4874-bc53-49f8293a504d	1	Other	Other
+84d3f333-65f9-4b91-a92f-718660a49bd1	1	Other	Other
+84d41344-5f84-4fa0-9b31-56b726bdaadf	1	Other	Other
+84d44237-5a22-427e-8f33-23fb7e00b19f	1	Other	Other
+84d4c4c7-5d63-44b7-b40f-3a08449c04d8	1	Other	Other
+84d52bf9-2bec-4cd6-843c-edb467b04f47	1	Other	Other
+84d5c4ef-a481-4caa-bc1d-09c5f3121db3	1	Other	Other
+84d5c88c-fe4c-48b2-8366-ab911be28d21	1	Other	Other
+84d5e709-3329-49e9-b45b-205b3ef7ff24	1	Other	Other
+84d640a1-60bd-4eaf-9997-46189588de0d	1	Other	Other
+84d699bd-aeb6-4340-9ad2-6d98fe3fc5ef	1	\N	Other
+84d6a355-c577-4864-877d-b48d4f6125f3	1	Other	Other
+84d6bd1b-4ac5-4380-8c68-8e8c5bf13b25	1	Other	Other
+84d7451a-fd88-4d5f-812a-97074671f400	1	Other	Other
+84d7510e-17f6-4ca8-9cc1-f3c458137b03	1	Other	Other
+84d76bfa-a3ab-44f8-8852-69aa069433c5	1	Other	Other
+84d7ade4-9629-46e4-9797-18ec031fba29	1	Other	Other
+84d808e9-961c-4d17-be55-6e451d5065b4	1	Other	Other
+84d80dad-84bd-4359-bc46-94c26a53f298	1	Other	Other
+84d88545-5998-4ab1-8691-fb6277858d28	1	\N	Other
+84d8c393-d8de-42d8-92e8-59e61e6f86a1	1	Other	Other
+84d8df58-1859-4e6c-9a31-cc432b5c1827	1	Other	Other
+84d8f9d3-597f-4e5f-8e1a-89b4db3676ec	1	Other	Other
+84d901cf-73b5-45bf-b1b5-a75635a7d46c	1	Other	Other
+84d90aa5-e218-4326-89c1-24b525aa662a	1	Other	Other
+84d92431-f515-4800-9ec9-d8e2f3048d41	1	Other	Other
+84d964c6-2cfb-4239-bac8-ec518f51eeec	1	Other	Other
+84d9869f-a3aa-4b80-b92b-4424c522f690	1	Other	Other
+84d9b270-057c-4e4a-b966-bfaa837f9761	1	Other	Other
+84d9c994-0ffe-4b19-881d-2e6e627b08bc	1	Other	Other
+84dad0f0-2881-49e0-967c-6919089fa895	1	Other	Other
+84db0200-afcd-4f4a-909e-b844a0502598	1	Other	Other
+84db2112-90da-4eee-8f73-64654daee3ec	1	Other	Other
+84db2c1c-4659-4af6-80d3-0478eef835c3	1	Other	Other
+84dba26a-0e28-48bb-8905-ac11136b6432	1	Other	Other
+84dbb273-f36b-46b3-ab74-13ba7a468ff7	1	Other	Other
+84dc264c-e028-4de3-b212-7cdaad42b3ff	1	Other	Other
+84dc3470-9630-4319-863c-8bc22f441a6b	1	Other	Other
+84dc38f9-d1b5-4890-bc4f-b608790d4c81	1	Other	Other
+84dc4cf4-cca0-4f8f-abbd-e10ad7823319	1	Other	Other
+84dc9d8f-4eaa-4028-87c0-bfd373018689	1	Other	Other
+84dccf68-c341-41e6-8397-f5c74a5ae1e7	1	Other	Other
+84dcfdbe-8b52-4d5b-96ee-63a9612c50aa	1	Other	Other
+84dd0ce8-e06c-424e-a5ef-612c117d687b	1	Other	Other
+84dd1ba8-590d-46ec-876f-844ee8e1a58d	1	Other	Other
+84dd344d-6d14-4f5e-bc70-158568cf9fbb	1	Other	Other
+84dd3d00-ca59-4da4-a2b3-900c1aad142b	1	Other	Other
+84ddb237-9f93-4c17-b2bf-4c0e74a976a2	1	Other	Other
+84ddb4dc-a748-4a25-8c3e-8bfdab440f4e	1	Other	Other
+84de1f85-27f6-40a9-8768-5ed50444de59	1	Other	Other
+84de2cb3-cf41-4158-8cb5-35d5cc552cda	1	Other	Other
+84de4ffe-a847-4581-9df2-49d9970b6a68	1	Other	Other
+84de5c2c-3dc6-45c8-8bd7-0d8bd3adfdfb	1	Other	Other
+84de6cd3-6369-4b99-96d8-2a94a2c1eb2c	1	\N	Other
+84de8916-f376-4c1f-af95-d2b31df81b4b	1	Other	Other
+84de8e8c-f4a8-47ee-878e-bfbf76d568aa	1	\N	Other
+84de8ff5-14a3-4a14-b218-c0d568f43dc4	1	Other	Other
+84de9daa-d6c2-4064-99dc-6de898da2cdf	1	Other	Other
+84de9df4-8400-4913-a3e0-a1745b1ecda9	1	Other	Other
+84de9e30-72b2-4ea7-b061-e816a4de8285	1	Other	Other
+84dea405-0551-4695-9206-2261b52239d9	1	Other	Other
+84df589c-0c46-4914-af51-21b3efc96218	1	Other	Other
+84df8de3-ebfe-4f86-891b-33a3a6560be9	1	Other	Other
+84df9a11-018a-442c-ad6d-381e20d00939	1	James	Other
+84dfa381-2a2c-4f42-8a24-c058ad3b8017	1	Other	Other
+84dfa886-0e8d-4e5f-b761-74a604cff166	1	Other	Other
+84e055c1-77b4-42a7-9505-c4974d3390ec	1	Other	Other
+84e0679a-eb73-47ca-9b0e-ae8923b6b0a0	1	Other	Other
+84e09e65-ee27-4a55-9b47-c7aa19446638	1	Other	Other
+84e0bc27-5d84-4d2e-9d0f-210102c7c00f	1	Other	Other
+84e0c0b4-ab61-481a-9e44-b4310ded634b	1	Other	Other
+84e0f3b0-ce98-4748-8b30-d4a5130fe2f2	1	Other	Other
+84e14f37-b951-4448-a757-05e61ee7b0f2	1	Other	Other
+84e2318d-8bcc-4430-8a84-a5094c6e9733	1	Other	Other
+84e23912-9148-4593-ab6a-098ef84be631	1	Other	Other
+84e2e33f-023a-462f-9a50-9f261c9cf60e	1	Other	Other
+84e3966d-8991-48a3-be80-219350b7e6c8	1	Other	Other
+84e39737-7907-44c1-b5b7-e2c80003e443	1	Other	Other
+84e40433-d57d-4942-b60d-07450c7f6277	1	Other	Other
+84e40806-753b-44a5-a678-d65860c9fcea	1	Other	Other
+84e433a2-41e9-4d95-bdf9-7823e00eef49	1	Other	Other
+84e45c1a-19d3-4961-b99e-7b8551740375	1	Other	Other
+84e47ac7-4071-4bdf-ac1b-ea1622d1f776	1	\N	Other
+84e47dca-5e19-4b53-95fe-04c0739a0c2d	1	Other	Other
+84e4815c-1dae-4e54-ae2e-e9f5671c26f9	1	Other	Other
+84e4b4e9-dfcb-4df8-b75e-15420592d047	1	Other	Other
+84e4dd64-4ed0-42ad-a7a6-21931785bcb1	1	Other	Other
+84e51adc-0e5c-4f77-925a-62fb89619998	1	Other	Other
+84e51c31-caa1-4421-a628-516eb0c32061	1	Other	Other
+84e54e7c-cfa1-4261-b1ee-6db24e4ce78c	1	Other	Other
+84e578f5-6bc9-48bb-8139-ed13d1320f70	1	Other	Other
+84e585f3-7b8d-4cb6-ab05-07dc62b34bea	1	Other	Other
+84e58d91-ffb7-4f55-93d3-98264ca99751	1	Other	Other
+84e59a99-fb6b-402e-8c4f-257dbe63f6c4	1	Other	Other
+84e5db3a-6b0e-4652-a64c-9db44279de78	1	Other	Other
+84e5e593-6c2c-4a48-8ae8-c254e3c0ce0f	1	Other	Other
+84e60afe-2404-4a6b-9cec-1510dff3afd4	1	Other	Other
+84e62402-576a-4e24-8bf3-6ff17fadae5d	1	Other	Other
+84e66fbd-8b8d-46cb-a7d1-d7c0bd42e4c3	1	Other	Other
+84e6938a-40f9-46e5-b467-6fc46c9add98	1	Other	Other
+84e6c12a-6253-42ff-8130-e764e590cc71	1	Other	Other
+84e6d095-1b64-4898-9e53-10e087bb5051	1	Other	Other
+84e6df18-2a51-44ae-8d17-0d92df3df115	1	Other	Other
+84e6f1ca-fd12-4975-a62d-d1087e34e8c2	1	Other	Other
+84e76ff3-5b6c-4ba4-973c-538ee6cd0c00	1	Other	Other
+84e7a954-1d8a-4701-8ca1-4da49ceba1eb	1	Other	Other
+84e7bd14-c55f-4ba5-9821-903845e27075	1	Other	Other
+84e7c2f2-96a4-48ed-b07a-b338d21cadd4	1	Other	Other
+84e7c5e5-dbcc-4a21-ba66-3dd77513f594	1	Other	Other
+84e7caa7-5af2-42a2-b869-4f44a46c75ec	1	Other	Other
+84e7e3f2-61c2-4df2-bdb3-1f20a788029c	1	Other	Other
+84e7fa28-e90b-4b87-b687-e62543fe2b6b	1	Other	Other
+84e7fbb5-1170-44e9-9fff-fc536c272931	1	Other	Other
+84e8084b-6f8b-4cdf-9e62-e72071c130dc	1	Other	Other
+84e84069-f98c-4d09-9dc1-3aef26263feb	1	Other	Other
+84e841d7-4ef3-43e3-abfc-89c5e535ebab	1	Other	Other
+84e860b0-67a9-437f-a13a-f94dc0ad4daa	1	Other	Other
+84e86349-8345-4f69-a469-a4b96db296ca	1	Other	Other
+84e86cc2-c05e-4c3f-9adf-d0616fd53909	1	Other	Other
+84e8bba8-57f6-4bc3-8b9d-e7f6f3d2f584	1	Other	Other
+84e8e371-a7e2-4120-96fc-a77f87b6cd3b	1	Other	Other
+84e90db9-a319-4af8-9015-73f86e1090e5	1	Other	Other
+84e94eda-66ab-4fbd-b5f3-ee0acdfc5392	1	Other	Other
+84e95ebf-1b98-4e67-948e-14ec8e395464	1	Other	Other
+84e975dd-7102-4ceb-8101-a689ff143abf	1	Other	Other
+84e9d676-fe17-4a9c-99fd-85288d0bdf98	1	Other	Other
+84e9e443-be56-4066-86cb-4f262c187133	1	Other	Other
+84e9fa0f-dece-4c4d-918e-67afb0f5a287	1	Other	Other
+84ea6a6c-c4e3-4843-bd00-bdc61c228357	1	Other	Other
+84eab64a-986d-4369-989f-aa208a96df49	1	Other	Other
+84eac4e5-4f77-425a-86d9-5f0fbb1fe189	1	Other	Other
+84eadbd2-330a-4b8f-a441-6f4971013a25	1	Other	Other
+84eb03e8-43d0-453c-ac5d-83e6370e4487	1	Other	Other
+84eb1280-cc7e-4828-8602-6b85ecd4a72d	1	Other	Other
+84eba716-b5c9-422d-b26b-411ba72f0886	1	Other	Other
+84ebb220-1683-442c-85e2-3104cd40b061	1	Other	Other
+84ebc134-bdad-4c8f-8204-687d029f9b8f	1	Other	Other
+84ebc2f8-1010-4834-85cb-5436c45d7728	1	Other	Other
+84ebcd97-ffb2-4b33-9cc7-b027e5d7ee2f	1	Other	Other
+84ec1ae3-39e1-4584-b02d-c258b3fcd2ca	1	Other	Other
+84ec600d-1cfa-41cd-9e40-7a163941a276	1	Other	Other
+84ec8c2a-e0f7-41e1-92fb-a1203500b6f8	1	Other	Other
+84ec9df9-5529-42ec-af36-34d16b3e6b6e	1	Other	Other
+84eca75c-1e6a-43ef-8252-7c9fce994f35	1	Other	Other
+84ecaf17-1167-45c5-ab48-f54aeb6b8e02	1	Other	Other
+84ecb251-9ddf-4333-a866-a611777778fa	1	Other	Other
+84ed1cd7-c285-4229-926b-d99ff9f38b65	1	Other	Other
+84ed3916-7c0f-4e64-94bb-fe1391bde962	1	Other	Other
+84ed3da8-6aec-4efd-bfe5-1e3fcd947cce	1	Other	Other
+84ed52f8-67a8-4ccd-9df0-7fa3ab492c6b	1	Other	Other
+84edc9dc-8d4a-4852-b8bf-134a5b31c6ee	1	Other	Other
+84edd7a4-3993-4c9a-911f-9bab29dbc321	1	Other	Other
+84ee00a7-1499-4e4b-bba0-1b8058fe6b6f	1	Other	Other
+84ee1fcf-7aca-4660-8224-6c5ef2acdcae	1	Other	Other
+84ee720e-79a0-430a-a241-f1a51199d9c4	1	Other	Other
+84eeac14-692a-488b-8255-bd11619abe71	1	Other	Other
+84ef139f-1869-48af-a70f-1e07fcb9d6e4	1	Other	Other
+84ef34a8-a7eb-4e8d-a675-4d1d47a58803	1	Other	Other
+84ef740e-8493-4b2f-b2bf-8272ecf68dd5	1	Other	Other
+84efa33d-c12b-43a6-a428-706d80b4c2a0	1	Other	Other
+84efae8b-4106-4f01-82e6-4ed703878676	1	Other	Other
+84efe280-4e20-4df6-ace2-f7ea53ea859e	1	Other	Other
+84efee96-7b29-4455-b7e7-0159fd0be781	1	Other	Other
+84f023eb-7e85-4644-9ee0-68244e8b4563	1	Other	Other
+84f05356-44d7-4771-b876-6384b2dbe5e6	1	Other	Other
+84f07a4c-74fc-4b91-8652-5cfc9e3180de	1	Other	Other
+84f0d58e-0afd-484b-bc08-adf1d41a7b3d	1	Other	Other
+84f0d6bc-71d1-4a8b-890f-71ac2be29646	1	Other	Other
+84f0eaa0-c121-4d8b-a8ef-cb29e9dfa20f	1	Other	Other
+84f1042c-a805-4aa0-9357-99eb3555e44b	1	Other	Other
+84f167de-1a9e-4690-8b03-ba459ccf0815	1	Other	Other
+84f19da1-06e2-49ec-b610-442688126500	1	\N	Other
+84f1b0ef-9b5a-43d6-937a-819eb0719eb5	1	Other	Other
+84f1c48e-860f-4c5d-844e-26b1da534f41	1	Other	Other
+84f1e2c1-fca8-4c94-bb55-ab32f4da47cd	1	Other	Other
+84f219d0-611b-425e-b721-2d0130afd950	1	Other	Other
+84f2a292-1d74-49fe-82aa-93233faee996	1	Other	Other
+84f2b20e-3651-4aa9-8624-ddb2883243f3	1	Other	Other
+84f2d90a-7e6f-4238-99fe-c85d1c9a1a4b	1	Other	Other
+84f31440-6b09-4ae6-8f9a-03d66befe193	1	Other	Other
+84f3236e-eaed-4a35-b794-e932d8816b93	1	Other	Other
+84f34710-3769-4513-80fb-ef991c2d0eba	1	Other	Other
+84f35cbd-edfe-4fca-a677-9dd76f983f95	1	Other	Other
+84f38f54-6191-48bf-a59f-2668b5e547e4	1	Other	Other
+84f396c1-a738-4977-91a3-11535c28ff33	1	Other	Other
+84f399d3-d741-42fa-bfb4-4404e946bc26	1	Other	Other
+84f3fe0b-35dd-4772-88d8-de01c8e16abc	1	Other	Other
+84f41aaf-105b-4f32-b966-0f3c4d8e85b4	1	Other	Other
+84f4335c-69d6-48e0-8e89-d90db1133e72	1	Other	Other
+84f4838c-d2c5-416d-8711-0a224efeea85	1	Other	Other
+84f51803-81f7-49bc-b069-188c12503f89	1	Other	Other
+84f521d6-a4de-403b-87f3-b00c5300c80c	1	Other	Other
+84f57dab-7d63-4d16-9f5b-6039ebe0806d	1	Other	Other
+84f5a5db-a28d-4f2c-958a-5e3f46a41d7f	1	Other	Other
+84f5f305-71bc-414c-b271-6eed8abe2717	1	Other	Other
+84f6246c-0e03-40ce-9a08-6424877fda1a	1	Other	Other
+84f65402-bf49-4207-be73-f135bc494117	1	Other	Other
+84f6544c-50f0-439d-a07a-f1328f226754	1	Other	Other
+84f749ba-c826-42ee-983b-f0393f26a071	1	Other	Other
+84f759f8-7d6d-42d9-8e2a-95ecab9688bb	1	James	Other
+84f78481-191f-48d5-9af6-14fb1d5ac119	1	Other	Other
+84f7869d-e710-4933-bdeb-07647e05442d	1	Other	Other
+84f7b57f-db68-47b0-b319-5e6c63f5b20e	1	Other	Other
+84f7d10f-a863-438c-ada8-58c457a6657c	1	Other	Other
+84f7fa4e-e17f-4362-8f56-1bac914e63bf	1	Other	Other
+84f87cb8-8da9-4ab2-b977-a2992ce8bfcb	1	Other	Other
+84f8a807-3650-4172-bfff-852f4e52adbe	1	Other	Other
+84f909b5-4ca3-4175-98a5-8c40baa8df1e	1	Other	Other
+84f92eae-3b6e-4292-9219-590b3d6e111f	1	Other	Other
+84f94702-5f30-4bd3-b78d-19c39baaa89e	1	Other	Other
+84f97320-d58b-4ae0-95b8-9e04239f6adf	1	Other	Other
+84f98bcd-a035-4e59-93f7-f93c916d2c0c	1	Other	Other
+84fa8954-bb33-43ef-9ace-5586521bcb27	1	Other	Other
+84fabaa1-1e8b-49a7-bcd8-760064d3ddfb	1	\N	Other
+84faeaee-85a8-44bd-8270-bc31f9dbdfc1	1	Other	Other
+84fb4bfe-a655-4add-99b9-5d7c53c03b47	1	Other	Other
+84fbc01c-5623-4774-b55f-2c0b1bcf9a03	1	Other	Other
+84fbd85d-67f9-4eba-80c3-a8a60a9f7e4f	1	Other	Other
+84fbfc91-9abf-447b-bc29-f9282b949245	1	Other	Other
+84fcbdca-57f7-4e95-9790-eaeb75429f70	1	Other	Other
+84fcec4f-dc5f-478a-bf7b-9a39bf06d692	1	Other	Other
+84fcf860-3ea1-4585-a3e4-91ce73325f0b	1	Other	Other
+84fd12a6-4c56-4835-a13c-e7db9d90688e	1	Other	Other
+84fd22b5-6b43-4f39-8775-84e4252fadb7	1	Other	Other
+84fd410f-7042-4dfa-b43e-376ea27a2b5a	1	Other	Other
+84fe262f-4260-45b6-af18-9627f10e3310	1	Other	Other
+84fe4fc8-c2ce-4193-acea-da09e291e07a	1	Other	Other
+84fe7b92-2d58-4f17-9db8-76890c72f546	1	Other	Other
+84fe8f8d-96e3-48a2-878b-8b48746f7e32	1	Other	Other
+84feab00-a7ea-4909-b5e9-aae2ff63a44c	1	Other	Other
+84feb0bd-1e01-40c3-82d2-68f9d88d3dfa	1	Other	Other
+84feec5b-20f2-4e00-9a3c-71a6f0d30979	1	Other	Other
+84ff2692-b644-45bf-8a08-4c85bef313f5	1	Other	Other
+84ff79d0-9687-4974-a36d-65be44006f1d	1	Other	Other
+84ff7b77-c4a4-4e06-9883-5a47447573e8	1	Other	Other
+8500085c-1e14-4a5b-b695-24f3b9946701	1	Other	Other
+850009aa-9715-4e9c-af5d-28c9b0aa55cf	1	Other	Other
+850015d4-1721-49c2-a9a6-702c5ed8200b	1	Other	Other
+85002219-7f63-4db4-969a-61c0bf0acb3a	1	James	Other
+85003ad5-1ab2-4ae2-b6a9-aed6daa3479f	1	Other	Other
+85008268-e9a7-4007-ba61-3ae2403ba656	1	Other	Other
+8500aa55-3733-4d15-b8a4-975a1820a9b3	1	\N	Other
+8500bdfe-4b8f-4e00-8f8a-abb974e27d9a	1	Other	Other
+8500de78-f0a9-4880-bfed-75c6be85c5e7	1	Other	Other
+8500e835-ebfb-4ceb-ae47-f33ee676e69b	1	Other	Other
+85011e95-fef3-45d0-9313-19add674c05e	1	Other	Other
+85015a89-fe9e-4a58-8fa2-f1c9820fe2b6	1	Other	Other
+85016d11-74c1-45da-996d-36331f9f3f45	1	Other	Other
+850188a9-33de-4e5b-8760-d05f7d4340e4	1	Other	Other
+8501db03-f52a-41dd-a04a-5e57f76a12bb	1	Other	Other
+850248a2-ad5b-4582-bef4-7a4ebba386a0	1	Other	Other
+8502b866-284e-4cd2-b63a-b875f56a57b9	1	Other	Other
+8502bc3c-05a6-4501-a3f4-4feec26a8b51	1	Other	Other
+8502c494-9949-4b2d-b260-032dc6797f66	1	Other	Other
+8502ec73-c050-45b5-953b-aa1153d56768	1	Other	Other
+8503a996-3b8b-4bad-92ae-82f10bcf2290	1	Other	Other
+8503d891-e31e-48c1-b48f-47f1be604a5b	1	Other	Other
+8503e0f1-fab7-4069-ad10-f774db6a60b9	1	Other	Other
+8504150b-6de3-402e-9f94-3578dfeadc0f	1	\N	Other
+85043500-1f90-43e0-97e6-20a15d02fe4b	1	Other	Other
+8504465f-4acb-4e3f-b90b-5a952a487b75	1	Other	Other
+8504779d-edc5-4659-a0c5-16d2fdb18a94	1	Other	Other
+85048176-9415-40e8-9e0e-9acfbd3299a5	1	Other	Other
+85049d1a-91fe-4697-9dd2-0311660e3c5d	1	Other	Other
+8504ccaa-389d-4e30-b446-41f2b05139bc	1	Other	Other
+85053bfa-5187-4ff0-a16a-b15b652240bb	1	Other	Other
+85055e90-5f06-40d0-8cd8-7512c55edc58	1	Other	Other
+8505a3cd-bced-4520-b4d3-30c4ac20e003	1	Other	Other
+8505aa0c-328b-48b9-a86e-3dd09e7f7daa	1	Other	Other
+8505dc20-26c0-4560-b131-53e2d703ed6b	1	Other	Other
+8506013b-495f-49c5-af87-bbbcbf1bdfb5	1	\N	Other
+85062795-8e04-4207-ba6b-92ecd46656fa	1	Other	Other
+85063c13-6d2b-4300-bf78-8e2c38ba7c99	1	Other	Other
+8506b73a-b7ec-4bbe-9401-e4d03840ac15	1	\N	Other
+850700fb-f0bf-4ead-b676-5552f935ec14	1	Other	Other
+85075423-1404-4553-86de-88ac2ecfd955	1	Other	Other
+850768c6-537b-4f18-b15d-9c24f43b0a75	1	Other	Other
+8507f0d9-43ee-489e-ab29-7dafb58e640e	1	Other	Other
+85084b48-cfe0-4ca5-ac78-34393ab92351	1	Other	Other
+85087521-849a-4913-9885-75b6cbeac355	1	Other	Other
+85087cea-de69-4e7e-9e25-b3ff51f9e23a	1	Other	Other
+8508b2b8-ef12-4377-8327-9b4b30c08d96	1	Other	Other
+8508dd47-7b01-445c-a1c3-c78cc1e71aa5	1	Other	Other
+8508ec99-ef97-4939-96dd-7fbd5b012083	1	Other	Other
+85090ccf-1b47-4cca-9d4d-ac0d8c833cae	1	Other	Other
+85099694-ce4b-4a72-ab7f-41627962c62b	1	Other	Other
+850a0eee-abe7-4289-9f95-b800563a2864	1	Other	Other
+850a57e4-cbdb-4983-99ac-fb1b4a7886d8	1	Other	Other
+850a71ff-f30d-4e18-950e-7c754ab6b972	1	Other	Other
+850aa481-ef30-46b5-b10a-7f389a8a4763	1	Other	Other
+850aac22-6d81-439d-b365-c42246b90e83	1	Other	Other
+850abe6c-813f-4ef9-8c00-5d2e477e93fb	1	\N	Other
+850ae6c0-8ca8-4276-b668-af436d8e7ace	1	Other	Other
+850af8f5-5ff5-45e2-8d84-d23a34f339b9	1	Other	Other
+850b0a03-17f5-4b9d-b2d0-70b22158ef54	1	Other	Other
+850b2fb4-fbf3-4fee-82d4-e621abb40117	1	Other	Other
+850b371b-9a5a-409f-b221-194c5f15b253	1	Other	Other
+850b3862-c59c-41a0-8e42-18f649b2b5e3	1	Other	Other
+850b3fb5-cf4f-42d6-bb88-a20cfdbd6e7f	1	Other	Other
+850bb2cf-35db-4f8a-ac66-5d809822aed7	1	Other	Other
+850bc639-4277-4bae-b5ee-2338623ed357	1	Other	Other
+850bca2c-9404-416c-8962-b6e42ca366d7	1	Other	Other
+850bf971-1688-45f8-84b8-2bc5dcd11693	1	Other	Other
+850c475a-f678-40b2-8191-347408ee7d6a	1	Other	Other
+850c7587-8d4f-4721-8ab8-06dd8825128d	1	Other	Other
+850c82b5-b247-4d2f-b4d0-b5e863c87761	1	James	Other
+850cade4-e030-433c-bbbd-02bfb49d51d5	1	Other	Other
+850ccc85-edd9-44f5-959b-7c0ebcc7d2c3	1	\N	Other
+850cd401-a9f5-4d3b-b62b-bc878a90e3ce	1	Other	Other
+850d91a1-9581-4f73-888f-4209e13cec63	1	Other	Other
+850e0800-cad4-4006-8bfe-003df4937f1d	1	Other	Other
+850e1460-b8cc-4289-a915-552f7e93a5d3	1	Other	Other
+850e197b-be24-4193-8843-8a42b1a70bac	1	Other	Other
+850e40be-d13b-4aaf-a98a-ad7cf0735307	1	Other	Other
+850e4c66-cb29-4224-9bcd-9c766269e1df	1	Other	Other
+850eb113-912e-4238-b347-a076bc3eaee6	1	Other	Other
+850ed013-ee7a-4f9f-a02d-aff244406a3f	1	Other	Other
+850f070a-436a-422b-b21c-81c68008bef4	1	Other	Other
+850f0ac4-0862-4715-86ae-aae66e937801	1	Other	Other
+850f688f-f3b0-4c57-a1c6-6f31066d4d44	1	Other	Other
+850f7b71-7157-492e-808b-349653a26468	1	James	Other
+850fb455-bd5c-4d3b-8491-f78943a4e8f9	1	Other	Other
+850fb966-ec17-416e-93c7-74732f5167e8	1	Other	Other
+850fc935-4863-4b29-9c53-b0af2418048a	1	Other	Other
+85100917-e1d7-4933-8701-e2812d6c2e16	1	Other	Other
+85100f0a-7b15-487f-a6d5-658530f05618	1	\N	Other
+85103c86-0eba-4b42-bfe2-000bee8c06a0	1	Other	Other
+85104a31-c281-4739-a9f7-29e25010f88f	1	Other	Other
+85107b5b-0507-45f4-93dc-99b955a8e837	1	Other	Other
+851082e5-df2c-4d01-94c1-e4df0001f039	1	Other	Other
+85108cec-8001-4082-a016-12b9e636400f	1	Other	Other
+8510a340-a528-480a-9c02-945e0a3f360b	1	Other	Other
+8510c0ef-7b52-4daf-98c5-99c45d43a496	1	Other	Other
+8510e0f8-23b4-4931-a233-4550d148c376	1	Other	Other
+8511991d-4d3a-4247-bae0-76099198921d	1	Other	Other
+8511a0f0-a934-4d0f-9600-8f79867098f3	1	Other	Other
+8511a3a9-ac48-4fed-832a-835d0bdefd75	1	Other	Other
+85121206-7f08-4223-a398-2f53db9bcfc6	1	James	Other
+851245c6-fadd-42a4-9095-b2c301ffd96b	1	Other	Other
+85126564-c255-4e6e-b17a-a79056e0b014	1	Other	Other
+85126f66-169e-4d6b-86ab-2566550441ad	1	Other	Other
+8512d424-56b0-4a96-b5ad-a31f0b468b74	1	Other	Other
+851336a7-2604-490b-bdd1-0c0d6179fdc9	1	Other	Other
+851374d3-adb2-4885-9811-785ac672fc74	1	Other	Other
+8513ac08-9ca8-4a29-b477-23990eac21de	1	Other	Other
+8513ea33-2403-42c8-9b4d-fc79e9d366de	1	Other	Other
+851407a8-e6e9-471e-8c8d-81bfbcc3ba91	1	Other	Other
+851459ca-25a3-44df-afe5-71a7d9fdda28	1	James	Other
+851469f3-0fde-4abb-bacd-2d0358f80271	1	Other	Other
+85147d28-f340-4f05-86d2-b5963a0c12c0	1	Other	Other
+85148180-9d99-4e0b-8980-d6a345f82d23	1	Other	Other
+85148598-a62c-465f-81bd-2d3c7ffb10d6	1	Other	Other
+8514b52a-a6b0-4912-964c-7e1959fdd957	1	James	Other
+8514d806-818f-42fb-afe3-3f55e69e9e45	1	Other	Other
+8514e4be-369c-4d00-ab2b-2f7be3b1dbf9	1	Other	Other
+851534a6-14d8-4a9d-b0ed-75e97a4ba31e	1	Other	Other
+85155dec-d94f-4fae-81bc-8b182c6f3d44	1	Other	Other
+85158e44-6bc9-42cb-8438-a4b7b5417417	1	Other	Other
+85160589-63d9-4dcb-a9e3-8495027ed7ac	1	Other	Other
+85164ff7-07c0-470f-8219-9f6f806d973f	1	Other	Other
+851679cb-41d3-4e77-8f0d-77066ebfa9bf	1	Other	Other
+85169bb1-b39b-4f84-bac7-1d85aac94c58	1	Other	Other
+85169d45-642d-47cc-974f-8f328371f3fd	1	Other	Other
+8516bdbf-8b16-4e0d-a050-bd220a5dfb76	1	Other	Other
+85172460-0a79-4b7a-80cf-b939cefcb7af	1	Other	Other
+85175bf2-7167-4efa-b082-ab9d384b316f	1	Other	Other
+851780be-6579-45e9-8ef4-49599c993ad0	1	Other	Other
+8517af2f-45bf-4927-8cd0-500bddfe776e	1	Other	Other
+8517c365-ea10-4d58-b6ab-b6d4d00c838b	1	Other	Other
+851836d3-9387-4237-b7ca-a2c6e041ed38	1	Other	Other
+85186df1-d602-4207-8f65-d602f29dd66b	1	Other	Other
+851875ef-c58e-44f1-afa0-ef543bc3c101	1	Other	Other
+851891d8-dada-4e64-a7f8-ba962ee86194	1	Other	Other
+85189b39-6c03-4ddf-a607-00fa4df7f865	1	Other	Other
+8518a209-6e60-4dc2-9202-ce6309461393	1	Other	Other
+8518c987-7581-42e8-a778-bf7453a9dcf9	1	Other	Other
+8518eb3c-b821-4fb2-b69d-31463b4f5f23	1	Other	Other
+851911b6-f8e0-4772-8da7-74a21c5d6045	1	Other	Other
+85196ff0-12ea-4162-be96-6f9d52edf428	1	Other	Other
+8519aa80-89fe-4713-b9c6-d42120938fc0	1	Other	Other
+851a272e-efaa-4b68-934b-fe5751944026	1	Other	Other
+851a31e1-4c96-4abb-953a-3d4b7b28ace0	1	Other	Other
+851a546a-f7f1-4da6-b257-d66b0cacc0ad	1	Other	Other
+851a5b3d-15a8-49a5-833f-62f587773580	1	Other	Other
+851ab66b-bd53-4f10-8704-f4b2a6e2e87e	1	James	Other
+851ad613-3696-4ce8-b99c-63c38c728ceb	1	Other	Other
+851aea03-e6f4-4318-8590-362833565e39	1	Other	Other
+851b2f41-d5d8-43a2-9977-47a42f9ad96e	1	Other	Other
+851b8036-92e7-40ed-a0e5-124055e4304c	1	Other	Other
+851bb012-6031-434a-984c-e36c1e837005	1	Other	Other
+851bb524-cc76-47ca-a57f-cb96b3d4728b	1	Other	Other
+851bc18f-d001-4b91-9a23-c04f1987e889	1	\N	Other
+851bc995-fa3f-4435-aa0b-867d1e5566f3	1	Other	Other
+851c68a5-d9dc-4f76-a0fa-926392fe929d	1	Other	Other
+851c77a0-0974-4bf6-bc44-e44dbd84aac0	1	Other	Other
+851cc615-4228-4790-a916-e4b4ed1a5225	1	Other	Other
+851d7a68-53c8-43ae-aaa3-2aa5e13a3378	1	Other	Other
+851d8bca-23f0-4e21-ae98-89ad1602bf5b	1	Other	Other
+851da38f-4b1c-4445-8d43-abb205b99e6e	1	Other	Other
+851da3a5-5e20-47b0-b040-d4ef73c01a95	1	Other	Other
+851dbc50-5473-4a9d-99e3-8909bef2f235	1	Other	Other
+851dbc9e-c453-4c43-8ada-81ccccc54ba3	1	Other	Other
+851dc3ba-6694-45ae-9a76-c33f750d5dd4	1	Other	Other
+851df3c0-ece7-442a-8b55-1a6cf2724c50	1	Other	Other
+851e2556-08ab-45ad-8067-4ebf61c9d9bb	1	Other	Other
+851e7e08-5b4b-46af-9bd5-7589689b4113	1	Other	Other
+851eb00a-e17c-440b-9e74-13d85485b01b	1	Other	Other
+851eb7e2-7008-4cc4-a768-0aea772f850b	1	Other	Other
+851ec2eb-0100-4bf9-8480-b326566f1ab3	1	Other	Other
+851ed1a1-bde4-436c-953d-2296e01e8fec	1	\N	Other
+851ed786-717d-4eb1-b4da-935d77dc7599	1	Other	Other
+851f048a-a02b-4e3c-b4a2-7c1d70229aa7	1	Other	Other
+851f8b53-ce96-4525-bc1a-acfef4d846dd	1	Other	Other
+851f919e-de4a-45d2-a6a2-59881a76e811	1	Other	Other
+851f92f5-7b7f-45df-adca-df8e000eda31	1	Other	Other
+851fe48b-7ebb-4448-8884-4be7ea202086	1	Other	Other
+851feb8c-f5ee-4548-b680-8ae1f0f4c563	1	Other	Other
+85200920-5419-4802-99c2-33af237bce36	1	Other	Other
+852011ab-f77a-41e6-9a35-c2db81a68666	1	Other	Other
+852075ad-5556-4e9c-8b76-b11794c8ce21	1	Other	Other
+852086ed-1144-4ade-a925-547df7e72e75	1	Other	Other
+8520a4df-848f-4f29-a94f-604a52f9aa49	1	Other	Other
+85210ef2-3851-49dd-a885-21d8d7658a0e	1	Other	Other
+85213be6-941a-4710-9195-307eea666f75	1	Other	Other
+8521e584-ac9c-4f35-a2fc-e1819bfff00e	1	Other	Other
+85221cf2-1d7e-4bc3-9e0d-7170b9154b08	1	Other	Other
+85224f1a-c99c-4bc5-bafd-0ba00a9d68fa	1	Other	Other
+85227a0a-fd64-4d7b-9af3-b3b888b4377b	1	Other	Other
+85227ecd-082b-48fc-911a-ef347234f149	1	Other	Other
+85229d0e-9083-401e-a070-06f9c4686f2f	1	Other	Other
+8522b9a6-f3d8-4bb5-93bb-459bcdb115a7	1	Other	Other
+852348c7-3fae-4a5f-b965-fdc474093dcc	1	Other	Other
+85235779-70c0-412f-a0a2-de34e72beed8	1	Other	Other
+85235981-594d-4210-934e-6f84f55f8f49	1	Other	Other
+8523a162-1b8f-434f-88ee-d187ea13ea62	1	Other	Other
+8523b193-bb6a-4bb7-b7f7-5167c58307d2	1	\N	Other
+8523b6bc-22c9-436c-a746-406f2a1e92cb	1	Other	Other
+8523cf08-66bf-42df-8cc7-b966528ac8b9	1	Other	Other
+8523dd93-9b41-4c90-bde1-e2d06e4e86e7	1	\N	Other
+8523e2a7-ca73-439e-a830-aff550ee3246	1	Other	Other
+852479c1-5edb-453d-9759-62cc854929a7	1	Other	Other
+85250b98-227c-44df-8e9d-76ffe30bb626	1	Other	Other
+8525787b-e94d-4c33-945c-006d543ec976	1	Other	Other
+8525d986-a023-4f90-813a-fdfecf64bb2c	1	Other	Other
+85260c70-fe1b-455a-adaa-5a4b306eaebf	1	Other	Other
+8526314c-f590-49bf-8616-f23409fec05b	1	Other	Other
+852642b8-f282-4afa-955d-8974357c58da	1	Other	Other
+852643da-4b3a-4e6b-8a35-5486ee0dc4f8	1	Other	Other
+8526d54d-2b07-48b3-90dd-c0a5f2ef7d09	1	\N	Other
+85271e71-db98-4eeb-893f-983bb212e2bb	1	Other	Other
+85271e9a-4497-4ca9-a728-7e242849b850	1	Other	Other
+85272b13-2b92-41d1-b016-3dba30b8e4db	1	Other	Other
+85272cea-36d0-458b-a366-7bce612755af	1	Other	Other
+85276ce2-f6e8-4b9b-98b4-74ecdcdb4fb3	1	Other	Other
+8527723f-c5d1-4479-810c-ce00afaf70de	1	Other	Other
+85277b90-9037-4300-80ed-739f20f11f46	1	Other	Other
+8527842d-7a05-47d9-9c12-8bad38f27e9d	1	Other	Other
+85278880-fe80-46f2-9821-6a2c9e33bed0	1	Other	Other
+852790ba-4acf-4565-acde-0c0f3414eb8b	1	Other	Other
+8527d075-ac85-4acb-8bd2-3a3d061f077b	1	Other	Other
+8527e67e-ceff-4fa6-a406-e843c10bf9fa	1	Other	Other
+85284503-fce8-48ec-a365-691379ed555a	1	Other	Other
+85289052-1867-4af5-8be3-f1089fa54886	1	Other	Other
+852937e0-0376-4c4c-9581-8a24c401ce30	1	Other	Other
+85298816-f2d0-447d-8f67-d209d06972e5	1	Other	Other
+8529bb2e-997c-4e73-901e-f6648e105e46	1	Other	Other
+8529bed3-96cc-49cb-832c-af6dfd173c8f	1	Other	Other
+8529f06c-1980-4f54-a538-d5bdff6622dc	1	Other	Other
+8529f84c-00d8-4ace-b17d-354d9477b75a	1	Other	Other
+8529fd2e-4bea-44ea-ade6-7263406dbd8f	1	Other	Other
+852a02f4-0b80-454e-a8d8-bf6d718fb5e9	1	Other	Other
+852a1661-ba59-4c17-8a50-18b2c3452d0e	1	Other	Other
+852a3c13-e223-44a8-8302-5fb40bcdc1c7	1	Other	Other
+852a7ad4-fd7e-4fe8-89b4-3be4d8fe2cee	1	Other	Other
+852a8496-5d19-4dbd-a862-97013f92fe15	1	Other	Other
+852abf2f-853a-4b6d-b403-b8fe9e4f8f2f	1	Other	Other
+852acabe-6dea-4c8b-a42b-bd94ae0c488c	1	Other	Other
+852b4fa1-3c28-4d75-b4a8-22000ba3ae23	1	Other	Other
+852cb93f-df0d-46a0-90ab-66ef86933ca4	1	Other	Other
+852cf9ad-5cf3-4fff-a9c5-5c0cacabec03	1	Other	Other
+852d76f4-b30e-481c-918e-ba7d4433b61d	1	Other	Other
+852d9172-4053-4d1b-986c-559dcb5529d5	1	Other	Other
+852d9cb9-01fe-4f78-bccf-72293fcdba7d	1	Other	Other
+852e088b-91e4-491c-b1b1-ff359231d14b	1	Other	Other
+852e09c4-df83-413d-be8f-eba1b4f811ef	1	Other	Other
+852e2e48-096b-47f4-9b46-3e8cafb0b5d3	1	Other	Other
+852e7656-fee5-4586-8b07-fa1a01607a4a	1	Other	Other
+852ec069-1198-490f-9c50-6eac47920070	1	Other	Other
+852ecdce-c4d1-4e2f-a70f-b07cea6351f8	1	Other	Other
+852ed908-a636-4d19-a737-cc68c426982e	1	Other	Other
+852eda07-e35e-4b37-8cb9-525f57cda4a9	1	Other	Other
+852f4b25-6978-4eaa-8495-79b93a93c8fb	1	Other	Other
+852fae84-ecb5-472f-8b02-3bf2960fa508	1	Other	Other
+852fbb4e-7097-488b-bdf4-f7299c5142c1	1	Other	Other
+852fbc4f-95c0-443d-b214-88e3a135579e	1	Other	Other
+852fda80-6c54-467d-a85b-fba45cb026dd	1	Other	Other
+852fe17c-634b-4312-ae37-285cb365aea8	1	Other	Other
+85302814-13bd-4135-8d8d-93342fbbc1f3	1	Other	Other
+85306519-1b10-4187-83e7-99baf4da9325	1	Other	Other
+853089ed-51f4-4e22-a250-91db5982c669	1	\N	Other
+8530a309-c870-4a61-aab3-93319c780d80	1	Other	Other
+8530ccfa-2027-4033-ba36-c1e6c3f12563	1	Other	Other
+8530da4b-a21a-4785-9525-15d0ddd37a83	1	Other	Other
+8530fd14-e2ef-47d0-8eec-c600dc891775	1	Other	Other
+8531238a-299c-4e02-8196-0fbfe7e79312	1	Other	Other
+8531301f-5ad4-48e0-abaa-75587b2ec383	1	Other	Other
+85313202-4028-4667-baa8-f7d5fad28c15	1	Other	Other
+85314e83-da30-472d-b7ae-318fd394c483	1	Other	Other
+85316826-acf3-451f-89b4-8ba1cb148311	1	Other	Other
+8531c5c5-44a4-4ae6-9117-6423a9593a69	1	Other	Other
+8531c706-54d6-4448-96bd-a7797822e0f4	1	\N	Other
+8531f76e-1de9-400f-9117-d943dfb7a2d4	1	Other	Other
+853258aa-64b9-4e8c-b153-2739c1a3ddc9	1	Other	Other
+85329349-6eee-42d7-a0e5-77739d75656e	1	Other	Other
+8532a674-9e4c-48a5-b114-c4560a7fc786	1	Other	Other
+8532af60-f2af-41ba-8240-e1df97d977c1	1	Other	Other
+8532b578-8933-4852-a17b-635825ebe229	1	Other	Other
+8532b5aa-c603-4b0e-b993-7174765511ab	1	Other	Other
+8532eb6a-d1eb-47cb-bd64-74e1dc279646	1	Other	Other
+8533230e-3c8f-47fc-8b9a-311d96f2669a	1	Other	Other
+853338ee-1dd4-449e-ac5b-25de63174475	1	Other	Other
+853350fd-86f0-417d-898b-57d48dd96fcb	1	Other	Other
+85335622-b2e0-49c9-b9d0-78f88ca25fb5	1	Other	Other
+85335b9b-d3e4-4eb4-87a0-7ab81d8a4b6f	1	Other	Other
+8533a192-bfae-4360-8582-023b78053f54	1	Other	Other
+8533ed35-5ad8-4249-88cf-f8471a3e7eab	1	Other	Other
+85341b08-049d-4268-9779-38102fb463f7	1	\N	Other
+853431ec-c44a-4c25-ad85-31c265e69f29	1	Other	Other
+85343469-e19b-4e48-8e04-6f7de97f2fb6	1	James	Other
+8534bee0-7cb0-466d-85fe-7a62352233ee	1	Other	Other
+8534df59-ba6e-4733-93e4-6d2714194efc	1	Other	Other
+8534e7d9-dbdc-4f63-b6c5-3b2f64d04299	1	Other	Other
+853527b4-4f29-4d1d-a8e3-3310e86a31fd	1	Other	Other
+85357343-a770-4d49-88e9-3f90e10b026a	1	Other	Other
+8535dcdc-93db-4f64-9229-3c3ec4c9ae51	1	Other	Other
+8535e371-35e4-4a5d-a1eb-5d8729a5c90d	1	Other	Other
+85369e80-e1ad-414e-8f79-0966f8e32d7e	1	Other	Other
+8536a38a-c8dd-4288-84e4-7159ce6661a7	1	Other	Other
+8536bafe-92ea-49fd-85d6-51e5314aad02	1	Other	Other
+8536ca31-9ebf-4161-bfd6-27ac157dc2ec	1	Other	Other
+8536df60-d7af-4b3a-933e-ecee5e604df8	1	Other	Other
+8536f4a6-f728-455a-8b85-2b89716605da	1	Other	Other
+8536f5ad-826b-46e6-b141-31edf57e54ec	1	Other	Other
+85370282-fec0-4b7f-85ea-6fee19222dff	1	Other	Other
+853730db-0ac2-49ae-89b6-1a72c10bc347	1	Other	Other
+8537970a-52cc-4958-9335-30ffa179ef09	1	Other	Other
+8537b1d5-acb7-4767-98f8-f6bb38ac4f4a	1	Other	Other
+8537c0ae-de41-412e-839b-3adf97d95a16	1	Other	Other
+85380dc7-d8a1-483f-8fed-ff8428475e9a	1	Other	Other
+853827ff-5ed0-4bba-8cb8-2bdab9754846	1	Other	Other
+85382dd2-b4b2-4d75-a20c-aa2b6afe233a	1	Other	Other
+85383d61-72b7-463f-a85e-37abaced86e7	1	Other	Other
+853844bd-0937-4a90-a191-960e34bdfde8	1	Other	Other
+8538a5fe-bf1b-46c1-bd5d-c88c560177e1	1	Other	Other
+8538b7b4-45a1-471d-b8fa-190b67efbc07	1	Other	Other
+8538b7fd-e5e1-4c38-9b20-5d5c3cbbcd91	1	Other	Other
+85395a35-d75e-460b-81da-5aa0d7acc155	1	Other	Other
+85395cea-fd00-4070-924b-c713d4fef21d	1	Other	Other
+8539bd74-ef35-4ec5-94db-95d6410ef77b	1	Other	Other
+8539be7e-e830-4423-966d-8940ab103a59	1	Other	Other
+8539bf59-cde0-4178-a33c-818d1675d036	1	Other	Other
+853a12b8-ceed-4bfe-99b9-f814e8f89b60	1	Other	Other
+853a403e-342a-41f6-bee9-96c3db8d6567	1	Other	Other
+853a935c-9c0b-48c3-bae7-063e1699ba7c	1	Other	Other
+853ab482-8724-43b2-81d9-175f9527d64f	1	Other	Other
+853b0a39-be68-4b9e-9e21-10a8d3d378f3	1	Other	Other
+853b2c99-ae9f-4223-bb7f-b7974204aee1	1	\N	Other
+853b567d-553f-48fb-a316-203bc16e9e54	1	Other	Other
+853b8350-1705-48ec-b71a-dcf6901f78f4	1	Other	Other
+853b84e6-d744-42b5-b789-539e995b36ba	1	Other	Other
+853bbae2-842c-4dad-af8a-76e984d2112a	1	Other	Other
+853bbe10-ad43-40c8-9ec4-e5fcfaa21dbd	1	\N	Other
+853bf72f-5fe0-4103-9397-4e3bad4ca58b	1	Other	Other
+853c0ad5-e71d-49e3-894a-4ce3ec2ce1a3	1	Other	Other
+853c0d59-c262-407e-a35b-258c935bac69	1	Other	Other
+853c5e6f-4fa2-4645-a78c-a6d6158b3995	1	Other	Other
+853c7dcd-e855-473f-bc9d-56ec17fbd5be	1	Other	Other
+853c8e6f-c728-4c95-9f47-ed90baeaef1e	1	Other	Other
+853cb0d7-d80b-412f-b96e-1bac70d5abb9	1	Other	Other
+853cd8f4-cd40-424d-bfaa-5cb88fbc1128	1	Other	Other
+853cd93b-f5cb-4faa-a1af-c52694d08a0d	1	Other	Other
+853d15f4-4111-477b-85c0-2b318dc07445	1	Other	Other
+853d24e0-0e14-44da-8fec-ec07cddeb16e	1	Other	Other
+853d4278-f525-4443-8808-a60f7b9e44a7	1	Other	Other
+853db0ee-2756-465b-b4f3-a39f58860533	1	Other	Other
+853dc622-e7f5-4871-bac1-e37a6dddf682	1	\N	Other
+853e058b-4ba1-495b-93a5-9c3d64732c30	1	Other	Other
+853e3d9b-7cca-4bee-a48d-9b5c34ca2061	1	Other	Other
+853e3e52-6437-4c32-9fa6-5169461b071a	1	Other	Other
+853e5470-0424-4de9-a402-f011c846701f	1	Other	Other
+853eb6b2-f5ee-4efc-9e59-eeb5b9a540e5	1	Other	Other
+853ecadc-b0cf-4330-b4fc-e72ddef70171	1	Other	Other
+853ee427-f07f-43ba-8afa-c7681a85db60	1	Other	Other
+853ee68b-f892-4558-a09c-ff1d588bd0ab	1	Other	Other
+853f4245-be17-4b38-af48-43397af45788	1	Other	Other
+853f5ff0-5f4d-46ad-aed3-752ad53594db	1	Other	Other
+853f8ebf-4ed4-4b1c-bfd0-cb88a9a2b8a1	1	Other	Other
+853f9796-85fe-4dbc-aaef-9fb5a429345d	1	Other	Other
+853fd395-4f52-43ea-9d04-3ec146e11b67	1	Other	Other
+853fe718-2e11-4bf6-8fff-397eed2a50c1	1	Other	Other
+8540118f-0cf3-48d6-96bc-cc1c5e24ff2b	1	Other	Other
+85404674-f64e-4ccd-b783-d8a735f13862	1	Other	Other
+85408d71-701b-409f-a5e9-9c6495512c75	1	Other	Other
+8540982c-e4c4-4752-bc75-96b2e8c99017	1	Other	Other
+8540bc8c-609f-4e6d-a7a4-ba65857474e5	1	Other	Other
+8540c35c-298d-48e1-b77d-987a6f18a820	1	\N	Other
+8540e199-da4b-4b89-9518-228ed31afb85	1	Other	Other
+8540e42d-d2c0-4510-913e-49a3552e076c	1	\N	Other
+85410d10-9d8b-4790-adcb-f227e1c7fcd6	1	Other	Other
+85416b4c-aac6-4fef-a6ee-c5a07ab78e63	1	Other	Other
+854178ed-3a5b-4c42-b4f4-95d5d730fab9	1	Other	Other
+854179f8-784e-4c0d-a844-5616f55b7d68	1	Other	Other
+85422b66-7dcd-434b-a0a6-b7ecd438cec5	1	Other	Other
+854254b0-d46f-4bcc-89dd-9ccb30991a5b	1	Other	Other
+85426b41-e158-494a-a3a7-978f4c9100e1	1	Other	Other
+8542be5b-d040-4d71-82a1-32ef2003a2ab	1	Other	Other
+8542eb70-b412-4912-89c2-1bdabb1a98c0	1	Other	Other
+85437005-313d-4af2-9203-328af438ce46	1	Other	Other
+85439b51-7980-445c-8a2c-4159180a9b42	1	Other	Other
+8543a331-295f-4f82-b153-3b08caa59cd9	1	Other	Other
+8543a93e-4325-4c75-8656-b4cae74317b1	1	Other	Other
+8543da5f-9df4-4a37-95cd-6b126abc1b91	1	Other	Other
+854408b4-c73d-4509-b3e9-20b86ae7ed20	1	Other	Other
+85440db4-0d28-11e8-b49b-fa163e8624cc	1	\N	Other
+85445019-388e-49fe-891a-33d0374529ce	1	Other	Other
+85448ed3-ef2c-4b40-987b-3e278f574f31	1	Other	Other
+8544a66f-c899-42e9-af60-1e60a591f5e5	1	Other	Other
+8544c8f9-95f8-4613-82e9-67dc949f2e2e	1	Other	Other
+854517aa-b241-4bb8-9b57-a44668ec1ecb	1	Other	Other
+85454e1c-2b81-41df-a1a0-69d3e3b9938f	1	Other	Other
+854574b1-3eb9-4766-96ec-7e4648cd7a9e	1	Other	Other
+85459449-8e5d-43e8-9c7b-9c58fb0e1840	1	Other	Other
+8545b7ea-e558-4a02-8c24-9505120cd9cb	1	Other	Other
+8545d77c-0e2e-48cc-9c0c-92057d45dce8	1	Other	Other
+8545ed54-2b7c-46f5-842d-a1749d660466	1	Other	Other
+8545fff7-785c-44a6-9a98-05b7b54f97f4	1	Other	Other
+85469fc3-11ae-4c2b-a434-baf927af9d12	1	Other	Other
+8546b507-c630-4605-b71a-c599942ae6be	1	Other	Other
+8546e414-c2ab-4d97-a177-a7f855e5358f	1	Other	Other
+85470fee-348d-4abd-b20b-700e09818692	1	Other	Other
+854714b2-e76d-49c1-84f7-628fb15ebb24	1	Other	Other
+85472bef-83ad-4f06-b260-8fff233c8379	1	Other	Other
+854780bb-7c3e-4732-8783-6f1163e10eb9	1	Other	Other
+8547844f-97c8-459d-bc0b-787af83eab5e	1	Other	Other
+8547877b-c172-4368-a8b3-0beb347b1019	1	Other	Other
+854796e6-f725-40d7-807f-75e8be3793ef	1	Other	Other
+8547a8f0-0381-45de-ae39-ad43075cddc1	1	Other	Other
+8547ed67-1aaf-4cc1-bf3a-d747dfe4cb13	1	\N	Other
+8547f73b-6502-4de7-8073-18acd55da9d7	1	Other	Other
+85480e48-9322-4b8e-a6fb-85525d4b8241	1	Other	Other
+85481047-adef-486a-9553-7ac70cfb4506	1	\N	Other
+8548743c-e2b4-4fca-8610-ae1780a3cbf7	1	Other	Other
+8548ab41-0e5a-43f1-9aa7-2e38b5423e22	1	Other	Other
+8548c251-78ab-4e2d-916f-20113e9c8841	1	Other	Other
+8548f9cd-7e66-4049-b141-171aafb09f67	1	Other	Other
+85492037-d6fb-4faf-8423-3afcdf4d996a	1	Other	Other
+85492736-db79-4fce-8a3d-f6810ed95708	1	James	Other
+85492e85-864c-454c-bb05-2350ffb031f1	1	Other	Other
+854950f4-0dba-42cc-9d19-6f25f0ed2883	1	\N	Other
+854953be-08f7-4903-9e0b-e013190372ff	1	Other	Other
+8549796c-91cb-4ce7-9d55-b39c42d77c39	1	Other	Other
+854990b3-9926-41cc-b293-f60f06a4de84	1	Other	Other
+8549c2c7-2c4b-4866-addd-25fe5300c2d8	1	Other	Other
+854a901f-0f9d-4fa7-9d30-a7cac0b9c8f7	1	Other	Other
+854a94ab-4b61-46c1-99d2-0bcaa382c39a	1	Other	Other
+854ab3e2-6731-48f6-a339-cc2ef6c39e70	1	Other	Other
+854ad04e-813e-4c0a-837e-0b0b06177a43	1	Other	Other
+854aeb56-0603-4549-b744-e2697914a4c5	1	Other	Other
+854aeec1-1058-4eed-adc4-16afcdb1b90a	1	Other	Other
+854b048a-b0c7-4b3d-8970-aeee7aa5fbe1	1	Other	Other
+854b3c50-d0e5-4123-957f-ed9ca5cb2067	1	Other	Other
+854b67d2-de9e-41c0-bca1-07c18093335c	1	Other	Other
+854b8c0d-3801-43d0-be71-434fc336a078	1	Other	Other
+854be3e2-a5c9-46a6-992f-c325438e840c	1	Other	Other
+854bfa81-580a-432f-9bef-4c2a700358d8	1	Other	Other
+854c1c00-19e3-4032-9010-b9dc77d6bd51	1	Other	Other
+854c9960-7f4e-47b2-b60e-9cffa5e7beb0	1	Other	Other
+854ccd34-798d-491a-a0d8-1c5ac47b28e6	1	Other	Other
+854cf725-fdd9-4059-af58-8a17c27aac64	1	Other	Other
+854d21ca-dbe3-4980-a017-570678cbe070	1	Other	Other
+854d48ca-7b86-4cc9-b903-cee94f4d6dcd	1	Other	Other
+854d4a5a-a513-4236-8572-13dc520265a8	1	Other	Other
+854d6e6e-c675-4c12-9680-a2631b35f1c3	1	Other	Other
+854da977-f547-4824-89af-cd55a424c40e	1	Other	Other
+854dab5c-59ff-4d67-8e61-dbc85e4dcf72	1	Other	Other
+854dc1ba-7e17-4b96-bec5-a78c98c59344	1	Other	Other
+854e59bc-a544-4056-a069-ac3a9e25a67d	1	Other	Other
+854e779f-e920-4169-b665-a4d856f2bd09	1	Other	Other
+854e970c-d291-491a-bdc8-d9e9d86ea756	1	\N	Other
+854f06e5-5f11-432d-9d07-80834be078da	1	Other	Other
+854f19b5-c453-4189-80f3-861b7bca4264	1	Other	Other
+854f6b74-82b2-443f-8fe2-2c5ebf16c8d8	1	Other	Other
+854f9935-ef0b-46dc-baab-a492da7a1051	1	Other	Other
+854f9bd4-10bc-4109-900a-2c705156d609	1	Other	Other
+854fa3a9-ea32-416c-ba7d-c409ad9a39b6	1	Other	Other
+854fad51-987d-42d1-85dc-e016d8c8dc18	1	Other	Other
+855021f2-cdaf-4955-a424-639d4a814b90	1	Other	Other
+855057d3-a013-4c09-b0f0-738dd8b5093d	1	Other	Other
+855076ca-b117-44dd-b96c-33761a53d1ad	1	Other	Other
+8550b229-ab02-4966-bd02-367112556533	1	Other	Other
+8550c944-5b54-407d-a57a-0607c8bac33e	1	Other	Other
+85514d22-4d55-41fd-95b6-77ca64e0e84e	1	\N	Other
+8551a89c-0f62-4301-9e92-83547e3180d7	1	Other	Other
+8551bdaf-798b-4446-a2fd-0b4a16c88956	1	Other	Other
+8551c7b5-19c6-4810-985b-d161fabca58f	1	Other	Other
+8551e4a8-e530-411c-b9c0-defa82f431f4	1	Other	Other
+8552034a-fb26-44b5-9471-59c1779b57ad	1	Other	Other
+85523bdd-a6d4-463c-a142-34df3b650290	1	Other	Other
+8552986f-3829-4c91-a8ac-441fc366307d	1	Other	Other
+8552bc93-29e9-4903-bf7a-17d3e1253165	1	Other	Other
+8552d2ef-dcd5-4dd9-ade4-da03775b09d0	1	Other	Other
+855313c7-00eb-444b-a11c-44f1630eb684	1	Other	Other
+8553299b-87e4-4f38-8596-7393bc9c747a	1	Other	Other
+85533be9-b85a-4fb6-b015-cd70bb1a3162	1	Other	Other
+8553579b-0a4a-449c-9b46-71771bb5b66d	1	Other	Other
+855361fa-db4c-40b8-b532-c39433623366	1	Other	Other
+85538fb2-4ded-4eaa-871b-3e6ee6fb94df	1	Other	Other
+8553bc55-817d-4fed-8f5f-0c2aac5a1962	1	Other	Other
+8553e49e-1b20-483d-9fda-4d10bf28ead4	1	Other	Other
+8553f4cd-ffb8-445c-8abb-66c5bd0ae889	1	Other	Other
+85542736-1edc-4eea-b58f-866f5f4ebb6d	1	Other	Other
+855444bc-4438-46e7-9733-92bc105d05c0	1	Other	Other
+85548e52-bcea-45be-bdf8-7740f5d06f8d	1	Other	Other
+8554a64e-55d2-4f6b-8474-5b03147fd012	1	Other	Other
+8555759d-4def-49da-87d3-ca9eb3899556	1	Other	Other
+85557fa1-8f53-4520-b1fa-1a7e56f90e42	1	Other	Other
+85559e12-3857-444f-a79a-de3975d314e3	1	Other	Other
+8555c57e-4984-4ea2-8072-3f5b99afcb63	1	Other	Other
+8555e4e3-bce0-4058-ab76-81331488bc18	1	Other	Other
+85565ce7-e53b-4a2d-b7fa-eafd701c5b81	1	Other	Other
+85565d91-9278-4b6a-b3f3-5c71c56a082b	1	Other	Other
+8556683f-ebb6-4d37-8c03-ef8e277c714e	1	Other	Other
+8556af25-5402-42a6-a723-e35344209703	1	Other	Other
+8556b9c8-ffd9-4656-befc-5582556481de	1	Other	Other
+8556deff-ffb6-4ae4-aaf9-6722b48a2c3a	1	Other	Other
+8557242d-3dbd-4b8b-8956-8166fde4c77a	1	Other	Other
+85572d79-6473-4fbe-b53a-ac6361f4b38a	1	Other	Other
+855745fa-b975-4306-9fbc-2b4e66592ad8	1	Other	Other
+8557bcee-43f2-4abc-ae33-6a985a29377a	1	Other	Other
+8557e918-9336-4be2-82b6-d49920c26aa1	1	Other	Other
+855802a2-8050-4b5f-95ad-53cc46d02ea9	1	Other	Other
+8558295e-cc59-4c22-98e8-57cd1045cd52	1	Other	Other
+85587225-32bc-4ec4-a341-11018f78a001	1	\N	Other
+85593684-64f8-4367-8a2e-ff01f9f7818e	1	\N	Other
+8559445d-c1f9-4159-81c7-afe44e18eb8b	1	Other	Other
+8559ab0c-b277-480a-8587-eabcca2301f8	1	Other	Other
+8559e268-27d2-4c1e-9fce-b319eb1f4c42	1	Other	Other
+855a1f65-3e2b-4e05-a58f-0c14158d569a	1	Other	Other
+855b4707-38d4-4009-841c-9eb93d4bd9a2	1	Other	Other
+855b5ec5-62da-4bb3-905b-6739792ab257	1	Other	Other
+855bb7fb-c442-48ea-8c68-4cfbeb9dd824	1	Other	Other
+855bea88-3024-4abb-971a-f2c1ba8fb11c	1	Other	Other
+855cac48-c628-401d-a6e4-db965b374e51	1	Other	Other
+855cf633-eb81-4100-8c0b-9b233262676d	1	Other	Other
+855d00d9-dc04-4ae1-bfea-9e0ef6626753	1	Other	Other
+855dede0-234c-46c4-a286-88e4b0dc7605	1	Other	Other
+855e1f29-b897-4118-a5c3-3232d0f5f714	1	Other	Other
+855e2366-b381-4ad4-b995-28af330bbfd2	1	Other	Other
+855e3980-0ca8-4ccc-aaff-0befe334615f	1	\N	Other
+855e3a84-1405-439b-8d45-370eba59de78	1	Other	Other
+855e5964-587e-4496-b8f4-f7deb803941b	1	Other	Other
+855e907c-5f9e-41b7-bba4-065ff2d1e58d	1	\N	Other
+855ea34a-a1b2-4999-a639-13dc7fbf1c22	1	Other	Other
+855ed132-1b82-419e-b853-b81c8143cc16	1	Other	Other
+855ef2f3-530b-4ac4-bdf7-69c2b4bea918	1	Other	Other
+855f78ae-e1b7-4119-b293-98fa044bbc76	1	Other	Other
+855f9b57-c927-4d86-9b8b-9c1ffe52f22f	1	Other	Other
+855fa64f-a7d3-4d6b-9445-7e00271d6ef3	1	Other	Other
+855fcd3f-2950-42b1-bb94-add512d26686	1	Other	Other
+855fd6b6-e7e3-443f-aca1-c08431845290	1	Other	Other
+855fdd9f-2f8f-44b2-8693-9cc8e173aae6	1	Other	Other
+8560c64a-d01a-4f51-84cf-20ebfa33224c	1	Other	Other
+8560d26f-10a6-4ec0-a72b-bcc03ab21967	1	Other	Other
+8560d61e-e9af-4538-b62c-13c8f89dd237	1	Other	Other
+8560f1d3-ee97-4a85-be8d-ccd5cee5cf84	1	Other	Other
+8560ff2c-e256-40d0-9713-c40d58f98acd	1	Other	Other
+85613a2d-3cda-49f1-ba58-09c34f7ffef9	1	Other	Other
+8561895d-e053-433b-a217-b1df14822ee6	1	Other	Other
+8561f65e-7177-472e-9776-ad3aae18f0dd	1	Other	Other
+85624045-4023-4fb7-bb41-fc7d80ec5191	1	Other	Other
+85626187-7f22-4b6d-82cc-186c749636f8	1	Other	Other
+856272fd-a5d3-4a96-8aa2-1479c2fb5456	1	Other	Other
+8562b60f-117c-4773-a42f-a3b2ff997984	1	Other	Other
+8562d597-3263-41eb-8762-091df34e42b1	1	Other	Other
+8562df83-1c68-473f-a8a3-865ba65c3815	1	Other	Other
+8562fa2c-7541-4579-93ac-0bc9e881ef36	1	Other	Other
+85630b7c-1504-4443-88aa-185c3e22db1e	1	Other	Other
+85634c85-4192-4b75-a2e7-2e8dcb43f32b	1	Other	Other
+85638fd3-e921-49db-9599-f05f81f2434c	1	Other	Other
+8563c45a-0f06-4289-9254-72a8f08d1a5c	1	Other	Other
+856428c4-4612-478e-a66f-9030e4b0ebb6	1	Other	Other
+85643f05-be48-4f15-a07a-fcae67e13c2b	1	Other	Other
+8564c80c-91d2-4f98-b985-9e2c24288386	1	Other	Other
+8564ca0d-e0c2-4bc9-8255-c6dce56e61a1	1	Other	Other
+8564e038-35a0-417a-a820-7b65d858bcfd	1	Other	Other
+8564e140-0683-4c45-b7b5-11b1cfced289	1	\N	Other
+85652493-9ae1-4334-a40d-31e914a72ebb	1	Other	Other
+85657a21-ca15-4ed8-8ca6-227fdc83aba0	1	Other	Other
+8565b4c4-a738-4748-9d90-dbff04f33d66	1	Other	Other
+8565c9ff-2012-4f2a-89d9-034559e017fc	1	Other	Other
+8565d8bf-4061-444b-91bd-ae31463702dc	1	Other	Other
+85664d06-25e5-4c36-a55b-4fc26fcaf633	1	Other	Other
+8566b15a-2a61-43a7-965d-a841c3f823e6	1	Other	Other
+8566eb7f-cccc-490b-9a96-0b983a7c6436	1	Other	Other
+85685c4d-0e65-41bc-965b-543a765364a8	1	Other	Other
+85689dce-d44f-4929-8220-53a528d865bf	1	Other	Other
+8568f394-b666-40f9-9709-f7ef07c06b72	1	Other	Other
+85697b87-f526-4c58-b64c-90a6dad9b9a8	1	Other	Other
+85698a8c-5371-47df-8010-e2a23eafbf4c	1	Other	Other
+8569aea1-6e94-4388-a5a4-cc4be2abd7bb	1	Other	Other
+8569b0d0-cf5d-40b4-ad41-9de5a84d8a75	1	James	Other
+8569d3ba-a499-451d-ba1c-fc77743d5a21	1	Other	Other
+8569ed55-6c53-4c1a-be75-fdcc19a62bde	1	Other	Other
+856a4208-8273-432e-9aca-712f257be14a	1	Other	Other
+856a8b1b-3927-4a63-aea1-14ce4a026640	1	Other	Other
+856ab0e2-1e14-4bb3-a9e8-4804fa54e316	1	Other	Other
+856aead8-d8e4-4768-aa7f-7ae8ba9df153	1	Other	Other
+856b0651-c09c-40f7-b860-b983e0332447	1	Other	Other
+856b5e74-adc5-4dc8-9ced-74bdcb168678	1	Other	Other
+856c2b91-133f-41b1-81fb-b5ee5b4bc4ee	1	Other	Other
+856c33d9-639f-49c4-864c-bb9b4016d7b9	1	Other	Other
+856cb1f9-07f4-499c-b0ff-396ff7f75f09	1	Other	Other
+856cd60f-ac90-4247-b353-dbeb3f991d97	1	Other	Other
+856d17d3-d3d8-4f80-9bc0-24975093f8a2	1	\N	Other
+856d1aa7-3aa4-4d5c-a66c-2ad6f035489b	1	Other	Other
+856d24b2-fc3f-4ce8-9f4a-a54be62949ed	1	Other	Other
+856d7d9f-1630-4309-9bd1-83f35aff05e3	1	Other	Other
+856d9f9d-2aae-4019-aeda-f9afeb9d0aa8	1	Other	Other
+856db41b-6010-4773-bc0b-27190404df5f	1	Other	Other
+856e133f-cab3-4d0f-8573-ca3a3748f46d	1	Other	Other
+856e1468-7bdf-4d13-be51-09d8fac2f835	1	Other	Other
+856e2d02-89fa-4a44-bb76-84b97cc72bc2	1	Other	Other
+856e4920-2a50-4b9d-bffa-4cfc4cd6df41	1	Other	Other
+856e4edc-67b5-4084-91e4-f8db62406dc4	1	James	Other
+856e8820-1f56-42ba-a3ed-f207adee6fae	1	Other	Other
+856e9488-af23-42d6-b5e8-f8b48853addb	1	Other	Other
+856e9b80-8b36-44af-b98a-d1e2e7b1ca82	1	Other	Other
+856eb6ae-c769-4b42-867b-d6283c4aa149	1	Other	Other
+856edd04-b0df-4e75-8999-a2b4d704f6ea	1	Other	Other
+856ff49e-9e87-403c-b935-abd4841a3174	1	Other	Other
+85705ba4-dba1-4983-a58c-9678a3e5f411	1	Other	Other
+857071c5-2cb8-4d0f-9f11-98f0a8d977d7	1	Other	Other
+8570f5c8-6b29-4afd-8bb3-b8484aaf949f	1	Other	Other
+85711201-d503-40f9-b68a-6cc431f04d1a	1	Other	Other
+857183d7-c494-4bca-8add-ac6a2c93f61c	1	Other	Other
+8572335d-4a96-4454-9908-8c06261559a1	1	Other	Other
+8572642c-81c5-4527-a145-910fed995ed2	1	Other	Other
+85726872-7919-48aa-b595-09728dd2a927	1	\N	Other
+8572933f-104b-445e-9f7c-b408acd5cd6f	1	Other	Other
+8572bed5-934b-426e-88cc-bbdc89852f1f	1	Other	Other
+85731b6d-5201-4468-8be8-7e2d86187460	1	Other	Other
+857326be-e7b9-4ddb-b9c5-f0f78accc232	1	Other	Other
+85733780-c8ae-4a85-a4c2-21cc46767d4c	1	Other	Other
+85736828-4fe0-46b6-8974-dc3664a7f5b3	1	Other	Other
+85739e91-7593-42a3-a2b6-5ac8aa600703	1	Other	Other
+8573afc8-0261-49da-9570-dd11e6b57612	1	Other	Other
+8573f721-4079-49be-a07c-97d9135dc861	1	Other	Other
+857447a5-0584-4746-9cfb-00df4ffa45d7	1	Other	Other
+85746adf-4fda-4bdf-923b-c2b9c0ae1c78	1	Other	Other
+8574d740-60fd-4133-a7c6-3e10ecda7ad6	1	Other	Other
+85752867-1331-4a6b-a6ea-dee6df4f1b23	1	Other	Other
+85753506-dc40-4fce-8700-364acf92aaf9	1	Other	Other
+85754c5c-d004-4949-ad45-ff4c31661d25	1	Other	Other
+8575664f-7174-4fdc-96a9-c496451656cd	1	Other	Other
+857575c9-d9d8-496f-b76e-0932595fc802	1	Other	Other
+85759161-6d67-4f6a-b9fd-a793337b6238	1	\N	Other
+85759c84-9d5c-466e-970e-fb23ac426890	1	Other	Other
+8575a761-53e5-4208-9bb3-d07c33c1cd88	1	\N	Other
+857624b4-e1e8-411d-a81d-b9ed30b9ac2d	1	Other	Other
+8576255e-ad5b-4c2e-a195-d284465b56b5	1	\N	Other
+85764f0f-fbee-400b-afe0-5319e6d7aa96	1	\N	Other
+85768276-a573-4eb2-a5c0-5a6d9c3229e7	1	Other	Other
+85769875-cd89-4142-8bc0-dc50b17ed461	1	Other	Other
+85773a35-14f3-41bd-9c9a-5fb804d7a759	1	Other	Other
+857745dd-f8a4-4f92-b3f6-49ed6d3b3658	1	Other	Other
+85774a54-3ce0-4013-a93b-983953db68a2	1	Other	Other
+857781ae-e79e-4ed4-be8e-ce244acdde2d	1	Other	Other
+8577c4dd-7310-42f3-ba7f-6b75fff2cd51	1	Other	Other
+857804e8-aaf3-4362-b0e6-9a1c522028ca	1	Other	Other
+8578a748-2961-4be1-837f-86ac86543ce3	1	Other	Other
+8578d689-b1fd-4b19-b79d-522a22726c4b	1	Other	Other
+8578f50b-7d64-4254-858c-2834aca1e9f9	1	Other	Other
+8578fafe-8d61-4b63-9b3a-edde384f5343	1	Other	Other
+85790501-75fb-46f5-a3fa-da62b9818f90	1	Other	Other
+857930d5-206d-4c1b-af14-bdc28796aa10	1	James	Other
+85795dba-bcb7-498c-8788-c1da5e649bd1	1	Other	Other
+8579f7fb-8f99-426d-8705-ea1d26f188e2	1	Other	Other
+857a62e1-44d3-4888-b9f3-c6acd38a4940	1	Other	Other
+857a8569-4478-4b56-af0e-9c26dccecae5	1	Other	Other
+857a86a7-9f84-49ba-ac0b-09a29b216def	1	Other	Other
+857afb5f-be41-40c0-b1e1-b00b28d96927	1	Other	Other
+857b3ca8-12ac-4843-94cb-cda75f630782	1	Other	Other
+857b7a11-8182-4914-afed-104983de7961	1	Other	Other
+857c0d9a-1062-49c1-9f93-cae93a6e8c7f	1	Other	Other
+857c1cc9-2d4d-4325-8540-341803fecca1	1	James	Other
+857c20f3-90e2-4cb9-b324-0b07afeb1ac3	1	Other	Other
+857c6e31-5704-469a-8ea5-2e72763929f7	1	Other	Other
+857ca774-22c8-4d9b-b705-ed0a4f16b9ec	1	Other	Other
+857cb8a8-6124-4466-9790-c6900b388ada	1	Other	Other
+857cc936-292c-459b-8929-5d51716b6d50	1	Other	Other
+857d2f44-8d37-452c-87a3-7dc66f0629dd	1	Other	Other
+857d6b04-248b-4080-84ff-b94bcae4b7a0	1	\N	Other
+857d7656-f7ff-44d5-93ad-d167f866f7dc	1	Other	Other
+857e2668-ea30-4c5e-bf81-2b3afb9f1167	1	Other	Other
+857e3fb6-4211-4d02-bbed-1f2b9555ecff	1	Other	Other
+857eb8e3-6a93-4716-b60c-4cda3b8ba23c	1	Other	Other
+857f133a-5b0c-422f-986d-53d8005b325a	1	Other	Other
+857f28e7-cf6f-4b97-ac51-44e558589076	1	Other	Other
+857f5d89-d11e-4404-8193-4fe96ceebeee	1	Other	Other
+857f6645-fec4-47c9-89f1-64c180f5b925	1	Other	Other
+857f967b-8ee0-48f8-baac-e351de325bc5	1	\N	Other
+857faa27-d131-4ba6-8eef-150f37f4f084	1	Other	Other
+857fb65d-6444-4796-80b3-1167951fe824	1	Other	Other
+857fcddd-9a81-4256-bec0-9c8f55de6e09	1	Other	Other
+857fdaef-55b0-4af3-b762-62a75f4e9308	1	Other	Other
+857fff99-152f-4140-b912-c7d6d105022a	1	Other	Other
+858017e7-7d51-4471-a418-1ce196763588	1	Other	Other
+85803ccd-c59b-4dff-9d69-905724d6ecb7	1	Other	Other
+85806bdb-e40a-41a6-9f24-4dd7ffab1524	1	Other	Other
+8580914c-a16b-40e8-8a2e-b902a782f9a8	1	Other	Other
+85810032-fd7f-4ba7-9659-ee627b483737	1	Other	Other
+8581581b-0f42-4d73-8abc-2afc248e8bee	1	Other	Other
+85815cc6-d314-4677-a673-59dbe44a1901	1	Other	Other
+858181a7-7a35-4f6d-b823-e83f8575fba3	1	Other	Other
+8581a937-0498-4555-848f-a4c79d27bcae	1	Other	Other
+8581bc6f-0063-4547-a730-de5a1d15a025	1	Other	Other
+85820798-e9c5-42e8-9e8a-98bf434ed0dc	1	\N	Other
+85823d2c-e711-44e7-bf9a-4d9cace1e824	1	Other	Other
+85827991-449c-490e-832f-c124d02abfbf	1	\N	Other
+85828457-ba55-422f-b10a-027608e93019	1	Other	Other
+858286af-a127-41c3-8439-846b11e0c274	1	Other	Other
+8582dea2-fdc5-41ed-90d9-defc70d716bc	1	Other	Other
+8582e044-4ac1-46e1-865a-476477a8345c	1	Other	Other
+8582e69b-7abb-4bf6-afe7-cd6ef1990b33	1	Other	Other
+8582fd77-53bb-4f3b-8efe-92f2c6e911dc	1	Other	Other
+8583687f-5f1f-44df-ac5c-9cdccb8431c1	1	Other	Other
+85837264-5479-4b41-a0bf-561856058fb7	1	Other	Other
+8584698c-f60d-476b-aaa1-a8ba72e50008	1	Other	Other
+8584b0ba-6be0-404c-aa5a-a5f97b2b1d01	1	Other	Other
+8584dc5c-a6db-4a39-ae52-ba75ed166cd6	1	Other	Other
+8584f0fc-d837-4a7a-aa85-4db8f0b83b20	1	Other	Other
+858502a2-634b-434d-a93f-614b98ba2b35	1	Other	Other
+85851451-141c-4cbb-aa18-7e92fdaaa0e9	1	Other	Other
+85851dbd-a284-4fae-8aa3-1a0c1a930369	1	James	Other
+85852486-c177-4553-953e-3981e5c0060d	1	Other	Other
+85856c29-24f2-49e3-afd5-d51cd5fb99a0	1	Other	Other
+85857362-18d4-405e-b1ac-fa78b725ef45	1	Other	Other
+858586c8-9055-4209-b614-32d558355196	1	Other	Other
+858598d5-dc5d-4b3f-a09b-bc2aebb5ce3a	1	Other	Other
+8585b591-b357-4e9f-8f63-b3face101034	1	Other	Other
+8585f64e-8f7f-4fc2-9dce-5d9046cf00cc	1	Other	Other
+8585f968-a06a-4337-8331-01c890097b4d	1	Other	Other
+8585fdf7-f937-43ca-9542-ddae6fc0b58a	1	Other	Other
+858602f1-4ed5-4d19-b877-d8e0f9f9db8e	1	Other	Other
+858617c1-c21b-4e92-9567-c00c8094e808	1	Other	Other
+858623c2-314d-4b48-8a41-a4f84dd1595a	1	Other	Other
+85865ba8-b69d-4d2f-bc31-b1ff66405b55	1	Other	Other
+85866004-2911-46d3-af25-c349f0c9949b	1	Other	Other
+85866623-86a0-4b4f-b946-2d642ed78d5d	1	Other	Other
+85866c06-a0c9-4536-808b-34170550496c	1	Other	Other
+85867dbf-2444-41b2-9d22-eb9ac39a18a8	1	Other	Other
+8586a49f-fce8-494e-8f26-67804cd4923a	1	Other	Other
+8586b986-98ac-43e5-a933-4b3a46eae578	1	Other	Other
+8586bb3f-74ff-4474-9742-1ea5afcb24ae	1	Other	Other
+858770cd-a2ea-4831-ba62-41f71e4e7b66	1	\N	Other
+85878e92-5e30-4201-a78a-c1cc34e62dfb	1	Other	Other
+8587b04f-2f21-4608-95e7-d4256791ce19	1	Other	Other
+8587cdb4-f936-4454-856c-f83f5890d7e2	1	Other	Other
+8588578b-68e3-480b-bb0a-4d183a9f31aa	1	Other	Other
+85885a06-e2b2-442a-a0e5-5ef7ea787c1e	1	Other	Other
+8588c625-c831-4fd8-8dd7-972d0c589727	1	Other	Other
+85893233-c03e-4477-a2ee-5ce2a39b2300	1	Other	Other
+858994f4-a2ab-42d3-ab76-6979e9523389	1	Other	Other
+8589a886-ada0-4729-b924-05d438bc1487	1	Other	Other
+8589ba04-3a2b-4c7f-869e-95358d32c396	1	Other	Other
+8589d3e9-910c-4f5c-b535-b76462ed1d5e	1	Other	Other
+858a4c54-a544-49f8-bc63-b0686f39ad9e	1	Other	Other
+858a51b7-b666-439b-8b34-878605106352	1	Other	Other
+858a87e8-8eb1-4c64-9df0-b9fbc1d7b3b3	1	Other	Other
+858a8a5a-98d6-47d7-adc0-5df1e9d9b96e	1	Other	Other
+858aa010-ce76-4baf-8d8a-24aded5cb007	1	Other	Other
+858af1a6-6470-4fa9-bca4-adf7ef54175d	1	Other	Other
+858b705e-4b35-4f73-9a38-4c85d973249a	1	Other	Other
+858bb388-3e00-4896-a7b9-cf943aa33a23	1	Other	Other
+858bc5c6-0324-4957-9591-96ba9d5944a6	1	Other	Other
+858c1114-ff71-4f33-82b8-774aca71543b	1	Other	Other
+858c223a-c9a6-487f-8c14-377edc845799	1	Other	Other
+858c3bdb-fe04-4807-9e78-2ca23fb8a7a8	1	Other	Other
+858c3e78-c24d-4fa4-b094-7098b929754d	1	Other	Other
+858c6e78-2f9c-4b1e-a2f7-7ac1bb86a4e8	1	Other	Other
+858c94fb-c988-4f56-ac72-8564d38fcff4	1	Other	Other
+858cdecc-6d3b-48ea-91de-8e0c13813507	1	Other	Other
+858d2cf4-76f7-4d3d-8a75-ad79043c5b34	1	Other	Other
+858d5682-2e48-483d-bd02-8ac8dd495588	1	Other	Other
+858d79a9-2e9c-4c65-b190-dba4e97a24b5	1	Other	Other
+858d9e53-6f37-45cf-94c6-b7f3b93e5747	1	Other	Other
+858e77ea-da80-4850-b1fe-59d9e2c5b9af	1	Other	Other
+858e7c57-eff9-4e82-b303-2a8fb45bb687	1	Other	Other
+858e9dfb-5505-4141-b05c-378b3b9f5300	1	Other	Other
+858ea3e0-b919-4b59-a0db-85d9fe04e868	1	Other	Other
+858ef0ca-e246-4678-ab4b-c9df748f9015	1	Other	Other
+858f4937-f0f3-4e3d-b9d9-4ef93bf2f26e	1	Other	Other
+858f7726-55f8-470c-837b-1aabb9658112	1	\N	Other
+858f9ba4-6edb-4260-b906-df997b678eca	1	Other	Other
+85901ff1-5087-4a35-9f4d-a766cd98de58	1	Other	Other
+85902768-08fc-45cf-b673-6eeaddc66290	1	Other	Other
+8590db48-1b9a-4b3c-9759-500060c09618	1	Other	Other
+8590dd66-02b1-41e3-935d-56d6b8e9f659	1	Other	Other
+8590ffc9-4fc6-468e-9f51-e34aea877590	1	Other	Other
+8591110c-5770-48bd-9ff5-1088545d2431	1	Other	Other
+85916686-3bdf-4851-91b6-7eb81f0f0575	1	Other	Other
+8591b153-97e4-4a13-a0f0-6044b48be95d	1	Other	Other
+8591b233-5014-4931-b1a5-06b5193a2421	1	Other	Other
+8591c578-c97e-4425-b766-180eb6b49529	1	Other	Other
+859249dc-55d9-4b37-b5f7-1d65925065dd	1	Other	Other
+85925652-acc1-4907-8256-00f4895a595b	1	Other	Other
+8592b5d9-be63-4f38-abcc-d366c66d6531	1	Other	Other
+8592f636-7995-49ba-878a-97c22061e3c4	1	Other	Other
+85932f64-8fd2-458d-8887-69ea3f980950	1	Other	Other
+85933bb8-b231-4422-9921-4f488ebc6675	1	Other	Other
+8593499e-61be-405f-ae26-feaf86c5b240	1	Other	Other
+85938076-d70e-4659-a736-c0cc9b77f3de	1	Other	Other
+85938fff-8dd2-4b79-863d-3dad6f33ff45	1	Other	Other
+8593b6cf-0f01-45c8-bf2c-179483dd0365	1	Other	Other
+8593dba2-bcb0-4800-9e16-e3574e5cdb67	1	Other	Other
+85940e63-e178-4d29-893c-e534e1c38663	1	Other	Other
+8594125b-eebc-447f-8259-953bc7ddbe2d	1	Other	Other
+85945195-475d-4b46-be00-c564bd9cab82	1	Other	Other
+8594c0b7-853b-4b7e-88eb-69dd2bfef6ff	1	Other	Other
+8594c43c-c215-4c71-a5e7-6c8fe2aaa355	1	Other	Other
+85958189-6026-4162-b2ed-d3e7c17b2131	1	Other	Other
+85958a59-2ae9-4953-85bd-b80878cc6f88	1	Other	Other
+85959f2e-9fc0-4bdb-8bb5-7a410698ed7e	1	Other	Other
+8595c9eb-251d-4137-8a4e-d95214f3e49c	1	Other	Other
+8595dd33-ca3e-41eb-8905-460156cc6735	1	Other	Other
+8595eafd-90df-48bf-a871-bc94e2e97731	1	Other	Other
+85967d90-8db2-4c3e-9e95-08d049ba4d31	1	James	Other
+8596915b-cc86-4f6b-87c2-d64c30165f3c	1	Other	Other
+85969368-8a50-4f00-bf1b-fb365d6f9ec5	1	Other	Other
+8596a1d5-a6fe-4b94-a939-5e9eebeb26bd	1	Other	Other
+8596e0a4-5b31-430d-8d31-6022b2ca6d14	1	Other	Other
+8596f1e6-8c8a-4d18-9f5a-d1853bd476e9	1	Other	Other
+85973a85-f234-4c8f-b37f-8b7530054e73	1	Other	Other
+8597d13b-d654-4e91-8220-bf7541a441f5	1	Other	Other
+8597d155-8394-486a-a790-75b33d27166d	1	Other	Other
+85980782-2614-456e-895f-04beb48932be	1	\N	Other
+8598465f-b487-45e5-aeb8-2c0fe4f554aa	1	Other	Other
+8598cd3d-5b3d-4fc3-9807-94cc4a95f231	1	Other	Other
+85990cb9-57d2-4304-8e4f-2c9e221b67aa	1	Other	Other
+85990ea1-0e59-498c-ad74-4c551dbfaacb	1	Other	Other
+8599401f-fbcb-4851-9ca4-43bfc57ce1ae	1	Other	Other
+859942b1-c863-480a-943e-fed6fef5c192	1	Other	Other
+8599beff-a756-477f-9638-a813f5434885	1	Other	Other
+859a0451-f4c8-4673-a9d3-40de4396899b	1	Other	Other
+859a4c5e-d737-45d6-bbba-1fa62ffef495	1	Other	Other
+859a5409-5231-452c-be87-a50cda99ede6	1	Other	Other
+859aa0d9-62fd-446c-94e0-5bfcfe62e60b	1	Other	Other
+859b3192-b6d0-4291-8ab3-ee336d6f7f76	1	Other	Other
+859bef90-19f7-43a9-9df8-19bd1c4a76f5	1	Other	Other
+859c0345-6e89-4338-8375-02e40b3dd16a	1	Other	Other
+859c079e-dfd0-4c97-9727-3786c74ca2c5	1	Other	Other
+859c1c15-15a9-4392-83ec-0571b6770639	1	Other	Other
+859c6844-f9f3-4758-b9bb-22dbd649c95f	1	Other	Other
+859c73f8-6e86-4665-a1ce-02a922da2e10	1	Other	Other
+859c770f-5b04-48d1-be32-dfc4d39dac0c	1	Other	Other
+859c8131-7473-472e-aa88-62fe55f243f4	1	Other	Other
+859cf06e-458f-4941-8af2-ac14163db3b7	1	Other	Other
+859d06f5-ffa8-4212-ba51-070ffaaab946	1	\N	Other
+859d07be-9d33-4dbc-b9a5-bd9a840b9915	1	Other	Other
+859d0baf-b4fc-43f6-9cdf-3722d3bcd3d4	1	Other	Other
+859d1eef-701b-4ebb-a40d-ed106fc9ebc9	1	Other	Other
+859d47eb-70af-497d-a650-4054edcc9378	1	Other	Other
+859d5800-c4b7-44ec-8787-b66e04dd3aa0	1	Other	Other
+859d60f1-2003-4c93-808a-5b1f8de7201a	1	Other	Other
+859d9082-e54a-42d7-9539-56df85a452c9	1	Other	Other
+859da5e2-2940-4307-ac38-eaa49e036915	1	Other	Other
+859dbe78-1760-4109-843d-a41543970742	1	Other	Other
+859dcaef-85a7-4e15-8535-882cb232358e	1	Other	Other
+859e0260-1e48-4414-8e68-ba3c0470d052	1	Other	Other
+859e05e3-c1df-42c4-9968-44a64aeaed25	1	Other	Other
+859e107a-6e85-43b5-b5be-9101473a84c6	1	Other	Other
+859e257d-1028-4d8e-91f9-aa57dac48d62	1	Other	Other
+859e6197-4346-4e42-980a-56c82d8ae107	1	Other	Other
+859efe78-3c12-4bcf-ab55-17f6351a7cdb	1	James	Other
+859f5859-95fc-47bf-b1a4-27d5d70741a2	1	Other	Other
+859f5c9d-0c99-4e33-9844-cf9981e0b4b7	1	Other	Other
+859f7b61-9ec2-4eb8-8bd1-ce3b648cf11e	1	Other	Other
+859fa61f-dec5-4410-8e08-d381ce514847	1	Other	Other
+85a074b4-dc51-4b05-9bd8-aafefb1175a4	1	Other	Other
+85a07f4a-8aa4-46fa-90a8-7d2f28526246	1	Other	Other
+85a08872-ad43-40e2-9ad8-ced4206bdc63	1	Other	Other
+85a0cb32-c186-441c-b498-9b9341c20a01	1	Other	Other
+85a0e1a0-48b2-4c04-a0cc-938d1f5db689	1	Other	Other
+85a0fc60-1a5c-4189-9d65-6ffb149d53b0	1	Other	Other
+85a113ca-c3e8-4261-b5b9-7b56ed87fecc	1	Other	Other
+85a17dc0-74c3-48a7-9649-f2c03e73b4a8	1	Other	Other
+85a1e2a8-60e6-4ecc-bd8b-36291517ed25	1	Other	Other
+85a1f32c-d016-4a5e-9ec6-176ea41ae50f	1	Other	Other
+85a22c1b-cb49-4d29-9f9f-ad84d860c4f7	1	Other	Other
+85a263f2-3ae4-440b-939a-39a3dc6458a9	1	Other	Other
+85a28422-27bf-4a1b-a5b7-ffd4362aaed0	1	\N	Other
+85a29d0a-9a02-452d-9eef-e34390ceb6dc	1	Other	Other
+85a2ba6b-12ff-467f-a7eb-4b45f9ddf14a	1	Other	Other
+85a30d03-5023-43e4-b5fd-2a334310ef32	1	Other	Other
+85a32084-67ec-4380-8cc4-6f018204632b	1	Other	Other
+85a33483-578b-4015-b233-e8141190ab39	1	\N	Other
+85a358c6-e8a2-4030-8c49-a0a52886ecdd	1	Other	Other
+85a38f82-7e0a-4749-b7f3-ddf0de477062	1	Other	Other
+85a3c4e2-33d6-46f2-bb4d-838f852697a7	1	Other	Other
+85a3fa11-70ac-4080-ac61-34de7d0184d1	1	\N	Other
+85a408b1-5d27-45f5-bf27-6c0bed0a6755	1	Other	Other
+85a413a3-038f-435f-9d86-c10fd755f865	1	Other	Other
+85a41a8d-9544-4ed7-b177-1ba38a5db832	1	Other	Other
+85a44ac0-2ec3-4d39-ae24-7dbe7f7544bf	1	Other	Other
+85a46715-2985-4dfe-b457-d849e9ba19a1	1	James	Other
+85a46965-97da-490e-9b58-281481401e6c	1	Other	Other
+85a48186-5fb0-46da-a17a-e885651a3ec5	1	Other	Other
+85a4cc37-6263-4c35-b0a3-ecf152d3e04a	1	Other	Other
+85a4d575-a819-422c-8534-f4a16815a82a	1	Other	Other
+85a4dd67-f0dc-425b-a29c-7736108dd606	1	Other	Other
+85a4e8b8-4fdc-4901-bb89-c9901ef73843	1	Other	Other
+85a51e56-c3a2-4e39-87e9-35fa6dbe19d0	1	Other	Other
+85a53209-a0a7-4a34-b08c-21fe52f981ab	1	Other	Other
+85a549f6-b2df-4aac-ba99-7eb2c0f4d8ab	1	Other	Other
+85a574a3-a25a-4e14-8548-579eb45ee345	1	\N	Other
+85a57d6b-a6a2-4d28-84f3-98fdac8ecfce	1	Other	Other
+85a58118-b9b2-402e-929e-371a65012d7a	1	Other	Other
+85a59522-e4fd-4b2a-b1c9-905f16b56488	1	Other	Other
+85a66dda-1f2e-41fd-8dc1-a7f6e82558a3	1	Other	Other
+85a69852-c2c9-4f2c-8d7c-0baf321f6a5b	1	Other	Other
+85a7040b-fa83-4c7d-8ada-97c9f9050420	1	Other	Other
+85a74a9a-edea-4cae-be1f-815f97e95d6c	1	Other	Other
+85a7780f-bb74-4ec6-9f5d-03858d2d8f4f	1	Other	Other
+85a785e0-2325-4854-a1c5-181839df42c5	1	Other	Other
+85a7b07e-7cae-403a-b206-f0c2e3ed81f7	1	Other	Other
+85a7b51b-261c-404e-8b43-a8231762c01b	1	Other	Other
+85a7d881-d1f3-4535-a9b0-663a63a97d79	1	Other	Other
+85a834e9-39c4-4642-8b1b-47ab50762905	1	Other	Other
+85a86ba8-9e73-4865-b31f-beb063d8a74f	1	Other	Other
+85a8b4d1-d9b5-4d5e-8cbe-703208a55b05	1	Other	Other
+85a8d86c-0eed-444d-8118-6c16f3281f0d	1	Other	Other
+85a8fc33-f9db-4611-a1c8-24f4e2463158	1	Other	Other
+85a904b1-d4a3-4197-8a86-2c100325c62c	1	Other	Other
+85a9321d-f0a4-49f3-9270-be4b92da681c	1	Other	Other
+85a94d35-1bc3-4136-a51a-2aca43178272	1	Other	Other
+85a9bb16-627a-4490-b057-9f4a88fa854a	1	Other	Other
+85a9c183-4891-4425-8e86-19c60e4171da	1	Other	Other
+85a9ef64-fb32-44d2-bf48-c3cefcf282cd	1	Other	Other
+85a9f5f7-ea5c-4424-b260-9b63a791862b	1	Other	Other
+85aa2978-b62b-4c04-94c9-01ecbc63f7ba	1	Other	Other
+85aa2f65-2835-4f72-92fd-73c9c82200c1	1	Other	Other
+85aa3657-28bc-439d-b329-80ec7889822a	1	Other	Other
+85aa5463-5fbc-4fb1-a3e2-e7393454a94e	1	Other	Other
+85aa5ee7-718a-45a9-b903-26b507760c33	1	Other	Other
+85aa6a1e-87f9-4835-a7fe-b4de4ac3c9bf	1	Other	Other
+85aa6eec-5859-443e-aca5-9c158b8c0b18	1	Other	Other
+85aa9845-6ff7-4bc4-b884-a21baa1c05e5	1	Other	Other
+85aad09b-65ed-4559-8c77-41b7a7f48f20	1	Other	Other
+85ab3671-2a23-451d-8f35-550ac7052581	1	Other	Other
+85abd3b1-fd59-4d92-bafe-20fdc4e89494	1	Other	Other
+85abd7ba-68e4-4630-9524-dd3019819878	1	Other	Other
+85abdae9-631e-4c4f-a2d0-3606d909acb8	1	Other	Other
+85abec1d-9ceb-4e13-bba4-28d7e1d4aee9	1	Other	Other
+85abf733-1492-4c2d-8ce6-7f642f778a6e	1	Other	Other
+85ac1564-bcd8-4bb1-abcb-09b449af8d9b	1	Other	Other
+85ac2b7b-98c6-4f88-b6e2-60e6807c0a9e	1	Other	Other
+85ac786f-0d65-4bbb-ba4f-1a1259ffb456	1	Other	Other
+85acc2bb-8c7f-4f69-8c0b-28f2307693a8	1	Other	Other
+85ad11e9-2624-4303-8a1e-810c36bf6cfb	1	\N	Other
+85ad215d-dae1-4ff9-8842-58581845d21d	1	Other	Other
+85ad34ac-06a1-46b8-ad52-e6877168bd17	1	Other	Other
+85ad44ad-2a01-4200-ba72-bad2e85f82ca	1	Other	Other
+85ad7cb5-4f7d-42ee-9406-c7f7b3011d1c	1	Other	Other
+85adf128-14a3-4bfe-bbcd-8fd9fdb96dba	1	Other	Other
+85adfbb6-4524-402e-a2a6-a67b9190ba11	1	Other	Other
+85ae5886-4def-4f13-987e-4be8d11ffd60	1	Other	Other
+85ae5cf5-5a7d-4ba9-926d-63b10ca2bd7b	1	Other	Other
+85ae664b-07a6-429a-85ed-c9c824b6897d	1	Other	Other
+85ae90a5-dd2d-4bcc-8641-aca384e7416b	1	Other	Other
+85af598d-2758-4e42-aa5c-0c15c66d8c63	1	Other	Other
+85af5af6-ea60-4a47-8483-c6988558610a	1	Other	Other
+85afa322-17f5-4391-aec4-850d62dc52b4	1	Other	Other
+85afc83c-5fe1-4b44-b4f4-ee27166dbb21	1	Other	Other
+85afce0e-c6f2-4044-9678-67e607e1b636	1	Other	Other
+85aff900-8953-4cd8-8b0a-8e721886a1fd	1	Other	Other
+85b055ad-76b6-4039-aaef-fc3eb38d777a	1	Other	Other
+85b05d51-c8e8-416e-b8b6-2230aab49840	1	Other	Other
+85b0e8a3-5f6f-49ed-9c10-af92f9a2f802	1	Other	Other
+85b0fac7-66d1-40ea-a199-6c15f3ec4dbf	1	Other	Other
+85b0fc95-0929-4530-810c-b91dce7db434	1	Other	Other
+85b1343e-f900-45fe-9ee3-a36a95a1e5c2	1	Other	Other
+85b16309-69b3-43e1-a32a-618f2521b87c	1	Other	Other
+85b18b71-e971-4ba0-95ff-01a9959d2dd1	1	Other	Other
+85b1d74c-45ee-4cda-8a2e-2414efb3f2f4	1	Other	Other
+85b1e064-27fe-44db-bd2f-16842307a530	1	Other	Other
+85b287e8-564e-4b27-aac3-fa59cfb38b93	1	Other	Other
+85b29c6d-0aa7-4a69-a46e-bf41e003c0d1	1	Other	Other
+85b2d363-b6fe-4d18-9714-de741c62d765	1	Other	Other
+85b2e61a-f0a9-4e26-9dd7-8c99ca09899c	1	Other	Other
+85b321a8-7af7-4be7-9e82-d4eece3fcbbe	1	Other	Other
+85b3414e-23f2-4047-8803-74dcb403343a	1	Other	Other
+85b3489a-3bb6-43d9-87c2-be4ca9e16c06	1	Other	Other
+85b37690-a585-413d-b496-79e4b89adbf7	1	Other	Other
+85b3d852-70db-4135-9d66-9eea1c468de7	1	Other	Other
+85b3e7a0-46c2-496c-8940-7cdcbe4fef26	1	Other	Other
+85b3fe38-6ed9-4503-9de8-da3d95ec9252	1	Other	Other
+85b400c9-d56f-4650-8f73-d7ffd82f7168	1	Other	Other
+85b4096f-d7ba-4298-bad0-10ee41408b48	1	Other	Other
+85b40ced-99b0-4f01-b171-addaf7c9587e	1	Other	Other
+85b43ef0-87af-4087-ad94-b932a6ea902b	1	Other	Other
+85b49e8d-d986-4116-ad75-15bf6485bf80	1	Other	Other
+85b5755a-cd6a-409f-b3cb-b62b4e48cc81	1	Other	Other
+85b5de9a-10db-41ab-8e8d-84161c03f112	1	Other	Other
+85b5e420-c931-42b6-addc-54f8bdcfd651	1	Other	Other
+85b66419-9a03-4187-bb0a-ea92845232ed	1	Other	Other
+85b68383-d931-4416-b5b9-c1f65ebef76f	1	Other	Other
+85b69588-060b-4543-8354-75c5523b7457	1	Other	Other
+85b6c57e-3965-430d-bd11-f1f06f26cfac	1	Other	Other
+85b6e882-5474-4a4e-885a-2408b5b0e395	1	Other	Other
+85b70b43-ae4c-4d03-9043-e271d1c19415	1	Other	Other
+85b73764-50d1-4930-b125-8b00071312a2	1	Other	Other
+85b7a593-0e89-4a02-bddc-123a789e7fd1	1	\N	Other
+85b7c318-4240-4095-a913-7f3526f93ee5	1	Other	Other
+85b7f13b-b0e4-4a3a-889d-1a4814c1314a	1	Other	Other
+85b8552f-d293-4454-86bd-b15b75760b42	1	Other	Other
+85b87d59-2f03-4c93-b5ec-cd45469d0915	1	Other	Other
+85b887fb-3ec6-4480-aa03-e8adca787c99	1	Other	Other
+85b888fc-3ae9-44d1-9cf2-58e9e00be38e	1	Other	Other
+85b894df-5f14-4d99-9ce4-b80e2a3fd3e6	1	Other	Other
+85b8ae19-c2cb-4856-b36a-7634e39fc9aa	1	Other	Other
+85b8bb9c-73f1-40a6-bfa6-02fed508dfa0	1	Other	Other
+85b8ce12-2f66-4cfd-8aeb-68a8519b0e2c	1	Other	Other
+85b8e054-4e62-40db-8250-75ffc00b2603	1	Other	Other
+85b9447b-4872-4a67-9c17-c4e8be2812dc	1	Other	Other
+85b948a3-cdb6-47a7-b11d-244f86cdfb33	1	Other	Other
+85b956b2-b1eb-4640-a424-4815e0f8a474	1	Other	Other
+85b96f21-c3bf-4ec5-9a03-c05969bc0115	1	\N	Other
+85b976d3-0a1b-4efe-b241-65045e54cc87	1	\N	Other
+85b9a78d-05d9-4b57-ae1c-bc923d1256c0	1	Other	Other
+85b9b1ad-2f08-418e-9526-f52e236a431e	1	Other	Other
+85b9fea7-0c3d-4f89-9900-a32e38b7a590	1	Other	Other
+85ba3736-15bf-48da-8ae7-7908085502fb	1	Other	Other
+85ba3b36-0798-46a5-94fa-cc94cf6f1d1e	1	Other	Other
+85ba474a-fd7d-4ab5-973b-a69c8554aafe	1	Other	Other
+85ba8a89-18da-4128-b6b2-4ff4d2b2fd02	1	Other	Other
+85bae3d9-ea33-4cae-bcae-5942a81c6877	1	Other	Other
+85bbc624-8302-49fc-bc16-4699fbaa4ed8	1	Other	Other
+85bca29c-87f1-465d-86c4-b5ed23f6d160	1	Other	Other
+85bcdcea-52b5-4600-b2a1-6f7df4b2e7bc	1	Other	Other
+85bcf0b0-f573-45ab-93c3-b5efce07e13f	1	Other	Other
+85bcf4be-8241-43f0-a244-77048949a747	1	Other	Other
+85bdab87-e3a2-45db-99f1-bf75b2eab63e	1	Other	Other
+85bdaf60-de39-4a68-aab3-935b8532c1f5	1	Other	Other
+85bdbd50-a57f-4a4f-95ca-6c47af3aca8b	1	Other	Other
+85bdec9b-cc98-4d62-8b17-c88db9fc30e5	1	Other	Other
+85be2480-3497-495b-bfab-c53c11becb50	1	Other	Other
+85be7642-ca6f-4b6b-a354-63def58c0c77	1	Other	Other
+85bed41b-8b70-4685-b1e8-b3378098fa65	1	James	Other
+85beeebf-b02e-4c83-ba7e-05471264d9cb	1	Other	Other
+85bf1ca5-6408-4c31-9fac-7c2d5fd9a937	1	Other	Other
+85bf3124-fbec-443b-89f1-8e4b6b63d9e8	1	Other	Other
+85bf37aa-468a-49b5-9e0e-db3550f0a90b	1	Other	Other
+85bf717e-4a06-466d-89d5-033372feb448	1	Other	Other
+85c09660-487c-4e76-a84a-c0e14c7eb980	1	Other	Other
+85c0b3c9-418e-418e-8ffc-f85f113dd112	1	Other	Other
+85c0fea8-9df0-4211-8f0c-911f031f439e	1	Other	Other
+85c133c2-6489-4bdb-b173-25a31a40b3a1	1	Other	Other
+85c15975-8c17-4a11-8ab3-ca03867e8e7a	1	Other	Other
+85c16f13-6a71-4d24-9b5a-5dca13ed81df	1	\N	Other
+85c21efd-7f37-475c-8d38-05f3e7d24d83	1	\N	Other
+85c2249a-9807-4310-b068-6e6116a51d5e	1	Other	Other
+85c22d32-a9fb-45e5-a8a4-fc9dfb3d1718	1	Other	Other
+85c2510d-55fe-4df0-9cf3-224259f42aa2	1	Other	Other
+85c3010d-c97e-4452-b31c-b4997baea67c	1	Other	Other
+85c31189-c0f0-40c8-a17d-49272adc111f	1	Other	Other
+85c33ee0-3bd1-4e58-a996-6741b3cff7a4	1	Other	Other
+85c39deb-9cfc-4b57-87c5-ed7b95ccfccd	1	Other	Other
+85c3f24b-5994-4113-b9fc-c462bfb7b836	1	Other	Other
+85c427f9-c5f7-4b05-8598-a2bc02070e37	1	Other	Other
+85c4935c-78c2-4596-979f-8b3c83c5a813	1	Other	Other
+85c496ef-eca2-4448-88d0-b5bc28eb5fd2	1	Other	Other
+85c4a3a4-a2c5-47b0-9af5-d2b089fe281e	1	Other	Other
+85c50fd9-f2f2-436c-bdc9-177f92e6c1aa	1	Other	Other
+85c53a88-ff7f-41ab-9a7f-2aacb5517dc4	1	Other	Other
+85c5666b-f457-4bab-8874-70d89f81cc31	1	Other	Other
+85c584cb-9996-4fee-a144-ee70acc1519a	1	Other	Other
+85c60781-55b2-4d49-a5dd-dc9b623a3cd8	1	Other	Other
+85c6137b-d4f1-4f47-882f-e43d05b60162	1	Other	Other
+85c63794-8d6e-4533-99f3-227afade7f39	1	James	Other
+85c64449-ff25-46a5-b736-e229642b9b15	1	Other	Other
+85c6b059-7b0c-4b48-9f84-a7049ed3bf60	1	Other	Other
+85c6c091-777d-4d66-9a84-d920ced5e9e2	1	Other	Other
+85c785d9-a4d8-4317-bda8-43994c925f6b	1	Other	Other
+85c7ba66-a6d0-406c-9e08-f3c76ca0c292	1	Other	Other
+85c7d4b2-49fa-41a8-96d3-e1874179a42b	1	Other	Other
+85c7ed68-d462-46a0-836d-8ea4d6a2e4ca	1	Other	Other
+85c83df9-5b39-4314-93ea-9d44bf96a6ba	1	Other	Other
+85c85895-629b-451b-bb78-24a525418f64	1	Other	Other
+85c89176-b497-42cb-ac55-a12a55a01629	1	Other	Other
+85c8ba48-a62a-42e7-a271-0d5f3ce59b43	1	Other	Other
+85c8c6fa-9994-452e-9de9-3ba42d24fb3b	1	Other	Other
+85c93253-7db2-424f-8b1b-5f5cc1fef9ea	1	Other	Other
+85c93bb0-a068-40ea-af57-621592aaffb6	1	Other	Other
+85c97379-381f-4680-9b62-c817187e96f7	1	Other	Other
+85c97a8c-397a-4754-875e-5b842e27d233	1	Other	Other
+85c99945-e6a4-4450-8047-6cd31eb8dacd	1	Other	Other
+85c9efc5-8cf6-40bf-afc5-e35bbf1bc5a0	1	Other	Other
+85ca172e-4dd8-4e5a-9092-fa24d510bc46	1	Other	Other
+85ca9bc4-5d3e-4c04-9633-289c24634c3d	1	Other	Other
+85caadc2-0b64-4ae0-8fe6-2d3a0b1b923b	1	Other	Other
+85cabe49-9df8-4535-81ae-2453252b39db	1	Other	Other
+85cb0af0-f90d-47bb-a3a8-1f536d9b5482	1	Other	Other
+85cb208a-d98f-4152-8c2a-c0ab195d6de3	1	Other	Other
+85cb6898-9bbf-4360-940c-398da4a9533e	1	Other	Other
+85cb98d1-2eaf-43d0-bf80-775358468894	1	\N	Other
+85cc4c7b-2f14-40c8-8d2d-ec832a971779	1	Other	Other
+85cc63cf-ca07-477a-9e5a-01de10067929	1	Other	Other
+85cc7da8-3fc8-4fdf-86ca-8dfcbd7e0b62	1	Other	Other
+85cc8289-6df1-4602-9a59-ea30558a93a7	1	Other	Other
+85ccac3c-03fc-404a-b41c-7390febc4773	1	Other	Other
+85ccc9e4-ee33-4842-9bb8-285034b66eff	1	Other	Other
+85ccff54-7543-4d1f-b0d6-436fe249b535	1	Other	Other
+85cd08f4-aaf8-41b7-83cf-da584092b5fd	1	Other	Other
+85cd5021-d8cc-4d0b-bb65-a05de6958912	1	Other	Other
+85cd8f93-f9cb-47e3-919b-e57b43b8521f	1	Other	Other
+85cd9d44-18bb-4f47-a1ee-1044c0bf7b80	1	Other	Other
+85cde839-ae3e-4e6c-ac80-abc5cabdcc8e	1	\N	Other
+85cdedc6-ba41-4397-82dd-52c009eab78b	1	Other	Other
+85ce1bdd-43f5-47a8-803a-8e6d168e6a56	1	Other	Other
+85ce4b10-d8fc-4b14-80e6-5024b437651a	1	Other	Other
+85ce728e-d286-421f-ac06-fe171cd084fe	1	Other	Other
+85cecce7-77a2-438f-9d0e-a92d46f8b19b	1	Other	Other
+85ced106-0150-4129-90a8-ca4d109a4e6e	1	Other	Other
+85ceef35-5424-4801-930e-4d0bc0cb2171	1	Other	Other
+85cf0595-e063-4d3f-8d03-736ce2a46171	1	Other	Other
+85cf355e-64c8-4b22-8e9f-196b60724d90	1	Other	Other
+85cf4462-a043-47c8-8803-434b72865e25	1	Other	Other
+85cf7305-199b-4773-8e4c-555e6f97fd08	1	Other	Other
+85cf94b4-0451-480e-ae0e-f8d3a1f71031	1	Other	Other
+85cfac48-1b48-44f7-8c3b-7f0e93cc70ff	1	\N	Other
+85cfb366-1d82-4352-9b83-c52b831cfe57	1	Other	Other
+85cfecfa-0060-4bf8-bea4-79ac1249b15b	1	Other	Other
+85cfed02-6f6a-44cb-b800-be596e1c41dc	1	Other	Other
+85d00367-13ce-4714-9474-bb2c60960765	1	Other	Other
+85d00c08-c256-4a40-b374-9b29455fcde8	1	Other	Other
+85d01edf-06c7-4fd8-8e54-0c2cfa352b05	1	Other	Other
+85d03e46-757f-4e53-9d3f-330ab3c4d4d8	1	Other	Other
+85d06550-a198-4fbc-899d-e0391f28a0f1	1	\N	Other
+85d083a9-18cf-4159-ae73-a9e26ded4a1d	1	\N	Other
+85d0e858-5151-4f02-932b-6ecbe685541c	1	Other	Other
+85d10b7a-a341-42d1-92ab-076aff8804fc	1	Other	Other
+85d13603-6be9-4e2c-bec4-eea422a50787	1	Other	Other
+85d15004-0a69-40ff-8270-60fd9ddeb9ff	1	Other	Other
+85d17bbf-5f50-4364-8799-a11bd69b2035	1	Other	Other
+85d19333-3169-458f-ab3b-084287a5d846	1	Other	Other
+85d19492-f6a7-43f7-bdc8-15b5b09886ca	1	Other	Other
+85d1bc17-34a3-4a89-a3ea-5299646d5ae2	1	Other	Other
+85d1f8cf-ac32-4b41-aa95-a3249d00b0f1	1	Other	Other
+85d205bb-d20c-41d2-8032-439b4dc27b24	1	Other	Other
+85d27f30-8761-4801-aa04-7442c33d9e9b	1	Other	Other
+85d2ad85-e355-40e0-bd79-6210d7eff9b2	1	Other	Other
+85d2f60c-dd8f-4359-b8e0-58f0daeb3dba	1	Other	Other
+85d325b8-6a74-4ee6-b519-75dd721ea0bb	1	Other	Other
+85d3469c-d8e5-45c5-901b-140a8f5884e0	1	Other	Other
+85d35771-1758-403b-aff4-e2658cf877c1	1	Other	Other
+85d372bd-aed6-4196-92fd-84eaf75c58e8	1	Other	Other
+85d37dc1-a9fa-44b5-9b0a-e624ea6e83f0	1	Other	Other
+85d4627c-dc1d-457a-ac49-36787936067f	1	Other	Other
+85d4f10d-d5d7-44a0-bb06-55b928dd4192	1	\N	Other
+85d4fded-23af-457c-a911-13829105347d	1	Other	Other
+85d50225-3fb4-47c0-89b9-7524b2ffb8d6	1	Other	Other
+85d56ebe-0129-41c9-94cd-8a73a5e134e0	1	Other	Other
+85d589b4-a1de-4db8-aa85-a382b777818f	1	Other	Other
+85d589e6-0670-4229-b334-bbb31c14d0cf	1	Other	Other
+85d601df-fd20-48b4-bac4-c72be45f568d	1	Other	Other
+85d62635-7748-4e23-b3ad-828f1b51c80e	1	Other	Other
+85d68689-e887-4be8-b89f-566540a9bc38	1	Other	Other
+85d73e3b-0577-4ead-8b32-bb408bd11bff	1	Other	Other
+85d740ea-0721-4c60-ac0e-e8eb8d82ac10	1	Other	Other
+85d783a2-d9b9-404f-b9ba-ad8086cdadb4	1	Other	Other
+85d7934f-f337-4013-ab62-977165e7110b	1	Other	Other
+85d7a7d9-0d37-4d88-baa8-a087ddfcfbbb	1	Other	Other
+85d7bbcc-a047-4b35-b688-339ec38c2e21	1	Other	Other
+85d7ee65-f41e-4af1-8961-cf0ab0d33148	1	Other	Other
+85d871b1-1089-41c4-82a3-6b15876d034b	1	Other	Other
+85d89ea7-0302-4b87-b250-aff6503077e2	1	Other	Other
+85d8b553-58de-44bd-83c5-9b13fbf9bd52	1	Other	Other
+85d92b3e-6dd6-40c6-b536-d5dd449dc612	1	Other	Other
+85d93d88-aedd-42d9-ba8d-e3ce1a4bea0c	1	Other	Other
+85d98afe-b0e8-4445-bafd-5e3d300209fc	1	Other	Other
+85d9aa85-d267-4e31-88e2-ed614e5438ed	1	Other	Other
+85d9e276-4b9b-48ee-b673-e64dddbe4e3e	1	Other	Other
+85d9ea34-c551-4ec4-8e2b-7517f5f08baa	1	Other	Other
+85d9f944-2ca0-425a-a916-e8d8fca3e8e0	1	Other	Other
+85da2fa2-7bb9-42b1-bd9a-a1dca959336b	1	Other	Other
+85da5dec-20b0-457a-9daa-4379eb2c5664	1	Other	Other
+85da71f1-030c-45db-8096-7a11081ed170	1	Other	Other
+85da9b48-d2be-46b6-8c17-90b90b69f876	1	Other	Other
+85dab078-e96b-4848-b0ea-5c18e7c57a8a	1	Other	Other
+85dadd1d-1f98-4875-a5b1-4e11273e8d9b	1	Other	Other
+85dba7e7-25af-4c9d-bab0-01ce837ac036	1	Other	Other
+85dbd45b-6fba-44e0-a795-d12c5b6860ca	1	Other	Other
+85dc3f47-e4c3-4902-ba41-2cf52a3d1fae	1	Other	Other
+85dc753a-2b95-40bf-b8c5-c10b449f5c6c	1	Other	Other
+85dc86ea-b15f-4b4e-b08f-03cb50b350b7	1	Other	Other
+85dd622a-d552-4e66-bcc7-9e2ce86d237d	1	Other	Other
+85dd7a3f-6d4e-4188-937c-36265f63f489	1	Other	Other
+85dda31d-fb04-42f7-bb0e-2fb0558df0c8	1	Other	Other
+85ddf6fc-9e8f-4155-9dab-e239b06f48a0	1	Other	Other
+85de0ca9-881d-44aa-80e4-d12d419866de	1	Other	Other
+85de1c16-9272-4953-b4b5-7c5ed37f1930	1	Other	Other
+85de4b49-6365-44c2-9aba-e79997dab7fc	1	Other	Other
+85dea3bd-2e5f-4817-8e47-adade25ae8c3	1	Other	Other
+85deed6b-d523-4cbd-aaa7-c39147af6c1e	1	Other	Other
+85df0bfd-7656-456c-a13a-d05e6b222601	1	Other	Other
+85df1df1-2f2f-4cd9-a97a-8c29af3ffede	1	Other	Other
+85df3b28-4b95-46a0-9e48-ab9abd2952f2	1	Other	Other
+85df73c7-21fc-418a-bc90-12c42c0822aa	1	Other	Other
+85dfc7ce-b706-4199-b713-0ac0772a55f7	1	Other	Other
+85dfff6f-d3da-42dc-9f40-3857704bd83f	1	Other	Other
+85e024ff-9288-4e78-9162-e71f62fd4073	1	Other	Other
+85e056f2-a8cf-4039-994f-c9773a83d4ed	1	Other	Other
+85e0870f-80ff-4fea-83e7-e96307801058	1	Other	Other
+85e09936-38a0-4a26-a114-7c4926df627b	1	Other	Other
+85e0da7c-73e6-44b4-b2af-22d6f34cb521	1	Other	Other
+85e0ede2-c77b-4cf6-a456-c989e084c1f9	1	Other	Other
+85e0f86b-a9e0-4c11-936a-0402f3c27a1a	1	Other	Other
+85e14054-165f-4bc7-b391-a3a37e1425c8	1	Other	Other
+85e14654-c870-4ef3-8c71-a251ba19a7b1	1	Other	Other
+85e156e3-30cc-4452-b472-bb08ca8acbc9	1	James	Other
+85e1c7ac-4c76-4a06-b896-0d8c64206b04	1	Other	Other
+85e1d152-c538-4bb9-a98a-56f8fce96129	1	Other	Other
+85e20f76-ccf6-4310-8b88-5697e12f2a36	1	Other	Other
+85e23e44-b854-45bb-be29-330a864c2f75	1	Other	Other
+85e265b3-3962-4f9a-9cad-12747e39dd2f	1	\N	Other
+85e27b97-582d-416d-8a22-d9146024e334	1	Other	Other
+85e2bf7f-f63a-40ac-806e-893de46dfeef	1	Other	Other
+85e2cefa-a7c3-4b8f-b00d-1b23ba3842ee	1	Other	Other
+85e2cfb8-a3fc-4b1c-ae3c-62bd6b38e2e8	1	\N	Other
+85e2dd89-60c2-4a05-9287-7aac1ccb6e5e	1	Other	Other
+85e31447-b925-464b-bb98-f02d29992cf1	1	Other	Other
+85e34a1e-d912-4a93-a88b-ef02dffac344	1	Other	Other
+85e356c0-da03-4c07-a48a-660eec9dc3a6	1	Other	Other
+85e3d0dc-3b8c-4826-83ed-f4b2c165e7ef	1	Other	Other
+85e401f0-0445-45e7-bf8d-1243189aaa31	1	Other	Other
+85e45421-5707-46dc-9b2f-d24680562f41	1	Other	Other
+85e47922-168f-4562-837d-df07868e5231	1	Other	Other
+85e4cfff-be4c-48de-9148-22871bb79efe	1	Other	Other
+85e4eead-d0c9-4e5a-8260-7b2951a33a9b	1	Other	Other
+85e4fb52-0216-4a94-ac1e-1dc94cd22c9d	1	Other	Other
+85e4fd0a-0e7d-452b-87f7-511b79fef903	1	Other	Other
+85e50755-ef95-4d78-b973-68b1f0361f32	1	Other	Other
+85e510f6-c959-4020-bcd0-6495f469c413	1	Other	Other
+85e51c5c-ce7c-4ac8-980f-c12e4df2821d	1	Other	Other
+85e54ce7-dc08-4904-8e84-126dec35d5d6	1	Other	Other
+85e551ce-cfbf-43b4-ac3e-031058659822	1	Other	Other
+85e57717-d756-4143-b627-77325a4e4eda	1	Other	Other
+85e5b850-ac2c-4993-887c-93de8a1460fb	1	Other	Other
+85e5d662-ae50-44a8-b104-79270812f088	1	Other	Other
+85e5f5f1-c15c-4c7a-a5a2-c6af70a3be9d	1	Other	Other
+85e67507-26aa-438d-938e-4c0095b48364	1	Other	Other
+85e68271-2101-499b-b418-5322687415dc	1	Other	Other
+85e6cb9e-fc34-4b75-a3b8-0064adeeb392	1	Other	Other
+85e720a0-16b4-40c9-860e-38b481703640	1	Other	Other
+85e75760-e682-457d-9342-3c9ca577fef3	1	Other	Other
+85e77c58-782a-48f7-bca0-ddb35080d46a	1	Other	Other
+85e7baff-76c8-4c90-ae15-80127e8da669	1	Other	Other
+85e7fcf3-b7d5-4350-9928-78f160240264	1	Other	Other
+85e81ac5-5143-4000-8210-5294feb6d312	1	James	Other
+85e83737-50bd-4e38-9ce0-c917408a71b3	1	Other	Other
+85e852e3-a221-4b7e-bca0-3e0deab2a161	1	Other	Other
+85e88c1f-d900-45f3-a2ff-f3ac8d1bcdf1	1	Other	Other
+85e91775-4b73-4460-925c-e83655dec47c	1	Other	Other
+85e97e4e-7e4c-4a02-9066-d187efcb1d7e	1	Other	Other
+85e9bb96-464f-42ad-acf6-1982c0919d05	1	Other	Other
+85e9d825-4091-4302-b7a5-04e2ed1d261b	1	Other	Other
+85ea0c69-5bbb-4492-b2b5-454920795d1a	1	Other	Other
+85ead2e0-780a-411d-bd3e-1e578280b623	1	Other	Other
+85ead49a-ad28-4013-9e9b-1156cee34a6e	1	Other	Other
+85eafa6a-95ff-49d7-8171-015335a8534a	1	Other	Other
+85eb12a7-e9b1-4f1f-b02c-814c55bd6684	1	Other	Other
+85eb4c5b-fd2b-4c66-8f9f-88b43e42cc4e	1	Other	Other
+85ec0396-596d-4246-9906-eed356f714a9	1	Other	Other
+85ec50c9-8d27-4992-ab84-bd57c608cf56	1	Other	Other
+85ec5533-7234-4378-83e8-3f3e401fbffc	1	Other	Other
+85eca485-c745-47fb-ab72-b683f1e45d04	1	James	Other
+85ecab9b-f530-4ecf-8669-ea641c5553b6	1	Other	Other
+85ecae2e-8dfa-43e8-a74b-a1e0c39be917	1	Other	Other
+85ecb43c-3b58-4a8c-8bf2-04a0894fc786	1	Other	Other
+85ece524-4ca5-4821-be72-ef6f3a1e3234	1	Other	Other
+85ed9681-abce-4463-8ca5-c51ac6ea6ae5	1	Other	Other
+85edf65a-a508-4377-ae2f-c5ab6b5d2039	1	Other	Other
+85ee193b-4376-4472-8d16-f8052ee8a8a8	1	\N	Other
+85ee2424-00ab-4b68-83ec-1dbcb4416f2b	1	Other	Other
+85ee469a-c4d9-491b-afe2-481d506e96e2	1	Other	Other
+85ee63c1-b6af-49e9-8bef-60819dcadf33	1	Other	Other
+85eeca62-468c-44a2-a7fb-5f4971c3f204	1	Other	Other
+85ef2f38-8180-440d-911f-a6bf798b8716	1	Other	Other
+85ef3e3f-9dc7-4230-bd76-1a2790e5cda3	1	Other	Other
+85ef6ca2-91d1-4976-8d15-cf61493f0eda	1	Other	Other
+85ef7a57-b460-4f69-a8a4-d466828c2e42	1	Other	Other
+85efa7f3-99b8-4a38-a124-9b2a17b3d031	1	Other	Other
+85efaf43-ad72-486c-9e0b-8900b9586cea	1	Other	Other
+85efda6f-67ca-4c2e-947a-9457c02fa500	1	Other	Other
+85f05fd4-e69f-4020-9be8-62e73761e19c	1	Other	Other
+85f069c8-9f5f-4399-8736-75e45207e026	1	Other	Other
+85f0750c-b57b-42e7-90a5-e1a015d4f4b5	1	Other	Other
+85f07880-3942-4dc3-800c-006a945cf2d1	1	Other	Other
+85f0c9d6-6f26-492d-ae87-973d42bc189a	1	Other	Other
+85f11d03-952a-492d-a22d-0996cef9318e	1	Other	Other
+85f1955e-308f-4cd2-b92e-0a294518e2ab	1	Other	Other
+85f1a4b7-e49e-4d75-806b-e83fb8a3c67a	1	Other	Other
+85f1d259-21b1-4162-b765-54c25f2321e9	1	Other	Other
+85f1d89c-12fb-40c2-861a-e691974e0b13	1	Other	Other
+85f21342-1584-438e-b488-931fe8e5d4ac	1	Other	Other
+85f232a4-a205-436e-9096-37e209370e93	1	Other	Other
+85f24762-23f8-48c6-b3df-751d50056339	1	Other	Other
+85f256d1-4cf9-40f2-8190-77da0207fc40	1	Other	Other
+85f27d17-ea60-4a62-8506-c07695f3572f	1	Other	Other
+85f2ac3c-cc93-4f82-a656-690deff8871a	1	Other	Other
+85f336b6-65b6-41fc-a0d4-e0f3521c80b0	1	Other	Other
+85f3f2bb-2f3a-41ea-8d3a-4eb4a195962d	1	Other	Other
+85f4f721-1651-4500-ba4b-f992a42a95e0	1	Other	Other
+85f50c11-9402-49ab-ad4c-6a812cfc755e	1	Other	Other
+85f52082-f73f-479c-a391-adf651ff9c0c	1	Other	Other
+85f530ac-0dd0-43f0-9bb0-29fcc28a28a6	1	Other	Other
+85f53b6f-a49f-462c-99b2-6646fb9a523f	1	Other	Other
+85f54c75-3c8b-4dd4-89a1-0e58e74c49f1	1	Other	Other
+85f5be28-4871-4a87-875a-6f1f340101a2	1	Other	Other
+85f64d94-c4cc-4f4d-b708-3a88bb881b12	1	Other	Other
+85f69ca6-e727-4104-8c21-810cd117efdf	1	Other	Other
+85f6c1dc-02c9-4f9f-99e2-d004a13be389	1	Other	Other
+85f6d2e1-5031-4320-abd3-55e00bdff155	1	Other	Other
+85f6fd7a-5951-4ae6-8dba-2d0c2a774d2d	1	Other	Other
+85f73a84-c0c9-4b92-b1e9-a6dd3d3ba45d	1	Other	Other
+85f76c82-5402-42ef-901f-587bf7cedc2e	1	Other	Other
+85f77f15-2ce0-48b0-a63b-2836d000c05a	1	Other	Other
+85f7a5e2-eab3-4e45-8eb3-3325c67f1f27	1	Other	Other
+85f7b2b3-1fd2-4556-8084-0750b3b2957f	1	Other	Other
+85f7df92-60a9-43f9-9c4b-65f0b13600d0	1	Other	Other
+85f802ce-f32d-43f9-b240-d50a8c7eb763	1	Other	Other
+85f82960-f802-4a0d-a81e-e2f53efcbbfa	1	Other	Other
+85f86ec8-8b22-4c50-818f-a6a10300137f	1	Other	Other
+85f877f5-0d6e-49b8-b6df-2f93ae484175	1	Other	Other
+85f898c3-a040-4483-8224-9e51db2fd6d1	1	Other	Other
+85f89c32-ad80-4301-83e3-8292017b4ac8	1	Other	Other
+85f8c3f0-6b76-4465-8829-685bf7e2784b	1	Other	Other
+85f8d253-c00a-4adc-ae5b-e7c44317d17a	1	Other	Other
+85f8f795-eb39-43ef-a893-adaa17ad7654	1	Other	Other
+85f90710-84a7-4df2-9cee-5b0db80df4bc	1	Other	Other
+85f93386-f0fa-4006-a4b8-96b14bd8110e	1	Other	Other
+85f951d8-6a92-4a9b-b3e5-afab2fc81b3d	1	Other	Other
+85f9c536-822f-48cf-b986-4286c3f7a481	1	Other	Other
+85f9e828-a18a-44dc-8e86-7722044963d1	1	Other	Other
+85fa36ba-6443-44e9-b65a-03acc23275f3	1	Other	Other
+85fa36c3-a278-4c4d-bdfa-b30f3811ff5b	1	Other	Other
+85fa39b9-3c25-4816-90c0-3cd594bf0f6b	1	Other	Other
+85fa3bb8-1c2d-4733-a979-497f9a5a1e3e	1	Other	Other
+85fa50e7-74bb-4d97-9a2b-b691a3a31604	1	Other	Other
+85fa9f94-5ef9-471f-85e5-bf4789a6a76a	1	Other	Other
+85fb5b17-a6ec-49cb-a5d8-0d6d9a971427	1	Other	Other
+85fb5b20-e8cf-48ef-82db-7ce1aad32e46	1	Other	Other
+85fb68da-fa93-4079-955a-a34d6273ad33	1	Other	Other
+85fb9efa-f3df-46e2-8d35-78a5edd1b918	1	Other	Other
+85fbc053-abc9-48e8-83ba-4ea557228403	1	Other	Other
+85fbc249-27fd-42e0-82e4-86cceca31faf	1	Other	Other
+85fbc78c-68d2-4ced-9b56-3aacab074ee6	1	Other	Other
+85fc19b5-bfae-4233-a329-5596b865b344	1	Other	Other
+85fc3dc1-6001-4229-858e-3f73a2c66d59	1	Other	Other
+85fc4629-2654-47f7-844e-1380681fdb74	1	Other	Other
+85fc614c-b47d-41e5-8831-17f833288729	1	Other	Other
+85fcd407-2857-4acd-8fdd-759159c79fe4	1	Other	Other
+85fce44b-dac2-45c1-bde5-8964aad34186	1	Other	Other
+85fd5ba5-dddf-4834-97b4-48afeff2e2a5	1	Other	Other
+85fd6bc6-1428-407c-8abe-b471aae7da88	1	Other	Other
+85fd6cca-8eac-4cb8-ab20-604aba27f966	1	Other	Other
+85fd7320-5fd5-422d-a1f2-c6de21a4819a	1	Other	Other
+85fd9c3c-a05d-4b95-864a-4d6252aaab40	1	Other	Other
+85fe50cd-da85-43a3-a33f-7829acfb4156	1	\N	Other
+85fe52b1-93e9-40dd-a588-9ac53e2c90ad	1	Other	Other
+85fe6949-1d68-48dd-803f-75731b397975	1	Other	Other
+85fea517-28ff-4fc0-b9eb-e7f32fb0d731	1	Other	Other
+85fef8f3-7ee9-4849-81ef-11cabf50f36e	1	Other	Other
+85fefc79-1a10-4fbd-a7cd-04eac481c303	1	Other	Other
+85ff16c2-33aa-45f9-b6b2-2850dca639bd	1	Other	Other
+85ff3f61-1d09-460b-a6ea-d2b22a783697	1	Other	Other
+85ff420f-c28a-4389-a088-b83c0054cf9a	1	Other	Other
+85ff676a-2833-4112-9c85-6214432d9672	1	Other	Other
+85ffa7ff-3e1f-4e46-9d25-890b143c104c	1	Other	Other
+8600bcf0-abd7-46b8-a9af-0d79044601e8	1	Other	Other
+8600d1b1-db28-439e-bd90-87bcfdc378dc	1	Other	Other
+8600dc8d-440d-4142-a298-1ce20545de5e	1	Other	Other
+860108e5-929f-4778-83ff-ba6aaa323f7a	1	Other	Other
+86010b1f-8608-40b4-a99b-07a8d1b84d81	1	Other	Other
+86011a78-11c6-4cbb-b853-99e4c3ce89cc	1	Other	Other
+86015d36-94e1-401d-8377-d23501a22041	1	\N	Other
+86018162-421d-4658-8577-15525132c8d9	1	Other	Other
+860182da-8487-463a-a5d4-2a6c8ae4b3e3	1	Other	Other
+860188f6-5705-4865-b377-4ec38953cc91	1	Other	Other
+8601dd44-8046-4fc9-9c1d-9071670fecc4	1	Other	Other
+86021025-4a1c-4a67-9789-8ec57790acea	1	Other	Other
+86022b51-d4a9-4740-8c28-31b86d3de2c5	1	Other	Other
+8602348a-c85b-4775-9631-ad12d57b402a	1	Other	Other
+8602a3a8-6897-484f-b3d3-b08885892ceb	1	Other	Other
+8603603a-df1c-42ee-90b1-555ccbb9f1a1	1	Other	Other
+8603da35-2fc1-4592-a8d2-f636b656bcbf	1	Other	Other
+8603de4c-84dc-4819-8cbb-d5bee4284c2f	1	Other	Other
+8603e76c-4afb-46ac-b8ee-8f245c12740a	1	Other	Other
+8604278a-8366-4c43-9d45-c2fd79e7834b	1	Other	Other
+86042d32-ba44-4bfd-bdbb-5bab28dd608f	1	Other	Other
+8604347a-b881-481d-99de-a5487b060012	1	Other	Other
+86043c48-dab4-4a7e-b46b-f74055f7cf35	1	Other	Other
+86050f80-1bb5-4e02-aad1-c6da7983c2ff	1	Other	Other
+86051ebc-7e2f-44f3-8a07-ae81ddf7f620	1	James	Other
+86053c7e-2988-4623-902c-9446a295e63b	1	Other	Other
+860589e4-9737-433c-ac3d-6bccf419426f	1	Other	Other
+8605ee05-de98-4873-884a-2f0d392ab18b	1	Other	Other
+860614cb-1196-4277-906c-b00189fad1c8	1	Other	Other
+8606ea83-eed8-4429-9fdb-c65e3df2c4ec	1	Other	Other
+8606f1d5-1432-472a-a987-8bce0e20f8d1	1	Other	Other
+86072734-38eb-48b1-a059-6cb45da5b62e	1	Other	Other
+86076a1e-1098-4e03-9076-58042d743052	1	\N	Other
+8607727f-b285-4fdd-85d9-692b4c305205	1	Other	Other
+8607842b-0d7d-4db2-b7e6-be039ab4fbb3	1	Other	Other
+860786c5-ab04-43f7-9a53-89026b548c20	1	Other	Other
+8607a7bd-a14e-41cb-a288-2a7fc01c27a6	1	Other	Other
+8607ad0f-d603-4811-9934-b08211fbabf5	1	Other	Other
+8607b9d7-c9e1-4566-b407-6722b5438f91	1	Other	Other
+8607dd81-e294-4fd9-9073-71c7e8a86324	1	Other	Other
+860823bd-243f-4078-beec-ff09d6271bc6	1	Other	Other
+86082478-8050-451c-aeb7-f0c04500a06a	1	Other	Other
+86084e16-fcad-44fa-9e43-3caeeec76913	1	Other	Other
+8608ab7c-8075-421d-8719-2cd808052d62	1	Other	Other
+8608eb8f-e56f-46ca-86df-91aa3f502c6b	1	Other	Other
+8608fa16-0f5b-4a21-bc13-b592816b4651	1	Other	Other
+8608fa85-e951-47b3-8ac1-ffd625e64377	1	Other	Other
+8608fb84-faa9-4312-99eb-f4b27f70f5cc	1	Other	Other
+8609c230-8ab4-4dc3-a5dc-5aeeacd4c6e9	1	Other	Other
+8609c40e-6a1d-4e5b-ba01-7d3410e4f518	1	Other	Other
+8609d9eb-02a6-4476-be84-4cc1766fdf33	1	Other	Other
+8609edd3-9337-46aa-8d8b-9017e8b075ee	1	Other	Other
+8609effc-b6ba-4b91-aa2c-d9857e754a6d	1	Other	Other
+8609f484-4c00-42b9-83a4-ba28c509724e	1	Other	Other
+860a92de-246b-432d-b07f-a69cb92ab06c	1	Other	Other
+860a949c-b300-4ee3-acec-fe5023a2a169	1	James	Other
+860adfbf-e8f7-440e-b662-dbfcc6d8bea7	1	Other	Other
+860afa8f-7bc8-4f1d-9ca0-e696037d42a2	1	Other	Other
+860b45e3-ab0c-45f8-bf8d-54d6515ec48e	1	Other	Other
+860b52aa-5fb7-4135-a1d4-5993cf7dde2a	1	Other	Other
+860b70a6-7d54-4a77-aab0-8547445cac4f	1	Other	Other
+860b834d-dd00-41c0-97ce-b09af31c0d52	1	Other	Other
+860b8801-9fe7-49cc-80ee-c827ebb4df41	1	\N	Other
+860c1a07-0659-4e02-9732-d0058d02d3aa	1	Other	Other
+860c1e1d-85e4-4f29-aac8-9f84b3f64a6e	1	Other	Other
+860c4b8e-4386-4c0b-b17f-50d0a4c5f514	1	Other	Other
+860cc678-2ca4-48e6-aee8-b3cc7a0ca24b	1	Other	Other
+860ce45e-6034-4183-9416-274bfa961bd8	1	Other	Other
+860d2770-162b-43c9-87b5-35d25f34fc51	1	Other	Other
+860d9055-688a-4cb0-93e8-c22c339a5d67	1	Other	Other
+860dfb3e-4913-49ac-acda-eb30f277d4de	1	Other	Other
+860e0963-ecda-4e16-9fc8-2c19456058d1	1	Other	Other
+860e22b1-a66e-4fc0-bf45-cd12796c6f9f	1	Other	Other
+860e3bc5-17a2-4a27-8c97-5a015e124de7	1	Other	Other
+860e4d9c-1c1c-488f-bfc2-42e9f514bda0	1	Other	Other
+860e739a-c3fb-46e6-ade5-16d6f3b03ec7	1	Other	Other
+860e7b74-8853-4706-8988-f7eb3530896b	1	Other	Other
+860e81dc-75b3-4266-9aa6-f04f498f679d	1	Other	Other
+860ec8f6-2567-4e91-a807-9b7355510349	1	Other	Other
+860f0f22-8259-4d75-b3f5-636e2abed73a	1	Other	Other
+860f8215-a827-485f-99ad-57ea2709aef2	1	Other	Other
+860f9f1b-2952-487b-a317-465bedaf17fc	1	Other	Other
+860fbea5-f0e0-41b4-91a9-4d825679d267	1	Other	Other
+860fbfbe-b655-4d1c-a112-985f17e69abf	1	Other	Other
+860fc0cb-2d0b-4fd4-ba78-51d825ce53e6	1	Other	Other
+860fc2a3-2e78-4dc5-97bd-70ced2eef5e4	1	Other	Other
+861026cc-1353-4be4-a9ad-2a224f250afb	1	Other	Other
+86104a6f-fb3d-42cb-a5d1-147948378840	1	Other	Other
+86105c44-907c-448f-a0e1-55ee8b1c780c	1	Other	Other
+86107831-fe1d-461f-9504-46f147fd9375	1	Other	Other
+8610cf57-0662-4b72-9120-bdb589b4a6fa	1	Other	Other
+8610fbb9-875c-4e99-8f83-0b09fc82454d	1	Other	Other
+861116cc-b57e-4faa-a3e0-81396343f67c	1	Other	Other
+86112b56-396d-4de9-a02c-9e07363e95e9	1	Other	Other
+8611377e-95fe-4051-afdd-24b1b668261c	1	\N	Other
+861166a9-bcc2-4f86-be4b-cadc10ef6585	1	Other	Other
+86118ce7-42da-42ed-9bd1-e0016689b3e7	1	Other	Other
+861298c4-2ab6-40d6-95c4-12bdaa5fe3bc	1	Other	Other
+86129b3d-1fc1-40ef-b310-e9a4d8cfe2c4	1	Other	Other
+8612d86f-f858-449a-a822-d244be97b048	1	Other	Other
+8612fec3-7ad5-4b1c-ae64-b3d1e0884dfb	1	Other	Other
+861354ec-2530-41d2-a650-1ecd5d857583	1	Other	Other
+8613d60c-2fc7-4847-bb7e-9ae5bbd63148	1	Other	Other
+861486d7-8480-4aaa-9cb7-edb5ba04d42c	1	Other	Other
+86150771-035f-46da-b12b-e844ad1b03cb	1	Other	Other
+861545e5-4b65-4dd9-ad89-47b247d38705	1	Other	Other
+86156dcd-0f76-4aa7-a841-0c621337605a	1	Other	Other
+86165d6a-d968-4816-91d5-20d87020e462	1	Other	Other
+8616816f-a7de-4d7c-ad32-4cf595f3902a	1	Other	Other
+86169528-4f11-4fa4-971a-219b88612e6a	1	Other	Other
+86169538-92f8-48f5-865b-b886cc9299f6	1	Other	Other
+8616c973-719b-405a-ab10-dde16b21926d	1	\N	Other
+8616ed26-2ab4-41b9-91a2-33b79cae518c	1	Other	Other
+8616f1de-7164-4120-afe8-9af07d527fda	1	Other	Other
+86175020-048d-475d-8079-5da11d62b35a	1	Other	Other
+861760f0-a065-4b26-8fd8-f8efc906450d	1	Other	Other
+86176b5a-afe6-4a50-b87a-c8ac06859855	1	Other	Other
+8617740f-ad63-456d-b608-816223f56e25	1	Other	Other
+86177d53-9b8a-4042-829b-31ed3fda9034	1	Other	Other
+86178161-b1d6-42dd-8fcf-a9249843d006	1	Other	Other
+8617da1f-0972-41d8-a224-5284f7694bbd	1	Other	Other
+8617e5a1-6633-4e52-a291-54b4ff639c35	1	Other	Other
+8618173d-f216-42b2-a67d-91fbbdd154f1	1	Other	Other
+861859bb-a14f-45d2-a2ec-8e90a30c92c6	1	Other	Other
+861862ff-c7fd-4c7b-abd0-460cbf175452	1	Other	Other
+8618ca5c-7ddb-483f-987f-dfcf0aed7105	1	Other	Other
+8618d539-ec5c-431b-aa43-52235efa1fc2	1	Other	Other
+8618da4c-4ed3-4906-a0cf-b2dea7ee24d6	1	Other	Other
+8618f92b-b387-48c4-a200-ac53c9f7b797	1	Other	Other
+86192ad0-feb8-4ff1-809f-33cb7d46dfb6	1	Other	Other
+86192b9d-c1fc-4a19-aa0d-d6b5308da3f8	1	Other	Other
+86193734-1709-4f05-8553-e7594a0f1404	1	Other	Other
+86193f14-9b1c-4dc4-96f5-53aacd56a692	1	\N	Other
+8619c327-b046-448d-89a4-2783714fbd1f	1	Other	Other
+8619d135-ceed-4ff7-9243-fc10676dadb6	1	Other	Other
+8619de9a-ec56-4063-b830-5116b2e9725a	1	Other	Other
+8619fe91-5c0a-4e79-8f7f-537e53392376	1	Other	Other
+861a1e63-20d6-452c-9336-027d918bc53b	1	Other	Other
+861a83f7-822c-4a5b-b943-2c69f26f410f	1	Other	Other
+861aebae-18f1-47f1-8888-95a629d656bc	1	Other	Other
+861aff2a-108a-4ee3-8275-2e6b3ba605b1	1	\N	Other
+861b0e92-ea9a-498d-89de-fa9edf68f624	1	Other	Other
+861b15f8-32f6-460d-bd57-053ea14db164	1	\N	Other
+861b2dd8-1866-4baa-902a-992e3311c8d9	1	Other	Other
+861b72e8-4967-44da-a60b-5c28ac9af556	1	Other	Other
+861ba070-a42c-4e3e-b7f3-0133df83e5fc	1	\N	Other
+861bc94a-1404-4676-9440-948074959cbd	1	Other	Other
+861bd506-e54c-4ee1-a8fb-9e40ab6137c3	1	Other	Other
+861bfe13-c2bd-4c12-944c-8051d3248ac4	1	Other	Other
+861c10da-9509-4563-9f02-5fac5ef8dd83	1	Other	Other
+861c782d-d7c6-4ee0-8ce2-2e2538a02268	1	Other	Other
+861c8f19-bb73-4a49-84eb-d40dfa5dffee	1	Other	Other
+861cb87c-c076-4d12-a6b1-78a029eafcf6	1	Other	Other
+861cbad4-7b77-4741-b71f-90a46af327e8	1	Other	Other
+861cc28d-59b7-4be0-ada8-2512929d2e3a	1	Other	Other
+861cd0b3-cd11-4d62-8e2f-3ade22c94c6f	1	James	Other
+861cd735-b667-4227-89f3-f2abf3d0a13e	1	Other	Other
+861d1131-0c3a-402d-9e62-9c0dc20454fe	1	Other	Other
+861d658e-be1f-41ea-a09d-555774ca98c1	1	Other	Other
+861da909-fd92-4418-b437-92c365d1477f	1	Other	Other
+861e136c-d320-42b8-96dc-6dbf05912ab2	1	Other	Other
+861e1bde-e167-475f-9876-e6537307453e	1	Other	Other
+861e566d-f5de-4a2e-900f-5daaa8fad765	1	Other	Other
+861ed2c6-f456-4031-a9b7-b006593f9446	1	Other	Other
+861f5d2d-6bf6-4a3f-b071-6e3c424ddaff	1	Other	Other
+861fa033-f418-4ad7-bd67-1affa023ac7f	1	Other	Other
+861fe868-aef7-4606-9054-34611369eb5d	1	Other	Other
+8620338f-f661-4a0b-af7a-bcc6654a843f	1	Other	Other
+8620380f-0f55-40f8-8ea3-93fcc50a0f04	1	Other	Other
+86203ed4-dd5b-4999-855b-4172706aebe5	1	Other	Other
+862073c1-1c41-4a41-91f4-ea1451e83d28	1	Other	Other
+8620b595-b91b-4f8e-b3bf-3c13599f2029	1	Other	Other
+8620d43a-8db6-47ef-8a9d-56d40be20985	1	Other	Other
+8620f356-0090-41b2-b890-b4b7d0214103	1	Other	Other
+86210785-d7e8-450b-aa78-77527a199ae7	1	Other	Other
+86212355-9d85-4a93-98ef-8064596a3f0b	1	Other	Other
+86214a89-dd33-4acb-b632-84b5ba7420b0	1	Other	Other
+8621db24-6cd4-4525-850a-2876c277e13b	1	Other	Other
+86224dbd-4938-4c29-b6e9-a4cc2c76149a	1	Other	Other
+86226c68-632a-4f44-a373-9fb079a419a9	1	Other	Other
+86228188-85d9-42f0-97df-39db05a7e4c1	1	Other	Other
+8622a02f-3c04-4fe0-a857-468f57a8ae4f	1	Other	Other
+8622adb8-b764-4d02-8fba-e32467a30cf9	1	Other	Other
+8622b6d0-5f32-47ab-a26d-0671e8166ebc	1	Other	Other
+8622d30e-b498-4968-bf3f-f92e1386d643	1	Other	Other
+8622e741-0635-478b-b45b-2355dfff97d4	1	\N	Other
+86231841-f72d-48d5-a07e-60844b4c8c93	1	Other	Other
+86234af0-ac47-441b-b7f5-3f3da2b749f7	1	Other	Other
+8623dc53-8063-4943-acc3-eef547f35fe6	1	Other	Other
+8624262d-8d99-4af8-a8c1-6d991c40de90	1	Other	Other
+862475f9-d23b-42b0-8eb5-a9b0518f0ee7	1	Other	Other
+86249a04-5cdc-4f24-a6cd-05c5f3c1b3f8	1	Other	Other
+8624adab-0182-4166-9af1-b52cfc43d6f8	1	Other	Other
+862519f2-ed15-4d8c-aee5-5b325a5312e9	1	Other	Other
+8625b4c1-164b-4c83-bd4d-b3a703ef62b7	1	Other	Other
+86261add-5bde-4e3b-8a1b-740e4e7b32c0	1	\N	Other
+86267795-d655-47ee-a22c-8e270399968d	1	Other	Other
+86267b31-ccd6-43c5-8c2a-6c1d2a5de8f3	1	Other	Other
+86268d76-379f-4359-9e82-76284f935336	1	Other	Other
+8626da79-6982-41df-84a8-b8624f09a4f7	1	Other	Other
+8627a691-0dff-4892-822b-dd99404fe306	1	Other	Other
+86280d0d-f6b0-4bb7-988d-e453b0f5041e	1	Other	Other
+86283cd1-f5f4-408f-a9c7-d40b9d37ccac	1	Other	Other
+8628cadb-ddfa-407d-9f58-b24ae85e5ece	1	Other	Other
+8628df2d-f58c-4f5b-9796-ff7ac347c419	1	Other	Other
+86290cd4-ee78-472b-8191-6d4d4318c410	1	Other	Other
+862935e4-fec4-4a95-870b-ded8675a7c8f	1	Other	Other
+862936ce-27fe-43e5-883b-85727ed22d2d	1	Other	Other
+8629b66a-aa46-4a10-8387-f75d65e50d3b	1	Other	Other
+8629de0b-f8f4-43a7-9872-38c695657ca1	1	Other	Other
+8629e919-4c56-4742-b223-49b33390dbea	1	Other	Other
+862a44b8-4810-45e9-b20b-34dcfa58dcef	1	Other	Other
+862a4e93-1804-42d7-b2a4-d2bda53c3a2e	1	Other	Other
+862ad90c-46c2-43b9-a612-603f3c9ab22e	1	Other	Other
+862b47d4-5947-46ab-a2a2-d2f02bf0c8b6	1	Other	Other
+862b4a11-e7c0-4c62-a912-c3ea5fa9d6db	1	Other	Other
+862ba40f-0146-4ea7-95d3-4d981baa83a1	1	Other	Other
+862be377-21fb-4f62-857b-51cc583e8821	1	Other	Other
+862c374d-8863-4854-b02d-d6cfc6913db3	1	Other	Other
+862c3886-3879-45d2-b0ca-272f3c993dae	1	Other	Other
+862c5fb3-5647-45c7-aa5b-061724fba614	1	Other	Other
+862c680b-04a3-43e0-a4e7-5f3bbc26732c	1	Other	Other
+862cb895-2118-456d-b8cc-98bd39d4bbdb	1	Other	Other
+862cb963-4649-4679-8436-68334f51a7ab	1	Other	Other
+862d2fd9-71c9-43d2-bfc8-49d8c873a6a3	1	Other	Other
+862d60e4-12ab-41a2-96c4-b635988a6859	1	Other	Other
+862d68f2-0c01-4121-b78e-07fe874a78ae	1	Other	Other
+862d6ba8-0369-44db-8b91-a4631c3fbe50	1	Other	Other
+862d76b6-e4db-4723-b610-c135f83fb924	1	Other	Other
+862d93b4-5e7e-4ad0-8f5e-822ee8c59e3d	1	Other	Other
+862d9477-0898-471a-a61b-4ed2a05341fd	1	Other	Other
+862dbbe3-92c9-4e7e-9dfb-67519449abf4	1	Other	Other
+862f1158-7fd2-4450-99f0-3fead4102c53	1	Other	Other
+862f2738-f4c1-4561-a4f5-2a5c651cf3ae	1	Other	Other
+862f28c3-21d3-4035-bf9a-b712fb5eee6b	1	Other	Other
+862f3b50-fe0b-4985-a9ea-0c15079fd6f3	1	Other	Other
+862f3bde-2144-4d36-bb74-0e32ed98c78d	1	Other	Other
+862f40e7-2ae8-430d-a8eb-2c1fd1477e61	1	Other	Other
+862f7855-6706-4e19-bd8b-e80d7d87d5ab	1	Other	Other
+862f978a-412e-4053-8878-8f18b39e9d1f	1	Other	Other
+862fa84a-310f-4b89-8f1a-dc46021e4a5f	1	Other	Other
+862fbde4-3289-4975-9f9e-02e4d03ca69c	1	Other	Other
+862fe7d0-7e76-46de-9130-7b4644eb6dd0	1	\N	Other
+8630297f-bd87-442a-9796-8652dd87b103	1	Other	Other
+86309ec3-c138-4f7d-80d3-2d2ce2278251	1	Other	Other
+8630e811-2658-4ae1-8657-136e49b370e1	1	Other	Other
+8631062f-ce8b-4e84-bf0f-9532f268157f	1	Other	Other
+86316566-189d-4224-995c-45b66eff68e7	1	Other	Other
+8631f5eb-a07f-4184-a48a-dcfc309f5d18	1	Other	Other
+863205d9-9df6-47f1-8bea-2e3255d1e8e6	1	Other	Other
+863231a6-bb0b-4754-a82c-98c569029ed9	1	Other	Other
+86324b27-66a0-4e77-a482-5da1fac63a06	1	Other	Other
+86324b85-98f8-4343-83af-223fb27747e9	1	Other	Other
+8632a24e-6408-4a6e-943a-d09c3848101e	1	James	Other
+8632a78c-f506-49b4-a27b-26cb09cf045a	1	Other	Other
+86331168-32b6-408f-a2fd-3b93d651cbff	1	Other	Other
+8633209d-2228-4f02-b0e3-2cd7e862223f	1	Other	Other
+8633caf2-fc78-4089-889e-bd88873ba681	1	\N	Other
+8633d41e-d3dc-4416-b9a0-56ca9e2baea0	1	Other	Other
+86340b22-8061-43c0-a08e-dd6d7508dbfd	1	Other	Other
+8634159d-9e43-4d5a-a464-3d86eb9f7043	1	Other	Other
+863438fc-e12c-49da-971e-f27077821b1a	1	Other	Other
+86347261-c920-41f6-97ea-c89285b11900	1	Other	Other
+8634a07f-804a-44e3-ab4a-d599fa57682a	1	Other	Other
+8634d1eb-1912-4657-bba7-3c17c8df7e24	1	Other	Other
+8634dbe2-41d3-45d2-824a-6cfe1cc592df	1	Other	Other
+8634e14f-51bc-496d-9cac-367dc1bbd884	1	Other	Other
+863590f2-fa59-46ea-8164-d8f21a96a940	1	Other	Other
+8635b744-1639-11e8-a568-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+86361a1a-9eb8-4788-96bc-c6cdd930d930	1	Other	Other
+86362291-e6fe-485b-9b51-a1e8248acc81	1	Other	Other
+86364531-01d7-49a9-bb15-228c35580a3a	1	Other	Other
+86365ba1-a3fd-4187-9b30-7d48c30ca890	1	Other	Other
+86368311-af01-4f4f-8542-1016ca6d113c	1	Other	Other
+8636bb00-91dc-4eea-8ffd-26370b38f49a	1	Other	Other
+8636e0ee-b469-4a86-a336-61027d25116e	1	Other	Other
+86377318-a08b-4da4-9e89-3397f3f22879	1	Other	Other
+86378be3-6193-48e9-a133-14f9b9c98a4e	1	Other	Other
+8637984b-5570-47a9-b6bf-a97bb30913a5	1	Other	Other
+8637994b-66c9-484b-a222-55975c7c224b	1	Other	Other
+8637e73e-9e85-4541-bcd2-e56cf5bb175f	1	Other	Other
+86381b3c-90e8-4bf8-b12c-386f7f3b4983	1	Other	Other
+8638398c-3d7b-43d8-95ec-c8299dda4e9c	1	Other	Other
+86395318-9ec8-4a89-91db-178390c75e8f	1	Other	Other
+86396073-af85-4559-9077-d8298f546234	1	Other	Other
+8639737d-5dae-48d7-8cfd-aacef51ff98e	1	Other	Other
+8639a67b-4d36-40e5-a041-e42e337c1b3e	1	Other	Other
+8639b0db-bc0a-4fc2-ad5b-5e96e7292ca6	1	Other	Other
+8639cf72-fd70-423e-b107-f780af3c47b6	1	Other	Other
+863a0f0c-4a07-4a09-8fc1-1f5e31c2de34	1	Other	Other
+863a2394-64d6-434e-92ee-8e8aba1f910f	1	Other	Other
+863a2880-f11f-4541-9e6c-25188a011288	1	Other	Other
+863a2c57-a802-41a2-94a9-04c6f4a72bf9	1	Other	Other
+863a328e-e749-49d3-8481-c51d6830d020	1	Other	Other
+863a5626-9dad-40c7-b242-929e7c727c80	1	Other	Other
+863a62ca-c5ad-4b6a-b6e9-28d98166d6a3	1	Other	Other
+863a656d-b42d-4d53-b8b7-be4bd46638b1	1	Other	Other
+863a7ea5-de1c-4a74-8c6a-fc326add3abd	1	Other	Other
+863a83c4-417e-4381-a42f-e0c3183dff14	1	Other	Other
+863ad889-e9d4-401f-97c4-2626369b36d5	1	Other	Other
+863b141c-ac31-4917-94cf-ee487f2bb619	1	Other	Other
+863b3b41-8f29-4b8e-aa56-c5458a229b9a	1	Other	Other
+863b3c16-f949-4460-8cee-b1ea407757b8	1	Other	Other
+863bc16c-87eb-472e-bb55-4ccd7b2d2d41	1	Other	Other
+863bd8f1-6c6f-4ec2-8a8a-c5155d14d4f1	1	Other	Other
+863bdd7e-8f34-4ac9-a117-b957ef52bd27	1	Other	Other
+863bf101-949a-45bd-ae5b-c03813d94f12	1	Other	Other
+863bf6ec-3194-41fa-b125-422e8018a21f	1	Other	Other
+863c263f-3f65-480e-ab4c-7f2aa249692e	1	Other	Other
+863ca944-0662-4e40-b7ea-b8c9cf564374	1	Other	Other
+863cdd3f-2194-434a-b357-707f28ec7916	1	Other	Other
+863d3606-31be-4486-9f78-c004fdf4a0a7	1	Other	Other
+863d760c-65cd-459b-acde-e803641d4ba8	1	Other	Other
+863ddb8e-cc71-48ad-9631-636aa52a8437	1	Other	Other
+863df815-6ef2-4f46-814e-3974b3a70383	1	Other	Other
+863e11c0-e56a-4f9a-bd2e-7b21acb8a97c	1	Other	Other
+863e6771-cede-4736-9879-eca684dbe080	1	Other	Other
+863e7caa-6bdb-47ff-8661-9a24f26a3f07	1	Other	Other
+863efdce-bce5-4a1d-8ed3-1e143633e333	1	\N	Other
+863f328d-de2e-48e6-9c49-e355e62ef0b2	1	Other	Other
+863f9899-2352-499c-bebe-4011f39551f9	1	Other	Other
+863fe2b6-f186-4f1c-bf24-377b2693ae17	1	Other	Other
+863fec8b-b6c0-4b87-bd96-a31f75fd7550	1	Other	Other
+863ff7dd-7bab-4ac8-97c4-8cb9262f2f1c	1	Other	Other
+8640389d-f959-4177-a349-eb4ddec805d2	1	Other	Other
+86405dbd-ce87-499f-9749-62875b832fdc	1	Other	Other
+86407a5b-3bf2-4fea-add1-8acc16767765	1	Other	Other
+8640b1a5-7e06-483e-a5f5-e03876f8ac8a	1	Other	Other
+8640d0c4-5dfb-4af4-9928-fd55cd281bd0	1	Other	Other
+8640d6bf-b3ee-4fa7-8629-5b1de2824633	1	Other	Other
+86410405-ee17-4bca-94bd-50f5b072da2a	1	Other	Other
+86410734-a58a-48ef-af17-be10192eb273	1	Other	Other
+86410d8b-065b-4eb1-8657-77eade872c53	1	Other	Other
+86411db2-6f5f-415a-8593-0712fff42519	1	Other	Other
+86411e3d-cfe1-4e1c-aedb-0f4883f46e4c	1	Other	Other
+86417417-4310-482c-9e90-5c5b3e3480c4	1	Other	Other
+8641874b-c7a6-45b7-80c7-ad2e048f2d05	1	\N	Other
+8641bd40-fd6a-47b8-978b-cedc4eea4c5c	1	Other	Other
+8641d0c6-3bfd-4067-bc3c-2680811776d5	1	Other	Other
+8641e889-898a-4e47-a50e-f2aa5e6ba7f3	1	Other	Other
+864218ec-b0c4-4747-a133-3d5034afb18d	1	Other	Other
+86422ebb-3fff-456f-a367-ff6dbfa1f179	1	Other	Other
+86423dfd-c455-4087-84b7-4a3ac4b2a11e	1	Other	Other
+864280eb-0588-461d-9e85-876a87889484	1	Other	Other
+864300e2-603a-4ade-b72a-1f32f9908b1f	1	Other	Other
+86431ed2-bad4-4387-9f2f-6497f10e4f6b	1	Other	Other
+8643300b-9b22-4a04-9d7e-0b0cbc8a7fa4	1	Other	Other
+864339a9-1b92-4422-8ef7-20e9bbdde689	1	Other	Other
+86436e67-7732-4394-953c-d749599ff387	1	Other	Other
+8643ac28-1932-483e-9ee2-a4f8a96f9dc0	1	Other	Other
+86443b2f-03d8-4812-a0b3-af369b425ef8	1	James	Other
+86444751-82a4-4951-9359-25d46c6eb3f0	1	\N	Other
+86444a20-0052-4822-8c6d-eb8151eb4902	1	Other	Other
+86447df4-9399-49d4-a902-729c3a9cf4f4	1	Other	Other
+8644ee03-c77f-45ef-a51f-7542a345c1c0	1	Other	Other
+8645116c-34d4-42f0-b647-6fbaff474a8e	1	Other	Other
+86454190-21bf-438e-8850-c81f1140f9d1	1	Other	Other
+86455453-7d50-447a-9664-c3f3ba25755c	1	Other	Other
+864576b2-cd74-4ac0-bfaa-cd550fc1995a	1	Other	Other
+8645841c-2ef2-4e03-8b13-195cd9c8776b	1	Other	Other
+86458f0d-0308-43c2-a485-7ddc0c522308	1	Other	Other
+8645d8e8-68b8-4c6d-a55a-97ade25666e3	1	Other	Other
+86461416-74f8-400a-a85f-cfd0f080b1ee	1	Other	Other
+864620dc-0bb6-4f6e-be9b-dcb5c240b6ee	1	Other	Other
+86463a75-1159-4ce5-b103-a2dcb41e58f9	1	Other	Other
+8646c4d5-13d6-4a36-b094-aeb12673e814	1	Other	Other
+8646f8e1-803c-4865-bdaa-3ff5994dcb81	1	Other	Other
+864741d8-d608-4b10-9145-58ce0c49433e	1	Other	Other
+8647793a-ef04-48a4-9049-21f62f79047f	1	Other	Other
+864788b9-6a1b-4d2b-a9cb-b4672e72b606	1	Other	Other
+86478d10-7284-4ebf-ab92-e189d4434833	1	Other	Other
+8647fce2-9971-4647-9261-bfc0fa9e2ded	1	Other	Other
+864825a5-e05c-422d-b468-2f52c20109be	1	Other	Other
+864828bc-4ec9-4b50-ad7e-5a1a98531d35	1	Other	Other
+864843ef-8bf9-40b9-a211-83bd1f6353d3	1	Other	Other
+864845e2-985f-11e7-a058-fa163e8624cc	1	Other	Other
+86486c59-7ab7-4fa6-9db7-75b22d6632bb	1	Other	Other
+86489efb-bf11-4add-91b3-58d622b6f6fc	1	Other	Other
+86489ffb-6247-4c88-8f9c-ab2ddbe8e2b3	1	Other	Other
+8648e7b1-72e3-4d6c-b268-94c8821dccd7	1	Other	Other
+86490dcf-2d88-4b89-b2de-d34533cfcc64	1	Other	Other
+864942f2-6b6e-4f29-8c32-b11e8d749228	1	Other	Other
+8649d456-b973-480c-871a-c37ad349b7be	1	Other	Other
+8649e303-257e-44c5-b7ac-f5742ebbcacc	1	James	Other
+864a11e6-dc04-4840-8645-8290f359e009	1	Other	Other
+864a38ca-f344-4190-bcf5-6ec3365da11f	1	Other	Other
+864a759f-d71e-4ff1-9e41-fcb5357ffc6f	1	Other	Other
+864aa91e-4559-451d-9bf3-8b860e5eb308	1	Other	Other
+864afb96-8796-4914-85dd-ace5a55fa7b1	1	Other	Other
+864b3d35-2966-4170-b1ee-f74fedfc9d0c	1	Other	Other
+864be726-6d84-4be6-a065-f84639953009	1	\N	Other
+864be865-6376-4d51-8281-e25bf7fae4f8	1	Other	Other
+864c41a4-e020-48b2-91fd-7d92d7945cec	1	Other	Other
+864c4d82-b3a5-4726-a46b-aeebda63c41f	1	Other	Other
+864ccb24-3bf3-428f-b310-d163434efc06	1	Other	Other
+864dc6eb-74a1-4629-9568-c7c1f1d817e4	1	Other	Other
+864dff3d-9c01-4496-b271-309a9228684e	1	Other	Other
+864e4c49-a836-46bb-b7d2-f309311542a7	1	Other	Other
+864e5d1a-ed0b-4e01-aa21-a917c73cb6e4	1	Other	Other
+864e63fa-ee8e-486d-a444-8d51d2918bdc	1	Other	Other
+864ed6cb-9ca5-4310-878e-289c5050e245	1	James	Other
+864eeca3-a4e4-42c2-a366-05dedd11d55d	1	Other	Other
+864f3303-c0c1-45aa-a2e3-0b1989a74252	1	Other	Other
+864f4abe-6b4f-42d0-82ce-9a9e23f2d47d	1	Other	Other
+864f5028-93ef-4662-aa58-3e34861164f9	1	Other	Other
+864f5434-dd26-4835-a2d8-f5d8e3bbd6d8	1	Other	Other
+864f5b56-e903-48ff-8342-aec645b5b575	1	Other	Other
+864fafef-1c9c-455c-8ff2-aebf653acf28	1	Other	Other
+864fb9e4-6171-46b4-b980-74b82d256584	1	Other	Other
+864fbf5d-9246-4dfc-946a-57f6028b64d3	1	Other	Other
+86500046-ea2f-415f-9af1-a02558fe55fb	1	Other	Other
+865025a6-3431-4f82-8ccf-6c179f9110bc	1	Other	Other
+86504df1-8f05-4d4e-b6fe-7ed2fb142624	1	Other	Other
+865069fe-9330-47bd-88be-7ea596333780	1	Other	Other
+865075ef-6739-4bc6-b128-1c7ad2521f8b	1	Other	Other
+865078bd-d05d-4c72-9e71-fcbab6e09479	1	James	Other
+865081eb-c8c7-432e-b13a-48568cdf927e	1	Other	Other
+86511440-4d3a-4c9b-a29a-e694fb059003	1	Other	Other
+86519975-ec02-42fa-9fd8-93edd8b739fa	1	Other	Other
+8651dfc4-5336-499a-9831-6754fd6c9f26	1	Other	Other
+8651f1cc-f5b8-4579-8164-c8d85a077b80	1	Other	Other
+865215fb-88e1-43b7-b731-d52c9ee7fdcd	1	Other	Other
+86525b22-4ee4-4f9a-833d-3475334afb8d	1	Other	Other
+86528bb3-5af0-4678-86d0-56c3526eb1b1	1	Other	Other
+8652ac7d-9694-407a-bd69-1c32c44987dc	1	Other	Other
+8653106e-b1f5-4200-b183-d80fcd5ae998	1	Other	Other
+8653337e-891a-47e5-9bc4-de88da679e4d	1	Other	Other
+8653696e-2733-403c-a059-c73de14a4d3a	1	Other	Other
+865369ce-ad93-466e-992e-7f0551762620	1	Other	Other
+86536e2d-c9fd-4c63-b4ec-45f754d54f2b	1	\N	Other
+865378eb-e167-4013-8c8b-d86d1b747de8	1	Other	Other
+865394f4-410e-4198-b997-e0c8a60c1bc3	1	Other	Other
+8653a166-4a22-4358-9d1a-6c4e7c57cee1	1	Other	Other
+8653fb56-6918-4d76-91eb-1c14d4369735	1	Other	Other
+86540d1c-9fa5-4c2c-a76b-2fb18460b167	1	Other	Other
+86540e30-dac8-47f1-9989-0de0c9fab52f	1	Other	Other
+865412ef-d00f-4b1c-851f-1b3b9b468565	1	Other	Other
+865415e9-ec64-4f66-b31e-3a4b9d35c573	1	Other	Other
+86543e0b-afdd-4db4-a458-918ec6341eee	1	Other	Other
+86545c97-7652-4f8a-b5bc-a44f8f4e6696	1	Other	Other
+86549ced-cc5e-471f-9183-ebc4004c62f4	1	James	Other
+8654bdc3-29f4-4ad3-89b2-1df011c8c61b	1	Other	Other
+8654caea-2de3-4871-b162-29b81fac4e58	1	Other	Other
+86550445-c447-408c-a69d-5bc4c7ad3c2c	1	Other	Other
+86559dc9-8234-48c8-8868-b6bdb9c30872	1	Other	Other
+8655f632-a1c8-483b-bde2-097147f4ac0c	1	Other	Other
+8656172e-f8af-4a37-8fb6-45c0dc86abda	1	Other	Other
+86561ac8-0c72-4bc4-bb05-5004addc8934	1	Other	Other
+8656cce1-e133-4c65-a5db-6637f1ed9b39	1	Other	Other
+8656d355-9c4b-4eb6-92a7-45e1d672f4c9	1	Other	Other
+8656d830-1e98-4359-8add-5807579c4db6	1	Other	Other
+8656f322-70b0-4250-aa32-6152769923ea	1	Other	Other
+86574b67-05a3-4aa2-9f59-56a9c650e951	1	Other	Other
+865766c2-7460-4ad2-854a-fbddee32f4f3	1	Other	Other
+865770b6-a635-4cf8-8de2-116b456e671b	1	James	Other
+8657eead-e8bb-45b3-a526-fb550b916cf2	1	Other	Other
+8657f6dc-1c71-4fab-9382-23d0010056ab	1	Other	Other
+86585aa0-ac84-47f7-bf0f-f806188f93d6	1	Other	Other
+8658aecc-a31f-454d-8535-9c0865d857cc	1	Other	Other
+86590409-a7f2-44da-8edf-74931ccbde27	1	Other	Other
+86591ed4-1c24-456c-88a1-74d7ab80add6	1	Other	Other
+8659511e-c4d3-44ad-b26e-98b3c657381c	1	Other	Other
+86597bdb-5d84-49ff-a031-eff43fc0064b	1	Other	Other
+86598dac-8b88-444e-8df4-e71394f40e98	1	Other	Other
+86599206-713a-4192-913b-3108f93784f1	1	Other	Other
+865993b0-8f81-4a16-9d21-cc79dff1c3ed	1	Other	Other
+865996fa-82bd-4a55-9898-b8d14e610e97	1	Other	Other
+8659a120-65cb-4874-a151-2f701e33f0c7	1	Other	Other
+8659a78e-44bc-489d-b519-11ac4ebd428b	1	Other	Other
+8659e084-4b23-48a0-8eb7-52986b133b5e	1	Other	Other
+8659faf8-ef1a-422c-bdf7-5b3d4d583082	1	Other	Other
+865a1736-c6ca-4f9f-b9bc-9291090f49fb	1	Other	Other
+865a3d83-df3f-4a0c-82d2-ac25d404ae71	1	Other	Other
+865a58bc-0ae5-4887-a1b9-73a020894af2	1	Other	Other
+865a5e3f-006a-4778-8812-99b59761c6bd	1	Other	Other
+865a9efd-4fd6-46a6-ae9e-4ed556e4ccaa	1	Other	Other
+865aafa3-1cb2-4c5b-878f-ea1a25171073	1	Other	Other
+865ac26b-e20c-4508-9689-d49faf7cf66e	1	\N	Other
+865afad7-8534-42b9-bc89-8ffdfdc3d07f	1	Other	Other
+865b0b12-eb4b-48bb-afb0-42d55af30faa	1	Other	Other
+865b3d47-ff11-4ba0-8391-745f651939c9	1	Other	Other
+865b6635-3f13-49d2-928f-8ecca2955aca	1	Other	Other
+865b8e26-5305-4988-aad7-4285283022f2	1	Other	Other
+865b944f-c599-48ed-9261-339406488256	1	Other	Other
+865bb5fe-53f2-4741-818d-86e4b99abb08	1	Other	Other
+865bb88d-ba53-4c9b-a007-a9630710a170	1	Other	Other
+865bcf40-7409-4ede-ae59-8af2f7d250f8	1	Other	Other
+865c34d3-e600-4b5d-980e-2f6fbc73bd3f	1	Other	Other
+865c702c-1821-4309-a532-5fad790ea28e	1	Other	Other
+865c8221-af63-4995-ba49-67a62751dc89	1	Other	Other
+865c83d7-fb7b-4be7-9b79-26912be9dba3	1	Other	Other
+865cb61f-eb8c-4b1a-b66b-1131d45249e0	1	Other	Other
+865cef0e-578d-477f-9ec1-5d4b4f1dbfdb	1	Other	Other
+865cf7d6-8232-4849-a149-d07ae054023b	1	Other	Other
+865d145a-f38e-4177-995d-048660c7223e	1	Other	Other
+865d2678-ab79-4b80-a3c7-4e25b27f6648	1	Other	Other
+865d61b6-d5e1-4acd-88d7-f62e8586e9c8	1	Other	Other
+865dba02-2133-4d19-906c-a60d6ec6dc7d	1	Other	Other
+865dead7-d888-473c-9e98-5ac6225092fa	1	Other	Other
+865dffc0-4a0a-49f1-a137-34750d7f7c10	1	Other	Other
+865e01eb-39d8-413a-a32d-a274968c9aa2	1	Other	Other
+865e79b1-25af-4708-8d55-680ae5b8f531	1	Other	Other
+865ee853-f321-4060-8ba9-b9c4f8bc098d	1	Other	Other
+865f2671-8a2c-44b7-87cf-d91fcb64802b	1	Other	Other
+865f793e-f33f-42e9-b7ec-055a79dd1241	1	Other	Other
+865f8d77-4f64-41e2-b63e-1155d292c259	1	Other	Other
+86608d38-6647-4509-a645-5147535afea0	1	Other	Other
+866097c2-1cd2-4699-9a9b-85652ce82b7f	1	Other	Other
+8660a05b-9a72-42cd-af48-febfe4e133b8	1	Other	Other
+8660cbe8-1148-4723-b6a9-5ddfc30b4a11	1	Other	Other
+8660d327-d126-4cca-bcf6-81f2f743544f	1	Other	Other
+86610962-f269-48c1-b85f-7d158b34ec97	1	Other	Other
+86619180-d8ff-4d8f-a242-5116cfdaa0eb	1	James	Other
+8661cd38-edf5-4341-a37e-b7c756fdcbf5	1	Other	Other
+8661dd02-2534-4971-92b7-28021c9ddb00	1	Other	Other
+8661f908-c744-4ed1-bf8c-5e2632023512	1	Other	Other
+86620727-9253-49b6-93df-4e44989db926	1	Other	Other
+86622214-2517-4fe9-9c50-c1f415f1d87a	1	Other	Other
+866232e9-2df8-4494-83a5-eb09e677ea94	1	Other	Other
+866250b8-f680-4b22-8faf-0cc1c4f21218	1	Other	Other
+866255a3-d711-4f36-8baf-dd2ec023bdf3	1	Other	Other
+8662568c-7dc7-40d2-867c-e2c5682e40f0	1	Other	Other
+8662c797-db6e-40ef-aa69-b91c668e4fb8	1	Other	Other
+8662f55a-6b4a-424c-9c46-d2aaf371e700	1	Other	Other
+8662f828-82ba-42a7-aa27-5c79d263d5f8	1	Other	Other
+866348ac-5c23-4cfc-87ec-85cb9c94ebe6	1	Other	Other
+8663568b-bdfc-43a3-81b3-61d608e9b97d	1	Other	Other
+866369aa-47f4-4f7f-9231-d5ca069d417d	1	Other	Other
+86636f01-0b66-49da-a548-5dd566d360f9	1	\N	Other
+86637204-44c9-4771-a7d3-14a0dee7a834	1	Other	Other
+8663fdbe-45f1-444f-afeb-a2334080332b	1	Other	Other
+8664349f-8071-4779-9cb4-455557b48974	1	Other	Other
+86646cde-f048-4429-ac66-47337cf70dfe	1	Other	Other
+86649ca3-518b-4e14-b271-ce2b62acc87a	1	Other	Other
+8664a5b0-6d19-4c56-8b46-d39745a810ea	1	Other	Other
+8664b191-d2f9-4929-96b8-2be3e8720d32	1	Other	Other
+8665040b-12be-4725-a9d2-08d44a904d38	1	Other	Other
+866512de-c588-446d-8d18-b9c7aae05898	1	Other	Other
+866564a9-8a72-469c-a7ee-8e047bf84178	1	Other	Other
+86656cd9-5453-4be8-80b3-b05c34ef03a0	1	Other	Other
+86665c2b-9581-49e9-a807-5cb7de305d54	1	Other	Other
+8666c046-1ea4-44e7-bbe9-6148144f7e4b	1	Other	Other
+8666effe-f748-4718-bd0f-fa8fa2879cc8	1	Other	Other
+86670531-5a39-46ca-944d-13cc9900bb5b	1	Other	Other
+866745cf-f188-4a9d-b776-307864452faa	1	Other	Other
+8667c02d-3045-4b8f-ae74-ba8f084c3e88	1	James	Other
+8667dba4-9612-4f7d-9b65-0d164baaf702	1	Other	Other
+8667e9d5-3ed1-477d-af76-3a6fb1bb6c27	1	Other	Other
+8667f6c4-54ce-4fdb-935c-731f8c44e5d5	1	Other	Other
+86682623-e95e-42cb-b76e-af94924c1cb6	1	Other	Other
+8668608f-4906-412a-8707-327a53e415cc	1	Other	Other
+866866d2-cbb1-42b2-9d35-03103ea58486	1	Other	Other
+86688348-77ce-42c9-aba0-e6c34ac1fec6	1	Other	Other
+8668c37d-1ffc-4e71-870a-dd82e46403d2	1	Other	Other
+86693d4a-b1be-48b2-b0c3-5a13792fdca2	1	Other	Other
+86696d7e-5ba8-4066-9a8c-245d0c65efe0	1	Other	Other
+86699122-fa6d-41f5-85eb-9ddbda339c92	1	Other	Other
+8669a234-9b68-4f62-8154-1ffb480b3eae	1	Other	Other
+8669e906-ea0b-4313-9b3f-0832dcefe9be	1	Other	Other
+866a0788-f60b-46db-a9ab-7e7b676d43e9	1	Other	Other
+866a27a3-63ee-4d51-81c6-0b227d2fd2d9	1	Other	Other
+866a2e0e-0798-43db-8167-a7f020929c7e	1	Other	Other
+866a38e0-dde1-4c84-b8a9-4449491eb761	1	Other	Other
+866a607e-4947-4b37-9593-2ed4176f3e90	1	Other	Other
+866a6cc3-b23f-4a86-847b-0621a4eafb8b	1	Other	Other
+866a6fdc-4bfa-4307-aed9-417ff66ca97e	1	\N	Other
+866b472e-e86c-4616-9121-e4cff94e9ec6	1	Other	Other
+866ba68b-bd73-46e8-a345-735e033526dd	1	Other	Other
+866bae0f-3948-42e8-998b-fc35e3332739	1	Other	Other
+866bf46c-a7b1-4016-96f0-ad7d8844e91d	1	Other	Other
+866c2ece-f112-4c12-8fe9-b0f1b8baeddb	1	Other	Other
+866c5c58-c9ae-4150-ad65-e7a880edd140	1	\N	Other
+866c6461-4f3d-4b18-94b3-3f141380acce	1	Other	Other
+866cc6f1-b16d-4204-8a24-838839efe163	1	Other	Other
+866ce0b3-365f-49f5-a393-37c707c36bec	1	James	Other
+866d4b50-76c6-4de2-bdb0-708c621a79b9	1	\N	Other
+866d57e3-a669-48d1-8fc7-23817cff61af	1	Other	Other
+866d5f14-93d2-47e4-a6be-0f3ddfb87359	1	Other	Other
+866d6c76-5818-411f-b334-620489cd8328	1	Other	Other
+866d6f20-33a2-4837-a097-81e3a6affc1f	1	Other	Other
+866da86e-018c-427a-8c0f-bd83dc787061	1	Other	Other
+866e02a3-1fe6-4706-959a-e41b30d85d7c	1	Other	Other
+866e2bc6-569f-45d6-be5b-fa5b009bef39	1	Other	Other
+866e4807-0244-41cf-a482-a4567c09ba3f	1	Other	Other
+866e78bd-65db-494c-b021-3ecf75b77e9e	1	James	Other
+866ec00d-cb93-4b0a-8904-84994b439082	1	Other	Other
+866eca24-ebb2-4184-afa4-9197aa79e9c7	1	Other	Other
+866ed866-e4c3-47d5-8207-9d8e8b509aa2	1	Other	Other
+866f76bc-eed6-4e4f-910b-bf2e417aeacb	1	Other	Other
+866f7939-c16d-4cad-9fde-1aa8f4ccb7a0	1	Other	Other
+866f93a7-e9c2-421a-84d5-2b70733a8ee8	1	Other	Other
+866fa0bf-9509-4cdc-bf28-5e8ee185b26b	1	Other	Other
+866fabad-9d59-4555-87cd-6149189c2984	1	\N	Other
+866fec33-7424-4811-ade1-9d989a5f57c3	1	Other	Other
+866ffa7c-a95f-43be-96b5-3f926feb6a67	1	Other	Other
+86709a9a-f22e-4260-b51b-4f6d1aa3a429	1	Other	Other
+8670c2a8-0fb4-4df1-bdba-c6be5cdd1c16	1	Other	Other
+8671065e-aaec-4893-9366-633354228b55	1	Other	Other
+8671158b-21a3-406a-bb8e-b87834d32a7f	1	Other	Other
+86712079-d748-4e1b-8afb-85916a4a5b54	1	Other	Other
+86715f31-d0bc-4726-b2d2-421c1eb91900	1	Other	Other
+867191d0-4a36-4772-944f-d0fe4c27e838	1	Other	Other
+86719c93-8017-4eb6-a991-62c210b826c9	1	Other	Other
+8671fd45-bd7e-4894-9912-d21dc5b0e2ba	1	Other	Other
+86720e6d-b3dc-4631-851e-d6a7e41a0a51	1	Other	Other
+86721c44-eb61-4867-aa0c-9d1f335ad285	1	Other	Other
+86722e8d-5136-4f0e-aa2d-c6413eb2dc7d	1	Other	Other
+86723ccb-6194-4274-8ed8-276b0ff478e9	1	Other	Other
+86726dce-daba-47b4-9503-b8b8f0d2adf9	1	Other	Other
+867275bd-0fb8-4119-88ad-0f5509be4139	1	Other	Other
+86729d25-f257-4353-b9de-0eb4c8bc53b6	1	Other	Other
+86732239-09a2-4d02-81d1-058b44d4737d	1	Other	Other
+86735298-ce2b-499e-9702-015ad97b56b4	1	Other	Other
+867385fc-ca84-48d9-87e7-fcf4696df302	1	Other	Other
+8673953b-59bd-442f-a355-8fcfe198b33d	1	James	Other
+8673abd7-0d87-42e3-8fcc-41eb5619e791	1	Other	Other
+8673da31-5522-4638-81c6-044ba5f6204b	1	Other	Other
+8673f398-fff9-438c-a30c-f54f2ccd3801	1	Other	Other
+86743ec6-31d5-457c-8b25-cf56ced37537	1	Other	Other
+86743f45-b91d-4bb9-9ab4-748e8d5a3ba8	1	Other	Other
+8674546d-6756-4b91-b29c-d1fc7e59ccc6	1	Other	Other
+86748422-1ff6-48ca-9a31-8e3e2af5e8ec	1	Other	Other
+8674da78-c9b4-439e-8cb1-42fef1733924	1	Other	Other
+8674eb83-e475-4eba-9eed-126a7f1082d4	1	Other	Other
+86750211-3b72-496e-a791-4fe968087bec	1	Other	Other
+86753210-e801-4b14-beda-aacc43a2759b	1	Other	Other
+86756b53-9810-44b8-8eb6-f27e74ee95a9	1	Other	Other
+86758006-ca85-4919-810c-38429687bd52	1	Other	Other
+86758548-1a2c-41be-b5fc-f3e770cc1c9d	1	Other	Other
+8675bddd-e9d5-4a0e-aa64-89e24ddae6f8	1	Other	Other
+86763e61-6e06-4367-957e-5e325853bb74	1	Other	Other
+867669aa-922e-4ff8-887f-99ee41f0b616	1	Other	Other
+86769821-bbc5-48cc-a0f0-6373101eb6c0	1	Other	Other
+8676af75-3c78-407d-8836-a8d5849a884f	1	Other	Other
+8676dbf5-aecc-4c74-a04b-d8a56c2effae	1	Other	Other
+8676e176-1c0c-4ab3-bd15-a7e81a0d976d	1	Other	Other
+8677259b-b795-4594-9d9e-4e698777ccc8	1	Other	Other
+86773782-7339-4a90-831f-870b73a95e58	1	Other	Other
+867849d3-cc53-423b-8319-8ea0b598d2dd	1	Other	Other
+867856f6-14af-440d-a762-443cd84c6f3e	1	Other	Other
+86789701-dcd2-4ab8-9569-d6246073e6d3	1	Other	Other
+8678c371-3223-4e76-85ee-56f22409ea99	1	Other	Other
+8678d123-07b7-480b-af9d-b87456a533ca	1	Other	Other
+86795b20-dc46-41e4-adc0-0095db60f17d	1	Other	Other
+86799e7c-8230-4471-af10-02c43ea51d7b	1	\N	Other
+867a3563-5eb9-4e79-8076-62233a86063e	1	Other	Other
+867a5ebc-a054-4599-94ee-d2a6af72a873	1	Other	Other
+867a8fac-eb35-493a-ad54-e929230c7003	1	\N	Other
+867ab502-1c4e-46a9-94a4-1eb4a94609a3	1	Other	Other
+867acef8-a688-40b4-87fb-be8be36134b1	1	Other	Other
+867b38fd-6f42-471b-ae28-3e05d90e9c3c	1	Other	Other
+867b412b-fe9c-4936-84a0-a9572f7bcbbd	1	Other	Other
+867b4b6b-99a4-422d-beaa-215b6a0e3c9e	1	Other	Other
+867c0761-acc3-4f8c-a2e1-8abc31cd8807	1	Other	Other
+867c46eb-caad-4b1e-b5ef-c27056b6378f	1	Other	Other
+867c887c-ac13-4653-8fae-cc4978fbafed	1	Other	Other
+867cf0d1-12de-42c1-9e88-ad65a0913762	1	Other	Other
+867d1c6c-50f4-4a7b-b9e6-0fac0e4bcad3	1	Other	Other
+867d1da2-5f24-4e61-8610-b719408a5dc9	1	Other	Other
+867db444-a8ba-43b0-aa30-17386cc1b3e9	1	Other	Other
+867dbbc3-6ea7-4f9c-96c3-744f0e27e8e2	1	Other	Other
+867dc7ef-590d-4984-bb10-4d71180f1ca0	1	Other	Other
+867dffc6-6f45-4601-9b4e-0e89842e5b3c	1	Other	Other
+867e2638-aa8e-462b-ad6c-c871a6b0c796	1	\N	Other
+867e268d-de10-40ea-afd2-f68912de79c6	1	Other	Other
+867e3a96-bb7d-40e9-833b-a3dd246c4a33	1	Other	Other
+867e78be-8255-42a3-a409-b9e686b393e3	1	Other	Other
+867e9d0f-961d-4044-886d-f1956c559a55	1	Other	Other
+867f388a-eb45-4d2d-8887-edf9c81fe76e	1	\N	Other
+867f607d-cae2-4e3b-b2dc-a36ba1011818	1	Other	Other
+867f63b6-436e-4cb4-9a99-bf11d06dd144	1	Other	Other
+867f95d9-ddb4-4d78-bc39-63bf78fceeaa	1	Other	Other
+867f9f77-21e2-44b2-982e-e7e9403f8982	1	Other	Other
+867fd3a5-cd99-4f3d-a962-c725af1ddd15	1	Other	Other
+867fdba4-5ca5-40a9-8b50-c31057c68d7e	1	Other	Other
+86801d23-7078-41de-abd5-522d0b418383	1	Other	Other
+86802405-8135-4b32-81f0-b555151049f8	1	Other	Other
+868046f8-5c07-404d-84e4-beb27bfc7112	1	Other	Other
+86806150-ef6a-4eff-bd5c-b2a38d649f8b	1	Other	Other
+8680705f-a5e3-4449-b2c8-7944bc3e7709	1	Other	Other
+868092d6-c75a-4af2-af7e-18bd3ebae6a0	1	Other	Other
+8680974d-7746-40fa-9e9d-8d0420606741	1	Other	Other
+8680ae93-6fe3-4d30-b1cd-c5f617b863d4	1	Other	Other
+8680c46b-bc02-43a1-b89c-981d17933ff3	1	Other	Other
+86810737-15f5-49e0-a5c0-98f829845981	1	Other	Other
+868123ac-ec82-493b-857f-479412c0dc38	1	Other	Other
+868172b5-7e75-4357-b757-0c73a2de6098	1	\N	Other
+868189a1-bdf8-41f0-9a11-784cc708dbf8	1	Other	Other
+868190da-4699-4b4c-947f-6cba426d3910	1	Other	Other
+8681dcc3-0c27-4e2a-b2d3-6ba4ee02f0e3	1	Other	Other
+868254a5-f471-4ded-8e76-f3b336e2fd5c	1	Other	Other
+8682a030-3b4c-4f50-968c-d6454673951c	1	Other	Other
+8682bef0-d638-40eb-ba18-a71a061e8ffe	1	Other	Other
+8682cc7f-1b9c-4c41-be97-a85f0d356938	1	Other	Other
+8682d6b2-f655-44ac-aa0b-dbc5d449291e	1	Other	Other
+8682efcb-1e12-4047-af6f-951f13be0d60	1	\N	Other
+86836c0e-cda3-4786-9003-5f2e10ce4c3d	1	Other	Other
+86837217-ee6e-4b3f-a907-929f3a193faf	1	Other	Other
+86838fd5-0ff7-4b23-998e-8d24e4fb1ada	1	Other	Other
+86839213-636c-4226-ac8d-84c75fa0359c	1	Other	Other
+868392f0-1fd5-4b34-b142-69ddd91777df	1	Other	Other
+8683e50e-d58d-41bf-939a-817d971552a8	1	Other	Other
+8683f8ea-0b90-41fd-8d1e-4daf1edd8e93	1	Other	Other
+868497cb-1fb6-4b4a-9bc9-bf32fa628fa7	1	Other	Other
+8684a1ff-c828-45d3-9154-e1ddd840fa0e	1	Other	Other
+8684aa53-e3c3-4614-99d9-8bcede7141d9	1	Other	Other
+8684f3a3-ae0c-45ff-adc9-529165ca6f64	1	Other	Other
+868509d3-46e6-430a-8450-ac82c7c67608	1	Other	Other
+8685233e-1e4d-4b1c-86bd-76ecc7bca642	1	Other	Other
+86854a1c-5f88-428c-971c-8547e3d4121a	1	Other	Other
+86856ec1-e3b3-411d-8cef-14584ea1afe0	1	Other	Other
+86858a1d-4793-4449-91eb-c61190d7c7a3	1	James	Other
+86858d31-2256-4085-84d1-99d7b9de3cf5	1	Other	Other
+8685d20f-aa98-4601-bb75-75747812d1b4	1	Other	Other
+86860683-ae36-42b7-b774-d663f7b819ff	1	Other	Other
+86860ac6-bf78-45b7-994f-54bdf3679053	1	Other	Other
+868633e1-c89e-49a9-abe2-acc701dd9e72	1	Other	Other
+86863b27-0560-41b3-a8d7-010591a74f46	1	Other	Other
+86863fc8-d0bc-4d29-97d1-faa0f46a9904	1	Other	Other
+86867a3f-3d8e-4984-8b8b-e944bae766d5	1	Other	Other
+8686a447-261b-4ebc-ad91-c23f5de2bf4b	1	Other	Other
+8686b2b4-4d45-4176-9f42-2ce4fa11b501	1	Other	Other
+8686b546-3a73-4ab4-8744-98662849e0a9	1	Other	Other
+8686c395-b84e-4e71-a8c3-50933fe7ae40	1	Other	Other
+8686df3f-1652-433b-b445-94302b7ee33d	1	Other	Other
+8687618c-f042-4d84-a276-261eaa77b795	1	Other	Other
+868763c4-edf1-4dda-a34f-c393379aa1e6	1	Other	Other
+86876f12-dda5-41bc-886f-93d241d53614	1	Other	Other
+8687ada2-0e52-4e33-a74b-5e18b385d892	1	Other	Other
+8687e8a5-ba08-4c48-8353-6b2b1bddf066	1	Other	Other
+8687f45a-e754-48a9-aacc-6b6606bca141	1	Other	Other
+868841a8-0c93-4b97-82e1-01da43b33e2a	1	Other	Other
+8688993f-da56-427a-8b2f-3b9a9beb7ba5	1	Other	Other
+8688a814-1965-40cc-939b-bbe15409e264	1	Other	Other
+8688bf1f-bf5e-4f39-b617-7748202410f8	1	Other	Other
+86891ae4-da2b-42e9-b4de-3a01b15165ed	1	Other	Other
+8689358e-edb4-4b2a-b473-63b4321277bc	1	Other	Other
+868935cd-f070-4d72-a053-82cf8d2f7198	1	Other	Other
+86898e09-824d-48f3-b7f1-96e52eb3ec7e	1	Other	Other
+8689acfc-16f7-4ffe-840e-2f4abbb01dc1	1	Other	Other
+8689bd9c-2253-4dc3-85a4-3a3af7b709f6	1	Other	Other
+8689c062-ac4e-4ac4-a9cb-9d06a75c581e	1	Other	Other
+8689f9eb-39ce-47c1-bc0f-fa7921496b39	1	\N	Other
+868a1643-b910-442d-ab93-f19e37db7dae	1	Other	Other
+868a3551-9429-4ca1-8141-638b1d11775f	1	Other	Other
+868a378b-014e-4bdc-8232-bf11b352d605	1	Other	Other
+868a3fa1-2e56-4c21-aa61-2a2b568fc40e	1	Other	Other
+868a6440-9701-4eca-a858-8c7aa43784db	1	Other	Other
+868aa49a-a122-4e60-a454-72c141949777	1	Other	Other
+868abd73-3b42-4847-84c6-2082d29f1a29	1	Other	Other
+868ac4e1-60bd-41dc-9c86-d0069d2a1b16	1	Other	Other
+868af683-6877-4fdf-a2a2-16b8fe91552d	1	Other	Other
+868af86a-799b-4573-a7e5-4d903f5922b7	1	Other	Other
+868b1257-6670-49d9-81eb-2da83bdaeba5	1	Other	Other
+868b4b50-6c3b-4347-b407-fff33c96c99f	1	Other	Other
+868b64f6-efbb-4232-ac44-b5d2d05da2ca	1	Other	Other
+868b65e1-33a6-4b9b-aa84-2574252dfdbc	1	Other	Other
+868b6e51-3e4b-4acc-aa29-57a5a0df283c	1	Other	Other
+868b78de-1bcd-4900-850a-2b4e34fe3cfd	1	Other	Other
+868b8226-b433-419a-8188-fb3067c3a395	1	Other	Other
+868bbe7b-e11a-49e8-be6d-a28441f6817d	1	Other	Other
+868bf1c8-5605-4549-b42c-a01becac9dd7	1	Other	Other
+868c2ea8-0630-43f8-8664-e83b3b476466	1	Other	Other
+868c341a-6992-47d0-a8a8-26d44763e6e0	1	Other	Other
+868c4bd0-3f95-458f-8b1b-4d4cd1ed7adc	1	Other	Other
+868c5bb9-8e9a-467d-beb8-8336a3dfa930	1	Other	Other
+868c997e-e027-47b3-b2f1-5120f69b6beb	1	Other	Other
+868cf9d7-a684-496a-abeb-26c5d22165d5	1	Other	Other
+868d0169-8af9-4ff9-a082-2a550328be47	1	Other	Other
+868d4eda-c9d7-4997-bab0-a43f1526e2fb	1	Other	Other
+868dc723-ad3c-4031-ab90-82bc350a3c66	1	Other	Other
+868e07a9-978d-4152-95c7-94f467a4257f	1	Other	Other
+868e36b0-d135-40c1-8b5b-18ce240fb83e	1	Other	Other
+868e5522-e52d-45d4-9b3e-d0e3828c451a	1	Other	Other
+868e5672-847e-4285-84a2-6a3941c14c0f	1	Other	Other
+868e8037-9f13-48ae-b9d3-bfc49004c3b0	1	Other	Other
+868e82c1-7020-4e22-baff-43d2d8a96f5b	1	Other	Other
+868eb134-8360-4f5d-bd3e-edf629540e66	1	Other	Other
+868ecd32-d742-45b7-95c1-6c4b527316a6	1	Other	Other
+868f157b-2b91-4260-9e21-55955b84b21b	1	Other	Other
+868fccb8-f8f4-4b1e-b8b1-f8f3d7a86550	1	Other	Other
+868ff12f-b080-4a75-a18e-06e4fcef8e73	1	Other	Other
+86900065-abee-4ac8-9e74-ccb69a04aa87	1	Other	Other
+869068f1-4677-4ce7-9dda-a3d456ef8222	1	Other	Other
+8690ec95-1eca-4d8e-b8c3-9b0bfec18ad5	1	Other	Other
+86910039-a303-49cc-bde9-8388c0ef8bef	1	Other	Other
+86910c17-2ac0-46e2-b4af-d2dc34a29fec	1	Other	Other
+86911c94-9079-4529-a0ae-43d4b299a758	1	Other	Other
+86912675-c7d5-4ac3-8831-a400a0bf1d8a	1	Other	Other
+86913f97-dc57-4b21-9104-cc401422bdea	1	\N	Other
+86916b50-4770-4caa-bc6e-8cd0fbeed370	1	\N	Other
+869192a2-5b6c-47e7-891f-d9cf630bf600	1	Other	Other
+8691c924-cdb8-4eb8-9d97-6c1ebbafbb0a	1	Other	Other
+8691ca34-172b-423e-9846-144ec4a8491d	1	Other	Other
+8691eb48-b302-48f4-94ae-e2f1e0861154	1	Other	Other
+86921545-b1cf-4670-afff-816575cfa1ed	1	Other	Other
+86923928-4036-496a-9757-4f64df5f4ac2	1	Other	Other
+86924a35-54a6-4f85-b2dc-57b65ef0f87a	1	Other	Other
+86925ea9-f99d-490c-ac97-bc83de2fa6af	1	Other	Other
+8692c55a-a752-4528-bdd4-3b417a923ec1	1	Other	Other
+8692ce1c-3917-486f-98d4-52fcf64bc65d	1	James	Other
+8692e06a-ab7d-49c8-9932-5bf6447426ae	1	Other	Other
+86937b1c-ab69-4892-b99e-1c20d8ebeea6	1	Other	Other
+86939809-f86c-4a77-bf6c-97c13c5c4e5f	1	Other	Other
+8693a555-5563-4c15-b006-a53afb0de83a	1	Other	Other
+8693d8c3-031f-4e9d-b27c-2341af823d02	1	\N	Other
+86942926-8862-49ec-a217-a2176a059f66	1	\N	Other
+86945c4b-62dc-442a-a33a-189f87f07c57	1	Other	Other
+86948358-f084-4b89-af63-732b99770468	1	Other	Other
+86949409-264a-4053-b03c-90703c0f746d	1	Other	Other
+86949e41-9e83-41ff-8088-76fa63923b4b	1	Other	Other
+8694f048-57a0-4c2f-8c8c-dac7215252e7	1	Other	Other
+86953b72-646a-44fa-9a2a-95d994fff9c0	1	Other	Other
+869588e7-5a0f-4d8f-bd4b-e3c2c5deaffc	1	Other	Other
+8695c385-b7bf-4dff-9695-2c8a24f1c8d0	1	Other	Other
+869651d0-6230-47c4-b3bb-1a120a5dfefa	1	Other	Other
+86968614-16e2-41d3-9e10-35ccd2d2954d	1	Other	Other
+86969066-15f6-44e1-8790-cb7f41eddf14	1	Other	Other
+8696b697-c6ab-4b27-9928-2b6ebe413bda	1	Other	Other
+8696c06e-f446-4dc7-80f7-52789e5bae98	1	Other	Other
+86971437-856e-420d-a83a-b0c6fa442111	1	\N	Other
+86976b15-6696-447a-83a3-07ea2934aa2d	1	Other	Other
+86976c86-2014-42fa-8d6d-64a2fdc21707	1	Other	Other
+86978266-fd07-4d2f-9744-172f4146f723	1	\N	Other
+869801d6-fefb-4184-bccb-87c766f8ea56	1	Other	Other
+86981fc4-afc1-409d-95d2-35a73d48ea7b	1	Other	Other
+8698b922-5620-49f6-9a6e-872d237a6497	1	Other	Other
+86990ae3-ed51-4a43-8786-5c54b0b33ed9	1	Other	Other
+86991700-9c44-41e7-a834-362174096c27	1	Other	Other
+86993be1-1644-44eb-80f0-46c236c6d9bc	1	Other	Other
+86994168-959e-48e4-944d-1e1a57ae56b4	1	Other	Other
+86996a2d-6790-4d8b-92ee-33518a50f159	1	Other	Other
+86997c7d-11b5-493c-9016-db4d74ed26cc	1	Other	Other
+869a9ed4-026b-4a7f-a434-5cb9d03b08d6	1	Other	Other
+869b2273-1aae-476b-997f-59227eec32fe	1	Other	Other
+869ba496-c217-4675-896d-14b665371628	1	Other	Other
+869bb5bf-423f-4a39-9740-bb1151d8b4ee	1	Other	Other
+869bc814-5da3-4e91-8a0c-e1010aea6d90	1	Other	Other
+869bfdd1-3207-418a-8ac2-096eff288a7c	1	Other	Other
+869c11aa-65fe-4d4e-8f50-f0dc05026928	1	Other	Other
+869c409f-8541-41b7-8e8a-bb59e59d2fc3	1	Other	Other
+869c42f2-23f1-4e37-91ec-6b2a387d4f99	1	Other	Other
+869c732e-cfa5-4683-b3f0-964fec23d751	1	Other	Other
+869c801f-31ea-4333-845b-5f277a987013	1	Other	Other
+869cfec4-3d6a-4283-a68d-10142dca63f5	1	Other	Other
+869d2a37-529e-456c-8a36-090dabefe83a	1	Other	Other
+869d9827-c9b7-45c8-9e10-3e7c26dbd7e8	1	Other	Other
+869dcd04-c1e5-4b17-8313-8e6703cac374	1	Other	Other
+869e3f75-23d4-404d-b5db-e656d8f0a154	1	Other	Other
+869ebec6-eb26-4758-af1b-23e7146e63ee	1	Other	Other
+869f0909-01a0-4339-b9d9-91af8c57cacf	1	Other	Other
+869f6a77-0835-4fc1-b361-e45493d2f643	1	Other	Other
+869f7a4c-5c88-4566-87c2-fcaa38127f5e	1	Other	Other
+869fc031-7ccc-4c7f-a181-a432db95324a	1	Other	Other
+869fdc8c-ddc0-410d-a2b9-2224f9810cfb	1	Other	Other
+86a03d4d-1d1b-44de-ae0f-37c8b6103a57	1	Other	Other
+86a041d0-3ef6-4365-976f-1b3e5cd229ee	1	Other	Other
+86a0c870-de7e-4069-89ea-5b584b06e5ec	1	Other	Other
+86a11386-1d8b-4851-94ab-2de6b06a3dea	1	Other	Other
+86a1292f-acf9-4e40-9ae3-80eb38a48713	1	Other	Other
+86a19bf2-9cb6-439d-925e-c58c8863516b	1	Other	Other
+86a1b77b-114d-48c4-98d7-874af2bd35ac	1	Other	Other
+86a1cf9a-91f9-4f62-9a7b-b51e17e37bc7	1	Other	Other
+86a1edde-d99b-4821-8b13-2961f78a0434	1	Other	Other
+86a1fcaf-e865-4ec0-bf0d-07dfa78ee7db	1	Other	Other
+86a20ee8-9c8b-4a8c-ad2f-f680375fb82f	1	Other	Other
+86a21c8e-8b40-446a-8c02-f9e74c6a10b3	1	Other	Other
+86a237b5-59ac-4ff3-845f-214ba667c129	1	Other	Other
+86a28635-d060-4e50-932b-d3d3e0498e0f	1	Other	Other
+86a28993-ef7b-48d4-81bb-2d98a4521280	1	Other	Other
+86a2b119-b813-4e25-8e4f-132b6492e0b0	1	Other	Other
+86a2d914-4608-4824-a0fc-61fe4dfd4b91	1	Other	Other
+86a30250-d6f2-42f9-8d9b-d33202628455	1	James	Other
+86a358c2-c24b-4a3a-af23-baeaf0436f53	1	Other	Other
+86a374dc-aa81-4160-b095-34806366f4ea	1	Other	Other
+86a37cf4-535e-4d6e-8901-bb878e133d7e	1	\N	Other
+86a3adeb-3e4d-4f1e-9973-f3efd4338ee3	1	Other	Other
+86a40578-de2c-4605-91cc-c822fa1a3ea7	1	Other	Other
+86a4622d-2bdb-4ca6-a66e-e78ba34ae066	1	Other	Other
+86a489ab-2a71-435f-8e46-5696c68c5d61	1	Other	Other
+86a48e05-ed9b-40cd-90a8-cdfe84a79ab3	1	Other	Other
+86a4f66b-9ea7-4b09-88ca-9fb03df2d59e	1	Other	Other
+86a509d1-63a1-451b-9406-ec4ffb879810	1	Other	Other
+86a5332c-70a0-4942-a567-e16ef8595727	1	Other	Other
+86a535a7-4bb2-4cf2-aa66-4d450fc7e9b0	1	Other	Other
+86a56192-01cb-4295-a94f-83d3a2dcb3de	1	Other	Other
+86a5727f-6084-41cc-ba00-c0af02964949	1	Other	Other
+86a5d31f-3552-4f20-a520-a6b72cd9fab3	1	Other	Other
+86a620b0-6f2a-46b4-b1e5-713d18c6e0dc	1	Other	Other
+86a62cca-cb99-45a5-9c6f-86b5d97e2346	1	\N	Other
+86a63ed7-3514-453d-9b08-19e4f029e923	1	Other	Other
+86a67cbc-bd78-487b-9918-af342af29cad	1	Other	Other
+86a682c5-35ce-4124-aa36-fb8518b69166	1	\N	Other
+86a69bcc-113b-4477-82fb-f4fd6a6695c3	1	Other	Other
+86a6dc39-7656-43e6-8509-289d19227618	1	Other	Other
+86a6dfd9-47de-40c5-9f10-d7d800bd4823	1	Other	Other
+86a6e8d6-f0e9-4cf1-8856-5a8dff61c8bc	1	Other	Other
+86a71fbe-ad12-4c8c-b684-3799168e6f3e	1	Other	Other
+86a73f42-9faa-47f6-bb19-4ad253604690	1	Other	Other
+86a7419b-9a4f-4b02-9735-108563761801	1	Other	Other
+86a752f2-d1b7-41f3-a147-7a2dafeb1713	1	Other	Other
+86a793e2-6b51-4463-9aea-9a9bb1d5d9d5	1	Other	Other
+86a7d246-7f27-41c5-ac4f-9c96030b3677	1	Other	Other
+86a7ead4-fb87-4f2c-a331-e03bb796abc7	1	James	Other
+86a7fcaf-0600-456e-aa43-d005002513b5	1	Other	Other
+86a814c7-55c8-43f5-892e-e57b32c826fc	1	James	Other
+86a82a36-f94f-424b-bff1-c572a2cf5458	1	Other	Other
+86a8c0ab-7e92-44a5-8a16-69d886d71276	1	Other	Other
+86a9319a-1fae-46f0-8117-b49bda20cbb3	1	Other	Other
+86a957ee-6dae-4e99-b8b5-23352a3505ea	1	Other	Other
+86a9b3f3-436c-4166-b46a-15023eccef32	1	Other	Other
+86a9dad9-5fb5-4b9d-9aeb-33e5937d5268	1	Other	Other
+86aa36af-1921-45b7-9311-5c0415238a7d	1	Other	Other
+86aa4c29-3fad-4fd6-9779-81a4a0d2e078	1	Other	Other
+86aaf28f-ae53-44ce-9074-24a223397483	1	Other	Other
+86ab0dcb-e954-42ba-be83-7b059a5d2498	1	Other	Other
+86ab1179-2741-4514-a1b2-d433ec172646	1	Other	Other
+86ab7826-d5c1-4097-b48f-86d98024f622	1	Other	Other
+86abb8a4-3a99-4d54-9c00-02a151ef880e	1	Other	Other
+86abc79d-69d7-4c27-a6ea-80707ccd9fd2	1	Other	Other
+86ac3933-6315-4d11-b30d-46065cf1e8ab	1	Other	Other
+86ac7bec-0665-4fcd-8ae5-663b1723b928	1	Other	Other
+86acd387-7adb-47e8-9114-5e5601602c82	1	Other	Other
+86acd98a-277b-44bc-a895-ecb6c73b8836	1	Other	Other
+86acf51b-45ee-4f22-a354-efa9167e9478	1	Other	Other
+86ad39bc-c1d7-4179-a894-9a62790c223c	1	Other	Other
+86ad4ce5-0060-4425-92e2-2d26d9aabb98	1	Other	Other
+86ad8443-5497-4d60-9af3-2c5b2ee2dcd5	1	Other	Other
+86adb327-7be2-4bfc-97ab-7b3cda9ccde8	1	Other	Other
+86add556-f775-420b-8096-bdf9ca9d89f1	1	Other	Other
+86adf39a-3854-4c44-9772-6f87740830b2	1	Other	Other
+86ae9c90-ef39-4655-92ac-509bde888600	1	Other	Other
+86af2ad8-cdb1-47f0-bbd4-1f62babbb577	1	Other	Other
+86af50c2-fc41-4129-b257-ccc4a8270ec0	1	Other	Other
+86afbd09-acc8-4b03-9df5-723b23cdee28	1	Other	Other
+86afc1a4-1da8-43e2-bc7a-37476a20b57a	1	Other	Other
+86afe577-9eab-4284-a843-8c5993c9bbf5	1	Other	Other
+86afeee2-b95d-4a2c-b90e-8c95c63735f7	1	Other	Other
+86b00bc7-7a8e-46a9-b548-c8441e32bcc9	1	Other	Other
+86b015c2-2695-40d0-9c60-2ba8b172c7f5	1	Other	Other
+86b0d6e7-5aea-4553-a817-ab21dc194d9d	1	Other	Other
+86b10e6c-1e7c-4a0e-b2d6-95fc18501bbe	1	Other	Other
+86b13eba-0007-4a2c-81ff-e06f28cab86c	1	Other	Other
+86b180a8-ffa1-41c1-ab4b-439c1cac235b	1	Other	Other
+86b1d31f-184f-4368-bbb2-cc6968493635	1	Other	Other
+86b1de9d-f1ec-45f5-b2c6-bbed475c4b96	1	Other	Other
+86b1e12c-26c4-4d7e-94d8-bccc01ece28e	1	Other	Other
+86b1ef58-ba4d-4333-8a58-517edbcc54a3	1	\N	Other
+86b22ccc-7e9d-4c40-8b5f-a54be5bf05eb	1	Other	Other
+86b23ad4-313f-451c-8788-6690b08f0feb	1	Other	Other
+86b253c6-bd07-4e66-a468-22e06848d0ac	1	Other	Other
+86b2fc33-8701-4365-aeb5-afa5ff0dd518	1	Other	Other
+86b2fe0f-49df-4fee-9004-99570f635ba6	1	Other	Other
+86b35c5d-61b7-4a64-ba1c-24b03b66fca4	1	Other	Other
+86b3603f-1ce9-4d88-bbdd-3370b2679f52	1	Other	Other
+86b379a3-3a2c-4307-ba3a-ea5505057424	1	Other	Other
+86b37e27-fa5f-4650-9db1-0e650e4b3f25	1	Other	Other
+86b39069-844a-47d4-8648-651ffa2ed494	1	Other	Other
+86b3ac07-c1d7-4026-957f-7352ed0e5287	1	Other	Other
+86b3b8cc-27c7-4cf7-af44-29475163f1ec	1	Other	Other
+86b3dafd-b44c-4955-9eac-008e2cdbb3ad	1	Other	Other
+86b423e5-cdc5-4cc4-a166-d70e54376e9c	1	Other	Other
+86b43903-7336-4a71-9419-03a2d6399ebd	1	Other	Other
+86b43d62-f824-4a5e-99d7-9d87297e9ccc	1	Other	Other
+86b4507d-849a-4dda-bff0-938da5db3b25	1	Other	Other
+86b49021-63c0-4e5b-a2aa-3c08187e1598	1	Other	Other
+86b4b1a8-eb9a-4f2f-bc0f-c10c4ab73efc	1	Other	Other
+86b5321c-71b5-4bbc-89be-313968e0aa7b	1	Other	Other
+86b563a3-07cd-4066-b614-9c39734bf83c	1	Other	Other
+86b58b82-4cdd-4c5a-a7b7-a297f0d55b04	1	Other	Other
+86b59875-8e08-4f66-b3ad-bff657304157	1	Other	Other
+86b59bf8-0157-4610-9c2e-53c100ed01e5	1	\N	Other
+86b5b168-f6b4-440d-8d08-065ff6977afa	1	Other	Other
+86b5e32e-af47-426c-9f11-543e46121441	1	Other	Other
+86b66c18-1147-41a9-a847-0a5e5d597465	1	Other	Other
+86b69a51-7d2c-4894-86c7-4269376e3026	1	Other	Other
+86b6a4ac-07ac-447a-85fd-da49f6cc434f	1	Other	Other
+86b6b992-0f67-4c06-9d45-211d9bd05edf	1	Other	Other
+86b6c013-5d1e-4699-af9c-6b476cc4e1be	1	Other	Other
+86b6c593-8c93-40b2-8b87-97285a49ff29	1	Other	Other
+86b6ee0f-8988-46c8-a3b5-9ab321aa8c85	1	Other	Other
+86b7b264-409e-4e79-899d-2f94aeb893ed	1	\N	Other
+86b7bd6b-f05e-4c9e-b99b-0796ad37a530	1	Other	Other
+86b7c280-7a23-4ab6-bf26-a8c58548da6b	1	Other	Other
+86b7c9dc-ab23-4d0d-9c7e-138366419025	1	Other	Other
+86b818d7-e8c6-4655-a3be-6529ed354ea1	1	Other	Other
+86b81e6e-c5a9-4bc0-b2f1-b7f15d3d0acd	1	Other	Other
+86b8312c-9c6c-4ece-b14e-450c4c3e14f0	1	Other	Other
+86b83897-5b81-4b23-81a7-f482607f9c4d	1	Other	Other
+86b8acd8-c636-4113-9c5c-e69a9639887d	1	Other	Other
+86b8d662-a5c2-4f0b-90e0-6f69ce8aef28	1	Other	Other
+86b948e4-9d80-4497-a62a-8904835f0ede	1	Other	Other
+86b979bd-d156-4e1e-bae2-c9f0e86fe5f3	1	Other	Other
+86b99384-6f76-4519-a36b-a07ec1256063	1	\N	Other
+86b9c7d2-fdf3-496b-a89f-898c4b2760fa	1	\N	Other
+86b9d1d3-c3ba-4086-b5a4-13bdd3e47849	1	Other	Other
+86b9f4fc-a749-4356-8e8b-d99be16f2075	1	Other	Other
+86ba3189-bf43-489f-a1d7-570b9b099a1e	1	Other	Other
+86ba790f-d797-4273-adbe-7ebd946abbf6	1	\N	Other
+86baa86f-5daa-4277-a4c2-edeeadbcac95	1	Other	Other
+86baf8f7-1d35-446d-8bd8-475f088fe496	1	Other	Other
+86bb0f9d-4e5e-4bff-89a8-8484961baba8	1	Other	Other
+86bb2844-35aa-4af8-8c75-b92cc5308e4b	1	Other	Other
+86bb5198-4deb-4e6b-a315-2baeede49991	1	Other	Other
+86bb6eae-1a01-4416-8c92-8d58491dbd19	1	Other	Other
+86bb9450-02de-400f-b611-b124c8fa3f6b	1	Other	Other
+86bbd7ba-c416-4876-895b-1f1c829f9567	1	Other	Other
+86bc8b94-af44-4404-b9e0-d1b659539117	1	Other	Other
+86bd2f4d-bb3e-4d86-b172-b7ebe9d963e1	1	Other	Other
+86bdd2ae-b567-4eaf-a95e-0d51d0a51acd	1	Other	Other
+86bdf26b-8223-409a-adaf-933f3e592acd	1	Other	Other
+86be2c4c-57bb-4821-a8a4-973ec7494800	1	Other	Other
+86be3380-e7b7-4a2e-a65c-c8da6150f56e	1	Other	Other
+86be739e-88f8-49b9-9f7a-10bfac39ca93	1	Other	Other
+86beb6fd-3aca-42d8-a3c1-d661671d10c3	1	Other	Other
+86bec73c-196a-4251-99e6-de8c53c08276	1	Other	Other
+86bed4fb-0253-4113-a4a5-e9be577a2047	1	Other	Other
+86bf7828-2269-4235-a375-24ba815e3db8	1	Other	Other
+86c01cc5-a89e-4bef-84ff-4f971f4c77ff	1	Other	Other
+86c0710d-767c-46e3-8254-3bd8158b3103	1	\N	Other
+86c071f9-4fd5-45f6-8981-6b99e1567711	1	Other	Other
+86c0960b-86b8-499a-bea9-a1b2e2eea6dc	1	Other	Other
+86c0a9a7-4401-4f5c-ae6d-6a4d0185d149	1	Other	Other
+86c0b12b-d25a-4a04-aad4-bda4dae65eaa	1	Other	Other
+86c1161d-4913-4bca-a342-2039fbceaa5d	1	Other	Other
+86c12705-f603-4698-a369-f1291c241128	1	Other	Other
+86c1a01e-ccc6-4a5c-8181-267a4f0dd710	1	Other	Other
+86c1aad5-38dc-4ca4-963c-2fba1b4493ce	1	Other	Other
+86c1ae0e-7cb1-4f6e-b61c-f1bd099365e0	1	Other	Other
+86c1f18d-cd1a-404f-8e86-74384e91460c	1	Other	Other
+86c21369-c29b-47c8-9f39-09b53bc1949d	1	Other	Other
+86c2290e-9a73-41b1-b7f3-0e37290deb01	1	Other	Other
+86c2c41c-70df-4900-aa0c-a15538052e02	1	\N	Other
+86c31591-6630-4c0e-8a13-c981deedd76b	1	Other	Other
+86c32366-f44a-4a21-b75b-d6450ee54704	1	Other	Other
+86c35249-5715-4242-9a69-cdb29e241ebc	1	Other	Other
+86c390f0-f564-4329-96d6-a016e679bf65	1	Other	Other
+86c396ce-2a7e-4ae2-babb-d8a7aa511617	1	Other	Other
+86c3b095-5fb0-4ad3-a9b5-da14aa77d65e	1	Other	Other
+86c3f579-1030-4ef5-abf5-dce53c6af320	1	Other	Other
+86c3fa48-7a59-4a5e-84fd-7fca2799e2d7	1	\N	Other
+86c41c84-9dea-496d-8513-b477f2379133	1	Other	Other
+86c459e7-0216-45ff-a2dc-5dfeef26d820	1	Other	Other
+86c45ee9-d159-400f-a8d2-1b28c6d867a4	1	Other	Other
+86c47702-7196-4740-ab6f-323c03996cd9	1	Other	Other
+86c477f4-3881-4480-ba06-ba6ba0443d2b	1	Other	Other
+86c4a0a5-2464-4e7e-8c59-d5215c582114	1	Other	Other
+86c4afd0-6fec-4efd-a27b-04e421100095	1	Other	Other
+86c4e944-3562-480f-ada5-832343c049a2	1	Other	Other
+86c4ed39-b764-4234-8d5c-6d1a52100273	1	Other	Other
+86c508a4-8f48-446a-920b-db0e6a53ab9e	1	Other	Other
+86c518dc-d419-473e-b003-c1f967288d39	1	Other	Other
+86c51a62-9d56-4d5c-874b-6f83abca1c43	1	Other	Other
+86c543d1-085e-4515-a2c7-c4f182462f8f	1	Other	Other
+86c547a1-9102-4a04-a04b-7ceb9ab4e772	1	Other	Other
+86c5963d-cd4a-421c-9768-a291a6f67677	1	Other	Other
+86c5f3c6-4c53-4f17-84e9-9430504d0d44	1	Other	Other
+86c5f577-e9fb-4041-82ec-dba9b2346155	1	Other	Other
+86c62ddf-0075-4d34-98f9-968ecb9901dd	1	Other	Other
+86c67ab6-0ae2-4959-ba33-68e0ce70fbf9	1	Other	Other
+86c6c0fa-1dfa-4fca-9385-4e8f13ab7cc1	1	Other	Other
+86c6fd87-95c3-402d-bfb2-d245dd1fe4c8	1	Other	Other
+86c712cd-23a1-40ed-99b4-420ec86348ea	1	Other	Other
+86c768da-f80b-4b37-9f1b-1d513cbf2fb6	1	Other	Other
+86c78f32-8ca9-48c9-919c-6fdb6de88c49	1	Other	Other
+86c827d2-983a-4dad-8c0e-bd9a5697e4b1	1	Other	Other
+86c8970c-9a28-4d2e-92f5-f4739b26b021	1	Other	Other
+86c90b85-61a1-4b93-9174-33e4e9621840	1	Other	Other
+86c91249-edae-48ad-a47d-c890f7ba4464	1	Other	Other
+86c9541e-c1fe-454c-b3ba-7f1d0964b814	1	Other	Other
+86ca5c94-0613-4e88-aeca-95825ebdaf62	1	Other	Other
+86caa234-6068-4190-b93e-ca4c94529143	1	Other	Other
+86cabab9-accc-4712-8c93-97e7f0b5ec1d	1	Other	Other
+86cad78b-7751-4140-9333-5cb34191241d	1	Other	Other
+86cb0862-4aec-4a57-84a6-bc4656eab244	1	Other	Other
+86cb1aa6-3fda-42b8-9de8-80cdb842f230	1	Other	Other
+86cbf67c-e8a3-42a0-8fe9-4473fb80aab6	1	Other	Other
+86cc1ee8-cda3-440b-a051-c3fcfcdb2a14	1	Other	Other
+86cc4d94-90d3-4f99-ba7b-7732db01da24	1	Other	Other
+86cca2b7-5efa-452c-8679-268073f2314a	1	Other	Other
+86ccadad-2f98-4011-8263-aa95e0a1cae1	1	Other	Other
+86cd4e70-69c6-4d83-b442-2ef452b8e06e	1	Other	Other
+86cd7057-07be-4939-b5f7-59e545a9da18	1	Other	Other
+86cdea71-fa24-49a6-9fdb-2c4a58e3d2f5	1	Other	Other
+86ce8244-4f3d-4910-89c4-d08da36689d5	1	Other	Other
+86ceb224-0d28-11e8-aa7e-fa163e8624cc	1	\N	Other
+86cec92b-45d5-4442-9803-83ff38cf6608	1	Other	Other
+86cececc-a3c7-4281-93d0-867ea61456ab	1	Other	Other
+86ced24c-260b-4b0a-8104-a6ffb63ec89d	1	Other	Other
+86ced2ad-86bc-4002-84b0-498abbc37391	1	Other	Other
+86ced3bc-cbaa-48ad-8e67-5cf3adf7ac9d	1	Other	Other
+86cedff2-b774-42dd-9952-bfadaf55d7bd	1	Other	Other
+86cee626-400b-43ce-87c6-619e2fbed36c	1	Other	Other
+86cee62b-c20f-4ead-91eb-d7a2c024349b	1	Other	Other
+86cefbf5-82d6-4b65-87fc-6a2b08889ce4	1	Other	Other
+86cf2117-eadc-4ea3-91d9-b6d8f1e5492e	1	Other	Other
+86cf3e41-7939-4d7c-b992-53873cc40cc3	1	Other	Other
+86cfcca7-56b8-4cb6-aed0-3811d4850c32	1	Other	Other
+86d0275f-798a-4042-8900-f6be6c4b4d09	1	Other	Other
+86d02b54-c814-4693-a5e1-7c47152a0693	1	Other	Other
+86d05964-61ea-493e-9a6b-64b3d0de789e	1	Other	Other
+86d08f76-37bd-409a-90b1-4bb1f608e7e7	1	Other	Other
+86d094ad-f417-48fe-9176-08660f93ad58	1	Other	Other
+86d0bce3-49c0-4234-abca-dacb534b6ea1	1	Other	Other
+86d0c04e-b051-45cb-bb9f-a1f39eb2426d	1	Other	Other
+86d0c93a-21b1-41fa-832e-09d976d8c05e	1	\N	Other
+86d1341b-7d6d-473e-9ccd-992ea8319de8	1	Other	Other
+86d13538-e1dd-402f-b240-16081459319b	1	Other	Other
+86d1507d-d6b7-471b-8507-c7673c425b1c	1	Other	Other
+86d1662b-6148-4ccd-87cd-809406059891	1	James	Other
+86d170dc-7303-4723-bef6-d60de643857a	1	Other	Other
+86d209b6-6f22-4abd-8f05-51ded6130d8b	1	Other	Other
+86d26173-1ad8-4fe8-89ab-e5524fdf8027	1	Other	Other
+86d29735-758a-4040-98f0-722c6246764f	1	Other	Other
+86d336f8-c8e2-4ceb-9a18-02af07594702	1	Other	Other
+86d35a07-6b27-411b-9697-8f1e1df53e89	1	Other	Other
+86d361f2-4ae9-4245-9b13-71f5a0331bde	1	Other	Other
+86d3e162-e7af-4b60-977e-292450b5cc69	1	Other	Other
+86d42e8f-c392-4d62-8889-c556707ef0f9	1	Other	Other
+86d49b56-8765-4cd9-832b-d1726e8382b4	1	Other	Other
+86d4be93-e5a8-4ac2-ba2f-beafc9874973	1	Other	Other
+86d4e14c-810b-48b5-b69c-8959e8c39d78	1	Other	Other
+86d50649-ca2d-45f9-a7f6-2e8ef1e13ce2	1	Other	Other
+86d50e22-ab09-41ae-8103-5bbc6cb9314b	1	Other	Other
+86d51125-7127-4f58-8747-cd04d62b82eb	1	Other	Other
+86d51bb4-ca47-4b8d-ba60-efd97b0ec954	1	Other	Other
+86d56280-374f-45fb-9130-34aca30eef08	1	Other	Other
+86d58565-abd3-4d1a-b578-5a1046f7d600	1	\N	Other
+86d58c11-c0ed-4468-b404-d3cae787cf24	1	Other	Other
+86d58ce6-b760-4620-aa72-c1bea2b1533a	1	Other	Other
+86d59625-14f9-4cfe-84e1-abb945ab85c6	1	Other	Other
+86d59a20-2ea3-11e8-82c1-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+86d5c4af-e4d2-41c5-b86d-12b03b935baf	1	Other	Other
+86d5d834-4a97-45cf-8dff-a7dabcf5fd66	1	Other	Other
+86d5dd76-1ca7-4c34-91e8-da4590b5ad6a	1	Other	Other
+86d600cb-3dc3-45e6-a749-42df66ff3f5e	1	Other	Other
+86d64f2b-11fd-4d6f-93fc-9d1aa8beb5ed	1	James	Other
+86d6bccb-9be6-48af-b7d2-48f03d9427a5	1	Other	Other
+86d6d563-4cee-4af0-b76b-2669c2aee27b	1	Other	Other
+86d71981-fba4-49c6-a284-6720c7433ee3	1	Other	Other
+86d72865-1d33-4e36-b14e-0760a9d86945	1	Other	Other
+86d75f23-ec9a-45be-8ae8-856456d3d952	1	\N	Other
+86d79038-ac05-48da-9a53-67aea2b2cf13	1	Other	Other
+86d7bbe0-691d-4ffb-8987-ccfe0f90e2d3	1	Other	Other
+86d7ff56-7dd9-469b-b5d5-06dc3052518a	1	Other	Other
+86d89d43-1015-49ca-8ea2-95c626c0194c	1	Other	Other
+86d8c2ff-2b67-45ab-b29f-e775858afd5f	1	Other	Other
+86d9418d-59bd-47b1-b696-edd8d076a53b	1	Other	Other
+86d945e6-bf10-47d4-8f87-2b23cc7e5f10	1	Other	Other
+86d94683-6fdd-496d-b7ba-c02462004234	1	Other	Other
+86d966f6-e8a2-4d3a-bb90-c44f31b845e7	1	\N	Other
+86d96f90-2316-4dd5-b127-457ce348ac19	1	Other	Other
+86da1a28-7c3c-438c-b79b-7bd5ba801c7c	1	Other	Other
+86da1fb5-16c0-44ba-a6d9-6ddd9b8f7547	1	Other	Other
+86da4c17-140e-4ef0-8ad0-36c31f7704cb	1	Other	Other
+86da9243-53b2-40cd-9cf3-bde6fdd63800	1	\N	Other
+86da9a67-ac3f-4d71-b8bd-44f16a57ed1c	1	Other	Other
+86dab519-e360-4da0-9f19-5b6e4e391cbc	1	Other	Other
+86dabda8-2027-440c-aadb-620c4e13d822	1	Other	Other
+86db2e0a-0943-419c-992f-b25ed3c5478e	1	Other	Other
+86db7226-acfc-4c39-b219-1dd489c22020	1	Other	Other
+86db99a7-d227-4d60-8ea9-84f369acc314	1	Other	Other
+86dbc436-7394-4428-b02c-b9da4f502c8d	1	Other	Other
+86dbef1c-f37f-41b2-a0d5-33df2410dda1	1	Other	Other
+86dc150f-0a5f-49c3-a6b6-c4cf46b663f7	1	Other	Other
+86dc88df-3253-4bb6-9db7-5350da50c756	1	Other	Other
+86dca702-d7e6-4648-ab1c-fef8ed562864	1	Other	Other
+86dcc520-9765-461f-baaa-159f9df5c0b0	1	Other	Other
+86dcc6b7-75e0-46f9-9aac-34da06ea0b55	1	Other	Other
+86dd5c97-28be-46a1-a0aa-ef14af42d07c	1	Other	Other
+86dd5d79-40d9-44c7-93f8-b59075c9f884	1	Other	Other
+86dd7bc4-97a5-4f44-ae7a-6af617e80f1f	1	Other	Other
+86dd912d-0c71-482a-97b0-25084244bb30	1	Other	Other
+86dd934d-132b-4300-a0c5-b408dc3b8ffd	1	Other	Other
+86ddadcc-bcdf-45fd-944e-ffb6f908ceb3	1	Other	Other
+86ddc94b-aae9-41eb-8d73-97ee7b5f6023	1	Other	Other
+86ddd5cf-1f75-46fe-a184-ca1d7d1ac417	1	Other	Other
+86de78fa-cd18-4007-92ab-d71ee1a8928d	1	Other	Other
+86de8fd1-bcb3-4625-8d6f-64ad25af80f8	1	Other	Other
+86df0714-6b33-40fe-bd6e-a24a89682fd1	1	Other	Other
+86df8681-e58b-4703-a225-f1141fea9d7f	1	Other	Other
+86df9a58-9f6e-4229-b0df-5c59250082b6	1	Other	Other
+86dfabfb-1c8f-4c02-a856-00f9ef65acbd	1	Other	Other
+86dff9fd-fd37-4b8f-ac77-846b4b75838f	1	Other	Other
+86e030be-db6e-4e06-bdf7-0f3d3a4bc3f0	1	Other	Other
+86e0788e-156f-4c7b-808b-4933f75f3825	1	Other	Other
+86e08e3d-4769-4f8a-8495-e9e78a8a251e	1	Other	Other
+86e0cb3c-d345-40d5-8816-f2aa9f3f1a21	1	Other	Other
+86e0f77f-1437-45e1-8411-6fa9b0cb8963	1	Other	Other
+86e1807b-33c0-41c4-8e5a-827c577118f8	1	Other	Other
+86e195f8-2c51-42d8-b597-9d14ceb9013a	1	Other	Other
+86e1a72f-802f-43ef-a641-ebc38ed1a51a	1	Other	Other
+86e1f7f4-f7b1-494d-bf0f-f03531b8163a	1	Other	Other
+86e20b38-4e95-4be5-b6bf-644bb27810f0	1	Other	Other
+86e21a10-565f-47ca-b72a-1f6267f2b495	1	Other	Other
+86e22b7e-3fb2-43d4-9687-6ff71ac2889c	1	Other	Other
+86e26493-6ecc-4523-8fd1-d401fa5d2860	1	Other	Other
+86e26edd-312f-405b-adc3-93f75d6fc137	1	Other	Other
+86e2958c-96de-48b4-9d19-2989a980bf4a	1	Other	Other
+86e37183-5db0-4209-81ce-bbea1dee4e54	1	Other	Other
+86e37670-9777-408b-9fee-ae47a6e267ae	1	Other	Other
+86e382c1-e169-4f4f-9a92-a20415ef635f	1	Other	Other
+86e3841a-b486-4fcc-befa-82958c97b223	1	Other	Other
+86e3d7e5-dff1-48f5-af85-0db6b045fc6b	1	Other	Other
+86e46335-9e4a-4848-a645-53df294efe64	1	Other	Other
+86e57c4d-8d59-4637-99af-250e4bf76fb1	1	Other	Other
+86e62b66-8efc-49b4-bca0-c2df8f72bc10	1	Other	Other
+86e64215-be35-4c73-818c-e9e481a8d6c0	1	Other	Other
+86e688e6-a26a-4bd1-8e1f-a76e885b093a	1	Other	Other
+86e691fc-6dcf-41d6-9a89-3cee371226ed	1	Other	Other
+86e69fe4-f564-4012-a7fa-fb65d20cfee6	1	Other	Other
+86e6d93f-f076-408a-8eb3-edfbd0a330d3	1	Other	Other
+86e6dda7-9fe3-4d37-93dc-fa40cc66c9dc	1	Other	Other
+86e6e216-aa4f-4ca0-8eda-d86397da6aa2	1	Other	Other
+86e6fe0d-1a64-4eb8-864b-9dd8395f28ca	1	Other	Other
+86e7084f-b6d4-43a3-bed2-6f387f25a89f	1	Other	Other
+86e71285-5f74-455d-be3d-ea7ce7fb289d	1	Other	Other
+86e71daa-2ee8-4d5f-b3f0-0bad73a7c6db	1	Other	Other
+86e7280b-b8d2-410e-a306-d24123f4e96b	1	Other	Other
+86e72b0a-a5d0-4ad6-9ccd-8b6b76eb28bb	1	James	Other
+86e74b18-de3a-47f1-a23f-a8f51d7bea52	1	Other	Other
+86e75d2d-0df7-4cf5-9b6b-bf486952230d	1	Other	Other
+86e7606d-5e09-4bd0-be81-ddd0862f8d29	1	Other	Other
+86e7805b-227b-4d4b-84c3-d2b0543e32e5	1	Other	Other
+86e78630-1e60-4c28-9955-5af44c17bb93	1	Other	Other
+86e78aa9-d7c2-49d0-a98a-6e6e832576bb	1	Other	Other
+86e7b139-fcd5-4d87-b8b6-063966db24f9	1	Other	Other
+86e7b734-cfa8-4702-bc2d-44cab401355e	1	Other	Other
+86e7f863-449d-4a7c-844f-c9f21575dcb2	1	Other	Other
+86e824c1-e40f-4879-8d89-5ecc8512d6e7	1	Other	Other
+86e88e4b-4c46-48d9-91c4-d8fd54dbab97	1	Other	Other
+86e8bb63-3ac0-43f8-bf63-c129d60c59ed	1	\N	Other
+86e8e43f-9b7c-49d2-8cb1-fff5af07cabd	1	Other	Other
+86e8f938-224c-4d45-a4a9-dee0b8ad3217	1	Other	Other
+86e905f1-4351-4442-b27a-c58674ecf0b1	1	Other	Other
+86e973a5-9280-4f5f-8860-8eb1d0a50ef7	1	\N	Other
+86e986ba-3a2f-48ab-bfc0-e51a56b22ff6	1	Other	Other
+86e995ab-e506-43d3-8fd6-d5bebe3047df	1	Other	Other
+86e99bc6-5558-405a-b935-1dd00890fa68	1	Other	Other
+86e9ad92-aab3-45fc-b57a-16b8f7988ed4	1	Other	Other
+86e9da11-63b4-4af9-8309-5575a70847f3	1	Other	Other
+86e9f5a4-2fc0-41c5-8fa0-8d7df62dc2a0	1	Other	Other
+86ea344c-d1df-4b4f-b5c2-560d4541f6dc	1	Other	Other
+86ea35c6-aeca-4bf8-8260-d70460ded598	1	Other	Other
+86ea3b9f-1d49-43a3-b669-298d9dae3c29	1	Other	Other
+86ea47bb-0960-4a77-940a-9bc7b2300381	1	Other	Other
+86eb06fe-aa00-4573-9778-c2515e64293e	1	Other	Other
+86eb1f61-e51f-499c-a0b4-dc1b197c951b	1	Other	Other
+86eb5898-b10b-4da8-91e2-e2e6e31e293f	1	Other	Other
+86eb84fe-8789-44a0-8d18-e4305f3d0434	1	Other	Other
+86ebac7e-0f9e-49bb-9217-179aa50013f0	1	Other	Other
+86ec0092-cc56-4407-9608-64f014a59523	1	Other	Other
+86ec58c3-46a1-4a0b-bb01-ed036fbdfcad	1	Other	Other
+86eca9c5-30d7-4a3c-8825-e8fb9e82c95f	1	Other	Other
+86ecb1ee-955c-4736-80d2-6d3bb85737fa	1	Other	Other
+86ecce7c-f265-42e0-be2e-58a6ebfd25b6	1	Other	Other
+86ecd1f6-237f-4153-8d38-94eb640c099b	1	Other	Other
+86ece003-3b66-4c56-93de-af892863fdf4	1	Other	Other
+86ed209f-40ca-4732-b9f1-e376c5438121	1	Other	Other
+86ed4e79-ab7b-4836-8b63-4fcfe99dcaff	1	Other	Other
+86ed5598-0380-4bba-be46-4057564e626a	1	Other	Other
+86ed67fc-5558-42ce-9fd4-e19314603b76	1	\N	Other
+86eda5eb-4c85-49b2-a551-6b17e5adde23	1	Other	Other
+86ee14ec-dc06-417e-9745-6876c4342800	1	Other	Other
+86ee1edc-2195-4dfa-8f96-8a7e78d905fb	1	Other	Other
+86ee3bdd-e5ee-4668-9757-a5febf12215d	1	Other	Other
+86ee4855-f846-4832-9b5d-cfadd81df315	1	Other	Other
+86eead40-720e-41e5-a9a3-4a60b8a81939	1	Other	Other
+86eebf6f-c01f-4d7f-9fca-1fb4a5b9b4ea	1	Other	Other
+86eed05e-8b77-40c2-802f-157977c44d30	1	Other	Other
+86eef816-9895-4007-b138-abfef445b271	1	Other	Other
+86efa534-70b3-4dd4-bd43-5871385d1e31	1	Other	Other
+86efc2ea-66a0-4cb3-bea7-b8002ac0f5d0	1	Other	Other
+86efc63e-40ad-4f8f-a462-c8548f6c6dd8	1	Other	Other
+86efea44-4b30-40c5-b0a7-d12d0c541069	1	Other	Other
+86f0065e-1ad0-4068-9403-28b9efe27b5e	1	Other	Other
+86f041db-b301-4cb8-aecf-dcfdfb1d6bec	1	Other	Other
+86f0aaac-0838-40ad-9ce8-638f40bbea62	1	Other	Other
+86f0b1cd-596e-4325-9cf4-daa5de306e75	1	Other	Other
+86f0d536-632b-419e-8d35-74a1c19d0fa1	1	Other	Other
+86f0e9b4-aa9e-46d7-83f0-112a69dc3d86	1	Other	Other
+86f11d5c-49d6-49cf-accf-214dc197a7b4	1	Other	Other
+86f12b48-09a4-4202-a97a-e00f13d5d78d	1	Other	Other
+86f164cc-c3e4-437c-947c-9b91773e8c2f	1	Other	Other
+86f1efef-ea91-42c3-9fbd-b93bac006e66	1	Other	Other
+86f1f4ee-1433-46bb-a6d2-74855a617f8d	1	Other	Other
+86f1fc1d-2acd-4aa2-abfd-1deaeb6cde3f	1	Other	Other
+86f20857-daeb-44cc-913b-f8e55ddd7940	1	Other	Other
+86f2179a-b64c-4e7a-ac43-ef17f473e9db	1	Other	Other
+86f2327a-b8b9-4ef7-8534-47c4af2d9520	1	Other	Other
+86f23a01-9eaf-4c46-8fc8-60662110e5c3	1	Other	Other
+86f29650-d37d-4843-9018-17b895d0d520	1	Other	Other
+86f321e8-7a8d-46c3-b7e0-68686f982d56	1	Other	Other
+86f3326c-940e-4e06-a02c-44a3e3a345ae	1	James	Other
+86f33b1d-dd21-434d-8b44-5a7f0b203fd8	1	Other	Other
+86f34494-5bb4-492b-972d-797850486cd4	1	Other	Other
+86f35f47-6b74-4093-af43-8691e8464697	1	Other	Other
+86f37545-23b2-451f-afe9-b1eb9204fcd4	1	Other	Other
+86f37ba3-2dcf-413f-ae75-0d3b3be17309	1	Other	Other
+86f3a714-d9c3-497e-927e-abb75031ad10	1	Other	Other
+86f41983-623b-4b01-8e9a-1a047e7c6e67	1	Other	Other
+86f44f42-3dc6-43e5-8e2d-3823143b5992	1	Other	Other
+86f45caf-3b67-4410-abca-361106de2461	1	Other	Other
+86f4674e-09ce-4eb9-b0cb-6be5c08b1fa9	1	Other	Other
+86f4a93a-e2f2-4835-8896-ca58fe68bdec	1	Other	Other
+86f4b9df-ec94-432c-b213-c11250fe46c7	1	Other	Other
+86f4d78d-cd31-4e3e-a31f-14339dd99112	1	Other	Other
+86f4da31-c14d-4089-a059-01a09d7b6a42	1	Other	Other
+86f4e04e-1b1b-4770-91aa-91aa3a8dc158	1	Other	Other
+86f4f1e1-f00c-43fe-9c08-8b3a50ae70c8	1	Other	Other
+86f5312c-e7a5-4128-ba4d-a51a095ef40d	1	Other	Other
+86f57080-a2c0-41b9-a6eb-5da66152e369	1	Other	Other
+86f57a07-6d14-4cc3-8b7d-0f19181a0c33	1	Other	Other
+86f5ca26-0ebf-4e75-b2b8-389aebfe6b36	1	Other	Other
+86f60967-4fc7-40c1-b9ce-d56e42e1255b	1	Other	Other
+86f61039-2cd4-4a74-84f7-0c1094195269	1	Other	Other
+86f651ad-11bc-48a0-9840-8410cbc132ed	1	Other	Other
+86f66ab5-79fb-4972-9eeb-fcc478bf2831	1	Other	Other
+86f74560-1d65-4c0a-9473-b1ae4df4ef24	1	Other	Other
+86f79806-18df-4595-b8b7-e2ba0ee88431	1	Other	Other
+86f7a6ea-0a96-478f-b023-0bc84abe0d76	1	Other	Other
+86f7a9a0-d841-483f-b09d-db133d7bfd20	1	Other	Other
+86f7c3ed-dfb2-40fe-b14d-12ce03311510	1	Other	Other
+86f7eaf2-ed94-4331-8a13-69dc0d8320f9	1	Other	Other
+86f7ee33-ac31-471f-b335-e1cbd89e7112	1	Other	Other
+86f82382-1b12-4412-b550-213608ac504f	1	Other	Other
+86f89771-53db-4870-82f8-bf5e77ad108e	1	Other	Other
+86f8cd20-9837-4684-b3b1-57a3880221fb	1	Other	Other
+86f8e8b7-a709-42df-b894-8db248d8c82c	1	Other	Other
+86f8f737-6370-4afa-82c8-765927bd1e53	1	Other	Other
+86f9117a-0c42-482a-83bc-0cd4a173a2ec	1	Other	Other
+86f928eb-790c-49c8-b785-a324ac3bd2a3	1	Other	Other
+86f94dd7-7845-489b-ae67-91c4e821bffd	1	Other	Other
+86f95005-06e9-4621-8b0d-96906d2acaa4	1	Other	Other
+86f96d57-2f4a-4b28-bb4d-267c076dbf2f	1	Other	Other
+86f99f04-85de-44c3-b565-a7aa6e28c88c	1	Other	Other
+86f9cb6d-8165-4478-b601-d09da62d8be3	1	Other	Other
+86fb0524-2e84-4755-ad94-e7623a3f7ec5	1	Other	Other
+86fb1083-52bd-4e70-8c05-3505832e5cc2	1	Other	Other
+86fb3de6-3ae3-4c1d-b6f7-74e6d69caf8b	1	Other	Other
+86fb5d5b-ae4e-42c4-aab9-0c4ada3a9e16	1	Other	Other
+86fbb477-192b-4146-87b3-e54b7d618668	1	Other	Other
+86fbd023-0219-427e-93df-2422c1315b12	1	Other	Other
+86fbf27f-92c4-462e-8eec-7ef477c9b85e	1	\N	Other
+86fc0a2b-146f-4ffe-8920-336b60fc840e	1	Other	Other
+86fc7bd3-9278-4ce3-a1ec-ad63bbc3b741	1	Other	Other
+86fca95c-4ce1-4206-84dd-4f5ed73d436b	1	James	Other
+86fcc136-67c9-470a-8395-c9b324c880e2	1	Other	Other
+86fcf6c2-dbc2-4e3b-810d-440d668b4898	1	Other	Other
+86fd07e7-aa77-49ec-93d2-83ca045a571e	1	\N	Other
+86fd619e-8e66-44c5-8b37-da7b12e3328d	1	Other	Other
+86fd628c-1ac7-4128-8397-51120dc312b9	1	Other	Other
+86fd71da-e940-4edd-b8be-b33e8b45230b	1	Other	Other
+86fdd521-1c40-4d27-b030-40e6ab6ce71a	1	Other	Other
+86fe3273-4316-4ed1-a68b-ae5b7136638c	1	Other	Other
+86fe4732-da42-4f94-abf2-84d8accf51f4	1	\N	Other
+86fe7c2a-f992-4d85-a77e-832aeda1e3c8	1	Other	Other
+86fe895e-7f65-489d-8401-49b2cd57d1eb	1	Other	Other
+86fe9959-dc7f-4ab5-8161-00fe9e33231c	1	Other	Other
+86fe9f75-8064-4a50-9a91-b9122b33899f	1	Other	Other
+86fefdad-8071-4cb7-a875-f359b3323a7f	1	Other	Other
+86ff51dc-849d-4c19-8e10-c1aae1f01747	1	Other	Other
+86ff72d7-8c2f-49e0-a096-c8ea1a7444c4	1	Other	Other
+86ffdf4f-a4e3-4ad3-bea9-a9971f847e9a	1	Other	Other
+87005109-a427-4517-9c41-20f6f537f982	1	Other	Other
+87006acb-8695-440f-a433-59985282c1cc	1	Other	Other
+8700b488-0a24-42a4-af3b-d4b394f1c67b	1	James	Other
+8700d931-8b64-4a45-bf47-4ba223586531	1	Other	Other
+8700e157-28cc-4689-8bd5-0ba690824de0	1	Other	Other
+8700f236-77f6-4bf7-bc44-be4a4128be4f	1	Other	Other
+8700f719-a1d9-436e-9249-6ec912533e8a	1	Other	Other
+87010888-8261-49b3-8abe-87f6d8123753	1	Other	Other
+870160d3-f609-431b-979e-61009de10e34	1	Other	Other
+8701819b-1454-4e25-aaf2-3a9bc2d8b141	1	Other	Other
+8701a223-4da3-4493-a1a1-a83d8d4c1642	1	Other	Other
+87020781-d757-4e6f-b555-5cd210f02523	1	Other	Other
+87026ed2-9890-4e6a-85ae-93e8cabd1afd	1	Other	Other
+87027c19-d87c-481a-bafe-ff20dd9820fe	1	Other	Other
+8702c36c-0ff8-4b97-b53a-370a37077967	1	Other	Other
+870338c8-1cd3-4b16-8f31-76b89f0cf44f	1	Other	Other
+8703651a-f850-4ccd-996c-fd81f64e7ee4	1	Other	Other
+8703938e-e098-4013-be4f-9150c6370b59	1	Other	Other
+8703b79d-db51-4160-a072-18ae1207c226	1	James	Other
+8703ead5-d081-4edd-967f-45bea3a69dca	1	Other	Other
+87041506-09b0-4346-87ad-d954f5150d15	1	Other	Other
+87042372-05df-4271-9968-09cd8b6afa47	1	Other	Other
+87042a57-d4cb-43a5-9ef7-c5de2a31aadd	1	\N	Other
+87042e87-5b95-4a6e-a95c-1147a5d759c1	1	Other	Other
+87043fdb-e0dd-4cdd-8473-ca00ba7d5830	1	Other	Other
+87045e66-a389-407b-b9d1-0736f0454bfd	1	Other	Other
+87049500-e768-40cf-92be-b88c6916c0ef	1	\N	Other
+8704a3a4-fa66-4362-af8d-1428ef610a13	1	Other	Other
+870513d4-692a-4c56-a375-971172a6daa1	1	Other	Other
+87051c36-776d-4421-b8d2-d415c0c68717	1	Other	Other
+87052aee-804b-47a3-9ad7-44a2ad479c82	1	Other	Other
+8705411d-722d-4d3e-8091-9403dde3ff7f	1	Other	Other
+87054f2d-f5db-4d06-8c89-dc50c21a18ba	1	Other	Other
+8705fa72-d633-4f5c-8c23-927a779c40e2	1	Other	Other
+87067688-6140-4875-aea5-12baf051d06b	1	Other	Other
+8706ad6f-386f-4bd3-95e3-dcf382ecfd28	1	Other	Other
+8706af42-9288-40dd-ba62-020aa668ca79	1	Other	Other
+87078999-4590-4fed-b9cf-5ccf291ff859	1	Other	Other
+870796f5-6c9d-41ec-8bcc-70ace289ae9f	1	Other	Other
+8707a0d3-9125-4e78-9249-1262da751f87	1	Other	Other
+8707aa50-6a43-4110-be6b-9fc3cf078fed	1	Other	Other
+87080e81-88df-4ce0-8224-7107105717bb	1	Other	Other
+87081063-1b52-4cec-9650-792ae24b30c2	1	Other	Other
+87088862-de18-47b1-9dc4-aa251eb894b3	1	Other	Other
+8708d5fe-53fe-4588-bc57-2f943ffeebdf	1	Other	Other
+87091e54-d9f4-42e4-8b2e-2bc6568834b2	1	Other	Other
+87091ee3-bda8-4203-b5f1-87564557c4c8	1	Other	Other
+87095d71-c220-4be1-a741-f69d6a56f269	1	Other	Other
+870960ba-f25b-480f-8c1e-6baccf5e026b	1	Other	Other
+87098927-ea7d-4912-8d6b-07b618a0d905	1	Other	Other
+8709a094-bba8-49a0-9712-c1fd604d273f	1	Other	Other
+8709d230-d141-47db-9fc6-d791e41f542d	1	Other	Other
+870a5ac0-a03c-4e1f-9cf7-f69cf4e5daba	1	Other	Other
+870a7842-0ee4-47bd-a26b-4a61abb7270f	1	Other	Other
+870af8d3-7d3d-4a75-bfcc-a335cb0f31c2	1	Other	Other
+870b0022-8ad5-4bf1-a54f-e963bc9a7f0f	1	Other	Other
+870b406b-5995-4efc-9039-3edab971e338	1	James	Other
+870b4980-9d9f-443d-9aa3-c80a35064b14	1	Other	Other
+870b60c7-a035-45a6-bf80-c037d0a1630e	1	Other	Other
+870b73b4-cb16-4b43-834e-92252235842e	1	Other	Other
+870b8c6c-9469-43c1-b10f-24058ab4d88d	1	Other	Other
+870bac7e-e5cb-4479-bf6c-7215e160a08e	1	Other	Other
+870beb4b-2211-42a8-8bb0-341ed68fcfbe	1	Other	Other
+870c05d8-675a-4c6b-b369-f204920a23ae	1	Other	Other
+870c1a90-e1d3-4cc0-9316-937adf3dd413	1	Other	Other
+870c6659-03a8-455c-b7d3-0d0911709e4f	1	Other	Other
+870ca8c0-403c-4427-b8c4-51e28c46d7cc	1	James	Other
+870cf3ac-fedf-4812-bf92-df16593030f0	1	Other	Other
+870cf67f-f7f0-408d-8c68-6ccd8285bfef	1	\N	Other
+870d370f-102d-4321-a656-f5db2f4da3dc	1	Other	Other
+870d3ce9-190f-4821-b6e1-14cf01f264ca	1	Other	Other
+870dade9-3f56-42ed-abbe-f81b93e9a0dd	1	Other	Other
+870dc217-14ab-44fa-b772-1af9d1eecf5d	1	Other	Other
+870e0f38-e474-4cab-b033-79e4d2be5d04	1	Other	Other
+870e2315-7c5a-4ea5-ba47-710fc379153a	1	\N	Other
+870e3f62-d1c2-47de-9187-c4209bf4cff1	1	Other	Other
+870e5707-2b81-4d06-8adc-518ff5d35d99	1	Other	Other
+870e71cb-b977-4531-8e30-285666ee3084	1	Other	Other
+870e7d7c-681a-4969-8c53-4d43a00605eb	1	Other	Other
+870ea7b5-900d-46aa-95f0-3bbdc833582f	1	Other	Other
+870eb909-d3aa-4361-940b-42117f46df66	1	Other	Other
+870ef29d-6736-49e4-a293-c78ecb573893	1	Other	Other
+870f2c6d-b7e3-4e5b-bfbe-743b781497fe	1	Other	Other
+870f3279-6860-41b1-be81-cb419f954d41	1	Other	Other
+870f574e-76f6-4aea-8b77-c91c3d5f447a	1	Other	Other
+870f5a28-5b44-42e9-9b36-1e28c4457d8f	1	Other	Other
+870f60ec-7819-4129-ae4c-8a5e098454ea	1	Other	Other
+870fa723-99ff-4025-822a-059108bba705	1	Other	Other
+870fbbbd-714b-4955-8122-b4765e3676cf	1	Other	Other
+870fcd1b-c1ab-4b1f-8ec3-04c498588a15	1	Other	Other
+870fec0c-b627-467e-b26e-51fac21199f4	1	Other	Other
+8710052d-66e7-49d3-9a27-5b1c7be53b18	1	Other	Other
+87103baa-0e11-4029-8a96-26802d39d9ff	1	Other	Other
+87106498-e842-4dc6-842b-c557a3f5e3d1	1	Other	Other
+8710857d-8c7c-4350-8685-748532e08d1e	1	Other	Other
+8710a704-1460-4103-b4e5-bdb2891a21cc	1	Other	Other
+8710f5ca-0509-11e8-b5af-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8710fe6a-b2cd-4ab1-b357-552212c18f93	1	\N	Other
+87110080-81ea-40ba-bac6-ccf11835d4a7	1	James	Other
+87113591-9c6f-4227-9892-f4bbf6cf39e7	1	Other	Other
+87116d2a-4f42-4bf3-8e72-01575479eabe	1	Other	Other
+8711950c-9828-433b-92c1-d64d8f93c883	1	Other	Other
+8711e0a0-a6a7-440e-bd66-deb83583bbd1	1	Other	Other
+8711e1c8-430d-11e8-9187-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+8711eb30-d0d0-4b0d-8dbd-b132332b32af	1	Other	Other
+871252bb-452a-4aff-89fe-d90862ddb54c	1	Other	Other
+87128972-e2b0-41b7-abb3-39786fb560c0	1	Other	Other
+8712ac73-170f-4489-b925-4c32debdb7b1	1	Other	Other
+8712b7c8-4d7e-4dbd-9a02-70491bfddf17	1	James	Other
+8712ecd6-32ed-46b3-8147-7cc7aa105552	1	Other	Other
+8713188e-5480-4c14-a98c-783f9595a54b	1	Other	Other
+8713435e-1d77-4dcf-b207-9e7045c498b2	1	Other	Other
+87135c5b-5a92-4d1e-854a-56edc567e141	1	Other	Other
+871423b9-a8c2-4ca5-9ddd-546316f590ca	1	Other	Other
+87143aa7-965f-4251-9d6e-ad0c55ee2bed	1	Other	Other
+87148984-7786-4fa5-9104-e8ce74e63c65	1	Other	Other
+8714bf46-6fb8-455a-a24a-3f4f3879353f	1	James	Other
+8714bff3-6f27-4ea2-88ec-ea417036167f	1	Other	Other
+8714c18f-fe8a-4b3f-9656-8ddbdd57d50c	1	Other	Other
+8714ced2-6450-4cee-a7be-f932959a140b	1	Other	Other
+8714df2c-05c9-4029-81e4-23cedc418c70	1	Other	Other
+8714edb9-a397-4511-a6ff-08fecc7934a6	1	Other	Other
+871514ea-56ba-4b1b-b90a-561c9194cbc4	1	Other	Other
+87151e9c-bf45-4c8e-966c-4f39b35cfb1c	1	Other	Other
+8715d1bd-7f76-4366-b810-abe1856205cb	1	Other	Other
+8715d912-3c59-41a3-8d1f-40a8b577d537	1	Other	Other
+8715d9e0-fa8e-468e-9280-3c2ed177c912	1	Other	Other
+8715ddb2-2ee8-4648-942d-3fcf33cda7b9	1	Other	Other
+8715e94f-782b-40a2-9f83-9f1922e78a0e	1	Other	Other
+87166384-8746-4236-87f6-a1306b6731b9	1	\N	Other
+87166f0d-0f66-4992-8030-70c22778944c	1	Other	Other
+871698f7-6270-4a25-84bc-dddcb8865198	1	Other	Other
+8716ae0c-0ed1-4ea2-9f1f-655cdcc5ac0c	1	Other	Other
+8716deb3-c780-45a5-9357-20e6237ffcab	1	Other	Other
+8716e25d-8809-48c4-b491-2a62127d5681	1	Other	Other
+8717039b-1676-420d-89c9-17b066b518f9	1	Other	Other
+8717198e-b43b-4116-bdd8-ed95e9627b55	1	Other	Other
+87173279-34af-49bb-99c1-ecc034d6903c	1	Other	Other
+87176bb7-452a-4a11-b5bb-c1bee2f008b3	1	Other	Other
+87179965-ceca-4f6f-8b36-bd60a4a6da06	1	Other	Other
+87181ac8-cc36-4d4f-9315-bd7b51eafb0b	1	Other	Other
+871886a5-eb69-4577-a4be-eee3b118d397	1	Other	Other
+8718876b-8f10-4352-a948-3b41d20a2153	1	Other	Other
+8718cfc4-9b6c-43bd-8a3f-2101f74f4ca9	1	Other	Other
+87191088-4bf6-4ada-bca9-14c7b6ac612a	1	Other	Other
+87192d63-641b-44e9-a05c-15a4ca1826b2	1	Other	Other
+8719948c-54b8-4d77-bc86-e47de65ccb65	1	Other	Other
+8719cbb3-d051-4029-ad19-d8c178b44b86	1	Other	Other
+8719db70-a54d-459b-85d5-ee943779c382	1	Other	Other
+871a3707-8bef-431d-93bf-08a9021c5da3	1	Other	Other
+871a76fe-1a59-498a-b485-1c7ae5fb25e8	1	Other	Other
+871ae073-ef63-4774-ab37-60eef9280908	1	Other	Other
+871b1130-73df-4e0e-98b7-b2e35447a4b4	1	Other	Other
+871b14a6-baad-4fd7-86ff-2ae7bfc7d576	1	Other	Other
+871b7f43-7f3c-49b3-8eeb-7dac189f3b3f	1	Other	Other
+871bae14-c887-47f4-9016-e9b453503fff	1	Other	Other
+871bdaf7-a4fb-4329-a1a4-eec5781b8120	1	Other	Other
+871bdd9e-52fe-47fe-a2bd-3950c91a6a48	1	Other	Other
+871bde8b-f72b-4491-8685-e5d261cd5285	1	\N	Other
+871ccfe2-ad78-405a-81cf-a0b7d4087fb2	1	Other	Other
+871cd1ee-d9a3-48ba-ba1d-c2f79e6691eb	1	Other	Other
+871cf60b-3bbe-46d3-880c-56e679b89ae5	1	Other	Other
+871d1e9e-bc0f-46e4-9bcd-d0ed064428c3	1	Other	Other
+871d2e0e-2b26-45a0-9cd0-1f9b040291e6	1	Other	Other
+871d2f2f-dd5f-4edc-9159-ae64366fc33e	1	Other	Other
+871dc06f-42c9-4a9d-9342-aa29b6b227a9	1	Other	Other
+871de509-16dd-447b-89d1-a419ecbde55f	1	Other	Other
+871dea30-68a7-46ec-ac5e-c76586f7dc15	1	Other	Other
+871dfe45-7fa4-4e18-b456-efe4cc6fb041	1	Other	Other
+871e1cc1-30cf-45ae-b665-668009e4f917	1	Other	Other
+871e4157-9813-4d52-a115-baa8b48266d7	1	Other	Other
+871e8e13-0361-48a3-b83e-b29b3b6b7b7c	1	Other	Other
+871e9d27-a173-4e04-bf8e-63832fbde88d	1	Other	Other
+871ed1bc-d4e7-477b-9bb2-d1cd060ad6b4	1	Other	Other
+871ed38a-e606-4206-af98-60d4c2409109	1	Other	Other
+871eef14-110b-4010-84dc-88bbfcf0256e	1	Other	Other
+871f2113-caa5-432d-bf2f-51c69f7f1d3b	1	Other	Other
+871f68ae-c93a-4488-af5b-9f3b6620491d	1	Other	Other
+871f8bd8-1645-412f-b91f-fdc69ec178a8	1	Other	Other
+871fa32f-bd81-4918-a2b0-db4b9b54f071	1	Other	Other
+871fefc3-0ba6-4c0a-88d6-b3f3aef0d5c8	1	Other	Other
+871ff338-c4b4-42d5-ae2c-444a75b50d2a	1	Other	Other
+872019b8-5990-481a-9608-7bb798e16cfb	1	Other	Other
+87202bc7-5287-49bf-8971-f0c80f6aac13	1	Other	Other
+87203423-b7e6-46c1-b6a2-32321ebb2948	1	Other	Other
+8720418e-5601-4a7e-96e5-2427509f7611	1	Other	Other
+8720694a-1f9f-4775-88fc-355c0c1a6548	1	Other	Other
+872077ef-3673-44c4-91d4-914dafbbf738	1	Other	Other
+8720a7f4-50d1-4f00-8678-17529bd4aff9	1	Other	Other
+87212f77-1fcb-49dd-80cd-9864fb178e4e	1	Other	Other
+87219172-897d-4999-b6cf-dade1d2dbe79	1	Other	Other
+8721f0bd-0642-4f2f-aae8-70b001c22dc9	1	Other	Other
+872227ff-7718-4e04-bd9b-7bdf6db4c72d	1	Other	Other
+87224a98-0197-4e7f-bd1e-a77d7735596e	1	Other	Other
+872295f0-9ee4-407b-b2db-a1fb8dd07803	1	Other	Other
+87229d99-7538-4a25-ba00-ef033030fd1b	1	Other	Other
+8722d9fc-cab8-4ebc-8ffb-7778f7f3c2bf	1	Other	Other
+8722e477-8577-4fd1-9e23-1347cc3ce44e	1	Other	Other
+8722e783-eb20-41c1-ae85-22f2841ba05b	1	Other	Other
+872314a2-28fc-4e61-8b50-35ed62b21d09	1	Other	Other
+872339a2-08f0-45a4-9df3-1b87f92ecccb	1	Other	Other
+8723ad78-5cb1-4cd9-90b3-478227610deb	1	\N	Other
+8723dda5-6444-4f2b-9f7c-f5b053a390e5	1	\N	Other
+8723f6c0-ba4e-4011-87b6-8b66385b0806	1	Other	Other
+8724d833-5b45-4dcf-b953-66ea60201ae3	1	Other	Other
+87251a49-df12-4b4e-8fe2-470a47473df3	1	Other	Other
+872521ec-a0fa-4803-9b01-ecf48416f991	1	Other	Other
+87253b29-9b3b-4b7a-ab47-92d9189dc946	1	Other	Other
+8725682f-cd9c-4002-bbdd-535a76ef29f3	1	Other	Other
+87258208-b274-44d1-9f50-b90e6afde3ce	1	Other	Other
+872585e0-d9b0-400d-aa23-a46b383f8ba8	1	Other	Other
+87263811-e38f-4887-b303-9b1e5ef81eb0	1	Other	Other
+8726cbe9-49d9-471b-b56f-e4d5c88f5dd3	1	Other	Other
+8726d523-e6c2-4b42-87b5-25157c7f3acb	1	Other	Other
+8726f754-9aa1-4796-abd8-3d3d50518062	1	Other	Other
+87272757-1504-47b5-8af8-40ff87afd4b3	1	Other	Other
+87275741-d2ef-4be4-b0a7-78c1cd556856	1	Other	Other
+872767f7-09f8-4a25-941c-4ebb06ab0b78	1	Other	Other
+87278f16-b517-44a0-9963-0f57f2597b98	1	Other	Other
+8727ce9a-6baa-45cc-aab5-4840dbe2bf41	1	Other	Other
+87283f6f-8afe-4637-a2d5-3aa5df61ed3a	1	Other	Other
+87284a2c-f289-4f35-8966-55fcc2bd417d	1	Other	Other
+87285ca2-f124-4199-b978-bdc1ce3780a3	1	Other	Other
+87286b30-29b5-40be-ad3d-aeb2e3cbde84	1	Other	Other
+872876dd-80dd-4b67-b4bf-132c9dfe3fe5	1	Other	Other
+8728b0f2-bbd8-4319-a5fc-21a211da4fe6	1	Other	Other
+8728b60f-fe24-4c23-adf3-8c6c5e6d459c	1	Other	Other
+8728e47b-66a1-49b0-8772-f320073a977a	1	Other	Other
+8728f53b-4801-4bd8-8158-c2b897f9868f	1	Other	Other
+87292de2-2b77-4562-9b01-8c1955fcb331	1	Other	Other
+8729679a-6d4e-4a54-ab56-dbf213c3aaea	1	Other	Other
+8729699d-3ca2-4b8c-9712-85b3f4850d04	1	Other	Other
+8729a57b-038e-47cf-b839-a77564d3609f	1	Other	Other
+8729acb2-d094-4619-83dd-4c679aa0bef9	1	Other	Other
+8729c0fb-05fe-470e-845f-1013f88629ed	1	Other	Other
+8729fde2-3986-4dc7-9ddc-94d68c4e841e	1	Other	Other
+872a210e-0c8f-4772-ad88-1d331dbb42c7	1	Other	Other
+872a29a3-8528-4d49-8459-ab1703a0b5d7	1	Other	Other
+872a2fb5-0814-499d-b551-d055849cf4ef	1	Other	Other
+872a7524-3c4c-4a4a-8e81-32ce24658cf7	1	Other	Other
+872ad8e7-3772-4ca1-b614-16e0c580c455	1	Other	Other
+872b02b4-39fb-4cfa-add3-cec5536f7fd5	1	Other	Other
+872b0670-07b7-4442-996f-855560f0c461	1	Other	Other
+872b453e-9691-4a14-81fd-4dfcad40d3c2	1	Other	Other
+872b6628-4a84-428e-81e4-46514ab8dcc4	1	Other	Other
+872b8e02-49e6-43c4-9686-8fd438d0a150	1	Other	Other
+872bd829-bcec-4b72-bb5d-702acc57cd3e	1	Other	Other
+872be2aa-33c0-414e-97ba-7bc5cf232d9e	1	Other	Other
+872bfdc8-edee-46ff-b007-3f34d56e231b	1	Other	Other
+872c07e8-36f3-40b6-95a1-7c6d19e0f3fc	1	Other	Other
+872c2755-eb03-4cb6-8142-76eb1f78f6b4	1	Other	Other
+872c5618-3651-4455-9bc8-1489f1d7d752	1	Other	Other
+872c7052-3f23-438a-bdef-a8933a7028b9	1	Other	Other
+872c8303-82e5-4edf-b920-1204770c8882	1	Other	Other
+872c917f-5bd5-41ef-969b-4a57b5008552	1	Other	Other
+872cae3b-777b-49ae-a358-96a756277dc5	1	Other	Other
+872cc819-0205-4d99-bc4a-ede7160d93ca	1	Other	Other
+872cdd2b-c0af-4634-b390-cc923955521d	1	Other	Other
+872ce056-0f20-4350-900d-31cb65a02756	1	Other	Other
+872d1356-67f2-48df-839d-acd4947b2b19	1	Other	Other
+872d138f-7558-4113-bb19-77e8a2d961a7	1	Other	Other
+872d3b43-ee45-427f-86b3-07195470d3a7	1	Other	Other
+872d644e-960f-4a70-9a62-3dc3dcaeb7fd	1	Other	Other
+872d7a79-fe62-40b9-8e20-623b246f4286	1	Other	Other
+872d8d74-663a-434c-a6fb-e1eebac0e4a9	1	Other	Other
+872da871-6852-40ce-97f6-b0e565c5d9fc	1	Other	Other
+872dac68-ae47-4924-a599-7a81c70f624f	1	Other	Other
+872db88d-2fab-449b-96e7-5279c9254169	1	Other	Other
+872dba26-0d8a-4967-accd-7ce3ba8f8093	1	Other	Other
+872dbf45-9913-4526-b262-1bc179e085f8	1	Other	Other
+872df56a-dfb5-4081-a684-24b30327daea	1	Other	Other
+872eaf9e-b807-4f79-af32-e6cac9120b47	1	\N	Other
+872efe87-4c5f-4997-aa4c-89b4ce8b5ac8	1	Other	Other
+872f1787-7755-4761-bfe7-11000b6deb46	1	Other	Other
+872f5344-5d44-484a-a25d-2ac37f7dbda4	1	Other	Other
+872f8cea-d64f-493e-b098-961a3201a4ca	1	Other	Other
+872ff8d6-450b-41e5-a019-303d50694b77	1	Other	Other
+87300bbe-16ef-43c8-8c2b-518f6d36d540	1	Other	Other
+8730125e-321a-40aa-bc57-bb1f80deb47e	1	Other	Other
+87301723-af5b-46d2-bd0e-65ec99aa2a3c	1	Other	Other
+8730e10b-4600-4c7e-8201-db915b020d37	1	Other	Other
+87313d5b-69d7-4969-97d4-244677740830	1	Other	Other
+873152eb-a52d-4dbc-be34-48edc0769c81	1	Other	Other
+87315d0b-1b4d-4e0f-a1ae-223adc915a73	1	Other	Other
+87317c0b-a1f1-41af-b23b-208130ec69ce	1	Other	Other
+87318a04-d631-4ea9-b57e-d85ad1f4f509	1	Other	Other
+8731d630-3dac-4af1-ac3c-f7ffd2886d49	1	Other	Other
+8731f5eb-3b6e-497b-88f1-8cc05b68efbf	1	Other	Other
+873215e5-fe0b-44dd-94c2-346d53cbd445	1	Other	Other
+87321f7b-99e3-4299-a1a6-3eb8ba413257	1	Other	Other
+8732434b-8d78-4f33-9228-261495ee03dc	1	Other	Other
+87326ef9-2710-448c-8f65-8c6d4ed43302	1	Other	Other
+87329592-1415-4021-bb7c-59a593267fea	1	Other	Other
+8732a59e-5e4e-463d-b85d-61c583e00927	1	Other	Other
+8732ad14-1956-4807-82f9-58d143e4450c	1	Other	Other
+8732b892-1b4e-4c77-8b27-877c81322c25	1	Other	Other
+8732d8f4-dcdf-42af-b02c-abb83b6ba1df	1	Other	Other
+8732e4fc-35df-4abd-aa4a-49896b63d610	1	Other	Other
+8732fae7-6672-4cb0-af82-117e7a582dfc	1	Other	Other
+87330a58-5563-4f31-9834-c1904f5e6f36	1	Other	Other
+87333a6b-e7db-4c83-af4b-ea593c45a28f	1	Other	Other
+8733923a-4f12-4c12-beda-cb80050a8599	1	Other	Other
+8733a4c1-bd48-4199-892a-f65235558fdd	1	Other	Other
+87340da4-eb45-4a43-8f17-1b60ce37a0f3	1	Other	Other
+87342cab-6845-4b18-8387-1a32af617d24	1	Other	Other
+8734436e-1c00-42eb-83c3-23776eee933e	1	Other	Other
+87347df5-56e8-4b29-a8b6-f9d2607a0795	1	Other	Other
+87348df8-42a4-492d-ad64-711086bbe2cd	1	Other	Other
+8734a653-99f7-422f-8612-6d5c8b739057	1	Other	Other
+8734b50a-cefc-4428-8252-bd34818f957c	1	Other	Other
+8734b6d8-5721-4614-93af-37b9d6311efd	1	Other	Other
+87350d4b-fe57-4a42-9123-d0c369184e84	1	Other	Other
+87358ae5-1e7c-4118-9c1b-60a416bec0ca	1	Other	Other
+8735a776-2a0d-47bd-9953-ea6060998fb3	1	Other	Other
+8735c6a0-a1d7-4228-a66d-81208ed0519a	1	Other	Other
+873600d6-ac5f-4ecd-9527-47d033b3e02e	1	\N	Other
+8736030d-3956-41f8-b11a-375721eaf9c0	1	Other	Other
+87368114-f7b6-4e4b-ad9a-27ff61eef9c0	1	James	Other
+8736cf64-09bf-413e-9bcb-1faefa3720bf	1	Other	Other
+8736df19-e09d-4c95-bffb-eca06f7381c0	1	Other	Other
+8736edac-f569-4179-9ecf-f29fe90a4dfb	1	Other	Other
+8736f203-e3f9-4eaa-95d5-bee547c192b4	1	Other	Other
+873733f0-b4e7-4137-be84-38702c833e2e	1	Other	Other
+873752b4-d3e3-45b7-9e86-63657fd28641	1	Other	Other
+87379152-e52a-49a4-9bac-7905f4f5250d	1	Other	Other
+87379fc1-28dd-4b14-b60c-bd10ab7745ce	1	Other	Other
+873823bf-95d9-4eb4-bd26-c9cfcbcfbd80	1	Other	Other
+873857aa-e3d9-4a9a-bd65-14bac8d929a6	1	Other	Other
+87388c69-3fa0-4fc9-b4b0-523ad8a1674d	1	Other	Other
+8739232a-ea19-4f86-a057-54538a65e3ea	1	Other	Other
+873959a7-b7ae-400d-a6b1-a9512c125bb2	1	Other	Other
+8739965c-b721-4216-bca8-8c25e74eac70	1	Other	Other
+8739d4d1-2184-4ac2-97a1-1520cac447b5	1	Other	Other
+8739d8d7-c76c-4411-bac4-ab8ad2d09263	1	Other	Other
+873a07db-84be-49b3-b1de-391b6a87c1b7	1	Other	Other
+873a7949-3c19-4143-a37d-a995f185ab92	1	Other	Other
+873a86d2-c3e8-4710-8f9f-a9f0f6929292	1	Other	Other
+873ac6be-8283-4df5-95b0-63bfe02a424e	1	Other	Other
+873ad92c-4387-468f-b571-47784a4f50ad	1	Other	Other
+873af979-5b03-4541-a68b-84ce315e3ebd	1	Other	Other
+873b1ff8-551e-4d96-9212-cbb514beedd4	1	Other	Other
+873b2ecd-d0ed-452a-9e7d-31cf8aa81ccc	1	Other	Other
+873bd323-2dd2-4d7e-aa35-8a5ad0ecfe75	1	Other	Other
+873bebf7-74f6-4c17-bc42-bad5284c8025	1	Other	Other
+873c2d1b-d347-4795-b688-a0172fc13738	1	Other	Other
+873c42a4-f50f-4a5b-880e-b3fb53722e79	1	Other	Other
+873c5c34-ba85-4e88-8989-385d103b2261	1	Other	Other
+873c8381-9c7e-471f-9e41-1a7b34f1185f	1	Other	Other
+873c97b5-9ef0-4258-8e5d-1f5bc54d360d	1	Other	Other
+873ca67d-8107-4fae-8628-feb6dc902391	1	Other	Other
+873ce165-4920-47ed-a02e-9d98a30f4336	1	Other	Other
+873d402a-e960-4cb9-a9c0-e599f465274d	1	\N	Other
+873d5010-0a72-4525-a4cd-63b26626dc74	1	Other	Other
+873d70d4-5f91-4471-90ba-a9808c8d42ac	1	Other	Other
+873da15d-64bc-4ce2-a3b6-4fde29ec272c	1	Other	Other
+873dd7c0-56ec-44d3-9c46-2cf4e1fabe0c	1	Other	Other
+873e4ecd-675b-4877-a111-1dcdf4ca7076	1	Other	Other
+873e597d-265c-4d07-8802-3de98b558e8b	1	Other	Other
+873ebdb8-9dcc-410a-9b80-a9c1ddfb0921	1	Other	Other
+873f1300-2f96-4b55-9056-d339782d81ad	1	Other	Other
+873f210b-8a1a-4426-8482-18b5bf0babd9	1	Other	Other
+873f4780-8be9-4780-832b-8cef6e05ed3c	1	Other	Other
+873fece0-541f-400c-a0dc-9587bbfee8b8	1	Other	Other
+873ff585-0a7c-4e3e-8196-8d9b3bdfa943	1	Other	Other
+87400a71-e494-424c-9aea-a2926dfa83ba	1	Other	Other
+874017c5-6da5-4768-854d-3d95acdd4c36	1	Other	Other
+87403dfa-cd22-48cc-9ed7-37ff7986a36a	1	Other	Other
+87404659-73ac-4131-9a02-b687af27fd22	1	Other	Other
+87404f73-4b03-4d7d-b77d-d9be4972ece4	1	Other	Other
+87406bec-9f0b-4d50-b853-7a92dca83cd4	1	Other	Other
+87406e9d-3946-42bc-9835-fceb7283739d	1	Other	Other
+87408a43-6289-40ad-890c-3102b244cc40	1	Other	Other
+8740a9b6-031d-483a-84df-09249fcbf44b	1	\N	Other
+8740b884-ccc8-461e-99d3-5822577edce9	1	\N	Other
+8740c150-9d63-49c5-90bb-b78a743bf157	1	Other	Other
+8740d1d1-1162-4ff5-8483-60b3a6fc9630	1	Other	Other
+8740d34c-ef22-4e34-872e-fcc796282644	1	Other	Other
+8740dc6f-f879-4f48-b7ea-ed028ae679d0	1	Other	Other
+8741102e-0792-4a5e-903c-256b6decd076	1	Other	Other
+87413624-c89c-47f5-95c4-07ec1970de8f	1	Other	Other
+87414150-058f-48bf-84e4-350f8ba570bc	1	Other	Other
+87414af2-3662-434f-b729-19f4caca33b5	1	Other	Other
+87418f98-788e-4e4a-8cab-292a613a10a1	1	Other	Other
+874201b0-5e15-4af0-b9c4-ce789dd8a28b	1	Other	Other
+87423f7f-09d9-485c-a4d4-7a7a38e58eff	1	Other	Other
+874279a1-f73f-4378-ba49-ef8faf3ddbd0	1	Other	Other
+8742e0ca-5a18-4e75-b1a3-68f990d25c5e	1	Other	Other
+8742f11b-d682-443d-9a7b-e2c9b7336441	1	Other	Other
+8742f646-9a0b-4d02-98e5-c7569c497329	1	Other	Other
+874306fa-aabe-4bf4-ae2a-cfe0fe81242a	1	Other	Other
+87431ffa-3f2a-41e8-ba92-d1c64407b872	1	Other	Other
+8743aeee-797b-4d32-87e9-d6f5c4b66147	1	Other	Other
+8743e9d9-6b96-4167-8b10-a71e38d35ecc	1	Other	Other
+874448e9-51df-4312-a49e-efbae0247367	1	Other	Other
+8744545d-e4eb-49df-bb59-7ecc54492ea1	1	Other	Other
+874492a0-9641-4997-b7a7-764ae45892ba	1	Other	Other
+8745163d-8cda-4007-b970-b1109c8c66b4	1	Other	Other
+87454559-6332-4375-bf02-260c1eba26bc	1	Other	Other
+8745c96c-8dd5-4e3b-9b7c-9e1fde2d61af	1	James	Other
+874632a3-a4ca-41e0-b5bf-cd0c6882e49f	1	Other	Other
+87466b8f-582e-48e7-8cbb-cf5b0a7d4425	1	Other	Other
+8746a74a-2500-465a-ae51-b02755771dea	1	Other	Other
+8746c117-ee2f-468a-a573-0f00b97f01dc	1	Other	Other
+87473ad4-4357-4247-aa83-8e6bf0b98773	1	Other	Other
+87475af3-47ff-4245-8549-0b93c3fdf64c	1	Other	Other
+8747ca85-ec11-4910-9c28-342f7d06e8af	1	Other	Other
+8748422a-cab2-48eb-923b-0cc80c090270	1	Other	Other
+874859d7-7c09-449d-80d8-a50c71c667a6	1	Other	Other
+87485aa5-e1ec-482f-92bd-71b237de9f92	1	Other	Other
+87487594-8e27-4c7f-8a77-1f3c3efa286c	1	Other	Other
+8748950f-bb9d-478d-a719-d8c0d37928cf	1	Other	Other
+8748a0a3-eb23-4eda-9a63-4dadf892fefa	1	Other	Other
+8749dc9b-14b4-42a2-83ef-1849d3c6ed06	1	Other	Other
+8749fa38-14d0-438d-85e8-f1eae3300fa8	1	Other	Other
+8749fd5e-484e-4af3-95b3-b571d95d53ee	1	Other	Other
+874a0be7-7a2a-4d43-9e96-a639ff7e13d2	1	Other	Other
+874a125b-1b9f-4cad-bccf-990ca0fc168f	1	Other	Other
+874a2f8e-f8fc-45c3-886f-6719d4857025	1	Other	Other
+874a38ca-8bf8-4a3b-97ef-e97e19d6a740	1	Other	Other
+874a5849-6419-4b0f-9ce3-e5f18b72612b	1	Other	Other
+874a9177-63bc-4984-a4d0-735ef32e3936	1	Other	Other
+874a982d-287f-488a-9550-4e474c4c8348	1	Other	Other
+874ab2c6-fb42-4f3e-a345-9f4cde57ebff	1	Other	Other
+874ae663-98c3-4395-9463-3339aaad5492	1	Other	Other
+874b0bf9-dd06-44dd-8c73-09d61c62ac02	1	\N	Other
+874b40d1-ecc3-4fa9-af85-ffcb9507e08a	1	Other	Other
+874b4578-5221-4892-af03-768b053383f8	1	Other	Other
+874b54a7-8503-4c67-ae3b-ffc978a27eb5	1	Other	Other
+874b6a18-b07e-415e-b1b9-d2b78968fd12	1	Other	Other
+874b9496-29af-4f47-b0c6-0aa79db6eccb	1	Other	Other
+874b9e99-d6fa-49df-af64-91c5f5f17fc4	1	Other	Other
+874bf1d2-d584-4874-84d1-e48353a14110	1	Other	Other
+874bfe3d-a7d4-438a-aa5e-7e75ef4b11f2	1	Other	Other
+874bfeac-9b18-47c5-947d-9dd01b91d7f7	1	Other	Other
+874c2e53-7089-47bb-b53b-be0dca20218e	1	Other	Other
+874c34b5-1112-4b39-bbd6-83a6fb7aa021	1	Other	Other
+874c40d8-c401-4c01-bffc-ec8ae3262e6b	1	Other	Other
+874c8979-15da-4520-915e-6ae6258bb66f	1	Other	Other
+874caf32-e8f6-493f-a692-9ef2d45e15e9	1	Other	Other
+874cf931-0beb-4735-a476-a727c2f9f6b1	1	Other	Other
+874d59f8-162e-4882-b803-f41b528ef422	1	Other	Other
+874db8a9-e96e-4088-9606-bcda5286bb04	1	Other	Other
+874dd3ed-9270-4eae-bae1-2723ddc6ae8b	1	Other	Other
+874decd5-e193-49d0-b685-6894a7cae245	1	Other	Other
+874e0b99-98bf-445c-bdf2-a7437b3f826f	1	Other	Other
+874ecff7-749d-4aed-873a-a9cddf04118c	1	\N	Other
+874ef22a-36e3-426b-926b-48077c0ae2fe	1	Other	Other
+874f24a2-8258-4baa-9b38-8ed642de3a74	1	Other	Other
+874f4552-f8ac-457b-b756-30565b408588	1	Other	Other
+874f5989-0fe6-461b-9114-bd666f8d2959	1	Other	Other
+874f5c99-e292-4a34-8556-1771028be22e	1	Other	Other
+874f6a55-7f1a-4927-a37e-8b957e76fc7b	1	Other	Other
+874fa148-6141-49f1-8173-afb21b70186e	1	Other	Other
+874fb657-4705-4a0c-a6b5-50c54e557adc	1	Other	Other
+874fcaa6-092a-46d9-83c2-943af50465d9	1	Other	Other
+874fd368-b4a7-43df-bbe2-abcb29441c8e	1	Other	Other
+874ff981-041d-4812-ae65-62b654575d64	1	Other	Other
+8750377b-2996-4b16-8492-3fbb45bc2c71	1	\N	Other
+87503d49-bcd3-4dbb-8d93-d610f7a8e148	1	Other	Other
+87504fb0-9da8-4604-80ba-0fe5a3683c46	1	Other	Other
+8750cf99-20e4-44c6-a2a6-f5ac41d109a5	1	Other	Other
+8750d32f-0b13-4aa8-8ee8-c0942c63d495	1	Other	Other
+8750f045-f200-496c-ab79-2db3d264fe7c	1	Other	Other
+8751108f-d478-4734-9ef1-14f71e96e114	1	Other	Other
+87512ecc-0b89-4b4a-a5ed-42ab63aa91a5	1	Other	Other
+875130e2-718b-470b-95d4-b6fcb2a6db26	1	Other	Other
+87516038-ee65-4345-844b-d77394bc5ae9	1	Other	Other
+87518c2c-1be0-49a9-8a2e-954d66ae23c3	1	Other	Other
+8751a67f-bdeb-436a-a35a-e7b612a2dc9d	1	Other	Other
+87524375-9cdc-4311-a147-1eb4cdd1c2af	1	Other	Other
+87526a81-90b4-4448-aa69-05a56699e17f	1	Other	Other
+87528b96-c066-470e-99b6-5982f621c6a0	1	Other	Other
+8752bb3d-9e06-4f79-bb43-fef365aab85f	1	Other	Other
+8752df38-50c2-4eaa-a174-f9e0519259d8	1	Other	Other
+8752faf2-df05-4fb0-9a71-3c4818c7df38	1	\N	Other
+87534f96-6c14-4c97-843b-ba9b65500e51	1	Other	Other
+87538030-762c-4aa5-a28a-5ac4999500b9	1	Other	Other
+8753c557-0095-4020-8ceb-338a305be6d4	1	Other	Other
+8753d538-01cd-4a5a-a599-38603af107c7	1	Other	Other
+875462e1-be3f-44c1-be7f-dbe5faff5435	1	Other	Other
+875470d0-ca9b-4c61-b586-a8b019d1d054	1	Other	Other
+8754972f-712a-4de1-86bb-0811d1bfc8c1	1	\N	Other
+8754a11a-ad6e-473f-88dd-a53486d7fb62	1	Other	Other
+8754a582-edb1-4977-a50d-bfc9d4c9f0a8	1	Other	Other
+87553716-12da-41a7-909f-d1f7fa207571	1	Other	Other
+8755792b-6234-4808-8a24-fa994ca95877	1	Other	Other
+8755cedf-8229-4907-9997-1ff18759d341	1	\N	Other
+8755f237-92fb-4a44-9dc8-4d5411090048	1	\N	Other
+8755fa57-428f-4297-ba14-aa3258ec8d4a	1	Other	Other
+87561e31-4d58-4095-aa98-33d1a8ad1a49	1	Other	Other
+875672b9-8744-446e-9cbc-92b6fd0d1a72	1	Other	Other
+8756ca67-03a5-4214-bbec-9273b529b512	1	Other	Other
+8756d759-a873-4d8c-8c6c-536e3b9446b8	1	Other	Other
+87571d59-e699-4995-91c7-347baf26359b	1	Other	Other
+875724d0-7edd-4959-8bf1-0b3c1ad2b961	1	Other	Other
+8757335b-1e13-4143-85fe-f5a5880ce7c8	1	Other	Other
+87575086-4500-4e32-a3f5-fe7a693643eb	1	Other	Other
+875788b6-fee6-4180-a9ab-ffaeefe8c4ef	1	Other	Other
+8757af41-8b0b-48bf-bcc4-6e701c089b73	1	Other	Other
+8757c44f-3a03-4ded-add7-0b5941f581c6	1	Other	Other
+87580f06-e624-4a66-b0be-a5265be911f9	1	Other	Other
+875822c4-a4fb-4ccd-8455-df21c49a8284	1	Other	Other
+875822e1-6ae5-45c2-8076-f4f81f39a96c	1	Other	Other
+87582545-c764-409f-8165-0077ce93311a	1	Other	Other
+87587b1c-7ea3-4e8f-9bdc-c5cf1f0cad72	1	Other	Other
+87588e52-04cf-4050-9fa8-b8aa644ea7df	1	\N	Other
+8758a1c5-c376-414a-a050-728decfe3b81	1	Other	Other
+87591acc-fc72-4a2b-ba94-db7cf990083e	1	Other	Other
+8759381d-0474-4f7c-a9fa-ba8ec04c58cd	1	Other	Other
+875991fc-d40b-4c53-a27e-0862f5221af0	1	\N	Other
+87599fa1-1c54-4a83-8a7b-e95dab3c6cdc	1	Other	Other
+8759a115-5866-47a1-bc0b-37710ea51b79	1	Other	Other
+8759a78a-8984-428a-a4f3-ef772408917e	1	Other	Other
+8759aaf0-d9fa-4ba8-b77a-f74c2a13dfdd	1	Other	Other
+8759e4b1-bcbc-48bb-ac70-ff71cf45735f	1	Other	Other
+875a31dc-f7f0-4982-8296-b081a722c009	1	Other	Other
+875a4d48-bc7b-4689-a4bf-c28cb29a6f91	1	Other	Other
+875a7dcf-be0d-45ad-8af4-def81ae84f1c	1	Other	Other
+875a8eea-77e0-4c8e-b095-573e6a7363ee	1	Other	Other
+875abdee-06cd-457d-91af-5b0b924406da	1	Other	Other
+875ac743-2c95-48b0-a7df-a9439b91db2b	1	Other	Other
+875ae7a0-e967-44f8-9e83-6bdf3a05639a	1	Other	Other
+875b24ff-fa71-43f2-85e5-bcbb58126c33	1	Other	Other
+875b39f0-b4df-4237-9c39-cf157c2ee943	1	Other	Other
+875b4da3-a864-4930-9a45-43b687460b97	1	Other	Other
+875b6a2c-ed5f-4fe1-92f9-68eab2def91a	1	Other	Other
+875b758a-de87-4f99-ad87-9b81cb5208ca	1	Other	Other
+875b8dce-d7d0-46eb-bbf9-11d3d2857636	1	Other	Other
+875ba592-aa40-475f-bce6-871a03c0555e	1	Other	Other
+875bd0f5-a4c0-4380-95ed-0613c02e2a43	1	Other	Other
+875c48b2-aef6-44a6-82a6-89beef056934	1	Other	Other
+875c5db7-afb2-4e2a-b122-4c6101384f52	1	\N	Other
+875cbc1d-ada3-4c37-b27a-4630df75fd8b	1	Other	Other
+875ce2bf-116f-4bbc-8f3d-6a11def094e9	1	Other	Other
+875cee19-405e-4ec3-aa97-a4c444b89a4a	1	Other	Other
+875cfc67-ec11-4740-8ee1-91bf924d4ba6	1	Other	Other
+875d1271-73cb-463f-bd27-10900409d600	1	Other	Other
+875d24e0-3538-439f-adf6-4667d5e15133	1	Other	Other
+875d3a92-8e2d-4a0b-9292-2a76be19845d	1	Other	Other
+875e6541-7a2f-4052-b83e-2a6c348a7cd3	1	Other	Other
+875e667e-1c16-4fc7-9027-7df3ae0f4ac6	1	Other	Other
+875ebd07-2f04-440a-ba3d-5a4648c0e3d1	1	Other	Other
+875ebe0a-a94b-49be-bcd7-6d29342d930f	1	Other	Other
+875edb04-6b81-469c-ad89-7155b0ecf2da	1	Other	Other
+875f3fef-8f52-42dd-8bc6-b9347d24cae7	1	Other	Other
+875f5a0d-1995-4839-ac4a-7befb002c0a6	1	Other	Other
+875fb05a-69ae-4384-9785-bf7c106aa6b8	1	Other	Other
+87602c30-c0c8-4fbf-ba69-9bf42a13990b	1	\N	Other
+87602caa-74f1-46d4-901e-9934634676b0	1	Other	Other
+876034ca-d66c-4bc7-9129-09da6ad6e03e	1	Other	Other
+8760473b-4cee-4b63-a6f6-c768ebd8bad4	1	Other	Other
+8760a977-002d-40ec-a79c-a7a717e8cf8b	1	Other	Other
+87611717-5bee-4ba2-b6c4-b684f83994ef	1	Other	Other
+87611884-2e60-4e55-add7-8a77b6c29ff5	1	Other	Other
+876133a1-ca72-47b3-9ed2-023cb7b7ebdf	1	Other	Other
+876177a0-decd-4cfd-adfc-f7487e6c132e	1	Other	Other
+8761804f-cb86-42a2-b270-679a62bdf5f5	1	Other	Other
+8761d55b-6737-4bb6-9a8d-f25075b13e5f	1	Other	Other
+8761e9b3-c3a3-4de0-8c8f-96780b813b04	1	Other	Other
+8761eae7-f06b-4354-82fe-ccce11863d5e	1	Other	Other
+8761fa61-5ef5-441d-a59a-db080f613fbf	1	Other	Other
+876227be-047e-4f68-80a9-134e27d27ac3	1	Other	Other
+87622bbe-7b88-4a9d-9d3b-801879663bd2	1	Other	Other
+876235b7-c7bc-4ef0-b48c-d807a394490f	1	Other	Other
+87624a1e-9dff-4801-b3f3-d2d3b6cb807b	1	Other	Other
+87626782-71eb-4a15-8b15-9e52a192c87b	1	Other	Other
+8762c80f-b75d-412b-bc7e-b37e00793ad6	1	Other	Other
+8762e96c-60fd-420e-a93b-ca581f963b8f	1	Other	Other
+8762ecb7-9f16-4685-b66a-40ec3f035468	1	Other	Other
+8762f83e-77f4-492d-a3d1-1522d1b05241	1	Other	Other
+87636b6e-fdfe-445d-9b76-f945dc9940ad	1	James	Other
+876378b1-0ef0-40ca-bba4-99e7f8975a55	1	Other	Other
+87637bcf-bad3-45f3-964e-78a3c2002092	1	Other	Other
+87639515-dcd2-41ed-a2a2-38cc6e559972	1	Other	Other
+8763d893-63df-4c01-b366-6e9801b706e0	1	Other	Other
+876447b9-86a1-4eeb-98fd-3e14bc2f7299	1	Other	Other
+876464a2-8923-4198-9d42-7dab427742c0	1	Other	Other
+87647e3e-0be7-40e1-b726-9ea60c4a3a02	1	Other	Other
+87649155-3811-4c78-85af-b495861618d6	1	Other	Other
+8764f35a-c06a-4b1c-8ea4-9679372458c5	1	Other	Other
+8764f564-1325-45bf-ab3f-f01f6fccd6ab	1	Other	Other
+876567f7-eade-4122-8fd0-7634fba8155a	1	Other	Other
+8765e3bf-0bc2-4351-9c87-9e2d0abb8cd5	1	\N	Other
+8765ed3c-d104-49a1-ba57-81688de61d42	1	Other	Other
+8765eff3-8fcd-40ee-8fff-8cd8697dc1dd	1	Other	Other
+87662069-d6bf-4ef5-893b-7eb6f63a9967	1	Other	Other
+87662c9e-506b-426c-a9e9-f82d7775c8d4	1	Other	Other
+87663a69-f145-4eee-8079-70756b0483a3	1	Other	Other
+876652a2-ed0f-42f0-b557-d5763c7c77ca	1	Other	Other
+87665541-0306-464f-8c96-eb6df8e9249c	1	Other	Other
+8766729c-0549-48e2-9436-ad7c14c05821	1	Other	Other
+8766a8f9-72af-4190-9f96-210678fa0020	1	Other	Other
+8766e8e8-8b94-4458-9b2d-cc903b6fca5e	1	Other	Other
+8766ea4a-81e1-4249-9e52-15617bc2dd83	1	Other	Other
+87672fa5-a03c-4329-86c6-c65eb0570415	1	Other	Other
+87673ec5-feac-45cb-b8af-4fb3bbc82f6b	1	Other	Other
+876765b4-92e8-440d-8924-5472b6c2da00	1	\N	Other
+8767b0bc-25e7-4a1f-9730-2826bcdfc6b4	1	Other	Other
+8767b20e-2f60-4be4-afa0-fa27de7a09e4	1	Other	Other
+8767bc79-dcc2-4920-96c7-6915982714ef	1	Other	Other
+8767c56d-ffe8-4b86-9d13-4a1b23e29438	1	James	Other
+8767ead0-f41e-44bb-ba95-840a97457c33	1	Other	Other
+8767fca7-5992-46f6-b5a6-cef194e05b76	1	Other	Other
+87680b8b-0601-47de-b16b-e29efe98bba4	1	\N	Other
+8768268b-ea16-47f0-95a1-cc6964734ed4	1	Other	Other
+87684d0a-89af-4233-aab5-f1687da80356	1	\N	Other
+8768945b-a696-47f8-b8bf-f4e1f827ad8b	1	Other	Other
+87689a7b-8bac-4a10-973e-07fcfc23bbad	1	Other	Other
+8768bdf0-f96c-4836-97da-25b2961d7a36	1	Other	Other
+8768c75f-71ab-4d6d-8e53-9f000724718c	1	Other	Other
+87690f2e-3a25-4cd4-b127-27d4f904b414	1	Other	Other
+87693166-ef59-4071-bb7b-c341c1bef148	1	Other	Other
+876936bc-e7a6-4d5e-ad01-b68bd70adebb	1	Other	Other
+87698c12-9bb7-426e-98a3-71e29b9237cb	1	Other	Other
+876998db-ba39-4de1-a285-71be31f6e986	1	Other	Other
+8769d438-267b-46a7-b180-bd87979ee44b	1	Other	Other
+8769d659-3b5b-4a8d-823e-76fd0a47a3df	1	Other	Other
+876a0a1e-69c5-4cf8-8535-51ab18450f64	1	Other	Other
+876b72c8-c984-480f-812b-311e141e85db	1	Other	Other
+876ba220-5c72-4ede-ad84-da56bf5ddcf2	1	Other	Other
+876bc1c5-a076-4a20-a550-c0867099c6cf	1	Other	Other
+876bcc93-4e73-4034-83ec-b8eb1051265d	1	Other	Other
+876c0a3f-fa2e-4621-a9e5-54e987c4bc2a	1	Other	Other
+876c1ac7-3e7a-4d4b-abd7-a8f737618745	1	Other	Other
+876c46cd-9b64-4109-bdad-1417355e5abc	1	Other	Other
+876cc112-215d-4898-8aeb-613f69496dbf	1	Other	Other
+876d0e92-f419-40f0-b06e-46c8f2092050	1	Other	Other
+876d3d97-ba28-4e7f-8e67-5b6fbe28bf09	1	Other	Other
+876d520e-5601-4649-a1c2-56d2b3080242	1	Other	Other
+876da3ae-ea9b-44bc-81d1-735ab9d68d1c	1	Other	Other
+876dc9c6-a545-416b-861f-49c8e8a4007a	1	Other	Other
+876df1dc-9ef8-4a55-9bb2-518fa13ec7e2	1	Other	Other
+876eb76c-a735-450c-9d6a-22ce6ec17918	1	Other	Other
+876f5ebe-97bc-4f1a-9b7d-bb2056968c9d	1	Other	Other
+876fb3fc-a070-471d-8567-75012009f4a0	1	Other	Other
+876fe03a-0632-4cd6-8adb-2c280a91fc4f	1	Other	Other
+8770bd9d-4a81-4227-ac6f-f7208d693173	1	James	Other
+8770c4c5-8da1-423b-8122-5fb8f145ba10	1	Other	Other
+877114be-71c8-4e95-bccd-e4d9ce553d60	1	Other	Other
+87713647-f527-462d-bde7-5761df24b95c	1	James	Other
+87716d75-abf9-4f75-84e6-c572d6b29338	1	Other	Other
+87718a91-5f29-46e6-b1a1-ec098faf22a4	1	Other	Other
+87718fb9-102e-4079-9082-7ea046fe4735	1	Other	Other
+8771a171-2e4b-46b4-9198-eaed5c92b101	1	Other	Other
+8771fe14-20df-4d71-a2a5-97e109e9a588	1	Other	Other
+87721e88-db49-4afa-bf31-3ba7a6576f27	1	Other	Other
+877243bd-7e80-4a8b-946d-cf3195731ebe	1	Other	Other
+87725fee-1adc-4e56-ad0e-684e0724a85b	1	Other	Other
+877269fd-c8ad-4a9d-a3cf-e53e954e8c6f	1	Other	Other
+877289c8-759f-4010-8e84-a5b07caf7172	1	Other	Other
+8772dce9-ac63-4854-8aa9-7568bba8577c	1	Other	Other
+87730bc6-3cf5-45e0-b42b-e0a1eba2c588	1	Other	Other
+87731c1e-2edf-4cfb-85ec-94c312a55b29	1	Other	Other
+87734021-cdb0-43fc-843b-e85f0c2bd46e	1	Other	Other
+87738d8c-fbd0-4c5a-a677-39a00e14f5dc	1	Other	Other
+8773afa4-e5b2-4e65-965f-c58e40bd824c	1	Other	Other
+8773bf12-c363-42be-bf30-8fe4b1b90d91	1	Other	Other
+8773c49c-0bdc-4b21-9b46-c3d59b295846	1	Other	Other
+8773c5e0-7637-49e1-a643-563180b9edbd	1	Other	Other
+87740d8c-64fa-484a-ba2c-3a54236da283	1	\N	Other
+87742085-486f-4255-b974-e3f01977c6b6	1	Other	Other
+87742b2e-1e3f-4707-bbd1-b0cfdc6eb9b8	1	Other	Other
+87747a93-8720-4aa6-9a20-375eaec1c08d	1	Other	Other
+87747fc1-54b9-45db-b845-5b898744a121	1	Other	Other
+877496c1-8be3-4fc1-a9ce-be31fec707b5	1	Other	Other
+8774f506-2b29-40d4-b443-3c18ffb01a84	1	Other	Other
+87752095-dbbf-408c-a8a4-0c4ae33b1048	1	Other	Other
+87752a0b-5642-4848-a78f-8f88bea4f4a8	1	Other	Other
+87752d40-04d3-45a9-a94c-82fc02c0aaee	1	Other	Other
+8775344c-29fa-439a-9814-c9b506a916a3	1	Other	Other
+87753e07-823a-4f1f-8653-2fa9b3af1f41	1	Other	Other
+8775441a-36b2-4ccf-b755-275e4df9e911	1	Other	Other
+877551d8-b919-4e1f-9822-0b397b467285	1	Other	Other
+8775d570-04cd-4613-ac61-660f7c0a4a89	1	Other	Other
+8775e86a-3495-47bd-b3bb-48d4bc6e13a5	1	\N	Other
+87760041-9db0-4611-99db-edb46072f57a	1	Other	Other
+8776225b-2045-4bdc-90d7-67c28f79a69c	1	Other	Other
+877691ab-4089-49c5-96c9-e1b070f3f378	1	Other	Other
+8776e57b-d1ce-4f73-bf91-f6700943bf68	1	Other	Other
+87770067-4f99-4226-ad9a-192e39b04192	1	Other	Other
+8777472c-ab78-465a-a736-2ef46560b1b6	1	Other	Other
+87775fd7-708d-40a8-bb18-cb91f9cf2ef2	1	Other	Other
+8777dd60-aef4-41d3-b485-a7a348151708	1	Other	Other
+8777e224-4948-4c74-9ce2-982c7cf5ab6a	1	Other	Other
+8777fc65-7487-4f76-8ce9-786bc90f3277	1	Other	Other
+87780ccb-8f6e-4dba-80a7-ca0c4accbdd7	1	Other	Other
+87784580-e610-49b0-b7d6-37393d21afd0	1	Other	Other
+87785cd9-61b6-4421-983b-cf429ffcb5fd	1	Other	Other
+8778c867-a550-46c4-b804-c726e2b9f3cf	1	Other	Other
+8779a3e8-9940-4f83-9e03-a00e802a4822	1	Other	Other
+8779b922-2d8e-4be5-a603-58a62e41b4d4	1	Other	Other
+8779bc64-99ad-4ebd-acd9-2bd407d4ab6e	1	Other	Other
+877a07ab-c8ac-4c49-ba57-67ca5af682ef	1	Other	Other
+877a2907-93a8-4baa-8975-8eb4441c8d78	1	Other	Other
+877a4cdb-6e6a-4136-9139-5e736ec89cb5	1	Other	Other
+877a90a1-e447-48e6-a894-43cca866944f	1	Other	Other
+877a999c-e4b0-4c2b-9be4-1c15c45f4442	1	Other	Other
+877aa50a-8b12-4738-90c8-42aa2e70cd96	1	Other	Other
+877af888-6352-4e3a-9106-4704a5d665a2	1	Other	Other
+877b66c0-ac84-436f-951e-97f77388fb61	1	Other	Other
+877ba701-695d-4c91-97af-8687e96cab41	1	Other	Other
+877bede7-939d-4284-9918-e1f9c13bfe32	1	Other	Other
+877c09a1-9adf-43d6-9c9f-0d5d1b05c1db	1	Other	Other
+877c1780-2413-4ac6-a27c-5168a9e38188	1	Other	Other
+877c592f-a56d-4954-9cb5-aea1d96a2cdc	1	Other	Other
+877c6b4a-29a1-435a-adb3-dab8bfa110cd	1	Other	Other
+877cf24a-944c-4afa-8eb7-9a52f7745115	1	Other	Other
+877d13bb-e1a8-48af-9a2c-d9808616456c	1	Other	Other
+877d432d-657a-4117-99b4-00617450ce4f	1	Other	Other
+877d9d7c-9191-4f3d-856f-c6b2863b4aad	1	Other	Other
+877daa6d-d5f9-49db-baba-ae92be38955b	1	Other	Other
+877dcc0b-941a-4f3a-98fc-bfb2d105ce31	1	Other	Other
+877de57c-5f28-4e95-b282-e75f714578e9	1	James	Other
+877dfd6c-f570-43cd-a965-4aa2f3efb5a5	1	Other	Other
+877e19de-64e0-4ba6-a1e9-3ad5643826c7	1	Other	Other
+877e41f4-5420-475d-8d66-075526bc5d3f	1	\N	Other
+877e454e-b5e1-4e55-8e8b-3411cd1adc98	1	Other	Other
+877f128c-a534-468b-93b3-c2bd8c4efb62	1	Other	Other
+877f33c4-06ba-40ad-9ff9-14b2273e51b1	1	James	Other
+877f5acf-8a99-4dd7-9357-d308255fee39	1	Other	Other
+877f747f-0711-4f04-9454-ba7c799aaef9	1	Other	Other
+877fcf95-0acf-43f7-93b7-4e753ee21354	1	Other	Other
+877fd5a8-2067-494d-92ad-c86c2487b2a8	1	Other	Other
+877fe06f-b1a7-47cf-ac4e-6493495dc24c	1	Other	Other
+87802bab-8b17-46bc-b477-fdddd1436c52	1	Other	Other
+87802fd0-4abc-4f91-903e-bdc87d639c01	1	Other	Other
+87806338-dab3-4425-b075-08a1726419f1	1	Other	Other
+8780699d-6505-4120-94b5-e8ab69d4ca34	1	Other	Other
+878099e0-763a-4bf1-94d1-9ef54e16b72b	1	Other	Other
+8781496c-2375-424e-93c5-9281ea7dffc6	1	Other	Other
+87815771-e14a-4ddf-9710-f77c57c0c7f9	1	Other	Other
+878186c5-7c04-4f46-8b62-9ffbeaa4cfc2	1	Other	Other
+8781ce3a-0b05-4403-8bb2-be573e0023e0	1	\N	Other
+8781cf03-cff2-43f4-a4ab-dfaba599c863	1	Other	Other
+8781d061-75cb-47c6-96a9-814b8bdc44bf	1	Other	Other
+8781e62b-3e18-49a5-805e-ad140fbf9c04	1	Other	Other
+87821b71-fdf6-4fa8-8dea-f6fda3ce75de	1	Other	Other
+87827386-e7c9-4648-9f03-3ccaf9750d4d	1	Other	Other
+87829b63-3215-44b3-a32a-e22007f3b319	1	Other	Other
+8782a4e3-4334-4a60-b8ae-4151d313df17	1	Other	Other
+87830a7c-e4c9-40fb-a1e7-097ab01272d4	1	Other	Other
+87835ccf-f8c0-4f8c-91a7-32ba68ced793	1	\N	Other
+87840275-a075-4d17-94e6-350ea5302730	1	Other	Other
+87843ee5-e577-4fec-876c-0f4babce37c9	1	\N	Other
+87845450-e6cc-4964-a6a8-578933686f8d	1	Other	Other
+87845dbb-c86e-43ed-ba6a-d7e4828596fd	1	Other	Other
+87846af0-e80f-411b-af9d-8b76cdd40234	1	Other	Other
+878471f9-2966-4cbb-a453-0b488d9b915e	1	Other	Other
+8784b3b2-05cb-11e8-9368-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+878534ab-a174-45c1-992e-e17d4e6c5536	1	Other	Other
+878544cf-6384-4ef7-9f31-2b75827308d1	1	Other	Other
+878550d4-c2f4-4a98-8200-de16e7a6c070	1	Other	Other
+8785511a-b8be-43c0-8fd4-977cb6401c01	1	Other	Other
+87855e43-b7f8-4bb3-819d-b5c155422a50	1	Other	Other
+87858d1e-4a78-48ce-af6d-f1e5e20e452d	1	Other	Other
+8785a184-e972-423d-843e-1dee20eb630f	1	Other	Other
+8785d9ad-24b8-4de2-8e76-e55896116375	1	Other	Other
+878628a1-9c6d-41f0-9f16-c1dd17bb56af	1	Other	Other
+8786321b-805d-43ae-84c2-98a7279bc9c1	1	Other	Other
+87867aec-f6aa-4700-987a-16e9e2d593d5	1	Other	Other
+87869899-7f8e-4801-9aa0-c7c997dd657a	1	Other	Other
+8786a0ad-004d-4bfb-a6c6-cf1c3c67f35c	1	Other	Other
+8786a966-fc61-49d4-bd2f-f11e1d39c727	1	Other	Other
+878704c4-07b4-480a-be9d-43e71713e8ca	1	Other	Other
+87876b06-b4c5-4cc9-bd6b-d89ab384fd4d	1	Other	Other
+87878177-7951-43b5-ad81-06548afae695	1	Other	Other
+87878390-09e7-414b-a7db-da9450f224fb	1	Other	Other
+87878a54-44ab-4649-9eae-e7280b8c80bf	1	Other	Other
+87879eef-365a-4c12-af04-3a88f9d26cff	1	Other	Other
+87880f46-ec25-4ebd-93db-193992270179	1	Other	Other
+87885141-aaa1-4f13-b67a-3f4fc09582f5	1	Other	Other
+878857e8-2ffb-46ca-9c21-8c69ebb87ef6	1	Other	Other
+8788641e-b3cd-4c40-8aea-72b0665cd037	1	Other	Other
+8788b7a2-6244-41f9-8c3e-76d97089cd8a	1	Other	Other
+8788c404-ce7e-49d2-b563-b6054464e264	1	\N	Other
+8788d465-3593-4b9e-b7f5-548eff2b8645	1	Other	Other
+8788d832-cba2-46d5-b1b8-1bc4f0165c6e	1	Other	Other
+8788dc72-7902-4532-a9d1-95928358396f	1	Other	Other
+8788fc4e-74d8-41e6-a32a-cbc1db53b06a	1	Other	Other
+87892f3b-3dec-49a4-83ac-cba0676efbd3	1	Other	Other
+878937d8-b76a-4ccd-9d20-852250593193	1	Other	Other
+87894c4c-5d3a-4729-9950-a66be13e7043	1	James	Other
+8789e643-16a6-4331-9bd6-6cb58eac6c66	1	Other	Other
+8789f562-cf0b-4f7a-bae6-db8ba4d0b056	1	Other	Other
+878a2a41-2d78-4765-b453-a9db8a4474f8	1	\N	Other
+878a649c-de7f-4057-9982-6d368231bd69	1	Other	Other
+878ad2b3-4627-4c5f-a8c3-955fbcdd0b8a	1	Other	Other
+878ad9a9-4e82-4718-9a5e-7bf87967ade7	1	Other	Other
+878b3db5-e98b-4ee2-8223-6e5a0cf09a79	1	Other	Other
+878b5d12-a023-42ff-a219-dd98df431b54	1	Other	Other
+878b762b-5237-4451-9064-6100af0b66a6	1	Other	Other
+878bc1e7-8320-483b-aec4-ff2ac23feb75	1	Other	Other
+878bf204-fd3a-4b16-a2a0-ead4407c6650	1	Other	Other
+878c19d7-0cef-48a7-ade0-d60436653375	1	Other	Other
+878c3cef-3c09-46a3-921f-5976b63e5207	1	Other	Other
+878cdae2-d5db-499f-9758-444e1cb541d9	1	Other	Other
+878d8201-e00d-4f2a-8899-6adfce1b2ea6	1	Other	Other
+878d853c-9382-4b84-ab39-03291a3c6f71	1	Other	Other
+878d9aca-7887-4f6a-a1a3-e71863d3fe46	1	Other	Other
+878da185-978c-4443-83b7-a74f847b40aa	1	Other	Other
+878e0ade-d05c-4423-b822-700f38c242f0	1	Other	Other
+878e103b-8714-406a-9ec8-1ac39b764b0f	1	Other	Other
+878e299d-5245-4b79-a61d-95a29a7c0d20	1	Other	Other
+878ef904-7471-4210-9f19-8ddacd61c9cf	1	Other	Other
+878f52df-8185-4fb7-940b-e2e328f460ea	1	Other	Other
+878f5d9b-0ef6-4f7f-8219-61fa05700c9c	1	Other	Other
+878f7ca0-614d-4f85-b1e3-71b4309ffda4	1	Other	Other
+878f8a3f-7f2c-4676-907f-4dcc8b988c0e	1	Other	Other
+878fd892-59ed-4b08-a271-eac4d18afd3e	1	Other	Other
+878ffd46-902b-4023-a8fe-4bfa0aa3b7b0	1	Other	Other
+8790750f-96d3-485d-9aab-42e591310633	1	Other	Other
+8790964d-50e2-4a52-9fa2-12e3ef7e2264	1	Other	Other
+8791060e-ce08-4670-bd3b-89de5d4a4a4f	1	Other	Other
+87914bad-3c6a-4611-9dcd-dac096ba5fc3	1	Other	Other
+879191c0-c093-41b0-8064-b458b0333bde	1	Other	Other
+879192e7-ede3-49c8-8321-96655f8296e8	1	Other	Other
+8791a117-0c5a-4698-8bc2-3092b9bca34a	1	Other	Other
+879214ec-53af-4356-b45b-6fc4681e9228	1	Other	Other
+87929816-9959-4897-9d44-8f18da735eda	1	Other	Other
+87929d56-4b8b-462a-9010-248395638bba	1	Other	Other
+8792d9ca-7cdf-41b3-bde4-972350d84179	1	Other	Other
+8792dfeb-f374-4ebc-a3d2-2420da1cde89	1	Other	Other
+8792e309-2ff5-4bd5-a696-058385b22f46	1	Other	Other
+8792f4b3-64b4-41db-b90c-e2b4b846ee23	1	Other	Other
+87930274-35d1-4f5f-8d46-cfeb52beb644	1	Other	Other
+87932f24-53bc-41d3-97ca-274bbbb71946	1	Other	Other
+8793f82f-83fb-4922-8ed9-5034a1402a03	1	Other	Other
+87942460-95f0-4e25-9ec6-23790c28d08a	1	Other	Other
+87944e6a-edc7-4e21-867a-fe7834e402d6	1	Other	Other
+87946c62-bc73-43d3-b325-85aeb6092629	1	\N	Other
+8794bd4d-2a66-45e7-a187-48cc1a974747	1	Other	Other
+879527c9-edc1-4b13-8614-1fb552e7ae29	1	Other	Other
+8795327c-8a75-4de3-aab2-7feadaf82c7b	1	Other	Other
+8795547a-d0af-4ca8-8d2d-d621690be09f	1	Other	Other
+87957e95-d458-4ac2-a873-4d853ac2c3fb	1	Other	Other
+879595aa-79b5-4df8-b95b-9a167d219dfa	1	Other	Other
+8795a182-60af-4c00-942b-1114a16b79e2	1	Other	Other
+8795a61f-79b0-4905-a8a6-0cd0c8249374	1	Other	Other
+8795a625-be6e-4645-9f49-4c56da1bc05a	1	\N	Other
+8795b9f1-b725-41b7-84d5-602012a79b8b	1	Other	Other
+8795bf5c-9ca7-4f70-9595-fbdc96e1fd88	1	Other	Other
+8795c13e-a313-4d25-8a23-fd43e8b23f05	1	Other	Other
+8795e6d0-1f69-4e2a-8f3f-4bc2f4af4318	1	Other	Other
+8795f083-a1f9-4765-9034-77cf28b1f06a	1	Other	Other
+879676e4-889a-4507-8616-e5a0d0ccaf33	1	Other	Other
+8796e2eb-bae9-46b4-a4c7-097f22b5a677	1	Other	Other
+8796ecf3-90c5-403a-8a2a-524f89e69425	1	Other	Other
+8796f33b-b55a-43cd-a2f7-21950524871b	1	Other	Other
+87971f1d-d215-4068-82e8-dcb5f2509844	1	Other	Other
+8797260a-1155-4731-93d1-a9b4fd988ba2	1	Other	Other
+87975bc0-168f-4371-bcf9-917dd1eccdaa	1	Other	Other
+87976c9c-435d-42a3-8126-a407b58c3458	1	Other	Other
+87976dd9-8c92-4a10-aed5-31e8fbfe392f	1	Other	Other
+879815b0-f19e-46ac-a82c-e15e26d6129e	1	Other	Other
+879833d6-6c6c-4810-a896-3ab495a61140	1	Other	Other
+879840e6-87ab-4f18-9c37-7eee426def48	1	Other	Other
+8798962a-3a69-4d4f-9a74-b1a041d2ba40	1	Other	Other
+8798a7c0-7836-4c60-a98a-151397a7adc6	1	Other	Other
+8799050f-64d1-4956-896b-62b22d7f5e7b	1	Other	Other
+87990a3d-bdc9-4aaf-84c0-3560add51629	1	Other	Other
+87994064-018a-4f6f-a790-0b276233d9b1	1	Other	Other
+8799bcc4-f923-4567-bd6c-4a05fd14943d	1	Other	Other
+8799d6e8-37db-4d13-9943-6fc53ceb458a	1	Other	Other
+8799ddac-a3b4-4ba5-82c7-bed7618434b2	1	Other	Other
+8799f6eb-2adf-4abe-be16-201c0453c61b	1	Other	Other
+879a1436-c969-4c32-9995-06d8afc505d0	1	Other	Other
+879a1da8-5f81-417f-a8d2-9616c0837e0a	1	Other	Other
+879a33f6-35b6-41ca-b6be-d9a3aaebf2fd	1	Other	Other
+879a503c-8c4c-49aa-93a0-e4fffc4ff548	1	Other	Other
+879a765c-862d-4ef8-9382-1d809df7c613	1	Other	Other
+879a84c6-de4b-484a-b040-aeb5c4eb5e57	1	Other	Other
+879aca71-6529-438e-bfae-23c6b41fd42f	1	James	Other
+879ae80c-9763-42a7-aad1-5af0c5606526	1	Other	Other
+879b2bb2-e954-48aa-9a26-4b4708c9dab2	1	Other	Other
+879b4d98-dcb7-45c2-97bc-fed5abc8b97d	1	\N	Other
+879bb131-4ba4-4ea2-8775-aaa3a83a14a6	1	Other	Other
+879bd30e-5b48-47b4-8b71-35c387793a18	1	Other	Other
+879bd845-6e36-45a9-ba5e-28d722c0e33c	1	Other	Other
+879c074f-08c2-42bd-bcb3-18f10b9f526b	1	Other	Other
+879c7438-127b-427b-a296-ddf31ca66034	1	Other	Other
+879cc023-57dd-4ec5-9cad-03fcfb5ed181	1	Other	Other
+879d0931-2bed-48ef-8576-165719708c1c	1	Other	Other
+879d397f-14c7-491a-b364-116c51de92fe	1	Other	Other
+879d3acc-2f0c-49d1-a913-048e22324d31	1	Other	Other
+879d723d-e013-4af4-ab66-acf0756d9bed	1	Other	Other
+879d8e3c-f90a-49d1-8233-dd467227bd12	1	Other	Other
+879dbbfb-425c-4a70-9682-fd5d2eba5094	1	Other	Other
+879de906-66eb-4e63-8efa-abcdb1a98157	1	Other	Other
+879e1795-3b1c-4e74-b20e-d6ad522c9e46	1	Other	Other
+879e50e3-64cd-49c0-a7c7-379bbf68d3c6	1	Other	Other
+879e82f4-1b78-498f-ac45-fc7b62ed62df	1	Other	Other
+879ea753-ed75-486a-ad7f-9f4a6e8a9d7c	1	Other	Other
+879ea8ef-4c43-461c-85da-be406a33f25a	1	Other	Other
+879ee99f-eddb-4125-b69d-5279892fd00c	1	Other	Other
+879f3114-9411-4100-9031-394fddf68768	1	Other	Other
+879f659c-caba-4e64-9216-78758793d4a5	1	Other	Other
+879faaf1-46f7-4091-975e-a8c0570ee9c1	1	Other	Other
+879fe813-c7b3-45fa-ad8d-74c302ca626f	1	Other	Other
+879ff090-cc0a-41f8-8942-6804cbb5358e	1	Other	Other
+87a04a4a-80d0-4f1f-bb39-ca1873ce0346	1	Other	Other
+87a04be0-884e-4b9d-9b0f-b898d240fc5b	1	Other	Other
+87a07baa-33a3-438e-b7b2-8248511d7b7f	1	Other	Other
+87a0b544-9047-4090-acf5-c36c2c71fe2f	1	Other	Other
+87a0f0f5-0913-4dbe-ae1c-a374df465c40	1	Other	Other
+87a0f3c9-e69d-47b5-80c5-bdcfadfbc81f	1	Other	Other
+87a15500-d531-4f45-8265-7b0769054d3d	1	Other	Other
+87a1ae18-ccc8-4600-b8e7-c6f38935f829	1	Other	Other
+87a1b9f9-7c78-40a6-8c8c-c0f22482db5a	1	Other	Other
+87a1ca71-8490-434d-94f5-3c17ffe7011e	1	Other	Other
+87a1d82a-aaf1-4216-89d3-cf719bcb6351	1	Other	Other
+87a1fb28-cdcf-4196-b236-c4141b3e53f7	1	Other	Other
+87a215d5-9e19-4cb4-9e1b-e8375444edf6	1	Other	Other
+87a22d30-7d63-48cf-985f-e56a42ff322d	1	Other	Other
+87a2361d-a604-429b-9ab8-f15485e42d06	1	Other	Other
+87a25888-ae20-46d7-8195-95cd4b4e394b	1	Other	Other
+87a281c8-5ec7-4729-918f-465da1bd35a9	1	Other	Other
+87a31c79-c6d0-454b-b235-6ccd56bdc4c8	1	Other	Other
+87a33493-77c4-481a-a4c6-4dcfe0586eb5	1	Other	Other
+87a346c4-81a1-4e9a-a451-4aa9b0db9f7c	1	Other	Other
+87a365cb-3dc6-47cb-be0b-dc9efe8dc983	1	Other	Other
+87a370c8-7915-4b57-ae0f-8ff4484dc1b6	1	Other	Other
+87a3b1a7-ce3b-435a-a620-c93b864766e4	1	Other	Other
+87a3de7a-e83e-4fc9-8818-081422bd665c	1	Other	Other
+87a41459-b472-484c-8139-55f6852d34a0	1	Other	Other
+87a4265e-9047-45fc-9d2f-a8a4a6eaff0f	1	Other	Other
+87a43153-d1a2-4757-8883-da2822ece964	1	Other	Other
+87a46dab-3ad8-4f23-bd1d-c15aaea421d6	1	Other	Other
+87a48583-db3e-49a9-a45d-43cc51df11f9	1	Other	Other
+87a48c91-313a-4208-a2ac-c53ccf473dbe	1	Other	Other
+87a4a820-a278-449b-a71e-9806f9c8e555	1	Other	Other
+87a4baa0-d511-47bb-a844-ebe082bf746b	1	Other	Other
+87a4be26-ad46-4958-8249-9d80418f201e	1	Other	Other
+87a4e728-5f87-43e9-b544-665cbca78cdb	1	Other	Other
+87a536df-3b3a-4962-a41a-51b930443de4	1	Other	Other
+87a539ed-1141-4a8b-a706-32db5961207c	1	Other	Other
+87a55511-3dea-4c51-8d84-094a7d30df24	1	Other	Other
+87a57944-6926-4713-ad36-87312901429f	1	Other	Other
+87a5857d-9270-46a3-a364-f7da563d2dc8	1	\N	Other
+87a5fab4-6438-4aa3-b29b-00da5c00624f	1	Other	Other
+87a69662-6da5-4dc4-8566-6a4ce12ceb01	1	Other	Other
+87a6fd47-5d80-4481-b4ab-0ca4123015a2	1	Other	Other
+87a73658-80aa-4dd3-b687-d44b8fa3131c	1	Other	Other
+87a763fd-be07-4b8c-bbe9-c43732480648	1	Other	Other
+87a77f02-3a75-4020-886e-cab1273c1794	1	James	Other
+87a7db51-6368-4618-92e7-0bb0437a6430	1	Other	Other
+87a80042-6009-4368-a352-3b2bd789599d	1	Other	Other
+87a842f2-f741-4bff-801a-65b3bb439df7	1	Other	Other
+87a90fdc-47ee-4c97-a773-d00a49de55e1	1	Other	Other
+87a93789-7828-40c9-81f3-9636b68e90eb	1	Other	Other
+87a944d6-3898-471d-bd83-9b6e3f6d8320	1	Other	Other
+87a98e8b-c65b-4907-be13-11cecbf56e3d	1	Other	Other
+87a999c2-4564-4d11-b834-76da906bfc76	1	Other	Other
+87a999ff-d749-48cc-8854-e8d2420a4b20	1	Other	Other
+87a9ac59-b991-4d3e-9640-99282d6e88dc	1	Other	Other
+87a9b405-1988-4c5b-a9bd-8f59d83c5d60	1	Other	Other
+87a9d0a8-c9e9-4ba2-b532-cd84373e4268	1	Other	Other
+87a9dc4c-061d-4f39-9024-637ec43dbfe9	1	Other	Other
+87aa2b6f-2f43-4461-b93f-37daf02bfe98	1	Other	Other
+87aa2d44-6ca3-4034-9605-27d2ebaf4c5d	1	Other	Other
+87aa3ea5-ba73-4e65-9624-6328151e9576	1	Other	Other
+87aa7b71-74d7-4a65-b2e1-9cc6a38ea66e	1	Other	Other
+87aaa98b-1427-41fa-a063-05f7386ae195	1	James	Other
+87ab18d8-dfc0-406d-b498-1793cfd1e2fc	1	Other	Other
+87ab1b80-ee3e-4bef-8a19-86f558231864	1	Other	Other
+87aba121-430b-4760-9890-3dbf67e15c29	1	Other	Other
+87abc96c-8dc7-493e-878c-b25c60a0046f	1	Other	Other
+87abe60a-0b81-4029-bd66-7d04a5ba683b	1	Other	Other
+87abf19e-ba0c-42f3-b54e-3b8f0c9ee806	1	\N	Other
+87ac24b8-9dc1-42fe-9bb9-262c4358eaf0	1	Other	Other
+87ac3ec6-17fa-49e3-9f90-146cb3bf531a	1	Other	Other
+87ac4219-1ed7-44cb-985c-6d53a1e15be4	1	Other	Other
+87acae8d-30c1-43c0-906d-84431ada7a01	1	Other	Other
+87acb9bd-a105-4ca8-a203-e481e3e89bd1	1	Other	Other
+87ace8c8-7424-4391-9b77-6278e2c25990	1	Other	Other
+87acf564-7346-4aa7-a990-95b4f9708bb0	1	Other	Other
+87ad0973-1a1b-4f84-9787-1dec6263e5bf	1	Other	Other
+87ad2042-1590-40cb-82f5-6c5875dc21ed	1	Other	Other
+87ad5311-abae-476f-aa9f-dc0f21d71f74	1	Other	Other
+87ad69d5-3c6c-44a7-a91d-d501ae91242c	1	Other	Other
+87ad7e08-ff0b-47a1-98e3-9bd478a85794	1	Other	Other
+87ad8de4-b453-42a6-b941-6bcddf5c98ea	1	Other	Other
+87adcc09-2ef5-447a-9f1e-9951de588aba	1	Other	Other
+87ae4a53-dc5c-4d82-9b49-d9d00b3d7b12	1	Other	Other
+87ae80a1-4ccf-4053-8885-71b63ff792dd	1	Other	Other
+87ae8f0b-f617-4506-a47d-b7ce5674599e	1	Other	Other
+87ae912b-601b-4b1d-9fea-cd19a9aa766f	1	Other	Other
+87aea582-3842-4356-b5eb-85c5b29fa270	1	Other	Other
+87aeb73c-9926-11e7-bdcc-fa163e8624cc	1	Other	Other
+87aed697-26f3-419c-b34a-71d64d69010a	1	\N	Other
+87aef92d-aeb5-43ee-9f92-fc73228c7ecd	1	Other	Other
+87af18e7-8281-474a-a1e1-647fc63d19a5	1	Other	Other
+87af4a17-c03d-46e3-b463-f26e89705bf6	1	Other	Other
+87af692d-cfee-4ec2-b469-1d994f23c959	1	Other	Other
+87afd5ab-0b63-4cf2-bb15-9799af354721	1	Other	Other
+87b025b7-e78f-4df5-9487-339e6650fbdc	1	Other	Other
+87b03589-e2bd-4289-be8f-68d78d828c60	1	Other	Other
+87b06490-73d0-44ad-ac97-6b412eeb1ad0	1	Other	Other
+87b09db6-9697-4fa0-b1b1-a542a6798c27	1	Other	Other
+87b10e5b-0f93-469d-abec-4c881a2e2bf2	1	Other	Other
+87b16597-1bfc-4477-a237-92cf50150d3a	1	Other	Other
+87b1bb5c-3bb9-49c9-99b3-312ae1257929	1	Other	Other
+87b1e69c-7cdb-4a8b-bdd4-a75a05e46172	1	Other	Other
+87b1ef29-9eef-4e49-88cf-cd3d49a21568	1	Other	Other
+87b210dd-0f10-4b8c-aec1-2806d9c13f51	1	Other	Other
+87b24fd1-43bf-4f1d-9c2e-04ae26723000	1	Other	Other
+87b25a60-5cdd-4a26-a1ef-2ab102e3c753	1	Other	Other
+87b279f2-492b-4cd4-acd1-5244117b80fc	1	Other	Other
+87b28d91-ea19-49c4-aa80-5342c90b82c2	1	Other	Other
+87b2cf14-910f-45e5-be54-92a6d3f62093	1	Other	Other
+87b2f234-3f7a-41e1-83a4-c8408df8c82c	1	Other	Other
+87b301a7-2a69-44ea-8943-05d4be9afd1e	1	\N	Other
+87b30bc1-8b84-4eb2-b2fb-ae6a8f5cacd9	1	Other	Other
+87b324ae-b0fd-45e5-8180-503468672d53	1	Other	Other
+87b3b3bd-4a61-4111-8769-f3e10bab508a	1	Other	Other
+87b3b6e7-d910-444a-a73a-251aa6150cfb	1	Other	Other
+87b3b840-eeea-485e-bb76-c8f90800cb0e	1	Other	Other
+87b3bf20-7fc4-4cdd-8db1-03eca46e4057	1	Other	Other
+87b3bf80-8f4a-4811-8c9a-1fe2dd4ba61d	1	Other	Other
+87b3c788-2820-455c-92f6-998653c7b814	1	Other	Other
+87b3eb76-8f85-4e14-b291-36e0096911aa	1	\N	Other
+87b419a7-a581-4675-b04c-1fc46cbca7a1	1	Other	Other
+87b4a6a6-d3e3-4160-8c8d-11e7e702b173	1	\N	Other
+87b4c35f-0290-4f5f-b664-c4fc804219a1	1	Other	Other
+87b4c754-db86-4dee-af5d-c7790899c991	1	Other	Other
+87b540f9-bfa7-4a3d-bc47-3cb2d8e167e7	1	Other	Other
+87b56113-148e-4e87-9735-262e26b61cc6	1	Other	Other
+87b5a672-231a-428c-ae4b-fb7ea934aa22	1	Other	Other
+87b5ae73-12aa-4f2a-a42e-7c36c4c7a1dc	1	Other	Other
+87b5b878-bdbe-45a7-be91-8733e531255c	1	Other	Other
+87b5b94b-6016-457c-90ef-74d2ff0ab52b	1	Other	Other
+87b5dbf9-b386-4b33-9440-e131db50049f	1	Other	Other
+87b6aeec-5308-4b21-a433-38cfb843a735	1	Other	Other
+87b711a4-ae71-4b75-a488-753e7d7e6af0	1	Other	Other
+87b7304e-23dd-46b5-9b77-8451e2ba333d	1	Other	Other
+87b73668-c1c6-4cec-89e3-9f118a1869f3	1	Other	Other
+87b743e7-a813-4098-94a9-197fb8837e2d	1	Other	Other
+87b7527b-c5ca-405b-9e10-de218454a797	1	Other	Other
+87b7b242-ec68-4484-8623-16f2559b55e0	1	Other	Other
+87b7b775-d26c-40fe-8d15-04dd0dbebc55	1	Other	Other
+87b7dbb6-8704-4ec2-840f-9e1aca35a79f	1	Other	Other
+87b80bd6-f922-46eb-8e30-f14daba69898	1	James	Other
+87b88e75-cb89-4260-bc54-066bff4886a1	1	Other	Other
+87b8e02f-49dd-4049-9033-c6b9c978799b	1	Other	Other
+87b92b02-205e-4973-8a36-b17b14bd9e9f	1	Other	Other
+87b97684-d581-44ad-9b8f-20af7e526d6a	1	Other	Other
+87b9e5a0-b3cd-447a-9db5-539964de43fc	1	Other	Other
+87ba2dab-75c8-4798-b889-c9c388ac51e6	1	Other	Other
+87ba94f0-4049-4ac6-87ba-271211c137bb	1	Other	Other
+87bb7436-6bd2-4547-9764-bd847e77af7f	1	Other	Other
+87bb76c5-f803-4b97-9b72-b13f7091a147	1	Other	Other
+87bbccbc-ba57-47ee-8c02-4e07bbf0cebd	1	Other	Other
+87bbdb27-efa5-4bc0-8090-30e18d2bde42	1	Other	Other
+87bbf3c3-f0c7-460b-aa46-80746bf29a36	1	Other	Other
+87bc3d11-ea2f-4cea-bbff-bf2f2b592d7d	1	Other	Other
+87bc521f-d541-4c75-bc08-3be8f127aa4f	1	Other	Other
+87bc6270-6b40-4917-88e9-0f5a8f494dba	1	Other	Other
+87bc7be6-4780-4aa9-bbbb-7549f3087634	1	Other	Other
+87bcaa88-1fd1-452c-8b73-27e2d2271902	1	Other	Other
+87bcb8ba-21c5-4eff-877a-1612688f9eee	1	Other	Other
+87bcd1b2-a3b7-4b09-88e5-9d9ea1a902df	1	\N	Other
+87bcf24a-749a-4c3c-b110-234e5aedc8fb	1	Other	Other
+87bcf783-7e31-47c1-bb27-afb4b920ebb9	1	Other	Other
+87bd1e57-b749-46d9-9049-429a77c6764f	1	Other	Other
+87bd348e-eadf-4f41-89d5-9ea19a8a5204	1	Other	Other
+87bd3cf0-e2e4-4a04-a598-e8e88a0d12ca	1	Other	Other
+87bd5ac8-4937-4da0-bc71-13ea26566d34	1	Other	Other
+87bd8aab-5765-4294-98d8-f07fac5002d2	1	Other	Other
+87bdb2be-a922-46c9-9954-148c52a35e9f	1	Other	Other
+87be45bd-9644-4395-ad4f-f456da830a01	1	Other	Other
+87bea887-6ed2-4a7e-aba9-9dd40441e845	1	Other	Other
+87bf00b4-1da0-4258-9408-541c39c8c002	1	Other	Other
+87bf065e-4472-486a-9e5c-e9b0cd35843f	1	Other	Other
+87bf2a91-d0d7-4e48-ab1a-fcec471a9b48	1	Other	Other
+87bf3034-d096-4a63-baad-45e5016ee5d8	1	Other	Other
+87bf74ac-82bc-4159-a1e3-fa9c832aac07	1	Other	Other
+87bfa169-62f4-412d-8d41-0771011daca6	1	Other	Other
+87bfba54-21a5-4322-aa63-6b957dbb72ab	1	Other	Other
+87bfba99-5767-4d75-994b-64c4291f40ac	1	Other	Other
+87bfd1ca-2bf6-4967-a184-2562e0910dd8	1	Other	Other
+87bfe1e1-961d-4dc2-93c0-88f33630b7ac	1	Other	Other
+87bfed0d-0a6c-4548-a41d-40b473c7da09	1	Other	Other
+87c01f37-0693-4335-8555-6b417b9bf1d4	1	Other	Other
+87c05bd2-5f76-4c5f-b899-a83dfddbf6bf	1	Other	Other
+87c064f2-cfb3-4a08-8399-c4ae17a7d80c	1	Other	Other
+87c0c2ec-9777-4db4-9b7b-9917094ab34d	1	Other	Other
+87c0d416-fa61-4659-969e-0c4ff96a2814	1	\N	Other
+87c0e73e-7fea-49ae-9d43-7891cab40330	1	\N	Other
+87c11d76-389c-4e3f-b162-a573f2063941	1	James	Other
+87c17ac3-d28f-49a3-a846-04da131bcf57	1	Other	Other
+87c17fce-d0bf-49f8-b3ce-acefee49f59c	1	Other	Other
+87c18895-01a2-4074-8d9e-d90622238067	1	Other	Other
+87c22125-4bf9-419a-8c91-b1184cc247ac	1	Other	Other
+87c229ac-fc6e-42f4-b949-4e786bc3de40	1	Other	Other
+87c22d6b-f97c-45a0-a53e-87d6561adbc4	1	Other	Other
+87c237d3-34ec-4879-9733-ff875f85dbc0	1	Other	Other
+87c24990-c629-4cca-a0d0-8a9e319970c0	1	Other	Other
+87c268be-2c2b-481a-87d7-16ca3a32cdb7	1	Other	Other
+87c29f13-d892-488b-9fb6-92d191c65fb2	1	Other	Other
+87c2fef0-bc21-412f-a357-e7194bb90a2a	1	Other	Other
+87c30245-19bf-487e-8c10-db088dfe05d3	1	Other	Other
+87c37b26-9825-4f00-8ada-b07406ffd9a9	1	Other	Other
+87c39b82-bba4-4972-b63c-fb99e487efda	1	Other	Other
+87c3b53f-9f75-41f9-8da3-634da40d3e9e	1	Other	Other
+87c3c83e-1f1c-4334-b92f-294a75b382e3	1	Other	Other
+87c3eb93-08ea-4357-8548-ac9059aeccf0	1	\N	Other
+87c42bfb-a0c3-4c7f-80ea-7db908e78bfd	1	Other	Other
+87c49222-598c-4a18-be81-049283c41a6b	1	Other	Other
+87c4a539-5e24-43f1-a671-7cff81912dac	1	Other	Other
+87c4dc36-f079-456c-a1cc-d42c4cbc363b	1	Other	Other
+87c50ef4-28f8-4e2b-a732-c414fac443a5	1	Other	Other
+87c54042-aebe-4822-8130-1d680053df64	1	Other	Other
+87c57379-6b3a-44be-8db3-54ca0ed42d3f	1	Other	Other
+87c665e6-1d4b-4950-86bf-162ad36571e8	1	Other	Other
+87c666f1-3a69-4c86-ab23-564702443dfe	1	Other	Other
+87c6741a-f586-4b37-9aff-c1883dd24a84	1	Other	Other
+87c68812-6edb-45eb-a867-388402043462	1	Other	Other
+87c68e44-d3cb-44da-aa5a-bfdd5ed848e2	1	Other	Other
+87c6ec0e-967d-4d28-a247-70e23d3fa1fc	1	Other	Other
+87c703cc-01dc-414f-9d24-91583cad54fb	1	Other	Other
+87c71028-aa5d-4c72-a348-7da6458dfb15	1	Other	Other
+87c71f2f-159e-4390-8711-31acd5cf6d05	1	Other	Other
+87c73297-d685-422c-b4ec-d2fd1dec4670	1	Other	Other
+87c77cb0-547f-46f1-980e-b79bf1fe0b8b	1	James	Other
+87c78501-7a23-4390-b332-0b1027ed32ec	1	Other	Other
+87c786a1-6efb-4b49-b3ab-7fb4e062e34b	1	Other	Other
+87c78a4b-1c58-4e85-afe5-3e356f1ab89a	1	Other	Other
+87c7b27e-cc80-4136-b169-a12b649004d1	1	Other	Other
+87c7b691-bf2f-4396-a1ce-90f975141ae7	1	Other	Other
+87c7bc7a-800a-4c62-a61c-205cdb8add06	1	Other	Other
+87c7cc5c-1827-4bc9-8bca-fbe616cc0245	1	Other	Other
+87c7d25f-14a4-45c4-b3eb-3efb1981c387	1	Other	Other
+87c7ea3c-3107-49e0-b212-b68ff7d92b28	1	Other	Other
+87c7f645-c6a6-489a-a473-b7da9c16e187	1	Other	Other
+87c81e10-f1cf-484f-b383-b1ef7687fc48	1	Other	Other
+87c8ae1b-7471-4e8b-87f3-104a0708b95a	1	Other	Other
+87c8c1ef-f7a7-4277-a2c0-6828b1a7996d	1	Other	Other
+87c8d12f-02a9-4009-9e42-6fd14961004a	1	Other	Other
+87c95044-28c0-44c3-a2f9-d7ea74be780a	1	Other	Other
+87c97aea-348e-450a-97e3-63daba24414a	1	Other	Other
+87c9ce33-6e36-4e6e-9649-96dc9e57d0b0	1	Other	Other
+87c9d649-c09f-4552-bdc6-7dfaefcee551	1	\N	Other
+87ca0c6e-635a-41e0-98c5-a54e06fe9c5a	1	Other	Other
+87ca7d67-f1f6-4e6c-9136-125df85a66a4	1	Other	Other
+87ca8ca2-ef5e-4e18-a82a-37588dbaf295	1	Other	Other
+87cad0d3-57e2-45de-a901-661609141f10	1	Other	Other
+87cae18a-e89b-4860-b074-5ea63f8d2e96	1	Other	Other
+87cb00f6-ee15-48eb-a4d6-6286a2c38806	1	Other	Other
+87cb3bb8-b664-4517-a49a-0f988f3118ae	1	Other	Other
+87cb7b12-0bdc-40d1-b919-81bdcffe4b27	1	Other	Other
+87cc98be-933b-43b4-a51c-5bc99cf98608	1	Other	Other
+87cca85f-2143-4b65-8586-a1edf8b0b43a	1	\N	Other
+87ccceba-1af8-45c0-9c7f-b755a62d52d9	1	Other	Other
+87ccd416-6eb9-4738-9d7b-0ea31ba02473	1	Other	Other
+87ccd747-6ed1-438a-b7ce-5bdf6a715bf8	1	Other	Other
+87ccf393-e702-4ae9-be2b-411bbe3ed422	1	Other	Other
+87cd0e49-4620-4197-b2de-e27daf930abd	1	Other	Other
+87cd2232-45a5-44d3-979e-ef928f4795e9	1	Other	Other
+87cd384c-c414-4401-ae47-179ebf95bf4d	1	Other	Other
+87cd7184-71f2-41fb-b63b-8e3ccb9cd32a	1	Other	Other
+87cd96ea-913a-4da0-8bee-58edcdebcc00	1	Other	Other
+87cda616-4a2c-4f4d-a8a3-4b16c0e35b1e	1	Other	Other
+87cdfe90-8ff4-41cf-a02b-6c1cabbf1084	1	Other	Other
+87ce2ac8-1e84-4bb6-9d22-8d21fce4c7c7	1	Other	Other
+87ce412c-b619-4c12-ac01-a656dc80f602	1	Other	Other
+87ce457a-8c81-428b-816b-e119fb14ebbc	1	Other	Other
+87ce6348-5dc3-4bea-bb0d-a64b91c5885c	1	Other	Other
+87cedf81-a98e-48d1-80e6-7f306cd2af9d	1	Other	Other
+87cf099e-5722-49db-a07e-ee38833e6167	1	Other	Other
+87cf31c8-06d7-4c76-b26a-aa593cacc901	1	Other	Other
+87cf60be-89a6-4424-8cfd-e663264bc766	1	Other	Other
+87cf7869-6fab-4119-8e26-e4b8b40d7ef6	1	Other	Other
+87cf7c5b-1665-4830-a434-60336ed62cf9	1	Other	Other
+87d03a47-42b5-4e7f-a56f-f96f0d4bba08	1	\N	Other
+87d06f0d-7a7c-4001-ae03-9ea76cd5aef3	1	James	Other
+87d0ad8d-f3f0-49d7-a970-a1412ae5923b	1	\N	Other
+87d0b943-79fc-45cf-8266-3d3b5ea5bb60	1	Other	Other
+87d1111e-844d-4d64-be38-83c344f0a916	1	Other	Other
+87d11ae5-21da-490c-a4d9-769ea667dade	1	Other	Other
+87d1323a-be9b-4dcf-91ac-dc0ad8a380f2	1	Other	Other
+87d21265-c8d1-453e-8ab1-4a3627993716	1	Other	Other
+87d26f28-17ba-48e8-8270-d7641fa25b8d	1	\N	Other
+87d281a6-f8cf-47e7-9805-70b50be8f89b	1	Other	Other
+87d28aa6-9cef-47b8-a7a6-13050f4ac535	1	Other	Other
+87d2f49f-1f45-41e4-a478-a2357c029aad	1	Other	Other
+87d31ece-d81e-4580-9d34-ddb1a435b326	1	Other	Other
+87d3424f-5fc9-4441-b631-19f830f9621c	1	Other	Other
+87d381ac-e128-421a-8441-bc8ebe7e2581	1	\N	Other
+87d3839d-c4c9-4238-b4a4-f6caa3f13e1f	1	Other	Other
+87d3c88c-cd98-4559-b5ec-275d0a472090	1	Other	Other
+87d3cc6b-969b-47ff-8115-c0fab621d314	1	Other	Other
+87d3cc90-f572-4009-9a5b-55ee90b595d1	1	Other	Other
+87d3d841-e419-41d9-a887-dc51cfac10c5	1	Other	Other
+87d3e540-a0f5-468d-ae40-2abf2aeacb87	1	Other	Other
+87d481b3-2be6-4c61-a0cf-04b30a7f463d	1	Other	Other
+87d4a9e2-ec91-4408-99c9-ad6d99dd729a	1	Other	Other
+87d50a86-636e-42e4-a51b-527ba0125cdc	1	Other	Other
+87d55fed-4774-4ea2-8131-4efe002aa69c	1	Other	Other
+87d5716b-e6af-4a49-90f4-f44bd78bbb1f	1	Other	Other
+87d576b4-ca30-4748-8ed3-f26b5fb5fbc9	1	Other	Other
+87d5a1fe-dcc5-47de-a7b8-b7b228a4ae52	1	Other	Other
+87d5d293-4861-43f4-b1fc-0e28aeb9e250	1	Other	Other
+87d5e137-2b3a-4327-b1ca-5ca00d92d220	1	Other	Other
+87d6020b-937c-4634-9743-ffec955056af	1	Other	Other
+87d618cd-5715-40c1-bdd5-8decd865b766	1	Other	Other
+87d65bae-84ed-4b79-8c38-0a46ed57ad39	1	Other	Other
+87d670d0-9b02-443a-a84c-fa3379f7af08	1	Other	Other
+87d6a4fc-aea7-410a-aa30-9b753452cc99	1	Other	Other
+87d7489a-4183-4c9a-8f4c-a28fe5225186	1	Other	Other
+87d76514-c0f2-4702-a222-779b1621a8ca	1	Other	Other
+87d778e3-468b-44f6-92f2-27cd757c1bc8	1	Other	Other
+87d7c00c-1791-4da1-bf99-986198f87528	1	James	Other
+87d7c603-3223-4118-a8ab-fd5c66fbd169	1	Other	Other
+87d7f0e9-1f30-44ca-ba9c-db1ec5359277	1	Other	Other
+87d8258f-91b6-47d9-a31c-5044b02af6a4	1	Other	Other
+87d82bce-762c-412b-95fb-0493f812e402	1	Other	Other
+87d90006-3c23-4fa3-817c-c2c4f4a7d862	1	Other	Other
+87d92aad-bd49-4263-bc93-afec0478570c	1	Other	Other
+87d92ea6-0b30-4794-bf62-7ebe03a746aa	1	Other	Other
+87d9388e-5c48-4768-a5c0-9e24df78170a	1	Other	Other
+87d93bdc-acd4-476e-bbc2-3d39dfb272b9	1	Other	Other
+87d93f44-d84f-4339-9714-14033dbfe48d	1	Other	Other
+87d954b8-eac5-4f65-b065-06733e86ee7e	1	Other	Other
+87d99dcd-7f88-4749-a0c8-6af4898708f0	1	Other	Other
+87d9cdcb-3ee4-4d7e-b4fa-c49b0ed2aba6	1	Other	Other
+87da1bcf-4125-4318-8330-28b9d38b819b	1	Other	Other
+87da3c1c-8aba-4084-a0f7-c4d63bc45509	1	Other	Other
+87da5d40-dfac-4258-bfe3-0be1ce334cfb	1	Other	Other
+87da6fcc-cb87-4caf-b4e5-5f77d81c13eb	1	Other	Other
+87dad3ec-3ecf-48c3-9164-daf85274e61f	1	Other	Other
+87dadc14-ef6f-433b-8517-9c05530ec15c	1	Other	Other
+87dae83c-9915-405d-8a8b-fe7d0b62f205	1	Other	Other
+87db2094-6619-407a-bac8-4ccbac2add77	1	Other	Other
+87db32a3-b437-4760-a492-6b82f28bf1e7	1	Other	Other
+87db58ad-1b61-4fd5-b150-b7e609389f91	1	Other	Other
+87db7a04-9cd1-439f-b505-894c8c7c1f5a	1	Other	Other
+87db922b-a45d-405c-99cd-1e04d1c0deba	1	Other	Other
+87dba47d-60ec-4123-a886-fcaa83c781e1	1	Other	Other
+87dbaa8c-2dff-4c6a-b694-f48a94afbb78	1	Other	Other
+87dbaaec-3e77-4429-988a-69d3855e67a1	1	Other	Other
+87dbe9cd-dc40-4b78-b85c-c9d0b398954f	1	Other	Other
+87dc2747-45e0-46ae-9c4a-22190d41f55b	1	Other	Other
+87dc364f-a1ae-4271-9199-38c36816a6a1	1	Other	Other
+87dc6f45-57f2-4159-8858-84ea898fbcf0	1	Other	Other
+87dca8e3-91fa-4431-b100-cf78cbaccbb7	1	Other	Other
+87dcd2aa-e270-48dc-a8c9-c3ae54c173b2	1	Other	Other
+87dcea57-e507-4c8a-8e67-2f414155eec9	1	Other	Other
+87dd0e79-0780-437e-9da7-ed04ba7c6f30	1	Other	Other
+87dd1a1a-2218-45ef-b4a7-a2b630c47863	1	Other	Other
+87dd1e02-aebd-4d7b-b6f8-931c9c39c0ed	1	Other	Other
+87dd3594-cb53-4731-9eff-4e8313be4b23	1	Other	Other
+87dda0f0-7ae3-4a35-948b-15c7fd8dd3fb	1	Other	Other
+87ddb204-4e25-4b9a-9d0c-6441a32cbe5b	1	Other	Other
+87ddc1f9-e75f-4d78-8b0c-d07a76253b48	1	Other	Other
+87ddc51d-7fd6-42bf-80b0-1621b690581b	1	Other	Other
+87ddf823-05e1-4a66-b520-cca4239d371e	1	Other	Other
+87de1fae-0d1f-442e-a47f-657eac530648	1	Other	Other
+87de2360-407c-425b-b3c3-d522eeed2aa2	1	\N	Other
+87de4fe6-3e92-45ff-b41f-ea39e608f66a	1	Other	Other
+87de8ef1-5b6a-49d8-952e-6fc07c63d18e	1	Other	Other
+87de8fc0-5129-4c8e-a1a3-1d3a71cee912	1	Other	Other
+87dead5c-0dd4-40cb-9eb6-81b748544db0	1	\N	Other
+87defe0e-e2fa-4aa3-97eb-c90b8fca0cde	1	\N	Other
+87df0b08-445a-4806-a191-630034338e5a	1	Other	Other
+87df5564-4e4f-4e4e-b57e-d04c2c91c3b5	1	Other	Other
+87dfac99-f4ea-4cdd-bbff-bfa730056d8c	1	Other	Other
+87dfc902-bead-4e25-82a9-d84597a94372	1	Other	Other
+87e0389f-4385-4ea7-b20a-60df9695a042	1	Other	Other
+87e052dd-9a2f-45c8-91e7-c74ac82de904	1	Other	Other
+87e11589-cd36-45d7-9c63-3b4194bf3f60	1	Other	Other
+87e1246d-9c34-4d6d-91cc-833f356cd5f3	1	Other	Other
+87e12726-a254-47e5-b9c7-ea728b0d515a	1	Other	Other
+87e141d6-ab9f-4719-9ec7-49d14dff75eb	1	Other	Other
+87e15aa2-8801-4973-bde3-7c9082f18217	1	Other	Other
+87e15de2-6068-4eb8-939f-fa89bd36c032	1	Other	Other
+87e19a9a-a1f4-4ab0-a489-9753cfe35556	1	Other	Other
+87e1d861-b2d1-4743-a62a-fe63c61350bb	1	Other	Other
+87e1f227-bf0b-40c2-af48-c2df523b9a0c	1	Other	Other
+87e1f7cd-bcca-4816-93aa-98d3a21f3e52	1	Other	Other
+87e21232-7dde-46ba-a4de-d8abf0815603	1	Other	Other
+87e21688-b0d9-474a-adbe-27a727474acb	1	Other	Other
+87e238d7-042e-4dcd-ba75-ef65bbad3adb	1	Other	Other
+87e251a4-6a04-491f-ac79-81eb40089b76	1	\N	Other
+87e25e62-4856-41ad-9e5d-b5e05f5608e6	1	Other	Other
+87e2ad98-0930-4d3d-8c29-042b759d169b	1	Other	Other
+87e2c181-d079-4ca8-ae48-3ee1f22ed3f3	1	Other	Other
+87e2e991-bb7c-4716-8ff7-37aed0b061db	1	Other	Other
+87e2f7c6-398a-417a-a105-cf337c4973c5	1	Other	Other
+87e2fb9b-bdd4-48ed-b6dc-66c71e423ff3	1	Other	Other
+87e30ebb-f86b-43d1-aea9-b5b3cbface75	1	Other	Other
+87e32df3-c639-4383-9555-ebbb3aad6bfe	1	Other	Other
+87e354d2-4555-4c69-8f59-0e7142350522	1	Other	Other
+87e378f6-9158-4c1f-beac-ccaba2b496e9	1	James	Other
+87e379ed-6c1f-4927-b88b-148664605d45	1	Other	Other
+87e38149-8efd-44f9-88de-f5f732705494	1	Other	Other
+87e3cb15-d529-4449-843d-8192c26ebcac	1	Other	Other
+87e3ce84-6124-43fb-bb3f-ac86237c49d9	1	Other	Other
+87e3d079-16f4-473e-aa62-ab89f1907676	1	Other	Other
+87e40e43-99e6-46dd-ba87-749f0e9b337e	1	Other	Other
+87e41d0d-4f00-4333-aed2-e20cce51f3f1	1	Other	Other
+87e425f1-7ae1-47b8-815b-74b0787e8b9e	1	Other	Other
+87e45e20-ef78-4002-9843-d22f75752c00	1	Other	Other
+87e46abf-178d-4f02-b985-f2c7cc264ad2	1	Other	Other
+87e52cd2-ee25-4998-907f-70001902b356	1	Other	Other
+87e564a7-76f9-4b91-8df9-edc33563c318	1	Other	Other
+87e5c821-d89e-4f9b-8953-3ba0e72c5aa3	1	\N	Other
+87e5d110-a621-442f-a876-12bb7ed4047c	1	\N	Other
+87e5ef3a-a4d1-4290-9d52-700a9dba72b8	1	Other	Other
+87e61774-c86f-46d2-a22d-64d21fbc2b2f	1	Other	Other
+87e667fe-ab00-4d90-8204-8955249b2ea6	1	Other	Other
+87e6704a-9990-4386-a98d-7284b25c1db8	1	\N	Other
+87e68ef0-31d5-44b8-a42d-89b262522b39	1	Other	Other
+87e69a5b-a79a-42b2-bdca-d46c357c6884	1	Other	Other
+87e71181-2932-44e3-97b9-1a30b9a6475e	1	Other	Other
+87e74362-e6a6-49c8-8249-16d2069501e8	1	Other	Other
+87e75ca6-9d15-4dc2-9556-3ce8ecf90992	1	Other	Other
+87e763db-5cd2-48f1-a923-705eda7a5ab2	1	Other	Other
+87e79b5a-7bf6-4020-9abb-2f8bc381e722	1	Other	Other
+87e7a429-e685-4f00-b884-5aba54824bbe	1	Other	Other
+87e7dcf9-c0d0-45f5-bcc3-55d55f31d7f4	1	Other	Other
+87e7ea77-6fe2-452e-b3db-5db2b72f4e03	1	Other	Other
+87e802a3-a9e9-424e-9f88-e4921738fccf	1	Other	Other
+87e839d9-4421-4f27-9f78-0be6ec18f582	1	Other	Other
+87e859ef-1cf3-4b5f-871f-7c1fb42a739e	1	Other	Other
+87e85fa4-5ee6-44d9-95f3-c9ab03999fb0	1	Other	Other
+87e8798d-7014-40f0-8dd0-13a8634aea9c	1	Other	Other
+87e87bfe-0c3e-4010-a2bc-575fce95ca69	1	Other	Other
+87e89fa8-9c75-4fb2-aed2-64472685de2c	1	Other	Other
+87e8b72b-b5b5-454e-83ac-884df9b4da81	1	Other	Other
+87e8f702-cd19-4a38-a7e2-65e065178ac9	1	Other	Other
+87e900fa-78c9-4c5e-bf0f-1cfde1dac8c1	1	Other	Other
+87e92e93-6c9a-48c8-a3d5-29a512821f93	1	Other	Other
+87e9c835-2ce8-4eca-908d-aba03a7663e2	1	Other	Other
+87e9cc7e-1c5c-48df-9d64-0d4baa311ec7	1	\N	Other
+87ea0cbc-3851-4e5e-b865-e5f7956f54bf	1	Other	Other
+87ea4d2d-6634-4ebd-a628-9baf56b57c2a	1	Other	Other
+87ea88fa-d16a-4846-be10-4b473dc1d2eb	1	Other	Other
+87eaa6a8-6c2f-4605-8a30-8e8648e05d49	1	Other	Other
+87eaec98-4ce4-49bd-81c9-deb41106e07d	1	Other	Other
+87eb0a14-7ece-4bd2-860d-d9eb35e87598	1	Other	Other
+87eb6ba3-e9b3-428b-a9fd-6b90b4de2dba	1	Other	Other
+87eb7c47-a90d-45c0-90fd-0f3cc05d1084	1	Other	Other
+87ebc100-3bb0-4878-8963-42505ad1a6c2	1	Other	Other
+87ec1b13-195f-4efe-aea3-08fc58fbe5fd	1	Other	Other
+87ec248d-9c4f-45c4-a5cf-040faef46c12	1	\N	Other
+87ec255d-20ab-402a-8fb9-0b4e487b7132	1	Other	Other
+87ec51b0-12a2-4ffe-81a8-ddccdef0b83f	1	Other	Other
+87ec5fc6-b798-4b0a-8db2-1706d7dc9025	1	Other	Other
+87ec7025-5430-4baa-8859-ef7fda5754e3	1	Other	Other
+87ecba0f-6c00-48c8-8f3d-e85be7f6cee0	1	Other	Other
+87ecf638-0a29-42ce-919e-56d2a8e5eff8	1	Other	Other
+87ed1336-c679-4e96-bf88-6968fb992671	1	Other	Other
+87ed17e1-2397-4575-abc9-a813ebd53191	1	Other	Other
+87ed38b1-d50a-4a1d-8690-652cf8c8920a	1	\N	Other
+87ed45f4-aef5-4dd0-8e99-42e9797dba83	1	Other	Other
+87ed9a40-2a27-4735-9ae6-fde7c7f8da5f	1	Other	Other
+87eda569-05a1-4684-aea9-e12ef7d34609	1	Other	Other
+87ee11c7-2b0a-46bb-a4c5-f606d82a8d7f	1	Other	Other
+87ee5f4d-6841-44fa-af76-c91b8d745b50	1	Other	Other
+87eeea81-d9ec-43e6-b2ac-0f44f2975d56	1	Other	Other
+87ef1790-d18c-4388-89c8-301c876626a2	1	Other	Other
+87ef53d0-b1ec-492d-b91e-1f2294ccef33	1	Other	Other
+87ef6f75-660d-4920-ae30-e15e5e330da2	1	Other	Other
+87ef7dd2-28dd-4b35-bd8b-434e23b729ef	1	Other	Other
+87ef9508-e157-49f1-9380-0decdb6416bf	1	Other	Other
+87efabb4-fd45-4a02-a985-47c86d5d5a91	1	Other	Other
+87efb6ea-90ce-4598-8b5f-ff18fadee6c0	1	Other	Other
+87efba8e-520b-46d5-89bd-309b846ddbcc	1	Other	Other
+87efecd3-b191-4cb8-a690-0626e035f296	1	Other	Other
+87eff4ec-e49f-4dbb-9bea-f2df357da411	1	Other	Other
+87f0042c-fe2c-45be-b2a5-cdff6d0ab7ea	1	Other	Other
+87f04e5d-f10b-421d-9d2b-7a5adb06adaa	1	Other	Other
+87f07126-3a8b-47c6-946d-e2863accbd3a	1	Other	Other
+87f08ab2-7cce-45ee-a39e-8e5dd6063ff5	1	Other	Other
+87f11921-15b9-48cd-8d20-42b85f30f721	1	Other	Other
+87f19ffb-9f69-46ae-a70d-c5a1f987f943	1	Other	Other
+87f1a09d-409a-40c1-be61-4ec92c5e50b8	1	Other	Other
+87f1c210-bc11-41ef-b89f-479410040440	1	Other	Other
+87f1ea2c-2694-4b97-92c7-99cc523d4e8e	1	Other	Other
+87f22c80-62fe-4476-ab11-7efe394ff322	1	Other	Other
+87f23353-6cfe-44cb-aaca-980ffc1c1eef	1	Other	Other
+87f2388a-1eba-406c-97d8-7ee0c3b1fce2	1	Other	Other
+87f2cb9b-c055-43f8-afd4-75a4645ca2d5	1	\N	Other
+87f2ce42-9d03-44b7-8af9-8ee21b24ea55	1	\N	Other
+87f35116-7311-41d8-9b37-1a07193b0fee	1	Other	Other
+87f36c04-06ca-42d7-88a3-afa2b06f9a06	1	Other	Other
+87f3b34b-1c84-4a40-850b-34f15bd05ba6	1	Other	Other
+87f3c7d3-0931-448e-9a70-a0fcafb76367	1	Other	Other
+87f3d240-d3a8-4bec-85d6-93cdf88a9420	1	Other	Other
+87f40cf4-8a6b-4d9c-b702-0f0075a25063	1	Other	Other
+87f411a1-871b-4808-a3f3-0114c4559dd1	1	Other	Other
+87f41b14-74cc-41c5-bd7a-17255304270e	1	Other	Other
+87f46de0-771d-4829-8677-311994f8f0b3	1	Other	Other
+87f4ea5e-9114-4b24-a392-ff254fbb7859	1	Other	Other
+87f4f001-76e4-4784-8f5d-aa3d7013fa84	1	Other	Other
+87f5a1e0-9929-4811-8099-331529c1e7ae	1	Other	Other
+87f5faf7-d582-4c1d-8f02-91f72ae35dac	1	Other	Other
+87f61865-bdb4-49ad-880f-7afd88a1a736	1	Other	Other
+87f648c1-81fd-4ca2-bec5-784014605868	1	Other	Other
+87f6741d-c90a-4c0d-a2f4-ad9bf284c1f0	1	Other	Other
+87f68ae1-18c7-4f72-b0b7-1209f083f67b	1	Other	Other
+87f6a028-a463-48f5-9294-43d931c83509	1	Other	Other
+87f715d1-afb0-4595-870b-ae7136dca921	1	Other	Other
+87f7666a-7b6d-4fad-b8d5-5a9cf0b1878b	1	Other	Other
+87f7868d-502b-478b-a50e-2dcf1b950670	1	Other	Other
+87f791c9-3f54-4023-b176-6787cb398af1	1	Other	Other
+87f7d779-66c4-46a1-b79f-e521ec2baeab	1	Other	Other
+87f7e3f4-4fe3-43a4-b0bb-9e9feafc35fa	1	Other	Other
+87f8299a-ddd8-4cb5-96a9-a8eb7a9b0c05	1	Other	Other
+87f8c392-da97-40af-b5a1-7e0d69a339a6	1	Other	Other
+87f8d15c-eac0-4720-a9bc-9c9a1cd36f1f	1	Other	Other
+87f937b4-25ca-44cd-979a-d24296f16e4e	1	Other	Other
+87f99ff7-c918-409e-8c56-7e79e011fe8f	1	Other	Other
+87f9d327-f316-4373-be85-41d730540f68	1	Other	Other
+87f9f243-b309-4450-9e80-a32f5b99ecd0	1	Other	Other
+87fa257c-6dd2-4b31-823f-c62a1c3b1fff	1	Other	Other
+87fa4a50-fb47-4986-9b04-c7febdc92cfe	1	Other	Other
+87facda4-71dc-41b7-bd8a-518fc7f787c6	1	Other	Other
+87fae13f-95c7-451b-8943-cb9c95e087f9	1	Other	Other
+87fb1333-5ad0-4057-9dec-7d5adcbf3713	1	Other	Other
+87fb1be3-4e1c-4876-9e26-408f4cf74afb	1	Other	Other
+87fb1da4-5a55-49c1-9260-a4bd360780bf	1	Other	Other
+87fba788-bf29-43f2-b50e-d72c012c0e42	1	Other	Other
+87fbce3e-cc8b-4dc2-a877-b7383e64a859	1	Other	Other
+87fc19b8-ba35-4fa7-96d6-e24bda8afb31	1	Other	Other
+87fc2c73-63dd-4d6e-8e4e-713a2cc8c498	1	Other	Other
+87fc5290-734c-49d3-bd54-7457d456b675	1	Other	Other
+87fc955e-a74e-45f8-9a9c-a977293d2236	1	Other	Other
+87fcc42e-247c-4200-8c12-42f782ae88e4	1	Other	Other
+87fce941-b8e7-47b6-8f25-b4c9b125292b	1	Other	Other
+87fcfdd5-cd0e-4661-8708-cfbf702a71b2	1	Other	Other
+87fd4b18-d454-43d6-9763-d06c4a2dcf15	1	Other	Other
+87fd5891-2879-4e5f-821e-ba39c4f6adc8	1	Other	Other
+87fddb26-b499-433b-be8e-855dee1b0d46	1	Other	Other
+87fe0fcb-ebd3-4647-a0c9-0204cc1fd92b	1	Other	Other
+87fec1f3-8057-4410-9048-903df8a39084	1	Other	Other
+87fef4ea-6d4f-4296-b0e6-7bc9f4b258d2	1	Other	Other
+87ff0080-2fff-4426-bee0-b834a42fc54a	1	Other	Other
+87ff30c2-ac55-4c7a-bb9c-c307b0cf3c23	1	Other	Other
+87ff46b4-a7da-4ae9-bec0-1f0d0d2b03ad	1	Other	Other
+87ffb454-eb19-4437-8457-71a0b6829fd3	1	Other	Other
+8800f4ce-5dda-4ce6-b0dc-e767b6bfb6a4	1	Other	Other
+88011bf0-2d60-4ac7-a7df-862b06793225	1	Other	Other
+88016fcb-5094-4dbb-bd7c-0d8296c0e30b	1	Other	Other
+88017bf0-651f-448e-b9df-6f20b06d2d39	1	Other	Other
+880194a0-187c-4995-b551-f3942d254a1c	1	\N	Other
+8801d73d-c225-401f-af9d-c9b99935aa15	1	Other	Other
+88023f32-20d2-43e6-98db-697589e721e2	1	Other	Other
+88024eda-3556-44fb-b91a-127bc8eedd4f	1	Other	Other
+8802745c-fad7-49df-b56a-6ee6ecc9a6e5	1	Other	Other
+8802bf14-c391-4ef7-8008-a9a4e274fa07	1	Other	Other
+8802c0cf-02f2-44d2-8b14-b5d4bffb00cb	1	Other	Other
+8802d1d6-ccdd-4507-bd51-d4136043ea21	1	Other	Other
+88030e16-2bad-4c03-8e08-b46c80c26090	1	Other	Other
+88034df4-09e2-4134-8443-984949bffeb1	1	Other	Other
+8803f390-748c-4c2b-bd03-2fc097bd10a7	1	Other	Other
+88041075-cd5a-484e-8821-694b659af583	1	Other	Other
+88042441-111d-4537-9638-ec0905daec0e	1	Other	Other
+88043362-fa69-4260-9213-7e0df52ca460	1	Other	Other
+88044f20-da48-4a6d-b237-00b9bcc38693	1	Other	Other
+8804af81-aa6f-40a7-8f00-3c79bf2df25c	1	Other	Other
+8804c95e-01a9-435b-b3a6-b94229c76ddb	1	Other	Other
+8804e7d8-4e31-455b-9b2f-87fe538dab6c	1	Other	Other
+8804fc11-2cc5-49c5-93a0-57b404158ff6	1	Other	Other
+8805020a-8885-4d21-81f2-abd81fb80046	1	Other	Other
+880580ce-312e-4cc3-a44e-26c31eae724d	1	Other	Other
+880597a9-d33f-4671-b01c-155e843a0713	1	Other	Other
+8805daae-3a88-498d-8023-27970cef40eb	1	Other	Other
+8805dfa3-a448-42de-83e4-bc227edd743e	1	Other	Other
+8805e87f-a4b3-4f7c-9c41-13617cf061db	1	Other	Other
+8805fba3-250f-4354-8d7f-6d76f249cf08	1	Other	Other
+8806043b-09fb-488b-9c95-ca968de21f7e	1	Other	Other
+88064b1c-5ccf-4962-8403-8e72cf0a30d3	1	Other	Other
+880657f2-16bc-413b-9246-c9a4ccd2f343	1	Other	Other
+88066ecb-d56a-4770-872a-4898e9f2548b	1	Other	Other
+8806e8ad-b68e-47cf-a0f4-fddc6ebf7e76	1	Other	Other
+8807141d-8978-4be1-9b2b-677ff991fced	1	Other	Other
+880727a0-4a7b-4fdd-8633-6beb91393921	1	Other	Other
+88073ed2-8156-4b17-9dba-ad562f9c1da1	1	Other	Other
+880747d5-0c20-4960-b291-1c47c7d2f000	1	Other	Other
+880754b1-e3fd-4870-a96a-086adea2eac7	1	Other	Other
+88075668-7364-4bfa-b05d-719aa9417588	1	Other	Other
+8807bdc6-c512-4dcd-890a-dd77e30bbbd5	1	Other	Other
+8807bfdd-fb44-4604-a5e8-e7a4c8754b6e	1	Other	Other
+8807cfe1-d229-4b46-b274-2078d951c4e5	1	Other	Other
+88082460-bc80-4ebc-af14-08964d37bf52	1	Other	Other
+8808250c-9f1f-4257-b2b8-1baca3021887	1	Other	Other
+8808404e-66c1-4a6a-919c-da83ecf33e21	1	Other	Other
+88084641-e013-45b3-b9cf-4c0e6db66d19	1	Other	Other
+88084f1a-c175-444d-bb98-fe0b85e52939	1	Other	Other
+88088010-356e-40d8-ab44-f924e23f8106	1	Other	Other
+88088eb8-71e9-4169-8d9e-25ed43e456db	1	\N	Other
+8808a58a-c08d-4ba7-abd7-a8a60c639a08	1	Other	Other
+8808f150-5c22-4f4b-bb84-bf3bc5139b64	1	Other	Other
+8808f3cd-1744-4892-a6ce-502fbb04ee31	1	Other	Other
+8808f686-8fd0-42fb-9157-a7da231e4ffc	1	Other	Other
+8809077d-a95b-4bc8-a080-9939e375c67e	1	Other	Other
+88093c0f-201a-4380-8b98-bff52edb3368	1	Other	Other
+88094b15-9812-4b19-9a28-87c5be05ab34	1	Other	Other
+8809c367-883f-4af7-a9ec-cbf1a1198c19	1	Other	Other
+880a06f7-a059-4d25-99d8-3b4ebf0b38c5	1	Other	Other
+880a3d55-9b02-4049-9c40-e0f8f779317d	1	Other	Other
+880a574d-961c-4ef5-bc32-c8a7ed2dcc04	1	Other	Other
+880aa8dc-875a-446e-a247-8818051f5731	1	Other	Other
+880ac10a-3059-4fb9-bd6d-cbe9e50eb11a	1	Other	Other
+880aecf7-4c38-4380-8c60-3a56a268fbee	1	Other	Other
+880b0356-9ca0-49c0-8e02-bfa3e5e2be04	1	Other	Other
+880b316c-8410-47b5-944f-a3b1d941fcaa	1	Other	Other
+880b864a-95e4-4229-9442-72b815c675b2	1	Other	Other
+880bc5cc-5def-49c1-9a51-a989d0bf564c	1	Other	Other
+880c3b59-28f6-4e08-baa0-081a752d0ee8	1	\N	Other
+880c6dd4-8ce1-452b-8067-9ce866248152	1	Other	Other
+880c7f3d-fa6b-48f3-bf16-a66c8e39b783	1	Other	Other
+880d0e83-a9a4-43b8-873d-53c624a350bf	1	Other	Other
+880d1786-d965-4ec7-9054-332d30e855cc	1	Other	Other
+880d2862-15f0-4c4c-9906-f3a3dfb7f656	1	Other	Other
+880d78a6-8ad5-46a2-be17-236ff2ab9485	1	Other	Other
+880d78cb-3ac6-41e7-8185-29fc0ed3d44d	1	Other	Other
+880e3307-72fb-4086-9dc1-cdd60cd90e33	1	Other	Other
+880e5a51-ece3-40c9-8dbb-aa4c4b975359	1	Other	Other
+880e5cad-5205-4316-bd33-37155947cf4b	1	Other	Other
+880e5ccd-9023-4ddc-bbb1-67a4a84836f0	1	Other	Other
+880e651b-e333-4dec-beac-5276b5d95b07	1	Other	Other
+880eb290-b561-4d18-8f37-09f35dacb6ef	1	Other	Other
+880eff12-943e-4668-9882-a79bca8e2a90	1	Other	Other
+880f0f92-e752-4d74-ab2a-31422ea1fa9b	1	Other	Other
+880f457a-d083-4d6c-9043-9fff1e8d849b	1	Other	Other
+880f81d3-3852-4929-a547-af4bead0a0ca	1	Other	Other
+880f96e0-32a5-4c49-bd1a-20ec368ae0f4	1	Other	Other
+880fae86-cdf4-4fdd-83eb-7f1e80373b94	1	Other	Other
+880fd14a-a50f-4260-8fdc-6d355293b76e	1	\N	Other
+880fd16e-1bba-4692-80b3-bc90da65d3f0	1	Other	Other
+88107200-6683-42ac-afc8-cfb2e16b7888	1	Other	Other
+88108e74-2a00-4324-89b2-645c6a97ced2	1	Other	Other
+8810b812-6745-4d43-b723-a513a399ff1d	1	Other	Other
+8810e12c-2813-4169-b861-a6886e237ec9	1	Other	Other
+8810fcf8-ecbc-41c1-82ea-a7dbe8a5c9f3	1	Other	Other
+88110975-17b7-44c4-841c-bd907aa23be5	1	Other	Other
+88110a9b-67aa-4adb-adec-4a0fa41f63b9	1	Other	Other
+88111e04-8c93-4250-b5cc-9e74a19fe8be	1	Other	Other
+8811303e-d39a-4a31-a1a7-9ab4f32d6ef3	1	Other	Other
+88115b44-950a-4be3-9f4d-3204587e9bef	1	Other	Other
+88116e0d-98a0-4660-b5c5-21028ae971d7	1	Other	Other
+88119134-bc72-4630-8d34-416c19878724	1	Other	Other
+88119522-03f6-43da-917f-2c10ea0ccfc2	1	\N	Other
+8811a871-13e0-4ca7-9981-7a17c2434050	1	Other	Other
+8812593c-a732-45a3-8dcb-fabac5bae168	1	Other	Other
+88128108-e7c6-4d30-910a-58106a55e76e	1	Other	Other
+88128b30-4551-497b-ad2f-91b7c95c6044	1	Other	Other
+8813000c-541f-4b7a-982a-67923417ee53	1	Other	Other
+88132fa1-5ef9-4841-b089-da3492fc5fa1	1	Other	Other
+88138e94-efcf-41be-917b-538fa40f384f	1	Other	Other
+8813eb20-b58d-4dee-8315-756cf19c14c1	1	Other	Other
+88141b5c-4946-47f3-8687-fca4261e5c9b	1	Other	Other
+88143883-17bd-4676-a2c3-cd230029426a	1	Other	Other
+8814619a-15b6-4234-8f2b-a167d5bd8595	1	Other	Other
+8814a2cd-1298-4749-b3e8-057dd808bb14	1	Other	Other
+881570e3-3136-4a83-94f7-7913563c2374	1	Other	Other
+88158e64-b8e4-4a3f-b187-b87c2c8385c7	1	Other	Other
+881594fc-b5a3-4fb1-9b73-61fb3398fb5a	1	Other	Other
+8815b82a-6f5b-4068-9f8b-9e604748f2c9	1	Other	Other
+8815f14f-45da-4347-81bf-67e4885c7d59	1	Other	Other
+8815f8b4-613c-488a-8eff-fb3862c0cd37	1	Other	Other
+881610a3-4f51-4fc6-84df-c3fc065512f3	1	Other	Other
+88164ed3-4289-4c11-b585-3e5025d639f3	1	Other	Other
+88166061-95b6-42cf-83cb-2c7eb16dab1a	1	Other	Other
+8816759f-1b03-4864-bebb-f9cbf590cc07	1	Other	Other
+8816a7c2-3c0d-4fd8-855d-cbdcd168b40f	1	Other	Other
+8816a829-9ffd-4f4b-88e0-828ccfcedf31	1	Other	Other
+8817146a-c98a-47b6-9551-0e841bd33bbf	1	Other	Other
+88174aed-f871-4024-9897-25f6460939ac	1	Other	Other
+88179f44-6d6b-4e31-a2e8-77169725c3bd	1	Other	Other
+8817b9a4-af38-4d49-87d1-90a36ba24ea2	1	Other	Other
+8817fa17-c224-41e9-8b53-6c6cda5aaf31	1	Other	Other
+8817fa1f-f48e-490c-932a-1b04ed9f6553	1	Other	Other
+8818165e-a9b6-4cdf-894d-29d8e80580a9	1	Other	Other
+881841eb-7008-4db3-af6f-7143263f7b5e	1	Other	Other
+881867bb-0709-4ec8-9144-b2642350d495	1	Other	Other
+88188b76-c6df-4aa4-ad65-8b49d1139bb4	1	Other	Other
+881957eb-341e-4682-852e-397ae3ceb2e6	1	Other	Other
+881970d4-5b21-4a95-941c-f27448d9b80e	1	Other	Other
+88197fda-b53f-40f9-a44d-d6b9e7f7963b	1	Other	Other
+8819a46f-78b5-46bc-a9d8-0bda92ede819	1	Other	Other
+881a01fb-a87a-444a-b617-18c15d4a3cb1	1	Other	Other
+881a3909-5eef-4967-8ddf-dd59f8e2d20c	1	Other	Other
+881a988b-fe5b-406c-a7a0-7afcb9b05df5	1	Other	Other
+881ae28d-9224-430a-9b4d-a04bc65daed8	1	James	Other
+881afc1a-eb02-4609-971f-6988dde5c47b	1	Other	Other
+881bc65a-623d-458c-a764-fa0352c4c75e	1	Other	Other
+881bc93e-711f-493b-a1e2-efc5ba2a1a20	1	Other	Other
+881c0c49-1b20-4ce6-9d36-0fba3feb0388	1	Other	Other
+881c1a63-15ad-4294-9191-997628b22c64	1	Other	Other
+881c1ea7-9124-4619-8dbf-5b62fab7c1b2	1	Other	Other
+881c3f69-4a7c-42c2-88d7-d3787a01036f	1	Other	Other
+881cdd2c-ba72-4d72-ab47-0493a477ad9c	1	Other	Other
+881ceaf4-d720-4c16-9e63-6d519593124a	1	\N	Other
+881d175d-5af1-43a4-9534-46840fe732e6	1	Other	Other
+881d8c52-4c60-4137-832e-fa81d3c5240c	1	Other	Other
+881dc478-7a53-4a16-ac60-6d0f8c64c89e	1	Other	Other
+881e4d8c-6d93-4acf-86df-1fc687ca271b	1	\N	Other
+881e5039-25f4-4950-92b1-261a933d46ff	1	Other	Other
+881e7fce-f41b-454e-8cc9-2a5061599290	1	Other	Other
+881ea369-e1fd-4316-b298-9db7abfc351d	1	Other	Other
+881ea90b-3dec-4a07-97d9-2b2e4c3ca4f4	1	Other	Other
+881ef21c-a9c6-46ce-aaa8-d8e9d9128c1c	1	Other	Other
+881ef344-6293-4b2e-86e3-91f676b8e561	1	Other	Other
+881f8082-2287-43fa-9dee-e950eb8e6e51	1	Other	Other
+881fcfbd-6e2b-4419-873c-11b3caaf4eda	1	Other	Other
+881ff5c5-5553-4720-a75d-36a0012a5145	1	\N	Other
+8820b417-4a35-4fa1-836b-fbe924a181ad	1	Other	Other
+8820d209-f8e5-4a91-87ec-b26827635e6d	1	\N	Other
+8820ef5f-89fc-4663-9795-ebd8c140aabc	1	Other	Other
+882110eb-8377-458d-9bda-c0f1783b2cd3	1	Other	Other
+88211c37-d954-442d-8a26-a85c63353a25	1	\N	Other
+8821b5f4-fc96-432d-86ae-d0800de278df	1	Other	Other
+8821e7c8-3b80-455d-8684-23e3509f9d8a	1	Other	Other
+8822422e-a38d-4944-9821-c9ee8480681d	1	Other	Other
+882257a6-81ac-460c-81fa-f9cd7f01a397	1	Other	Other
+88232ddc-162f-447e-886b-d2c695a25ba4	1	James	Other
+882359ea-4bfc-43b7-8e3e-b36be553bb29	1	Other	Other
+88235e31-91af-402b-ba62-f5459bb4ea25	1	Other	Other
+882382cd-826f-40d4-8149-ec800f2967bf	1	Other	Other
+8823f0fd-a549-4ee0-9218-8bea1226fec6	1	Other	Other
+882412b8-19f1-4035-a29d-b9301353292e	1	Other	Other
+882455d1-a2e0-452b-82c6-a21cbc39e650	1	Other	Other
+8824aaca-de53-4dc3-9959-50dfdc0e609b	1	James	Other
+8824e325-8254-49aa-aa21-3fc4567774e9	1	Other	Other
+88251bb1-2e2a-4894-9b7b-74ff5ac1a54b	1	Other	Other
+88253522-0ab4-4a4a-b9bc-f95f6e9c1a28	1	Other	Other
+882544c0-25ec-4b2a-a586-68c125879047	1	Other	Other
+8825b6ae-e5fb-49d2-a048-ff22b5886aad	1	\N	Other
+8825c1e0-c89f-462d-b867-e9e2916254ea	1	Other	Other
+8825df08-cec5-4642-9d5a-4a22255a583f	1	Other	Other
+88260cfb-f5c7-4b57-bd13-431d8d4d9b26	1	Other	Other
+8826a785-d325-4706-a256-270ae435c8ef	1	Other	Other
+8826ab51-21ad-481f-94b7-ea3bd0ddcc4a	1	Other	Other
+8826b13f-2fa0-45dd-baa1-e49fc7d4b8c3	1	Other	Other
+88271f30-0b57-461f-a2ab-a274650f2469	1	Other	Other
+8827229a-5610-4cc3-b521-72c28871c941	1	Other	Other
+88272c42-b49f-49ce-859b-77aac50d7677	1	Other	Other
+882746b6-b00f-490a-852b-0b7896bdbe19	1	Other	Other
+8827508e-9599-4134-8ee2-21cae72a368d	1	Other	Other
+882770bb-df71-4051-a629-b07effffc3bf	1	Other	Other
+8827718d-d237-431d-b11c-c33dbaa2f5cc	1	Other	Other
+882773f9-27f6-4a0a-98ba-a76a3fbaf26e	1	Other	Other
+8827aaff-fc0a-4215-b137-03e943899edf	1	\N	Other
+8827cef8-dfd1-48de-b550-49656a95cceb	1	Other	Other
+8827d840-298f-4c8b-a260-f2a4313cca2a	1	\N	Other
+8828ae39-de60-4e27-b812-6a7af2eb03b9	1	Other	Other
+8828fb6b-ef98-41cb-97b0-707a9aca0dbd	1	Other	Other
+8829439e-472e-4363-88e8-2d4800dade6e	1	Other	Other
+88295e7d-6cc2-4e90-8ad2-5603f2b620a1	1	Other	Other
+8829b4f4-fe2d-430a-94cf-625d37df285a	1	Other	Other
+8829c8d2-5099-4ace-8140-9b407dea389b	1	Other	Other
+8829cf94-dfbb-4390-ac34-64105c2724fd	1	Other	Other
+882a3bf4-bca3-426d-9c6d-027bf53f5f60	1	Other	Other
+882a61a2-cada-4942-9d6e-f46211128355	1	Other	Other
+882a81ab-754f-43fb-9970-3a56e1cee232	1	Other	Other
+882a8992-0a73-473c-b2db-7b168db9e80a	1	Other	Other
+882a8ac6-ae5f-4ad5-bcd9-587f4fb90ba8	1	Other	Other
+882b129c-d02f-11e7-b897-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+882b6a0a-1c99-4a78-9a07-9bd865c69280	1	Other	Other
+882b7161-d252-4adb-bf0d-b76e1cd762ef	1	Other	Other
+882c0849-8ca0-4715-97fc-3d2e1a0664b0	1	Other	Other
+882c546d-b6a8-44cc-8c31-86fdc6d1137a	1	Other	Other
+882d0188-24bc-4256-8387-ecba59bed0ff	1	Other	Other
+882d0291-e909-43e2-8b3c-759fc8e70824	1	James	Other
+882d4ccf-b3b2-4e94-9a36-7a135f497866	1	Other	Other
+882d5a5c-5281-4f7b-a5cb-05fa0f1009e4	1	Other	Other
+882d6fd4-cd7c-4f4a-a9ae-c6da30d3b443	1	Other	Other
+882db2fe-6dfb-405f-afb5-9a98e2c1487b	1	Other	Other
+882de91d-e1fc-48b2-88bc-c62dc1cd6403	1	Other	Other
+882e1057-2204-44e7-85b5-3591b4c508f6	1	Other	Other
+882e4097-1334-4963-86b8-9dadf66ac27e	1	Other	Other
+882e6e45-64bb-4518-8c3d-f61ec6ca3f3a	1	Other	Other
+882ea594-e079-426c-8d99-61bf6bf7adc3	1	Other	Other
+882eff3e-0ddd-452e-9b36-42aa477649e5	1	Other	Other
+88301bfa-e2bc-4e20-8c32-64a676f5423c	1	Other	Other
+8830250a-868f-409f-b709-faf9ebc3b517	1	Other	Other
+88302bd6-978b-42bf-927b-817e7c6b4b66	1	Other	Other
+88303544-9a5b-4f5f-917e-26a80fc23380	1	Other	Other
+88303559-01f9-4a2b-aca0-2cf8ac9be7d8	1	Other	Other
+88305bc0-b93e-44b7-8c10-825cbac014c8	1	Other	Other
+8830fab0-d090-4d6c-9bb2-341d36d04204	1	Other	Other
+88310ee8-a27b-4f1e-ba18-3b8856f018aa	1	Other	Other
+88315894-1b00-48bc-bd07-886d1127cb9c	1	Other	Other
+88319550-00b6-42e4-8100-32f849ceb9ff	1	Other	Other
+8831b05c-5dbb-4f67-a6df-c4b48d36e4be	1	Other	Other
+8831b5ed-ee54-45d5-8613-97458f974d57	1	James	Other
+8831ca46-36d4-495e-b63a-7d1cc56319b1	1	Other	Other
+8831e2c3-8ae1-4605-b000-7d0d45864c24	1	Other	Other
+88320588-3a7d-4d0f-af2d-7d7db0ea6740	1	Other	Other
+88326831-b867-4530-881d-c4d277ac0e45	1	Other	Other
+88327930-5462-4294-8565-af523c9d1394	1	Other	Other
+883297ae-c1a6-42f1-9e3d-c438aa48d3b3	1	Other	Other
+8832b4ea-002a-4cc2-973e-06af464e9adc	1	Other	Other
+8832d41d-87fd-445a-b158-c7519e4dee8a	1	\N	Other
+8832dab1-3800-4dce-a4eb-2af153e26676	1	Other	Other
+8832fac9-da19-477c-a516-f4a155c39aac	1	Other	Other
+8833000c-0767-46c9-b7bc-0c4b5a45b8bb	1	Other	Other
+883339bc-92db-421f-89dc-d274b8126661	1	Other	Other
+88337f2d-d275-4307-a6ab-a41cfdf81d40	1	Other	Other
+88338f0f-1281-4199-ae87-69a90f74ce5a	1	Other	Other
+88342df7-4099-4161-8dba-dbe243e94843	1	Other	Other
+88345102-f714-4deb-8d97-ea36b07cc31d	1	Other	Other
+88345ac1-ace7-41f5-a9ab-eefa54a759a9	1	Other	Other
+883496fc-e200-4f76-9676-cff3e47706f8	1	Other	Other
+8834996c-e274-4be6-8db0-c5739f72aad8	1	Other	Other
+8834ca41-3f19-49b8-a001-ca61b0fd33f8	1	Other	Other
+8834d3d9-a8aa-44b7-b8e5-1773639c8d2c	1	Other	Other
+88350a38-be2c-4629-9ad4-7df06768f5c7	1	Other	Other
+8835197d-1536-4fda-9e43-2989722d4d5c	1	Other	Other
+88354359-f7ef-41df-8b6c-98f764d41f48	1	Other	Other
+8835cff5-e680-442a-a760-c14c501ae8cc	1	Other	Other
+88361140-c340-43c8-8c92-5981cc78a07b	1	Other	Other
+88365cf1-9031-41b6-bd0a-dd410a8775cf	1	Other	Other
+883664f3-ec37-4144-818c-8e0e43216357	1	Other	Other
+8836688b-2d9f-4a78-83d7-08acd20edd6d	1	Other	Other
+883686ec-e7b1-4c9d-80c2-9f9aaced02ef	1	Other	Other
+88368e71-ab53-4a03-9322-336e1aadc075	1	Other	Other
+8836b0f6-4f91-447a-a1cc-fdc7dbdd0125	1	Other	Other
+8836c26f-03f1-4e29-91c5-e5f358313d0a	1	\N	Other
+8836db28-e96a-40fa-affb-7c51ae230895	1	Other	Other
+8836ec80-eae5-48ff-aab3-57b6daf948e6	1	Other	Other
+8836fe71-17b9-43fb-a4c6-29b362cce6aa	1	Other	Other
+88374128-a2c3-4336-ab4b-8b7700bd9237	1	James	Other
+88376410-afd3-4e60-9d7b-982ad16d594d	1	Other	Other
+8837818c-3a97-4e29-a7d2-ca6a94bbec80	1	Other	Other
+8837a35a-9a36-4b42-8c9e-de23e271f923	1	Other	Other
+8837ffad-8f03-4c73-8de7-e67952a4841f	1	Other	Other
+883811ea-5c5a-437c-99d3-3734631cea96	1	Other	Other
+88381d81-c14c-4d65-a199-57b50b5737cf	1	\N	Other
+8838577c-4b40-431d-a053-cf66afab95ea	1	Other	Other
+88386a58-1cf6-41cd-86f8-a7f7e027f70b	1	Other	Other
+8838f2e9-f41f-493e-acbe-ce6dbcee9f6d	1	Other	Other
+88394b20-0315-43d1-aa0a-351f951ba705	1	Other	Other
+883967c0-0953-45ad-85d3-d1f5fca28980	1	Other	Other
+8839808a-53ed-4798-840f-9ec3b2e05e85	1	Other	Other
+88399ca6-2a73-40be-9193-c8109a9b58b7	1	Other	Other
+8839ad3f-16f6-40c6-86f6-418f9be11630	1	Other	Other
+8839cb97-28a3-43d6-a1a6-b28e40c613fc	1	Other	Other
+883a37ac-b2a0-4b97-8afb-a3a2101cb9b5	1	Other	Other
+883a5f58-54c0-476d-8c56-41510df89129	1	Other	Other
+883a78a2-ad72-4ee3-bd8c-32410967356a	1	Other	Other
+883a9347-9cb1-4f5a-8d5d-a04a39687487	1	Other	Other
+883ac8b2-6d7d-409b-9e7f-3d0cfe76a821	1	Other	Other
+883ae5ea-0800-4bf5-af0b-e4c83c7b113c	1	Other	Other
+883b2a26-3d7f-472d-b273-7c06bace345a	1	Other	Other
+883b62c9-649b-418c-ae0d-f8900342e39e	1	Other	Other
+883b7603-d9f6-4538-8872-9530ccc763dc	1	Other	Other
+883b7815-4249-4b81-9b78-2145c27ec528	1	Other	Other
+883bd3cc-c3e5-499a-9ad2-73b7a809be9a	1	Other	Other
+883bdd1a-dfd4-4ed3-9952-0f8a61f4bce7	1	Other	Other
+883be6cc-efcc-4a4e-97f9-41feb5af1c0e	1	Other	Other
+883bfd81-dc4d-4575-8fbd-3fd033fdab10	1	Other	Other
+883c51ba-7364-4867-a269-cb08c3ca1db4	1	Other	Other
+883c60f4-5429-46c3-aa64-89de7973967c	1	Other	Other
+883c7bea-93c0-492d-abba-e8e12ab40a3a	1	Other	Other
+883cedca-870c-4507-9352-b2d9849df798	1	Other	Other
+883d5aef-ee3f-48ac-b9d1-9111a0a46886	1	Other	Other
+883d8986-2266-421b-9a54-682de04436e2	1	Other	Other
+883d9f1a-5aec-4b8b-8ea4-3f91f2606ba5	1	\N	Other
+883da2a3-5686-48fa-a150-6090ce10ce4d	1	Other	Other
+883dc49d-77ad-496c-a286-4a8a539f7a62	1	Other	Other
+883e5f66-3d46-4586-88a8-166a57b8f560	1	James	Other
+883ef0c4-c57e-4e2f-bf17-11e03842f51e	1	Other	Other
+883f097e-b6e1-4cd1-a13a-1a8be90441a7	1	Other	Other
+883f1e05-3b0a-4fc0-acd3-b83d0b84a577	1	Other	Other
+883f3e9e-f52c-11e7-bdf2-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+883f590f-9bf0-4cc2-951b-2f914c22e629	1	Other	Other
+883f8036-922a-42cb-b0c8-2585a687ed39	1	Other	Other
+883fb1a2-f50a-47fc-8de1-0b099d0b5184	1	Other	Other
+884006b6-8db2-430f-b309-d20fadc082bd	1	Other	Other
+88408998-6c02-4861-987a-7623040a7a63	1	Other	Other
+88409714-dddc-4f37-b954-eca0bc41265e	1	Other	Other
+8840984a-00f4-4003-a986-4e53d0190667	1	\N	Other
+884111ad-15e4-49f7-bd67-171652d79481	1	Other	Other
+88413d68-7d13-4e3f-bf30-c21a1d15cc3c	1	Other	Other
+8841629c-cf6b-4788-9e96-5719a23d4299	1	Other	Other
+88419dff-57e7-4d29-abfc-b6c798f19382	1	Other	Other
+8842b929-ce3f-43b7-a01a-deca8e2c6ea1	1	Other	Other
+8842b999-e18a-431a-b69d-d685d1e842e6	1	Other	Other
+8842dfc8-37f6-4585-966b-c7c9628b3394	1	Other	Other
+8842e699-2fb1-4e84-9f95-50a915085ea4	1	Other	Other
+8842fcf6-ffea-47ea-a21a-94c7f6ae8dbc	1	Other	Other
+8842fd8a-cbd7-4f8c-8e0b-b32f93ef9935	1	Other	Other
+884301da-0d83-43ee-8f42-636827fa2fb3	1	\N	Other
+88430def-cd03-4b9c-9473-de62452af114	1	Other	Other
+88430eb0-8acb-41e0-9d9e-c47cf087ee8e	1	Other	Other
+884312db-91f0-46ce-b059-0905b760d0f0	1	Other	Other
+88431510-6f22-421c-a831-416398e1fb4e	1	Other	Other
+884322aa-17d5-4151-972e-118a459588eb	1	Other	Other
+884341d2-7323-406b-be92-b76c06d22034	1	Other	Other
+88436e4e-8c25-4bf4-a694-a074743ed8e2	1	Other	Other
+884370a1-2207-46b5-b819-14d3b3c6bc8e	1	Other	Other
+8843bb63-8d1a-42e7-a2dc-268b5b03a1e8	1	Other	Other
+884436f3-5b86-4ce0-8456-65367ad3ca41	1	Other	Other
+884438bc-9500-4e79-8cc8-eb0dc64cfe9c	1	Other	Other
+88443a6b-6694-4f5f-a14c-a1576f17d01f	1	Other	Other
+88445413-27e0-481c-b2af-07f24d89b72f	1	Other	Other
+884470f1-1be9-4ebd-82da-31f8ce0775ce	1	James	Other
+8844d191-ef86-4db7-8510-f5133c712b59	1	Other	Other
+884576f0-37b2-47c3-ac8e-54fff2fb107f	1	Other	Other
+88457d82-da0a-4c54-871d-6c94aff9914a	1	Other	Other
+88459d90-c244-4526-9ebd-f34abc748235	1	Other	Other
+88459f50-acdb-4286-874e-233fc7696f08	1	Other	Other
+8846d545-acca-4b0b-97a4-3f25f021819d	1	Other	Other
+884769e1-9010-46f9-b815-67cb8b2c8b74	1	Other	Other
+88478cdd-9cae-4742-968d-3191e712c1ed	1	Other	Other
+8847e7cf-b96a-43b0-b8bd-3cc77f05beb3	1	Other	Other
+88483d8c-467b-46c4-85ab-e3c3660cd472	1	Other	Other
+884868c8-02ad-4256-a9a5-1b8e7a650b10	1	Other	Other
+88488957-0f60-4836-a89c-24eb37898b5e	1	Other	Other
+8848a0dd-922e-477c-af36-9bcee53aa011	1	Other	Other
+8848a770-56ec-4f6e-806a-d5b3bbbaf872	1	Other	Other
+8848cffd-7765-478f-af01-429f317b50f7	1	Other	Other
+88491646-e20c-42c6-92c8-bc8867774fe8	1	Other	Other
+884916ab-fee0-48be-95d0-e28a587a3e0d	1	\N	Other
+8849221c-8088-4961-9953-fe5bbdc3d367	1	Other	Other
+88493fd3-e98b-4589-a3e3-9355bf939751	1	Other	Other
+884986fe-1a69-40a5-88be-4e81f68c8080	1	Other	Other
+8849b62c-bdab-4db4-a709-ebc6f3eaf732	1	Other	Other
+8849cd75-9524-4de5-b21b-6c32e488bf34	1	Other	Other
+8849e7f9-09da-44cf-98ef-e425a84a65d8	1	Other	Other
+884a1476-11a7-4989-8900-f522f26f3a44	1	Other	Other
+884a611b-ddb0-4691-8a93-c55cca38c0d7	1	Other	Other
+884ad937-ab9e-4ceb-b70d-a50effd75b04	1	Other	Other
+884aeeab-96d3-4cb2-9f32-313778eb85cb	1	Other	Other
+884b00c7-92fd-4d12-833e-7ed746fea8b9	1	Other	Other
+884b62c8-0e6c-42ab-8085-6345a2d4d595	1	Other	Other
+884b7a13-2383-4c13-9a11-90130599d037	1	Other	Other
+884b84a5-6a8a-4d9b-be5a-72381aead970	1	Other	Other
+884bde82-7f36-46d1-afde-925f9180bad8	1	\N	Other
+884c151b-f207-4c05-8e62-232089ebf4e3	1	Other	Other
+884cd616-9b33-46ac-af5d-5481955e43d4	1	Other	Other
+884cdedc-9fd2-4756-ad2f-767594040c78	1	Other	Other
+884d3532-30d1-4cb3-96eb-9644adfd70b6	1	Other	Other
+884d5f40-c06c-4fe2-8eff-60b8d25c0634	1	Other	Other
+884dcc02-f1c0-4088-9c20-fab4f58574e2	1	Other	Other
+884e085d-62a8-4943-a3a8-052f4f99d015	1	Other	Other
+884e5521-3106-4bb6-879c-0b8a0d199e3b	1	Other	Other
+884eeb7b-8110-4abc-ab40-45941374cbc3	1	Other	Other
+884efd1f-2351-4d58-b9c8-9ff2fba435bd	1	Other	Other
+884f986b-efe3-45f9-9562-13c5e3166b8f	1	Other	Other
+884fc1c7-4d79-472e-914c-9539c9da5a74	1	\N	Other
+884fc3aa-18a3-4985-844a-6ccf052c87ec	1	Other	Other
+8850283b-5b3e-4def-a6b2-9a0e24c50e82	1	Other	Other
+885141be-3d6d-4d77-a228-80854cea8f87	1	Other	Other
+8851506a-b13f-41f3-93d1-1d1af2da5f5d	1	Other	Other
+885171f9-5563-452e-8716-b94f5512e82c	1	Other	Other
+8851c786-331d-455a-b845-0d910d0f1bc4	1	Other	Other
+8851fe7b-0c28-4c18-a9d8-a0fd9e431561	1	Other	Other
+885230dd-e4d5-486f-9d67-a71f9560bb63	1	Other	Other
+88523e6b-27b3-4037-83d5-8c5018165951	1	\N	Other
+88528c9c-6254-4930-bb56-7fa1ff7f25b3	1	Other	Other
+88528d4e-eaed-4098-ad61-6054a5790809	1	Other	Other
+88529e97-b3e4-4042-ae7e-c946f6ef589c	1	Other	Other
+8852c2a9-7aed-448b-8773-a6634fc9a4af	1	Other	Other
+8852df11-8ec5-4f17-992c-ddfb276dda76	1	Other	Other
+8852e678-711d-4db9-93ab-b29ac424d9b4	1	Other	Other
+885379e1-b0fd-4ea2-ad85-2b6bb54affa7	1	Other	Other
+88537da4-e3e1-4a17-9442-03bfd0436e1c	1	Other	Other
+88546801-cdb9-42b0-86b7-d000a1159789	1	Other	Other
+88546b0e-467f-46a1-b49a-40fa96d5bdbb	1	Other	Other
+8854b50f-6640-49fa-a724-f988da0fa783	1	Other	Other
+8855225a-4d6a-45da-a52a-41cfdfcfc4e1	1	Other	Other
+88554f8d-08fd-4a95-853a-6fb1e9953599	1	Other	Other
+88555be5-849a-44c2-a3a7-5407bc79e394	1	Other	Other
+88559613-6e82-411f-8db6-2a34c4002f06	1	Other	Other
+8855a4ce-9b13-4b33-a731-798b3cb27219	1	Other	Other
+8855f80d-6863-4d3e-baf9-2af0ff5cc75a	1	Other	Other
+885641a9-225d-4b0a-b4f3-0c74a967d77b	1	Other	Other
+88564344-b6f1-4456-a5f4-0ff24e680f04	1	Other	Other
+88567293-d04c-43e5-8fee-768388d50aa6	1	Other	Other
+88569175-8502-4df4-8b2a-8049a7bf24ee	1	Other	Other
+8856af9c-b56d-4883-9f63-8d02c442f436	1	Other	Other
+8856dee3-69fa-48ae-a69a-ea10914395c2	1	Other	Other
+8856f5e2-51b8-4ed9-85cd-9f5365b64b66	1	Other	Other
+88571e9b-1877-471e-ad29-5b31c3fa7d91	1	Other	Other
+8857280c-e88d-4649-b23b-b825c9dcafec	1	Other	Other
+88578d46-caea-49a2-a86e-1b7114f1258a	1	Other	Other
+88579abe-2308-43b7-b3cd-fb279ebbea11	1	Other	Other
+8857e9da-6ae1-46e5-aa0c-77da10059b13	1	Other	Other
+8857efda-4ff8-48ed-a6c4-d802390fba34	1	Other	Other
+88580861-e12d-4788-af8e-4ce61030115d	1	\N	Other
+88584017-d525-4c34-bd2f-49558ee51a9a	1	Other	Other
+88585a07-23b0-42b1-bf6c-604339cd6729	1	Other	Other
+8858863b-c4ad-4460-8d18-4c8bcb06af50	1	Other	Other
+8858b5d6-c453-49c4-b5f3-22436f324549	1	Other	Other
+8858eb94-1a8b-4e8c-b0a2-9f8dcb00ec7c	1	Other	Other
+88593cbc-b81a-40d6-82ea-2fc356a0bae2	1	Other	Other
+88595d8a-b4fe-4893-b042-027bc62fbfc6	1	Other	Other
+885a087a-6c76-471d-9dde-44b90cefc88c	1	Other	Other
+885a56c7-2221-47c3-b6ea-1dc806ed5a64	1	Other	Other
+885acc80-e129-4da9-ae8a-e143dde3614f	1	Other	Other
+885ad45d-160d-4829-8c25-113ba04dccf7	1	Other	Other
+885adf8a-c249-4bc3-8b34-abe78fd4afff	1	Other	Other
+885b4bfe-7c50-4793-869d-926fc14da62d	1	Other	Other
+885bc476-235f-4a8a-9a59-a27b74251eb5	1	\N	Other
+885bd351-6d4c-454a-9bf8-652a92d02845	1	Other	Other
+885c2e6d-cedb-48eb-a816-8b7169605525	1	Other	Other
+885c6745-f881-42aa-92bf-5e124549c601	1	Other	Other
+885c89e7-f655-4be5-a0a5-b598acd68766	1	Other	Other
+885c9ccb-bca5-4d0f-8bef-fcfedd62291b	1	Other	Other
+885cb794-4172-45a6-9812-ec073cd4c15e	1	Other	Other
+885cdc38-c48c-4fe9-9a81-d5b67a1953ea	1	Other	Other
+885cde14-2af9-4790-937e-308a07bb68ae	1	Other	Other
+885cfbbb-6295-4846-9138-7f0cb35fc54b	1	Other	Other
+885d26fc-5803-46a2-9b8c-20ebfdfcd11f	1	Other	Other
+885d574c-1a53-43cb-9d6d-a3631ac3acaa	1	Other	Other
+885d576e-f304-48a5-97a9-9a77a1217f22	1	Other	Other
+885e49bf-7bd5-4207-a91c-6f8ea6fe87f0	1	Other	Other
+885e74be-f07c-41df-a451-d4eb6aeca5ac	1	Other	Other
+885ea044-1a85-401b-a022-5e5192ee7ac0	1	Other	Other
+885ef2a4-1479-433c-812c-3b24ec6146b4	1	Other	Other
+885f8d10-c071-4cee-ad63-0c5945287469	1	\N	Other
+885f8db6-4fc2-4710-927e-a16e4eb1ed83	1	Other	Other
+885fdc93-b56a-4dad-861d-9b493acf78a3	1	Other	Other
+885feabb-986e-4cd1-b0dc-43f1c38c379a	1	Other	Other
+88601600-6c19-4143-bd9a-0bf37826249d	1	Other	Other
+886056e7-9aae-43b3-9743-9da43b87aa28	1	Other	Other
+886058e0-80fe-466d-b13b-d59a364d870e	1	Other	Other
+886096a3-967d-49a8-995c-353eb658c23a	1	\N	Other
+8860ee60-d05b-490b-a55b-8b32ebe2e636	1	Other	Other
+886139ff-15d6-48ac-a724-a6d467e6a46b	1	Other	Other
+88613abe-1088-4482-ae52-f55b10ea5d08	1	Other	Other
+8861447d-446c-4d21-93a2-6806e35419ca	1	Other	Other
+8861747a-5dd9-46fe-bbcb-ab8e0f2b5fea	1	Other	Other
+88618b8f-2f48-456f-83fa-c12ce9759da9	1	Other	Other
+88619a88-2202-4bf3-8b8d-f381c758727b	1	Other	Other
+8861a1af-3bfd-4442-a368-d313c9459efb	1	Other	Other
+88626327-330d-4a0a-bcb3-d78a0bb32466	1	Other	Other
+88637720-c067-4170-881b-7fc2bf20fd13	1	Other	Other
+8863e0b2-7d03-471d-aa15-0b0672ee25ec	1	Other	Other
+886417b1-6cdd-454b-8721-7010b1720903	1	Other	Other
+88643541-fb1d-40e0-a5ad-93fb3a670ece	1	Other	Other
+886490ae-12b8-4471-8887-1f7ec6213255	1	Other	Other
+8864bd0c-2721-4272-aa2a-46fc01a09585	1	Other	Other
+8864e65d-58b0-48a3-8d4d-4caba8415214	1	Other	Other
+8865099d-12d9-414a-8bae-971162e56a7b	1	Other	Other
+88652499-378d-4f3e-8cb2-261f7a2e08b0	1	Other	Other
+88655872-fd7d-4ca3-8346-6e2ec2e3d6e0	1	Other	Other
+8865aea5-189d-42ab-80f5-be7c6ee2ebc2	1	Other	Other
+8865b1ce-f2e0-4c05-a3ee-14efb02b0bac	1	Other	Other
+8865c699-0a0a-417b-bb2f-928e80e4ef53	1	Other	Other
+8865efa0-e570-4647-b07f-68d6df449fdb	1	Other	Other
+8866007b-60f6-4183-90ad-a19479464602	1	Other	Other
+88665287-7acd-4f11-b6aa-ec5b491ad0ba	1	Other	Other
+88665b3e-8158-42df-b478-9f86774fea67	1	Other	Other
+88666644-aad8-4d04-8779-77de22f125f1	1	Other	Other
+88666811-3b5b-4223-ad03-4c4a3b75eca2	1	Other	Other
+88667549-ff09-42c5-885a-d38f757edbe1	1	Other	Other
+8866828f-d2f9-4b34-aced-10f8ed5be1a4	1	Other	Other
+88668a7b-e83b-4884-a5a5-f2abcc38a20f	1	Other	Other
+8866d9e7-e6bc-4e29-809d-a9b4cf963c5f	1	Other	Other
+8866df69-4526-4063-b0bb-3c45c3079d24	1	Other	Other
+8866f9c3-41f1-4217-b77a-b11e75d6e6ca	1	Other	Other
+8866fbaf-a427-4d8c-a8da-2f78a22ca74d	1	Other	Other
+88673745-6015-493a-abb4-91cd18f86824	1	Other	Other
+88677006-2773-4d7e-b541-d973c3498e0d	1	Other	Other
+886773f3-c44d-450c-931b-35bbec9a4224	1	Other	Other
+88677660-9a38-47a4-be65-3b593cc31945	1	Other	Other
+886786a5-cd00-4985-ab07-e9efe0f4a74b	1	Other	Other
+886798c4-3bc8-43ae-ac4a-57198bf7fa19	1	\N	Other
+8867a4be-09ab-4d06-a2c5-4eb6b7a51dd7	1	Other	Other
+8867b79a-55b2-4d41-8c07-1965fff903c8	1	Other	Other
+8867e5a9-07b4-4e12-9d55-1bc12ff529a7	1	Other	Other
+8867eccb-0604-4c42-bd40-de953258cf09	1	Other	Other
+88684983-cf69-4683-97c6-8c54f0cd8cc2	1	Other	Other
+88687040-ee97-4fdc-afd4-418040bd124e	1	Other	Other
+886884dc-d8bc-41c1-b457-62bec208c332	1	Other	Other
+8868c46d-d355-4f7e-8a7a-9663b6c8235a	1	Other	Other
+8868de66-e2de-4394-be1e-11b35717f63c	1	Other	Other
+8868f4c3-a4df-42d9-b1dd-9397779eaead	1	Other	Other
+88691283-9b9c-458d-a4fb-750be706b541	1	Other	Other
+886916d3-8e68-450b-88ff-81733fe27248	1	Other	Other
+88692308-1ce5-44cb-8504-9e5235411f3e	1	Other	Other
+886924d8-b3af-4b01-86c7-07fbd38a669e	1	Other	Other
+88695cd0-52fb-4441-9c1f-7e0318b27870	1	Other	Other
+88696405-6def-4da7-b073-7c02ed8410e2	1	Other	Other
+886979a8-576c-48d3-9208-c3ad90576dd5	1	Other	Other
+88699129-eb8d-4ede-a8e8-f9bcfca9ed4e	1	Other	Other
+8869c5c6-8fe4-4ef9-85a0-cdc5163f7111	1	Other	Other
+8869cd01-c1f6-4d94-b4af-957cb66ad206	1	Other	Other
+8869f9c4-fcd7-4b0b-b17e-1d06f93ba39b	1	Other	Other
+886a0c12-69df-4b2f-8d05-d6d6e2dfdf39	1	Other	Other
+886a1ecf-27b7-489c-9693-00c16d81de91	1	Other	Other
+886a25aa-581d-41fc-93c4-71957c85f083	1	Other	Other
+886a3638-852d-4657-9b17-baec3a02484d	1	James	Other
+886a5919-2038-4e90-8e5c-015f5b552551	1	Other	Other
+886a5d39-3fda-495d-8f0f-008e313d2fe6	1	Other	Other
+886a82e5-911b-4572-b4a1-bd736b180653	1	Other	Other
+886a9d35-b1ea-4414-954b-ed867bb3b030	1	Other	Other
+886adb89-115c-4bad-8157-372c4ee08d4b	1	Other	Other
+886aed7a-5848-4c27-b6e4-6fbb0044b6d2	1	Other	Other
+886afee1-f9c6-4ff5-a2b4-d01e83575e06	1	Other	Other
+886b03f3-6a34-441c-98b0-028bf5f11e3c	1	Other	Other
+886b0d13-0798-4cf2-9651-d8a549417255	1	Other	Other
+886b3c80-fb8a-4bed-9be2-8264e72323c3	1	Other	Other
+886b5a03-20d0-4444-8874-c526bad8362b	1	Other	Other
+886b5c89-b64b-4b7a-b624-3593b773e2dc	1	Other	Other
+886b80e5-06af-4ebc-839c-6b79e2b921d6	1	Other	Other
+886ba223-3d78-432e-9067-f1d1a00ad5d2	1	Other	Other
+886bc523-02ce-41fc-8236-c13fd46a0806	1	Other	Other
+886bcd47-0440-494d-aff1-4be963f3f56d	1	Other	Other
+886c0bc5-7a15-418b-84c2-0ea80c5c3fbd	1	Other	Other
+886c3edd-ce5e-4fd1-922c-f12d7fefc798	1	Other	Other
+886c4538-6469-4898-9eb8-820e789e4aad	1	Other	Other
+886c7718-62ff-4259-a18c-04435b75105d	1	James	Other
+886c8485-9bae-47b2-a14d-1968bc91c308	1	Other	Other
+886c9251-f723-4676-b914-fc58d1e2735c	1	\N	Other
+886c9f76-0deb-44dd-b0d0-34fe5b23925d	1	Other	Other
+886cda4c-662b-4f2b-9df8-fab675d84611	1	Other	Other
+886cf4d6-7889-4478-8e32-7ce40802b11b	1	Other	Other
+886d86eb-56d2-451e-b9d4-b96377f42ea0	1	Other	Other
+886daa89-11bc-4121-96d9-aaa9b8503614	1	Other	Other
+886dcd11-ba5d-48ab-905d-0afc222557ea	1	Other	Other
+886df467-5eeb-4cbf-be47-3a0086239b92	1	Other	Other
+886e5115-1527-4baa-a2cd-5f02e091a1e5	1	Other	Other
+886e5c62-1f2b-4f45-ba51-8ff832a0ba70	1	Other	Other
+886e8514-1fc4-48b7-be7d-13a8ec614ee9	1	Other	Other
+886ead02-9f49-4d27-902d-356af887d426	1	Other	Other
+886efde4-44dd-4324-a0d4-d7c90cab110c	1	Other	Other
+886f1012-889d-47c7-ace6-1214872ec2c2	1	Other	Other
+886f4d4b-fc97-4c92-a182-042cfc8e2efa	1	Other	Other
+886f6f56-028a-40b2-b7a2-b1f095f80cd6	1	Other	Other
+886f7a11-6aac-4e8e-b331-c446c6bf6752	1	Other	Other
+886fb5a3-8c0e-4c6c-9011-5bb2720f55f3	1	Other	Other
+886fd554-130d-4b9d-8656-08cf58404714	1	Other	Other
+88700b42-0da9-406f-9e3d-3f1152888cbd	1	Other	Other
+88700d5e-3340-45a2-90d5-12d0a664b01b	1	Other	Other
+88708d7c-9a78-4f71-b2aa-9cc4c7188a40	1	Other	Other
+8870b49d-9b4a-4902-a434-aa0c81dfb442	1	Other	Other
+88710729-18d9-43a0-b1f4-77c6a23ae9e0	1	Other	Other
+88718d18-3cef-42a3-95a2-b771032201d2	1	James	Other
+88719a42-9e7f-4fb2-9b42-25f03d0b98c2	1	Other	Other
+8871ab7c-49e7-411b-accf-5eca4b4d4617	1	Other	Other
+8871c294-e6f9-450e-88f9-cc157fa4e698	1	Other	Other
+88720b0a-80f8-4ca7-aee9-cc795848cc59	1	Other	Other
+88721f7e-0914-4808-a9c5-71e50ea35628	1	Other	Other
+88722775-7196-4f1e-b89e-3f7d96d6f8a6	1	Other	Other
+88725fa6-8427-4ca1-8c51-3ca63dbaa67e	1	Other	Other
+8873968a-36b3-4f76-a400-1bb7c3ce1314	1	Other	Other
+8873b753-2ac2-499d-8ef8-7ed2eab2c6aa	1	Other	Other
+8873e4a1-e319-4fdc-953c-d6e0313369de	1	Other	Other
+88740f5d-fad1-45bc-bcb3-b8968bfb00c1	1	Other	Other
+88741231-b03b-4993-9c45-1c76b3c7d94e	1	Other	Other
+88741574-8e9d-4206-a568-2f365972d4fe	1	Other	Other
+88749292-b3df-4817-a25d-f74e24af05ed	1	Other	Other
+88751d5f-5635-4d38-b91c-fdd83c2a9ccf	1	Other	Other
+88752c27-00fe-4c39-be53-3e48e086581c	1	Other	Other
+8875442d-0239-4adc-980a-8705b9e14927	1	Other	Other
+88754700-b84b-466e-8355-01945db4987a	1	Other	Other
+88754f54-cccd-45b3-b2df-60ea1e909ee6	1	Other	Other
+887586b7-fdec-4442-83a4-fe57b4f3b206	1	Other	Other
+8875c0da-3819-4ef3-82ea-3706cd567459	1	Other	Other
+887604f3-f34b-444e-ba77-20c66552ef30	1	Other	Other
+88762a09-cff0-4cd8-831e-d5dcbea6a995	1	Other	Other
+8876b3ce-34f5-4d34-997f-77ab3847f182	1	Other	Other
+8876c67d-aa1a-46a8-bd5b-2fd347af5d0e	1	Other	Other
+8876df22-232a-4ed9-b54f-a1f33393dfa2	1	Other	Other
+8876f35a-0f26-4924-bd75-d567fd82dc9f	1	Other	Other
+887788df-44b4-4ff0-80b5-5f44fb38534c	1	Other	Other
+8877c2d7-721e-4304-a367-c7e0ed833f6d	1	Other	Other
+8877c8f6-192d-4991-bb18-27b36536adf7	1	Other	Other
+8877c90f-c347-4016-8449-6e241274a7dd	1	Other	Other
+8877f894-902a-40da-83e7-5e31de437825	1	Other	Other
+8877f9db-7ef2-4981-9bb6-f3c460da0af7	1	Other	Other
+8878366c-e051-4bab-889e-d82a7e7ec792	1	Other	Other
+8878522a-4e33-4dd6-b219-3a1929d5f290	1	Other	Other
+88786909-d29c-438a-b8bb-b37f9566fda0	1	Other	Other
+88786b20-8879-4ba5-9d1d-795fba9d70a9	1	Other	Other
+88792ed1-aab2-4ddc-af3f-0b7a3515f76c	1	Other	Other
+887936a3-b3d3-4c4c-9f15-d12baa10509a	1	Other	Other
+8879583e-2975-4d6d-ba5c-05d521832f1e	1	Other	Other
+887a55c7-ed01-4b04-9428-0f87635315cb	1	Other	Other
+887a90f0-fa5f-4fc7-8d6c-00113709f9b1	1	Other	Other
+887aa1b5-7a76-4364-b83d-6f4d72c614a6	1	Other	Other
+887b0140-db9c-4914-b2f1-64af153ee711	1	Other	Other
+887b0c1e-ccea-4d63-b445-4f0791a56440	1	Other	Other
+887b2b97-56f6-4e05-831b-56f6aa3ffba5	1	Other	Other
+887b4597-f235-49b8-a3d1-cddffdd7c6e5	1	Other	Other
+887b5516-40bd-4775-85b4-9fe0294085ee	1	Other	Other
+887b651e-bc9c-4994-a238-07b9c42c8821	1	Other	Other
+887b8f93-235d-40dc-99ca-c10e740b1a03	1	Other	Other
+887ba8d4-cc66-456d-814c-81f05db07a47	1	Other	Other
+887be8d8-e2e0-4f2f-9f51-c4ac19f660f8	1	Other	Other
+887c1ab7-e0c1-4740-9410-75064d579431	1	Other	Other
+887c4869-8f22-4722-b071-0b0cea49e722	1	Other	Other
+887c8a31-9a81-4447-977b-83f79eccaab6	1	Other	Other
+887c9e47-96d2-481f-b548-29095ae0f241	1	Other	Other
+887cb177-7f77-4b2c-bd6d-7c8f0104ee6f	1	Other	Other
+887cc855-0da6-4586-b16a-67174acf16a8	1	Other	Other
+887cf1fb-e878-4c57-9c6c-9215c805dd64	1	Other	Other
+887cf625-7c83-4f85-8d64-baa72483c2fb	1	Other	Other
+887cf62c-209d-449c-91b9-899dbe895e2b	1	Other	Other
+887d1561-d954-4f25-8e6b-69d23b2f176e	1	Other	Other
+887d161f-e00b-4891-8e8a-47a683cbbc9f	1	Other	Other
+887d34f4-6685-4038-9566-645b757634d4	1	Other	Other
+887d350e-303e-4788-8fbd-2e0ed0e14448	1	Other	Other
+887d5c19-1099-4140-90a6-a838e9b3e84d	1	Other	Other
+887dc0d0-adfb-4563-85e4-29af2fc81b6b	1	Other	Other
+887dcd79-444e-4a2b-8fdc-eb79fb80a25e	1	James	Other
+887dfd8f-298c-444b-936d-0d18f0f1dab0	1	Other	Other
+887e11f7-8c0f-4e07-997e-997f628a2565	1	Other	Other
+887e4cfd-43e1-4f96-bb42-b3a13107cfcf	1	Other	Other
+887eb20c-1eba-463a-9e03-77f7d6c00b87	1	Other	Other
+887f4fd6-bd56-404e-b02a-ac5556e8400f	1	Other	Other
+887f53c3-1985-493f-8980-5a0ba11b0e65	1	\N	Other
+887f6309-0cef-4976-afbd-5f24231a2d02	1	Other	Other
+888018cb-e6fc-4901-a6ca-d4cb94cd2dcb	1	Other	Other
+88801b42-bd67-4eec-8e80-461dfafe72f6	1	Other	Other
+88803bf5-93b6-4825-bc44-41213a9590c8	1	Other	Other
+88806a09-84e6-4592-a33d-2978452a5825	1	Other	Other
+88806e50-adf0-47fa-a0be-5d64a2bf13fd	1	Other	Other
+88809abb-4c5d-4cd2-ac97-3b63586daf84	1	Other	Other
+888103df-72a5-4f26-85df-8db29f4e9931	1	Other	Other
+88817d66-780c-479a-bdeb-69152dd81fd4	1	Other	Other
+88819efd-a4fe-4963-bd8b-9c3657014e7c	1	Other	Other
+8881e92e-5e42-4682-a0ac-d8fcac7be8a3	1	James	Other
+8881ff5d-15bf-48a7-b406-bdb0ff4816be	1	Other	Other
+888229f2-071b-48bf-853d-129d5211b6fe	1	Other	Other
+88824ce1-1843-4064-9882-084143ce0627	1	Other	Other
+888259ba-e9ce-45b8-8e27-37326159ca02	1	Other	Other
+88825e0f-9e20-45b6-86f4-c387431f4c28	1	Other	Other
+88828ddb-bc14-4dc5-8901-f448fed15e25	1	Other	Other
+888304fc-06c1-11e8-81ba-fa163e8624cc	1	\N	Other
+888309fe-6283-4c5a-a592-fec6ec97da0d	1	Other	Other
+8883106e-832f-44ca-aa4b-dedf9f4be208	1	Other	Other
+88836aa1-087d-421f-a847-04d8db63265d	1	Other	Other
+8883aa95-ad2e-4e7b-a194-9e20b4b62897	1	Other	Other
+8883cea0-1327-4e8e-a77f-686321272a34	1	Other	Other
+888424e5-b0d2-49e5-bff8-7f0c63309e85	1	Other	Other
+888447c0-5c27-4c0d-96f6-a9196b68a366	1	Other	Other
+88847560-3135-495b-97b7-2135b6509a9e	1	Other	Other
+88849f22-e4df-4d96-90b6-e75a07213dd3	1	Other	Other
+8884ccbb-8200-4299-ad60-d80926355d0f	1	Other	Other
+8884ddc2-722d-4ec9-9b21-5fab369bb9a5	1	Other	Other
+8884e901-2cc1-4438-860a-b7d50b38957b	1	Other	Other
+888521f4-1a7d-4a79-bdf2-4bc176ca79d2	1	Other	Other
+8885239b-e20b-457f-adeb-57895f8fdb31	1	Other	Other
+8885798f-fe33-47d1-9339-c35f4ef87a28	1	Other	Other
+8885de2f-38a5-4c41-9b87-1a6baed8ad4b	1	Other	Other
+8885e9e1-cf1b-4cec-bb6a-2dfeb2addff6	1	Other	Other
+88860ad3-31e2-426a-ba1a-f73484fb534b	1	Other	Other
+888669af-8a80-4560-b501-2b6fd0ce3c3b	1	Other	Other
+88867bf0-e62e-4644-8e6c-49e14c10dbc6	1	Other	Other
+88869c66-3550-480f-b2b7-7076dfbb3d50	1	Other	Other
+8886a9c6-d282-42de-922d-4ebdb575d682	1	Other	Other
+88871645-8597-41aa-8b52-3338108bd79c	1	Other	Other
+88871821-724e-4c99-8a65-d7c51fd88564	1	Other	Other
+88875f34-ca93-4a7f-aebd-bc5d027b0ef2	1	\N	Other
+8887907b-6de2-4e4c-9c87-c1b57ba346c8	1	\N	Other
+88879a42-87f3-4890-823a-6b7fc7d86265	1	Other	Other
+8887b88c-fbca-4372-baa2-0e4ef2c07455	1	Other	Other
+8887cb42-3e44-4cf5-b453-a1adff26492c	1	Other	Other
+8887f7c2-7f0d-4a96-9ea9-f8cbc0b6c248	1	Other	Other
+88880179-97a7-44f3-acec-3aa2c88b0063	1	Other	Other
+88880396-0fe8-47f5-a4c6-f93064652fcc	1	Other	Other
+88882d50-c55a-46e3-a1ba-e49e98d1f130	1	Other	Other
+888862ff-e30f-4778-8db7-e660833dca72	1	Other	Other
+88886532-c4a4-4f4f-955d-e9e7e8d72e5d	1	Other	Other
+8888bb2d-adfb-4971-b000-8eba24c15238	1	\N	Other
+8888c8de-b73b-4349-bbd3-a89cb1e4bfab	1	Other	Other
+8888d9b3-0153-4c5b-b79d-1b81b680ded3	1	\N	Other
+8888e930-49aa-4aba-8c66-3f73305af83d	1	Other	Other
+88891de6-0f4e-4cfa-ade9-59530f3dda2a	1	Other	Other
+88899f48-a231-44ac-ae02-bc6ffeed8c04	1	Other	Other
+8889ce68-f562-46f2-9382-7c24badac637	1	Other	Other
+888a28d7-b26d-40ff-b05f-1ad583885a5b	1	Other	Other
+888a7709-28c8-49ca-8319-fb0c98d06631	1	Other	Other
+888a83ba-381c-410e-9406-289ca503d6d2	1	Other	Other
+888a8d09-45ca-4bba-875a-ad619f8840bf	1	Other	Other
+888adb06-7f70-48b8-95cb-58a62ad396e0	1	Other	Other
+888adcf1-d15e-49e8-9c83-c9a88e1b97bc	1	Other	Other
+888b3003-da71-4968-94f7-f9c1a6333676	1	Other	Other
+888b3f02-ace1-4991-a4f0-63e7c34a6927	1	Other	Other
+888b5a1b-5562-4ab5-879d-8531d4b81659	1	Other	Other
+888ba236-5bf7-45dd-a2de-39a1c7fbc844	1	Other	Other
+888bd23e-990e-40f0-b890-463e7ead0872	1	Other	Other
+888bd737-5ee8-4e4e-bef7-1b1448a256a3	1	Other	Other
+888beb24-1a29-44be-96d5-c22c0797e509	1	Other	Other
+888bef9c-67fa-4d89-9c80-b326b879691a	1	Other	Other
+888c3b38-f541-4eb1-8c16-4d4fa0ddeb88	1	\N	Other
+888c4d65-b00c-4dd5-a37b-5dbc98066452	1	Other	Other
+888c69c3-2b8f-490c-bcbb-a9f107892b2d	1	Other	Other
+888cbf5f-f136-4e4a-bdb9-ef3a1350ee1f	1	Other	Other
+888d3a6c-cfd6-4fbb-ac3e-e14876890c91	1	James	Other
+888d3f50-b2dd-42fb-915f-47e428ec2e12	1	Other	Other
+888d66f0-0556-4bb6-94bd-47df705383c0	1	Other	Other
+888d6acf-b1b6-456e-a4f2-38de7b840069	1	Other	Other
+888d9660-b2ee-47ec-b023-5cf0ea1555bf	1	Other	Other
+888dc16d-58b5-4047-8a09-7376741405a3	1	Other	Other
+888dd5ce-074a-45e6-bf6f-0a2486d5b525	1	Other	Other
+888e1810-1997-4e86-8f90-e942d87bdf28	1	Other	Other
+888eb441-dd59-4acc-9191-6e406406060a	1	Other	Other
+888eee22-6bae-42c6-a9bf-ba6dded95517	1	\N	Other
+888f0819-1369-4109-9a42-354766cb25c2	1	James	Other
+888f21fa-bf6b-4b8b-b43a-68e55727a4da	1	Other	Other
+888f4078-9892-4193-9e37-baecb5ab70ee	1	\N	Other
+888f5ebd-eb95-4659-b936-0d30b1509175	1	Other	Other
+888f60ed-70f5-42aa-a9fd-1bbb8ebafd04	1	Other	Other
+888fd338-33d8-4a3b-a493-f098c1057a72	1	Other	Other
+888fde26-ef4c-4e53-a917-c9a0e99dd681	1	Other	Other
+888fe3f3-7521-4943-b7b8-9938cdbd5281	1	Other	Other
+888ff392-002a-48c4-8b3c-861f27283848	1	Other	Other
+888ffc56-aaa2-493d-afd9-71a14eca1faf	1	Other	Other
+88900c95-e6f2-4202-bf9f-8aabe04f5bdb	1	Other	Other
+8890153f-efd8-4f31-978d-e7637b50d3d3	1	Other	Other
+88901597-73fa-418f-93ec-695b5a58c7f9	1	Other	Other
+8890657b-a729-460c-b15a-a971bda7740f	1	Other	Other
+88907b81-48d2-4117-b6bf-24cfe2d1a858	1	Other	Other
+8890b767-ed92-4e8b-895e-ca843adf5536	1	Other	Other
+8890c19a-db2c-4110-97c6-34fd8b1f0525	1	Other	Other
+8890cda7-407d-498c-ae70-e451a80e0fa8	1	Other	Other
+889105e3-4302-4539-8b3a-2b92312c13ac	1	Other	Other
+88911df2-8361-4ce2-9e9d-11aaba7f8f9c	1	Other	Other
+88915c4b-955e-41bd-a334-006ef68cd0b3	1	Other	Other
+88916294-aaad-4ea0-8f0a-0d33f5206cdf	1	Other	Other
+88917226-798f-40fa-94a0-9602f36260c6	1	Other	Other
+88918882-aaa4-4548-9ff7-fd5e601f8fb9	1	Other	Other
+8891da3e-ea93-49a7-9904-5be2ea282702	1	Other	Other
+88924630-c6b6-479a-b50b-119f47cea61e	1	Other	Other
+88924ef1-0ea8-49e7-8323-7f0d8394c154	1	Other	Other
+88926f41-4b89-4ad9-b51a-e03d5d2067c3	1	Other	Other
+8892f5af-aabf-45f6-9e29-a828a32a2d48	1	Other	Other
+889320d6-4a71-44e2-aeb3-b534623bd09d	1	Other	Other
+88932e3a-516e-475e-beb2-b7a0ca1713a9	1	Other	Other
+88933753-1c58-4ae5-a30a-830546245d66	1	Other	Other
+8893b29a-eca2-49e4-b229-70c680ab619f	1	Other	Other
+8893da43-1345-484f-af56-e85a13b6a219	1	Other	Other
+8893e75d-0a62-435a-98f3-b6193d0037ef	1	Other	Other
+88941a78-4423-4e05-9e4a-c05dcb4bfd87	1	Other	Other
+88946682-1dca-47b4-aecb-50c5bccb76ab	1	Other	Other
+8894e74c-9bce-449f-91de-9a03c32f10ef	1	Other	Other
+88950172-28dc-48ec-b90c-096c79f65b77	1	Other	Other
+88952ed1-bd94-4b3b-a7f0-bb407981edf4	1	Other	Other
+88953230-a692-4a24-9112-749aaa14aa44	1	Other	Other
+88958755-80b9-496b-95e5-b4f6740bf6a2	1	\N	Other
+889636c5-8f54-4217-a369-21733351b3dd	1	Other	Other
+8896651e-e23a-4edc-a571-f08b745e7d85	1	Other	Other
+88967ac5-3c3c-4bc5-8038-f1288104f6f3	1	Other	Other
+8896940a-c8a2-45f4-9b26-cc80703aeaec	1	Other	Other
+8897096d-b83b-4bcb-b4b9-0ce81b29277e	1	Other	Other
+88971df5-b6ab-4032-b686-dcfd8074db77	1	Other	Other
+88975eff-0e2d-4e8e-b629-51e352db2045	1	Other	Other
+8897c433-8c1c-454f-8175-424993db608c	1	Other	Other
+8897ce9b-5b1d-464e-862d-d158e4aafe9d	1	\N	Other
+8897f6d9-a1d6-4149-be39-bed02475ef90	1	Other	Other
+8898105c-778a-4c9c-b7f4-a52a0c61fdb9	1	Other	Other
+889854d6-9bf0-48b6-a0bf-eba83bbf0f59	1	\N	Other
+8898918b-cdc0-4f6b-9e4b-6e80620f144c	1	Other	Other
+8898c39d-36eb-4994-8ac4-443a5b278599	1	Other	Other
+8898c68a-e24a-4fd2-b53f-e55d458ad3f7	1	Other	Other
+8898db5f-adfa-43cd-85a2-22324e357ffd	1	Other	Other
+889904a0-e986-4cc9-b722-454cf479426f	1	Other	Other
+88991eca-7898-4d89-ba7a-b987a3b9f16c	1	Other	Other
+8899262b-5a01-481a-91d8-a6b0789b2d59	1	Other	Other
+889941b3-d2d6-41f9-a753-87f523558a67	1	Other	Other
+889944aa-23ad-4041-bc93-12c3972dbc74	1	Other	Other
+88996dcd-76ba-4260-a5e6-fead3cf356a0	1	Other	Other
+8899b660-5f06-41fa-802c-a5e085320d26	1	Other	Other
+8899ddc8-400b-4a14-85fb-311a7185ae4f	1	Other	Other
+8899e466-f814-493e-9915-2e39e2fc5a93	1	\N	Other
+889a8b2e-92ea-47a2-b8ae-6544a7a793c7	1	Other	Other
+889a9589-734a-4b83-98ef-b149f971ffdb	1	Other	Other
+889afad1-1c79-4853-881f-631aa33636f1	1	Other	Other
+889b195e-60ab-466b-8a2e-d1941349fc8e	1	Other	Other
+889b403a-d0e2-4d89-a8bb-54d8fa68f112	1	Other	Other
+889b4d30-20a1-4a22-b2aa-5c6f7c358c1c	1	\N	Other
+889b69f7-a2bd-4af1-8acf-2d5e2a0cd6d9	1	Other	Other
+889b702f-9b64-4f90-8535-7f24350c6dc3	1	Other	Other
+889b7d9c-082f-4a4d-a630-35f49334205f	1	Other	Other
+889b8826-6086-4c4e-999d-b34aacb9e5eb	1	Other	Other
+889bc840-6043-4a40-b28c-ee6854c48436	1	Other	Other
+889bcb6f-97e2-4f68-b7e5-52f07dd75b2f	1	Other	Other
+889bdef1-0268-462a-ac99-5db3767fce21	1	Other	Other
+889bebea-5ce2-40e1-a43f-8907d6fb8d22	1	Other	Other
+889c0f6f-995c-4e35-8a2d-863b4ae9dcc9	1	Other	Other
+889c1868-2f96-4108-9ac9-6f6b5f4d1b14	1	\N	Other
+889c41b9-d36a-4881-8eb5-3b002c99afea	1	Other	Other
+889cc832-235f-465e-8ef0-52a198ce4f7b	1	Other	Other
+889cf948-c90d-497b-a071-8ff4624e6104	1	Other	Other
+889d5929-2c46-4f3a-85a3-e477b13f90e7	1	Other	Other
+889d64bf-7f28-42a6-844c-6c7a3531b09e	1	Other	Other
+889db031-272f-4747-bd01-6d9bddaee9e3	1	Other	Other
+889dd6f3-41bf-47e7-a087-487ebd5df643	1	Other	Other
+889e0499-94f1-4d5a-8b1d-595f99ebce22	1	Other	Other
+889e0906-fc32-432e-9693-ab5de4e463ec	1	Other	Other
+889e2615-d572-4fcb-b13b-d839e3c15170	1	Other	Other
+889e88cc-4a7c-4c4c-897e-51bbf7a1cc53	1	Other	Other
+889e8e46-04f0-4efd-97e7-1757859ece40	1	Other	Other
+889e927e-7d83-450d-9aea-e6735e207674	1	Other	Other
+889edf54-47b3-4f24-8dcc-bf6d02415e22	1	Other	Other
+889eed7a-85db-4719-a74d-0684b5d5242e	1	Other	Other
+889f30fa-c7a2-4261-9acd-f7db3d055965	1	\N	Other
+889fbaf1-5daa-4f20-a518-ab9438618ded	1	Other	Other
+889fbc19-1e2d-4dd9-82c6-6c74920e0002	1	Other	Other
+889fdd0a-1aee-4c71-ae91-65e8430c2658	1	Other	Other
+88a0218f-93ed-435b-8d9a-b6fc0af51f0f	1	Other	Other
+88a02a9f-18cd-46d9-ae5d-c4f99b643f24	1	Other	Other
+88a03046-eeda-4186-9eb3-32392401d70c	1	Other	Other
+88a03946-406f-4999-a8f1-287e5cd51632	1	Other	Other
+88a09fae-9e51-402a-ab31-2ec500a8ae84	1	Other	Other
+88a0a901-20b4-479e-a93d-6dbba4fd60fc	1	Other	Other
+88a10a97-b5ab-4a3f-9190-88a01f9e6e99	1	Other	Other
+88a1172f-acd3-4c06-abfb-a3c8efec2977	1	Other	Other
+88a11b13-f351-4956-9881-b579b539d889	1	James	Other
+88a19e91-e7d6-4409-8994-cc88be4746a6	1	Other	Other
+88a1cc2c-14ca-4d32-ba1c-d2f1f0866054	1	Other	Other
+88a1fa97-4b7c-482c-872e-2bd2ccc5db26	1	Other	Other
+88a2a383-dc7c-4aad-816f-4bba175949e9	1	Other	Other
+88a2de2b-3ba8-4de6-8ff7-db9112fea8ee	1	Other	Other
+88a2f02a-b893-4f74-8d7d-6e10a66cbc71	1	Other	Other
+88a2fc42-bc7f-49ae-830f-1d31bf658405	1	Other	Other
+88a38dba-1605-46e6-8273-0247bb98f1b4	1	Other	Other
+88a3ba21-c424-4082-9f20-43fb7cf6e4ab	1	Other	Other
+88a3c289-7ea2-4e3e-b6f4-bdb1285beb6d	1	Other	Other
+88a3ea19-99b3-4d4b-8d56-29ce5485e36a	1	Other	Other
+88a3ffc1-f0f0-41b5-a0bb-ff9c4172f42f	1	Other	Other
+88a47cde-6756-4606-a1fa-9fbb533715fe	1	Other	Other
+88a4b715-0200-46cc-9372-f7bcee1d6479	1	Other	Other
+88a4da9d-56fd-4744-bae3-cd2b9f891d0f	1	Other	Other
+88a4e317-51ff-42ff-bdc1-c2aead264c0c	1	Other	Other
+88a4e915-ad39-4ded-b77b-5768d78d0fca	1	Other	Other
+88a4f186-3dff-4ced-9451-1b2c7a041709	1	Other	Other
+88a5088a-16e6-48f9-badc-ce904f441ef5	1	Other	Other
+88a583d2-e2cf-4827-89eb-f02e85e0770e	1	Other	Other
+88a5f175-3975-4258-806b-56de58a9bcfd	1	Other	Other
+88a60acf-df8e-4f17-bbbe-ac5e17676ebb	1	Other	Other
+88a6acc6-386d-4c2d-b150-91acaa4b1184	1	Other	Other
+88a6c496-2d36-4bb1-b33a-107030e03c34	1	Other	Other
+88a6c620-856d-47fe-b07b-62892411ee2a	1	Other	Other
+88a6e8f3-4da9-4fe8-bb83-c77f0ba274da	1	Other	Other
+88a6f1fd-7b43-465c-b736-e2929c548950	1	Other	Other
+88a7223a-d687-44eb-a6e0-5c2831d48e75	1	Other	Other
+88a72714-f94c-4ea6-bc46-e30b13837354	1	\N	Other
+88a745e6-54db-45c5-95f5-975aeb8d1f8f	1	Other	Other
+88a75010-e64d-45ea-bf83-067fd2298079	1	Other	Other
+88a7c05d-875a-4c56-904b-8efe28ee7460	1	Other	Other
+88a7cf90-ceb3-469a-bafd-3626ece44cf0	1	Other	Other
+88a8da9e-c05b-4b2b-ab34-583a7bb8ffe2	1	Other	Other
+88a8ec4a-2096-42dc-900b-964a9afd2893	1	Other	Other
+88a91620-ea84-4919-b244-2a2f00332d0f	1	Other	Other
+88a958e6-467f-46f5-a843-dc68088d18f7	1	Other	Other
+88a975cd-ed27-4468-9d11-d376e0113ae4	1	Other	Other
+88a98bf5-674f-493f-9e5e-fe7597a25889	1	\N	Other
+88a9a987-df99-4a10-a94f-125887ef6c10	1	Other	Other
+88a9e7cb-4eb0-448b-ad4b-9c252d1cf695	1	Other	Other
+88a9f54c-a286-4f25-9c1f-a86e4f78819e	1	\N	Other
+88aa75fa-c0a8-4afd-a02d-088f69a389c6	1	Other	Other
+88aaa8b3-6391-44d4-a352-4348fc35022b	1	Other	Other
+88aac923-08b0-402d-9f9b-70e9b44c06eb	1	Other	Other
+88aade50-e338-4c8e-8f17-82cfc252b57f	1	Other	Other
+88aafd14-4cac-4a97-9853-5748e81c600a	1	Other	Other
+88ab2ec7-4205-4061-80c9-7eca65dfdc95	1	Other	Other
+88ab4179-642e-415c-9fc0-ab2d66fc53cd	1	Other	Other
+88ab9baf-b339-4e5e-b866-4907f5ec3dcf	1	Other	Other
+88abbc2c-81b6-4920-a64e-ac7ba52d92ad	1	\N	Other
+88abbcad-1b22-4296-91f6-def90ff034b2	1	\N	Other
+88abf29c-c399-4fff-b8e5-caca65313fb6	1	Other	Other
+88ac42df-2af5-41ac-ae78-b1e27509ef8a	1	Other	Other
+88ac6be7-6044-4b85-b875-6d65ba5603de	1	Other	Other
+88ac9041-75c7-46d0-b4e1-62e46a8c1be1	1	Other	Other
+88acdc19-5cc7-4626-af22-3d96b651a608	1	Other	Other
+88acde65-e702-4e56-99ce-c95e80ade0ea	1	Other	Other
+88ad034b-ccfc-44ee-a08b-3e84e0b66604	1	Other	Other
+88ad57ff-02a2-4aad-ab96-5220c5dc569f	1	Other	Other
+88ad9779-f9bc-48e1-a436-27e56adc0c5c	1	Other	Other
+88adf1f2-1a42-4c6c-a0e7-0fd8a5ac12c1	1	Other	Other
+88ae0997-2b4b-4ca1-99fa-44ea3f816e5c	1	Other	Other
+88ae1029-2594-4cfb-9d88-a83659112cd5	1	Other	Other
+88ae2b92-7427-4656-a391-ea78483f8e6c	1	Other	Other
+88ae9259-cd5c-4d5b-9921-f8159a5b2082	1	Other	Other
+88ae93a3-73e7-49ec-86c8-ce88203fe974	1	Other	Other
+88aecd19-944e-4bf6-8f64-b27eba919c40	1	Other	Other
+88af12bd-bb32-4e22-a3fc-9d8822192291	1	Other	Other
+88af5814-a426-45ea-a0fb-acf68dcb08ec	1	Other	Other
+88afbf8e-489f-47e7-88c6-c4fd648351b4	1	Other	Other
+88afe146-c6e9-4d65-8329-e57907ea6d7b	1	Other	Other
+88affaf5-92c3-48d0-9bc5-d45bffd23b7a	1	Other	Other
+88b06102-553b-4ce1-b7a9-b3a29514051e	1	Other	Other
+88b0a040-d12c-40e5-82b7-7ca593a44fc5	1	Other	Other
+88b0e11f-afb2-4137-b29e-e79763309973	1	\N	Other
+88b0f3e4-1296-4b3e-90b2-fcb541244031	1	Other	Other
+88b13f52-7d3c-49ea-a24a-298780b4e259	1	Other	Other
+88b14f1c-d3a1-426c-b69c-a2aeab51a622	1	Other	Other
+88b16909-7c8d-44ef-9fa1-73722c840ad8	1	\N	Other
+88b1c5ad-aa20-4b73-9943-50da227f8812	1	Other	Other
+88b1e853-d0c0-4a56-9360-3a11c83becb3	1	Other	Other
+88b1f9fc-50d9-4135-a1c7-b747fdda4db5	1	\N	Other
+88b2e55f-6d69-4106-b1eb-7c2d2affffbc	1	Other	Other
+88b31a97-2118-468d-b799-6939f29389d2	1	Other	Other
+88b336fe-1dc9-4f05-8a7f-def0baff8298	1	Other	Other
+88b33d08-c61a-465f-a1e1-2be9de8b4ffc	1	Other	Other
+88b33f6e-3d5e-438a-a742-90c915f78edf	1	Other	Other
+88b377f6-01a5-4f76-83a8-8f308e9e433e	1	Other	Other
+88b3998f-3215-4485-834c-c9942d340195	1	Other	Other
+88b40d85-15a1-4e10-a67c-4f3b04d131d4	1	Other	Other
+88b41728-104e-408e-a14c-4f1dff500ad9	1	Other	Other
+88b43b3a-2e01-4c28-937d-f3e5932a5bc0	1	Other	Other
+88b43bff-c969-414b-887b-4c6b83bfd1c4	1	Other	Other
+88b4400e-50cb-4733-82a5-a4494201c350	1	Other	Other
+88b455d1-8e0b-484a-8e5f-8b99c33e300b	1	Other	Other
+88b46ba0-f666-46dd-921a-039fd4e26433	1	Other	Other
+88b49eef-92a8-47e0-9e07-f04b1fc5b986	1	Other	Other
+88b4e90d-64e8-43c5-a67d-9ade55d96040	1	Other	Other
+88b590bd-a77d-461a-8178-f23cb8e1f6dc	1	Other	Other
+88b5c84e-efb1-491a-b45a-26a888513d49	1	Other	Other
+88b5e6a8-e34d-4d90-a609-21c8580ff5fb	1	Other	Other
+88b610ff-78a0-4cf1-8633-79b170b71750	1	Other	Other
+88b66264-67d4-419d-86c6-932ea0981040	1	Other	Other
+88b6a140-75e8-4238-9305-25dcdde55cd4	1	Other	Other
+88b6db78-ffd4-4b08-ad93-c21f77420926	1	Other	Other
+88b6ff1c-58b3-472e-99b7-1f44ed0d2948	1	Other	Other
+88b70128-9c0d-4f3e-9661-1ee99c2e37d4	1	Other	Other
+88b715d4-661b-426f-952b-1f9c9968170d	1	Other	Other
+88b71994-170c-11e8-838a-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+88b726d6-7e39-440a-b4d1-685d674d9800	1	Other	Other
+88b75362-e2c5-4933-b6ff-152d9057523d	1	Other	Other
+88b7aea7-fa5a-49a0-ae79-b47e55055f18	1	Other	Other
+88b7b7b4-6cfe-4407-b01c-aea1d0fea000	1	Other	Other
+88b7f83a-e554-4a52-97d5-6769ce970d72	1	Other	Other
+88b864f8-3c32-44ce-abe0-9110df8e953f	1	James	Other
+88b8a1f8-3c6a-4a5c-954a-547f3be31a1a	1	Other	Other
+88b8c792-6aa6-4d9c-b227-4d246e3731a0	1	Other	Other
+88b8e39f-00f5-4c22-af48-226549237716	1	Other	Other
+88b8ed35-0216-44f3-8f4d-d7b6aad97db0	1	Other	Other
+88b90375-28c5-499f-99f8-02350f6f904b	1	Other	Other
+88b94d9c-5a60-488b-9893-2f455b92b038	1	Other	Other
+88b9933a-9bc5-451f-bd6a-6dbe7a58f175	1	Other	Other
+88b99596-20cf-41ef-b330-da8a82f2a17f	1	Other	Other
+88b9a6cb-8674-4fb1-b92f-746c2b3b9ce8	1	Other	Other
+88b9b4c2-9dc4-46e3-bb5a-e1418d49f137	1	Other	Other
+88ba0ea7-4a59-4398-835e-98d0a3788efa	1	Other	Other
+88ba1491-d168-481b-99c5-5dfe37654e67	1	Other	Other
+88ba707b-9d36-4aae-80d6-4c939e732e75	1	Other	Other
+88bac062-7575-40cf-9700-f83fbf8c6e49	1	Other	Other
+88bac09f-f5fa-47fb-acbb-e0b29396f66f	1	Other	Other
+88bac734-ca4a-437c-94ca-10ca38160fa2	1	Other	Other
+88bb0e5f-70a4-46da-8084-ec2f58fab09d	1	Other	Other
+88bb2be2-b9d3-465b-85e4-fd83807199a1	1	Other	Other
+88bb3da7-d541-452e-8b50-becbf5272724	1	Other	Other
+88bb5407-1b37-456a-ba5b-fa33824aca52	1	Other	Other
+88bb5963-e899-4b1f-bf57-462348d5d850	1	James	Other
+88bb5a23-b1b3-4fac-a49f-6333a5563332	1	Other	Other
+88bb6dc5-ad38-4199-8bdf-2758d506b116	1	Other	Other
+88bb7483-5196-42b2-a140-fe0bdf6838c0	1	\N	Other
+88bb8239-d66c-49a2-88b0-8e9359660c98	1	Other	Other
+88bb835d-6790-4973-8865-3a68491c0548	1	Other	Other
+88bba4ad-e2e5-496f-bc11-7a624f2714f4	1	Other	Other
+88bbdc07-0ad1-41bb-a741-29caa1a7d3a3	1	Other	Other
+88bbe917-4f6e-4f75-8755-b762493cd8be	1	Other	Other
+88bc0810-3b51-4aa4-a936-11238eb1f03e	1	James	Other
+88bc9092-1c78-4b5b-9cda-42be8b117a2e	1	Other	Other
+88bcb026-8d65-4e5d-868c-b7b584aaf61f	1	Other	Other
+88bcdc7f-62c2-4a7e-9595-947968681711	1	Other	Other
+88bd0701-7f36-4932-9f8a-4a7263d7c5e7	1	Other	Other
+88bd4bef-212c-4bce-89d5-6e228a7cabd0	1	Other	Other
+88bd7946-821c-4f8f-a11f-1d6cea82a44a	1	Other	Other
+88bdc1ee-201c-47ec-b668-4d9a545055fb	1	Other	Other
+88be20ba-3337-456f-8438-ee238c42c6c4	1	James	Other
+88be21ae-45e3-4993-a015-a4adca236c17	1	Other	Other
+88be2684-91f2-45fc-8a21-f30a802583fc	1	Other	Other
+88be8131-8607-4ec2-875e-a5047cccb7b5	1	Other	Other
+88bebb47-14a1-41cd-afb7-eaf8e08e3c6a	1	Other	Other
+88bebc9b-8675-4a5f-8711-8a970aea0d51	1	Other	Other
+88bf14c1-6d20-44ef-b3fb-7d7bf8f0c1c3	1	Other	Other
+88bf4e55-57a9-4654-9252-f33a1f88e3cf	1	Other	Other
+88bf5885-a82c-49b9-9d2f-7c5df733888c	1	Other	Other
+88bf8fc0-cfb5-486a-b60d-096ad3f88bf2	1	Other	Other
+88bfd785-22e1-4e33-92ff-79303443adfe	1	Other	Other
+88c04fb2-c475-4688-9a39-0cc683724173	1	Other	Other
+88c06529-fea8-4281-900c-abf1720d25c4	1	Other	Other
+88c08a89-0f88-4ffa-a782-0af354607f80	1	Other	Other
+88c08dfa-0f98-49a6-b470-6aef7b0c8d04	1	Other	Other
+88c0930e-94ec-4147-a177-4aec169229ce	1	\N	Other
+88c09cc4-5a25-40b8-b5d2-b5c402873f53	1	Other	Other
+88c11757-1362-4863-8d9a-420d0f7f1833	1	Other	Other
+88c1620b-7b62-4d95-b208-cefde84b62f4	1	Other	Other
+88c1758a-eaca-475f-963b-cfdbb82f19bc	1	Other	Other
+88c17839-9d1b-4eef-badf-5bbbaf8e0e00	1	Other	Other
+88c1ac64-30dd-4480-9614-c4684af3ed7d	1	Other	Other
+88c1c96e-8143-4fd9-a9ee-81167c395c62	1	Other	Other
+88c1e507-3dcb-4468-beb6-c6d7f0caa132	1	Other	Other
+88c221b5-816a-4115-92ff-90c2f944b86a	1	Other	Other
+88c234ed-2329-4be2-b08d-095858f20edd	1	Other	Other
+88c23682-5ab0-4cc4-b6c8-9073b3280071	1	Other	Other
+88c28f93-a1d2-43cb-8177-54921dbe3dca	1	Other	Other
+88c2b3c6-d7b1-41ac-a232-b06636e9e419	1	Other	Other
+88c3d455-2af5-434a-bf89-840295876981	1	Other	Other
+88c3d4b2-6a73-4d22-a669-4e14efb8e798	1	Other	Other
+88c3d8fb-65aa-4186-a4b3-238542bddb27	1	Other	Other
+88c3de8d-9922-4546-9fc6-e92b886ea1a8	1	Other	Other
+88c3e803-0631-4bdc-8236-37afbc602b60	1	Other	Other
+88c43930-7602-46ca-8ca9-2f58fa5a61ec	1	Other	Other
+88c46ee7-7e1f-4d2c-b737-da16ba743c39	1	Other	Other
+88c4d1cd-9d1c-4ad3-b877-43d1297efb8d	1	Other	Other
+88c4e943-be21-41b7-a38a-d0c23a4f757e	1	Other	Other
+88c52b24-eab2-4569-be84-efb5cbd9d08b	1	Other	Other
+88c592ec-a582-4843-8b76-7ba4db587afa	1	Other	Other
+88c5cb9e-407e-4090-a124-1bac9f5be611	1	Other	Other
+88c63a61-0373-4c06-b9e3-5c1bb08d8145	1	\N	Other
+88c64605-efae-4ddf-ad84-e3fc84c37b86	1	Other	Other
+88c6511e-6f3a-4213-9e0d-0ce9daf98b13	1	Other	Other
+88c673f2-5974-448f-9d4b-aedaaa8ef76d	1	Other	Other
+88c67c49-e984-4268-868a-6f8554bbd376	1	Other	Other
+88c6810d-aaa3-4fb7-94ef-d9ef63e7cbc1	1	Other	Other
+88c6b61a-620f-473b-83bc-f0b547c0b85d	1	Other	Other
+88c6d93e-e6d9-441c-a844-943b39b91d9f	1	Other	Other
+88c75438-4ad0-4986-9187-4446ee304d15	1	Other	Other
+88c7596d-c40b-42fa-9038-d5b016394965	1	Other	Other
+88c766f6-cca1-469b-9706-e93a0e84047a	1	Other	Other
+88c78d2c-ba45-443a-8c46-9b361c741a01	1	Other	Other
+88c7aafe-7b97-4744-bab9-ef9100635c4b	1	Other	Other
+88c7dff9-eb40-41e3-86ce-87f327a2c742	1	Other	Other
+88c7e462-0e5f-412e-aa22-d6a970dfd06d	1	James	Other
+88c8c4eb-b2ea-4f3c-858a-8e15434c7870	1	Other	Other
+88c8ee8c-0996-4c41-a674-62ca8bbc3e0c	1	\N	Other
+88c8fa12-21e5-4626-ac4b-c7299770d238	1	Other	Other
+88c93a00-930a-4411-a802-f5c47d79883d	1	Other	Other
+88c99b10-be1d-4776-925d-c31b863b2bfe	1	Other	Other
+88c99cc8-abb2-4783-a65b-9f5b31a3992c	1	Other	Other
+88c9ded1-9f9d-4940-922b-3814873a4058	1	James	Other
+88ca6e3f-9139-48ca-8246-f026e85772b0	1	Other	Other
+88ca7ca1-2e7c-4672-9832-dff7fff2153b	1	Other	Other
+88cabcc0-8551-460d-a84a-91d18028c8af	1	Other	Other
+88cb3823-6333-442d-a7ac-995ff900ade7	1	\N	Other
+88cb5414-2703-4cb0-a69a-0270830b3214	1	Other	Other
+88cb89d1-b7a7-4f66-94ca-e315a68590d6	1	Other	Other
+88cb912c-b384-4539-b87d-a4ba543459fc	1	Other	Other
+88cbf629-c3f9-4685-9d93-059a19ccfc88	1	Other	Other
+88cc1e9a-a696-4b59-953c-173b0f06c036	1	Other	Other
+88cc3ccc-7686-4098-b306-1b476ba2bb95	1	Other	Other
+88cc82f2-c401-4acc-839f-c4655573d48d	1	Other	Other
+88cd24ea-8b2e-43a6-bb7f-894bfb14c2cc	1	Other	Other
+88cd3033-fd35-4ac8-8a60-23e7bfdb0991	1	Other	Other
+88cd3bf3-4140-4fd2-a524-ae5a82ed5055	1	Other	Other
+88cd5408-6d16-488e-8fd1-2a7cdf356a50	1	Other	Other
+88cd9575-5d20-4e1b-b220-ed7b2686d96c	1	Other	Other
+88cda55f-b49a-4e5d-b29e-b2c0cf9b3a1d	1	Other	Other
+88cdfd28-ebb5-4ddb-b413-341a288917f3	1	Other	Other
+88ce60d8-086f-4a51-86c6-13067c9b2e4d	1	Other	Other
+88ce8fc3-92d5-46b5-a13e-e46f3957d185	1	Other	Other
+88ce9682-2b0f-40b0-a4fe-72a27618aeb6	1	Other	Other
+88cec72a-5183-47ff-961e-f93a51c7a3a7	1	Other	Other
+88cef25b-ab81-46db-bd07-30b54d5eca57	1	Other	Other
+88cf3be8-3529-4603-9567-0d46dbcbb9ae	1	Other	Other
+88cf476e-8118-4b34-817a-7bcbab6b4f44	1	Other	Other
+88cf6212-a50d-49cb-bcdd-bfdb49c3fdf1	1	Other	Other
+88cf7b8f-46d1-4d1f-befd-9944b5682322	1	Other	Other
+88cf8a8b-03ba-4171-9ac5-fc2b35570ccb	1	\N	Other
+88cf8f6f-e237-4a0a-bf81-70649b12d3e1	1	Other	Other
+88cf9670-ece0-404b-b09f-7888bdcbce3d	1	Other	Other
+88cff8a1-0a46-4888-9fcd-8a577e027fe8	1	Other	Other
+88d01870-faf2-4997-8db3-3b941d3ea1fe	1	Other	Other
+88d039fb-c047-4152-86a6-a8f9b628c646	1	Other	Other
+88d0543d-3dd7-4345-b68b-f8a34e3cf367	1	Other	Other
+88d09d3c-2404-4597-96ec-83a336b3098d	1	Other	Other
+88d09e84-e1ca-403d-82f2-92cbcb22ece2	1	Other	Other
+88d0a583-4fc6-4a3b-b7af-cb8bde8222b8	1	Other	Other
+88d0d4f4-2b1d-49ec-8769-eec076db7496	1	Other	Other
+88d0ecb7-97f5-4052-86d8-418b4c4f044d	1	Other	Other
+88d1220c-6168-4a1a-b27c-46271364399d	1	Other	Other
+88d1886e-584c-4f09-b550-c0b2d68e82f9	1	Other	Other
+88d19760-4346-4ccd-b8e9-085a5b50f4a5	1	Other	Other
+88d1a606-a1f9-411c-81f5-d64f383357bd	1	Other	Other
+88d1d70b-f67a-4a8e-a975-c794bc6a036f	1	Other	Other
+88d20ce3-d8e5-4fcc-ab59-808327387217	1	\N	Other
+88d21747-8f64-49bd-89b7-f88b96aa0304	1	Other	Other
+88d21f22-8983-475f-be00-5d2dd360a72a	1	Other	Other
+88d25ba1-85a1-4be0-a687-d8ce363813d7	1	Other	Other
+88d2b170-aef7-49f2-8a1c-dc73edf272b5	1	Other	Other
+88d2c41f-f31b-493e-8ddb-147750beca0b	1	Other	Other
+88d2cd1e-0e33-46e7-b609-25e97cc6c713	1	Other	Other
+88d2ce6a-8288-4276-8305-e8739316bffb	1	Other	Other
+88d2dc43-dacb-4068-8f69-0fd56ac2b924	1	Other	Other
+88d2e4dc-aaa8-4262-ace8-31be263f49b9	1	Other	Other
+88d2ef9c-4f57-4ff7-8d1e-0e15e08f1e2b	1	Other	Other
+88d2f93d-aef3-4827-bba7-47749a948e9b	1	Other	Other
+88d31f9b-3675-4f50-a2a0-d09b24bc8c98	1	Other	Other
+88d33bdc-a2fe-4a24-85c6-24fb20566e08	1	Other	Other
+88d36af6-6529-4083-a459-edf302d3662e	1	Other	Other
+88d3956a-7b01-4935-97fc-114740e2e464	1	Other	Other
+88d3be04-3597-4380-99c9-2daa16ec095b	1	Other	Other
+88d3bff7-2823-4a99-a82a-8eb3fab0dcce	1	Other	Other
+88d3c065-2ca3-4843-a2da-393f852a1a44	1	Other	Other
+88d3c783-6448-4631-bfe3-7bb845f6fc49	1	Other	Other
+88d406c0-e418-4fd5-af10-43e432879af1	1	Other	Other
+88d42550-bfde-4329-aecd-8e89a2c6dfa1	1	Other	Other
+88d429b0-e611-4160-8a22-bfcb86525ec1	1	Other	Other
+88d43752-5e8e-4cf8-b843-5ce0460f7d26	1	Other	Other
+88d456c4-dee8-4ee0-b22d-dfa860f380b0	1	Other	Other
+88d46db6-4f85-44e9-aa03-1389bf1a3099	1	Other	Other
+88d46f32-4596-4be1-9429-bb7937726456	1	Other	Other
+88d56270-a408-4c7b-b671-690ca31b87e9	1	Other	Other
+88d5a5f0-038a-4c3f-9084-044cd001a4ba	1	Other	Other
+88d5a716-7615-4a61-9500-72db6e1630e2	1	Other	Other
+88d5c3e8-664d-47d9-b4e4-3e1ed85fb8f3	1	Other	Other
+88d66333-bd39-41c2-b2a7-12fd08613bd3	1	Other	Other
+88d68ca6-c86b-4387-bb88-75b587a30c4d	1	Other	Other
+88d69e44-5921-4c3d-91b5-5cb30890eaf4	1	Other	Other
+88d6ce67-f3f5-4b5b-94e4-05cf41ba8a21	1	\N	Other
+88d6d007-0b2b-4571-966a-a3ff04cb5697	1	Other	Other
+88d712a6-3f6d-4319-815b-1862be51b60b	1	Other	Other
+88d74249-8eb7-4bbd-a562-7f70fa02ed2a	1	Other	Other
+88d7b3ac-3d0a-4c71-9405-c667418dba73	1	Other	Other
+88d7b7cc-529f-4b2a-a9e2-ff5c09b2acce	1	Other	Other
+88d7bbb6-a4e9-456d-b5ee-8afeb19564e9	1	Other	Other
+88d7e8c9-d0bb-4f93-a553-87bba862ef24	1	Other	Other
+88d81b12-694c-48a0-afe5-5ebd9c0374ad	1	Other	Other
+88d81f04-d7fb-47e9-8418-70aa55fc8667	1	Other	Other
+88d820a8-b6e3-42f2-a473-53562b2af95c	1	Other	Other
+88d87133-2b00-4787-b00e-c9ed8f130f9c	1	Other	Other
+88d876e8-cff0-440b-890a-ed8dbeb78b6e	1	Other	Other
+88d8e115-3cb0-4664-be97-84ff2c1a1599	1	\N	Other
+88d8f25b-ba69-46da-9f48-b96ab682045a	1	Other	Other
+88d90bd2-2d4f-4084-8061-fcb913a03190	1	Other	Other
+88d9536e-82f3-4dfb-be8f-100611253464	1	Other	Other
+88d9640e-067a-4e17-bb53-bd016f2fd43f	1	Other	Other
+88d9a593-ce17-4757-aac9-66ecdda692c5	1	Other	Other
+88da26f4-600d-4fd4-a92d-4ccc69d9add6	1	Other	Other
+88da5215-0ab3-469a-a1ea-5943d9c33b92	1	\N	Other
+88dadc0f-bc3f-44d9-8ad2-865616d3f275	1	Other	Other
+88dae5fb-6c82-467e-82d4-e029961cd6a6	1	Other	Other
+88db0c05-2425-4045-a03d-f1d83ec90443	1	Other	Other
+88db2471-f347-4222-af5c-cb08bad0f011	1	Other	Other
+88db6cc3-3a20-48b8-bce3-1a915a705e81	1	Other	Other
+88db75e3-f4ca-46b7-b677-a2cbcfe12a42	1	Other	Other
+88dbdefb-7cf7-49cb-938d-99b62c9cf665	1	James	Other
+88dc5cd7-d380-490d-bcc6-cb1e0efad1a5	1	Other	Other
+88dd6dec-5734-4916-be78-1df8a9fbf186	1	Other	Other
+88dd8a43-5e5b-4b4d-90a3-eadb94015781	1	Other	Other
+88dd9f61-cf83-441a-ad7c-6a79e55e7075	1	Other	Other
+88ddae7c-02c1-42c6-af97-7fe4a5e12df2	1	Other	Other
+88de3889-009a-4a3c-95dd-b52c4486e87b	1	Other	Other
+88de79ba-8aa1-426c-82fc-517b35f5325b	1	Other	Other
+88de8561-eff7-402e-945d-7b1e72d4586e	1	Other	Other
+88de9629-725a-4d54-8fad-ef1bac4a60bb	1	Other	Other
+88ded38b-88d2-4a43-b11f-4af4aa4d4e18	1	Other	Other
+88df1d2e-a413-4b0d-89bc-9db02457b76a	1	Other	Other
+88df3185-252e-42b8-a8b7-a1bdf19c1cfc	1	Other	Other
+88df3d87-b535-45df-ac6d-7088c6937b7c	1	Other	Other
+88df4152-ad6d-46f6-a1e2-e5a4d83bacb3	1	Other	Other
+88df46f2-95aa-4604-9a6c-2c3ba7e3451a	1	Other	Other
+88df5ae8-899b-4768-9ad6-450fcfee9d6e	1	Other	Other
+88df5dc5-13d4-4325-aa4b-eeef37b51db5	1	\N	Other
+88dfa5e4-c2a2-4170-a21f-9aafa228b20b	1	Other	Other
+88dfb9d8-3327-47d9-b55a-dfb53773be7b	1	Other	Other
+88dfcdc2-1dd7-4ace-9569-1203c4dc2ed0	1	Other	Other
+88dfd9a5-8389-43c5-913c-c1e3d39b72d6	1	Other	Other
+88dfe4d0-9e1b-4c7c-8dd9-22cc15bf5364	1	Other	Other
+88e0061f-a467-4f88-9039-52f6afd52d04	1	Other	Other
+88e04bf4-2b5d-48b0-9b69-bd1103be5051	1	Other	Other
+88e08a71-bf6a-4f5c-b59a-8920e0b4a236	1	Other	Other
+88e09c67-bc8b-4130-b530-05d981300740	1	Other	Other
+88e0a34c-6433-4c9a-be21-123e75d14df7	1	Other	Other
+88e0a91d-7a5e-4c6e-983d-9c2a32bef306	1	Other	Other
+88e0aa84-2cb1-4d80-a24f-89af298f7355	1	Other	Other
+88e10adb-9395-4576-905f-933654c8f817	1	Other	Other
+88e1e846-058a-4c15-b5da-33f3f061119e	1	Other	Other
+88e20e31-49b9-4270-b5aa-80a9e2b7afe8	1	\N	Other
+88e21ee9-5a1f-4ed7-8474-9b5eaf4f55ed	1	Other	Other
+88e24ffd-ea23-49fc-816f-cf7b356d8c11	1	\N	Other
+88e2697e-9261-453d-ad75-8ed640f9a55a	1	Other	Other
+88e27e91-73f2-4ec8-b05f-2dc2c5e25130	1	Other	Other
+88e28591-d756-4cfb-bb12-a64d09d6cf80	1	Other	Other
+88e2870b-603c-44bc-a09c-c5fe8c17b478	1	Other	Other
+88e2ad41-fbaf-4080-8dce-dd4f373c7339	1	Other	Other
+88e2b6ee-d96a-4de8-98c7-fc97b3627fe4	1	Other	Other
+88e2e0b6-439b-4e7b-a0e2-8d568d1e7e86	1	Other	Other
+88e30791-93e8-4279-8be0-1eb3de20e08e	1	Other	Other
+88e3212b-9f3e-42ea-87f1-bf47a0f17bb9	1	\N	Other
+88e3273c-9350-4e0a-ad49-9e546bcd68db	1	Other	Other
+88e35585-9c32-4c09-af68-2cac0e8e37cb	1	Other	Other
+88e384a4-373c-4b75-b907-0677b4fe74c2	1	Other	Other
+88e4153b-595d-4727-878a-ea59bd626826	1	Other	Other
+88e444a9-f42d-4908-9eff-4d3658c0b350	1	Other	Other
+88e4531c-fd0e-4145-b9b1-241424555203	1	Other	Other
+88e4a1e9-d465-4da1-ba20-ebdd93731ad9	1	Other	Other
+88e4a2e5-5ded-41d5-b77f-90bcfe6934ec	1	Other	Other
+88e4b72b-b569-4109-b3d7-c87bb9a99ec7	1	Other	Other
+88e5085d-1557-4e87-af90-864c17d762fe	1	Other	Other
+88e52812-5801-4bc8-8120-2428c5adb6bb	1	Other	Other
+88e55cdc-6ce9-422c-b53b-8f6f5a312e9e	1	\N	Other
+88e56ff6-f63c-40a1-a973-a11a757a2c3b	1	Other	Other
+88e5c224-6e10-451f-8066-580aa3126942	1	Other	Other
+88e5d81d-05ee-4d67-969c-7eab93629012	1	Other	Other
+88e63e99-0676-49a4-a5ad-6d32713b7cb9	1	Other	Other
+88e6afa4-c176-4acd-9387-ef4a58ad790a	1	Other	Other
+88e6c885-e5ec-4523-8e63-bdb6b1b1a1a9	1	Other	Other
+88e6e1e8-40d7-409b-a579-e947a6c482e8	1	Other	Other
+88e6ecd5-b1cd-4c9d-b356-81d7c91aecc1	1	Other	Other
+88e70dba-0e12-4175-9bf2-675bce26d7a9	1	Other	Other
+88e71376-ee2f-481b-9e84-ffd058a1b412	1	Other	Other
+88e72cd7-8048-4acc-8007-5e208cba542a	1	Other	Other
+88e7d7c1-1725-4ab5-8d62-66215a304c50	1	Other	Other
+88e7fa7d-4fa9-42b5-8f2a-2ddbf45ab60b	1	Other	Other
+88e82e03-ca53-4d4c-871a-35eef23e40a3	1	\N	Other
+88e8403f-52b6-48c4-b724-a5132b0688ed	1	Other	Other
+88e88be9-b99c-4e8b-aba9-484494f297fe	1	Other	Other
+88e894c8-b024-4a02-b967-ed0360c79f5b	1	Other	Other
+88e95751-cc1c-4231-a075-de15c478f33e	1	Other	Other
+88e9a101-3de5-41a8-89cd-f898d9e6410d	1	Other	Other
+88e9d89b-3797-4631-b3ee-c2541f1d8166	1	\N	Other
+88e9f7b9-c051-4d16-a3f4-3919cdcc4a09	1	Other	Other
+88ea14c1-f96d-4cd0-8e96-8e4a229acd26	1	Other	Other
+88ea19e9-9036-43f2-8350-5832ac5227c3	1	Other	Other
+88ea22b9-f01b-4c0f-90fa-99477c2c7a64	1	Other	Other
+88ea82d2-cbce-4cb2-a1f4-404d8e3928db	1	Other	Other
+88eaa855-08b9-4ec1-aacb-2a5bb39acf63	1	Other	Other
+88eacaa8-a95e-4b0c-b9cc-b9efe25adb08	1	Other	Other
+88ead88b-311f-445c-8f04-7c3ebccdd281	1	Other	Other
+88eaeb41-eed2-41b5-b469-d3eb788e1823	1	Other	Other
+88eb154a-b4b9-4925-9662-80455e3e3418	1	Other	Other
+88eb1e3a-e283-4c26-98f0-9a17a3007357	1	Other	Other
+88eb3d34-e4d1-4a04-913e-5292fc02e2e5	1	\N	Other
+88eb71ff-b8ea-4a0c-8579-b57c2d156809	1	Other	Other
+88ebada6-20ec-4029-85ac-b5c330b51784	1	\N	Other
+88ec056b-708b-46e0-9730-a1d5237504de	1	Other	Other
+88ec0b5b-acda-4dec-b3c8-a237ed800ffe	1	Other	Other
+88ec0f68-f4eb-4b24-aaf6-17ab7a7f2035	1	Other	Other
+88ec3aa9-9afb-439b-8d94-3eb337c133b2	1	Other	Other
+88ec58ac-6a7c-4971-aa78-5bf205e52445	1	Other	Other
+88ec9b66-0e30-414a-8c5c-e85417709bcd	1	\N	Other
+88ecf3e7-85b0-49fb-b63a-9f8c776d92f0	1	Other	Other
+88ed159c-cda4-414b-8a48-5487ac7fff1e	1	Other	Other
+88ed2a07-3c36-45b7-bb43-66ff90f3d12a	1	Other	Other
+88ed7959-7ed1-434a-bd89-070515f004ce	1	Other	Other
+88ed9238-e708-4bf7-9a7f-15d1b5ccfe0c	1	Other	Other
+88ed9996-b0c0-4566-8ff5-c18587358196	1	Other	Other
+88edb04e-9048-452e-89ee-32c2d6db1dc0	1	Other	Other
+88edb36b-194b-4360-9601-8376539d33d4	1	Other	Other
+88edf46f-8032-4713-9392-3a9db1ed61e8	1	Other	Other
+88edf79f-38e3-4330-baf8-04187acf3354	1	Other	Other
+88ee1259-e82e-4054-b2bd-f5907f5a2d2a	1	Other	Other
+88ee24dc-378f-4ea2-98ac-1cb5ff34a83d	1	Other	Other
+88ee879c-c6b6-4ec4-808a-6a647c4521cd	1	Other	Other
+88ee8e32-7da8-457c-b348-c56ec6bc5d51	1	Other	Other
+88ef281e-5a83-4563-829f-7d97d54666fd	1	Other	Other
+88ef3c1e-5d1b-442e-a031-555e819ded9f	1	Other	Other
+88ef69b8-9d2c-45c7-8116-dd3f2bcec154	1	Other	Other
+88ef6cf7-e609-4199-b9d3-c79d90c25ee3	1	Other	Other
+88ef7357-bb08-4898-a582-a3eea67ccab7	1	Other	Other
+88efc293-5cd0-4f4f-b61f-b581a008287b	1	Other	Other
+88f00c9e-e423-4f33-96e2-4226ee28d1c4	1	Other	Other
+88f02817-4eb2-4ca1-abdd-1421bf075bff	1	Other	Other
+88f02cfa-e010-477e-a906-c3c197f57767	1	Other	Other
+88f033ca-91b2-48fb-b464-4f74c8ef5a9b	1	Other	Other
+88f05425-a915-48d1-ad1f-51016a642fda	1	Other	Other
+88f099bc-3f8e-4d37-aa8f-fedb9edb1f60	1	Other	Other
+88f0b1ce-7f8d-4146-bd0f-0924abd96efd	1	Other	Other
+88f11305-7b1c-48c6-bba7-6e4dbd7bb495	1	Other	Other
+88f14554-43b6-40ca-9c80-d86b65408ea0	1	Other	Other
+88f15208-bd1d-4173-8b59-2d1c12ce3b69	1	Other	Other
+88f27d25-0a08-47b2-945e-2e51c6557b8c	1	Other	Other
+88f2b9f6-d8a7-47a1-ba7e-5a55b5ed737c	1	Other	Other
+88f2cd32-8e25-447e-a6aa-95073dd69b06	1	Other	Other
+88f334d8-c3fc-47ad-b206-a98cbddd9da5	1	Other	Other
+88f36fe9-b859-439f-a290-ff227b9c3cc7	1	Other	Other
+88f38846-9081-4697-adbb-91902765d433	1	Other	Other
+88f388e5-e305-47d8-ae55-a3c6331bd09f	1	Other	Other
+88f38cf6-e889-48ae-8edb-a2da7368bfe3	1	Other	Other
+88f3b43d-ca3e-43e4-98a4-55da5f5a1f10	1	Other	Other
+88f3c368-1507-4434-9d3b-d93e39d5cf8f	1	Other	Other
+88f3ea99-7040-4ac0-9199-4f5df0d9e133	1	Other	Other
+88f424a2-cddc-478a-96b2-a48dcc5d4b46	1	Other	Other
+88f42e5f-ec42-4f53-a594-96a01efb6b71	1	Other	Other
+88f4393e-0856-4de8-b266-521afddbea20	1	James	Other
+88f44bb3-e596-4191-82c9-165c0a41a372	1	Other	Other
+88f46410-c0e5-4ebe-a6ed-b642623c0bee	1	Other	Other
+88f4b9c4-d4f1-4f7f-8568-ef9cbcb35d85	1	Other	Other
+88f4bb25-f952-4c65-b260-198f044d48b9	1	Other	Other
+88f4da33-9b3b-46bc-beff-1580fdf21945	1	Other	Other
+88f4e744-fac4-4d37-81c9-8330b3239cfe	1	Other	Other
+88f53888-06c1-11e8-8848-fa163e8624cc	1	\N	Other
+88f63072-5a63-4125-b3a5-bb7f0ef592c3	1	Other	Other
+88f63550-e039-4647-a8cd-bfc1fda0c983	1	Other	Other
+88f6626c-e791-4071-acc2-77facb4cbac7	1	Other	Other
+88f6b6e1-f0fa-4365-bce6-8a93502eeb9b	1	Other	Other
+88f6ba6d-ed89-42e6-824c-7bde1cfb94ba	1	Other	Other
+88f79f6e-0256-4a1b-8e20-c2440ecfd3b6	1	Other	Other
+88f7abec-0202-4961-b96b-d5a124cda005	1	Other	Other
+88f832b1-c86e-4f4a-90c6-e9288968d7b6	1	Other	Other
+88f850f1-72a8-4531-9f05-e2968cf28f71	1	Other	Other
+88f85e4b-5e8d-46aa-b8b1-03ca3e1c10c2	1	Other	Other
+88f875ed-b28d-4749-a121-73534efe5129	1	Other	Other
+88f8b94c-5f20-4c0f-80c1-fccdea26cc1d	1	Other	Other
+88f8d3f7-d9e1-4d13-9c2c-8e431b24b8d3	1	Other	Other
+88f93e9b-b97a-4242-be81-02249b22785d	1	Other	Other
+88f96c1b-5969-451f-956c-1bada1737dec	1	Other	Other
+88f9763b-9a2e-4c46-b663-cbd8fdc961ac	1	Other	Other
+88f9847d-0fca-4b93-bec3-f5705258adb0	1	Other	Other
+88f9d716-4630-4f37-9fdc-b68df52a4799	1	Other	Other
+88f9df2a-7412-4f7b-88dc-1497f6e9b153	1	Other	Other
+88f9e40d-d329-4d3d-81b1-b280656b73ba	1	Other	Other
+88fab80c-2aab-496e-a9d5-1bdc09fb23df	1	Other	Other
+88facb11-429c-4678-a99e-1cffa68615db	1	Other	Other
+88fadebf-eb8a-44dd-a962-c93eb997ffad	1	Other	Other
+88fae4c6-00c3-43e8-bd89-a65b080eff5f	1	Other	Other
+88fb0c90-17c0-4a68-9760-de3347fc9dbb	1	Other	Other
+88fb460b-05c6-43b8-884e-70470179a810	1	Other	Other
+88fb5499-546c-4d11-9167-fc20b39d516b	1	Other	Other
+88fb998a-f719-4dee-a300-38128a67daca	1	Other	Other
+88fb9bf0-919d-45bc-b5fa-a3f8d7cc2ade	1	Other	Other
+88fbd5b4-5ae4-479f-9ffc-e702de562971	1	Other	Other
+88fbff16-894e-4ed9-b292-9c444d912257	1	Other	Other
+88fc804b-4d2d-410d-8842-af6264c32bfa	1	Other	Other
+88fc9090-ca3f-43e3-a2aa-b371ba3ceca5	1	Other	Other
+88fce56e-582f-41f6-a138-b5a2bc21100c	1	\N	Other
+88fd29de-f139-4ca3-8694-7ce5ad454d14	1	Other	Other
+88fd86a5-9687-4306-b793-89ad8c8e06a5	1	James	Other
+88fda2ec-494f-4e8a-b4e8-25f1ddb5000d	1	Other	Other
+88fdf577-54b3-4918-aea8-1cb13f9ac36f	1	Other	Other
+88fe2845-1f41-4a05-95ec-10d3ed20c0a7	1	Other	Other
+88fe379b-7eef-4e61-897f-b5a244508f73	1	Other	Other
+88fe3c71-029c-42d9-86cf-7aa75f70f75f	1	Other	Other
+88fe47ed-b48a-446c-9720-0ce1b9511148	1	Other	Other
+88fe6033-901a-4aa2-87a5-d4140779e3b6	1	Other	Other
+88fe60b9-a624-482a-9ed7-e129fe3a3d13	1	Other	Other
+88fe8436-3e68-430c-b0eb-cc86f739f9e9	1	Other	Other
+88fea8ed-a4e5-4378-adef-523bbe50aa8f	1	Other	Other
+88feb6a8-9d23-4f2a-8a95-10ce12e708d8	1	Other	Other
+88fec4c4-5ab5-4d65-8454-b30425d2742e	1	Other	Other
+88feeb94-250c-44d0-a20d-5f4eaba71126	1	Other	Other
+88ff3349-b4b2-4e57-9f3b-f83113bbc0e1	1	Other	Other
+88ff7295-d711-441b-abea-9cf6b843a188	1	Other	Other
+88ff75b5-2a8e-4047-9d72-040c75cdcab2	1	Other	Other
+88ff7735-1803-4292-a1f6-91ef202e0685	1	Other	Other
+88ffb403-f9c1-47de-b8e2-a76f0162b143	1	Other	Other
+88ffb900-1d05-4dab-a4b2-62068e1e5d96	1	Other	Other
+88ffbc36-785f-404b-8dab-43f4cc13deac	1	\N	Other
+890031be-4b44-4bb6-8003-46edebed2921	1	Other	Other
+8900620a-7105-4cdf-bbb6-702dca099edd	1	Other	Other
+8900aee0-61aa-4b85-960d-fa224697c61a	1	Other	Other
+8900d950-8e87-41f7-b13e-761e70bd3a43	1	Other	Other
+8900f283-cb4a-4051-9dca-293b76c640a8	1	Other	Other
+89010238-317f-47ec-8c6d-ba06bd21d312	1	Other	Other
+890131e6-1cf3-4a69-91f2-765fb16cd72d	1	Other	Other
+890149dc-eac9-49cc-80e2-404c0f88c747	1	Other	Other
+89017cd3-51e0-4948-9940-4ae51e7abfda	1	Other	Other
+8901a9f2-ae2f-43fd-900d-eae8bcba77c7	1	Other	Other
+8901ec80-46ca-4c4a-90ad-9beda1e67441	1	\N	Other
+890211c4-54d3-46ff-8bfa-715ff0636cac	1	Other	Other
+89024f58-c067-4044-b435-3ebf31a4b8b1	1	Other	Other
+890304c0-5c64-4921-a7b7-3590a6b0d6fa	1	Other	Other
+89036434-1bdd-4852-ba2b-23acba2a5db1	1	Other	Other
+89037ea0-dd80-4f21-9ef3-a18879c33b7e	1	Other	Other
+890393f4-195b-4db8-91aa-050bdafac2d6	1	Other	Other
+8903da17-2bc2-43f8-85d0-b747a2ded264	1	Other	Other
+8903e105-a5b6-477a-9a2b-bfcba825930e	1	Other	Other
+8903fdd9-4008-42dc-88d7-bbf049b467be	1	Other	Other
+89040cd3-ae5a-4395-ae33-957f9547ed1a	1	Other	Other
+89042fe6-6268-49b2-93b7-98653a954531	1	Other	Other
+890437c7-c881-4290-839a-d4535df7d301	1	Other	Other
+89047faa-5816-4151-a639-1a0bfd8003d8	1	Other	Other
+890490f4-3c4c-415e-994f-988d2856cfa7	1	Other	Other
+8904d1a7-529a-42ad-bcef-ccb0d7c075b3	1	James	Other
+8904f3fe-cd19-415c-a539-b8c126c7ca4f	1	Other	Other
+8904f569-5ea7-4c84-a7d8-5cd6668d38a0	1	Other	Other
+89051f46-4fb3-4851-ba78-563a0edfdf9c	1	Other	Other
+8905b996-77a7-4f8d-8f27-5de21bc8cb02	1	Other	Other
+8905ecc0-b16d-4858-b1e8-9195abe30b6a	1	Other	Other
+8905ee57-f76d-4e59-9bfc-846a87a0d4a1	1	Other	Other
+89063d55-6949-48c5-b4a1-4179cf863db4	1	Other	Other
+89064ef8-dcaa-4e7e-bd8a-e1bf76854465	1	Other	Other
+89067c35-f7e9-443f-831d-61360ba128b8	1	Other	Other
+89067c70-a21e-4541-85f7-984fd1b85f9a	1	James	Other
+8906f7d1-ad89-40d3-b113-01cc97cfe2ca	1	Other	Other
+890719b3-1a21-4bf7-8966-da604a7f70e6	1	Other	Other
+890769ff-945b-47e0-8aac-d7cf3fdcc6d1	1	Other	Other
+89079535-6c5a-4472-ab3a-93aec3c7d395	1	Other	Other
+89081495-26d2-4617-b4fb-8e4a87847db7	1	Other	Other
+8908a5ae-68e4-4e4b-9598-494a2959dd02	1	Other	Other
+8908d1d3-334f-42cc-8fae-82666fe75839	1	Other	Other
+8908f4a8-e147-42ba-92a3-95cb92cde063	1	Other	Other
+89094769-fee8-4979-abb5-3f168cb94c1d	1	Other	Other
+89094f08-fd49-41c6-a38f-92b4c5e6039f	1	Other	Other
+89096c2d-8aca-4ee1-9cf7-68bffc947a90	1	\N	Other
+8909965b-78f1-44a3-99d5-da06d29b21af	1	Other	Other
+8909be30-5817-43dd-8d68-4fa3ceaeab39	1	Other	Other
+8909d4b5-7931-4250-82bd-aae680d6a558	1	Other	Other
+890a4bfa-8084-4c4f-b8ed-2929187d9159	1	Other	Other
+890a6558-2215-455e-bad3-05270069482e	1	Other	Other
+890aa287-2dba-4420-bc52-5c030fef4705	1	\N	Other
+890aa542-199a-4c1c-92ea-f911ba7d659f	1	\N	Other
+890ae8aa-fa5a-445b-9479-e086b99af2cd	1	Other	Other
+890aeb14-ccd8-421d-8c91-d732ed943716	1	Other	Other
+890b5d7f-7add-4033-a393-656cb4e2cb93	1	Other	Other
+890b60c1-7aec-48b2-b03e-fa0b3b80bd94	1	Other	Other
+890b658a-3971-4836-b24e-c0a6fdd21bf6	1	Other	Other
+890b80d3-affa-43db-98c3-3567f7f0e39b	1	Other	Other
+890b99ba-41aa-4b25-bfda-43113491a3e5	1	Other	Other
+890c0024-54eb-4b81-b20c-208db33d8448	1	Other	Other
+890c2c2f-4ce5-43eb-9cd2-92932282b6b1	1	Other	Other
+890c65a2-666e-4e15-b92c-bf0a94b14833	1	Other	Other
+890c8d3d-17c1-4548-ae8c-8c9194b5b5d0	1	Other	Other
+890cb16f-ce97-4fc1-b9e4-d45b4389b62f	1	Other	Other
+890cce09-2d07-44e5-a4d9-1835bbd4e2da	1	Other	Other
+890ce5ba-dccd-4a62-bd01-425f41d8c335	1	Other	Other
+890d0893-ef05-4958-a68a-01d7b5e1f8ab	1	Other	Other
+890d0ac8-310a-4988-9e0a-5eac0f8380db	1	Other	Other
+890d12af-229e-4c47-99cd-91ff89c11cb8	1	Other	Other
+890d2917-4c29-4a22-8789-bc2271cf5439	1	Other	Other
+890d4f99-9672-4535-b964-bf00d1d7b3d5	1	Other	Other
+890d72e4-161d-4549-b0f6-23df8786562a	1	Other	Other
+890db277-b9df-4f12-8d5d-ee6056d1cf32	1	Other	Other
+890db574-04ae-40f4-bb84-879f363e8c42	1	Other	Other
+890dc215-f880-441b-b027-f4ac246f69ad	1	Other	Other
+890ed8a2-c7b7-4bd6-8d13-c8aae5edcb1c	1	Other	Other
+890edd40-271a-41cc-8954-bb838a6975b8	1	Other	Other
+890f072b-4582-45f8-b6e8-873a777b81a7	1	Other	Other
+890f2a93-5c07-4e1b-8e41-62658de8d914	1	Other	Other
+890f55c1-9acf-4efa-ad80-3c8270152a54	1	Other	Other
+890f9941-9e79-4154-80dd-583d158a391f	1	\N	Other
+890f9a4a-b0e0-4cae-b48f-8f552cb1769c	1	Other	Other
+891004ea-7f17-40b1-ac51-72aa769b50b3	1	Other	Other
+89109389-26a4-491b-94cf-1e24ef5dda38	1	Other	Other
+8910b5f3-270b-4f94-aae4-b3036764ad98	1	James	Other
+8910c29c-4869-46e2-85d6-ea8c96ae7eb5	1	Other	Other
+8910e41d-fa87-4bdb-a27d-16e46ed901b9	1	Other	Other
+8910eded-7f0d-459a-81c6-363e2dba12a9	1	Other	Other
+89114fcb-73d6-4931-969c-887618fa9490	1	Other	Other
+8911502c-d54b-404e-94f9-dcf08bc328a1	1	\N	Other
+89118504-ee8a-4a12-8ecb-bb57df40398c	1	Other	Other
+8911882c-4122-47c5-bd15-f2de033f4e98	1	Other	Other
+891199bc-0a5a-4e0b-81fc-0609c66bea2a	1	Other	Other
+8911a1b6-e0e0-461e-af2c-47171d7c16de	1	Other	Other
+89120974-6fbc-4d77-b6eb-da5e765250af	1	Other	Other
+891254da-14cf-4d21-9416-4188a0dc6efc	1	Other	Other
+891264a5-d2aa-4f5e-9c96-649e817f5c07	1	Other	Other
+891280df-203d-41b6-bd3a-0a712d80780e	1	Other	Other
+89128318-b532-4e71-9537-72ea6875f700	1	Other	Other
+8913207c-807d-44b5-97f7-976450af728e	1	Other	Other
+8913ad50-a1e6-4343-badb-1e75baa7a571	1	Other	Other
+8913dae7-3ab0-4cb9-beca-cfcb2cedca68	1	Other	Other
+89140292-7423-42c8-bb23-0ebab9587fdd	1	Other	Other
+89141879-82de-4b8d-951d-8a60fdbd4bcb	1	Other	Other
+89141a22-b8d7-4231-9c76-91cbe8d2ce8c	1	Other	Other
+89145726-da86-4947-977b-0062a9a88fc6	1	Other	Other
+89147a2c-01b2-48f6-9bce-9f96cd0b8be7	1	Other	Other
+8914e8ec-e4a5-4ce4-8058-510025ae2130	1	Other	Other
+8914ff18-edd0-47dc-ac4a-14a9d6693362	1	Other	Other
+891508fd-8fa9-4a65-856b-9c6d1c6d4dd0	1	Other	Other
+891578dd-5fb7-4a6e-8bbc-1edb96516a9e	1	Other	Other
+89158e7f-b71c-4659-a994-0178ef1150fb	1	Other	Other
+89159f26-212c-4607-8bb8-26a0286109d7	1	\N	Other
+8915adab-592f-4107-9155-b2a03e3850ac	1	Other	Other
+8915d9fa-c78a-44dc-a0e9-490df3d3da0e	1	Other	Other
+8915db60-b877-4d81-ab85-aea5b3da25a3	1	Other	Other
+8915fdde-6c36-4cec-b584-7e5771a471ea	1	James	Other
+89161530-dd46-49ce-b707-5d67166ada4c	1	Other	Other
+8916469f-7d21-4646-919f-52b74ba84807	1	Other	Other
+89167600-0a55-4d65-883a-9995c53d9452	1	Other	Other
+89168503-df85-4094-87cf-d2ef80685e3e	1	Other	Other
+891687a4-49ac-450a-8d17-45f2e2d0f90a	1	Other	Other
+8916c8cd-ab8d-492b-99b3-7e5fd8e055ac	1	Other	Other
+8916e977-7017-4cf1-b512-34a78ee59220	1	Other	Other
+89171b68-0a30-468b-8b48-4d41ecc7d0c9	1	\N	Other
+891730f1-7789-4087-8d20-a404102c1412	1	Other	Other
+891741ac-9ac9-4d04-be0c-d5ee0550de6e	1	Other	Other
+89174bf3-7fc0-45bc-a4d2-727ef3dc5522	1	Other	Other
+89176477-07a1-444c-b91a-b0ca20588cfd	1	\N	Other
+89176ad7-756b-42a6-8278-79cc75d7e2f5	1	Other	Other
+89176b28-053c-45ae-9858-c04cb2ed70a7	1	Other	Other
+8917aa61-8e9f-4f64-a743-f1a98102fd1e	1	Other	Other
+8917c636-3ec6-4f77-af7c-22033f4822d4	1	James	Other
+8917e57b-91cd-443c-a806-e85f849ece34	1	Other	Other
+891845a3-dcdd-4aa0-aa51-0ec66bfd0815	1	Other	Other
+891848af-57c8-4770-8ad5-8b0ad4e232bd	1	Other	Other
+89187132-bc48-4538-a9e3-b2cc8c095e45	1	Other	Other
+8918f7dc-f3f5-45d0-9b6c-bb3b7a22b13c	1	Other	Other
+891a0bb2-7652-4159-bf6a-040daa9937be	1	Other	Other
+891a0dad-513b-4752-833c-cf8ba9b9d7aa	1	Other	Other
+891a1eae-0eec-465b-ae20-76cde203fa1c	1	Other	Other
+891a290f-025b-4fad-bf06-4e2a4181bad8	1	Other	Other
+891a493a-6116-4e6a-bcf4-a0d2af10b7ee	1	Other	Other
+891ae3dc-b678-46b2-ab19-cf21c9c7e7d6	1	Other	Other
+891afbf0-a2f9-4ba3-af47-28e7a4f63f4e	1	Other	Other
+891b1c03-25ce-46c7-9d3c-93ff63b7b8a9	1	Other	Other
+891bc0b7-f2e6-4acb-88ee-b9a4edb00ff0	1	Other	Other
+891be3ea-c67d-4f3c-8d6d-54068c71d5d3	1	Other	Other
+891be7da-5ce0-443a-bfe0-6733081a774a	1	\N	Other
+891c0a6c-c82f-495c-98bb-041b2446de1b	1	Other	Other
+891c3c84-1767-45b6-9900-b3db94c0812c	1	Other	Other
+891c9088-fa74-49f5-8efa-aa95b852d4b0	1	Other	Other
+891cced8-eb58-49f0-96ff-ef7287fa9527	1	Other	Other
+891d1035-299e-44b8-a92a-5528b50fbc52	1	\N	Other
+891d1e73-6265-4295-905b-b1bf8c89a438	1	Other	Other
+891d3b90-8d40-4943-b8b4-7ef34568ccee	1	Other	Other
+891da185-abc8-419e-bbaf-6fdcdbc3b8e8	1	Other	Other
+891dccac-918e-4764-b8ce-71e04ee34383	1	Other	Other
+891e0159-086d-4c49-9b72-fe9cbcc7b950	1	Other	Other
+891e434c-906e-4717-80f3-5f9117cf7f6e	1	Other	Other
+891e4824-b10f-48fc-a885-7414bd1d7274	1	Other	Other
+891e78d6-878a-47a7-8b1c-8cae1383c812	1	Other	Other
+891eb7e2-7df8-49cc-b216-add12f358ce1	1	Other	Other
+891ebf92-bdd9-488c-bf79-a30c7d7e1781	1	Other	Other
+891ed5dd-1f49-42c6-b5be-90b5fcb65bb1	1	Other	Other
+891f1cbd-54c9-4fcf-b6e0-3daec9998a28	1	Other	Other
+891f21bd-ceef-405a-98e5-56a8e0bb0cec	1	Other	Other
+891f28e2-da58-4752-bddf-e7f4529eb43d	1	Other	Other
+891f2d02-2550-4ec8-962c-3fd888b5a183	1	Other	Other
+891f7d2e-51db-407a-9396-1873aa7caaf9	1	Other	Other
+891fda88-9df2-4267-9950-2849a914c1c4	1	\N	Other
+891fffeb-8569-4924-9f4e-ffa29d3ce564	1	Other	Other
+892016e4-4fe8-4ca0-9ee0-ac05a6239b2b	1	Other	Other
+892037ce-434f-4e03-86aa-0dd31c57a1a6	1	Other	Other
+892097db-d0f0-4568-9c38-9f2afb5affb5	1	Other	Other
+8920a4a0-aaef-4600-9840-1f82a1dc49aa	1	Other	Other
+8920bc68-7cd9-46db-ae86-c9c14685e904	1	Other	Other
+8920d72a-dd27-494e-b575-7d84305c39d5	1	\N	Other
+89217891-7c70-4154-926b-822507268f88	1	Other	Other
+89218163-dd61-425c-975e-8297c4ad820a	1	Other	Other
+8921ee7b-489a-4340-b713-f70dfcbca663	1	Other	Other
+8921fa45-76b9-46d1-9fa3-928b56f2e290	1	Other	Other
+89220fc4-a85d-4075-98a0-8a163dd19602	1	Other	Other
+89226108-92c6-4a24-ad89-ed39dd7b6bf1	1	Other	Other
+89228b61-6064-4782-b21d-715cb3d8eb5e	1	Other	Other
+8922bf63-ac7b-4b8f-82a6-3d4881ac5fa4	1	Other	Other
+89232c8c-fb35-48be-b951-6c34577c2214	1	Other	Other
+89233cd9-9057-447c-ac43-cd2fd510f74f	1	Other	Other
+8923c5cd-f133-46da-9061-4bc0e02d6910	1	Other	Other
+8923c776-39ef-46f7-9764-1ec656589af4	1	Other	Other
+8923fca7-cc47-4b87-a2c4-65456e9f7536	1	Other	Other
+892400e9-8e5d-4ddf-b91e-172b4eb09c02	1	Other	Other
+89241d75-01cf-449b-9204-df26d38c6bc8	1	\N	Other
+89242cfd-fc15-451d-a0fe-2de692dbc541	1	Other	Other
+89246018-e905-40d7-8f3b-0a65f9507644	1	Other	Other
+892460c5-0100-4acc-9236-9fe002f29499	1	Other	Other
+89253f77-5cb1-4654-a8e9-39b6b29a0971	1	\N	Other
+8925870e-ae27-4bc7-8a65-23a16e2f9078	1	Other	Other
+8925a445-043b-49ce-b2b9-3c4f36f0bd80	1	Other	Other
+8925b3f3-eae8-49cd-b064-b52dc470d1d5	1	Other	Other
+8925b56f-53f8-46bf-a544-d615338a69b5	1	Other	Other
+8926b222-7e64-4174-9a7c-624915d0a0f4	1	Other	Other
+89270ff4-bba6-4c30-bdbb-4f1096d85d4a	1	Other	Other
+89278438-ec18-4fc8-86e7-c8bcfb02f510	1	Other	Other
+8927cd2b-1c53-4b9e-b9cf-b0038641adec	1	Other	Other
+8927fcbd-22f3-44eb-a5d1-5a062c421123	1	Other	Other
+8928318d-fa81-408c-89b8-e046b6b089fc	1	Other	Other
+892877c3-8dd1-409f-b2e5-9846a32ed29f	1	Other	Other
+892882ff-5289-465c-9e6b-33544a590c74	1	Other	Other
+8929212f-88da-4819-b62a-b7b785f5905c	1	Other	Other
+892935e4-5644-4d78-95b9-663c5c74e30a	1	Other	Other
+8929422b-ba3e-4c63-9163-27c7270f2b8d	1	Other	Other
+892985e6-f845-4675-a38f-04f72276da9b	1	Other	Other
+89298959-ec3f-4715-b3ab-6271ccee433a	1	Other	Other
+8929c40c-0b8e-4c4d-b5ef-754f14d58027	1	Other	Other
+892a3802-2617-455e-806b-f63b000af827	1	Other	Other
+892a4368-8e6c-4180-829a-2f8d73cd949b	1	\N	Other
+892acfb3-1e59-4f4a-a6c1-785024288bb2	1	Other	Other
+892b70db-93d3-4956-b740-c2a72863a6fd	1	Other	Other
+892b73b8-8d6a-4b97-981e-1b2ace25c17d	1	Other	Other
+892b8f86-b47b-4db3-8f31-3f130ff5982e	1	Other	Other
+892bd4ff-acb1-4912-b192-1c63e6819d0b	1	Other	Other
+892c32f7-4b0e-49b7-982d-0a3ac67a5445	1	Other	Other
+892c33aa-64de-4119-9791-f5aeae6d95ec	1	Other	Other
+892c4e2d-0fbc-4a02-b7c0-9f7cf490e587	1	Other	Other
+892caebf-9b50-4fca-85e4-aa4373241372	1	Other	Other
+892cc38e-f44c-48d1-9692-ad0858afdb20	1	Other	Other
+892d0df6-7a6a-47ba-80d4-00d02ea651b4	1	Other	Other
+892d240f-5c8a-4e48-b76c-a88475573254	1	Other	Other
+892d6b29-46c3-466c-98b9-3a6f738ce8a5	1	Other	Other
+892d72a2-3478-4702-ab07-95b70b4016d3	1	Other	Other
+892d8434-c5f5-48c8-aadc-f9728fd62f5a	1	Other	Other
+892dd90a-ae52-4726-8a12-dc4a7a2f364d	1	Other	Other
+892e106f-99e5-438b-937e-c6614820eff0	1	\N	Other
+892e123e-caad-11e7-8c9f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+892e21de-4db1-4dc4-bcc0-7808676bbfe7	1	Other	Other
+892e6dab-79f3-4b1c-9a8c-47de609177f7	1	Other	Other
+892e9397-080b-4555-8653-7126e04ef565	1	Other	Other
+892f383f-a900-4554-a435-9d7ab3b26450	1	Other	Other
+892f68f9-0ca5-49b3-91ab-27076dbccf05	1	Other	Other
+892f751e-bc56-4afe-8747-f4b33ce1954c	1	Other	Other
+892f83fc-6425-4074-81a1-e0ebcd56148d	1	Other	Other
+892f8a99-80f7-412d-ae21-ba942784b500	1	Other	Other
+892fa1f7-03e2-448b-a9cd-3bae7bdfa174	1	Other	Other
+8930823d-4e17-4ab4-8e33-19cc66837869	1	Other	Other
+8930cb4e-67e1-4817-919f-9727ff677382	1	Other	Other
+8930f854-bf42-4cf3-a1fa-1c7a37b3a27e	1	Other	Other
+89313a5d-086a-41c9-b0fa-cba7fa2de2d7	1	Other	Other
+89313f5f-16ed-4375-9ea1-9479c52f761a	1	Other	Other
+893150d2-fd04-4547-a1ae-f197ba2672f3	1	Other	Other
+8931524d-7871-4dd8-b63c-ef7106c92e8d	1	Other	Other
+8931934a-7d01-47f8-a38d-5611822c3f09	1	Other	Other
+8931a57f-da3a-41b3-9286-5ca02a6f908a	1	Other	Other
+89323b0d-92ac-49b2-aa45-3a569968362e	1	Other	Other
+89323c1e-2604-40ce-b27a-d0a04522bc08	1	Other	Other
+89323eb8-3a51-4594-b8ec-26d8687dd772	1	Other	Other
+8932856a-82de-4f4c-9190-cea12592ea9d	1	Other	Other
+8932d44b-c72f-465a-96e0-7ee2f6db1777	1	Other	Other
+89330231-3792-41da-9221-a5e579230f53	1	Other	Other
+89332f1f-4d8f-41c5-a6e3-ba5880616116	1	Other	Other
+89332fe2-1ec6-4183-bcef-08a466ba32c5	1	Other	Other
+89338094-d1f2-4691-8dd6-ffcb6c4b6dd0	1	Other	Other
+893394f5-a0ed-4583-a5d1-8afb7efac27b	1	Other	Other
+8933a2bb-fcda-4051-a272-607a8dcda42d	1	Other	Other
+8933ea0b-7ea8-4e57-916e-0b715cd45e55	1	Other	Other
+8933f2f0-b8ac-45ba-8925-c9bbaaaa65f1	1	Other	Other
+89342542-285e-4d0c-a0e8-11d92f700d75	1	Other	Other
+893466e1-19cf-4d8d-ade5-15df84009d10	1	Other	Other
+893479f0-2f7f-4ed4-8201-d659dec35d08	1	Other	Other
+89347b15-7351-4950-9391-f692fd7bd27e	1	Other	Other
+89348f26-2a8c-405b-b989-4906becfdb85	1	Other	Other
+8934b7ae-1bee-47fa-b61a-6926b15cb1e7	1	Other	Other
+8934fe80-a4d5-4541-90dc-9b5c5f4e50ac	1	Other	Other
+893534ac-c0c3-4d14-b4b5-23e68030081d	1	Other	Other
+89353d54-94d0-4f4e-ab8d-e9b69d76036e	1	Other	Other
+89354144-31c2-4b4d-b029-28574ef90a28	1	Other	Other
+89354149-292b-4e70-b332-c9c237d5e94c	1	Other	Other
+89356266-e5a3-4dc4-9a92-351d551022aa	1	Other	Other
+893579bf-0c56-4e55-8957-cf087793b84f	1	Other	Other
+89359fe1-f633-4ec1-821a-65640bbb1ef9	1	\N	Other
+8935be8f-c1a8-4d02-af00-3b47c7058e53	1	Other	Other
+8935f4e3-8e31-481c-9a64-2c7738d83ac1	1	Other	Other
+8936263b-7e4e-4ba0-9e4d-30200f532d90	1	Other	Other
+8936a25e-3caa-11e8-85cb-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8936c9e2-febb-4351-a53b-71859d1965be	1	Other	Other
+8936d085-27fc-41f2-9408-e77967d30363	1	Other	Other
+89372171-f4c0-4e49-a0a4-0b488a3fb762	1	Other	Other
+89373893-775c-49ec-8dd8-089c42a90594	1	\N	Other
+8937658c-2d3e-4708-a899-806d90745913	1	Other	Other
+89376864-1a41-49a6-86c5-b1115478bcb6	1	Other	Other
+89378299-20b4-48b7-948c-1339ea9825aa	1	Other	Other
+8937878d-f1ab-467e-b2f8-7968d1f0e460	1	James	Other
+89378e28-8868-40b8-87dd-f7d9d2124e1c	1	Other	Other
+8937a9b3-6428-436d-80ad-af5dd41b0f0b	1	Other	Other
+89387fe4-ab9b-4136-a220-e46ddd353136	1	Other	Other
+89388800-38d3-4b6f-b7cc-ad49fc625a57	1	\N	Other
+893892e4-87e4-42d5-9b72-56df2576ac86	1	Other	Other
+8938bad0-d580-4f24-a72c-b5baef714f58	1	Other	Other
+8938d8d7-f405-4f34-9fbf-ca1bee073d6e	1	Other	Other
+8938e8fc-03ee-4937-b5a5-c130c42f3a61	1	\N	Other
+8939380f-1aad-48f1-81b5-c7a039a5027b	1	Other	Other
+893954c3-e2b4-4207-a0a7-b3176c48746f	1	Other	Other
+8939be7f-43bf-4dc5-9880-c08312dbbe26	1	Other	Other
+8939d6b6-358d-4a40-9cd0-32ffdd96c147	1	Other	Other
+8939e5f7-b6ce-4eb1-bdfd-4c52400656b6	1	\N	Other
+893a4cbd-6796-45da-b5b6-87a322c20227	1	Other	Other
+893a7b77-f0fc-4253-acb4-b31cf8e94f3f	1	Other	Other
+893aa23d-6748-4bea-b48f-e38032dd3c11	1	Other	Other
+893aa31e-9561-4dbe-8fce-38f51547c312	1	Other	Other
+893addf9-4a20-4306-88fe-8edb8bbbdd9b	1	Other	Other
+893b0b4c-d275-42db-9af7-90ef21dfe244	1	Other	Other
+893b0f1c-fcf0-4c14-b741-bb9eb37a2879	1	Other	Other
+893b9af9-e3c4-4d7c-949e-98cd7ebbfc1f	1	Other	Other
+893bc2a9-8774-434a-b236-b3b8993a5f62	1	Other	Other
+893bdb33-a4c9-420d-a5b2-97e1ad4108a6	1	Other	Other
+893bdf7b-0255-4bc1-a402-1b734c77b614	1	Other	Other
+893be208-2ec3-4374-a7e4-1f8004fa857c	1	Other	Other
+893c4342-5ecf-4298-85ea-ee1a78219d66	1	Other	Other
+893c680c-2469-46f9-b323-5160f95bd93e	1	Other	Other
+893c72df-d987-4f7f-8baf-584577610cb2	1	Other	Other
+893c8019-7004-4365-9a6b-471a268c8d5a	1	\N	Other
+893c95c5-96e9-4322-a382-ee8540e16896	1	James	Other
+893cb92a-548b-4c71-b1ac-1c029575ce68	1	Other	Other
+893cdbe2-76ce-4a5b-be48-4e084bb3357a	1	Other	Other
+893d198f-b242-4eca-a3dc-e22a3308388b	1	Other	Other
+893d373d-eb3d-4562-8c05-82181abd3817	1	Other	Other
+893d59b3-9700-4556-bd06-eae9e46abef9	1	Other	Other
+893db9eb-6ef0-4edd-9bb3-1dd98e887e83	1	Other	Other
+893dd03d-7ff8-4104-8711-ce1a036e5666	1	Other	Other
+893de21d-ca97-4cb4-ae40-ce166dd89e03	1	Other	Other
+893de274-dd95-4a95-9e47-42deb576bbfb	1	Other	Other
+893e2273-58b4-40be-a97d-358483b38e93	1	Other	Other
+893e3079-9076-40f1-bc9d-69fdb6bc765d	1	Other	Other
+893e9052-3b5b-42d9-b802-9c5a364cf44d	1	Other	Other
+893eabf0-9cb8-464b-9fc9-9ebe4b274479	1	James	Other
+893ec286-bc75-45bd-b52c-7e1f8e192311	1	Other	Other
+893edaaa-b6f6-406c-94ab-5f10a1bfcae1	1	Other	Other
+893ef1ef-a7d5-4d94-a6e6-ff8119689a17	1	Other	Other
+893f4d71-f3e4-4399-91e4-12db5edc2e4c	1	Other	Other
+893f5512-fed5-4005-8943-3979e3300d07	1	Other	Other
+893fc518-4ea9-423f-9e60-9d13bbd16cb9	1	Other	Other
+893fc62e-fcdc-4ed9-8985-41400a6c6e54	1	Other	Other
+89400efa-1903-46eb-8880-88db839c0c34	1	Other	Other
+89405bd0-f0de-4d95-8fbc-619a24743e6f	1	Other	Other
+8940639e-fac1-42dd-825f-736917887a90	1	Other	Other
+89409f2e-f424-47ca-b414-bd75f2d39d77	1	Other	Other
+8940a66a-c2a9-4fd7-9c5f-7a277f6095b0	1	Other	Other
+894147c2-493a-4df6-b21c-3756a9737f67	1	Other	Other
+8942002a-a4ba-4fbc-a44c-707f676713d9	1	Other	Other
+8942188b-efa2-4ccf-a4aa-825d67db8adc	1	James	Other
+8942a0d6-67c7-4748-b066-576bae91d585	1	Other	Other
+8942a507-7edd-4f19-86ab-8ba51b7cd5d8	1	Other	Other
+8942ef0c-e2f9-4fe7-886e-78da6d0028ba	1	Other	Other
+8942f40b-e7da-4bd1-ab2e-4172c3a7859f	1	\N	Other
+8942fb68-081d-47a6-baff-8df68e2ba02b	1	Other	Other
+89430a89-b148-4c2d-bf66-7c5d1c6b2e0f	1	Other	Other
+89432583-61c3-49bb-92d2-d0a348c076f3	1	Other	Other
+894361ec-d62d-4236-9c3c-b83d2905e98a	1	Other	Other
+89439116-f929-4211-a200-8adc9f057727	1	Other	Other
+89439437-e89d-4879-8239-ee9e71eee817	1	Other	Other
+8943db55-2119-4d54-ab84-b94948086a50	1	\N	Other
+8943eb10-1140-4364-b837-14dee479ea3f	1	Other	Other
+8943f3d8-228d-414b-8aeb-b31e5d846082	1	\N	Other
+8943f5f4-4275-401c-8a70-c3b5d6fd8cf0	1	Other	Other
+8944011b-7b36-468c-a695-3d52cb95ff9c	1	James	Other
+894417ce-0e6b-4872-994e-a82fdbf9a0fe	1	Other	Other
+89443d3a-40cc-4460-a16d-feaea9be7105	1	Other	Other
+89444898-6073-4de3-a12a-45b073a5c82c	1	Other	Other
+8944a8bc-4239-4037-8acd-f186a598508b	1	Other	Other
+8944b3de-2218-4556-a63b-018d2905bbd4	1	Other	Other
+8944b845-9cd8-40f9-a0a4-e392b307650a	1	Other	Other
+894507e9-6730-4959-92f9-4d1789755e14	1	Other	Other
+89455dfc-993e-4845-8d0c-be31dcc97d66	1	Other	Other
+89456a34-d743-4dd7-b364-146ccf1ac599	1	Other	Other
+8945c8fd-c7f0-4a33-8d2d-906cb03d2b0e	1	Other	Other
+894642fe-20dd-4074-a38a-7187bbd99b31	1	Other	Other
+89464483-c88e-4767-9965-84c6586fb693	1	Other	Other
+89464847-3285-4132-95c4-9557b8221831	1	Other	Other
+89464ba8-f6d6-44dc-b937-bb31f7937494	1	Other	Other
+89465106-ca17-488e-a828-7a039b2046eb	1	Other	Other
+8946a471-c50f-49e5-aab0-c81b936a19d7	1	Other	Other
+8946b60b-d61d-42bf-b133-32ed1af52421	1	\N	Other
+8946fef2-e05b-4f2f-b08d-53906c8baedd	1	Other	Other
+89474525-30ff-4f74-a2fd-501c1bca9515	1	Other	Other
+89476057-933b-404f-b164-62b467987a70	1	Other	Other
+8947a841-e643-4869-aea9-60f5a3b4e1f6	1	Other	Other
+8947c852-3b1d-4b58-a453-cebddcf23326	1	Other	Other
+8947e5b3-2568-406e-b4af-4fae08aa406b	1	Other	Other
+8947ff63-838f-4adb-9e5a-6afba76f19e6	1	Other	Other
+894817af-eab6-4bc4-b85e-1eca58a0e649	1	Other	Other
+89482e69-728b-4317-bd96-a0f21d7913c0	1	Other	Other
+89488894-59cd-43fe-b5af-d78112f623f5	1	Other	Other
+89488a6b-2d2c-4193-91ed-6b3aa4d068ad	1	Other	Other
+89488c4c-0b0e-4c32-a7a2-1ef8061b6ac3	1	Other	Other
+8948aac7-bd65-4d58-9565-98444f59abdb	1	Other	Other
+89490aee-9be6-4685-becb-bf069bc314d5	1	Other	Other
+89494e7d-995a-4e1d-9b1f-3b38a5e1a857	1	Other	Other
+89497b40-cb59-421d-bf79-9e88219b9193	1	Other	Other
+8949dd86-1958-4feb-908e-77487c90f98e	1	Other	Other
+894a33e4-7cdd-48b4-88f5-6d65fa0bb2d6	1	Other	Other
+894a5be0-64fe-4ad9-b710-0bd167f0bd22	1	Other	Other
+894a7023-ec37-4d32-baf1-910783bfafe8	1	Other	Other
+894ab4e1-cfb7-434c-b19f-a26e9be37511	1	Other	Other
+894ad988-89bd-4a48-ac19-0d104d17cb59	1	Other	Other
+894af5e9-0125-4e6c-84d3-badaae04866f	1	Other	Other
+894b2241-2026-49b5-bd3b-fc261e0f619d	1	Other	Other
+894b40eb-7a52-43eb-beff-7b0eeb951896	1	Other	Other
+894b4423-e7da-4078-ac61-e9948e530bb6	1	Other	Other
+894bd098-cc4b-4ab3-add9-af391fc45720	1	Other	Other
+894c16f4-93a1-45a2-b048-303564ada9e9	1	Other	Other
+894c4953-2e63-4f07-b668-63677133c4ad	1	Other	Other
+894cb876-d321-4880-94ba-cfd9967e332d	1	Other	Other
+894d5605-0367-4a52-a60a-9b29ffae9fce	1	Other	Other
+894df633-3b76-44b3-b929-672453eecc2f	1	Other	Other
+894e210d-ef0a-4205-b09c-02c27aa9125a	1	Other	Other
+894e310c-e31b-4c62-b0c2-3f20e6dc491e	1	Other	Other
+894e33d2-65ca-452f-a238-2b8aaf22eb44	1	Other	Other
+894e73dd-6120-43e8-a01d-a8235363931c	1	Other	Other
+894edb95-1822-4f20-9990-ca12d8bf60e6	1	Other	Other
+894f42e1-57aa-4cd4-8ab7-dc5cd5070389	1	Other	Other
+894f58d9-b341-4f99-b770-10b1b76524c3	1	Other	Other
+894f7d28-c491-4b5b-ad9b-8c109105748b	1	Other	Other
+8950160d-cf92-421d-aa50-8226c0146606	1	Other	Other
+8950410f-98d1-42a2-8299-38d40c1a8c6a	1	Other	Other
+89505121-84f4-441e-8eae-42529d4ee797	1	Other	Other
+895082fa-66ba-4c03-9e47-24197a71341d	1	Other	Other
+8950eda3-dfd2-4b09-bec5-6268f5099799	1	Other	Other
+8950ef5a-c444-4d1b-93c0-c0eceb846555	1	Other	Other
+895114f7-6b75-4262-a9c7-0e51775fa0a1	1	\N	Other
+8951546b-f1d4-49a3-a91f-81810e77b143	1	Other	Other
+89516122-ebbe-477c-a47d-a729dea2e76e	1	Other	Other
+89518329-0d4f-4aca-9226-f2daefe5ae13	1	Other	Other
+8951f77f-3045-4f01-8a41-b847bed3e563	1	Other	Other
+8951fec3-a592-4ca1-bca8-1af9e008c06a	1	Other	Other
+89527b43-ce8f-43b2-b5a0-0d6c3969fc4a	1	Other	Other
+8953027c-ea82-46ad-96b6-710e40275a50	1	Other	Other
+89539af6-982a-4e12-9ea2-ca7f1c48600c	1	Other	Other
+89539de4-5ed6-48f4-966a-dba68e82818b	1	Other	Other
+89542a2f-8b4c-4e6b-85bf-2ff027a1cd2b	1	Other	Other
+8954c870-1fa3-4de7-98d8-847ac3db4e1f	1	Other	Other
+8954d28e-75e5-411b-8aec-5c69d414a0f3	1	Other	Other
+8954d876-92a9-4876-b5ee-df062a8f1de4	1	Other	Other
+89554e12-1508-47e0-9964-d239bcf11e5e	1	Other	Other
+89557583-94d7-4d0d-9c48-1ceeb48f10b6	1	Other	Other
+89558dae-40aa-4d6c-a9eb-68cee661b628	1	Other	Other
+8955da2d-871e-4d97-90cc-4c7733f921d8	1	Other	Other
+895623f7-aecb-4c53-8a10-22cdb750377e	1	Other	Other
+89569d6c-8b71-40a5-893e-547a2219b64d	1	Other	Other
+8956a818-c31c-4968-8205-22a6e27aab7e	1	Other	Other
+8956be4f-b88f-4537-ac59-3dec203a6ba4	1	Other	Other
+8956d059-1b13-41b6-bf0f-d9872539d04e	1	Other	Other
+8956d28d-cb15-435d-b6f6-1e7773dcc6e0	1	Other	Other
+8956d68b-1fdb-49c3-aa67-424a3292f0ba	1	Other	Other
+8956df9f-4c6a-4909-af16-bf7eab79818b	1	Other	Other
+8956ef3b-adca-4e04-a817-955c5a89ada5	1	Other	Other
+8956f27f-e824-4ca8-a93a-d622bfbff50c	1	Other	Other
+8956f6a9-7e5f-4bf4-b825-e740b87e6fbb	1	\N	Other
+8957326c-1fae-427f-a1e3-fed40f8427ad	1	Other	Other
+8957353c-30b3-470e-a0a0-c801ee27f798	1	Other	Other
+89574fbc-b5dc-43b5-ab91-d4a021f2fa67	1	Other	Other
+895776cc-6183-4eeb-be64-0da84dd9f3d3	1	Other	Other
+8957dfee-facb-4933-9360-2759a28b2181	1	Other	Other
+8957f065-cf03-4b81-8392-810ce9d317c4	1	Other	Other
+8957fa34-212f-4d63-8b01-d70ebac6f365	1	Other	Other
+895835d2-0e4b-40fc-aaf7-c332b435718e	1	Other	Other
+89583fa6-f9bf-4b05-ba73-0af4072ce9ce	1	Other	Other
+8958469f-15a4-40e7-8ba0-032c418d10b6	1	Other	Other
+89587191-4e91-45dd-8a8a-d51734a51c16	1	Other	Other
+89587637-4664-43a0-b974-a34505742c38	1	Other	Other
+895883c2-1eaa-478f-8436-b4194fa563e8	1	Other	Other
+8958887b-859c-4f62-83ab-df868c982e4d	1	Other	Other
+895896fc-d53b-43c5-ba73-dd8cf6a80428	1	Other	Other
+89597708-39c9-47f0-8073-3c2a0fb58266	1	Other	Other
+89598618-d45a-4a82-a642-2f6095437b48	1	Other	Other
+89599ccf-1d15-4798-899b-cff8118f2829	1	Other	Other
+8959a07d-2656-4905-b896-9b4809a2265c	1	Other	Other
+8959c36f-5098-43bb-888f-8354bdc5a3fd	1	Other	Other
+8959df73-6c9e-4b60-90e7-af050530e20e	1	Other	Other
+895a1232-6e2e-4730-966a-fcbd58ff8c9b	1	Other	Other
+895a8ac9-4574-4f68-9437-4741211e0798	1	Other	Other
+895a8f44-6791-45c9-b381-90a9237c664e	1	Other	Other
+895a988a-6d43-425d-8e65-56bc9474ca4f	1	James	Other
+895a9ef4-35d8-4a54-9f8c-a33d6d0654d7	1	Other	Other
+895aa455-f364-459c-94be-166afecadd6c	1	Other	Other
+895ac008-6ea3-4e49-9a58-b9ad74cbadcc	1	Other	Other
+895ae440-4cb7-49a9-a9b9-65410fa72070	1	Other	Other
+895b0fff-6430-4dd0-92bb-ef785e77df2e	1	Other	Other
+895b53b9-8c82-45cd-9b6b-4cfaae5f9faa	1	Other	Other
+895b6ce4-aa19-4888-8291-b83a369a46ca	1	Other	Other
+895b774f-88a2-4e78-ac1c-6e764c9a684d	1	Other	Other
+895c0364-6053-4486-81c5-5792f0c3797a	1	Other	Other
+895c064e-0265-4f91-ba46-bb2a5374cbc7	1	Other	Other
+895c071c-2bfb-4457-a60f-fc3a27da30a9	1	\N	Other
+895c1101-98d6-4bc4-8697-8e65def48cfa	1	Other	Other
+895c380a-ce6c-492c-9056-19c6d7ebb666	1	Other	Other
+895c6ee0-77ce-4e41-832a-2e5c4482af29	1	\N	Other
+895d476a-a812-44a3-aa20-ec390361813d	1	Other	Other
+895d4c37-9d5e-4593-9332-ffe9e28b35c2	1	Other	Other
+895d525c-082d-429c-bc43-662c548b5653	1	Other	Other
+895d64e2-633c-4135-824c-4cc997c24f6b	1	Other	Other
+895d6b12-ea17-4091-9cb1-377fc14d1ef3	1	Other	Other
+895d7990-452a-49d9-ab7e-14d89942e43f	1	Other	Other
+895d9204-0bb8-4c7b-82d6-dbffdc4a16f6	1	Other	Other
+895dcda8-ebc1-47f9-a343-661779b36f5b	1	Other	Other
+895e0936-76e6-49cb-8709-fca23f08ce6e	1	Other	Other
+895e2e1f-b704-4ea0-94fd-7719e37db3ac	1	Other	Other
+895e57a6-63b8-4ebb-9f95-d4f402607d2f	1	Other	Other
+895e76e5-dd36-467c-a7d3-61d0e1d9062c	1	\N	Other
+895eb4b7-894c-4856-8ccc-f55930cc0452	1	Other	Other
+895ebda9-9ebe-4b2b-9016-f80fcec1afbd	1	Other	Other
+895f0272-1c5d-4186-820a-d4a0dced84e2	1	Other	Other
+895f02de-3e99-4ce7-8086-6031e33c345a	1	Other	Other
+895f1103-574f-4b43-a2fc-7c062d783ab2	1	Other	Other
+895f4d66-3bb4-487f-a2c1-376e1341d68a	1	\N	Other
+895f517c-b8c0-4973-991e-504ac3b87ec7	1	Other	Other
+895f574a-cd73-4b54-b057-842487c68b1f	1	Other	Other
+895f8e61-7db6-4252-a0d6-c1c9e44403e3	1	Other	Other
+895fc48c-0fdd-4439-9081-7b91c8f0eb07	1	Other	Other
+895fe069-fee3-46d5-8b95-79db7cfc0d76	1	Other	Other
+89600df5-178f-4116-a62b-9c11d6be8f1a	1	Other	Other
+8960150d-8e30-4ebc-b6a2-4346acb734e5	1	Other	Other
+89602fa0-c994-48d6-9500-9e509393912f	1	Other	Other
+8960a24f-fc98-4fc7-9648-8b50ff39fd98	1	James	Other
+8960e640-85e1-497b-aaf9-7c0585581e48	1	Other	Other
+8960eaa8-3c74-4811-b0f3-18334e0f2420	1	Other	Other
+8961025e-1d7a-4223-b7cd-153243c1da40	1	Other	Other
+89610605-6e98-40b1-959e-af9c7865c890	1	Other	Other
+89614304-9aae-4afe-8289-9b5ae357e555	1	Other	Other
+89615b3c-9644-449d-9bb6-85c859dc443e	1	Other	Other
+896215f6-af63-4211-a2c9-7ad74cc66905	1	Other	Other
+89627dde-2b10-47c3-8848-8a4fafc0ddd7	1	Other	Other
+8962fbae-448b-4502-9520-7d683a24ca66	1	Other	Other
+89631051-6c9d-4ba7-9633-0f0a1a4de918	1	Other	Other
+89631a4f-a70d-4077-82fe-cdba2cddc622	1	Other	Other
+89633932-5a23-4d7b-9df6-094aec083076	1	Other	Other
+89635957-2731-456a-9514-5fd5686a0e9a	1	\N	Other
+89638f4f-a48b-4a09-9c05-585eafa91e31	1	Other	Other
+8963ac12-a9fc-4c62-aa99-624401d82b83	1	Other	Other
+8963e48e-ba77-45d7-aed8-dec1365f2263	1	Other	Other
+8963f09d-09f5-4a81-a641-08f0af67daac	1	Other	Other
+8963f73e-8c36-4649-a639-12041c2bb101	1	Other	Other
+89640375-d9a9-4831-ae9c-c1ae0cb3a9cf	1	Other	Other
+89642ba0-a35b-4e93-806f-78a51ec0d0c9	1	Other	Other
+896461b8-9021-4c95-b4fb-ab05d803dba8	1	\N	Other
+89647803-4740-4289-b943-50ad0faa4260	1	Other	Other
+8964c065-ebd9-4671-8e4e-f1c9c81ab1f6	1	Other	Other
+8964e684-543f-48d8-b76d-3f840e6785b6	1	Other	Other
+89654aaf-fdf5-4bf8-b2a5-cec9b23c4a10	1	Other	Other
+8965bf09-e893-4c7f-bb48-20f91eb941b4	1	Other	Other
+8966b4f3-9b77-4222-9e48-a89e064ea29a	1	James	Other
+89673c51-f593-46c7-b748-693bb55fd910	1	Other	Other
+89674128-d69a-4a1d-bed3-8d2a9b9df42d	1	Other	Other
+89678c81-30da-401d-bcd8-f8ca3bfb4c37	1	Other	Other
+8967a69d-e99c-4497-968a-764d681615ef	1	Other	Other
+8967d9bf-bd3e-4242-814e-d6b9b62205fb	1	Other	Other
+89682da6-9539-11e7-9981-fa163e8624cc	1	Other	Other
+89683d9b-242f-4829-a3a3-68992e028789	1	Other	Other
+89687a70-f030-422d-951f-55879cded157	1	Other	Other
+8969af9e-b528-4d0c-8589-a3f96f3485e9	1	Other	Other
+8969d85b-772f-4a59-a752-dca121aa4c17	1	Other	Other
+8969f208-63c1-45b9-9b4a-8b962fb5a9e7	1	Other	Other
+896a4f12-43f2-4f56-834f-541afe37f7cd	1	Other	Other
+896a9ec4-b990-4968-8037-dcf7ed5bff01	1	Other	Other
+896abce3-715f-4e69-a500-1c6a626e8371	1	Other	Other
+896ad735-e670-4c9a-8a78-6309ece988f2	1	Other	Other
+896b5318-dea0-436e-8cfc-54f3b5852310	1	Other	Other
+896b5ae6-ce8e-45a2-8e69-67c63579f58b	1	Other	Other
+896b8047-407c-4214-92a7-0d157f944157	1	Other	Other
+896b9cb7-dd3a-436c-8d7a-f671139e0a58	1	Other	Other
+896c03b8-29a2-4055-a887-96ddda8af8a4	1	Other	Other
+896cbb5f-f4cf-4e2d-9272-8531fc41420c	1	Other	Other
+896ccd43-77c7-4055-9ba9-8b2a800fe961	1	Other	Other
+896cd654-2daf-4148-b8f6-beeb42903425	1	Other	Other
+896d2d07-a7d0-4cd9-9dc5-cc3ba52a894b	1	\N	Other
+896d6d0b-021c-4cea-834b-5e218dc7b8e7	1	Other	Other
+896d9428-950a-416a-9a9a-8964bce5343f	1	Other	Other
+896dd898-8f95-4457-bf40-7fe0e941c18a	1	Other	Other
+896e2b37-7bff-4e5b-8770-8236fde998e0	1	Other	Other
+896ef0b9-4543-41c5-8205-99ba37adae40	1	Other	Other
+896f48ec-b281-4631-901f-52aa85b98041	1	Other	Other
+896f67fd-fdcb-48f8-a4d4-770d51bed67d	1	Other	Other
+896f73a5-f46f-49c4-afd6-db312c84778c	1	Other	Other
+896f9f62-0a46-4e1b-8b3b-5898a991d0b7	1	Other	Other
+896fb780-1293-4a49-9d7e-9f499b4c4225	1	Other	Other
+897013b0-72ef-454a-91b4-e5e1ea99b656	1	Other	Other
+89704ff0-b5ca-4d68-a4ef-fde2d0fff186	1	Other	Other
+8970a8cc-7a6d-4e5c-bc75-5db98010f808	1	Other	Other
+8970d17a-0150-40d4-9647-c41f410b4959	1	Other	Other
+8970d9d7-55cc-4755-b756-b20d1464bbbc	1	Other	Other
+8970e3f9-b060-40bb-9b30-620b1395be33	1	Other	Other
+8970fefb-c346-4465-81f5-0a5822de6e8f	1	Other	Other
+897114a9-d053-46c2-bdec-3339c39b5539	1	Other	Other
+897125d8-1642-4d21-a512-7033bc783e98	1	Other	Other
+89712998-cf2b-4a6a-a37c-c1449d4825ed	1	James	Other
+8971317d-5f7b-412a-ad6d-9471ae41001f	1	Other	Other
+897172e9-249e-468f-bb78-6493191ff073	1	Other	Other
+8971bef5-51a0-4a6c-bfb1-b98e34d6997b	1	Other	Other
+89720ef6-ab45-4638-944f-b4a1a05745de	1	Other	Other
+89722a65-cd95-4533-b08b-434e8283b809	1	Other	Other
+89722bc7-0f50-4240-9824-672ff5c47745	1	Other	Other
+89722c03-94d1-4412-aa67-13ee158bc9bf	1	Other	Other
+8972a0e8-3055-4c08-b03d-830cf4e90664	1	Other	Other
+897353c2-05ec-4b38-8902-1e4409eb3d2c	1	Other	Other
+89736bdc-aeb4-4894-a896-909af4773113	1	Other	Other
+8973c335-4ad3-4ab5-8561-93a8f24c8a69	1	Other	Other
+8973e0f9-c2df-4df4-86fb-6529b1e0de66	1	Other	Other
+8973fad6-7b00-40f2-96c9-a095761c526e	1	Other	Other
+89740049-2187-4079-95b1-546b8f114b9f	1	Other	Other
+897407bc-87ad-46bf-955b-b8b04e1fb014	1	Other	Other
+8974b3df-9232-43fc-ae69-55180c90aa5e	1	Other	Other
+8974f51d-a608-4dbc-b4b7-0415f33c2598	1	Other	Other
+8975341f-4fa0-4411-bc30-ce96438bfce8	1	Other	Other
+89755376-6b40-4f97-bb36-f9ad5bb3fbba	1	Other	Other
+897573de-ae81-4d51-9269-5360ebef40b6	1	Other	Other
+89757cad-3800-45cb-b730-425251d786aa	1	Other	Other
+8975f7e7-a26d-4049-98c8-85eb087ec59f	1	\N	Other
+89760a95-9207-483b-a28c-31c555f6bb23	1	Other	Other
+89760b03-309d-40f0-bd2f-5ef9bf1593d2	1	Other	Other
+89761056-ecf5-490e-b8d1-01c2b10851a8	1	Other	Other
+89766b48-d53b-4334-a67e-bdbf6c12afb0	1	Other	Other
+8976bc79-533d-400c-afce-684da6f96566	1	Other	Other
+8976f337-e786-4811-8244-af347334d3d9	1	Other	Other
+8976fcab-9e95-4fe2-9a8c-43dc5e9c0809	1	Other	Other
+8977016e-6b9e-4537-a4e1-e7e04c619881	1	Other	Other
+89774202-2e56-4d6c-a06f-aec03e58fab9	1	Other	Other
+897791d5-d8f7-4df7-a6d8-115c789bacaf	1	Other	Other
+8977a5c9-7d75-47a4-9fd1-6957562c98bc	1	Other	Other
+897821fb-a477-4557-a687-069f76262857	1	Other	Other
+8978290c-3d78-4b79-8be6-790f500f90c1	1	Other	Other
+89783acf-a0b3-4774-8602-c53bc0980620	1	Other	Other
+8978757a-ca92-4832-aac2-ce1024c74fe6	1	\N	Other
+89788598-08e7-4839-af7f-aa93ca0b5742	1	Other	Other
+8978889a-3c97-465c-904f-daffd6bb83ee	1	Other	Other
+8978a5a2-72ab-493f-8506-f1eb80a2719d	1	Other	Other
+8978b3b7-81a5-4bc3-9bc5-2b62442965ef	1	Other	Other
+8978f1c0-96a8-48e4-ad5d-e53cb0a38f9b	1	Other	Other
+897932a5-4b59-4ab3-80d2-b8dd6dc97f4b	1	Other	Other
+89793743-84c9-42b7-97ae-c2929f53fe43	1	Other	Other
+8979af1c-1318-4d99-b164-757d98547d8a	1	Other	Other
+8979cd61-bdf2-45e6-b2e3-973b762fb93c	1	Other	Other
+897a50a3-5fee-4609-acb5-7fc25eb85a62	1	Other	Other
+897a547a-c3e4-43a4-9ee9-af2902a8b46a	1	Other	Other
+897a7ab8-1572-4c75-9926-88eeab33da47	1	Other	Other
+897a8a58-1bc6-4ee2-88f9-dcb26b357fbb	1	Other	Other
+897ac752-8ef2-488f-b440-305ab5bfc106	1	Other	Other
+897ae42f-d64f-4823-b262-8abd5dd01a0a	1	Other	Other
+897b20b2-e02f-465e-87ae-47b310b06e4d	1	Other	Other
+897b4ed4-14d3-4460-89b2-b3dc8a3f43e7	1	Other	Other
+897b562c-6282-44a2-b2ae-c95e9df30f0c	1	Other	Other
+897b6b9c-82ec-4654-be4a-bb59f4f5618a	1	Other	Other
+897b7cbd-abf9-4ce0-a805-067968ff0f6d	1	Other	Other
+897bc88f-c34b-4e73-a4c7-d4ff04c05f39	1	Other	Other
+897bccf3-0af5-42b9-857d-de99c64ae889	1	Other	Other
+897c00bd-40fc-42b8-acac-907eccd56449	1	Other	Other
+897c4cc9-c0c5-4611-9fc5-0c802cd22eab	1	Other	Other
+897c54e7-eae8-4da8-9779-17b6dbf527c7	1	Other	Other
+897c80bf-9e4c-4105-b0f0-067dc0f7163d	1	Other	Other
+897cae05-91c5-4c7e-86bc-7a09e91ade07	1	Other	Other
+897cb70d-a317-4a07-b142-b2818255239c	1	\N	Other
+897cd2c9-e1d8-43ff-b95f-a55d48b3ecc8	1	Other	Other
+897d58d6-f691-4f9f-80e9-9fc085654de3	1	Other	Other
+897d8fd7-27c4-461d-8341-267533e9a791	1	Other	Other
+897d9ad4-ae04-4d76-8e07-e434014ff528	1	Other	Other
+897d9c16-a007-4e4c-9560-6b4eeac49f50	1	Other	Other
+897daca0-b1f2-4fbb-b029-f4090f6ee440	1	Other	Other
+897dd21e-aff4-49ce-b834-5b6a6400ebe2	1	Other	Other
+897df0e9-a94d-4859-98e6-a78fddd8e50d	1	Other	Other
+897e15c9-62b3-484c-86a0-a843da2269ea	1	Other	Other
+897e4398-d0b4-4c85-9b88-394180291354	1	Other	Other
+897e7b1c-e1b1-4a20-a98b-72c5f7d3991c	1	Other	Other
+897e8419-0fde-4c8d-b74e-cd64cf2b0252	1	Other	Other
+897edd6c-0cd0-4c19-abbb-410c4178026a	1	Other	Other
+897f38ea-b793-4ac5-9edf-7fdb0b7a4bd6	1	Other	Other
+897f9940-cbc3-45b1-97a5-c6dc5664e798	1	Other	Other
+897fad4b-304b-4b0e-8d87-b082966255b8	1	Other	Other
+897fadd0-0638-4b5d-8947-bbc3d7faf3cc	1	Other	Other
+898033bf-3204-4c7c-a7dd-f48cd8b463b4	1	Other	Other
+89804532-ba0a-481d-a28b-ffd982f5fd64	1	Other	Other
+8980e8b2-4487-4215-a634-1f0735415c2c	1	Other	Other
+8980f226-d52f-4b8d-8c9b-7577203b6c83	1	Other	Other
+89816382-b3ae-451c-8b5b-cec7973e0d5c	1	Other	Other
+898191d2-86d7-41b7-ab24-bb7a10cfe99a	1	Other	Other
+8981bddb-97fe-4132-a630-b9f033e9e3be	1	Other	Other
+8981db23-6407-4faf-9f8e-56ad61557162	1	Other	Other
+89820669-a210-4801-8019-2505218941fc	1	Other	Other
+89820c03-a483-4351-bb43-9330099f576a	1	Other	Other
+8982a1e4-2c5a-4be1-b25f-214d0508cd62	1	Other	Other
+8982ae75-a2d1-48a5-a847-b167a14dccb9	1	Other	Other
+8982fdde-89cb-43c3-a4e4-7f844df69ea0	1	Other	Other
+898334e2-cf9c-4606-8315-b91ce75329d1	1	Other	Other
+89839fd7-909c-430f-b51c-6b86b52705e0	1	\N	Other
+8983a77c-7b60-4d35-a5e9-1ce4f9e8ee4a	1	Other	Other
+8983cbfb-a8e3-4bb5-9773-725499bb8ec0	1	Other	Other
+8983e686-b838-4a12-a4a1-bfa64f5068cf	1	Other	Other
+898413a7-3871-4961-9188-26bdcbbc03a7	1	Other	Other
+898430a8-344f-492c-a4dd-1e2712074f28	1	James	Other
+89848fbd-c727-4d1e-a2bc-0284b553b224	1	Other	Other
+8984970b-5a39-4e78-ae10-cb3e2f4f9974	1	Other	Other
+8984eb58-ae33-4789-a168-487a8c50b642	1	Other	Other
+89853890-bf18-49db-ade8-76736fbc3d77	1	Other	Other
+89853faf-99bf-44fd-aec9-741ba083aaaa	1	Other	Other
+89855896-4cbd-449c-bcfd-3af4d17095c1	1	Other	Other
+898575b9-35a4-470a-955f-a319d259ec3a	1	Other	Other
+89858541-c4ac-4faa-ad9a-80d16026b126	1	Other	Other
+8985c6a0-1b90-426e-8f1e-dd2a2b4f9121	1	Other	Other
+89860c05-afc4-40c4-b52e-57de5e8b5440	1	Other	Other
+8986142c-14ff-4a47-839c-558978b665e6	1	Other	Other
+89861b7f-541b-454e-9b4f-9826cc7296ef	1	Other	Other
+89864924-108e-4322-8282-25072e43023b	1	Other	Other
+89864bc1-68c2-4f96-8b3b-8798e5858996	1	Other	Other
+898661bb-5732-4b5b-9cca-4eb23174e8ec	1	Other	Other
+898668f6-fa8b-46ae-8279-83d3b447b19e	1	Other	Other
+898677f0-7c83-4c5e-b76c-a43cb352ca12	1	Other	Other
+89867bef-fc25-46a4-8b3f-f7c1576da770	1	Other	Other
+89874ed3-850a-4425-9abb-14fa4a2ae57b	1	Other	Other
+89877620-c407-4604-8ca1-77b67ff6a121	1	Other	Other
+8987b732-4df9-4bde-b74e-3d30c3657a80	1	\N	Other
+8987e9cc-9ff6-4c04-91aa-9b394d8fddb5	1	Other	Other
+8988bf06-b9b2-46e1-963b-e5aa421af92e	1	Other	Other
+89891752-c129-45fa-8785-bf34fcb458ee	1	\N	Other
+89894b4a-c48c-48b1-92dd-51bc7be5c9ed	1	Other	Other
+8989c69f-3a14-4b0b-9383-86f073c71593	1	Other	Other
+8989d5d8-e9d3-48b9-a9b4-2390a4143163	1	Other	Other
+8989f3ce-4c5f-4a04-a2ac-143f1aabd80b	1	Other	Other
+898a130f-7a2b-4bcd-905c-2de64bafdf4e	1	Other	Other
+898a3ac1-2b5b-4bd1-b02d-e0460a74706f	1	Other	Other
+898aa690-9def-4354-a96f-42ea5127ceda	1	Other	Other
+898aa98c-d853-4b72-a4f7-7dc8fe6867c7	1	Other	Other
+898b023c-a3b0-4ecd-9402-320809dd05d3	1	Other	Other
+898b3d9c-1c84-4df5-9544-4bf819ef461d	1	Other	Other
+898b806b-2c39-443c-8e67-b5ac2e2001dd	1	Other	Other
+898bb818-d1dd-49bb-b104-779e6d95c4f2	1	Other	Other
+898c0005-be64-46f9-a483-d502e1701dbc	1	Other	Other
+898ca57f-65b6-47e3-b716-0e4b85d5349f	1	Other	Other
+898cd052-f43e-4142-ba61-254bb636e83d	1	Other	Other
+898ce415-f856-4c0e-aefc-0eb1690d704a	1	Other	Other
+898ce828-dc65-4a0d-8379-0bba5139644f	1	Other	Other
+898d0013-9d44-4359-aa74-1437e0af0e67	1	Other	Other
+898d0192-decb-427a-931b-a74ebe44baab	1	Other	Other
+898d1077-054c-4e4c-ad37-41e1aa5d022b	1	Other	Other
+898d187c-9046-437e-8fe4-86f0236f4845	1	Other	Other
+898d8932-f704-4325-a14d-7f8a82fa2d8a	1	\N	Other
+898e3720-4b2a-409a-8aee-9c7f8e3ddf25	1	Other	Other
+898e44d8-4df5-4dee-bd6a-a55827d31ccf	1	Other	Other
+898e7169-d97a-4a6a-97e6-f8492faaf684	1	Other	Other
+898e796f-9838-49fc-b870-0c1679c7ba8c	1	Other	Other
+898e850b-0440-45a9-b004-db6df3933e6f	1	Other	Other
+898eaec6-3fc3-42ce-afd2-f3281ecb9ddb	1	Other	Other
+898ed138-4dd1-403e-8226-eb9cdaebf015	1	Other	Other
+898f6f88-a4a6-4e52-bbca-ba84bc51e6dd	1	Other	Other
+898f80c5-0e25-4cdf-9207-b31d968169d8	1	Other	Other
+898f9efa-8cc9-4f79-9a0f-4b44990edadc	1	Other	Other
+898fab5c-e368-420a-877b-f14b51f13fd9	1	Other	Other
+89902759-d3cc-4504-8083-39ec35837302	1	\N	Other
+8990679c-6e4b-4a21-951e-a2c5ee3c3350	1	Other	Other
+8990be94-4835-441c-80fe-52dd0eef5f12	1	Other	Other
+8990c213-e72c-40ee-a7df-efc71b4e7475	1	Other	Other
+89915111-f49f-4936-adb5-45896c557ca7	1	\N	Other
+89917f4c-e3a2-4ddc-8b9c-c5e195016207	1	Other	Other
+8991938f-34c7-417a-bd2e-3e1f14ef91a4	1	Other	Other
+8991a16d-66d8-4155-8b8e-4d0e80204a23	1	Other	Other
+8991e446-5331-43c5-b7b2-b44934bf85e1	1	Other	Other
+8992073a-6cc2-4883-9ab4-63f492eb3e3c	1	Other	Other
+89920da2-e827-476f-bea5-4009b487554a	1	Other	Other
+89920f7a-3327-4df7-872a-5c105e719ad8	1	Other	Other
+8992534f-2cfb-4aa8-a831-642f2b1aa453	1	Other	Other
+89925a0a-ea3e-484b-a251-b8078acd22af	1	Other	Other
+89926281-66f0-4ce9-9635-518c0e1691a6	1	Other	Other
+8992b774-d89b-49e0-8136-20defff19e71	1	\N	Other
+8992c363-0188-4564-89cc-4d265312b756	1	Other	Other
+8992eafb-afda-49c7-a047-9258e8bb0bde	1	Other	Other
+8992f9cd-afa9-4d8d-be6a-feed63b62103	1	Other	Other
+89935b21-94c6-4eae-b078-24d22cc10c4d	1	Other	Other
+8993c395-44bb-46ad-9957-d8bbe7939e52	1	Other	Other
+8993ee96-7f07-4ac1-bf2c-d5ed1d973122	1	Other	Other
+8993ff48-f363-49d2-b459-7726212e73c7	1	Other	Other
+8993ffd5-4422-448e-b84a-7e197b59be1e	1	Other	Other
+89941da7-0485-4ca6-8602-aab1b34b7bef	1	Other	Other
+899424b4-615d-4642-82ad-55191c0448a6	1	Other	Other
+89943fdc-56a2-4ddc-8f98-8d7d10786a01	1	Other	Other
+8994769f-b31a-4f16-b0dd-9e3d6df169c9	1	Other	Other
+8994858b-7f71-4b87-b753-6cf0782a04d9	1	Other	Other
+8994a920-2957-4da1-ad3d-9deeae213cd8	1	Other	Other
+8994bc06-4906-4479-8bc4-cff8dc818fc7	1	Other	Other
+8994efd4-e644-4464-a3cc-661a6300b9f5	1	Other	Other
+8994fb84-cefb-436f-bb7e-ae4c874dae36	1	Other	Other
+89951236-92e0-11e7-a8dd-fa163e8624cc	1	Other	Other
+8995286c-2b81-4391-b9a6-c6a0c163c08e	1	Other	Other
+899569c8-b4c9-4cd1-ac58-47c53a58b10a	1	Other	Other
+89959f83-0ea2-49c8-b982-32d7143c1fd1	1	Other	Other
+8995d78f-3b66-491f-a3bf-575a74266024	1	Other	Other
+8995da5d-e69a-4993-b867-e88a9452168d	1	Other	Other
+8995e1fb-b858-4ee5-acbf-369eb0fac7c9	1	Other	Other
+89960dbe-c08d-43d9-b770-4198cf61bc7a	1	Other	Other
+89961af2-868b-4c84-8593-b3293e3944ff	1	Other	Other
+89962a71-a137-4d2c-b036-2e9308ca4078	1	Other	Other
+899663f2-f562-47b2-81f0-1e25ac298e07	1	Other	Other
+89967863-0f9c-49ce-a41d-b99ec75ab759	1	Other	Other
+899690df-e1dd-4bd5-84b6-b348475c5d22	1	Other	Other
+899690ee-e966-4c7e-94da-419c426e56aa	1	Other	Other
+8996cdd2-7fd6-4b3b-b7ec-54696c8585f7	1	Other	Other
+8996e9f1-9039-4321-adcc-6e0e226fd953	1	Other	Other
+89970f8c-f2ba-434b-8f7c-7de694d7b699	1	Other	Other
+899756f7-e427-42db-a07e-64b6912e1d44	1	\N	Other
+89977552-d02b-440a-b867-1f10ef0b332c	1	Other	Other
+8997c6d7-ca7c-4496-aa85-a228910abdeb	1	Other	Other
+89980c81-a374-4056-a15b-b826e145a421	1	\N	Other
+8998631b-3b1c-42de-ba66-e14614e85c46	1	Other	Other
+89987589-84ee-418a-9571-3de389408290	1	Other	Other
+89989674-d3e0-43ed-9f78-91782cc9604f	1	Other	Other
+8998a36e-970d-4c1b-ba27-fb1bb67ef415	1	Other	Other
+8998af2c-b4ec-4697-bce1-83890754f243	1	Other	Other
+8998cd0f-8b30-4118-922a-e071e77bd518	1	Other	Other
+8998dbdd-37cf-4e78-8e92-08dc4d1c2679	1	Other	Other
+899972d4-e661-4dfd-8953-d21dd5ca2fd3	1	Other	Other
+8999bd7c-70ac-438f-bd2b-4a9903d7deb9	1	Other	Other
+8999da84-9952-4b3b-a777-d9413f605d8e	1	Other	Other
+8999fd5d-1330-47d6-9136-35858e3a68c1	1	Other	Other
+899a1b7d-c616-4b1c-baeb-a29213380e5a	1	\N	Other
+899a211e-b154-4853-a314-81b04f8107fc	1	Other	Other
+899a23b0-cf64-4246-8e08-9ab635d457e7	1	Other	Other
+899a27c8-d86d-487b-901c-aa547584c1df	1	Other	Other
+899a59cf-d71f-4af2-9537-3f0edabbcde9	1	Other	Other
+899a96cd-b5f5-4f2e-9f82-d73df90b0045	1	Other	Other
+899acc60-aa84-11e7-989a-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+899af888-2b4e-4c68-81e2-0bd20ae902f4	1	Other	Other
+899b1bb2-9f54-4eda-ae16-00cdc4440f62	1	Other	Other
+899b5b1d-6036-423a-b954-c3d4cb387a55	1	Other	Other
+899b9fea-c11d-47f0-9488-b5149333faed	1	Other	Other
+899c0e09-7a86-4989-9e2a-7cf9e12b4db2	1	Other	Other
+899c36d6-9d8c-4672-a88b-c561c97906b6	1	Other	Other
+899c447f-0c51-44a9-bb48-4671e8b69369	1	Other	Other
+899c4644-b739-45aa-8fef-7cb3a949c2c6	1	Other	Other
+899c64dc-3051-4365-a4aa-33ea7b3e694a	1	Other	Other
+899c78cb-8b55-413d-bc36-58671cf9b4e3	1	Other	Other
+899c7d79-7eb2-4e5a-a1ca-d852c21b53cf	1	Other	Other
+899c8679-93ff-4e57-872b-9fb352920bf3	1	Other	Other
+899c8c80-439e-4ddc-a354-fc7ccd57bfc4	1	\N	Other
+899ca2f7-bda3-425b-822f-ac7ef551fb8a	1	Other	Other
+899cdbaf-5979-4d2d-bc86-01ec5c6215db	1	Other	Other
+899d1a0c-fba9-460b-9398-26d09be81ae9	1	Other	Other
+899d202c-44bc-4afd-9ad3-4ea368bb28d0	1	Other	Other
+899d351c-4fd1-4688-8b25-e6c626899873	1	Other	Other
+899d3fbb-da5a-491d-98c2-f19362f98ac5	1	\N	Other
+899d713c-8049-42a3-bd23-e649645ad955	1	Other	Other
+899d7eaa-b82c-4aa2-ac97-3b8f85d14695	1	Other	Other
+899d9975-d733-4fcc-b59b-05af7b7a03f4	1	Other	Other
+899d9a3d-a634-4a7e-bbb9-55bbc7ca641e	1	Other	Other
+899d9a91-ad9d-42f3-baa5-9fd15423f116	1	Other	Other
+899dffcf-8425-44e2-98e2-a94573d0404f	1	Other	Other
+899e1c0e-6bef-43c0-aab5-03a8234810fc	1	Other	Other
+899e245f-3931-48c8-bf95-e9964b0417fc	1	\N	Other
+899e279e-05aa-4e94-9bce-0a21f59c802e	1	Other	Other
+899f012e-1abb-4a61-852e-712de5d97620	1	Other	Other
+899f3ee8-f526-11e7-b1df-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+899f6d96-7529-43d9-9c60-67ceef82f7c0	1	Other	Other
+899f78d9-1859-460a-98cd-6491cd195e8c	1	Other	Other
+899fcdf8-a959-4a50-877e-a8aeeb54ca21	1	Other	Other
+899fd68a-48fc-4584-87af-fed38d270807	1	Other	Other
+89a04c3d-1687-490c-a7a9-acec969e5844	1	Other	Other
+89a04ff6-898a-408a-a13f-7de3b75d986c	1	Other	Other
+89a052aa-d9ba-487c-ba68-d3ca366abf00	1	Other	Other
+89a072df-003a-4b0d-a03c-f33d61b78e99	1	Other	Other
+89a07fdb-babb-40cf-a1f9-fbf554a4f39b	1	Other	Other
+89a086a7-93bd-4c8e-b24c-616de7fc1092	1	Other	Other
+89a0a331-4862-4182-92fb-e4fd88125f96	1	Other	Other
+89a0c085-2b27-4d9b-a2b4-3f7bdbd062e9	1	Other	Other
+89a0f6c7-66c4-40c4-a1fd-c5f89a7ae2d2	1	Other	Other
+89a14f09-f6cc-43b3-8404-367668362e97	1	Other	Other
+89a19b1e-04fb-49b2-b074-3745b0099df4	1	Other	Other
+89a1c2b3-5741-4ebe-9734-3ab4a8f33176	1	Other	Other
+89a1f3b8-4519-4f43-bdde-99ac2f853c10	1	Other	Other
+89a24550-aa3b-4279-af17-4aee78f7e592	1	Other	Other
+89a25d45-e070-4b6d-b17b-76e3b603d3d7	1	Other	Other
+89a2cc39-7202-416e-86b3-dc65b486bfa4	1	Other	Other
+89a2e3e4-8e44-45e0-b055-d3e459a18992	1	Other	Other
+89a31616-50c5-4bea-9ce7-b7aaee68e8c0	1	James	Other
+89a33c0e-4a35-4c46-b648-00862546593a	1	Other	Other
+89a34eca-3b79-4148-af74-77c074661e75	1	Other	Other
+89a35742-c3ee-46cf-be05-a8e764c54dfb	1	Other	Other
+89a3b680-80c5-4941-a867-5d7d809e31fe	1	Other	Other
+89a3bc62-c22a-4c4e-8c27-98a70d2c53cc	1	Other	Other
+89a3dffd-1ad3-4552-8459-c86f3b45045a	1	Other	Other
+89a4025c-6d84-4d5c-adba-3d69537b7f17	1	Other	Other
+89a44425-71c8-4f73-a8b1-e80fbe4038b8	1	Other	Other
+89a4576c-c0ad-4196-939e-4d5b8871d335	1	Other	Other
+89a47cd2-fdc8-41c5-ae31-68cad5b86351	1	Other	Other
+89a49477-8e0d-4758-b362-426873f9a685	1	Other	Other
+89a49591-3db9-42a3-ac24-46f4b92451ca	1	Other	Other
+89a4a41f-aa54-405b-b887-26d6364afad8	1	Other	Other
+89a4b1ee-baca-4ec8-8a3f-5f83ebf83695	1	Other	Other
+89a4ba9a-7a80-4b2c-977a-355b23e11248	1	Other	Other
+89a5953e-3a8c-4225-b77a-3a674d61aa12	1	Other	Other
+89a59713-760b-4ff1-b86d-442d7ecb7397	1	Other	Other
+89a5da25-b344-428b-9904-b2dc745c3608	1	Other	Other
+89a5fb61-d14b-4f4b-9c4c-81b5df8c0cd9	1	Other	Other
+89a606c9-35ae-4ba2-bff5-5bb16d8fef78	1	Other	Other
+89a65826-9d97-4ea6-8166-49f0b46b84c6	1	Other	Other
+89a7185f-02b8-49f1-a9a8-7a5c5d8be9f7	1	Other	Other
+89a7582a-664d-4508-80be-771277900d09	1	Other	Other
+89a77572-c322-44c8-a800-c0eb45c17a35	1	Other	Other
+89a7a171-82ec-48da-8681-a195a82071fb	1	Other	Other
+89a7aa8a-3ec3-4dc4-8def-29f76e619f46	1	Other	Other
+89a7e18c-4540-440b-90aa-13671a225ea8	1	Other	Other
+89a7fa25-0421-4f2d-b04c-c01f42d323da	1	Other	Other
+89a80e8c-0d11-472c-aece-200ab44055ce	1	Other	Other
+89a866fb-4067-447c-95b9-f525d4de1154	1	Other	Other
+89a8ac2c-f6f9-4a8e-ab5e-e7dc903416c7	1	Other	Other
+89a8c602-9082-4ad7-b184-6b56c598277b	1	Other	Other
+89a95579-811f-410f-807c-d36362e02faf	1	Other	Other
+89a95bae-fee6-4943-8ed2-02135b75e994	1	Other	Other
+89a9d296-3ee8-47be-a486-a0108ddd78cf	1	Other	Other
+89aa6b14-cc19-482d-80f7-b20bee9b8dca	1	Other	Other
+89aa7d3f-cba0-4c6b-a528-a9eb5aa35039	1	Other	Other
+89aab4bd-66c7-4835-9ca8-70c6ce8d101f	1	Other	Other
+89aacaec-d7e8-4947-b9bd-53cde7673280	1	Other	Other
+89aae352-7a28-48f0-90c2-8b75219861aa	1	Other	Other
+89ab2853-9a1d-4c36-8016-e25756fbfac4	1	Other	Other
+89ab35aa-c612-42ac-a694-d5b958514755	1	Other	Other
+89ab9294-c6c2-4fe5-993d-f7cda122a785	1	Other	Other
+89ab9840-a730-43ca-a1f5-c786a5da79fe	1	Other	Other
+89abd157-1a38-424e-a0c5-1eef3b26910f	1	Other	Other
+89abe7d8-2c8b-419e-85c9-287a3b2bf6a4	1	Other	Other
+89ac14aa-ff57-4711-9349-ad77fc3fcb78	1	Other	Other
+89ac3bed-98cb-4816-a8ed-c84dde664b5d	1	Other	Other
+89ac587b-7e39-4519-8291-f82c7145946e	1	Other	Other
+89ac9ce1-f4d9-4327-a7a5-d055212464b0	1	Other	Other
+89acbe39-272b-45bd-b913-0c98b1718d4f	1	Other	Other
+89ace84a-36cc-48a7-970e-ec7874296efd	1	Other	Other
+89ad05f2-6621-47dc-9dd5-df599498bacc	1	\N	Other
+89ad38bb-b0ec-4962-8f66-3d131df6dc5c	1	Other	Other
+89ad5595-560e-4a8f-9484-cc9c6491d3fb	1	Other	Other
+89ad7160-e4ac-4f78-8b0d-d57c918d2aaa	1	Other	Other
+89adad47-2f5d-42fb-94c1-2482b61ae6e0	1	Other	Other
+89adb220-075e-46b7-acdd-432e967da4cb	1	Other	Other
+89addfc5-fc33-46d1-9159-ce3537d91506	1	Other	Other
+89ae3507-4bf4-46c6-a088-68cfa8da9e06	1	Other	Other
+89ae4615-19d8-4f77-b041-4e93da5e2b17	1	Other	Other
+89ae63dc-1d26-4540-a4f2-5592e54a18a3	1	Other	Other
+89ae7dc4-6b63-42a8-9209-9493cd436cad	1	Other	Other
+89aea8d7-0051-48ad-94c8-724c924ac500	1	Other	Other
+89aed69e-c8de-47c8-9e8b-22487db83f10	1	\N	Other
+89aee275-1d35-415e-9228-179013b60aba	1	Other	Other
+89af0b95-8c60-49b1-b898-27cfc54e7212	1	Other	Other
+89af3271-18e1-4e06-b646-db37adb8865a	1	Other	Other
+89af57d4-c568-4d3e-b5b9-b6543496f326	1	Other	Other
+89af63a4-3664-4fac-a1ac-92b593716bbf	1	Other	Other
+89af70ad-051a-4ddf-ba0c-f1b95fcc1bcd	1	Other	Other
+89af72d5-c598-483d-8acd-6555289b12d2	1	Other	Other
+89afc409-5832-4c8d-b5ef-667b64a6653b	1	Other	Other
+89afe96c-cfdd-4ec8-af70-791eb101a2a1	1	Other	Other
+89b006b3-a115-47c1-a01a-6a8ad6aaeae8	1	Other	Other
+89b019f4-2a74-47ca-b753-540d90cd9c79	1	Other	Other
+89b0cc0f-51a3-472c-a37b-e3cc68110389	1	Other	Other
+89b0cf29-775a-4f7c-aef2-02709217866a	1	Other	Other
+89b14405-3bd7-4ddd-88ed-39b6b7479307	1	Other	Other
+89b14a3b-1568-47c8-a0f6-81795395f792	1	Other	Other
+89b1e0e2-d7c4-44e5-a338-dbceb8fc95f6	1	Other	Other
+89b1f8a5-0bbf-4d11-9115-5c4671caa1dd	1	Other	Other
+89b22759-52f2-4910-bfab-92b1d67d5f96	1	Other	Other
+89b25768-5dca-4de3-b30a-48804c113885	1	Other	Other
+89b27605-323d-4580-80b8-b163de5cc901	1	Other	Other
+89b282f9-a6da-4209-b7b4-f89441fdf1a9	1	Other	Other
+89b2890b-c9a7-4034-8870-50c6a124d15a	1	Other	Other
+89b2f62e-b611-4d09-a50d-226d604dcaa2	1	Other	Other
+89b3522e-40ad-46d5-bb59-e7b8c2760a74	1	Other	Other
+89b37504-561b-47c6-a559-e68463545d9b	1	Other	Other
+89b3f5f2-a37e-4663-a581-81b897be4abf	1	Other	Other
+89b43e06-fab8-489d-be61-92b84fa5db61	1	Other	Other
+89b480af-d0c4-4377-a6fe-0f14d9d0e279	1	Other	Other
+89b4b72a-16d4-4327-969c-ce5cd6434a34	1	Other	Other
+89b4dac2-eb58-4aa6-9a4e-d95940961838	1	Other	Other
+89b4fb99-c9d2-4d7a-be29-15640be5ffc8	1	Other	Other
+89b545fe-79a3-4b64-a52f-23dcd517a30f	1	Other	Other
+89b57f03-a381-4f66-9fb1-16471e380b9d	1	Other	Other
+89b59ecf-b572-4136-8cce-e7fe44a2f4a8	1	\N	Other
+89b5c3c1-6c7b-4ed4-b8ad-9ef4a36ef8aa	1	Other	Other
+89b5c5e1-1439-43f8-8d86-e01275a84316	1	Other	Other
+89b60874-455b-45ff-a8d2-a6d94f1e8351	1	Other	Other
+89b611e5-8cf3-426d-9e1b-6c84033dbec8	1	\N	Other
+89b62fc4-7fdb-4e0d-b5dc-8df6e7289d19	1	Other	Other
+89b7176b-5bd9-4e74-a9dc-ed1e8fce8d0d	1	Other	Other
+89b73d39-e030-4bd7-8e67-c78a96976e33	1	Other	Other
+89b74d20-2f8a-4ddf-8795-c8da0ec28491	1	Other	Other
+89b76fce-5a9f-41f0-b17d-de4db9cf365b	1	Other	Other
+89b78f31-3618-4cd3-b2d3-eb2c611d26ed	1	Other	Other
+89b791d6-f694-41c7-be05-e07ada62855e	1	Other	Other
+89b7a8e4-95d8-425c-a8f8-37271adbfbeb	1	Other	Other
+89b7ae76-fb8e-4b14-9490-7e7711c77f56	1	Other	Other
+89b7b8f5-55c5-46e4-bb02-84a7a36ef61d	1	Other	Other
+89b7c324-054b-4698-a275-28eae21fc255	1	Other	Other
+89b87481-7d5c-469d-b710-0db6d9d9dbbf	1	Other	Other
+89b8a5f8-7d8c-44a7-8c31-0e7139084e3e	1	Other	Other
+89b8e1c3-4fb6-4052-af8f-a89f52727fd1	1	James	Other
+89b952cd-f6ac-435a-a812-b11e69c65d26	1	Other	Other
+89b9b571-c0b4-4362-b272-ef1d640aa2ad	1	Other	Other
+89ba3f85-570e-471a-b71f-cb138998e8de	1	Other	Other
+89ba5190-39a5-4334-be7f-a586874b8ab4	1	Other	Other
+89ba5b64-a74b-4412-803f-99330022952d	1	Other	Other
+89baf48f-0901-4f3d-aa1d-58c451595152	1	Other	Other
+89bb61ec-31dd-4cda-932e-a8d8413afa3f	1	Other	Other
+89bbba38-7614-48cd-9b2d-41da35271ff1	1	Other	Other
+89bbfe80-1930-45cf-8f88-312f154752b0	1	Other	Other
+89bc2b9c-55c0-4ccd-ac8d-c7d84c8efb0a	1	Other	Other
+89bc7e93-31f3-45cb-a9f7-c13777f37de2	1	Other	Other
+89bc918d-7dee-4dbf-9059-d5ccf5c8c076	1	Other	Other
+89bcc8fc-1f50-49b4-a177-eabc15af55e2	1	Other	Other
+89bd33b5-e3a3-44e4-aa24-5ac1fd18b241	1	Other	Other
+89bd5139-8daf-4eff-89e0-0ff9f5f7e1fb	1	Other	Other
+89bd6d22-ce6f-4967-a6dc-497ba6143b07	1	Other	Other
+89bd9dd0-4ca5-48ce-a9fd-a3e2182937e7	1	Other	Other
+89bda507-8a65-420b-a088-a0c9c5d2a24e	1	Other	Other
+89bdd83b-5e1e-4f80-87ff-b466c862b4a7	1	Other	Other
+89be0232-99c1-431c-b306-c2bf31137f26	1	Other	Other
+89be32a4-bc24-4c66-a911-2ab799bb0406	1	Other	Other
+89be640a-1e5d-4780-9a85-117d1f48c8a6	1	Other	Other
+89be6e3f-6dfc-4a56-8d4f-972b0eaf536c	1	Other	Other
+89beb67e-fb3c-477c-bbb3-841661a3e7c3	1	Other	Other
+89bed856-207e-4b7e-aace-18731917bdbb	1	Other	Other
+89bef8ef-3f5f-400e-bf3c-f33b54a07e6f	1	Other	Other
+89bf07aa-224f-4908-9cdb-273d7f752806	1	Other	Other
+89bfa75e-9ec9-440a-b1aa-f07585cc5eea	1	Other	Other
+89c002cf-56e0-4c44-b39d-72c8a6860a04	1	Other	Other
+89c0ab39-fe5a-468b-83dc-b832488a25ef	1	Other	Other
+89c0e8a0-f12b-498e-b87e-1a48589055bc	1	Other	Other
+89c0ed22-d484-4b67-8832-89badcee7e4b	1	Other	Other
+89c10ba1-83fe-4ea3-841f-758ab48bfa90	1	Other	Other
+89c10f42-030f-4791-b5ce-91b6751962e1	1	Other	Other
+89c112dd-b13a-41c9-a051-a5b82b0f2f2d	1	Other	Other
+89c1c1cb-0680-415b-8aa3-4a5082538f0e	1	Other	Other
+89c1d8f0-bd47-4c93-a395-bde4fc8dcb71	1	Other	Other
+89c1edb4-6af6-4fca-8af6-a2b068bb0868	1	Other	Other
+89c203b8-fd30-4dbf-b0d4-683a9f369704	1	Other	Other
+89c21f0f-95fc-4aa2-bef2-f81931e93e80	1	Other	Other
+89c22ad1-e0ce-4b9a-9af7-ad0a76528ec6	1	Other	Other
+89c29237-a9c2-4f99-9d33-031339c5f0bc	1	Other	Other
+89c2f52f-79eb-4667-a5b2-269ce84e67d1	1	Other	Other
+89c352d9-daea-47ea-9f82-08e4b17cf68c	1	Other	Other
+89c39e2d-12eb-46e0-8df5-cba21d0a9669	1	Other	Other
+89c3c473-2249-4e8f-a651-8ccf2fbaf723	1	Other	Other
+89c46927-fe5b-4cb4-8f60-68eeaaaed500	1	Other	Other
+89c49216-b519-4f54-b17a-1d1bae000912	1	Other	Other
+89c4dc48-fa1b-4502-8bd2-3c5e153933a9	1	Other	Other
+89c53193-8931-4b27-9142-aaacbc19b65a	1	Other	Other
+89c5b8c7-0206-4c24-9a93-83dd45bf63ab	1	Other	Other
+89c5c01d-958b-40de-8e63-48683854995c	1	Other	Other
+89c5c9e7-7f76-48ac-b414-bd9f0182a71b	1	Other	Other
+89c5eb33-9694-4029-bd77-a37e95dee510	1	Other	Other
+89c5ff85-e60a-467f-843b-39f3c48bce79	1	Other	Other
+89c60010-4155-404b-8c41-7000895145d2	1	Other	Other
+89c65fb3-3918-4fa3-a80a-b4bda631ec42	1	Other	Other
+89c6befb-046c-4f12-976b-0c4376796634	1	Other	Other
+89c6c75f-86ab-470b-851d-d201cfed6df5	1	Other	Other
+89c72375-8b3d-4f31-a930-bd8b1c75e979	1	Other	Other
+89c7355a-1956-4ae1-994b-7321c6b42c53	1	Other	Other
+89c74974-0e03-4be8-94e1-c62c4ae5c12c	1	Other	Other
+89c74e88-25c6-41d1-9a46-2f5a30d34431	1	Other	Other
+89c75b66-ec1c-4bb8-b176-b262ef63c496	1	Other	Other
+89c76de3-2613-47aa-a6b5-b8eaab4cb3b7	1	Other	Other
+89c78623-e340-4cba-96f2-f41851a07126	1	Other	Other
+89c788d8-dfdc-4f9e-8ceb-ea4d4fa4b5d6	1	Other	Other
+89c7b275-84e2-43a5-8269-252849ee054c	1	Other	Other
+89c7d373-fd8c-458e-a2a1-145fd3d8b400	1	Other	Other
+89c7dd59-cd7d-478d-98a1-0ffb36143800	1	Other	Other
+89c816fd-0225-473d-80ab-884be3de0530	1	Other	Other
+89c88e38-d89b-4041-a605-f991b455efa4	1	Other	Other
+89c8b7f7-ddd3-47bf-a00f-b443d5d2792d	1	Other	Other
+89c8c959-7a5f-4f74-adfb-f603f2944883	1	\N	Other
+89c911e6-50a9-4f08-96de-1cd99c7610d5	1	Other	Other
+89c91e0a-cbc3-43ef-be44-8bc1c0cdc30a	1	Other	Other
+89c922f0-4709-48e8-aec4-7cccb3a69e2b	1	Other	Other
+89c934fe-dba7-42d0-b9c2-b3285654b1dd	1	Other	Other
+89c94717-8fa8-4f3c-9ffa-0245786ac4a9	1	Other	Other
+89c97b03-cfe2-4600-b76a-cd111126fe00	1	Other	Other
+89c9ad7b-42f0-42f8-9b65-1405cb3033f1	1	Other	Other
+89c9cae9-442a-442a-8055-543b3251bae5	1	Other	Other
+89ca0db9-5bc9-4bf9-9e27-87bc32f166f8	1	Other	Other
+89ca111a-7ee7-4e63-84dc-e89354a58a90	1	Other	Other
+89ca1a53-6a72-44b3-8db3-cc0e65ed2e53	1	Other	Other
+89ca5f16-b83e-44ae-8c14-79cb0db2ce97	1	\N	Other
+89ca84e2-65e6-4c60-b49e-6454941a21b2	1	Other	Other
+89cad9a8-4fa9-4396-972e-2bccb7b9f22a	1	Other	Other
+89cb373f-c8df-414d-8708-5cc5e03fceea	1	Other	Other
+89cb43de-3b7d-42ed-b657-7cc570b7adfc	1	Other	Other
+89cba390-4ff8-4af7-b98f-5e5c7ef87b90	1	Other	Other
+89cbfc4c-2e43-47e4-bfd8-0e53d864592f	1	Other	Other
+89cc1ba2-04ee-458f-9fcf-2317fdfa111a	1	Other	Other
+89cc1d05-6188-48e4-b842-34470cb2a9eb	1	Other	Other
+89cc54a7-4601-47f3-8693-2a91667f9f6e	1	Other	Other
+89cc5e48-8f1b-4e47-852b-1410850da2a8	1	Other	Other
+89cc5fb0-344d-462e-9bae-a0d42cd5301f	1	Other	Other
+89cc84e8-5f43-4195-b3af-c248c1ebdc34	1	Other	Other
+89ccab73-33da-4522-b151-fc929391a0c9	1	Other	Other
+89ccb7fc-b92a-4409-afa6-22b9bbfce190	1	Other	Other
+89cccf16-8083-48e9-9daa-e2dcfe7b101e	1	Other	Other
+89cd1432-2295-484e-95f9-f91276279b24	1	Other	Other
+89cd4b07-e455-45b3-814e-1f175934d728	1	Other	Other
+89cd6b4a-1bdb-4b02-a175-bb786df7c046	1	Other	Other
+89cd93f4-84d9-499f-b2e7-cce73b46593e	1	Other	Other
+89cd98b8-d8cc-4e83-b020-4d5e895135fd	1	Other	Other
+89cdc748-3ee9-4b84-a675-9bd59bcd27a4	1	Other	Other
+89cdc7b0-89c2-4934-80b3-f4af98c6cc0f	1	Other	Other
+89ce7655-2096-486d-9a1d-bda1476eeb4a	1	Other	Other
+89ceba24-2df8-42de-bf21-5f659900335e	1	Other	Other
+89cecd30-618e-4a44-9356-5d2e1a2f95dd	1	Other	Other
+89cedb84-1b04-4436-8c3d-e51aa33efe9f	1	Other	Other
+89cf28dd-ac92-4f08-bb10-0c9a8639c6a1	1	James	Other
+89cf7dae-cec1-492f-a6a5-184995b1e114	1	Other	Other
+89d0144d-fb7d-46a4-8976-1e14f77537a4	1	\N	Other
+89d04cb5-fedc-4901-b380-2f021bdcbaa7	1	Other	Other
+89d05418-87eb-4efa-9bb7-3571eb81d4f4	1	James	Other
+89d07991-308e-43da-a43d-5a2d7c6494ad	1	Other	Other
+89d07d96-c93c-44d0-9fa6-23243a1ac671	1	Other	Other
+89d09558-9c6a-4607-8388-13c1dc59ecd5	1	\N	Other
+89d09c68-9863-4320-ad6c-9975891978af	1	Other	Other
+89d0d606-02f7-4a0d-82da-5fbd08519b41	1	Other	Other
+89d1183e-d56e-4182-b7a0-6424bb36875d	1	Other	Other
+89d1249a-0d20-44fb-abbd-a133463cc6e5	1	Other	Other
+89d147e1-2f6e-49f0-89e3-d186d10c4389	1	Other	Other
+89d15fc9-d757-40a5-a1ea-4293941449bc	1	Other	Other
+89d186c3-98fd-4b5f-837e-cc9413c8623b	1	Other	Other
+89d22886-afe4-4f5c-95d7-c48077129ab1	1	Other	Other
+89d2e484-6190-4765-9244-8dd0644d24c4	1	Other	Other
+89d2fa5a-9ee0-4ffe-94f3-2024dbff7a86	1	Other	Other
+89d2fdde-99c9-4494-8a79-eb271302af1b	1	\N	Other
+89d31702-5a42-41f3-9182-5ef661f1b1dc	1	Other	Other
+89d328ea-8361-48bc-8396-d5926865c68f	1	Other	Other
+89d369f7-48d2-437b-9704-058b2c347b20	1	Other	Other
+89d37f8b-1ffb-44c6-9eed-200bb0800650	1	Other	Other
+89d3a87c-d8bf-42af-90bc-7371737a04a4	1	Other	Other
+89d456b2-003f-4976-a4c3-7328c8b61eb7	1	Other	Other
+89d501e4-5577-4419-8c7c-8dd704a8cb3d	1	Other	Other
+89d51d1f-f77b-443c-9fbc-3e76be98dfb0	1	Other	Other
+89d562f1-5732-4675-a906-6861625266e2	1	Other	Other
+89d56774-60d9-4260-8ba0-afa5e22a5233	1	Other	Other
+89d589c4-b2b6-47f4-aeee-36189ecf3bcc	1	Other	Other
+89d597a2-6c31-47b9-af6e-2792d21ba788	1	Other	Other
+89d5c273-8d33-4f31-a15a-0d595d45b22a	1	Other	Other
+89d5c3e7-4859-4604-9427-7d9b763f55e9	1	Other	Other
+89d674bf-0a7a-4a61-b9a2-311d6d626056	1	Other	Other
+89d67fcc-0432-4094-be3a-832641ce4035	1	Other	Other
+89d6b6e4-d7ea-4f34-8843-c5c6cc7cf1d1	1	Other	Other
+89d6c57c-8b45-40ac-948c-034aa5f1fab0	1	Other	Other
+89d6c880-8ee2-41b5-b775-0521ea341e4b	1	Other	Other
+89d70d19-419f-4c8a-a9d1-011fef9be360	1	Other	Other
+89d70f6c-5865-4655-97a0-6e20cb171fa1	1	Other	Other
+89d76ada-e613-4fbe-bd8d-5034c3e04c49	1	\N	Other
+89d76af8-0042-438e-97ac-9142a1b8b007	1	Other	Other
+89d786d8-2274-4157-8b70-3bf81f9b66d4	1	Other	Other
+89d7901f-9237-4316-9ee5-16df9d1eb4a7	1	Other	Other
+89d83cc2-e809-46e8-9f03-fd822cc1cff6	1	Other	Other
+89d90b8e-7277-48b0-a57b-ad3c1fce98b7	1	Other	Other
+89d91d1e-53ad-483d-87d3-f2eaabfe5b6d	1	Other	Other
+89d93db7-c039-41d7-be9c-9c34a3818ac7	1	Other	Other
+89d94185-3043-4dcb-9fdd-422dc839e869	1	Other	Other
+89d952a4-c2e7-413c-abf9-9cbb07190fd4	1	Other	Other
+89d96589-6973-4a01-8a1f-65ebab5cdabb	1	Other	Other
+89d99a4e-ea0c-41b1-bb43-28fe56a8ff18	1	Other	Other
+89d9a667-fc26-4f18-8276-ff6e49db3fe3	1	Other	Other
+89d9c48b-6249-43ef-b78a-e8213818e0a5	1	Other	Other
+89d9e8e0-8c97-4774-af2a-e7609ac5e0ce	1	Other	Other
+89d9ed85-5221-411f-a3ad-7621e2602414	1	Other	Other
+89da1898-6f31-45e2-ac9c-b22829ce7229	1	Other	Other
+89da243d-aa52-4afd-ab50-df6f4cd1353a	1	Other	Other
+89da46f8-2f22-4b81-957d-19cf9ee67cc9	1	Other	Other
+89da4d9e-f600-499e-81e2-510583ecdc38	1	Other	Other
+89da4eea-8542-44f3-bc87-5910d754dbaa	1	Other	Other
+89da68ac-e713-4c8b-ab8a-476a1c761b15	1	Other	Other
+89da7069-274d-48ee-a5e3-e536a0e840df	1	Other	Other
+89da7d8c-bf42-4282-992c-246b88bd4c1d	1	Other	Other
+89da9147-7c86-49e4-9c80-91e6d708b7a9	1	\N	Other
+89daae83-30f0-4106-a2eb-5fd9c663dd46	1	Other	Other
+89dae226-8ee2-4adc-94a6-69d973b0ee98	1	Other	Other
+89daf05e-8e96-410a-bc9e-a4c38aa46259	1	Other	Other
+89daf99a-e916-403d-94ed-a8d9bd882445	1	Other	Other
+89db3c46-3438-4f9b-9e81-a189d17227a4	1	Other	Other
+89dba80a-c529-4fa6-8da8-65abe39a59fd	1	Other	Other
+89dbae09-f4bb-4014-af76-0a345e7848f0	1	Other	Other
+89dc2999-66bc-4fb7-b7e1-fc0128f89f5b	1	James	Other
+89dc6057-d55f-4732-b3e4-ebb6caf9e1c4	1	Other	Other
+89dcb9a3-e213-4041-ac15-63db8b95f766	1	Other	Other
+89dcd9d2-59bf-497f-bffc-e6bd0f36ceb0	1	Other	Other
+89dd49e9-0e01-4a94-8cee-21ad9af0030e	1	Other	Other
+89dd8f1a-20d2-45b1-89bd-97ee20e68c02	1	Other	Other
+89ddd6f6-d079-4c03-9152-adcde520edef	1	Other	Other
+89de1035-ac96-4237-a1b4-2b8f96058a12	1	Other	Other
+89de1302-b3d7-43ac-8279-05ff6a6112f2	1	Other	Other
+89de7383-8db4-406a-8fa8-2c963e66c5c0	1	Other	Other
+89de8342-65f9-45a7-80b9-5c4c3e80bab9	1	Other	Other
+89dea6e6-aa7f-4817-8f0a-4326a1e181e0	1	Other	Other
+89df7fe1-6824-4aac-916b-a603f80c3a50	1	Other	Other
+89dfaefb-dcf5-48ae-966d-97b1d787cb21	1	Other	Other
+89dfc478-397e-44e8-b73c-65626c8bdb83	1	Other	Other
+89dfed19-745e-4d75-b941-bc444da7c01e	1	Other	Other
+89dffd29-8256-4f09-94b8-55cce1b11cc3	1	Other	Other
+89e081b6-f89a-4d2e-8485-a1c20e116160	1	Other	Other
+89e092d4-1e2b-4cc6-a290-8409ee5606b6	1	Other	Other
+89e0a691-9e74-4c5f-bf84-3ff1d4da364e	1	Other	Other
+89e13215-efe2-4437-892b-51457d6571c8	1	Other	Other
+89e14447-a679-4834-9d26-4ae995f6e924	1	Other	Other
+89e159c9-4325-4090-85e0-b7451c42fc6c	1	Other	Other
+89e19499-11db-46d8-9a81-73f343e8124c	1	Other	Other
+89e194b8-d8ef-4b5b-805e-cf4e1b25588f	1	Other	Other
+89e1f6b8-46e2-49bf-b2f9-162bdc93bdd7	1	Other	Other
+89e2057d-bd79-4095-8eb1-35f077394dc1	1	Other	Other
+89e211ab-a3ea-44f4-aa65-213b615ad0e7	1	Other	Other
+89e23fb5-03e4-4e95-a457-c4266773aa1e	1	Other	Other
+89e26bdd-0763-4738-9bf4-97bbeb6b34c4	1	James	Other
+89e36e38-0479-4847-8630-6e8af9ecc201	1	\N	Other
+89e377a7-ba28-4521-863c-85e20f129275	1	Other	Other
+89e39b12-4391-43cd-bc09-2754b738ff2b	1	Other	Other
+89e3aca3-996c-40f2-b5f1-e3de66428bf4	1	Other	Other
+89e41e4a-ef9e-469b-b2db-a7945818228b	1	Other	Other
+89e42dce-a455-4096-a555-2ac87dba5b62	1	Other	Other
+89e43633-f63c-4ac6-8e2a-3d66b21e7771	1	Other	Other
+89e482ff-3bcd-48a7-bee8-87935be717e5	1	Other	Other
+89e4ab9f-b70f-40e0-8efd-8c12c8fb14af	1	Other	Other
+89e4abad-2a00-4e40-8e56-557fd5b191eb	1	Other	Other
+89e4ad9f-57a8-444e-bc0b-c511ef4841e0	1	Other	Other
+89e4c58f-9f1c-4979-8a5c-ca5f21165660	1	Other	Other
+89e5089e-c98b-43d8-9d16-b8a204662b4a	1	Other	Other
+89e522ab-b72c-4423-9efd-940408981017	1	Other	Other
+89e54af4-8102-4129-bd51-3816fb061eb4	1	Other	Other
+89e54d9c-cc53-4978-94ef-9f57c5166040	1	Other	Other
+89e55498-63a1-4f02-b09b-905940ada165	1	Other	Other
+89e557c0-d3b8-4b06-8ee2-68857abf9a0b	1	Other	Other
+89e5e43a-8415-4631-9f22-eb481bad5637	1	Other	Other
+89e5ee9d-4778-4593-8e84-4be84db8e747	1	Other	Other
+89e5f987-5a55-4a31-a282-1c1b7cf07509	1	Other	Other
+89e62f56-db4a-430c-ba84-5f6e844a5022	1	Other	Other
+89e67584-324d-4001-95e2-0b6d59be4d86	1	Other	Other
+89e6976d-8d27-45e5-96a2-f335f2feb2ce	1	Other	Other
+89e71fbd-925b-4750-9b9a-e4b99e6c7992	1	Other	Other
+89e737fc-1a11-4e0a-b3a3-0f103ca44949	1	Other	Other
+89e73fe8-244a-41f1-aba2-7b6cfe61d74c	1	\N	Other
+89e756d1-1fd6-4dfb-a5a4-cfc4f2f7569f	1	Other	Other
+89e764fc-62b1-4f52-84f5-96aeaf6c5d59	1	Other	Other
+89e7820f-33a0-4225-bc01-f3f94f2073ca	1	Other	Other
+89e79c70-d374-4e3d-ad70-26de9ed04c37	1	Other	Other
+89e7c47e-0b1d-4844-a6a4-dbed6ffcb6f9	1	Other	Other
+89e7d4bf-df76-4c4e-a5ad-68b5b4181039	1	Other	Other
+89e81d51-bbf7-4115-871e-11e7d44cefca	1	Other	Other
+89e83c55-906d-43fb-8fae-5d91ad68e80b	1	Other	Other
+89e85773-4938-4e50-b4b2-4a20102365eb	1	Other	Other
+89e85b5d-5cfa-471f-899e-28e7655630d9	1	Other	Other
+89e89fe5-27ff-47fb-ab92-2e95f6aeb961	1	Other	Other
+89e8a654-85fe-4e76-9d5c-01edca0990c9	1	Other	Other
+89e8aa2d-26e6-411a-80c8-8dd566d36969	1	Other	Other
+89e8c73d-ae12-4d57-9c6a-2d38fb71ad51	1	Other	Other
+89e8c748-929d-4c03-967f-526f049c91c1	1	Other	Other
+89e90716-1052-4b6b-8edd-546ec2df3c2e	1	Other	Other
+89e90900-a76b-45ff-9a6a-a54aba826271	1	\N	Other
+89e90977-a05b-4787-a9f4-46cc6a356afe	1	Other	Other
+89e915f7-15f7-4f22-8367-b73900897e88	1	Other	Other
+89e98132-d07e-4d7f-b368-60b772d09eb5	1	Other	Other
+89e99092-7801-43db-862f-49d6c8fa0813	1	Other	Other
+89ea11c3-204c-426b-8b47-76e6fa08608c	1	Other	Other
+89ea1fb3-94f6-47cf-b937-9915e3ee1a8a	1	Other	Other
+89ea5560-2c86-40b8-b50f-8f34853751ba	1	Other	Other
+89ea6935-83d0-4e1f-926f-7e914cdb5bed	1	Other	Other
+89ea932a-36e9-4110-954d-cf16f05f5e2c	1	Other	Other
+89ea93e5-68e5-4049-9134-2b71f0a5c756	1	Other	Other
+89eaf42a-159d-4001-a5f0-0679ebd3424f	1	Other	Other
+89eafa2f-73f2-473e-92c2-737752d09deb	1	Other	Other
+89eb3828-7acb-4f74-9293-37ac477d581a	1	Other	Other
+89eb7695-d540-4c67-8636-da22260197be	1	Other	Other
+89eb7c0c-1ad0-11e8-979e-fa163e8624cc	1	Other	Other
+89eb7d7a-56b6-45a4-ad8a-8dee5f401d6d	1	Other	Other
+89eb90a7-c5c2-4c1f-b2f8-2a8ee5734d34	1	Other	Other
+89ebe57d-68bf-478b-93f1-fce6b700e2fb	1	Other	Other
+89ebf4b6-2808-4a43-99c9-5e21d572b7d5	1	Other	Other
+89ec3012-389d-4dcc-96e9-efd6c0953460	1	Other	Other
+89ec552a-6d45-4026-b700-9cab6ed61eee	1	Other	Other
+89ec9edc-330b-4269-87e1-ce4a442f6238	1	Other	Other
+89ecbeeb-48db-4da0-88f5-1e85506b6bc8	1	Other	Other
+89ecc327-815d-4099-af10-0040b015dd35	1	Other	Other
+89ecd91f-a940-478c-8c20-df7c0515c1bb	1	Other	Other
+89ed0266-21ee-46f6-bc65-7b53dfa90d7a	1	Other	Other
+89ed5ce0-2439-48db-a9fa-911117413e6e	1	Other	Other
+89ed5cf2-eaae-4338-8748-aa908e8a1bbc	1	Other	Other
+89ed784f-9574-4d2e-9587-7e41cb765146	1	James	Other
+89ed7ada-e8e1-4273-880b-c07c51ad3cce	1	Other	Other
+89edae5e-f81f-42db-8e38-6ea166301c77	1	Other	Other
+89edbed7-b6e9-4a8e-81f1-04f981625545	1	Other	Other
+89edd2fa-fbe1-4257-80cf-cae5e4b6ba1d	1	Other	Other
+89ee329e-f3d5-4760-94e1-29f2782a09ef	1	Other	Other
+89ee3474-8ab3-4a41-b817-49dd6f6359c2	1	Other	Other
+89ee3874-b3f8-411b-9092-5eb2d562399c	1	Other	Other
+89eef68c-d13c-4e8c-a3b0-6d546c16cf5c	1	Other	Other
+89ef1cde-f2c4-4f2f-8920-23ae5fb6fd24	1	Other	Other
+89ef894c-a2dd-4682-81a1-c5b75c46bab1	1	Other	Other
+89efad3c-a2a5-428b-ba74-87808aa79bb3	1	Other	Other
+89efd253-cc3c-4c6e-bcd6-dbf779ebc4dc	1	Other	Other
+89f00d63-2c24-42ae-b700-2e6404447966	1	\N	Other
+89f01fb9-b6bf-4600-8a6d-8f0479fcb2ff	1	James	Other
+89f0a4bc-8d7e-4128-af87-3dd1cd658471	1	Other	Other
+89f0b11b-925b-428f-9302-e0ea200f0059	1	Other	Other
+89f105c8-a939-42d3-b05f-4e29169dba1d	1	Other	Other
+89f1201a-d520-40f8-a3da-fb5fdd0807b8	1	Other	Other
+89f2003b-6a3d-478c-b563-1fba1288a8e3	1	Other	Other
+89f23400-dd7b-4e63-93db-9faf4f61b371	1	Other	Other
+89f2bcbb-657e-49a5-aba8-266573c7c17f	1	Other	Other
+89f2d286-ac3f-4ca4-9eab-3c2d7fd17f7b	1	Other	Other
+89f2dea4-ee83-45bc-91b9-96180253699e	1	Other	Other
+89f30756-de7f-471c-989f-74796c1e2ecd	1	Other	Other
+89f30d01-3e5f-4659-8260-7a87e27def79	1	Other	Other
+89f32c20-a54b-42ed-a8aa-b62c8cea5b1e	1	Other	Other
+89f32cfa-c41a-46f2-bee0-958bd888741d	1	Other	Other
+89f3379e-dc47-46c6-8c2f-c387d9427395	1	Other	Other
+89f36de5-8c4e-4687-88af-a54067e52f2e	1	Other	Other
+89f3a9ac-dd8f-43f2-b015-25b9a064343a	1	Other	Other
+89f3e0f0-05a2-4f40-92fd-11fc87f2f6fe	1	Other	Other
+89f448d8-75ea-493e-819d-1723ed9a8228	1	Other	Other
+89f4614a-cb32-4795-99af-35f9299d457f	1	Other	Other
+89f476a5-9b08-4fc3-9fab-8742dcfe0e40	1	Other	Other
+89f4d7ee-fd85-4826-8ca8-e919fe39954f	1	Other	Other
+89f4ea69-fbdf-47c8-8160-b0e70551099b	1	Other	Other
+89f5257a-b329-499e-b9fb-ce015daf07e9	1	Other	Other
+89f526ea-2601-4d33-bcdf-d9020c2473e7	1	Other	Other
+89f52eb4-e680-40db-a13a-21a3020d92ad	1	\N	Other
+89f53a20-abf5-445e-af0d-acd564889cb8	1	Other	Other
+89f5b6e7-1235-48cc-93ee-28855d575a01	1	James	Other
+89f5eb55-bbed-4bcb-8c49-66e90c868ba1	1	Other	Other
+89f61e53-8113-4431-8789-d5e166e21f6a	1	Other	Other
+89f62e80-2fbb-486c-a215-7b21416f37ed	1	Other	Other
+89f69261-e373-44f7-ab38-df70b4bef937	1	Other	Other
+89f6a42f-f148-4369-9025-03a047066a8f	1	Other	Other
+89f6f9a0-ce8a-4285-8923-a9c567358978	1	Other	Other
+89f73d70-1628-4ee5-ae8c-8835d277370c	1	Other	Other
+89f7cc1e-78b1-4aad-b705-88efd59aefbd	1	Other	Other
+89f7e5ff-08d0-4a8a-b31e-e7785e4bd6d9	1	Other	Other
+89f80b2f-ae83-4442-8c9d-adb364694fed	1	Other	Other
+89f816e8-e084-4058-a123-7112cd3ae85f	1	Other	Other
+89f81ba5-ae66-4b26-8a7f-89f12ddb32fb	1	Other	Other
+89f84225-0255-4f66-aef4-1a1a14c859cf	1	Other	Other
+89f85087-2035-4fbb-8e58-24baebc7d8f8	1	Other	Other
+89f85478-2ba9-4daa-b368-19c454ee377c	1	Other	Other
+89f8ac6d-ace7-42d3-8065-e4037960bb70	1	Other	Other
+89f8cc30-552d-4b5e-8d6c-52f2aaf8f346	1	Other	Other
+89f9148c-4625-459a-a514-163a10be1803	1	Other	Other
+89f92869-d416-4afd-9b1e-a741b860accf	1	Other	Other
+89f94d10-9e4d-4990-b4cc-e84faecb7adf	1	Other	Other
+89f94ec2-d82f-4aef-a90a-faa7de22201e	1	Other	Other
+89f97e2a-af85-4511-9332-7ed090f0b735	1	Other	Other
+89f98cdf-cdc1-4cc5-a8af-4728fb5b371f	1	Other	Other
+89f99edf-95f6-442a-8a2e-b4dd91e89e74	1	Other	Other
+89f9b3a3-d941-421d-b05f-632e2b6af000	1	Other	Other
+89f9b596-1133-4038-b757-1b2ac3bbd3a8	1	Other	Other
+89f9ceef-8391-4ce7-b42b-92f24607a86d	1	Other	Other
+89fa1d89-892d-47a7-a80d-3caf11272c55	1	James	Other
+89fa5c32-ff12-497f-b005-f1c4d17959cd	1	Other	Other
+89fa88a5-cd27-4c8c-acaf-4c03393900d7	1	Other	Other
+89faa865-e2fb-400b-a573-112883be3361	1	Other	Other
+89fab824-2129-4dd1-b6ed-012f2d2df6fc	1	Other	Other
+89fb0e6b-2ded-45e6-bed6-379fa4c34df9	1	Other	Other
+89fb2e9d-832f-4563-9bfa-ec8d1ec334b9	1	Other	Other
+89fb7cd0-dc68-4df6-9706-c1f20b291e0e	1	Other	Other
+89fb9830-63f4-4d06-88ec-c21a96c6733f	1	Other	Other
+89fb9e71-33f8-49c4-bd88-a65eaddb488f	1	Other	Other
+89fbbf08-8d30-4238-864b-646e52b03a5b	1	Other	Other
+89fbebaa-18f1-4387-a368-371b9ccacde4	1	Other	Other
+89fc2c37-06ff-45ae-b5d8-7ea76be2706a	1	Other	Other
+89fc4862-e1d3-432b-9373-f307d34d1865	1	Other	Other
+89fc5a96-207b-4086-91ba-c06cdc6ab4f5	1	\N	Other
+89fc60ef-f2d9-47eb-bf87-1036adf5b6fa	1	Other	Other
+89fc71d7-2c59-44e3-86b6-90ed1b5e3611	1	Other	Other
+89fc8207-ae41-4fa8-9f42-aa3eb930a143	1	Other	Other
+89fcc52d-8a6a-42c9-afc4-257cb7a4342f	1	Other	Other
+89fcea40-7d48-4b64-b46c-52f23b53b31d	1	Other	Other
+89fcec3d-82dc-4524-a14f-55a90760f2ef	1	Other	Other
+89fcf885-a149-4453-b429-a83b9fed86ae	1	Other	Other
+89fd4323-f504-4809-bfcb-35f2523ca1c7	1	Other	Other
+89fd46c6-5ed3-48ca-a3bf-1900cbedf64b	1	Other	Other
+89fd4e88-ca9e-4d0e-87f8-73e3a822bb11	1	Other	Other
+89fd71f0-7540-4f26-9a53-602aee1e5faf	1	Other	Other
+89fd999a-e6c8-48b3-b41f-5e8c721a6865	1	Other	Other
+89fdacba-acd7-47a1-a8ea-04032e4654aa	1	James	Other
+89fdbaa0-6d0c-4808-bedb-c456b7c4ee4b	1	Other	Other
+89fdc6d5-7fc0-4643-b5bb-742e407ab257	1	Other	Other
+89fdcc29-c9fe-482c-93fd-7b57630a8064	1	Other	Other
+89fe0e9b-28a9-4e13-bca9-d890c71591f4	1	Other	Other
+89fe3d32-94a3-455f-a364-d31331161705	1	Other	Other
+89fe431e-a096-4755-849a-473a55bf1260	1	Other	Other
+89fe7889-69d8-49de-8453-db45d0aa88e4	1	Other	Other
+89fe8672-3655-48c4-a1db-fe3b2b2018d1	1	Other	Other
+89fea0ff-302e-443f-a6f5-4825acc4fbbd	1	Other	Other
+89febe01-5408-4cc5-8fa0-10758226015f	1	Other	Other
+89fec4f4-f30b-4628-a2bd-c64db1c02a48	1	Other	Other
+89ff07f0-dfcc-4a41-954c-188835bcbefa	1	\N	Other
+89ff68fd-147f-42c4-9de3-c997015f5b80	1	Other	Other
+8a000566-38f7-4b2d-be82-912f805fbfb0	1	\N	Other
+8a002d45-9e93-42a3-b690-7b23b977fe21	1	Other	Other
+8a004671-7f2b-43ad-bcbc-e43eed380267	1	Other	Other
+8a0046f5-5424-4902-8de3-5c98edd3c907	1	Other	Other
+8a007c35-ed99-4c91-9b9a-d82cef2e4569	1	Other	Other
+8a00f074-d71c-40b8-9a08-8f6da2577743	1	Other	Other
+8a0113d2-62ab-43d1-bfa9-c6ca78c11ea0	1	Other	Other
+8a013ccd-3570-4499-9e67-a24dff0633c3	1	James	Other
+8a014c94-22fe-415e-916c-086b537c0976	1	Other	Other
+8a01785f-77c0-4849-8b56-e7c010199d7e	1	Other	Other
+8a01bbbb-349c-4d80-99f2-a50f1692901a	1	Other	Other
+8a01d6d1-5693-447e-97e9-11186f9c53c3	1	Other	Other
+8a021f81-a8a6-4ead-9370-a6dd475877ea	1	Other	Other
+8a0231a6-803e-4730-a615-fd22eefe98e1	1	Other	Other
+8a025a18-8f78-4dd0-a7cc-2ca4529553c2	1	\N	Other
+8a0264f5-45f1-43ec-9a8d-61a0ea9c20d2	1	Other	Other
+8a028643-4324-4fb4-b66e-6a7f5b358785	1	Other	Other
+8a02adbf-ea64-4b9d-958f-f65e5d55b505	1	Other	Other
+8a02e72a-19cb-4742-883f-dd84dbc907eb	1	Other	Other
+8a03360e-eae1-400e-bada-40006cf01234	1	Other	Other
+8a036299-b671-42dd-8ac8-4fb0056301c9	1	Other	Other
+8a03f826-bb9d-46c0-8933-992ae98c1b0b	1	Other	Other
+8a03f902-1d19-4476-aa3a-9c33637a35ab	1	Other	Other
+8a043028-f2be-467a-bd7b-78531addc97d	1	Other	Other
+8a043fc9-1590-4372-8df2-a0ee58380233	1	Other	Other
+8a045b8f-cfbf-484e-a671-aa07afe1a2ab	1	Other	Other
+8a047e1f-18ee-47a2-abcc-87344b466732	1	Other	Other
+8a04b43d-4b52-4be8-b67e-803b4004aa2a	1	Other	Other
+8a04e071-05bf-4cff-8e9e-23265de7d02c	1	Other	Other
+8a04e7c1-1836-40e1-9773-2e9708c1970e	1	Other	Other
+8a05193c-be5f-458f-bff9-102e874317ca	1	Other	Other
+8a051bd1-aa7a-4be6-ae1e-c5990b4e7f69	1	Other	Other
+8a052542-8551-4ac8-85a4-1d6a084cc895	1	Other	Other
+8a059f99-bb98-48f4-9686-c337f3416e6f	1	Other	Other
+8a061f3a-29ff-48fd-8e83-544fbbafa21c	1	Other	Other
+8a06551f-2937-4049-8da1-73dc5c741470	1	Other	Other
+8a06a2b2-ac31-49e8-9752-c32d6ce9108c	1	Other	Other
+8a06be1f-e344-40f9-a617-ee15ac9b3897	1	Other	Other
+8a06c7d3-9831-4859-99d8-a0cf44308cdf	1	Other	Other
+8a06f823-820f-40b5-b8e1-40ab0b6d9d2e	1	Other	Other
+8a070acb-0898-407d-a45f-19a9d00cc265	1	Other	Other
+8a0717c5-cebf-4966-a1f8-77ec727fe23a	1	Other	Other
+8a07288e-b62a-4cab-b6ec-dcb54cb7a249	1	Other	Other
+8a0747a9-79bf-4c86-b907-30fa80c19fd5	1	Other	Other
+8a076031-c8de-4b50-9745-56ac04f1a5cb	1	Other	Other
+8a078b94-ca2a-48c0-a515-55969d5ee86a	1	Other	Other
+8a07ca12-2751-43ff-9144-01fab498c4c4	1	Other	Other
+8a07d4a2-5d89-46a7-b156-879f92f70e4d	1	Other	Other
+8a07e836-35de-425b-ba12-785a1cd23941	1	Other	Other
+8a089495-7191-4b8a-9234-1d87b7a2d8cd	1	Other	Other
+8a08e7c0-a544-4fa8-b98d-fe73f65352d5	1	Other	Other
+8a091cdb-1417-452d-8a7d-74de135ea7f2	1	Other	Other
+8a0983d4-c7b7-4cf2-8900-b3094e7d6c9b	1	Other	Other
+8a0995c8-dc38-4fe3-adec-ad6fb991e1a4	1	Other	Other
+8a09a0ac-38f5-40cb-b670-2b3997ce210c	1	Other	Other
+8a09edef-0bb1-4843-8459-3d321817493c	1	Other	Other
+8a0a10ec-ff78-4ca4-b9f9-f0b808e52a8c	1	Other	Other
+8a0a8b2c-56b4-4a3a-a3f1-d904c3c72380	1	Other	Other
+8a0a9fc6-acfe-4452-8185-0601954c92e7	1	Other	Other
+8a0abec0-57c5-44cd-8957-9ff1cb231bab	1	Other	Other
+8a0af0c1-d2a7-4f69-b989-c0e0c37b8509	1	Other	Other
+8a0b326a-c048-4453-ac1f-c7f3b4f822f1	1	Other	Other
+8a0b5140-d549-4a1c-8633-d9b6a915a605	1	Other	Other
+8a0b67a8-7e2e-4806-a72c-4bbe8eee4313	1	Other	Other
+8a0b7045-7950-4685-a220-b9679b75b1fb	1	Other	Other
+8a0b8dc3-6362-448f-8999-2e1ea8fd0c7b	1	Other	Other
+8a0bce1e-fb03-4b0e-9e16-8dc3af51ad11	1	Other	Other
+8a0bd7ab-21bf-48b5-9a36-02a485f635ce	1	Other	Other
+8a0c0a6d-2a04-4208-87ad-10500f2cdad6	1	Other	Other
+8a0c286b-9911-40f9-bd36-dafe6ed999c9	1	Other	Other
+8a0c312b-d06d-4e9b-9243-2457284637ea	1	Other	Other
+8a0cc115-85d5-47c5-843e-90234a769f08	1	\N	Other
+8a0cc2b3-b044-4105-af1c-c95c54d8496f	1	Other	Other
+8a0d2a69-36ca-4c71-aa3d-fa8d308fcc31	1	Other	Other
+8a0d3811-97bb-4497-9473-6e8d6216d934	1	Other	Other
+8a0daca1-f3d7-4968-a41b-be82a810dcc6	1	\N	Other
+8a0df7e1-9b1b-4fdd-b7a4-4cd04b280d9d	1	Other	Other
+8a0df7e9-ee8b-462e-8186-7d031e0d7f5b	1	Other	Other
+8a0e74cf-ccfe-4d4c-96fa-412bda6a9c52	1	Other	Other
+8a0eaca6-2600-4a83-a583-f81a7ce74a58	1	Other	Other
+8a0ecba6-b638-4923-8e31-c7256ee2685d	1	Other	Other
+8a0f0885-034e-4988-94d3-59e5b1a4d355	1	Other	Other
+8a0f1e59-8968-43c2-9c6c-1b40b0b2fc76	1	Other	Other
+8a0f5367-bb3b-40fc-ac7e-d525189add0a	1	Other	Other
+8a0f8bf9-382c-4081-bbed-0e89412ed86c	1	Other	Other
+8a0fcf6b-246c-451f-931d-640a4b07e769	1	Other	Other
+8a0fe1e2-c8b5-4b62-883c-294cb96090c4	1	Other	Other
+8a103df1-37f0-4910-9596-9078eeb56271	1	Other	Other
+8a103fe1-d6c5-405e-a550-8833403b0d32	1	Other	Other
+8a105119-868f-4473-a500-bd420de9f78a	1	Other	Other
+8a112e76-c176-41e0-9630-42b61fd65274	1	Other	Other
+8a11341b-dd86-4ae4-a177-ac7496ea045d	1	Other	Other
+8a1134f8-2f81-4ed8-b26b-a65c21718bf3	1	Other	Other
+8a114728-10e3-464b-bbf7-805f8d030796	1	Other	Other
+8a11517b-0467-4922-ae20-7e0e6b35980e	1	James	Other
+8a115baf-65ef-46e4-b787-c5ad09016107	1	Other	Other
+8a115f0e-5330-4754-bd56-17f3265303ce	1	Other	Other
+8a117843-f7ba-45ea-89c3-72719470b1f2	1	Other	Other
+8a117f5c-9541-41af-a54e-415452e495be	1	Other	Other
+8a11b268-7dda-4203-baf6-be39be6ce6de	1	Other	Other
+8a123142-34d1-4899-a44d-f4b14ce1a479	1	Other	Other
+8a123847-4ba7-44da-bca7-519d53f8651f	1	Other	Other
+8a1248f9-d436-4d99-b536-cc61403e89e7	1	Other	Other
+8a1271c7-220c-43de-bd6f-505dc2aa40bc	1	Other	Other
+8a129408-fe96-4471-9f17-80f3cc2e024e	1	Other	Other
+8a12b03e-ad35-4b25-9b2d-1c6fc5f4f056	1	Other	Other
+8a12b16a-4b40-4e61-9ad2-36affb67699f	1	Other	Other
+8a12f6fd-c3f0-4389-9046-6e1bc4f863e2	1	Other	Other
+8a130ab0-efd4-4c11-b738-fda9af2c8627	1	Other	Other
+8a131968-42a3-44d8-972d-626a9e29cc86	1	Other	Other
+8a13781a-d7c9-468b-bf9c-8ac4ffe59a2b	1	Other	Other
+8a13cd36-452c-4e10-ae5b-7c3ccb79d8e7	1	Other	Other
+8a13dc17-bf6c-42e1-9fdf-ee867eead0af	1	Other	Other
+8a13f057-f59e-4a12-82a7-2e21f2e7c733	1	James	Other
+8a13f091-0890-4ed8-a9ee-e3c0db4d285e	1	Other	Other
+8a149f7b-a847-483d-adaf-22d0b34335f4	1	Other	Other
+8a14d184-8c78-4944-92b6-33f88761509b	1	Other	Other
+8a153dfb-c9cc-47f8-b394-2433de1946f1	1	Other	Other
+8a157386-f4b1-40d1-aa54-368441dc5a88	1	Other	Other
+8a15a616-a3c4-4aa5-adb3-1810547ae026	1	Other	Other
+8a15c648-1cf1-4e35-b326-668cdd17526c	1	\N	Other
+8a160839-b919-40f5-92a0-f9f1523b5eaa	1	Other	Other
+8a16105f-c2cd-4722-b9d9-b379b7960413	1	Other	Other
+8a163bac-98f0-486a-b5b5-4d2b037bfaae	1	Other	Other
+8a16484f-d1d7-4e52-9a4c-04c3d6d13507	1	Other	Other
+8a165ce5-fffa-406a-9c36-3768d1b100fc	1	Other	Other
+8a167b6c-d732-4279-8185-ff0eac92e912	1	\N	Other
+8a16808d-249e-4621-975b-eec5869e490f	1	Other	Other
+8a16f526-2aa2-4fd9-9e57-40da8df47d4f	1	Other	Other
+8a16f84c-ec70-499f-ad7f-3c1ddbd0db80	1	Other	Other
+8a170911-3f69-4a31-abca-ee1df1ba9862	1	Other	Other
+8a171dee-1a6b-4e91-8e09-6a078b025f67	1	Other	Other
+8a173ec0-6590-456a-b2a8-4e04943db10b	1	Other	Other
+8a176576-5a80-444e-81b8-836ea54f10a3	1	Other	Other
+8a1794f5-a55a-40fa-8afc-2bf3a129582f	1	Other	Other
+8a17cddf-96cf-490a-adbf-c016e0da475c	1	Other	Other
+8a183956-bc9a-4d4b-9339-8eb20b5eea9b	1	Other	Other
+8a187e43-94b8-4cd6-bd38-8b9ffacf8def	1	Other	Other
+8a188e1f-ca95-4cfe-955e-1db250ed1010	1	Other	Other
+8a18cf67-6874-48af-95c9-48c5e587d928	1	James	Other
+8a19149c-2064-4c9b-a851-7b4a807a93de	1	Other	Other
+8a192e99-f4f8-4a78-a8a3-871856361ee3	1	\N	Other
+8a1996ff-876a-4c68-9bbd-035e20b1c722	1	Other	Other
+8a19d187-111c-4a49-8868-cf094ad78aae	1	Other	Other
+8a19d3ca-59b6-40cd-b590-2028f0ba4848	1	Other	Other
+8a19fd7b-e4c3-4ba6-b7dc-02a9d977372d	1	Other	Other
+8a1a6c3d-f239-4cfd-8bc1-558221f4c632	1	Other	Other
+8a1a993a-38f2-4a49-847c-7eb821d94ce8	1	Other	Other
+8a1aa9e6-c3fb-49a7-9641-aad18cb7993c	1	\N	Other
+8a1aaa19-b6e4-4251-b98f-e0d446d5de15	1	Other	Other
+8a1ac9d4-6d58-453c-8ffa-24b249ffc5d8	1	Other	Other
+8a1af01a-b6e6-4bfd-93a2-05f789be47b6	1	Other	Other
+8a1b319c-506c-437a-a990-7f211c00c7cf	1	Other	Other
+8a1b6aab-27b4-4a9c-a5e3-9faddd0fc7bf	1	Other	Other
+8a1c3517-1b61-47f4-8a14-33d6e736db8d	1	Other	Other
+8a1c4c71-154b-4600-a98e-9cf621a1fd2d	1	Other	Other
+8a1c4f58-886a-401c-84d6-e02081276329	1	Other	Other
+8a1c7cfc-ef12-472f-82a4-0419d8476149	1	Other	Other
+8a1cd381-8812-4fa6-b3e0-e85cb7646047	1	Other	Other
+8a1d50ba-0296-4050-b29d-8c8fe70d3070	1	Other	Other
+8a1d5d32-7469-41f0-a41d-6bcdcb31a0b6	1	Other	Other
+8a1e3adf-c829-49f0-b4ec-ccdf1a15f843	1	Other	Other
+8a1e4843-67a8-4b4e-aebf-064e4120e294	1	Other	Other
+8a1e8961-74f3-4bde-9d8f-56a5cf5c2343	1	Other	Other
+8a1ea2f4-83cc-4e11-9258-4c91df40bf59	1	\N	Other
+8a1ea83a-51cb-48a8-9ff9-4b13db7bc69f	1	Other	Other
+8a1f0ac8-492c-4187-8133-95a4c981f411	1	Other	Other
+8a1f35b7-3008-4885-b7b9-6e404fede3c9	1	Other	Other
+8a1f668e-95bd-4a99-ac18-24fe9110508a	1	Other	Other
+8a1fa7c8-bbc8-46b8-b10e-030048f954b2	1	Other	Other
+8a1fc917-6207-42f6-afb2-473b2d72b465	1	Other	Other
+8a201b97-a320-4c04-89cc-b93f87491177	1	Other	Other
+8a2021e5-7f53-462e-be35-5cac60e10826	1	Other	Other
+8a20553b-ef92-42e7-bf8f-4877d42bb81a	1	Other	Other
+8a20668c-3e03-4a4a-8df4-82ab3945e62d	1	Other	Other
+8a20e1c4-e85d-497e-8e4d-5b1ff4036c1b	1	Other	Other
+8a2124c8-b25a-4fc2-bc3e-ca8ae78f4f9c	1	Other	Other
+8a2183dd-2a85-42ab-8601-039f7c371986	1	Other	Other
+8a2196de-4510-442e-9669-ad07fe665b36	1	Other	Other
+8a21b04e-cb63-41e1-959c-008325ccb914	1	Other	Other
+8a21c374-5ff0-447a-845c-d9cb91ad72f4	1	Other	Other
+8a21e0e7-8c24-47fa-b90c-cf1f164751b5	1	Other	Other
+8a22212a-08d5-4c03-bd22-86441f622f24	1	Other	Other
+8a222344-39bd-4def-b031-6838d001fcce	1	Other	Other
+8a226bd1-9cfc-4ea6-8ca8-1519e6a6d039	1	James	Other
+8a227325-ea67-46ab-b50d-187c529fa49f	1	Other	Other
+8a227de8-723f-4cbc-a214-932e92260118	1	Other	Other
+8a22da6e-0b88-11e8-a93d-fa163e8624cc	1	\N	Other
+8a23e64a-f721-49c7-9524-ed147885e036	1	Other	Other
+8a242ac1-eec4-4453-9e39-634be4e6383b	1	Other	Other
+8a243ef0-6694-43db-b74e-ef48151215e5	1	Other	Other
+8a24430d-1d81-4b21-95bf-25f18cb956a8	1	Other	Other
+8a244dd2-049f-4bcb-b233-05f38f04b650	1	Other	Other
+8a244f12-7785-45a8-bf9a-045f5e61cd58	1	Other	Other
+8a24509e-bb73-4a89-a021-23ac08a127bb	1	Other	Other
+8a247791-1ec3-435b-aba8-cfbb091f2661	1	Other	Other
+8a247f55-f92d-47ad-bf5a-c1ffce54583d	1	Other	Other
+8a24cf6f-87db-43bc-b82d-c14b464d35ef	1	Other	Other
+8a24faa0-61a0-4a49-870e-8d5c61e631db	1	Other	Other
+8a2518f8-c5ff-4207-a507-84f3d1c16034	1	Other	Other
+8a25f82f-e4ed-44c6-a9da-18d4e74ba50a	1	Other	Other
+8a2622b2-3bf1-4d0a-a0ae-7c99b34b4647	1	Other	Other
+8a26345a-9cfe-4563-bdfe-debcd0dd69a7	1	Other	Other
+8a26398f-a4e6-4768-853f-08f4b7bc95a5	1	Other	Other
+8a26901d-b36c-4c08-9cbb-882e8d36ee67	1	Other	Other
+8a269254-6476-41e7-b861-fb98f8ec6dfe	1	Other	Other
+8a269f73-6635-4f71-9a2e-2959f842a0c0	1	Other	Other
+8a26a7c8-f3bf-4491-b720-104c76e21094	1	Other	Other
+8a26d44f-4c9a-4017-9bd9-c030f6f590ca	1	Other	Other
+8a26de5c-8c57-4767-920c-40d7a146eb40	1	\N	Other
+8a270eff-3b18-4ee1-b0c8-2c1b37c348d7	1	Other	Other
+8a277193-8100-4191-a7c6-3b24ebc54d86	1	Other	Other
+8a277852-2a7c-4271-872e-36984b30d00d	1	Other	Other
+8a278d47-034c-4479-9cc0-360ddb4f3850	1	Other	Other
+8a278f07-1601-4198-b8f0-00202f510224	1	Other	Other
+8a27f87c-48ec-40df-8a16-91c8e85fcba1	1	Other	Other
+8a27fbfd-c0ad-49c1-935a-51345800db5b	1	Other	Other
+8a285d35-c674-48e3-803c-8922b4991406	1	Other	Other
+8a2869d0-f7c8-457e-aa68-26e9be1b1893	1	Other	Other
+8a293624-5467-44f9-98db-612316b9e4c7	1	Other	Other
+8a294c9f-6c09-4378-9598-290302cd6d44	1	Other	Other
+8a296914-b6a3-4fac-b285-473f73b14e38	1	Other	Other
+8a29b0ab-dfbe-4ad2-bb05-90f773af28e4	1	Other	Other
+8a29b7d4-24bf-4f35-896f-35a558615166	1	Other	Other
+8a29fad0-18dc-4a1a-aaed-35a0409701aa	1	Other	Other
+8a2a1f10-087e-4719-911a-b80e76138dec	1	Other	Other
+8a2a1fff-c5aa-48f8-a287-eb62df810fe7	1	Other	Other
+8a2a27b6-8040-427e-9b52-594f256f922c	1	Other	Other
+8a2a39d3-8135-4fa7-b928-7fdd66a2eca7	1	\N	Other
+8a2ae580-716c-445b-9888-fd852dbf5a57	1	Other	Other
+8a2b3763-eecc-4998-a5fd-c8d2cb192756	1	Other	Other
+8a2bf77b-cb9e-4128-846c-c4530304a0f0	1	Other	Other
+8a2c0a91-a7f0-4efe-9e0e-c72eeebdc1dd	1	Other	Other
+8a2c21a2-8bef-441b-9ea2-5eb5668db8e0	1	Other	Other
+8a2c3884-d837-4d47-9c51-894724587415	1	Other	Other
+8a2c3b09-7e84-469f-bb0b-6f061beb75bc	1	Other	Other
+8a2c677c-7629-4f3b-8308-4fb6590d9bab	1	Other	Other
+8a2c8d72-8c04-4af6-b92b-c39f6844a646	1	\N	Other
+8a2cb055-093c-4695-9eb9-902834d33a2a	1	Other	Other
+8a2cd005-c39a-452d-8a96-b86d7954e334	1	Other	Other
+8a2ce10d-ca2b-4a4b-af82-3ae3472b7d36	1	Other	Other
+8a2cef22-777d-487d-8c8f-ec8d291c90c6	1	Other	Other
+8a2d15a0-4919-4fe2-9d6b-d44b1abd172c	1	Other	Other
+8a2d44f8-36a6-44c6-8ff0-95d84e3e0283	1	Other	Other
+8a2d588c-8f56-4b9d-a113-2a65ca14e49a	1	Other	Other
+8a2d5fe4-57ef-416f-be70-320577480852	1	Other	Other
+8a2da743-252f-4f17-8edb-d392eed3aa18	1	Other	Other
+8a2e06c1-5c81-48c6-a6b1-f986f33b9b21	1	Other	Other
+8a2e0aef-6739-499a-8de5-02d1ca556e1e	1	Other	Other
+8a2e2f22-80d6-4a64-a772-8079e7c6aeee	1	Other	Other
+8a2e4652-bb9e-4468-b3bd-5bf60a9c15c8	1	Other	Other
+8a2e9372-3ab3-4df3-8a51-252ff168286b	1	Other	Other
+8a2ea2b4-0119-42f0-ab97-2b5c1c7c1394	1	Other	Other
+8a2ea8c2-24f5-469e-990b-8f51b55d2531	1	Other	Other
+8a2edc09-e230-4ffb-b7d6-2be4dcbb0f1d	1	\N	Other
+8a2efec9-c398-41c4-ad59-04118ac546ac	1	Other	Other
+8a2f2c1e-052d-4a55-8407-1b29053fe16b	1	Other	Other
+8a2f3619-f8b8-474e-b080-f2f39c5ffa9e	1	Other	Other
+8a2f6a74-627d-4ab6-baf4-d8612b9c1351	1	Other	Other
+8a2f88fb-d222-4a65-8d10-33587d3f5551	1	Other	Other
+8a2f904a-9538-11e7-8bb7-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8a2fa7be-c27f-4789-9a0b-22dda6bbc965	1	Other	Other
+8a2ff733-8b41-4587-b968-97e81a792789	1	Other	Other
+8a2ffe1e-902b-494c-9357-e8cc00508394	1	Other	Other
+8a3003d6-2f1d-4d97-8a77-d75829bc42b0	1	Other	Other
+8a302e2f-c289-41c5-b3d0-1c04d32f8fe1	1	Other	Other
+8a305fff-4418-45cb-bb8f-7083b0b347cc	1	Other	Other
+8a3063e9-0c8c-43ba-ae51-90c5472db591	1	Other	Other
+8a3087ef-50a0-4c15-bcbf-a0ba1e51e7a0	1	Other	Other
+8a308afb-1efb-43e6-8171-7937312039a2	1	Other	Other
+8a308da6-7934-4ee6-ae96-177b5712b7af	1	Other	Other
+8a308dd7-1198-4677-b3e6-0e6b38f1e920	1	Other	Other
+8a30905b-840d-403b-b624-b2d94cff6972	1	Other	Other
+8a309612-8702-4bbd-88da-c169c02e2eba	1	Other	Other
+8a30a550-dc1f-4e0b-b254-d65097f5a91d	1	Other	Other
+8a30c2e1-f0bb-4d8b-8cca-934d8d537a52	1	Other	Other
+8a30fa59-c1e2-4b80-89c4-997434bafc7c	1	Other	Other
+8a31067c-d425-4b4e-8ce7-f27a065f1a99	1	Other	Other
+8a31476f-ec90-40bf-8e16-8e6d1c4c08e8	1	Other	Other
+8a316054-f351-4eaf-b6d4-14d5903accaa	1	James	Other
+8a321d02-db31-4fde-b13c-85fce5966de8	1	Other	Other
+8a323b4c-e85a-4ccd-a695-bd35ca311a3f	1	Other	Other
+8a325c5b-0bc8-4b9c-954c-5189618adec8	1	Other	Other
+8a328621-e855-4c6e-a877-7937b3d80b05	1	Other	Other
+8a32aece-0533-46c6-8849-6640ae25629a	1	Other	Other
+8a32bf3c-88d6-49e2-b35f-19f89ca0c450	1	Other	Other
+8a32f2ec-a99b-412c-915a-4bf45c8eb892	1	Other	Other
+8a330a25-2d11-42b0-8003-9f8793ab4d4b	1	Other	Other
+8a331f8e-ef93-4b26-a848-83e105f3d1d8	1	Other	Other
+8a332fe8-2083-4668-95ff-0b1e4e6593d4	1	Other	Other
+8a334afb-b9b9-43e9-8bd3-75119b752547	1	Other	Other
+8a3363a2-4ebe-4e43-bf5d-885fa451a4df	1	Other	Other
+8a342a4d-49c8-449b-89d8-92f71561db4c	1	Other	Other
+8a34625b-77a1-491e-9940-890657069703	1	Other	Other
+8a349c19-0837-4984-b561-70e00c28457e	1	Other	Other
+8a34ade0-d0f1-48aa-bfff-2a38993b0176	1	Other	Other
+8a34af21-672a-4734-a71c-dc31b35c0b20	1	Other	Other
+8a34f2c6-9221-4b82-91f2-d1d84dabcda3	1	Other	Other
+8a34f50f-0b76-4047-816f-466c22754efd	1	Other	Other
+8a34f7e8-4ac8-4a2e-8d0d-d588efd0b474	1	Other	Other
+8a355514-38cb-4c43-8e66-e8a0ceb34d39	1	Other	Other
+8a356eab-acd2-4ed3-b0d3-8f9c863673e7	1	Other	Other
+8a357bd8-e39c-49e7-8515-3516e899faeb	1	Other	Other
+8a35d4f8-e546-4e99-a78b-cda428641ab1	1	Other	Other
+8a35ecf9-5f0b-4a4c-bf7b-b13663b19cd6	1	Other	Other
+8a35f5cf-3a68-41ef-aac7-425995fe1a4a	1	Other	Other
+8a35ffa3-cbb6-4de3-86ef-3ee7163e9acd	1	Other	Other
+8a363c43-2349-4e71-afc4-b7116d7cb133	1	Other	Other
+8a366ed3-d9c6-42b4-aa4f-d406ab30cc04	1	Other	Other
+8a3677ee-8150-46de-abc3-766eaa8c6379	1	Other	Other
+8a36a557-2232-4c4e-853b-7d9e71b99f40	1	Other	Other
+8a36bad1-0c86-4c08-978b-711e2b73827c	1	\N	Other
+8a37187c-f2ff-4616-aaea-225689f9916a	1	Other	Other
+8a3728a9-2c6b-4216-b785-c417fa598dc4	1	Other	Other
+8a372a23-c51e-43fd-b4d0-ba38c4694b11	1	Other	Other
+8a376cb1-fec7-4258-95b6-7785d6426b63	1	\N	Other
+8a3778dd-1384-42cb-b40d-cca99d0c95a1	1	Other	Other
+8a378d47-8570-45f5-9f9d-b52d687ddb19	1	Other	Other
+8a379480-7f59-48e7-af72-e72de1402d2e	1	Other	Other
+8a3794d1-9869-40f5-af43-2b3299f6fbfd	1	Other	Other
+8a37a11a-0452-4c2a-bb3f-fa2a8a1c7d86	1	Other	Other
+8a3802c1-724b-467d-8b9a-65c2439f195e	1	Other	Other
+8a386e1f-7860-42e7-8938-c0f208a0d4ee	1	Other	Other
+8a3870cf-4d9e-49fc-9086-e73f3f30ce3f	1	Other	Other
+8a387a79-ee4c-4f3c-83ba-fa76c018ef4e	1	Other	Other
+8a388942-00b6-45a2-b392-226d9a64c17f	1	Other	Other
+8a38e5af-5070-487f-8c90-a8bd0d8799fd	1	Other	Other
+8a38e5e1-4e72-42ce-89f7-63e55b473ad9	1	Other	Other
+8a395415-2adf-473b-aaca-c9fe7a22074e	1	Other	Other
+8a3965fd-e6f7-44cb-9c3a-7ca363349483	1	Other	Other
+8a39e4e6-de5b-49c1-917c-c7f7081ccf2b	1	Other	Other
+8a39ed87-732a-48b8-b00a-deae716c1702	1	Other	Other
+8a39ee1d-31b0-4e49-b76d-af8ae3dbae60	1	Other	Other
+8a39f1be-36e0-46c0-a316-17d6c251fd3c	1	Other	Other
+8a39f827-d431-4cca-b8f5-8070ee413b66	1	Other	Other
+8a3a0352-ef93-4481-8c08-042d7ba7a9cc	1	Other	Other
+8a3a066d-8465-414b-818e-37973cc9cf03	1	Other	Other
+8a3a1095-685c-43ff-8b05-81765aa7733e	1	Other	Other
+8a3b054b-9a56-45e1-8751-e6c602941b07	1	Other	Other
+8a3b0d5d-7a32-497f-a8b1-2d992036dad9	1	James	Other
+8a3b56b4-c64d-40fd-a775-4134bf13c338	1	Other	Other
+8a3bc806-27a1-4205-b354-dd4287b55e13	1	Other	Other
+8a3bcaa5-8118-4bc0-a74c-66dc7dc10a51	1	Other	Other
+8a3bd6cf-516a-442c-a252-71fafba9b3b5	1	Other	Other
+8a3bdd89-af8e-4109-acac-c7d89a63e90f	1	Other	Other
+8a3c6374-9e73-4840-9b8a-32a673f144e5	1	Other	Other
+8a3c799c-cb05-4c48-9a12-d7a63ac125bf	1	Other	Other
+8a3d041d-a1eb-413b-9664-b974cb5b7420	1	Other	Other
+8a3d19be-e591-479d-9ba3-dfce11ff260c	1	Other	Other
+8a3d3a3c-76b2-48e7-9968-42d0bdf2a94b	1	Other	Other
+8a3d5b63-b3ae-4e6c-b660-5d16145e1a12	1	Other	Other
+8a3d61ac-0a14-4cbb-95dd-ab270f7d8479	1	Other	Other
+8a3d6a47-d822-4aca-a0c9-6753f7483f6f	1	Other	Other
+8a3dbc11-cd22-44de-aaee-31db90cffe90	1	\N	Other
+8a3e360c-8ff9-4716-bb27-01cd9ae97768	1	Other	Other
+8a3e6549-a3e3-4226-a35a-21c74e5d92ae	1	Other	Other
+8a3eabfa-c05e-48a7-8819-ff6118825700	1	Other	Other
+8a3ec460-6f58-4193-a6e2-81c363c070f5	1	Other	Other
+8a3f014f-2e54-4324-9912-5b796aa5d1a4	1	Other	Other
+8a3f3ebd-d7df-4680-8745-e003fc88b534	1	Other	Other
+8a3f5525-4426-46ab-ba48-b6191c507e78	1	Other	Other
+8a3f6f10-8928-4e37-ad28-ce3aa1c120b8	1	Other	Other
+8a3ff94d-bfe3-4cd8-af11-46e80269c8cd	1	Other	Other
+8a401fe3-b8bf-4915-a499-6d94f5eb841d	1	Other	Other
+8a4049dd-4bf8-4201-bbf3-3f2e0a6965c1	1	Other	Other
+8a4059db-856c-4bd3-ac3a-fe38c6a9632f	1	Other	Other
+8a406e4e-07a8-43cf-b3d4-13c9f8dcfd1e	1	Other	Other
+8a4071db-3c11-4818-83c5-145e206a0082	1	\N	Other
+8a4074e3-6727-401e-b3a4-e59e0d60ac14	1	Other	Other
+8a40e466-b1b6-4559-884e-fff30d948558	1	Other	Other
+8a41093e-346a-40f8-b57d-c1002eb9f3ed	1	Other	Other
+8a416940-f0de-47ec-a4d8-f483d507a86f	1	Other	Other
+8a419bf1-9547-45b9-991b-cb6f22edaaca	1	Other	Other
+8a419ca7-c5a1-4b24-8fd5-1b6bff021ed1	1	Other	Other
+8a420098-00f8-400d-be07-7b129b0d35d8	1	Other	Other
+8a424232-b235-4a6d-835c-2b9817874b25	1	Other	Other
+8a426762-652a-474f-810d-f5960b4ade99	1	Other	Other
+8a42abc2-1081-446c-a305-c1626bdf7156	1	Other	Other
+8a42bb59-e3f7-4da6-bb1d-08881665b7d0	1	Other	Other
+8a42c7a3-5f2c-4473-9668-d3a3b9b97c31	1	Other	Other
+8a4306b4-652e-4215-8c4c-27690e4c9962	1	Other	Other
+8a434121-acb7-47bb-a80f-8729853f21b7	1	Other	Other
+8a434474-f43e-47ea-8609-c7d9910b7740	1	Other	Other
+8a436259-e473-47a8-9654-496007453bbf	1	Other	Other
+8a438906-10e3-44a2-af9e-81efa5e1abdf	1	Other	Other
+8a43ae6c-8f92-4ed3-bee9-eee53f448607	1	Other	Other
+8a43b424-7117-4c09-b1fb-b525928af66d	1	Other	Other
+8a43b50d-74c5-48d6-987e-0d46d81e255e	1	Other	Other
+8a43e506-95a0-4df1-9af5-23fb2a645274	1	Other	Other
+8a441ddd-41c7-45c1-bf12-cb79f6c81f73	1	Other	Other
+8a4460ad-86e3-478d-83c7-a1be8c7fdbd8	1	Other	Other
+8a4464e2-a457-422e-9a77-59b371589ed5	1	Other	Other
+8a44bc4a-af17-456d-98fd-a35816521179	1	Other	Other
+8a44c5bc-c71c-4e49-a2bf-28af70120bcf	1	Other	Other
+8a44de61-de1d-42c6-9064-a659f6a05236	1	Other	Other
+8a450373-d6f3-452b-8984-de4109b24f44	1	Other	Other
+8a451e4e-1e1d-47d4-8329-025d4d10e341	1	Other	Other
+8a4527a4-2ede-41f2-b543-b24d513f4f50	1	Other	Other
+8a455397-b14c-4c32-8907-5f80f42b1fd7	1	Other	Other
+8a45714c-5451-42fc-bb1d-0bbe8be0d1da	1	Other	Other
+8a459321-7432-47cf-92a3-a50496fdb908	1	Other	Other
+8a45fb58-4546-42a9-9b7b-a068ce732143	1	Other	Other
+8a460b6a-080e-11e8-8bf8-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8a467a64-759c-46bf-815f-f8d03c1e42ee	1	Other	Other
+8a46a955-4ad4-4109-84d0-7aa557d9a48c	1	Other	Other
+8a48034b-f559-4f28-9209-c4e85c74b623	1	Other	Other
+8a482eab-9150-4d38-9542-17f0d39038d7	1	Other	Other
+8a484aa5-05af-4542-8e33-f804d6db8f4e	1	Other	Other
+8a485613-96a3-43f4-946e-62a3ef741dfb	1	Other	Other
+8a487eba-f57a-4a2d-a22f-d66898785c0d	1	Other	Other
+8a4888a6-d992-4b4d-8d51-baa41a21e1cc	1	Other	Other
+8a490821-6193-445b-8692-c2a58e98305b	1	Other	Other
+8a490db3-4cbd-4c0e-84fe-4e04d1389192	1	Other	Other
+8a498067-5a7b-4871-b81e-9913c134dba6	1	Other	Other
+8a49a2cb-88d0-4778-b036-b5cb65024b2d	1	Other	Other
+8a49a60e-5a2e-479a-ade3-9012778f323e	1	Other	Other
+8a49b0a9-5c80-409a-addc-dfec26597773	1	Other	Other
+8a49b0ba-d355-44a2-aedb-2764a0a049f8	1	Other	Other
+8a49f3e3-f345-45d1-b2c7-05ce1bef4887	1	James	Other
+8a49f799-df78-4c8a-858c-435b78d3e807	1	Other	Other
+8a4afa21-4db6-44ea-b959-72c8cca51571	1	Other	Other
+8a4afde7-0923-4062-8a88-81aa263d60e1	1	Other	Other
+8a4ba171-cee3-4f88-8cff-87a73500a725	1	Other	Other
+8a4ba224-f19e-4de2-9473-85dbf0abda0c	1	\N	Other
+8a4baa5c-2040-4164-b8ad-ee3d3a6206a6	1	Other	Other
+8a4bc708-7188-408e-9be6-c192acaf7f40	1	Other	Other
+8a4bd826-519f-455c-957c-b763e4f09b50	1	Other	Other
+8a4c5803-6ac9-4eaf-b0b8-444b236b9708	1	Other	Other
+8a4c5b35-9677-484c-9d81-bc2ce8abf0bb	1	Other	Other
+8a4c660c-aa77-4b43-af5f-9ba3eb9a2813	1	Other	Other
+8a4c6d25-fb12-49f7-9290-2a55effa9d62	1	Other	Other
+8a4cb0a3-91ca-4266-a3da-c44126b4cf5e	1	Other	Other
+8a4cb174-347d-4200-aacc-ba2a36965522	1	Other	Other
+8a4cc6f7-c81f-4c0c-b312-0b24c3de871c	1	\N	Other
+8a4cdc27-b878-42f6-824d-613d494ff41b	1	Other	Other
+8a4d145b-925e-41b5-bbe7-9f4449f4160b	1	Other	Other
+8a4d433b-46d4-4c37-b1a2-39bc5c5b9cb7	1	Other	Other
+8a4d5406-4e29-40ad-b448-13c79465f835	1	Other	Other
+8a4d6fd4-13fd-4994-b32d-b0acb96dc971	1	Other	Other
+8a4d78e1-39d4-4e00-9165-1a23a8e94225	1	Other	Other
+8a4d7fb5-1135-4a55-8d91-eeef1b64efb9	1	Other	Other
+8a4dbc50-feb6-46a1-b01d-7439c57a705a	1	Other	Other
+8a4dc710-8b9a-4f60-b2a2-6cd5ebc237dd	1	Other	Other
+8a4dc797-959f-4afa-8de5-8516897941d9	1	Other	Other
+8a4dee14-13d7-11e8-82fa-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8a4e166c-bcf3-4772-8d3d-2143217eb75d	1	Other	Other
+8a4e25f8-c54e-49ea-96fc-d92022900cf1	1	Other	Other
+8a4e5c5b-0c1c-4a0e-a413-56fea45d5d86	1	Other	Other
+8a4e9340-64ca-4084-a7eb-9c74fa653aef	1	Other	Other
+8a4eb3c0-d3c0-47d5-98e9-914cae111ffd	1	Other	Other
+8a4ed2eb-f52b-4540-9706-57bd01dd40f8	1	Other	Other
+8a4ed7ce-c35d-4a9e-b0b1-6a03a654f304	1	Other	Other
+8a4eddea-5748-46ae-b411-8036b242feab	1	Other	Other
+8a4f06bd-6619-41cb-8fdc-dcc774ea5c15	1	Other	Other
+8a4f1dc0-ba18-44f6-ab96-a7e38174b4e4	1	Other	Other
+8a4fdf8b-32c7-403d-8e38-c4d99b1014c0	1	Other	Other
+8a5023a3-f13c-40c9-ad98-91f9a6057953	1	Other	Other
+8a506293-1d22-4749-8dc0-1977ac5a27e6	1	Other	Other
+8a50bd64-0c16-4136-909a-c5df28c99391	1	Other	Other
+8a510ba6-8485-4f76-9112-35ab7e8330b2	1	Other	Other
+8a51b817-9ca2-47cc-92c4-9d492bba32f2	1	Other	Other
+8a51ee38-e292-4179-96d5-d9ad91848fa2	1	Other	Other
+8a51fb1a-2821-4e02-a4af-b4d2d05a5a43	1	\N	Other
+8a5235d4-547f-43a5-939b-0b959ce92003	1	Other	Other
+8a524e9e-0bdb-4839-8a4b-1f41e32eca0c	1	Other	Other
+8a528e6f-582a-40f7-a763-4ec7fb0e9552	1	Other	Other
+8a528ebc-1ee2-4acb-ab43-5d55232cac39	1	Other	Other
+8a528f96-cf7e-4cc6-9270-cd8cdfc96a92	1	Other	Other
+8a52b98e-2729-401a-bac0-309e0b11e409	1	Other	Other
+8a52e26a-709f-4c5a-a466-6a3c5bf6e96b	1	Other	Other
+8a5308f7-295c-42b8-8d90-d091a907364d	1	Other	Other
+8a538740-06dc-4f56-8462-2b1e4b52bcd1	1	Other	Other
+8a5402c7-30fd-463a-ae87-57dc104d9084	1	\N	Other
+8a54664f-dd16-4588-9eb0-6d6da523f440	1	Other	Other
+8a5469c2-c64a-4558-a52f-908a74b0b896	1	Other	Other
+8a54859e-63bd-40a8-b855-84f47f9b538b	1	Other	Other
+8a54a518-88c9-4f77-89a1-c6126653e666	1	Other	Other
+8a54a9e7-7913-4b58-b1fd-4f7d53ba1f9e	1	Other	Other
+8a54be40-2ce8-4f79-a596-752ea2c5841b	1	Other	Other
+8a54e6bb-4583-47bd-941f-ec0321e8d522	1	Other	Other
+8a551741-d4aa-4743-941e-ad794367ff5e	1	Other	Other
+8a55c0f1-5d11-4bef-9692-f9d27b8167a0	1	Other	Other
+8a55ee79-1243-4e6e-9028-ee92676dd2d5	1	Other	Other
+8a5645b8-e6c2-41e3-aed8-cff1b7d7a5ce	1	Other	Other
+8a565ba6-c9df-49ba-9317-7df1993b473f	1	Other	Other
+8a56c858-c5e1-4869-a15e-c54a8dd2390e	1	Other	Other
+8a56d0b6-bab1-437b-b79d-a06aa129df0c	1	Other	Other
+8a56fcfe-d8c1-4e5f-915a-5fbda356c13f	1	Other	Other
+8a573e0f-df9e-4a1d-b177-28a488cfaa7b	1	Other	Other
+8a57ba94-3349-47f8-80a2-bcb54ef46b68	1	Other	Other
+8a57e747-1a6a-4654-8504-2ef2214afb38	1	Other	Other
+8a57ef55-8a9d-455b-a681-6ad1099db77b	1	Other	Other
+8a5803e2-1da7-4011-ad46-367cc737477c	1	Other	Other
+8a5830f2-9477-11e7-bcba-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8a584413-69c0-4430-9046-3d2258150a2c	1	Other	Other
+8a586fd8-d6bd-45c7-b46f-c79caab7eb32	1	Other	Other
+8a58a61a-f2db-46dc-af7b-bdc02ba12b1c	1	Other	Other
+8a58e005-270d-4525-9762-216d17417884	1	Other	Other
+8a59199d-c46b-4092-b083-b82c4bc0a63f	1	Other	Other
+8a5942b8-4918-49eb-bf8f-6bee9814d4ce	1	Other	Other
+8a598764-75b4-4d94-89de-aff6c0fbe70d	1	Other	Other
+8a59c113-62c9-42f8-b197-f27946db7ab0	1	Other	Other
+8a59f9ac-a0b9-4ae3-b2c9-b66da115d66a	1	Other	Other
+8a5a04d3-a2a2-426b-8c6c-f38a1c70088a	1	Other	Other
+8a5a6290-02ba-44d6-9912-306851837e41	1	Other	Other
+8a5aa09b-5f9f-45d4-ac42-f119aff532e5	1	Other	Other
+8a5aa696-6013-41bd-9c87-8b9fd81b7c78	1	Other	Other
+8a5ab73e-5a58-437e-81e0-40267b245e39	1	Other	Other
+8a5acf2c-d806-442f-b8b1-0f803ef77d6e	1	Other	Other
+8a5aefcd-dda6-4ad6-bb81-bd92318fa849	1	Other	Other
+8a5b7100-2c4d-40e4-8bc0-ce523b953336	1	Other	Other
+8a5bdaa9-7ca0-428c-906f-f36681950c27	1	Other	Other
+8a5bdb3e-07f2-4b81-af3c-159dfcd154b9	1	Other	Other
+8a5c571c-7424-4dfd-b0e0-df463e29ab57	1	Other	Other
+8a5c62c4-e429-4983-83a8-be9ca4500490	1	\N	Other
+8a5c6ecc-a44f-43b4-ac9d-729f1dc2c0ab	1	Other	Other
+8a5c8948-afba-4135-abd7-257e3a6a9607	1	Other	Other
+8a5cb71a-f4f0-45b7-a6a2-c3c1f991aa5c	1	Other	Other
+8a5cbb8f-c182-43da-8cb4-a1ca0f377b9d	1	Other	Other
+8a5cc3bd-4cd6-4b2c-83a4-ac7ab5e89fb6	1	Other	Other
+8a5d9dc8-efa6-44ce-b5dd-f73e7fffdf08	1	Other	Other
+8a5dabc0-2ca7-4ea9-9794-f316ef5a2d7f	1	Other	Other
+8a5dc72f-78b6-45d3-9281-8531ca4d186e	1	Other	Other
+8a5ddf70-6df1-4e10-ab72-d02d301b8a64	1	Other	Other
+8a5dee1a-b52e-4f78-8789-c3db4cfad5c4	1	Other	Other
+8a5e1a63-b376-4ece-8bcd-f851f7e20241	1	Other	Other
+8a5e5b7e-81a8-4cd2-9f91-be01899e7b66	1	Other	Other
+8a5e7c09-1562-4579-9b08-a5ac4c1a0145	1	Other	Other
+8a5e8cb5-2e70-4080-bc4c-c6c9339237c9	1	Other	Other
+8a5eda9b-bcd5-4782-925a-8505cc161c60	1	Other	Other
+8a5ef4c5-cccd-4f24-ac51-077411cae394	1	Other	Other
+8a5f3e15-ea81-4c6d-9001-0350d7ff0a41	1	Other	Other
+8a5f7650-4da1-45f2-8a24-f922d90b47a0	1	Other	Other
+8a5f7651-9764-49c1-9d06-c85f5011be3c	1	Other	Other
+8a5ff005-2595-4be1-9109-9bc91276ddeb	1	\N	Other
+8a602fcd-e703-4d8a-998c-e85f2a154449	1	Other	Other
+8a603f15-5735-461d-9fc5-9ec98eacfaa2	1	Other	Other
+8a6057da-976f-4d48-a4f9-70d23ea6eeb2	1	Other	Other
+8a606dd3-46c8-44a6-a3ae-211e538daf0b	1	Other	Other
+8a607097-e5aa-4cd4-b2e1-2e035029d677	1	Other	Other
+8a60c72f-50db-4afc-80e3-82a099809b3d	1	Other	Other
+8a60c990-4ac2-465f-bbad-2a1f2beeaca1	1	Other	Other
+8a610c3a-d3f2-48cb-bb1f-39b528726b32	1	Other	Other
+8a612a4e-9e0b-4118-85ac-dacc2d3c19e1	1	Other	Other
+8a61768b-5f79-4e4d-8a42-1c3c33715755	1	Other	Other
+8a62234f-ae24-4aac-ae3c-1101b2700129	1	Other	Other
+8a624451-2453-4da3-9add-5698b57ca05a	1	Other	Other
+8a628bb8-837c-45a4-8ba4-21df76c0c3da	1	Other	Other
+8a62981b-6990-4909-8f9c-cff436b92532	1	Other	Other
+8a62d580-3ee1-40ea-b579-9cc9ed224015	1	Other	Other
+8a62ec05-6757-4c0c-9e41-b35b2b9e5ac1	1	Other	Other
+8a631fa5-ef0a-4d00-a911-2e123a4c9c3c	1	Other	Other
+8a633e2f-0564-423d-b0c4-84ccc9129176	1	Other	Other
+8a633fd2-4596-4ad9-a608-f5885457e9e3	1	Other	Other
+8a6370f0-b8d3-4191-a392-bbb5be0bd21e	1	Other	Other
+8a6398a1-2dc5-4369-b66a-135a7725af0c	1	Other	Other
+8a63c17d-1139-4a33-9500-8f67b81d4688	1	Other	Other
+8a63f319-4d4a-4fee-8a79-6d6f15c7e2cc	1	Other	Other
+8a63f76c-881a-4d92-a37b-be8f12b54c41	1	Other	Other
+8a6425a5-8ded-4076-9292-d731488cb8b2	1	Other	Other
+8a64e514-3bda-4725-9696-0a88e956dd6e	1	Other	Other
+8a64e76c-9311-4342-a237-dc0421e70e74	1	Other	Other
+8a650c00-2281-4d69-8678-099b3852256d	1	Other	Other
+8a655762-6806-4fab-941a-2ab33e5395fd	1	Other	Other
+8a65c373-08df-4cbb-9735-171b43bc7519	1	Other	Other
+8a65f185-e2bd-4e0a-aae0-a655085c9387	1	Other	Other
+8a65ff0a-cb1c-493f-a471-0e44f12271ee	1	Other	Other
+8a6638e1-2bbc-4a8a-9715-6490945206e3	1	Other	Other
+8a667291-4b67-44e3-9506-130ea58465ac	1	Other	Other
+8a668315-86fb-42c0-914e-c4bc06a84318	1	Other	Other
+8a66adf5-17b5-484b-84a5-1a6d2b5459df	1	Other	Other
+8a672038-bb66-400a-801d-ee58272438dd	1	Other	Other
+8a673c58-651c-49a0-a6f3-096f536fb505	1	Other	Other
+8a675e8a-fc14-4c99-9960-62297683becf	1	Other	Other
+8a6769d1-543b-4846-9055-8c9fa7f31304	1	Other	Other
+8a676c20-cb5f-4b6b-af6f-ac429c5c93c9	1	Other	Other
+8a67700b-a7f4-45ec-b26a-5950fab49568	1	Other	Other
+8a67b732-da48-46f8-b44c-b63ab50dab03	1	Other	Other
+8a67bd9d-30fc-4263-a582-03e59e62a7a8	1	Other	Other
+8a67e0a5-fb74-42f4-91d1-b4df28c6a5e1	1	Other	Other
+8a67eaf0-1115-4bdf-be22-348fc90dc641	1	Other	Other
+8a67fd2e-ddcb-40f3-abcb-7f1dcefc2b1b	1	Other	Other
+8a6857ab-6b6e-420b-93c1-4b85b92210d5	1	Other	Other
+8a6886b8-ae7c-49b6-8e0b-9db6e0c63d6f	1	Other	Other
+8a68fa4c-de7c-4f0c-83a7-3f6b742aa93e	1	Other	Other
+8a6979ef-208a-4882-8b61-b94466012f25	1	Other	Other
+8a6991af-0a09-4e28-ab80-4ac8a6f5c18f	1	\N	Other
+8a6a6aa9-5a5e-4401-9def-4128779a8256	1	Other	Other
+8a6a752a-f1dd-428d-9f06-d5cd709f16f2	1	Other	Other
+8a6a769f-f581-4fde-933d-72a068781f3b	1	Other	Other
+8a6a8f16-44e9-4802-8757-eae7147a8d65	1	Other	Other
+8a6a9461-33b4-4120-a5fe-b6d5cd5b711d	1	Other	Other
+8a6b8119-0652-4eb3-a487-4e01f635a2b6	1	Other	Other
+8a6b82f6-9cfc-46b8-a19c-c73dcdd20bf5	1	Other	Other
+8a6bc2b8-f942-49c5-ba95-48caeb087c55	1	Other	Other
+8a6bf658-3bc2-4d66-8b85-f5618631eaca	1	Other	Other
+8a6c6756-c594-49fe-8cca-7085b163c740	1	Other	Other
+8a6ca823-6761-4540-9a7e-82f3c50d95ec	1	Other	Other
+8a6cb4b5-20f9-45bd-865f-1a5f1a19e652	1	Other	Other
+8a6cbe57-8954-427d-a1f6-f02e661b2de2	1	Other	Other
+8a6d2d7e-1762-43a4-a785-2d12e27c4019	1	Other	Other
+8a6d53a9-dbf0-429c-8fde-d8c1943a7f63	1	Other	Other
+8a6dc984-0302-4998-8954-44be3aec79d0	1	Other	Other
+8a6e2360-f12b-11e7-9dd9-fa163e8624cc	1	Other	Other
+8a6e2eeb-bc12-48e5-a6e2-9c8d20f050d4	1	Other	Other
+8a6e4c67-d865-42b6-b9e1-3f0a2ca5e519	1	Other	Other
+8a6ed11f-fe5a-48b0-9a3c-bc8327590970	1	Other	Other
+8a6f3c9b-5abf-42c1-9e43-e7705a3a5cd7	1	Other	Other
+8a6f5f99-4bbd-4ebc-942c-839363b9695d	1	Other	Other
+8a6f6a1a-9de2-49cb-a040-b287e0560db4	1	Other	Other
+8a6f785f-5281-4134-a8e2-9e476fd37f52	1	Other	Other
+8a6f78c9-f1d0-4870-b494-9a422d2ba156	1	Other	Other
+8a6f9b7d-2043-42c9-b7a6-09943813e0c5	1	Other	Other
+8a6faad7-41a9-4bde-8122-54d3cce7a1d8	1	Other	Other
+8a6ff1ef-52ce-4240-a8f4-9df62ff784e5	1	Other	Other
+8a70359a-58de-4c9e-807b-d2f39889eb8f	1	Other	Other
+8a70941c-0db3-424e-8d55-230c367141d0	1	Other	Other
+8a70967a-dc9d-479f-8900-fafe27d51034	1	Other	Other
+8a70b169-bb46-4ac1-90f3-0e7347c5996a	1	Other	Other
+8a715090-5088-4149-87fe-03afbbb711c3	1	Other	Other
+8a71dc61-a04d-4f97-9ff4-c2731cffa8ea	1	Other	Other
+8a722c8c-bb28-4c4e-bf63-82b2ee2a77d0	1	Other	Other
+8a72967a-7ab8-4e6d-aaf3-e552a7b56286	1	Other	Other
+8a72bcc2-75ba-43ea-8de1-7394cd3193e6	1	Other	Other
+8a72d2df-6bee-4061-bb8c-d10e0481f74b	1	Other	Other
+8a72fba2-0b88-11e8-8c82-fa163e8624cc	1	\N	Other
+8a7337db-9ec1-4d77-a7c2-085315e5c36c	1	Other	Other
+8a7367ad-d83d-4f02-91d9-c06c46079af6	1	Other	Other
+8a738156-d383-47e1-aaf8-a6de4735b868	1	Other	Other
+8a73bbdd-995e-4a4b-aa19-b0a637591a85	1	Other	Other
+8a73bcd4-a682-46b8-a4df-5a9649504044	1	Other	Other
+8a73c001-d000-410f-9181-c33fcfb7c12b	1	\N	Other
+8a73d356-2f28-4663-b923-62b6775f388d	1	Other	Other
+8a73dd87-babc-47cf-ab4a-2009b4636648	1	Other	Other
+8a73edcd-5df1-4284-a54e-d747cd5ce10d	1	Other	Other
+8a7411d7-2403-47cf-afd7-19d379541262	1	Other	Other
+8a7417dd-f95f-4122-80e4-a030779e00a8	1	Other	Other
+8a746920-6bf8-4097-a3bd-cc193ba0102e	1	James	Other
+8a7486fc-cf81-4385-95a6-8a92be5d26b9	1	Other	Other
+8a74dcac-2f3b-4de5-a6d6-e9254ad81700	1	Other	Other
+8a74e492-7cdf-45ae-8bb4-61085cf35c69	1	Other	Other
+8a751898-b45f-40da-a159-8f0e7fc51439	1	Other	Other
+8a756c37-973d-4103-88cb-c8d0b37faf68	1	Other	Other
+8a759234-9849-4354-b241-98f331ca66e9	1	Other	Other
+8a7596ab-f3a0-4263-a097-bf0d1699c2cd	1	Other	Other
+8a764e6d-645c-40f5-97b9-2761648abf87	1	Other	Other
+8a7663ea-c609-43d0-b050-c66ebdd07ec5	1	Other	Other
+8a76a01e-d2aa-464b-aa14-4e145ddda2c0	1	Other	Other
+8a76dad5-2775-4f68-91ff-869d5b4239d0	1	Other	Other
+8a76e1d9-a34c-43e7-88da-b03a785d19c6	1	Other	Other
+8a76ecec-479a-4d0a-bb94-61589c2020b4	1	Other	Other
+8a76ef70-eb08-4c05-b8f9-50bf28780752	1	\N	Other
+8a772082-13a5-4378-bc2d-09c75f5f7d13	1	Other	Other
+8a772ebc-6c16-4301-812c-58cc37ad0c8b	1	Other	Other
+8a7738e5-a965-4d13-ac38-fd47e8814424	1	Other	Other
+8a778236-cbae-4c24-b239-eaf88733b0cd	1	Other	Other
+8a78090c-3e50-4c15-a7c5-ebab493f1c34	1	Other	Other
+8a780f5c-7709-4b50-86f9-576687209e65	1	Other	Other
+8a786844-f50d-4dfc-bb4e-908470629973	1	Other	Other
+8a787553-2aa1-4bb8-930b-3c23d60083e4	1	Other	Other
+8a788cfe-e376-41c3-b1ac-323d1da49746	1	Other	Other
+8a78d108-4a94-409a-8112-96a59f44858c	1	Other	Other
+8a78e4e5-e5a5-4924-9232-45b1e86cb012	1	Other	Other
+8a78e708-4704-48a4-9430-8a03b6b97411	1	Other	Other
+8a7940c6-c10c-4a35-866d-acd9dfbd9c4f	1	Other	Other
+8a79b5bc-1e0a-4ea9-bee1-6c7a9b704c1f	1	Other	Other
+8a7a182f-6a85-4514-a2e2-5933b7bf4385	1	Other	Other
+8a7a1f57-8ab8-4fef-8079-fb3cd3eea17b	1	Other	Other
+8a7aaa68-2cc1-46c0-aca9-2c3a0b724a57	1	Other	Other
+8a7ad128-7f59-440f-9822-f605debd1a7e	1	Other	Other
+8a7aed4d-9ca4-4e54-a464-7d49907c3410	1	Other	Other
+8a7b01e0-416c-4952-a2a8-d7cfed073620	1	Other	Other
+8a7b0f14-9ed3-4762-8c08-c8643a2927b7	1	Other	Other
+8a7b479a-a29c-4b3b-b528-a64f61ab6738	1	Other	Other
+8a7ba925-db86-4a25-8c7d-0b33b12ea75a	1	Other	Other
+8a7bc700-99d1-4f29-8fd7-47a1eb473776	1	Other	Other
+8a7c061e-4a89-4f0b-be35-3bad7f3dd211	1	Other	Other
+8a7c324c-bbde-4843-96cc-f2ddddbc339d	1	James	Other
+8a7c368b-29d5-4e90-8736-b71ad228dd95	1	Other	Other
+8a7c3bb6-b999-4688-835c-1388a2199852	1	Other	Other
+8a7c53a8-f12c-11e7-966d-fa163e8624cc	1	Other	Other
+8a7cc813-2410-4a23-8481-e81ff2cccc71	1	Other	Other
+8a7d05c4-68b8-4085-bde8-5c7338a584ed	1	\N	Other
+8a7d814b-3b21-4c47-b1c8-bc73b72f6d80	1	\N	Other
+8a7da453-f8b9-47aa-8efb-f95b9fae96a8	1	Other	Other
+8a7e34cf-ddb7-4759-9536-435addf22520	1	Other	Other
+8a7f66b7-3054-455a-889e-1e84b87b9de3	1	Other	Other
+8a7f8581-dbb4-4c18-a012-62dc66860b38	1	Other	Other
+8a7fbccb-3387-4e23-ae7b-4931053e300a	1	Other	Other
+8a7fe03a-9ee4-4b55-9c96-6325838bb3b7	1	Other	Other
+8a7ffc65-2bd8-4ccc-9dd4-f179f46c9807	1	Other	Other
+8a805486-cc69-4f93-889d-186cf3c6b930	1	Other	Other
+8a809288-1e77-4300-b95e-516d991ac870	1	Other	Other
+8a809742-912c-4dcd-b372-8015bc7f4b99	1	Other	Other
+8a809896-4fe1-41e2-96d3-f7c525004962	1	Other	Other
+8a809bb7-3338-420e-b811-282fd246c637	1	Other	Other
+8a80d18d-cd0f-4b41-a6aa-68907dc1120f	1	Other	Other
+8a8114b5-92d6-4d85-931b-1afe7428f5dc	1	Other	Other
+8a814030-5b76-46e7-ae76-5e5d17eb97bf	1	Other	Other
+8a816de2-f86a-40b2-84e4-34e62fa8b54e	1	Other	Other
+8a817cbe-3548-4ea4-85c9-c86f6c807f1d	1	Other	Other
+8a81a113-a793-4b95-9d0c-496b1de806ab	1	Other	Other
+8a821215-d8cd-4c37-b8ff-8f7390d22bbf	1	Other	Other
+8a822bf8-d8db-4ffd-a041-d3981be47880	1	Other	Other
+8a8251fa-36c4-4ddd-a923-6c0d2e69cf2d	1	Other	Other
+8a826ba3-c154-43d2-9d90-e5147237169d	1	Other	Other
+8a82abf4-2566-4e26-a180-375a016b3ee0	1	Other	Other
+8a83014d-48cd-41af-9df8-d49bdb2e9d77	1	Other	Other
+8a830e38-f8a9-4d01-ae81-9417d86b3ca2	1	Other	Other
+8a8317f0-85e9-4532-b6ca-7dd595c50c71	1	Other	Other
+8a8326e9-ae3e-4691-9b16-c8ccafc90ac9	1	Other	Other
+8a833a06-23ba-40e5-bdc3-da7909cd469b	1	Other	Other
+8a834b70-b85e-4b68-8dbe-75f1afb4cfea	1	James	Other
+8a83cd17-6be5-4bed-8999-a2064a3b15a7	1	Other	Other
+8a83ff33-2605-498c-871d-d2f343926404	1	Other	Other
+8a841c33-70ed-4b63-a33c-00bd1c224d5c	1	Other	Other
+8a84260b-0b1f-437f-8df1-bb7ab90cdea5	1	Other	Other
+8a8448f4-4a67-4842-859d-d00305b70252	1	Other	Other
+8a847dd4-e300-4aae-9f46-8df57369c46e	1	Other	Other
+8a848501-fe81-4d31-bec9-082d8d352076	1	Other	Other
+8a848dfb-5fa1-4556-a485-e6db4415b666	1	Other	Other
+8a84934c-c4f6-45df-82ec-8d3b7c6b1b48	1	Other	Other
+8a849b34-a8bb-4975-ab6c-9667a45db8e6	1	Other	Other
+8a84cdc6-9033-4d2b-bd37-5cfe547a1f86	1	Other	Other
+8a84d494-3bdd-4f3b-8f07-340d84fbe9d3	1	Other	Other
+8a8517e5-57d0-4244-afc8-19c9e663d91e	1	Other	Other
+8a8570de-c0a0-4db0-9c4c-e68772d5f039	1	Other	Other
+8a85b8ba-db13-477e-acbe-c84542c93bde	1	Other	Other
+8a85d66b-d293-42fe-83e7-ee10d7dcc570	1	Other	Other
+8a85f728-677c-4427-bd5b-1a2c676c70f6	1	Other	Other
+8a8635b7-bf66-4868-8e92-e4263c258af0	1	Other	Other
+8a8636ef-ab11-41c1-8e9d-5a31571b32dc	1	Other	Other
+8a868ddc-284b-41a5-a2bf-bb8495147ba7	1	Other	Other
+8a86e494-143b-4a19-b9cf-7ab9b422ec86	1	Other	Other
+8a86fec7-e4ad-4508-b252-5c1b50a33ba4	1	Other	Other
+8a870674-ea33-49d4-8df0-fe787fe28db0	1	Other	Other
+8a87495e-d56c-4138-808b-ac4eb35ca4fd	1	Other	Other
+8a87b264-ae78-4439-8774-ed89828fb41d	1	Other	Other
+8a87bf39-0ceb-44e6-bd28-4e9770529158	1	Other	Other
+8a8832fb-f987-4f2b-8cb0-b02d34747cc4	1	Other	Other
+8a883880-e411-4ae0-adc9-b3e5297ae0e8	1	Other	Other
+8a886b9c-b754-4cbf-b843-f55b5fad51ad	1	Other	Other
+8a8876a5-1527-439d-8a72-efd6d5c2cb1c	1	Other	Other
+8a88b947-d7cb-41bf-9535-75513d366d37	1	Other	Other
+8a88e080-0c27-49a7-8c9f-071134bf65ec	1	Other	Other
+8a89160b-05ca-4ebf-85a9-ea36681f0a7c	1	Other	Other
+8a892bac-b793-40cb-b047-8b84ead0c5e5	1	Other	Other
+8a8959b1-665e-4a6f-b3e2-a6c343042d14	1	Other	Other
+8a898f4a-c439-4f35-a2ba-4e7639211261	1	Other	Other
+8a89929a-f621-4ad6-94bd-ae46162d65f3	1	Other	Other
+8a8994fa-010b-47dd-b0a4-a25aac8f13ca	1	Other	Other
+8a89ad22-e2a8-4373-8d26-df614deb3b1d	1	Other	Other
+8a89af3e-149f-4880-84dc-773c7fd34671	1	Other	Other
+8a89d1db-07ac-4458-b17e-16589c0bbd6a	1	Other	Other
+8a8a2352-adc4-47e1-9fbe-21324d86bb3e	1	Other	Other
+8a8adfdc-3d62-4c45-92bf-875efcbdc643	1	Other	Other
+8a8b0c08-2d84-402e-8096-1355a16cb82f	1	Other	Other
+8a8ba90d-2df0-432f-a432-04de0d915320	1	Other	Other
+8a8bc0a0-db12-44b6-930b-2a488dacdf87	1	Other	Other
+8a8bf643-a727-4e11-b559-a1452f1b83b4	1	Other	Other
+8a8c0d10-790c-4650-aef7-5e75dc581fc7	1	Other	Other
+8a8c1a97-6054-43b0-a294-9ab8e4b83267	1	Other	Other
+8a8cda5f-9821-4867-a649-db6b1a2e1fc9	1	Other	Other
+8a8cddee-ae23-4222-be96-add173184b52	1	Other	Other
+8a8cfe58-07eb-4110-9d4e-0bca386d2c32	1	Other	Other
+8a8cfe58-7412-4f5f-9816-2c4822791cdd	1	Other	Other
+8a8d275b-8f8b-4731-bb47-3e32518a1460	1	Other	Other
+8a8d4990-dc57-4f1d-8056-88b845cb5c5c	1	\N	Other
+8a8d5a04-9082-432f-b020-9cbd5084aa45	1	Other	Other
+8a8db53b-4108-40e4-91d3-48fc2fa55a4c	1	Other	Other
+8a8dbe3c-0124-41ca-985d-fe91002a0a74	1	Other	Other
+8a8e2896-acdb-4362-8458-a92455a3a6f7	1	Other	Other
+8a8e3c1e-eb65-4837-ab6c-c4f0c23bc203	1	Other	Other
+8a8eb96d-4444-4919-9af9-148125353a6e	1	Other	Other
+8a8eeee2-9e8e-4063-b895-b39e37ee93f6	1	Other	Other
+8a8f1553-0687-44bb-a1e1-422493361367	1	Other	Other
+8a8f7cba-4e56-4010-878a-d27082fbccfa	1	Other	Other
+8a8fe73a-0379-49ba-92de-a6fd201c41bf	1	Other	Other
+8a900c68-8f69-4100-a73f-38581496330d	1	Other	Other
+8a901067-ce74-4aaa-98da-68948da15394	1	Other	Other
+8a909138-a2c5-4b11-b170-545c773bef52	1	Other	Other
+8a90c9ed-db69-4faf-8f44-c56af800ccd1	1	Other	Other
+8a90d23f-d7b0-4c6b-adf4-93191f9fa3a6	1	Other	Other
+8a90e543-a1aa-4411-8ce4-d96f93dffa6f	1	Other	Other
+8a90eac5-21ed-47f7-9a51-6f4c8601ccf7	1	Other	Other
+8a91d5f0-685e-47e6-959b-16e2f3de38a8	1	\N	Other
+8a91e915-352b-4c7e-a834-90efa00e1835	1	Other	Other
+8a91fffa-72e3-4169-a941-9f3d7f69b66b	1	Other	Other
+8a9233af-f985-4c4a-a566-ffd3c9c0d092	1	Other	Other
+8a923522-2368-4b2d-be39-48e6facda4ce	1	Other	Other
+8a927db6-f2ca-44a4-9d97-ba36ad8cb5bf	1	Other	Other
+8a92d6e9-4d58-45ff-a91f-1912b6cf5cc9	1	Other	Other
+8a9343b0-02ac-4160-b9c7-f99a9f1857ac	1	Other	Other
+8a93606b-540b-45d8-85f7-1bd7c7e5f63c	1	Other	Other
+8a9379c2-909d-4292-8e34-c45e120182cd	1	Other	Other
+8a93a765-e958-435c-bb79-620f6bcf2bae	1	Other	Other
+8a942a50-ba83-4f83-a904-f6770cb7817a	1	Other	Other
+8a942f3f-fd35-44f0-bfb2-1c42c4242db9	1	Other	Other
+8a946e3e-5f10-4134-8d2c-5a9bcbc57c97	1	Other	Other
+8a947abf-4013-4a6e-8df9-cb600ddfbc97	1	Other	Other
+8a9486ef-da07-4653-b745-df3943281326	1	Other	Other
+8a94a8b7-bb11-4d5f-ad5e-5f0fb3641f1b	1	Other	Other
+8a94b482-b1b0-48d4-a21d-b5bd13ca169d	1	Other	Other
+8a94b6bf-4d74-4940-a375-e1addf5d5435	1	Other	Other
+8a94f43f-9ec6-4f95-8f64-96b8fc69ed8a	1	Other	Other
+8a950605-42ae-4938-8bf5-49d106e58810	1	Other	Other
+8a954440-b450-45dc-8f38-4342afda42a2	1	Other	Other
+8a95ab3e-cd9c-49a4-9787-b4c8f5de3f0c	1	Other	Other
+8a95db12-9105-48d7-9b20-f8b9f15f539c	1	Other	Other
+8a962c43-836d-4aed-93ec-56119d9e46bb	1	Other	Other
+8a964115-89c9-418a-a9e9-e5470dd4c65b	1	Other	Other
+8a965199-5377-484b-883c-20fc47eac5f6	1	Other	Other
+8a966db5-7d6f-4c71-a61f-10f1650b6051	1	Other	Other
+8a967d26-37e9-45d1-98c3-c98831d63c47	1	Other	Other
+8a968b46-5b27-494e-a959-6b65c6a3d7e5	1	Other	Other
+8a96b5f1-6a93-4b11-9dcb-a446663b9eff	1	Other	Other
+8a96c576-5d0d-47ba-a120-f6cb24a72ff3	1	Other	Other
+8a96fa89-32ab-4dcc-abf3-711c53f29c5d	1	Other	Other
+8a9708c1-bc3b-4ccf-bf87-f043f42593fe	1	Other	Other
+8a971970-561a-4c02-88ac-3c727da42910	1	Other	Other
+8a974698-ea05-4314-97a2-09f9ca78659c	1	Other	Other
+8a97729c-9197-4291-ac14-79bed290fef9	1	Other	Other
+8a979664-f11f-4676-9e46-1f9d31b7e0d3	1	Other	Other
+8a97f283-25cc-49bf-a7de-f3353f9927fc	1	Other	Other
+8a98767c-6945-4a8e-ad9c-953a1a20357f	1	Other	Other
+8a9890b1-346d-4396-9d29-02f9025d2197	1	Other	Other
+8a98cf1b-bc2a-411a-843a-3f28852b36e0	1	Other	Other
+8a98e105-c3b3-4865-90bd-0ee887a361d2	1	Other	Other
+8a98f7ce-5b6a-40f8-a114-8fed0fb0d354	1	Other	Other
+8a990129-99e0-4e90-8f95-95ea0890d016	1	Other	Other
+8a992887-40e8-4589-9744-0a9716fd5d31	1	Other	Other
+8a99395f-c1bf-4003-b445-0e3ccbeb7712	1	Other	Other
+8a9958a6-6c19-4996-844c-01a9dbd54ad6	1	Other	Other
+8a999451-c6ba-4552-925e-663dd4006024	1	Other	Other
+8a99c2a6-2b16-4603-967e-8e93f04dce15	1	Other	Other
+8a99ce95-67ba-4602-976e-3c2b2e78258f	1	Other	Other
+8a9a111f-1912-40a6-a5f1-7023787465bc	1	Other	Other
+8a9a3dd7-49e2-48d3-a6eb-e7266cd6b8f1	1	Other	Other
+8a9a4591-2593-4f15-8edf-614bcc7047e3	1	Other	Other
+8a9a6043-7371-4060-94ef-967929b4c7b6	1	Other	Other
+8a9aa74f-d3e2-405b-ae06-cd1dc0502317	1	Other	Other
+8a9b15c0-1434-4a77-ba81-d63f5e75945b	1	Other	Other
+8a9b230f-92b1-47de-9425-0ef66280c409	1	Other	Other
+8a9b2a24-8556-42e3-a9ba-866cc2bbc268	1	Other	Other
+8a9b39cd-5dfb-4c2b-bdf3-1d76c8c59c36	1	Other	Other
+8a9b4685-f044-492c-b8fd-9e5841a7d4fa	1	Other	Other
+8a9bc772-ca97-4d0b-a88c-913be7fb7dfa	1	Other	Other
+8a9bdbf4-5ad8-4e0c-b418-aa2167717592	1	\N	Other
+8a9c23b7-312b-442c-a9ef-720ce99f7d23	1	James	Other
+8a9c45ae-7b46-4ca1-81c0-964f27df9fc9	1	Other	Other
+8a9cc574-0ca5-4caf-bff2-ce2462a18029	1	Other	Other
+8a9ce3ee-5f44-4fb5-920d-e4c3dcebf004	1	Other	Other
+8a9d4106-e4e1-482d-ad15-1eaf807f8a04	1	Other	Other
+8a9d622c-09a0-4c43-b552-e3860a6d619a	1	Other	Other
+8a9d8308-bde3-4e8a-a536-feba1be51485	1	Other	Other
+8a9df5f0-77a9-45af-82ab-f50f4305dfa8	1	James	Other
+8a9e20df-f7c3-4be6-9d35-6fd8af2a8daa	1	Other	Other
+8a9e35f1-a30d-4fb3-a007-7532d6f3f3e8	1	Other	Other
+8a9e6576-8ee7-4f1b-bdd9-09ce507dc9ea	1	Other	Other
+8a9e8930-4e15-442b-baf7-d53488334d2b	1	Other	Other
+8a9e9ece-66cb-4199-ad45-9fb3fa6a516e	1	Other	Other
+8a9ea903-373c-4dd1-a51f-c2e474243a0a	1	Other	Other
+8a9eb472-9f8d-4070-8109-f4684b7bec1b	1	Other	Other
+8a9ec9d9-81e9-42da-b142-99e2058d36a2	1	Other	Other
+8a9f3b52-cd8d-42d2-8178-79b7d1b7e5a6	1	Other	Other
+8a9fa710-4c20-4023-8fa2-9a7995254580	1	Other	Other
+8a9fa7c2-fa30-40c7-974f-2edfb6b22e8f	1	Other	Other
+8a9fb0c9-e1e8-4ef8-9e92-b418ee5c324f	1	Other	Other
+8a9fd243-42f5-4bbb-ac87-9e1498250fb3	1	Other	Other
+8a9fe556-1d12-4d98-b6b7-a25774b25cd4	1	Other	Other
+8aa007e3-ff07-4aa5-a5d2-6d70fcb0dbac	1	Other	Other
+8aa02f69-2756-4350-a4f0-8f39ec688d34	1	\N	Other
+8aa0487f-a294-446b-a6da-b44ca2bbfb75	1	Other	Other
+8aa0a957-e635-4471-9e1d-f3d8f2a0453b	1	Other	Other
+8aa0d558-690f-4641-a9c6-f26eed5e7145	1	Other	Other
+8aa11c8e-0e47-4038-9f0f-2550e47418cb	1	Other	Other
+8aa1a0d0-aa0d-4643-bc87-480f5a3a6be9	1	Other	Other
+8aa1a4d2-8959-477d-bc6f-dca6f37c007c	1	Other	Other
+8aa1a7ba-e7bf-459a-bac8-a80e4503c0cf	1	Other	Other
+8aa1b267-d38a-44c7-9d4d-81abe5f89314	1	Other	Other
+8aa1d1db-b8ab-4c54-8b9b-7a739f613dd5	1	Other	Other
+8aa1e494-cb16-4610-8b9c-bff426578024	1	Other	Other
+8aa201a4-cb51-4900-aa7e-acf3bff8f4f2	1	Other	Other
+8aa252ff-d531-43e1-bd77-f3400babbeab	1	Other	Other
+8aa2cac3-0bb7-4b69-b9a3-5fb763a06d11	1	Other	Other
+8aa2f35f-e98a-438f-90e1-8b5013c26d5e	1	Other	Other
+8aa41c6f-6ba2-4fb6-b0e3-8cc6d8f7b7a7	1	Other	Other
+8aa432ae-4e5a-45e7-8d27-c2ff4bf8c29c	1	Other	Other
+8aa4bf69-c8b2-431e-a65a-afee922d69b3	1	Other	Other
+8aa4c8b1-3a22-4585-8ef4-16d8aded76b4	1	Other	Other
+8aa4e0f3-9838-4a86-a6dd-fa99a14d0f36	1	Other	Other
+8aa513f7-5a1e-4660-958e-8ad83b2e1630	1	Other	Other
+8aa51c85-434a-439e-b703-43e9ccb825c2	1	Other	Other
+8aa53cd1-0a39-4686-94fc-cf80f6db57bc	1	Other	Other
+8aa576fa-458b-4b6a-a706-41acc7916a29	1	Other	Other
+8aa58cd4-528c-40a7-bd8e-e8bf0bd3b7fd	1	Other	Other
+8aa5ab7a-c295-4669-867d-460b414db2fc	1	Other	Other
+8aa5eadc-9718-4c8d-8d1d-cd09408a14d0	1	Other	Other
+8aa5f52d-3740-4b27-9338-8a57e552f721	1	Other	Other
+8aa5fa54-a4dd-4f2c-9dbd-105bca45a20c	1	Other	Other
+8aa65023-e6a7-4ccf-9a58-e38165c0193f	1	Other	Other
+8aa6c99a-d543-4cb9-b270-f391cfea9cd9	1	Other	Other
+8aa6ce12-9100-4f55-8937-1768e0aaeecb	1	Other	Other
+8aa6e180-b201-48a1-b28c-f7e43e49e847	1	\N	Other
+8aa704ab-a20e-4e2f-b011-7112aeedd1e9	1	Other	Other
+8aa70c5d-b139-4b55-97cf-78c36288078f	1	Other	Other
+8aa73bcb-ddfd-48e2-b724-5701d1ed29ce	1	\N	Other
+8aa76160-7706-4d4c-94b0-e491ef466d66	1	Other	Other
+8aa77e5d-72fd-4a40-a126-531a9cfeddd8	1	Other	Other
+8aa83897-1755-40e5-ab2d-6eadeffe5382	1	Other	Other
+8aa85852-0b09-46a7-a59b-402433ad16f1	1	Other	Other
+8aa88a77-f6a3-4209-8620-f02279d50371	1	Other	Other
+8aa8bb5d-2225-4d2b-8436-58f8658401e8	1	Other	Other
+8aa8d09e-3118-4841-8007-f9590e4f3f1e	1	Other	Other
+8aa8ef10-7670-4a7e-b9b0-1973537b3c69	1	Other	Other
+8aa991b9-c2b8-42e5-909c-1911c3fb37c8	1	Other	Other
+8aa99795-2401-44a3-a144-6d262470f9fd	1	Other	Other
+8aa9a568-cb33-4b98-868d-303f47afcb5e	1	Other	Other
+8aa9ec62-372e-492b-886d-e11b394d5157	1	Other	Other
+8aaa50db-f0c6-49b5-8266-b200f4062493	1	\N	Other
+8aaa8b4c-aeda-46c5-970b-63e6a463a145	1	Other	Other
+8aaafb73-0162-4344-b703-e58c4089a0d9	1	Other	Other
+8aab9617-83fe-477f-8ade-87761b4e2b3c	1	Other	Other
+8aaba2e0-b794-4b50-9a03-bcb42cbdf9ee	1	Other	Other
+8aaba8be-81d4-43e4-bc1d-df37bd4f1172	1	Other	Other
+8aabb6d9-9997-4a70-9da7-8a3bc3b20a0b	1	Other	Other
+8aabc05c-09fd-4905-aa37-8b48385edfe2	1	\N	Other
+8aabd4ed-a879-458a-b051-c59ddb4f90de	1	Other	Other
+8aabee1e-91dd-45de-a28e-c18c87f03379	1	Other	Other
+8aac00d6-ec33-40cc-9e64-b609151cdae4	1	Other	Other
+8aac8ca6-5c91-47d2-94f4-e448f14d31a3	1	Other	Other
+8aac9873-0637-4703-ba35-1e4e3ba7db9e	1	Other	Other
+8aad8e64-9bcc-4b31-8578-c0ffdcf91c69	1	Other	Other
+8aada126-db89-4eda-a3ef-07f15876cef8	1	Other	Other
+8aadc37d-53a2-4413-a634-dc1481213a21	1	Other	Other
+8aade6c4-4a0d-4b5b-8b90-818971dcbec3	1	Other	Other
+8aadea08-15f1-42a8-a180-f319d6424cc1	1	Other	Other
+8aadf98c-9cef-47a1-9d83-7d0b4ea225f1	1	Other	Other
+8aae016d-f86a-4ab1-afb7-12e4fd381243	1	Other	Other
+8aae1e90-c15d-4915-a276-1eac4a831ef2	1	Other	Other
+8aae3774-72de-4e6e-aed1-9cfba74bdc88	1	Other	Other
+8aaee238-b288-434f-abf4-a8fc28fb1d9d	1	Other	Other
+8aaee9ff-6f8d-4302-bb91-f2fcfcb79464	1	Other	Other
+8aaef186-9f0a-40d7-8f03-666f5b8cf625	1	Other	Other
+8aaf35c9-ec8a-4423-bdc5-5bf4d354f270	1	Other	Other
+8aaf47b5-e867-4f22-8889-4e1adbe5d357	1	Other	Other
+8aaf681a-7a43-43e4-945a-64e649d49693	1	Other	Other
+8aafa534-1913-405c-b399-1f7e5e3c17ce	1	Other	Other
+8aaff2b1-3c52-458a-9602-2e2c41355829	1	Other	Other
+8ab0463a-cb18-478e-84bf-347858f5b188	1	Other	Other
+8ab051e7-ae24-4088-bd2d-a35322558a52	1	Other	Other
+8ab06472-8a79-45e3-834f-0ac5068b0765	1	Other	Other
+8ab09547-1cc5-4eaf-86f7-e5008ada08a6	1	Other	Other
+8ab0a5a2-e6f5-4b8b-bd7f-9914f2674ff9	1	Other	Other
+8ab0c96c-2a2e-4e45-b398-96c0376c99fa	1	\N	Other
+8ab100ad-35fc-42f1-8a05-49332c790c39	1	Other	Other
+8ab14d03-a978-4912-9b82-caf46fa9b28b	1	Other	Other
+8ab182a8-a72e-47ad-a753-27d34b75f0ee	1	Other	Other
+8ab18ff8-2d9c-446f-bb67-c01ff33ee769	1	Other	Other
+8ab2069c-0479-4614-8a3c-79fba07a26f2	1	Other	Other
+8ab20df5-aaeb-4a84-8b95-85f6bdc93539	1	Other	Other
+8ab26388-d459-45f8-a404-52821bf11a46	1	Other	Other
+8ab27578-988b-45ed-ae1f-4278794661ae	1	Other	Other
+8ab2bad0-0b39-4f81-a98c-96b32521a0cc	1	Other	Other
+8ab2f8d4-8247-4119-bc90-f5b09bb79fd7	1	Other	Other
+8ab30927-e6fa-426e-b1e8-37b3d7196ba4	1	Other	Other
+8ab309a6-481b-4035-a81a-71f4e29579fd	1	Other	Other
+8ab32c44-9e35-4d21-8128-6d389ab47441	1	Other	Other
+8ab335fe-1b96-4bef-b8c5-c7d498c89efa	1	Other	Other
+8ab35a1c-15e7-4ebd-b06b-f361e7138897	1	Other	Other
+8ab367e0-c65e-41d0-8a7d-ba52fa1d804d	1	Other	Other
+8ab37432-b05d-4f29-bc2e-5b50da88126a	1	Other	Other
+8ab3a454-baf3-4eaf-9a47-434bf8434b22	1	Other	Other
+8ab3a81b-7437-4e31-bfb4-8fa8c7a7c917	1	Other	Other
+8ab4114d-951e-443a-8001-3945982b65d8	1	Other	Other
+8ab41b24-9510-48ea-b5d0-8f03ed34fc51	1	Other	Other
+8ab43797-b125-4b51-8de6-e854feee530e	1	Other	Other
+8ab48db3-0315-468f-b1a9-29df3604a70e	1	Other	Other
+8ab4f7da-3a0a-408e-a4c4-9c0512e334ce	1	Other	Other
+8ab550ec-5f8e-4877-8b9b-e4a0ebbb6945	1	Other	Other
+8ab57044-59fa-4c35-a86a-925db6e14232	1	Other	Other
+8ab583df-7848-4334-9c2e-8b8b6f83d01c	1	Other	Other
+8ab58c31-9fa6-4ed6-b767-274dcf85b327	1	Other	Other
+8ab5a183-60bb-4456-991f-d50db6c1257e	1	Other	Other
+8ab5c68a-fcbf-438d-9a81-834b068df48c	1	Other	Other
+8ab63ff8-4055-4230-a148-d9973bbf56db	1	Other	Other
+8ab64578-3be2-4843-9539-a4320907e19b	1	Other	Other
+8ab716cd-428c-4bba-8240-393439bd2744	1	Other	Other
+8ab76555-1b21-4570-98d5-478870b4551b	1	Other	Other
+8ab767e0-22a0-4f76-acb2-d54deb4f53a7	1	Other	Other
+8ab7db8d-552c-480c-b674-6cc9c1f3f703	1	Other	Other
+8ab7ffd9-0f6a-4cb5-9cf7-133e01e42ce2	1	Other	Other
+8ab8278e-6d44-4896-b7b9-fbdb2025ba6c	1	\N	Other
+8ab832e6-0ffa-11e8-9296-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8ab84f75-288e-4c18-b111-b3decd682b08	1	Other	Other
+8ab870f0-f14c-4197-a316-d49137af8817	1	Other	Other
+8ab878e1-ea7f-4870-99e8-41ffcd75f8b9	1	Other	Other
+8ab94f37-cf1b-4198-8c94-68a85084224f	1	Other	Other
+8ab954a3-fcf4-47cc-895e-4d7617bd34b4	1	Other	Other
+8ab956c9-f3a6-4fa2-9980-0d18375ec665	1	Other	Other
+8ab96a41-fdd4-4c9c-a456-0de2f25c91cf	1	Other	Other
+8ab9c4b4-3e88-467f-a9f2-5ae930db7614	1	Other	Other
+8ab9f2e5-6551-4063-b270-6db6dd55219d	1	Other	Other
+8aba1dce-3a82-41e8-9f5f-298f7c8846bb	1	Other	Other
+8aba55ab-432d-4fec-b2f5-e527b31aab2d	1	Other	Other
+8aba88ac-d4f5-40ba-bb3b-e80be5eb7ca5	1	Other	Other
+8aba9609-1e5c-4877-9e70-bd78a7329684	1	Other	Other
+8abbe48e-eea7-4852-aa71-89d68eaf5f1e	1	Other	Other
+8abbeb6e-5f3a-4455-a6bf-dccad4ed6ac1	1	Other	Other
+8abc6119-655c-43ac-a034-5ea6ff5bfe68	1	Other	Other
+8abc8723-620a-4211-b8b5-5167a8550443	1	Other	Other
+8abca6f1-bc8f-4288-ae24-b72bb3f70b02	1	James	Other
+8abcddcd-96b1-48f7-923b-f312fe2a9a06	1	Other	Other
+8abd243d-de66-4d88-8741-e54189df2313	1	Other	Other
+8abd366c-f3f8-4668-ab3f-43b6f2f8c634	1	Other	Other
+8abd4004-0707-45cc-a3d3-9625364a34d8	1	Other	Other
+8abd433f-d8f0-4a1d-b327-f5fb8455e86e	1	Other	Other
+8abd829d-7b1d-4052-967a-57ca4c8c69d1	1	Other	Other
+8abd8345-726e-4a08-a41d-1e1cf55ecadc	1	Other	Other
+8abd86e9-e6d1-4700-ae22-fd582ca9f1bf	1	Other	Other
+8abda742-24b8-484c-b4fd-95acb63ca906	1	Other	Other
+8abdbbd9-9f57-48dd-84ea-e136dab64665	1	Other	Other
+8abe2ea6-1739-4d18-bb06-d89ee8730ff7	1	Other	Other
+8abe8ac2-5594-4ff1-9d53-e3fb27151d8c	1	Other	Other
+8abea09a-0fd4-4b96-a316-8f5ecb694199	1	Other	Other
+8abef762-81ee-4e80-b1e7-c912afa6b779	1	Other	Other
+8abf098c-20c0-4ee5-b36b-53a187381197	1	Other	Other
+8abf1567-bbb8-4fe5-8b4b-ab867161f9b0	1	Other	Other
+8abf15d9-a150-455f-b69e-249ebb224aec	1	Other	Other
+8abf308e-2da0-4e43-97a4-844bb436276e	1	Other	Other
+8abfcb0e-e93f-4e5f-b968-5e6f48646a77	1	Other	Other
+8abfed24-5a54-474a-8386-21b0cb53de19	1	Other	Other
+8ac0005d-7cf7-4775-9a14-8e741047328b	1	\N	Other
+8ac0516f-56ca-4e16-bf38-810b5de8db0a	1	Other	Other
+8ac06df0-d0eb-46c0-8e96-3c040c6455f7	1	Other	Other
+8ac0744d-3cea-482c-8cf4-27a9f3fe7b20	1	\N	Other
+8ac07940-15dd-4332-8caa-e272f1182b7b	1	Other	Other
+8ac08d40-b992-4e08-9f4c-be310d28bb98	1	Other	Other
+8ac0bf77-707b-4dc4-ab57-942f138b9c0d	1	Other	Other
+8ac1400b-5645-43c9-82c8-41b05675266e	1	Other	Other
+8ac16a59-cdb8-4c1d-86cf-07c2ca81c721	1	Other	Other
+8ac1724a-6daa-4271-8b1c-0c1856663ceb	1	Other	Other
+8ac19e59-6ab2-4f8c-9e09-29a24fefc48c	1	Other	Other
+8ac1c880-283d-45c6-93b6-b9a04f4ebd6c	1	\N	Other
+8ac22f20-9bb5-4563-858f-363d1b66b75b	1	Other	Other
+8ac233c6-6107-4ffc-9d7b-878c70fbcac1	1	Other	Other
+8ac35fcb-9a8b-4345-9845-6e4a2c8070f1	1	Other	Other
+8ac37676-0da6-45de-b37f-d3340e694cd4	1	Other	Other
+8ac40873-9bde-40a0-8476-65839b3c518a	1	Other	Other
+8ac4e2ea-081d-46d7-b13d-dad361665fb2	1	Other	Other
+8ac4e662-5928-43e0-9bf0-0f0ad558bddf	1	Other	Other
+8ac5864a-094d-4ad3-8951-c77ab5189539	1	Other	Other
+8ac5cdae-0d60-40d0-8d49-dd2a894b5a14	1	Other	Other
+8ac5eca0-86e2-4d4b-916d-b3c03aa03dc8	1	Other	Other
+8ac61ec3-6a9f-4c08-847d-c1bfad97c72c	1	Other	Other
+8ac66403-5938-4f55-933d-2a1ebb3092e6	1	Other	Other
+8ac69862-3890-444f-8865-e9738e89fb89	1	Other	Other
+8ac6b8ee-2cb0-4a9e-8bfd-21a7622e43a2	1	Other	Other
+8ac6d3d5-4418-4e74-8287-8d3048010314	1	Other	Other
+8ac6ebcd-a06a-413d-9040-99fb44eaf228	1	Other	Other
+8ac719d6-6bd8-4d8d-b28c-e2e2d8e53815	1	Other	Other
+8ac740e0-1f88-4c23-8d7f-4923b4692aaa	1	James	Other
+8ac76772-4be1-42b8-9f74-3c5e70265b21	1	Other	Other
+8ac7a9f3-8fe9-43bc-b0c1-47e2e4b25e46	1	Other	Other
+8ac7d2dd-7a71-464e-b314-db62ecae2056	1	Other	Other
+8ac7f3dd-b59e-44bb-acfb-9f5a13c8fb20	1	Other	Other
+8ac7f763-7bee-40a6-9089-c350fff918c3	1	Other	Other
+8ac814a2-5fa8-4d08-a2b4-dc39616dbc57	1	Other	Other
+8ac8a97b-6b40-4588-9268-e863f65d90ef	1	Other	Other
+8ac8dbee-528e-479d-a7e4-bdc242b0fc32	1	Other	Other
+8ac8f7e6-f518-430d-b60b-bc4272d4c123	1	Other	Other
+8ac99348-0afa-4326-a84f-19c0b1d4ef19	1	Other	Other
+8ac9b0a6-8db6-40d8-a468-18f4307f4784	1	Other	Other
+8ac9b0d1-b647-4080-baa9-19377a125a3d	1	Other	Other
+8ac9c5b9-3f43-44a1-8a6b-54b1adabc7af	1	Other	Other
+8ac9e382-27b3-4e9c-9086-abe052efe247	1	Other	Other
+8ac9e4a7-c986-4c9b-a28f-4552e74c7d1a	1	Other	Other
+8ac9f464-a579-46e7-941a-e4ed287b37f3	1	\N	Other
+8aca2204-521b-4cf9-94b0-8428d16e27cc	1	Other	Other
+8aca2479-fe7a-4130-85f8-375119328a4a	1	Other	Other
+8aca4a7b-687f-4096-9576-13747620cc44	1	James	Other
+8aca88aa-550f-49ed-be75-1fdf1eb3bc80	1	Other	Other
+8aca9019-d6aa-456e-bb22-928b692903f8	1	Other	Other
+8acac639-0655-43cc-ab37-77dfac891ffe	1	\N	Other
+8acade15-6fdc-4552-a3c8-4b44ef36cd59	1	Other	Other
+8acae5b2-d09b-4349-95a0-4fa7b7a69cfb	1	Other	Other
+8acaf2ed-2f5f-47d3-b4ad-daaa697dd73f	1	Other	Other
+8acb055e-613a-4b65-8d98-9dc51100bf1a	1	Other	Other
+8acb1085-fcff-4560-8398-aa71e0ff987c	1	Other	Other
+8acb1dd3-8915-423a-b19b-ed40f9cb80ba	1	Other	Other
+8acb42de-00c1-4a9e-8080-b493a52513fe	1	Other	Other
+8acb7e82-54f7-4b23-9d6f-e24813829c55	1	Other	Other
+8acba034-2355-4092-b88b-cd8602af3ba8	1	Other	Other
+8acc0cf0-73fc-4e80-853f-df150a423f7b	1	Other	Other
+8acc916c-c569-412f-ba50-f1e56a3f2e5a	1	Other	Other
+8acce016-7193-4eeb-ad18-3b5cd3790037	1	Other	Other
+8acd67af-eb5f-4c5c-a78c-2cdb852fc2f0	1	Other	Other
+8acd6fbf-537c-485b-83b4-56fd505087ef	1	Other	Other
+8acd760b-2188-4d0f-ad1b-f860c5f257ab	1	Other	Other
+8ace2563-ddd6-4481-b5e0-72ca7c1bb1ef	1	Other	Other
+8ace4479-1750-4219-8351-6082652302df	1	Other	Other
+8ace51dc-c2cf-437a-9b13-023e7ee02cf3	1	Other	Other
+8ace5a29-e495-465f-b7d3-467cc8df1f9d	1	Other	Other
+8ace83f5-75a1-41c1-b238-8d0ab9ffa056	1	Other	Other
+8aced02e-ffc0-42ce-ad95-017f9873c7bd	1	Other	Other
+8aced240-b2ad-479f-a3cb-7393c6de8a2e	1	Other	Other
+8aced436-3924-4f6a-9eb1-4e0978a9cb30	1	Other	Other
+8acf283a-2be6-4f31-9940-75e6eb20f7ce	1	Other	Other
+8acf546a-6b54-4d6a-bcd4-80ffe636f12c	1	Other	Other
+8acf9011-bdd8-47fd-9b25-f49ba2b24b79	1	\N	Other
+8acfc5ae-c256-40f0-baca-4853e9b4b782	1	Other	Other
+8acfc5b7-46ea-42b9-90b9-6563b6a8c031	1	Other	Other
+8acfe2a5-f6cb-47b8-ae7b-2ec9233e1393	1	Other	Other
+8acfeb37-3736-4c7b-8527-2bc9bc1548c8	1	Other	Other
+8acff1eb-3be1-47b3-91a2-03da7b672f8c	1	Other	Other
+8acff8e9-c2d9-4072-ad84-57779c178f16	1	Other	Other
+8ad00133-3bbc-4494-a6bf-63bbd11335ca	1	James	Other
+8ad058f7-b477-4d10-acda-5176fe4fd3d2	1	Other	Other
+8ad07491-a6f8-44e6-90c7-7175c0815fd6	1	Other	Other
+8ad07aa4-6546-4fa3-83ef-dcfe64f8ba4a	1	Other	Other
+8ad0a3c7-dec4-49e6-b49a-833006158540	1	Other	Other
+8ad0f867-57f2-4e6e-8f9f-60a0cd7c62b3	1	Other	Other
+8ad152ec-8946-464c-a513-276214a8edcb	1	Other	Other
+8ad15796-194a-428f-bc0a-6be4cf7cd9d6	1	Other	Other
+8ad15c5e-d49a-4819-bc62-f3de23e7f395	1	Other	Other
+8ad1dbe0-25ee-4913-9759-d8294c1b3ae9	1	Other	Other
+8ad20a4c-5a72-4776-8944-ca8799bc4165	1	Other	Other
+8ad2107a-ec95-44b6-a794-97a9aaf82c4f	1	Other	Other
+8ad23f35-03d5-49b5-9133-06c16d36d3de	1	Other	Other
+8ad26f9d-bbe2-4ec0-9c93-ae307f622655	1	Other	Other
+8ad2a46d-b153-4309-8703-829b75fa979b	1	Other	Other
+8ad2b2a9-58a0-4434-89bf-3db30b77e2a7	1	Other	Other
+8ad2d295-2b5d-42da-aa05-199fdc2e73dc	1	James	Other
+8ad2f349-1f7e-4226-8104-f44640ecf740	1	Other	Other
+8ad2fab6-e243-43b2-9a8d-cc4ec95a1436	1	Other	Other
+8ad336eb-c47e-43aa-9992-1dc907701018	1	Other	Other
+8ad337fb-05dc-4b33-b350-cd099827de69	1	Other	Other
+8ad36120-21ac-4f1a-9528-d59200249abf	1	Other	Other
+8ad362b2-9689-46a9-ab5c-470345c9148d	1	James	Other
+8ad3b8eb-c3d6-43da-a238-dac6824aed3a	1	Other	Other
+8ad3f4c4-ca7d-48e1-a755-1419ad304afe	1	Other	Other
+8ad43c47-86b2-4058-8afd-5c59efa9cd2b	1	Other	Other
+8ad446f2-243d-4065-bc1b-6800284fa55d	1	Other	Other
+8ad4745b-df7b-402f-9cb7-11e36940e697	1	Other	Other
+8ad48190-4fe8-46d0-aca7-8c511450bfc0	1	Other	Other
+8ad49676-2c4b-4014-902a-5699e1658b0c	1	Other	Other
+8ad49a3c-e974-4a16-8e6d-579c1b8116ab	1	Other	Other
+8ad5766c-3c4e-4703-a5d6-e64ab016639d	1	Other	Other
+8ad5b495-b924-4017-9cec-77361d391655	1	Other	Other
+8ad5c4c6-c79e-49e9-9d04-2ec3a7653ad4	1	Other	Other
+8ad60685-81fb-4c06-9af1-bac08bea8bb6	1	Other	Other
+8ad60e22-a217-47b4-b26c-56370d1332c7	1	Other	Other
+8ad62f40-c88f-4676-a288-4ce449315dd3	1	Other	Other
+8ad65d45-96fb-489f-91b1-4fdf24a8cc98	1	Other	Other
+8ad6711a-1e62-4eb1-8799-be7aedec91ed	1	Other	Other
+8ad6c566-d9d8-4236-8d9d-c6a564030f26	1	Other	Other
+8ad6c9a8-0b29-4b39-a6ea-85c3accf5437	1	Other	Other
+8ad6eddc-410f-40dc-b6a4-d4f4e8acc15a	1	Other	Other
+8ad6fd23-3abe-4a6f-b764-96ffa26cc974	1	Other	Other
+8ad739ab-904a-46a8-827c-c5e810c5d810	1	Other	Other
+8ad7a3c2-76ff-40cb-adc9-e4a56ca7c358	1	Other	Other
+8ad7d764-639c-496d-854c-4f49b13dd352	1	Other	Other
+8ad80a4a-ea62-4450-80ca-093212724c73	1	Other	Other
+8ad80aa3-b9b6-4361-8433-5e38c0b1b3b1	1	Other	Other
+8ad850c0-a4f1-4e72-a543-583d4da6ed60	1	Other	Other
+8ad87929-4acf-498f-b578-633b15443149	1	\N	Other
+8ad8cf2c-4cbe-454d-8101-723306e73b96	1	Other	Other
+8ad8e54b-9c0f-4a3f-a0dd-730efbc35073	1	Other	Other
+8ad90141-3d11-40d2-9267-12557e71889c	1	Other	Other
+8ad935ca-b667-4408-bf6a-d9f26211ef0d	1	Other	Other
+8ad993ce-8ba9-43c5-bd63-d9346273769a	1	Other	Other
+8ad9a706-202c-47cb-a8b7-785abffeedea	1	Other	Other
+8ada2382-26e1-4088-b758-188b6d8b3ab3	1	\N	Other
+8ada2da7-b977-4fd6-8722-67470a9a8185	1	Other	Other
+8ada433e-a3c5-4653-9484-6ff961a3d862	1	Other	Other
+8ada57be-c62f-4dfc-9663-e5df8e2d28db	1	Other	Other
+8ada5db0-c199-48e1-8973-dedb42a0a76f	1	James	Other
+8ada7f29-431f-46ef-9a5b-68813ed5c9ce	1	Other	Other
+8adac4fd-6812-4846-8fb9-ba343d4f131e	1	Other	Other
+8adb14b8-e89e-49a1-9201-7c907e310be0	1	Other	Other
+8adb1be9-577c-499d-939d-6902bdfe6083	1	Other	Other
+8adb32ff-57b1-45ac-bf3f-091c2f749b5c	1	Other	Other
+8adbead8-d279-46f5-a194-09c689c5a69a	1	\N	Other
+8adbfc34-16aa-4dbd-92f9-99a5b983bc8c	1	James	Other
+8adc120e-11f3-4057-8679-2b54755a5bc0	1	Other	Other
+8adcd9e3-cab5-4088-baf3-762c2ff2238d	1	Other	Other
+8adce22d-0e12-4aa8-8fdb-35d875e895d2	1	Other	Other
+8adcf46a-b645-4772-9d36-73067db00165	1	Other	Other
+8add0410-abfa-4c78-ad4b-8da265aa6eef	1	Other	Other
+8add4694-94c6-4f6e-82a2-b688f8b9ea3c	1	Other	Other
+8add4cfd-b378-4d32-ab77-e4695594baa9	1	Other	Other
+8add6080-3d81-488c-bdc3-b0862757f67f	1	Other	Other
+8add68d8-d8f5-4580-ae58-98d72f90f4be	1	Other	Other
+8add8255-5bd3-438c-afe0-593e3630eeb1	1	Other	Other
+8add946a-2ae8-46e9-9e45-d7d87d82dd47	1	Other	Other
+8ade2505-a6d8-405a-b904-15f8290fe800	1	Other	Other
+8ade3f9f-cbf2-47ac-96e0-dcac5a287734	1	Other	Other
+8adea96e-aa1e-43c6-8eff-fe3ab7cd1eba	1	Other	Other
+8adeb921-6349-4cae-914c-f146a18f56b3	1	Other	Other
+8adf5971-90bd-4f6c-bd7f-7f39bf93a2ad	1	Other	Other
+8adfc50a-9c59-4de7-8671-cce11eef9e9d	1	Other	Other
+8adfd300-c043-49a8-970f-fc9a91122046	1	Other	Other
+8adfe211-6ff5-44da-a0d7-ac50e385fb82	1	Other	Other
+8adfe65b-226f-4e71-83b6-184758b80a06	1	Other	Other
+8adffd73-0b45-46ae-9c24-cf1e89ae6858	1	Other	Other
+8ae0868b-2017-4bfa-9db8-30271cb5ea5f	1	Other	Other
+8ae08e30-6604-4691-9262-f7e0db361727	1	Other	Other
+8ae0b71a-b25e-4c7a-85d4-84c0db8f9993	1	Other	Other
+8ae0c222-9631-4835-b9fa-da3cfd3c326b	1	Other	Other
+8ae1123e-c212-4480-a0c3-d38bdfdd00ad	1	Other	Other
+8ae142dd-4807-4e1c-9ae4-dcb9efb606e3	1	Other	Other
+8ae143d6-e604-4649-91a4-32692647d043	1	Other	Other
+8ae1443f-8cf2-471a-8285-328b5f1bde04	1	James	Other
+8ae17609-7dda-4549-9b1c-dd89d1ae7c91	1	Other	Other
+8ae19a4a-0671-409a-aec9-a7233816124a	1	Other	Other
+8ae1c5c6-14ba-4f17-bd71-39b4866d3ce4	1	Other	Other
+8ae1f7fb-7dd8-4a3d-b92c-a4581b3c049b	1	Other	Other
+8ae1fe8f-9cc9-4907-a554-dc2500d5ce03	1	Other	Other
+8ae2561f-4ca0-4fa6-b0d8-82471db10547	1	Other	Other
+8ae295b1-0a75-43d0-94a5-f8c0e27ad078	1	Other	Other
+8ae29faf-4ca3-44a1-9eee-edafcea63be1	1	Other	Other
+8ae2afcb-fd9d-4587-8575-ea24ca95247c	1	Other	Other
+8ae30779-c271-4a53-9681-b6e109bc5bbc	1	Other	Other
+8ae30d54-7b7c-4ebb-b0fa-8d7b0b62b8f7	1	Other	Other
+8ae32542-b6e5-4d07-8840-8f39915c32a9	1	Other	Other
+8ae33745-0fb2-4dce-a54f-fa73d9aab3ba	1	Other	Other
+8ae35a1e-0541-42ed-a358-924ea93341cf	1	Other	Other
+8ae394bb-6150-4377-ac05-0748e5ecb7bb	1	Other	Other
+8ae3b073-f127-4af5-89e9-02f2851a7152	1	Other	Other
+8ae3d76f-8b83-4968-bb37-84c2451342b4	1	Other	Other
+8ae3d9c0-993e-4413-8329-df72b1c02f4a	1	Other	Other
+8ae3fe48-1821-4d24-948f-16647914b62a	1	Other	Other
+8ae5453e-d397-4262-bfc1-134bb8c8311c	1	Other	Other
+8ae54e6f-a98e-4297-b130-f967da04d987	1	Other	Other
+8ae5d612-320c-483b-9b8f-ab35308b17bd	1	Other	Other
+8ae5dc9d-0c34-493f-afdd-678295fbaab3	1	\N	Other
+8ae69aaa-8374-4120-ae99-827adea141c9	1	Other	Other
+8ae71327-714b-4b1b-b582-da3990e3d907	1	Other	Other
+8ae71fb3-4dc1-4f59-9217-6fbb05a2d502	1	Other	Other
+8ae80565-30cb-4e2c-a413-55548fb93750	1	James	Other
+8ae82ab2-4ede-4d97-8bd8-03f90cd1a5b3	1	Other	Other
+8ae84519-4195-4433-8f6d-91e3d0c43e03	1	Other	Other
+8ae84bbb-9840-459f-b08e-9a5a04c5e5f8	1	Other	Other
+8ae88d11-359a-428d-92c5-3f331a41bcd6	1	Other	Other
+8ae8a7d1-f465-4f51-95ca-18bc45af47d8	1	Other	Other
+8ae8ae6b-f77e-45dd-9b1a-9a5fa2869c9f	1	Other	Other
+8ae8dab9-9fc7-46ba-9f0f-79c1589a10b6	1	Other	Other
+8ae92802-1227-4ca4-93c8-7922e6ca67f1	1	Other	Other
+8ae93854-66d8-45dd-9e06-e23723e2e80c	1	Other	Other
+8ae9a212-885d-4fda-9182-dbf13eb2a0cf	1	Other	Other
+8ae9a4e3-76ca-48d3-baa9-3eef70dfc93a	1	Other	Other
+8ae9afb6-02a7-4068-8a10-884954e8959a	1	Other	Other
+8ae9f7ce-bb57-4319-b402-0982712175de	1	Other	Other
+8aea0144-dfaf-4f27-87a2-ba1eb3b7b5ea	1	Other	Other
+8aea5522-3493-499f-82c5-6a26affc1a1d	1	Other	Other
+8aea67ba-82f0-4f7b-a0b9-a97ba19a3564	1	Other	Other
+8aea818a-b412-4b03-a69c-c8aa4feb2aae	1	Other	Other
+8aea837a-2bcc-478a-8301-271a80ddcf98	1	Other	Other
+8aeac635-fd73-488b-abbe-22124d4c8e17	1	Other	Other
+8aeaf036-59f3-4998-988a-4ef05676adf1	1	Other	Other
+8aeaf7cf-d431-4099-8f5d-132caca5d501	1	Other	Other
+8aeb186e-b81a-4e18-b777-01c1c55ef2d3	1	Other	Other
+8aeb4954-160b-4e8a-b435-d0cc5cd66718	1	Other	Other
+8aeb6a7c-82d0-49e3-8f72-a6b3ea6e906b	1	Other	Other
+8aeb85f7-9288-484c-9183-a2cfc9096989	1	Other	Other
+8aebfa7f-83c9-475d-857a-73fda5f47457	1	Other	Other
+8aec060d-7b6f-4b2d-bfc1-e1427cbb8f99	1	Other	Other
+8aec45e9-2651-4bb4-995b-5ce2fbeb8b00	1	Other	Other
+8aeca88b-0563-45e2-942c-d51aebf57220	1	Other	Other
+8aecd6ac-ddf4-43bb-a404-84d8689fd0f7	1	Other	Other
+8aed1975-a700-4a6f-b46e-8fda04d82eb4	1	Other	Other
+8aed2dca-531f-4793-9a54-98b137727177	1	Other	Other
+8aedde81-fbe1-4f17-9ac7-fc89c390e639	1	Other	Other
+8aee07ec-ff21-432b-bf07-12d741f3da94	1	Other	Other
+8aee0aa1-2d68-4366-9b92-4aa50e7a9a45	1	Other	Other
+8aee0d2a-10e5-497d-8d67-24f18d79737e	1	Other	Other
+8aee58ad-1f45-417e-a9d8-8288db25b8ef	1	Other	Other
+8aee7615-9354-494e-b6de-7d5164d5a210	1	Other	Other
+8aee8374-d6bb-4e27-805b-bc51827caef8	1	Other	Other
+8aee8b3e-45b6-42c4-a106-837b1e6276ea	1	Other	Other
+8aeea436-3022-4e85-a04f-45d19f02cd60	1	Other	Other
+8aef1d16-05e7-48ad-886a-1b7a10e57255	1	Other	Other
+8aefc93a-ae0b-4cac-bbbb-41b02aa4e59d	1	Other	Other
+8af002ff-38a7-4bdf-aa6c-3d1cd168d6bc	1	Other	Other
+8af00a6f-cc73-4fe9-84de-ce41ab0098f3	1	Other	Other
+8af1273b-6054-4c1b-9d5b-baf4c6152cbf	1	Other	Other
+8af16b9f-e0cf-47b6-be90-64dc0842d2da	1	Other	Other
+8af26201-5b0a-4dd6-92bc-aae3da03f613	1	Other	Other
+8af2684f-96f4-4cdb-b36c-693c362367f6	1	Other	Other
+8af27562-016e-479e-8624-5b10852d8aaa	1	Other	Other
+8af293ec-5bbe-4c66-a7cc-635939fc77cf	1	Other	Other
+8af29529-a3ff-4ac6-a4de-a672ba1926f9	1	Other	Other
+8af2ac3e-13af-45cc-b1f8-d55ce366d56f	1	Other	Other
+8af2b467-0769-42cb-aba5-1491ff2701ce	1	Other	Other
+8af2ba47-20e5-4381-ad3a-9ae3f01251a4	1	Other	Other
+8af2bfe8-b44b-4e21-95ac-aba549bbed4d	1	Other	Other
+8af30a95-6e28-4b71-ba6b-cb8677c34453	1	Other	Other
+8af36651-fea2-48a7-9377-bafce85694f6	1	Other	Other
+8af3b9b1-0ff7-49d0-abb4-764ac5501443	1	Other	Other
+8af3e712-9f5b-4bf2-ac73-a04256ad2a78	1	Other	Other
+8af4a76c-956a-4278-93a3-bf03feab965a	1	Other	Other
+8af4b6ee-3da6-4aff-b28f-c00377bb089f	1	Other	Other
+8af4bc32-d8ed-4980-b248-a134b097a71c	1	Other	Other
+8af4c6f3-832c-4406-8a16-be5785986f0e	1	Other	Other
+8af4cce8-d4e8-4166-8d0e-2fc1af396263	1	Other	Other
+8af4d1ba-5598-4388-9702-2d8f01d27ac5	1	Other	Other
+8af4e01e-98e4-4cd4-8fb0-fee8e66246f0	1	Other	Other
+8af4f787-6b6d-4195-b5aa-edfab31e1895	1	Other	Other
+8af55461-7a5e-4218-95fd-f224e0c85eb0	1	Other	Other
+8af59390-47b7-4824-bc63-ac741d0a4855	1	Other	Other
+8af6617a-b57e-4d0d-8f07-c500dffcd83e	1	Other	Other
+8af6c16b-9627-4ea6-9fa7-9f35d19141c1	1	Other	Other
+8af6e70d-6f70-4c6d-96ea-ca3cbaaeeb28	1	\N	Other
+8af71bbb-d789-483f-bbba-8f229994a931	1	Other	Other
+8af73891-d1c5-4e94-be32-55e98780ebd6	1	Other	Other
+8af74552-f7cb-45e0-be29-d596d9cd20d5	1	Other	Other
+8af74d4c-eec2-44df-9522-370f94ef24c4	1	Other	Other
+8af7d1db-f8b1-4a58-8e65-5a35b72ff505	1	Other	Other
+8af7d607-8ea9-43a1-ba59-3f3651c94c24	1	Other	Other
+8af80eea-12fe-48a4-b7dc-96e734299819	1	Other	Other
+8af81c33-a347-4fd7-ab18-3a1b81c5035f	1	Other	Other
+8af8513d-f500-45be-a946-0dd1c1f0b6ad	1	\N	Other
+8af8860b-8f34-404b-abc4-efe351eb5c99	1	Other	Other
+8af889ef-5aa5-4a55-98cd-767d10933d4a	1	Other	Other
+8af88c1c-1e73-456b-9861-37fae64da349	1	Other	Other
+8af8a528-0410-4a7d-83bd-67f9b1819f24	1	Other	Other
+8af8d3b6-e372-4475-8466-b920d0f7481e	1	Other	Other
+8af8dc3c-16a5-4433-8032-2e10fb5589d2	1	Other	Other
+8af8de8b-e470-4985-9d6e-6728958efef1	1	Other	Other
+8af8ed64-21f3-4c93-abc5-944e3108b243	1	Other	Other
+8af92e09-ebff-4c55-b834-c34bcc07f6c0	1	Other	Other
+8af97067-5d05-4302-ae60-0708c3e047ae	1	Other	Other
+8af99060-c84d-4edc-9cbb-256479bf4dc2	1	Other	Other
+8af9916d-095b-405a-bb36-d875ab07afb8	1	Other	Other
+8af998de-5b7b-4bc3-a6ea-87b90f97c97f	1	Other	Other
+8af9da02-0400-47f4-857d-c50e14c958f4	1	Other	Other
+8af9ddfc-bbb1-4dbd-bc4b-a705d94bd85f	1	Other	Other
+8af9e058-ede7-4406-9b11-a1e5eeb112bb	1	Other	Other
+8af9f408-872d-4eda-816f-5002619eca70	1	Other	Other
+8afa1226-6812-43b4-8d62-2bc6eaa212e4	1	Other	Other
+8afa3494-149b-4ee8-abdf-d5d076b9efe9	1	Other	Other
+8afa3c61-c6e5-4581-8f17-4da72092af55	1	Other	Other
+8afa6a47-55ab-4a3f-b625-89cf96d00eb8	1	Other	Other
+8afa82c9-5573-4921-970f-336ad0703f1d	1	Other	Other
+8afaad70-461b-41d3-b97d-6b04ae714250	1	Other	Other
+8afacf8b-32ea-45ed-8543-af854b749bcf	1	Other	Other
+8afb4b63-3e0c-4c61-b0bb-b8c2c1196030	1	Other	Other
+8afb4ce9-4957-44b3-82a6-3869724ac836	1	Other	Other
+8afb6543-604d-452a-86ca-154f7c43217d	1	Other	Other
+8afb75de-c08e-4b55-969d-6c425dc26506	1	Other	Other
+8afbab7e-3a42-4e42-9a7f-1bd9f87f4267	1	Other	Other
+8afbb4ff-0905-49e5-9aac-1be1d66526e9	1	Other	Other
+8afbe863-b0cb-4652-bae8-d966603e3560	1	Other	Other
+8afbed20-aee5-428d-b8fd-54cd7c54412d	1	Other	Other
+8afc310b-4bc4-46e0-a3ab-a950468c8336	1	Other	Other
+8afc7319-9d84-4067-a3e1-b0884c6bcbf7	1	Other	Other
+8afc857b-2586-4dcb-a005-7c59f3691c1e	1	Other	Other
+8afd54ff-b1c6-4eaa-a9c4-1a07338ff3a9	1	Other	Other
+8afdc8e9-90ec-4148-8a83-7fbb511317a6	1	Other	Other
+8afdd50a-2f28-4f0a-852c-a6112ee1a298	1	\N	Other
+8afe1336-375d-4749-9e00-2dd5f0f59ee8	1	Other	Other
+8afe212f-3a69-4fa9-8205-f1a17799d012	1	Other	Other
+8afe9602-d475-4f5a-bca0-3ef156867adf	1	Other	Other
+8afe9d64-60a8-4fed-933d-edb8769acff3	1	Other	Other
+8afed848-3033-4267-abcc-a03121547e82	1	Other	Other
+8afedf1d-6840-487b-ad8c-a2bd1f175222	1	Other	Other
+8aff26f7-ac65-42ed-8a2b-e5581c4a8bf3	1	Other	Other
+8aff630b-f81b-4f17-9e3a-9fc84ed53f50	1	Other	Other
+8aff7446-07d0-4b1d-add9-7856730ac5d0	1	Other	Other
+8affa9ac-0ceb-4d44-b07f-da63f7c5e882	1	Other	Other
+8affb31e-610c-4d48-94b6-1861bd36a5d5	1	Other	Other
+8b0037ef-b5a8-4a3e-be5c-78f7a9f02ddf	1	Other	Other
+8b00c525-9699-4f17-b527-d7f2b1e7d04e	1	\N	Other
+8b00ce28-3881-4bcf-af7b-1927cfce062f	1	Other	Other
+8b00d93e-23d8-483f-a48f-51a658ff47ee	1	Other	Other
+8b00fd7b-a932-4395-815b-bc2d40ed5ff7	1	Other	Other
+8b011265-48a1-456c-b54a-4f8b472bff19	1	Other	Other
+8b0152b0-e158-408f-9a55-535d09b3bbb6	1	Other	Other
+8b016336-a352-4492-b23a-0556c8ddcda8	1	Other	Other
+8b01af7b-af8c-4162-9335-8447c5d92f9e	1	Other	Other
+8b02aede-71fc-45a8-8faa-5c0c0ac91f40	1	Other	Other
+8b02b680-e080-4ba2-9ce4-da5c43a88105	1	Other	Other
+8b02ed75-e2ee-4b25-a749-7b10bc55b5cf	1	Other	Other
+8b0306a2-5618-4081-877c-bd9fe4dac953	1	Other	Other
+8b031c7d-6be7-4e62-8dab-a66710fdfb88	1	Other	Other
+8b032bef-b880-403b-80ee-f90ae70f8c66	1	Other	Other
+8b035750-83df-48f3-b1a1-054f76557e13	1	Other	Other
+8b03593a-3ac8-449b-b1d6-57a4306b5539	1	James	Other
+8b035f72-6bc4-4848-89bd-dd1f71ad3251	1	Other	Other
+8b036146-9659-452e-b0af-d5781ce358e2	1	Other	Other
+8b036398-2fed-46d5-9f12-a42e942ec486	1	Other	Other
+8b036537-da3e-449c-a6ea-3ac9d182050d	1	Other	Other
+8b0397b4-ba62-4c17-b0df-dd8815d8d4bf	1	Other	Other
+8b03bc8a-ffbe-410e-a7b4-46f4f7586667	1	Other	Other
+8b03ebdd-4d99-4124-a4d4-de7a40f2a648	1	Other	Other
+8b041d7d-2793-4bfa-8688-27eeaddc00c7	1	Other	Other
+8b0480f2-de4a-4544-a578-1a03efa0daa7	1	Other	Other
+8b0487e1-0bc2-47ae-916d-ef5b68c5a380	1	Other	Other
+8b04a21b-0a58-4ec9-b74d-53f3bbf402f6	1	Other	Other
+8b04aaf2-d6d8-43d7-aa0c-f7f612a65654	1	Other	Other
+8b05060c-e3a6-4b99-8dc0-c1d652b786c9	1	Other	Other
+8b050eef-0ec2-4d4b-809b-f9f858b9a19c	1	Other	Other
+8b05225b-20f3-408c-b372-cf4bfd952246	1	Other	Other
+8b054617-21fb-4f2a-b7c3-021bffa03558	1	Other	Other
+8b054737-41af-4706-a291-04ac7d893d10	1	Other	Other
+8b05486c-df0e-4e24-b884-3c6e4c82ef7c	1	Other	Other
+8b055f16-e333-4331-af86-03cfec60b90b	1	Other	Other
+8b056dad-a65e-4392-88a9-86b98d60f829	1	Other	Other
+8b059cd9-d6f8-4c07-9919-1c76b28017e4	1	Other	Other
+8b05c249-baeb-4041-b7fc-b78f02fb0715	1	Other	Other
+8b05c81f-acd7-4b0e-8df3-558dfb259c1e	1	\N	Other
+8b05cee2-128c-4c2b-b437-25e6dad2a804	1	Other	Other
+8b05d6ef-8882-402c-9d2f-1b81d15c2043	1	Other	Other
+8b05f346-1512-40c5-8de7-bf1d98911614	1	Other	Other
+8b061c79-20a5-49e8-8465-836e19c4f314	1	Other	Other
+8b0652d8-e871-4d02-bad8-30989cc740d5	1	Other	Other
+8b065828-a99d-4aad-85c0-3a5cb8b95128	1	Other	Other
+8b06652e-efd0-4e9a-ae66-a4daae3ccc13	1	Other	Other
+8b066d45-0472-40f4-8fb2-1be59f962a53	1	Other	Other
+8b06a6d7-f44f-43be-be3f-d23da0875ac1	1	Other	Other
+8b06b5a2-f95e-4467-9602-06a45a9b5f9b	1	Other	Other
+8b06d0a0-c971-45da-9267-461c1f7e39a5	1	Other	Other
+8b06ea73-639d-401d-99a6-7eb0095459b9	1	Other	Other
+8b0750d6-c91a-442a-a30b-9ee81e604fca	1	Other	Other
+8b075321-1058-4f74-9ca1-2f7427299532	1	Other	Other
+8b0839b9-13c3-4f50-8ef1-f329959d54bf	1	Other	Other
+8b083f25-018c-4e37-8dab-7b110f221f23	1	Other	Other
+8b0841aa-29b9-4429-ad97-d6044d118aa3	1	Other	Other
+8b0886d2-b28b-40e7-bbed-15519b79b95b	1	Other	Other
+8b08c054-84e9-4fff-acd3-b1795460e701	1	Other	Other
+8b08dba0-0491-4059-9328-59fd87daac3f	1	Other	Other
+8b08e698-e082-4628-b161-a10e64eac61f	1	Other	Other
+8b08f02f-1dc6-416d-9c53-c2a7d19eadd3	1	Other	Other
+8b090285-fc8c-44d8-bc70-af0640ef1ae8	1	Other	Other
+8b0914ef-aa5e-433b-b629-69620fdb4550	1	Other	Other
+8b09283a-3e67-4a73-9805-dd25fe34539a	1	Other	Other
+8b096809-741e-4303-ab05-691e9cd03b31	1	Other	Other
+8b099eef-05d4-4d1e-b217-179d390be24c	1	Other	Other
+8b09a64c-c645-472d-94b0-fcecaf9f449c	1	Other	Other
+8b09bcbf-e711-4223-8ad9-40ff134f1e58	1	Other	Other
+8b09c733-7f37-4716-b525-e565764637d2	1	Other	Other
+8b09dada-b493-4d15-9631-445203210066	1	Other	Other
+8b09e883-f420-4a82-8676-d003ce74e62e	1	Other	Other
+8b0a0f59-5b31-4e58-804b-05f5669c0024	1	James	Other
+8b0a1d2d-1e1c-4d6b-9748-d3863c102168	1	Other	Other
+8b0a2642-3c78-45fa-8650-c2133ce45d06	1	Other	Other
+8b0a556d-b805-4c77-bcd7-93c6b45b754f	1	Other	Other
+8b0a56ed-482e-4b11-b566-07a7d5fd8383	1	Other	Other
+8b0a74bc-d92d-4a8b-a7ae-5c3bc8a9ccfd	1	Other	Other
+8b0a7719-d2b4-43b5-b5cb-58ab73a6a07e	1	Other	Other
+8b0a82df-42eb-4266-a430-ab9eec658b29	1	Other	Other
+8b0aafa7-98ef-43c6-babc-85bf9ae0da65	1	Other	Other
+8b0ae8df-9b92-45e8-af68-19a8021c502c	1	Other	Other
+8b0aef0d-0795-453a-8066-7a681dcc8476	1	Other	Other
+8b0b1294-511f-48a9-a4dc-86816bb1c184	1	Other	Other
+8b0b1b2b-d1ad-401b-8f3e-76e385b0c130	1	Other	Other
+8b0b8160-40e3-4c35-bd2e-dec2540d566d	1	Other	Other
+8b0b962f-2fc5-4221-b82d-26cb86fc18cc	1	Other	Other
+8b0be8ff-c8b5-4548-a49d-479a164ff2c8	1	Other	Other
+8b0c35c6-0379-4046-999a-16f30c956590	1	Other	Other
+8b0ce23e-a78f-426e-a522-1c8e8e3b4043	1	Other	Other
+8b0cf64b-9705-4b8d-ad70-34a2f6031010	1	Other	Other
+8b0d0aa8-ca48-4c66-b74b-837463c1157d	1	Other	Other
+8b0d1461-91b7-47d2-a58d-422381986282	1	Other	Other
+8b0d1494-17d4-4791-af59-9559689c93bb	1	Other	Other
+8b0d337e-fe1d-45ce-b0d2-f0cab705b71f	1	Other	Other
+8b0d4f9f-5072-4e2a-9385-b702e8df1428	1	Other	Other
+8b0d6602-a51d-4c8e-b9c8-907ae32c3d13	1	Other	Other
+8b0d77f9-91e5-41a8-ac37-cc5d7a189700	1	Other	Other
+8b0d8ff6-74ed-4eb8-bde0-094c72f769fd	1	Other	Other
+8b0db5ba-16e9-48f7-b807-4027a4428530	1	Other	Other
+8b0dd965-816a-467f-9300-22dab071ee4d	1	Other	Other
+8b0e0ecb-fca5-4c2f-9f4a-47023e90700a	1	Other	Other
+8b0e29ae-1f13-417c-bfbb-dcc98d548b39	1	Other	Other
+8b0e2bb4-194a-4a6f-ad25-04109e485839	1	Other	Other
+8b0e39c2-e5f5-4c2d-be5d-5dce715a54bd	1	Other	Other
+8b0e3b6d-0061-45bf-a3ca-0629fd79429d	1	Other	Other
+8b0e9469-3ec8-477d-a807-34e7d34de613	1	Other	Other
+8b0ea359-7f4a-402b-91a1-75d18035ae42	1	Other	Other
+8b0f5e27-7558-4735-8cb4-a34dfb9d1b19	1	Other	Other
+8b0fc432-f057-4e3b-a4f7-8a913fcae8a8	1	Other	Other
+8b1007c5-b11e-4bfd-9582-d2470b3f70f9	1	Other	Other
+8b1035c5-6c4c-466a-8832-6a1a4a34dfbc	1	Other	Other
+8b106c54-7608-47f8-b385-d3cf38937991	1	Other	Other
+8b106d89-65e0-4cb0-90a0-1324f70a4176	1	Other	Other
+8b107ed9-5ae0-48b8-8f80-6271b22cfbda	1	Other	Other
+8b108a41-6574-4032-aaa9-3b600d812913	1	Other	Other
+8b10a2ff-c7b3-4e7c-807c-690deeee21a1	1	Other	Other
+8b10be0b-251e-4b7b-837e-6f7d1989be30	1	Other	Other
+8b10c84e-1f1a-44e9-976e-6763520e95e7	1	Other	Other
+8b10ee01-428a-45b8-8c13-b41fb2187614	1	Other	Other
+8b111834-afd2-4898-b597-86811b1451c8	1	Other	Other
+8b112c9e-a9e0-4eb0-a67e-b442e2d7d444	1	James	Other
+8b113d39-462e-4a3f-8d85-245c4ef50619	1	Other	Other
+8b11a862-007f-447f-9da5-1871bb987f55	1	Other	Other
+8b11bc5f-58eb-4a6c-8066-0c7002a2caed	1	Other	Other
+8b11d9f3-f12f-47b9-89be-7982cdf79a18	1	Other	Other
+8b120dc0-75c7-4c94-8b4c-6339cbbe67ec	1	Other	Other
+8b129e76-8234-4796-9bf4-34905ad94cf5	1	Other	Other
+8b12b0a2-c876-4200-9d0e-d078364df4c5	1	Other	Other
+8b12d6ea-1b09-4501-b1b0-df392a05442d	1	Other	Other
+8b1336a9-795d-4037-b6f7-19206f1d8f81	1	Other	Other
+8b13421c-7302-4563-a6aa-0314ad6d253d	1	Other	Other
+8b136f94-9c0b-4378-90e5-bf61cc65875a	1	Other	Other
+8b1374be-80e1-46b3-b29f-c4a4e01164f8	1	\N	Other
+8b13774d-9e66-47ae-800a-2b39cb86395a	1	Other	Other
+8b13a6fb-d188-4ed4-b4cb-58ae6d2940cd	1	Other	Other
+8b13b148-1b12-4e59-896a-ad305a7b7345	1	Other	Other
+8b13bef9-34be-463f-933a-8354526a4468	1	Other	Other
+8b13e20d-6525-45a7-ae67-487bc5cfe2b0	1	Other	Other
+8b13f610-8af4-4137-bfa7-c7b956f60aff	1	Other	Other
+8b142f50-c08f-4e54-b769-2aaf6305aa84	1	Other	Other
+8b148d63-e1d1-4431-8ae1-9b5e0d9f07cb	1	Other	Other
+8b14a26b-b549-47b6-8ded-a17b63f4b3f8	1	Other	Other
+8b14c34e-8de3-41ec-9f9d-aac16ccbb3e4	1	Other	Other
+8b14d3d5-c1bd-4d83-aa94-c17d47d1f52f	1	Other	Other
+8b15239b-9a7a-4de4-a9d7-5cb2ba1f5ded	1	Other	Other
+8b1548c0-2890-4f3f-a510-6b4177972ec9	1	Other	Other
+8b154bd1-c79d-40b5-a454-908235211f11	1	\N	Other
+8b15aaed-4cf1-4a35-abb6-b7946d16cb27	1	Other	Other
+8b15cd02-94cc-417b-b263-6c72aed04168	1	Other	Other
+8b161587-d11b-4ef3-9464-f7cb88295c5e	1	Other	Other
+8b163096-94fd-4837-8757-e31970fe36be	1	Other	Other
+8b164c7f-3963-4d41-87b2-df701472352b	1	James	Other
+8b166029-c699-4032-a759-e5cc955a4f0a	1	Other	Other
+8b1664bd-a0fb-44c6-9cbf-f70f26ad889e	1	Other	Other
+8b166bee-ed3a-41d4-8ff3-6433cecf6219	1	Other	Other
+8b16837d-b3b7-44f7-90aa-0eb6ab29f383	1	Other	Other
+8b1685ab-6bf6-413a-9671-903be1437f5d	1	Other	Other
+8b16a209-db14-410c-9fd5-15ef8f80645d	1	Other	Other
+8b16b8e8-3267-4e72-ae82-ba47e0545a06	1	Other	Other
+8b16c60d-9a4c-4c15-b2f2-3b70fac9acc8	1	Other	Other
+8b16d574-d3a2-44f5-adc2-e8596337be7a	1	Other	Other
+8b177d9b-c3c4-4a80-b834-5b56acdf6039	1	Other	Other
+8b17f1ab-697c-47f5-ab97-88b866edcee6	1	Other	Other
+8b17ff11-136a-474b-83f9-17f78166bcd9	1	Other	Other
+8b183b40-ff99-491d-b8be-eab8e9d50018	1	Other	Other
+8b183f67-e517-45aa-84f5-015e6b320b88	1	Other	Other
+8b18e4b4-e8be-4e80-a0bc-268718a995d2	1	Other	Other
+8b19689f-4bd1-4218-aa6d-de19a94109ec	1	Other	Other
+8b19ccb6-f2f5-42a8-8451-690a2a200b14	1	Other	Other
+8b1a6ec8-44c1-4188-8b31-b0d53684f986	1	Other	Other
+8b1a701f-5781-484e-b6e4-5c57e8ac3237	1	Other	Other
+8b1a9267-adc1-45b6-b9fc-69d07f963912	1	Other	Other
+8b1a966b-8622-44da-93f6-25b476c80e12	1	Other	Other
+8b1aa506-698d-43c4-a80d-f666b29aa6ce	1	Other	Other
+8b1ab83d-f8d1-43f1-8d4e-619698761150	1	Other	Other
+8b1ad2bb-d947-436e-a630-522ef4cea863	1	Other	Other
+8b1af487-61b8-4620-b9e9-e2ca1f4230cc	1	Other	Other
+8b1b0f33-d056-46ea-b50a-f1a09efcf4dd	1	Other	Other
+8b1b1855-8ca2-4d98-958e-fb145edf9b97	1	James	Other
+8b1b6226-62fa-45ff-a822-004024c68cd4	1	James	Other
+8b1bcc15-b087-45bd-8478-8eaee1bedc03	1	Other	Other
+8b1bd917-3ba8-47ba-b13c-059d98133312	1	Other	Other
+8b1bfd77-e427-4a5e-8ade-172c1ffff909	1	Other	Other
+8b1c1fe0-8752-49eb-b6f5-1235ce44fccb	1	Other	Other
+8b1c345f-cbf4-4aaf-a473-2f45bf4e98af	1	Other	Other
+8b1c688c-fe0c-4d49-87bc-462d76dba4f2	1	\N	Other
+8b1cf25c-a428-4964-9f8b-f36e1be4dc32	1	Other	Other
+8b1d279f-e857-4dea-a66b-66c20d342597	1	\N	Other
+8b1d7405-b5eb-42be-bcb3-af2f6bb7b6e5	1	Other	Other
+8b1d797a-fbee-4649-87df-079bb0f5d9f5	1	Other	Other
+8b1d8b9a-8e96-4b8c-a250-d1cacddfd6b0	1	Other	Other
+8b1eec36-b575-469e-9207-bf3d85ee7528	1	Other	Other
+8b1f06ef-cdc5-48f6-90c3-f570d2e20583	1	Other	Other
+8b1f2585-511b-41d8-be83-9f27c912e3ba	1	Other	Other
+8b1f33fd-5746-4c39-bccc-8a32e9d10784	1	Other	Other
+8b1fa90b-fd3b-4fce-8820-a6663e56bb2e	1	Other	Other
+8b1fb682-7648-440d-9972-b227da25d062	1	Other	Other
+8b2005ab-9e96-4ff7-a3e9-0b04d4317073	1	Other	Other
+8b200bbf-e933-40cc-ba83-94c5deaccbf0	1	Other	Other
+8b203ea0-72ba-478b-892d-5455e20f15e3	1	Other	Other
+8b204b72-d7ba-46b6-a7de-d9f5a04e9ed5	1	Other	Other
+8b20d35a-9e6f-4b0e-809b-7626ca7262cd	1	Other	Other
+8b20daaa-1c5b-44dc-ac55-d72acd413240	1	Other	Other
+8b212191-67f1-48a2-be11-c2e4c84759df	1	Other	Other
+8b21488b-6cd9-4589-952f-126629d57200	1	Other	Other
+8b214dc6-f4fe-406e-b962-af252708e8ba	1	Other	Other
+8b21b3e8-57a7-4a91-8822-e17996293b92	1	Other	Other
+8b21c975-d71a-4701-82e0-ced09a81a8c8	1	Other	Other
+8b221c5c-6189-4f47-8e5a-9f5c13069fff	1	Other	Other
+8b2225b5-c318-40e0-8e69-bfa11a60fd7c	1	Other	Other
+8b228013-bd15-404f-b950-d7cddc3edda6	1	Other	Other
+8b22e227-e625-4f58-9f0b-b7566ac13052	1	Other	Other
+8b22f622-8636-41d0-833c-2cfc98691eae	1	Other	Other
+8b237911-15de-4277-be85-0412b49c1864	1	Other	Other
+8b237f77-bc83-4bca-b0e8-9ac52eed9eb7	1	\N	Other
+8b239352-fc8c-4094-87c0-6b38d61b862e	1	Other	Other
+8b23a907-2c21-4092-b72b-f731617cc5d8	1	Other	Other
+8b23f59f-f02e-423b-8df2-89682408aec6	1	Other	Other
+8b241c6f-702d-4603-b32c-6a186fd71cbc	1	Other	Other
+8b243fb8-92ba-4982-9b48-ee883f6254d5	1	Other	Other
+8b2441b7-f7c3-4249-9a3d-767bd69c96a4	1	Other	Other
+8b24d22e-1ca9-41ec-a4df-67bdf081c6af	1	Other	Other
+8b2525a8-b377-4901-b8e9-046fd3dcf510	1	Other	Other
+8b255445-049d-4018-9650-44c9a0fb74d9	1	\N	Other
+8b25b802-d9e3-44c5-a00a-26b5969653af	1	Other	Other
+8b25c24e-4ee4-480e-92e6-de5251f64f1b	1	Other	Other
+8b25dd5c-82a8-401e-a44b-8d65e7ac31e2	1	Other	Other
+8b25f0aa-9dfe-4029-a0d1-ba6c858c8ad7	1	Other	Other
+8b25f20a-c875-4ebf-8541-d1d83e50967d	1	Other	Other
+8b25f58a-9a8c-4508-83a5-e038cab031a8	1	Other	Other
+8b265f67-8430-4a39-809e-4f8c3b095aee	1	Other	Other
+8b266912-2155-4c74-8cea-ca145396ab58	1	Other	Other
+8b26ce74-631f-491e-a16b-2a08a45cb8b1	1	Other	Other
+8b26d7df-71c6-46e9-988c-5e615ede5659	1	\N	Other
+8b271871-7575-4daa-8d66-68090957ffee	1	Other	Other
+8b275593-a45b-4fbd-b722-8998e1f048db	1	Other	Other
+8b278248-ee26-4973-82a8-d1d100bd67e8	1	Other	Other
+8b27c7ca-7828-45c1-bd9e-153208419eeb	1	Other	Other
+8b27cb29-d2fb-48e2-9e9d-f40a5a211831	1	Other	Other
+8b287042-c51e-4585-a4f6-e5dd03d300c0	1	James	Other
+8b287dcf-00ea-4b48-b8d4-2fda64e34264	1	Other	Other
+8b28e1ad-7c1e-4ce5-9c60-9750e18f08f8	1	Other	Other
+8b28f31b-219b-4745-8339-19316045d048	1	Other	Other
+8b294289-4d35-4e46-b754-511224e7aa2b	1	Other	Other
+8b295a15-c21a-4868-bdc4-f449eec92b68	1	Other	Other
+8b299f36-1681-469d-b3cd-cc2030dcdf3c	1	Other	Other
+8b29cd2b-1e5f-4e9c-bb54-44e1b0333269	1	James	Other
+8b2a015a-8591-4ef2-afad-8c2dda234861	1	Other	Other
+8b2a0770-0b18-43c9-bb66-66509061f6fe	1	Other	Other
+8b2a383e-9c62-11e7-92e6-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8b2ae651-ae44-4f1d-a8f9-43d6a1236b6d	1	Other	Other
+8b2ae6e0-3b66-466d-a53a-2eb6d2620bc0	1	Other	Other
+8b2b41de-0be8-11e8-8b08-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8b2b881f-7ccd-4fce-bbea-fcc71894232e	1	Other	Other
+8b2c0949-ffa7-4c6c-beba-64734ea17354	1	Other	Other
+8b2c1594-a7be-472a-8a3e-e05f63b48639	1	Other	Other
+8b2c4343-2c53-430d-bd64-24f4d5b26cfe	1	Other	Other
+8b2c811a-0355-4b8a-a272-d4a899de1844	1	Other	Other
+8b2c9fe6-c615-4070-9674-202aebd9dcfb	1	Other	Other
+8b2ca0c5-4d00-4c67-8d99-f707e48b5c89	1	Other	Other
+8b2cde6d-0225-4805-ab51-f9dbd29e9a69	1	Other	Other
+8b2ceb49-e913-4b2c-9547-5dc9a1469726	1	Other	Other
+8b2d1c0e-190b-45fa-9ccf-573291031c43	1	Other	Other
+8b2d9ef2-6c4d-4efb-85ac-893acb351b18	1	Other	Other
+8b2df65b-7596-48c8-8724-862c1551ef6f	1	James	Other
+8b2e2e42-7327-4ca6-b53e-32647415a5e1	1	Other	Other
+8b2ebde0-99be-4799-9d8f-d7b3b6b69d06	1	\N	Other
+8b2edfaa-6fe9-4321-969f-c7f5d7dad9ce	1	Other	Other
+8b2f9c12-acb3-47fc-8067-9ec46c0ccd5b	1	\N	Other
+8b2fa270-0d72-42cb-93ac-5ff0b1196737	1	Other	Other
+8b2fb91e-df89-4146-b106-c2231f6bc8d6	1	Other	Other
+8b2fe216-4fa7-45bf-b51d-a52a86ddb61d	1	Other	Other
+8b305879-fb26-4183-881b-9a6dd4f1ffef	1	Other	Other
+8b30edfa-197e-43fe-8cc0-2b21432e542f	1	Other	Other
+8b30ffd2-111d-4c09-b097-88f26dc109d1	1	Other	Other
+8b313763-ddf6-4d3f-9516-bb10c69fdeb4	1	Other	Other
+8b313d7e-5bd2-4172-9684-0f754a426370	1	Other	Other
+8b319fe4-4983-4c6c-9e70-4ec0c54ef52c	1	Other	Other
+8b31adfa-6aa9-43e3-86b6-d766c8a8b201	1	Other	Other
+8b31d51e-303e-4d82-8676-02297c7f5230	1	Other	Other
+8b31fa33-9455-41cf-94f0-68e1bf4df9dc	1	Other	Other
+8b3208f3-9a50-4379-b2c3-8eb499b30672	1	Other	Other
+8b3234ab-795e-49e2-869e-994f96bed166	1	Other	Other
+8b324eb2-b29c-42f5-bf78-cf4c41833df4	1	Other	Other
+8b3255f0-47f8-4414-9440-10927956792c	1	Other	Other
+8b3259ec-e541-4ed9-9ef6-37ff16259a8e	1	Other	Other
+8b326398-3f7a-48b3-a84f-587a59ad8cae	1	Other	Other
+8b3283d9-a2a7-4b75-87fa-54a517e1c624	1	Other	Other
+8b32f950-48f1-4b48-999d-62f8e9273b5d	1	Other	Other
+8b32fff7-101a-4cbb-8c42-8bb260d22732	1	Other	Other
+8b3313d1-8451-479f-aec5-c8488d56c318	1	Other	Other
+8b33bd72-dad8-4dc5-ab66-c54a1892e96c	1	Other	Other
+8b33d27d-edc3-4d9b-b1e6-b811fd11420b	1	Other	Other
+8b341095-004b-4a06-92bc-508d4c70f86b	1	Other	Other
+8b342793-92af-4c90-9552-dd29f694632f	1	Other	Other
+8b344a7a-7922-435e-ad9c-0fa57c3da2f3	1	Other	Other
+8b3494c7-92ea-4b6c-b263-9712c13f8f4c	1	Other	Other
+8b34bd1a-784e-430b-bfb6-dd9fd690b458	1	Other	Other
+8b34cfaa-06f9-4641-ba94-a6a0c3de0356	1	Other	Other
+8b34f74d-61df-4cf0-83cf-6e81ad8d1274	1	Other	Other
+8b350f7a-4981-475f-b6af-0e8fea1d9a56	1	Other	Other
+8b351fa6-0a21-404a-a363-c8813b3e6944	1	Other	Other
+8b353d05-6e12-43fc-ab37-0074fea37220	1	Other	Other
+8b3542a3-a858-4f5d-9ecd-2adada5771e9	1	Other	Other
+8b354442-1db6-4ffc-a7cd-825193174595	1	Other	Other
+8b357276-0623-444a-bc3f-29b7625e48d2	1	Other	Other
+8b35bd2c-c353-43ca-9cf4-990831067b78	1	Other	Other
+8b35d20a-b2a6-4f43-b4c3-1578b8446cd4	1	Other	Other
+8b35d4ae-86ba-4d4c-aa8d-a55f4e70fa9a	1	Other	Other
+8b35d772-f74b-422b-8eb5-72a493305517	1	Other	Other
+8b35fb4f-6cc9-464f-8d30-e14fa96ccc57	1	Other	Other
+8b362ac6-2ddc-410d-83d6-491552781b89	1	Other	Other
+8b366129-0f69-4348-8996-ad4265d5c489	1	Other	Other
+8b36a318-d0ec-4986-b3c0-35361d719fdb	1	Other	Other
+8b36b651-1d01-4e57-81d3-53cd56322e75	1	Other	Other
+8b36d758-a5b3-4cd9-993b-d9e662396fdb	1	Other	Other
+8b36e0bd-b12e-464e-9a7c-a05b0cbd095c	1	Other	Other
+8b36e32f-140e-45ff-aa21-ee877ae14689	1	Other	Other
+8b37468a-20ca-4087-ada9-b103048ac7ba	1	Other	Other
+8b379777-c95f-4b2d-ba9c-f2f4e507fbc8	1	Other	Other
+8b37b4cb-76b4-4921-881e-43e0cf5075de	1	Other	Other
+8b381ef7-b10d-4421-9398-a755170728a3	1	Other	Other
+8b38212a-14bb-4e87-9abe-58820bc64b79	1	Other	Other
+8b383b71-4bcd-4e4a-9509-bc745d534d88	1	Other	Other
+8b3857e4-6828-4775-a396-627a791e2283	1	Other	Other
+8b3865c0-7744-4c60-ad54-22e95ef12258	1	Other	Other
+8b389a49-50c2-4ada-826a-6e23db044d9d	1	Other	Other
+8b38b4c4-7499-43cc-b00e-696f033883fb	1	Other	Other
+8b38b50a-8d3c-40c7-bb53-6225bc0df1ee	1	Other	Other
+8b38c526-98f9-4299-b1b6-7701e6e6891c	1	Other	Other
+8b38ce25-2a86-4c7d-b1de-1670a0efef50	1	Other	Other
+8b38fae9-ed1b-411e-b259-7f77d15eb7fc	1	Other	Other
+8b39658d-3a50-4ee1-924e-7b3036fbc31e	1	James	Other
+8b3976ef-2ff8-49b2-97a4-59c26add96cf	1	Other	Other
+8b39cebe-945c-40eb-981f-dbef5ee46023	1	Other	Other
+8b3a41c9-090d-4558-94c8-f02101c14d10	1	Other	Other
+8b3a5a8a-7c78-4742-a306-4e928571f7a0	1	Other	Other
+8b3a6353-0686-42cf-bc5e-77bf8512e149	1	Other	Other
+8b3a89c8-15cb-4111-9ba5-3e92c17033be	1	Other	Other
+8b3b502b-63f9-40c4-abbb-741d82d19549	1	Other	Other
+8b3b6abf-484d-4791-b20c-dce215f97185	1	Other	Other
+8b3bbc3d-f1fe-4873-baad-6c22127ff6df	1	Other	Other
+8b3c1376-6595-4027-98a6-df3eb241c182	1	Other	Other
+8b3c34c1-eebb-41c5-a1e1-a957cbfd581d	1	Other	Other
+8b3c458f-86ea-43cd-960e-9b78948b1f95	1	Other	Other
+8b3cc074-4253-401a-ba88-d2b97fda0026	1	Other	Other
+8b3cc394-7d05-4007-b43e-4ae669189976	1	Other	Other
+8b3d1bda-f2a4-4338-881a-582ec28e45fc	1	Other	Other
+8b3d1da6-4919-4d9f-a142-93cfc20e1c9a	1	Other	Other
+8b3d1dd2-c6d5-4346-a5af-272da409e6d3	1	\N	Other
+8b3d3a52-9584-48fb-bd69-dd4d9d8ea9a8	1	Other	Other
+8b3d3ea4-2630-44f1-9132-9f7f80e258ba	1	Other	Other
+8b3d3f4c-4ce9-40f6-9ad3-51fa10f7867d	1	Other	Other
+8b3d8993-77a9-4db9-bcf6-4fcee6513842	1	Other	Other
+8b3dc925-1ab8-4354-90f2-c9c08f03bd21	1	Other	Other
+8b3e1b02-f8eb-4edb-b301-7830e532b49e	1	Other	Other
+8b3e615e-0579-4675-9eb0-1e16b42e9bb4	1	Other	Other
+8b3ea51a-ad31-41b5-ab2e-d415d72c5ad9	1	Other	Other
+8b3eb324-0ed4-4d07-8eea-bc7b55227a11	1	Other	Other
+8b3ecbba-8bd1-4672-982e-77ee51cedf05	1	Other	Other
+8b3ee40a-7a03-44e7-932f-9b9430ef8eb3	1	Other	Other
+8b3f836f-faca-4b81-93db-b06d0631b610	1	Other	Other
+8b3f929d-bf35-4e93-b56e-1f45df1dbb9c	1	Other	Other
+8b400d7c-175b-4d0b-907f-320db812a103	1	Other	Other
+8b407f76-875e-48ab-ad95-1c556311b8bf	1	Other	Other
+8b409b15-d2b0-4408-8cf6-27759bcb3c07	1	Other	Other
+8b40aca3-b9ac-4511-9d8b-ffc276f1b57c	1	James	Other
+8b40cce6-48fd-4217-9b71-081a54d7e05d	1	Other	Other
+8b41007d-8215-407f-85bb-1032d07bb7ec	1	Other	Other
+8b4106bf-8b84-4f37-a76c-52d4483178f9	1	\N	Other
+8b411850-9dfe-48bb-bd45-2322313f896a	1	Other	Other
+8b414c8b-070d-4b93-98f7-f68a53dfeb0e	1	Other	Other
+8b4150c1-2191-45f4-b260-ffcc2cde8f75	1	Other	Other
+8b4179e9-5a35-4ceb-91b5-2209baef6a35	1	Other	Other
+8b41ca04-6950-496a-8593-bb39bc94daee	1	Other	Other
+8b41cd7e-0054-4d09-8424-f3d33be7d462	1	Other	Other
+8b4219c4-4ce1-4d1e-83ef-11c1c6998959	1	Other	Other
+8b422207-f49b-47cb-937c-5664be88907e	1	Other	Other
+8b422e2f-4872-49a6-85a2-dc1368fc7299	1	Other	Other
+8b425356-7eee-47d5-96a0-c7579445e2ce	1	Other	Other
+8b42670c-1e91-450e-81d7-0a42649b0049	1	Other	Other
+8b429168-374a-414f-baa2-1bc682be8ff5	1	Other	Other
+8b42ce48-7bd4-4dd5-8d85-b8cd9d8b4940	1	Other	Other
+8b432db7-dc00-46e5-87b2-7b2007a9f86f	1	Other	Other
+8b4377b2-5dcc-4eae-bbcb-b39e4d752d2f	1	Other	Other
+8b437db7-c2fa-45f2-9d4b-b99f14132e9e	1	\N	Other
+8b438fe6-ccbe-4111-a9de-2343ee78909f	1	Other	Other
+8b439309-0abe-4adb-91d0-4a38ed52af15	1	Other	Other
+8b43bdd5-a970-48d5-a186-178345ca61f5	1	Other	Other
+8b43ff18-9d3c-411f-a70b-a6e39d5cf604	1	Other	Other
+8b440923-79cc-449e-a753-26762971f137	1	Other	Other
+8b440e69-e958-49a4-b4b3-5c04edb8bedc	1	Other	Other
+8b446ec1-5d97-4cdb-b324-af9164024286	1	Other	Other
+8b44a2ef-6fff-416a-9f34-2310a8020586	1	Other	Other
+8b44da5e-431b-494b-aa28-ba59ba924194	1	\N	Other
+8b4508a7-337f-4639-9f66-855e95cb69c2	1	Other	Other
+8b450d81-68c8-4994-a38f-5e8f95ca14f1	1	Other	Other
+8b451bd6-b22a-47e4-985a-e073836f1e88	1	Other	Other
+8b455885-53d4-4385-abd4-557c4870ac6c	1	Other	Other
+8b456629-f90b-4b6c-b444-6d6e0ce017ef	1	Other	Other
+8b462323-d0d0-42fb-9bf6-d63cea92ac42	1	Other	Other
+8b462da8-2989-42dc-926d-9628594f1b37	1	Other	Other
+8b466bf9-efbd-4335-b23b-74fd8dee2412	1	\N	Other
+8b47670b-87b2-4b7c-864f-1f491d7a56e7	1	Other	Other
+8b47824a-85f8-4167-86ee-caccae2972f2	1	Other	Other
+8b47b357-c357-4d17-9798-694705131866	1	Other	Other
+8b47cb6f-c435-4464-bda8-751f59563099	1	Other	Other
+8b47ce5c-e448-489d-bf3e-fb5a6ebe6784	1	Other	Other
+8b47f088-be3c-49ce-9e32-7e9674b2bb92	1	Other	Other
+8b480701-faba-44a7-bdd9-c3db66db1c51	1	Other	Other
+8b482864-9165-4081-a224-0a28c33476da	1	\N	Other
+8b484104-c86b-4135-8e6b-c4ac4ebc86a1	1	Other	Other
+8b484a0e-85a2-420d-969d-c9cbb1232a67	1	Other	Other
+8b4967ad-5332-4af9-8519-bc00955d869b	1	Other	Other
+8b49c754-a369-461e-8e19-28c17164b759	1	Other	Other
+8b49f03f-5fe9-4807-94e5-191dbe30d1de	1	Other	Other
+8b4a0dc4-21de-4b79-ba73-baa8c6ab08bb	1	Other	Other
+8b4a4510-4207-46a4-8578-2fbfc391d85c	1	\N	Other
+8b4a50c9-26ea-4f4a-894f-4091f64c9a9b	1	Other	Other
+8b4a91f6-b64a-462c-a0ca-a086e561a0e7	1	Other	Other
+8b4acf6d-ce30-4e71-b9e4-de8983fcd3b3	1	Other	Other
+8b4ad60d-4c23-4c65-99ca-3e7ca62acd41	1	Other	Other
+8b4b12c9-abc1-4d00-a0c1-8d2554d6063e	1	Other	Other
+8b4b1766-bfc1-4a5d-bc21-8b5f89704011	1	Other	Other
+8b4b2e91-fd74-4c22-88b3-1b5de89261df	1	Other	Other
+8b4b3e50-ea2e-4de9-b612-c0b945dada0f	1	Other	Other
+8b4b6198-5b4d-4648-a11f-afa459b5f5fc	1	Other	Other
+8b4b648f-2f80-4f4c-a8ab-283c0242ca83	1	Other	Other
+8b4b758c-ad91-447c-b76a-8a4d1b664b01	1	Other	Other
+8b4b809d-aef2-479e-88c3-16a4ff5b0ba7	1	Other	Other
+8b4c2e34-2ece-46ae-9b9f-4d459e9f2045	1	Other	Other
+8b4c3121-3219-4623-810a-5d11d7c07d0a	1	Other	Other
+8b4c80dc-7251-4a54-b1aa-3388207b4e6e	1	Other	Other
+8b4c9432-9a18-426a-bd1c-cb0dad6bbcc7	1	Other	Other
+8b4d3961-0866-4d29-b482-b039f2d4ddbb	1	Other	Other
+8b4d6f5e-d93f-4471-857b-a669e6cab408	1	Other	Other
+8b4dc0d8-c1eb-45f3-9e5c-040b27c4dc66	1	Other	Other
+8b4e4b59-afd6-460e-9c5a-d2b2b9830c90	1	Other	Other
+8b4e5271-87e5-404d-bbbc-081d62596778	1	Other	Other
+8b4e60f2-5a6e-425c-933c-014cfcd18c4a	1	Other	Other
+8b4ea3d3-0f5a-486a-bece-11381fca7df2	1	Other	Other
+8b4eb9fa-8e2f-4648-a5cd-6aa0af87cd59	1	Other	Other
+8b4f0535-10c1-4ad7-b7c7-9761a527a6d7	1	Other	Other
+8b4f5b54-50c3-442a-a3d1-0b1f07885ead	1	Other	Other
+8b4f78f5-3dac-4811-b9b2-01b169cfd993	1	Other	Other
+8b4fb507-1f14-466b-a708-52cf2a554e8e	1	Other	Other
+8b5007c3-ce8e-4df4-a467-3c3ab05563fb	1	\N	Other
+8b50e655-b6f2-4fb8-a725-f5b01cfcf75d	1	Other	Other
+8b5111a7-161a-46c8-ab28-f35289bda322	1	Other	Other
+8b51bffa-05ef-42be-9b81-f97c2f25f662	1	Other	Other
+8b51c6ab-bb13-4544-a40d-07d08bd9f976	1	Other	Other
+8b51f767-f217-43cd-8f57-36466bb507a8	1	Other	Other
+8b52862b-6c94-481a-9cbf-b25a3397e577	1	\N	Other
+8b5305a9-e096-4473-9ef2-0325b8d56c4b	1	Other	Other
+8b5305c8-e3dd-4f62-80e8-e15b8a291ead	1	Other	Other
+8b5327b2-6daf-4dee-a825-e3e3af693084	1	Other	Other
+8b533cd3-c45f-4989-9589-0935d11ba186	1	Other	Other
+8b536530-d271-4365-90fc-085571558bb9	1	Other	Other
+8b540c83-350b-4ad9-bed0-6d8785e6f67a	1	Other	Other
+8b541849-40de-4be1-b2a1-15faec444354	1	Other	Other
+8b542b0e-970b-49fa-a913-d0ff9457a628	1	Other	Other
+8b5481c0-1f25-4d86-9570-a7649da84545	1	Other	Other
+8b5483b1-2e1b-4ffa-8e3d-e898583b233f	1	Other	Other
+8b54aa3a-5066-4c11-9fb1-23978b690adc	1	Other	Other
+8b54b278-ecb5-409d-97db-3733a9c686dd	1	Other	Other
+8b54fee0-89ee-4afd-8b1e-ced37dec852d	1	Other	Other
+8b553ca4-f68e-4d58-bcc0-b81d465865b4	1	Other	Other
+8b5547ae-efa7-44c5-9c31-f09d978b1446	1	Other	Other
+8b56280f-0a1d-4c2d-bb72-39fbafae1d50	1	Other	Other
+8b562e15-1119-4d05-8775-93613d199fc4	1	Other	Other
+8b56477b-6011-4d8d-9dc6-ad3dba6e7d95	1	Other	Other
+8b569410-0fb6-456d-83fb-0cb32f96cf2c	1	Other	Other
+8b56e3c0-7ec7-4225-859a-eb57ccafbf1a	1	Other	Other
+8b56e3f8-7ff6-4e51-89df-783f8db09709	1	Other	Other
+8b575048-9c90-43f2-848f-00c51d5babce	1	Other	Other
+8b579fa0-2fa6-4f25-9968-146fc17bfc59	1	Other	Other
+8b57b1c4-4e3d-4e80-a67e-f7aafacc6ad9	1	Other	Other
+8b57c585-bcc2-4244-815f-108c685465bc	1	Other	Other
+8b581d07-87ee-40e6-adc2-1276282109ba	1	Other	Other
+8b583ed3-9893-4e69-86a1-e361e8e583e0	1	Other	Other
+8b584176-d412-4750-b542-af2f832872a7	1	Other	Other
+8b58619e-d2a3-4fe8-bc87-571a94e109a7	1	Other	Other
+8b5872d9-c3bc-4f0b-8b95-210a15e88e60	1	Other	Other
+8b58a9d7-54e0-4182-bb5a-2e478474ec45	1	Other	Other
+8b58c0a7-c74d-4129-900b-988b16ddeef8	1	Other	Other
+8b58d38d-6dbd-4077-9879-950c32a8a533	1	Other	Other
+8b58d70d-43a0-4568-9e00-c2a87ffdacd5	1	Other	Other
+8b58feb2-cacd-46eb-9349-51777391fd6c	1	Other	Other
+8b59059f-9653-4c87-a773-327c24f2797f	1	Other	Other
+8b5925e9-1003-4135-93b8-04fe9348eb99	1	Other	Other
+8b598c80-ccef-49f3-a1ed-616640604054	1	Other	Other
+8b59faa0-361e-46ed-85c5-79d09d613d13	1	Other	Other
+8b5a27dc-ae7c-49eb-b7f8-40cb7f6c72b3	1	Other	Other
+8b5b2437-c12c-49b2-94b7-6601b984b35d	1	Other	Other
+8b5b81de-9e63-47a2-9ecb-9a5db4496f97	1	\N	Other
+8b5ba10a-2a6d-485b-aa66-24f0a408f255	1	Other	Other
+8b5bb3e4-2589-4bba-ae56-e7787f8ef89d	1	Other	Other
+8b5bb65c-05db-4b01-bfce-c935621b1c6e	1	Other	Other
+8b5bfce4-6b03-4b0c-bfe2-4a8f5930db57	1	Other	Other
+8b5c264f-a2a2-459c-88f3-e8a5540e0d7f	1	Other	Other
+8b5c88d0-a1f4-4397-987d-8645f7cadc46	1	James	Other
+8b5ca971-3f70-41b0-ae30-d62f8b082c4b	1	Other	Other
+8b5ccbf9-f96f-4635-9d3d-e7a12d7e216d	1	Other	Other
+8b5e0970-4f42-48f3-8bac-cd1b10436f55	1	Other	Other
+8b5e147e-f2a6-4493-a23c-1b425fb73510	1	Other	Other
+8b5e2583-8443-4e6c-8f35-d1c98c2d3845	1	Other	Other
+8b5e2899-1e53-4f97-b423-7700ab046f79	1	Other	Other
+8b5e381b-58d9-4f4e-b9c1-21d08637198d	1	Other	Other
+8b5e57d9-67d7-44f2-93bb-de40e0604907	1	Other	Other
+8b5e6ac0-83e8-4e3d-b788-0b1c4601ca1f	1	Other	Other
+8b5e92b9-c622-4707-acc4-f2c617304f29	1	Other	Other
+8b5ed9cd-b682-42cc-abb4-fa4554c67eb8	1	Other	Other
+8b5ef42e-c6c9-4162-b48f-17ab8ba82e47	1	Other	Other
+8b5f37a5-6787-4a4c-b762-981fbb76310f	1	Other	Other
+8b5f61fc-c867-464e-b7bd-9a43534aa17d	1	Other	Other
+8b5f8f41-d3b3-483d-b3e9-fd213e6054a8	1	Other	Other
+8b5fa1d8-4a96-4450-a7d1-f7ec9fbfb19e	1	Other	Other
+8b5fc410-1866-4766-bfd4-4567dc60ac20	1	Other	Other
+8b602fe3-84fb-4035-9250-f0417fa00208	1	Other	Other
+8b604507-5f26-4b4c-a21f-d6ba9b6bddfd	1	Other	Other
+8b60b073-2ddc-4a84-89df-75e45038db43	1	\N	Other
+8b60f211-c869-4f9b-9223-f78ba4623823	1	Other	Other
+8b60feda-7776-4f94-a7d7-f66b62e2341e	1	Other	Other
+8b610802-6b60-40cd-a3ed-d4c561e838eb	1	Other	Other
+8b614d21-37c6-49b4-bed2-c880a5b2d81d	1	Other	Other
+8b615cb9-ae52-4e08-be26-4bf7af26645d	1	Other	Other
+8b61d970-da04-49bc-8a57-05ab42570241	1	Other	Other
+8b61eb2a-851c-417f-80e0-ecea3003de18	1	Other	Other
+8b62377b-bb9a-4d41-af35-97c00b0a5d02	1	Other	Other
+8b623e48-4ec8-465c-9825-36054e94bf00	1	Other	Other
+8b62634e-ebff-43ed-bfaf-79597ce56bbe	1	Other	Other
+8b62c4d2-1f03-4960-b26c-cce8a653f5fa	1	Other	Other
+8b62e909-34d3-4a37-b984-b99133c0110e	1	Other	Other
+8b62fce1-0f00-461b-8268-2e2f2e9df798	1	Other	Other
+8b632cb5-abc0-43cc-aabb-a95daaa7c49f	1	Other	Other
+8b6341ac-ccfb-4b4f-bd96-eef0040a119a	1	Other	Other
+8b637cfb-b69f-40c0-9335-8c9eaa69e6a2	1	Other	Other
+8b638010-fe52-4346-a675-f50e0916d19b	1	Other	Other
+8b63e4aa-b6c8-41cb-b647-e6ffda72d2b1	1	Other	Other
+8b640ae6-92df-4d36-974f-759be377b166	1	Other	Other
+8b641125-ed32-4661-a1e7-8de00f1f28fe	1	Other	Other
+8b641d3f-a8d4-45f0-bfd9-200cd9a3a38d	1	Other	Other
+8b643667-e9cc-4701-85c7-91f30ffbb74d	1	Other	Other
+8b643f64-7d46-478d-abfe-0681c416c253	1	Other	Other
+8b6469be-d613-4640-a776-a26d97c11b9f	1	Other	Other
+8b6480aa-4999-4d71-9a65-0d2c97bc29aa	1	Other	Other
+8b64b152-16aa-4ef7-9c8a-c937fba1559e	1	Other	Other
+8b64c6e3-0df7-49c8-9397-33c3a459ff0b	1	Other	Other
+8b64fef1-4dc2-49d7-ab83-8916837b41cd	1	Other	Other
+8b6530ff-7096-4214-8087-9d994968957b	1	Other	Other
+8b65af27-b68e-494f-9824-4c8948fc7d37	1	Other	Other
+8b65ffb9-5f4e-4205-a036-a89160fba97f	1	James	Other
+8b6600f7-a30c-4017-abc7-a25e846e6e2c	1	Other	Other
+8b665c7d-8c73-421b-9eb6-60d0073a8c10	1	Other	Other
+8b665faa-3610-4a6e-b0dc-a1f3512ecd37	1	Other	Other
+8b66ae6d-8717-4711-9875-ea5307765efb	1	\N	Other
+8b66c37d-b282-4745-83ac-91e4b4c9de13	1	Other	Other
+8b66dfb4-3f0a-4b7b-898d-483a4a7dc5e3	1	Other	Other
+8b670995-d985-4194-ad61-ef94bb1841c9	1	Other	Other
+8b674bb9-3bd4-4ad4-a833-06fa6493ac1a	1	Other	Other
+8b67514d-19bf-4c33-a5b8-18720c90d71e	1	Other	Other
+8b677dcd-3578-454b-b2c7-932c8a398b4f	1	Other	Other
+8b67c9dd-464f-47f3-b520-5ba720041ede	1	Other	Other
+8b67e433-3f72-4dba-8950-96a29455e8bc	1	Other	Other
+8b67ed92-45b2-4117-9b14-1a361099ebdb	1	Other	Other
+8b67f3fc-ffac-4722-b551-ab86555d1131	1	Other	Other
+8b680f78-bc6e-4986-a689-be3409415fdc	1	Other	Other
+8b683611-45bd-453f-9c8e-475c2398c40c	1	Other	Other
+8b685f30-d5e1-47c1-a563-29ca62fddb37	1	Other	Other
+8b687e91-ca7b-49d9-a669-a47c343022ee	1	Other	Other
+8b68a138-d765-47a0-bd70-827360c94321	1	Other	Other
+8b68bdbc-b470-4dc5-845c-2abde6f76fee	1	Other	Other
+8b68d2bb-eff7-4051-9718-f55b00a7ec99	1	Other	Other
+8b69166e-0633-44c8-b448-26669d374d6d	1	Other	Other
+8b69248e-d8d2-4737-a9a5-3a0fbc77f31f	1	Other	Other
+8b697b9b-a84b-4651-b9df-69a4f802e2ba	1	Other	Other
+8b697be1-e88b-4e99-8a91-ccb54121ff94	1	Other	Other
+8b69e9d5-49ae-4fdf-8873-49927a5cc98e	1	Other	Other
+8b6a0114-26c6-4740-8150-9c99c1a84775	1	Other	Other
+8b6a6108-306e-40f1-8fbe-ddd5deb5f2ab	1	Other	Other
+8b6a6236-648a-4653-811a-2f0116423c04	1	Other	Other
+8b6ad571-bd30-4c3f-8a4a-6d3eadbe9e43	1	Other	Other
+8b6bd171-8165-4165-8e8a-86a278ec7b30	1	Other	Other
+8b6c318e-4dc2-44b2-9ddd-ac9e320ac8e3	1	Other	Other
+8b6c4ed9-fc60-430b-b919-62d073fb9efb	1	Other	Other
+8b6c6221-9cd4-476f-9c14-eec64935e959	1	Other	Other
+8b6c92da-74d7-406c-a64f-cd2567e29933	1	Other	Other
+8b6c9b06-4385-4e7a-86f8-78dc0965dd6d	1	Other	Other
+8b6cb383-48f8-45b8-9391-da9e53a21123	1	\N	Other
+8b6cc00b-2755-458a-8a21-209db01f5ccc	1	James	Other
+8b6cd713-2761-4044-9f01-13a3338da84b	1	Other	Other
+8b6ce90c-e640-4609-af5a-c6052fdc62ee	1	Other	Other
+8b6d346b-acb1-4f3c-9744-91ca4fc177b4	1	Other	Other
+8b6d9192-dd38-491a-b44d-54875fd5c326	1	Other	Other
+8b6da3ef-619a-4c43-bf7d-f994ec9fc38b	1	Other	Other
+8b6dbdf9-fc79-446a-b7e9-5684049e2cb5	1	Other	Other
+8b6de30a-f67d-4538-bc03-96089cb64e0e	1	Other	Other
+8b6e086c-d0ba-4326-8c2c-5f50b59dcd31	1	Other	Other
+8b6e2e81-ab13-4b81-b9e2-a00215ea3bac	1	Other	Other
+8b6e7601-934d-48b7-a203-d6d7ae81cf1e	1	Other	Other
+8b6e80a9-c32c-4349-bd1c-403db23215fb	1	Other	Other
+8b6eb35a-26e6-4313-b60e-c77f8e452fb5	1	Other	Other
+8b6f5290-946b-427a-b4f4-34be2baec3c9	1	Other	Other
+8b6f8411-c3c0-4409-8f6d-3e3fdf55e9c4	1	Other	Other
+8b6f9df7-a489-48fc-8005-03bac8c3e3e4	1	Other	Other
+8b6fa4ce-d73a-4234-a686-04d90db355d7	1	Other	Other
+8b6fddb8-3a3e-496c-90ee-233441ab4ba3	1	Other	Other
+8b70a7eb-50e3-4a56-9d54-857deb4ea156	1	Other	Other
+8b70a87f-f671-404d-bf25-2079fa7b6c0e	1	Other	Other
+8b70c4bd-6ec9-4425-a4f5-4baca7970c42	1	Other	Other
+8b70e510-e3a4-4545-ba58-91a38851b0f7	1	Other	Other
+8b713b38-a127-49f6-bea8-6a5d5748d8e4	1	Other	Other
+8b71c312-b78a-4ca9-8c4c-143a303ea475	1	Other	Other
+8b71e8b5-60ab-498c-b828-695553d2fddd	1	Other	Other
+8b726170-0980-49c2-bc5a-c3d08df1cfc7	1	Other	Other
+8b7287c8-06cc-4089-92cc-06a9c09525ba	1	Other	Other
+8b7296de-8da6-4bbf-82a3-efb8f776aa69	1	Other	Other
+8b729a91-0c21-4088-a2bb-bd2b6945604b	1	Other	Other
+8b729a95-b315-46e4-9322-24f2378bc202	1	Other	Other
+8b72b0ad-c234-40aa-9bde-0082e3e876dd	1	Other	Other
+8b72cdb9-7599-4509-a614-96bf86429958	1	Other	Other
+8b72d211-36f6-44ae-a04f-c1cdf4cf6533	1	Other	Other
+8b732f0b-2e76-4216-9277-cb5021d844d5	1	Other	Other
+8b738947-486a-4a7e-b4e4-6c08ec17942b	1	Other	Other
+8b73a7f2-b040-4aa3-99fa-96e5573d3d0e	1	Other	Other
+8b7454c7-419a-4547-a06d-ac548a7f399f	1	Other	Other
+8b745d18-c195-4898-8e72-2aba325c9805	1	Other	Other
+8b746804-f491-49cd-9d3b-2671412973fe	1	Other	Other
+8b75016f-6e62-4a30-9381-a7e7128902fe	1	James	Other
+8b755600-ff16-406d-a9aa-98de11d2ac1a	1	Other	Other
+8b75597d-20d2-47ef-b558-d60875ec6d23	1	Other	Other
+8b758287-6597-4b4e-a0b4-cde9d6bc821b	1	Other	Other
+8b760187-9524-4369-9c31-86997d6aa9aa	1	Other	Other
+8b764f5a-150f-4fe0-87bd-3975175fda09	1	Other	Other
+8b768efc-9793-426b-9c05-e6d9bad81784	1	Other	Other
+8b7698e6-530d-4f85-8e64-5934a7344b2e	1	Other	Other
+8b76aba6-d526-4507-ae53-971983a8a996	1	Other	Other
+8b76b893-dd19-4a4a-a815-ca3fbe88d484	1	Other	Other
+8b76c8ca-9491-4e69-b55f-297192211859	1	Other	Other
+8b770287-33a5-4516-a16f-73eb2c4cce03	1	Other	Other
+8b770d6b-a8f9-4b3a-bcea-8d5911b02597	1	Other	Other
+8b7794b5-0ccf-4608-baeb-bdff46463b43	1	Other	Other
+8b77c860-183b-11e8-904c-fa163e8624cc	1	\N	Other
+8b77f6e5-0f40-4923-a8ce-09caee9a798e	1	Other	Other
+8b77fd84-8dbc-4f25-a350-bd8bd051d93d	1	Other	Other
+8b77fe86-4e71-4bef-85d4-8a986ca624f3	1	Other	Other
+8b7805dd-fdde-47f4-821c-35ab9f55c73e	1	Other	Other
+8b78187f-245b-466c-aedb-969ca8ca015c	1	Other	Other
+8b781e37-f247-4276-bc3a-981030522e1d	1	Other	Other
+8b78843e-49e9-4e9f-92b2-442570dec4b8	1	Other	Other
+8b78a355-15fc-486c-821a-f9dbab572c55	1	Other	Other
+8b78f55f-12a2-49f4-aaed-af76ea5edccb	1	\N	Other
+8b790a80-3bb6-4a14-8d63-bf6a5ca5fd44	1	Other	Other
+8b795435-b0e7-4792-81d0-ac4d2372cb18	1	Other	Other
+8b795de2-3dd1-403a-96e5-58a300914eec	1	Other	Other
+8b796149-167b-41f0-ae1f-1c707f07bdce	1	Other	Other
+8b7986cb-e119-4415-a1ce-77d31c123672	1	Other	Other
+8b79aa2a-fba1-4db3-a3be-7c0071c3de0d	1	Other	Other
+8b7a248b-4501-4190-9a7b-a3ac0774558b	1	Other	Other
+8b7ab2f5-6561-473a-ac62-4f8bed53ede3	1	Other	Other
+8b7ac12b-cc84-44e5-84a6-259ff938b4e9	1	Other	Other
+8b7b3458-6431-41c0-8e89-1c6b0e786e07	1	Other	Other
+8b7b4c84-6ae9-4e7e-9495-d98f3dbf79e2	1	\N	Other
+8b7b704c-b8d9-4380-895a-28fc28cf2d26	1	Other	Other
+8b7ba582-2448-4645-ad37-c317e020036d	1	Other	Other
+8b7bf475-7e8b-485f-981f-7982de53fe3d	1	Other	Other
+8b7bf5f9-4f61-4414-b1de-138a3432bb56	1	Other	Other
+8b7c155a-84ba-4cbc-84e9-efbd5690817e	1	Other	Other
+8b7c539b-54a7-46b8-9dd4-152484c900a0	1	Other	Other
+8b7cf96c-82f0-4b52-aa22-e79d4d0f79c8	1	Other	Other
+8b7cfd02-0e70-4cb8-9f3f-a96dd853775c	1	Other	Other
+8b7d01a2-009b-4435-a76f-b48d040fdb2d	1	Other	Other
+8b7d0232-a9dd-4934-a81e-fb244640214a	1	Other	Other
+8b7d15f8-6b84-4d75-b35f-007cbeccdda2	1	Other	Other
+8b7d2aef-67dd-477d-9f29-f6b632e90dca	1	Other	Other
+8b7d544e-a27e-4869-ad6c-7ba37f4068b4	1	Other	Other
+8b7d7650-7fcd-45b4-bab1-7c5ea277f13e	1	Other	Other
+8b7dc20f-d192-49e7-a774-b6bb5e32462c	1	Other	Other
+8b7dc976-b2a6-4110-827b-ae4422cc32fc	1	Other	Other
+8b7e147b-f2a0-43a0-a5d6-67302a92eedc	1	Other	Other
+8b7e377e-f2a7-4858-83b0-486cd40a0af7	1	Other	Other
+8b7e4e0a-bfec-4349-9d83-ec9569325eb7	1	Other	Other
+8b7ea298-49e8-4566-b918-d22e52b7fbba	1	Other	Other
+8b7eab7a-899c-46bb-8742-ff2b29f01143	1	Other	Other
+8b7eb516-7f23-4d3b-a513-4ac070af497d	1	Other	Other
+8b7ebc58-649e-4b61-912f-ed73d6674e63	1	Other	Other
+8b7f3e29-d2a5-488a-bff0-c0515fec9ebc	1	Other	Other
+8b7f45df-28fd-4841-bc38-ebe452901292	1	Other	Other
+8b7f5b48-c087-4fb2-b2bd-d3e79f039243	1	Other	Other
+8b7f62f9-fd2f-4518-9f2d-2ec1f98fafb4	1	James	Other
+8b7f65d6-7add-49e0-8d5d-df2ec8b6efe1	1	Other	Other
+8b7f795a-7c25-45a7-963a-b0a3ede3e0c5	1	Other	Other
+8b7f7ddd-aa31-430b-9d26-3d6b4339bfb8	1	\N	Other
+8b7fe8c4-0352-4f7f-bbea-fad3bda28252	1	Other	Other
+8b7ff9dd-cd3d-4220-94b5-b4fd9370d59c	1	Other	Other
+8b80766f-b766-4281-b8a0-bad57725c62e	1	Other	Other
+8b80d0e8-181c-43f4-b4de-d11f0eb9845d	1	Other	Other
+8b80d650-3de1-4c18-952e-e58cc3f09cff	1	Other	Other
+8b80daed-af51-4060-8d8f-2736bdd822f3	1	Other	Other
+8b813e44-4d06-46cb-991b-da4f8a1ca5c5	1	Other	Other
+8b814cb4-9450-4b05-bc73-b712feb8b49b	1	Other	Other
+8b816187-c5e6-4dd7-9638-1575810b4d33	1	Other	Other
+8b8185c7-8235-498f-896e-f32931d523b4	1	Other	Other
+8b81a1e9-db57-4e9b-bf93-55c60b5cd2c2	1	\N	Other
+8b81e7cd-951c-4352-a3f2-712833f8f680	1	Other	Other
+8b8213fb-40ec-4733-ac27-f33da5eb9921	1	Other	Other
+8b823722-3e4c-4d55-af38-e06e28bbf705	1	Other	Other
+8b8244e3-68ff-4b3c-a537-dd7debdd6134	1	Other	Other
+8b82a967-ab85-4294-a786-26b19dd80556	1	Other	Other
+8b82ab89-a000-466d-8c2f-816917521482	1	Other	Other
+8b82c1ef-52d7-4570-8fc4-a52496902079	1	Other	Other
+8b82c48b-b3a3-4fd6-bc4b-38559aae5835	1	Other	Other
+8b831081-3c4f-46ab-accb-b7ddd1ee9f58	1	Other	Other
+8b8374bc-0dd0-4f88-b0ee-a7762289c9eb	1	Other	Other
+8b83a2c3-8202-440d-865f-44ccf582cc39	1	Other	Other
+8b83dc99-b4a1-4c4b-9a11-15bc6c8f0b70	1	Other	Other
+8b8418d5-a9d6-4358-a7cf-866f3263c600	1	Other	Other
+8b843f33-9645-47f9-8705-510a74d4117a	1	Other	Other
+8b8467d6-1790-4517-a80f-a20ab8c355ed	1	Other	Other
+8b84cbd4-877f-4ee0-b118-14774c6049da	1	Other	Other
+8b84cc48-86fe-4a13-bd8f-e2bb103faac8	1	Other	Other
+8b8507a6-c7b3-44d1-b177-7b07e35058ba	1	Other	Other
+8b850da7-1656-4b0c-b4d0-9bf6d6e82950	1	Other	Other
+8b85419f-808c-4443-8870-85f65a80b26b	1	Other	Other
+8b85e9d5-7171-480f-8e24-922d79f34a3f	1	Other	Other
+8b8602d3-f440-4841-8054-3e5860995e68	1	Other	Other
+8b866ef5-51a5-4c06-9d2b-3dd6ace81f7e	1	Other	Other
+8b86816b-bd36-44ac-97b9-c40d3790c4f4	1	Other	Other
+8b86c273-df95-4b9d-85bd-5b01dfe094f4	1	Other	Other
+8b8704cc-782e-4a1a-bf43-828173e8fb3b	1	Other	Other
+8b881867-aca2-43f2-bf52-7f5590708f91	1	Other	Other
+8b8851e3-7984-4e9b-a9e4-f5653f956f6e	1	Other	Other
+8b89191f-2672-4b0c-aa80-9bd593d001f8	1	Other	Other
+8b891ed2-3f60-4b08-9fe2-c315c58b797a	1	Other	Other
+8b8935e2-016a-4438-bd38-efcbce1e479f	1	Other	Other
+8b894d21-d0c6-41e9-9d42-84a2328e5cfc	1	Other	Other
+8b89afa9-9d26-4667-bb49-6158edd171fa	1	Other	Other
+8b8a04a4-9bdc-4047-9c0b-2603333faf09	1	Other	Other
+8b8a5025-94eb-4ea0-a53a-dc5004ed989b	1	Other	Other
+8b8a6648-f82e-4625-9635-e356b8af22f1	1	Other	Other
+8b8ab34b-badd-471c-9ef8-7a4976e671d4	1	Other	Other
+8b8aff0e-f160-4544-b51c-f17234bfce5c	1	Other	Other
+8b8b1d2f-8fa5-4599-9e04-26cfc3f03eef	1	Other	Other
+8b8b376d-9a07-4604-bb4f-b41c1a6d9675	1	Other	Other
+8b8bc05e-b6b3-43eb-9d66-eff7802a933c	1	Other	Other
+8b8bc0d7-fac9-4356-9bfc-668d22873a0d	1	Other	Other
+8b8c33c0-cee8-459f-add0-452c03bdab33	1	Other	Other
+8b8c4334-3e0e-47d4-93c6-d00571eebf70	1	Other	Other
+8b8c441a-8867-4557-83b4-d4de22083453	1	Other	Other
+8b8c6650-3958-4c5b-89c8-e9b216d94489	1	Other	Other
+8b8c75be-7b42-497a-b50b-56cf3bbe8ac1	1	Other	Other
+8b8c75fb-da71-46a4-bb0c-2ea477d9f934	1	Other	Other
+8b8ca167-4e79-4521-9f30-b797b444cef7	1	Other	Other
+8b8cc7f1-fcf5-4063-bd5e-3f9db769bac2	1	Other	Other
+8b8ce5c0-90d2-4085-a944-ce85b8e92e37	1	Other	Other
+8b8d5e9b-3350-43e6-be60-dcec23370680	1	Other	Other
+8b8d722f-9b56-4566-af2d-2b91ff30deec	1	\N	Other
+8b8d8280-4f39-43e8-9106-016ce7c521e5	1	Other	Other
+8b8dd01d-1078-42f0-9f22-ba4bfb5776b3	1	Other	Other
+8b8df78e-c200-450e-aff3-0089eac06cc6	1	Other	Other
+8b8e0b0a-1d61-4f16-a407-4bf64d32b480	1	James	Other
+8b8e3619-0f4f-4b79-a75b-97ea863b5f84	1	Other	Other
+8b8eadc7-05f1-48b0-91e6-56310e189f4b	1	Other	Other
+8b8ed756-bee1-4def-b731-c17f5b521a59	1	Other	Other
+8b8eea3c-c9fc-4529-8374-5c9fcfb035f3	1	Other	Other
+8b8f0820-894b-4268-b053-b2309d4cfdea	1	Other	Other
+8b8f171d-2a17-4945-8f03-a7b70859b6d8	1	\N	Other
+8b8f49ae-e3df-4b32-a78b-9cbd76b261cc	1	Other	Other
+8b8f5ebf-1c8f-4755-90e1-f3452da8d15f	1	Other	Other
+8b8f898e-79b9-4c45-8e51-cb30e4c570f9	1	Other	Other
+8b900e9b-cdba-4633-ae27-007e0a5b6fde	1	Other	Other
+8b902fdb-edd3-4a12-8d97-699a76a79bf8	1	Other	Other
+8b903b31-0a29-4cf1-90b2-26034a3acbd3	1	Other	Other
+8b905ec9-b2ee-4fb7-86f8-7086ebee1594	1	Other	Other
+8b9071a8-3244-444d-8c79-1f43c6eb2081	1	Other	Other
+8b90b22b-b18e-4381-a965-865f2dcd0b60	1	Other	Other
+8b90fc99-ff1e-4d37-aa97-27d0500e9d93	1	Other	Other
+8b916307-8503-4573-b9ab-ac5a4f1e6724	1	Other	Other
+8b919499-7d86-4116-8215-0daddba58bbd	1	Other	Other
+8b91ea39-8e8e-4e86-bca0-65f02b76b63b	1	Other	Other
+8b92315b-be9a-405a-baf0-253e82850f5b	1	Other	Other
+8b9287a2-1f09-4f55-a388-8dcc9c7fa03b	1	Other	Other
+8b92e141-773a-47eb-af73-1242081cd495	1	\N	Other
+8b9310a2-9a75-46e2-99ab-17c9768631c1	1	Other	Other
+8b9360c5-45ee-4cb7-bd55-747124c61a5f	1	Other	Other
+8b93a6f6-fd81-49b6-8108-2d113063ddc2	1	Other	Other
+8b93b041-2de4-45ad-ac07-22f624e480ad	1	Other	Other
+8b942ce3-9d96-4c6d-ba63-a9076e219c5e	1	Other	Other
+8b9440fe-84f1-4028-8698-5d48e4d6a258	1	Other	Other
+8b9458f2-6904-4ebc-a3b1-42b47f142ab9	1	Other	Other
+8b947d88-430e-4fe4-a817-d72c5637489a	1	Other	Other
+8b94b009-57f1-443b-b75f-d716ba7edc48	1	Other	Other
+8b94effe-96d5-4ffa-87a5-b391d45b3071	1	Other	Other
+8b95200d-d006-4cda-b22f-2a5559657186	1	Other	Other
+8b9586f5-04be-41b7-a082-307eef796a81	1	Other	Other
+8b962f8a-f822-4b5b-9398-e615e0d6ded1	1	Other	Other
+8b964894-d161-4aaa-8c9b-daec31573948	1	Other	Other
+8b96baaa-4c15-45a3-96d4-d9e8c04d549a	1	Other	Other
+8b96bd32-4a5f-417f-a6f6-456b63a37ded	1	Other	Other
+8b9714a3-6dba-4166-b2b6-304f1880f15b	1	Other	Other
+8b971c63-5dd6-42df-ac5c-b2adccbb600e	1	Other	Other
+8b9725aa-b36e-4e0a-bf4d-e4524d02aa1a	1	Other	Other
+8b974863-abc0-4d69-bfba-db09afcbbdf1	1	Other	Other
+8b974efc-8e45-41b2-86e6-24203eda3510	1	Other	Other
+8b976471-a03d-4018-979d-386b46d0235f	1	Other	Other
+8b976ef8-1d5f-45a8-b99a-48b8dc45eff5	1	Other	Other
+8b978f87-0b5f-4826-b324-6bd52c364675	1	Other	Other
+8b97c8b7-dd47-40dc-9de5-7c425da83a48	1	Other	Other
+8b97d31e-0041-4f3e-97ca-e8802edcf69c	1	Other	Other
+8b97e18d-8ca9-4aab-aa7d-29f95be2b36d	1	\N	Other
+8b97f7c6-39a1-46ae-bfb5-f065a42ced68	1	Other	Other
+8b98325b-d3f4-48ec-b9e3-64cb29598aa0	1	Other	Other
+8b98bf88-50da-4d77-ab46-d78d3c69daa1	1	Other	Other
+8b990446-dbf1-4734-a5b5-7afc77a1a8ef	1	\N	Other
+8b9972c1-5584-4c09-ad31-b22509398b56	1	Other	Other
+8b999df8-5d0a-4a21-b78f-7d3e7be8836d	1	Other	Other
+8b999f13-39e3-4a66-8b1e-4dd112ef0256	1	Other	Other
+8b99b48f-e98b-462b-be1b-ce725c6c5f43	1	Other	Other
+8b9a6dfc-89ca-4c46-9aa6-f94947213178	1	Other	Other
+8b9aa63f-158a-41b7-be41-4e71865a899b	1	Other	Other
+8b9aead9-80da-4634-ab0a-197d15dc875b	1	Other	Other
+8b9b7361-a188-43d3-a181-9772507a431d	1	Other	Other
+8b9ba2ce-e479-48e7-b38e-2bbee245bb1d	1	Other	Other
+8b9bb22e-b4f4-4aa3-bf4c-c34e4b121eda	1	Other	Other
+8b9bc8ef-9fcc-49ec-85e6-102f09d520d2	1	Other	Other
+8b9bca70-f80f-4994-afa5-14c381375236	1	Other	Other
+8b9be27f-23ea-4d23-a286-17021a950e0e	1	Other	Other
+8b9bf9f4-de98-482a-8efb-893cf67cae65	1	Other	Other
+8b9c4b37-4255-42fc-a63e-2900cb0661e9	1	Other	Other
+8b9c57c5-6b17-4395-a0aa-c509ac5c5c69	1	Other	Other
+8b9c5d21-907f-4658-a013-a076ddffd77d	1	Other	Other
+8b9ca8a9-f744-4abb-9cfd-c69c768a591a	1	Other	Other
+8b9cf926-60a5-4f77-8c39-962ea2260c80	1	Other	Other
+8b9cfe8a-9874-4596-b894-aad36adf04b0	1	Other	Other
+8b9d24db-661a-4a18-aa03-fc47752962b3	1	Other	Other
+8b9d2eb9-5a58-4adc-be56-a2a6ccefc0b6	1	Other	Other
+8b9d5f0f-1f9b-4704-a44b-e3ad226d1fcf	1	Other	Other
+8b9d6061-2da5-4c82-9072-be69ed803ea8	1	Other	Other
+8b9d858a-5150-49a1-9766-84d66c9c3d9e	1	Other	Other
+8b9d8f66-4c99-47d8-9388-15b6bf2c020e	1	Other	Other
+8b9da09c-85de-4093-accd-52c04e68f8ce	1	Other	Other
+8b9db651-e5a7-4dcb-95ff-09bd9df69688	1	Other	Other
+8b9dcb8c-1dc7-4ffe-a110-0f879d9661c5	1	Other	Other
+8b9de91a-fb16-4cb9-b28a-20bb47ca2352	1	Other	Other
+8b9df65e-0896-44f8-b312-13dc42aa9e15	1	Other	Other
+8b9e2ad6-5742-4479-be63-0b12306f0ca7	1	Other	Other
+8b9e61bc-eb39-4030-b064-ab3dc51b6737	1	Other	Other
+8b9e923e-27dc-4c65-9f97-f6a19ac14bf6	1	Other	Other
+8b9f3388-6588-46f5-814f-b12e5865a9d1	1	\N	Other
+8b9f49b9-3359-4144-b29d-fc7fc82044e5	1	Other	Other
+8b9f86c4-8fa4-490f-9e35-e817f6c1c39a	1	Other	Other
+8b9faba3-3121-4fdf-8c32-d0ec8e99c216	1	Other	Other
+8b9fd021-9e38-42ab-ac69-877ed575bcc2	1	\N	Other
+8b9fd92c-3e12-471b-a966-5353a1f263fc	1	Other	Other
+8b9fee6d-f364-4d83-a6ac-c7b21735187f	1	Other	Other
+8ba025aa-466b-4e2d-89cf-42d542affcf9	1	Other	Other
+8ba077c0-4331-4590-8218-aad398b3caf9	1	Other	Other
+8ba08382-68f8-4c00-a9f6-df87da788860	1	Other	Other
+8ba16392-834a-417c-b5fb-8ddd80f02a4b	1	Other	Other
+8ba2286e-76f5-4669-8021-cccdc69036cc	1	Other	Other
+8ba2b692-d09b-4834-9873-6d63e57dc9e7	1	Other	Other
+8ba2da34-6edb-47d8-8a76-8c37b17140f3	1	Other	Other
+8ba316cc-b4a0-4097-9f50-043c06b4a242	1	Other	Other
+8ba368b5-efc1-4f7c-94a3-ae7016e87e1e	1	Other	Other
+8ba3ad19-0788-47e5-aa36-a723aae4d943	1	Other	Other
+8ba3afab-9d6e-4dcf-8489-73138443fcc4	1	Other	Other
+8ba3d206-caf9-457e-b578-0f3d35edeb02	1	Other	Other
+8ba3d76a-6105-4af2-b003-865bc37f984e	1	Other	Other
+8ba3ef07-6e12-42d0-b47d-ab16780ffc49	1	Other	Other
+8ba409e3-e96e-4bba-9c95-0b760810e15b	1	Other	Other
+8ba4331d-8519-4738-93f1-ec453e856a0f	1	Other	Other
+8ba44957-f1d2-4ac0-845d-bf8d758722a6	1	Other	Other
+8ba47acb-1f36-4b2a-abda-35233be72599	1	Other	Other
+8ba49b37-7afa-4fb5-bf26-67af9c45a80c	1	Other	Other
+8ba4add8-0adf-4ccb-8166-c1f93efd8ef9	1	Other	Other
+8ba4b0c1-4ef7-4bfa-874c-d0244e5f6b4d	1	Other	Other
+8ba56a04-7a50-4d02-96dd-6bf1378d735d	1	Other	Other
+8ba58b85-1fdb-4f69-8818-82e351e858cc	1	Other	Other
+8ba5a5f5-c533-499c-acb0-d342376d35ce	1	Other	Other
+8ba5c27a-a7e0-415d-a002-61e37d6fefb6	1	Other	Other
+8ba60806-3db1-4e9c-91ad-d1f4cb3fcff2	1	\N	Other
+8ba62b00-3144-41fa-89db-4a2991b0c2f5	1	Other	Other
+8ba64050-a8a1-4d32-8d60-8efc0c2665ce	1	Other	Other
+8ba65452-f56a-4378-934b-c69ebde51479	1	Other	Other
+8ba68fc8-9022-4017-ac81-4134fb0524c2	1	Other	Other
+8ba69907-e390-4a6d-a5d1-7f2838870fae	1	Other	Other
+8ba6bf40-7687-412f-968b-063ff96314e5	1	Other	Other
+8ba6d8f8-837b-45d7-91ba-a53afc45e8ff	1	Other	Other
+8ba6fd9e-8897-4fbf-81c4-b4c6e93f009f	1	Other	Other
+8ba70cc3-ab87-495a-b87b-98008ba7e0fa	1	Other	Other
+8ba749b5-15b6-4cb3-80ef-577706a1b4b2	1	Other	Other
+8ba79d80-3649-4384-8c0e-739128cb86b5	1	Other	Other
+8ba7b12d-b757-4fca-bd3c-87295cfa5132	1	Other	Other
+8ba7be6f-5f1d-48a3-ad73-d821c13096d2	1	Other	Other
+8ba81bc9-3a0a-4980-9229-d961cbd7bbb6	1	Other	Other
+8ba8295d-d7e6-4ac4-9385-33dd539c867e	1	Other	Other
+8ba88709-ad64-450d-b4f5-044b05276e7b	1	Other	Other
+8ba88c70-1e6d-46b6-a80f-35d8369c3376	1	Other	Other
+8ba902a7-9197-4640-ac7d-c859dbeacdbc	1	Other	Other
+8ba9152b-b30c-4be5-b2ac-da27f49e250e	1	James	Other
+8ba93f44-38a5-44d7-97fe-631e29b6daa6	1	Other	Other
+8ba95d85-b4d7-4c9f-910e-67ebe4259f2e	1	Other	Other
+8ba97903-d39a-4c9b-a34c-ee1575325f37	1	Other	Other
+8ba9c121-2054-4f11-8a61-58e36e7bf3ca	1	Other	Other
+8baa3975-51be-4f8c-a262-0bc673d862d5	1	Other	Other
+8baa81f3-29e4-4e0a-84b6-4347de2f3295	1	Other	Other
+8baaee89-bddd-4c54-8f22-01a0a0f0f801	1	Other	Other
+8baafada-29e7-4c8f-a588-00319939bd95	1	Other	Other
+8bab0307-a1a1-4eb5-beb1-ac8ceab3fd94	1	Other	Other
+8bab2366-a275-43f4-9c07-b35302d1eb74	1	Other	Other
+8bab3d9b-e0cc-4c2e-834f-76a19e447d85	1	Other	Other
+8bab6498-336c-402d-a977-cb8986989011	1	Other	Other
+8bab862c-da84-4e6e-9b6a-d1be39d30ce7	1	Other	Other
+8bac7dd0-e7ef-4bd9-9cc1-f18b11c8b865	1	Other	Other
+8bac8800-dc82-409d-9ec0-fb25e905a1ea	1	Other	Other
+8bad3d7f-0393-4ed0-af16-95480df4f980	1	Other	Other
+8bad6318-e7d1-46b6-8946-4a00f3432be5	1	Other	Other
+8bad9d93-b9d9-479c-b608-47f968dc14b4	1	Other	Other
+8bae41d9-0578-4efa-b460-8fd324a0f70b	1	Other	Other
+8bae630c-cbe9-431f-b773-886717f41368	1	Other	Other
+8bae92e1-ad9c-48dd-acd8-1bcd99f3b783	1	Other	Other
+8baebba0-a1f0-4a28-89e9-5a9485ae861a	1	Other	Other
+8baed6a9-832d-435d-9e82-d5b39e577532	1	Other	Other
+8baeedb7-0e59-4811-a3fa-2358b7a43a2f	1	Other	Other
+8baf2ae2-47c6-4b83-b2ca-6b433e08ec5f	1	\N	Other
+8bb023ea-e6c9-4a7d-bf0a-96e87bfe690e	1	Other	Other
+8bb04042-0b38-4669-b092-ec6f0e9abb3f	1	Other	Other
+8bb0557c-d75d-4630-9066-129e576e32e9	1	Other	Other
+8bb09328-9c48-43b7-a6f0-ec76a80bdeee	1	Other	Other
+8bb0b943-e28f-40df-89f0-5728b39bcc92	1	Other	Other
+8bb0f489-3aa8-41ec-8d6f-e7365857f0b0	1	Other	Other
+8bb140c8-d6b3-4e37-98d3-0c245fbcff80	1	Other	Other
+8bb19139-7d3d-4736-ac44-6013de56a535	1	Other	Other
+8bb1c385-dc4c-418f-9b82-22c6166abeb1	1	Other	Other
+8bb2402a-00d5-47ba-a690-fcfe06b57f90	1	Other	Other
+8bb299c0-e0c1-4ff8-a037-4e8ed464d6c3	1	Other	Other
+8bb2ca9c-9d13-4813-8af3-91deb2a947b1	1	Other	Other
+8bb2f1ca-2908-45e0-9ae6-be2241e10660	1	Other	Other
+8bb2f77a-b231-4e47-8d71-987839d12c35	1	Other	Other
+8bb32140-833e-4878-87d3-d6bf60f38e3a	1	Other	Other
+8bb340c1-eaba-4cca-96f1-f1fac657e86c	1	Other	Other
+8bb37676-7538-4af9-9922-d9aaf81d5a93	1	Other	Other
+8bb37d31-9521-4604-b844-c0fe67b6db1a	1	Other	Other
+8bb385f1-f9bb-4823-840d-c177417030c9	1	Other	Other
+8bb3f306-a0ed-442d-9bf3-d0483dbdd689	1	Other	Other
+8bb3fa80-4518-4fbb-97f4-5ba38e66b298	1	Other	Other
+8bb44bed-21d8-493c-a37a-042666063074	1	Other	Other
+8bb473b8-cf70-4f25-a987-d86918763a2d	1	Other	Other
+8bb48387-7730-4cec-9600-ed316cc92531	1	Other	Other
+8bb49da1-5435-4f8d-a86e-178ffce90bd2	1	Other	Other
+8bb55222-5155-4b0b-bf11-f8980ef3fa15	1	Other	Other
+8bb55a92-57c7-4eef-9506-99a5cd27a77b	1	Other	Other
+8bb58b77-171c-46e0-b552-f12b6f93e3cc	1	Other	Other
+8bb5c317-1064-4c08-8d5e-c6ac8b237c60	1	Other	Other
+8bb5c676-b50d-426a-ac40-aef36c87eb4f	1	Other	Other
+8bb61b8b-8d57-440b-bd12-39f15ce0dc97	1	Other	Other
+8bb653ad-dbbe-4a3d-a336-f8b6872a9feb	1	Other	Other
+8bb665be-f07c-4d19-a670-05cad722bec9	1	Other	Other
+8bb67ec5-a59a-4519-bf54-93dc84b5c867	1	Other	Other
+8bb72001-eeca-4889-b75e-79eef901b792	1	Other	Other
+8bb75f1b-c2ee-4622-86b2-df93aceb806c	1	Other	Other
+8bb764ea-fd6a-44c3-a100-10f61af43de2	1	Other	Other
+8bb7758f-412d-499a-9563-4fd4f1ed5b32	1	Other	Other
+8bb805e6-7123-4532-9683-03c5b97e4408	1	Other	Other
+8bb80c0c-8756-4d39-89d4-7ee30d5e7478	1	Other	Other
+8bb8409d-59cc-4643-8811-b03501c8771f	1	Other	Other
+8bb8485c-e140-48c8-bea8-c7ef3ded2514	1	Other	Other
+8bb84e06-42ab-4f0c-ad1d-b79caf654587	1	Other	Other
+8bb89ed1-0ad2-425a-84ff-c3a76ce0a3b1	1	Other	Other
+8bb8e191-65e2-4c68-9ea5-004ebd91ff29	1	Other	Other
+8bb90677-5cba-4547-a8aa-5a3ab23b052f	1	Other	Other
+8bb95dca-9364-46c9-bcb9-d7455f49c4ac	1	Other	Other
+8bb9b245-5d0f-498d-8a6c-93b123d0036b	1	Other	Other
+8bb9cbd2-feda-490c-84a6-0e28f558cdbc	1	Other	Other
+8bb9d073-d356-47ba-b2e4-d520bb9cb6f9	1	Other	Other
+8bba0cd0-daad-40ed-8b14-b8479c996aac	1	Other	Other
+8bba1721-d56e-4f6c-a2ba-d1cf847fa468	1	Other	Other
+8bba47f2-89d8-44d3-b9d6-e6a25131d8dc	1	Other	Other
+8bba4fe8-afb0-45ca-865a-ca139361c007	1	Other	Other
+8bbb089b-e88d-41a9-b7fd-35d4319c5921	1	Other	Other
+8bbc0e2b-a812-4f1c-93d9-0e65e64182a6	1	Other	Other
+8bbc33fb-6d41-47a7-834a-99cab0ac6ff3	1	Other	Other
+8bbc4445-592e-4ac8-aac0-2c323b6ec550	1	Other	Other
+8bbc91b9-3323-40da-99d0-19de1cd21c90	1	Other	Other
+8bbca856-557b-428f-9945-b04ec9f8a106	1	Other	Other
+8bbd0ec1-4e64-4a7c-9111-697e32dfe35c	1	Other	Other
+8bbd10f6-3318-4d96-bcaf-91bba346629f	1	Other	Other
+8bbd23be-6b8b-4465-94e7-2e46b7a113e9	1	James	Other
+8bbd70d8-3dde-4989-8fda-0df936c96f5d	1	Other	Other
+8bbd7370-f00a-4fa1-946c-a9ceb2d5c270	1	Other	Other
+8bbd9e16-9bdc-4fa0-b736-ff8663e212c4	1	Other	Other
+8bbdb181-b509-44de-99a4-37a4b3269d21	1	Other	Other
+8bbdb4e8-5931-4c0b-b981-d60ce9475835	1	Other	Other
+8bbde46d-8851-4e1a-a29b-5316e4f8b7c7	1	Other	Other
+8bbde750-2ac8-40a3-a517-51729e0466a4	1	Other	Other
+8bbe1f56-89b6-4b5a-9874-7b29e9934d36	1	Other	Other
+8bbe8320-0a22-4910-ac3d-72aaf76f03fe	1	Other	Other
+8bbedf49-41e4-4303-9722-c4dcde82ce00	1	\N	Other
+8bbee2cc-ad0c-4e8e-804e-ba5877361fe9	1	Other	Other
+8bbfe880-f76d-464d-bde9-69f624813067	1	Other	Other
+8bc02a13-1418-4ee1-a2c4-c2d27385edb6	1	Other	Other
+8bc07c9f-da6d-4dc4-8c68-d4d52db1d9a5	1	Other	Other
+8bc08519-c6da-41f5-987a-907eb5941edb	1	Other	Other
+8bc09346-c70a-4e15-81f4-88f953c0e480	1	Other	Other
+8bc09601-8095-4935-82a0-03b0a4fcbf4f	1	Other	Other
+8bc09d3d-7a51-4ffd-9277-3bdde3aa6d9e	1	Other	Other
+8bc0a617-01f9-4fc5-acb3-4944017fdde7	1	Other	Other
+8bc0ba5b-79d5-4dfc-95fb-b873144a3e75	1	Other	Other
+8bc14e52-f196-423a-a076-f8c980929871	1	Other	Other
+8bc1687e-a6cb-41e5-82df-9aff7fc21e3b	1	Other	Other
+8bc16f58-59e0-42d6-8af0-c747439b101c	1	James	Other
+8bc1c413-d4f2-40d9-97de-c2c4966c2075	1	Other	Other
+8bc1f1e3-a5e3-411f-9939-8f45616cddd1	1	Other	Other
+8bc276b3-418b-4f9b-9904-b470210a2a27	1	Other	Other
+8bc283e6-75cf-4213-98e8-0a50a5902223	1	Other	Other
+8bc2a793-ab3d-4fc4-93da-558294d7603a	1	Other	Other
+8bc2bde7-a52f-406f-8fad-365df58de053	1	Other	Other
+8bc2c68d-4bc2-4bf7-b11e-49b541e8a829	1	Other	Other
+8bc2f9a6-2604-4ba7-8446-0e13d4b3d482	1	Other	Other
+8bc359ea-1aeb-4a50-b54a-8d8bf81238b9	1	Other	Other
+8bc3d660-67cf-4061-87c6-7c87d4286d45	1	Other	Other
+8bc3eb03-b946-43b9-9165-41267d7c7fa5	1	Other	Other
+8bc3ecac-6c43-494f-9649-5239f507cc27	1	Other	Other
+8bc427dd-8d15-448e-9d01-8cd4a0b4b01e	1	Other	Other
+8bc46376-f2f6-4cc7-b219-ee94029e061e	1	James	Other
+8bc4bfd7-a7d1-4b6e-8efc-afb2c0e06cbb	1	Other	Other
+8bc4c248-0d53-4a1b-991a-56837ed0d981	1	Other	Other
+8bc4cba2-c9d1-488a-9061-05447ab53105	1	Other	Other
+8bc4f988-5e12-4841-b345-8e736c8e78e9	1	Other	Other
+8bc4fd9f-fc4f-40a7-98e6-3f9f1b5293ae	1	Other	Other
+8bc522b2-a4b7-4cd8-8b77-4c4d218c83cf	1	James	Other
+8bc52373-3425-4590-b1f4-0aa086b54ae2	1	Other	Other
+8bc53462-7b71-425b-bfcc-2b54102a9ad0	1	Other	Other
+8bc53b95-136f-4bc5-9db4-c64d0f2685d4	1	Other	Other
+8bc5b324-7337-4b3f-9a61-3b588593f3ae	1	Other	Other
+8bc5eec5-ad29-4e7e-9fe7-b9be87d82e2e	1	Other	Other
+8bc5f77b-0eb8-4235-ac4f-60afe7b46ca1	1	Other	Other
+8bc61d2d-aea7-4635-b3eb-3c2ccb0fad6c	1	Other	Other
+8bc63319-ffb5-4dd2-bb9e-c84a2d795b82	1	Other	Other
+8bc67fd7-87e7-404b-955a-e9b106859c47	1	Other	Other
+8bc6c1dc-51df-48fc-b7a7-68e8cd0bef53	1	Other	Other
+8bc6d91e-9e12-4512-8ca1-d9453d19fd2c	1	Other	Other
+8bc72baf-10fc-4819-bd56-5cf923bd8292	1	Other	Other
+8bc79117-d552-45cc-9229-cde7bb62f405	1	Other	Other
+8bc795c1-272e-4125-8ca7-1779fdd79f9b	1	James	Other
+8bc7c1cc-02f7-4261-970a-142edb7e1a50	1	\N	Other
+8bc7c667-d302-4047-963f-76657f11954b	1	Other	Other
+8bc7d4bd-3b3d-4f59-96b5-6b875e322e46	1	Other	Other
+8bc83020-09a0-42e8-abfd-94e8e951d686	1	Other	Other
+8bc83d3b-bede-4e5a-8878-f91bc83adab2	1	Other	Other
+8bc863a5-e9e4-402e-8f88-b6eeaa25ffb4	1	\N	Other
+8bc8c8d9-7a95-418c-ac62-c955e0f7b964	1	Other	Other
+8bc90205-3cef-437f-93f4-e962a5d7c1dc	1	Other	Other
+8bc94514-2212-4b31-94ac-56a14ad9fc6a	1	Other	Other
+8bc9566e-7513-453c-89a4-f1fb06ec141b	1	Other	Other
+8bc957d8-36bc-43e0-9c23-99dad7365143	1	Other	Other
+8bc9635a-3473-4c70-a17a-9f5517dc99f3	1	Other	Other
+8bc9998d-061d-4ad9-9f2f-040f7f7babe7	1	Other	Other
+8bc9badd-febc-492f-a61b-3475113182db	1	\N	Other
+8bc9eb17-4987-4f19-8fb2-c75c84113dd8	1	Other	Other
+8bca4428-8bd3-4e41-a8b4-485816e3c16d	1	Other	Other
+8bca55e6-bcbb-4429-9292-96902b0e6103	1	Other	Other
+8bca601e-f077-4eeb-8cca-3d92e2428898	1	Other	Other
+8bca8b53-ce12-496c-92b9-e734da6c2bda	1	Other	Other
+8bca9e88-d0d6-4342-98e6-25f6a0e33327	1	Other	Other
+8bcaa89d-5a5e-4d92-bb4e-5083c169c7b5	1	Other	Other
+8bcad285-6963-4a4c-8243-e88300e8c09c	1	Other	Other
+8bcb0426-3982-4809-ba88-89f1d9968546	1	Other	Other
+8bcba05f-432e-4a07-bfc7-ac87fad9acf5	1	Other	Other
+8bcc0c2a-7dd0-49de-86f9-c202bbaf1fa6	1	Other	Other
+8bcc4678-2b21-492b-8e3f-95c08072ed67	1	Other	Other
+8bcc6533-3d59-4562-a477-46ec4c9dbf8a	1	Other	Other
+8bcc733a-2458-4a33-bd22-65ceb974938f	1	Other	Other
+8bccdfc6-0872-4b18-8a88-2b1a5d64c4ba	1	Other	Other
+8bcce1a3-bad1-45a2-84b8-7bcec0a6f9fd	1	Other	Other
+8bcd0f7f-0693-4e77-80ec-716ee634395b	1	Other	Other
+8bcd113d-2db7-4b1e-b2b6-799c6ab9b9f3	1	Other	Other
+8bcd2bfb-aec6-4617-8921-d7fb744e75b0	1	Other	Other
+8bcd8b16-c8c1-4014-8627-519ef014bc4d	1	Other	Other
+8bcdc6f8-0463-4002-bd59-1b7fddc919c2	1	Other	Other
+8bcdfa3b-8fe9-4d10-9612-f22202ba14fd	1	Other	Other
+8bce2133-decf-450a-a132-8b4b72d602cd	1	Other	Other
+8bce51bd-3068-43d8-a248-98ad3e4c0949	1	Other	Other
+8bce725d-411a-4bb8-a1a2-4f87bd0dfc8f	1	Other	Other
+8bceb34a-517b-417c-b841-4ea20186082c	1	Other	Other
+8bcecc94-10c3-4333-8024-73523a83d565	1	Other	Other
+8bced3f5-d02c-4da2-be8e-f1e8b1bf4cd1	1	Other	Other
+8bcee310-7a6d-43b1-88bd-01b6e5c89b4f	1	Other	Other
+8bcf4d05-3f67-4c30-8c8e-d00999fcaa22	1	Other	Other
+8bcfc320-74d1-429b-bdac-1e44fa0266a5	1	Other	Other
+8bcfd11d-3dad-40d6-a7f6-4eac9012eccb	1	Other	Other
+8bcfee2e-8a10-4153-a16d-1c8aba11f3b9	1	Other	Other
+8bcff3ed-d36e-4396-8be4-366c10a63575	1	Other	Other
+8bd00f66-e4e8-4372-9d41-6fe31a9b6386	1	\N	Other
+8bd03e91-4077-49f7-8bfd-8c7e5f4e66dd	1	Other	Other
+8bd077c1-54f7-46fa-9d58-efde691012da	1	Other	Other
+8bd09f5b-e829-4415-86cb-7d23b6945d12	1	Other	Other
+8bd0ac2f-08d2-48ab-9d79-1cb5569f7fc9	1	Other	Other
+8bd0ff72-cdfc-4de6-9ac9-0d1fc02e06c3	1	Other	Other
+8bd1619a-c939-46ba-9fe2-b4ab78a1b184	1	Other	Other
+8bd16983-27f8-4cda-9512-77256b007e95	1	Other	Other
+8bd23897-b6b2-4c88-8c73-2f559e794ff7	1	Other	Other
+8bd245f9-b47d-4937-97b5-3faf447e08d1	1	Other	Other
+8bd248ff-6a1f-4e61-b39f-b6f79bdf1f1c	1	Other	Other
+8bd2493f-432c-4720-a5cd-b4b786b4b66d	1	Other	Other
+8bd2536c-e19f-4184-9b42-25ebb0c42b6c	1	Other	Other
+8bd2f698-5728-46aa-ae08-c548491c8522	1	Other	Other
+8bd2fb4e-de5d-4cdc-b43a-ca15811c892c	1	Other	Other
+8bd2fbad-ad2f-4576-9616-58476e3945a6	1	Other	Other
+8bd3455f-d48b-40a4-8d2d-22d103fd8dd4	1	Other	Other
+8bd36f82-aa1a-4ece-ad20-010f222700d9	1	Other	Other
+8bd3b91e-eccb-4913-bfde-ae3232e77906	1	Other	Other
+8bd3eb69-7b4b-4261-b8d2-730df3f11008	1	Other	Other
+8bd3f7c9-e64a-46c2-89cf-b57273faf904	1	Other	Other
+8bd40344-a23c-4a48-96c1-52bf99858b7f	1	Other	Other
+8bd41516-02e3-4488-9a12-db0e24c87ab0	1	Other	Other
+8bd4475f-a6ea-4843-ae84-b71b77b9d5bf	1	Other	Other
+8bd452b5-8033-41a4-bde7-6cc8a93959c1	1	Other	Other
+8bd48aa9-0df7-451b-9570-4380a5f6d3ce	1	Other	Other
+8bd494ad-cf35-4c1e-af0e-1bf4adb133ae	1	James	Other
+8bd4aba5-4010-426b-825b-6924377c4e9b	1	Other	Other
+8bd4c891-75df-46f3-ab33-01947616e7ed	1	Other	Other
+8bd4e20e-edf9-415e-99f8-ef37dca575b7	1	Other	Other
+8bd4fe8b-7946-436c-a104-d22d26d73fd3	1	Other	Other
+8bd5153e-dd88-425d-8d40-433cbd1e169b	1	Other	Other
+8bd55882-181d-40d8-b1e0-212e2f227bc5	1	Other	Other
+8bd5eed6-7475-479c-8ca1-78d80cf1c581	1	Other	Other
+8bd60cb1-a7c5-458c-815d-a7cafc96a9d3	1	Other	Other
+8bd6167c-9988-4c42-bcad-17b749c88d5c	1	Other	Other
+8bd62267-dd8c-4bc8-adfc-0775e9caa1f7	1	\N	Other
+8bd6319e-3dbd-46e6-a9ed-ebb9a90a65cd	1	Other	Other
+8bd6440f-d7b4-4492-ad78-a8462a32e9b8	1	Other	Other
+8bd66313-fc8c-4201-a38f-b0e767f2c57c	1	Other	Other
+8bd6b1d0-1c9a-4f35-be8e-985558b11b8b	1	Other	Other
+8bd6e211-9224-4dde-ba97-5f919cf1826f	1	Other	Other
+8bd75694-d301-4c69-bf49-2f451150e37d	1	Other	Other
+8bd75796-6c3d-4e54-84dd-356b6f091b4b	1	Other	Other
+8bd75ccb-c689-4bd7-b32e-4c80d2cc4c95	1	Other	Other
+8bd76f19-932e-4856-8354-26bf49921e61	1	Other	Other
+8bd7718b-ddcb-4a91-a1b0-12cbb617b05c	1	Other	Other
+8bd78dcc-317b-4c52-b09f-d21f8fa2d421	1	Other	Other
+8bd79d90-1ca4-456d-9c0f-135e62cb6530	1	Other	Other
+8bd7a0e8-1b54-46ab-97ae-400be5f14cc1	1	Other	Other
+8bd7ae02-aa8a-4298-a2d3-3df9e5c3484f	1	Other	Other
+8bd804ab-95b2-46aa-ad18-7e4ccf803eb0	1	Other	Other
+8bd813f3-8acf-4d25-a832-0c1f3d656519	1	Other	Other
+8bd84b28-33fb-4276-93ee-21ad2d784001	1	Other	Other
+8bd866ec-286b-478b-a8a9-90db19eb9b10	1	Other	Other
+8bd87e49-10f3-4f84-81b6-d4114f06b27f	1	Other	Other
+8bd8ba8d-5fb5-42a8-99e1-d7580c2ddc96	1	Other	Other
+8bd8f9b8-082c-4ac2-bb7d-8312abcc83cd	1	Other	Other
+8bd9406e-543b-48b3-be62-be536457ba43	1	Other	Other
+8bd991d1-6dae-4d65-ba04-b4c76f98f8a4	1	Other	Other
+8bd99634-6a1e-4c7f-b725-2d1ff18d76a7	1	Other	Other
+8bd9aad4-d622-4401-859f-883749fb4b7e	1	Other	Other
+8bd9b42c-48c7-4c4d-815b-3429465973d4	1	Other	Other
+8bd9c23e-19b8-4677-9d38-fdecbc56fd05	1	Other	Other
+8bd9da27-d070-4cec-a729-3104bf819136	1	Other	Other
+8bda49bf-d1c9-43f6-a2d5-326e9a17f26e	1	Other	Other
+8bdac349-30dd-4d3d-8e6b-54cd3506af74	1	Other	Other
+8bdadaed-2d98-41d6-ad47-ec557e4fa242	1	Other	Other
+8bdb09e5-ecbf-4b34-bf94-00549ecf9dec	1	Other	Other
+8bdb43f3-5aba-489d-9419-0497607e2e75	1	Other	Other
+8bdb45c0-eac9-4674-914a-66305abf7d9d	1	Other	Other
+8bdb82ed-948c-4de4-b6f0-2d332104fb27	1	Other	Other
+8bdbbff0-c889-47c8-8593-5b794e06fbef	1	\N	Other
+8bdbdf0d-dbd3-4a0c-9f31-9239077d4d80	1	\N	Other
+8bdc5108-1692-41c5-8cc7-08adc165da0e	1	Other	Other
+8bdc733e-9433-4dca-81d9-9f9354483dfd	1	Other	Other
+8bdc95ed-aa9e-40ec-af20-74f4c528da88	1	Other	Other
+8bdc9cf7-d86c-454b-97fd-23556cfdb324	1	Other	Other
+8bdca0ca-a4a5-4a14-a124-d5de6f0e4546	1	Other	Other
+8bdccc35-9ed8-4ee3-9970-10c703e604c7	1	Other	Other
+8bdd03d5-0190-4a3c-bc1c-87d1bca1321d	1	Other	Other
+8bdd114a-93dd-47f9-bac1-68543f10db00	1	Other	Other
+8bdd73df-13c2-420f-a062-59bcde4f3f24	1	Other	Other
+8bdd7a53-bed0-44a5-a0dc-c36deb6f8693	1	Other	Other
+8bddaa42-dcc1-45f5-bf5c-0731ee4a5351	1	Other	Other
+8bdde676-5983-4a8b-a9ce-5b0d921d5ecf	1	\N	Other
+8bde5f78-7f67-4772-a76e-862088007b07	1	Other	Other
+8bde7517-b8f5-45f1-854c-0c23337f8a28	1	\N	Other
+8bde7b67-4c9d-4e6c-abb1-673b80ee21f8	1	Other	Other
+8bde89ba-529c-4e5c-89ed-9c09e89fdaa0	1	Other	Other
+8bdeb96b-3b0e-4dc3-ac3e-c846f8e01ff7	1	Other	Other
+8bdec8b5-a10d-4d14-b7f1-0be6fcc22083	1	Other	Other
+8bdeea95-a6bf-48cd-8243-92888230f990	1	Other	Other
+8bdf47b8-6d0d-4643-a5df-ba26bf47b932	1	Other	Other
+8bdf7895-5168-4692-8819-18d4b287d614	1	Other	Other
+8bdfbf21-3007-45c5-ab88-7ecc6f880a69	1	Other	Other
+8bdfddfe-f0ab-4c2d-b052-c9dd67bf1476	1	Other	Other
+8bdff4bb-205f-4a01-926b-f2a388e21b56	1	Other	Other
+8bdffe5f-cb77-41f1-b760-02e94b1d30d5	1	Other	Other
+8be01fb0-189a-4d5f-8e74-cc986c3b0a17	1	Other	Other
+8be08eb3-4faf-4958-81d6-1beadbb75b6b	1	Other	Other
+8be09109-49fc-4eea-945c-3c1ca3ca29d9	1	Other	Other
+8be0a4be-17ae-4cce-8daa-9c00d0c565a8	1	Other	Other
+8be0c71b-8531-4f51-b8db-8b0f0f7a6c1b	1	Other	Other
+8be0cd8b-9a8a-4cd2-a968-84e53141e0ad	1	Other	Other
+8be0f500-fc63-415f-83e1-9bac8ad65cb4	1	Other	Other
+8be13f62-a57f-475e-96e1-da9a45518bba	1	Other	Other
+8be17989-7525-452b-8e7c-1d49f6d63517	1	Other	Other
+8be1abd6-9888-428a-ba15-b34dc078281a	1	Other	Other
+8be23d39-75c1-490d-9689-c703a3121e5d	1	James	Other
+8be25cea-f720-47dc-a6df-0c395d461431	1	Other	Other
+8be26d5b-3ea7-461c-acb7-ff1106a2893c	1	Other	Other
+8be2b3c8-183b-11e8-877a-fa163e8624cc	1	\N	Other
+8be2c1da-3742-4ed1-a875-86eaa24b6aa8	1	Other	Other
+8be2daac-c6b0-4a90-aa8b-7b16e05c9145	1	Other	Other
+8be2e4d6-f978-4d1f-9f48-e67c2ab1c801	1	Other	Other
+8be2e750-1b15-4c26-a782-8f6aef52f1d0	1	Other	Other
+8be32070-2b10-4bfc-9c0c-6dfb1bc70b97	1	Other	Other
+8be354ca-70b3-4eba-99de-880a765bb5d2	1	Other	Other
+8be3696d-85e9-4d3a-82b6-a953b5266c7a	1	Other	Other
+8be37494-5c56-4d96-a7f0-b0959f282765	1	Other	Other
+8be3b319-8fe8-42bf-8348-68c92091551c	1	Other	Other
+8be42e22-640e-4fc7-bd08-e12cf2bdfbc6	1	Other	Other
+8be4500a-6dd7-4659-81ef-549d808b6e16	1	Other	Other
+8be49f18-e5de-404d-abc9-14da1fe848e3	1	Other	Other
+8be4b978-b226-4726-861a-2779841461e9	1	Other	Other
+8be4be91-fda2-4731-a91c-023e20e39466	1	Other	Other
+8be558bd-e864-4ef3-b042-65e01db25cf1	1	Other	Other
+8be5f32f-5b5c-4bfd-9218-fa081570d38f	1	Other	Other
+8be5fe11-9326-412a-bf75-3b211bdaa009	1	Other	Other
+8be64c7f-926d-40b4-89c3-5ee9c4dd9f20	1	Other	Other
+8be66326-0577-4d33-8cac-8e516562ed58	1	\N	Other
+8be6f4dc-78a8-45b6-aea1-a8e392844084	1	Other	Other
+8be75634-44c2-4783-a195-12b688e98384	1	Other	Other
+8be75731-80a1-4794-b3aa-e37b1eeb8f17	1	Other	Other
+8be76142-234b-4b7f-9e83-7450a507a202	1	Other	Other
+8be784fb-88cb-44c5-bf33-7c84266036dd	1	Other	Other
+8be7af19-912a-4da2-9317-c0f1d0f7a8ef	1	Other	Other
+8be7b763-1114-4dfd-ab41-f3a1cb160a55	1	Other	Other
+8be7ce5a-2c1c-4989-8467-27835554233d	1	Other	Other
+8be7edba-1f4f-475a-b562-0faef8b19b14	1	Other	Other
+8be7ef82-7340-4a3a-ab4c-24a0d6e8a4c0	1	Other	Other
+8be83d5d-423a-4600-944f-d605eeadadca	1	Other	Other
+8be85090-4fd7-43a9-bcd4-637a15bd10db	1	Other	Other
+8be89bcc-6355-4aee-ae66-8f93974b4ae8	1	Other	Other
+8be9270f-3907-44b9-9caf-b1b58c464155	1	Other	Other
+8be94113-6288-4145-8f6a-a676be6f706e	1	Other	Other
+8be9e59e-3894-4a62-a0f0-1d41cb99c65b	1	Other	Other
+8bea2f59-0c32-4340-9d09-8d19f6968c6c	1	Other	Other
+8bea4233-0a40-407c-8361-4bc896599b83	1	Other	Other
+8bea461d-e0b6-4617-8dfe-af0cd83d68a2	1	Other	Other
+8bea60a2-734a-4b5d-830e-fc44c019f593	1	Other	Other
+8bea7d21-6784-49c8-97ba-149f7de7c667	1	Other	Other
+8beaf512-40cc-415e-a676-396a91f3d2b9	1	Other	Other
+8beb1702-79e2-4e9d-b567-ee199c8eeb72	1	Other	Other
+8beb18b9-9561-4972-9f78-9742f152a3ab	1	Other	Other
+8beb1ede-6565-44a7-82d1-1e840071ac64	1	Other	Other
+8beb77c6-8636-4627-96b3-5616727132dc	1	Other	Other
+8beb7c3f-d32a-4581-9866-ba946a02afa8	1	Other	Other
+8beb8452-842a-4fb8-946b-903b2e0e7d39	1	Other	Other
+8beba356-4bd8-4be1-91d8-fe2c10b32d67	1	Other	Other
+8bebe986-90b9-44b2-8d89-81f4f883dd94	1	Other	Other
+8bec43e1-9ff6-4688-87ca-958cd7bd8123	1	Other	Other
+8bec74f0-98bc-4b49-9a5b-12cce9a99c18	1	Other	Other
+8beca205-58d3-4622-bb4b-ef1599bf6b6d	1	Other	Other
+8bed1571-e64b-41c1-92bf-018fccfd3074	1	Other	Other
+8bed9377-3c5a-4685-b901-d959dae8bcd2	1	Other	Other
+8bedc1b4-da76-4491-8d04-dbce1be4a6a1	1	Other	Other
+8bee224a-1b39-4938-b23e-f028a0a6437e	1	Other	Other
+8bee5d0f-2194-4e46-8b01-e83c9108b373	1	\N	Other
+8beeaa52-ed21-473f-8a67-c6cc5027d615	1	Other	Other
+8beeb7fd-5a52-4a7d-9299-6c332d1123bb	1	Other	Other
+8beeceb0-f01e-43ba-b10d-8ec2c6d7b63d	1	\N	Other
+8bef200e-f2c9-462d-89f3-e6b0932a5c36	1	Other	Other
+8bef6e8e-2f10-484e-b0d7-3199b36aaf45	1	\N	Other
+8bef7e3b-17e6-4ec6-8a73-731c709c16e6	1	Other	Other
+8befa0b3-87a5-4bc5-a576-09cd59adbba5	1	Other	Other
+8befaae0-fdc7-4c92-8481-1d8f291c2741	1	Other	Other
+8befb441-7541-4d3f-98e3-fd10246433af	1	Other	Other
+8befdcf5-b2ef-46ba-a641-3d54e4c81bac	1	Other	Other
+8bf0307a-7217-4744-b702-e6caaf5a73cd	1	Other	Other
+8bf06d4f-9909-4dc7-9da9-cd048016cf71	1	Other	Other
+8bf0af93-4ac2-4ffa-9e7f-ccb7dc31e18e	1	Other	Other
+8bf0e122-cc54-4d28-b130-9540832adb34	1	Other	Other
+8bf116a2-d53b-4dab-8ef4-facb591a7ca5	1	Other	Other
+8bf12297-67ad-4e0f-8a8f-5d7231a2cd69	1	Other	Other
+8bf129af-71d8-4ab1-bb51-c2d4a1068abc	1	Other	Other
+8bf12ba9-e20a-4963-902c-1022568fffb9	1	Other	Other
+8bf14b5b-ba93-4e73-80af-f8185cacd455	1	Other	Other
+8bf1641f-0c70-487b-8f34-7dc61c717fd2	1	Other	Other
+8bf17695-1606-49d7-9972-c7554fc210f1	1	James	Other
+8bf2387c-5bd6-49f8-bc03-7e2c58fd60c4	1	\N	Other
+8bf24794-8bf5-4bd6-b095-e6b8f79bb47c	1	Other	Other
+8bf27662-def8-4a2f-b25b-07fd69276faf	1	Other	Other
+8bf2ba3b-cc9b-42ed-9dc9-2b8f61753c57	1	Other	Other
+8bf3707f-f995-40af-8c35-71c53ed69a7e	1	James	Other
+8bf377fa-9d02-47fb-8e61-ac390800c184	1	Other	Other
+8bf3fbc5-eaf4-41a5-997d-0d762d2dbb12	1	Other	Other
+8bf40c11-6596-4623-8dcd-769baddc511e	1	Other	Other
+8bf4137e-0bdb-4f5b-b216-017871cd0794	1	Other	Other
+8bf42a8a-bff9-46c8-86d7-4d1d139c4c10	1	Other	Other
+8bf43bab-35f3-438b-8360-192ef2a6d3e7	1	Other	Other
+8bf442a9-2535-4645-9aee-0d36fc6e4ce2	1	Other	Other
+8bf44472-4649-4c4c-b011-fc140e6697d9	1	Other	Other
+8bf44cc8-d58e-47aa-ac40-c106db2c5174	1	Other	Other
+8bf456a6-1414-4abf-8b55-0d9761b7a6fa	1	Other	Other
+8bf457e7-2881-4f6c-b384-78ab1909e40e	1	Other	Other
+8bf4c143-7787-494c-a468-246cab477dac	1	Other	Other
+8bf4ee23-2c10-432c-8f39-18aac95bd632	1	Other	Other
+8bf52c50-94bc-4969-8a1a-773cfa1c0d6f	1	Other	Other
+8bf551b6-0a52-4816-b516-2d5fbded06db	1	Other	Other
+8bf5a574-0c79-4251-9395-2391ae73976f	1	Other	Other
+8bf5ade6-6447-463f-b635-305ee7466863	1	Other	Other
+8bf5d43b-6bd6-4182-9b96-f7fdfac239c3	1	Other	Other
+8bf63611-c73b-41b7-8160-3a2670f60f60	1	Other	Other
+8bf6883f-f667-4e80-9cf1-01f2d695e7e8	1	Other	Other
+8bf69387-74e4-49f3-bad3-7277810c9017	1	Other	Other
+8bf6a7da-e67b-4fdb-88ca-844713a758db	1	Other	Other
+8bf6a82d-3232-4231-b0a2-eeeafbbdc1e1	1	\N	Other
+8bf6add9-7709-43f4-aec1-c81cec0dbd9b	1	Other	Other
+8bf6e204-6baa-4d80-852e-d482a832117f	1	Other	Other
+8bf70a03-5269-4089-898f-20787761f0f1	1	Other	Other
+8bf739b5-5d6b-4f6a-95f0-15d67a50d31c	1	Other	Other
+8bf78f11-7f49-4204-b00c-5e412136ef55	1	Other	Other
+8bf7b98b-d137-4054-8ac7-0453079480f0	1	Other	Other
+8bf8029a-49df-4ca1-9492-5fa2fe05e20c	1	Other	Other
+8bf8a7c5-429c-4f73-b0d6-5e303bb03984	1	Other	Other
+8bf8e417-a503-4db4-ae55-824ddfac1a9d	1	Other	Other
+8bf8f56c-f95b-449a-8c27-9133198fa0e3	1	Other	Other
+8bf98c63-df39-4545-b603-9d923a5acee8	1	Other	Other
+8bf99dd8-7847-4a35-a687-49b5e5ce837c	1	Other	Other
+8bf9a714-8456-4a66-b37c-b13b2c7adf77	1	Other	Other
+8bf9f592-281d-4d4c-b892-25f85105d773	1	Other	Other
+8bfa005d-d23a-4cfc-9346-ccd3f8bbadd2	1	Other	Other
+8bfa1755-e573-4713-adc2-0ab043c66eb4	1	Other	Other
+8bfa64a5-61ac-4f2d-9051-b779780b86ea	1	Other	Other
+8bfae2ce-dc43-4937-857a-a18f81891790	1	Other	Other
+8bfb166c-60d0-4b7a-85f0-509c2183cf98	1	Other	Other
+8bfb5701-6965-4de8-9b68-6700b0af171e	1	James	Other
+8bfba95d-caac-4630-baec-a45a47fb878b	1	Other	Other
+8bfbcfc6-d250-44b6-8eed-12e186e0945a	1	Other	Other
+8bfc161a-adc0-4914-bbbb-90e72e25e71c	1	Other	Other
+8bfc45bc-a501-437a-8423-750de9a7b5f6	1	Other	Other
+8bfc5f27-90e7-42a0-9d82-33031b341e37	1	\N	Other
+8bfc9dfd-c577-4cd4-b65d-a054be4c1a99	1	Other	Other
+8bfcaab9-7692-4591-9fc9-6638ac4b00df	1	Other	Other
+8bfcc12d-db42-4b25-b348-200b6040944b	1	Other	Other
+8bfcc2ad-bcef-4e75-a9e3-107e0dc1cc56	1	Other	Other
+8bfcebc5-826b-420c-bf4c-37e6b5c5bcc6	1	Other	Other
+8bfd5c7c-adef-45f9-ad37-ab61a7baa117	1	Other	Other
+8bfd8be7-5ce9-4cd3-a0b0-0b0ef2c907f2	1	Other	Other
+8bfd90f4-a92a-4568-9c31-fe643e98a9af	1	Other	Other
+8bfe634c-5d29-472a-a9a6-1f70ebe78089	1	Other	Other
+8bfe8fb6-f966-4703-89d6-dd41278b02fb	1	James	Other
+8bfea77f-9e53-4a15-850b-04a78fc07081	1	Other	Other
+8bfebc6c-2733-41c8-a2b5-9a24acdf0f59	1	Other	Other
+8bfed247-155a-480a-a244-be53ea0b1ca2	1	Other	Other
+8bff262b-768f-4de0-8cb2-eb954dafe1d8	1	Other	Other
+8bff2bf7-15b3-4837-ae59-8d482a8f7ee4	1	Other	Other
+8bff338a-7a02-45ea-aa95-5af8702b7ad4	1	Other	Other
+8bff3a8e-8558-4751-b069-14dd8d0a3f63	1	Other	Other
+8bff7250-c793-49d3-9026-c1ae81c6610d	1	Other	Other
+8bff8e15-3ded-4746-a567-db5af579c867	1	Other	Other
+8bff9133-f695-4a6e-87d5-1c12e56d552a	1	Other	Other
+8bffad8e-b5d8-49e5-9fea-2b9d2b75e24d	1	Other	Other
+8bffb8ce-9784-450b-a632-86d1dc5724c5	1	Other	Other
+8c003b1b-613a-43b3-a6e5-19347a349d0d	1	Other	Other
+8c0057c4-8265-4877-95e1-daed8353146a	1	Other	Other
+8c00889c-cff6-4622-ba29-8348ca751fea	1	Other	Other
+8c00d9c1-8ff4-4d5e-ba64-ea9dffe6d5db	1	Other	Other
+8c00f8ba-ecfc-4c93-8df0-79931b37e7d3	1	Other	Other
+8c0147d8-4cdf-4d3a-93b8-76b56393fc44	1	Other	Other
+8c0150dd-3d77-4f2a-ab00-5ea9315b3a35	1	Other	Other
+8c019291-4748-41b1-a32a-5e30a7288889	1	Other	Other
+8c01ccda-6e9c-4731-9b7c-d2d7f88daa1b	1	Other	Other
+8c01e4e2-f960-4d54-a315-0d0258828183	1	Other	Other
+8c0207a2-86d6-437c-bd73-abfb06246e44	1	Other	Other
+8c0225a4-2010-41fd-8f10-d47f1403d52b	1	Other	Other
+8c023147-5d5f-4438-bcc9-889c97e0f056	1	Other	Other
+8c025849-0f42-4827-b7cb-cf4bcf6a9bb5	1	Other	Other
+8c026909-9cea-4bab-a360-a8fdf39ea44c	1	Other	Other
+8c027b05-8ee5-4ca6-a434-23bec6b7ba62	1	Other	Other
+8c02d67b-874c-4163-8000-dcc15bd06c7e	1	Other	Other
+8c02f6c0-8c6b-4b9e-85c8-9e28978e9022	1	Other	Other
+8c032bfc-daa6-4a38-a7a9-5a28e3b6d008	1	Other	Other
+8c0362ac-78bf-469d-a6d8-defd0c895682	1	Other	Other
+8c0371b9-5914-4500-b8b1-58170e36e2a8	1	\N	Other
+8c037ff9-36e6-4f8e-ae94-944aae71e7e1	1	Other	Other
+8c038528-2caa-4cf1-aa97-75e221ec0bae	1	Other	Other
+8c03e66f-76a0-46b4-b465-22986bca5c6e	1	Other	Other
+8c040aa0-9a76-4ad7-bdf0-71da329b1e40	1	Other	Other
+8c0436cd-8a1e-458c-9fcb-0bb42d24e3b8	1	Other	Other
+8c048c21-6895-4a4a-ae40-0848f02c14e1	1	Other	Other
+8c049a40-5c26-462a-9b43-9f61dd16e4cd	1	Other	Other
+8c04c3ee-5368-445d-9363-d002609740b8	1	Other	Other
+8c04d2d3-9459-4f00-9dd3-4b59ac028207	1	Other	Other
+8c04eaff-ef42-4a40-8f87-87c8459774c4	1	Other	Other
+8c04f68f-8ff3-4d8c-b07d-7f4a16da2930	1	Other	Other
+8c051aa2-9583-486b-8567-866685ad1dcc	1	Other	Other
+8c0538c5-0899-4438-ade5-7ec3e09c09cf	1	Other	Other
+8c053aa0-07a1-47aa-9bbd-3dea898f053b	1	Other	Other
+8c055507-c243-4743-bf6f-3b85597f253b	1	Other	Other
+8c0586b2-9e23-4786-aba0-a74d93e7582e	1	Other	Other
+8c05afcb-7266-4789-9733-944a17016d8e	1	Other	Other
+8c06131a-f7f1-4000-8f5e-6966440088fb	1	Other	Other
+8c06244d-3cf2-4a1a-8b21-d7e81e8b89d7	1	Other	Other
+8c062cf0-8182-4f9e-9dcb-56f0f63cfd05	1	Other	Other
+8c06b6b2-4591-4b88-b941-ed3a7da245f7	1	Other	Other
+8c06cddb-0650-49b5-8b55-809e58614bf8	1	Other	Other
+8c0753d1-b957-48b0-8be9-1c5cd643e43a	1	Other	Other
+8c07616b-4546-472a-b917-ac98992dd448	1	Other	Other
+8c079e90-68eb-4ba6-9430-317ccbf2dc53	1	Other	Other
+8c07aafb-9fd6-4495-98dd-492da6ccaf46	1	Other	Other
+8c07b018-8eb2-4b72-9e00-c2a8b2820699	1	Other	Other
+8c07bc85-55fc-46b4-a0ed-7f969d6c8fbd	1	Other	Other
+8c07d5bf-41be-4d77-96f7-a718d77089b0	1	Other	Other
+8c080e01-aa8c-4109-a25a-f5698bfc760b	1	Other	Other
+8c085966-b15f-42c9-8b89-ee2b747ed0f0	1	Other	Other
+8c0875ef-dacd-4b90-8091-4d7c85bf4a52	1	Other	Other
+8c08c76d-8c49-45d3-9d86-c70e9d30c948	1	Other	Other
+8c093333-9c37-4f3a-aedc-d07c0dd97efe	1	\N	Other
+8c093727-9d2c-42c4-a27b-4e663e050b28	1	Other	Other
+8c09626b-3954-4400-9d5f-e6423c22925c	1	Other	Other
+8c099911-ede3-4f2c-a666-8201c9aac081	1	Other	Other
+8c09c3b2-cd78-47ee-8614-cec12dbd9061	1	Other	Other
+8c09db79-d94e-43db-94dd-1a2d15648ea1	1	Other	Other
+8c09f16f-993a-4f06-8050-e4665d28e339	1	Other	Other
+8c0a2767-8432-4bb3-803e-50afde93396c	1	Other	Other
+8c0a3a4d-04b3-41c7-8c88-3d1f28bec4e2	1	Other	Other
+8c0a76a5-64bf-4500-8bf9-c77bc15daa9f	1	Other	Other
+8c0a85d7-31a8-4332-bfd2-8b32331895e7	1	Other	Other
+8c0a87a6-4723-43f0-a097-323e53e169c2	1	Other	Other
+8c0b1f03-0a98-4254-b455-eb310098aaa7	1	Other	Other
+8c0b48e5-f52f-4a94-8a8f-a72edbcb0d90	1	Other	Other
+8c0b5c1a-f192-4b77-a41a-5108c5ffda9a	1	Other	Other
+8c0c110e-1694-4a37-bcd7-e138a70a928e	1	Other	Other
+8c0c43cc-b098-480d-bad4-8bf9eb0b926c	1	Other	Other
+8c0c52d5-9e03-495c-946c-f0a4d2e9dd84	1	Other	Other
+8c0ca230-96a4-4da6-bccf-8ff317caaf0e	1	Other	Other
+8c0cba08-35b0-4083-8e85-b4e1adc0e396	1	Other	Other
+8c0cc434-a9d3-41a0-ad69-c9ae3cf9d665	1	Other	Other
+8c0ce9ea-aa45-430b-b338-ae6fc38fc522	1	Other	Other
+8c0d2f05-1fa3-4e2f-aae1-8b53b04203b0	1	Other	Other
+8c0d41e6-49ea-4c7d-aace-c4d071d7ea68	1	Other	Other
+8c0d6f15-0a82-49b8-ab41-b8c6ec2d067b	1	\N	Other
+8c0d7430-39e3-43de-9fa2-232088cf10f4	1	Other	Other
+8c0d90c5-4f18-494a-b490-6946aa5a3d9e	1	\N	Other
+8c0db893-327f-487e-a52d-79c5e82b5270	1	Other	Other
+8c0e13fe-3e9d-497e-93b3-31fdb8d949be	1	Other	Other
+8c0e26ca-f6bd-42bf-843b-44aeb4bcf9e0	1	Other	Other
+8c0e4c54-8c86-42cf-a1fe-ed17144e615b	1	\N	Other
+8c0e526d-391c-4cf8-a953-b9b5c6591c8d	1	Other	Other
+8c0ea7de-2175-4d69-8d3b-22b2c43cb5de	1	\N	Other
+8c0ecd18-c1b4-4208-815b-982fa89dbdd9	1	\N	Other
+8c0ef807-3749-4879-9a65-d83c31b29d25	1	Other	Other
+8c0f20b5-f9ab-4867-aaab-c388cd5fb5a2	1	Other	Other
+8c0f3427-910d-4ad6-a387-9c5c69a49075	1	Other	Other
+8c0f93ed-1ef5-432c-827a-7f1cc5ecc581	1	Other	Other
+8c0fccb2-0e65-4b1a-9745-7316fd8efc89	1	Other	Other
+8c0fff68-5b00-4353-b9ca-4fdf3d523fa6	1	Other	Other
+8c103d46-1943-4d55-b2d9-01beae00673d	1	Other	Other
+8c109116-3375-44a5-be2f-dd99db377c08	1	Other	Other
+8c10b9eb-0050-4e92-896f-35d3dae30237	1	Other	Other
+8c10f809-a441-47a7-82f3-9d5ae2eceaa1	1	\N	Other
+8c10f8ab-1d06-463b-b167-aa9d7b1960dc	1	Other	Other
+8c11041f-57f0-458a-80ca-c0420a7a93ad	1	Other	Other
+8c115ef3-e8f6-4ae9-a3c9-731d68f162ce	1	Other	Other
+8c116c0b-199b-4c3a-a8a3-759b17cedb80	1	Other	Other
+8c118fb0-ad5f-4145-a38b-a3db0c6b3afa	1	Other	Other
+8c11d3c7-26a9-4dba-b4f1-0f04e6c06056	1	Other	Other
+8c11d4a3-6a1e-41a5-a06d-a4a10936e7a6	1	James	Other
+8c11de4a-e2ac-48b1-a6d2-84dc9176e0d2	1	Other	Other
+8c126595-a4c0-4fb3-b5f0-38e5c4376254	1	\N	Other
+8c126ac8-8f60-469a-9fd5-c00e0107c83d	1	Other	Other
+8c128010-8bad-47e4-879a-9c0511b0aa9f	1	Other	Other
+8c128ac3-0493-4926-80ab-a7a489b982a3	1	Other	Other
+8c12db9f-8ddb-4f2f-93e3-2fc1258c04bb	1	Other	Other
+8c12fe94-06a6-4d99-a922-ef97cc673af8	1	Other	Other
+8c131c36-04ad-456a-bacf-58767bec5040	1	Other	Other
+8c13460e-b042-4a45-9f62-49972b20155a	1	Other	Other
+8c136111-8b8c-4781-9c2d-1d09a50c41da	1	Other	Other
+8c136125-296d-4018-9afc-7c86ba848400	1	Other	Other
+8c13981b-c875-460d-9253-ab02bb388346	1	Other	Other
+8c141b4a-8034-4c0a-8bee-12a82d7395ae	1	Other	Other
+8c1443a1-514e-4e79-a046-b99aee2168e3	1	Other	Other
+8c144674-9d73-484d-88fd-5835b1245a77	1	Other	Other
+8c145b27-0129-4190-bc2d-ec450ec7bfa3	1	Other	Other
+8c1484c5-2fec-4079-9d72-0a20cae00251	1	Other	Other
+8c14bc9b-7c05-43fa-96c1-c10e30f54556	1	Other	Other
+8c14dab1-7eb3-423c-b14d-66f59e1e79de	1	Other	Other
+8c159262-2574-4d99-9916-9d8ceadd4709	1	Other	Other
+8c15bdbc-5b49-42a8-b727-60b849e82a32	1	Other	Other
+8c15c2f7-a592-48bf-9efb-82fe7d4703ad	1	Other	Other
+8c160c2c-37a2-42d3-8517-8fc218b11c33	1	Other	Other
+8c1656ef-96ec-4b39-93de-436d1fb4f0c7	1	Other	Other
+8c16adf8-c4e4-4be4-9c9f-b159b7af9830	1	Other	Other
+8c16f15f-fca1-4390-ad73-02a6b57d24a7	1	Other	Other
+8c1755ef-f7d0-4376-b7fe-b973f7fbbf21	1	Other	Other
+8c17576c-5da4-4ed5-af7c-4d54392bc40d	1	James	Other
+8c175917-b0a8-4c4e-b9e6-1d207ddeec14	1	Other	Other
+8c176685-063a-4afd-a5ff-30ce73501a3f	1	Other	Other
+8c1773e2-5610-4202-a35b-15b18c0cd402	1	Other	Other
+8c17a863-8e12-4cbb-9ca1-12f3209e7c66	1	Other	Other
+8c17d2c3-8c01-4eba-83c9-f60095ccfaa9	1	Other	Other
+8c17e4d8-7063-48ae-b5e8-c348b830c060	1	Other	Other
+8c17e7c1-0c37-4b9f-9332-d067f0ca4360	1	Other	Other
+8c188862-e941-4289-ac40-2460f3c23012	1	Other	Other
+8c18e27b-1ca0-42cd-a982-732889e5a833	1	Other	Other
+8c194382-fe0a-4580-88f4-7b463d1c8109	1	Other	Other
+8c194414-0681-4d90-9053-71e46cfa504b	1	Other	Other
+8c1976d2-8655-4251-b5b7-b95e1acad1fb	1	Other	Other
+8c19a1d4-d503-46fa-9aae-a432a2d67a13	1	Other	Other
+8c19b83b-48a4-4266-8cf7-a26b20c7983a	1	Other	Other
+8c19bbb8-bad0-4c94-b871-fb2fc5049dd4	1	Other	Other
+8c1a2822-4d91-4cb0-b2c6-94fc6c0fbc44	1	Other	Other
+8c1a5ddd-9a3d-4928-a397-b0775a109461	1	\N	Other
+8c1a6873-12b9-4b73-b7b8-62da6e0a482e	1	Other	Other
+8c1aca6a-a621-4186-9fd3-cb604ea277a6	1	Other	Other
+8c1b0cf2-c8f1-4163-b5a1-ffe54f0ffaf7	1	Other	Other
+8c1b45dc-ade0-46b1-83ec-779ed71e3916	1	\N	Other
+8c1b5077-6f85-4f75-8766-869cdeb6cdd5	1	Other	Other
+8c1b5554-9c93-4098-88f9-5d983339d32e	1	Other	Other
+8c1b6317-90b5-49b9-a7aa-1bae05282168	1	\N	Other
+8c1bb86e-745b-401f-8779-1d3fcc622794	1	Other	Other
+8c1bc8e9-017f-45be-8995-a5a54236ba6d	1	Other	Other
+8c1bd75a-6f4e-4980-8b06-5a2e721f3591	1	Other	Other
+8c1c20d2-4620-4fd3-928c-3af20d480625	1	Other	Other
+8c1c2f9a-4c82-4950-872a-0035da1ae69b	1	Other	Other
+8c1c627e-9218-4182-9bce-9a5cefb43768	1	Other	Other
+8c1c703b-5037-4b29-8e59-d153c190887a	1	Other	Other
+8c1d142b-ee16-4cb5-8e97-8e4fbf3d4dca	1	Other	Other
+8c1d443f-fe7f-4103-b60e-305b73254406	1	Other	Other
+8c1da23e-4c26-43a0-9c97-33989818f475	1	Other	Other
+8c1dbe9d-6954-4113-9e94-e6aa65a5c9df	1	Other	Other
+8c1df78a-b1ca-4af8-96f5-5748f0762757	1	Other	Other
+8c1e1f3c-6829-4f40-b84b-d7d1e8f6accd	1	Other	Other
+8c1e2743-cf84-486e-b7b3-3687ff6f0fed	1	Other	Other
+8c1e40f1-1d8c-4e42-923f-b9e792b3076a	1	Other	Other
+8c1e5195-69f4-4559-a96f-cb2ad188c426	1	Other	Other
+8c1e5a24-9df7-4919-b238-5d7fb1243a60	1	Other	Other
+8c1e758a-e5b9-4ed4-a945-3fe0947e47bf	1	Other	Other
+8c1f18e4-e0a4-43cd-824b-10583691054f	1	Other	Other
+8c1f2322-04ed-4d12-9f9f-10393f4a20be	1	Other	Other
+8c1f35e8-5fce-4e6e-9eca-59fa43239562	1	Other	Other
+8c1f4959-6191-4cbc-8ab6-d80505df3c2e	1	Other	Other
+8c1f5650-7dfa-4f14-81c7-6d592cc59362	1	Other	Other
+8c1f6cb5-ec20-4d13-a484-534a76c73c51	1	Other	Other
+8c1f9189-72c0-4f3a-b331-62a8c8d020bd	1	Other	Other
+8c1fa8a7-9d91-470a-bfb9-5f040e7820f6	1	Other	Other
+8c1fa8e6-8e13-4252-87c7-3cc5a8e4bb54	1	Other	Other
+8c1fa93c-9b7c-4da2-bcdd-835b9a1f9c51	1	\N	Other
+8c1fb486-6321-433c-9f9c-dc64c0fd68cd	1	Other	Other
+8c2022fc-4f03-4bfd-aa1d-2fea66359582	1	Other	Other
+8c2072b7-715c-4c41-bfce-d41ce6cb8a1a	1	Other	Other
+8c207aea-2924-495a-845e-4e64fb7683ec	1	Other	Other
+8c208b90-a141-47c9-8618-a82bdaf7adbc	1	Other	Other
+8c2095a6-f561-4795-91c7-827a4e0002bb	1	Other	Other
+8c20a84e-2dcd-4132-a035-30615ab8f135	1	Other	Other
+8c20d38e-cb17-4d6a-a983-13004853aac1	1	Other	Other
+8c2142bc-a328-4423-90f8-4c29e2cf1bf3	1	Other	Other
+8c21c2c0-cf5a-4a56-a3eb-c218fafd4556	1	Other	Other
+8c21dc52-198f-49ca-921c-053fef3c2f77	1	Other	Other
+8c224df3-5edb-459f-9a81-4dd290ebc47d	1	Other	Other
+8c227a5e-cb56-4699-a396-88d655ea22c5	1	Other	Other
+8c22abf5-f0b5-40c7-a648-b968a2ae3cfc	1	Other	Other
+8c22e80d-e576-40e8-8a4e-06a6bd4940a0	1	Other	Other
+8c22e822-98e5-444a-a477-0bb63fe6d120	1	Other	Other
+8c22efab-a69c-45b2-8d9f-3e2ca7c843a6	1	Other	Other
+8c231d8f-e446-4830-bf35-9b3e0efe3687	1	Other	Other
+8c232f8a-176a-44dc-b02c-a076a4a9cd00	1	Other	Other
+8c234cc3-0479-4341-afd2-ad74811dae05	1	Other	Other
+8c23b13e-ff16-4d9a-8d15-9f8605b0e690	1	\N	Other
+8c23d57a-57a5-453e-ac9a-b240716e6f51	1	Other	Other
+8c23dd51-a415-4d82-8179-af73bdb0e038	1	Other	Other
+8c23efba-3e67-4f7f-a720-cab2c52ef348	1	Other	Other
+8c23fb7e-70dc-4ee2-b118-aa212c6fc26d	1	Other	Other
+8c246337-2d4a-468e-99c0-42ec7fc40e70	1	Other	Other
+8c24eaf7-e33a-4508-8de3-d978fa2453bc	1	Other	Other
+8c24ffad-fd58-4845-a67e-9408424ef258	1	Other	Other
+8c252fd0-cc9f-4dc8-bdb8-fa59219955f4	1	Other	Other
+8c25850b-5c90-416e-9fbd-c4b8fbd7a3cc	1	Other	Other
+8c25ed71-aaf0-4dbc-bc12-d800da32dde0	1	Other	Other
+8c25f9f8-d141-4d1c-909e-a880f021459c	1	Other	Other
+8c25fc52-5c42-464c-8cc8-27aca877e660	1	Other	Other
+8c2617a3-3c54-402c-898d-926f4eb543f9	1	Other	Other
+8c261ac3-77ae-4af5-bdcf-c9b5e5276019	1	Other	Other
+8c262639-e130-40bc-a44e-e5f64e2c1de8	1	Other	Other
+8c264b5c-f8ea-42e9-9e5b-0e3e2f9955b2	1	Other	Other
+8c265ec2-b799-4c66-9b4c-1d6a0d9884ab	1	Other	Other
+8c2668e2-2919-4926-a707-762053754915	1	Other	Other
+8c26810f-d837-40e1-99ac-4c2ff0defcee	1	Other	Other
+8c26bba8-2993-4b68-a464-37291ccc1091	1	Other	Other
+8c270763-e049-46fa-ba06-6fb72a31ef6b	1	Other	Other
+8c270ef5-1933-4a39-aed1-fd5ace6414cf	1	Other	Other
+8c271547-be3b-4636-b61e-6adadf0efe05	1	Other	Other
+8c273de7-da1a-47c8-9ee2-ff729d77a88f	1	Other	Other
+8c277e88-5392-4226-af75-a9606368999a	1	Other	Other
+8c279748-33d8-4b07-bcae-51dcba8c8d00	1	Other	Other
+8c27b8cb-1d57-4a67-ab56-7202ff74af51	1	Other	Other
+8c282914-ebff-41e2-b4b5-196eb595d3be	1	Other	Other
+8c285f51-cad5-4de5-b078-acc0f7964fbd	1	Other	Other
+8c288807-76ed-4e02-af19-516124f50401	1	Other	Other
+8c288f06-41d2-44a4-ba50-1c06ddd86a7e	1	Other	Other
+8c28a2fd-7605-4310-9793-646b1441fc0f	1	Other	Other
+8c28e8a6-940e-4ec3-ae70-a93e8fa2382f	1	Other	Other
+8c28eee7-2c89-442c-8056-5b9c951ef685	1	Other	Other
+8c290a2d-bf69-4e45-ae30-89d5fe89a36e	1	Other	Other
+8c293308-98d8-42f5-bffc-9128c4ba78f4	1	Other	Other
+8c2961be-940f-412b-9f3e-1130ae945bae	1	Other	Other
+8c29ae5e-9d46-4ef1-9173-475d6f495411	1	Other	Other
+8c29f2c1-1c12-4521-90bb-24658ea48c43	1	Other	Other
+8c2a2ba1-bd59-4e16-b4e0-f0cf88cd671b	1	Other	Other
+8c2a7835-5386-4317-9ce9-f45b16f2fc31	1	Other	Other
+8c2ac3a6-8888-4017-bf71-4df1f28a8891	1	Other	Other
+8c2ae226-c55b-4108-b18d-31670c4b2d96	1	Other	Other
+8c2aebc8-257c-4d1d-bfc9-9ac0a72484dc	1	Other	Other
+8c2aef4a-704c-48ca-89d2-14e4fc5bb06f	1	Other	Other
+8c2b136d-f35d-400f-80c3-2e9c731eb4db	1	Other	Other
+8c2b5d06-e379-404f-b69c-f546f2d43e70	1	Other	Other
+8c2b613f-c9dd-4160-b81a-b6f554c6cbab	1	Other	Other
+8c2c1cc3-8336-4626-a4d7-b6ea440bb657	1	Other	Other
+8c2c2f89-adef-4efa-a7e0-52cffeac6ee4	1	Other	Other
+8c2c9d10-a63c-4650-b7fc-d4510b9b2564	1	Other	Other
+8c2ca00f-8315-407d-b2aa-3ce6878d54aa	1	\N	Other
+8c2cb331-5a72-40a1-a039-297f8a38692a	1	Other	Other
+8c2cfca4-41e5-406b-8310-2b18f382ef46	1	Other	Other
+8c2d08e2-aa31-4197-86e1-6d182f06749b	1	Other	Other
+8c2d2276-998b-475a-a29e-44273393b6bf	1	Other	Other
+8c2d2d75-543d-4306-8e5a-7524be74d74c	1	Other	Other
+8c2d370b-2fc7-401c-970b-01dcd82edc61	1	Other	Other
+8c2d9ad1-a4ee-4dde-9dc9-8be25078ae07	1	Other	Other
+8c2df527-2925-41fa-8a72-29c68e8066e2	1	Other	Other
+8c2ec1c8-7a55-4e98-871f-f3c83303ba02	1	Other	Other
+8c2ec7f2-ee86-4d75-ab4d-1aaa7ed5a601	1	Other	Other
+8c2ef2d9-8d05-4165-aee4-2d936e875aaa	1	Other	Other
+8c2fab25-d9c6-4562-acd5-08376a56dd6f	1	Other	Other
+8c2fb2ac-d43b-49c3-a94e-2a99f3dba6e7	1	Other	Other
+8c2fb5d5-803c-4bf2-8ee1-6560694442db	1	Other	Other
+8c301b4b-f3af-4893-af6d-aa2dd8cef1d8	1	Other	Other
+8c30285a-afa7-4d54-a472-da63c40eab26	1	Other	Other
+8c304f59-8e28-42ad-b666-302992c25f33	1	Other	Other
+8c30b153-2b8e-4d8c-9631-04a23291b816	1	Other	Other
+8c30f876-64e2-44be-9e40-5df6b848b619	1	Other	Other
+8c3131c1-f59d-4cb2-836e-a15413ff6956	1	Other	Other
+8c3142be-107c-45e2-8fd4-3ca5f1083d43	1	Other	Other
+8c31560d-da49-47a1-82b6-51929d1a4ab0	1	Other	Other
+8c31b7d3-4b4f-44b1-a5d9-20959245f577	1	Other	Other
+8c31d913-0c41-4bb7-986c-1861a82ad201	1	Other	Other
+8c320b88-a082-473a-b77a-1d18e2d337d1	1	Other	Other
+8c32270f-9399-4ae3-b719-0dadd425f3c2	1	Other	Other
+8c32af2a-bb78-437a-b49a-b31adeacc256	1	\N	Other
+8c32d045-43d3-4443-ab5d-69af14ab794b	1	Other	Other
+8c32d3c0-5479-4e8e-add6-37918b3d9f22	1	Other	Other
+8c33cb05-f5b6-417f-80c8-6a142c864d0b	1	Other	Other
+8c342835-5a31-41bc-9d87-1f74f8973b73	1	Other	Other
+8c343c0a-2c4c-409c-98a9-05613c3dc731	1	Other	Other
+8c349d06-f0f9-4047-86e0-b6a78cdca9a1	1	Other	Other
+8c34c987-7ede-40c5-a0ae-cccb8c644066	1	Other	Other
+8c34cfb9-d636-42a2-bf53-45add052d26f	1	Other	Other
+8c34d819-e82a-46da-bb88-17711a84bb4d	1	Other	Other
+8c34daa5-a56c-4902-b987-a4812f636dfb	1	Other	Other
+8c35394f-9513-46d0-8705-2c0b530ab9e1	1	Other	Other
+8c3559d8-4336-403d-b6c6-3149cdea4f95	1	Other	Other
+8c359661-a2ff-4289-b484-64ea4118f211	1	Other	Other
+8c359e9f-3f24-41f5-b917-946cd859afa7	1	Other	Other
+8c35a2c8-663b-4941-81b1-31fd7796c659	1	Other	Other
+8c3600ed-3785-407b-86a0-c3ccd0ded19c	1	\N	Other
+8c36695f-cbb5-4a92-af90-ecc8dc5d3001	1	Other	Other
+8c369688-7e7e-4778-acce-9681f4497688	1	Other	Other
+8c36c047-72b4-419f-ae22-a3dce08e9c22	1	Other	Other
+8c36dced-680c-4695-8f8b-b2b53dba8044	1	Other	Other
+8c36e201-e9e1-41b7-9cb7-132b1cb41189	1	Other	Other
+8c3705af-1416-4820-a5cb-9478f972cdff	1	Other	Other
+8c370e8d-4423-443a-b64e-071815fb2675	1	\N	Other
+8c371fd4-d5c7-4f7c-babd-87c5ef38851c	1	Other	Other
+8c3721c1-7fd7-4de8-853e-604ba86d5a0b	1	Other	Other
+8c372faf-2bfe-4bec-97be-38d9fc96af1c	1	Other	Other
+8c3783d7-a6c1-48e4-b0c0-1aeb40e7905c	1	Other	Other
+8c37cc6d-9115-46a0-86df-05bfd4a69d82	1	Other	Other
+8c37ddf8-ba0a-466e-9908-164b9adab0e6	1	Other	Other
+8c3804d8-f676-4b1a-a16e-54431ad2a955	1	Other	Other
+8c38146c-3a89-42ef-9d39-9b87d24bbd5f	1	\N	Other
+8c3824ef-a86f-49e3-a9e8-0ebad728a63d	1	Other	Other
+8c382741-a965-49e7-9166-19788610df11	1	Other	Other
+8c3843a6-2b13-4738-87b0-11bdfb2a23a8	1	Other	Other
+8c3848ed-bb20-4819-bdd0-96b296aea2ff	1	Other	Other
+8c384d37-23bb-41e4-92d1-4626ad88e4ea	1	James	Other
+8c388b4c-a783-4788-ad71-5243cd7f099c	1	Other	Other
+8c38afd3-9e98-48c3-9adf-cdaa7063ae95	1	Other	Other
+8c38bb76-ee8e-4262-b12e-f7730bd43bed	1	Other	Other
+8c392996-2f6a-4391-ac68-1897bd26c720	1	Other	Other
+8c39d0f3-c250-4878-b42a-af4866ea4380	1	Other	Other
+8c39f6db-2ac9-4f3d-aeac-9d9bdda10f52	1	Other	Other
+8c3a1017-b06e-4f5e-b38f-7e1f0e62dca1	1	Other	Other
+8c3a2c3d-eac1-426d-802d-fe3ba79e7ee4	1	Other	Other
+8c3a3429-a978-4d48-b42a-f30164c67bb3	1	Other	Other
+8c3a6e62-cb64-4f01-8d10-273c59af7e14	1	Other	Other
+8c3ac272-7449-4288-a2fb-79caa6867d5e	1	Other	Other
+8c3ae8a2-e2b0-4dbc-9ad9-4865acb6a742	1	Other	Other
+8c3b1681-a4f8-447b-8d68-27ea43815827	1	Other	Other
+8c3b42b2-bafd-41ff-bf57-42c6e40687ca	1	Other	Other
+8c3bbeee-4dba-4f84-967d-c40e6348a0c1	1	Other	Other
+8c3bca2c-a212-4cf8-a986-9a47907d2a8d	1	Other	Other
+8c3c364e-68aa-44c7-af5e-cecdf6cd06f3	1	Other	Other
+8c3c8f31-4506-442b-9536-5ea502eff240	1	Other	Other
+8c3cb691-d336-484f-91d1-a67c700e2a66	1	Other	Other
+8c3ce119-b0ad-4c2d-a803-a5b6910a939e	1	Other	Other
+8c3cf945-2192-4d75-a1ed-65c0c9a09a10	1	Other	Other
+8c3d2ca1-1388-4c1e-9236-bc0b7dc9afc6	1	James	Other
+8c3d3300-890a-4473-9720-a4cfd4945e7c	1	Other	Other
+8c3d8dde-d61a-4ef1-9c50-58b6a5575efc	1	Other	Other
+8c3da1a3-0bab-47b0-83ab-4907101ebf7a	1	Other	Other
+8c3dc0ee-7e98-48c4-aea8-49735a8344dd	1	Other	Other
+8c3dd1cc-b42f-4a8a-880c-4333870f2d7b	1	Other	Other
+8c3ddd1f-ab16-4576-88ab-ffd6e87c51ee	1	Other	Other
+8c3e5224-2194-4186-9b0e-6c1abd7b531f	1	Other	Other
+8c3e7a22-1cef-4078-888a-b824fdb820d0	1	Other	Other
+8c3e7ecf-26ba-4945-bf86-bc5797f76f31	1	Other	Other
+8c3e943b-7ec5-4791-a3e1-3005e6f83dcf	1	Other	Other
+8c3f33a8-9d0b-48a8-98c5-00f56f6007ea	1	Other	Other
+8c3f4655-7a26-42cd-8bcd-16410d5eafd0	1	Other	Other
+8c3f4f54-3316-40c9-becb-6e393064e1fa	1	Other	Other
+8c3f6a41-63d3-4aa7-be22-2a448f7fc577	1	Other	Other
+8c3f814c-e4ab-4a5b-8fb4-b1cd8ee4592f	1	Other	Other
+8c3fb590-31cd-4b97-91bb-6e32e514c1c9	1	Other	Other
+8c3fc635-c239-487e-9069-7798a020e062	1	Other	Other
+8c3fcdfb-9946-4df2-8114-29b5741f9bac	1	Other	Other
+8c3fef34-f1ea-41b7-b115-4842f09bb027	1	Other	Other
+8c3ff492-b206-4075-abac-f82193729b74	1	Other	Other
+8c40115f-8c2d-471b-8f21-8927926e0eb1	1	Other	Other
+8c4048b6-557b-40fd-ad97-d1dc8b2727f9	1	Other	Other
+8c407973-7c62-4d74-a63a-543c02183787	1	Other	Other
+8c409984-177b-484f-9191-49cd5e748be7	1	Other	Other
+8c40b207-9222-4b76-a653-e3c4ae7d26e2	1	Other	Other
+8c40ba74-9cd5-4bde-a80e-8d659149d1f2	1	Other	Other
+8c40c3ea-0c1f-40ae-86a0-a603210d34d7	1	\N	Other
+8c40d094-8769-4004-96ab-02a2c7d3da14	1	Other	Other
+8c412dae-f63e-40c7-a7cb-c130bf7be836	1	James	Other
+8c41d8dc-c77b-4ed4-9773-054d7170e581	1	Other	Other
+8c41f1d4-1662-4ce6-bdba-91d4c1212c78	1	Other	Other
+8c4280c0-7e12-46ad-8b95-1dece3bf3c0c	1	Other	Other
+8c428b09-3c24-419f-880c-f7e197ea4f25	1	Other	Other
+8c430741-823a-4b70-8e10-7310d9d972f3	1	Other	Other
+8c430b60-9635-434c-ab35-050db5b19057	1	Other	Other
+8c431f7a-28cd-4545-9322-81ae114b341c	1	Other	Other
+8c43595c-e89e-4903-a1d9-c00d7bf17745	1	Other	Other
+8c438c58-f8ec-43dd-bd39-55555be7d5f5	1	Other	Other
+8c43d014-9561-4b5f-9570-0c60bc16d261	1	Other	Other
+8c43d8b6-22ff-440e-9aab-5ef569ceae6c	1	Other	Other
+8c446906-08ff-4a02-9ea8-a3bdb1747daa	1	Other	Other
+8c4480ef-8829-4750-8d76-791b9aaf8574	1	Other	Other
+8c45016f-ac5d-4b51-9da3-909b3298d1b2	1	Other	Other
+8c45152b-4ce0-4c7c-927f-900f9270797a	1	Other	Other
+8c459dca-d8d0-4b88-8f4d-8912283f2b71	1	Other	Other
+8c45b8a8-33ca-4204-9753-12c0cf98f7cf	1	Other	Other
+8c462ee7-c287-44d4-bb28-570cbda51603	1	Other	Other
+8c464389-4645-4b8b-b24f-6bd2d16a13a8	1	Other	Other
+8c4652aa-0c49-435e-84b1-12356a230571	1	Other	Other
+8c465f07-6420-4fd2-8343-0f3c715c885a	1	\N	Other
+8c46849b-7481-4c9c-b744-6c44da42f0c0	1	Other	Other
+8c46dd9e-47c2-4552-a984-7bacff391385	1	Other	Other
+8c46fa5b-897c-45d2-a019-ff733d44e0b5	1	James	Other
+8c47025c-4544-11e8-9787-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8c476178-7e8c-4099-865d-d43a6cae60c9	1	Other	Other
+8c4769c9-b8cb-4277-84fc-b7be097e4787	1	Other	Other
+8c47a430-5694-45f6-b135-373315dc45fa	1	Other	Other
+8c47bff7-237d-4a1e-9d53-05f076ffe2d5	1	Other	Other
+8c47e3da-b28e-47c4-bd82-813d3c9fb39b	1	Other	Other
+8c47e523-ff81-4a43-a9aa-28c0b7bcd8b0	1	Other	Other
+8c47ef0e-7082-427c-a061-5077d919dfcf	1	Other	Other
+8c480c6b-a86f-4217-b2a5-f6eccc21e901	1	\N	Other
+8c486fe7-fabd-4dbd-9e05-3825136f7875	1	Other	Other
+8c4893b0-a6d2-4ba3-bb69-ef1173162758	1	Other	Other
+8c48ba2a-78d8-4745-99e8-d55a1b3a220b	1	Other	Other
+8c48eb64-1700-40b0-a0c2-ab1c3589edee	1	Other	Other
+8c48f720-8e3d-457e-ad04-a12d8e93ac05	1	Other	Other
+8c48f8ae-8c05-4628-88a4-95f7a5c3591d	1	Other	Other
+8c4917f6-0f21-4034-8f23-cd7f73f4d6a5	1	\N	Other
+8c49296a-2b60-4a03-8a51-d8e8c5aa3022	1	Other	Other
+8c496ef0-f5bf-4ba9-88b6-89ccf290f76b	1	Other	Other
+8c4976a6-0a91-43da-b6b7-a70046e27896	1	Other	Other
+8c498c74-541e-45dc-91bb-50df5a398858	1	Other	Other
+8c498e5d-604e-4921-92d4-efa59e0860d3	1	Other	Other
+8c49a758-5963-4126-889c-9de87240ca5e	1	Other	Other
+8c49b997-97ba-44a3-8805-4ed235ccf120	1	Other	Other
+8c49bac0-4a9a-4c96-ab3a-d702193c5641	1	Other	Other
+8c4a15d2-a2e0-4e6d-a584-c56f62dcc5c6	1	Other	Other
+8c4a67f7-034e-47c5-a3a6-a93805d25b3e	1	Other	Other
+8c4a7a25-c38e-42b4-b126-fef6fd072791	1	Other	Other
+8c4ad7ea-57ba-4850-b4cf-ae052ee7e17e	1	Other	Other
+8c4af195-61f8-4818-8c01-76ed15e5253e	1	Other	Other
+8c4b2040-51dd-4c19-84a9-c8f06d4f7bba	1	Other	Other
+8c4b3b40-7791-4a96-a3b2-994f7bde0a78	1	Other	Other
+8c4b5de0-420d-4078-9bd5-c4cef8f0db88	1	Other	Other
+8c4bbaac-930a-4b73-88c3-282b37e2f8de	1	Other	Other
+8c4bd7df-94e8-41f6-b8b2-852ef30037cf	1	Other	Other
+8c4bdd0f-4219-43f3-bea7-05a09a6d989d	1	Other	Other
+8c4be2c8-8b92-4eed-9b50-eba9501a49e8	1	Other	Other
+8c4c2da3-ee64-4a6e-8969-9f429da83cc5	1	Other	Other
+8c4c3cee-33cc-4e71-bfba-b36e135b69cd	1	Other	Other
+8c4c9590-b041-46dc-afbe-91876b3cac9d	1	James	Other
+8c4d0c94-9cb1-48c5-a4ae-f527bcb9bf5a	1	Other	Other
+8c4d1760-46b7-40bc-9e8e-ca07cb07c5d8	1	Other	Other
+8c4d2339-ae74-4a6c-94e7-3b6b607638b2	1	Other	Other
+8c4d83ad-2c1e-4a2d-a5a5-4465b82a80e2	1	Other	Other
+8c4da8a6-9927-4554-af08-032a09f99f88	1	Other	Other
+8c4db843-d3e5-47ef-86b1-9a8b0f25c8f8	1	Other	Other
+8c4dd4ef-591d-4028-87a0-c3ac1b7d81d4	1	James	Other
+8c4df7c8-546f-4691-bd29-33309643781e	1	Other	Other
+8c4e02e0-78b3-4598-8caf-1805f91e7dc9	1	Other	Other
+8c4e0893-e074-4662-b80b-c1d889fcb096	1	Other	Other
+8c4e50ff-87bf-4c55-a1d4-d5b624f11c81	1	Other	Other
+8c4eb65a-2ae5-47c4-9669-e554ecf423b7	1	Other	Other
+8c4f00a3-d9c9-4084-b19b-6ae364f5c8e3	1	James	Other
+8c4f6d8b-fa10-42f7-847f-2636aa545500	1	Other	Other
+8c4f7aaa-3e04-4247-9e01-c041d7384d61	1	Other	Other
+8c4f8e70-3563-4f5e-9fce-02eddf36264a	1	Other	Other
+8c5017ca-63a8-49d4-8d83-b2976f07f57e	1	Other	Other
+8c50556e-43ce-4dde-8d41-e673f688fd9b	1	Other	Other
+8c505dac-68fa-440d-8b30-373f185f87c5	1	Other	Other
+8c50a147-5910-41fd-b80b-40db9552769e	1	Other	Other
+8c50beb0-287b-44a1-90dc-4cf4c7f49291	1	Other	Other
+8c511b81-7ee5-4a7b-acec-c9d42a7c5fbc	1	Other	Other
+8c51397b-6534-4ec7-b847-c66dac7b70d9	1	Other	Other
+8c51664b-6efa-4c27-9a37-61c5d052b8ec	1	Other	Other
+8c5166fc-2675-45f3-baa0-2bdba82ba649	1	Other	Other
+8c51870a-56d1-41e7-9d91-d6e7cf2866a9	1	\N	Other
+8c518f56-fd0c-4eee-a270-c04b44dc2a7b	1	Other	Other
+8c51bf18-cb1a-4cd3-bdf8-3675ace86478	1	Other	Other
+8c5215e9-90fa-496e-921c-4f9fdd52d372	1	Other	Other
+8c52278f-ca83-413f-9409-5d8e5bc62297	1	Other	Other
+8c5227db-5255-4e1f-a6c5-d2d3f8d1c530	1	Other	Other
+8c522900-d267-47d9-952a-ca591779bd29	1	Other	Other
+8c524739-6ac8-4277-be4d-ec1afdec5187	1	Other	Other
+8c5276ac-5c4f-4a94-b881-b7169fad94fe	1	Other	Other
+8c52845b-53ca-4d51-a239-9633eddc2de5	1	Other	Other
+8c528fcb-1d1f-41dd-a83a-dc58370d8c1d	1	Other	Other
+8c52f7b3-a304-41a8-b486-a2ee050f1f92	1	Other	Other
+8c53556a-a82c-4262-8a56-3b2e01aa50b0	1	Other	Other
+8c5368ec-ceff-4d0f-8ddf-54524af48ea8	1	Other	Other
+8c536e4a-5bbc-4571-8b5d-11bb5ebec6aa	1	Other	Other
+8c53864c-d4bc-4912-8289-4ae4b2d779fb	1	Other	Other
+8c538d74-1ee6-4e17-9d40-9e75c901ac00	1	Other	Other
+8c5390e1-04c6-4012-a639-ab4a14fa1a7d	1	Other	Other
+8c53cc4e-d223-4c0e-8fe7-b2ac466ce60d	1	Other	Other
+8c53ef1a-5868-4f47-8e0c-2e1e2d5d5e84	1	Other	Other
+8c54430b-bbd5-4a11-99fb-092ec0a4ccd2	1	Other	Other
+8c545a4e-2941-4fea-9465-4f8c2b633df8	1	Other	Other
+8c548cb0-7a38-4470-82ec-441a2528951e	1	Other	Other
+8c54a5eb-345b-4adc-96fb-f0c8f695ef30	1	Other	Other
+8c54c6af-59be-4601-803a-d801b8cf0d8e	1	Other	Other
+8c551b38-b450-4049-9171-af74782deb04	1	Other	Other
+8c556cb5-d8ec-4970-92e7-dc1fc511ce00	1	Other	Other
+8c561bb3-5e35-4698-af8e-ff297d97fd4f	1	Other	Other
+8c5681d3-4cce-426e-ae7e-be18a84277ec	1	Other	Other
+8c568ef9-9a65-421f-85dd-e441117ae5cc	1	Other	Other
+8c56e508-4b51-43ed-a73b-2489591bda01	1	Other	Other
+8c5719ad-3c00-43ee-ad1a-477828f1aba1	1	Other	Other
+8c5753ce-8aed-4464-a344-5300fa4e92e7	1	Other	Other
+8c5768fb-5769-48e2-a80a-7e0520e138ca	1	Other	Other
+8c5796ca-b7d0-4d60-bc28-08843bc6608c	1	\N	Other
+8c57b2ae-f5f1-4be6-a5e1-f9f60ffea6fa	1	Other	Other
+8c57d8fa-5393-4499-83b9-87297755dca0	1	Other	Other
+8c57eb08-3cad-48a6-ae6e-532856ab9faa	1	Other	Other
+8c57ee7c-e9bd-42d1-a79b-dbee322c2b2b	1	Other	Other
+8c57f8d5-b625-45cc-8394-1107c857650d	1	Other	Other
+8c580fe6-37e9-488d-aa7b-5added560cd1	1	Other	Other
+8c587758-d46e-455a-8944-2a433da85e7c	1	Other	Other
+8c58911d-ed7c-4572-b144-74e8098ef211	1	Other	Other
+8c58d7e1-f81e-42c5-aef8-a15795a55c24	1	Other	Other
+8c595e85-1329-48ca-9b75-c521c66aa882	1	Other	Other
+8c598489-aa91-4ad3-a901-f215058b4709	1	Other	Other
+8c599134-a5c1-45b5-b7fa-1218275b6276	1	Other	Other
+8c59c70f-99ac-45e0-b8c0-82616691efd8	1	Other	Other
+8c5a3622-0f8a-4a06-99bd-30c4ad87e24f	1	Other	Other
+8c5a97c3-89e9-402b-b5e7-9e9769713171	1	Other	Other
+8c5aa158-a6cb-4e0c-ade8-68b333609b3a	1	Other	Other
+8c5b0696-b27d-4a35-9a88-2ed04e751580	1	James	Other
+8c5b119e-9e9a-4bee-8a57-dacaf1b2961a	1	Other	Other
+8c5b36be-9f49-4325-a8fc-a91851008b33	1	Other	Other
+8c5b3b4e-f652-4971-a01f-2b5174fd7812	1	\N	Other
+8c5bdfb6-01cc-4835-b756-aa1ce6fc196a	1	Other	Other
+8c5be642-b7a6-4994-9d2f-38e316872271	1	Other	Other
+8c5c088d-4024-4247-b594-b95dbb5ce513	1	Other	Other
+8c5c6bbd-1d20-4aa8-9dca-4d4b3e059eaa	1	Other	Other
+8c5c7c32-f144-4678-90cd-57f2cba8c1ad	1	Other	Other
+8c5c8bda-35f1-4cb5-9d41-97b5d4d05783	1	Other	Other
+8c5c9555-3452-4a04-b75b-3c654767ddc3	1	Other	Other
+8c5cbf7d-7891-4f97-b75e-5809d77b5fbd	1	Other	Other
+8c5cd8a3-812e-4de3-a4c5-caed81458aa7	1	Other	Other
+8c5d5ff7-0e03-4d53-8251-2797b451cb11	1	Other	Other
+8c5df55f-9807-4636-b301-6a2f8f8a27fa	1	Other	Other
+8c5dfdcc-3839-45d7-9313-127f38795076	1	Other	Other
+8c5e8a47-d8dc-439e-b71a-c06aefdc4cb4	1	Other	Other
+8c5e951a-72dd-4ae8-8d0d-c69545b0c12f	1	Other	Other
+8c5e9e88-cb46-4ab8-b74a-a87e7e86b957	1	Other	Other
+8c5eb886-74d5-48c8-9b6e-1e01e7039a39	1	Other	Other
+8c5ebeb0-6618-48d5-9763-949a65316947	1	Other	Other
+8c5ec626-cde3-41f4-9313-a1804292aa16	1	Other	Other
+8c5ec6b9-2caf-4398-9f12-a2d3f39fdb52	1	Other	Other
+8c5ecfeb-502c-4175-b9d7-da5c0ecaa313	1	Other	Other
+8c5edb75-d2f3-4fc9-b466-10ef85951ee4	1	Other	Other
+8c5f07e7-90a8-44c3-9513-ed2993dbde2e	1	Other	Other
+8c5f1a94-fc37-4102-bade-adadf252e1ad	1	Other	Other
+8c5f20b3-948f-4efc-88f3-2f842696406f	1	Other	Other
+8c5f3a3b-5685-4dcc-868e-331b230a2801	1	Other	Other
+8c5f8091-a161-418b-83a2-819f5127930a	1	Other	Other
+8c5f837a-8473-4ce8-94e1-eeac6b0bfef3	1	Other	Other
+8c5fd2f4-fcfc-4835-9ffc-179dfe026527	1	Other	Other
+8c5fd479-8dbb-42ff-b227-12df1f0d33a6	1	Other	Other
+8c5ff98d-78e3-440b-8f0a-6cffbe84b3de	1	Other	Other
+8c60309d-9a66-4e87-916d-1429c047519d	1	Other	Other
+8c605b8e-fe8e-4231-aace-da3a35bfb5c4	1	Other	Other
+8c606890-174a-43f4-b8ce-751c09354cba	1	\N	Other
+8c6077d2-ce1d-4e52-b758-6c681f264795	1	Other	Other
+8c60899e-0a20-4b11-b3a3-cd97fd47265b	1	Other	Other
+8c60f9b1-ffc3-4b92-b62a-a68df53637e3	1	Other	Other
+8c6149b6-7c03-4cf9-baae-76a0637e6b81	1	Other	Other
+8c616b2c-7e7f-4261-a9fb-2dfe330fb46f	1	Other	Other
+8c6190fc-5a2b-4103-a1c4-10db12017887	1	Other	Other
+8c61a00f-fe44-4e6c-8c72-0502a4593970	1	Other	Other
+8c61c01b-1ecd-43d2-a7f7-3889337d7a1e	1	Other	Other
+8c61c828-d953-4e78-80d3-c15ebb58cc47	1	Other	Other
+8c61e8c1-5c3c-4d6f-add9-cb68605c62be	1	Other	Other
+8c61f864-1bc2-47f9-bc24-091a39f1f8f8	1	Other	Other
+8c63187f-23b8-488d-ae3b-7f837f378306	1	Other	Other
+8c634c0f-a738-4b67-9fac-52d50a438b23	1	Other	Other
+8c63d243-06a9-4234-8dfc-d48177960cd3	1	Other	Other
+8c63e26f-8fdc-4969-98b1-a9a7641e632b	1	Other	Other
+8c63faaa-01df-4819-b48d-3da25c7baf97	1	Other	Other
+8c643c95-5bc6-432f-8e5f-ba454159d6f3	1	Other	Other
+8c643d14-4428-4374-aef4-fce4c2db5180	1	\N	Other
+8c6472e1-75ca-424f-b93d-84339012f0c6	1	Other	Other
+8c64cc77-9b11-4ae6-a1f6-a698573900c7	1	Other	Other
+8c64e61d-c03f-4aec-aa1f-7c6826e96413	1	Other	Other
+8c652565-9c8e-4d1c-b0c2-d6dd094cc69f	1	Other	Other
+8c65336c-9018-4ddc-96cb-325678b57773	1	Other	Other
+8c65405f-c85f-4143-b02b-66b6d37dbfb6	1	Other	Other
+8c6541b6-570f-4f03-b98f-abcd4732ae01	1	\N	Other
+8c6561c0-6a99-4cf0-935b-45fcfc9ede5b	1	Other	Other
+8c657729-6f4e-40f0-a551-e826664c5a18	1	Other	Other
+8c65a5d8-c57c-4037-931e-c33c4679ca3d	1	Other	Other
+8c66007d-a1b7-414f-bc4b-eb3bf1a488c1	1	Other	Other
+8c66048d-5148-429b-997c-e7f8bafc1708	1	James	Other
+8c662f77-48d1-43f2-bd88-3ff2e346cc75	1	Other	Other
+8c665aae-1956-4def-87e9-95b8464a5e69	1	Other	Other
+8c666f2d-5bd2-41cd-99b0-fb77386fc7d3	1	Other	Other
+8c6687ff-f6a6-4f80-bb22-dc848f15bb3d	1	Other	Other
+8c671920-8fe7-494e-8b16-f6e14f84e421	1	Other	Other
+8c675e29-de6c-47a6-b496-ec35197c5717	1	Other	Other
+8c67906c-94c5-42cd-850f-b74f3a52bac8	1	Other	Other
+8c67a005-7cfe-4638-b664-d088a899d02b	1	Other	Other
+8c67a138-614c-4027-a0f1-ca9765455446	1	Other	Other
+8c67cc1a-d969-4791-96ea-e982f1d73d3a	1	Other	Other
+8c67d482-7be3-4002-afaa-68011649ffba	1	Other	Other
+8c67e00f-ff9a-4a52-90bc-370031f7154d	1	Other	Other
+8c68396e-6db3-4232-9f20-5304bb05a75b	1	Other	Other
+8c68436b-ab22-43cf-b1ff-288778858b01	1	Other	Other
+8c6896a9-d792-4890-9262-a24d6db30041	1	Other	Other
+8c68b04f-3257-4917-8afe-2aecfa64b079	1	Other	Other
+8c699305-3ec1-4590-9afd-13a95dc4dd64	1	Other	Other
+8c69d7c5-9186-485a-9720-0ee1f3c65abd	1	Other	Other
+8c6a25d5-d9f1-4874-b756-91c5c7c7efd7	1	Other	Other
+8c6a2d4e-171f-4667-b955-427516ef77d4	1	Other	Other
+8c6ad284-fa83-45f1-9bc1-45e747801725	1	Other	Other
+8c6b02c8-de5c-445f-9c8e-56d9da63e99a	1	Other	Other
+8c6b08b8-2c87-444a-9683-a2b737951475	1	Other	Other
+8c6b1294-78bc-4023-a280-a6f1e6980526	1	Other	Other
+8c6b33fc-395b-4639-b80e-64ebf78f557e	1	Other	Other
+8c6b681d-2c4c-41d9-aacb-e03ec5372e33	1	Other	Other
+8c6b998f-00ea-409e-a7e5-c9ec8d48060a	1	Other	Other
+8c6b9e33-3908-48c8-8a2e-6af704fb3cb2	1	Other	Other
+8c6ba014-4a1e-43a9-b3e0-b76b9c3a9dd8	1	Other	Other
+8c6bf89d-c5bf-4522-bf58-6d63fce1c010	1	Other	Other
+8c6bfd31-7e7b-4302-9ab0-2a9b1a32685c	1	Other	Other
+8c6c77e0-23ad-4cac-be8e-735e4f307dae	1	Other	Other
+8c6c7ed1-3157-42c5-a4b0-d7dfc3616a9c	1	Other	Other
+8c6ca831-cff7-4e50-b127-a39a9600b20f	1	Other	Other
+8c6cb544-9cb3-4990-92e9-2fd069f9e7bb	1	Other	Other
+8c6cd85e-e452-4cce-9cab-50ce8f6f0102	1	Other	Other
+8c6cd91e-960c-461c-a11d-55ab0170116d	1	Other	Other
+8c6d22b3-47a0-4b58-94b3-73979b12fb70	1	Other	Other
+8c6d24f1-5291-4853-9d0c-c6061bb4510c	1	Other	Other
+8c6d5d8f-c683-4f6e-88b6-c5f06feff36e	1	Other	Other
+8c6db7fc-82b4-4965-85b0-03c1e4c11406	1	Other	Other
+8c6db9c5-9a10-483d-b872-db590a849546	1	Other	Other
+8c6deaec-2441-46b6-afbc-6957318fe889	1	Other	Other
+8c6e2455-da7d-4f42-9f40-a3eaef97b278	1	Other	Other
+8c6e598f-af8a-46d1-b85c-e6cdd56c8ee1	1	Other	Other
+8c6eff64-70d8-4c7d-a10a-5f16c0fcbfe1	1	Other	Other
+8c6f61bf-8617-4ed4-a663-646fe8410355	1	Other	Other
+8c6fbdc4-c7d5-4786-b773-7f5d9227d1b2	1	Other	Other
+8c6fc9b2-77cd-4ea1-884d-708088e6fc7c	1	Other	Other
+8c6fd1b9-c39f-4519-9ef0-9b1a1ddc66d7	1	Other	Other
+8c6fdd80-5313-4186-acbf-2238c85b2a20	1	Other	Other
+8c7032f5-35de-4444-9e3d-a85755ef12ad	1	Other	Other
+8c703442-4158-4d85-bdfa-b0f7b2264af4	1	Other	Other
+8c70c00e-5d48-4fe8-b17c-12c23cd0435a	1	Other	Other
+8c70ee9e-7826-491c-8760-1d37057a480f	1	Other	Other
+8c71661d-aa88-4929-80c4-7f18b7f5fdbf	1	Other	Other
+8c7176eb-abd3-44cf-b6d4-60dc5311372c	1	Other	Other
+8c71e139-c5c7-441a-8068-ddc69429ac14	1	Other	Other
+8c721126-6dd1-45d0-8152-c40bd5273b20	1	Other	Other
+8c72b37a-3a68-4f17-9970-4a427395e2d9	1	Other	Other
+8c731b39-ee9f-4e86-9c10-06e4acd5cceb	1	Other	Other
+8c732b74-2d5e-43da-880b-bcc05821fa92	1	Other	Other
+8c734e30-c663-4419-b1d1-f4802c5bb251	1	Other	Other
+8c738927-4ec0-41d6-9ef2-d64b7880cfbc	1	Other	Other
+8c73c22c-e35b-4d3d-84eb-f87cc2962468	1	Other	Other
+8c7415c4-d0a6-46c8-a4f7-d9526cd78e05	1	Other	Other
+8c7418ae-9d73-4db9-b431-a4bb7e436cda	1	Other	Other
+8c742235-fe34-401c-8efb-dce69ef2dea1	1	Other	Other
+8c749841-69c9-44a2-a0df-9d36487b93c1	1	Other	Other
+8c753c0f-08f4-48a9-99d0-08c1935b305f	1	Other	Other
+8c757110-01aa-4196-91a3-fbec6abe5e3d	1	Other	Other
+8c75795f-e706-4e13-883a-71f900d0424e	1	Other	Other
+8c7592c9-d448-4b88-9b88-5c7cff94084a	1	Other	Other
+8c759507-54d2-4486-b4d0-00f10ca685fe	1	Other	Other
+8c75d635-08bb-4bf6-9908-744a6b530c4a	1	Other	Other
+8c75f5a8-0a8a-4197-9d00-cedec52b6082	1	\N	Other
+8c760d0c-f63e-48d5-b68a-8bbdf63f048e	1	Other	Other
+8c760e2b-1693-4c4b-8ae0-b6b8dbdbbcb9	1	Other	Other
+8c77bdf8-14e6-43f7-b668-46a11d544ad1	1	Other	Other
+8c77e246-c19b-4d76-a791-eee1ba4d2afe	1	Other	Other
+8c7830b6-90c9-41b2-aab1-2eb0188376ca	1	Other	Other
+8c785b85-647d-4bc8-adf8-9264307ff832	1	Other	Other
+8c785d9b-98a4-45e0-9bc0-98df10f0fd2a	1	Other	Other
+8c7864bb-72ac-4c16-bfe5-5a7291e8eedd	1	Other	Other
+8c78b0a6-45f3-4ccc-a941-159565f57732	1	Other	Other
+8c78fff6-a308-44a6-a89a-c9d8526d764a	1	Other	Other
+8c790c8e-7028-4fce-a8ca-2b4f0b0f3b54	1	Other	Other
+8c7988f4-fc6b-42df-859e-0b44dfa8f838	1	James	Other
+8c79bb62-2c8e-4d3b-9209-3a0a3f6aa994	1	Other	Other
+8c79cc2a-ada0-4a01-ab1b-04988fb4972a	1	Other	Other
+8c79e8a6-7b3b-4759-bbdd-f281f0a5c0c3	1	James	Other
+8c7a3a77-f87a-4849-9541-6c341f9bb51f	1	Other	Other
+8c7a8551-1ef9-4fe3-89b9-0ad32a59c4b7	1	Other	Other
+8c7b0680-c2ae-4804-bd83-783bf661e8cc	1	Other	Other
+8c7b3d99-d29e-45a4-a8ea-05c1a7c3fdad	1	Other	Other
+8c7b5687-cbf5-4c9e-b436-2a6b98c6b6aa	1	Other	Other
+8c7b5799-923d-49ce-86d9-4719e02ad7f2	1	Other	Other
+8c7b5c5d-99fb-4ef6-8861-a02a7a20d300	1	Other	Other
+8c7b9b6a-a867-4451-baeb-5c56efd06121	1	James	Other
+8c7bca43-b4a6-4dd4-9778-62097975af8e	1	Other	Other
+8c7c190f-756d-4dd5-bef7-58b327a5ff4e	1	Other	Other
+8c7c20c3-3d85-464a-8fa8-22f8b93579dd	1	Other	Other
+8c7c3fb7-e235-4a00-9da6-e6a97d00fbbb	1	\N	Other
+8c7c99c3-e526-42de-ab8b-327747828ff6	1	Other	Other
+8c7c9dbb-4119-45a3-b4b5-2bcb439312df	1	Other	Other
+8c7cd273-6f54-4f6d-95fc-1c25efaeb3a5	1	Other	Other
+8c7d45f5-b8d5-4d0f-b091-9481dc2a71f9	1	Other	Other
+8c7d81b8-d900-4dfe-88e8-f3eef9145c1b	1	Other	Other
+8c7db588-8d05-4cc1-b645-250638c1c90a	1	Other	Other
+8c7e2cdf-a2cd-43ad-83be-d4df6f49cd53	1	Other	Other
+8c7e869c-5a9f-4fc2-83d1-7dd6fc2ebc69	1	Other	Other
+8c7ed153-f01d-48b3-8853-9fed90871b0c	1	Other	Other
+8c7f012f-c359-49ab-8aa0-1fafd40e234b	1	Other	Other
+8c7f5dd0-3057-4010-b4dc-c1fd8f19abb2	1	Other	Other
+8c7f80c1-7777-4ce9-96be-e710f6806676	1	Other	Other
+8c7fb2b1-c31e-4b9e-b9b3-dc032a4049e7	1	Other	Other
+8c802375-a29a-4a33-ad3c-959ed8af9fd3	1	Other	Other
+8c8043bf-f2b6-495a-8bdf-ec8b2d9db2b1	1	Other	Other
+8c804be1-2a1e-4528-bca6-8958db7fc931	1	Other	Other
+8c8093a5-336f-4891-8904-1caf7849f7b8	1	Other	Other
+8c80fe22-8718-4c79-a6f9-60faf3d8878f	1	Other	Other
+8c8113ab-42f1-4b2b-bcfa-e38a8055dd2e	1	Other	Other
+8c816f8b-80d1-4bff-a12f-839641183808	1	\N	Other
+8c819a69-4a4c-4523-accb-1dda2df52663	1	Other	Other
+8c8225f1-94b7-43b8-a1e7-4350670a600f	1	Other	Other
+8c8242a2-9982-4eeb-a5f3-8fbc5bbffc47	1	Other	Other
+8c82a317-dabf-4028-83ee-fa4f03eac5e8	1	Other	Other
+8c82aec8-d005-4117-a3e3-c30132132eb7	1	Other	Other
+8c83895c-86c6-419f-b239-3a446fd97988	1	Other	Other
+8c838d88-7a99-4bbd-b8e7-bbca267174bc	1	Other	Other
+8c83e508-c5ad-4cf7-af65-ca853705308f	1	Other	Other
+8c83fdf6-b875-446c-bce7-c6b24b1a05e4	1	Other	Other
+8c843322-8efd-41f7-b1fe-ef2a5f069a85	1	Other	Other
+8c84349f-2d81-475f-99fa-218cd57c0017	1	Other	Other
+8c844ac4-a7cb-4581-9ac6-f419b4aa5617	1	\N	Other
+8c845e7d-fbd3-4b5c-9d97-4417504cab40	1	Other	Other
+8c848b48-ddab-488a-8d1b-dbf43b81314c	1	Other	Other
+8c84bafd-420e-4ad5-9e47-175245ce859d	1	Other	Other
+8c851c9f-a457-4913-88f7-0f845155ce19	1	Other	Other
+8c859899-5599-4d6f-8c7f-493c9c92ceaf	1	Other	Other
+8c85b3ae-e208-434a-9a91-44cd1d29d290	1	Other	Other
+8c85cecc-eee8-4c27-840d-b731bd6a5091	1	Other	Other
+8c85d947-e327-4790-b05d-87873bf69d7d	1	Other	Other
+8c85de5a-cd22-48c7-9ed8-d23df03091a9	1	Other	Other
+8c85e4d8-6139-4de9-b5e3-f5e9424669c8	1	Other	Other
+8c865771-e5ba-436f-ae2f-c0c62b1e4440	1	Other	Other
+8c87158c-683a-4704-9c74-e3dfe11c4669	1	Other	Other
+8c874cd4-51c9-4bbf-b70a-b008a5fbca5c	1	Other	Other
+8c8755e1-49bb-498a-a8bd-71efe4e99e9a	1	Other	Other
+8c87dfc1-5844-4183-b4bf-8f74e5ada8da	1	Other	Other
+8c87e52e-6093-4d1b-a914-fe1ac04c9d1a	1	Other	Other
+8c8845e0-5bd5-43eb-826f-5faadf7819f2	1	Other	Other
+8c88465f-c525-4bde-9932-050836b6d594	1	Other	Other
+8c889b32-73f7-4d93-ba3c-8bfa69c01169	1	Other	Other
+8c88f37b-998c-4ba3-9a5c-89fe21828d6d	1	Other	Other
+8c88f989-5412-408f-81ee-e8bfc49d2e2d	1	Other	Other
+8c8958eb-fc04-4870-a87e-745b508847bf	1	Other	Other
+8c896a37-77de-4a63-99d1-0dc98b104c67	1	Other	Other
+8c89c3ae-72e3-4781-bb10-f1d57634d325	1	Other	Other
+8c8a314d-d2f3-4177-b893-14c8d7e667ad	1	Other	Other
+8c8a67b6-11e9-47d2-99a5-3705bfbd89e2	1	Other	Other
+8c8aa73a-50cf-4b83-8483-96d617f9f2f2	1	Other	Other
+8c8abd3c-2f41-48fe-aad8-f2335c80fa34	1	Other	Other
+8c8b180e-7dea-47e6-b84a-ae8eb63e1cfe	1	Other	Other
+8c8b759f-cd6c-4f08-b269-4f4e7e3dc871	1	Other	Other
+8c8c11d5-788e-4ddd-b170-663a5a9e2a76	1	Other	Other
+8c8c7ad5-8b00-4c7f-b03c-aa24d8196174	1	Other	Other
+8c8c88a8-a6f1-46c6-a2d6-6fa2ded6e350	1	\N	Other
+8c8cb1cf-313f-47d3-9af4-4313829e248c	1	Other	Other
+8c8ce208-833c-4123-8256-28b0ed5e849c	1	Other	Other
+8c8d4c61-4107-4854-be38-9e0157c187dc	1	Other	Other
+8c8d5a24-78f3-447e-8a44-a005c072204a	1	Other	Other
+8c8dc778-f35d-4f76-b9e0-0350de0e2c95	1	Other	Other
+8c8df49e-eeeb-48fe-a2e3-d704a7e5c824	1	Other	Other
+8c8e247b-450d-44d4-89bd-0a798a29449b	1	Other	Other
+8c8e5498-6c43-4348-b98f-a3b6744fb445	1	Other	Other
+8c8e9e26-91f5-4b71-aa97-da6f3d401671	1	Other	Other
+8c8f1282-157b-4a5f-bbec-1027911a1517	1	Other	Other
+8c8f28b5-5d76-40f6-92e1-bb231e3f2d11	1	Other	Other
+8c8f48f3-301f-4568-b425-db7ceaf9c37d	1	Other	Other
+8c8fa365-4139-4e68-9dd4-a84c5bd4d34a	1	Other	Other
+8c8fa4ec-e0d4-4a74-a7c6-ed593ebcf962	1	Other	Other
+8c9000d7-8b46-47ca-8e74-e4bc232b0677	1	Other	Other
+8c901617-00ab-4056-a832-584bd870baf8	1	Other	Other
+8c90bfbf-3c70-4010-9ca3-e2cca8cc8874	1	Other	Other
+8c911d9f-8635-460e-8cee-6098358b4c22	1	James	Other
+8c914d87-2ec9-4c8e-961c-e9de1168aee7	1	Other	Other
+8c916bf9-b53a-443f-854b-197a2ab37c70	1	Other	Other
+8c9186fc-f9f7-4352-a4df-7cf363436795	1	Other	Other
+8c91a04a-a018-4856-8401-67aee617a47d	1	Other	Other
+8c91a255-fcef-4e9a-8fcc-1a468b25849a	1	Other	Other
+8c91cf85-f423-49b3-8535-17bb99eb7964	1	Other	Other
+8c91d78f-cf00-4db2-be9c-2bc7f465ca2b	1	\N	Other
+8c926412-26bd-49ff-8a90-06e4a1bd8c6f	1	\N	Other
+8c9268ca-971b-4452-b439-2dce0e32f77b	1	Other	Other
+8c92787d-f3ab-4805-b38f-01dd370e01e6	1	Other	Other
+8c92fb85-af1b-4727-ba99-20e4dc99d809	1	Other	Other
+8c936299-fb22-4d0c-b5a9-90a5715ac170	1	Other	Other
+8c93dc45-1c67-48a1-b819-c4d9944446de	1	Other	Other
+8c94057c-13ce-4375-a835-3e0ac1d509e5	1	Other	Other
+8c9447c6-36b8-4306-8583-d3e166e261cf	1	Other	Other
+8c946d1a-aa0c-4f20-b718-a5737a5144d3	1	Other	Other
+8c94e075-c6f7-45e1-baf5-8969830e3a30	1	Other	Other
+8c9515e6-07b8-443c-84f7-d8bbedacda70	1	\N	Other
+8c9552af-0639-41bf-af8f-5d7e6968e93b	1	Other	Other
+8c95631e-c85d-4141-a526-7300483e95a7	1	Other	Other
+8c958fa9-6267-4f0c-b3fe-34e5a6df4146	1	Other	Other
+8c9590f4-8211-483d-8f30-0e7578df304a	1	Other	Other
+8c95a166-7229-4cc5-970f-925663487c6c	1	Other	Other
+8c95e162-7fa1-46ee-a5ca-eabf90b2ef94	1	Other	Other
+8c95e4f6-1207-49a8-8dc2-440191e6a4ad	1	\N	Other
+8c961ec4-aca3-49c4-a28f-cc917fefd628	1	Other	Other
+8c962959-aad6-4668-a2be-3cadff4c368e	1	Other	Other
+8c966097-f8a2-4ede-90ee-637eb557879f	1	Other	Other
+8c96aac7-1422-40c3-bce6-75b746b62b2d	1	Other	Other
+8c96acbe-ee95-45b8-af53-965982063223	1	Other	Other
+8c96bba9-f733-458c-97da-7bba842f6aa9	1	James	Other
+8c96cea9-3ac6-43ea-99fc-5ad48a5d3324	1	Other	Other
+8c96d42a-9dfe-4bef-8bd8-bcfec1753388	1	Other	Other
+8c96dc1f-689c-4f13-a5f4-50517b4714f6	1	Other	Other
+8c96dfd1-0470-47a3-b161-10ce622352ed	1	Other	Other
+8c96e4c3-9c01-45b1-b316-65f207fc1cb8	1	Other	Other
+8c96e4ef-1318-457b-9013-622b92129930	1	Other	Other
+8c9703a5-6795-4d99-88bd-9228101b4398	1	Other	Other
+8c973c3e-9803-4d34-b571-0fcb062869e6	1	Other	Other
+8c978f1c-7d33-42ce-a329-192d0678d01c	1	Other	Other
+8c97906e-e49d-4e2e-80a4-a75315d20d16	1	Other	Other
+8c979e84-1f0d-4053-b0a4-2b0398cd5840	1	Other	Other
+8c97d68b-3a7b-4dff-9a6a-793d2bdf7884	1	Other	Other
+8c984731-da50-4b7a-9be6-1849f60cad8c	1	Other	Other
+8c989c55-1d88-40c4-a2e7-5682ada3a9b4	1	Other	Other
+8c98ca1e-b3eb-4b6c-afa6-6db207c55cc6	1	Other	Other
+8c98d3de-13aa-445a-b092-31e45963abcc	1	Other	Other
+8c98ee3d-35ef-4720-ad0b-d25e56d9fa16	1	Other	Other
+8c9900c1-14ed-43fc-8c4e-d56a0e69ea47	1	Other	Other
+8c995467-f46b-4fa9-aae1-1bfc4b8962a8	1	Other	Other
+8c995abf-f042-43cc-8a28-88db01b4ac2f	1	Other	Other
+8c9971bb-72b3-4353-a605-4286bfcbd550	1	Other	Other
+8c9a3813-392f-4099-a2ec-aca949a64960	1	Other	Other
+8c9a7994-6da5-4925-ab29-0276aa7ea7c6	1	Other	Other
+8c9ae67e-ee2b-453b-91b1-df8454f64c0e	1	Other	Other
+8c9b43a4-3466-4bdd-8d99-7cf35534f62d	1	Other	Other
+8c9b4b00-166b-4cbf-bc4a-609ec35602a4	1	Other	Other
+8c9b4e89-9c6a-46a1-9104-30832383ce96	1	Other	Other
+8c9bdf07-375d-4e2a-8ebd-a34dfda211a8	1	Other	Other
+8c9be756-c55a-418b-abfd-13b2704b42e9	1	Other	Other
+8c9bf524-3d8d-48ab-b8b6-4868338a2972	1	Other	Other
+8c9d1ccf-0069-4d5f-a24c-cc6538d928c2	1	Other	Other
+8c9d53f3-c6e8-4883-aacb-79e6909d4e73	1	Other	Other
+8c9d59ec-d32f-4302-8ccf-70fec6693628	1	Other	Other
+8c9d68a7-6d73-4cf0-9372-9a9affb71657	1	Other	Other
+8c9d84a4-6648-4cf1-99db-5f5e6070a1ea	1	Other	Other
+8c9d88d4-a13e-4982-ba39-5b1a08e51cc4	1	Other	Other
+8c9d961d-a4d8-4890-be37-738b74e83f6b	1	James	Other
+8c9d9953-a57d-46cf-853e-fc83e3ba70d3	1	Other	Other
+8c9dc10e-6d7b-453c-800c-cd261b900eed	1	Other	Other
+8c9e0b8e-3454-4b35-ad49-7fa58c876909	1	Other	Other
+8c9e1fa4-8ec3-4cab-93b4-e8f86659b8c4	1	Other	Other
+8c9e5e3f-013e-4854-abfe-fce6ccff4a53	1	Other	Other
+8c9e739d-5c53-4756-9221-2ae1fc68b8c4	1	Other	Other
+8c9ea9e3-ab10-4bfd-8a05-8fcd2a7d233b	1	Other	Other
+8c9edefd-fae5-4b1e-9352-23c4630957df	1	Other	Other
+8c9eec33-46a7-44d2-9442-b4dc17ac5ad9	1	Other	Other
+8c9fd6b7-f494-4845-8c70-7ee148f6c400	1	\N	Other
+8c9fee47-a990-4433-98c0-373826b319eb	1	Other	Other
+8c9ff81f-3a40-4cc3-b921-05a03e4c4815	1	Other	Other
+8ca04dcb-8bea-48cc-804b-161e53965ee4	1	Other	Other
+8ca05a03-b769-491c-b95f-2da285f5f99f	1	Other	Other
+8ca08214-b45a-4b32-b4a3-17dbfe22720e	1	Other	Other
+8ca12e51-5a16-49b0-b14d-b86a54f41197	1	Other	Other
+8ca145ed-6212-4f83-a71f-21f0eae07661	1	Other	Other
+8ca16aff-6946-479b-8b3e-3678fa825e27	1	Other	Other
+8ca1a540-aea8-4acb-a00b-cf51b8d27557	1	Other	Other
+8ca1a858-8a92-481b-a969-288703dcae77	1	Other	Other
+8ca1e076-7c8e-45aa-8493-a2613e73fff6	1	Other	Other
+8ca1fada-036c-44fc-9619-0d838b87c874	1	Other	Other
+8ca232a0-3c30-4358-8cfb-27e695587324	1	Other	Other
+8ca246cc-59eb-4b12-a78d-e257d8570e70	1	Other	Other
+8ca2561a-01d4-4a5d-a8cc-9241745ef09f	1	Other	Other
+8ca27a75-4fac-43ea-a8e5-854860596b12	1	Other	Other
+8ca2bcb5-4164-419c-82a1-d1426671044b	1	Other	Other
+8ca30579-19be-4053-9c4a-c74cd658c6b7	1	Other	Other
+8ca3190f-dbb9-4539-8437-ccfba830b8aa	1	Other	Other
+8ca383ef-ec8e-4ad4-b4dc-c83c1b7768aa	1	Other	Other
+8ca3d691-e65d-499f-ac69-295890d6781c	1	Other	Other
+8ca44805-c614-4d66-bf4f-2606e9b09efa	1	Other	Other
+8ca4aef4-ca62-4eff-9447-f9adc8c0aa23	1	Other	Other
+8ca4d6c8-5326-47fb-a571-253a14198d6a	1	Other	Other
+8ca57dcf-d9c5-4335-855c-7f31664261d7	1	\N	Other
+8ca5bbca-b88f-4a57-85bd-4e1679b9c7ae	1	Other	Other
+8ca5d04f-3240-4240-b1c2-d1a7e3aae80c	1	Other	Other
+8ca61105-f8b6-4fed-b288-58a394381028	1	Other	Other
+8ca61726-a1dd-4fe7-b6c3-36525fbc9cb1	1	Other	Other
+8ca62100-3afb-4fe5-93d2-216abf9c82be	1	Other	Other
+8ca65634-2201-43e7-93c6-8bf854982921	1	Other	Other
+8ca6672b-8b7b-4c50-b364-ff8fd4c34580	1	Other	Other
+8ca69b0c-5c7c-4482-a34f-08e2f93a1faf	1	Other	Other
+8ca69f28-4162-4d0c-8ccd-b51b2ce37cce	1	Other	Other
+8ca69f4e-08bc-46b0-af6b-b54e9ecbe46a	1	Other	Other
+8ca6ca4b-ad0e-4447-9000-d60bf419f031	1	\N	Other
+8ca6e1ce-1f88-4ef6-b496-edb570c00b32	1	Other	Other
+8ca6ff58-38e6-4810-8ced-ea0f9de29072	1	Other	Other
+8ca734fa-5f45-47f9-afe7-f0402845c9fe	1	Other	Other
+8ca73af7-2eb3-44ec-878a-417aa3b1857d	1	Other	Other
+8ca73f64-fac9-4678-b453-00ed396f4615	1	Other	Other
+8ca778e3-941d-408d-bd7d-0643bc6ede6a	1	Other	Other
+8ca783df-8242-436a-a967-496e0a3256aa	1	Other	Other
+8ca7d199-70c0-4581-aa57-b4713c0efb4d	1	Other	Other
+8ca7d5dc-a082-4b60-9737-c77e75e1c4c1	1	Other	Other
+8ca81b2f-a758-4186-9007-c0cf11d4497b	1	Other	Other
+8ca87370-a8c4-4658-a7cc-64c36cd3c4c6	1	Other	Other
+8ca87943-20a8-47aa-b704-ef45df31a71f	1	Other	Other
+8ca87e2c-007b-4257-bde1-965904705049	1	Other	Other
+8ca8888f-355d-4b08-be0b-558e9cb2992d	1	Other	Other
+8ca88df7-e4a6-4c6b-a48a-8726f4f4e946	1	Other	Other
+8ca8bf56-178c-42c4-a6d9-1dbc5871c110	1	\N	Other
+8ca8d1d0-aee1-4385-8bf8-3c84b685f5ae	1	Other	Other
+8ca8d367-cf28-4268-a8aa-4e1f7ec93635	1	Other	Other
+8ca8ffab-c3c0-491c-b0f1-4ec47c6a287a	1	Other	Other
+8ca902ad-6e7f-4302-8d79-78c3c46f9801	1	Other	Other
+8ca94464-38fa-4b5c-b86b-617d7d389dc0	1	Other	Other
+8ca9bb68-1e32-46ec-9f62-33b59f19950b	1	Other	Other
+8ca9bd17-9790-412f-b2e7-51a56e17c05a	1	Other	Other
+8caa06d7-c323-479a-afaa-c3cf166238d0	1	Other	Other
+8caa1a1a-14af-4369-86c7-90cbb592c16c	1	Other	Other
+8caa9c93-2df9-4802-86e0-bef7b14e4e1e	1	Other	Other
+8caab6d5-9fb3-4e8f-945f-a127b98fc620	1	Other	Other
+8caae261-a3c8-4005-9716-fe58b028127b	1	Other	Other
+8cab309e-c7a8-433d-a081-6f0024d17f60	1	Other	Other
+8cab5109-a76c-4b0c-9253-4212720aa9a6	1	Other	Other
+8cab9437-6c7a-4c2f-955c-1ba8323a3276	1	Other	Other
+8cab9a4e-956d-4dd3-9766-6e0d5a7c0c8a	1	Other	Other
+8caba910-88fe-4791-b2ba-97c10ba7c6a3	1	Other	Other
+8cabb232-bc2d-4ed6-8892-16694717f98c	1	Other	Other
+8cabb729-43b0-4422-ae30-27b51b62a2a9	1	\N	Other
+8cabe280-b036-4f00-aef8-645963dc6c52	1	Other	Other
+8cac01fe-b2b8-4c27-8e47-70369b06e8c6	1	Other	Other
+8cac4b73-2106-4c0d-82b1-e4d14019d6b2	1	\N	Other
+8cac935e-6fd9-43b8-bbde-a6574b0e6df8	1	Other	Other
+8cacf1e8-6fcf-4bb0-a4c6-1ed918835505	1	Other	Other
+8cad0916-330c-4605-8d94-0b23a1a4c165	1	Other	Other
+8cad4d26-1677-4f7a-a40e-2519e94823a8	1	Other	Other
+8cad9b81-6c59-49da-8725-b6e1156fcadd	1	Other	Other
+8cae18d3-41ee-4db2-a0b5-1fde7577730f	1	Other	Other
+8cae32e6-2a62-4cf6-a136-07e8b57478cb	1	Other	Other
+8cae4b64-1ac1-488b-aa3b-8a2c79625e32	1	Other	Other
+8cae5a1e-56ae-4c9d-9908-c2e624d77e3a	1	Other	Other
+8caed602-105e-4401-88ca-e2c6ee046b04	1	Other	Other
+8caed774-fef1-41b0-86ce-a05467b6a6ef	1	Other	Other
+8caef5d3-474a-4ce1-8717-eb640d42f729	1	Other	Other
+8caf0e48-ec14-47c9-8113-bc09d11134b1	1	Other	Other
+8caf3bde-abc4-4f4e-9b84-c9de2463b6ca	1	Other	Other
+8cb026eb-206d-4477-bb81-3f85b88601b4	1	Other	Other
+8cb03279-2c59-426e-9419-3c95891b73b5	1	Other	Other
+8cb0660b-3d17-4202-9d87-321548869074	1	Other	Other
+8cb0d80f-6e4d-4ba9-8b0e-aaf7a2adbe73	1	Other	Other
+8cb115cf-d03d-4584-83ec-142116b580fa	1	Other	Other
+8cb12bb3-ff37-4b99-8066-9494f00bdb33	1	Other	Other
+8cb1b40d-5e2c-48de-9df1-c9ef118b8ad3	1	Other	Other
+8cb1d256-4166-42bd-a6f0-be843c2a2a98	1	Other	Other
+8cb201cc-1d80-4cc8-a3ac-a3aa502326cc	1	Other	Other
+8cb219e1-dadb-4c4e-a9b1-2d7d96cb7df4	1	Other	Other
+8cb231dd-201a-40bd-ba95-20677ee35fa0	1	Other	Other
+8cb234dc-a930-42a3-95e1-6f2f0b9c36d9	1	Other	Other
+8cb23bf8-cdb2-4437-bd39-bd37be08131c	1	Other	Other
+8cb2462b-139c-47e2-bd43-70953422acf9	1	Other	Other
+8cb29b5b-eb00-4d7d-aa19-f45c466f94b3	1	\N	Other
+8cb2a89a-8338-416a-9e6f-6d82604d0ba6	1	Other	Other
+8cb2bf47-0c8b-4637-83be-11c73747d5f5	1	\N	Other
+8cb2d485-3b81-43fb-930a-132d48314d3a	1	Other	Other
+8cb2e538-6c8a-4f72-82b1-1588e013df43	1	Other	Other
+8cb2ef1f-5e97-42b2-9bac-9923ebbb506f	1	Other	Other
+8cb30672-037f-4286-be52-6ff309173561	1	Other	Other
+8cb31371-b1c2-440d-ac79-cb6018eeba29	1	Other	Other
+8cb322c8-d3c3-424d-85dc-0f3b60b886a5	1	Other	Other
+8cb35a6d-cbf7-4c99-b8c3-c0acb996b1e2	1	Other	Other
+8cb35ba2-4dd1-4e9f-a4db-168060ce87c8	1	Other	Other
+8cb3ad0c-a661-4d0a-9f55-463634505d88	1	Other	Other
+8cb3e4df-15c5-46ca-a37d-19503ef83578	1	\N	Other
+8cb3fed1-0cc9-4ee8-b543-e55d029498a1	1	\N	Other
+8cb40e69-ce40-40c6-a1b9-034a888d3767	1	Other	Other
+8cb42dd2-3fe8-48fc-9a9d-f3b77145d74a	1	Other	Other
+8cb45b43-da67-45e1-abde-689ba32534bb	1	Other	Other
+8cb4c571-26ef-4daf-bba4-dd49c2b77394	1	Other	Other
+8cb4cb12-a1ce-4af9-a967-e7c5b0e74b1a	1	Other	Other
+8cb52935-6eac-4a5a-9cdf-10cef996c017	1	Other	Other
+8cb53a2c-aa63-49a7-8ef9-cc39f46fd4cf	1	Other	Other
+8cb53c83-0bca-4978-904a-023dab6c85f4	1	Other	Other
+8cb5453b-0a4d-4181-b606-f503bbcd1d2a	1	\N	Other
+8cb54f9c-8962-4579-9743-8d7aece00f55	1	Other	Other
+8cb58481-049b-4386-9ee9-34cbb2e409b5	1	Other	Other
+8cb59493-04be-472a-bdc3-1785737ac8da	1	Other	Other
+8cb5c9c2-4d97-4f1b-b67d-a8d4601b2de5	1	Other	Other
+8cb62643-558a-4a0c-92d6-3515ee4ecc17	1	Other	Other
+8cb696cc-5ae1-45c6-9321-09ccda3bbcbd	1	Other	Other
+8cb6b24b-2301-477d-a309-78fefc1d714e	1	Other	Other
+8cb6d08b-5955-49b8-938b-f4926a967d5e	1	Other	Other
+8cb6f723-48d3-415d-bc91-f441508f23d3	1	Other	Other
+8cb765b3-c5ea-45d8-a159-8be10a59475a	1	Other	Other
+8cb79c83-9f70-4741-ae8c-b1eed03d6dad	1	\N	Other
+8cb7cf5f-6fcd-4ba4-8ba2-e4e13884b437	1	Other	Other
+8cb80a1d-cfab-44be-aa8e-040ac28f24ef	1	Other	Other
+8cb81215-fa89-40cb-8f84-e4dedf5c8dda	1	Other	Other
+8cb82e41-cfca-4267-a57b-47340cf60e7d	1	James	Other
+8cb869c0-0869-4cd2-86f9-90c348dc01e0	1	Other	Other
+8cb8a1f0-0790-4de3-b770-4c76f1950de0	1	Other	Other
+8cb8f623-699f-4e68-944a-871a332a7636	1	Other	Other
+8cb91603-3e56-4a02-bbb0-22ed9c984deb	1	Other	Other
+8cb943e6-cfa9-4e78-b478-2072ca936737	1	Other	Other
+8cb95a57-ee5a-4d5b-ac4d-3ab248cba7ec	1	Other	Other
+8cb9663d-d765-4dbd-acbc-69f5ae22ab8d	1	\N	Other
+8cb9cfa4-dc35-44c7-8187-878c41c789e3	1	Other	Other
+8cba3428-dbec-478c-8232-8401fdac2b6d	1	Other	Other
+8cbae862-47f8-46ee-bbff-cda6ec6db545	1	Other	Other
+8cbaf041-55ec-43f7-8e12-31c4f952d6fc	1	Other	Other
+8cbb0853-7ab2-4713-ba72-8335627cbf44	1	Other	Other
+8cbb571b-d0bc-40c3-9f96-9a84ac2ba8b6	1	Other	Other
+8cbb6c13-5b52-4c15-b939-452f52547b71	1	Other	Other
+8cbc3754-d2f1-4cbf-8de5-f66d87bb7c37	1	Other	Other
+8cbc8343-bb42-4f9b-848f-d494b60e448f	1	Other	Other
+8cbc87d0-54b1-460c-8e2d-aa35dc2a108b	1	Other	Other
+8cbc8a63-bb53-4cbc-8474-64be17fb46ce	1	Other	Other
+8cbcdf99-2d96-45f4-80be-703593a8d3ae	1	Other	Other
+8cbd0cc1-a6e7-4c10-8d5c-8f3c5e6ff93c	1	Other	Other
+8cbd0f37-f716-4a8d-92d2-9b8d10367840	1	Other	Other
+8cbd11c7-a00a-45c7-8c59-99fc8db8f033	1	Other	Other
+8cbd3903-0969-4a39-a19a-e017b424ab34	1	Other	Other
+8cbdc30e-0d51-407c-8d68-e225589318fe	1	Other	Other
+8cbe0fe1-d5ea-4dee-90c6-d5bebfa397c3	1	Other	Other
+8cbe2617-75d8-49ba-b947-934f478ce6bb	1	Other	Other
+8cbe2dff-694e-4eb2-9fd5-9e63a9dc83f9	1	Other	Other
+8cbe3929-7257-41a1-81f6-0c7346012115	1	\N	Other
+8cbea375-03d9-4671-b729-1005ed7937d1	1	Other	Other
+8cbea3ad-b1d3-4410-9978-67da5c9687fe	1	Other	Other
+8cbeffd6-da27-4723-bd86-0411b5a4bc59	1	Other	Other
+8cbf329e-5b06-4ef5-bfc1-899a40cb5e54	1	Other	Other
+8cbfa906-43ce-4014-8f37-3f9b365a190b	1	Other	Other
+8cbfec3e-dcab-424d-a8d4-372339e22e47	1	Other	Other
+8cc0a7fd-3ad7-4c4b-aac5-ba4c0f27831e	1	Other	Other
+8cc0f292-802e-4d0c-b1a9-dab9ac3a64df	1	Other	Other
+8cc107c7-58ab-4ec2-b7ae-bd8f3569e2eb	1	Other	Other
+8cc13c2f-a361-471a-aa34-180d2c018a4b	1	Other	Other
+8cc2395b-eab5-4931-a7b7-821b6a4dd1ba	1	Other	Other
+8cc297a8-12bf-48a6-99d6-3812e7aab62c	1	Other	Other
+8cc2ad74-ade4-404b-a554-73ca96e2384b	1	\N	Other
+8cc319c0-084a-4fd7-b802-0b41a9752d3f	1	Other	Other
+8cc3456f-75d2-4ec5-9d5d-0a6f7dcf166f	1	Other	Other
+8cc35698-2a38-493d-bddf-810dc5a8760a	1	Other	Other
+8cc3a3d5-2120-4ff3-a4a9-6842ff00b939	1	Other	Other
+8cc3c5ea-8a46-431b-8585-e2e263abc395	1	Other	Other
+8cc3d704-ac84-49d8-a8d5-ef00bceb8b1a	1	Other	Other
+8cc3d728-ce35-4467-b2be-fe09b7aee194	1	Other	Other
+8cc3dcbc-63bd-4228-84b5-17a99754d062	1	Other	Other
+8cc45093-02f7-403d-b3cb-5392b4193f3b	1	Other	Other
+8cc4792e-496c-4293-bd43-73f3e3aee927	1	\N	Other
+8cc4e132-dbdf-4f2c-b2e2-7e46e5d860ec	1	\N	Other
+8cc50257-b9a7-4396-8316-b0a815d85d45	1	\N	Other
+8cc5093c-e857-463e-9b9f-8a8930c2fa34	1	Other	Other
+8cc536a7-b490-4aaf-b904-ee619c11e282	1	Other	Other
+8cc5a873-5e77-4fc9-b36e-fd150651fca0	1	Other	Other
+8cc5c15b-e6d6-4901-b116-868975abb1d9	1	Other	Other
+8cc5e404-0285-407f-a6ed-2be550f59597	1	Other	Other
+8cc5f17f-ab36-49fd-b587-d25129702856	1	Other	Other
+8cc617bb-24e1-4bdf-8340-b16b09d3dfcd	1	Other	Other
+8cc64187-2633-4ebc-adf7-94314e5413ab	1	Other	Other
+8cc652e7-cb65-4d71-bf5b-65780a02413b	1	Other	Other
+8cc65e60-4c3c-42bc-935d-60e877a7ec90	1	Other	Other
+8cc6ab17-bc5f-430b-9bba-ab76b0dcf2cb	1	Other	Other
+8cc6d077-a8f0-448d-a9d3-0de11f4cb4c0	1	Other	Other
+8cc6ecc7-6dbb-4d65-ad62-502d71a55871	1	Other	Other
+8cc72e6e-d448-4294-8061-00602ba9fe0f	1	\N	Other
+8cc77218-ebcf-43f7-aac6-9db84620abf4	1	Other	Other
+8cc776ca-2db8-4f4b-b280-711d06af95ee	1	Other	Other
+8cc7ade1-e002-40b1-9b1f-7be6912f7ebf	1	Other	Other
+8cc7b314-8195-4ebe-b5b2-b74f7ea21f09	1	Other	Other
+8cc7c42d-c819-44e0-a042-6a374bfecc28	1	Other	Other
+8cc7d865-7912-43e1-bffe-6635e9ecf335	1	Other	Other
+8cc7fe8c-87da-489c-a655-abaf7c739fad	1	Other	Other
+8cc80c26-0ccd-4cb5-b753-3978844561aa	1	\N	Other
+8cc88046-aa8a-4980-b16e-fa72aa88053f	1	Other	Other
+8cc8aa6a-b54b-47b6-af81-bfd84b666bfc	1	Other	Other
+8cc8b601-6c9b-448a-bcac-23adededcbde	1	Other	Other
+8cc8bbec-7b13-4d90-8d98-877d2c7a569c	1	Other	Other
+8cc8bd7a-acca-4f0c-932a-5c9fd3a5611e	1	Other	Other
+8cc8d524-99e4-464a-b678-ee54ab8199bb	1	Other	Other
+8cc9020d-aae5-4e1c-8659-ce3cd1aa14a1	1	Other	Other
+8cc92ba6-876b-4810-a151-759e15eb33c9	1	Other	Other
+8cc94a60-708c-49e7-9bb1-a1d311a4f784	1	Other	Other
+8cc9b162-c3fa-4962-9848-5eac57b57862	1	Other	Other
+8cc9bc13-5557-4836-ab89-b553fa4d2370	1	Other	Other
+8cc9c597-b40d-4656-a6d7-0a80e6098eec	1	Other	Other
+8cc9d79d-fd39-4a8c-a916-578da108bfbd	1	Other	Other
+8cca57e8-bd8a-44c0-8f24-f5845ced30f3	1	Other	Other
+8cca84f1-874b-4395-a02b-3b2f357c1bb7	1	Other	Other
+8cca9c5a-9343-40f9-81cd-6f3b8ad56048	1	Other	Other
+8ccb0c34-6c4f-4cf7-a104-2b1185f1566e	1	Other	Other
+8ccb25a2-a3c0-4b75-b01b-070fcae2509c	1	Other	Other
+8ccb5226-4800-4e19-ab07-769d385a742d	1	Other	Other
+8ccb533e-07f0-4e4c-886a-0a037ac1b635	1	Other	Other
+8ccb57b5-3595-459e-b1df-aaf0b5bb1ce7	1	Other	Other
+8ccba5aa-0031-4bae-a9c1-cffe204ce075	1	Other	Other
+8ccbb77e-1900-4f10-9599-fd07efddd8b0	1	Other	Other
+8ccc0744-cc2e-450e-abc7-6fbba114c1b7	1	Other	Other
+8ccc4c4c-44d3-46a8-9313-a1e4b1c5bbba	1	Other	Other
+8ccc5531-914c-46c2-9044-6e62bd2f84bd	1	Other	Other
+8ccc9f2b-c2ca-43cd-a78f-4912a88446ae	1	Other	Other
+8cccc46c-66b1-40fd-ab92-fca9cc5c6713	1	Other	Other
+8cccc9d4-44b7-41ee-b38f-b34da012f952	1	Other	Other
+8ccdb30c-0e62-43d2-9c6f-23a02a9416b8	1	Other	Other
+8ccdf312-63e2-4de7-bbee-089f63724579	1	Other	Other
+8cce2c2d-b70d-4571-a48d-c4e935c6b930	1	Other	Other
+8cce34c5-de97-44a3-965c-84e95b35e7a8	1	\N	Other
+8ccec3d4-d541-4784-ac9e-198b6a700f51	1	Other	Other
+8cced767-2701-4948-a06f-9dafcaf4690d	1	Other	Other
+8ccf22de-8ce1-475e-b84d-50ab3252f006	1	Other	Other
+8ccf246c-2a9c-4faf-818e-4d4d7d57c198	1	Other	Other
+8ccf5199-2d70-4f91-879d-dc21c3322172	1	Other	Other
+8ccf5fba-1e5f-4656-871c-fbcf6a8fc602	1	Other	Other
+8ccf7f62-559d-49a7-8338-28a048de2ddc	1	Other	Other
+8ccf9863-334e-440d-b833-7ada704d2c69	1	Other	Other
+8cd042c9-3ecc-414b-9eb7-b23b4352303e	1	Other	Other
+8cd0bffe-171b-467e-a7ec-59efab250913	1	Other	Other
+8cd0c3de-23bc-4d58-8ff9-058f70235494	1	Other	Other
+8cd0f621-b80d-440b-8bbf-8aee486117a2	1	Other	Other
+8cd124dd-e544-4c2b-aa83-a2ab2f0a8de2	1	Other	Other
+8cd15dbf-e25c-46e2-abae-53e70bb52ead	1	Other	Other
+8cd16077-f0b7-41d8-adb3-307df997f178	1	\N	Other
+8cd1792a-8030-477d-b5a8-de3e86c8318e	1	Other	Other
+8cd179e5-eb51-4978-9bc7-d3771b3015b8	1	Other	Other
+8cd19345-4b8a-4f76-be58-fa4d32d7104a	1	Other	Other
+8cd19f76-f1d3-4994-b350-fef1b5438d5e	1	Other	Other
+8cd1b8ab-e377-4d79-acfe-a961babf7b31	1	Other	Other
+8cd207ce-9fb5-4218-b60a-575010ba657f	1	Other	Other
+8cd23d3d-1289-4302-9cac-eb6e7519d623	1	Other	Other
+8cd26633-b163-42da-8162-eda69618380a	1	Other	Other
+8cd2b70f-7ecc-4a58-80c6-5bfa8c79a12d	1	Other	Other
+8cd2cabf-87bc-4ce0-9092-3df3ed2e4233	1	Other	Other
+8cd2defa-6041-4ecd-845d-9ddd2df24cb9	1	Other	Other
+8cd2f89f-f499-46e1-8c49-a5672ff50db8	1	Other	Other
+8cd33fc7-e4f0-4f5b-955e-205d0df25700	1	Other	Other
+8cd34684-4f56-4699-a5cf-ff0565bbc559	1	Other	Other
+8cd36c1d-b3d1-4927-b441-ed55b6c8081d	1	Other	Other
+8cd37fb8-cbcd-4b18-a46c-27aa771cdc05	1	Other	Other
+8cd3c727-f912-4e14-9ec4-8d1540dcb237	1	Other	Other
+8cd3c96d-0ae0-4779-ae53-5d1a6003c1fb	1	Other	Other
+8cd3ec13-faa1-4f12-b2e5-74ab57f3605c	1	Other	Other
+8cd45165-03c4-43ea-a408-0956300230d8	1	Other	Other
+8cd4527a-e2fa-418a-b5be-bf8ef062f609	1	Other	Other
+8cd483f0-fc4d-49ab-8f6c-cef068daef7a	1	Other	Other
+8cd49348-1877-45ce-8f57-6a813b35c35a	1	Other	Other
+8cd49d14-9346-4728-b1db-92cd7e5dfb39	1	Other	Other
+8cd4ae19-26a9-45bb-91e8-fcdb862ae8c5	1	Other	Other
+8cd4b738-2787-4898-ad87-e1a04d2df4d4	1	Other	Other
+8cd50494-8e19-406d-a0b6-eb2ec538ff97	1	Other	Other
+8cd53313-3d9c-4024-a812-465728b71fae	1	Other	Other
+8cd53b22-dc41-4025-8726-c00f80d78713	1	Other	Other
+8cd679c6-1bfe-4c9d-af32-5112514e28c9	1	Other	Other
+8cd6c4c6-7727-4abf-918b-a1539293b5f5	1	Other	Other
+8cd75d2c-f640-4a73-afb9-218057143f3d	1	\N	Other
+8cd7644f-1c4a-4230-b374-0722e73c3f69	1	Other	Other
+8cd76ee1-38ff-40e5-a74b-8b37103c4566	1	Other	Other
+8cd77a00-1d51-4bd0-862c-d450b570cf82	1	Other	Other
+8cd7e66d-d37b-48f3-a638-55c7acb23f65	1	Other	Other
+8cd7f51e-659a-4030-a9a0-0b8c1bcba286	1	Other	Other
+8cd7f954-86e0-4d7a-a1e3-fcafc8c41b54	1	Other	Other
+8cd84ec9-8473-4a42-843f-7137f564f02a	1	Other	Other
+8cd867b8-b7c3-46f5-af9b-30d53f6e3f47	1	Other	Other
+8cd87314-92ba-471d-9dea-9c960cc91132	1	Other	Other
+8cd8871f-d28d-4c66-b9b0-90f71a2675c7	1	Other	Other
+8cd8bd6d-f0a0-4298-b419-053488f195f9	1	Other	Other
+8cd93587-c09a-4d00-ab93-47a085abf27a	1	Other	Other
+8cd93ca0-550a-43c5-bf0d-13ee916972fc	1	Other	Other
+8cd95091-703d-4c27-8639-c5ac82e4ba79	1	Other	Other
+8cd982df-8a06-4c91-a058-7705f4c65805	1	Other	Other
+8cda085a-6645-45a9-93db-41e2d10d639d	1	James	Other
+8cda260a-1778-496f-ad43-c37609dd48dd	1	Other	Other
+8cda46a2-49e4-435d-81bb-a42b7fb5da4c	1	Other	Other
+8cda5158-3793-4a28-9639-204e0554cef9	1	Other	Other
+8cda8d35-f423-455d-a4f1-75d02e53117d	1	Other	Other
+8cdb09cf-3075-42c7-b90d-009a57723f3c	1	Other	Other
+8cdb7b3f-1e4a-4d31-93aa-20fe010fe19a	1	Other	Other
+8cdbdb5b-c7ad-4043-aa95-87bff1782dcb	1	Other	Other
+8cdc01f7-e495-4400-adf2-92a9a08721a9	1	Other	Other
+8cdc0634-fe5b-41f1-b38e-f5a16d49b58d	1	Other	Other
+8cdc1761-e8b6-436c-86fa-5bad4cfce2c5	1	Other	Other
+8cdc4c86-e436-49aa-ab43-906ddfc6cc5a	1	Other	Other
+8cdc7aa5-f21b-4f43-b208-447bf8562b35	1	Other	Other
+8cdca9c4-9192-4f90-b7bc-7ae38901f143	1	Other	Other
+8cdcf903-813a-4dcf-86eb-9d43e60e86ff	1	Other	Other
+8cdcfc38-7953-4a81-8cad-cdc764ede931	1	Other	Other
+8cdd0327-a074-4185-8f62-e8250a045e38	1	Other	Other
+8cdd4c6d-9fe2-4984-b400-94570ca59181	1	Other	Other
+8cddacea-5635-4f02-b078-d9d368cfe78c	1	Other	Other
+8cdde47f-1de9-4d78-ba09-3e26a49cb196	1	Other	Other
+8cde1124-6bd3-4a5c-a023-4193a16f5dd3	1	Other	Other
+8cde176f-1e18-4945-bd4d-150ff054cb6d	1	Other	Other
+8cde3374-e3ff-43e7-a8c0-56919db39584	1	Other	Other
+8cde39a7-786b-45bb-be24-6e61ae15a299	1	Other	Other
+8cde447a-b787-4729-a99e-3df168857e2c	1	Other	Other
+8cde448c-32c6-4623-8173-51e72087eef0	1	\N	Other
+8cde567a-3e3f-49a5-b5b1-5a936eaa1287	1	Other	Other
+8cdecdfc-93b1-4020-bb52-ac3f9b8d167f	1	Other	Other
+8cded8cb-3cea-4737-88bc-0c582ed76fe9	1	\N	Other
+8cdedfbe-66b0-45da-b6b7-3d385815578c	1	Other	Other
+8cdeead1-ea60-4c11-af52-0c69d41385d2	1	Other	Other
+8cdefafb-a870-4a62-9aca-04b97c28f6c5	1	Other	Other
+8cdf7c8a-188d-425f-97af-79c32142c102	1	Other	Other
+8cdf8285-20ba-4166-80e9-e85a9641eae3	1	Other	Other
+8cdfc475-bedc-41d3-b5a4-b7ef3b2d0a65	1	Other	Other
+8cdfe407-c7be-4ce9-86ad-84e1d18785a6	1	Other	Other
+8ce014ab-157f-4675-a533-0f01a2ed08bc	1	Other	Other
+8ce02129-0a44-4f5d-96f0-bf4127a7183a	1	Other	Other
+8ce08396-99de-41e7-b6b0-8426ce56a778	1	Other	Other
+8ce0c61e-ed5e-4967-a5b9-4e3c1a376564	1	Other	Other
+8ce0d42e-9d8c-4430-a2d3-77640eba343f	1	Other	Other
+8ce0dc7f-9854-4ac0-8b15-9961c2589cbf	1	Other	Other
+8ce14845-cef1-40e5-8557-f9e77efeb350	1	Other	Other
+8ce1498d-3d7f-4f7a-a8dc-07328e8778a6	1	James	Other
+8ce1a150-bd40-4823-ae75-b166521a4bd3	1	Other	Other
+8ce1d0f8-b647-4b7f-8f42-80843ae71463	1	Other	Other
+8ce1e742-68fe-4427-bea7-105462230e62	1	Other	Other
+8ce1f5d5-5753-42ca-bcb5-3718754dd9ee	1	Other	Other
+8ce23652-b49a-473a-ae1f-6077d70e3477	1	Other	Other
+8ce24d4f-f39c-49ee-811d-0768ccce27db	1	Other	Other
+8ce2a9f6-c475-4865-8245-93af05aa5849	1	Other	Other
+8ce2c176-6e1a-4bab-b4d7-80b0f8163410	1	Other	Other
+8ce2dff9-33c3-4634-9f48-bc5ee8bdb51c	1	Other	Other
+8ce2e998-f19e-432b-9327-271037a73acd	1	Other	Other
+8ce2ff2f-cc4b-4eb9-90d0-6214016bbec4	1	\N	Other
+8ce337b0-0a17-4538-b070-ac927a276a08	1	Other	Other
+8ce37527-051c-4a85-bf87-91746baae5cf	1	Other	Other
+8ce38f5c-9029-4780-bda6-22f8e3a3bfd6	1	\N	Other
+8ce3df0c-5ca7-4332-9864-3a55069aec54	1	\N	Other
+8ce3efdb-ed87-4ae3-8af5-676534252e09	1	Other	Other
+8ce40e98-7ba8-4205-8d26-6582317ddba9	1	Other	Other
+8ce423af-ccdf-4395-82d2-72dbe40573b1	1	Other	Other
+8ce4630e-e2d7-4208-9991-673eee8b0a5c	1	Other	Other
+8ce46a7e-0b7c-4ea1-aa8a-9680f7a046f6	1	Other	Other
+8ce47213-b46a-498c-ba53-3af406e73573	1	Other	Other
+8ce4807d-3dc4-4440-836e-6f51385829a3	1	Other	Other
+8ce4834c-ac0d-45b7-8ec3-2b5879be052d	1	Other	Other
+8ce4a957-25e5-4182-ba33-ab9bb32f2222	1	Other	Other
+8ce4d661-603b-41b1-8366-d6790234707c	1	Other	Other
+8ce4fbdc-e9b5-480a-971d-4bd8ba443ae7	1	Other	Other
+8ce5004c-e53f-4676-9497-8ef11e3bcc63	1	Other	Other
+8ce50af1-b5f6-4d1c-be00-c8f0d726c4d7	1	Other	Other
+8ce54804-9ea0-42e5-8907-76221b7fd529	1	Other	Other
+8ce56d9a-a33e-4718-be96-a68b39b054f3	1	Other	Other
+8ce5b391-b7d3-4121-8279-20f54e950c64	1	Other	Other
+8ce62130-831e-482a-8a58-f7437e510ab8	1	Other	Other
+8ce64da0-c618-4818-bf38-ecd37b8a2052	1	Other	Other
+8ce65508-c708-48ea-a3b4-4e6ad128514d	1	Other	Other
+8ce65dd1-d2a5-41d4-bcc1-f0eebbfde32f	1	Other	Other
+8ce6986c-a586-46e3-82bf-ef2ead19865e	1	Other	Other
+8ce70af6-d866-44e1-9ac6-8ddb31a4970e	1	Other	Other
+8ce718d5-58a5-45bf-ab12-a68342f461ce	1	Other	Other
+8ce74075-597f-4eb9-a4dd-5bba3ce0d86e	1	Other	Other
+8ce77147-e291-4334-be97-fe5c0350ddb7	1	Other	Other
+8ce7e7d0-64bf-4e6b-861f-a04770693920	1	Other	Other
+8ce7eb00-49ed-4c6f-97c9-aa7e901ddc9d	1	Other	Other
+8ce7eddf-6e0a-4c13-9c7d-836991662bac	1	Other	Other
+8ce7ef69-c5ee-46a1-ba01-d6919d563667	1	Other	Other
+8ce7fe49-92b4-4abe-a2a3-fcc1ad75917c	1	Other	Other
+8ce80271-44dc-40ad-9d1b-efd79ddcf87c	1	Other	Other
+8ce8128f-4695-4165-a420-5fe4bb20a02b	1	Other	Other
+8ce89b4f-d9b4-4f17-a1bf-4eb30c9e1887	1	Other	Other
+8ce904ab-ba17-4ea1-a50a-97853d8c673c	1	\N	Other
+8ce923bc-f5b8-4005-bd87-6d357864253d	1	Other	Other
+8ce92b76-9228-4c47-aee5-8695bbccb0f6	1	Other	Other
+8ce96fd7-e7a3-4efe-8f40-35b6bee4db69	1	Other	Other
+8ce98a9e-5ca4-4c74-ba38-877920579283	1	Other	Other
+8ce997a5-8e4e-4d2a-b6ef-07f6ff80e2c9	1	Other	Other
+8cea396f-a383-40ba-9b42-4c4cacdcbf61	1	Other	Other
+8cea7916-825d-4ba9-b2b0-9f7a4f85d868	1	Other	Other
+8cea7956-4e05-4bd6-90f4-c56376ea093a	1	Other	Other
+8cea9df3-0886-4ae3-b93d-8fc5b92a9e52	1	Other	Other
+8ceae98f-b273-40e6-9b28-bcf0383a618d	1	Other	Other
+8ceb09f9-ae92-4944-96a4-0b801207a6d4	1	Other	Other
+8ceb0db9-4ae0-4cee-af74-31fd6266523f	1	Other	Other
+8ceb1327-4a9b-4292-9a09-da348ff6dd30	1	Other	Other
+8ceb3901-09a3-4e2f-81be-336114c097e1	1	Other	Other
+8ceb9f95-1c39-42eb-a0a0-890bb0fae727	1	Other	Other
+8ced5ec7-1f23-4bc5-b524-0035ca485884	1	Other	Other
+8ced82a2-f469-4701-87f5-42924153cf11	1	Other	Other
+8cedf05c-dc98-440d-8cab-4b58b73eca24	1	Other	Other
+8cee4657-5b19-4915-8422-f34f02a1eb97	1	Other	Other
+8cee4ff3-9c97-4f70-bace-03189b316c49	1	Other	Other
+8cee7f77-48cc-444d-ac35-6f89e9acb656	1	Other	Other
+8cee7fca-8173-4d70-94e2-cf03c79bf5ac	1	Other	Other
+8cef4d08-4fc9-4c3b-ba7f-53c0748bc9b5	1	Other	Other
+8cefa33d-fc55-4ce0-a0f9-c1bfb8a24398	1	Other	Other
+8cefac22-4b69-4f3a-8c9e-4adb917cd47e	1	Other	Other
+8cefcca9-39fc-4d80-a359-b1d35d0b1003	1	Other	Other
+8cefd1e6-18a8-4896-8675-1b3e73f9d31a	1	Other	Other
+8ceff9c3-f9c5-4e49-aa69-0db980cbfda9	1	Other	Other
+8cf01092-4af3-4b6f-8c85-61e5e15a2775	1	James	Other
+8cf03f5e-ff15-4315-be3f-c64a5a306dcc	1	Other	Other
+8cf06cea-849f-4acd-8a41-5f63cd736a2f	1	Other	Other
+8cf0aa4e-61fc-4d17-b45b-fcc40df6a5f1	1	Other	Other
+8cf10865-bc28-47bf-8ea2-e7573ca5fac3	1	Other	Other
+8cf115ca-47bd-4921-ac51-95937e054840	1	Other	Other
+8cf144b0-2f67-40a4-a4dc-89f10e11c2c5	1	Other	Other
+8cf1536c-579e-4c28-8e4a-832ab9f09857	1	Other	Other
+8cf1571c-e931-4c27-b86e-83c70cdc7a2b	1	Other	Other
+8cf1b3e9-e882-43f3-bd38-ee149a568775	1	Other	Other
+8cf28874-fd2c-4fdd-8937-45d552a26bb1	1	Other	Other
+8cf2da21-3893-4b3b-b798-2dbd28ed464e	1	Other	Other
+8cf2f5fe-a834-4656-ac9c-4eb202b0cf82	1	Other	Other
+8cf2f9ea-9fa4-47ff-8531-f4e75e1d6e61	1	Other	Other
+8cf315fc-a6cf-4a66-92b3-1aa2602bf58a	1	Other	Other
+8cf34b57-d919-4099-b711-5328ad8924ec	1	Other	Other
+8cf35ba9-d97d-41a6-b877-21b15227ba9a	1	Other	Other
+8cf373ce-2202-4e74-8550-1823e58b0369	1	Other	Other
+8cf387c6-a3d5-4cb3-a473-b0e4c1033710	1	Other	Other
+8cf39c4a-ec55-47fc-8e75-6231e9601138	1	Other	Other
+8cf3aa8f-df36-4263-be9f-97e3be3fdf6d	1	Other	Other
+8cf3fdd7-46e8-4435-a7c9-17c15959871b	1	Other	Other
+8cf44360-ebdc-4a8c-b0d6-b28d8115f6b6	1	Other	Other
+8cf4622b-8449-4b0c-be46-6373809690cb	1	Other	Other
+8cf4a588-f0e9-4826-aba3-a130ff7dc126	1	James	Other
+8cf4cd60-e831-48bf-9e2b-a0ab7efa58b6	1	Other	Other
+8cf4dcac-5579-46ab-a7b0-a69f23b51c0d	1	Other	Other
+8cf52185-f50f-40a3-aab4-c7d7495dc19d	1	James	Other
+8cf536d2-8e69-4357-a109-f37b838618a2	1	Other	Other
+8cf55121-4f5a-40e7-a301-a411cae4d555	1	Other	Other
+8cf5689e-618c-4172-8f0f-5b7eb566b0b1	1	Other	Other
+8cf59d40-0726-47c9-8378-ee70d6cf4ea3	1	Other	Other
+8cf5a885-4845-47c5-8cc5-b430a6f4ad35	1	Other	Other
+8cf5c659-bd20-458d-8a34-5973856c00db	1	Other	Other
+8cf5ddf7-08a4-4f2b-adc4-5ed7e89160e1	1	Other	Other
+8cf63e54-0cf0-496b-9273-7356c30d4ee6	1	Other	Other
+8cf64c29-ee48-479b-b7aa-ead00433dc10	1	Other	Other
+8cf651b8-90b4-46bd-82a7-20ad6bae66b3	1	Other	Other
+8cf6bef6-b111-4a65-ada8-1b348b8dddae	1	Other	Other
+8cf6c0c1-d536-4b20-98b6-35b284e95a40	1	Other	Other
+8cf6d7dc-eb08-4960-b883-59312f87e1aa	1	Other	Other
+8cf7110c-9d5d-48d8-ae76-174bf28d82d0	1	Other	Other
+8cf71281-cf7e-4ae3-9d5b-e69135607bdd	1	Other	Other
+8cf7273f-98a6-480d-802a-c3ebb66a3441	1	Other	Other
+8cf75cef-b7eb-45fd-baab-97ca8edee1be	1	Other	Other
+8cf7ac4c-555c-49b2-a209-9733113a3245	1	Other	Other
+8cf7beab-98aa-4265-a07d-673f700f58a9	1	Other	Other
+8cf7dcd8-d1e2-477d-b36f-ea6151aad813	1	Other	Other
+8cf83b5e-c574-4dc4-aa85-ca5180a30209	1	Other	Other
+8cf8463a-e404-40ba-b518-efb1648f3d62	1	Other	Other
+8cf8b3b2-bfeb-4c4b-ac42-b867d7c9efc2	1	Other	Other
+8cf8bf1e-6446-4caf-ad94-a1e5c9a5e8e9	1	Other	Other
+8cf8cea2-6cc1-40fe-b55e-76b21931e535	1	Other	Other
+8cf8e018-339a-4cf6-9f4b-ea92ed7d08e9	1	Other	Other
+8cf90f8e-f87b-4daa-b5b9-3a18854d9643	1	Other	Other
+8cf94cca-a8b6-4322-82a9-ab9821a5a768	1	Other	Other
+8cf963de-686d-4318-b6d7-0f25a89df739	1	Other	Other
+8cf9704f-64f4-4e69-8f6f-57a2bf31c4a5	1	Other	Other
+8cf98ae3-3b19-45b6-9b0a-d5ec8f6d03b2	1	Other	Other
+8cf9bb62-217a-4bc3-bc62-c38a970c6480	1	Other	Other
+8cf9c7d7-9512-4297-a721-a88a831daf85	1	Other	Other
+8cf9c906-e3dc-4575-a922-d76a48f0b22a	1	Other	Other
+8cf9d0be-7683-4dc4-be8b-64d62f7e7205	1	Other	Other
+8cfa1653-3e72-4ef8-954c-c33dee7aa6a4	1	Other	Other
+8cfa4a49-164c-46f6-a950-89a599866825	1	Other	Other
+8cfa5cfa-9897-4b10-967c-293316784a83	1	Other	Other
+8cfa851e-69ec-4525-bb71-9bc931086a2b	1	\N	Other
+8cfac385-b245-4ee2-afc5-d8cfcb4ef71a	1	Other	Other
+8cfadf9c-1c94-49e4-a8bc-93468ca7276a	1	Other	Other
+8cfb0536-e274-4378-a55d-d4e0f71db6a9	1	\N	Other
+8cfb29ed-aefa-4066-81ec-d1a919a01642	1	Other	Other
+8cfc0f2b-d93a-4143-aeb3-479560448c38	1	Other	Other
+8cfca3c0-47c0-49d0-856d-d6075ccfccd9	1	Other	Other
+8cfd020e-698f-4b58-868a-5622144f11ba	1	Other	Other
+8cfd3967-8a93-48fe-b1de-d507c68756cc	1	Other	Other
+8cfda10b-7745-4674-8cf9-56070e9c15ff	1	Other	Other
+8cfda7c1-6855-4cbb-ab21-5865f5691d9e	1	Other	Other
+8cfe236a-24c8-433f-8af5-daca8c90f60f	1	Other	Other
+8cfe4dbe-3dc0-4949-9a55-4684f4dd7ea7	1	Other	Other
+8cfe5c00-45fa-4254-8f03-a08cff87b424	1	Other	Other
+8cfe5dfc-c126-41df-b637-8ef1e15dfda1	1	Other	Other
+8cfe79f9-fbe2-47ae-a85f-3b8d309ac3fa	1	Other	Other
+8cfebc5f-3593-4014-90ee-660e20a3f838	1	Other	Other
+8cfed300-d644-4841-a4ac-b8fcba38844b	1	Other	Other
+8cfed737-74ce-4d8a-8d9c-76c0cd586a50	1	Other	Other
+8cfedc29-6832-4a6f-b700-8d85a4f3ef07	1	Other	Other
+8cfef699-70be-45ff-ae14-d848a783898f	1	\N	Other
+8cfef6a3-281f-4e4b-8fef-1d425ca0f236	1	Other	Other
+8cfef6c2-9714-437d-8b20-1b7c36c80df6	1	James	Other
+8cff1dc7-68a1-443c-8e55-a1e51c2139b7	1	Other	Other
+8cff525c-c628-4f28-bbaf-5cc82f67b1b8	1	Other	Other
+8cff68be-e126-4547-94d0-822f40450493	1	Other	Other
+8cff6a9d-898b-47d2-aab4-735e47598958	1	Other	Other
+8cff8a47-7829-4137-8bd9-93d14edd13a4	1	Other	Other
+8cfff745-dce7-41f9-9ab4-781eaa9c4264	1	Other	Other
+8d003bc7-f6bd-4c0c-b18c-6550824db0e0	1	Other	Other
+8d009b6a-e6a6-4808-b50a-54d5ecc29478	1	Other	Other
+8d00a16d-b74b-4d4e-8a2f-c5f8d6f45ae9	1	Other	Other
+8d00e1ad-d894-47b8-82a8-b28803a01094	1	Other	Other
+8d012e2d-f4d9-4eeb-9d36-bdca06dc3949	1	Other	Other
+8d01a783-26dd-4c3b-9361-78a3611602b0	1	Other	Other
+8d0201f4-b6a7-4782-8948-7f2fe1270c0d	1	Other	Other
+8d026ce1-60ab-401b-83f8-7fb4cbb8bf29	1	Other	Other
+8d02b340-d1cf-42b2-adf0-bd7c4b8e8013	1	Other	Other
+8d03340e-a748-4dbd-aa3d-0e393c8463d4	1	Other	Other
+8d034dc8-d104-4fec-82d1-c1e11fcaa484	1	Other	Other
+8d038ceb-9e5b-404e-9c54-97615f17b9ba	1	Other	Other
+8d03b18a-a307-4d15-a570-9c39fc8c2668	1	Other	Other
+8d0429f8-10d8-4971-bc7a-65c66d035e8f	1	Other	Other
+8d045bc2-1eb9-4846-a8dd-4fd25cd5159b	1	Other	Other
+8d0472cd-117a-41d8-8ebd-b88bf5e9d5e5	1	Other	Other
+8d04c7c2-5b83-426d-854e-02f290baeb5d	1	Other	Other
+8d04da8d-24d1-4ff5-a84b-43042650d8c4	1	Other	Other
+8d04ea57-4ed4-4495-a12f-110532b220ce	1	Other	Other
+8d054780-3d7a-43ee-baa3-3b16fb76d055	1	Other	Other
+8d055b7e-d2da-4706-a983-eeed40e1c649	1	Other	Other
+8d05872d-75b0-451d-882f-63c312fa7cb8	1	Other	Other
+8d059136-6d42-463b-8937-87fe4286f04a	1	Other	Other
+8d0602a9-8353-422a-b398-4dc622b6db5e	1	Other	Other
+8d060491-dbd0-451c-90b4-cb55590ab756	1	Other	Other
+8d061d10-2617-4a47-b8ea-bd64591da703	1	Other	Other
+8d063f70-69fa-412b-9889-191561cd7085	1	Other	Other
+8d0686c2-1218-48c0-af51-eb107b8922d3	1	Other	Other
+8d076982-fc61-474d-ba4f-3be00dac989f	1	\N	Other
+8d07b3f1-ee34-4bb4-9719-b61099079efc	1	Other	Other
+8d07ce8f-9aff-4f23-901f-84caf1bdaeec	1	James	Other
+8d07ff6b-be02-4909-8b09-573c0b4bed70	1	Other	Other
+8d081fd8-845e-4060-b19a-feb2587abffe	1	Other	Other
+8d08294f-d3cf-4c55-87d5-3c312bccc9cc	1	Other	Other
+8d082fba-0df7-447a-a5ca-00288da5ebd6	1	Other	Other
+8d083350-db5c-4cc2-9715-9f107b29be1a	1	Other	Other
+8d087b93-15c2-42cf-84ab-0bc85eaa80ab	1	Other	Other
+8d08caf4-1fc1-4856-bbac-8b41177b610a	1	Other	Other
+8d08fa49-18cb-4d2b-a8eb-cc70f0ec5d10	1	Other	Other
+8d090735-c575-4ca2-a463-c8e68a8bc7dc	1	Other	Other
+8d092d67-ed8e-4ae3-9b3a-efaa91f57c65	1	Other	Other
+8d098573-6746-4602-9f6b-a4e84322c917	1	Other	Other
+8d09e59d-3224-4349-8cb2-603116201d87	1	Other	Other
+8d0a4e15-a7e4-4072-9b98-765e3d5bf86b	1	Other	Other
+8d0a57b8-972d-46c5-a5bf-fdfe7367122f	1	Other	Other
+8d0b17db-23e3-45b8-aff5-1ade13ea7824	1	Other	Other
+8d0b1d8b-153a-433a-a349-9c653f35b755	1	Other	Other
+8d0b2a54-a303-41aa-b14e-75323d187eba	1	Other	Other
+8d0b6b45-28b8-40d9-99a6-09684cd07d15	1	Other	Other
+8d0b8f86-2fb4-4933-991c-b23a7ed05436	1	Other	Other
+8d0c3ffc-7dc7-4fe7-8639-8f267d63c18d	1	Other	Other
+8d0c4120-dbe1-4ee5-93d0-e236af9a83fc	1	Other	Other
+8d0d57f8-243b-42f7-be4f-2dd8997f0008	1	Other	Other
+8d0d5bdd-6bbc-423a-aed5-68f308e55dfd	1	Other	Other
+8d0d9f64-2cb4-4bb3-8c14-e42567c9d522	1	\N	Other
+8d0dacbd-34da-4dad-a56a-847013a1d0bd	1	Other	Other
+8d0dbf92-af23-4884-be36-27c800e2ea05	1	Other	Other
+8d0dc172-f759-4c48-b730-cb9832607d75	1	Other	Other
+8d0e68f5-e42c-4d5a-bd14-e193c521a1c6	1	Other	Other
+8d0f1597-dc1a-4d26-84a7-97f1657130d5	1	Other	Other
+8d0f5827-9212-4ddd-bded-c284cd1dcd45	1	Other	Other
+8d0f9f8f-690a-42f2-9676-0ced240737f5	1	Other	Other
+8d101a9e-d486-4d41-b6bb-270644405376	1	Other	Other
+8d102b78-19e6-48a5-bd8e-f6aa643a193b	1	Other	Other
+8d1051f1-f0ec-4d5f-a70f-125024a74b15	1	Other	Other
+8d105e04-61ab-434f-b758-a1495d2cda3c	1	Other	Other
+8d10a659-c411-4b93-809a-5e08e033241b	1	Other	Other
+8d10aac6-6b70-40fb-b622-76fc85dd6e95	1	Other	Other
+8d10b505-d99d-448c-9813-63c5a20f881a	1	\N	Other
+8d10c12a-2d49-4d1c-8459-e0a863923ee2	1	Other	Other
+8d10ce47-a0c7-4b9c-bd2a-2a58268ce298	1	Other	Other
+8d10dc02-03fe-436d-a166-3dc18d57a632	1	Other	Other
+8d10f629-d9fd-4e45-8989-027afa23b105	1	Other	Other
+8d10f925-a79d-43ee-8b99-ac3c904d4e73	1	Other	Other
+8d111a84-c3f4-4037-8166-e0c26a72d3d9	1	Other	Other
+8d114d89-c3c9-48e3-8076-5e242b1f9088	1	Other	Other
+8d115eb7-43c9-4945-872f-508fab2f20bb	1	Other	Other
+8d117103-6893-41de-8681-f307b3f29bf6	1	Other	Other
+8d121c91-28eb-4593-babe-78bc7f65572b	1	Other	Other
+8d123082-e107-44dd-b989-4d67bb10fc48	1	Other	Other
+8d12566f-e3fc-4104-9f1a-5c2fecfd2069	1	Other	Other
+8d128504-6193-442b-a603-076d98f94861	1	Other	Other
+8d12aa64-36bc-4804-bba4-19417c297d3f	1	Other	Other
+8d12b228-ed14-49a0-9355-9f24b1d9a972	1	Other	Other
+8d12d6e8-c589-4d66-8eea-b25ae5fef3c5	1	Other	Other
+8d12ff6e-4590-4c34-927a-1a16c7b123b9	1	Other	Other
+8d133a52-2c63-4d00-aa2c-3ae4cb9e61d6	1	Other	Other
+8d137133-abc2-4ebd-b5e9-ad591d3e9966	1	Other	Other
+8d137919-1b7d-45cd-9bbb-18b076a581a4	1	Other	Other
+8d13a0a2-2611-4e82-8f5b-e54433ff3887	1	Other	Other
+8d13c3b4-7019-4a5e-accf-aa35fc3bf100	1	Other	Other
+8d13de8a-b0c8-4d73-a860-17ce698bf6db	1	Other	Other
+8d13e0c0-1c4f-423a-8b58-10838abf4edc	1	Other	Other
+8d145d1f-c06a-4d02-ab33-cb8545cca40f	1	Other	Other
+8d1477bf-6ab3-47b6-ae4c-a463fae70abe	1	Other	Other
+8d149909-6d05-4519-8b5d-22f4a45c4bab	1	Other	Other
+8d14a7fb-dabe-4c4d-9639-0bdc08ba5ae8	1	Other	Other
+8d151ba4-9eb4-4327-8703-6eaefa502060	1	Other	Other
+8d15242a-1d26-4154-9b15-fdde57fe260e	1	Other	Other
+8d152c31-6143-4510-9f98-222dd6812f7d	1	Other	Other
+8d156a70-f804-42a0-82af-ba8f9fbb6e20	1	Other	Other
+8d15b6f2-9f42-4704-9b3d-30e060e8e133	1	Other	Other
+8d167050-1c61-454e-95d0-fcbc53eb9ecb	1	Other	Other
+8d169bb1-8815-402b-8c1b-25df1ec232d0	1	Other	Other
+8d16a0ee-2c9e-4995-9e84-a8b565ed75d2	1	Other	Other
+8d16b932-4aa0-4cde-b4be-3b120145ed05	1	Other	Other
+8d16c7c0-4943-4383-9abe-f7ff63a2e7e3	1	Other	Other
+8d16d341-9a3b-4f08-bef4-1b7c1546a3aa	1	Other	Other
+8d172619-7d5f-443a-97a8-ccb69839616f	1	Other	Other
+8d173556-e845-4275-bbe9-8fb2a841620e	1	Other	Other
+8d174034-771f-48b7-8fb5-2edcddf2af3d	1	Other	Other
+8d174255-1fef-4882-bcf0-b1a5e41026c4	1	Other	Other
+8d174d3b-93b3-4729-9c8f-43adf8a91139	1	James	Other
+8d17a029-0cb2-428d-aa53-8c8bd52439d8	1	Other	Other
+8d17e8c4-abc7-43f4-b487-a3946e20abc4	1	Other	Other
+8d18b30c-c41a-4734-bd44-a323ecabc294	1	Other	Other
+8d18c217-77c7-4a9e-8738-cd3e8d94f3f2	1	Other	Other
+8d196cc5-68b0-46bb-a1d7-948b4908cb8b	1	Other	Other
+8d19b5b4-b3db-4e80-92af-70886cf45182	1	Other	Other
+8d19cfcd-0d55-449f-b53b-ea15b409efc8	1	Other	Other
+8d19d8ce-e0e5-4911-a0d5-899468d81295	1	Other	Other
+8d19ef8c-8dbc-4f62-9317-386063a357eb	1	Other	Other
+8d1a2961-34b4-480c-8593-a496ab9fa5fe	1	Other	Other
+8d1a7953-ed5f-4612-a541-022b4540dd50	1	Other	Other
+8d1a85fe-64fd-460c-862d-fafc77220781	1	Other	Other
+8d1a95ab-51e0-4c9b-9469-ba81db0425a1	1	Other	Other
+8d1abec9-4856-497c-9e87-0e304e8eb3ab	1	Other	Other
+8d1af4a6-2e81-4ae6-9831-60cf104e3a92	1	Other	Other
+8d1b151d-5827-4d00-9afb-fa16b580ac84	1	Other	Other
+8d1b7e12-a323-4fb8-a866-8910fae89bac	1	Other	Other
+8d1ba58b-06c9-4052-a331-da48a367588b	1	Other	Other
+8d1bbd86-8df1-42c7-8fa0-5a633a893e4d	1	Other	Other
+8d1bc941-4791-4f19-9107-e8398b5586e3	1	Other	Other
+8d1bf126-cdfd-437f-872e-4021eb59aaea	1	Other	Other
+8d1c08cd-5fd8-4715-b783-c2006604d8a2	1	Other	Other
+8d1c19cd-7cd0-49a7-9855-57d265da9d63	1	Other	Other
+8d1c5872-8f28-4d5e-8482-09c08f05d6b8	1	Other	Other
+8d1c5bd0-e2af-4f02-bd72-61fdc6827146	1	Other	Other
+8d1c77b5-bbe1-48f5-8bdf-a4f3b8ebb081	1	Other	Other
+8d1cebd1-28d8-4c1e-9521-75193d39d4bd	1	Other	Other
+8d1d3e78-9f7d-4939-81b3-3d214a3d7251	1	Other	Other
+8d1dd861-2d88-4ec9-b372-c2321db7bf55	1	Other	Other
+8d1df274-c771-4429-afe0-1f9b0631ce73	1	Other	Other
+8d1e6a6e-da4d-4388-bbcd-805ecbe107d1	1	Other	Other
+8d1e7dca-179e-4345-b4f4-46f97ab78fcf	1	Other	Other
+8d1eda9c-4f47-4ff3-ab06-d11d94c062bb	1	Other	Other
+8d1ee859-61de-4531-843b-e644426c60a3	1	Other	Other
+8d1efa45-706d-4d50-bb83-019a9cc7b987	1	Other	Other
+8d1f0bdd-cb5e-4c38-a577-d2d17de24d46	1	Other	Other
+8d1f2687-29c9-461a-a69a-2f3bbf01e461	1	Other	Other
+8d1f667c-0c2e-4648-b053-5d2e54602ae0	1	Other	Other
+8d1fba42-26fd-4570-a5ad-8bf26de3e2df	1	Other	Other
+8d1ff3af-4665-4071-89ff-41a04809c622	1	\N	Other
+8d201e0f-df08-4100-9fac-4fe3b6995547	1	Other	Other
+8d2067a7-0cb9-41e3-8ed3-e766b3e9382b	1	Other	Other
+8d20a980-52ed-43ce-a676-0f3c2c1b850b	1	Other	Other
+8d20e58c-ee28-4983-b495-4578a9849ea4	1	Other	Other
+8d20ebe5-5e0c-457b-9060-501c66eff855	1	Other	Other
+8d21044b-fd06-40db-9141-8807ec205075	1	Other	Other
+8d212182-9f39-4ce4-b1c4-2d9c276b3196	1	Other	Other
+8d213fc8-85cd-4eff-a9d1-c9ec69019f01	1	Other	Other
+8d217210-63ae-4a8b-b208-d69ad83753af	1	Other	Other
+8d219705-3d0d-41a8-a52c-1ba12e101117	1	Other	Other
+8d21a1aa-8893-4c97-adb5-4085a5049010	1	Other	Other
+8d220c37-f6c8-4e4a-b98b-dc85cc0564f5	1	Other	Other
+8d223f12-fc5f-4713-8c97-0b0b808f9c4b	1	\N	Other
+8d223fbb-8f85-45b6-ab86-9f6eea2d82df	1	Other	Other
+8d22d926-41f1-469e-a254-635f6d5a1944	1	Other	Other
+8d22e90a-266f-4e7c-8179-2281b9a5dc89	1	Other	Other
+8d22f54b-6a64-4610-a98d-935f5e51ed86	1	Other	Other
+8d2344b1-59cf-41d0-a3dc-d98d6d387666	1	Other	Other
+8d235fe2-88b7-431a-9103-a015fbccc878	1	Other	Other
+8d2368a9-3a76-4731-9757-4551e14e8519	1	Other	Other
+8d2387d6-331b-41c6-a250-5dd8bd77936f	1	Other	Other
+8d23a6b4-23b2-456c-ba1c-b1358e0e4d51	1	Other	Other
+8d242686-8c4a-4583-b8db-f4402dafa3cd	1	Other	Other
+8d249314-b22a-4907-bc28-975ef4853125	1	Other	Other
+8d24c837-549c-44e5-b352-b9f05a08d274	1	Other	Other
+8d25045e-aa22-4bc4-b8f2-72616cdf50d0	1	James	Other
+8d2523d6-294b-4ec5-a226-af68d303735f	1	Other	Other
+8d256738-2464-4fd1-af2b-faf0049a8e53	1	Other	Other
+8d257136-9204-4cfa-8251-c12ed6cc47db	1	Other	Other
+8d25b042-5e94-4e1b-89d0-ae86527743db	1	Other	Other
+8d25b0c1-c5fa-4b7b-af84-dc161edd5c2a	1	Other	Other
+8d25eede-5530-4a19-83eb-dbcbef1efd31	1	Other	Other
+8d25f2ba-d235-44a0-8320-c7a08d9f9161	1	Other	Other
+8d261961-3ef8-4cb3-bb08-f0454583d93b	1	Other	Other
+8d2622e4-1d17-4b66-be19-c9a496e33263	1	Other	Other
+8d26389a-15b4-46d7-b961-b328c1ed0ffd	1	Other	Other
+8d264c24-3ef7-4606-81a3-078a8357a046	1	Other	Other
+8d26571f-0afe-42f5-bb82-584a5bf623c4	1	\N	Other
+8d265ef7-4c4e-47e7-a508-16f4b973ed70	1	Other	Other
+8d2669f8-3386-4593-b02a-f80f255fc29e	1	Other	Other
+8d267d86-500d-4faf-939c-11da7c18be5e	1	Other	Other
+8d269e1b-a44d-4a6b-aff7-1a4c5e4beea5	1	Other	Other
+8d26dd2a-1cc2-4ef9-83aa-c1b4fd5a5252	1	Other	Other
+8d270ca4-8060-4fdc-9c87-5c234ee3f432	1	Other	Other
+8d2722bd-8bb6-4824-9822-998e15e149a7	1	Other	Other
+8d274214-ccea-46a9-9012-39e937932244	1	Other	Other
+8d274af1-7246-45a3-b4a0-93c1e9f5ac25	1	Other	Other
+8d2751a2-f4aa-487f-bd96-bdcbeb16eb58	1	Other	Other
+8d275c5f-f12e-4bfe-9dda-009283d01aac	1	Other	Other
+8d276633-466f-4649-81b9-0c912d7a76ad	1	Other	Other
+8d27f040-86d3-4c35-bef1-03c0d6e00c53	1	Other	Other
+8d27ff00-ccfa-4d48-a606-0d1e758cf5e7	1	Other	Other
+8d287f86-c9c5-4a1f-b0f1-f586f6a51838	1	Other	Other
+8d2881ca-bcc3-4b3b-b47c-57bada48453a	1	Other	Other
+8d2888f7-c903-44c3-a1d2-c67476d5952f	1	Other	Other
+8d28ad7f-e088-4270-92ee-cabc1b6ded7c	1	Other	Other
+8d28af57-5c17-4c94-9415-139fdeb3b1c6	1	Other	Other
+8d28d201-e46c-42f5-b82e-9d9d84f94462	1	Other	Other
+8d28f524-0cb8-43ed-8110-94862cb0c571	1	Other	Other
+8d2910fd-a1c8-46b2-a4e7-d12dddcb5922	1	Other	Other
+8d2920a3-c6b8-4988-ac74-d7c8a153f948	1	Other	Other
+8d29246a-c735-40c3-aa22-002ef8f1c0e2	1	Other	Other
+8d2924a0-4163-42b8-a90f-16a874987642	1	Other	Other
+8d293f67-0a8f-42b5-b178-fddc0c1fe705	1	Other	Other
+8d295b9e-86cb-42b3-ad9f-6401f4b4b6fc	1	Other	Other
+8d295de2-661f-4933-b292-da1c53cf79f0	1	Other	Other
+8d296447-46bf-4c66-b09d-b3c31903ff32	1	Other	Other
+8d297df0-3ada-4320-b244-ade17b0e0faa	1	Other	Other
+8d297e97-9e25-4ea9-a2ca-91c2ecc528cf	1	Other	Other
+8d29c1ad-5728-4265-849e-1ef7bb11e4cf	1	Other	Other
+8d29de88-1ea8-48d2-9bd5-40805d6d8061	1	Other	Other
+8d2a25c3-5233-483a-9cc1-921344d79462	1	Other	Other
+8d2aab21-7db8-46ef-89a6-801d13d54a7f	1	Other	Other
+8d2b7de2-83b1-40a6-97dd-eb968fc8bc55	1	Other	Other
+8d2ba180-24a2-42c0-ac50-e752d5eecfd5	1	Other	Other
+8d2bc813-4c6a-440d-a527-ee7ea9573d4d	1	Other	Other
+8d2bea94-b418-458c-90c0-2e2ee7b394cf	1	Other	Other
+8d2c048d-a07d-4171-9137-5f882ae53c75	1	Other	Other
+8d2c07e0-aab1-47f5-bd95-a91e23fad872	1	Other	Other
+8d2c0e4a-237f-4561-a13f-3c01ab493aba	1	Other	Other
+8d2c3d06-c189-4f41-8fc0-519fb00a261c	1	Other	Other
+8d2c900d-211f-4b78-9908-d4ea5a02bc9e	1	Other	Other
+8d2c9d3b-70ee-447d-b4ce-3a10d0223779	1	Other	Other
+8d2ce9cb-bf11-4c7b-82d1-a10000a21b9c	1	Other	Other
+8d2cee36-7ca6-48cd-8bb2-2a32bbecd1f0	1	Other	Other
+8d2cf8f3-7a79-4793-81ee-d4dd522fdda7	1	Other	Other
+8d2d0b01-6216-40c5-abef-efec3452c44b	1	\N	Other
+8d2d1def-1db0-4494-89a2-cedfc4d095b9	1	Other	Other
+8d2d53b1-cd10-4c2b-8d0b-0b4d37a270a7	1	Other	Other
+8d2dbdf8-2312-4ded-9d12-d59d720b1bd9	1	Other	Other
+8d2e3546-0276-4256-afff-fecd0dc7c762	1	Other	Other
+8d2e9278-302d-419d-bde5-d12a09929cef	1	Other	Other
+8d2e9cb0-126e-4b8c-9a47-d0761d5be74b	1	Other	Other
+8d2ea91e-9cfa-491d-853b-10176b4d9a17	1	Other	Other
+8d2f3bab-c2dc-4988-970d-2047464dc747	1	Other	Other
+8d2f5a87-7e9b-482c-b2e9-e323938d2cce	1	Other	Other
+8d2f6f05-9b8c-480e-8edc-290cae09d71c	1	Other	Other
+8d2f8375-d4d7-4247-a97b-d33efdda7e02	1	Other	Other
+8d2f87a5-9ff7-4ac4-b3f4-145bc2f331b6	1	Other	Other
+8d2f8b77-8e21-4196-a975-169b9975ef99	1	Other	Other
+8d2f9d15-2e13-44e0-baaf-62d746fcd91a	1	Other	Other
+8d2fb969-f5a4-4578-a08c-60f850713d90	1	Other	Other
+8d2fd569-6c6b-4b53-93db-c021e9663f3f	1	Other	Other
+8d303bb0-a660-42ac-8d5a-a80cffa0e917	1	Other	Other
+8d3097ad-f080-44a2-86af-8c7183067900	1	Other	Other
+8d3098f8-f64f-4390-9784-b870c1fc2629	1	Other	Other
+8d309e07-4692-4ccd-a70d-a88589639fd7	1	Other	Other
+8d3107a4-23bd-45cb-a2c8-47a2ecdc005d	1	James	Other
+8d31352b-8eeb-4655-91fe-03db818b847b	1	Other	Other
+8d315bce-2263-4da3-8d24-f74d8ba59583	1	Other	Other
+8d316464-a7a0-41e6-b30f-9353805eaae7	1	Other	Other
+8d31f1bc-1baf-4c6c-bbcd-cd6c71a13ead	1	Other	Other
+8d32112e-e8b0-413e-be3d-dd4bc15f599f	1	Other	Other
+8d323c3d-e85e-47bc-b265-f20cf69efd6b	1	Other	Other
+8d326225-0464-4f2b-8bde-165a4b99eb37	1	Other	Other
+8d327407-10d9-4acf-8a2b-9197cd0cd1ae	1	Other	Other
+8d3315d3-9464-4279-b62a-d334549e4fb2	1	Other	Other
+8d333b45-c1aa-4961-8a2e-fd8f8c7f763a	1	Other	Other
+8d335a3d-b344-4199-9aed-ade4da75ebfb	1	Other	Other
+8d33bbcc-6bfe-43e2-bc2f-e4e36d99f6b9	1	Other	Other
+8d33d42f-e839-43d4-ad76-dea40c643169	1	Other	Other
+8d342d2f-0aef-4e33-8379-352045fc86e1	1	Other	Other
+8d3433fa-210f-48ee-b716-233998e6b469	1	Other	Other
+8d3462c3-02a4-488b-bbd0-b0d328884f25	1	Other	Other
+8d3468fa-da8e-4395-9ffa-86004e5f9fcf	1	Other	Other
+8d3496a7-f392-4512-ac88-093686047194	1	Other	Other
+8d349cf3-0154-41ab-a95b-91aa8b3f4dea	1	Other	Other
+8d34ade6-8181-4247-9fad-dede4ff00306	1	Other	Other
+8d35ba11-d4f8-44fc-b72e-8848eac59de0	1	\N	Other
+8d35d27f-672d-46bd-b383-a179363bcced	1	Other	Other
+8d35fd9f-5a69-403f-a4aa-16977932952e	1	Other	Other
+8d36094e-b174-47f2-9d36-59ed1d1b98c2	1	Other	Other
+8d36b5ea-b072-428c-a210-0a8257e9e429	1	James	Other
+8d36be8c-523f-4013-858f-42c9880e8438	1	Other	Other
+8d374621-4035-43a2-9a62-c6cd3e97e530	1	Other	Other
+8d374fa0-aa6f-4080-8f86-f85a14d3d8aa	1	Other	Other
+8d37edd6-2e18-4b31-b2d8-5557d890661f	1	Other	Other
+8d3853c5-b19a-40e0-b8bf-64faa2e0d3c7	1	Other	Other
+8d387cfc-2b82-45ff-8813-3b3f507192aa	1	Other	Other
+8d389ccd-7449-4cd4-974a-be051479fc12	1	Other	Other
+8d38c40a-b87f-4011-90c3-fab2704ca730	1	Other	Other
+8d38f72e-7296-45f2-96ac-4f66ac8c1521	1	Other	Other
+8d3935bd-2074-462a-9229-74da78e6347f	1	Other	Other
+8d394ccf-a01f-40f4-b571-d05185048bd5	1	Other	Other
+8d395c43-7b35-43ab-b1a5-3ad4d1169e9f	1	Other	Other
+8d3962d3-8d48-487b-9c1b-5122617a30ec	1	Other	Other
+8d39d1ee-7320-4100-866f-880f788dc6d9	1	Other	Other
+8d39fc0c-b454-45a2-8928-f0391318f2bc	1	Other	Other
+8d3a01c6-edb1-42bd-8480-da79a3b91521	1	Other	Other
+8d3a5a7c-0ea4-4a3a-adda-22a164a2a6af	1	Other	Other
+8d3a7310-a72f-432d-8dd9-4678837db535	1	Other	Other
+8d3ad10a-09c4-49e7-9e53-1e4d046cf128	1	Other	Other
+8d3b2225-4969-46b3-8128-f6ecaa48e7ac	1	Other	Other
+8d3b4382-588f-48d8-a6b6-279ff85cbed4	1	Other	Other
+8d3b4ea9-54f0-4536-874b-e6dc0c939f22	1	Other	Other
+8d3b610c-701b-4f4a-94cc-c6d82e63f77f	1	Other	Other
+8d3b7198-6aad-46e1-9164-16ee0063fb2d	1	Other	Other
+8d3ba8f8-6f51-4ac0-95de-0ed0383c9618	1	Other	Other
+8d3bc90e-7635-4016-813b-56a48a277d7f	1	\N	Other
+8d3c0880-770b-4fc1-956e-06bc51c1ce03	1	Other	Other
+8d3c5b23-94ff-428c-b56d-fe5e5f67c256	1	Other	Other
+8d3c5b84-321c-4cc9-b59e-2da9dc528fcb	1	Other	Other
+8d3cfe3f-4e02-4e5e-b35c-940d0a8045fb	1	Other	Other
+8d3d265d-aa05-4e04-a2be-67dcda886c09	1	Other	Other
+8d3d9e7b-5791-459b-8d0c-dd5594d87529	1	Other	Other
+8d3da500-ffd1-469c-b4d9-5e797c78aaad	1	Other	Other
+8d3dbded-0350-4826-9cd6-d228dbad1a4d	1	Other	Other
+8d3dd957-3ff9-44b3-b968-1f6ff05796ef	1	Other	Other
+8d3de4d8-3cd0-44aa-96fc-b273d1837f4d	1	Other	Other
+8d3df3c7-c25f-4666-b813-efe293e9588e	1	Other	Other
+8d3e3b66-2592-4d34-b919-32ed1eb315c6	1	Other	Other
+8d3ea710-8167-4bb3-b47a-86ada82a8dd1	1	Other	Other
+8d3ec30d-e089-448c-9bf2-44493eb995ff	1	Other	Other
+8d3ed7e7-75a1-46c2-b78e-58746680f147	1	Other	Other
+8d3eda78-cc87-4d09-b2ad-0b1ea4f3ef0b	1	Other	Other
+8d3f1de5-d282-493a-964d-2633221eaf5c	1	Other	Other
+8d3fb84b-b06a-4e65-b7b9-cd8a6f195c10	1	Other	Other
+8d4006fe-0b2b-48d1-a23d-9f48c7dff86b	1	Other	Other
+8d401b69-2689-448d-9af3-ff0d206ed8a9	1	Other	Other
+8d40dc33-1340-435d-8b50-5f3a2d95a5a8	1	Other	Other
+8d4104fc-a4b0-4459-b380-8f620aa6cf23	1	Other	Other
+8d4111eb-1ea6-4f2f-b963-61b494584b55	1	Other	Other
+8d415ad4-413e-418c-8451-cdf3f940dc2a	1	James	Other
+8d4165e7-8048-45ed-b4d3-29b99dfc13dd	1	Other	Other
+8d41662b-aadf-42a4-b72a-34fabdeb950c	1	Other	Other
+8d41888d-92da-4fa8-9231-7c32eed615ae	1	Other	Other
+8d418bde-57f9-465d-8909-2c5baaf0c290	1	Other	Other
+8d41a6bc-9dd3-4b39-b10f-d84c63bcc02c	1	Other	Other
+8d41af05-eb98-4c40-995a-d6fa32a47493	1	Other	Other
+8d41cd15-f7a9-4aad-a986-6159ec45f50c	1	Other	Other
+8d41e6b4-2cf0-4d6a-882b-b8de65f57d46	1	Other	Other
+8d41f69f-19fe-44d5-a9c2-9ef977a3992e	1	Other	Other
+8d425529-2f57-4b1b-b4e6-fc095ee8e010	1	Other	Other
+8d42670d-3d68-4845-849a-376a92e1c5e7	1	Other	Other
+8d429e6c-aff7-44f4-8bab-5ce97b8f52b0	1	Other	Other
+8d42d790-b1b1-4ef2-a7bf-7f4557cb5297	1	Other	Other
+8d432bd9-6008-4a27-8267-54b5060be2bf	1	Other	Other
+8d43462d-231b-4e97-9428-ba4f9333fcc3	1	Other	Other
+8d434a96-8ef0-4466-9402-7b54e223f2b7	1	Other	Other
+8d437b7f-6f94-441e-a54a-fcb81b67080e	1	Other	Other
+8d43b737-4271-45a3-a87c-8c2be53a8c67	1	Other	Other
+8d43d6c6-0f83-45be-a6df-77ddb19f6e1e	1	Other	Other
+8d43f36b-e6ac-430b-953f-79f5e1e35cca	1	Other	Other
+8d43f947-1307-4626-8176-fa900b7d01a3	1	Other	Other
+8d4481b9-58d6-4f3b-baab-ade1b6f8c4fb	1	Other	Other
+8d448871-6e96-444f-9aa8-9f3beaa3b920	1	Other	Other
+8d4495f2-53bd-45a0-a6f5-262fffee6a9a	1	Other	Other
+8d4544d8-144c-4b9d-9be9-6ba5fc7d3e4c	1	\N	Other
+8d4606f6-379e-4551-9710-b0bdf114fcf0	1	Other	Other
+8d460ccc-3b90-4303-b605-9b34c7fa9346	1	Other	Other
+8d462465-bc0b-48f2-bc22-a92e060be047	1	Other	Other
+8d4648a2-74f8-497a-9bad-26b0417487b2	1	Other	Other
+8d46590d-b5c2-4c6b-b78b-42b88095e447	1	Other	Other
+8d46ba5d-32b3-4288-a840-f3b6c41ddcf7	1	Other	Other
+8d46cb80-6ba2-4481-992f-e7e3de2c20af	1	Other	Other
+8d46e3e9-445c-485e-87ab-8a56c7e1aaec	1	\N	Other
+8d472102-9e93-4fef-a617-006dbcb95a5d	1	Other	Other
+8d4734cc-a818-4013-ae3c-a35628d5443e	1	Other	Other
+8d47396d-2de5-4dca-bb88-41f8e6e704e1	1	Other	Other
+8d4749ac-273e-4900-9af0-abbbe537a8e1	1	Other	Other
+8d474d00-8cd7-4704-b25b-cb3b0032422e	1	Other	Other
+8d478687-a843-4823-a54a-b3cd549e3483	1	Other	Other
+8d47a878-0a86-45c5-818d-01b5f6ac8130	1	Other	Other
+8d47a891-495b-4d93-b09a-2a85208d2b54	1	Other	Other
+8d481ade-da97-4cf4-a333-babc63e953f7	1	Other	Other
+8d4842c3-88ca-4d65-b666-bd1ff3827156	1	Other	Other
+8d489367-68d1-41b3-9b63-62ef3f97a18f	1	Other	Other
+8d48e64f-68c0-4c19-932e-06274b928de9	1	Other	Other
+8d494104-7998-4358-a25e-91c0e3f7c6b1	1	Other	Other
+8d495d9f-e35d-457e-ad31-0951ee1ab282	1	Other	Other
+8d49860a-166b-4cc1-8b0a-551285983d00	1	Other	Other
+8d49866b-062c-4475-9a33-6219d078e1d1	1	Other	Other
+8d499f83-12a2-4abc-8941-30698d71317c	1	\N	Other
+8d49a278-a657-4c65-9db5-8e51df301232	1	Other	Other
+8d49a640-7d4f-4082-9155-b833fc436a24	1	Other	Other
+8d49b7b9-b5b4-4d33-b055-9820c2aecfa2	1	Other	Other
+8d49d245-1b5b-4009-96aa-eb08d1df7232	1	Other	Other
+8d49f85e-53f8-4452-8e47-61451c65ee5d	1	Other	Other
+8d4a37e3-7475-4043-8485-12ebd78a1068	1	Other	Other
+8d4a42ce-ec6d-4310-97c7-8e31b5d19777	1	Other	Other
+8d4a4b37-9c73-419e-8587-116b7b701472	1	Other	Other
+8d4a5e26-dcde-4123-9d89-39eb8d8350d1	1	Other	Other
+8d4a67bc-48ba-4f07-a1c7-bdbfd37e2109	1	Other	Other
+8d4a9c7f-3c0a-41d5-a004-9e604a2257fd	1	Other	Other
+8d4ad2ad-9572-4997-9914-dc15d3f8da88	1	Other	Other
+8d4af7ae-bac9-4aea-ac21-edf7e00c088a	1	Other	Other
+8d4b03ee-68fe-468d-8532-3c75cc3bd04d	1	Other	Other
+8d4b0dda-36a9-4b2b-bb6d-436f9dbf6eda	1	Other	Other
+8d4b1caf-c3d9-42e5-89de-8fbfb3e012c3	1	Other	Other
+8d4b70be-331d-4e7d-9d93-8baf1616a649	1	Other	Other
+8d4b88cf-1cd8-4a00-a625-36631ba809b3	1	Other	Other
+8d4baec1-8d03-4656-b5d3-0acf0db51139	1	Other	Other
+8d4bb951-1ad0-4813-9a1f-1c9e90a08e2f	1	Other	Other
+8d4c5822-03d0-4704-945a-c5964f72b1d8	1	Other	Other
+8d4c5899-95fb-4509-9e55-63d61c3f4306	1	Other	Other
+8d4c895e-bda8-48c1-a6ca-13b49b57ead1	1	Other	Other
+8d4cf2b7-3c0a-492d-8575-d3598ea24cb2	1	Other	Other
+8d4d3915-0ea1-4784-be42-fe2f75d0fe6d	1	Other	Other
+8d4d9057-3124-4de1-960d-44a1e895ae17	1	Other	Other
+8d4dbfbf-9916-4586-82ba-6b93d639d55e	1	Other	Other
+8d4df311-b3d4-436a-a8b7-39ae776eb1f1	1	Other	Other
+8d4df66c-4038-4d18-9c7c-5aa67404c06c	1	Other	Other
+8d4e9d1e-f026-4510-a484-75480c69417a	1	James	Other
+8d4e9d6a-5a9f-4d89-adc6-30af5c951602	1	Other	Other
+8d4ede76-d502-4daf-9169-fde6f087ce04	1	Other	Other
+8d4ee89f-ddc0-4b6f-93a0-cf750e9b2686	1	Other	Other
+8d4f5826-e2c7-49c0-9181-0c356d82af0e	1	Other	Other
+8d4f93a7-bf05-4787-9f9f-4cbb7a7035a5	1	Other	Other
+8d4fa518-bab6-4402-a78e-8cc10b1a9006	1	Other	Other
+8d500a05-d4f8-4908-8cae-4380fb18e319	1	Other	Other
+8d502375-26ad-4ab6-8d5c-9154fa1a0bc6	1	Other	Other
+8d5051ff-b61f-481d-b578-aceeacb7526e	1	Other	Other
+8d507bcf-a71e-47a6-aec0-7e411997073d	1	Other	Other
+8d508af6-0bfb-11e8-a966-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8d50a172-54fa-41c1-9e81-0aff5cc1b47a	1	Other	Other
+8d50cae6-1f07-489f-a537-694ea3ab99d4	1	Other	Other
+8d50f5d6-c5a1-40d2-b876-4ac9c9fe1b59	1	Other	Other
+8d5148df-9355-4e2a-86c5-e8c414aab065	1	Other	Other
+8d51616e-5eba-496a-bb48-f5ab610498f6	1	Other	Other
+8d517859-e20a-4619-86e5-08ee26ab6dca	1	Other	Other
+8d519190-9469-4bee-96b5-1d4ca504590b	1	Other	Other
+8d51b9bd-3239-4f43-952e-26ea1d197e22	1	Other	Other
+8d51ef47-62e2-4e5e-8348-8433c5598afc	1	Other	Other
+8d52183d-b208-4b81-ba1e-c847831f8404	1	Other	Other
+8d52a14c-af1f-4a20-8457-5236ecadc1ad	1	Other	Other
+8d52d0a3-d2b0-4a5e-af34-64b937939364	1	Other	Other
+8d52f54c-ce26-4a3b-8551-4cac2da95dcc	1	Other	Other
+8d530a42-cfb5-4c3e-be5c-87a3d25eb83d	1	Other	Other
+8d530c1d-e2c7-4cdb-a73e-4bbcf59c8dae	1	Other	Other
+8d535132-d589-4c22-bb49-9b017ad977fd	1	Other	Other
+8d538503-6527-48a7-b477-93378a22f27e	1	Other	Other
+8d53a3ac-c104-40df-953d-00652720c92d	1	Other	Other
+8d53b5e1-5acc-496c-af4f-adf38ca63e0c	1	Other	Other
+8d54256a-7300-49b3-8e2e-81d5474daa23	1	Other	Other
+8d543dfa-20e5-4ca9-b1c0-aae58313cccf	1	Other	Other
+8d5450fb-5471-4624-8669-b5b34f2901c8	1	Other	Other
+8d548222-7764-4b19-8769-0669a6f6ab0e	1	Other	Other
+8d548a1b-5a0e-4568-824d-d7172498a06d	1	Other	Other
+8d549f6b-ead8-433a-9554-4cf7cd4411e8	1	Other	Other
+8d556f4b-73ae-4328-9dfc-665e12ad8d5e	1	Other	Other
+8d557a6e-05a3-4159-bb0c-29db06cffd62	1	Other	Other
+8d5650b1-66f3-426f-8839-8351a515b3a2	1	Other	Other
+8d565d00-dc4a-4c81-92ad-4be6d0d586c2	1	Other	Other
+8d566342-0c20-449d-9325-526d04301b47	1	Other	Other
+8d56d690-0247-4f47-83ca-c833530f4b78	1	Other	Other
+8d5701de-5c71-4ace-b779-02070fbe8122	1	Other	Other
+8d571401-35aa-449d-8905-f5da2ce6b54a	1	Other	Other
+8d572766-21ab-48bf-bb8c-2af037ee9986	1	Other	Other
+8d5730ca-2b6b-4929-9de3-409bfa6f5d71	1	Other	Other
+8d573958-ebb8-49ec-bee7-aee83354cfba	1	\N	Other
+8d576977-c88b-4960-90b3-6d4f293cd2a0	1	James	Other
+8d577593-8eda-4bb8-abc1-b91c1000cc8f	1	Other	Other
+8d5783b3-8d91-4e02-a432-a1233baec8b9	1	Other	Other
+8d57ab38-5b4e-4764-9a15-11f7f1e6ec2d	1	Other	Other
+8d57e9bd-c046-4f11-9c29-8b74dd554fec	1	Other	Other
+8d5807c7-32e1-4b5a-8380-263f60e62397	1	Other	Other
+8d580997-1558-411a-973a-e760ad2d2ea9	1	Other	Other
+8d581a63-f78f-4d4a-8219-593c0a452d0c	1	\N	Other
+8d5855d4-0f71-4746-8a0d-20ee271e1cdd	1	Other	Other
+8d586756-c63c-44d3-ba51-5e95c171e4ce	1	Other	Other
+8d589ef2-c549-4dad-afeb-1d57212e601b	1	\N	Other
+8d58c2f8-b255-44ce-aeec-02fe16dfaf53	1	Other	Other
+8d58ff17-83d7-418a-bd98-8be5c51f1b78	1	Other	Other
+8d592a16-5830-4e9e-bcf5-f553c710b2cb	1	Other	Other
+8d59c346-188b-477b-88bd-a1bfadef75c2	1	Other	Other
+8d59d511-9cf8-4f18-9953-b6e510a69a33	1	Other	Other
+8d59d94f-29b6-4b25-b7f7-c13f5b2e8e26	1	Other	Other
+8d5a0857-15ec-416d-bbef-fa956a97a02d	1	Other	Other
+8d5a2012-6107-4ed8-bd51-1c317eb5c08f	1	Other	Other
+8d5a2136-6ed4-474d-a72c-e899a5c9b1ec	1	Other	Other
+8d5a2a10-b144-47d4-bb69-dd162bdae53f	1	Other	Other
+8d5a2f8f-0760-4594-a60b-bab16518b58f	1	Other	Other
+8d5a4615-61d1-45d5-96e8-d339305e41a4	1	Other	Other
+8d5a7b54-986e-4ce4-b7bc-ede53d0f5e8a	1	Other	Other
+8d5aa67e-08a6-42bc-9ef2-53214502663e	1	Other	Other
+8d5ac10f-42a3-4cba-bb16-45f8b73d5c0d	1	Other	Other
+8d5ac7c2-8b0f-4e5a-b766-e0feaca7c911	1	Other	Other
+8d5ac829-abc7-45f9-a135-cb7362dd487b	1	James	Other
+8d5bc270-f261-41a1-bccb-94a6e3553bf2	1	Other	Other
+8d5bdbcb-3b35-4675-8a47-f913391f922f	1	Other	Other
+8d5c59d2-03b0-4a52-8eff-b2b5922978c7	1	Other	Other
+8d5c95fa-22bb-4725-b861-fd89fb08ac38	1	Other	Other
+8d5d0d0d-27ad-42e9-a4fb-ef764eab398f	1	Other	Other
+8d5e1ee2-3eae-411f-8922-1049c58dafb4	1	Other	Other
+8d5e261a-31e5-49c2-8b10-2b9d53ddf7f7	1	Other	Other
+8d5e725e-91ef-4f5a-a347-f39f5dd17cef	1	Other	Other
+8d5e7c52-f3e7-4e2c-9bbb-a3621b9ac3a7	1	Other	Other
+8d5e9d41-b0ed-4a0b-ab8c-ea0c79247363	1	Other	Other
+8d5f57cd-8d84-4d65-a1d8-67f39d0dbf72	1	Other	Other
+8d5f74d5-d20c-4a01-8a32-b51f56b47d72	1	Other	Other
+8d6023d3-cb9e-45e5-a165-a8f41bf7f5ba	1	Other	Other
+8d60276a-8b90-4a1a-af93-0b45e5bdcbd9	1	Other	Other
+8d6031ea-ce53-4eb3-aa3f-c5df2589c809	1	Other	Other
+8d60500f-bdfc-437f-9d7b-6fdafba67268	1	Other	Other
+8d605f99-3396-4ba6-b0d5-a41aad32c5aa	1	Other	Other
+8d606598-32b5-4ed4-a82c-0e42a594255b	1	Other	Other
+8d60769b-1726-40f8-8a55-1bd77c3bc226	1	Other	Other
+8d60db15-c106-4526-bd80-01a608ca0380	1	Other	Other
+8d60f8a3-4ef5-4a8a-8bab-dc01628d45d2	1	Other	Other
+8d61183f-a913-4354-ba2e-598f39bcce8d	1	Other	Other
+8d616764-77ac-4495-afa9-2065255f69a0	1	Other	Other
+8d6190aa-9676-4b12-86f4-cb1d3ee52cad	1	Other	Other
+8d61d91b-2413-400c-9ce0-f2c8cacd9bbb	1	Other	Other
+8d61e2f0-4bf6-4906-ac02-3cfa0155a72d	1	Other	Other
+8d61e94a-3d6f-4e54-b3c4-63f23d610853	1	Other	Other
+8d621aaa-eda9-48c6-a41f-c3f82d49f205	1	Other	Other
+8d627586-3010-49f5-ab47-e0bd22076689	1	Other	Other
+8d62b3e4-505e-4fce-8807-08f4b1aaae77	1	Other	Other
+8d62bf1f-53ad-48a6-bce8-f65c50d3a42d	1	Other	Other
+8d62fc47-a6ce-4ef0-9bc2-080e6dd290d4	1	Other	Other
+8d630728-7555-4028-83f5-33705fbfaf40	1	Other	Other
+8d642619-7b13-45c4-b05f-56015886211f	1	Other	Other
+8d6441b2-12df-46c8-b6ae-d38c6c8c22af	1	Other	Other
+8d648dbe-8593-4555-9c4e-6af71b38de45	1	\N	Other
+8d6495c7-741d-4422-8479-9aee129541f0	1	Other	Other
+8d654c20-5e56-4292-a3f6-70a7617c19e7	1	Other	Other
+8d656376-387b-4f24-b846-1e02daa70113	1	Other	Other
+8d658774-7d99-4f7d-abdf-5a264304053b	1	Other	Other
+8d660703-f22a-49dc-a3e0-83f8f8980eef	1	Other	Other
+8d66389c-27a8-4263-8601-e90f0b1b47ff	1	Other	Other
+8d66af77-b4ea-41a4-b713-c1406eb5c1c4	1	Other	Other
+8d66b356-05f6-4dca-8237-cd10359abd61	1	Other	Other
+8d66fb2d-ef39-4fb6-82c4-572eab673da9	1	Other	Other
+8d670732-b662-4e7a-8184-3b29fadcdffe	1	Other	Other
+8d6712bb-e35b-45e2-987d-5f8c38688f71	1	Other	Other
+8d67a5a2-3171-4f0e-b55f-23247964bc29	1	Other	Other
+8d67a605-4d49-400f-bda1-1b75e6716fd1	1	Other	Other
+8d67cbc9-03d5-49a7-9a8d-47317af34ca7	1	Other	Other
+8d67ec24-c3f9-4403-95f6-3f240a7fd898	1	Other	Other
+8d67effd-4056-4da6-ae19-c6332e8872c3	1	Other	Other
+8d6801df-b9d9-4329-91d6-9ebdc6561f96	1	James	Other
+8d683896-2077-47c3-9336-85b87d732f19	1	Other	Other
+8d6843bf-3888-4515-93ba-fc31dc37f52b	1	\N	Other
+8d68a8e4-1e48-494c-817b-25f98b35e241	1	Other	Other
+8d68b706-740b-46a7-b8cf-bdee18459802	1	Other	Other
+8d68ef9c-65ba-44a9-b604-bbfd18d0132d	1	Other	Other
+8d691f21-3262-4cdb-9edd-e5f7c2ecdaa0	1	Other	Other
+8d695e97-702c-4f32-ab6e-5f60a74acc9b	1	Other	Other
+8d696238-f660-4fc4-a871-2cfc9eef3f14	1	Other	Other
+8d699666-7e09-49d4-a4dc-59101720aa50	1	Other	Other
+8d69e847-b182-449e-850e-36357211535c	1	Other	Other
+8d6a0146-526c-4e1f-b037-1ba7fae2ea69	1	Other	Other
+8d6a2087-ffbf-4429-9d6b-a58c49b8a9bb	1	Other	Other
+8d6a5f93-eb89-422f-8868-bc5db99a0851	1	Other	Other
+8d6a6de6-8df9-4bc5-8ecf-0751cb6a337e	1	Other	Other
+8d6b48e6-0d87-4398-8f04-2b358e5a7a9c	1	Other	Other
+8d6b9fa5-515f-4364-8d17-dae1fe55458c	1	Other	Other
+8d6bcbad-9e92-43cc-8522-4256cc1767e3	1	Other	Other
+8d6c1986-647d-448f-a366-2b8019ccf93d	1	Other	Other
+8d6c3cce-d77d-4fd4-bfe7-79fd2a3a715f	1	Other	Other
+8d6c510e-ee30-4074-9595-c15fa4c58407	1	Other	Other
+8d6c53e3-5f79-46dd-8855-c74c81fdb26f	1	Other	Other
+8d6c6ac5-2aa4-4a62-95a2-4d845f3c9df9	1	Other	Other
+8d6c6d3f-5dba-4f06-b0dd-1d22a9c86d0a	1	Other	Other
+8d6c8bd1-42bc-4f00-853c-fd59ceae2161	1	Other	Other
+8d6cc3b1-3987-407d-bcb5-97406e8d6617	1	Other	Other
+8d6cd70a-95c9-42ba-9a1a-15af40178b21	1	Other	Other
+8d6d3718-32f1-4e8b-9c22-22328baa27d7	1	Other	Other
+8d6d6c09-0c63-41de-ab74-741d8fa48593	1	Other	Other
+8d6da662-5a07-4228-ae51-cacc4043b660	1	Other	Other
+8d6dbc98-aaec-4e2b-8451-cc0856552c4f	1	Other	Other
+8d6dc41b-641b-4db0-b6c6-2e43dd99aa02	1	Other	Other
+8d6dc5db-fea0-4e3c-a549-4174cf573d6e	1	Other	Other
+8d6deded-29f1-44e9-860c-424ea8f94e0b	1	Other	Other
+8d6f0110-ce3d-4685-9bf0-f2af26796293	1	Other	Other
+8d6f29ed-00d0-4bb5-a22a-49e279c421e9	1	Other	Other
+8d6f428e-3e37-4f3a-9fd1-1e3f30c395fb	1	Other	Other
+8d6f844c-6d9a-4088-a69e-7e21472471c5	1	Other	Other
+8d6fd68a-e291-45b4-9964-ba27f3c47dc2	1	Other	Other
+8d6ff6a0-a0bb-4a7f-b953-fdb32a2ed4e2	1	Other	Other
+8d6ffde2-9a39-457e-b384-acc46fe7af6f	1	Other	Other
+8d703df3-bf5f-4ffa-9b10-03f02c27d771	1	Other	Other
+8d70432d-a05a-4050-9fb1-07cbf7c85a63	1	Other	Other
+8d705c02-f5ca-4675-bf1e-0fbdc7835147	1	Other	Other
+8d70dff7-c7f9-4981-8e65-8144b2048bfc	1	Other	Other
+8d7157fc-b983-4445-b8d8-9cfc477aa1fd	1	Other	Other
+8d71a64c-b5d5-4e76-9440-22cd4fe2fa2a	1	Other	Other
+8d71b175-ed15-44e9-ab91-b69e12b0c707	1	Other	Other
+8d71b788-071a-4d99-b781-d8629e26dac7	1	Other	Other
+8d71e210-4726-4589-a68d-c2e18c277725	1	Other	Other
+8d71ecf3-c484-4530-91e2-6fc3821eb3e8	1	Other	Other
+8d71f0e5-d947-4a71-9895-f6fd762d41a9	1	Other	Other
+8d72190e-58f3-4d41-b9ec-f24aac938e62	1	Other	Other
+8d723a06-ac53-4cde-a904-010cb8b030d3	1	Other	Other
+8d731f83-e919-40bb-9051-869216b38693	1	Other	Other
+8d740744-4132-4aad-903a-10558f44033a	1	Other	Other
+8d741164-4a65-4d34-8ed5-27ecc4c5bd74	1	Other	Other
+8d744a64-2460-4106-b2a4-6d9e5441213e	1	Other	Other
+8d74cd5e-9b75-4913-8937-9575c1c431d4	1	Other	Other
+8d74f743-9aef-4daa-a244-11ae644c4574	1	Other	Other
+8d75412b-f8dd-4edb-b6af-32a48b427d13	1	Other	Other
+8d75478a-d64a-462e-bd73-16973ca6c734	1	Other	Other
+8d756fe9-b0c1-4586-b92a-a6d5270e31e9	1	Other	Other
+8d757dff-30b4-4d91-8bd8-5b1328023c99	1	Other	Other
+8d758d8d-d7aa-40f4-a60a-e6963475299b	1	Other	Other
+8d759842-0377-44f5-849d-5228ceaac5f7	1	Other	Other
+8d75a74b-0444-48c4-99a3-a884e70ad88a	1	\N	Other
+8d75c3bb-1cdd-479c-8062-7a50a6de7642	1	Other	Other
+8d75e0e3-4851-4138-b2f9-f6dec65f4768	1	\N	Other
+8d75e41b-c6ac-4030-88e5-97627dd53cee	1	Other	Other
+8d764d51-6628-4b4c-992d-893a75d90312	1	Other	Other
+8d7662a2-ca76-465f-8426-53f541388d85	1	Other	Other
+8d768079-4615-42f6-acf6-a50361548ab8	1	Other	Other
+8d76896c-8278-4a97-a26c-b805a64880dd	1	Other	Other
+8d769e33-32ab-473e-848e-54894ac7ef20	1	Other	Other
+8d76f399-37e8-4343-917f-279fbf937a2b	1	Other	Other
+8d770fdb-02c5-41fa-8606-efc3a965fc61	1	Other	Other
+8d772022-c20c-4f7b-b04f-303400cf2241	1	Other	Other
+8d77b714-6d7d-48e1-adc3-513c240083de	1	Other	Other
+8d77d855-faa7-4130-b327-da9db72f46a7	1	Other	Other
+8d782bd5-2c2b-4bc7-8124-a6cf9940f229	1	Other	Other
+8d784c43-63b7-4429-bd57-bfb59ee6e99a	1	Other	Other
+8d786936-5884-4532-9432-329d642ef83b	1	Other	Other
+8d79a595-5478-43af-abd6-4f8ebd4da3e4	1	Other	Other
+8d79da60-f474-4358-840b-4632877d0cc3	1	Other	Other
+8d79ee43-222a-4287-8109-8dfed7f70e11	1	Other	Other
+8d7a0a71-1ce7-490b-b27c-11df880bf4ae	1	Other	Other
+8d7a610a-05ad-48bb-bb3e-4a9ec8318659	1	Other	Other
+8d7a88ef-54a2-4d25-8f39-f691fc3ed8a8	1	Other	Other
+8d7a8d05-2952-49e6-9112-76ae16634c16	1	Other	Other
+8d7a9d4a-dad9-4973-ac07-70d6cde64b24	1	Other	Other
+8d7b0e76-59ac-4a5e-aac1-1fd44fa83627	1	Other	Other
+8d7b74aa-ddf8-4c39-8f6d-eb2ab1ed85ca	1	Other	Other
+8d7b8a54-f321-41b5-8e8d-82e2ee99038e	1	Other	Other
+8d7bcb70-7412-4786-89d6-74362ae980d7	1	Other	Other
+8d7c04b8-d622-4d60-a4fa-2c6828a1ffd2	1	Other	Other
+8d7c4dd9-5dd1-4d56-9e55-3b9789296cc2	1	Other	Other
+8d7c8fa7-f222-4f2f-9fc1-3e7f80faf068	1	Other	Other
+8d7cb9c0-41a8-4041-bf39-d1711919c792	1	Other	Other
+8d7ce6a0-6892-4ebc-8dce-feebee47078b	1	Other	Other
+8d7e133f-f610-4009-86f2-f561e71a6499	1	Other	Other
+8d7e306a-080d-11e8-8eed-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8d7e36ba-975e-4ec5-b35c-10c9e113330f	1	Other	Other
+8d7e589a-0fcf-4c7e-9b6a-718783758b3a	1	Other	Other
+8d7e8a68-a4af-4c97-974a-3471dd2ea72c	1	Other	Other
+8d7f1620-e95a-4a37-a45b-d465bd16f6c9	1	\N	Other
+8d7f6dfc-6384-4e5f-a08c-bb0b583d5318	1	James	Other
+8d7f7e4c-b206-46a2-a7e3-aa73d7f00f8f	1	Other	Other
+8d7f9f57-8797-4f2a-8a1c-b51081dd82ff	1	Other	Other
+8d7fd1a7-301a-4d68-9341-244169d76a8d	1	Other	Other
+8d802354-a441-4dca-84e5-36b33fe0ef70	1	Other	Other
+8d8028e2-854b-46db-a68d-ffa507f14183	1	Other	Other
+8d809b68-8634-4fcf-8aaf-e5206099b682	1	Other	Other
+8d80acad-7262-4a4b-b50a-25e2752cb3ae	1	Other	Other
+8d80e4dd-958a-4b18-9f4e-3885e9a34f3c	1	Other	Other
+8d80ec71-2feb-4a5b-80f1-93f76a0a04c0	1	Other	Other
+8d810cb1-c739-4ec1-83d6-7f05fba45a64	1	Other	Other
+8d81249f-d8e4-4ae0-b2ae-a9a0f368c6e7	1	Other	Other
+8d8147b7-0b7d-4b78-b445-f8d28ca838d2	1	Other	Other
+8d815b98-d37d-44f2-b230-12726182435e	1	Other	Other
+8d8165a9-dac2-4cc3-9446-9a96240f7fc6	1	\N	Other
+8d8172ce-01d9-4d36-8e61-2809c496abbe	1	Other	Other
+8d81aaac-2752-4f11-bae0-0e6532ce0623	1	Other	Other
+8d822b10-c495-4288-bf3d-c40ed25caed3	1	Other	Other
+8d822e32-e06c-41a3-963a-ebaa9252e640	1	Other	Other
+8d826613-1255-4f5b-976e-a5abc93232c4	1	Other	Other
+8d827912-e413-4f8c-8bcb-ed786cd962c7	1	James	Other
+8d82f4de-89b1-47f3-9a66-fb22e295632c	1	Other	Other
+8d82fd69-7d28-4614-a2e0-7a05cd9f6832	1	Other	Other
+8d83093d-2d67-4dda-ba47-14cfd38b7bcf	1	Other	Other
+8d831ef3-eade-4b82-ac7b-39848c4570eb	1	Other	Other
+8d835881-a3ed-4e5d-a399-666a09d1c140	1	Other	Other
+8d83da9f-0e6a-411b-ab1e-6cc865b35391	1	Other	Other
+8d8421ec-53b4-42f5-9693-b09f92bea4ff	1	\N	Other
+8d843de6-b46c-4941-a27d-7f4ec695148f	1	Other	Other
+8d846c05-2635-4d46-88b7-58e7bc79ce79	1	Other	Other
+8d84b12a-62a5-4be5-b3c9-ccced24a897f	1	Other	Other
+8d85c2ab-1945-41f5-9226-1813b61b51b7	1	Other	Other
+8d85c9c0-cc48-44f6-9456-33acd5ed0b36	1	Other	Other
+8d85edcf-2a86-4610-bc0c-dd9ad1a82280	1	Other	Other
+8d862c22-8a7e-4733-880b-876cee87a0ce	1	Other	Other
+8d86685c-4ab0-4bd8-8c15-98f69482e537	1	Other	Other
+8d867649-36d1-444b-9e2d-d5e258e9cc08	1	Other	Other
+8d86aa9a-c0ca-40e2-8ee9-2619ceaa5160	1	Other	Other
+8d872f31-a2fb-4309-a43f-5c683b8bba38	1	Other	Other
+8d875585-0856-4a88-b990-634c222d0fe8	1	Other	Other
+8d877f7a-e957-4cdb-b848-321a72f942f2	1	Other	Other
+8d87b702-d7e8-4c3d-abd7-2bd6c15a803f	1	Other	Other
+8d87ccd4-b66c-4f5f-a346-558160609b41	1	Other	Other
+8d87ebe2-b633-4248-b6e9-adffee1946e3	1	Other	Other
+8d885420-0618-445e-ad0a-31a1946baf06	1	Other	Other
+8d888d67-1d61-4922-9a0a-d812cfef1959	1	Other	Other
+8d888e90-15dd-42de-b70c-8f714aeb4a82	1	Other	Other
+8d888efc-a459-4f17-9168-ffa56d842b36	1	Other	Other
+8d8898e0-b759-43c9-9e6c-7a4b90a8e239	1	Other	Other
+8d88ceec-3912-4c09-af01-2bcf8974a966	1	Other	Other
+8d88d41a-450b-40b1-b102-3d7a2972ff07	1	Other	Other
+8d88e553-68ae-4dae-9ff6-0e5f79b80068	1	Other	Other
+8d88e5d6-37c9-4dc0-be06-2b7ac5cbf322	1	Other	Other
+8d88f037-1245-42a9-b643-42d43da26844	1	Other	Other
+8d899ac2-2624-47dc-94bc-3533efd41db1	1	Other	Other
+8d89a506-ec55-4250-8374-5ddf75f50882	1	Other	Other
+8d89b4c1-f533-4505-b79d-08a64c53af92	1	Other	Other
+8d89d792-5513-4f68-98b6-48833cf29649	1	Other	Other
+8d8a00bc-2db6-4566-841f-897c7ae7839b	1	Other	Other
+8d8a0d6d-9582-480d-83e6-9cf495b1ea98	1	Other	Other
+8d8aca74-e037-41d8-8b18-067e4e36a056	1	Other	Other
+8d8ae1fb-4bfd-45e1-b3f1-0cd4a58a5b91	1	Other	Other
+8d8b1aff-d3d3-4c2c-91b7-9070f044aedc	1	Other	Other
+8d8b3084-28fc-4471-a548-a7efcd202330	1	Other	Other
+8d8b57a3-3ee1-4883-a92e-6b9b3eaf811f	1	Other	Other
+8d8b9ac9-c0da-4088-938d-e90121cf17f4	1	Other	Other
+8d8c21c7-e5e3-44c5-b214-ce22e3551e4f	1	Other	Other
+8d8c2a48-05d8-44c2-b198-ae9d47d18143	1	Other	Other
+8d8c4f31-05f6-41dc-9b7c-4c5c9b633431	1	Other	Other
+8d8c6ae7-0904-4d72-a946-92227492294d	1	Other	Other
+8d8cc100-b329-47c8-860b-0e5b41835b87	1	Other	Other
+8d8ccf1a-da49-4ae3-85e5-28542770b1f9	1	Other	Other
+8d8d515d-9b17-48b8-b5be-7352805f4e44	1	Other	Other
+8d8d5f16-9ad1-4d7f-ba44-66bfb2a2ee0d	1	Other	Other
+8d8d7e9c-d6fe-4d2d-ac1e-231ced79cd30	1	Other	Other
+8d8d882e-a01f-4fd3-a694-9140330d70ca	1	Other	Other
+8d8dafa8-3880-4e92-a88d-b33f774ec6a7	1	Other	Other
+8d8dc4a4-b5b2-46f8-8d71-bacb05fba465	1	Other	Other
+8d8dd795-d8cb-470e-ad94-0d40e80ab84e	1	\N	Other
+8d8df239-9cca-4c25-9fed-ad41f58ec522	1	Other	Other
+8d8e6c0f-9a35-4297-87d2-fe05d42eb2c6	1	Other	Other
+8d8ec5c8-f5d3-49f9-b5a0-fc2a81cf22d3	1	Other	Other
+8d8eec59-2f8d-4589-a266-2f5f5fad255d	1	James	Other
+8d8efd1a-4b9b-4165-8efc-3c0111dabdb8	1	Other	Other
+8d8f15ba-2448-461b-8494-094b77878dcb	1	Other	Other
+8d8f3c3f-1be9-483a-8560-89de5c215554	1	Other	Other
+8d8faf5c-556a-4033-b87f-f7f6fcfc4395	1	Other	Other
+8d8fc52b-1c98-44e2-9ed4-9d66decd27ef	1	Other	Other
+8d8fc7cb-45ec-4f66-b352-07464c494095	1	Other	Other
+8d8fe679-50a9-4629-ac0e-073117eb9c56	1	Other	Other
+8d8ffac0-5857-4952-9be1-c0158e6fdaea	1	Other	Other
+8d8fffa9-99d4-42ee-a032-12591b4bb1cc	1	Other	Other
+8d90adc9-2f56-43b7-857b-a389d7deabd1	1	Other	Other
+8d90b8a1-fe85-40e2-8aea-ee401c7412ed	1	Other	Other
+8d90cc3d-d7f9-4c3d-8b4a-c7e9f456d959	1	\N	Other
+8d9153cc-cdac-4ae5-979b-fcbbc0756ef3	1	Other	Other
+8d9153de-6fb1-468e-b0de-2c9d36fa1fe5	1	Other	Other
+8d9156b4-c4c0-4b4b-bf6f-28746e7b5c87	1	Other	Other
+8d91c0e7-d48d-48f2-a45e-05717982bcfa	1	Other	Other
+8d921add-40af-49a2-8364-7055260aac19	1	Other	Other
+8d9228d4-79e0-49f0-86da-a3cd82a06d17	1	Other	Other
+8d92453e-0205-4373-9659-95778339fdc3	1	Other	Other
+8d924890-022b-4a52-a44a-aa50f7bea2f7	1	Other	Other
+8d925121-95b8-44d4-b21b-d73107a8d494	1	\N	Other
+8d926c08-9cb5-4e3b-b4fc-efa7cbc8507d	1	Other	Other
+8d92782e-cafa-48ec-9825-530fc7af9a14	1	James	Other
+8d928e36-38ee-493a-a1ed-318009f4dd76	1	Other	Other
+8d92a2f8-df82-49ff-86c7-74415e6df822	1	Other	Other
+8d92b733-2559-45b2-967e-e04b82ed14f2	1	Other	Other
+8d93c6e2-76ce-4cb0-bd38-26149bc764e1	1	Other	Other
+8d93f044-9a7f-4121-901f-6b0a8fdf1d2e	1	Other	Other
+8d9485cc-fec4-4482-a0a6-4dc90ba7c880	1	Other	Other
+8d94b2c7-ec9c-48b5-a861-804fcdcde85f	1	Other	Other
+8d951134-39f1-43cb-b503-e6049a7f2500	1	Other	Other
+8d956176-085c-45bc-8a7f-c7a3ea4b7d13	1	Other	Other
+8d95d217-9c61-446c-98f3-ed94fd75a072	1	Other	Other
+8d9650ee-a3d8-4d64-8bc6-6b2bfcd2c0cd	1	Other	Other
+8d96c746-817e-47d6-bf9b-83c5ba3b7d29	1	Other	Other
+8d96d5f2-9ea2-4ea1-8c60-f7bfae0ffa23	1	Other	Other
+8d974e4d-7097-4120-a94a-778fd63ac7d1	1	James	Other
+8d976e95-4950-454c-94ce-d4b1ad0a4570	1	Other	Other
+8d977fcf-6251-4bc3-ac5e-53339c42fe45	1	Other	Other
+8d97cc0b-7b19-42e1-b73e-d92fa0aa23fb	1	Other	Other
+8d97f8e6-f587-455e-829f-e04de7966d8c	1	Other	Other
+8d983c52-75ec-4374-86a3-4d6aadb787f3	1	Other	Other
+8d9886e7-09db-4a42-a6f8-497894f4ca51	1	Other	Other
+8d98a601-d9c6-4d30-88d6-1068180ca42e	1	Other	Other
+8d98f4bb-8fe1-4727-b24e-37075b4b4311	1	Other	Other
+8d993a66-62f7-4540-bb4a-baddee1cfd0d	1	Other	Other
+8d9941ae-4067-4ff6-85b5-273e6980a60d	1	Other	Other
+8d994aef-d7ac-41dc-a599-68bc126ed580	1	Other	Other
+8d9960c9-2fe3-4652-8b9c-697e3a3501bf	1	Other	Other
+8d99d743-e6ed-4af2-9ced-154b1e4591f3	1	Other	Other
+8d99d932-114a-40e2-a82d-fec25ee2dabc	1	Other	Other
+8d99e0ad-ce9e-408c-9da4-bea48dcdc757	1	\N	Other
+8d99f9f7-f993-45e4-a15d-50a99897e549	1	Other	Other
+8d9a1497-b5ff-4d0c-8986-70c3e6a18923	1	Other	Other
+8d9a3502-dcf6-4e81-8965-b3973017b8d7	1	Other	Other
+8d9b39f3-d4fc-49d6-b769-05d51e9a0923	1	Other	Other
+8d9b6e8d-c6c4-468c-a099-a011088beae2	1	Other	Other
+8d9b88a5-d949-4364-953b-62d41dffd7cb	1	Other	Other
+8d9c0356-d58d-4cc9-9f7c-ac82bcf007e3	1	Other	Other
+8d9c0757-6bf3-4941-8cf3-8eb36a39dc62	1	Other	Other
+8d9c5d1a-418b-4a1f-b216-75016c1e81cd	1	Other	Other
+8d9c7e6a-36ce-4a8d-af37-1b96d5396088	1	Other	Other
+8d9cdfd2-2073-11e8-a7d0-fa163e8624cc	63dfcd94-143a-11e7-bec8-fa163e4dd901	Other	Other
+8d9ceadb-2157-43ba-ba8c-88d9e288efce	1	Other	Other
+8d9cf2e8-c162-426c-b4bc-55112da12097	1	Other	Other
+8d9cf867-a070-42be-8f2d-751e9714b542	1	Other	Other
+8d9d5015-ba9f-4ce7-bee3-a9aac727fe8a	1	Other	Other
+8d9d5633-ce64-495c-b351-2f7fc6383cbe	1	Other	Other
+8d9d83ce-4118-4d5b-97cb-f689e3e79cd0	1	Other	Other
+8d9da8f5-0413-49f0-b0f1-aabe2fb719c4	1	Other	Other
+8d9db373-f05f-4782-87f7-c46a39484015	1	Other	Other
+8d9de0f3-7669-4f93-b3a6-738ba9dca820	1	Other	Other
+8d9e2144-3aa7-4a8a-94ef-222adb964f0f	1	Other	Other
+8d9e2d7b-07f4-4103-9c5f-cff9b384a0a3	1	Other	Other
+8d9e7d57-f5a9-43e2-8709-80561f4cb3fc	1	Other	Other
+8d9e95f7-1871-47c2-a6cc-7faa30a258a5	1	Other	Other
+8d9ef258-744b-4533-a18b-7ce4cf183717	1	Other	Other
+8d9f1ce8-4840-4701-ab9c-26f309f8a8c9	1	Other	Other
+8d9f496d-7253-412c-a215-f80c115fdd87	1	Other	Other
+8d9f7b8a-9bd9-4f22-93a5-03f3bffcbc89	1	Other	Other
+8d9fa21d-2b6a-46ca-a29b-60f159bb0aab	1	Other	Other
+8d9faa21-ee21-4e08-b29b-4e816e178100	1	Other	Other
+8d9fbdad-8f5c-47bc-8fbc-507d1fb231bc	1	Other	Other
+8da00879-f05e-4faf-b123-43848b85314c	1	Other	Other
+8da01866-96c9-11e7-afc1-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8da01dd5-04f7-4c2f-92fb-e3159673a6d7	1	Other	Other
+8da06707-aa3a-4d20-a9c5-8bde91effb60	1	Other	Other
+8da0c8b2-49b7-4a9e-ae76-d7d5c91cd8ab	1	Other	Other
+8da10a01-4f7c-452e-b3ac-910240ade8df	1	Other	Other
+8da13d5f-9c8a-4135-b710-a6c1d5f65339	1	Other	Other
+8da18bbe-eb07-45c0-bd56-231dbde72b9e	1	Other	Other
+8da1e6c6-3ce2-4c2c-9441-fa1dbedbe701	1	Other	Other
+8da1ef3a-a39b-4ca9-904c-6f35d72410ac	1	Other	Other
+8da2145a-9770-40a8-b45d-d578b4135144	1	Other	Other
+8da217cc-27d4-463b-9a6d-ee414807d44d	1	James	Other
+8da26cef-6d4a-454a-9a28-6dceadf44cc6	1	Other	Other
+8da308f5-f744-48f0-9d7c-fc82f56c4aa1	1	Other	Other
+8da32fbc-b30c-4c51-9e05-1c4820b6fea7	1	Other	Other
+8da335f7-1f50-451d-933b-52f44e17571c	1	Other	Other
+8da33efe-987c-4cfa-afe0-d99e4f6f2c61	1	Other	Other
+8da35d63-8eba-45e5-b96f-1ce0970f32f8	1	Other	Other
+8da38df2-11e0-4830-a02b-0273efbbc096	1	Other	Other
+8da39bbe-78b6-4ce7-b57a-a3f7a9dac707	1	Other	Other
+8da3a6f4-ae1a-4f21-b1d4-d52b2e236f72	1	\N	Other
+8da3a907-0087-4ccc-9043-e49125911330	1	Other	Other
+8da3afae-e011-4864-b171-9930d979d29b	1	Other	Other
+8da3fed1-b89a-4bad-a541-88f5782344d3	1	Other	Other
+8da428c8-9412-47b1-aaba-7dd7c5431603	1	Other	Other
+8da45239-1276-4239-8bc7-e20c6666203f	1	\N	Other
+8da473e4-dac4-46e0-adbb-910909561dcb	1	Other	Other
+8da47b6e-5516-467e-94b9-179607a60df7	1	Other	Other
+8da4d51c-dc9d-4c98-adf0-3d7ab048703b	1	Other	Other
+8da52473-6ec5-4d05-8df2-17eaede0e928	1	Other	Other
+8da58491-0ab0-46f2-8ccc-fa004abfe8a3	1	Other	Other
+8da58d0f-f113-4174-bd2c-b781a32af401	1	Other	Other
+8da5b945-7387-42e9-9d66-996881500576	1	Other	Other
+8da60bf9-6237-4b7a-ae03-82082199341d	1	Other	Other
+8da618ca-c29e-4f3a-8fe8-eb2fdda21616	1	\N	Other
+8da636eb-121e-4de4-996c-cb03888cf061	1	Other	Other
+8da67468-dc53-4369-9dcb-b9557f14bf95	1	Other	Other
+8da6a0e4-986b-45be-974c-06e6793ba5c4	1	Other	Other
+8da6af2d-c1cb-4296-a9a8-ceabaedcfdc2	1	James	Other
+8da6af60-a73b-4380-95f9-e5434bfa1098	1	Other	Other
+8da72466-03dd-4fea-8f4d-d18e91c1605d	1	Other	Other
+8da72d52-2a13-4597-846f-d4e43fa7a5c3	1	Other	Other
+8da73015-dc39-4f8e-8f49-bfe8eb8e6e51	1	Other	Other
+8da73c8d-1065-4b6d-a91e-a22711202728	1	Other	Other
+8da74e40-f9bb-43f5-9fb7-95f9b1831c02	1	\N	Other
+8da7966e-04ff-4616-9fa9-79e5d6fdf037	1	James	Other
+8da7c7f6-b5c0-4e54-8cf8-420ca313f9b0	1	Other	Other
+8da7f00c-b351-4318-b57b-c63ca2234314	1	Other	Other
+8da7fc66-36d3-4da2-9ec5-5469829551e4	1	Other	Other
+8da85ea0-93f7-40ad-a1c7-8a2f999e42c6	1	Other	Other
+8da8e061-7481-4c71-8400-9da0fe4fe6be	1	Other	Other
+8da938d8-fd45-4ca4-80af-0b0fed2acc3b	1	Other	Other
+8da954aa-d76a-47c2-b649-ba25a43ea2f9	1	Other	Other
+8da956ca-e000-4941-a9fb-4bdd8c71efa6	1	James	Other
+8da960ee-b87c-4337-ac27-321da6f5367d	1	Other	Other
+8da9cd65-3887-4ca3-ac81-658003a2cf0b	1	Other	Other
+8da9e000-b2da-44df-a57a-ebdeb092f770	1	\N	Other
+8daac2b0-63ff-45d7-934d-0b24406513e6	1	Other	Other
+8daace72-bdd4-4133-ab2f-00c3f5a2e2a9	1	Other	Other
+8daae077-e9e8-4e23-8208-290e26a00e97	1	Other	Other
+8daae1ac-a12b-4427-9fb4-3ca97ccf0c46	1	Other	Other
+8daae26d-ee26-438c-9abf-19df8f0ba916	1	Other	Other
+8dab1051-3948-4534-aeaf-ae0d4bdb4f1a	1	Other	Other
+8dab47ff-ac85-4a5a-99b1-9552d3239e10	1	Other	Other
+8dab56eb-6b46-44e9-9930-20fffe1e0fd2	1	Other	Other
+8dab956c-fbd5-4e1e-8a89-e660ea005ab2	1	Other	Other
+8daba065-c4a3-4bf9-9c7e-eb2b2fe81e0b	1	Other	Other
+8dac1949-efdb-4b87-b81f-4966adbf09a5	1	Other	Other
+8dac1eb5-a903-4875-b3dc-7fd9d297f112	1	Other	Other
+8dac4dfd-c13f-4f26-852d-cde21e7f802f	1	Other	Other
+8dac7293-5dfe-4a2c-8c8d-8538c2a019b0	1	Other	Other
+8dacc4f4-b44f-482e-a075-0076f338f637	1	Other	Other
+8dacc89e-c5ed-4bb2-b18e-fc2ea4f806ae	1	Other	Other
+8dace6e9-dddb-4819-8673-4400ad8a82b1	1	Other	Other
+8dacedc4-fdc6-45c3-997e-571aa3f1a66b	1	Other	Other
+8dad0b6b-e769-4349-a7f9-c626d5f4522f	1	Other	Other
+8dad5eea-045c-4f9b-80be-b46f3d961742	1	Other	Other
+8dad7d03-aa9e-48b4-9f81-f7e3e14e66c1	1	Other	Other
+8dadfc1c-e5e8-49fb-b590-850e7a9e2f79	1	Other	Other
+8daedf24-2daf-45c1-a9d6-fa7d7a1bfcf9	1	Other	Other
+8daeeed0-a089-46c9-abda-c64f444832d1	1	Other	Other
+8daf11ab-bba3-4800-9d60-4f580d6235c0	1	Other	Other
+8daf4b98-7779-4db5-810d-aa71da0b000b	1	Other	Other
+8daf507c-a4bc-4ba0-ac6e-4e49e2d2b4ae	1	Other	Other
+8dafa760-410f-4fdc-8f9f-eeba5691b7da	1	Other	Other
+8dafc8dc-4b16-4db1-b049-8782dee780b7	1	Other	Other
+8db01b06-0ffc-47e0-b5d3-0f234b629354	1	Other	Other
+8db036b9-a11b-4ca9-abe1-2b4fc4cedc3e	1	Other	Other
+8db0585c-9474-4bf9-86cc-c7ee1c23cc1f	1	Other	Other
+8db06d38-644d-4e1b-a121-69a052842a1e	1	Other	Other
+8db0a4a7-a9e0-4889-9ef6-e7210f83e9da	1	Other	Other
+8db0d3d0-27fd-4b94-9858-e44a0bacab80	1	Other	Other
+8db1030b-0a3c-4fdc-81c5-f33fc8032569	1	Other	Other
+8db1030d-13bc-44bd-90d4-fd87f6342645	1	Other	Other
+8db15d8f-b4ac-4f08-8a8e-9e0a7803ad63	1	Other	Other
+8db1667e-f6bd-4c6a-a38d-66d1a4973822	1	Other	Other
+8db16789-5c25-4f54-8f65-c142cda63b0d	1	Other	Other
+8db1cefa-5889-4f49-a44c-11c4d3b1cb99	1	Other	Other
+8db1d397-a2f4-4c21-9cfa-00013f8d9be6	1	Other	Other
+8db241e8-6bd3-48d7-92f9-6f66a4cffd7c	1	Other	Other
+8db24e24-7a4c-46ae-abe8-9c2100bc579f	1	\N	Other
+8db2bb9a-a6e9-4f96-91dc-8f681bca0bb3	1	Other	Other
+8db2e41f-f8ba-446f-a6d9-c012381349f7	1	Other	Other
+8db3009f-e602-4f06-b332-0f33729f9c8b	1	Other	Other
+8db303bc-d4d3-436a-866a-1996e1f76122	1	Other	Other
+8db329c1-4bf4-4e5f-9ca6-5f4a61d1abee	1	Other	Other
+8db32c93-b1bf-46ae-9426-d1174f89073b	1	Other	Other
+8db3a2db-a932-47e6-86a4-fe9255561f40	1	Other	Other
+8db3b0e7-28a8-45ef-aab8-dedabe009a7d	1	Other	Other
+8db409e0-5e8c-4eea-8833-43c74c943c90	1	Other	Other
+8db43b00-620d-4455-be4e-e35060306919	1	Other	Other
+8db43e70-fbc4-4f5c-907f-1585d3fa62c9	1	Other	Other
+8db44f50-9690-4ed7-ae28-70d896b8d189	1	Other	Other
+8db4ca5d-b4fd-4a21-8b3d-208ac0c40a69	1	Other	Other
+8db52907-c2b9-418c-b8e9-9fed9977425f	1	Other	Other
+8db52ac4-2017-4f16-bc1c-e0029a2f7436	1	Other	Other
+8db53469-c9ac-4bea-b699-d464adc42961	1	Other	Other
+8db64309-c97b-4f15-b2ef-a7459c5da734	1	Other	Other
+8db6501c-97b8-43d9-973d-d44ce2ce0336	1	Other	Other
+8db6770d-3c07-4624-b22c-83e7cd2e9524	1	Other	Other
+8db68cfd-d88b-46d3-a89c-e4acb001f3e6	1	Other	Other
+8db69010-9f57-4197-bf80-7ee10753c04b	1	Other	Other
+8db6c464-b95e-42da-99bb-aa184344fac9	1	Other	Other
+8db76fab-081c-4568-9426-26af3a7d44e9	1	Other	Other
+8db8752f-b951-4dfc-b318-e1747e6292f8	1	Other	Other
+8db8a17d-1d22-49db-89a2-96942da86503	1	Other	Other
+8db8b439-04cf-416e-bb19-0c850b95fc29	1	Other	Other
+8db8c955-775d-4620-90ef-ba6bf14c1de5	1	Other	Other
+8db915be-fede-4f7f-be70-0c37fdc4634c	1	Other	Other
+8db92205-6065-478e-8cf4-6490aaa3c084	1	Other	Other
+8db9cda5-9db6-4414-92eb-b1908a1a549e	1	Other	Other
+8dba0eaf-c280-42b3-900b-cee162b4c384	1	Other	Other
+8dba4914-d726-4103-8cce-c750bb5b9703	1	Other	Other
+8dba5c57-ef10-4923-ac82-20670af08c07	1	Other	Other
+8dba64c4-4561-4534-9e8a-8b9ec3b8b232	1	Other	Other
+8dbae20c-9d21-4833-b3e5-6d577f287ad3	1	Other	Other
+8dbb1b0c-b6e5-418e-acdc-f73e0e157703	1	James	Other
+8dbb89de-efb6-44f6-9c32-6241bd6a3a16	1	Other	Other
+8dbc22ba-d533-4318-a6cf-3bef3a34e283	1	Other	Other
+8dbc39f7-0a67-4aff-893f-a93caac90e00	1	Other	Other
+8dbc5f80-8add-4fa1-a9cc-ac45027f41e4	1	Other	Other
+8dbc9535-840b-49fe-82a6-a5de871a4cad	1	Other	Other
+8dbcb105-5f3b-4a47-b4ef-687e75059e9b	1	Other	Other
+8dbd04be-4b35-46bd-a1b1-9b45590f39dc	1	Other	Other
+8dbd0747-8b62-46fa-912b-a93e565ba3bf	1	Other	Other
+8dbd1633-4893-4e42-bc6e-446331e4b84d	1	Other	Other
+8dbd916c-9144-435d-a144-774fa797eb92	1	Other	Other
+8dbe296e-0b08-478c-9eb4-3419dcd02b68	1	\N	Other
+8dbe2fb0-381c-465f-b143-47317d6a4ffe	1	Other	Other
+8dbeeaae-3ccf-43a2-99a8-a731ba916297	1	Other	Other
+8dbef245-7adc-4877-97df-6b69d80b6855	1	Other	Other
+8dbf04ea-1b72-485d-96d6-17fa01fa7bfa	1	Other	Other
+8dbf2a80-8c4d-4539-946a-6996ffc25720	1	Other	Other
+8dbf37fc-7c7d-4cf3-9dab-e2631e3ac474	1	Other	Other
+8dbf3b39-d622-4db8-9cde-97ccfb297972	1	Other	Other
+8dbf53ee-27d2-4958-9519-552fadf216d2	1	Other	Other
+8dbf66f0-d820-4517-ae1a-dbce1a10204e	1	Other	Other
+8dbf765e-917c-40b7-b043-4d2ef2230d77	1	Other	Other
+8dbf95a3-4114-455a-b5e9-1e40688a6b8b	1	Other	Other
+8dbf9960-98ad-40a8-a5ef-30da5f13c48f	1	Other	Other
+8dbfac93-6956-414f-955f-9edc2878c5b2	1	Other	Other
+8dbfb6ba-77d6-49b1-95be-9b4d086a4be0	1	Other	Other
+8dbfe286-21c6-49b6-854b-c4901d71635b	1	Other	Other
+8dc02a1a-61f7-439d-a2f3-ca59804441f7	1	Other	Other
+8dc04c3a-8e4a-46f2-9e23-3e74ffdbe02d	1	Other	Other
+8dc0b35b-5eed-43eb-ac3d-a22ad8c8bfbd	1	Other	Other
+8dc0e514-628d-4956-be11-5b869d44f3df	1	Other	Other
+8dc157b9-ff99-4c3d-8dc8-a861149f3079	1	Other	Other
+8dc170b1-18de-4948-9cff-8dbfe8d69b80	1	Other	Other
+8dc18846-16b3-42ab-a495-203d5f66ab94	1	Other	Other
+8dc1e576-ef6c-4bbc-9627-0210ced098d5	1	Other	Other
+8dc206f9-5258-481c-a33b-6bc3c5b8f255	1	James	Other
+8dc244c4-c1c4-4c28-9a54-9fd88a58963e	1	Other	Other
+8dc25289-6f52-4516-9027-96dfb210f3b0	1	Other	Other
+8dc2af77-1d35-4ec9-a586-6c4f23adf03c	1	Other	Other
+8dc3038d-d2a2-4c44-bd80-63d8a55218f9	1	Other	Other
+8dc32ef0-4f18-4868-80b1-790275900650	1	Other	Other
+8dc33cdc-aaa0-41b6-ad1c-1950d4166bcf	1	Other	Other
+8dc3a5c7-c711-42da-9a94-49d04267171a	1	Other	Other
+8dc3be8e-41f7-404d-8b51-4e85f2087e36	1	Other	Other
+8dc3f2e5-7e42-489d-a6e6-b2331c558f93	1	Other	Other
+8dc4a3ed-65f2-4bae-87f2-a9433115a7dc	1	Other	Other
+8dc4a63f-179b-4225-b6f5-1be414b9ca2a	1	Other	Other
+8dc4d59c-be5a-4927-a0b7-da25cc02b296	1	Other	Other
+8dc4d6d3-f55e-4cad-a2d5-508dc42d2fc1	1	Other	Other
+8dc4d98a-fe8d-4fc8-962c-8fce04f1fb0d	1	Other	Other
+8dc4ebc9-8f48-46d1-9bde-2c9dae980b57	1	Other	Other
+8dc4f994-1994-4ae1-8c1a-80f68c195215	1	Other	Other
+8dc51bf1-d0d1-4cb8-a477-c154b209eb33	1	Other	Other
+8dc55f89-00a6-4513-8fbf-232349f8a355	1	Other	Other
+8dc56aaf-2340-4d6c-ac29-6000018d8e58	1	Other	Other
+8dc57775-b0ec-4806-b8cb-e4ed1616e92c	1	Other	Other
+8dc58715-4e81-45c7-8354-ca132bff200a	1	Other	Other
+8dc59af4-9c7b-4e54-8961-b3bea6fa6aa6	1	Other	Other
+8dc5ce72-fb92-4e55-90bb-8dc7bacd34d5	1	Other	Other
+8dc5d65c-6a69-4516-b4fa-b0f5aa9d1a68	1	Other	Other
+8dc6b124-d572-4ccb-9bba-49a0073d8eb7	1	Other	Other
+8dc6c8be-b5c8-4e28-a2cb-d4251d494c80	1	Other	Other
+8dc6c9f4-4253-4182-aeb9-8e29ec926bef	1	Other	Other
+8dc72086-d283-44e2-90ac-07408532921e	1	Other	Other
+8dc7247c-c442-4225-bdeb-1b4c16771144	1	Other	Other
+8dc72810-cdbb-4d1d-9567-d8279ba685be	1	Other	Other
+8dc7548c-9c40-4107-9269-e2148b1577f1	1	Other	Other
+8dc75787-ca5c-4e48-96b7-f6f8c1c7eb4b	1	Other	Other
+8dc7a6fc-3084-40c7-99df-9e5679afed09	1	Other	Other
+8dc7c813-8da6-4f10-be6b-6c393302683e	1	Other	Other
+8dc7d5af-249d-4655-80c3-df138893b5b2	1	Other	Other
+8dc7d812-f467-4214-a791-82147a9c3a10	1	\N	Other
+8dc804e9-d59f-4e0e-b00e-5c23ac726b83	1	Other	Other
+8dc81dfa-ceb6-4c07-897f-5ef6e92e6b3e	1	Other	Other
+8dc82c35-3df3-4032-b362-2b18129b0bfd	1	Other	Other
+8dc83dd7-671b-4334-a57f-a90736d9f0ba	1	Other	Other
+8dc8449d-ed9f-4608-91ff-3145b2bc64f0	1	Other	Other
+8dc86e33-c404-40ea-bd42-07b11f134892	1	\N	Other
+8dc89f21-ef8b-4edc-b1f7-78b481ff53be	1	\N	Other
+8dc8f99a-98f4-4158-9f5c-07386c383b7b	1	Other	Other
+8dc915a1-b4bf-48a0-b3da-91fa5b086f9e	1	Other	Other
+8dc9279a-316b-4a67-8930-2c48f43fb6e8	1	Other	Other
+8dc9942a-587b-41f7-9e74-45e8149470b5	1	Other	Other
+8dc9995c-389a-4957-a295-ae6ea11f4dd2	1	Other	Other
+8dc9b094-b0be-449d-b197-c6ccebc6045d	1	Other	Other
+8dc9b829-7507-4b48-a807-33296707520c	1	Other	Other
+8dc9e6e4-d43c-4acd-965c-e67e049b8221	1	Other	Other
+8dca061a-08f4-4c4d-ad08-a7bef0e54cf2	1	Other	Other
+8dca55bd-1abf-45e4-9e43-8a8905bcd93f	1	Other	Other
+8dcaa78c-f903-4c0c-bd95-d3eb62174e6b	1	Other	Other
+8dcac7db-949a-4fe7-880d-79a9a869c243	1	Other	Other
+8dcb50b5-b507-472c-9754-1e879c0f5791	1	Other	Other
+8dcb573f-ca35-4f5f-9613-f97687aafb90	1	Other	Other
+8dcb75b2-7670-42e6-886c-be9cb85f48af	1	Other	Other
+8dcb907b-2be7-451f-8ae6-0d01b60d602a	1	Other	Other
+8dcb99b5-889e-4d83-84aa-73f70ee0bdc4	1	Other	Other
+8dcbd565-db5d-41f2-84bf-ed6709e352f1	1	Other	Other
+8dcbf68e-afdf-43a0-85a9-16e6899166a4	1	Other	Other
+8dcc0a6b-0dc1-48fb-bedf-0d4032f191f4	1	Other	Other
+8dcc3074-6b9e-4100-9f82-a08ff19415f3	1	Other	Other
+8dcc759e-9a32-4172-b683-3fe70606f426	1	Other	Other
+8dccc522-0cce-488c-90af-1ac6b6e94bc7	1	\N	Other
+8dccf764-680b-4691-9cb1-f9ecbe90adc0	1	Other	Other
+8dcd080d-3bc5-4a87-b3a4-c30c432f6401	1	Other	Other
+8dcd7bfc-39fe-4479-80e7-f3b50fc2d93b	1	Other	Other
+8dcd9f2c-27c6-4fb6-9c15-d734db40157d	1	Other	Other
+8dcdbd55-40d0-409c-8216-9159e5bdabb9	1	Other	Other
+8dcdf0a6-505a-494e-97ba-b1117a9ac8b1	1	\N	Other
+8dcdf8c7-21c1-4f65-a8f2-56f7e8a0e69a	1	Other	Other
+8dced238-b57d-4aca-ac0e-10d012031249	1	Other	Other
+8dcf489b-f678-4736-ac2f-3b286c44dad6	1	\N	Other
+8dcf5ae5-9674-49e8-a4a6-a5f243c771b4	1	Other	Other
+8dd0295a-aebd-4e33-aa54-137b992edf6d	1	Other	Other
+8dd02a9f-ad25-45a4-b7ac-4c6deedab72d	1	Other	Other
+8dd04784-cff4-4003-9cba-af1dd89a82c7	1	Other	Other
+8dd0500e-d285-4dc8-8cd1-381103216c5c	1	Other	Other
+8dd0544b-0f3c-42b1-8a5c-1f0af5a5f5b2	1	Other	Other
+8dd08fd5-1c8b-42ed-a7c2-a94b31702089	1	Other	Other
+8dd0b05b-6dfc-47bd-a968-ec34bc215e84	1	Other	Other
+8dd0b57f-ff3c-40b2-abf9-2d7160d050fc	1	Other	Other
+8dd0cb0c-708d-44ef-9f14-16394f6d6759	1	Other	Other
+8dd0ce14-891b-4001-a685-1a6f40feeaa3	1	Other	Other
+8dd0ddc5-4443-46af-9fe6-d9d4151ee02b	1	Other	Other
+8dd101d8-49d0-430a-82e8-447508c9d66c	1	Other	Other
+8dd11591-0073-4bd7-ae23-1a0fa2b2c290	1	Other	Other
+8dd1482a-dd90-42a2-bb12-7f3942676b4a	1	Other	Other
+8dd1742a-495c-47df-b3ed-f6a1d06565d9	1	Other	Other
+8dd17858-0bf2-4d1f-8dea-879c0c386df1	1	\N	Other
+8dd1c2ce-f30b-468e-aa5d-0b2e705fcc20	1	Other	Other
+8dd1c4f4-7e01-487e-831c-ab11fbc231e6	1	Other	Other
+8dd2bb22-37e4-4315-8440-216d0c236907	1	Other	Other
+8dd2d2ea-81f9-4c7f-878b-430bef73c020	1	Other	Other
+8dd2e1f0-369b-4427-b4c5-c26ce7bf9f0e	1	Other	Other
+8dd2ff18-5fd3-40c4-8e7a-bb83e95b1790	1	Other	Other
+8dd322b1-c5f0-45c4-8b9f-b5a8cc729ba9	1	Other	Other
+8dd36392-ab59-4370-b149-5db1bf81f703	1	Other	Other
+8dd3c988-76d7-474c-a6c7-056ad388788d	1	Other	Other
+8dd3ca3b-6508-40ae-9d3f-47cc1008c2d0	1	Other	Other
+8dd3dbab-5fcb-4850-a92f-654794b3f88d	1	Other	Other
+8dd413f4-1acb-4d0b-9a74-7a79e6beaff4	1	Other	Other
+8dd430e7-c3c9-4463-9c2b-eee94d0b3222	1	Other	Other
+8dd4603b-b741-45b3-93b3-e1679f2381c8	1	Other	Other
+8dd47c81-d706-45e7-90f8-0e49f7dede97	1	\N	Other
+8dd4e7a5-46b8-498f-b8e2-4a2295ff33b2	1	Other	Other
+8dd5572e-84f6-4ef0-b08b-abb492def5f8	1	Other	Other
+8dd58aeb-3042-48b2-a72e-320b47cad8b8	1	Other	Other
+8dd59d14-ea70-42ca-ab9b-88f8a68f7d83	1	Other	Other
+8dd5f696-4472-11e8-a758-fa163e8624cc	1	Other	Other
+8dd607c2-2ff9-412e-a599-90d819cc9631	1	Other	Other
+8dd6121e-34ca-431b-a436-e4cabb97a154	1	Other	Other
+8dd627e8-0114-4adf-8d14-7d3d9b718f46	1	Other	Other
+8dd62d90-5e90-400d-a2c4-b9da4f31a7dc	1	Other	Other
+8dd6431c-97b0-455a-acb7-ebdde3ada19d	1	Other	Other
+8dd67c25-4f9a-41d2-b785-2f85a5884e34	1	\N	Other
+8dd6b1b1-bc1b-4ddd-9cdf-2651d06ec387	1	Other	Other
+8dd6cc30-be7d-40a9-ac2b-0a6b3867c07f	1	Other	Other
+8dd73288-e24e-4a71-bdcd-6ced3623df8f	1	Other	Other
+8dd767a4-ae4a-4eed-97c1-1840b4de5fc5	1	Other	Other
+8dd7f8bb-cdf6-4bd6-848b-aac6b7d08f26	1	Other	Other
+8dd80b35-f8c8-40d3-9703-1497a19def26	1	Other	Other
+8dd88c20-0fd9-464c-8c81-ad4ae4712d29	1	Other	Other
+8dd938de-b566-4755-b873-4bb42108813d	1	Other	Other
+8dd984de-e07e-4245-bc7e-684ae37115c9	1	Other	Other
+8dd9d261-9771-4796-a853-b184410399ed	1	Other	Other
+8dd9db42-86fc-4dea-bea1-7b3a5652e32e	1	Other	Other
+8dda3141-2d7d-4009-a707-aa2c8b857dd7	1	Other	Other
+8dda3473-4bb4-47a1-9381-8fbf25806009	1	Other	Other
+8dda7f84-acab-4a20-b02f-52e7400f038f	1	Other	Other
+8dda9c5e-4b83-4198-9537-23ed1a678127	1	Other	Other
+8ddaa688-05cc-4e25-ab12-3195ff3040cd	1	Other	Other
+8ddafd08-e221-4455-ba83-fcb30b939210	1	Other	Other
+8ddb2d1d-18d4-4d42-a0b4-8ed2ab7706f7	1	Other	Other
+8ddb4a33-6994-4568-8c65-9a47f161809f	1	Other	Other
+8ddb5448-39fc-4031-b11b-6f87d2a7fe00	1	Other	Other
+8ddb59c3-6c6c-42fb-9c7c-7ab32d82abf0	1	Other	Other
+8ddbb45f-b32a-4d50-8770-23f63ca90ce8	1	Other	Other
+8ddbb60e-a27e-4c96-b3ef-2210640a7d22	1	Other	Other
+8ddc165b-ccd3-42e2-99e8-8025ca696ce6	1	Other	Other
+8ddc6c43-f4bd-4543-af5e-5056438bb75e	1	Other	Other
+8ddc7b17-557e-4fb5-941e-45c3340f2882	1	Other	Other
+8ddce2a8-273c-433f-ba52-c35c79131ff0	1	Other	Other
+8ddd071d-a33c-4ad3-b7f0-87e5b79a7558	1	Other	Other
+8ddd0c81-1fb6-485f-9f81-ca75290a5baa	1	Other	Other
+8ddd10db-8969-4161-8fff-96c9be358c6e	1	Other	Other
+8ddd9f81-3dd6-435f-af6d-a8bd744cfa8e	1	Other	Other
+8ddda68a-1aff-4ca2-b8a9-ed5789ff98c4	1	Other	Other
+8dddabe4-7929-40ef-be45-a958be2819e9	1	Other	Other
+8dddc733-9f2c-418c-b13e-c2796d53ffc9	1	Other	Other
+8dddd455-626f-4ef6-a4ba-e03b8df18d92	1	Other	Other
+8ddddf53-7d7f-4f57-a9bb-d8ae054ad60e	1	Other	Other
+8dddede5-78a5-49ff-a17a-5ddee3b7369b	1	Other	Other
+8dde1697-c129-40ed-84d3-004dcc5e88ee	1	Other	Other
+8dde97fb-e868-49ee-a3e1-f5fb9254e1b6	1	Other	Other
+8ddef32f-7349-49bd-9136-bde18b82fe5b	1	Other	Other
+8ddf0064-489d-4473-bf9e-4d12754149bd	1	Other	Other
+8ddf3a99-b2df-48ba-a774-5ef4277245ac	1	Other	Other
+8ddf4c81-3748-4810-a950-e7b9d7362191	1	Other	Other
+8ddf77c7-2d90-494b-b630-fd88bbc35c6d	1	Other	Other
+8ddf8415-cc94-453e-86c8-d78c96c55472	1	Other	Other
+8ddf9149-2504-4800-bd55-a811b3dd0754	1	Other	Other
+8ddf919d-89f6-46f6-8cbe-9e7873478293	1	Other	Other
+8ddfc6ae-8b30-41ef-98a0-0d394efc9726	1	Other	Other
+8ddfde34-3802-4be7-8850-f7511c5d4e26	1	Other	Other
+8de00689-91f4-48e2-8622-8f5723a4bd66	1	Other	Other
+8de05e84-7139-4179-bd56-8f083c9a1639	1	Other	Other
+8de0700a-ee6a-4fb2-a19a-c38cc743e970	1	Other	Other
+8de08b56-91dc-4db2-8f28-d1b8fa7d13c1	1	Other	Other
+8de08f5f-8e9d-42e8-8d71-f3c3cf1f6eee	1	Other	Other
+8de13633-8ec9-4508-9da6-273cc7281776	1	\N	Other
+8de13f37-3d72-4a51-b742-112dbc6262ac	1	Other	Other
+8de19f3e-72e3-446f-925b-bf01b337a6a7	1	Other	Other
+8de1a7f7-6610-4dcb-a2bc-b2d108956322	1	Other	Other
+8de1cafc-8a8f-4de1-8026-4203445d4512	1	Other	Other
+8de1daf9-d5a0-4b7b-b78a-45b14bc02b89	1	Other	Other
+8de1e3d2-d50a-4180-9ff1-dc61ddc933c5	1	Other	Other
+8de1e6a2-3a05-42eb-9e10-44f4b3398506	1	Other	Other
+8de2095e-647b-4f2d-ab43-a6a19bf159cb	1	Other	Other
+8de20b2c-119b-4aec-ba68-aff59f2da8ec	1	Other	Other
+8de2a848-0ee5-4e3d-b6f9-2dcc25a29778	1	Other	Other
+8de2c15e-7d40-41eb-89de-e801da732b3c	1	Other	Other
+8de2dbb2-cd7d-4171-a08f-da3107cefb1c	1	Other	Other
+8de2e29f-7880-48ab-a506-29843f1ca82d	1	Other	Other
+8de2ec45-262e-46b0-b939-416c150609bd	1	Other	Other
+8de35b3b-0bd0-4f69-a360-1a23889336d9	1	James	Other
+8de370f8-e3c4-4d5f-b5ba-31d9caa02980	1	Other	Other
+8de37403-5663-4c6b-b6fa-cd5b4e31956f	1	Other	Other
+8de375e9-3631-486a-9337-14db7b4b8a11	1	Other	Other
+8de37f87-186d-4f7d-b3c4-4259b6d2c88c	1	Other	Other
+8de3bca1-51cb-4313-8f1a-0856db6270f2	1	Other	Other
+8de4157f-9a13-452d-bf9e-69ca22805566	1	Other	Other
+8de42ffe-9571-4831-990d-16a283e4b8fa	1	Other	Other
+8de45b90-10de-47f8-981b-250c7063f71f	1	Other	Other
+8de46936-b87d-4c79-a5aa-23a231118ff6	1	Other	Other
+8de48c29-ad77-4b8b-b6a6-c1b60ee72e6c	1	Other	Other
+8de4ccdb-6ab7-46db-9d55-cf78f3c5d814	1	Other	Other
+8de4e3af-398d-4ea8-8b7f-03c812c4ca52	1	Other	Other
+8de51921-d651-4afe-be0c-b7697afa4b98	1	Other	Other
+8de54e20-07ca-4918-84d8-067e99fb7b2a	1	Other	Other
+8de55f2d-11d7-48a5-83c5-6b3042d70c3b	1	Other	Other
+8de59ff0-4ea8-42d3-a24a-b047ff299654	1	Other	Other
+8de5f8be-8bbf-45f2-b601-2528e057c90f	1	Other	Other
+8de61696-1f29-438c-a6c4-532e95e5b046	1	Other	Other
+8de62f87-1961-4435-affc-6dd527314cbe	1	\N	Other
+8de71996-9f84-4882-9f7d-c40ae3ac473e	1	Other	Other
+8de73c98-1eda-4457-a3c4-e9f8c9d665d9	1	Other	Other
+8de740a4-1e84-4464-9b87-43c2599b3fbb	1	Other	Other
+8de770ca-2b4b-46f9-b010-02f1c8421bc0	1	Other	Other
+8de7db74-b65c-480c-bbb9-9f5600ba7429	1	Other	Other
+8de824f6-27c6-4ac3-9981-aa07488f0191	1	Other	Other
+8de837c3-5031-4528-ab04-0a8bc708e494	1	Other	Other
+8de842b0-2c30-412e-aa57-23c46f2d5efa	1	Other	Other
+8de9272b-d552-4008-89d4-bbf364f13e91	1	Other	Other
+8de95ca3-d131-411d-a296-deff699e532b	1	\N	Other
+8de95ca5-92e2-4c42-9d08-98ddffd85c55	1	Other	Other
+8de988ad-304c-4a0f-a2fe-8beda8a22f23	1	Other	Other
+8de99dea-bcc2-4bfa-990b-e5484a741576	1	Other	Other
+8de9b13c-c2cd-4ac4-b542-19e341a1c621	1	Other	Other
+8de9bbec-36c2-4acf-820c-963b5cbdf0d1	1	Other	Other
+8de9e28e-ed32-488d-92d4-1182e2546225	1	Other	Other
+8dea1bb8-19f2-4357-a5e8-c7ed02748904	1	Other	Other
+8dea6975-0d71-447b-8e58-2abb688a0eb3	1	Other	Other
+8deaf145-c872-46b3-b6ea-decdd6d31710	1	Other	Other
+8deb2530-b862-41ed-8432-b41d4986bdc1	1	Other	Other
+8deb53e8-b4a6-4710-b31f-fc8ae35a6fd6	1	Other	Other
+8debaa2a-5f02-40e4-9e8d-1d51bdd9eeaa	1	Other	Other
+8debe5fd-7794-48e3-ae75-752435b03a9b	1	Other	Other
+8dec0fc2-9175-4e22-8d1d-3b80c2ad4f79	1	Other	Other
+8dec235f-4370-45af-94b9-5d76647a5569	1	Other	Other
+8dec264c-28a6-473f-89da-fce8659ccc7b	1	Other	Other
+8dec26e2-6b38-4eec-b40d-1b9c79ec4a6b	1	Other	Other
+8decb755-2f56-4942-9558-af6383d22a10	1	Other	Other
+8decc667-f68a-477d-97a0-dbe564576dfb	1	Other	Other
+8ded28eb-6a35-4961-a217-13630ed509a0	1	Other	Other
+8ded29bd-9a4a-44be-a72b-b6f146b727a0	1	Other	Other
+8ded5c1a-4286-45cd-a3f0-0d2fccb96181	1	Other	Other
+8ded5d6b-c997-414e-824d-defb20f96166	1	Other	Other
+8dedf958-341c-4756-8ab0-d177d34489bb	1	Other	Other
+8dee50fb-c56d-4483-a0ba-eed6a8ed12f5	1	Other	Other
+8dee660f-d1ee-4b9c-ac20-2cdd5bfb043a	1	Other	Other
+8dee7738-7ab5-47f8-b692-8a071fe66b78	1	Other	Other
+8dee96d1-e952-40df-af29-b5dd4aa56bc9	1	Other	Other
+8deea351-69d0-46d8-a034-395d55e3d4c5	1	James	Other
+8deea6e3-7c36-4c30-9962-ab704139c237	1	Other	Other
+8deeb324-548d-4c66-86f5-a1410d7c305c	1	Other	Other
+8deefdf9-b968-43d7-ad33-b0c0c6b07420	1	Other	Other
+8def1173-a649-4156-9c74-cdc317684bc0	1	Other	Other
+8def2f8d-02fc-4a71-a38a-1711ec64f129	1	Other	Other
+8def8f6e-bed1-4817-b190-9f8d0a6b46d5	1	Other	Other
+8def9f31-3d5f-48be-b557-53a4b3431ffe	1	Other	Other
+8def9ffc-b905-4460-8e15-2e1da542950d	1	\N	Other
+8defb5f2-4ed9-4a0a-90d5-6efc36b2373b	1	Other	Other
+8defc631-ad49-4777-be37-653fde13f659	1	Other	Other
+8df048bb-344c-4062-9501-9e2367fb8b44	1	Other	Other
+8df0679d-ec0e-456b-8266-39fc0d1db92b	1	Other	Other
+8df092f9-9416-4a6c-add0-f01e084a7b23	1	Other	Other
+8df0cabd-08d5-4c06-b625-ec43b731ea39	1	Other	Other
+8df0f0ea-e264-4980-9b3b-d6de0ac1c3d4	1	Other	Other
+8df129b0-45b6-4e32-9ac5-f3da5e75891e	1	Other	Other
+8df12d92-1b15-4c8d-89b1-c4bd309c11ac	1	Other	Other
+8df13067-55dd-47a2-8f7c-e7978fd0aa8c	1	Other	Other
+8df17569-fd32-4c09-afff-8cddaa8910e5	1	Other	Other
+8df1aafd-6631-4e87-9209-e2ddbfd312f1	1	Other	Other
+8df1b78a-da43-4b8b-9b30-068d893dc9ac	1	Other	Other
+8df1c37c-7af4-43f5-b1d8-9b1ce0f53741	1	Other	Other
+8df2356c-f69e-4931-b28b-2be221d47eff	1	Other	Other
+8df29296-609f-4f8a-8ee9-9a62fd99a570	1	\N	Other
+8df29c02-ffd0-4ef2-91b1-0ec2211b8b66	1	Other	Other
+8df2e69c-4654-4a65-af9b-171b6d90e45b	1	Other	Other
+8df2ffcb-4edd-4417-b056-1c50ed0f10bb	1	\N	Other
+8df31d9b-a9e3-4f4b-9ad5-6a24760c51dd	1	Other	Other
+8df324ea-b088-45a7-917e-4faaf57f11ba	1	Other	Other
+8df372ca-0e36-4bf1-8872-8e985a6a2f43	1	Other	Other
+8df3759c-97d4-4d7d-a8fc-1d66d29d9488	1	Other	Other
+8df39b28-3505-4129-8abf-9b197cf6e655	1	Other	Other
+8df3d6f3-20a5-4d6f-ae1c-5af7a821fcab	1	Other	Other
+8df430a6-fe59-4d06-92b0-3739aba032bd	1	Other	Other
+8df44028-d98e-41ed-81f5-d0ce8054cd10	1	Other	Other
+8df49694-1afd-414f-92f6-bbd635af6364	1	Other	Other
+8df4de5d-a9e4-4d41-910a-ca2c8d5f34cf	1	Other	Other
+8df4e082-423e-4091-ad60-18048b25be20	1	\N	Other
+8df4f062-18d5-4e5d-a128-66ac4e62b618	1	Other	Other
+8df57226-f9cf-4cb0-9db8-253537949ef6	1	Other	Other
+8df581b9-0dad-4e02-be03-248b00327423	1	Other	Other
+8df63d74-905f-4c48-8708-ef5ca343d737	1	Other	Other
+8df65c8f-2382-430b-945d-daabceb9c474	1	Other	Other
+8df66f32-b5da-4513-bc0d-e133e9c5abbd	1	Other	Other
+8df67686-c78e-431f-908e-867a80ba0c47	1	Other	Other
+8df68e86-1afd-45c3-a9e3-7487fc786e0f	1	Other	Other
+8df6aded-6950-4293-8e88-0e2ba0ed943c	1	Other	Other
+8df7dbc1-973a-438c-8d99-c3a5a7398ecf	1	Other	Other
+8df813a4-b20e-47e9-9098-1809f7ba69e2	1	Other	Other
+8df84a4f-c186-4c71-8073-152efba1d7e3	1	Other	Other
+8df86341-eddd-4d07-acce-cf240cec2def	1	Other	Other
+8df8bbc0-4eec-4f77-84bc-58ae8ee302d7	1	Other	Other
+8df8cb1c-1f50-4da6-8a3d-66bb0b227194	1	Other	Other
+8df8d79a-6929-4598-ae91-60c5ce4ffd2d	1	Other	Other
+8df95def-96c8-468a-9a3b-5b9744f6e154	1	Other	Other
+8df9a26b-8dbc-455c-88e2-118aef249640	1	Other	Other
+8df9c958-4883-4da1-bac1-c6f216d0b761	1	Other	Other
+8dfa03a9-9ad6-4876-90ec-b67035cfbf6c	1	Other	Other
+8dfa277b-d3a1-4393-a1b5-6cffae005919	1	Other	Other
+8dfa2bb3-24eb-442b-bbef-ac3be78ff506	1	Other	Other
+8dfa650b-a12d-493d-8111-d9145650a7e2	1	Other	Other
+8dfa74c6-d14a-4303-980b-5bbe458ea467	1	Other	Other
+8dfad764-e33d-4fd8-9d1e-be2ee2ea4321	1	Other	Other
+8dfaf4d2-12ea-4c47-b485-a99c2774c639	1	Other	Other
+8dfb10b2-d7dc-4e8a-9e21-f52ebfea585e	1	Other	Other
+8dfb6fe7-0df3-4b81-b858-bc6c19b4a263	1	Other	Other
+8dfb7900-bbca-48f2-950f-7b4829860602	1	Other	Other
+8dfb9a04-afbf-4aa6-bdc9-7877f1a6b624	1	Other	Other
+8dfbdfcb-fc8e-4c98-8f0e-ffaf0c68f8e2	1	\N	Other
+8dfbe784-1926-462f-bf62-07bf3ae8493b	1	Other	Other
+8dfc26de-0b4c-4ed1-a89e-a3c87b27609b	1	Other	Other
+8dfc3b03-cc4b-4f8b-8867-83e9ec47e2e4	1	Other	Other
+8dfc53c2-0d1c-4a87-a6a8-841600289a7d	1	James	Other
+8dfc6695-4233-4e99-ab50-0e6164cc9a36	1	Other	Other
+8dfc7788-8b1a-448f-aa56-656ad7596a1f	1	Other	Other
+8dfc86f2-4626-47be-97e5-b309c3c82ed7	1	Other	Other
+8dfc8c1d-3d53-40ad-8b5f-2549e902a3fe	1	Other	Other
+8dfce3cf-4dfe-44c9-8b0a-57685ff33a18	1	Other	Other
+8dfd23d9-c76e-4d06-b552-5be75bd62737	1	\N	Other
+8dfd39a0-4888-4808-aa03-6c1463ef6a69	1	Other	Other
+8dfda72d-38a4-4573-bb94-1e82541f67c8	1	Other	Other
+8dfdb3d6-9c74-4787-b02f-8f3638440dd9	1	Other	Other
+8dfdd7d3-61fd-44e3-9b8f-6844e46d00f1	1	Other	Other
+8dfddbc2-0637-4019-a744-623e55f6ce15	1	Other	Other
+8dfe1384-0e3a-4d24-b5b5-34c21f81ce8d	1	Other	Other
+8dfe1537-ba3a-4672-aefc-14b1abd7e046	1	Other	Other
+8dfe2681-1116-46a0-9003-fc9762cf11fa	1	Other	Other
+8dfe94bd-7f3d-414c-8a63-9cddde7166c9	1	Other	Other
+8dfe9909-e1c7-4d8b-baa8-1f8fecb10b73	1	Other	Other
+8dfec2ae-b857-417c-8ed2-0533bb07b299	1	Other	Other
+8dfef129-9e86-4614-af0f-3917ac5640b6	1	Other	Other
+8dff0275-aacc-47d1-b666-c02ddbdf414c	1	Other	Other
+8dff10bf-8757-4ad9-b94f-2aeac4c9eea7	1	Other	Other
+8dff1e8f-5280-4d1e-9a08-3f78f75b842b	1	Other	Other
+8dff8149-7c33-48f8-bb07-e1a2dd98245c	1	Other	Other
+8dffa0c8-e7bd-4324-89c2-b77f20a0012f	1	Other	Other
+8dffa304-d810-4c3a-946f-0000e7655c16	1	Other	Other
+8dffc639-035d-4451-a190-13b04d337b03	1	Other	Other
+8dffeb1c-0319-4546-b916-699cb34ea9d6	1	Other	Other
+8e0079d3-11ed-43cc-9761-1b6ed61c912c	1	Other	Other
+8e009dc5-cc91-43e7-96bf-6ac3f9fb9066	1	Other	Other
+8e00ecfb-188f-4f9d-8af8-6b412d11a40a	1	Other	Other
+8e01225b-b714-474b-bd3c-bc8866d24587	1	Other	Other
+8e014041-c98c-460b-abea-8ecc7c15a35a	1	Other	Other
+8e01c440-7f0c-485a-984c-7f809e865ae8	1	Other	Other
+8e02674b-d65a-4ba9-970a-33e488c54b40	1	Other	Other
+8e02c38e-c628-4373-85eb-e2d893c215cf	1	Other	Other
+8e031969-7bae-41e8-a7b8-3b2861aa5a4b	1	Other	Other
+8e036978-74fa-44fe-89cb-01316d035b1c	1	Other	Other
+8e039562-aa6c-4334-93a6-b7daee94a439	1	Other	Other
+8e039ccb-7f8c-4ec0-9c93-b207d8820074	1	Other	Other
+8e040d09-3a3c-4c3b-951e-de7dcb81907f	1	\N	Other
+8e0485a7-15b1-4e99-840d-547263c8608b	1	Other	Other
+8e04880c-b369-47de-a30b-a05219311f9b	1	Other	Other
+8e04eef9-dae2-4b51-bd00-ceab352f91de	1	Other	Other
+8e052922-a475-4816-8c18-1d5e75a55c43	1	Other	Other
+8e05a6c9-93ff-4b81-8aff-d788129d64ee	1	Other	Other
+8e064cd1-bf59-46ac-b271-ff73e89a26d1	1	Other	Other
+8e064e26-6dcd-4998-a5e2-b122830ddf56	1	Other	Other
+8e065df7-8559-44a2-920b-601c31660e24	1	Other	Other
+8e070948-0375-4678-ad98-9753fa57e3ee	1	Other	Other
+8e07280b-3c1b-4ebc-b4e8-70dc7305ff56	1	\N	Other
+8e07319d-5873-4d64-8a86-a6751dc873e3	1	Other	Other
+8e073ac2-95ef-44e9-85f9-c8d3d1ac6c6a	1	Other	Other
+8e0746f0-ba39-40fb-909b-30d10e0b5a4e	1	Other	Other
+8e07bf11-091f-4d55-a78c-298e5d9adeaf	1	Other	Other
+8e07d31e-6979-4354-819d-343d03ac7fa4	1	Other	Other
+8e081a8a-11bf-43ed-b789-33d73814abf0	1	James	Other
+8e084d8f-6509-4839-a742-df6ddb617a9a	1	Other	Other
+8e086933-8c59-4707-a632-9c9329341b5b	1	Other	Other
+8e087ee0-465f-4407-b8d9-fa0002e89331	1	Other	Other
+8e088fe0-6ea6-46c8-b35f-ba60585f6e2a	1	Other	Other
+8e089ac0-f5dc-47c7-8846-0ba9c945310b	1	Other	Other
+8e08a3b4-ca41-4a7c-af08-74ef7b26a23b	1	Other	Other
+8e09373d-0e10-43ad-849c-a5d769185af3	1	Other	Other
+8e093a56-8b60-44bc-85a8-3f43b3decc18	1	Other	Other
+8e0966f5-acf7-4dff-934b-11f1c543b1ca	1	\N	Other
+8e099dd6-a473-4b9f-aa8a-fd0c827533c7	1	Other	Other
+8e09a599-71f9-40c9-ab84-3d6822d8fc5b	1	Other	Other
+8e09d45f-d16b-4836-b260-c2ec2b3c497c	1	Other	Other
+8e0a0a0f-c455-4306-a98c-23f5d05be67e	1	Other	Other
+8e0a0d9d-258b-4b39-a497-196475007cce	1	Other	Other
+8e0a0f41-e323-4990-a953-096407a60192	1	Other	Other
+8e0a33f6-9050-4995-901f-ca6751708000	1	\N	Other
+8e0a482b-c44d-4cc6-b4b9-e06232332ffa	1	Other	Other
+8e0a674e-4238-4958-981b-8e4a15d8bfeb	1	Other	Other
+8e0a9be8-c323-4976-8c21-ae2a6b91ab47	1	Other	Other
+8e0ae6f6-1c08-4383-81cc-ec05f4bfcc4e	1	Other	Other
+8e0b2d8f-f9e2-47d5-9ee1-5f641c5067f6	1	Other	Other
+8e0b822b-9b74-43e8-8adb-544419a8161f	1	Other	Other
+8e0bb03f-0b2a-4105-b45c-b44f9aa8cca4	1	Other	Other
+8e0be6cf-f274-41b9-b00c-bf979960745c	1	Other	Other
+8e0c0564-211e-43d8-ac8b-4465ec5bc931	1	Other	Other
+8e0c6caa-1cfa-4bf1-ba0c-18cccadd8742	1	Other	Other
+8e0cb14a-48db-42ec-af2c-0a48f2f4c001	1	Other	Other
+8e0cf37a-7821-46cd-9670-ded1bb09ac2b	1	Other	Other
+8e0d29ff-f5c7-41bd-8c90-94480a00fbc5	1	Other	Other
+8e0db16e-3bba-4a77-8229-b2fe81eb1b62	1	Other	Other
+8e0dbb17-f237-499a-93be-97280d975dde	1	James	Other
+8e0e9bf7-9093-437a-b52a-330c86b396c7	1	\N	Other
+8e0ea863-3657-4009-bd54-63c730e1b378	1	Other	Other
+8e0ed0ca-fc46-40c9-b112-9de1601170c6	1	Other	Other
+8e0edb9a-6af4-4867-9ba3-aff78ce1e642	1	Other	Other
+8e0eeec4-8f0f-4ccf-bc5c-b6cf90736741	1	Other	Other
+8e0f05d9-74a5-454c-b8f1-ea372a0cdc89	1	Other	Other
+8e0f5392-8292-44ad-bebe-6cbf5809b4b2	1	Other	Other
+8e0f5ff9-495d-4328-91a4-e2d4ae748a9d	1	Other	Other
+8e0f872d-463f-4b20-aaf2-b28ba524631a	1	Other	Other
+8e0f97b3-8dba-4983-8567-d4632f8a652e	1	Other	Other
+8e0faa26-406f-491a-b3eb-7ff99a30598b	1	Other	Other
+8e100066-de04-45fc-abf4-b3039e5ed1ec	1	Other	Other
+8e101e38-68c5-459d-893b-8ebbbcf4249a	1	Other	Other
+8e102556-bb68-4ea2-9d1e-690e5ce295c3	1	Other	Other
+8e10475f-8c1e-4b2c-b199-e4ed5b4d3d52	1	Other	Other
+8e10a280-12c3-49f0-ac66-6c2fb08cad33	1	Other	Other
+8e10b1bf-d0af-43ea-8c2e-8e850f357ca0	1	Other	Other
+8e1125f2-e05f-443c-bfae-611a0ca60d2a	1	Other	Other
+8e11261c-b35f-4032-8f42-5394afc4a34a	1	Other	Other
+8e112be4-c8ef-4739-ad8b-d2e5935b5828	1	Other	Other
+8e118a82-360e-4504-a119-f58976ede170	1	Other	Other
+8e11cdea-05d0-46a3-9637-3c95713929ca	1	Other	Other
+8e11ce1f-f693-4e5f-8f0a-d4bad57beb9c	1	Other	Other
+8e11ceef-4f44-4908-b135-d52c04e2277e	1	Other	Other
+8e11d1f4-3a43-4f77-adec-2f1cda889621	1	Other	Other
+8e11f1ba-60c8-400e-b6c8-cbe3ec4f970b	1	Other	Other
+8e121505-f9e3-4717-857f-c450379c6aed	1	Other	Other
+8e121b23-831b-43ed-95fd-3d2a6360dd1c	1	Other	Other
+8e12a29c-4c19-4155-81be-1d43a9a41284	1	Other	Other
+8e12c57c-fe39-4d6e-810d-55b20d1f1305	1	Other	Other
+8e12e03c-e737-4cc8-a7fa-979e0c5d1db2	1	Other	Other
+8e13207e-89d9-4b38-8201-bebc9f33b0cd	1	Other	Other
+8e136241-6fbe-4237-9f65-a05e8c6f8154	1	Other	Other
+8e136668-2e51-4725-a6ec-5f5d1d1b71b6	1	Other	Other
+8e13ed67-ba0f-48b1-9d0b-35bd97706f2f	1	Other	Other
+8e145f84-25c3-49cd-841a-d8bd7b80acd7	1	Other	Other
+8e146b30-6dfe-4c32-abef-85beedc5ad27	1	Other	Other
+8e14f1d2-73dc-4579-84aa-3269ed1be3f4	1	Other	Other
+8e151b42-1a3e-47c6-a66b-bae5d11dac83	1	Other	Other
+8e1521ce-f6d9-44f3-aa0a-986140d92878	1	Other	Other
+8e152aa4-66e1-42bb-81e4-abc91976e05e	1	Other	Other
+8e153033-4056-4b26-bfa3-29d0c25941de	1	Other	Other
+8e15405b-934d-419d-9ee4-584beccc3b96	1	Other	Other
+8e15913e-4498-4f0a-b519-4707860c8dab	1	Other	Other
+8e15b85f-bea6-42ec-a2c2-b71f4a3fd38a	1	Other	Other
+8e15cba3-fd7c-4dac-b4c9-3a6d68b34f66	1	Other	Other
+8e15cf48-ed5d-4db9-8056-b384c7944714	1	Other	Other
+8e15f21b-591c-47ac-a207-3ed59f26a2db	1	Other	Other
+8e160de0-59d6-4d60-ae94-e5e3709bf305	1	Other	Other
+8e160f95-e197-4c72-9cd6-fc2e4e48bf15	1	Other	Other
+8e161600-2cc5-43f2-b449-deac4274656a	1	Other	Other
+8e168190-1de1-43e6-bb8e-54213bbc3157	1	Other	Other
+8e168190-34d1-4d4f-b6d2-48572f1368fb	1	Other	Other
+8e16caee-e737-4117-9572-a865f7df47b8	1	Other	Other
+8e16d4a9-a71c-4d0d-b354-59d419722ee2	1	Other	Other
+8e16fc86-7303-420b-b360-d775749fef12	1	Other	Other
+8e170207-54f3-4ecd-a34c-25fefefac376	1	Other	Other
+8e170a56-b998-4b99-bdc4-4a7e1b128b8c	1	Other	Other
+8e171211-1ebc-4e0c-b46e-df181f131ed0	1	Other	Other
+8e171832-bed0-48ac-b456-2d2b73819499	1	Other	Other
+8e1785d4-d1e1-498c-ba0b-534ec319837e	1	Other	Other
+8e17abeb-be97-493f-9534-d734ded5ddfa	1	Other	Other
+8e17df47-db47-4f85-9797-9212ac8225c7	1	Other	Other
+8e17e580-91c8-4651-8b92-1d05147eccda	1	Other	Other
+8e18181a-4d39-42ff-9c74-42722016b2ed	1	Other	Other
+8e18a2b5-2dd3-44d7-a86f-9b3d71b97fad	1	Other	Other
+8e18d80f-6b1a-4413-85db-c9bf815d53c9	1	Other	Other
+8e18f8f5-ac2a-495e-8e9f-eba49d1dcae4	1	Other	Other
+8e195965-09fe-41fb-af05-d32486188412	1	Other	Other
+8e198c66-3ec2-456d-9710-8d8cc7f503ff	1	Other	Other
+8e19db3d-0a95-41c7-aa42-da42e2c18e41	1	Other	Other
+8e1a683c-eb19-4d77-a6e9-54664f7f26f1	1	Other	Other
+8e1a85d7-7b7e-446e-afc3-0bc8432c123e	1	Other	Other
+8e1b28b9-599b-4f7b-a933-61ae30e0eebe	1	Other	Other
+8e1b366d-4b1f-466d-92c4-2de8638c4aa0	1	Other	Other
+8e1b5256-3ac5-4f7e-bea2-4edab3975e39	1	Other	Other
+8e1bb0da-6d76-4ae2-8a2a-35efb445522f	1	Other	Other
+8e1bbcde-6860-4da1-a5f7-91aa0bd96036	1	Other	Other
+8e1bbd66-5775-41e9-9956-3d6f77c5c7f4	1	Other	Other
+8e1bc387-41c3-4e24-a8d2-6119afd57c2e	1	Other	Other
+8e1cc2d0-63b6-4935-84b7-d69904d36b2d	1	Other	Other
+8e1cc8b9-755f-4517-983b-41dae17b1b27	1	Other	Other
+8e1cf623-4ea6-4b3d-94db-44b91aa19ca6	1	Other	Other
+8e1d0dcb-6674-4a0a-9fc8-ba95639945a4	1	Other	Other
+8e1d405b-f6cf-4fef-96b6-cd122cd57e57	1	Other	Other
+8e1d4c54-6350-46c6-b9d2-1975b49f956d	1	Other	Other
+8e1d4ead-6485-4d24-a7d9-b63e479d1843	1	Other	Other
+8e1d74a8-b11c-45d4-bdd1-3c29fd2e8352	1	Other	Other
+8e1d8fb0-d061-42f0-9ec1-5674a5759f18	1	Other	Other
+8e1da1a1-8aa8-41d9-9d8e-0c94174556d9	1	Other	Other
+8e1dbfcb-3e4c-436e-9505-35c52c6cb9a9	1	Other	Other
+8e1dffbf-3b4d-4dc0-917a-6d702d414650	1	Other	Other
+8e1e196a-ed4b-4a51-aa90-62471318b593	1	Other	Other
+8e1e245a-7d55-45a5-9e3a-0b6eb870aa78	1	Other	Other
+8e1e7116-1673-4ac4-b03c-e98bd7d3bbee	1	Other	Other
+8e1e7ac7-bd89-4914-afc0-7449f5238402	1	Other	Other
+8e1ee126-28b9-4a44-9148-92857e7baa97	1	Other	Other
+8e1ee7a8-241d-4296-a63c-5ad1efd6c922	1	Other	Other
+8e1f0351-0f69-4e8a-b1cb-1ac8d24efb58	1	Other	Other
+8e1f793a-1629-4c14-81ec-2be03e23a931	1	Other	Other
+8e1f8249-30cb-4313-968a-51069da16c4c	1	Other	Other
+8e1fa0da-8ef2-464c-9066-3f53824f4b6f	1	Other	Other
+8e2017ca-7ead-4c72-aa55-59c041d1bb94	1	Other	Other
+8e208c0a-410e-465b-8b34-238b1c548c4a	1	Other	Other
+8e209532-5e8c-41cf-9e60-b301af09ba4e	1	Other	Other
+8e20f177-d561-4d42-b032-2a686c037c2c	1	Other	Other
+8e2100cf-6975-4372-9827-da70bd40c666	1	Other	Other
+8e2114ad-ef92-429d-a010-ba1f958cfcb8	1	Other	Other
+8e2123d2-619e-4a70-8318-5e4c7ecf2967	1	Other	Other
+8e214fb7-3db5-4bf2-b3a0-8a32f3337541	1	Other	Other
+8e219b56-8b27-4843-b87a-097bd213d347	1	Other	Other
+8e219e58-d6bf-41a5-827a-e19d8cd48481	1	Other	Other
+8e21c0ac-fbff-4dce-af01-5524b581c838	1	Other	Other
+8e21e7a0-9787-4b39-92e4-72dac7585d15	1	Other	Other
+8e22d814-a7d4-4321-9ec2-5643bd959d6c	1	Other	Other
+8e22e4ef-fcfa-41e0-88f7-202138ef8c82	1	Other	Other
+8e2361af-764e-4c24-917c-a5758de611a3	1	Other	Other
+8e23818f-78ba-40a3-acfc-87022436099e	1	Other	Other
+8e238463-f64f-4625-9b19-c44f8f71c541	1	Other	Other
+8e239e62-206c-47c9-846e-dafbbdaccc8f	1	Other	Other
+8e242931-c841-4b47-8d4c-fa236fe5ca10	1	James	Other
+8e2453e6-1368-4258-8cfc-12f2da4e0257	1	Other	Other
+8e2465d7-7549-49b6-b432-af8a25e46c03	1	Other	Other
+8e2466c6-f36a-4707-8e00-1bd9ce647277	1	Other	Other
+8e2507a9-fdf5-4768-9df0-3eb4dc56a6b7	1	Other	Other
+8e254eab-24f4-44fe-a618-d5e44f32a54e	1	\N	Other
+8e255703-26b1-42f3-be63-4c16922c98ad	1	Other	Other
+8e2580de-a85c-4e69-9fc2-f878d2f26389	1	Other	Other
+8e258e75-4ef3-4a62-abca-4ec7fc2d2af9	1	Other	Other
+8e25a671-6772-4b87-8372-7b567b88505f	1	Other	Other
+8e25ac8e-6755-47ac-b0f2-a3e19a557936	1	Other	Other
+8e25d39f-9e8a-4fee-8250-5496130d0d3d	1	Other	Other
+8e25ef0e-e966-4cb6-baa0-671e08b55008	1	Other	Other
+8e261a04-1faa-4dab-a84c-62dcb579728b	1	Other	Other
+8e265390-0523-45ac-9394-9ae83c6e0e5a	1	Other	Other
+8e2653ad-b043-487d-9c56-03d9630dd002	1	Other	Other
+8e265b36-2b7c-4e67-a0e0-4db750ba8b08	1	Other	Other
+8e265b50-ed61-4c40-8a59-e850902592b8	1	Other	Other
+8e267d97-6d1b-481b-b2d3-bda2477f4226	1	Other	Other
+8e26d892-e698-4c43-a5a2-bfb72909e46b	1	Other	Other
+8e26e22a-9551-4aef-981d-787393f8c944	1	Other	Other
+8e2758ff-7278-4370-b0c3-606a8b6136c9	1	Other	Other
+8e2765fd-29a6-4ea3-8bf2-4f401af66026	1	Other	Other
+8e28afd5-18fe-4644-b9fc-481d1951988f	1	Other	Other
+8e28d213-8d88-4f09-91f7-2074bc78138c	1	Other	Other
+8e28e8f2-08f8-4cd6-89a8-82308493657e	1	Other	Other
+8e29544d-8272-4786-baa7-5efaf3974085	1	Other	Other
+8e2964e3-3913-416a-b00c-f01622e605e0	1	Other	Other
+8e298c84-6c97-4db9-ac85-e57ab635f36c	1	Other	Other
+8e2a1771-0d3a-4fc5-bb7c-35dad65d0ef8	1	Other	Other
+8e2a43c3-9732-44e2-ac4a-f04d35ad9433	1	Other	Other
+8e2a4b1f-e3c4-4b7c-8498-f7b392d8cfba	1	Other	Other
+8e2aac4b-dd66-4ce2-900c-46dadc5a5c21	1	Other	Other
+8e2ad420-9404-433f-930f-a0483b9a1962	1	Other	Other
+8e2adbe2-0988-4dd7-aecf-399cdc41400f	1	Other	Other
+8e2ae84c-1027-4d90-867e-93ecdde443a5	1	Other	Other
+8e2b0fa8-9ea4-42a9-b994-90963f8a7191	1	Other	Other
+8e2b263f-8b06-4898-83b6-b2b7fb092aba	1	Other	Other
+8e2b2bfe-4f62-42af-b93f-50af906ad9e0	1	Other	Other
+8e2b2e7a-212a-4b2b-a2a6-1c57950d2dff	1	Other	Other
+8e2b3ed3-74ab-4753-8b68-e56b999dc797	1	Other	Other
+8e2b5cc2-62b0-45d3-9a78-b1f9417df780	1	Other	Other
+8e2b6579-5f22-44b8-8b2e-72d16341b425	1	Other	Other
+8e2b94f6-bec7-4fc7-80bd-9ae2b7330a89	1	Other	Other
+8e2ba071-0c55-4d6b-b5fc-7b595f7f1469	1	Other	Other
+8e2c43a9-69aa-4368-9982-7b1162d9fbc9	1	Other	Other
+8e2c4662-6824-409c-add6-7aa98663abe0	1	Other	Other
+8e2c972d-c301-4e3c-abde-419fc19b9d36	1	Other	Other
+8e2c9b9d-af7a-40b3-a30f-e0c79fbdbb18	1	Other	Other
+8e2ccc86-32b3-4643-9cfe-989ef6df137f	1	Other	Other
+8e2ced4d-53c5-45e0-975a-e0dc48fdab4a	1	Other	Other
+8e2d2c67-3cc8-4671-a28c-bc8f3df48c36	1	Other	Other
+8e2d3e7d-08a4-4644-8f0f-6bad140044cd	1	Other	Other
+8e2d8cfb-2b20-4c7e-a0e6-d4b35241ac97	1	Other	Other
+8e2dabed-d127-4dc8-87bc-125a2d43fd56	1	Other	Other
+8e2dd016-4397-42e6-a392-597df67b29a2	1	Other	Other
+8e2de445-dab6-4d72-8f71-aafe0dec91b7	1	Other	Other
+8e2df64f-7ef6-4d68-bd2d-d65f21a64670	1	Other	Other
+8e2e0015-b534-4ce4-bd9f-77495cc4c6c6	1	Other	Other
+8e2e111e-d762-41f7-8930-02e55425f1e5	1	Other	Other
+8e2e1976-26a9-470c-b4e0-ab6580998590	1	Other	Other
+8e2e36d5-d232-41fc-97e3-170e1782eefd	1	Other	Other
+8e2e5979-ea12-4552-8bc7-42ceb7fea5b2	1	Other	Other
+8e2ece64-8512-4e13-a98e-6439468c6151	1	Other	Other
+8e2edd88-7d62-480c-a280-70025513c49e	1	Other	Other
+8e2eeba2-ec23-48a2-adfd-448c954232a2	1	\N	Other
+8e2f1521-388c-495e-9934-cb51a9fdf1ad	1	Other	Other
+8e2f17b2-8066-4284-8202-589051ba3ec9	1	Other	Other
+8e2f2016-eb31-410d-8fa2-d988da8221c0	1	Other	Other
+8e2f432b-dcc3-422c-864e-335462d9e021	1	Other	Other
+8e2f7b7f-4bfc-48e4-b1df-f75e22824318	1	Other	Other
+8e2f98d3-c35f-4124-bd8c-6b9c88ac8bb7	1	Other	Other
+8e2fa57f-1804-4bd6-b35a-d623d5c616ce	1	Other	Other
+8e2fadea-fd46-43ac-b67c-07dcca42fcfe	1	Other	Other
+8e2fe4ec-1ae8-4687-9f9a-0f696e6ad440	1	Other	Other
+8e2fecc5-765b-403b-aceb-4ad504cc0976	1	Other	Other
+8e300ef9-3c91-4abb-be46-73a5f6e1af53	1	Other	Other
+8e305647-d52a-453b-a224-2072024cc617	1	Other	Other
+8e3061b8-d07e-477e-bd3e-554aa76427d4	1	Other	Other
+8e30c41b-4bcc-4fed-b84a-2b156ff43e6a	1	Other	Other
+8e30d17d-4608-4021-91b3-c70cb0368059	1	Other	Other
+8e3106a3-4e0c-4f61-8f30-bd3a8879f664	1	Other	Other
+8e31441f-b684-4d57-8219-22c14ac9c1d3	1	Other	Other
+8e3176e9-ed17-4c27-8d83-304b66923267	1	Other	Other
+8e317e10-94de-4e1f-be03-871d94f38ad2	1	Other	Other
+8e319437-cdba-49d8-bcc0-76a7ff7fa40b	1	Other	Other
+8e31a479-fb6d-4c8d-87bb-f5d3623fb357	1	Other	Other
+8e31ca3a-325c-4130-95e7-de6bc281e03a	1	Other	Other
+8e31cfa7-aab5-4899-808a-0cd344af12e0	1	Other	Other
+8e31ee24-1777-49a4-89ca-56743f5102f9	1	Other	Other
+8e320afc-eb27-4fff-8c1d-461bfeb7cb46	1	Other	Other
+8e3218b1-4fca-49e1-8903-3826b2f722ac	1	Other	Other
+8e322fcd-7805-4673-b819-2c363761d579	1	Other	Other
+8e326dba-f0e9-4d4d-896f-1159aa663fa8	1	Other	Other
+8e3293bf-16ef-452f-8a1b-6978b3fd0009	1	Other	Other
+8e3294a7-a438-45b1-a0f4-a5deec9965da	1	Other	Other
+8e330479-2c43-4be8-9767-eeee90952490	1	Other	Other
+8e3314ec-c5d5-4f0d-be7e-e29ab37bed73	1	Other	Other
+8e334b98-873b-477b-a37d-bcadd1d40959	1	Other	Other
+8e338ee3-0472-454a-b7e4-e48b271fa7e0	1	Other	Other
+8e33918c-7466-434e-a901-7ecbbb4a84ba	1	Other	Other
+8e339407-a228-4557-b336-e25aff7448f2	1	Other	Other
+8e33a1fa-d397-4e99-a0ab-ca4059ea96d3	1	Other	Other
+8e33aee1-bfbc-441c-8180-450af3825ec6	1	Other	Other
+8e33ede7-ee6b-4abb-b8c5-70745641fde4	1	Other	Other
+8e340781-55c3-4063-96ff-8a058f23d114	1	Other	Other
+8e34e040-d632-40fd-a7fe-5e336744cd74	1	Other	Other
+8e34e243-d5ca-49d0-9bec-ed58b842532e	1	Other	Other
+8e34fb89-b384-4589-b654-489f96a4e52e	1	Other	Other
+8e3521a2-3af0-483b-bed3-7f9602cd2bf3	1	Other	Other
+8e352d4b-1fef-4373-97e5-2991e4b9aa92	1	Other	Other
+8e3532f3-29d6-4f7d-84c1-d6ba8125ae91	1	Other	Other
+8e353862-7e64-4238-8a3a-61c9e6df5890	1	Other	Other
+8e364383-af45-4294-bd4b-a51c0863bca7	1	Other	Other
+8e368ff1-0a2d-4f79-8759-d5b4bfec7ded	1	Other	Other
+8e36b078-a4e1-4f41-8b18-b1acdd36b076	1	Other	Other
+8e36c297-630c-40df-ba6f-479f39dac6b4	1	Other	Other
+8e36f343-f5b8-42fe-8ab4-fdee1c397c01	1	Other	Other
+8e379902-0de8-428f-a5e2-ebaf990a9c6f	1	Other	Other
+8e379ae6-8aee-4bdc-b6c5-aa27f3e7d11a	1	Other	Other
+8e380a43-163a-4b53-989a-86d7b0b07976	1	Other	Other
+8e38392d-0440-4e02-a00e-788d63e04e63	1	Other	Other
+8e385a6c-bbc6-4927-a7c2-77bc241543de	1	Other	Other
+8e386593-7ca5-44be-8431-df9e9d2008d8	1	Other	Other
+8e386b20-0a73-41e4-a09f-79db312e2ed5	1	Other	Other
+8e38805b-e354-4bcd-ae7a-9e4c568df16c	1	Other	Other
+8e3893fe-aa3f-4e6d-a74d-6437648880c3	1	Other	Other
+8e38ff5e-57ba-4a7a-9422-96b7c2d6f301	1	Other	Other
+8e393fa6-10fd-4e17-86eb-fac78f323e2d	1	Other	Other
+8e3960af-b689-4e46-909c-be9093ae2684	1	Other	Other
+8e3973f1-10ee-435e-9b56-51b133a1d40e	1	Other	Other
+8e39920c-c397-414e-9f6e-ea3011a551c0	1	Other	Other
+8e39bc7f-085c-4ec9-9e23-8bcbaebc8cda	1	Other	Other
+8e39e304-8828-4f23-9808-4bf7d1be567d	1	Other	Other
+8e39e7d8-22e0-4bc4-ab4b-51bb70a04dbb	1	Other	Other
+8e3a42e1-336a-4e10-beee-be79d1a5c97c	1	Other	Other
+8e3a43e5-fe7d-4e96-b210-dc2692e6e40c	1	Other	Other
+8e3a646e-cbd5-4d3b-a28f-09987a171968	1	Other	Other
+8e3a674b-12c3-436f-a777-99eedeb00ffd	1	Other	Other
+8e3a8527-14e0-46e1-8bab-f0be52588f8e	1	Other	Other
+8e3af007-65f3-45d4-8d5a-cc1fa7ca6b9a	1	Other	Other
+8e3b6771-5559-49e3-9197-fce45c4a9b47	1	Other	Other
+8e3bb80d-a17b-451a-af20-85b18646c6d3	1	Other	Other
+8e3bd36f-4e20-4b06-8245-37c4459deba0	1	Other	Other
+8e3be49b-c99c-4b50-98f5-01afb8690438	1	Other	Other
+8e3c4c85-5a23-49d2-b7cb-06380a74854d	1	Other	Other
+8e3c6a6f-463f-413c-aaea-f15844022984	1	Other	Other
+8e3c7edb-9c93-4e5b-b529-fd30f023da21	1	Other	Other
+8e3c8c09-7860-4e1c-8593-634d5282746e	1	Other	Other
+8e3cac52-a6e2-4f3d-8d1a-a3866190e9d9	1	\N	Other
+8e3cc036-17e7-43d6-85ab-6b5aee938c5b	1	Other	Other
+8e3cecc4-48d3-42c3-956c-9e67037ffe47	1	Other	Other
+8e3d0a54-4c97-4982-8830-403a1b5da738	1	Other	Other
+8e3d6efe-4a8f-435e-8fe7-3f658e5c4b14	1	Other	Other
+8e3d74bc-9529-4210-b41e-d9db8a6abcf7	1	Other	Other
+8e3d802b-bb8b-4188-ac62-423d2c5cf116	1	Other	Other
+8e3d86f7-c092-45df-8a9c-8c18a647a745	1	Other	Other
+8e3d88cd-3665-4e3b-9826-f1dd6401473d	1	Other	Other
+8e3d9ef5-b128-4042-a8a5-050d9fa6f781	1	Other	Other
+8e3dcf5e-eaea-40f5-899f-ee2d206a4b2a	1	Other	Other
+8e3de01e-b48b-467e-ad43-c03092a84958	1	Other	Other
+8e3e1a83-5993-4ef1-a8cb-10e5c03a9a95	1	Other	Other
+8e3e2432-ca37-4129-819e-bb79f0059cfb	1	Other	Other
+8e3e3fc9-257f-4ccb-b1c5-523ebade90fd	1	Other	Other
+8e3e6b7d-5e5e-4d40-a15b-d3274a102a21	1	Other	Other
+8e3e97aa-f50e-4393-8842-dc9a88ef678a	1	Other	Other
+8e3eb6bf-7ffa-4297-85ee-90e47391cecf	1	Other	Other
+8e3ecdce-780f-4e2f-9080-1946ac89dffa	1	Other	Other
+8e3ed041-9b05-4fd2-9216-ca1425405fd8	1	Other	Other
+8e3f2d9e-4b93-4dd9-b9e2-32edca68943d	1	Other	Other
+8e3f3ee6-aaec-47cd-a275-f3cba6bc1ecb	1	Other	Other
+8e3f4631-607e-401f-80d4-791f3e2ba818	1	Other	Other
+8e3f85f0-3da7-4256-a290-c3a1aa5276df	1	Other	Other
+8e3fa4a9-1ea6-4e4b-9f64-f8aee8d89b0e	1	Other	Other
+8e3fad4e-6adc-4c5c-9c0e-f42a0cadeae2	1	Other	Other
+8e3fb029-6d47-45e4-8f76-e7f0e11d42a1	1	Other	Other
+8e3ffd71-9a06-41cd-94f7-799af226dbe5	1	Other	Other
+8e401d2f-80d0-417c-a91d-4a1b48f5604e	1	Other	Other
+8e401ea1-d3b2-4dc3-9159-190865adf3ca	1	Other	Other
+8e40d73b-e925-4765-8105-9f5f6783a55f	1	Other	Other
+8e40df80-0951-468d-9191-76131f30e04d	1	Other	Other
+8e411fac-fba9-4d20-b060-9cad1c884ff1	1	Other	Other
+8e41362a-330e-4100-aec4-3bed9dc218c3	1	Other	Other
+8e414474-828a-460a-ba9d-4c54054c0cb6	1	Other	Other
+8e41489b-1970-4cd8-aae7-ac0171b39708	1	Other	Other
+8e4173fa-ddd2-4371-83bb-9014fdae279f	1	Other	Other
+8e429c3e-e468-4bf0-99df-f8d110bf10f8	1	Other	Other
+8e42a1bb-26fd-474e-ac47-3919660b0a69	1	Other	Other
+8e42dbee-c8cb-476e-811f-7f2e500e4a8e	1	Other	Other
+8e42e0a8-c8cc-4dbc-ad7f-8f9b3d3ac600	1	Other	Other
+8e42f7b5-b369-4d35-8d54-782721a49468	1	Other	Other
+8e43657b-aa3e-403b-8369-e9bb71aafd06	1	Other	Other
+8e4367de-2d48-40cb-9a7b-bbd342cf17cc	1	Other	Other
+8e43edda-55cd-4bd2-af38-87ab570f347e	1	Other	Other
+8e43f6a8-4e3c-4dd5-a3b9-bba225b846cd	1	\N	Other
+8e44201a-760a-4103-bff8-966d189a0853	1	Other	Other
+8e4452dd-dfeb-4b0c-8b4a-1914481c4cca	1	Other	Other
+8e449ce3-34fd-4801-82a3-37eb8565f926	1	Other	Other
+8e44c921-2b5a-48ce-af93-8248616f2941	1	Other	Other
+8e453701-c10a-4969-abe2-593e5a24b095	1	Other	Other
+8e45c6a8-8222-4894-8638-12a7e7a44128	1	Other	Other
+8e45c924-d232-45d4-8c10-9b370f070547	1	Other	Other
+8e460cdd-11ad-457d-a707-453354001f70	1	Other	Other
+8e461420-b86c-4f8d-b476-e8ccd2fb4029	1	Other	Other
+8e4693bd-63fe-4332-aa10-df16f42ce786	1	Other	Other
+8e470d41-a32b-47e2-8075-405c5e737ee3	1	Other	Other
+8e470e0b-a12b-4263-94e6-4debc2fabaad	1	\N	Other
+8e476836-1052-4dc5-84f0-4ed3882bdd3c	1	Other	Other
+8e476e44-248d-45ee-a2c9-03ff8f350010	1	Other	Other
+8e476e8a-99ae-47ad-a556-d5fa03560ebe	1	Other	Other
+8e479df4-0ec6-4993-a1eb-11da3735b8f3	1	Other	Other
+8e47b3cc-654c-4f71-a75c-57c67979f5b7	1	Other	Other
+8e48559f-174d-48e3-81ed-10f6463e4e1f	1	Other	Other
+8e48c6ab-c42e-4095-ac1a-471a44fcd30a	1	Other	Other
+8e48dca5-6f1b-4af7-bd9b-c5e2979df750	1	Other	Other
+8e48e158-636d-4f18-a22a-10988c8f701d	1	Other	Other
+8e48fb75-04ab-4b50-a447-bdd05e1352ff	1	Other	Other
+8e490b76-756a-4806-ad57-f60be84a7b4d	1	Other	Other
+8e491896-422d-43e8-8926-a88f08cd5671	1	Other	Other
+8e499d90-a0f6-4010-a549-e045af8c4e3c	1	Other	Other
+8e49c1ca-64cb-4cec-b8f9-a61667a34c17	1	Other	Other
+8e49c25c-14c6-4b1c-a3fb-ac1a9a52c880	1	Other	Other
+8e49cfac-4fb0-47c1-94be-e702cceda8c3	1	Other	Other
+8e49f7e3-fdfa-4b2f-934c-34b59125622b	1	Other	Other
+8e49fe8d-c85e-4989-a8f6-bb8d65179654	1	Other	Other
+8e49ffda-e608-4139-b511-7b8c0a5336d8	1	Other	Other
+8e4a097d-36e0-4782-971a-74821de32c92	1	Other	Other
+8e4a4b0b-52e1-4725-8c72-f19ebaba92b7	1	Other	Other
+8e4a533d-daa7-497c-a323-a42423956edb	1	Other	Other
+8e4a65db-4715-4cfd-90f9-7102e5242406	1	James	Other
+8e4a68f8-78ce-4696-9ccb-7815ffe50539	1	Other	Other
+8e4a8bfc-8f95-43b7-bddc-1e0ed39ae75b	1	Other	Other
+8e4a90e4-3495-481c-993d-bf1f2b7e14d5	1	Other	Other
+8e4ac54b-e4c3-4e8f-9ac9-9a5b515b16e6	1	Other	Other
+8e4ae2f4-ac26-4e27-929b-227f284c19f8	1	Other	Other
+8e4b7182-35b6-4f07-ae83-699f60c0a05c	1	Other	Other
+8e4b74c1-8812-4d57-a2ef-734b23b65889	1	Other	Other
+8e4b7aaf-ada9-47f2-96ac-22f189d41f26	1	Other	Other
+8e4b9e50-0464-4ea5-a8e4-57160dcaa725	1	Other	Other
+8e4bb749-0c74-4ff9-b5ad-d443e9d0b7ba	1	Other	Other
+8e4c49db-eee0-4997-9a4b-d5da0637d37a	1	Other	Other
+8e4c85b3-20e8-42e0-bf9b-b7ef977adfe1	1	James	Other
+8e4cb72c-0308-4354-bd7d-3e2e5bc266be	1	Other	Other
+8e4cc4a5-8d29-4abd-a6fd-17df3dbab5fb	1	Other	Other
+8e4cda37-7f42-4fb4-97fb-62545ec6faab	1	Other	Other
+8e4cec5b-1131-412e-8c91-b7781c5ad549	1	Other	Other
+8e4cf43e-b642-4fc0-822a-3c502124e6e7	1	Other	Other
+8e4d5a03-4456-46a5-aeb2-2736cfdf3d85	1	Other	Other
+8e4e3924-6d9a-4cbf-bc41-b07c23ce6952	1	Other	Other
+8e4e490f-03c0-431e-bd45-b1e24013d449	1	Other	Other
+8e4eac69-8967-41f9-a341-668900d58fec	1	Other	Other
+8e4eb10c-1bb0-43a8-ade6-86552984517c	1	Other	Other
+8e4ef83f-e03b-4232-8c26-44034b2056a3	1	Other	Other
+8e4ef9b7-2813-43ee-b597-07c5a32e1802	1	Other	Other
+8e4f012e-a553-40f2-8aa4-9e72f486e43e	1	Other	Other
+8e4f44e6-3102-4e04-8115-8d7ce5102aaf	1	Other	Other
+8e4fe2ef-8ab8-4c5d-9bf7-34f9b22750ee	1	Other	Other
+8e502bf0-931c-4bdc-996c-a0f8cf206cac	1	Other	Other
+8e506098-f279-429d-9f67-0125c76a6951	1	Other	Other
+8e5061c1-278a-468a-91f3-0e468b34f2b1	1	\N	Other
+8e509665-8d93-462c-9667-51b9c5d70166	1	Other	Other
+8e50cb7f-2b85-4d3f-867f-f395aeaf05c8	1	Other	Other
+8e50ff9a-9f43-48f9-9f76-230ac4a575f9	1	Other	Other
+8e5165d8-6e01-4763-a527-efec1d720086	1	Other	Other
+8e51a036-41b7-4315-9adb-5fa44c974623	1	Other	Other
+8e51daf8-777d-4625-af69-eee6580e0a67	1	Other	Other
+8e522d2c-1f52-4a69-9b1f-c46d7de74576	1	Other	Other
+8e52470c-7a42-43f3-b8be-5a23aa259fab	1	Other	Other
+8e526847-7d58-466f-82db-5404dc5e6b14	1	Other	Other
+8e52a6c7-5b1f-4a9f-8a91-28394195c55d	1	Other	Other
+8e52cc8b-54d6-4df6-8592-837dc5d22612	1	Other	Other
+8e52ced5-e56a-4fcb-9f0c-8bfc0cc5050e	1	Other	Other
+8e5319e0-fff6-49d3-8b6b-111b5e2f12d6	1	Other	Other
+8e535fc8-9bd2-43dc-9f26-7bc8f56534cd	1	Other	Other
+8e537041-ada6-4878-864e-03796aaeafdf	1	Other	Other
+8e537b3f-b034-4084-bd7d-0733ae94ef01	1	Other	Other
+8e53d151-fbf7-43e4-94bf-74dc3668eb6f	1	\N	Other
+8e53d458-4788-4c5c-8e89-e9d49696148f	1	Other	Other
+8e5499c4-abe0-4d10-8c91-b7033f0cad4c	1	Other	Other
+8e54a0dc-cdf1-445b-b2e5-8f8056ae1173	1	Other	Other
+8e54c5ae-8f71-4ca8-80e1-5e35dac085ab	1	Other	Other
+8e55732c-c2d5-433e-bd9a-1047843fe0e9	1	Other	Other
+8e55a206-8afc-4749-9ea5-f84b75f74313	1	Other	Other
+8e55f080-0bfa-4ed0-bc2e-29a2df43b1f3	1	\N	Other
+8e561930-3c98-4b91-acfc-9fd4476dbda3	1	Other	Other
+8e561b40-e06a-42f3-83bb-90e6578b7055	1	Other	Other
+8e561e06-3c50-438c-864d-d95f7af0f87f	1	Other	Other
+8e561fa7-6d1d-4e1b-9053-2db9e0dbb90e	1	Other	Other
+8e56571c-01df-4975-bd3f-d2b21b422cc9	1	Other	Other
+8e566a7e-628b-4da8-b6d4-83feeec7fdad	1	Other	Other
+8e566fbd-9e67-485b-9aaf-9aed99f5d74f	1	Other	Other
+8e56960a-cb47-4a18-bcc6-1aa9c02d6a6c	1	\N	Other
+8e56c600-f601-4699-b02e-4faa931ec0c8	1	Other	Other
+8e56df5e-f5f7-4b27-8fb0-9f3c1165111f	1	Other	Other
+8e5702e8-546a-4f50-9735-b627d847cffd	1	Other	Other
+8e57613e-62a4-4b69-a48d-bd719bb7d414	1	Other	Other
+8e57ad15-626c-4f6f-b362-87fe59d2e5f3	1	Other	Other
+8e57b758-6b49-4392-bb46-321ada5bb2ab	1	Other	Other
+8e57db68-ca17-4f21-b007-e74ebec24bc7	1	\N	Other
+8e5810e9-af8d-40a9-bcfd-082348b9cf18	1	Other	Other
+8e58123e-627a-444d-81e0-45c974811e59	1	Other	Other
+8e58703b-9dc0-448b-a135-b5eefb95208d	1	Other	Other
+8e5883db-47b6-4816-9eec-a97bb885cb52	1	Other	Other
+8e58a6d2-db5f-4d2e-99eb-443a4e0def35	1	Other	Other
+8e590b86-5098-467b-9702-9be3899ce70d	1	Other	Other
+8e591602-1c82-4a0d-a271-f5cb2457e007	1	Other	Other
+8e5983ed-374e-436d-82d0-323cac95e5ee	1	Other	Other
+8e598502-60da-4394-8781-e83b979aece7	1	Other	Other
+8e59f3e8-3b3e-49e4-aa95-5e94c65760e9	1	Other	Other
+8e5a0d2c-52d6-4a9d-a222-a1252c8f706d	1	Other	Other
+8e5a0e13-6026-4d23-b31c-7934405761b7	1	Other	Other
+8e5aaa54-3c53-4da4-ac34-e1d2141f3def	1	Other	Other
+8e5aee98-7411-493c-9c69-21a1e0435167	1	Other	Other
+8e5b0842-abe1-46a4-9ca5-43f4581856a9	1	Other	Other
+8e5b2322-727e-4837-8aba-c06d9fc9e257	1	Other	Other
+8e5b3625-ff20-40cc-a401-983684bbf607	1	Other	Other
+8e5b6e7b-c5ee-4d96-aa66-02e8a2a2b45a	1	Other	Other
+8e5b7000-2aff-4d45-90c8-2bb02fb563ad	1	Other	Other
+8e5b719f-0b27-4224-8dd7-70e45a5301d5	1	Other	Other
+8e5bb65e-f1f4-4590-9d7e-03b5955f6651	1	Other	Other
+8e5bbff4-d231-4d9c-aee3-d829351def83	1	Other	Other
+8e5be83d-b6a4-4a22-b84c-1ea0ac3cb86c	1	Other	Other
+8e5bf68d-9bb0-4271-bc84-0c810dbded15	1	Other	Other
+8e5c6fcb-a576-49b6-a965-e23d3aeb4309	1	Other	Other
+8e5c70c3-f22c-41e7-ae7b-916abb17c66d	1	Other	Other
+8e5c7c54-6103-4cd9-9c83-7494cd08fcfd	1	Other	Other
+8e5c954a-8f37-4a47-93fc-f805e2f558b5	1	Other	Other
+8e5ca6dc-0142-4153-91e7-71d770fae5bb	1	Other	Other
+8e5cb499-0ea9-44c3-8324-80bfcd178a25	1	Other	Other
+8e5cb4b2-688b-4802-8dda-7f30431c637d	1	Other	Other
+8e5cb4f0-a841-4fc1-a57d-31bf91179601	1	Other	Other
+8e5d1a3c-8609-40d5-af8e-c6193f56d13a	1	Other	Other
+8e5d38c8-4a71-4b97-b4cd-91a0d4153a49	1	Other	Other
+8e5d608a-5cf9-4b59-84cc-c3aea13eee01	1	Other	Other
+8e5d67de-3be4-4b8a-822a-618f7d3758be	1	Other	Other
+8e5d6f71-1998-4e85-a200-66cf3985291f	1	Other	Other
+8e5dbf0f-6989-468a-a24f-e7c161de747a	1	Other	Other
+8e5dc3c5-257e-4e83-92c5-58344d8bc1b2	1	Other	Other
+8e5dcb55-be88-44c8-9c6e-903a3907c09c	1	Other	Other
+8e5ddd6a-d5a2-48a7-8e51-60abefb77b62	1	Other	Other
+8e5e48b7-35ac-46f3-af09-d50aa4e07ee9	1	Other	Other
+8e5e4d38-d2f9-4020-a429-45f1bde4e9cc	1	Other	Other
+8e5e7d31-e850-40d7-bce1-7e1bbd7d8757	1	\N	Other
+8e5e86f5-dc7b-4b96-8ab1-7f89b93435e7	1	Other	Other
+8e5e8f0a-e1cc-4391-9290-a27117ccbcae	1	Other	Other
+8e5e97a6-5722-44cb-b5e1-85476a4e4181	1	Other	Other
+8e5ec0db-6ef4-42b0-bcd4-c73ab1c39801	1	Other	Other
+8e5ed58d-630d-4d59-a72b-da80ec4b0c75	1	Other	Other
+8e5ee2f9-05c8-4e39-a298-9c2faed9f692	1	Other	Other
+8e5f3293-6211-4e27-a29e-68503e1fbd37	1	Other	Other
+8e5f8904-2a4c-41dc-a39d-5e5289daf0f2	1	Other	Other
+8e5f9092-72e5-4f46-a170-d2712b6ce026	1	Other	Other
+8e60025c-c6e9-4b4a-862e-5991612849ef	1	Other	Other
+8e601f97-0f12-4728-8a73-859e97891d39	1	Other	Other
+8e60447a-ae22-4312-abd5-6e9a17d5acd8	1	Other	Other
+8e60d9dd-159b-4c7a-8d7a-91cf8e53023e	1	Other	Other
+8e6107d6-25d7-4994-9e9b-e87c23ad9bcb	1	Other	Other
+8e611d3e-c04d-4c53-bec9-7f2bda6ad056	1	Other	Other
+8e611e4d-5fe8-4e74-9e9d-817ff91f1c5e	1	Other	Other
+8e612ccc-50ac-4c03-a570-e8b281b8c2d5	1	Other	Other
+8e616613-8c54-41e3-b160-5dc0411a3709	1	Other	Other
+8e61d3f1-9259-4149-a3e8-a270e40bed9a	1	Other	Other
+8e61fece-f02b-4912-842a-96e7798fc366	1	Other	Other
+8e621040-4c10-40e1-ab3e-cd7e5b36c0b8	1	Other	Other
+8e621952-c56b-41b9-9482-c4dba7627a80	1	Other	Other
+8e62a8a4-e03a-4ade-8a1b-d033e9ebbb88	1	Other	Other
+8e62ae02-4029-483c-a03e-32a392a37930	1	Other	Other
+8e62b756-dca3-4be0-be30-5fb46748ed73	1	Other	Other
+8e62d5fc-9577-4182-aaa7-c317529cb569	1	Other	Other
+8e62e75c-d0fb-4391-839d-0a5b082b9302	1	Other	Other
+8e6352d8-b4de-4cff-9a4d-b9118278cc0f	1	Other	Other
+8e637ae6-3433-49de-9eb0-657b0d26ffde	1	Other	Other
+8e63a160-b183-4231-8ede-f12f8a23924a	1	Other	Other
+8e63f2ae-7455-461f-a538-7111753a24a7	1	Other	Other
+8e64606a-8e31-436c-bbc6-5c099cd5fc82	1	Other	Other
+8e64c106-98a7-4bed-8445-a86bdfe8d7de	1	\N	Other
+8e64cb8f-ef92-4cdb-88de-b8e9a103b40b	1	Other	Other
+8e658d87-fa2a-4f4e-ad86-1e818db8dd78	1	Other	Other
+8e66392b-b449-480c-9879-6ba5ba113441	1	Other	Other
+8e663cf4-66e2-4625-a9b1-8a710790d102	1	Other	Other
+8e6671e7-ea19-46e7-a42a-cbc2079dc340	1	Other	Other
+8e66afd6-0757-450d-a96e-9e1187237250	1	Other	Other
+8e66b829-d70b-4c0d-a855-fce6349b476d	1	Other	Other
+8e66b86a-7127-4ec2-88f5-90dfd7c89ec0	1	Other	Other
+8e66df7a-e693-4129-aa91-6245cfb27db6	1	Other	Other
+8e673c31-ee1e-47f2-aa7c-0a91537b69b6	1	Other	Other
+8e6763c5-1cb4-463a-bb9c-0d5928ae8a5e	1	\N	Other
+8e67fd57-209f-46af-8019-e443db167d21	1	Other	Other
+8e6807d4-1b17-422a-9b58-a4e40655b0a6	1	Other	Other
+8e682ac4-44e8-40e4-8ce0-6cfa2153afaf	1	Other	Other
+8e689031-9df9-4f5d-8a30-59b097e6bc29	1	Other	Other
+8e68ac74-d79e-45b1-a3c1-3bd21c44451f	1	Other	Other
+8e68ad04-0c9b-4b0d-93c8-011c113e40fd	1	Other	Other
+8e691bd7-1220-4252-a2ec-1695ce87f1d3	1	Other	Other
+8e6990ea-39ef-4bcd-8f70-50612bb55f6a	1	Other	Other
+8e69c250-0d81-4ada-879a-57d5825784be	1	Other	Other
+8e69f183-0b67-4445-8782-7606cd347b6e	1	Other	Other
+8e6a0fc4-28a2-4450-8bfb-378901990406	1	Other	Other
+8e6a1655-21f0-435b-8b89-8c0672fe0ac6	1	Other	Other
+8e6a2792-fb96-4c9d-b267-29acf4854933	1	Other	Other
+8e6a424e-e696-40aa-bbdf-a2b1aa80e4ca	1	Other	Other
+8e6a4bb7-3942-4729-bf86-f5c28a9be053	1	Other	Other
+8e6a85c3-c556-4f84-ab0f-7165e744a78d	1	Other	Other
+8e6acceb-5cff-436a-84ae-4ae032264d5d	1	Other	Other
+8e6ad435-e4b4-4ac2-9d81-2f2a83892caa	1	Other	Other
+8e6aec4e-6ba4-481d-adbf-229fc91e1026	1	Other	Other
+8e6b24f5-e123-4e3a-aa5e-ebc1eaaae144	1	Other	Other
+8e6b2950-2a3e-4756-a215-cd91e123ec37	1	Other	Other
+8e6b3d7d-bb6d-4211-86c3-bd3c418e0f1d	1	Other	Other
+8e6b889a-355a-4491-a1dc-d1c5a37ba818	1	Other	Other
+8e6b9650-e69d-4e12-b230-86ac402e6dfc	1	Other	Other
+8e6b9f32-eb8a-4d44-a12b-1bdb594f441a	1	\N	Other
+8e6bc2df-1524-4ade-a8c1-bc1c7b12cdef	1	Other	Other
+8e6bd9c8-1980-41e7-992f-99c88892bad6	1	Other	Other
+8e6c404c-45db-49be-ac41-f966d6c79b0d	1	Other	Other
+8e6c7d2c-9318-45da-b6c6-dd0e6fb62052	1	Other	Other
+8e6c9685-b170-47e5-9372-9d2437e24b3f	1	Other	Other
+8e6c9ac2-d87d-46eb-8583-7464a961f63b	1	Other	Other
+8e6cac95-8ef0-4ead-85b9-d651d9fdafaf	1	Other	Other
+8e6cdd5d-7b16-4c69-ab52-a82f1cb781e8	1	James	Other
+8e6ce910-caa9-4555-b0f7-1923e57c5b8d	1	Other	Other
+8e6d152d-5351-405d-b945-1572f459e9a7	1	Other	Other
+8e6d35dd-83ae-4ac3-8d3b-18398fe87315	1	Other	Other
+8e6da7c4-6296-4e26-85eb-9189c77ee217	1	Other	Other
+8e6dcf1f-cbe3-4f5e-bab6-0ffc5d4cac26	1	Other	Other
+8e6df236-4968-4473-9351-74331ade72a8	1	Other	Other
+8e6e2b65-c197-4d2a-b63f-acb1efd273b4	1	Other	Other
+8e6e3e8d-da08-439c-8227-ea3e3b9c4699	1	Other	Other
+8e6e63f4-cdf5-4076-a8de-6b1b0edd2d5f	1	Other	Other
+8e6f0082-bff1-4b9c-a39f-6770859aadd6	1	\N	Other
+8e6f0165-f40c-4b49-ad87-a3a9e4c500e3	1	Other	Other
+8e6f1811-95b5-4ea7-8c62-08850d0d609a	1	Other	Other
+8e6f53ab-c9c9-4424-9267-cc4d20996125	1	Other	Other
+8e6fc2aa-0512-4696-b79a-9b5e7c4059d1	1	Other	Other
+8e6fcad0-0f26-403f-b854-46bc4d69a71b	1	Other	Other
+8e6fe399-b8ae-44ed-8481-2b49e6474cd8	1	Other	Other
+8e7037fd-13f2-407d-8627-6018c72b010a	1	Other	Other
+8e7057f3-d454-40bd-baa1-6601e361ae85	1	Other	Other
+8e70594b-85a4-4fb5-876e-97c8f731d5c4	1	Other	Other
+8e70a322-fdd3-4275-b924-5962131b4113	1	Other	Other
+8e70b032-f406-42f4-91fa-a4e71bb4ff02	1	Other	Other
+8e70be20-35b7-4b75-a187-6e70173c3c56	1	Other	Other
+8e70e0a4-42fe-11e8-b9b1-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8e711103-d7af-4e39-b399-30190090368f	1	Other	Other
+8e714912-70fb-4b21-a5ef-83aa733c80f4	1	Other	Other
+8e717595-c36d-4080-8c40-a9fa93161b62	1	Other	Other
+8e717b0d-17e4-4dc1-84b9-de597f7fe4aa	1	Other	Other
+8e718335-74f8-4136-aa45-639125e2bffc	1	Other	Other
+8e71921b-db85-4b91-9f25-08fd4a2dfe1f	1	Other	Other
+8e71aa01-49b4-41c8-99fa-3da645055c02	1	Other	Other
+8e727960-99e9-4f01-82f2-902b1c919bb5	1	Other	Other
+8e72ac9f-f649-4a7c-beb1-e57a2f3dc4c9	1	Other	Other
+8e72d7bb-8e34-487f-b59b-dfda4bb9f533	1	Other	Other
+8e72eca3-af00-4d61-941f-1d6fe9217ea7	1	Other	Other
+8e730a4a-c557-4d67-af16-90fbe9bff4f5	1	Other	Other
+8e732865-c87a-4b38-9eb2-164b27ef7fbc	1	Other	Other
+8e73397d-3b00-4cd5-a952-9fc97f4256f3	1	\N	Other
+8e734f57-c3f5-4881-85a3-3dc32c0350c9	1	Other	Other
+8e738e9d-3f6a-4ebe-8d3b-d4721de791c7	1	Other	Other
+8e73b9d8-9c1c-4a09-bf84-3a9072177a75	1	Other	Other
+8e743678-ba48-4825-8dcd-c0264014b05b	1	Other	Other
+8e74a822-04b9-4da6-b0ff-edfcfc214955	1	Other	Other
+8e76033a-7af3-42ca-b9bc-2ef0b16738a0	1	Other	Other
+8e76356a-8903-4a90-adee-13a13a3fe8be	1	Other	Other
+8e764f74-45d3-49b3-8e8d-f1748212c241	1	Other	Other
+8e769124-6c65-4ec2-919b-4f08b49fd759	1	Other	Other
+8e76923e-59cd-4638-889b-a1d113b6f0fd	1	Other	Other
+8e7699ea-9fc9-442b-834a-c8ae492a9f55	1	Other	Other
+8e76a18e-17e8-4858-8329-7bddc8f807e1	1	James	Other
+8e76cea5-c276-435e-9123-6012dd6e0973	1	Other	Other
+8e76f03b-7b8a-423a-84a5-38110fa8d4d4	1	Other	Other
+8e7772b7-dce9-49d1-b6aa-d358c43e911a	1	Other	Other
+8e777ee7-3b45-4022-b67b-bede9e71ef32	1	Other	Other
+8e7783b5-ebce-4792-8abc-3c2feea5debe	1	Other	Other
+8e778ba5-6c44-405d-a936-4c02d34f10dc	1	Other	Other
+8e77b47a-7b48-46c6-97b3-a7bc47d1f7de	1	Other	Other
+8e77bfdd-f1d9-43a1-ae2a-7b97aa196a48	1	Other	Other
+8e77dc80-09d6-45c7-a055-0699fc8492f9	1	Other	Other
+8e787858-11ef-4826-9f67-e2c43572f37e	1	Other	Other
+8e7881d5-835f-4271-b8f9-9ed6a4c879ae	1	Other	Other
+8e78dbcb-3065-468c-998a-8a38f7460c03	1	Other	Other
+8e78fba3-62e6-45b2-9184-9411ed1c2a89	1	Other	Other
+8e79619d-ea96-432d-9e26-348411d6cdab	1	Other	Other
+8e796f45-0158-41ab-a656-a11f31117eb6	1	\N	Other
+8e79b7ac-d687-457a-8ee8-9453c3e2d1e3	1	Other	Other
+8e79c209-4f3f-491f-84bf-6144699b0221	1	Other	Other
+8e79cfcd-cae6-4cd3-a2c3-ba7d5b10f513	1	Other	Other
+8e79e899-effc-4ac1-847d-857546aa9854	1	Other	Other
+8e7a0f51-813d-420e-89f5-1f1feb965807	1	Other	Other
+8e7a29f6-2d26-4048-b07e-d1b7a9885b33	1	Other	Other
+8e7a2d0b-8c37-4bbf-afaf-bac5058f62b9	1	Other	Other
+8e7a3926-dfd7-4e59-bc72-913e0cb69a5c	1	Other	Other
+8e7a9bbb-5a78-4c65-ab18-adb1557bd285	1	Other	Other
+8e7aeaca-6ae6-4887-9d01-4b97a882fa66	1	\N	Other
+8e7b6086-662f-40d2-bc04-a07f80f43501	1	Other	Other
+8e7bd778-1f00-46ef-92e8-0f8e39afa7c1	1	Other	Other
+8e7bf9e8-e68c-45ff-ad0f-355e18bef32b	1	Other	Other
+8e7c348e-86eb-4832-aafd-14823591eef7	1	Other	Other
+8e7c3ba4-d154-4e61-8999-1b21cfc9539c	1	Other	Other
+8e7c5c2d-d709-47de-ab3d-ca283034fa6b	1	Other	Other
+8e7cdd01-8bff-4a21-a315-48567fa5bb3e	1	Other	Other
+8e7d04af-009c-47f2-8c39-d9bc0669ea47	1	Other	Other
+8e7d07cb-8ddc-4f3b-8b86-3d48c154b8b3	1	Other	Other
+8e7d91aa-efb3-4479-ab00-90ce9291c037	1	Other	Other
+8e7dad35-3f10-4f5d-8a56-6dda24bf9e4a	1	Other	Other
+8e7dc3ce-a7c2-4398-a920-43348eb6ebf1	1	Other	Other
+8e7e19ec-9456-46ed-8b28-b98abcfe2d47	1	Other	Other
+8e7e99c8-7f4e-4dbe-b8bf-76cdc7f84188	1	Other	Other
+8e7ea42d-63c2-462b-95e5-d5c75fe1d9d9	1	Other	Other
+8e7efde2-8c43-43e2-9725-fbc0bbc79f02	1	Other	Other
+8e7f1aeb-48c4-4fc1-8118-39fee32b6b78	1	Other	Other
+8e7f2cad-211d-4779-a57f-f342083e404b	1	Other	Other
+8e7f60c1-a4e6-4fab-a980-37e43d9753b3	1	Other	Other
+8e7f6740-acb7-4b62-94f9-b2bd17d6a545	1	Other	Other
+8e7fb3e6-055a-415e-b3d3-dd2757c5fe2b	1	Other	Other
+8e7fc3da-e0fc-4635-a182-abd0177de598	1	Other	Other
+8e7fe06e-2328-429a-9959-c8b8db66632e	1	Other	Other
+8e7ff28c-3cf6-4820-bdd5-6a1184b20c9b	1	Other	Other
+8e80100f-bbb8-4f60-9064-a521377dd5bf	1	Other	Other
+8e8028a8-f1c7-4823-9ed2-e5a5e84d652e	1	Other	Other
+8e8034cd-60a3-4fcf-a102-980b079f7a95	1	Other	Other
+8e805762-9cbb-4ef0-ac52-e0cf49977c49	1	Other	Other
+8e80633f-8f94-4a21-ac90-f28b97cb21c6	1	Other	Other
+8e806c45-c9ec-4a5e-a0d3-ea24f240288d	1	Other	Other
+8e80701f-c23d-446d-b3e5-0c0fdaac8d45	1	Other	Other
+8e80b198-0016-45df-92fe-05245e08609e	1	Other	Other
+8e80bb52-0c1e-47ad-aef4-ac2ad3b72781	1	\N	Other
+8e80fa6c-a51d-4eb7-ae5c-a3ed39ed8af7	1	Other	Other
+8e811770-6326-42c7-8269-45a8043eb640	1	Other	Other
+8e811785-2c66-4a0c-9a74-ed67556239d8	1	Other	Other
+8e8119e6-56f0-42b9-bad8-58ce1d0d5c44	1	Other	Other
+8e813c0d-7bc0-439e-8056-2ccb3c0848b8	1	\N	Other
+8e817fb6-9a95-4f42-8243-6af55d87dfd6	1	Other	Other
+8e81e6c3-2783-424a-a831-2ad1c6143a6c	1	Other	Other
+8e81f735-6fb4-42c7-8972-115404dd1e7b	1	Other	Other
+8e81f763-6857-45a5-96bb-6d470116d3d3	1	Other	Other
+8e821859-d5d4-4fe9-b864-1565fe64913b	1	Other	Other
+8e824039-e6de-4c95-9e15-ecf0ea004a31	1	Other	Other
+8e8243fe-d3c8-4ff8-a332-38d79757720f	1	Other	Other
+8e829f36-26ab-4091-8e8e-e1fed53d38ac	1	Other	Other
+8e82b96b-c1f7-4228-b2e1-c4c9167e330b	1	Other	Other
+8e82fd29-6a55-4069-81d9-09f41c5f8223	1	Other	Other
+8e830f04-aa02-4931-b7fd-c6568d5574f9	1	Other	Other
+8e833430-8de4-40f4-bf42-597b40b7d5ce	1	\N	Other
+8e83a98c-7f82-42ae-bdcf-71b32dc8ab2d	1	Other	Other
+8e83dfe9-2daa-4423-af9d-32dbbc3eca95	1	Other	Other
+8e84494c-a889-40ce-aba6-15a79c85e487	1	Other	Other
+8e84637a-065c-4533-9bb2-f56437871041	1	Other	Other
+8e8499aa-80f5-4b2a-ac60-368ff19e58dd	1	Other	Other
+8e84ad2e-ae2f-4f32-99b1-d50b7a50ff69	1	Other	Other
+8e84b017-1afa-4bdc-8424-577fc5b2fd56	1	Other	Other
+8e84c433-1c10-4875-8e06-18b78ebd6e40	1	Other	Other
+8e84ce3d-fa09-4aee-8c82-aeb405089910	1	Other	Other
+8e852005-cfee-48b8-8d9e-0d26cb98dae7	1	Other	Other
+8e857fc1-8695-48ff-9c97-c1221fa57205	1	Other	Other
+8e85a061-23bc-419d-b98f-8658bb23d19a	1	Other	Other
+8e85c175-217a-449c-aba7-473ca7756b6e	1	Other	Other
+8e85c4e1-a0e6-4f43-8473-9a4136e9de5a	1	Other	Other
+8e87695f-b73c-4dbf-9e52-bed2a581945c	1	James	Other
+8e878038-85ed-43b9-a294-e528a1641e9d	1	Other	Other
+8e879d2e-0e48-4553-8481-815bb7930ae1	1	Other	Other
+8e87cc19-47db-47de-b218-f9ed63afad39	1	Other	Other
+8e87daa2-93e8-490c-a8fb-617f731439ca	1	Other	Other
+8e8825cb-bbe3-4c5e-906c-e122c9dfe010	1	Other	Other
+8e8852df-a38b-43b2-8d9f-6779bacec10a	1	\N	Other
+8e8875d0-924e-4f71-9384-e24b0b5f8ca2	1	Other	Other
+8e887da0-d49b-4a60-a679-9ef309daf3f6	1	Other	Other
+8e887e51-21d7-456a-8c23-7ef1f5e4c362	1	Other	Other
+8e88ae39-cb64-4257-b5a4-62ed9c6b1683	1	Other	Other
+8e88f1b7-3b4f-4ca3-be9f-d00e10a7d981	1	Other	Other
+8e891f15-fe91-470f-ba7e-72d7188166a3	1	Other	Other
+8e895147-9d9f-4454-9966-829a72000f72	1	Other	Other
+8e896ae3-794f-4a18-bf97-bdb4fa610da4	1	Other	Other
+8e899fc5-cee5-4627-8fc8-789685a5a929	1	Other	Other
+8e89e8ac-51ee-45d8-bef8-b728d34d396f	1	Other	Other
+8e8a1a8e-a68a-471f-be02-a431ba9d03cb	1	Other	Other
+8e8a4bc8-0f85-4d55-bf6e-e72985e498b6	1	Other	Other
+8e8a7090-fd42-469b-add4-9300f2052c99	1	Other	Other
+8e8a8d01-c00d-4589-9bc7-789456c585f4	1	Other	Other
+8e8a9f64-f196-4829-b363-49391089006f	1	Other	Other
+8e8aa198-7e67-4e50-a135-47d088cc5afa	1	James	Other
+8e8ad11e-6d2f-4874-a0e4-1b411e11b767	1	Other	Other
+8e8ad630-ac4f-40cf-af88-57bbe65d4879	1	Other	Other
+8e8b56f4-73bb-4311-8128-eb1f7758f578	1	Other	Other
+8e8b57fd-c470-4786-bcdd-ce3b4faf4054	1	Other	Other
+8e8b667b-8d28-4fa0-bc81-8d2571811bba	1	Other	Other
+8e8c02e7-5093-450b-b643-a1cce7c17b84	1	Other	Other
+8e8c97ec-6a5a-4113-af4a-a0918c3b5431	1	Other	Other
+8e8ccd31-0e73-439b-a21f-08d7de6d24b0	1	Other	Other
+8e8d553a-96f9-4979-988a-a5fc3811562a	1	Other	Other
+8e8dd719-2828-4450-9923-881cf3d5406c	1	Other	Other
+8e8de488-2aef-459f-a720-061056ff6b69	1	Other	Other
+8e8e1134-2f52-4d8c-9a41-387063670fa1	1	Other	Other
+8e8e1fa5-a6e7-465a-abe7-e5dbc903336d	1	Other	Other
+8e8e6677-5cb0-4195-b282-e92b8408b0e8	1	\N	Other
+8e8ea19f-88fb-4ad0-8631-61ff63aa2b55	1	Other	Other
+8e8eb16a-3456-405a-884c-418e7bb23c0d	1	Other	Other
+8e8ec98e-061e-4e4f-8251-6cf73ffac324	1	Other	Other
+8e8ed05c-f0d1-4941-a4f0-2ceea7e0c1ee	1	Other	Other
+8e8ee9fa-4f3a-4c1a-a59b-cacad67b30f7	1	Other	Other
+8e8f406e-934d-4d0a-a54e-239d66f64e22	1	Other	Other
+8e8f76e7-956c-4de7-a66a-dc3969b862f8	1	Other	Other
+8e8f8702-bde3-4265-9b4f-2eebbbfc48e8	1	Other	Other
+8e8fbc35-f418-4427-b604-6befb2e464f8	1	Other	Other
+8e8ff1d6-87a3-4f97-87d6-2aea2885f65c	1	Other	Other
+8e9025dd-b7c7-4fd2-9aa7-a74c12506bc8	1	Other	Other
+8e9038f0-28db-475c-a20f-0aa1f6db77d0	1	Other	Other
+8e903e06-fb6c-446b-8ae6-708838b77ada	1	Other	Other
+8e905571-7573-4138-8c74-6ec3d8f891e8	1	Other	Other
+8e908824-f652-4a39-ac6d-9dac588fed5d	1	Other	Other
+8e908b27-3e3f-4231-8c2c-1f73ba50f67f	1	Other	Other
+8e909cf9-8676-4942-a82d-9f86838acd5f	1	\N	Other
+8e90a375-e923-4edb-b8ce-9f276e174031	1	Other	Other
+8e90c218-dc71-4434-bd0b-fdb8c379562f	1	\N	Other
+8e90dd06-e113-47ca-a6fe-34e2f02ed0c8	1	Other	Other
+8e911b9d-a894-4e61-b898-36b49a25e41d	1	James	Other
+8e9148c8-8b61-483b-8471-752577a8d61a	1	Other	Other
+8e916f37-e167-4ac7-8131-66166a4c21fb	1	Other	Other
+8e9177c2-5233-4398-acda-48713f97e108	1	Other	Other
+8e91843f-fd52-4aa1-92a9-4e3139651238	1	Other	Other
+8e919ac7-863b-4c74-8651-c76d91f542f6	1	Other	Other
+8e91e69a-f440-425b-b532-0820c1b66de2	1	Other	Other
+8e920b5d-06a1-4375-8c6f-13716b2c95d6	1	Other	Other
+8e923966-39b4-4232-bb79-2164252e0238	1	Other	Other
+8e924fdc-a1b2-46e5-bdce-a35a51defe64	1	Other	Other
+8e931a72-2689-4b8b-bea7-358a2e5a5590	1	Other	Other
+8e932e4c-aff4-4b21-b118-ec9d8d9e362d	1	Other	Other
+8e936dc1-9679-4e04-a133-17b6e74896ed	1	Other	Other
+8e93ce2d-8626-4893-b478-4cf0f78c4b39	1	Other	Other
+8e93d02c-2378-44c4-9236-0b871341bc86	1	Other	Other
+8e93f0cc-56c9-42dc-869e-03616968fce8	1	Other	Other
+8e944485-48c9-4c5e-8de5-6ee2fe63a9d3	1	Other	Other
+8e94b306-10fc-4f1b-846d-84dfb4e968bb	1	Other	Other
+8e953dac-5649-4fcb-b507-bcd1e4118826	1	Other	Other
+8e954436-81ad-4dd0-b0be-b09684ce3025	1	Other	Other
+8e95457c-a1be-4d4a-b5ac-05a089db2442	1	Other	Other
+8e959ca2-f431-46ca-a3bc-e35e11868af1	1	Other	Other
+8e95a545-e625-41eb-a9d4-3cbcb6816e16	1	Other	Other
+8e95d3a5-0fd9-489c-8f75-3bbc3529a760	1	Other	Other
+8e963cb1-860f-4267-b314-3cb36c00668a	1	Other	Other
+8e964405-9bd2-4727-a90b-516c201ef9fb	1	Other	Other
+8e96483d-edf4-4368-abb8-2161dac6999b	1	Other	Other
+8e965b73-3ba8-4472-bc2b-d2e2dfa4f855	1	Other	Other
+8e966638-2b80-44a7-9c50-5c8b567c71bb	1	Other	Other
+8e96799e-68a8-4036-8ef7-14560693ffc9	1	Other	Other
+8e967a48-03fc-440d-8a41-f8fba4c36751	1	Other	Other
+8e9688da-daf2-4fec-8c2e-97a198c0fa77	1	Other	Other
+8e96a296-75e2-41d7-9d63-a90f8eb68a90	1	\N	Other
+8e973354-2d10-48ca-a18d-9eebb78251c9	1	Other	Other
+8e97883b-b681-434b-997a-591d6b535a4c	1	Other	Other
+8e9795f6-3591-47e3-8aad-91faa7b3c51c	1	Other	Other
+8e97b370-8442-486c-9650-60a81c6f8590	1	\N	Other
+8e97e880-4804-4a1f-85d3-f32d3303ed5c	1	Other	Other
+8e983530-c63c-4237-b8f9-1e61ac732096	1	Other	Other
+8e98383e-e5ef-49d9-ab22-7f123d8fc0b9	1	Other	Other
+8e984098-b23f-42b7-82c3-f05c8658da29	1	Other	Other
+8e9865bb-6bcc-4394-b1a1-76ed87d576e2	1	Other	Other
+8e986fb6-23b6-4aa2-8d6f-3b9094ba7b7e	1	Other	Other
+8e9873e6-773b-468f-a027-2c4a9f72d181	1	Other	Other
+8e988704-6049-41db-ba16-f2e0181bb143	1	Other	Other
+8e98dc00-d537-4022-8497-aee6522922e5	1	Other	Other
+8e98f468-407b-409d-99a8-539b85ee2f54	1	Other	Other
+8e98f9b1-57ff-4dd7-b7f3-c8df5d8a6e07	1	Other	Other
+8e9919d5-db07-4d17-be03-3eeaa98a2720	1	Other	Other
+8e994029-960d-4c34-a792-943f437c2f9c	1	Other	Other
+8e996573-64f7-4a6b-8a22-77987ac88497	1	Other	Other
+8e99aba6-977d-431a-9414-a20624a1704d	1	Other	Other
+8e9a0c36-d34d-4453-b743-c87ce5a0555c	1	Other	Other
+8e9a4d01-cf8c-4f53-b045-8373a445350e	1	Other	Other
+8e9a79c5-c807-40c0-bdca-0650d3a621f3	1	Other	Other
+8e9b764a-8441-46dc-9375-6d8644dc1f5d	1	Other	Other
+8e9b962b-c57f-4633-8772-9ecd5e16a0aa	1	Other	Other
+8e9bd0d0-27f0-48bb-9e77-0c8d463c437c	1	Other	Other
+8e9bf4c7-2d40-40e5-8422-2ca393b37dde	1	Other	Other
+8e9c47ec-77e4-4f3b-8f61-1823558f3097	1	Other	Other
+8e9c9811-e383-4f10-af6a-6d723a664eee	1	Other	Other
+8e9cb055-37c1-49af-9d9f-4fe892bc37cd	1	James	Other
+8e9cf865-1d0b-49be-ba91-8979c3a4a22a	1	Other	Other
+8e9d07e0-e002-4ef4-8ec4-676852824635	1	Other	Other
+8e9dd1ae-4890-45d5-8026-f527ee3a01e2	1	Other	Other
+8e9df0af-31e1-4adb-ab8a-5d11d1563ec6	1	\N	Other
+8e9e18f5-916b-4b25-8889-e4d8870b07c5	1	Other	Other
+8e9e9e52-99da-4db1-8934-75ac9a54ef36	1	Other	Other
+8e9ea600-2507-4805-86e5-77fff76e9dcb	1	Other	Other
+8e9f0434-f7da-4170-9233-3fa09fcf92c5	1	Other	Other
+8e9f1c53-f5e2-4598-aba3-f45475752dcf	1	Other	Other
+8e9f4dd7-8723-4132-996f-1bf06e7e438c	1	\N	Other
+8e9fa765-7a9e-4b5f-a1d3-00ace91e63ba	1	Other	Other
+8e9fb4a0-8ace-48aa-88db-5cdaea7dd628	1	Other	Other
+8e9fb8d1-dee4-42af-a14b-42ea06d5f0ed	1	Other	Other
+8e9fea78-5708-42a1-b4e4-0d6f4e446ee5	1	Other	Other
+8ea02f6a-01ea-4125-93c1-538f7e1c972c	1	Other	Other
+8ea05707-51ba-4f1d-b637-78fa2b3878d1	1	Other	Other
+8ea06606-e607-4d55-89af-a039347e8217	1	Other	Other
+8ea0695b-de9c-45e1-9634-612068f8ffe4	1	Other	Other
+8ea08681-9543-4481-9662-a1f61d540d5c	1	Other	Other
+8ea08aa8-5391-41a9-a871-63f53364c21e	1	Other	Other
+8ea08d23-d147-4f1b-9fea-3f8a76e0b8b8	1	Other	Other
+8ea0cf17-bdf8-4aa1-b5da-37a12a8266fc	1	Other	Other
+8ea10272-3e8f-4365-8205-83741412cd1a	1	Other	Other
+8ea13209-600e-4871-9d6f-0b604162d40f	1	Other	Other
+8ea1b03f-959c-4849-949f-269e3dc400f5	1	Other	Other
+8ea1d5ec-de4d-40c6-8e78-22b9f3f92071	1	Other	Other
+8ea1faff-7c0a-4c88-9f8d-7659b6d48cbd	1	Other	Other
+8ea24669-b858-4341-bddb-0fe10061970c	1	Other	Other
+8ea2c857-e55c-4995-976b-1b2ffcb1cbb3	1	\N	Other
+8ea30d69-c440-4760-8ab2-f2dbeff37ce2	1	Other	Other
+8ea31f77-0164-4752-97db-af8af3e24e48	1	Other	Other
+8ea34337-72dd-4b7a-acc0-b60b50aa37d8	1	Other	Other
+8ea350db-eb45-45ae-b8b0-56eae56d0c4e	1	Other	Other
+8ea3aade-8844-4485-89b2-0a1f00c70280	1	Other	Other
+8ea3ec85-658d-4c20-adcf-d2957ae6a2ab	1	Other	Other
+8ea4175c-6174-44eb-a2ca-5e6f336c06e3	1	Other	Other
+8ea4dad9-7c95-4bff-abe7-50f8771a0c89	1	Other	Other
+8ea54ca7-4822-459b-8ef3-b3b8d6d86cf2	1	Other	Other
+8ea580e9-70e1-48c9-aeb2-a0d88d9b82d2	1	Other	Other
+8ea61cd7-ec57-4aca-95f0-2ab75175ca16	1	Other	Other
+8ea61e68-c159-45cc-8265-989a2ad5aba5	1	Other	Other
+8ea62fae-9b8a-458f-a06d-c26befac9213	1	Other	Other
+8ea6492a-acfb-4ccd-a91d-a856d76e0229	1	Other	Other
+8ea65991-9e18-41d8-9ee3-0f63a294069f	1	Other	Other
+8ea65d29-6751-4d91-81d4-d35ecd37ba83	1	Other	Other
+8ea6803c-1489-4591-a9cf-f14c1f87c4ae	1	Other	Other
+8ea6a7a1-2b2d-4d51-a67c-41019b3b8e1c	1	Other	Other
+8ea6cded-1a0c-447a-8e55-b566b58396df	1	Other	Other
+8ea72e73-a331-4b68-9101-f392d3f0a3c2	1	Other	Other
+8ea72fee-9932-40cb-8321-f75ea7ca85bb	1	Other	Other
+8ea73089-e4a9-409e-a422-d4f8e2ec1725	1	Other	Other
+8ea7402b-31d1-459c-a937-b8b996709f1f	1	Other	Other
+8ea7682f-588a-4a4f-9d4e-9904665420d3	1	Other	Other
+8ea79c50-4852-4b22-b20a-29fb8851a4c5	1	Other	Other
+8ea7dfe9-77ab-4dda-93be-b2ff3b40d784	1	Other	Other
+8ea7ebcb-4814-4815-90d3-6e52f526b4e5	1	Other	Other
+8ea7ec4a-598d-4c41-a64d-055e6a6ea91f	1	Other	Other
+8ea850fa-1cd3-4925-a122-651575e8a6c1	1	\N	Other
+8ea86231-11d9-49a0-bd67-72d33138b705	1	Other	Other
+8ea865b0-ec2b-4334-98d8-a4d0e8904e9a	1	Other	Other
+8ea8a5d1-a477-4da1-8a29-26b182f2cc22	1	Other	Other
+8ea8f51f-0361-42a7-9109-7c9866ed3069	1	Other	Other
+8ea8f9cb-6172-47ba-a663-526efe4abae1	1	Other	Other
+8ea916aa-f576-4f40-8b23-6981a723770b	1	Other	Other
+8ea9c31b-907d-4dae-9319-3cb4db3de732	1	Other	Other
+8ea9d6b2-96de-4f69-a3aa-04751b855408	1	Other	Other
+8eaa7aae-9ec1-4903-8e47-5a70dc1dfc3e	1	Other	Other
+8eaa8904-5bc3-463b-82d0-683821bd8e4e	1	Other	Other
+8eaacdcb-fa2d-41c9-b94b-354a5dc6f5f8	1	Other	Other
+8eaadc6f-8a95-4f4d-bf84-0ae3b00b5d48	1	Other	Other
+8eaaf6e5-8cd7-4c91-bbcc-9d587e093a3c	1	Other	Other
+8eab12c5-ab69-49ef-970f-216dff8856c7	1	Other	Other
+8eab211f-f771-4740-be42-92d8e7fd5aa3	1	James	Other
+8eab2c86-8500-47ae-9bab-c3c5cfe59d79	1	Other	Other
+8eab66c0-f392-46ca-9959-49a4064882d8	1	Other	Other
+8eab67a4-90c6-4413-b50a-88d4dac0593d	1	Other	Other
+8eabc38a-b40c-44dc-9c9c-5e2d897d92f3	1	Other	Other
+8eac0716-1302-4bf0-9385-c00694bc41fe	1	Other	Other
+8eac0b0d-8739-4bd1-af03-75b2acd63041	1	Other	Other
+8eac2486-b22d-43e6-adf9-e2973f60f7b7	1	Other	Other
+8eac3c8d-7a06-4ae8-ab18-59215f4b48a3	1	Other	Other
+8eac4f3f-ff4e-47f7-92c1-7225f56d552f	1	Other	Other
+8eac786a-963f-42bd-87b7-79886801b140	1	Other	Other
+8eac947c-84d0-4bc4-ad6a-6b98d5d95361	1	Other	Other
+8eacec1f-2d3e-4934-8d73-357404bd3c8e	1	Other	Other
+8ead8780-cdf8-4fc5-a504-d753e861f2d9	1	Other	Other
+8eaddb95-0007-4dfb-aaa8-48747ceb81bf	1	Other	Other
+8eae07e1-7044-422a-a1d4-7419abf47e63	1	Other	Other
+8eae9458-5e08-4f3e-9459-6e936bdb4948	1	Other	Other
+8eaea0d7-37c2-40fe-91a7-7e2fafaa09db	1	Other	Other
+8eaf4590-72d2-4dcb-89e6-193bba93b0d0	1	Other	Other
+8eaf7b10-d26a-44dc-b310-2ee59e477c98	1	Other	Other
+8eafaee4-cf9d-424f-9800-24c1295dea87	1	Other	Other
+8eb01c9d-60a6-491e-bdf1-6f79d809f0ed	1	Other	Other
+8eb0867c-68f8-45cb-b9cc-e9c1401cfd33	1	Other	Other
+8eb08eb6-6fe7-462a-83ac-b3ca53cc4c3a	1	Other	Other
+8eb0bc4d-261a-45ba-b363-bc196a0d99fa	1	Other	Other
+8eb0c069-3d9c-4429-ab7b-54df1cd76cfc	1	Other	Other
+8eb1433e-a9cb-4dfc-becd-8f16fde6ea89	1	Other	Other
+8eb145d3-a027-4c5b-b284-647c7555e0db	1	Other	Other
+8eb15209-6fb6-4e19-9d27-5f4cb150876a	1	Other	Other
+8eb16bc7-3cf9-40a7-bc1c-b8d988e06fac	1	Other	Other
+8eb16fcf-7908-42d0-bff6-0522715fd79e	1	Other	Other
+8eb21a2a-403c-466b-9661-d9536dbcb0f9	1	Other	Other
+8eb28f68-b03d-4cf9-b9db-2a0379d0e56e	1	Other	Other
+8eb290cd-5198-409d-beeb-8cf32f97e053	1	Other	Other
+8eb2a781-ab69-47e1-969b-6f6d5b685529	1	Other	Other
+8eb2fff9-b25a-4f24-b58a-4a8ca2218694	1	Other	Other
+8eb33fe2-31c6-4e63-8b81-f5265bcc2602	1	Other	Other
+8eb35eca-e2ca-4d29-b685-56ef3598580d	1	Other	Other
+8eb39f80-c793-48d0-a7d8-19f1cd952fce	1	Other	Other
+8eb3a4db-9625-4223-96f8-64988f44861b	1	Other	Other
+8eb3e602-eacc-41b9-a04c-5f652daa3a96	1	Other	Other
+8eb3f825-2e53-4f44-91cd-a5a2714c5194	1	Other	Other
+8eb400f5-0654-47e5-8df6-d89c3a1fb773	1	\N	Other
+8eb437b2-1463-44d7-a149-640bcb747a76	1	Other	Other
+8eb44b57-1e66-4e76-ac9c-154d36cd284f	1	Other	Other
+8eb45d6f-0c99-4a7f-9d5f-555ad4d959ba	1	Other	Other
+8eb46d77-e39f-4bb9-89cc-623589e25aa7	1	Other	Other
+8eb48dc4-a823-4fa5-8538-4c6eb7967d99	1	Other	Other
+8eb48ebc-f400-4592-8315-842d9f802690	1	Other	Other
+8eb4ab1b-ca58-4f73-9ab7-1a8afe8156fd	1	Other	Other
+8eb4c52e-e5f1-4a92-95b7-38dbece8093c	1	Other	Other
+8eb4e132-59fc-438d-8eab-cfea7576d577	1	Other	Other
+8eb4e265-41b8-4e5f-9caa-d95677f537fb	1	Other	Other
+8eb4e380-6975-43e8-98ee-8bfe9b99411c	1	Other	Other
+8eb503d1-a35c-495b-86c0-ed74894b76f8	1	Other	Other
+8eb50b16-586a-49e1-ba55-cb67a49aa0ff	1	Other	Other
+8eb5aca5-7f6b-47d5-8a2b-a79518890fca	1	Other	Other
+8eb5f740-06ff-4599-9dd1-754183655d5d	1	Other	Other
+8eb69008-05c9-404f-9b62-9cae81519e35	1	Other	Other
+8eb6a873-6842-47e0-9e6e-e62e8a591c57	1	Other	Other
+8eb6b1ab-eb1a-4e47-9864-0d6d8cb860bb	1	Other	Other
+8eb6d965-5526-4334-b603-6da331c8978f	1	Other	Other
+8eb6e7c8-18c3-406e-ab12-df04a3235c7c	1	Other	Other
+8eb6f5aa-d1a2-40e7-8126-f11580ab23ab	1	Other	Other
+8eb700b0-f25e-468c-8548-62bfa595782c	1	Other	Other
+8eb7838f-e9fa-4eb8-80ee-b7cb156af86c	1	Other	Other
+8eb78e98-998e-4878-ba4c-8ae539dbe745	1	Other	Other
+8eb7b348-4ac7-4d0d-9b7a-07de851cb6a3	1	Other	Other
+8eb7b449-7fc9-451e-b4be-54dbf203e6d3	1	Other	Other
+8eb7c6f0-e2e7-4765-8da8-86784c234d64	1	Other	Other
+8eb7e242-7bb3-4635-899e-fc602f263e19	1	Other	Other
+8eb7ff3b-bc69-49b6-beb7-07bb1fa7dab4	1	Other	Other
+8eb837fd-a899-425c-9880-083eaa4545ad	1	Other	Other
+8eb89784-6fac-4467-aab5-c4ae86ab4c80	1	Other	Other
+8eb8b083-1cd5-4921-be04-09f3e0ef09f2	1	Other	Other
+8eb8e0ce-f182-4ee7-9a1a-bd4f589b804e	1	Other	Other
+8eb97149-c1c9-46b5-9a82-f9a2482c5f1d	1	Other	Other
+8eb98460-d2d7-4a77-8ba5-1dac62c4dc00	1	Other	Other
+8eb9e92c-4988-4d34-9009-ed9eaaf53f64	1	Other	Other
+8eba798b-b0f7-4eab-bad1-658cea98d90b	1	Other	Other
+8eba8236-3bec-4d0d-bb73-d1a8bb3543cc	1	Other	Other
+8ebac9ab-39d3-4cfd-941a-dd563a015351	1	Other	Other
+8ebb2646-8da2-472a-9c1f-a130614a5336	1	Other	Other
+8ebb4ded-ca84-43bb-affa-0d30f4076ac3	1	Other	Other
+8ebb52c4-5a2b-430b-ac6b-875f3a9693a8	1	Other	Other
+8ebbe6ca-7a8d-4b59-8ec5-42d58c8e55a9	1	Other	Other
+8ebc86ec-21ea-4503-ba28-bbbd7cddd31d	1	Other	Other
+8ebca5a1-eb7d-4081-91ed-58ecce8d27eb	1	Other	Other
+8ebd6b06-ae57-49b1-b949-f567bd63adab	1	Other	Other
+8ebdd0ff-6291-41d5-a4b4-f7e02e2be7ea	1	Other	Other
+8ebdf194-2042-4194-8b53-56fac492a090	1	Other	Other
+8ebe031a-d347-4894-b4b1-6ce3f1f3b22b	1	Other	Other
+8ebe202b-5b6f-420b-b0cb-2538e1c8aebb	1	Other	Other
+8ebe5d96-eb69-40af-ace6-0e2c721d6619	1	Other	Other
+8ebe61aa-04b9-452a-a237-3d68bcd6bfa2	1	Other	Other
+8ebea0ff-319f-4d18-8b5e-8a495c76b2c8	1	Other	Other
+8ebeee12-d53c-4b4f-8c47-26b80306f7fc	1	Other	Other
+8ebf4e65-c670-47a9-95c5-37c0ee8994c7	1	Other	Other
+8ebfcd65-c70f-4696-8fe4-5bdfa1fb74ee	1	Other	Other
+8ec05506-e0f0-4264-9920-a0d537c514f4	1	Other	Other
+8ec06017-59f0-4ae1-a608-a6f066dfc812	1	Other	Other
+8ec06eee-c8c5-4d0f-8417-f86dc3593855	1	Other	Other
+8ec087ed-0d1e-4ba0-8045-7dd5b7fccf10	1	Other	Other
+8ec097ed-fb72-4129-a094-dceb8602d544	1	Other	Other
+8ec097f0-5a05-4619-af93-1569f4703328	1	Other	Other
+8ec0bc3d-bf30-4bf9-90d9-0f2d89b8f364	1	Other	Other
+8ec15b6f-487a-4333-b1c9-7ed9f6637424	1	Other	Other
+8ec1d6e7-5197-44a1-98c3-920c3653e477	1	\N	Other
+8ec1ef78-b68c-492e-bca1-82cdb02f1d41	1	Other	Other
+8ec21105-667d-4306-b48a-f9f7e7b06b9b	1	James	Other
+8ec25f50-bf1a-4598-9805-0fb75d71c447	1	Other	Other
+8ec27c8c-cc53-4ba7-a74a-b92bded6b36a	1	Other	Other
+8ec29722-cdcf-43e9-9cfd-ab2b29909efb	1	Other	Other
+8ec2c3a8-ada2-4861-b423-603284937ba4	1	Other	Other
+8ec2e633-2bed-45b4-b6ad-ff07d94d6ada	1	Other	Other
+8ec2e801-aef1-4484-a194-d714695df2d3	1	Other	Other
+8ec320fb-be87-47b0-aed5-e6d672896565	1	Other	Other
+8ec327b2-8d2d-4e89-838a-7db53958f7ed	1	Other	Other
+8ec353ea-2b43-43b3-ab06-01ebdc65e35a	1	Other	Other
+8ec3868f-a948-4d19-af75-ee5b02851dbc	1	Other	Other
+8ec38a0d-580e-458c-a63d-026c5d1aa6ed	1	Other	Other
+8ec3aa43-5a38-4d3e-831a-1f0afeb61ce5	1	Other	Other
+8ec430b4-c704-4bb5-8305-6eb43dab79e9	1	Other	Other
+8ec43b1b-3998-475b-a22f-d9340e55a49d	1	Other	Other
+8ec4c598-cfd9-42d0-ab2c-e87fe75235fa	1	Other	Other
+8ec4db3b-3711-4afe-b1b4-aece285f5aa2	1	Other	Other
+8ec4deb9-6287-467d-b207-2dcba24a355a	1	Other	Other
+8ec4fa33-9ce3-4150-958f-b509fa138b39	1	Other	Other
+8ec5973b-4e91-42f3-8e93-cc8f555136bf	1	Other	Other
+8ec5c36b-1ea5-43eb-b4e1-4b3811e2babf	1	Other	Other
+8ec60182-34d0-4420-b1ed-f46ff487b625	1	Other	Other
+8ec654c8-c4e0-40d4-994d-6651d6ab7432	1	Other	Other
+8ec669b2-53eb-4614-bb94-450cf14ab03b	1	Other	Other
+8ec6a1b6-b368-41cd-85fc-225eadd97ddf	1	Other	Other
+8ec6f175-c76a-4928-8b92-df4997b22714	1	Other	Other
+8ec7161e-4031-49fb-af8c-43133895acae	1	\N	Other
+8ec74ff9-6558-4a6c-b3b3-44414ca5ce32	1	Other	Other
+8ec75da1-b516-416f-b000-f9ba16dae40d	1	Other	Other
+8ec7baa1-8a01-4f0f-95d2-e6c63fc6e36f	1	Other	Other
+8ec80624-1b41-4c8d-9d50-4adc3e21b45b	1	\N	Other
+8ec87647-e793-497e-8842-4cd2d5297e19	1	Other	Other
+8ec8cd8c-981c-4568-b021-a3dde68f6575	1	Other	Other
+8ec8f1a0-34f3-4e26-9f76-5477c85721f7	1	Other	Other
+8ec8fc2c-f214-49fd-9468-3d2f8ee56455	1	Other	Other
+8ec98e3f-438d-4db4-a3dd-7c0ebdd39753	1	Other	Other
+8ec9d5e4-def1-44cb-a3ee-521f6a9d9197	1	Other	Other
+8ec9e40e-4cbc-4f27-a9a8-1624c5c721ea	1	Other	Other
+8eca131b-0bce-4f7f-9f05-a8bccff1a720	1	Other	Other
+8eca7700-8818-4e14-8f53-fceea2e42e7d	1	Other	Other
+8eca8042-8c86-48d4-8dee-e3672898e07d	1	Other	Other
+8ecad5fc-0213-44c8-9a82-8e24f6aedf4e	1	Other	Other
+8ecadb8f-2f5d-4480-bdb4-f19d93ab9f39	1	Other	Other
+8ecb03b4-f40b-44f2-8f14-367128799e87	1	Other	Other
+8ecb106a-7d81-4d24-8c04-69c6747e68a6	1	Other	Other
+8ecb7111-3f9d-4959-a972-fb58e62e486a	1	Other	Other
+8ecba899-57ea-4615-9215-becb737596ea	1	Other	Other
+8ecbec42-de36-4bbd-ab17-d99f5ca6db52	1	Other	Other
+8ecc3369-045c-4f9d-8647-1be82de17070	1	Other	Other
+8ecc657c-b8b8-4bc7-b9ce-41f1f694c590	1	Other	Other
+8ecc6944-3b1d-4dd9-97a3-b73f5aecdad1	1	Other	Other
+8ecc69cd-9b6b-45f9-b675-e8c24e3108b3	1	Other	Other
+8ecc86c9-9730-4413-a671-cca5358a3e96	1	Other	Other
+8ecc9721-9864-4816-9b0d-0891f2271bc0	1	Other	Other
+8eccfb38-8cd9-4980-bcff-92aa37744de4	1	Other	Other
+8ecd98fc-31c4-4419-b938-02e833d98ac2	1	Other	Other
+8ecd9d81-8464-4bb3-bb4b-0d82f4713f10	1	Other	Other
+8ecde4b1-bc30-4851-823a-802b9ba3a98a	1	Other	Other
+8ece2ff5-2f61-4bf3-b155-5bba0d68e71e	1	Other	Other
+8ece4b28-82e4-490e-8e89-b16ef780ebff	1	Other	Other
+8ece703b-ff58-4129-aaff-40a69cec15dd	1	Other	Other
+8ece7189-691a-4950-88d1-4fca8ae110d6	1	Other	Other
+8ece8044-c14c-4d47-adda-d8cd5a87710f	1	\N	Other
+8ecea278-99fd-442c-a198-c6b6699cd944	1	Other	Other
+8ecf27ae-b096-425a-ad28-f30c1e3de7bc	1	Other	Other
+8ed05fcf-2ab3-4c0e-8133-ee14bea93d41	1	Other	Other
+8ed08d33-0c84-4ac7-9143-bee14eaad276	1	Other	Other
+8ed09f38-82c2-4f46-8382-3768ac12f272	1	Other	Other
+8ed0a803-8b48-4211-8fef-75271e782181	1	Other	Other
+8ed0c4b0-627b-4e93-915d-d6bdc1f26ad7	1	Other	Other
+8ed0df3b-dd01-4b27-83e7-569a4d0df813	1	Other	Other
+8ed114e8-e7dc-47a2-ad2a-84c2704736ad	1	Other	Other
+8ed13271-8e11-4a69-96ab-8f08af673397	1	\N	Other
+8ed18e7c-e882-4312-8c87-eacf97ceb5c5	1	Other	Other
+8ed1ac13-02d9-4f1a-b65e-bede0982bd8b	1	Other	Other
+8ed1f494-9dec-4ade-aeb4-c59d9660f765	1	Other	Other
+8ed22edf-2017-4057-b482-cc774e7f08b7	1	Other	Other
+8ed27630-f78c-4f88-81b7-61d08192814a	1	\N	Other
+8ed293b7-5bda-479b-a745-b4d249329d4b	1	Other	Other
+8ed2be37-8434-4625-8baa-6463e8098190	1	Other	Other
+8ed2be53-e8fa-462b-b4ed-1fb8539f9147	1	Other	Other
+8ed2f6f6-c95c-4547-b096-00518c137cfc	1	Other	Other
+8ed3045f-9502-4648-88d6-01450ae62c0f	1	Other	Other
+8ed3e13d-3448-4aa1-a3b8-2676313c67fd	1	Other	Other
+8ed3fd51-dd67-4e51-90a1-5574ec7bfd58	1	Other	Other
+8ed444d4-0b7e-4da8-be5b-120cec0545c6	1	Other	Other
+8ed459ec-31bd-4dfe-a346-1ee61a03f5a3	1	Other	Other
+8ed4b957-4984-466f-92d6-261a24677058	1	Other	Other
+8ed50fdf-c6d5-48df-bd82-f4876a4df94b	1	Other	Other
+8ed5255f-21fe-471f-ab3c-ad7699cb76e7	1	Other	Other
+8ed576b2-88ed-4c1f-905e-a6922c074f4d	1	\N	Other
+8ed5c010-b6ee-417d-8898-8e24352fa69e	1	Other	Other
+8ed5e802-94e6-4e25-a2e4-4f46281cd9e7	1	Other	Other
+8ed5f781-8968-4a97-b6b7-f2f9348daa00	1	Other	Other
+8ed634e9-ee19-4613-bf29-689d7dba3050	1	Other	Other
+8ed64b8e-54da-42d4-ad9e-988802779d7c	1	Other	Other
+8ed66c52-ce85-4624-bce8-f7b7596c2bbf	1	Other	Other
+8ed67d32-165a-4a73-a402-87b614bf0a94	1	Other	Other
+8ed6d182-6284-4bbd-afbc-1fe5d45a2e47	1	Other	Other
+8ed6daa2-0175-48e6-a50e-0f39b184e34f	1	Other	Other
+8ed6fd06-8f89-4897-8596-934744bf10bd	1	\N	Other
+8ed7a5f8-e0ca-4f3d-939f-e6b79c4195cf	1	Other	Other
+8ed7f967-9ce6-4038-b905-c814c8f3a818	1	Other	Other
+8ed80e37-52f3-4ce3-a8f7-cd09c2ede656	1	Other	Other
+8ed83bb6-ad30-437a-a577-00f0575e128e	1	Other	Other
+8ed8b461-9a87-4648-ab55-2322b4dfdb27	1	\N	Other
+8ed925b1-0e98-4f2f-ab56-e2a3a57428f2	1	Other	Other
+8ed92dbf-55ca-4692-9caf-18609d8bf4ec	1	Other	Other
+8ed940dc-dda4-4c71-a01f-b023b9891dc2	1	Other	Other
+8ed9540c-1a3e-4c41-abbd-7b4f378df234	1	Other	Other
+8ed9a057-ee4e-49e6-8d56-ad8412b557d5	1	Other	Other
+8ed9b5a0-d7c6-4375-9eda-6412917effbd	1	Other	Other
+8eda2441-c685-46cd-9ec7-50ce55b8368f	1	Other	Other
+8eda4385-4090-427d-9ff9-054498c347b9	1	Other	Other
+8eda6418-8f02-4daa-b5ec-5e05be72dee8	1	Other	Other
+8eda6489-6a20-470b-aefb-446491384aa6	1	Other	Other
+8edaa99b-a721-42f6-b72e-8760350e24c3	1	Other	Other
+8edad8bf-bf33-44eb-937e-a744b5bf73b3	1	Other	Other
+8edafd49-bc94-47ab-91a3-09101a38f9c6	1	Other	Other
+8edafe25-d6e9-4c8a-af46-13acd620a265	1	Other	Other
+8edb3461-30f9-4d54-9a3c-301e8897c7f3	1	Other	Other
+8edb928e-2441-46b3-a480-d3014e68bca7	1	Other	Other
+8edbdb3e-c03b-4167-8f2a-99c5940cdd05	1	Other	Other
+8edc1a5a-8882-4ef1-b7c1-bf46ef31f60b	1	Other	Other
+8edc5209-f2ac-4f72-8c68-b40b5cde2f3f	1	Other	Other
+8edc5ad3-254f-4c99-b717-6dd019b48551	1	Other	Other
+8edc741f-8071-4b91-b2ff-d1fe862f7ceb	1	Other	Other
+8edc78a3-da43-4cc8-ae08-113db633c734	1	Other	Other
+8edc8929-4bfe-43d7-852e-5cb8c23c1197	1	Other	Other
+8edccf17-ee2d-461c-8fb1-2952001cdaed	1	Other	Other
+8edcd142-fc61-4dc2-bb15-d8946ebeb0e5	1	Other	Other
+8edcfeb1-9da2-4fb6-acc1-0e4ce9e5bb17	1	\N	Other
+8edd1e44-27e1-4631-890a-a7475911da6b	1	Other	Other
+8edd9383-805a-4255-a38d-1b123a665459	1	Other	Other
+8eddacac-b064-402c-ae94-24bab4f4d415	1	\N	Other
+8eddf76e-8e01-4b5e-b2b4-27c0cd0e03ad	1	\N	Other
+8eddfdc3-a402-44f3-8945-f2f50df99250	1	Other	Other
+8eddffd3-0ac3-446e-b014-12ec800c67ee	1	\N	Other
+8ede1dd0-59fd-4d84-8125-80c1df0b0e41	1	Other	Other
+8ede3a45-0d77-4b1e-a868-62f42d521b84	1	Other	Other
+8ede4bc9-15fe-4b5f-83d1-0b3954def78f	1	Other	Other
+8ede6820-c6d2-4ae3-be84-3e8c77d3887a	1	\N	Other
+8edf467c-c60e-42e5-a7bc-7bd246d62fbd	1	Other	Other
+8edf4b83-5e29-46d8-aa8a-5818e9fdb352	1	Other	Other
+8edf8263-9feb-485c-9e4b-0cc00c138142	1	Other	Other
+8edf858e-96cb-4ebc-bba4-e5b4b05706a6	1	Other	Other
+8edf9d61-a927-4400-a0d0-dc06caa6ab3b	1	Other	Other
+8edfa9dd-36ef-4c45-9bb2-f1b36d4ba956	1	Other	Other
+8edfc204-9176-4a21-b441-ded05f65fa40	1	Other	Other
+8edfd6c7-3a5e-4bb7-a374-bf733dc05595	1	Other	Other
+8ee07f63-85ca-48da-9edc-186e42d92c85	1	Other	Other
+8ee08661-29ee-4fd6-95a3-b43ec7f4cd4a	1	Other	Other
+8ee098f5-78d7-45dd-8f14-73eec7607c60	1	Other	Other
+8ee13f7c-758b-4396-ad63-1c614556a838	1	\N	Other
+8ee16f5e-91a5-41f0-bdf3-1c031daf4737	1	Other	Other
+8ee18ad0-d2e9-495b-97f2-ceff76a3d059	1	Other	Other
+8ee19e98-b66b-4c83-95f5-c1a32c6deec3	1	Other	Other
+8ee1a629-0138-47b9-9123-a9d71cf3b9e4	1	Other	Other
+8ee1df3c-cb0b-4f0e-8ab3-03cbac81828b	1	Other	Other
+8ee1e429-e447-41a9-ad0f-f6bf63103ae8	1	Other	Other
+8ee219ab-4adf-4e99-9f2a-3221d918ad20	1	Other	Other
+8ee21a1b-9f01-4565-ac3d-3c4dd7d4c6f6	1	Other	Other
+8ee229d1-f458-42a8-9af0-6b11cab471e7	1	Other	Other
+8ee23ef4-5ecc-4fb4-a8e6-f6ac16137510	1	Other	Other
+8ee26a14-e8e0-4a4c-a61b-31ddd7eb85af	1	Other	Other
+8ee26cbb-a529-4c3f-97e0-27c5e7561a50	1	Other	Other
+8ee2c064-3478-411b-b5e2-e3c717e9ad27	1	Other	Other
+8ee2d177-2957-49f0-bf3d-69f136f55e09	1	Other	Other
+8ee2fc97-b4ce-47e3-be0c-d37ec446cfd8	1	Other	Other
+8ee3373a-59ab-4394-bfec-8b134c06d17c	1	Other	Other
+8ee34414-eb12-4f7d-ba72-c5a5ad851da1	1	\N	Other
+8ee3d5ea-7c9d-478d-bba8-a2ec8430f83a	1	Other	Other
+8ee3e708-4ec8-4c12-9df3-9a66787c94d0	1	Other	Other
+8ee41c20-20fb-4254-a1e3-03c2d2ee1379	1	Other	Other
+8ee431fc-3f55-4e50-b46e-a8088d65f072	1	Other	Other
+8ee49980-ab83-422b-a8c0-009b50e55a82	1	Other	Other
+8ee50e3a-8a25-41ea-9afe-d8c5a7a29310	1	Other	Other
+8ee52548-01fb-4ead-9246-092f727ca183	1	Other	Other
+8ee58034-8d1b-4d2f-85fa-b43889de48da	1	Other	Other
+8ee5956a-88a0-4c68-a53c-7fc802309898	1	Other	Other
+8ee5e6d1-a10d-4e7f-89c2-92844969540f	1	Other	Other
+8ee5e978-da52-4a2a-b3df-20a56f278534	1	Other	Other
+8ee5f40a-67fd-42a1-b574-cf2d565088fb	1	Other	Other
+8ee60842-d97e-40a1-b813-cf076521af2b	1	Other	Other
+8ee61899-3c78-4f74-89c7-e27e371ceac0	1	Other	Other
+8ee6314b-b7c8-4f85-a3ee-4b279bc2801d	1	Other	Other
+8ee67852-fbbe-4f8b-80f0-b60e3332cc1e	1	Other	Other
+8ee6852e-7b18-4193-949b-3caa45319f2c	1	Other	Other
+8ee6c8d4-778f-4465-9fc8-a62dfa7d52d4	1	Other	Other
+8ee6c8ec-8312-450a-a584-4401fa5334e0	1	Other	Other
+8ee6e2db-e269-4700-9aa9-4b8bbb3838fb	1	Other	Other
+8ee76eb3-54be-4946-a683-83cb2397b4ec	1	Other	Other
+8ee79783-319c-4411-b83e-60dc5e6acebd	1	Other	Other
+8ee7a589-46f1-4334-8bbe-6dce4c99be38	1	Other	Other
+8ee84c8e-adf3-4df9-a3a9-1afb24865e23	1	Other	Other
+8ee84e98-b299-4ee5-8bfc-695603df6fc4	1	Other	Other
+8ee86e3e-974a-46ac-9a6f-c0f99734526c	1	Other	Other
+8ee8adcf-e908-4095-b96f-300782c02721	1	Other	Other
+8ee8e97f-2387-42e9-b406-2fcd471123fb	1	Other	Other
+8ee8fe01-0e24-458a-8310-e153d858c4c5	1	Other	Other
+8ee91d62-0eac-495e-a6ce-849497cffd91	1	Other	Other
+8ee932b8-1270-4fc4-8feb-f48c8cf34b3d	1	Other	Other
+8ee94e5b-a606-4e41-b4f7-b7ee4b7ee3a1	1	Other	Other
+8ee95262-f69a-4889-9a0e-32298e1f59e4	1	Other	Other
+8ee96de6-bfdc-45aa-8b89-11f37669757e	1	Other	Other
+8ee97a84-2a1d-45a6-b2be-2da443fd49fd	1	Other	Other
+8ee9b17d-ef2f-4a7f-b806-5b61b4942ac5	1	James	Other
+8ee9b845-38b2-46a5-bcc5-715d708514dc	1	Other	Other
+8ee9d173-7a7f-4f95-923f-c187c494e840	1	Other	Other
+8ee9ee22-581e-4742-bb7e-bd6289f3e2fb	1	Other	Other
+8ee9f975-0d7a-4073-8aef-75c6adf750a8	1	Other	Other
+8eea9f5f-c467-4dd0-8178-881cee5c45b9	1	Other	Other
+8eeaf42c-7298-480a-a10c-183bb8403831	1	Other	Other
+8eeb2406-685a-4c6c-8c87-27d834980025	1	Other	Other
+8eeb2b4f-e6aa-49bf-9a81-a8a92a3c7375	1	Other	Other
+8eeb3049-eb0a-4936-8aa5-b3fa4e1be5fd	1	Other	Other
+8eeb6243-41ad-4bce-a16e-b151afc2d999	1	Other	Other
+8eeb8319-7241-4aa7-9f0f-c21077f6ae03	1	Other	Other
+8eebacde-7ee7-4f68-b233-eec55e0d4061	1	Other	Other
+8eebaeda-b765-4bdf-96b0-f4084bd19da2	1	Other	Other
+8eebb4a0-efd0-462e-85da-c1cf95b0839e	1	Other	Other
+8eec26b5-1eec-4792-a6bf-fce185660e02	1	Other	Other
+8eec33e8-25c4-498b-9c8b-aaa21dae48d2	1	\N	Other
+8eec4a7b-0a89-4a77-8931-d9d163a6edad	1	Other	Other
+8eec5ac1-ddfc-403e-8c59-3b3f4b1b9515	1	Other	Other
+8eec9f2c-d7fd-4811-99a0-558985f243f6	1	Other	Other
+8eecb21b-f3c9-4df7-9829-1512fb8dd8a2	1	Other	Other
+8eecb92f-e2aa-4fb5-8a95-942563d7218a	1	Other	Other
+8eecee84-32f1-4270-af14-c521b957ad80	1	Other	Other
+8eecf823-5271-46c1-8430-c68939e43607	1	Other	Other
+8eecfe5b-6e87-4f22-87e7-47f637d47f4b	1	Other	Other
+8eed1670-5046-47a5-909f-101e640e2dfa	1	Other	Other
+8eed18c4-f054-4b59-b732-9219b26561cb	1	Other	Other
+8eed3ce6-035e-4856-83d7-fc043b883b97	1	Other	Other
+8eed7165-8b31-4275-b3c1-310ae5efe892	1	Other	Other
+8eede766-09c8-4e48-9a07-24f13078b308	1	Other	Other
+8eee60b3-ebd2-4b8c-9e4d-69ab7d6d071b	1	Other	Other
+8eee6f6f-989e-411f-9b08-16d36d6a82ca	1	Other	Other
+8eee876e-84af-48aa-8da7-703bdb46a4ba	1	Other	Other
+8eee8fe3-1a1b-46b1-b79b-2974a1075ce2	1	Other	Other
+8eeeca93-63dc-42f0-847d-9ce86dc71197	1	Other	Other
+8eef1f8b-4d60-47fe-9f89-a4af8af2ff74	1	Other	Other
+8eef3292-e84e-4ce0-a4a4-dc3bc17b1e8b	1	Other	Other
+8eef4b49-8efe-49d7-b13e-c4d3452baff7	1	Other	Other
+8eef9d70-4c3a-48c5-9f23-6dbf9d0f9b6d	1	Other	Other
+8eefbbce-cd39-48e2-9ade-160ba525965e	1	Other	Other
+8eefce0b-25c9-4b3b-bcea-140a735519aa	1	Other	Other
+8eefe2af-29bf-4b29-8b16-55076f556cd2	1	Other	Other
+8ef02a20-d1cb-4cc0-92a8-4ee2105f970d	1	Other	Other
+8ef02cef-245a-4520-8eda-f7a00c065969	1	Other	Other
+8ef0751d-1068-4db8-b337-d298da0e0075	1	Other	Other
+8ef07bb8-2af5-47ea-ac0e-ae7ed8074439	1	Other	Other
+8ef0ee7b-427f-417c-910f-1d21b847b9bb	1	Other	Other
+8ef11060-d658-4cb9-b788-2bc072ee3c26	1	Other	Other
+8ef11b29-7f3e-4925-bea2-82143360e79b	1	Other	Other
+8ef19427-1495-4c4c-a245-691e599b4f38	1	Other	Other
+8ef1e72f-a6fd-444a-86e5-c76a74e6faf5	1	Other	Other
+8ef1ec1f-5d7e-4d4b-9d0d-48afe088ba44	1	Other	Other
+8ef2368a-f4f1-4d76-ac79-23ae41e56886	1	Other	Other
+8ef24e18-23d8-472e-8cd4-96f839843313	1	Other	Other
+8ef2555e-672d-46cf-a32c-675067ac12ca	1	Other	Other
+8ef27916-6d0d-4246-8b49-49dc4a41c86c	1	Other	Other
+8ef2926e-1cf0-4779-b00b-07235e1ba394	1	Other	Other
+8ef2a1a1-30d9-4e1c-b88c-3a9e6e3e2f21	1	Other	Other
+8ef2b55d-27d5-4952-adfb-dfb3fe5245f5	1	Other	Other
+8ef2d0ac-3a9a-4ca4-908a-1f74b314cd66	1	Other	Other
+8ef344bd-8616-4a29-8354-5e77cf820112	1	Other	Other
+8ef34e76-4735-4d63-96fe-7351317bcfc7	1	Other	Other
+8ef35479-3f76-4a08-8176-8f16d56759bc	1	Other	Other
+8ef35d15-d54e-469b-b3d1-f9527c963b86	1	Other	Other
+8ef3776b-2554-43df-a44f-025277d48f8e	1	Other	Other
+8ef37b5c-59c7-4167-b5f2-51474b734716	1	Other	Other
+8ef38dfe-577b-497a-99ce-5ce444c34a58	1	Other	Other
+8ef3b889-8389-41ba-ae10-059bb40b8ea3	1	Other	Other
+8ef3f107-434b-4d9f-86b3-a0feefd1c485	1	Other	Other
+8ef3f5d3-1041-48d0-861a-4d92681526db	1	Other	Other
+8ef417a5-9c8a-4ba7-a8fc-4c81c5bfc895	1	Other	Other
+8ef45307-fc37-4efa-b7e6-831351fcc911	1	Other	Other
+8ef4b4ea-379b-4edb-8e42-f687d0efb20b	1	Other	Other
+8ef4e9e0-417c-46e6-b226-abd4241f57e5	1	Other	Other
+8ef52967-8526-423a-9f11-e580ebf93ffb	1	Other	Other
+8ef55519-1391-4276-b859-bb7c4cc02c37	1	Other	Other
+8ef57c30-370b-47b3-8968-405b8f05f9e3	1	Other	Other
+8ef58085-6237-410e-81dc-8553556cc813	1	Other	Other
+8ef5bffb-2145-404b-9416-ec78c1d8fea3	1	Other	Other
+8ef60b77-ff5a-47f6-a20a-7e5d2277f7e7	1	Other	Other
+8ef626a1-8f0c-4ec1-9f8d-99d971a4c2dd	1	Other	Other
+8ef631e4-b2bd-49c1-8c8a-9ee1e00ee93f	1	Other	Other
+8ef65eae-800e-4139-a103-a0794a412841	1	Other	Other
+8ef6bf1b-0e47-44a6-a9ef-9afba62e79e0	1	Other	Other
+8ef6ea69-52fe-4839-8d0f-874e9661829e	1	Other	Other
+8ef75136-6b99-41d1-8946-075130353775	1	Other	Other
+8ef75986-a934-46c2-a22f-2d53c29993da	1	Other	Other
+8ef76f18-07c6-4c7e-bfda-ae4fa7b0c5e4	1	Other	Other
+8ef7719e-5a5c-44fd-9814-8594e3107c89	1	Other	Other
+8ef779f6-58d4-4b43-a43b-8c1437479594	1	Other	Other
+8ef79600-bc99-4533-bf44-0737152c90da	1	Other	Other
+8ef7afef-d756-4082-8ff7-efed4d8b0333	1	Other	Other
+8ef7c07e-399e-490b-ac89-37ced63f1cb1	1	Other	Other
+8ef7e4cb-d338-49c8-bae2-efeefc236e28	1	Other	Other
+8ef7f692-a117-4210-833e-1cf2ee4b83fc	1	Other	Other
+8ef87179-540f-4b43-9bb7-48f55326465d	1	Other	Other
+8ef87581-25d1-4b6b-b4ba-fe0d2d123298	1	Other	Other
+8ef8dfc1-7478-4264-8303-8af8fdb4ea61	1	Other	Other
+8ef928e5-d817-4e5a-9e33-398120a21105	1	Other	Other
+8ef93b5c-0c2a-4090-ae38-db39f0e4476b	1	Other	Other
+8ef94d55-d8f9-45b8-a53d-4f516f60e985	1	Other	Other
+8ef95722-a8a5-42a3-aacc-1f788fe288aa	1	Other	Other
+8ef95db2-81e4-4264-bf17-952c88bf6666	1	Other	Other
+8ef96c1f-18f1-4436-a96a-a48ea0124c9d	1	Other	Other
+8ef96e37-2903-4072-9cf6-9b68c612a184	1	Other	Other
+8ef99906-1bbf-4c0d-90e3-8148f97f1414	1	Other	Other
+8ef9c96f-7447-47e7-a331-d954d9a312b9	1	Other	Other
+8ef9d3d3-fc94-4616-bb16-63cecc33a786	1	Other	Other
+8efa1aa9-605b-4dcf-a61c-15aae32c6dc5	1	Other	Other
+8efa7903-0e09-48c3-9618-2a5bb7703e3a	1	Other	Other
+8efa9168-95bf-48c3-84f0-b5da2fe2e886	1	Other	Other
+8efb161f-f30b-4e0c-8f8d-bacc2189769e	1	Other	Other
+8efb314d-9910-42ee-a221-fd8d1d9ecc86	1	Other	Other
+8efb4e37-852e-47cd-aa4b-4c46c903e1f0	1	Other	Other
+8efb663d-aca4-4504-85dd-c1062742bc5a	1	Other	Other
+8efb7716-fa6e-4e5b-a5d7-e4fcb8a88ae5	1	Other	Other
+8efbefc6-be4b-494e-9080-e09ee4827f96	1	Other	Other
+8efbf490-3afc-4ca2-b647-9992640c38ea	1	Other	Other
+8efc0c82-56b9-4684-82de-aad28aa9b42d	1	Other	Other
+8efc12ca-228f-4ec9-b56c-c7b8a3dcf2fd	1	Other	Other
+8efc2453-c1f4-4971-aed8-380611d7b1f3	1	Other	Other
+8efc55a8-88e4-4e70-9033-b486fa58ffef	1	Other	Other
+8efc6e81-28de-4db5-91da-e869a68e4008	1	Other	Other
+8efcb60b-2ebd-40f7-a996-34559e13a3d6	1	Other	Other
+8efd1daa-d80b-4c2b-946b-7a88dd6f1dc0	1	Other	Other
+8efd21c7-bb8e-413d-b19c-898113b2c350	1	Other	Other
+8efd82a1-ac9c-4567-b0b6-96e0c936b079	1	Other	Other
+8efdbfd8-d2d9-4f48-86e0-c37561431cf9	1	Other	Other
+8efdd164-d31e-47d5-9165-d20d4806e4ed	1	Other	Other
+8efe2a9b-15d5-47e7-88c8-5ee5b6aac917	1	Other	Other
+8efeaac4-b195-408f-9959-c5df2b80d2fe	1	Other	Other
+8efeaf68-6d48-4688-92a5-53e907e861db	1	Other	Other
+8eff21ad-4641-4b35-9fbe-97b9cf7355c6	1	Other	Other
+8eff256b-29bc-4860-ba28-ffd6fe1280fa	1	\N	Other
+8eff5860-af6e-40a9-ade3-df9249148128	1	Other	Other
+8eff5c58-d6c7-4890-89c2-b0893a714fde	1	Other	Other
+8eff6f15-3830-4b84-a17f-b768f2e2d8cb	1	Other	Other
+8eff7a1b-1134-4307-955d-60efa03e509d	1	Other	Other
+8effc461-0093-4030-be7b-6d7568fe1eda	1	Other	Other
+8effc57b-3dcd-4d57-acde-25530e31c26e	1	Other	Other
+8effdab8-c3ee-42e7-9530-6ad78d89f5cb	1	Other	Other
+8f00278e-6161-4182-91f6-184ceee122dd	1	Other	Other
+8f005dc0-a89c-4513-b82c-ac2a0d0c757b	1	Other	Other
+8f007e4c-b281-47cb-82e7-44b1b86da5c3	1	Other	Other
+8f00acdb-a90a-4d8c-879a-d55408d159a6	1	Other	Other
+8f00d999-6293-4dda-9301-be81f96aaebd	1	Other	Other
+8f01103b-5dbf-4bc2-bc67-bb52a5fcb366	1	Other	Other
+8f011658-7057-41ff-8b60-3ab669a7db17	1	Other	Other
+8f0122ac-493b-4aea-9c4e-72d4e79a51a3	1	Other	Other
+8f013c2f-2299-49f2-a363-48010e453945	1	Other	Other
+8f01625c-a215-4d77-bbce-33855b0a1c89	1	Other	Other
+8f01c076-f892-47f0-a6c5-f9b9678b3820	1	Other	Other
+8f01d0c3-a61f-4ff5-ba49-b202e5d075b5	1	\N	Other
+8f01d6c4-db2c-4582-a99e-a64c28010c6c	1	Other	Other
+8f024a88-64f2-4566-af6e-306d2af71fd2	1	Other	Other
+8f025c10-fd15-4393-9254-83accc694b54	1	Other	Other
+8f028e73-7a6c-4925-912d-869d4ffbe2b2	1	Other	Other
+8f029475-e8de-47b6-b5cb-ee1560ba48db	1	Other	Other
+8f02bcd5-1c70-4006-9f81-360e558903c6	1	Other	Other
+8f02cfd7-3f3e-47bf-b52c-8ec7b9b8078f	1	Other	Other
+8f02d55c-72cd-4468-ae52-ea234af8e09d	1	Other	Other
+8f0320c5-9461-4308-93cd-10187f969fdd	1	Other	Other
+8f034596-8085-4ac8-a25b-5aa7b205c011	1	Other	Other
+8f03685a-04e9-46d8-a50a-6725723ec094	1	Other	Other
+8f03c6ae-cd56-40ea-9f55-0bd58c861812	1	Other	Other
+8f03fe62-f02e-4cb3-b03e-78ae363b1961	1	Other	Other
+8f041d83-fc6e-40a5-9269-ef725bc71a98	1	Other	Other
+8f046a38-5f87-4294-bfd4-e092db11b175	1	Other	Other
+8f0481a1-a6d7-4a1d-a080-a72304c4dfcc	1	Other	Other
+8f04ba86-6768-4ead-95d0-ced57fb355dc	1	Other	Other
+8f04bc3b-7bbe-42e2-9fb0-cd8cd8a394e9	1	Other	Other
+8f04c021-b03b-429f-b468-ac80893fb8ec	1	Other	Other
+8f04c738-04b8-4a1c-a560-e72e670a9b6c	1	Other	Other
+8f04eaec-0b7c-46ac-b731-aa25b9c3bd48	1	Other	Other
+8f04f827-4ce8-4bf6-92a3-f65ce82db78a	1	Other	Other
+8f0512ca-adc1-494d-9a67-e93b3fcce04d	1	Other	Other
+8f0519be-09fc-493f-86f4-6da12882f5de	1	Other	Other
+8f052673-0bae-4556-97b5-348584f90a39	1	Other	Other
+8f052893-8ebe-4be7-92f8-451d2fb9d2f3	1	Other	Other
+8f052ad8-71c7-4d2f-8d65-0e77d180e3f2	1	Other	Other
+8f053828-9bfe-4173-a9cd-678480cc6b56	1	Other	Other
+8f0564f0-63ee-4f3a-a16e-5d876f37faf1	1	Other	Other
+8f05866b-7176-4768-810b-cb04749fe3a1	1	Other	Other
+8f05a210-3815-4c61-827d-154cac4c9091	1	Other	Other
+8f05cda2-a6db-47d5-aca3-1a980be5a5ad	1	Other	Other
+8f060d8a-ed52-45a9-8edc-5c6e139ec828	1	Other	Other
+8f0641f0-c87c-4a22-998f-272a81ea1178	1	Other	Other
+8f067320-040a-4b85-bb68-f6f51ae897c4	1	Other	Other
+8f06887d-a18e-4246-8623-6b78c89fb8ab	1	Other	Other
+8f06ae82-de78-406f-a623-62fa2dbf4772	1	Other	Other
+8f0715db-4845-40af-bc91-1444269de660	1	Other	Other
+8f071c0a-0035-4996-a0fa-e460bfc8af72	1	Other	Other
+8f0753b5-07a9-4e3c-be34-70b3e02ee0f4	1	Other	Other
+8f07838b-2de5-4503-9314-f3d87f1acc2a	1	Other	Other
+8f0784d4-975f-4afd-84c8-beb835bec905	1	Other	Other
+8f078eb0-6b65-4a42-887d-d5c34b933844	1	Other	Other
+8f07b124-6729-4249-851d-fc1039e5a2d8	1	Other	Other
+8f07b22d-3fe8-4fa4-b3d4-82456aeb0da4	1	Other	Other
+8f07f98a-5b6b-4a87-9df7-ca69a12071b5	1	Other	Other
+8f081f55-713f-479c-a117-5727491f96d5	1	Other	Other
+8f08f43c-edec-4415-a8e6-4ffadd0651c2	1	Other	Other
+8f092cf2-b52b-44c4-8bb3-741bb4bfcab8	1	Other	Other
+8f09685f-55c6-47d0-abdf-af82c5bfc125	1	Other	Other
+8f0982ec-8b54-4b10-8bfa-046eb1cbc5ef	1	Other	Other
+8f09aac9-9d76-4a23-9f80-39c0da92e896	1	Other	Other
+8f0a2806-8e4d-4a59-8778-d90c0e3f6078	1	Other	Other
+8f0a74e3-ef10-4022-a624-2290717ff7a8	1	Other	Other
+8f0a9f5e-af23-40d5-8fb4-fa2c7d7db18c	1	Other	Other
+8f0b45bf-42db-4818-9527-b202c3c174be	1	\N	Other
+8f0b9653-364f-411e-b9f6-b09a2cb1afb7	1	Other	Other
+8f0bc579-b008-48d3-a409-2844f04c36cb	1	Other	Other
+8f0c13d6-9875-48f9-83e8-d0c8827b24a2	1	Other	Other
+8f0c1426-b402-44b9-90f9-2fac131d1091	1	Other	Other
+8f0c18fd-afbb-4525-a240-dfc207d7c656	1	Other	Other
+8f0c1d35-042d-472c-b2b6-e8c768088b19	1	Other	Other
+8f0c4530-3634-4ef4-bcb9-0841276fbebf	1	Other	Other
+8f0ceabb-c8c8-46f9-845e-466969ebd4f9	1	Other	Other
+8f0d0713-70e0-44c2-911a-e22b7f911286	1	Other	Other
+8f0d1027-54d9-459c-b9a7-79ce116cf5f5	1	Other	Other
+8f0d1fe1-42a0-4ce3-b6ff-cbed1ba365b2	1	Other	Other
+8f0d58a9-f3e9-4b54-9438-85cb9b30c9e8	1	Other	Other
+8f0d5c76-4b5e-44da-bfa7-915c820e22b3	1	Other	Other
+8f0dce2e-0c1a-4f58-b502-acf83f7ded5a	1	Other	Other
+8f0ddc63-6325-4852-912e-fdafa172e65b	1	Other	Other
+8f0e1a11-cc4d-41b4-a803-bc5f16adaff0	1	Other	Other
+8f0e22f7-b462-47dd-84e6-68a0adf7db52	1	Other	Other
+8f0e64bf-76da-4ed6-9eb0-f74d7761c969	1	Other	Other
+8f0e913a-0c57-4769-a1a9-88123aaeb10b	1	Other	Other
+8f0e9aa3-f8bf-4cb7-b9ed-3c24ed9e8245	1	Other	Other
+8f0eb8b1-93e8-48e2-8798-863e396bf811	1	Other	Other
+8f0ec1e5-c119-4f13-81d5-516f2bf270c7	1	\N	Other
+8f0f4102-9f96-4b89-a13f-411baf94a21f	1	Other	Other
+8f0f43c7-13b0-4422-a33e-8069f38320c3	1	Other	Other
+8f0f7b61-df0c-4606-99c6-760829cec02d	1	Other	Other
+8f0f8c2d-ba50-41df-84d8-134998c75262	1	Other	Other
+8f0f9089-b83d-410e-8be7-4a3d8e3f97d8	1	Other	Other
+8f0fb897-a018-4f08-a27a-c110905f8c66	1	Other	Other
+8f0fc720-44ab-4bec-9653-7bd84471dd27	1	Other	Other
+8f103e93-76e0-4be1-8083-7da40bdba2f0	1	Other	Other
+8f1056c7-f3c9-42d0-8024-bf124d60a308	1	Other	Other
+8f106cf2-9122-48b7-b631-38279bbd8e4c	1	Other	Other
+8f107420-b2ac-4c1b-bb8c-b24a5c5517ee	1	Other	Other
+8f10baf8-779d-471e-b8bd-063403ad9851	1	Other	Other
+8f10f8e0-448a-41c6-b8d0-e9e261f17236	1	Other	Other
+8f110853-ada5-428d-bb54-a4234f7e36a1	1	Other	Other
+8f11793d-01b7-46be-86a6-be1f64fbcc4a	1	Other	Other
+8f11e690-156b-44a3-85f1-9be38551a7ad	1	Other	Other
+8f12313a-f476-4711-ab0f-861a1003ddcf	1	Other	Other
+8f1266ec-33f4-41b4-b4b6-21a3cca3cc18	1	Other	Other
+8f1299bb-33f5-491a-9e94-a9a3426a65c7	1	James	Other
+8f12b33b-6298-48b7-9550-48fc03fec23c	1	Other	Other
+8f131c67-1e42-4469-83c1-4b642f699e08	1	Other	Other
+8f133702-ad4b-462f-b494-6dc7948b5da8	1	Other	Other
+8f133bc6-452e-459d-a8fd-f9c16fd89742	1	Other	Other
+8f1347d0-a240-4095-ae5c-6ce0319f46ed	1	Other	Other
+8f138a26-3d88-43d0-9738-283b6138631c	1	Other	Other
+8f13a3ae-c2f6-4b15-8f52-82abf5be2d59	1	Other	Other
+8f13aa56-7a6f-4179-8ee1-8858190abc8f	1	\N	Other
+8f13c491-4221-4081-a56a-dbc0f4d3609d	1	Other	Other
+8f13c85f-c508-4d27-875a-d1553870b8ae	1	Other	Other
+8f1439e9-32a1-4759-b368-11ef5e005da8	1	Other	Other
+8f149a67-5f99-411e-8abc-a204876da8e1	1	Other	Other
+8f14a2f9-5dbf-4e92-8a8c-6076ba59836d	1	Other	Other
+8f14a37d-6181-4d5b-8bb7-ee09c492e204	1	Other	Other
+8f14b704-c478-489f-97a4-97594ff435d3	1	Other	Other
+8f14cdc5-e3c2-469d-880f-2310d658f746	1	Other	Other
+8f14cfa2-c3cd-49fe-bb76-ac020b8e6d9f	1	Other	Other
+8f14f625-7615-44af-a434-2b3c86313c19	1	Other	Other
+8f150595-645a-48c1-9fba-1bdbe8c64e95	1	Other	Other
+8f157a21-4ec7-4029-a0c3-4e4416ee4c63	1	Other	Other
+8f1599cc-9e47-49e0-bc33-269b3540dc4b	1	Other	Other
+8f162d56-0319-4821-8388-d7024b8556f2	1	Other	Other
+8f1642ca-daab-48f9-ab57-afbc0e02df49	1	Other	Other
+8f16c762-939f-4ccd-8b70-91befececb80	1	Other	Other
+8f16f618-1a3b-4e0d-9c9b-8dc3e3eebbf8	1	Other	Other
+8f17221c-be41-420c-94e1-7ad449f05163	1	Other	Other
+8f173a6c-ff8e-4006-9712-fb568287993d	1	Other	Other
+8f173e6e-1649-496a-9163-04d540414a74	1	Other	Other
+8f174bd2-755c-4ff6-a0e2-ad9955a99c32	1	Other	Other
+8f17b5b2-cbb4-42f2-8e2b-33cfc1df772e	1	Other	Other
+8f1827d6-73c1-4ec6-b4c8-2bb240281981	1	\N	Other
+8f18512e-b403-4894-b284-1774b9843943	1	Other	Other
+8f18f858-51cf-4cd7-8bab-817660fa7258	1	Other	Other
+8f191efc-cc12-483f-b239-e160a6378f0e	1	Other	Other
+8f194ec0-d586-4cd2-9ffa-288eb9826d6d	1	Other	Other
+8f19686a-6c71-4d3e-a089-22534c6594da	1	Other	Other
+8f19783c-6daf-443e-b1e7-112adb405357	1	Other	Other
+8f19e784-7285-4db5-8aa8-73583e89d34c	1	Other	Other
+8f19f53d-c1da-416c-b17a-d6e24f4462f8	1	Other	Other
+8f1a1538-dea0-4e08-9d7d-1a9b2cef9c55	1	Other	Other
+8f1ad000-532a-4df3-9988-b35fdedb7473	1	Other	Other
+8f1aff68-63dd-4e56-8a4e-f58eef146441	1	Other	Other
+8f1b4bc7-4cf6-4f8b-8960-9940d687d3d1	1	\N	Other
+8f1b6b8d-e1b1-4ff4-a159-62c81d11fe70	1	Other	Other
+8f1ba20e-517b-4a34-b1a8-968d71226dea	1	Other	Other
+8f1c070b-f278-4ddd-9ac2-7ca493367eb5	1	Other	Other
+8f1c1589-3d69-4a01-8818-2a207eba10b1	1	Other	Other
+8f1c20ac-3123-4d66-a846-cb1a0608c12b	1	Other	Other
+8f1c2f53-97db-47d4-bfa0-d7c7dd2da66c	1	\N	Other
+8f1c4e66-e338-4012-b6cf-621f2cebabc1	1	Other	Other
+8f1c65f8-3ae5-4385-9be8-f7990d1ae95a	1	Other	Other
+8f1ca035-cdd4-4f10-940c-6bfe5ac1ea82	1	Other	Other
+8f1ca358-6a7b-4d5e-88e2-5fdc5acb789b	1	Other	Other
+8f1caf9b-114d-44d4-9554-58666fc3ba59	1	Other	Other
+8f1cee26-927e-4724-921f-42e119581704	1	Other	Other
+8f1d62ee-b8bb-4e32-b370-f719b7815bf5	1	Other	Other
+8f1d7015-b131-4044-8c7f-609b1721bd16	1	Other	Other
+8f1d7ef0-2289-4018-9105-39628b4f7eb0	1	Other	Other
+8f1de0a6-111f-4384-9ffc-ae22f40089be	1	Other	Other
+8f1de49c-87e6-4def-9bf0-555616922497	1	Other	Other
+8f1e504e-c3a0-4299-b80a-65513a2acc7e	1	Other	Other
+8f1e741d-992e-4a9c-beaf-951d0b028975	1	Other	Other
+8f1e9821-c512-4ab1-9518-45ba3ee7a8b1	1	Other	Other
+8f1ea204-c57a-4bf4-80e6-34bf59d5ad7c	1	Other	Other
+8f1ed00d-c10c-4151-93c2-2b4bfbf3d361	1	Other	Other
+8f1ef678-58de-4a6f-9870-d0b9667b1a96	1	Other	Other
+8f1f5b39-a968-4218-90c7-156a998196ef	1	Other	Other
+8f1f6f60-2b4e-44e2-b36e-916d3298c47c	1	Other	Other
+8f1f96c8-9a18-499a-b225-0b980281bcd3	1	Other	Other
+8f1ff603-3fe5-490f-b1d5-00560b6ae3fa	1	Other	Other
+8f207877-7c07-44db-b0f6-44d4c88a24e9	1	Other	Other
+8f209794-cfda-459b-ae87-7685cab7e188	1	Other	Other
+8f209b3a-83b8-4db0-ab25-2733068c7724	1	Other	Other
+8f20bdfd-90c7-4317-b945-8ccc4fd59f75	1	Other	Other
+8f20fd57-ccca-4e53-bb3f-9770dbc5b8ad	1	Other	Other
+8f217a0b-6f68-47be-a6f6-299629d679fc	1	Other	Other
+8f219079-b12d-40ad-b1bf-c5a53f797649	1	Other	Other
+8f21f4bb-8760-4eb8-92cb-3875221fc117	1	James	Other
+8f21f874-3efb-4b8a-aed0-b4bfe50a1a07	1	James	Other
+8f229341-af92-44e3-8d57-8d1b61f7cdfd	1	Other	Other
+8f230a53-7d94-4206-aa35-9dedf3dcbfd1	1	Other	Other
+8f232018-5d61-4a0e-b8da-0bc4f226d7e8	1	Other	Other
+8f23d124-c379-4f97-9e63-4d1945e013be	1	Other	Other
+8f247b65-6fc1-40cb-9905-2dbb1d10abdc	1	Other	Other
+8f248d5f-abeb-4b59-8e48-79c5fa768b87	1	\N	Other
+8f24bf03-3569-4332-8bef-86bd185a486b	1	Other	Other
+8f250496-e9c5-422d-aec2-f5b19e08d262	1	Other	Other
+8f25805b-1b34-4e96-ac52-6d410b728286	1	Other	Other
+8f2585da-cac1-424f-894f-485bb2aff2bd	1	Other	Other
+8f25a9f4-2bc4-48fb-81e1-4767722f9bbb	1	Other	Other
+8f25f1a4-80f4-4bce-b2e7-05e9f0312b05	1	Other	Other
+8f26127b-e1ff-4bcc-be70-bc587ede3fba	1	Other	Other
+8f265d0b-5282-4385-9550-3fbe3aaac71a	1	Other	Other
+8f265fa5-fb37-4821-91a2-52b5053a112e	1	Other	Other
+8f266f1c-c9f6-47c8-a514-bcf3444b210a	1	Other	Other
+8f26c3b5-c7cd-4d81-84bf-725b7bc576f4	1	Other	Other
+8f272bbb-5b97-40cd-a50e-104ce341c50b	1	Other	Other
+8f273615-2c95-421d-981f-bad23fa9911d	1	Other	Other
+8f273bcc-e07e-4638-861f-435567b0172a	1	Other	Other
+8f27879d-08e5-4e3e-8e8f-c73b62746971	1	Other	Other
+8f27c6cc-6ef4-43ee-9b01-1f729ddb87ce	1	Other	Other
+8f27d4a6-5570-4a87-aad4-e5f3d20322f5	1	Other	Other
+8f289ce4-095b-4a5c-bee0-cb7ec8ba018c	1	Other	Other
+8f289ee0-ed97-47ff-ba2a-b540a03a6b69	1	Other	Other
+8f292462-e7f8-43cc-8b04-37b11931555b	1	\N	Other
+8f2924e4-933b-458d-b9eb-530c7567e270	1	Other	Other
+8f29aa00-f850-482f-98d6-7743d7cd8b57	1	Other	Other
+8f2a2648-24da-40a1-8785-3eed8af9b288	1	Other	Other
+8f2a66b7-425c-4b09-8ec2-61a352e67182	1	Other	Other
+8f2abc9e-a061-4928-aee2-2faecf164aae	1	Other	Other
+8f2acf33-aa6e-43ba-a481-d510b6739018	1	Other	Other
+8f2aefa3-a549-4cfd-880f-6afe5d2e92de	1	Other	Other
+8f2af787-9d87-4719-a514-cda1fccaee79	1	Other	Other
+8f2b2661-b7dc-4878-a11c-a1fcc6454690	1	Other	Other
+8f2b4b4b-5cbd-4229-826a-a7e93224c517	1	Other	Other
+8f2b6a19-4868-4784-a794-4f86191c833e	1	Other	Other
+8f2ba78b-2959-45ad-9993-774315804ae4	1	Other	Other
+8f2c0457-ba63-4c14-80b9-cac275576075	1	Other	Other
+8f2c556e-0e84-4e89-a96c-e1d9b552e424	1	Other	Other
+8f2cd0c4-be96-4892-bd41-27ed9a4c063d	1	Other	Other
+8f2ce3e7-92f0-4030-9038-6ac2ba9ebcb6	1	Other	Other
+8f2ceb0b-b26b-4268-9847-1a2499fcf6f1	1	Other	Other
+8f2d2263-3cbc-4e4c-b52a-17c3b95f6b1a	1	Other	Other
+8f2d2676-f95c-4146-a000-3ca25477a3eb	1	Other	Other
+8f2d6ac1-753e-42cc-864f-dccdf902f3ba	1	Other	Other
+8f2d8dd3-27f9-41e8-b76f-1014504484b9	1	Other	Other
+8f2dcbad-1c5d-44f6-9020-bf64e3026894	1	Other	Other
+8f2e1ec5-2812-4d27-a621-87e8820a9afc	1	Other	Other
+8f2e4579-9b72-4183-866d-bbadb0d2b06e	1	Other	Other
+8f2e74de-2e18-44de-9f40-b0d2ea338840	1	Other	Other
+8f2e9849-4a5f-4468-85b6-c5cd3aa651a8	1	Other	Other
+8f2eac6f-288f-4b30-8f1b-8bfb3174bda1	1	Other	Other
+8f2eeb4c-e347-4f98-8a54-ead2bc71afb8	1	Other	Other
+8f2f0169-5bfd-487b-8314-33803a0629fc	1	Other	Other
+8f2f0fb0-cf5d-472b-b17e-f42c060fa719	1	Other	Other
+8f2f3e13-cdff-483d-a682-70c1860923ae	1	Other	Other
+8f2f5747-0903-4172-8549-ed88db7ce72e	1	Other	Other
+8f2fbd7b-f35c-4f30-9767-897fdde8eaa9	1	Other	Other
+8f306b14-ccc9-4b3c-9f9a-4a00c7d93a41	1	Other	Other
+8f307b24-95b1-48e9-9913-744a584d4f6a	1	Other	Other
+8f30daed-198a-4cf7-a7ed-1eab40d81929	1	Other	Other
+8f30df87-548c-4cf6-b616-7aa40edae7b7	1	Other	Other
+8f319d08-bb04-4a93-a61d-46d2861a64a6	1	Other	Other
+8f31a6da-73fe-42e1-b649-465a6cbabc5c	1	Other	Other
+8f31db7b-4ad6-4d15-8f1f-161622010907	1	Other	Other
+8f320f78-2e4c-477f-9436-16e8cd5bba74	1	Other	Other
+8f32198c-1f6c-403f-aba2-21db8ad73f6a	1	Other	Other
+8f323407-23a7-4233-afac-e25f6d2ba318	1	Other	Other
+8f3253b3-e358-4cb6-a1a4-f95c28402272	1	Other	Other
+8f329d52-e375-4974-b119-e63ebc51d1d2	1	Other	Other
+8f32e299-f3be-4d97-be85-3b123aa29754	1	Other	Other
+8f32e351-f6f0-4415-be41-b4285b6492f9	1	Other	Other
+8f32fab3-7c09-4fb2-b9bf-447c7aea0bde	1	Other	Other
+8f333432-2072-453e-86f9-cff5f340e636	1	Other	Other
+8f3335d5-d372-479c-bf8d-7103e9ad7576	1	Other	Other
+8f337198-2b21-4243-8ff2-42e15efc4a1b	1	Other	Other
+8f33744b-eb7b-43fb-868c-19d8eb220a55	1	Other	Other
+8f339188-f5aa-432d-b9dd-136743c1869e	1	Other	Other
+8f33a300-1c91-4c4f-b15e-67c2490ffbce	1	Other	Other
+8f33fdb1-de13-4f88-ba21-f5f8c8d8d91e	1	Other	Other
+8f3411e5-bc3c-42f0-ba8d-4253477839a4	1	Other	Other
+8f3421df-0e5f-44bb-910a-7e56d1be4367	1	Other	Other
+8f343499-1ee0-48ec-95cc-c4d77cc6afa8	1	Other	Other
+8f348e17-6a09-41e7-a02d-7cdf93db0438	1	Other	Other
+8f34e48a-7f11-4211-955f-24a6d795030d	1	Other	Other
+8f34f149-dddb-46ef-81c2-6d10c78d0aae	1	\N	Other
+8f350429-2b17-42ea-b5e1-6ab069f0b9a4	1	Other	Other
+8f350468-f447-430e-bc3b-2eee5cc1bf68	1	Other	Other
+8f350f7a-02c1-4689-beb2-31e38ba9e001	1	Other	Other
+8f351802-921f-4ae0-acd4-5410684c60de	1	Other	Other
+8f353c00-7169-414f-8251-495a9384dcd7	1	Other	Other
+8f357d49-c0f8-4fe9-be95-6c79d2e911f2	1	Other	Other
+8f35b8a3-56de-4437-9c40-f2bf2a4cbf3b	1	Other	Other
+8f365534-06ca-483a-b9c4-1214500cfe8c	1	Other	Other
+8f3690ec-1ba1-4843-a6d5-117e7d626649	1	Other	Other
+8f36a63f-fd01-45c3-aa0e-604099801039	1	Other	Other
+8f36a9ad-b835-4907-9e27-bd0eb1f53aa6	1	Other	Other
+8f36aeef-9292-4053-8037-fa305b236b0c	1	Other	Other
+8f36d16c-9f7d-4da5-a3b2-fed66d957625	1	Other	Other
+8f37096f-5d5e-475f-940b-5e374b66ed4a	1	Other	Other
+8f371d31-1128-47d6-9436-5798ea3dd0e1	1	Other	Other
+8f377e6a-dc1e-4264-9800-1f8ed5e1a199	1	Other	Other
+8f37adc8-9278-417c-9e37-748d6419ea0f	1	Other	Other
+8f37ae27-f35f-4f33-b034-70a4714d3e17	1	Other	Other
+8f37f959-8747-4d22-93f2-1c97f3fb4393	1	Other	Other
+8f382c98-cd1a-43cc-9543-0c3c86aed551	1	Other	Other
+8f387c25-7667-4742-8cd2-62bf8b4d010f	1	Other	Other
+8f387d5a-853e-46b4-8779-1696affec1b9	1	Other	Other
+8f38ad5f-8ed4-41a0-a891-4e9b2e4c8ccb	1	Other	Other
+8f39226f-5eb3-495b-a20d-8cef17c32ca4	1	Other	Other
+8f3932ff-68b1-461d-b6ed-b771ea32ea50	1	Other	Other
+8f39c966-b620-4819-9c04-6f233dbf9250	1	Other	Other
+8f3a48ad-67ec-4139-9ebb-1ed0677a40d2	1	Other	Other
+8f3a80f8-6ce6-4ecb-985e-29a02e0a5e91	1	Other	Other
+8f3a8e88-03f3-44e9-b166-cc67ba17df27	1	Other	Other
+8f3af93f-4fe6-47d8-ab4e-9339517666fb	1	Other	Other
+8f3b2ec0-6491-4113-aad3-4e2f45ca0f44	1	Other	Other
+8f3b9c6e-b9ce-493d-b570-6bc1dda664a3	1	Other	Other
+8f3bacd7-5774-46bc-851d-a5ac13e998df	1	Other	Other
+8f3bd0e8-9b2b-499e-86d1-f0269f9792aa	1	Other	Other
+8f3bf934-8209-44d1-b108-0045b7e7f7b8	1	Other	Other
+8f3c0bb9-0a1a-4a46-8bb0-bc1aeb49c478	1	Other	Other
+8f3c2752-58ec-46cf-8ed8-03fefecd95b3	1	Other	Other
+8f3c5a1a-d462-4aae-84e5-b82a02b75931	1	Other	Other
+8f3c72ca-6220-41ed-86dd-7b546e693666	1	Other	Other
+8f3c907d-c8fc-4db4-b1b7-1998cd6a8245	1	Other	Other
+8f3ca5db-1fa8-4d30-9806-ef634288b4b1	1	Other	Other
+8f3ca8f0-efa4-436b-9ec1-7167644581b7	1	Other	Other
+8f3cac1d-7f44-4e74-85d6-0d3ffb1cb16d	1	Other	Other
+8f3ce001-5d7f-4231-a0ac-758e0b948760	1	Other	Other
+8f3ce15c-9cc9-4089-9e1e-a73435f42501	1	Other	Other
+8f3d1c54-82be-4e23-9ad0-cda547e1779b	1	Other	Other
+8f3d227c-8a7c-4096-ab92-7a051a6784fa	1	Other	Other
+8f3d44ec-dd0d-4307-8481-ce8ab9d05935	1	Other	Other
+8f3d86ca-5960-4336-bfdc-35bab748fd3f	1	James	Other
+8f3da5c7-c769-43eb-9e7a-8fd8b38ed201	1	Other	Other
+8f3dac09-bfcb-4a08-8800-d890a14ae26d	1	Other	Other
+8f3e2536-c250-4bcf-91b6-d9667e3783c0	1	Other	Other
+8f3ea9ba-ae41-49d0-b232-d8e05b7176bd	1	Other	Other
+8f3eeaa6-f3ef-4346-9b91-f5869afab8db	1	Other	Other
+8f3f3fc2-9c77-4535-a69f-05e10727f7ac	1	Other	Other
+8f3f5fcc-8900-476e-98f8-dc29862d7837	1	Other	Other
+8f3f6692-8325-474b-84da-e4416e6bb9a8	1	Other	Other
+8f3f87fa-9dec-4d4b-abe4-389a9ed6f1da	1	\N	Other
+8f3fdfd6-f094-4056-acbd-c88d1164e66d	1	Other	Other
+8f3fe9b0-17ad-40c3-92db-be8ececdadbf	1	Other	Other
+8f3fed39-d7b5-4d2c-9508-7088832cb889	1	\N	Other
+8f401cfa-bae2-484c-adc6-0662b053ce6b	1	Other	Other
+8f401f85-21c8-4fed-9343-480310e5cad7	1	Other	Other
+8f402a74-8faa-475c-aaf5-22eb514114c2	1	Other	Other
+8f403237-c120-46a5-8185-4fd8ad5f8d57	1	Other	Other
+8f404263-e154-4e26-8371-4001cd0d4459	1	Other	Other
+8f409535-2e42-4c9e-88bd-01b17bf39f9b	1	Other	Other
+8f40972e-d845-426a-ac4f-02d638b5a46a	1	Other	Other
+8f40bb21-fb59-4ac6-a81f-0c2620a71663	1	Other	Other
+8f40dc6c-8470-4350-a6d7-ea2fd37a6afa	1	Other	Other
+8f40eb51-1fc5-440e-92ae-b7a423f2d2ce	1	Other	Other
+8f414e59-e4ec-4afd-a635-5df00cc5312e	1	Other	Other
+8f4153b0-ba1c-433d-98e5-a7c3e8b35559	1	Other	Other
+8f41ac50-fc6b-42f3-ab24-06411dd260de	1	Other	Other
+8f41bea4-07e1-4bcd-8ff4-4975854a7570	1	Other	Other
+8f41cd69-56cc-4ba5-9530-06961b7e66f4	1	Other	Other
+8f429c3f-9974-4bf1-9836-ab1221983371	1	Other	Other
+8f429f34-4526-479c-9c57-e5dc136d2237	1	Other	Other
+8f42b161-0e10-413e-8aef-9232cd1cf34c	1	Other	Other
+8f42d864-230f-45dd-9614-b39647ae3a7f	1	Other	Other
+8f42df4a-8850-4703-9bb0-9836bfb0dcd9	1	Other	Other
+8f42e718-9f64-4f1e-91e0-13ca46bb2010	1	Other	Other
+8f42fa99-0462-4071-941c-024d72244bf3	1	Other	Other
+8f42fdd8-5df5-4283-8aa9-5b8ef0fc28ff	1	Other	Other
+8f434e19-1e16-43a1-9d54-d81f7f6c297f	1	Other	Other
+8f4354da-60c8-4480-9dd5-ba3e90a34a57	1	Other	Other
+8f43c8eb-2d6a-4e0a-ab82-fbe229f45715	1	Other	Other
+8f4434f6-daee-4e8e-a5d1-61cf0b8aee63	1	Other	Other
+8f4451f0-7ec7-40f9-b278-fac2b91bb848	1	Other	Other
+8f448604-2593-494e-b988-be64c4183e81	1	Other	Other
+8f44a561-7f0f-4073-91b5-59375a0c2f71	1	Other	Other
+8f44b34b-cb9c-439c-bbd7-64e4b75d8ed6	1	Other	Other
+8f44cdd3-6d1a-4443-8fa7-5bd4891937cd	1	Other	Other
+8f450e11-a200-4ad0-9bcf-75b3713df90b	1	Other	Other
+8f451a75-fbea-4574-bc81-f4e7a093b172	1	Other	Other
+8f45498b-a173-4252-b3a9-c8ed5c3f4059	1	\N	Other
+8f455c13-3f5e-4592-8237-15ca322ba54b	1	Other	Other
+8f4592a2-00f8-45fa-8f95-f98e45b1313e	1	Other	Other
+8f45a11c-eeb2-49ba-875b-d5c32ff83c67	1	Other	Other
+8f45c7f2-75d3-45c4-a3f7-28d4e7682724	1	\N	Other
+8f45ca6b-90c8-4e39-85cf-d320cdf32d09	1	Other	Other
+8f45d566-c840-4a72-a6d6-724a6ecc06b3	1	Other	Other
+8f45e86e-f59a-4141-9272-21cc51818b18	1	Other	Other
+8f45ee61-368d-4c75-9635-0dcd72662649	1	Other	Other
+8f45f657-900e-472b-a3e8-adb2ea8499dd	1	Other	Other
+8f45f9f9-bde2-4c03-ac8b-13f16a77e206	1	Other	Other
+8f461021-9906-4f23-8073-5f8cf38b2358	1	Other	Other
+8f461b4e-e878-427d-bc35-e609450cb8a3	1	Other	Other
+8f4665d0-2097-4733-a5a2-74df65f576cb	1	Other	Other
+8f46a185-e385-459a-b264-429d949bf5f7	1	Other	Other
+8f46bccb-3e97-4233-a5d4-68335445a1eb	1	Other	Other
+8f46be5b-f87a-4515-b9a7-a8980a77d11e	1	Other	Other
+8f46d11c-09d8-42ee-bcba-fee4bb0d65d8	1	Other	Other
+8f46ffe9-a223-4d71-a341-7c496171bdaa	1	Other	Other
+8f470f17-b40d-460a-b375-f236bf66b0f2	1	Other	Other
+8f47101e-ec5b-4f3d-8fbc-d07039684d52	1	Other	Other
+8f475202-5441-479f-9d43-00677335ac13	1	Other	Other
+8f475689-3294-4c3b-add8-99724e778553	1	Other	Other
+8f47d1d2-c0ea-43fb-90a6-4128b9f05960	1	Other	Other
+8f47da98-34b3-4609-a906-3b62a3365db9	1	Other	Other
+8f48bc3f-152b-45ea-9b03-554d7419e1da	1	Other	Other
+8f48c25f-9882-479f-a09f-0ec3c9c887eb	1	Other	Other
+8f48e53a-69f0-429e-a3a5-555d6c048070	1	Other	Other
+8f48ecca-a16d-480c-a57c-18b6a7ad535d	1	Other	Other
+8f4926a0-8ea5-4741-a475-91ce9bf5192d	1	Other	Other
+8f496b2a-1640-40aa-8108-c55ec3d2c3c5	1	Other	Other
+8f49b0ee-5a1e-4b9e-87f3-b3a7f87f2374	1	Other	Other
+8f49f96b-60d0-4a4d-86f1-9ddc1ac303f1	1	Other	Other
+8f4a3dd0-837d-4f02-912b-6a9a0a8ca218	1	Other	Other
+8f4a5740-b059-4851-98cf-7fedeec8851d	1	Other	Other
+8f4a7b89-ab2a-4592-8efc-171a7a224193	1	Other	Other
+8f4a847c-fa90-4d02-9d78-b36fc9009ed4	1	Other	Other
+8f4ab196-1708-4eef-82e8-982665a0d315	1	Other	Other
+8f4acd96-c3b2-480d-81fb-35885545c3a6	1	Other	Other
+8f4b1fdd-6f34-4b08-b5c9-ee1e2ae2bd41	1	Other	Other
+8f4b3e43-2ce9-4ae9-af10-3fe5c8d7bba8	1	Other	Other
+8f4b4449-f166-4dd4-a15f-84c19719c39f	1	Other	Other
+8f4b4fad-be39-444e-87bf-256c641bd8e4	1	Other	Other
+8f4b889e-fbf8-475b-b261-4d9e5072f246	1	Other	Other
+8f4bc400-31c2-42be-a545-bec859b9df10	1	Other	Other
+8f4bca8d-19e9-4be5-856d-8ed3797eaf3b	1	Other	Other
+8f4c0d2f-d379-4fbd-b0ef-704e5476e948	1	Other	Other
+8f4c4ce9-c7dc-4ba9-9b1b-0ca27c7b6fb8	1	Other	Other
+8f4c865d-1ad4-4136-b073-74657f7652bf	1	Other	Other
+8f4ce8f8-6a90-4e52-bfa5-ca81368b31a4	1	Other	Other
+8f4d9239-51c5-44ff-a0bf-f11168b50fa2	1	Other	Other
+8f4da605-6889-48e1-be95-ed43d920c1c3	1	Other	Other
+8f4e4232-d5ef-43ed-83f4-5c9fbe0878c5	1	Other	Other
+8f4e5c17-9ede-416e-a0b6-c22d2831c115	1	Other	Other
+8f4e6656-ead0-4e7a-bfda-258f44b5a456	1	Other	Other
+8f4e966c-6df8-4bf8-a13b-39fb4564ac61	1	Other	Other
+8f4ed54b-0310-454e-8294-6296b189868f	1	Other	Other
+8f4f1fdd-e0e4-4849-8e71-bf879eb42054	1	Other	Other
+8f4f2768-e5a3-44fa-857f-c0f5471a837a	1	Other	Other
+8f4f36de-e0b2-4ccc-a538-0e0d3c9a7a6e	1	\N	Other
+8f4f8aa4-e398-4aab-a8cb-35cc1ed0c561	1	Other	Other
+8f4f9b04-0c4c-4262-b28a-66a5b93a0a53	1	Other	Other
+8f4ffa0f-5f10-4fc9-ae1d-4cd33a690d7e	1	Other	Other
+8f501b71-be22-48a6-97c6-1650de6e34bc	1	Other	Other
+8f50281d-1c04-491d-9357-b24265c1d10b	1	Other	Other
+8f50368b-8320-4bd9-9353-f999a88b9274	1	Other	Other
+8f5042b9-a3ac-4d55-a760-62b7017f69aa	1	Other	Other
+8f504a33-271c-4251-b804-cfb19495bb36	1	Other	Other
+8f506713-961d-43d5-9263-3baeabcb7e0a	1	Other	Other
+8f50993c-e7ef-426a-a684-577e6421b54f	1	Other	Other
+8f50e228-7df4-42a5-aa45-49d50eb27b81	1	Other	Other
+8f510431-9138-4b20-921a-396fc2b37e88	1	Other	Other
+8f515871-ebb9-40ad-8fd0-778d47221e60	1	Other	Other
+8f521633-a9aa-456b-b2d9-61bab694d545	1	Other	Other
+8f523fc6-dc7c-4df2-8443-258fb4194e27	1	Other	Other
+8f5299bf-4b7f-482e-ad89-52289e8a3ec2	1	Other	Other
+8f52a2a7-2631-4838-afd5-9a4e2605507e	1	Other	Other
+8f52daff-bc3e-4086-840d-6d1bd2059c07	1	Other	Other
+8f52e8de-550c-47c3-a564-9b42ebf87624	1	Other	Other
+8f5317a7-51a3-421a-8047-79672a06cc0c	1	Other	Other
+8f532edc-e08d-4717-a699-cd19109a02d9	1	Other	Other
+8f5390b9-e33b-4989-904a-b0e81b85a34f	1	Other	Other
+8f53a922-2997-409b-8917-14c366a9fe12	1	Other	Other
+8f53b439-aff2-452c-80e7-4368bdb8c114	1	Other	Other
+8f53d3cd-ad0a-4b9a-8eea-8322669fcbd2	1	Other	Other
+8f541eab-5627-4346-8713-ecc25c1a6ddd	1	Other	Other
+8f543418-3df0-4afe-b510-1233c97efde8	1	Other	Other
+8f543aab-4b8f-4946-b1df-47fea734bc3f	1	\N	Other
+8f54421b-04b0-4ecb-86b2-cfa1ab7cb7ef	1	Other	Other
+8f545fb3-9ad4-4851-9aa0-e350d0aa6b8a	1	Other	Other
+8f54caea-2019-45c8-84ab-67def4028a76	1	Other	Other
+8f54d97c-1206-4a3c-9852-8f85d5761576	1	Other	Other
+8f5503b8-3fbf-473c-ad9b-6e3f6793c8ef	1	Other	Other
+8f551838-7ca6-4869-ac11-30c509914c94	1	Other	Other
+8f55371d-56d0-46da-84fc-21b8d464c83d	1	Other	Other
+8f5582cb-4be2-4bd8-8117-25f0d51cac0e	1	Other	Other
+8f55af08-4b77-47cb-acd0-5cae67660a7f	1	Other	Other
+8f55d9db-12be-49b2-84c5-499bb2d943cd	1	Other	Other
+8f55ef19-a7d3-44a2-83ad-b6189068b217	1	Other	Other
+8f56a263-62f1-4b1e-8c0e-aeebc85bd653	1	Other	Other
+8f572f1f-1c5c-431b-9d55-2d84176b0cfa	1	Other	Other
+8f575aa5-195a-4cf5-b0bd-70ad11c1f88d	1	Other	Other
+8f577465-c11c-4d54-bc25-092a4e3dae03	1	Other	Other
+8f579c87-1759-4434-b508-4c323ff6ef90	1	Other	Other
+8f57bb03-e19b-4f55-8c2c-a313d52a5810	1	Other	Other
+8f57fda0-4a93-4570-b32c-7051180a9acf	1	\N	Other
+8f584fe5-7b0c-4b11-81f3-ecc2057d72a8	1	Other	Other
+8f58c22b-b916-4257-b079-c668d17bf930	1	Other	Other
+8f58e04f-66c2-4215-9beb-b13216816367	1	\N	Other
+8f58f0fd-8a35-4f72-877d-b9db5384410a	1	Other	Other
+8f5928f3-c9cd-4d35-a924-51027c50c95e	1	Other	Other
+8f594623-6f11-4471-a7fa-8545b9a7d901	1	Other	Other
+8f599896-2a51-4b82-a9bd-7e8b8f898a8f	1	James	Other
+8f59b8f3-b661-4ad2-940f-a8388cac13d1	1	Other	Other
+8f59ee92-5c9e-409f-9292-f60330460af3	1	Other	Other
+8f5a0d90-f997-48ed-aeea-50c2d9563f9f	1	Other	Other
+8f5a5c03-c0d1-4983-b5ea-6f512b7a76cf	1	James	Other
+8f5a60ad-5a9a-4adf-a103-0d50e48c5f79	1	Other	Other
+8f5aa5f1-caee-4b33-b25f-1f6a0f9a0ba9	1	Other	Other
+8f5ac5c4-614f-4515-9cc6-45172ec653cc	1	Other	Other
+8f5aeb20-9085-4c69-9b23-e38ff5981cc8	1	Other	Other
+8f5b1fd8-5dd5-4543-9c51-ea83e0932e05	1	Other	Other
+8f5b30db-d54a-42f9-801b-256d8513711f	1	Other	Other
+8f5bb37a-1d6a-49b0-bf07-28282bf9f560	1	Other	Other
+8f5bfa49-80cf-4dfd-a8ab-1fb1e831e2d6	1	Other	Other
+8f5bffe2-c0cf-4cf9-8298-48fbc74ac260	1	Other	Other
+8f5c13fa-449a-43a1-bcd0-672d955926e1	1	Other	Other
+8f5c4620-cbfd-4a65-ac5a-277ede275e13	1	Other	Other
+8f5c5362-c7bd-4b0a-a830-dfe98e1ffe80	1	Other	Other
+8f5c564c-899a-465a-8b33-c1daaae5089c	1	Other	Other
+8f5c5df0-8d1e-4207-9e7c-cde7d7f3c7b1	1	Other	Other
+8f5c9a93-3275-4210-a478-835ba0e278f7	1	Other	Other
+8f5cc85c-67f1-4930-b580-426d420d34eb	1	Other	Other
+8f5cd0dd-b5d7-4bf1-9e03-2bcf88d34498	1	Other	Other
+8f5cf4f3-f1c6-477b-b9b4-d2232ed410ee	1	Other	Other
+8f5d3462-4105-437e-a1f2-2ea548143548	1	Other	Other
+8f5d39a2-b768-4129-8072-03d402db4d00	1	Other	Other
+8f5dc518-a175-48f5-a56c-8cc1792c3071	1	Other	Other
+8f5e1ed0-62be-4c8e-8368-f5e58039f220	1	Other	Other
+8f5e24ce-ff35-4163-8030-11c32cecdf6c	1	Other	Other
+8f5e54ba-7597-4033-8277-a7cd54e285fa	1	Other	Other
+8f5e5da5-4152-4800-92d7-ec106e393638	1	Other	Other
+8f5e6aa9-29cd-43d8-9aca-57336fa7fc52	1	Other	Other
+8f5e84de-3ec6-4c47-b22b-3762daa10d40	1	James	Other
+8f5ea708-0a78-4648-b728-2531c0db1c40	1	Other	Other
+8f5ed69d-f87a-4bd3-ada2-38d6258e7127	1	Other	Other
+8f5f0df8-e37d-4006-9d05-ba9214976dc6	1	\N	Other
+8f5f162b-43be-4093-af99-e5b4e2453ba4	1	Other	Other
+8f5f532a-7a8f-4322-bd81-13b4412608f6	1	Other	Other
+8f5fc072-e2de-4912-adc5-2e5c566188d0	1	Other	Other
+8f603620-8cdb-47c6-b5d0-0afb9a9d5694	1	Other	Other
+8f60440d-2e8f-408b-b1b4-ae968241b89a	1	Other	Other
+8f605cf0-368f-405c-9395-4a19158e263a	1	\N	Other
+8f606f41-24ee-485f-82dd-73fb0690d9cb	1	Other	Other
+8f6083f6-8320-46d0-ae83-47531aa9366f	1	Other	Other
+8f60a881-af0d-4fe4-bbb0-77c4b48618d2	1	Other	Other
+8f60d984-7f78-4f86-9b54-85e37789ff58	1	Other	Other
+8f60eee3-b859-43e7-9320-7324a785c752	1	Other	Other
+8f61016b-6c03-4e49-b9b8-c4e66fb7b639	1	Other	Other
+8f6121c9-9a89-453a-981a-9e65207abfba	1	Other	Other
+8f6128bc-958c-4aa5-8b57-28fdf08324eb	1	Other	Other
+8f61a592-2623-4242-b691-7cc08f46ecef	1	Other	Other
+8f61a7f5-07e7-4439-983c-a65bc5b86429	1	Other	Other
+8f620e54-0b5e-4cab-bb8d-677132594df5	1	Other	Other
+8f621833-cd67-4985-8d62-8b2047d3d91c	1	Other	Other
+8f622f3f-2d8f-4815-9140-a94326625c1f	1	Other	Other
+8f626625-89eb-4a48-b776-6fc238cb4b31	1	Other	Other
+8f62d284-4986-46a0-9871-4d3e8551d99a	1	Other	Other
+8f632943-11ce-43ff-b9c4-abbb8283c824	1	Other	Other
+8f633d90-cb95-4158-9efb-f043cb034e17	1	Other	Other
+8f6341cf-7a19-44b3-9bea-dddf085becf2	1	\N	Other
+8f63dd75-3e2b-4b31-83e6-5d45bc7aca2f	1	Other	Other
+8f64112e-070b-4a06-8efd-36e45a335449	1	Other	Other
+8f6423dd-1a59-4bfb-adca-ea3a6d321f12	1	Other	Other
+8f6438e8-0b8b-4aaf-804b-a97c4124e82c	1	Other	Other
+8f64532c-35a1-4c58-b3aa-e6208b7f06a1	1	Other	Other
+8f645b42-838d-4ef9-bf77-8afd3dcf357b	1	Other	Other
+8f64d918-a382-4eb3-a5d5-92e80d4ab130	1	Other	Other
+8f64eaab-54be-4824-81c3-2c462aae2ce6	1	Other	Other
+8f64fa35-f405-4964-8146-6469354d9be2	1	Other	Other
+8f6560bf-a08f-457b-abe6-e6d6e04c6eec	1	Other	Other
+8f65787c-5877-4b3b-b652-fc748b0395e5	1	Other	Other
+8f65862d-c31a-420c-ac89-10af02cfe333	1	Other	Other
+8f66064e-287d-42fc-b6a8-a9f430badda8	1	Other	Other
+8f6651b6-d5d3-45f9-914b-26ab476b9b25	1	Other	Other
+8f669a85-a359-47c1-a023-b9e5368e3311	1	Other	Other
+8f66f029-c58e-41f1-9632-19a88e89d8f0	1	Other	Other
+8f671c14-f928-49ed-b055-75efbb23ec90	1	Other	Other
+8f671f1f-456c-4868-8eef-4ccf71036cff	1	Other	Other
+8f6728df-86fd-4e3a-bc04-bba6eccaf49e	1	Other	Other
+8f6733b1-d0e1-42bd-a1bc-7b9a9a5ceb25	1	Other	Other
+8f675767-fa9b-4216-98ad-c4f4fad07bee	1	Other	Other
+8f679878-db14-43fc-93dd-db64ce25141b	1	Other	Other
+8f67d9f4-6dff-4a30-b193-8001c1f19c1f	1	Other	Other
+8f682f9f-4d4e-450d-b80d-25e3873d946e	1	Other	Other
+8f68655c-f511-4bf9-9824-28cae12c44fe	1	Other	Other
+8f68cb53-d2eb-4d3c-bcb0-9c2f9c06d649	1	Other	Other
+8f693821-4955-4247-aa91-4c5e04444023	1	Other	Other
+8f696908-ca3f-4534-b88d-9273125c480b	1	Other	Other
+8f6979a5-3be5-4efd-92c2-6dd38700d087	1	Other	Other
+8f699175-f2a7-4859-a2b7-178714f999ce	1	Other	Other
+8f69c66b-c14e-4200-91f2-d0a6f837e454	1	Other	Other
+8f69d545-5a33-4346-bdc8-6e75c4dbabd0	1	Other	Other
+8f69e808-b214-496e-8ebe-6c7367d4eaf8	1	Other	Other
+8f69ee7b-6ecb-43f5-a32d-7bafe0bfdbc8	1	Other	Other
+8f6a3896-16e0-436f-9ad4-4c9301142751	1	Other	Other
+8f6b1151-d3ba-4b6f-a8e4-0ba4b362e809	1	Other	Other
+8f6b1371-4445-45da-a5e6-6d8d1cca80ab	1	Other	Other
+8f6b365c-826e-49d6-98fa-66f6f02ace81	1	Other	Other
+8f6b4b06-18d3-4d84-9318-19fe32d8cb03	1	Other	Other
+8f6b6d9a-4fae-465b-a844-1741966c160f	1	Other	Other
+8f6b833f-2dde-41cf-b635-ce6bf0a6af59	1	Other	Other
+8f6ba8ca-1a3b-4ec4-b06e-8a96f2fc208e	1	Other	Other
+8f6bb102-3d7b-4cd4-857a-8c827e6ff0e7	1	Other	Other
+8f6bd1f1-601a-49ee-b0fb-81713aab9ff3	1	\N	Other
+8f6bdd09-b5cb-45ab-9856-5606e4af5e3a	1	\N	Other
+8f6c0a9c-c642-4f4a-a839-a474a397a658	1	Other	Other
+8f6c1acb-0809-422f-82c9-2f4c0a2b7b65	1	Other	Other
+8f6c95a9-b2ff-4cc9-8ff7-b5ad8f17554e	1	Other	Other
+8f6cc49d-9116-4682-87a7-bd1f91aae6ef	1	Other	Other
+8f6d4b21-96bd-4f31-9bd5-7f64a9e17872	1	Other	Other
+8f6d5c9c-0705-4f19-8224-0d26af12a25c	1	Other	Other
+8f6d6a20-3075-44a7-854e-1066e3a13c1f	1	Other	Other
+8f6d8812-6eaf-4988-8d2a-61d116778006	1	Other	Other
+8f6d99f5-f2f5-43d7-80e1-1dff3fc52296	1	Other	Other
+8f6dbaae-e209-40e0-a15c-4849f39ce0f4	1	Other	Other
+8f6dc811-e069-4325-9857-e093b58fa822	1	Other	Other
+8f6dcbb2-eb3b-4ceb-b749-ed6a5db1d05a	1	Other	Other
+8f6e1c8e-56ab-42bd-98fe-d693bb453b42	1	Other	Other
+8f6e2e74-6941-4b37-8283-113c96c093b2	1	Other	Other
+8f6e4afa-c896-4c24-a047-57dc6e9262e1	1	Other	Other
+8f6e60e5-213a-480b-b108-82b1a59ae94a	1	Other	Other
+8f6e623a-4879-4faa-9d78-f42fcc3ff157	1	Other	Other
+8f6e6425-e5dd-4825-a29a-49de521d6ae4	1	Other	Other
+8f6e6c4a-6c79-4989-9f8e-3eae905880a9	1	Other	Other
+8f6e9994-7a99-4f63-add8-f7abf816bdf5	1	Other	Other
+8f6eaef6-a8b1-4156-900d-887c0993cbcc	1	Other	Other
+8f6eefdd-548e-40e3-8fb5-86465877f654	1	Other	Other
+8f6f45dd-2e26-4376-95f8-3f4be3f2b6db	1	Other	Other
+8f6fbc8a-4a91-4d31-8c1c-afc45b0f8a51	1	Other	Other
+8f6fbe50-2cc3-4b52-91a2-e53771b9a7ca	1	Other	Other
+8f6fbf0b-3856-46b9-a805-79b44c3b0ec1	1	Other	Other
+8f6fce81-b9ca-4a3b-82e0-ae5e91b868cf	1	Other	Other
+8f701565-40c9-4d61-a110-85515177da0c	1	Other	Other
+8f7066e2-79bd-4bf3-890c-5986f2e65f6b	1	Other	Other
+8f70751b-9589-4035-a87d-7ee743fe50dd	1	Other	Other
+8f70e3d8-176d-4d2b-b1e0-04be17678a13	1	Other	Other
+8f71a211-4fbc-409e-a6d6-3c86d1c61442	1	Other	Other
+8f7215fd-f6ac-43f8-a42c-20c195177a37	1	Other	Other
+8f72a85b-a447-4fda-b4f5-e60d40247184	1	Other	Other
+8f72ac03-660b-4781-bdb7-2a7cfd4d2cea	1	Other	Other
+8f72b6fa-00af-40a9-9ac7-a25ccc607246	1	Other	Other
+8f72d27a-9be7-4cdb-9ebc-892e1adee065	1	Other	Other
+8f72e5a1-e49a-4612-b5a6-f34948f3670a	1	Other	Other
+8f72ec83-7d92-4c67-9268-642c630142ac	1	Other	Other
+8f7323af-91ca-46d2-8cb3-a4e9f5787723	1	Other	Other
+8f73415d-b13a-48a0-81ec-8a300b5acbf9	1	Other	Other
+8f7342f2-5305-4653-901d-6efa98305a87	1	Other	Other
+8f7372cf-11bc-4502-868a-cddcf582f403	1	Other	Other
+8f73b23c-7ee5-4782-acd6-86520301ee17	1	Other	Other
+8f73cae9-faa3-481f-b57d-264d0a9e836e	1	Other	Other
+8f742f7e-d4d1-47a6-bdb9-4019670262e7	1	Other	Other
+8f745ac5-ae02-4f7a-a86a-5edc9af9c6df	1	Other	Other
+8f74682d-1aaa-4726-9be8-1d814d7c0f99	1	Other	Other
+8f74909f-a60b-4d12-905f-5685019e48a9	1	Other	Other
+8f758fa4-bad5-4f30-9004-2e27e107c299	1	Other	Other
+8f75bde9-309d-40b0-bba8-2e07d195f14b	1	Other	Other
+8f75c23e-3dc2-4951-b420-6e1f3fa4a3f6	1	Other	Other
+8f761872-2dab-4152-95b2-852598b301d6	1	Other	Other
+8f766459-20d1-4068-aacd-b32a9ad6f3e9	1	Other	Other
+8f76645f-9e1a-4542-8685-57c2f24f5997	1	\N	Other
+8f769b16-250c-4f95-80c8-d8c7ae27b893	1	Other	Other
+8f7704b3-faf8-4bd8-8924-2a689e1eb63e	1	Other	Other
+8f771ec4-1de1-430b-b894-795125692990	1	Other	Other
+8f773302-fd21-43d0-8958-a343e6094fd4	1	Other	Other
+8f7753a4-a9a6-43bd-ac9a-336a987c2093	1	Other	Other
+8f7755b3-f8b9-485c-9816-7f455428c18b	1	Other	Other
+8f77c0e6-a3bc-4b85-af4b-bdabef661ceb	1	Other	Other
+8f77d730-cf34-4e25-b6a7-087523e0122c	1	Other	Other
+8f77de9c-c352-4f82-95e7-62d3dded2ded	1	Other	Other
+8f781d02-e5cf-4a09-b958-0530fd1c2cc2	1	Other	Other
+8f782e66-53c6-4dd0-9eb2-3c3dcbb79fbe	1	Other	Other
+8f7836bb-1545-4655-89c9-e8524935db6f	1	Other	Other
+8f785c9f-83f1-423b-852c-36435a3438c8	1	Other	Other
+8f7865c0-f3e7-4d44-9873-cfed8db51b12	1	Other	Other
+8f78c973-4671-4ffe-8b3a-bc4fcb28e1dd	1	Other	Other
+8f78da3e-17b5-11e8-88d6-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8f78f673-614c-4d6c-a18f-4cde6debba02	1	Other	Other
+8f79345d-f7f3-410d-b9d5-ad99b2eddf8b	1	Other	Other
+8f79c947-bbb5-4a44-886b-f60ffabd2e65	1	\N	Other
+8f79d1cd-a6e0-4bda-ae52-2b6a22d3ccf5	1	Other	Other
+8f79e36f-40a5-49c7-938f-67c560d1a914	1	Other	Other
+8f79eb61-e539-4755-b6d9-aafc2c73c272	1	Other	Other
+8f7a3b45-87ca-4e2c-a80d-bddeac62421f	1	Other	Other
+8f7a6cce-b716-43de-a5ba-c98947a4ccdb	1	Other	Other
+8f7a98d1-054b-4329-b472-ccbc92bcf59d	1	Other	Other
+8f7b08f4-e882-4e17-9bf7-ab4629983cf9	1	Other	Other
+8f7b676b-0a7f-4ad9-981a-5aae5ca93fd0	1	Other	Other
+8f7bd50f-eaed-4c4e-b4e6-8e6ca33e8336	1	Other	Other
+8f7c0b60-6e39-4a4f-aeec-39dbf66ab5a5	1	Other	Other
+8f7c4984-0109-4da4-938f-3b6a7b7e6171	1	Other	Other
+8f7c77fe-a5f8-4c8f-8f78-2ee219076a74	1	Other	Other
+8f7cac0d-7a91-40fb-b3a6-48287b0b8936	1	Other	Other
+8f7cb9eb-e8a7-4727-b666-79aa5a392f3b	1	Other	Other
+8f7cbcc0-1926-4738-aadb-efec4284818a	1	Other	Other
+8f7d1cbe-64a3-481c-b7b2-3ceabff96168	1	Other	Other
+8f7d97f5-e646-44ef-8db1-e6c7dc4cbeb9	1	Other	Other
+8f7d9e84-097e-4fc1-bd1a-0244d0162f00	1	Other	Other
+8f7da1d4-45bc-4e3b-8b77-e68788d03fce	1	\N	Other
+8f7da265-3acb-4313-9a7b-504d5a4fca38	1	Other	Other
+8f7e1b0d-ae3e-47c5-8408-240976a8e5f1	1	Other	Other
+8f7e7c45-517d-48cf-a2f4-32a36fa11ea6	1	Other	Other
+8f7e7e56-6599-4d17-9adb-f46721437931	1	Other	Other
+8f7f75fb-d478-46d2-9f7c-433ed2755b26	1	Other	Other
+8f7fa03b-be8d-4e85-a879-22a81927f2c3	1	Other	Other
+8f7fa28e-725c-4e55-9589-5aa4d94d5731	1	Other	Other
+8f7faec0-5b3a-4fa1-90ca-5ef132bf858c	1	\N	Other
+8f7fee38-9015-423f-80c2-81ca0419089a	1	Other	Other
+8f800aee-75e7-4e5a-90a6-6bc46d62d24b	1	Other	Other
+8f807dba-0d28-43a9-85d8-46a8023ed849	1	Other	Other
+8f809a57-9704-4f93-b8a1-862a4532391c	1	Other	Other
+8f80a066-92e3-4cc7-804e-f1f12707ebe6	1	Other	Other
+8f80dc60-d30f-45c3-92a7-6e42a80946d1	1	Other	Other
+8f810146-41de-4403-b2bf-92453bf08816	1	Other	Other
+8f815127-d373-4528-9ba8-d7de3dc4c18c	1	Other	Other
+8f81a2fe-c840-47c4-bf86-5953e5308349	1	Other	Other
+8f81a9fa-32d6-4ad6-9d05-3faeafa3ecc8	1	Other	Other
+8f81aad3-448d-4da6-b4fb-83d0ae263ded	1	Other	Other
+8f81b8c5-f61a-4b03-8883-47ebcba787b7	1	Other	Other
+8f81c552-b8f9-44e1-a874-f81b4033de61	1	\N	Other
+8f81f40f-a7c1-4f5a-b82f-a12052b4fe27	1	Other	Other
+8f821efb-449f-4963-a411-4242a7dad961	1	Other	Other
+8f828e8d-53fd-4eea-823a-470678d4b22e	1	Other	Other
+8f82918b-5414-461d-8e52-c6150936328b	1	\N	Other
+8f829364-89a4-4489-885d-962c18d29065	1	Other	Other
+8f829406-5030-4300-8507-20b208c24c82	1	Other	Other
+8f829ec9-44eb-4ae8-a273-91484257e853	1	Other	Other
+8f82b728-0c5f-4b66-8dc1-844e5b32d02e	1	Other	Other
+8f82d0d7-bd47-413a-852d-08bffdb33361	1	Other	Other
+8f82da5a-e4c9-4f6d-b600-a62c7e39e6ee	1	Other	Other
+8f82f832-0ce1-42a7-a342-baa793ca5078	1	Other	Other
+8f832090-07eb-4bef-a9fb-fa44e0655428	1	James	Other
+8f833630-6e15-4ee9-88cb-191dcbad5177	1	Other	Other
+8f833ab6-23b0-4927-9959-c7cadf5167ce	1	Other	Other
+8f835df3-24f0-46bf-9f17-c56c3a059363	1	Other	Other
+8f83e734-1617-11e8-9252-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8f8408f7-d35f-4c5c-b1a5-08f22970555b	1	Other	Other
+8f844052-3bf5-4e9f-9602-181c7bf74b43	1	Other	Other
+8f845bff-8be1-4739-9641-cc02c75854df	1	Other	Other
+8f848812-b321-40cf-b781-5c405cdcc58e	1	Other	Other
+8f84d0d4-a8c3-4f87-83bc-4b863e6cf1d9	1	Other	Other
+8f84d5a5-ffd4-4e6c-a0ce-bc1995c2f22d	1	Other	Other
+8f856076-7df2-4270-817a-d0ada6a04ca9	1	Other	Other
+8f857f44-bb50-4d06-a16a-782530891c41	1	Other	Other
+8f85df55-0c04-4473-a946-a4481c244e4f	1	Other	Other
+8f85e1b1-d3c4-44ac-abd1-7500a7175fb0	1	Other	Other
+8f85f7bf-4afd-4d23-822b-05351042bca7	1	Other	Other
+8f863a2e-07f7-4631-8468-fd5308b5dc87	1	Other	Other
+8f865b98-97a1-4453-9fc0-08973fa87c00	1	Other	Other
+8f8664a7-055f-4a7a-8d40-7be789100e9b	1	Other	Other
+8f866a86-65f8-4f5c-b6d1-9731064c299e	1	Other	Other
+8f8684f2-8031-4080-80cc-159d93ffb756	1	Other	Other
+8f86ae56-031c-4a6a-b00b-2b47d2c32e97	1	Other	Other
+8f86af4b-44bc-40da-8b46-fd080e578b4d	1	Other	Other
+8f86c2bb-b2a7-43e0-88a2-b441047ae52f	1	Other	Other
+8f86cc15-cac6-4c26-acbd-42bcd5ef8ea7	1	Other	Other
+8f86f796-f462-4b2c-b621-0f600226af03	1	Other	Other
+8f870dfa-4bc5-40a4-8ff2-1dab509729f5	1	Other	Other
+8f8744bd-912f-4fdc-8d01-ad23638174fb	1	Other	Other
+8f877181-855f-4aff-98f7-4beb54910cc9	1	Other	Other
+8f878f81-fa49-44e8-a1a6-8984795350dd	1	Other	Other
+8f88110d-6aa5-44b2-abd2-a0568b11ebe6	1	Other	Other
+8f882711-a702-42db-80da-251ac30fae39	1	Other	Other
+8f886fc6-d794-42bc-8a94-56e50bb3d695	1	Other	Other
+8f88a8f3-4d8d-4dba-aa6b-d518758f5dd7	1	Other	Other
+8f88b550-79f1-417c-8c96-7791672eef76	1	Other	Other
+8f891881-3d51-4963-b89e-0f30914aeef2	1	Other	Other
+8f89313d-9aea-438f-b1d2-a8c59dda8d61	1	Other	Other
+8f894115-70ac-4eed-8e3f-7eefafbb7070	1	Other	Other
+8f895120-43ca-4b43-8faf-b50af0c647c4	1	Other	Other
+8f8999a2-484e-4898-b952-2cc5cb53f13c	1	Other	Other
+8f89be85-9abd-4e89-b0d4-52ab54340a72	1	Other	Other
+8f89f0ed-5a23-42cb-850a-5ae66999e32e	1	Other	Other
+8f8a8705-8390-4ca9-bf35-535b6e5ccc99	1	Other	Other
+8f8aa8ac-5df4-4029-9bf1-9787447adfdf	1	Other	Other
+8f8ab4d1-56bf-46fc-a1c8-cc6cd64bd83a	1	Other	Other
+8f8ab623-5e1f-4334-8025-7bf7f37fe7f4	1	Other	Other
+8f8ac05e-dcea-430f-b22d-ccb4f48854ee	1	Other	Other
+8f8ae870-ceba-4528-906b-5a29b7e99616	1	Other	Other
+8f8af5ef-cab5-4616-b4fa-30e001fbeaea	1	Other	Other
+8f8b1cf7-0108-4d34-a3df-27f5233f5774	1	Other	Other
+8f8b5c28-e3fc-4a90-a461-5ac8c14c39cf	1	Other	Other
+8f8b7b4b-4fb6-41b1-8bf8-dcab0e86c378	1	Other	Other
+8f8bb4ae-2308-47f8-a949-9aa0a36ba971	1	Other	Other
+8f8c0952-5049-468b-8a68-98981808e9fa	1	Other	Other
+8f8c1204-43b1-483c-99df-77203b4359af	1	Other	Other
+8f8c379c-0273-4fb0-b14b-48a6a3e3a22d	1	Other	Other
+8f8c596d-c507-467b-9548-bbb60ebc8d97	1	Other	Other
+8f8c6ed3-881f-4e5c-80d6-b29430ed246e	1	Other	Other
+8f8cac01-dea1-4246-b334-b1e9b9270734	1	Other	Other
+8f8cb8c7-92ff-434a-b499-dc579d10ffd3	1	Other	Other
+8f8cbba9-8b75-4b71-9437-952b42ce8048	1	Other	Other
+8f8cff35-a47e-4506-a440-ea02fd9ac39f	1	Other	Other
+8f8de049-eb07-44ab-9848-f68bd6ba3146	1	Other	Other
+8f8deedc-651c-43d7-84ae-23c3005d84fe	1	Other	Other
+8f8df700-851a-43ec-a1fd-81a5c908f7fe	1	Other	Other
+8f8e3b38-facf-4b51-8a08-68dd1eccf948	1	Other	Other
+8f8e7b6e-4ff7-4724-8524-e4f2da8250d3	1	Other	Other
+8f8e9409-884b-4c88-adcd-89cdea291e26	1	Other	Other
+8f8eae3c-11a8-4c88-91a0-9ba5e9437933	1	Other	Other
+8f8eaff2-4017-4e52-8ba8-f66bdf40f33c	1	Other	Other
+8f8ec192-a8e7-45c3-abb1-84d427d7db2b	1	Other	Other
+8f8ec23b-b8c5-4cf7-b913-ed53a70f1cd7	1	Other	Other
+8f8effeb-7865-4c08-8c9d-d7bb623ba6cf	1	Other	Other
+8f8f1028-9013-4940-90d5-8ccb91c22f25	1	Other	Other
+8f8f4153-86fc-4b63-ada6-c99ea50c0f9f	1	Other	Other
+8f8f5940-f1dd-4809-a742-0b800c2c8f84	1	Other	Other
+8f8f6bb5-6e3e-425e-97e8-0f68126cdc00	1	Other	Other
+8f8f9346-22de-48d2-a774-dd691c4b1d7b	1	Other	Other
+8f8fd273-8c3b-46c2-aff0-82a75da78f89	1	Other	Other
+8f8ff9a7-cfab-4d8b-8f78-2d22d40e0a2c	1	Other	Other
+8f900790-53e2-4ae9-91aa-75304aa6db2f	1	Other	Other
+8f90b159-eb29-4d6a-be19-0c4a2a6970a1	1	Other	Other
+8f9132b1-d903-472a-ae2f-75f42349ee3a	1	Other	Other
+8f914a88-044c-4ff5-acf4-634d0712672a	1	Other	Other
+8f915793-b1ef-44c9-83c8-e48329a32f2b	1	Other	Other
+8f915d70-d43a-4fe9-a05e-b65562c8213c	1	Other	Other
+8f91d6f5-8b07-4c96-acc2-56eea5ad9fd8	1	\N	Other
+8f91eb0c-b9aa-4cd4-a9d7-681e0dd54392	1	Other	Other
+8f924ff7-cf75-49d9-859d-ada41c3bd0b8	1	Other	Other
+8f926f92-34fe-41c6-9cfb-24dccd6025f9	1	Other	Other
+8f92b240-de5d-4071-8acc-76619f26c250	1	Other	Other
+8f9352cf-c4cb-4007-80dd-8f469d7a953d	1	Other	Other
+8f939ed8-23ad-48b6-9ed2-e76c7eeff090	1	Other	Other
+8f93dd8d-1697-4f43-9270-8f62e6faa4de	1	Other	Other
+8f93eaac-a6fe-40a5-9a20-c4a0e6496e40	1	Other	Other
+8f9427d3-6f81-4d2c-9c04-54ac78cdcc3c	1	Other	Other
+8f9431b3-5f77-46d9-9d85-ff3ab0b84daa	1	Other	Other
+8f94b385-8c55-4e86-8dff-ae6b63a14c89	1	Other	Other
+8f95693b-c182-4184-b7b2-1a867555ae4e	1	Other	Other
+8f958332-a916-4022-961c-5faff4167981	1	Other	Other
+8f9594bd-58c6-4bb1-b9a0-d0b660645e5a	1	Other	Other
+8f95ad4c-46a8-43e4-8799-d5d705e4e692	1	Other	Other
+8f95fe7f-e14c-4202-9883-840207d602dc	1	Other	Other
+8f963526-d56e-4071-8973-1ad4b8158761	1	Other	Other
+8f96397d-089b-4821-8649-89fa18a124df	1	Other	Other
+8f96717a-9b9e-4a54-be76-081fa2bc2d6f	1	Other	Other
+8f96c92f-a2aa-4e00-97f3-0b0c58c5ad25	1	Other	Other
+8f96caf2-4d01-4ffb-bb73-8f23cb8130e9	1	Other	Other
+8f96db07-55a7-4e76-a02c-66c305024e2f	1	Other	Other
+8f96e844-b760-4093-9330-e69ae2fb5819	1	Other	Other
+8f96fbfe-f1bb-4791-bd0d-fa74ec8ffc79	1	Other	Other
+8f97681b-8e70-41a1-99cc-34b4c7471056	1	Other	Other
+8f97b201-445b-4b1c-b7ab-ed0d2bd4eb07	1	Other	Other
+8f97e137-e2c4-4733-9b48-fd18da8920de	1	Other	Other
+8f97eb29-40b7-41b0-8eeb-8e285e6615a6	1	Other	Other
+8f980f5c-eaa7-4ffa-ba51-31c04889c51d	1	Other	Other
+8f982ecf-0e11-4b84-ae24-067353705a90	1	Other	Other
+8f98ab0e-be63-4cbc-8bd7-bd561c2cddb3	1	Other	Other
+8f98ac3d-a5ea-4957-abee-745d5e6e871c	1	Other	Other
+8f98ad3b-1c1a-4734-9cd6-0f1ccd69e15d	1	\N	Other
+8f98c665-b71b-47a5-8bf2-1d58c1888a55	1	Other	Other
+8f98da09-d159-429c-a64b-94e75b47a4c9	1	Other	Other
+8f994cdb-10aa-4891-9385-2a0dbc7a3286	1	Other	Other
+8f996106-5b5f-4878-91db-45b1b456a4be	1	Other	Other
+8f998d56-c88c-4e95-a624-8a89a437849c	1	Other	Other
+8f99c907-89d6-48d6-be17-3f7bce75d481	1	Other	Other
+8f99d0a0-985c-11e7-a70b-fa163e8624cc	1	Other	Other
+8f9a4b92-8347-442a-b098-c34128f92690	1	Other	Other
+8f9a9b49-a37f-4271-9cb7-f6112729bcd4	1	Other	Other
+8f9ab38b-6c42-4a08-82cb-f8e3c5aea05a	1	Other	Other
+8f9ade87-9b4a-4aba-8380-615101a89eb7	1	Other	Other
+8f9b2b7a-1e9b-4fda-8152-bf37f67dea9c	1	Other	Other
+8f9b4354-4617-4479-8ac0-a1327fe664e4	1	Other	Other
+8f9ba854-cff5-443c-a884-45dd92fd5e34	1	Other	Other
+8f9bc263-2573-4ae1-a206-b5ab12539937	1	Other	Other
+8f9c8fc9-b2f1-43ea-9e4c-602624f82532	1	Other	Other
+8f9cb752-8d05-4827-aeb3-caea0ec21f53	1	Other	Other
+8f9cc859-538e-4149-8584-e01d0d727bb6	1	Other	Other
+8f9d1257-6bd6-41fa-9dd2-d789aee70df9	1	Other	Other
+8f9d4553-77e6-4402-a4cb-3ddcda5a076e	1	\N	Other
+8f9d4a94-5a05-4a78-a5dc-acc7d8973d00	1	Other	Other
+8f9d7422-8916-4681-9feb-9acfba464b6c	1	Other	Other
+8f9d8624-8e98-434d-9a19-a52d7c423e91	1	Other	Other
+8f9dd9ae-3f58-43ab-b699-f3138579e3fe	1	Other	Other
+8f9e1301-1bce-4d4b-88be-8f3f1dbb80c2	1	Other	Other
+8f9e1d67-7485-4895-a2ea-f22e67d2ae58	1	Other	Other
+8f9e28b3-d0fd-416e-b9a2-7b342d088369	1	Other	Other
+8f9e3160-f1ae-40fb-b457-afe25b14739d	1	Other	Other
+8f9e40dd-9358-4159-ad12-64a3510ec26b	1	Other	Other
+8f9e5d77-aa8d-4bd0-b07e-bb27df6c4442	1	Other	Other
+8f9eb19a-6bd6-41c1-971d-94dbe7adaf78	1	Other	Other
+8f9efe22-9703-11e7-982f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+8f9f2672-20b4-4410-9b90-7ff3a7dc5dd6	1	Other	Other
+8f9f4885-f331-4178-88b1-4e12a30d745b	1	Other	Other
+8f9f71a4-f6fb-495f-9467-b89d7e282757	1	Other	Other
+8f9f80d3-d80f-4c03-81d4-c0e21e5e08a8	1	Other	Other
+8f9faef9-0d81-45b9-9859-1c147395d387	1	Other	Other
+8fa072f7-6ebe-470f-9680-09dec458c173	1	Other	Other
+8fa08990-0358-4a18-8a5d-d8c28d2d2383	1	Other	Other
+8fa08c15-5ea2-4a56-836b-921a0b048116	1	Other	Other
+8fa0c511-d78c-42e2-9aae-3ac4acda28d9	1	Other	Other
+8fa0ceb4-3864-45d4-9ff7-9d5612fe1642	1	\N	Other
+8fa11605-0562-4f71-a82e-ceedfceb7772	1	Other	Other
+8fa13297-82b4-415a-b984-38ebeb76180a	1	Other	Other
+8fa1695c-03da-4b24-8476-b8c719639955	1	\N	Other
+8fa19ccd-a44d-4aba-ad25-be27aef9a1bb	1	Other	Other
+8fa1cb7b-271d-4224-bf3a-5989b927b5ee	1	Other	Other
+8fa1f9c7-b00a-480e-abb7-8f90f32b7d5c	1	Other	Other
+8fa20201-2b33-4482-82ea-db36284985ad	1	Other	Other
+8fa20b94-e301-4914-8852-96ea1b9466af	1	Other	Other
+8fa23756-c0f1-4f1d-ae21-7ef054e9c53b	1	Other	Other
+8fa28219-a2aa-41ef-b0b9-4c813e3c0685	1	Other	Other
+8fa2bd99-827f-4ebd-8c88-47817a13eade	1	Other	Other
+8fa2d9f8-e037-4827-bef9-fa06076f86df	1	Other	Other
+8fa2eec2-98d9-4091-af88-d83a2b449444	1	Other	Other
+8fa325fc-c526-4605-963c-3c88a0d878fb	1	Other	Other
+8fa34504-b2b9-42f7-85b5-f5820a22b89b	1	Other	Other
+8fa3673e-2efb-4989-80a8-be6874c838eb	1	Other	Other
+8fa39f10-ff55-4966-b3ce-69582f331375	1	Other	Other
+8fa3c9bf-90e1-45f4-824c-4242a249f41b	1	Other	Other
+8fa4d3be-8542-4452-a2a8-945491e24adb	1	Other	Other
+8fa4e366-bd7c-47a8-97c0-ef71167b049f	1	Other	Other
+8fa4f38a-7294-4918-8f3f-a0827ef80941	1	Other	Other
+8fa50d31-668e-4f08-a4ae-232c6d3842e5	1	Other	Other
+8fa514b0-ba1a-402c-bb55-f48b951d906c	1	Other	Other
+8fa54fe7-c111-45bb-a4be-c81520c584d1	1	Other	Other
+8fa550ff-809e-4900-b4ca-1e988f90afff	1	Other	Other
+8fa5e65b-0c90-43c3-878b-fc77ced0acb2	1	Other	Other
+8fa5f63a-81e1-4d32-9c57-14a18ec3c902	1	Other	Other
+8fa6d601-7d0f-402f-95b6-9911c460ec40	1	Other	Other
+8fa72348-2410-4230-bd31-b7fa00a87247	1	Other	Other
+8fa72b8e-05ec-4c9f-87e4-539f377e1249	1	Other	Other
+8fa7326e-e51a-442a-8f12-4b4fbecf89c4	1	\N	Other
+8fa76054-d020-425f-8283-47c7097c4c41	1	Other	Other
+8fa7685d-cbea-49b8-b072-aee7f6d25c91	1	Other	Other
+8fa76932-c01c-4622-a7f1-d554c1e76726	1	Other	Other
+8fa78260-e4cc-4ada-8c61-72bf3589862f	1	Other	Other
+8fa7cea6-4c7c-453a-a7fc-f40e9727a912	1	Other	Other
+8fa7f0f0-ab81-4213-846a-351af598ed9c	1	Other	Other
+8fa83bb4-32c6-460d-8973-11c581827bd5	1	Other	Other
+8fa9278d-d215-45f0-8cc9-769ad1194341	1	James	Other
+8fa92a1b-bad3-4f42-8a16-cb033552a41f	1	Other	Other
+8fa93ba9-0f4c-4304-9f4a-9094a439da69	1	Other	Other
+8fa9f2cd-64ea-417d-b019-c0dd84b4232f	1	Other	Other
+8faa16c7-e868-4ad2-b456-2420f102b1c7	1	Other	Other
+8faa848a-52f7-477d-a70c-6a61e6ae5b6d	1	Other	Other
+8faa8cf1-0e23-4da9-9ad7-2cac617fbdb1	1	Other	Other
+8faa93d8-e707-4208-ba11-27b07237252f	1	Other	Other
+8faa99bb-dd25-40ec-ac9a-9201dc0dd913	1	Other	Other
+8faac2ec-7a47-476f-8e16-751e07038a16	1	Other	Other
+8fab2aa0-a495-464c-b261-2c482d5ac089	1	Other	Other
+8fab3706-c9a1-4b25-8c1d-a13c44f9522c	1	Other	Other
+8fab5ad5-7144-4746-8423-7bc751722c4a	1	Other	Other
+8fab9f3a-b06c-4340-b0ba-325ebc50dbdf	1	Other	Other
+8fabaf53-a415-407d-ae71-1b46097e0947	1	Other	Other
+8fabaff2-bf43-4691-a40a-a8ce3d29bb9b	1	Other	Other
+8fabb925-f7d4-4f02-a519-a764bb2b60cd	1	Other	Other
+8fabc53e-064f-4754-849b-124c664239e9	1	\N	Other
+8fac4868-bb03-44bd-a8ea-da75142edf38	1	Other	Other
+8fac5120-10cf-4f11-a5a6-e6c6ccc66635	1	Other	Other
+8facdc9c-5788-4d16-847e-87c0c109e1a2	1	Other	Other
+8face1a9-76f9-448e-a337-f459ca3922d7	1	Other	Other
+8facf1bf-78fe-4cee-a44c-d727a5ab5361	1	Other	Other
+8fad214a-b7e8-4b1c-8d5b-6e0baf999382	1	Other	Other
+8fad3d8f-5d71-4dc5-b77b-2a8283fb47e7	1	Other	Other
+8fad58e8-93be-457e-8ef6-42c6efbd9de9	1	Other	Other
+8fad5f78-7a77-4f28-806a-5f18820a6bdc	1	Other	Other
+8fad77b8-67d3-43ab-870e-aed416e76b9f	1	Other	Other
+8fad918a-3171-4fa7-bc02-302fe7cdb204	1	Other	Other
+8fada1cd-8f8c-4878-9449-ad892e8e7e3b	1	Other	Other
+8fadb028-b19b-45fd-ab08-72d404c4e83c	1	Other	Other
+8fadc5ed-9006-42ba-a0a7-71b55b4d9f70	1	Other	Other
+8fadf7cf-3b7b-4d9f-8005-12e4d73fce01	1	Other	Other
+8fae0a46-2605-4557-81f1-30593bba76e4	1	Other	Other
+8fae0d26-137b-41da-96cc-eca475684249	1	Other	Other
+8fae30b8-2932-45ef-afa3-10a3e4cf909d	1	Other	Other
+8fae3301-9bfd-4af2-bf6d-5feaefb44117	1	Other	Other
+8fae3ba4-04a3-49ca-bb2c-1299280f8c09	1	Other	Other
+8fae403f-3f8e-4c69-9f65-fa66c1f08786	1	Other	Other
+8fae592b-79e6-4548-ad1a-b24dd3a934e0	1	Other	Other
+8fae6b3a-1c4d-4f80-90cd-1c28e92975be	1	Other	Other
+8fae9c8d-d361-440e-a28e-b1377761c631	1	Other	Other
+8faebf7a-4f18-4e30-a5f0-fe4bd4757a1c	1	Other	Other
+8faec8a6-f820-4672-8433-2d99e61714d8	1	Other	Other
+8faf146f-c9e5-4643-a130-a262a97ff67c	1	Other	Other
+8faf2751-1f3c-4cde-8571-8acfecb21f3e	1	Other	Other
+8faf2b9b-9357-4f13-8dfc-5a277e136656	1	Other	Other
+8faf50f2-9b0d-4cdd-9fc1-43657a05f301	1	Other	Other
+8faf9a96-a612-47ad-b1bd-21334fa8c002	1	Other	Other
+8faf9d61-0548-4cde-a810-a8218ffeb654	1	Other	Other
+8fafb5d4-328f-4a7d-aa67-80c778e6f9fe	1	Other	Other
+8fafe5a1-705e-4f38-9054-f75175ad91f4	1	Other	Other
+8fb03483-a7ff-4f92-a1ef-4aba2f4f7767	1	Other	Other
+8fb0ad04-ae66-4ab7-b1af-a81d1c8c3219	1	Other	Other
+8fb0b388-f0a8-4f65-bc9b-e941a913e429	1	Other	Other
+8fb122c1-973d-48b7-b70a-57b98cc7199f	1	Other	Other
+8fb12d5e-c0af-4818-82fc-f18500f2a322	1	\N	Other
+8fb13b08-3b3a-451e-b19b-44cf0cc6f5b2	1	Other	Other
+8fb15c23-4609-47c4-9783-4140d4f718bf	1	Other	Other
+8fb16568-0345-4961-9301-0dcc3dd164b3	1	Other	Other
+8fb18893-9601-4788-acbe-3f69592e6a1f	1	Other	Other
+8fb19512-f08c-4f5c-b62b-6065c6f62207	1	Other	Other
+8fb1a670-aca2-47dd-8bfe-b139b29e6ce5	1	Other	Other
+8fb1a9a4-b7cd-4189-af45-46ba76789d15	1	Other	Other
+8fb1ba07-79b0-41a9-88bb-f4a4596fd76b	1	James	Other
+8fb1d64c-733d-4a36-a473-8ccca089ffb9	1	Other	Other
+8fb1e58c-4845-4d9a-9d3b-5540bad548d7	1	Other	Other
+8fb1fa4c-9b9d-4d1b-8cc7-5c5c665befb9	1	Other	Other
+8fb1fdf7-4424-456f-bb46-2f25a52c901f	1	Other	Other
+8fb2150f-2bfc-46a8-a038-1c80ea91148d	1	Other	Other
+8fb21e62-994b-46a5-82ef-5e9a5b94f406	1	Other	Other
+8fb2bdc5-8a55-4e6f-b611-8212f645ca35	1	Other	Other
+8fb2fd8a-d8bf-47b8-a54a-9186e3d3e65c	1	Other	Other
+8fb33bca-3227-47cb-bf8e-4b06931a4e35	1	Other	Other
+8fb34ebd-eaec-40f6-a81e-e07ef0e67076	1	Other	Other
+8fb354a7-ee47-4b61-bdfd-c29f60785a56	1	Other	Other
+8fb40072-4e6c-48e4-9449-b762da2451fd	1	James	Other
+8fb47e05-6a58-45a1-a162-22cd786c4a17	1	Other	Other
+8fb4b43f-24b8-4471-ba7d-39f84e246e79	1	Other	Other
+8fb4ccc1-a3ac-496e-9103-7bc237e16bed	1	Other	Other
+8fb4d088-19e5-4e99-90e8-c315344e30ca	1	Other	Other
+8fb4d618-cbe7-4e0b-a442-9628bc8db05f	1	Other	Other
+8fb55308-8bf7-49e8-8f03-88dfbf20fff6	1	Other	Other
+8fb55df2-cf49-44b5-9a2b-5b7ee821b3c8	1	Other	Other
+8fb57e87-3da4-46fe-bd8b-a4c92caf1e05	1	Other	Other
+8fb5c17d-77f0-4583-ac0f-e7f8a42eb91e	1	James	Other
+8fb5c226-372b-4704-9457-8e4e52d19482	1	Other	Other
+8fb5c97a-abd5-4ec7-b2b6-53f37b31905d	1	Other	Other
+8fb65c82-99b4-456e-876c-a0e9f365a3cf	1	Other	Other
+8fb67a70-4085-4f48-a44e-f32532229716	1	Other	Other
+8fb6a13b-6fd7-4a7f-a5d0-31a4e0d836b8	1	Other	Other
+8fb6b93e-bfe5-41f3-99e5-cf47d58446f2	1	Other	Other
+8fb6d814-1d4b-4829-a3bb-c0ea5b0cf8db	1	\N	Other
+8fb6de20-8521-4fed-a622-2026c1251b49	1	Other	Other
+8fb76cb7-a650-46c5-95f8-81a705623e71	1	Other	Other
+8fb7a7bf-7f56-4ac9-bafa-bbbbd46a712a	1	\N	Other
+8fb7ae22-6189-46b2-9f45-a68aab7cd7ec	1	Other	Other
+8fb7ba12-8193-498a-b382-6200eabcefb8	1	Other	Other
+8fb7c297-123a-45dc-82bb-87dfda72780e	1	Other	Other
+8fb7c9be-eb5b-4bca-a3b8-48712c9ec6a7	1	Other	Other
+8fb7cfe5-d5a7-470b-8033-135dc2b22d76	1	Other	Other
+8fb844fd-b1bc-4bbc-a6b7-18f05120ef2f	1	Other	Other
+8fb847d2-259b-4d11-ae9e-d992fb2b3a6c	1	Other	Other
+8fb84ec7-6849-4380-8f2b-aae57d8e7a3f	1	Other	Other
+8fb84f7b-5b60-4b2e-8c84-e9306c2a3b44	1	Other	Other
+8fb86442-092c-4928-835e-35398eb2ed13	1	Other	Other
+8fb8a27d-e850-4ad5-a64c-1fd2d10eb4ba	1	Other	Other
+8fb8ad23-8df9-4e17-b123-efe52bf59669	1	Other	Other
+8fb8cb93-3590-466a-899d-cfa3e36caf4a	1	Other	Other
+8fb8dc12-4d94-4f01-878c-4e4a7a438ddf	1	Other	Other
+8fb8e984-26fd-4b0f-b4f6-74f308ff6e29	1	Other	Other
+8fb9577d-7246-45c4-8d93-d4ee66382722	1	Other	Other
+8fb9920f-8280-4718-bf06-7fd6f110de37	1	Other	Other
+8fb999b7-f43e-4048-b5fb-e48d40e3d990	1	Other	Other
+8fb9bb6a-da26-4791-b6b2-65f4e39fd8ac	1	Other	Other
+8fb9e044-33ab-410c-a72d-5e15f8dd97cc	1	Other	Other
+8fb9ea0a-2046-4d2a-9719-dfab9c32254e	1	Other	Other
+8fba201b-824f-436b-89ae-85963958ffa4	1	Other	Other
+8fba23cc-9185-4eb6-959b-5729818c8bf8	1	Other	Other
+8fba292d-5def-4d43-9bc3-688a8f635017	1	\N	Other
+8fba56f0-628d-4b00-80a4-60e09bc39d9b	1	Other	Other
+8fbad18b-1ae7-4f34-8af7-37511b0d3f8d	1	Other	Other
+8fbb210d-ee0d-452b-876b-62b4e8ceb5c2	1	Other	Other
+8fbb3dbf-88d8-4a98-b3ae-753fa7b028df	1	Other	Other
+8fbb7225-45f9-4414-b0a8-0aa2f0661b14	1	Other	Other
+8fbb7909-9fac-4907-b19c-8dc5c49b327d	1	Other	Other
+8fbbc8eb-a945-4e5c-82b0-1feb414116ba	1	Other	Other
+8fbc31bb-eaf1-4002-8286-151febe43b67	1	Other	Other
+8fbc4863-aaf9-4b39-a245-1fa92c9fee6b	1	Other	Other
+8fbc7484-8e3f-475c-b174-ebd31d2400d6	1	Other	Other
+8fbcc096-7074-4422-a515-c61d804cc482	1	Other	Other
+8fbcc658-da42-4ae9-89e6-085859231c73	1	Other	Other
+8fbd4371-f841-4b71-958d-3306ac231c52	1	Other	Other
+8fbd49e1-e621-4142-a309-5addab9fdd8c	1	Other	Other
+8fbdaa76-ffaf-4869-aa2b-3ed7743bc752	1	Other	Other
+8fbdbfd0-b74b-476a-8f64-2cd60bf1ec82	1	Other	Other
+8fbdcfd5-186a-4ceb-ba65-550c60cc44cf	1	Other	Other
+8fbe07a8-9a60-4737-bdd1-85c3554f9816	1	Other	Other
+8fbe0fbc-6a86-4089-a5b1-0782c19fa93a	1	Other	Other
+8fbe5d2e-7fe5-47d7-aff4-2424daf7fb63	1	Other	Other
+8fbf32d6-1b55-4978-90ac-49b5d4c084a2	1	Other	Other
+8fbf52d3-af0b-4436-928f-745d6af4a5ea	1	Other	Other
+8fbfa1a5-879a-417e-9e4e-ec01d3a7eb6d	1	Other	Other
+8fc0a73c-e897-4b04-9e3c-c541f2ef558c	1	Other	Other
+8fc0be5a-7084-4ba5-b397-cdaa804a329c	1	Other	Other
+8fc0cf0d-3910-43ba-b366-7d6021b0ae2b	1	Other	Other
+8fc0d0f2-6594-43b3-8f24-37e98627d22d	1	Other	Other
+8fc0e219-daaf-4118-a9f1-64efdb61ea64	1	Other	Other
+8fc0eea7-4504-467a-ab78-589e138ab292	1	\N	Other
+8fc0f762-30ac-4f63-9d28-f3f311c488b0	1	Other	Other
+8fc0ffc3-8a7d-4ac6-bbdf-da003062db22	1	Other	Other
+8fc10938-182a-494d-ae7f-0b94dcec9dc7	1	Other	Other
+8fc11682-d5b1-486c-9929-16d1f18295b0	1	Other	Other
+8fc13718-b651-4387-a3ad-05a85a325538	1	Other	Other
+8fc1a740-244e-4390-b948-b85390cfde78	1	Other	Other
+8fc1bffe-7f92-42db-8bc8-52322e08fe7e	1	Other	Other
+8fc1f72f-7e36-44b3-b386-121eddc28acf	1	James	Other
+8fc1fa6c-f6d8-45cd-8403-20199047eaaf	1	Other	Other
+8fc25d72-b53c-4c47-9c55-b92fedc96df3	1	Other	Other
+8fc26075-ba54-4c81-a560-cb1824e7f20a	1	Other	Other
+8fc2882c-dec9-4db6-a155-60e6bc864dcb	1	Other	Other
+8fc28dbc-729b-47ff-b6d7-c73de21a32ec	1	Other	Other
+8fc28ee8-33f6-4422-9107-fe9e85de5a4e	1	Other	Other
+8fc2be54-c48a-4061-8949-fa54bc3b10ec	1	Other	Other
+8fc2c223-69f0-46fc-a944-4e13486caa8e	1	Other	Other
+8fc2c9e1-a256-410c-b29b-c36d0ee2c1db	1	Other	Other
+8fc315cf-b11f-4a7f-aa73-708cf4c84d68	1	Other	Other
+8fc36a4e-9f71-4ea4-b1ba-c65bf3103d74	1	Other	Other
+8fc38706-6818-440a-a807-166a1829e836	1	Other	Other
+8fc3a0cd-5bbc-4142-a34a-a0d7388f7409	1	Other	Other
+8fc3c07e-d1c0-40f8-83e7-6d864103a548	1	\N	Other
+8fc3d0bb-412c-4674-a031-76bf8f192b19	1	Other	Other
+8fc3f745-b5a9-433c-99d7-793c8f016749	1	Other	Other
+8fc40b85-6f7c-45e3-b645-226ba8814314	1	Other	Other
+8fc42670-7906-47df-b2f3-8824d1ee6a29	1	Other	Other
+8fc43790-0581-4736-8c14-5b716c3f55c1	1	Other	Other
+8fc49284-0476-4115-b74d-255c5b02d5f7	1	Other	Other
+8fc4c978-b54f-443e-bc1a-fbdb826b5dd2	1	Other	Other
+8fc52596-7833-4e55-928d-44cd85f68f41	1	Other	Other
+8fc54c2c-8569-4816-9463-de79350d3342	1	Other	Other
+8fc57777-3e46-4906-84c7-e90930222f2c	1	Other	Other
+8fc57aa1-812f-437f-86ec-7f83c3514269	1	Other	Other
+8fc57d45-e6bb-406c-ae2f-bfa0232d9589	1	Other	Other
+8fc5e1af-5a01-4902-8013-36919a018a45	1	\N	Other
+8fc5e513-d3eb-4a74-a715-55c14ef30b9e	1	Other	Other
+8fc5e95b-2bfe-4924-911c-6ccb096e120d	1	James	Other
+8fc649a0-0cc3-4bde-aab7-193d812e6de1	1	Other	Other
+8fc68ae5-6ea4-4646-a0fe-0298a916713b	1	Other	Other
+8fc6c9f3-316b-4c02-a5ec-5c86be5c9905	1	Other	Other
+8fc6d269-46b0-4121-84f4-51299e973d20	1	Other	Other
+8fc70f0a-692c-40df-8baf-bcca1bfa6cee	1	Other	Other
+8fc7169c-1471-4bcc-a143-082b74538a8b	1	Other	Other
+8fc7b191-0043-497e-b459-9b4f82eeed91	1	Other	Other
+8fc7b508-5685-40f6-8002-6fd6d3097a22	1	Other	Other
+8fc7eccd-4815-452e-9bba-bd11945a0adb	1	Other	Other
+8fc7f6d7-2c24-4303-9359-c701eb7478a9	1	Other	Other
+8fc81092-6b08-4cb5-a5e5-e51987b6b9cd	1	Other	Other
+8fc818e0-945b-4db8-b3fe-ece12570da83	1	Other	Other
+8fc84101-bce9-4dc6-b42f-c1ef1b2c27cd	1	Other	Other
+8fc84725-23ba-4d83-b73d-7e88a0248358	1	Other	Other
+8fc85cae-545b-4536-af40-70bd7fd729ce	1	\N	Other
+8fc889ff-23e5-4480-8110-a838a720949c	1	Other	Other
+8fc92f1a-d8e7-490c-ab71-8c3cad5518d9	1	Other	Other
+8fc95724-010c-497a-8b6c-a02eeeadc42c	1	Other	Other
+8fc9727d-693b-4fba-8291-926121a0fe2f	1	Other	Other
+8fc9b5fb-f623-4b59-8b26-68d3b56c0243	1	Other	Other
+8fc9bad5-6681-4aa2-9b39-3b437865f5ac	1	Other	Other
+8fc9c9d1-5195-4c60-9b07-4a4379771039	1	Other	Other
+8fc9ff18-7e86-458b-a1c8-975deef3d500	1	Other	Other
+8fca0999-7b43-4520-b201-1dbb2ee39961	1	Other	Other
+8fca4cb7-bc17-4773-8c69-d673c52ea0cd	1	Other	Other
+8fca7ad6-c479-4ebe-99ab-50220fe123dc	1	Other	Other
+8fcaa518-b16d-45eb-9fbc-30acb54d01c8	1	Other	Other
+8fcae57a-7248-4dc1-8ac5-071a274eb756	1	Other	Other
+8fcb1e43-e77e-436f-80bc-b698e2a39ca8	1	Other	Other
+8fcb29f8-adbd-4bd7-8c9a-62909505cf77	1	Other	Other
+8fcb327f-d18c-45a0-b555-235b29237c02	1	Other	Other
+8fcb4eca-190f-45a3-97fa-4b8ec719a5cb	1	Other	Other
+8fcbc069-77f2-48f0-85b8-76cafc7eeb0b	1	Other	Other
+8fcc6f8f-b067-4a2b-acd9-f627cdf78701	1	\N	Other
+8fccfa54-b033-4f2d-baea-63aceb3f5ab2	1	Other	Other
+8fcd3538-9acd-4702-a76b-736291544246	1	Other	Other
+8fcd4ef2-937f-470f-8b14-6e9e3ed71e42	1	Other	Other
+8fcd7c87-35bb-4b69-8547-6536b1a3b2bd	1	Other	Other
+8fcd994e-6ee8-4e88-9e08-1ba0765c2c01	1	Other	Other
+8fcde883-0163-41bb-9096-6fd88ac3f85a	1	Other	Other
+8fce16e9-2d3c-4a0a-a543-9a60aa0ee5cf	1	Other	Other
+8fce3f72-a6e5-4c13-8703-ef4d73dbef2f	1	Other	Other
+8fce5873-9629-43b2-8700-ffbfa964fa06	1	Other	Other
+8fcebe8a-15a1-4fd8-8d7e-5c195f59fefe	1	Other	Other
+8fcf0738-e457-47c7-987c-40d9366c0b74	1	Other	Other
+8fcf1c71-4651-45b1-bee9-6e0b075a4387	1	Other	Other
+8fcf5c3c-c533-42c0-aec9-e52dacac36a4	1	Other	Other
+8fd02857-efc2-475e-bdc1-e0c4c6a767d1	1	Other	Other
+8fd0315f-dbc3-4a4d-a0ea-8270c53467f2	1	Other	Other
+8fd04053-b35a-46ad-a5f9-6cb263cc1fff	1	\N	Other
+8fd044bd-6da2-4e0b-8bb3-9c3a3dbc133e	1	Other	Other
+8fd08319-a561-4402-9e73-3fbf6ecede03	1	Other	Other
+8fd135f8-d84c-4850-ab19-7dd0bc2e59eb	1	Other	Other
+8fd186ac-4fb9-4f52-9fa5-5411666cc533	1	Other	Other
+8fd19e9a-ae6d-499d-9cb5-0612682d7b87	1	Other	Other
+8fd1aa48-192b-4f8b-8208-eb0fed21822a	1	Other	Other
+8fd1aaa6-7a7a-400c-ad8d-372ff572e6bf	1	Other	Other
+8fd1ae9f-cb56-488a-9501-8a7c81c33cd1	1	Other	Other
+8fd1b3da-1b47-4c02-9d21-c90d54f516c4	1	Other	Other
+8fd1e7d2-ada5-4b68-9e85-c6a55e7ea46f	1	Other	Other
+8fd1e9aa-8f51-49ce-9149-e52b6d19dec4	1	Other	Other
+8fd21cd1-ca23-442d-8757-549528acabec	1	Other	Other
+8fd25fdc-f682-4c77-b0e5-a99ac275de02	1	Other	Other
+8fd2bb81-7b0c-4858-a830-7958d88f3256	1	Other	Other
+8fd33bd2-c02d-4d57-b60a-eb239b7c19b3	1	Other	Other
+8fd398ec-3fcc-4d1c-b430-85bc811ce229	1	Other	Other
+8fd3b687-9ee7-44d4-8d7b-f13250fed1a2	1	Other	Other
+8fd3c9da-c363-47a4-b86a-39293b321196	1	Other	Other
+8fd3dcd9-d05d-4db9-839e-737b21f03138	1	Other	Other
+8fd3f003-d5dc-4eba-bda3-651348bb68f7	1	Other	Other
+8fd44151-e8dc-4eed-94fb-116c24756e5b	1	Other	Other
+8fd50dcd-cfda-4039-abb0-c3e09efcfc18	1	\N	Other
+8fd5c764-383b-4593-8975-556a21fff07f	1	Other	Other
+8fd5d9b8-b237-479f-a894-107d9c4ce09d	1	Other	Other
+8fd603b2-3cea-4c5a-865d-aab7458bbadb	1	Other	Other
+8fd67385-ceee-4221-8dc1-079220cc00a0	1	Other	Other
+8fd6f000-4147-4307-96f5-f488658e035c	1	Other	Other
+8fd755b6-e122-4da1-b827-597bbac9a0c8	1	Other	Other
+8fd77f1c-8264-4314-9176-fe19ee01b648	1	Other	Other
+8fd7921d-e564-4fef-b26e-de41dfede231	1	Other	Other
+8fd7bae6-8fce-4934-8ce3-db506a21c068	1	Other	Other
+8fd7de6c-3365-442f-9d9c-8b01b65df324	1	Other	Other
+8fd7f3f0-c2c9-4c41-8439-39c436a21f02	1	Other	Other
+8fd83eb4-98ef-4c15-8029-f268983964b8	1	Other	Other
+8fd851d4-a37f-42dc-843c-be119d6d8674	1	Other	Other
+8fd87cdd-713b-48c4-8b3b-ce75fc99598b	1	Other	Other
+8fd898fb-0656-46e0-931b-8cf52980e626	1	Other	Other
+8fd8c426-f96f-46a5-9de2-08f6efc0ce7c	1	Other	Other
+8fd8dedc-5117-4f1e-83c1-f209a11de437	1	Other	Other
+8fd8e293-4e5b-4dfd-bd17-557890a45f33	1	Other	Other
+8fd8fd72-d671-4842-a185-869f87383ad1	1	Other	Other
+8fd90155-3862-4227-a82c-76dbe57c5f1f	1	Other	Other
+8fd90b19-01e1-49b3-8071-5d7c8985a74e	1	Other	Other
+8fd93e98-1c8c-4c3e-a49e-a771286ee0ea	1	Other	Other
+8fd94ef5-2b74-49f7-b228-5faea1316829	1	Other	Other
+8fd9bf89-5d25-43f5-b96c-184a9159a146	1	Other	Other
+8fd9d788-0054-423b-bfea-727577c4640e	1	\N	Other
+8fda0d6d-93ec-41d1-baa6-ec16c68410fa	1	Other	Other
+8fda2a3e-9360-4357-97e7-cc50e0b6592b	1	Other	Other
+8fda6951-d078-4d1b-b1c2-e4e5f28c0e18	1	Other	Other
+8fda80bf-a281-41db-9493-1e60ffe7e7dd	1	Other	Other
+8fdaa66b-feb9-45df-a0f6-3bc9033d5bcc	1	Other	Other
+8fdab728-d593-453a-b09e-7f3decb11aaa	1	Other	Other
+8fdaf40f-8a53-4110-91cb-8c6dbcbe5f6e	1	\N	Other
+8fdaf935-7191-41b6-a49b-a947d7656220	1	Other	Other
+8fdb0df4-4c44-46f7-964d-7cecac1f32d0	1	\N	Other
+8fdb224f-63a7-4aef-8ac1-d234003cebe0	1	Other	Other
+8fdb389b-af1f-4286-826b-49b59709af44	1	Other	Other
+8fdb42e0-7da7-4be4-b13e-4d71e08355b3	1	Other	Other
+8fdb4b39-f005-40a2-bb33-5bd97f235b36	1	Other	Other
+8fdbc697-83c5-4d0b-aae4-a7e8c624a487	1	Other	Other
+8fdbcfa7-b52e-496b-87b7-bbade378c3e5	1	Other	Other
+8fdc2208-300c-4754-a692-f48c904d956b	1	Other	Other
+8fdc76cc-a32e-45a5-a07b-a90f713dc089	1	Other	Other
+8fdcf148-652c-4031-aeec-34a5ef35c4ce	1	Other	Other
+8fdd7ead-02fb-4b03-b750-ca1799b2c01f	1	Other	Other
+8fdd94bd-b3ef-4908-bda1-6e27dd80d747	1	Other	Other
+8fdddd7e-e636-4c15-945c-4b59c8075f23	1	Other	Other
+8fdde585-f707-497f-93df-79a780f8bfae	1	Other	Other
+8fddfa69-bfd9-48f4-bd1f-60ddec3c0d78	1	\N	Other
+8fde0bd8-4a04-45ce-a41d-ee85a567ba56	1	Other	Other
+8fde18a8-5c19-4b91-b86d-ce604cfb809c	1	Other	Other
+8fde2e4c-4a2f-4584-ad88-adda7606d538	1	Other	Other
+8fdee861-bafb-4b6b-b6be-931bee22342c	1	Other	Other
+8fdf0e53-fcdd-42e4-a6e7-9e32d28abaab	1	Other	Other
+8fdf5f46-b5d7-4283-b255-eb8b9375beb7	1	Other	Other
+8fdf969d-24ce-46e1-b1b9-6d6be42891b6	1	Other	Other
+8fdfc414-8e02-4c01-ac9a-a67360266b81	1	Other	Other
+8fdfcdbb-d31f-4a4b-a59d-8ecbea5d440b	1	Other	Other
+8fdfdff3-c5bc-47a2-a11f-f4d3e6a67bea	1	Other	Other
+8fdff7f0-5e53-4016-b40a-9cbff4180235	1	Other	Other
+8fe01e92-4433-4e67-9cf7-bf17bda81ec2	1	Other	Other
+8fe079e1-0005-485d-83b1-c8253232a0a8	1	Other	Other
+8fe08e41-65af-4aa6-87aa-4ddd8d364e8b	1	Other	Other
+8fe0bf33-98c3-46f1-91f9-464385a449af	1	Other	Other
+8fe0fee3-21b4-4abf-af7e-5caadace70cd	1	Other	Other
+8fe1264e-8b3e-4021-90d8-35691b06eca3	1	James	Other
+8fe143b9-d906-4ad6-930c-7aadfd8e69c2	1	Other	Other
+8fe14f9e-6d75-473b-b088-375aed3e2305	1	Other	Other
+8fe18720-0bbb-40d9-9d7d-bd579fe85782	1	Other	Other
+8fe1acff-1249-44af-8668-e88bf4ccbbc2	1	Other	Other
+8fe1c05a-d2f6-4636-974a-a81f7f214a6c	1	Other	Other
+8fe1ce75-3f52-4464-a468-f805673a0f8c	1	Other	Other
+8fe1f919-ded3-4742-959b-0267c801dbfd	1	Other	Other
+8fe219d7-a583-471a-852c-f72d97833ea2	1	Other	Other
+8fe26cae-837a-4d8d-a36f-adad1323e9c3	1	Other	Other
+8fe27aa7-0c56-479f-9e02-24b95057c5dd	1	Other	Other
+8fe2c03d-4a63-4729-92e7-5f5b7bf10b7e	1	Other	Other
+8fe2dfd7-702c-406e-b8fc-1d163ce6691a	1	Other	Other
+8fe2f0e7-cc04-4eca-9242-0f7d3f0f3cc8	1	Other	Other
+8fe31dda-2edc-44fb-a8cf-e3fb638bf90f	1	Other	Other
+8fe325e3-24a0-4675-b48b-0485783e65ec	1	Other	Other
+8fe327f3-abd3-48bc-8f74-7ce136178704	1	Other	Other
+8fe331a4-3650-444a-bf32-e651f129f199	1	Other	Other
+8fe39e11-4ec0-469f-b451-9ac4bb207fa7	1	Other	Other
+8fe40bdc-123e-499e-aab6-070cda731699	1	Other	Other
+8fe40cea-778f-4be0-b2ae-590c8ee7a9f4	1	Other	Other
+8fe4291b-334b-4032-988d-32489e1f298c	1	Other	Other
+8fe474ca-6b20-43b6-960d-f6324a436b61	1	Other	Other
+8fe4e047-ad48-4790-9929-abd0db96eab2	1	Other	Other
+8fe4e378-ce10-4294-b5bf-5ce97d7f457c	1	Other	Other
+8fe53434-1c2c-49bb-99d1-b1c4764cbff5	1	Other	Other
+8fe54265-6b04-4b3b-bbb5-77505cc441f4	1	Other	Other
+8fe5abc6-8622-479a-a1e9-a9d71066d3af	1	Other	Other
+8fe5b9c3-06ed-4620-993f-f26f5b7316b1	1	Other	Other
+8fe5e07a-8449-45b2-bcb8-06d0585d08e5	1	\N	Other
+8fe60d33-fa70-4baf-8e99-c39ad563c1b8	1	Other	Other
+8fe66d94-da36-40f3-8f33-bb89248caca5	1	James	Other
+8fe706b8-a341-49e0-bebe-cc2e0f19920e	1	Other	Other
+8fe7597d-3120-4fae-8666-72a5e6699344	1	Other	Other
+8fe75e9f-7bbf-43e4-a1d7-c2014242db0a	1	Other	Other
+8fe7908e-adbb-4f1a-98fb-e2459d1382d4	1	Other	Other
+8fe86573-5d72-4aad-b869-4c78ed60d1fa	1	Other	Other
+8fe86fbb-144f-4cbe-9c91-46973b057ee1	1	Other	Other
+8fe88fbf-f279-4e74-846e-877bda1a2e4d	1	Other	Other
+8fe8cef8-e8d2-492b-8392-ae9f242ce804	1	Other	Other
+8fe8ee07-af68-4d75-88a1-d4ae040111d9	1	Other	Other
+8fe9570b-81cd-4bbb-92f3-55022824e49a	1	Other	Other
+8fe95d2f-4685-4226-97d0-fbee8602fa01	1	Other	Other
+8fe98e9b-c75f-4cc1-9c3e-f577d255bd30	1	\N	Other
+8fe9b2fc-a8ce-4c9f-824e-97cb54018582	1	Other	Other
+8fe9f1b1-a264-4b4f-879a-7108cff3ef11	1	Other	Other
+8fea158a-6c4a-46ac-81ba-ab59af5a0b5e	1	Other	Other
+8fea2b8e-83f0-4858-802d-a1221cde63c6	1	Other	Other
+8fea3b93-b823-498b-aa43-396db662a90b	1	Other	Other
+8fea51e8-f2cc-4734-a7d6-a76ef3879302	1	\N	Other
+8fea81db-b804-4e59-953b-e2f5674aa1b9	1	Other	Other
+8fea9cdd-4a35-4536-b0a7-1350129db934	1	Other	Other
+8feaed3f-8fd2-44c7-937e-66a22bf06737	1	Other	Other
+8feb0aa0-89d2-43f0-924a-d823e3030eff	1	Other	Other
+8feb1789-c453-4081-828a-6926656e8597	1	Other	Other
+8feb67c2-6ee2-49c0-8a6b-66ba1af7a2b3	1	Other	Other
+8febf5a1-e973-4d93-a9d8-e4ed0307f4c4	1	Other	Other
+8fec02d0-6573-49e8-9c69-c231aaf4a2d2	1	Other	Other
+8fec1dd2-9c75-4934-beb8-604583ec4a65	1	Other	Other
+8fec33de-4675-431f-bd21-6af98587b55c	1	Other	Other
+8fec4f90-111b-493b-8864-e065daa81679	1	Other	Other
+8fec7da4-7b90-4e9c-8f14-c8095fa88967	1	Other	Other
+8feca30e-ea60-45f0-8f17-f2bc4e0d9b35	1	Other	Other
+8fecbb04-2ae7-4493-b4f7-6aae727a85a6	1	Other	Other
+8fed026b-bb7e-47a6-b2e8-c323d96e745e	1	Other	Other
+8fed0820-7665-4ac8-9c74-04b914d97d59	1	\N	Other
+8feda135-23c9-44be-b412-d1e661c9682d	1	Other	Other
+8feda183-74ef-410f-869f-977b8266be0e	1	Other	Other
+8feda43e-c6ad-41c0-9c9c-2ec3f2e2bc2b	1	Other	Other
+8feda440-dd5a-470b-a3a6-0f546da4ae7d	1	Other	Other
+8feda8f6-5876-437d-93d3-2ec5a3c37ce9	1	Other	Other
+8fedced9-1a71-4d0c-abe1-b3b5bd53f78b	1	Other	Other
+8fee0229-3f95-474c-8ce7-c4efed375ef0	1	Other	Other
+8fee06cb-ed7d-4c49-805a-c58059f2df8d	1	Other	Other
+8fee34cf-daf7-41e9-aeff-56120cc858e9	1	Other	Other
+8fee5724-eaab-46b8-8581-e1bd58f9992c	1	Other	Other
+8fee6486-573c-4a95-bdb8-42bab15d5574	1	Other	Other
+8fee6f6f-6c7c-4357-89b6-f0ed6dc01b9b	1	Other	Other
+8fee8047-509e-49d3-80db-396357d16988	1	Other	Other
+8fee904c-c2b2-464e-a0e2-4b0c4c912d64	1	Other	Other
+8fee9643-edc5-48c5-b49b-cee414091462	1	Other	Other
+8feed088-980a-4f43-88ee-42db2b7186e6	1	Other	Other
+8feed46b-87ed-4723-9d87-2b8966468b73	1	Other	Other
+8feef42f-6d99-4899-b36d-2b7dc0bf16b5	1	Other	Other
+8fef18d1-784a-4316-9e1d-7c8923910dcb	1	Other	Other
+8fef1e51-5dc9-4385-b826-9b99cbd15b77	1	Other	Other
+8fef35b6-75aa-47ae-9307-08842f6fefa6	1	Other	Other
+8fef57e9-2b16-4c6f-a3f2-1f58c210550d	1	Other	Other
+8fef9325-95ce-489c-91f1-c7acc6d82448	1	Other	Other
+8fef9bf7-4890-4c58-97ae-7578da00ac86	1	Other	Other
+8fefb52b-5751-40f0-94bf-5903974de064	1	Other	Other
+8fefbd5d-e226-4dc4-b7e4-d8686d9ab1c8	1	Other	Other
+8fefe254-f56c-4c17-bc56-a616a91940c9	1	Other	Other
+8feffd01-7107-455a-834d-4c823bead6b3	1	Other	Other
+8ff022d1-0ccf-407c-a949-9fbbbd493dc1	1	Other	Other
+8ff083bf-c521-442d-9cb2-b836049fdacf	1	Other	Other
+8ff0d108-eadb-431c-96d5-f9f60cd5ea18	1	Other	Other
+8ff0f4a8-0a3b-4a84-9afb-1d8dc5dc554b	1	Other	Other
+8ff103b8-25b1-4b7b-af35-bc0806bc47f5	1	Other	Other
+8ff11c27-add1-4340-9416-7e0a648dacce	1	Other	Other
+8ff11eca-ea41-42fb-af6c-451d287718e1	1	Other	Other
+8ff123cc-382d-4b99-afec-62781615ec9a	1	\N	Other
+8ff1329c-648c-47b9-a192-3070eb11ea42	1	Other	Other
+8ff158f6-a2f5-410a-8881-37c054641b0d	1	Other	Other
+8ff22e61-36ad-45a9-a34d-fa54264f6896	1	Other	Other
+8ff231ec-8c55-4716-b439-c17c7f6f4662	1	Other	Other
+8ff2346d-67aa-47f0-9440-564e1ea466f7	1	Other	Other
+8ff243ce-52ce-437a-8155-4a36ec2632a3	1	Other	Other
+8ff28d0b-577c-458b-9c17-44f02a6c6191	1	Other	Other
+8ff2941d-273f-4c93-b0ca-e91deb05176e	1	Other	Other
+8ff302b1-cf06-43b3-8564-e2a65918446a	1	Other	Other
+8ff37aec-6796-4c99-bdfd-f827cf4faa2a	1	Other	Other
+8ff3b3b8-a5e5-46d2-a63e-6b26a0825809	1	Other	Other
+8ff3b7d6-3f11-4303-a662-b233c90b9246	1	Other	Other
+8ff3cf69-ac0d-43e9-b6cf-553da21676d0	1	Other	Other
+8ff405fa-a2c8-4b16-992a-515365849a7b	1	Other	Other
+8ff43a59-2656-4e0c-9550-ef8d7b58ea09	1	Other	Other
+8ff44700-543f-4844-b0ae-739ab85a9d62	1	Other	Other
+8ff44ec2-0386-44b6-a13f-4285897bd94d	1	Other	Other
+8ff472e0-e427-430c-8977-63813559b20d	1	Other	Other
+8ff4a81c-c713-4a11-93cf-bee58387693e	1	Other	Other
+8ff4cfb4-9309-4c2e-895f-2063c8545426	1	Other	Other
+8ff4d7dc-7764-4cb4-bf62-c63062fe75d2	1	Other	Other
+8ff500df-4adc-4f8b-9f8f-dd08dde5cff5	1	Other	Other
+8ff526bf-4a9e-481f-a32f-d6730941835b	1	Other	Other
+8ff57116-bd46-4fca-b614-842d03ce813f	1	Other	Other
+8ff57bc5-9832-4cd4-8e53-93930153250f	1	Other	Other
+8ff5ad39-9e8e-4046-93c8-706615ea4a20	1	Other	Other
+8ff5cacb-6b79-46f5-ba1e-7e113741a28c	1	Other	Other
+8ff5d756-1a7f-4889-ace5-aa239d813463	1	Other	Other
+8ff61234-0b2d-4332-a6ea-74a307daf3d0	1	Other	Other
+8ff6be4c-4266-49f4-b5e1-87ea1460e7dc	1	Other	Other
+8ff6be5d-f3ea-40c7-8787-b193e176c1b9	1	Other	Other
+8ff72537-f73a-43e1-ad22-50ab37c837a1	1	Other	Other
+8ff77118-8197-4c6a-86a8-3ec2ec8681e4	1	Other	Other
+8ff79a83-b9b6-468c-b4ff-103704f37fb0	1	Other	Other
+8ff7be6d-4634-4bcd-ae0a-3346845bc5b0	1	Other	Other
+8ff7f608-3613-4540-9c99-865b7cd675d4	1	Other	Other
+8ff853c2-aab2-430d-b673-74cde4515c51	1	Other	Other
+8ff893ed-d682-40d9-920a-ecdbbd330f0d	1	Other	Other
+8ff8b462-1ac7-4a70-a7e8-698af811669e	1	Other	Other
+8ff8ed17-b1a9-458e-86a4-8a418a13508b	1	Other	Other
+8ff904d8-9a4e-4848-91f9-c1d2fa4a60ba	1	Other	Other
+8ff94f29-2ffb-4a5e-8dff-e87e17fdf952	1	Other	Other
+8ff97e73-98fc-47f6-bcd3-178da73753e8	1	Other	Other
+8ff9adc0-c770-4da6-a24b-bc8dd08513cc	1	Other	Other
+8ffa70a3-5328-4fe6-967d-53941c37d23d	1	Other	Other
+8ffaec90-bf24-4f20-acca-4d46cbf08e5a	1	Other	Other
+8ffb1db2-32f0-46b6-b2ad-6017199cf4ee	1	Other	Other
+8ffb2fe4-dd73-4b87-bc27-ee601b91a8a4	1	Other	Other
+8ffbf0e0-42c5-4afe-940d-e014c7c87821	1	Other	Other
+8ffc214c-c409-458b-8c88-ec343f36b8a5	1	Other	Other
+8ffc9624-9197-404b-859c-49e73f866680	1	Other	Other
+8ffcafb1-44e4-4544-97a2-054de299865e	1	Other	Other
+8ffcc4d4-9afb-4066-8751-188b3e0c617b	1	Other	Other
+8ffcde05-56ac-4a3f-b652-1383a802ed2a	1	Other	Other
+8ffcf4e5-f8c1-45fa-8c96-77fe4a8399fe	1	Other	Other
+8ffd04d5-c756-4f60-b0dd-b8438027e3b3	1	Other	Other
+8ffd09dd-8460-4e85-98b7-253dfce85ed4	1	Other	Other
+8ffd76a5-a28f-42b8-830a-6b4313f5fdde	1	Other	Other
+8ffdf892-2682-4cde-873b-8992334f42de	1	Other	Other
+8ffe4aca-90d9-4f00-8a53-b2e7d5b629e7	1	Other	Other
+8ffe6edf-1d6c-476d-938d-e06d4c8c335a	1	Other	Other
+8ffe85ae-f5af-4716-a7b9-4a4de37cd3d6	1	Other	Other
+8fff2d89-9ba9-484e-872e-92d898868e0e	1	Other	Other
+8fff4b10-d816-4fbd-a9d5-6aa419e94605	1	Other	Other
+8fffbc15-b215-4331-a575-b6bb9343b64b	1	Other	Other
+8fffc009-b2f8-48d2-8824-ce6f9caa5704	1	Other	Other
+9000493d-f155-4473-848a-bc53a0c2edd6	1	Other	Other
+900070ed-3880-4b4a-bb05-aa4c5f647a40	1	Other	Other
+9000cb86-aba7-4501-840f-0b763c7eaf12	1	Other	Other
+9000cff5-6cfe-406d-9128-66caa171c61e	1	Other	Other
+9000d854-5114-465d-8f8e-a619b01fe3c4	1	Other	Other
+90012295-6497-426f-9036-e37eb4c0b685	1	Other	Other
+900125f1-40c5-48c1-9b7e-43cb49065246	1	Other	Other
+9001331b-1040-4634-ad52-8914adeccc8f	1	Other	Other
+90014cf6-3536-4d5a-8c04-f65f0ed9e506	1	Other	Other
+90016352-d104-403b-9cd6-1b7aa2588ccb	1	Other	Other
+9001a97e-8520-4cad-b0de-6f570a9f8751	1	Other	Other
+9001e5c4-3a9e-4c07-a47a-0cc42732a4e0	1	Other	Other
+90029e57-0dbd-48e9-a122-e5f1700a6ae8	1	Other	Other
+9002c263-c81b-4c19-85bd-7e45b931144b	1	Other	Other
+9002c3d5-3a8f-438f-a588-7df180c8465c	1	Other	Other
+9002d307-3651-4531-9386-94e0020b1d12	1	Other	Other
+900308fa-74b4-4802-9ec5-8d82f7200f88	1	Other	Other
+90031520-089f-47a2-953c-40ed3d6f2c7b	1	Other	Other
+90036920-2f63-4c0a-8191-72d998c16669	1	Other	Other
+90039931-a1be-49b8-a058-46d2bf417454	1	Other	Other
+9003f7bb-f2c5-44ac-b427-e8b16f4f7e4e	1	Other	Other
+90046edb-25cd-40aa-9c64-886b7b4ce139	1	Other	Other
+90047b47-0b75-4105-9c55-073101c70952	1	Other	Other
+9004c01c-abb3-4177-80f0-c48ba1891820	1	Other	Other
+90054c51-fc19-4d86-ae1c-340ea488aa14	1	Other	Other
+90059207-74bf-491b-86c7-8cc10f6dbaa2	1	Other	Other
+9005a161-1ae0-4903-a760-5b4cfb7ab610	1	Other	Other
+9005aad9-074b-406f-a303-731222dde6da	1	\N	Other
+9005af67-c765-4706-b84c-5de4b319c8a9	1	Other	Other
+9005c3d7-44cf-421f-871d-c9e0b4cde230	1	Other	Other
+9005c7cf-c6e5-4777-af8f-21fa58dd5ded	1	Other	Other
+9005d5b1-7d35-4942-9e75-914572b04c2c	1	Other	Other
+9006080f-677c-4ed8-91eb-62df2f61d9e7	1	Other	Other
+900698ff-578c-446b-b77f-d133354ffa48	1	Other	Other
+90072dd8-0a80-4d49-8f6d-1dfafed35b82	1	Other	Other
+90072f6b-32eb-4b4c-8421-95a58a4021aa	1	Other	Other
+900739e5-f7e6-4a8e-beb1-0de8a11581b6	1	Other	Other
+9007552f-d80d-430f-9aa9-7098b185140f	1	Other	Other
+90078ed6-d660-4bc2-844a-8b9db8b6afc7	1	Other	Other
+9007c2dd-8935-4c98-8a7a-29909d8c31ac	1	Other	Other
+9007fd0b-0325-4151-b96b-f5ce05d94fea	1	Other	Other
+9008695f-ebd9-4fee-a89b-9de4796700bf	1	Other	Other
+90088227-1b61-4bed-8bc6-515b05de1c25	1	Other	Other
+900884a1-b1a6-4315-89bc-31b6bf3c7e9f	1	Other	Other
+9008deff-a190-4823-8f72-ee2e7c8942ad	1	Other	Other
+9008fc5a-848e-43c0-9658-961dfac3a952	1	Other	Other
+90090e6a-c746-4cd4-bf8b-489951fe604c	1	\N	Other
+900a6fa0-cb05-4452-92b4-43962150e305	1	Other	Other
+900a8f20-fe5d-4915-ba63-2e8f032354a2	1	Other	Other
+900a9366-9f55-43bf-ae58-287a71d02e72	1	Other	Other
+900b082e-b28c-445e-a885-c97795c79a5c	1	Other	Other
+900b0c0f-7891-4d9b-aa18-2258a871e21c	1	Other	Other
+900b573f-78ed-461c-be32-d506f4e9ebe3	1	Other	Other
+900b5ca4-7ff7-4e96-af3c-e76bb11a1549	1	Other	Other
+900b98ed-833d-41ce-b4f5-b5b45161d815	1	Other	Other
+900ba2fb-447b-4687-8834-f5d1627dc35f	1	Other	Other
+900c3bf6-5262-4b02-a62e-a6ea6f60b32b	1	Other	Other
+900c6701-e9a0-4f40-971a-d67587faa9fc	1	Other	Other
+900c7f03-88f7-4751-bdb1-adc388d63abc	1	Other	Other
+900c8347-e8d6-4fa8-b254-c9c8b3f6f7a9	1	Other	Other
+900c913e-317a-416c-b873-3631cdacd77f	1	\N	Other
+900cb45a-e8aa-4632-8ab9-a3d52662bc8b	1	Other	Other
+900cc547-1f3e-4bc0-8b1c-839a27f54d3c	1	Other	Other
+900ce67b-8107-47da-a2a7-c5fecebdc130	1	Other	Other
+900cf3db-e2dd-43b9-9219-792a5a37bc0b	1	Other	Other
+900d0b55-c2bd-43da-ab09-9a3e411f4cbd	1	Other	Other
+900d1d69-e89d-4658-9e5a-19b95d883b65	1	Other	Other
+900ddaef-26fb-40df-9a5a-0f47654c9cd2	1	Other	Other
+900e291f-d269-4357-9c63-7a4033edf60c	1	Other	Other
+900e9293-17de-4ac1-9e4d-2eed18995841	1	Other	Other
+900ef239-2902-4683-9318-ce4d6c3cb79b	1	Other	Other
+900efc22-42fc-455b-be66-210efb2b4d1c	1	Other	Other
+900efd02-1298-41c7-98a5-929a34433853	1	Other	Other
+900efd57-e35f-41d2-a281-67242c4c64a5	1	Other	Other
+900f463a-6e68-4558-9755-0a42f9991b86	1	Other	Other
+900f5f84-8328-4ac8-97e1-a2d1ee41caa0	1	Other	Other
+900fae3b-d4bf-49de-a8cf-7f91ee2eb22a	1	Other	Other
+900fd3a5-118b-4d75-99a5-286f394a5e5f	1	Other	Other
+90104292-b3be-4645-9e41-278416e140ee	1	Other	Other
+9010446b-8247-49b7-8e50-f457db612da1	1	Other	Other
+90109d3a-c4e6-4f7e-8d9b-13b021570e4f	1	Other	Other
+9010dc2d-3e9f-465c-8134-8dad06e056ba	1	Other	Other
+9011851a-7412-4936-bfa7-33ca79e157cd	1	Other	Other
+9011b291-18bf-420b-91c6-91bb762a4ddd	1	Other	Other
+9011bbb8-484f-4ceb-a1b2-8442bac63948	1	Other	Other
+90128742-cd90-40b9-81e7-a4e917fb092a	1	Other	Other
+90128c41-afc0-4cdb-b175-4cbdccde7eb4	1	Other	Other
+90129168-dc75-442b-a131-76bcc3e0a9e7	1	Other	Other
+90129a51-f2bc-4f52-89c3-13f7efa432b9	1	Other	Other
+9012b15c-18d9-4860-8d43-cf76d11582ba	1	Other	Other
+9012b9b2-ab00-47de-8463-813c90f68f72	1	Other	Other
+9012e754-8a3a-11e7-993a-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+90130ec4-35e6-4799-abde-ec1c6d1c30e4	1	Other	Other
+901344e1-e3ac-42e6-8df4-3441963608d4	1	Other	Other
+9013683b-b218-469d-84a0-405ef5d746f7	1	Other	Other
+90147627-a276-4aef-823e-84c24143a990	1	Other	Other
+9014a42d-f5f5-4a1c-936f-76465ecc0cb5	1	Other	Other
+90153084-285b-4e6d-9882-98f9bbe51f83	1	Other	Other
+901566a5-cc00-4458-8370-8a2a9f632b60	1	\N	Other
+9015a87f-5737-4b04-8df7-c31d98b0ac05	1	Other	Other
+9015a980-6c22-4280-b0a4-c97a244352d3	1	Other	Other
+9015ddeb-6a22-40ac-9a48-4dffb6485803	1	Other	Other
+90164aa3-ded0-44b4-a216-41edf2e0a3eb	1	Other	Other
+90165ed1-a0e0-4a7f-b8b0-20edcf8b1d7e	1	Other	Other
+9016985e-ef0b-4a08-9dee-99b41d9c9a1a	1	Other	Other
+9016d78d-55bb-4a87-9aa1-5413e3da96fe	1	Other	Other
+901714bc-debe-450f-b90a-c1d2c085995f	1	Other	Other
+90174749-fc49-4871-8ee2-509309898f7e	1	Other	Other
+901749d4-76a1-490c-8e20-699ad454127a	1	Other	Other
+90176bb9-cdda-47c1-93c3-16a39667dbe8	1	Other	Other
+90176e21-7aad-4e40-851c-350c19933879	1	Other	Other
+9017c3ea-37c2-4af0-bb92-271d391900a8	1	Other	Other
+90182e42-bbe2-4d4d-9eb8-d4664c2f4a82	1	Other	Other
+9018567d-0a8d-4d81-9206-3a9dea7208bf	1	Other	Other
+90187ecd-d9a9-4358-9118-9e9ee5564c3c	1	\N	Other
+90189417-2d59-484e-a68b-33f59d2a8369	1	Other	Other
+90189d04-a4cc-428d-8d1c-13496e1c656f	1	Other	Other
+9018a33c-fed5-4e93-93db-d023ab5a966e	1	Other	Other
+90195caf-d839-43b2-ad9d-11ed895fd4ee	1	Other	Other
+90195d9d-f6ed-48a3-9088-129eab56df55	1	Other	Other
+90198c93-b442-44ce-bb0a-13ec6831ac54	1	\N	Other
+9019a2b6-2b55-4a0d-8b7b-36f52afc7288	1	Other	Other
+9019d898-9b17-4534-9a76-c9a92dbf28e4	1	\N	Other
+901a0f75-4aa4-460d-84e2-9522b97d6292	1	James	Other
+901a1a5a-803c-4507-bc9f-37dd8e10bc87	1	Other	Other
+901a1b04-b111-44e6-98a5-dc57cc01a6ff	1	Other	Other
+901a1f45-cdfa-456c-8ebe-f1c6208b3075	1	Other	Other
+901a1f62-44ab-462b-89ff-ae7ae0ffb87d	1	Other	Other
+901a2016-a6eb-42f1-ae03-c07614a0ea2f	1	Other	Other
+901a3bdf-7fb0-40a4-8de5-1791d9863357	1	Other	Other
+901a7589-ce0e-41a4-a24f-9d06fc2e8afc	1	Other	Other
+901a96c3-cf78-4382-b74c-75ec6ebff089	1	Other	Other
+901aa60c-77fa-4a99-aff5-04259e1a762b	1	Other	Other
+901ab3f4-e49b-46f7-936e-413d43b58f0b	1	Other	Other
+901ab450-85aa-4403-9f33-09a4bb70af9f	1	Other	Other
+901aefbc-df46-400c-b529-1ff89c2472fb	1	Other	Other
+901aefc0-cce7-44c8-bf77-41767b6dab3d	1	Other	Other
+901b4115-e747-4cec-a703-856784332a71	1	Other	Other
+901b7d7d-68df-40f7-ae5d-46a9c0f0be21	1	Other	Other
+901bf622-f552-4d62-bc4e-0064a374b69d	1	Other	Other
+901ccce2-a7b6-4c08-ad7c-20c69f8385ee	1	Other	Other
+901d0970-30f2-4dd7-9c8f-0a013cfa8b2d	1	Other	Other
+901d2739-e80a-43a2-821a-4b5fd12d5f08	1	Other	Other
+901d4bf5-5d0a-4167-9974-6b41d2addf7d	1	Other	Other
+901d74b9-bb3b-4af9-9139-d8c4d3ea243f	1	Other	Other
+901d835f-4ae7-4761-9212-2d6c856b6c88	1	Other	Other
+901dc819-d827-408e-888b-3931968bb018	1	Other	Other
+901e518f-86a7-4729-a3de-d238ea01fec2	1	Other	Other
+901e8019-8279-46d1-83ec-cd6912a8b69d	1	Other	Other
+901e8219-0972-422a-897f-919541e7d760	1	Other	Other
+901e92e1-1ac6-47c2-ad68-0135bbec260e	1	Other	Other
+901ed406-58c3-4790-8e05-b37be1f6a186	1	Other	Other
+901ed5f1-a274-4ade-9419-73c0a54f1b4a	1	Other	Other
+901f0a6b-3627-426f-8f86-571fe373c347	1	Other	Other
+901f19c6-021d-4c19-b041-90e4ba83ea21	1	Other	Other
+901f2f0f-e534-496a-820c-671b97762d2d	1	Other	Other
+901f8419-8d9f-478e-b86e-718a913dca3a	1	Other	Other
+901fa6b6-8f24-4725-a274-41d9bfd33932	1	Other	Other
+901fbccf-b600-4377-8376-0e8f7d79c2cf	1	Other	Other
+9020663b-6a8d-484a-96fa-18dbe47b79c2	1	Other	Other
+90208a41-1fb2-4fe7-be70-440a642c47ea	1	Other	Other
+902092ac-4c4a-452e-9095-4d86dcd61984	1	Other	Other
+9020fd25-6d9b-438d-b2ca-0808ece5be06	1	James	Other
+90211992-e88c-429b-89c7-879ff2a50193	1	Other	Other
+902149fa-599a-4623-924e-22ea47fb7d32	1	Other	Other
+90217946-b77e-426f-863e-d70c0d531460	1	Other	Other
+902207c8-0197-4c02-8338-9bb9c635fd57	1	Other	Other
+90226d26-e45d-4f14-a2b0-4fc87cc92bbe	1	Other	Other
+9022781d-cc8a-4058-91ed-8830c15808a6	1	Other	Other
+90229ccb-4bdb-48a1-84b7-67039ce06252	1	Other	Other
+9022c39b-f671-4cb3-ab5b-00635d97b12c	1	Other	Other
+9022e26d-2f08-43d4-888e-737fe05a7235	1	Other	Other
+9022fe7e-a64e-480e-9d5b-0101630403ab	1	\N	Other
+90231705-46a9-41db-9e24-d6041920ac6b	1	James	Other
+90234fcb-525a-4bf0-bf39-729b6e17a228	1	Other	Other
+9023a3ec-eeb4-4036-82a4-8635d3cd55f4	1	Other	Other
+9023b5da-e00e-4f28-93c6-bb6500b38984	1	Other	Other
+9023b705-3d4a-471b-b8a8-39c9724bd749	1	\N	Other
+9023de12-c1af-4812-aa30-d410590b004f	1	Other	Other
+9023eae4-f28c-486d-bf90-6d5738ec736c	1	Other	Other
+9023f867-99ca-48a3-be8f-13b3b1e5a8b7	1	Other	Other
+9024338b-5eed-4998-a0a5-f92e879359ab	1	Other	Other
+90249ae2-7469-4c3d-96c8-c96007810a67	1	Other	Other
+9024ac30-c95a-4223-9759-c46ad29f68ff	1	\N	Other
+90251223-c7a2-4456-b9d1-52c1be778499	1	Other	Other
+9025312e-0ebf-46c8-b5cd-378e6ebf3795	1	Other	Other
+902542d7-7866-44b3-9b44-572b3102836f	1	Other	Other
+90256d7b-e4ca-4e30-a254-b9de558dfa54	1	Other	Other
+902577b9-aff5-4b59-87cf-d8fd9b91c0bb	1	Other	Other
+90258890-78d5-4dff-913f-675117eba9bd	1	Other	Other
+9025cabe-115f-45ba-b735-ee33857e38de	1	Other	Other
+9025da76-8aab-4f74-a371-6c8b14e9d42d	1	Other	Other
+9025e01e-1d3f-40e1-8f2b-0b90a684513f	1	Other	Other
+9026388b-c568-464f-92e7-077881a35a5d	1	Other	Other
+902638b2-6e31-45f1-a4a6-13a67e27e2ca	1	Other	Other
+9026ec9c-eb9d-44bf-b484-556d8a15cbbb	1	Other	Other
+90270834-507c-4404-a4ff-446e4fa77bda	1	Other	Other
+90270fa8-24a8-4bf2-b29f-3a69971a5253	1	Other	Other
+90272f76-d5a8-4c91-ae2a-f1134b007cb1	1	Other	Other
+902737bc-008d-41ff-9d7f-cf0c95044af5	1	Other	Other
+90274753-6ab2-4a0d-aed4-bbbc648f05f6	1	Other	Other
+9027572a-52b1-4f19-84d1-8942a8dcb9cf	1	Other	Other
+902801f2-b6ad-4997-a5f4-d500d05e4f8f	1	Other	Other
+90281732-1e37-4240-b52f-6e802b35bc1b	1	Other	Other
+90282440-9145-4b62-b38c-70f54894d3f0	1	Other	Other
+9028349b-95f0-4efd-9720-2fb8849f3279	1	Other	Other
+90287d45-5a17-4a92-ac59-3ca2abc68c95	1	Other	Other
+9028d46b-860a-4c9d-a2de-45a6c3fea735	1	Other	Other
+9028fa54-6d53-4b5a-8959-24b7283ae5d6	1	Other	Other
+902975cf-9579-4cc3-8a24-b62d5744b158	1	Other	Other
+9029d363-f6a4-4276-9439-9a3fb1525c4f	1	Other	Other
+9029e674-e51d-49a9-9bfe-8bb6375fa2d4	1	Other	Other
+902a0a43-1485-435a-8d0b-02215a963d64	1	Other	Other
+902a0c16-a344-4a85-a44c-652ac84994cf	1	Other	Other
+902a196f-835b-4dd2-bb46-4f801ceda7d6	1	Other	Other
+902a9f39-6a7a-4167-aef8-a35962d3770d	1	Other	Other
+902aa47e-1470-4f47-bfc1-b879aa307eab	1	Other	Other
+902aae17-e605-4bbb-86c8-a0916897232b	1	Other	Other
+902ada2e-1ac6-4dab-9cbe-ca4777abb41e	1	Other	Other
+902ae2a0-06ec-4844-813b-11e9e3bfcb5f	1	Other	Other
+902b0582-9003-4f98-9548-e3ec91bcfe45	1	Other	Other
+902b92cd-dc2b-4776-8119-2d9504da5996	1	Other	Other
+902c20ab-8b62-47a7-8bca-1287432acd4a	1	Other	Other
+902c3f51-ca95-47fa-94ab-97580ce14ec3	1	Other	Other
+902c5d8a-0dd9-4557-8b09-0e6ad7c7e863	1	\N	Other
+902cc613-cc59-4478-a221-fda789199d8b	1	Other	Other
+902cfbc0-046e-41f2-9699-d0d0b02fb72f	1	Other	Other
+902cfd28-7948-44a6-84d3-87776a8215a2	1	Other	Other
+902d05f8-81cd-4f30-8f8e-dc47ac6dcc24	1	Other	Other
+902d4c71-6f88-4d5c-adfe-fb4487185227	1	Other	Other
+902d79c2-5400-471f-9822-9e506dae4c1d	1	James	Other
+902d7a17-062b-46f8-b08e-8ec7af628077	1	Other	Other
+902d831c-b52d-4c42-bb8d-b51c40be7cd1	1	Other	Other
+902e058f-1663-4971-b011-7608d88b36c6	1	Other	Other
+902e12a3-ef5e-45f1-8692-d84bf2bcc83a	1	Other	Other
+902e6bd4-5f4f-4a57-b987-f2e1a7e670a4	1	Other	Other
+902ecc1e-2a1e-49a8-86da-029877b4ac33	1	Other	Other
+902ecd23-8782-4dd0-a5cd-3e77a0e75622	1	Other	Other
+902ed635-6a90-4073-8e12-143e250589d8	1	Other	Other
+902ef89e-3d94-405b-ab8f-c9fff2526e19	1	Other	Other
+902f4087-b008-4a5c-8ce2-03d2713f2904	1	Other	Other
+902f4a9e-09ab-48a9-ab0d-a187ab8da759	1	Other	Other
+902f502b-33cc-469e-9acb-351a08028bd3	1	Other	Other
+902f713a-9ba4-4d13-ba75-543cc15ffd63	1	Other	Other
+902f7d1d-c0b0-4aac-8ff1-612c868f53ee	1	Other	Other
+902f950c-46ed-4542-ba6f-4a852f74baa7	1	Other	Other
+902fa246-957e-422a-a661-9809b4e0d1c8	1	Other	Other
+902faa4e-51f6-4afc-9f9d-6861c86982c2	1	Other	Other
+902fbda1-bdb2-4de0-8744-5bd9b8c9af39	1	Other	Other
+90304061-2df2-4810-bca9-e623a68d6373	1	Other	Other
+90305ca3-d219-4831-9189-472edb8b6f68	1	Other	Other
+903089b1-07ec-4c4e-8587-cd7fb6921f14	1	Other	Other
+9030c4a9-40db-4821-a1f8-9ea1d927c4e1	1	James	Other
+90311e94-7775-4cfa-b245-0d909c7c8346	1	Other	Other
+9031868f-60b9-4c4d-a0b7-3859f01551bf	1	Other	Other
+9031e1c2-4164-498d-866a-42863781fd1a	1	Other	Other
+90320101-e2c1-4290-96b6-3d4c2d3a13db	1	Other	Other
+903249d6-8559-4ae1-ace2-a0ff977a5985	1	Other	Other
+90326e1c-28c8-42e9-acc7-fb38690b8273	1	Other	Other
+9032ddf8-34b5-44a5-b84b-9898b59019e8	1	Other	Other
+90335ad1-e2f7-4cf7-8008-77a152e64490	1	Other	Other
+903386c4-c6f5-49e3-87c5-3e3873ed617a	1	Other	Other
+9033a584-a9e1-401d-9a41-48224cab5b3e	1	\N	Other
+9033c94d-996e-44af-b7d6-f16f980f0bc2	1	Other	Other
+9033f476-73a1-420d-a13e-708a314c4267	1	Other	Other
+90345eb1-7376-4ecd-8b59-a15a43e2d283	1	Other	Other
+9034b1c6-ca52-47bd-b14a-37a9d47acec4	1	Other	Other
+9034f7aa-bfc0-46ab-8635-41624fc965c9	1	Other	Other
+903568e4-0163-4d87-b5c0-e105f3f6c330	1	Other	Other
+90359742-6fe8-4ddb-94b2-92fb06d34fd5	1	Other	Other
+9035a406-44b6-475a-8765-a3a5f6ecd756	1	\N	Other
+9035bd82-e518-4430-b3d8-736e2148a24c	1	James	Other
+90362112-42e4-4d36-b375-578ea0a1d97e	1	Other	Other
+903643aa-862f-49d3-a6e0-b57ad7c459c3	1	Other	Other
+903670d8-0940-4eba-878e-c9992734299e	1	Other	Other
+9036772d-c0eb-4542-b3af-8fe6fe9d0e87	1	Other	Other
+9036ea09-123b-4db6-beae-d63e05820ad7	1	Other	Other
+9036ef23-db1d-4cbb-9244-a3a38859b262	1	Other	Other
+903721a3-1cc4-401a-8537-7ecf1e070720	1	Other	Other
+903723c7-a8d0-4442-9788-46f7f4a57577	1	Other	Other
+9037275f-d032-4085-8d48-33c185b40958	1	Other	Other
+90375d5b-0da9-4276-a35e-8eb7d75f999e	1	Other	Other
+90375fa4-4a91-40dd-9dc4-7001881b754d	1	Other	Other
+90378e98-2b57-4c5a-b992-8fbed3ec87cd	1	Other	Other
+90379c34-1fc8-4ef9-85b5-74c2877462fa	1	Other	Other
+9037ac31-aa7b-4a5e-881c-a1175a8b4064	1	Other	Other
+9037ed85-f8bb-4739-bc16-c37e6e50e669	1	Other	Other
+9038453d-2a48-4a6c-ac5b-e4dd78805dd3	1	Other	Other
+9038584a-f1bc-4afe-b8a5-8363c6fa51d7	1	Other	Other
+90385d31-17ca-474e-b386-55e1ca978010	1	Other	Other
+90386f04-cc3b-11e7-8b59-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+9038b681-9fc9-4976-9b70-542d0c5be928	1	Other	Other
+9038c774-a71c-4de7-be63-b446774dec5d	1	Other	Other
+9038e089-8159-4987-b8eb-419aa794b631	1	Other	Other
+9038e2d3-7e22-4abf-b25d-6b0f364e0442	1	Other	Other
+9038f190-881c-4465-85f8-30057bfd20a0	1	Other	Other
+9038fedd-92bc-4179-8bde-47a8a06efa66	1	Other	Other
+90393a76-1ad4-481a-9080-1b51f9dc99ca	1	Other	Other
+9039a9df-5638-45f1-add5-fb9abdf76968	1	Other	Other
+9039c093-508f-4e9f-8295-4055cb62c0ba	1	Other	Other
+9039dc45-6b65-4d94-936a-3556e9e47d47	1	Other	Other
+903a0a82-fa7b-421b-96a0-4a7f04049e1e	1	Other	Other
+903a2720-a383-41c0-95ca-c63e760090fb	1	Other	Other
+903a5bd4-2bfc-4d17-b0ae-709b5ca56b56	1	Other	Other
+903a74c4-94b3-455a-8138-80db64293518	1	Other	Other
+903a8eb5-2223-445d-aedc-c2135db6edec	1	Other	Other
+903aadb2-23d2-4d83-ac70-2d6d3e5c8c40	1	Other	Other
+903ab9d4-86a3-4fd4-8fe5-26b37857f4fc	1	Other	Other
+903b132a-e4dc-4a54-be0f-3dde1b941908	1	Other	Other
+903b1cb9-16f4-4276-ad2b-147ed4c19672	1	Other	Other
+903b61a0-a64d-439b-a29c-67b66cbe3785	1	Other	Other
+903b6e3b-a410-4d07-a4d2-4d87c5c9ce18	1	Other	Other
+903bbfd3-4691-4f61-a01a-7e9b90c4b915	1	Other	Other
+903bc7b3-ae5e-4067-a75e-b8b10be4c88c	1	Other	Other
+903be2ef-cbdf-40e7-ac41-fad58776f222	1	Other	Other
+903c2085-877b-4021-8c86-674edce15e8f	1	Other	Other
+903c6d4b-e20b-433d-8d43-14cc946991e6	1	Other	Other
+903c7091-ff23-41ab-9890-fff5644ab0c2	1	Other	Other
+903c8450-6709-4d8a-a482-1ffa508f36be	1	Other	Other
+903ca328-bc08-4640-86f9-a1b96b9a88b9	1	Other	Other
+903caed6-ab49-4324-acb8-2964e0c4995c	1	Other	Other
+903cb15f-3eb0-4e10-8282-26419a1274b7	1	Other	Other
+903d2366-7ce5-47f3-9e7b-4e2f91202167	1	Other	Other
+903d6cdd-8335-4940-b526-ad372be758de	1	Other	Other
+903d7902-a618-4b35-b396-5500fcb70da6	1	Other	Other
+903db7d2-3975-46d2-aa38-12b4ab06a125	1	Other	Other
+903db808-c5a5-475a-a6b5-b55ccd6e6242	1	Other	Other
+903e163e-15ca-4ab7-bb6e-1b76720ba21f	1	Other	Other
+903e9634-0684-44fb-a4c0-91c34aef50a0	1	Other	Other
+903e985d-484c-43bc-9cc4-58db7680dd78	1	Other	Other
+903ea368-b549-4e2c-a3bf-57ad3174c73e	1	Other	Other
+903ead84-d2fa-446d-9091-6fdfcf023766	1	Other	Other
+903ed85e-00da-45ae-b914-79e482ead467	1	Other	Other
+903ee6cd-791c-4401-8e9f-d0e7c2fb2dae	1	Other	Other
+903f9bf6-6f61-47e3-b845-02489d9b8409	1	Other	Other
+903f9f59-4971-44de-8bef-35fc3b20384b	1	Other	Other
+903fb573-faa7-4ac6-a545-b8a02215d1c2	1	Other	Other
+903fc68c-e17d-4b78-ab8a-4c4b04b77e37	1	Other	Other
+903ff6ab-06aa-48ba-8ea1-3b0f465bf9e3	1	Other	Other
+903ff94f-89af-4333-a10c-2ec06e171a7a	1	Other	Other
+90403f30-07cd-4b97-a583-e4add3107479	1	Other	Other
+9040603e-6eae-49db-9bd3-dfe9b4aed72c	1	\N	Other
+9040766c-fe37-4e99-8d9f-44339dca12dd	1	Other	Other
+9040823e-642e-4478-bd8a-e2d3bebd094c	1	Other	Other
+904103d3-5037-4d9d-a827-26efab6ed074	1	Other	Other
+90411078-1219-4b0b-a9a2-35491f9d55b3	1	Other	Other
+90411415-cb2d-404d-becb-f86315268c8b	1	Other	Other
+90416d2e-dad5-4139-a10f-4552586807ee	1	\N	Other
+90416ebd-f2ba-4d54-bccc-e01cdc1be751	1	Other	Other
+90418290-0b51-45c9-948c-10bc865c2754	1	Other	Other
+90419d82-c79b-4680-a0ff-288c305a4961	1	Other	Other
+9041cad5-d29b-46ce-b692-0ae4de806e13	1	Other	Other
+904223dd-bdba-4cd6-8761-23966fa8bf0a	1	Other	Other
+9042296e-40d2-48c6-840e-dd93f1529938	1	Other	Other
+90429a97-2526-4f8b-8238-3a32c2a9a2fd	1	\N	Other
+9042b8e3-3c7b-4f50-aec2-c09bd56556e0	1	\N	Other
+9042ce67-5a27-410d-97e3-2315ff72cb64	1	Other	Other
+9042ece6-6ae8-498b-98e2-7d0fda263cb2	1	Other	Other
+9043021b-9310-477f-aef4-d61b528a9eff	1	Other	Other
+90432106-6892-47aa-80bb-72cb2d2698ce	1	Other	Other
+90432e2a-a59a-4e58-bf7b-f3770c656266	1	Other	Other
+904384db-63f6-41e8-92e8-1c675d255e72	1	Other	Other
+9043b120-2043-42f6-80d4-c5649a5dc10a	1	\N	Other
+9043dcfa-cf19-41c3-a712-89c20519fd8e	1	Other	Other
+9043e75d-3b15-4c2d-a5ea-d4cc66344b7a	1	Other	Other
+9043f95d-3c8a-447f-ba8d-c47dd9dfdade	1	Other	Other
+9043fbe5-d80e-4140-929e-1fa8bfff3ef1	1	Other	Other
+904427b7-39ac-4ae6-bedd-f96637569c22	1	Other	Other
+90443a10-8627-424e-942c-dec6a5ce194d	1	Other	Other
+90444623-2860-4df2-a731-fd7502837e91	1	Other	Other
+904459a3-02d6-4c20-a3ba-82d864829b1c	1	Other	Other
+90445fc2-a8a9-45e0-8fc0-eb2b1987844f	1	Other	Other
+9044aa51-10b9-45f8-9af8-426797f8bbf1	1	Other	Other
+9044cdcc-1443-4cd0-a8d1-860291683cbc	1	Other	Other
+9044dd5b-64e2-47cd-8192-8c54fb53fe63	1	Other	Other
+90451d83-a8ff-421e-8f5c-f8c74326d900	1	Other	Other
+90452ab7-bbc1-4a14-bdb4-581add73f94e	1	\N	Other
+904546a4-09f7-4d37-a777-db5b68e5f285	1	Other	Other
+90454d04-f167-4ee2-88d1-5e5e7d59ace9	1	Other	Other
+90455998-b3e9-4d4c-a301-df6368188686	1	Other	Other
+90459532-4134-48c1-8e66-396bf059309c	1	Other	Other
+9045e087-61a5-4549-bed5-7f2d46ea203b	1	Other	Other
+9045e72c-c1c4-4a20-ad61-7752ce33aabb	1	Other	Other
+9045f496-2c53-49ab-9ae3-9e4d809642f5	1	Other	Other
+9045f53a-c32a-4b41-b8db-9447de7385db	1	Other	Other
+904600f4-ebfa-4202-8ad2-12bc93eca968	1	Other	Other
+90463bf3-32d9-4b85-93e9-2793515575ef	1	\N	Other
+904642be-bb85-42fa-a2a4-e6cbaebbe7a9	1	Other	Other
+90464bf5-488e-4780-b749-1ff6bce824cb	1	Other	Other
+90465ec8-408e-4139-90d3-1f6b0929a528	1	Other	Other
+9046a127-46de-4453-8d35-b90aa279b37e	1	Other	Other
+9046ea2d-2c48-49c3-b5a8-18294bd1190a	1	Other	Other
+9046ed8a-4e3a-4742-a03a-9adaffe35100	1	\N	Other
+9046f844-fa03-45d7-be3d-f285082aa815	1	Other	Other
+90471a87-127e-46ca-be8e-7a31b994634a	1	Other	Other
+90479e4d-67b5-452a-9683-fa4f9cbcc4fa	1	Other	Other
+9047ba8b-2313-4005-9e7d-a1028e4f078d	1	Other	Other
+9047c600-b85a-4bb9-9a78-2534b9f1ac6e	1	Other	Other
+9047d465-7e21-4e25-bb54-e28c147543ab	1	Other	Other
+904804cd-26df-4cc2-95a7-582ca2915ecb	1	Other	Other
+9048321b-a09e-496a-a671-b251c6e336d2	1	Other	Other
+9048459c-7ebe-40f4-8870-4daa154970a7	1	Other	Other
+9048b054-9fa3-43a3-bd28-2d2b895738ff	1	Other	Other
+9048d919-b73a-4343-a000-42332ecd7052	1	James	Other
+9048db5f-4cda-484d-ad6c-a223490cb474	1	Other	Other
+904915c0-fb33-4d2a-931d-f625cda533af	1	Other	Other
+904920f1-e88c-41af-b222-22a94f8805ef	1	Other	Other
+904932e3-54e5-46d7-9930-64804e451bc6	1	Other	Other
+90495ad0-29db-4400-b103-cfb71f127ca8	1	Other	Other
+90495f8d-b5a8-4505-96ef-424f11dcfae1	1	Other	Other
+9049c729-e1c3-4a32-8597-47e25a2e34ad	1	Other	Other
+9049e9e3-e838-47a4-b26f-326227ff8fbb	1	\N	Other
+904a348f-90df-484a-a5bd-0b11dcb97577	1	Other	Other
+904a4202-4d93-4f32-9073-2984a1e9bc0b	1	Other	Other
+904a6ae5-fa27-49b5-b17e-7ccabd08bb94	1	\N	Other
+904a7bf8-04ef-46d5-a754-000bf622f6d8	1	Other	Other
+904a985b-d76d-4b45-9c39-f180ee8e671d	1	Other	Other
+904ad0fd-dbe8-4ef2-a67b-74dc37c12e2d	1	Other	Other
+904b045b-0116-45a7-9914-3541c87dffdb	1	Other	Other
+904b6877-a87a-48a9-aed6-77d44efabb13	1	Other	Other
+904b8477-21b6-4c0e-afcf-6a9587dd9ba7	1	Other	Other
+904b9f63-fe5e-4450-a389-62037fb09ac3	1	Other	Other
+904bc368-93a9-42e9-8c56-48df5d90740b	1	Other	Other
+904c1e8a-e528-4ef4-add9-44baae2a3453	1	Other	Other
+904c24ed-35c7-4726-9b6a-e97052d28461	1	Other	Other
+904cac47-076f-4afa-90a2-5f0c9dcc488c	1	Other	Other
+904cb940-4c39-4f40-b2ac-218df555cad1	1	\N	Other
+904cbaea-2018-43fd-9c0b-1f4a52cc68b6	1	Other	Other
+904cc1b5-dabc-4aad-acd5-56372da52128	1	Other	Other
+904cc9f6-75f2-4fb7-8956-e3cdd020da78	1	Other	Other
+904ce431-1953-4af3-b73c-3805b75c77f4	1	Other	Other
+904d0eaa-1aa4-416c-bbb0-eece4b08168c	1	Other	Other
+904d6762-43c6-4c71-b3b3-ca936f735613	1	Other	Other
+904d81d8-1d73-4402-81c8-95f65f9f7dbe	1	Other	Other
+904dbe65-86f2-4f6e-a5f9-6688caedf4b8	1	\N	Other
+904df739-bafe-443e-8622-5955f47bdfea	1	Other	Other
+904e1b9a-4a9e-45bb-a404-248dd9362555	1	Other	Other
+904e30f1-ebf0-46e0-8bb5-4060be9be2ed	1	Other	Other
+904f2964-2387-4d9c-9852-77d573a1a7bb	1	Other	Other
+904f4563-f08c-48e2-92a8-413a17935dd9	1	Other	Other
+904f7ad7-cc14-49b4-ae8f-ae5148bc323d	1	Other	Other
+904f93d2-1879-4778-adec-0bdfebc74dc5	1	Other	Other
+904fde1c-3c6e-408c-8c6b-778e3ce5e6bb	1	James	Other
+90501bd2-ecfe-4a5d-bc4e-c730eac38fe4	1	Other	Other
+90509e7a-fa7d-408b-98e0-f682f4f19021	1	Other	Other
+9050f3d9-5902-4f39-80da-da01a87787bb	1	Other	Other
+90512238-86a2-4812-ace5-58060caa431b	1	\N	Other
+90518ed5-4d2f-495c-be87-14aac01c72a6	1	Other	Other
+9051cd17-82fa-4c04-9811-89cb1ca46797	1	Other	Other
+9051d64a-1c85-4abe-acb8-4fa76d7f0a24	1	Other	Other
+9052051a-ab67-4907-9c69-9ef9a496af98	1	Other	Other
+905255d6-ab19-4a46-bcd2-d13e0d12d551	1	Other	Other
+90526831-9922-4468-a6c5-d45f3ffb3602	1	Other	Other
+90526db8-5249-479b-a76f-a929b64cab4c	1	Other	Other
+9052d344-0141-4050-955b-faa23ea72f78	1	Other	Other
+9052d6f3-7dde-4a60-92fb-6e21a5f30fec	1	Other	Other
+905312f0-776e-4435-88a0-3eb634096018	1	Other	Other
+905331ee-ebc1-4d3c-91fa-f1eee7820d61	1	Other	Other
+9053c884-9976-46fd-9319-183076fe607a	1	Other	Other
+90540071-d0b1-430a-b98b-fcaa43e226a3	1	Other	Other
+90540761-df90-431c-a88b-4d415ea8fea6	1	Other	Other
+90545c6e-417a-44f7-b8e9-5c7139bedd81	1	Other	Other
+90546dfb-9fef-4587-8109-82f244a72529	1	\N	Other
+90547a48-1772-4655-9b9a-693a66cebec7	1	Other	Other
+9054ab93-359e-45f7-87f0-e7d724efe59f	1	Other	Other
+90550e15-0b16-4dc8-b1ab-6580a951a6fc	1	Other	Other
+90551904-86d6-474d-aea3-89c5f2db116b	1	Other	Other
+90556ea8-2751-4304-a482-1f3192bd36c8	1	Other	Other
+9055a322-8923-4fa9-ae25-28a89d3a4155	1	Other	Other
+9055ace4-378a-4249-9735-70ad63859ba7	1	Other	Other
+9055b647-f796-4cd5-8ec9-00e9c78772e1	1	Other	Other
+90561fa5-f5f5-48cf-a7ae-6247a01deb3b	1	Other	Other
+90566646-5496-4f39-8c4f-fee68fd3b981	1	Other	Other
+9056af79-8916-44ac-b4e5-6317844350e5	1	Other	Other
+9056b1ca-a8d6-48ec-8d75-e83e84087ea0	1	Other	Other
+9056cc78-87f2-4b47-bea4-abfd1bd3776a	1	Other	Other
+9056f932-a427-480d-b7d4-50d84e7daa1f	1	Other	Other
+90570178-e8bc-493c-933d-af0b85cc81c5	1	Other	Other
+905708fd-a048-471a-ad91-492564070d2e	1	\N	Other
+9057453a-0838-47ed-9bae-36cbe4173ff8	1	Other	Other
+90575b2b-60bd-4ace-982c-298932a60a27	1	Other	Other
+90577af4-158d-4e8d-86be-150608be819d	1	Other	Other
+9057a3ac-433f-4eef-82f8-9571c0adf6af	1	Other	Other
+9057f42f-135f-4c0d-8b8c-8d176db8f70c	1	\N	Other
+90587518-ee9a-4f57-93e8-ceec16342b23	1	\N	Other
+90587bce-5839-4e90-ab35-65cb6db600d9	1	Other	Other
+9058becf-783a-4f64-ac0d-2bbe7a8a1e03	1	Other	Other
+9058d4ca-9604-403b-b6bb-29413f570a5f	1	Other	Other
+90591d74-b5fe-4740-b0ac-a21b5580f5fb	1	Other	Other
+90593158-0336-4b2e-9548-71c3bdaa537d	1	Other	Other
+90594631-645f-4aa4-990d-28f74b053708	1	Other	Other
+90595cee-d287-4814-9b88-918d1126d435	1	Other	Other
+905963f8-6f55-403d-80fc-eb76188a9585	1	Other	Other
+9059966e-f272-412b-97a1-7fa683331460	1	Other	Other
+9059bb23-adea-4ac5-ae90-01f62bb0f244	1	Other	Other
+9059fdf8-35f5-4f2c-a65d-ded69b89f35e	1	Other	Other
+905a095d-cc72-4101-b432-3a171c641a95	1	Other	Other
+905a14ba-6f1f-42b9-9aad-cbb7075f2173	1	Other	Other
+905a7258-4196-4b60-9ddc-0744c0bb83b3	1	Other	Other
+905a7fdf-0a8a-46f1-9ca5-999ffc4571a3	1	Other	Other
+905a8a9f-6867-4f07-95dc-0bd20387c5e7	1	Other	Other
+905abb52-b1b7-41a8-9c30-0d8910e1a266	1	Other	Other
+905b4104-af64-4181-9732-4c1da6828f04	1	\N	Other
+905b5b0f-5ad5-45c2-a1e7-c2b03a8a5230	1	Other	Other
+905b82f6-2898-4d4a-8adf-4ec6af86543a	1	Other	Other
+905c821b-142e-4dbd-bcf7-d11a20dc0551	1	Other	Other
+905c910f-06e5-4716-8ced-22eca90392d9	1	Other	Other
+905ca0a6-50e5-4717-be3c-bfdea38f9b84	1	Other	Other
+905cba9b-c5a2-4a8a-add6-aca2207d8517	1	Other	Other
+905d1800-10e5-4196-aa89-656a26e03d57	1	Other	Other
+905d2070-93d2-46ca-9de5-9481351a3de0	1	Other	Other
+905d2bd3-4668-4f9a-8e78-41d23c2f3d43	1	Other	Other
+905d76a9-b0c4-46ac-a06d-6e62f9f3db89	1	Other	Other
+905d7805-d2ef-4b1e-9ca0-3487a215f32c	1	Other	Other
+905d91d9-9824-421f-915e-5e560d1a8c0f	1	Other	Other
+905d95dc-d924-461a-9ba4-71848a057691	1	Other	Other
+905dc90d-6374-4dc9-8942-71bd5948ba8a	1	Other	Other
+905e2246-ee22-42fd-92b0-d7754a2f432d	1	Other	Other
+905e2b11-7d60-4994-b1de-94342c1a031e	1	Other	Other
+905e46c9-f4bd-45a4-be8e-2e8d27938d3a	1	Other	Other
+905e69cb-d4f6-4773-82f0-b830a8d64ae5	1	Other	Other
+905e8a4a-0e9a-49d2-a353-39c1f1eaa97b	1	Other	Other
+905ebbaa-a30c-4779-b6ba-627088916d8e	1	Other	Other
+905f2340-31c7-4fe1-9cb2-30c0d5d86efe	1	Other	Other
+905f9978-e77c-45ea-a479-4c69cf59894c	1	Other	Other
+905fcad7-5dae-47f3-b2ee-e4db958f75ca	1	Other	Other
+905fdbe3-ca9c-4e54-bd92-c8868d856a53	1	Other	Other
+905fe834-1a23-48f2-8cbb-137cd2bb036d	1	Other	Other
+90600352-77d2-4b94-a364-fde01db1dc4c	1	Other	Other
+90600b89-82f5-46e3-8bf0-90a996825e62	1	Other	Other
+90601aab-007a-4101-8039-2272b116596d	1	Other	Other
+90605065-38f1-434e-9418-76308986bf95	1	Other	Other
+90606847-3e98-4372-9696-7a4cfeb758df	1	Other	Other
+9060b65b-292e-4e6d-9481-c0e28dd879a1	1	Other	Other
+9060f21a-720a-4c03-9b40-1979a1454b85	1	Other	Other
+9060f656-2469-4ca2-8136-7553f9ccd831	1	Other	Other
+9060faf0-eadd-4c3b-b6b8-98604c2b5ed2	1	Other	Other
+906108fd-b604-4c8a-a111-ed3e30fed732	1	Other	Other
+90611e4c-fb69-4492-a24b-905e1b16808b	1	Other	Other
+90612709-1046-422e-a10d-cac86054e676	1	Other	Other
+90615acc-1204-490f-aca7-4892d47c1f75	1	Other	Other
+90616282-1579-497e-b9e9-3a5b0c065a1c	1	Other	Other
+90618977-5911-4104-b445-dcb2b907a035	1	Other	Other
+9061a55e-9236-48ec-a2b3-0e9b9acdebc0	1	Other	Other
+9061ee2d-bb0a-4e52-ab01-b646e7e547c3	1	Other	Other
+906221a0-ba8a-4c9e-b3d9-486783ab0d01	1	Other	Other
+90630d31-7d7f-47f1-a594-dfbc3b43e8e2	1	Other	Other
+90634727-b550-4962-a7aa-e57e170349cd	1	Other	Other
+9063dfcd-0753-40ed-9633-1d1af71f6df4	1	Other	Other
+90640602-10bb-4466-8595-8537fe48768c	1	Other	Other
+90642758-a270-430a-80a4-2cd83f82cf32	1	Other	Other
+90644375-bcc7-4fb9-a036-b159b0c30045	1	Other	Other
+90647477-df42-4b49-9e9c-46641fd5dcea	1	Other	Other
+9064a1f4-5225-487f-b531-125520153958	1	Other	Other
+9064eadc-26f0-47c8-8920-99f550dc6712	1	Other	Other
+9065d1de-6c87-464c-a3da-9603d874760e	1	Other	Other
+9065e75f-c453-456f-9d26-7e74257e1826	1	Other	Other
+90664c2d-e280-4282-93c4-6cbfa040f0a3	1	Other	Other
+90667f12-d805-4516-93ee-559a2b612d7e	1	Other	Other
+9066cd4c-fb20-4e84-871d-57fffc536ef3	1	Other	Other
+9066d5a7-6dce-46be-82e4-385d52c575a6	1	Other	Other
+906732ce-7148-4809-9fec-e52c4c72d1f8	1	James	Other
+9067514d-25c6-47af-ba24-0d6ed0ca50f4	1	Other	Other
+9067754e-a820-48cf-8bf1-9c840b158e5c	1	Other	Other
+906828e7-6694-4451-89cb-291f54ff0a55	1	Other	Other
+90689093-4216-4b48-be9b-8b79c65b783c	1	Other	Other
+9068c8e0-49af-4ce2-8a8f-6ab0263d5b8f	1	Other	Other
+90693c16-f181-4e1d-a3c6-21b1a7d2ecf4	1	Other	Other
+90695701-597f-4458-979f-66c704912df5	1	Other	Other
+90696f31-0775-4fdc-8445-b4e43f4b046d	1	Other	Other
+9069ac63-9b52-4bbc-aa7a-8489c2c2db32	1	Other	Other
+9069bc3a-6de7-494b-88c8-8189a4780c11	1	Other	Other
+9069d9c4-4162-4e7c-be24-4d1ff4cf1855	1	Other	Other
+9069dd6e-6646-48c2-bdc9-787da937c782	1	Other	Other
+906a5574-9b0c-4650-812a-a48e0f094e65	1	Other	Other
+906a6a41-6d85-4628-a7a4-a47ae78c9b22	1	Other	Other
+906a9f31-ecac-4ca0-8fb9-610e0660f7a4	1	Other	Other
+906ab919-2955-4fe2-adb7-cac525eef59f	1	Other	Other
+906abca7-1996-45a6-a2d5-462bfe4ce102	1	Other	Other
+906acb43-7935-4c58-bd5a-ba44bcfaab87	1	Other	Other
+906acd5e-76fe-44b4-acd2-49fdfc59d17b	1	Other	Other
+906ad231-38af-483b-ad73-59df918484ac	1	Other	Other
+906b1f44-d670-43a1-818d-9ad86283dc90	1	Other	Other
+906b857d-a666-4520-bbb6-1cd6a3da245a	1	Other	Other
+906bb014-360d-4c40-a20c-989958a3d9db	1	Other	Other
+906bb810-cc57-4325-9259-ec88ded7a361	1	\N	Other
+906bed13-2f82-466d-84d8-9a5a79dbc070	1	Other	Other
+906c1609-4b23-4c36-982a-2c1dc9eadea3	1	Other	Other
+906c3668-5922-4d76-86a6-e62c3bd15ec6	1	Other	Other
+906c5470-b4b4-4c02-8843-a5bb53c5cee1	1	Other	Other
+906c6ed4-d35c-47c9-97a0-a684b6390adf	1	Other	Other
+906ccf95-c7b6-4b16-a697-22d80ba1aac0	1	Other	Other
+906ceb6b-f8f7-4bf5-ba8b-8c45e0cdd292	1	Other	Other
+906d6b6f-8be6-4c03-bb74-7ef32a662ec1	1	Other	Other
+906df9ad-422a-492a-a2ac-3ce8220a2346	1	Other	Other
+906e0097-db77-4161-beee-c84a8f300833	1	Other	Other
+906e4a07-4416-426f-833e-7cf3640bbdd6	1	Other	Other
+906e934f-d6b2-471a-823f-2bff83f8374f	1	Other	Other
+906ea91d-ee5d-4bf8-ab98-c21f28d4f0ae	1	Other	Other
+906f0ec2-ed9d-400e-a302-a6782d969b83	1	Other	Other
+906f3e13-2c3a-4b7a-ab88-f2897b804c26	1	Other	Other
+906f3e96-0aaa-435e-a1fc-c712bffe98ee	1	Other	Other
+906f5cb3-5622-4c4e-a352-c0ea11c7c970	1	Other	Other
+906f8ec5-350b-42d5-84c0-3a58e0f023f8	1	Other	Other
+907068f9-a50e-476c-87fd-0f4960fe36b3	1	Other	Other
+90709419-0e3d-4c16-9994-2c3776cd5a3f	1	Other	Other
+9070b306-b864-49d3-999d-898572966e82	1	Other	Other
+9070d4b5-3c3c-4ec6-80cd-4e7b966340da	1	Other	Other
+907139fa-875c-4eef-b77a-6fdc64402bea	1	Other	Other
+907189da-6ac6-47fd-8247-13cb18c6c62d	1	Other	Other
+9071f830-0454-447d-a209-d25f9b4f4962	1	Other	Other
+90729602-3a64-4ead-8c81-f01b3bcd258f	1	Other	Other
+9072b70e-7bab-40e0-bf2c-4e4c1396f3c1	1	Other	Other
+9072cfd5-0445-4009-b6c5-b946b33d248f	1	Other	Other
+9072d5a4-4f93-4380-a65c-9471c96d5c74	1	Other	Other
+9072f6c5-c8cf-4eec-9fe2-9582c2275781	1	Other	Other
+90734472-0f95-45a5-a5e4-9557cb5ca403	1	Other	Other
+90737ada-5584-4cc0-a67c-a04f16388b51	1	Other	Other
+907396ec-b485-4c63-a867-66a266be6cfd	1	Other	Other
+9073d9a0-7649-4d4f-b8e4-cd85e9f44a67	1	Other	Other
+9073e939-c534-413f-90dd-c61f0149a125	1	Other	Other
+90745bd1-b40c-4eea-a5d1-c150b3fc7ae0	1	Other	Other
+907470b9-9b1a-4d2d-a7c2-24efb60865d7	1	Other	Other
+90751bce-27a3-4707-9216-c9fc81a170df	1	Other	Other
+90753ba7-26ea-4336-9959-9d810ba69522	1	Other	Other
+90755d3b-0272-478d-b453-e96def637179	1	Other	Other
+90757cb6-5502-4f42-83f2-f0a7f1cdf6e9	1	Other	Other
+9075a0fa-7788-4f82-80dc-f29079b2ae64	1	Other	Other
+90761890-ed1a-4fec-81b5-a54028be5088	1	Other	Other
+90764454-b37c-4432-bd4e-1dad1408097e	1	Other	Other
+9076541a-3e84-4d1e-ac8d-b4e53d345e9a	1	Other	Other
+907666cb-343d-481d-ad66-e3f9e7cbe9a6	1	Other	Other
+9076db7c-502f-438f-a5fd-ff7b8161aee0	1	Other	Other
+9076e9e0-a632-42a1-9236-1eb22b9071ba	1	Other	Other
+90771bd4-70c2-44d2-ad49-c1a6301cd263	1	Other	Other
+90772a4f-7166-4ddb-b808-ac31b4453ef0	1	Other	Other
+9077671c-0033-4d7f-baf2-c8d77f83d8bf	1	Other	Other
+9077738c-f2cd-48cc-8ba7-4358d45da2c1	1	Other	Other
+9077a346-0663-4178-9c34-b5a1442bc40d	1	Other	Other
+9077ee31-0f6c-49cc-a598-47695a9f3955	1	Other	Other
+90781695-4545-4ae2-aee9-98acc0065921	1	James	Other
+90783d49-54f4-4d7f-8d65-fee12a62a07c	1	Other	Other
+9078d598-e2ee-4768-b245-09947bc6a87c	1	Other	Other
+90791a35-e59e-457c-9088-2e3c3b687133	1	Other	Other
+90791b82-3e62-4c94-8c89-65e75b61aba4	1	Other	Other
+90794788-f623-41c3-9afe-2524a169de61	1	Other	Other
+90794ba2-544c-4081-94cf-4762863ccbcc	1	Other	Other
+90798c09-6441-46ec-b879-01895feae869	1	Other	Other
+9079a83c-2bca-435a-9065-27fbc0623e08	1	Other	Other
+907a3b7d-827d-4954-92ff-bc6a9e9a424e	1	\N	Other
+907a43ee-92d9-4a5b-81fa-6e7e3391fefa	1	Other	Other
+907a4402-3967-46bf-96c7-a51d747870b0	1	Other	Other
+907a4c20-f8e6-4265-ba62-a8bb83cb0197	1	Other	Other
+907b1dd1-5b13-4960-a889-2c38adb6b192	1	Other	Other
+907bd1bb-3346-4aca-b874-1a3ff7f63130	1	Other	Other
+907be5cb-bd64-47fd-81df-f9935f679773	1	Other	Other
+907c0d7e-7e98-4afb-9551-9506f04464fd	1	Other	Other
+907c1f5f-5bd4-4407-a237-9f35534160b8	1	Other	Other
+907c9727-4347-4fa0-b5e2-99eee82505e2	1	Other	Other
+907ca0ee-f1bc-48f1-82d8-5bcb6fbafbad	1	Other	Other
+907d2e39-d2af-4b44-91db-f8687e561921	1	Other	Other
+907dacf1-f36a-489a-a082-0025f728ce37	1	Other	Other
+907dc2e3-9ff6-49e0-94e4-63b045ad7afd	1	Other	Other
+907dcfd9-6213-4ac4-84e0-e16bbda88200	1	Other	Other
+907dd0b9-5cd6-45f2-b1bc-67abb542bf12	1	Other	Other
+907e0486-f2fe-4450-8e8b-c1ffcaf242c6	1	Other	Other
+907e0509-68da-4b48-84ad-84232e24e26d	1	Other	Other
+907e0b77-83be-420f-ae59-6fbedb543d3c	1	Other	Other
+907ea247-ef7f-449d-bcc0-f21611695e07	1	Other	Other
+907eab83-6469-440e-9d91-e1d7e3b8c452	1	Other	Other
+907f9c5e-e7e8-458f-8300-2dd645d2ce70	1	Other	Other
+907fa57f-ef4f-4f66-8999-5acc89c7dbf7	1	Other	Other
+90801110-c231-472f-bfce-9743aca57635	1	Other	Other
+90803027-aca5-4e34-87f9-ab9bebda7c68	1	Other	Other
+90805f87-e2dd-4c31-93ff-a5ba05d9c852	1	Other	Other
+90806477-586e-42ba-997f-41d5736028b2	1	Other	Other
+9080719f-2537-41b5-ab49-7ce0868efb35	1	Other	Other
+9080d9e6-9061-47a5-9a20-f53dad1d0504	1	Other	Other
+9080fadf-9e40-43da-96f0-4d0c70bd54db	1	Other	Other
+908135b0-8bc0-45f3-aebb-03761c3aa7cc	1	Other	Other
+90819372-c175-48f1-bca4-b0cc6aa9c538	1	Other	Other
+9081972b-5558-413a-90ba-ab99a6b13abd	1	Other	Other
+9081c665-a776-4fd6-adeb-0fa2e4d9794e	1	Other	Other
+9081e153-16d2-4217-9e6b-434b3de22680	1	Other	Other
+9081e82f-05b2-4d5d-850f-84a5cdae0194	1	Other	Other
+9081e8ae-a28e-4a96-a725-f1b1ef081770	1	James	Other
+9081ff0a-4c23-4b28-a17e-d56a2345833a	1	Other	Other
+908209cd-6707-4e90-8199-4fcf7e454573	1	Other	Other
+9082191d-9d4e-4796-b2e2-ece3c2a8aaea	1	Other	Other
+90821ead-027c-4504-859a-b19770e44de7	1	Other	Other
+908238b2-16b6-4872-9e61-b47eda45a560	1	Other	Other
+9082d5a7-65ef-41c9-acee-1d1dec11e539	1	Other	Other
+9082ef1a-d278-4e11-bd5b-821ca4026dff	1	Other	Other
+9083146e-5ca5-4915-a7be-eb3f2b9fc4e4	1	Other	Other
+90831df2-7e84-4f83-9d9b-787e1e52ac4a	1	Other	Other
+90835420-9cdd-4a65-bf23-390f3f84d564	1	Other	Other
+90836dad-db1b-430b-b0c5-8df583b77eab	1	Other	Other
+908373e2-18a5-4c54-8ed7-2be88648c1e9	1	Other	Other
+9083ba0e-2c53-11e8-b791-fa163e8624cc	63dfcd94-143a-11e7-bec8-fa163e4dd901	Other	Other
+9083bcbe-b83e-475c-95f0-e2362dd0e426	1	Other	Other
+90842aaa-b1c2-46ff-a409-95892abc69d0	1	Other	Other
+90845141-8d47-4b0e-9bea-1d35ce46e217	1	Other	Other
+90846021-4351-4563-8cef-2eaaf0ba780c	1	Other	Other
+90846fcf-3e21-42e6-8fd2-d0f6ca654164	1	Other	Other
+90848fa6-18b9-48ee-8ce3-314d1a0f4359	1	Other	Other
+9084bce9-26c6-4ca0-994f-19ff0a3d4f17	1	Other	Other
+9084e9af-4925-40a3-959d-1d320c5c5281	1	Other	Other
+908515a0-6e97-4e63-88c6-4cb2b105c76d	1	Other	Other
+90852e0f-47bc-4ed8-a5f3-4c6568a218b6	1	Other	Other
+908551a5-f2e0-42cc-8fb4-068ffaaf4eba	1	Other	Other
+90856db5-0e7f-4184-8e6b-32445cbd43c7	1	Other	Other
+90857815-9157-46be-93dd-5db28ae8d342	1	Other	Other
+90857900-fe1b-4fa0-8264-1bd486e47e53	1	Other	Other
+9085e757-7783-48d8-bab3-5e72c21b137e	1	Other	Other
+90862cf8-2da5-40bc-9113-2c6a12a7c74c	1	Other	Other
+90865dde-4e53-45db-84a7-76ceeef62a70	1	Other	Other
+90867c95-2c4a-47b6-a7d6-7042bcb883ad	1	Other	Other
+90867ff9-f1a2-4046-b9f8-84dd9e0831cb	1	Other	Other
+9086ac38-3465-44a2-92f4-54927e6d1dd0	1	Other	Other
+9086f1a7-35eb-4115-af06-ea974969ace5	1	Other	Other
+90870174-6be7-443f-b949-671869f21154	1	Other	Other
+90872f40-f1e5-416f-90b7-a6d84a849a0e	1	Other	Other
+9087577b-92e5-48c5-b6ec-84e9a9c63af9	1	Other	Other
+9087882b-539e-41b2-a91c-649013921d5a	1	James	Other
+9087a14c-7e93-476f-bfbd-3c78f822148c	1	Other	Other
+9087f8b0-f036-490a-a2b7-6a4b71a013df	1	Other	Other
+908837b0-4271-4337-a670-f6a32c4661e8	1	Other	Other
+9088dbbe-e9a3-4bc6-9796-e3bb91c6437a	1	Other	Other
+908908a7-ff30-402d-b2b9-c7f86c6d6f16	1	Other	Other
+90891c29-1087-48ce-a2ea-57067e76d66e	1	Other	Other
+908949db-46a9-4da1-b88d-f161f27b8369	1	Other	Other
+908959e1-e888-468d-8965-96f1bc99fce5	1	Other	Other
+9089b8b3-6971-4ebd-9991-336828ecec50	1	Other	Other
+9089d2d4-ff2a-428e-96b6-1826b8470e4e	1	Other	Other
+908a68ec-d085-4ed1-a7a5-9020ab1fb95e	1	Other	Other
+908a8f6c-eb87-43c4-b4df-27a64b22b99b	1	Other	Other
+908aa8f7-f781-49b3-9cd8-5d9a9eb3db1f	1	Other	Other
+908ab7ff-6df3-41ee-9b2a-7194e6782c99	1	Other	Other
+908b521f-49a9-4646-9d3a-874298fb12e6	1	Other	Other
+908b58f0-c376-471f-ae4c-bcc0d87572df	1	Other	Other
+908b8dea-d20d-4e7e-9112-75e5abe788ff	1	\N	Other
+908b935e-f249-4a5a-a0b2-12bec26c0ffb	1	\N	Other
+908b9883-4e1d-421e-a309-0210be7d88f1	1	Other	Other
+908bb1eb-340a-43d8-96ac-7ef655674e83	1	Other	Other
+908c050b-672c-492f-b0ac-31a5199fa7b0	1	Other	Other
+908c44ed-f17f-47da-b083-e76509bd5dac	1	Other	Other
+908c72f7-91f7-4ba6-9e26-b4c38aef94a9	1	Other	Other
+908ca596-5b99-4024-87cb-cef85f86cb96	1	Other	Other
+908cc04a-57a3-4a20-b125-d13306df2bbf	1	Other	Other
+908cea98-845b-4a93-869c-2081a1264f27	1	Other	Other
+908d2e75-3d0c-4026-9291-86ee487154b2	1	Other	Other
+908d5a0e-4dc3-4527-9e7c-0ac77166b77a	1	Other	Other
+908e450a-b070-4396-9b86-551ae881a3aa	1	Other	Other
+908e597e-810b-49a0-9e42-6ef9307e574d	1	Other	Other
+908e87ad-fd06-4ac1-8220-750ed4e6f88e	1	Other	Other
+908e882d-07cf-485d-b9da-91dda5f11354	1	Other	Other
+908ea162-6456-474a-aa9a-152c50b4c1e3	1	Other	Other
+908ea1c1-3146-4eae-ab0c-6c5827afff8a	1	Other	Other
+908eb674-3c10-427d-88b9-58aedcf05c7e	1	Other	Other
+908ed463-0781-4f36-9dbd-40d494f1469c	1	Other	Other
+908ee308-e13c-4a8a-8a19-84cf91e034fb	1	Other	Other
+908ee786-c308-4241-92a1-13e4b28ad69b	1	Other	Other
+908f18ae-84a5-41a8-b18e-d79ad8a6e3bd	1	Other	Other
+908f480d-63f8-4cc9-b10b-c15e2a82800b	1	Other	Other
+908f6e3c-ba40-4e48-914e-b9482339d630	1	Other	Other
+908fa05b-35a4-4097-9619-30f97f94e539	1	Other	Other
+908fa9d4-2c54-4104-b553-3dd94669ffec	1	James	Other
+908fb7a7-90c8-434a-987f-d26d020dd7c1	1	Other	Other
+908fc348-6449-4837-9e1b-78c21a6baa02	1	Other	Other
+908fc396-14c2-49cc-a5a1-8c0fe250241a	1	Other	Other
+908fdad9-e1cc-4b18-87a5-1f9fdbfca4ee	1	Other	Other
+908ffa7d-a14f-4723-a417-0d96d5a726c4	1	Other	Other
+9090177d-90e8-4915-a786-953f8653ff47	1	Other	Other
+90903d55-96c4-4038-a214-bebeee9868ff	1	Other	Other
+909055f4-208f-4e13-83c8-50c0c60b5516	1	Other	Other
+9090cb2c-5dd9-48c5-a070-517185a1f3ef	1	Other	Other
+9090db25-eebf-470f-aa29-2428ffe9a9cb	1	Other	Other
+90912db4-2691-4557-9ef5-56724c2a0454	1	\N	Other
+9091d408-e91d-4036-938c-73fed7f1ae09	1	Other	Other
+9091ffa6-3258-4f4d-8cf9-4aa1c58fe9f3	1	Other	Other
+90920c6c-3016-46fe-901a-ad270f9adbb9	1	Other	Other
+90925243-dc1e-4fcf-9521-623925767f87	1	Other	Other
+90925867-21d1-4ca5-870c-91b5259637a7	1	Other	Other
+90928310-da82-473f-a3e0-28642ca34d31	1	Other	Other
+9092baa8-aed1-427d-abbf-ef8def6f6dab	1	Other	Other
+9092e7a3-93c7-4c36-b3d1-c3fa623a5d95	1	Other	Other
+9093400b-4a35-4093-a3ba-7d7692f35e8e	1	Other	Other
+90944c67-72dc-488b-bed2-695796c82ca4	1	\N	Other
+90946ce8-b69a-4ac5-88b7-24939bc5a978	1	Other	Other
+9094a07e-dfd4-40cf-821e-88bb5f825cb2	1	Other	Other
+9094d5fa-5a68-4ab4-a95d-66f489ce6599	1	Other	Other
+9094e082-93fb-497f-b530-9b667124c7ce	1	Other	Other
+9094f109-c947-4417-8e50-8731dbfa55d5	1	Other	Other
+9094f38e-77e8-43e8-8e23-7b9fb85d0713	1	Other	Other
+9094fb3b-a4b0-4c2c-b75f-94d20e66fdb4	1	Other	Other
+909511be-70fe-4535-a751-13068e969774	1	\N	Other
+90952478-c7d2-404c-bf52-17c236d37f64	1	James	Other
+90958674-85d1-47f4-953a-bcbb2250405c	1	Other	Other
+9095b540-7a5e-429a-b9ae-c386b05dc18c	1	Other	Other
+90961265-cda4-4306-b28b-3a8ed1104b2a	1	Other	Other
+9096320a-9cdc-4efb-801b-c0c0687de8eb	1	Other	Other
+90964cf4-4efb-4e5c-9012-82f7f9ba92eb	1	Other	Other
+90965e99-d4b5-4ab1-8caa-fcbc3add6961	1	Other	Other
+909695ef-1a2f-4059-b88a-76f02c9944d9	1	Other	Other
+9096fd82-1eb5-48bd-b5eb-eb1c8bf17523	1	Other	Other
+90971822-6bab-40d2-93f2-f1e16ce704ad	1	\N	Other
+9097a485-36c0-4c48-abed-3367a8bc1397	1	Other	Other
+9098432d-30e0-4a3e-88db-c06b9531dffd	1	Other	Other
+9098abe3-4999-42f0-9d92-ab84dac1dd6a	1	Other	Other
+9098fc05-b59f-4a13-9a01-ff3666229bcc	1	Other	Other
+90991aea-c06b-4752-914d-c01efc5ceee3	1	Other	Other
+90992b67-821e-4c7d-af1b-5b9b785e7886	1	Other	Other
+90995c61-5986-485e-aaab-47997abbbdb2	1	Other	Other
+90999a9d-c816-48e1-b573-845b4373856f	1	Other	Other
+90999c21-3482-4a2f-a249-282339165605	1	Other	Other
+9099bc38-1738-4504-b0d7-e218b513140a	1	Other	Other
+9099cb50-1761-477f-82a0-f3efe0b7b100	1	Other	Other
+9099f977-1f7a-441f-a602-997692492919	1	Other	Other
+909a1d7f-38b0-44fc-b3b0-f1074d707094	1	Other	Other
+909a6620-b07a-4918-8b04-54ba0f6b43d1	1	\N	Other
+909a8b4e-6656-48b3-8bbf-d5e6731cac56	1	Other	Other
+909a91d0-1a2b-46b0-9173-d2604c261ce8	1	Other	Other
+909ae0a3-aa74-4f5f-8920-ee3c8cdbc35e	1	Other	Other
+909b177c-cde1-49d8-b4ac-dc0e561adeff	1	\N	Other
+909b32a1-9f1d-4595-8c77-e46c6bac5adf	1	Other	Other
+909b4a0c-661a-428d-add1-4d0e520a2dd5	1	Other	Other
+909bbec3-3d6d-4dad-ade6-3d26f12b9696	1	Other	Other
+909bd66d-6e14-49e3-bbd0-3da0cf9aa0aa	1	\N	Other
+909c304d-0449-4e47-aaae-17493ef1aa0b	1	Other	Other
+909cb38c-8180-4b8d-acf0-e2e27cb6c6b4	1	Other	Other
+909cda02-f5b1-4142-abb6-5be13d6a66da	1	Other	Other
+909cf4f1-ebe6-4223-942c-5e8d538a2f54	1	Other	Other
+909d7307-972a-4aaa-a081-457303115ab3	1	Other	Other
+909dbdcb-bcd1-4462-a904-f5179ea8703b	1	Other	Other
+909ddd79-22a5-472e-a560-e3a4a02397fc	1	Other	Other
+909e0d8c-c6be-4873-937f-3b682f9e97af	1	Other	Other
+909e3893-dadb-400c-822b-55aa2bea4eb1	1	Other	Other
+909e7c4c-7f65-4558-9a62-356e7c96da28	1	Other	Other
+909e7dd2-8bcf-46f3-86f9-4d5f0ea75e3b	1	Other	Other
+909e91e7-dbb5-45ed-a8f0-e5734d0fdb19	1	Other	Other
+909eb550-96e2-426d-9d19-4cabbf5f926e	1	Other	Other
+909eb626-cff5-4ebc-9726-1b35024eed6a	1	Other	Other
+909ed043-b476-46b6-826a-182099b2b8c8	1	Other	Other
+909f7e49-89aa-44ff-853a-71cae29a5187	1	Other	Other
+909ff828-163a-4d3b-a34c-f7c03502b77c	1	Other	Other
+90a00941-59e7-46aa-829c-64674a01b91e	1	Other	Other
+90a04540-b52c-42ea-812b-2876b52aa6cb	1	Other	Other
+90a05204-7e46-4845-af6f-f398b0abf732	1	Other	Other
+90a0914e-eee2-4cc4-a10f-49e61c0c17cd	1	Other	Other
+90a0de5b-cfbb-420d-a363-4f74e3ee4416	1	Other	Other
+90a0dfe8-564a-484f-9231-ddc60d3ec77d	1	Other	Other
+90a0f212-bda9-40a2-b57d-cf38f6230ed5	1	Other	Other
+90a0f8aa-a0c8-4ca7-af45-b06e5bc75ba7	1	Other	Other
+90a13c52-b6bc-410f-afd3-87a378c623e9	1	Other	Other
+90a14148-1c89-4f9a-9ad3-95615bafba49	1	\N	Other
+90a1bdb7-158f-481b-885b-6a1ee49d0cc6	1	Other	Other
+90a240b2-9664-427e-87cd-abf7a8d67cab	1	Other	Other
+90a2694b-10ea-4460-bdec-e59538b77b23	1	Other	Other
+90a27192-141b-4aec-ad71-17575ea1ed7c	1	Other	Other
+90a27682-62af-4c3e-ad5d-5df36d12c16e	1	Other	Other
+90a29638-5941-4610-b3fd-fb151dca868f	1	Other	Other
+90a2d6b5-ca09-43e6-a9e4-7d25b8c0f739	1	Other	Other
+90a2dc1f-66ea-4690-b5b2-7790b343a0be	1	\N	Other
+90a2f0d0-98cb-4810-92c3-72b5126e85c2	1	Other	Other
+90a330be-ce4d-4231-bfd2-bacd7290a767	1	Other	Other
+90a35041-5466-41af-b7d5-c3a93f62abd4	1	Other	Other
+90a355a6-9ad2-410b-9b1a-57a447afc827	1	Other	Other
+90a36075-8196-4405-8bc7-a7c0b7662943	1	Other	Other
+90a368a6-210d-44e6-bd16-9f91dd0d77de	1	Other	Other
+90a3995f-d0d8-44f1-a504-a6671282cb33	1	Other	Other
+90a3a050-251f-494a-acf4-d9387049a325	1	Other	Other
+90a3aeb1-1eef-4192-bf95-f64764ae53f9	1	\N	Other
+90a40bc4-1de3-48d7-a940-96548d837397	1	Other	Other
+90a40e5d-6652-467f-bfe1-dea258060219	1	Other	Other
+90a41b01-7dd8-4738-955a-87443b667433	1	Other	Other
+90a43ff6-32e1-4c18-b201-5bdf0811650d	1	Other	Other
+90a452b2-9845-4407-afc2-22688619494e	1	Other	Other
+90a46db8-2e9b-475a-9b48-91a2683798c5	1	Other	Other
+90a474cc-a6c1-415b-80ae-d816f833cf70	1	Other	Other
+90a48379-3039-47dc-95ed-e31d69e7835a	1	Other	Other
+90a494fe-1906-4bfb-91b8-86dc75ff6cbb	1	\N	Other
+90a4a61a-783a-4f80-a082-9de8262250e5	1	Other	Other
+90a4d1fc-092f-4bd5-879b-c0b65116100e	1	\N	Other
+90a4d265-91b4-4acd-ad7e-51021ba3451d	1	Other	Other
+90a4d73e-9470-4d38-b18f-720bcb034ff7	1	Other	Other
+90a4ff71-35d3-4039-96b7-ea08ce7eefef	1	Other	Other
+90a5118b-1e24-4b5a-b387-6d17b6d265bb	1	Other	Other
+90a53782-96be-4f81-b0d7-bfafad5508bb	1	Other	Other
+90a5480f-1cec-43b4-805a-e74957b9fe63	1	Other	Other
+90a58db8-96f3-4dda-96e0-6b9faa94db0e	1	Other	Other
+90a6052d-5436-4d00-b697-7a4cc292f4fa	1	Other	Other
+90a6328e-6ef4-4ed3-9d11-c65096ac6cac	1	Other	Other
+90a64d20-4787-4cc7-a34c-3c0e7aaf3f55	1	Other	Other
+90a665ae-047c-496e-99b4-27c536d2db81	1	Other	Other
+90a68613-2a8f-4637-b904-75640260aa2a	1	Other	Other
+90a6b49f-12b1-491f-a583-793b724bcf44	1	\N	Other
+90a6cf3b-f62d-45ca-9f98-31727c85ed7b	1	Other	Other
+90a6d7f0-5bae-44fd-8679-76b023abdd11	1	Other	Other
+90a7031b-0180-415c-81f4-b66374ba7111	1	Other	Other
+90a71f5f-5cad-4a09-9e08-81242739680a	1	Other	Other
+90a7e476-5569-4865-9648-984d18256379	1	Other	Other
+90a816e9-d41f-494f-81ea-e058d31fed22	1	Other	Other
+90a84b33-000e-4c3d-a178-d344b62ff6a6	1	Other	Other
+90a884b1-7dc1-408f-aefd-02e0d7a8310c	1	Other	Other
+90a8991e-00cb-487c-b647-75a482a37f29	1	Other	Other
+90a8c8a4-90b0-45db-97e6-1d515e613b8a	1	Other	Other
+90a8e827-8ce7-4fea-9239-49be24c86d39	1	\N	Other
+90a9238d-29d1-4b96-b0cb-d0eca251ead8	1	James	Other
+90a95a32-500c-46fa-9d33-1b6f3e3da8c5	1	Other	Other
+90a99bf8-fb9c-467a-89c5-bf2a3489c5bd	1	Other	Other
+90a9d326-447a-11e8-94e8-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+90aa3edc-4143-40e5-9538-e0a66f52c4bd	1	Other	Other
+90aa7123-1f36-4a94-b201-bec21064ce89	1	Other	Other
+90aa986b-caba-470e-9f0a-241951d586cd	1	Other	Other
+90aaec0a-4349-4f6c-8b76-2a1db43c3751	1	Other	Other
+90ab3ca5-4bde-4b86-8b9f-78ddc619ebc5	1	Other	Other
+90ab7789-8c9f-4c7f-907f-17cb432720ce	1	Other	Other
+90ab9ea0-b029-4083-840f-a89ddc882133	1	Other	Other
+90aba4f5-5aae-438f-85dc-120076acbf52	1	Other	Other
+90abc7b6-53f7-461c-b496-e53e917e6ae1	1	Other	Other
+90abcccc-4b11-4667-86ab-64df066f7018	1	Other	Other
+90abe5a1-7f1c-46c8-a9ec-a94fb43db53a	1	Other	Other
+90ac00e0-755d-45c9-b570-9257bbb13d50	1	Other	Other
+90ac231b-0fd2-4ad3-a16a-5da98ace1095	1	Other	Other
+90ac7090-b3a5-42bb-875a-acf3704c6822	1	Other	Other
+90acba43-048a-4682-b84e-45e02a912ec3	1	Other	Other
+90aceeec-e066-4b3d-9df9-0f40d94c7afd	1	Other	Other
+90acfebe-7b6c-4db6-84cc-dad3458e6c9b	1	\N	Other
+90ad0501-8b0e-4ddc-af16-24a75ad5336c	1	Other	Other
+90ad3558-3366-493e-ae10-6fb41383f494	1	Other	Other
+90ad8168-5017-4958-8048-7eece5d284bc	1	Other	Other
+90adab3c-efd4-460d-9ca2-69234d14d6d0	1	Other	Other
+90ae7318-b1e7-47ec-a7dc-b7801f9be0bb	1	Other	Other
+90af2355-d5a9-4bda-a31d-360bac579c33	1	Other	Other
+90af5cf8-0445-4b30-b13f-0036ba748e40	1	\N	Other
+90af9517-622f-435a-a5d4-85d543362817	1	Other	Other
+90afa5f1-8d54-4e1a-a201-8e80f726a0c1	1	Other	Other
+90afe575-a5a8-48ce-9540-e51c0ce07d30	1	Other	Other
+90b039ad-3448-4bf0-a6a6-62e12c4e3672	1	Other	Other
+90b05224-3ebd-41e8-b9d0-539aa86e1ea7	1	Other	Other
+90b0a201-249a-43ce-9e79-1e279d4dba13	1	Other	Other
+90b0b0cd-9d1c-4c2f-a830-91a74495eebe	1	Other	Other
+90b0cc12-629f-4b58-a779-372229124ff6	1	\N	Other
+90b119a5-dc99-4c17-8154-059061b976eb	1	Other	Other
+90b12b15-925d-439d-9a9b-b37922f78f71	1	Other	Other
+90b144df-0f54-4454-8c3b-993f88e89241	1	Other	Other
+90b188ea-4f73-4a31-ba11-fd9433ff31b1	1	Other	Other
+90b1b655-f799-43ae-a043-e3c37f288968	1	Other	Other
+90b1f792-e03b-48a6-a7e7-a50a75d31513	1	Other	Other
+90b2a9c1-72ea-4b93-b67d-df8401b51f66	1	Other	Other
+90b2b75a-20f3-4ad6-b691-879d48661bd2	1	Other	Other
+90b2cc08-7e51-4130-a657-aee095542765	1	Other	Other
+90b2d125-4371-426d-b4f4-94d3ccd096a2	1	Other	Other
+90b31a85-bf91-4f6d-a44f-1f07391ea068	1	Other	Other
+90b32059-a476-49a3-bcaa-79125dedcacf	1	\N	Other
+90b33442-a659-48ac-85f5-d37ef80c3ce3	1	Other	Other
+90b38b40-8678-47bf-abb1-1567df81634b	1	Other	Other
+90b3b4ae-901b-48a9-9ff4-52ddf2ad5622	1	Other	Other
+90b40bc1-f030-48f4-8ebe-b298414bc67d	1	\N	Other
+90b40c47-c753-4225-960e-108a0741a7a7	1	Other	Other
+90b41e8b-c929-45a5-b44e-9ef8e16c18d8	1	Other	Other
+90b42450-0568-4e56-9611-d6097d22b2af	1	Other	Other
+90b46f9e-0252-486b-beda-866e70066ad1	1	Other	Other
+90b49fa3-321a-473e-9839-a876b5d24341	1	Other	Other
+90b4ab1e-4e7d-4ed7-896c-84b482d0baa0	1	Other	Other
+90b4d4f8-3d07-419f-81e3-a18951f3986d	1	James	Other
+90b5a61a-4da4-495f-9e01-36be25942911	1	Other	Other
+90b5c0dc-6c3b-47f7-b6f9-38740c2a387f	1	Other	Other
+90b600df-10f9-412f-960f-20501f8f5b2e	1	Other	Other
+90b60e8b-0e65-40ef-956e-68f9382fb759	1	Other	Other
+90b68117-ff75-4e5b-8cec-e899f7eacd9f	1	Other	Other
+90b6c3d5-92f1-48e4-821f-50a3f74c02e8	1	Other	Other
+90b73fa6-92d9-4c8e-b339-7d873f871006	1	Other	Other
+90b74cfb-b9a6-4d33-937f-aa4772f52a8b	1	Other	Other
+90b79016-27ea-46f0-9261-16481f36c814	1	Other	Other
+90b7c410-0cb4-4964-ad2f-2fc57bf0cfcc	1	Other	Other
+90b7ca85-e767-4fa8-8aae-69c584867443	1	James	Other
+90b7e98d-beac-4371-bab4-9ecf37754ac1	1	Other	Other
+90b82aa2-061a-47e7-8407-a8ba7b7c1723	1	Other	Other
+90b85ab2-dc34-40f1-afaa-b26338959fe0	1	Other	Other
+90b865da-9a87-477b-bd4c-ca05ad94e689	1	Other	Other
+90b87048-2707-4429-8f80-a6dedc6d146a	1	Other	Other
+90b890a4-fcfa-11e7-b02d-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+90b89698-3355-4de7-8000-3dc96c941bba	1	Other	Other
+90b90337-bf92-4512-b7d0-ccbfb85f3f64	1	Other	Other
+90b92f51-2b91-4690-81db-5b263a3f5c9c	1	Other	Other
+90b99f98-ca5b-4661-a603-8411a9df6947	1	Other	Other
+90b9c4e0-ed27-44ec-8f43-05744a7739f4	1	Other	Other
+90b9d35e-a57e-4952-bfca-8fe6ff8fdd12	1	\N	Other
+90b9fc4c-e7a6-44b6-9bbf-400cf4f642bf	1	Other	Other
+90ba2208-c9a9-491c-aab8-82e99bbb1691	1	Other	Other
+90ba4169-2752-4620-b33e-dd457dd8ca0b	1	Other	Other
+90baa99b-a18c-4065-a46c-57e2d6047456	1	Other	Other
+90bacee6-3012-49f5-9d8c-7f1bf0a5d8f1	1	Other	Other
+90bad4dd-d67b-4728-b6c1-5086988d1502	1	Other	Other
+90bb5dd2-dec6-478a-bb02-bd97b81d2340	1	Other	Other
+90bb6830-fb00-43ec-ba86-8e34babd0b17	1	Other	Other
+90bb8537-6250-4c32-b76a-c5d3d00a54d7	1	Other	Other
+90bbda37-6f2a-4b24-95b1-df0bf5c431d1	1	Other	Other
+90bbf47e-8b5c-48e1-80f3-55282be88c91	1	Other	Other
+90bbfc82-9cd9-48cc-a3c4-da2b0329377c	1	Other	Other
+90bc253c-2eea-4eb7-a35c-bef2d14c96a3	1	Other	Other
+90bc3301-f0b3-42db-99c2-3278aa675ca3	1	Other	Other
+90bc3701-4752-43a4-b64e-233e9d32d3fc	1	Other	Other
+90bc7ce5-620b-48a2-b064-386511428861	1	Other	Other
+90bc7d6c-f34e-4335-9dda-45b71f661a9c	1	Other	Other
+90bc7e08-e7ed-47f1-9b57-2926aa919eae	1	\N	Other
+90bcf261-f857-4a76-bd06-41721b1fdff4	1	Other	Other
+90bcf644-390a-46ea-a295-a1626a1943d4	1	Other	Other
+90bd8b56-dacb-4922-b1fc-e9cd4929d124	1	Other	Other
+90bda71e-b99d-4d73-9c89-79bafa77d340	1	\N	Other
+90bdd212-d85d-43eb-b8ba-dc8872486ae1	1	Other	Other
+90be0598-303c-47cd-8fee-249bb1f95c06	1	Other	Other
+90be0892-9d85-49de-aa34-2a0d00167c70	1	Other	Other
+90be1f0a-fd79-4c4c-8dcb-f1bc153bb019	1	Other	Other
+90be2e7c-91ae-4557-9ae8-b856bf74f97e	1	Other	Other
+90be32fd-29b7-4a00-8f39-cb1d4d89853f	1	James	Other
+90be556f-57ba-4286-b2a8-06bbade4ee9c	1	Other	Other
+90be6654-ebe7-4b88-a96c-16df7bfa7efa	1	Other	Other
+90bebea7-9b1f-4aa4-9350-694004b73ec8	1	Other	Other
+90befb6d-0db6-4ac8-b990-ae729d7b3003	1	Other	Other
+90bf152d-36db-4a0d-a353-054e86786f56	1	Other	Other
+90bf3de6-c4fe-4559-99db-c881a68a2d07	1	Other	Other
+90bf4c26-ba1b-4452-8c8e-8edf9b7d1cf9	1	\N	Other
+90bfda84-14ed-41b5-9d41-a172b90d9e75	1	Other	Other
+90c005bc-3269-4908-a630-3060582fe083	1	Other	Other
+90c026b2-e4b9-4eef-94e5-1dcc91dbcebb	1	Other	Other
+90c046be-34e9-4e35-8df4-7b23872d3c72	1	Other	Other
+90c06b88-4c0c-4c27-8cf2-47f472da64a8	1	Other	Other
+90c0a834-50a0-4e3a-9491-952b6044eafc	1	Other	Other
+90c0b364-513d-418c-b9e8-4bec8e8cdcfe	1	James	Other
+90c0b5e2-aecc-45d5-99d0-0321a9d3c92d	1	Other	Other
+90c0c21e-0d02-4542-bd76-7e84dfb1b1a1	1	Other	Other
+90c0e6b0-1178-42ad-beed-6e1f22fa7175	1	Other	Other
+90c1b544-e009-4f4e-805e-3a5f0b7d7564	1	Other	Other
+90c1bd54-0e2b-42c5-90d6-aae9fa2a433a	1	\N	Other
+90c1d467-59a6-44cc-aa42-8c7ca19e52ad	1	Other	Other
+90c20923-5766-4f7c-ba7a-039856e9c0d8	1	Other	Other
+90c27564-3992-4eae-84dd-8a4ad792aa7b	1	Other	Other
+90c281bd-e4da-4edb-9e7d-fa15b3a9699b	1	Other	Other
+90c28cc8-3228-4eb6-b547-490b6e3f5fdc	1	Other	Other
+90c2b9e6-4dd9-4024-8474-e1f68ed64e04	1	Other	Other
+90c2fa86-5cf0-4928-b523-3ee85a572da1	1	Other	Other
+90c32f36-8c0c-4164-b28e-ac50e2263c87	1	\N	Other
+90c35153-0a1d-4934-bbf2-1f889b9e98e6	1	Other	Other
+90c3556b-9b08-44b6-93a6-d48ac6c98e47	1	Other	Other
+90c390c4-ed07-4cd3-8d52-53423f5cc6fb	1	Other	Other
+90c40160-8221-444b-b917-7830b9d9219f	1	Other	Other
+90c454d7-d1cd-4873-a64a-ddd30cb592eb	1	Other	Other
+90c456ec-61eb-40db-aeb5-43fc567f1c65	1	Other	Other
+90c494a6-178d-4627-b3d8-23ffbdc7d234	1	Other	Other
+90c4a482-b669-4ebc-b982-4cff2042eb45	1	Other	Other
+90c4d6d4-96a8-43f6-bdec-3a1059290f2c	1	Other	Other
+90c4e319-e00d-4267-98e6-31599fa08bc0	1	Other	Other
+90c52595-f5e3-43a4-b45a-b56d7d231de2	1	Other	Other
+90c536a8-fed8-4a37-8cb4-8445d4155d96	1	Other	Other
+90c54aac-2118-4970-a17d-02928a7b1729	1	Other	Other
+90c5b327-89b0-43d4-b2a7-6999267a2a12	1	Other	Other
+90c5c7a1-7160-4ccf-8c79-e7acabca70ce	1	Other	Other
+90c5d7ef-3d7c-46ee-b602-7579c1eb6ab7	1	Other	Other
+90c66b13-c0e6-4586-843a-e36a0a2c9eb8	1	Other	Other
+90c6a9c6-a8e9-484e-93b4-c663898a1d41	1	Other	Other
+90c6c297-ccd8-4f36-9212-1d4f13f1ae96	1	Other	Other
+90c6f520-17c4-4dd1-b96c-81d9e86f5a74	1	\N	Other
+90c713e3-1c9b-4b94-8312-cff5e36a2e17	1	Other	Other
+90c71b0d-8761-4a1b-a6ea-2a41ac3e0a64	1	Other	Other
+90c774d4-6b39-49f3-8e93-f6d16422a7e8	1	Other	Other
+90c77958-d4c5-4d97-8c19-27a8d526dd16	1	Other	Other
+90c7ac74-aa57-435e-9309-3d3714620d2f	1	Other	Other
+90c84bab-bd83-4d44-b39d-8e54fd266581	1	Other	Other
+90c85af9-47f8-4bdf-aabe-9f4572620cf1	1	Other	Other
+90c87102-026f-485b-a924-b5dac9b57ca9	1	\N	Other
+90c87260-977c-4e90-b27b-b88cb8e65f60	1	Other	Other
+90c88c5c-54db-43b8-a92e-ce6b30624d70	1	Other	Other
+90c8c7d4-5020-4368-9c7e-5efd16a3db06	1	Other	Other
+90c934cc-0ef3-4af2-85fb-59a5dc0d43c8	1	Other	Other
+90c94a55-c29d-4d81-84c5-db353ed8cbef	1	Other	Other
+90c9687c-8494-415d-be85-e441a557ba6e	1	Other	Other
+90c9c434-58c9-44bb-be8c-a61e963592b3	1	Other	Other
+90c9c647-3674-484c-ba3a-360c80909842	1	Other	Other
+90ca2ea5-eb67-475d-aacd-18f393743e90	1	Other	Other
+90ca62b2-2a35-4c82-922f-701dd53c0d3d	1	Other	Other
+90ca962c-16e2-4468-82e0-d8c44a106ee0	1	Other	Other
+90cac547-e3ba-4a6f-9fec-df3f2a896f3e	1	Other	Other
+90cb4d37-8baf-45ff-ba09-31359e9d9b78	1	Other	Other
+90cb5c73-a0a4-4cc2-b14e-f35c70620266	1	Other	Other
+90cc24de-f916-4590-bdd4-3a6469738815	1	Other	Other
+90ccb913-d6d2-4e03-8de0-b8127c04fa89	1	Other	Other
+90cce103-433a-49e6-b313-d7d1864b034f	1	Other	Other
+90cd5435-a318-4e87-9beb-de1d2657aa5f	1	Other	Other
+90cdb3a5-419b-4277-a7fa-12019ea88de2	1	Other	Other
+90ce0256-2b5b-4d07-8d28-cb537a5fd66b	1	Other	Other
+90ce241a-8ac0-439f-b2eb-d1b61d8640ab	1	Other	Other
+90ce5ec4-af93-4b5d-a52b-122a6a41befb	1	Other	Other
+90ce615b-c70f-4453-a204-bd0d597e26e1	1	Other	Other
+90ce6b4b-617b-4763-81f4-c9285a6725f5	1	Other	Other
+90ce86b2-ba9c-4ab8-bb09-0886710568a2	1	Other	Other
+90ce8757-1221-4ca3-b1d3-16ab9232fcc3	1	Other	Other
+90cec3d7-1cee-46d0-859d-fc40cc9ffa69	1	Other	Other
+90cf4a05-0dfb-4e7b-8f9a-4db95ab57138	1	Other	Other
+90cf4cea-5615-4e39-870c-4f2b65c6b84d	1	Other	Other
+90cf54c2-9b45-4da9-9404-7445d64f0f1d	1	Other	Other
+90cf6f7b-4fae-4648-a281-55ca5f71c4c9	1	Other	Other
+90cf7da5-3959-4cd2-89e0-861faa10ac3d	1	Other	Other
+90cf928b-a718-42dd-b824-035cc789ca0b	1	Other	Other
+90d14682-adfb-4c51-8ac7-42ae1eea0e9a	1	Other	Other
+90d17b62-8cfe-4355-b24f-6710c3d6dd53	1	Other	Other
+90d1a0c9-a57a-4bb7-8148-15384f9fa764	1	Other	Other
+90d2732e-87cc-4e9d-be8b-2e156b703cf1	1	Other	Other
+90d28315-b806-4e23-9acb-80bb451f4037	1	Other	Other
+90d29da9-39f2-490e-9a82-188415b32de0	1	Other	Other
+90d2cc21-4eef-468b-9299-223dd9d01738	1	Other	Other
+90d38431-00f8-40dc-91d0-541a4c443010	1	Other	Other
+90d41149-94bc-4e30-8689-da3fec9d7452	1	Other	Other
+90d4a59d-f440-4066-8d11-b5c9f4c7bf0e	1	Other	Other
+90d4df06-6a27-48bb-bbd8-be51721ba631	1	Other	Other
+90d517df-c58d-441c-9deb-0c8885059836	1	Other	Other
+90d5539e-b99d-45e6-91ad-70694140c0d2	1	Other	Other
+90d57807-c724-4db4-94d7-a040a9e01466	1	Other	Other
+90d58368-07a8-443f-809a-a5d687d08c5a	1	Other	Other
+90d5a9bf-472c-4cf9-819b-bc6773e33c9a	1	Other	Other
+90d5d3b9-0dcd-447a-a3c1-ec0c3584c7fd	1	Other	Other
+90d640e5-6297-4d3f-bf43-f7350097e53a	1	Other	Other
+90d64481-887a-4716-87af-c09be440d8c4	1	Other	Other
+90d64627-dde0-46d6-b551-87f21f45c350	1	Other	Other
+90d64ce5-4f74-4678-97c5-5bf0d77fbb75	1	\N	Other
+90d66c70-0b69-449b-b27a-c0216a4b4d7d	1	Other	Other
+90d69df7-498b-4ca2-9abb-955da8557ba5	1	Other	Other
+90d6b293-1ee2-4d4b-b978-39ea54fb1c89	1	Other	Other
+90d72180-d1ca-474b-9734-6f566e489eb5	1	Other	Other
+90d769c1-a354-4070-9a69-8ffaf04741c3	1	Other	Other
+90d7c843-7c84-45bf-b7f3-2f00decb6973	1	Other	Other
+90d86261-a0db-4824-9211-2f0c4b43a36c	1	Other	Other
+90d8679a-c353-4eba-a98d-cb9c9a0adad6	1	Other	Other
+90d86ee7-8e40-4c55-9a32-e2b140811bbe	1	Other	Other
+90d87056-83d4-451d-8c19-72dd9bec9084	1	Other	Other
+90d891eb-c301-4526-8f2b-f57c6eba1c8b	1	Other	Other
+90d8991d-0815-43f5-a7a4-3041adbb82ff	1	Other	Other
+90d8b1b8-8649-4014-ba52-d8cf04072963	1	Other	Other
+90d8c925-ab72-484d-b046-c68c42c15696	1	Other	Other
+90d8cdd1-50c4-4a23-bb73-b1d0c86db44c	1	Other	Other
+90d8d441-5a32-4140-ac25-ec1aeb01ded4	1	Other	Other
+90d8e957-919f-4e49-acde-e62a82f546d1	1	Other	Other
+90d91f2c-5880-4915-bf7c-6ec58c12a5e1	1	Other	Other
+90d97e95-ec2e-4b02-9079-7a183014d3e4	1	Other	Other
+90d989f5-92f2-47af-9f18-014b1b9dd4b9	1	Other	Other
+90d98b41-3ad8-48f5-883e-83d3fa10fe75	1	Other	Other
+90d9a201-715a-4346-a1e8-2e1f012e9968	1	Other	Other
+90d9a6ac-a4b9-41f8-9964-a1180f6f6d22	1	Other	Other
+90da051e-c41d-4531-8bec-6c990a0e77d3	1	Other	Other
+90da2758-2bae-4e21-802b-f5b950d9b161	1	Other	Other
+90da3480-e4f6-469b-a54e-f83c38284943	1	Other	Other
+90da572c-9228-4e21-a0bb-ed8cce927054	1	Other	Other
+90dac76c-58a5-44db-9d71-0514840dce96	1	Other	Other
+90dad176-eaad-4d96-89b3-9972094232b7	1	Other	Other
+90dad2dc-f359-498d-a7a3-5973bb4d57cd	1	Other	Other
+90db19ab-2b1e-4143-9831-3c17fee287e5	1	Other	Other
+90dbb75e-6720-418e-99a2-b88ae9e08df1	1	Other	Other
+90dbc12c-64a2-4486-b05a-f213c7621df7	1	Other	Other
+90dbdbae-ac53-4a67-8a76-8f7ef8916270	1	Other	Other
+90dc0ff2-7784-446a-97ad-ff7b5fbdbcde	1	Other	Other
+90dc219b-80d6-4cdc-b893-8781c968cd9c	1	Other	Other
+90dc5916-cd49-4805-9974-d78b7b77a637	1	Other	Other
+90dc89b3-17a6-4715-8c2b-a203b27886da	1	Other	Other
+90dcbe50-3c03-4fc4-a427-d0666cc320d1	1	Other	Other
+90dcda54-7ea7-4d20-8d97-683828595c6a	1	Other	Other
+90dcddd9-da6b-4b22-9452-78dc8f0e355d	1	Other	Other
+90dce7a4-baa9-4e5d-b3cf-1f7a90bcf35d	1	Other	Other
+90dcf7ea-bd43-4c3b-9f48-9eaac956cdf6	1	Other	Other
+90dd1d5a-c057-4416-bf4f-3672f108fe40	1	Other	Other
+90dd484b-d58f-4ba5-8a9f-535b5690d003	1	Other	Other
+90dd51a2-2a28-4ca3-bb89-131e0475c55f	1	Other	Other
+90dd636d-10d3-452e-a5c2-f930f7ffa8b1	1	Other	Other
+90dd668a-a918-487e-ae4a-04719aa57399	1	Other	Other
+90dd79d6-156f-11e8-a2a1-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+90ddaf1d-a19d-4cd7-8d42-06d21c81b465	1	Other	Other
+90dde095-7945-4896-b144-ac597029da0c	1	Other	Other
+90ddef6d-bf12-468e-b879-0d0c4121f0a8	1	Other	Other
+90de08a0-6677-4fed-b5a0-4d9f6b4d8824	1	Other	Other
+90de5c10-634d-4cbd-af39-20b4afc71fea	1	Other	Other
+90dea68a-840a-4f25-aba0-15b6b494106b	1	Other	Other
+90df288f-48cd-43d3-866c-77a708a5549b	1	\N	Other
+90df5b87-6835-4b8d-b8ea-5d147154e5aa	1	Other	Other
+90df68f7-eaf4-4391-b291-38eaa02b3030	1	Other	Other
+90df9393-8c08-4a34-8754-9ef02eb4bf71	1	Other	Other
+90dfa9a9-bc01-4662-b8ed-ab4d765c63e2	1	Other	Other
+90e022ef-103b-4c29-8197-479c8f3b5c95	1	Other	Other
+90e033d3-581e-49e7-91ef-310a1ffc09b0	1	Other	Other
+90e039cd-8e7e-4dbb-8a54-d24abb87752b	1	Other	Other
+90e04e06-014e-472e-ab14-c89ade7dfc5e	1	Other	Other
+90e08e49-8614-481a-aaf8-b5c1e2cd13d2	1	Other	Other
+90e10378-fcf8-4535-ab3d-993c3402c1ef	1	Other	Other
+90e13c70-10a7-4b3d-8c5b-9a32b0fe6581	1	Other	Other
+90e17a5c-bd96-4ffb-b6f8-eed2605ea6bf	1	Other	Other
+90e1c0a1-6bcd-43cf-a571-b6bc54bfd2a2	1	Other	Other
+90e218f3-4f9e-48c8-98d0-fa810ddd4cd6	1	Other	Other
+90e24b23-6ecf-44bc-9bf2-746329dff17f	1	Other	Other
+90e25b64-5072-4445-a4dc-9e692324f330	1	Other	Other
+90e2855c-05bb-442a-89e8-bbf02d8e473e	1	Other	Other
+90e295e0-8bc4-4bd5-9ffa-dc33784924b8	1	Other	Other
+90e2a1b3-7dfb-4f6c-956d-35b048960a08	1	Other	Other
+90e2df17-3710-4310-8448-ac20d0dfb8ad	1	Other	Other
+90e30202-9572-4aad-bac1-d78ec27a4dfe	1	Other	Other
+90e31171-4afb-4f36-8150-84d65bb7dd35	1	Other	Other
+90e318b0-f03f-4a7b-bec6-ead48890a062	1	Other	Other
+90e33549-5c35-49cd-bee9-6ead124c081a	1	Other	Other
+90e384d9-010f-4728-abff-bf88a5cedfb5	1	Other	Other
+90e38a8c-55b7-4209-8bba-86766f242f1c	1	Other	Other
+90e3cda7-7d69-4067-8bb5-e38761c41f5a	1	Other	Other
+90e41c1a-a375-4ae9-8654-69399446e565	1	Other	Other
+90e46b52-caf2-4386-8b04-f78d9ab30ea9	1	Other	Other
+90e4c610-29eb-423d-9e6a-3dabbbdb9b69	1	Other	Other
+90e4f2ab-3e90-46aa-9d99-e67f523f51fc	1	Other	Other
+90e50977-3009-472d-8a57-72124cea21e4	1	Other	Other
+90e51b5a-9fb4-4e9a-bc00-6e0eba8c9f23	1	Other	Other
+90e54714-ba79-44ea-aafe-69176d1f72a1	1	Other	Other
+90e5645d-df03-40c6-88f0-22d7e58ed260	1	Other	Other
+90e56d82-5e01-4ff2-b111-b1ce14f3674d	1	Other	Other
+90e5a7ab-930c-49ef-b393-568d6d9c9452	1	Other	Other
+90e5e31a-ca79-4128-80eb-8c0914420641	1	Other	Other
+90e5f021-3e96-4467-8e37-0275f07811ce	1	Other	Other
+90e634cb-ed9d-4bc4-b3e9-eb07030b55da	1	Other	Other
+90e6487f-02f4-4113-b81e-1039f7511dd9	1	Other	Other
+90e698c0-c90a-4991-b57a-817d43034559	1	Other	Other
+90e6abcc-6138-402d-81b9-8ddd9b25b73a	1	Other	Other
+90e6e117-c3bd-45a8-9614-448fba3b3088	1	Other	Other
+90e6ed09-126d-406e-84e9-d8a27a47d096	1	Other	Other
+90e70f99-ed9c-4461-8111-189cdeb9f831	1	Other	Other
+90e77252-6a86-45d2-9c48-12eea4a00775	1	Other	Other
+90e78146-8166-42c8-bbcb-064ff799abc0	1	Other	Other
+90e786f9-e4bb-425e-94a0-7eec1ca937fe	1	\N	Other
+90e7d12d-c51c-41e5-8ca3-d77d55aeed2e	1	\N	Other
+90e7f0bb-b08b-4918-aa74-a7ecacf004eb	1	Other	Other
+90e7f3ae-fe14-4b0d-b0d0-ed0946b1ffe1	1	Other	Other
+90e7f937-93fe-47ab-a5a8-3e0f08519bd1	1	Other	Other
+90e82ba9-9017-460f-b8be-b865e756f660	1	Other	Other
+90e82dfe-34ca-4fbd-a893-92af7852693f	1	Other	Other
+90e8b372-8bde-4880-be1c-281f8c092d1a	1	Other	Other
+90e8e213-4163-42dc-9a8b-92808c8bae05	1	Other	Other
+90e8e9b7-9045-47a8-b613-6af6bd093bf5	1	Other	Other
+90e8ecc1-bbe2-461a-970d-a544b2db81eb	1	Other	Other
+90e96611-8446-4d5b-9f77-a20b4080d748	1	Other	Other
+90e9ce43-808c-4d46-8161-eed2603c8efd	1	Other	Other
+90e9dc7b-ef55-4467-b51b-1e246bb5663e	1	Other	Other
+90e9e5f2-3c15-4ebc-b0dd-f7c75bd7b985	1	Other	Other
+90ea1a67-60b8-4803-970d-c0d2a3d3680f	1	Other	Other
+90ea23df-1db3-490a-b3c5-55038c935045	1	Other	Other
+90ea5c03-9539-4f2c-8b82-9fc3876fb4d2	1	Other	Other
+90ea6133-4f79-4a7b-ba21-cb885efbd938	1	Other	Other
+90ea631b-35cb-4b9c-b8c2-077d26dadfb0	1	Other	Other
+90ea7e5b-b102-4ecf-bcd8-c210be12237e	1	\N	Other
+90ea9151-f327-488a-a6bd-ad9b179a7b8a	1	Other	Other
+90eaa7f1-06e6-4065-93a6-4ca9dc2a3a3e	1	Other	Other
+90eaaced-2bfe-496b-84af-c81d8a8cf57e	1	Other	Other
+90eaae47-e62b-4dc7-9dda-2416beca91ff	1	Other	Other
+90eab599-da73-4397-a817-b95903f18f2a	1	Other	Other
+90eababf-0002-403e-a0e9-cb8b15f173a5	1	Other	Other
+90eade57-995b-41e3-a9f0-4ab7138c3064	1	James	Other
+90eb02e6-e296-4515-a707-9f26236fdb5e	1	Other	Other
+90eb2630-8f89-4f44-8ead-711cb1cbed89	1	Other	Other
+90eb466c-bc22-48a9-9172-a7208e681e3a	1	Other	Other
+90eb71e6-104d-4113-b828-4cd62687bdf0	1	Other	Other
+90eba129-aa7f-445b-8646-49ebcae115ef	1	Other	Other
+90ebe675-e64f-4066-86e0-633930f54cef	1	Other	Other
+90ec1c2f-7f32-4267-bb51-6a3d7e40beea	1	Other	Other
+90ec4054-47ee-4d26-991a-37b6fbbc558b	1	Other	Other
+90ec59d2-5eea-442d-8bd5-f509f7876197	1	Other	Other
+90ecc9bc-463c-49ca-90aa-47b045b37a5d	1	Other	Other
+90eccbce-aacd-4822-adb4-b1ebeea84599	1	Other	Other
+90ecdda0-e1f3-44cf-bb69-2310b4a0f915	1	Other	Other
+90ece356-fa13-4570-9ded-ede5d4260581	1	Other	Other
+90eced15-899e-44e0-9706-136e5a4ddccb	1	Other	Other
+90ed115b-872d-4f39-a9ed-088f81cd3e38	1	Other	Other
+90ed4c8f-ec9d-42e0-bb04-33e96397f6d2	1	Other	Other
+90ed5700-934d-4786-9e8a-1ac69abf2ec5	1	Other	Other
+90ed76e9-6453-4aa0-89e6-4e5adb8b3661	1	Other	Other
+90ed77e5-c3d7-43fe-99c9-ce781c250a1a	1	Other	Other
+90ee2988-ee41-4905-8e41-e9bb3ff35213	1	Other	Other
+90ee854b-a444-44f4-8430-617a757a71c6	1	Other	Other
+90eebe8d-a431-4017-af95-ef1f3afd11cb	1	Other	Other
+90eeed3b-e660-4bdc-9bf7-3b9f2b6394a5	1	Other	Other
+90ef643b-fd0c-4186-a534-0228718b61c3	1	Other	Other
+90ef6cd8-d8ee-40f8-b5ff-0da8be807a93	1	James	Other
+90efab53-28ac-4efa-8691-cc06d1d458f1	1	Other	Other
+90efdd57-e949-4a81-95bf-654ff9861c58	1	\N	Other
+90f02bfc-119a-47a2-98e0-4598027834e0	1	Other	Other
+90f033a9-e8d4-4cf9-9e2c-beac3df8eaaa	1	Other	Other
+90f05896-bf92-4911-856c-bab34525059c	1	Other	Other
+90f07293-1a01-4077-b38f-627b45c9c1c1	1	Other	Other
+90f07eb9-ee4b-4097-9a03-756a6c643cf3	1	Other	Other
+90f084dd-0688-4069-8725-0b311cf520fc	1	Other	Other
+90f0a89f-2bda-454d-ad35-661a0d22ea02	1	Other	Other
+90f0c37b-d28b-41bd-b93c-d79e098ec11e	1	Other	Other
+90f15914-0cd8-4254-9a9e-b6094dd6193b	1	Other	Other
+90f192a7-37cd-4e94-b154-990302a850f2	1	Other	Other
+90f1e525-a026-4a1c-ae94-c8e971758b19	1	Other	Other
+90f1f612-6de7-4080-aae2-251317ce7943	1	Other	Other
+90f20f99-1c45-42be-bbd9-4b92e42e7980	1	Other	Other
+90f27d16-43bb-4eb8-b0f5-87d2351b4e13	1	Other	Other
+90f30bfe-0b66-4673-85b8-a88f83e05672	1	Other	Other
+90f327cc-a059-447f-a872-24ed801084a7	1	Other	Other
+90f35a7e-1ada-11e8-b391-fa163e8624cc	1	Other	Other
+90f36ce8-4fba-4830-8719-fa10771290c7	1	Other	Other
+90f3c4b3-936e-4850-80fa-fae7fbb0e2d2	1	Other	Other
+90f40645-9ce7-4d73-9301-ba8c2d7561b2	1	Other	Other
+90f415a9-5fa0-45af-be31-04627fd75d90	1	Other	Other
+90f42607-0ebb-407b-87e7-301cc61a9238	1	Other	Other
+90f42840-b6e9-440d-8922-8edeea6b9444	1	Other	Other
+90f48034-5ed7-43cd-9e20-76f81a234aab	1	Other	Other
+90f4ec9c-c0c7-4272-8e23-bed7bcce367c	1	Other	Other
+90f4f592-ea22-4341-9224-506d78e0755d	1	Other	Other
+90f51b19-8d08-47a4-9d39-e6cc5b727057	1	Other	Other
+90f5eba7-190a-4b97-8dc7-d830e8bd3519	1	Other	Other
+90f60b60-c06b-4c45-a7a1-087ad405bfc7	1	Other	Other
+90f61d4c-0c4c-43e1-8a89-9fc06337126e	1	Other	Other
+90f6a06b-1bba-4d51-8181-3af0882e63a6	1	Other	Other
+90f7458b-c604-4d6b-9772-9e7e63d6818d	1	Other	Other
+90f76a3e-8865-4cf1-898e-baa9df30b4b1	1	Other	Other
+90f79271-f8ed-4910-b3ce-b7b59888e4db	1	Other	Other
+90f7e868-ab8a-4c7f-af0f-38cef794fc59	1	Other	Other
+90f7f629-f339-49b3-9587-627e644c097d	1	\N	Other
+90f7fd80-6fd0-4e49-8035-b9fc35b4b419	1	Other	Other
+90f81a3d-acf0-4159-9c41-fea1bebbc8ef	1	Other	Other
+90f82b1a-5f1b-402f-9aec-745e9b879059	1	Other	Other
+90f8302d-513d-4f54-8d65-3124adb8643f	1	James	Other
+90f8470e-eed1-428e-a24d-073a03a7f1bb	1	\N	Other
+90f87784-b691-4870-a132-228c0dc16e62	1	Other	Other
+90f8b4b6-abfc-4279-97ae-1aa0b63c0d77	1	Other	Other
+90f8f5c9-ba06-41a2-8212-c0cba9cb5b25	1	Other	Other
+90f8fb40-3ef3-44ac-9270-0ac782a16801	1	Other	Other
+90f9248a-0768-49a8-975e-aaafc13af9db	1	Other	Other
+90f93499-8d32-4917-a137-49602bd7ccfa	1	Other	Other
+90f96ea5-4f5f-4d1f-a22e-0ccc10be16ef	1	Other	Other
+90f9c47a-13e5-4dca-9009-4b7c189e9325	1	Other	Other
+90f9ebbb-dc7e-4bd4-bf3e-8344ca9b9df4	1	Other	Other
+90f9f94a-74ac-43b6-806a-6d8c4f9882bc	1	Other	Other
+90fa16d8-8014-4df5-8479-fe865d44e199	1	Other	Other
+90fa1844-0a84-47e2-9c26-e90509caa949	1	Other	Other
+90fa248c-f27b-449d-b654-02b86a7dba49	1	Other	Other
+90fa2c62-4773-4ec5-92f3-43af274ccee1	1	Other	Other
+90fa7231-d98f-4ac3-966e-075bb1ae1289	1	Other	Other
+90fb06e9-1ad8-41e3-a698-bb23d00c4005	1	Other	Other
+90fb311c-5b57-4052-901c-d60795f6ddbf	1	\N	Other
+90fb5dbf-e39a-4197-b3ff-717a24fab1c3	1	Other	Other
+90fb5f45-f38d-44a5-98fa-0593cc7c4df4	1	Other	Other
+90fb7843-ad54-40f7-8490-8dfd0468d245	1	Other	Other
+90fbfa3a-e10b-4694-aaf3-6475b6195ccd	1	Other	Other
+90fbfd8f-0f2c-49d4-ba77-e8e6170a8f98	1	Other	Other
+90fc9c67-2400-4490-af2d-1fdad147d4ae	1	Other	Other
+90fcadb6-2e6d-4a57-9507-5f6c80598c4d	1	Other	Other
+90fcb0f8-5e06-4e7f-9710-89e7b49af662	1	Other	Other
+90fce30c-8cfb-4f82-a6e5-06e2f3a54588	1	Other	Other
+90fcfa0b-5e9e-4a4e-8e5a-40c5fceff181	1	Other	Other
+90fcff46-43a8-42f0-af15-896d9583b046	1	Other	Other
+90fd1a86-70cd-45dd-8fdf-43f0d3b2e085	1	Other	Other
+90fd21c0-5bf1-44c2-ac6c-3e0a4cf3596b	1	Other	Other
+90fd5db4-7389-45d5-996a-7aa016457280	1	James	Other
+90fdb5c8-794d-4624-abf5-ad8b90a015a9	1	Other	Other
+90fdf32a-39cb-4ea5-a9ef-f96da9d72efc	1	Other	Other
+90fe2d66-8184-4b03-b028-af27ece44eea	1	Other	Other
+90fe5e1e-5ec6-452d-b27f-421a811bbfb2	1	Other	Other
+90ff1466-ed60-4c39-8c68-a030bff78c5a	1	Other	Other
+90ff9a03-4d27-4ccc-a092-f5204010a047	1	Other	Other
+90ffcc37-2eb7-4326-bc4d-d44800525f8e	1	Other	Other
+90ffd695-b008-4e6f-b15f-3f31e0b32f3b	1	Other	Other
+9100011d-08e6-44af-8d77-b5d9bb607525	1	Other	Other
+91000940-60dc-4ea2-a397-9ee58ea9c7a7	1	Other	Other
+91000ae6-5aa8-4cce-b49a-8e5061c750e3	1	\N	Other
+9100848d-60f6-48e0-a109-c174997a39ae	1	Other	Other
+9100d038-b866-41b2-a528-448a4fc5ce43	1	Other	Other
+9100ff5b-a525-4769-8af5-b44470968bc5	1	Other	Other
+91014340-e466-4f15-8466-16da52d574c7	1	Other	Other
+9102340b-4db0-4df2-a4c4-98b4d58503c8	1	Other	Other
+91024541-0a69-4e36-a3c2-9ac15018a4d5	1	Other	Other
+91025d84-2f7a-485d-a6db-3420fa1d69ce	1	Other	Other
+910266b9-029f-442d-aa03-cec88c492899	1	Other	Other
+91027cff-7e63-4350-82f2-587f05a789f2	1	James	Other
+910281a6-7b16-469e-aac5-3c92986b1ea9	1	Other	Other
+9102c02a-396a-4910-a72f-dcea63536964	1	Other	Other
+9102e955-445d-4102-a53b-b82d67571ba9	1	Other	Other
+910325e0-ae7a-4302-a38c-626ebf557b0d	1	Other	Other
+91036b2f-8e2e-4b3b-8561-5bab40b84510	1	\N	Other
+910394ef-c240-488c-a9f3-8cc93913bae3	1	Other	Other
+9103989b-5504-4ffe-ab01-7681128af818	1	Other	Other
+91042111-fcfc-41c9-b5d1-c700e9e30877	1	Other	Other
+91044b23-ffa2-414f-9409-45bc40a4f1c2	1	Other	Other
+910476ff-68b2-4a30-b2e9-634383defa8a	1	Other	Other
+9104c0c0-1a89-459a-a6ac-8e11b17408df	1	Other	Other
+9104ddb1-6214-41aa-8407-556f4993a37a	1	Other	Other
+9105058c-d419-4f8a-80fa-dbd9c532502a	1	Other	Other
+91050cf0-1f1a-4ebe-91ff-fc115897d3ec	1	Other	Other
+91052fe4-9c8c-441d-9c54-5c10c7624d58	1	Other	Other
+91054cf6-0392-446d-8bae-2f02d9f0b0de	1	James	Other
+9105577e-bce8-44f9-8e24-744253f0a7b5	1	Other	Other
+91058e3f-131f-438e-ae6b-e6ee2768404e	1	Other	Other
+9105c514-259a-4b6f-b154-55d32f9b6848	1	Other	Other
+9106832a-37a8-4b38-9d4b-d3529100ecf2	1	Other	Other
+9106cfe3-d520-4dfe-b203-828a78d81a1e	1	Other	Other
+910736c0-95ec-4c32-97c1-239e640fd3ac	1	Other	Other
+91075d56-4c69-4b70-a953-05d1a62d460a	1	Other	Other
+9107754d-6bca-4b87-a4f5-ab101adf5e42	1	Other	Other
+9107896b-05f2-442e-bcdb-9b5fd7e218a1	1	Other	Other
+9107a905-67d3-4579-9f09-2a43be6ed9c9	1	Other	Other
+9107bd41-d02a-4ca6-9865-e467c4206713	1	Other	Other
+91081589-7a13-4073-9f1a-73e42550ca4b	1	Other	Other
+91089409-5f67-45c4-92bb-d164bf24d2c0	1	Other	Other
+9108c867-37bf-49f2-915c-4983e08c9596	1	Other	Other
+9108eacb-3e9d-48aa-a803-dfae02972192	1	Other	Other
+9108f7dc-3e8c-404f-b543-ea846b3e5ffe	1	Other	Other
+9109191b-df5a-4549-b885-708d894f835b	1	Other	Other
+91097bea-0713-4c0d-8770-a876f7189aa8	1	Other	Other
+910a455f-a150-4d39-ba1d-928d63dd9d38	1	Other	Other
+910a7585-6742-4f3e-84c0-bd4c6d3cf1ff	1	Other	Other
+910ac110-2e4c-4e03-8a36-6ee017bc0a60	1	Other	Other
+910acedb-4eb5-4f26-bcb9-298018f3c4de	1	Other	Other
+910afa26-4083-4901-a1d2-2caa463718b4	1	Other	Other
+910afbb8-4cc9-4c23-b020-1447b6525c3e	1	Other	Other
+910b1d0b-ba1c-4ab3-9379-941056a674f7	1	Other	Other
+910b61ca-e1d1-44fe-b0ab-5c6d78276ad1	1	Other	Other
+910ba1ab-fc80-4896-9a88-007f36c15beb	1	Other	Other
+910be7fc-6940-4dcd-9bf1-8831517bda54	1	Other	Other
+910c0d8d-6423-4262-b565-7e1e89cfa93c	1	Other	Other
+910c55ea-c82c-4714-833f-5d25b2368865	1	Other	Other
+910c5e4d-601a-4f74-b811-6fe40b53e985	1	Other	Other
+910c6c37-737e-4443-b63e-9a0d2b9d19f6	1	Other	Other
+910c91af-9bbc-45cb-9204-e30a806cc0b9	1	Other	Other
+910cb0fa-4348-42c5-83fa-8633ed36c901	1	Other	Other
+910cbee6-1b1c-4194-8e5a-ca141f1370c7	1	Other	Other
+910ce6e3-b5d7-4447-a964-27ad2b927378	1	Other	Other
+910cfac4-931d-43df-b442-761f181d9ba6	1	James	Other
+910d1989-2550-4276-9b2e-1994e51e77c3	1	James	Other
+910d2ddd-60e5-4bb6-9e52-b59422c7d2af	1	Other	Other
+910d393f-e4f2-4fc8-99da-5ef0cd1e6c53	1	Other	Other
+910d4e8d-a98b-4557-be94-3c76e5e588b6	1	Other	Other
+910d5538-dde7-440a-a915-a642ed6159ab	1	Other	Other
+910d5d83-c8ea-40cc-939d-76c8d2c89fde	1	Other	Other
+910d9567-6432-4612-8354-420c24cc2cdf	1	Other	Other
+910dc72f-1d48-4b47-9be3-52ab3b6659a5	1	Other	Other
+910dcb97-b8d0-49c1-9154-800c63cbe1e9	1	Other	Other
+910dcbd8-bc10-4c20-8a94-c8dd0dd330a6	1	James	Other
+910ddfa1-b8dc-4c7c-b5ea-5bf2ec5d8026	1	Other	Other
+910df376-f479-4328-99d5-ad55817a2928	1	\N	Other
+910e73c8-212b-45e8-bf69-4624716c0f1c	1	Other	Other
+910e8f32-7798-491f-9413-a773d26387bf	1	Other	Other
+910ecbbb-3fb4-485e-9ac9-94506c6e6ba6	1	Other	Other
+910eec5c-94bb-4de4-9f26-9a13b05b2775	1	Other	Other
+910ef5eb-a3de-4f74-b69c-bc5e9e0f2441	1	Other	Other
+910efadd-1ad3-40be-bad5-fc2968eaeecc	1	Other	Other
+910f2dde-eaf5-49eb-9804-c7767d1684d4	1	Other	Other
+910fa9c3-4ae2-465d-bcae-5ea5beb763ca	1	Other	Other
+910fac3b-5a2a-40ca-b12b-5624595b67c5	1	Other	Other
+910fb543-aad5-4d31-bc0f-84be19117403	1	Other	Other
+910fe5a7-2201-4635-865d-4a595a18336b	1	Other	Other
+91101098-1c5e-4a61-81cc-c25ea7a2137e	1	Other	Other
+911054b2-ccd1-4ad7-b1d2-ce8393956fec	1	Other	Other
+91109134-58d4-4c7c-922e-a6b81df046ce	1	Other	Other
+911097cb-01ea-437a-b6cb-bd82932e192e	1	Other	Other
+9111dc10-4fbe-491f-aa38-bfec1c910325	1	Other	Other
+9111dfda-99ce-46c5-92c4-938373f04fe3	1	Other	Other
+91122c23-d548-48a1-83d8-18427506ae91	1	\N	Other
+91124cdd-4564-4a31-ab51-7ee20cf2ae09	1	Other	Other
+91125aba-2804-42aa-916f-6836e20fd32c	1	Other	Other
+911280a4-c81b-4581-9684-8823526b0874	1	Other	Other
+91128f40-967e-4ee8-b519-29b6692a740f	1	Other	Other
+91129416-03f0-4574-941e-19650e1848f2	1	Other	Other
+9112d962-b5a5-43cc-88a3-a9e65252eb35	1	Other	Other
+911350e7-5b5f-4459-8d6f-2c84ed8fc79b	1	Other	Other
+91135886-a3f6-4371-b1c5-b3a8053fccee	1	Other	Other
+91139128-0dd6-43af-a4b6-8a07a9ce1c43	1	Other	Other
+9113940f-9e73-419b-949d-5dc4977c2218	1	Other	Other
+9113f5a9-3f2c-487b-bcb9-ab90375bea8a	1	Other	Other
+911416c7-4117-4f52-a97c-559040aca86e	1	Other	Other
+9114488a-f45e-4601-93ae-2298f1393526	1	Other	Other
+91144917-47ea-48ca-a1c9-0e0d38fb2dd7	1	Other	Other
+91147b59-185a-48bc-8ba3-44b560fcdee0	1	Other	Other
+91147cae-5ea8-48a0-869e-14cb70beb6de	1	\N	Other
+91149493-5c79-4730-97a1-e7580982accb	1	Other	Other
+9114998a-5fda-402e-a6e8-41614c51b711	1	Other	Other
+9114b930-d41a-47d6-8173-81a3a8c2e8d8	1	Other	Other
+91156c9b-cee0-4a5c-92bd-bbf45c7a319c	1	Other	Other
+91157cca-05b4-422e-a761-8d082fa725ef	1	Other	Other
+91158077-5e07-4d92-87c7-8d68b7c3ff20	1	Other	Other
+91159b95-d9dd-46b8-82a0-ab4a68dead8c	1	\N	Other
+9115c3b0-e42d-4aa3-b2b1-c95163710e7b	1	Other	Other
+9115c7ae-931a-46b7-809e-435f38d15053	1	Other	Other
+911607b5-52c1-49f0-9edc-699aad5b2e86	1	Other	Other
+91160ec1-c25f-4cf6-8f8d-d68e555c96f9	1	Other	Other
+91161d2c-b2c3-49d0-8726-2c4a2edf0e67	1	Other	Other
+91166ccd-d78c-4dd4-bcb5-5670344a1799	1	Other	Other
+91169582-fe1c-4a8c-99e6-20c42a1ae446	1	Other	Other
+9116f11b-3c85-45c4-aae6-8fd45c645b22	1	Other	Other
+9116f330-6d5d-4c5a-b241-d0fc735f44f8	1	Other	Other
+9117556c-1dc0-4e0d-ba8c-4873556ea3be	1	Other	Other
+9117556d-c83c-40a7-aea5-cb0e02b94fb8	1	Other	Other
+91177865-9ac5-4572-88b1-25de1e2f49fa	1	Other	Other
+9117c419-3786-4200-948e-accb67f0cc5c	1	Other	Other
+9117cd6b-7ba0-4eb3-b65b-0a7b87ec11c2	1	Other	Other
+9117f868-2c1b-4a8e-bd68-20678c2d61cd	1	Other	Other
+91184238-7bd9-48ab-a934-a0cbde0242bc	1	Other	Other
+91184313-17a6-4c7f-9312-8c57fae02a2f	1	Other	Other
+91186554-790a-4b56-ab44-ef1ca90f5da1	1	Other	Other
+91188f97-dee3-4397-b8e5-fc3b02a5f268	1	Other	Other
+9118c2b0-d0da-4386-94db-d383fae829f2	1	Other	Other
+9118ecd5-cb22-47d6-a03f-7be3b710d36e	1	\N	Other
+91191a2c-cf91-4fa3-9ed8-035b0aca0b1e	1	Other	Other
+911936a8-349c-4a5a-a8a4-1c919558abac	1	Other	Other
+91198034-b648-420d-a86c-b268071992d2	1	Other	Other
+91199b00-6dcb-4460-9e1d-ef5437c3c249	1	Other	Other
+911a1a2b-18a7-4833-8cc6-1bae89b37dce	1	Other	Other
+911a40a5-a936-47e1-8a5f-27d73b92f54a	1	\N	Other
+911a55ab-edac-48f6-88db-acad6bf9052b	1	Other	Other
+911a5b0e-bb3c-491b-be87-138c7279c25e	1	Other	Other
+911a6b7f-222e-48d7-9a37-99704879bdac	1	Other	Other
+911abfb4-f772-41c7-aca1-d760e71a081d	1	Other	Other
+911ac0d2-54bc-4ec6-bbe1-cf200013c458	1	Other	Other
+911ad6f2-f253-4b12-b213-e761fd8bab52	1	Other	Other
+911b0202-a0a9-4b70-b30d-b5f1e13db371	1	Other	Other
+911b0bc2-cf90-4529-86ab-2d1ac127df52	1	Other	Other
+911b0f42-88e6-4cf5-94ae-79fb8f61837a	1	Other	Other
+911b5b81-3bae-4696-90f2-24aa4e3801bd	1	Other	Other
+911b660a-ddf1-482c-b7e4-f4ed489474a9	1	Other	Other
+911b8b91-f6ce-405b-a630-3108b5170622	1	Other	Other
+911be212-7e89-4bfc-9273-eb980637aab6	1	Other	Other
+911c9246-3440-454b-b73d-58c106c73069	1	\N	Other
+911ce99b-bbdc-4786-b7e2-c170a0a99616	1	Other	Other
+911d40d1-90b9-427c-a9b5-16217ca5c85d	1	Other	Other
+911dd781-e3cf-484d-ac7f-d98c69092a25	1	Other	Other
+911ddbf9-6b95-49cb-9553-d61c0456cf04	1	Other	Other
+911e1cf8-54da-4033-942d-dfff04343986	1	Other	Other
+911e1dc6-eed9-4e29-b6cf-f581be24e969	1	Other	Other
+911e3f89-6817-46b0-a332-f0e167daafcf	1	Other	Other
+911e59bf-c158-47ad-bc3c-5d634c478e81	1	Other	Other
+911e82ca-d90d-4e37-b20a-dc34127d7f6e	1	Other	Other
+911ea99e-bd2e-43ff-9cb7-10804fe5baf9	1	Other	Other
+911ebd33-e7ac-40a7-a1f0-4cade4b04ed2	1	Other	Other
+911ed061-f17e-461c-a2c4-500a5bec01c1	1	Other	Other
+911f04e6-c0dc-4fe5-91ae-0bddc2c8f008	1	Other	Other
+911f1e0d-4595-433e-8c7d-587b537da62f	1	Other	Other
+911f28d9-c1e7-4743-9011-46c90bd5469d	1	Other	Other
+911f3222-4d2b-4f62-a3e3-2734400007b2	1	Other	Other
+911fae96-d4c5-4dba-814a-56062bf9d9d9	1	\N	Other
+91203057-2513-4b2e-b9ac-75acd67d48a2	1	Other	Other
+912062b0-2cab-47e6-9685-445d2d5e55e7	1	Other	Other
+91207b3f-ac9c-4c8d-9427-ff31b787debf	1	Other	Other
+9120a1cd-debc-4cc4-ad0f-5f799c5095e3	1	Other	Other
+9120c56b-ad7b-46a9-8682-362683736785	1	Other	Other
+91214c95-00e3-4dd9-bfaa-142db140c3e1	1	Other	Other
+91219d5b-857c-4073-9dcb-30922ad58d16	1	Other	Other
+9121a828-c0bd-46b9-a6d4-ca546e7f423f	1	\N	Other
+9121f36f-bbf6-4ccf-b81b-a7d119d6d85a	1	Other	Other
+91227cce-f94c-44b0-b113-edffa71636eb	1	Other	Other
+91229789-1c90-4ec2-b1ab-9da97986e0a5	1	Other	Other
+912297ef-3e44-4749-b5ac-e8691bed3228	1	Other	Other
+9122a5c4-3d2e-470a-b900-073a14be4887	1	Other	Other
+9122c44c-8566-42ec-9052-e9720b8c7b07	1	Other	Other
+9122d94f-c081-4cda-bddc-fea35a175149	1	Other	Other
+9122fafb-8dbc-46f8-8324-a5d916407f14	1	\N	Other
+9123053c-ddfd-4663-8a1b-3b5ba58b7d4d	1	Other	Other
+912334ea-f6ca-40b6-a2bd-a93707a47cba	1	Other	Other
+9123a70f-a058-4a53-93c0-4423208de001	1	Other	Other
+9123ab95-dc4e-42bc-90e0-4069517841f6	1	Other	Other
+91242009-6b6a-4669-91be-006b3b211d65	1	Other	Other
+91242593-17fa-4851-8927-6a77d8c75a67	1	Other	Other
+91244217-3179-461f-b518-b97e5c5983ba	1	Other	Other
+9124d291-2a0f-47cd-9c34-c9602cc97600	1	Other	Other
+91253b3f-9c4b-4df8-a653-ab69f7bab0d8	1	Other	Other
+912552e0-a9f0-44e6-8c76-a58afb061bb3	1	Other	Other
+91255b12-03f2-4f43-9144-f23cdbb40202	1	Other	Other
+912571b8-50cb-4683-ba94-455270ec0833	1	Other	Other
+91259c12-77a9-4d24-93fa-2187d4d17e5a	1	Other	Other
+9125b09b-fd8d-4f87-856c-76528be06e9c	1	Other	Other
+9125b8e2-43f8-49d8-aa6f-4d1c55d7b921	1	\N	Other
+9125c5f3-a3c2-4448-bf7d-790032aed45f	1	Other	Other
+9125c967-cf21-4e25-9a79-da26b0fb753d	1	Other	Other
+9125f4b8-c7e0-40c3-a248-5f6f33dc1ad2	1	Other	Other
+91265f4e-04bd-4984-b0ab-bc00e81c6053	1	Other	Other
+912677c9-9dc9-434c-818b-17a613fbe7b4	1	Other	Other
+91268164-4e6b-4612-a9e6-15599431a537	1	Other	Other
+9126d0bb-a2fb-4742-b5b1-f7defd10589a	1	Other	Other
+9126d310-2a2e-446a-856d-a6535ddc03fe	1	Other	Other
+91270199-028a-477e-b18d-7171a3f3185e	1	Other	Other
+91272a4b-adbe-40d5-a1fd-1687cd3a6eba	1	Other	Other
+91274b65-c1bc-435c-8dd0-a06a781eac1c	1	Other	Other
+91279fa4-0e2c-457d-86eb-746f0495738d	1	Other	Other
+9127f27e-b2a1-4860-b6f5-823c4262477a	1	Other	Other
+912801f6-982b-4196-9a24-eb376d81173e	1	Other	Other
+91288508-f7be-4791-bb49-cb45a3a41acf	1	Other	Other
+9128ae7a-cde8-452d-9930-a14beb81008f	1	Other	Other
+91292370-9b2f-4d20-b22a-5db14a619a77	1	Other	Other
+91293657-4f01-47b0-bf93-a2d970dcbf48	1	Other	Other
+91294c14-0ac5-47ed-93bf-c7b2458839b4	1	Other	Other
+912986d6-98d0-4930-be2c-be7d97231067	1	Other	Other
+912990da-c3df-4026-b823-81912fe9c6a0	1	Other	Other
+9129da4c-3606-4add-ab03-2f43c47f3d5c	1	Other	Other
+912a4de1-4034-404c-b590-f867f9b6f79f	1	Other	Other
+912aa0fe-1d74-4628-91a0-fc663be7271c	1	Other	Other
+912af480-7edb-4d92-9b2c-0832ffe3dc79	1	Other	Other
+912b1776-e119-43a3-9f09-9b38c81a6689	1	Other	Other
+912b457f-59f4-40c3-a0f3-21903ea8db4a	1	Other	Other
+912bdbb9-2722-4b33-8b44-fbbc8de9fa83	1	Other	Other
+912c06c4-7bd3-4051-a1f5-f1b9b8d994bf	1	Other	Other
+912c546d-777d-4810-bd4a-4ceed47234b3	1	Other	Other
+912ca97f-684e-4d33-b7bb-40ac703966b0	1	Other	Other
+912cd366-f58b-4fec-807c-e79028b9bc77	1	Other	Other
+912cdf80-d7a4-4958-b698-d772add0f956	1	Other	Other
+912d212b-7409-4d8f-87e3-6f732aaf96f8	1	Other	Other
+912d97e2-5693-4b98-991e-fd10e6faee64	1	Other	Other
+912da105-8de0-4d81-a1c7-1dfd4a414370	1	James	Other
+912ddde2-35c8-4533-9445-637b9d0b31d9	1	Other	Other
+912defc4-144a-48b8-b603-bbbecfb3a812	1	Other	Other
+912df237-efcf-409b-95c8-93e715f26f9b	1	\N	Other
+912e2a92-c8a4-4e65-a672-c4c9c886862f	1	Other	Other
+912e30da-27e4-490b-8403-a2ea1ba6e0bd	1	Other	Other
+912e4919-bce4-4e9c-8714-0b9c6bf41f49	1	Other	Other
+912e60fa-d662-4186-8feb-9abc19b4714d	1	Other	Other
+912eb9d4-ce76-4c1c-9c40-0db793072571	1	Other	Other
+912ec6df-a8cf-4728-b0e7-5d1f5a95c4c2	1	Other	Other
+912f111c-8953-48c7-9279-5b989faa68c1	1	\N	Other
+912f2305-0a27-4219-ad1e-ae522b1f03e1	1	Other	Other
+912f8fae-6c45-4761-8624-ec1f3c02962b	1	Other	Other
+912fd258-11fa-416e-af9e-27e6ea161eea	1	Other	Other
+912fdac2-b5b1-450c-8056-f3e898381bda	1	Other	Other
+9130282b-e48b-4bb1-942d-7f563d2d59df	1	Other	Other
+9130656f-1362-4b7a-ad06-0e86d92226e7	1	Other	Other
+91311836-0875-4cf2-a44b-a43f5d287331	1	Other	Other
+913118ce-9df5-48d7-a342-b41a2a7af404	1	Other	Other
+91311985-2a33-4626-bda2-2b1a620bbfd6	1	Other	Other
+9131962b-57b7-4a26-a46b-36e0392333a2	1	Other	Other
+91319fac-ae5e-49fc-8722-11571d708646	1	Other	Other
+9131a533-0d39-4fc3-bb8e-3de4d2a38209	1	Other	Other
+9131a73b-86fd-45c7-b75c-eb3d69a10fe6	1	Other	Other
+9131b171-cc99-4ed7-925c-88e943fe83a2	1	Other	Other
+91320835-54a9-4dba-928e-9b45c8b88845	1	Other	Other
+913228df-ee51-4a37-8e73-5dd296f007f9	1	Other	Other
+91326f0a-0511-4b7c-accd-1708b7d63a8b	1	Other	Other
+9132734b-a3da-45e0-ae7d-78e5c45921d7	1	Other	Other
+9132a64f-9507-4c8f-961d-e856d10443c1	1	Other	Other
+9132ca09-e721-4d5f-855f-97d0c61d9044	1	Other	Other
+9132e1b7-62ce-44b9-abb2-79e1da5819b0	1	Other	Other
+9132f7a2-9ff2-444f-aa43-5ab575b56952	1	Other	Other
+91335d14-98e1-44e7-91ef-465dd0dc4a7b	1	Other	Other
+9133b30b-ab63-4a4f-9e9d-bde06dc2fdb7	1	Other	Other
+9133e88c-7fa0-4fdd-ba1f-5fa2b74d44dc	1	Other	Other
+9133ec74-adb4-46bb-87ba-6620d70c2c03	1	\N	Other
+913406be-376d-47bd-a136-2680cdc1895d	1	Other	Other
+91349e91-8a1d-4ca4-ba4b-92909461e296	1	Other	Other
+9134b400-fe81-4e0b-8bd8-51f2c22b79e7	1	Other	Other
+9134f4ec-d8d6-47c1-8810-0a02de80d90d	1	Other	Other
+9135097f-da79-4977-932f-15dc6bbfd85d	1	Other	Other
+913528cb-fd12-473e-9e68-73386b6c1c4e	1	Other	Other
+91355f02-b5c2-487a-8cd5-dc97b979360b	1	\N	Other
+913575f9-2615-4fef-a349-55a6fbf7f33e	1	Other	Other
+91357f30-3bfb-45da-9948-be288b20f356	1	Other	Other
+9135ea1a-5837-44c4-8fd5-c12181b441cd	1	Other	Other
+9135f632-2002-4944-97e3-c2c592984a86	1	Other	Other
+91362a13-62af-4bb7-ade1-282e37f05807	1	Other	Other
+91363761-21ae-4a66-b739-d69aad44dfca	1	Other	Other
+91369c3d-8bfa-4104-9f06-4f45223fb444	1	Other	Other
+9136b79f-ed46-4266-9190-63a0fa777106	1	Other	Other
+9136c072-8b44-40b0-a14f-8c7c7a7b8337	1	Other	Other
+9136d3b2-d62b-4de6-90d1-c99ab0490d87	1	Other	Other
+913704b1-891e-4429-977e-05b7b7ed8afd	1	Other	Other
+9137283a-da59-4e8f-93c5-712fe62eeda5	1	Other	Other
+913737d1-6b16-4646-9d74-e28c1701bec0	1	Other	Other
+91373b49-bc6c-4049-9a41-8ecac74e6dca	1	Other	Other
+913756c3-0ade-49d3-94a6-d556bfbefb0e	1	Other	Other
+91377774-3aad-4246-a17c-710c211a425b	1	\N	Other
+91378656-652e-4d2b-a6a9-3e215cd60df6	1	Other	Other
+9137e7b3-c9ae-4a10-84a6-83e20a700ac1	1	Other	Other
+91380c39-be6c-4b58-9bf9-bec90a712f2f	1	Other	Other
+9138145b-0c2e-42d2-a155-49448a838f7b	1	James	Other
+91383e2f-f4a4-4505-bad7-5eaf21729f7c	1	Other	Other
+9138940b-42e4-479d-ac45-801b728bd892	1	Other	Other
+9138a538-fc4b-4bb6-86ae-bca400cc7b3e	1	Other	Other
+9138c54d-3a6d-40ac-81b5-2e083e572942	1	Other	Other
+9138c561-6d03-45d3-8eac-a6b831b173cc	1	Other	Other
+9138c8e0-5581-4fb2-a4a4-cb37b87e3417	1	Other	Other
+9138f4e8-d276-49ac-9433-ed76ac0f558c	1	Other	Other
+91391b0f-c1bb-46a5-849f-344a548e4c8a	1	Other	Other
+9139878b-d124-4a31-a957-30a3236021bb	1	Other	Other
+9139ab7f-7792-43cd-a60e-38d10d3988e8	1	Other	Other
+9139bb66-4801-4f22-b777-15850f2777f0	1	Other	Other
+9139c36a-abdd-48e4-95d2-f8ea8c2802bf	1	Other	Other
+913a4b6b-8a95-437d-86dd-0eb7d8cc5fe1	1	Other	Other
+913aed2c-e30a-4b9e-84c0-582ef23270b7	1	\N	Other
+913b09c8-af91-4edb-be31-0a9d04bbd608	1	Other	Other
+913b2f2e-e197-4ed5-951e-67baa5b2764d	1	Other	Other
+913b37c6-9f5e-475c-8056-cd5e78d85fe3	1	Other	Other
+913b4460-07aa-4068-8494-fba7faac877a	1	Other	Other
+913b4738-61d4-46e6-bc51-cac965391595	1	Other	Other
+913b6e26-0ea8-4d3f-833a-41bd774cbae8	1	Other	Other
+913bc73b-a111-4dbb-bf9f-d5f9d2bead26	1	Other	Other
+913be295-99fa-4568-992b-1928c19630a8	1	Other	Other
+913be4d8-455a-428d-bec3-7fad00cc2913	1	Other	Other
+913bebe1-f0e3-4a20-9104-c8ed5b951bd2	1	Other	Other
+913c10e0-8c99-49e1-a757-6ebd2401de8c	1	Other	Other
+913c248b-56c2-442c-811e-f77fc0375d0c	1	Other	Other
+913c3767-4652-4ddc-b7fb-7851eeec4de9	1	Other	Other
+913c40b6-dc65-493a-8983-2d172509c206	1	Other	Other
+913c6517-c245-496d-9a71-ebaab42b9369	1	Other	Other
+913c7a42-c8d9-4c30-8178-e68c0f70295f	1	Other	Other
+913ca539-5095-4618-a413-4e4338c66e98	1	Other	Other
+913cfb6c-8f4f-434f-b4ed-bdcd9eee530b	1	Other	Other
+913d651f-56a5-40b5-b0f4-087287aaf53d	1	Other	Other
+913dfded-3035-48bb-b225-682acb4f4603	1	Other	Other
+913e0192-53b1-4f5b-ae2c-d29e5878b1c4	1	Other	Other
+913e9dc8-198d-421d-a4b6-9d17bf7f48e9	1	Other	Other
+913efa50-fd0e-46e2-974d-1574e0d20f4a	1	Other	Other
+913f1a3c-2a69-4658-8a32-d87561f083cc	1	Other	Other
+914063b5-c356-424b-a7b2-d67b1e3aceae	1	\N	Other
+91407846-658d-4fda-be12-62bdfa685601	1	Other	Other
+914086b7-415a-445c-a39c-5d4e3a0bf159	1	Other	Other
+914098a2-a9fa-40c5-900a-10c7c841e604	1	Other	Other
+914104d2-701e-4014-be5f-3f0ff3b1880b	1	\N	Other
+91411c61-a355-42c7-933b-8bc194ba86f1	1	Other	Other
+91412016-7cab-42bd-ad42-b920791e671a	1	Other	Other
+9141620d-23f1-473a-af2f-288b4530f8ec	1	Other	Other
+914162bd-07f2-4fa4-b4d4-e313c6b726d1	1	Other	Other
+9141aa5c-a25e-4bb4-a7c6-08ccbd267444	1	Other	Other
+9141ec0a-69bb-44b7-8d17-08ebe4ca9320	1	Other	Other
+9142059c-1aa1-4e2d-8329-859225e4beb5	1	Other	Other
+91420ca2-592b-46c9-9e2e-1d9334960c08	1	Other	Other
+91420f96-e2ec-466b-991b-1396a475eadd	1	\N	Other
+914217e3-2337-43ea-b872-143ee5ca6cdf	1	Other	Other
+91422620-a8ed-46fc-92e2-98b16aa6a437	1	Other	Other
+914231fd-bfcd-4aae-8765-0340aa34ee26	1	Other	Other
+91424a8d-cfca-460a-9618-d7088d4dfcdf	1	Other	Other
+914253d7-142a-4d55-9e62-6995dc52982e	1	Other	Other
+9142aa5f-0fbd-4f93-b5fb-0da020028d06	1	Other	Other
+91430ae2-2ebb-4238-b082-5599ecca4c8f	1	Other	Other
+9143249e-4189-4e37-8122-6aec54bf7b70	1	Other	Other
+91433b3b-2e37-4de8-a38c-de513070961a	1	Other	Other
+9143426c-3862-482e-a488-978b3f389354	1	Other	Other
+914389a4-9cb4-4927-92bc-4bcff8f00ac6	1	Other	Other
+91438e15-2ac4-480b-b769-6e597b444eff	1	Other	Other
+9143d46b-0b1e-43a1-81f7-cac29fdc86c1	1	Other	Other
+914417c1-8ab0-4f98-9b32-9ea7b3b1224a	1	Other	Other
+91441e61-7d01-4baa-a5da-683c740c737e	1	Other	Other
+91443c61-8eec-49ee-bfc8-d2926d2d9395	1	Other	Other
+914483c5-0a81-4a3b-991a-8a5744a51588	1	Other	Other
+914492e7-c654-4af4-9dd0-b693c60cfcb3	1	Other	Other
+9144f0c0-913e-4bda-aa03-065fa65bfc43	1	Other	Other
+9144f407-15a9-44f2-9575-0453331ebc78	1	Other	Other
+914509e4-fa98-4155-9f53-c02eee9f3c2c	1	Other	Other
+91454f3d-cef2-4365-a0ce-0d454f5b6a77	1	Other	Other
+9145a76c-474f-4c7c-9608-24548141b2c4	1	Other	Other
+914600bc-a0bb-4482-96ab-5ffffc872f06	1	Other	Other
+91467420-310c-4779-b693-4f8b85ce6bd4	1	Other	Other
+9146a1f2-ee5e-4802-a4cf-8f41c488c30c	1	\N	Other
+9146d7c7-1f7b-49e3-9af3-9bb20f8d6e48	1	Other	Other
+9146e41a-4979-46f3-9bd0-33b07e0b6116	1	Other	Other
+91478307-0004-4e63-a1d0-d9e0696fcc00	1	Other	Other
+9147b179-9c46-4c52-882c-e6284fbfd6aa	1	Other	Other
+9147f264-dd17-4147-ab67-fbc04c7607de	1	Other	Other
+9147f6c5-d533-47ad-9725-052bdce8fc10	1	Other	Other
+91481aaa-7bac-40ff-9ee1-b110510ec9e7	1	Other	Other
+91484b02-e32a-47d7-b830-00070b119a60	1	Other	Other
+914859c5-c0d9-4777-856d-866fa0dbcb9a	1	Other	Other
+9148a275-748d-4f2f-aee6-dafaa9d363ec	1	Other	Other
+9148ba06-e465-4d87-8cae-4abe0dd3afeb	1	Other	Other
+9148fc52-554e-4261-bad2-a312c9fdb020	1	Other	Other
+914922c6-d0d6-4085-acdd-1ecd62e53e61	1	Other	Other
+914957d4-3b01-48e1-9bd7-bfcc0c530659	1	Other	Other
+914a1fff-62f0-45bb-946b-a9be6fe261dc	1	Other	Other
+914a2514-16a5-4d60-89ed-97d0ae20e066	1	Other	Other
+914a2bd5-4f3e-4e0c-b49d-944c7df26d3d	1	Other	Other
+914a3a96-e762-4b22-b80f-e3ee003de810	1	Other	Other
+914a5879-67e0-4eb6-a2cc-b9c36b3ac67e	1	Other	Other
+914adf0a-6e94-4080-a4a7-a41710f597ca	1	Other	Other
+914b1794-7da6-46a4-bc52-9828c63fe6fd	1	Other	Other
+914bb7eb-1107-4838-bc52-59960fbb1de4	1	Other	Other
+914beb7f-a65b-4c6a-bf7b-023f166b60ea	1	Other	Other
+914bf82f-993e-4ca9-80f6-48d1683c07c4	1	Other	Other
+914c000f-ef7c-41f7-8d84-b18a86bcb5c9	1	Other	Other
+914c83b5-2fa3-492d-9ccc-4d040f30cba8	1	Other	Other
+914d7bac-86b2-4f76-b13a-d94ea3ff94d2	1	Other	Other
+914dc48b-9c2c-4775-aa68-cd301008eef2	1	Other	Other
+914de653-0e32-4323-9139-6a1362de3f71	1	Other	Other
+914df9dc-7734-4cee-94bf-04e05115069e	1	Other	Other
+914e340c-9cb0-4280-a2e4-3822a2ea17bb	1	Other	Other
+914e4a4e-02db-4246-b7a0-1039373af6ec	1	Other	Other
+914e93cc-f3f1-44c8-bd1e-6c74dbf8e1c5	1	Other	Other
+914e94f4-53af-4f42-9f29-bebc66addd76	1	Other	Other
+914eb54f-4729-4d31-865a-87a6a4f030ef	1	Other	Other
+914ece0d-821d-4c5e-8064-7c4bda482d11	1	Other	Other
+914ed1ff-bc67-4a7e-a0ac-5aaf1d58433f	1	Other	Other
+914f0b09-c8e8-48c8-b463-6193d5c39638	1	\N	Other
+914f1a00-583b-485a-8764-bb8881ebc501	1	Other	Other
+914f35cc-a82f-4d17-826c-c2fb52683c3c	1	Other	Other
+914fd4a1-3372-4f05-8266-04c1ce70fa72	1	Other	Other
+914feb37-1bf4-4e47-b229-21860c7501f9	1	Other	Other
+91506397-cbd5-4477-a0a4-66eff18e62ff	1	Other	Other
+915064c1-04ce-4623-b1e5-54782f3ff098	1	Other	Other
+91508378-b139-4ab0-98cc-9a9b54c4f0f4	1	Other	Other
+9150c42c-26b7-452f-891d-fec469cacdd1	1	Other	Other
+9150cb4a-ec20-44ab-aada-0d4085a1c3cf	1	Other	Other
+9150ceba-f034-459e-a51b-fc4ba509290e	1	Other	Other
+9151005d-b292-43d4-b141-f59b4734f906	1	Other	Other
+915124a3-37cd-4b13-bafc-cdc66b522a8b	1	Other	Other
+9151728e-bcdf-4548-886f-93c6c67a1e79	1	Other	Other
+9151cdc0-5573-484d-80ca-4b6841f3b580	1	Other	Other
+9151f6fd-b433-49df-a705-9c18fc193258	1	Other	Other
+91523823-c444-4878-9f85-d9d7838ee22c	1	Other	Other
+91523e16-82ee-4276-81c2-1c23a2a2b06c	1	Other	Other
+91524036-a7fe-4ddd-9002-0ce0a1caade4	1	Other	Other
+9152be4a-8bed-48af-b44d-14f19adbb7cc	1	\N	Other
+9152f3e8-7d18-4f29-a332-5f168caa5f48	1	Other	Other
+91530ca3-324f-46a3-a79f-fd4607f38444	1	\N	Other
+91539b7b-af31-4be2-a26a-fa2a3f6c92e7	1	\N	Other
+9153d279-b473-4a5f-bd81-47c74bdf9224	1	Other	Other
+91542e7e-b8f3-4d4a-ade6-316e3bd2fd17	1	Other	Other
+91549bd2-d6a9-4031-bc7a-2de5248c88af	1	Other	Other
+91549d63-539a-4c3c-85e1-4826d4928a94	1	Other	Other
+915523af-8369-4ea5-8fd0-3ffece86d030	1	Other	Other
+91554dbb-2ec7-4746-9e66-856128dc3bda	1	Other	Other
+91558d82-17b5-4ca7-97ae-115ce6859d46	1	Other	Other
+91559c23-3e1d-439d-b6ab-a23b6acf281f	1	Other	Other
+9155cdde-9678-4edb-ae36-2f790d7ceaae	1	Other	Other
+9155e76b-a794-4045-a28d-681751dac659	1	Other	Other
+9155fa8a-09f7-4082-99f9-8ac1f6cc5d12	1	Other	Other
+91562a4c-3ca2-4539-a911-9de3e9419442	1	Other	Other
+91564d53-bb96-45da-a058-573e406f24e6	1	Other	Other
+91566914-7612-4124-b9ef-2d4a40895ea3	1	Other	Other
+9156795c-8ebb-456d-ba54-d9fe843a7d16	1	Other	Other
+9156852b-f568-4f45-bd07-bc8c705ae006	1	Other	Other
+9156941c-4a5b-49bc-9c4d-11eec4811c5b	1	Other	Other
+9156fd2b-d749-4176-af71-6422eff03907	1	Other	Other
+915731e2-725a-4341-8355-8932ea8e791d	1	Other	Other
+91579b6b-b751-40c2-b0f6-853ea7205c3a	1	Other	Other
+91579dea-e93d-4b16-a75c-f4f0022a1a23	1	Other	Other
+9157ac51-6ec3-4141-9486-f05abebbadc2	1	Other	Other
+9157de91-1956-4b26-b09c-369af6fe41d0	1	\N	Other
+9157eb34-896f-4653-b636-0fe64f01c264	1	\N	Other
+915840e7-45fc-4b0f-b31e-1e0fe1d9f2c5	1	Other	Other
+91585f81-b9ab-4b9f-8d3b-4790e2676387	1	Other	Other
+91587a8a-f0ba-4f39-b03e-00ebf801a6e0	1	Other	Other
+9158adc7-662f-4cd9-9472-316d19de0dd2	1	Other	Other
+91597446-6e17-4432-b89d-8b21b9e9b920	1	Other	Other
+9159b523-7aa3-46a1-8ac3-cc81cfa1e204	1	Other	Other
+915a07d3-0933-4d75-a439-74b4d7776c03	1	Other	Other
+915a36f7-096d-42ee-a744-cd6b9c87e5fa	1	Other	Other
+915ad721-f560-4496-9dfc-5829392c4205	1	Other	Other
+915b140d-9895-4ca8-ad0e-702bfa4d7922	1	Other	Other
+915b405c-3a35-45c9-8630-b9686ce7e496	1	Other	Other
+915b5418-9d54-49a6-b597-6dbc71f9fa9c	1	Other	Other
+915b80d4-1ec4-4447-a81d-a2fba193d7ba	1	Other	Other
+915b886d-babf-4d57-a1c1-a4db60b2d5c3	1	Other	Other
+915b9441-367c-40a3-b70f-a8cd70d61552	1	Other	Other
+915bd547-aa34-4608-a571-7d97b75ab7ef	1	Other	Other
+915be6c4-c414-40ae-9fd4-43b091f51c23	1	Other	Other
+915bea35-1955-461d-8c3c-84b73daeedec	1	Other	Other
+915bf4e2-72d8-44c5-8761-ace46fd5a35a	1	Other	Other
+915bfc0a-bf57-4f75-a5ef-6bdbb082b059	1	Other	Other
+915c4c52-3620-4ec0-90e6-49c93d76c45b	1	Other	Other
+915c5a3d-312a-4a46-9ee4-41bc84a724f2	1	Other	Other
+915c7445-cebc-477b-940d-450f4c3aa389	1	Other	Other
+915ca7e9-b4cc-4893-8676-7824b9fc8957	1	Other	Other
+915ca8c0-c4f9-44ac-a77f-6cf862b0ee85	1	Other	Other
+915cf3ba-8f7a-4065-93fd-80cc2caad2a5	1	Other	Other
+915cf4e0-92c5-4b36-a65c-db6163a002d1	1	Other	Other
+915d060a-c422-4481-8201-237e734c8979	1	Other	Other
+915d3d08-1c81-457c-a7cf-f556d5c9e1b7	1	Other	Other
+915d4ada-98aa-4e0f-af5a-539767efd45b	1	Other	Other
+915dfdfb-1744-47cb-9d98-54b62aae7e39	1	Other	Other
+915e15fa-e121-4f75-8c55-29d22049d3c6	1	Other	Other
+915e2f93-efb6-4a25-8e2f-c1b5c4d42e27	1	Other	Other
+915e9f49-7091-4f2f-9fc1-b282334c63cb	1	Other	Other
+915f77e3-b0eb-4147-9d3d-2fc934936728	1	Other	Other
+915f8159-60b6-40ff-bc51-8543c76cdef8	1	Other	Other
+915f87ab-4333-4293-bde7-4ba17a35ba4e	1	Other	Other
+915ff280-9373-46a0-a88c-600ce41f061e	1	Other	Other
+91602062-18aa-4d3b-9ab0-89f335d2af9a	1	Other	Other
+91602a36-4217-4e41-bbf7-0b16c7b4511e	1	Other	Other
+91602e9a-59f4-42da-aecc-b00290685160	1	Other	Other
+9160568f-393e-4285-ac1d-0d3f08cee854	1	Other	Other
+91605943-5bfd-4262-a04c-326372614749	1	Other	Other
+916065dc-89de-439f-a13a-3c32daa4f4ec	1	Other	Other
+91606ee3-a0e1-45af-bcfe-621a2eed0237	1	Other	Other
+91609d7e-c224-497f-b9cd-de511f2fc0c8	1	Other	Other
+9160a00c-2c16-449e-bef9-62b627498b8f	1	Other	Other
+9160ab6c-e0ce-48b5-b504-4a45b5610ab1	1	Other	Other
+9160aede-3062-4c10-ac02-c18c60f81d57	1	James	Other
+9160b02b-0243-4298-975f-c4d815db536b	1	Other	Other
+9160c158-4477-4a17-83e7-dbbc2294aa7b	1	James	Other
+9160fefc-2841-4ca5-ad35-c112ccf6e774	1	Other	Other
+91610265-9678-4061-86be-76694f3d835b	1	Other	Other
+916120fc-ac75-49af-8372-c0c1a7021f00	1	Other	Other
+916124a9-cb85-4957-b825-1d307af21e1b	1	Other	Other
+91612d91-102f-49f2-a175-b6bbd2f798e9	1	Other	Other
+91619403-e351-455d-b07f-68daeaa7f150	1	Other	Other
+916199d1-4c36-49ae-a778-b56d626f501c	1	Other	Other
+9161c79d-c955-4539-aab2-af70f392f952	1	Other	Other
+916201e1-83fe-4486-93ba-d41daeeb6e4b	1	Other	Other
+9162030b-cf45-4f84-b3e4-5e586db0bf45	1	Other	Other
+91620c17-c950-4389-89e0-a35681052240	1	Other	Other
+9162431a-bcd1-4607-954a-e4266a276998	1	Other	Other
+916246da-dfa9-42ce-a500-fbb6564aa198	1	Other	Other
+91627ff9-76f8-4b7d-8ed2-5bcc3b8a3026	1	Other	Other
+9162be06-b917-4a61-845d-a1612ba35291	1	Other	Other
+916302f4-0d8f-47d9-9a45-23284bbd691c	1	Other	Other
+9163aec0-4acd-453f-9d91-b97bfdd9d7b6	1	Other	Other
+9163ce63-c59a-43be-8815-886dcc061d2d	1	Other	Other
+91640e8a-873a-4a52-a966-73a9134251dc	1	Other	Other
+91641a58-82f1-489c-895b-afb917c663d7	1	Other	Other
+91645acc-37bb-48d8-85ee-790137fb5539	1	Other	Other
+9164a799-5323-49e2-bbab-614e2e1f5cb9	1	Other	Other
+916500c4-f66c-4cd9-96f5-f931c856f2af	1	Other	Other
+9165033a-fbd6-46ea-ad9b-4a0d00640ff2	1	Other	Other
+91653966-374b-4163-8e95-dce33000873c	1	Other	Other
+9165426c-d9aa-4e5e-af2b-443b6dda8c77	1	Other	Other
+9165c163-edc1-4f0c-99e8-5099386bc6c7	1	Other	Other
+91665987-b6f4-4cf2-9043-6ba76bfd8c73	1	Other	Other
+916662bc-c053-4814-975b-8bb5720a29d3	1	Other	Other
+91669461-f678-4822-8897-f17bb3b0a919	1	Other	Other
+91669ad3-77d5-4804-aef8-6882f7a722da	1	Other	Other
+9166ca21-152a-446d-b820-74f2023515af	1	Other	Other
+9167247a-7cb0-4ee8-8542-b5b1e23ae93b	1	Other	Other
+91672c36-c1f0-40aa-9a91-a7d2d5cb22c8	1	Other	Other
+91673304-8b52-4a66-9025-43d5f25430be	1	Other	Other
+91681e25-5162-4f47-934d-1eb4583e178d	1	Other	Other
+91682e93-e8af-4f16-9c3f-aca0d8f7f04d	1	Other	Other
+91683346-8ea9-42c3-9d47-8a050a31a06f	1	Other	Other
+91687575-f7f7-45fa-aa79-1753b5905795	1	Other	Other
+9168c60f-7af8-4d34-a0ac-3c7b977d3e6d	1	Other	Other
+916909f5-577d-4f55-b4c7-bb1d24edd7c2	1	Other	Other
+916965ad-2622-46a7-90d2-ec04aac79eed	1	Other	Other
+9169678f-19af-445b-ab0e-b8b21e07d042	1	Other	Other
+91698840-17f3-46ad-9dfb-caa95be0042c	1	Other	Other
+91698cca-acda-4355-afa0-93ec2e06c7f1	1	\N	Other
+91699cc5-7ae4-4d44-99fd-d43643754688	1	Other	Other
+9169a610-533d-4972-87b0-bc7004941bb3	1	Other	Other
+9169b3d1-d3f2-4364-afc1-a64c9e3677b3	1	Other	Other
+9169cb94-2b61-4dec-8927-d5ad11757a8b	1	Other	Other
+9169ce57-1f81-4d3e-ac43-6d5373214e23	1	Other	Other
+916a0a4f-570e-485d-a01e-d35188f641b6	1	Other	Other
+916a4859-8651-4679-a3f1-be7c9691bba4	1	Other	Other
+916a5fcf-75c3-4d69-8ac8-a37ee755cba4	1	Other	Other
+916aac59-cb10-44e2-a536-ae61319c7f0b	1	Other	Other
+916aacf0-7b6c-4d41-8ebf-3e1ef2cb081d	1	Other	Other
+916af774-920a-4118-a392-d4e3b07c1915	1	Other	Other
+916b7f88-f23c-414b-92fd-77a6a6697773	1	Other	Other
+916bfa58-5c30-48ae-81d1-35b1a7b7755a	1	Other	Other
+916cec24-fa72-4827-a4be-7a8bae309987	1	Other	Other
+916cfad9-5d9d-49c6-a266-9538f540e4fc	1	Other	Other
+916cfc89-8723-4944-acc4-bb37a0235a4a	1	Other	Other
+916d08b9-cdfa-45cb-a665-04c2e6f36303	1	Other	Other
+916d6478-94b7-4965-93ec-0f9894bce0bf	1	Other	Other
+916dafec-3e7b-40a1-9d3e-a37a7143c4b3	1	Other	Other
+916dd5ec-5375-4a79-b4b2-f75fa15d4035	1	Other	Other
+916e086b-c059-41b3-94f8-054750cba17f	1	Other	Other
+916e1504-fcaf-4244-9b34-087ed0b8e0aa	1	Other	Other
+916e3243-df65-4d09-85bf-345c4dddfe42	1	Other	Other
+916e365f-6640-455b-b1cb-fad8d0395998	1	Other	Other
+916e463e-70f6-412b-b0ad-bbad76c4ad96	1	Other	Other
+916e53aa-8f47-4b8c-9398-3ed6ec7252f4	1	Other	Other
+916e5570-ec6e-484d-99e7-8809496f34fd	1	Other	Other
+916e70fe-8059-4efe-92ca-1a3be485f7d7	1	Other	Other
+916e723d-3834-4549-a193-0877055ba444	1	Other	Other
+916e7d48-bab8-4656-84f7-22b981a974c6	1	Other	Other
+916eb113-4893-448d-95e4-0c6e27bd6d5e	1	Other	Other
+916ed108-bb4d-45ed-a88e-0b53095ef2bc	1	Other	Other
+916ed4ee-ff2e-4a1f-a908-feb0e402ef49	1	Other	Other
+916f0fe5-9352-4d02-9605-287f667a34c2	1	Other	Other
+916f22ad-7572-462e-b010-57348142e05f	1	Other	Other
+916f5cbd-16a5-4b16-bd2b-0d9c8bbf997b	1	Other	Other
+916f9786-98c5-46cc-b180-20a056ed13cf	1	Other	Other
+916fe1a4-7b4f-492f-a4bb-b023b96f305c	1	Other	Other
+9170282d-7e8e-42fb-b4a3-849f4757a263	1	Other	Other
+91703180-7f66-4d97-ab60-3c0f2f7bdb0f	1	Other	Other
+917033dc-efc6-4984-8df2-e41bed84d6e1	1	Other	Other
+9170b334-7917-42f7-9be2-006aca421fa1	1	Other	Other
+9170b574-589f-4452-b1a0-c0ba2ba14891	1	Other	Other
+9170bd36-46b1-41a5-b58f-efe81a13899d	1	Other	Other
+9170f652-8a0c-49ee-82c8-5aac32ffc2bb	1	Other	Other
+91710e86-7d5f-43d5-8d11-3c3ed2d44e0c	1	Other	Other
+91712538-b530-4ebf-9c68-bf57342496b6	1	Other	Other
+917195a2-85e4-4c8e-9d3d-350ef62f9f36	1	Other	Other
+9171a4d8-ae51-4705-8f10-37311c83fad0	1	Other	Other
+9171c7f7-56e5-4648-90db-f16965c7cfaa	1	Other	Other
+9171f154-2256-495a-9a22-bcfc3b279eb1	1	Other	Other
+917231e6-63c0-4328-97c6-5925451000cd	1	Other	Other
+917232e2-4239-4cc6-860c-f48f1b1cda28	1	Other	Other
+9172563d-656f-4e8d-9678-3d60bee59c92	1	Other	Other
+91726744-3ca9-4e45-8e15-0560e2bb6560	1	Other	Other
+91726c7a-0e47-4039-ae1c-b9e2be547329	1	Other	Other
+917291af-0933-45b4-9296-cfeb9a177950	1	Other	Other
+9172cbd5-1d60-488f-99a5-9d0853df82bf	1	Other	Other
+9172cc63-86ed-4914-8e4d-82093f730676	1	Other	Other
+91738ee5-8d3d-429d-8b38-01a51f58d1c3	1	Other	Other
+9173a6c2-abf2-41fa-849b-f7084a074c0d	1	Other	Other
+91742303-cc41-4242-9b5c-80e479ad2ea2	1	Other	Other
+91745856-6c3a-4a6a-9b42-71274b1baf63	1	Other	Other
+9174a2d8-bb13-44c4-80cf-744e8dfeaab2	1	Other	Other
+9174b498-99e2-4d70-8cbd-ac365421c51e	1	Other	Other
+9174ef98-a9e2-433b-9ce5-a0d8aaa031d3	1	Other	Other
+9175449f-e9af-4571-88a3-e90bf3866fcb	1	Other	Other
+91757af9-4842-48d5-8ccf-b8eee7ad9b6f	1	Other	Other
+917595c6-dc61-4244-a203-d4a19021f984	1	Other	Other
+9175bf5e-5525-401f-80f1-c68cf914e5a3	1	Other	Other
+9175cd01-fbe7-4798-ac9c-d86a97504ca2	1	Other	Other
+9175dd0d-f998-4655-a851-b377f4f225c8	1	Other	Other
+91762f0f-11f8-4663-82c2-c38b9115278d	1	Other	Other
+91763f32-7322-46e4-a093-f35a76b27d0a	1	Other	Other
+91764199-af81-418d-b5ab-474ca796c293	1	Other	Other
+91764ff9-3203-4b4f-ada3-4ab46a1ec201	1	Other	Other
+91767de8-832b-4e74-ae8f-4660c0a0f384	1	Other	Other
+91768834-f9d1-4181-b82c-97957e3b0938	1	\N	Other
+91768afd-a6cc-4eac-9daa-69f226701efe	1	Other	Other
+9176a876-ae2c-46d2-9bc4-13c74e2467dd	1	Other	Other
+9176ab41-32d6-4512-9c53-49f73b429a05	1	Other	Other
+9176cd34-7b38-4cd7-80cc-62af9754456c	1	Other	Other
+9176d748-681c-4624-b311-8865ffd74967	1	Other	Other
+9176e07c-0f30-4dd9-aba7-86509b40f24c	1	Other	Other
+91770f68-393a-47ac-8c4f-05de882bf581	1	Other	Other
+917771dc-9c87-11e7-8a51-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9177749f-3ceb-4f57-a27b-01734811b8e9	1	Other	Other
+91777f0f-e3fc-4063-8c67-7f851a580cfc	1	Other	Other
+9177a66f-e824-4d71-af2d-42bce4304fb4	1	Other	Other
+9178004e-bf10-493a-993d-33a76dd60235	1	Other	Other
+917811c6-1d98-4a61-9e66-12fc900e8af5	1	Other	Other
+9178c3f8-5692-404b-9fba-4e869226ad2f	1	Other	Other
+9178c491-fe33-4288-88c9-1c524637899b	1	Other	Other
+9178d2e0-23b6-4dbd-9c5d-6f7907780a04	1	\N	Other
+9178f770-fd03-4dd2-af56-fc7f6f6b3cb7	1	Other	Other
+9179289a-9cce-4973-a236-d1403b3cdae9	1	Other	Other
+91796804-3337-4a2e-8475-afb020c602f4	1	Other	Other
+91799a2d-967d-4e86-8822-5da5cf34de1c	1	Other	Other
+9179a912-96ff-4a93-8026-0e3a70ae1894	1	Other	Other
+9179ca52-e949-4de6-aab7-6f14bc46bd46	1	Other	Other
+9179e494-acd4-4d01-a20d-826a9836e316	1	Other	Other
+917a3ccf-cc37-4167-8f9f-80ec02d6da57	1	Other	Other
+917a56a5-dd97-4447-ab7d-a9c8e2875234	1	Other	Other
+917aa148-20b9-49b4-a7e4-58c9e9647c13	1	Other	Other
+917ad0a0-e2e5-41ea-ba6c-1f87f1caf484	1	Other	Other
+917b39bf-e9fb-4fea-8074-a4e0d48c1468	1	Other	Other
+917b493c-25f5-4406-8734-97e2fd03123f	1	Other	Other
+917bbb53-d68a-434e-aa6b-93f6df98bdf5	1	Other	Other
+917bd22c-6a27-4c8d-a2fb-b1ed32cd7e1c	1	Other	Other
+917c12c3-b2e1-48eb-85dd-ca524612aeef	1	Other	Other
+917c2044-0933-4964-bfcc-120d61922cf9	1	Other	Other
+917cb849-5bdf-4a4f-aec9-596413075060	1	Other	Other
+917cd9e0-fb55-4836-8107-bb4b958c7faa	1	Other	Other
+917cde30-ab9a-4f66-94e9-d87d51fba347	1	Other	Other
+917cf48c-b6ce-4b1d-93b1-bac6aaf97059	1	Other	Other
+917cf827-6cfc-42a0-90f6-e39bb57461f3	1	Other	Other
+917d00fc-2964-43ab-9b79-ef3ac54d2ddc	1	Other	Other
+917d165b-0035-4a4f-97d4-d38b16014094	1	Other	Other
+917d35f9-a111-4e5a-86ee-a88fc9d19530	1	Other	Other
+917d5bca-48a5-46c2-8621-980ddae1beab	1	Other	Other
+917dbc3c-eaae-417c-bc9e-2abec5e1fdef	1	Other	Other
+917dc624-3805-485b-82ee-47f8d4e665f3	1	James	Other
+917dcfbe-f09b-456f-b76e-4bcd98e95cf8	1	Other	Other
+917dfa3a-026b-4220-a22a-9a1917ebcf6c	1	Other	Other
+917e004a-8860-4738-828d-a7bc1b4cde6b	1	Other	Other
+917e370e-a00d-48bf-92cb-ea5d7243d3d2	1	Other	Other
+917eb10d-d9ee-46a5-ac71-dae820e6ea2a	1	Other	Other
+917eca14-64a3-4c21-9f95-2f3cf43cc1d3	1	Other	Other
+917ee66b-b58f-43c5-9710-ca6194831ea0	1	Other	Other
+917f4861-e2d6-49b9-93e9-c67fdede7e4e	1	Other	Other
+917f4cc2-1f7a-41f8-8362-adac35ad810b	1	James	Other
+917f64c7-8f88-4ac6-907a-c29e3346e13a	1	Other	Other
+917f65a1-93cd-4d1b-861a-25851a220f78	1	Other	Other
+917f902f-bc91-4c83-82a5-01869da8a982	1	Other	Other
+917f90f9-172d-4df4-a514-44d65306a912	1	James	Other
+9180033a-d471-4c4b-a682-e7ebfe961203	1	Other	Other
+91804b8a-7d92-4c27-b709-1f6afb094aaa	1	Other	Other
+918087c6-6e14-4993-9f31-24b31bb45410	1	Other	Other
+918112b4-90ab-4265-b1f9-694439839130	1	Other	Other
+918120bd-b458-4232-928b-59b6866464d6	1	Other	Other
+9181283f-0e29-4a4e-afc7-9328843de999	1	Other	Other
+9181917f-6458-4d88-af02-d123757a0e77	1	Other	Other
+91820894-b540-416c-80b5-ba2d82ed34dc	1	\N	Other
+918217fa-c260-4f9b-9f92-f718ee8f9686	1	Other	Other
+9182283b-31d1-4c1b-84a3-677a89c90515	1	Other	Other
+9182546c-63ef-47ce-bee6-1f04fbb207e1	1	\N	Other
+9182c7f2-55ae-4d76-8c23-8a1f92edfe66	1	\N	Other
+91832480-d4ca-4654-b08e-f7b635b32839	1	Other	Other
+91832703-cf83-4892-833e-be9b4b52b975	1	Other	Other
+91832c19-32de-4968-aa37-72e504deae0f	1	Other	Other
+918334a3-ab55-4b3f-818e-7ee09540b6e6	1	Other	Other
+91833f6b-086b-4830-8d7b-6162be99321c	1	Other	Other
+91834ce7-e05b-4a0e-b6e9-7286d89bd310	1	Other	Other
+9183c5ce-d11f-4145-8877-06941f3f2bec	1	Other	Other
+9183e8a4-5276-4167-9fde-3edc16f321e7	1	Other	Other
+9183f849-0c38-4ba7-b2c9-b6a0fd1b6ff0	1	Other	Other
+91841898-c340-449a-b7d3-d1410571974b	1	Other	Other
+91843cb0-0915-4d3b-9630-e6952aab2293	1	Other	Other
+91843fd9-e0b4-4932-8ef9-4f1365dee396	1	Other	Other
+91844b45-7743-42af-90a5-ce6b9c5907b8	1	Other	Other
+91846124-f480-4e91-b945-7749d7c30b1f	1	Other	Other
+91848a12-441f-456b-afb1-027a75dc5027	1	\N	Other
+9184a696-570d-4a39-bc2e-247cdedf33e9	1	Other	Other
+9184b0e1-c3e2-4a75-9fab-e5b136d445aa	1	Other	Other
+918539f4-a981-4405-83c6-1ab11fc46eac	1	Other	Other
+918582dd-93a9-4451-975b-1fb016292604	1	Other	Other
+91859d29-1776-47fc-9221-dcb296cac0aa	1	Other	Other
+91866055-ea06-4825-8f19-bbec71bb3b2b	1	Other	Other
+91875e04-b4e2-4a58-b819-5bc6fed00a11	1	James	Other
+9187c93c-b488-4436-88ec-76de25d8b69e	1	Other	Other
+9187cc5e-bdf0-4cba-985f-29e5a177c7ec	1	Other	Other
+9187f023-675b-4f2b-a94a-c3b05c2ad8cc	1	Other	Other
+9188427b-6375-4892-9f43-e4422606b243	1	Other	Other
+91887851-214c-4e0d-9fe0-04ace5f71f7b	1	Other	Other
+9188f993-8660-4683-9610-e3d14288ea0f	1	Other	Other
+91895f63-6939-465c-9f22-3307bc750ca6	1	Other	Other
+9189cec1-070a-40b3-babb-58559d23c8df	1	Other	Other
+9189ea96-daaa-4362-ba67-1e6a52b50fa3	1	Other	Other
+918a084e-2c6d-4f24-a0fd-01b8d07d7ff1	1	Other	Other
+918a0d83-3275-426a-b6df-c4c9806d0e6a	1	Other	Other
+918a4229-725f-4b2c-81aa-484d0f3b70e9	1	Other	Other
+918a4bbc-b6b7-4e0c-980f-dc87c2eedafe	1	Other	Other
+918a67f8-6dd0-4ca9-82bf-51e08e8be0aa	1	Other	Other
+918a7aaf-ae80-46c6-ad51-620afde462ec	1	Other	Other
+918a9a19-ad6f-4efb-b58a-63ee6a782eab	1	Other	Other
+918ac3bc-1b15-4cd3-abdc-cd842346bd2d	1	Other	Other
+918acfb7-1c7c-4b4d-bc1e-24fff54a7dda	1	Other	Other
+918af6a4-0947-4dea-8e16-8d3e1e9a58aa	1	Other	Other
+918b3df2-ec7b-4454-82b5-18444f4b8772	1	Other	Other
+918c156b-bec0-42d3-bfe1-3968979df0a6	1	Other	Other
+918c2556-c3d9-454f-8a06-34c82937f1ef	1	Other	Other
+918c313e-ced7-4490-bd31-7c786aeb0d94	1	Other	Other
+918c32f9-d2d4-4a14-a9d7-1961b1e82f6f	1	Other	Other
+918c3681-1f98-4846-80d2-bb9dbfb1a03a	1	Other	Other
+918c4452-8564-4d46-9a8b-9bd5e1318814	1	Other	Other
+918c6f8c-556f-4a4b-842a-abe761d01048	1	Other	Other
+918c71c4-1231-4955-8a2a-39f29277db93	1	Other	Other
+918c7bf8-bc30-43e2-8a27-85b755d24027	1	James	Other
+918d1636-9b24-4355-b5cb-8f6c0b85c0b8	1	Other	Other
+918deb8b-8c33-4e88-8218-9fce1501ff7d	1	Other	Other
+918df5df-c8b7-4385-a277-2e7cfae38999	1	Other	Other
+918e089d-defd-4c45-ac85-246df65496a2	1	Other	Other
+918e3211-7e86-4145-a9a8-2252d6c4d77e	1	Other	Other
+918e3916-9300-494f-be99-e48675a983ff	1	Other	Other
+918e43ef-c0f4-4ffd-8325-d3b0c3d60787	1	Other	Other
+918e4c81-e5b0-4a6d-853d-f5bad5284d9f	1	Other	Other
+918e6a8c-eca8-4e18-aeaf-4756b3f17911	1	Other	Other
+918ec10f-0b7a-4a3e-a032-364ac9950bcb	1	Other	Other
+918ec925-0597-4ed1-85ce-4d4970eb61a4	1	Other	Other
+918f7fae-0837-4c88-846a-eaafd3c6ca27	1	Other	Other
+918f9f72-b64b-4dac-9dc8-d37d29946c5c	1	Other	Other
+918fc72d-84b2-4118-bb6f-69f1f56926ad	1	Other	Other
+918fe995-5be9-41ae-92cc-f9e09f7df916	1	Other	Other
+918ff062-bb86-422c-b5b2-6f5b5df7ded1	1	Other	Other
+918ff0b0-d07c-4d4f-b52e-b111ea8211d8	1	Other	Other
+91900157-c96a-4451-9202-00a85713c377	1	Other	Other
+919008ec-7736-4d6c-8336-cf8282c5daf4	1	Other	Other
+9190095b-1f18-4085-9112-411385a584b1	1	Other	Other
+91901249-2134-4134-8b56-73d2fb90fee6	1	Other	Other
+919072b4-715a-41b6-b3b6-063fbcab7879	1	Other	Other
+9190b428-503b-4eea-bd18-e4656032bc1b	1	Other	Other
+91910fed-9f86-4854-a654-78c732f88d74	1	Other	Other
+919192d6-5fa5-48c5-9608-6d7d9601092c	1	Other	Other
+9191d02f-ba20-44f9-abcc-633dbc01bab6	1	Other	Other
+9191dfd3-e80e-4317-8bed-39f567f70e16	1	Other	Other
+9192055d-278c-4d19-91b7-da538f0deccc	1	Other	Other
+9192727e-47d9-4d76-a4d2-f2a8985af87b	1	\N	Other
+91927a87-1a0a-4c63-a539-022e8267a688	1	Other	Other
+91931843-c192-42df-9719-5ec7a3420d57	1	Other	Other
+9193aa88-a4ee-4fae-8438-c02e09e0125e	1	Other	Other
+9193bfdf-58ba-410d-9b31-35162bcc4290	1	Other	Other
+9193fcec-b723-4334-9a59-51a542fd47d5	1	Other	Other
+91948bd2-340c-41f3-b19e-f5cc15a43210	1	Other	Other
+91948f94-8f17-436e-8fcb-1d24f69ef21c	1	Other	Other
+9194afaa-33e3-4c30-9558-67dfaecb3852	1	Other	Other
+9194b862-4346-4dc4-ac1a-9260b82ca918	1	Other	Other
+91955aa0-2ba1-4c15-9816-5fa97cf7ac8f	1	Other	Other
+91956e95-a91e-4a84-9de0-af372089a902	1	Other	Other
+91958e8d-4abe-4e0a-a214-48645fcfe12e	1	Other	Other
+91958ee6-e755-4506-b040-18edbcd05e19	1	Other	Other
+9195a33b-a0db-49b7-b2e4-1f8159199d0a	1	Other	Other
+9195d9a5-4dd9-4dee-9d12-28197d8e71e2	1	Other	Other
+9195e9db-6f84-4c66-ab5e-a4d3c73659fb	1	Other	Other
+91964c61-8264-455a-884b-0b70ca01e713	1	Other	Other
+9196665a-97be-4a87-b5ef-0fc5c73d8312	1	\N	Other
+919698b8-0a51-4dc9-9557-45a22278692f	1	\N	Other
+9196b7a9-6d34-4bc9-90b2-f21957f25e1f	1	Other	Other
+91971840-92af-48fd-85f8-228cd109f89b	1	James	Other
+91972326-3861-4de9-afa2-5a64aa36b46b	1	Other	Other
+9197505a-89b2-4bfb-9d46-78a745d2e1ac	1	\N	Other
+91976b8a-def2-4322-a4e1-d9b172ac9c00	1	Other	Other
+91979845-f868-495a-9b93-e2af8c66497a	1	\N	Other
+919798ca-add0-46f0-af54-148b31b7b0db	1	Other	Other
+9197b8fd-a0c8-4c0e-8e46-9c720445952a	1	Other	Other
+9197fa51-0e9e-4364-a283-cd34c7ff2283	1	Other	Other
+919833a0-d87c-4c7a-8306-07aeec5bebc3	1	Other	Other
+91984f2d-689c-4763-b7be-6dcbc8c20ffe	1	Other	Other
+9198ed0c-8782-4655-94df-f477c8f4109c	1	Other	Other
+91994999-d776-4ac9-8233-2f3ce4076e7a	1	Other	Other
+919964a3-f3fe-446d-8ec7-70b0d7a10138	1	Other	Other
+919976dc-90dd-4979-b810-74be1984c2e1	1	Other	Other
+9199ebcc-5d0e-4cf8-987e-58e0f7cbea71	1	Other	Other
+9199f26e-b807-4d62-897f-ec67ec6f858e	1	Other	Other
+919a3d84-9546-4ce6-8779-a81068d44d8d	1	Other	Other
+919a7458-213b-4c50-9d88-ae84f77c6418	1	Other	Other
+919a76ed-a245-4f9f-869f-8369003bf190	1	Other	Other
+919afe85-29d4-44e8-8f5e-af1eaadfa038	1	Other	Other
+919b3370-e3fd-49b6-9e09-a1a8edeae4d8	1	Other	Other
+919b4b8d-f103-4896-9faf-d42cafc0fb3b	1	Other	Other
+919b8c37-f6d6-4092-a6bb-f4d3fd33a188	1	\N	Other
+919bb2b1-1ad5-4e6d-987b-ec71c4e2189e	1	Other	Other
+919beeb5-abc2-44f7-a6f4-b74882cac779	1	Other	Other
+919c31de-e0c9-4df5-9b80-35a4cb91b4f3	1	Other	Other
+919c5bf5-4c14-4705-9416-cec5fe7b8b4b	1	\N	Other
+919c5eb2-b683-4736-bfa0-1ae39486de33	1	Other	Other
+919c64be-ddf3-4b51-8b33-1baad9956b59	1	Other	Other
+919c6600-8e82-41ba-be01-82a07e520bd1	1	Other	Other
+919c9fba-415b-4878-8448-992c2272f4c9	1	Other	Other
+919d944f-5dfb-4b66-822f-560ba4beaa67	1	Other	Other
+919da406-ba19-4e46-a3a4-7c24a1c7cc28	1	Other	Other
+919de17c-768c-4749-9336-e7fd6f2253a1	1	Other	Other
+919e8b44-e905-46d6-8e83-ba9505b2f6db	1	Other	Other
+919e979d-6aaa-4fb8-80e4-0174dad77e56	1	\N	Other
+919ef71d-00bf-4ace-8606-1239d8570d3a	1	Other	Other
+919f040f-baaa-4865-9c43-ca72eead9c83	1	Other	Other
+919f13be-63ee-4d8e-a446-da01d3f60147	1	Other	Other
+919f823a-b7d4-471b-80a6-91c94ad1addc	1	Other	Other
+919fd938-9241-4bf8-af33-5e7d545079aa	1	Other	Other
+919fe3cf-77fe-4a4a-a7f6-125555ddee6d	1	Other	Other
+91a053ac-6941-49c3-9274-939a041e2947	1	Other	Other
+91a05a77-762b-4e5f-8c99-20aeb704b9e4	1	Other	Other
+91a0b355-76fb-44ac-9c4f-1deca5a218b2	1	Other	Other
+91a0c6c9-2612-486e-af0f-86232625abca	1	Other	Other
+91a0ce9c-bea0-4fa4-992b-648475ea3c5e	1	Other	Other
+91a1163e-da84-44a5-bf61-9ba8439b713a	1	Other	Other
+91a13423-4646-4240-8784-13e32e7cd119	1	Other	Other
+91a18084-8159-4a71-acd0-161956390172	1	James	Other
+91a1da0a-b773-44f5-8363-7df29e70c3e6	1	Other	Other
+91a201d7-136f-4af3-aecb-e918ab89ee00	1	James	Other
+91a21c5a-4d25-4880-b792-70d7b397865f	1	Other	Other
+91a25503-40b5-43b9-8e73-f35a459e9b7e	1	Other	Other
+91a255b6-6c51-47a5-ab96-f0ca6d9bac6c	1	Other	Other
+91a26910-c732-4fb0-a0a8-d67a14bf9a8e	1	Other	Other
+91a2e3b9-0177-410b-95af-b1a17faba0c0	1	Other	Other
+91a350a7-2bd0-4f9f-a055-1aa8a1cb9099	1	Other	Other
+91a359c0-6dde-4b88-9815-8d20c780ddb4	1	Other	Other
+91a35e8f-f63b-4a0d-833b-45f08b46b0d7	1	Other	Other
+91a3bea7-adec-4ca1-b31b-a49ec28b9805	1	Other	Other
+91a433b8-333f-4efe-86fa-d43f396fcf02	1	Other	Other
+91a433dc-681a-438c-9279-5988323f3556	1	\N	Other
+91a44fab-d83c-44a6-9a25-6460d1ec8f4a	1	Other	Other
+91a454d2-a389-44c0-803c-8ff9b99d7257	1	Other	Other
+91a46938-aecc-4a87-b241-b8ee5393bf9e	1	Other	Other
+91a497e0-6427-4c8f-8eb7-cadb544c4636	1	Other	Other
+91a4bde4-7968-49e1-81ff-234ad98bdf8d	1	Other	Other
+91a4cf1e-2b75-43ff-a9f7-148281588953	1	Other	Other
+91a4f988-5009-4f27-a31e-f91aac305eb6	1	Other	Other
+91a5124e-80f0-45f5-b4d7-a8c23faff7bb	1	Other	Other
+91a54f18-a133-474b-a6ad-edc7001a1a6e	1	Other	Other
+91a5e2d9-5be2-47a3-9003-c47ea449fa63	1	Other	Other
+91a5fe4b-49bc-4afc-8f4d-503e2f101361	1	Other	Other
+91a601a3-30a1-4c53-ad46-f4313a51058d	1	Other	Other
+91a65392-a69f-4b12-a72b-bc586f6527ad	1	Other	Other
+91a6996a-961f-4ee2-961d-68f946b281a8	1	\N	Other
+91a7135a-ad53-4a52-b7be-467dbbba5f05	1	Other	Other
+91a716c8-6e19-415a-90dd-316edb77e7b6	1	Other	Other
+91a73301-f649-46be-b17c-4288b39ff396	1	Other	Other
+91a73d36-4cc0-440f-9fae-a12667facc26	1	Other	Other
+91a78fa9-d7e5-49d3-b943-3d385c8ae333	1	Other	Other
+91a7b1ee-486f-4234-93fa-e7e1066cf3cf	1	Other	Other
+91a82231-8c96-402d-84f1-a22b2309d80f	1	Other	Other
+91a88502-a1c0-40fb-94f8-f6ba42af5576	1	Other	Other
+91a88d78-59b8-4292-978b-e4682975477b	1	Other	Other
+91a8b5a6-fff8-4281-aed2-cb91578a467d	1	Other	Other
+91a8cd81-999c-462d-bbdf-839c254ae942	1	Other	Other
+91a8e161-f802-49e7-b848-6fdb57e78523	1	Other	Other
+91a91b78-798a-40bf-ac2c-0ee45a84a3f6	1	\N	Other
+91a94eeb-c234-402f-b07c-80c3e27d19c8	1	Other	Other
+91a985f1-f964-4c87-97c2-7cc12750b862	1	Other	Other
+91a9a5af-f819-451f-9cbb-1bb204a939c4	1	Other	Other
+91a9b917-981a-46f3-8bec-bcd8e2eef2a3	1	Other	Other
+91a9c166-f082-4ada-9f35-b2535f0f5089	1	Other	Other
+91a9c6a4-e158-4303-befe-db271775b469	1	Other	Other
+91a9caa2-fecc-4964-b6d5-1ab539f0d9d6	1	\N	Other
+91a9d85a-a52d-4e1b-8b9c-d4015aaf7024	1	Other	Other
+91a9dfe5-7823-4f65-b528-56698a8e1377	1	Other	Other
+91a9f739-4b49-4be8-8161-51483bfb28db	1	Other	Other
+91aa3a4d-bc4c-4988-9c5f-5039b5051d63	1	Other	Other
+91aa50f0-d923-4f8a-88fd-6eba18253d69	1	Other	Other
+91aa5d86-6262-4d73-a1d9-6cc3eb3c23c6	1	Other	Other
+91aa7aa3-3a68-478f-b25d-be69cf2956bf	1	Other	Other
+91aa86c4-4978-4229-8282-4a4ee8fef6b1	1	Other	Other
+91aa8e65-6a93-4958-bd0b-149311dab115	1	Other	Other
+91aaed97-6648-45ed-8aec-28e23e59bab1	1	Other	Other
+91aaee46-d194-4c1f-b8b3-4c67e108f365	1	Other	Other
+91ab06a3-bc46-40ed-9525-cc8c5da9ee90	1	Other	Other
+91ab0e3b-476b-41e4-bfe2-15dbac8dbbe9	1	Other	Other
+91ab4872-0a9c-4c6d-8b85-c8015770e172	1	Other	Other
+91ab590d-3303-4eb6-99a1-b1aae20124c8	1	Other	Other
+91ab5ee5-cda0-41fe-bdab-339176db38ca	1	Other	Other
+91ab9992-9dbf-4d87-91e2-513666f8ef00	1	Other	Other
+91abaf63-3493-4e41-b95b-139686eb16cc	1	Other	Other
+91abe250-692e-45a8-aad1-10e30d1d0378	1	Other	Other
+91abfccd-c40c-4f77-92ee-3a02e44fd26f	1	Other	Other
+91ac76b2-d743-4dc1-b81b-20eb65f695af	1	Other	Other
+91ac7714-3f0e-4d6a-a35a-c3cfd25881a4	1	Other	Other
+91ac9b3b-a653-461a-a7fe-2eeb6a8d58c2	1	Other	Other
+91acaba8-9300-4c90-b30a-7972d21a7114	1	Other	Other
+91acd832-21b1-4ab7-9dc8-06bab96a21b3	1	Other	Other
+91ad32d2-3cac-4e95-a3f6-56c3dcfca01a	1	Other	Other
+91ad855d-e00f-45f1-bf4c-6f217e5caa7e	1	Other	Other
+91ae17f8-0b58-4a03-a204-1ee5afce8e98	1	Other	Other
+91ae493a-cc99-4135-b0db-08c212d0e6bc	1	Other	Other
+91ae5b1c-430c-4922-a0f4-0a64534b469d	1	Other	Other
+91ae645a-8b6b-4892-90b2-8b7432b2ba27	1	Other	Other
+91aea2ed-ee7c-4f88-80a5-b68fc84fa277	1	Other	Other
+91aea87f-ae2c-49d2-b4e3-99278c97beca	1	Other	Other
+91aeb957-c44e-4ebb-a345-f4f7cf21b326	1	Other	Other
+91aeea72-91fd-4a18-ac2d-329b40897db9	1	Other	Other
+91af1c7c-3227-427b-a46e-13090b6f3499	1	Other	Other
+91af3989-188b-4c95-8eb3-f29260f3cc94	1	Other	Other
+91af431e-33ab-432a-a82c-b99bd726b81b	1	Other	Other
+91aff2ac-5079-4376-a543-0452a193143b	1	Other	Other
+91b0217d-5daa-4e3d-8a0f-86651e25b17a	1	Other	Other
+91b06edc-961e-4c7e-872d-565a171544ae	1	Other	Other
+91b07fd6-6688-4feb-be86-3753137ff044	1	Other	Other
+91b08a90-1ac7-44c9-9ea5-5146922891e4	1	Other	Other
+91b19d41-7259-4d2d-8aa8-2c21306a2243	1	Other	Other
+91b1c828-74c6-4319-bbc2-210116b480f2	1	Other	Other
+91b1da2f-ab9c-469d-b701-3344a33db806	1	Other	Other
+91b25867-83ce-48f6-8c1b-2f85f0eacb7f	1	Other	Other
+91b25e9f-144e-43bc-af1a-8482d478b932	1	Other	Other
+91b264f2-d86e-48c0-b9f9-8b8170fabfff	1	Other	Other
+91b29bc1-4345-4737-b685-532db2d19cc7	1	Other	Other
+91b2a3d4-1b16-4581-9d03-7fc9a4d88d70	1	Other	Other
+91b3194d-cd79-43bf-aba7-b26449ed31ba	1	Other	Other
+91b3502d-4ed8-4981-8b7a-103b0eaadc25	1	Other	Other
+91b3abe0-9023-4eb1-9feb-91ec2f6e7b29	1	Other	Other
+91b40589-9e0a-40e1-8cac-8e599443bdcd	1	Other	Other
+91b41af8-d9b1-426d-91fe-4cd0937f251b	1	Other	Other
+91b4682a-512c-4b44-bcd0-e056e948c4f8	1	Other	Other
+91b4955c-c9d9-45d4-9eb2-381112a9c343	1	Other	Other
+91b4ab7b-211f-4285-9c32-c303eec54384	1	Other	Other
+91b4afbe-9f3e-41c2-84d1-feb77fe3c97a	1	Other	Other
+91b4d969-16fb-4ead-9b0f-f56997e59681	1	Other	Other
+91b51794-86d8-4fde-ad4d-6c289c18dbce	1	\N	Other
+91b51b6f-93fc-4a85-b586-de7cae075db0	1	Other	Other
+91b529f9-8dc2-4e56-9bb1-c63dcc9fec42	1	Other	Other
+91b60d73-570a-40ca-833f-cf4d1b37ba84	1	Other	Other
+91b633d8-ff2b-4c8a-8ee3-9f994aa3c915	1	Other	Other
+91b63e6f-4f9e-4b01-b7f9-6342df135e33	1	Other	Other
+91b65ed2-d591-4bc8-a645-9f63acd54721	1	Other	Other
+91b681d6-1a2b-45dd-bc43-17636b1c956b	1	Other	Other
+91b6b007-f340-4716-afac-7830de842469	1	Other	Other
+91b6ecfc-3c91-4449-bc2b-f56dcf2347bb	1	Other	Other
+91b75f23-7286-4d4a-bcdf-19f723f499fc	1	Other	Other
+91b770cc-8a5a-4359-9990-d82c50f8a5ac	1	Other	Other
+91b7f018-6337-469f-86f3-7e7b504cf886	1	\N	Other
+91b7f28c-8f13-4990-9e64-b5834d34007a	1	Other	Other
+91b80014-c247-4a7f-a930-47e4e658eac2	1	Other	Other
+91b84101-3a6b-4fb5-b295-657ddf8a7b36	1	Other	Other
+91b871ad-86e0-4a03-905f-43271447677e	1	Other	Other
+91b87fb2-b127-4e4e-b505-c80313974afe	1	Other	Other
+91b88234-dff2-40ab-ba36-a98607d176bd	1	Other	Other
+91b91ab1-8c17-4b66-b14c-d36942d2f473	1	Other	Other
+91b97373-6b9d-475c-b41e-b04ff7058608	1	Other	Other
+91b9f433-1da7-4741-8795-7307a3164107	1	Other	Other
+91ba1009-18de-4d2b-acc0-3c5c22f90325	1	Other	Other
+91ba1ba5-7d86-4291-a4c7-6b5be1e956ff	1	Other	Other
+91ba1d53-0f56-4d40-a1c1-85306366a2f8	1	Other	Other
+91ba9073-04d9-4102-acd5-d54fa6118541	1	Other	Other
+91bafdf1-6df8-4618-977f-d7f7b7c91979	1	Other	Other
+91bb29a3-505c-43ff-873e-d1acfdf7ad56	1	Other	Other
+91bb2c19-1258-4d1b-b259-2cd629c7c40f	1	Other	Other
+91bb46a3-5e87-432f-9c59-b42af12babe5	1	Other	Other
+91bb6dc7-7540-47e3-a4a9-c83f65085312	1	Other	Other
+91bb8199-5e6f-47a1-9c93-f4fc4b20ed93	1	Other	Other
+91bb82d5-1505-41a5-b210-747b303395f1	1	Other	Other
+91bb9ff5-6abd-4e77-947e-a620ce8f2ffe	1	Other	Other
+91bbeeda-e2dd-422f-b4b8-bb56136bea1f	1	Other	Other
+91bc4168-37c9-4616-bf40-e780f247e95c	1	Other	Other
+91bc5495-5680-442a-aab1-1d0529077b57	1	Other	Other
+91bc6ca9-11db-4e2d-9532-2b4105fff0fd	1	Other	Other
+91bcb34f-aedb-410e-98b6-70dcdd9d9789	1	Other	Other
+91bccfed-c26d-4606-87af-d3c5f7f4df98	1	Other	Other
+91bcf4be-5292-43cb-a9f5-61e21b034410	1	Other	Other
+91bd05f6-5b1e-4cb7-84c7-9e6035daa097	1	Other	Other
+91bd6603-8a05-4b2f-9ee5-a3a445c5a376	1	Other	Other
+91bd6968-c827-42c3-8cc6-7a58e82efbcc	1	Other	Other
+91bd7527-de1e-49f8-8e8c-2aac796d36f4	1	Other	Other
+91bdd27c-7039-401e-bd77-664518bd6998	1	Other	Other
+91bdd83c-fec0-4563-9aff-dc00db17b1fd	1	\N	Other
+91bdeae2-48f8-4f16-9298-5bc1b1d4e089	1	Other	Other
+91bdf535-e220-4a16-9ebe-8134cdc48c7d	1	Other	Other
+91bdf77c-daa6-4885-877d-9015eb5294a4	1	Other	Other
+91be0ded-e469-4576-b9b6-3642866a080d	1	Other	Other
+91be2022-5891-432b-8117-d01dbdc21b4c	1	Other	Other
+91be6e14-8eb1-4021-975a-a871a609d975	1	Other	Other
+91be8a05-c898-4c1f-9aa0-61bef756d273	1	Other	Other
+91be8e46-d894-4821-9cab-9a0434109d9d	1	Other	Other
+91bec220-3c5b-4497-a19c-a050e6885b56	1	Other	Other
+91bec503-6b89-4258-a653-30a8a84f66fd	1	Other	Other
+91bee434-6942-49f0-8549-bf28b7948c6b	1	Other	Other
+91bfc696-77be-45fc-a4a4-843dc21e2d34	1	Other	Other
+91bff047-7ce4-4b44-885e-f06e80e83777	1	Other	Other
+91c07d61-6807-46b0-a55b-26a9aef63bec	1	Other	Other
+91c08905-9f76-4da4-ad1c-78dc2ea8430a	1	Other	Other
+91c090ed-5d5b-423a-b107-8529fc195d32	1	Other	Other
+91c0adfd-3709-4396-b7db-098b865de53c	1	Other	Other
+91c0d6eb-054b-49ac-af81-716ee4687860	1	Other	Other
+91c11596-2d74-442c-ae59-0a52c43d61b2	1	Other	Other
+91c126dc-a631-4962-988f-975c62db4cc0	1	Other	Other
+91c1500c-e77b-40b5-9041-c8f67dafbe6d	1	Other	Other
+91c1598e-500a-48a8-9087-6769ff5eb2be	1	Other	Other
+91c17706-900f-4d4d-b9ba-a435c74a247b	1	Other	Other
+91c1ad1a-4927-4783-ba4a-a34104229313	1	Other	Other
+91c1d378-c829-4cc9-b5dc-365e3316c2be	1	James	Other
+91c1f0ed-86e9-4338-8076-452c4e32ea60	1	Other	Other
+91c23796-2152-48ed-83d7-0dbb4a56c0d4	1	Other	Other
+91c24783-03e4-4f58-b817-db029420973f	1	Other	Other
+91c29b4d-f975-414f-b679-a917c46f0b41	1	Other	Other
+91c2b71f-a432-4b4f-9764-47daed652383	1	Other	Other
+91c30bed-4e9f-4e8b-ac71-124f61642d19	1	Other	Other
+91c33e1d-b2f7-4748-a4cc-00c382ff3cdb	1	\N	Other
+91c3581f-4c32-4603-9bb4-19b2d2e515cf	1	Other	Other
+91c36dec-f7e5-4938-8036-9a4b22663b1c	1	Other	Other
+91c3874a-cdbf-4763-beae-b8351aad418f	1	Other	Other
+91c43b8e-88a0-47e1-b606-ff0c91f810bf	1	Other	Other
+91c446c0-a5c3-4c9c-96c3-1d78acb73acd	1	Other	Other
+91c4cce1-6e42-4e41-874f-9bfe4b47abc5	1	Other	Other
+91c4dd30-8868-4fff-af9c-2820f1e96c18	1	Other	Other
+91c54853-753e-4ac5-820c-337de05a900d	1	Other	Other
+91c5559c-defa-4cf9-8d9b-76e705d19e39	1	Other	Other
+91c573f5-caa0-44e3-9661-e3fd095e7e88	1	Other	Other
+91c5910b-d519-47e3-bc80-f3aa7d1156a8	1	Other	Other
+91c59e5f-b5ff-413b-b6b4-0b65fe586b22	1	Other	Other
+91c5a8de-d238-4f7f-943a-fcf74cd7ad5f	1	\N	Other
+91c5d4f8-8a22-4db9-b5b6-5be9a5f1658b	1	Other	Other
+91c5d5f8-0983-4fd4-9fda-16f6c363119c	1	Other	Other
+91c5dd09-1d1f-4d75-b1b8-b51b4a9ccd2a	1	Other	Other
+91c5fba8-df5e-4f2f-809b-ffd5f3e95d16	1	Other	Other
+91c615f0-40fd-432c-b784-72af57237f6e	1	Other	Other
+91c62c81-bcb1-4723-bb8f-4b0de4be31d2	1	Other	Other
+91c63489-8842-418b-b6ac-f73fc0174aa8	1	\N	Other
+91c645ea-7d74-4334-919f-ce48785d2f3a	1	Other	Other
+91c69c1d-58a1-4a2b-8233-0185d771ccf9	1	Other	Other
+91c6cfd2-ea07-4724-9a99-7349cb09e364	1	Other	Other
+91c72a7d-7a4b-4d73-93e3-2332608780ee	1	Other	Other
+91c741cd-64e5-4460-829d-6f486d1d1089	1	Other	Other
+91c7622e-6de5-459c-b997-e004992b0055	1	Other	Other
+91c78912-26f2-46cf-91cd-1e490e91a464	1	Other	Other
+91c78eab-3574-46b1-9692-9ffb56e4401f	1	Other	Other
+91c7cf71-1f9c-47f4-adb3-be8570858659	1	Other	Other
+91c7ea88-cf12-43de-9446-20ea98fb02a7	1	Other	Other
+91c81667-eabe-4f2c-bff5-015465c04d97	1	Other	Other
+91c82d59-bfd8-4d8b-9b78-90165e569cc2	1	James	Other
+91c8540b-b97f-4212-b42c-0b32f727b223	1	Other	Other
+91c85f73-f3a2-411f-a511-8ef2b3910ef7	1	Other	Other
+91c8678e-bb15-49dc-89fe-172b6b98d79f	1	Other	Other
+91c89a6b-7266-4e07-8f61-1174d7003527	1	Other	Other
+91c8a522-a414-4160-ad90-3b61fadca235	1	Other	Other
+91c8cde4-b2fc-460b-ac28-ed6826ecfa23	1	Other	Other
+91c8fef5-411f-42ae-a52f-15e0b1b3784b	1	Other	Other
+91c9305a-385b-4c9c-a0a1-6e071d8cfbe5	1	Other	Other
+91c97582-7384-409d-b083-d61c023f4e18	1	Other	Other
+91c9c013-3f51-44e5-811e-f3c8b53425f2	1	Other	Other
+91c9c977-0c35-476c-a699-016c35d505db	1	Other	Other
+91c9f082-0eff-41aa-8018-6a630305f4d7	1	Other	Other
+91ca1576-f040-4222-a1e6-acca269666e1	1	Other	Other
+91ca1e2b-9241-4060-abd0-53b16137d596	1	Other	Other
+91cad9d5-9ec1-4f59-91a6-18264d66a4ed	1	Other	Other
+91cb2917-6c9d-4fa3-bbd4-55daaf82a51c	1	Other	Other
+91cb37f9-06fc-4e42-aabc-67a51174f210	1	Other	Other
+91cba031-14b8-42eb-84ee-7eb887662584	1	Other	Other
+91cbc1b6-36e7-465a-a06f-c74cc20720ad	1	Other	Other
+91cc13f3-0acb-4734-b4df-1204fdd2b96b	1	Other	Other
+91cc3196-668f-4228-9e0e-01c790a11eee	1	Other	Other
+91cc4226-8986-4ab7-8b87-1f90490dbe12	1	Other	Other
+91ccbe09-dc43-4df6-a315-dd28d46c4c8c	1	Other	Other
+91ccbe41-3133-4033-9f41-791354dff6c5	1	Other	Other
+91ccea0e-52b0-4b3d-be9f-ff187b05705d	1	Other	Other
+91cdb6ac-7eb6-4f22-9583-9df92bd64ace	1	Other	Other
+91ce7c9a-e01d-450c-8207-4dd3059c86bf	1	Other	Other
+91ce95e6-528b-41f6-9d2c-e8a7187d0863	1	Other	Other
+91ceb94e-d20b-41f7-ba7d-a2c46584203a	1	Other	Other
+91cf1104-e888-449f-81d4-ffa20486020b	1	Other	Other
+91cf483e-ed25-4fd2-84c9-180ecc35211f	1	Other	Other
+91cf6aca-b783-49c4-9412-08b7cee6ee6d	1	Other	Other
+91cf908a-c39a-4177-98cf-d84dea43f2d9	1	Other	Other
+91cfcde4-e705-40e6-b5b2-b54953461c23	1	Other	Other
+91cff2fb-0875-4128-bf48-f990b358d5c1	1	Other	Other
+91d0210a-4bd0-4dcd-9eb3-23abfcc518df	1	Other	Other
+91d02923-4b9c-408b-8da3-5339cd57a0ef	1	Other	Other
+91d07d62-6c44-4338-81c4-dc20f9d7c897	1	Other	Other
+91d08f03-feac-4af0-91c0-73e47a0a5c8b	1	Other	Other
+91d0a58e-53ef-4062-9e44-94fa71f35a83	1	Other	Other
+91d0a9d8-070f-47b6-8b2a-d53f5bd2d5d0	1	Other	Other
+91d0d396-aa2f-4736-b01c-ab6a09d30579	1	Other	Other
+91d13096-601c-4124-bcc5-d68b0ee27aa8	1	\N	Other
+91d15165-3c77-4834-89bd-8d487447ef1d	1	Other	Other
+91d15407-6396-4ed7-85b6-641ec8a1cd93	1	Other	Other
+91d17cbf-cb53-4c10-8dea-dd7fc721a0a2	1	Other	Other
+91d19312-5122-4f50-b492-2bf572b89063	1	Other	Other
+91d1cb12-7076-45c9-93d6-e6d65d29acf3	1	Other	Other
+91d1dea1-ace5-4486-86fb-863cff8276a8	1	Other	Other
+91d1fd38-8600-4fb7-ad68-d43888c9ae3a	1	Other	Other
+91d2494f-5667-4f1e-8627-3f2a3f3f095e	1	Other	Other
+91d25d43-7216-4d1d-9ef5-3e0f1932652c	1	Other	Other
+91d2907a-60aa-4f5f-aa12-ad731e1b9ed7	1	Other	Other
+91d29180-2f5a-4889-8943-19432008d047	1	Other	Other
+91d297a5-f35d-4730-9980-79db11afe1cd	1	Other	Other
+91d2c993-248f-4085-b9fb-fcabc6d3dd6c	1	Other	Other
+91d2cecc-f2ef-4211-a93f-cf99f23fd84e	1	Other	Other
+91d2da8f-f058-43ea-8e23-38245684249f	1	Other	Other
+91d2f829-869b-4a4a-a76c-11ceb1baaaa8	1	Other	Other
+91d312d5-2848-4517-ba8d-55cf2fc1fd20	1	Other	Other
+91d33d5f-4de8-4ca5-b3af-f96d93815b76	1	Other	Other
+91d37040-0250-4304-b505-74750125c8d3	1	Other	Other
+91d39527-face-4732-9132-d33b7f042a58	1	Other	Other
+91d39760-bfd3-4298-95eb-e7c85e2db34f	1	Other	Other
+91d3a70a-5abb-4a06-bd6f-bb038070f2bf	1	Other	Other
+91d40850-3961-4a02-a0a4-12ca5e193ceb	1	Other	Other
+91d42b6a-0cfc-4380-99c3-9702d5754ff7	1	Other	Other
+91d46953-1d83-4a16-a7b4-0781a20432ab	1	Other	Other
+91d470f6-8d05-4c28-9ff0-657449c20386	1	Other	Other
+91d4ae3e-4031-4c1d-841e-a2547c08db6c	1	Other	Other
+91d4b9ee-f75d-4ccb-ae14-5b59a6a858da	1	Other	Other
+91d4e04c-db21-4f2c-9692-42497db903d5	1	Other	Other
+91d4e185-940e-4f1a-9716-5f4fa1f03b0c	1	Other	Other
+91d4ebfa-653b-411e-983a-af6e5cd3c37b	1	Other	Other
+91d4f672-e857-41dc-8d05-fe0b3eef3de2	1	Other	Other
+91d50d48-b700-4bf1-99a7-bb36ef05971e	1	Other	Other
+91d58562-83d0-4b57-992a-15d66a03d92b	1	James	Other
+91d5b6c9-bfc3-479f-8bbb-80c4e3cbd384	1	Other	Other
+91d6022d-36fa-4db4-a438-15bda22cfcf6	1	Other	Other
+91d62330-a06e-4b69-af17-1735c2108c95	1	Other	Other
+91d62bd5-1516-499c-908d-ae15d4200724	1	Other	Other
+91d635d6-7cbe-4d54-866b-17bc275b0f49	1	Other	Other
+91d66a43-692d-49f1-bd08-da9742854be2	1	Other	Other
+91d6c7dc-dff1-45c7-9ef0-7d76c3da2ff5	1	Other	Other
+91d70ff5-87b4-4f66-8fc3-d5f5a53d589f	1	Other	Other
+91d76f80-a5d6-4859-aaa9-5ec86b09fc3a	1	Other	Other
+91d83f9e-c1c5-4a08-a87a-aa3440a51ef6	1	Other	Other
+91d88bef-a27d-4cf1-824d-e4650d386036	1	James	Other
+91d88e64-5a89-4bab-bf48-5461cc3a3a0d	1	Other	Other
+91d8c601-5bd4-42f7-8ff4-3bba62d0a134	1	Other	Other
+91d8d77f-ec4d-4012-88d8-fc056035c7ea	1	Other	Other
+91d8dd9f-e34e-441d-9fd2-7cfd7f63f08f	1	Other	Other
+91d919b5-a69f-4d00-bae0-8269a0e286a5	1	Other	Other
+91d936fa-4064-4d80-aaf0-d29c349c6b05	1	Other	Other
+91d98850-a6ff-4372-97f2-cf017bd6d107	1	James	Other
+91d9ae67-392f-4af2-84c0-31b65ce519a1	1	Other	Other
+91da66bd-b9d8-4f5b-99c7-cb90d0ea8fc8	1	Other	Other
+91da8e27-055c-4300-9286-d88e9ec4f9a3	1	Other	Other
+91da9ddb-dbfb-4aa2-a840-cd5e99f7ae17	1	Other	Other
+91db042a-8f4e-4b93-a54c-2868ab2cdd14	1	Other	Other
+91db1d84-a827-4634-9cc7-9fda4bd807c1	1	Other	Other
+91dc0f5e-2f5b-44e5-939c-23857e383e74	1	Other	Other
+91dc2222-49f2-4bf8-a9a1-729578ae2f7f	1	James	Other
+91dc2523-b85d-430f-97a1-9272d1949a78	1	Other	Other
+91dc4cc1-cdc3-4ce9-87d9-c5927cdbf7f5	1	Other	Other
+91dc8d9b-8761-43e2-bda1-96ca3c4a1017	1	Other	Other
+91dc93f2-a460-42f4-a12c-d5dcdf65a5b0	1	Other	Other
+91dcc3a4-4c3d-4cbc-8007-6eac19cf07ba	1	Other	Other
+91dcfdf7-cb91-4e64-808d-97550a29fad8	1	Other	Other
+91dd1138-49d2-466e-838c-1f0c9fc74584	1	Other	Other
+91dd15af-1908-4cd4-8bab-2ec9298f6413	1	Other	Other
+91dd3db8-cf84-4546-8877-9e482e39be02	1	Other	Other
+91dd55fc-d934-412b-b7a8-9ac8d8b6f2d9	1	Other	Other
+91dd8c20-0e10-4dab-8aa6-c4a8693dffea	1	Other	Other
+91de2d94-5d9e-4f13-839f-11139164d803	1	Other	Other
+91de5fd9-66a5-4149-b1e6-895bd4e63c6c	1	Other	Other
+91de96a1-b407-46c0-859d-93fc46c493de	1	\N	Other
+91def42d-a5cb-45a1-9f0b-e097ecbbc1ed	1	Other	Other
+91df0afc-57f0-4b55-8057-1566e83c4085	1	Other	Other
+91df26c5-53d5-44bc-9e75-f406850bcc29	1	Other	Other
+91df463f-351a-4eef-97ae-97573dc3bf93	1	Other	Other
+91df8def-d86d-458b-b7d3-4b57563eee9d	1	Other	Other
+91df9b8e-aed9-4f44-a3ed-11ee728f8166	1	Other	Other
+91dfb64c-b359-422b-8d7d-b34a25f6a043	1	Other	Other
+91e04e08-d276-4b19-a76a-68d0ba717179	1	Other	Other
+91e0578d-1b35-4372-bfb7-55c475fd0d06	1	Other	Other
+91e05b7d-e3f0-4155-a853-b418cabf790a	1	Other	Other
+91e0cf0f-8634-438f-9f67-bad716cbaf30	1	Other	Other
+91e0dcb1-2606-4f02-b6f2-271823aa337f	1	Other	Other
+91e1160f-541e-4715-9709-2a9e5fc5be9a	1	Other	Other
+91e17649-a627-402f-8a24-85549873cd68	1	Other	Other
+91e1bd20-682e-4c42-aa6b-4ee1e77bec95	1	Other	Other
+91e1d640-7ac4-459f-bcc7-a7ac94652152	1	Other	Other
+91e21ed0-e6ce-42cb-b394-10fb1c9a105c	1	Other	Other
+91e223fb-21d0-420e-b58b-2882c6b15152	1	Other	Other
+91e29224-aad8-46dc-b5cd-9b74fc7f808a	1	Other	Other
+91e2d014-0b91-4e0b-a5b5-b4cfd96bd573	1	Other	Other
+91e2e369-f6cc-4721-9488-e2213e45dfd8	1	Other	Other
+91e3121f-a126-47b3-bf5f-4e64ac5cea7f	1	Other	Other
+91e3537a-b8e5-47a5-9f4d-c0cf05fffe28	1	Other	Other
+91e3aa6c-72fc-4de6-85fb-031fcbb1f445	1	Other	Other
+91e3b7cb-90a7-43c3-a1af-085f16e3acf2	1	Other	Other
+91e3bd83-f024-4976-8f83-136e48324b58	1	Other	Other
+91e43517-d472-460c-b51a-eed6f2414860	1	Other	Other
+91e44354-01b6-4e37-96c4-bb32f8cc11a9	1	Other	Other
+91e474b2-447a-4fbe-9223-2884ac444489	1	Other	Other
+91e47bea-1f4e-437d-957c-00786a5bbbba	1	James	Other
+91e4c1f4-7a38-44f0-92ff-a6da4a4b894f	1	Other	Other
+91e4ebfc-1359-4e05-a5a4-6b4f6dea0662	1	James	Other
+91e55bff-0c6f-4c7c-925c-0c600e1f3fc4	1	Other	Other
+91e56462-3bc8-42f8-9ad1-fde4ce3836e3	1	Other	Other
+91e5715b-db6a-4931-836f-3967c9f13bf3	1	Other	Other
+91e5c29d-d35b-4c6e-888e-49d38ec8a682	1	Other	Other
+91e5cfc9-b92d-4607-9939-995114ac0e89	1	Other	Other
+91e61bc9-bed9-4285-b941-fb6be9ac2b7b	1	Other	Other
+91e66c48-6a96-4ee9-9205-8cbf9088ac16	1	Other	Other
+91e6750d-c1db-4615-b4cb-4fa8b1a587a8	1	Other	Other
+91e67958-9206-47b5-9af9-61b3c0384126	1	Other	Other
+91e67b09-f9ba-4cd2-b961-96024116791b	1	Other	Other
+91e76335-d498-44ec-ae39-0800bc3eb657	1	Other	Other
+91e76642-c679-4b0b-b078-901d6aaaad61	1	Other	Other
+91e771fe-9a1c-4773-bb8e-8615d3825252	1	Other	Other
+91e7a1c8-4e68-4ba7-bf22-8c47aee6e5de	1	Other	Other
+91e7cf99-10b2-402f-90dc-907b212ce523	1	Other	Other
+91e7d520-d01e-4094-aeee-5a3225870359	1	Other	Other
+91e7f5eb-ade5-487d-9902-522e4a4f9a9b	1	Other	Other
+91e898d7-57f0-42d2-8665-d19a4e537259	1	Other	Other
+91e89f1e-aab1-46d8-8569-305bf534addb	1	Other	Other
+91e8bbf9-7e8a-4738-bf50-48fd0e5a4b20	1	Other	Other
+91e8d666-efb7-4f5b-9e12-df2541b93162	1	Other	Other
+91e8e00a-2c79-4437-b05d-55ac59db9c18	1	Other	Other
+91e8ebcc-fa62-4d08-ae7f-16ec94af1d57	1	Other	Other
+91e8fbc7-9abe-4489-8c2d-bf8a73956098	1	Other	Other
+91e905b1-f4d0-4387-a16c-12771b4348a6	1	Other	Other
+91e923ee-2f96-408d-acbc-2133df96a774	1	Other	Other
+91e92461-24f8-49ff-b8d7-d1a55e4778cd	1	Other	Other
+91e92ac2-cd5e-42a4-aca9-2a371a0ee70e	1	Other	Other
+91e9444f-1661-40f6-b897-07de37924a18	1	Other	Other
+91e99e9b-b84c-41b7-b82d-d669dab6b93d	1	Other	Other
+91e9cd0d-11b2-44fd-bb54-5082cb59d22a	1	Other	Other
+91e9d165-d0c2-4d02-9491-380b253508db	1	Other	Other
+91e9d6ff-3030-4fb1-9bc0-34a66e8e3b91	1	Other	Other
+91ea2e6b-9b72-48e6-9328-0a8ef5d4d53f	1	Other	Other
+91ea3e6e-2fc6-4a2e-9aa2-eda938b0aa94	1	Other	Other
+91ea6bb2-8fd9-40b7-9e23-8d78ec7a297d	1	Other	Other
+91ea6bf6-2bb4-4e41-a715-d5eaadf2798c	1	Other	Other
+91ea6f14-2319-4f07-bff9-2a75587315f7	1	\N	Other
+91ea973f-6490-4d64-be03-2003b9d1c5b7	1	James	Other
+91eab0cf-5db8-47d4-b4d0-57c9d9d99a87	1	Other	Other
+91eabc3c-ec2f-4801-9888-f36d37918484	1	Other	Other
+91eadfe3-d9b0-46bd-abed-2700d2e63993	1	Other	Other
+91eaefda-3883-4744-9b96-334ce1c99258	1	Other	Other
+91eb3d69-78e9-427d-9882-47d9d793d142	1	Other	Other
+91eb40d2-8cb0-4316-a5c0-45a9c5e62657	1	Other	Other
+91eb6916-5006-4401-9219-ce44a3e3d51a	1	Other	Other
+91eb8498-ce22-4600-a997-c30207f0a66c	1	Other	Other
+91ebc3d5-7be4-4ac3-b7aa-1f1e90265bf1	1	Other	Other
+91ec2c05-3a54-4d0b-b694-6f57615bd4b4	1	Other	Other
+91ec603f-3847-4b09-9f7b-992a977d99eb	1	Other	Other
+91ec90c6-9678-4865-801d-bdf57346e963	1	Other	Other
+91ec9a21-cfe7-4555-bdce-74ef1d2fefc0	1	Other	Other
+91ece1a1-72a8-497a-a051-16f01b28591b	1	Other	Other
+91ecfc46-a3b5-43ad-bcd3-8950bc87bd9c	1	Other	Other
+91ed0441-9fa0-44a3-a80b-03e20af4bc9f	1	Other	Other
+91ed247f-5595-4962-b99a-8da323d6db33	1	Other	Other
+91ed28da-6571-4a3b-9cdb-ac1b7642a8c7	1	Other	Other
+91ed3b0c-3ac4-45f2-8dd3-0a2b48d6b905	1	Other	Other
+91ed4c33-2ffa-45cd-8a11-28d255b13ede	1	Other	Other
+91ed5727-d827-44d9-9a83-6e5c805dd41c	1	Other	Other
+91ed5760-0ca9-493b-bfc9-08e41a29feee	1	Other	Other
+91edca6f-9335-4fbd-9753-c285cc3073cc	1	Other	Other
+91edd83b-6fcd-4f71-b8a4-2f74d738d074	1	Other	Other
+91eddd21-fe70-4cc3-8671-437a2ec8243a	1	Other	Other
+91edf3d8-3e6e-493e-afba-f37882f8fbc1	1	Other	Other
+91ee1af8-ad97-4c3f-8bc4-3218cba1db65	1	Other	Other
+91ee476d-e7d9-46ce-9b28-a988bb4798ba	1	Other	Other
+91ee8094-7ffa-43f4-8686-3443039a07bd	1	Other	Other
+91eece5c-d53a-4567-b137-b43f41cc05b8	1	Other	Other
+91eeef26-af27-4375-bd9c-c34eb5b4d3e0	1	\N	Other
+91ef0ddf-8d16-44ba-9fe4-3f137c58cac8	1	Other	Other
+91ef2615-c93f-4f96-9e5f-bb9eda0e4b53	1	Other	Other
+91ef35a3-748d-45c3-a276-ce1819ba69c2	1	Other	Other
+91ef41b1-a9fc-4b14-8ee8-cb4c14a4e3db	1	Other	Other
+91ef9c9e-d2f9-4af0-b54c-c0aa5faeb64d	1	Other	Other
+91efb572-7afa-4ec5-9a5a-ecb4f09c01a9	1	Other	Other
+91efbd6d-7f58-4e21-96cf-8c0edf8ff76c	1	Other	Other
+91f00b40-f68c-47f8-b47f-48aff5d01588	1	Other	Other
+91f02da4-344a-420e-baba-edd829e8e63c	1	Other	Other
+91f038af-62f1-43e4-aacf-9322ee058678	1	Other	Other
+91f08357-24f9-4c5e-9e94-b56bbb69bb49	1	Other	Other
+91f0846d-a8a2-45c0-82b1-ba23658cd631	1	Other	Other
+91f092e4-55b3-40f3-9770-a6017ebf6b80	1	Other	Other
+91f099a3-b6c0-454b-a167-5a3b3faf731d	1	Other	Other
+91f0c871-68cf-4b04-82c5-3ef9c80d1c3b	1	Other	Other
+91f123a4-5d91-41e5-8ea2-6ad103ab627b	1	Other	Other
+91f14de1-45f4-433b-b4c8-0059c01080a4	1	Other	Other
+91f22290-ae94-41d5-9eb2-8b4b02c35705	1	Other	Other
+91f24514-196e-4801-8a08-27004db126b3	1	Other	Other
+91f2537d-ef01-4350-8c0a-52c5b1e15608	1	Other	Other
+91f2cb4b-53e5-44d5-a200-f50b9dafa895	1	Other	Other
+91f2da32-3426-448d-aa04-0177bc5751e5	1	Other	Other
+91f2e8b2-52b6-4271-a796-ad8e7911cc23	1	Other	Other
+91f323e8-a5ab-4c72-8515-4c75dbea899a	1	Other	Other
+91f3c6a9-cc31-4389-a655-1312423b5ffa	1	Other	Other
+91f3d4cb-0763-40ec-9716-4a8a8d093602	1	Other	Other
+91f3d5cb-ff3e-4f32-9a3c-6f4c98aedc2e	1	Other	Other
+91f3f5de-2e3e-4507-8afe-946056b969ea	1	Other	Other
+91f400ca-bad7-43b3-bf2d-7a8411ec6449	1	Other	Other
+91f4128f-831b-486c-bc96-87f13170d76a	1	Other	Other
+91f441ba-3222-4c2a-8c18-86f1e0032d69	1	Other	Other
+91f4e647-3fd3-4d35-81d5-1bccad92edf3	1	Other	Other
+91f4f06d-8a9a-4493-b838-d09f037cc33f	1	Other	Other
+91f4f38b-358b-4d0e-9a44-0ec1ef682f80	1	Other	Other
+91f5104a-b702-4d89-9a90-480806a2b72d	1	Other	Other
+91f52b99-5035-4711-9233-843eb49b7bc7	1	James	Other
+91f54de4-57be-4e40-9ea2-b0900dfc1e65	1	Other	Other
+91f59740-ab5b-4a5f-a847-8b6bc294e743	1	Other	Other
+91f5b136-8905-4514-a4be-b8c611972639	1	Other	Other
+91f5b482-4382-4a50-933a-73c686acd243	1	Other	Other
+91f5b740-395b-4c26-8f82-cf20cd6bab62	1	Other	Other
+91f5eb14-95e4-4603-8876-b4cb7a1f1753	1	Other	Other
+91f5f957-bcc7-4e39-89d4-efa8594c96f1	1	Other	Other
+91f5f9d2-6034-4a8d-bbec-9ae518c3cee4	1	Other	Other
+91f6458f-d1c8-475c-8db6-ef5ad2d58c88	1	Other	Other
+91f653a8-cafd-4865-a44f-95223d12a173	1	Other	Other
+91f68850-a16f-469d-adea-d81d1883becb	1	Other	Other
+91f69b4e-3ecf-4bce-b5d5-f82fd83e06c9	1	Other	Other
+91f6b6a5-35f1-44ae-ae6d-dbc5f9c42564	1	Other	Other
+91f6cdb8-a217-4ede-bdbd-23b8ab546651	1	Other	Other
+91f75858-e937-430f-8ba7-887f1085a4b2	1	Other	Other
+91f7a327-186f-4f15-b978-8ed71885eead	1	Other	Other
+91f80a47-c6c6-4480-b402-f024971e02a0	1	Other	Other
+91f870ce-7fc4-48d3-bd47-d6e56e050c3c	1	Other	Other
+91f8819d-9757-481c-a94c-e30579d85058	1	Other	Other
+91f930a9-8f10-4b4c-bfe9-14b342c5821a	1	Other	Other
+91f9646f-a5ba-4099-807a-24c2238cef25	1	Other	Other
+91f96ed8-2bfc-41e9-80db-84067cbb292d	1	Other	Other
+91f98e21-8109-49ae-901c-95b3ba861527	1	Other	Other
+91f9b1fa-a1b5-4b63-b50d-9d49dc4162c8	1	Other	Other
+91f9b42b-8ed7-41b7-80bb-9612fba187d2	1	Other	Other
+91f9dd82-120e-44a5-8fb2-a19d2210d897	1	Other	Other
+91fa0cb0-04bc-40cc-8290-d5cb4afdea59	1	Other	Other
+91fa1fc2-ba64-4ae5-9281-6f8a814ababf	1	Other	Other
+91fa5973-bce0-4d58-b15a-405f48899ac8	1	Other	Other
+91fa80b0-bab1-4b64-8b1f-5ae411e96ad0	1	Other	Other
+91facf1e-e141-4b5a-bc8f-6029e2267039	1	Other	Other
+91faf4ee-ea0d-4ef2-9ffa-6aaa900bd2ab	1	Other	Other
+91fb0c7f-cdb9-4076-9951-f3c78f0c8c7c	1	Other	Other
+91fb0d9b-46d6-416e-a93e-6030ef0142bc	1	\N	Other
+91fb17c6-88ed-475a-b0ce-efd5684bfbed	1	Other	Other
+91fb1b5f-d0b4-4f2f-9387-bc4f6826085f	1	Other	Other
+91fb3d0f-6d7e-4087-8a17-735bf3c6b0c5	1	Other	Other
+91fb4ba0-13f9-4db0-9a78-b1a68750aaeb	1	Other	Other
+91fbbfc6-a031-48fc-8570-fa1eaed6922e	1	Other	Other
+91fc110d-f0f4-4621-bec6-6eac439fd61d	1	\N	Other
+91fcb012-6cd9-41c7-97a1-ef929ef9ee67	1	Other	Other
+91fd0879-e30f-4962-820b-547b01540c80	1	Other	Other
+91fdac90-dd63-4245-80fc-567a4bb788fb	1	Other	Other
+91fdeba2-c927-4a91-853d-d88c48de5476	1	Other	Other
+91fe3574-d5b9-47aa-afc3-92a86e7a8249	1	Other	Other
+91fe4f95-d63c-4b78-a7fe-b16149632b2c	1	Other	Other
+91fe7c57-c1be-4178-bdf7-225191b3765c	1	Other	Other
+91ff08c7-b377-466b-9403-82edbc1bbc6a	1	Other	Other
+91ff3516-2473-4e6d-aa74-d93c69aeafa7	1	Other	Other
+91ff83d2-8186-4d0c-ad79-bd2a13ef3fa7	1	Other	Other
+91ffde35-0070-4729-b59c-270f336c6bab	1	Other	Other
+91ffe3ea-5231-45e9-bc20-07011743520d	1	\N	Other
+920020a7-77ea-4140-8e43-6b0ad9ae3b19	1	Other	Other
+9200717c-44dd-4779-95b7-b3b5a67b5dfc	1	Other	Other
+920073a9-7577-42e0-bb67-aafe1facfce1	1	Other	Other
+920074c9-c8a6-4008-9068-082823936d3b	1	Other	Other
+9200a58b-0522-47ad-b4aa-eeae40bba7f3	1	Other	Other
+9201431d-ee23-4446-b3b1-9c0e1004d9f8	1	Other	Other
+9201bfba-7a9e-4f75-84bf-f30641107335	1	Other	Other
+9201e034-5997-46ab-a82e-f034e4244c3e	1	Other	Other
+9201f727-ce01-49ce-bc45-0f0b52524534	1	Other	Other
+9201f9d5-6e01-49b1-9455-247beb3f4a79	1	Other	Other
+9201ff62-24d4-49e7-9676-811803bcd86c	1	Other	Other
+92021e73-092f-492f-b3c9-b6498783c75a	1	Other	Other
+920253bc-f922-4460-a866-58ed4d1598a9	1	Other	Other
+92025d8c-24dc-466b-91b3-19defaf5644b	1	Other	Other
+92028454-2594-4364-ae56-6b873e07e99c	1	Other	Other
+9202b593-69f7-46a8-9993-c070dca31ca3	1	Other	Other
+9202e2d0-0973-4786-822e-14b226bd2548	1	Other	Other
+92030248-85ce-426a-b663-b215edd9b308	1	Other	Other
+920324be-90dd-4d2f-816c-62a383cc8228	1	Other	Other
+9203963a-a13c-43ae-a15d-e78f8aeeb931	1	Other	Other
+92039ac0-cae4-4cd8-81d6-e554f3479baa	1	Other	Other
+92039f8b-aa96-4195-85b4-5159cc7ecc21	1	Other	Other
+9203ed1c-a0b2-4518-923b-d2bf9d35cb32	1	\N	Other
+920426bf-d2f9-4131-a0c6-ff733e6e4fab	1	Other	Other
+92043460-e35b-43cd-982c-59d4aab2ab3c	1	Other	Other
+92043bc8-2b75-4db2-aa4e-bc016a323623	1	Other	Other
+9204620b-ce71-4f24-90f2-0cc781525455	1	Other	Other
+9204682e-7b08-41c7-96fe-f4cae529b9b8	1	Other	Other
+920474fc-6639-4eba-b12f-f4e258695659	1	Other	Other
+92047ee7-9828-4c5c-a503-82fb6d366ed8	1	James	Other
+920488d0-7783-4275-840b-42390c439ac6	1	Other	Other
+92048b55-8821-4255-90c2-50a78923f77a	1	Other	Other
+920547ac-b85c-487f-9611-c1b718d02665	1	Other	Other
+9205a709-b466-4e5b-bde8-9534b0a8a5dc	1	Other	Other
+9205ca12-eedb-4546-ab98-177321040015	1	Other	Other
+9205d90a-7a43-4c03-ae08-6d827ed2d27d	1	Other	Other
+9205daa0-6685-4f2e-9dc8-8b333a5102e3	1	Other	Other
+9205e7ef-c87e-4a15-b0c3-5e92236e7b97	1	Other	Other
+9206360b-c647-486a-a330-5c7d0a43fc56	1	Other	Other
+92067800-16e2-41b8-812f-5c924e7a0dbd	1	Other	Other
+92067b21-2501-4611-8442-89665f2d79fd	1	Other	Other
+92068fd7-f065-489e-919a-ec860d09a314	1	Other	Other
+9206ba80-88b0-443e-9779-75eeeb9c3881	1	Other	Other
+9206e215-c578-45e7-bc57-73eb7da9f612	1	Other	Other
+9206f30c-faa8-46b6-b55e-fbe5c256603e	1	Other	Other
+92071b35-4fe4-4ccb-b161-67a00fad7f8b	1	Other	Other
+9207667e-7431-45a7-a10f-2b96170b3e22	1	Other	Other
+9207bdf9-35d1-49fa-9df1-5448bd4e9077	1	Other	Other
+920861b9-50b4-4890-b31c-4a156196dd77	1	Other	Other
+92088f3c-70aa-4c5b-a878-09c96c88b82e	1	Other	Other
+9208a165-2765-49bb-891c-2a3a1bd13735	1	Other	Other
+9208a6c9-c20b-43af-a990-34ad27cf870e	1	Other	Other
+920911ec-1158-4bb2-9d48-10048e1bec9e	1	Other	Other
+9209af05-2631-440d-90a2-88534d9b4e1e	1	Other	Other
+920a1984-72dc-4fb7-b168-5d7c6934e8d3	1	Other	Other
+920a30a3-5ad2-454d-9607-731542c82b31	1	Other	Other
+920a32d3-4fe2-433f-a0b7-36dd8c1ae249	1	Other	Other
+920a5e83-f754-4d2c-bde7-bffad7a78975	1	Other	Other
+920a60e2-89f6-43bf-8453-09a982aff929	1	Other	Other
+920ada5e-4e02-4adf-b296-5a192a9dc043	1	Other	Other
+920ae686-cd7a-44bf-b9b5-e6d2eca0fc2f	1	Other	Other
+920aeb78-bba5-49ab-8858-d33805460804	1	Other	Other
+920b2ab4-02b0-4fc3-93ba-16822a2cf954	1	Other	Other
+920b6ab2-7f4c-4bd4-8ba4-776b5ef41431	1	Other	Other
+920b7484-af6b-4984-847c-5b96df0e3e0c	1	Other	Other
+920b7b3c-085e-47db-ac3c-4a7ae6718758	1	Other	Other
+920baaff-988b-4d76-af08-f9847dcaafe1	1	Other	Other
+920bbfbf-8c6c-46a9-aacb-00a708406b63	1	Other	Other
+920c0c29-66bf-4720-8d4e-b1127c4fe42f	1	Other	Other
+920c43fd-0bc9-405d-814f-6b81dafc7625	1	Other	Other
+920c6271-f7c7-40fb-9a71-63a19a9146b0	1	Other	Other
+920c77d7-d1ac-4b3d-90c5-14f2a76113b5	1	Other	Other
+920cd419-7ef8-4b66-8c94-06e632f8ae59	1	Other	Other
+920d115a-6cc0-48ab-807d-3efad637d197	1	Other	Other
+920d3153-732c-484e-bf02-4ba7e7fe060d	1	Other	Other
+920d96db-c37d-40e8-b744-ea7b54577c90	1	Other	Other
+920dbf95-c8cc-4797-a76d-01ea63572ba4	1	Other	Other
+920e2853-7260-412c-9703-4a261659654e	1	Other	Other
+920ef3b7-9ddb-473c-9017-8a3c8011a9ac	1	Other	Other
+920ef417-be2e-478b-a44f-64ab6aa10f2e	1	Other	Other
+920f4201-0b6f-4801-9868-6b7be09f5452	1	Other	Other
+920fb78f-bb78-4110-a87f-aea6468c1bc7	1	James	Other
+920fe6a0-1cd7-407b-abcb-fe02b5d3e878	1	Other	Other
+92101b29-880f-4eab-87ce-6c8e7f9f7263	1	Other	Other
+9210a07a-d8e3-4f0c-91b8-06977a8ca194	1	Other	Other
+9210c3b9-5c66-4b8b-96e5-206a33446858	1	Other	Other
+92110cb1-9661-45ed-a60d-649ed4db68f4	1	Other	Other
+92111cf8-bfb1-43eb-a217-23b76ca3a02d	1	Other	Other
+921144f8-d3bb-44cb-bb93-3f4952d32340	1	Other	Other
+9211556e-b226-446c-9a13-0b37fe1a9b2e	1	James	Other
+9211837c-cc21-4b10-925f-1b06d921f8b4	1	Other	Other
+92118606-da05-4564-a827-c088420055c1	1	Other	Other
+9211d61a-89cf-427c-89d0-79d9316d5a79	1	Other	Other
+92120c63-246a-46c4-8214-3ee4c658921e	1	Other	Other
+92126782-b44b-4e7f-adee-33129712efdd	1	Other	Other
+9212c853-afce-46c9-b997-24b2324088e9	1	Other	Other
+92131779-4b11-42d3-9b26-ab17e9447d43	1	Other	Other
+9213378c-62ca-4f84-9717-0fed5ed49425	1	Other	Other
+921367fb-d828-4c2c-b589-39aa357f9442	1	Other	Other
+9213889f-030e-4e31-aeeb-8f5ba13bc315	1	Other	Other
+9213c697-d9d8-44c0-b275-6c49f0fcc751	1	Other	Other
+9214131c-d3b5-4371-a98b-6cf5cf0b5b2a	1	James	Other
+921420eb-57ef-4335-8c32-ac14191ab3f0	1	Other	Other
+9214594d-e9d3-45fe-a1eb-061ade718906	1	Other	Other
+92147966-f4a3-4670-b81f-ec23dec8fd4f	1	Other	Other
+92148659-75b7-4a48-a498-604a40e36dd8	1	Other	Other
+9214b6ba-ad3e-4e37-a92c-e9bd3adcafce	1	Other	Other
+9214bf23-e52e-476a-a776-bc0d83a0778d	1	Other	Other
+9214d161-1212-4261-9496-3f2e6a222493	1	Other	Other
+9214ede8-0309-4a7a-b3f5-9f2f950cb688	1	Other	Other
+92150367-9a90-4e46-971f-e99c2711e2bf	1	Other	Other
+92156582-5ae8-45b7-a619-92d99a19bef6	1	Other	Other
+92157bd8-4d6d-4c6b-ad6a-1cb68005ded2	1	Other	Other
+9215bf47-7cfc-4e4e-8fb8-147e0b7a05ac	1	Other	Other
+9215bfe4-2334-4eb1-a3ca-4f7e919b5171	1	Other	Other
+92162a41-6634-4aa8-a3b6-1b4b0001665e	1	Other	Other
+92162f06-103e-470d-9891-92d69e3489cf	1	Other	Other
+92163bfa-802a-4c8c-81d5-ea280a6dc270	1	Other	Other
+921641c2-8641-4e3a-9ade-2ddcf3037393	1	Other	Other
+92165033-41d2-4ba1-b8c9-2d21c42c38f7	1	Other	Other
+9216815e-9511-481e-a8cd-743de05b3221	1	Other	Other
+9216ab52-d623-4fda-b1f1-7ceb0a0afc51	1	Other	Other
+9216bd14-cfbc-4370-9b77-f82e881a836e	1	Other	Other
+9216c5a5-9365-4f53-95f2-e69b589938f1	1	Other	Other
+9216f4d8-9d0c-484e-a73b-46ab30597999	1	Other	Other
+92170b45-0b52-4829-b161-1d354f2b43b4	1	Other	Other
+92170f28-00e9-46ff-8be9-1ccb62d7f5ec	1	Other	Other
+92172f82-216e-4586-81b8-0785c45fc9de	1	Other	Other
+9217319b-a3f5-4756-a0e4-7f5b409a91f7	1	Other	Other
+92175927-451e-48ad-8135-04f917429dbf	1	Other	Other
+92178ed6-28a4-4cea-8821-ac87b7f98edd	1	Other	Other
+9217b26a-520e-4c32-bebb-516612b91a3d	1	Other	Other
+9217b83f-3081-469e-9dee-e16255bcd3ee	1	\N	Other
+9217ce3e-a022-449a-9e4b-e8850dd78e87	1	\N	Other
+9217d6ad-938c-4f89-b4ba-1bc94695005b	1	Other	Other
+9217e518-8dac-46d9-b977-ef82db6d4fc2	1	Other	Other
+92183f66-257c-4179-a8d3-76df56973377	1	Other	Other
+92184b80-eed8-43cd-8053-1c3fe5ffc7da	1	Other	Other
+92186695-17bb-40a1-ab09-411b8707c05e	1	Other	Other
+921896e7-6275-4dee-b81c-92f28eb1d350	1	Other	Other
+9218a31d-2d91-4322-b517-37a9c1c132b2	1	Other	Other
+9218c7a3-8c81-4693-b59b-eb584292ac5e	1	Other	Other
+9218dcda-6472-4b8d-8f23-8c7f0a23475c	1	James	Other
+92190994-eeda-41a9-adbb-b9df8b7f3eaa	1	Other	Other
+92194f55-9614-4193-b0f8-37972853ed75	1	Other	Other
+9219d6fa-fedb-4f87-bd4d-31dfbd7bfa97	1	Other	Other
+921a2f07-2f17-4c11-857c-f7416bb65967	1	Other	Other
+921a5144-79f2-4e32-a7fd-a62c25b672bc	1	Other	Other
+921a88ec-fff4-4bf4-a187-f5a8a8991082	1	Other	Other
+921a9533-8a9c-454c-84b0-c75dffbc7a20	1	Other	Other
+921aa8be-3e94-457d-994a-f5053fd005e8	1	James	Other
+921b06a3-d50c-495d-89d8-dd1d37922473	1	Other	Other
+921b0e6a-9a92-4bfa-932a-9679dc5472b7	1	Other	Other
+921b4bc4-c267-42e6-8147-83c91c453408	1	\N	Other
+921b84aa-88fb-4f11-b3c5-ae9f40299732	1	Other	Other
+921b9ba4-425e-4ec5-bc72-a6764a18b123	1	Other	Other
+921b9ff2-2952-4672-beb0-b686c312b2ab	1	Other	Other
+921c3957-b71b-4c8e-9175-3157a9e8138f	1	Other	Other
+921c4375-025c-4392-91ae-2579151e6ace	1	Other	Other
+921c4efd-43c8-4b12-804e-1c2a2594e524	1	Other	Other
+921c6cb2-49fb-4b9b-875c-2af85a14d5aa	1	Other	Other
+921c705d-1a68-4bf9-994b-584d101d1f18	1	Other	Other
+921c8f1d-0f70-4f92-97e3-79c74b1b0dd9	1	Other	Other
+921ca55a-7d86-49ec-9baa-e51c845169f1	1	Other	Other
+921cf1b9-4524-416b-b8fd-f7fde4212eaa	1	Other	Other
+921d2f43-2bc7-4e9e-8e64-6c470052796b	1	Other	Other
+921d57ce-a9d5-454b-9876-092f8a6950cb	1	Other	Other
+921d683a-a830-402b-b315-97d7c5e5d00f	1	\N	Other
+921d6f7b-8036-4002-a648-8b5d3f9836c0	1	Other	Other
+921d7473-24fb-45ed-b9af-fd07e81aae88	1	Other	Other
+921d92c6-6672-4fd7-bf2c-c83a704c05a6	1	Other	Other
+921df893-8859-4edc-ad9c-8b3b3833b7bb	1	Other	Other
+921e0d24-1fc3-4f81-9b15-9556da4fa0c2	1	James	Other
+921e1538-4b23-422f-8e27-f045c5f64332	1	Other	Other
+921e27ce-1f8f-4193-bee2-c11c13b9043a	1	Other	Other
+921e712c-bfc3-4c5d-a2a6-dc1df1851856	1	\N	Other
+921e8459-4738-4854-acc0-97121772f1e6	1	Other	Other
+921e9228-4c5c-4813-880a-eafbb975ca27	1	Other	Other
+921f66e6-8520-4e8f-bba0-f6b75caada68	1	Other	Other
+9220212b-f1d6-40f7-a477-b6505722ad5c	1	Other	Other
+92205f3b-2b5c-4968-99fd-8b9cfaa255d9	1	Other	Other
+922063bf-5e82-46ad-b513-54ceb7f87466	1	Other	Other
+9220994f-23d3-4344-9324-9a3d0e31f50f	1	Other	Other
+9220b787-c424-44be-8c74-f08b7a04b2e7	1	Other	Other
+9220c1a0-1479-46ce-9ee4-0bdfea6ff8cf	1	Other	Other
+9220d5f7-7c2c-4a96-8c97-0291cf4a0fab	1	Other	Other
+9220f37b-9404-4e4f-9c34-cc0ba9843e97	1	Other	Other
+92211bd0-e0a9-44de-83a6-5c9c98792e54	1	Other	Other
+92212320-81a2-412e-b48d-f8cf38abcb4e	1	Other	Other
+922136be-b07b-4d39-8454-a8498c0d249d	1	Other	Other
+92217b85-4da7-44ee-be28-877dd4044636	1	Other	Other
+9221d4c3-b6de-452f-90e6-ab20e353055d	1	Other	Other
+922240ff-d53d-4c70-b3ec-5fe8174f968f	1	Other	Other
+9222a6dd-cbf9-4100-9e15-db420c390b24	1	Other	Other
+922322dd-0325-49b7-b58c-091b7903c199	1	Other	Other
+92232399-73f4-4593-94be-f44ce2224403	1	Other	Other
+922348bd-9ce1-4364-97ca-136867ed43b1	1	Other	Other
+92234bee-ba83-4aee-874b-d24b7961e2cd	1	Other	Other
+922364dd-e46f-428b-acbd-f19133e1759c	1	Other	Other
+9223b217-e44f-4b67-bd1e-f8df4663654c	1	Other	Other
+9223bf35-9153-4a90-b53a-01db11837683	1	Other	Other
+9223c9e9-ed81-48c2-9cc2-d3b26d6eeca1	1	Other	Other
+9224169f-61a8-4912-88d3-5986524d425a	1	Other	Other
+92243429-f530-407c-9ddc-ff2018443079	1	Other	Other
+92246127-5d88-41e0-b89e-4f2584e50553	1	Other	Other
+9224c696-d0cc-4b11-9096-3843616691eb	1	Other	Other
+9224ce82-c233-41bb-99f2-f7ad59d5e5eb	1	Other	Other
+92251793-4551-49c9-8dec-3841721ca6ba	1	Other	Other
+92256c5e-086a-4609-a5f5-69ab58d82591	1	Other	Other
+9225922e-13bb-4d87-8858-7f58b4ada01a	1	Other	Other
+9225ff91-ae78-4cc4-b387-7670f37ad665	1	Other	Other
+92261e4a-714d-4e99-a255-42012b82fc9f	1	Other	Other
+92261e75-c396-46c4-9744-4965559a9aff	1	Other	Other
+922657ad-9f56-41e5-bf31-144e726e7086	1	Other	Other
+9226c048-88f8-46c2-94a5-2fe1e2fea377	1	Other	Other
+9226e7c5-7f96-4ec6-95e4-c0220f4d4e1b	1	Other	Other
+9226f1f3-d150-4e64-8858-c5be03018e40	1	Other	Other
+92271bd3-bfe3-4c1b-8dba-4efa8773bda9	1	Other	Other
+92276265-c54b-4692-ad59-9a39987d2843	1	James	Other
+922788d0-87fa-4286-b1be-5a7f8511bfae	1	Other	Other
+922818ae-7138-40c1-a8c7-33b4c8f71636	1	Other	Other
+92281c37-90d6-4303-bd86-57b9e4da3c2b	1	Other	Other
+92286e58-54cb-4b26-a52b-497cc8ec003c	1	Other	Other
+922871c2-6178-40e1-9812-f673517294a4	1	Other	Other
+92288bab-41aa-412a-92de-fb585a8ee78c	1	Other	Other
+9228d344-a864-49b8-8b07-d7d93fbc3bb7	1	Other	Other
+9228e5ac-d204-46f2-9c5c-295a6ca796c0	1	Other	Other
+92290501-f788-45bc-b4b7-7b52b7be3151	1	Other	Other
+92290b5a-a66e-4103-b800-544fe821be13	1	Other	Other
+9229187b-654e-48b8-bb3e-a46321e2a06d	1	Other	Other
+92295b09-2e88-4867-a3f8-44cb6325e6f1	1	Other	Other
+922974c2-84f5-49c8-9a95-f710c25d319d	1	Other	Other
+922985cf-1dca-4b4e-bd6f-b831c0050c85	1	Other	Other
+9229e189-83e2-4421-a96f-1ce5048bada0	1	Other	Other
+9229eb7b-2785-483f-b6f6-3bf028afdbfd	1	\N	Other
+9229f5ff-3afe-4ac0-ad28-16578521b145	1	Other	Other
+922a069b-5589-4008-bdb9-4222d1eec3c1	1	Other	Other
+922a09e2-1039-4bd0-b721-70523cb59735	1	Other	Other
+922a2721-588b-485d-89dc-efbc81c6d053	1	Other	Other
+922a2d5a-42a0-42de-bf21-0334dc0ea1a6	1	Other	Other
+922a90f2-77b0-475b-a915-e7007a65862a	1	Other	Other
+922af2f6-2e07-4e41-aa10-e8192149b399	1	Other	Other
+922b1f16-28ab-4b27-88a6-a622ae6ae22c	1	Other	Other
+922b23a3-d3f6-41df-be2b-7e2d1df73bbf	1	Other	Other
+922b35d9-eb8e-46f1-a3d6-e582fb5e29cf	1	Other	Other
+922b6226-2e26-4a85-b9bb-02fc49ead579	1	Other	Other
+922b695a-559b-4aba-803e-3df5283e8827	1	\N	Other
+922b75a5-72ee-4db0-bb96-02e5b652bc29	1	Other	Other
+922b9227-22f8-4001-9c50-42ab3f76e7f3	1	Other	Other
+922bc387-fb52-4a36-b5d7-c687884dd8ba	1	Other	Other
+922bf0e6-e3f3-49aa-be14-426f4ad7ba1f	1	Other	Other
+922bf15b-af7d-4df8-b280-32a8da1c8fdc	1	\N	Other
+922bf604-0b9d-4e04-8c2b-237925c9f159	1	Other	Other
+922c820e-e2e9-4586-a8d2-121775bae77c	1	Other	Other
+922cda78-8109-49c2-ba56-bdd9882d1228	1	Other	Other
+922cdf1c-e0b8-4550-8bc4-ac15b3f6e1c2	1	Other	Other
+922cf03a-68d1-436d-9d02-60fbc7841536	1	Other	Other
+922d0a51-341e-4bcf-8b0c-d4e0ef91ce12	1	Other	Other
+922d3637-ead5-4a8e-91d2-d44ade854304	1	\N	Other
+922d67f6-7fcf-48ac-84a6-a29edcb3ac85	1	Other	Other
+922dad44-f323-438e-bf69-cd6d8c5d9890	1	Other	Other
+922dc344-51d0-47ae-9e02-b77ba3384f73	1	Other	Other
+922e1536-6da1-4038-8724-0c65910b1d89	1	Other	Other
+922e1d1e-8567-43cf-b60d-4427b6c3c87c	1	Other	Other
+922e4850-3862-4933-8e8e-0a3ad633aab6	1	Other	Other
+922e6edd-5a09-4256-9d6b-02f93358ffcb	1	Other	Other
+922e74b0-2b4b-47dd-bf30-7253779d7a5e	1	Other	Other
+922e85f3-8b1f-430f-93ec-266558dd08eb	1	Other	Other
+922ea6b6-acdc-4d39-aeaf-dbdd3eeaceab	1	Other	Other
+922eb39c-8e77-4da2-b5a3-bc4756094711	1	Other	Other
+922ed62e-f6dc-4bae-8745-3121dd9bbfe5	1	Other	Other
+922f4b95-6ff2-4d09-a2c1-76d1e3b8a178	1	Other	Other
+922f6428-1414-4c80-a16e-a0220a397ef2	1	Other	Other
+922fb100-449b-4e2a-b48f-eaba8da3e885	1	Other	Other
+922fbfe3-1bee-4373-ad6b-cfb5fac58bf1	1	Other	Other
+922fe616-52c4-4759-8b88-7d70266d2f79	1	Other	Other
+922ffc34-78e9-4cd2-bbc3-626ea3359984	1	Other	Other
+923059d2-5ee4-4f22-8b96-7c1b699ee062	1	Other	Other
+92306b63-1d04-4c16-bf0c-47733c5cecb7	1	Other	Other
+92306de7-b770-4624-b61f-5eab6d9a1dc8	1	Other	Other
+9230a6b0-97b3-454e-8725-ca94065faafc	1	Other	Other
+9230bce4-4bf1-4fa3-aa14-1ba8c49c55aa	1	Other	Other
+9230bdc8-c97e-4961-874c-9d93fd446f33	1	Other	Other
+9231752c-3977-4dbf-a9cf-9669988c812c	1	Other	Other
+923192aa-d8bc-4d7c-af2a-1fc335c829e4	1	Other	Other
+92320ccc-8cac-4846-882c-c4c137f59bad	1	Other	Other
+9232366b-9d3e-499e-becb-37110669ebe2	1	Other	Other
+9232986d-b218-496b-bac0-9cc09bf6661a	1	Other	Other
+92330061-8149-443d-9933-8ad9a2505bb5	1	Other	Other
+9233274c-7b42-4512-8bda-116a87cde746	1	Other	Other
+923337de-5e6b-4685-9f9c-1eddbe3d6865	1	Other	Other
+92335a5a-1770-48cd-b274-6a94d614b9e1	1	Other	Other
+923387e5-ebea-48c2-a9ea-c7ecc6de0a65	1	Other	Other
+9233e69a-ec6d-4884-b960-2f736fab2a08	1	Other	Other
+9233e90a-d49c-4088-b803-41ee04459c69	1	Other	Other
+9233ed53-4b76-4834-bde6-808a2b58d834	1	Other	Other
+9233ee6e-35fd-4e16-8dac-103fcd9a7740	1	Other	Other
+92345215-329a-42a1-9dc3-d5f0fcf13c83	1	Other	Other
+92345f93-dcc2-4d36-9b04-54d682539abc	1	Other	Other
+9234bcf9-1ecc-4c20-88cf-6d118580abff	1	Other	Other
+9234ce09-b9b5-4082-8db9-a5814ec68df8	1	\N	Other
+9234f111-089a-4fa1-91ca-aa8e409fd886	1	Other	Other
+9235609e-b53b-4b08-be4d-6e9a6303df67	1	Other	Other
+92358ffc-b50a-4792-ba41-02f98f16d67c	1	Other	Other
+92359e50-6293-49f2-93a5-eca469b5770b	1	Other	Other
+92361b6a-6e0a-4dbb-8ea2-0c448e35e977	1	Other	Other
+923634b0-fe65-4a7f-ae69-461eee4999f3	1	Other	Other
+923675b0-575f-4f00-9075-d747d222b95f	1	Other	Other
+9236c0fa-66ef-4f00-aaab-df79dc504048	1	Other	Other
+9236d723-083f-453b-9794-be55a2a4ad93	1	Other	Other
+9236fa03-6941-48fe-8bcb-0d5edb3828aa	1	Other	Other
+923715a5-202e-4ff1-9328-256d0ded6314	1	\N	Other
+92371a7e-53c0-497d-a9a6-1ff181d510e4	1	Other	Other
+923748e5-3c7b-464b-80cd-b88a402ef1ca	1	Other	Other
+9237ca3e-1123-4c6c-8b23-98f379a47d1c	1	Other	Other
+9237cbf8-600f-4d22-b8ad-fd14a3451df8	1	Other	Other
+9237d9a3-882c-4ff2-a64d-f325004eeebf	1	Other	Other
+9237ff6a-d4db-4b29-86f9-c62d94428eeb	1	Other	Other
+92381040-9195-4dd8-b901-b1aec9c39c0a	1	Other	Other
+923833b8-c002-4b67-9995-0a3f9e17ce6c	1	Other	Other
+9238822b-f703-4998-8f47-89b5091b0fd5	1	Other	Other
+92388a9a-89fd-40ca-a38f-b92224ae33f9	1	Other	Other
+9238932c-e815-4d4f-b858-14fcadf2a7a5	1	Other	Other
+9238b1d0-9d07-4fb4-8952-e808d6d68d03	1	Other	Other
+9238c2be-1302-4f1c-8f85-769c4b6509eb	1	Other	Other
+9238e96a-dbe6-487f-9b26-4353fa7a4aa8	1	Other	Other
+9239438a-81be-41ed-bad6-497851650933	1	Other	Other
+9239581e-6558-404a-a42f-142afd71e583	1	Other	Other
+92396d82-2a0a-4889-bc54-cd80faac8200	1	Other	Other
+9239a6b3-535f-4dc8-9dbc-a74afd44eb4a	1	Other	Other
+9239b213-a509-41fa-985e-0a3ff283f439	1	Other	Other
+9239d29f-af13-4b5a-9e5d-b2351b06a46c	1	Other	Other
+9239e94c-e4de-493f-8dea-a328125adcf8	1	Other	Other
+923a2e5b-947e-49ce-91d7-ef700dfa5b02	1	Other	Other
+923a39fa-e2a3-4e38-931e-21132ba6d532	1	Other	Other
+923a79b5-2c3e-4c8b-ba41-c967ba244275	1	Other	Other
+923a921a-8715-4581-976b-a644160a20f4	1	Other	Other
+923a9d91-f487-4467-b5ec-feae95d9c710	1	Other	Other
+923ac6ef-1b10-41c0-91d2-a48efd65158c	1	Other	Other
+923ae729-8a96-482d-a21f-b4c01a24bb5f	1	Other	Other
+923b039e-d897-4318-8adf-e5f50b93a362	1	Other	Other
+923b37ef-4c00-451f-8b36-079eb02e4be3	1	Other	Other
+923b39f2-b812-4342-8686-c4ecdfef57d1	1	Other	Other
+923b80c9-029a-4801-aa73-c0e5e42225ed	1	Other	Other
+923b8abd-c574-404b-98dd-0d7b3249d5ee	1	Other	Other
+923bf8a4-3479-496e-9d59-d0683489616d	1	Other	Other
+923c17f5-522f-4c7d-ba52-4df58009c570	1	Other	Other
+923c60e7-41c0-4713-9ca6-91f894692bd7	1	Other	Other
+923c64d3-8832-48d0-ac89-f560f9695e94	1	Other	Other
+923c88b3-4ca0-475e-b0c9-27af6dc3186d	1	\N	Other
+923cb369-642b-4a6c-b3ec-914faaa32977	1	Other	Other
+923cdaa1-ea0f-49ae-89d8-91d8d64acd83	1	Other	Other
+923d5806-0289-4b46-a8b9-3d9fafcc2db0	1	Other	Other
+923d6972-c850-4f24-9745-b810e4a7fe66	1	Other	Other
+923d8fc8-646d-4042-ab9b-6a8f830a0b70	1	Other	Other
+923da5bd-153b-4dc3-9ad3-8cf8c6a42e26	1	Other	Other
+923db0e7-d4ca-4fce-a8a1-2c254162f78b	1	Other	Other
+923ddc7d-d6a3-4d50-8e24-78c5a54da8cc	1	Other	Other
+923e0f70-d37e-45e3-ae59-eed97619ce53	1	Other	Other
+923e1284-e43e-4d5c-87ae-2338e3d326b2	1	Other	Other
+923e87a7-81c0-43ec-8757-1621067934f6	1	\N	Other
+923e947e-476f-4c3d-b12c-cc93adc90e32	1	Other	Other
+923ed9cc-fdf4-4783-afc8-0d81be37e193	1	Other	Other
+923ede8a-00b0-49d3-a93b-41f461158284	1	Other	Other
+923ef73e-549d-4851-afe7-f95bada32011	1	Other	Other
+923ef8e9-797b-4891-a858-d6e6ba402af3	1	Other	Other
+923f201e-0bd4-4e98-a5df-423e00c0b8df	1	Other	Other
+923f3d07-cc2e-4194-8d1e-a2119fe9eb2b	1	Other	Other
+923f4ee4-f161-461d-91e0-b9bbda85ed74	1	\N	Other
+923fa189-75eb-4673-818e-b24859a52b22	1	Other	Other
+92402967-6578-43b2-bfaa-cfd6d891a8f5	1	Other	Other
+9240a8fc-8281-4206-aa2c-e09094153edc	1	Other	Other
+9240c4a3-8abd-422a-9aa0-93c63af9d61f	1	Other	Other
+9240d2ac-acff-4924-bb5b-f6d6564dd730	1	Other	Other
+9240ea2a-6872-4020-8010-6d1e308f183f	1	Other	Other
+92411d4d-3d3a-4d05-be7d-f04c4a79c023	1	Other	Other
+924121ab-0a71-44fb-90da-77fa89509f92	1	Other	Other
+92412903-1ae4-45bf-afda-7e4fc363a50c	1	\N	Other
+92413f12-f0ac-4d6e-8a3c-d76bed0b039b	1	Other	Other
+92414ab7-5112-4165-a820-7194f3559f18	1	Other	Other
+9241be2a-2c74-4759-bb71-9e7d1d95cf9d	1	Other	Other
+9241f767-7ec9-438e-b4d4-299635c9c100	1	Other	Other
+924215a5-c643-49bb-b6c9-cf7a3c725ca8	1	Other	Other
+924248b2-0274-4c22-92c0-e90d9ae46de0	1	Other	Other
+92427eb3-be66-43e6-a953-83910e83d452	1	Other	Other
+92427fd8-3853-4a64-8e39-e46e28c9e78c	1	Other	Other
+92429411-b91c-4e25-af08-e453c47e0a61	1	Other	Other
+9242b3c6-a7a2-4825-b442-6578ce48e014	1	Other	Other
+9242d5c2-b687-4148-a378-5797fda72786	1	Other	Other
+92430d0c-2cff-4a82-8dce-852fd6a4519c	1	Other	Other
+924341cd-ec9a-4927-a8e8-917a9fd218fe	1	Other	Other
+92435078-63d0-4052-bb58-a2c85c5d96a3	1	James	Other
+92439860-a84e-4a3e-86f4-7b2235c5a53b	1	Other	Other
+92439b15-2b90-4e0f-b698-9585540f9701	1	Other	Other
+9243bb14-1e1f-42aa-b8ed-5bb42b42f8df	1	Other	Other
+9243f376-ed02-4334-9971-039e88586fe3	1	Other	Other
+92440771-566f-459d-ad13-f71ab6037f48	1	Other	Other
+92442eff-7a03-4b28-ac3b-8d036e64dde7	1	Other	Other
+924448fb-ef1f-42c1-ac73-a32a42944116	1	Other	Other
+92446743-4d2e-4d0d-8f75-4d77e776b498	1	Other	Other
+9244767e-ef1f-47a8-9439-27809db127fc	1	Other	Other
+9244f5e2-7f95-498c-9d74-621e6ab8e31e	1	Other	Other
+92451c1e-dd1a-4cf4-a670-b6ab432d34e9	1	Other	Other
+9245450e-00d4-4abf-bd3d-44f1cbadedb8	1	Other	Other
+9245543d-58e0-4232-9020-dff3b5e26678	1	Other	Other
+92456ac5-7567-42a4-87d9-c11e0bb85117	1	Other	Other
+9245f3bd-e4ce-41f9-9306-57641f830284	1	Other	Other
+924646a5-c1ab-4c43-a3cc-c2350397a427	1	Other	Other
+92467eea-4c75-4565-b47a-72aa1a983ad0	1	\N	Other
+92468d9f-8ab0-4eb0-bbab-4490874a325e	1	Other	Other
+9246a9a2-458b-44e4-a8e5-8286da23d4a6	1	Other	Other
+9246cc77-feee-4e2e-9481-a134f7c2abd8	1	Other	Other
+9246de96-00ca-47c2-b8f8-061a4949b66a	1	Other	Other
+924728a9-114a-4e5b-860a-fc413c82f6e9	1	Other	Other
+924763ab-4efe-46bc-adeb-95ffcd40f42c	1	Other	Other
+92476fc1-a801-43f9-9886-2ca4f5625d7e	1	Other	Other
+924795e9-ea3f-4b6d-b10b-d5aa28f3db9d	1	Other	Other
+9247a7a7-ae5c-41fc-b8ad-592115a4f9f4	1	Other	Other
+9247b5bb-3e57-41d4-8bc3-38762568c974	1	Other	Other
+9247d706-29fb-465d-af1f-edd13e9fc440	1	Other	Other
+924894c3-ec91-4213-969c-7d6f06d3490e	1	Other	Other
+9248bd3f-7718-4714-87e4-a42a6f14d3e8	1	Other	Other
+9248edf0-38a4-4ae9-a8ae-7b0d2c46384c	1	Other	Other
+92490176-fa1f-4394-aa0d-5c03a2f04582	1	\N	Other
+92490a60-43b5-404d-97c4-9a1a60662216	1	Other	Other
+9249331f-29f9-4baf-9bdb-74864c804dd1	1	Other	Other
+9249343c-b260-47ee-875d-f4c10cbfa4de	1	Other	Other
+92493726-153b-450d-80a8-24c439fe940b	1	Other	Other
+9249569e-e8b8-4d77-a62c-1758ae3a210f	1	Other	Other
+92496a29-b896-4a1e-9121-5c6d315e4306	1	Other	Other
+924987bc-bd49-40fa-936e-1f6cac121175	1	Other	Other
+92499f14-9d0f-42cf-8fa1-1d6337afb44c	1	Other	Other
+9249a37c-4b46-460c-a053-bca163ae0b2a	1	Other	Other
+9249a88a-db9b-44fd-a3ca-f7f061c175a6	1	Other	Other
+9249d4d8-da2f-4a60-8e70-ab02b3380159	1	Other	Other
+9249eddd-de44-4b40-b169-ff82e4d5c067	1	Other	Other
+9249f0d5-9ecb-40d9-b9aa-2e805ddf4923	1	Other	Other
+924a10cc-20e6-48d5-b043-e9104dccd34c	1	Other	Other
+924a482c-df97-400e-a5e7-4dc301dd857a	1	Other	Other
+924a634a-9a5a-4185-879f-3c0f84d21be4	1	Other	Other
+924abe5e-ba96-489b-9918-033b6acc59ef	1	Other	Other
+924ae083-c857-47b4-ab01-c4be9e914d05	1	Other	Other
+924b2233-ccbd-49de-a21a-e40f5d55032a	1	Other	Other
+924b44f4-1c8b-4a01-a815-ae820f79f59d	1	Other	Other
+924bad23-67fc-4ca0-918b-d7ebf3ba2137	1	Other	Other
+924c34fd-1fd4-4033-b6c9-8f72559fa7c3	1	Other	Other
+924c426f-c511-4eb0-b1ba-085b3c80c0e3	1	Other	Other
+924c6dde-c611-4316-ac39-fd092430ff9c	1	Other	Other
+924c9425-c0e8-4730-8705-451287e1e247	1	Other	Other
+924cbe58-adfa-4364-acce-e07992a79184	1	Other	Other
+924cc807-a4e3-460d-8cf7-1abc56477989	1	Other	Other
+924d19e3-22df-4ca2-b1a5-42e68fa279e3	1	Other	Other
+924d5274-76ca-4b19-9077-a622083bc917	1	Other	Other
+924db89b-7c54-41db-8834-591c9ef87c20	1	Other	Other
+924dc359-6df9-4a91-8e38-f4e65f5563ee	1	Other	Other
+924e21b3-a35e-4e49-9da0-82f5abfa0d2f	1	Other	Other
+924e3c70-2a0d-4f86-979b-e1373e384722	1	Other	Other
+924e4e1b-532d-474e-a322-58d591e48b5b	1	Other	Other
+924ea1b2-1787-4cdb-b3cf-540518347688	1	Other	Other
+924ebf21-4106-4c4d-8e35-a3b2f08e2292	1	Other	Other
+924ef0ca-45cb-4cc0-88f1-01a5e748d5e5	1	Other	Other
+924ef70c-84a3-44be-8dde-27964b308780	1	Other	Other
+924f491e-ba03-432d-8437-965826c2631c	1	Other	Other
+924f728a-78f8-4491-9876-77592a3b0c5a	1	Other	Other
+924f8ab8-5711-4da9-87a5-26a7ea3a74aa	1	Other	Other
+924fd08b-12bd-459e-bfad-82ecb6590603	1	Other	Other
+924fdedb-e3da-43fa-a1ef-5bc08fcd41f6	1	Other	Other
+925044c1-8e58-4946-896d-905664ec2ee3	1	Other	Other
+9250702a-6f6b-4c72-95d9-ac5ff6f0c61e	1	Other	Other
+92509b9f-b0fd-4263-8de5-a24ab6e64d62	1	Other	Other
+9250a4e5-6312-4ec2-8b2f-592cc8d9692e	1	Other	Other
+9250d43a-4e98-4c80-81ef-b9e1a4cb7cc3	1	Other	Other
+9250df72-0ca6-4234-983f-7a64e86f6614	1	Other	Other
+9250dff7-03f3-4987-86c5-6310d08297ef	1	Other	Other
+9251267a-fdaa-4e16-91c0-e4169ba853c6	1	Other	Other
+92512f75-95ad-4f50-a627-a7b6d3d78a92	1	\N	Other
+92514bb5-9c16-40bd-ba60-ec9abebf7bf8	1	Other	Other
+9251788e-60df-421a-851e-9d19096fee2a	1	Other	Other
+925178b7-e05a-4042-ba4e-ffe6276c374b	1	Other	Other
+9251893d-add9-47f1-a871-6af3b676372b	1	Other	Other
+92519705-2b6a-427f-83c7-30031ce8a39c	1	Other	Other
+92519930-5979-4db5-aba7-dfdbee65403c	1	Other	Other
+92519fbc-5c74-4093-bf44-0a20a813c7fa	1	Other	Other
+9251c316-3d6b-4348-a156-d3ac09daa2e6	1	Other	Other
+9251e684-6b88-4713-a038-f41c422bb5a2	1	Other	Other
+92521aa8-b295-4e2a-a4f3-b5b0e1dd80bd	1	Other	Other
+92521ad0-fdb9-4029-bf24-a7b7597ebd6e	1	Other	Other
+9252261f-f984-4749-b7a2-d11719a58b5b	1	Other	Other
+92522f99-251b-404e-b7b2-94e052d4ab35	1	Other	Other
+92523059-ac90-4df3-b326-756cb543c7bf	1	Other	Other
+92525a5b-6bc3-4184-96fb-995f16700b78	1	Other	Other
+925262cf-f816-4a27-bc64-d43052bcd71e	1	Other	Other
+925273de-cb39-4d51-9101-76e0fedfd53b	1	Other	Other
+92528b52-ad09-4b64-8cd3-0a636ad203d5	1	Other	Other
+9252c599-a413-4a4b-984c-aa90e0bef629	1	Other	Other
+9252e302-5655-405b-9707-9288b7913566	1	Other	Other
+9252ed15-17e3-4920-b319-2e359a72e481	1	Other	Other
+9252fad1-a385-4518-bf7c-612b132ca45b	1	Other	Other
+9252fb86-6c72-473b-ab9a-c6465e68cf96	1	Other	Other
+92531330-b863-4aa9-b6a1-c1755a0c8ae2	1	Other	Other
+92531a7d-77a3-4ac5-9b3f-367824f2ed03	1	Other	Other
+925343c1-d633-45f6-ad2d-23963acc2134	1	James	Other
+92534a5b-b0a1-438e-8002-2c526b3ed9d1	1	Other	Other
+92539167-f896-45e0-bca0-ae6f435e7bda	1	Other	Other
+9253a23e-b85a-4017-9093-15b021293eb1	1	Other	Other
+9253f6ae-43ba-4217-be3e-72c48cecaf2c	1	Other	Other
+92541f53-bdd6-49eb-84b1-bf3b6be5c6d9	1	Other	Other
+925472f8-5687-44db-9ef9-ce9858b8afd3	1	Other	Other
+9254de74-78b3-4474-80f7-01411978b129	1	Other	Other
+9254e55a-45b3-47ad-ba1b-25439b26cddd	1	Other	Other
+925500f0-b806-46a5-8505-7f9aae04aab9	1	Other	Other
+925529a2-8e73-46eb-b374-8c7597d8f149	1	Other	Other
+92555f13-67c9-42c5-ac10-c7ee9a32ef86	1	\N	Other
+92558a29-b237-49cb-8532-88c89bfbd2f0	1	Other	Other
+9255bc80-217f-4a0b-9baf-9653efeb53fc	1	Other	Other
+9255ff1c-e2d0-4ee0-87cf-6a9496cecefd	1	Other	Other
+925630eb-756e-4d5a-8cda-fdc68c667ad6	1	Other	Other
+92565f48-4e00-42bb-9703-dad862d675f8	1	Other	Other
+925663df-5afc-4293-aa00-5695d07bc792	1	Other	Other
+9256b55a-8c2c-4e92-830e-1ef4722f6453	1	Other	Other
+9256c2d0-d29d-4405-bbc9-8d2789080575	1	Other	Other
+92571287-d7e3-40d2-b8ca-c190e7556fef	1	Other	Other
+92571308-fbf2-4398-a6ce-cbfbab9760f4	1	Other	Other
+92571df4-70d6-4215-b521-c33ddcacf0c4	1	Other	Other
+92582737-39a2-4681-a1fd-91662e76d518	1	Other	Other
+9258bb74-6bb7-490d-9731-6fa1ac0753f8	1	Other	Other
+9258dc8d-3c5f-40e6-93cf-0804bd731288	1	Other	Other
+9258e5cc-3244-4865-aeef-8e30608d288f	1	Other	Other
+92594bec-b893-47ea-971a-0e950a70a45c	1	Other	Other
+9259ca40-836f-49e1-b588-6b6ef9cd566a	1	Other	Other
+9259d98d-169b-447c-af34-e7ddec871a1a	1	Other	Other
+9259fb25-73c2-4743-8042-fa2305e09fdd	1	Other	Other
+925a1dd4-6af3-44e5-a010-646d5f93b0d4	1	Other	Other
+925a61d4-0ff9-4aec-9358-98788a6078e6	1	Other	Other
+925a6efb-e5ef-44ff-ae2c-1400c57212de	1	Other	Other
+925a7138-ec2a-4ac3-8c1a-67dbb60bfe00	1	Other	Other
+925a85ae-c9b9-4ac3-a4b4-78aa67e73356	1	Other	Other
+925ac9f9-0920-4fe0-b7f6-227eae352d42	1	Other	Other
+925b03cb-15ca-43c1-932c-e61cdd3da48f	1	Other	Other
+925b4015-7f1e-4a0d-a28d-96834a919bf7	1	Other	Other
+925b96c7-c78a-4638-9a95-1c50b98daa77	1	Other	Other
+925bab1a-d9de-4adc-a1b1-b37691fec756	1	Other	Other
+925be4ec-33a0-4847-a48b-5e6535237c73	1	Other	Other
+925be59d-7b28-4bd5-be48-bc991a9c3451	1	Other	Other
+925bf9ff-a950-490c-b580-c73c098bda3b	1	Other	Other
+925c1b92-1164-425b-9349-4fa35830beff	1	Other	Other
+925c21cd-a2fc-4aab-95c4-19c1c5d47830	1	Other	Other
+925c49a2-535c-41a9-97be-67d96b4b2690	1	Other	Other
+925c49da-9a3e-4eb2-ae5c-b92068d9a12a	1	Other	Other
+925c543d-1977-4811-af5f-ec8ac2b61950	1	Other	Other
+925c6d79-7348-48ee-9f84-e7e95cf99163	1	Other	Other
+925ca481-57be-4b1f-ab20-53747877ef36	1	Other	Other
+925cb792-3840-4e76-b883-30b0dc5b4358	1	Other	Other
+925cd29f-3395-4a5b-9609-22db90dd03c2	1	Other	Other
+925cd3e9-5e00-4186-bb9c-477a3fb68625	1	Other	Other
+925cde76-afb8-4222-b338-76c790aa577a	1	Other	Other
+925cf66e-a3ce-4dcf-9229-72d3d8bb664e	1	Other	Other
+925d1b0b-f4e4-4804-9bd9-30b8ff9bdd12	1	Other	Other
+925d4e24-f57d-4cba-b30c-9897bbc3f5c6	1	Other	Other
+925d52bb-8ac3-45c3-a945-e4f46ae0657e	1	Other	Other
+925d67ad-44d2-4a60-ac01-76e40ab524cf	1	Other	Other
+925d8ebc-3cac-4b3e-8620-ac699f729f4f	1	Other	Other
+925d9054-488e-487a-8c24-f9ce148347f7	1	Other	Other
+925d95e1-aea2-41ee-8630-3575e826ea58	1	Other	Other
+925da35c-0598-4055-a1e1-edf3a6b8ce57	1	Other	Other
+925daade-08bc-466f-b6b6-0b31562fc040	1	Other	Other
+925dc338-af21-4817-aa20-490b04ac5ff6	1	Other	Other
+925dd929-e68f-44bc-b2d4-c0274ac6bccf	1	Other	Other
+925dffa0-98f6-4657-8d46-97b8d56d9ad8	1	Other	Other
+925e1000-d951-4ade-9f43-ec3d5194470f	1	Other	Other
+925e172a-0db2-4df8-a57f-3532e1d0afa2	1	\N	Other
+925e21c6-5021-44a9-af1e-9cc985274209	1	Other	Other
+925e4e15-4cf9-472d-b13f-2fcd7c730dc6	1	Other	Other
+925e907f-39a1-4790-bab7-d5a9c11145e3	1	Other	Other
+925ec3cb-a25f-4e65-bb76-a83eb7512c6c	1	Other	Other
+925f521d-5519-45d3-8757-907f44fbb1f9	1	Other	Other
+925f867b-e2b0-4bf8-bb52-23190d9a4824	1	Other	Other
+925f8708-fc28-4f87-9cca-995de9465b5e	1	Other	Other
+925fce67-5660-46d8-9187-a5ac86d63a9f	1	Other	Other
+925fda25-602c-4dda-9e78-b39c499cecfd	1	Other	Other
+925ff794-110a-4ff6-b6e5-3d4f23f8f409	1	Other	Other
+925ffe29-3a7c-4a0d-8de2-531ab633dbb3	1	Other	Other
+92611d10-59ab-4112-b1f9-3f04b0714f7d	1	Other	Other
+92612ea8-d63b-4b1a-91c7-606a075cf855	1	Other	Other
+92616967-b332-4e9c-b6fe-4469e5a0dffa	1	\N	Other
+9261712c-4ff1-498c-ba7e-229a50afddc1	1	Other	Other
+92617f11-c8f6-42e8-bc94-62c3072ce154	1	Other	Other
+92619e7e-6936-4811-a1b3-7d972099fc94	1	Other	Other
+9261ca5b-b712-4b4c-ab12-b96ddbb22d23	1	Other	Other
+9261de50-0c94-4445-b0c4-e9430fa8559a	1	Other	Other
+926223b8-647b-4909-9a58-6dca54f2a391	1	Other	Other
+9262a822-d86b-4b43-81f4-d4b7e3e0e70e	1	Other	Other
+9262d505-cff9-464b-ab06-919542dfe97b	1	James	Other
+926346e5-7b8e-4d9a-b07f-740d5c7146da	1	Other	Other
+92637296-978b-4622-8e7a-15344df559c6	1	Other	Other
+9263ab97-2880-4ac7-a995-3f93bad8ffe3	1	Other	Other
+9263ad5c-231d-4420-aa96-e8e002c778c7	1	Other	Other
+9263d945-84a6-4532-b8f1-af4eb2ff60d7	1	Other	Other
+92647904-f22d-490c-9f65-c4c95b8774b4	1	Other	Other
+92652eb2-842e-4615-988e-983108691ca1	1	Other	Other
+9265429c-9f7a-4e28-9662-a397abcdde1c	1	Other	Other
+92654e00-782a-40fa-ab5c-b6804fb63a1f	1	Other	Other
+9265a2f1-83d5-45bd-ab9a-fd1b2457059e	1	Other	Other
+9265b08f-9ece-4860-a38d-0b6aa7023a08	1	Other	Other
+9265b354-9212-4d5e-8c6b-3132281a008d	1	Other	Other
+9265de42-8695-4572-a58a-aaf2359f9859	1	Other	Other
+9265f20b-2f94-4641-bc9c-22d7988ac036	1	Other	Other
+92662465-703e-4ed2-8b5c-35431f5ed25c	1	Other	Other
+92664250-a353-46d5-a009-c99537479f02	1	Other	Other
+92666beb-ed95-4524-964d-ca0e1d815d01	1	Other	Other
+926693ba-a90a-48e6-8f9a-94bb74e8e92f	1	\N	Other
+9266f094-4463-4b36-b2a2-6113f31a5ad2	1	Other	Other
+926730f8-941b-413e-bc18-d4e4a8496f2e	1	Other	Other
+9267d4a5-f12a-41aa-b9c7-a0b1d31df4ae	1	Other	Other
+9268501d-57d5-42dc-83ed-e0214b6e7de0	1	Other	Other
+9268537e-209d-4caa-b176-f25522ca0ff1	1	Other	Other
+926854d8-51e2-463e-8a8e-4dcca23892bc	1	Other	Other
+92686d0b-d615-4322-9177-56561a014850	1	Other	Other
+92688e75-2e4f-4ae6-aab8-c0999df847a4	1	Other	Other
+926897bb-c6b2-435c-a551-ddab25136b48	1	Other	Other
+92689aa0-7065-4c75-8f55-1ba16de46471	1	Other	Other
+9268f08e-21f1-440e-9e6d-7aeb0810704c	1	Other	Other
+92691084-03e2-4f12-90a1-30bca80488ef	1	Other	Other
+92694686-3f91-40e0-8cfc-faf09088bd93	1	Other	Other
+92695549-e7bc-401e-8aad-7b3ad8914a3a	1	Other	Other
+92697929-61b2-41a0-9c5c-7fb02559b77d	1	Other	Other
+9269be22-8300-48fd-ba30-331672b4b853	1	\N	Other
+9269dd1e-9559-43e8-84a5-c0da5f150139	1	Other	Other
+926a4d97-ce72-40ed-a994-38b5df7827ca	1	Other	Other
+926a6e34-5aec-4ecf-9b27-9a6872a39666	1	Other	Other
+926a7a1a-712e-45ae-a89c-284bd3c3119e	1	Other	Other
+926a9364-8cf3-4170-9ee9-17ad755566f5	1	Other	Other
+926afe45-4506-4cd6-8dc0-fffef44b8000	1	Other	Other
+926b1e44-685a-48c3-b3bb-16eee6aedb35	1	\N	Other
+926b2948-3200-4067-80c3-3ed9b14e2874	1	Other	Other
+926b3aa1-bd4a-4ec4-9719-dac701ebbb67	1	Other	Other
+926bc602-54c4-40b2-9261-0e9d8582fb5a	1	Other	Other
+926be2a9-b9be-453e-8fbc-bda2091db1d0	1	Other	Other
+926be925-c733-43ef-8939-f433695f623a	1	Other	Other
+926bef46-b9ae-4c4a-b4f2-391d0db8b1f1	1	Other	Other
+926c2454-361d-41c5-a06d-943f84481a61	1	Other	Other
+926c4093-e5a7-4f3d-b793-f4e012c8ce6c	1	Other	Other
+926c7f22-7fe1-4e4c-95cb-389f4af9be53	1	Other	Other
+926cc90f-38d3-4430-a112-f17efc9d20da	1	Other	Other
+926cce29-bd21-4e2a-9987-ba63d4ca093a	1	Other	Other
+926d71d2-969f-4175-b474-ce76bd240096	1	Other	Other
+926e6334-d6d6-4bac-a658-e735d3a09601	1	Other	Other
+926e6b7f-d1dc-45de-8d4d-22191cbb810f	1	Other	Other
+926e8082-65c7-424d-8f4f-65df3f0ce962	1	Other	Other
+926e8384-e13e-40bd-89b5-bf598e1746c9	1	Other	Other
+926eb415-2dec-4c02-b80a-2986c553bb06	1	Other	Other
+926eb621-c3b8-4b08-9168-8cd5b8aa29a0	1	Other	Other
+926ed1b7-3f5f-4df8-8d5e-7ca4ede81869	1	Other	Other
+926ee1d8-7f45-4d0a-bbfb-7b6ff2680219	1	Other	Other
+926f3f39-99ca-4cdb-a66c-2764ef81b3a3	1	Other	Other
+926f653e-3fc1-43e7-808a-fc9e884bf1e1	1	Other	Other
+926f9c0f-bf42-418c-8a6f-f93b1b5bf165	1	Other	Other
+926fb444-8fc0-4175-8373-84257d7de8b3	1	Other	Other
+926fbef1-35e2-45d4-b62b-bb80c9d3c7d3	1	Other	Other
+926fded2-907b-47ea-b127-9af0e505764b	1	Other	Other
+92701883-580c-40fc-a9b5-171f4e65a641	1	Other	Other
+92702b61-6d73-48e6-bf58-fdbef3dbca00	1	Other	Other
+927048aa-f2d5-4afd-bad6-5b5925701995	1	Other	Other
+92706c19-87db-4c86-b0e7-45ea852dcfb3	1	Other	Other
+92708301-ac2d-489a-84b9-59ba94ff199a	1	Other	Other
+9270bda0-8409-4977-9135-e81bf9f88470	1	Other	Other
+927124c4-914d-4dd9-ac2b-0cbe6b157dec	1	Other	Other
+927196c3-158c-4308-bbb7-5ce648cc1b36	1	Other	Other
+927199bd-1b9a-4152-83af-e1d9bbc6e4a1	1	Other	Other
+9271ac08-69c5-4333-be87-23113b7a4948	1	Other	Other
+9271b044-cb6a-4258-8f19-501232f49603	1	Other	Other
+9271c9d3-e93d-4c59-9705-13907fb1daf4	1	Other	Other
+927225fd-bd67-45bf-8abf-bb6a19ead958	1	Other	Other
+92723d41-b50e-439c-8cd9-e2a3a5d55642	1	Other	Other
+9272a324-0251-461e-9774-0fd549ad4245	1	Other	Other
+9272bc1b-1d6d-485d-997c-8460c1108c5b	1	Other	Other
+92730dae-b46d-4a42-9e3f-851228e34abd	1	Other	Other
+9273223a-8e34-428a-bc0b-33f75437b921	1	Other	Other
+927333e0-f570-4a4d-b9d1-7a24471d0aa4	1	Other	Other
+927404ee-e09b-4f04-94b4-86a757d92ce8	1	Other	Other
+92743198-2719-4320-a8ce-833d559ab096	1	Other	Other
+9274839c-e240-4313-a95e-61d7a3cffeae	1	Other	Other
+9274870b-e752-46b8-8a06-d943c02f528b	1	Other	Other
+92749164-929f-48f7-a9d8-49dcc477391d	1	Other	Other
+92749945-c42f-445b-a6a8-a05f8036958a	1	Other	Other
+9274bf47-b209-4ef5-94a7-4f35a361562e	1	Other	Other
+92751e8d-46e6-4762-ba5a-520d36c4aca4	1	Other	Other
+9275e25c-f47f-48ff-8231-6cacc405894c	1	Other	Other
+9275f6e1-f40f-4007-81e5-3cbad0a2aea8	1	Other	Other
+92761f5b-af93-4c44-9cde-8f83243386af	1	James	Other
+927643cc-7f3d-409b-9d3b-5561995f71b3	1	James	Other
+927658cc-7fbd-48ff-9324-a96fc401693c	1	Other	Other
+92766285-c88c-4b70-90f9-a90a3f7922cf	1	Other	Other
+9276ad74-ac4a-455e-a9f8-678461908efd	1	Other	Other
+9276d651-a209-4be1-b28a-b33e79242ab7	1	Other	Other
+9277755e-ce89-474c-b3ab-4e78f1baff7d	1	Other	Other
+9277c123-b2b4-4791-ad2b-aa203fa87b97	1	Other	Other
+9278055e-1bfb-492d-9fb2-ffdab85291b0	1	Other	Other
+927821f8-91eb-499c-a4e7-0b291ba16624	1	Other	Other
+927831b6-0d9c-4e33-bea1-64263bfb2e71	1	Other	Other
+92785a81-19d0-40d1-8727-d3b93dcee0e1	1	Other	Other
+927883ea-94a6-48a7-a079-5a986de5d71d	1	\N	Other
+9278a87d-a286-48e0-a533-adad343696e9	1	Other	Other
+9278ac25-1af8-421a-a41a-6a7564fa04ed	1	Other	Other
+9278db91-b5c8-4614-bc8e-f15748f12a6e	1	Other	Other
+9278f970-c91b-4738-bc72-5dcf8771f01c	1	Other	Other
+927908cc-3b14-4294-a974-d0577879e41d	1	Other	Other
+92792477-de2d-4886-bf07-58ba3f51768f	1	Other	Other
+92792bcd-47a5-473e-b4d3-8e28b6781073	1	Other	Other
+92793765-271f-4f10-9b86-f1f7af966993	1	Other	Other
+92799f94-93e0-43e2-9eae-6f6e93612018	1	Other	Other
+9279b270-2e53-444e-8bc6-1f60d43bb85e	1	Other	Other
+927a068f-0d9c-4b0a-b654-773d26b3d9e3	1	Other	Other
+927a4a0a-925d-4f57-8012-0342fcfaf4fc	1	Other	Other
+927ab7eb-fd16-4df9-a773-b4ea7e0b5a49	1	Other	Other
+927ad031-bc7f-4cf3-bf63-9ff108394778	1	Other	Other
+927af618-d886-4118-91a2-2f6fe32486d5	1	Other	Other
+927b34a9-1ff8-40c2-91fa-864a4ece2257	1	Other	Other
+927be3c4-284e-483e-8879-cb06d6babcca	1	\N	Other
+927c43f3-0103-4fe0-b29f-3b04627669c2	1	Other	Other
+927cb8c6-0b22-465f-94c2-2c3dc72aa134	1	Other	Other
+927ccb5f-e32c-41f5-847e-9577139a49c7	1	Other	Other
+927cf9f9-9b0c-4ce1-931a-6e0c6e2a3da3	1	Other	Other
+927d05db-4d73-4745-8d9f-067deee94999	1	Other	Other
+927d1925-8f39-4d2c-aa3a-41a0bbd0d493	1	Other	Other
+927d3b7d-8641-424b-a19f-121b164be00c	1	Other	Other
+927d7219-3f03-43bc-a8e2-685446088c4a	1	Other	Other
+927da8f0-9190-497e-b388-c771c64f3d94	1	Other	Other
+927db866-e6b5-4fa2-9190-f442da26b781	1	Other	Other
+927dba86-beae-45d9-abed-aacabf53ac92	1	Other	Other
+927dd3be-c69b-49f5-ac5f-f2e7a0f6eb1f	1	Other	Other
+927df5ce-c5fc-4d9e-84f2-07e3ce1f99d9	1	Other	Other
+927e0ab1-58f3-49ba-be29-6bd90e522565	1	Other	Other
+927e5c0d-5575-470e-86f8-d52c459bdad6	1	Other	Other
+927e9f6a-a7a8-4a25-b262-a146bca7ec26	1	Other	Other
+927eab5c-1f4e-435a-bf50-0c3fb00e9c3c	1	Other	Other
+927ec762-4c0a-405c-b440-349462436c8a	1	Other	Other
+927ed46e-efe2-4214-b597-988523d51a4a	1	Other	Other
+927ef5fd-6581-4e97-a6d6-b5063069f8ec	1	Other	Other
+92804031-3838-4c06-9094-6bd234edc8ee	1	Other	Other
+9280d460-00f0-4de4-9687-7d11106bafa0	1	Other	Other
+92812ec6-b914-4110-825b-b39d3a831f4d	1	Other	Other
+92814b78-b7f5-4c9c-a05a-40dd63cde821	1	Other	Other
+92816283-0be4-4003-8690-d30080b7699b	1	Other	Other
+9281fe68-05a7-446c-94c5-0a19f86b9c8b	1	Other	Other
+92824c91-0992-4540-aab8-732ef15cbf2e	1	Other	Other
+928250a6-f0e0-446e-b2cc-7094dcdd419f	1	Other	Other
+9282738e-053d-4e07-83d4-a2ce98487247	1	Other	Other
+9282b6f4-4fea-414a-844e-a000f8d522ba	1	Other	Other
+9282ea46-f5c3-4f06-9d3d-c0572b4ea517	1	Other	Other
+9282f459-6f0a-44ab-8d2c-2d342c9c8c91	1	Other	Other
+92832bae-6f81-4208-b224-7e849d901c9b	1	Other	Other
+92834428-c3c1-4ec5-96f1-d18fd06b31aa	1	Other	Other
+92836d31-c03e-4760-899d-e63075663fdb	1	Other	Other
+92838a23-bed8-4f2d-bcd5-011d29cdb002	1	James	Other
+9283b95e-0051-4677-be03-eaea278cfd87	1	\N	Other
+9283b9f5-1ec1-42ae-bbcb-b45637efb657	1	Other	Other
+9283b9fd-f196-4356-a164-58479f3722a5	1	Other	Other
+9283ec78-81a7-44d2-bb34-37af01e1a6e0	1	Other	Other
+92841a0a-bd6d-4031-83f6-555f17d25eb9	1	Other	Other
+92841e40-cf9c-4e37-bde5-f555b90da646	1	Other	Other
+92846a4d-b4b9-4224-8f7f-4488c59b2548	1	Other	Other
+92846b51-0bbe-4368-b1cd-338a79a1c96d	1	Other	Other
+92846ec9-575d-411b-95a7-248b849e17b1	1	Other	Other
+92847797-0058-4e56-9a0a-c0763a43d8f5	1	Other	Other
+92847b72-7adf-4ac4-80a9-0c43ca77c198	1	Other	Other
+92848fa3-4934-4ca5-bff0-59f1e62c2290	1	Other	Other
+92849bc3-cd29-4237-834a-0b8b41f566d8	1	Other	Other
+9284a42f-9739-40bc-a1e2-443fcc89fb76	1	Other	Other
+9284a83d-7832-4421-85a4-4666c38bc29a	1	Other	Other
+9284acf2-55a4-48ce-aca0-2b9b92ef2ff9	1	Other	Other
+9284be63-a32d-45e1-99b7-6946cf94e1c4	1	Other	Other
+928502b4-5454-44de-b382-07de25d2d4f1	1	Other	Other
+92853b74-c550-4e9d-8273-ced114e0913a	1	Other	Other
+92854af0-c8de-44bc-8eaa-079082b710b5	1	Other	Other
+92856a0b-39a4-4938-9dee-3328f746a78d	1	Other	Other
+9285af91-34fa-4a1c-a252-bcc0777978ee	1	Other	Other
+9285f2fb-d51b-4537-a8e5-63b9dfc39c6b	1	Other	Other
+9285f5bf-f020-44d8-bfa5-cdcdd01c3112	1	Other	Other
+928618ff-0dc8-4977-a219-27eb009d2925	1	\N	Other
+92862041-68f5-4157-b791-e33cc7fbaf20	1	Other	Other
+92862c0f-5e42-43da-a4d4-d7c45111f1cd	1	Other	Other
+92867f0d-7e7c-4cd3-b315-8ec98c477aba	1	Other	Other
+92869f4d-fb9a-40e9-8a4d-1baff31344ac	1	Other	Other
+9286d005-e81b-4cb9-84bd-09689ba69949	1	Other	Other
+9286ee29-a031-45c9-8a8a-6cf3c832ecf1	1	Other	Other
+9286f6ce-a9fd-4e6c-96c0-5934c6e84adb	1	Other	Other
+928747ed-1dbc-43ca-8654-c7efff8226e1	1	Other	Other
+92874b35-c6ca-435f-b7da-e08ff94055ba	1	Other	Other
+92875e8a-6554-4f56-9195-5a6aabbb5223	1	Other	Other
+92876ae2-37a1-4506-a27b-e7b80bd3f42e	1	James	Other
+92877f99-61b0-4b8d-b166-96c533dfe2a1	1	Other	Other
+92879cb6-4a5a-4f6e-ac75-04db41b73871	1	Other	Other
+9287cd52-ec05-481a-b48f-adddb0344f33	1	Other	Other
+9287f656-c91b-4bac-93be-4f32b8080639	1	Other	Other
+92884872-ea1b-45ac-b624-4e8f603457cd	1	Other	Other
+92886222-f4d5-40d0-b583-c259ac967be1	1	Other	Other
+92887151-c571-4812-b416-3323b06ca690	1	Other	Other
+92887c4b-5586-48c1-8a8d-674f18c4da60	1	Other	Other
+92887f3c-b088-4f46-bc2e-3a84d21438b3	1	Other	Other
+928896fd-7bd4-44cd-816a-ede986fd6800	1	Other	Other
+9288b307-4e96-458b-82bb-fc84903ce55b	1	Other	Other
+92894922-a1a9-4c01-befc-79a06089b8f1	1	Other	Other
+92896c58-8ddd-47e3-b26e-4f14421f2511	1	Other	Other
+9289a66b-0e8e-4155-813e-67434028ac6a	1	Other	Other
+9289f914-8028-4011-93e4-f0c5ecb7d075	1	Other	Other
+9289fd7d-f2b0-4861-b362-55fb5d9f175e	1	Other	Other
+928a0165-204b-45fc-affb-90cd5b9618f9	1	Other	Other
+928a6d6c-09af-4f4a-ab10-0834c9736531	1	Other	Other
+928a9c0e-d362-4015-bc89-b4a528f22dca	1	\N	Other
+928ad36d-8b31-46ed-8eba-c22068607956	1	Other	Other
+928af549-607d-427b-a717-d1705a758e98	1	Other	Other
+928b1618-85c2-4aa8-b5c6-dcabc196f727	1	Other	Other
+928b217c-6952-4095-aff0-1f970dfa2a23	1	Other	Other
+928b540c-7817-46c6-9209-1f3323cb7a0f	1	Other	Other
+928bcd69-a9d5-49d0-96f2-89f3642e4867	1	Other	Other
+928c2a36-9e92-4b5f-a0f3-f223616a1e96	1	Other	Other
+928c3b30-1d04-44d9-af2b-4b87b7aa3be5	1	Other	Other
+928caf6a-c940-4171-b947-ad2563925f0a	1	Other	Other
+928cd853-44b8-4032-867c-c022bf7e384c	1	Other	Other
+928d45e9-8fb3-45f9-8631-30b802680f68	1	Other	Other
+928d46ad-8e6a-4f82-b0d2-657aa6009bb9	1	Other	Other
+928d5ec7-b940-4238-a5aa-cf31b68f4d44	1	Other	Other
+928d8f33-13d1-4a36-81de-1075aa85a443	1	Other	Other
+928d97c3-9844-4bf6-940a-f53ce36fbb7e	1	Other	Other
+928d983a-55ac-4c08-9811-36f292d44363	1	Other	Other
+928db2ee-3f70-4d54-9d57-aeadcdb86024	1	Other	Other
+928dd4a2-1e2e-4a53-a7a5-d98798cdf15e	1	\N	Other
+928e2dd2-4fca-4746-8227-9cec541c4dca	1	Other	Other
+928e5460-b4b8-474c-bc19-3d22c418ae84	1	James	Other
+928e56ba-ccc7-4b6a-8c79-5c4c6674e9bb	1	Other	Other
+928e578b-4af3-4c2d-8a86-8542b1fa70bd	1	Other	Other
+928e7cf6-8057-43fb-bc5f-f1ffd2765ed0	1	Other	Other
+928e8652-3463-42aa-8f9e-270f28eb0865	1	Other	Other
+928ea29f-69db-4d97-b1e3-522fd71b726f	1	Other	Other
+928fac9b-aabe-44a5-9924-0ed85f2eeed8	1	Other	Other
+928fccd7-9ab7-4eee-ba23-ac95920f3dc4	1	Other	Other
+928ff4a9-a0a5-4e95-87ab-ad7586057b90	1	Other	Other
+929015df-64b6-44c9-8abb-08d912a8913f	1	Other	Other
+9290dd09-75ff-439c-b9f7-9f1abb4623d0	1	Other	Other
+929105c9-90e0-4323-a04a-1eca4fb98d4a	1	Other	Other
+92910eec-296e-4090-9306-6b1ddccffde1	1	Other	Other
+92919c92-3b33-4b1f-93dc-750067c7ea71	1	Other	Other
+9291e78b-53e3-48b6-99b3-890e9b404d23	1	Other	Other
+92920a0e-9bf5-4c9f-aa6d-3173ac073237	1	Other	Other
+92920bc8-9e18-4d61-b86b-f23ea7428981	1	Other	Other
+9292a4bd-50fb-45ee-9017-393fe3878654	1	Other	Other
+9292eb4c-a451-4e97-8273-12dcf1c62144	1	Other	Other
+929363a2-917e-40ac-9954-af9e8e1b995a	1	Other	Other
+92937807-2f60-4f11-8756-1556a6d8d599	1	Other	Other
+9293bd4a-edb7-4bea-a630-95a15d209273	1	Other	Other
+9293ed26-82e7-48f8-906b-d53b00227357	1	Other	Other
+92940052-f57a-4753-b689-42aeec078d3e	1	Other	Other
+92941eb6-3cd3-11e8-a31b-fa163e8624cc	4577d246-1441-11e7-8897-fa163e4dd901	Other	Other
+92943f5c-1a13-4cab-b1fd-4ed89abe8f05	1	Other	Other
+92944859-9fb0-4993-a910-a14d0829eeef	1	Other	Other
+92947952-0622-4f79-a79e-94ff85599a80	1	Other	Other
+92948056-ddc5-4afb-b793-9b009a017857	1	Other	Other
+92949ec7-9e9a-405d-bb34-f3f578509db9	1	Other	Other
+929500d3-5607-4815-8168-956136b8bc88	1	Other	Other
+9295295b-8006-485f-b6b5-6691ba2e9a4e	1	Other	Other
+9295616e-64e9-4462-ad4e-c415a14dd3f2	1	Other	Other
+92959fe5-0d14-495f-8d3d-375c20cd9580	1	Other	Other
+9295e279-0372-475f-8231-a13c584ffc13	1	Other	Other
+9295ece9-31ef-4c79-a15d-758d5197e2ba	1	Other	Other
+92967ece-03c7-4435-b783-e797a644ac7b	1	Other	Other
+9296b831-7b31-47f7-b52a-6efa3559e150	1	Other	Other
+9296c107-5e77-4384-b9ed-a4ffb303582d	1	Other	Other
+9296dfa8-2ae8-4c6e-9262-c8e58a8ebf88	1	Other	Other
+92975603-bd40-4366-85c8-cd4de716e192	1	Other	Other
+92975e83-f073-45fd-99ec-8b60cef9721c	1	Other	Other
+9297884e-a68d-457c-8ab3-08fc3f9ba211	1	Other	Other
+9297a62b-6a48-43a2-9ff6-679f6e7725e2	1	Other	Other
+9297bd1f-d130-4a16-a583-c39c547cfa74	1	Other	Other
+9297d7d0-5f23-494a-b324-123b4ee1965d	1	Other	Other
+9298177a-4b52-46c2-81a1-970699aa9418	1	Other	Other
+929874ff-dc4a-411d-af50-073ab4d011c7	1	\N	Other
+92987caa-2897-4ee6-9c55-7b6e15576049	1	Other	Other
+92988ecd-c2f6-4113-8c64-ae8b1d43cf7c	1	Other	Other
+9298d9e2-6eba-404e-852f-df590013bb1f	1	Other	Other
+92992255-c04e-44e1-82d6-75c240f86bbd	1	Other	Other
+92995ea9-3519-40ac-867c-2b5a5bd07726	1	Other	Other
+92998495-9e8b-418e-aa2f-3b1d15850ba4	1	Other	Other
+92998a8b-81c8-4f5c-bbde-f6ae41e76974	1	Other	Other
+9299d0fe-c120-4532-b5cc-77f107f72b2a	1	Other	Other
+9299d154-f85c-433e-bab7-b62fc7144c9e	1	Other	Other
+9299f41b-ff83-48cb-ad92-5bd4758cf273	1	Other	Other
+929a03b9-7787-413c-b352-562f86eb102f	1	Other	Other
+929a7cb2-2fc3-4e6d-b2af-9d5a6cae4b2a	1	Other	Other
+929aadc2-c332-4967-ae8e-6cd89e12864f	1	Other	Other
+929b095e-1029-4492-b14c-9682f0d3fcd5	1	Other	Other
+929b6c55-12cb-4756-93d8-6b50b1f30069	1	\N	Other
+929b9323-d27d-4ec0-97a3-a2fbb87849dc	1	Other	Other
+929bf9ca-5b8d-432a-95a8-c6ef1647a522	1	\N	Other
+929c2dad-edee-45ca-a7bf-a612d8b8429a	1	Other	Other
+929c2feb-f240-49df-88fc-3be32ac805b1	1	Other	Other
+929c3d4a-19a1-4765-b91b-f585c4caf1cd	1	Other	Other
+929c45bc-a320-45db-b02b-14934b637b0f	1	Other	Other
+929ce956-f8fb-4837-b758-f9397f598cbc	1	Other	Other
+929d1aed-95c4-4431-a3ee-d13392bb96d9	1	\N	Other
+929d280e-4699-4784-8536-4f6fd6da65fb	1	Other	Other
+929d28f2-b745-4f4d-bd00-60d5ba9f7dd1	1	Other	Other
+929d5691-86f1-4113-9e38-fa0b18b87961	1	Other	Other
+929d56a4-b671-48d9-82f1-1ceddc2f7854	1	Other	Other
+929d5ae7-fee2-4117-b837-285f8e510628	1	Other	Other
+929d7fb1-0b5c-44b7-ae96-f537d1b77c61	1	Other	Other
+929e1c6b-f251-4d9f-a0dd-6ece82877f01	1	Other	Other
+929e21ac-e3ca-4fd2-8b03-1346fee26577	1	Other	Other
+929e3aff-38d4-4a03-b1df-5cf35b641a77	1	Other	Other
+929e5db4-b391-4be5-9257-ee7e02e2ffa8	1	Other	Other
+929ed8e2-809e-427c-ab58-b7cae62c2409	1	\N	Other
+929ee889-e3f5-4616-a2cb-61a96fc4568d	1	Other	Other
+929ef417-37da-44e6-a6e5-b98fc40f2627	1	Other	Other
+929f2c44-247c-48f4-85a9-29c63c9bcd72	1	Other	Other
+929f441a-763f-4031-9189-ecc19f8dfaa4	1	\N	Other
+929fb05c-5071-4937-a005-a6c5238c7962	1	Other	Other
+929fedc5-a8e4-49c4-9ea4-b256fc80faa2	1	Other	Other
+92a01e8a-8f4a-437e-a40c-3bdd6013df04	1	Other	Other
+92a02d3d-ced7-4437-9851-c2718de30bd5	1	Other	Other
+92a0305a-654a-4b64-b684-7496a216f0f9	1	Other	Other
+92a05516-07bc-4bd2-a866-b724dd2a7448	1	Other	Other
+92a0a2bf-ebe6-4c15-b2ea-dbec9c750dff	1	Other	Other
+92a0a670-52a9-4f87-89ca-db992194563c	1	Other	Other
+92a0d6df-d3e2-4069-a32a-06da0e820070	1	Other	Other
+92a16b1a-924b-4354-8c55-d640d7ea4d67	1	Other	Other
+92a19081-fff8-458c-be15-8053dfe8dd03	1	Other	Other
+92a1959e-5f4c-456e-b269-56f61f1b8771	1	Other	Other
+92a1ae1e-2023-4887-be6e-f80e88f1ae91	1	Other	Other
+92a1b673-b22f-40a1-847e-10dc33e9c8ee	1	Other	Other
+92a1d370-04d1-4b0a-8e4f-8b6528dbbef8	1	Other	Other
+92a1f0c7-056e-4777-b01c-2285b9a68c36	1	Other	Other
+92a1f700-f2af-4b2c-80c2-6d513365cdb3	1	Other	Other
+92a2913a-e650-43d4-bb48-8a4bc79edb71	1	Other	Other
+92a2ad4a-a4f9-4aa5-b9d9-e083cf443fa2	1	Other	Other
+92a2cf95-457d-4191-9bc2-e28235054bd3	1	Other	Other
+92a32fcb-9dd7-43da-9b2b-754b666cd305	1	Other	Other
+92a34145-c1dd-4be3-ae83-414544f2a17d	1	Other	Other
+92a39168-14dd-4546-9102-a8fed99f73ad	1	Other	Other
+92a3d2df-f469-4106-bfee-982be294f546	1	Other	Other
+92a3d90f-3f76-4916-8b9f-c1a8efc3cfb3	1	Other	Other
+92a425b5-c6af-435b-8152-526e99e7bcb9	1	Other	Other
+92a42b3b-be14-401d-b09e-637c51f6a522	1	Other	Other
+92a43b8b-fc53-4c46-8279-1428da335b93	1	Other	Other
+92a4435e-60ee-4c9d-b496-094eb38d6084	1	Other	Other
+92a448e9-29e0-4963-82e0-4dc1e09c7206	1	Other	Other
+92a45d18-9f8e-4a25-83b1-2ec6221adf59	1	Other	Other
+92a47baf-9de1-42aa-ba5a-4d27e2b681b7	1	Other	Other
+92a4aa49-c46f-4521-b383-bc1fc125df3f	1	Other	Other
+92a54910-892f-41a6-aa5a-70ba9a6d477c	1	Other	Other
+92a5bb5c-9584-4a69-9825-f0048be084d3	1	Other	Other
+92a6c471-2dce-458b-8cf8-1aacd6ef0b1a	1	Other	Other
+92a6c51e-4cae-4f8d-9717-6905747e4558	1	\N	Other
+92a73dd2-66ce-48b4-bfbd-11d88a93f554	1	\N	Other
+92a73ea3-f27b-40e4-8ce8-49fcc9b48013	1	Other	Other
+92a74b92-5280-4aa5-84ee-7f9afc500721	1	Other	Other
+92a76200-dd4a-4bb8-84de-705602540784	1	Other	Other
+92a762d7-7dab-4552-9b7b-897f38a66a17	1	Other	Other
+92a81217-72ff-422b-a37f-f6d1c6022521	1	Other	Other
+92a82ac6-07b7-48a8-a960-47809a030ac9	1	Other	Other
+92a83ee7-de17-49df-a196-060fe7190d92	1	James	Other
+92a845e1-2e3f-4318-9925-9c4ff3411cd3	1	Other	Other
+92a867a5-bb67-4f42-b05d-abe13563199c	1	Other	Other
+92a89b2a-2bf0-412c-926f-61774b820216	1	Other	Other
+92a8aef0-8110-48b6-9e12-48beb4364df6	1	Other	Other
+92a8c580-9602-4ba1-923d-5d7e584bbc48	1	James	Other
+92a8d036-5057-4d4e-8de3-20a2a8d2a1bb	1	Other	Other
+92a8d458-c9a2-4394-b427-54347e40db24	1	Other	Other
+92a8d4af-3089-49e8-a7cd-f4ce9c5936d6	1	Other	Other
+92a8f561-eee7-4e15-a599-50309274eb52	1	Other	Other
+92a90d5b-0fd0-4f04-b70b-e4d50878a146	1	Other	Other
+92a99865-531e-42fd-9214-cb84c04b520b	1	Other	Other
+92aa2e46-9308-4715-b25a-b7f13612f0a3	1	Other	Other
+92aa5e48-d0ab-4a16-a96a-8f6b159be888	1	Other	Other
+92aa5e80-03db-44bb-ad44-9d20ab6f86be	1	\N	Other
+92aa9e8d-d363-4d8d-ba43-684b701dd0b0	1	Other	Other
+92aa9fea-b2b5-4fff-81df-98bb26995cf9	1	Other	Other
+92aae0b8-24fd-4e1c-8678-a0aa1f830456	1	Other	Other
+92aae59e-3c94-4193-af21-098c6b9c0994	1	Other	Other
+92aafe1c-9ad0-4c0f-9f36-117e82b1a37e	1	James	Other
+92ab037d-6230-4b39-97c9-f7a26750c7bc	1	Other	Other
+92ab39ac-df13-4eda-851a-8613efb43caa	1	Other	Other
+92ab3df9-a3a9-48d6-a8c8-cecdc5108179	1	Other	Other
+92ab45f2-8bf9-4905-84a4-6aee303d2a9f	1	Other	Other
+92ab47e4-76c4-4126-93e9-3889672477c3	1	Other	Other
+92ac0a0b-fc53-4d8d-8bf7-8648e088ffc4	1	Other	Other
+92ac92c1-a214-4e4f-834e-95a31102af35	1	Other	Other
+92aca895-c104-48c3-95e1-ac66fc501257	1	Other	Other
+92acba19-4139-4b87-8e68-721f00f16325	1	Other	Other
+92ace0c1-aae9-4759-9356-8c66e1aed25a	1	Other	Other
+92acf73b-a888-4b71-b7a5-6b3d70a9df1b	1	Other	Other
+92ad4b60-0de1-430f-8514-2d63dcabe09c	1	Other	Other
+92ad5fb7-64bb-4ad1-a872-2a3dfb26fd52	1	Other	Other
+92ad8c9e-c17d-4f8b-88ca-31bd66dbddba	1	Other	Other
+92ad9071-c540-455c-8657-475241b6f319	1	James	Other
+92adf66d-e51f-4856-b300-34fd4ee9644d	1	Other	Other
+92ae2501-d563-4e48-af8a-a56a8a1a7ca3	1	Other	Other
+92ae402e-f3a8-4671-9c75-60ac6c4eb08e	1	Other	Other
+92ae506a-d037-4f8d-8bd1-14e4d44ef33f	1	Other	Other
+92af017b-ffd6-4288-941d-7bd606d7f1c7	1	Other	Other
+92af1179-797a-48e6-84c1-578b3c42ab61	1	Other	Other
+92af1b34-e17e-4903-9f0e-85c9cf340f33	1	Other	Other
+92af5b6f-d432-464e-abc1-f2d8580285b7	1	Other	Other
+92af69c5-963b-40b6-ae7b-dafe82c56d53	1	Other	Other
+92af8d9d-e6f8-449e-899b-9f02fb1b134a	1	Other	Other
+92afd05c-a1aa-41b4-94f8-49bf96a50a91	1	Other	Other
+92afef5c-9884-40be-8bc3-68ac661e3d8a	1	\N	Other
+92b01712-71e9-4811-b93f-ec6caa76f8e1	1	Other	Other
+92b06160-549b-458c-8f7d-ba6bc0cbab53	1	Other	Other
+92b06a9e-f672-4f22-8cfe-df1777c439c1	1	Other	Other
+92b076b7-f970-4f86-9dc5-914f11f92ecf	1	Other	Other
+92b07949-4bc1-469c-b785-165ee17a588c	1	Other	Other
+92b17560-0c34-4dcc-9d46-87286610882d	1	Other	Other
+92b178c6-8759-452a-8759-e6421742d71e	1	Other	Other
+92b17b9e-5c7a-4483-b25e-53e5368a2dc3	1	Other	Other
+92b197ee-5fc5-4b96-847a-9b942c44c32e	1	Other	Other
+92b19d45-d5b2-41a2-9a35-416358a166cc	1	Other	Other
+92b1b594-0a70-4798-89b6-533de8c113d9	1	Other	Other
+92b1e0f5-93f0-4cb2-bbf3-6be7a40b2e9e	1	Other	Other
+92b1e4d4-ff6f-47ee-972c-d382fe957434	1	Other	Other
+92b1f29f-7058-40e1-a035-cd9e2da03eb7	1	Other	Other
+92b2db9f-df0e-46cf-8ec0-89871449ee39	1	Other	Other
+92b2f162-753b-4c55-bdaa-1b29a3fa0ea5	1	Other	Other
+92b2fb49-e47e-4936-b446-7f7e1f13b5bf	1	Other	Other
+92b2fc46-9758-4620-98ff-dd6410a38acb	1	Other	Other
+92b334e9-669c-49eb-8bd1-0b5990f726c6	1	Other	Other
+92b34df6-b144-49e5-b0e8-12a4d572b02e	1	Other	Other
+92b376b6-5c24-4f6b-b506-2dd0912d0fae	1	Other	Other
+92b3ff83-5b69-4f10-bce4-b423885eadd6	1	Other	Other
+92b43887-d9ee-461d-afff-eb348605e2ec	1	Other	Other
+92b47555-1bfd-4aa6-99b2-a4eb7335e3c8	1	Other	Other
+92b475fe-b761-4d9f-ac5c-ee826ba506e9	1	Other	Other
+92b48ec4-365e-40a4-9c8b-e6829968ec72	1	Other	Other
+92b4e3a8-7a5f-4afc-bded-35a3e9af73d5	1	Other	Other
+92b59416-77d1-4713-bdf0-deee4ab17c53	1	Other	Other
+92b5c32f-8f31-48b7-9e79-1908e8c3a021	1	Other	Other
+92b5f2bb-79cb-4778-b856-f0598b60a584	1	Other	Other
+92b61440-5684-4928-b769-f7d48500481a	1	Other	Other
+92b67337-a47d-4269-bca8-393af42c95a2	1	Other	Other
+92b67c70-c61d-4be1-a5c4-d1a0a308e0dc	1	Other	Other
+92b68250-075a-4c46-a447-42d0e03e6919	1	Other	Other
+92b6d168-5114-4e74-b50d-0ec05d88540d	1	Other	Other
+92b6f61c-c504-40b6-8b25-0181d352db34	1	\N	Other
+92b708a4-a0dd-4602-9b52-5cda16677074	1	Other	Other
+92b7b9d9-2191-42a8-9017-3e018439f098	1	Other	Other
+92b7bfe5-c58f-4b92-be05-2182f2365e19	1	\N	Other
+92b829d3-1115-451f-8442-a0435b8eb8ea	1	Other	Other
+92b8457e-0f4f-432a-af8c-52aa54161f16	1	Other	Other
+92b880a7-d5fb-49e0-a27a-fc0d8706920d	1	Other	Other
+92b89d04-5877-4c62-b9d6-9220af698fc2	1	Other	Other
+92b8c5a9-3e25-4efe-8175-f2bccb28b5a4	1	Other	Other
+92b8d5f2-97c6-40f6-ba1f-b5d244a9ff52	1	Other	Other
+92b8f81a-8a61-46c7-bdd4-31729bed440c	1	Other	Other
+92b92c05-ee23-4ad6-bb74-9c61dab78755	1	Other	Other
+92b9c1c5-cf53-4211-b19d-6156648a104a	1	Other	Other
+92ba51f0-906b-4682-b3a4-c4cc8d02b223	1	Other	Other
+92ba9958-7325-4a8f-93bb-5fdcdf4bf50b	1	Other	Other
+92baa3d3-9e22-477a-8f33-170180907eec	1	Other	Other
+92bb2f3e-5319-40ac-9420-3cf0764851e6	1	Other	Other
+92bb448d-b0fd-4d02-87b4-58820d02ccda	1	Other	Other
+92bb690d-938c-40da-b0f3-8d71e0a01927	1	Other	Other
+92bbaf77-7cff-4055-9c55-412bd251869d	1	Other	Other
+92bbccfd-3ed2-4b37-a543-fcc3843e13e5	1	Other	Other
+92bbf19e-d16b-4f07-a250-dbd4ef8c385b	1	Other	Other
+92bc12ed-ae82-4525-b4a4-14c1607ba086	1	Other	Other
+92bc416e-1780-4db0-8048-2aa5c45e32fb	1	Other	Other
+92bc8744-6909-48ae-b308-038e4f15b511	1	Other	Other
+92bd261d-7245-41e1-b15c-ea3feeb6f319	1	Other	Other
+92bd7792-ecfd-4843-90d1-87ec616eb861	1	\N	Other
+92bd9d76-bc93-4b9e-9118-f9de4d1499d2	1	Other	Other
+92bdd6bd-dbc9-4bf1-82fa-a56c38aaad2a	1	Other	Other
+92be37ed-5d24-449f-9377-479b9fbbd26f	1	Other	Other
+92be5efc-5b8a-4103-9e6c-d01c1525d8df	1	Other	Other
+92be6706-2225-4aa4-82d5-6f97b785b9f6	1	Other	Other
+92be8f8d-7057-45b2-b400-847f0016b477	1	Other	Other
+92beaf02-3ca5-4177-b171-5da311f5e70c	1	Other	Other
+92befb35-26c7-455d-97ed-dee6559a184b	1	Other	Other
+92bf1fcc-517d-4ec2-a5a4-544fec7688b4	1	Other	Other
+92bf9361-a81f-4454-bded-e305142d9bc0	1	Other	Other
+92bfb0df-715b-4831-b1e3-f242690da591	1	James	Other
+92bfb985-f802-49b4-a9ad-60925cda7631	1	Other	Other
+92bff421-3943-42cb-b662-e41c7af307bc	1	Other	Other
+92bffbc4-cace-4800-a97c-db6cfeccd2b8	1	Other	Other
+92c01efe-0ea1-4c44-8c65-3edad59955b2	1	Other	Other
+92c0b66c-a00d-47aa-8cbe-fc33b475887a	1	Other	Other
+92c1204f-71d1-4c89-8224-de1e1b1a385c	1	Other	Other
+92c13da6-2a14-4f1f-afb6-8e99b11d6d76	1	Other	Other
+92c15c28-f9ad-420b-bc91-2f9f21099079	1	\N	Other
+92c1d2b6-c1c3-45ea-92f3-2c12ad5306b9	1	Other	Other
+92c239fc-6066-498a-9a17-87390b16ffd9	1	Other	Other
+92c25b38-d7fb-4745-826f-857d7f273677	1	Other	Other
+92c26076-cb3c-44c1-b434-8afde9eddb47	1	Other	Other
+92c2670f-d7ce-4cce-9415-077b2fa473fa	1	Other	Other
+92c267f4-e5a0-4b4e-9c58-f5e12702be7d	1	Other	Other
+92c2a7c9-5406-4686-b3d2-2cd2379818f9	1	Other	Other
+92c2ecb5-03a9-43e1-8e3e-b51a271fecc6	1	Other	Other
+92c30ba3-6d98-4cd5-9a34-b4a6c20e30a9	1	Other	Other
+92c33d03-49b3-49b8-b132-80a6f90bb1a5	1	Other	Other
+92c37958-700e-4c8d-8bcd-1a5e24da2409	1	Other	Other
+92c392d9-bf52-4682-9eb6-de895d9ee6e3	1	Other	Other
+92c39345-3949-4d96-baca-15caf4fffafc	1	Other	Other
+92c3a98d-9112-4a69-9c2a-e1a5e65e2199	1	Other	Other
+92c42d65-c9ed-4fb3-87d8-8d3ec5eabda7	1	Other	Other
+92c43cc0-f527-11e7-a2c5-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+92c53a49-4c07-4fc6-b534-eaa62cdee7c3	1	Other	Other
+92c53ed0-4d09-4b5e-9be7-3f58a28363fe	1	Other	Other
+92c550fd-4c24-43db-9d91-879b1efdefb4	1	Other	Other
+92c5d02c-d53e-41f4-a800-48fe154d18fc	1	Other	Other
+92c5e1ad-6bc1-4944-adb9-82680f10d5db	1	Other	Other
+92c6290a-8414-4db7-9008-7ec53afbff53	1	Other	Other
+92c6cac1-20d8-4267-8717-77d94c4f3a45	1	Other	Other
+92c6e729-7e7e-4498-a566-314ede608a39	1	Other	Other
+92c6ee7e-ee2f-4456-bc12-786d1ed83372	1	Other	Other
+92c71ab6-a369-4d44-9998-bd0fe706d8bb	1	Other	Other
+92c750ac-3886-4fbf-984f-4d132fc85022	1	\N	Other
+92c75ad6-b54a-4826-983b-bf0836a3b26b	1	Other	Other
+92c75c08-2fde-4f51-bb36-e35caada2e71	1	Other	Other
+92c78f0a-b95c-49a2-990a-7efca9b0568f	1	Other	Other
+92c7cc2e-57f8-426a-aaf5-ebf17848609d	1	Other	Other
+92c7d5d2-2b50-4e7b-b214-132c41295a0c	1	Other	Other
+92c7da16-6d85-40d2-955b-f55590c37ede	1	Other	Other
+92c7e6eb-b93f-48d1-b85b-5bb8fe3ad4b9	1	James	Other
+92c81bbc-547f-4dd8-89ea-c97ce30b2b64	1	Other	Other
+92c84f35-7f4d-41d1-8039-d31ba11970dc	1	\N	Other
+92c8b9e8-4724-432f-a481-b4751613f3f8	1	Other	Other
+92c8d9e3-3754-47ca-bbdc-ed6c83e0877b	1	Other	Other
+92c93347-766c-4e82-880b-6bf789d99088	1	Other	Other
+92c94efa-9203-457d-baf8-b61ba5263e6b	1	Other	Other
+92ca0fa6-5e38-4865-af0a-3319bf98d175	1	Other	Other
+92ca37de-0a71-4a4a-a1af-1e2df483af71	1	Other	Other
+92caf854-843b-4add-9585-35d54e06baa6	1	Other	Other
+92cb3c4f-1933-4235-a58e-d6fb0d15ab6d	1	Other	Other
+92cb9710-6a9d-4b43-84d0-e0298d2dfcc2	1	Other	Other
+92cbe53c-5679-419f-94b8-ebd4169f8a62	1	Other	Other
+92cbedd2-caa0-450f-b1fd-09a6a895a80b	1	Other	Other
+92cc4197-d296-4d87-8455-76ce53f7adcd	1	\N	Other
+92cc4298-da00-4298-9fb6-7b16ab76d7f7	1	Other	Other
+92cc862a-e475-470a-9823-428ed5996965	1	Other	Other
+92ccd128-f49e-49fe-9a19-925949888d44	1	Other	Other
+92cd01c5-7e38-4f5a-83b5-bb4ed58d9e29	1	Other	Other
+92cd336e-8e25-467b-9e6b-7ae55802fbeb	1	Other	Other
+92cd63f9-6221-41c2-af7f-393bc512597b	1	Other	Other
+92cd659b-895e-4c75-917b-7b53d2642eab	1	Other	Other
+92cd65a0-e5c2-49fb-bab4-b2141abcacfe	1	Other	Other
+92cd85bd-8677-4bf8-a90f-68a881365a9a	1	Other	Other
+92cd8d62-22e4-443c-a1c8-d85bcbc15575	1	Other	Other
+92cdf7d6-5065-4279-a3fb-21af698d8f26	1	Other	Other
+92ce6a39-c5cb-4c76-83d9-81819045c198	1	Other	Other
+92ce8f55-ab54-4521-b3c5-8244e2c47bc7	1	Other	Other
+92cec221-8ea9-4dfe-9039-5727c134c818	1	Other	Other
+92ced03a-547a-4e5e-ad61-6bb9be50cc8a	1	Other	Other
+92cf4a85-eee5-4100-b415-7ba181d5ad82	1	\N	Other
+92cf597e-cb2d-4311-9932-f1d9ef0576f3	1	Other	Other
+92cf5bff-4cf5-4049-87a2-a9b3bb54c4cf	1	Other	Other
+92cfddfb-e5b8-4b12-a100-e47c4b78db4d	1	Other	Other
+92d01875-0ddf-4fbb-b1e1-50b4e2df4cb2	1	Other	Other
+92d0804b-b6bf-4162-a89c-cc542489e162	1	Other	Other
+92d0bde1-4011-4012-8424-2f2fc567b7ea	1	Other	Other
+92d10fd6-8ef8-4554-833a-e2330407db32	1	Other	Other
+92d1dfb9-c416-40b2-8bf0-e7fb94fae1b6	1	Other	Other
+92d20f2b-3a62-4c7d-8c5a-663d34f21653	1	Other	Other
+92d285a9-d696-4abb-8339-c504dc478f20	1	Other	Other
+92d31dcf-4add-413f-9749-e568a8c96b75	1	Other	Other
+92d3286d-61c7-47ef-83fc-f5de3288394e	1	Other	Other
+92d382aa-6386-450b-a4d4-a2472126dfde	1	Other	Other
+92d3fbd4-80ee-4dbf-910a-1ea5fb4c3b17	1	Other	Other
+92d4621f-5c85-4e72-9a7c-33a1426368e3	1	Other	Other
+92d505f8-d599-4dc2-a61d-646a10b14b1f	1	Other	Other
+92d50887-8cfb-488e-804b-d99f2aa02e3b	1	James	Other
+92d53bb8-c3c2-4e39-8f7c-77da4e1ddae1	1	Other	Other
+92d546db-e9da-4c11-93cb-107a24665c79	1	Other	Other
+92d54bda-dfb9-4fd4-ae72-023286ab6af6	1	Other	Other
+92d5596e-d507-48f4-b6fc-2f980aaf36e9	1	Other	Other
+92d57992-df9d-440b-b330-aafc203dde6a	1	Other	Other
+92d59479-6f2d-4995-a2e1-deee1ba84604	1	Other	Other
+92d5b7f0-e54e-47c2-9928-959f538d7a09	1	Other	Other
+92d5c444-4dbe-4b00-978d-7529955d6f39	1	Other	Other
+92d5d447-631a-422c-884d-876532898816	1	Other	Other
+92d5ef20-b222-4da7-b219-6eb562344613	1	Other	Other
+92d5f91d-300f-4f09-8660-34527eb49273	1	Other	Other
+92d61455-34fc-413b-af28-d21eaddeec7f	1	Other	Other
+92d691f0-977c-4787-ba1e-00221b2275ee	1	Other	Other
+92d6a3cb-8669-43b8-bd70-1854a1ca9f04	1	James	Other
+92d70dce-83f4-4708-8e11-c5e128660a86	1	Other	Other
+92d795b5-c4d1-495c-baa2-920d42649078	1	Other	Other
+92d79843-8830-4f91-8e0d-639256510aab	1	Other	Other
+92d79a85-35a0-4d35-bb8e-9f8ee242db0c	1	Other	Other
+92d7a2e0-58d8-4738-b56c-bf85a59135bd	1	Other	Other
+92d7c4da-3822-489b-8d80-df8b7551949e	1	Other	Other
+92d7d4b4-53cc-47a0-a159-b492e5e4239d	1	Other	Other
+92d7ea5d-7724-4aa3-ba31-23ff5de9f8df	1	\N	Other
+92d866e9-2c6d-4f47-ae95-179c9f57b1ad	1	Other	Other
+92d8a728-e935-4782-a502-cac4bf9d4d8b	1	Other	Other
+92d8dc81-34ea-45eb-ada4-78458359eb50	1	Other	Other
+92d8fb2d-4d88-4a3b-b22e-004c1ac7ec46	1	Other	Other
+92d95d2f-bf0e-438c-b2d3-ef04daa2ad26	1	Other	Other
+92d9ac80-ddcf-4ff2-ae7e-bdcff1a410dc	1	Other	Other
+92da1854-bf11-4bcb-b921-c5cac4febed1	1	Other	Other
+92da58d2-c7bd-47bb-adcb-06b7bfbc5e88	1	Other	Other
+92da5d9f-0ead-4376-8ef2-dfab3251f66c	1	Other	Other
+92da772c-b7c5-4ae7-8b7b-c240d63fffd0	1	Other	Other
+92da9038-97d7-4fa2-ab66-1b0d1b7a7078	1	Other	Other
+92dab752-d207-4ecc-afad-cd372484bd83	1	Other	Other
+92daca1a-bc7e-4fee-8ddb-29c4d2c3715e	1	Other	Other
+92db3cfd-82ca-4de8-9458-9313ad9914be	1	Other	Other
+92db4b88-c452-4a83-9cb9-5ea046d25aba	1	Other	Other
+92db69f4-2615-4713-bf04-e6d7caf82b46	1	Other	Other
+92dba3f1-6a6b-4acb-8687-3b691e1ba1a4	1	Other	Other
+92dbaf4c-acce-45c0-9d83-f4b4a0fdbe1d	1	Other	Other
+92dbecb7-0332-49d5-bb01-7969688086e9	1	Other	Other
+92dbf0b8-56b3-4d25-b8fe-580c660172ce	1	Other	Other
+92dc08d5-924a-468f-906d-3a267a21e72d	1	Other	Other
+92dc3540-c9a7-4842-8c9a-90739e5f71ab	1	Other	Other
+92dc440d-779b-405b-a9d4-0f43559aa681	1	Other	Other
+92dc648a-a6ec-4f59-8455-ae24cb10598c	1	Other	Other
+92dca614-647e-4a7f-a1f6-cc69e22a1d51	1	Other	Other
+92dcbbb5-48a3-4fd8-b83f-b484417aaf17	1	Other	Other
+92dcc6e4-b02d-48bb-8405-22cfba05965f	1	Other	Other
+92dd7b03-297c-4379-bcbc-14e18d554a69	1	Other	Other
+92dd7f94-f31c-4bfd-9c70-9a45b11410c6	1	Other	Other
+92dd9a06-86a9-4b7f-987a-ad1f1d51c7e4	1	Other	Other
+92dde364-2df4-445b-9bbc-d088bc14efde	1	Other	Other
+92de2639-59ac-40df-a33c-aba39da92755	1	Other	Other
+92de44cc-3633-4bcb-9da6-4399af17e0cc	1	Other	Other
+92de96a5-2eb6-4897-8db5-101b7bbaab8e	1	Other	Other
+92dec195-77e4-482b-895d-416d5422ba82	1	Other	Other
+92dee036-4cfe-4b86-81e1-6669eba0f0dc	1	Other	Other
+92df195b-9685-4602-b864-de3138fcf0a0	1	Other	Other
+92df92e4-528d-43cf-ac3f-1ee4c914741e	1	Other	Other
+92dfdb98-ba16-4654-bae5-320bf30e8ea7	1	Other	Other
+92dff4ed-464a-46c1-98fd-33ede586f7f9	1	Other	Other
+92dff854-d942-472d-8602-ce688121b0c7	1	Other	Other
+92dffbae-28c3-4c08-a739-0646881edc56	1	Other	Other
+92e01696-9fa0-4fbf-91df-56d71cf49cd3	1	Other	Other
+92e092a3-ec7d-4d06-98f3-16d97c65d16a	1	Other	Other
+92e0be28-44d8-4e7e-b751-5f162d6cb906	1	Other	Other
+92e0c2b3-4658-44de-b126-898af9e74d37	1	Other	Other
+92e0cf58-11e5-4d63-b51d-6dbee05376f1	1	Other	Other
+92e0d656-afff-46e6-9c1a-36ad21cab694	1	Other	Other
+92e0d6ee-3011-48e3-bae2-b6456f4b1321	1	Other	Other
+92e1160b-29f9-40fb-a853-671f3ef4d02d	1	James	Other
+92e179fd-faf4-4ecd-9c43-2cff434dd6fb	1	Other	Other
+92e1cb80-5e11-4994-9a36-1e9fa0d0e5a3	1	Other	Other
+92e2424c-f2ce-4b5c-a025-1b3e1616e4f7	1	Other	Other
+92e253cf-8895-4d04-90e4-0811b24f26ec	1	Other	Other
+92e290e6-f673-40ef-9e62-168e0150bd68	1	Other	Other
+92e31ef4-aa73-490c-9317-9a5d4c50e31a	1	Other	Other
+92e35972-cab3-45b3-b790-7c711259cf19	1	Other	Other
+92e3796f-19c7-4920-9a16-dc818934f3ce	1	Other	Other
+92e39135-487a-4055-bff5-d1cb0ce56890	1	Other	Other
+92e3e0a9-09da-47bf-90f4-c7d1cf859894	1	Other	Other
+92e42520-cf27-482d-81b5-a915ad3f1197	1	Other	Other
+92e42f90-0426-4fc0-a9d8-164e9e9cf9e0	1	Other	Other
+92e457a2-af05-4ae2-8ff1-72025d8650f4	1	Other	Other
+92e4710b-890a-492f-9b67-91439046048d	1	Other	Other
+92e4bb76-6dd9-4edf-aeaa-6fc7fbbb0fe2	1	Other	Other
+92e4ed2d-d722-4940-908a-70785b8c4593	1	Other	Other
+92e54e1e-1079-4991-8567-321a9e2bb0c8	1	Other	Other
+92e59865-5b2e-4009-a7ba-37da89cae44a	1	Other	Other
+92e5ac34-b0c4-4429-9b46-fc6539a33bc3	1	Other	Other
+92e5dea2-21a8-4e7e-8af8-4249557feedf	1	Other	Other
+92e5f017-d633-4706-a5c8-9da6157b9b5e	1	Other	Other
+92e605d9-45b4-498b-ba27-d445aa0e6889	1	Other	Other
+92e67fa8-40d6-4e04-a80d-4ec0a9997461	1	Other	Other
+92e697d5-1301-45ac-b35a-1a69a7ce0eef	1	Other	Other
+92e6adfe-4a8c-4486-b7a7-eac235043375	1	Other	Other
+92e6b306-3193-401b-b68f-da27ef224c8d	1	Other	Other
+92e7196f-23a5-4fce-84b7-ff16900e3f57	1	Other	Other
+92e7319a-e4f7-4159-943f-5e14af075f2d	1	Other	Other
+92e79538-4cdd-4bdb-99a2-b279f07c4e6c	1	Other	Other
+92e7ee2f-d3eb-4162-82f9-e0e2258f6645	1	Other	Other
+92e85d78-0dcd-436f-b98e-4f4b840e8dd6	1	Other	Other
+92e86798-7576-43aa-aec3-2fc7e84a0f8d	1	Other	Other
+92e86c4f-ecb5-40f7-a7d2-79d4cc924eb8	1	Other	Other
+92e887d9-88c7-4eb3-b5ec-47f522004960	1	Other	Other
+92e8ade3-37b7-4827-8eb0-f62575e4474a	1	Other	Other
+92e91fdf-797d-4dfa-8093-c834d45e324a	1	Other	Other
+92e95b31-40ab-414f-ab51-d22a0c93bf4e	1	Other	Other
+92e99654-2523-4336-ad18-6355fd0e510b	1	Other	Other
+92e9b90a-ef9b-11e7-b166-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+92e9cdc4-2717-4ec2-bfb7-4508946aef06	1	Other	Other
+92ea07b2-6720-413d-b995-f77f171e0fa0	1	Other	Other
+92ea4a04-a4f3-4769-aaf8-90346cf8761f	1	Other	Other
+92ea89ec-d553-4a7a-8461-9c8c8f2ff5f6	1	Other	Other
+92ea9970-6af5-410d-b956-6d1f1b1f80e4	1	Other	Other
+92eab12e-84c0-4bb1-8045-028c59375338	1	Other	Other
+92eabf55-ac02-4270-8c1e-d1c268265ee5	1	Other	Other
+92eaf344-1dda-4d70-89c9-75d612dad040	1	Other	Other
+92eb223e-00f2-4631-9b3c-cd17ff4f87f0	1	Other	Other
+92eb24f6-5dd9-433a-b1c0-fe84ca722aee	1	Other	Other
+92eb4003-02be-4f00-91d5-9eb41c303723	1	Other	Other
+92eb5be1-6735-4259-a560-6c6c967a86c0	1	Other	Other
+92eb8a9e-bb72-4143-83e1-d94d5907abae	1	Other	Other
+92eb8df2-0d82-4d05-8e08-cd570917eae3	1	Other	Other
+92ebad95-215f-443d-9291-02204f6c7204	1	Other	Other
+92ebd228-9698-4ffe-82a3-9c1b72b79b68	1	Other	Other
+92ebdd29-9fd9-4587-be00-83cf24c2cfbd	1	Other	Other
+92ecab0f-6da4-4770-a4f2-03ce14fba795	1	Other	Other
+92ece671-83d6-40fb-96a5-6dec01ea549a	1	Other	Other
+92ed339f-2c26-47fc-9337-29ebbf08b654	1	Other	Other
+92ed81ed-6b85-4e0a-8c3e-02a59a883c7b	1	Other	Other
+92ed9ca4-02eb-4f34-bf41-6d43f1ac213f	1	Other	Other
+92eda7ea-468b-43b0-aa68-1c75a320727c	1	Other	Other
+92edd9bb-1242-4491-8576-9e545fcfc717	1	Other	Other
+92ee2944-0936-4284-aae5-6ff0a6526b1a	1	Other	Other
+92ee658f-c40f-4295-a49d-f20b9af2d435	1	Other	Other
+92ee6f83-19b7-4054-82f5-51fa4b867762	1	Other	Other
+92ee9d64-87d4-41e2-8523-cb80f646f4d0	1	Other	Other
+92eea07d-c8a0-4c4b-842e-d72e41a26314	1	Other	Other
+92eebed9-0f5f-4ca3-9388-0f2d0fbfdf57	1	Other	Other
+92eef7f5-871a-48a8-9d39-76b122d9ea97	1	Other	Other
+92ef65ee-9376-45e4-95cd-132fcc9e25ab	1	Other	Other
+92ef771b-a82a-4908-8049-58177dcc0dbe	1	Other	Other
+92ef7efe-ac1a-4cac-8ba8-d83ac785b16a	1	Other	Other
+92efb702-f3f0-458f-91ad-58f572b76600	1	Other	Other
+92efca88-3881-4355-9e39-e8381c3d961b	1	Other	Other
+92f01153-6c53-469d-8404-b2681d8a6f18	1	Other	Other
+92f0d9fa-6e9c-40c8-aff9-5916366d570b	1	Other	Other
+92f0e5ec-a47c-4c8b-82ef-4429d772d0b1	1	\N	Other
+92f10034-c66e-4e5c-952f-c9690eb53558	1	Other	Other
+92f163fe-6773-4716-931f-d590703bf158	1	Other	Other
+92f184a5-c6f7-4186-bc71-e5e09b4214eb	1	Other	Other
+92f1912f-bf1f-4703-8471-50efc714c9c1	1	Other	Other
+92f19a5d-dced-443f-a786-89b15ebf9dca	1	Other	Other
+92f21c0c-f296-4bc1-9d93-c81fd24548e5	1	Other	Other
+92f29629-11f0-49c2-b8c2-823d3973a832	1	Other	Other
+92f2bde9-0909-4634-bbf5-5f966cb96205	1	Other	Other
+92f2eab5-d0b1-46f0-a8f3-dda66d7bd06d	1	James	Other
+92f2ff5e-1b26-462a-9a9d-60716f02662f	1	Other	Other
+92f2ff9c-e5a3-46d2-abaa-7f4e69a9a959	1	Other	Other
+92f30ed4-f66a-4f6c-ba38-9f1078d6993b	1	Other	Other
+92f31ab4-ab13-413a-bac8-4ead82654c64	1	Other	Other
+92f36bec-be64-4e40-870f-e9a7b92e488c	1	Other	Other
+92f383cd-e151-406f-983e-afff9eca5801	1	Other	Other
+92f391b1-fa31-476d-96da-ad94364bb90a	1	Other	Other
+92f3998a-3163-464f-bdfd-5be776412790	1	Other	Other
+92f3f225-61c6-45aa-acb4-361a20a5d961	1	Other	Other
+92f3f49b-50f1-414a-9c99-0b7552063f93	1	Other	Other
+92f4187a-3137-4610-ac9b-715f418cec3f	1	Other	Other
+92f42a59-ef50-456d-9839-6364b9547c6c	1	Other	Other
+92f463b3-123d-4034-92f5-baca65f73424	1	Other	Other
+92f50f93-c446-4ecb-9549-7f488f2ea573	1	Other	Other
+92f57e2c-3749-4887-884f-989fd39bc835	1	Other	Other
+92f59f9f-29e3-4c07-b6f1-8a66167ce3ed	1	Other	Other
+92f5b4bc-d9d8-4824-a5c4-00e4f59a7cfe	1	Other	Other
+92f6aa6b-0895-4c8c-9f87-1c62e4ae771d	1	Other	Other
+92f7206b-0b05-4f55-b603-12106828b0a3	1	Other	Other
+92f76c36-cd5d-44e5-8d02-06dc28474011	1	Other	Other
+92f7abeb-0eb7-4e39-8570-3949a2b8786d	1	Other	Other
+92f7eb4c-1a13-4c7a-a661-c876238dd3e6	1	Other	Other
+92f80bec-532c-496d-b189-2a665b2b64b9	1	Other	Other
+92f8a812-6be9-411f-bb92-72e85f4d0524	1	Other	Other
+92f8b8d3-45ba-45e7-8e62-d55069f59b2f	1	Other	Other
+92f95418-489c-4851-ab89-0ebf028b810e	1	Other	Other
+92f966d9-c32b-4fab-84cf-987e2acad4bb	1	Other	Other
+92f96e39-4d10-40e7-b62b-3a3edf5ce800	1	Other	Other
+92f9705b-5033-4b8e-9556-150d6d2d0a8e	1	\N	Other
+92f974e9-8308-4ade-950b-2b991bf57af7	1	\N	Other
+92f9806c-3fb2-4c78-bb92-956197d9327e	1	Other	Other
+92f99674-1255-43ad-8f0f-14d8db4ecad8	1	\N	Other
+92f9a9e6-ecfe-4b3e-876a-32c9b31fc778	1	Other	Other
+92f9ca6a-ca38-4643-80a9-532b9be38569	1	Other	Other
+92fa72ab-ebe6-4d5d-b3da-c3e156640979	1	Other	Other
+92facd9d-a53d-4718-92c5-107ff804ae62	1	Other	Other
+92fad623-ddfb-46dd-b690-931408c63afe	1	Other	Other
+92fad9bb-6db1-4f6d-988a-619349fa6996	1	Other	Other
+92fadd49-28d5-449e-93a2-63fa933341d1	1	Other	Other
+92fb5069-7ef3-45df-86ac-67a16a3ef96b	1	\N	Other
+92fc4697-89fa-422b-83d4-556838b3c9db	1	Other	Other
+92fc5080-c35c-4147-bade-d27a6cf79a90	1	\N	Other
+92fc6dd5-dc61-4342-a966-2b4b41117f59	1	Other	Other
+92fc87f7-b8f2-45e6-8c15-429362d44a65	1	\N	Other
+92fc9124-c23d-4a17-9587-76616f79e513	1	Other	Other
+92fd05be-a508-4a1a-9160-8ac38b6acea4	1	Other	Other
+92fd1966-97f8-4f38-a66e-77ce815070aa	1	Other	Other
+92fd886c-c3eb-4b0a-abc9-eee627a2c60d	1	Other	Other
+92fd9112-0e4a-4a07-9b4a-d464c613a4e7	1	Other	Other
+92fd9832-b4af-484c-bbdb-8382f169020b	1	Other	Other
+92fd98de-ce26-43aa-bdab-54ca67e2437a	1	Other	Other
+92fd9cab-72d0-449d-a27a-4dd6ea6f28dd	1	Other	Other
+92fe02fd-1b74-418d-aeb6-8426bde8a0c2	1	Other	Other
+92fe460a-05a7-4c0a-9b36-75be2f4aa1d1	1	Other	Other
+92fed3ba-1f3b-4dc2-9db3-93d1daa69753	1	Other	Other
+92feea7c-28cd-40b8-b7b2-8bf14ba237ae	1	Other	Other
+92ff1298-c81c-4cab-90ed-8490a73620aa	1	\N	Other
+92ff3ccd-1620-4b64-bbd0-9c74cf40847c	1	Other	Other
+92ff6124-e9b7-4d87-b815-b82f065f9afd	1	Other	Other
+92ffcf09-abf9-4d7a-b14e-93439dfe3e66	1	Other	Other
+92ffee69-5c5b-4277-b88a-93cb2767ea4b	1	Other	Other
+93004056-b7d7-4622-bf47-4cb6719600d4	1	Other	Other
+93004eaf-6748-4c3e-830c-40d7be9a6dad	1	Other	Other
+93006016-ca47-475f-a74b-ea57229455e2	1	Other	Other
+9300c1a6-2e7a-4aa6-b75d-9ddfc52cdfea	1	Other	Other
+93013bbe-6db4-4347-8b37-1f738d16f6b8	1	Other	Other
+93017a8f-4ab4-4bb3-8bce-cde5e2154c67	1	Other	Other
+93017ef9-2440-4568-8663-e2493c64f7b5	1	Other	Other
+9301831b-f596-44fd-ae6c-0b6b1f068276	1	Other	Other
+930184bc-be46-4ff9-9f72-fb05badd2064	1	James	Other
+9301d575-a83f-4086-92c6-9f19313bbd66	1	Other	Other
+9301db32-aeb5-472c-a40c-6aaacbb660c1	1	Other	Other
+9301f4bb-1538-417f-b9cc-70452c56eadf	1	Other	Other
+9301ffbf-6f71-4699-9134-fad313635509	1	Other	Other
+930200dd-82e1-4257-bd09-39ffac271ba8	1	Other	Other
+93026a10-f015-43ee-acc7-30a784399f3c	1	\N	Other
+930284b0-c2a0-4fe1-b5c7-679d7b19175a	1	Other	Other
+9302b085-d6ba-490e-843b-16c30a68e6f9	1	Other	Other
+9302cea4-9ae4-4bc4-90d9-5554fe07b1a7	1	Other	Other
+9302ced6-ebd6-4afb-b0d2-d434c0b83c3a	1	Other	Other
+9302edb1-6f27-4353-a74e-41d49cdbd03b	1	Other	Other
+9302f768-a5f4-4b19-98ad-7580815c35ba	1	Other	Other
+93030d30-1599-4984-b8ec-63ad66521867	1	Other	Other
+930365a0-ce96-469b-9a7c-5f76fdaf5580	1	Other	Other
+9303a3c0-20f4-4908-a841-f6fec544969b	1	Other	Other
+930406ae-9ccd-4007-a754-0a29ec768122	1	Other	Other
+930460ec-b851-470c-b992-048667a44a63	1	Other	Other
+93048b54-49e2-4be4-8cbd-09edc59d1727	1	Other	Other
+930492db-dcf2-4d8e-8e24-d33779071326	1	Other	Other
+9304b0fd-b980-4d99-8eec-79c4986c79fa	1	Other	Other
+9304cff4-0dcc-4463-9122-6446e999e195	1	Other	Other
+9304d0a8-ed83-41ec-b681-84f2dcba85a7	1	Other	Other
+9304f8d8-e004-4f04-a9eb-ef40c15f47e9	1	Other	Other
+93050948-371d-476d-b704-01eff872d865	1	Other	Other
+93053d37-e29c-4e0a-941f-e1a63017e82a	1	Other	Other
+930556fb-b173-4e01-b2b5-4eff21b895dd	1	Other	Other
+93056e92-e286-4a94-b43f-a41596b16312	1	Other	Other
+93057859-3f8f-46ea-a17e-888807747575	1	Other	Other
+93058094-e223-4277-a4b1-700dc5105838	1	Other	Other
+93058258-2d31-4514-b230-98a6e0104520	1	Other	Other
+93059608-146e-4778-a71b-4f5be8396613	1	Other	Other
+9305e3d2-81a2-4540-8bb1-f687e841d533	1	Other	Other
+930664a1-8ac2-4f96-b665-cc0d3f3abf96	1	Other	Other
+9306b5c7-dce5-46f4-bc6c-f3ec5074f2e3	1	Other	Other
+9306be0c-6f73-47ac-8f03-b462dfd58eff	1	Other	Other
+9306cbc6-85a7-4695-bcee-b7b2016f896d	1	Other	Other
+93073c3f-6f45-4e36-86c9-047363bf9a8e	1	Other	Other
+930741e9-8d9d-4f97-8d24-9e342155a1f4	1	Other	Other
+93075e35-e4b3-4b9d-9a43-3503ec3cd125	1	Other	Other
+9307b510-d846-4f48-bfd5-d3941dba78cc	1	Other	Other
+9307c051-2ce5-45a8-a792-5589cf598ed2	1	Other	Other
+93080a9e-2d18-4738-9883-da6ea88e8b42	1	Other	Other
+93082a06-a88b-4353-8dcc-eaf2c159ddf3	1	Other	Other
+9308da43-eb5d-45dd-949d-0a55ccb5f1dd	1	Other	Other
+9308e137-63f0-4466-b4cc-ba2c553e9339	1	Other	Other
+93090d54-c00f-4496-a097-0b581b02e327	1	Other	Other
+93091314-2f0f-4f95-a459-3c0486b93523	1	Other	Other
+93091b08-a10d-47c6-bed2-798c208649ed	1	Other	Other
+93092b4a-7eb7-4b36-8be3-941989d7ada3	1	Other	Other
+93093804-cac6-4c9e-84be-01afeffde736	1	Other	Other
+930974ce-bfe7-4d7f-b078-e0d0925bb6c3	1	Other	Other
+9309816f-28a0-4171-acae-33f426cd81d2	1	James	Other
+9309909f-96ab-466c-be7d-ae40975eaa29	1	Other	Other
+93099263-a1d4-485b-9910-d2592b25ed0d	1	Other	Other
+9309a390-09f6-4581-9ea6-7fd652694eb9	1	Other	Other
+9309bdcd-9f7b-4d7f-aa70-c64ef0c2cc14	1	Other	Other
+9309d042-0f8d-4f06-8fe7-8d78f6dbe3f5	1	Other	Other
+9309e004-abfd-4fdf-a26b-cf9f56931071	1	Other	Other
+9309f5ab-f627-437e-b88b-1571db2af293	1	Other	Other
+930a1ca9-cb3c-42f7-aabe-0a0c7d1b0d38	1	Other	Other
+930aa723-cbbe-4734-ac58-8e687fce1358	1	Other	Other
+930b85e9-b93c-4f59-b376-41e3a0b36aa9	1	Other	Other
+930ba24a-c063-4935-929d-ee0840f4b71d	1	Other	Other
+930ce46e-b584-4977-9dbc-a7f08df84439	1	Other	Other
+930ce4ed-27dc-4245-ad63-5aa32c6337f5	1	Other	Other
+930d11be-cecb-4e91-9090-800d7e61687c	1	Other	Other
+930d3223-c8c8-4a37-90dc-d6159be4c945	1	Other	Other
+930d88d2-ff95-4d67-926a-40f1f4e02e57	1	Other	Other
+930d90f6-ae8c-4ea3-b3f8-f87c91d701ca	1	Other	Other
+930db2d8-c2ec-493f-8cc7-2f19c4b7386e	1	Other	Other
+930dd2bf-ee69-482c-a3b4-2d5e6a4636f8	1	Other	Other
+930dd4ea-cf30-4aaf-988d-252c0cb71f49	1	Other	Other
+930df6cc-7b16-4ccc-9ebd-b06e040daa92	1	Other	Other
+930e19f4-6527-4420-8bf2-57d4bc3507f7	1	Other	Other
+930e2e46-c126-447e-8fe3-e3b7395fb035	1	Other	Other
+930e5b2d-0830-4a6b-a46c-ecfaf0e734db	1	Other	Other
+930e9f70-c325-4f80-845a-46ce95f14b4b	1	Other	Other
+930f0f4a-7354-4ea9-b2e1-b78ec1c16052	1	Other	Other
+930f16b8-2a30-4e3d-9f00-0734b6af72d4	1	Other	Other
+930f2a8d-ddeb-4a36-aa27-5e22bec0d799	1	Other	Other
+930f47b5-d809-4f88-ab77-fed5d9ef7c79	1	Other	Other
+930f6899-94be-4a63-9f04-3c0820060526	1	Other	Other
+930f9fb7-8c9b-433b-9e15-ec0ebb6e0deb	1	Other	Other
+9310baf9-35b3-4619-99cc-d86e56d997f1	1	Other	Other
+9310d024-d2a4-4385-ad7f-58e94a5b4daa	1	Other	Other
+93112044-3770-47f3-8765-242ab74f7bc3	1	Other	Other
+93115346-c428-4f47-afef-9c3a651ba68d	1	Other	Other
+931172b1-5bfc-48a1-a83e-27e27f1e149b	1	Other	Other
+9311a165-96cd-422a-830f-424922a92ff1	1	Other	Other
+9311eb78-fe17-4d5d-a871-fa0ee52201a5	1	Other	Other
+93121c4f-3af3-46a6-8d01-e2c7f61123cc	1	Other	Other
+93124a01-5835-4612-a816-c3b2875b3bc9	1	Other	Other
+931274d5-e910-4afd-8f6c-2c56f551a36b	1	Other	Other
+931283b5-c661-4fbe-9d70-3f2a0ae19538	1	Other	Other
+931284e8-87fd-4de2-bff6-e6efd6165af3	1	Other	Other
+93128780-4559-48d8-9939-ab40d00c94f4	1	Other	Other
+93129a50-f194-41b4-a2a6-a286c17c2bdb	1	Other	Other
+93129c51-ede1-45af-83f0-dd119ca6d1ad	1	Other	Other
+93130177-e793-4b03-b642-adda7f5b20e4	1	Other	Other
+9313b434-c868-4c0a-b522-f3f5cfcaa787	1	Other	Other
+93143d12-1a5b-4c9e-b5c4-bc266c635561	1	Other	Other
+93145b7d-8c7a-4f31-82ac-c8ae06d9e4c9	1	Other	Other
+93146d9b-17ce-410e-ab2f-c62bb0b76a57	1	Other	Other
+9314e96a-4a0a-44b7-9010-635d251a5266	1	\N	Other
+931528ec-2f7e-4449-bebf-61433c59efea	1	Other	Other
+931551d7-e675-4bfd-aaab-25d4284137da	1	Other	Other
+9315e7a9-569c-47be-86a2-9a675b624962	1	Other	Other
+931636d2-1c88-453a-b88c-8317bb9967bc	1	Other	Other
+93164010-98b7-4999-9322-0c3e3dd0a044	1	Other	Other
+93166a19-6ba3-4414-b442-5ebea57cfd36	1	James	Other
+93166bc8-4302-428c-8853-f55a736e4da0	1	Other	Other
+9316d45a-dc3b-43f2-aacd-f826974c72b4	1	Other	Other
+93177843-dcf1-4786-9c19-999fe67decb8	1	Other	Other
+9317791f-3bb0-49cc-9385-eaa6211e0c27	1	Other	Other
+931797ee-99c4-4f31-aa18-e23aaa26811a	1	Other	Other
+9317a03d-fc69-440a-a40b-26f901d92fa7	1	Other	Other
+9318e002-58f2-413b-bd80-9e1fff5ed6bd	1	Other	Other
+9318f073-b3b1-434e-8609-9b29b9c306cc	1	Other	Other
+9319018b-2357-48ef-9031-85fd1fda991b	1	Other	Other
+931923e9-c2dd-4a4b-882b-8b167215947d	1	Other	Other
+931954f6-c51a-483d-89f1-305e5018e8f6	1	Other	Other
+9319684c-29bf-4581-b2c4-e901a8b34235	1	Other	Other
+9319a6f1-5323-4ef6-b60b-40a734143aa4	1	Other	Other
+9319c58a-6e0a-4fa2-9908-7243d7d85ee5	1	Other	Other
+931a2cb0-7b1c-4664-bb6c-acc96e5b19b9	1	Other	Other
+931a4a04-9ec0-4498-952c-03e597717040	1	Other	Other
+931a60c0-925e-4cfc-b8ec-37312e512c51	1	Other	Other
+931a755e-1d71-4f6a-818b-0d10e8cb59f1	1	Other	Other
+931a7a1f-42da-44d2-bf76-773fce352b2f	1	Other	Other
+931a8d4e-7a5f-46e1-9d43-960ac3413e1b	1	James	Other
+931a9e08-3fcf-4ac1-9209-249b5dc5b834	1	Other	Other
+931a9e2e-cd38-47d2-9e18-ff4fae65ff7d	1	Other	Other
+931ac260-2c14-43be-be32-5831d98e8db6	1	\N	Other
+931ac9e6-50c7-431a-823a-7db3a7cfc51f	1	Other	Other
+931af0c6-e014-4aff-85dd-42b1d8346374	1	James	Other
+931af254-64c4-4365-8dfa-81437878064a	1	Other	Other
+931aff6c-9ebe-48fb-8256-c9c86a6ae6d9	1	Other	Other
+931b3617-1c17-4a5e-8fae-3d67a3e290c4	1	Other	Other
+931b57c4-990c-4483-aca9-bc61083685cc	1	Other	Other
+931b75e9-c83f-4f2e-8fa1-88caf205e075	1	Other	Other
+931ba186-b6e5-486c-b180-1e8a5656b206	1	\N	Other
+931bddf1-6ff7-453e-a585-706e2ea17d77	1	Other	Other
+931bf4e6-9e6e-466a-9f73-051084447d9c	1	Other	Other
+931c4b92-ec44-4c35-9d59-2320a521e510	1	Other	Other
+931c6054-af13-4b10-8e20-f04bc5ad35aa	1	Other	Other
+931c6270-2743-4398-8278-29e7f43d4d2e	1	Other	Other
+931c6efa-a12b-48ab-9446-a863bd1087e7	1	Other	Other
+931c82d2-facc-4c2d-abd7-c120a0b09f96	1	Other	Other
+931cae1a-c292-4311-9605-98dab891a873	1	Other	Other
+931cfdc1-6255-4a2a-9d9c-6563ddc6af0e	1	Other	Other
+931d0574-1dde-4ad2-9521-fc5c61e24aa8	1	Other	Other
+931d325c-09fc-4cd9-9dbc-717708597eb0	1	Other	Other
+931d4192-c970-4e4c-8dc0-5a996740c7c8	1	Other	Other
+931d6c1b-4415-428c-890d-f3f87a651a0f	1	Other	Other
+931db2b5-d2bd-42e1-9c71-a89662a676ae	1	Other	Other
+931dbae8-8512-482f-a2de-affce2ed26c0	1	Other	Other
+931df2fa-4527-41c9-a3c8-2813e4ce7da3	1	Other	Other
+931e020a-8227-4231-8863-d56a68aeb13e	1	Other	Other
+931e3c7f-95b4-4c44-a852-e5f950d2f9f0	1	Other	Other
+931e5769-6f25-4979-b028-b1d7f551d6f6	1	Other	Other
+931f1a6d-094f-4b5b-8f2c-e032bc876425	1	Other	Other
+931f5233-64cc-4359-9d8c-b7b7ff022e0a	1	\N	Other
+931fa76a-296d-4b0c-bee7-efb58e627220	1	Other	Other
+931fab3c-89fc-4ea2-bcd0-5d231cfdf560	1	Other	Other
+931fbf3e-117c-457d-a31e-54dda5146245	1	Other	Other
+931ffa09-99d3-4c58-9461-57012699fccf	1	Other	Other
+932002ba-2344-4063-a5fa-ef78b1bc2369	1	Other	Other
+93209747-4d5a-48b7-9c5e-ebd99554f8aa	1	Other	Other
+93211a5e-e89f-4628-b829-e22cb18230a7	1	Other	Other
+93212538-eab2-4e05-b554-ec69d3063e55	1	Other	Other
+93214018-94e4-49bb-b27b-83f6b1e610c1	1	James	Other
+93214b2b-5fe7-4dc2-87d9-e12cd62112f7	1	Other	Other
+9321929e-32a8-4a49-a1cf-3c46e3f599d8	1	Other	Other
+932199b6-d53e-4595-b9de-7911b74c94b2	1	Other	Other
+9321ae50-4a31-42df-966c-8a9fd1c9abd3	1	Other	Other
+9321d98d-b70c-412e-968a-769a66aef338	1	Other	Other
+93220a7d-9436-4d62-bf8d-a67b9fcf5d8c	1	Other	Other
+9322770c-277d-43d3-8934-0b35c6568fb5	1	Other	Other
+93227fb7-5bcf-4e0d-8c19-1e2785fef8ac	1	Other	Other
+93229c9e-34f1-4f01-9aad-6a02f21eb02f	1	Other	Other
+93232d8d-a642-4052-b789-e2dd2f6c7f43	1	Other	Other
+93235423-443e-4a00-af18-d3e373179d6d	1	Other	Other
+932378f3-3de3-46dd-89b1-eb47acdc44b6	1	Other	Other
+93237a4c-4232-4ddb-bc27-4f3cd9bf1cc6	1	Other	Other
+93237f5a-21c3-4997-b434-aec4cd3cb695	1	Other	Other
+93239d2a-88c3-4556-a5f7-5c9c33f311d8	1	Other	Other
+9323bba7-101b-4329-9c80-16d015c63372	1	Other	Other
+9323c10d-042f-4735-bbc2-39e4954303f4	1	Other	Other
+9323f171-7179-4720-932a-5e29c28fc24e	1	Other	Other
+932410be-4355-4817-a47d-e5736dbb0596	1	Other	Other
+93242ba0-03b9-466e-a436-e820b1c079a8	1	Other	Other
+9324455b-930b-449c-8368-6e2406baa0f5	1	Other	Other
+93246b56-83ad-4c87-8c75-f00fc85baaac	1	Other	Other
+9324ae79-f018-4a36-82ef-fea5e4e77650	1	Other	Other
+9324ff1e-2aa1-42ee-b01f-a3f55f0f7594	1	Other	Other
+9325094f-aa69-4da7-be27-f1bd794ea2ff	1	Other	Other
+9325bdfa-0d42-43be-83ec-7c1edbec5aa2	1	James	Other
+9325c222-9477-4b7b-a0a8-26c5a8035ec8	1	Other	Other
+9325e2d4-dafc-4e4f-8f4b-95d90c6b03e9	1	Other	Other
+9325fe62-d967-4a01-a3b7-4a13d7809c1e	1	Other	Other
+93261767-b6e9-429d-90a3-f2ccc6176465	1	Other	Other
+932625b4-eb1b-4ed1-a7a3-a58f53dedd36	1	Other	Other
+93263029-14f4-463d-a202-ddb5c733b152	1	Other	Other
+93264c5c-ee85-48e3-92ea-e631646ebc0d	1	Other	Other
+932651d4-ad48-42e7-b9c5-c5031ed35245	1	Other	Other
+93265e91-0444-43f7-94ad-4a954d8d628d	1	Other	Other
+932672a7-d475-4015-a760-3a9b7534278c	1	Other	Other
+932675a6-896c-4970-805c-e3de4a58d873	1	Other	Other
+9326c61a-78ff-4f0d-a81f-b75939ba4150	1	Other	Other
+9326d2fb-7ec6-49c8-9fca-1de167912ca8	1	Other	Other
+9327122f-2a55-4f07-9d44-a233475004fb	1	Other	Other
+93272b11-5848-48ab-b25a-a10cd8e1e707	1	Other	Other
+93275f2e-da3d-440e-9b3b-f06c0b4fdf81	1	Other	Other
+9327860f-afb6-4230-9c5e-8f07aa6d3fea	1	Other	Other
+93282bd4-6032-4a0b-a282-f7e02529a383	1	Other	Other
+93283097-d749-4b19-9491-4f14f2f1d5c8	1	Other	Other
+93285f0f-4b82-4123-bb14-75e388109dd2	1	Other	Other
+9328fe65-3c91-47e6-948d-733ed58d9702	1	Other	Other
+9329159b-9cd1-4214-8953-0df5591773d4	1	Other	Other
+9329d5d1-64ec-43d6-8111-2415a716138b	1	Other	Other
+932a521b-2b02-4129-80a6-be3f3ecc003b	1	Other	Other
+932a5ae1-85c5-4e4b-a3ca-b4e50504e53a	1	Other	Other
+932a6cfc-c06a-428d-8852-de6a4ac9972e	1	Other	Other
+932a864a-a3bb-472d-abe6-763440b9f7bc	1	Other	Other
+932b033e-89d7-4ef9-89e9-37dc12f12160	1	Other	Other
+932b06ae-1b23-427b-bf35-c3339707ff23	1	Other	Other
+932b22a2-3707-4f6b-abbd-942e01a81552	1	Other	Other
+932b2856-868d-4a2b-9ca9-e2a5e217a962	1	Other	Other
+932b408a-61fb-44db-b8f3-bd0ccf8b5775	1	Other	Other
+932b4f6d-51a7-4ea7-b4f1-430fb19d16d2	1	\N	Other
+932b6944-dae1-4539-8090-a036c71b3e23	1	Other	Other
+932bae88-0996-4a7c-9144-3def6f4d64c2	1	Other	Other
+932bd596-0850-49b0-9b61-b88332749d27	1	Other	Other
+932be69d-021b-4200-ab6d-c5ab7b5f8101	1	Other	Other
+932bfe45-68f5-4120-b0f3-d0d64b80588c	1	Other	Other
+932bffa0-1f0c-4297-817f-3b1da0d979fb	1	Other	Other
+932c81f0-9c8d-4c14-935f-cd2a17bf8641	1	Other	Other
+932ca8c6-41f3-4a64-bfa5-6ef378949d64	1	Other	Other
+932d22f0-6e1a-4daf-a7d1-3cbb5b8b16db	1	Other	Other
+932d3443-9b2f-433f-9b16-7999a6845ebf	1	Other	Other
+932d6a0f-fcab-44b5-b4e5-86536f4c3ab2	1	Other	Other
+932d6ac4-47d2-46f4-9912-52e12e66e321	1	Other	Other
+932daf68-b551-4c44-afa9-3606d20f6d0a	1	Other	Other
+932dbf2f-437a-4934-9c7c-b1ad7bc79a07	1	Other	Other
+932de420-e440-4173-8572-a4c7902ba446	1	Other	Other
+932e29a5-ff67-445a-9296-7a7bc86b1a3d	1	Other	Other
+932e6ec8-7ea2-4458-a705-9e5dcf87fade	1	Other	Other
+932e9ba3-9f25-4fc4-a53d-be0ff73cefc9	1	Other	Other
+932eb482-478a-4095-9469-138e8b0cd1e2	1	Other	Other
+932ebdf8-db77-4e3b-b9cf-513b817837dd	1	Other	Other
+932ee8ed-8c53-4c64-882b-7899fb9dd605	1	Other	Other
+932f1705-9df6-47ac-aa48-3d8a2c200b97	1	Other	Other
+932fb9bc-4ae4-4da9-b731-e47fcdcec088	1	Other	Other
+933028a3-0af9-4f33-a4fd-a48808f4e789	1	Other	Other
+93307b36-993d-4b76-941f-904535074761	1	Other	Other
+93309657-d043-4a6d-8921-9f49289bc1f2	1	Other	Other
+9330d5b7-0cc6-490d-9c91-5d6e2813200c	1	Other	Other
+93312dd6-73f9-437a-9be1-a9a7cff915e7	1	Other	Other
+93317b7c-1e9d-4937-abfa-708d7e2d6b78	1	Other	Other
+9331f2ae-8ce4-4028-a71d-fabf2472a8c2	1	Other	Other
+9331f549-62fe-4678-82d8-0ed7f53cd732	1	Other	Other
+93320cda-f460-48ee-9427-199ff4c196eb	1	Other	Other
+93321317-9452-48fb-93a9-7db90c389af9	1	Other	Other
+9332180a-f25e-42ed-8eb6-48403c6df3e0	1	Other	Other
+93322443-ac33-4af6-9555-e968bffa76a8	1	James	Other
+933225ef-a3f0-48a7-bdcc-2b087975ad6b	1	Other	Other
+93326498-c070-46ec-a3c2-333d702a8bbc	1	Other	Other
+93326a1b-558c-4431-b931-ced64beef2ac	1	Other	Other
+93327d4a-e1af-479f-ace7-caed89198640	1	Other	Other
+93328caa-7dff-48bb-8848-ea7a42b55f1a	1	Other	Other
+9332d619-bef8-4d77-afdd-f9af26dd2be1	1	Other	Other
+933353a2-5619-4c7b-868c-70c398a8aad0	1	Other	Other
+9333c1e2-eccc-4db4-9204-5176082c2fdc	1	Other	Other
+9333c3c0-bb5e-403d-b669-24e9e306fa33	1	Other	Other
+9333d46a-e266-49ea-b058-b77830b285e5	1	Other	Other
+9333ebae-f196-4dd1-ba7c-a86ab40e4a1d	1	Other	Other
+933413a5-e3f5-4116-bf92-6e1fb55352af	1	\N	Other
+93343766-2193-42f8-aafe-f16732ddee17	1	Other	Other
+933448e8-ca7f-4b0d-936e-3628e70737e4	1	Other	Other
+93345644-9bf7-4620-90e8-5e02e95a0e8b	1	Other	Other
+9335170a-2275-49c1-894b-fbd4c150cfe7	1	\N	Other
+933537ad-6e6b-4e53-8a79-d843b619d09a	1	Other	Other
+93356874-1f12-421d-96b3-c28edcb5fe46	1	Other	Other
+9335767c-c5d1-41b0-872b-5e4d3953cd29	1	Other	Other
+933578f3-8925-4e56-ab17-79935831e9ee	1	\N	Other
+9335ad4c-1190-4bfa-9c8b-969b174133d8	1	Other	Other
+9335cf40-5528-4777-b893-04967e3120a0	1	Other	Other
+9335dc20-9f73-41f8-ab63-201f496f6841	1	Other	Other
+9335f51f-35b1-4cf9-bac4-9afa32900207	1	Other	Other
+933675d1-3c89-40fc-8b90-23d6926746b7	1	Other	Other
+9336ea4a-ca70-45b5-94eb-7a24c6847fd2	1	Other	Other
+9336f4a8-1e43-4703-af63-eb065110cb16	1	Other	Other
+933720d1-b292-4df5-b89c-d4adc6ed858d	1	Other	Other
+9337fec1-f622-46ff-add6-9775053533da	1	Other	Other
+93382573-1418-4147-a817-b2263804e51e	1	Other	Other
+9338e705-c16d-489c-869f-b2a25884a39c	1	Other	Other
+9338fabe-8f7a-446a-85c7-fa0de3cccf68	1	Other	Other
+933901a0-79c7-4761-b4d1-13bbcc383042	1	Other	Other
+93392534-27f8-4c5b-8264-ed2d9e5893a1	1	Other	Other
+93393138-9cd0-42ae-8c7e-5b9e3a2a9587	1	Other	Other
+933932ea-a52a-4292-a9ca-586c32ce4268	1	Other	Other
+9339a40f-a711-444a-bf80-e6fa721689a1	1	Other	Other
+9339add1-b14c-4626-b9ab-2c28cc2c6fbb	1	Other	Other
+9339aeeb-b428-43aa-8631-1e2ae7d4fb83	1	Other	Other
+9339cae3-f1b1-467b-b4b9-6795f3ea6626	1	\N	Other
+9339d642-35b2-4ad9-9e6f-de602214d38b	1	Other	Other
+9339e381-5fb3-4fcf-b26c-584280c0608c	1	Other	Other
+9339e71e-fcd5-4093-8f5b-1f1a76f489c5	1	Other	Other
+9339eb72-19de-4535-a13b-9ad114127daa	1	Other	Other
+933a0434-8e29-4fd9-a38f-d95bd8973966	1	James	Other
+933a6110-98c1-4b97-94cb-b4efcac3f972	1	Other	Other
+933a8405-e695-47eb-bee8-604f558a0351	1	Other	Other
+933a9790-9a1e-4640-8192-22c9bf55275b	1	Other	Other
+933abef6-7224-428b-8ad6-176150beca77	1	Other	Other
+933af72b-743b-4bd9-aa59-72a44ed89ec8	1	\N	Other
+933afd98-92d3-43f7-93fe-d12d16e567e5	1	Other	Other
+933b3917-3519-4d62-848e-aeb771790272	1	Other	Other
+933bc63e-7178-4576-ac12-04d2c17f1cce	1	Other	Other
+933bd218-4102-4eed-99aa-f91c360fbd08	1	Other	Other
+933be53c-0e0e-4756-94da-fa3c9ac640fa	1	Other	Other
+933c3900-57e3-48c0-b793-51e1badf4342	1	Other	Other
+933cbed5-e743-4b6d-bebc-98539b0ac7bd	1	Other	Other
+933cccc0-752c-40ad-8e14-bb5f9a0ad70f	1	Other	Other
+933cceb6-ddf5-4adb-9212-60d27aaaa57e	1	Other	Other
+933cda32-486e-11e8-bcfe-fa163e8624cc	1	Other	Other
+933d35a6-6b06-451c-9576-83615e5a21d9	1	Other	Other
+933d3c89-1f11-4079-9933-8674309ecb48	1	Other	Other
+933d6057-d70e-4876-bc43-61b35127334e	1	Other	Other
+933d793f-7106-4dd9-bdcc-c4434cc503a2	1	Other	Other
+933e726d-e5ef-4876-b928-8a77a5960eb4	1	Other	Other
+933e9e05-2cd8-4cd9-a2dd-1479caf13d71	1	Other	Other
+933eb616-f5ae-4d05-ac22-af045caaf3b2	1	Other	Other
+933ee3e5-fc84-4dfc-98dc-86e17a3778ab	1	Other	Other
+933f2f8a-31a4-46ec-b371-5a7ae4572d81	1	Other	Other
+933f4bd9-335a-436f-a71f-19d95b0bdc47	1	\N	Other
+933f535f-5437-476c-b049-51b1ba230212	1	Other	Other
+933fb348-1e19-4f1b-be64-487363645764	1	Other	Other
+933fef54-c608-45a2-aa3d-43972471425f	1	Other	Other
+933ff66c-57c1-4b67-91ac-b1ae4633331c	1	Other	Other
+93402e88-1f5b-4127-a729-00fafeb56565	1	Other	Other
+93404774-7211-43ca-80a6-8cba6f6ea188	1	Other	Other
+93406ebf-ec66-4436-977a-26b855270f41	1	Other	Other
+9340ae25-4d67-4a43-9cfe-e34e6d4a5fdb	1	Other	Other
+9340cc89-9fb7-4f64-ac5f-1e60ea69cdeb	1	Other	Other
+9340cf6e-d671-4c32-b9ba-fe6ee562140d	1	Other	Other
+9340e585-26d4-4e72-9af4-97be3bebd5c2	1	Other	Other
+9340f89c-bb7a-4b25-a409-6d521ce54869	1	Other	Other
+93411991-e996-4830-8e45-8463d2d070bb	1	Other	Other
+93411b66-e06c-4df4-bdda-16c58b3a87c1	1	Other	Other
+93413b70-68f5-4dbb-b0ac-6cb1d23ff6bc	1	Other	Other
+93413f91-96ef-427d-b758-fb1fc32e8790	1	Other	Other
+934164bc-837f-4dd0-a084-3a8d7d5bd9fb	1	Other	Other
+9341ee5e-0710-4579-bb37-fc10a5349cf3	1	Other	Other
+9342a3b4-2df1-4865-9686-a87dd8c54509	1	Other	Other
+9342c1d9-96f9-4324-adc3-ae3ccb31d35d	1	Other	Other
+93430195-d6b6-4d59-a240-e9a4ed1b6553	1	Other	Other
+934335b5-ac38-436d-ab8a-3a8830d3a8ad	1	Other	Other
+93443429-938d-463d-998d-97b98411197b	1	Other	Other
+93444c94-02a0-4c95-8234-1938d2436db9	1	Other	Other
+93444daa-1272-4b2c-aa2b-86e76b187439	1	Other	Other
+93445595-8ee2-4824-89bd-3f159cad5345	1	Other	Other
+93449393-a4ec-49fe-8765-b4654dac2378	1	Other	Other
+93449ad6-7298-46da-8543-566277487b76	1	Other	Other
+9344ada9-d6d6-4f6e-bdec-f3720e8db3c2	1	Other	Other
+9344b58a-f64f-4bbb-8e06-4d5f5b5fc793	1	Other	Other
+9344d4cc-45e7-4db6-a4dc-2d26dea2ed3d	1	Other	Other
+9344f613-eb5b-4998-8989-1caca984958e	1	Other	Other
+93456786-c68c-4c8d-9850-65323ce186f7	1	Other	Other
+9345785d-6a7e-4bc4-8064-e5b06ecd8398	1	Other	Other
+934582dd-67d6-4609-89f4-eeeecaa9b0da	1	Other	Other
+93458339-4ff5-41c1-9bb6-1e22f07dc457	1	Other	Other
+9345c4c5-b3ee-46b9-83d7-2df7b837fe12	1	Other	Other
+9345cb48-9462-49e2-8fba-0fa6d986f267	1	Other	Other
+9345ef15-e238-4858-b2b8-0b8a1d69ae63	1	Other	Other
+93460560-a25b-4813-981f-530a8787be5c	1	\N	Other
+93465bb8-3bc2-4d0c-a125-252438b3a3dd	1	Other	Other
+934665d3-a131-4809-bc27-83b393c2f278	1	Other	Other
+9346c020-5c79-49a1-9ad0-fd7d23a51306	1	Other	Other
+9346cc2d-4c08-42d9-bd63-e6c2318b2224	1	Other	Other
+9346eb36-71ee-4e4e-ba02-9b5b3ecd8157	1	Other	Other
+93472033-cf55-4ea0-a31f-6be694fb17fe	1	Other	Other
+93477e3d-d9af-47d9-ab55-cf7a3f9c4830	1	Other	Other
+9347ea73-3acd-48a0-b552-35687ac45711	1	Other	Other
+9348513d-7ac7-4e3f-94f4-7d5d2b6a4b9c	1	Other	Other
+93487f4b-3590-4e89-a583-bbece03c9935	1	\N	Other
+93489057-586f-40f4-a243-f1ae802fddd3	1	Other	Other
+93489d03-ce66-4082-94ee-f7613f1444c0	1	Other	Other
+9348c0f4-e4a6-49f2-9fd5-98f4c3781149	1	Other	Other
+934929d8-4a1f-4f2f-88ba-5bde4bbef018	1	Other	Other
+9349728d-c0e4-4b01-aa25-79d2d410cea8	1	Other	Other
+9349c1a1-7cdc-4460-bb30-36464708ab66	1	\N	Other
+9349de92-6a4d-4598-ba63-6b2ff64db44f	1	Other	Other
+9349fc55-69b5-4877-8c7a-b6b90f6c27d9	1	James	Other
+934a4052-6ffe-4330-89ff-f9127bef2bc0	1	Other	Other
+934ab7c2-fcbb-41db-a7c9-7f7fe1339008	1	Other	Other
+934acd6f-77fd-449e-a7e1-1706fc9e576d	1	Other	Other
+934b35fb-0a8b-4b43-bd4e-085fd07020b0	1	Other	Other
+934b845d-e1b1-4298-b323-1d9ec59bc2dd	1	Other	Other
+934baa39-067a-4d78-87ad-cb64f7f448e4	1	Other	Other
+934bcfe1-ba85-48c2-9970-748cd431407b	1	Other	Other
+934c11df-4b13-45f4-9496-8290c0cae0ae	1	Other	Other
+934ce93e-ecdd-4e60-8401-632c48903789	1	Other	Other
+934cf4c4-4fc8-4afe-923a-ee9fbd6256e9	1	Other	Other
+934d104f-0122-4586-9c47-dd01d024553a	1	Other	Other
+934d11c5-5e1a-41bf-90f7-bf2c892efd38	1	Other	Other
+934d44af-b09a-4c79-821a-ba9e15f1940a	1	Other	Other
+934dab3e-2b37-4920-a286-194a4a001c2d	1	Other	Other
+934db597-5049-4f87-985c-54c68cecb2e8	1	Other	Other
+934dc30c-9297-4994-b322-2fa67c07be65	1	Other	Other
+934dd831-d5ad-4530-8f39-742265cae7a3	1	Other	Other
+934de9f7-b069-4bca-bb86-a9e8b373752f	1	Other	Other
+934e334f-6953-47b5-911c-ffb18ee495a9	1	Other	Other
+934e5fc9-c72d-43eb-a672-47b07ab9a591	1	Other	Other
+934eca27-c9d9-44ec-8826-9a7363270bcc	1	Other	Other
+934ecece-0b53-4d54-99dd-e6248526b4b9	1	Other	Other
+934ed06f-1c31-4b0e-a17c-fe05681223bd	1	Other	Other
+934f055a-10e5-4f65-bf13-82196233e53f	1	Other	Other
+934f0a82-ffec-411c-9ac5-9691627200b8	1	Other	Other
+934f2330-d848-40d0-85bf-f4e4857de8c2	1	Other	Other
+934f428b-c39f-4f96-8e21-e590c46b9fb9	1	Other	Other
+934f6a8f-0a5d-4be2-8b4a-ad4abdb9f7df	1	Other	Other
+934f7136-1f47-4769-abe0-07c187682ca9	1	Other	Other
+934f7e46-9349-4711-9c04-813c728c6c3b	1	Other	Other
+934f807e-14a4-4a42-921f-33f97e5e5e47	1	Other	Other
+934fb5ea-3e95-4b89-a75e-671b9ab7d239	1	Other	Other
+934fe61a-ec93-4b65-93d6-570bc45b0557	1	Other	Other
+934ff952-4f0c-4bb2-af14-cb30607f93db	1	Other	Other
+93502f65-c355-4290-b2ae-e7729e22def0	1	Other	Other
+93505110-80af-42a2-9db5-f6a326eb396b	1	Other	Other
+9350afd3-a71e-43ea-92c9-31e883fb10d9	1	Other	Other
+9350cf2e-5567-4a8f-a569-7c93dd4ad427	1	Other	Other
+93511aea-0ca9-4b32-a9b3-17ffcc214347	1	Other	Other
+93512f54-4aaa-48b1-b698-083bbda17471	1	Other	Other
+93518bfb-f082-4373-a58c-7e2438446ee8	1	Other	Other
+9351ba6a-67dd-4f37-8d18-cd0124787656	1	Other	Other
+935266a4-132b-4808-a8d5-ce8a26f6b696	1	Other	Other
+935287e9-7ff3-476f-a34f-25d23b9f4c3a	1	Other	Other
+9352bbf3-3f9b-4984-b570-b86c33d5758a	1	Other	Other
+9352f33a-15c6-4e4d-b607-2f05727839b5	1	Other	Other
+9352f6cf-3093-419a-acfa-dbd1bf65b971	1	Other	Other
+935319ba-602d-4926-b994-13c19350bbf6	1	Other	Other
+93532231-1b1c-40c0-b799-12f171b11756	1	Other	Other
+9353729c-1992-45c8-9182-8df93500ed1e	1	Other	Other
+93537550-811f-462b-b66f-3a826cbf86ea	1	Other	Other
+93539829-9518-41e4-ba6f-d6a1e740f834	1	Other	Other
+935398a3-caed-47f9-a30a-291ef568da86	1	Other	Other
+9353e156-d845-48ab-a3d2-dbd7b789ccb4	1	Other	Other
+935405cc-a4f0-40e7-abd8-a7af92350001	1	Other	Other
+9354152b-5c75-41f0-8c5d-cb4f5fcda6a0	1	Other	Other
+93542861-9bfa-4b3b-bfc6-e529632bda6e	1	James	Other
+93546be9-70d5-4aed-9edf-9dc91c3821d9	1	Other	Other
+93548f14-dfbd-4b04-b51e-56512b41d157	1	Other	Other
+9354a1e4-2bca-440f-b2d0-2d97e3809c97	1	Other	Other
+9354bf48-d236-4dee-acb4-db8b0c3809e7	1	Other	Other
+9354c54d-97c3-4048-9b92-062f6837f900	1	Other	Other
+9354d788-2e99-4457-8dc4-528c8307be37	1	Other	Other
+9354ee6b-9b51-43a9-aa02-f652c592776c	1	Other	Other
+93555b7e-bb2c-4ca2-babe-cde45ccf0eb8	1	Other	Other
+93558595-0263-4c26-b604-d6ae00877ee1	1	Other	Other
+9355b160-ba00-4f3c-afdb-662d39fd6c8e	1	Other	Other
+9355ee93-7fdc-4575-8556-001ce2adaac2	1	Other	Other
+93564744-05ea-4ae4-b1d3-d71e8a033147	1	Other	Other
+935659cd-c94d-41d0-8180-1f9953ff0119	1	Other	Other
+93566faf-25b2-4e44-a851-1be6f1362ce3	1	Other	Other
+935678f5-544a-4666-8004-ec21d9a5f773	1	Other	Other
+93567ae2-d068-4830-8372-98b30d96f3c9	1	Other	Other
+9356897e-3518-4dca-a5b5-c745e1f3bdcb	1	Other	Other
+9356a973-877f-40f4-82cd-3826afeffedf	1	Other	Other
+9356fc2c-8322-47bc-bf11-d5ee3958c41e	1	Other	Other
+935700aa-899b-4e1c-a522-8f151a665049	1	Other	Other
+9357cb25-d19e-4ecb-9bdd-8f90dbf932e6	1	Other	Other
+9357fe27-92d7-42c4-b8f9-7d483f8e5e09	1	Other	Other
+93585a7c-14f6-42f6-b76c-5311eb32bfa9	1	\N	Other
+935864fd-3b5e-4c71-9791-72be5ae80fd9	1	Other	Other
+935910e0-66b0-4bee-82aa-36efc1f8d7cb	1	Other	Other
+93592adc-33ef-4929-91ee-5a58b1650694	1	Other	Other
+93593643-d59b-494c-94f9-e01960a89ab3	1	Other	Other
+93596f02-751b-4b0b-8b36-549027ff4375	1	Other	Other
+935989ae-5f83-4248-801b-722433a39a25	1	Other	Other
+935a4fce-ac03-4832-a7b9-7d7224a02e89	1	Other	Other
+935a554c-0cbd-4ea4-83f8-7bee5896a5c8	1	Other	Other
+935a5b1e-4a31-4e83-ab3a-8a96f996b836	1	Other	Other
+935a636e-9181-46ac-921e-abea627bb35a	1	Other	Other
+935acac2-ee10-40ee-9d61-bf9ed34a138c	1	Other	Other
+935aeb05-088f-423e-a9c1-da0fd72e03e7	1	Other	Other
+935b49e1-a171-4b76-ba2a-2e765fee0654	1	Other	Other
+935b511c-da9e-481f-ad4d-e888954601bf	1	Other	Other
+935b6742-13d9-4c9b-bd7b-0b570381a4ea	1	Other	Other
+935bb4f7-c0bb-4957-a95a-32ac209661d7	1	Other	Other
+935bff77-7322-4b30-9e29-c855b66a3426	1	Other	Other
+935c67fe-35f4-4f7a-9d1a-21ddea42c764	1	Other	Other
+935c7c9f-c0e9-496e-86ca-de8aea033947	1	\N	Other
+935c820f-8c6e-4fa1-88db-9ed53d524704	1	Other	Other
+935c8a0a-4e1a-4e5e-8f40-a4b0b47b11f6	1	Other	Other
+935c9024-c90f-43d8-8165-f874b9d4f7b5	1	Other	Other
+935cf9ca-ae4f-4f86-872c-cda56851f2c2	1	Other	Other
+935d10c5-6682-4643-b4e5-a3aad9b34822	1	Other	Other
+935d1efd-4dce-4773-b8d0-adc7e6494963	1	Other	Other
+935d3b85-c93f-4c51-b852-2369db4456c0	1	Other	Other
+935d45b4-5682-448a-8fa2-958eed50c5d2	1	Other	Other
+935e33a5-5b9c-4b53-a022-b521bc8f3662	1	Other	Other
+935e4aa3-f4ac-4cc7-89ff-7c414f21f26e	1	Other	Other
+935e71f5-a1c9-4127-be83-ddbe0bcee486	1	Other	Other
+935ed2a0-997c-4576-b824-68ed8a207013	1	Other	Other
+935eef1e-5b13-4820-8034-8e4a945a8e55	1	Other	Other
+935ef3ca-d0d3-4080-a510-44ea99f3dc06	1	Other	Other
+935f157d-6429-48af-8d15-9b7eb4285772	1	Other	Other
+935f2759-0eff-4e32-963f-e70331dee2a4	1	Other	Other
+935ffc01-2a72-47db-b401-d9d188f9ce7b	1	Other	Other
+93603f22-92b8-4328-84ab-7d9c890445f5	1	Other	Other
+93605535-cc72-4ca1-bfaf-8445c00ee26a	1	Other	Other
+93606b53-2809-42ca-9bf4-0713bcbaa0b3	1	Other	Other
+93607a98-eefc-4dda-b85b-574ed2709eab	1	Other	Other
+9360904e-ef75-477f-9ce0-e58b077751f7	1	Other	Other
+9360958f-fc00-481a-a374-8ac1a634c27c	1	Other	Other
+9360aa9d-014c-4879-a10d-d3166e8c541a	1	Other	Other
+9360c95f-64f2-46da-9bfc-2ce78ee2119b	1	Other	Other
+9360db7f-90d9-47e5-b399-7e26d4b343cf	1	Other	Other
+9360f841-60fe-4b39-a5fd-91908057cd86	1	Other	Other
+936104d1-9e31-4cca-98a1-05b57dafd39b	1	Other	Other
+93610e1d-252a-4e24-b8ba-2e7a74e2814f	1	Other	Other
+93612086-a4d1-456c-a3b5-b789231a7c00	1	Other	Other
+9361a0ab-ab58-4c75-89d4-2aab0e360a36	1	Other	Other
+9361f335-99cc-4d04-9f83-c7c14fb84f15	1	Other	Other
+9361f3c2-b64d-44f7-8394-7401a39c0d88	1	Other	Other
+936205d8-26f7-48ea-b8b6-3cddc038abac	1	Other	Other
+93621f9b-27d2-4afd-9f2b-b1692776528a	1	Other	Other
+9362410e-4abb-45d6-abb1-6aa6c9982868	1	Other	Other
+93626ce2-ef9c-4191-ac9e-e7f7c8c39093	1	Other	Other
+93627917-45b9-4ca9-b2a7-b008d36ffdaa	1	Other	Other
+936294ca-84e4-4ad8-8240-a5c505efb6e3	1	Other	Other
+9362ac29-2c76-4400-9a42-59a7d6ab32f6	1	Other	Other
+9362b22a-6265-40ed-980e-16a0edb6f3fb	1	Other	Other
+93632cfd-82a9-4b40-ab7b-a140c5cbb765	1	\N	Other
+93632d77-e5a4-447d-8b3f-62ed20693e73	1	Other	Other
+93633804-bbea-4059-befd-640c3fdfb878	1	Other	Other
+93634304-af4a-4fe7-9e43-ae19e34987fe	1	Other	Other
+93634925-af51-4597-be40-0b215688c6b6	1	Other	Other
+9363580b-c4a4-4fbe-87fe-7dee7cf1be3d	1	Other	Other
+9363a0f2-029a-4725-b0a1-a45a295a3803	1	Other	Other
+9363f6a2-365a-44c9-b0b1-7a8315753038	1	Other	Other
+9363ffd2-c57e-4fda-aa21-12b55f08e051	1	Other	Other
+93643c85-5d39-412c-be96-8c1a820063d3	1	Other	Other
+936484c3-e4c4-480c-a6a6-921db23b3704	1	Other	Other
+93649b25-de41-4c3e-bb14-4c037b118a7c	1	Other	Other
+93652fa0-8bfc-4a7c-b7e1-47b38939abf5	1	Other	Other
+936538ae-d284-4577-bbc5-628bd5168c9c	1	Other	Other
+936564a6-c12f-4c6c-b8a7-bc5f855706db	1	Other	Other
+93656613-d23c-4574-a102-cbcaade5e300	1	Other	Other
+9365e340-89cb-4a01-ad8c-35c22f82864f	1	Other	Other
+93660e54-b770-4e41-ac65-939e31f87a3d	1	Other	Other
+936614b0-09a7-493e-b3f3-6e77e986c738	1	Other	Other
+936618ec-b1bc-4866-93c1-49b0fe53a54e	1	Other	Other
+9366593c-5151-421a-951a-b57134ba567f	1	Other	Other
+93665f62-f179-4a91-8b2f-945a972057d8	1	\N	Other
+936667f9-82d5-4d30-92d1-25b7fd9a53a2	1	Other	Other
+9366e466-3155-4511-8988-67235f90b2d3	1	Other	Other
+93671cd9-4d90-4a91-98c6-621661782dfb	1	Other	Other
+93674eef-62b3-440c-b1e7-8e4285286b9f	1	Other	Other
+93679484-9a13-40af-a176-ed4afded74b7	1	Other	Other
+9367bb7d-201b-4d89-a58a-b5386e9c6e5c	1	Other	Other
+9368113d-2d11-4f1b-b33a-12bf55dcbdfb	1	Other	Other
+936835cf-da74-4130-b892-83d1b509032b	1	Other	Other
+9368c545-61df-42ac-8bf4-bcacca09320d	1	Other	Other
+9368d143-208a-49a9-aa14-39d167fad685	1	Other	Other
+93692c82-d5c1-4d48-a819-15dc3058cddf	1	Other	Other
+93692e31-f5b6-410f-bc96-d7b2795e482e	1	Other	Other
+93694e8c-d9ed-41b0-9978-912def231786	1	Other	Other
+9369da97-5bc3-4fc6-8cc1-e3e9b814a43b	1	Other	Other
+936aa1b8-9bfc-4bec-b602-f332c84d4603	1	\N	Other
+936aef77-b585-436f-9303-a17ca1f6bb64	1	Other	Other
+936af259-df32-47e8-bde3-aee915937b7c	1	\N	Other
+936b0332-b5d6-4c78-a901-66fb4541ed74	1	Other	Other
+936b2f61-f0ae-4156-b4c3-0ee294a2d70b	1	Other	Other
+936b4ecb-bf5c-410c-8804-f813d38f34e5	1	Other	Other
+936b6a76-03c8-4641-9433-d76008805e07	1	Other	Other
+936ba048-fbbe-4de6-91af-6e6ecd622c4f	1	Other	Other
+936be7bb-8165-4a4e-b854-babf74b8f8d0	1	Other	Other
+936c1bff-80b2-46ce-a3c7-b5aa41422dda	1	Other	Other
+936c8263-d602-44c7-a41b-f03aef666b24	1	Other	Other
+936c830c-7b8d-400a-9f1c-8efaa9ff3508	1	Other	Other
+936c9608-2cce-4b41-a1f9-8f7ed6745a1a	1	Other	Other
+936cc04c-d41d-47a9-bfcb-68bcd3b420be	1	Other	Other
+936cd472-1772-47d9-a4c6-1b36ca4bb066	1	Other	Other
+936d7128-8a82-4280-b518-4d4c7cac33d7	1	Other	Other
+936d7880-6db8-43bc-a73a-f03b461e884d	1	\N	Other
+936d7fe0-a858-4aed-b677-a969175ac341	1	Other	Other
+936dc6e0-2234-4ce1-a55d-120cd847335f	1	Other	Other
+936de31e-868b-4125-82c9-ca1b7adb1e32	1	Other	Other
+936e4ea2-b207-4c11-bd38-ef1e25d74c30	1	Other	Other
+936e5616-e185-4bd8-9d9e-a44d72853feb	1	Other	Other
+936e8817-9fde-4e87-bf59-77e3639683f6	1	Other	Other
+936e8a59-66e5-4a3d-8687-a4d503545735	1	Other	Other
+936e93d0-5ed5-4be4-a3e2-2f4c98a7039a	1	Other	Other
+936e9484-541a-4a42-aaef-36ac79f1f027	1	Other	Other
+936ed576-0506-4fe5-90fe-985a5f999835	1	Other	Other
+936f096b-a13f-460d-afe3-4fc7be390d28	1	Other	Other
+936f1205-f519-4e4d-9076-92107911d23e	1	Other	Other
+936f2eee-694d-4500-ae0b-b8ef64caaa46	1	Other	Other
+93700392-e39f-4875-b35f-4dae23c06646	1	Other	Other
+937053b7-f0ad-428a-877e-9f68a9b6944f	1	Other	Other
+9370ea12-0adc-4116-b70f-f732aae90fb8	1	Other	Other
+93715e7e-9a32-4373-a173-fc8316daae3f	1	Other	Other
+9372171a-9301-405a-bb79-e6f8a8a73195	1	Other	Other
+93724c36-31a4-4bd8-99e7-2c1a3978dc66	1	Other	Other
+93726ddc-163a-4a09-bec9-952d75348c97	1	Other	Other
+937288ba-fd4a-4bcb-aafd-18099829c157	1	Other	Other
+9372d8d6-31a0-42ad-8e6f-9cf33d4c74e3	1	Other	Other
+9372e1fc-378c-42e0-8bfa-9153d174d639	1	Other	Other
+93734fe7-0a37-4ee9-a112-966b0db1e01f	1	Other	Other
+9373741f-42c0-4dc0-80d6-448f63eb5677	1	Other	Other
+9373b56d-6096-4162-80a8-bb27d4606880	1	Other	Other
+9373c4c8-f918-4064-a9b5-67ddeeb7e73c	1	Other	Other
+937435f6-6727-4a42-bf11-f1488779d364	1	Other	Other
+937445f8-df5f-4cf4-8279-6c0c8d353dce	1	Other	Other
+937493d4-5b9d-4b2c-ab5f-84140774a654	1	Other	Other
+9374a435-2d74-47d4-b303-fc0dc4d25f42	1	Other	Other
+9374f76a-a292-46c8-af01-b111f4691814	1	Other	Other
+9374fc4c-c40b-4331-920f-e14ad4265298	1	Other	Other
+93752959-c35c-41eb-90cc-97b12e3a7f19	1	Other	Other
+93758000-5e05-402a-8e7a-55a849820a1d	1	Other	Other
+9375b1c3-8caf-4a33-b6d0-3c8c4586c012	1	Other	Other
+9375ea61-f677-4cdb-85f5-af9073215b6e	1	Other	Other
+93766e2c-19d3-49de-b583-59bf407c93f5	1	Other	Other
+937693ee-46cd-4c50-a69b-dd5d68ea09ba	1	Other	Other
+9376dd47-fbfc-4070-ae35-28d779f31a8a	1	Other	Other
+93772682-ec70-4a92-a0f2-6bd7c38b558d	1	Other	Other
+937736e4-e364-48d0-80de-08415e5d1257	1	Other	Other
+9377ad9d-ac52-4656-836c-9cc9f20405f0	1	Other	Other
+93780887-619d-4415-acd5-0fbb663a4946	1	Other	Other
+93783717-bc3e-400e-b35d-408871f6421f	1	Other	Other
+937849e1-9431-490f-94a6-50865f534c5d	1	Other	Other
+9378bd1f-7238-4eb8-9f75-61c33796db04	1	Other	Other
+93792016-4b8c-4fd7-9b4b-fabb08a96b38	1	\N	Other
+93795655-a1c3-4ab1-80c7-4608d00d26ae	1	Other	Other
+93796cc4-2d1b-4305-bf33-6d53a0b8ff4d	1	Other	Other
+937a05e0-46d0-4ad1-a08d-f019e2d07c02	1	Other	Other
+937a1ca9-52da-4fd4-9df1-1b2a02cdccc6	1	Other	Other
+937a34cf-1582-4ec1-be02-665644f517bb	1	Other	Other
+937a674e-ed43-4d49-abbe-264a77fd51e3	1	Other	Other
+937a74c6-e8f9-4461-86b0-907f4d3d0465	1	Other	Other
+937ad7a3-71c5-4cc9-a09c-fe7a969eb821	1	Other	Other
+937ad94b-a81b-485a-a40e-a38231846cf3	1	Other	Other
+937b2c7f-0f04-4d5c-a974-7633ee7f68c1	1	Other	Other
+937b5d94-b5fd-4dde-9f27-37c125a40aa5	1	Other	Other
+937b6d77-1bed-48a1-b46d-0b0086a9f4fe	1	Other	Other
+937b8473-83e1-45b7-a995-402b8e1e25a9	1	Other	Other
+937bbfce-d06c-42ac-8fbd-4da00f1792ba	1	Other	Other
+937bc5f0-5f58-42ff-a265-587426306ff6	1	Other	Other
+937c741f-b2dd-483f-8ad7-e72469df5d51	1	Other	Other
+937c790c-474f-4d4e-bb9c-930547c65041	1	Other	Other
+937c90e0-4785-40d4-aca2-e0b4fd62651d	1	Other	Other
+937cb49b-2353-4ff2-ad68-f890c9389563	1	Other	Other
+937d275a-3bdb-482c-916b-76b70e2ce20d	1	Other	Other
+937d56bf-1aaa-400e-93d9-e8d9792657e9	1	Other	Other
+937d89cc-43db-42d8-9d66-a794f1f23b92	1	Other	Other
+937d8d73-67d1-4a6c-a473-117d152e4e00	1	Other	Other
+937da1bc-3a92-4fce-b961-9b6aaa36f7b7	1	Other	Other
+937ddad3-2b35-4556-8680-3f972abd1363	1	Other	Other
+937e1160-98e2-49b0-bb46-59d1cc78b8f2	1	Other	Other
+937e6da2-ccc3-485a-b2a1-41f118b9d9b6	1	Other	Other
+937e708a-7625-4741-a6d7-3ae5b562d169	1	Other	Other
+937ea87b-7c0a-494f-8388-f485de335567	1	Other	Other
+937ee27c-6e99-4144-a6af-bd299c06348d	1	Other	Other
+937f37bd-add2-4960-9ef4-3e61c6f16504	1	Other	Other
+937f42a1-e890-4c5d-8d26-dd73cdfe2077	1	Other	Other
+937f8685-e973-4a8e-b264-ce4830ff905d	1	Other	Other
+937f99ba-3b6d-4c7b-9693-9f85e7dc792c	1	Other	Other
+937fcc90-60d3-4132-809c-3717d0f76bf0	1	Other	Other
+937fe7fe-5ee3-4d10-9403-b8ee0026ffc0	1	Other	Other
+938028d5-8aaa-4596-8ec4-337f67452214	1	Other	Other
+9380481d-a721-4a64-a95b-e1811ca79b24	1	\N	Other
+938066ee-bf00-466e-b78d-af5ce761a9d0	1	Other	Other
+9380bf11-95b1-441d-acf7-c243a8d41334	1	Other	Other
+9380cd69-eff9-492e-98b2-3f786dbafdc7	1	Other	Other
+9380eb17-00e4-47ba-9794-114619b4a7f4	1	Other	Other
+9380f5f4-dbe5-4a2c-a20b-f75062a2b34c	1	Other	Other
+9380fc5f-b224-4ddc-966b-bd1dc0200eb7	1	Other	Other
+93816e68-9df2-4895-9a21-020177d9d6ba	1	Other	Other
+9381998e-7589-41a6-bfee-d1979b489dbf	1	Other	Other
+9381c14b-f323-4513-bc2a-8ba5bf0d4575	1	Other	Other
+9381dbf2-2288-4268-90e0-984ff53638af	1	Other	Other
+9381e29a-d5b7-44d1-bd18-4a72d925c39a	1	Other	Other
+93820049-3790-4be8-b0a6-b3b70cb94c35	1	Other	Other
+9382262c-6a29-4a64-b2fe-b613f724790d	1	\N	Other
+938255e1-8422-4936-8145-c99d84d8b918	1	Other	Other
+9382d1a0-f976-4ba8-b249-4254fcf9a9f1	1	Other	Other
+9382d85f-8e95-47b6-b1d2-19b84620b976	1	Other	Other
+9382f433-3a3e-4c56-b582-2d4dc55caa29	1	Other	Other
+9383420a-0a6a-4a52-a4b0-97987f6d2dab	1	Other	Other
+93835a23-5db9-4e4d-a22a-079243dc09a3	1	Other	Other
+9383e45d-215a-4cc2-819e-d16880c23f8c	1	Other	Other
+9384897d-c574-4c04-991e-6c54dddfa8cd	1	\N	Other
+93849c2f-0bce-47ea-aef1-c94d3d2a8137	1	Other	Other
+9384aefe-ad8a-4e92-bcd1-2dc2780f6160	1	Other	Other
+9384b5da-1d37-4949-8a11-8510f5384185	1	Other	Other
+9384b66f-63e7-4e61-a1f9-3e1b48f4535e	1	Other	Other
+9384e644-d7e8-4f19-8244-3ddd32679402	1	Other	Other
+93850ad9-4d42-4c43-be48-dfe6dd9309ea	1	Other	Other
+9385313b-27a9-4084-8c33-da1e308ba1dc	1	Other	Other
+938554f3-77c6-4ad2-b065-0c56e95a7a57	1	Other	Other
+93856cf0-7ee7-456f-8fa8-70890d4a95c1	1	\N	Other
+9385a1b5-814b-43c9-b6a8-03185aced68d	1	Other	Other
+9385d5f0-f46c-4b65-85b0-29848780be2b	1	Other	Other
+9385e8a8-7a6a-4e78-87cd-ca4fd455596f	1	Other	Other
+9385f223-2d82-498d-bdee-e4880a97bef4	1	Other	Other
+9386025f-89ae-43ca-895a-0c8fc4de821a	1	Other	Other
+93862311-43d3-4efe-80b0-c6bd9812e948	1	Other	Other
+9386699b-258b-4586-b69b-195fdf4715f2	1	Other	Other
+9386a0ad-9622-4673-9035-57cc22c97416	1	Other	Other
+9386a1bd-9d5f-43bb-834a-dc40cbdf410b	1	Other	Other
+9386b384-3841-4759-bee6-bc8343508f27	1	Other	Other
+938729c3-3130-4aa1-9e4b-9d42933296ff	1	Other	Other
+938762d1-f30f-45d2-bfbe-594b03cd1078	1	Other	Other
+93877bd1-d7e5-471f-bc2d-f277d29b9fbd	1	Other	Other
+93878d19-94f7-48d1-b01e-eda3fe06bea1	1	James	Other
+93880e85-2e4d-41ad-b543-9126fc31fd7f	1	Other	Other
+938863c2-abe6-4036-a1ee-34995e38cfaa	1	Other	Other
+93886fa4-31b4-41ff-80b7-beac7d8e8c6d	1	Other	Other
+9388b5f4-f8e6-4053-9e06-79545a4502d8	1	Other	Other
+9388e2ef-e085-419f-886b-edf69f650e72	1	Other	Other
+9388eb30-14fe-4dce-9d39-e68fa953e33d	1	Other	Other
+9389071a-7bff-43db-abd2-61a080573a6a	1	Other	Other
+93893a41-6800-4c00-abd0-556d9111b28d	1	Other	Other
+9389509e-2997-4381-bfc8-c81b43f46814	1	Other	Other
+93897525-b54e-4081-acb1-0d857314754e	1	Other	Other
+938987a4-9201-41ab-8af8-2cf17a6c7650	1	Other	Other
+93898b3b-9f4c-4829-9398-aa7cac53a822	1	Other	Other
+938998dd-7a8d-4992-bc38-097cf50cf18e	1	Other	Other
+9389b806-9e01-4ab8-8c7c-355c22482e18	1	Other	Other
+9389da06-308b-479c-b2bc-28230bb268e8	1	Other	Other
+9389f1e1-1730-4a1f-9835-dfc7667c588d	1	Other	Other
+9389fd11-8942-4cd9-8cd4-dd4f50fc18b2	1	Other	Other
+938a0fb3-ff28-4f66-8c55-c3bc11286954	1	Other	Other
+938a2c92-b666-4582-bf1d-77aee38494b1	1	Other	Other
+938a3994-8f28-4f5d-a1c1-d602150faa52	1	Other	Other
+938aa6fb-e899-47c0-9f79-0d72068db421	1	Other	Other
+938b1a8b-9f87-45b7-9c25-324e69bb46ef	1	Other	Other
+938b20c2-a008-4444-99a2-24eae654b9a8	1	Other	Other
+938b5855-4866-488e-8097-194a752460fd	1	Other	Other
+938b83ad-2f24-4870-aded-d689a83a8e9d	1	Other	Other
+938baa19-0636-4626-9d0e-efe2674f8421	1	Other	Other
+938bda6d-6048-4ef7-801f-ef8cb61dd50a	1	Other	Other
+938c0b75-d871-4ddd-9165-13d32ee944e4	1	Other	Other
+938c48e7-66cc-4417-ac73-51be8d04f7b6	1	Other	Other
+938cdf07-db96-4464-8d11-51bd0b3bab36	1	Other	Other
+938ce2a6-7fc0-4df9-8edc-4f9d7d6a2906	1	Other	Other
+938d1220-ffee-4d6b-b596-33078a820a0a	1	Other	Other
+938d4cf3-4253-4a59-ad35-66acec0b0bd8	1	Other	Other
+938db403-3ecd-4cc4-864f-cc3698cb20e8	1	Other	Other
+938df600-7da1-41df-b1b9-dcf3349672c0	1	Other	Other
+938e1a84-e3b2-422d-8d3a-f28512cbdab6	1	Other	Other
+938e2226-41f1-4644-a4d0-e3b1240d6ab8	1	Other	Other
+938e2c4e-c138-4bf2-931e-9fc2e234df1e	1	Other	Other
+938e6c42-bae3-46ff-a007-074021e69bbd	1	Other	Other
+938ea33e-9455-4228-8a14-47945a8e581e	1	Other	Other
+938eeb5b-1a8a-4733-94ca-52749e74aa23	1	Other	Other
+938f0b90-6b1d-4d6b-95f6-4f1ce5ea038a	1	Other	Other
+938f3713-43aa-4780-b179-20c4a5f26f25	1	Other	Other
+938f6597-9670-4086-8b57-89e24f2b6873	1	Other	Other
+938fa1d2-67f6-49ff-920e-265bb83916b0	1	\N	Other
+938fa8b5-55cb-4c99-8b41-872c965b61c4	1	Other	Other
+938fcd90-2971-4e23-8920-0812a246e4c1	1	Other	Other
+938fd500-c78d-4548-8a71-ca6aeb598f00	1	Other	Other
+938ffb64-5bd6-4c3c-aa9e-840dbda237d9	1	Other	Other
+938ffe88-7d9c-436e-8151-e6c5df315ed3	1	James	Other
+939037d8-86f9-454f-8d36-7e4ecbc71152	1	Other	Other
+939071f6-b41b-4e58-927f-ffe5e2128fb1	1	Other	Other
+9390d98f-7b2b-4dec-8e31-74a2a293daf5	1	Other	Other
+9390fd4c-e81e-4800-b121-5d67dea9631d	1	Other	Other
+939145b0-60a7-46f4-8445-1caf532bd482	1	Other	Other
+93915514-3439-4af7-877b-c2a5d9823d7e	1	Other	Other
+93916ed9-e2fb-4a88-8c5d-e24442e282ff	1	Other	Other
+93917fd1-0014-4098-9cdb-6dad520064ac	1	\N	Other
+9391d920-2172-4264-a4a1-f6390d69be7f	1	Other	Other
+93923bb5-7482-4ce6-b755-791775dcf187	1	Other	Other
+93924695-006e-451e-9a3e-5467a408fa3a	1	Other	Other
+9392610e-0763-471d-bd83-fad72afe66de	1	Other	Other
+939276b2-0086-44a5-9883-555de9458689	1	Other	Other
+93927ad7-7995-442f-b1e4-7d6429c6bb94	1	Other	Other
+93927e5d-bec1-4990-9100-5675c2f4b8ba	1	Other	Other
+93928307-7900-4866-8148-945b173396ad	1	Other	Other
+9392a30a-7ec5-4984-85ff-ec975b8fc1c6	1	Other	Other
+9392b2c8-83df-4998-abab-668c69f7793d	1	Other	Other
+9392cbe9-4f26-45a1-8933-99ae4748a7a6	1	Other	Other
+939319d0-3f15-41c2-be96-8cc351378bd9	1	Other	Other
+939337f7-1b2e-4c7b-ae8b-6501a879e03b	1	Other	Other
+93938386-312e-4203-b8a6-2d58b33cf258	1	Other	Other
+9393d2d8-2a3c-4ba3-86b4-64df13417ab7	1	Other	Other
+9393e2fa-8077-492a-8cbb-ccbe900a62b2	1	Other	Other
+9393ecbe-a735-43ad-af33-4ada3ad93494	1	Other	Other
+93940408-1d91-4134-85cb-9464b17d0610	1	Other	Other
+93948704-a4cc-46f9-9509-90407bc1872a	1	Other	Other
+9394ad4b-49f3-4b39-9e4f-0d4ffdbbd338	1	Other	Other
+9394e7c3-82d7-49df-9c03-cabcb5416402	1	Other	Other
+9394eaec-9896-41f2-aade-1d8e472e4943	1	\N	Other
+93953bc5-e0a9-4dab-99f7-b009b52d1eca	1	\N	Other
+9395a3bd-ee34-4cc5-82ba-5179a9867689	1	Other	Other
+9395b7e4-209e-482a-ae5e-936a15f97f1f	1	Other	Other
+9395bc2e-812a-411e-870c-9d2cecbe61c1	1	Other	Other
+9395c6b1-9e76-48a9-81ae-239145906954	1	James	Other
+9395e17a-289d-406c-bed1-cc263334735b	1	Other	Other
+9395fdda-80fb-4a78-b285-325b210b2a8b	1	Other	Other
+939602d4-f05f-458e-9e0e-fb56b00ea414	1	Other	Other
+9396247e-758c-4b14-8ed5-39e203263ed9	1	Other	Other
+93963cf3-7a0a-4fa5-85e7-9a7fb1ed6625	1	Other	Other
+93963e97-6d28-43e9-b808-5f2d4fac2df5	1	Other	Other
+9396780e-f63d-441f-9a7f-39313f8653d5	1	Other	Other
+93969e83-5948-4594-bf96-aef20c8c59b6	1	Other	Other
+93969fd8-e562-4afa-88bd-4b935dee2e9c	1	James	Other
+9396ab69-5a0b-4958-8864-235b11514979	1	Other	Other
+939713f3-ced2-491f-a00f-234c13389563	1	Other	Other
+93978dd4-9b84-41bc-8d3c-97a87bf0f01b	1	Other	Other
+939799d0-fa3c-43b5-9a61-54bb227691d0	1	Other	Other
+9397d46d-b1a0-406c-bb32-0dcd3d303ec9	1	Other	Other
+93983583-64be-4de6-972a-3737d9071da1	1	Other	Other
+93989767-c856-4f9c-9148-7d11677a9b04	1	Other	Other
+9398e4fb-d105-41a3-972d-f0d66da0cb11	1	Other	Other
+9398faa8-ee07-4470-974a-5c8cde876d48	1	Other	Other
+939906a6-00c6-4c6b-8321-c55a0214838c	1	Other	Other
+93991058-a9f9-4660-b42e-4a15c52613a7	1	Other	Other
+939942b4-2a4a-4db1-a867-4b47158febea	1	Other	Other
+93994b1e-0d66-4c0e-ab5f-e81789094f2f	1	Other	Other
+939a14fd-4ab8-482f-a008-0c6af52c9b5a	1	Other	Other
+939a2e5b-9378-413b-8455-30a2a508b957	1	Other	Other
+939a5a2f-4112-4586-99bc-a8ce2c08f8dc	1	Other	Other
+939a5e67-70cd-41d6-9b53-5542ccc312ab	1	Other	Other
+939a8ae1-a3bc-4308-8ddd-6fa887d70f62	1	Other	Other
+939a9416-36e8-499e-b638-35293470b679	1	Other	Other
+939ac028-09bd-4721-99d4-4f62b9ad1187	1	Other	Other
+939ad1e9-82ee-43a3-9569-cf042481d8ef	1	Other	Other
+939b625c-2f42-470b-a433-576446b41b86	1	Other	Other
+939ba729-7eb4-477d-9442-a4aecbfc52e0	1	Other	Other
+939bb89e-1eec-4e71-bb1e-3962d32a801c	1	Other	Other
+939bf8ff-9d4e-49f4-be6b-8c4c66f6d8b2	1	Other	Other
+939c5f04-cb97-4f43-ad63-34a0ffd285ea	1	Other	Other
+939ca6cc-c231-4371-bee8-451bfb233459	1	Other	Other
+939ccd70-0fde-4b64-bf4c-05f2fb506bcf	1	Other	Other
+939ce9f8-3878-49b3-8c69-8f97d6d888ae	1	Other	Other
+939d05db-cd7e-4604-8dfc-f414856a35a8	1	Other	Other
+939d07e0-1b81-4ab5-979d-0c871613f493	1	Other	Other
+939d97da-f806-4404-b261-41f725a4c4d8	1	Other	Other
+939da15b-3af2-437f-938c-d9ec55efc562	1	Other	Other
+939dba40-3268-493f-939a-8ac29b6e88e3	1	Other	Other
+939dd389-d1b4-41ab-bda5-791efba701fb	1	Other	Other
+939df5f1-8584-4f20-b3a0-79486b6c5d7c	1	Other	Other
+939e12f6-c7e2-4531-a00d-767e462db02b	1	Other	Other
+939e31a3-7ff2-43ad-8040-454c2a9a90ce	1	Other	Other
+939e6621-0153-433b-b96b-164e325901e2	1	Other	Other
+939e7807-3f7c-4ef4-9368-4fd0100ed25f	1	Other	Other
+939e85ac-8cc6-4df9-85b9-cdc2c569d967	1	Other	Other
+939f7fbc-f2fb-477c-b6dd-4bf08e3cbee8	1	Other	Other
+939f96f0-89e3-4673-89ac-e88e7de26117	1	Other	Other
+939fefa3-a04d-4231-8193-a30f73db2cbe	1	Other	Other
+93a08372-a571-45bb-b3bd-18e5be0e7bb6	1	Other	Other
+93a10b38-57cc-4fda-9b47-0f137b5a3913	1	Other	Other
+93a1811f-f2a4-4c79-9a7f-5defc1fde2f0	1	Other	Other
+93a1a63c-ec3d-43a5-88c8-4af219a32990	1	Other	Other
+93a1c28c-24cc-4ea4-946a-568a121f308c	1	Other	Other
+93a24612-afd5-4fae-9332-d1edffbcea1b	1	Other	Other
+93a272ac-4376-462a-91ba-bd8b09e8df1f	1	Other	Other
+93a27b64-5389-4d83-9703-da80df50d455	1	Other	Other
+93a27c80-5702-4fdd-ad00-372976eb2804	1	Other	Other
+93a28a0e-9e73-4699-8663-4655167af691	1	Other	Other
+93a2e012-76e4-4ccb-bcd9-bed0699c9c6f	1	Other	Other
+93a310e7-227e-4503-976e-ce5b1c7e87a6	1	Other	Other
+93a32b1a-e44d-4d32-ab83-f94527d67b69	1	Other	Other
+93a35260-5f61-47b1-8436-f7f4621c94ba	1	Other	Other
+93a398c8-3d26-450a-816c-c36bef6f4664	1	Other	Other
+93a39cfa-0f65-45de-8d23-6101bb9b7717	1	Other	Other
+93a3d08a-a615-418f-8355-32c7a4abf896	1	\N	Other
+93a3e1a8-d711-409d-aecb-07f01eccd0a1	1	Other	Other
+93a3e5c6-fbfd-487a-9f19-bb6938eb21aa	1	Other	Other
+93a3f28c-3420-40e1-9004-5287c85df58e	1	Other	Other
+93a41d26-5950-4352-a217-1f54f38114a9	1	Other	Other
+93a45988-a040-4e0d-8d20-3a5ea87526f2	1	Other	Other
+93a463f1-0b64-40e3-b20c-1f723b2c5fe0	1	Other	Other
+93a485a7-6737-401f-b51a-16197b8c3748	1	Other	Other
+93a4d677-355b-4894-8675-795036bc67f5	1	Other	Other
+93a4f7a9-fb9c-45f3-a92f-cdb9b07175b8	1	Other	Other
+93a56439-fdf2-49fe-b33e-797896219b2b	1	Other	Other
+93a568a0-46a6-4575-9756-17f5e7703dbe	1	Other	Other
+93a5870c-2a6c-494c-b634-557064daffdd	1	Other	Other
+93a598f4-3d1b-402e-a648-7c9da78c1af4	1	Other	Other
+93a5eea6-e0cc-456f-8b56-a6940a30d827	1	\N	Other
+93a64e21-b908-4440-9f5a-f4fa18f36b85	1	Other	Other
+93a6a7e7-6eb2-406c-8839-f562f60fe703	1	Other	Other
+93a6f4f2-f85b-4c1b-849a-52d6cebc67ea	1	Other	Other
+93a740dd-eb28-4266-ae25-4d778574fd61	1	Other	Other
+93a78107-1985-4831-8ca0-75a92d7edacf	1	Other	Other
+93a79a8b-ef92-44f0-ba93-2179e56befaa	1	James	Other
+93a7b4b9-f3f9-4c62-a703-273fb2f46232	1	Other	Other
+93a7c0ad-2a53-4cc3-8ff2-fbab21e91fb6	1	Other	Other
+93a7d71c-af3d-4f34-a350-5ca962493e8e	1	Other	Other
+93a7f272-e63e-4604-8ec9-07718b24992d	1	\N	Other
+93a8008a-5017-4367-8c5c-8d144728c5da	1	Other	Other
+93a82e28-8e90-4178-8927-a3024bbc0c06	1	Other	Other
+93a86c8d-c688-4148-911d-c3c4c949e2c3	1	Other	Other
+93a8710d-dd2e-48ba-8fc4-3b0cc80f5536	1	Other	Other
+93a87fb3-d774-4e78-84aa-5d361b422748	1	Other	Other
+93a886ba-eabd-447b-85b7-d906dc31075c	1	Other	Other
+93a8d66c-0d73-4a07-88bf-7652d59ca6f7	1	Other	Other
+93a8e13f-a264-4829-ab77-9176983ff594	1	Other	Other
+93a8e6de-c6c7-4838-97e1-a8de059608cf	1	Other	Other
+93a90873-1eaf-4512-8ed9-b58ab2301368	1	Other	Other
+93a942e5-7341-4bf0-9f87-c38f8402cd14	1	Other	Other
+93a95154-4ce6-4733-bfdf-dc0c1855f043	1	Other	Other
+93a999da-d2be-486b-a4e0-adb0a9b47fce	1	Other	Other
+93a9f96a-3dad-4497-9db0-31471a76e10c	1	Other	Other
+93aa67f8-d43b-4f75-b7f9-8a46167b284b	1	Other	Other
+93aa7209-65e0-4f1f-af37-dee9cda7464f	1	Other	Other
+93aabeec-c848-47ef-89f2-a6c2d004d0d9	1	Other	Other
+93ab1b88-0eca-4a41-812c-34bf126114b6	1	\N	Other
+93ab1bce-cd6f-4aa9-afd9-eaf13ced6985	1	Other	Other
+93ab4de3-baf0-4692-8fc4-8ece351d9e4d	1	Other	Other
+93ab7059-92f9-42cf-b0d3-ff0b5936b795	1	Other	Other
+93ab7b95-5c5e-429c-92c1-aab300e6f7ee	1	Other	Other
+93abdbd4-9041-4d92-8beb-440bb6080223	1	Other	Other
+93ac4570-3e06-4ee1-b2e8-2dc2d7e35dbf	1	Other	Other
+93ac866f-d12d-4442-bb6e-e5a65bdf141f	1	Other	Other
+93aca496-c577-41aa-b05a-536d219dd26c	1	Other	Other
+93acbcc6-b7da-444b-9b35-b00cc995016b	1	Other	Other
+93ad1a01-a67c-4d90-a41e-4d2d76c2269e	1	Other	Other
+93ad227d-b117-4345-8f38-56f1db481d3b	1	Other	Other
+93ad5450-ca75-4834-a610-dc3756ea0742	1	Other	Other
+93ad894b-ac1b-4b17-aa90-6048f9571574	1	Other	Other
+93ad9618-c4a2-477b-ad94-f33e711301d3	1	Other	Other
+93adac06-1e60-4d47-8a3d-70a6a5ed1f03	1	Other	Other
+93adb3bb-34ba-47ca-8abc-6988bee0c15f	1	Other	Other
+93adc923-47e9-4644-b792-77a01e7521db	1	Other	Other
+93ade4aa-7d19-4189-9b9e-ba728ffef274	1	Other	Other
+93ade73e-5fcb-4181-a049-08849842af50	1	Other	Other
+93adebcd-1ef7-4b8e-963d-86eb62db02e7	1	Other	Other
+93ae023f-abf9-4410-86d3-b3f84edd6f46	1	Other	Other
+93ae0ad9-d174-4f9e-8a3f-5de49f2f0586	1	Other	Other
+93ae125c-215e-4fba-a381-6c2c363d7bf4	1	Other	Other
+93ae3332-98db-4f3a-9ce2-5e61af6416de	1	Other	Other
+93ae753c-836d-4fbd-b911-5ed36d1629e4	1	Other	Other
+93aebbb6-c8d8-41cb-830b-0db95baf91a6	1	Other	Other
+93aeebe0-9509-4589-a420-398b3e09dd16	1	Other	Other
+93af3fed-c120-469d-a00d-ca7ad8d90705	1	Other	Other
+93af49a8-4515-4c70-bb36-e23b5140b6bb	1	Other	Other
+93af5cf5-4696-4cd0-b81c-b5cbdddcb0a1	1	Other	Other
+93af74dd-219f-43cf-baa6-552de602c0b3	1	Other	Other
+93af9a42-818e-4c5b-834d-6e8c8c360801	1	Other	Other
+93af9f53-2c48-4069-ab2f-64ec09c16e65	1	Other	Other
+93afd417-e55a-464d-b97c-c0df59417536	1	Other	Other
+93afd750-3889-407a-9ac6-7a28d6776f78	1	Other	Other
+93afd8a8-ae74-4d0a-b38e-80a52df567af	1	Other	Other
+93afde2e-0837-4f38-a2cc-21179780f17d	1	Other	Other
+93affe86-a919-4f5e-b028-a62469651c59	1	Other	Other
+93b02273-ac48-4323-ab58-d2850b8ccb3e	1	Other	Other
+93b043fb-cab3-48f6-a7f8-04999960e95b	1	\N	Other
+93b07e2d-6712-489d-85f7-044a128d1984	1	Other	Other
+93b0bdaa-b3a6-406f-aa95-fbb966be31e1	1	Other	Other
+93b0f953-836e-404f-ad34-1bb3d1e18dfd	1	Other	Other
+93b1165c-2ea6-4551-8d0f-7508e3cc44b4	1	Other	Other
+93b159dd-4f1a-41c6-b4cf-e183a53aa0c9	1	Other	Other
+93b1a96b-ad5f-4dd3-90a8-6d1704f266b4	1	Other	Other
+93b1dfbc-84ed-4764-88f1-67e75274149f	1	Other	Other
+93b1fabe-f936-4335-afa2-35e9a75fcd67	1	Other	Other
+93b24f4f-efdf-423e-9b2f-fa99da481e3f	1	Other	Other
+93b27313-ce2e-45f9-b6cb-1a71d375e419	1	Other	Other
+93b29fb0-7846-4f0a-ba4a-a20963f47574	1	Other	Other
+93b2d50b-de84-4303-857f-f5b47f6f916f	1	Other	Other
+93b2f644-b29f-4319-883b-30b75ebfa1dd	1	Other	Other
+93b2fbbc-6ae9-4faf-b81b-de9579264f60	1	Other	Other
+93b338b7-4f36-4726-9734-65b3256004df	1	Other	Other
+93b37b1f-efb6-48fb-a558-723fb2f8afc8	1	Other	Other
+93b394ed-cc0e-4de5-9924-327dd28ae16d	1	Other	Other
+93b3d34f-8758-4a58-ac83-f861d03fe722	1	Other	Other
+93b3e942-7df8-4ad3-a35c-fb3da3ee2125	1	Other	Other
+93b3f158-1361-47fa-a178-df5913c38b30	1	Other	Other
+93b3fdaa-18df-4b67-b0c9-eb6da6fc7038	1	Other	Other
+93b41a83-d321-4b66-bdf8-6d8b56449e92	1	Other	Other
+93b443ba-6617-4d70-9f7f-e71aa87565b4	1	Other	Other
+93b44d1c-ed4f-4d82-a091-919a13c328f8	1	Other	Other
+93b45cc5-ac06-4f3b-b06f-09c065ef136e	1	Other	Other
+93b45d97-cb61-4fe3-8bca-5f1680949351	1	Other	Other
+93b472c9-c160-4193-911d-60226bd037a9	1	Other	Other
+93b47380-5850-4aa9-909c-fa9548105cd9	1	Other	Other
+93b47714-83a7-4c37-9dcd-1cfa3dc8c8cc	1	Other	Other
+93b48235-f81e-47f9-a7b4-2560bcea8169	1	\N	Other
+93b52d2d-2a81-4c3b-83cb-14476486c59d	1	Other	Other
+93b56d23-2c61-4e89-8c2e-7409580c3561	1	Other	Other
+93b598d1-d3d7-43af-90bc-e0ad4268976b	1	Other	Other
+93b5a17b-7a7b-47e0-b493-9dc5a08f4c20	1	\N	Other
+93b5ac04-57bc-467b-b7f4-e6256701609a	1	Other	Other
+93b5c326-4f36-451d-927c-5442e48c3dee	1	\N	Other
+93b5c399-3d25-4ccb-8efa-0cc885e9f28b	1	Other	Other
+93b601f7-2e62-4a37-94ca-2ad3b68c166e	1	Other	Other
+93b60997-6104-4fb7-856a-73d29dd30a9a	1	\N	Other
+93b69386-8e93-4265-b2fe-05f96f985103	1	Other	Other
+93b6d772-077e-471d-b229-8db479c40575	1	Other	Other
+93b704d9-0149-4af7-94cd-25d9769491d4	1	Other	Other
+93b7114e-e00c-41e0-a2a3-9746f9b010f8	1	Other	Other
+93b74be9-edb5-4d40-ba44-d9dc452fa7fa	1	Other	Other
+93b78814-c82f-4002-8897-d876517b5888	1	\N	Other
+93b7bfe4-7d4a-4fd4-a734-c7b02ef59690	1	Other	Other
+93b7cad5-c9c8-4f7e-b60b-08fc94a6a35d	1	James	Other
+93b80e79-56bb-43ef-b06c-8d13585b6041	1	Other	Other
+93b85ae9-e3ad-457a-9ba5-1650be1c0ea5	1	Other	Other
+93b85ca1-72d5-4ebd-a4e4-261196bb9bc4	1	Other	Other
+93b862fb-f2dc-48c0-8b4b-a24705e62892	1	Other	Other
+93b96fd9-54a7-4262-bd1c-627ae26a1248	1	Other	Other
+93b9ef72-99fd-47f3-b6ef-86450eba03f3	1	Other	Other
+93ba0ca3-8ba7-45a8-9cd6-7fcc70bad87e	1	Other	Other
+93ba2383-6412-4880-b08e-bd30750b3c0d	1	Other	Other
+93baf6ba-385c-427d-b5ec-7908243caa3c	1	Other	Other
+93bb285f-9d34-4cab-aa87-f2654ee31dc4	1	Other	Other
+93bb2c5c-04a5-485c-88e1-798cb4ca8f66	1	Other	Other
+93bb5fd4-9ae9-4136-9982-eebbd90acc82	1	Other	Other
+93bb7158-a043-4927-a5af-6799505cfbf1	1	Other	Other
+93bbd305-6e6f-4a74-ac2f-1c12514b31a5	1	Other	Other
+93bbe3d4-f7fe-49c4-b20a-9fa682078c0f	1	Other	Other
+93bc3443-924c-4d01-9d16-faa617330937	1	Other	Other
+93bc8ab7-b793-48b1-9932-057cc33afedc	1	Other	Other
+93bcdbfc-de64-4279-b0a3-66ebe1b45de8	1	Other	Other
+93bd2c34-b9e3-4268-9b2b-97f6469c8622	1	Other	Other
+93bd62c2-4dce-4d72-bf37-657193e4cba4	1	Other	Other
+93bd92fd-1b92-470e-95da-5e742669b4e1	1	Other	Other
+93bddfb9-ddea-4b72-86a1-dc39e93378b6	1	Other	Other
+93bde1af-8ad3-4115-941a-dcd50895e3f1	1	Other	Other
+93bdfd6b-70a8-4622-beae-50f46454fb98	1	Other	Other
+93be3b6e-251a-4eb8-842d-a6cad0c20b68	1	Other	Other
+93be74df-6ea8-41ca-bc7f-5f061d7bad1f	1	Other	Other
+93be97a6-8754-443a-96f0-f121dbea21c2	1	Other	Other
+93bea292-d8f4-41df-a243-0ecb1e065490	1	Other	Other
+93beb2b8-77b5-4f16-9576-e5e242b19199	1	Other	Other
+93befbc6-6599-407c-ad21-e38fcf5b016e	1	\N	Other
+93bf72a7-7cf7-4509-ad0b-7811ed5ab737	1	Other	Other
+93bfbd6e-f464-4959-ab9c-b4a6c0d66cb1	1	Other	Other
+93bfc3dd-e866-4cf0-966f-fa63267068bf	1	Other	Other
+93bfddb8-f788-4e80-ba43-2a1a3f5c13a5	1	Other	Other
+93c011c9-68e4-4906-8b60-ecaba979fa66	1	Other	Other
+93c02a94-bc90-4070-8760-90ff91df9bbc	1	Other	Other
+93c039c8-5ba9-4066-a654-5c28c6a07101	1	Other	Other
+93c0d781-55cd-49e6-b429-8629c8c354f6	1	Other	Other
+93c104fe-3e9b-464b-a847-0347927fcea8	1	Other	Other
+93c16fd3-3967-4b54-bf3a-71bc129fc42d	1	Other	Other
+93c18236-29fb-4e9a-a83f-a7da07bab650	1	Other	Other
+93c18f9c-46b2-4111-b9bc-86078b76c1c0	1	Other	Other
+93c19e9d-cc28-4391-9adb-6b079525dd7c	1	Other	Other
+93c1af90-14ff-4383-8601-a19b2b65aeff	1	Other	Other
+93c1c830-bedc-4a9d-ad1e-b1d9a85b7aab	1	Other	Other
+93c20862-2679-41e0-bea7-9b204605cc4d	1	Other	Other
+93c210d7-490f-40b5-84a1-5ddd6d3f4eae	1	Other	Other
+93c21845-456b-44a5-aea6-393c50f12a00	1	Other	Other
+93c237da-ac46-4508-9608-54114c17bdc3	1	Other	Other
+93c266f4-13e6-43b1-bf79-61d6870eaf09	1	Other	Other
+93c27b27-9e8f-4b98-ba85-860657ff1887	1	Other	Other
+93c2e05e-1139-498c-b054-0fcb5baf7be0	1	Other	Other
+93c3bdb2-8f7f-41b2-9aa0-e3337109a17c	1	Other	Other
+93c3bed2-7215-4fa1-bcb6-54c2c4d93947	1	Other	Other
+93c3c8c7-5bde-4937-9a08-f6d19be3a27f	1	Other	Other
+93c426d1-f205-48db-9d13-853711d261df	1	\N	Other
+93c483ce-6098-4141-b9f1-09bebfa0ab0f	1	Other	Other
+93c4901e-8515-411c-a6a9-96ba02840a02	1	Other	Other
+93c4a98d-9d1d-46b4-af3f-876358ec6d32	1	Other	Other
+93c510bb-4322-453f-a085-c553364fc18a	1	Other	Other
+93c5142d-0db7-46dc-9fa4-b33087c795fe	1	Other	Other
+93c5227c-d58b-4592-8e85-801b3952c462	1	Other	Other
+93c557fe-654b-4cb0-aaf3-c86efc57609f	1	Other	Other
+93c57a65-b4bc-49b5-8759-8bbe389aa227	1	Other	Other
+93c589dd-3088-4288-903b-fc1cfa0f63fc	1	Other	Other
+93c5afb0-c948-4c2c-8273-9f9932096164	1	Other	Other
+93c5c0ee-57bc-4edf-843b-5b818cbd5193	1	\N	Other
+93c5d18b-47d0-4ce5-99dc-e177890502e8	1	Other	Other
+93c5d908-7acc-42d5-8746-ee597c04565b	1	Other	Other
+93c63431-3a54-4c0e-b126-77821f882b39	1	Other	Other
+93c68086-a4ef-4c69-b88e-2c1c073af39d	1	Other	Other
+93c68e8e-1ce9-44b5-9648-f2906109dfb3	1	Other	Other
+93c6a256-78fe-4581-a6d5-9e78616f7faa	1	Other	Other
+93c6bc95-65a7-4487-94d6-737e5fed0654	1	Other	Other
+93c6cfa3-7570-49ca-a2cc-f5fbdf55b605	1	Other	Other
+93c6e3b9-3e3e-4877-a6ed-a1c2ecc3cfde	1	Other	Other
+93c71f22-135b-439c-a73b-e23b188c329b	1	Other	Other
+93c72be2-fa5f-419a-a034-4f2501dcb3b1	1	James	Other
+93c73c02-aa32-4729-b847-8980e162893f	1	Other	Other
+93c7460b-38f4-4093-889f-5d272ae24f40	1	Other	Other
+93c7aada-5b64-4b2b-93f5-93229572353c	1	Other	Other
+93c7b9f3-bfdd-479d-8270-a90189b2994b	1	Other	Other
+93c8111d-db19-42a9-8e5a-509efe60ccc8	1	Other	Other
+93c8ff0e-aaca-4f75-b577-530ac856fd20	1	Other	Other
+93c93020-1727-435c-8ae9-d921a3556386	1	Other	Other
+93c945d0-5395-4a12-9c66-d82e922d1490	1	Other	Other
+93c94e49-7c24-4f5b-87ea-f9302412c4fe	1	Other	Other
+93c95edd-e285-4e91-af6e-75ce728351b8	1	Other	Other
+93c96d97-ecd4-4200-b22f-6fda8f10d850	1	Other	Other
+93c9a312-d5cc-48df-97a3-b011bae2ba5a	1	Other	Other
+93c9af4d-4965-49e3-9460-5a902dcacd83	1	Other	Other
+93c9d2b6-f181-46f7-9dc9-9f8dd214835f	1	Other	Other
+93ca79ca-2aac-431a-ac55-ae7d9cedb897	1	Other	Other
+93cb1be1-c153-4387-8a8a-7ab1eff11517	1	Other	Other
+93cb2de4-cbf8-494d-a036-83c54a453b20	1	Other	Other
+93cc25db-e424-459c-a7e3-20dfee5dc932	1	Other	Other
+93cc2e79-8c9e-4dfd-868d-5489f6581ac4	1	Other	Other
+93cc36db-d34f-4e1b-a704-858863f9b863	1	Other	Other
+93cc4c89-cf89-4485-aec0-218c256430d3	1	Other	Other
+93cc502c-e509-4a32-8c3d-de4b1ebd9b91	1	Other	Other
+93cc68d3-2a89-40ef-a9b3-1a3452a9fbe1	1	Other	Other
+93cc8f46-8282-4978-a522-3c74e75d018b	1	Other	Other
+93ccafa1-b749-4aa4-8c59-dca7fe0f6ec9	1	Other	Other
+93ccd39c-6a2c-4534-b01e-02a7d0b8d972	1	James	Other
+93cd7d84-28cc-42d1-8435-a99f099a68af	1	Other	Other
+93cd7fe8-4bd2-4936-95d0-fdb15f141313	1	Other	Other
+93cda9c6-56d5-48ae-afe5-33f2893baffd	1	Other	Other
+93cdba95-6bbd-430b-b292-7a520216aba1	1	Other	Other
+93cdd27a-7be6-4706-9e74-7a7c4f07d99b	1	Other	Other
+93ce567c-8963-41dd-94b4-8ad982daf52a	1	\N	Other
+93ce5d75-9d33-47f0-9298-8214768a67f1	1	Other	Other
+93ce63f1-2eb8-4201-85a6-671e30f7f7bc	1	Other	Other
+93ce8d04-9a8c-4a3b-801b-a7476ac57a9c	1	Other	Other
+93cefdf5-1a65-4373-9a5b-76b7e9859bd8	1	Other	Other
+93cf1bba-f3b7-47ca-9917-43fc6b63bdea	1	Other	Other
+93cf5fc2-360d-40a5-b450-1a71ef39904d	1	Other	Other
+93cf9dd2-6340-4806-9b25-e0ca550cb808	1	Other	Other
+93cfa061-79ed-4c4a-90c7-9a9312ce4be4	1	Other	Other
+93cfbe99-ba04-4e2d-890d-e0f19a40ee4a	1	Other	Other
+93cfd509-6741-4b2a-afd4-ccc175e9f122	1	Other	Other
+93d00f61-5ed5-4ce2-b913-5f960301a563	1	Other	Other
+93d05366-c0f9-41fb-8d0d-b148a4e13d3c	1	Other	Other
+93d05da0-522e-42e7-a713-c9c87194fdb6	1	Other	Other
+93d0f7e1-1179-42e5-95a6-87f14316a8e5	1	Other	Other
+93d10eae-a258-4f8e-b301-6f3b7e103aec	1	James	Other
+93d17389-38f3-47a4-9241-33031bfa9bb0	1	Other	Other
+93d1a991-2157-49ea-884f-3c04f40c7725	1	Other	Other
+93d1d174-aa19-47db-9e65-6c2c6db3209e	1	Other	Other
+93d1ea14-08ba-4efe-9d2a-73dd158280c7	1	Other	Other
+93d23527-229f-40da-9288-44d6ab2f8d3c	1	Other	Other
+93d2af11-e75a-411a-906c-aa6947b05312	1	Other	Other
+93d2f0f9-c08d-4d49-b8dc-22d3044afcdb	1	Other	Other
+93d2f6e3-b97a-413b-b383-b48aa00bfb5d	1	Other	Other
+93d2fca1-fee3-4870-89b8-79b5444f6be5	1	Other	Other
+93d314dd-c2b1-4a19-a2bb-4145543959c1	1	Other	Other
+93d3d559-5235-4233-940c-4f6af43abab9	1	Other	Other
+93d3f352-007a-419e-9fb4-79379c3c1bf0	1	Other	Other
+93d40ef8-9124-4018-81b5-82cb3dbe7f97	1	Other	Other
+93d41eba-4815-4470-b050-ed52053aa9e5	1	Other	Other
+93d44049-461a-440e-9b57-a419fd1ff53e	1	Other	Other
+93d4921a-1782-4b48-abc8-e5adcac8b446	1	Other	Other
+93d4a4ef-6990-42b2-9bf8-30ff81a60df3	1	Other	Other
+93d4c9bd-fcee-47fb-9be9-30abe43acb97	1	Other	Other
+93d4e2e9-ae00-4552-9aa3-aa87d58d6472	1	Other	Other
+93d52413-9964-401f-bc3f-8e49778ae471	1	Other	Other
+93d588a7-2b88-4e8d-87c0-f85020a84252	1	Other	Other
+93d5bca8-ae82-4e4f-82f4-adef73531480	1	\N	Other
+93d6daa4-1060-4137-a303-3a7ca0c15978	1	Other	Other
+93d6dc48-e6af-4655-be99-71222e072488	1	Other	Other
+93d6e63f-88f7-4f8a-8183-6c90a8574f7a	1	Other	Other
+93d71b15-81f3-4344-af31-a0360abafadd	1	Other	Other
+93d727ab-889d-46d5-b3a0-4484b76325dc	1	Other	Other
+93d76560-4fea-4b49-8693-fbdddb9a0bf3	1	Other	Other
+93d78bb8-8fa3-4559-9e5c-1b344caad37c	1	Other	Other
+93d79dde-ac6b-461f-bcd6-1d8662a76313	1	Other	Other
+93d7aa52-b03d-4c02-8ad4-0fc36cbd8068	1	Other	Other
+93d7ebeb-638d-40c3-b6c9-198fabc33e76	1	Other	Other
+93d81439-0df5-4fcd-a228-4ea9dec4825a	1	Other	Other
+93d81977-64f3-40c3-b45c-8adfd58cd675	1	Other	Other
+93d819c2-cea1-45d9-ad8f-dd8876c3d93b	1	Other	Other
+93d838b6-9306-41e6-9972-aadb9f51360f	1	Other	Other
+93d87fec-f02a-4ea2-9514-2bee13efede0	1	Other	Other
+93d88103-11e3-4235-b89b-33670f9b4785	1	Other	Other
+93d8a85e-b229-4d61-9b8c-a2b8f1c04a97	1	Other	Other
+93d92702-0543-4b4a-8d5f-3616ada9ef92	1	Other	Other
+93d92cf2-326f-4e2d-b61d-bdaedcebd1f5	1	Other	Other
+93d937f9-bf06-4c7b-ac22-35a7a90ff20b	1	Other	Other
+93d9ba32-fb83-41e0-9a26-540102747ec3	1	Other	Other
+93d9bb94-4249-455a-b683-7962d3933cd6	1	\N	Other
+93d9c3b2-1dfb-4296-bce2-a2976836a91f	1	Other	Other
+93d9eb90-ef39-47fb-8d6b-43b7aa7b0a57	1	Other	Other
+93d9ec42-1a82-4a9b-a55b-2106ac8d301a	1	Other	Other
+93da3621-6363-478e-b2f9-b968cf34a131	1	Other	Other
+93da5dcb-72b8-4daf-aeeb-96e8204fab11	1	Other	Other
+93daaa56-c60a-4181-9957-71044a56d465	1	Other	Other
+93db21f1-8752-4803-b65d-b9ae05bbdf92	1	Other	Other
+93db387a-034c-46b8-b4d3-bad6ab2e8468	1	Other	Other
+93db42bc-6e3d-48ce-8426-332612d49a9a	1	Other	Other
+93db4fb5-9e78-41c7-b4d4-5d85ad54c6ec	1	\N	Other
+93db6ae1-8256-4712-ad8a-28099a67cc1b	1	Other	Other
+93db7f3f-0f45-4c69-a5ac-36c00836f9d8	1	Other	Other
+93dba1d4-dcaf-4317-a312-9ae6e4067a70	1	Other	Other
+93dbc6d9-8022-4970-9f69-0ce2cf790454	1	Other	Other
+93dbe8dd-80ec-4596-9fef-1fe958ca12c0	1	Other	Other
+93dc2d85-c8a5-4d56-a4b4-60d4dfa1f0d1	1	Other	Other
+93dc47c5-6cad-42f0-b5a0-f66660f75cf7	1	\N	Other
+93dc6721-5341-4c7f-9adc-c2fb3d0b5cd5	1	Other	Other
+93dd6a8f-37a1-4ab1-9d73-bac280117faf	1	\N	Other
+93ddb44f-2119-47b0-86be-3c40205a9d24	1	Other	Other
+93de3adb-3ef2-4d19-913c-0fd92218adba	1	Other	Other
+93de3ea3-2a53-40c9-b6c6-4fdc54dbf5e5	1	Other	Other
+93de79da-fa45-441a-a126-029903721a6f	1	Other	Other
+93debec0-d5d3-4af7-9ba8-f9e7036ac630	1	Other	Other
+93dec6a7-c1d2-43f4-828d-9c06b3da302c	1	Other	Other
+93ded161-57c8-470f-858c-0277d6995544	1	Other	Other
+93def07d-1f3e-4cab-9229-c3ca62b98770	1	Other	Other
+93df31c2-095d-4ba8-9b2e-5b136d1586a4	1	Other	Other
+93df9edb-36d0-4c21-afd7-48afa9c5b3d6	1	Other	Other
+93dfb1e2-6aee-4e5d-ba9e-704f3e2ff640	1	James	Other
+93dfeba5-7f14-41d9-b855-253045f4cdd4	1	Other	Other
+93e00647-b924-46d7-be0a-8272ba3420e5	1	Other	Other
+93e03e63-f25e-4ee1-bf3b-04605c56d8b2	1	Other	Other
+93e050b7-90c1-4f3d-ba9b-ed0c08e6912f	1	Other	Other
+93e05fc0-cf73-4e96-95a9-c6c692c1053a	1	Other	Other
+93e09ec1-a607-43ea-91aa-788a4e7b646f	1	Other	Other
+93e0d055-c75f-4cc7-af70-d07d3ec4a218	1	Other	Other
+93e0fd6c-5f58-4e51-a35d-d9cc794f697b	1	Other	Other
+93e19013-0300-4654-a0f2-7e0c82b8b1f6	1	Other	Other
+93e1ae08-4049-4041-abd4-aa7d526a9cce	1	\N	Other
+93e1be89-fab6-4704-bfa2-cfd998c6431a	1	Other	Other
+93e227d8-110e-4e88-86de-a400561f71ec	1	Other	Other
+93e237c0-3612-43d4-9dae-614773eaea73	1	Other	Other
+93e23e24-7138-4d21-98fb-c039d17754e1	1	Other	Other
+93e26fc1-5e39-45f5-9da6-b50672e1aa8a	1	Other	Other
+93e27993-341c-467e-984a-9d4957fcd668	1	\N	Other
+93e2d0b9-22c4-4cab-893d-0489b3a8b238	1	Other	Other
+93e2d690-b18a-4d9c-9360-ea5d3197004b	1	Other	Other
+93e2f77f-f596-4e5e-a5b1-069eca3a49a4	1	Other	Other
+93e2f7eb-36de-49ad-963c-019f6fc60863	1	Other	Other
+93e3467a-ab65-4bcc-82b3-7428ddc44e9e	1	Other	Other
+93e346db-4f77-42a5-98a6-b366ce8a2829	1	Other	Other
+93e35df9-0c00-4087-8113-d2c8192f359d	1	Other	Other
+93e37e35-a7f6-41da-8f15-e90b77fe76a9	1	Other	Other
+93e39631-c3a9-47d6-96a7-f1e46957aed7	1	Other	Other
+93e3ecde-324c-476b-bf8a-6618ce51f5ca	1	Other	Other
+93e411cb-ca6b-4558-a591-d7c73f19ce65	1	Other	Other
+93e42ff5-5a16-4ed6-a4c6-35b0f73aaf40	1	Other	Other
+93e44228-eb83-468b-a3c8-7808add5fb16	1	\N	Other
+93e447ef-15a5-4fba-95e4-c78179e7d55c	1	Other	Other
+93e45a6e-4810-4f57-bbf4-e7ab59106a49	1	Other	Other
+93e46243-cc77-4957-9510-f368a950b819	1	Other	Other
+93e4749f-2324-440b-b46a-7e2b0aa9f402	1	Other	Other
+93e47878-4db9-4ba8-808c-341776c92ecb	1	Other	Other
+93e488b8-9d3b-472c-9f7b-b1815b3b305c	1	Other	Other
+93e4d496-aa86-42ec-9534-ee10bda610a4	1	Other	Other
+93e4f774-1da7-46d6-9559-f2c5e65326a9	1	Other	Other
+93e50979-d58a-4470-8b6e-a5a08f8522e7	1	James	Other
+93e53fd8-4ae9-4ca6-bc71-2f6c6e4912e9	1	Other	Other
+93e5e42b-c6f6-4cb5-9965-fa8519455e07	1	Other	Other
+93e60cf3-5a18-4cd7-821b-ad75f2dafc7f	1	Other	Other
+93e6175a-4d4d-4ac5-9102-009d452f5e92	1	Other	Other
+93e6319b-00f9-4059-aa13-e8dcad37c45c	1	Other	Other
+93e65bee-b8ed-4ab6-a314-2cefe861a6b8	1	Other	Other
+93e67327-1559-4cf3-a8cf-a07ff818961d	1	Other	Other
+93e690ed-2d9c-4dec-97cf-bd15a3c82941	1	Other	Other
+93e719f5-37fe-4621-b9c7-a95c8c8b4e2a	1	Other	Other
+93e72d05-4960-443e-8e95-1656925daba9	1	Other	Other
+93e798c4-f12c-4f5d-a830-436d78d64971	1	\N	Other
+93e7a2ee-2f8d-45b0-88bd-0adbc98040f8	1	Other	Other
+93e7cf90-76c5-4859-b6d3-1559c183aed3	1	Other	Other
+93e81f0e-e36b-4538-9acc-ed11c38f4a67	1	Other	Other
+93e8858a-fe62-46c7-b7d5-c45a7c099930	1	Other	Other
+93e90c54-8e9c-46c9-93b7-b17287d2fb24	1	Other	Other
+93e90e60-7efb-4adc-ad8f-e89a60512a8f	1	Other	Other
+93e97153-c1ee-4ec1-8871-58654126f2d5	1	Other	Other
+93e9c4aa-1338-458b-ae84-4fbab9a4ad4d	1	Other	Other
+93e9dabb-739e-4ef0-82f0-19c6dcb1b6a8	1	Other	Other
+93e9e402-e0f7-4015-a103-5c69d42dc1b1	1	Other	Other
+93ea0642-4c83-434c-a44c-f2bf77b0f541	1	Other	Other
+93ea98a5-5266-48e5-b3ac-436b521b229d	1	Other	Other
+93eac12f-9aec-4300-9535-4756a9a59035	1	Other	Other
+93eb0ded-3411-4df8-8e15-71610c7d41f9	1	Other	Other
+93eb3a6d-5329-408a-8b5e-8f4837a73b96	1	Other	Other
+93eb7307-57a2-4199-9e28-0ddda6d250c4	1	Other	Other
+93eba14f-4525-4a2f-8602-77254b5dffba	1	Other	Other
+93eba37e-d7b1-4111-8a04-94ed35b42dff	1	Other	Other
+93ebdff6-2f18-4dce-947d-f4ccdb53d1f3	1	Other	Other
+93ec0205-9b89-49fc-8c4c-24a2fbc74cf5	1	Other	Other
+93ec60f3-cfae-43f0-925b-6945ef9c2f1e	1	Other	Other
+93ec71dd-9f0a-4b99-9372-c02d049cb2f8	1	Other	Other
+93ecbd36-e744-4826-ad50-d832045ea861	1	Other	Other
+93ecc0cc-5180-4b30-83da-ce72211be55f	1	Other	Other
+93ece77e-ea6e-4bbf-aa2b-aa336ce19beb	1	Other	Other
+93ed3b13-fc86-4d38-974f-1359725b810d	1	Other	Other
+93ed6ad2-4088-4560-8b22-6545147f7799	1	Other	Other
+93ee1238-7d7a-40ff-b02a-3ce5a5307284	1	Other	Other
+93eecd31-97a4-4ffb-89ae-78685f71c2df	1	Other	Other
+93eef521-4633-4b86-871f-e521d77da614	1	Other	Other
+93ef3c4d-c779-45f6-977d-06f99f7d8b23	1	Other	Other
+93ef6466-681f-44e6-8346-1225988017e6	1	Other	Other
+93ef66e0-8df9-4150-894c-090dbad5b42c	1	Other	Other
+93ef706a-db98-4fcd-a019-44ddc8d475dd	1	Other	Other
+93ef7105-2737-4531-8376-de9e7beb5920	1	Other	Other
+93efb810-c7ed-4d72-8e26-1f79678ff1e1	1	Other	Other
+93efc722-197d-48bb-81f5-172be2df9b6e	1	Other	Other
+93f0378d-5573-4e93-adc0-8312631795c0	1	Other	Other
+93f056f3-0485-411a-b35e-82be97676c31	1	Other	Other
+93f064e2-d7ae-4119-807d-1f4b53fe3e1d	1	Other	Other
+93f0d4b7-5dfc-4f2a-9ba9-8ef51f09e8cb	1	Other	Other
+93f0f1d1-248b-4fdf-96e1-862478c06264	1	Other	Other
+93f11d25-2d47-4aec-baf4-649aad5df617	1	Other	Other
+93f13b5e-bc66-4103-a89a-db09008a84e8	1	Other	Other
+93f1ac18-2617-4181-8d06-421bb35c9847	1	Other	Other
+93f1b7d7-bf96-49a1-897c-e004f8dda2c0	1	Other	Other
+93f1dd5a-2af2-471e-bdf6-3b324a07705e	1	Other	Other
+93f24fc3-67a9-4ed3-bd72-b4868c618a50	1	Other	Other
+93f2c1fe-1717-11e8-b673-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+93f2c8d4-6a8f-4d26-a8f3-34970df1b4d5	1	Other	Other
+93f37e43-0740-4560-bfaf-05b9da16f6a0	1	Other	Other
+93f38591-02ac-4ac6-8fc4-8e2b16a96fbc	1	Other	Other
+93f3d244-5a2e-441f-87a7-b3828e4afee1	1	Other	Other
+93f3d685-5ad7-4a06-ad5c-0cd8b1be74dc	1	Other	Other
+93f4008c-599d-4ec9-a341-3b120bd2e254	1	Other	Other
+93f425e7-7ff0-416c-92ca-fcd470ee0e1b	1	Other	Other
+93f4a847-2767-46a8-9412-450a254bbd83	1	Other	Other
+93f4a927-656d-4b0d-9cd7-51ce4cf891f9	1	\N	Other
+93f54178-3de2-475d-88f2-0d48dd531d66	1	Other	Other
+93f5422a-6be2-4142-a85f-9bbbf87c349c	1	Other	Other
+93f57c90-63dc-455f-a641-1d25d5f51588	1	Other	Other
+93f5c5bd-960e-4ca2-9783-e06da0944ec2	1	Other	Other
+93f5cf7f-16c1-4bf6-b36c-dee700d1e787	1	Other	Other
+93f5fe3c-6d5e-400c-9131-de0eb109119f	1	Other	Other
+93f64537-2e76-4902-8be7-00d9673bcc27	1	Other	Other
+93f65743-ca54-4d02-8da7-0f3467200a49	1	\N	Other
+93f65bec-f528-4148-932d-11d502deec32	1	Other	Other
+93f6686f-5e23-4b16-9abf-5f4b2f2c8289	1	Other	Other
+93f6840d-c88f-4081-aec8-6ec86b804116	1	Other	Other
+93f684a0-946e-4f2b-8d7a-0f8cbf38fa8e	1	Other	Other
+93f691d0-edc7-45fd-af6d-551a3ba5770f	1	Other	Other
+93f69b53-9cad-4c8e-9205-b2d94874ae58	1	Other	Other
+93f6e074-d760-4f87-9689-bbb4996582ad	1	\N	Other
+93f704ea-5b7d-45ef-8c58-48611890058b	1	Other	Other
+93f716b1-7fc9-4f4d-8b12-189f5d3b201f	1	Other	Other
+93f7226a-b0f2-429f-8925-f22d614dd991	1	Other	Other
+93f76711-c36c-4d5b-a2c1-a20c2cfcf0df	1	Other	Other
+93f76c25-9a2e-4e57-ab25-20145ce18893	1	Other	Other
+93f7d543-debb-4192-b9df-a4dbadba4779	1	Other	Other
+93f819ab-3a9f-4403-92ad-be1472aeaf7e	1	Other	Other
+93f8b456-745f-4e66-aea0-83f8876af909	1	Other	Other
+93f8f101-e9ef-4096-9d2f-394a73f7def7	1	Other	Other
+93f9129a-4993-471a-ad50-4132c5c74535	1	Other	Other
+93f91aec-cab4-4753-a139-86e721c9954c	1	Other	Other
+93f934f1-c0ca-4667-a6af-9c553020bd2f	1	Other	Other
+93f95f4d-1f57-4396-ab65-b387fdc3a779	1	Other	Other
+93fa2754-58b0-4fda-b8e3-444b3137eba1	1	Other	Other
+93fa6faf-3107-43df-9687-d2c12f36ab03	1	Other	Other
+93fb04cc-5ab6-4c1c-b933-f41679d1a1c2	1	Other	Other
+93fb1964-483e-4f4c-a932-abd2f99a9373	1	Other	Other
+93fb4e98-6294-4c98-9725-3ae417b55720	1	Other	Other
+93fba7fd-8147-416e-bdf0-b75f3ecf3123	1	Other	Other
+93fbd679-5f0a-4bf3-8ebb-6cfebbaccfc5	1	Other	Other
+93fc2999-9bb2-4e85-b19c-70e9d266040b	1	\N	Other
+93fc66ff-1e87-4e46-aa73-eaa1b1beec05	1	Other	Other
+93fc780c-6514-4e7b-828a-3dc32f8ed05e	1	Other	Other
+93fc8aab-8f09-4390-bf24-44b2edb6df1c	1	Other	Other
+93fcce85-9be0-4e73-b530-693f12fa45ac	1	Other	Other
+93fcfad2-ed5e-43de-b750-455d4bf9e602	1	Other	Other
+93fd640b-6d4a-4339-a329-00a667031bd4	1	Other	Other
+93fd7d94-50b0-4f5b-937d-1bfaf00245fc	1	Other	Other
+93fd8e44-97f6-4bd8-80bc-80faad4af507	1	Other	Other
+93fda777-1aae-4a3c-90ec-6f72e9bd3df1	1	Other	Other
+93fdb1d9-d5e0-4d76-8376-799287e4efef	1	Other	Other
+93fed80a-461b-49e0-8b42-f8add00df35d	1	Other	Other
+93feffdb-c5a8-4545-b862-0b4209c66e4e	1	Other	Other
+93ff2427-dbe4-4dce-94fc-96349ed67ec8	1	Other	Other
+93ff7874-d551-4776-b5ce-0b3fcee89346	1	Other	Other
+93ff7c39-9684-4f3e-bacd-7b0745fc514b	1	Other	Other
+93fffc46-5c04-47fc-84ed-7e1009f4eacc	1	Other	Other
+94001e01-2647-4b40-b298-6f15300b3809	1	Other	Other
+94004be7-f7f0-4a34-a07a-b0d31e874c18	1	Other	Other
+94009af1-d2d9-493f-93b7-b83be487f31e	1	Other	Other
+940114ff-41fd-4b2a-a738-96eab548e3ef	1	Other	Other
+94016dff-0eaf-42de-acab-e349b536f712	1	Other	Other
+9401a0c7-28d7-4526-b1d7-48f40b696832	1	Other	Other
+9401b614-ce86-484e-a046-d1dd59a1ef1a	1	Other	Other
+9401db03-738f-402a-ac68-2a67870a69d7	1	Other	Other
+94020d5e-d8f5-4907-a812-c021c4f2d587	1	Other	Other
+94023f88-5089-4684-b886-aad952555021	1	Other	Other
+94024e10-e003-40f0-ab3d-27b482bb39fd	1	Other	Other
+94024f40-169c-4d6f-9300-1461b6ab9b30	1	Other	Other
+94026ed8-4f02-48d0-ae04-7e35ab4b035c	1	Other	Other
+9402b83f-3f4c-4259-a2e3-3a59b8776a86	1	Other	Other
+9402f73b-7be5-4902-b544-01f9bdfd82c5	1	Other	Other
+94032108-10ef-45ee-b6e6-3c91b18592d0	1	Other	Other
+94035217-d4ea-4b75-9c2c-e954bd561fe3	1	Other	Other
+94037e11-cb4d-42ef-b434-b528f2a00827	1	Other	Other
+9403cc1d-5dd9-4b93-8c52-6a3f94ab979c	1	Other	Other
+94042952-b561-426f-bd0e-b6b0c7ef79d5	1	Other	Other
+94044372-2004-4005-b532-bd12e02e4592	1	Other	Other
+940474d7-91b1-4ae3-a6a7-b55fb8354cdb	1	Other	Other
+94048816-8ecf-4537-9800-a1032db6a988	1	Other	Other
+94049195-d1dc-4298-b5bd-6e48cf97da9b	1	Other	Other
+9404dd1c-1ef8-4bea-9747-b266c3050de7	1	Other	Other
+9404ee7a-f5ad-496b-ae75-185d925fd88e	1	Other	Other
+94053577-786c-4874-b907-e4a0fb4a34a6	1	Other	Other
+94057197-2428-4d9c-a3e7-2d41b77b27f3	1	Other	Other
+94058dba-304b-4708-8b47-6837de7035dc	1	Other	Other
+9405a902-84c2-40da-abeb-8eefa5479216	1	Other	Other
+9405d43c-3d9c-4c19-b8f3-50bd75931976	1	Other	Other
+94063a6c-7b90-42c9-8d8e-297050a9ede1	1	Other	Other
+940645c1-e782-44fb-9c29-a11fc2d0db5e	1	Other	Other
+9406ab57-e4d1-4bfe-b403-0adbeef1286d	1	Other	Other
+9406f087-66df-4114-a564-5190e5d3ca39	1	Other	Other
+9406f1a1-5e87-478e-9221-d7f989ace9fd	1	Other	Other
+9407463a-f171-4876-a278-2e92b2c35742	1	Other	Other
+94075684-5c86-4739-86c9-aa8c031be279	1	Other	Other
+94075b67-3a9d-4cbd-aa95-c24ccc0f9c2b	1	James	Other
+9407844e-63fd-447c-88c0-1bff651943ee	1	Other	Other
+94079a9f-d27c-4c1b-9450-16b32d2888d7	1	Other	Other
+940810af-a420-4e7b-a581-5c8f6dfce23d	1	Other	Other
+940846b0-a0a9-4d0b-bc2c-b7b60a57bf44	1	Other	Other
+94085493-4c00-4787-ad9e-c39770efd36a	1	Other	Other
+94089902-b4df-4977-ab2e-caf0b5ea7e90	1	Other	Other
+9408a5d8-ee78-4b19-9bfd-aef3eaad0c34	1	Other	Other
+9408d972-4b40-4aa9-ae29-f8c6d7b0d670	1	Other	Other
+9408f40e-03cb-4d67-9f66-24d567221b89	1	Other	Other
+9409129e-3ad9-428c-a3dd-93ce6bed1a09	1	Other	Other
+94092a85-41a9-4315-931d-90160691ab5b	1	Other	Other
+94097669-4597-4d3c-9a9b-1d65015107a1	1	Other	Other
+94097d0f-5909-42d1-a1f5-95acef0e6666	1	Other	Other
+940991f4-7b61-4036-82ae-e13499f36e52	1	Other	Other
+940a08d5-c81c-4655-b95c-21ae0f28d33d	1	Other	Other
+940a3a4f-5b77-4ba8-8823-4e7a26e4ae3c	1	\N	Other
+940a4dfe-9c83-4870-92a6-e1f82c8ebb4f	1	Other	Other
+940a6f02-b91b-4d65-ad57-8fe89aed9e27	1	Other	Other
+940ada83-be53-4786-b512-94f22285f880	1	Other	Other
+940afe44-a2d0-4d58-bfb3-3f639fb1cafb	1	Other	Other
+940b1d79-bfd4-4e40-b492-874cf7616ddb	1	Other	Other
+940b29b2-c49f-43d3-87a5-a3229d50a2bb	1	Other	Other
+940b3bd0-34ef-4c26-a942-9fcc7f76a9ff	1	Other	Other
+940c1179-d645-4bd2-8aba-228324de9e2a	1	Other	Other
+940c1523-6e46-4e21-993f-306bffd0860c	1	Other	Other
+940c1a7d-8e90-4bd2-bd79-6780e448bd1a	1	Other	Other
+940c4c5f-f270-4578-822b-e83501106a9f	1	Other	Other
+940c6c45-e8da-4486-a02b-625ef2a836dc	1	Other	Other
+940c8f4b-6411-445f-aab4-15fd6a03283b	1	Other	Other
+940c9959-088b-4949-aa86-bef9b02dde0e	1	Other	Other
+940d63f2-f338-4657-b585-58f854f2f415	1	Other	Other
+940daf36-51c9-4d01-9813-f0014187fa41	1	Other	Other
+940e024e-e29f-4e0f-b4be-73308e201da2	1	Other	Other
+940e1e44-9e7c-4af6-ac3f-9de54e8eeac7	1	\N	Other
+940e4430-82f4-44a1-a927-156ed851a0c1	1	Other	Other
+940e7dd0-c6e1-489e-96ac-e406d95c6ff8	1	Other	Other
+940e8df3-b053-4065-9111-8d3dc9bb52a5	1	\N	Other
+940ece7f-d061-4324-a0cd-121f607e2aed	1	Other	Other
+940ee854-1e61-4711-a196-2452681d6b7f	1	Other	Other
+940f1f4b-7f80-457e-ad45-4a0c0fd40303	1	Other	Other
+940f21a4-a75b-4ed0-89e0-97eacb469855	1	Other	Other
+940f47a7-6ad0-4311-ac50-991cc58a2191	1	Other	Other
+940f7f77-c268-4590-9976-cb26a46152ce	1	\N	Other
+940fa464-55cf-4394-861c-d818b12daee6	1	\N	Other
+94100d30-a919-46ef-acef-4396afd25d5d	1	Other	Other
+94101b56-327e-4636-ba7e-931b5d01ac2b	1	Other	Other
+94101c30-ea9b-45b9-a269-eeac53ec92e2	1	Other	Other
+9410217b-d58b-4904-9bb7-e938ed03ef0a	1	Other	Other
+94105d69-ffc8-4a71-9324-f479e11a9d36	1	Other	Other
+9410b71e-8662-4ef8-ad30-4d10863b70b9	1	Other	Other
+941160bb-5fe4-4e24-9713-ddb7befdc809	1	Other	Other
+941175b9-1512-4c05-9542-2dfefc09a9a1	1	Other	Other
+9411a334-7f26-469d-b2b5-b8b44153d3ee	1	Other	Other
+9411f4c3-e355-4e39-b3e5-ef961e4e7330	1	Other	Other
+9412272e-6b3f-40b7-886d-dd0838b299ed	1	Other	Other
+9412b023-ddc1-4abb-8cf2-eaaab63be236	1	Other	Other
+9412cd45-8f78-4d51-8faf-350ec86d9d86	1	Other	Other
+941388f9-2069-4c1a-8725-74dee5b3b8ba	1	Other	Other
+94139ade-eaf9-46ed-8494-80451849c5c9	1	Other	Other
+9413be81-9959-4565-880b-94ef75bdbd4f	1	Other	Other
+9413ccac-4bec-48be-8c1f-405e49fb2bb3	1	Other	Other
+94147221-f86f-431b-bd31-451b19964fdb	1	Other	Other
+941493d0-33c7-4dec-95cd-feb5c2968435	1	Other	Other
+94149a07-de82-49d8-ae36-fc33ab3a8768	1	Other	Other
+9414b24e-9d38-445c-9784-fa1bdd2c74f1	1	Other	Other
+9414c2da-6bcc-4834-b4c8-5b25ed4e7558	1	Other	Other
+9414cbac-2623-4dd8-9674-b6b461566086	1	Other	Other
+9414d9fe-a03a-4f01-aeee-637fcd5f4c11	1	Other	Other
+9414f9ec-8457-4b88-a063-8f916972f579	1	Other	Other
+94152b32-7353-4852-947b-15148271bdd6	1	Other	Other
+94154b5c-cecf-467d-935f-96c647895932	1	Other	Other
+9415b778-9c50-473d-a343-bd7977ca7019	1	Other	Other
+9415c502-9317-4c7e-b2ad-5b43c0d7c619	1	Other	Other
+9415dbd5-78bc-40a1-a144-f9c3c82bb49e	1	\N	Other
+941601ef-3ba9-446e-b193-09b39dfced1d	1	Other	Other
+9416e962-87dd-415a-be32-9d397260725b	1	Other	Other
+94170a49-25d6-43a1-ad2f-e3c728dd3432	1	Other	Other
+941712d9-e0f1-48e9-a357-fa425f4021d5	1	James	Other
+9417272f-1387-4cfc-aa6e-110f5605da78	1	Other	Other
+94173363-5e3e-47f3-9a20-67f787d81a3f	1	Other	Other
+94175202-2498-4d50-9b51-d95be1565798	1	Other	Other
+94178994-920c-4f41-9b6e-1510b26c20e3	1	Other	Other
+9417b9bd-d3cf-49c0-908f-74f669ece71f	1	Other	Other
+9417f687-7d73-4825-bda7-8be283db80a6	1	Other	Other
+94183279-0a45-4e46-9f00-aa2ff600e5a8	1	Other	Other
+941853a6-0678-4443-ab94-e88986a634d5	1	Other	Other
+94187ad8-a7ee-4325-912a-f0bded04461d	1	Other	Other
+941880f8-ada4-4e8e-9caa-7e085874bee8	1	Other	Other
+9418cf89-09b0-41da-ba45-63d1ed8710c0	1	Other	Other
+94191d9d-8d02-42fa-b293-c5c48b0b48c9	1	Other	Other
+94192f26-8a2b-47c9-8f2a-d45ee8312e07	1	Other	Other
+9419567c-d31f-4073-b970-9bc46404dc96	1	Other	Other
+94196d07-f79b-4a41-a6d8-b4dd8f57139c	1	Other	Other
+94197485-0d84-41dc-b8a9-5f833f606497	1	Other	Other
+94198627-6138-4358-a992-058bf5447535	1	Other	Other
+94198fda-ec6d-4957-acfd-9e85439fcc02	1	Other	Other
+9419da78-8236-43ca-9771-319726b30cf4	1	Other	Other
+9419e8c8-088b-4351-b4c4-1920d57602a5	1	Other	Other
+9419ea2a-d48c-4dea-9139-7db9009e8a01	1	Other	Other
+9419efe0-9678-4c8c-bf24-14287570bd38	1	Other	Other
+941a0256-eca0-443f-bd66-b4830990236d	1	Other	Other
+941a0da6-d4b7-4466-b19f-655c4cbfaaaf	1	Other	Other
+941a13d9-aeae-449a-90b6-8276b10f9c5f	1	Other	Other
+941a25b0-b04d-4443-b39b-bc251daa4da8	1	Other	Other
+941a3276-f0b4-4c92-8a6e-d85c797ca29b	1	Other	Other
+941a60cf-1a72-4d9e-9438-8ea782880e78	1	Other	Other
+941a9683-5cf8-4606-a13a-9d0a2c380db2	1	Other	Other
+941adef0-b336-4fc5-a33a-2958c6f4402a	1	Other	Other
+941afe98-343c-4740-a59c-889222c7f48c	1	Other	Other
+941b14c5-d06c-4a81-9c2d-c9e1770c49eb	1	Other	Other
+941b335e-7936-48c7-9fc0-cc1ca976c251	1	Other	Other
+941b3429-6a07-49f9-bef2-9b34ecc068ac	1	Other	Other
+941b3ce3-666e-4ecc-b02d-33828d46cca3	1	James	Other
+941b63d4-ab6c-422c-a452-c344fc01667c	1	Other	Other
+941b6b66-4069-41d0-8b29-d627093c3779	1	Other	Other
+941b6d5d-dda7-473b-8683-3b165633a830	1	Other	Other
+941c34d7-f530-4527-817e-b0bb4d79d2d3	1	Other	Other
+941c7c8b-5b46-4aae-a7d1-60848546e895	1	Other	Other
+941c8b3d-537c-4a59-8065-db1a17460290	1	Other	Other
+941c99d4-cff9-4b3b-bba3-b84352c72450	1	Other	Other
+941cc6b0-fb6b-43d8-a64e-2509ca72e4d1	1	Other	Other
+941cff7e-137f-4511-bc05-63aa6f8b3c2e	1	Other	Other
+941d0b44-747f-4e88-aca5-0ce574b570b3	1	Other	Other
+941d184e-626b-469c-88d8-ce527854cff6	1	Other	Other
+941d41ba-9111-46f0-b050-6471077856d0	1	Other	Other
+941d78a9-3445-4e00-9895-1dff198fd27a	1	Other	Other
+941dc8c2-8a9c-4ada-b693-7cf8e207d42d	1	Other	Other
+941ec4da-e4b1-4e9a-a5fd-f2c86f5b7571	1	Other	Other
+941f3922-12d0-4204-ab21-c8016416618a	1	Other	Other
+941f642b-dcb9-413d-bb2d-6853a4e8750a	1	Other	Other
+941fc9e3-25d4-4ae1-9620-031bf6156125	1	Other	Other
+941fd176-c09c-4608-8414-27d84e8dc9a0	1	Other	Other
+94201c0d-150d-4a25-9c19-290d0685a321	1	Other	Other
+94207bba-6d5e-4d17-9f16-d8a18213c85c	1	Other	Other
+94212816-14cb-45b9-a76a-245dd3ad8dd5	1	Other	Other
+94215b49-7b03-476e-8a67-e4089da70647	1	Other	Other
+942196a2-445a-46f9-a89b-6a8bc7e36ff5	1	Other	Other
+9421d446-0905-4769-9203-108230a54da9	1	Other	Other
+9421e3d1-a94b-4aff-b098-08c68da31f87	1	Other	Other
+9421e667-eda6-429f-8818-548720781fb4	1	\N	Other
+942235ad-59e8-427f-96e1-bc0ca3643b40	1	Other	Other
+94228f96-ec03-4e13-a39f-264e3fbb0102	1	Other	Other
+9422d047-2da4-4d47-9f57-b087b09b8997	1	Other	Other
+94231688-5467-4731-9e29-43e6ecd136c9	1	Other	Other
+942330a2-b908-47fb-8e67-a1399e71f916	1	Other	Other
+942335b5-af3e-4071-aaa0-4329f996375d	1	Other	Other
+94234219-5896-4ed6-b7b1-87c311af5b81	1	Other	Other
+94234ce4-7bb5-4963-97a8-a13bcd05d5e4	1	Other	Other
+94235660-0fd7-4f41-8b16-cd42486d2fc6	1	Other	Other
+94238842-8297-4793-9837-0c529f065f80	1	Other	Other
+9423b7a0-f30e-490d-a6aa-c86b48c7dc2d	1	Other	Other
+942406d6-9ac1-4f9d-b28c-36c2ac96d1dc	1	Other	Other
+9424148f-a9c7-4101-a0eb-9a0f0faace18	1	Other	Other
+9424437f-a185-4c35-8e8f-93b1acca7ae9	1	Other	Other
+94244860-51f6-49e7-b29a-f1612b977722	1	Other	Other
+94252be2-ae7c-405d-9604-789b7ba24358	1	Other	Other
+94253a42-3e66-4434-a04a-cf68a86efc4a	1	Other	Other
+942590ee-5dc2-4e04-99ae-21a523c0d0bf	1	Other	Other
+9425dd09-0d2b-458c-839a-40f6586e475c	1	Other	Other
+9426103d-aaa0-4cd8-8bed-b7707b931670	1	Other	Other
+94262942-7b0b-4afc-87c8-089443505e61	1	Other	Other
+9426395a-607b-4b54-83af-6276da3129af	1	Other	Other
+942661b4-5164-4d5e-ac9c-025231171001	1	Other	Other
+9426b4f6-bcb6-4502-b2e5-4b601ec1863e	1	Other	Other
+9426ea3c-b460-41e4-b372-210d8bc649ed	1	Other	Other
+9426f398-1e0f-4807-8f08-dc44295528ba	1	Other	Other
+9427159c-0248-4bd8-8871-70bc670c3cae	1	Other	Other
+94272d82-e611-4f88-b617-634d281c0c68	1	Other	Other
+94273004-eeab-47e9-b318-8d5acc03020c	1	Other	Other
+942750d4-64be-4509-91c9-6e82eeebec79	1	Other	Other
+942777c0-510e-48b3-bf17-e4f2b928e720	1	Other	Other
+94278b24-7a16-42d8-96cd-b14911ea6672	1	Other	Other
+94278f2a-c462-4423-b7bf-94fbf728ab3b	1	Other	Other
+94279970-81da-4a6f-8732-6113f67d0b4f	1	Other	Other
+9427d17f-e981-4dbf-ae54-a04cfbc7f248	1	Other	Other
+94282bb1-1fc0-42c8-be3d-4f14daa8770b	1	Other	Other
+94291777-682a-4b45-9ea4-eb512fcb63ca	1	Other	Other
+94292fb0-3b18-4138-99bd-486e9e0abdd3	1	Other	Other
+94297e7f-b92f-4424-b0f8-a30125fa76d0	1	Other	Other
+94298d4e-8274-4575-85c5-100ddccccdbe	1	\N	Other
+9429bcff-d122-4fe4-8677-6901eaf22b73	1	Other	Other
+942a128e-b5af-4598-a4d8-890f33aa2d63	1	Other	Other
+942a467d-58cb-4f99-88f2-5e58b5ebbfe7	1	Other	Other
+942a48a4-7335-416b-977e-22e9967acab4	1	Other	Other
+942a531e-c430-4b2c-b39e-4d7ee07b8ca6	1	Other	Other
+942a8332-648b-489e-94d9-b5a292a6ef2b	1	Other	Other
+942a945f-810b-45b5-a881-8355ef1573dc	1	\N	Other
+942b0c4f-9dac-483c-a596-44e2ff860389	1	Other	Other
+942b30a3-ac7b-45a6-b28c-11caec395d2c	1	\N	Other
+942b36f7-f9fb-4d07-9a84-447d08e01cb1	1	Other	Other
+942b52a0-9f41-4e14-9861-418b2458cb92	1	Other	Other
+942b7565-0d17-40a5-9451-949d1f7a1e2a	1	Other	Other
+942b78a6-5d14-4b73-bbf8-e0b4be96a65a	1	Other	Other
+942b95b4-3fa1-40b9-9282-6a0f9be2e9fd	1	Other	Other
+942bac83-7acf-4487-9472-4627cd5d1dd3	1	Other	Other
+942bc290-8fab-4884-86f1-98fb8cf9e61b	1	Other	Other
+942bf567-8575-4d7f-860a-2fa5f94081cc	1	Other	Other
+942c092f-b5cf-4b5e-bc97-573f764c3ca7	1	Other	Other
+942c1e23-bbd0-4203-9f60-99ec3dbbb237	1	Other	Other
+942c3b39-f039-4e74-8ca2-495b12369ebb	1	Other	Other
+942c46e9-571a-4117-bd17-6941cc3c4cf6	1	Other	Other
+942c5230-2123-440e-8840-e1d342145ebe	1	Other	Other
+942c9785-168e-4b5e-a556-a26212a87d5b	1	Other	Other
+942ccc7a-e1e7-4f9d-99b6-19c940b86721	1	Other	Other
+942cf6c4-b463-4217-b758-49e415f3a9ef	1	Other	Other
+942d0118-9695-43a9-8a1a-3f3f233f70af	1	Other	Other
+942d63b6-62e6-4e51-a837-15a720164c50	1	Other	Other
+942d848b-8525-42a6-9ef5-3feed5b11a58	1	Other	Other
+942dde2d-f85f-4a88-b532-416cc9272f17	1	Other	Other
+942ddfed-bd7b-4b12-ad1a-e360bc0e056d	1	Other	Other
+942dee17-4397-4ce7-b588-c3df121790ae	1	Other	Other
+942e0a88-4cfb-4632-9af8-0f1af636b8ba	1	Other	Other
+942e1516-5b8d-4205-92ea-24caf30515d7	1	Other	Other
+942e2895-c0e0-4c56-9db9-1bb30ea3dfa9	1	Other	Other
+942e313c-c9c0-40f0-bb6d-8657c8946b72	1	Other	Other
+942e32b2-7cfc-4ce3-941d-2d33f8895f37	1	Other	Other
+942e40e9-ed89-4fea-8c03-410b4de998d8	1	Other	Other
+942e43ef-7c19-4a72-95a0-998b62e6746c	1	Other	Other
+942e77c1-3033-4bec-9841-05cd3700598d	1	Other	Other
+942e942e-9c3c-4e4a-9854-d59de7111757	1	Other	Other
+942ec0ef-fe6a-4b96-910b-0ce801768226	1	Other	Other
+942ecffe-5e09-4aed-b8fc-6132f87b3459	1	Other	Other
+942ed573-0637-4609-b40d-40eda6d4247a	1	Other	Other
+942f40a3-5973-4f3f-8b84-fd74e99e45a8	1	Other	Other
+942f5273-8a9f-49d1-aa03-5bd86669182d	1	Other	Other
+942fa248-0628-4a2b-9e15-aeb2a56b1701	1	Other	Other
+942ffec9-144c-4d55-858f-102fd9950db3	1	Other	Other
+943007dd-acc1-4f39-9936-06a61a60de7c	1	Other	Other
+94300f51-7419-4fbc-aa85-57c3f3efe534	1	Other	Other
+94301407-044d-4be9-8094-93d37c4809ce	1	Other	Other
+943040ec-3abb-4657-b29a-55450bacb47a	1	James	Other
+943061d9-4338-4cdb-b668-749ca550c8d5	1	Other	Other
+94306d51-1e95-4bbd-9adb-899452b0bbb8	1	Other	Other
+94307c3c-2212-4e71-9c84-d8da53cd71ed	1	Other	Other
+9430825a-c289-4e12-8e0e-7aa6a2cf616e	1	Other	Other
+94308844-2728-4165-b004-fa2b3e1889ff	1	Other	Other
+9430887e-805a-4fc7-95c5-915ab77d1869	1	Other	Other
+9430a88c-2c29-4e8e-8717-2ea9bbfc90a5	1	Other	Other
+9430ba8d-d8c3-44c7-9ff3-2850f4732dc5	1	Other	Other
+9430c700-23d5-44a4-9edc-0db647d95b74	1	Other	Other
+9430f5f4-1656-4811-811b-74dde1b16455	1	Other	Other
+9430fc85-8bca-4dea-a6e9-48cce901f6f5	1	Other	Other
+94315d8b-a0c6-4c30-853b-904c681bedf8	1	Other	Other
+943163b0-7008-46ad-afb0-b1760b3c79de	1	Other	Other
+9431937e-25b7-48a4-8ccc-c9773a42c952	1	Other	Other
+9431b0fc-a33c-4bc2-b85b-a01c351740ec	1	Other	Other
+9431f7e5-5cd8-407f-ad7d-f8d3a65c737a	1	Other	Other
+9431f99e-cba7-4e8b-9843-723be88a4f3a	1	Other	Other
+94325333-cc25-4a91-904b-6a670193d4d7	1	Other	Other
+94325eac-157a-4026-a9ac-0c0cf233da63	1	Other	Other
+9432704b-275f-4302-9b48-d1741a84a271	1	Other	Other
+94328817-cca3-48b1-ae93-4c7a583ac202	1	Other	Other
+9432de6f-55c9-4934-b444-2a58ad75c6bc	1	Other	Other
+9433204b-57ed-4aa2-804b-beb9165ce567	1	Other	Other
+94338eff-d4da-4686-ad05-c7a7e92e85d1	1	Other	Other
+9433d30c-8d5c-456f-a1a0-0ed5f0d94e05	1	Other	Other
+94340d0e-92f0-47f4-8d5a-6d01b7326155	1	Other	Other
+94341cc4-53d5-40c4-a307-12e0fbda148a	1	\N	Other
+943426c5-7882-4252-9081-a722bf322643	1	Other	Other
+94342de5-8324-4dc7-ac26-e496fd42a111	1	Other	Other
+9434403f-ebb1-4eeb-9e78-1ca4715086ec	1	Other	Other
+9434f37c-860a-4f1a-890d-ca2f827fe38b	1	Other	Other
+9434ff9b-8f1f-4f49-9ccc-1ba0f4cc10a3	1	Other	Other
+9435260b-27de-4e97-b6a4-e15206f5d40a	1	Other	Other
+9435582a-5d28-497f-9f31-b7b354febaa1	1	Other	Other
+9435bdcb-4b10-4729-949e-327c1875ff17	1	Other	Other
+94360565-8843-4bf6-82fc-681e8ee588d3	1	Other	Other
+94360869-f627-4d8c-833e-51dd793ab483	1	Other	Other
+94369b7b-468c-4313-b4ca-3237433a1c2c	1	Other	Other
+9436bb8f-eba6-4b0e-bd77-f9f61882ae70	1	Other	Other
+9436c046-d89d-480d-8aaf-0e8f3a3ff68a	1	Other	Other
+9436e395-bc15-4c94-b0c5-9064b34b5b4d	1	Other	Other
+9437118b-ea70-4a0b-89c5-af5e8acab0bc	1	Other	Other
+94372b32-4039-4372-9b6c-d12a08ff7c36	1	Other	Other
+94373300-dfe3-416d-9c3d-79fe2bca4455	1	Other	Other
+9437748d-9a41-40ff-8ef8-7caf37f5c3e7	1	Other	Other
+9437944c-65de-4fb2-b428-fb3a6b9a4fe6	1	Other	Other
+94381ef7-644a-43a0-b76f-530238fc3c12	1	Other	Other
+94386d57-06d0-4d5f-af5e-e49316e2be72	1	\N	Other
+943891ab-6e3c-4eb8-91bc-17a804b1412d	1	Other	Other
+9438d808-9a51-4b19-ac01-704a8546ef83	1	Other	Other
+94391087-9a2a-41a7-a8a3-a942e442eb33	1	Other	Other
+943911df-82f8-4591-bdcc-7c97a7ef3657	1	Other	Other
+9439130f-8ef5-46ac-841c-7e59f6a87a02	1	Other	Other
+94391c87-c11a-4c2e-bf4d-b15807c9c517	1	Other	Other
+9439cc88-7370-45fa-ad08-503538771838	1	\N	Other
+9439d37b-2996-4da5-bceb-590eef128202	1	Other	Other
+9439f3dc-a8f6-4025-b2dc-54970e7b1bf3	1	Other	Other
+943a518a-2d50-481a-8b8f-ae8bccd2615e	1	Other	Other
+943a9136-1660-46c3-b23a-d96d26be1d9c	1	Other	Other
+943aa1eb-2c46-4ca8-b5ac-bcb9e8a65274	1	Other	Other
+943aadb2-d98f-478c-a201-63ed5e19e0b7	1	Other	Other
+943abf72-9e45-4ebb-b79a-821c7da1074c	1	Other	Other
+943b038b-4e1d-45b8-b0da-647be1feb59e	1	Other	Other
+943b12e5-3899-4cc7-86e8-830cdfaca227	1	\N	Other
+943b2408-c4a3-4f89-9982-f8a85775ab1d	1	Other	Other
+943b2423-6bda-4406-9d7d-3f2819d3a810	1	Other	Other
+943bbfcd-20e4-46e9-b59a-c7b622937990	1	Other	Other
+943bc9e2-9062-4da5-b589-bd5cf1987d11	1	Other	Other
+943bf450-c683-418c-a1ee-b34d290fcac2	1	Other	Other
+943c2576-c9bf-4dc9-aabb-4b59643bb7bc	1	Other	Other
+943c2e00-c7e0-4fc6-be5b-f86be5d75f8a	1	Other	Other
+943c2fee-be4e-4168-a3a1-8a44574b70cd	1	Other	Other
+943c3c23-1693-4453-981f-fec112790515	1	Other	Other
+943c4b34-6f38-46d5-8250-eb68bbabbf46	1	Other	Other
+943c5218-7372-476c-b519-09f7e35369a2	1	Other	Other
+943c9a68-f5b6-4a03-9882-95aee64a8134	1	Other	Other
+943cc52b-b1d1-472b-a02f-c938432280c2	1	Other	Other
+943d5a27-e490-4631-8f4c-67b4b481eab2	1	Other	Other
+943d81fe-d994-42f4-a2f6-f98b7231ce99	1	Other	Other
+943d9c9e-a622-4ede-a1f2-93d63f6e5100	1	Other	Other
+943da281-6fee-4837-85ec-fcef11008fec	1	Other	Other
+943dbbc9-3e69-4656-9f90-4f2ebc3cadca	1	Other	Other
+943dc0aa-8aac-4feb-939f-1a72ed845455	1	Other	Other
+943df837-a71a-4c99-82a0-f45b0aa8d8c5	1	Other	Other
+943e0034-6627-4d95-8e45-d13d36a8b0aa	1	Other	Other
+943e55d8-7e32-4ce0-aba4-915fea9e2945	1	Other	Other
+943edf2b-56a5-4ce3-a21a-9c61ce91dbb5	1	\N	Other
+943edf90-04a9-4759-b336-42fb78206ce0	1	Other	Other
+943f08bf-7c1e-4d42-8fdd-5f734ed3ecd9	1	Other	Other
+943f4a6d-f9fa-4b3b-8fa2-f7bc7388ab53	1	Other	Other
+943fb46f-7ae7-4086-836d-2b0d42dcbe65	1	Other	Other
+943fc195-8f6f-4b7e-8423-81c52e2f6dfa	1	Other	Other
+943fe96f-0fcd-4b26-82bf-9e53346065b5	1	Other	Other
+944018de-b991-4511-b040-d8372a659d69	1	Other	Other
+9440331a-2285-4822-accf-95ab290858b2	1	Other	Other
+944078bd-414a-4508-8141-c309da11cdab	1	Other	Other
+9440a7c0-e9ab-49ce-9c1c-3165bd91077d	1	Other	Other
+94411850-fbad-4a1b-9dbd-ae3c1da7cac6	1	Other	Other
+94413ba9-bacc-43b2-9701-9581488a0f7d	1	Other	Other
+94414dd2-f300-42e1-8f18-9ced9794eb1f	1	Other	Other
+94417ebb-77fc-476c-914f-b26ec748758e	1	Other	Other
+94418808-ce01-4a49-b474-da7dd6ed0055	1	Other	Other
+9441b996-e9ae-4853-95b0-4925015ee9b8	1	Other	Other
+9441c353-124a-4326-a0a7-7598b1b2d241	1	Other	Other
+9441fed9-fb87-42dd-bce2-0a2870554b6e	1	Other	Other
+94421663-18bc-4d87-81b3-aafda23bb2cf	1	Other	Other
+94424df7-c4ae-472f-9874-a58f579762e0	1	Other	Other
+94425e5a-8683-49b9-8814-3ff8c8440812	1	Other	Other
+94428bed-c3ad-489e-91f9-78c5af249124	1	Other	Other
+9442b725-1419-4cac-a670-6bdc1d6c6642	1	Other	Other
+9442ed01-f94e-4863-8cd5-4d66468f0059	1	Other	Other
+94430f7c-b02d-4307-adc6-001e86eded9f	1	Other	Other
+944374a5-7b67-4408-ac1b-4f9d05a1e8c7	1	Other	Other
+94444413-4e90-4bc8-8be9-4e12df5421d5	1	Other	Other
+944446b0-7b9c-42e2-b292-95e7aa455d99	1	Other	Other
+94447b1e-6946-4ed3-994a-70102635fbf2	1	Other	Other
+944496c7-a2a3-4184-9d8c-4ae4d2d1810e	1	Other	Other
+9444b05a-1366-4b32-9c22-4c5a19cc2690	1	Other	Other
+9444cfed-65e6-4978-9860-72b95fe14d40	1	Other	Other
+9444e1c2-88e0-47b4-9a18-e298b8b0a792	1	Other	Other
+9444f2d3-b74b-4bdb-bcfc-803aa92259c8	1	Other	Other
+9444f3f7-bf1b-4d37-bc04-c2a2614ffa75	1	Other	Other
+944538a8-d69b-4047-b2c8-e94122600681	1	Other	Other
+9445a462-6bc2-4fa9-8779-7cbc45ace72c	1	Other	Other
+9445b75f-d36a-41c6-a571-b765e1842d8e	1	Other	Other
+9445b962-b914-44d3-9e61-d89fd691fe02	1	Other	Other
+9445c57c-102e-45bf-a625-71d4f3214139	1	Other	Other
+9445e4c8-2de1-4c2f-aed3-0eebe7d170c2	1	Other	Other
+944603d8-75e5-477a-b82f-f86172a5867d	1	Other	Other
+944671d3-70c5-415b-8666-2bd726210a13	1	Other	Other
+9446aacd-10ae-41e2-8b2e-b6c753dd05c3	1	Other	Other
+9446d200-27a7-4828-99be-23741d0105eb	1	Other	Other
+94477596-ff76-4cbf-bdd2-3b1245587220	1	Other	Other
+9447cd2c-dc8e-44d5-8350-94692ced7a00	1	Other	Other
+9447ee55-6a2d-461f-9aa1-a3e97bcdea8f	1	Other	Other
+9447f050-1821-458b-9680-739e00171556	1	Other	Other
+9447f990-7d43-46d4-9094-8e923eeb3d3c	1	Other	Other
+94483dc7-cc2c-4678-a0d6-bd01673fd9be	1	Other	Other
+9448437c-4057-4ca6-9dbb-68597f475c76	1	Other	Other
+94484550-25ee-4d81-81d5-b76b0bfe9d36	1	Other	Other
+9448e5ca-299f-43f6-ad12-61d1ae35e326	1	Other	Other
+9449277d-8ad5-4f5a-ac4f-e1b6b60a49d7	1	Other	Other
+94496ded-39b7-45b9-8331-b25295e0c5a2	1	Other	Other
+9449803b-5f1a-4fac-853d-60094b4a5877	1	Other	Other
+944992f7-3fba-4d4e-b380-018bb59e23a1	1	Other	Other
+9449a9f1-b86c-4941-898d-961ab7d6a5f2	1	Other	Other
+9449c3ec-f111-4c89-abe9-12b3e238e0bc	1	Other	Other
+9449e83f-6078-4121-bc77-71979123078e	1	Other	Other
+944a2cf7-9aa1-470b-a8d2-64ee45f4851f	1	Other	Other
+944a3edd-841c-413c-bddf-b87172fc1254	1	Other	Other
+944a994e-2a72-4a48-b8df-f4f043066b48	1	Other	Other
+944ac14e-d3c4-4ccb-9dcf-d9f3e7ae5292	1	Other	Other
+944acb5c-48ed-4a0e-a04d-fa0db70347ee	1	Other	Other
+944ad74d-5f49-46b0-91ef-450165195304	1	Other	Other
+944ae482-b8ea-4e67-9fc4-b780fff4e1d9	1	Other	Other
+944afc8e-5283-4db5-8cbe-013725a8b121	1	Other	Other
+944b1ea3-0a25-428b-8d76-2b1531a711aa	1	Other	Other
+944b6e09-c75f-4618-89d6-b95c1f71c605	1	Other	Other
+944b873b-be86-4ae1-99df-62dc8a629e92	1	Other	Other
+944b8da9-ff39-4429-bb13-1d0321a49f4c	1	Other	Other
+944b994a-cffc-49e8-90f2-43fa74827314	1	Other	Other
+944bfc43-2b66-4bf4-bf7c-e5777a28ccb8	1	Other	Other
+944c08a6-ce7a-4bba-b963-9c9b698a8204	1	Other	Other
+944c0c3a-127a-480e-87d0-995da9147e4f	1	Other	Other
+944c6aca-367d-42c4-8396-c4b4d6e531c9	1	Other	Other
+944cb66d-192a-440c-a94a-f808c5527c13	1	Other	Other
+944cc5c3-ea2e-4772-86ca-b04efa58c8ab	1	Other	Other
+944cd6cb-0cdc-4ffd-abf1-d9eb83872268	1	Other	Other
+944d13cd-2237-49cd-91b3-315ae87b6f69	1	Other	Other
+944d3064-bf52-4287-91fa-afe1a3b3f9aa	1	Other	Other
+944d800e-bebb-4e8d-b61b-0faab6ebedf2	1	Other	Other
+944daff9-1918-41cd-bc7e-90d43e561d0c	1	Other	Other
+944e1117-b65b-4d55-9a3e-6826494875b6	1	Other	Other
+944e6115-d489-44a0-a703-cd8c2b431bf4	1	Other	Other
+944e829f-0d0e-4193-960a-5fc8d0867db3	1	Other	Other
+944ed2e9-7896-46fe-b9a2-bfafb8ec9b18	1	Other	Other
+944f185e-d296-4081-8983-3c624de5a545	1	Other	Other
+944f3208-d58a-4bdb-bf7a-cf9330ea5e45	1	Other	Other
+944fbc28-35aa-4114-896f-15de89ef27f4	1	Other	Other
+944fd1f7-90e3-4cd8-bf57-aff5c9b26030	1	\N	Other
+945003b8-7aeb-4de1-afb2-fcb2d00c120b	1	Other	Other
+94507c86-edab-4274-88ae-b729bd2d632a	1	\N	Other
+9450bb3c-8da9-4641-8ce0-7d65eb9f6be2	1	Other	Other
+9450c70b-dd6f-45ac-adc0-af080f35e783	1	Other	Other
+94512c8f-fc58-443a-8498-9d3df2a4a5bf	1	Other	Other
+94515d60-0664-4a62-9bad-6ac903f9f258	1	Other	Other
+945168fd-8dc2-43f9-a97b-7933dc515e84	1	Other	Other
+94517546-0129-4f6f-8ab1-b48755dbab6b	1	Other	Other
+9451e788-2b6d-448b-a062-63a883c2e2d3	1	Other	Other
+94522d46-99ff-491d-a915-b4a13559273f	1	Other	Other
+94524317-1808-4f85-8ece-2318bb4dc3fe	1	Other	Other
+9452659a-6149-422b-a881-8242f14f4bf5	1	Other	Other
+9452699e-5ba0-4f86-a98c-258eb88c1f06	1	Other	Other
+94528bce-fe05-4017-b8da-145da416b36d	1	James	Other
+9452960a-049a-4612-9a1b-0cc10d578daa	1	Other	Other
+9452cc45-5840-4fb7-92e9-f363428b35a3	1	Other	Other
+9452e444-66b1-41d0-a765-4856896117fa	1	Other	Other
+94534fb0-ada1-4b54-a23c-7851793e636a	1	Other	Other
+94537e96-0570-493c-ba67-70b36af6b024	1	Other	Other
+945390a4-6b27-4364-a575-c9821fc8f24e	1	Other	Other
+9453ccf8-1070-4b3e-a333-d1608aae3510	1	Other	Other
+94547277-b1a7-4698-84f9-41f263a95264	1	Other	Other
+9454b60e-78fb-462f-b916-d7bf081d979d	1	Other	Other
+9454d853-86a0-4817-bc8a-7f906e501667	1	Other	Other
+945533b0-60a0-4e46-91dd-25cc563db0fb	1	Other	Other
+94553efd-eb62-4ec8-b487-a22c83341711	1	Other	Other
+9455755f-f43f-4d01-ad48-c4c38790ba42	1	Other	Other
+94558606-4479-11e8-8e50-fa163e8624cc	1	Other	Other
+94559766-79a5-4c6f-b384-674a1de62a9c	1	Other	Other
+9455f793-0d85-4682-8cb8-e88073f53bdc	1	Other	Other
+9455ff20-f83b-412b-8233-b69cfff6dea8	1	Other	Other
+94560236-d55c-448f-99b4-7627d5003911	1	Other	Other
+94561157-f1cf-4848-8e38-5f18acf4e202	1	Other	Other
+945628ab-ddd9-4fc1-8d26-3b6afa381112	1	\N	Other
+945636c0-6eec-415d-b70d-1f20a5b7ff4d	1	Other	Other
+945637fa-bef3-4174-844c-37d4338ad546	1	Other	Other
+94564d30-1e4e-4caf-8298-ea8e5fedf78f	1	Other	Other
+945728f1-ba57-424d-a837-b6f0dd82b6ce	1	Other	Other
+94572c1d-bc9f-47c2-aa1e-6bef0ec3cf2e	1	Other	Other
+94573abf-7be9-4762-bb94-f7de17864ec2	1	Other	Other
+9457bcd1-33fc-4a4f-b228-6d23b32d7647	1	\N	Other
+9457ec98-8ff7-4840-b9d2-33f8c5c4af7b	1	Other	Other
+9457ed02-a8d5-4bad-a8af-a4e1950831ee	1	Other	Other
+94580cb8-53a1-410a-b576-d0a849898c2f	1	Other	Other
+94583846-d965-4b59-88d2-6b84226779be	1	Other	Other
+945846ea-267b-43d5-8a64-e17895fe5cd8	1	Other	Other
+9458483e-ad25-41e4-8018-e7804ea3a3c7	1	Other	Other
+9458835f-7519-4484-af20-6d5f71607eb7	1	Other	Other
+94589058-6480-4990-9447-501121e58e25	1	Other	Other
+9458eefc-06e6-44bd-8cb6-882001aa53c9	1	Other	Other
+9458fee8-86b0-4887-b18b-c7d2ee99f881	1	Other	Other
+94590bf2-dd70-45b0-8f20-4af4809eb6e2	1	Other	Other
+94598c2d-b5f9-4190-b114-a363339330c9	1	Other	Other
+9459d67b-2fa6-4830-8e2b-b2260d2f7ad8	1	Other	Other
+9459f0da-da8b-4e6e-8eda-57983a6eb3b3	1	Other	Other
+945a3c98-a3b7-48a5-9472-537515007dec	1	Other	Other
+945a4afc-fc23-479d-8337-7c7624369908	1	Other	Other
+945ad69e-9946-4000-b119-0dbef6394736	1	Other	Other
+945ae93f-1970-4c57-884a-9d6b38f76ab1	1	Other	Other
+945af13e-0c2e-462d-8723-ac03133c31ac	1	Other	Other
+945b16e0-104a-4795-8191-0ea175bcf5d4	1	Other	Other
+945b1e26-b257-465c-9c96-1c2054f2c21f	1	Other	Other
+945b26c6-21ea-4543-9417-02887f24238e	1	Other	Other
+945b443e-9fe3-4c75-8882-b521f57f7de4	1	Other	Other
+945b4ef9-56dc-47ac-840f-bad635862623	1	Other	Other
+945b6b11-0f5a-4e54-9214-e4d6d3b41ac6	1	Other	Other
+945b768c-4120-428b-b1fa-70bbe5384070	1	Other	Other
+945bb757-e268-4ba9-82b6-890148e7ee39	1	Other	Other
+945bb8c3-9fc7-4513-90d1-e3ebf3537d68	1	Other	Other
+945c01ba-27ea-46cf-8cea-1f87183d5ec0	1	Other	Other
+945c2929-9237-4276-a524-ff64f6c230e9	1	Other	Other
+945c4870-7537-40e6-855a-5eb06b47eb7b	1	Other	Other
+945d886d-0300-4476-a63b-cebc463b1827	1	Other	Other
+945d913a-c215-4ba2-b5e2-b07a79b7960d	1	Other	Other
+945d9874-098a-4fc1-8a79-3a8fec631f8d	1	Other	Other
+945dab97-ffc2-4350-9f22-1ed9fa4b0726	1	Other	Other
+945db357-c984-4beb-881b-eedbb6ddc65e	1	Other	Other
+945e3c09-09c2-4614-bb18-38c8715e9412	1	Other	Other
+945e4b60-09e2-452a-8987-2f9c14824f32	1	Other	Other
+945e6e48-102a-4012-8657-142542b2d710	1	Other	Other
+945f3bc8-117c-436b-b278-a071f2673d24	1	Other	Other
+945f4a83-472d-4cbb-85e3-2d65a1b2da9f	1	Other	Other
+945f53be-29ed-4563-bdad-2b1ad03a04f8	1	Other	Other
+945f8ee7-1ee9-412c-912b-6ee6567074b8	1	Other	Other
+9460360d-9101-468f-a9c6-5ea5583ee929	1	Other	Other
+94608696-45aa-49c1-b7b1-20a0b9584247	1	Other	Other
+9460add3-b6bb-4f87-9721-795a19e63a9a	1	Other	Other
+9460ccb8-f1ad-466f-a874-f3ce30a888ee	1	Other	Other
+94612620-d5ed-4f1b-bbd4-350644b42732	1	Other	Other
+9461538f-fd89-41df-ab8e-5f4f8f8c2715	1	Other	Other
+9461808b-b261-4d7f-9708-8659fc302295	1	Other	Other
+9461b795-5227-4369-b982-c52b6c3925a7	1	Other	Other
+94623b90-bb64-402b-932e-4f6849fa5acb	1	Other	Other
+94629c3f-b1b3-46ca-850c-ffe20a1b0d2d	1	Other	Other
+9462a653-cfe6-41e9-901f-f99fb0d79306	1	Other	Other
+9462b87b-6076-40ca-947b-a1bf7a31ced3	1	Other	Other
+9462eb01-fc3e-469d-bc92-2559737a5bcc	1	Other	Other
+9462f620-4000-4b9a-b9d4-38f3910f5535	1	Other	Other
+94631286-fb11-45e9-995b-4ab6ad946f23	1	Other	Other
+94634ab3-9bf0-45a0-ad19-591a0fee4dad	1	Other	Other
+94634fd3-940e-49e7-91fd-62389151033a	1	Other	Other
+94636926-67d0-40fa-acc9-107d7d8fe7bf	1	Other	Other
+9463bbd2-b54a-4d5e-bb6b-0180d7156fad	1	Other	Other
+9463bced-6dfe-4555-bb26-b8e228f47df3	1	Other	Other
+9463c82f-e292-4ab6-bb87-5c8f410140b1	1	Other	Other
+9463d8e3-12db-4dc5-9735-f07d1494cbca	1	Other	Other
+94641cc2-b610-4b91-a85e-69ed9743cf4d	1	James	Other
+94645bc5-defc-4995-86f4-e5935ed2c809	1	Other	Other
+9464840e-c232-450d-86f5-10848c1a2c2d	1	Other	Other
+9464ab56-c824-473a-9c15-1e2ce15dc9a5	1	Other	Other
+9464e2c0-f85a-4acd-9023-dc3c693c28a2	1	Other	Other
+94652e96-576b-424b-bf2d-6ed541b00eec	1	Other	Other
+94654c00-cc4e-4a18-bbec-b07b7c31ddcb	1	Other	Other
+94659448-902b-4e8a-8095-53a19cb98e2d	1	Other	Other
+9465bcfe-2ddb-4a8e-9d25-9706cbf175b9	1	Other	Other
+946606c9-a5ae-47ed-bea2-aa60bec1cec4	1	Other	Other
+94660771-5f78-4259-b778-86fa7a5e472c	1	Other	Other
+94661c98-bc5c-4fa7-96ae-9cddab9b121a	1	Other	Other
+946657d2-003c-497c-b38e-3eb7424902e5	1	Other	Other
+94666d03-ed9b-4d5b-84b5-5b50cb4d394f	1	Other	Other
+9466981b-6c4c-4d9d-a11d-baa8b8b25779	1	Other	Other
+9466982f-37ba-480a-8996-ac1204483d73	1	Other	Other
+9466a162-020f-4860-bab5-a6ce2759eb1d	1	Other	Other
+9466ae16-4ce4-4f74-8774-3584edc80124	1	Other	Other
+9466d7ef-0688-48d4-a2e3-f3cbe8d31956	1	Other	Other
+9466e8d9-1685-46d3-9e2b-92993c325694	1	Other	Other
+9466ff53-7ddd-4f53-b371-a84cc7651e74	1	Other	Other
+94671057-f243-45fa-9e4e-47195a0d3156	1	Other	Other
+94676fd6-d471-4118-8f0c-99baeefacdd2	1	Other	Other
+94677f4e-adf8-4ba3-92d6-39a0810c637e	1	Other	Other
+9467a110-8138-4be1-a73f-70f151c3e7ff	1	Other	Other
+9467d8c7-4719-4e49-9160-512ffee52210	1	Other	Other
+9467f1e0-5d14-4a89-8a63-4b781af82944	1	Other	Other
+9467f335-b209-44b9-9b23-65a1c2f3b3f9	1	Other	Other
+94681d83-58f8-4bb7-9907-92a7c9a16342	1	Other	Other
+94682fa6-4a45-4c6c-b1dd-cc5dce6fb30d	1	Other	Other
+94685487-c3d0-4508-97e9-a79a009aa07c	1	Other	Other
+94687f72-016e-427f-bebd-f61c73d52241	1	Other	Other
+9468d4cb-89d3-4e55-bb74-a2797dc10c67	1	\N	Other
+94694d10-7cda-4214-8ee7-9d97aa21ab04	1	Other	Other
+94695230-b962-48e3-8787-9b959fdf3fcf	1	Other	Other
+9469903c-84b6-4d56-9fc4-461285f6d88b	1	Other	Other
+946a086a-e159-4dcd-92b7-3bbcc5a59356	1	Other	Other
+946a615c-fedb-4609-92d8-82c9b2fac827	1	Other	Other
+946a8204-5c17-4bd1-95a9-fa72ab44bbee	1	Other	Other
+946b7b9f-e55e-420b-9abd-1896acca2a36	1	\N	Other
+946b8001-910d-494c-a292-91fd39d8b2d3	1	Other	Other
+946ba0f3-16f4-4900-ab4f-ec49eb738844	1	Other	Other
+946bbb23-214c-41ca-9fa5-5aaa0e44eea4	1	Other	Other
+946c07d7-528a-445c-a0a6-173bf67f0103	1	Other	Other
+946c3b79-56c3-4c91-8291-934973f76fd7	1	Other	Other
+946c4301-3643-4268-98d4-5019ae95cb5c	1	\N	Other
+946c4cc8-63a7-4fb3-aae0-83c3a1b44661	1	Other	Other
+946c86fd-cc73-4aa9-8a5e-dab0a572136d	1	\N	Other
+946c8929-3e2c-47a9-ae33-3583d499a058	1	Other	Other
+946d12e3-4938-4ece-9b99-188e14ca8da4	1	Other	Other
+946d18d3-49a1-4eec-ba7d-75b83166a445	1	Other	Other
+946d3a36-4e51-4302-a965-51a622234bad	1	Other	Other
+946d4078-527e-4642-b1fa-aca0550185bb	1	Other	Other
+946dd829-b5be-4e69-ae3b-b0406a25abca	1	Other	Other
+946df5d5-cdb1-4f19-810c-bd9d55017b1b	1	Other	Other
+946e1b5a-8a30-40ab-8712-47a908be48f3	1	Other	Other
+946e62cd-8cda-47d6-8383-23783cf327dc	1	Other	Other
+946e7c69-1029-4775-ad9f-cb2846f86baf	1	Other	Other
+946eb622-7f7c-423c-a987-0351a8376f70	1	Other	Other
+946ebe0b-4abf-496f-bb75-6d0ebded6aab	1	Other	Other
+946ec6af-2134-4f63-9604-18f3d05b40f5	1	Other	Other
+946ed93e-e60c-456c-8ea1-f8c2712c7bf9	1	Other	Other
+946f0d96-827a-4366-a57d-1954b698f49a	1	Other	Other
+946f75e5-f11c-47f8-bf28-142861f2e405	1	Other	Other
+946f880b-ef6a-4418-82a3-fe325c7d2a98	1	Other	Other
+946f99ac-b532-4e44-a203-075baa328829	1	Other	Other
+946fa34a-fba6-47ec-a094-f589d77146e5	1	Other	Other
+946fba73-2e84-42ab-8780-42d0e4559fb5	1	Other	Other
+946fc6a8-3e43-4030-b043-972f6030ab8f	1	Other	Other
+946feb9a-aef5-4cd6-839e-3937468e0ba2	1	Other	Other
+9470144c-c6ef-44c0-9bb5-7d7f063ab8a2	1	Other	Other
+94701c8c-6587-41f6-94a7-856be4dc247d	1	Other	Other
+947030b0-0260-43c9-bcca-a88b7cd1e5fa	1	Other	Other
+9470bcee-234d-4d15-aa54-19f2eefa48f6	1	Other	Other
+94713a1c-bc28-414c-ae6e-c2145cd30817	1	Other	Other
+94715010-3200-4132-b242-6eb875b8c2b1	1	Other	Other
+9471504f-ff99-4fef-84d3-c4fc4562cdf5	1	\N	Other
+94716953-1299-4f5c-9176-6149adbcedce	1	Other	Other
+94717360-f046-4bd8-b346-b705ca6708d4	1	Other	Other
+947185c9-c92f-4a24-9d73-422fde479875	1	\N	Other
+9471dbaf-eda2-4271-b853-ca8c4fa6eed5	1	Other	Other
+947210cd-5f18-4426-b471-f2aec4ac83d2	1	Other	Other
+947211a4-2c1a-4a48-866f-5bc000d150f8	1	Other	Other
+94721ea5-e2bd-4152-a7cc-630afcd82f70	1	James	Other
+947265fe-86ff-4983-b309-a07db8a4a922	1	Other	Other
+9472ab85-debb-49f3-9367-d397c0343904	1	Other	Other
+9472b25f-1c24-4583-9b52-943380ff98c1	1	Other	Other
+9472e26b-265f-476f-b416-01a5f759a823	1	Other	Other
+9472fa1f-a1ab-46ce-a9f3-858fd63338b1	1	\N	Other
+9473080a-c6cc-4353-bdfc-ea32ac04ebf5	1	Other	Other
+947310e8-0639-4bb8-a0d6-aaea265bfcfa	1	Other	Other
+9473129d-f61f-4e56-8508-cb85b372f1c3	1	Other	Other
+94733885-79ab-4160-9ab0-afc9e1c2fec1	1	Other	Other
+94733cfd-3ff0-4afc-9972-4a6877bc2650	1	Other	Other
+9473fe8e-c9ca-4182-a670-a72651ca97a4	1	Other	Other
+94741c77-8762-4e74-9eb1-8da873765df3	1	Other	Other
+94745424-7c12-4142-953c-e574baf59370	1	\N	Other
+9475340b-fa1b-4a46-b226-d53ec106eb1b	1	Other	Other
+94759c20-382d-4305-90a8-705a9d0198ba	1	Other	Other
+947673c8-d863-4e27-8ba3-d4fd3938738b	1	Other	Other
+94770852-87ee-40bf-8e28-05560c4911ce	1	Other	Other
+94770ed6-808e-4412-8686-3be82f0c2671	1	Other	Other
+94771cb9-713b-43f8-be34-8f8f8407f917	1	Other	Other
+9477441e-5163-4a09-9ed3-ecdfaa3dcc30	1	Other	Other
+947771c7-b700-4e90-a298-783c97d4072f	1	Other	Other
+947773f1-56ca-4e79-89d4-10767e0b85b8	1	Other	Other
+94777c3b-528b-4c1b-97a0-d97205198df4	1	Other	Other
+94779c65-9a39-4781-b540-967fcdac3908	1	Other	Other
+9477d0c6-2a53-48ed-a7c3-10e122fec1b6	1	Other	Other
+9477f844-2993-485b-80a6-d0cbe9023bf5	1	Other	Other
+94785bc9-1433-451a-b39e-b1862b11560a	1	\N	Other
+94786e24-58c4-4ba8-94b7-c6aacea634b3	1	Other	Other
+94787464-b3f3-4d22-a2d7-0b0ca67f3ad7	1	Other	Other
+947882e7-6308-4f79-9759-a41e7eb9a899	1	Other	Other
+9478d2cb-23ae-4691-a487-721e5c498844	1	Other	Other
+9478dca1-34ad-48bd-b0ff-da5910fb5da7	1	Other	Other
+9478e7a7-5822-41cd-ba77-0cc6673b5e63	1	Other	Other
+94792bab-214d-4ddb-a475-f771f17ede24	1	Other	Other
+947937df-7d4c-4517-b46e-3cc9baf103ba	1	Other	Other
+9479b940-e1c9-4262-8901-7805a74b97e2	1	Other	Other
+9479bd4e-b380-4747-a2fb-9e5e4e188a0b	1	Other	Other
+9479c6f7-72ed-47ce-b1ec-b99b7d994aa6	1	Other	Other
+947a5f2c-a189-46d8-b624-8ed9288e3389	1	Other	Other
+947a7869-ce43-40f2-b5b9-d136e9626281	1	Other	Other
+947a79b1-a018-432a-9dbc-4c541513ec43	1	\N	Other
+947aa5b3-ce63-4c9f-8d5c-ff691535a592	1	Other	Other
+947ad48f-7c62-45c9-9fcd-e9f3b7dc951d	1	Other	Other
+947adaac-df99-4da5-b866-0cec9889f259	1	\N	Other
+947adf64-eaea-4805-bc6e-7827bdbf044e	1	Other	Other
+947ae8e2-d6b8-4552-926e-b46b76efe82b	1	Other	Other
+947b22ca-660b-4f52-8303-235c6bed3f19	1	Other	Other
+947b3b07-89c8-4980-9e7d-664a1b766f19	1	\N	Other
+947b71e9-72d5-40be-bacf-390e208f46b4	1	Other	Other
+947bb4a6-3ee2-4457-a91d-d9689444266f	1	Other	Other
+947c1c3f-5903-4452-8590-71feb4e21a8e	1	Other	Other
+947c387d-4982-4b24-901c-98c5ec039007	1	Other	Other
+947c44a7-9166-44dc-af17-48b617bc8291	1	Other	Other
+947c5a82-7b8d-4777-96f4-84a2990ab7ab	1	Other	Other
+947c6f54-035b-4572-8bca-87acf20a1f0b	1	Other	Other
+947c9a0c-fff6-483c-ba08-6dd9aac14d0b	1	Other	Other
+947ca9fd-3ef9-482b-852b-8586a1fc85d6	1	Other	Other
+947cb0ce-fb25-4e59-9bc8-dfc5799ffa8f	1	Other	Other
+947cd957-69ca-4ffb-b68a-70bb78d33578	1	Other	Other
+947d0818-5edc-45e9-a890-25db93388b4f	1	Other	Other
+947d396b-832a-4c71-a627-d36042649138	1	Other	Other
+947d86a0-0d4d-45ab-8c06-b729c019f26c	1	James	Other
+947dcafc-db69-4f3c-b281-34c82aa5b61b	1	Other	Other
+947e8478-0fa1-4714-aae6-c00599376a1f	1	Other	Other
+947ebfe3-a2c7-4270-89a6-01e4f4d517a7	1	Other	Other
+947ec66c-38c9-4ef7-939d-b1595e799547	1	Other	Other
+947ee5fe-4d52-4e56-8421-dee6138034cb	1	Other	Other
+947f1302-a8e0-41ea-9d97-764dd9cfd975	1	\N	Other
+94801c82-7b61-45fd-8538-95354e918427	1	Other	Other
+94803797-4f10-42d9-963a-a6d33bcaa785	1	James	Other
+94806d9a-1b27-4c7c-b8ec-77daaa96b8b7	1	Other	Other
+948077aa-5831-4950-a08f-6ddfe776c8e7	1	James	Other
+9480c0b2-4069-4b2f-84e5-130a55639e83	1	Other	Other
+94810801-6f36-40a2-b882-c3590d3fdfaa	1	Other	Other
+9481270a-3b9b-4da0-b24c-ea23e586d259	1	Other	Other
+9481827f-2f78-4253-8b3c-6846cbb398b1	1	Other	Other
+9481b1e4-8f3c-417e-a3da-449b0df46395	1	Other	Other
+9481fcda-6001-4a90-9c4e-5653d56dafab	1	Other	Other
+94827ded-8057-4a95-8746-29dae305df8e	1	Other	Other
+9482c3f5-9d84-4bd2-9c48-52d19c999a85	1	Other	Other
+9482d288-f962-4773-9260-49eb3949edfa	1	Other	Other
+9482d4ad-5315-4c1a-ada5-30cf93d55fc3	1	Other	Other
+9482dc1b-e7c1-4be6-b348-d20330c774f6	1	Other	Other
+94838907-1f45-4b1e-871a-8decd2e4c118	1	Other	Other
+9483cfd7-0bf0-4f68-88f0-75d5152a9dc9	1	Other	Other
+94845d27-76be-4236-8984-5306a8d75cf9	1	Other	Other
+9484d57e-27cb-4a8b-9003-a7130954dee5	1	Other	Other
+9484db3a-5514-4c84-ad89-563b42267cb2	1	Other	Other
+94855dc2-dfdf-43d6-8e7b-a42ea41f72c6	1	Other	Other
+94856b5d-6321-4249-89d6-807090b13645	1	Other	Other
+9485851f-fc72-47e2-a02f-dcbd77215a55	1	Other	Other
+9485a244-bd6a-4271-a133-75a7a39727ba	1	Other	Other
+9485c05c-00f1-4cd9-b9d4-84ec23289ad8	1	Other	Other
+94861b0b-25e4-45e2-ae3e-e5b8ea492b29	1	Other	Other
+94862609-7abf-483b-b820-34a33d0c8a3d	1	Other	Other
+948686bc-9e4f-42a7-a820-de98d8fe20b3	1	Other	Other
+9486b8de-3e7e-4df2-ac89-8e286008b1fe	1	Other	Other
+9486b986-d943-44e1-b179-297b0f6245c1	1	Other	Other
+9486deba-7bd1-4e07-a07c-b9b8d8b24969	1	Other	Other
+9486e970-bb3d-4575-a670-01a574a14415	1	Other	Other
+9486f17e-937b-4c56-beaa-ee0c34d0c2d9	1	Other	Other
+9487041f-571f-486c-a2f5-5e1209654d36	1	Other	Other
+94870f6d-33cb-4b40-9ff2-6d427c1c10f7	1	Other	Other
+94877fe4-7745-4c80-a980-dbf58a9d9333	1	Other	Other
+9487955d-8ccb-4eea-8989-1f0fa66d6a98	1	Other	Other
+9487b9a0-8d62-4a70-8be7-832afdf1ec60	1	Other	Other
+9487e5cf-7d87-4e2b-b49b-46b0b8fe0589	1	Other	Other
+9487fb45-e656-4867-a003-96ddd319ba72	1	Other	Other
+948803c6-e409-401b-8e90-1a7132279d9f	1	Other	Other
+94880834-f389-4130-8492-1d782f9e3b1c	1	Other	Other
+94881113-628e-4a80-8db8-516403158b9f	1	Other	Other
+94884a01-83d7-4187-9a3c-d621844dc3cd	1	Other	Other
+94884e50-aca1-4784-8a2e-452d7f5f35b0	1	Other	Other
+9488765d-120e-4dc8-9c6e-2ada2de5b243	1	Other	Other
+9488876b-468a-4cb6-b1e3-72767f156fed	1	Other	Other
+94889179-b93a-4033-b116-8dc021fd717c	1	Other	Other
+94889dc3-f880-4747-95dd-e54119e22241	1	Other	Other
+9488aa47-5949-4a71-a683-23c7c56ec1a9	1	Other	Other
+9488ead2-9e28-44d6-ab0f-4946446a937c	1	Other	Other
+9488f04e-a62f-4649-9b4b-ca83c10f4f18	1	Other	Other
+948905c3-5509-4af8-8e8c-7eaf908ab5e2	1	Other	Other
+94891caa-5a11-4b3c-8f78-5a96038429df	1	Other	Other
+948946f0-3ce9-41d6-935f-a5cb2235850d	1	Other	Other
+94896ac9-3f23-41b4-9a79-ee54c6c454d2	1	Other	Other
+948980f9-217f-438f-b93a-b85ab92acd37	1	Other	Other
+94898256-fdad-4fbb-bd70-f1963451c826	1	Other	Other
+9489bc7f-e7f4-4597-bbd2-f3fba79755e2	1	Other	Other
+9489fd7a-ef86-47aa-a7af-cfacf533c187	1	Other	Other
+948a28b0-dbc0-4a43-857d-05239368edba	1	Other	Other
+948a466b-0f7b-4f59-ad8e-9b73a6295ca1	1	Other	Other
+948a580d-063f-4bde-8f59-7234578c433c	1	Other	Other
+948a83d4-c4c9-43e8-a6ff-8a64032828c6	1	Other	Other
+948a9bed-5293-4fc8-a633-55f37187e706	1	Other	Other
+948affe9-a016-4713-a2bb-c14b591288f8	1	Other	Other
+948b0dbd-353f-4b6d-8dcf-6ab3971fd68a	1	\N	Other
+948b3436-0775-4bdd-ad49-fbf3bbb0a3a3	1	Other	Other
+948b79ce-859f-4e82-aa22-b2713594d018	1	\N	Other
+948c13c5-ff6e-4b78-857f-5420215e585e	1	Other	Other
+948c17f8-7367-4b87-b306-67b606255f73	1	Other	Other
+948c6379-567d-4a6d-bc17-3af8b4922f5f	1	Other	Other
+948c86fb-8da4-4484-b643-381ae38dc5c7	1	Other	Other
+948cabb1-237a-42e3-9868-17131f7de68e	1	\N	Other
+948cc287-284f-440a-8c2a-0bf45ef8c836	1	Other	Other
+948cfa0a-2f58-4f9c-9a65-afb7f9f31aa4	1	Other	Other
+948d2629-e8ed-4ec4-b650-4c78e94853ec	1	Other	Other
+948d4e02-fe44-44d1-9049-8584be40612f	1	Other	Other
+948db970-ee94-4944-8198-8717f97e699c	1	Other	Other
+948fbbb0-d7c0-4131-82d3-4cd6f15adf45	1	Other	Other
+9490133a-1886-4e26-96bd-4c28716f6f69	1	Other	Other
+94902dfc-5581-47a4-9fd2-467d31bbf429	1	Other	Other
+94903699-36de-4f27-84d9-1dfa58265fe9	1	Other	Other
+9490ddd3-f897-4361-a959-bdf193e70332	1	Other	Other
+94913985-0add-4fc3-b2f9-af5997cdaeec	1	Other	Other
+949157b2-071e-4e31-9f09-e2841ece44e7	1	Other	Other
+94915b48-147e-43aa-a7d5-3dce57a62a2d	1	Other	Other
+949178ab-6349-4bdb-939e-25c39d10b30f	1	Other	Other
+9491e8f8-2fbd-4158-ba13-2dccf656e153	1	Other	Other
+9492068b-5668-4a65-9fd2-cdc270f36934	1	Other	Other
+94922f0f-2a8b-462a-be69-faa480ab5900	1	Other	Other
+949234c4-b437-490b-a6e1-e5d6e10195ac	1	Other	Other
+9492bd3b-7e05-4fd1-9d93-b74d141eea93	1	Other	Other
+9492bf43-e5b0-4d5a-9ab3-76b6b4d1af98	1	Other	Other
+9492ceb9-f26d-4ef1-95f0-d5fa78dfdd08	1	Other	Other
+94931869-d1f5-4c1d-a312-b0417921f9de	1	\N	Other
+94934dfd-a403-4b79-b26e-9760a3530856	1	Other	Other
+949358e0-f167-485b-8be9-f71cc4f16aa8	1	Other	Other
+94935f13-420f-474b-a9c4-0e8d73ce0179	1	Other	Other
+94936e0a-8c24-4426-98ed-980654db812e	1	Other	Other
+9493a0e1-f86f-4381-89df-860aa4d12ab2	1	Other	Other
+9493bdef-ef63-4866-9b7c-844f62fd848d	1	Other	Other
+949404d7-9dff-4493-8b30-3e2606718f40	1	Other	Other
+94940f08-d91f-424b-a4fa-bc172ee12378	1	Other	Other
+9494a2fa-5523-4603-b9df-088d98639198	1	James	Other
+9494ad3b-b3c3-41d0-814c-868c2bf1428e	1	Other	Other
+94960dc0-3843-4c2f-a00a-a1bb1b7be213	1	Other	Other
+9496131c-430a-4693-861f-81c346b9de7b	1	Other	Other
+949632bb-c201-49e1-8f4a-e733584e1d9e	1	Other	Other
+9496548f-3aac-4f64-8891-da0de5623976	1	Other	Other
+94967d25-c3de-4d91-8a9d-5c173922c6e0	1	\N	Other
+9496821b-8d24-44fd-aa25-1eac56c2ca71	1	Other	Other
+9496b228-cdfe-400d-be1c-2e3d83914bfa	1	Other	Other
+9496d803-0aa0-4524-8476-6350f7db3066	1	Other	Other
+9496e336-7206-419f-9de1-65999afb87c6	1	Other	Other
+949724db-6cb2-4f04-a172-2bc7edbea36b	1	Other	Other
+94972cf5-5d10-4a10-8175-1ed9bd1859f3	1	Other	Other
+94975ca8-8bd9-4929-b982-6fe1ec4d1a64	1	\N	Other
+949774dc-0f84-47d6-bf01-99663ededd36	1	Other	Other
+9497793f-ff6d-464a-93ea-5cd274e6e240	1	Other	Other
+94979a08-af31-4fb7-9b3d-2d83b3b7ca24	1	Other	Other
+9497a52b-39ce-40c1-826d-09b4b06d11e6	1	Other	Other
+9497ad82-7842-4ef6-9df0-5b6d71f2de15	1	James	Other
+94981650-2620-4ee9-a99f-009f168f70b5	1	Other	Other
+94981885-3cca-4788-85e1-f7a3479ae5fc	1	Other	Other
+94984872-d249-4fd5-87e8-74dd3b4237bb	1	Other	Other
+94988931-85f8-4f8d-80b4-d4e1ce608d54	1	Other	Other
+9498ccb6-75ad-4c70-ba3d-cae92da51cf3	1	Other	Other
+9498f68a-d650-4c56-974c-7785c1797f8d	1	Other	Other
+949921e1-b2c6-4f23-9397-080cb5b01606	1	Other	Other
+9499623d-d808-49a7-897e-a3c13226e006	1	Other	Other
+9499a2fa-a30b-467e-a30d-96cb4cb29579	1	Other	Other
+9499b93f-ad0f-4f66-bcd9-f52b9db3df08	1	Other	Other
+9499e2f9-df36-4e0f-997f-5543ddb75c28	1	Other	Other
+949a1a24-1c32-4310-b907-010e48b55b93	1	Other	Other
+949a76e4-7efb-44bc-bc9f-31524bbc8675	1	Other	Other
+949b218d-a110-4bc4-94a9-adf9dd23ece6	1	Other	Other
+949b3222-42c3-422c-b0fe-9ae6bc6b2e8b	1	Other	Other
+949b7035-3250-42ab-afa5-7463ce0ccdc9	1	Other	Other
+949bd5cf-bb6b-4b40-a781-a60dd39380c2	1	Other	Other
+949be8f3-43c8-457c-8c0d-8ff10681dfe5	1	Other	Other
+949c1c57-c7af-420b-96d7-019f82195233	1	Other	Other
+949c309a-5f3c-485d-91c6-b41496361ac1	1	Other	Other
+949c9371-5e31-476d-ad53-0881fe310cd7	1	Other	Other
+949ca234-c24e-4ec7-a717-05d2b30280c1	1	Other	Other
+949cac2b-f046-42eb-a29a-25d32704d3ff	1	Other	Other
+949caebf-65ef-40ad-8c6a-42887d8528d3	1	Other	Other
+949cb922-42f3-47b7-9352-1cf23948b299	1	Other	Other
+949cbe08-3b68-41f6-8fd4-09318c6065e7	1	Other	Other
+949cd561-bd79-43a6-b4e2-b2bc05d69d63	1	Other	Other
+949cdc4b-978d-4a39-b906-481848f7ed33	1	Other	Other
+949d0568-a117-4053-85a6-81f50ede541c	1	Other	Other
+949d252b-e97f-4826-9033-5890fb91fe51	1	Other	Other
+949d44a3-e69a-44c2-b9dc-026ea8ec3711	1	Other	Other
+949d462d-7d30-4095-acd9-cad4b4e5fc11	1	Other	Other
+949da0ac-b4c5-4001-b73e-57cd623473ad	1	Other	Other
+949dc86d-8e8b-4e2a-a9d0-b3f738757957	1	Other	Other
+949dca52-84e1-408d-9893-49d5d79742b0	1	Other	Other
+949dd682-a5d0-472f-9155-d1de6ace222a	1	Other	Other
+949e6fc9-cb2d-431d-bcbd-4cfecd8b1e9a	1	Other	Other
+949ea3cd-d9c6-43d9-8359-e035589a8208	1	Other	Other
+949ebde7-6b00-473a-b774-47d821baa177	1	Other	Other
+949ee655-5e23-44a6-90a2-112d9668f820	1	Other	Other
+949f093d-399c-408d-95e3-1d3d3c0415bc	1	Other	Other
+949f0b73-4867-4f2a-8259-787cf46e3f7c	1	Other	Other
+949f2a5e-1de1-477d-b901-e80f18d0ca5d	1	\N	Other
+949f7571-24f9-46b3-b959-035701c1dbee	1	Other	Other
+949f7f0b-9d94-4f62-8cf1-4db4caac5c49	1	Other	Other
+949f8884-a167-44c8-80f1-419ca8adac01	1	Other	Other
+949f9b68-4453-4b18-96d0-e7d013e15a5b	1	Other	Other
+949f9f5a-ccf2-44d8-93d6-a7bfbb131d06	1	\N	Other
+949fcd36-790c-4c08-af20-4d8493af3f83	1	Other	Other
+949fd325-407f-4d1e-8e4c-d7aa59efe0dc	1	Other	Other
+94a02952-9adb-4652-ba48-7e46134bdb14	1	Other	Other
+94a08aff-2129-43d8-bde5-cd81f2fd82bb	1	Other	Other
+94a0b9a4-3f0b-40a1-ba1b-fc8c8c521c1f	1	Other	Other
+94a0cf08-d5dc-4cc2-b73b-26a51dd7458d	1	Other	Other
+94a12960-f225-426f-961c-6fa11043b841	1	Other	Other
+94a1656c-bb53-41dc-8b5e-ecfb49a6dec2	1	James	Other
+94a18942-da37-472f-b4e7-a971dd09dd25	1	Other	Other
+94a21dec-39a9-42ad-a808-086bd7eaa73a	1	Other	Other
+94a23971-5826-48a1-8d7d-77e608590e62	1	Other	Other
+94a24e33-b485-41e1-ab6b-b40ee40ba6a3	1	Other	Other
+94a263c5-c1c3-4397-9663-860a2ca3864c	1	Other	Other
+94a281e8-7193-4be7-9575-525c4374b8ba	1	Other	Other
+94a3331f-1e09-4395-9cab-3c18f17f3341	1	Other	Other
+94a395a8-30c5-45c9-b151-745004cdd66d	1	Other	Other
+94a425be-d6ad-426b-b18f-041869adab3e	1	Other	Other
+94a42a51-4c09-4726-8a70-69d6c1fa3f95	1	Other	Other
+94a48d4c-df36-456d-b8f5-0c166ee5f443	1	Other	Other
+94a49bd5-4135-4c58-8cde-2d10852bb6af	1	Other	Other
+94a4a043-4f68-4ac2-a7a7-35f159e5b118	1	Other	Other
+94a4b0ff-aef7-4cfe-8013-10638a981e93	1	Other	Other
+94a4bec4-b4f4-41a5-9799-78204e189456	1	Other	Other
+94a4c352-1123-4f99-98ee-77376fa26441	1	Other	Other
+94a4ce06-60c5-4f08-9283-4692b53a794c	1	Other	Other
+94a51193-d2e4-4464-8e4a-4e1c669cce4c	1	Other	Other
+94a5180b-cff4-4361-91ce-0c2075410759	1	Other	Other
+94a52179-74d9-43a7-b94e-0d055d67e0cd	1	Other	Other
+94a54bb4-ec4f-4960-aa53-ec19550e3b61	1	\N	Other
+94a5ab45-418b-4887-9a84-344487ed11dc	1	Other	Other
+94a5ef59-1b70-4498-b7a3-f3b0280d7663	1	Other	Other
+94a61899-65a8-4a45-bb51-6f2093a49b6b	1	Other	Other
+94a66ec8-132b-4c96-abd2-e119cac663a6	1	Other	Other
+94a67e9d-7962-4186-bbe1-6004eb0b3926	1	Other	Other
+94a6cc5c-2bd7-499a-809e-0540e0731fe0	1	Other	Other
+94a71988-3212-49d0-94d1-6a93b5649d2a	1	Other	Other
+94a729b4-7980-41e4-8536-f566f5348474	1	Other	Other
+94a7b410-f763-496e-9b32-43f794ee1fa1	1	Other	Other
+94a7fd89-06c1-4c3b-b1c2-c723578c44ad	1	Other	Other
+94a7feac-4454-4fa5-be55-17710d40f3e2	1	Other	Other
+94a818d5-395d-467f-b10e-87fed60640a8	1	Other	Other
+94a83265-76c2-4972-ac11-6290808beb7f	1	Other	Other
+94a8914e-7956-4ca9-99c1-41bde539eb2c	1	Other	Other
+94a89150-3844-45ff-948e-3c8387565520	1	Other	Other
+94a892f0-706f-491b-a9f4-1b5d12a57421	1	Other	Other
+94a89ad9-4151-4ee6-9174-094763abd25d	1	Other	Other
+94a8d0e8-99fd-403c-bd89-cca096719a6b	1	Other	Other
+94a8e08e-343b-4595-9dd4-a274341a9855	1	Other	Other
+94a8fb17-b350-4257-8ff4-b5f533072f64	1	Other	Other
+94a91d16-9f15-4961-aae2-2aeab3c50a8b	1	James	Other
+94a92a55-b347-4186-8ce0-abab03dfeca3	1	Other	Other
+94a94625-acbe-4747-b688-d1fdbf297a84	1	Other	Other
+94a9bfda-268a-4a9c-af98-be88f2b56518	1	Other	Other
+94a9fec1-d123-419e-b4fc-c1a88a20e4eb	1	Other	Other
+94aa155b-404d-49ed-be5f-8b6d29de9803	1	Other	Other
+94aa9d21-de8c-47d4-baf3-94f6732f1e2a	1	Other	Other
+94aaaefa-4c81-46a9-928e-9614f7a04900	1	Other	Other
+94aaaf65-2eee-4711-949c-70983bfc5d3d	1	Other	Other
+94aae48d-665a-4762-ab0e-795290ca4552	1	Other	Other
+94aae982-6fcd-49d2-ba45-ae7e4dde43d1	1	Other	Other
+94ab3b0a-e94b-4196-8915-118a10c3c858	1	Other	Other
+94ab5d44-4aa3-4938-94b2-bd9203b2108b	1	Other	Other
+94abd668-7b8d-480c-9d9c-e26eaf13e54d	1	Other	Other
+94ad04bf-8060-40b5-a9c1-3154be8c16fd	1	Other	Other
+94ad219d-5e8e-48cd-8476-83c872bb4609	1	Other	Other
+94ad3733-005c-4366-b2a6-574a6a8b7860	1	Other	Other
+94ad629c-aee7-4099-bca6-d3eafa2ba03b	1	Other	Other
+94ad76a5-554a-490f-89b3-80671bc0d1c2	1	Other	Other
+94adbb80-7b3a-48e9-baad-0a52975b144b	1	\N	Other
+94ae1c5e-987d-43c6-8427-fe86307bfbaf	1	Other	Other
+94ae36d4-3d3c-4a46-976f-42e465f9c7f0	1	Other	Other
+94ae9656-5910-45bd-aebf-c902d745f57d	1	Other	Other
+94ae9874-adc5-4e55-b553-56b61bbde720	1	Other	Other
+94aebe80-9f1d-4eb6-844e-ed153e38adda	1	Other	Other
+94af08ae-c781-44e8-9466-a9bb1cb86fa6	1	Other	Other
+94af13a4-de13-420b-b4ff-1281a2b4c996	1	Other	Other
+94af5830-3efb-455d-a9aa-dad52a2f6589	1	Other	Other
+94afbcdb-5768-4898-b43c-7eb3586c831a	1	Other	Other
+94afd99e-f629-4c56-bf54-7c13cffe637d	1	James	Other
+94afe113-d025-4fb6-9d9e-370fe86a43b8	1	Other	Other
+94aff0a9-2d1d-40ff-85ad-2e8e5d4fdf0e	1	Other	Other
+94b07208-0cea-44ef-a938-b0fef5b0fa04	1	Other	Other
+94b07656-6372-4b64-a2e4-1b3a511c7cb0	1	Other	Other
+94b0d967-5182-4ff4-a92c-d5795bafefb0	1	Other	Other
+94b10cb1-944e-4fa5-a36a-894a1e5b9892	1	Other	Other
+94b12356-5a71-4f08-aec0-fb95f3a469bc	1	Other	Other
+94b1dd8b-869f-4da9-aac4-97831984469a	1	Other	Other
+94b21b7b-801d-4f3e-bc62-2aa65f21b159	1	Other	Other
+94b24eb1-63c1-49eb-bb86-ae1b5b13c167	1	Other	Other
+94b28d29-8a01-4561-b2a2-f212ab569087	1	Other	Other
+94b29e60-ed2e-4c03-b45b-ee1656c7c3ba	1	Other	Other
+94b2a5d3-e8a2-4a1b-a7ec-51695a2dc68f	1	Other	Other
+94b2c23e-82f3-4906-9075-2e1d6f2ec71b	1	James	Other
+94b2ebd1-f9cd-4e1a-9b32-dba5dcba6e78	1	Other	Other
+94b32149-8934-4a30-ab58-c6af75cfb661	1	Other	Other
+94b32a16-2bf1-408b-91a1-5520684a0cba	1	\N	Other
+94b33e08-4040-48b0-92db-1a66c6feffb1	1	Other	Other
+94b34672-bd8b-45c6-bca1-3a3465b70fe0	1	Other	Other
+94b348f2-8797-4682-87ae-9e5280c06612	1	Other	Other
+94b3a1d7-5839-44b7-8ffc-4ae527c25f75	1	Other	Other
+94b3be2f-a0a4-4bec-a803-bcd2a9c3d7fd	1	Other	Other
+94b3ca14-ca45-40db-861b-46c2fd89eb57	1	Other	Other
+94b3d753-ff8f-4160-b00d-2763ef4fba20	1	Other	Other
+94b3db99-56bf-45ba-8f59-12b907a65a6d	1	Other	Other
+94b42173-d433-49b5-b185-29746ec7c4b0	1	Other	Other
+94b43568-9444-4886-99b7-09c4cafff389	1	Other	Other
+94b4457f-0577-4de6-973c-6021d9b6aad1	1	Other	Other
+94b452df-527d-479f-bc22-ca090c8a99b4	1	Other	Other
+94b47513-764f-4778-945e-8a6995cd9e9f	1	Other	Other
+94b47d7d-3a59-471c-aaeb-260c87b5113c	1	Other	Other
+94b487ee-ba2b-4fe8-add3-8e37df8ca29d	1	Other	Other
+94b48cee-483a-491a-9b0f-ac41f4767e78	1	Other	Other
+94b4dba6-635c-4ce3-b7c0-b14b98899f6f	1	Other	Other
+94b50438-a808-4fc5-81e3-6dcb9fc4ec5c	1	Other	Other
+94b51c8c-69f6-4134-ab7e-791a375cb97f	1	Other	Other
+94b560bb-a0e0-4832-9e30-bb1d61e529aa	1	Other	Other
+94b5cb53-5762-4a38-b3b6-51bf77031c86	1	Other	Other
+94b5faa0-46d5-11e8-890c-fa163e8624cc	1	Other	Other
+94b64515-bd90-4184-a5d1-4d0c74b2a559	1	Other	Other
+94b6e56a-f9c0-488c-a5d2-ba9a08483712	1	Other	Other
+94b71160-7cb5-4c9a-8bac-4352e1616d4b	1	Other	Other
+94b7685d-2362-41a0-a146-85226e096670	1	Other	Other
+94b784c9-564b-4ece-b215-2550eb61e8d1	1	Other	Other
+94b7fdd9-84d2-4ae3-b563-50aede6d701d	1	Other	Other
+94b808c8-aa73-4a53-92fb-48ca51ec59b6	1	Other	Other
+94b87fcf-9147-4b08-b110-fc5e20f88bac	1	James	Other
+94b893f9-24b3-4f97-ac51-fba91f15d88a	1	Other	Other
+94b90fb2-d045-423a-95ba-f5d75f6d8396	1	Other	Other
+94b93190-4b93-4d5e-92fe-2edcb2c4dc14	1	\N	Other
+94b93d3f-abdb-439a-add3-18b3b7200218	1	Other	Other
+94b94946-865e-46eb-a2d6-b84ba83bc4a8	1	Other	Other
+94b97158-a619-4889-ad5f-89b63aa4afbc	1	Other	Other
+94b97e31-3404-4cd7-96cd-0bddc89336f9	1	Other	Other
+94ba2a19-ff93-4170-99a3-77e76e99cc5e	1	James	Other
+94ba4bf8-844a-4829-8f4d-b99a1c7d9846	1	Other	Other
+94ba6678-22ec-4df7-adc2-3e36e370c6a5	1	Other	Other
+94ba9c42-ea0d-4d48-98a3-e5537e8caf87	1	Other	Other
+94bac0c0-54ec-48e8-8edb-f789235f81e4	1	Other	Other
+94bad6c8-7ecb-4b46-964f-cd62126d53bd	1	Other	Other
+94bb4ad9-7193-4a26-95eb-9cd8474c6292	1	Other	Other
+94bb7062-a7b3-459a-b6b2-f9de05e14381	1	Other	Other
+94bbb1d7-08a1-479b-b72b-922540c8d23a	1	Other	Other
+94bbc87f-e755-4bab-967a-7ffe6ae13eaa	1	Other	Other
+94bc0fe8-4f44-4e2e-8e99-05f54f1e7b03	1	Other	Other
+94bc310d-767b-4034-9f15-67da8df8feae	1	Other	Other
+94bc4a91-4869-420e-afb5-6654a18326e7	1	\N	Other
+94bc79e9-881c-45a2-830f-1f47b5650a44	1	Other	Other
+94bc8d8c-6516-49a2-9bf3-9ab5d9ceba93	1	Other	Other
+94bc9b81-8045-4370-a612-c1aa0e3a64be	1	Other	Other
+94bcbf57-632c-401f-bcc5-7d02dae355dd	1	Other	Other
+94bd0de5-ae50-471a-a372-6933271501e3	1	\N	Other
+94bd0e00-ca94-4ce1-887e-48179b83fa5c	1	Other	Other
+94bd1366-6cdc-48f1-ba07-f8b1f9f18499	1	Other	Other
+94bd1f86-d7f0-4e61-9f22-f8eb86f681be	1	\N	Other
+94bd41e3-a261-4aa1-a266-437425e9e6f8	1	Other	Other
+94bd450e-49a0-4abd-94f8-6c3bb8bc1059	1	Other	Other
+94bd6d93-baa4-430c-b32a-2040c44ac69b	1	Other	Other
+94bd7de1-4581-4073-b125-bcc653b6035d	1	Other	Other
+94bd9913-75d9-4f6c-b987-f700ed9c75e4	1	Other	Other
+94bdb1bf-65c4-437a-8a2b-b896ec059980	1	Other	Other
+94bdec15-9b18-4138-8b07-994b95fd95a8	1	Other	Other
+94bdfef7-74b9-40fe-b39d-616a9da6d152	1	Other	Other
+94be4781-d865-4119-a454-77db8e5e61c2	1	Other	Other
+94be7f90-117a-43f6-8f8b-229aec6d8f77	1	Other	Other
+94bef445-53e9-4137-bdf1-9f1da0fe6577	1	Other	Other
+94bf2721-5fb1-48a9-9417-b6afe3f1460d	1	Other	Other
+94bf6255-022b-4033-9e28-36c9df26944f	1	Other	Other
+94bf837f-4eb2-47df-8590-bc41362d2e1d	1	Other	Other
+94bf9538-0842-4a84-9e98-f38eae81d27b	1	Other	Other
+94bfa7e5-b5a0-4522-a5d9-b34befd88dc5	1	Other	Other
+94bfa80c-0b96-46d9-9e82-56a9d6294f7c	1	Other	Other
+94bfd54e-8b64-476a-99b5-1d2546e7caba	1	Other	Other
+94bfd786-2682-46a7-85a7-62da9214bb69	1	Other	Other
+94bfecf1-0644-40d5-883c-1adcad93813a	1	Other	Other
+94c00d9f-a1bf-4582-9c3e-697e22dc423c	1	Other	Other
+94c0d546-632c-440a-b3a9-14a1a9e155fe	1	Other	Other
+94c0ddce-5233-45a9-a36a-fa498e6bc2fb	1	Other	Other
+94c0ea1c-727c-46c2-9b7a-c2ba9374dca6	1	Other	Other
+94c0f64f-d1f4-4576-a505-0b4e8308a62f	1	Other	Other
+94c14e24-ec83-44d4-8af4-41aed78b7840	1	Other	Other
+94c15c9a-7fd1-414f-a883-6fd75c70c832	1	Other	Other
+94c16433-3bf9-42b6-961a-101a1c255bf0	1	\N	Other
+94c1f9ee-d0fb-45de-a336-eaab6ee98a69	1	Other	Other
+94c26a74-a96d-4aea-b233-91ded22c4f03	1	Other	Other
+94c295de-0ab3-41c0-ac09-1b4328f9c650	1	Other	Other
+94c2c832-34ca-45a3-b08d-84c110bf4618	1	Other	Other
+94c3416d-a796-41ba-a4c1-2531b7a56a0e	1	Other	Other
+94c369f7-581e-4abf-9def-726b1c22f199	1	Other	Other
+94c3b865-f9d1-4729-a0dd-46ef4bcd7c8c	1	Other	Other
+94c3e430-be53-48a6-b0eb-224282cf309f	1	Other	Other
+94c4704e-68d8-4ba7-8164-bc93aa8e57b6	1	Other	Other
+94c4bbd5-c731-4b27-9430-f816e1d9a8ce	1	Other	Other
+94c4bec6-de45-4264-82e3-ac1639fe4a29	1	Other	Other
+94c4ff53-46a4-433a-be87-8a9d477bb98a	1	Other	Other
+94c51bc3-ea9c-4316-9248-67f935c1d381	1	Other	Other
+94c52287-8a60-4df7-b5f3-4ee2ff452706	1	Other	Other
+94c56591-29f3-4370-883a-25434c96e7cf	1	Other	Other
+94c579db-39b4-4388-b78d-a1d928fc1c62	1	Other	Other
+94c581eb-0346-4180-8c7a-953921f16003	1	Other	Other
+94c5b577-2c35-4c28-8266-52f4a060cdd3	1	Other	Other
+94c5c67c-f658-4cff-80fa-767dd4896ff1	1	Other	Other
+94c5ce0a-9bf4-4f7e-8b1a-4559bf53566e	1	Other	Other
+94c5ed2d-ec4c-416f-b35d-e927b702f449	1	Other	Other
+94c61bce-db6b-44c7-8eef-c31920608409	1	Other	Other
+94c68e95-ee91-405f-9aea-c1d12338c101	1	Other	Other
+94c6fe75-77cb-4a93-9415-522539563053	1	Other	Other
+94c71eec-1458-42dc-ad40-0ebc63236b27	1	Other	Other
+94c72a04-ad4d-40b6-9a28-a07031877218	1	Other	Other
+94c73ec3-9982-4373-8b86-012b87857ea4	1	Other	Other
+94c753e4-84a6-4607-8274-a909d1968196	1	Other	Other
+94c7913e-7056-450c-9b2e-7f9e663ba523	1	Other	Other
+94c79404-9a8e-460f-b49d-a7d0a1599474	1	Other	Other
+94c79eb2-ef93-49fd-a02c-cbd26adce8e8	1	Other	Other
+94c8029c-774d-46f3-9bba-302615de114f	1	Other	Other
+94c80c5d-659f-43dd-9dae-cd2c247ac257	1	Other	Other
+94c854bc-943d-4134-958d-ece86dcc7bd2	1	Other	Other
+94c85d23-0e03-435e-87e3-ed1b77e7ff94	1	Other	Other
+94c8a085-b284-46b5-bfbf-05a69d60f6ab	1	\N	Other
+94c8ac33-b663-426c-bd1a-7bcc635d04ff	1	Other	Other
+94c94161-4e14-467f-b15d-b43bb689b704	1	Other	Other
+94c95f79-ef39-4ac8-80f1-63e43ce3c734	1	Other	Other
+94c9638a-dd71-4c62-8c02-85e5b601eca5	1	Other	Other
+94c9c699-a482-466c-b8bc-c573f443b9bd	1	Other	Other
+94c9cb52-9474-4a0d-9cd2-9b28f5106396	1	Other	Other
+94c9f00b-628a-442e-bc2f-74bd9d62d57d	1	Other	Other
+94ca6266-e8cc-4ac2-9784-d0f7b09b3895	1	Other	Other
+94ca8ad1-99b4-417a-be87-e7fbf34d2f97	1	Other	Other
+94ca9373-e903-4049-b21b-eb747a0fc995	1	Other	Other
+94cad603-c3f9-449e-aa89-13cc36f7ca7f	1	Other	Other
+94cae574-602c-4e81-88e9-8912cfb3e65c	1	Other	Other
+94cbbe24-a467-4b44-9068-c0225fedd682	1	Other	Other
+94cc2bee-d76a-4b14-b62d-2db8b1f52b89	1	Other	Other
+94cc48a7-f815-4b41-bff2-c2550468419f	1	Other	Other
+94cc7fb7-0706-4999-8122-caa36af05172	1	Other	Other
+94cc8c20-c82b-4be0-9153-0dd548d23603	1	Other	Other
+94cd14a9-c1a9-4d92-9d2a-cf3a5e23bcd6	1	Other	Other
+94cd16cc-d3fd-45f0-8952-1aff5751a79e	1	Other	Other
+94cd3acd-0574-4315-8feb-2b6e331fb828	1	\N	Other
+94cd47d3-61f2-4d09-85bd-7b4f65320aa4	1	Other	Other
+94cd491d-fd4c-4e57-98db-ac137a8f00f5	1	Other	Other
+94cd70f9-15f9-4801-8273-64987f32f1c2	1	Other	Other
+94cd78e7-fcac-4044-a6bd-85c853b58f5a	1	Other	Other
+94cd88b5-46cc-40fa-843e-123acb672280	1	Other	Other
+94cd8cfa-5ee9-4e46-b586-a147f82ef997	1	Other	Other
+94cdc2dc-92c0-4544-b4e7-b8e0512e3b2f	1	Other	Other
+94ce216b-b5ba-497a-a33b-e80743adf194	1	Other	Other
+94ce2593-80d8-4006-a98d-fd8fd4769637	1	Other	Other
+94ce46af-8eb7-475b-9676-ff3a1cdc7995	1	Other	Other
+94ce5409-8033-4276-b88b-86462f36c9a4	1	Other	Other
+94cf1243-5f49-4e26-a39b-b522ba9c50ed	1	Other	Other
+94cf2af4-e08f-4dcb-a6e6-7a635a86739a	1	Other	Other
+94cf5c79-5ba3-4792-8266-c56c22bf60e2	1	Other	Other
+94cf87d1-ffa2-49ab-9fd8-fc222fe375d4	1	Other	Other
+94cfd9e4-379d-45a0-bd4e-0d920ff197f9	1	Other	Other
+94cfe318-b516-4c9d-8c9b-4603b66e6788	1	Other	Other
+94d01303-5298-4234-8821-b031d40a2025	1	Other	Other
+94d02274-8618-4739-9a34-857ccf5e999d	1	Other	Other
+94d04325-2c60-4c7f-a2c4-e534f75e78bc	1	Other	Other
+94d05287-a106-40dd-981b-1d7453aedf10	1	Other	Other
+94d06807-e2b4-4b08-9c1b-a63925294467	1	Other	Other
+94d0c22b-de0e-43ea-878a-52ce95d2f0d5	1	Other	Other
+94d0d08c-33a2-4bdd-91d2-ea853bde8271	1	Other	Other
+94d1094f-8a98-4016-b287-d1bf5622af03	1	Other	Other
+94d15a8a-cf9f-41e2-87b7-39bcc95f0704	1	Other	Other
+94d17da1-3684-47ea-ba80-bc6688a1a9b8	1	Other	Other
+94d1c799-9714-43f7-9a9d-95b28595e819	1	Other	Other
+94d20f86-bff8-4844-b974-1d8ca821feb0	1	Other	Other
+94d20fde-711e-42d4-9f95-98b052ce69fc	1	Other	Other
+94d2172c-7aa5-490f-b148-2eef78dd9b89	1	Other	Other
+94d21f16-1299-48b5-91f3-cdeefc4f2f2a	1	Other	Other
+94d27e03-4ca8-40b8-b463-087e132dc33d	1	Other	Other
+94d297a7-3d1f-4d86-a614-f9298439110f	1	Other	Other
+94d2f14f-774f-4cf3-ac6d-6500351f1f04	1	Other	Other
+94d3006d-62b2-4465-bced-76750c7827a1	1	Other	Other
+94d3229c-d4ba-4152-8119-65c61b22af3b	1	Other	Other
+94d35d25-c20e-4996-b778-f953df2959b0	1	Other	Other
+94d36521-2fb2-46e6-8715-28028d987f2b	1	Other	Other
+94d377da-bb02-4019-a944-5213f1d2346e	1	Other	Other
+94d39ff8-92a7-4bc5-ae4d-97e710a98a76	1	Other	Other
+94d3c920-91cd-488d-b5d3-c55079b1c2d5	1	Other	Other
+94d3f3de-0b88-4e20-b87f-e0f7afc186cc	1	Other	Other
+94d3fc18-710a-48e7-bdb8-eb30c9684b5d	1	Other	Other
+94d40613-162b-423e-b4dc-d0f929be50c5	1	Other	Other
+94d41dd7-0b75-4e52-ba5f-483fadf4e958	1	Other	Other
+94d47e8c-bab0-4dfb-b523-4f35367617f4	1	Other	Other
+94d4ba78-9f5e-4707-8f3f-59e3f87302d8	1	Other	Other
+94d51519-bc8e-4409-8c4b-a023b7c2d8c1	1	Other	Other
+94d547e5-7c5c-4d00-9c7e-ff1ca7905706	1	Other	Other
+94d579f0-be32-48d8-9d54-304b83ab9009	1	Other	Other
+94d5b511-e9bd-4b56-abc1-52463165e09c	1	\N	Other
+94d5c791-4e59-4a31-9b0c-f8dcffbf54a3	1	Other	Other
+94d60996-fc22-43fd-b114-b0f8d6b79a72	1	Other	Other
+94d6242a-b6f1-4918-bafb-696ba526799a	1	Other	Other
+94d6334c-a170-46fc-8e7e-5034d0cf0e26	1	Other	Other
+94d64aed-a34c-4613-a99b-4003c48334a3	1	Other	Other
+94d68b45-f9f8-4972-aaa3-760ec5fb005d	1	Other	Other
+94d6a365-6a54-40be-a78d-cc29abd06cb7	1	Other	Other
+94d6a753-b065-42be-8ec5-36d5577963d1	1	Other	Other
+94d6fe1e-35e9-423f-a298-55c2d4e6e862	1	Other	Other
+94d6ff3e-49b8-42f8-8c10-b4aa07f85c6b	1	Other	Other
+94d7081d-45e1-4bb3-b59a-367c9a1539c1	1	Other	Other
+94d7735c-70a9-4d08-9246-7abd0444ad93	1	Other	Other
+94d7c1b5-1c31-4a80-b777-3f80b6ab618b	1	Other	Other
+94d8117d-a040-40b8-a472-f272f0ea2fe0	1	Other	Other
+94d860af-5458-4e94-b428-ddae19130794	1	Other	Other
+94d8679f-1bc2-40ce-8f5b-c23be55344e8	1	Other	Other
+94d86f12-976c-4b78-ac47-546a6af734ad	1	Other	Other
+94d8dd1a-3149-400b-9550-55f37f6b8638	1	Other	Other
+94d8e29b-2030-4162-b017-f5d10ce73c13	1	Other	Other
+94d92505-6fe9-4090-9bed-559abb9870ff	1	Other	Other
+94d932ea-413d-434a-87d0-d5ffa220288f	1	Other	Other
+94d9558b-b6d8-4366-bb12-41b7be813311	1	Other	Other
+94d978aa-bb5e-4a6e-aa16-596bd8f99021	1	Other	Other
+94d980a3-d457-42ac-993a-d9c31cd09f8d	1	Other	Other
+94d9c61d-54d3-4358-9e91-1ab228aab2d2	1	Other	Other
+94d9ce70-5bea-4e4d-a589-6270e76af03d	1	Other	Other
+94d9f5ca-9e62-411e-b10b-596aeaef8187	1	Other	Other
+94da37e5-6f6e-4986-a34c-8a606f64884a	1	Other	Other
+94da77be-0f2f-4aa3-b0ae-9f59951b8442	1	Other	Other
+94da7f50-4271-4632-af24-a4bf36accfc4	1	Other	Other
+94da9abe-a93f-415c-ba54-0932fb64eeef	1	Other	Other
+94daac8d-0eae-426d-bdcd-b3980bb05381	1	Other	Other
+94dafc7e-b825-4b7b-a65a-5dea60b9d191	1	Other	Other
+94db0d57-018a-411e-8bb6-3635e9926fb5	1	Other	Other
+94db1f44-ee02-44cb-96ff-abb1d063c0a8	1	Other	Other
+94db4c48-065a-4d81-bb10-789987d962dc	1	Other	Other
+94db599e-6ace-4a87-9bea-660341f82720	1	Other	Other
+94db59f8-9a9d-479c-a7fd-98d18f46db09	1	\N	Other
+94dbab33-b437-428f-bca6-7aea0aaa27fb	1	Other	Other
+94dbb686-136e-4ec1-952c-ba2260a9c09b	1	Other	Other
+94dbf60b-1d6e-438f-a994-5c12e66b84f1	1	Other	Other
+94dc5eb8-6777-4227-86c2-1356e1a1baf3	1	Other	Other
+94dca756-5881-49d9-8004-63f3c7b29d5d	1	Other	Other
+94dca96c-4885-40b6-adfd-f1da0111f68a	1	Other	Other
+94dcc6ad-29e1-403c-975a-cde4bc617372	1	Other	Other
+94dd0ac6-ee67-440d-a2b5-1c07966603a0	1	\N	Other
+94dd2eba-fada-4df0-b260-5f27f43a537c	1	Other	Other
+94dd38d2-1dd6-4177-bb19-85e6a7fb520c	1	Other	Other
+94dd4f61-87e0-4165-91cd-b82a732475e0	1	Other	Other
+94dd6764-44b5-4fc0-a4cc-6b56c80ca6d7	1	Other	Other
+94ddcc32-2fd2-4d25-b5bf-3023e290e43c	1	\N	Other
+94ddcfb3-5651-431e-ba0b-49c7eae5f6eb	1	Other	Other
+94ddeb40-cd00-4a90-ba6c-338673fb9ad1	1	Other	Other
+94de1a70-0e8a-4e1a-8ef9-fe29939c2172	1	Other	Other
+94de4a06-5999-433c-8085-385012251844	1	Other	Other
+94de554c-fe5a-4e59-b5d7-bd76d7a27806	1	Other	Other
+94de5be6-e6b0-4c59-9171-5f711d556b7f	1	Other	Other
+94de7d6c-10a8-11e8-8c0f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+94de876e-3a01-40d1-a744-2b63b41c1fcb	1	Other	Other
+94de9b60-2d8f-405c-8e7b-566dc1fc8897	1	Other	Other
+94deaaf7-db7d-4c8e-84ec-72023f26de6d	1	\N	Other
+94dec643-39f0-45b6-8aaa-a94591ced43f	1	Other	Other
+94deebde-41da-4625-af42-de5e3fa50646	1	Other	Other
+94df3bd6-a604-4053-a7a3-b50d08a24a7d	1	Other	Other
+94dfa4c4-bc01-49e9-8aab-7ed52d1fd6f3	1	Other	Other
+94e000a0-c70d-4d6e-a3fd-c9656f0c8625	1	Other	Other
+94e02dbd-e146-4b0d-8e95-42c92e32ee0f	1	Other	Other
+94e04f96-0284-4e42-9046-48c8ec6864e3	1	Other	Other
+94e05ee8-09d9-4a1a-ac55-837169db31fe	1	Other	Other
+94e0917a-8c06-4ca2-b8fc-faf7d65d7763	1	Other	Other
+94e0b6f7-9be0-451a-8349-9c3d6c5ebaaa	1	Other	Other
+94e0b7fa-2642-4916-8121-4b50597420e1	1	Other	Other
+94e0bae8-4963-493e-b072-d66ce96183a8	1	Other	Other
+94e14cbc-8267-474e-bd6d-456b6feeb259	1	James	Other
+94e1649a-e1b0-425c-9fc7-0bdd8a4a0d9c	1	Other	Other
+94e16e9d-cf3b-4f00-bce8-01ba72e2f50c	1	Other	Other
+94e16f13-d4a1-4672-b147-8c08dfee776c	1	Other	Other
+94e19896-9ddd-4ac2-8ba2-73679b81ccd5	1	Other	Other
+94e1c8e1-75ae-4f67-8da9-e44640b6237b	1	Other	Other
+94e1ea2a-5fb4-4cb8-9585-eebd3d4805a3	1	Other	Other
+94e1f279-7d02-4be0-96bc-4f3494a81822	1	Other	Other
+94e1fe63-8609-485c-ae60-ae5e5f0fe3a6	1	Other	Other
+94e24074-9d5c-49af-926d-9a4711bf6d47	1	James	Other
+94e250cb-5e3f-484f-a98a-2cd63f521370	1	Other	Other
+94e25e1a-6689-4e3e-8c4b-0ffffdc87b50	1	Other	Other
+94e27588-e0b8-4a2b-9c53-b51660a5dc51	1	Other	Other
+94e28f67-c094-4549-8cfb-bdf99fc0f05f	1	Other	Other
+94e2d375-331d-47b6-976d-c33ce2822e6f	1	Other	Other
+94e3059d-4e7c-4ce6-abcd-90fdf1a5d51a	1	Other	Other
+94e3606f-bdde-48bc-97b7-cd7561e2244e	1	Other	Other
+94e3a817-e877-486e-8c95-9148d8714278	1	Other	Other
+94e3b17a-8ac4-4f51-b01c-da044a1f3355	1	Other	Other
+94e3ec59-5bba-4888-8815-a2b2726d6d3e	1	Other	Other
+94e3f7ea-5e85-4ef2-9861-80614260f346	1	Other	Other
+94e417e1-8c25-4cec-9cf9-b0da8a41fef8	1	Other	Other
+94e426b5-9f4c-4b43-906a-6b26bbc4eb05	1	Other	Other
+94e43065-fde0-49f4-b253-0254defc5225	1	Other	Other
+94e44ca5-9449-4ba1-9eec-efb8a33f4cbe	1	Other	Other
+94e4f73d-2239-4264-8ad6-4e6422e2761f	1	Other	Other
+94e534ea-affc-4756-8828-a9893d8db9b5	1	\N	Other
+94e53e64-b8f7-462f-82e7-f9d7da16514f	1	James	Other
+94e56fa7-c190-434b-b606-a7add55d248b	1	Other	Other
+94e5afc9-4bd0-4843-bcd7-2d549629b1f1	1	Other	Other
+94e60397-da6e-4300-bca5-be79816ab1cf	1	Other	Other
+94e6666e-636d-4288-b302-7acd182b4a8b	1	Other	Other
+94e6681e-795b-4409-a0c8-4a2e7feb0daf	1	Other	Other
+94e6dad3-66f6-440f-844e-f09176fcdeee	1	Other	Other
+94e6eb75-1f6a-4711-b0fa-952b93323d10	1	Other	Other
+94e749ea-ab45-497f-9819-b70df7330d3e	1	Other	Other
+94e89a68-c378-464c-afb5-a5b1eb489d85	1	Other	Other
+94e8c85a-4ae5-4c3b-9508-06e2af1b4876	1	Other	Other
+94e8e007-afbd-420d-83be-b9bbf95b9518	1	Other	Other
+94e8e476-4472-4514-8f87-354854a62eee	1	Other	Other
+94e92655-2649-4561-82a5-395285760c09	1	Other	Other
+94e947bb-bf5c-41c7-814a-5200dcf075e7	1	Other	Other
+94e96904-2948-4c66-93bd-e850d8979f95	1	Other	Other
+94e99271-ad05-49b3-8f50-35c36acd65f9	1	Other	Other
+94e99b37-3577-4b10-9e17-c7630be18f64	1	Other	Other
+94e9bea0-3e88-4962-a94a-6b88b7ee7308	1	Other	Other
+94e9d39d-d2e7-4849-b07f-3ddeaf4e2b78	1	Other	Other
+94e9ec68-6b84-4fd7-8d1c-9d96b3a9b819	1	Other	Other
+94e9fefa-8b88-4076-b0ec-6ad6c04d8b6c	1	Other	Other
+94ea7077-67a1-47eb-9d00-445c621a2fe0	1	\N	Other
+94ea8a77-6bcd-4281-8c90-c4954310f5a4	1	Other	Other
+94eaff6b-93c8-4feb-b09b-0e3b31ff4505	1	Other	Other
+94eb18d0-ab35-4f96-b2d0-300491945390	1	Other	Other
+94eb3eef-e853-466d-a722-be258e30f5ee	1	Other	Other
+94eb6ac2-7e26-4603-a7bf-2543b85b523b	1	Other	Other
+94eb7ef3-5ca4-4be1-9027-0d0f0e5c2d09	1	Other	Other
+94ebad96-95d3-4023-bf84-828db8556efe	1	Other	Other
+94ebae23-e85b-4a4e-8daf-3a9182e793dc	1	Other	Other
+94ebe0c7-6133-4cb4-a3a9-265b121847dc	1	Other	Other
+94ec2452-e113-4dee-9312-e610a4083653	1	Other	Other
+94ec3ceb-3078-47ba-97f4-0d1ba9ca904b	1	Other	Other
+94ec41d5-51f4-4fe8-a977-6ccc51d294f4	1	Other	Other
+94ec666c-fe39-4939-b205-a616733965eb	1	Other	Other
+94ed0360-2b3d-48b1-8151-6ce55f4b4f51	1	Other	Other
+94ed451d-2e51-4484-94fc-0772870ce968	1	Other	Other
+94ed484d-9417-4489-8636-d37842ed057e	1	Other	Other
+94ed6970-29ad-4e8d-995d-cd87ce9a5774	1	Other	Other
+94ed7cf1-e400-4490-aa93-7bbc66efc756	1	Other	Other
+94ed98cd-47e0-4953-b3fe-13e08607a758	1	Other	Other
+94edba44-1f29-4315-b813-efb2d2391d81	1	Other	Other
+94edc419-3a7c-454a-bef6-1488e101877c	1	Other	Other
+94edea18-207c-4b8c-b2cf-754d8a777ff3	1	Other	Other
+94ee0fec-987f-4981-b626-7cc813cf6e42	1	Other	Other
+94ee3357-396f-49e1-9546-b068e0fc7bc5	1	Other	Other
+94ee6faf-3345-429c-8856-505dd2ec8929	1	Other	Other
+94ee740d-a942-4405-9a39-1697307d6884	1	Other	Other
+94eec5fb-0d87-4dcf-b058-c7afe449a0b9	1	James	Other
+94eec840-aa59-41e8-ab25-0de1754e96e2	1	Other	Other
+94eecc29-88d3-4cc3-a2b8-7e939d8f8c94	1	Other	Other
+94eed1eb-bdce-4a72-a621-244e4bd638cb	1	\N	Other
+94eed297-d2c0-433b-be0d-b16e925893e1	1	Other	Other
+94eede9d-e72d-4da9-a024-7ef7e68f9eae	1	Other	Other
+94eee33b-8b01-4f37-9ae3-4824bbd2daa8	1	Other	Other
+94eef0cc-bfff-471b-b1c7-2582ce01dbe8	1	Other	Other
+94ef1073-9042-4a66-9566-b7229b53d484	1	Other	Other
+94ef26f9-f1b5-40f7-a260-47713b90a606	1	Other	Other
+94ef470b-fe21-4802-96a9-ba508e0e09d3	1	Other	Other
+94efbd31-1214-4222-ba0a-f175b360b274	1	\N	Other
+94efe2cf-8a8a-498c-87e3-98fe338fd576	1	Other	Other
+94f04662-c689-44d2-920c-df2bf62b28a5	1	Other	Other
+94f06bc7-ed13-48da-aaf7-fe77f600e853	1	Other	Other
+94f0a896-2365-4fc9-9dd2-ccdc32404a50	1	Other	Other
+94f10873-325b-429a-9b47-752c45f1a198	1	Other	Other
+94f12e1a-fca7-409a-8a2f-3fe4c29e4d77	1	Other	Other
+94f1410e-6aed-4dd0-b383-420c0573e8c4	1	Other	Other
+94f1c549-ed3d-4cf9-af51-d49c2a43343a	1	Other	Other
+94f1dbbd-6bd7-4253-8576-ccda466a7c82	1	Other	Other
+94f1ea61-df9e-4411-a584-245825912706	1	Other	Other
+94f1efe5-a5f3-46c4-b901-c356c68cb0ea	1	Other	Other
+94f22d78-94b0-44df-b111-2b2b4fb27d0a	1	Other	Other
+94f2a084-ff4e-4df0-bfe9-5fcd39a37ccf	1	\N	Other
+94f2b3e9-57f3-4339-a499-23f42ae140ff	1	Other	Other
+94f30837-6b8b-4b9d-8b90-4aa5821945df	1	\N	Other
+94f31418-6293-4220-b08b-64637507f067	1	Other	Other
+94f318d1-1d56-465a-b556-01a9ef5834d5	1	Other	Other
+94f31b1f-daef-4281-b0b9-d3a4f2fbe18b	1	Other	Other
+94f33c6d-75cf-4425-a973-b5f416ab2925	1	James	Other
+94f34dd8-efdb-4935-a8b4-02941339dd84	1	Other	Other
+94f3ff11-c8f0-49c6-8aeb-e3eee31653bc	1	Other	Other
+94f4427c-6dd6-48d3-a2d6-9d275b9c5ff8	1	Other	Other
+94f47065-06b7-4295-9ca6-ddaf9382efa2	1	Other	Other
+94f4aa3c-32d9-4b4d-94fe-ff156175aac3	1	Other	Other
+94f4ad6d-8e18-457b-a5c1-9869e40edbc9	1	Other	Other
+94f4f1bb-b4a2-4032-a94f-c160cf25b288	1	Other	Other
+94f4ffdb-ccd7-44e8-9632-5f0f262b334c	1	\N	Other
+94f569d2-2196-4c6e-a6db-370dacd889d8	1	Other	Other
+94f57063-398b-4e57-9fec-4d9aeb5efd26	1	Other	Other
+94f57495-07a7-45bd-84a8-bee46b55cb18	1	Other	Other
+94f578d7-e1ae-4067-86c0-57eba72a1830	1	Other	Other
+94f63514-7dcb-42bc-ad11-c8907fe69676	1	Other	Other
+94f6642c-e146-4646-8d56-cad20572454e	1	Other	Other
+94f6d78d-828a-4ebb-adda-28143c242a06	1	Other	Other
+94f72971-d2d2-402a-9077-eeb69b3018bb	1	Other	Other
+94f75e9e-1c17-4064-ba65-0a5df5658b93	1	Other	Other
+94f779a6-1f19-40d1-95ea-fedeb83f998a	1	Other	Other
+94f77b40-734b-48fc-a700-95c266166daa	1	Other	Other
+94f77c0c-d11b-401a-afd0-b5632ba3abc7	1	Other	Other
+94f782e1-d7e3-44d0-9dcc-7763acd43466	1	Other	Other
+94f78c05-0f9d-45a3-8cb6-7cd766ac22b0	1	\N	Other
+94f8278a-b832-4e60-87cb-1e3172cc0f3e	1	Other	Other
+94f82e38-a41d-4984-ad3a-e85b19fd5c19	1	Other	Other
+94f83f19-4664-4a6e-86a3-2306fab5a70b	1	Other	Other
+94f8a12a-ee26-4237-a8f4-7b01e75c6d14	1	Other	Other
+94f91f6c-2c3a-4352-8040-771527002277	1	Other	Other
+94f9573c-b6b6-49a9-bf91-82e3f3f6dc68	1	Other	Other
+94f9d1a9-028a-487b-a5f0-28e775055abb	1	Other	Other
+94f9ee80-8253-4fc9-b967-97c10f7e1d65	1	Other	Other
+94fa2213-9b73-4a55-a426-13f94d9ee000	1	Other	Other
+94fa24ab-f03e-41a8-8b2b-66a676261836	1	Other	Other
+94fa35a5-b83f-4262-a67a-8ab92b7a366f	1	Other	Other
+94fa41bf-a21f-48a2-b523-71730814c55a	1	Other	Other
+94fa6f2d-bfa6-4ed6-b89f-5fcfb618e60b	1	Other	Other
+94fad313-2d6a-489f-9375-883756ae55d1	1	Other	Other
+94fae96b-2883-4e64-9822-02d347cb87ec	1	Other	Other
+94fb345d-265f-4bb0-8a5a-d6c109cd74ce	1	Other	Other
+94fb697e-9246-40a8-9cad-6d980e178058	1	Other	Other
+94fbbfa7-94a3-431c-85a7-6275010b5843	1	Other	Other
+94fc0a10-e069-4f86-a77e-6e51d62158ee	1	Other	Other
+94fc17f9-a404-4efd-9a07-02f0f1665b24	1	Other	Other
+94fc3f37-83f6-42cb-b2f4-58bbeb8816e6	1	Other	Other
+94fca4b8-d9f9-47ed-ab80-e6118a9a2f55	1	\N	Other
+94fcb6dd-e36b-4628-9e03-a7c048e4989c	1	Other	Other
+94fce22a-2a79-4e2c-b130-66f64ab4c69a	1	Other	Other
+94fdb9ee-922a-4fcf-832f-813d20e5f305	1	Other	Other
+94fdc76e-6671-4307-8daf-dc24ec5917f0	1	Other	Other
+94fe5f34-0f83-4288-88ba-fa0c0c55648c	1	Other	Other
+94fe83ba-a298-40f2-85a5-17f168a51a1d	1	Other	Other
+94fe8dd1-31c2-4672-b971-04d8dc9d3ce8	1	Other	Other
+94fecc75-b92a-46e3-9642-3cbfdd81a9a7	1	Other	Other
+94fef257-0b37-499b-9bb9-50901dd1668b	1	Other	Other
+94fef5d9-8348-48f0-a66a-09201edf1cfe	1	Other	Other
+94ff4595-4910-41b4-9932-aceda0f5ce92	1	Other	Other
+94ff7546-53dc-4335-a524-adec67dc5855	1	Other	Other
+94ff838a-0ac2-4e80-be5b-e35ceec8db40	1	Other	Other
+94ff8c59-7e87-448d-ab04-a24e7bb392e2	1	Other	Other
+94ffce8d-e490-4ab9-b4dd-6601d28850c8	1	Other	Other
+94ffd0e0-3bd2-4256-ba8b-f32faeac375c	1	Other	Other
+94ffd93c-4b17-442b-a93a-746a851b298e	1	Other	Other
+94ffdc9b-7b4f-4c40-aa25-f719df145d61	1	Other	Other
+9500341e-da15-4558-8e54-cf137d839269	1	Other	Other
+95006bae-5a27-4619-934f-60f38b7b3794	1	Other	Other
+9500dde6-d140-472a-bb34-900b838d24fe	1	Other	Other
+9501397e-f4d8-438a-931b-f832385bea40	1	Other	Other
+95014080-d6f4-4772-a492-82f874faadd4	1	Other	Other
+95024b35-090e-4f25-b0ac-97a22dfe4f76	1	Other	Other
+9502b6bc-e328-42de-a481-b026bc8d84b2	1	Other	Other
+9502dd57-4121-4111-a2e7-a634f7706b59	1	Other	Other
+9502f889-7932-4886-abd9-93f2f1a5fb6e	1	Other	Other
+9502fd92-6eb2-438d-9e14-53a574e51cd8	1	Other	Other
+950306f2-ba1a-44a4-af35-f5698aeb3b52	1	Other	Other
+95033db4-e110-4c23-8ad0-295e34f9cbee	1	Other	Other
+95039440-3e81-4275-8341-7848719ff844	1	Other	Other
+950396eb-87cd-48ea-a9a8-6ffc28c2aa44	1	Other	Other
+95041183-5aee-4c31-9eb3-9795660c0c48	1	Other	Other
+9504928a-9206-45ab-99d6-5217e6b29b3b	1	\N	Other
+95049b4c-c20a-43da-b04d-da220572540c	1	Other	Other
+950549bd-6030-4f1a-9f8c-fda6eed56637	1	Other	Other
+9505545c-0815-490d-a650-274c3c8ce1b7	1	Other	Other
+950570eb-55f7-4516-a8cd-bab3d6346a11	1	Other	Other
+950583dd-be2b-434e-b78b-3d91d19fd0c2	1	Other	Other
+95059730-d698-4c3b-9022-7b390b067fc3	1	Other	Other
+9505d843-8261-4b71-9656-4d0d78a0712f	1	Other	Other
+950605ee-c6ee-47de-8543-5616b784fae3	1	Other	Other
+95060943-5f0d-4b27-9f92-d7d9c4855d04	1	Other	Other
+95066282-d50e-4cb5-a39c-36a5c5ac39e1	1	Other	Other
+9506ab06-bc06-4db9-ad07-ce8cd184a3d5	1	Other	Other
+95075ccb-8df0-4af9-a9d5-bf9e3c554b2d	1	Other	Other
+9507c64b-f880-4709-9e83-722a7496e282	1	Other	Other
+9508968c-0865-46c3-809e-8db843939c04	1	Other	Other
+95093493-1d65-4d52-af35-74ab272546d9	1	Other	Other
+95093948-3d49-4419-b29b-591742cf5c91	1	Other	Other
+950957d2-85a7-401a-97db-e3ba37f51ff5	1	Other	Other
+95095a63-6407-4ac9-bf27-f87569e09471	1	Other	Other
+9509cc36-cfb8-40bb-a57f-c6e4444a57ce	1	\N	Other
+9509f9bf-444b-4536-801d-bbd4e126e552	1	Other	Other
+950a111b-fb36-4b78-a9bc-7b2409d05e54	1	\N	Other
+950acac8-a311-4e78-b19e-9de9af7ae3a1	1	Other	Other
+950ae2be-bb68-42a2-9b46-86dda1651388	1	Other	Other
+950b037f-6807-4a71-8382-91ee73b788dc	1	Other	Other
+950b170a-0c38-46b1-80a2-b6b5b3ee274c	1	Other	Other
+950b62cf-345d-4f19-a353-f94fcf8673b8	1	Other	Other
+950c14b4-42b5-49c9-a135-50eb2d64eb79	1	Other	Other
+950c2337-4a86-45c3-824a-37427ebd8a64	1	Other	Other
+950c4b35-4908-4db9-8a3f-a46f11ce904b	1	Other	Other
+950c529b-c8d3-4d61-9181-64f35c4c679f	1	Other	Other
+950c7c2e-fe6a-46f9-800e-2092a3e33822	1	Other	Other
+950ce56a-1910-4aca-893d-c5a301090be6	1	Other	Other
+950d3064-89c6-48d7-9ecf-6e86e5b5d8db	1	Other	Other
+950d5826-3197-49e9-885f-df4e6c17a224	1	Other	Other
+950d724a-827a-458c-95cc-18298f2ffc6e	1	Other	Other
+950d97fe-861b-4c59-97c0-047d60f7b744	1	Other	Other
+950d9acd-7225-4d1c-bb10-3680fb979c97	1	Other	Other
+950d9d6b-ece1-4fbe-8941-1d00972a33ec	1	Other	Other
+950dc1a9-90ed-493a-869e-d833584c9232	1	Other	Other
+950ea119-8bb7-4f8b-a54c-96f8161dc4bd	1	Other	Other
+950eb143-da6e-4bba-a193-4d4e1d788d9e	1	Other	Other
+950f352b-b23c-48ee-97f5-746c1cdc1d45	1	Other	Other
+950f658f-cc39-4eb7-927e-fc33e30e60eb	1	Other	Other
+950f65dd-03c2-4b56-9af6-4a4fac968de2	1	Other	Other
+950f6910-f01d-4071-b662-362186101ab6	1	Other	Other
+950f88a8-7a7a-4c0b-b6f6-101d180995cf	1	Other	Other
+950fccdf-ba44-4364-990a-88a7e4704b36	1	Other	Other
+950fcd79-71a3-4eae-b07d-d5fc579151a9	1	Other	Other
+950fdc1e-96c8-4c21-b070-42ea41b64ab2	1	Other	Other
+950fe08b-421c-46cb-84bd-cf351d05f7f1	1	Other	Other
+950fec8d-b9ab-483d-bf6b-eea7e0af4425	1	James	Other
+95100564-9507-4ebd-83c3-3101c6b1ced4	1	Other	Other
+9510a15a-9cb8-41a9-aee3-c5bd2cecf62d	1	Other	Other
+9510a9ae-4b2e-4ae4-a8e8-7ef18b48cddd	1	Other	Other
+9510b1da-dc8d-4abf-830c-8dd1bc08e5a8	1	Other	Other
+9510db57-abc8-45a1-a8c3-3a95d4c113eb	1	Other	Other
+951119c1-048e-4ebf-9cfe-4d115c1151fd	1	Other	Other
+9511391b-ec74-4740-bb64-a168ce80bbd5	1	Other	Other
+9511448a-b9ab-4422-bb96-8e56487bc283	1	Other	Other
+9511d840-bb03-40db-a254-429356aea6b7	1	Other	Other
+9511fa22-6565-4338-b9a1-f1679366cecc	1	Other	Other
+9511fa2e-3638-4184-a7d8-ea61fa9e1454	1	Other	Other
+951262e6-3eaf-45e9-85ce-b5225f393fc3	1	Other	Other
+9512d936-abca-4160-aca8-5afcba83ebdf	1	Other	Other
+9512db96-5a68-46f5-b812-9785bc5c907e	1	Other	Other
+9512f97d-5f87-4b14-b808-216450b0fb17	1	Other	Other
+9513065e-a6e2-4c23-8eca-c657ab17715a	1	Other	Other
+95130da6-1c94-4a33-bf62-11033c8af6ed	1	Other	Other
+9513494a-a9e8-498d-87ef-139faeb8253b	1	Other	Other
+95138add-5164-453e-8e80-386f10c62c56	1	Other	Other
+9513c25c-5c0b-42b9-b5b1-d580b7721886	1	Other	Other
+9513cb7e-a113-4ea6-816b-a17dbd0be9f7	1	James	Other
+9513e6c8-f768-4441-a143-2d15b8c07f62	1	Other	Other
+95145068-b229-4758-b2d4-610f0480500b	1	\N	Other
+9514524a-53b4-4958-a30b-09b9042a4022	1	Other	Other
+951464ed-4eac-4426-b946-5fa5c97f4fe5	1	Other	Other
+9514745f-ba9c-44d7-ab2e-62eaf1f8c928	1	Other	Other
+9514c1b4-03d5-4055-81fc-40014b1da9aa	1	Other	Other
+951506cc-2ce5-4ffd-81f6-7429645fbc73	1	Other	Other
+9515204e-3e89-4d0e-9230-fad06e5cd2be	1	Other	Other
+95153678-0bee-4d66-b900-65ed2fe66037	1	Other	Other
+951548ab-4833-4fe5-a451-cbe2aca6dae8	1	Other	Other
+951560f3-537b-4849-84b6-4102d119662c	1	Other	Other
+951584cf-3d7e-4faf-a840-a25ebac46667	1	Other	Other
+95159ac7-5b47-4aac-8c26-10a32abc4659	1	Other	Other
+9515b982-2900-4f7c-b66d-2253fc304619	1	\N	Other
+951603e7-2e06-4787-bd9c-745560643e59	1	Other	Other
+9516878a-e8c5-40b8-b8e3-445b936d4176	1	Other	Other
+95168d5e-c425-4f40-9047-07b417c04e7d	1	Other	Other
+9516af61-11f9-4f7a-9f81-ac7b0e77cf84	1	Other	Other
+9516cf8a-6708-4608-9323-220106ebe0f5	1	Other	Other
+95171fe0-a759-4a92-a90f-36b4e66c20b7	1	Other	Other
+951809bf-8ba2-4af4-9e29-c0f1fba2802f	1	Other	Other
+95186ad1-ccbe-43a5-afa0-636940f2543b	1	Other	Other
+9518945e-2371-4c73-8401-ca6365536dd6	1	Other	Other
+9518a361-b66e-4502-b6af-6a51a8021949	1	Other	Other
+9518bf96-24dd-407b-985e-23193b10b291	1	Other	Other
+9518f06c-4448-4c4b-98a8-cf70328a8ef8	1	Other	Other
+951931e2-3775-44ae-8c3c-8464209d4092	1	Other	Other
+951942a3-e315-4bcf-8bef-9d0a3e55f515	1	Other	Other
+951953f1-680d-44b7-a29c-2125dc14bab9	1	Other	Other
+95199bd2-b501-4f14-ae72-51a0392b31e3	1	Other	Other
+9519eee0-70bf-43f1-8553-751355837f76	1	Other	Other
+951a11f4-ef40-430d-ba56-9d7ed617be87	1	Other	Other
+951a1d9d-b731-4509-85e4-44d0d6885642	1	Other	Other
+951a32ba-5f9f-40bd-8708-91811fdcfd0a	1	Other	Other
+951a6dc1-6ecd-459c-abf7-1aa94c3beab8	1	Other	Other
+951a9aff-0637-43b6-bba5-589242e6fb32	1	Other	Other
+951aa38c-b4f5-41cd-9ddf-2a820062704c	1	Other	Other
+951aa648-3981-4501-a099-a18d1755894e	1	Other	Other
+951ac2c5-bd35-4aab-80f4-40b30281c42d	1	Other	Other
+951af0e7-8067-4f73-96d0-87a2ac7a479c	1	Other	Other
+951b88fd-bd87-43e4-83ad-dc71bd7e22d2	1	\N	Other
+951bbdff-05a4-4b0c-97f2-8aca82101081	1	Other	Other
+951bd614-2099-4579-9a7d-6b3975173a13	1	Other	Other
+951bf749-6019-48aa-9ff1-435f2e8331c6	1	Other	Other
+951c0cef-fc9a-47e8-8a60-37336383c409	1	Other	Other
+951c171a-221c-4c35-bd1b-2e7e88deb7eb	1	Other	Other
+951c7a56-ab32-44e6-9d04-b49d2b3cc99e	1	\N	Other
+951cb6ad-9409-471d-a639-57f85f7f7444	1	Other	Other
+951cc526-4f22-4c7f-a825-dea214a8acd0	1	Other	Other
+951d2c54-852a-45a3-9c94-ff8a17ecc14d	1	Other	Other
+951d42c4-3ffd-49df-8127-999555b0f070	1	Other	Other
+951d4771-855e-4b8b-8b69-382210440cf3	1	Other	Other
+951d7c75-a922-400d-9167-3dd891eb7e11	1	Other	Other
+951d8cc6-e9da-4cfe-bf6e-2b1d39ea8879	1	Other	Other
+951dcf11-02d4-4529-872f-1c9469091daf	1	Other	Other
+951e082f-5310-4e3c-b783-dcde41efbd99	1	Other	Other
+951e3085-6148-4fd4-b99a-852b92bcb5c1	1	Other	Other
+951e37b9-c994-4f02-ba4e-315ea155be7e	1	Other	Other
+951e38c6-10e8-4ffd-85f9-76e472340451	1	Other	Other
+951e5d1c-295b-4692-b018-24bc582123b0	1	Other	Other
+951ed2c7-d511-427c-89db-84a0fae22b4d	1	\N	Other
+951f9eb3-93d5-4bc6-8c8a-b9c506f9586e	1	\N	Other
+951fe4dd-6b42-4609-aed0-55133c52f5b0	1	Other	Other
+9520375f-05f7-4f57-b818-3a7f375b90e0	1	Other	Other
+95204bde-a449-48d5-be9b-ca3f2e37c0bb	1	Other	Other
+952081af-b513-4486-9bb6-83fc83b7bd39	1	Other	Other
+9520e54d-26fd-448f-a319-c5f9553231d5	1	Other	Other
+95211e48-a160-4068-80b3-6fc6379c0177	1	Other	Other
+95215ace-cc73-42dc-a20b-1bd59c910dff	1	Other	Other
+95215ce5-581d-4300-9004-81c7a404c4ba	1	Other	Other
+9521aa1d-de77-4815-a0cc-8dcfaf1b8e2a	1	\N	Other
+9521dffd-585e-4270-86de-a893b2811a53	1	Other	Other
+9521f7e6-6907-40eb-a8c6-a7a6015a90df	1	Other	Other
+95226e82-5938-42ed-a39b-56c944d56620	1	Other	Other
+95229c0e-4e4d-46a2-b8cd-e5e1fdd95524	1	Other	Other
+9522d812-479b-458f-bb4e-ae94da94b449	1	Other	Other
+9522ebbe-93b5-478d-b868-b4a9699777a5	1	\N	Other
+952312b7-15eb-4a58-be4b-417ba97607f7	1	Other	Other
+952323fc-397e-4831-8239-82439c93adb9	1	Other	Other
+952343c7-a96b-48a0-a22a-2092e4d6cb12	1	Other	Other
+95235c18-a277-4d57-8dc4-492ca86e8aaf	1	Other	Other
+95236cb9-e8ff-4679-9138-f449e61a176c	1	Other	Other
+95237ee4-bc46-49bc-be08-9d59a5e46edf	1	Other	Other
+9523d87e-85aa-44df-a830-9d775abe6311	1	Other	Other
+952414cb-a6d2-435f-99b9-edcf58069f17	1	Other	Other
+952422f7-bc81-47f2-83ad-3920a69b48c3	1	Other	Other
+9524414c-c3ba-4909-8f17-66530bb5f508	1	Other	Other
+9524a853-601b-4134-ae4b-2591a9a63234	1	Other	Other
+9524e48b-afb5-486c-bc76-604229246c01	1	Other	Other
+952539fc-36ad-4ab2-b752-00adf6b13015	1	Other	Other
+95254185-e87c-41cd-b1a4-8d22d5352f4c	1	Other	Other
+95258a6d-e53b-4759-9a1a-01851b84db05	1	Other	Other
+95259dd9-28b4-4456-a1c2-b7cb235368f4	1	Other	Other
+9525ae60-ba90-4c3b-a34d-65efdfcd6d77	1	Other	Other
+9526150a-de62-4788-bb42-8aa01cae526d	1	Other	Other
+9526526e-e725-46ae-85d9-4518cc71f0a5	1	Other	Other
+95265a58-37cb-4a54-ac09-f74d7563cf83	1	Other	Other
+952691d3-46c0-4c80-8312-3f226300b119	1	Other	Other
+95269cef-ba5d-4510-954a-724a7dce24d5	1	Other	Other
+9526b1f4-2992-4d70-9a72-46335c7d92a9	1	Other	Other
+95270ae6-c61f-4e3d-a9b5-07797371a943	1	Other	Other
+9527650b-2499-4690-8f64-a0beda0f5168	1	Other	Other
+95279ffb-1e74-46a4-9204-f55c39a9ae51	1	Other	Other
+9527c15d-b0e1-4b93-84b9-bbeff8d67ee6	1	\N	Other
+9527d06d-a3c7-4583-b88c-78b0cfd75c23	1	Other	Other
+9527e83b-e072-402c-a083-63f4cef8235b	1	James	Other
+95284d4c-0e1d-4dee-8ec3-a148712f4079	1	Other	Other
+95287930-8786-4a94-8815-b87a9a097f70	1	Other	Other
+95288136-8073-43a4-91a6-6a1f303b5d0e	1	Other	Other
+95288d45-cbad-4615-83cd-48b230667460	1	Other	Other
+9528fdee-eda3-4556-9960-078c41689dc7	1	Other	Other
+95290905-f880-4ed4-8a06-de1e720128c5	1	Other	Other
+95294fac-b942-4d8c-9a21-3b69ac8ca81f	1	Other	Other
+9529ea06-c698-4dbf-9287-c1a0cf476e55	1	Other	Other
+952a09e2-ac47-4793-86ad-c8a79862e208	1	Other	Other
+952a3473-448d-493b-9ef0-4f410c34fad4	1	Other	Other
+952af5eb-6287-41da-9dea-2690e860d454	1	Other	Other
+952b0ea8-2687-45af-bb95-be92023a4f0d	1	Other	Other
+952b1b4a-933a-4aeb-958e-c32bc453c2b3	1	Other	Other
+952b5744-0659-4e74-aaed-fa2e0432b221	1	Other	Other
+952b9e39-c3d5-4e85-ae66-c6cd9771aeff	1	Other	Other
+952bac9d-782e-461f-a273-490e58ab4391	1	Other	Other
+952baed2-b4c2-416c-9b7c-cfbc7791be40	1	Other	Other
+952bccb2-16e7-11e8-8086-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+952be87b-f36d-4fde-8713-036e69ede67f	1	\N	Other
+952c1e77-9353-4cf4-baa2-b1659cac399c	1	Other	Other
+952c34be-f3c1-4498-b6aa-6d63e2f0c75a	1	Other	Other
+952c4496-ef08-43b1-9873-641b691b14a3	1	Other	Other
+952c54b2-3992-4252-a979-06e09814e182	1	Other	Other
+952cae48-dfdf-4597-b1da-49a6af4cf5ad	1	Other	Other
+952cf09c-9554-44d6-bc44-717ec384f002	1	Other	Other
+952d1488-99fb-4bbc-ab71-2b94519a02a9	1	Other	Other
+952d14cd-6188-4003-9dfe-1ac5bbe2fb93	1	Other	Other
+952d1f2d-1f46-4941-a88b-ae66a4715422	1	Other	Other
+952d953d-82de-4e52-84f2-aed9808ebde5	1	Other	Other
+952dc112-00a6-4cd1-a1ef-6d20e408e1c8	1	Other	Other
+952e1317-52c2-4a53-8361-cf72fbc4b936	1	Other	Other
+952e7429-319a-4882-a00d-f9368b49808b	1	Other	Other
+952ebbbb-0f68-4677-b796-a666d490ded9	1	Other	Other
+952ed12c-57c6-4e12-98d8-b0a0a7ef4e3d	1	Other	Other
+952ed82a-c3c9-4268-992e-e379cd72fd46	1	Other	Other
+952f0378-ba66-4766-8c4e-79ddde41ef16	1	Other	Other
+952f04d2-f151-441e-8c21-736061dc1578	1	Other	Other
+952faa3f-2eea-4b53-9892-a944c15a4c6d	1	\N	Other
+952feb67-3b45-4a8d-abb7-e9114e03e574	1	Other	Other
+95304258-0454-4bac-b198-a87b60789746	1	Other	Other
+95307671-5d3c-4c08-9f6b-8aa4743f817e	1	Other	Other
+9530815b-7153-495c-9087-14fc6f690c22	1	Other	Other
+95309021-883d-468f-972b-83c086f40816	1	Other	Other
+9530be4f-a350-4ce4-aa7a-ef0d3e694e7e	1	Other	Other
+95312bdf-e005-4cda-8774-4d0c6d5cf07b	1	Other	Other
+9531306c-9070-4b8f-89d1-551adb3abaa2	1	Other	Other
+9531a004-75b9-4bed-8fcd-999149bccead	1	Other	Other
+9531d5ca-c96b-4aa9-afd5-f6218a61523c	1	Other	Other
+9531f83c-37e9-48bc-a7d4-ac2bdf86e70d	1	Other	Other
+953207a2-6ced-4328-9c76-212a5bd5c543	1	Other	Other
+953239e1-d22c-42ba-8af3-357e28c44e07	1	Other	Other
+9532740e-6b5f-492a-9395-cac23bea2014	1	Other	Other
+9532aa46-076c-4551-9a7b-bc197cd8613f	1	Other	Other
+9532ecfb-38e6-462f-84a9-a7ea6cf0906f	1	Other	Other
+9533be7d-1c38-43fd-a7dc-be0ef5599ed2	1	Other	Other
+953474fc-2c56-4a51-858d-834936adb21c	1	Other	Other
+95349135-4265-4a75-819b-7457266628ab	1	Other	Other
+9534cabb-f5bf-4739-a381-15ab0262e582	1	Other	Other
+953531fd-ee30-4f01-97b0-073270cad89c	1	Other	Other
+953535ac-24b3-4486-a06b-ebb2d2550b3b	1	Other	Other
+95354cec-8bd4-40c5-b879-b5a724e3745e	1	Other	Other
+95356c45-6583-4cff-b39a-749be10164d9	1	Other	Other
+9535934f-8aed-44af-a667-091628b08be4	1	\N	Other
+9535b159-a2e0-4f7b-a298-e509226053c9	1	Other	Other
+9535bd5f-932e-4c06-890d-017ee19b492f	1	Other	Other
+9535eb95-ef35-4841-b803-b6f24bc118cb	1	Other	Other
+953607d7-4b85-4d20-82aa-6482df76344d	1	Other	Other
+95364218-bf1c-4e5f-97b5-23086a297853	1	Other	Other
+95364464-fb9d-4658-b20c-8a76ef4b106a	1	Other	Other
+953663fb-2b3c-438e-bf55-2e79324b4838	1	Other	Other
+95366524-609e-470f-bede-e0d2de62b136	1	Other	Other
+953667ec-a6a2-4102-883d-c613d6539420	1	Other	Other
+953675aa-0974-49ed-b517-50314a112d96	1	Other	Other
+9537583a-63c7-44fb-af59-b9cf22b6d155	1	Other	Other
+95377d5f-8ca9-4237-bc2a-80db7840cbb0	1	Other	Other
+95379509-bb65-4e8f-b1d5-696df75b3b2d	1	Other	Other
+95386be2-d4d7-4c52-b7aa-fa85c91efa31	1	Other	Other
+9538b841-1587-46cd-be19-f369d436553b	1	Other	Other
+9538d8dd-8eb4-471f-b93f-71fd8dec113f	1	Other	Other
+953968c3-2227-4914-a6e6-72f5a1a80977	1	Other	Other
+9539a482-f9a0-4416-ad45-342f6c7f00ee	1	Other	Other
+9539a8f7-4b11-48bf-bfb0-1bce89bd4700	1	Other	Other
+9539d491-35fa-4e16-9a1a-d3f651f0adcd	1	Other	Other
+9539d9fb-d9e6-4ded-90f5-38124740fe35	1	Other	Other
+9539e4dd-ebd7-40cd-9caa-1e438d812592	1	Other	Other
+953a8802-0d37-42a6-8134-124f6bde3b13	1	Other	Other
+953aa3a1-b671-47fb-a7c8-3472b86128df	1	Other	Other
+953ac0ae-d46c-4989-b838-30d4231ab34d	1	Other	Other
+953afb64-438a-4b7f-88e2-521348a6885b	1	Other	Other
+953b0eb4-6540-4c16-aa16-cc7d8b3ab1ac	1	Other	Other
+953b80d5-5201-40b3-ba9f-0219946ed87d	1	Other	Other
+953bc4eb-e94f-48a5-8f2e-48f5eb9d4829	1	Other	Other
+953c1289-1ba0-4b58-a02c-699d4a001231	1	Other	Other
+953c1886-69e8-4460-b234-f7ff7c7f40af	1	Other	Other
+953c1995-c4ab-4ea5-99a7-73ccb72f82f4	1	Other	Other
+953c306d-0dde-481c-a0b8-008159e8f412	1	Other	Other
+953cba10-42ca-4287-9f52-3ac13e0b4d74	1	Other	Other
+953d1431-8ee0-4d69-a866-710bdd95e19c	1	Other	Other
+953d1aac-e23f-4baa-89e1-843b7f3322b3	1	Other	Other
+953d52df-6bdb-49d7-a401-ac1440e37246	1	Other	Other
+953d8562-82ca-4245-abf4-a6491e36546b	1	Other	Other
+953da747-afb7-44dc-a115-7b68e13395c9	1	Other	Other
+953db436-1cd8-4de7-ab9c-08bd0a55df09	1	Other	Other
+953dbb68-055c-4d72-b31e-cebc7c502ee4	1	Other	Other
+953dc89d-5381-4860-90ac-3047803bfe67	1	Other	Other
+953e0908-a357-4761-ba4a-b9f54c40d66f	1	\N	Other
+953e1317-1909-4478-8934-621bffa6bb27	1	Other	Other
+953e521b-b20f-460d-86bd-20c2c55b364f	1	Other	Other
+953e8736-d151-4bda-9ac5-c4181870fde9	1	Other	Other
+953ed8b1-d000-49e1-914b-4b9815a93856	1	Other	Other
+953f20d2-d211-4c59-ae7b-d19dbe90fa5d	1	Other	Other
+953f2f73-f1ab-469b-abba-b494c542b6da	1	\N	Other
+953f6de6-a8d3-4617-b332-f19e4e4a70a2	1	Other	Other
+953fc1ee-d371-4eac-85be-dd2662a1b5eb	1	\N	Other
+953fea66-5a2e-4dd4-8a8c-28d5927c6537	1	Other	Other
+95402b05-caf2-483a-acd7-23fbc2599cac	1	Other	Other
+9540bea1-b7dd-40be-86a5-6fa7b9a43430	1	Other	Other
+9540c3df-38e6-4117-abfd-8afbf449b0e7	1	Other	Other
+9540c720-7ea1-409e-b432-343a04d7000d	1	Other	Other
+95414420-8dec-4b6e-bab6-30bfbe65cbe9	1	\N	Other
+95416845-3867-44fc-9595-d7dc18083348	1	Other	Other
+954186a5-3496-4dc3-8be6-bb8f68c321ae	1	Other	Other
+9541a146-0afd-41f7-8ebc-db553fe6c42a	1	Other	Other
+9541b3e1-d245-49a5-9acb-f6f5eb0f40c7	1	Other	Other
+9541e3b9-928c-4c92-868b-aa22b6f0eee0	1	Other	Other
+95421801-9cf5-482d-99f1-c98a352006c6	1	Other	Other
+9542a985-d0bb-4818-bff6-287c14324c30	1	Other	Other
+95433897-0b29-478f-b214-347852b78dc6	1	Other	Other
+95433d33-3150-4311-b4fd-ebcadee5cff5	1	Other	Other
+9543d3b8-d342-4884-a5b3-72173b536fe3	1	Other	Other
+9543f7ba-3523-4801-b7c0-a267d28b1e00	1	Other	Other
+95448f5f-391f-4a33-924b-f0c4213ed015	1	Other	Other
+9544c573-c4d5-4eff-8a05-54feebec4b6a	1	Other	Other
+9544fee8-2eb5-4a7b-b0fc-676114430153	1	Other	Other
+954544f9-aca2-4974-9924-282cf4991d40	1	Other	Other
+95455e02-b54b-46db-bc44-95a2fe8a213f	1	Other	Other
+9545b779-11ad-4a68-a21d-8801d3d1d52c	1	Other	Other
+954619e1-2a78-4ea5-a6dc-5668ed3bca7d	1	Other	Other
+95462754-9b5b-4a9b-9246-f81bd4ac8342	1	Other	Other
+95462c47-d62d-4f68-a95d-069ae27a3215	1	Other	Other
+9546352e-a6bd-4b97-913c-d230c5d399b0	1	Other	Other
+95463967-4077-4b48-bff0-4c75a481b3a6	1	Other	Other
+95464086-b520-463d-b19d-23acb942da5a	1	Other	Other
+95464a7f-77a6-4899-a417-83761c2953da	1	Other	Other
+95466b83-4f57-485f-83c2-d851f367fb53	1	Other	Other
+9546754b-126c-4048-a4ce-823b78a68948	1	Other	Other
+95469fe8-3e4b-4ae4-a67d-e7a65d59e0d5	1	Other	Other
+9546fdc0-9b01-4099-a848-0b0f5d76d0b6	1	Other	Other
+95471065-1c8e-4982-9deb-37504cd97f46	1	Other	Other
+95475685-a7b1-4819-a393-623f498e3c27	1	Other	Other
+95478219-d105-4c7b-b32d-970880b4b9ce	1	Other	Other
+95479be8-7b2e-45c9-be16-2f051e656d4a	1	Other	Other
+9548362d-6ef5-495a-bfe7-d83416ff4983	1	Other	Other
+95484b09-8f4c-44ec-ae8e-cae770987060	1	Other	Other
+95487df7-dc42-4665-b9e9-d6d1a83cf0bf	1	Other	Other
+9548b592-44af-4b35-b91e-64281949da3a	1	Other	Other
+9548cc73-592d-48bb-892c-71148f7a281e	1	Other	Other
+95490f3a-7da4-4b84-acd8-3f90993915d0	1	Other	Other
+95496c04-dffd-48f7-a0ad-1ba00da16829	1	Other	Other
+95498261-25f8-44f2-9f61-6312eac69a5f	1	Other	Other
+95498506-a0d1-4863-a56d-ddbdbb45da4f	1	Other	Other
+954985ce-716d-430b-8014-1b4ee93f0def	1	Other	Other
+9549891a-aa60-4613-b98b-c45a6d57165f	1	Other	Other
+95499ee3-7559-40db-8a0b-520e5b7cc08c	1	Other	Other
+9549c2e3-a45c-4082-be79-786d2ff8d550	1	Other	Other
+954a356a-9486-4725-8f02-16e8ab6c6d2b	1	Other	Other
+954a414e-3253-42be-a88d-dc57a6d656fe	1	Other	Other
+954a60db-4957-41ba-aa7f-e77b6fc25a41	1	Other	Other
+954a75b5-fd36-47e7-95a2-3f003d88e9e3	1	Other	Other
+954a9359-2e36-4f06-a2a6-e919dc75a4d3	1	Other	Other
+954ab43d-3b14-4f0d-bec1-67c8c926f52f	1	Other	Other
+954acb5a-aa0d-42c0-9f57-9f8fe6adc1d9	1	Other	Other
+954ae1af-9f4f-4c85-83b0-6996c0e7589d	1	Other	Other
+954afc30-bdd8-42a7-841c-c96f5f67eabd	1	\N	Other
+954b6bce-e021-4877-a3f2-77b77065f9ee	1	James	Other
+954b891d-8be3-4a1d-806e-2fe24efb49e9	1	\N	Other
+954bb1c0-4bdc-4e67-bd75-8bf48f40b4f6	1	Other	Other
+954be74d-546c-46e8-900b-db419d2aaeea	1	Other	Other
+954c126a-3e41-4241-be26-e190f382d964	1	Other	Other
+954c45cb-b0fe-4e40-a533-e6c91995dd0e	1	Other	Other
+954c92fb-622d-43bd-b43a-d57bf7ac4f72	1	Other	Other
+954cda3d-2dc9-4ded-941b-ba8e9a2c50e2	1	Other	Other
+954ce62b-7b1c-44f0-9fd4-510fc9b65110	1	Other	Other
+954d18c5-f59d-493e-8a0b-309bd68062a6	1	Other	Other
+954d29d0-d964-4b3a-ae29-e01b5003f6a1	1	Other	Other
+954d2fb9-92ad-425e-87be-0d5c35b06816	1	Other	Other
+954d30e3-9d9f-413d-a874-abb8eab6ac4a	1	Other	Other
+954d63fc-25e0-4c76-93f7-3304313b3533	1	Other	Other
+954d68d7-c221-43b1-88cf-9faee39e619a	1	Other	Other
+954dc8a8-bdfa-4f03-b370-1afc7e5cb52b	1	Other	Other
+954de5c5-3134-4ca3-830a-4b4414943ff8	1	Other	Other
+954e11a6-c96f-42da-9a8a-be51a69f56de	1	Other	Other
+954e4fbc-401c-464c-99cd-e1c374b096c4	1	Other	Other
+954e5b78-ff84-473e-92e2-2dc89715fd99	1	Other	Other
+954e8c1f-9863-4335-8588-6faab805367c	1	Other	Other
+954eb063-5163-427d-8708-1f481fc94135	1	Other	Other
+954edd69-be48-40de-b286-4f67b2db6d0e	1	Other	Other
+954ee309-0c70-4da0-9049-315416d48976	1	Other	Other
+954f5269-33cd-49ba-b8ac-bdd5f9444f39	1	Other	Other
+954f54d4-3004-4742-9a4b-0cada48e0638	1	Other	Other
+954fb24a-8d91-4fdd-bf8d-7f99d4a2c58c	1	Other	Other
+954fb3cb-9bb8-48d6-a4ca-6e9a07c821b9	1	Other	Other
+954fd801-ef68-49ff-87fe-efda49d3a86b	1	Other	Other
+954ff531-d8cc-4e5d-8b9e-b35256723e78	1	Other	Other
+95507149-1896-4efd-b28b-0b665a328e86	1	Other	Other
+95510fa7-7a10-4d6f-9fe5-adcd53108fad	1	Other	Other
+95513528-4445-415b-8fc3-35a6531e84e1	1	Other	Other
+9551a295-1858-422f-867f-c4840b3fd81f	1	Other	Other
+9551c779-56bb-46ec-a7d8-7b998e3ccb59	1	Other	Other
+9551ca32-8d36-4b38-b80b-1b746e681b8b	1	Other	Other
+9551dc1a-b1e1-42b5-97a4-e3597f889940	1	Other	Other
+9551ddde-bb4d-44b9-9b91-ffd56f9a4691	1	Other	Other
+9551f34c-3c24-4b89-8bfe-f21c6a8623a0	1	Other	Other
+955202b7-187f-4d8f-9e5e-81960694f62a	1	Other	Other
+95523579-2351-48dd-9add-20a8912d7522	1	Other	Other
+95529066-249a-41a3-90c6-157e2d922233	1	\N	Other
+955292ef-3701-4ebc-99b7-36673ac584df	1	Other	Other
+95529f60-6f34-4cf0-ba8b-c0504c2794e0	1	Other	Other
+9552a493-8201-450a-8abe-a5f4af08570c	1	Other	Other
+9552b2ca-4379-4578-a663-7fc9b9c7d178	1	Other	Other
+95530ff5-eee4-4b44-900d-0f0e86b95b94	1	Other	Other
+9553473d-a5cd-4679-ac55-8abf7cadc43e	1	Other	Other
+955386f9-2147-4344-b55f-0afe5ae5a90e	1	Other	Other
+95538d8a-7514-461f-8aa3-5c3f821a909c	1	Other	Other
+9553b412-9efb-4ca3-8f12-da360952d9dc	1	Other	Other
+9553bbcc-a595-4696-8869-ed64179bb739	1	Other	Other
+9553e227-c806-45d2-bfad-a8b8af8cd88c	1	Other	Other
+9554862b-298d-481a-a6db-11a6a8bffa46	1	Other	Other
+9554b699-2f78-46ac-921d-4e08017404f1	1	Other	Other
+9554c2dd-0de1-4934-9d3b-572b1e430c9d	1	Other	Other
+9554ce5a-a046-4375-a3e8-fc22d0f7fbe5	1	Other	Other
+955554f6-6330-4e5b-999c-3d85b8df0fa3	1	Other	Other
+955579f5-d997-45e2-9b6f-b430d7d54d2f	1	Other	Other
+95558da6-62ac-4ae9-8102-b8a64f6e7baf	1	Other	Other
+9555af43-a817-4fd2-8d89-4cd4723d2cad	1	Other	Other
+9555cba8-f0fe-4b2b-a961-d59e59db2f25	1	Other	Other
+9555cbd2-4ccc-4f23-bf1d-73243b1bdb3d	1	Other	Other
+955639aa-3ebd-4a20-b7f3-f79f09ceaff8	1	Other	Other
+95563c64-1a3d-4728-827e-3b3bc5738439	1	Other	Other
+955663b6-4e9a-4d41-89ff-6acfc91ec155	1	Other	Other
+95568c85-35fa-4c98-898c-81b1835dd0e1	1	Other	Other
+9556d6fc-fbbf-472e-a300-53c22949668f	1	Other	Other
+9556ed71-2101-4597-9677-a2797c1dcbab	1	Other	Other
+9556fd26-4134-4ed7-b135-eb1425e5a3b9	1	Other	Other
+9557965d-fab8-4723-a213-bc9b37993c23	1	Other	Other
+9557b8e1-87ab-481a-84a4-b2c8bc87a9cb	1	Other	Other
+9557c0ef-9447-4003-9842-e19e960d8f4d	1	Other	Other
+9557e3a5-e574-48bb-aaea-d9d757d22ea4	1	Other	Other
+95582ab6-f910-449a-8b45-bac64ec83a98	1	Other	Other
+9558773b-81ef-4400-9500-d39fcdee1e59	1	\N	Other
+95588e4f-4368-4999-863e-6952c9ce22b2	1	Other	Other
+9558b069-7277-4b4a-a824-fcb439b140ba	1	James	Other
+9558c451-be48-4a7e-9e69-b542a79f290b	1	Other	Other
+95591e21-6879-4214-b265-56218cf316c1	1	Other	Other
+955934c2-8d23-4029-937c-21c7d7313de7	1	Other	Other
+95593746-9cea-4172-aaad-b506f98fda2b	1	Other	Other
+95593c80-e61c-40e2-b0bc-98832d8b9902	1	Other	Other
+955951a2-8342-4261-8dd5-5b9f76219c5f	1	Other	Other
+95597659-b55c-43d4-8269-e8b911ee1c83	1	Other	Other
+95597932-058b-4baa-bda0-65ec01a60587	1	Other	Other
+95599f28-c5b7-43ad-9194-dc83bfceec78	1	Other	Other
+9559d72b-bd78-4fd8-9e2c-16239c3c2626	1	Other	Other
+955a417c-f920-4edb-a903-be3714dc1e26	1	Other	Other
+955a64d8-609b-4ff2-bb53-edad3af1ac8f	1	Other	Other
+955aad06-c865-4b98-b8f4-78aa696ce6e3	1	Other	Other
+955ace47-a3b5-4cba-9a84-8f242e178738	1	Other	Other
+955b6004-5b92-4a5d-b221-b11c8bd8a8b1	1	Other	Other
+955b7241-f841-49f7-bff0-8a8fe9347366	1	Other	Other
+955bbf72-75fa-45d7-938a-3bc0ee6370fc	1	Other	Other
+955bc7e6-ca19-4a2c-9c74-14587650155a	1	Other	Other
+955c1e73-8848-49f0-964b-3b846d1ede86	1	Other	Other
+955c6e36-9604-46ec-a836-4e32ad6ab245	1	Other	Other
+955cf411-7fae-43f4-9456-826a7c945fc8	1	Other	Other
+955cfa59-70e0-494d-a829-99c55153820c	1	Other	Other
+955d3ae1-0e0d-4517-9e42-a340ceb05d39	1	Other	Other
+955d40e9-f0a5-4794-a8bc-8d08763cd554	1	Other	Other
+955d76fb-9200-49a4-b7a1-526bd32ab34d	1	Other	Other
+955dcd59-1aa6-45aa-8a6c-d67c84eb4c78	1	Other	Other
+955de7f6-6817-4b4b-8ea5-9ca73aebdfb0	1	Other	Other
+955dec16-dd5e-4299-9eb8-ab7c542cdf8d	1	Other	Other
+955e2c28-1337-4bc1-80c3-7af34dcff8ef	1	Other	Other
+955e312b-ee72-4b4c-8d77-54a70795cda3	1	Other	Other
+955e88c6-9ce3-47fb-9abb-fc5ae85bcbb0	1	Other	Other
+955ece57-4149-4ab1-ac15-bdbb2b62dfd4	1	Other	Other
+955ef510-fc28-47a2-ab7e-85e5685bc595	1	Other	Other
+955f0fee-8876-432c-a637-eadf81fbc0b1	1	Other	Other
+955f71de-330d-45ab-80db-81d2389bc197	1	Other	Other
+955fa0f9-7cc4-48d4-8ec3-57447dd20c97	1	Other	Other
+955fc039-cbdf-4497-8c2e-b42ca513d709	1	Other	Other
+955fc3be-75bf-40fd-a37a-1c7494de3edd	1	Other	Other
+955fc75f-167d-4b93-b53c-ffe3e725840c	1	Other	Other
+955fd25d-b574-40c7-a1d9-fd88ff766382	1	Other	Other
+955ff3b0-26de-4413-aab2-2aa81921a8b1	1	James	Other
+9560170a-c07d-4238-849f-68aeb2001177	1	Other	Other
+95601c45-430c-4263-b208-36226cfa56f8	1	Other	Other
+95601c9d-ef99-46bc-a856-8f8ffc9244c9	1	Other	Other
+95604dcd-18f1-4c11-b00e-6768e98d527c	1	Other	Other
+95606561-5b68-405b-a61c-3643bc59805c	1	Other	Other
+9560697b-01f1-4268-8423-12b1dda99521	1	Other	Other
+9560895e-e8b8-4e60-9c81-fe056a9c67eb	1	\N	Other
+956104d1-47ad-49ce-a8de-d3cea6e3464d	1	Other	Other
+956143b4-86f6-4232-af94-2aa2e8d04b60	1	Other	Other
+95614b2f-0370-445e-a918-dfc6f6b26720	1	\N	Other
+95614f95-125d-4320-ab67-c08c1916e4db	1	Other	Other
+95618cd4-7ab5-45b2-9acf-752bc10a57c1	1	Other	Other
+9561bdd8-374e-4ef4-ba17-1b2e87244544	1	Other	Other
+9561de4c-7dc3-4456-a953-ae8cc77b4672	1	Other	Other
+956206e4-7d47-4456-9adf-a726afb828f7	1	Other	Other
+95623583-19c5-4b5a-99f6-8f11d17ead3f	1	Other	Other
+95623acd-d578-4bb6-8598-18e7e96ce8f1	1	Other	Other
+95623e10-6df8-46af-8beb-abce758a8bf2	1	Other	Other
+95624cb2-0837-41e4-a5c9-3c2496d8d895	1	Other	Other
+9562f4a4-f3cf-48c6-9617-fa69226a8702	1	Other	Other
+956370e2-b779-420b-bdf9-d47b974dd318	1	Other	Other
+95638bec-d8a6-4773-8b61-4b28129eca5e	1	Other	Other
+9563ccb1-e1aa-484f-b921-dabc51eeb34b	1	\N	Other
+9563d99e-10e3-4d92-aa5c-f9f5be343bfe	1	Other	Other
+95643b39-10bb-43bc-9b2a-17877283d2f5	1	Other	Other
+95648dd9-19eb-49ae-96d8-25433cfa00f9	1	Other	Other
+9564c343-8973-47f4-a1ce-4f31f4085c5f	1	Other	Other
+9564d0e4-2057-4fde-9aa2-80443466cc71	1	Other	Other
+95651edb-af95-4734-aa6a-03b555ca2b9f	1	Other	Other
+95655670-7ca1-4b1e-acaf-bf0235cc0978	1	Other	Other
+956570a1-2a2b-48df-b50c-5a2b70500ac4	1	Other	Other
+956587af-562f-4fc5-884c-1a01c867929c	1	Other	Other
+9565ac60-7082-4c01-94a6-33cd5ae280fb	1	Other	Other
+9565c563-5756-4537-8a9e-7bbff3282090	1	Other	Other
+9565dc99-0875-4d71-a633-619b50a46861	1	James	Other
+9565ef63-d553-4425-b696-f22409d9c858	1	\N	Other
+95663180-b06f-4911-82c1-e57c25263f35	1	Other	Other
+95664be8-1328-4433-843c-a2c4078b771b	1	Other	Other
+95667460-639b-476a-9e07-9860de96b8df	1	Other	Other
+9566bfb8-66cd-4a62-b941-6aabce49b980	1	Other	Other
+95678a66-a085-45a2-8f03-7f1e9d9428de	1	Other	Other
+95679de6-ee09-42aa-b326-0c914b6004a8	1	Other	Other
+9567d4c8-7529-44bf-831e-23921cefecf2	1	Other	Other
+9567ec42-a7a7-4195-9ea5-4b102e1cae19	1	Other	Other
+956870dd-3e71-4130-a304-abdf0d5cb126	1	Other	Other
+95687d47-d0c3-4169-a66c-c00dded42158	1	Other	Other
+95689685-c683-4785-8da0-0ed599ebbba7	1	Other	Other
+95693ca3-306e-4718-871f-eb14fafdf823	1	Other	Other
+95695748-885d-488e-9f2b-c8fd281389ea	1	Other	Other
+95695b8e-30dc-48ea-82bb-eda5d986c41a	1	Other	Other
+95697924-a28e-4a86-a219-ac991aa3b401	1	Other	Other
+95697ff5-df96-44cc-9876-aa0124e017f8	1	Other	Other
+95698494-bdb6-4ecd-94dd-d28f22b8c754	1	Other	Other
+956984d4-6a3d-4b35-a76e-c31c3e3afcf1	1	Other	Other
+9569c052-9928-4a37-a377-b58d91e99619	1	Other	Other
+956a07ef-6849-4b8f-8442-8908deb1c08c	1	Other	Other
+956a2f15-f7c3-4b24-ba22-4395574a1c64	1	Other	Other
+956a377e-1556-4193-b383-d3c92c09fcc3	1	Other	Other
+956a59cc-924d-49cb-8235-c9863c80c925	1	Other	Other
+956ac62a-2a51-47ce-ba6b-d55e1ad49427	1	Other	Other
+956b9491-94b7-47aa-af83-520a4def215b	1	Other	Other
+956ba691-a870-4be7-ba1e-c73c91e192a9	1	Other	Other
+956bd58c-9c2a-4e34-9754-f488664fa5f9	1	James	Other
+956c9ace-253a-4ef4-8922-bfcd1fa7a2b1	1	\N	Other
+956c9e13-f50e-48bf-9c92-b3dfa1282ff4	1	Other	Other
+956d1a03-79c7-422f-96b0-9fbc127e7682	1	Other	Other
+956d206e-bd04-41a0-8b7f-b2bf603cd49b	1	\N	Other
+956d336b-965a-40d5-bed7-fc659c6315ee	1	Other	Other
+956d9e36-1fdf-496f-b858-7f8759fa72da	1	Other	Other
+956da0f7-4f13-490d-b1f3-39fa54ba8cf0	1	Other	Other
+956e2913-64e7-4d82-b258-623a00d767e6	1	Other	Other
+956e463f-9428-4353-aac1-19275316632e	1	Other	Other
+956e6a1c-4c54-44e2-8843-572378cf3e81	1	Other	Other
+956ea468-f3d8-4771-8b59-2eb89d075bb0	1	Other	Other
+956f1e56-5220-4d3e-b1be-aa9452592f9b	1	James	Other
+956f1f19-243d-4387-bc89-06baac4d166d	1	Other	Other
+956f215a-e410-4bd2-b6c3-eecbef2687fe	1	Other	Other
+956f4184-f6c1-4d75-80f6-d4409661a9f9	1	Other	Other
+956f8ab2-68b4-4b2c-a939-c94f50986eeb	1	Other	Other
+956fa131-c236-4cf3-8c01-1016ed0ee19a	1	Other	Other
+956febac-d82a-4beb-9317-141e84100447	1	Other	Other
+957028b5-f0b8-4419-bdf4-ea0b7f07153e	1	Other	Other
+9571d96b-077b-413f-aff5-fd25fc7ec5d4	1	Other	Other
+9571dc75-23c8-4100-9a73-ece676859e13	1	Other	Other
+95721a6b-de1e-4fe8-a5f3-980d6ad72e1d	1	Other	Other
+9572631a-4fa8-497b-a07f-5f48b935e9f3	1	Other	Other
+9572749d-423f-46ff-bc99-aee331f02871	1	Other	Other
+9572ac37-76b5-41f8-a4ec-9a02c45b0e7a	1	Other	Other
+9572dba7-697f-40a0-80a7-9f02dfb496cf	1	Other	Other
+95733588-e148-49ae-a2f7-c65c0c00594d	1	Other	Other
+95736d5c-105a-4f0d-80f3-9fbb0735c52a	1	Other	Other
+9573775b-804f-4758-8987-a212ccd5ea81	1	Other	Other
+95739b36-a1b1-47a5-aa18-efc1740e5377	1	Other	Other
+9573ba2d-0b3e-4427-9c50-93d4eb7d42c9	1	Other	Other
+9573d157-676a-427e-8c60-16ea74d41e17	1	James	Other
+9573e1d3-c114-4fb4-b7d0-658f4c45010b	1	Other	Other
+9573f221-dac1-4923-8f56-e638ea1e7c64	1	Other	Other
+9573f762-1e35-4cad-8289-fa4a3ef7ba80	1	Other	Other
+95745ee3-91dd-4038-aa1a-80a6a6af2ea4	1	Other	Other
+95746473-4948-4dbf-a595-aae2f31b452f	1	Other	Other
+9574bb82-5c09-40ea-af81-b60059e390ed	1	Other	Other
+95752423-9226-4838-972f-5698c36ded9a	1	Other	Other
+957578ce-4a44-49e0-84c1-69f7244bcab0	1	Other	Other
+95758a9a-81a3-46cf-a5c9-924550861774	1	Other	Other
+9575cfc4-2b23-4469-994e-b2ebb476f6d4	1	Other	Other
+9575d329-1103-4641-a9e4-da1807cd079c	1	Other	Other
+9576004e-439c-4aed-86a8-7475a4b24300	1	Other	Other
+95762fa2-90eb-4918-89ef-d18393177e30	1	Other	Other
+95765295-0212-440c-82f6-c6fe99558e10	1	Other	Other
+95767e5c-7e99-4e95-85fd-d4e76249a3cd	1	Other	Other
+9576d305-9daf-4a51-bdd7-c8ae0c66b1b4	1	Other	Other
+9576d444-ed5c-4fd0-beb3-cbb459fb4ad6	1	Other	Other
+9576dc43-8ca1-4cec-aab7-708494b9b818	1	Other	Other
+9576ee5d-cef5-485b-b84e-30b0db0c2024	1	Other	Other
+957726f1-67c2-47dc-b8cf-b0f75bc1420a	1	Other	Other
+95775b06-a4b5-4580-9e60-b88fabd6ff3c	1	Other	Other
+957775a3-abf1-4944-8890-02a9f72328bc	1	Other	Other
+9577d290-a42e-4212-ae7d-1974b5892160	1	Other	Other
+957803a1-c642-411e-889e-65476615774e	1	Other	Other
+95780824-3f46-4a72-83e8-27adfcf7e8f9	1	Other	Other
+9578212f-4104-4040-ba50-61a71963a3b7	1	Other	Other
+95783f7a-d558-4f9c-b83a-0b5e75e718b0	1	Other	Other
+95785208-8d70-417e-800c-8f6a876828b0	1	Other	Other
+9578ff37-36d9-47a9-a6fb-209e47c08ac9	1	Other	Other
+95791ab7-4f7b-4034-89b5-16b2f07ecdfd	1	Other	Other
+95796359-32bf-4c8e-8f3a-e0e5df59b71b	1	Other	Other
+95796801-4f60-4065-a958-8e059888c9b7	1	Other	Other
+9579a3b1-4359-4966-94ef-b74241b57980	1	\N	Other
+9579a6b3-8734-4cc9-a52d-39a7a6194e1b	1	Other	Other
+957a3a08-2f67-441b-8356-018bc7f13f91	1	\N	Other
+957a3b68-b80d-49c2-80b8-d5e8b57f6d14	1	Other	Other
+957a42ad-f613-431c-99e3-1839ee9b849f	1	Other	Other
+957a858d-9525-4b14-be4d-4fb1ceeac9b4	1	Other	Other
+957aa3e7-eb02-4404-a5cb-463db3c48ea9	1	Other	Other
+957aa4f5-8b5e-46c6-97d6-d297ef97b200	1	Other	Other
+957afaf4-ee39-4a29-bc0a-296e724c4636	1	Other	Other
+957b026e-eb7e-4a67-800d-b6439dde451c	1	Other	Other
+957b2f87-f58d-4c40-845c-4b9c76b28e46	1	Other	Other
+957b7e22-df7b-4e64-8d9a-192e9c210a6f	1	\N	Other
+957b9e4c-7cb7-4b99-b745-7eedd20c1a37	1	Other	Other
+957bc26e-4984-4052-9e08-115d683e1e46	1	Other	Other
+957bdce0-f4d0-423f-a4a4-fb67e9c5a8c7	1	Other	Other
+957bf1d7-a07a-4707-8b9a-d1117a3c3386	1	Other	Other
+957c03f7-3c2f-4b37-b306-f936e97852de	1	Other	Other
+957c1c2c-2ba1-44d2-97a7-1827b32fa828	1	Other	Other
+957c495d-b27d-45fe-b474-bebd3f08945a	1	Other	Other
+957c581f-3db0-4eec-83f9-6907fa0d85b0	1	Other	Other
+957d0f51-2ced-46e4-8fe3-1b093a876eda	1	Other	Other
+957d6af3-d146-421c-b1d3-5d4076f8c94f	1	Other	Other
+957d930a-5d69-4eca-9e02-33985e05dc52	1	Other	Other
+957dd58d-7ef2-49e5-b6ff-44b07cb06635	1	Other	Other
+957dda5a-82f2-42be-a6df-8f9002ce783e	1	Other	Other
+957e30f8-1926-49cc-80b3-ce340fbc857a	1	James	Other
+957e4abd-b916-4ae1-9153-1c978f7735ee	1	Other	Other
+957ea33d-3cec-4c4d-8fa5-3f5eb634c2dd	1	Other	Other
+957eb3a0-0422-4ac0-b5fe-8ff99b4e0c9a	1	Other	Other
+957ed4e4-8cc9-422f-93d3-df097bc72f85	1	Other	Other
+957eeb62-c5d1-4839-9dcc-aae1194556af	1	Other	Other
+957f0221-2c8c-4033-934c-a7e7d0a383ce	1	\N	Other
+957f4500-994f-49c2-978a-0a2e861b4df1	1	Other	Other
+957f87ce-7343-428c-8841-cf04eade3acc	1	Other	Other
+957f8f00-ce88-4994-a03d-78e54e83da5f	1	Other	Other
+957fc3ce-df12-4cc4-8657-12732709e0e8	1	Other	Other
+957fd074-d7a7-4dc8-8f25-5030f708ab91	1	Other	Other
+957fd431-ffc1-4dfe-85ce-91ca46ed2c0a	1	Other	Other
+957febe4-2084-4f53-99c3-d1081fafcdcb	1	\N	Other
+9580215b-f0fa-4a97-933b-466e755389a0	1	Other	Other
+95802c44-2998-41c1-896c-8aa6f54029fb	1	Other	Other
+958054fe-1cff-4ba1-93f7-668309637867	1	Other	Other
+958080f9-b664-4571-a875-ce5afddd0b54	1	Other	Other
+95816a6f-ba6c-412f-bde9-dd1b61e58c68	1	Other	Other
+95816abd-a930-4cf8-a204-223326ed4e8c	1	Other	Other
+958199ae-68fc-4401-b205-c3e2d1ab3967	1	Other	Other
+9581d9b6-9470-4074-89b5-536d1164de0f	1	Other	Other
+9581db57-c7ad-42e5-a723-9f464447b9dc	1	Other	Other
+95821263-506e-4070-ac5c-694b35b00eec	1	Other	Other
+95822090-82f8-4069-b583-ac4d0d38133b	1	Other	Other
+9582241f-1bd7-4192-8c22-cd7c1d3afa7a	1	Other	Other
+95831419-017e-4e70-9219-56f2e1ebb69f	1	Other	Other
+95833119-ef42-445b-b607-2df5e5466d71	1	Other	Other
+95835db7-6e2f-4282-850b-b2b055c85116	1	Other	Other
+9583a7da-5deb-40d1-9ce1-0b4d4d3c6d11	1	Other	Other
+9583e2f5-9bb3-4ed8-b422-0e1649de8ef8	1	Other	Other
+9583fc72-7078-4483-a203-580102d41c06	1	Other	Other
+95840e74-dde5-42b0-8c10-5f547bac1765	1	Other	Other
+95840fe3-df57-4971-9ffd-37a82532ddfd	1	Other	Other
+958483dc-0295-4932-a4d9-d83b42d635aa	1	\N	Other
+9584d04b-3c5a-48ae-8f2b-a1dce05db187	1	Other	Other
+95853f63-2587-438f-923d-c04177c902ec	1	Other	Other
+9585acf2-90b7-4c55-985b-002dd5b8e5aa	1	Other	Other
+9585c961-0f75-471e-bdea-c73946bf8555	1	Other	Other
+9585f936-f202-4f86-b72d-ae284508f1d6	1	Other	Other
+958653cd-9cdc-45f1-9858-a51df8fc8925	1	Other	Other
+95865c5a-b725-46af-bcfa-f4c098255648	1	Other	Other
+95869c77-2a18-4f39-b799-8fbcc12b4981	1	Other	Other
+9586c5ed-e12f-4632-85a3-f7f6fa749a68	1	Other	Other
+9586d3ad-1944-4a63-a3f2-228ddaf3e205	1	Other	Other
+95871be4-faa0-4142-8dc0-9e753bce1162	1	Other	Other
+9587255e-41c4-4558-b985-cfd4828f10a5	1	Other	Other
+95872755-74e4-464d-9e53-b747ded02d57	1	Other	Other
+9587cc42-58ab-4ba2-941f-02650a44bf5e	1	Other	Other
+9587e678-2c93-4bda-a6ad-5e9c95d0ea4d	1	Other	Other
+9587f757-e9a3-4d6f-8b65-50fd8d688e24	1	Other	Other
+9588033a-c2fe-415b-948f-87d7d0d63124	1	Other	Other
+95883643-40c4-4646-8f91-d583296f90dd	1	Other	Other
+95883980-d96c-4932-a662-322c8471fe6e	1	Other	Other
+9588e258-332f-437d-a089-7258682004dc	1	Other	Other
+9588e7cd-7fb4-4a74-9027-111d61142ab9	1	Other	Other
+9588e897-d5f5-40d6-9422-7f820bbd886f	1	Other	Other
+95891a4f-0ecb-4d75-bbca-31a54a255c88	1	Other	Other
+95892223-70c3-4c77-8324-f85176d46104	1	Other	Other
+95892580-f4af-4421-9fcf-907eab47cd6e	1	Other	Other
+95895234-bf65-420c-b319-4c907f8a6bb2	1	Other	Other
+95895e80-8ec1-43b1-883c-b86161bcd5a0	1	Other	Other
+9589c46d-a07d-48e3-aa85-b47f24c57a10	1	Other	Other
+9589e394-3a7f-4d05-b19e-fcc0dbc53b0a	1	Other	Other
+958acebb-ac03-4f96-9920-f8eba5627270	1	Other	Other
+958adff6-22e3-45ba-869a-83872b15c4b6	1	Other	Other
+958ae06a-8c58-4f28-85af-9e6e190be73a	1	Other	Other
+958b117b-6b2c-4507-ac4d-56a54af19d8a	1	Other	Other
+958b53c1-1e52-43ba-9f46-cabe9757f782	1	Other	Other
+958bd721-bd6a-4893-a8de-846da48e0382	1	Other	Other
+958bfe11-56f7-4907-960f-e7efebe9ba85	1	\N	Other
+958c1227-7d3f-4d78-9949-17f5a3cd704a	1	Other	Other
+958c35f1-718a-426c-8028-2d7521730d1d	1	Other	Other
+958c471c-e714-4786-9348-1e3188431491	1	Other	Other
+958c484e-102e-419d-8d91-184cd3b6c07f	1	Other	Other
+958cf15a-685d-4a7a-8acf-2f1b90914951	1	Other	Other
+958d6dce-d912-4af8-8a6b-3eff4ea757cc	1	Other	Other
+958de6a0-8ae2-4ba2-9fbf-021f7718ecc7	1	Other	Other
+958e1fd2-8178-4914-a347-ac4f762d4c31	1	Other	Other
+958e42af-3a45-4757-8f85-8105071b2cc7	1	Other	Other
+958e461d-e98f-4dd4-a083-253b82588daf	1	Other	Other
+958e6856-dcbd-4167-a288-87cd2350f2ed	1	Other	Other
+958e7301-6687-4469-bd2b-91be4e2cc02d	1	Other	Other
+958e83ed-efbc-4033-85f2-269a87c0de75	1	Other	Other
+958e9552-bdb3-46df-88db-24928129bba4	1	Other	Other
+958e9e18-c52a-4708-9834-673722391491	1	Other	Other
+958eeeb6-c48b-4fff-8f07-b1f20068bbf0	1	Other	Other
+958f04a8-c956-46b3-aff7-47f87bf11569	1	Other	Other
+958f0749-a386-46ec-b49d-61e7e722d848	1	Other	Other
+958f6a52-0953-4e6b-8f33-eb23a78c75e4	1	Other	Other
+958fa966-092d-4449-8600-6b6d9989e0a0	1	Other	Other
+958fb257-0477-4921-8ef5-e95f6b081371	1	Other	Other
+958fc447-dddd-48f7-bdfd-c8f464518d58	1	Other	Other
+958fe481-63b4-4767-b501-4704692dba69	1	Other	Other
+95901f3f-f823-4500-a5e0-d0f0c3035878	1	Other	Other
+959048ab-4e15-47a1-a6c7-6c536070f0da	1	Other	Other
+95904d58-ffa3-450b-ad24-f5ba8172f077	1	Other	Other
+95909387-6536-4416-bec7-3cea4c7657c4	1	Other	Other
+9590a3d5-a9ed-4572-8832-7301f462c024	1	Other	Other
+9590ba7b-c0d5-4a52-95bd-f58457ff1659	1	Other	Other
+9590bd1f-9bf2-48b3-933c-8f6e56dfe3a3	1	Other	Other
+9590c20e-4000-4d72-923a-ba967f51ec4c	1	Other	Other
+9590d095-9ae7-4258-b9c2-4a0df1d81bdb	1	Other	Other
+9590e5c3-8919-4b76-b65b-0e4fab3572e9	1	\N	Other
+9590eef2-6ba0-4ecc-841c-d8bcad317986	1	James	Other
+9591003f-3226-4746-8886-06ca09e3702f	1	Other	Other
+95912ded-b16a-4dc1-9c2f-74059834a16c	1	Other	Other
+959134e6-a7cf-4d7c-8802-9a7eb530d1d0	1	Other	Other
+95914551-69a5-45d8-bdba-695e27d75f6f	1	Other	Other
+959160e7-8ceb-4ac2-9114-15a53383f899	1	Other	Other
+95916ef2-38c6-4a73-b656-b87cc94348a3	1	Other	Other
+95917bf6-47ca-4cc2-9d23-dfaf407dc2e4	1	Other	Other
+9591a4de-0059-48f6-8da6-73fe596347d1	1	Other	Other
+9591bb7e-2ae8-4daa-ad79-a9d98d299787	1	Other	Other
+95921022-09e2-48db-953c-b647d46f73f7	1	Other	Other
+959225b4-5a15-456a-8c6a-b0cb1ffa469e	1	Other	Other
+95922a65-8a80-41f7-860a-9a8740ac387a	1	Other	Other
+959245a2-0513-4f07-8237-0cca8bdbf63b	1	Other	Other
+9592775b-85e4-4f60-80bb-a92ea5f69770	1	Other	Other
+9592a83e-38da-4f2b-8d23-3fb99fa76939	1	Other	Other
+9592b08d-7b96-464e-9b60-1ae5fcb25641	1	Other	Other
+959314e1-3b92-47fb-bfd8-c4f7569ae28a	1	Other	Other
+95935599-7476-4fd3-acce-55d7217cdf35	1	Other	Other
+9593d608-844a-443e-8866-b14b673f9569	1	Other	Other
+959418ee-e351-49c0-97e2-67a5a4551465	1	Other	Other
+95945bc7-b775-4cec-b209-d21687d5f41a	1	Other	Other
+9594f189-cfea-48a5-921e-ddc855670de5	1	Other	Other
+9594f22e-2c46-4bea-98a5-9733c7f05892	1	James	Other
+959507d9-7cef-480a-95d3-a765b41b8160	1	Other	Other
+959513ef-a18e-4c97-bdb2-423d5468aab1	1	Other	Other
+9595cfe2-07a0-46fb-8068-8910b40d0b12	1	Other	Other
+95960367-b6b5-4361-98b3-dc1959886a25	1	Other	Other
+95962299-be19-44c4-ac48-61abc895533a	1	Other	Other
+95969a96-96e8-4dc7-8db6-b6252b07c0a2	1	Other	Other
+9596a825-359f-4fbe-a287-63d1cc65c1b9	1	Other	Other
+9596e4d9-338a-4c00-8289-5d9101d4664d	1	Other	Other
+95970cb3-08e2-44c4-8b9c-19e37b79e176	1	Other	Other
+959736a6-0388-47df-8b00-bde92335d899	1	Other	Other
+9597387e-9c9f-40a5-9d70-cbdba102a694	1	Other	Other
+95973c13-92e9-4d5b-90b8-c203809432f1	1	Other	Other
+95975d0c-dc77-4178-bd19-9a222aff1b32	1	Other	Other
+95976dbc-13b0-4bfd-b271-cecb26c3dfba	1	Other	Other
+9597a561-3954-4d66-bce3-a7d9e4eb5d02	1	\N	Other
+9597b1c7-aac3-450d-be8b-fd761d871b2f	1	Other	Other
+9597c15f-0227-4025-83eb-dce5f2235a8e	1	Other	Other
+9597e677-c325-4ba4-aae2-549c7e5bf5c1	1	Other	Other
+9597e82f-b5ed-4c2d-be70-1005fe7dd4d8	1	Other	Other
+959857ba-ece0-4e1c-b531-e12d762e3cb2	1	Other	Other
+95986036-d326-4926-bcce-8688768201e4	1	Other	Other
+959865a1-27c2-4461-b50c-a16918856443	1	Other	Other
+95986a8a-e920-48f3-9c3e-e49ed34e25d5	1	Other	Other
+95989b72-0d63-4708-8db8-0eec489aacf1	1	Other	Other
+9598aa27-7955-44e5-b5f7-0ed08d99741e	1	Other	Other
+959935c5-43b1-4111-9195-5f25ad1da7b0	1	Other	Other
+95993b9c-6af9-4fbb-b0fb-7101b37a8a65	1	Other	Other
+9599a127-e67d-4eb1-8785-0f06027614b7	1	Other	Other
+9599a989-384a-40b1-bc03-2ff536c4a565	1	Other	Other
+9599e881-e0b8-4da8-a804-9ca9e5a8ff7f	1	Other	Other
+9599fc7d-7d07-4f95-892e-cb28b22362ed	1	Other	Other
+959a00de-81f8-4a48-882c-f3b6d31f5b97	1	Other	Other
+959a26d8-aa33-488d-b40f-60fe022d68a5	1	\N	Other
+959aafde-4b51-4bcb-b6ee-153c1252520b	1	Other	Other
+959ae486-8256-4607-87d3-27ec1b4ad8e7	1	Other	Other
+959b239d-ef17-4af8-8bfb-2a2c605c62cc	1	Other	Other
+959b2ef6-046c-41f2-b0ad-d876a9d3ecb1	1	Other	Other
+959b4530-8182-4043-b81d-33b23626d120	1	Other	Other
+959b8d8b-2abd-4bfb-9a69-f0d27f112e2a	1	Other	Other
+959bbb5c-965d-4e01-8567-ba010b17d1e1	1	Other	Other
+959c0523-9377-460a-8c54-c1f9087a3a63	1	Other	Other
+959c6296-b9fd-4539-9959-4ed8bbb5a268	1	Other	Other
+959ccc68-d7c7-46a4-aba3-328172e2360a	1	Other	Other
+959cd04a-2818-4f48-920a-98384169d935	1	\N	Other
+959cea9b-1d89-4f18-8f02-a50190869b0b	1	Other	Other
+959cf1ce-77ee-4ce9-81f4-5b8f27a0c91a	1	Other	Other
+959d33d7-594f-4ee4-a53a-a7c3dbdff001	1	Other	Other
+959d6a4b-9d2a-4cd9-aeb7-4feef90f95ae	1	Other	Other
+959d8e48-99a7-4986-b43f-8f616fa4cb9f	1	Other	Other
+959db9be-f0e6-4a30-bb1a-b1b2b2a61e59	1	Other	Other
+959dffbc-a558-4a80-b10d-86e66b9f8a9e	1	Other	Other
+959e383e-deea-43ba-8936-3cf96ceed059	1	Other	Other
+959e50eb-232d-4dec-b7ea-d3a209edcf98	1	Other	Other
+959ea74d-e21e-4482-a768-f6eaa3096e18	1	Other	Other
+959efffb-6cc5-4ed4-97ea-5a43a4cafc92	1	Other	Other
+959f2d4a-2235-4240-918a-07f5bde127c0	1	Other	Other
+959f347e-2935-4431-83bd-5d5703de2f5a	1	Other	Other
+959f3673-68df-49e2-9077-a52afe495c18	1	Other	Other
+959f9e12-ea39-4c39-b4c6-9f7fa45a0b55	1	Other	Other
+959fb245-416d-4ad9-9e69-45ab7f71e57a	1	Other	Other
+959fe484-9b6c-42b1-a151-9098c0623603	1	Other	Other
+959ffae5-a00f-4dad-94c8-1b8359bc0a88	1	\N	Other
+95a03061-f969-44bb-9ab6-e1c28f6a2b85	1	Other	Other
+95a05462-795a-4bb3-872b-4bc1701fb326	1	Other	Other
+95a0998a-475e-4dee-8db0-0523e9f7ba35	1	Other	Other
+95a0ac58-8ffc-442c-8424-1196f04443c1	1	Other	Other
+95a0b481-6607-404e-8722-953d16c49725	1	Other	Other
+95a0c6c9-5685-44e5-bf9c-b50e5e8f9fa7	1	Other	Other
+95a17980-d40e-4bfa-82c3-a12458cf2f87	1	Other	Other
+95a18f5c-1008-453a-b5d3-5972bc9cae48	1	Other	Other
+95a2260f-71e1-4849-b3fe-a2e24e78788b	1	Other	Other
+95a2c9a3-34fc-43ed-ab1a-0a86db15464c	1	Other	Other
+95a2dafb-a217-4925-9895-0c858e75ff5b	1	Other	Other
+95a337f5-1009-4a9a-bb4e-5050a8ace77e	1	Other	Other
+95a34ab4-de2c-47ce-8d51-010b6ac22475	1	Other	Other
+95a35064-30db-4249-a505-3d96569a4f97	1	Other	Other
+95a373c8-0601-4bd0-9d2a-52a93de71cbe	1	Other	Other
+95a378bc-7a4d-4084-a2ef-f607f51a5f9f	1	Other	Other
+95a39113-f637-4c3e-96ff-2b5f2fdf3e4f	1	\N	Other
+95a3d3a4-d58e-4f63-992f-af5a1a86c396	1	Other	Other
+95a43d19-0006-44b9-bdfd-13e4e90b7970	1	James	Other
+95a4748a-cbc0-4e26-8522-cc52f6cff1db	1	Other	Other
+95a4d6c0-451c-486a-97eb-bc01954d5614	1	Other	Other
+95a4db3b-39c1-44d0-b210-a04bced93647	1	Other	Other
+95a4ed1d-fe51-4590-a554-007bc94f8958	1	Other	Other
+95a4f2a3-f42b-4ff1-931b-3bef796e39f3	1	Other	Other
+95a4f39b-2751-4f54-9370-c7322a221894	1	Other	Other
+95a5115c-8ca4-4eaf-b5fb-b69d3925627c	1	Other	Other
+95a51346-00f4-4e02-91ff-4cabd491e401	1	Other	Other
+95a55a7e-ef56-4c9e-841b-ffd7dad4a9c1	1	Other	Other
+95a59747-5f85-444f-bf01-5ae3d7a60d9e	1	Other	Other
+95a5a739-4f04-4938-82e6-0add3e211903	1	Other	Other
+95a5a7a5-5a12-4f3b-bd7f-6bb8bf556c35	1	Other	Other
+95a5f93a-879d-4204-b2a8-8dec6baafcbe	1	Other	Other
+95a5fde0-bf18-4157-b994-a32f0ff5b4d9	1	\N	Other
+95a6515e-4050-4f48-ab42-3692e59eac95	1	Other	Other
+95a66045-cae3-4056-9e96-dbe2a638c30f	1	Other	Other
+95a67ec5-23b0-41b4-b21b-0315ce6e4f40	1	Other	Other
+95a680eb-d06f-4982-b591-21e9244d4eba	1	\N	Other
+95a6b646-1e52-42a0-bee8-b24bad71ad2e	1	Other	Other
+95a6deb3-be81-4b54-a926-519f4a8af3cb	1	Other	Other
+95a6eb61-7dd7-42b4-9cb2-ea8a0f8b2c2a	1	Other	Other
+95a70caf-029f-4b45-9899-55abdc017d4f	1	Other	Other
+95a71829-7e42-485e-93ce-595d4f69e0c2	1	Other	Other
+95a71d7b-d42e-428a-873b-29c1fbfdfc32	1	Other	Other
+95a77df5-b852-47c7-8820-01c2d9e05dac	1	Other	Other
+95a7970f-dc75-4000-8212-5bec22e1efbb	1	Other	Other
+95a7a146-e760-4781-bdad-54593eaef2ac	1	Other	Other
+95a7e7f4-d6a7-4f71-b510-feab3995dd4b	1	Other	Other
+95a7ead6-ed78-4ffd-bb56-8d5a691510f5	1	Other	Other
+95a7f415-b7a0-4271-89c5-3bf5b25cc152	1	Other	Other
+95a7f7ff-ec73-4f94-bf59-94412e917f00	1	Other	Other
+95a83c09-55c7-492e-acab-141e78c10674	1	Other	Other
+95a85705-e549-4649-a761-0f9b04442607	1	Other	Other
+95a87c47-9043-4311-bdb5-d28ca5803950	1	Other	Other
+95a8eaf0-f860-4157-96a6-cb823bf7f642	1	Other	Other
+95a8f3e0-f543-44b4-a087-d16264cc84db	1	Other	Other
+95a8f543-827e-49b0-a597-9867dbf25b26	1	Other	Other
+95a904f6-a209-4e0f-8a59-e0ad4239dd78	1	Other	Other
+95a92d36-2309-42c6-93c2-cd6f9bac47ab	1	Other	Other
+95a97606-1ff0-4c9f-ae98-ca5be1c44c4d	1	Other	Other
+95a9a7ad-9e58-45af-86c2-0fb9a2137ac6	1	\N	Other
+95a9d002-b697-4180-aea4-d4d97887f2b5	1	Other	Other
+95a9d952-edb0-4b5d-a967-db3ad3d7166e	1	Other	Other
+95aa8d7d-77c4-49ed-a632-f6ef9896a28b	1	\N	Other
+95aaaad2-6a1e-4a10-ab86-84a5d948e893	1	Other	Other
+95ab2651-b0cd-493a-bc7f-0f3d3b9b4560	1	Other	Other
+95ab50c0-7f96-4a7b-9196-0d448dd5bb3d	1	Other	Other
+95ab59ad-aca5-456b-91d5-0621ce497012	1	Other	Other
+95aba913-953b-4b97-81d7-938979a61463	1	Other	Other
+95abe1d6-ca9f-4497-948c-35f91fa6618c	1	Other	Other
+95ac1c72-3fe7-4f37-9b59-5b29e430d714	1	Other	Other
+95ac3303-7e2d-45b5-94d7-79b86fafeb6a	1	Other	Other
+95ac3fc8-7b71-41de-867a-8002974e5c8c	1	Other	Other
+95ac51a6-ad86-4561-b25f-13a55d5f73cb	1	Other	Other
+95ac9a41-a656-4d52-a5e3-0f27172cf45c	1	Other	Other
+95ad0515-acf7-4d86-bb6d-0e21329bddc6	1	Other	Other
+95ad33cf-1ade-4ccf-8c8d-f6a9895a7f7f	1	James	Other
+95ad47ef-c130-4b21-a14e-8a81fcbaa1bb	1	Other	Other
+95ad6105-17a7-4aab-b468-264366777274	1	Other	Other
+95ad6625-ef40-4189-be5e-44ea5e43f2a7	1	Other	Other
+95ad6e58-8fce-4bb4-beee-1d2715fb83e6	1	Other	Other
+95ad7955-7f9c-4163-9f94-3b844275b7aa	1	Other	Other
+95adaf61-a2e2-48fe-a69c-04524355ee37	1	Other	Other
+95adcab5-d047-434c-940a-cfde426cb59f	1	\N	Other
+95adcbe5-b099-40f9-8ea2-c2b7369b8e84	1	Other	Other
+95add519-df74-431c-9c9e-61f258a152c5	1	Other	Other
+95ae4bb6-4d9f-4692-9963-8ffa635a3859	1	Other	Other
+95ae5fbd-c50f-49ca-a90d-3ec49739a9b7	1	Other	Other
+95ae8398-4edf-474f-9767-92048c678e9b	1	\N	Other
+95aeb22d-6a6a-4c95-bed9-c2a63e4a383e	1	\N	Other
+95aecb41-16d4-447b-bfa4-d224f4eb89cf	1	Other	Other
+95aee124-e942-4167-8f8a-063edbc6096e	1	Other	Other
+95af0f2f-1a00-4d39-af65-8d1a766e3b3b	1	Other	Other
+95af234a-576d-4de5-b2b7-a2b83e15add1	1	Other	Other
+95af29cf-5bdd-4822-9828-56f6421bef68	1	Other	Other
+95af8836-8cf1-4525-a143-717b57c8a100	1	Other	Other
+95af9f48-6ce7-4942-b95d-27ba091317dc	1	Other	Other
+95afbcbe-75f6-42ff-addf-39cd31669c9f	1	\N	Other
+95afbf51-c38c-45b7-b49f-00c9a9ae9730	1	Other	Other
+95afc3d8-dd6f-4cb1-ae98-0eba97b81caf	1	Other	Other
+95b002ab-02e3-4b8c-b9f0-6150df10604f	1	Other	Other
+95b01e79-83d1-47c9-b10f-b31506eef150	1	\N	Other
+95b02699-ed7b-4f4b-ba73-799f9c4a88b5	1	Other	Other
+95b04f47-de99-413f-b030-0c985cb92156	1	Other	Other
+95b05777-f2a5-462c-acfa-95e47c07bfd8	1	Other	Other
+95b09dee-b9b9-46c8-8d9e-4c8069c47713	1	Other	Other
+95b0e5ed-322d-473e-a74f-eb7c5f3a5dac	1	Other	Other
+95b1014e-fdff-4556-8f1d-e25897cf4e2c	1	Other	Other
+95b116a7-a7e6-4ec0-a6dd-9e722f50101f	1	Other	Other
+95b118c0-2e83-4b22-953f-020c4c90344b	1	Other	Other
+95b16095-5ef6-447b-b401-b0afb91c3aeb	1	Other	Other
+95b1ba06-4adb-42a3-b2d3-2b479976cb0e	1	Other	Other
+95b1defe-27e8-4b47-8e06-b20ceb2c0291	1	Other	Other
+95b25804-ee96-47b7-8ff7-57909e5b1a1f	1	Other	Other
+95b28edc-026b-49d1-a7f5-ce8222f62b87	1	Other	Other
+95b33f0c-d5de-440a-81b4-1e38c5ae9936	1	Other	Other
+95b379ee-3749-4baa-95d0-0223c651d371	1	Other	Other
+95b381ed-05b4-4c65-b1f4-82378fc820c6	1	Other	Other
+95b3ef97-44ea-4f5d-824b-e9797dfef109	1	Other	Other
+95b43053-a439-4122-8e4d-f29cfa49a6af	1	Other	Other
+95b44dc0-feff-4242-bfa0-3ae245055981	1	Other	Other
+95b45dbc-be96-47da-881c-4a1414997015	1	Other	Other
+95b518da-438a-49c7-acfa-d90987666636	1	Other	Other
+95b5328f-6b20-4e7f-9104-ba7fa74961a2	1	Other	Other
+95b54bfc-dc8b-4892-9b65-f200083c91d7	1	Other	Other
+95b55818-5908-40ca-922c-92e0155cb392	1	Other	Other
+95b5a5ce-1a57-483e-8d7e-f1c8e4032042	1	Other	Other
+95b5c50e-7133-4f86-ac3b-0b74777dbdc2	1	Other	Other
+95b5f1ab-557d-4ec8-89f9-2a925bbe5d88	1	Other	Other
+95b6021a-357d-4ce9-876a-668579e4ee65	1	Other	Other
+95b60424-c6f7-4fa4-8f37-a87fb29b757e	1	Other	Other
+95b6356f-920a-4fcb-b8fa-e2a1997747c6	1	Other	Other
+95b641c9-3258-4a00-aef3-b40755eee8d6	1	Other	Other
+95b64b4b-16dc-4d51-be7a-7867fb0f6fe2	1	Other	Other
+95b64cd4-2053-4eec-8b85-0aa3613f0fa8	1	Other	Other
+95b6636b-5429-43e5-b25a-b33d02cdced6	1	Other	Other
+95b6f2a8-a69f-4d1d-8499-92a8ef83d7c1	1	Other	Other
+95b74941-b93a-444e-ab94-12ba031c505e	1	Other	Other
+95b751be-b27e-4382-a62d-ce3c7d357bbf	1	Other	Other
+95b7a78f-bbea-443a-8833-cc09413a1650	1	Other	Other
+95b7c01a-a6ef-4439-b687-8a308e961808	1	Other	Other
+95b82f65-2e90-4e0d-a60b-bc7fa5ff64a1	1	Other	Other
+95b82fe4-e2c6-42cd-88a9-827cbb533424	1	Other	Other
+95b832bb-cd65-4165-9425-11c08e4b5763	1	Other	Other
+95b83978-f441-44f1-93bb-8d486575937e	1	Other	Other
+95b867b3-3519-4af7-b641-7654a00377db	1	James	Other
+95b893b8-88b5-47e7-8933-440fe71082b6	1	Other	Other
+95b8a246-dc89-403e-a47e-0e2fcecd0df8	1	\N	Other
+95b8a2be-5642-4732-b3e8-42585ce8a6ab	1	Other	Other
+95b8c11b-85b3-4a6b-a673-b846e7ce63ee	1	\N	Other
+95b8f645-8062-4a0b-ba86-568961ea94a5	1	Other	Other
+95b922c7-0755-4f2e-885c-264580b4d04f	1	Other	Other
+95b940a7-da0e-46fc-838e-87ab0ff12438	1	Other	Other
+95b94a63-8780-4dfe-acee-99f7255eac9b	1	Other	Other
+95b94faf-5789-4a31-976d-eadfe092706c	1	Other	Other
+95b96a47-611e-4857-ab48-e02231e8131b	1	Other	Other
+95b9d385-9c81-4078-ae3d-50c75ea9e332	1	Other	Other
+95b9dd13-d40a-4e2d-9bd2-48a76c03cb51	1	Other	Other
+95ba1226-cfe6-4a9e-88cc-d2c9f00cac15	1	Other	Other
+95ba2bdc-a5e6-4fdf-a3d3-5162d81f9ba1	1	Other	Other
+95ba3c62-8e89-4646-ba60-d021b9a978e6	1	Other	Other
+95ba83f0-65c8-4743-b183-fd26212dabd7	1	Other	Other
+95bad959-d226-43b8-bc59-cad53a406963	1	Other	Other
+95baf2f0-f078-4cef-af0a-66c6e93b5697	1	Other	Other
+95bb13e8-7244-4f08-a1d0-9eed95efde9a	1	Other	Other
+95bb7e76-4432-42dd-a0e4-5f9fa830d862	1	Other	Other
+95bbbe84-0aed-492b-820e-2df57ae3b1c0	1	Other	Other
+95bc7590-44e3-4e9a-b0c4-ec2ed0fe0244	1	Other	Other
+95bc9dc3-a7b9-40e7-aeb7-fd32f4d58f1c	1	Other	Other
+95bdb7b6-4f3e-49bc-94a3-3ffe15d18157	1	Other	Other
+95bde997-a8ec-46d4-8ea3-c3e95d925efe	1	Other	Other
+95bdf555-18f8-46d6-a0a1-543cab98f79f	1	Other	Other
+95be1692-fe99-4a6b-89bf-a190ac9f9676	1	Other	Other
+95be6ba1-bca0-4984-b2da-ac0ae1a5655a	1	Other	Other
+95be86e2-28fb-49a5-afd2-08063e5c7599	1	Other	Other
+95beae3a-1481-4740-b6ee-fa5850f80ab1	1	Other	Other
+95bebfe3-217c-4f3f-a15f-8225cb24af5f	1	Other	Other
+95bec723-04f9-4aa5-ba60-2ba875d254cf	1	Other	Other
+95bef82d-88e2-4851-ab11-13d1a19dd046	1	Other	Other
+95bef84d-f9c5-4907-a13d-3ecea7b674b2	1	Other	Other
+95bf0c39-4874-49e8-b4e7-87cd3e48a056	1	Other	Other
+95bf0dd3-0fa0-4669-87a1-14b6674ce37a	1	Other	Other
+95bf48f8-74db-4b23-8ce1-5ad073866a6b	1	Other	Other
+95bf738c-19a6-4272-9629-83c0aec80fec	1	\N	Other
+95bf8dbd-e724-4a1f-bcc1-93237e9c7a4c	1	Other	Other
+95bfaea0-1962-4c40-88a9-3319b3115c28	1	Other	Other
+95bfb22a-7637-4e09-9eea-b2a3a5c76a78	1	Other	Other
+95bfc881-22e9-4f1f-9051-d8c68cfc0b30	1	Other	Other
+95bfce6e-d9d4-496e-a6a8-03d5b69fbcff	1	Other	Other
+95bfce7c-9ba2-47b4-8201-85a94917b537	1	Other	Other
+95c05d97-ecd3-49d9-9974-1a9b8e4e02c7	1	Other	Other
+95c07dee-4cbf-42a0-b241-3f86355c0762	1	Other	Other
+95c0ebfa-2378-4dfe-9ffe-25f857b81d0b	1	Other	Other
+95c12940-3d56-4086-bf8a-d7032cbd9e9e	1	Other	Other
+95c14628-4a67-4177-b800-b789d114f148	1	Other	Other
+95c15d78-d0f3-4dad-b2d2-d04f0a807e3d	1	Other	Other
+95c16538-7819-42be-96ab-66b5563c265f	1	Other	Other
+95c16749-d2a2-463b-9187-b6408356e02d	1	Other	Other
+95c1c988-e7fc-45bc-87be-62fcc683f495	1	Other	Other
+95c205dc-267d-40b8-b95b-c9456c394d3b	1	Other	Other
+95c225b5-0cb3-4474-b493-765378dd8125	1	Other	Other
+95c26fca-4808-46a7-b7ed-ab06fcd776a2	1	Other	Other
+95c29f46-50f4-418c-a7b4-a41f6a7080c6	1	Other	Other
+95c2a5ca-67d3-4b0b-a2b7-7c7bbd9f506e	1	Other	Other
+95c2b199-b197-42d5-9961-e868449ac9a0	1	Other	Other
+95c30e39-af1c-4470-bef7-c01cd58224a6	1	James	Other
+95c32db6-e8d9-422a-a3c6-0214141f9ee9	1	Other	Other
+95c33bd4-d31d-49c0-a4c9-e7c4936ae659	1	Other	Other
+95c38c68-8245-4f87-80f2-4518dfeef74d	1	Other	Other
+95c3e198-e3ef-4fd2-990b-556f3aa9c9ed	1	Other	Other
+95c3ed89-bbe9-41a1-95bf-48d812f1ea1b	1	Other	Other
+95c413ca-f5de-48db-b4a8-f29f098d88dc	1	Other	Other
+95c47848-91fe-4847-a75e-3035d0f6f91a	1	Other	Other
+95c47ee2-4f0b-4cba-a31f-28e293d5dd73	1	Other	Other
+95c47f96-ebc2-4c52-baa8-a5b1a86f3d12	1	\N	Other
+95c4f2cf-aacc-4b0f-b8b3-b1a7858a2f7f	1	Other	Other
+95c52830-7427-4a4e-8862-1a3935bcad78	1	Other	Other
+95c5a617-ca20-486e-b9ee-aa342e21b6ce	1	Other	Other
+95c5ca8c-a9c5-4d6b-bd9f-144f0068387b	1	Other	Other
+95c5cf81-bd2c-4dad-bda8-012011977da9	1	Other	Other
+95c62fe8-23aa-4a9f-bdec-f04e13eabcf4	1	Other	Other
+95c6404a-b610-4546-aee4-924ce92b767a	1	Other	Other
+95c6ae0d-b006-4f7e-bb4e-f8205b9faff0	1	Other	Other
+95c6fd93-d444-4b19-baab-796917492ed2	1	Other	Other
+95c70e51-e1db-4b0d-b418-5270917be4ef	1	Other	Other
+95c78e61-5af6-4a77-bccb-c367c2cb5ba0	1	Other	Other
+95c79a77-372c-4f4e-9271-1884edebf764	1	Other	Other
+95c8294b-58a1-4460-bb7d-181e9f120b0c	1	Other	Other
+95c84110-3fbf-4b73-91f6-1a3a5561269a	1	Other	Other
+95c864c3-36ec-4e4b-b45f-506135035bb4	1	Other	Other
+95c8bd57-1aba-4e58-b08d-0acbaea8debe	1	James	Other
+95c8d05f-086b-494b-89f9-de8668eefb0a	1	Other	Other
+95c8dd24-9d79-45cc-bcdb-c9c064190424	1	Other	Other
+95c8f5ce-8803-416f-9e94-4aae65e1b479	1	Other	Other
+95c8fa88-217a-4ce3-ad96-3a6ea2523d1e	1	Other	Other
+95c91c5a-8e8e-46bf-ad8b-de74e411fadd	1	Other	Other
+95c960c6-deb1-4fc2-9ce5-d3c9df027930	1	Other	Other
+95c96608-93c7-4874-94c2-c55268592701	1	Other	Other
+95c968b1-5b35-4a48-ba28-581f418fa474	1	Other	Other
+95ca14f3-21c0-4b70-8ae3-7376e67bb516	1	Other	Other
+95ca22b5-decc-4594-a602-98947d9a3f70	1	Other	Other
+95ca3610-26d6-4fae-92ce-fcae27aebcc7	1	Other	Other
+95ca369c-bdd3-4dad-b1d5-ce0b47c65af9	1	Other	Other
+95ca70a7-8bf1-41b7-b2e4-cc8fa1fa87b7	1	Other	Other
+95ca7632-8f06-43ca-8607-0a97165c39a4	1	Other	Other
+95caa910-b730-4c45-b764-e4c9f6b9f6c5	1	Other	Other
+95cade47-90c9-41c6-91ca-81a17901a931	1	Other	Other
+95cb08df-abf8-4807-a5ef-6d7dacc67858	1	Other	Other
+95cb4423-0386-4a29-aa57-bf900e7e0748	1	Other	Other
+95cb8550-88c5-4641-b212-83d63c90cd88	1	Other	Other
+95cbc3d3-e116-453d-8396-e21d3f4d81ce	1	\N	Other
+95cbcadd-6402-4ae7-be50-cadfc079ad3f	1	Other	Other
+95cbe25d-3fd2-4596-a665-61353978e8b2	1	Other	Other
+95cbfea4-5587-4821-8975-81f4bea3cb8e	1	Other	Other
+95cc0f8d-d32d-4694-bfcd-fb08db186072	1	\N	Other
+95cc5465-51fe-4f73-b3ec-3172cddf648f	1	Other	Other
+95cc6dae-c8b3-40ae-8b6a-c485eea825ce	1	Other	Other
+95cc7ce5-1d7e-4abe-a108-2c965ed62597	1	Other	Other
+95cca499-39c9-40be-a651-bf65fd148cab	1	Other	Other
+95ccb20c-f4bb-4d9a-ac24-65cf9783c11c	1	Other	Other
+95ccb94a-a691-4a36-8d36-73b526b39a9f	1	\N	Other
+95ccd55d-1c47-48ca-a08d-4f48c99db189	1	Other	Other
+95ccd597-7856-425d-8f82-cfdf573e7f0a	1	Other	Other
+95ccdc87-5d00-46ad-bdb6-713e9a216119	1	Other	Other
+95ccde99-0af7-44dd-b9e9-b66aedb35d27	1	Other	Other
+95cd2e65-9605-4392-bc87-6f30d44b9ebb	1	Other	Other
+95cdf48b-aa5c-4ac2-9a5b-4e0e863d20b6	1	Other	Other
+95ce08ec-102a-4968-aefa-12d101e0d56c	1	Other	Other
+95ce262f-9fbc-4f58-a1cc-550beddf4751	1	Other	Other
+95ce381a-98b4-4ee5-92c1-a242e3a7c0aa	1	Other	Other
+95ce4324-a3f1-4ab2-b997-c8daa324ac89	1	Other	Other
+95ce7a92-5350-4bf1-bbdc-19f23e7426bf	1	Other	Other
+95ce8a10-bb80-4eda-aa27-0e6b11930b0c	1	Other	Other
+95ce98a8-899d-4b90-8b2b-c139e656dffe	1	Other	Other
+95ce9e52-b4a1-4180-9175-6a132b71b497	1	Other	Other
+95cea44c-26c4-41a6-a396-061dc294afa3	1	Other	Other
+95ceb939-395f-45e3-9eed-cdfb360f65a3	1	Other	Other
+95ceff8a-f9e5-4176-ade6-7d69c6aaa7a0	1	Other	Other
+95cf61fe-0ec9-4503-9392-7b49b779c456	1	Other	Other
+95cfef34-c269-4764-8262-3c90ce23e8f8	1	Other	Other
+95cff7c4-99c4-4f5c-b78d-1c9defa3b7bc	1	Other	Other
+95d014bd-2ddf-486a-b423-2352a787d236	1	Other	Other
+95d067dc-8b51-42c7-96ff-9bd6d891d719	1	Other	Other
+95d06ea1-974b-4b6b-b30c-375b5236abc7	1	Other	Other
+95d07428-d2d8-4c63-b889-f31b4b9b5155	1	Other	Other
+95d08048-0af7-4a1e-b6d1-1d408d7a3937	1	Other	Other
+95d08339-9b12-4c7b-b610-70ead4050db2	1	Other	Other
+95d08af0-5368-467d-85d3-e4d65633233f	1	Other	Other
+95d0a75c-abd9-427f-8912-998f4d16c8fd	1	Other	Other
+95d0c10c-7f0f-419c-a063-5274028c508e	1	Other	Other
+95d0c6a2-aecb-4dd7-b8af-30da62844ffa	1	Other	Other
+95d10e54-9590-4241-99de-9680aba8b403	1	Other	Other
+95d14781-dee6-408e-ab4b-396ee2522c80	1	Other	Other
+95d1872e-b3cf-4ba3-a02b-5f7db76160dc	1	Other	Other
+95d1b58c-563c-4f40-8355-2c6703eeff6c	1	Other	Other
+95d1c314-9f47-4749-b6e7-c5c89c7fa083	1	Other	Other
+95d1fb0e-1d43-44c4-a2c7-126ff4890f89	1	Other	Other
+95d217d4-15f6-478c-b965-32954cb7e27a	1	Other	Other
+95d228df-6c70-4dc9-983c-8fcab9eded47	1	Other	Other
+95d2c72a-46cd-4606-98f6-698ac3195795	1	Other	Other
+95d2c77e-7753-4f3b-8700-c048b9f0c43a	1	Other	Other
+95d37dbb-02b0-4002-a30e-5c0a14559a0f	1	Other	Other
+95d46ad9-f041-4e5a-ad8a-422ce0fee295	1	Other	Other
+95d46e7a-9783-4fa2-a5cc-c372855bf2ad	1	Other	Other
+95d4ae80-fdbe-41d0-ab80-a54dddf91a2e	1	Other	Other
+95d4b356-578b-4fe5-8703-5fc34872bfa6	1	Other	Other
+95d4d70d-6105-4ced-b6dc-0b7c1284e08f	1	Other	Other
+95d4ee5a-a143-4c14-bfc0-579be908ed82	1	Other	Other
+95d4eff0-741c-4bc0-af03-4c6cdfb29380	1	Other	Other
+95d4fffc-21ac-4197-b44e-4019051408ce	1	Other	Other
+95d53240-8739-4239-a2c7-8304a03c3742	1	James	Other
+95d53453-7bc1-429c-85e9-3392fe9b0125	1	Other	Other
+95d57d4f-2f65-461b-a5bb-a947e3ae7d0c	1	Other	Other
+95d5b5ae-dd97-4e7b-a3ae-9d169085e07c	1	Other	Other
+95d5cd87-b1f0-4dda-a73a-382e625347b7	1	Other	Other
+95d625d5-b09d-47c7-9f7a-f0220ff8fdc0	1	\N	Other
+95d64e8f-5f81-4f62-bb50-16c1ef0f7fce	1	Other	Other
+95d654de-b91b-4fd1-a491-aa48ac1ba30f	1	Other	Other
+95d65920-2e75-45ec-a5b7-133fd854b755	1	Other	Other
+95d672e5-7c5c-487f-9d53-db767fd20ae9	1	Other	Other
+95d6a5a4-3fc1-46bd-be09-80157fe376df	1	Other	Other
+95d70bec-0eb3-4588-a087-3be0d3bf826a	1	Other	Other
+95d70cac-6102-4a9f-b2c1-c19e24c15d20	1	Other	Other
+95d7f258-0bfb-476b-846c-a05370abee32	1	Other	Other
+95d80b26-4ee7-4025-8b78-a04abd88d1ee	1	Other	Other
+95d820bc-350e-4c19-97dd-72346961e6a3	1	Other	Other
+95d854d4-b326-4455-9098-5249efdaddd7	1	Other	Other
+95d8a569-c011-4a90-821e-6f982eebaa75	1	Other	Other
+95d8a83d-5a10-4c3a-b4ad-c442b2c129dc	1	Other	Other
+95d92a54-fc47-4d83-9215-35ad2acda9fd	1	Other	Other
+95d92f40-800b-49db-8b58-2f1f55e40232	1	Other	Other
+95d949a1-297a-49cd-ba5e-edb1500bf55a	1	Other	Other
+95d95455-2124-4e8d-ab25-fa6cc763eae1	1	Other	Other
+95d996f1-306b-4d06-8dd5-63a1a8fa0929	1	Other	Other
+95da0357-eab6-4956-a3cc-3a500f3b12a9	1	\N	Other
+95da310d-e86b-40a1-9095-4a23d5306e35	1	Other	Other
+95da56b9-bf70-4e99-83cd-df71b951833c	1	Other	Other
+95daca2c-91f6-45e0-88de-68af0999afb1	1	\N	Other
+95dae9ce-6e9c-47c1-8aba-229e2bc5532c	1	Other	Other
+95db0b10-32c1-4e7d-89c9-ae254c7f524d	1	Other	Other
+95db1b50-2492-40ba-af35-05305c192378	1	Other	Other
+95db470a-7dde-4a2b-83fe-86e267e9806d	1	Other	Other
+95db7201-51c3-4a7a-a340-3990b53d0b95	1	Other	Other
+95db9c1f-9186-4f10-b217-ae8c4b8d3ff8	1	Other	Other
+95db9ce9-27d1-4655-873e-37af7d031239	1	Other	Other
+95dc3d41-8f0f-4225-844f-bea4e596dc73	1	Other	Other
+95dc4141-d632-4aea-9bf4-c83e550b1613	1	\N	Other
+95dc43e1-6911-4ce1-bc5b-8097424f0ee7	1	Other	Other
+95dc68e9-1e13-4b05-8391-615b152a0b00	1	Other	Other
+95dd1be1-f8b2-4058-8b72-45d98dd564e6	1	Other	Other
+95dd9b4b-e9c6-499c-8e50-78a48d7cfb78	1	Other	Other
+95ddb1b2-0647-11e8-80cb-fa163e8624cc	1	\N	Other
+95dddcf7-e3c3-44ef-a3a0-8a0529f31f9e	1	Other	Other
+95de04b3-7788-425d-bb65-c96f427499ea	1	Other	Other
+95de2e9e-d1b0-419f-9166-5dde37f8c878	1	Other	Other
+95de41f5-620d-40a7-b570-d9ba960925bb	1	Other	Other
+95de750b-c2a4-4183-aaff-a50f6439d207	1	Other	Other
+95de939b-bfc5-489e-b1fc-3d34e7cd8716	1	Other	Other
+95dedd8d-78c6-4d1d-a86f-6bf1203038ef	1	Other	Other
+95df0b3d-a584-49b7-9e81-74590b54ffa4	1	Other	Other
+95df3527-70d6-43ca-a54b-28fb8e72b987	1	Other	Other
+95dfc9a0-93b3-4e7c-8502-e61b3316c0a8	1	Other	Other
+95dfe888-8336-4db8-80c5-64a58591995d	1	Other	Other
+95e012af-7476-4638-98d7-1c98343648f7	1	Other	Other
+95e061eb-a19d-4f0c-b658-2a971e13d057	1	Other	Other
+95e06b11-9a0a-4e39-82cd-95c359c9bec2	1	Other	Other
+95e08aa1-89ed-4636-92c9-fce9ac7a698a	1	Other	Other
+95e0aad9-8b02-4d5c-a0f4-86ac30c0e604	1	Other	Other
+95e0ac0d-a986-4d21-9155-15defa969e56	1	Other	Other
+95e0b869-63c6-46bc-96d2-bf54ce3b97b4	1	Other	Other
+95e0c877-653c-47c9-9b00-fe32758c6b43	1	Other	Other
+95e0f0a3-4a35-4407-a3ba-93e5de7f65e0	1	Other	Other
+95e179dd-25a3-424e-9f9b-87c405d28aaf	1	Other	Other
+95e18af8-fa2b-4413-999f-359402a4dcdf	1	Other	Other
+95e1ba4c-bd65-4192-a0f6-7ee063dcf751	1	Other	Other
+95e1d4ec-5d75-41b8-b1a4-abdd4f5fa03b	1	Other	Other
+95e1e022-ed5c-4e37-947c-0e7b5d09b9ed	1	Other	Other
+95e20036-d265-4e57-810f-1effae034791	1	Other	Other
+95e2027d-97bf-4578-90fd-4cdcc31a9ce6	1	Other	Other
+95e207b5-25ce-4c18-942a-6cac57390246	1	Other	Other
+95e2164d-ddc5-40d5-9b3d-21c3996ee033	1	Other	Other
+95e2265a-4f58-4e52-b624-a0ebffa1f4cd	1	Other	Other
+95e284e5-708d-4e36-8745-ce0cac39183b	1	Other	Other
+95e2d6b8-1541-41a5-b887-bc00f2971703	1	Other	Other
+95e36791-85e5-422a-a498-21d0e4ae7352	1	Other	Other
+95e36a98-5ae9-4bcf-b469-799b4e05f8b8	1	\N	Other
+95e37524-bb79-4a19-be84-c3b55d36380c	1	Other	Other
+95e3a9a6-2e3f-406e-b2da-20a4beb65ac0	1	Other	Other
+95e3b23e-9002-4206-a906-453eb8680714	1	Other	Other
+95e3c4a0-0193-4ee8-9902-9ec1a1ec888a	1	\N	Other
+95e414d3-8cec-4c16-99ec-b82073c1c4c5	1	Other	Other
+95e48309-218e-4c28-9442-fc4fe109199e	1	Other	Other
+95e4cc4d-f330-4584-8cc1-392fc33eef5a	1	Other	Other
+95e4f779-2058-46c6-b3ff-ec7ef5a61187	1	Other	Other
+95e5438f-95d0-4b02-8bdf-4f544354553d	1	Other	Other
+95e5b40c-b36d-4f9f-a4de-904fb154461b	1	Other	Other
+95e5e8e5-2045-4fab-aaf6-7e9a3511c7c4	1	Other	Other
+95e62145-e9cd-4fc1-8edc-ea9dfbff6784	1	\N	Other
+95e62eb4-1893-4229-aa09-0f1a61eed440	1	\N	Other
+95e660c9-9f49-4dc0-b3c8-120083274998	1	Other	Other
+95e66b29-5758-4751-b41b-1308142fd6f3	1	Other	Other
+95e6913b-ec70-4d6e-a6db-16f2db4b30f8	1	Other	Other
+95e6e013-2d90-4014-9197-fe1e933d4a81	1	Other	Other
+95e6fa84-414d-4729-abca-3652ad72ef98	1	Other	Other
+95e753be-36c1-49ba-a08d-bbcc91365f87	1	Other	Other
+95e767ae-fa0d-4983-935a-bf041aad4e20	1	Other	Other
+95e7b4d8-3989-419d-9653-24c65d6e074a	1	Other	Other
+95e81902-e0b2-4f67-8f38-53526a5c29d1	1	Other	Other
+95e82db8-e220-4880-8eab-59303f534217	1	Other	Other
+95e83c28-a76d-4d3c-bc50-da44a2943484	1	Other	Other
+95e83f9e-30a6-4a8e-b2cd-53941943e918	1	Other	Other
+95e84cd7-30cd-45d2-b106-cab71fe1c7ad	1	Other	Other
+95e856bf-657b-4218-972b-2fe9a827c0fb	1	Other	Other
+95e895c5-8260-4e7b-a4bf-ccfee5e45dce	1	Other	Other
+95e8e29b-1dbc-4439-9eaf-74fd3b85f592	1	Other	Other
+95e917b6-0a11-4982-9b1a-fd5c28889033	1	\N	Other
+95e94149-767c-42bb-8361-8f98c2a805fb	1	Other	Other
+95e992c1-9549-43ec-b2c1-6fb2d288a73c	1	Other	Other
+95e9b5e4-d645-49df-bda8-052b4724c766	1	Other	Other
+95e9c103-e7c8-4fae-8096-c56ba76dc497	1	Other	Other
+95ea55f1-7ce3-46c6-b191-4ce3dc9a6b77	1	Other	Other
+95ea6c90-1391-4a56-83b5-08b8c1379cb2	1	Other	Other
+95ea87f4-095b-11e8-9ed7-fa163e8624cc	1	\N	Other
+95eac568-bd1a-4ec6-b88b-028024f2a9c7	1	Other	Other
+95ead54a-f7ba-4e18-b741-59c0b8798828	1	Other	Other
+95ead61f-17e4-443e-8c45-4c179e08e79c	1	Other	Other
+95eaec93-2d13-4be2-8ff3-ecb0d90c49c9	1	\N	Other
+95eb12b7-2710-4ab3-9d19-1d4b412561e8	1	Other	Other
+95eb1aed-0002-47dc-9ff6-e1f115456804	1	Other	Other
+95eb38ca-f20a-4238-a13b-d7374d513a87	1	Other	Other
+95eb48db-3721-4d2d-b746-34b9b5fac1d0	1	Other	Other
+95eb6403-8307-47ab-963c-9cb555f95897	1	Other	Other
+95eb6ecd-653b-4f79-a5d4-d98f2f8550cb	1	Other	Other
+95eb9000-c1ec-405d-87e6-a88bbc2796cc	1	Other	Other
+95ebc5f4-9fcb-4f5d-b176-6e3fc1bfdac4	1	Other	Other
+95ec058e-89a3-4d85-8664-d94a34a2dfce	1	Other	Other
+95ec0fed-5255-4e6f-973a-fe749f443639	1	Other	Other
+95ec1035-960e-4ba1-94bc-28b9c328f49b	1	Other	Other
+95ec3719-1922-49c2-82fc-fc0eca027c7f	1	Other	Other
+95ec4997-28e9-4600-a512-221be93f430f	1	Other	Other
+95ecc8c5-e02a-4804-b628-75740c8ad035	1	Other	Other
+95ecd4ae-a8bf-4a14-9042-f1b1f914a260	1	Other	Other
+95ed5ec6-356f-472e-b3c4-1318d954b867	1	James	Other
+95edb71c-1566-42d6-bb88-05749da8d1d7	1	Other	Other
+95ee752e-8289-4837-8a60-68e7ad9cce33	1	Other	Other
+95ef16ce-2cfd-4de9-8342-19ae4005276e	1	Other	Other
+95ef6351-c8ed-48e8-971e-63fe8d0e6dc1	1	Other	Other
+95f06855-96c7-4e60-a741-f9d09d407133	1	Other	Other
+95f06be6-5801-4541-9cc7-29a1898f738f	1	Other	Other
+95f088e5-8365-44d2-998f-40497aba4a06	1	Other	Other
+95f092f5-3353-49cb-bb7a-67bfa4139bf2	1	Other	Other
+95f0bbb4-a017-47f1-8551-c81378e5eee2	1	Other	Other
+95f0ce5a-d842-48d4-9c3c-cbe7f4732be0	1	\N	Other
+95f177f1-b7bd-4223-89ea-4aa0d8564a8b	1	Other	Other
+95f1814f-0a7b-4a8a-bedf-dc4139c4b0c2	1	Other	Other
+95f18f20-a140-47c7-914f-b6e0aa4d8ec3	1	Other	Other
+95f1ab4b-d29c-4627-9069-edc4d53ad69a	1	Other	Other
+95f1c226-2997-48c4-b029-fb2caff195a5	1	Other	Other
+95f21b1b-ba47-47d8-a314-235cd164c722	1	Other	Other
+95f21eb9-b388-49dd-a08a-d853e8252815	1	Other	Other
+95f255c8-77cf-420f-8ee0-aac173754443	1	Other	Other
+95f28c1f-29dc-4290-a4ff-93b1e5921478	1	Other	Other
+95f2ce65-c92a-4ea5-929e-bfda25f94a8a	1	Other	Other
+95f2da53-b935-4d1d-b7ba-bd6e39c32a7a	1	Other	Other
+95f2dba7-5f23-44a5-a5e7-1ad598ee7c85	1	Other	Other
+95f2f301-0ca0-40d1-a29d-e58aac718778	1	Other	Other
+95f31115-13fd-4e33-a1f8-8b33ba681977	1	James	Other
+95f32d99-ab69-4564-b290-32bce2296bb8	1	Other	Other
+95f38ae9-5b87-450e-999d-ad347187721d	1	Other	Other
+95f38f52-095b-11e8-bf34-fa163e8624cc	1	\N	Other
+95f40e92-3100-4cb3-b03a-ec5766d91493	1	Other	Other
+95f42ab5-99e3-43dd-b4f5-d53e8b04e15d	1	Other	Other
+95f43bed-ea1b-4f49-8ed7-738f6f6ef8a9	1	Other	Other
+95f484db-27d3-45c1-ba7e-42ea6beb57a7	1	Other	Other
+95f48c11-e585-4db1-a56c-98d185dfdb3f	1	\N	Other
+95f490c3-ce8b-4e67-b564-11c0a5da0878	1	Other	Other
+95f51726-5311-44bb-8f9a-fda2ea8b7b1a	1	Other	Other
+95f53302-8ab0-4eab-aa34-b41866d2ba69	1	Other	Other
+95f5399c-9b40-4a76-8840-f7fa4a69c7c9	1	Other	Other
+95f57a85-aadc-435a-96b8-68ef79e901ab	1	Other	Other
+95f58603-3c04-43df-9f56-12e0ea57afb3	1	Other	Other
+95f5e06b-1656-461b-8ab0-6b1ec9166844	1	Other	Other
+95f65063-2e32-4d94-9314-9bf2bd970ba9	1	Other	Other
+95f65727-9e50-4798-8eb9-ed50a158fdcf	1	Other	Other
+95f67360-d508-42ab-b8b6-60ad5885eafe	1	Other	Other
+95f6d494-acbd-4383-99d1-ace3de17e114	1	Other	Other
+95f6ee7b-f173-40e9-b30d-95c9fc8a5d06	1	Other	Other
+95f6ee83-c3bd-45c3-ba46-793d78b8cc1e	1	Other	Other
+95f6fc90-4ee6-4651-bf1d-54f8068f0763	1	Other	Other
+95f73de2-f695-418e-9c03-91230ec0a825	1	\N	Other
+95f7b014-21ba-4c5c-b464-118b15d9e701	1	Other	Other
+95f7be94-2c27-4439-a1a6-e82c74a00d36	1	\N	Other
+95f7c541-a034-4d44-8185-809f1761f1cc	1	Other	Other
+95f7db51-8179-4378-bdf6-d2d096236b8f	1	Other	Other
+95f7f9e6-704e-4daf-aed7-ec5448f73fe5	1	Other	Other
+95f81b3b-50f2-43e1-905b-5e4415988354	1	Other	Other
+95f8b391-0a7a-43b0-8f3f-41ca754eadfe	1	Other	Other
+95f8bd0b-2eeb-401c-9f6f-a01a2b986292	1	Other	Other
+95f8dead-9b8e-4a77-87a3-28413e86cd26	1	Other	Other
+95f8eaa9-6434-4e90-b653-3fdeff42e94a	1	Other	Other
+95f8ebcd-d2a5-490b-ba4e-ed175447b816	1	Other	Other
+95f8f164-b1f5-4ecc-bc76-9ad9db1f10d4	1	James	Other
+95f909d6-39a2-421e-b3d1-48e25357f001	1	Other	Other
+95f91d50-a1af-45c1-a0d9-96e2d514055a	1	Other	Other
+95f948fc-3e48-4313-9fc4-dc897399e54b	1	Other	Other
+95f9d6b8-0a85-43a5-868b-2e7550a1c01b	1	Other	Other
+95f9e284-985b-4e96-9eca-25bedbacb6e2	1	\N	Other
+95fa8155-2c50-4975-8e97-e6a275893376	1	\N	Other
+95facd2e-ac37-46db-84a3-01c98bbf7edb	1	Other	Other
+95faf3cf-10c8-41b5-b5f5-2b33fb54409d	1	Other	Other
+95fafa2d-ccdc-4e2a-8872-7035546d2279	1	Other	Other
+95fb5200-92ad-4132-bcce-74937f94dcaf	1	Other	Other
+95fb5a4c-4baa-4f43-a7cb-3fad74f1697d	1	Other	Other
+95fb73bf-808f-44ae-a12b-4e813f796e56	1	Other	Other
+95fb8114-e249-45bb-bbb3-af5cd227b6c8	1	Other	Other
+95fb908e-0448-44cb-b539-2f29ab77704b	1	Other	Other
+95fba93c-623c-4b5e-92b3-202ab811bb61	1	Other	Other
+95fbb2c6-f613-4fef-843f-3d7dc1cfd077	1	Other	Other
+95fbc2ac-c7ee-418d-9848-81fe40691d6b	1	Other	Other
+95fbc782-5dc7-474c-873a-be05bf3b77d8	1	Other	Other
+95fbef97-9a52-4a78-8db9-469e3a70ea04	1	Other	Other
+95fc1cba-b4a0-4503-8ea7-b2a32eccdb1e	1	Other	Other
+95fc5091-0649-40d5-8448-50f25e2b7452	1	Other	Other
+95fccff8-3a59-49d9-b83e-d3168daa0cb6	1	Other	Other
+95fd42a0-0277-4f16-a798-92675ff8b054	1	Other	Other
+95fd441a-f6c6-4cb2-9c61-7346cf770fbb	1	Other	Other
+95fdd320-dccf-4a91-a497-62e1ec6a67b3	1	Other	Other
+95fddf13-6e65-4b86-a216-c51149669349	1	\N	Other
+95fe21bf-d863-4d77-9cd3-765b7ccd9cea	1	Other	Other
+95fe4bc9-d91a-4d1c-9eab-ac7f799e2d16	1	Other	Other
+95fe7126-16cc-4643-bb7a-875933dcb75d	1	Other	Other
+95fe7d17-707a-42b0-88ba-9465aa491859	1	Other	Other
+95fea443-c88f-49f3-80dd-1224336113cf	1	Other	Other
+95ff17dd-b28b-44eb-b8c5-3526e3b121ad	1	Other	Other
+95ff1eda-f3ed-4ca5-8059-d08e1dce4cfd	1	Other	Other
+95ff22d1-51a2-4fc4-9db4-c19338f30bb2	1	Other	Other
+95ff25ea-7375-4d8a-9d20-de1f2cbfefac	1	Other	Other
+95ff2922-26e1-43db-8a3a-eae678d14077	1	Other	Other
+95ff3057-efd0-41c4-8e8a-0ef1d6f933ca	1	Other	Other
+95ffbf7b-af9d-40a9-86db-dad5aeffc449	1	Other	Other
+95ffc13d-a0c1-44f7-9587-5abe3b9802a8	1	Other	Other
+95fffd14-1108-4972-b426-52121888c285	1	Other	Other
+960001ad-d355-4653-b21e-240d2247ae1e	1	Other	Other
+96000e43-ecf3-4fdb-9b5b-5a11ad82bdee	1	Other	Other
+96003f31-bb26-4835-b8b9-f9982e265d4d	1	Other	Other
+96005dac-0bc7-4cb7-9d58-1f9d99aaba78	1	Other	Other
+96006724-7c7a-4a00-a583-c31f5c6cb847	1	Other	Other
+96006b80-c3c4-4fd5-8412-f29434af14fb	1	Other	Other
+9600b1a2-3caf-476d-852c-89c30761f140	1	Other	Other
+9600d05e-f57a-4b64-bf35-acae9a3196bf	1	Other	Other
+9600dc82-764a-4ad3-9ba6-fddb2b10bfd2	1	Other	Other
+9600e421-7b93-4e41-9580-751b19d15bd8	1	Other	Other
+9601214a-541d-4c61-880e-4f7c76eb5c78	1	Other	Other
+96014b2b-a9ad-4e79-b59d-434a4b44d46b	1	Other	Other
+960160a9-2e88-4c41-8ede-afc036dea78b	1	Other	Other
+96016caf-e859-4441-afa3-c44a91b4662b	1	Other	Other
+9601a2bd-5988-4da4-9111-e606d3c2cf42	1	Other	Other
+9601a5ff-bc7c-415c-aac9-5ee497b5fee6	1	Other	Other
+9601b43d-b4c5-4cdd-a7ec-29eb9416d792	1	Other	Other
+9601f97d-3993-4912-bf36-5773e4c65907	1	Other	Other
+9602041c-65d4-4360-b7c2-be58c0923e39	1	Other	Other
+96022f57-4593-44c0-b430-fd293b31e3fe	1	Other	Other
+96023614-7bdd-4016-8602-827164b77e89	1	James	Other
+96033a8b-9367-492c-96e5-11bc50cf9352	1	Other	Other
+96034a15-e0e5-4fbd-b002-154301429431	1	Other	Other
+9603615f-2a76-4c14-8a02-d1a3d66c33b8	1	Other	Other
+9603d2c9-d25e-4c73-a16b-682813e51931	1	Other	Other
+9603dba1-04dc-4f0c-84db-6b44e86459aa	1	Other	Other
+9603e853-4dc5-4e8f-ba73-4b901abc0181	1	Other	Other
+96042607-85e6-4e16-a375-3dc40b87c614	1	Other	Other
+960453d7-6e77-4ce7-a704-8127b5982958	1	Other	Other
+960464e6-b8fa-4a54-bc2e-18e7894c7e06	1	Other	Other
+9604a570-41b4-4dc7-be8b-b49492917bfb	1	Other	Other
+9604d395-3c75-40e6-b04e-716aee6a685b	1	Other	Other
+9604e84e-13d9-4cb6-a824-658779c56642	1	Other	Other
+960571d9-8008-4331-b8a7-3085e16ba79f	1	James	Other
+96057e15-cca1-4114-b800-9982e4bc2f03	1	Other	Other
+9605d139-7f54-4e14-897b-636f810b6671	1	Other	Other
+9605f59b-5381-4006-a3fc-0c656be33bdb	1	Other	Other
+96064dbc-a595-419d-a7d6-da9d2493e8c3	1	Other	Other
+9606bd5a-c2aa-4282-ba07-d75e507c82d2	1	Other	Other
+9606c4db-f393-4619-aa1a-344eff2d8b47	1	Other	Other
+9606d46e-27fd-4c76-91cd-ccae69b8c8c5	1	Other	Other
+9606dfac-6d04-453d-b2d8-d354e75e301f	1	Other	Other
+9607150d-e727-4d30-9f1c-abad576d4d46	1	\N	Other
+96077f6c-af8f-4752-89a2-9aa40569606e	1	Other	Other
+96079366-4734-4f8d-b5ba-2cdca5238e46	1	\N	Other
+96086e9b-b1f0-4f70-8cb3-635abe9bf275	1	Other	Other
+960879e3-b925-4e45-b2fc-619a61bdbc54	1	Other	Other
+9608ae94-0647-11e8-b578-fa163e8624cc	1	\N	Other
+9608d85c-b15f-4739-b123-53f1eb4ef67f	1	Other	Other
+9608e35a-d975-44c0-96f6-fdc0e2edcd7d	1	Other	Other
+960949cb-37b4-4b24-9f32-3e5d42ab741d	1	Other	Other
+9609697f-81b4-4802-9ae4-4f4d2495dd13	1	Other	Other
+960a123c-b9a4-47fc-abb2-cc64c45d2236	1	Other	Other
+960ad71a-ec06-48b8-b283-19f11a7ea03c	1	Other	Other
+960af82c-9ef8-42c8-b7c0-7f76b8810f56	1	Other	Other
+960b033f-b048-4e07-a3ab-b97a776252dc	1	Other	Other
+960b6418-0ac2-4678-acb8-b402364aa6be	1	Other	Other
+960b797e-499a-4b90-8101-a3610c25bd3d	1	\N	Other
+960bb1dc-65f1-4ed2-b02c-d48dbbdc4519	1	Other	Other
+960bd2a1-46d6-4687-9f24-93a2352353a1	1	Other	Other
+960c6700-2055-4ce5-abee-2f0dafc7465b	1	Other	Other
+960cd2c9-7167-4f5c-bd07-c479f4acad75	1	Other	Other
+960cfcd8-0647-11e8-afed-fa163e8624cc	1	\N	Other
+960d0b7d-0622-4db3-b098-53ef597a944f	1	Other	Other
+960d1ce2-4d82-40de-b01e-983d88e6e217	1	Other	Other
+960d2d93-1b8d-470a-afc0-817e77d16900	1	Other	Other
+960d512e-0985-4129-bdb1-a6831d9bf1c7	1	Other	Other
+960d6236-dc0f-417f-938b-7e5296c8db63	1	Other	Other
+960d876e-9e5c-4cd6-94d8-f380747f6c83	1	Other	Other
+960dab44-6299-472b-9135-392192b9575f	1	Other	Other
+960e0616-27e9-456e-af64-df5a41d102e6	1	Other	Other
+960e9fc3-f780-49e7-882a-1e1f679df978	1	Other	Other
+960ea77a-2886-466c-8375-a4c73478c718	1	Other	Other
+960ecd4b-7cac-44a1-895d-3e1d4b4acb78	1	Other	Other
+960ee9b4-ced7-4311-b091-85b62bdc813b	1	Other	Other
+960f1b91-82ed-4ab4-afd6-8585afb7d3b9	1	Other	Other
+960f448e-82bf-486d-ab33-264cc8c9a815	1	Other	Other
+960fb86e-0f78-4524-ad25-4f63abf2b21c	1	Other	Other
+96102e25-449d-4afe-af6b-3bb48d52f945	1	\N	Other
+961039ea-b183-43dc-b45c-8cd927451a14	1	Other	Other
+9610b8e5-06a2-4220-88e2-767d897ed987	1	Other	Other
+9610ce47-4d17-4679-b79b-73a96509107c	1	Other	Other
+9610dc10-1efc-4f65-8803-f8938fc9dea6	1	Other	Other
+96111e28-f751-4bad-a914-66bfc6f75b7c	1	Other	Other
+96114060-dc9d-472a-8473-f6ef87e75549	1	Other	Other
+96120499-7a73-4443-8775-99448f4d8385	1	Other	Other
+96120a9a-2841-444c-ab3f-f177dffa1488	1	Other	Other
+96124369-0ea5-40c7-a32c-6657fbd7b7a5	1	Other	Other
+96127c11-e0e1-4b83-a360-2f4b1eacebd0	1	Other	Other
+96129db7-d905-4cba-9c16-9355c0606252	1	Other	Other
+9612c4cd-d42b-4765-8c9c-83b35830cafb	1	Other	Other
+96134ba8-ee73-40f2-b56c-9ab0a4ddc2cf	1	Other	Other
+96135c12-cd1f-451b-993b-a4c4492a62a9	1	Other	Other
+96141f31-9422-40e1-a159-0a4647c421f9	1	Other	Other
+96142149-dd30-443b-9961-d36734bc6fcd	1	Other	Other
+96143a65-e4eb-41bc-9128-48ae75b5a2af	1	Other	Other
+96143c37-ce8c-41c6-a5d8-a1da30863e1a	1	Other	Other
+961458da-54bc-4808-b931-b81b16a75e15	1	Other	Other
+96145af6-0467-4235-beb5-5aa1298f7300	1	Other	Other
+96147fdf-b43e-4c2f-bc44-db64e22539cc	1	Other	Other
+961487fd-9427-4d66-ae1c-46875799811d	1	James	Other
+96149ed4-6890-4b53-aa12-7f24063a3ac5	1	Other	Other
+9614b81a-23ee-4a6d-b382-37154f9654cd	1	Other	Other
+9614ef2b-bb96-4d3d-8305-dd0a4af67202	1	Other	Other
+96153743-3df4-43a0-b984-5523ca2c5a75	1	Other	Other
+9615456d-8562-46a5-b6a0-a16f521a0e80	1	Other	Other
+96159aff-2cff-4ee2-8b44-683ad4e5f2e2	1	Other	Other
+9615da53-da60-428e-8b7e-fb6ab1e13fc4	1	Other	Other
+9615e001-7733-48ac-9b3b-36ec79deaa0f	1	Other	Other
+9615f6cc-4b73-4545-9b6d-f528b771c926	1	Other	Other
+96161d18-dc05-4909-95cc-f615200009d3	1	Other	Other
+96171d2a-c4fd-446f-b503-bd9b3692e938	1	Other	Other
+961750a7-a0be-4c04-8ce0-25dfa1c83f58	1	Other	Other
+96177547-fe13-401a-941c-fbbda5a4c719	1	Other	Other
+9617b192-9b15-4066-ac9c-a86752bd5a94	1	Other	Other
+9617d30e-7250-4522-b41c-961d1df9643c	1	Other	Other
+9617e4f5-82a7-4a78-b1b9-60455ba0513d	1	Other	Other
+9618674a-be1b-4fa0-9a7e-c7f768409035	1	James	Other
+96186c97-6170-497c-b4c7-346a23d72e2b	1	Other	Other
+9618b941-2493-4bba-be96-21c7022ab84a	1	Other	Other
+9618bca8-867d-4a99-9f25-14bb35b72874	1	Other	Other
+9618f0fe-c538-47f3-a122-fcf952fbc290	1	Other	Other
+9619149c-2c6e-48d2-8781-b17e56eea575	1	Other	Other
+96192061-82a2-4650-96c6-5f1b59d8d867	1	Other	Other
+96193279-3986-496f-9f68-d09c6f255675	1	Other	Other
+96197ed0-91fe-4763-966a-f9cfb387526d	1	Other	Other
+9619a92f-3a17-4071-8375-b512db9822c8	1	Other	Other
+9619ea9a-b625-469c-a3ef-a583fa83d2b9	1	Other	Other
+961a50c0-696f-4706-91af-09ac28834568	1	Other	Other
+961a7846-2834-4b52-aa96-797a589495cc	1	Other	Other
+961a7849-5c00-4183-8971-e24d6d1a970f	1	Other	Other
+961a8886-6a51-4485-9276-d0518a2af8ba	1	Other	Other
+961aadaf-4d72-4c3c-9449-1397d8d103a4	1	Other	Other
+961ade6f-6003-4a29-846a-82b340dca5db	1	Other	Other
+961b175e-e2c6-444d-b7ff-2dc96d784f06	1	Other	Other
+961b50e3-4ac1-4670-99dc-03c92d483d8d	1	Other	Other
+961b8503-ccca-4aa5-a0ee-57200c148b04	1	Other	Other
+961be927-00a5-4016-9707-9ee1f2b1aebf	1	Other	Other
+961c0c66-095b-11e8-b43f-fa163e8624cc	1	\N	Other
+961c212f-d495-4155-a4a8-2d4a1fa6b9c5	1	Other	Other
+961c3bd8-3420-4103-a501-5b597ca86fa4	1	Other	Other
+961c875b-09be-4a5d-87e6-c226d1113680	1	Other	Other
+961c9e4b-7949-4291-9295-3d2747c538d0	1	Other	Other
+961cc415-aaaa-4e96-856c-3fcd58ce6481	1	Other	Other
+961d0f0a-7b63-4155-91f8-355938e4867c	1	Other	Other
+961d352e-fb6d-462a-81ea-404792b7d9cb	1	Other	Other
+961d6cdb-0761-4752-8ce0-e44236b1047c	1	\N	Other
+961d7c33-b530-4177-8f5f-6f980b40b115	1	Other	Other
+961d7c72-190c-4f1b-85bf-528e8e57ffb1	1	Other	Other
+961dcee7-81bb-40fc-a3f7-6d2836e67fc0	1	Other	Other
+961dfa7f-9011-4173-ba7d-0e604d410382	1	Other	Other
+961e0732-401b-4101-b0f6-e45e1931220b	1	Other	Other
+961e2034-41a1-4a41-953d-90863ab96f35	1	Other	Other
+961e594c-bb4d-44cb-a990-41a8a376e915	1	James	Other
+961e9356-69f9-4571-9f48-482dea214e54	1	Other	Other
+961ec1bb-46d2-4c34-9787-c98077c085cc	1	Other	Other
+961f731c-7738-42c2-b952-0192f0ce9553	1	Other	Other
+961f8c8f-fd6d-4928-a635-95f1efce168a	1	Other	Other
+961fa3cd-23d6-4b3d-82ae-1dfe49928e57	1	Other	Other
+961fe1c5-3078-4a4a-8213-45c9c2ef535f	1	Other	Other
+96200d78-7f54-4a12-b14e-030494b04bd6	1	\N	Other
+9620198c-095b-11e8-87b9-fa163e8624cc	1	\N	Other
+96201fc2-024d-4709-b6dd-5f39622d502d	1	Other	Other
+9620d44d-ec9e-4a46-be3b-71bf5a191ef9	1	Other	Other
+96210e31-866b-4462-a4cc-2275e0552714	1	Other	Other
+96211aa5-d2f9-48a6-a465-b6bd5b1fcf44	1	Other	Other
+96213bdf-43fb-463c-a4e2-f278b14c96e5	1	Other	Other
+96219d1c-a292-4218-9f1b-91eb0bf7a220	1	James	Other
+9621aa14-6d76-412b-bc18-d2a2115ec53a	1	Other	Other
+9621b738-1ade-4cc6-b0af-0a148bcb8a56	1	Other	Other
+9621c570-a2de-4a0c-a469-396afde496a8	1	Other	Other
+9621da1b-cd68-4736-be75-ed5f81b57a3f	1	Other	Other
+962224af-2e75-46b4-b2e7-71255b7dcd5b	1	James	Other
+9622605a-42e2-4e0c-8aa0-b42bd2d9e640	1	Other	Other
+96228ecd-56e0-4890-9bef-2e1755eae6c5	1	Other	Other
+9622b667-fc69-4dcf-bfa6-0bcf76bc7b08	1	Other	Other
+96232743-2446-4ac9-86f0-66e89362bfc7	1	Other	Other
+9623318a-4912-4250-843c-79d38ac564c1	1	Other	Other
+96233463-4c35-47ab-8cda-b202fc72be14	1	Other	Other
+96238c54-7c49-4add-a585-5d03a68dd83c	1	Other	Other
+96247db8-432b-44a6-91dd-7fa713bc9a92	1	Other	Other
+96250b2a-6cb8-4d09-a07b-00cf8008a583	1	Other	Other
+962514b1-e724-4ba4-80b2-8c8af3cb580b	1	Other	Other
+96251a3a-e995-4820-a27c-0335c2e41ddc	1	Other	Other
+96253450-ddc3-43d9-a975-d6d83bd0faae	1	Other	Other
+96253e07-eb5e-4e8c-9066-0eaf64ac35e3	1	Other	Other
+96256357-1ec5-4759-81b9-e154e327c038	1	Other	Other
+9625654d-8368-4827-911e-c814470663a8	1	Other	Other
+962583a5-efb8-48de-91cc-1af4989b97b5	1	Other	Other
+9625cc21-0e0e-41c7-bccd-c6e3b456e2e5	1	Other	Other
+96262417-10b5-45db-b943-56bc52f034a5	1	Other	Other
+962624df-8627-424b-8a1f-e0e41b5772a2	1	Other	Other
+962631d0-9d3b-4e7c-85e7-ca4ae80d3d6f	1	Other	Other
+962649ab-2e95-4b2c-a71f-9ca23161d5a5	1	Other	Other
+96265757-1587-47a0-8c7b-59c254aad35d	1	Other	Other
+96265ed0-9be3-42fb-b664-c3b4420afa45	1	Other	Other
+96266234-f3ae-4eb0-a387-710c80d24bd4	1	Other	Other
+9626b8a8-0647-11e8-a03c-fa163e8624cc	1	\N	Other
+9626cd9d-635a-4831-abc8-bcf608562b37	1	Other	Other
+9626dc82-4f63-476c-a4b9-195d2d3caf4a	1	Other	Other
+9626e54b-1e13-4075-aa9d-3fe321da70fc	1	Other	Other
+9626ecd9-34eb-49a9-ada1-dd037709a572	1	Other	Other
+9627017d-9405-4f87-8651-29339e788dee	1	Other	Other
+96270812-1244-45b9-9f17-9378ba56b22e	1	Other	Other
+96277342-0720-4326-a5ca-904fce075a45	1	Other	Other
+9627c9cc-8307-48c4-900f-0a539b54b480	1	Other	Other
+96280639-3a2f-4239-bacd-e1a3109b8a6f	1	\N	Other
+962809bb-0811-46ec-8f4a-fed39ca7d7d7	1	Other	Other
+96287597-8e4d-4f2c-a169-4ac2ceafb54a	1	Other	Other
+9628f2fa-5c95-4a45-a748-a2fd1c2ed308	1	Other	Other
+96290758-a521-4343-94eb-ae3ecc4e3530	1	Other	Other
+96291869-9516-4ab0-882c-659a54a3da1a	1	Other	Other
+96293f6a-b955-4260-a93c-ea7f226a9ee3	1	Other	Other
+962990d6-1177-462f-9096-343a66c2768e	1	Other	Other
+9629d21d-d9cd-47cc-a70b-e67cdcae5342	1	Other	Other
+962a3599-453e-4e6a-b7ab-461e5864c67e	1	Other	Other
+962a48e0-6448-4fab-98be-b4b948f83d97	1	Other	Other
+962a6058-c2fd-4f8c-b2f0-c66ed916ee31	1	Other	Other
+962a7254-1be9-4afb-8334-e437136559fe	1	Other	Other
+962a8b5c-492f-4d26-9e06-c13844c18d6e	1	Other	Other
+962ab97f-54a7-4233-9425-5d5b560aa655	1	Other	Other
+962abc2f-326f-4b04-b1b7-2979060ea471	1	Other	Other
+962b0538-2b53-44bb-b635-00cf62a86b9b	1	Other	Other
+962b1cfd-a01f-4e76-9810-9968492e91d9	1	Other	Other
+962b2024-0f7a-474b-849d-11aad7a456b3	1	Other	Other
+962b3841-ec53-4a08-b052-48116289e4b4	1	Other	Other
+962b3d66-f2af-4479-991c-acc723b5c0e7	1	Other	Other
+962b693a-befd-4b6a-af5e-e2951e1ba94c	1	Other	Other
+962b8bd2-4104-4ef0-8496-0524acec4f1e	1	Other	Other
+962b9d69-d591-4ce5-9b59-12b55eb66031	1	Other	Other
+962be52f-e490-41c2-b27c-3cee00066c67	1	Other	Other
+962c18cc-0692-42c0-bd45-bf4528142a48	1	Other	Other
+962c3f83-7a0d-4e88-8c7d-a5377d394452	1	Other	Other
+962cdcd1-8f66-4870-8caa-bd01a5945b7b	1	James	Other
+962ce49f-75fc-45a5-86ad-906de0b4c837	1	Other	Other
+962ce7c8-9ca3-4c6f-b206-b26bf54d04b0	1	Other	Other
+962cf3e5-cad2-40be-afc4-645375c9facf	1	Other	Other
+962d6a2d-a0bd-409a-86ff-109d4672ea14	1	Other	Other
+962e1062-0647-11e8-b796-fa163e8624cc	1	\N	Other
+962e134e-b9c7-46db-bb29-6fb3eeda063b	1	Other	Other
+962e261a-1c94-473b-8bde-ee5fd84b0a1b	1	Other	Other
+962e28b5-dfa5-47e1-a9be-169702a98972	1	Other	Other
+962e4978-fcfd-4e7a-be0e-2e9561b992a3	1	Other	Other
+962e7cd5-12d0-49f0-8ef5-a58dbe711d7c	1	Other	Other
+962e83a5-716e-42ce-8daf-0ba13473d646	1	Other	Other
+962e9a7d-5c21-42a9-b127-c342dc58ab3d	1	Other	Other
+962eade7-2d60-4209-ae0b-3ed06ce8e703	1	Other	Other
+962eb14c-1a81-482f-85c1-234b9d0de7ff	1	Other	Other
+962ed546-f19c-4f4e-b109-2efd3c881aa3	1	Other	Other
+962ef3a5-c0da-4839-ade9-b513fb8e9c3d	1	Other	Other
+962f1bb6-cd04-48cb-84f5-ebddbb7c451c	1	Other	Other
+962f1cfb-3a5e-4330-a4e5-17c63ed8eefd	1	Other	Other
+962f3699-1edc-4eb4-835c-22840d811ba8	1	Other	Other
+962f72a3-6432-419c-9f0f-c22b5a152d6c	1	Other	Other
+962f73c0-01e7-4ef7-a435-198b66201476	1	Other	Other
+962f8b2b-2581-4745-b955-e13ab13ce50f	1	Other	Other
+962fa0e3-7008-4954-b980-f33f6276ea12	1	Other	Other
+962fd287-0df3-42ea-955e-0cef0c88eb5a	1	Other	Other
+962fd5c1-7370-4edb-9698-e88ed430fe3e	1	Other	Other
+96300a81-b842-4a9b-872c-919939ba0488	1	Other	Other
+96301a87-b43a-4f4b-b96a-ad15bce511ef	1	Other	Other
+9630562c-2872-40aa-bd30-ce9a9ee725eb	1	Other	Other
+9630688a-48f1-4165-83b5-4181206f1301	1	James	Other
+96307011-6d75-40a2-b998-31f0aaf6294c	1	Other	Other
+9630c03a-bdcb-41b3-a5cb-7416649ed8ca	1	Other	Other
+96314e3e-9c06-4c97-8b69-28262ed87a88	1	Other	Other
+96315049-1276-423a-8fc0-264b4363c240	1	Other	Other
+963157bb-1b3e-42a7-a0fb-344c00a37057	1	Other	Other
+9631d426-2c7f-49e2-a263-3af2f6943583	1	Other	Other
+96322de0-a09c-459e-a109-43176cc8a889	1	Other	Other
+96324c3e-d869-496c-8ea9-d5324d362606	1	Other	Other
+9632a7f6-d031-486a-b6da-51f7da1bf0d8	1	Other	Other
+9632ade5-4667-4fb7-ad85-43aad9d9122e	1	\N	Other
+963314d5-1bdb-48b9-aa84-faa4fc3e805e	1	Other	Other
+96335bb5-533b-4d3d-a674-60353940fae7	1	Other	Other
+96337a0d-b160-414f-8ed3-0ee4ee8ea6e3	1	Other	Other
+9633855f-98ff-4162-aae5-f201f98d45c5	1	Other	Other
+9633957f-f17c-4533-b2e0-3ef02f466429	1	Other	Other
+9633cc77-5e61-466e-9a1b-4d16eed085c5	1	Other	Other
+9633f573-b8b0-4688-9f38-b91f60d33236	1	Other	Other
+96341671-c5c6-401f-b084-a9ba634944f1	1	Other	Other
+9634218e-738a-4357-afbc-d543fb092c68	1	Other	Other
+96343088-a979-4e26-bc34-b6f2d701b880	1	Other	Other
+96344457-2e85-4031-b0bc-f6bedf718b93	1	Other	Other
+96344d1f-74ae-4289-ad96-269bc0e57fb4	1	Other	Other
+96345427-64d2-4e5c-a3cb-701185f9d2c7	1	Other	Other
+96347e45-c0e9-477f-984a-4092a52c7c05	1	Other	Other
+96348d2e-e6da-42d2-b561-d2383e435cc7	1	Other	Other
+96355432-319a-4163-becd-7722c6753e70	1	Other	Other
+9635598a-bc9b-4733-be9f-c5001e718cd5	1	Other	Other
+963595b2-02d4-4a07-831c-1385b7467d5b	1	Other	Other
+96359f89-664d-4331-9232-6b7cbc15ac01	1	Other	Other
+9635fd7f-3c83-4755-91a8-a58137014c3c	1	Other	Other
+96360f35-1277-4408-9c6a-1717b955b601	1	Other	Other
+96364f7f-6118-40d9-b363-acc5a1ea2aca	1	Other	Other
+96366303-615f-4880-bb99-3f003c22df89	1	\N	Other
+9636785c-24ce-42e6-89d1-9dcdc1f7fb36	1	Other	Other
+963681b8-a3fc-47f4-b992-d40d662bcf9f	1	Other	Other
+96374450-ca40-4e24-b367-ebd53f8f9aa2	1	Other	Other
+963745ee-314a-4630-9857-43bcb90d54b4	1	Other	Other
+963780a7-d4b7-4447-88a3-6e8b516ae283	1	Other	Other
+9637a164-e84c-4432-ba22-504bb52eecdc	1	Other	Other
+963823aa-48b3-4047-af29-9f5e6b451b81	1	Other	Other
+9638595c-9d0d-42b7-9e1c-dc0f8c325927	1	Other	Other
+96386025-14fa-4cc7-aecb-3bb52cd5d24a	1	Other	Other
+9638bd76-3f24-422a-9d03-91fdd1c4ada2	1	Other	Other
+9638d124-6f8a-468f-97cc-55632c7af8c7	1	Other	Other
+963901b1-f8d9-4919-9374-38c723d0e933	1	Other	Other
+96391b63-aebd-4639-8528-62e13a713747	1	James	Other
+963936f1-b885-4afb-adeb-7d20e02f1da8	1	Other	Other
+963952e2-e821-41b0-b018-58af154628ea	1	Other	Other
+963971b8-a77f-4d94-b4db-0e7fa6c5cf1a	1	Other	Other
+963a3742-f86e-4565-a339-8da1882a3a14	1	Other	Other
+963a398f-82a7-4194-9ea6-4987c2be7fa2	1	Other	Other
+963a4637-b327-49c9-a819-73f7d0a5d796	1	Other	Other
+963a806b-0d58-45a9-80d7-bef0a3a23da2	1	Other	Other
+963ac8b4-6192-4673-b434-a38eea139128	1	Other	Other
+963b6ad7-efc8-44ce-9677-14fc557b218c	1	Other	Other
+963b8d11-d8e4-473f-a108-8e3735f2d96d	1	Other	Other
+963b98c3-0d84-432d-9c0b-679b417c9db5	1	Other	Other
+963c56bd-e55a-4c62-8b2d-b93d54b93d10	1	Other	Other
+963c74e8-b432-4007-9595-597f52a0fa2e	1	Other	Other
+963c99fb-9be5-4b93-9492-5386356bddd4	1	Other	Other
+963cba2f-6f4a-4ae0-8134-8966c762a97b	1	Other	Other
+963d0ceb-3bd7-4420-aa30-87e99a1a1eba	1	Other	Other
+963d0f78-befe-4664-a154-6eef7b833598	1	Other	Other
+963d1f87-cf0c-4994-a27b-81c973503a01	1	Other	Other
+963d7211-16d9-4f98-a365-4ad776f3d55e	1	Other	Other
+963db45f-21e2-47f2-bdd1-ea3ace360929	1	Other	Other
+963dc2f2-095b-11e8-b3b0-fa163e8624cc	1	\N	Other
+963dda61-5f93-4dc2-9bc1-54835dc04891	1	\N	Other
+963e4bf5-c9ac-4f3e-8e57-220613c949fd	1	Other	Other
+963e8af5-776e-420d-bf71-204f9f6d6660	1	Other	Other
+963ee60d-e301-44ff-9099-a180f7eb15c5	1	Other	Other
+963f0415-7350-416d-b2ec-a85fd7348d46	1	Other	Other
+963f26ab-9654-4501-ab3e-5ccee444b910	1	Other	Other
+963f9974-e10c-42c1-96c3-557f63cf0f9b	1	Other	Other
+963fad9e-51a0-48d1-9ecd-752b2166dba1	1	Other	Other
+96402b4c-fcb1-4c7c-88c0-a78b15e626c7	1	Other	Other
+96403171-8800-4fdb-b8a0-cd0e210fe9c2	1	\N	Other
+964075f6-8365-4f4f-9d84-861e6f5a8e5e	1	Other	Other
+96407f91-9b23-4975-a445-aa0c8aefc68b	1	Other	Other
+96408e3f-255a-4556-a636-d40a1bd31386	1	Other	Other
+9640b714-ca80-4a77-809e-100e2527f768	1	Other	Other
+9640db3f-1977-4dc1-af56-385502f0913c	1	Other	Other
+964167af-5948-454f-a6b3-456062cb31ba	1	Other	Other
+9641b4d0-07f0-4b4d-824e-b54aed0cd1d9	1	Other	Other
+9641b7a0-8aa4-4bb2-92bc-0b18797e92f8	1	Other	Other
+9641bf7a-04bf-4a47-b28f-04800cd517ba	1	Other	Other
+9641ca5e-7731-4332-bdbb-8106da593f24	1	Other	Other
+9641fcf3-d755-4b18-902d-2dd3186ec941	1	Other	Other
+96421140-4a70-4136-89e1-00ff63e8210a	1	\N	Other
+964219d0-893e-4505-892b-d4b348b656a6	1	Other	Other
+96423681-2135-498d-b65a-cbe793417e57	1	Other	Other
+96427dee-977c-46e2-aa50-de1adf14d6b0	1	Other	Other
+9642a93f-1307-4c2a-844b-c1b44745c5e2	1	Other	Other
+9642b621-0006-4e8f-be67-118261e6a7c8	1	Other	Other
+9642e106-c5f3-4ad6-89a0-fe5a62f926cf	1	\N	Other
+9642ec3b-679e-4d48-bf33-cc2269ffc5cf	1	Other	Other
+96437117-f9a5-4728-a847-e6bcb7e24ef6	1	Other	Other
+9643a448-9f04-42b8-947d-fd8afa638b3a	1	Other	Other
+9643b57f-382d-4e98-9304-300d57f60806	1	Other	Other
+9643c892-db84-4076-8f79-e8a618fa1279	1	Other	Other
+9643fc38-d94d-4de8-97fd-3416e5e48ad4	1	Other	Other
+964414c0-e49a-4156-9ae8-a28b5b21429a	1	Other	Other
+96442e87-127f-4511-a3b4-8651069babeb	1	Other	Other
+964469b5-2af1-415e-a377-c9d6d17dd4c9	1	Other	Other
+96446f0a-34e8-45bf-b3d8-ab670e64cf72	1	Other	Other
+9644cbd5-ab17-4631-83cf-45b59b95bc3c	1	Other	Other
+9644cfc3-4ddc-4b27-8da1-f34e6eb6caa0	1	Other	Other
+9644d61f-5a59-4a10-9149-e9f7c7d3567e	1	Other	Other
+9644e777-a54b-4358-b0eb-40137b0f0d83	1	Other	Other
+9644f9b8-2720-4e8e-b29f-e79ea4f44241	1	Other	Other
+96453d6f-d49b-4a87-ab8c-896401821c7f	1	Other	Other
+96454e34-1098-40a7-b05e-a62019914d5c	1	Other	Other
+96454ed1-3abd-4bc0-8ad0-4e2d94de7d26	1	Other	Other
+9645e5ba-e80b-43a1-8d7d-50df4cbef611	1	Other	Other
+964616d1-e5b8-46c8-97a4-a363f6f657aa	1	Other	Other
+964685f2-6e44-4036-8430-69fd49741567	1	Other	Other
+96468ab6-f367-4823-b254-c98528bac1d9	1	James	Other
+9646decd-9d3f-43cb-8c56-43439b9b6691	1	Other	Other
+964737d4-a86f-4c03-bec6-8551a10c70d5	1	Other	Other
+96479902-c820-4249-b4f7-10c791b094de	1	Other	Other
+9647ad74-2b83-4b99-80dc-ab59b5ccca91	1	Other	Other
+9647db7c-226b-4699-8687-45c5ebcdb9f3	1	Other	Other
+9647e2ef-32e5-4196-bee0-e338839c5e44	1	Other	Other
+9647ef70-cc77-4672-be93-d8c0c9e50fff	1	Other	Other
+9648af7f-6303-4429-904f-c50570d0eee1	1	Other	Other
+9648c106-5b7e-4de4-a258-994ace11bad7	1	Other	Other
+9648f0da-0647-11e8-be70-fa163e8624cc	1	\N	Other
+9648fd6e-a433-48ec-92dc-2fb6271207c3	1	Other	Other
+9648fe7c-5ef5-4c55-9b17-7ead523ce80d	1	Other	Other
+96491cec-eb7f-4334-8c7a-bad70a269a6e	1	Other	Other
+96494858-dccd-4de2-b24a-0a7e5672053d	1	Other	Other
+96498dbd-cb50-460c-9ba5-2970e03405b1	1	Other	Other
+96499b11-612b-474b-bf24-ce8330e8f2fe	1	Other	Other
+9649b4ab-1cc9-4442-9ea4-0c3e2ac364ee	1	Other	Other
+9649cd1f-5133-44b0-9e35-19ae1b7f8a83	1	Other	Other
+964aaf04-5133-4692-a387-053c51aaff16	1	Other	Other
+964ab7b9-faa6-4440-8542-62cedee5c921	1	\N	Other
+964ac5d0-8140-4910-8d8f-37f5a3497f29	1	Other	Other
+964af126-7a94-48ae-bea8-b7b09f336cd8	1	Other	Other
+964c0fa9-4fc0-4cb6-9e60-df81c30f44b3	1	Other	Other
+964c189f-9a83-429b-a399-89a282e8833a	1	Other	Other
+964c452f-40a8-43b8-bb80-a60c3faa34e0	1	Other	Other
+964ca065-59eb-4d3a-ac58-26afe0a28b8c	1	Other	Other
+964ca4aa-75a4-4b4c-acc1-f7175308f29f	1	Other	Other
+964ca5d1-a844-42a3-a8d4-9d1fc76df4c4	1	Other	Other
+964cdb0c-945f-4c6b-a610-ef693fc012ab	1	\N	Other
+964d3e76-8fc6-11e7-af15-fa163e8624cc	1	Other	Other
+964d63a9-651a-4d41-a655-e0ba1a973af1	1	Other	Other
+964ddf3f-2674-45f2-8521-b34867d197e2	1	Other	Other
+964df3cc-7d32-4b72-8732-241b8860d67f	1	Other	Other
+964e0ec9-04f8-4e6f-bab7-86010e6e2d4e	1	Other	Other
+964e6afa-1ba7-4782-aa67-2e3513eb5fcc	1	Other	Other
+964e8fa9-4f78-457e-b101-1368addbc44d	1	Other	Other
+964ea62a-c370-4e20-be67-c9767f8fd159	1	Other	Other
+964ef76f-c65d-4c88-90a1-1799c03dbf87	1	Other	Other
+964f0ef7-c3eb-420c-bfa7-9727d740b1b7	1	Other	Other
+964f1cbc-8c66-48e9-a63d-0de6da316116	1	Other	Other
+964f4931-79cd-4ccf-9447-a3f60b995f4a	1	Other	Other
+964f7896-6f31-4172-8468-0c72a45e0218	1	Other	Other
+964fe74d-372a-4967-b769-b0ccc0242397	1	Other	Other
+96502722-7e19-4c04-92fa-758ee7a13b26	1	Other	Other
+96503ce5-9ee8-498b-ae94-47869d5a37df	1	Other	Other
+96506b40-d1eb-4a3c-971f-701663fbca33	1	Other	Other
+9650dcfc-6e0d-411a-bdb6-4e8bc5e2113b	1	Other	Other
+9650fdd6-9518-4582-9fb4-25a40f410964	1	Other	Other
+9650ffed-945e-4727-8b58-71ef22bfa1e1	1	Other	Other
+965137fd-29f5-450a-86fe-c146f5dac0c6	1	Other	Other
+965174e7-8fdd-4e07-a9df-9a16a752007b	1	Other	Other
+96518341-fc02-46c3-b9c2-3f75fd51552d	1	Other	Other
+9651c250-4079-4b15-aa82-6580d21538b6	1	Other	Other
+9651f2cb-2c56-4683-8c6e-e32971448f18	1	Other	Other
+96524539-7c50-41eb-a65e-695bb79891d4	1	Other	Other
+96525d08-fd2c-4944-9f0e-f60effefbca7	1	Other	Other
+96526a70-3f13-48df-816e-57c9014cd2b3	1	Other	Other
+96529ee8-ad28-4522-857a-30124bd01cfe	1	Other	Other
+9652a03c-e68e-4da1-b388-7e4a6eacab60	1	Other	Other
+9652af58-e4b1-4209-a229-6db7b77ad318	1	Other	Other
+9652bc66-e0ca-4ca0-991e-b009aa15d943	1	Other	Other
+9652f25d-b1cc-4d21-9afd-19e43b266832	1	Other	Other
+96531a85-122e-4181-bc88-dbd84381a024	1	Other	Other
+965367a5-02ba-4336-be5c-86f0d3b6260c	1	Other	Other
+96536bfa-816b-4590-ba8c-a489315fe4b9	1	\N	Other
+9653756b-db1d-4789-a3ec-638e8b3caa95	1	Other	Other
+96538084-db36-4a21-bd39-5ad82aafb5b3	1	Other	Other
+96539646-b4f2-4822-9fb7-2741c4a178ec	1	Other	Other
+9653c0f9-fa7f-4db2-950d-7d47fc5d78e9	1	Other	Other
+9654641e-4baf-42c7-bb98-6a9387ec4286	1	Other	Other
+96547918-145d-43df-b806-28cac8b744c9	1	Other	Other
+96547da7-8129-4d4f-b62d-eb013d02b11d	1	Other	Other
+96549ae8-64d8-4f21-ab4e-8cf7503addfc	1	Other	Other
+96549b2d-bca6-4f68-9489-62171c146d18	1	Other	Other
+9654a454-095b-11e8-9f5a-fa163e8624cc	1	\N	Other
+9654e270-74d7-464d-8a17-6459a0666ea0	1	Other	Other
+96550c89-e8fa-461c-ad93-0dd31dda442c	1	Other	Other
+965516a6-e11a-4d14-bce5-6c0ecd29f8ee	1	Other	Other
+965586f0-3bf2-47e7-b70f-621b1801ad3f	1	Other	Other
+96558836-6243-4a56-b3bf-f554496f8d44	1	Other	Other
+9655ab1b-6fd3-459d-9efd-08cb1dcfb4fe	1	Other	Other
+9655b28c-b6b7-4bbd-9433-d97ea150baca	1	Other	Other
+96562c64-c94a-4a78-99d1-d1c5233ca8c7	1	Other	Other
+965636d4-d5dd-4e75-9912-3dcf0faf1ee5	1	\N	Other
+9656a2c5-cbdb-40bf-af94-b10a31c3d768	1	Other	Other
+9656ccb4-9f6c-4ec8-90a3-fcda0fc70970	1	\N	Other
+9656d562-4dba-473f-8fef-95b90f31a5f1	1	Other	Other
+96571dec-92e0-4570-a5db-cd247cda42a9	1	Other	Other
+96572353-ba2f-4b38-bd97-1828418842d6	1	Other	Other
+96572abb-b28a-4824-a09e-2560780394a1	1	Other	Other
+9657410c-4503-41f4-80f8-4758d2916219	1	Other	Other
+965744b8-7424-430d-89d3-ddc58e3d0f07	1	Other	Other
+9657e5fb-2114-441c-8886-4591eeaa2dc5	1	\N	Other
+9658490d-5c6e-41a9-98ca-a354b3ae70cb	1	Other	Other
+96589b5f-08d0-482f-bc97-d5abf6642327	1	Other	Other
+9658d865-455c-45a6-a419-cc811eb554be	1	Other	Other
+9658e912-4503-4963-ab81-64f9e92e1d34	1	Other	Other
+965958ec-796d-4c76-9aa6-cf4324cd011d	1	Other	Other
+9659742b-13e2-4599-bbd1-cd507d5a8271	1	Other	Other
+9659a02d-7644-4662-b60b-57b6aeaac9d8	1	Other	Other
+965a4c3e-1879-49e8-a2e5-d3ee6797752e	1	Other	Other
+965a8d94-59ab-49f2-b807-61ec4a54d0e5	1	Other	Other
+965a9a07-f392-44b2-92a2-ba7df5fb10fa	1	Other	Other
+965acef5-3eb9-477e-80bb-5beb74c61659	1	Other	Other
+965aee09-954d-408e-99af-54aa0e5a00a9	1	Other	Other
+965b16d7-d4da-4f49-b8a5-fa24e994e68a	1	\N	Other
+965b34c1-e616-4d84-b0bf-8b2289e5f3c5	1	Other	Other
+965b595d-6e12-48f7-9e14-40317a1535bd	1	\N	Other
+965b7eb0-eb1b-4845-a36b-4bf4c39e3902	1	Other	Other
+965ba58f-e23b-4a70-913c-b521fdaa1124	1	Other	Other
+965bb5fe-20da-49f0-a945-f685cc7e2305	1	Other	Other
+965bc8ac-75bd-4a2b-845e-5453cbe7bee4	1	Other	Other
+965c0568-bdb9-4bd0-b534-1705cdea0865	1	Other	Other
+965c303e-824a-4534-b286-17b6adb36c1b	1	Other	Other
+965c9966-5588-4b39-a8d4-cc878ebc0a67	1	Other	Other
+965c9d57-b34b-44da-ba52-1797d33cc187	1	Other	Other
+965ca035-fa63-4197-9a4e-fbe3803d3efd	1	Other	Other
+965cb743-c52d-4144-9137-868325800afb	1	Other	Other
+965d0d07-39df-4614-906d-d9d12e57eee2	1	Other	Other
+965d1675-86ce-4a9f-b356-03efbf5010d9	1	Other	Other
+965d50ab-f230-45c3-b5e2-1c45b84df141	1	Other	Other
+965d950f-53c2-4f10-a2de-37b6f892b745	1	Other	Other
+965df166-6884-42f9-9b0d-685925d1be4d	1	Other	Other
+965e9a0b-3870-4693-9cc3-876324908152	1	Other	Other
+965eef70-ee7d-4634-b8d1-7a1bbdc69293	1	Other	Other
+965f7157-4c46-42c3-aee5-5124562fb5c9	1	Other	Other
+965f86ba-353f-4644-94ee-e469922d5663	1	Other	Other
+965f95f2-1e76-479c-89d8-e17628eb7cea	1	Other	Other
+965fea02-0ce9-43d5-870a-b2ebeb81e493	1	Other	Other
+965ff0a8-5cee-4aae-933f-9e80de561972	1	Other	Other
+96600468-2ca0-40c6-a2c2-8636069ea627	1	Other	Other
+9660910c-94d9-4e30-a740-cdf65121bc51	1	Other	Other
+9660a9d7-eb65-4ac7-a8ed-5543d2dd8a37	1	Other	Other
+9661347a-b2d0-4e91-9b16-30eb0ec6e17f	1	Other	Other
+96617d93-bc2e-4c60-a381-77f79f89452f	1	Other	Other
+9661f442-c908-46d7-8fb7-a940aa412bdb	1	Other	Other
+966202d0-2e0f-4c00-90bc-f66e38b42d84	1	Other	Other
+966235b4-2ab9-47ba-b0ae-c334a461b2c4	1	Other	Other
+96623986-e72e-4678-a388-3dff62a017c1	1	Other	Other
+966262ee-aa57-45af-a16a-246cfbc7a336	1	Other	Other
+9662b146-226b-4a79-a67d-748d7d07a275	1	Other	Other
+9662f967-36f4-4422-889f-c0bc2d2a2dbb	1	Other	Other
+96631a73-b9b1-4140-915b-9d80fb487e2d	1	Other	Other
+96633402-079e-48c3-8ec1-dcf3df4cb6a4	1	\N	Other
+966358e1-d9e2-4d07-a9b8-3aa0d417a22a	1	Other	Other
+96635922-6762-49a0-b2e9-66f606ef98c6	1	Other	Other
+96637277-a102-432b-84f7-e4340e901763	1	Other	Other
+9663c15e-510e-40bf-b081-c8830c1f7c1e	1	Other	Other
+9663f650-f8ca-42f4-a1f4-5df150d8953f	1	Other	Other
+966439c4-bb7f-43f4-8974-67158b4195c7	1	Other	Other
+96648b35-8546-4769-adb1-97fdfaf620a9	1	Other	Other
+9664c8e5-bad9-4875-a7fd-0095eb73118b	1	Other	Other
+9665d0ad-083f-47ef-9618-f75e6caf1ab7	1	Other	Other
+9665d9e5-8452-409b-891e-80f1939c29ac	1	Other	Other
+96664a29-184f-4a9b-8089-aaf0ef8fb5ce	1	Other	Other
+96665d45-9ad9-4b13-b9ac-f9a2edc8ee28	1	Other	Other
+96666873-e7bc-47c6-a2a1-8c5b5ccd26be	1	Other	Other
+96668f61-968b-4dce-84f6-c08c216550e2	1	James	Other
+96670a1a-de00-44ae-8681-e0eda6abd64c	1	Other	Other
+96676751-5438-4706-82fa-190b894980ba	1	Other	Other
+9667a40e-fc51-4f55-bc0c-7f3302e52314	1	\N	Other
+9667daaa-62d2-438a-a7aa-262cf804c0c5	1	Other	Other
+9668358a-6e06-4469-a997-c4a539d0061f	1	Other	Other
+96693351-a480-475e-956c-0a36250994f8	1	Other	Other
+96693cd2-52a1-4892-9a22-f6bfb417835e	1	Other	Other
+96693f2b-2f4d-414e-8b10-43bbe78af03f	1	Other	Other
+9669544e-a469-44a3-8dab-af692cc06632	1	Other	Other
+9669648a-606f-454c-9d67-47ce4bd2445e	1	Other	Other
+9669a18b-7738-4ad7-b243-e8e5c0f59a2f	1	Other	Other
+9669aa79-cab6-45de-83d2-8fd3fbc55a01	1	Other	Other
+966a4d80-512d-42e9-8eae-a82aae84a71a	1	Other	Other
+966aa6c8-6685-4bc4-b71b-7678e151ab72	1	Other	Other
+966b296b-fac7-416f-b4e4-197df9a49f31	1	Other	Other
+966b3a1b-8edf-4ea2-bd5e-35cb63cce4b8	1	Other	Other
+966b3a49-0658-4c1e-b68f-065c8083511b	1	Other	Other
+966b9006-095b-11e8-969b-fa163e8624cc	1	\N	Other
+966bf122-5f1f-4e15-a135-8f816bccb8df	1	Other	Other
+966c15f4-52b3-4603-9adb-dce237fd5755	1	Other	Other
+966c3d45-fcca-4aa3-a8aa-573e0c752be6	1	Other	Other
+966c6cac-95fb-4a96-bb2a-1c16457ea2bc	1	Other	Other
+966cc343-b120-4936-8d5f-60e0e34ca855	1	Other	Other
+966cd618-6f0d-433a-a9a2-ee48ea4f2250	1	Other	Other
+966ce1c0-d086-44cf-b733-f4f5f08b08f2	1	Other	Other
+966cf2af-7321-4029-a682-c8eb231ff8be	1	Other	Other
+966d72c5-bc16-46bb-953e-c4278cbec62e	1	Other	Other
+966d8c2f-6f0f-4914-a196-5eed21fb14b1	1	Other	Other
+966dd219-4963-4af7-bcfa-0938d4efe0ba	1	Other	Other
+966e4e66-7623-4970-be0a-b503884eaa0d	1	Other	Other
+966eafc7-7da1-480b-86bd-09b2c502500c	1	Other	Other
+966eb74d-9de8-45f9-970b-a55352b71c94	1	Other	Other
+966ed5a5-6b94-42f1-a8f9-d6fc640b7dff	1	Other	Other
+966f10ac-54f5-4d02-b92b-e3f5a9527b85	1	Other	Other
+966f307b-d65c-4b83-8e75-6da11b049267	1	Other	Other
+966f3959-3a45-4655-8591-d547ed0b7a74	1	Other	Other
+966f588f-530a-4a69-b7bc-ddbd59b581d4	1	Other	Other
+966fb182-3316-45db-a13f-9822bf5a4860	1	Other	Other
+966fbf84-0dac-420d-a89c-14e3077c967e	1	Other	Other
+966fe296-0533-4d2e-b21e-d8a97793a41e	1	\N	Other
+966fe3cd-c2a2-474f-8ac3-4fdfe46c06eb	1	Other	Other
+96703757-6a65-450a-85af-6ace3ced49f1	1	Other	Other
+96705476-c182-4c2e-94a7-89420392c651	1	Other	Other
+9670851d-acc8-4212-acf3-fe4ceaa1e7ba	1	Other	Other
+967089af-fbbe-476b-bb79-18d6369737db	1	Other	Other
+9670a148-6ecf-481b-8f83-23d651192f67	1	Other	Other
+9670db7f-32e4-4f2a-add6-e2264e58484e	1	Other	Other
+96712838-7fe9-40b6-b1d1-55f3d99a62d2	1	Other	Other
+96715a71-ec5c-4066-98cb-f2bed60c326b	1	Other	Other
+96716b08-92c1-4be3-b815-01551d87cbaf	1	Other	Other
+96716d29-a0ea-4407-a7f5-0be2c458a6e0	1	Other	Other
+967172fc-2410-4203-bc34-2991c174b1e1	1	Other	Other
+9671c916-1611-4629-83e6-61b245017c84	1	Other	Other
+9671e298-3d40-467e-92bd-adbebffc2779	1	Other	Other
+9671e88e-c178-4800-887c-b41857ba36e6	1	Other	Other
+9671fb63-7797-44e7-9103-2704e5f96ea7	1	Other	Other
+96720d5f-58aa-4e37-bc66-5caefa1929af	1	Other	Other
+96729974-e488-41e3-82ed-32e0806d1cd2	1	Other	Other
+96729f97-cd22-47b4-a622-14101f55d235	1	Other	Other
+9673a636-d9a5-482c-b1dc-654fb3d0235b	1	Other	Other
+9673acd5-f5da-48b0-98d3-6dda7215b7c9	1	Other	Other
+9673b1b2-56a4-4622-a216-5f6cbfc4f0a0	1	Other	Other
+96741a2d-77f5-4895-ae15-64cc969c7302	1	Other	Other
+9674488f-6f47-455a-ac59-dd58156b194f	1	Other	Other
+9674cdaa-ef8a-411a-9622-7fc5e25ad5f5	1	Other	Other
+96752191-13b2-4eea-85c8-9b51349a324c	1	Other	Other
+96752cba-be5a-474c-89ba-15be8d7e6655	1	Other	Other
+967541fd-2529-4240-91ef-03f76891a44f	1	Other	Other
+96754ab2-2e21-4eab-8745-bf9ef1f364b9	1	Other	Other
+9675a27c-8218-47fe-a2e9-e8f15f483dcc	1	Other	Other
+9675f1cc-5128-4bec-aac2-b1ebfdd363a4	1	Other	Other
+9675f7bb-b374-49b4-8fac-8b61798ab76c	1	Other	Other
+9676035d-08b1-4d6b-8cb2-2794a1dc3951	1	Other	Other
+967638ee-0a1b-4d73-8d3f-e1181a57ff38	1	Other	Other
+967678af-f79e-4169-904e-2441ded5cf34	1	Other	Other
+9676b95a-7ac1-4fc9-b73a-9f82cd9128b0	1	Other	Other
+9676c8e5-5f7f-447b-b7b3-931ad53fb4b7	1	Other	Other
+9676cc8a-1100-4c0c-8be6-860597f16b19	1	Other	Other
+9676e44b-9666-466d-9d16-5374da26fc5f	1	Other	Other
+9677121e-14b9-49a3-b7e7-ebdb1f919098	1	Other	Other
+96771bdb-6602-4f6e-8da7-588d16b781fb	1	Other	Other
+96773a4b-2b6f-41bc-a6b2-58bd70b151a5	1	Other	Other
+967773e9-9ad6-4d63-848c-740966c1302d	1	Other	Other
+9677e129-3c33-48a4-82b2-30741ed01ba6	1	Other	Other
+9677f030-3981-41c1-9a70-39d078f5237c	1	Other	Other
+9677f6c3-e942-44c7-bdad-9b8a1e3e784c	1	Other	Other
+967816cd-b2b4-4610-b9bd-fba9e407d7c8	1	Other	Other
+967861b3-ccc4-43f8-93bc-522e7a2e44e9	1	\N	Other
+96788c9e-ac74-4ef8-a2b4-d225187925f4	1	Other	Other
+96789006-1c7b-4504-b0ed-20997429c929	1	Other	Other
+9678e087-5d03-4b23-b50c-e34157d956a7	1	Other	Other
+9678f134-1f8d-468b-ba3b-a90762e97784	1	Other	Other
+9679079e-0897-41a0-b098-a1f964c0c33f	1	Other	Other
+96790c1c-1dd8-4cfd-af06-5f21d9f14c65	1	Other	Other
+96791b06-1792-4358-9095-044417f03978	1	Other	Other
+967927ea-85a4-4df0-b25e-39d2a66334ac	1	Other	Other
+967972f6-9e0f-4ee0-81ce-a16542f61ef7	1	Other	Other
+96798005-e8aa-4f2d-a356-774aa68a57f0	1	Other	Other
+96798a26-dc33-4ec3-b7b7-29999a6be1ce	1	Other	Other
+96799dbc-2fb2-4c4f-bf52-cc9454bd35f5	1	Other	Other
+9679bf07-5310-4d7d-8b98-ed6575192b32	1	Other	Other
+9679c01d-e92b-491a-bc00-48aac6bf3379	1	Other	Other
+9679d232-ec3b-4478-a71f-28e05b6899dc	1	Other	Other
+9679dd49-1425-4171-affd-4b703f165d34	1	Other	Other
+967a1a2f-071c-4b2f-9c71-7ea92b66d921	1	Other	Other
+967a34e7-fe1e-4e9f-a824-cbc8b0991a02	1	Other	Other
+967a49e5-4e4f-417f-bd6b-987d1b964a25	1	Other	Other
+967a8d1e-f839-48b3-9ca3-17f1147b4751	1	Other	Other
+967ac0ed-ac05-433b-a177-4cf12e83d36f	1	Other	Other
+967ac558-8935-47ac-a419-56d9278b725e	1	Other	Other
+967b2f1a-e401-45e1-a11c-0094a3907f4c	1	Other	Other
+967b5095-d7d0-4a2e-9eca-a2d6416f416c	1	Other	Other
+967b7e03-6842-4b00-8a78-830b3e2a9189	1	Other	Other
+967b837f-03d4-415f-95b1-bb621198369f	1	Other	Other
+967c60f4-97bf-4434-a19c-85c70312073b	1	Other	Other
+967c6340-07ec-49d0-9dac-4a1c9b53b063	1	Other	Other
+967cb700-45ed-47f8-a470-fbb0ede9d4e8	1	Other	Other
+967cc314-5e1d-42bb-b4f0-05d2c463d589	1	Other	Other
+967d5117-6797-44e6-bc13-0467432e787a	1	Other	Other
+967d703d-7884-4cce-8ab6-359100637531	1	Other	Other
+967d9a6e-419b-4fed-bbda-ce2be1f4aac1	1	Other	Other
+967dd6c8-0477-4795-883b-ed98caebd539	1	Other	Other
+967df6c7-251d-494b-8f26-00313200f428	1	Other	Other
+967e3b81-6feb-4b48-863b-8572efacf79f	1	Other	Other
+967e47fb-99e0-42f2-bfdd-bf6c1bce5031	1	\N	Other
+967e79e3-a7a2-46a2-b344-00df185af8e7	1	Other	Other
+967eaf15-0653-450c-a4d2-5717c1068493	1	Other	Other
+967f65a3-94f6-48dc-9570-0e66b30546f3	1	Other	Other
+967f9ccf-4d20-4bcc-881c-158f263149a4	1	Other	Other
+9680152e-8ae0-485c-b01d-8bc53f57f2c3	1	Other	Other
+96802cc7-87ba-4f79-960c-ce43b579f6c4	1	Other	Other
+96802d89-c062-4ecd-8de9-7b86ce0db9a6	1	Other	Other
+9680ad28-15b6-4667-ad6b-009dad88ae21	1	Other	Other
+96813c2c-8343-423f-9f2f-8edba2e85519	1	Other	Other
+96815040-b804-4cc2-ba82-541958482f91	1	Other	Other
+9681a778-c902-443b-acc0-cb8f945f0bb8	1	Other	Other
+9681c510-16b6-4fdb-aff9-45531bfed944	1	Other	Other
+9681ec79-cfa6-4831-9a8b-edce6242ab35	1	Other	Other
+9682172e-6771-4eb2-ad92-becbc2fb89b4	1	Other	Other
+968225d2-bac3-438e-88a8-81526ec10469	1	Other	Other
+9682326c-ced5-451b-9f60-ad70acb49c55	1	Other	Other
+968247c6-d4bc-40dc-bfc5-976e0da48d87	1	Other	Other
+968290e9-a7d5-4e85-a82d-7956b4469146	1	Other	Other
+9682ac1b-107b-4fd4-954d-123ffc2f733f	1	Other	Other
+9682bc9e-bfcd-4c3a-9285-ddb623409a8c	1	\N	Other
+96832e44-03a1-4758-8b77-5f6307cc4637	1	Other	Other
+968352c6-8be8-4eca-bb0c-b97c4a70b45c	1	Other	Other
+96835dbf-0548-4b24-9d43-6e5e58cea419	1	Other	Other
+96839c24-fc31-4bdc-a3b7-f432309ca742	1	Other	Other
+9683e3e6-842b-4420-9bff-9dd5ca32fe8b	1	Other	Other
+9684166c-72a2-4012-a929-81f06be7e76c	1	Other	Other
+96845c74-f2b2-43b0-bccf-06d9361a7f9c	1	Other	Other
+9684735c-005a-4f38-943f-3c01c37576f8	1	Other	Other
+9684d635-6616-4bea-bf25-13da0f83ee18	1	Other	Other
+96851411-bf85-4995-870b-ec680dd6ed33	1	Other	Other
+96851626-646d-485d-b972-893b851f5454	1	Other	Other
+96851ed6-0f49-4160-ac5e-9bcc5a547895	1	Other	Other
+96854f34-222e-40d2-935f-88c95ce14fe9	1	Other	Other
+96858b59-eaf7-457c-98b6-4f8be13f0cc7	1	Other	Other
+96859650-b58d-4c94-a643-967316c0385e	1	Other	Other
+9685a18f-6c2f-40c0-bdf2-ccdc0a795447	1	Other	Other
+9685a930-d104-43ac-b236-c07d55c2d817	1	Other	Other
+9685e944-0122-444d-9676-df662cccb7f6	1	James	Other
+9685fc7b-06b6-4676-b519-6fa7f4c522a9	1	Other	Other
+9685ffb5-b7a4-4d50-972f-29250158c015	1	Other	Other
+96862d45-f74c-4f52-b2e1-872b0b997f4b	1	Other	Other
+968633f5-39ba-413c-a4d3-d44cb60e1580	1	Other	Other
+968635ca-5590-4be9-b767-e454a9eda07d	1	Other	Other
+96863e14-e647-4196-a874-13f968e804f7	1	Other	Other
+9686af91-b5e4-4e65-b9ce-fe6aca2d365a	1	Other	Other
+9686bf28-445c-497d-badd-09e26303284d	1	Other	Other
+9686fdc7-a33f-49d5-a0ae-3282d56d9e93	1	Other	Other
+968728c2-ed25-4433-a9e8-89f79770de0b	1	Other	Other
+96873684-c88a-426e-90e8-741abcacaa98	1	Other	Other
+9687502e-5f67-47fe-a2ab-be40b0a76d09	1	Other	Other
+96876192-d027-4547-9eba-4eccb14579a2	1	Other	Other
+9687ce5b-42a8-4e45-b389-7d0538d75358	1	Other	Other
+96881064-149f-434e-98ad-ff2afa34d5d4	1	Other	Other
+96881364-b049-4432-8d7a-bde1ba7400bf	1	Other	Other
+968816ce-dbad-4921-8fe7-4f4db2fa10d3	1	Other	Other
+96882d68-6539-4c4d-97f6-2cf4905f63ea	1	Other	Other
+96884a98-d43a-4ae5-9024-3b35d2a10aa7	1	Other	Other
+9688b586-5fe0-430d-ab9e-a1da533ecdc7	1	Other	Other
+9688b615-fe8c-4c29-b914-bcbfdbde2ffe	1	Other	Other
+96890b76-73c9-400b-9b67-122471d6541b	1	Other	Other
+9689d987-9c0f-4814-b97d-e7e21ace93f7	1	Other	Other
+9689f74e-095b-11e8-9e36-fa163e8624cc	1	\N	Other
+968a13e4-5ca4-404d-9cb4-c3f691546f50	1	Other	Other
+968a1a61-37d0-4c3d-893d-76e66e416548	1	Other	Other
+968a2160-4efc-41a0-aa06-077590204a97	1	Other	Other
+968a2169-30e6-46bf-a54e-ba32227cd7c8	1	Other	Other
+968a4606-3ab0-44e9-a296-b7f1c9171009	1	Other	Other
+968a47fa-2698-40f7-951b-2d45c2e88861	1	Other	Other
+968a4c2d-c18a-443b-8271-57450b10d9f1	1	Other	Other
+968aa2b3-4729-4ecb-84b9-ed53bc0161e6	1	Other	Other
+968ab00b-7e1d-4752-a535-4e914304c538	1	Other	Other
+968ab7eb-6d94-4764-960f-c6fa2de08c8b	1	Other	Other
+968ac17b-12d9-4daa-b7d0-7f661da2d867	1	Other	Other
+968aea8f-ed05-415c-903e-3f2fb3a68048	1	Other	Other
+968b0530-786b-4d50-9987-e9048202d487	1	Other	Other
+968b26ee-c279-4b08-8f40-c300352d5495	1	Other	Other
+968b398e-6430-431e-88af-2a6d98796100	1	Other	Other
+968b681f-9e52-4b54-8a81-dce721938bac	1	Other	Other
+968bb3e9-7c24-440e-9beb-57f4e4767f77	1	Other	Other
+968bd112-7d01-4ce5-84c6-35cbf6f8bbb1	1	Other	Other
+968be909-3e9f-4219-a37f-0e32bb57d578	1	Other	Other
+968bf71c-a627-4b1d-b437-3196fbf9723a	1	Other	Other
+968c27f0-9e59-4af7-a21c-9161b2094639	1	Other	Other
+968c4e79-17ef-44b6-9fdb-b68873fa734e	1	Other	Other
+968c6dae-03bf-45d2-8e64-2cc9f5bf7c1c	1	Other	Other
+968c794d-322c-43a1-8d6f-9d1c2ade0c16	1	Other	Other
+968caadb-993b-45d9-9dc4-f6fdb68d8a94	1	Other	Other
+968cd10e-3bdc-4938-b21c-50e0352444a5	1	Other	Other
+968d123d-0916-435f-ba28-9298026b023d	1	Other	Other
+968d126f-349c-444f-9784-eb2846eb7c9c	1	Other	Other
+968d25cb-15cc-44e3-818a-9efb16d9b79f	1	Other	Other
+968d48be-8b2a-4493-98cd-c3c3f4c384cd	1	Other	Other
+968db9a0-8de6-49ef-bc4a-eb3961665bba	1	James	Other
+968e1858-0748-4223-a4ce-4b3f68a5bb0e	1	Other	Other
+968e3e1d-a140-42f1-aef2-4109509416f8	1	Other	Other
+968e53ed-9ef3-419a-8986-d20e69a786bf	1	Other	Other
+968e5b3f-43d8-4f82-a02d-abb742670de2	1	Other	Other
+968e6f9c-5197-4ccf-8075-1391967c9dc1	1	Other	Other
+968e7c98-886b-49ef-94ca-5e08a5c88963	1	\N	Other
+968ed80a-477a-43d4-8afe-760962f20684	1	Other	Other
+968ed90a-abbd-4e36-a5aa-8ae37a47caab	1	Other	Other
+968edcc2-2816-41e7-a1e2-5d381a9b1715	1	Other	Other
+968f6d74-4636-4a07-b6f5-4f630904de7a	1	Other	Other
+968fcc04-55a6-4821-a8d8-1b62bf12794b	1	Other	Other
+9690393d-e9e2-420f-aaff-91f61661e134	1	Other	Other
+96904ced-2c20-45f4-b85e-622b0ade9682	1	Other	Other
+969053d1-ada8-41ee-97ba-3daafe2aef21	1	Other	Other
+96905c7a-0660-4d70-893f-6d9d0e7ced32	1	Other	Other
+969073f2-6970-4554-9049-21ff43b15495	1	James	Other
+96909dcd-c949-455f-b86e-9961ddd91f94	1	Other	Other
+9690a5c2-fb27-4bbd-a768-2803c283676f	1	Other	Other
+9690d53d-6403-4f61-94ef-eb32cae630d0	1	Other	Other
+9690de91-cbef-46e6-9fee-d9341d0b49f0	1	Other	Other
+969136a6-e77f-490c-b9de-fb58026aa925	1	Other	Other
+96916371-7ac3-4804-8846-29d731aad800	1	Other	Other
+9691765f-69b6-4234-99c3-3e4292062173	1	Other	Other
+969203d3-4e8a-4521-806d-e526df74d2cf	1	Other	Other
+96925a70-f381-4ad8-924e-75e708289f79	1	Other	Other
+9692b73d-4da0-4bf9-ad91-2a79cfbc6118	1	Other	Other
+9692c304-7aa3-4a68-9cc4-646e18fd10a2	1	Other	Other
+969307bd-26d2-4513-838b-ccf17a1c35a7	1	Other	Other
+9693129f-b0f4-47bf-acc1-4673573a48bf	1	Other	Other
+96934432-f993-4e38-9742-1500724dcf76	1	James	Other
+9693b5c0-2ab7-441f-a2ae-c5717388dda2	1	Other	Other
+9693cbb0-3e16-4ad1-9013-3381229e20a3	1	Other	Other
+9693faff-bb8d-406d-a2ef-37a85de82b57	1	Other	Other
+9693fb19-9615-4224-b247-fce74972c09a	1	Other	Other
+9694731a-27b0-41b6-8e5b-a5c7205033c4	1	Other	Other
+969495bc-fe55-4c4a-895d-b5137f9cf929	1	Other	Other
+9694990b-a16b-4349-a307-6c54a5fb35d9	1	Other	Other
+9694eb82-cc83-42da-8ae9-4293caad9f87	1	Other	Other
+969509e8-4756-48a2-83da-07dc1e860fa4	1	Other	Other
+969525a9-4700-4df0-9dae-9cffa052da29	1	Other	Other
+9695405c-758f-466e-a2b4-dd9e7f4b37a4	1	Other	Other
+9695e021-808b-4f66-8965-8a115082faf7	1	Other	Other
+9695ecb8-055a-4b16-98d4-7e34783f3717	1	Other	Other
+9696659b-c690-49ea-8b7a-a8f283041b10	1	Other	Other
+96968c67-e9c5-4e82-919b-f76089861353	1	Other	Other
+96969ffc-3572-4d7f-8a09-f0447fa2aeba	1	\N	Other
+9696d859-65bd-46fd-a7f9-5724b023a2f6	1	Other	Other
+9696e1b2-19bf-4fb4-8ae8-7e9552226088	1	Other	Other
+96979037-47a3-4fe3-91cd-84121405c17d	1	Other	Other
+9697c616-8702-44b1-bd76-1680490a7bb7	1	Other	Other
+96980f8e-4c4b-4147-aabf-037fa874cd27	1	Other	Other
+96982bfe-53d9-4961-8a99-28a5818a3873	1	Other	Other
+96989994-bb6c-4283-a14f-f8b05321301f	1	Other	Other
+9698f468-0b48-4f43-afd8-f0ba7faff773	1	Other	Other
+96991bdf-e099-43a7-9964-d62496d4a144	1	\N	Other
+969961a7-e323-4e1b-ac1c-567d57dc4278	1	\N	Other
+96996680-ebc7-4fb1-bf29-8f327bb83a5b	1	Other	Other
+969978eb-db1e-4630-99ce-be2b1ea90caa	1	\N	Other
+9699c8cc-9043-415b-a23f-ddf9c42831dd	1	Other	Other
+9699ddf2-3300-44f5-a599-07aaf3ec4b9f	1	Other	Other
+969a01bd-8a90-4bf9-ac85-1939fc27417c	1	Other	Other
+969b0784-ec34-4287-9c00-5653b48fefc8	1	Other	Other
+969b265a-e04d-4337-886a-275a68165234	1	Other	Other
+969b2ef7-a7be-4d00-9635-851e48cc59d2	1	Other	Other
+969b598c-b14d-440e-90ef-c88f9bc722e8	1	Other	Other
+969b6e7c-7720-4deb-93d9-fb671d1c5760	1	Other	Other
+969b948d-9236-4390-a1f9-a22486c91b3e	1	Other	Other
+969b9851-ee66-4f3f-81f1-09525a76d602	1	Other	Other
+969bb48f-021e-4deb-b067-18b02e4268de	1	Other	Other
+969c1146-f214-4686-895d-4a3cec49c4a3	1	Other	Other
+969c581b-0430-4d1a-b6f6-0c9bec288da6	1	Other	Other
+969c9c1d-8747-45da-b797-373c128bd5a2	1	Other	Other
+969cd085-84ee-4cd5-87fe-d9223454f30e	1	Other	Other
+969cdec6-9037-4bbe-bd41-48a46592ddfd	1	Other	Other
+969d0098-5cce-44e2-9277-a349db79be7d	1	Other	Other
+969d2b38-5c1f-407e-8970-04686548c143	1	Other	Other
+969d65f7-5e2f-4487-b76c-6d11dec1de91	1	Other	Other
+969d6c80-cb7f-4b7f-80e6-157dafc8428c	1	Other	Other
+969d8602-e663-4d14-bd8e-3d0afb9fadff	1	Other	Other
+969da3de-45a0-41e9-9441-a38c3745af0b	1	Other	Other
+969dc9de-5b26-4189-b12f-799a1dc8d630	1	Other	Other
+969df2f9-3e25-43e0-a6c4-33ad8d9c2f7c	1	Other	Other
+969e9c53-4601-4e97-8f31-244543a642f2	1	Other	Other
+969ece6e-1827-4b77-a4ff-8c6e56dd1220	1	Other	Other
+969ee60a-695b-4ec3-8809-d7010db11845	1	Other	Other
+969f5567-8bf8-4410-a654-3db64e4c5d55	1	Other	Other
+969fb964-c49d-42a7-a211-0d0f72676c15	1	Other	Other
+969ff06b-3ecb-44f9-b5d9-5614c9825b3d	1	Other	Other
+96a02ce5-b53b-4466-a392-3275535731c4	1	Other	Other
+96a0adde-2951-439a-aa5c-060e2bd250d1	1	Other	Other
+96a0b6be-ace8-4810-ad62-cfda9c4b2d7a	1	Other	Other
+96a0c3ff-f212-4543-9c0c-e99823f52c57	1	Other	Other
+96a0df2a-a9fa-406b-892e-abdde70fab3b	1	Other	Other
+96a1071a-b6f9-4418-a9ff-61778487e434	1	Other	Other
+96a17148-10bb-4653-879b-39d609e74bf5	1	\N	Other
+96a1826e-9455-4880-9cc7-fea2f2bd0d94	1	James	Other
+96a18293-9f94-4bfe-8513-592008c96f54	1	Other	Other
+96a1b5fe-246c-4926-a70a-4b8c560f97f7	1	\N	Other
+96a1c53c-7fa3-4016-bc0b-b1f8d6d8376c	1	Other	Other
+96a28167-920d-4fb2-881b-3d41d3758c58	1	Other	Other
+96a2f41a-791f-4810-875c-c1d9b7a8d737	1	\N	Other
+96a36a80-20e2-4e53-9d73-cf16593cc089	1	Other	Other
+96a373ab-0dcb-4cf0-aaf1-0fdaa76a427f	1	Other	Other
+96a385b1-9aa6-4141-b8c7-98b83d4d50f1	1	Other	Other
+96a3d256-5a81-4803-ab2a-7576d8affe6b	1	Other	Other
+96a405aa-327d-4d46-8225-419f47cc22e7	1	Other	Other
+96a408fd-bd51-4fd2-852a-1605782897eb	1	\N	Other
+96a4107f-ce10-4558-bdad-b841d72f8811	1	Other	Other
+96a42543-01f3-453c-bce9-b00e71fe14fb	1	Other	Other
+96a48795-36b6-4084-b020-03606b77b4ce	1	Other	Other
+96a48ceb-25bd-4581-8617-a6099a0bf6e6	1	Other	Other
+96a4a34f-5fe2-4e6f-add7-f2097e7681df	1	Other	Other
+96a4ce5e-e0e0-4d9d-96d4-0942c002e8fd	1	Other	Other
+96a4d634-12ab-4554-bd36-a4c6360cf0bd	1	Other	Other
+96a4eb89-0ae2-4bc3-affb-58e39a82bbe3	1	Other	Other
+96a59878-ecc6-480d-ba11-8544fc9b05fe	1	Other	Other
+96a5a938-59f4-4311-aeb7-11985b05a530	1	Other	Other
+96a5b28a-6b2c-485b-86a3-ccf343130d8d	1	\N	Other
+96a5b33c-3b63-480d-b5be-c0cb6d633ac7	1	Other	Other
+96a5c3d6-7a8b-463a-8bee-33bcbede78f4	1	Other	Other
+96a66dd2-9ae8-43ca-b3c0-cdf597ec527e	1	Other	Other
+96a685e9-92e1-4d66-92fc-620d63df57e1	1	Other	Other
+96a6b465-0f40-479c-a4a6-eedc164495f4	1	Other	Other
+96a6bae4-0412-447d-9752-1cf3463e5fd0	1	Other	Other
+96a6e8a4-18cc-4a18-864a-d320dcd1de6b	1	Other	Other
+96a71821-2063-4ee2-8d60-25cc0f2b6d57	1	Other	Other
+96a77e7d-fc7a-430f-a55f-ebe90d0ca17d	1	Other	Other
+96a79026-5ff0-4812-b8e4-78c7802929a9	1	Other	Other
+96a79ddc-3219-4410-9ed3-3208f1c06260	1	Other	Other
+96a7cfd5-c418-4426-bb74-39d4411ce8bf	1	Other	Other
+96a7debf-9782-4bd8-aeb1-9c2bc913e36b	1	Other	Other
+96a80a1e-669d-4419-88cc-6ff07a3bd7ce	1	Other	Other
+96a8ac9d-3508-4507-b839-595d2d5752ec	1	Other	Other
+96a8e8c2-f67d-404e-bc1f-c153282ce416	1	Other	Other
+96aa2cec-e249-4de1-8e03-4c0945ff8ecf	1	Other	Other
+96aad6ac-7f59-4250-8dd7-05f0cd45fa98	1	Other	Other
+96aadef4-3209-4464-b64b-6f1fd6e084a9	1	Other	Other
+96aba995-fd51-4658-920a-8b7d4428a41e	1	Other	Other
+96abbe81-6f0f-4558-aa9e-f852b47a5c85	1	Other	Other
+96abf08c-ed7a-47b8-adf7-f9a5a83ad828	1	Other	Other
+96ac547d-1f13-4572-b939-becd59985d7f	1	Other	Other
+96ac5b8e-bfd1-40c2-82aa-171158361e13	1	Other	Other
+96ac6762-f543-41fd-80e0-e9a94d2384bf	1	Other	Other
+96ac6826-c977-4b0b-8c89-8a92a8a209ac	1	Other	Other
+96ac7212-7758-467b-97b5-f1a3c7c63f1b	1	Other	Other
+96aca1a5-0938-46db-818a-e25aaab815f1	1	Other	Other
+96acab69-66c4-4527-ac26-5bc404a82f07	1	Other	Other
+96acc3db-a44a-46e0-92f1-094641d11e8d	1	Other	Other
+96ad04ae-8ebd-4bfc-a57d-b2ee0957853a	1	Other	Other
+96ad0824-0457-4aa3-a257-f42b873c4a9c	1	Other	Other
+96ad35b5-ba30-4102-80c0-fe0461d80e5d	1	Other	Other
+96ad7f15-a2df-4420-af23-31bfeab075c8	1	Other	Other
+96ad837c-2114-424c-94fc-2f73b372b3dc	1	Other	Other
+96ad8e4d-9473-4ee3-8d5a-4b45327caa06	1	Other	Other
+96adafe1-0b2f-4a94-b7a5-36e41fe157ce	1	Other	Other
+96adce74-9582-4667-ba9b-2e0cd46bc8e7	1	Other	Other
+96ae17e9-396d-4543-9686-12cf59a85c9b	1	Other	Other
+96ae4121-6cbf-4c50-a1fb-ae3ce2f106f7	1	Other	Other
+96af43d1-498c-4dec-860a-7a580fb64ada	1	Other	Other
+96afb096-d7f4-4472-9a90-5c674351924a	1	Other	Other
+96afb10e-1e0c-49c1-8eb6-d27a687fa5a0	1	Other	Other
+96afd3da-e507-4cdb-ba1b-82637b76684f	1	Other	Other
+96afd863-2992-4928-8841-653d24ad4acc	1	Other	Other
+96b0063b-4038-4476-8a37-b38be37799e7	1	Other	Other
+96b077cb-1ab4-4ceb-95b4-a0178216b07f	1	James	Other
+96b092dd-e61d-41f9-85ef-a29b3afa828f	1	Other	Other
+96b09ea3-8c37-4c4f-a9d9-94bd422509ef	1	Other	Other
+96b0f944-d146-4d07-9dfd-52ef386586c6	1	Other	Other
+96b1f367-bb62-4f34-8c34-5ac0b9dc2231	1	Other	Other
+96b21c0b-c74c-4fba-8665-1c56f84f0d42	1	Other	Other
+96b2d9f7-569f-4d5e-a283-bce1c0533772	1	Other	Other
+96b30309-e7e7-431c-9715-d0041feb83d6	1	Other	Other
+96b36b29-ee63-40c0-8186-ca0acd0ebcc9	1	Other	Other
+96b39530-43e7-4c1d-9ccc-a8a94ed53960	1	Other	Other
+96b3a06f-228f-4fb4-93b1-1bbd0d3e9294	1	Other	Other
+96b3ce5b-9a87-4805-ba63-f5a45b952a44	1	Other	Other
+96b3e6df-e2d9-4396-971e-e766f669f69b	1	Other	Other
+96b464f6-6f74-4cfe-93b8-b2e14ab50ec4	1	Other	Other
+96b46fbb-7d03-4a3f-aeeb-e3e3cfadc097	1	Other	Other
+96b47f9f-3291-4719-b1a2-b66a74684c28	1	Other	Other
+96b48753-c304-4a0a-bfa7-7c64a013d8c3	1	Other	Other
+96b4a7f6-3f39-40ab-9ea1-6bc58808c14f	1	Other	Other
+96b4a9ca-1493-4a22-8d95-2e56c164cf08	1	Other	Other
+96b50449-0df9-4529-8b49-549799c85fd8	1	Other	Other
+96b53bad-f123-40f5-a362-134c74754767	1	Other	Other
+96b5d7c6-1f27-4346-977d-ce2458bf7c34	1	Other	Other
+96b619f6-5568-42ff-a199-b36d673c90f3	1	Other	Other
+96b643ea-dec9-4555-b7bf-acc0d29d677b	1	Other	Other
+96b64651-c591-44d3-b3b5-6b06e577f0c9	1	Other	Other
+96b6edc6-0c61-4726-9194-8768d490585f	1	Other	Other
+96b74ae9-a480-4773-8467-b1fc6312739d	1	Other	Other
+96b75189-111a-4de5-a9ce-aedb2a4dbc24	1	Other	Other
+96b76a05-3e24-4a6a-a128-ddba01e419fb	1	Other	Other
+96b7843c-9cb8-4421-a2b3-fdb99e58ea1b	1	Other	Other
+96b7e4f7-a6c5-4f99-b146-9fb3eec2d835	1	Other	Other
+96b800f3-80fb-4dd0-a741-d1dcbdc67abc	1	Other	Other
+96b86b5c-dce6-4550-bf1c-92a206756e8f	1	Other	Other
+96b88a6d-19e7-45cb-ba70-3576b808b29e	1	Other	Other
+96b8ea58-6b94-4b91-a2b5-8da955ea93fa	1	Other	Other
+96b8fec0-bced-40b7-af0c-7bf68bac6095	1	Other	Other
+96b92542-3e01-4ee6-a806-8df25220f75e	1	Other	Other
+96b97a3e-de1e-4b1e-9cfc-35e19ff0dbcf	1	Other	Other
+96b9846e-1b8c-47b9-b905-4cfa2749e560	1	Other	Other
+96b998ca-122e-4816-9f7c-73305f762761	1	Other	Other
+96b9a71f-9993-4c03-9cf2-4ddabee9a86f	1	Other	Other
+96b9ac19-404a-4611-bcd8-a09be6db3a8c	1	Other	Other
+96b9c4ab-81ff-42c3-b8a8-b55c1b3b0013	1	Other	Other
+96b9d04f-eaaf-4a83-bb4b-f0bf3ae4c72d	1	Other	Other
+96ba048d-e784-4f9c-a7f1-1e4f3084fe38	1	Other	Other
+96ba08c1-ab96-4c66-80fe-6cd1e8378620	1	Other	Other
+96ba095b-7ca5-49aa-aa63-e195951e4fae	1	Other	Other
+96ba2210-0dfe-4a71-90c6-996575c9da85	1	Other	Other
+96ba370c-4f89-4bc5-b427-528d60fa6b9b	1	Other	Other
+96ba6263-a7c6-4b63-9d88-e9f7fc330011	1	Other	Other
+96bac848-f4df-43cd-908c-57f610419bcd	1	Other	Other
+96badbdb-e6da-4a16-ac2b-b0daac0afa1c	1	Other	Other
+96bb13d1-aaa6-4b08-af74-51d66243361e	1	Other	Other
+96bb1656-506b-4376-a4b4-c0fd4515a1fb	1	Other	Other
+96bb3488-be5b-49d8-9682-36d90a07ec9b	1	Other	Other
+96bb5b79-eea3-403f-b0a8-87b6c274e4bb	1	Other	Other
+96bbb8a4-5ec0-4246-9f68-839ee65848ae	1	Other	Other
+96bc2aee-5aeb-4c22-bae0-6e31baf0ab98	1	Other	Other
+96bc49de-797e-4ab0-8d78-959b78e17153	1	Other	Other
+96bca792-6f7c-4505-9dd4-3b5ce544e5ef	1	Other	Other
+96bcb74e-3ad7-464e-89f3-e9ce4d36e361	1	Other	Other
+96bcbcbe-2f03-415b-b07d-5960fa75aeb1	1	Other	Other
+96bd1cdb-2b81-474c-858b-29f7a38dd065	1	Other	Other
+96bd3533-a56e-44e1-9d59-47f63aa5efd4	1	Other	Other
+96bd51c6-3b2a-431a-a5da-c844d6588804	1	Other	Other
+96bd60b1-87c8-438c-a00e-5901598f39d4	1	Other	Other
+96bd9a48-f36f-49ae-b2cb-20563e340105	1	Other	Other
+96bddd2f-31d7-4c5a-8aa9-7f58a71af7f9	1	Other	Other
+96bdeb7c-2924-4bf2-8dbd-8b1bf191b99e	1	Other	Other
+96bded03-b1ca-4586-9708-ecd4aa4bbe10	1	Other	Other
+96bdf1f1-0570-4aaf-b7b4-aeaf0fa09501	1	Other	Other
+96be985e-7e9f-452d-87ba-0c3e872e263e	1	Other	Other
+96bf21f7-291b-4af5-9167-88d3acf4a9e7	1	Other	Other
+96bf2481-7f00-4c1e-bbae-cf60a56064a5	1	Other	Other
+96bf64d0-76a3-495f-bb48-fe5c0fedb85e	1	Other	Other
+96bfc97b-f799-41c5-b7b2-097065fa1a2b	1	Other	Other
+96bfcb76-2685-43bd-b194-0fd71cceef58	1	Other	Other
+96bfcb8d-e847-4985-b779-4cd050aa0848	1	Other	Other
+96bfdbb8-356c-49f8-9953-525108036c68	1	James	Other
+96bff429-96b1-48f3-9c93-79a72c6d1344	1	Other	Other
+96c062f5-46b2-4409-a2c2-e89ad3a60864	1	Other	Other
+96c095fb-ae58-413f-b921-e2bc6f5b3589	1	Other	Other
+96c0d481-9ac5-4767-ba56-6c59c64b1d29	1	Other	Other
+96c10ac0-31ba-49ce-b867-72ff110ef387	1	Other	Other
+96c11916-d9f0-42ba-8aca-6dcef07b4481	1	Other	Other
+96c128d5-c735-414f-8344-e74ef06e44e9	1	Other	Other
+96c13260-f7ec-46db-a85b-19ae3d8170d3	1	Other	Other
+96c133bb-7196-4120-940c-6d5cbc03ba2b	1	Other	Other
+96c13ef4-c30c-4c85-a401-a17f1e5ee652	1	Other	Other
+96c15d72-4667-4213-90a8-7886b151ebc7	1	Other	Other
+96c179f6-f0ee-48e2-a463-e492b8c6d18b	1	Other	Other
+96c19357-5593-47ce-b61b-10c30da1210e	1	Other	Other
+96c1e161-73bf-42b8-b96f-45b9ba5b99ef	1	Other	Other
+96c1e1fc-800a-4acb-9a8d-241c414bd41d	1	Other	Other
+96c1ed7b-cb8f-46e2-8107-32042df91bac	1	Other	Other
+96c26b60-522a-4d18-8ca7-54b24cb70b21	1	Other	Other
+96c289f2-45d5-4bfc-b63a-9fdc5bcf0947	1	Other	Other
+96c2b1d2-5974-4623-a236-4f94cba73529	1	Other	Other
+96c2d9cb-6092-4401-a91b-45a3ddbb4f61	1	\N	Other
+96c2e746-22b6-4c4d-a197-095100cd9452	1	Other	Other
+96c3030c-9ea2-49be-ae28-f4f339f48921	1	\N	Other
+96c303f1-5c04-42dd-a5f2-85f39e5c90b8	1	Other	Other
+96c32416-fd6d-40b5-8e72-3bf6b262f987	1	Other	Other
+96c325e4-789b-4687-9661-720e2a34c826	1	Other	Other
+96c33572-40fe-4449-8b49-a2b118ac64c0	1	Other	Other
+96c3a589-5d15-4a47-816f-f2792f4ddedf	1	Other	Other
+96c3b3e0-1f53-480c-942c-5a83cb34e058	1	Other	Other
+96c4582d-73e2-4c72-b3fc-bead92cb1698	1	Other	Other
+96c46336-7f47-41b9-82da-07e9769dfb59	1	Other	Other
+96c46a8a-70af-4140-81cd-849a7d35b445	1	Other	Other
+96c51573-56e8-4879-876d-787966b59f78	1	Other	Other
+96c525ab-baa4-46b9-b8e7-dfe0f8410190	1	Other	Other
+96c54d3c-fdb2-4704-ac0c-81f22793ed57	1	Other	Other
+96c569a7-1c20-4712-af50-f823e0fecf90	1	Other	Other
+96c59c6e-2de9-4567-bcb9-7a86e1c7dd83	1	Other	Other
+96c5b9e5-446f-4a8a-ab38-1a523801e8f1	1	Other	Other
+96c5c6d0-1de1-44ac-a5cd-7c0b19d30abc	1	Other	Other
+96c5d4c9-b07a-40dc-8abe-b9aa4d97200b	1	Other	Other
+96c5dde1-ae7b-48ae-bb99-e0334db0b73f	1	Other	Other
+96c5f42e-dd60-4c50-a37a-685f7baf8639	1	Other	Other
+96c60927-fc1b-422f-89f4-6f01eda9c9cf	1	Other	Other
+96c627cf-233b-423b-8315-f8dd5fb93533	1	Other	Other
+96c63ed5-6ef8-4176-820c-2846dc820462	1	Other	Other
+96c65580-b155-41e0-b03e-24d736b7a6d5	1	Other	Other
+96c6b71d-cfe6-4159-9e22-15e78928ef14	1	Other	Other
+96c70ca5-206d-48dd-b8f4-703a88a23797	1	Other	Other
+96c72766-1e49-4ce2-a967-28400858f21c	1	Other	Other
+96c75d79-9d51-4793-9bc5-ba885de0a218	1	Other	Other
+96c76d30-0277-11e8-a62f-fa163e8624cc	1	Other	Other
+96c78cbb-8b55-4ae1-ab61-93c03acf6fc1	1	Other	Other
+96c873db-c5b0-4acc-8814-2de20fd509e8	1	Other	Other
+96c87d72-f125-439e-8c21-89491a6e3a7b	1	Other	Other
+96c88639-e7ac-4418-b627-d35b53910433	1	Other	Other
+96c8e56b-8392-49b6-9361-567fd2227e30	1	Other	Other
+96c913bd-6cfd-4277-8d14-d0155d9a06a9	1	Other	Other
+96c97123-a0ca-4044-82d7-617fde66d08e	1	Other	Other
+96c97501-1ec4-4dcf-9c7a-58bb3c0e1cf1	1	Other	Other
+96c9f17e-9fe1-4e15-b98f-8db6fb8768f0	1	Other	Other
+96ca4765-0401-456d-9623-4b0321de196a	1	Other	Other
+96ca4bae-21a3-43c6-949d-d44aea15300b	1	Other	Other
+96cb5c3f-c9bc-4388-910a-d411e8241000	1	\N	Other
+96cb92d8-0be8-4c9c-b176-0e82f6e11d90	1	Other	Other
+96cbb794-900e-4083-a0bd-35744c71d0ac	1	Other	Other
+96cc12ca-31d8-4ca2-bb30-18248d66d9f7	1	Other	Other
+96cc188d-0023-4c45-9a80-40fbab829b9d	1	Other	Other
+96cc2487-5e21-42ed-987b-026e88079aab	1	Other	Other
+96cc249c-82d2-4e14-ab42-3adddedae102	1	Other	Other
+96cc6a90-1bbe-45d3-8a84-a0696813ff85	1	Other	Other
+96cca4be-b7bf-47e8-8422-573a27d83d99	1	Other	Other
+96ccdce2-f14f-42a1-ab1b-d05ebf1d5af6	1	Other	Other
+96cd15b6-a6ae-44e6-bc55-6d3d6d71ac12	1	Other	Other
+96cd2977-7540-4f08-af0a-dc97962a74ed	1	Other	Other
+96cd31d5-8b57-4e11-a83a-3aa70c57d8dd	1	Other	Other
+96cd80aa-c09b-48f4-a2b4-fbf1f47ec4f4	1	Other	Other
+96cda612-ab41-4198-b50c-773770d4415c	1	Other	Other
+96ce2aaf-49ed-4879-8970-9c5cd90e7dfb	1	Other	Other
+96ce346e-73a9-418d-b84a-dfb30273eb75	1	Other	Other
+96ced87a-0efa-4e6a-a76f-5fbc28a2a316	1	Other	Other
+96cee95f-447b-4b64-be6d-b6fb4acd41dd	1	Other	Other
+96cef6b9-901b-4f18-b41e-c31af5166026	1	Other	Other
+96cf092f-0742-4010-a228-5fab5fc1a841	1	Other	Other
+96cf2756-326d-45ea-be9a-525920381cc6	1	Other	Other
+96cf4183-b23e-4188-9f53-631a0d3bcd5c	1	Other	Other
+96cf6e94-bc29-4c8b-9d7d-0138ce705d43	1	Other	Other
+96cfb30b-9346-4de2-ba1f-fb18cb745b29	1	Other	Other
+96cfcf9b-d57e-4285-9362-abe9af880f78	1	Other	Other
+96cfda6a-9f2e-402e-9e7b-aec00e9e7cd7	1	Other	Other
+96d04182-ee6c-4626-a155-40a0d7064604	1	Other	Other
+96d0475c-8709-43be-a1bb-265196111cf3	1	\N	Other
+96d04f69-58db-453e-bbe7-c6bef21672ec	1	Other	Other
+96d07326-a53f-4ac0-94e6-eb53cd436dec	1	Other	Other
+96d087ba-809c-4ff4-9158-d1dd10f5e5a3	1	Other	Other
+96d0a1b2-e1c3-4673-8093-80918a334a61	1	Other	Other
+96d0c987-f0f1-4995-abf7-e63945e04b42	1	Other	Other
+96d108ce-b9a0-41a2-a22f-8c314e70a40d	1	\N	Other
+96d14e81-dcf1-4eae-8dea-55baa4a3a3de	1	Other	Other
+96d16615-ba0e-43c2-89af-4803a8ee7cb9	1	\N	Other
+96d1bb18-0582-4b9f-93c9-79286fe11d32	1	Other	Other
+96d1e97d-17e8-4a3e-97fb-0a168b6dc12c	1	Other	Other
+96d20913-6fa8-4e0f-8f84-f56705ace45c	1	Other	Other
+96d20f02-2035-471b-a0b2-c4419a65dc42	1	Other	Other
+96d2143f-25f6-4124-892c-cefae0400256	1	Other	Other
+96d22446-0493-4fa3-8518-06fdc8d385a4	1	Other	Other
+96d2daf0-d88e-493b-bb54-70e0339cb358	1	\N	Other
+96d38d9d-f3a5-4dc4-b5b0-b3cca2c5fe7f	1	Other	Other
+96d3d60a-8bd3-4924-a7ef-a0abdbc3190b	1	Other	Other
+96d3f85d-fd18-4add-a44e-20511222202d	1	Other	Other
+96d40db3-a2ef-412a-9dbb-2c05bf18ab2e	1	Other	Other
+96d419e3-e96e-46a8-9780-0382aedcb41e	1	\N	Other
+96d4201e-f366-4292-b15c-ca07b9dcb59b	1	Other	Other
+96d44957-a7c6-42a9-bb10-3b5163a8a435	1	Other	Other
+96d45a1f-f9c7-4e4f-b8c7-0b738a189297	1	Other	Other
+96d4b5f8-4ec6-4068-8bfc-42a44608cbe9	1	Other	Other
+96d54105-b261-4062-84a5-bf82930e1e52	1	Other	Other
+96d559b1-caac-46bc-8769-4477e99d87df	1	Other	Other
+96d55ca9-71c6-4f7b-b191-a45adee0f253	1	Other	Other
+96d5a669-b880-416b-91e6-ad10d83d0c2f	1	Other	Other
+96d5b0f1-5007-40b2-9f0b-ed1f4d66587f	1	Other	Other
+96d606fe-ba26-49a4-9997-4f7c3ca6f91b	1	Other	Other
+96d6a03f-d99f-4863-b59e-bd4d068761f2	1	\N	Other
+96d6acdf-3f47-44f1-ab24-5e871108bfda	1	Other	Other
+96d6c2ad-47a7-4b51-8839-904fea284bb2	1	Other	Other
+96d6cb3a-d7c6-4e6e-8472-67c2d8d9f8a6	1	Other	Other
+96d6d97f-e62d-449d-9850-434d189d4dd0	1	Other	Other
+96d6f269-f7ee-4991-a647-6d2550501152	1	Other	Other
+96d732fe-d24a-4e76-bfa1-644d317c9afc	1	Other	Other
+96d764b5-cb5e-4b70-8c3b-ee24eceb1ba1	1	Other	Other
+96d76e92-b6cb-45a5-a3e8-42feeb904ec8	1	Other	Other
+96d7905d-d331-4b24-9048-e29aae7f649c	1	Other	Other
+96d79779-43c2-409b-84bc-9634db4bc3a6	1	Other	Other
+96d79d08-2521-4825-9457-5cffb0318c6c	1	Other	Other
+96d828ab-59ce-4d49-a229-664f0e9990a6	1	Other	Other
+96d88722-22d5-4deb-bec4-ab4f14fc6b5b	1	Other	Other
+96d8a932-e3dd-4b88-97a5-5405a20e90a1	1	Other	Other
+96d8ad5d-3ae7-411f-81fe-5d7b16f1eae9	1	Other	Other
+96d8d979-8632-4800-8e06-95ede139efbc	1	Other	Other
+96d92074-8d4f-49a2-9a8c-26c8063128d8	1	Other	Other
+96d966df-2767-48ac-9584-7a032af3a1c2	1	James	Other
+96da0300-d414-465a-9b8c-47a1cb4d4724	1	Other	Other
+96da0359-1211-4cdd-9e56-648eccc93033	1	Other	Other
+96da06c4-0ea1-4938-a1a2-8b1c18581327	1	Other	Other
+96da4274-c9db-447d-b10c-dd8ce1b05d1b	1	Other	Other
+96da4414-09eb-4637-8c7b-3baa0969849b	1	Other	Other
+96dab64c-4da3-46c6-bb18-641416641e8b	1	Other	Other
+96dac370-5848-4b7f-bbc4-4bc9b6a823ab	1	Other	Other
+96dad950-b953-4664-9379-19f007479a8f	1	Other	Other
+96dae8cf-4378-48f7-b2b5-cb314227dfb2	1	Other	Other
+96daf921-1c20-4d28-8954-d5cf2babc8d8	1	Other	Other
+96db9e6f-d842-456b-94f0-91ae384059fc	1	Other	Other
+96dba37a-e370-41cd-9aac-2a638ae579da	1	\N	Other
+96dbab2c-9432-4a0f-9b7e-97044bdee68c	1	Other	Other
+96dbec20-cf8e-42e0-bca6-1ee91589d621	1	Other	Other
+96dc3f3e-4943-40bc-b02f-e780f69cff63	1	Other	Other
+96dcdf28-64ca-4b82-85a5-346567bde7d3	1	Other	Other
+96dcf4bb-a3a7-489e-81bd-3923796dc325	1	Other	Other
+96dd0c18-1152-4e3f-a288-318a172ce491	1	Other	Other
+96dd1cbc-4471-45b9-a2af-731eb0bae107	1	Other	Other
+96dd37ee-05ce-45c1-aef3-4b0821a2e11e	1	Other	Other
+96dd7ee2-08bc-4210-a6c9-22d5f2a63d42	1	Other	Other
+96ddacc5-6d58-4f96-9563-d71564c11e79	1	Other	Other
+96ddc4d9-ecff-4194-86e2-474d9b99b395	1	Other	Other
+96ddf69e-51a5-474b-a27d-d14dae131d85	1	Other	Other
+96de4ac5-2006-40c8-834c-a5e64366ea7b	1	Other	Other
+96deba3d-978d-426c-8801-16340c0fad96	1	Other	Other
+96dee560-adc0-425f-a667-ec15e4e58d3d	1	Other	Other
+96deed38-4f92-444c-beae-e8e66714aac5	1	\N	Other
+96def998-c660-486b-8845-07193b54d1cd	1	Other	Other
+96df3796-58e2-4063-a428-188e3e1e58e6	1	Other	Other
+96df6d34-1b92-4f59-ad08-342adce5a4c8	1	Other	Other
+96df8d0a-98c5-4350-891d-7fc2ee4879e1	1	Other	Other
+96dfe91e-565a-44f8-9087-cbb00cc2bd68	1	Other	Other
+96e04869-788d-46e4-aeb0-158994a63c99	1	Other	Other
+96e05044-696e-4a53-9ae4-f38e4f212f53	1	Other	Other
+96e09dc2-f4d6-402c-9cbb-9476ff05ac22	1	Other	Other
+96e0a1fe-cd7e-4875-b0aa-7a5d86185975	1	Other	Other
+96e0c734-18b6-4338-b9a8-d421b3f7de54	1	Other	Other
+96e1421b-4ea2-4b60-a7c0-75814fe37145	1	Other	Other
+96e16103-26db-44df-9575-7da4038a4d20	1	Other	Other
+96e16573-58bc-4677-b176-4bb7e66d31c8	1	Other	Other
+96e18bb0-818e-4b52-a54b-40c0ff32b3ef	1	Other	Other
+96e191d2-7bc6-425e-812f-12db6ad2f3f5	1	Other	Other
+96e19aad-2622-49ff-aeb8-d1695bb58aa6	1	Other	Other
+96e1c354-3bb3-447c-b73e-1bffe7c94023	1	Other	Other
+96e1fa65-9e28-41fe-bfc1-2db95f0e423e	1	Other	Other
+96e20335-157a-4a08-a225-b24ec4065924	1	Other	Other
+96e2059a-2637-4fe5-8304-8ee337fd58aa	1	Other	Other
+96e23298-e3aa-4e50-84a1-47085a8d90e7	1	Other	Other
+96e23993-a7bf-44e2-9e03-18e553413904	1	Other	Other
+96e2436b-e88e-45b1-9e31-1c61e6756236	1	Other	Other
+96e2510b-e6f6-4c08-a652-806358ab6f43	1	Other	Other
+96e2aa88-22e5-468e-8eba-8398ba635810	1	Other	Other
+96e2bbf6-1af2-4d36-a67c-c0253b590295	1	Other	Other
+96e2c760-0adb-44ce-9031-7d47a826e11e	1	Other	Other
+96e2ca85-e0c0-4db8-955d-51759c1f30aa	1	\N	Other
+96e2e357-87a1-465e-82cc-b20f3169c084	1	Other	Other
+96e32193-e6fd-4156-951a-22e45ce3f7e6	1	Other	Other
+96e321f6-d6b7-45a9-8429-90b71c90576d	1	Other	Other
+96e39792-3a7b-4b8f-98d6-0dcb4cbcb1ed	1	Other	Other
+96e3c18e-ccef-40c4-b449-90c156862404	1	Other	Other
+96e43b9d-c698-4623-ae6b-4e5d903d9b53	1	Other	Other
+96e44f24-b94a-4308-a5b1-4da130319ec8	1	Other	Other
+96e4b613-9a16-4d45-8446-e3e657a130f2	1	Other	Other
+96e4d531-4696-4fee-8e1a-9bd226edc91b	1	Other	Other
+96e5249f-b0b5-487d-96ae-66398757cdb5	1	Other	Other
+96e533a5-f1d2-4b0e-9d57-534c659029ce	1	Other	Other
+96e5afcf-f7f8-46db-a321-b6ce9096f513	1	Other	Other
+96e5bf55-57bc-491f-9d2e-1b2756758a38	1	Other	Other
+96e5d777-81a5-4665-871a-cb1b1ac939fa	1	Other	Other
+96e6a961-7c19-4e12-abcb-534ca082c29d	1	Other	Other
+96e6bf75-f518-4387-a6d8-a328be6090f6	1	Other	Other
+96e6ec8b-1497-4ab7-8da0-f416f988a80c	1	Other	Other
+96e71534-7be0-4008-a425-f065d40f5836	1	Other	Other
+96e72554-cfd4-424b-a16b-5e81841231f4	1	Other	Other
+96e75031-5870-4aa5-9ea1-570d4b2ba1de	1	Other	Other
+96e7642e-c705-4ac5-9e2f-99a9a327e99e	1	Other	Other
+96e76ea0-f20f-48bd-a044-ac972743a17f	1	Other	Other
+96e7737e-ae97-4b3e-9a87-2cbf427603c9	1	Other	Other
+96e7d5ca-495f-404c-8f74-bb8516df6bff	1	Other	Other
+96e7e1cf-8634-4b69-876f-2860996827bd	1	Other	Other
+96e866a9-1831-4178-9e5d-2024cf2f34df	1	Other	Other
+96e8b5a3-3aac-41e8-b6b9-136e7080a17c	1	Other	Other
+96e8cd85-13c3-452e-8c9b-840a8dc3f2dd	1	Other	Other
+96e8d9c7-2487-45ef-9ed5-460a4f353620	1	Other	Other
+96e8f066-1aeb-4a83-bd19-3597a15e1c85	1	Other	Other
+96e8f513-ee21-4891-a5c5-ec97c6f2b57d	1	Other	Other
+96e90579-f1f0-4a20-ab2e-3a9d3782f8f1	1	Other	Other
+96e93f82-0366-41f5-a290-9db6644c68f4	1	Other	Other
+96e962c4-baf1-4241-aae7-93aabf8cb82f	1	Other	Other
+96ea1098-9005-4283-8450-210a5d862dd5	1	Other	Other
+96ea9a06-a903-48c0-87d2-01921672baab	1	Other	Other
+96eb0035-5a80-4b6a-8380-fe8679a2d664	1	Other	Other
+96eb2705-0b9b-42ba-b754-6fcacebe974e	1	Other	Other
+96eb61c0-6b78-4597-9d06-4ccd38d990bd	1	\N	Other
+96eb81a1-12c2-4721-b5f8-5fc1c22d25bd	1	Other	Other
+96eb983f-c232-4a9a-a4db-f916b380927c	1	Other	Other
+96ec4c83-1194-469d-a625-4b0b5801a611	1	Other	Other
+96ec523a-7bca-4ed5-942a-4bfcd8cd47d6	1	Other	Other
+96ec79a0-3d07-42b9-9840-a0cb8d1b7430	1	\N	Other
+96ec7e50-e6c6-4fd4-81eb-68cbf95101fb	1	Other	Other
+96ec98af-a095-4c9e-908d-cb838fca0d68	1	Other	Other
+96ed1ce6-139d-41ee-b1ef-45ad1c73ef9c	1	Other	Other
+96ed2c06-72a2-4ab7-827e-2e1f22ec359b	1	Other	Other
+96ed399a-fc8c-409c-88c8-e48421fb8cd4	1	Other	Other
+96ed9e62-9968-4508-b761-2e2b750c7da7	1	Other	Other
+96edc32b-1020-4a4f-aff9-ec1c3161f8c6	1	Other	Other
+96ee3e4d-1efb-4819-affd-4ccedf198a6a	1	Other	Other
+96ee6d77-dff9-44d1-92e0-e21f6355c5f9	1	Other	Other
+96ef219f-db42-4a57-9cec-0555b4eaef32	1	Other	Other
+96ef3b89-5d54-450c-99b4-31c5085ef17d	1	Other	Other
+96ef6a9b-ef8f-49c0-a9d9-b34b28662ebe	1	Other	Other
+96efb652-b33e-4d43-baea-159436fb8c40	1	Other	Other
+96efbbf0-f06a-4f67-896a-c7b0d01a7864	1	Other	Other
+96efc715-6c33-4e31-a56c-55949e84d2b2	1	Other	Other
+96efe30e-55de-4e1a-8eb9-f64ba7ce81a5	1	Other	Other
+96f07381-9e99-437e-869c-52464dd23138	1	Other	Other
+96f0a1a9-725c-419b-99e1-232b3c597076	1	Other	Other
+96f10e69-9c94-4923-8c8c-9e99137b902e	1	Other	Other
+96f11ee0-6996-4d93-836f-37e7130ad621	1	Other	Other
+96f14c3c-bd07-43b5-a87e-cbebbe5a7f8e	1	Other	Other
+96f162ff-ebcc-4d01-8d22-1cbb38e9f08b	1	Other	Other
+96f18e74-dde8-4d70-9e59-d0978fa322f8	1	Other	Other
+96f1a165-30c3-4736-9701-36d391de6f59	1	Other	Other
+96f1a36b-3c24-479c-b119-ca325a7a6de1	1	Other	Other
+96f1bb6e-b6b8-43e4-a944-137aa0570712	1	Other	Other
+96f2779f-e6fd-4f0e-8615-dbeff7a67d16	1	Other	Other
+96f30937-cf34-4fbb-ba04-f8f658175505	1	Other	Other
+96f311a3-5833-4dbf-b6d4-1dee50c9cacb	1	Other	Other
+96f3276a-5ae3-4ae9-b824-06b25bd490eb	1	Other	Other
+96f33d93-9a44-4885-890e-c6d0a63228d9	1	Other	Other
+96f34167-cdaf-4e81-9c56-1bfa20c8670f	1	Other	Other
+96f347d9-34e3-4d4a-810f-761af1bc768c	1	Other	Other
+96f3730a-b947-40a7-a437-a790064bf078	1	Other	Other
+96f3a2b3-ae28-4a96-a2ea-2eba51c07718	1	Other	Other
+96f3b84f-aacf-436a-a413-a366f10c6ded	1	Other	Other
+96f3cebe-08fb-491f-b798-5a6945e5600c	1	Other	Other
+96f3de38-c243-4158-a8aa-736df383fe6b	1	Other	Other
+96f45e0a-cbef-4e0c-9540-a83be22e4151	1	Other	Other
+96f4ae85-f052-44fe-aee1-ab4b7c92d676	1	Other	Other
+96f4daa3-ba8c-44a8-a740-1c07f616865b	1	Other	Other
+96f4ef3b-fdcb-4d60-8caa-08178be819e8	1	Other	Other
+96f4f24d-80ab-4968-afcf-84ff731724e8	1	Other	Other
+96f4f508-1b66-47a5-b6be-1186cc72ee3b	1	Other	Other
+96f580a5-b302-4d31-a8cc-fcef855cb676	1	Other	Other
+96f582f9-6d79-4c57-bcb7-eb87e4dbd0aa	1	Other	Other
+96f59aaa-c48e-4656-9b77-85bfbdefb902	1	Other	Other
+96f5a3e1-853f-4853-974a-09106b24ee2e	1	Other	Other
+96f5c722-41dd-4068-8336-42364c847c45	1	Other	Other
+96f63530-749e-4a6d-b6f4-7fff0bb8d1b0	1	Other	Other
+96f63f52-4100-4de3-a211-6f6a7621c300	1	Other	Other
+96f66a9e-af1c-4e71-90a7-1bb80a92a9ec	1	Other	Other
+96f66cb5-d16a-4fca-b038-362d36b8ce0a	1	Other	Other
+96f6a593-7561-4350-8031-4df22be77b26	1	Other	Other
+96f6bd55-ec01-4609-9d55-731597448206	1	Other	Other
+96f6c33b-1d9c-4318-b8b4-c2b6970f1a60	1	Other	Other
+96f6d0d7-8207-424a-af41-993c9cda8615	1	Other	Other
+96f7097b-e48c-4ee4-a69a-c7c274f96872	1	Other	Other
+96f70e0c-ebe7-480a-8247-dd2389d17e56	1	Other	Other
+96f725e5-61a4-4c61-8ef4-d3ca1cd9bc7d	1	Other	Other
+96f76aa7-da80-4397-a33a-8e87e7ceea4a	1	Other	Other
+96f76d7c-14a3-4abf-ae84-8479127a954b	1	Other	Other
+96f777a5-ba24-4747-b46a-22360eb67dfd	1	Other	Other
+96f78f80-b76a-4a0b-a167-828af57d8ce7	1	Other	Other
+96f79f45-5a75-441c-91d0-c976ccd721b0	1	Other	Other
+96f7b39a-1f74-4b24-8fcf-3d5d0a1cce33	1	Other	Other
+96f7d8f9-f11a-48a5-8bab-c8569770385d	1	Other	Other
+96f7eca4-7414-42da-9ae1-527fe2ec02d1	1	Other	Other
+96f817f1-2412-4823-b99a-3bb3f793925b	1	Other	Other
+96f81d0b-6a56-468b-b005-2ca561186f2c	1	Other	Other
+96f9090e-f260-48e3-80f1-d544e6757ac2	1	Other	Other
+96f90a81-e922-4fc4-bb46-a360d693af7f	1	\N	Other
+96f92617-4274-4508-9e9a-268f75ce316a	1	Other	Other
+96f93bf1-9f4b-4e27-bbf8-3248469a7e49	1	Other	Other
+96f94f36-f442-4829-8cf5-4f63ca23db51	1	Other	Other
+96f9aa67-5c9a-4ada-87c4-15908f7fd161	1	Other	Other
+96f9abb9-0d98-408e-a95b-f8ec987fe636	1	Other	Other
+96f9bfb0-97ad-4101-9164-511bdc80c533	1	Other	Other
+96f9f431-5b5d-49ff-afa3-c47a546136f2	1	Other	Other
+96faf950-a889-4862-b907-3745ba7b299a	1	Other	Other
+96fb3718-b6ff-40f2-9f41-399fd4e773c6	1	Other	Other
+96fb3883-1a1d-40a7-bdad-710502fa234f	1	Other	Other
+96fb4095-8646-4dec-ae11-5623ef917f98	1	Other	Other
+96fb46f6-6f08-4061-906e-6ddeebe00b49	1	Other	Other
+96fb64d4-5d0a-4788-bcb3-853fd0025606	1	Other	Other
+96fb9eb1-af90-474a-9f00-32f3b4237a08	1	Other	Other
+96fbbdce-d4e4-4798-a505-1964db60a510	1	Other	Other
+96fc0803-b40e-4fd2-a68b-0e77f16f5e30	1	Other	Other
+96fc3b1f-6e1a-448a-aca9-d5b087ecd92c	1	Other	Other
+96fc4de5-2bdd-4eca-938f-cdf17aad76ed	1	Other	Other
+96fcc1c6-96c4-4627-96d5-4b1e71f99152	1	Other	Other
+96fd0ddb-92dc-4253-bd96-9db453e695da	1	Other	Other
+96fd363b-76c3-4f13-b096-3ef1732eefd9	1	Other	Other
+96fda66f-c355-457a-b450-0c68a5764e8f	1	Other	Other
+96fdaa55-5aa9-41f8-98ad-748e1d3a3c6e	1	Other	Other
+96fdd2c0-88c8-4cd0-ab7c-1ebe53319008	1	Other	Other
+96fe37c0-f8a4-4187-9d5e-0c725815ef11	1	\N	Other
+96fe4f07-27da-4402-8c33-c00e686d5204	1	Other	Other
+96fe7acd-3208-47c3-beea-2e53490451d2	1	Other	Other
+96fe86e1-c498-450e-a164-a3ab65b48304	1	Other	Other
+96fe86f1-9798-4181-9fcc-d78ab841b588	1	Other	Other
+96fe8c87-19d2-4c43-ad06-b5cbbb6f16fa	1	Other	Other
+96fe9fa4-5ea2-4313-aca8-41fdd9de2f6c	1	Other	Other
+96fec19a-415d-46e4-8a46-5b9f6eaec08f	1	Other	Other
+96fed9f5-b6b4-443b-b4f1-cb1430a1b6a4	1	Other	Other
+96fef509-c250-49a2-a224-35751dd6e3da	1	Other	Other
+96ff4d17-b55c-4e52-bf0a-a03b95c326d1	1	Other	Other
+96ff6e92-520d-43cd-a93d-c063942bc22a	1	Other	Other
+96ff81e3-768a-4a56-b214-5267985f0e20	1	Other	Other
+96ffa80c-53f5-4b2c-9223-92c4bb0dccca	1	Other	Other
+97000c9b-ff87-4a2b-968b-75013168c926	1	Other	Other
+97000e5f-843f-47c8-a543-c8a466665a70	1	Other	Other
+97004075-702b-471e-948a-4e4d348a7c09	1	Other	Other
+97005972-d832-4431-83dd-ad9accd6c590	1	Other	Other
+97008d3c-3646-4583-8e0f-1bee41844df6	1	Other	Other
+970091d8-1140-44cb-a2ec-6fd1f79524b8	1	Other	Other
+9701080b-bb38-47cb-ab45-83784c8a50fc	1	Other	Other
+97010d2f-bd25-4d0e-9b09-1ec68e6c62e7	1	Other	Other
+97011c1a-308b-4e06-b24a-9c0fcc6cdbb1	1	Other	Other
+97018678-5cd6-454f-b14f-73e9020952a2	1	Other	Other
+97019692-e197-480f-8376-44c2082e5386	1	Other	Other
+970214b5-b9d8-47bc-9e7c-f9e520e0fbd2	1	Other	Other
+97025813-2224-45d3-b661-8d9cf631bacf	1	Other	Other
+97025f16-1d0f-4300-a5fd-b3f9bc4d24c1	1	Other	Other
+9702793f-a0a5-4ff8-a6cb-ef14c9833884	1	Other	Other
+97028965-6414-41f6-8cae-9ba0f66a6352	1	Other	Other
+9702b46f-15a5-49ab-a27b-16f38dcf4715	1	Other	Other
+9702bf4d-bb81-4de4-acb7-d43ef230ec6d	1	Other	Other
+970305b7-467f-4ef1-ba14-5ddba508bc18	1	Other	Other
+9703316f-636c-43bf-b578-87480a4fb3b7	1	Other	Other
+97034641-a494-4068-a34d-e3f2ee5bedc6	1	Other	Other
+97036c2b-eff1-4dd8-a12d-bdfb81179845	1	Other	Other
+97038c28-466c-44bc-8fda-4f0090c9b559	1	Other	Other
+97041c4c-b874-4edf-ac11-ce71d737c04a	1	Other	Other
+97041dcc-565c-4893-8cd1-79b194558ec5	1	Other	Other
+970421a0-ed9b-4762-a7fb-7e869ca27c80	1	Other	Other
+97043482-fbb0-47a1-84b8-da64f200e190	1	Other	Other
+970480df-5697-4fc4-a14d-f7b465479c95	1	\N	Other
+970497f0-b58f-4f30-8527-55414a357952	1	Other	Other
+9704cc0d-370a-41d6-a125-59cc781b5d17	1	Other	Other
+9704e958-3d99-48ba-94e5-482fa26fdd16	1	Other	Other
+97050a8d-d3f3-4c3e-a4f3-12b8a22580d9	1	Other	Other
+970544d3-d355-481c-be12-c11365403abe	1	Other	Other
+97054969-d55d-4dad-8a88-c6a1d1cdffb5	1	Other	Other
+9705c607-1736-4b5d-91dc-1fa5bc6763fe	1	Other	Other
+9705cfef-eb44-4aea-a809-7a75902ec49e	1	James	Other
+9705e3b5-69d7-43b6-86c3-bba148d6e7be	1	Other	Other
+9705f811-f43e-4edb-9760-0b6a45a5bcb8	1	Other	Other
+970602bb-a87c-418f-b838-06fb2db06b73	1	Other	Other
+97062569-f86c-469d-ab98-281a6932e24a	1	\N	Other
+97062b23-6ed7-4aef-afe9-0f80a1da0e43	1	Other	Other
+9706bac4-c7b3-4721-ace2-b7f6aecc2aea	1	Other	Other
+9706e45f-a545-4e9f-9c4f-0ea4e2259688	1	James	Other
+97070553-cb71-4900-bdef-42ca716012e5	1	Other	Other
+970743ee-25c7-4fc1-af60-313e8b0050ae	1	Other	Other
+97075e2b-1c42-4467-bd5a-270dfa36e480	1	Other	Other
+9707809b-575c-4524-8a2f-d62b49ac00af	1	Other	Other
+9707a888-bccf-411f-8c58-de09a0ac32d1	1	Other	Other
+9707bdd0-9fd8-43c7-9cd2-61ac9aa1eb73	1	Other	Other
+9707beef-2c60-4906-ab2a-30603b433cba	1	Other	Other
+9707fa99-0fd8-4191-9505-ebb07520256f	1	Other	Other
+97081489-f8e0-4baa-b294-c82a84865423	1	Other	Other
+97084250-9185-43c4-ba14-353555c857f1	1	Other	Other
+9708628d-905b-4d92-aa7c-d35e2d0e032a	1	Other	Other
+97089711-3caf-47e7-bb16-6d480d47810a	1	\N	Other
+9708d741-7cb2-4322-8999-d8faf9bbac25	1	Other	Other
+9708f75c-6296-4ef1-8b06-6dd3f9942c4c	1	Other	Other
+97097f1f-fe94-490d-9633-e299fc9528b8	1	Other	Other
+9709cba6-2c54-4784-9bdc-7df9dcbf7d02	1	Other	Other
+9709dee0-2437-43bd-ab46-432e41ed5b7e	1	Other	Other
+970a0624-ece2-4394-ad8b-7d01e31f6cca	1	Other	Other
+970a3e22-d138-4851-aa8b-035b361cd048	1	Other	Other
+970a639d-c9d1-40fa-9f20-7ad23f5d1a24	1	Other	Other
+970a8d82-5a4e-4574-b530-b042a2ed24f9	1	Other	Other
+970a9b26-797b-489f-a48d-6710896bbdbf	1	Other	Other
+970b1e42-e596-476b-86b4-3566e7e0f6c3	1	Other	Other
+970b2246-4245-4865-87dd-3ca586580289	1	Other	Other
+970b5e5b-f09a-4a8f-955f-c71d6331edf1	1	Other	Other
+970b6d86-b2a0-4eb4-9678-64ae9bdd9c42	1	Other	Other
+970bb02c-1b64-4c3d-969a-58121ff25147	1	Other	Other
+970bcc16-d129-465c-8019-c030163fb4ab	1	Other	Other
+970bd6e8-f632-4064-8db6-88f360f41671	1	Other	Other
+970bd70d-24b8-4526-acbf-e963f655eea7	1	Other	Other
+970c0498-3fc2-4f60-b931-d88260cbb9cc	1	Other	Other
+970c4e05-1e65-48e0-b581-a96b40782e5c	1	Other	Other
+970c86dc-d468-4aa5-95f9-be11e4aa47fc	1	\N	Other
+970c9368-f83a-40eb-91b7-3677005d00e2	1	Other	Other
+970ca25c-8965-4a3b-a73e-873fc9471ec6	1	Other	Other
+970cb3ac-e726-494f-9dac-db7b80873b3b	1	Other	Other
+970cd5a8-4392-4236-a185-ba0e5c3e7b1a	1	Other	Other
+970d075a-a8c1-4d52-9664-37c98a8d67a8	1	Other	Other
+970d3e92-628f-41db-b507-d27a23316c7b	1	Other	Other
+970d7432-6552-4f0c-bbc7-88f630652707	1	Other	Other
+970dcb1a-a5e7-43bb-b7ba-d456bf815de9	1	Other	Other
+970dd6f6-f6d7-40b0-bc7b-0f1dffe3a347	1	Other	Other
+970e1a0a-4d32-468f-9eee-c59af7cc3f87	1	JAMES	Other
+970e31fa-ab75-4810-acd2-d4c7a1ad6073	1	Other	Other
+970e3e84-2532-48f0-802d-88299c0da5cb	1	Other	Other
+970e6d43-403e-4f92-a9d1-c140be70d6ec	1	Other	Other
+970e8159-5cb7-4be1-879a-f363bc7088ed	1	Other	Other
+970e84cf-71f1-4eaf-a046-e6eb396e719e	1	Other	Other
+970e89ce-9699-41c8-a6c1-8b0e80411c5a	1	Other	Other
+970e936a-aa30-490c-888d-342436429e32	1	Other	Other
+970eaf28-becc-459e-b7fd-3f80297c78e7	1	Other	Other
+970f01e1-6645-41b2-aeb2-1a2e87786fa9	1	Other	Other
+970f149f-2c78-4091-bd81-86e6c37531c9	1	Other	Other
+970f27df-ee05-4dab-88cf-a428817bf39d	1	Other	Other
+970f2900-82b9-4775-95c4-d8052453052a	1	Other	Other
+970f88aa-92d4-4690-b443-4fa68b6f71d0	1	Other	Other
+970fb98f-29b5-4c00-a7ac-a01efdf30ae4	1	Other	Other
+970fdaa5-883d-4c55-b66f-542ac829c999	1	Other	Other
+970fe688-482b-4df1-a64e-60a518e8db3a	1	Other	Other
+970ffd11-3cfd-4069-af36-f20920a6e28a	1	Other	Other
+97101a7b-9e94-493c-86bf-b9b7ee826919	1	Other	Other
+971034f3-3173-4740-9bb9-00182224683d	1	Other	Other
+971085d4-04e5-4325-a32c-2dc8aabdd3d3	1	Other	Other
+97109300-e1fd-4d21-aa50-0bef36d5a703	1	Other	Other
+971096e2-9bb8-4953-b29c-4d6fc44ec308	1	Other	Other
+971124b7-e735-49c1-9b83-64a859bebcfb	1	James	Other
+9711335b-128d-4a0b-bfa9-28d942d5c431	1	Other	Other
+9711432d-522b-4a2a-adbf-2074d89523da	1	Other	Other
+97114363-7248-4c17-af7d-6df970c1f9ba	1	Other	Other
+97116158-e606-4fad-a713-22cc690b5dba	1	Other	Other
+97118305-fe48-4342-abb0-97e1b4d61e10	1	Other	Other
+97120241-251a-4326-9449-c2a15d359a8b	1	Other	Other
+97121551-5138-45aa-9d4d-03c290645ee6	1	Other	Other
+9712b66a-a318-4566-832d-4b5787c3b9de	1	Other	Other
+9712c04e-b5a9-43a4-b13f-68465dfd80f0	1	Other	Other
+9712ef73-a258-48c2-b1d4-3f41481a97ce	1	Other	Other
+97130f89-3dbd-4a5b-8ce5-0af399d5dcd7	1	Other	Other
+97138fe0-e73e-4d69-a103-e11287527739	1	Other	Other
+9713d0d4-768e-4b02-ac4b-2d6e9c3e88b0	1	Other	Other
+9713ef63-fb55-4282-9331-84f7b947d018	1	Other	Other
+9713f710-f678-481f-8d0f-f877f3dfcf75	1	Other	Other
+97140b59-4a16-40f5-b604-d12f68e2db83	1	Other	Other
+9714155c-5aff-4197-ab3c-ccec0aa5f952	1	Other	Other
+9714552e-6762-48e3-a4d2-e57bd34698d7	1	Other	Other
+97146503-cbcf-48a7-84ba-c7ccb92e1f42	1	Other	Other
+97147161-c4fb-44ad-a412-433e71a6ed7f	1	Other	Other
+9714cf26-63f0-47c7-8363-fb16b85636be	1	Other	Other
+9714ec6f-e9d0-4070-88a3-ca5b3b10b941	1	Other	Other
+9715a646-67c4-4dcc-91ba-659be11cfb27	1	Other	Other
+9715cdf1-03b8-48e5-9321-c2b16917774b	1	\N	Other
+9715d089-b04e-4b43-89f9-33db03f55560	1	Other	Other
+9715df70-751e-4e1c-bbd9-77c67525b3e2	1	Other	Other
+9716087f-10ea-413e-bd0c-c3af8928eca2	1	Other	Other
+97160e73-4295-4724-a18a-4e1478cff803	1	Other	Other
+9716440e-b141-4801-ba8a-92bfadc36a53	1	Other	Other
+97164788-f70f-485f-b587-dec1a138b9af	1	\N	Other
+9716661b-16aa-47ec-9be1-87c7e86d6130	1	James	Other
+97167701-fa1d-451f-b6bb-896ccf94098d	1	Other	Other
+9716f633-e441-404b-bdfe-6bcdd3d98103	1	Other	Other
+97171f4e-547a-49cc-9850-9f23f9902f7e	1	Other	Other
+97172ed8-917c-4100-8ad8-9f9278e65df9	1	Other	Other
+97173fe9-f2dd-4822-be74-8bd532bb3061	1	Other	Other
+97175064-790a-44f2-b124-651f9dcab987	1	Other	Other
+97179b33-4df0-4555-94a0-2bd767e0cdad	1	James	Other
+9717d409-0fb5-4f40-889b-fceafcb5267d	1	Other	Other
+9717e54e-60d3-4c13-9261-780c871b2427	1	Other	Other
+97180b5d-47e2-4ba5-b80b-91b6ce29f3eb	1	Other	Other
+97181d76-d9ab-4273-880f-641d22ed3a96	1	Other	Other
+97186c71-759b-4a30-837d-2c85a15a3bdd	1	Other	Other
+971887c8-8cd3-44b0-9d51-f88af6c25a5f	1	Other	Other
+9718a9e6-c845-4e41-bc52-7098c00661a6	1	Other	Other
+9718d2b3-43ab-4cf4-8011-55e913150c2a	1	Other	Other
+9718db20-f4b5-4440-82f9-0b39ef23c45d	1	Other	Other
+9718ddfb-c46d-49c4-8d6f-176617b5088a	1	Other	Other
+9719918c-9d89-4c0f-b49a-8da1c4387d3d	1	Other	Other
+9719e6f9-0ef2-499c-98b0-f172841812a3	1	\N	Other
+971a14c4-1403-4897-a971-17ba480fc311	1	Other	Other
+971a2954-71cc-4fe9-b3e8-3be4d3dbf933	1	Other	Other
+971a9655-d954-48e6-839c-b2eda600d45c	1	Other	Other
+971aa149-6357-4a96-a447-c451b15a149f	1	Other	Other
+971acfe9-c980-4408-9834-1401bac133d3	1	Other	Other
+971b8a5c-dcd8-4302-ada8-ee8abb81ee98	1	Other	Other
+971bd07a-cfb7-44a7-8757-81c9b336b9bf	1	Other	Other
+971bdea2-af7c-40c5-b975-922b066ca261	1	Other	Other
+971beced-0bc6-4b93-be1c-89904f5387bd	1	Other	Other
+971c147c-3e8f-477b-b600-3961d54a4587	1	Other	Other
+971c325d-7a03-4ebc-a559-7add2e119395	1	Other	Other
+971ca76b-141c-42ba-a664-ce8ce0026401	1	Other	Other
+971cb659-35ae-4596-aa5f-55eeecd44c4b	1	Other	Other
+971cfc4e-72f1-49b3-ad2b-5c3b607570b8	1	Other	Other
+971d157e-719a-4d0f-bd04-e3e406681214	1	Other	Other
+971d49ff-e568-470a-bcc8-b9bd7d6ca345	1	Other	Other
+971d4cc2-d6a6-4bb7-8159-47ea0eb1d4ac	1	Other	Other
+971e0726-48a8-4b7a-93e3-7c58c15a9dac	1	Other	Other
+971e3750-c67f-465a-b086-ab31ec861590	1	Other	Other
+971e54e7-4ebd-43c9-aaef-66ca7aba1f55	1	James	Other
+971e7958-e719-4e7b-a66f-31b206b1b500	1	Other	Other
+971e8db5-3c30-47c9-a8bf-4947696eb0dc	1	Other	Other
+971e94d7-b17c-489c-a64e-a5ca127b55dc	1	Other	Other
+971eca8f-b1d5-430c-8779-bf2759996dea	1	Other	Other
+971ed82d-3e01-40f3-b4a4-2ae3936d45c9	1	Other	Other
+971ee14b-01e9-4f32-ad70-7748dbc3a01f	1	Other	Other
+971f6fa8-52e3-4fef-8c18-86a3d5a378a1	1	Other	Other
+971fe6bd-cf20-4c76-8ad3-a6985f05be97	1	\N	Other
+971fe7d5-0a8d-4537-b2b5-c1cfb315a570	1	Other	Other
+97200417-ce3a-4926-8bd9-49a6a36756ea	1	Other	Other
+97206c7d-af36-40d2-b0c0-a270d464c61e	1	Other	Other
+9720802a-953a-451c-80eb-668ab8f7d3f3	1	Other	Other
+9721cab9-e077-4c5f-8f70-fab7f83a27e6	1	Other	Other
+97220365-4d8a-482e-9e75-0c797655f96a	1	Other	Other
+97221bdd-beab-48b0-b349-bd52959d284d	1	Other	Other
+9722b5cb-29af-4061-b5f4-08d3ce77f246	1	Other	Other
+9722e656-6053-40c2-a1c3-aac3ec70be55	1	Other	Other
+97233d16-be28-4a45-9bc0-a0c03f19dedc	1	Other	Other
+9723798c-a769-4843-9786-7f43e9e5ea03	1	Other	Other
+97239247-46c9-4e8b-a1dd-3ecad151514c	1	\N	Other
+9723afdd-3ca4-41fc-9a0a-cc1c2d2168ae	1	Other	Other
+9723e269-bfe8-4337-8b8d-1f0543bc6660	1	Other	Other
+9723ec79-5507-40f8-a783-17f0da6e71a0	1	Other	Other
+97242afb-0d02-404b-8f2a-8f591c206bf5	1	Other	Other
+972474d4-8c98-4d9b-afcc-f8c28f3641cb	1	Other	Other
+972496cf-37c1-4ad6-96ea-a7bf1572b96c	1	Other	Other
+97251e17-fb40-492d-97a4-3c653c884161	1	\N	Other
+972530e5-72f6-4afd-9e8b-21f3689f557e	1	Other	Other
+97256eb9-35e2-4ecc-adcb-1660c128636d	1	Other	Other
+9725b1ae-1bc2-4939-b02e-2ecb6050de46	1	Other	Other
+9725ca43-a50d-42f5-b1a1-b55b18f6a2c8	1	Other	Other
+972635a8-7521-4f0c-b590-ebcffaae74d5	1	Other	Other
+97263cce-3727-466d-9a01-f4264208cd41	1	Other	Other
+97267cd4-8285-46f4-893b-7082c9f303b4	1	Other	Other
+9726acc5-0334-41a6-bd60-538da72531b9	1	Other	Other
+9726ce03-e2e9-4c11-8c3e-191a781cedc4	1	Other	Other
+9726fdfa-8b78-4b89-ab09-aedc84bdeda1	1	Other	Other
+97279f87-baee-4eba-b5b6-d6b3211b32d7	1	Other	Other
+9727cffe-24d3-410f-95a9-91638b7df0c5	1	Other	Other
+97281381-fd97-43e6-a06c-9021bcbe06d9	1	Other	Other
+97283644-6b79-4bf5-aff9-7048e33eddb3	1	Other	Other
+97283ec7-2b36-4460-91db-41888d4dfae9	1	Other	Other
+9728464f-58ce-41b6-866d-b1ba20022a30	1	Other	Other
+9728cd56-3c02-49a4-86b1-54191dbdd16b	1	Other	Other
+9728d31a-914c-472a-ae27-03a17e59a0e3	1	Other	Other
+9728d72d-5889-42d8-a0e3-a7db25ea6e8f	1	Other	Other
+97290438-d29e-47e5-9562-8ea5c984984c	1	Other	Other
+97297907-043e-43ff-8e80-49bd2e97bb40	1	Other	Other
+97298813-b4a3-4910-887c-23ebe7f68357	1	Other	Other
+9729a187-dcab-4536-b9e5-94ef8adceca5	1	Other	Other
+972a51e1-2b83-4a45-a7d6-007e9cef5090	1	Other	Other
+972aa0ee-3633-42ca-8b48-13d078b06be4	1	Other	Other
+972b1770-9e53-49af-b707-769d556623d7	1	Other	Other
+972b1b7d-7474-4c69-8de2-05e0cca98f78	1	\N	Other
+972b5a86-469a-4fe8-9c30-99d813085c7c	1	Other	Other
+972bb875-1fcb-4db7-abd2-2d03d0eda3e2	1	Other	Other
+972bdd3f-e10c-44a7-b574-6d48dcc71782	1	\N	Other
+972c38e4-aec5-4404-8151-58687864d6ca	1	Other	Other
+972c44a4-bbad-4108-ae24-9ffdc9860219	1	Other	Other
+972c6f72-76a6-489f-9250-407404e825ea	1	Other	Other
+972c9cf3-4ee7-4e1a-9bd3-2a4cbbb1eb3d	1	Other	Other
+972d75b5-b2ef-484c-b01f-b9f725d15f6d	1	Other	Other
+972d920a-0e38-479f-88ba-0177d0325f39	1	Other	Other
+972db08b-1e15-4481-a6ea-f6e25474552c	1	Other	Other
+972dc551-4ac8-467e-a814-84904b7222a8	1	Other	Other
+972dfd0b-c59c-4223-8b1e-3094122b4062	1	Other	Other
+972e0c0a-90b7-4133-8f40-6a5befcf123e	1	\N	Other
+972e1c95-5e5a-420f-b548-a616e3b0181f	1	Other	Other
+972e4e7e-a9dc-4ba4-ac5a-41a982f25324	1	Other	Other
+972e9eb2-5465-46a7-b791-922f2691a753	1	Other	Other
+972eaf3f-67ea-4bc8-aaec-3249079c036e	1	Other	Other
+972ec181-7a42-4e96-90dd-7bb93caed0a0	1	Other	Other
+972ed4b1-a972-40b5-b339-46aceb4f952d	1	Other	Other
+972edf27-e836-4bcf-9a23-add9422fa967	1	Other	Other
+972f044c-6488-4b63-a458-6a0fe6c2b20a	1	Other	Other
+972f4bed-bcc8-4873-928e-e1200c7ef67b	1	Other	Other
+972f6f34-5ead-4ac6-a3ea-9d0020b4f30d	1	Other	Other
+972f702a-5de5-4d11-9915-22490b21f3d4	1	Other	Other
+972f75b2-b5fa-4e37-9eda-15fa0842b175	1	Other	Other
+972f9d70-ec52-46ac-b95f-f8840a4dc15f	1	Other	Other
+973042b5-0323-4fd3-9a5e-d2f947e6e522	1	Other	Other
+97305809-673a-4275-9391-969dc7ae0451	1	\N	Other
+973068c8-02ae-4654-a50c-ce569d5c0d3b	1	Other	Other
+97306b47-87db-4fc6-bde4-4b462098bfc7	1	Other	Other
+97312f1b-2ac8-4271-a5b8-49957a7fd493	1	Other	Other
+973155da-d34a-46a6-9e25-550a950d1044	1	Other	Other
+97317e39-28d3-4c56-939c-69153ee6a6a9	1	Other	Other
+97319d8d-3ca2-4556-b164-cdf73531695b	1	Other	Other
+9731ceb9-ec99-43e5-9739-b8cfb85f36e8	1	Other	Other
+97320069-327e-4ed1-8c24-c3219e49a527	1	Other	Other
+97320644-dbbc-4738-8d8b-a40c2b9ebb10	1	Other	Other
+9732884b-b16f-44cb-ae34-a126c9146f7d	1	Other	Other
+97328f1d-b2d1-4ae2-ae86-21f9cd4a0f39	1	Other	Other
+97329d68-f384-458a-a3da-d112dd181a74	1	Other	Other
+9732a13c-f5a3-4473-a513-6c14c0ba8405	1	Other	Other
+9732a5b8-6c8e-45fe-b3e9-f7c658313107	1	Other	Other
+9732cbed-cbfd-4b35-816d-6e8f58d69a21	1	Other	Other
+97330fe9-f272-47e9-9e3e-f1ca9c4df607	1	Other	Other
+9733c28e-ff4d-4ecc-8fd7-fd4d968badc2	1	Other	Other
+97343b9c-0361-4734-be11-d35523d68699	1	Other	Other
+9734e07d-9cb4-4f6b-bafd-33b049468b85	1	Other	Other
+9735374f-dd25-47e7-9a27-b2c999323f0b	1	Other	Other
+9735adbd-d730-471d-a636-43a6224cc32d	1	Other	Other
+9735c385-7624-4fca-816f-caa738e1f6fa	1	Other	Other
+97363363-e0fb-42fc-bffa-35f5a711fe68	1	Other	Other
+97363d91-9b46-47ac-8af2-df59947f487c	1	Other	Other
+973679e2-e0b2-439a-9bb4-8785cf8b8865	1	Other	Other
+97371713-f892-4456-a696-b474ad55d693	1	Other	Other
+9737352e-9c59-4768-b126-2b91d2470fd2	1	Other	Other
+973770a0-77a8-47db-a8c6-c52af5bad266	1	Other	Other
+9737a0e5-716b-409e-bac4-bb0c789f6008	1	Other	Other
+9737e66d-92c3-416d-bba6-7f68a2227fa1	1	\N	Other
+9737f825-a43e-4e88-97e3-61d42dbfeb60	1	Other	Other
+97381557-8cd0-438c-b920-7a5c257f7d29	1	Other	Other
+97384d45-110b-4527-a924-d4d0179c6c47	1	Other	Other
+97388a18-9c75-4f46-bf3c-226c996c4610	1	Other	Other
+9738ddcc-bc9a-4580-8e06-4f9658733149	1	Other	Other
+9739004e-6d2c-4f82-972a-a6bcbeb1579c	1	Other	Other
+97391a09-9a2d-4b99-bcf1-b1b665b41a26	1	Other	Other
+97394128-38cd-462a-a8c5-4fb5d1b33c12	1	Other	Other
+97396fe3-c5c7-4c62-a904-3ac7b33139dc	1	Other	Other
+9739706f-90ff-4bc8-9f26-cdfe97c7f083	1	Other	Other
+97399571-0668-44b1-8731-b65bfff075f4	1	Other	Other
+9739aa89-8d90-47bc-91ff-5200e531ab8f	1	Other	Other
+9739f8f7-8dff-4cbe-bd82-2e32c8ffe8b2	1	Other	Other
+973a183f-caee-4e7b-a473-b164f50c49ab	1	\N	Other
+973a316e-1a34-41bf-8463-bbeb20ba0df9	1	Other	Other
+973a4a3d-53e4-4734-a5e5-6185d7a8c95f	1	Other	Other
+973a8a17-425c-4a67-ad80-80a921a6ab81	1	Other	Other
+973adebc-8712-450b-b0d0-5ef52dc11bdb	1	\N	Other
+973ae499-29e4-402a-821f-253d7754d6d3	1	Other	Other
+973aee39-71e6-43a1-8a80-fc28d0a16240	1	Other	Other
+973b465f-943a-4cd5-ae96-356977e3914c	1	Other	Other
+973ba170-c484-4a54-803e-1ab07f68306f	1	Other	Other
+973c560b-c721-46ca-926a-a891a79398d3	1	Other	Other
+973c6bbd-9769-4e2a-90c0-da3bbdb1346c	1	Other	Other
+973cd9c4-4695-456e-902a-cc4a27cd57dd	1	Other	Other
+973d117e-d125-4a1e-91c7-64aa31210195	1	Other	Other
+973d1fa6-cb94-414d-be4d-acfabefe9102	1	Other	Other
+973d41a2-22d2-413d-b553-fcd57210063d	1	Other	Other
+973d4cb1-5ef9-41aa-849e-bf3d01041ea2	1	Other	Other
+973d7c5a-9855-44c5-af0b-54b2732b45a9	1	Other	Other
+973d8e01-34a5-47f8-aaf7-7964f1f78ad5	1	Other	Other
+973e0a88-aae5-43c0-8c49-1396c232eb76	1	Other	Other
+973e1e78-a284-4306-9a1f-8574b047ea7a	1	Other	Other
+973e3a6f-386b-41b5-889f-a86b30f7ef2c	1	Other	Other
+973e68f6-9b59-4f1b-b6ca-b7767490b13c	1	\N	Other
+973e7ea0-2c45-4c93-b735-63c4f6f95e7c	1	Other	Other
+973ea5fc-a09d-45e8-b721-efda915673d4	1	Other	Other
+973ed98e-a38f-11e7-a2c3-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+973ee654-9da7-4df6-a9d6-5701b434414d	1	Other	Other
+973f1e85-75a6-4bbb-8195-797c04cc0f44	1	Other	Other
+973f4cf8-7573-403a-8657-9aaa185432ee	1	Other	Other
+973f524e-5667-4be6-b51a-68478a48ffc6	1	Other	Other
+973f561c-05e0-47c2-bd5c-c73b4173c792	1	Other	Other
+973fc335-eec9-4a95-8a78-513a9da313e4	1	Other	Other
+973fd40b-5a36-4fce-9022-1dd1d4714a25	1	Other	Other
+973fecb0-3348-4801-b7e9-99820fea41eb	1	\N	Other
+9740579d-226f-4f4a-b46e-1b3c1b68d9f6	1	Other	Other
+97409e1d-d684-4abf-a3c2-9d0ff0127deb	1	Other	Other
+9740dc30-d54d-4ff6-ace9-3c877550dc86	1	Other	Other
+97416cc9-0438-490b-87f8-92e9380c7fd0	1	Other	Other
+97417b29-483f-4636-911a-27c0491a9ca3	1	Other	Other
+9741a037-fb2b-4847-a3aa-74b1fb6365b1	1	Other	Other
+9741a2ed-b50f-4af5-be91-e8fd58f02c53	1	Other	Other
+9741ad55-ccdb-4a35-a18b-1ed4af9ba8e4	1	Other	Other
+9741e064-7ca2-48d8-8894-f1a4d44de3f2	1	Other	Other
+97424635-de90-4c79-a00a-6eee6473c620	1	Other	Other
+974270f2-ff1e-4c16-8e1d-55cece1ddbb1	1	Other	Other
+9742815e-0e97-4ea6-a1ed-7394c2d8db4b	1	Other	Other
+9742a7c4-7d34-472d-abba-919b19533ca8	1	Other	Other
+9742d57f-bcb8-47b3-a5b7-21bcb0ee30d0	1	Other	Other
+97430a9f-0eed-4b81-a348-70fc852487d7	1	Other	Other
+974371b8-7fe9-43dd-a66e-e0aa0b8c7088	1	Other	Other
+9743a8d4-c6c7-432a-8f55-b609fad688c7	1	Other	Other
+9743e21f-3395-477a-9386-3fc96f6894e4	1	Other	Other
+9743fd4c-4ccf-4b2d-8542-09fd171da40a	1	Other	Other
+97441fec-8647-48c5-bca2-5e01bb9354bd	1	Other	Other
+974425b5-43a1-4f48-abc8-cb3b07408121	1	\N	Other
+97443221-09f6-4f83-add5-1222959dc862	1	Other	Other
+97449001-10cf-41f8-b2c4-878ce14f1076	1	Other	Other
+9744fee9-eaf8-4a0b-b26b-e316f901a6e6	1	Other	Other
+97451837-4d48-42cd-baec-65ad16ac7a6b	1	Other	Other
+97457e92-4c5f-4618-9379-6833e7d120c3	1	Other	Other
+9745a576-6bee-4211-9fe0-50a6a51e7633	1	Other	Other
+9745a605-202f-41d2-b18e-2a89066384e0	1	Other	Other
+9745d9ca-c443-4279-a529-844af6155231	1	Other	Other
+9745e312-8104-42fd-accf-dd3eaa183094	1	Other	Other
+9745f847-02cc-42f3-bf85-deb46c981330	1	Other	Other
+97463b58-4b47-430f-bae0-7022c3b40d81	1	Other	Other
+97468086-e1ed-4f90-a7bb-aece9ba864da	1	Other	Other
+9746a5f6-a056-48ea-9de4-08dbcef174b7	1	Other	Other
+9746aa93-a0ea-4c41-8ad2-97bf9d88b250	1	Other	Other
+9746e257-558c-4eb4-98af-ad507d265415	1	Other	Other
+974700e5-4f28-4cd5-b206-dc101f0b1ad4	1	Other	Other
+97470f3c-2dea-465d-8a8d-b65bd4fab275	1	Other	Other
+9747792a-9ac2-11e7-b93c-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+97487d75-b5d0-40d2-b89b-12b113ba9488	1	Other	Other
+9748bd31-9fa8-46ae-b6ac-9ee80ddb5cc7	1	Other	Other
+9748c9b2-68e7-487b-9b72-c5090938999c	1	Other	Other
+9748dad6-f097-4bd0-805e-2961646fde93	1	Other	Other
+97490090-73d4-4a5d-8c2e-33c525fa9735	1	Other	Other
+97492929-4c55-4b6b-ba74-d659a13529ae	1	Other	Other
+974933ac-b2f4-44e3-8ed4-db0ee8227093	1	Other	Other
+974979c8-febf-4be1-8dad-7a334c3d47cc	1	Other	Other
+9749c64e-ddc4-4f06-9e39-0c289d0631d6	1	Other	Other
+974a8248-1f88-4c53-ae8b-ed4d7913b699	1	Other	Other
+974ac880-67b5-4237-bc7a-a89c315aa149	1	Other	Other
+974afb42-d68a-4db7-8e3f-f5e0758baf35	1	Other	Other
+974b1def-6e7b-4b95-b5fe-4944bc022166	1	Other	Other
+974b2ba6-5fd2-4083-a6e5-bfa2fc7bc877	1	Other	Other
+974b4e83-8b21-4a19-aa00-7ad1f89e9dcf	1	Other	Other
+974bb41b-97a1-4433-ab2d-01220dbfeae6	1	Other	Other
+974c429b-c959-4c4b-a1ff-b5722f792db0	1	Other	Other
+974c63ca-1b61-4621-ae50-a10afdc76318	1	Other	Other
+974c6ce6-7018-49e1-9425-cb24e0abbdd6	1	Other	Other
+974c6e35-152a-4749-9e33-82bf2a9dbd8a	1	Other	Other
+974c8597-1042-42df-b0d7-7dccba0c952d	1	Other	Other
+974c90ab-b670-48ac-a3af-b31f651f2d55	1	Other	Other
+974d4ae4-0b81-4cfd-844c-945c03ac6510	1	Other	Other
+974d7af3-da1e-4181-ab2c-7559925ea6d7	1	Other	Other
+974d7f96-52c6-48c4-8430-7a195b28f88e	1	Other	Other
+974d989a-87c2-4449-913b-63d1e2890df4	1	Other	Other
+974dbd9e-fa48-4767-b43b-29dbef0d0473	1	Other	Other
+974dc4e6-6e85-42fc-a71e-b867dd6841df	1	Other	Other
+974de87e-205e-4284-9635-43b296da9a7e	1	Other	Other
+974dfc06-6afc-4d63-82da-2b5c398de209	1	Other	Other
+974e3efb-271c-4836-a7d8-5de80977d674	1	Other	Other
+974ed8bb-30b2-4eff-a28e-01dfeee93dce	1	Other	Other
+974ee889-a6e7-4435-b2c8-4eb00737db88	1	Other	Other
+974f3039-333a-4750-bba6-0e92cde812a4	1	Other	Other
+974f4ea5-14ad-421f-8e8a-c8b6a631d1d9	1	Other	Other
+974f65b2-79fb-44b5-a423-8310dde062ce	1	Other	Other
+974f6e1d-28a4-4f32-8391-d94ca4df8a07	1	Other	Other
+974f7ab9-35da-432c-953c-20c69dcd1efb	1	Other	Other
+974f8e3b-da2e-4d53-9a18-b2198ee8261b	1	Other	Other
+974fcfdc-9da0-4f54-9f1d-3583948a719f	1	Other	Other
+974fffcf-fa0e-4ecb-b91d-ea9fedc9926e	1	Other	Other
+97502f29-abc3-43f6-b1fc-eb1dc9e2f127	1	Other	Other
+97503f47-d61d-46b5-bb86-bd6dd920eea3	1	Other	Other
+9750791f-fb4f-4d34-ac83-5b2e3fafff2b	1	Other	Other
+9750d279-6c0c-4b12-a056-19684645fb8a	1	Other	Other
+97519792-411e-4220-a10d-a313e8cef806	1	Other	Other
+975199d5-a5da-44e9-a809-59f8b03f7ea9	1	Other	Other
+9751a5c1-f5ab-430a-b1bd-5d56c41cb851	1	Other	Other
+9751db76-235d-4d2a-b2e0-c2b681eb669a	1	Other	Other
+9751ec89-34e4-4051-a07b-048dfcb9ae59	1	Other	Other
+9751f675-81c2-4674-b5ac-9fc58ac603c8	1	Other	Other
+97520ad8-3cbc-11e8-ae1c-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+97522db7-4725-43b3-9dd7-3abcc1a5167a	1	Other	Other
+975241f9-cf91-474e-9a73-9f8d97651a26	1	Other	Other
+975296d2-9235-49e5-a25a-2a74a8b7ef7a	1	Other	Other
+9752a5b0-d84e-4e8a-9872-3764caaf8497	1	Other	Other
+9752ea53-dab5-4b34-b99d-5552c85eaa47	1	Other	Other
+97530ff6-2f4d-4b36-8c75-c7523b55dbda	1	Other	Other
+97535efa-9fec-4da1-bc57-8e68c70a5d49	1	Other	Other
+97536e3d-3d76-4923-a23f-ca5575eddc32	1	Other	Other
+9753767b-a58c-479b-8558-53bc9101b228	1	Other	Other
+9753a885-2a07-4f9c-8c52-e50c5ed32a51	1	Other	Other
+9753f8b5-ece8-4989-b9fe-81da5d942dec	1	Other	Other
+975432f9-aa80-4dfe-bbca-5b7def480e41	1	Other	Other
+97544142-bff7-4961-8b45-72381363a6d8	1	Other	Other
+975484e0-b531-450a-800a-e6d38f2db5e6	1	Other	Other
+97548878-e6f7-4f7e-976f-3af70a020e72	1	Other	Other
+97549ecb-82c1-4780-838a-d6379f3e8080	1	Other	Other
+97555c42-4c2f-4dd9-a0f6-d646c2c4f89b	1	Other	Other
+97557400-32bc-441c-8299-c82c0a179d76	1	Other	Other
+9755b319-ff7e-4767-abb7-a72371e5396e	1	Other	Other
+9755bba8-5f82-467e-bfe0-9e5033de0449	1	Other	Other
+9755be75-6b95-4e28-87ec-aeb62fbec624	1	Other	Other
+9755cd2b-311a-4d25-bc44-1ddf1a5feafb	1	Other	Other
+97564f3b-d9eb-4ba7-9c4c-9cb2734bc849	1	Other	Other
+9756b318-9e16-4af3-b28e-da366b2ffe4f	1	Other	Other
+9757aaf1-ba05-401d-8add-2d3598ea79a9	1	Other	Other
+9757c16e-d1d9-4bc3-b63d-71378a0e314d	1	Other	Other
+9757f055-2fc3-4e91-af2a-8115e1f00c93	1	Other	Other
+97583d6f-6051-462b-aa0a-63f52d81f485	1	Other	Other
+9758714a-d800-4aae-825c-107d02359834	1	Other	Other
+97588259-f7c1-4472-abee-f59bd67e4b12	1	Other	Other
+9758bd04-5e0c-4da8-9d96-43492a66e865	1	Other	Other
+9758c976-96c7-4ddc-a5bd-8f02d43fc7fa	1	Other	Other
+97594607-6482-4dd7-ab9a-10932d0a64c2	1	Other	Other
+97595122-989c-499a-b27e-4cdf0f1e6ffe	1	Other	Other
+9759973a-2a6d-4079-9d35-5e21eae4d609	1	\N	Other
+9759a656-3899-4f7f-94a0-3f2d89d9be35	1	Other	Other
+975a4ee7-85c9-4320-b166-a3dae605e9ed	1	Other	Other
+975a5793-78be-4564-b7b4-67094ef9b36f	1	Other	Other
+975aacc9-03cd-4ba0-876e-eec813db3ace	1	Other	Other
+975afcf8-79f3-4890-82a0-2f3663c7aa31	1	Other	Other
+975b3731-d46d-4508-a680-2783543a6914	1	\N	Other
+975b6e86-0976-488e-b49d-bb54b34c21bc	1	Other	Other
+975b73dc-3213-4aea-88db-4b6243e4d092	1	Other	Other
+975b9909-4594-4990-9a89-a342a313d1de	1	Other	Other
+975b9e1c-aaee-47b0-b096-9823c1bd2b4a	1	Other	Other
+975ba865-62d8-4c99-bd3e-ddf98ed808a7	1	Other	Other
+975bb5c9-3170-430b-890b-9548da96ec8d	1	Other	Other
+975bfe64-5bb0-4674-8400-d2d0280ec21d	1	Other	Other
+975c285b-4a30-4420-889e-4c662ff6f02f	1	Other	Other
+975c38a3-3389-467a-8b49-751f18a5bd61	1	Other	Other
+975c7a3a-bdd1-44c8-ab4e-ea00a3d055d7	1	Other	Other
+975cafb1-3735-4f7e-80a3-48dcb3b0ff07	1	Other	Other
+975ccd2d-a0e6-434d-911b-72c9411979e5	1	Other	Other
+975cf3c4-0d22-40ff-9c71-07e178787d1b	1	Other	Other
+975d9d1d-b244-4126-90b9-77d5276e411c	1	Other	Other
+975da3b8-7cb2-42a5-a865-9ca9cbf1d013	1	Other	Other
+975da615-a496-4991-a045-466804714a08	1	Other	Other
+975dae98-92d9-4a7d-87d8-784098cb7d25	1	Other	Other
+975de740-5cd4-45b1-8082-3122a20748f7	1	Other	Other
+975df9ea-ba00-4da7-bc1f-3bf561526491	1	Other	Other
+975dfced-1e42-44d7-9250-7976e6ae0469	1	Other	Other
+975e112e-edb6-4512-9684-1e83f7890b20	1	Other	Other
+975e1172-d163-403d-b46b-33e65b707853	1	Other	Other
+975e76c5-750a-418a-b1fc-38d74e0aae54	1	Other	Other
+975e7975-974d-44e6-b701-13cf1237e822	1	Other	Other
+975e8ab0-0da5-461a-a9c7-4dec5e2311cd	1	Other	Other
+975ecd03-acca-4782-a1fb-e441ba6702fc	1	Other	Other
+975f1e54-042c-4d1f-bfea-1b2bdc14b73a	1	Other	Other
+975f27b3-8c10-4e3a-a319-0bf63f2bb3d7	1	Other	Other
+975f2b22-0eb2-46a7-9092-71b4e6465b1b	1	Other	Other
+975f316a-66ae-4884-ba2f-54e9ff953ca5	1	Other	Other
+975f5c5d-f44c-42fc-a16c-05dac1219623	1	Other	Other
+975fd94b-ad9f-4f8d-a40d-730c27d0bcec	1	Other	Other
+975ff3a3-a4b9-426f-9db4-f9ba707157b3	1	Other	Other
+975ff595-bd35-41b9-9fe5-99eafa2c84b0	1	Other	Other
+97600433-8473-480c-9353-65f8a691cede	1	Other	Other
+97601b01-d60e-4ceb-b8b5-c04a6cbb64ca	1	Other	Other
+9760303e-b2aa-4914-abe8-1462f2f3b0e0	1	\N	Other
+97603d5d-5dab-447b-864b-32b992e80360	1	Other	Other
+976055a7-2b14-46e1-ba88-fa8a071cf8db	1	Other	Other
+97605b00-1416-4ea8-b50a-303bb7a32ea0	1	Other	Other
+97606247-62e2-4242-92b5-e7e410e540f1	1	Other	Other
+9760872d-53a4-4135-b002-dbc4b8bc73e9	1	Other	Other
+9760b403-2480-45fe-a280-b24a594501e1	1	Other	Other
+9760bc37-1e59-4f73-b2be-54ec19fca3b4	1	James	Other
+9760eb41-8264-4201-836f-3452b1cfe9e7	1	Other	Other
+9760ffe6-c72f-4fe4-ae8e-b15eb163f97a	1	Other	Other
+976152e7-2fb3-42fc-85ff-72cdfd519e96	1	Other	Other
+976160bc-10f0-4a4d-9c02-b5b5b24a25d0	1	Other	Other
+9761dfda-5892-4b5c-a2df-62b4d4867acd	1	Other	Other
+976201c1-8ddf-4543-bc59-cde63c69995b	1	Other	Other
+97621f01-bd68-4f59-8c03-bcea9c312204	1	Other	Other
+976258f0-b393-4958-9461-5424eb73cf6e	1	Other	Other
+97629e02-7f85-4fad-b5eb-45f20968801a	1	\N	Other
+9762c23e-829c-42f8-a337-6fbfaba3991d	1	Other	Other
+9762c730-4032-4c93-a82a-532826ef0601	1	Other	Other
+9762cb23-4a83-45c4-bf34-e8636b91ff50	1	Other	Other
+9763363b-7c63-472b-93ad-68c26e1ead1c	1	Other	Other
+97633b43-8086-40ec-b103-d083ecae2d7a	1	Other	Other
+97638e02-3872-4747-8793-d303d11ed2be	1	Other	Other
+9763df20-0260-4203-9734-2cc5c1194743	1	\N	Other
+976421b0-a323-4a83-8ea4-19727d8f660a	1	Other	Other
+97650c87-acf3-42f4-9d05-d77faab9d6b6	1	Other	Other
+97652ea4-5175-4542-aee4-63f79194427b	1	Other	Other
+97653101-e463-4cc5-a195-6166d573ad83	1	\N	Other
+97654210-0b84-4ca3-8606-f70136f47670	1	Other	Other
+976553a7-a63e-40e4-a0d6-f6f4fbc8c2fd	1	Other	Other
+97658594-947c-4178-809e-1c69f732b3f8	1	Other	Other
+9765a11d-2148-4bdb-a6bb-e7ed8b37a435	1	Other	Other
+9765b553-e41b-4a76-b748-2877d896f3bf	1	Other	Other
+9765f88e-7092-42e8-b747-fccae467740b	1	Other	Other
+97663c08-b77e-4155-997c-5e731704b3b9	1	Other	Other
+976646b1-6e72-4a2f-b230-dbc0e21e3170	1	Other	Other
+9766c3ac-53d7-4ef7-bc6b-6d78f58fe7e3	1	Other	Other
+9766d14e-0387-48ad-aff6-f440853b6066	1	Other	Other
+9766e199-62ca-4aea-91a6-cc2f8da23e12	1	Other	Other
+9767179a-cd68-4616-8ba6-dacfe087361e	1	Other	Other
+97671f01-d59c-4fe1-acb4-b841bd971546	1	Other	Other
+97673e82-1589-44d6-97f2-3f4023ab96dd	1	Other	Other
+97676f17-0c05-4185-bda6-29d115263298	1	Other	Other
+9767b1db-eb9c-45ee-b959-988c66ba22a9	1	Other	Other
+9767b6d8-72cb-430e-8e81-b464b752041e	1	Other	Other
+9767d47b-0b64-42f2-9a73-330532f8f818	1	Other	Other
+9767f23e-3c78-4454-806c-ad7b97d3e6cc	1	Other	Other
+97683e0f-1428-4a97-b67c-430d59c340cc	1	Other	Other
+97686379-3989-48d1-b153-b8493566149e	1	Other	Other
+97689b30-8568-415d-981d-bd90ec70edd3	1	Other	Other
+9768bc46-569d-4e80-a0f4-1dfb03caaeca	1	Other	Other
+9768c767-6d40-4bee-b2a4-b1b2ce895b85	1	Other	Other
+9768e0df-a8c1-4786-8029-f8c6d4cb7a54	1	Other	Other
+9768e5c1-09f0-43d6-9231-35ca777a9b36	1	Other	Other
+97693914-2986-47d3-ba02-2a87b209f21e	1	Other	Other
+97695ef4-bedf-4435-82cc-de332ce16dcc	1	Other	Other
+97696bbf-ec32-499b-b0c7-eac4142e7fb4	1	Other	Other
+97698de7-fbb5-4d0c-9a38-94b21ee02912	1	Other	Other
+9769abb0-b564-466f-ac94-260ac7cb930b	1	Other	Other
+9769d1aa-26d3-4c8f-878e-3d29c1ba87fa	1	Other	Other
+9769d1cf-9772-4586-9f06-3e6a5ad6bce6	1	Other	Other
+9769e86c-90d2-4a70-b4b0-6fa99b2466a2	1	Other	Other
+9769f9d0-85ec-486e-875d-5523421c42b3	1	Other	Other
+9769ff3e-b9d1-4650-b9ef-3de2cfa81175	1	Other	Other
+976a0600-1a8a-4c8a-881c-ce959eead993	1	Other	Other
+976a289e-b553-4ae7-9578-1104645cd351	1	Other	Other
+976a29a8-97b4-4c6a-8bf1-3bb26db62d66	1	Other	Other
+976a4790-5eee-41e7-ad0f-a20fb03b1def	1	Other	Other
+976a4dbb-507d-4f8b-a517-3170cdf3ac5b	1	Other	Other
+976a69a7-63a2-4795-9489-6f10a067c077	1	Other	Other
+976ae6f6-012d-45fa-99bf-cf34d8d66797	1	James	Other
+976b12a7-e2bc-49ff-b5be-5d9c587708ec	1	Other	Other
+976bc78e-8b1a-4008-a307-b3bf1b9375a7	1	Other	Other
+976c2e20-99fd-4c55-b214-a353237beee6	1	Other	Other
+976c4ee0-f4d2-483a-8339-153ab2c7c4c4	1	Other	Other
+976c5d8a-ba77-4f08-bc96-4d8cea04d108	1	Other	Other
+976d2063-698f-4589-9521-a6fe1fe34d26	1	Other	Other
+976d489c-0564-430c-b6d5-53cbcfb0fe8a	1	Other	Other
+976d552a-fb73-48f5-b6f9-f4e22b91e066	1	Other	Other
+976d78d4-baaf-4fe7-a6e8-5de095b6e452	1	Other	Other
+976d9554-64d5-4453-9180-a7307a4020dc	1	Other	Other
+976daf46-5641-4177-834c-bec65cdada26	1	Other	Other
+976dbf60-9632-48ba-9f8c-e54fa8f6f4dd	1	Other	Other
+976de177-bb5c-4df8-ad28-8ca925b18991	1	Other	Other
+976df9ef-e933-43f4-b6d5-84868a7aea61	1	Other	Other
+976e3836-25b8-11e8-ac0f-fa163e8624cc	1	\N	Other
+976e740f-0455-41e8-b27f-5f205d07d7a9	1	Other	Other
+976e83f5-48b4-43cd-9fe2-f6ea8471d2ef	1	Other	Other
+976ea904-bdf5-41cc-91d9-f992b2cf63af	1	Other	Other
+976f243e-2b8b-46e6-a436-35149d363312	1	Other	Other
+976f2d76-39f2-4f48-ae19-0d349de6c18f	1	Other	Other
+976f6ca7-8dc3-4561-b392-0481d0c38ad9	1	Other	Other
+976f7dce-069c-4ff6-945b-f1a2d19b7d02	1	Other	Other
+976f99b2-9811-42d3-b9ee-555fa22f3550	1	Other	Other
+976f9e4c-25b8-11e8-9dd1-fa163e8624cc	1	\N	Other
+976fd760-1cab-4da4-9c89-c450b9e1e54f	1	Other	Other
+97702431-a6e8-41e4-944d-e70351182192	1	Other	Other
+97704fd7-ec02-4b3b-8827-0aab1b25bff8	1	Other	Other
+977085e0-cd4a-4e33-afff-2e985d1bd8d0	1	Other	Other
+97709183-8c3b-43e5-8c1f-c1958c667ee5	1	\N	Other
+977095a0-1c10-40ff-98d8-ad4a171160c8	1	Other	Other
+9770a0da-aca0-4c98-bc77-e1c47b646742	1	Other	Other
+9770ad41-55b0-4255-8159-9bbe4081b3d1	1	Other	Other
+9770f0cd-d8d5-4b9a-9488-6f9522586ee4	1	Other	Other
+9770f9da-9b2c-43be-93ae-ff849840be12	1	Other	Other
+9771183b-6e46-469b-99e8-43c67674b95c	1	Other	Other
+9771529b-a667-49a4-9b72-0986ad83959f	1	Other	Other
+97715999-129b-45b7-9cac-5a4546413d1b	1	Other	Other
+977193a9-3790-40f2-a59c-4891864c73c5	1	Other	Other
+9771b418-cb4c-4563-b5ef-76f937f20a04	1	Other	Other
+9771ddce-a822-4249-a292-b66c57c47460	1	\N	Other
+9771de38-b0ae-4137-8c58-0a9e1a49e9d3	1	Other	Other
+9771fdb3-8bf1-4939-8c2f-29cbf7b3a79e	1	Other	Other
+97720b3c-870e-420c-b592-34b151d64a19	1	Other	Other
+977213f6-bc47-4933-a1c5-5ef442ac08c7	1	Other	Other
+9772b7f4-68b6-405c-9d15-9845ac133e2f	1	Other	Other
+9772fd7d-426f-46ca-9548-a9132ea03be1	1	Other	Other
+9773498b-70a3-43d3-8d6e-58e0daac2165	1	Other	Other
+9773595d-bde2-46dd-bf78-5c6842d59377	1	Other	Other
+97736415-a4fe-4340-ad84-5144bbfded92	1	Other	Other
+97736d0e-28c2-4dfd-b8b4-2375b0cc857e	1	Other	Other
+9773afeb-71a2-4521-9146-6ad5431000ec	1	Other	Other
+9773cf7a-555f-443d-b254-2fe136aacad4	1	Other	Other
+9773e8de-9c5f-4630-b3dc-9037640e11f6	1	Other	Other
+9773f87a-bb39-48ff-87a2-dde8450b3a0e	1	Other	Other
+9774066e-9d53-4dcc-b169-9e624d804073	1	\N	Other
+97743858-5a7e-4308-8327-b742b403fe2a	1	James	Other
+97744a28-a32f-4389-8beb-44f637ca0b29	1	Other	Other
+97744be9-5180-4ba2-8be6-15f9ffd0fc71	1	Other	Other
+97747459-188d-4a4e-8b22-1d91bcf2f85c	1	\N	Other
+97750822-5da3-41a1-98d6-5c3896bb2f35	1	Other	Other
+97751192-770d-494d-b1e3-0a65eb0270d4	1	Other	Other
+97751cfc-200d-409f-b5ab-1fa84dba599c	1	Other	Other
+97752b7b-7c46-4520-9d12-74c8012282c1	1	Other	Other
+9775760b-a771-434a-b045-ec4d32d810d2	1	Other	Other
+97758152-7476-4c3f-80a6-e0b65d13ff85	1	Other	Other
+9775972c-ce43-4c0d-aa1d-45d89749aaf4	1	James	Other
+9775a0b4-3dbc-4c45-8c55-2a1ec1522a47	1	Other	Other
+9775a8b6-156f-4f13-87df-689edc5b121b	1	Other	Other
+97763e25-2cea-473d-af5d-52925d51d7d3	1	Other	Other
+97764d33-ba6f-47b6-ab19-59de7282e9d5	1	Other	Other
+97768706-11dc-424a-a72e-a5321fccd828	1	Other	Other
+97769343-be84-4064-b4a5-2a3170d0ffd3	1	Other	Other
+977695f9-c14e-4694-874f-6c11cfd1f0d8	1	Other	Other
+9777a322-9f9a-4969-ab80-baeec7b3e6b0	1	Other	Other
+9777a7c7-1fbc-4eeb-8bb8-ea482fd74920	1	Other	Other
+9777e1f2-5b62-45d7-9297-720527ff036d	1	Other	Other
+97786459-2bcf-42f3-8b44-d2c526d71f14	1	Other	Other
+9778da79-d590-43d4-8806-bb5cad98841e	1	Other	Other
+9779037c-6826-44de-ae42-1777f4a88765	1	Other	Other
+977910b4-7037-43c6-ac20-0f20a807e479	1	Other	Other
+97793306-952f-4708-80d7-fd75e93e88fe	1	Other	Other
+9779525b-d0b8-423f-90b3-136531aa9759	1	Other	Other
+9779a028-94eb-488f-a5e5-1cc830a2ac24	1	Other	Other
+977a2c8e-3376-44a0-9047-d8a770166126	1	Other	Other
+977a46a9-c64b-4947-9e7a-abfea710a727	1	Other	Other
+977a81d7-8914-4414-9f31-ac11b4d9a636	1	Other	Other
+977a8393-955e-4854-a381-13f7bf51884f	1	Other	Other
+977affcc-cf1f-474f-8f8d-a2b88dff4163	1	Other	Other
+977b0cb0-8079-49cf-80cc-a25045909bca	1	Other	Other
+977b227f-3658-4d39-94b6-592ab734564b	1	Other	Other
+977b6020-b474-4394-978a-7771af4f00aa	1	Other	Other
+977b6f4f-02b1-4a45-8afe-20c2461578bc	1	Other	Other
+977b9424-4ac1-41ce-83ec-932b19c01bc7	1	Other	Other
+977b94a8-8a8f-424e-91fa-9aea9ee8360b	1	Other	Other
+977c3ebc-d530-4985-89e6-7bdf90c98713	1	Other	Other
+977c5ad4-6db5-4d84-b28d-63c87e495c3c	1	Other	Other
+977ccf61-7352-4ffa-8c48-378a02ec976b	1	Other	Other
+977d073d-9240-407e-abe0-ba258d7cfd36	1	Other	Other
+977d6930-f919-42f5-83cc-17a6c985496a	1	Other	Other
+977d72d4-fcc0-4a38-b3d6-3e9b6b6bfe1e	1	Other	Other
+977d780c-0ee1-461e-b191-00414c27c81f	1	Other	Other
+977dc509-7e76-471a-b32d-99e388a60160	1	Other	Other
+977dd4d8-f14e-4d62-8d86-e87e3c36329b	1	Other	Other
+977e17a6-094a-4eb9-8893-caa85108d114	1	\N	Other
+977f0b69-4c97-4769-9cce-5df617d4b381	1	Other	Other
+977f5f7b-1022-431f-8961-3b8bc057df2f	1	Other	Other
+977f8816-f6d8-40bb-86d9-713288393f9a	1	Other	Other
+977f8e98-9121-4d80-a618-7bd6a83184aa	1	Other	Other
+977fee32-911c-4aaf-926f-d6eb0af7386e	1	Other	Other
+978015d6-9646-42b9-b8df-64c2e27f3dbd	1	Other	Other
+9780441a-aeb2-4ad1-90c3-5022d4655ba7	1	Other	Other
+97809cfe-c9d8-4860-a961-c4ad8aa8cfbb	1	Other	Other
+9780c90e-cbce-46a8-a98e-c3011b86d6a2	1	\N	Other
+97817a88-db28-46c1-969f-620656cf9522	1	Other	Other
+9781ad77-28a3-4f98-9c7e-1fd1eb981dd8	1	Other	Other
+9781b267-23b7-41f7-8ce5-0b8ab0538fa0	1	Other	Other
+9781cd3c-b3f9-4a10-a08b-8da93e7acb7c	1	Other	Other
+9781d839-b8fe-4ae0-93df-2ee6660c8bfc	1	Other	Other
+9781e19b-b359-444a-9d3c-70e184c116f6	1	Other	Other
+9781fe7a-7e97-45ff-bf92-273323992346	1	Other	Other
+9781ffa2-b91c-4d8a-80a0-bf9288546421	1	Other	Other
+978209c6-9156-4847-8ba5-62ca3941a6d6	1	Other	Other
+9782124c-7e22-4303-b678-0b95ffe24130	1	Other	Other
+97821c20-cc1f-4f3b-8894-2e34cc428a4c	1	Other	Other
+97822db5-2d1e-4034-be70-cebafefbc259	1	Other	Other
+9782ab2c-4223-4924-96c9-b5ff186f598f	1	Other	Other
+9782dd52-96d3-41ad-846e-e6b3b100766b	1	Other	Other
+9782f20f-afc4-4d6d-a5ee-aba21db4c16f	1	Other	Other
+978322aa-63fc-4991-8001-edb3cb459c40	1	Other	Other
+97836cc6-a925-4887-bd63-7bfab7135dfd	1	Other	Other
+9783ca69-022f-4e9d-8bc2-4a8f6d24896c	1	Other	Other
+9783e9db-d985-4450-90f5-e1da0394152f	1	\N	Other
+978444f5-85d8-4496-bdb6-1e01557f2b3c	1	Other	Other
+97846e0a-f666-46e4-8307-3a63dd631fcd	1	Other	Other
+9784a91d-837f-4690-b305-7cb4b9853579	1	Other	Other
+9784ac3f-9200-4cf5-b2fc-d3368b4cd202	1	Other	Other
+97853374-3e13-43e7-8946-1a7c3e32c7c5	1	Other	Other
+97853652-5eaf-4dbf-97f5-c4f8ea19b685	1	Other	Other
+97854c11-46cd-431a-b654-52d410d532d9	1	Other	Other
+97857fbc-d69e-4b44-933b-a07431c8647c	1	Other	Other
+97858399-b630-4fdc-9cd2-b9c0ba42feae	1	Other	Other
+9785a1fc-bbaa-4b0b-a031-200e100b5307	1	Other	Other
+9785a211-9f91-40b9-8848-a9672f7a95d7	1	Other	Other
+9785b28f-de2e-4b65-86cc-b6df89f8f7bc	1	Other	Other
+9785b89d-6438-47a2-a8b5-70aaf57bde68	1	Other	Other
+9785c35e-1b96-4357-b4f0-14e8d1e57371	1	Other	Other
+9785c9ed-bbcc-49e1-862b-bb1a785c9b4d	1	Other	Other
+9785dd50-fd43-427b-8631-b1f57effb5cb	1	Other	Other
+9786120d-b280-4885-bfac-77e48e28d808	1	Other	Other
+97861b58-63b3-4bbb-93d1-fc0f6f37d48c	1	Other	Other
+97863f1d-c85b-4b90-bf62-affd689de9f6	1	Other	Other
+97866ad9-753f-4016-bb52-0b9252bd2c5e	1	Other	Other
+9786a2ac-078c-4162-b2f5-34037e78a4cf	1	Other	Other
+9786e8ca-0c5d-40ab-935a-dfacd283305f	1	Other	Other
+9787279a-4210-4283-a4dd-053e2bfb0a5a	1	Other	Other
+97872802-a2f5-4a83-badd-2e4cb4b5ca66	1	Other	Other
+978767f5-9ff6-4c18-b3db-6151697c5d87	1	Other	Other
+9787db6a-8507-424e-8a53-ffa842d165b9	1	Other	Other
+97888753-7809-470e-9da8-ac33151ddf5c	1	Other	Other
+97888891-dfad-4273-ac09-4ff74d7f560d	1	Other	Other
+9788d38e-66d8-49b9-8f69-21b91853b41d	1	Other	Other
+9788d74f-50d3-421a-9bed-a0479fdfa1a0	1	\N	Other
+9788f3b2-aa89-4142-9a6a-5ae23c96bc19	1	Other	Other
+97890d2b-8f23-4f5a-ad6a-2e6fcd1fa9b1	1	Other	Other
+97890ebf-12de-45a1-8d1e-2a55cc27f0f4	1	Other	Other
+97899e57-1517-4e32-ab18-bfb260ee2909	1	Other	Other
+9789cf4b-1abb-4710-9787-97c26542a000	1	Other	Other
+9789d16f-f2b7-4324-bbe8-cab89ef6ffb2	1	Other	Other
+9789d381-d85d-46bd-a5b0-6de6c5b52167	1	Other	Other
+978a1d4e-4aab-40de-989f-07790523acc1	1	Other	Other
+978a67fd-67d4-4bce-8f85-27299773c9fe	1	Other	Other
+978a6d4e-d226-4aaa-93da-53f5fc4f4e22	1	Other	Other
+978a91bc-8e13-433f-a4a4-944cd53d9317	1	Other	Other
+978aaaa3-b070-4909-87fd-63b707313008	1	Other	Other
+978ab40d-c2b6-46ba-93e6-f119795803e9	1	Other	Other
+978ab89c-6edc-4a59-ab19-cfd12e623309	1	Other	Other
+978b06b8-f0f7-46d5-9b9c-0bad668b8337	1	Other	Other
+978b0fb5-0a8c-45c8-aca3-1deea4022f29	1	Other	Other
+978b1f3c-4016-489c-8b40-21eebfca5d76	1	Other	Other
+978b228a-449f-4d5f-abe3-b7d3e533fdb3	1	Other	Other
+978b5b34-9087-431a-9e32-bf853ce51b76	1	Other	Other
+978b7127-ad0b-4c35-87e8-f374ad2738c4	1	Other	Other
+978b8cb4-4049-408e-84d7-2e21e7843115	1	Other	Other
+978b9529-0dd3-4148-8ceb-988796621e58	1	Other	Other
+978bae54-098d-4822-bcb0-7217482bbadb	1	Other	Other
+978c289a-428e-4cb5-a463-5eb1a13f168a	1	Other	Other
+978c4bfc-451c-4fa4-ad18-f154bf0d500a	1	Other	Other
+978c6d9c-4a90-4e54-9bb1-4563f4af0350	1	Other	Other
+978c7812-c743-4828-ab2e-4ffee9e531b3	1	Other	Other
+978cf5db-639a-40d0-a418-89c2c18cc319	1	Other	Other
+978d46b2-3c54-4c57-ba40-440f752b1c1c	1	Other	Other
+978e2257-4965-4016-b6c8-913dd65b7add	1	Other	Other
+978e3e51-5bbc-4c61-859f-b3d977d1b74f	1	Other	Other
+978ef295-152e-4332-85dd-44e7612b6e36	1	Other	Other
+978f2f29-fa5c-47ce-8247-1a0fccaf8416	1	Other	Other
+978f3a03-6a71-429d-99c9-d3078c13bb18	1	Other	Other
+978f54b2-1ccd-418a-8d16-136afc1b95d7	1	Other	Other
+978f83f0-f94a-4c22-8348-4b5532da1530	1	Other	Other
+978f9455-ccaa-4902-ae9d-1cd652b8102f	1	Other	Other
+978f9550-768a-483f-abc4-b6a07579eaba	1	Other	Other
+978fbc9a-3cbc-4e0a-a010-a6fa6f2e5a31	1	Other	Other
+97903ec0-fc07-4fb0-8ab5-5f43e28aa36f	1	Other	Other
+97903f09-c477-4160-94b6-b88e7733ba8e	1	Other	Other
+979041a2-5c38-4c70-a36b-8077d6be25fb	1	Other	Other
+97904d39-ae0b-4a98-bfc9-f64ca956d2aa	1	Other	Other
+97906b90-d8f2-4c49-872d-b0b30ed5379f	1	\N	Other
+97908a28-84b2-43ba-92d1-72d87aed947e	1	Other	Other
+97908b4f-7915-4d51-bf43-a0a85b096164	1	Other	Other
+97908f1a-58d2-4fb5-bf21-5be68a5518e9	1	James	Other
+9790a1ea-21c9-4c57-a770-0472b2688e62	1	\N	Other
+9790b5af-be35-4934-b8a8-c7a388696198	1	Other	Other
+9790fc7a-92ca-47fa-9596-3e44cfafe765	1	Other	Other
+979120e0-e46d-4ff8-a346-c330bc9f9553	1	Other	Other
+97912caa-04e7-448a-b533-818ad60c16f6	1	Other	Other
+9791b75e-a317-4607-998e-d875fcb66597	1	Other	Other
+9791d32a-23d0-4e43-9741-ef546e3d805f	1	Other	Other
+97924b87-b4ae-4205-91c5-c4cd3eadb369	1	Other	Other
+979299c5-fa07-4f4d-b0a4-eed8d16dd5da	1	Other	Other
+97929ada-5c05-446a-a2b8-db38e33def4d	1	Other	Other
+9792b5b2-69b9-4e4b-ba96-3f7729d5b7d7	1	Other	Other
+9792c24b-8aac-40a3-8fb5-8ce4e56de053	1	Other	Other
+9792d075-8590-45a9-b171-862f6b915397	1	Other	Other
+9792f4d9-9b05-4aa7-a206-7766560243a4	1	Other	Other
+979328f8-4c7b-43ff-8e16-916b94f84fb6	1	Other	Other
+97932af8-ebab-4642-8b83-5aae5349f23d	1	Other	Other
+97936a41-e8f6-455f-9b08-6530869fcd40	1	Other	Other
+97936ad5-3e0a-42f6-a54e-91f4c3d93e11	1	Other	Other
+97937ee9-5985-4a5a-9060-f65f72f90941	1	Other	Other
+9793871e-99b0-4209-b66f-6649013ce115	1	\N	Other
+97938fec-917a-4596-bb95-c28b251594ca	1	Other	Other
+9794044d-aaee-4757-8e4f-c1b33c58fa30	1	Other	Other
+97942430-3147-4e52-8042-ff2a71448a0b	1	Other	Other
+979450a1-b055-40d1-bdb0-df87b6780a5f	1	Other	Other
+97945e23-0c28-4c92-ab66-349840e65348	1	Other	Other
+97947af9-d14b-43f5-8f43-7ea18cf7138d	1	Other	Other
+9794dec3-e874-40ba-864e-a37811f25d4b	1	Other	Other
+9794f368-6182-4656-8019-335e3f1554d5	1	Other	Other
+9794ff9a-28a0-4271-886a-bf37e34b00af	1	James	Other
+97954a13-aace-462e-96b9-60a34fc0484c	1	Other	Other
+979586da-3db9-43ac-ad7f-64d20dfda1ac	1	Other	Other
+97959168-7bb6-41e6-ae3f-b93c17c53f13	1	\N	Other
+979657ad-21bb-4888-99e7-78c74f45a27e	1	Other	Other
+979665ff-0ce5-4d90-ba7c-669d654f31b9	1	Other	Other
+9796f89f-ad5b-41dc-ab84-8c03454c0482	1	\N	Other
+9796ff4b-2c20-4e17-a25f-7583b32b2753	1	Other	Other
+9797266d-82f9-46b8-8f53-958c4b02ce8d	1	Other	Other
+97973acc-7c6f-47b7-9a1e-543894449103	1	Other	Other
+97975bbd-8dd1-4fc4-a8df-a93892a1956c	1	Other	Other
+9797aa11-e0b8-4492-8bc7-c92c1b2a9d47	1	\N	Other
+97981fa1-9eb0-4517-babb-24ba268e7ee3	1	Other	Other
+97989812-c9fe-4778-907e-1b806537be3a	1	Other	Other
+9798ac95-0447-4e76-a357-f8b12a41d19b	1	Other	Other
+9798ca1d-3796-4dce-8585-d277d1a43a8c	1	Other	Other
+9798cc55-bf14-4010-a55f-4209321492fc	1	Other	Other
+97991441-00db-4287-82bd-65cae258fb9d	1	Other	Other
+97992a93-f847-4000-b236-bfbc182930dd	1	Other	Other
+979982ed-5940-4625-8de2-7fddf69f4529	1	Other	Other
+97998da0-2b6a-4cf2-9acd-c42ee9eef67e	1	Other	Other
+9799a30b-de98-46f5-8631-35cec8c7a05f	1	Other	Other
+979a2e3a-dd24-4935-931b-3d08a3a473b9	1	Other	Other
+979ac3ea-4018-4263-9d6c-8604d4871a1e	1	Other	Other
+979b3beb-c157-4055-9e2a-b950ee08a2bc	1	Other	Other
+979b3f79-afb0-4a90-b847-7cb8e17fb94e	1	Other	Other
+979bb265-ed76-42b5-b285-53add93e145e	1	Other	Other
+979bd62d-383b-4854-bd4d-49fbf0d8265f	1	Other	Other
+979bdc73-14a1-4910-92a0-cc6bfa911e2d	1	Other	Other
+979bfdc4-fe31-4bd6-9ce2-378c805abfec	1	\N	Other
+979c2dce-8a9a-49b3-9c79-870bf593d351	1	Other	Other
+979c3210-dff1-4d82-8ffb-baaae9a938c5	1	Other	Other
+979c3d92-38bb-44c7-a15e-06650684a707	1	Other	Other
+979c51e8-fd17-47cd-848d-8b0a0d4ed175	1	Other	Other
+979c831d-1074-43ad-8faf-b6d94ddba02c	1	Other	Other
+979d0619-58f5-4f67-9195-5cebbb9be3e5	1	Other	Other
+979d641f-96b8-4580-b5a2-ba01879d9f03	1	\N	Other
+979dfc56-c437-488a-b619-3ddad81135d8	1	Other	Other
+979e2c1d-e9d4-4fe3-bad2-2df32beea221	1	Other	Other
+979e682c-c66e-46b3-8e05-edbf4672ca75	1	\N	Other
+979e9f33-a194-4c93-a293-ae11543483f4	1	Other	Other
+979eaeab-fba4-43ca-937f-84145033ba87	1	Other	Other
+979ef7af-6717-40cb-9cb7-4ad66575fea5	1	Other	Other
+979efce9-36c9-4bbe-987c-10c29d3ad292	1	Other	Other
+979f1657-fa30-4207-bb06-d58370eb6341	1	Other	Other
+979f2489-375a-44e6-b6ef-14c2b2a2d4e9	1	Other	Other
+979fa533-1447-4834-9095-2b21a8fd8f39	1	Other	Other
+979fbd2e-959a-44e6-9ef3-0f89ff55ad76	1	Other	Other
+97a0836b-9a79-4d1a-86f1-d90389bd8c16	1	Other	Other
+97a0bdee-1802-4c85-98bc-071b6767ae1a	1	Other	Other
+97a0c5de-b773-4533-89bc-d51f0f6d39c1	1	Other	Other
+97a11a8c-1e5b-46c2-b143-f1bdc5bf27a6	1	Other	Other
+97a125ac-c82e-454c-a5fd-c0bdb0ea5f08	1	Other	Other
+97a1294d-bcef-4489-b3bc-1295a6f73a19	1	Other	Other
+97a17957-8f1a-4739-b973-87fe55015250	1	Other	Other
+97a18433-0383-43db-ae5d-15f0594712c3	1	Other	Other
+97a18d27-b3a3-4b83-9d7d-1ae19b24f2f4	1	Other	Other
+97a19f7a-590d-4ff0-afd6-b0442b4cd086	1	Other	Other
+97a1d4fd-614a-403a-b516-17b975d0f5d4	1	Other	Other
+97a1e3c0-9100-4230-9960-354d4b41bf91	1	Other	Other
+97a1f272-b4ca-463a-bc02-b8099c54db82	1	Other	Other
+97a20b6d-76f4-49ea-ad89-eab991acd21d	1	Other	Other
+97a22522-2a00-4d68-8224-6a74902a2e6b	1	Other	Other
+97a23cd3-3ead-43ef-bb98-1f85355c9282	1	Other	Other
+97a247fc-6c2a-4519-aebb-7cce6bee011c	1	Other	Other
+97a26034-3dc3-4c81-a501-1da60201fda7	1	Other	Other
+97a27584-a2f7-4d17-ae3f-1091ce0241c0	1	Other	Other
+97a293b4-e23e-44eb-8f4c-e60097bf6e24	1	Other	Other
+97a30df1-a934-4964-a516-3cf7b590b37a	1	\N	Other
+97a33974-f813-4227-ba79-2883ad78ca1e	1	Other	Other
+97a34e66-2c23-4c8d-8bfd-a2ea00e1705c	1	Other	Other
+97a3b6be-25b8-11e8-ac7b-fa163e8624cc	1	\N	Other
+97a3c0a1-f7b2-401a-85d8-4a5aeedb895f	1	James	Other
+97a3db15-4fe1-4954-84aa-965d0d0b3766	1	Other	Other
+97a42148-4d3f-41d9-be4b-914957ddd43c	1	Other	Other
+97a4cbe4-2737-424b-8c95-99d6f80565c1	1	Other	Other
+97a5021a-96c4-4414-9ce2-ce6dd4539697	1	Other	Other
+97a504d8-25b8-11e8-a7be-fa163e8624cc	1	\N	Other
+97a578dd-3aa1-40e9-9d86-5f843a79a015	1	Other	Other
+97a5e8b8-72b2-44b0-ab00-fda8a6f36887	1	Other	Other
+97a5fb35-3e6e-412f-9ef0-1357e714ba17	1	Other	Other
+97a6016f-110a-46a8-aa60-f6cc559d8f2b	1	\N	Other
+97a60476-29c5-4a7b-833b-ca6ed7a36ae0	1	Other	Other
+97a6177e-9e71-4eb8-8482-6e51f81d2a11	1	Other	Other
+97a65ce9-9b40-4562-a502-d94ac13a3f1e	1	Other	Other
+97a6ebf4-8d9d-43a0-8efb-2b858c51d492	1	Other	Other
+97a6f14a-a664-4805-8085-07ee884db5e4	1	Other	Other
+97a70ecc-6494-4bbd-9f00-c7e0581d1d9d	1	Other	Other
+97a71c63-8fd4-41f9-bb85-09ec5af1fc9e	1	Other	Other
+97a74047-32a4-4615-b532-8adec19cc50e	1	Other	Other
+97a78550-c625-4c81-a5b2-53d3aaf68f36	1	Other	Other
+97a7875b-724d-44e8-b5d1-3bd949197786	1	Other	Other
+97a7dfc4-6854-4346-9154-5897b9ff7b06	1	Other	Other
+97a7e499-9d48-4741-972a-c7a6058b82e2	1	Other	Other
+97a7f468-6e49-45e1-9d3c-bbac67a332ae	1	Other	Other
+97a7fdbf-ab74-4c23-8e9b-3009225fa502	1	Other	Other
+97a81f38-812f-4edd-9fa1-8ceb9f96bd6b	1	Other	Other
+97a849cd-a23a-4922-abd6-b850d4f20443	1	Other	Other
+97a8740d-74e8-4729-8708-27e4100a9582	1	Other	Other
+97a8941b-18e6-40c5-906a-d13413c8ad94	1	Other	Other
+97a8d3e9-6b27-4846-8945-8083d8321480	1	Other	Other
+97a8d76d-a57a-4c60-bc74-1ade7679e1fa	1	Other	Other
+97a94c56-fb31-4ce0-a51b-6c4f960ebc38	1	Other	Other
+97a96a70-1d8e-4140-8118-9282a478d3d1	1	Other	Other
+97a98c13-2f61-4fd5-a3b4-1b4e6637a168	1	Other	Other
+97a9b8c4-1c80-4dfe-a241-d1f6c3f0b7b4	1	Other	Other
+97a9c1d0-39f3-4531-85c5-3838b4eaca0a	1	Other	Other
+97a9ce0a-d762-4492-9ae4-ad882da7e5e9	1	Other	Other
+97a9e761-7462-457b-9b4a-b5651266cc50	1	Other	Other
+97a9ebb6-1d58-42dc-9367-3b3d9fb5eeca	1	Other	Other
+97aa0488-4abb-4d8e-b2a6-5cb0c121dab5	1	Other	Other
+97aa0956-a001-4fca-8f37-bb20b2ee30e6	1	Other	Other
+97aa1bc0-592a-4ef0-a728-d6fa92cc0fdf	1	Other	Other
+97aa4109-0ee0-4221-b44f-a1344ffb99c1	1	James	Other
+97aa54e9-90d1-4879-af8e-27aca91ab933	1	Other	Other
+97aa58ff-9a61-4bda-90af-1415d0e3f9f4	1	Other	Other
+97aaff77-25fe-446c-b9fa-3b2deab159ba	1	Other	Other
+97ab3c3a-1b7e-4a7f-9d30-9b00a22a658b	1	Other	Other
+97ab5520-2b50-45ff-8f86-cc59dd718c7d	1	Other	Other
+97ab56da-6a48-47ed-a8f4-821c9d24fb0b	1	Other	Other
+97ab6968-a4f5-4389-816f-4582474ed813	1	Other	Other
+97ab8ffd-918f-4c7a-b481-db1789085282	1	Other	Other
+97ab91fa-3323-4b5d-8028-b4fd9ded0d89	1	Other	Other
+97abb43d-2402-4303-a16b-387a7675168e	1	Other	Other
+97ac0151-9d47-46fe-92c4-100392d2dece	1	Other	Other
+97ac1d85-df8f-45b6-8b3d-21d729c0d4f7	1	Other	Other
+97ac3ee1-1c73-4616-b96d-17732503832e	1	Other	Other
+97ac69b0-e7e1-4037-ae7c-245e6f97239c	1	Other	Other
+97ac723f-87df-4e76-a6a4-7fad24894464	1	Other	Other
+97ac8a83-37b9-4ae9-91af-46b6ca660a77	1	Other	Other
+97ac94c0-278d-4e29-bcc5-508047f8dc96	1	Other	Other
+97aca0f5-157e-46cd-a3dc-ad5a79a00369	1	Other	Other
+97acab4d-d463-458e-9d16-31b25ba100fb	1	Other	Other
+97acb1d3-2b97-49c3-a3be-c80b2da0b391	1	Other	Other
+97acb769-c6f9-4bca-9509-e0e5419997b9	1	Other	Other
+97ad1c4f-1f08-4c07-90b6-c430a5efff07	1	Other	Other
+97ad5ba4-70d3-415d-b705-1c529d5fbbaf	1	Other	Other
+97ad7e49-c5a7-4771-80b7-f2f42f6717e4	1	Other	Other
+97ae1514-a57a-4ebe-a452-239700b8c27f	1	Other	Other
+97ae44c0-8cff-4acf-85c5-1ee57613242d	1	Other	Other
+97ae6670-17b5-4bb7-84bf-6584e866bd97	1	Other	Other
+97aeadcb-a39f-4d46-8ac4-063c2244758f	1	Other	Other
+97aecd9f-bf33-4223-a2de-956301d20fa6	1	Other	Other
+97aef64a-5581-4a20-b6d8-bdecaac8d60a	1	Other	Other
+97af0c89-33b6-4296-9280-6b49ea657de9	1	Other	Other
+97af4eae-d220-46f3-8cd7-ae60675879f4	1	Other	Other
+97af7b5d-ab63-4d04-b3ea-9cf9eff5158d	1	Other	Other
+97af82ad-5940-4caa-a229-37d11e524dd8	1	Other	Other
+97af95fd-3fbe-4145-ac94-633d31ed7c74	1	Other	Other
+97afd7d4-73ff-48c8-b357-9cef3026da6a	1	Other	Other
+97afd933-9d0c-4c8f-ad41-b4528802ef3e	1	Other	Other
+97afe64e-5470-47bf-855b-c3e3a80271d0	1	Other	Other
+97b01813-2adc-44b4-b0cc-07e873ae48dd	1	Other	Other
+97b02b8c-4c20-4e4e-a1bd-3ab11c61efaa	1	Other	Other
+97b0cd19-4199-4b44-902e-f0cf72dbf4b3	1	Other	Other
+97b10770-23df-4bc3-a010-36c6b680c03a	1	Other	Other
+97b12fea-b87e-429e-9dad-d24ec9d29d80	1	Other	Other
+97b17253-a26d-4968-833a-263baa6d4cab	1	Other	Other
+97b1a57f-e95a-41ac-a4d3-2fb5024034c1	1	Other	Other
+97b23880-704c-4507-ab82-2ce9500ef4dc	1	Other	Other
+97b2a361-c935-4a2d-bf65-63022882b0b9	1	Other	Other
+97b2de7d-aafe-4e02-9487-fa534b95c7ef	1	Other	Other
+97b2e76e-3d38-4394-a5bb-988b70341b11	1	Other	Other
+97b2fa4d-5c00-4771-a18e-942045bfe82d	1	Other	Other
+97b31b89-3f24-474c-af95-6eb53ba883bf	1	\N	Other
+97b3391b-bbd1-4187-ac3d-a377f6385963	1	Other	Other
+97b33a9d-e3d2-46b2-bb96-0bbb8cb796ad	1	Other	Other
+97b353fd-6243-40f3-a334-fcae5891dd1f	1	Other	Other
+97b377e4-68e5-4c41-ae66-851071a8b725	1	Other	Other
+97b3cfbb-d28b-4263-bf62-4381d347d440	1	Other	Other
+97b3fbb6-2ed6-4dc1-828a-0dbcbb421f1c	1	\N	Other
+97b41e96-a7bf-4caf-8326-c133eb82fa1d	1	Other	Other
+97b4437e-dfc8-485e-b0d1-1035fb8be03f	1	Other	Other
+97b4c52c-12b8-4ae5-bc27-dd7633c8cb97	1	Other	Other
+97b4dce4-aaa0-4e39-b294-46590aed7dc4	1	Other	Other
+97b5208d-36aa-4bef-b7fa-fc618e2166f6	1	Other	Other
+97b57393-751a-4c23-9d75-796826eb31ff	1	Other	Other
+97b58e0c-63ae-4a40-b9fe-059583a2438b	1	\N	Other
+97b5971e-57d5-4609-84a2-a3130ff98db5	1	Other	Other
+97b599ac-f541-44e7-9e9d-846fd8ac4013	1	Other	Other
+97b5bb8d-be27-4425-9648-5a2bac7f8fad	1	Other	Other
+97b5bd20-0213-409a-bfdd-884d114864c6	1	Other	Other
+97b6245c-514d-435b-8a27-4ce762bdd7d5	1	Other	Other
+97b6715a-928e-4da6-9f64-a79cf6588e85	1	Other	Other
+97b6874f-7363-42d8-8c07-4523f767710b	1	Other	Other
+97b6de85-6b06-4386-b874-3c2adde12a97	1	Other	Other
+97b6fc73-0b7c-4aba-907e-07dc769c501d	1	Other	Other
+97b71ea3-596b-401b-9f50-f12d910a7106	1	\N	Other
+97b72fb6-8e19-469c-8731-8efedd00406e	1	Other	Other
+97b73106-1c2e-46aa-8209-2b37f5597255	1	Other	Other
+97b79d28-9445-47fe-aa1c-e2350e09dda2	1	Other	Other
+97b7d016-87f3-46dd-9abd-e277d651c77b	1	Other	Other
+97b7d094-547f-4c9f-b6f2-28ebba8a11ef	1	Other	Other
+97b7dc06-0aae-4d3f-84ce-bbe0010d4dc4	1	\N	Other
+97b7f20e-80d7-438c-b320-5333fd7d92ec	1	Other	Other
+97b7fd9d-24b8-43bd-a040-b50ff8ddd753	1	Other	Other
+97b8348b-53f8-46a0-ab98-953470a74a05	1	James	Other
+97b83b84-e11d-44d8-87dd-5f84fa5f89e7	1	Other	Other
+97b88e32-95ec-42d1-8ff6-8f1092d37f96	1	Other	Other
+97b899ce-0e44-433e-bbe1-b7e2d912ee34	1	Other	Other
+97b8d370-9f1a-4d6d-9b63-52ed6a1e4718	1	Other	Other
+97b8e939-0e01-4f5e-89c9-56858e399ed9	1	Other	Other
+97b93dd1-0086-4156-b0ee-3ac022d13d4b	1	Other	Other
+97b98f01-1398-4403-b78a-687301a80c8d	1	Other	Other
+97ba0e43-ce6d-4ce8-b2bf-1967233c633d	1	Other	Other
+97bad741-cd8d-4097-9020-920829102e4a	1	Other	Other
+97bb14c8-7335-4c94-b624-8ffce7557ba6	1	Other	Other
+97bb2729-fdb5-43ae-b509-1ca7ff36085d	1	Other	Other
+97bba02d-67e2-4d10-bd6a-ecc2871d0fcf	1	Other	Other
+97bbaef1-76cc-4ca2-85a7-6d3cf74be960	1	\N	Other
+97bbcc21-34a4-4c12-a507-fac581e4486d	1	Other	Other
+97bbeeba-480e-4752-8ddc-e0b4670806af	1	Other	Other
+97bc1f67-4158-416e-bbde-06de1933afe9	1	Other	Other
+97bc23a4-c81d-4ce5-b1df-f52bfc6211bc	1	Other	Other
+97bc44eb-9a97-4376-a10d-8a17eb8a599f	1	Other	Other
+97bc74e4-d5aa-4af4-b2c2-cf8c3c4b991e	1	Other	Other
+97bce9af-ec49-4245-9676-344196675f10	1	Other	Other
+97bd083d-7e63-4494-8237-37fa09dabd81	1	\N	Other
+97bd4a1e-333b-450c-bd93-58c819d97ffe	1	Other	Other
+97bd65a0-eb6a-4eff-97c4-a75902bb45dd	1	Other	Other
+97bd6604-678d-410f-8840-0ebae5a3ad97	1	Other	Other
+97bd6d78-728e-420c-86d4-f58ed034f4f5	1	Other	Other
+97bdbe60-d6f9-46eb-961e-aac25e879ba0	1	Other	Other
+97bdc5bd-1f61-4ce5-98e3-f58b8f69ffaa	1	Other	Other
+97bddb82-baac-42af-bcca-844e0c0c01c2	1	Other	Other
+97bdf38d-9c1b-4422-8198-6390acf60a27	1	Other	Other
+97be0caf-fa8d-4fa8-afc8-8affaf52352e	1	Other	Other
+97be13ba-e204-4fd2-bb7a-a960a31832e4	1	Other	Other
+97beaf82-c652-4ba9-a1f7-a0b7e250e860	1	Other	Other
+97beedce-b78c-444c-a26d-0298f252f184	1	\N	Other
+97bef0f9-7434-4bda-9535-8d5f7822f1a9	1	Other	Other
+97bf106b-b5f9-41c1-8005-32bd0cc7bbb8	1	Other	Other
+97bf4779-3b24-4bd0-9a84-a56b3aa6718b	1	Other	Other
+97bfcc83-e916-4f94-951f-95c1a460b87c	1	Other	Other
+97bfd5ff-f1cd-4a52-9b9e-80d166660228	1	Other	Other
+97bff947-6cb2-40b2-a561-71402c908a5f	1	Other	Other
+97bffda0-f7a2-407c-8a29-769aa9e5da7d	1	Other	Other
+97c01dc7-2602-437b-aa3e-f395568d3d44	1	Other	Other
+97c023fc-db3a-4717-b674-7453fae37451	1	Other	Other
+97c081d1-ef47-4dc8-a977-b52d32f0fdf4	1	Other	Other
+97c0bfc0-a8ca-4022-a727-59640163e140	1	Other	Other
+97c11c38-826a-4039-9256-443d34d4bb43	1	Other	Other
+97c1619c-3dd9-4f34-91f4-28e994d4ca05	1	Other	Other
+97c19392-b90b-4217-b478-e8afa07e8c12	1	Other	Other
+97c1d305-7984-47b0-99f3-c6940362f0c6	1	Other	Other
+97c1fb51-495d-4057-bbe2-aceb3d8ddc5b	1	Other	Other
+97c2440e-8526-4c73-9da6-25448cc0d299	1	Other	Other
+97c27363-2320-4e62-8cca-4ffdd3e7af7f	1	Other	Other
+97c2aff3-575e-43af-abb0-11948233181a	1	Other	Other
+97c2c532-e58b-4281-a35c-bb4460f31592	1	Other	Other
+97c2e0b0-449c-449e-aff7-6e20d611fad6	1	\N	Other
+97c354d0-1276-41a2-8bb9-d9b4ea7d507e	1	Other	Other
+97c3d06f-2d9c-4e5a-bb27-0b07b4f6d059	1	Other	Other
+97c4bd77-3a80-4c6e-a7c4-aecb11ef522a	1	Other	Other
+97c4e3bf-9b71-4cc3-954a-f81247647670	1	Other	Other
+97c4f37e-4d8e-4bbc-b6be-71735e86b7f0	1	Other	Other
+97c58c84-20f0-441d-89b5-dbb085758c8c	1	Other	Other
+97c5a4c2-d327-45fc-b4c6-6d898252b142	1	Other	Other
+97c5e904-bad5-4a57-9556-fba37a0446a8	1	Other	Other
+97c6448d-4dca-45fa-a9b7-087942b6c694	1	Other	Other
+97c6486d-5619-4096-8d07-3179b92271c9	1	Other	Other
+97c66776-4823-47f8-a6b2-96bf0abfc257	1	Other	Other
+97c67b6c-67d3-4c61-bcb8-2e912a614fa1	1	Other	Other
+97c68265-768e-4b12-a7cf-79c36cd9ea3d	1	Other	Other
+97c6f744-3bcd-458c-9037-88082b6a161d	1	Other	Other
+97c77d3c-e463-486d-bb28-29236f270c87	1	Other	Other
+97c7971f-9b49-424c-b42d-95cdc66d46c2	1	Other	Other
+97c7e60b-4aad-4917-899f-5112d3111260	1	Other	Other
+97c82dc6-d4e0-48d4-bf73-8c4f866de177	1	Other	Other
+97c865bd-5fc7-4e0d-be96-c393dfb01736	1	\N	Other
+97c87378-e130-42ae-b2ff-4c894da65c43	1	Other	Other
+97c889b3-5df8-4466-8d78-bfc49acf5095	1	Other	Other
+97c89973-3e8c-4a2d-addb-c1444861bcd4	1	Other	Other
+97c89a17-577e-4584-a29e-6b173da92104	1	Other	Other
+97c89a99-6260-4218-944a-114e5f977de7	1	Other	Other
+97c93900-a3d7-4198-b164-38e891ec11c3	1	Other	Other
+97c94aa5-c928-4afd-ae96-042010cff04d	1	Other	Other
+97c95531-ac09-49e5-b431-f968a01b874a	1	Other	Other
+97c96e57-4089-4d59-b237-864f11200802	1	Other	Other
+97c9a767-67a1-4c1a-8d91-a062e685eec1	1	Other	Other
+97ca0a35-6b08-448e-96f1-0efada16e5b3	1	Other	Other
+97ca1bbe-93e6-40e4-a8b6-67be41be926c	1	\N	Other
+97ca20fd-558b-4882-9164-47052b3f52f3	1	Other	Other
+97ca2939-051f-4fbe-8eae-b53a85bd81dd	1	Other	Other
+97ca88b4-d2b9-464b-bd75-9c9703b44361	1	Other	Other
+97cac3e1-8dc5-4f19-b27f-cdeca830e0d4	1	Other	Other
+97caceaa-3cfc-4161-80ee-eb9c49d2b40c	1	Other	Other
+97cb2510-33cb-4b42-995d-d02445729f31	1	Other	Other
+97cb40c2-e04a-4b7b-b345-2e1c57d7cb57	1	Other	Other
+97cb611b-70fb-4297-9bb5-46c452b7b069	1	Other	Other
+97cbb02f-1695-4c8a-b9a4-6b4502776feb	1	Other	Other
+97cc18d9-5244-4d4f-82e3-487a323f99bd	1	Other	Other
+97cc66af-71bd-4501-86dc-a3f498543af4	1	Other	Other
+97cc6a17-0185-4a76-b42b-a4ad4f62079d	1	Other	Other
+97cc6ed2-7e67-4a42-8882-d09bda9731bb	1	Other	Other
+97cceedd-996e-40b2-a875-c4623b343e17	1	Other	Other
+97ccfdb4-3b13-46b3-837a-9ff275cbe9fd	1	Other	Other
+97ccfe12-77d5-4fdf-9991-c9298765eb78	1	Other	Other
+97cd030e-83d0-4478-bd23-941c8254a026	1	Other	Other
+97cd0419-2ca0-4dbd-abef-e0cf224996d4	1	Other	Other
+97cd1de3-9c0c-47ba-ae47-fc88b3bedcc7	1	Other	Other
+97cd5370-87d6-442a-b0ea-6059508defa3	1	Other	Other
+97cdb594-d2c8-4e3e-85ef-520a7aeee0bf	1	Other	Other
+97cdf224-9786-4c7e-96bb-a29adce3459b	1	Other	Other
+97ce657b-f2db-4f5e-8bfa-144a21811017	1	Other	Other
+97ceaeaa-2a95-4d96-aab8-ea0938e9209d	1	Other	Other
+97cf71c4-3106-4433-8bd3-6648debac79b	1	Other	Other
+97cf9af3-b3cf-446f-9d7e-c9f4c9d9dde1	1	Other	Other
+97cfb099-bac2-4900-a84a-5659c6803c28	1	Other	Other
+97cfba38-b530-4929-930b-3f37c68f4f34	1	Other	Other
+97cfddf4-05b7-4439-8cc3-5d4ed708c55b	1	Other	Other
+97cfe671-5e26-4972-88bb-6ba6b88099e4	1	Other	Other
+97d02aaf-227a-41d9-a70a-42c19661ffc1	1	Other	Other
+97d03a03-6872-4b56-9212-0efe8085d7b9	1	Other	Other
+97d04b36-2532-426e-9207-3200319594af	1	Other	Other
+97d0b07c-dcb8-4e98-b9c4-65f4a4e9a877	1	Other	Other
+97d0d2d1-d754-4ec0-86f1-97393a65991e	1	Other	Other
+97d142ad-f834-43fe-9042-3b61cd841093	1	Other	Other
+97d14e9a-7d74-44a7-af8f-451f61bf1714	1	Other	Other
+97d248a5-3baa-422b-ad8e-c0b2b4d38078	1	Other	Other
+97d25dce-0a2a-49fb-b753-1d87d0c9c00f	1	Other	Other
+97d2b3b1-3e53-4a32-b18f-8630ced0c4fd	1	Other	Other
+97d2c2c6-0f06-40f6-a2eb-1bdfadd9bd7e	1	Other	Other
+97d3105c-7ac0-4167-a617-0854f48b53bf	1	Other	Other
+97d320af-9ef8-4776-a646-f572bde2b727	1	Other	Other
+97d366c2-9328-47e5-884d-7e2116da1b26	1	Other	Other
+97d368d4-fd76-4bb9-af4f-80f12e6611e0	1	Other	Other
+97d37ef3-0804-41cb-a7d5-0196e2267ed2	1	Other	Other
+97d3b5e9-c0db-4a62-aa92-bba96cf303a2	1	Other	Other
+97d43d7e-5c4c-45a2-8726-82c0e92c9c6f	1	Other	Other
+97d44c29-9364-4714-96f6-643e9b794168	1	Other	Other
+97d46a23-429e-4c1d-96e3-a83ae8235c6f	1	Other	Other
+97d54716-f5ab-4e16-b0d9-e7d2b17e852e	1	Other	Other
+97d5b065-cdb9-4142-a880-e12be3fa09ea	1	Other	Other
+97d5b2ec-428e-48e1-94e1-5dd87b77ce44	1	Other	Other
+97d5d04d-0f85-4c3b-8eb0-4dce20f35197	1	Other	Other
+97d6146d-c668-447a-85d3-4bb2256f27c4	1	Other	Other
+97d651d2-87f7-4083-b92f-46b0a972ae0f	1	\N	Other
+97d655a8-67de-4ddd-a1e4-6847d39c49aa	1	Other	Other
+97d6e8d4-4a78-40ce-b268-8133dda3db60	1	Other	Other
+97d6f409-4cf3-4598-bcc5-e758b4eb0470	1	Other	Other
+97d7424a-60cc-4d9f-824b-1b25e1aa4a58	1	Other	Other
+97d7f4d9-55ee-4d56-972a-861601129bb4	1	Other	Other
+97d88f2b-5521-4bd3-9d69-36d392a224bc	1	Other	Other
+97d8efd1-66da-4ec4-a172-5e789abdf36d	1	Other	Other
+97d90566-5213-467a-891f-ff7f2955fee3	1	Other	Other
+97d9209d-772a-42a9-8cf8-1ef4be0c00eb	1	Other	Other
+97d9541f-a2d1-45ec-90f6-2b3d4ae1d597	1	Other	Other
+97d965c4-c559-4466-a920-3d412213c118	1	Other	Other
+97d97a4e-dfd1-4950-af28-bffa06951052	1	Other	Other
+97d98714-f3e2-4883-b799-cadd83451e06	1	Other	Other
+97d9ae9c-00bf-4637-8432-e8d23a9ac650	1	Other	Other
+97d9da71-450f-4f7e-b03b-7861c731a438	1	Other	Other
+97da1ed6-a17a-4cb1-b727-23536989d95f	1	Other	Other
+97da26d0-5355-4535-b7ec-74a0a952fb31	1	Other	Other
+97da3f8d-7b13-4527-9149-7b0c99c3d319	1	Other	Other
+97da500f-dce3-4bb9-a129-8da6cdb5d47c	1	Other	Other
+97da589b-4647-4c83-bd5c-03e6ec91f72e	1	Other	Other
+97da705e-756a-40b0-9e5b-5e0f15a838b0	1	Other	Other
+97da8fcf-0891-49f7-b160-fc4d146baf91	1	Other	Other
+97da9a97-db29-487c-ac26-8a63e1b6f9c8	1	Other	Other
+97db73db-251a-4085-a05d-fb371ce173a3	1	Other	Other
+97db8851-bd57-4bf2-b042-139917a79b21	1	Other	Other
+97db8c1e-9940-4dc9-8494-b7bcb8d63829	1	Other	Other
+97db9bcc-8728-4c11-be14-7faa2455eced	1	Other	Other
+97dbdd0e-6621-4c3b-8ee1-75fe77c13add	1	Other	Other
+97dbf664-90d3-45db-b211-83e440b8280f	1	Other	Other
+97dc12d1-7254-4ee0-b7e8-64c150bf6982	1	Other	Other
+97dc21a9-d4ee-4ead-a7fc-6c27f7b2d382	1	Other	Other
+97dcb03a-f5e1-4755-83eb-93b9e504b1c0	1	Other	Other
+97dcdd16-d1ac-4220-ab45-0ab1e1cb82b4	1	Other	Other
+97dd0485-35d1-401d-ba3f-86254d62629e	1	Other	Other
+97dd746d-bf9c-4a1f-b9b0-78f50b2d22b8	1	Other	Other
+97dd7eb0-8052-4c85-a74f-f8d3faf960f1	1	Other	Other
+97de0878-fd3f-4195-90ef-184b90cfe77a	1	Other	Other
+97de15ed-66df-4a34-ac18-ec4cede96f8b	1	Other	Other
+97de60fb-ddc3-4c39-9fec-8de846c863cc	1	Other	Other
+97de6785-ff8c-45f4-98cb-5e22d813589f	1	Other	Other
+97dea32b-abb1-4934-a29d-166d907fdf50	1	Other	Other
+97dec43a-e5ba-4b92-beb5-168562302c28	1	Other	Other
+97ded1d2-e746-48e6-9f7b-c6dd3c37f8b3	1	Other	Other
+97df2baa-b7f9-42d6-a653-94cfaf802027	1	Other	Other
+97df889e-d78c-448d-8ed8-5073cc30227a	1	Other	Other
+97df94c9-6d67-451d-afde-a8a3bf48c48c	1	Other	Other
+97dff774-f865-4bc7-bdb0-65e2a433d24f	1	Other	Other
+97dff81a-46ed-4491-a1a9-e1979ebcf22c	1	Other	Other
+97dfff6d-2e27-44dd-b9d0-73ed33a967ff	1	Other	Other
+97e038ef-9ab3-4cdf-ba8f-1bf745d212f5	1	Other	Other
+97e0618b-d4b7-4e52-8396-c9148f55c2e9	1	Other	Other
+97e07649-54e9-4b63-93aa-7a801244b64d	1	Other	Other
+97e08aa7-8aad-476a-902f-8f54c06282ae	1	Other	Other
+97e11637-3b93-4b72-a820-2c8c95e91cc8	1	Other	Other
+97e18f6e-5616-4ade-aa05-7e79d64f0138	1	Other	Other
+97e1a771-a064-48bf-a756-3d4917882bdb	1	Other	Other
+97e1c35a-ff1b-4770-a67d-71d5c3328c4a	1	Other	Other
+97e1da6a-88da-40ec-810b-7a5688327ced	1	Other	Other
+97e1ec24-1316-4fdb-90d4-30442e07abc2	1	Other	Other
+97e200fe-b0d0-4bf8-ad27-e699cf70c511	1	\N	Other
+97e215d0-df64-47b5-a389-eb0ab4d5fbcc	1	Other	Other
+97e299c2-0c92-41ef-9682-7befead98f12	1	Other	Other
+97e2b664-1f6b-4688-945b-436fb75d6d33	1	Other	Other
+97e2c891-c77c-4a34-a175-c911cf2a3d80	1	Other	Other
+97e3431a-35cd-46e8-b7cd-b62bbdcc73a3	1	Other	Other
+97e3446a-9563-44f7-bd04-762646ade254	1	Other	Other
+97e35aa4-b198-467b-a561-d39e7deca81a	1	Other	Other
+97e38cb2-aed2-4fb6-b12b-daca765e394a	1	Other	Other
+97e3cd84-6df7-4418-9ce7-a4f5b376c0a4	1	Other	Other
+97e3d849-b95a-4763-a616-425db15ab166	1	Other	Other
+97e3e487-e1b2-44c8-8b67-2d9e90ea1650	1	Other	Other
+97e3fb16-932e-4157-94f6-b9fc34d0e9a7	1	Other	Other
+97e401de-077a-4ee5-9203-85fc7f4c66a9	1	Other	Other
+97e43952-caff-4f49-8c3a-4f3a7e83f99a	1	Other	Other
+97e44869-9a3b-4bf3-999c-f66bc2b42208	1	Other	Other
+97e50517-6cb2-49d5-a652-d22a2154a057	1	Other	Other
+97e563b8-f76f-4c5c-8a3d-756d9aa9c885	1	Other	Other
+97e57fd1-2e10-4480-9af9-30195d34cd74	1	Other	Other
+97e5ccd1-2292-4a4b-89c2-ae2ead72749b	1	Other	Other
+97e5d87f-11cf-4ed0-ba46-5a083f3a2c8b	1	Other	Other
+97e5d9e6-739f-41f7-9974-24a8262262ed	1	Other	Other
+97e5e251-2342-400d-ab87-4407a23f68ce	1	Other	Other
+97e63601-78c3-4c0e-aece-87e446328e90	1	Other	Other
+97e637b3-5834-46d9-b118-42a8f1c20824	1	Other	Other
+97e65667-25b2-4401-bb9b-d9cdd54bd75a	1	Other	Other
+97e657b0-27c4-4973-9105-64603b310623	1	Other	Other
+97e6d922-da63-44bb-9c2e-b87b0bf88d96	1	Other	Other
+97e6f723-00b7-4181-a6a2-da3c83a77bb0	1	Other	Other
+97e741e6-fe8f-4b7c-8887-02a6325fad2a	1	Other	Other
+97e75554-02e4-4c3e-9c60-cc2f9c9f7250	1	Other	Other
+97e782a8-3e42-4942-81ba-8ff0150aad81	1	Other	Other
+97e860fd-a5b4-40d2-80c7-c24123fbe3c6	1	Other	Other
+97e894df-74c5-4642-a382-de0319e9fd0c	1	Other	Other
+97e8c6ae-d22d-4d81-8894-09722ce168cb	1	Other	Other
+97e8c7d7-9812-4d51-ac85-5c99e48444fa	1	Other	Other
+97e8ca34-4841-4a29-b712-007995458e5b	1	Other	Other
+97e8d23e-098a-433b-9479-88e2bb7a7687	1	\N	Other
+97e914ac-2c4b-4259-8407-0b5b5bda8d97	1	Other	Other
+97e925b0-736a-4c2d-bc03-680665c1915a	1	Other	Other
+97e926cb-f748-4454-9b1c-834f1b871288	1	Other	Other
+97e961a2-b7d4-47a8-9ba7-a895cd6f6178	1	Other	Other
+97e96617-e5f5-4d41-958b-a4a03dc2331f	1	Other	Other
+97e9a5f1-ec27-4372-bb71-3d3af6125b00	1	Other	Other
+97e9bddb-ac27-4193-9f92-6b7697bb3720	1	Other	Other
+97e9c371-1d4f-4c14-9997-ba3379e274f9	1	Other	Other
+97e9e894-7e91-4c55-b665-329519f5febf	1	Other	Other
+97ea040d-4d9f-41af-97a9-f6a1a24e75a8	1	Other	Other
+97ea0b0c-4d99-44f2-becc-7303b2bed6a9	1	Other	Other
+97ea467b-8a34-41f4-8cfb-1f563d6932af	1	Other	Other
+97ea553c-5d66-462b-a0fd-e7ed3bacdc01	1	Other	Other
+97ea6e93-96aa-4748-9e7d-f21c5bae4878	1	Other	Other
+97ea7e59-ceb6-434a-9081-4771b2e0ea06	1	Other	Other
+97ea8d01-ce7d-414b-a32d-00bb8a888d70	1	Other	Other
+97eac00c-1199-49d3-b26f-6b0bcdca57fc	1	Other	Other
+97eb00f6-584a-447b-a328-d72547cd8f5b	1	Other	Other
+97eb6ae9-a966-460b-b29a-b2354740f24a	1	Other	Other
+97eb772d-6d1f-41ec-9eaf-20e91fc2516e	1	Other	Other
+97eb981b-2606-4bce-828a-6f330b9e8e7e	1	Other	Other
+97ebacf7-61cf-4b64-b5d4-8bc6823c486c	1	Other	Other
+97ebf9de-b5e1-4626-b2a1-cc9031383af9	1	Other	Other
+97ec3e08-0211-4596-b5fb-70dd8bf87576	1	Other	Other
+97ec4ee9-fbdb-4c34-913b-4f2e012d531b	1	Other	Other
+97ec4efb-e2ea-46a4-a3f5-b508e83ddeff	1	Other	Other
+97ec7d9e-157e-495d-b951-61936e76a5ad	1	Other	Other
+97ec9197-a759-4362-b915-c47a7d39b827	1	Other	Other
+97ecae77-4ef3-4761-963f-7bfff2819b5c	1	Other	Other
+97ecae79-7d92-4f3b-b009-afa466a09adc	1	Other	Other
+97ecbfda-0189-47e8-be6f-272136ba1420	1	Other	Other
+97ed05ae-474d-432d-a5ad-f977bc01536e	1	Other	Other
+97ed224f-4782-4464-a2ca-7e1b4f257db8	1	Other	Other
+97edb514-dd71-4263-a0b6-cf7d89f55c6a	1	Other	Other
+97eddfd3-c529-4e87-85f6-114bee2dcfe8	1	Other	Other
+97edeed5-8b29-45a8-8e8a-facd873f7ff3	1	Other	Other
+97eebcbe-7cb3-414f-b2f7-53c399234d08	1	Other	Other
+97eedbaf-a171-4288-92a7-d0583c32ed61	1	\N	Other
+97eeeb9b-233e-4db4-bc85-e1f83397d2f3	1	Other	Other
+97eeef1d-dd8d-4edf-bc7d-abfe476093ab	1	Other	Other
+97ef0fd3-ecb0-41e4-9a74-fa9fd9787c9d	1	Other	Other
+97ef35d3-574a-49b7-be3e-bb4ba5d76e84	1	Other	Other
+97ef559f-d7a1-4950-9cbd-0ab6359ae69b	1	Other	Other
+97ef7071-b26c-4feb-8c3e-71145937302c	1	Other	Other
+97ef824d-2b65-4662-b343-6b2a4ea5303f	1	Other	Other
+97efac24-a542-4d3c-90b4-b1a1cabb606e	1	Other	Other
+97efeb66-1f0a-46ad-8872-41a23357e7f9	1	Other	Other
+97f02d4f-28ae-4211-a644-2f8f4660fec7	1	Other	Other
+97f04d5a-d719-4456-a7a6-1a7dd195d5ee	1	Other	Other
+97f125b2-3ec4-4930-8a29-75ae18a48b19	1	Other	Other
+97f12bf5-c03b-4a11-b5da-f9ba403a2c3b	1	Other	Other
+97f12ea8-be43-4dfc-8056-6e49296e882d	1	Other	Other
+97f16a24-51e8-43aa-adac-daef1d0069d5	1	Other	Other
+97f1809c-ccf6-438a-aa24-e42e53cd9e8b	1	Other	Other
+97f19011-55e8-49fe-9ad8-a4511d049603	1	Other	Other
+97f19186-0beb-11e8-9341-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+97f19517-52c5-46cd-92e0-7f0bc9b798f0	1	Other	Other
+97f1b68c-64bc-4240-a753-f64792c11a4b	1	Other	Other
+97f1c72e-d09a-49a6-b2df-360ff536de72	1	Other	Other
+97f1d97b-e7dd-42eb-8410-53bd8b9aa8e3	1	Other	Other
+97f1e760-9eee-4222-b8c8-210b15003058	1	Other	Other
+97f20c55-9c45-4aad-84f1-7e0560a3d0ed	1	Other	Other
+97f22e77-93ba-4cea-ab75-5b09435007cc	1	Other	Other
+97f23be1-86d9-4ace-a46e-fc6d1c84161c	1	Other	Other
+97f24080-2ada-43c3-b844-567a873a04c2	1	Other	Other
+97f2596a-78f2-4c56-808a-eb9d2e9af359	1	Other	Other
+97f276b5-1e00-4a26-8309-7b145f2b0244	1	Other	Other
+97f2b898-8d68-4540-b63e-e31edfb114d6	1	Other	Other
+97f2bbbc-3924-4e2d-b978-440d51c8ca6e	1	Other	Other
+97f2c5e6-3a27-4236-ab6e-66e5bc30ed7b	1	Other	Other
+97f2da0c-284e-4985-b65a-05c50037544e	1	Other	Other
+97f2e46b-283e-4a85-83f4-6fe37ac5a887	1	Other	Other
+97f31605-5d01-4bef-9acf-ac39242777cd	1	Other	Other
+97f343e4-b7e2-446a-ac47-3e00aea07e63	1	Other	Other
+97f377e2-1eb2-4a42-906e-788e5b57ea73	1	Other	Other
+97f38d1f-08d6-4c71-bd8f-63655ae8f6ab	1	Other	Other
+97f3de62-4722-4083-bad1-015f6f5167dd	1	Other	Other
+97f418be-9bff-4a39-946b-3f0f5f2c969c	1	Other	Other
+97f44f32-5dff-4de4-a38a-053d61a7e0ad	1	Other	Other
+97f4cdb9-c3e8-451f-b350-6579cc575b29	1	Other	Other
+97f4d23c-3c51-4024-b980-1edbfc33b6bd	1	Other	Other
+97f50be0-e38d-4c8c-86b0-b6ac7166462d	1	Other	Other
+97f5766b-ef76-422c-98ce-90060670706e	1	Other	Other
+97f5fb72-f69d-42e9-8401-ad43ec84fd58	1	Other	Other
+97f64102-b875-4fd0-ac40-1c2136fb4aa1	1	Other	Other
+97f65a5a-d6e6-406d-bcfc-3a6f3426d035	1	Other	Other
+97f67969-e18e-4417-9b91-6bcb6c23e1ce	1	Other	Other
+97f68615-26e2-4d27-be7b-afde9f5ac8ef	1	Other	Other
+97f6a510-57dd-447e-a759-0c0c6be82ab7	1	Other	Other
+97f6e088-b02e-4d88-892b-643064ce3982	1	Other	Other
+97f6e4a0-ef8e-4419-b15b-eafbd5e5ea6a	1	Other	Other
+97f73577-3f29-4fe5-8504-6ad913c89b3e	1	Other	Other
+97f7390f-3c40-4573-b529-fe0d8a13b55b	1	Other	Other
+97f74e7f-15a4-4f6f-9260-df55d15ea7a1	1	Other	Other
+97f7cdd6-44d7-40e9-9e2b-6e80cfa5f177	1	Other	Other
+97f7d8b8-1f9f-4d2c-88a0-06d9497ce96f	1	Other	Other
+97f7dee0-3db9-42e5-9f4e-d580ac755f3c	1	Other	Other
+97f7f893-f6a9-4c30-8810-8b19b68a04bb	1	Other	Other
+97f81b3f-f35a-4b70-a1ec-30da72315399	1	Other	Other
+97f825d7-19e4-43ef-ba2b-8c8f4bc5aa6e	1	Other	Other
+97f86125-1bbe-4102-8a6f-00b1ae71b650	1	Other	Other
+97f86246-e189-4f63-bb87-87bde7d595a6	1	Other	Other
+97f897f5-21d8-4541-b3cb-d5e3eedbccfe	1	Other	Other
+97f8b9e5-775e-4866-a2c7-81101bc6a3e0	1	Other	Other
+97f8ba12-8950-49c2-a797-d4398d3a072c	1	Other	Other
+97f8cc83-18db-4726-9c78-641cc5a34fb3	1	Other	Other
+97f8d296-6697-4001-8307-3325572b1ef1	1	Other	Other
+97f92a6c-3d4a-4bff-97d1-ed06b516b4ee	1	Other	Other
+97f965a7-9ab0-417f-9424-df4e3fa9f12c	1	Other	Other
+97f9ab35-3582-4103-881a-711cdecd6945	1	Other	Other
+97f9f3a0-9d6e-42f3-ab59-25767e13664f	1	Other	Other
+97fa1654-538f-4e63-9dde-7cb29c282293	1	Other	Other
+97fa8bba-8078-4bc1-ba81-5ad486dd8c17	1	\N	Other
+97faf0f1-721f-4e83-a0ac-6cf9e8a00f06	1	Other	Other
+97fb10e1-db24-4d1b-8982-01b373343550	1	Other	Other
+97fb1aa3-b68b-48e5-9131-15e8efa0a305	1	Other	Other
+97fb65e6-caa8-4ef8-92c3-eb9ec387907b	1	Other	Other
+97fb9f76-4a7a-4cfb-a900-9d8f971c2565	1	\N	Other
+97fba576-f77b-44e5-802f-c4b6002a5d79	1	Other	Other
+97fbd4db-4481-4f76-978a-f41ce8799da0	1	Other	Other
+97fbd91b-a61b-4dd4-85b8-e41dc495f067	1	Other	Other
+97fc0444-41d0-447a-adbb-9bacd625ed88	1	Other	Other
+97fc1b78-7bee-4eba-8a08-bd4de6893acc	1	Other	Other
+97fcf0b9-5166-4573-aa09-ee5a722f0eb6	1	Other	Other
+97fd0122-efa8-463e-973a-87b5f70cff61	1	Other	Other
+97fd0cc9-11d4-4027-9711-97596481e053	1	Other	Other
+97fd53bb-200c-4871-b4b2-768a4c809750	1	Other	Other
+97fd9e25-f7d2-464a-b8a5-2fad89f55141	1	Other	Other
+97fd9ee3-4f54-42a8-8be0-5671764bb712	1	Other	Other
+97fe0622-7150-4d9e-ad05-dc6bd3a13014	1	Other	Other
+97fe6017-b032-420f-ae14-6a64a8041cbb	1	Other	Other
+97fedfb7-f602-437f-a53c-42b8f9d73273	1	Other	Other
+97fee1a4-902b-4503-86c6-30e3bf4e1dbd	1	\N	Other
+97ff038c-cf7a-41bc-a470-c8629889a6a8	1	Other	Other
+97ff4466-18fe-4e12-8861-274640398587	1	Other	Other
+97ff5d57-a963-4618-b85c-d18ce0871037	1	Other	Other
+97ff833c-2cb9-4474-a52d-05fedf30435c	1	Other	Other
+97ffc219-3b41-4b9e-a129-4e3b6eb89ec1	1	Other	Other
+98003e92-7130-4255-a1cd-26e40a89f779	1	Other	Other
+98004458-08ab-4ac4-b981-593c7e737006	1	\N	Other
+98005ed9-0902-4cd9-836d-06db030264fa	1	Other	Other
+9800d348-da36-4426-a302-5a83bbf05cd8	1	Other	Other
+9801269b-5dfc-4224-8d90-3c70fd08ac6b	1	James	Other
+980129ce-2c55-420d-87fb-59d1b9082643	1	Other	Other
+980164e6-e77b-4e62-ba55-f894f3809cbd	1	Other	Other
+98020e45-cab4-45e5-b3a2-faf0178cca8e	1	Other	Other
+980258b9-ff37-4476-938b-f5f13215123e	1	\N	Other
+980287ee-4444-41b9-95e3-81d0d77dd3fb	1	Other	Other
+9802a98a-4ae5-4504-8eca-d5266a624917	1	Other	Other
+9802bf38-fc94-48ef-b475-a89d26a5cdc2	1	Other	Other
+9802eb9d-4707-4dbf-9aea-202fdf259357	1	Other	Other
+9803521f-5e82-4f0c-9391-f9f876bf772c	1	Other	Other
+98039896-6bd1-42e6-8a38-c5a152196959	1	Other	Other
+9803d877-c291-4add-8dcb-b40d665c498a	1	Other	Other
+9803d95b-df42-4cef-905d-5ed7fa205e62	1	Other	Other
+9804325c-67c2-4424-b87a-48d364753be3	1	Other	Other
+98043596-138e-4b11-9924-054663b10c99	1	Other	Other
+98045e93-40ad-43d1-9918-9245a0078db8	1	Other	Other
+980471c8-c726-41e2-9da1-d1ff5be9543b	1	Other	Other
+9804c97e-dcc9-4c32-aa63-82e6d4aa48e7	1	Other	Other
+9804f92f-4b47-4f0e-b68e-5edcd82e060a	1	Other	Other
+980526c1-d72c-4772-9199-eb74e307d62f	1	James	Other
+980542f3-16f4-41f8-8203-316591e85026	1	Other	Other
+9805a00e-7e90-427b-981a-cb89a2fb865e	1	Other	Other
+9805a422-a8b3-4e4e-8595-ab8f2565218f	1	Other	Other
+9805a615-03c1-46b0-81a0-ebafc92a2bd4	1	Other	Other
+9805d5c8-ee46-4210-9669-8c4f1de50006	1	Other	Other
+98060606-4db9-432f-9928-18e13d3351cc	1	Other	Other
+9806254d-2cbf-453e-a591-777bc07535f1	1	Other	Other
+98065933-d073-430c-9d7f-fd95952c874b	1	Other	Other
+98067279-9f96-47c1-b983-096c6a3ee3bb	1	Other	Other
+9806841d-be3d-4dfb-83e3-6a73f818ed91	1	Other	Other
+980697d4-021a-4d11-a869-da38ef3e0602	1	Other	Other
+980699de-756e-4c9d-ba31-01415fb739e7	1	\N	Other
+9806a4bb-4a5a-4200-aac4-d9b7db02c50a	1	Other	Other
+9806cdb3-1d98-4a8c-8d34-61e7402db7e3	1	Other	Other
+9806d677-ca62-4c3d-b391-44d1cd34c160	1	Other	Other
+9806d919-6e83-4d9c-a3de-62251a2b638e	1	Other	Other
+98075b73-1600-4f4c-a286-d2970257df33	1	Other	Other
+9807661e-61c8-43b4-a4f5-26d58958cd74	1	Other	Other
+9807a2a4-93a6-11e7-9311-fa163e8624cc	1	Other	Other
+9808324b-e693-4156-84d4-39fcf7913fb3	1	Other	Other
+98084617-e368-4c5f-8642-4d554b64e600	1	Other	Other
+9808497e-b0d3-4e63-af6f-df065a380458	1	Other	Other
+980877b8-043d-4465-896e-b31f08c4d24b	1	Other	Other
+98087989-b763-43db-95c7-7bbd7efd5259	1	Other	Other
+9808e5a2-1032-4071-bc0d-a9f4297462a2	1	Other	Other
+9808f5f3-76e7-401d-9ed0-f2566fe5bcbb	1	Other	Other
+98090cf0-8731-46f0-a74d-f416f9d01b44	1	Other	Other
+98093d9e-12bf-4e3c-b768-b429d2762f95	1	James	Other
+98097900-64e8-41e7-9bb3-6771b0aa8ece	1	Other	Other
+9809a9e1-808f-4523-902e-a3c95ba10418	1	Other	Other
+9809bcc3-e81c-40fd-8dcf-37d96770083c	1	Other	Other
+9809dfd5-c11b-4cfb-91f8-db748fb14f55	1	Other	Other
+980a078e-7315-4e42-b331-a6d4a6ca03bc	1	Other	Other
+980a1c4f-37f8-4f93-aa62-279d8185559c	1	Other	Other
+980a4bc3-a763-46d8-ab70-7bc65e7c71dd	1	Other	Other
+980a79f4-3f1b-4826-830b-db310d67fe51	1	Other	Other
+980a8b4d-177c-478a-97f3-1e69a67ae388	1	Other	Other
+980ac9c9-eb4a-4110-a012-b1fca9445166	1	Other	Other
+980aca4f-689a-415f-8e91-d4cb8a492ff1	1	Other	Other
+980b96a5-b765-422e-878c-7618a14068d1	1	Other	Other
+980bcd40-c873-4bc6-a6e0-3c6b9388f8f1	1	Other	Other
+980c166f-acd1-49ce-bf72-3f4086fc4bf8	1	Other	Other
+980c9c30-d1c5-481b-84a9-9b0c49563b3d	1	Other	Other
+980ca9ce-cc46-43f5-bc80-978be1e06ca9	1	Other	Other
+980cc18f-e33c-4197-8aef-a960a0c2a786	1	Other	Other
+980d16f3-151a-45f4-80eb-62a13a782e04	1	Other	Other
+980d56f1-24d3-47d6-a6d3-9386362aaeca	1	Other	Other
+980d628e-2285-4080-920e-65156e3434cb	1	James	Other
+980d6f69-46f5-4d5c-802c-1de0f0fd5049	1	Other	Other
+980d8219-2711-446b-a70e-4ba4ecf9f7d8	1	Other	Other
+980dd6a9-8a87-4da0-9acb-0c9097479699	1	Other	Other
+980e110a-08db-43ec-8fd0-03c0ff5b1860	1	Other	Other
+980e80a3-ebce-4f77-82c6-28c60bf1d2b6	1	Other	Other
+980eb135-3d16-410a-901c-bd1fa8173d48	1	Other	Other
+980ece7e-4082-466f-a70b-235592293dcd	1	Other	Other
+980edb9f-0fff-4353-b05b-7d95fe954ed8	1	Other	Other
+980f0381-2b62-44b7-8120-bb8a28c919e9	1	Other	Other
+980f17e5-7aae-438e-a088-16f154c9c609	1	Other	Other
+980f1f23-92b5-4954-8c92-31736fad09eb	1	Other	Other
+980f310b-dfd7-4e76-9e25-711407f58f59	1	Other	Other
+980f7422-74c2-4130-8393-7d0cd9893e0c	1	Other	Other
+980fa8ff-82a3-4ca6-b2ef-a83f19676b48	1	Other	Other
+980fb36e-2f99-4446-890f-cbac175a9d57	1	\N	Other
+980fee63-f797-462e-9eaa-edd4e13b9bbf	1	Other	Other
+98106af2-c8db-45be-8530-ad4421a9813f	1	Other	Other
+98107725-7925-4411-83ba-6e412b466ce2	1	Other	Other
+98108041-cd6e-4839-94f0-fb68a1ed62c6	1	Other	Other
+98109998-a734-451d-a08a-93cad05e8c8a	1	Other	Other
+9810ae2e-aa7b-496a-bf0a-bc430e4e5a32	1	Other	Other
+9810bd31-de8b-4dbd-a2e2-8be8887d3dea	1	\N	Other
+9810bddd-0e0b-40fe-a89c-3f7ecb6eb43b	1	Other	Other
+9810bdfe-c919-4010-a801-b7cfcaea4702	1	Other	Other
+9810d26a-058e-4f89-8cc7-87f48507b40d	1	Other	Other
+9810e277-955a-4759-a523-ed798a9999c7	1	Other	Other
+9810faf0-d82d-45cc-9013-f44df4905617	1	Other	Other
+98113810-50f7-441d-b90d-490e4aecb375	1	Other	Other
+9811b6b9-14b5-45fa-b56d-305299eb3c63	1	\N	Other
+9811b978-6b91-4815-a5a8-4daf6e065615	1	Other	Other
+9811ef5d-7b73-4569-9ec0-5861010d1e47	1	Other	Other
+98122d41-7a8a-4a24-95b1-8a5e58ac380d	1	Other	Other
+981254ef-2db5-4c51-b1f5-f0cf7475d839	1	Other	Other
+98125937-fdda-407b-9edf-9e50d5adf25e	1	Other	Other
+98126995-2dd6-47eb-90f9-b74216b54d29	1	Other	Other
+9812afed-5d46-4c3c-a5bd-28dfc1943b6e	1	Other	Other
+9812ca33-bba2-468d-832c-b5d38bef1377	1	Other	Other
+9812f4c0-e253-4aa9-8366-51fb2f3c7ba4	1	Other	Other
+9812f5ce-c89d-4ba4-98e6-6723b4793aae	1	Other	Other
+98133e25-c8f6-4386-b7f9-f43a7287a800	1	\N	Other
+9813bd91-816f-4859-bc19-47ed30ab5acc	1	\N	Other
+9814035f-98b2-43cb-b985-43f65a7982d7	1	Other	Other
+98143f64-b5c4-4bbb-8895-1b3e9ca25d59	1	Other	Other
+98146c08-c312-4b11-ad3c-18c0bd167355	1	Other	Other
+9814852e-eeb6-49fd-940c-11c99df91867	1	Other	Other
+9815097e-d89b-4f40-bfaa-6550c05b2fb8	1	Other	Other
+98150ba4-eb72-4460-b691-8db71eef3468	1	Other	Other
+98152e59-d0a0-47ec-b4fa-42cb61df4422	1	Other	Other
+98158855-48a2-4bd5-b33b-7d2fe8fbb2e7	1	\N	Other
+9815d102-3b85-40da-8f0f-96be045a7141	1	Other	Other
+9815e37c-008c-4022-bf2f-94393e74583a	1	James	Other
+9815e76c-8bc9-4957-baec-acfb791dd8d7	1	Other	Other
+98163412-605a-4bc1-bf18-8419e0bf20f3	1	Other	Other
+98166e4b-82f5-4a5b-af37-cb562809f4f9	1	Other	Other
+9816dd91-81cf-4c9d-8afd-c9a0c711161b	1	Other	Other
+9816e0b9-1fe9-4b63-b9a5-7e47420c336d	1	Other	Other
+9816f544-b2c0-44f2-8c15-66fc2bd56ed4	1	Other	Other
+981746d5-ba06-4c41-86a7-5b92bac03e9a	1	Other	Other
+98174832-341e-49c6-b982-3f0583521029	1	Other	Other
+98175bcf-9170-455b-a0ff-64ada778edd2	1	Other	Other
+98175d8a-c6c1-4044-9ed7-b9bcb86617e8	1	Other	Other
+98176929-6fee-49d4-a2aa-26e37e3de207	1	Other	Other
+98179cc7-0369-4e1d-8138-6b01aa6ad3ed	1	Other	Other
+9817d19c-3877-4108-b40f-6fc53edc22a2	1	Other	Other
+9817ec64-3e1c-44ff-932f-d2c779d5afd7	1	Other	Other
+9817fb36-893d-4b6a-a0c2-52d666fd7d4e	1	Other	Other
+9818778f-9de3-4b81-9b95-fd7edf8922a2	1	Other	Other
+9818a4b3-0e01-452e-9584-ca4d03c3006a	1	Other	Other
+9818efbd-0a76-4a26-b3f9-7d36495da5f6	1	Other	Other
+98191ca5-28b8-4b50-90bd-55813733286a	1	Other	Other
+9819a706-f1cf-4ef6-bbf9-3d90e7e1167c	1	Other	Other
+9819b204-d04d-43b8-810a-1a8d6ca8df44	1	Other	Other
+9819f146-8ad4-42f4-8641-5c27ecf66586	1	Other	Other
+9819f249-b548-4166-92d9-b9673c38260e	1	Other	Other
+981a02a7-7c8a-4bfa-afe4-9e13b1d2fd29	1	Other	Other
+981a5b66-b39a-4220-aa78-0842d30aa377	1	Other	Other
+981a6cc7-8726-4cd8-9312-0e1be07dbf73	1	Other	Other
+981a9874-81f3-4808-a44b-4eef4926a540	1	Other	Other
+981aea5f-de28-4d1b-8cc3-c44c72865848	1	Other	Other
+981af571-de00-4926-9b27-fcf4c106fc54	1	Other	Other
+981af924-4ab6-4d9e-8052-b1bba4ee4357	1	Other	Other
+981b40c1-7ed2-41a0-acc4-9cbd64e8d510	1	Other	Other
+981b468d-2ee2-47a4-8906-856ad361d336	1	Other	Other
+981ba554-ba2d-4474-8cf4-30dac7439995	1	Other	Other
+981bd594-aaa9-40ff-9c85-7cfb581e2612	1	Other	Other
+981bde6b-368e-40b0-83f4-aae3af092d01	1	\N	Other
+981bf8b9-2085-47cb-95a8-533addafc092	1	Other	Other
+981c415a-0171-4d61-9e19-5556405b0877	1	Other	Other
+981ceb4a-3fa5-464a-aa72-b1de56405f84	1	Other	Other
+981d1047-8a97-4ef8-9cc5-fb4cb192fb07	1	Other	Other
+981d6421-1630-4c10-98f6-24d508c82108	1	Other	Other
+981d6e69-33bf-44ba-a621-cea097cedee1	1	Other	Other
+981dc83f-a7f9-4698-a9bb-11b671bb7929	1	Other	Other
+981ddd73-94f3-4132-835a-92443e6c41ef	1	Other	Other
+981e0b02-8113-4dfd-bc1c-68f9a0c7a57a	1	Other	Other
+981e4f05-21c2-4727-86e3-2b3817072868	1	Other	Other
+981ec170-38a0-466c-b4f5-8c8e3083c388	1	Other	Other
+981f0cc6-9583-4b43-9160-81573df8c2a8	1	\N	Other
+981fbad8-9309-4dbf-a179-57c1bc0d43c1	1	Other	Other
+981fced6-a238-4d83-b967-e99364ef7315	1	Other	Other
+981fe3a0-6b3a-4759-9198-3c9d307de869	1	Other	Other
+9820362b-1ae3-4b6a-a7de-b27e8c515f13	1	James	Other
+982053a3-19c7-44af-ae30-e0a9d3d8ad84	1	Other	Other
+98208f00-b20d-4ee7-98cd-d42de27aa363	1	Other	Other
+9820bf79-fe04-4384-89bc-e1640dffb65b	1	Other	Other
+9820cc92-5621-44ee-8703-caffddc4bd1d	1	Other	Other
+98215ee9-7a66-414c-9b44-79fc17692760	1	Other	Other
+98217d96-3ecd-4cd2-b6d3-4f22115c8c3f	1	Other	Other
+9821add3-c6f5-4b15-97a8-1df491cdc218	1	Other	Other
+9821dbcc-e806-48bd-8789-d56195a7c6aa	1	Other	Other
+982207c4-462e-40e2-a964-974a1729d2cc	1	Other	Other
+98221f48-e754-4f9f-935b-138b207e70dc	1	\N	Other
+9822508f-5acf-4cae-b140-7b2beff43865	1	Other	Other
+9822547a-d968-4501-bb11-fb048067b577	1	Other	Other
+9822d320-9da0-4c69-aa7a-1852360dc1a1	1	Other	Other
+982306e5-a981-4551-bd3f-7f3abe1ae087	1	Other	Other
+98237348-07bf-450c-ac41-f544403e8920	1	\N	Other
+98237a71-1401-44ac-8608-25aef7e1a0fe	1	Other	Other
+98237de4-d085-4c54-ac65-b1c41024d081	1	Other	Other
+9823d4ca-1fc9-41c6-8bc3-3cabf4a74bad	1	Other	Other
+9823dc3d-d87d-4f83-a6a5-a7b765079bec	1	Other	Other
+98242390-c2f8-457d-810e-4d4f7d0074f1	1	Other	Other
+9824590b-24eb-4d58-a74e-45080e63f830	1	Other	Other
+98245be4-0fd8-49ca-99da-da4cb916400a	1	Other	Other
+98248d91-c633-4b1b-9427-1b0f395ced2e	1	Other	Other
+98249590-3f65-4303-8f99-f1412f7fa574	1	Other	Other
+9824b325-920c-4764-b36d-bbc3733acab9	1	Other	Other
+9824fb01-d095-4519-b666-c18bfeca4946	1	Other	Other
+98252ad6-c302-43c4-addd-6bc1e4ecb10c	1	Other	Other
+98255a46-c5a9-421d-b4f3-8d2538e18a2c	1	Other	Other
+9825630e-a6ee-428d-8416-618821dce809	1	\N	Other
+9825826e-dc70-4b1f-8769-a9a6570799af	1	Other	Other
+9825a780-18c0-4af6-b3a0-0c023bca5d98	1	Other	Other
+9825c13e-e48f-4fd2-8413-03d57c5b929e	1	Other	Other
+9825cfb8-4657-428f-b433-def3dba0e3b8	1	Other	Other
+9825e60d-d580-4e85-a711-902964dd3b88	1	Other	Other
+98261071-1e72-4618-9a7c-5a6494bad088	1	Other	Other
+98262ee8-7a90-4c69-a446-59e1f5424376	1	Other	Other
+98263be2-7fb5-4c6b-bbdf-6fe204f49500	1	Other	Other
+98265cb1-f2b1-4fb2-b843-ad57cfed738a	1	Other	Other
+9826c99b-d980-4c7c-a129-89976de8f25b	1	Other	Other
+98273bc7-ac9d-479a-91d0-86766f2e71a8	1	Other	Other
+98276cb8-b7c3-4cfc-baad-60c3c3495e83	1	Other	Other
+98279616-4d9c-4cee-9016-17268cc8504d	1	\N	Other
+9827a5fc-4a74-4ba8-ac35-4505abaf7412	1	Other	Other
+9827bd42-8eac-46ff-b9e0-f101902042ff	1	Other	Other
+9827c5ce-7563-4851-921a-7e35c170157d	1	Other	Other
+9827df83-c2bc-46c7-bfd0-db02c38d095d	1	Other	Other
+9827f056-950a-4c49-ae6a-5d5a62a7b5f6	1	Other	Other
+9828538b-0f42-4e27-8959-21f96b0ad8e0	1	James	Other
+9828862b-04f3-412f-8bb7-6ceaa38686f4	1	Other	Other
+9828871e-26e2-4415-a68d-ab1a3d6d38ef	1	Other	Other
+98289286-49f5-4f65-a09e-9319f2b1dcc3	1	Other	Other
+9828c22b-1b83-49a3-aef0-9f7e122a3b17	1	Other	Other
+982908cb-5304-46f2-ab9c-a9fabb2ca50c	1	Other	Other
+982911cd-0f22-4419-94fa-8081fd2d9e38	1	Other	Other
+98293d5b-27d3-4543-b981-6ece577fc352	1	Other	Other
+98293ef9-61e0-4365-9b56-292b6f02ec56	1	\N	Other
+98294636-fa80-46e3-a2c2-0c26c505ff63	1	Other	Other
+9829949a-d306-43ce-999e-84727cd3fb6d	1	Other	Other
+98299738-625a-4537-92be-910019e96fb9	1	Other	Other
+9829bab8-cc13-43b9-93ca-cae5d3393abb	1	Other	Other
+9829dd48-5b55-4f53-a7e5-028276bff89a	1	Other	Other
+9829f291-c433-4fbe-814b-f7c39c7889ab	1	Other	Other
+982a7b44-cea5-422e-b9f9-5010dd694d83	1	Other	Other
+982aa828-b85e-4c77-832f-435ffddb25a8	1	Other	Other
+982abe40-ee09-404b-87f9-9f0513ff51e0	1	Other	Other
+982b16f7-6efb-46db-93e5-35808306711b	1	Other	Other
+982b29b4-e7ec-4ebd-9354-bc4752e92d67	1	Other	Other
+982b4dc9-a063-4015-8c23-742aa00c4cc3	1	Other	Other
+982bbd17-d043-4155-8890-8e3409b0042e	1	\N	Other
+982c07d0-866f-40b2-a4ac-16968e16f455	1	Other	Other
+982c26fa-215e-44da-ba2c-e2a6b19a005f	1	Other	Other
+982c38b5-a345-454b-8b9e-8bbfd786d638	1	Other	Other
+982c9fa9-05d1-4fa7-a816-1b17266bd6fb	1	Other	Other
+982ca756-aacb-4332-ad79-be0f444e3411	1	Other	Other
+982ccaf8-44cf-48df-9740-42ccb0fb7f53	1	Other	Other
+982cda07-9f21-420d-8ca8-3e07dc5e2479	1	Other	Other
+982d273b-9b44-46de-a65b-03a0c7fb78b0	1	Other	Other
+982d36f4-f446-40e7-a4d5-202fb86216c6	1	\N	Other
+982d91cb-9d17-48df-a378-83ce07383cd6	1	Other	Other
+982dd437-f9c7-4f38-b3de-deddb58b3bba	1	Other	Other
+982e3a94-0dd4-4074-b342-99f4b3a41981	1	Other	Other
+982e5a86-172b-408e-98f1-02f7d240a857	1	Other	Other
+982ea202-c6b5-4a80-b9f8-4915ab594431	1	Other	Other
+982ec5fe-e214-4d95-bf83-6882a590b8c4	1	Other	Other
+982ef6a0-9ef6-4580-9670-cb38020d5fa5	1	Other	Other
+982f09b8-7415-4c4f-b933-0232a0c94a3c	1	Other	Other
+982f343f-6de0-4fe9-8337-5587db855550	1	Other	Other
+982f892d-3ee6-44b9-b90d-3d1e7d9f5ea6	1	Other	Other
+982fad1a-7ce3-4ca6-9389-fdbe3ffa5bdd	1	Other	Other
+982fd1ff-611a-498b-91cf-bff91b09ccbd	1	Other	Other
+982fe807-9583-4627-ba90-734d5cf27ad7	1	Other	Other
+982fea3c-3ec0-4484-9312-b34fcc8332a5	1	Other	Other
+983055ec-ee4f-4c73-8c4c-031fd666db7e	1	Other	Other
+98309171-b81b-4079-84d9-4c1a5a639150	1	Other	Other
+9830cc4d-cb29-478a-8edc-069113633430	1	Other	Other
+9830d1d4-ff41-4377-880a-b5c14c5bd155	1	Other	Other
+983124f8-f3bd-41e4-9733-e1dc1b23d32d	1	Other	Other
+983142a6-a39e-4140-80fa-ebb5326efa1e	1	Other	Other
+98318bb2-91a4-4563-9b69-22a12a22c2cf	1	Other	Other
+9831a8ec-c40b-4db4-af41-1b5d3423aefe	1	Other	Other
+9831df0e-9845-4b20-bf62-0cedef34ef60	1	Other	Other
+983204da-53d3-4977-aa90-a8e73eeb2acb	1	Other	Other
+98322dda-8167-456f-addd-981e698dfe30	1	\N	Other
+983246d2-7989-40d8-8cfd-1beaebfe86cd	1	Other	Other
+98324938-b1c5-4db5-9fe2-a8cd6e01d098	1	Other	Other
+9832b304-378b-464b-8f7c-40b0efc81bdc	1	Other	Other
+9832dbf3-7a41-40db-949c-d382d6758dbb	1	Other	Other
+98331b4c-3fa4-4803-993e-ee3c8caac3f2	1	Other	Other
+98332fa5-ab51-4bb7-a3ef-0dc67879c01d	1	Other	Other
+983338d2-1f2b-457f-b209-fe4c8fd15309	1	Other	Other
+9833669c-589f-4617-a3d2-ae66680ea377	1	Other	Other
+983373ca-0bd1-4a86-8e76-f3c7b4222831	1	Other	Other
+98338b48-dac8-4e39-a8fb-52e77fb31ad2	1	Other	Other
+9833b2e4-976f-45b9-b700-fae4a8374a77	1	\N	Other
+98341a1f-4445-4567-8a27-9774cb7c47cf	1	Other	Other
+983460a9-8ff9-48f6-8f77-1f7d9bac9a04	1	Other	Other
+98346cf1-5715-4c6b-9b38-b51ef7142676	1	Other	Other
+98348313-437d-4631-a31b-e514338943ad	1	Other	Other
+9834a612-7ead-4773-9f69-7aba2fb90b41	1	Other	Other
+9834c3cb-a31c-4ba9-aac0-87cfd637b41c	1	Other	Other
+9834e69a-aa26-47c1-ac83-1fe70a3571a7	1	Other	Other
+98350b95-a76f-4b79-bdee-2c7daffed8b3	1	Other	Other
+983513b5-6aca-48c5-9e9f-ee17da1861e3	1	Other	Other
+983523e7-49d8-4ec3-b76c-a338f94416d9	1	\N	Other
+983542c7-698b-4753-b10d-28e16bb298bc	1	Other	Other
+983544b3-cd00-4bda-87ed-5a508a99e974	1	Other	Other
+98360eff-1fc8-4fd4-ad5d-977d7c88e5b8	1	Other	Other
+98361731-2bc0-4867-b9ce-c90e725ccb8b	1	\N	Other
+983622da-4818-42a5-a7e8-929b19b8e459	1	Other	Other
+98364470-4ddc-4b08-802e-7caffffb7f00	1	Other	Other
+98370180-cc27-4e61-9cae-592a297ad158	1	Other	Other
+9837290a-59b7-438d-b588-47d104384f49	1	Other	Other
+98379d42-7638-4216-9a0f-e36635b0cf4f	1	Other	Other
+98380be5-a2fa-45e1-a558-177f311c9b59	1	Other	Other
+983847ae-a1a1-49dc-8caf-9b4e6fceda79	1	Other	Other
+9838f82f-5c92-41d7-8390-42168660ecdf	1	Other	Other
+983910a7-c4d3-4d16-bf92-a09247bb163c	1	Other	Other
+983960bc-5ad3-4976-a190-a422ee32d83a	1	Other	Other
+983970a3-e9cf-4780-a6dc-9df89fdbc8f8	1	Other	Other
+9839c9bf-acc2-4219-9093-ff75adaee00d	1	Other	Other
+9839da66-0f73-44bd-bcf7-9063659e0ba9	1	Other	Other
+9839dd95-b0a3-4d2b-8a4f-9e825a364eb3	1	Other	Other
+983aa091-170f-494b-8d2a-2aef7e8cf687	1	Other	Other
+983aaa16-9aaf-40b2-bf57-8f8f68128f68	1	Other	Other
+983b01fa-aca8-4d58-9879-621404a445de	1	Other	Other
+983b3f52-fd86-4e0f-9d3e-4ce5c0e1b196	1	Other	Other
+983b4697-24cc-47f1-b1e8-bc9aafc749c9	1	Other	Other
+983b5dc3-b6bc-4320-bb48-04302b82b76a	1	Other	Other
+983b75ef-2808-4bb5-af10-98d12ec53412	1	Other	Other
+983bb910-206b-46e6-9b79-04ea2d4fb878	1	Other	Other
+983c00fb-227b-4b3f-b692-66389f10967c	1	Other	Other
+983c10c7-6366-407a-811a-d9662ce05120	1	Other	Other
+983c694a-8613-4926-be63-a8f51ef7e263	1	\N	Other
+983c90aa-2ec6-42e6-a7a3-59d2b6cb4205	1	Other	Other
+983c9839-acb7-4c0e-bdbe-20836d3ea78a	1	Other	Other
+983caffc-cc06-47c1-a181-368bc053a5ff	1	Other	Other
+983cf5a6-e387-4e9a-9038-66669b794771	1	Other	Other
+983d25c2-9e33-4bca-af0c-1d6d3eeb0124	1	Other	Other
+983db0c3-58bb-463e-b91d-db38e613db9b	1	Other	Other
+983dc7d9-7bda-4c70-9b4f-b3755f4efae7	1	Other	Other
+983ded62-f3aa-469d-84ad-534b717e24e9	1	James	Other
+983e0154-e069-48e4-a6e1-2a4fe40f9e56	1	Other	Other
+983e19b2-6ad2-434f-a55a-4c5486388bd3	1	James	Other
+983e2035-0a00-4749-b0d3-a6e60aa02ac6	1	Other	Other
+983e5ef0-2618-4f46-8021-9db58af69883	1	Other	Other
+983e65d2-bf34-482d-80b1-0ca28ebe4ece	1	Other	Other
+983e6825-582b-4f5f-884d-da0c44f49482	1	Other	Other
+983e9569-b09d-4260-b58c-759da37d7a7a	1	Other	Other
+983f27eb-f905-4ab0-9b90-ef4efdacb7c4	1	Other	Other
+983f2db9-a9fb-4522-8295-8a69d29842cb	1	Other	Other
+983fc01a-79ec-4ec7-a01d-85ccb410982f	1	Other	Other
+983ffc62-1cb5-400f-9379-7884088ec018	1	Other	Other
+984015ee-defa-463f-8d0f-d70e8864cedb	1	Other	Other
+98403e25-d454-4ece-b59a-fcf01502fea9	1	Other	Other
+98406b1e-4436-4ab9-9977-1701c5461589	1	Other	Other
+9840786c-6d9a-4ef7-a9ef-044bbcaa8644	1	Other	Other
+984093bb-72e1-4446-96a1-a5d19f95fce9	1	Other	Other
+9840a939-023b-46d8-9b49-9a40de69cf4c	1	Other	Other
+9840b50e-7e06-4350-9d72-826d14894797	1	Other	Other
+9840d2c2-3193-46e8-9a77-9070cc614500	1	Other	Other
+98410f1c-1682-413c-9a7f-c64a58e1ff00	1	Other	Other
+984124e0-ba5d-42fe-afbb-1db87db8fc59	1	Other	Other
+98414ac4-366d-483a-b94c-2de93c38f239	1	Other	Other
+98418d91-06c5-4fa5-80be-6fe43dd3c4d2	1	Other	Other
+9841db6c-fcb7-49a1-8e55-cdcb9be37361	1	Other	Other
+98427a6f-47a6-40e9-a2d7-2e50e28d127f	1	Other	Other
+9842efb7-1e8b-4a32-b63c-a9799794f46c	1	Other	Other
+984318bf-f3e9-4a07-8ed7-0d32fa187e15	1	Other	Other
+98435110-fe9c-4a56-9e6b-1eaed8aa507d	1	Other	Other
+98435648-778f-4273-8f34-8722946364f1	1	Other	Other
+9843816c-4cc2-4077-9205-694be1a5d8e8	1	Other	Other
+9843b72b-f988-4dd5-b988-38108070ce24	1	Other	Other
+984443d9-62b9-4a21-8b87-d542fdf423c3	1	Other	Other
+9844807d-1a42-47db-aeab-a77b8ddb35e1	1	Other	Other
+9844a4e6-7a20-432c-9ea8-ba23dd055c93	1	Other	Other
+9844b49c-f8b8-430c-9883-82cece86bae7	1	Other	Other
+9844d6b4-8c03-48fe-82bc-9dafd8610eca	1	Other	Other
+98450e9e-f738-4633-8bad-62938a74ceca	1	Other	Other
+984534a4-24ee-4c9c-a996-8731679a77e7	1	Other	Other
+98454a1b-beec-44ad-afcb-2f34ff0ef8ac	1	Other	Other
+98458316-355d-438d-8f3e-1a0fba5f4deb	1	Other	Other
+9845cad9-5746-45b1-bc0d-fed6d3c80969	1	Other	Other
+9845f0f4-fe01-4904-b458-efadd352e79f	1	Other	Other
+984613e5-fc8f-4559-a75d-a5b649a9a6dc	1	Other	Other
+984614db-1031-46c8-a848-80d73796e7ec	1	Other	Other
+98464576-c635-4d40-a3a7-c09175bc201b	1	Other	Other
+984648e5-c74d-4f6d-aeb6-a93ec36fff11	1	Other	Other
+98464a71-c8d5-4bb3-a1c1-d992d9f6f5e1	1	Other	Other
+984745b7-7210-477e-aaee-81fe97a3c421	1	Other	Other
+9847871c-dc44-44fb-9d1d-87acdce1caaf	1	\N	Other
+98483fb1-ee11-4cb0-9321-4e9c08f84ed3	1	Other	Other
+98485e88-214a-4153-9fc8-cf7ce2a6f10e	1	Other	Other
+9848b151-0448-485a-b8f1-5fe255da8152	1	Other	Other
+9848b640-d2c9-4f54-8470-61e53d25a137	1	Other	Other
+9848ce9a-66fb-4b7b-9e6a-12c7ffbd7bc5	1	Other	Other
+9848cfc1-8454-4531-9d37-8a133b731c78	1	Other	Other
+98492edb-1a15-4c44-b42d-980c8b06d883	1	Other	Other
+9849304a-c0ad-4de5-9e62-08708a82719c	1	Other	Other
+98498e2b-3b07-4f2d-9d42-03114c786756	1	Other	Other
+984a5e76-6d33-4974-bc86-9ae56cb45997	1	Other	Other
+984a7764-7555-4462-b1ab-278388e99511	1	Other	Other
+984a7a13-b056-47c9-b12f-f73e00c8af1e	1	Other	Other
+984a8057-b286-4c2a-a94c-89b50da33f09	1	Other	Other
+984a805e-70b6-47f7-bb0f-f7461340a93a	1	Other	Other
+984af024-251b-4b50-aa4a-d03b9ddee90c	1	Other	Other
+984b0a8c-bf87-4cd4-bc49-21401be314b9	1	Other	Other
+984b4124-6312-494f-82fc-b14816044685	1	Other	Other
+984b8e53-a83f-4920-8d87-72ddb445d846	1	Other	Other
+984bc082-062a-4fe3-829f-e8b1e38a5043	1	Other	Other
+984bdeae-0822-4aba-a57c-cb934331ac90	1	Other	Other
+984c1c75-5c9e-488e-882e-ce37dcfdd9e8	1	Other	Other
+984c3286-eb43-4610-8f05-adf2256f3407	1	Other	Other
+984c3e21-adda-4636-94d3-cdd80b9029b6	1	Other	Other
+984cc8a3-fa3e-4da7-9b1d-02320383433c	1	Other	Other
+984cd43a-37e4-4cb9-aafb-38711bb63d27	1	Other	Other
+984cd7ab-8fd9-4256-a4bd-175677257e3b	1	Other	Other
+984cfd13-a58e-4f53-9006-7984ff5a8120	1	Other	Other
+984d014c-8943-4e3e-b223-34af3c579c4c	1	Other	Other
+984d802f-fb7c-453f-aed5-877b8962f960	1	Other	Other
+984daaa2-1121-49ff-be21-48dab66ceaea	1	Other	Other
+984dea3c-f05b-45b7-983c-8c509261aaef	1	Other	Other
+984e596c-de34-48cc-bae1-0e0e5bb3965e	1	Other	Other
+984f1abf-2555-4aa5-a94c-ae143c8fab50	1	Other	Other
+984f1bfe-bcbc-469b-a65d-417c8ea0b097	1	Other	Other
+984f6eac-28a4-4cf6-bfc1-5b7de9313b9e	1	Other	Other
+984f9a9a-6b35-40b9-8694-f366f95431aa	1	Other	Other
+984fa122-3a04-4bfc-8094-17505e760bf6	1	Other	Other
+98501375-e1d1-4df5-8609-bee1054df2b6	1	Other	Other
+98501559-d331-45e1-ab7b-b06208ddfb49	1	Other	Other
+98506012-0d5a-4979-897f-4e5a7ad65faf	1	Other	Other
+98507308-99e5-4e6e-80ed-d2d247fe373a	1	\N	Other
+9850808d-ff55-426d-aee6-2cb3ea073f68	1	James	Other
+9850f13d-938b-45c0-8bf0-000190940243	1	Other	Other
+98512bf8-4d6a-4250-a874-740afa7fed80	1	Other	Other
+98513e8f-e686-48db-98ef-4ed157fc86ee	1	Other	Other
+9851484a-80dd-42ae-8e89-0ed5c4d430e7	1	Other	Other
+98518bb6-b989-4948-a7e0-44ba91294e74	1	Other	Other
+9851a621-718a-4362-a570-b978beea0463	1	Other	Other
+98521dab-bcfd-43a3-8f00-e6d58a459eca	1	Other	Other
+985224ec-5cb9-40c0-82ae-5efe7e559826	1	Other	Other
+985227a3-6b1e-4d13-85c8-3a71b248ffa9	1	Other	Other
+98529c4f-e3bb-4557-98c6-4027cfd0ac10	1	Other	Other
+9852a232-ab89-4a0b-8cc1-a36f50e9b587	1	Other	Other
+9852b0d5-2bff-4e22-89f6-c0114a38e262	1	Other	Other
+985303fb-220f-4ca8-baae-9179b542064a	1	Other	Other
+98534d70-efd7-4140-9846-b2eae46f52fb	1	Other	Other
+98539097-63ee-43b8-9a78-8a69338d0b91	1	Other	Other
+9853f1e9-788e-4b3e-b9f9-67db5220e990	1	Other	Other
+9854115a-4109-4595-8bc7-8247b3cbe66b	1	Other	Other
+9854460f-4dbe-4c17-8501-a42c1ad3ae86	1	Other	Other
+9854d0f3-0427-4499-8f58-61ba8dd8be3b	1	Other	Other
+985512a1-9c09-4e91-bd12-e59ed7ed5840	1	Other	Other
+98551bc1-ece4-431b-af5a-9e4885cd1105	1	Other	Other
+98555f74-4b7b-4866-9514-07deaba63f44	1	Other	Other
+9855e49e-b038-4ef0-87f4-3961f6d688d7	1	Other	Other
+9855eb09-eb29-4844-ae57-f332b88156af	1	Other	Other
+9856342b-7f01-4b2a-ac27-9aabc1919b3d	1	Other	Other
+985635aa-a29f-4f5e-a5de-b10938d565ce	1	Other	Other
+98567314-b14a-4e1d-9be0-25f10404eb63	1	Other	Other
+9856b578-e97d-4afa-a5d2-95135ce26075	1	Other	Other
+9856b910-408e-4a9c-ae5a-8786838c334d	1	Other	Other
+9856c087-5f6a-4fc9-8601-f9e8c2acd45d	1	Other	Other
+9856d068-f85e-44c8-8164-79cecaed32a4	1	Other	Other
+9856daac-3218-423c-880d-0efc34726fde	1	Other	Other
+9856f084-c73b-4cc1-9fc5-76952d19b8cf	1	Other	Other
+98574d56-47fb-452c-a85b-42ca485aeea6	1	Other	Other
+98578ca0-047a-47fc-9fdf-5b80c6731fd2	1	Other	Other
+98579565-527e-4cb4-88f7-81c6916b2347	1	Other	Other
+9857d324-6323-447f-b021-0bd07f36bcdf	1	Other	Other
+9857d445-846f-42bd-bb59-066795d078ec	1	Other	Other
+9858c82b-229f-44fb-a0f6-9316f74eed3d	1	Other	Other
+9858da07-996f-4b9b-9f32-05a046477c00	1	Other	Other
+9859629b-c84d-48ba-b939-ba1c455f2ebf	1	Other	Other
+9859e622-5249-4a3f-9fed-fd557a91387d	1	Other	Other
+9859f358-9fb6-404a-86eb-90d4dd4f73f0	1	Other	Other
+985a00c9-0a9b-4f16-80e9-4782dbb008e4	1	Other	Other
+985a0440-3fa2-4858-ac6d-c8e1450eefc5	1	\N	Other
+985a753b-e3af-4084-9575-809dbab0a0ae	1	Other	Other
+985a80fc-532f-47a7-9e06-9469e30e0bf0	1	Other	Other
+985a86ae-80a0-435a-80ac-21c8489b5fac	1	Other	Other
+985a89cd-6663-4820-b6ac-0e18957ff13c	1	Other	Other
+985a92fe-ff35-4ea5-9283-830d9272b6d0	1	Other	Other
+985aaf47-013d-415f-b4e0-267e51950d29	1	Other	Other
+985ab06c-5caf-4f00-82e7-db310ac445fb	1	Other	Other
+985b738b-8f33-49a2-8620-16e412bdf98d	1	Other	Other
+985b9d0d-b784-40df-8a9a-b96985175661	1	Other	Other
+985be44f-b6db-4d54-9504-c459ce1c9ed8	1	Other	Other
+985bf3fe-d1ea-4eb5-95f7-97b0d5c76093	1	Other	Other
+985c0c9a-3577-4aa9-89a8-1d601d96ac28	1	Other	Other
+985c55c4-74a4-42a0-a1f1-589c42b49aec	1	Other	Other
+985c5b96-7aa4-4bdb-94b3-cf478794c86a	1	Other	Other
+985ca584-9e87-4dfd-a1d6-b00fc3b0ed10	1	Other	Other
+985cbd29-9356-42f5-b56a-6a1171c4bbca	1	Other	Other
+985d0446-fd1e-4a6d-8c25-22dc0dd4c664	1	Other	Other
+985d3d62-2794-45f9-9a3d-d9c2c6b8f009	1	Other	Other
+985d57e3-b7f6-460c-9b74-1fa1a8360823	1	Other	Other
+985d86d9-2934-4759-92e2-e06182739583	1	Other	Other
+985d8c8e-e41e-49b4-a845-a75c979e6b13	1	Other	Other
+985d9ed0-ef36-4a22-b478-c8c36f693142	1	Other	Other
+985de600-b0d6-46c3-8c22-d187f25906ea	1	Other	Other
+985e228f-a8d4-422c-b649-aad2edc3fcd1	1	Other	Other
+985e5037-a730-4c62-877e-cd0d1e62e866	1	Other	Other
+985e5b52-8553-4d45-ae6d-3cc3afc9b940	1	Other	Other
+985e6275-b8ce-456b-94b1-4f30a05295c8	1	Other	Other
+985e7f0d-f619-4cb4-ac2b-3e66c0973155	1	Other	Other
+985e84cc-313f-43da-ba92-e88a128971c9	1	Other	Other
+985e9c39-e39b-41c8-8694-14750e7f3787	1	Other	Other
+985eab4b-db5c-4f60-80b1-daef8950f7cc	1	Other	Other
+985eba22-68fa-4edd-8561-8855b37ddb5f	1	Other	Other
+985ed5dd-71ea-405f-ae54-8b87a8294ffa	1	Other	Other
+985ee966-c067-437d-8ea7-7554bf88561c	1	Other	Other
+985f2345-7a1a-429b-8ed5-076ca8b63d4d	1	Other	Other
+985f4acc-29af-49e0-afdc-fa15504acd28	1	James	Other
+985f6626-1e7b-4b49-beb9-0b33852eccbb	1	Other	Other
+985fadf8-15ac-476a-a258-9926ac2b03b1	1	\N	Other
+985fb37c-4788-406b-bff8-1e3afb4eb1ca	1	Other	Other
+985fb7de-9dad-453b-a3fb-28caea51ee6d	1	Other	Other
+985fdc2c-e1b7-44eb-bc86-2820df141491	1	Other	Other
+985fe434-1bf0-4a97-8a0a-112da95906b0	1	Other	Other
+985fe834-6b12-44d0-b3a0-8d91513ddae3	1	Other	Other
+986068ff-7191-45d7-ac67-3ae214bdff88	1	Other	Other
+986075f8-6e50-4618-820b-b92bda2154f1	1	Other	Other
+98607e99-997a-4dad-aa0b-b1df4e2e77b4	1	Other	Other
+98607ff0-0b7f-4464-a563-e7ea8fa8c559	1	Other	Other
+9860a226-23f9-4a4f-918e-f7ad941e8f04	1	Other	Other
+9860c34f-47af-4420-8f3d-52f8a38bdeca	1	Other	Other
+98611bc2-7448-40be-be54-7b594df08768	1	Other	Other
+98612128-d70f-49a1-a959-1d35f3e3e27f	1	Other	Other
+986198b4-fcd8-401c-9e16-2fa28b344c5c	1	Other	Other
+9861c115-fc77-411f-b090-53cb4b05664b	1	Other	Other
+9861ccb5-fd3d-4fd8-aa39-26e04ed5b87f	1	Other	Other
+9861d5d0-ad49-46e2-9eb3-3bf925eec7b4	1	Other	Other
+9861ee8c-660d-4bda-8c9b-feb2df269a0b	1	Other	Other
+98621c1c-7190-4e26-9b7e-a55d7fea1bcf	1	\N	Other
+98624f3b-9e45-48c3-add3-c0b643343e5f	1	Other	Other
+9862d00c-ebd5-4139-b728-ca29413d80f2	1	Other	Other
+9862dc1a-5a22-4f39-9bfb-8f6fdd9f6d8b	1	Other	Other
+9862e00c-6502-48bb-b3dd-7e0bd8de49af	1	Other	Other
+9862f867-05d7-45a2-a549-387aabe4cc5f	1	Other	Other
+98634c16-1d42-41b5-a779-18c9c853ad0a	1	Other	Other
+98635e6e-5a9d-4490-9217-3342092d6aae	1	Other	Other
+9863b880-7ea1-49ae-84a1-f97d16c0b6ca	1	Other	Other
+9863ee7d-3f8a-4772-82ec-20cf545c1325	1	Other	Other
+986435c9-bc88-4358-a319-3ea61c73d779	1	Other	Other
+98643f1f-97da-42ee-8dff-21f50716b836	1	Other	Other
+98645070-c85a-462d-b34f-c92768925452	1	Other	Other
+98647eff-d6e9-4daa-a5be-9007adfac94e	1	Other	Other
+98649a4d-e326-4223-935f-2bb7db99a976	1	Other	Other
+9864f7d5-e397-41e4-a345-91d91e78b2e6	1	Other	Other
+98652276-35ab-42b0-b51c-40bcdb7f4581	1	Other	Other
+98652b0e-bc97-4c96-bcf0-d339f591975c	1	Other	Other
+986566d1-521f-495c-89e3-145d752598ba	1	Other	Other
+98657902-2ef3-477e-bbc3-7378feb26f2b	1	Other	Other
+9865858a-584a-4e1f-8e75-dad5d0da1251	1	Other	Other
+986594db-7480-433e-a63f-dc2fe8aaa2d6	1	Other	Other
+9865bcc4-5c44-4a8c-a0b0-f132dc793319	1	Other	Other
+9865cd2d-07cd-43e0-972c-619b6eee8506	1	\N	Other
+9865cfe5-571e-4e0d-8567-19597ffc8ec8	1	Other	Other
+9865dc83-2d13-4cbd-8632-416a07494bbf	1	Other	Other
+9865eecb-4611-495c-9a59-de23cc6aa0e5	1	Other	Other
+9865f650-223f-4cf9-b8c5-d32b15b16381	1	Other	Other
+98663281-3f59-42ca-9c0a-a09e7bb72132	1	Other	Other
+98668277-dc74-46a3-8338-8eb74c78e360	1	Other	Other
+98668527-06bf-483a-a151-98dd7f5033b6	1	Other	Other
+9866a393-c541-459a-a524-20c61131d58a	1	Other	Other
+9866dc6a-d01c-411c-aca3-287c42f6ff2a	1	Other	Other
+986705b7-e001-44a5-b080-34a7d25fb900	1	Other	Other
+98673ac4-84f9-46cd-a3e6-1d450a0e56b8	1	Other	Other
+98676baf-6d4e-4ad6-a447-51e0f1ca0fa7	1	Other	Other
+98677fae-b3d5-4eab-b968-de44d67b10e4	1	Other	Other
+98678a27-fa65-4aac-b0ec-5bfe79744874	1	Other	Other
+9867e006-4a1f-4fad-9565-207ea9b9398b	1	Other	Other
+9867e323-f5f7-4e4e-8ee5-59a837386430	1	Other	Other
+9867f485-bd09-495c-977d-29d27758c339	1	Other	Other
+9868448f-63db-41ba-9561-d89986f04b6d	1	Other	Other
+9868567c-58ac-4906-a292-9e5d21b229fa	1	Other	Other
+9868e1ff-aa4a-44ef-b2d1-7d0fb6852a2b	1	Other	Other
+9868fee1-2bc3-4af5-b2b2-fc1d3bab8bd7	1	Other	Other
+98690812-76b8-4660-b534-f4e2043d5749	1	Other	Other
+98695d33-abbc-4024-a1a0-756b21d20c36	1	Other	Other
+98696835-da0a-412c-9f2f-ad1da74bbc1d	1	Other	Other
+9869723d-2c6e-4308-834e-8da00699abdf	1	Other	Other
+98699512-de37-497c-b16a-ea71bfa87b4a	1	Other	Other
+9869d32c-6d86-4a50-87fa-ee8f9bc01323	1	Other	Other
+9869ef17-c2fa-4c1c-b09f-aa9c86cdd2a8	1	Other	Other
+9869f595-dafd-4ed1-83e6-ba91cb4520a8	1	Other	Other
+986a11cc-d167-411a-a653-53a4e805a717	1	Other	Other
+986a139c-b283-47e7-b34d-658de76ec63a	1	Other	Other
+986a1a11-88f9-465b-9cb5-c92a65db6fe9	1	Other	Other
+986a305a-5621-48e8-bf64-d338903b65a5	1	Other	Other
+986a4187-af59-47b5-bb0a-201aaa1ab792	1	Other	Other
+986a5425-3b08-45c3-bd90-3d1dd182eeb6	1	Other	Other
+986a5fc0-e887-4dca-8ddf-8d97f4f94f1a	1	Other	Other
+986ad14e-c258-4cf4-83c9-f7dedca27986	1	Other	Other
+986ad387-a4d4-47c0-92db-c0bfcf3a732c	1	Other	Other
+986b1b5b-7e7c-4b3d-9d44-a9be8a16e5af	1	Other	Other
+986b3c0e-7c3f-4b15-b054-0023fa5c39c4	1	Other	Other
+986b73bf-7206-48e7-9e4d-25d8aa577843	1	Other	Other
+986b8a78-8e47-4959-b6a9-5742b1092a86	1	Other	Other
+986bc058-70ed-4210-9d38-e52c32321b81	1	Other	Other
+986bc17d-89fe-4cee-9edd-db37ddc76d2e	1	Other	Other
+986be01e-8e9a-47dd-a09d-05cd70d42aa9	1	Other	Other
+986be08c-84c5-40c1-9bce-1d8b3b2bfe91	1	Other	Other
+986c0091-fc0c-49f7-9af0-f38f225401c9	1	Other	Other
+986c750c-07a3-46f3-aa30-a92444c9d0b2	1	Other	Other
+986cb013-3249-4925-b81f-392802845184	1	Other	Other
+986d37e6-146d-428f-bc7e-20626f10f9c0	1	Other	Other
+986d5a07-e9c0-4623-85b8-79dc8e540715	1	Other	Other
+986ddb7e-1d22-4d25-ab3e-9366958cd299	1	Other	Other
+986df24f-7051-4657-bdbe-2b78158ec4f9	1	Other	Other
+986e542f-d0fd-4207-a959-0df7e0de5ce0	1	Other	Other
+986e5c11-b2af-4bc2-9f46-09ab1b562c64	1	Other	Other
+986eac73-9001-4a2b-b599-9ad09dad51c8	1	Other	Other
+986eadad-350f-4901-afb7-4429e05b56a9	1	Other	Other
+986ed9d4-79f4-4638-86a7-eeee7fc03916	1	Other	Other
+986f0b6f-7886-4123-a21a-18f615cb5d43	1	Other	Other
+986fc64e-3229-4725-b03c-844ee00dfaf5	1	Other	Other
+98701db4-9634-4a1f-8b74-b01df4c9c5f1	1	Other	Other
+98709230-5758-471a-822b-ed891bbd63e4	1	Other	Other
+9870e62f-3004-4a87-a11f-f0221ff7c957	1	Other	Other
+98710df1-bfd3-4505-8922-ba21402e3886	1	\N	Other
+987166ce-8c61-4288-b91d-929ab0430bfc	1	Other	Other
+9871681d-ce23-4b6b-95d1-2f4837e8debb	1	Other	Other
+9871bd33-1bf6-4763-b167-b353cbe20678	1	Other	Other
+9871c123-d121-4d2a-b86f-673c9e995d93	1	Other	Other
+9871e2f3-d238-4cb1-ade8-a17fe03089cf	1	Other	Other
+9872362f-ca4a-4cd2-a800-239162e7e44d	1	Other	Other
+9872982b-60ad-45e9-a699-0865aa3d7d41	1	Other	Other
+98729acc-ea43-4561-9a72-0d5ce7e56071	1	Other	Other
+9872b214-95a0-46eb-ae4b-a0f2c9cf4b6c	1	Other	Other
+9872d811-4340-4171-ae14-1ddd6b6df723	1	James	Other
+987388f8-6c97-44f3-be08-206da235b28f	1	Other	Other
+98739bb1-c68f-43ed-b449-fad08b981fe2	1	Other	Other
+9873c06a-9e89-4a78-ba90-8638ecf3940c	1	Other	Other
+9873c490-70b5-415f-913a-97936d9d247c	1	Other	Other
+9873ed64-4be9-4987-977a-3e254a8795fd	1	Other	Other
+9873efd4-ff69-4cf2-84c6-7614c30d99d5	1	Other	Other
+9873f566-78df-42b3-8f6f-7a367a104170	1	Other	Other
+98740c6c-a77a-45cf-9e48-297f406adddf	1	Other	Other
+9874320b-921f-43a2-82b2-881bbef51436	1	Other	Other
+98745047-d353-4b72-8bf5-72cc0188d45b	1	Other	Other
+98749951-3b27-452e-9f9c-d95511df1708	1	Other	Other
+9874d7a4-b1fa-4d77-be55-156ddfe81051	1	Other	Other
+9874faf2-d7e8-46fd-a316-a5b7c308f257	1	Other	Other
+9874fec3-b8d5-43a7-b2c8-e1e699205fd4	1	Other	Other
+9875f23e-1d02-4e08-ad03-782a4463a009	1	Other	Other
+98763c71-0324-49f3-94fb-d2d23e489de8	1	Other	Other
+9876473e-0c4a-491d-bb15-673b9659d7cc	1	Other	Other
+98769fb6-5e56-4c9c-8ac0-26c4ec2948ad	1	Other	Other
+9876f022-761a-4ceb-b2f3-d5c0bafe672f	1	Other	Other
+98771826-cafb-4bc1-871d-a64958e8971b	1	Other	Other
+987718ab-218c-413b-815f-9216992ba00a	1	Other	Other
+9877685f-fae5-4d34-badb-87f26bb11987	1	Other	Other
+98778373-1a28-45ab-b725-ef58594dca49	1	Other	Other
+9877acc5-e052-4508-a109-29e69c66eb96	1	Other	Other
+9877c901-53f0-4f45-8a18-6efb325613f7	1	Other	Other
+9877f6f1-2973-4593-8a2a-2f5cddc364e9	1	Other	Other
+98783a78-4cb5-4e32-8265-5d90862149d4	1	Other	Other
+9878742b-a870-4fd9-b32f-b705a86b43f8	1	Other	Other
+98787eaa-cecc-4e10-9d16-479f8185d20b	1	Other	Other
+9878a3bf-2058-4318-a93d-4636cbd5b4ba	1	Other	Other
+9878b053-f3d9-4417-87c4-1a5477f3c96d	1	Other	Other
+9878e837-d904-4ba3-8fab-ea4f43068283	1	Other	Other
+98795c58-5f4d-4bb4-b045-12102d9996aa	1	Other	Other
+98796572-09dc-4da9-8b93-a2098db3d61b	1	Other	Other
+98796dc8-a439-4649-b42b-7b4c8f7d5178	1	Other	Other
+98797857-f0fc-425d-8eda-8127a7f64fc8	1	Other	Other
+9879bae3-2576-4a6b-8c1b-c06095a43731	1	Other	Other
+987a12e4-670c-43ed-bac0-4ea978188b35	1	Other	Other
+987a6e5d-9fb4-43dc-b900-375c424f8115	1	Other	Other
+987abc31-5e51-4096-92cb-e65087df4aff	1	Other	Other
+987ac588-6a56-43a7-870e-7502e5c48b99	1	Other	Other
+987b4cd2-498a-430f-99aa-dcdb306424a1	1	Other	Other
+987b5161-ab26-4926-a30d-a0aca4dc234e	1	Other	Other
+987b7af9-7caa-43d4-985e-489b033da71d	1	Other	Other
+987b86e6-90a1-43f7-b0cb-e3d322cf552b	1	\N	Other
+987bb7cc-ebb9-4d59-8d8f-78f9a4d1fc8b	1	Other	Other
+987bce14-670a-4151-aa54-0180646746fd	1	Other	Other
+987bd842-bb46-4e52-994c-ce7639692990	1	Other	Other
+987bda75-1a64-47a2-9ade-ebb797382364	1	Other	Other
+987bdf72-2e5d-4636-ab01-9d01b653021f	1	Other	Other
+987bf6cc-b9ad-4186-84bf-657f2b1f8586	1	Other	Other
+987c03d8-4cb2-4f32-a306-4f1b62d1d38e	1	Other	Other
+987c12fe-ce3e-48cc-b94b-c09ff7086101	1	Other	Other
+987c1a8b-5751-445f-9f35-79ea341997ed	1	Other	Other
+987c4b1e-8c7d-47f3-834f-5ef436cd5f48	1	Other	Other
+987c5e37-e352-41ed-9fb2-d00c9d1db889	1	Other	Other
+987ca2c4-42e8-44a3-86b9-8da70b1c6332	1	James	Other
+987cdcfb-b674-4912-bc32-9455998d1995	1	Other	Other
+987ce68c-45d9-4462-9c4a-9026687d204b	1	Other	Other
+987d35e6-3271-4722-9c9f-e66cd1fdfd5b	1	Other	Other
+987d4472-17c5-45e4-bbf9-38289e0e04e7	1	Other	Other
+987e3608-c7bb-49a7-8aac-adfd20b45f26	1	Other	Other
+987e6457-4081-46bc-8f0a-66cec6eba684	1	Other	Other
+987ed6d5-d8fa-4825-977d-4d3263672adb	1	James	Other
+987f763f-c18d-4a24-b0ac-e4b69b1d037a	1	Other	Other
+987fa496-8056-439b-80da-fb4726707e46	1	Other	Other
+98802187-e627-43cd-9148-5e8f248f8092	1	\N	Other
+98802ceb-6ae1-4da9-8c69-e1733c9273a1	1	Other	Other
+988076a6-4706-4149-a666-07707401ea61	1	Other	Other
+988095ef-6aa8-4061-acff-d26458b8f79a	1	Other	Other
+98811c9d-4431-4247-bbc4-b080d8a42e4b	1	Other	Other
+988140ce-d1fb-47e8-a1b8-7b9ed2c4b465	1	Other	Other
+98815839-db11-4c20-ba1b-203869c1e42b	1	Other	Other
+98815c50-5ca5-4386-a3ed-f264fefe3a90	1	Other	Other
+988187fb-8cb6-4580-962f-7f0d5bf3f094	1	Other	Other
+988195d3-c883-49cd-90bf-4ad0080fc6b7	1	Other	Other
+9881a98d-2069-458a-94d9-0dee2cb73204	1	Other	Other
+9881b3c4-293b-4599-9ab8-39450cc62ceb	1	Other	Other
+9881b5fc-ad59-424b-83be-6927e09ffafa	1	Other	Other
+9881d6f6-a004-4a2b-b113-02af6b2a69ca	1	Other	Other
+98822637-4803-4e84-b3ef-c042d7d92cfa	1	Other	Other
+9882f229-adc2-4ac5-af31-166dd73df633	1	Other	Other
+9882fdd7-238c-4cf2-bd78-94ecc5b9ee9b	1	Other	Other
+98830bf6-64ec-4392-bd9d-128e4c522566	1	Other	Other
+98830fcc-08cf-40ac-b55a-4b56ac2538e4	1	Other	Other
+9883188b-d86b-4f78-8f8e-ad8d3ee47b6e	1	Other	Other
+98835608-71c1-48fd-8b26-0986d099917a	1	Other	Other
+98837219-a2f8-4b0e-a272-42c920ccbcfc	1	Other	Other
+98837d21-5c22-47c3-84fd-dd8909909e8c	1	Other	Other
+9883a301-f293-4e00-8eb7-b6fc7cb362e5	1	Other	Other
+98840d0d-3d76-4982-b6db-c47fa649ea2b	1	Other	Other
+98841859-616f-4e8e-8d90-01cc4f0f60b0	1	Other	Other
+988456aa-00fa-4da5-aa81-21ce8798a4ef	1	Other	Other
+9884698b-5c33-41b7-a398-6697dfef5638	1	\N	Other
+98846f9e-c61c-4916-a53d-2e8528dbaab0	1	Other	Other
+9884995c-48f6-4703-844a-8d02b7e02dd6	1	Other	Other
+9884b28e-5fe3-4317-9d6c-087b7c458c33	1	\N	Other
+9884d8ba-c1d3-4239-a7df-6ebaa24dab68	1	Other	Other
+9884f04b-82ca-4b13-8c0d-42426d563efb	1	Other	Other
+988536ac-ca25-4d10-aae3-e82b4358f10d	1	Other	Other
+988546c3-9c86-4541-af69-15fc0115905c	1	Other	Other
+98857ef7-c1c8-4206-9bd4-6d237a878067	1	Other	Other
+988588d6-62ce-45e4-814b-ce30821555c5	1	Other	Other
+9885b8e9-a017-44dd-be29-a24ecde87ef5	1	Other	Other
+9886106c-1e31-45ef-a9ce-19cd021c6591	1	Other	Other
+98861db9-e7aa-4748-a8dc-b7eddf11b44e	1	Other	Other
+988630bc-3c0e-47a0-bd69-48ac59734695	1	Other	Other
+98866d6a-23cd-4171-abcc-5afef4ff1580	1	Other	Other
+988682cd-55f2-4778-add4-2d44608a440f	1	Other	Other
+9886dc44-e2e1-46a0-b28b-65d0bcc128fb	1	Other	Other
+9886e82f-84b0-4ac7-8be6-eed6a1868df9	1	Other	Other
+9886ffa4-0554-44d3-b2ea-550640edb179	1	Other	Other
+9886ffc2-0312-4480-856e-3521a5ce4b44	1	Other	Other
+98870a79-8bc3-4406-99be-d99625ee3bd5	1	Other	Other
+98871d98-9a3a-4e90-8e83-cb97b727e201	1	Other	Other
+98873fd4-3c42-4688-995f-1f150a261bc2	1	Other	Other
+98875df3-d043-4d1e-a025-19f3d7b80473	1	Other	Other
+98876851-f2ce-4b6a-9e2f-28de228f919a	1	Other	Other
+9887cfdb-60ae-424c-8619-acd405a18546	1	Other	Other
+98880c8e-eec6-41a9-baaf-2d3698686e09	1	Other	Other
+98880d0e-e441-4d9d-a59f-e2c707ac2b5e	1	Other	Other
+98881df2-5732-4965-8cc2-20a4a455e9d0	1	Other	Other
+98883b12-aa9c-4aaa-b257-e855d60af0ab	1	Other	Other
+98887bb5-2ce9-46e0-8edc-efa562077786	1	Other	Other
+98889bc9-58b8-491f-98d4-31c8411b69f6	1	Other	Other
+9889562e-b0f2-40ae-8b42-cf0c5e655d03	1	Other	Other
+9889568e-2636-4fbb-b18e-b7fcb6138060	1	\N	Other
+98896abf-ad24-473d-8d97-f781609acdfa	1	Other	Other
+988a51df-230c-47fa-b93a-bb6d4588c869	1	Other	Other
+988a5259-8dbd-4173-9395-186286f221fa	1	Other	Other
+988a82be-10c5-41a6-9f85-06d140cb1d60	1	Other	Other
+988a847c-12f3-4a8e-a0c5-6aa5594d5059	1	Other	Other
+988aa471-66fc-4a73-9b54-efd7bbaeec68	1	Other	Other
+988aade6-f76d-46da-85ed-4ebb31acdd95	1	Other	Other
+988ad5ba-6e34-4602-89ea-d0467be18b7c	1	Other	Other
+988adcd5-17e2-474d-9a76-3ed152ae9458	1	Other	Other
+988aeabf-dbca-4816-a614-e59d19f22ca8	1	Other	Other
+988b05ce-9f9b-4172-b9ea-06589232f132	1	James	Other
+988b2238-e62d-4d01-ac1d-039e847a6b66	1	Other	Other
+988b509d-2c7b-495a-aa4d-598f4e489e83	1	Other	Other
+988b5fc9-afd7-422e-95f9-dd02b573df9a	1	Other	Other
+988b8df2-704d-4234-93aa-ba117f4e00f8	1	Other	Other
+988c0b4e-7766-405f-b562-091df5462855	1	Other	Other
+988c2d0b-a046-4cac-bc97-0f634c1e9de6	1	James	Other
+988c8167-0038-4260-b40d-2c5443f1a35b	1	\N	Other
+988c916a-ef6f-4f16-b3b9-82a628526a62	1	Other	Other
+988d843b-7674-48ed-a037-06f8cc393c6e	1	Other	Other
+988dd443-d277-40b6-9cd2-e9159c96aee3	1	Other	Other
+988de625-2bfd-4866-9b4a-e052d3c760ec	1	Other	Other
+988e4ec1-95a6-458f-887d-7ca8ebe117b1	1	Other	Other
+988e4fd8-ce40-4379-addf-0041c133874f	1	Other	Other
+988e815c-4579-404c-86a0-1084a919fdb2	1	Other	Other
+988ecb40-0170-46f9-992e-11f061feec3d	1	Other	Other
+988ef989-9e42-4515-b842-822725c763db	1	Other	Other
+988efa16-9f27-44f0-9d93-94e3fad5e855	1	Other	Other
+988f0cd7-2f07-4a27-84f6-ae1fdfe604ca	1	Other	Other
+988f17fc-d5b8-4129-8bc8-540027e12dba	1	Other	Other
+988f4b7d-9561-445d-b7f1-26bf01a5d94e	1	Other	Other
+988f5549-e300-4d25-b2a4-31383cf8f700	1	Other	Other
+988f7a8a-a824-42e2-9f16-7a486320fad1	1	Other	Other
+988fc321-aa86-460d-ae74-5b19666570be	1	Other	Other
+9890134b-bf98-4bc2-bea0-bd652361287b	1	Other	Other
+98907b14-9376-48da-ab09-6c82baf97ea9	1	\N	Other
+989111ed-609e-486d-aa8e-1be72e84c522	1	Other	Other
+98911917-83ce-4587-99fd-1dc24f7bfae9	1	Other	Other
+989157cf-05a3-4fcf-9469-fa7739ffbd82	1	Other	Other
+9891b025-4c1f-41b7-98df-e945bf3ce065	1	Other	Other
+9891b528-fb53-40ab-bbf1-3b84983535ee	1	Other	Other
+989200c6-8f7e-41fb-8757-318382385798	1	Other	Other
+989260b8-0ec0-421c-9b6b-d83cbbd848cd	1	Other	Other
+9892895c-3864-4f26-88ed-8b0b6646fec6	1	Other	Other
+9892df1a-959c-49c1-a961-c10f110b38da	1	Other	Other
+98933099-f6b7-44c8-b2fd-5a8929bf0bf3	1	Other	Other
+989335d3-c895-459a-ac75-7608894f6b4e	1	Other	Other
+98938b7f-09c5-4bf8-b348-0c067d502594	1	Other	Other
+989390ec-2159-48a0-a996-bfbdcc32a5e8	1	Other	Other
+9893aa92-4f20-4ad3-b664-2d1ae9dc6762	1	Other	Other
+9893cfc9-5be3-4146-833d-6417df31aa14	1	Other	Other
+989431b8-8b3f-4d08-a905-a151dcf5ee1d	1	Other	Other
+9894adec-384d-4c11-bcaf-71dd234170c7	1	Other	Other
+9894be84-f9cd-465d-9516-8b272525cde1	1	Other	Other
+9894bff3-deb4-4b9d-9127-465e6db4b52e	1	Other	Other
+9894cdd0-bb00-4bb8-8898-79047e9c52da	1	Other	Other
+9894eab8-0ec6-4e1a-b54f-2fef93c24335	1	Other	Other
+9895a4eb-e5a0-4409-9b6b-399297178f97	1	Other	Other
+9895cea5-8955-433c-850c-4ad52a686ff3	1	Other	Other
+98960347-9f69-4523-8454-28ec483e9388	1	Other	Other
+98962677-8d21-4003-9c2c-a172ec3c2766	1	Other	Other
+98965ffc-b68e-4454-9cb2-654fb2e7cbe3	1	Other	Other
+9896a9cf-78f1-4c0f-a8bc-7fd3ab6fcff8	1	Other	Other
+9896b142-e236-48e2-8d84-bcddc8604354	1	Other	Other
+9897a04a-b40f-43f0-b171-5c4d7fc7724b	1	Other	Other
+9897d551-d424-4b87-93db-18dc2246f425	1	Other	Other
+98987386-6146-40bf-8281-2ba3e26d1ad6	1	Other	Other
+9898cf88-e7ef-44fe-ac60-51b45b41c51c	1	Other	Other
+9898d0c3-fb67-44b0-93e3-788852a5607e	1	Other	Other
+9898eac8-eff2-4f7f-bf34-9c838a395f85	1	Other	Other
+98990700-dbaf-4259-9053-3f6cfaaf31a5	1	Other	Other
+989955a4-f72f-4d93-a33c-9049c29ef485	1	Other	Other
+98995fd3-ffa3-46c3-8ad4-80f2180aa291	1	Other	Other
+98997fb6-4392-47d5-beb6-25ace3bb9f35	1	Other	Other
+98998c70-55d1-42b8-9fe8-121cbe30bb82	1	Other	Other
+98998f21-0aac-47f0-8c49-05c4cef6e07a	1	Other	Other
+9899950e-f1aa-494e-9376-4e5f326aee4e	1	Other	Other
+989a1234-adda-416d-9d55-d7be4825a9f9	1	Other	Other
+989a1c5c-13a6-4702-95fd-fdb287009c45	1	Other	Other
+989a34a8-2f64-40d3-a04a-b30157678640	1	Other	Other
+989a63c3-0ed3-4058-b3c4-1b65ba8080ab	1	Other	Other
+989aa2b8-1c64-4d59-b1c0-a7cae7304258	1	Other	Other
+989ab37b-d557-4592-b368-e7a9a3813ae0	1	Other	Other
+989adcc9-03c3-4af3-a702-49634bb7996f	1	\N	Other
+989b035c-5d23-4adb-9e0c-5f89edc928e6	1	Other	Other
+989b2b7f-db2f-4d29-97b2-3778f10eab66	1	Other	Other
+989b4873-467d-4f37-803a-0240cc083ba1	1	Other	Other
+989b57f8-4443-46ac-af64-6b29680844d8	1	Other	Other
+989b5c92-9544-4097-9be9-c9c390d48944	1	Other	Other
+989b7199-84db-4135-8e64-55296881be68	1	Other	Other
+989ba3b0-ee6d-453b-86b7-1eb1e88c3235	1	Other	Other
+989be2d6-1eeb-4c94-a3fc-3f653e75d513	1	Other	Other
+989bf5e3-fcb2-4dfe-b52e-4f01b8e6d2f3	1	Other	Other
+989c0bcb-8116-4f98-a7be-897592464803	1	James	Other
+989c1a92-d212-4941-ab52-c2f4d1068f77	1	Other	Other
+989c3076-d1c0-4884-8842-540a4bb9ccab	1	Other	Other
+989c39e1-f3e1-4c0a-81eb-69f2c476a4f8	1	Other	Other
+989c5ead-e21d-4557-8711-c1812c1409b7	1	Other	Other
+989c66fd-de9c-40f4-a822-2c781a5091e2	1	James	Other
+989c88b3-0393-49a5-98c7-9baff5a3a2d3	1	Other	Other
+989cb59b-4ed5-4b59-be72-89608d8dd42f	1	Other	Other
+989cd3a3-1ce4-4dc5-8dd6-5f106aed5bfe	1	Other	Other
+989ce005-9c6a-4ea6-b519-b7627ee0c55d	1	Other	Other
+989cf694-1dd6-4414-addc-71b3954dd1a3	1	Other	Other
+989d06f1-5a7e-405d-8fe4-c8a049e8f554	1	Other	Other
+989d11d7-dad0-40d4-b7bc-57c2761f14ef	1	Other	Other
+989d37ad-51a1-4113-9af5-108a71176422	1	Other	Other
+989d9aa3-50c2-4455-bfff-57d8bc825956	1	\N	Other
+989da303-f8b4-4954-99c5-a2e430b78101	1	Other	Other
+989ddccc-cc3d-431c-a803-1789007c5263	1	Other	Other
+989de615-9eb3-48ce-a514-c4fd8ea839a5	1	\N	Other
+989df719-c668-4606-a8a0-cf8a8ff41874	1	Other	Other
+989e3a20-e368-439d-b4c0-016021638143	1	Other	Other
+989e4418-d76a-4267-ae2f-4df9885a79bf	1	Other	Other
+989e52d3-4879-4bb3-9965-fcc8daaea71f	1	Other	Other
+989e55bc-5ade-4b54-bb5f-d3ab1bd86c1c	1	Other	Other
+989ee4a8-b2d5-4331-89b0-c941cc02f5f9	1	Other	Other
+989ef352-3d73-42dd-a598-c872af5cdc05	1	Other	Other
+989ef37d-ed5b-4b1a-a9ab-fb3342001d56	1	Other	Other
+989f34fa-558c-4399-b301-95a7b6d03247	1	Other	Other
+989f5fa0-981f-4fd0-bd22-5a4c080d4ff6	1	Other	Other
+989f98d5-0a86-4900-beb7-4e94a65fdf5a	1	\N	Other
+989fe365-62f6-4158-b8a9-0bce2be79e26	1	Other	Other
+98a00b70-8a8b-4fd0-aed3-8c0f738a1320	1	Other	Other
+98a01756-b8e0-4ecd-aa96-6b3bf96bb3bc	1	Other	Other
+98a02e06-b1c2-41ad-8aa6-25cc3149e61d	1	Other	Other
+98a041ad-c9d8-4502-9ac5-5bc62844d4af	1	Other	Other
+98a05f82-dd06-43f4-8d17-26cbc2e0fe19	1	Other	Other
+98a08a39-8999-4951-a92f-372462f7b7bc	1	Other	Other
+98a0b5ca-d928-4a62-af2b-b2ed3fa8ad6b	1	Other	Other
+98a0eb3a-d26b-4421-ac3f-b5fdd9d74ec3	1	Other	Other
+98a0fa76-6e0b-4f0c-a7ef-5a692b136428	1	Other	Other
+98a113eb-f8da-40dd-be93-80415a856536	1	\N	Other
+98a14deb-505d-4354-ad29-1f867fa1d2f7	1	Other	Other
+98a15193-6f61-497d-8a54-1b3336b0177e	1	Other	Other
+98a1dfda-436b-4e23-a852-417c9fed83f3	1	Other	Other
+98a1f4be-19b6-469b-9ba3-b3dc4ac7ae2b	1	Other	Other
+98a264b3-df78-4543-a626-4eb113f604c7	1	Other	Other
+98a28005-4473-4547-bfe5-20918bc6022a	1	Other	Other
+98a29ee7-d1f7-4db4-a3ab-73aa9bdc636f	1	Other	Other
+98a2a634-41ef-47e1-a398-a07265b16738	1	Other	Other
+98a2b54e-5827-4930-8866-23c6d20e5140	1	Other	Other
+98a2b619-591c-418a-8c60-6c86a76a17e2	1	Other	Other
+98a2cc17-1f30-4b57-b88c-698ed5c9b23b	1	Other	Other
+98a321e1-25ba-4eac-a3f8-61d2a6ba1f52	1	Other	Other
+98a35975-26a1-4be1-aded-a5a70be63600	1	Other	Other
+98a3e8e9-6f2c-49b2-8047-7334efec0009	1	Other	Other
+98a414eb-ed9f-4f89-b4e7-02a9ff806eb6	1	Other	Other
+98a43360-92b6-4603-a55d-017fd42655f9	1	Other	Other
+98a480de-3d1a-424b-809c-5dfdf2caab62	1	Other	Other
+98a48b52-1efd-47d5-8bc4-e46cb58c77e5	1	Other	Other
+98a4bbd4-abb5-4861-8e11-248bab7e9764	1	Other	Other
+98a4f64a-6291-47af-8b80-da8a28d6147a	1	Other	Other
+98a55101-80d2-4a57-bf15-058ba2e6a5ac	1	Other	Other
+98a5591f-98c4-4161-8b43-63de0faf1e26	1	Other	Other
+98a5b2d9-0a64-480a-b7e1-ed84a3b46a0c	1	Other	Other
+98a5c08b-21f8-4cdd-807c-b9800bfbb274	1	Other	Other
+98a5c102-3fa6-4431-b38a-41b2191a1944	1	Other	Other
+98a5c79c-fa80-4580-b274-992ebd578b08	1	Other	Other
+98a5f4b4-e525-4413-a159-a97e9c134aa0	1	Other	Other
+98a612f9-c7ba-4bf8-b534-e366a3fbc779	1	Other	Other
+98a63713-bbc6-4a2c-9a5d-82a711f829ed	1	Other	Other
+98a676ce-c560-4e32-9670-9b1fad768914	1	Other	Other
+98a6a169-321d-4ab6-b02b-bfc320cb8b5e	1	Other	Other
+98a6a988-5a4f-4a75-badd-a9b058a1d2d1	1	Other	Other
+98a6b430-80a3-47b2-98b7-c9fe7474d31c	1	Other	Other
+98a6b480-1ae1-4a91-b599-5146cc8bb9e9	1	Other	Other
+98a6bd05-7669-4e13-9c0c-711126c6d698	1	Other	Other
+98a6c461-2e59-4cd5-9997-8775935ade70	1	Other	Other
+98a6e84d-9324-448c-8167-82c20f89ae36	1	Other	Other
+98a721d4-078c-40d3-bd95-0fd81d461130	1	Other	Other
+98a742f8-f168-4396-bd00-d7d448f1f11b	1	Other	Other
+98a751db-04a4-4df2-9a5c-0fccbf6fa68a	1	Other	Other
+98a75901-dac5-41e5-95ba-54a135be5fb5	1	Other	Other
+98a771f0-db6f-42a2-984c-81f0cf9d4585	1	Other	Other
+98a774d0-3ec7-4a7a-9712-44e5d20e0234	1	Other	Other
+98a79aa0-a9ca-44e7-85a4-00c9f466f8a7	1	Other	Other
+98a7b1dc-5147-4225-85e3-901138907207	1	Other	Other
+98a7de8e-9707-499a-8c73-425f354fdb83	1	Other	Other
+98a7fab3-a7cd-4bfe-815b-728a13c436c2	1	Other	Other
+98a82d3a-f2c3-4551-aa24-4107d87cd93b	1	Other	Other
+98a862a6-0c59-46e9-91c5-ed0984b0a40c	1	Other	Other
+98a8a09e-07f3-4c63-94fc-39cad41f9b8f	1	Other	Other
+98a8b123-f07c-45d9-9fd2-e3fd6538ea88	1	Other	Other
+98a8d805-42f0-4c86-bd8c-c2f5d3e345b6	1	Other	Other
+98a913c7-6779-4859-b4ef-75afddceefaa	1	Other	Other
+98a95464-c936-40be-b6cd-a35d71c27195	1	Other	Other
+98a9577f-68fc-4785-a722-d0afcda0f0a8	1	Other	Other
+98a9702d-6314-437e-a2fa-8829aa15eaae	1	Other	Other
+98a9db3b-0341-4be5-9b8c-7656bd083277	1	Other	Other
+98a9f57f-3a64-4bd3-b436-3569034e61bd	1	Other	Other
+98aa0209-6add-4591-a215-9b4b32f435d5	1	Other	Other
+98aa3cb1-4360-47d3-8a3e-8e2d01f8ff0e	1	\N	Other
+98aa43f6-6c63-4301-9317-31990f24a5d6	1	Other	Other
+98aaa607-427f-4643-a6fd-39f293413002	1	Other	Other
+98ab5fa9-8b0a-4c0b-a4d1-f98b68b3a597	1	Other	Other
+98ab637c-0c9b-46b3-99b4-861aece5a858	1	Other	Other
+98ab872a-022b-45f0-9045-51e5115fb1de	1	Other	Other
+98abc679-0c35-497a-bdda-a3ca7d3bd67a	1	Other	Other
+98abe958-6c5e-443e-a2c4-9c1efcfb3eb4	1	Other	Other
+98ac203f-7c2b-47d3-b269-d52576d0403b	1	Other	Other
+98ac6209-040a-4d00-9071-060761b9a5ab	1	Other	Other
+98ad3263-2ff2-49f7-99ec-d0f353817dcb	1	Other	Other
+98ad5dfb-4609-4946-a0b4-6608e54c945a	1	Other	Other
+98ad95d6-ddc8-4ff9-ad45-dfad95e40b96	1	Other	Other
+98ae0d7a-fedf-4f34-8312-4da10de19f38	1	Other	Other
+98ae2226-fc17-4b7d-957b-35744adb57b5	1	Other	Other
+98aeb5f5-cb3b-475e-b5b3-8fe3d0be7103	1	Other	Other
+98aec2b6-c019-4e73-8f78-33f772135d0e	1	Other	Other
+98af112a-2622-4157-b551-cd0a15f01e9d	1	Other	Other
+98af75b0-8ea9-4ea2-b315-44dde95d66bb	1	Other	Other
+98af9102-e102-423c-bba9-19e38eec4ee2	1	Other	Other
+98b02907-2230-40fd-8514-fb257d3b200b	1	Other	Other
+98b03d1f-4f5d-40f6-a117-2e4ddd8a4e0e	1	Other	Other
+98b04e5c-cb66-43cb-a15c-6329068ad714	1	Other	Other
+98b0a85a-038d-4de0-a9f7-e169d852a17d	1	Other	Other
+98b0be57-d783-43ac-9147-42c925e521b8	1	Other	Other
+98b0e5c7-eec8-42bc-9e93-0374ee32ad34	1	Other	Other
+98b0f72b-6c0a-4726-bc01-f664d1f4e910	1	Other	Other
+98b10e7d-0d32-4f6d-85f9-dfdec566d06c	1	Other	Other
+98b12949-7f9c-4c6c-8894-16546466e523	1	Other	Other
+98b13aa8-e268-4bc6-a75f-638f80b9b59d	1	Other	Other
+98b14456-9a0d-4a5a-a4b7-4a072b8cad0e	1	Other	Other
+98b19ad6-0823-4951-b495-0bbd8d4cac93	1	Other	Other
+98b1dd27-e4c7-4311-8d28-09509ea3e641	1	Other	Other
+98b1df82-8c80-477d-a4b5-ac8343073f78	1	Other	Other
+98b1fb9b-f0f1-4383-8deb-b24c0443f933	1	Other	Other
+98b21a57-d005-4df8-bead-303ba9f5ec6a	1	Other	Other
+98b24b89-ee0c-46f2-a8f4-d9c82a284349	1	Other	Other
+98b2e04d-ecf7-4e0e-bdfc-33a3746aef0f	1	Other	Other
+98b2e91b-7bab-481f-ac51-dcc21fab8727	1	Other	Other
+98b30bae-b491-4781-9283-37befd6a1c49	1	Other	Other
+98b36291-3002-4a93-a349-0cb5c7afc83f	1	Other	Other
+98b3cac2-6879-45ca-9729-938a5ad3f028	1	Other	Other
+98b40b1d-040d-41db-9976-9289bf45e1f4	1	\N	Other
+98b4367d-3e04-4f4b-864b-5c5f7487e981	1	Other	Other
+98b44093-59a2-4b5d-8089-4912e2e1b02c	1	Other	Other
+98b499b8-99c6-4403-a15f-a4e18bb07524	1	Other	Other
+98b528d1-8ae5-448d-ad16-49ce808ef169	1	James	Other
+98b5c991-900a-4ba1-b34d-a79929a5a322	1	Other	Other
+98b62849-af64-4a7b-8bf7-1a777e4c2af9	1	Other	Other
+98b655ca-dbe7-4b16-9f84-4ea9be8b7305	1	Other	Other
+98b68835-ac28-4c3c-9e78-22061c83db28	1	Other	Other
+98b6af60-041f-4d6a-b0fe-08f4273b60dc	1	Other	Other
+98b6afba-ef68-431a-be57-0eb0cf3b7580	1	\N	Other
+98b6c5a3-50f2-4aea-883e-79b512247e96	1	Other	Other
+98b6dac0-7a6c-40c6-975f-4c27964001b5	1	\N	Other
+98b739dd-8ee6-4423-993f-47dd90ae3d39	1	Other	Other
+98b76fc2-3a39-41c8-9847-f1f2f61e1137	1	Other	Other
+98b770e3-108e-4025-8faf-2610a678fbf1	1	Other	Other
+98b7ebc3-7f0c-4835-b42f-81ebe977d149	1	\N	Other
+98b80e0d-1540-4e4f-8720-f777cafccce5	1	Other	Other
+98b840d9-edc2-412b-b5b3-0d9c04819c5e	1	Other	Other
+98b87846-496e-4bdd-8e71-a1635ead0681	1	Other	Other
+98b8a30f-1a33-41b7-a282-0d51f1bab0d4	1	Other	Other
+98b8cbad-1d3d-425c-8e1b-f435761828f7	1	Other	Other
+98b900b9-3b2c-4c5a-84c1-4a0ee5fc305c	1	Other	Other
+98b911e9-21b7-4539-8987-f0635ca8f64b	1	Other	Other
+98b9871a-ee12-4ad8-9ee2-74a9ec034df9	1	Other	Other
+98b99855-c6dd-47f3-9a90-eab35598db2b	1	James	Other
+98b99a91-83dc-45b6-b225-e1b7867dfa8f	1	James	Other
+98b9daf2-3dca-4ef5-96a5-adbc92dc7bb5	1	Other	Other
+98b9e3e5-4150-4ca3-adda-c912b70f509c	1	James	Other
+98ba0dbf-eede-4e25-89ec-df276ecfd3e5	1	Other	Other
+98ba3221-2374-4c7d-a25e-685505b2909e	1	Other	Other
+98ba3759-1ab4-4259-8272-1776dc95ab4e	1	Other	Other
+98ba4708-2245-4560-bd16-9dba0968da2e	1	Other	Other
+98ba6036-d1d8-4c48-97a0-3db9744add23	1	Other	Other
+98bb1b07-f32b-4ddb-bcba-eec3dd285acb	1	Other	Other
+98bb250d-a254-419e-839e-af8b9de36816	1	Other	Other
+98bc0e00-e085-46a6-9f06-b9db9d14abe5	1	Other	Other
+98bc1818-eac3-4481-84ce-92a01dbe3897	1	Other	Other
+98bc801d-7ac5-4b00-a440-ff11270de79c	1	Other	Other
+98bccc16-3db5-451f-8c71-95bd470254d0	1	Other	Other
+98bd48d5-3568-4eae-9bfe-e814fdf4d9d5	1	Other	Other
+98bda8f3-4336-4c5a-910f-cd6712952d5b	1	Other	Other
+98bdca23-74ab-444f-8cf6-bba67e8cb034	1	Other	Other
+98be9d03-65ed-404f-8bae-12f0f3bdf3c1	1	Other	Other
+98beae84-6505-4698-b848-8b792563f108	1	Other	Other
+98beb696-f285-447c-b40e-b22ba893beb9	1	Other	Other
+98bf03e9-d90a-4393-af40-54fa6e46a448	1	Other	Other
+98bf41d2-4d47-43b5-89b9-d43bdf0ab374	1	Other	Other
+98bfa365-e409-4280-8f34-96f38b7ecf47	1	Other	Other
+98bfb6cc-a4a2-4731-9992-7b2dc6c82954	1	Other	Other
+98bfd586-3ab3-4e0f-abe6-5c7f066d3183	1	Other	Other
+98c00873-89e7-4247-a264-3ff63ad8b1b6	1	Other	Other
+98c0412c-b913-420a-8d49-7b11fefc3bc9	1	Other	Other
+98c0619e-81d9-4d32-9a67-0011c7afb9a3	1	James	Other
+98c0784e-a9c5-11e7-ac15-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+98c09587-afda-42f0-82ae-967fcbdad957	1	Other	Other
+98c0d522-80ab-4a3f-8d6b-7357189cfd67	1	Other	Other
+98c13e2e-202e-40b5-a6b6-45e02669e807	1	Other	Other
+98c157f3-b6f7-4b35-b063-930ad7ef113a	1	Other	Other
+98c16989-1060-49f6-a8de-1ea4a17b718b	1	Other	Other
+98c205b8-62fc-4d44-8a3b-f3cde1fd64bf	1	Other	Other
+98c259d8-7809-42db-99d5-11d10fd033c2	1	Other	Other
+98c294f5-cedc-4688-a7f0-b3cd67834384	1	Other	Other
+98c2a97e-4eaf-48b1-8157-519de6e0302d	1	Other	Other
+98c2aebe-0a57-11e8-8111-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	James	Other
+98c2f004-118e-4868-a4e1-193a42cf20d1	1	Other	Other
+98c2f4f8-6b23-4e42-8d88-df5f3a795ddb	1	Other	Other
+98c3016b-4bf1-4a3e-b44d-ef78eca40f00	1	Other	Other
+98c380a5-4ee6-497f-b4e7-74aeae6c7a37	1	Other	Other
+98c396a9-9888-40f1-9af9-86432a41b168	1	Other	Other
+98c3a988-f94c-4ee8-bd8e-a761e64ea88f	1	Other	Other
+98c3e3f6-f166-4818-8dd6-16c56763d76d	1	Other	Other
+98c3eeb1-6902-4a45-82a6-a6b22eb816eb	1	Other	Other
+98c456c4-b02a-44f9-a39c-1c5aa4aa5d93	1	Other	Other
+98c45b04-cbf6-4593-bdd9-80b425197923	1	Other	Other
+98c45c71-1122-42c7-b892-661753d34322	1	Other	Other
+98c46a1b-f574-44b3-9b8b-f125f43d799e	1	Other	Other
+98c476a0-c457-450d-aca9-a1d5529a556a	1	Other	Other
+98c4872a-665d-45a8-9bdf-6a3bb1efe5ec	1	Other	Other
+98c49731-f397-4461-b6bd-5f9496e6ad79	1	\N	Other
+98c4c9a2-272a-4abf-9c9b-c7258d2fcdbe	1	Other	Other
+98c4e6ee-085b-43f8-9cfc-893db679550e	1	Other	Other
+98c53bfa-5b4b-497f-b06d-b4f95d93edcf	1	Other	Other
+98c56f41-85af-4f8e-9368-c333d9208d74	1	Other	Other
+98c5865a-35cb-4755-a15f-1c48ba442085	1	Other	Other
+98c598bd-2600-4124-b72a-bebb71526a37	1	Other	Other
+98c64614-c7d9-44f7-a247-358d66e080a7	1	Other	Other
+98c6721a-268e-478d-bb7f-69911dd7f663	1	Other	Other
+98c6a86b-585d-448b-8287-e84ce93c31c0	1	Other	Other
+98c6aa1f-5a0d-4e99-91dd-626a3359b6b9	1	Other	Other
+98c6bcbf-c37b-4267-a8d0-0f587f00c291	1	Other	Other
+98c6e5a6-2d6b-4338-8491-679ef639bec5	1	Other	Other
+98c71768-2ac1-43f8-92c5-3f3fa7d05bf8	1	Other	Other
+98c72e7a-1fc0-4ef1-acf8-45282767b275	1	Other	Other
+98c734b2-107a-4e7e-a14c-a91b879758fd	1	Other	Other
+98c742e4-ab10-4534-8412-d9e876dbb31f	1	Other	Other
+98c76e6a-455d-47b1-a7f5-7cca4599766b	1	Other	Other
+98c7addb-7e88-4365-b483-d6339d52de59	1	Other	Other
+98c7cabb-884c-4c0d-8bd5-1ab39a2accdf	1	Other	Other
+98c83c3f-3276-4bc8-840f-fa9089337cae	1	Other	Other
+98c85b47-2828-4b2f-ad7f-1456d59ee47c	1	Other	Other
+98c8692f-0626-428b-9118-15b4c183ebb1	1	Other	Other
+98c87eb1-029d-486a-bbb7-1cfe9e0fe83b	1	Other	Other
+98c8bf8e-82ac-478a-9444-db060a84a6b7	1	Other	Other
+98c8dd1e-1d68-4520-8d33-3bcf4626f414	1	Other	Other
+98c94191-f50a-442e-8d2f-657d0f731dd0	1	Other	Other
+98c9dda6-9131-401e-b80a-02536364fa3a	1	Other	Other
+98ca136a-f797-42f9-8af9-61ee9c33e28d	1	Other	Other
+98ca3384-2420-4eba-86b4-9057798a9f5b	1	Other	Other
+98cac75e-c3f6-4828-85b5-b5c132cf5fb7	1	Other	Other
+98caf5d5-4de4-4f25-bb11-54db91a7c4e5	1	Other	Other
+98caf81b-98bc-4d65-93c4-a32aeea59e8a	1	Other	Other
+98cb0f67-fc57-4a6d-ab10-2078b7a26855	1	Other	Other
+98cb2986-511c-4045-b705-4447a6b6d137	1	Other	Other
+98cc0c76-24d9-4aa8-8045-4593d895d953	1	Other	Other
+98ccc291-aca9-43cb-bfe1-43bc8abd43ad	1	Other	Other
+98ccdc19-ba72-4962-88a2-48ec50ec6bc9	1	Other	Other
+98ccfbbd-aad7-47c5-bbf8-45bac9b2bb8d	1	Other	Other
+98cd0f82-f3e1-4d45-a3aa-64ae67c20986	1	Other	Other
+98cd28ba-1156-406b-b0a7-0e632c171b78	1	Other	Other
+98cd3965-9ddf-4ef8-9be1-5ab90f0fff01	1	Other	Other
+98cd56d3-c43b-4d14-9edc-2729f0b5e87b	1	Other	Other
+98cd61d4-6b63-4062-89e8-c5e10baf55ce	1	Other	Other
+98cd7153-7f35-4a94-ab50-191d4784c00f	1	\N	Other
+98cd8378-996a-410c-bb1b-4f6db8592b5b	1	Other	Other
+98cdab37-2c64-45e1-9197-2c74a53a7128	1	James	Other
+98cdc394-6feb-4a68-af99-0966a7dd5d31	1	Other	Other
+98cddaa1-aeee-422c-8043-1537f07684e6	1	\N	Other
+98ce724a-7dab-429e-8e16-bad00553a162	1	Other	Other
+98ce7d8f-09c4-42be-a876-47b10bcf7548	1	Other	Other
+98ceae52-a02f-4f0a-b8be-649b04117e9b	1	Other	Other
+98cec336-7d6b-4b47-bd35-5cda18a2e253	1	Other	Other
+98cef4df-c974-4569-b315-0ab025ae75ba	1	Other	Other
+98cf0a82-3f15-4b94-b318-d0219512cc9a	1	Other	Other
+98cf5828-474c-45cc-bf29-a4b6641b276a	1	Other	Other
+98cf5b13-fb32-4ec7-8f7a-2d01f446cb48	1	Other	Other
+98cfaeef-6c47-491f-8d79-f97f5c6fc560	1	Other	Other
+98cfcd8e-6f69-41cf-a1dc-cebbc94d4a7d	1	Other	Other
+98cfdf66-e6ae-4e81-8a6f-95aae33a1f7c	1	Other	Other
+98cffedd-47e0-430a-9c63-cbe8ba2f5df1	1	Other	Other
+98d00660-6c58-4c49-823a-0bb2aa594f91	1	Other	Other
+98d0256a-b13d-445b-a498-6e6f58e40dcb	1	Other	Other
+98d03427-573b-46f9-b74a-73cca94f8bce	1	\N	Other
+98d05256-d4f4-4bba-a53f-be560ad7c97c	1	Other	Other
+98d05a48-4a03-4749-aa64-2d9b35f1efc3	1	Other	Other
+98d08cc5-c6b6-4356-b1c3-a60e6a3f6832	1	James	Other
+98d106f3-2741-4942-85fc-1ab33f535370	1	Other	Other
+98d10707-107c-4fe7-a628-66528b4d5798	1	Other	Other
+98d12652-2dfa-4d99-81cb-ddb8e8522bc0	1	Other	Other
+98d13050-ff8d-4417-82ff-8140631da57d	1	Other	Other
+98d16c3f-e068-4454-880f-b1840cc17a79	1	Other	Other
+98d17dbf-e5bc-4287-b924-92dacda815b3	1	Other	Other
+98d1f09b-45f8-45e2-9d11-0bec662ecc11	1	Other	Other
+98d2154c-dfef-47be-bf70-cf2f06618bb9	1	Other	Other
+98d24068-78d6-4e81-aa21-bbe006794069	1	\N	Other
+98d24d73-6293-40ba-846a-b774cb8dc826	1	Other	Other
+98d250ff-1d94-4fa0-8dc6-892d81b7222a	1	Other	Other
+98d2640e-f930-4275-897f-29681489a4d2	1	Other	Other
+98d284ca-0765-43c8-9020-a203b909bfef	1	Other	Other
+98d2cce3-6688-4141-aac2-faaab14320a5	1	Other	Other
+98d2d91c-fe5c-4b73-8462-783eb5efaaaa	1	Other	Other
+98d3c0c2-9b28-4e13-8c80-10e77330e2bc	1	James	Other
+98d3dc9d-7935-4a9f-8b0b-b59462173632	1	\N	Other
+98d40a57-330d-48f3-bd29-25f9688acf03	1	Other	Other
+98d42014-982f-4a26-9fd9-b4520cf49da2	1	Other	Other
+98d4f15b-c0a4-40a4-92f2-a32e12abd669	1	Other	Other
+98d56e94-4694-46a6-bc73-8af942db29d8	1	Other	Other
+98d57c1a-51ac-4bf3-a5b4-24a83306c357	1	Other	Other
+98d595d9-cb1e-4f85-bfca-b3493fcb3b00	1	Other	Other
+98d5cb68-2edc-4cd0-84e2-120ff0e93553	1	Other	Other
+98d5dd20-f259-4fd2-a98d-e01d7d861b2c	1	Other	Other
+98d5f9cb-fd7a-4399-a799-82a6a4489f77	1	James	Other
+98d6894c-68bd-4195-a042-74e63a7b8054	1	Other	Other
+98d755a5-c4ec-462e-91cd-27d8d7c442d9	1	Other	Other
+98d7577c-f8ca-4615-9920-d25cf73cd3f4	1	Other	Other
+98d76add-0f46-4f34-9489-2151cffdf621	1	Other	Other
+98d79eb6-b892-4828-ad3a-33ead8016fec	1	Other	Other
+98d7c464-9522-4e7d-9313-757cabbb03af	1	\N	Other
+98d7dd87-1dfe-40d9-bdef-915f21949829	1	Other	Other
+98d81e58-75a2-46a3-8632-b477afddc9ed	1	Other	Other
+98d96897-0bc9-43dd-8765-b4328fe6a713	1	Other	Other
+98d9c3b3-78e7-4294-bbc5-68d4fea10abc	1	Other	Other
+98d9e514-f2c7-40f8-917d-2724003f66e5	1	Other	Other
+98da95c0-a98c-4592-b3d1-d783d159385d	1	Other	Other
+98daf18c-0611-457d-9189-8b4b7aca5f26	1	Other	Other
+98db4870-98d5-43dc-a2f8-6104bb5b957f	1	Other	Other
+98db4b76-dd92-4bbc-bcee-7d3ed5ec4ddf	1	Other	Other
+98db4bc3-ca46-4545-9e80-12f3669bfdd0	1	Other	Other
+98db4d54-f6d2-48ad-a6b5-0076a9d6ceff	1	Other	Other
+98db8d5d-a619-4625-8583-63bf4be86251	1	Other	Other
+98dbf61e-fdde-43ef-9484-1429eb4e7d58	1	Other	Other
+98dc1fc3-a610-49a2-9075-fd0ed3be9a74	1	\N	Other
+98dc4422-d3de-4a00-8f76-6594dac6c5b9	1	Other	Other
+98dc8291-05d5-4a07-aba3-30c65d0378ea	1	Other	Other
+98dc9371-9bc1-4844-b955-a986ec298985	1	Other	Other
+98dc9429-6f59-4535-934d-43eb02d955a8	1	Other	Other
+98dd2775-5650-4cbc-bc98-e720c89b4d1b	1	Other	Other
+98dd2b0c-6109-4baa-ade9-ea3a781794d2	1	\N	Other
+98dd44a2-207b-4fc0-94e0-63aad98ab67e	1	Other	Other
+98dd4c73-4c9c-4f42-878b-163014fd75bd	1	Other	Other
+98dd7fb7-8bc8-441a-bb48-1401b35fa1c0	1	Other	Other
+98dd8116-2230-41a3-8363-4885564a996d	1	Other	Other
+98dd8fd5-c7b0-4179-9429-27c5a39be008	1	Other	Other
+98ddab91-fd7a-43e4-b898-3fed9b0e1971	1	Other	Other
+98ddb14a-cbe2-458f-b488-2dc9ceb3d4a0	1	Other	Other
+98ddd00c-9720-4db6-b527-0783939a9889	1	Other	Other
+98de0463-ace8-45dd-b3a2-664647638913	1	Other	Other
+98de3f51-9e13-40fe-83b8-e2c8c1d04ff2	1	Other	Other
+98de5b72-5214-4a23-9900-be91fbcbc6e7	1	Other	Other
+98de8cde-ac53-49aa-9349-c7af267b82b5	1	Other	Other
+98dee565-ed95-47c5-a9ba-6679d92b4090	1	Other	Other
+98dee6ad-3ad3-4a61-91ba-b425facd122d	1	Other	Other
+98deff04-d09e-44dc-ab6c-4d026d221947	1	Other	Other
+98df22e0-7e8b-433c-a10a-65bcc2db5521	1	Other	Other
+98df9b7c-40e2-43a8-afff-52e87990f694	1	Other	Other
+98df9fa6-95c5-4297-b322-4dd76abcbffe	1	Other	Other
+98e06d11-bc34-4f6e-8707-267e59b24ff1	1	Other	Other
+98e097d1-bc3b-46d0-98c8-25247a437bf1	1	Other	Other
+98e0b02b-781e-493e-a897-a9ecd4b3f10b	1	Other	Other
+98e0f024-219d-4469-a475-1655bc2347bc	1	Other	Other
+98e13a37-7cc0-4cda-be6e-850abedd6903	1	Other	Other
+98e1a88f-307e-4589-9205-0a54224f5c05	1	Other	Other
+98e1b6c2-4370-470d-82ef-09f3527fe95a	1	Other	Other
+98e1bcd2-4112-464c-942a-99915a1e8022	1	Other	Other
+98e1d389-3752-4370-9f33-3d61370f2451	1	Other	Other
+98e207e5-1684-48ce-81d5-efc28f7f1a9e	1	\N	Other
+98e24113-319a-429e-bf3a-2e81346b9a5f	1	Other	Other
+98e25203-d244-4864-910e-ccf29175bff0	1	Other	Other
+98e2620d-1548-48bb-9fa8-faa280425c7c	1	\N	Other
+98e285ec-0672-4097-9db2-30f7ba2f782e	1	Other	Other
+98e2c8cb-0d02-4439-91b7-d7b0894d6bc5	1	Other	Other
+98e2e3b0-3397-4bf8-87c4-1df45cd863c4	1	James	Other
+98e36de6-37ea-4bba-95c5-5c8a7a648542	1	Other	Other
+98e397d3-762f-4dbd-9e81-42f608d42598	1	\N	Other
+98e3aa87-4fbd-4e25-87b8-b3a078f091f5	1	Other	Other
+98e4739c-f83e-46b6-8d71-7922ae21b907	1	Other	Other
+98e4c57b-4120-43d4-8dd1-b254ca3c1dad	1	Other	Other
+98e4d18d-abce-4639-9a69-f0e7702a0af1	1	Other	Other
+98e5370b-bc72-4c64-b0c3-7b8410e53d36	1	Other	Other
+98e53ca1-55db-4eb3-bbad-57d05b10bb82	1	Other	Other
+98e5599b-4ffa-4ea9-8a3e-059686bae3f2	1	Other	Other
+98e5956f-803f-47df-849a-644bc573f727	1	Other	Other
+98e5b176-d429-4580-97ff-5aefb4317a98	1	Other	Other
+98e5b2f5-3a6e-49b0-ab71-a50a543cb41f	1	Other	Other
+98e69250-f926-442a-b936-20384dca23e4	1	Other	Other
+98e6a02b-a117-41cb-81a5-9674db16b89f	1	\N	Other
+98e6a959-d8c2-4455-9b21-ad3ee2d04b8d	1	Other	Other
+98e6e411-6422-402b-8660-328b9f7a3d82	1	Other	Other
+98e701c3-8967-4bc1-87e8-e57ba2640dd4	1	Other	Other
+98e70e17-d52d-444c-b7df-f89be9d12735	1	Other	Other
+98e71d17-8667-42a1-b017-d8f6c8ad5328	1	Other	Other
+98e76f49-c3ef-4978-ba32-fd0c74f3af1d	1	Other	Other
+98e7b6b4-67b6-43ab-950b-8cd9ebf8a55a	1	Other	Other
+98e7d5f4-9f2e-4447-b897-4194b579d2a9	1	Other	Other
+98e7eca1-7d82-41fe-94bf-87f3ef46d02e	1	Other	Other
+98e83dea-317a-43b1-89b0-dab54e970385	1	Other	Other
+98e853c6-c43f-445d-9576-bb30ee8ee66b	1	Other	Other
+98e865e9-ee8e-400a-a5cd-aed3f9440a19	1	Other	Other
+98e8bbb7-cb4c-44fa-817e-63c58acb1dd1	1	Other	Other
+98e8d522-59aa-405f-9843-5be78fe84140	1	Other	Other
+98e8f977-2e1d-4049-ab8c-9be61036b63b	1	Other	Other
+98e90da5-b819-46bb-8281-ce95352c3711	1	Other	Other
+98e91982-35ce-4bd8-bca0-0341ab960461	1	Other	Other
+98e9722a-bc0a-49f9-86e6-50b7fa115a25	1	Other	Other
+98e973de-04d3-44c5-889d-5f6911516389	1	Other	Other
+98e9808d-7d85-41af-bec0-2fc28b4e7441	1	James	Other
+98e984dc-0a09-494f-b1a0-4131bc5c9aa4	1	Other	Other
+98e98caf-05b1-40e9-83a8-a9a91e18d878	1	Other	Other
+98e9a7a8-f17f-41ec-81dc-0ddf8b38ff07	1	Other	Other
+98e9c6df-5606-4e22-abd9-b80686b5a572	1	\N	Other
+98e9cd15-8204-4b2a-af37-d950c851faee	1	Other	Other
+98e9ee67-b8d5-4697-bc91-ee225f6df339	1	\N	Other
+98ea369d-19c3-4f75-b71d-4327abeec7a9	1	Other	Other
+98ea40bd-7517-4166-966f-537600b18a17	1	Other	Other
+98ea98b2-472d-475d-8b19-5688c52b8332	1	Other	Other
+98eaf0c4-8207-4ca1-98bc-4577e8da401f	1	Other	Other
+98eb123d-19c5-4d73-b595-919176fd7167	1	Other	Other
+98eb1ba0-5330-4f96-bbe9-34435c73119a	1	Other	Other
+98eb4840-eb15-4f9a-8651-b0cdec143a87	1	Other	Other
+98eb764f-5425-4fb1-9558-a34334301a7a	1	Other	Other
+98eb8be5-09bf-4465-8d12-fc8a9558d5c8	1	Other	Other
+98eb8d6d-a90f-441b-9299-ce4af02ac83b	1	Other	Other
+98eb8f3d-0a0a-45ff-9b5b-77fb77c46c32	1	Other	Other
+98ebb123-9e95-44f7-9991-6ab52b12220b	1	Other	Other
+98ec1d88-1434-4744-9555-182b95391cb5	1	Other	Other
+98ec323f-41fc-4500-9ae3-4fdcbfabf382	1	Other	Other
+98ec342c-b246-45b3-9a74-519af6e71b26	1	Other	Other
+98ec3a60-cfd5-4e66-a814-43b3c9f66f58	1	Other	Other
+98ec45c3-a7b0-4efa-af89-28a4e00a6749	1	Other	Other
+98ec6506-7ae0-48a8-bfdb-c761a952d169	1	Other	Other
+98ecafff-27c7-4d24-bd75-7aa0b86163d7	1	Other	Other
+98ecd269-6faf-4a9f-b076-b0d42799570b	1	Other	Other
+98ecfb2f-c616-41d9-a934-11af279aca3c	1	\N	Other
+98ed0e94-0714-4f6d-85f2-8cc05912f7e5	1	Other	Other
+98ed148d-a35e-4840-b838-23f0226d4767	1	Other	Other
+98ed5174-47ae-4102-a086-80f675081c8b	1	Other	Other
+98ee24a2-3b39-4c35-9638-1211c8620a8e	1	Other	Other
+98ee28a1-c4ee-4fd4-b34e-8b0f3f213186	1	Other	Other
+98ee6364-b1cd-4f4b-a68b-a72d73373278	1	Other	Other
+98ee8814-59d8-4072-aa23-05d5728efe88	1	Other	Other
+98ee9b50-b3d4-4546-8873-b3517ddbd051	1	Other	Other
+98eea55b-ad94-4101-a63c-cbe44138bc9d	1	Other	Other
+98eeb229-3a11-4574-a260-1a360fedf625	1	Other	Other
+98eed68c-c432-47c9-a93f-b16248f2759a	1	Other	Other
+98ef53e8-6cba-4c1b-88c5-1ca255554f0b	1	Other	Other
+98efb5d5-7b92-4702-b4f8-3718d5095f4f	1	Other	Other
+98efe965-1de2-42a7-a88e-e8f4fe805c46	1	Other	Other
+98f00b76-6804-4344-bea0-2faebc02c246	1	Other	Other
+98f03e57-f684-4de0-882e-98a427d84855	1	James	Other
+98f050b0-a4d2-492d-badf-f6ad79ca1376	1	Other	Other
+98f05245-e483-42e3-9ce9-6d56797ef9ef	1	Other	Other
+98f0614e-a577-4c26-928c-08e02f7d4806	1	Other	Other
+98f07971-067f-49b2-a711-75aab5eb3ef3	1	Other	Other
+98f07ff6-fabb-49e9-95a6-84a07e6a210d	1	Other	Other
+98f0a692-0cdf-42cc-aef9-a98d02ef7a3b	1	Other	Other
+98f10218-1a42-4cb9-a976-e6d0cc08f05f	1	Other	Other
+98f11fed-be02-4737-8810-035591d88dd8	1	Other	Other
+98f146cd-b95a-4636-9d0e-34ab8b574f86	1	James	Other
+98f19189-67ab-4c31-9886-8f648ac3b7b4	1	Other	Other
+98f273fc-5ce2-4381-b82a-1a80d7008e6a	1	Other	Other
+98f2938b-17b7-46af-ba42-10c373bfe0c3	1	Other	Other
+98f2e141-d66f-4990-8250-f48eafb86645	1	Other	Other
+98f33dc9-8a40-4e1e-a627-d1091b59cd48	1	Other	Other
+98f35aad-6c41-4871-ae0f-fa09933b0e42	1	Other	Other
+98f44ed2-ace2-43d7-a6df-f5df1d3b2190	1	Other	Other
+98f45246-14d1-4a80-8b74-705550047743	1	Other	Other
+98f4854a-1691-4ae7-9496-a5d58c8f9154	1	Other	Other
+98f4a879-b22d-4e87-b509-75ded39ed569	1	Other	Other
+98f4be14-f532-4208-ba98-a7574aaecbb6	1	Other	Other
+98f4dba2-f399-4b2f-bb69-5948ad6483c6	1	Other	Other
+98f4de73-751b-420e-b12e-7682828e8162	1	Other	Other
+98f4e614-5b04-4388-b16d-447d558ad4b2	1	Other	Other
+98f4fef6-8225-4671-ab0e-e9df24368992	1	Other	Other
+98f511e2-b488-4707-8dd0-430d06edacbf	1	Other	Other
+98f51422-1aa0-4ab0-a177-38df0e3ce850	1	Other	Other
+98f53e63-3f20-462c-8d59-1725922b0f79	1	Other	Other
+98f568d7-4b9f-44f7-82e7-1a089cb944f2	1	Other	Other
+98f59aaa-f887-4914-85f1-c5071b9754f7	1	Other	Other
+98f5cb2e-235f-45e7-884f-25a57932d61a	1	Other	Other
+98f5f2e2-90d7-4afe-bad8-f7417c27faba	1	Other	Other
+98f6b716-ae3f-4fd2-8844-35de92b0dbcd	1	Other	Other
+98f6c8f5-9e88-4c6f-9600-2582c6faaa3f	1	\N	Other
+98f72ba3-19f9-498f-b8bb-ff907225be37	1	Other	Other
+98f79c55-9ec3-4b19-babd-6869ad6b6642	1	Other	Other
+98f7b46c-3aaf-44e7-bef7-2cfa7adb5652	1	Other	Other
+98f7d7bf-3938-4bf5-9ac7-56c2755ff08e	1	Other	Other
+98f7f9a3-b904-4582-afb7-c54f49c23cb4	1	\N	Other
+98f8171d-6c0c-4c51-a57d-30aa83eb14e4	1	Other	Other
+98f90a48-bb55-470d-8baf-abad56daa594	1	Other	Other
+98f93805-e5d1-4c9b-9d7a-ca30c98dd040	1	Other	Other
+98f9851a-0968-4233-8d82-4c0ebca98dae	1	Other	Other
+98f98d50-ac7d-4855-95a5-a8d093ca3394	1	Other	Other
+98f9a2d8-553e-4043-b552-845cfa2cf0a4	1	Other	Other
+98f9f82a-85c9-49f1-b481-25a6e60c034c	1	Other	Other
+98fa0534-0b3f-4310-961f-f3d6c5b18f6d	1	Other	Other
+98fa1dff-f4ed-4fc9-8ae3-7d1dd34aa19b	1	Other	Other
+98fa41ff-0037-4048-aace-4f5c4cbe800b	1	Other	Other
+98fa4e63-08a3-4010-9b8f-6bb32b080de7	1	Other	Other
+98facf22-2d47-43ae-b4d1-3cc337acaf4b	1	Other	Other
+98fb4ca7-6cf5-4670-952e-f2f264c24612	1	Other	Other
+98fb9f7e-55b5-4b24-94f8-751c50898ba9	1	Other	Other
+98fbd411-244f-4245-a820-a101ea7ea97d	1	Other	Other
+98fbeeab-f327-4f03-8942-853d143039d4	1	Other	Other
+98fc7b52-9456-4039-8956-d7546746d06a	1	Other	Other
+98fc7c65-3731-4e17-a938-0eebdba357c8	1	Other	Other
+98fca9e7-3095-44ec-97dd-a6e660a12d3d	1	Other	Other
+98fcc577-c318-4c4a-95e5-739457052117	1	Other	Other
+98fcdae3-d8cb-488a-b801-b3d7958924d6	1	Other	Other
+98fd38e3-dce9-4ace-9606-e42c1d47dfe6	1	Other	Other
+98fd4905-2e09-4f77-8cae-93983fe38c07	1	Other	Other
+98fdfb27-0b04-44d8-a755-3aa3fd568506	1	Other	Other
+98fe2680-ff08-4ecd-ab95-b08be1dee484	1	Other	Other
+98fe5e50-aec1-4f78-88f8-5d82f7deae34	1	Other	Other
+98fee0b9-c356-4492-8175-d15a09b32d98	1	Other	Other
+98ff057d-87fe-4a14-afe4-aafec509ed06	1	Other	Other
+98ff2e64-a8fa-4d11-a146-0401a0b9c3f2	1	Other	Other
+98ff34f6-290a-413e-bc92-d584e7abc488	1	Other	Other
+98ff85a6-a933-47ea-8f1e-fef8b47ecb17	1	Other	Other
+99003977-fac3-4de8-a792-e1bde44b3c19	1	Other	Other
+99004bf1-35b3-44fe-a9ac-ea647778d39f	1	James	Other
+99007794-34f7-466b-9382-b8cd6a9ec968	1	Other	Other
+9900907d-0e4d-4311-ac76-4f7056ff9168	1	Other	Other
+9900a40e-1f2f-42d4-a1b8-02654cd8a5b8	1	Other	Other
+99019046-3ae8-4a3c-8bf0-fed9f019ff1a	1	Other	Other
+9901ecf3-b8eb-43bd-bc33-a99ef7c2e3c2	1	Other	Other
+99021897-c066-4322-a312-1a1d03dd3c9f	1	Other	Other
+99022c35-73eb-44f6-bec6-58fad304dcc7	1	Other	Other
+9902867c-37d8-4243-9a3b-601304f544f2	1	Other	Other
+9902882c-bc45-443c-a5fa-3a3a15997d8b	1	Other	Other
+9902b5b2-9e35-4c1f-9898-0ca76ad01718	1	Other	Other
+9902d7e5-9e25-40cd-9988-4bcae1fc0f90	1	Other	Other
+9902e056-2340-4b9d-86cc-eaaafa42a923	1	Other	Other
+990349d1-9453-453b-89b5-c53dfbd3c52e	1	Other	Other
+99039e05-5b38-4a5b-baa8-7dd42ae2bb39	1	Other	Other
+9903c714-2ff5-46a9-af12-2396d5d81fa9	1	Other	Other
+9903d3d3-3fc2-418a-b129-58365b0ab292	1	Other	Other
+9903e486-9cfb-4cad-8b9f-96a5da247046	1	Other	Other
+9903e5b7-c58c-4d23-a00e-91e8b9f96618	1	Other	Other
+9903fa57-71b8-462e-a0b1-899ed62c5a71	1	Other	Other
+99040d9d-c2db-488c-8475-24b1c583d5f7	1	Other	Other
+9904117c-0963-4c87-986d-d6ebdf9bb1ca	1	\N	Other
+9904502b-bdf9-4c42-8c19-b97f23e39f53	1	Other	Other
+9904d79d-629a-41ec-9d9d-b4bdde5adbfd	1	Other	Other
+99051bd0-58b4-48a6-ac47-c49b66cd3b49	1	Other	Other
+99052379-70e4-4406-b802-6f10f75ecbd9	1	Other	Other
+99052a09-09fc-4703-b49a-7ec31b0cc3c5	1	Other	Other
+99055944-842f-4346-a612-a2dcd2b1072c	1	Other	Other
+9905648d-6c04-4800-ba3d-83b14ac139b4	1	Other	Other
+99064dca-8a29-4a87-8878-0c34c2f51818	1	Other	Other
+99067d18-277f-4097-8378-ea76aac9948b	1	Other	Other
+9906e196-315d-41a6-84a1-3ba22f1ab525	1	Other	Other
+9906e625-f92e-4847-9df3-121677618f60	1	Other	Other
+99075728-8666-4220-b460-7fd0b077eae6	1	Other	Other
+99075d97-9c81-4c10-90ca-f4711ec56e39	1	Other	Other
+990763dc-f057-4228-af7e-b28c537cb3d5	1	Other	Other
+99079314-f5b2-4502-9920-1c96b1ba0024	1	Other	Other
+99079597-b71b-49eb-a1cb-f02f13b6b4cb	1	Other	Other
+9907c646-ca0d-414d-94fb-eecf3ab32f62	1	Other	Other
+9907d1c3-89c7-489b-8999-9e120c8f7719	1	\N	Other
+9907e193-7e1e-4289-a049-b4632054e5d3	1	Other	Other
+99080576-0f7d-4f25-aee0-9aa7df9e8567	1	Other	Other
+99083785-5acd-4a91-bb18-c9b628424a98	1	Other	Other
+99091c61-5d28-40cd-b384-421903d63c0f	1	Other	Other
+99091eba-8d03-4607-8db3-a30a2e4a97dd	1	Other	Other
+99094e0c-8ab0-4bd8-bdab-5171b0abf07a	1	Other	Other
+99096ad9-9c2a-4188-8181-78359ee9e2ae	1	Other	Other
+9909bfb9-c974-4077-8e68-5c49d11046dd	1	Other	Other
+9909e5f1-9327-4918-b2a8-5304a83be2a4	1	Other	Other
+990a2483-c71f-471f-bfb1-39330eb851a1	1	Other	Other
+990a343b-69d5-4804-b9d1-d874aff28854	1	Other	Other
+990a3cfb-b269-44a4-b8b1-ff4187964274	1	Other	Other
+990aa453-f730-487f-b03c-5d03658d3b27	1	Other	Other
+990ab9bf-a224-46a4-9003-768badd70f15	1	Other	Other
+990b2224-3ca8-4447-a7e9-fc426044a315	1	Other	Other
+990b60e7-41be-41cc-ad55-1ad209e295f9	1	Other	Other
+990b7d9d-56f0-41bb-a8e9-e61c94d16d69	1	Other	Other
+990b7e89-a846-450e-80ae-9e9cf9eb1395	1	Other	Other
+990b84e9-eab5-48d2-b7b4-7759a1ba3789	1	\N	Other
+990bbee0-e140-4163-95eb-b971d282b04c	1	Other	Other
+990bde55-c198-4f2a-be52-2d0edb47a014	1	Other	Other
+990bff56-23c8-482b-8951-d0ac795d662c	1	Other	Other
+990c0755-3e8f-4563-8bb3-07c5d94beb22	1	Other	Other
+990c128e-c9f9-41ce-8f14-5c551ebbb962	1	Other	Other
+990c1bb0-a6ae-49f9-8954-7f9163e6c75a	1	Other	Other
+990c383f-5479-4b96-ac9d-777db9137693	1	Other	Other
+990c4061-e02c-41ea-ae60-9b8d84369491	1	Other	Other
+990c49a6-320b-4851-89fa-5d7c4d78cd69	1	Other	Other
+990c5d2d-194c-4604-8c37-1e62613274b3	1	Other	Other
+990c64f6-c26c-4a24-8f76-f2937e8bd947	1	Other	Other
+990c7225-ac43-48f0-be23-dc1d8acd5e75	1	Other	Other
+990c7cae-5b9d-4348-8933-34794ac847b6	1	Other	Other
+990c8218-9c5e-4b20-9003-d292327a9c7d	1	Other	Other
+990cc7f1-2e9d-4c3e-89d6-2222f127bbbe	1	Other	Other
+990ce72b-4935-456d-ab3d-a76f229bb7bb	1	Other	Other
+990cfba8-b72a-405f-8777-b0b98d74c2dd	1	Other	Other
+990d2163-f626-4ca9-a480-98ab85c95aba	1	\N	Other
+990d7509-3b87-419b-912f-e9a389e06154	1	Other	Other
+990da9e9-dc48-47a9-9027-da26382a48b4	1	Other	Other
+990debbc-624b-4b30-8eef-74d34fb6304f	1	Other	Other
+990df2ed-90f2-4cef-8419-7fb9d0edd131	1	Other	Other
+990e0611-9608-4de1-b8b0-e0609a9844db	1	Other	Other
+990e1064-16c5-4f00-8d86-0e05a52fac33	1	Other	Other
+990e344f-3661-4f31-822c-39104a0c4de2	1	Other	Other
+990e3a92-c836-47a4-97a9-9e03d4140a32	1	Other	Other
+990f343e-47d4-4fce-baea-3adca15caf33	1	James	Other
+990f351f-65c5-49e4-bdd2-61c38d4e80b4	1	Other	Other
+990f3cd7-ca5f-4a20-9542-cd718a49be5c	1	Other	Other
+990f54f4-812b-4122-99bd-3d533cfeb509	1	Other	Other
+990f59ba-06a8-496f-b782-f3deeb55d5d6	1	Other	Other
+990fb227-317d-4c55-b822-5d1d3ff635b5	1	Other	Other
+990fc603-4516-4768-93f4-3c0ddee4ebf1	1	Other	Other
+991027e4-bafc-4471-ab2e-b7a088a66d62	1	Other	Other
+99103d25-47d5-4060-8d3c-2ad42aa22188	1	Other	Other
+99105fc6-a855-4f20-b193-eb0e2c727524	1	Other	Other
+991077a2-9bc8-4e40-bbeb-335b53dc7bbe	1	Other	Other
+99108f8c-24bd-49e6-a6a2-95fa347caa42	1	Other	Other
+9910963b-15ab-4764-8d0c-7b22b22126a5	1	Other	Other
+9910a3bf-acb4-423e-bbe9-425774ba2276	1	Other	Other
+9910b042-04af-4e89-b29d-14cb405b1c2d	1	Other	Other
+991128ac-5ea9-4bc8-a7b5-e9b797514393	1	Other	Other
+991134e9-c578-4f4b-8c53-81f917abe28d	1	Other	Other
+99113fa5-7002-4a44-bffc-9fc662f2c2ed	1	Other	Other
+991144ec-3e40-478a-9d73-0fa833787bb3	1	Other	Other
+9911671f-a7be-47c4-b4d6-9ef9cbd8f5a3	1	Other	Other
+9911a3b4-c19e-482f-b303-4ea23d993c3d	1	Other	Other
+9911f80c-2ac8-4678-a3cc-be6be01cdda5	1	Other	Other
+9912084b-a59d-4095-a54f-863e64419bbc	1	Other	Other
+99122e91-e1f4-4ffc-b2f0-5f8e313f5838	1	Other	Other
+991246a0-c555-4a7c-addb-fba79f3348b0	1	\N	Other
+9912573f-148f-4345-95b2-2792d3aa5d9d	1	Other	Other
+99127be1-1c46-4edd-a678-c3a900d58b20	1	Other	Other
+9912b1a3-fb0d-43db-9ad0-d1da658dff7e	1	Other	Other
+991302e5-b29c-4632-bc89-b6b50542fa9f	1	Other	Other
+99136a25-bf2d-4f51-af43-fd5e599582a6	1	Other	Other
+991379d4-d4bd-4f92-830e-fd553f7b9196	1	Other	Other
+99137c85-fd97-47a8-b293-a605a346d4e3	1	Other	Other
+99139130-bc8d-4bd4-af54-e6531aab7f81	1	\N	Other
+99139f1d-afa2-4b18-b7e0-30e23fa1d975	1	Other	Other
+9913a28a-9969-436c-8bc6-f72f57361689	1	Other	Other
+9913cc9b-7f00-46cd-bac3-c54edff57f32	1	Other	Other
+9913cf38-fadd-43d2-851f-156d3c220613	1	Other	Other
+99143125-1aea-4272-a0d1-c4385005531f	1	Other	Other
+991463ee-26f2-4297-9355-708a74bab89d	1	James	Other
+99147991-c815-4428-aa7a-3cc08f13e13b	1	Other	Other
+9914d70a-b330-442a-a55d-e4bba84cfc5b	1	Other	Other
+9914e429-cd5c-4da4-a965-f1a4d2026285	1	Other	Other
+99150b40-74fb-4965-bc6f-3bc2b717a5f3	1	Other	Other
+99152270-eded-4b06-90f2-d2dc529c9e49	1	Other	Other
+99154aee-ad9d-40a5-8fc9-8403a45d1393	1	Other	Other
+9915a6b1-429d-4c74-af95-b9169fda956f	1	Other	Other
+9915a81d-45c9-4aae-bde0-952064913499	1	Other	Other
+9915a81f-61f8-40ae-b493-588a5a347f2c	1	James	Other
+9915b256-9c6f-4b76-930d-abd2e2feb253	1	Other	Other
+99160f0a-1c4a-4073-8976-b140e128d201	1	Other	Other
+99161403-773f-47ac-9da8-64777979678b	1	Other	Other
+99162219-bcbb-4063-baaa-6425feb596a3	1	James	Other
+991660a1-ceb4-45db-b00e-46007d769451	1	Other	Other
+9916cac4-571a-4905-b8c5-d8950c194486	1	Other	Other
+99172578-7f3f-4c32-802c-b0e06950e2d5	1	Other	Other
+991726f0-b98d-478f-94b5-dac99dd6ba54	1	Other	Other
+99173009-7ef5-4950-8390-633de9360071	1	Other	Other
+99174264-ae59-487a-92a6-4388bf52f013	1	Other	Other
+991798af-79d3-43b3-9ce3-78f763b6bc82	1	Other	Other
+9917ddc3-efd0-4fa2-a63a-e8fb743f6728	1	Other	Other
+991815c6-e253-4e40-bc81-a0a25b61bea3	1	Other	Other
+99182c49-04b1-48ee-b4cc-5e9e5ff897f2	1	Other	Other
+99185897-341f-4495-8dd5-9f1a34800f74	1	Other	Other
+991867af-7bd8-4e52-81e1-365308d93b29	1	Other	Other
+9918ca9f-3dd4-49f6-a9b4-10a9111cc0bc	1	Other	Other
+9918d4f2-5d73-44be-a1b6-d0abd2feade0	1	Other	Other
+99191fbf-f643-45e3-9e5c-a7e99cfb06fa	1	Other	Other
+99192099-522b-4479-9cd2-e6ee88f62fe7	1	Other	Other
+9919304c-5fe5-4139-8b5f-737742c5aab0	1	Other	Other
+991963b8-af09-4036-9c0e-78846b3a1127	1	Other	Other
+99198462-22df-4d25-b3ca-424aa4970793	1	Other	Other
+991a0c3c-5544-467d-9ce4-f9e3443a3553	1	Other	Other
+991a3076-b592-4ba0-87a1-df1e6c0cc6fb	1	Other	Other
+991aa20f-1602-4491-a3ae-8fee5f4bc99d	1	Other	Other
+991aa39d-9eb4-4d9c-8600-9b92f0671d1e	1	Other	Other
+991ac71f-49e4-431f-9764-e86f4bd0883d	1	Other	Other
+991b07bb-fdfa-4c8c-b283-e096a0d56409	1	Other	Other
+991b1dc8-c1ee-470d-8933-d702c2b7da81	1	Other	Other
+991b2595-fb80-444b-87ff-d0a113555e15	1	Other	Other
+991b890d-1301-4157-992f-b7620a39d97c	1	Other	Other
+991be35e-d8ec-11e7-a9da-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	Other	Other
+991be601-7749-4966-8dc9-a4b3228a9060	1	Other	Other
+991c36aa-54d6-4434-a272-d30bf99406a2	1	Other	Other
+991c3ff4-a02b-4234-9c31-3571d70234c9	1	James	Other
+991c6d18-682a-4c12-af23-196156ca34d4	1	Other	Other
+991cb29c-1573-4c09-853b-5887bb393a28	1	Other	Other
+991cb78a-5fa1-46ad-a9af-107075db0ca5	1	Other	Other
+991cd09e-c38a-49ab-b27b-fee0fb4ce15b	1	Other	Other
+991cdfb3-4bcc-4bda-b6c9-f731193e3c54	1	Other	Other
+991cf44c-70d6-4635-9ab5-75a02741f041	1	Other	Other
+991d85b7-4feb-432f-8dc3-3684e7fa6578	1	Other	Other
+991dd457-7d1b-41ae-8db2-674ff71dcf5a	1	Other	Other
+991dde14-014b-468d-af07-8aeff70ece78	1	Other	Other
+991df66d-a341-4d82-ae37-441a480ecaec	1	Other	Other
+991e0fab-6b7a-4c77-b3ee-dae8c2a549cb	1	Other	Other
+991e4788-5b94-4564-b5c7-10e8e6ad78c0	1	Other	Other
+991e4d01-03aa-474c-a555-bb3edf373538	1	Other	Other
+991e5f84-d307-4b3d-8150-8492a2e79fed	1	Other	Other
+991e7241-3f72-4551-94cb-0d98ffd036ce	1	Other	Other
+991e812c-554b-49a6-b98e-74929b346384	1	Other	Other
+991ebde2-acee-4ba7-a348-52d9d255167b	1	Other	Other
+991ed5cf-c556-45a4-92d5-5baee37b8626	1	Other	Other
+991ee3ad-8f1f-4ed9-a7cc-e44a7b441624	1	\N	Other
+991f2b15-cf32-4894-ba43-52a6606f1125	1	Other	Other
+991f4c3a-9328-4c90-b8dc-f7931a64b387	1	Other	Other
+991f697f-1694-4016-8581-14c278a09700	1	Other	Other
+991f9696-0f85-4580-88e1-67b125da6b19	1	Other	Other
+991f97f4-fdcc-464d-9467-ee3f74c1c34a	1	Other	Other
+99201a32-5a30-48aa-82e4-eade96c5cd16	1	Other	Other
+99202aaf-1793-49eb-8a66-ae0ef8a5cead	1	Other	Other
+99203696-9c1e-46fb-b49f-684acb546f42	1	Other	Other
+992055e9-621f-4952-a40b-6200a8932bee	1	Other	Other
+99205d62-7722-495a-a510-323356d75e01	1	Other	Other
+99205d6a-3298-4893-915c-4e2f273a0713	1	Other	Other
+992085fb-af22-4c8c-9bb6-99db6a897ced	1	Other	Other
+99208c67-e5a5-4b78-b02f-0bb3fe77566a	1	\N	Other
+9920d1cf-7c94-4a0a-8940-1cd2462a536d	1	Other	Other
+992115b8-8d5d-4372-b276-d3908075e8e8	1	Other	Other
+99212024-9d3d-4265-b641-076e03d9707c	1	Other	Other
+992120fe-6624-4004-8840-5923cd72410b	1	\N	Other
+992133af-f6a8-4bf2-9559-dcc21bf96b5c	1	Other	Other
+992157a8-4e08-4424-be53-12cb294ecc5b	1	Other	Other
+9921796d-93bd-4364-927b-c20303a3f213	1	Other	Other
+99218827-f3af-440b-85e2-082101822c83	1	Other	Other
+99219424-6227-4f5c-a629-41813de8bc41	1	Other	Other
+9921ba45-7418-4c48-8fbb-7fc291850921	1	Other	Other
+9921cd51-d8b7-44b7-ad23-ce8e066a2fa7	1	Other	Other
+9922272c-7234-4705-92ee-8c4a24ee1723	1	Other	Other
+99222d4e-c653-483f-914f-7ea68cdae720	1	Other	Other
+99229be2-211f-46cc-b764-b723fe530580	1	\N	Other
+9922ff1d-caa0-44da-9550-663be5b92df4	1	Other	Other
+9923151c-9d01-4b0b-a6a1-996fe80f5011	1	Other	Other
+99233b59-c40e-4f57-b7ec-f70a2fda643f	1	Other	Other
+99239df9-5f51-4057-8a21-4a0cf8b0da10	1	Other	Other
+9923a7de-d741-456f-ade2-9f98cb87c4f9	1	Other	Other
+9923abcd-c07e-4049-9361-2e5c4b2f003a	1	Other	Other
+9923b312-dcf7-4f8c-bf10-0986149d171c	1	Other	Other
+992438b1-e9ca-4006-b04f-5bfdecb594e2	1	Other	Other
+9924909e-0e5d-40f0-9274-b6fee3abc57a	1	Other	Other
+9924cb05-2c8f-43ad-ac0d-81a67b32c904	1	Other	Other
+99250007-fd41-4288-aae3-fedc0f8f91d1	1	Other	Other
+99250a0c-1cd7-419c-92a8-cff8e3f90dea	1	Other	Other
+99250f59-f346-495e-9467-dae44d5a37f0	1	Other	Other
+99254ccc-9d49-41ab-91e8-0788cdf2c537	1	Other	Other
+9925681f-4342-439d-b315-b2b869bb1cbe	1	Other	Other
+99258397-5d49-4162-806f-683493ee161c	1	Other	Other
+9925c9f9-46d1-4e7b-9ab2-3fe5a915b046	1	Other	Other
+9925e831-5110-4a34-af66-5de5aee05075	1	Other	Other
+99260ba9-a672-4853-8cfb-3ec1e3b1bbf3	1	Other	Other
+99261232-78ab-4634-bbf2-977dffd64234	1	\N	Other
+9926c721-5a94-4f48-a072-671e6c11bafc	1	Other	Other
+9926ec89-14d2-4191-838f-ade1433d91a8	1	Other	Other
+99271309-fc50-47bf-9636-f307494837ea	1	Other	Other
+992717e0-1760-4c01-baa1-e4121f761ed8	1	Other	Other
+9927374d-c142-487e-bcdf-5e7f145f321e	1	Other	Other
+9927c4ce-c25a-42bd-90ce-6ac9a150b096	1	Other	Other
+9927ece1-e9e2-489a-8927-c7b7425a551d	1	Other	Other
+99280c4c-d6b3-4f0b-871d-26ec24d982a2	1	Other	Other
+992812cb-9e33-4e8f-b63a-f802f0a96b72	1	Other	Other
+99289d73-b000-4ba5-971a-658c0aa023c8	1	Other	Other
+9928b823-8969-4eec-8e44-3ff9397b747e	1	Other	Other
+9928d97d-7559-4869-adb3-6d4d631afcc5	1	Other	Other
+99292002-0849-4199-b6bc-a8a6d209809f	1	Other	Other
+9929225a-90b3-4145-9711-bcf749cada61	1	Other	Other
+9929600f-ad7a-451b-9ffb-128d9ecef722	1	Other	Other
+99296ace-1f47-43a3-b19d-f40a70cec96a	1	Other	Other
+99297f5c-877b-4adf-84b7-09c4f264b3d2	1	Other	Other
+9929be87-07c7-45f4-bdbb-6959b34788c8	1	Other	Other
+992a381b-29ac-48b4-a106-11915a504f4a	1	Other	Other
+992a49c1-5384-477f-961f-c454913c37e6	1	Other	Other
+992a6ee6-721a-4517-bf2f-87bc11a6f81d	1	Other	Other
+992a8c27-a0d6-4b3b-be94-6077d31b76f4	1	Other	Other
+992b1cb0-5fc2-4711-aa48-fe3ad33fc5e6	1	Other	Other
+992b2bbd-a21d-4e64-8629-db26c8a0ebae	1	Other	Other
+992b2faa-91e2-4b7e-81ba-c2bbc8300d4f	1	Other	Other
+992beb35-bc93-4b6e-a2ed-65f23ebdf75b	1	Other	Other
+992c21d2-f4c6-402b-8bdf-bd6f3b5d0c02	1	Other	Other
+992c3728-64c8-42fc-8d66-3e3424f648e1	1	Other	Other
+992cf2be-b3a5-43d3-b837-360fafb17a42	1	Other	Other
+992d0e52-e96d-4804-a9c9-84e7ceec0fd8	1	Other	Other
+992d1f0f-bd70-48f8-9b30-fe0bbc91873d	1	Other	Other
+992d9264-e8a2-4530-a4ee-cab132519484	1	Other	Other
+992d9dc3-dc10-472f-8f58-0e54a1f49926	1	Other	Other
+992dd097-3632-4d18-8f8f-567fb991acd7	1	Other	Other
+992de0b2-c24a-4fe4-bce4-08c376d48e05	1	Other	Other
+992de6b5-3159-454a-90d7-7413a8dd5494	1	Other	Other
+992deec5-d951-42f9-897f-8fb8d4c29498	1	Other	Other
+992e41dc-9b2e-4d0f-a1b9-cbb08f36d555	1	Other	Other
+992e7b43-aab7-421c-97a4-f77f6140ac81	1	Other	Other
+992e829d-bcb8-4c55-ae01-81281a627165	1	Other	Other
+992e8860-bd83-4afd-95dd-537577c39639	1	Other	Other
+992eac20-7d84-4170-9cfd-a1b2adce9e82	1	Other	Other
+992f191f-baad-4cc2-a77a-4125fb79dd09	1	Other	Other
+992f2853-027a-42fc-94fd-351bd5ddb6fd	1	\N	Other
+992f3cf4-fe68-4957-bd53-f6d3b834aac3	1	Other	Other
+992f8777-3651-470c-873e-dadf212a4b7a	1	Other	Other
+993122f4-3871-4670-bf6a-b9968b5a1108	1	Other	Other
+99314570-2b13-48c0-a495-85353f817ae2	1	Other	Other
+99316e8d-176a-4920-908e-8dc1a267970d	1	Other	Other
+993182e4-e39f-4608-8ed6-ba7c566fb455	1	Other	Other
+9931be5d-106a-4657-99be-35c7f89a8d8c	1	Other	Other
+9931e460-ddec-4192-8b08-8c5d612dd1aa	1	Other	Other
+9931ecec-a8bf-4168-a80e-3f56dc786f22	1	Other	Other
+99320686-86c7-4124-9110-c3d3355802ab	1	Other	Other
+9932461a-ed51-4e32-baba-26f63b7c3038	1	Other	Other
+993248ce-88b8-4299-94ab-90ce07d5cb43	1	Other	Other
+99331803-b49f-4610-8f34-72a58c40023e	1	Other	Other
+993331bf-3c12-4351-a933-34f549411bea	1	Other	Other
+993340f3-4344-4a37-b95d-9497abc66fe9	1	Other	Other
+99335649-67ff-4709-ae37-7d6d969ca76d	1	Other	Other
+99338568-e778-463b-8a72-2101166ecc4d	1	Other	Other
+9933a849-b7c0-4043-92cb-220f9d7566be	1	Other	Other
+9933d888-0fd8-499d-81e3-2efde0521140	1	Other	Other
+993405f5-2c1c-46a7-b92d-70850cd4f554	1	Other	Other
+993418fb-5a0e-4660-81e7-1b2d4174ceea	1	Other	Other
+993420ac-1a3c-45bb-9153-65ea47de2663	1	Other	Other
+9934a425-894c-4fb4-9adb-679f63ecf348	1	Other	Other
+9934c8f4-0ba7-4462-ac89-df460f19657e	1	Other	Other
+9934e523-613e-425d-9827-4b5bbba62fdb	1	Other	Other
+9935042a-c22b-46a5-9f84-15375955036b	1	Other	Other
+9935126b-04b6-40d9-a0ea-f2e2c2032a85	1	Other	Other
+99357886-2eb2-46e4-916f-26b8d9dda69b	1	Other	Other
+99358c35-43e1-4e83-9f05-9d7014189b7a	1	Other	Other
+9935ef65-2645-4183-b50e-5538887ebbeb	1	Other	Other
+993617e1-80b2-4231-b236-248b2d502b80	1	Other	Other
+99367156-6325-4549-bce7-fcb700ef2663	1	Other	Other
+99367c84-d76b-4618-963d-8903b935d972	1	Other	Other
+9936b211-c22e-413e-8b57-e7cab08c6c05	1	Other	Other
+993714b2-158c-4e65-a386-747a632be638	1	Other	Other
+99378e6c-1e68-41b5-a098-7514065084fc	1	James	Other
+993809dd-3b0f-4916-9202-9763f1ffa46b	1	Other	Other
+99381673-2f0a-400f-86fb-f723302e778e	1	Other	Other
+99388fc7-e516-48ed-a3f0-334fbd2c0d8f	1	\N	Other
+9938cc69-82e6-4a33-9b2f-0b41f46c95cd	1	Other	Other
+99393207-60a5-4ce8-879b-b540aa4fda5d	1	Other	Other
+993951e2-9c72-46eb-9921-e36205305c05	1	Other	Other
+9939642e-f6bc-42e8-85d9-b1f2cceecc81	1	Other	Other
+9939c878-037a-4b6c-aa84-435507447089	1	Other	Other
+9939ecc0-ec48-4bf3-91d1-34732314caf9	1	Other	Other
+993a657d-4a4d-4734-a6fa-40a492794906	1	Other	Other
+993a6d2b-af2b-498b-bedf-d881eaf931e3	1	Other	Other
+993a72fd-e576-464b-8f8c-80a9291e56eb	1	Other	Other
+993a8b3b-0722-4c6e-8ee1-7e38a9804382	1	Other	Other
+993aa83d-0e1c-4bb9-a5a3-d22b685799ec	1	Other	Other
+993ac740-be00-4b60-8983-30cd5710ee47	1	Other	Other
+993ae796-24f5-4c21-b19d-a890a34d80ad	1	Other	Other
+993affb2-29e5-4a5a-afd6-c30e191c650d	1	Other	Other
+993bcd95-bd63-48ab-979d-a854d5ee7823	1	Other	Other
+993bd7e5-e6ae-4a61-9170-5142f651b116	1	Other	Other
+993be74c-e67e-4169-bbcf-ef992bcd72cc	1	Other	Other
+993c06ec-a262-49ba-8005-e87a9aa9bd12	1	Other	Other
+993c1bf0-8814-4ca0-97a6-74ab52060236	1	Other	Other
+993d493b-bba8-4121-ab08-6fd68c3f0920	1	Other	Other
+993dad09-59ce-4abf-b951-cbf330c2899a	1	Other	Other
+993dcfe4-da9c-41c8-b6cd-e2d3cdc5b17f	1	Other	Other
+993ddedd-b2e0-436a-b2be-d78e8b231291	1	Other	Other
+993e3263-2f75-43d2-bad2-9b8cba470edb	1	Other	Other
+993e40d3-0564-43b5-b0e0-7ebfd4f001e6	1	Other	Other
+993e4ca1-6607-4c6a-b430-66c23ac7f35b	1	Other	Other
+993e6f9d-906e-4592-9a39-875a2ea9bb8d	1	Other	Other
+993e9fcc-81e2-4a0f-9d5b-610641e69495	1	Other	Other
+993ef991-3a08-41b6-b8f5-4b1cbe809f68	1	Other	Other
+993f1e26-4f06-4d40-8e22-33261df9edd2	1	Other	Other
+993f2321-2175-4cb3-bf6b-39aa160683a2	1	Other	Other
+993f2642-46ae-40ed-ad03-9711ce1f8188	1	Other	Other
+993f2f91-b130-4ece-a366-966326423f66	1	Other	Other
+993f4e37-b5df-41f5-a25c-28b4370d6d27	1	Other	Other
+993f5fa0-b339-44d9-aacf-48ab782eb9aa	1	Other	Other
+993fd63f-0228-41dc-a8f3-59a79a8ca717	1	Other	Other
+993ff96a-07dc-4013-a8f6-13f893c9ccf6	1	Other	Other
+993ffe3d-304b-496f-a698-665e4b8b8a15	1	Other	Other
+9940a61f-3e30-4cd6-b3c2-8e42066b5ae9	1	Other	Other
+9941334d-7e40-44b9-b18c-3fd476da0d2a	1	Other	Other
+994183a0-76d5-4553-a923-fac3f416dbff	1	Other	Other
+99418b27-c1c9-4cc4-b44c-9baabf39717e	1	Other	Other
+9941aa87-d36a-4fbb-9d3f-29c314dc4be9	1	Other	Other
+9941b3b0-1239-4c64-ad28-9440808bb9db	1	Other	Other
+9941e10e-4ad5-40e9-a6d5-eba732a3d636	1	Other	Other
+9941eb35-7768-4dcd-aa6f-da36b974f9b4	1	Other	Other
+99421323-eb34-406e-870b-a766ad86f5c8	1	Other	Other
+9942592f-be83-4ce4-95b4-5156de5c4677	1	\N	Other
+99426a60-e95f-4255-ad7e-03a8958109cb	1	Other	Other
+9942716b-a974-4389-ab36-75c930c64b38	1	Other	Other
+9942a805-2288-41b1-8a43-1465837d31e8	1	Other	Other
+9942bfed-4118-4572-9300-102a6e2e6032	1	Other	Other
+99433ba7-4a83-4c2d-add4-f72d58141e43	1	\N	Other
+99434c8f-9b9c-440d-a5bb-ad2b7b5573a6	1	Other	Other
+994361cc-f4f0-4027-9e07-269cbd73e715	1	\N	Other
+9943ab0d-830a-43b6-b6f1-f0f81821fea5	1	Other	Other
+994439b2-1a43-43a1-9760-1566a69131e2	1	Other	Other
+99444e8b-e35d-4ce2-8d91-e7e58e662529	1	Other	Other
+994453f1-6727-4c22-b468-dacd0022ce4b	1	Other	Other
+9944ab4f-63b8-4a55-8491-6ac3b85e5628	1	Other	Other
+9944e9b2-d2e6-4523-b76c-8f961b4d7bf1	1	Other	Other
+9944f1ff-baac-45c6-b6a3-702f2847a707	1	Other	Other
+99451957-54fb-4085-8a7b-03a7ed7c7541	1	Other	Other
+994544ab-394e-4bb2-8703-0bf6e1b557c7	1	Other	Other
+9945532b-f50a-4c79-b88d-24e2250608e5	1	Other	Other
+994561f5-9b5a-4e39-aeb5-ea8319843cf2	1	Other	Other
+9945a5ed-47eb-496e-80fa-352dad93948f	1	Other	Other
+9945ab29-6a16-40e6-acae-4a161adad6ea	1	Other	Other
+9945d285-d9b7-426d-8cd5-a5b8468f6375	1	James	Other
+9945d49c-6adc-4cc9-b676-23bcd2163a14	1	Other	Other
+9945d70c-b0a7-439c-abdc-375d8c33781e	1	\N	Other
+994659c1-2d52-41e3-8d3e-5cffe028e735	1	Other	Other
+9946b138-45de-49e1-a7d1-4f81844099d7	1	Other	Other
+9946b17c-1f41-475a-a56c-ebbc16c4fdb5	1	Other	Other
+9946c1d0-73bf-4430-89b0-dd82ea1886bd	1	Other	Other
+99478627-136b-4909-bc28-12fbd2418043	1	Other	Other
+9947bf48-3772-468c-869e-ff62b5e0e420	1	Other	Other
+9947cf0c-92b9-48a4-8a50-9d55c0cc778e	1	Other	Other
+9947f9f5-2031-425f-84c6-ccd856c18172	1	Other	Other
+99481506-debc-4955-9860-5066608863c5	1	Other	Other
+9948346e-0997-460a-bd08-6536683bd2b9	1	Other	Other
+994841d7-476d-4466-b120-20eb6ab2385d	1	Other	Other
+994849fc-8605-458a-901b-a535371fd719	1	Other	Other
+99486cb0-21ad-4b45-9c0f-0d48310b297a	1	Other	Other
+994880fd-0775-46ad-bea2-2e5ebc5ef3da	1	Other	Other
+9948b507-8b3a-4342-a83b-71af58f22de4	1	Other	Other
+994916bc-6476-4a18-bfd5-c57fbfd3c09c	1	\N	Other
+994935e3-6933-4d88-907f-4feb14d5aef6	1	Other	Other
+994978e4-f22d-4379-a5df-348c041d743c	1	Other	Other
+9949a1e5-79cd-4a06-9163-7a6e67bc9d6f	1	Other	Other
+9949c115-a119-4645-b403-44a129b1bf17	1	Other	Other
+9949f635-f46b-4d92-81c7-289fada730a8	1	Other	Other
+9949f775-33fe-4b63-b7ad-0549c0da64f1	1	Other	Other
+994a07b7-fad4-444d-937e-5bb2e2cbc6c0	1	Other	Other
+994a1022-ab7f-4944-8225-956dcc8c58a1	1	Other	Other
+994a1386-93bc-4588-85c0-40f0503f7461	1	Other	Other
+994a18c8-15c0-46fd-88f6-c5b24bb96f16	1	Other	Other
+994a590d-51cf-41eb-9a6f-ac7961cae9b2	1	Other	Other
+994a6ced-e617-4db8-b331-15f0b57fd8a4	1	Other	Other
+994aeda1-34c3-4ec5-8709-2933655078a1	1	Other	Other
+994af496-eefd-4052-a200-6f33cb42b8a3	1	Other	Other
+994afa79-3abb-462e-88fd-7af70cf9ab9b	1	Other	Other
+994b1c9b-8882-4156-8f0f-a4b9126cee8b	1	Other	Other
+994b4347-cfc7-4555-9192-63b0694ab3c2	1	Other	Other
+994b6452-c3f4-4bdb-8167-2d157f7ff184	1	Other	Other
+994ba330-042b-4c5b-a848-4a0d910f9075	1	Other	Other
+994c23ed-dc7e-4e19-a505-9328cf56e1b1	1	James	Other
+994c28c7-630c-40d4-bb86-dc10b904a736	1	Other	Other
+994c6a83-c5d9-4e2c-82d1-db7eaaa21f5a	1	Other	Other
+994c6e6d-be30-4140-8929-83c44041f69c	1	Other	Other
+994cc1fd-67c3-45e3-bf61-6c7b953a5d84	1	Other	Other
+994d862a-f630-47fc-ac61-31ae2ff67d5b	1	Other	Other
+994da837-0c81-47d3-8f24-3cc3d4d400b0	1	Other	Other
+994db440-e80c-4b2d-8717-3cc51ca1c669	1	Other	Other
+994e1ed5-766d-44e9-b4f1-45b4ee935206	1	James	Other
+994e6bfc-0d6d-4852-b999-aa52c2686099	1	Other	Other
+994e947b-1171-4a61-8f5c-5f3eb7211dd4	1	Other	Other
+994ec7be-c538-45fd-83fa-16b42d3d9822	1	Other	Other
+994ee5c4-751d-4567-bb3c-67093ac2a3df	1	Other	Other
+994f04d7-5d08-47b5-aa7c-3f3c7b6a131a	1	Other	Other
+994f5aaa-44b2-45ae-a0ef-0a3155e124ad	1	Other	Other
+994f7e09-daeb-40a0-9237-eeaca663d57a	1	Other	Other
+994f88fe-5d53-44d7-9da5-2385269ce789	1	Other	Other
+99500585-a4fe-4fc6-bb8d-3641f18ee1f4	1	Other	Other
+995029b4-a8bd-483e-96ed-24ffc6e9379f	1	Other	Other
+99507f8e-2565-4bb1-b283-158e3d0c468c	1	Other	Other
+9950dbb6-e07a-4fc6-a637-cd3966832791	1	Other	Other
+99514a5e-050a-423f-9b39-08bef56cc99f	1	\N	Other
+9951662a-62e9-4885-a099-b0d9dd704273	1	Other	Other
+9951a6a7-e949-4bd6-bd6a-5ca137771da2	1	Other	Other
+9951b9a6-d37d-4d87-9628-7b7b37c183f9	1	Other	Other
+9951ba0e-5731-48a3-ac89-6953820c3681	1	\N	Other
+9951dc46-096e-4b9d-b90b-4382a946639c	1	Other	Other
+9951eb8b-61d8-4916-a8a1-81857ef363f9	1	Other	Other
+9952522a-6ba6-42ac-b5dd-463435b63545	1	Other	Other
+9952aa08-56a3-4967-89b4-691a6c37a6ce	1	Other	Other
+9952ccd1-a6e9-4caa-be74-06d2904f0722	1	Other	Other
+9952dbc3-614a-41aa-bd5b-4356cce2a509	1	Other	Other
+99535dd8-e320-4167-b8ab-894934f6c995	1	Other	Other
+9953aebb-c921-4258-9416-4cb4f5c6ff69	1	Other	Other
+9953d7ba-a2e2-4ec1-8b65-943a9e737d89	1	Other	Other
+995458e8-9bd9-4e7c-b316-cb20b1a37723	1	Other	Other
+995478d7-1416-480c-84c5-b482f6ecf5b9	1	Other	Other
+99547d19-aaca-4659-9aa6-e8cf4aae8fba	1	Other	Other
+9954a6d0-b1b2-4975-b2f1-71b03f0b6f7a	1	\N	Other
+9954adc1-6b49-4349-81f8-f70929f9aedd	1	Other	Other
+9954b0a8-8dbb-4ed4-8745-c6ce41697ba7	1	Other	Other
+9954ca66-b195-41c4-a666-5717ee87c478	1	Other	Other
+9954d663-aefe-4700-91e1-e0c8a0663c15	1	Other	Other
+99551093-090f-4bcf-92fe-622df018ddf8	1	Other	Other
+99554866-4d14-468a-ad34-83392e789d6f	1	\N	Other
+99556dbe-55ef-4677-9251-447c77087628	1	Other	Other
+99558b7f-0646-464b-a9f9-1dedc6efac7f	1	Other	Other
+9955e92a-0af7-479d-a5f4-67d413a7a4ae	1	Other	Other
+995637dd-30e7-40d4-aba3-bbf0384538e2	1	Other	Other
+9956e35f-5c93-4b9c-a77f-943d79eb9560	1	Other	Other
+99574524-6870-49b4-b80a-ec17a3cd1110	1	Other	Other
+995768b7-f456-4e95-a974-20bfeaf954eb	1	Other	Other
+9957ca7f-8a01-45eb-ade8-cb6f3b24c50a	1	Other	Other
+9958225e-b6c5-4ff4-a82a-2619e3f55693	1	Other	Other
+99582a3d-3e62-4b5a-9f0c-ba2f4e96d936	1	Other	Other
+99585dad-f0d8-47d0-9e3f-aac5a6ab9f46	1	Other	Other
+995881c2-2b4c-473d-acf7-9cbe9f0d1877	1	Other	Other
+9958a5a2-8867-4b7f-861d-14024c695baf	1	Other	Other
+9958d4dd-537c-4320-8da4-fd3d7b1ffe91	1	Other	Other
+99590350-0c06-4646-a026-93210fb81a7e	1	Other	Other
+99593c33-f3a9-47ec-819d-119c1b6f78fc	1	Other	Other
+99597824-90a5-4527-9bd9-ec8da40425ff	1	Other	Other
+9959b418-cc24-4ec3-80f5-e225d0d2f50f	1	Other	Other
+9959f780-720e-428d-afb6-0491d664c334	1	Other	Other
+9959fbc1-01a2-4ec5-af23-cd227f0cc8a9	1	Other	Other
+995a1258-3b74-4114-a086-6fe6b8da654e	1	Other	Other
+995a1765-2b63-4365-ad74-1be82ae8098c	1	Other	Other
+995a3569-9091-4213-9473-1b7554b12b20	1	Other	Other
+995a4dc1-a6ce-4a67-948c-888c3a656857	1	Other	Other
+995a57ad-de0a-4483-a1d7-21051f7bbf5e	1	Other	Other
+995a8fbf-945c-4945-9efb-11e7105b80af	1	Other	Other
+995aa539-a54b-44cb-b2ac-3470dbadbe43	1	Other	Other
+995acc39-9297-468f-a9e8-793acf93103f	1	Other	Other
+995acfec-bec2-49d6-99c3-1d904e04db04	1	Other	Other
+995ae037-45d2-4e4a-9aba-1b0b96460c32	1	Other	Other
+995b0b78-7b82-4ed4-85fe-d8bd36f3e2c2	1	Other	Other
+995bdaa2-3f98-4ee6-a93c-69877f9223ea	1	Other	Other
+995be1fb-4869-4a6d-b850-f7ef28d0ee3e	1	Other	Other
+995c05b0-7a6b-42ee-9274-1e5cce84e481	1	Other	Other
+995c0814-a436-4020-bc0f-d735fb24d495	1	Other	Other
+995c8f93-7b82-45e8-aee9-b3d70cc179af	1	Other	Other
+995cbf99-a5cc-4207-aafb-3c0d5e980069	1	Other	Other
+995cced1-81dd-4dad-b8f1-c5db8397f345	1	Other	Other
+995ce7f3-77f0-4e9c-b755-f68be1ee91ec	1	Other	Other
+995d4b33-8bd2-4211-995b-6fd55d2c0367	1	Other	Other
+995d5464-b1de-4871-8586-26ff9cf2b1cc	1	Other	Other
+995d54fb-514e-478e-8494-b0a660e4f1c8	1	Other	Other
+995def0b-b013-4dd8-b9b3-779ed88f4659	1	Other	Other
+995e4641-10c5-4b81-bc95-93d95adfdc5c	1	Other	Other
+995e6f79-65cc-4192-942e-c6330f43f0a1	1	Other	Other
+995e9456-5ace-428e-ba24-f25527a3226a	1	Other	Other
+995ec69f-ede7-4c4b-b1c4-a8365b5b5d42	1	Other	Other
+995f079f-7d87-43a0-b15c-f11489c09712	1	James	Other
+995f1885-525e-47b3-8208-e8751d9f67a5	1	\N	Other
+995f259c-6b30-4822-a5c4-429a648756b7	1	Other	Other
+995f30c2-7ee2-411c-92eb-eab8bd3830df	1	Other	Other
+995f6ada-8cd9-41cb-85a1-c9061c5c30ba	1	Other	Other
+995f7baa-b3eb-4b61-a1e1-c108a959cc1b	1	Other	Other
+995f8193-8382-40b1-be34-d90e11761057	1	Other	Other
+995f8fb8-90f9-4fbf-882f-fea9b7d45395	1	\N	Other
+995fe7ee-6c11-46c3-8a10-d1fa513ac794	1	Other	Other
+995fff59-afc9-440b-a5e3-d5d1b63783b9	1	Other	Other
+99603f2b-7cfb-41f6-b79f-5504c0e88d39	1	Other	Other
+9960af5f-dcd0-413a-95ae-4b72016f298d	1	Other	Other
+9960b820-23f6-4b07-b41c-d830158e31fc	1	Other	Other
+9960d1a7-79e5-44ff-b0f9-fc4fb41bad20	1	Other	Other
+99615ed4-159e-45e0-928f-4fce440df240	1	Other	Other
+99616e95-31b3-44a9-9891-c4373a90ae3d	1	Other	Other
+99617183-4c89-453a-a6cc-e129622ec422	1	Other	Other
+9961b209-3cdb-4060-a8e6-44530a68a001	1	Other	Other
+9961d6ca-a2ce-4030-ab11-3f0e5b85398e	1	Other	Other
+9962417b-9000-47ed-a5d7-59a231037ac4	1	\N	Other
+99628947-00f7-4ba0-9592-2171b64ccb68	1	Other	Other
+99628d7d-7367-497f-add8-867824f64200	1	Other	Other
+99629aa1-cd8d-45e3-bdcc-7d3cc3e5dcc0	1	Other	Other
+9962dacc-9826-49a0-8251-8764fcf60344	1	Other	Other
+9963443e-dba9-4c8e-a709-69a3a43e1cec	1	Other	Other
+99637cb4-8131-4f07-9267-e0e96879f534	1	Other	Other
+9963ca9b-0918-460f-8843-141a3d47f87b	1	Other	Other
+9963d616-5f78-43ec-a40f-6e4e8bfe85ef	1	Other	Other
+996419de-e344-4d13-8c5b-f0c0a5d8d13f	1	Other	Other
+996467dc-9f63-4db4-ae4a-bdb8d780c32e	1	Other	Other
+99646c9e-ccfd-4337-b5ce-75185ef5c66e	1	Other	Other
+996490e0-f60e-419a-a8ae-f6385973149d	1	Other	Other
+9964ab94-f8d1-4915-b86d-a5206a106cff	1	Other	Other
+9964f1e7-5e35-45df-84cf-2c44b629c6a3	1	Other	Other
+9965347e-f0bf-4af2-a31d-f628f352741a	1	Other	Other
+99657885-47e4-4379-b836-195bd9eebb9b	1	Other	Other
+99658834-8b9d-493e-8ec0-c7d8ee91ca02	1	Other	Other
+9965af52-c337-4aaa-a8aa-40845a5b64c0	1	Other	Other
+9965e873-e04e-4f9d-923b-faf5eb001a00	1	Other	Other
+996673f6-320e-40a1-8574-66f00fd11413	1	Other	Other
+99668e91-d9a6-4952-8d81-1a3ebc4e4fe7	1	Other	Other
+9966fa3e-a21c-4564-b30e-62f60c610f98	1	Other	Other
+99672944-9235-4218-92ce-23a536ff9bcc	1	\N	Other
+996767d7-49c6-4c96-8428-51bddc6194f8	1	Other	Other
+99676cb3-26bf-41a1-a16a-0168efe924c4	1	Other	Other
+9967b922-da38-457a-b19f-8389a5596d4f	1	Other	Other
+9967bd7f-bac2-4f17-abbf-4109d5a1f8f2	1	Other	Other
+99684036-fe60-43a8-acad-c1b958199d16	1	Other	Other
+99686970-a42a-4755-ae41-299d46fe0406	1	Other	Other
+9968858e-aa6c-4367-a57b-3a7b091e9551	1	Other	Other
+9968e43b-c0e0-40c0-9d71-78dd6af6d93c	1	Other	Other
+99694780-4910-49c2-9744-8a02e6c36dd7	1	Other	Other
+99695cb7-92ea-4d6f-88ac-3403313d9286	1	Other	Other
+99696713-15b2-4b43-82bb-0734d1383574	1	Other	Other
+9969a068-c292-4391-81aa-af116906a69a	1	Other	Other
+9969af45-fd48-4643-b347-7bbf88fdc995	1	Other	Other
+9969f143-0a26-4c73-9600-5fe6e3e81317	1	Other	Other
+996a0052-39e0-4fc1-83c0-31695f9f21d4	1	Other	Other
+996a01fe-2356-474d-9e1f-fa220b592ed0	1	Other	Other
+996a0a36-a42c-4a1b-b3aa-4664d1bbf4ac	1	Other	Other
+996a3080-eaf0-4f21-97a4-08ebc18b45b9	1	Other	Other
+996a4eb1-61b3-4761-a1da-16b3849e0e2b	1	Other	Other
+996a84d5-7d6c-4e97-9d5b-653dc05dd555	1	Other	Other
+996a8903-5fa8-4f04-84b6-1bcc4894bcb8	1	Other	Other
+996b028b-c518-473b-ae3b-9f6b83202b66	1	Other	Other
+996b206d-bcda-49b7-80f9-6a400e5c0013	1	Other	Other
+996b85d9-7000-4a90-a4f4-3dcca633c201	1	Other	Other
+996ba4e3-8aa0-495b-a79e-40aab917b310	1	Other	Other
+996bbc99-c90c-4d50-8f11-c55470e48457	1	Other	Other
+996bd691-7f6e-4e79-9e69-a3e1bbee3c47	1	Other	Other
+996c2bdb-afca-4282-9ead-c70ea7721e67	1	Other	Other
+996c3d17-9278-47cc-b97b-d07e43fdcd68	1	Other	Other
+996c530f-4787-409d-af28-c0e9e84f3f58	1	Other	Other
+996c6b0f-0041-4cca-8b03-a300a05a48bf	1	Other	Other
+996c90f7-7940-4434-b011-5fb2923b6d73	1	Other	Other
+996ca3ad-9f4a-4151-aff0-8b6b5cc4f0b6	1	Other	Other
+996cf355-3a9d-4d48-b962-24505507475c	1	Other	Other
+996d5ed9-bc9d-4bf0-bcf1-217e4b5874ad	1	Other	Other
+996da3cb-9c6d-4018-9842-6fa324e57221	1	Other	Other
+996da6b4-1dd2-449f-b239-16038550695d	1	Other	Other
+996dca76-0f26-4556-8c58-8b78132a6be2	1	Other	Other
+996dd890-5504-4d90-b9b5-600393309024	1	Other	Other
+996e18d8-c4cc-4b5e-a73c-765a350ae54f	1	Other	Other
+996e23cb-30da-47f2-b5af-c5cfe93425a8	1	Other	Other
+996e5ec2-a647-4bd9-a0f3-81c6b616fca6	1	Other	Other
+996e7ca2-6668-4507-99fc-83615e738b64	1	Other	Other
+996ea61b-e46a-4d25-a94c-9abf63c681e6	1	Other	Other
+996ecd32-010f-4bff-946c-eb39e78a0580	1	Other	Other
+996ecdda-d74b-4166-97e5-75032a616022	1	Other	Other
+996f28c6-6291-428f-bc87-f6f13e894479	1	Other	Other
+996f382f-43e1-4bb2-8022-0b9b3d041c1a	1	Other	Other
+996f4291-9824-4bac-b171-b3e74b9bd03e	1	Other	Other
+996f8709-ada5-4177-aea8-09061f44143e	1	Other	Other
+996fd5fb-cd8b-4500-957b-6df69e868112	1	Other	Other
+996fef41-071a-45c0-a973-20bb3061c926	1	\N	Other
+99702c5f-d652-488c-aa22-b67a13edf31e	1	Other	Other
+99703620-ebcf-463d-9f98-0065d6f1931b	1	James	Other
+99707a76-532b-4b53-ad33-1551ecc06dbc	1	Other	Other
+9970b04e-bfbb-476d-9e43-dc6416911029	1	Other	Other
+9970d446-0b53-4a89-a4eb-6d89e4e557a5	1	Other	Other
+9970dd15-a510-4b9d-a886-66a9787d218e	1	Other	Other
+9970e16d-56a0-478d-8c6b-2aa39a8afae3	1	Other	Other
+99710a0c-f250-4cf3-8790-3bef9e9f504b	1	Other	Other
+99712c64-1ad2-4078-af10-e9db8c2f3d13	1	Other	Other
+99718b28-01c6-4daf-ab70-d4260b96750a	1	Other	Other
+9971a528-11c2-4776-a6dc-6c8e8bb35e40	1	Other	Other
+9971b5f7-228f-4ceb-a26e-e77d2065b740	1	Other	Other
+9971ef13-7086-4c11-bcc3-7def8ebd1b78	1	Other	Other
+997210af-b064-4d7f-ab49-989b8d994a4a	1	Other	Other
+997220ea-379e-41dc-84dd-d016d660dfeb	1	\N	Other
+997228d7-de1f-4bd9-b907-9931e602143d	1	Other	Other
+99724203-81a7-44b8-a2d1-5cc130c9e401	1	Other	Other
+99727be3-ebc6-4024-90de-577060dfc069	1	Other	Other
+99728115-4048-4ab1-a0bc-c00236c4d6ea	1	Other	Other
+9972ad97-1fae-47e2-a86e-b5a7475ed4c9	1	Other	Other
+9972afbb-8d68-492f-a0e4-62469b69b89e	1	Other	Other
+99730e0d-1c1c-49cd-bc37-c375601f7bcc	1	Other	Other
+997359fd-d17a-402c-b84b-e0be8a227ed3	1	Other	Other
+997369e6-aa1e-482e-a4e1-b2a366e3214e	1	Other	Other
+99738e55-8bb1-45dc-8942-35f3cd610119	1	\N	Other
+9973f06b-565e-4d1d-85e8-b694d311b75a	1	Other	Other
+99742c7d-e874-41ab-b6b1-84a5640a716f	1	Other	Other
+99747313-3bbd-4c75-884c-5170f17850d7	1	Other	Other
+9974b893-b39b-450c-bc58-a6d5adece16f	1	Other	Other
+9974dd3c-44ed-432b-8056-2ad00ae83576	1	Other	Other
+997544c4-3dea-4639-8f7a-61a31144e0c3	1	Other	Other
+9975b197-cf4f-417f-ac1e-3718c650b112	1	Other	Other
+9975e822-66b5-4a54-94c1-c75c84635707	1	Other	Other
+9975fdc2-d891-4eec-8313-654bc301b0e9	1	\N	Other
+99762063-e81a-4c26-bd82-83ed7b0cdc72	1	Other	Other
+99762fa1-09ef-453d-985f-3950a0f3d164	1	Other	Other
+99764522-0a0f-4f45-8e43-192a3db91123	1	Other	Other
+997692fa-3fe3-40b9-a683-b378dbf13e23	1	Other	Other
+9976ba38-2d5a-4c10-ad7f-365a70b417b6	1	Other	Other
+9976f411-6c8e-40f1-849a-f24a5d68e9fa	1	Other	Other
+9976f63b-635b-4ec8-96ba-32f93529094f	1	Other	Other
+99772367-dc4b-4de9-9611-92c93009b59c	1	Other	Other
+99772702-0bc0-43b9-bb31-b85474f2422e	1	Other	Other
+9977822b-1cc5-4fb8-bbf9-a541e8723b17	1	Other	Other
+9977ad18-4b41-4f8f-b23f-3acb15836060	1	Other	Other
+9977b782-ec39-40d8-b2fe-33f7b85da1bf	1	Other	Other
+9977b983-47c8-45ae-8e8b-2f01d698aaf3	1	Other	Other
+9977c93b-2175-49ec-a96d-87939dcc330e	1	James	Other
+9977d582-76cc-4610-83fb-cfb0dba389ba	1	Other	Other
+9977f991-e629-4444-8d22-ec8782c22bb5	1	Other	Other
+9977fd86-644f-47e2-bb80-2c38dd363263	1	Other	Other
+9978539a-1c56-493e-ba72-59eed48a18fa	1	Other	Other
+99787674-fd1d-4c2e-b5ee-1cd8c4f38bde	1	Other	Other
+99789d77-118a-4dac-8a41-5ea4a140f2a7	1	Other	Other
+9978f53e-66cc-4013-b42c-90485921dedb	1	Other	Other
+997975d2-3f2f-4b4a-a2c3-374f1c0d77fe	1	Other	Other
+9979d8eb-ade8-4da0-bbc7-009b111553f4	1	Other	Other
+9979fc5c-649a-48dc-b46a-a87f25c9a4ef	1	Other	Other
+997a45a7-79db-4e65-aba0-8f7b294545cd	1	Other	Other
+997a5b51-c7c3-4177-bf7c-1ebacb33d8ba	1	Other	Other
+997a919f-ba73-4d9b-8dca-63df4549efcf	1	Other	Other
+997aa6b3-a963-4128-8784-5791d64066e5	1	Other	Other
+997aca17-a164-45e1-b7ff-bc74cd795bb1	1	Other	Other
+997ae6bd-1f27-440d-bb74-736d48473ee0	1	Other	Other
+997b014b-90b2-4b27-ba99-a00ad953949c	1	Other	Other
+997b6ea8-9da5-48ac-a8d6-414a9ca3d3fe	1	Other	Other
+997b84c2-4a9f-48ca-8aaf-ab624d609e0b	1	Other	Other
+997b9ed1-2727-4450-a8f6-558218a0fdac	1	Other	Other
+997bb9d7-5676-4667-a6b9-96913dd8ede0	1	Other	Other
+997bd02b-6d6d-486c-87e1-5e80b18a559a	1	Other	Other
+997bd94a-e327-43a5-b203-09031aee840a	1	Other	Other
+997bfc4e-2007-47dc-bd26-5158a5d5f51e	1	James	Other
+997c2df6-ed7e-469c-8540-8e964e03cebb	1	Other	Other
+997cbc13-c0c0-411b-ae6f-d88b72288e98	1	Other	Other
+997cc686-2f98-42d6-819d-fe67c67fbbea	1	Other	Other
+997cd490-4994-4139-ba1e-2425d43d384a	1	Other	Other
+997ce763-a2e9-4169-a7e0-8a404f9b0157	1	Other	Other
+997cf8a4-5fe3-4583-bb1a-9b3badb279e2	1	\N	Other
+997d1417-b85f-45ea-92d5-77ad0bdb440d	1	Other	Other
+997d744a-9272-40c2-b8fc-83af695037da	1	Other	Other
+997d78a6-8f19-43e6-b372-9b541290415a	1	Other	Other
+997d7b15-eb72-4352-90f6-7d4a4b0d574e	1	Other	Other
+997da1a5-e061-45fa-9b22-017b1b06c58c	1	Other	Other
+997db398-7bc3-4267-9330-8850ed188a30	1	Other	Other
+997dbb2d-d122-40cc-9314-3513c2ddd1e4	1	Other	Other
+997dd10b-d315-4587-b372-434916456731	1	Other	Other
+997dd36d-19f6-4552-9f4c-f93ebe2929e7	1	Other	Other
+997df9e0-e0bf-4187-95fb-ef8f650bc51c	1	Other	Other
+997dfbc5-5b96-492d-900a-539d82247f7c	1	Other	Other
+997e57f1-126c-49df-806d-e96b77433734	1	Other	Other
+997e67e2-4530-448d-90bb-e97010b5dff8	1	Other	Other
+997e7ed0-c94f-4772-88ea-328cebf90a53	1	Other	Other
+997e8b0d-3f8e-485d-ae9f-5cf2751e74eb	1	Other	Other
+997e98fa-5e3b-4270-aa4e-f50705b9de11	1	Other	Other
+997ee521-722b-47fe-8cc3-dd23cad2ea84	1	Other	Other
+997ee904-1cc0-4014-83aa-0157dfdc8425	1	Other	Other
+997eefe4-3d67-4ca7-91ec-699cc051d612	1	Other	Other
+997f18f6-6234-426d-a176-ea8e656b2fee	1	Other	Other
+997f1c27-c263-40d0-b340-d9100686c57c	1	Other	Other
+997f9649-a781-4d8f-a2a1-e422c7b49d09	1	Other	Other
+997f9e2f-e366-4d01-9499-e829538fdae6	1	Other	Other
+99800dea-0036-11e8-86b7-fa163e8624cc	1	Other	Other
+998037f0-08f5-4156-a9a4-8a7c9185852f	1	Other	Other
+9980381f-4462-44aa-a1a0-9ae94e0c8e23	1	Other	Other
+998050e7-9d04-421d-bf79-3fea25683a61	1	Other	Other
+99806f16-8802-487c-9b66-ab229ad5bd99	1	Other	Other
+99807add-0b0a-46ae-9ee6-4f3df08cab71	1	Other	Other
+99809044-3080-45ee-9426-f909b3d239e0	1	Other	Other
+99810bd3-411d-4dee-8f31-d66e68e8b4c1	1	Other	Other
+99811745-c5ea-4888-b856-2193929cd917	1	Other	Other
+998117f7-5aa2-4ca3-b162-bb55621cacbc	1	Other	Other
+99814427-ab18-445a-90de-e5b889a08436	1	Other	Other
+99815d2c-1ab5-4b31-a97c-0108d6a9b1d3	1	Other	Other
+99817ce1-98de-4ffc-9fd1-ae5603a9ba9d	1	Other	Other
+99818148-1070-498c-ab75-e90c488fd1b3	1	Other	Other
+99824531-8014-4597-8565-90aa3011f77e	1	Other	Other
+9982807f-0c26-4e3c-9a5d-aeff65dffa9a	1	Other	Other
+998295ed-a622-44ac-bd5d-241020d1cc73	1	Other	Other
+9982d84f-94f2-461c-b307-986c4f13b288	1	Other	Other
+9982db09-b44b-409e-a015-8e37e15fe9ea	1	Other	Other
+998304cf-4138-41cf-9907-7d68705887f2	1	Other	Other
+998340c7-02fd-4560-af82-e6bf5b7c60e2	1	Other	Other
+99839156-f3bc-4865-9e29-a96623b09c93	1	Other	Other
+9983979a-79ea-4e64-9707-1d5033530fe3	1	Other	Other
+9983b6bd-9809-4c68-a8e8-ba91b81b5c6b	1	Other	Other
+9983cc8e-5f9e-4e87-a0bd-632dcf2912b0	1	Other	Other
+998438f1-158e-436a-91d2-6931e3e4c3dd	1	Other	Other
+99843c58-244b-4c56-a463-501728c8564f	1	Other	Other
+99844ea0-31d8-46b8-87c7-5b654cb4adc9	1	Other	Other
+998476fe-995f-4781-9c25-099219b5c301	1	Other	Other
+9985034c-f8f7-4546-b5a4-7c40da6ef6b4	1	Other	Other
+99852ed0-f03c-461c-a4d9-ed109281f90b	1	Other	Other
+998570b8-5d5a-4298-b2a5-31238dc97b52	1	\N	Other
+99859f58-f7a0-4a62-a825-a388797da286	1	Other	Other
+99862aea-61de-4187-aac6-715f571de3c8	1	Other	Other
+9986724f-7580-4e4f-9521-d610923ee65b	1	Other	Other
+99870a62-bdf3-48ee-9a16-ec427f48754d	1	Other	Other
+99872489-0fe9-4299-8473-d89081f88e8f	1	Other	Other
+99872910-d4bf-44d9-9611-c1638126ebcf	1	Other	Other
+9987441c-7dfb-4c4f-adc5-6f34a3829b79	1	Other	Other
+9987533a-9243-458d-9271-8297efceb8f2	1	Other	Other
+99879088-c890-4aac-b2fd-52296a9dcec0	1	Other	Other
+9987bee4-aa64-4f66-a11a-3560a118487f	1	Other	Other
+9987c266-0725-4d9c-9dd6-5ec6fead3a7f	1	Other	Other
+9987c7a1-f572-4191-b7da-1eb1578f71ad	1	Other	Other
+99881e36-1f7b-44bd-8088-0f5756bac740	1	Other	Other
+998832a5-11b8-42e3-b14a-81a1cb385f93	1	Other	Other
+9988a813-1a06-4253-bdc5-d24f99e64ab5	1	\N	Other
+9988f895-ebfc-4acb-a4ec-3aa5ca3080b7	1	Other	Other
+9989272a-7502-42cf-b4cb-b8c5580ae5f3	1	Other	Other
+998928e1-ae01-45e2-84a2-e4faace5a898	1	Other	Other
+99893db7-be58-4b2f-8422-58e2a46e8a9b	1	Other	Other
+9989e050-0af6-405d-a57e-b913b33a1f2f	1	Other	Other
+9989f4e5-5d0c-476c-9d85-228b1501699f	1	Other	Other
+998a9057-47b9-4d95-b142-827ba805624a	1	Other	Other
+998acbfc-bf37-440c-a698-05902059fe00	1	Other	Other
+998b7a32-8d9c-42d1-b768-8816d4d2c4d3	1	Other	Other
+998b8799-accb-4c8d-a46d-30d5be41574f	1	Other	Other
+998bb410-1794-47b9-b1f0-0c45ca398930	1	Other	Other
+998bb616-5700-407d-ae27-1c679387da36	1	Other	Other
+998beb4e-be2d-4ccd-96b1-7f51b23684e4	1	Other	Other
+998bec09-9597-4bc5-8bd8-b96c1de325da	1	Other	Other
+998c2100-942e-4799-8faa-f77df8470900	1	James	Other
+998c629e-2109-44a5-90f5-e6a7c926c5a9	1	Other	Other
+998c65f9-9b27-46dd-9e17-a937392dc34d	1	\N	Other
+998cd3ba-789b-40dc-b992-933857862a78	1	Other	Other
+998cd6d2-63da-4902-9acd-afca40c7985b	1	Other	Other
+998d2b54-1bd6-4eca-87c7-ae9497d0ef38	1	Other	Other
+998d777c-d6ae-42ca-9516-981a4dda6f5c	1	Other	Other
+998d8465-b027-413a-b6fe-e85722323720	1	Other	Other
+998d966f-ade2-42c3-aeab-f271feef96ec	1	Other	Other
+998e15b0-d933-4fb9-999b-a10cc85d5c91	1	Other	Other
+998e7502-3135-47ec-8051-8440b0b311db	1	Other	Other
+998ebfef-2dcb-4d55-8245-bceea1fdcd17	1	Other	Other
+998ef1c1-7dd2-46b7-86a4-4ef2e6d96fba	1	Other	Other
+998efdcc-ec73-4504-ae22-2320beaf99a9	1	Other	Other
+998f8e62-8f32-41ab-bff7-b4194e39127e	1	Other	Other
+998fc417-5eaa-4fc3-bc4a-78b066caff10	1	Other	Other
+999015b6-d553-4eb8-8646-bf3f88e2575d	1	Other	Other
+99910ad2-8b39-4d6f-bbf8-522fa1ce7842	1	Other	Other
+99911064-28ab-4d62-8ed3-846f6a3191ed	1	Other	Other
+99911319-edbc-4fa2-a45f-c27b54377f61	1	Other	Other
+999134c9-77d8-4bac-b674-9b21840bb298	1	Other	Other
+9991640b-6f4e-43eb-a9d8-1c9ebc840461	1	Other	Other
+99917429-b6ed-42e5-a9d2-f2a2d22605aa	1	Other	Other
+9991773a-6dd5-44fb-870c-f505c0eff6f2	1	Other	Other
+99919741-68e3-47e9-b702-486e48386dc6	1	Other	Other
+9991b29f-dd62-4311-ab3d-c430cceb6902	1	Other	Other
+9991b308-bbdc-4dc4-bf63-f101fb47dd60	1	Other	Other
+9991bb4d-1a92-4620-a070-0ffc1e7072d9	1	Other	Other
+9991d22b-e0cc-4e14-b5ed-d6ad3b38338a	1	Other	Other
+9991eb0d-1fec-4e18-b2b9-3c40c81557a7	1	Other	Other
+99921d4b-dd05-4452-9681-2cf465ca2d3b	1	Other	Other
+99923649-fe5a-44cf-aa2e-77e561d7b740	1	Other	Other
+999248c7-b7e5-4013-bd3e-1644b77cd5f7	1	Other	Other
+9992864f-87fc-4dff-ae53-11f952fc38da	1	Other	Other
+9992ac0a-7af4-4e2f-b1c1-3843f201d064	1	Other	Other
+9992b3b1-965b-496f-819a-d661d5b2c3ff	1	Other	Other
+9992f286-d357-4de7-9a5b-ecf73bb55d30	1	Other	Other
+99931577-97ec-4bd6-90b9-6b45f145a525	1	Other	Other
+9993a742-1c14-4512-af80-b376504fd8ab	1	Other	Other
+9993d905-22ee-4d73-b33e-60403ddc59de	1	Other	Other
+99941ce9-41e1-4f62-9dc2-f7f04626376b	1	Other	Other
+99942568-b308-4414-9323-ceef9f4ee59a	1	Other	Other
+99943a93-a34e-420d-b54b-f149c4287bbb	1	\N	Other
+9994417f-5428-4b06-b6db-007316db023c	1	Other	Other
+999465f1-b8a9-4ed2-8361-fcc022c25d96	1	Other	Other
+99946f77-0f0e-41e8-bf63-e6cc4f9b68d3	1	Other	Other
+9994dfda-31ad-41fe-95f8-517eabbc4b81	1	Other	Other
+99952f6a-3143-4be9-b1d1-3c85724ae691	1	Other	Other
+999537f3-8797-4275-b843-caecc21b3745	1	Other	Other
+99957818-6c65-476d-9151-a991b54f0b94	1	Other	Other
+999584ef-b06d-4811-bd45-710a15302dfe	1	Other	Other
+9995b0cf-036c-4303-b021-e3504ec516db	1	Other	Other
+9995d2bb-e05d-45fe-a3a4-d15fa3986b75	1	Other	Other
+9995d959-d832-44ab-b080-2f6aab43b673	1	Other	Other
+99960cb2-1b83-4de2-9f48-ba47bee4c053	1	Other	Other
+99960ffc-9b72-48eb-9e62-b431acb73374	1	Other	Other
+9996126f-7d62-4794-9539-c00b8e82c925	1	Other	Other
+99965050-e6f9-4ac2-86a0-6aea8e011a0b	1	Other	Other
+999662ae-d43e-4e0d-98f4-543415bc769c	1	Other	Other
+99970a2b-5519-4484-98c1-5125217f6bd5	1	Other	Other
+99972a37-e3c6-422d-a394-c1f3d3d71c2e	1	James	Other
+9997560b-e3c8-443b-b6b0-a69297dc2eba	1	Other	Other
+99976e9f-8690-48be-8940-7943ca488449	1	Other	Other
+9997e5ec-0128-42a0-a257-dd19c4aff979	1	\N	Other
+999821e1-d017-4cba-90fd-78df70c872b7	1	Other	Other
+99986afc-f16e-441e-a71d-d5b9223e83fc	1	Other	Other
+99989ae7-e31d-431f-b34f-ea7c1bb43831	1	Other	Other
+9998ad48-3d51-4b3d-8ce8-8aebfede8342	1	Other	Other
+99999aae-60c1-425b-858c-aa02e194ee44	1	Other	Other
+9999a71d-cef9-4c3a-8354-9c59be1226d5	1	Other	Other
+9999e43b-f0b0-4163-90fa-72dbb7867825	1	Other	Other
+999a13dc-2aa8-464c-82eb-7f932967b439	1	Other	Other
+999a2a03-4896-405d-a047-dfc553a6c34c	1	Other	Other
+999a2f9c-2492-4f74-8413-09dd15577215	1	Other	Other
+999a4ae2-2805-4ebc-812f-468393f248eb	1	Other	Other
+999a4eec-e9f7-4c9b-8105-3bb6bc3782f2	1	Other	Other
+999a69d9-1ab7-467c-9e45-ba7e63a15ccc	1	Other	Other
+999ac037-739c-409c-b47e-04658278a870	1	Other	Other
+999ad0c8-552a-440e-811d-c59f845ce012	1	Other	Other
+999ae2a9-790f-4ced-84f8-0247465938aa	1	Other	Other
+999b2dd8-67d9-44c6-8b50-f082ce2f3468	1	James	Other
+999bae79-5613-452a-929d-89fb904b2e92	1	Other	Other
+999bb248-ad0b-4332-9512-22199042ce1d	1	Other	Other
+999bef40-190a-435e-9709-835bf69117f3	1	Other	Other
+999c368a-5d60-4951-9697-c7c463a7bb2c	1	Other	Other
+999c6730-fc5e-4884-ab21-3245b0cd3115	1	Other	Other
+999c80a1-472b-4edc-b09a-d00657578378	1	Other	Other
+999cafc5-1703-44aa-9b34-21fc5ee6eb1c	1	Other	Other
+999cece0-4bf4-4650-bf7d-d149f8667621	1	\N	Other
+999d07ab-2d42-43c2-b5e9-ad4ee521b089	1	Other	Other
+999d13d3-ad1a-4438-8bdf-f2a53297e939	1	Other	Other
+999d44b0-5f53-44cf-aa39-8ff8fc39e82d	1	Other	Other
+999d7c02-b8f2-4c7d-8330-c5ba54c70df9	1	Other	Other
+999d975f-71d3-4bee-826b-378ec9a26da0	1	Other	Other
+999d9ee4-e023-439f-889c-3a0407da3193	1	Other	Other
+999db4a9-9742-462f-ac7d-76d93d92197c	1	\N	Other
+999ecb71-e485-4f92-a15a-8e0be11bf108	1	Other	Other
+999f12e6-8990-4a60-b10f-bfb4771cd616	1	Other	Other
+999f67a5-0447-4e53-b5b7-99808e3fe4fc	1	Other	Other
+999f816b-4dc0-41ed-8dcd-a72d292121cb	1	Other	Other
+999f8603-0f1d-480b-a421-0095727390cd	1	Other	Other
+999fc0ab-21ba-44fe-bf11-b328be29da56	1	Other	Other
+999fe62f-f3ff-476c-9569-cfbdaf81731d	1	Other	Other
+99a00c45-8a0e-4135-92a4-3b6b25815c82	1	Other	Other
+99a00ec6-10fd-4b36-8744-ef698baa79cf	1	Other	Other
+99a04cab-1c5e-44fa-bfc0-14e926784d32	1	Other	Other
+99a079f9-b1fa-4317-8dd4-f519bf8528d6	1	Other	Other
+99a09be6-149e-44c6-bd6b-02ce21935dcf	1	Other	Other
+99a18153-7316-4bb0-829d-77c3f0c1b029	1	Other	Other
+99a1e615-d63e-4d2f-8c5c-0a3a7ad781e7	1	Other	Other
+99a2296e-ef05-4520-b92f-4befc2c4e688	1	Other	Other
+99a23bec-6f73-4d1d-a572-c64bf5746380	1	Other	Other
+99a24726-6279-4996-854a-d0ef133d6983	1	Other	Other
+99a2735d-6aff-4b53-86ce-4d0ddfcddde6	1	\N	Other
+99a28b01-6ba5-4db0-bde4-7692f54c4fd2	1	Other	Other
+99a31919-d3ad-4589-9b57-7379afe55625	1	Other	Other
+99a39f6c-661c-4608-a9c8-28e5d5052a16	1	Other	Other
+99a3b279-8e6b-4b6e-840a-daed6be28991	1	Other	Other
+99a3bde5-1fc7-4252-bad9-6f8394cd185e	1	Other	Other
+99a3db37-b23a-408a-854d-e9c78119a70d	1	Other	Other
+99a424ba-57ea-4621-884b-01378589d31e	1	Other	Other
+99a43f97-499b-4b59-a0a8-c67385646449	1	\N	Other
+99a45698-aa58-4d7a-9297-f2beed938395	1	Other	Other
+99a48655-1cc5-4da9-964e-5b7ddaf702a5	1	Other	Other
+99a4b080-5320-4089-9727-9f1f742cbfb4	1	Other	Other
+99a56dce-2d0b-481f-b425-73698d60ab3d	1	Other	Other
+99a5c76a-ae27-4407-a991-2c1554b48846	1	Other	Other
+99a668a4-09b3-4042-9f18-effccc1ffaf0	1	Other	Other
+99a66bf5-99b9-4777-85c4-0873ce2ab4fe	1	Other	Other
+99a67036-95a7-4c12-b94e-53037461c385	1	James	Other
+99a6a63a-f813-420a-8f42-a454890726f3	1	\N	Other
+99a6ba7f-b249-483c-aaf4-1bef48ea1235	1	Other	Other
+99a6ce7a-4e83-4c22-ace2-09840836c575	1	Other	Other
+99a6e4b6-47a2-4ecf-8ba8-dfe37d5464cb	1	Other	Other
+99a6f8c5-d25c-4ff9-815f-744662169e93	1	Other	Other
+99a7079a-13c6-44ce-850c-0a3481f6c976	1	Other	Other
+99a711fd-5c53-4d12-9de2-0acb96a7ca4e	1	Other	Other
+99a7964b-600c-4288-adc3-4ee1d04bae2b	1	Other	Other
+99a7b039-46dd-4fa5-b1a4-a4ab570d180e	1	Other	Other
+99a7b4fc-c663-4147-879d-1e39886e1737	1	Other	Other
+99a7d629-e165-48da-86c6-18c3187f33cf	1	Other	Other
+99a857c4-8028-492f-9a73-801e916e9006	1	Other	Other
+99a8a323-e513-4a58-8e73-69576b2167f5	1	Other	Other
+99a8aa03-679f-46fa-befd-c78f8581b529	1	\N	Other
+99a91d1d-849a-4f3d-9d0e-58099ab58dd4	1	Other	Other
+99a92ea0-d2ad-47b7-80e2-ad54ce30377a	1	Other	Other
+99a93fe9-6b5d-4219-af91-e76658ca1c0d	1	Other	Other
+99a998bc-6549-4fa4-b6f5-fcf07f681a64	1	Other	Other
+99a99b5b-2a81-45b0-9cc6-b8ad4a58ad12	1	Other	Other
+99a9a6e8-8a3c-11e7-9c39-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+99a9b5f1-1e32-43b0-9ca5-9d571b45d729	1	Other	Other
+99aa00ef-bf7b-49ca-88d5-79e2e2083e36	1	Other	Other
+99aa354e-dbb1-4875-a114-fb102ae0c503	1	Other	Other
+99aa4fcd-b67b-4b04-a6a1-1eeca5055538	1	\N	Other
+99ab05ac-9c9c-4be7-b177-b5f6ae2ec621	1	Other	Other
+99ab0b0c-c374-46f9-bea4-07f0a09c2ec5	1	Other	Other
+99ab39e7-74e7-4b06-8e5b-68cb9dbe5c47	1	Other	Other
+99ab6d44-aaa4-42ce-b844-8d3ccc4bfb06	1	Other	Other
+99abaf82-97a5-4f21-a1e2-81755a1934ee	1	Other	Other
+99ac04b4-777c-4af2-8548-b729fd4660db	1	Other	Other
+99ac324e-68d3-48fa-b0c7-d8727134fa9c	1	James	Other
+99ac8066-9159-4a0b-b67e-dc3f826a7e31	1	Other	Other
+99ac965c-9e9e-4fbc-8d75-d62fb2a101ff	1	Other	Other
+99ad3e16-85bd-4cff-b479-730baba87af3	1	\N	Other
+99ad506b-cf8d-498e-b9ae-57e22e758e98	1	Other	Other
+99ad558a-a8a2-4700-a591-ec81130e7054	1	Other	Other
+99ad620a-bf9f-41bd-806b-66ca2c3b6cbf	1	\N	Other
+99ad644c-471d-4ffa-8a7e-a70890d97d88	1	Other	Other
+99ad7ac8-8d61-4475-b220-72a93445941f	1	Other	Other
+99ade21f-4634-4419-ac21-5f3bf0d42cb3	1	Other	Other
+99ae0bd4-6864-42f7-bdc9-61608ab20389	1	James	Other
+99ae0d52-53ee-459f-b289-d214d6132efa	1	Other	Other
+99ae12d5-d355-4f41-a21b-06cc2011f56b	1	Other	Other
+99ae5746-f56e-4234-9442-3535c1beea0e	1	Other	Other
+99aeccd5-171b-496a-95bb-ba6ed7240150	1	Other	Other
+99aee00d-400b-4460-a92b-54bb7a475a57	1	Other	Other
+99af0350-84e2-4bab-bd46-eb458707d47c	1	Other	Other
+99af7762-140d-4ae2-9cd7-f91eea23627a	1	Other	Other
+99af8528-b4bd-472a-b2a7-9b9e85fbdd95	1	Other	Other
+99afa2f3-2f56-4512-8c20-17abde115236	1	Other	Other
+99afc09a-49cc-47aa-9b75-9c84fc5e6d95	1	Other	Other
+99afcc78-1f28-4cc0-a1bb-3e3c2b4b362d	1	Other	Other
+99b06bc8-dd1d-409d-a921-f73f54da8e26	1	Other	Other
+99b0ad8a-7014-4f7b-af61-4f4a6d8efe37	1	Other	Other
+99b0d845-7362-4058-b7bd-0f268e03f28f	1	Other	Other
+99b103a2-ec12-4483-a8c4-559c939e6e9b	1	Other	Other
+99b165f5-f417-4fb6-9119-dbc39dbe3c73	1	Other	Other
+99b1aed8-ea05-4654-ac61-683bb889dcd7	1	Other	Other
+99b1c23b-bd86-4f1f-a533-6d5f4943770f	1	Other	Other
+99b1c2aa-c652-4923-83db-a19cb2cb81ac	1	Other	Other
+99b1d805-c483-437f-b4d5-01b9e3927195	1	Other	Other
+99b1dd00-b7b1-45bb-a7fa-fbfcdd1467cc	1	Other	Other
+99b213f9-1634-461e-ac45-ca52397cba0b	1	Other	Other
+99b2af3e-2265-49a2-91c5-6c4e3b08d112	1	Other	Other
+99b2b58e-7110-441b-87f8-95d59ee1b59a	1	Other	Other
+99b2e4ff-a91b-4247-8185-624f6a40c41a	1	Other	Other
+99b2ee63-b8b2-4093-9dae-293b02ef05f0	1	\N	Other
+99b30882-2c01-4379-90be-5307fdca51d6	1	Other	Other
+99b3465b-eb5d-43b2-a510-e3709decebab	1	Other	Other
+99b3799c-20e8-4da5-b18f-01fbbfb6405d	1	Other	Other
+99b37fca-28f7-4e2c-b52c-283f0e0cd0bd	1	Other	Other
+99b38bcc-acee-4021-bc97-662d42b1b018	1	Other	Other
+99b395bb-3a20-4d2e-87b4-61788a4bb491	1	Other	Other
+99b39a92-9e75-4d93-a216-d89accba4699	1	\N	Other
+99b3afd8-6697-48de-8490-07395098f2a1	1	Other	Other
+99b4196c-e51d-43ba-aa6b-4201f1da1048	1	Other	Other
+99b489e9-2ffc-4b1f-9182-8beef078618b	1	Other	Other
+99b49bc6-92dd-416c-a3ce-69851dcaeb00	1	Other	Other
+99b4d085-7115-4887-85a9-4f93dbfb7eed	1	Other	Other
+99b4e329-b689-4616-adca-cecd980af85f	1	Other	Other
+99b51c43-a188-4727-b2e3-ce50d3b1f445	1	Other	Other
+99b5c154-1afa-473b-867e-0193065c1ac0	1	Other	Other
+99b5c2fb-5598-482a-bce5-5425f17c1bd7	1	Other	Other
+99b62ee5-9c99-4843-8e72-c3ffac572a26	1	Other	Other
+99b712ad-43e2-47b1-91dd-1e986d32284a	1	Other	Other
+99b739bf-82bc-45aa-bc7d-ebb258f1b2e7	1	Other	Other
+99b76905-0f33-4e58-8f29-a1ba064a92f8	1	Other	Other
+99b77c17-9f73-409b-9897-87ec39fbe4ba	1	Other	Other
+99b79c38-62a7-4750-ac95-5716be6f4ab9	1	Other	Other
+99b7bb34-c788-4561-9ff9-7c900f0fd9ac	1	Other	Other
+99b7c0c5-8fc7-4f8f-9896-5f3f1b8c7dea	1	Other	Other
+99b8299a-9253-4948-aeec-1017dd47ab08	1	Other	Other
+99b82c91-8429-4e57-8b3f-0a4a6e73b013	1	Other	Other
+99b86d8b-c12e-46b9-a62e-504f53e70e7f	1	Other	Other
+99b8be01-5d0e-4105-8341-b2090d5b74b9	1	Other	Other
+99b8c06c-02d4-4602-8929-ad4c533014f0	1	Other	Other
+99b8c339-4c23-4114-b3fa-892f85a98ace	1	Other	Other
+99b8c470-ccec-46a2-a122-0e7d16b3e927	1	Other	Other
+99b8fdeb-68c4-48f4-8c16-8cb20aa70b83	1	James	Other
+99b913db-4116-4d04-a5f0-8da577a0a815	1	James	Other
+99b921eb-eaed-4e98-b4b9-85e153808f48	1	Other	Other
+99b95797-8eb2-4db4-936b-41c2aa40214c	1	Other	Other
+99b9bf79-f209-44cb-818b-451f8d5ca462	1	Other	Other
+99b9ed26-2181-4d96-aa7e-32c9c88fedcc	1	Other	Other
+99ba3405-8cfd-4758-ba1d-066b49172f4b	1	Other	Other
+99baa2d1-5a1a-4c02-9272-9ab5c81e4023	1	Other	Other
+99bab8c6-a539-48cb-916e-3e2353f4c2da	1	Other	Other
+99baceaa-79ca-4c06-bb57-72eb4b61a05c	1	\N	Other
+99badbcb-090c-43e7-ae52-e545ab9a5cff	1	Other	Other
+99baff4a-c20b-411b-9044-09458c4e7078	1	Other	Other
+99bb69ed-8b8d-401a-81cc-290cc4bfce92	1	Other	Other
+99bb9689-3ef9-4180-b1d4-e48ff2957a32	1	Other	Other
+99bbdfb9-0e6f-4841-87d4-b6e17caffd93	1	Other	Other
+99bbe84d-1109-40fe-b54a-dd09630931eb	1	Other	Other
+99bbf984-d1fe-4989-8ea6-13aaee0554d8	1	Other	Other
+99bc1b52-daa5-4536-8192-63bc289b0da5	1	\N	Other
+99bc7eb0-3a60-48dd-a8cd-03c60f82cd82	1	Other	Other
+99bc907e-9d76-4b99-80cc-5a0c67a59fc8	1	Other	Other
+99bca17f-c447-4d98-aa3d-9da70dadbb22	1	Other	Other
+99bcdeab-6d06-4e93-ab79-709e0d1b6cc3	1	Other	Other
+99bcee68-2774-4bcf-b763-edbe81e10583	1	Other	Other
+99bd0cf3-9ae7-47de-ba35-349ef847e3ce	1	Other	Other
+99bd46c8-eced-4046-8efc-630283170e5e	1	Other	Other
+99bd7a92-0529-47ed-ae3b-12a6ea216816	1	Other	Other
+99bd9ad8-b0d0-4fc6-a830-e68d45bbbc6a	1	Other	Other
+99bdd916-9c5e-4bb5-a895-782d8cbf8b06	1	Other	Other
+99be0d61-677c-4370-8999-5b089a85c531	1	Other	Other
+99be54e5-a9a8-40c2-8c88-6fbbd4d5dc13	1	\N	Other
+99be6651-1b52-4360-9fe2-9377adfd268d	1	Other	Other
+99be959f-f153-4435-aaf2-535b1c225aa5	1	Other	Other
+99bed597-c484-4373-8938-fb705e91f95d	1	Other	Other
+99bedacd-700a-4a40-abeb-dfa4f547b462	1	Other	Other
+99bef586-8037-401f-88ed-6b766ffdfae9	1	Other	Other
+99befceb-5721-4cac-97fc-dca5e6c44617	1	Other	Other
+99bf255a-1035-4076-97ec-b6c061e0cc1e	1	Other	Other
+99bf787b-c784-41d7-856e-25d90ee524de	1	Other	Other
+99bfc862-2525-4a0b-867b-f58fea3ed0eb	1	Other	Other
+99bfd5fb-c27c-4072-8e59-a49d1e00eace	1	Other	Other
+99c004fc-358a-476e-bc3e-f49d60ceb2c8	1	Other	Other
+99c00b95-f56b-43a5-84e7-4fc102181de3	1	\N	Other
+99c01e62-2275-41cd-8bef-1b026a8d843f	1	Other	Other
+99c05e3f-7167-4a8c-ada0-ec597aaef893	1	Other	Other
+99c0a790-ea17-4888-8876-9c9c9dea28a7	1	Other	Other
+99c144b1-c757-4818-929b-ac76d2fe16a2	1	Other	Other
+99c163f9-12b2-4d90-8847-debc2af884b6	1	Other	Other
+99c19b30-566e-4289-a2c5-39044111d3e7	1	Other	Other
+99c1ae6d-42c3-4e24-8f8b-390285edaad2	1	Other	Other
+99c1b154-2c1b-49e3-9ebe-965e10026982	1	Other	Other
+99c1b2a4-ee53-4168-9d9b-5ec47e7a0be7	1	Other	Other
+99c1d1a1-c9d6-4a06-81c9-5434e3da4455	1	Other	Other
+99c1f586-5194-4cf6-abb7-0ff445c72c69	1	Other	Other
+99c20fbd-a616-4ac2-af7c-6464901474ab	1	Other	Other
+99c21b9e-3308-496b-a0d4-63f95bcf5f05	1	Other	Other
+99c22015-e8f2-47e4-8adc-c62e39030ede	1	Other	Other
+99c26888-0d77-4837-865e-d96cc95c1bf8	1	Other	Other
+99c28fb8-e55e-4c33-9389-22628d1fcd3b	1	Other	Other
+99c2c3c9-a336-4771-b427-c919316437d3	1	Other	Other
+99c30edd-e52d-429a-a3f7-65d641d4257a	1	Other	Other
+99c33abb-a5ab-48cb-ae33-22a30c02372c	1	Other	Other
+99c350f2-b26c-471e-aa4e-17033c6bcdff	1	Other	Other
+99c3a87e-14cf-4d13-8338-9af307c483be	1	Other	Other
+99c3b98d-345b-474f-8af5-f74833d1d639	1	Other	Other
+99c4132f-6028-4a64-beee-a1d3443e0096	1	Other	Other
+99c41441-12c8-47c0-a131-60948f086f14	1	Other	Other
+99c4ac34-f94a-436f-b94f-aa7a15fcadca	1	Other	Other
+99c4c6d6-65ec-4e2e-be75-bae841c6e777	1	\N	Other
+99c525b1-a193-462e-8472-4b67e032e497	1	Other	Other
+99c537cf-838c-4812-8d3f-1b7f7355ba3c	1	Other	Other
+99c54a06-5f7b-4368-933a-cff77c4280b7	1	Other	Other
+99c551b7-90a6-42ee-8298-9bbb3bfc3532	1	Other	Other
+99c5695f-148f-41b3-882b-b39390f3a7f6	1	Other	Other
+99c57957-0272-4221-abae-722f91e58c6b	1	Other	Other
+99c5d7ee-9f26-4ddf-b201-bda352549ce5	1	Other	Other
+99c60383-d3a8-4cf1-97c2-82054b7c1c5f	1	Other	Other
+99c65fc2-5de7-46ee-b9f9-6cd03ac14594	1	Other	Other
+99c68a7e-9b2c-4412-a3af-1a96d6027e85	1	Other	Other
+99c6de45-744f-48fc-b5c0-0eae78849b7b	1	Other	Other
+99c6ec66-1851-41f5-9eb1-f1b486e27acb	1	Other	Other
+99c70ce7-e8c9-4b3a-8b3b-e3985a05cbb5	1	Other	Other
+99c70f9c-e2a0-4ec4-8f2c-ba39e5203409	1	Other	Other
+99c71ced-938e-45c7-b775-1376f52f42a5	1	Other	Other
+99c72a39-a14e-4da5-bfe3-d3ae68510139	1	Other	Other
+99c73b0d-5b46-4865-84bc-d4af00d5ad67	1	Other	Other
+99c73cf2-6127-4a51-bbe0-db3776d67917	1	Other	Other
+99c79630-2b5e-4c04-b1ae-8775d47f7bb9	1	Other	Other
+99c7ac54-9551-420d-8d46-9e23f94d1191	1	Other	Other
+99c80fc8-ac26-4075-94cf-b9b763057563	1	Other	Other
+99c83e92-b21e-4f6e-80f0-5ec573d76284	1	Other	Other
+99c86dad-1a80-40a8-9f7b-0d5162691d27	1	Other	Other
+99c88817-0f99-4b85-90ea-0952cb92bcb5	1	Other	Other
+99c8a1ac-61c0-40a9-8d46-dffa82bd651f	1	\N	Other
+99c8a1db-36ca-4fb8-b845-235d7a51b88a	1	Other	Other
+99c94c33-26f2-4556-b8a4-69410ebb40d2	1	Other	Other
+99c9b568-e795-465c-bd52-158418a68186	1	Other	Other
+99c9d995-7581-48de-b81a-f91f71b55fed	1	Other	Other
+99ca70da-6a81-4a57-b8c3-d650430ae54c	1	Other	Other
+99caad86-b1fb-4cb4-ac63-ecc80082676d	1	Other	Other
+99cab2f6-5140-4cdb-b22d-6e084283765e	1	Other	Other
+99cac2b7-750b-48a1-95fb-988bfea139a6	1	Other	Other
+99cb1035-8301-4e21-8ae7-e93bc9fd51a3	1	Other	Other
+99cb1764-c889-4411-8b52-2d69ed626321	1	Other	Other
+99cb2933-76c9-40fa-b48e-8d827d54697a	1	Other	Other
+99cbe7db-694e-402d-abbc-209a84f4c8dd	1	Other	Other
+99cc9ca9-75ff-458d-be7d-0ab7813ad7b0	1	Other	Other
+99ccd8e8-ee27-4687-bfe6-0d36da32a68f	1	Other	Other
+99cce9a7-d4c4-4089-8536-319de4b4d380	1	Other	Other
+99ccfd30-6c5c-4b5f-9ca0-3461fa4d965a	1	Other	Other
+99cd2e52-bab7-4d23-8072-24cbec97d4d9	1	Other	Other
+99cd6ebf-f2a7-490e-bae8-5aa37fc10d20	1	\N	Other
+99cd8fda-a307-4ee3-8cfd-0300e5cdcfa3	1	Other	Other
+99ce0cf6-9d61-4a85-b020-aaf8ea393495	1	Other	Other
+99ce4a1f-14ac-49af-b46a-04e6af09d177	1	Other	Other
+99ce6cb6-6bfd-482d-b02c-afab76581d4f	1	Other	Other
+99cedd0b-132d-4cb1-9cce-4478794b463d	1	Other	Other
+99cf5b29-9c0e-47ce-90e8-e1337f613c02	1	Other	Other
+99cf8df7-7929-4a74-a73f-6498570d2cc9	1	Other	Other
+99cf8fdd-9ea5-484c-91df-a3c768828bb6	1	Other	Other
+99cf94f9-abda-4403-9c6e-b9e31474b5b7	1	Other	Other
+99d033da-ff00-41df-83d4-8060feca766e	1	Other	Other
+99d07650-a65e-44a0-88ea-9f847e2a41fd	1	Other	Other
+99d095a7-386a-4b51-aada-b905bdbee4bf	1	Other	Other
+99d0aa54-03a4-46cb-b346-658ccc10d5a2	1	Other	Other
+99d0cd27-e3f4-4b66-9a76-348e30952301	1	Other	Other
+99d10318-ab10-4db1-b98c-262e60a77798	1	Other	Other
+99d14c28-8106-4c77-8f18-f619aad594ab	1	Other	Other
+99d18055-72f2-41d5-b33e-772990d234ba	1	Other	Other
+99d195c4-016b-4d8f-ba56-5f186d51bfac	1	\N	Other
+99d1a068-18b8-44d6-91ca-86a8405ca97c	1	Other	Other
+99d1c904-c1b1-4d90-be1f-8020672d7806	1	Other	Other
+99d1f13d-5d83-47c3-a1d7-806ade0cd41b	1	Other	Other
+99d205cc-b95e-4392-8c94-61758074f94e	1	Other	Other
+99d21efd-def6-43dd-830e-260cbfd0a7b0	1	Other	Other
+99d2820f-24c9-436a-90e3-06215af0cead	1	Other	Other
+99d2c744-736c-491c-81c8-c583b876ed75	1	Other	Other
+99d2f406-53fa-498f-964a-db9e3a125619	1	\N	Other
+99d30fec-d44d-4a3b-8e76-e08a73958d98	1	Other	Other
+99d3ef4b-176e-4d0f-bf0f-6ba3fb9b11be	1	Other	Other
+99d4463b-cdb9-4c18-889a-e1a203e336e2	1	Other	Other
+99d44854-c2bd-41b8-a6ea-ed4af69f8ec6	1	Other	Other
+99d5041d-0f5f-4da0-b867-5aca919dcd33	1	Other	Other
+99d506f6-703f-473a-8e4c-188ed39d4483	1	Other	Other
+99d512c7-1cd6-4392-8764-01a419a696a2	1	Other	Other
+99d51eae-f7c0-496d-bc8c-e90fde3cd3fd	1	Other	Other
+99d652bf-a7c7-4988-b94e-91a0af84eb73	1	Other	Other
+99d671d3-8700-49e2-9a68-7fb24fcc2218	1	Other	Other
+99d6a371-d099-4459-b9c2-d0df8ecb9adb	1	\N	Other
+99d6a43f-9059-4bb0-be2c-82d754929fa3	1	Other	Other
+99d6cef1-dd9e-4893-9d02-44bfdb863829	1	Other	Other
+99d7098a-0fd5-4daa-9f25-2b7efc2b2627	1	Other	Other
+99d71000-36fa-4517-8831-bc936676998c	1	Other	Other
+99d72122-4a9b-41b9-87f9-8219d6c07236	1	Other	Other
+99d72e4a-fb12-4204-a7f3-428dce5c430a	1	Other	Other
+99d72fb2-b55e-416d-a3c6-b052c6dbd505	1	Other	Other
+99d76e6f-918e-40a5-9131-951c41b5182a	1	Other	Other
+99d776e9-66f2-4eef-9b6c-447cc05ebe40	1	Other	Other
+99d77ad7-dfaa-48cd-a0ae-e284f23e7831	1	Other	Other
+99d7967c-ddab-49ba-9b69-c549a80cf5d6	1	Other	Other
+99d822ce-0674-4cd1-b8a4-33649f5f7e00	1	Other	Other
+99d830d9-1f1f-4e83-b07a-4a2929f77f32	1	Other	Other
+99d850ba-3e1b-4da2-b7e2-ad2811a9c92c	1	Other	Other
+99d85d30-897d-4b58-9125-fed44abc3686	1	Other	Other
+99d87136-9b71-47af-a8f6-9ff3a43a45b3	1	Other	Other
+99d8cb93-6c80-47bf-9673-43c8fd35fa1b	1	Other	Other
+99d90bc3-e481-4b5b-a16c-8308c4685834	1	Other	Other
+99d9469f-9048-472e-84ee-b4fed74cae89	1	Other	Other
+99d96463-5882-4932-9482-8480b0ff14f2	1	Other	Other
+99d982f0-27cc-43c4-8254-83fc65f1f2cf	1	Other	Other
+99d99770-ee20-4704-8fc8-c57f0686442f	1	Other	Other
+99d9b047-d64c-4ce2-86d3-817d5f980b55	1	Other	Other
+99da7ae5-aa53-4fbb-b8a4-37c29af2818a	1	Other	Other
+99da9f09-4479-46da-911b-d21024a67aed	1	Other	Other
+99daca2c-5379-408d-be1f-895ee520335a	1	Other	Other
+99dad368-4bb9-44bc-92f2-26c0735d2fd6	1	Other	Other
+99db18c7-b2c7-4485-8eb3-706295ef3c2c	1	Other	Other
+99db18e7-f060-4e71-aca9-12b469e53a35	1	Other	Other
+99db1d79-6f23-43e1-92e9-b96ac2b1a576	1	Other	Other
+99db4553-53a1-4dda-93bf-1911c1fa1eed	1	Other	Other
+99db580f-cfec-42c4-915d-e2462fee109e	1	Other	Other
+99db5da4-ebfa-4047-ac8a-e71afc674f63	1	Other	Other
+99db70e3-8a53-4d3d-bc98-9676f68484bb	1	\N	Other
+99dba1b4-0b65-4bb4-aef3-309074e1d742	1	Other	Other
+99dbad9c-f842-44e6-92e8-d475e54c3259	1	Other	Other
+99dc2bbc-3271-44ea-a788-d9900a085980	1	Other	Other
+99dc73fe-93f3-4967-9caf-dbaa6b0b7db6	1	Other	Other
+99dcbd36-5fb0-464b-a6fb-e3adda5fcd1a	1	Other	Other
+99dcdc4d-eb03-4941-91e9-9ed336a6b7bc	1	Other	Other
+99dd1d0c-6f42-4933-b7e0-7cfecc727f72	1	Other	Other
+99dd1e8a-92ac-4203-816c-2a7cc48d5756	1	Other	Other
+99dd52aa-eefb-4444-b998-480e81f31267	1	Other	Other
+99dde660-8bb4-405d-9152-9ab8368c4110	1	Other	Other
+99de2887-ed5a-4db9-9727-9bf3fbddabd1	1	Other	Other
+99de862a-2e05-4045-b8d5-497378802f0c	1	Other	Other
+99dea236-084d-46e7-a1d4-f98f32bc7008	1	Other	Other
+99deb503-e20f-4ec8-8009-d53a9664d3b9	1	Other	Other
+99dec32f-ac55-439c-918d-0c06ffa15fed	1	Other	Other
+99ded883-ff97-4eb6-a5aa-9d7abf512a0a	1	Other	Other
+99dee670-168a-4a49-af5a-507ecc55858e	1	Other	Other
+99df1a6c-d6d8-46c9-8274-4164447fd964	1	Other	Other
+99df99cf-2e7f-4c50-a163-04fc63e5f6fc	1	Other	Other
+99dfcba7-fa34-4577-9c88-aa8a410efa5d	1	Other	Other
+99dfd02e-5e16-45d3-8387-c9f71e352ba3	1	Other	Other
+99dfe999-099a-4ac3-b11c-40860f12ae05	1	Other	Other
+99e045c1-4e7b-4f73-acfe-c385ed5852cd	1	\N	Other
+99e06851-e320-47d4-96aa-5167279422d7	1	Other	Other
+99e0e754-4fa3-4971-b72a-a3821d9e319f	1	Other	Other
+99e0fa6f-e8f0-4177-93a8-16a4ceeeb451	1	\N	Other
+99e10267-0d92-4566-b976-1fdf5cd8a476	1	Other	Other
+99e1231f-b3c6-4d7a-ab83-6efe29fec07a	1	Other	Other
+99e1c6d8-41f2-4b60-b828-e764a722befe	1	Other	Other
+99e1da1d-cae8-4e14-aa21-d08291071f58	1	Other	Other
+99e1ddfa-3d39-45df-8c02-efb026e9abed	1	Other	Other
+99e1ee33-6d60-42b2-8b82-5b1c64c3a0d2	1	Other	Other
+99e1fd3a-59d8-4697-8300-c0bde2184ba5	1	Other	Other
+99e22504-14c9-4023-9447-9bb5c043dfb9	1	Other	Other
+99e24c89-10ee-47db-a3ce-041bf5bf1f9e	1	Other	Other
+99e26710-f719-4f32-8a1a-6a71f642e546	1	Other	Other
+99e28101-f138-4283-9317-b6cc87db80cd	1	Other	Other
+99e285ba-333c-4442-b41c-011ded9a1671	1	Other	Other
+99e2952c-1431-47ff-aacf-4ffba1edf467	1	Other	Other
+99e2aac2-da2c-47ca-a872-485445c21f1a	1	Other	Other
+99e2be50-12e5-4489-bc6c-8f3d649b52cc	1	Other	Other
+99e2ccc6-7aec-4379-98f2-0c030f500cef	1	Other	Other
+99e2de5c-b3ba-47cd-9366-24dd47fafd7e	1	Other	Other
+99e38b00-826e-4b96-91e6-72c329063c23	1	Other	Other
+99e38b23-d9e9-4cea-8ffd-e2dc05160e76	1	Other	Other
+99e3ce19-469f-418e-9796-6b328833cdb6	1	Other	Other
+99e3d6fe-e599-4a14-9b98-0335bd59b7ec	1	Other	Other
+99e3dca6-ca76-40f5-93bc-ea1c454b700a	1	Other	Other
+99e413b7-4586-45c7-b384-7d046f654047	1	Other	Other
+99e458e5-cdf8-4a3d-8c4f-2553910a313b	1	Other	Other
+99e45f77-72d1-4377-9baa-14583caa3deb	1	Other	Other
+99e4afb4-0b11-4abd-b473-89f8f68a9d5f	1	Other	Other
+99e4de55-eaec-485d-b6c2-bc66e849c7e4	1	Other	Other
+99e5077e-89fa-45d6-ad8a-37daa3c56619	1	Other	Other
+99e5577e-79d5-476a-a0b1-7e51b71fd4ad	1	Other	Other
+99e5afde-1267-4180-945a-ef5b02a17534	1	Other	Other
+99e5ff97-f251-4fd2-83f7-c9e8e68abe50	1	Other	Other
+99e60288-57f3-4d59-8439-a67c90259ea5	1	\N	Other
+99e6061b-db6d-4ab2-9a87-5a494b26df22	1	Other	Other
+99e60d64-264c-43c4-a29f-5e793d32b149	1	Other	Other
+99e61d2c-305d-418a-bf97-d4022e663a7b	1	Other	Other
+99e702a2-bf74-4924-9a21-07ef29558aca	1	Other	Other
+99e76dd4-3565-47e1-8506-44f3399c24f9	1	Other	Other
+99e775d7-9d60-4fec-877a-2e6edd8fa6b7	1	Other	Other
+99e787dd-e87a-4756-bba3-422e8faed429	1	Other	Other
+99e79289-3773-48db-8836-c202c5ab30cb	1	Other	Other
+99e7dc54-cad7-4eda-99f6-c85e115c41fa	1	Other	Other
+99e80655-f948-40a6-b800-23d356c31158	1	Other	Other
+99e81074-86ae-49e5-9bb4-cc1fecbc461f	1	Other	Other
+99e8792c-b829-4444-858f-63605753f2b3	1	Other	Other
+99e88d7c-ac79-4284-8654-4efb1ff82fed	1	Other	Other
+99e8c0a0-0c37-4267-b066-9b4948e75472	1	Other	Other
+99e8ec89-3937-4832-8752-d1897320a838	1	Other	Other
+99e8edd3-0a40-462c-aaff-174a110ca4a0	1	Other	Other
+99e9255c-c7c6-480e-8fd7-13017d210d1f	1	Other	Other
+99e94eb7-7a56-465a-8904-74b6bdbd6257	1	Other	Other
+99e95150-36c6-4b49-88d4-cbaede6031ec	1	Other	Other
+99e95433-a81e-433e-804a-f9d3a1c95113	1	Other	Other
+99e95f92-e3d6-463a-9d47-bdd62e3dfccd	1	Other	Other
+99e9619e-79e3-4c28-b916-aff97ac2b4e2	1	Other	Other
+99e9fafa-c708-4066-82b1-357d3a4a2b12	1	Other	Other
+99e9ffdb-1569-4dfb-b881-4e21a9691001	1	Other	Other
+99ea7914-5dc7-4ad9-828e-81320300a1b0	1	Other	Other
+99eaa9c3-1865-4a95-a0c0-5263368cb9b6	1	Other	Other
+99eb9128-293e-416d-a72e-c43bf9692e00	1	Other	Other
+99ebb8fd-1b5d-419f-acc6-925e19a376b5	1	Other	Other
+99ebc3b9-cb70-470b-9453-9f17a529384f	1	Other	Other
+99ec0cb0-299e-4735-82fd-bef192ed9de8	1	Other	Other
+99ec1b6b-88b8-4c22-a079-aa3455e7eeb7	1	Other	Other
+99ec3f4e-f9b1-42ea-a5ff-d7d607470c53	1	Other	Other
+99ecfc31-ca7d-4f0a-a676-5c850d185e97	1	Other	Other
+99ed1e98-f45b-4653-9caa-9360e988c36f	1	Other	Other
+99ed3671-5477-4124-94db-c5cf85f834a9	1	Other	Other
+99ed3852-db66-466d-ac00-903720d5795f	1	Other	Other
+99ed3bc0-8087-4f7b-9fb9-42430e8cfe29	1	\N	Other
+99ed4cfa-f2b9-4384-8773-8b6a3d9a4d5a	1	Other	Other
+99ed576a-9eca-4d8b-9dd6-548426538494	1	Other	Other
+99ed7dc9-a900-4b40-a1f6-053225f9374d	1	Other	Other
+99eda606-72e5-440f-907f-092465cef1cb	1	Other	Other
+99edb408-e792-455d-bd71-6a4bee656399	1	Other	Other
+99edb74b-69df-4349-ad67-4aeb9a59bb7b	1	Other	Other
+99edefc7-ae31-4227-b5db-358965ca91d8	1	Other	Other
+99ee555b-7c38-42ed-9fb7-b5a07f2a3fe4	1	Other	Other
+99ee5eb8-4d1c-4bba-b48b-cb1674d43dd1	1	Other	Other
+99ee7150-d784-440e-9003-f389c0597925	1	Other	Other
+99eeb858-c51f-4783-931c-fa7241008c61	1	\N	Other
+99eef88e-5056-4967-a12e-26e9b6c8d822	1	Other	Other
+99ef1947-c2ca-438d-b724-3e14cbec5425	1	Other	Other
+99ef329d-d78d-4a76-82e2-cd8def288306	1	Other	Other
+99ef7250-abaa-484f-97f0-9ee7246f9a5b	1	Other	Other
+99efa895-aff3-4127-9f97-593b77b135ea	1	James	Other
+99efbfbd-d4e4-430c-b9b2-3d02b11fabef	1	Other	Other
+99f02380-6082-47c6-a863-498d4a3583c6	1	Other	Other
+99f02878-61c0-43ee-ba96-6ba385c80c00	1	Other	Other
+99f0374f-eb45-4975-85bf-e60ad6407c71	1	Other	Other
+99f09e67-9485-4849-8a12-acc0169cfc08	1	Other	Other
+99f0f6fb-fa3b-4d37-83be-241ce9898247	1	Other	Other
+99f0f792-2947-428e-93c2-1f4c431e3298	1	Other	Other
+99f1007c-9816-43e3-8ad4-6f3eb0a1bb47	1	Other	Other
+99f10e34-37a0-4fb4-aa31-a6d04b670a8e	1	Other	Other
+99f120f7-613b-4f0a-a58f-553f2217bd32	1	Other	Other
+99f1686c-a911-4a30-9819-1e51dcacfaac	1	\N	Other
+99f1960c-2884-469b-a2d0-5dc854cae9f2	1	Other	Other
+99f19ca2-562f-4de1-a4b1-bb4195a330e4	1	Other	Other
+99f1e3ae-f5cd-4d3e-a312-d3163a6ee3a8	1	Other	Other
+99f1f704-12e7-4ff4-83b3-42d0a5c02e3d	1	Other	Other
+99f205e8-f924-4f2a-af84-26e7e87e56fe	1	Other	Other
+99f23780-c4a6-4fd7-899d-1524d53076b2	1	Other	Other
+99f24429-dc57-4a7e-b25a-8bfdb1bec565	1	James	Other
+99f29811-66e0-49a4-a473-4a6e3d4f74cf	1	Other	Other
+99f2b668-ebc9-49ef-adcf-e7aa4740347b	1	Other	Other
+99f2e7fb-334a-4c9b-9dfc-273e31298335	1	Other	Other
+99f2f2d0-a53f-43cc-851b-724ad1c40dae	1	Other	Other
+99f34be7-6264-46bb-a424-9a2768191ee1	1	Other	Other
+99f37724-a948-4742-9bf5-68b73a61f664	1	Other	Other
+99f3eb38-7f07-4bba-8960-e84198b874f7	1	Other	Other
+99f3eede-8487-499f-8cdf-b4f7ba7360e9	1	Other	Other
+99f3f084-fa6c-4761-95bb-769abfa76534	1	Other	Other
+99f400fa-411d-48b4-9919-bf3df35695a2	1	Other	Other
+99f41304-3cb7-4062-971f-5fddc9f45783	1	Other	Other
+99f46d13-bf0d-4333-9d88-c5b8ce0e897e	1	Other	Other
+99f4c9be-aee8-4f08-8095-64c0a4baba42	1	Other	Other
+99f4e1cf-7192-4e5b-ac4c-084f79ca1a9e	1	Other	Other
+99f50185-3c4e-48ce-8ede-8f67d72bac75	1	Other	Other
+99f50365-e31c-45df-bf8b-81ec70ada4f5	1	Other	Other
+99f519a6-19c5-4dae-afd6-0630a6961342	1	Other	Other
+99f537f7-115a-4fab-9968-f227215910ec	1	Other	Other
+99f53a60-01de-4520-a6a8-da46ec265ab3	1	Other	Other
+99f5691c-8fd8-430c-a4c2-7ed88270e1c6	1	Other	Other
+99f585c9-b912-4c2e-a54d-5253c118cbca	1	Other	Other
+99f67cf1-fce4-4a6b-8614-c0f20718a26b	1	Other	Other
+99f71428-bfed-4fd6-8a6d-75ddf7509a1d	1	Other	Other
+99f73081-ac29-47c1-8ca3-36b9d3be4713	1	Other	Other
+99f7381f-37ce-4e07-9712-ff32ff17667f	1	Other	Other
+99f74ab0-8166-422c-915d-6b439f91c818	1	Other	Other
+99f7a8be-02c1-4be0-b966-ff84e5244ea1	1	Other	Other
+99f7ab4a-cfbd-4345-851d-57065796b5e4	1	Other	Other
+99f7b800-f15e-4fd7-84c5-a49171ebc8b5	1	Other	Other
+99f7da61-6d6f-49b2-a8db-67cbb8aa0b6f	1	Other	Other
+99f8a041-5e18-42dc-b0f7-4b0ca50f5948	1	Other	Other
+99f8d78b-ce3a-4b30-a8d1-1232e504f190	1	Other	Other
+99f905cf-8551-4cfe-af36-48dd6aec79ad	1	Other	Other
+99f965e9-e212-4133-a98a-568254600d6e	1	Other	Other
+99f97aee-fd60-4135-bb59-bb518f7b3dac	1	Other	Other
+99f97e5f-b360-4871-9a17-a1ce6c660924	1	Other	Other
+99f989e1-d3b4-4236-b399-ba2c4693bd60	1	Other	Other
+99f996d5-b09f-485d-a171-dbfbb4fff6bc	1	Other	Other
+99fa1dbe-406e-49bb-b134-cc6c63d40783	1	Other	Other
+99fa71ba-6c89-4426-9939-f24594e1a68d	1	Other	Other
+99fa82cf-b3d8-44cb-9fa3-97d13a3010f2	1	Other	Other
+99fa8e93-6702-44db-94ab-5696cd161d6d	1	Other	Other
+99fb0a2b-95f8-4106-bf16-4659e61d113d	1	Other	Other
+99fb0a9a-1d1f-4b34-9b7f-59572e5593a5	1	Other	Other
+99fb2754-c8b5-4bf7-b35a-3bc5417a4f77	1	Other	Other
+99fbb2e8-1a01-44aa-b451-fdfd2c844ae0	1	Other	Other
+99fbb691-b4e0-47a9-bbe1-2015910a785d	1	Other	Other
+99fbc62e-18fe-455c-8d38-e417951ed80c	1	Other	Other
+99fbd7ac-2ce8-483a-9b26-ecf95c7feb31	1	Other	Other
+99fc07ba-c260-4305-a21e-06ab41a23247	1	Other	Other
+99fc30ed-3457-45b9-a27e-ef37b0990d35	1	Other	Other
+99fc5b68-5d2a-4f5a-afd5-bd7a09aa2876	1	Other	Other
+99fc80dc-d8a9-479d-81b0-d64a85da0547	1	Other	Other
+99fc8438-9dc2-417c-b01b-c59b1f344ebb	1	Other	Other
+99fca689-5738-4e14-80e4-a8a3852f8239	1	Other	Other
+99fcb35b-8006-4499-9092-b935108b9458	1	Other	Other
+99fcbcc4-4fbc-40eb-9dda-b2001c372c4c	1	Other	Other
+99fcf081-bd0e-49cc-9c8a-708acd50e8ae	1	Other	Other
+99fd1ad9-b653-43ee-83fd-a217f47d05ff	1	Other	Other
+99fd4455-6ab2-4bd5-8064-deaef3c03807	1	Other	Other
+99fd71aa-2c91-4959-be7c-1668469d1544	1	\N	Other
+99fd7a90-d895-47ec-b39e-dd7c26ad9b4e	1	Other	Other
+99fdb9ba-339a-4eaf-a7f2-3ebfedca35f8	1	Other	Other
+99fdd6d7-04f1-49b9-ab53-8d0a87139d26	1	Other	Other
+99fe4110-e485-4c9b-8ba7-c859b1385fe2	1	Other	Other
+99fe73dd-a729-40a6-bdcf-bafaed86fa99	1	Other	Other
+99feb644-fc2d-4df5-9533-6ebaea5c6eeb	1	Other	Other
+99fee07b-d8c5-41be-bae3-4bf5ec575447	1	Other	Other
+99feeb06-185d-4f92-aa50-752d87522234	1	Other	Other
+99ffa80b-36b6-4423-ad15-340b979bc584	1	Other	Other
+99ffc885-e615-4090-8a10-7a5aed41595a	1	Other	Other
+99ffeb65-6ee4-4d55-8094-7e75bac315f1	1	Other	Other
+9a002479-6efd-4c3d-a0ea-c17bb5d6de50	1	Other	Other
+9a002830-5b10-43aa-92fa-da5df0618688	1	Other	Other
+9a008787-608c-4669-b1e2-01d6f5ccc590	1	Other	Other
+9a00cf61-3294-4811-aadc-ac926ddfd6a3	1	Other	Other
+9a012e93-c470-4e39-a7c7-1f30494dd496	1	Other	Other
+9a016d6f-873b-49e7-8638-f8dcad225be1	1	Other	Other
+9a01986d-e2d9-4400-8581-4cb7719ae256	1	Other	Other
+9a019fad-ec73-4fa8-8eb5-29a2c635742c	1	Other	Other
+9a01c39e-beb8-4473-8fd3-226dbd1fad7a	1	Other	Other
+9a0224a6-9aaa-4d70-a1b0-a9b7e6f316b8	1	Other	Other
+9a0255ac-73ef-46ea-936a-bbd6d6d4ba7a	1	Other	Other
+9a02a4b5-c0e2-4e40-82bc-43977aac12da	1	Other	Other
+9a02aeb1-92f8-4fc3-80f2-b719f78ff4ea	1	Other	Other
+9a0305ba-4bcb-4a8b-88bd-2bdd1bb3486c	1	Other	Other
+9a038721-7420-4b11-9b18-6422b629842f	1	Other	Other
+9a03a918-c31f-4f43-9a26-60ff3d2617fa	1	Other	Other
+9a03ce9e-3913-4708-bd30-509a03a78cb7	1	Other	Other
+9a0402c7-72d8-45d4-abe3-10c897134975	1	Other	Other
+9a041913-e53d-4930-acc0-64f9c034e358	1	Other	Other
+9a043371-0ffa-4396-ae47-37c0f44a4103	1	Other	Other
+9a0458a6-cd86-4a6c-9867-01d4c36bccb9	1	Other	Other
+9a0462ea-5c94-4910-ba3c-5daad0749341	1	Other	Other
+9a04633f-3714-450b-b15a-3c2d8ae0c5d7	1	Other	Other
+9a048ba5-9573-4002-82f6-b02ad7a932cc	1	Other	Other
+9a04d0f5-dbb1-48c9-a553-66d362d25611	1	Other	Other
+9a050596-3d39-4580-8ec2-e26b2db65fb2	1	Other	Other
+9a053215-91ca-4853-9f2c-7340ea1caa0f	1	Other	Other
+9a0537b0-8708-4b2f-bb44-179db2123778	1	Other	Other
+9a059a8b-e139-4f51-8b2f-0882dff9d4d1	1	Other	Other
+9a05bd8d-fa79-4d5b-9b59-1b9f125db0e5	1	Other	Other
+9a05c6dc-ed89-4b26-9b31-ad9d6b47c3d7	1	Other	Other
+9a05d429-b965-48c3-9c84-726e5720c0d7	1	Other	Other
+9a05d915-ff82-4e25-a3f9-7266d5c40b53	1	Other	Other
+9a05e2fe-4a75-4b71-b1be-f0b3a2d20951	1	Other	Other
+9a05f5ec-4072-4da3-81ea-87b7d3ae361c	1	Other	Other
+9a062538-eecd-49f3-b048-2ff0d228de90	1	Other	Other
+9a064055-ac46-48ee-afe7-bd749a2a213f	1	Other	Other
+9a066b15-923e-4128-a7db-bfc48daedeee	1	Other	Other
+9a066eea-be3d-4abe-83b9-ef078373b7c8	1	Other	Other
+9a06a24f-f92e-4486-b898-5680897db72e	1	Other	Other
+9a06ed04-8092-4ea6-bf23-08cee9093b6d	1	Other	Other
+9a078dc0-6e93-4cd9-86e8-08f970bbe460	1	Other	Other
+9a07dcec-4f33-466d-bf29-8cc07f9e9bfc	1	Other	Other
+9a07e715-b6a7-46da-838d-8effa9036de2	1	Other	Other
+9a07fe32-ac06-4107-9851-96dc54214238	1	\N	Other
+9a080f3c-5b3e-49cf-be16-aa0d1f805f80	1	Other	Other
+9a081eac-f2f9-4cd9-b2d6-9eec61b59ff6	1	Other	Other
+9a082ecf-9e0e-4e3c-ab60-9575efbca721	1	James	Other
+9a0832e6-f28b-48b2-9bca-5dd186a62083	1	Other	Other
+9a0853c1-2444-41f4-9544-80c9d63f10ea	1	Other	Other
+9a086186-74dc-4df9-9a23-5f93934851b2	1	Other	Other
+9a087948-748c-44ba-811e-96776676b793	1	Other	Other
+9a08f2b2-4675-469b-b394-b867f8fea6de	1	Other	Other
+9a0a1aad-33da-4218-8593-9a639853fb4f	1	Other	Other
+9a0a415c-af1b-4510-99f1-5b025bdca804	1	Other	Other
+9a0a5554-be85-4c7d-86e3-b4045ae81bf6	1	Other	Other
+9a0a778e-c96d-465f-888e-7d1258440be8	1	Other	Other
+9a0b06f2-6ab2-45de-b44c-7000b837b2bb	1	Other	Other
+9a0b3ba8-190a-4e21-a321-29128cdba797	1	Other	Other
+9a0b8918-5a45-4b00-9a69-4d84ff53d039	1	Other	Other
+9a0c32ee-6411-4b2d-b109-793aae6ab8eb	1	Other	Other
+9a0c355f-4ede-4334-abec-c99599bb0a54	1	Other	Other
+9a0c9473-4aee-4dab-8a38-4c3d488077c9	1	Other	Other
+9a0ccceb-be18-4a2d-9689-fb513a045f15	1	Other	Other
+9a0d1f44-c8b7-4ce1-b1c1-9360a36d0a8d	1	Other	Other
+9a0d4ca5-5dde-457b-8dce-43dde33a87eb	1	Other	Other
+9a0d6fad-3dbc-46b5-9c4f-8d39500dc95c	1	Other	Other
+9a0d9273-6b9d-486e-b4c2-0597a69c8cbc	1	Other	Other
+9a0d9730-efe0-449f-b57e-0d4012b43506	1	Other	Other
+9a0e0c55-f65b-4dfb-ae77-c24cddaff33f	1	Other	Other
+9a0e3583-eff8-400c-a275-6f36bfc73126	1	Other	Other
+9a0e54ef-7f2a-4c64-89c7-75c8688bc98d	1	Other	Other
+9a0e6fe0-28d8-49a8-a242-d00b64134df0	1	Other	Other
+9a0e9727-6188-4373-825d-a502cf975d31	1	Other	Other
+9a0eed65-b6ef-4960-996c-55fa2a61c309	1	Other	Other
+9a0f3395-88c8-4292-821a-36b51af4aeb0	1	Other	Other
+9a0f433c-5aaa-4460-a5ff-f0fa989f7be4	1	Other	Other
+9a0f6a8c-2779-4673-821f-abc6387a41d9	1	Other	Other
+9a0f8d2f-c4bb-4cb1-956d-64b7a56c4350	1	Other	Other
+9a0faa72-b95e-4f18-ad89-42e4bc6a628f	1	Other	Other
+9a0fc401-e6ba-4bff-8afd-0b23c95c5ff4	1	Other	Other
+9a0fd252-8c52-40b7-99cf-e3a5a5fb6111	1	Other	Other
+9a0fd9f9-33aa-4b15-b011-768d07673a76	1	Other	Other
+9a10050a-0e31-460a-bfa3-9c2bf8ba8e8b	1	Other	Other
+9a100808-628c-4574-81f3-ce4f7fd586ee	1	Other	Other
+9a10198f-3110-410a-83a7-6eef076c3768	1	Other	Other
+9a104b2e-83a3-46cb-95c7-d17a540a5caf	1	Other	Other
+9a108749-4217-4e67-accb-2b9832e10e69	1	Other	Other
+9a10ddec-1a5e-4207-b636-f275d1988f59	1	Other	Other
+9a10f323-fdec-45d2-b165-f28c3034fe9b	1	\N	Other
+9a10fd0f-ac75-4acd-953d-4932f38bce68	1	Other	Other
+9a111f3b-e640-4cd8-9dfb-992cf713b880	1	Other	Other
+9a1130dd-3b60-4077-87ff-79778d28befd	1	Other	Other
+9a113e83-c1b3-499e-86e9-f537a995e03e	1	Other	Other
+9a11543b-b54b-4672-92ee-11bb61114ac3	1	Other	Other
+9a115a9e-d3c5-44a8-a436-ef25274a3cee	1	Other	Other
+9a115ade-82bb-4558-b581-46e603c5d8ac	1	Other	Other
+9a115f18-9623-41db-90a2-f4cf0b52d256	1	Other	Other
+9a116a0c-f7cb-4b4c-8da8-895f511ccac1	1	Other	Other
+9a119fcd-250b-435f-bed4-59cf7786e64d	1	Other	Other
+9a11dd4a-6cc9-47b3-8d95-1d9943a9f934	1	\N	Other
+9a11f886-6f49-4a49-8c87-722c68695c5e	1	Other	Other
+9a1203cc-5d19-4a4a-96f1-f8c4a84937f9	1	Other	Other
+9a124c18-bb39-43cf-bb7c-c2315b53961c	1	Other	Other
+9a12e960-0906-4cec-a69c-14eec1eed9e8	1	Other	Other
+9a1334a2-76ed-465f-8028-5810c53a28e5	1	Other	Other
+9a1351ea-8f66-4478-a1d7-fcd157e9c542	1	Other	Other
+9a139987-6049-46e7-ae07-5f627a91efab	1	Other	Other
+9a13be92-a44d-4057-962a-98e4a8d30a5e	1	Other	Other
+9a13cb89-4982-4ebf-8d66-bcaa39d5289c	1	Other	Other
+9a1420c6-8ec2-4c5a-a4a6-edf0a254436c	1	Other	Other
+9a142805-d3f3-4eb5-831b-582b95bbdaf1	1	\N	Other
+9a1438aa-826b-4228-a39d-d47aa6515ccc	1	Other	Other
+9a144847-2c4c-4a7f-ae14-56df10ebf790	1	Other	Other
+9a144fe0-0d60-4b26-9139-da02c7aecceb	1	Other	Other
+9a147901-359d-476d-8374-d9a9999b58d6	1	Other	Other
+9a14a231-cf89-428a-986f-225806bd9213	1	Other	Other
+9a14a617-0598-4d64-b691-7bbf522a1877	1	Other	Other
+9a14ae84-d032-11e7-98ff-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9a14b50a-7e84-47cd-b900-f6554e54af8b	1	Other	Other
+9a15087a-35bb-4124-891d-99c1d0c62f96	1	Other	Other
+9a1533ed-0a7f-43b6-91e0-bdf62ed2b674	1	Other	Other
+9a153a05-7c54-4656-bc1f-a367126f8881	1	Other	Other
+9a156d37-f66a-41b7-8d28-36c60f3de665	1	Other	Other
+9a1653d5-d350-4f40-ac66-86f5f650d975	1	Other	Other
+9a16861a-be94-4c8d-a6d3-f9da5126632c	1	Other	Other
+9a168661-e260-45b8-8743-5b11c4e60bd6	1	Other	Other
+9a16b86a-0ced-4a93-990f-bc7f01a570c5	1	Other	Other
+9a16e085-a9ca-4acc-9c2b-3600f470aec8	1	Other	Other
+9a16ff77-0739-4ec1-b7fc-8e4106c72a9f	1	Other	Other
+9a178c28-6518-43bd-b908-dd4cb115d8d9	1	Other	Other
+9a17ca78-236a-4082-b9ef-4a094f799cf9	1	Other	Other
+9a17cead-f177-44d8-8403-2e3443b16c7e	1	Other	Other
+9a17f5d8-3916-42d9-ad98-a9d6dd5c9d10	1	Other	Other
+9a180cc8-3e63-4d5b-b8ec-bf252f068632	1	\N	Other
+9a18129b-eee4-42fe-b0ae-736e1f69bc09	1	Other	Other
+9a19803d-7342-4ee3-870e-07bc12fd528f	1	Other	Other
+9a19cb16-e675-4bd2-aae8-3041fc72b4dc	1	Other	Other
+9a19f6c5-a4be-41cd-b150-d5110636f578	1	Other	Other
+9a1a0f56-2aff-433f-a374-350440f54b2e	1	Other	Other
+9a1a3db5-eef7-4955-acfd-4d810642d99c	1	Other	Other
+9a1a5c12-6952-414b-a42c-1459e44e0eb8	1	Other	Other
+9a1a9027-169e-4f9e-9b4c-9fffc88a77f6	1	\N	Other
+9a1aa76a-d04b-4bbe-b999-19c17cd13c30	1	Other	Other
+9a1abee7-6f5a-4baa-a11f-229f7eb0df96	1	\N	Other
+9a1b2814-de0d-473e-a745-7ba65cdef1a2	1	Other	Other
+9a1bdae7-faca-4e12-bf9b-8285775b1682	1	Other	Other
+9a1bdd50-4da2-4134-9a13-3af7fc0c6f0d	1	Other	Other
+9a1c2373-9746-4729-b927-73dd383acc84	1	Other	Other
+9a1c2a91-f55c-4363-99d0-18784fde52aa	1	Other	Other
+9a1c32fe-8152-4e34-87ee-8c0e5f71a147	1	Other	Other
+9a1c4715-efd5-425b-91fb-3e06eb284877	1	Other	Other
+9a1c6eab-5a1d-4917-8c6e-283fc66529b2	1	Other	Other
+9a1cb114-471a-491e-8340-925b32b315d7	1	Other	Other
+9a1cccd6-6de7-4cee-9653-372a67eeaed6	1	Other	Other
+9a1d5012-9c12-42b7-af6a-bfa42369b6eb	1	Other	Other
+9a1d6291-0099-4052-9850-93272294ec56	1	Other	Other
+9a1d80cc-4df6-45da-9a19-591f8500f546	1	Other	Other
+9a1daabe-96b6-4058-b940-6faf0baff6be	1	Other	Other
+9a1df5ee-26dd-4352-b429-ddf69fa38fc8	1	Other	Other
+9a1e1709-478f-417f-ac7d-32309557c7d8	1	Other	Other
+9a1e2e04-ba5d-4f10-b97b-a5e0d2deff8c	1	Other	Other
+9a1ebf0a-af9a-44e0-afcc-70a1be06cc61	1	Other	Other
+9a1ec03d-ad05-417a-b5e4-34683de902c8	1	Other	Other
+9a1eeec8-49ec-47e0-aea8-1cb2cd044fb1	1	Other	Other
+9a1efa19-3eb2-49f9-87af-bb4c0f1c2602	1	Other	Other
+9a1f017a-abf7-4c05-af09-118ff3ca9ff7	1	Other	Other
+9a1f14eb-0e86-4a14-89fc-3e8f5ef4134e	1	Other	Other
+9a1f396f-a32a-40b4-97b9-b2dab924c01a	1	Other	Other
+9a1f501d-df52-40fe-8f31-797e1ca56ce3	1	Other	Other
+9a1f819d-f72e-47ab-aa5a-57851dc7bfd3	1	Other	Other
+9a1f9a0d-8fe4-4c69-ac66-5c9dea5d3f4d	1	Other	Other
+9a1fb2c5-07f5-4a2d-a765-e207867aa685	1	Other	Other
+9a1fccd9-aee5-40eb-838c-11628a6d1398	1	\N	Other
+9a1fcd01-bcbd-4375-aafd-d5165f958dd9	1	Other	Other
+9a1fddb1-b091-49f8-b48e-74415f4dd017	1	James	Other
+9a1fe996-0d17-402c-93c1-2ca9bdd86122	1	Other	Other
+9a200f30-b96e-497a-a6fc-522a52118b47	1	Other	Other
+9a202e85-4167-4e12-8339-db3cd5dc32c9	1	Other	Other
+9a205a8c-432f-4e69-919c-d1058146231e	1	Other	Other
+9a209b08-0527-439e-a1c1-18a28755d255	1	Other	Other
+9a20ab5c-3991-4d42-8b3d-ac95dbbf793d	1	Other	Other
+9a20b4da-8398-4d09-92a3-accd3b75bbe0	1	Other	Other
+9a20fce3-cfb6-4863-ae71-4a917b2e4113	1	Other	Other
+9a211435-9be0-48ad-9300-03feda35bd08	1	\N	Other
+9a215860-eaaf-4013-b839-6d03e4554ea9	1	Other	Other
+9a218564-13ab-44c3-88d3-4287155480f4	1	Other	Other
+9a2233bc-1374-4e5b-a2e0-bcfbb7d5e2f5	1	Other	Other
+9a2233e3-ef2a-4dc8-97ae-77b68af4440a	1	Other	Other
+9a225be3-f2be-4519-a3d8-55aedfb4366a	1	Other	Other
+9a2281fc-a53a-487d-99b2-2f80ffd56ac1	1	Other	Other
+9a22986e-6d1e-47aa-9334-6da32d184ba8	1	Other	Other
+9a229c86-1f86-4212-836a-29b148f6c36e	1	Other	Other
+9a22f4bd-7305-4fb6-951c-065656554a78	1	Other	Other
+9a238457-ec20-4867-b553-a68b3e06096e	1	Other	Other
+9a23ebb9-9e63-4a46-bc0c-3038ba0e22ff	1	Other	Other
+9a242bbf-edb3-4f28-a607-32c679bb9aa6	1	Other	Other
+9a244d3f-c71b-4cbd-9f6c-157f8dfb78af	1	Other	Other
+9a246e91-598a-42a6-af41-6dc277af55a8	1	Other	Other
+9a250ca0-4a70-4a88-9d10-60405ee53893	1	Other	Other
+9a257a52-fc03-402e-a1a6-cbe8e2e218cb	1	Other	Other
+9a263849-9ab2-4ec9-8661-d5612fe4c0f7	1	Other	Other
+9a266a33-1e00-4002-bf70-e13b06d768b6	1	Other	Other
+9a266de4-12e8-4e97-a881-c47844440d04	1	Other	Other
+9a26a8e2-142f-414b-8035-8b874ffe3070	1	Other	Other
+9a26d795-636c-49d2-8783-acfbd817f732	1	Other	Other
+9a26f11b-c80e-4603-ad63-26665ad8fd10	1	Other	Other
+9a26f918-4150-4956-91ee-1cf7763cda40	1	Other	Other
+9a275d39-3bc1-4995-8e33-ea60b8088235	1	Other	Other
+9a279191-7f56-4ea3-86ea-ce20931c5625	1	Other	Other
+9a282bcc-c3c8-405e-803d-1a5ca3c41b69	1	Other	Other
+9a28d7f7-ac14-4802-aa1b-acf8fd37e0cf	1	Other	Other
+9a28edee-9038-4199-b829-bfaca388ad08	1	Other	Other
+9a292f9b-8dcd-4f7d-9ee7-1b5f24356dc6	1	Other	Other
+9a299c3e-4a4a-449a-a8ac-dc0cf4e794b5	1	Other	Other
+9a29abb7-a1f3-4858-b7a1-ad80b333b5f5	1	Other	Other
+9a29c223-f910-47c1-b2c1-65359139bfcf	1	Other	Other
+9a29e39f-7a50-4f0c-866a-97dee432fb4b	1	Other	Other
+9a29f29b-4a81-40dc-85f5-e93fdd33bc86	1	Other	Other
+9a2a77d3-8a10-4da6-8e3a-2d267e60c319	1	Other	Other
+9a2ab3ff-5952-4653-b4fc-d2f59cfaac9d	1	Other	Other
+9a2ac718-68ce-4b0c-baca-60958a6231ae	1	Other	Other
+9a2b2945-64d3-41a8-a5fe-5458c60d3afe	1	Other	Other
+9a2b822d-ea16-4844-afcc-db0506361353	1	Other	Other
+9a2ba490-2a04-45bf-a7b3-d38d3f9ed2e6	1	Other	Other
+9a2c207e-2045-4ebb-9428-b7f2c7db8c71	1	Other	Other
+9a2c4abc-36ad-494f-b350-39400bebab0e	1	Other	Other
+9a2c68db-1edd-420f-918a-5cb0e70311c1	1	Other	Other
+9a2c7168-6781-4318-af8f-cb87dd81be23	1	Other	Other
+9a2c8f30-4bc6-426d-923f-2111c4254eb6	1	Other	Other
+9a2c9c2e-739b-4b3a-89e3-a3d3ba3f46d0	1	\N	Other
+9a2cbad0-ee66-4d58-a8c9-e0534311c4e9	1	Other	Other
+9a2cfc32-3b7b-47da-a4d5-90e181e29409	1	Other	Other
+9a2d0bdc-b33c-4fd7-9e01-7ede7b043812	1	Other	Other
+9a2d2795-ba0b-4602-974a-f05076613d5e	1	Other	Other
+9a2d2f82-d113-4349-9767-9604ea173a43	1	Other	Other
+9a2d4de7-ea7c-47c8-8eda-01f34f1c8862	1	Other	Other
+9a2de031-2713-4d3c-8af0-962ca1863f6a	1	Other	Other
+9a2de24e-2137-4248-a862-ec2ef2246cbd	1	Other	Other
+9a2dfa09-960f-473b-aa91-c13a110bf07d	1	Other	Other
+9a2e4ff9-a5b1-49f0-a15f-b31abc8cc9a6	1	Other	Other
+9a2e809a-5fc6-4e67-9437-56c153ba1024	1	Other	Other
+9a2e8900-6389-4b45-97a3-4e54ddf25543	1	Other	Other
+9a2e90df-bbd1-4655-8626-02c2999af99a	1	Other	Other
+9a2ec423-a9f0-4e6e-b9a3-f0463a811d5a	1	Other	Other
+9a2f17c6-9d65-4f1e-9946-bbfe816af545	1	Other	Other
+9a2f8116-52aa-4c41-8e2d-f653d25caa40	1	Other	Other
+9a2fbeb5-4598-4ea6-bd75-b238ca720ccb	1	Other	Other
+9a303740-ff3e-4450-a9bb-ecc4bca05a42	1	Other	Other
+9a304bcb-a8dc-44b0-8019-ee6c62e98f78	1	Other	Other
+9a3056d5-0222-4a57-84c0-2a3430962eb1	1	Other	Other
+9a307976-ec30-4173-bce2-8ade16faba60	1	Other	Other
+9a3096b7-2936-474c-9244-d9fea058c67a	1	Other	Other
+9a31282d-8eb5-4d4a-a0cb-7eb8d2bcccb0	1	Other	Other
+9a31480e-6507-46ba-a670-bb41864cd462	1	Other	Other
+9a3158e5-15ef-4fb9-a423-a74858563b89	1	Other	Other
+9a31a2ed-509f-4ee2-a50e-07a809b92939	1	Other	Other
+9a31c013-bc1a-4247-9de4-dcc20bee0dac	1	Other	Other
+9a31e914-4d99-4bd5-af90-23d84f98a411	1	Other	Other
+9a322d03-775f-436c-a63f-9e6907051a99	1	Other	Other
+9a322db1-dc77-41af-8bb8-1d3d96f71a76	1	Other	Other
+9a32bade-7859-47f0-a20a-1b684893a1ee	1	Other	Other
+9a32cbcd-15df-4b0f-8974-8fd8f18f19fe	1	Other	Other
+9a333ca9-35ea-42bb-907f-bab6bd4a8506	1	Other	Other
+9a335c13-046a-4b15-b0fd-3207ce2d13aa	1	Other	Other
+9a33aed9-683c-4a43-a128-c7f8b91d5d74	1	Other	Other
+9a33d535-99b3-49cc-8de4-963b8221635f	1	Other	Other
+9a341107-1775-433c-a1b3-0abadc8032e3	1	Other	Other
+9a341d1e-1520-47cf-8e37-bf03b4ce60e8	1	Other	Other
+9a345611-bd26-4ff5-913b-d9cea0870c7d	1	Other	Other
+9a348865-3b22-4e0d-b1d6-9501832aea9f	1	Other	Other
+9a349906-b8ee-49de-ba41-bcc13e50291e	1	Other	Other
+9a34b427-944e-4d18-bf01-6fd5ccb555e9	1	Other	Other
+9a356474-e5a4-4143-bfce-cc8d2632ec42	1	Other	Other
+9a3576a8-6fb5-4874-a2a3-5b6ea44ec99b	1	Other	Other
+9a35ea79-b8aa-4273-928d-257db59f233b	1	Other	Other
+9a35f605-5c87-435b-8fea-8d4229388c68	1	Other	Other
+9a35fc6a-f0d6-4041-9954-82fe6dab6207	1	\N	Other
+9a360923-5640-4ffe-a691-3976cbd2790f	1	Other	Other
+9a36a7f2-5a41-4ecd-8df2-6a4ba897efd1	1	Other	Other
+9a36ab9c-edb2-4cd5-8c34-d220a53248eb	1	Other	Other
+9a36df35-6b9c-4699-b717-e0250979d45e	1	Other	Other
+9a3728b6-9d57-44f5-bb50-de40b57fb612	1	Other	Other
+9a375817-821f-4b64-8441-eeac4f88d498	1	Other	Other
+9a3761ee-569d-4e3f-a23d-1313bcca4d5a	1	Other	Other
+9a377629-ea30-4314-a53a-02ae013bd240	1	Other	Other
+9a378063-1f0b-4386-be5e-b8bab84c5ab8	1	Other	Other
+9a37dab7-0c97-4f5c-8f19-1266c4ff45ba	1	Other	Other
+9a37e378-bc80-4c0a-87e3-1282442b434b	1	Other	Other
+9a37ec4f-07de-4b36-8d4d-d1093c19be9a	1	Other	Other
+9a3832f8-ec6b-4c2f-9c9a-d840060506ec	1	Other	Other
+9a383417-304c-46a0-bb49-f7313ae060c1	1	Other	Other
+9a38382e-3ff4-4624-b778-93fdb21e565a	1	Other	Other
+9a38869b-d3d4-49fa-9a57-c5f791c825c8	1	Other	Other
+9a390874-e0fe-49a6-8abf-75c8ba8106a5	1	Other	Other
+9a390e07-aee6-443a-b221-15b1c2dcdff5	1	Other	Other
+9a39a946-ee6f-445f-bb2f-631c20a3ef65	1	Other	Other
+9a39e33d-cce9-4daa-9d72-ad92bc8945f3	1	Other	Other
+9a3a1090-c6bb-4e52-bd23-389a39469369	1	Other	Other
+9a3a22ec-9ef4-44f5-b1d4-05900aac56ba	1	\N	Other
+9a3a6e2b-4fff-4ad4-b587-12489374fd50	1	Other	Other
+9a3a7289-b3f6-42c3-b025-a30be9832dcf	1	Other	Other
+9a3a89b0-6514-4cea-96f1-6fff729d6025	1	Other	Other
+9a3a9572-c96f-4a62-8ca2-9f9d5541cc77	1	Other	Other
+9a3ace6b-a6a6-408d-9982-a6f258f11713	1	Other	Other
+9a3b1896-24db-43b6-a0e0-d4df6029841c	1	Other	Other
+9a3b7bd5-5920-4f2b-9fce-38e510de9ff0	1	Other	Other
+9a3bb1b3-501d-44b7-82a1-d694e0a35dc5	1	Other	Other
+9a3bda15-2dcf-45ee-9947-d60b6315c5e4	1	Other	Other
+9a3beb79-c749-408b-a8c8-56f089fa1623	1	Other	Other
+9a3c004e-4cfc-4ed5-99f2-8a940dc4e59c	1	Other	Other
+9a3c1a9b-9efa-4b37-8d6f-f4a5fca0442d	1	Other	Other
+9a3c34bc-369b-4a06-afe7-d4c351f59f44	1	Other	Other
+9a3c5154-414b-415a-9fbd-fc62b55657b3	1	Other	Other
+9a3c867b-92a2-46d3-9762-106389509b0b	1	\N	Other
+9a3c9e88-4489-4c73-8d7f-b08661dfc291	1	Other	Other
+9a3cabdc-3109-4c09-9f23-7874b2db5c1b	1	Other	Other
+9a3cb2dd-857b-47ba-ae4a-12bed7e0a1e2	1	Other	Other
+9a3cec82-de6e-434f-a0db-ff008c90b765	1	Other	Other
+9a3cf641-e564-453c-b0a4-ef8e3afb8aa9	1	Other	Other
+9a3cf7b8-e74a-4898-a7f0-122c4bc88458	1	Other	Other
+9a3d1c99-cb29-4515-81ea-8561bf284310	1	Other	Other
+9a3d3ad3-910e-4df6-95d5-cd8a025d2ff7	1	Other	Other
+9a3d5b88-49a5-4d63-953b-94a71e3edeca	1	Other	Other
+9a3d7818-4d69-4c31-a969-b82a4fae42b6	1	Other	Other
+9a3d8f7b-f478-469c-88f5-c8bf97c4e7d2	1	Other	Other
+9a3d921a-2af5-4e20-8520-f6338173aaec	1	Other	Other
+9a3dadd0-ac7f-4ce9-84a5-c3a38155e2e3	1	Other	Other
+9a3dbe93-422b-4c9d-bc4a-e5968e3792ed	1	Other	Other
+9a3dcd42-048d-491f-9883-c89e5a0444d8	1	Other	Other
+9a3de697-82cb-47d8-a19d-e78d6192086d	1	Other	Other
+9a3e10b3-604a-4acf-8da8-f97c225bf3ba	1	Other	Other
+9a3e8a26-141a-49f3-b0f3-8a09a8f72b86	1	\N	Other
+9a3f0d24-6cba-4315-af1f-f3951b8ea107	1	Other	Other
+9a3f0fb1-66b0-4609-a8d2-2fc31748605c	1	Other	Other
+9a3f273b-ba4a-4804-9f60-e4a90562dc9d	1	Other	Other
+9a3f7c6a-99df-4466-b7ac-cba15a68dfb1	1	Other	Other
+9a3f9e0f-0642-44d6-a096-8fc93c9a5014	1	Other	Other
+9a3f9fe8-17b2-4515-9843-5f931b7cf282	1	Other	Other
+9a3ff27a-b26e-40b6-9c67-46cbffaea173	1	Other	Other
+9a403fc1-6591-44a2-b089-89cca7e591c5	1	Other	Other
+9a404734-d5da-4262-a61f-bda1c383eab2	1	Other	Other
+9a40519d-1ced-45ad-9bf1-2c501f2eb0f8	1	James	Other
+9a408b20-4ebc-463e-a3bc-6626491ae6e8	1	Other	Other
+9a40a132-0fc2-4872-b998-d5bfc17a179b	1	Other	Other
+9a40a931-06f4-4487-adc2-51caab9d4c2f	1	Other	Other
+9a4124b9-0207-4434-a4fd-c512311461d3	1	Other	Other
+9a4148eb-b9c1-4777-a759-e5d5027ebd48	1	Other	Other
+9a4162aa-4ec5-4196-8076-e58080ce65e8	1	Other	Other
+9a4167dd-26fe-4e9f-8850-8c79c1052792	1	Other	Other
+9a41b542-944f-4677-bfe1-121f122c4856	1	Other	Other
+9a41cf9d-f116-42b5-907e-5cd1b5f8261a	1	Other	Other
+9a41f632-ca78-4b14-a5c9-ee6c8a15675f	1	Other	Other
+9a4226d4-8a2f-4e2a-9bc9-2fac66d4d08d	1	Other	Other
+9a428e17-5a6b-4fba-b44b-4c63fe179206	1	\N	Other
+9a42ef53-4cd4-4d1d-8bfb-cf0f55a336fe	1	Other	Other
+9a4329bc-973d-41d9-9809-4e8344d06146	1	Other	Other
+9a434137-71bb-4af1-9f34-5b4ddb8c000e	1	Other	Other
+9a434bbf-3142-481b-ac9c-454ee8a61f88	1	Other	Other
+9a4394fd-565b-4549-8b70-11a3a379bb38	1	Other	Other
+9a443f8c-9476-42b5-bda1-32eb0d91e926	1	Other	Other
+9a44568a-85fc-4824-9eb6-d04ad06890d3	1	Other	Other
+9a445ccd-3a37-48ad-9f2a-9de225fca5d2	1	Other	Other
+9a44aceb-e9e8-4923-a2e9-0f197edbcf08	1	Other	Other
+9a44d4d5-87a5-4ada-8053-ef793c0ce6a1	1	Other	Other
+9a44df5a-0a91-42f7-95f5-402104d76d27	1	Other	Other
+9a450cbc-21f3-4c04-adc4-40be5de0f736	1	Other	Other
+9a4524b3-5d3f-4c72-b174-49a69466e592	1	Other	Other
+9a455651-02f9-419c-9085-97841b81fd1e	1	Other	Other
+9a45bce4-820d-4767-a757-4846723089c2	1	Other	Other
+9a45efa2-2aee-491c-8626-f63e7eac5ef0	1	Other	Other
+9a462d76-7d1c-4162-93a8-0d1ec2f0c5e6	1	Other	Other
+9a463b11-6619-45c4-be4e-8f1c9a50dde7	1	Other	Other
+9a46b121-80be-4bf7-b20b-807d86a4dda9	1	Other	Other
+9a4700a2-368f-49b8-901a-da8c43e3c2e8	1	Other	Other
+9a471052-0886-4e3b-a907-985c904164be	1	Other	Other
+9a47dd3b-ef82-4eab-934e-c493b49db602	1	Other	Other
+9a47e212-76e6-418b-ac5e-6ea6833d150a	1	Other	Other
+9a4825aa-96e7-48f1-8d6f-fda5bec79807	1	Other	Other
+9a483f3f-8b94-402e-a749-c03403e829d0	1	Other	Other
+9a48c367-b8e8-4188-ad1c-45af9c027865	1	Other	Other
+9a48c615-55ee-4ef0-8752-7da6872766b7	1	Other	Other
+9a48d1bb-1439-4b6c-a177-e3ab9caab52a	1	Other	Other
+9a48fc15-eede-4c09-a2a3-3bae978a03ac	1	Other	Other
+9a498407-f3ab-471d-a2cf-fa0f9ca8201b	1	Other	Other
+9a498f7e-9294-4f88-bde3-8ba82ec9b320	1	Other	Other
+9a499586-045d-46af-81fb-f536b1b06698	1	Other	Other
+9a49c6d9-2c07-475f-b3dc-afc9ea52b88b	1	Other	Other
+9a4b0557-0499-47db-a3a7-8f246cac4ce9	1	Other	Other
+9a4b4829-2ec9-4965-9220-ba051445f034	1	Other	Other
+9a4b61ec-9014-4c41-b8ef-61e9af8e0538	1	Other	Other
+9a4b6a81-9a78-4699-a14c-8842d99fe712	1	Other	Other
+9a4b857e-9819-4333-a38a-551ab888a4ff	1	Other	Other
+9a4bb1ff-45fa-4f55-9773-11235d279b35	1	Other	Other
+9a4bb4ca-c0ef-4380-8be7-32d14cd9a560	1	Other	Other
+9a4c169f-496d-4766-a50c-0c4556e814b4	1	Other	Other
+9a4cb577-a136-499f-8ffa-af3e84939f1b	1	Other	Other
+9a4cd2b1-c725-4349-8445-c3fd9ad8044d	1	Other	Other
+9a4ceeb6-2820-44af-b1c1-3baaff5be935	1	Other	Other
+9a4d68ed-7058-4e5d-86da-045577d815f6	1	Other	Other
+9a4d6dd8-06f9-46e8-9746-f90ec25768f3	1	\N	Other
+9a4d7baf-2572-40a6-a627-67025e149645	1	Other	Other
+9a4d9c6a-86e4-489d-a7c1-e5e1c9be84bb	1	Other	Other
+9a4ddde0-9e2e-4a02-80ca-7d4d4fe2837a	1	Other	Other
+9a4e0d3c-5c0a-4159-bae2-af9c4be97ee8	1	Other	Other
+9a4e1d33-0aac-4e26-817d-8c501bd0a2e5	1	Other	Other
+9a4e2742-1eab-466a-b017-dbe7b2b116d1	1	Other	Other
+9a4e4030-6cf9-4edf-8ef6-bd29dd71812a	1	Other	Other
+9a4ea7f2-073e-4787-9fef-eab07f0b9d72	1	Other	Other
+9a4edbd7-b9fa-4901-ac1f-0deef1c9951b	1	Other	Other
+9a4ef5fe-d85b-4ed1-bbab-8b29e77140fc	1	Other	Other
+9a4f061b-ef85-4df9-aa99-cd30f1032050	1	Other	Other
+9a4f42fb-534c-41f9-bd97-29b65f3bbcc3	1	Other	Other
+9a4f57a0-9cae-4287-a08f-8d45fbd69f83	1	Other	Other
+9a4f5a52-c4ad-4888-9b38-702fc5a0636a	1	Other	Other
+9a4fe4a9-11e9-484f-a52a-e7013832e117	1	Other	Other
+9a4fedd2-68e4-4834-8729-f8e4090171a3	1	Other	Other
+9a4ffeb3-9f4c-4b7d-8bb0-6294de512871	1	Other	Other
+9a504519-9b46-4ebd-b8c0-0958451cf9b0	1	Other	Other
+9a505cb7-0de3-4e5f-bad2-8095b3a2797c	1	Other	Other
+9a507307-4a23-4bc1-8483-ad9550f93fa5	1	Other	Other
+9a50ffd1-a05a-4360-a750-a66d4557b216	1	Other	Other
+9a510811-1a31-414f-8de1-f9b3dfb8719b	1	Other	Other
+9a513639-8bbb-4be0-8c09-93678b0fc133	1	Other	Other
+9a515fbe-ca07-450e-9f16-e1c75f5a5d90	1	Other	Other
+9a516557-349a-4157-b71e-13c75c6e6668	1	Other	Other
+9a517cff-7e32-45cd-bb66-e7b0b8d94750	1	Other	Other
+9a5183da-0494-4893-94ed-b292961bd37e	1	Other	Other
+9a5186d6-62b1-4800-b26e-b7354905b646	1	Other	Other
+9a51d85b-370c-4851-89d4-af2eccb001b2	1	Other	Other
+9a51def0-76ca-40f4-9f64-7377913e2742	1	Other	Other
+9a5214cc-16ca-495d-884a-9603c30af584	1	Other	Other
+9a523729-0500-4ec7-8a08-260f04a8d9c8	1	Other	Other
+9a525e11-3c57-4441-b8ee-5e6d285f51d9	1	Other	Other
+9a526887-5c06-4546-933b-12a41abf782c	1	Other	Other
+9a529e3c-b3a5-48a9-973c-e8094983c9a6	1	Other	Other
+9a52ccf5-b0af-4872-b98d-0395643495fd	1	Other	Other
+9a52e726-48e7-4d35-b868-b9ec74e2d0f1	1	Other	Other
+9a53e776-1032-4ac6-8cda-569a9a73cc6d	1	Other	Other
+9a53ea87-09d9-4697-8242-e89809adbfe6	1	Other	Other
+9a53eb36-2ad3-440f-bea8-219a91c1b4c9	1	Other	Other
+9a53f93f-92ce-47e3-8632-2369db468b48	1	Other	Other
+9a545b21-3256-49a7-a213-da86cd9bf2c9	1	Other	Other
+9a547555-3d45-4860-a848-2f2496ff7343	1	Other	Other
+9a54950c-053c-47b1-be51-e3d16ff14707	1	Other	Other
+9a549977-82d6-46c8-808b-6dd2cc44a233	1	Other	Other
+9a54a8bf-af7c-438a-9e43-790fa2080f40	1	Other	Other
+9a54b4db-828b-4a6d-a5a6-689ee29be5bf	1	Other	Other
+9a54eaaa-7cac-469b-9f77-2b9cc6c5bb99	1	Other	Other
+9a54fa25-5f39-4b5b-81cc-7a99a34c9707	1	Other	Other
+9a5564e5-84f8-433a-a271-31a308349456	1	Other	Other
+9a556a78-c419-41f6-97b8-4dd6af98588b	1	Other	Other
+9a55a8ca-6101-450f-b9a5-dbfd77a2fefd	1	Other	Other
+9a55b89a-c9ef-41c9-8236-ec50f6907193	1	Other	Other
+9a55b8da-56b6-4645-ab34-3f216e4ed993	1	Other	Other
+9a55cb78-de62-46e6-8176-ed0ae055b32f	1	Other	Other
+9a560f65-d215-44dd-be48-66088127a7d1	1	Other	Other
+9a567847-4052-4c21-927d-ac0dfeab8337	1	Other	Other
+9a56c528-e175-45e0-bdee-30f9abe9b065	1	Other	Other
+9a572359-59b0-4f69-bd34-1fbff16d2a93	1	Other	Other
+9a5724f4-2830-432d-b77b-b0f0effd6829	1	Other	Other
+9a575007-d584-46e2-b091-7b51094bc868	1	\N	Other
+9a577d5a-60ba-4ced-8873-61fc3844a255	1	Other	Other
+9a579843-03a6-4efb-a970-6b824e6e3ff2	1	Other	Other
+9a57beaa-cfd6-409d-9fa9-c6fb13c9ec3a	1	Other	Other
+9a57ce9b-0e76-449f-89eb-d9035a84b365	1	Other	Other
+9a57d4c8-c82a-4fdd-902c-a7fe07dd0926	1	Other	Other
+9a584c3c-6f48-4dc4-b016-6d37efd5a0e1	1	Other	Other
+9a586e93-83a5-4e7d-8d6f-b6699bda8e05	1	Other	Other
+9a58b86d-ef19-414c-b864-de8d84583c74	1	Other	Other
+9a58bcc5-1c27-4984-b351-a974f7f30c81	1	Other	Other
+9a59583f-4a06-47d5-a0ac-4c4e23280995	1	Other	Other
+9a59937b-d903-4a72-a82b-1f5c2c98f9b8	1	Other	Other
+9a59a1bc-6c91-4ec6-a6b9-8a7adaf39abf	1	Other	Other
+9a59ebdb-e5b3-48f3-b82a-1892ff1e57c1	1	Other	Other
+9a5a1407-d9ba-4171-9b6e-061b948136bf	1	Other	Other
+9a5a279c-30e2-41d2-9fcb-8ea0ffc588af	1	Other	Other
+9a5a2ac5-5d9b-4bba-9af7-56e22d4def23	1	Other	Other
+9a5a2bd1-1d9e-428f-82cb-269007124eea	1	Other	Other
+9a5a4f74-46ea-4a4c-ae22-7662dc93f9b9	1	Other	Other
+9a5a4fb5-0bc0-4d90-8ce9-1e0e1e52f14d	1	Other	Other
+9a5a561f-3145-4ebf-a418-c4993af589e4	1	Other	Other
+9a5aa7c1-5701-4754-81de-f4284c979743	1	Other	Other
+9a5b2055-f863-45a6-b77b-d05f265b81ee	1	Other	Other
+9a5b379e-4f6b-474b-a27e-a06205692a58	1	Other	Other
+9a5b4225-9b29-43ad-96e3-78cd43a1071a	1	Other	Other
+9a5b43fb-e80e-4d19-81ad-337286d2161b	1	Other	Other
+9a5b6ac9-d11e-462f-bd23-faacd81099f0	1	Other	Other
+9a5b712b-bf88-4ca7-bf77-9aa6ae487837	1	Other	Other
+9a5b881f-0234-47ba-911f-30d9cbe9255f	1	Other	Other
+9a5baacd-eb11-464f-9152-21e5b7b4a9bf	1	Other	Other
+9a5bcb8b-1dbc-4c51-b828-27d827c39baa	1	Other	Other
+9a5c5d72-07b5-44c5-82ce-1cc82c05c743	1	Other	Other
+9a5c9d4b-d951-4f47-b47d-bc27ceb87276	1	Other	Other
+9a5ca3a7-6496-46e9-8d60-9f5341dc39b7	1	\N	Other
+9a5ccb2f-23b0-490d-8a4d-5253b701d30e	1	Other	Other
+9a5d1d39-e0e4-47df-b013-b3fa0cb38252	1	Other	Other
+9a5d357c-3ad2-4704-a038-21889721d373	1	Other	Other
+9a5d3e56-e508-4411-9302-65553081aed1	1	Other	Other
+9a5d4c49-a3ef-473e-89e3-493983b50299	1	Other	Other
+9a5d663c-1f07-4245-b0bc-6cadf51c0cce	1	Other	Other
+9a5d7fc4-68a4-46a6-8aee-d7c9cac25535	1	Other	Other
+9a5d8b32-343a-4f52-82c3-d45b93ef954c	1	Other	Other
+9a5d8be3-4e60-42c3-afdb-d6d48bfdaeeb	1	Other	Other
+9a5e1d0e-ea80-4638-872c-2dd3b6f9aabb	1	Other	Other
+9a5e60ca-c8db-4e07-a695-a399adc844dd	1	Other	Other
+9a5e78f9-396a-46d6-8f95-c4b82813cf6c	1	Other	Other
+9a5e81ee-03dc-45eb-aec0-40bd22dd752d	1	Other	Other
+9a5ebce5-261a-4387-9c53-3c6583488b72	1	Other	Other
+9a5ee4ca-96db-467c-bcf7-644cc3a46eb1	1	\N	Other
+9a5ef680-317d-481d-a9c4-70afee80c276	1	Other	Other
+9a5f2147-4ea6-4613-9ebd-4ff1c3e8c659	1	Other	Other
+9a5f6152-8950-43e0-b70e-53b8aae1dad8	1	Other	Other
+9a5f683a-c8fa-4fc4-a3fa-d558315f8d78	1	Other	Other
+9a5fa6d0-6b68-467d-9da4-4342e5fb7223	1	Other	Other
+9a5feb83-3b04-4544-8cb2-b469202019b3	1	James	Other
+9a600332-748a-42d8-89f1-b446fd172499	1	Other	Other
+9a6067bf-ba99-44dc-a21c-994fe4fff919	1	Other	Other
+9a60de22-8eea-4b9e-b946-f1f23fed9e4f	1	Other	Other
+9a611c81-9c92-4c72-8ca2-cd659edf71dc	1	Other	Other
+9a613722-3b8b-4f63-9a09-0d4a4a82d290	1	Other	Other
+9a613c1c-0485-49d5-b247-88125f6af194	1	Other	Other
+9a6180da-ea8d-44db-ab8c-aa685cf23d1e	1	Other	Other
+9a61a4f9-93c6-4aa8-a317-b133d741bd23	1	Other	Other
+9a61cdb3-5787-48cf-8ba5-55ef2adcb6a6	1	Other	Other
+9a61f932-703b-4421-8b54-27bc02b77ce6	1	Other	Other
+9a6217de-adb8-438a-ae91-fc94a0a99e11	1	Other	Other
+9a6282ce-b33c-47e5-9a40-a51d7cdcc190	1	Other	Other
+9a629e48-407a-4032-b691-d9aa0e473767	1	Other	Other
+9a62bf83-b346-4daf-bf6e-1b9dd06a8c8a	1	Other	Other
+9a62d267-1e70-4ef3-8d5b-793f12ed9216	1	Other	Other
+9a62eaf7-9c9e-4365-a382-01fb49689df2	1	Other	Other
+9a636b89-9f9c-4aed-a3cd-8bb78bfa4cbe	1	Other	Other
+9a6382fe-2bac-4cda-a6cd-bf32463bc890	1	Other	Other
+9a63a06e-47ef-4bb2-a767-a5a2b24b94e8	1	Other	Other
+9a63a28a-2395-44ad-bb98-f30330af82c3	1	Other	Other
+9a63c993-257d-49ca-935a-542f275fa0d0	1	Other	Other
+9a644416-69a4-40e4-8d74-c40bb38e44de	1	Other	Other
+9a64d80a-1a99-4fda-9d00-5aab7f8b44c7	1	Other	Other
+9a652c9c-0162-4ad9-9260-3f6f1c2b9f3f	1	Other	Other
+9a653356-0a30-431f-9603-b605720242c1	1	Other	Other
+9a659d44-4751-4a40-8f10-a2b8200f7a99	1	Other	Other
+9a65b4bc-b143-4db5-bad7-dc806b433462	1	Other	Other
+9a6614b6-e949-45f3-86bc-bc6de2105c69	1	Other	Other
+9a665176-abc3-41e3-b59f-f6682578af24	1	Other	Other
+9a667797-f2d6-492f-b60e-9d68e28f1635	1	Other	Other
+9a6773b8-0fda-4036-98fd-587df58b2412	1	Other	Other
+9a67c6c3-f244-4d82-82a2-4d6ee575b72a	1	Other	Other
+9a6801df-a3c7-46ee-be98-0a7984b5c67f	1	Other	Other
+9a68749b-e20c-43f8-a86f-b32b7fb65070	1	Other	Other
+9a68c57a-5a64-4be5-89f7-2f20d806f32d	1	Other	Other
+9a68e03c-94b8-4d8d-b713-de9aa9fc33b6	1	Other	Other
+9a68e0b1-7527-4511-bb81-961b3de14ff5	1	Other	Other
+9a68eba2-807b-4067-960f-265159d6ff3b	1	Other	Other
+9a68f0c4-757f-4177-9f0d-12a7eee73b31	1	Other	Other
+9a68fb6c-9fa1-4ae2-b7eb-ed7cdc304698	1	Other	Other
+9a69266e-7356-43b2-a991-8e29f8810f25	1	Other	Other
+9a694aa9-0169-4b38-b856-3537534b13a4	1	Other	Other
+9a698023-8a85-4485-bf5a-9eff6e1a13cc	1	Other	Other
+9a69c639-7c22-430c-8b6b-a41d7ef7b423	1	Other	Other
+9a6a07ac-f5f9-4a62-9229-4b1c2ed55400	1	Other	Other
+9a6a66be-d1ec-436e-a7aa-3e18e063ac7c	1	Other	Other
+9a6a67ed-ac9a-4353-86ad-e541844bc99d	1	Other	Other
+9a6a6a5f-9049-43bb-ba30-732f6733c787	1	Other	Other
+9a6ad148-6869-415b-888c-c4c32de67a77	1	Other	Other
+9a6ae97e-cc9b-4533-a35c-a737198402e5	1	Other	Other
+9a6b2499-ad60-483c-94fe-dfcf9f2959c2	1	Other	Other
+9a6b364d-a0f1-4637-8034-ed26e64d9fec	1	Other	Other
+9a6b4e81-e44d-4d20-ba9e-6faeec715e6d	1	Other	Other
+9a6bd7ea-115b-4e82-8a71-f63956ee8f4b	1	Other	Other
+9a6be2c4-42cf-430e-b882-b43e59b4eaa1	1	Other	Other
+9a6be53d-4764-476a-a20a-22f40b18b4a6	1	Other	Other
+9a6c0240-167b-41e6-90ca-cd8d9fbd70d3	1	Other	Other
+9a6c1bcf-08fe-4953-b50e-20ebb26792c0	1	\N	Other
+9a6c30d0-354f-4d12-b44c-39a571b823e3	1	Other	Other
+9a6c44b8-027d-4b68-94ed-cdd39ed42226	1	Other	Other
+9a6c68d5-7a8e-4381-8ec5-28e7efb5fd15	1	Other	Other
+9a6cf1dd-ba02-478a-9ab8-b89c4a71cd12	1	Other	Other
+9a6d0b1f-92c7-4814-9567-d75b4f26a17b	1	Other	Other
+9a6d3954-e59b-462a-bc8e-6e98227d39ed	1	Other	Other
+9a6d5d2a-6a0a-4de0-ab99-1001e5e7c6a7	1	Other	Other
+9a6d8e9c-578d-4426-8c2e-b2673a69cd42	1	Other	Other
+9a6e70e0-5908-4253-a2da-a63683fd2641	1	Other	Other
+9a6e89f1-94c9-4b6d-99e2-d904dde280c6	1	Other	Other
+9a6f1dbe-3b16-4ea3-85d6-255eb3bd9a71	1	Other	Other
+9a6f3c2d-45b9-4824-8889-77e0bbdd0e3a	1	Other	Other
+9a6f5049-30b8-4c3f-84ba-e1371ea2bd2b	1	Other	Other
+9a6f5d14-5d6b-4f68-9755-9875a604830a	1	Other	Other
+9a6f645a-47aa-47ea-8b29-5efab2f10362	1	Other	Other
+9a6f716a-559d-415f-953b-3b7fcf935688	1	Other	Other
+9a6f87b3-e734-420e-b6b7-9d7ffc344090	1	Other	Other
+9a6fbb42-4c7d-42e8-8f08-69ed03d2f3e3	1	Other	Other
+9a6fdddf-edaf-4ecc-8b47-ee4f8815d913	1	Other	Other
+9a6ff863-1ac1-4bb6-b0aa-2bd301515459	1	Other	Other
+9a6ff92c-c228-427e-b8cd-2a84c62fe789	1	Other	Other
+9a6ffc3f-9f64-43ce-9cb0-8125d655be33	1	Other	Other
+9a703e6f-906e-4073-9ec3-95c1b763bfaa	1	Other	Other
+9a705024-96bd-44b7-a273-29ff67e9b769	1	Other	Other
+9a708d69-f44c-4774-a14d-da5346568ae9	1	Other	Other
+9a709eab-df3e-4d6a-9568-41a5d920e982	1	Other	Other
+9a70e29d-80b6-4ca0-bb12-33b2938f5f23	1	Other	Other
+9a710f89-ff49-4003-a96a-1b97d7159254	1	Other	Other
+9a713b42-b385-4a21-8b40-3a92aad04bbe	1	Other	Other
+9a716b92-22e4-4b5a-b61d-aa80dac4b4d4	1	Other	Other
+9a71ec7b-2ca2-4060-95b8-c3f6daeda18f	1	Other	Other
+9a721110-3200-4803-8704-9aa0d9182396	1	Other	Other
+9a72524b-23e5-4f42-ba8b-cd118d545c62	1	Other	Other
+9a725749-5f1a-40da-a396-3bbba18dd204	1	Other	Other
+9a7259b7-addb-4ffb-90bc-15bf1cf767e1	1	Other	Other
+9a7294c0-bf87-4cf7-930d-5010202f972c	1	Other	Other
+9a732b04-72b0-4fbc-adb1-8e5a81d6b478	1	Other	Other
+9a73492a-3388-45d1-8111-e2608bb2cbe9	1	Other	Other
+9a73b645-a0a7-4a4f-9920-b8ee06f24d0f	1	Other	Other
+9a73e9ef-505f-41a4-9b52-4c6acdb50e5d	1	Other	Other
+9a73f473-1cc3-44c5-9d21-a3a54a844afa	1	Other	Other
+9a7428a6-dcab-4ae3-b47d-23832f0b8fb2	1	Other	Other
+9a744137-795a-42dd-92f8-06d3f08e2a5a	1	James	Other
+9a74cfc7-9eba-4e4f-afbd-cb6880e15032	1	Other	Other
+9a751089-4042-4c48-b0c3-7209b1e19636	1	Other	Other
+9a7541f5-f9c1-4adc-9d91-63941844c114	1	Other	Other
+9a7574ee-fdeb-4687-98dd-982bce8d4fd7	1	\N	Other
+9a759f0e-86db-4189-939a-02bb39ad00b6	1	Other	Other
+9a75b0d3-0798-483b-a04e-4aec4dda941c	1	\N	Other
+9a75cfbd-b8e7-4665-aaa1-a70c5823cf3a	1	Other	Other
+9a76258f-a35e-4f91-972c-d550cc8f6e3a	1	Other	Other
+9a7627fa-0660-41f9-8068-791442e048f7	1	Other	Other
+9a76472e-8667-4498-99bb-d46d74be6bee	1	Other	Other
+9a765933-f2b1-46ed-a2be-adaea797a6f1	1	Other	Other
+9a768b37-c908-4065-a662-b48eaebcdcf7	1	Other	Other
+9a7698c1-a750-4778-b8ab-e6f9cdc7b115	1	James	Other
+9a76d38d-77fc-4986-bdc6-e1b88b6db7a1	1	Other	Other
+9a76d511-ef60-480a-a9b3-289ccfae22e0	1	Other	Other
+9a76df10-104d-4144-a7b7-6a76f825ef19	1	Other	Other
+9a777f5e-6051-45bc-b816-bd9813817f8d	1	Other	Other
+9a7784cb-a976-46f2-9ea3-b23ecc46610b	1	Other	Other
+9a78290c-c5bf-4b6f-a36c-0f5f6578ce21	1	Other	Other
+9a784aa7-6268-4d23-8de8-eb4be70422f7	1	Other	Other
+9a78688a-efaf-4196-b8be-e8abff429aaf	1	Other	Other
+9a788aba-927f-4276-9b53-3c3790dacebe	1	Other	Other
+9a78f62b-e808-4bfd-a57a-db59b22133c6	1	Other	Other
+9a78fc9c-7864-4c15-8259-c63742bfa7cf	1	Other	Other
+9a78ffb3-499f-4f02-a178-ce24e51ba35e	1	Other	Other
+9a790a22-bedb-4bc8-9b36-1129b4fabdc0	1	Other	Other
+9a7929c8-e262-426b-bbd2-21cfeb0d59ac	1	Other	Other
+9a793918-99b3-49e8-affc-69f1f8616503	1	Other	Other
+9a794d8d-ca80-4324-a2bb-663ebb1a97f1	1	Other	Other
+9a7975bb-dd14-4136-bf06-76946a502b62	1	Other	Other
+9a797a1c-f638-4dde-ab5d-7840caf310f4	1	Other	Other
+9a79fabd-646c-4808-b24d-070f0dab0863	1	Other	Other
+9a79fc9a-9d32-4718-a33d-a237c81ad1a2	1	Other	Other
+9a7a999f-fadf-490c-9678-34edc4acb928	1	Other	Other
+9a7acfca-c936-4e50-90fd-05a379145cbb	1	Other	Other
+9a7aebc8-575d-402f-ab96-fb55bb71b4a3	1	Other	Other
+9a7af8ae-59a4-4d7a-a7a9-accd72204d7d	1	Other	Other
+9a7b040b-ca75-4629-a272-0898fece925b	1	Other	Other
+9a7b3caf-05e5-4ced-8758-946bee080eae	1	Other	Other
+9a7b4761-a7d3-48cc-8f24-01774f64e43b	1	Other	Other
+9a7b4c08-5183-4913-b6e9-a8ace71bd385	1	Other	Other
+9a7b62ca-33bb-4d7d-a610-1dfca2882078	1	\N	Other
+9a7b6f02-f684-4cbe-a4d5-4805d9140631	1	Other	Other
+9a7bb1a1-f27a-4594-ba72-36b0861b5b80	1	Other	Other
+9a7bbd67-5642-4b72-af68-ba6e5bb0f31e	1	Other	Other
+9a7bce40-8df2-423b-be2d-c4b40e4b4818	1	Other	Other
+9a7bfd8b-584f-492b-a62b-ebc736059690	1	Other	Other
+9a7c011d-f16b-43d1-b329-7587f3bc7433	1	Other	Other
+9a7c5b4c-7978-4009-b494-af57564954a5	1	Other	Other
+9a7c5b5b-ea96-4290-b892-d2ca07701561	1	Other	Other
+9a7c63be-41a1-4fe3-806f-d439ee6d28b3	1	Other	Other
+9a7c67ed-0731-4dc6-8250-3f19b1b7c993	1	Other	Other
+9a7c9a7a-cc76-40f0-bb28-1538915402d1	1	Other	Other
+9a7cbd57-7c8c-46a7-bd71-157663dd0bbe	1	\N	Other
+9a7d4867-8c8a-4abd-b08a-cd9cfb54dea7	1	Other	Other
+9a7d9f55-8f6b-4597-8541-7b7ffb697899	1	Other	Other
+9a7e11ff-71ee-4558-ac71-23b9b869fe54	1	Other	Other
+9a7ea9b9-865f-4109-8291-131534eed1a3	1	Other	Other
+9a7f1bf5-7476-4a43-9432-9b6125bcf1e2	1	Other	Other
+9a7f1c54-f48b-46be-b4a4-7e2e393fb51d	1	Other	Other
+9a7f3754-1cfd-4f3e-bf05-6722e3e86328	1	Other	Other
+9a7f46f8-263c-4528-b45d-c02a5149e5a9	1	Other	Other
+9a7f7ea0-3359-4db6-abff-f809d434d033	1	Other	Other
+9a7fa98b-17b3-44dc-9884-4db1078a8bed	1	Other	Other
+9a7fbc02-f094-4d14-8b2b-f9fe47125b78	1	Other	Other
+9a7fe8c9-842c-4dcb-91ac-8350263973e9	1	Other	Other
+9a80081d-4996-4905-98ef-8fee42b5ee02	1	Other	Other
+9a806318-3d13-4627-aed8-d4591deaaadc	1	Other	Other
+9a80ebc0-3ef2-4622-889e-2a0a32d473f4	1	Other	Other
+9a8150aa-336a-4bca-8975-79e6b1027e07	1	Other	Other
+9a8189e2-70fb-49ad-9fa8-d436ddbb44c5	1	Other	Other
+9a81afe4-2489-4421-80ea-405477d22dac	1	\N	Other
+9a81e335-2a58-4ad9-9ee3-b93b57c04c97	1	Other	Other
+9a81fd05-f3ac-4aea-8ea3-28210f9f9ccb	1	Other	Other
+9a825a50-f0b5-443b-8247-fd5c4b92386e	1	Other	Other
+9a8298c1-e5d9-4dda-a61a-0b0033733f3a	1	Other	Other
+9a82c3ad-5784-4cc5-8d22-37c2a2096eb6	1	Other	Other
+9a82dd82-f77b-4097-8716-659f1830646c	1	Other	Other
+9a8326fc-e003-4401-a593-0c303a23a8f7	1	Other	Other
+9a8330f4-c1d6-4778-95e8-0fe73f91f243	1	Other	Other
+9a834cb3-0e91-4631-bb62-fad37319e7a0	1	Other	Other
+9a835549-a80a-4ff7-995e-f9924aac89db	1	Other	Other
+9a838d17-ebd1-4306-90ca-b1d0ecdb3e44	1	Other	Other
+9a83d6c0-2f08-47c4-a3b1-143905f7e49e	1	Other	Other
+9a83e60e-2196-426f-a8c8-ff8f65db011d	1	Other	Other
+9a83f0c4-1877-4052-b2ed-eeb95c5d57a0	1	Other	Other
+9a83f188-8b56-4715-abbd-9fd62811fb8b	1	Other	Other
+9a841581-5d3b-47a5-8047-eba08f664356	1	Other	Other
+9a841862-ddda-45d7-a58d-637c7f67dcd4	1	Other	Other
+9a84db1b-d65e-470e-a30b-6b090c0cb180	1	Other	Other
+9a85136f-ee2e-42e0-8bed-3dbc738eee66	1	Other	Other
+9a8519d1-9846-4747-8a55-28c685bec052	1	Other	Other
+9a8549a6-e963-4145-97aa-f78df82bd562	1	Other	Other
+9a855dbd-d435-44ee-80cb-55756f9e55d6	1	James	Other
+9a85637d-87ca-4b23-8310-bf3e6e2ae41e	1	Other	Other
+9a859e3c-a99a-4583-9126-ccc37509d498	1	Other	Other
+9a85a0f7-751b-4a25-ad6d-9ad47f8ed868	1	Other	Other
+9a85bb3b-e9c5-4a1e-951c-fb6c2a47bf0e	1	Other	Other
+9a85c0c4-bdfc-4954-bf59-5dc5382aacc8	1	Other	Other
+9a860970-1fc5-4366-bc92-80a0022ece8b	1	\N	Other
+9a8626ce-74ac-413a-b10b-37b95976826d	1	Other	Other
+9a866729-5872-48c4-8cfa-5582d2ff002a	1	Other	Other
+9a867ccc-5fd5-4d6f-be4d-6629c78848c2	1	Other	Other
+9a8687bf-18eb-4a0c-8b52-4cff76d9641e	1	Other	Other
+9a868bf7-a2d1-4ebf-9119-9985b127fd71	1	Other	Other
+9a872c4e-da3c-4b5b-80ed-aa972673ae8d	1	Other	Other
+9a874ad4-eeb5-47c3-933d-3b446b751090	1	Other	Other
+9a878fd5-77df-4a15-951f-3e2cd596d470	1	Other	Other
+9a87bc66-034f-40e7-8a6a-62dc2c1d4376	1	Other	Other
+9a87f078-498d-46a4-b51f-68fc4398c15c	1	Other	Other
+9a88936a-b976-4a21-b799-296374b5e4db	1	Other	Other
+9a88a288-1812-431c-9edd-3bd182552ac5	1	Other	Other
+9a88a741-2dda-4440-abd5-b5619cdf393c	1	Other	Other
+9a88a841-1443-4fbe-a417-d467c00e22a9	1	Other	Other
+9a897c6e-b6cd-49b2-bf5d-2747b92c0fa3	1	Other	Other
+9a898121-2326-4ede-a32e-b6a6fabacfd1	1	Other	Other
+9a8a8b90-1d8b-4399-9d96-b93ac6f15c26	1	Other	Other
+9a8a9a3c-5dae-4af4-af11-6d95d0668ec9	1	Other	Other
+9a8aa391-352e-4302-9b80-cdc7984643cc	1	Other	Other
+9a8ac563-3409-4dbb-b434-805d71bb3305	1	Other	Other
+9a8ad3f2-854a-4e59-9950-7b953cbde3b2	1	Other	Other
+9a8b2388-ba1f-40af-9851-74fb95ba7c43	1	Other	Other
+9a8b276f-d792-4b09-a62e-ca9c637a058f	1	Other	Other
+9a8b4deb-0ca2-48f5-acbf-4c53bb722972	1	Other	Other
+9a8b6305-0ab9-4d9c-86a8-4ceda4a3fa78	1	\N	Other
+9a8b742e-24b2-4b14-a50e-2f160b8300a0	1	James	Other
+9a8bb833-19d6-407d-add5-c339f3f4e597	1	Other	Other
+9a8bd797-b7fd-4395-b8f3-944689f12b50	1	Other	Other
+9a8c0286-6ad0-43c4-9858-8e2cb9cdfee4	1	Other	Other
+9a8c2d3d-a94d-433c-9687-4082dce7e7ea	1	Other	Other
+9a8c503a-fad5-4d41-ba07-3561bbe5ab55	1	Other	Other
+9a8c8a5e-a32a-466f-b1fe-66e095c1a763	1	Other	Other
+9a8ca364-8339-425f-8b33-d6054b5e176b	1	\N	Other
+9a8cfcf4-694b-4ddd-84b9-92cf09f27285	1	Other	Other
+9a8d4d12-d314-4524-bdd8-2e960c6d113a	1	Other	Other
+9a8d4fed-2116-458f-8efb-d7c0cb29c131	1	Other	Other
+9a8d727d-27ee-43d4-8ebc-655f11a44647	1	Other	Other
+9a8de9b2-e47b-4632-add6-6983fc8893db	1	Other	Other
+9a8e3091-ae10-451e-86c4-0946ebb8fb86	1	Other	Other
+9a8e9394-716e-4d0c-a71d-79f0264fa311	1	Other	Other
+9a8eade2-0597-441c-b5eb-ff96f8b93dd0	1	Other	Other
+9a8eb7e6-f764-47e2-9884-54a504c0c19d	1	Other	Other
+9a8ed446-64e8-48d2-9223-e1901110c105	1	Other	Other
+9a8f2369-6595-4dda-a4eb-0b29f71eed77	1	Other	Other
+9a8f6635-035a-416b-b516-4b9b6216037d	1	Other	Other
+9a8f72be-2403-4f41-826d-c6aefbce2632	1	Other	Other
+9a8f99ee-4b6a-4498-8c30-566c98bdfef2	1	Other	Other
+9a907ef7-1730-43d3-89ff-afd508fedc96	1	Other	Other
+9a90c2ba-c25a-4d34-adab-4fbb80a2270d	1	Other	Other
+9a90dcd2-d6e0-4fac-8405-687151bc74c8	1	Other	Other
+9a90eaee-fa6e-43fb-932a-4a232137543b	1	Other	Other
+9a90f7f6-51fe-40ca-ab10-2dafd8ec0a67	1	Other	Other
+9a9104f7-535c-4a7f-82bf-820cd5c06e6b	1	Other	Other
+9a9117ab-b001-4b2f-ba80-14897292b7f1	1	\N	Other
+9a91236f-24d3-472a-92d7-1b764f2baf79	1	Other	Other
+9a9131c7-cd69-4226-bfa0-bf24048429e7	1	Other	Other
+9a914aa7-d469-424b-9395-c65e245cec0e	1	Other	Other
+9a916d3a-6926-4431-ba62-2645ca835c0e	1	Other	Other
+9a919400-a2f4-4e20-8fd6-a616a155c4e7	1	Other	Other
+9a91ac9e-d015-4749-b3c0-72c0cce942ca	1	\N	Other
+9a921e7a-d35b-4653-8a73-e2368290d219	1	Other	Other
+9a92382d-1098-428f-8f75-ea17de0f4ec3	1	Other	Other
+9a92ad46-7f50-492c-9afb-4ef37adf0d05	1	Other	Other
+9a92c51d-b23e-4fa6-8b82-f375bca8090a	1	Other	Other
+9a933da5-fd7d-4bfb-ab1b-3a43e46c4cdd	1	Other	Other
+9a93669b-ea95-45e9-820e-14e7695ef1f8	1	Other	Other
+9a936a6f-d267-4cf6-9398-8b266804039f	1	Other	Other
+9a938b06-46d7-4ad8-8bcd-1843ac732cf6	1	Other	Other
+9a9391bf-4948-4dd0-b66e-ea5aadcd72cd	1	Other	Other
+9a93b69c-53ac-49a2-a3d9-322bbb4d7d15	1	Other	Other
+9a93c815-6e6f-4b40-bdef-b3d6b5c400f5	1	Other	Other
+9a9400c6-6d62-4e1c-ae44-b59dc7836aa4	1	Other	Other
+9a941c29-e5cb-4913-8a3a-c656bbb8fff3	1	Other	Other
+9a9425cd-3147-4151-885d-97d599191c83	1	Other	Other
+9a946418-f2c4-4e29-9a7c-34a8c6c81d7b	1	James	Other
+9a947666-6115-42e6-a42f-7e3916919155	1	Other	Other
+9a9480e2-c750-485a-b8f1-f48dc35ecc19	1	Other	Other
+9a94b81d-ee51-466b-9a09-8b8e2907d2c9	1	Other	Other
+9a951796-5eae-4797-b3e6-be07c1907a0f	1	Other	Other
+9a9519af-464e-4093-9d7b-eb197905eae9	1	Other	Other
+9a95288a-6ac8-44ce-b865-3227caca3d8d	1	Other	Other
+9a9539bf-28c3-4ed7-81b3-99af81affd83	1	Other	Other
+9a95881c-fe3a-49d1-a192-0f0bb9a3e7bf	1	Other	Other
+9a95a7ac-55eb-444e-9d8f-dc3d089499f2	1	Other	Other
+9a95e7fa-c8d3-43f0-a3ee-260864a1e652	1	Other	Other
+9a95f700-6dbf-4d3c-93f3-9844bd2a8804	1	Other	Other
+9a96052f-b6be-42bf-ac88-d42a84595e4f	1	Other	Other
+9a960807-d78b-4f9f-97f8-9f980dddb1f3	1	Other	Other
+9a96357b-feba-4a99-a062-84299a3384bc	1	Other	Other
+9a9649fb-9777-4b79-a97a-c8c84f2db14f	1	Other	Other
+9a9678cb-b5be-4414-9f78-bee736a5180e	1	Other	Other
+9a96b510-52ef-4dd8-ab71-25db3202c67e	1	Other	Other
+9a96b91b-e07d-438d-b5d9-0431e5366347	1	Other	Other
+9a9747fd-a7b2-41ca-b4b7-5360bd9bae02	1	Other	Other
+9a97788b-38c0-45d2-a1c1-9419bb59b192	1	Other	Other
+9a97b862-711d-4451-ad1d-cf467de035c8	1	Other	Other
+9a984048-1b9f-4d64-a2b6-95802a0bef9e	1	Other	Other
+9a984f57-c444-4d75-b05e-6a3dde33a29d	1	Other	Other
+9a9860d4-a858-4267-845e-4daccabc694c	1	Other	Other
+9a98adf5-49f3-438c-bfed-0ddf35426698	1	Other	Other
+9a98e232-4e89-4360-8975-616e8a927b06	1	Other	Other
+9a98e276-a0ef-4945-9e04-78a5e4b0e464	1	Other	Other
+9a98fad1-e557-49f7-b366-58d28ad02bc9	1	Other	Other
+9a992537-f9ba-4bcc-93fa-52d9ada25383	1	Other	Other
+9a99932c-8831-43d4-be63-32bb830ecfaf	1	Other	Other
+9a99c026-a47c-489f-8e4e-7ec9066fd23d	1	Other	Other
+9a99c201-231f-459d-9a91-ccb7fa6d8d1b	1	Other	Other
+9a99c473-e09f-49b2-9bd8-add44a579f30	1	Other	Other
+9a9aa9b0-1a33-4c3a-8af6-ea0d06f07f05	1	Other	Other
+9a9afc5f-b866-45a0-ada1-f359341b1318	1	Other	Other
+9a9b03e0-5ad9-4b5b-98be-1bd5295da730	1	Other	Other
+9a9b25c5-cf21-4d67-8fdb-4a1fc1ae6830	1	Other	Other
+9a9b78e3-eb0c-4f67-b96e-7c19f50d12ce	1	Other	Other
+9a9d0e39-9047-4a6e-9615-37992e90cb16	1	Other	Other
+9a9d74e3-7b68-4f3a-9542-8f9e6fb2dd97	1	Other	Other
+9a9d8f3f-9062-430d-a4e0-6655e97f83ad	1	Other	Other
+9a9d930e-6b50-41de-824c-ae2dae15bc0b	1	Other	Other
+9a9e686b-c565-46d3-97d9-8f59a3c78990	1	Other	Other
+9a9e9f44-4f73-4c3d-89df-fb7b3463d651	1	Other	Other
+9a9ee1e7-2734-47b0-a2a9-e8c57d51c914	1	Other	Other
+9a9f4ba9-05b1-4f8f-bd57-0d10b25a386c	1	Other	Other
+9a9f97be-bb5d-4813-abb5-8dc3b42f975e	1	Other	Other
+9a9fc272-bae0-4ba8-bc12-ea31a46dd459	1	Other	Other
+9a9ff786-603f-4f05-bc3f-c3c9a3b5e401	1	James	Other
+9aa02a91-1345-458d-a3b9-5ebfe428968d	1	Other	Other
+9aa04def-131f-4df0-80d3-a3212478694e	1	Other	Other
+9aa08edf-0a78-47dd-a827-d3586379eb58	1	Other	Other
+9aa094d6-7f5d-455d-afc5-3a4d4996d041	1	Other	Other
+9aa0ae86-ccf2-48bb-8490-6477ca07121e	1	Other	Other
+9aa0e80c-91da-4ec5-943b-a9e34bce243c	1	Other	Other
+9aa140f7-4fce-48d2-a7f6-e875e9fafce1	1	Other	Other
+9aa1925e-bf6a-4c99-8b7e-359304e63150	1	Other	Other
+9aa1dd77-9bcd-4ba6-8d95-0fd46f5d9b9e	1	Other	Other
+9aa22aa8-06c2-44ab-addd-61a6c5ac1012	1	Other	Other
+9aa23e4f-7729-445d-ba28-35b16e3532f1	1	Other	Other
+9aa24183-bd9c-4826-938f-3c85692454fd	1	Other	Other
+9aa256d1-044f-4d05-a1cd-ca96236273c5	1	Other	Other
+9aa28640-570d-4f63-8d68-825298bf51ac	1	Other	Other
+9aa292b4-0472-49ee-bfdb-be6cf5bc5aa7	1	Other	Other
+9aa2b894-cdd7-4059-877d-d1286486c9bd	1	Other	Other
+9aa2d310-9631-4409-994c-572c4db5b8c1	1	Other	Other
+9aa3243d-8e95-4929-ab39-cccba584b086	1	Other	Other
+9aa32c3f-0a46-4998-a28e-a70cf755193e	1	Other	Other
+9aa36190-4655-4a6a-b127-a129ec430cb4	1	Other	Other
+9aa36b10-51ae-40c1-b956-04ecfd8b320c	1	Other	Other
+9aa38c49-a115-4a8b-b9c7-c37b5bff5133	1	Other	Other
+9aa39cd1-9ee9-41a7-8d69-11c7b54753a0	1	Other	Other
+9aa3c85e-ce51-4eaa-b7d0-e3a75e93bf2f	1	Other	Other
+9aa42fd6-611d-4f4f-8e20-e0922f0969de	1	Other	Other
+9aa44a10-54b5-4d65-9c4a-4ae953ef92ec	1	Other	Other
+9aa45720-f190-48f6-a318-0ba23910e2a0	1	Other	Other
+9aa46489-3469-43f2-afba-4e2237ec2e9c	1	James	Other
+9aa46cc6-e8b6-4aeb-a051-d549733614b3	1	Other	Other
+9aa4988a-e96d-4c7c-a089-ca485a42def7	1	Other	Other
+9aa4c95a-a303-46b8-9108-9d688f04449a	1	Other	Other
+9aa50b55-9334-4a9a-ab00-bdd42cb5ba88	1	Other	Other
+9aa520f5-f91d-4b3e-8aa0-1417ca1b42cb	1	Other	Other
+9aa54936-cb78-4495-9ea4-b54cd9a4c681	1	Other	Other
+9aa57ef7-4913-4467-b111-3e23555e59c3	1	Other	Other
+9aa5963b-436b-4adf-aabd-ff0ef94ec199	1	Other	Other
+9aa5ad6b-2673-49e0-934d-421ed5d82254	1	Other	Other
+9aa5c7bd-948a-4910-9808-b1136cf53e2f	1	Other	Other
+9aa5d83b-db38-4a86-8f7b-571cefc6b381	1	Other	Other
+9aa5f210-cda2-49c3-8b11-5ff6cd3ca799	1	Other	Other
+9aa6293c-b3ec-4680-a32d-76a2305b9a40	1	Other	Other
+9aa66008-5609-4613-a89a-833fab17bddc	1	Other	Other
+9aa69c36-8c68-4bd9-afc8-971c64c0425b	1	Other	Other
+9aa6e100-1be8-4939-82d3-d9f05e1fd806	1	Other	Other
+9aa70148-c4c9-4a84-bf9d-6eb4a3573200	1	Other	Other
+9aa71538-50df-4e38-8e99-e78dc9cf2257	1	Other	Other
+9aa79e7b-206e-486d-a233-fe8392f38cb5	1	Other	Other
+9aa7a33d-b49c-44bd-83ab-76f48061e0d6	1	Other	Other
+9aa7b803-9c27-4660-a49a-4811fe68024b	1	Other	Other
+9aa7f998-2d1c-42c3-b5e5-00d3b725eb9b	1	\N	Other
+9aa7ff0d-6f19-4062-8fc6-1cb98dac1d87	1	Other	Other
+9aa85faf-9b9e-4545-ae6e-0a0ac35fe910	1	Other	Other
+9aa8d860-b916-413a-90c0-b0d435fc973b	1	Other	Other
+9aa8f3ba-01f5-4bf8-bde9-804724a311cf	1	Other	Other
+9aa904bf-ef1c-4503-8c44-362116f5e0cc	1	Other	Other
+9aa91e2e-7325-4d6b-8d40-5724dbefd6ac	1	Other	Other
+9aa98599-8f18-44b1-831b-8d4478d367e9	1	Other	Other
+9aa9ad36-6e8f-45c2-9310-4a3a633e1534	1	Other	Other
+9aa9d1ee-91a0-4b73-b65f-134457c67149	1	Other	Other
+9aaa098c-e830-4b24-a654-1dc5500c4a44	1	Other	Other
+9aaa3282-b49d-49ff-bc16-fd656860133f	1	Other	Other
+9aaa9092-fbec-424f-9e7e-832cb711e9f9	1	Other	Other
+9aaadc64-41e9-47fb-88b5-f10310c60628	1	Other	Other
+9aab8e2e-1bed-4919-90e4-93fe65192fae	1	James	Other
+9aabded5-11bc-4197-8594-942440c173d6	1	Other	Other
+9aabeb1d-b82c-431b-b08e-0c2826b5c931	1	Other	Other
+9aabf232-2424-46d1-b5f0-e6a3ac801539	1	Other	Other
+9aabf340-0395-49ab-b7e4-eafc6885d44d	1	Other	Other
+9aac3046-8759-4d3d-b7f7-b7f79218a2dc	1	Other	Other
+9aac9ca3-1791-4e29-b710-b1109375a2ff	1	Other	Other
+9aacaf56-262d-49f1-935b-6b191b298c9b	1	Other	Other
+9aacba91-7411-46c3-95ea-c3cafb4d3ef3	1	Other	Other
+9aacd48e-aa14-4433-9e2c-2d13de622d73	1	Other	Other
+9aace4e7-9ed4-4a07-9c69-ae8b78cb58bd	1	Other	Other
+9aacea01-6f7f-4b81-804a-3ccefe8cb9ef	1	Other	Other
+9aaceb5a-9619-40e1-bb0e-72f86a375d65	1	Other	Other
+9aad0be5-ee00-4ed1-81d7-5fdf35a82faf	1	Other	Other
+9aad2955-576d-46e2-81cf-edf5e4a1439c	1	Other	Other
+9aad7215-3a8f-4bc0-8a82-81a3a533b6e6	1	James	Other
+9aad8d5b-18b2-4b34-9965-21e67ca6511f	1	Other	Other
+9aad9d00-0eef-459e-8669-750680e94440	1	Other	Other
+9aae73e5-22bb-446a-9396-1b1e94127998	1	Other	Other
+9aae88c2-3a34-4e7d-9038-d071362e0d8f	1	Other	Other
+9aae956a-d900-417e-8d9a-5c4d1b895c47	1	Other	Other
+9aaebc40-22ae-49b7-a787-d77f69f677f9	1	Other	Other
+9aaf4f32-8459-4174-8120-5525a4966a64	1	Other	Other
+9aaf5d5f-bd37-4a1d-b0d4-2bbca4f6e1e8	1	Other	Other
+9aaf7228-03ef-4a36-8349-d076752c2714	1	Other	Other
+9aaf7ae4-437d-41e0-8423-c3a540a989ca	1	Other	Other
+9aafc805-1584-4f07-9f0e-2f8b928fb02b	1	Other	Other
+9aafd4c8-4ce8-43db-a006-0307feca8a8b	1	Other	Other
+9ab006fa-7065-43b3-9827-76000380dee2	1	Other	Other
+9ab0793e-bb62-486e-8610-0a10123c6d1f	1	Other	Other
+9ab08514-7c57-405c-b5f6-2f9bb5d05099	1	Other	Other
+9ab08b2c-d88d-43d4-9c98-dc825bd8476c	1	Other	Other
+9ab0a133-70f5-4c05-9188-bd34df2f57be	1	Other	Other
+9ab0b2c2-2c9b-49fa-abb9-7c316627840e	1	Other	Other
+9ab0c215-186f-482b-a51f-0d2336f5afe3	1	Other	Other
+9ab0f141-cc64-418f-a0f5-52432ee0fd6a	1	Other	Other
+9ab16a86-a11a-4a71-95e8-898cfda4aaca	1	Other	Other
+9ab1dd28-e412-4e5b-a9d3-e42c1abe89af	1	Other	Other
+9ab23161-3efc-44bd-80e0-e99014f2360a	1	Other	Other
+9ab2e049-e68f-41a3-9c45-ec053bee12c1	1	Other	Other
+9ab2f128-70d9-410a-95aa-8e4c4a1c7e2c	1	\N	Other
+9ab307d6-fc7e-4961-ab98-fa7c48fa3072	1	Other	Other
+9ab3d29e-c75a-4147-b273-f2362550196e	1	Other	Other
+9ab40dd3-9d27-4f5a-b331-af8a4e4d9e26	1	\N	Other
+9ab431a5-1574-4d17-bdcf-79b4fec7c36c	1	Other	Other
+9ab456e9-f86c-4afd-bbce-4fad67a21856	1	Other	Other
+9ab45d04-8172-40e5-8e68-4271576f1bcf	1	Other	Other
+9ab46c26-1ec9-459f-b0a5-eacc0236d13d	1	Other	Other
+9ab47dc4-e05b-4d55-84d2-8f9d5e126a2d	1	Other	Other
+9ab5023c-d675-402a-9c1b-c79532cb31b6	1	Other	Other
+9ab649b5-6a49-476e-8624-12f2d629b424	1	Other	Other
+9ab65c25-8b82-41cc-808f-f62adf3adfd5	1	Other	Other
+9ab65d55-0664-4493-8238-b3a03e0255c3	1	Other	Other
+9ab6ad87-f068-4bfb-828a-fda907cd8cf3	1	Other	Other
+9ab6bdf7-657f-4155-bfbb-45bac0612843	1	\N	Other
+9ab6c335-0bcb-4e0b-b0bd-7d5704f39ab0	1	Other	Other
+9ab6d863-b968-4a0f-829b-1cc2dbcb2985	1	Other	Other
+9ab6dfbc-801f-44fc-82a6-235de45f36ce	1	Other	Other
+9ab6f7da-59be-4daf-96a5-b2e1267feb01	1	Other	Other
+9ab70a47-84cb-4ebd-b610-0ace178dec92	1	Other	Other
+9ab72894-4583-4cbc-b3c8-205a694f982c	1	Other	Other
+9ab7a9d4-0cbc-453a-bdba-4ec89fea683e	1	Other	Other
+9ab7c9e4-5f10-4648-8a8d-03ba75aaf318	1	Other	Other
+9ab86727-0c8c-4360-a464-c9199f427ee0	1	Other	Other
+9ab8b051-f70a-46e5-b27e-2a19b3444cb3	1	Other	Other
+9ab8c9d5-da97-44c3-9712-275e0e572362	1	\N	Other
+9ab8cc76-fde7-4eed-aa9c-45c879285cfc	1	Other	Other
+9ab8cfd8-7492-44a7-994d-6af5ae909960	1	Other	Other
+9ab95d11-2170-41a7-833a-4cd38d7c9482	1	Other	Other
+9ab9d21f-cbd9-47f4-bfb0-2ecd4e8cc9ad	1	Other	Other
+9ab9e605-3733-4c87-b134-a271b8880fbd	1	Other	Other
+9ab9eb44-faed-47fd-a260-3327cfef8adf	1	Other	Other
+9aba47eb-0a54-4312-8444-02c1716338fe	1	\N	Other
+9aba4d14-638e-4ba2-9ed5-42e91079a464	1	Other	Other
+9aba9ead-63ce-4355-98dd-45bcdd818f6c	1	Other	Other
+9abb13a8-7123-4c85-ac39-78d3af86ae3f	1	Other	Other
+9abb1f63-1987-4b77-905f-58c2ecdf40b0	1	Other	Other
+9abb3bc3-ea61-4e50-8a9b-f8919c05ad8e	1	Other	Other
+9abb5239-7e51-4c4d-95b5-fcb2e59cba55	1	Other	Other
+9abb5307-ab07-4023-bbfd-73b87f5900f4	1	Other	Other
+9abb5bc0-8109-4a01-ab9b-1ded7d0d6942	1	Other	Other
+9abb850e-65af-41f3-b9b9-dbc9c5d3dc58	1	\N	Other
+9abb8e58-911e-4cb0-8190-d52ee8ca9ba5	1	Other	Other
+9abc939f-0e52-4858-b695-5d518ea012e0	1	Other	Other
+9abcdb8f-e760-4f03-a69f-a55f7257c095	1	Other	Other
+9abd1554-b8cd-4bbd-9a96-d5a1f59fc1a3	1	Other	Other
+9abd60dc-ba37-4419-a516-4b9c7f154f04	1	Other	Other
+9abd785e-1c14-41a9-a4ae-9f29a5df0750	1	Other	Other
+9abdaade-5c59-4d35-865f-9ff80bc5b2d2	1	Other	Other
+9abe558b-2296-4973-a78c-55953b06b6ea	1	Other	Other
+9abe79fd-c793-47ab-a046-2b954aff69ad	1	Other	Other
+9abe903f-5ea5-4441-93ce-86cbabfa50d0	1	\N	Other
+9abedac0-6a2a-48d6-9b7b-dd54b4016a25	1	Other	Other
+9abeeb8e-3dd5-47b2-997c-f3c06f55a5af	1	\N	Other
+9abefa17-d96f-4d16-aa32-adcee974d499	1	Other	Other
+9abf23b9-5139-407e-9680-a70361e25351	1	Other	Other
+9abf2782-f7df-4cdd-8090-004ab67defb8	1	Other	Other
+9abf349a-7f64-4f26-9938-4cb65f461f92	1	Other	Other
+9abf34b1-3d94-4542-b460-0f2ea5a3e419	1	Other	Other
+9abfb58c-402e-4dfa-916d-ba9fae1bafae	1	Other	Other
+9abfb95a-6628-4731-bcf8-d46138cbb0ff	1	Other	Other
+9ac03282-08ef-4fc1-b0ed-d93e5ee234ea	1	Other	Other
+9ac0ad1b-115a-4794-a433-55e8e0c14d7a	1	Other	Other
+9ac0c16c-8c40-48ed-b838-8819d4a3030f	1	Other	Other
+9ac0c461-c8c7-4948-931f-502db84450a7	1	Other	Other
+9ac10ef2-caed-41de-a502-63c7233ccdc9	1	Other	Other
+9ac114a4-6b2d-4b62-a8ae-19868372466a	1	Other	Other
+9ac1314d-655f-4af4-b6ec-dc6530eca00a	1	Other	Other
+9ac136bb-fbaa-4ad5-aaf3-ee4e17e04f68	1	Other	Other
+9ac16055-0fb1-4b73-82f9-058630a581c5	1	Other	Other
+9ac182e3-8148-4822-bf41-5e429f89a8e0	1	James	Other
+9ac1be5b-ff09-470d-957c-174339bdb871	1	Other	Other
+9ac1f08b-ee5c-4fe1-bb5b-07a3065f3ba9	1	Other	Other
+9ac20093-87cd-4357-9a77-f63a40d82d7c	1	Other	Other
+9ac2469b-bb44-424b-b65e-71bd6da4072e	1	Other	Other
+9ac24ca2-ce8c-4488-8be8-0a50bb4234c9	1	Other	Other
+9ac2579c-e0d4-4cd5-adb7-d084d39c5720	1	Other	Other
+9ac263ad-ddc7-4de1-8b97-46f43c7ca500	1	Other	Other
+9ac2c5b6-912c-4ae4-96f3-fc3eea14510d	1	Other	Other
+9ac2fc19-27d9-463a-bcbd-898f72b56da6	1	Other	Other
+9ac31e19-5af8-4df1-9dae-2dbe66a7aec1	1	Other	Other
+9ac35245-3ce0-448a-b1ca-3a4d3d27984a	1	Other	Other
+9ac36d7f-1086-4bab-a97f-211a50ab5484	1	Other	Other
+9ac387da-2c78-40eb-b5b0-ebb7e8a194d3	1	Other	Other
+9ac38bd1-08f3-439e-80f2-91c425a5fd0c	1	Other	Other
+9ac39f9c-e181-4400-bf04-4b0376ad3936	1	Other	Other
+9ac3c298-3542-49d7-b97a-e3f71ba88ebd	1	Other	Other
+9ac43680-e681-4f14-8003-e168a7db940d	1	Other	Other
+9ac45571-4063-48f3-9557-2cf7b2b832df	1	Other	Other
+9ac46c99-763a-4447-afd9-113f87d5107d	1	Other	Other
+9ac4806f-7174-4bbb-bc61-7e66d1d452cb	1	Other	Other
+9ac4971e-cb54-421c-a573-643ca1889677	1	Other	Other
+9ac4b9cd-d545-4543-8729-b91ab4592e46	1	Other	Other
+9ac4e358-1098-482d-9583-1e2ef003d999	1	Other	Other
+9ac4ea69-3520-4bba-8c0b-b5e8dc1cc655	1	Other	Other
+9ac548f0-e000-4341-abec-0bc470859b36	1	Other	Other
+9ac5672e-0790-48d8-a0f7-1dac7b16fec6	1	Other	Other
+9ac5a97a-02e5-4b07-9a7c-b66949ecbfe3	1	James	Other
+9ac5c817-839e-41ea-8402-329d35ef031e	1	Other	Other
+9ac5dbf4-2a64-490d-bc71-798997830887	1	\N	Other
+9ac61e1f-6898-445c-a98a-cf8abb007aa7	1	Other	Other
+9ac62728-a02c-4e13-91a8-e166bf2365bf	1	Other	Other
+9ac6484d-65de-4d25-80e2-0498031dc12f	1	Other	Other
+9ac6efbd-9608-4533-981e-ec0f37640e56	1	Other	Other
+9ac71970-97a6-4ac5-9006-ced9ed3a3e17	1	Other	Other
+9ac730aa-e7e5-41c3-bdf7-d734c4caead7	1	Other	Other
+9ac76b7a-8b89-4620-823b-7159578d2f42	1	Other	Other
+9ac76c7a-eb78-41c9-83ab-8302e60a3ae2	1	Other	Other
+9ac77482-b233-4f05-9f4e-f79d1b80ee39	1	Other	Other
+9ac77572-bc55-4565-99bc-b6ba51eba52e	1	Other	Other
+9ac77759-e72d-4f99-b3e2-68607367a4cc	1	Other	Other
+9ac7b29d-8164-41fc-81ac-9a34bab542e0	1	Other	Other
+9ac7f2e4-11c1-4bc1-8baf-2b6dcd5a1008	1	Other	Other
+9ac815c5-cedd-40ea-80a2-dcf2cdf9f170	1	Other	Other
+9ac82410-add5-4974-8ff4-fb15f3d4a174	1	Other	Other
+9ac888f5-1be5-41fc-8157-3273a50a2224	1	Other	Other
+9ac8c0eb-e759-4fd4-97ea-2305fca68007	1	Other	Other
+9ac8d33b-6d48-4525-a0d1-11515d6747a6	1	Other	Other
+9ac8defa-19da-4597-83c8-c3a16db7a4aa	1	Other	Other
+9ac8e0ec-6a21-4317-8c2f-7a8de6b8a356	1	Other	Other
+9ac91476-da03-4ad1-9e42-6119abf53250	1	Other	Other
+9ac92813-1156-40fa-bf2b-a7dc51530a2e	1	Other	Other
+9ac96000-8a06-44d2-99ad-9ef78fa41f08	1	Other	Other
+9ac994eb-bdfe-4f50-9739-d2714e2eee2b	1	Other	Other
+9ac9a74f-74e9-4459-bed9-0934778a91b9	1	Other	Other
+9ac9cd36-a13d-4e9a-913d-ac2d133a9dd7	1	Other	Other
+9ac9e437-2425-44a4-a85c-66a5b3036c00	1	Other	Other
+9aca0740-c5af-4a93-944b-472da84a9c69	1	Other	Other
+9aca0a3d-2153-46d3-b05a-f0ea78b2b896	1	Other	Other
+9aca5c59-5d08-4e63-8170-bda679fac0bd	1	Other	Other
+9aca5fca-ffc1-44df-8398-2c0b67254b79	1	Other	Other
+9aca6fa8-e58c-4ae9-843d-1c6fce821f37	1	Other	Other
+9aca9d5a-603d-4d16-a749-ffa4208767f7	1	Other	Other
+9acac45b-c632-483c-ab28-ae2e28bcd152	1	Other	Other
+9acad1fe-fb38-44e9-b76a-f302c8d406c9	1	Other	Other
+9acb0663-908b-4c2d-a275-3d09fb8e3220	1	Other	Other
+9acb0c02-7e1f-4c9d-811c-fe631892c8c7	1	Other	Other
+9acb0e34-d977-428c-8858-73b062bf7e2c	1	Other	Other
+9acb120b-c2d4-420c-bed8-72ba6990de87	1	Other	Other
+9acb15bf-ff65-4a14-82db-b3917edf6901	1	Other	Other
+9acb7446-d2bb-4e08-bb4a-bb5015e5748c	1	Other	Other
+9acb9955-aacf-4820-9274-aafe351b0445	1	Other	Other
+9acc20e4-0977-4784-ad6b-1b6701d631b7	1	James	Other
+9acca504-f360-44f6-8d26-ce1321c7aee9	1	Other	Other
+9accc6c4-25a7-4de3-925d-a18bed96d33e	1	Other	Other
+9acd0197-c1f0-4fcd-898d-964ae6c4cd6b	1	Other	Other
+9acd13da-76e9-48e3-971f-0cd34a3cc165	1	Other	Other
+9acd2f63-4513-4075-b259-a23a193332f2	1	Other	Other
+9acd4d99-3d02-4d8c-9b1f-af1712c6c0a1	1	Other	Other
+9acdfd8d-67d6-4c0e-a6e9-01e088a71383	1	Other	Other
+9ace1fd8-b4c1-4685-a9e5-d495b042b28f	1	Other	Other
+9ace51c4-f0c0-42ad-aef8-57d98adaddac	1	Other	Other
+9ace5db8-2d35-4b6a-ace2-34e5d3f0eefd	1	Other	Other
+9ace720b-4528-40bb-a6b4-a8cfb13bc494	1	Other	Other
+9ace7ef8-f7b9-4957-99dd-7bcc5b773e0b	1	Other	Other
+9aceb998-8db4-4ca8-b15f-38ac5a542b38	1	Other	Other
+9acf78b9-cfba-4196-adde-f4af5bfcfd88	1	James	Other
+9acfb6ff-5ef2-41e9-a455-2a55ebd960d1	1	Other	Other
+9acfb779-aec3-4af1-b1bd-0038c159e214	1	Other	Other
+9acfc7dd-6593-421a-aab5-3845718a6f7d	1	Other	Other
+9acfccef-e043-4847-b05d-40b5932058f7	1	Other	Other
+9ad0019d-89c4-4155-a3c4-2c1b249a5685	1	Other	Other
+9ad033ba-7282-4590-a793-a6b85323f33a	1	Other	Other
+9ad049f2-8d6c-437e-9ab7-4c61e2aeba9d	1	Other	Other
+9ad0745b-cde3-43b8-b5d6-07458a93d357	1	Other	Other
+9ad07609-f1c1-4014-8de7-13867752c7d7	1	Other	Other
+9ad0b4c4-eec3-40aa-87a3-02ea4cb2a851	1	Other	Other
+9ad0d4d8-992d-4e79-a6eb-8a647f9889ae	1	Other	Other
+9ad118b4-1499-46aa-bf23-350ea965283d	1	Other	Other
+9ad11d47-048e-44f6-9c50-d1d807f4321e	1	Other	Other
+9ad13664-6a41-4410-b7e5-9d334c531737	1	Other	Other
+9ad14b62-eddb-45c1-8982-df66490012db	1	Other	Other
+9ad14bb6-5cf9-4713-bc94-602c6e50a033	1	Other	Other
+9ad16033-e95a-43c5-8ee5-97de0aa6fe18	1	Other	Other
+9ad180bc-2bd3-467c-8443-33304d869076	1	Other	Other
+9ad20919-46ed-4825-9b55-be91ae1b1c6b	1	Other	Other
+9ad20b6f-8308-46f4-8d1a-5756c64a733d	1	Other	Other
+9ad270ec-27f6-4552-9eb0-39f1df60b247	1	Other	Other
+9ad27fed-3713-4d4a-b4ee-389962e0e678	1	\N	Other
+9ad29242-ae44-4358-a37a-021218b4e5ee	1	Other	Other
+9ad2c17b-8a22-4608-aa46-d0a2f4a1ef46	1	Other	Other
+9ad2c761-cd4f-4815-b740-42c5940ea45e	1	Other	Other
+9ad3b5ba-4fd2-422e-bd2f-c8c59abe73f2	1	Other	Other
+9ad402c9-d4b9-47a6-8276-6ac64171845b	1	Other	Other
+9ad47b0b-91b4-4c43-a43d-b407fe163618	1	Other	Other
+9ad47f7e-1569-4d7e-b6b2-035d8cb097dc	1	Other	Other
+9ad492f4-1e69-40f1-ac8a-4fe8ba79a0d4	1	Other	Other
+9ad498e6-d563-4c8e-99f4-4c556e1b4f13	1	Other	Other
+9ad4ad40-72fb-4b95-a1b6-45ad02f3b1f5	1	Other	Other
+9ad507ff-7876-4e01-8e0c-e71d7ec62a48	1	Other	Other
+9ad55645-96e0-4625-ba10-63248e7cc60d	1	Other	Other
+9ad5a18d-009c-436a-a5f3-3e526b2769e0	1	Other	Other
+9ad5d4ee-ed32-4475-8dac-31dc2cf92e00	1	Other	Other
+9ad62cc5-e84d-4f25-9a73-3fcda17de3f3	1	Other	Other
+9ad634f6-639d-4483-b58e-9fdd0c3bf84f	1	Other	Other
+9ad6378b-92fe-4b6c-a6e8-ecd19d4ffd73	1	Other	Other
+9ad6528c-cb70-434a-91c2-8b92b15f37da	1	Other	Other
+9ad66364-56ad-4b2c-bcab-2bd23bb9ca1d	1	Other	Other
+9ad76332-0fc9-4b13-bbfc-36ac57b343cb	1	Other	Other
+9ad76810-d7c5-4325-a5c8-e80851e2ce8e	1	Other	Other
+9ad7944b-2084-4b7c-ad19-ff0fcc5caee1	1	Other	Other
+9ad79fe0-06e7-4f34-8c5f-92fd12eb3bb8	1	James	Other
+9ad7ae5b-645a-4730-8283-4b9387c766c2	1	Other	Other
+9ad7ec86-8047-4f86-9c3b-322972c396f6	1	Other	Other
+9ad83a69-61a8-4f8a-a256-7350de1b7b2d	1	Other	Other
+9ad85350-bbe4-44f1-a16e-1e756cfb98da	1	Other	Other
+9ad87e4a-f925-407b-b5cc-e4ad29452a8b	1	Other	Other
+9ad881e2-3555-4bdc-a8f2-a54ffeadd0ae	1	Other	Other
+9ad8bc6e-0d60-4546-a4f7-f1879a8d898c	1	\N	Other
+9ad8db31-9214-4414-90f1-d08a84295f8f	1	Other	Other
+9ad939d8-3944-42bb-a9ba-1cfd457a488d	1	Other	Other
+9ad95cd2-43eb-4910-a6e4-a3046390059c	1	Other	Other
+9ad967f2-0026-48d8-a9cc-1fb27c3802d5	1	Other	Other
+9ad96e75-9715-43fb-ade7-58eeb26cf534	1	Other	Other
+9ad9c335-4fec-43af-bc1f-9790124a3f05	1	\N	Other
+9ad9ff1d-69d1-4be4-bca6-7539d511c33e	1	Other	Other
+9ada7615-b281-45f5-828a-1995eb2ac8d9	1	Other	Other
+9ada8222-1fdb-4dad-a44c-ed6258939303	1	Other	Other
+9ada9b16-37f5-403e-ad13-50b66e168d82	1	Other	Other
+9adad4d0-a9b1-4255-bd5c-d2931986e05d	1	Other	Other
+9adb0efa-c258-4822-a1de-2671de113d19	1	\N	Other
+9adb10e8-9f03-44c0-8194-f919a0a1684a	1	Other	Other
+9adb28af-4454-4ccc-aebf-6944e6f0e9a1	1	Other	Other
+9adba464-a6e3-4403-9d67-22a7313a81e3	1	Other	Other
+9adbdf10-bbcd-4e7d-8540-fd8c98384e55	1	Other	Other
+9adc0b35-a076-40e6-9f53-940fe30307aa	1	Other	Other
+9adc1838-d37e-4caf-a5d0-f3595ec56a77	1	Other	Other
+9adc9615-45f3-4045-b996-20c1b747087d	1	Other	Other
+9adca4d5-4a7d-4f2c-b1bc-e0104a4fcbd7	1	James	Other
+9adcae62-2123-4089-96d5-90878a369fb6	1	Other	Other
+9adce66b-23d8-4742-b197-dd1403c7655d	1	Other	Other
+9add2c44-11fd-489d-b276-94a70c868349	1	Other	Other
+9add40b5-ad52-4e86-9c12-c71837ded981	1	Other	Other
+9adddd5c-7cef-4e1c-9351-5834cc7376e9	1	Other	Other
+9adde2b6-03bc-492e-8bb3-974fbe0f0f3b	1	Other	Other
+9addea0d-64e9-4e54-84ad-1779f60c0f31	1	James	Other
+9ade24c8-52e8-4379-84db-29f0a9c76aaf	1	Other	Other
+9ade83ab-676d-45b2-b512-86672b120951	1	Other	Other
+9ade8dd3-d3a8-4d8b-b448-617d147344b2	1	Other	Other
+9ade977f-a316-4966-8647-d56819209da2	1	Other	Other
+9adeb586-4b3c-434c-b478-e201f0ec05d4	1	Other	Other
+9adf55dd-b81d-4572-adc0-c0c89e19de44	1	Other	Other
+9adf5df7-3c28-4d1d-bdee-b9fecc3c9f7d	1	Other	Other
+9adfc305-4e06-4480-b3b6-bedb707839d9	1	\N	Other
+9adfce16-8eab-4ca4-b962-91e4ade9e931	1	\N	Other
+9adfe89a-c9d6-4523-ab04-678770768ffa	1	Other	Other
+9adfec8b-2cd4-48dc-ad97-80371e3029d9	1	Other	Other
+9ae018a1-b98e-4869-afa9-b45465f75688	1	Other	Other
+9ae07b3e-20d5-4dee-9ac4-2412d2645b77	1	Other	Other
+9ae17ef6-0e3a-477c-ab64-24d7ce3c9843	1	Other	Other
+9ae19260-3324-4c24-8d63-237288228629	1	Other	Other
+9ae1a655-3f2b-404f-b576-a29676a4d684	1	Other	Other
+9ae1b9df-6567-4f22-bc6a-1e9b777d2d07	1	Other	Other
+9ae1da15-4031-46dd-bcb0-914a82397121	1	Other	Other
+9ae21b44-cdff-4f35-9f64-4249a5f02702	1	Other	Other
+9ae2ccfb-0acf-4fab-8285-25738e632256	1	Other	Other
+9ae31aa8-0c59-4f79-a431-c345ac4b0a15	1	Other	Other
+9ae33f03-ecec-4b8b-8eb3-372dae84c341	1	Other	Other
+9ae3484c-88f2-4c57-8fb4-5e3afe062001	1	Other	Other
+9ae37993-856f-45a2-b8f2-0c282977a332	1	Other	Other
+9ae3acbc-5191-4627-8894-d28907a74375	1	Other	Other
+9ae3d4ba-e8ef-4f85-aa09-f579b43e4fe5	1	Other	Other
+9ae3d85b-8835-44ed-a8b0-21704989a150	1	\N	Other
+9ae3d9ef-c94d-4bb2-88ab-cf4616ee13db	1	Other	Other
+9ae40050-51d0-4d6c-8119-215ccab7f985	1	Other	Other
+9ae41a8f-4176-454b-a097-cc3090d6aab0	1	Other	Other
+9ae48fda-26c3-4874-94de-e7d36050b630	1	Other	Other
+9ae4e3fc-9048-426a-b55a-a14045b0fc42	1	Other	Other
+9ae57a48-1b77-4949-b642-02e7a5f9988f	1	Other	Other
+9ae5930e-f509-45f1-8d3d-0d9b4e4719d7	1	Other	Other
+9ae5d270-c27d-4bc4-b802-bd9049bf68ed	1	Other	Other
+9ae5f43d-e13e-44fd-ba6b-65b643843e13	1	Other	Other
+9ae620e8-2ca7-4a22-80da-916ef7075312	1	Other	Other
+9ae7959e-ef4a-470a-a00c-f3d384f735d5	1	Other	Other
+9ae79e2f-bf90-4e3d-bbfc-4b127bd408d7	1	Other	Other
+9ae7dc70-7c33-4f3a-9721-c9fe889bd221	1	Other	Other
+9ae7e92a-077d-4b8f-9ca3-e48e4b458a82	1	\N	Other
+9ae80f69-30ca-4acf-87ca-9d39e0f85244	1	Other	Other
+9ae81173-f8d7-4b9c-814b-d211b227fde0	1	Other	Other
+9ae83b4f-07d9-43f0-8910-166ad027adcf	1	Other	Other
+9ae842a0-8728-4eea-b3f5-d8c0ef1a3311	1	Other	Other
+9ae84564-505a-4704-88bb-a4980cbec4de	1	Other	Other
+9ae8735f-e1ed-4215-918e-09f6ece7cf21	1	Other	Other
+9ae888a2-fafa-47ca-8b97-9f3d7ad70b4d	1	\N	Other
+9ae94245-3191-4278-bfc6-35507e2517a1	1	\N	Other
+9ae9443e-54b5-4837-a4bd-be0d8246e655	1	Other	Other
+9ae97d60-3679-496f-830e-71cf2d9258d4	1	Other	Other
+9ae9855f-99b5-4b0c-91e5-17f94fc7e4a8	1	Other	Other
+9ae9ec31-52c9-4f40-a4cb-337ec8ff0317	1	Other	Other
+9ae9f1cd-e944-4009-8127-b5d1f0806b60	1	Other	Other
+9ae9f407-84a9-436f-adba-ce725210a944	1	Other	Other
+9aea194a-0006-4bee-803f-c34f0d0f58c4	1	Other	Other
+9aea471d-1e3d-4a5a-bb4f-69c819ace48a	1	Other	Other
+9aeac3d4-0d55-47c4-8802-a2c587bd8017	1	Other	Other
+9aead6bc-5cce-4119-97b3-9636ffcdade1	1	Other	Other
+9aeafa49-85a7-4527-b8a0-9f23a8f47c55	1	James	Other
+9aeb26a4-9399-4487-a853-ec13de726c9c	1	Other	Other
+9aebaea1-a4ce-4ed7-a2f1-8a4e0d2ca241	1	Other	Other
+9aebb5f7-26ea-4d35-b54d-6ae9e6e8d377	1	Other	Other
+9aebbeca-86c9-4c2a-abe0-d80d38215a41	1	Other	Other
+9aebe2e9-3974-41e1-b73b-5c249d4f2724	1	Other	Other
+9aec25cd-dc49-4291-8079-4c5725b46981	1	Other	Other
+9aec26b4-2ada-47c3-82ed-9dc0afab6779	1	Other	Other
+9aec2e52-8b66-4f69-90c8-e567a23e406f	1	Other	Other
+9aec6097-79ff-4e0f-a7aa-a3f822e44098	1	Other	Other
+9aec98c9-a5c2-4608-9ea4-71f82aa90022	1	\N	Other
+9aeca4e3-5150-4a82-94fd-9f03157e21f9	1	Other	Other
+9aecbdf1-2457-4f8b-bb3a-ef90d7526ca3	1	Other	Other
+9aed479c-cb33-43f9-8277-2513f37db98b	1	Other	Other
+9aed5b1e-4cad-4630-a387-d1cbf71594dc	1	Other	Other
+9aed6338-d63d-4454-8ccf-99516ff40e37	1	Other	Other
+9aedce2a-5ed6-474c-ae0d-9f899ed36541	1	Other	Other
+9aedcf86-1b0a-4ef9-adb3-e75722a6d880	1	Other	Other
+9aee467f-96a2-4c2e-af24-81af2059ec80	1	Other	Other
+9aee9bf6-4e11-4772-a35f-2b5e558cf2b8	1	Other	Other
+9aeef216-edd7-43ce-91b3-1dbaf8fd085c	1	Other	Other
+9aef1732-b9fa-4d3d-aae8-0706d15dfbc8	1	Other	Other
+9aefacb5-1f6a-489f-9767-a5af05dcd09e	1	Other	Other
+9aefaf20-18c8-4e81-a5a8-ff28c486ed61	1	Other	Other
+9aefc845-98af-44b3-b9e9-764a6810f35c	1	Other	Other
+9aefe067-c029-4bb9-8981-d69d2a8c1a40	1	Other	Other
+9aeff7e0-25ea-48b7-85ee-bdfc666917ad	1	Other	Other
+9aeffa9d-edcd-4048-a5b8-a553d815bcf9	1	\N	Other
+9af04a20-8fc1-48de-b0d1-6dc5b42f5e9f	1	Other	Other
+9af087e4-2c0e-4674-b094-63a1540f3875	1	Other	Other
+9af09ee1-cec7-45de-a48d-63ca6ee012a0	1	Other	Other
+9af0cd5e-4098-4002-b90d-482db8adc3e1	1	Other	Other
+9af1381b-622b-46ca-a7be-f8f721c879e2	1	Other	Other
+9af14958-c5a4-4fc6-bff1-cbf4578e3c2f	1	Other	Other
+9af16547-665f-4a38-a196-b290975fd655	1	Other	Other
+9af1cac8-a868-4b1c-b879-6341712e873b	1	Other	Other
+9af1e4dd-88ff-4c38-8166-2930035e1055	1	Other	Other
+9af22c65-cc74-4951-a202-da9cc2b1bde1	1	Other	Other
+9af27a0c-26cf-451d-ace9-b1f7a0c06963	1	Other	Other
+9af2920d-0cad-4592-87c0-f02b66448f3c	1	Other	Other
+9af29f38-cdcc-4b57-93e4-b7b986c162f1	1	Other	Other
+9af2acef-41e1-4979-bce4-fe5da84486fa	1	Other	Other
+9af2f366-578f-4d48-93be-b11e69e7c122	1	Other	Other
+9af31406-8d79-4355-adad-37a50eb8b893	1	Other	Other
+9af3197a-1612-4b99-9bee-d387cd02e1fc	1	\N	Other
+9af319ea-22b0-4bc1-8301-aa7ead6e6976	1	Other	Other
+9af366ff-7034-459f-85fd-9d3ef52a93d1	1	Other	Other
+9af37efe-df91-45b3-b73d-bb311374d3f3	1	Other	Other
+9af3872b-9424-4942-9abe-8f080d4992ca	1	Other	Other
+9af3e897-e7db-41cf-b1da-5a9d32fc8e2d	1	Other	Other
+9af40b1e-9589-4d9e-8467-6119c87e723f	1	Other	Other
+9af40b48-e240-486c-aae9-4b255612caed	1	Other	Other
+9af41c09-2b0b-4ac2-9f02-efc3f29d00ff	1	Other	Other
+9af42218-1cec-45c6-a6d0-732db4237b6b	1	Other	Other
+9af44982-8ddb-4f99-b6f6-37608098bcfb	1	Other	Other
+9af46ba7-b33d-4237-8010-7fb1acee3dd8	1	Other	Other
+9af46d09-2268-4049-add1-adb01dea66c7	1	Other	Other
+9af483f1-6ea8-4749-ab65-4f6a7c54e1be	1	Other	Other
+9af48924-4d42-4bfe-aa88-f8a1284257f2	1	Other	Other
+9af4be84-809b-4077-9aa3-1a7732934a10	1	Other	Other
+9af4cb4f-0240-4ca0-84d8-a9c799a68865	1	Other	Other
+9af4ce7a-8291-4544-844d-bc91a74afc09	1	Other	Other
+9af4f255-4068-4aaf-bb17-7051f4b649f1	1	Other	Other
+9af5228d-f21f-427f-b721-8d5539fab07c	1	Other	Other
+9af58382-3493-4fe1-ad6d-0c426c1a2e90	1	Other	Other
+9af5a379-96f7-4530-984f-09be956ce929	1	Other	Other
+9af5da22-601a-4a10-ade1-d30eb61bb7ba	1	Other	Other
+9af5e819-3852-46e4-9ab5-aee19b36eb7e	1	Other	Other
+9af600fd-04c7-4e3b-9102-4f45cbbd5f95	1	Other	Other
+9af62954-f8ca-4e40-84c0-1b2d0435391d	1	Other	Other
+9af663f8-e0d4-4f9d-94fa-49920af3c519	1	Other	Other
+9af6aef6-f3c8-47ec-9e9a-dc157a2f9ca8	1	Other	Other
+9af6dff1-2f33-46f7-8508-64a21ba94019	1	Other	Other
+9af7678e-0cb3-4df6-811c-f91bb5fbd6f4	1	Other	Other
+9af77eb3-cfcd-46f2-b342-151f25075bd6	1	Other	Other
+9af77f84-3487-4c76-9717-1fe9d3166246	1	Other	Other
+9af7bfb2-dcd9-4b39-a268-c27444b136a5	1	Other	Other
+9af7dce8-45a7-4a99-87a6-abed387a8f48	1	Other	Other
+9af7e589-1402-4efc-9129-925595a38c4a	1	Other	Other
+9af868bf-9734-4408-bad2-4e044d399cd7	1	Other	Other
+9af8b909-0570-4811-9852-3dbf331058b3	1	Other	Other
+9af91a5f-5974-4975-bbed-b8efb2c87c21	1	Other	Other
+9af929e3-0e18-4715-9011-472ce3a4ded1	1	Other	Other
+9af9481c-1593-48d7-8e50-257e5f97c1ce	1	Other	Other
+9af96667-c4db-4515-b1d6-e1621e916059	1	Other	Other
+9af988c6-2981-4e2c-83a9-b63639375d18	1	Other	Other
+9af989fc-e15f-4056-875a-17c7da493a81	1	Other	Other
+9af99a34-1d5a-4c15-90c9-0ebbb1e99028	1	Other	Other
+9af99a53-5d2e-4b9a-ab82-fb2d4f1f49b5	1	Other	Other
+9af9bc41-2fb0-4401-a0ef-86036d29c35c	1	Other	Other
+9af9d102-bc43-40fc-b16d-a8e22575c43c	1	Other	Other
+9af9e21d-3ef9-43bc-b84b-5845256913bb	1	Other	Other
+9af9e480-ea22-4653-a433-1cadbce1c147	1	Other	Other
+9afa109b-a7e5-48eb-9869-2006b5c284ba	1	James	Other
+9afa24de-6b3a-4243-b2a3-cf90ee21c5a7	1	Other	Other
+9afa3468-5316-4492-adf2-e242f8372e26	1	Other	Other
+9afa8015-4b6a-4a3a-8d01-b4d5b3007080	1	Other	Other
+9afac2c5-4782-4500-b9ed-5c9d4b213c9b	1	Other	Other
+9afaddcc-0467-43ff-886f-6a107e1e8e4f	1	Other	Other
+9afaf46b-9515-4385-946f-8024517bd7f5	1	Other	Other
+9afb16ef-1e90-4ec2-bae1-48f7e570a277	1	Other	Other
+9afb6135-e08e-43db-a015-3c005c322aac	1	Other	Other
+9afb7c5e-24d5-4780-8530-6b2dda55e6cd	1	Other	Other
+9afb9798-2606-46a7-b20e-93a4d9367e6d	1	Other	Other
+9afc2172-965c-49bd-88b9-d1321a7513c5	1	Other	Other
+9afc5261-4caf-4aa0-b5e4-ff1a2dd3966e	1	Other	Other
+9afc5de8-851e-4707-a068-90857a89be8e	1	Other	Other
+9afc6da1-aa63-4608-9b7a-f1d257f7e837	1	Other	Other
+9afcbaa0-647a-45c0-8c62-d80dc57f8544	1	Other	Other
+9afce67e-3246-4dd7-865b-6213e0058a7d	1	Other	Other
+9afceeee-ab78-4c1c-a653-2db643339a00	1	Other	Other
+9afd1088-8810-4178-ba2a-9c455e6fc85d	1	Other	Other
+9afd602d-18dd-45f5-9ace-fe6d6f84764a	1	Other	Other
+9afd9d4a-fd98-4c48-af0a-dfa4eb3edd6d	1	Other	Other
+9afe40b3-c615-47e5-b141-634a0e3f59c8	1	Other	Other
+9afe750d-1d09-4b0c-8b1a-f640c692db64	1	Other	Other
+9afe86b7-a834-4090-b8ff-cd00259751c7	1	Other	Other
+9afed386-9c92-4f87-8d7a-a97c5150313c	1	Other	Other
+9afefa38-1f38-4c03-968f-9637061df7f2	1	Other	Other
+9afefe84-7d23-467a-a5dd-06f0a9cb0494	1	Other	Other
+9aff005e-1782-4529-b2c0-20b9350757e9	1	\N	Other
+9aff0d01-4ace-480d-9483-7a25d0510f9b	1	\N	Other
+9aff5eaa-0d27-4bfc-a3c8-7b4ae027be93	1	Other	Other
+9affeb63-3ff6-4e9f-9d0a-f7704731664c	1	Other	Other
+9b014a7f-b178-4e4d-9567-ef44fc4a73b8	1	Other	Other
+9b015731-c898-461a-8722-88126f60ce70	1	Other	Other
+9b01729e-091e-4d11-818c-fc63ed572fb2	1	Other	Other
+9b0173b1-e6b0-4126-b75e-1a4794c91f79	1	Other	Other
+9b0181a7-4590-4b53-bb18-6c0904508606	1	Other	Other
+9b019568-28a9-485e-94dc-64ce04317563	1	James	Other
+9b01ba52-2c9a-437f-ab98-09237a425a87	1	Other	Other
+9b01d036-75a0-4a39-afff-658007e31692	1	Other	Other
+9b022794-881c-4daa-a416-d0e596a792c4	1	Other	Other
+9b023f8f-7ed1-46ef-b1dd-7d9fdc729c01	1	Other	Other
+9b0240f7-dac8-4140-9a4d-85cef3a53791	1	Other	Other
+9b0260cc-87de-4e8c-8179-ae7066e45800	1	Other	Other
+9b02841d-fd93-4afa-9c4a-15222a42e6cf	1	Other	Other
+9b02ec00-073f-4e23-990d-249451bf2c1b	1	Other	Other
+9b02f9d7-7da6-43c6-acf6-480f1b38dc44	1	Other	Other
+9b032863-27a7-4723-a1f1-08a50fb4482d	1	Other	Other
+9b035607-ecc8-42ab-8a54-45b905655672	1	Other	Other
+9b0356ea-fcf0-461b-b614-3036ea8bdff7	1	Other	Other
+9b0399f0-213c-4ef8-9f34-82ae9ccfeeac	1	Other	Other
+9b03f010-2982-4a2e-8253-1d300c5da825	1	Other	Other
+9b03f2e3-51a9-474c-a9a9-19e6ed17aa27	1	Other	Other
+9b04111f-4552-463d-b794-3333864427fc	1	Other	Other
+9b045dd4-4a01-4c7a-a4ba-1c1aa805e1ff	1	Other	Other
+9b047fef-8618-4ce6-ad77-6665b382eddc	1	Other	Other
+9b04a273-9b24-47f2-a3c9-638f182fba3a	1	Other	Other
+9b054c51-5f40-4eb6-ac76-54659e4e79a0	1	Other	Other
+9b056a23-ca10-4ef4-973a-fab7734a4873	1	Other	Other
+9b0590c8-29b6-487f-8d41-cca9eef252fa	1	Other	Other
+9b05a8bb-54a9-4040-a63f-6ead1dc64881	1	Other	Other
+9b05dfd2-133f-4286-aa02-31716b187b82	1	Other	Other
+9b05e5ee-e805-404d-be76-b91257cf0de6	1	Other	Other
+9b05f16a-ea76-48e4-a58d-5327436d88fa	1	Other	Other
+9b061811-c1c2-401c-b5d8-a3fea55d859d	1	Other	Other
+9b0649b4-1d19-4005-ae4a-f9463960547d	1	Other	Other
+9b06617b-846c-4d3a-aba8-c8051ce08981	1	Other	Other
+9b06c0bd-0db1-410d-a46f-60833d255a37	1	Other	Other
+9b06ea36-634d-4dbb-b6b3-d5b2df923a12	1	Other	Other
+9b06f2c1-91c8-4127-85a5-271fbbf8281e	1	Other	Other
+9b070a44-a5bd-4e82-983f-1460a6f20c96	1	Other	Other
+9b073100-68f7-4fa1-903b-eda71ca6be1a	1	Other	Other
+9b07600e-6d94-49ed-9f42-cdb96867e845	1	Other	Other
+9b07864d-736c-4721-9f62-6cd6999a0840	1	Other	Other
+9b0795df-ed52-4d74-ad28-dbb1a1cefb94	1	Other	Other
+9b07a9d2-d076-476f-a55d-a792fe41198a	1	Other	Other
+9b07cb5a-55b4-4750-9cea-bf5d4809f5fc	1	Other	Other
+9b080c49-a522-40cb-a9c6-7923f698e21a	1	Other	Other
+9b081276-e68f-43a0-b810-b58f0c06263e	1	Other	Other
+9b0815e7-d5c8-4473-ae4e-f32d74fee050	1	Other	Other
+9b081793-48ed-4305-b8e1-fc927372dd7a	1	Other	Other
+9b088aa6-dae2-4a70-b2e0-1df19387f8e8	1	\N	Other
+9b089099-52a8-49a2-b24d-9a4b357b1722	1	Other	Other
+9b089ab3-a8fc-4ce6-8365-d8dabc59b5d9	1	Other	Other
+9b08bdf1-6a99-47b5-8e5d-89b00e296707	1	Other	Other
+9b08c829-7033-4516-b277-d5b6cacdcbac	1	Other	Other
+9b096ee9-57b2-4e77-8574-eefa7bbc8838	1	Other	Other
+9b097276-fe8a-4a8b-b832-533f2e1f43be	1	Other	Other
+9b09d2fd-972c-4ba6-89f3-d303efad6f49	1	Other	Other
+9b09eadd-fdcc-4e0f-8608-040a93df3bb6	1	Other	Other
+9b0a012b-2291-41ce-8b7d-f2dc9aa00154	1	Other	Other
+9b0a0da9-15a9-4325-91b0-60be99c20ad1	1	Other	Other
+9b0a37a3-695a-4c94-a276-8b0f1b771b4a	1	Other	Other
+9b0ad42a-dbdc-4cfb-8e87-2330cbb07266	1	Other	Other
+9b0ae289-cc3e-4057-9aa9-2042212c9732	1	Other	Other
+9b0b1f57-7173-4f8c-8621-6ae2340097f5	1	Other	Other
+9b0b4db6-0327-4e84-84b6-956a2adda2f1	1	Other	Other
+9b0bbb2a-6339-4e37-91c1-58fed16029aa	1	Other	Other
+9b0bd651-4d93-4e74-9963-0d34af392ea6	1	Other	Other
+9b0c8ddc-4871-4d6b-98f7-d2755ab5a3c8	1	Other	Other
+9b0c9eb3-d997-44a7-becf-15d2532fdb1a	1	Other	Other
+9b0cc02e-8e58-40ef-8051-d4c81d61d77a	1	Other	Other
+9b0deefc-507e-4d9f-b46d-e070a4c81954	1	Other	Other
+9b0df447-ee3d-456b-bef2-3c4822119373	1	Other	Other
+9b0e92d3-de53-4a2b-99f7-bd20c6bd2c41	1	Other	Other
+9b0ef36a-3d4f-4f96-b0cf-39b786e8e0b9	1	Other	Other
+9b0f33a9-d231-45e2-ba74-8606d8e99486	1	Other	Other
+9b0fe55a-8593-43d9-ae29-ef351b4e970d	1	Other	Other
+9b0ff6a3-7a39-4bf8-9ac2-649444be0522	1	Other	Other
+9b103b83-5151-4230-bb3c-fc36c64c36df	1	Other	Other
+9b104431-5c85-4b4d-adf3-a96a694f2b61	1	Other	Other
+9b10552e-daba-498b-aa35-a5d2dac1f008	1	Other	Other
+9b107b2d-09a2-4838-a5a8-e6a038e1800c	1	Other	Other
+9b109605-7401-4aed-ac56-f225ded870de	1	Other	Other
+9b10a95a-1929-4e88-b4cc-8caa2be36a44	1	Other	Other
+9b111037-163c-4357-b81a-2a6830bc3ba2	1	Other	Other
+9b111bfb-8d1c-4cc1-be2c-f01595ffec4b	1	Other	Other
+9b113905-5e9b-4e4a-92d7-b56265a185bd	1	Other	Other
+9b118d9a-0859-4940-b4f3-0d809db62db8	1	Other	Other
+9b11c212-c305-4ebb-8cdb-d39530ef37fc	1	\N	Other
+9b11d844-b759-452c-84d2-4de72ba8eb4a	1	Other	Other
+9b11dc81-5910-4426-878c-cb4670e76f54	1	Other	Other
+9b1255e6-c4d2-44f9-a438-ff7ac771242b	1	James	Other
+9b12eae9-b45b-49ed-8932-6baa67db1199	1	Other	Other
+9b1318d2-2fca-4b8e-bb7e-9e031f0b6a49	1	Other	Other
+9b134beb-a137-4d81-9d47-dd6af2730df8	1	Other	Other
+9b135a75-011f-45dc-b720-bf06838dd972	1	\N	Other
+9b137d26-65f7-462d-b4ca-4ca258cfc629	1	Other	Other
+9b1386da-82d5-4274-92c5-0cafc85b412e	1	Other	Other
+9b138a44-43d7-44be-a73b-732d8b3fa24b	1	Other	Other
+9b1429a6-29fe-4add-b4de-50f396983e1b	1	Other	Other
+9b145287-9e19-4fe5-b1d9-ad4b8235a78c	1	Other	Other
+9b146604-f8d4-43af-a149-cfe93ed94a54	1	Other	Other
+9b1473c8-9be1-4d9d-9387-86ab5be2cac8	1	Other	Other
+9b147cf2-2d6d-4680-bec4-745b23137827	1	Other	Other
+9b14b78f-dae7-49c8-90ba-2615463e8ac7	1	Other	Other
+9b14e8af-fba5-4b2e-a8e8-b8478f1dc23d	1	Other	Other
+9b14f7d6-31cc-4e4b-ba7d-57ffc1161405	1	Other	Other
+9b15119f-b6cf-420f-8de1-e3fbf300c731	1	Other	Other
+9b153b40-9b3e-4882-b943-ac10e5277198	1	Other	Other
+9b154cbf-4a06-483d-a90b-55d63337f9d4	1	Other	Other
+9b159139-3b48-4cf1-9d7d-71645e903fbb	1	Other	Other
+9b15b7dd-597d-4e28-ad13-5f3fbd71df93	1	Other	Other
+9b15e520-9830-4771-86f2-dd98e4a82f5c	1	\N	Other
+9b15fa5a-ab76-48fb-892b-8feb40bd5c90	1	Other	Other
+9b15ff49-52db-405c-ae57-64a1af10877e	1	Other	Other
+9b166265-fd59-4795-be6b-e4e02b2e97db	1	Other	Other
+9b1675f2-d476-4813-be6f-f3618548cde3	1	James	Other
+9b1676b0-e1a0-4fd7-af66-87c3f1c0ccdc	1	\N	Other
+9b16c762-1464-4da7-adb1-47ada18c1085	1	Other	Other
+9b16ed32-d5e3-4393-94c7-7d456961a3e3	1	Other	Other
+9b176d29-6729-4ff9-8bbc-acd4d694719b	1	Other	Other
+9b17903b-ca17-4fa2-8654-ff1b13a5081b	1	Other	Other
+9b17af27-f897-4473-b89b-aa5521258cf3	1	Other	Other
+9b18c3d3-c25d-472d-b65c-d5118fdfa6cf	1	Other	Other
+9b18d117-be77-425f-b9be-e49b07484a8f	1	Other	Other
+9b195012-8e82-4919-9be1-f51b074f37a3	1	Other	Other
+9b1977bc-de5f-45b9-980a-08e17de9260b	1	Other	Other
+9b197f59-f767-414c-bbe1-66333685a681	1	Other	Other
+9b19bd52-a77b-4dd8-a7a2-0d2a5f2450c2	1	Other	Other
+9b19e166-af91-41cd-904f-67c0743c7649	1	James	Other
+9b1a0d7e-6b44-4ef9-b964-3ac50d670c86	1	Other	Other
+9b1a1c50-653a-423f-a931-4afa381faa64	1	Other	Other
+9b1a493f-10e5-41d6-a45f-5d1c30a70858	1	Other	Other
+9b1abc06-31ac-49dd-99d4-3214aa7c54cb	1	\N	Other
+9b1ad5fc-6045-4331-81c7-3d1e6b5d4457	1	Other	Other
+9b1b418a-54e4-49d5-9b28-88b96f7b7798	1	Other	Other
+9b1bc448-237c-41c8-9f57-c9636bef01f8	1	Other	Other
+9b1c1691-4060-4052-a980-f3f88d5ea9b5	1	Other	Other
+9b1c3932-2662-410d-ab6f-e466c54befc8	1	Other	Other
+9b1c4519-8d90-4896-a1bf-d5d0b25620df	1	Other	Other
+9b1c53c2-c45a-4eed-8102-c92e3bc21c00	1	\N	Other
+9b1c69e9-92fe-4065-804f-3e55d60a679d	1	Other	Other
+9b1c8347-488e-414d-ac6f-04a2a3dbcf05	1	Other	Other
+9b1caef2-e5cf-4454-b1d9-99c159a8eebe	1	Other	Other
+9b1cb7e4-d6e1-4579-8dab-0610dddf3c21	1	Other	Other
+9b1d601b-4d47-406f-8f33-e30987d49755	1	Other	Other
+9b1da2b8-194b-417e-86d2-b72c4fc9531d	1	\N	Other
+9b1da58b-fb60-4a9c-9eed-bc57c273a49d	1	Other	Other
+9b1df3b4-e809-40e7-a26f-f49b5a7edd51	1	Other	Other
+9b1df8d8-8dfd-4d0b-b072-9f8245bebdc8	1	Other	Other
+9b1e2a2d-6dc7-4032-9fde-29e0d5c40ac8	1	Other	Other
+9b1e50d5-225c-4567-b412-ca62afa28a61	1	Other	Other
+9b1ea74b-1eed-4b9a-af90-2802d66af1d7	1	Other	Other
+9b1f0468-e5bf-4201-8618-ab6310060b41	1	Other	Other
+9b1f248a-b9bb-41c8-afe6-ee38f6c3ca5d	1	Other	Other
+9b1f6058-8c81-46ca-819a-cc5f4019bcc3	1	Other	Other
+9b1fc934-6daf-4a25-a099-9be8d0b7d966	1	Other	Other
+9b1fd1eb-1691-4e1b-9660-76890fdf2e37	1	Other	Other
+9b1feaee-b6c6-467d-827a-978577733a61	1	Other	Other
+9b2051c9-b5d7-4cc9-a07c-f75f65820064	1	Other	Other
+9b208ba2-8b3f-4639-9a23-965e82a507d7	1	Other	Other
+9b208c30-3f24-421d-913f-933f1c37c574	1	Other	Other
+9b20c74e-6c17-4377-beb5-775dfaef6022	1	Other	Other
+9b210186-1ffb-4185-b91a-0b7f55d58042	1	Other	Other
+9b212c96-8f85-46f8-8530-abd157b6acbe	1	Other	Other
+9b213cce-61eb-4966-b380-82c58c98cca6	1	Other	Other
+9b2161fc-24e4-4dba-95a6-2650b37f6b2e	1	Other	Other
+9b21a08a-de18-4974-9305-f6258df1a911	1	Other	Other
+9b21efcc-115a-41dd-b8c5-aeee87bb8fa7	1	Other	Other
+9b21fc15-ec55-4bb6-845f-7f325d027232	1	Other	Other
+9b224d25-008f-45d1-8f36-2ca0bceb72a5	1	\N	Other
+9b225a91-11b2-411f-bb62-b4c4f8c6bf7a	1	Other	Other
+9b22a805-292e-412f-9b9d-5367ea30b2e6	1	Other	Other
+9b22afdd-8ca7-481c-8cb0-46a4b92dd65c	1	Other	Other
+9b22be5b-808d-4e54-8ed7-4256493e892b	1	Other	Other
+9b231355-f33f-4ffa-a05e-08bcd82ffa3e	1	Other	Other
+9b23383b-266e-403a-ac45-fd84da36f864	1	Other	Other
+9b23ca0e-575c-4e54-b7c4-e71e79dfa435	1	Other	Other
+9b23e5ae-4cd5-48d2-93e1-c8d7ee613b5d	1	Other	Other
+9b23edb4-5d28-4629-9a4c-063f2b5bf23e	1	Other	Other
+9b24ac2d-e4f3-4fe9-b617-e8e3551bc0d0	1	Other	Other
+9b24bf82-03bd-4050-8d87-84bdcb44c67b	1	Other	Other
+9b24c408-7046-4a20-b0dc-5b4a066d0001	1	Other	Other
+9b24c585-5fc1-44e5-9094-a575689a8987	1	Other	Other
+9b24cd57-6c59-4f6e-ba23-93e9ed03f23e	1	Other	Other
+9b2574a9-6936-4d34-a440-759c053d3db6	1	James	Other
+9b25a5a5-9740-430d-8167-e57e68108d67	1	\N	Other
+9b25ab64-7437-450a-90f9-88e1c4ace1ec	1	Other	Other
+9b25c5f2-8e37-435b-9fc1-39c073354f10	1	Other	Other
+9b25e9ee-a264-48f0-a4d0-40235d645615	1	Other	Other
+9b2606c5-8776-4c0d-829f-07745fa188c4	1	Other	Other
+9b260754-46ba-47cf-9cd3-c39d8dbeb536	1	Other	Other
+9b2608d3-f382-4afe-b3e2-fb03ce74330b	1	Other	Other
+9b2608e8-57fc-4f1f-a665-4dfe0fd6274f	1	Other	Other
+9b261f92-4e71-489e-a986-3edbc46e0dc4	1	Other	Other
+9b262582-18af-4e64-9d4d-4a46057098f2	1	Other	Other
+9b275f5b-1613-45aa-b831-3071313a9a65	1	Other	Other
+9b276b23-8649-451d-8f83-5078f512f232	1	Other	Other
+9b27bbd5-f483-490f-a99e-47a46e0b467c	1	Other	Other
+9b27ec76-a24d-458d-9e33-1813e5723593	1	Other	Other
+9b27f320-e992-465b-99f2-c9be08081a56	1	Other	Other
+9b280c9e-6d89-42ff-b2ae-0b3a18912ec9	1	Other	Other
+9b286aef-2eb8-4bff-a9d4-7645af6174e8	1	Other	Other
+9b28ade6-5bc6-4b40-9cf5-acb4d89442e6	1	Other	Other
+9b28b4b2-49bf-49eb-b764-a97b6bc3aada	1	Other	Other
+9b28f729-5737-42c8-a549-08f726f31550	1	\N	Other
+9b292b78-21d9-4ca1-8813-023a5eec2375	1	Other	Other
+9b293b50-e6ea-43f5-9cc6-68a49d6b055d	1	Other	Other
+9b29e3d2-391f-461d-b440-21b15d849c05	1	Other	Other
+9b2a506e-9b6c-4418-ad53-9c0bcd03abbc	1	Other	Other
+9b2a63df-8517-450e-b793-39cd70ad89c0	1	Other	Other
+9b2a6a8f-a958-4f0a-835c-9e5d178ec5a9	1	Other	Other
+9b2af165-c648-45a5-992d-c102637cb494	1	Other	Other
+9b2b0398-dacd-446e-b6b5-1630d10474b6	1	\N	Other
+9b2b35e1-f2bd-4185-9ad4-0ced727dd4ed	1	Other	Other
+9b2b9c30-a5a3-4197-86bd-edfa48225e6d	1	Other	Other
+9b2bc88b-833e-4526-adc2-f140a8ed9eef	1	Other	Other
+9b2bd243-4c2f-4362-baad-d127f5a67a4a	1	Other	Other
+9b2c1419-454d-4b8a-9ff7-11e46c576d26	1	Other	Other
+9b2c3133-74bb-4dcd-b728-4d77e5c0ec49	1	Other	Other
+9b2c3842-9f81-4296-90eb-984a3f847455	1	Other	Other
+9b2c605e-9640-49f4-abe9-76ab6e9e0f3a	1	Other	Other
+9b2c6c31-055e-4a45-8d30-b0d42b949ab0	1	Other	Other
+9b2c873c-699b-4a50-8842-e7a0d175b6d8	1	Other	Other
+9b2c9470-0e4a-4867-83e3-6856db843efe	1	Other	Other
+9b2cad53-6ea0-4f0e-ad1b-23201e624d52	1	Other	Other
+9b2cef1f-5387-40ef-926f-20573a578f34	1	Other	Other
+9b2d050e-bb81-471f-ab00-9e155b7860c9	1	Other	Other
+9b2d3856-45bb-4bee-b601-2b001ea6f5ea	1	Other	Other
+9b2d8641-09a9-4809-9dfa-41e329494247	1	Other	Other
+9b2d9e15-8495-4970-b3a2-ce1a9506ad59	1	Other	Other
+9b2e609a-9a83-42e9-ab9c-a793d55494cf	1	Other	Other
+9b2e85c5-d410-4d65-a743-b6c9c3972a9b	1	Other	Other
+9b2ed67d-11ad-4253-b70a-9071e1362312	1	Other	Other
+9b2ee264-b419-4361-be36-f5ebc60698d0	1	Other	Other
+9b2f7aec-38b9-4aba-9e97-0741ef90ecbf	1	James	Other
+9b2f9a9e-3820-4fa6-b6be-dbcf79ecf054	1	James	Other
+9b2f9ee2-b671-4748-8635-1c01f8574917	1	Other	Other
+9b2fa82e-a35c-477e-8e33-5bf107ab53cc	1	Other	Other
+9b2ff72a-5985-44e4-a389-5be6c54c007d	1	Other	Other
+9b300998-a26c-42d6-9d23-f7a73a427558	1	Other	Other
+9b314633-d778-4d10-8b7b-427b6050aa09	1	Other	Other
+9b317391-6322-4231-b98e-b3e958e6cba8	1	Other	Other
+9b3196c0-b877-4ab7-905d-70c1c9a8ce1b	1	Other	Other
+9b31bea8-f548-40f8-a3f0-cd0c5a0a4d19	1	Other	Other
+9b31c296-b767-4cfb-93fb-b3f77ff97370	1	Other	Other
+9b31d578-e1cf-4ca2-91ab-cb420843a36f	1	Other	Other
+9b31fc5e-0b11-4432-a39e-b5b0688417be	1	Other	Other
+9b320003-8083-4bfd-8d57-5abddbcd8867	1	Other	Other
+9b320455-ba39-48d8-9760-50089e44b220	1	Other	Other
+9b32695f-6b68-4e11-82de-e51fdc829d7a	1	Other	Other
+9b326f2c-9a05-4836-a1fe-c0d27743614c	1	Other	Other
+9b329e75-fcab-478c-929e-50e9757ea06e	1	Other	Other
+9b32c53f-1f90-4caf-820d-2a777cc274e9	1	Other	Other
+9b32e2bc-e6fe-4edb-92f1-c7e2e7589480	1	Other	Other
+9b32ff44-4872-43bb-9eb9-45513331cfc4	1	Other	Other
+9b333808-82d4-41b0-9cf0-4b0a6a91c9f3	1	Other	Other
+9b333ad9-b9a2-4be2-bbb1-39a10538602f	1	Other	Other
+9b335975-1082-4a57-9605-3f1aaf569e0e	1	Other	Other
+9b33635a-b7be-40ec-bece-ab82748b7de7	1	Other	Other
+9b3387dd-b974-4e9b-b3c5-e762ef853430	1	Other	Other
+9b33a4e3-e50b-4709-8204-b8ea0db13ead	1	\N	Other
+9b33e3d5-63f2-4ea3-90f9-9812600edd0f	1	Other	Other
+9b33e786-267c-4193-9bf8-cd6c23a5aaed	1	Other	Other
+9b342f00-1e7b-4af8-9448-ae8546bdaf9d	1	Other	Other
+9b34905e-5347-42d9-9848-150914ea4df5	1	Other	Other
+9b3490bf-21cc-467e-b3b0-9ee644862cd2	1	Other	Other
+9b34ce68-deff-4543-8063-2e4484291e5d	1	Other	Other
+9b34e581-5598-496b-b774-8a240cdb0c52	1	Other	Other
+9b351db7-17d5-43e9-81d3-caa64585c49b	1	Other	Other
+9b351f79-2faf-4f5a-825e-df5f89c0c85b	1	Other	Other
+9b352160-810c-447b-a7e1-da6f714887a3	1	Other	Other
+9b354baf-9e8e-4a1f-a034-0b7380739014	1	Other	Other
+9b35e5fd-adce-4a26-b780-82f2abb79890	1	Other	Other
+9b362e16-4114-4df7-a600-e72887781cb2	1	Other	Other
+9b362e9b-7672-4504-8b50-b5d2c8e10466	1	\N	Other
+9b364461-4998-4553-903e-75f2a1aa37c2	1	\N	Other
+9b367614-139f-43e2-a393-200b70379aa6	1	Other	Other
+9b36a909-ee75-4fbe-8abe-63abc7c7ea56	1	Other	Other
+9b36b85b-20a9-4c75-a51a-cae1ea16a625	1	Other	Other
+9b36fa5f-0d2b-48cc-b468-6f61c698750a	1	Other	Other
+9b37364b-3f30-40b8-b392-fc1d093eaab4	1	Other	Other
+9b375ba0-e024-45cd-8ee4-71fa75f7a8ce	1	Other	Other
+9b376cc1-c6f2-41ca-9513-5f2ccc382bae	1	Other	Other
+9b37e3a6-7804-478a-ba71-410a297358d2	1	Other	Other
+9b382c89-da8b-4ca7-9550-322ccb40c345	1	Other	Other
+9b38872b-feae-4b85-a157-a52a6bc8c000	1	Other	Other
+9b3889bb-6021-465d-b481-6ef352f13057	1	Other	Other
+9b3894b4-4d4c-4a31-809d-a0da8756a888	1	Other	Other
+9b38b797-a77d-4dc7-8d9b-1a3ee3ea9554	1	Other	Other
+9b38bdc0-3b65-4f18-adee-df516fd0c0b0	1	Other	Other
+9b38ee21-c916-4577-83d3-520af754f850	1	Other	Other
+9b391716-7672-42b1-9643-652af4bb9edb	1	Other	Other
+9b39494a-a82b-4023-9f4c-46ad80dbcb64	1	Other	Other
+9b39761b-b6ed-4268-bb86-bb2f00ef3b8b	1	Other	Other
+9b398de0-18aa-4699-b417-bd586cabb81c	1	\N	Other
+9b3a5b15-b0e8-4fce-bcf4-a75d67747c99	1	Other	Other
+9b3abad4-2116-4fe2-b73a-7210d76adb8a	1	\N	Other
+9b3b758d-0a6d-469d-8486-d2182cce0190	1	Other	Other
+9b3b8c0d-a369-4ce5-81c1-84c1ca9c9079	1	Other	Other
+9b3b9ae8-74a5-41d2-b31a-b684998fed6b	1	Other	Other
+9b3bc291-ca41-4cc7-a4a6-832bb5d2537b	1	Other	Other
+9b3bcff9-0068-4343-807a-c7248c434b1f	1	Other	Other
+9b3d1839-ea32-4908-a9a7-9bd7a9a12b09	1	Other	Other
+9b3d6add-aa79-41b9-b876-c2093aa58b78	1	Other	Other
+9b3d7807-0849-49cb-b280-31be7a659964	1	Other	Other
+9b3d7851-5769-4ca6-addf-87388e15d697	1	Other	Other
+9b3d81f3-c05c-4f9b-9a95-cb8331b8a6c2	1	Other	Other
+9b3dbd5d-0af6-4755-adb1-d5746c376442	1	Other	Other
+9b3ddd9a-0db0-43de-b7cb-7b2db84a97c4	1	Other	Other
+9b3ddeef-552b-4c07-9cc4-8854570106e0	1	Other	Other
+9b3dea84-3fc4-4a7a-be32-efda1dc19262	1	\N	Other
+9b3ea83f-355d-40bd-aa74-81468c830147	1	Other	Other
+9b3ef071-fe97-4c88-a499-63799803d746	1	Other	Other
+9b3f13a2-6b9c-40da-bd2c-490d115fc253	1	Other	Other
+9b3f45c0-9860-4d9b-a09b-cfebe6f92189	1	Other	Other
+9b3f6c7f-62ee-4f49-93aa-fda3687995ec	1	\N	Other
+9b3f904e-7d34-4ca7-8df3-8bee4956d9d1	1	Other	Other
+9b3f9dcd-2cbd-4900-bf79-b2e5ec159778	1	Other	Other
+9b3fd749-0132-42ba-9001-26d381defe72	1	Other	Other
+9b3fd940-8903-4a7d-a445-012f03b46e08	1	Other	Other
+9b404f9a-dc7b-44d7-8702-6b92f2762467	1	Other	Other
+9b4051c6-32ae-4db0-b560-092c884453f7	1	Other	Other
+9b40b025-205d-4248-9cb7-1021af41417a	1	Other	Other
+9b411b30-59d4-4ec0-a192-ac01f0dbedeb	1	Other	Other
+9b415c13-1f54-439f-bbff-da5fdb9917cf	1	Other	Other
+9b415d04-642c-481d-be66-bb6e96f88806	1	Other	Other
+9b4162bf-687f-4e6b-8429-a759456879c7	1	Other	Other
+9b4172cd-8696-4ada-84a8-8be7d72108b3	1	\N	Other
+9b41a98e-5c38-47ee-8298-559d1f3eb981	1	Other	Other
+9b42289c-26f1-4495-946e-9b8c99413deb	1	Other	Other
+9b423357-8257-484f-89ac-27e49dd3ce77	1	Other	Other
+9b424644-8b54-4646-b152-17cc77a27f64	1	Other	Other
+9b428bb6-16bd-422f-b2cd-e57074b825ce	1	Other	Other
+9b42a787-b0c7-4242-9b0b-f7686ff3734d	1	Other	Other
+9b42b02c-e2bc-4efc-95d5-de2dd605921a	1	Other	Other
+9b42e38a-6978-4b88-9475-21becd70951b	1	Other	Other
+9b4308eb-7f27-4795-acd4-791cd8f60df9	1	Other	Other
+9b432a9e-e3eb-4554-a5f0-7bfc27589693	1	Other	Other
+9b436682-49e1-11e8-866d-fa163e8624cc	1	\N	Other
+9b43c99f-20a8-4600-8203-87492525de12	1	Other	Other
+9b4448ab-c185-41c6-8c4c-4fc580a4a77c	1	James	Other
+9b446fa3-325f-4beb-87dd-b83c059035c8	1	Other	Other
+9b44700b-a1a0-457c-b73d-89d0a706e2ed	1	Other	Other
+9b447383-d8fa-43a5-a6ac-8468804a1f63	1	\N	Other
+9b450d33-a2a0-438b-9367-5b93bda3309a	1	Other	Other
+9b451f5a-ed0e-42b3-9934-42604edc356e	1	Other	Other
+9b45c7f8-f129-11e7-bbed-fa163e8624cc	1	Other	Other
+9b463bc3-31f4-4090-aec1-446571c9839d	1	Other	Other
+9b466de2-aee0-4272-ad8e-3d3a20028f5b	1	Other	Other
+9b468904-0a51-11e8-9e33-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+9b46df20-b252-41bf-96d2-ddaa6ecc93bc	1	Other	Other
+9b46ea2f-968e-4d46-a3e1-e367abf264fd	1	Other	Other
+9b46f30c-7762-4cd9-82b7-09e9b2fb43f1	1	Other	Other
+9b471578-8a71-42ff-849e-1b75163dc691	1	Other	Other
+9b471f19-7eeb-48f5-af9d-6435f70a1597	1	Other	Other
+9b473095-3e00-464b-8dfc-006423a58c2c	1	Other	Other
+9b47573e-4dcb-439f-8f61-0be3e36eb4a2	1	Other	Other
+9b47624a-5561-41bb-8b3c-20b93bde648d	1	Other	Other
+9b476d33-60d2-44d9-b678-477b777c5cf1	1	Other	Other
+9b4788c1-39ec-43b0-8334-6a985b711a31	1	Other	Other
+9b47c521-71a2-4aaa-a7e4-9bc4adb9c373	1	Other	Other
+9b4816ae-05e6-4cdc-881e-31bf5c30e654	1	Other	Other
+9b48230b-3115-47fe-a6d7-e709dfc8efd1	1	Other	Other
+9b4878d7-e13f-4965-ac58-f67512417a5d	1	Other	Other
+9b48a863-210c-4364-ac11-8c6f6919b747	1	Other	Other
+9b48daef-52b9-4035-b925-510939ecb2ab	1	Other	Other
+9b49159d-5ac0-4909-b204-4d0d198a4db2	1	Other	Other
+9b494507-d341-43f7-a250-85cf6a8d1e5d	1	James	Other
+9b495666-e755-4f9b-af71-058f5cff6a37	1	Other	Other
+9b4974f5-ab17-4a86-92d9-00393f4faa55	1	Other	Other
+9b499bd5-7ad8-4cb5-8e1b-eb0d20dd9a16	1	Other	Other
+9b49a9f6-3483-4a61-813f-14bb99096605	1	Other	Other
+9b49db76-dc45-4112-bd1c-2088db9729b3	1	Other	Other
+9b4a9d71-e2b4-4055-a9b8-5d64d21000c3	1	Other	Other
+9b4b2f98-5069-4e1d-a9fa-3435f0d6d49b	1	Other	Other
+9b4b4589-ae37-448a-96ba-75d8c8807d30	1	Other	Other
+9b4b5be2-199e-486c-a3e6-959c41cf657b	1	Other	Other
+9b4bc3ad-71e1-49e0-a39c-6553cba4fc87	1	Other	Other
+9b4bc60a-eabe-4b79-b8db-142b884bd9cc	1	Other	Other
+9b4bff40-49e1-11e8-a3bd-fa163e8624cc	1	\N	Other
+9b4c2bf4-798e-476f-b660-57d2313883f3	1	Other	Other
+9b4c35d9-0c97-47eb-9be4-9db45f6046d9	1	Other	Other
+9b4c4502-9d20-4376-b6fe-076bdfd23b2f	1	Other	Other
+9b4c6386-5d1a-47f7-825b-affc4dfd7e7a	1	Other	Other
+9b4c734b-9f98-4621-8af5-c6a936d57a60	1	Other	Other
+9b4cc709-7441-4f61-a26c-32ced503e9a6	1	Other	Other
+9b4d6a09-4ffd-4a2e-983a-88bf5b9e13f9	1	Other	Other
+9b4dd8b6-f3f1-4d58-ba67-d12c9a9f50df	1	Other	Other
+9b4e1ca9-3b4f-4687-bbc1-7bbcdab6f55b	1	Other	Other
+9b4e26f2-5c6e-44ef-b16b-42c2dac015a9	1	Other	Other
+9b4e4449-6479-4aad-90d1-2fd0ca89a816	1	Other	Other
+9b4e4ec0-4f70-4979-b449-c5a1686277d2	1	Other	Other
+9b4e5f9d-4eab-46a7-bb80-74ad6506e889	1	Other	Other
+9b4e75fc-570a-4b4a-8daf-ff319c2c9fd1	1	Other	Other
+9b4e8694-2f0b-476b-8576-0556c4a847d1	1	Other	Other
+9b4ea04f-a449-49f8-88f7-816bf2ea4945	1	Other	Other
+9b4eebc7-0e19-4359-8478-46eafe94f602	1	Other	Other
+9b4f0a83-e4af-440f-b381-b6b6d33179f3	1	Other	Other
+9b4f1467-5822-4b90-96ad-c15076cd8d17	1	Other	Other
+9b4f3ca9-818e-493e-868a-3be5c0d3cfcd	1	Other	Other
+9b4f63d9-9226-4354-9489-dcd7fd08ddf2	1	Other	Other
+9b4f6865-b24e-4b83-b972-bed21178a098	1	Other	Other
+9b4f9caf-a8c4-420f-86e8-e443ae53a209	1	Other	Other
+9b4fbc04-f22d-4613-aeb7-5ee8b0b6bef0	1	Other	Other
+9b4ffa52-9871-430b-92f4-6d6a11f6f192	1	Other	Other
+9b5018d9-1fbb-488a-9b7a-d24e0cfe0ee0	1	Other	Other
+9b502464-91a6-410f-b824-ce620464bc86	1	James	Other
+9b502651-825d-44d2-8074-9e833a7edda6	1	Other	Other
+9b503d4b-cc9d-4b99-8d9b-a4ac217ba3de	1	Other	Other
+9b50762c-d462-4583-bf04-e1b4975bd13e	1	Other	Other
+9b509771-1981-4765-9426-9dded06f9f30	1	Other	Other
+9b50a6cc-e813-417f-9a55-0530fb700003	1	Other	Other
+9b50f8f2-6734-4ead-bd32-fdaa891391cf	1	Other	Other
+9b510824-e134-49e6-ba61-a95403ac234c	1	Other	Other
+9b5140d8-ecd7-4334-91fa-eec0e4be1798	1	Other	Other
+9b5144e7-80be-4a62-98ee-5f5e5bc42277	1	Other	Other
+9b51537f-7082-4757-a901-402d3f7c4513	1	James	Other
+9b5167cf-d21c-43ee-8f5c-6dd7d6024e5d	1	Other	Other
+9b516eaf-3cdb-4b9f-be62-75beeb7becf4	1	Other	Other
+9b51f1e7-ba53-4d88-8064-ae4736f96c4f	1	Other	Other
+9b51fc88-7915-4089-9f76-fb70964b7667	1	\N	Other
+9b52ecb1-1a27-4337-9a5b-140500933267	1	Other	Other
+9b52f2a4-a43c-46bd-85ff-08cd749dbb63	1	Other	Other
+9b5335aa-92b0-48b0-a948-c1e702681f51	1	Other	Other
+9b536a90-59aa-45e7-89e0-e6eec7ed8092	1	Other	Other
+9b538974-ef2f-481b-9767-93bb6dd1490a	1	Other	Other
+9b538ab8-7c6e-48aa-aa70-66502ef0f12f	1	Other	Other
+9b53bc3d-9778-45e5-a2db-41fd73624aa0	1	Other	Other
+9b53bf48-10ee-4377-bee0-c57c26d136ca	1	Other	Other
+9b53d944-5213-424a-b8ca-223d79bdc549	1	Other	Other
+9b542c1d-28fa-4c44-bc67-7d75264c4710	1	Other	Other
+9b54321a-c1be-4169-aee4-a3b3fcd83794	1	Other	Other
+9b543538-4dbb-4f21-b060-71bb8c680066	1	Other	Other
+9b5439c0-201a-47da-ac09-74e8345e2397	1	Other	Other
+9b544d6c-b3fa-496f-a0e1-0c13ea40079d	1	Other	Other
+9b54654e-0be9-11e8-8be6-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9b54876c-6526-444e-8bfa-c5b8dda7a7cb	1	Other	Other
+9b54c822-5392-4936-969b-c88d12aeb1df	1	Other	Other
+9b54e3d2-9abf-44a1-813e-8b3059dc069d	1	Other	Other
+9b5527a7-583c-4278-aae6-a6c1b2d979f0	1	Other	Other
+9b55d8e0-8554-4ac8-a1dc-9e49b76c373b	1	Other	Other
+9b55ed5d-5d88-4376-b403-5421140b6211	1	Other	Other
+9b562ff2-99ea-40e5-818d-3a592086b1ae	1	Other	Other
+9b567fa8-67b3-4edf-bffb-c2407b85dce6	1	Other	Other
+9b56c3fc-9afd-4efa-a021-453014948a9f	1	Other	Other
+9b56e424-0c5b-4967-aa6b-641e0a28cca8	1	Other	Other
+9b56f033-fd72-4e66-9f80-cb48af6fcbcb	1	Other	Other
+9b570bdb-d5ed-4b3f-961f-80100a9019e4	1	Other	Other
+9b570ce8-5a6a-44a2-a3a9-0114ae3a06c6	1	Other	Other
+9b57576e-60fd-45f2-a173-39b32b69eec5	1	Other	Other
+9b577d43-a5a9-46a9-978a-a1c4c23e2eb1	1	Other	Other
+9b587c18-3e0a-4d89-83fb-5f31e110e6d6	1	Other	Other
+9b587f5f-c4d7-4d9a-9b3f-6a2f9c9ae775	1	\N	Other
+9b58894c-0846-4bdd-89a2-c335614e863d	1	Other	Other
+9b58fa82-79a2-4dbd-8b35-9ce41d18bab1	1	Other	Other
+9b590af6-3630-4efc-b199-78dc92a2bc0a	1	Other	Other
+9b591803-83a6-4995-b85b-f5ea12bbcae9	1	Other	Other
+9b593eb0-e085-4b33-8605-4ea71788b25e	1	\N	Other
+9b596d7e-917e-4367-bd66-17c052d24e65	1	Other	Other
+9b597e9c-dff1-4c67-88b8-888bb7411345	1	Other	Other
+9b59c2a7-d33d-4642-90fe-d06289d62cc4	1	Other	Other
+9b5a0d06-93d3-43e0-a386-73e415092b42	1	Other	Other
+9b5af6ac-1bc7-41b5-b6cb-f50185c50bfd	1	Other	Other
+9b5af716-a604-4fd5-8904-900536249d30	1	Other	Other
+9b5afcdb-872d-460e-ad65-49646e94600d	1	Other	Other
+9b5b0d64-bdf6-44d9-a33b-4dc73175d517	1	Other	Other
+9b5b21e2-e5cb-4461-b84b-468935224931	1	Other	Other
+9b5bf262-1530-40cc-a972-632627f6c4d5	1	Other	Other
+9b5c5ac5-5961-4d64-b8b9-e19a07840a32	1	Other	Other
+9b5c7a73-dd37-4867-b83a-e22d852574bb	1	Other	Other
+9b5c9104-e69f-43f4-8335-59acf95d220d	1	Other	Other
+9b5cabc8-0cca-42ab-ac97-186ba8bdba8a	1	Other	Other
+9b5ced33-66af-4053-9dd4-c524d2294a73	1	Other	Other
+9b5d2391-89ff-4008-be49-57a021f0dcf5	1	Other	Other
+9b5d8420-6fa6-4252-9cb8-4ac433e1c3bb	1	Other	Other
+9b5db12e-4ab5-4c46-8841-5f70cdc53eb1	1	Other	Other
+9b5dfffd-4094-46c4-8895-1b2fb2cd570d	1	Other	Other
+9b5e124e-0c71-41d5-acfc-fa5a7b620ab3	1	Other	Other
+9b5e50f3-cdb9-488f-8bc6-c76f426653ed	1	Other	Other
+9b5e5f46-a2cf-4d54-b44d-6ea2b66fec46	1	Other	Other
+9b5e640a-a79b-4945-aa9a-d6ddbadd9510	1	\N	Other
+9b5eb26f-8ca3-4cd2-ab34-ecbbad7ad00f	1	Other	Other
+9b5ebb55-50f3-471b-a613-671cf1eccf1c	1	Other	Other
+9b5ed5f7-a3e1-4cc0-ba47-115b393e8606	1	Other	Other
+9b5ef338-dae0-4575-909f-113da0d2a8ab	1	Other	Other
+9b5f207a-c8cb-4b38-b4c5-d80929fbe97b	1	Other	Other
+9b5f262f-de1a-4dbc-b2cf-60b73a97ea23	1	Other	Other
+9b5f3f92-a4d0-4e14-8320-1067062bf623	1	Other	Other
+9b5f63a1-8d59-4dee-bffc-24e2e202d74b	1	\N	Other
+9b5fcc63-564b-4e2b-a91f-9de0fd4cc01e	1	Other	Other
+9b5fd775-8e59-4069-a64f-693448172965	1	Other	Other
+9b5fec49-abcb-4de7-b85d-787a5ddccf1e	1	Other	Other
+9b5fee9d-e37b-49b3-9664-ded82411dcc5	1	Other	Other
+9b603f8f-f5ad-493b-a7fc-41312b899c4c	1	Other	Other
+9b607728-4098-4075-abf1-80c9f6d5665a	1	Other	Other
+9b60b859-47f0-4e98-ae57-be0203644a29	1	Other	Other
+9b60ef86-6209-4c17-bbdb-cfac4be0a857	1	Other	Other
+9b60f688-bd09-4e26-b50c-a8e7dad486ee	1	Other	Other
+9b611078-b841-49cb-9286-fa317daa391e	1	Other	Other
+9b6125d1-6bbd-455a-8a55-8def8463898b	1	Other	Other
+9b61715f-fe44-44ea-a147-6e1db0898927	1	Other	Other
+9b619a67-509d-484e-94d5-db694725f6b2	1	Other	Other
+9b61a3c5-1c8a-48e1-8d72-c027567ccb9b	1	Other	Other
+9b61c97a-4a09-4bf0-9c0d-e447f34ea36b	1	Other	Other
+9b61d2e4-172c-4ab6-afa5-740c6e76de46	1	Other	Other
+9b6269e8-900a-4f2f-923d-65dffcb68ab4	1	Other	Other
+9b628530-6455-4d09-8311-5c02a1c6f14e	1	Other	Other
+9b628ce5-242e-49cf-bd33-d8185b37dcdd	1	Other	Other
+9b6300c7-5b6c-4dcc-9e88-8224063b64ba	1	Other	Other
+9b630f8e-6269-42d9-beed-cacc1526d5af	1	Other	Other
+9b63229e-5d10-4ce1-8d5b-db33830002ac	1	James	Other
+9b63266f-e477-4783-8325-20eb9d01fa3b	1	Other	Other
+9b632f50-4831-46e8-ac18-0a5d839b484c	1	Other	Other
+9b639993-1b10-40a4-85e3-5b209a5b85fc	1	Other	Other
+9b643e9d-7a73-4d5c-b3aa-3d71d1296d3f	1	Other	Other
+9b6450c5-5fe9-4c75-9d84-4ff7621fb162	1	Other	Other
+9b64978a-70b7-4948-8d9a-9de3b289587f	1	Other	Other
+9b64b284-70e7-457f-8500-d6cd2926ed4d	1	Other	Other
+9b65328f-e99e-40de-b101-6954ce7a2058	1	Other	Other
+9b6537ff-4a24-4a4e-bbb3-18552fac1528	1	Other	Other
+9b6583fd-c50a-4bc1-8ba6-1a089e20969c	1	Other	Other
+9b65add9-5e2b-49f7-9b97-05592ec758a7	1	Other	Other
+9b65c861-89bf-48d4-8d20-4488296ad32b	1	Other	Other
+9b65f3e7-4f65-4612-90bf-fd3cd0bb8c9e	1	Other	Other
+9b65ffa7-8777-4313-882e-92de9c60736f	1	Other	Other
+9b662f21-dbcc-40d7-8f19-89fe42c311a2	1	Other	Other
+9b66332f-f860-45a3-a8f0-d460670f29d1	1	Other	Other
+9b66618a-3326-4954-b24f-aa6aea9e4197	1	Other	Other
+9b6662e5-826b-426c-9b51-f8cae280c9a8	1	Other	Other
+9b6680cf-d8a0-4585-a3f4-ca9ea2584f0c	1	Other	Other
+9b66bdec-3a4d-4e0e-af37-0566e9b096ec	1	Other	Other
+9b66e458-f595-4c76-825e-0248b7018c3a	1	Other	Other
+9b675f33-3840-400a-805b-b9128ae808ca	1	Other	Other
+9b675fc9-5385-40f9-95bf-57ec110ac2f0	1	Other	Other
+9b676108-3ee5-4d18-809f-7293729959cc	1	Other	Other
+9b6781b3-0d6b-4d22-b1b9-53f57e7ee5fe	1	Other	Other
+9b67900d-bd6f-4d8d-a33e-7e6488818af5	1	Other	Other
+9b67a3e6-a9e0-4fa0-8008-51e9b718d505	1	Other	Other
+9b67c62b-c63d-4f81-b44f-430fb2e24e5f	1	Other	Other
+9b684900-cff3-4869-8ff2-90cd8e9d3727	1	Other	Other
+9b687d1b-baf7-4306-b5c3-ca2aaee1df25	1	Other	Other
+9b6880b8-000d-4680-8116-fb3e32eb1997	1	Other	Other
+9b690435-964a-4c4e-a16e-f2fefb61c17c	1	Other	Other
+9b691e5c-dd99-40bd-89de-cf13393ef977	1	Other	Other
+9b694636-8225-4d18-a3c3-16442a5d2629	1	Other	Other
+9b695466-9881-4c78-9a87-49e109bcbc6e	1	Other	Other
+9b697ce7-7124-44aa-bd22-d9255c01eda0	1	James	Other
+9b697f63-3b6d-4948-a850-41c42bc8be8c	1	Other	Other
+9b698489-77f2-44b5-bf14-302c7b04ae9b	1	Other	Other
+9b69afaa-95f9-4906-a69d-7ba0d0e6c580	1	Other	Other
+9b69b161-7a10-4d97-9437-8704f855a7e1	1	Other	Other
+9b69cafb-3493-4dfe-ba52-b44a62abc32a	1	Other	Other
+9b69ea46-e81b-4a7c-b707-fa8e4570b10b	1	Other	Other
+9b69fad8-108a-4c44-9fac-ea95bd14bae7	1	Other	Other
+9b6a0628-b506-43cf-996a-7546d90bfa91	1	Other	Other
+9b6a2450-9155-4165-9766-9c96107e77bc	1	Other	Other
+9b6a4fab-65fe-45a5-b8fc-c9c98cf0d4ab	1	Other	Other
+9b6a6656-40a6-4d41-b8d5-18d333d43a57	1	Other	Other
+9b6a6ace-cb93-4c92-a116-a3a051e7c653	1	Other	Other
+9b6ae563-fbb7-41a9-a984-d6a49a8f59af	1	Other	Other
+9b6b59da-49e1-11e8-b95d-fa163e8624cc	1	\N	Other
+9b6b77d4-f95e-4b3c-b65a-cf7e0773d4bc	1	Other	Other
+9b6b7f11-f9df-4715-8ed0-7baa4d8a8fc7	1	Other	Other
+9b6bffb2-efa0-41f9-ade9-c0fe4fc70eec	1	Other	Other
+9b6c1364-3e64-4038-869f-fae44d28ef3f	1	Other	Other
+9b6c20ef-7d69-40d8-a175-f3297e52f971	1	Other	Other
+9b6c2c32-de59-4164-9486-abea766a5a93	1	Other	Other
+9b6c73ab-46b7-41fe-b85f-4e57a91aaf47	1	Other	Other
+9b6c7516-dfa6-427e-ad2a-bb9034c04f48	1	Other	Other
+9b6c86b3-5474-4370-a42e-de04475def20	1	Other	Other
+9b6cc1cb-197d-4e3b-869f-7627962479a9	1	Other	Other
+9b6cfc82-f4be-4aa9-95c7-70abb690a497	1	Other	Other
+9b6daa85-14ef-4a4c-8b1e-7584fbf7f3a7	1	Other	Other
+9b6dab1f-00d9-4971-8241-ec96e39c8739	1	Other	Other
+9b6dd222-a6e8-4d6b-840b-59e598a28a92	1	Other	Other
+9b6dfb1f-4a94-4b84-93d9-b4a3f41a1cd5	1	Other	Other
+9b6e05af-01f9-489d-88ba-2853948afe20	1	Other	Other
+9b6e2fb2-09b4-4ec6-ad4e-cdc509dd070b	1	Other	Other
+9b6e378a-5985-40c7-8b59-d58106d1c6ae	1	Other	Other
+9b6eab36-ce8b-4bc1-bf0c-9b68d1eea29c	1	Other	Other
+9b6ef7fb-570b-4355-a2cd-39e8ec977570	1	Other	Other
+9b70bf43-2232-4c56-852b-3dfafc48dc7c	1	Other	Other
+9b70da04-cef0-438d-a454-5724e1fd738c	1	Other	Other
+9b70f159-d861-456c-b7d8-ae3f463a35cc	1	Other	Other
+9b713304-3cf8-40f3-8ad1-cf6297d8f6d3	1	Other	Other
+9b713e5a-72a1-46c0-95f5-25af737f46eb	1	Other	Other
+9b7142e1-04ae-4e89-a556-81e8a62f3583	1	Other	Other
+9b71dafa-b5f0-433f-8404-1a05b82f85c1	1	Other	Other
+9b720e42-6ebc-43ca-a828-e4c2476a45a0	1	Other	Other
+9b727437-4305-43d9-b1f5-1f401753a0ae	1	Other	Other
+9b72b04c-5dee-4b35-841f-390564743dc9	1	Other	Other
+9b72d406-2d04-4a8e-8b33-02b5c74ef061	1	Other	Other
+9b72d98f-71b0-4abc-9ab9-dea74aa6f36d	1	Other	Other
+9b733d9b-3068-4a5e-b71a-6745ff41cd07	1	\N	Other
+9b735ae0-b46c-420a-8902-9ae2393819ef	1	Other	Other
+9b73608a-3769-4169-8534-81651b45ae11	1	Other	Other
+9b73a0d1-2648-4470-8bc0-9e2f3412df2c	1	Other	Other
+9b73a1e1-f50d-4aea-a715-4f339d10e9b2	1	Other	Other
+9b73be43-a8ad-4b6a-aaa3-c62190d455da	1	James	Other
+9b73f0e5-01eb-486f-970e-00c33ef12ffe	1	Other	Other
+9b7412e9-e3ab-4125-961c-4b16883ef51c	1	Other	Other
+9b74359a-f65e-48b0-950b-44ce5304279e	1	Other	Other
+9b746733-018a-41bb-b8eb-4674b7b2780e	1	Other	Other
+9b746e0a-9198-4ffc-8a6f-7ab1acab3bb7	1	Other	Other
+9b74b3f9-9d79-4eaf-85b3-c535a53b569b	1	Other	Other
+9b74c5b5-25e6-4ee8-8215-7223491a4617	1	Other	Other
+9b754862-df59-434c-9ae0-59cd73536054	1	Other	Other
+9b75e9e2-28e7-47e2-9bf6-7d72f3c1148a	1	Other	Other
+9b760d35-2a9d-4fd6-a60b-565ecc08ad00	1	Other	Other
+9b762a5a-bee1-4027-b158-d4d929aa8c24	1	Other	Other
+9b763108-8ffa-4896-b4d6-ce29b3ca3270	1	Other	Other
+9b7646d0-0c37-4210-a7af-cab50934112d	1	Other	Other
+9b7688ef-a52e-4a64-898c-55b7c724e08d	1	Other	Other
+9b7690c6-1be5-4796-a996-8603915f1ab4	1	Other	Other
+9b777118-0848-4f2d-93f6-450d4497db39	1	Other	Other
+9b777b5f-0803-44c8-ae03-3d24092ef6ab	1	Other	Other
+9b77800f-225b-482f-b9fd-be00b83fbd22	1	Other	Other
+9b77d160-a9e4-4a25-bcd8-6cfe940b3b88	1	Other	Other
+9b7826c4-49e1-11e8-86ca-fa163e8624cc	1	\N	Other
+9b782a0d-a2ed-452a-9ccf-59ef77dc4ef3	1	Other	Other
+9b785573-663e-4eb1-83dc-ccac5e0122a9	1	\N	Other
+9b78d1e9-0b09-4bbc-87cd-e359ecd5ecab	1	\N	Other
+9b78da14-2cb5-4d8d-b2a3-4e62a33d1d9a	1	Other	Other
+9b7919da-e455-42d1-a8f8-d36ee9336b81	1	Other	Other
+9b791b84-9b75-4c3d-9ef0-f85fba44b5d2	1	Other	Other
+9b7923de-bf77-465e-af96-ddc9e3265620	1	\N	Other
+9b79252c-eaa2-43ad-ad7e-8a86583eb95f	1	Other	Other
+9b7940ec-7f59-4cd7-a15f-a1eb27b31a83	1	Other	Other
+9b797a41-af7e-4e75-b26b-52bf1db523f6	1	Other	Other
+9b799ea8-0525-4783-bce6-97e9c808e670	1	Other	Other
+9b79dc86-87c1-4932-8527-4453095b2299	1	Other	Other
+9b79e2e9-c122-4f2a-b032-3d20471fe3f4	1	Other	Other
+9b79e890-6fce-45fc-bce8-5c28a75ec389	1	Other	Other
+9b7a05bd-bffd-4e03-903d-491f0d157977	1	Other	Other
+9b7a2b18-e13a-4e51-8dba-8e3cb3a6587a	1	Other	Other
+9b7a40bc-02a1-4571-bfc6-5ace57745c91	1	Other	Other
+9b7a62ff-f4cc-451e-a512-1774dfeabfb0	1	Other	Other
+9b7ac0e0-7787-4b1f-85b9-0a6d6fe629b2	1	Other	Other
+9b7ac4ab-cefa-4179-990d-b5c8cf2d948f	1	Other	Other
+9b7b1642-7036-4044-b815-99282599f579	1	\N	Other
+9b7be7a1-bb6d-411c-9419-402014bcd3c8	1	Other	Other
+9b7bf0fc-9b02-47d4-91ec-9f2747345beb	1	Other	Other
+9b7c343e-7f31-4d50-8688-bd1722852d05	1	Other	Other
+9b7c9379-5632-47fa-920c-b7769c3ca030	1	Other	Other
+9b7cdd22-117a-4f12-985f-0dc9e8a70e2c	1	Other	Other
+9b7d2153-1015-4eb1-a46a-33de5bde08db	1	Other	Other
+9b7d8322-1662-4f4b-8d63-f383ed37687c	1	Other	Other
+9b7daf7a-c15d-4443-9c56-94f85e6832b7	1	Other	Other
+9b7dc690-52b5-4a44-9ba8-b8d2086cf988	1	\N	Other
+9b7e652d-cb1d-42cc-8f6b-41f7e03d430e	1	Other	Other
+9b7e7116-b00c-42bd-bc23-4650a1f37289	1	Other	Other
+9b7e8c9e-1f60-4855-8ba8-ab1be39c454e	1	Other	Other
+9b7eabef-7ef3-4add-a132-5df0731d0d8b	1	Other	Other
+9b7eb8da-cee7-4ef3-8aad-ccd128d9f173	1	Other	Other
+9b7f00e4-7b1b-47b3-a4af-cf19cd66c36f	1	Other	Other
+9b7f0aca-b668-4e7b-b8b5-206272ceccb1	1	Other	Other
+9b7f1523-58a8-422c-9f94-cbbc02767e46	1	Other	Other
+9b7f5986-3363-4c52-a3a1-99cb7a57d5ac	1	Other	Other
+9b7fed72-c1f4-4dab-a28e-f0fcc61f0162	1	Other	Other
+9b8031a9-41b8-443c-8b32-3e819dfbe6a8	1	Other	Other
+9b804471-0c17-464d-bf6f-5e271bb35c30	1	Other	Other
+9b80ff39-e60b-4074-9b91-7ba6a852ed39	1	Other	Other
+9b814799-8280-47ed-b5bd-56a5280d5d63	1	Other	Other
+9b8164d1-f06f-4505-a816-c7f7e9ea8280	1	Other	Other
+9b81c2c7-9a5f-4eec-a132-911d1095f89c	1	Other	Other
+9b81cbee-ef88-405e-ad53-1f4d3c99d797	1	Other	Other
+9b82405a-70e8-4bc0-b4da-fb408adba51b	1	Other	Other
+9b82666c-7473-4b20-b810-4cfc3117552b	1	Other	Other
+9b826787-e710-4663-9a0e-7120cc92a7c5	1	\N	Other
+9b82913a-685a-4cff-88c3-6bc89559789f	1	Other	Other
+9b82a1b7-6d96-4052-a744-4f0109fbaa31	1	Other	Other
+9b82b44d-5cc3-476f-9c4f-75b86984dfbc	1	Other	Other
+9b82c657-daba-4484-9821-2488da61c1f0	1	Other	Other
+9b82eab3-0db0-40f0-9ed9-a54a05b527ce	1	Other	Other
+9b830aa8-5683-4b90-a8ab-dfa60132ac00	1	Other	Other
+9b8368db-f034-4f98-b153-162dac1afe4c	1	Other	Other
+9b838ba5-454d-484f-9ccd-bdf57a3bd5f8	1	Other	Other
+9b838c3d-e0c9-486d-aaeb-9b8bca6ae4ae	1	Other	Other
+9b838c59-3910-42f3-880e-a92b26463a37	1	Other	Other
+9b83adb9-1a6f-4e95-bcde-b62ccea69a61	1	Other	Other
+9b83d6fd-406b-410b-9bd7-7d7af27b167d	1	Other	Other
+9b83da13-5ff6-4dea-b1fb-552e0363372a	1	Other	Other
+9b83e576-848a-4f2d-b7bf-2c6a412350e2	1	Other	Other
+9b83e7f5-ec6c-4d27-8478-783e7cc13066	1	Other	Other
+9b84650a-e82f-479f-b799-eb642cf31d4a	1	Other	Other
+9b8489fc-5828-4c61-a3de-a8d402e190bf	1	Other	Other
+9b84d7c4-2f8a-46d4-bdaf-745d5a2cb1b6	1	Other	Other
+9b84ee8b-2819-409d-8fa1-b96f818d428c	1	Other	Other
+9b84f81b-d8fd-4fb7-a9d9-2d90a59b44c4	1	Other	Other
+9b8525de-829b-4e9e-bb14-7f4cb7372258	1	Other	Other
+9b854529-86c0-4161-9ce4-6bcf2fec742c	1	Other	Other
+9b855538-d134-4e05-b8c1-7cb8cf08715a	1	James	Other
+9b856fc2-b03d-4dca-a870-d060e8392061	1	Other	Other
+9b85a508-ff59-48e4-8c44-daf712a95f3d	1	\N	Other
+9b85dc62-1b25-4a78-a51a-cf8f73d0744f	1	Other	Other
+9b85feca-7618-4cf3-91ee-2cd224638800	1	Other	Other
+9b86168d-62ac-46c8-b216-651ba2debfcc	1	Other	Other
+9b861cc4-9330-4e42-82b9-be81da08ee49	1	Other	Other
+9b86877e-8dbf-4c06-a21f-a25f57bbce40	1	Other	Other
+9b86ac67-25d2-43f1-a4ce-4b0885601572	1	Other	Other
+9b86d42f-dd82-4f9d-9f15-c94b7a2eca7b	1	Other	Other
+9b86d7dd-734f-4714-aa52-7c0efbbe14fb	1	Other	Other
+9b8704bc-8b7f-45f8-a89c-64c95000a77e	1	Other	Other
+9b870b99-d7d2-473e-b62f-0f952e545782	1	Other	Other
+9b871327-7221-4cff-8339-8427299c6c71	1	Other	Other
+9b8736f5-3aba-4273-aa42-a237e7f7422d	1	Other	Other
+9b8762d7-55c4-4dbc-b3ef-70790062d26f	1	Other	Other
+9b87c5ef-f957-42ae-80cc-7721ff638c27	1	\N	Other
+9b87ce19-060d-488e-949a-da5a02bf794b	1	Other	Other
+9b87dce8-2ed8-4190-a478-36b249d25277	1	James	Other
+9b886990-e179-4d2a-ab7e-d4f327885baa	1	Other	Other
+9b88729f-b6b1-484f-9374-04b6ac810429	1	Other	Other
+9b88d4c1-eb0e-48d6-80a6-a4e1482ce05a	1	Other	Other
+9b88d828-6149-4c1a-a2e8-4896da9b6771	1	Other	Other
+9b890bd7-9fb1-42c4-a4e6-9fa14b993d36	1	Other	Other
+9b89ce43-acf8-4f3c-af56-9f6911b45cb0	1	Other	Other
+9b89f06b-4754-41c6-95cd-95975f476817	1	Other	Other
+9b8a14cd-afa3-47f4-8f5f-94f8bf38b644	1	Other	Other
+9b8a19e3-647b-410d-b471-24c1f0e60d0e	1	Other	Other
+9b8a6905-ee3e-4e13-bb45-07d1f6799557	1	Other	Other
+9b8a7fe9-b6d2-41ad-806b-9d1714847436	1	Other	Other
+9b8aa144-dfd0-45b9-9d4d-e6fa91583ebd	1	Other	Other
+9b8aa80b-d568-4a40-a396-48b04ab82352	1	Other	Other
+9b8ac1b2-7942-4b64-b98e-f8e9ed7f00cc	1	Other	Other
+9b8accec-1cc4-40be-9227-ce75e6498fb1	1	Other	Other
+9b8b4655-93dd-4429-8956-5558a44ed7f3	1	Other	Other
+9b8b50d0-12d4-4f07-95ed-eea6b79d9b78	1	Other	Other
+9b8b6d70-4714-4a38-af30-f46c0a8881f1	1	Other	Other
+9b8b7373-71b2-4f24-842a-55ff6f73a072	1	Other	Other
+9b8ba8d6-3c51-4af6-9406-231debf3f178	1	Other	Other
+9b8bcfbf-8fd0-4e1d-85d5-a9df7158c434	1	Other	Other
+9b8be39b-9d45-42cd-911a-01e2f019fc62	1	Other	Other
+9b8be436-8605-4e33-bc28-6c01f0d6dc5d	1	Other	Other
+9b8be78f-5553-436a-a323-8b30343243e8	1	Other	Other
+9b8bf438-dd5c-4c59-bf17-ebc3758144b3	1	Other	Other
+9b8c015d-38d7-4093-8d89-07d30886bbe6	1	Other	Other
+9b8c039a-dea7-4f52-a1b4-dec660122e7f	1	Other	Other
+9b8c5330-fb9e-40de-a4bc-1e13bcca4d6c	1	Other	Other
+9b8cac28-fcff-4458-9697-f6f9657f0ca7	1	Other	Other
+9b8cc4a8-fb66-4aec-bab1-e477222107dd	1	Other	Other
+9b8ceb25-f3c1-4796-bf03-d1e244f21498	1	Other	Other
+9b8d4d42-e332-46b9-a684-9de29f1d16c5	1	Other	Other
+9b8d5018-f1f2-4571-bec2-23ad6c643049	1	Other	Other
+9b8da84c-12c0-4f09-86a4-25214a0e0b47	1	Other	Other
+9b8dc30c-5ee9-4d3f-87bb-c98c7be44877	1	Other	Other
+9b8dcd74-b24d-41ea-a907-22f6b57f250b	1	Other	Other
+9b8e5d9e-5707-4562-aedd-4982a556291d	1	Other	Other
+9b8eab2d-414b-440e-af9a-ffd43dc1b787	1	Other	Other
+9b8f2bdb-2629-4cf3-86ad-11a56694484d	1	Other	Other
+9b8f2ee0-5d20-4843-849a-cc271b9781ac	1	Other	Other
+9b8f83a8-16e0-4ee0-bed0-be05d7def522	1	Other	Other
+9b8f8d92-b969-43db-a987-d51cc8721678	1	Other	Other
+9b8fad4d-27b3-4656-be62-c99846fa17bb	1	Other	Other
+9b8fcb42-677a-4fb9-b1ea-32cac3ac465d	1	\N	Other
+9b8fd355-35c0-43b8-b197-13242ba92c36	1	Other	Other
+9b8ff5e2-de7a-4d06-a04c-04d8ce34d876	1	Other	Other
+9b901eaf-f951-4a60-81a7-dd8cba5a61e0	1	Other	Other
+9b9076da-fbd8-47f2-bb0a-2f55b55800a3	1	Other	Other
+9b90df23-f455-46e3-921f-ec2a34cc0671	1	Other	Other
+9b90fb44-bca2-43b7-a8df-dba1c150df3c	1	Other	Other
+9b91188b-ae87-495f-ae02-6deca881f9fe	1	Other	Other
+9b9119d0-a1fb-4a80-87fb-aeb973334253	1	Other	Other
+9b919414-d491-4a53-81e0-d68605241eb0	1	Other	Other
+9b91da04-21eb-4b96-96b2-97f116da5058	1	Other	Other
+9b91e78a-a1ba-4528-a522-353947cad305	1	Other	Other
+9b921fcc-bcb1-45a2-af67-0eed73cf3bde	1	Other	Other
+9b92444b-772d-4218-9de2-16900872cf5a	1	Other	Other
+9b925755-8af5-44e4-83d9-6c09270782ea	1	Other	Other
+9b92ad8d-22be-4fab-b475-cc3ea882810a	1	Other	Other
+9b92d380-37e8-4d3d-a527-9489700a5669	1	Other	Other
+9b936f05-95f7-4df6-899d-78ffbded0193	1	Other	Other
+9b940553-4190-46cf-a7d3-c93062df630f	1	Other	Other
+9b941d80-d49d-4018-97cb-2d3d3cd20fab	1	Other	Other
+9b944794-20cc-49c4-bf34-dc2ba161ffa2	1	Other	Other
+9b945651-44aa-4372-9f2a-cf82da1bacbf	1	Other	Other
+9b94a686-8516-4afa-945c-1cb393a1c1b6	1	Other	Other
+9b9500d4-6943-4cc5-bc47-b2f2c3bfc5e5	1	Other	Other
+9b9527c8-1911-4798-9c92-84b940fa9d45	1	Other	Other
+9b954686-f8ce-4659-82aa-864a9138ea8e	1	Other	Other
+9b955ea1-b895-4d6b-a901-363a7b7b2a3f	1	Other	Other
+9b9571d7-0314-4c15-afe7-8bcc81e7400a	1	James	Other
+9b958fdb-3cc9-481c-b04f-6a2199193acb	1	Other	Other
+9b962b65-9b61-482c-9f8c-9cb4f87b1c52	1	Other	Other
+9b9646dc-6d3b-4fc4-97a0-d9b24f63cc19	1	Other	Other
+9b9648c6-2f89-4fe2-b558-1110621a9f7a	1	Other	Other
+9b96a199-5e95-46ca-b3b9-6622b2fdac7b	1	Other	Other
+9b96c05e-985d-4cc6-8fd2-78044f74ea32	1	Other	Other
+9b96ecee-26fe-4c23-9d94-4f7aeb1a68c6	1	Other	Other
+9b970cbc-8a2f-4435-ace2-0c484b5dec3d	1	Other	Other
+9b974654-f36a-4211-8b41-a568a8c14119	1	Other	Other
+9b977191-0e4b-4cd5-8513-78056fc4cc97	1	Other	Other
+9b97902f-bea6-4aec-9277-9f113acc6cad	1	Other	Other
+9b97be34-a5ec-4950-a282-145df7faa89e	1	Other	Other
+9b97c5ed-0867-401b-8100-af67e03a20f4	1	\N	Other
+9b980473-1774-4afb-a47f-636c801a2be0	1	Other	Other
+9b98088a-d8a6-4c90-99c5-955fac392011	1	Other	Other
+9b9814ce-18b2-426e-a8d6-8eabdb88b5ab	1	Other	Other
+9b9819f2-833a-4554-8634-c9ca915786a0	1	Other	Other
+9b9824e4-de23-4393-8f63-ceda1a0b7f17	1	Other	Other
+9b986548-cf4a-49b2-9354-9c9fbb7d70f0	1	Other	Other
+9b986a9c-bb55-4354-9953-9b38ad7f7418	1	Other	Other
+9b9893cb-71d6-47a0-be9b-d9e639c02478	1	Other	Other
+9b98d008-ad3a-465b-ae30-0a6aa0c005d1	1	Other	Other
+9b990df2-52b2-4185-a6af-0fb510989d24	1	Other	Other
+9b99230c-62b9-472c-ab6b-1bb8ecab0891	1	Other	Other
+9b9953ac-6d4e-4911-b4ee-66fa11e7b6d4	1	Other	Other
+9b998a5d-db77-4458-b503-6bcc6721e894	1	Other	Other
+9b99e61a-41dc-411c-b7cf-293f3fd74a53	1	Other	Other
+9b99f6a1-c299-4645-883b-a75545be2e7f	1	Other	Other
+9b9aeaa8-8293-40d7-a420-4fde5acba0ac	1	Other	Other
+9b9bb3a5-dcf8-4ee5-a1c5-35ffbad5adce	1	Other	Other
+9b9c1b56-32a7-403e-99b2-fb42404313c1	1	Other	Other
+9b9ca9eb-7df9-4a97-8ae9-648f2329ad76	1	Other	Other
+9b9cd6b7-ed8f-4065-8b43-f210325005c2	1	Other	Other
+9b9d97bd-abc5-420a-b55f-0a0ce8c68219	1	Other	Other
+9b9dc470-4025-45e8-ba1e-4e24fb882ee2	1	Other	Other
+9b9dea4e-df8a-460b-a290-afa2345c9272	1	Other	Other
+9b9dfff5-aec8-4291-a5f7-f5311e7cb0d4	1	Other	Other
+9b9e0a75-60db-4ce9-b4b0-c59e0f860239	1	Other	Other
+9b9e0f6f-48df-4c04-bfad-39b6a3c4a877	1	Other	Other
+9b9e3184-2830-4d13-9747-ca012885bb9b	1	Other	Other
+9b9e4586-304a-43c8-9539-592c1ea2388b	1	Other	Other
+9b9ef15c-410a-4e67-a5c9-69c72848f1c4	1	Other	Other
+9b9f2f8e-af8c-4ff4-8e4c-ec99070e3507	1	Other	Other
+9b9f5d98-5a68-4009-b5c8-c0133cf47074	1	Other	Other
+9b9fb911-5df0-4d5d-b94b-d85a6ec5b3e1	1	Other	Other
+9b9fca60-14db-4b46-9596-f66434c11bcb	1	Other	Other
+9ba03959-7bae-43fd-b523-df7dc58c36f3	1	Other	Other
+9ba055b1-ce54-4fc1-8e60-9d4d149fcc3d	1	Other	Other
+9ba0db75-3d89-419f-a42c-1358310a8825	1	Other	Other
+9ba0eed7-5054-449f-9d64-82ddeb5426d0	1	Other	Other
+9ba1bcdf-9513-4648-b27c-b7f3f8cc5cc2	1	Other	Other
+9ba1dd18-198c-4d2a-93ab-41cddeb54314	1	Other	Other
+9ba2230f-bf1a-47a6-a415-d237309a2354	1	Other	Other
+9ba25ae6-517d-4e24-b27a-f1ab3aba56f3	1	Other	Other
+9ba2cf8b-32c7-4acc-85ae-a621aa440ccf	1	Other	Other
+9ba2e242-1a1d-400c-9d1b-b7be22c2b7b5	1	Other	Other
+9ba2f8e7-f8e2-4bcd-908f-2b1ce38efb86	1	Other	Other
+9ba30fe1-b4b5-4cad-ac94-86fa68791eff	1	Other	Other
+9ba31c44-3616-445f-bcf7-e1abf08056af	1	Other	Other
+9ba34890-3450-462e-9bc3-b3197ae5ec26	1	Other	Other
+9ba3a341-13ac-40e6-bfcb-42addb87eed0	1	Other	Other
+9ba3a6fe-3535-4b35-95f8-569e094565fd	1	Other	Other
+9ba3cd49-3bdc-46bc-8a1f-17ade6ffca51	1	Other	Other
+9ba3e3ba-2d6a-4a19-88c1-e6ccbe6a622d	1	Other	Other
+9ba3ec34-9b27-4040-8cbc-5c622985d425	1	\N	Other
+9ba4242f-8b83-4894-8b05-c4be030dc87f	1	Other	Other
+9ba4452a-1717-4d1d-8ee2-ed57815c6ad0	1	Other	Other
+9ba4636d-a3bc-46ec-8ac8-368f85ef6067	1	Other	Other
+9ba4788a-96e2-4630-92d5-59efc190dced	1	Other	Other
+9ba4c57b-210a-4908-a700-7414524885a2	1	Other	Other
+9ba50bdc-873c-4bc6-8191-3a4e9d2b377a	1	Other	Other
+9ba51897-2adb-4a6f-9263-dfb9f7587b4c	1	Other	Other
+9ba53042-57fc-470d-b6c3-2c07d283d0dc	1	Other	Other
+9ba57166-157b-43dc-8344-7138ba2e6e82	1	Other	Other
+9ba5931d-465a-4a18-afbc-d5c9fbaec433	1	\N	Other
+9ba5e12e-6c89-45fc-8778-577ea28afe9f	1	Other	Other
+9ba60570-2d13-48fe-a1ec-7a5677815eeb	1	Other	Other
+9ba648aa-fe90-455c-929d-51c5f96a5c12	1	Other	Other
+9ba6527d-763e-4d4e-967a-f2629c9b15e7	1	Other	Other
+9ba677a9-0dc0-4b39-969a-49b758c396c4	1	Other	Other
+9ba67c4f-d937-4bab-9cf4-6c7aeb3b6ee3	1	Other	Other
+9ba68317-0a42-4e94-a648-465af14cd352	1	Other	Other
+9ba69f3d-24dd-4efc-b66a-639850942342	1	Other	Other
+9ba6a7de-80c0-42b9-8530-bfa077423a19	1	Other	Other
+9ba6e12e-5994-4ded-895c-a7f10cb596be	1	Other	Other
+9ba6fa01-fa78-4fbc-a256-3f09b94658bb	1	Other	Other
+9ba701fb-5be8-402a-af4a-7ca945b2e7dc	1	Other	Other
+9ba714d5-a861-4633-9972-ee624c67bd2d	1	Other	Other
+9ba728c7-329d-48a9-8ff2-bea0c12790e4	1	Other	Other
+9ba77c25-f98c-49d3-8d0e-75da115eafb2	1	Other	Other
+9ba7bb13-fe8b-48f7-bed6-aa642cbb0065	1	Other	Other
+9ba7dd87-67e7-4c14-bcb9-87b0bfabff42	1	Other	Other
+9ba7e997-2cb8-4574-8033-a7552807ae47	1	Other	Other
+9ba7f986-bb5e-44bd-a1b4-886cec1a9623	1	Other	Other
+9ba81297-9e39-4764-91e7-3dd735984130	1	Other	Other
+9ba882dd-8954-4a34-afd6-50270bf85ae4	1	\N	Other
+9ba8ca52-0305-4a02-b46a-08186a01adad	1	Other	Other
+9ba92cb6-38a0-4a9d-bd2f-ddf5f7fcacaa	1	Other	Other
+9ba9f721-4e51-4bb1-8e31-9339afe9f3f4	1	Other	Other
+9baa0fc9-89a6-4c07-8809-9051c1a35e96	1	Other	Other
+9baa9685-4238-40fb-85ee-3d059a939e75	1	Other	Other
+9baacb79-29d7-4ff7-962b-ddd4e193679a	1	Other	Other
+9baaedf1-63db-4111-9dfa-0f34f4c825d4	1	Other	Other
+9bab31a3-96ff-40d6-b334-34c47eec8ca1	1	Other	Other
+9bab44b6-796a-4886-b646-2ddf53901713	1	Other	Other
+9bab50a1-5e7f-4e5d-a5aa-d08218fe8b10	1	Other	Other
+9bab7a50-e3ed-417b-b55b-8c0f021a55db	1	Other	Other
+9bab9644-7b72-4425-848c-93caf1bace04	1	Other	Other
+9bac16dd-ec89-4760-9318-47ffff6e51e5	1	Other	Other
+9bac4d80-2fb1-4d91-8469-2e6dd690e4bc	1	Other	Other
+9bac7ac6-60c5-4087-8003-18496eaf7d34	1	Other	Other
+9bac9f48-7616-4b55-897d-f71cd0cd90b7	1	Other	Other
+9baca543-6d2b-4a49-9e79-1dfca609a8b3	1	Other	Other
+9baccf54-11ae-4490-af7f-381c6521a171	1	Other	Other
+9bacf096-c7ff-4527-b9a8-ffece4c0426d	1	Other	Other
+9bad0180-4d5e-424a-85ab-769bbd7e6f38	1	Other	Other
+9bad0409-2b1b-4d27-9311-8c61628d9d04	1	Other	Other
+9bad1774-acfb-4a81-b94e-22db5457b9dd	1	Other	Other
+9bad18c6-8770-4157-b275-3091c30f3e8d	1	Other	Other
+9bad3fd3-30e1-4b01-b033-f1505400d122	1	Other	Other
+9badd7ae-8ed5-46b0-9b23-cc82557e3d09	1	Other	Other
+9bae17dc-3320-4e52-84e8-2490ff474916	1	Other	Other
+9bae258e-b751-49fe-91f0-6fd1985e7562	1	Other	Other
+9bae360f-d662-469c-97e4-0aea58c876a6	1	Other	Other
+9bae4a40-9cfc-498d-b8b1-d6166f2f30e3	1	Other	Other
+9baeab82-28b6-4a78-b346-57ec1211d86e	1	Other	Other
+9bafdc5a-f92a-4896-b297-5fa5608ec89a	1	Other	Other
+9bb00db6-bced-41fa-bf77-dd567195fd57	1	Other	Other
+9bb07639-8539-4003-94f4-0b1a3b3ab114	1	Other	Other
+9bb078c8-146a-42c0-aeca-df096f329b1e	1	Other	Other
+9bb098cc-7756-4676-80c1-85f23071cbee	1	Other	Other
+9bb0b9b5-a075-4cbd-9884-69115e702adc	1	Other	Other
+9bb11df8-04c6-43f4-93bf-f4ebc9e5f949	1	Other	Other
+9bb12a44-769d-4db5-8db6-93bc5c4fe58e	1	Other	Other
+9bb1346e-0924-4609-b615-99cda87789d4	1	Other	Other
+9bb172d9-29b4-445b-b191-2a9a033d7a0a	1	Other	Other
+9bb178e1-be53-41d8-8349-4726df4db725	1	Other	Other
+9bb1a968-46d4-11e8-8f79-fa163e8624cc	1	Other	Other
+9bb20512-321c-4124-8213-d3fb3ba4cf3a	1	Other	Other
+9bb20b12-73cb-48d8-8b8b-fd3190b7fc1a	1	Other	Other
+9bb21f58-133b-4263-9ae5-2bf17d2dda4b	1	Other	Other
+9bb2262e-c7f1-448d-8d76-8c962f3f5011	1	Other	Other
+9bb22743-160a-41c2-81c7-f530cbb76f88	1	Other	Other
+9bb22ce5-5fad-43f7-b97b-b3ffa695cbe9	1	Other	Other
+9bb28cc0-360d-45c4-adcb-01e9c0373729	1	Other	Other
+9bb290b9-e8cd-4b81-9582-b405cb963ec7	1	Other	Other
+9bb29ca6-59e4-49ed-a06d-bb24ed939363	1	Other	Other
+9bb2e8a2-bbb2-4728-8bab-e5f0354f5e6b	1	Other	Other
+9bb3535b-a8b9-4dbc-9a4a-7c4804889060	1	Other	Other
+9bb360fc-61cd-4973-8077-aacbbb2e194e	1	Other	Other
+9bb37c6a-1aee-416b-ae5a-94e3c6f1cbea	1	Other	Other
+9bb393cb-56ad-4f02-9dd2-367ed21b98c2	1	Other	Other
+9bb3b830-755b-49b3-a1a1-1cd12b582682	1	Other	Other
+9bb3e74e-0a89-45ab-ab35-ded126e18051	1	Other	Other
+9bb40dec-5082-49a7-a473-7633f3eaaa24	1	Other	Other
+9bb4396c-720e-4741-b4f4-63396471cc13	1	Other	Other
+9bb4579e-11da-4679-b4c7-81c5b5a63810	1	James	Other
+9bb4580e-6c97-44b1-a122-861bff34d618	1	Other	Other
+9bb4626d-da00-4184-a9ea-20fc368ded45	1	Other	Other
+9bb48c85-f919-4cfa-89da-72173f16e9a4	1	Other	Other
+9bb49714-c321-4950-8bb5-1f9d7fb201ec	1	Other	Other
+9bb4a201-0f3a-44a8-8ac2-b6b7c93a08fb	1	Other	Other
+9bb4e3c0-eba4-4cf1-b315-ab22c9467c2d	1	\N	Other
+9bb4e6f2-f065-4050-9bac-7f10daaec4ca	1	Other	Other
+9bb50b4d-3b40-4e72-b681-edad964ccfcc	1	Other	Other
+9bb51a6d-bb7a-497a-ba63-0efba044cf44	1	Other	Other
+9bb53cab-cc14-4a0a-a48e-a7cf953114a3	1	\N	Other
+9bb53daf-ca74-4cdb-923e-ac73872713c1	1	Other	Other
+9bb5b40f-e421-4a8e-9264-540b0f53da00	1	Other	Other
+9bb5d544-0707-4a47-b8c0-d274fa462c6b	1	Other	Other
+9bb5e71b-fb0b-4613-a221-912637ef94fb	1	Other	Other
+9bb602b3-9056-4ba6-9419-c53d29be23ac	1	Other	Other
+9bb60606-76f0-4ab1-89a5-37563bf61505	1	Other	Other
+9bb61762-6392-4729-8e2c-ef0742fbb13f	1	Other	Other
+9bb6232a-9e86-4468-a316-bed39442918b	1	Other	Other
+9bb65d94-316c-4e7c-9c62-6aac17dd7ac4	1	Other	Other
+9bb6b707-6de0-4cf5-bd5c-0091c3d900a1	1	Other	Other
+9bb6cb1d-7d03-4f7f-a74b-ac384164a7ec	1	\N	Other
+9bb6ea3e-0eca-46a0-9942-99d6c910fb43	1	Other	Other
+9bb7110e-a7de-4fc1-9f37-91a7d634eae2	1	Other	Other
+9bb74376-4565-4db6-b008-52c7616c09b7	1	Other	Other
+9bb7edf8-8f94-4169-90d0-f708ad5956a1	1	Other	Other
+9bb8103a-c186-4319-9d3a-6cb77f54d130	1	Other	Other
+9bb8120f-8579-458c-97b3-a23004211284	1	Other	Other
+9bb83668-02fb-417d-9e0c-db4d32bb12ff	1	Other	Other
+9bb881c4-1367-4ae5-af12-f243d8a6ca0b	1	Other	Other
+9bb8d765-b2da-42fc-b795-36988dea873b	1	Other	Other
+9bb8f575-bbc6-4bfc-86d5-dc04199e5321	1	Other	Other
+9bb8f9b6-3e5a-45f1-98af-e6c8296466e6	1	Other	Other
+9bb9591e-3ef8-4bc4-9154-bb2a2730088d	1	Other	Other
+9bb969e1-c77e-4623-98a8-d55b77cdc320	1	Other	Other
+9bb96f16-79c4-4ead-aca8-973a08c1dcd4	1	Other	Other
+9bb9b282-330b-4747-bb5d-3e04121e985b	1	\N	Other
+9bb9d1e0-beba-4ad2-9a4a-54cf21d667ec	1	Other	Other
+9bba11aa-aa90-49b7-8b04-961caab73e1b	1	Other	Other
+9bbad49c-0c28-4e97-b736-922b8d8d8dd2	1	Other	Other
+9bbad771-b225-4ca2-8262-f41b4556e7a6	1	Other	Other
+9bbb00bd-924c-4f4c-b457-8b9686d46770	1	Other	Other
+9bbb2dc7-7303-400f-b0d4-acf537e459ca	1	\N	Other
+9bbb3d1b-78bf-4f3d-98e0-32988d61b96e	1	Other	Other
+9bbb5c98-27cf-4050-9b01-90a2d9cb86b5	1	Other	Other
+9bbba3bd-5670-4f57-a8fd-1f2baa792eb1	1	Other	Other
+9bbbb67a-6ef2-43d9-af32-bd917972257b	1	Other	Other
+9bbbb87e-403a-47ee-b7fe-ab56572712a2	1	Other	Other
+9bbbdf64-05f4-467d-b3f1-dcbf05423534	1	\N	Other
+9bbbe320-9ac5-4f56-834b-0ecea5d182d9	1	Other	Other
+9bbc0745-76c6-483c-a3b9-d28592197afe	1	\N	Other
+9bbc3fd7-8e64-4bc1-ab5f-653eb60131a9	1	Other	Other
+9bbc7be5-8727-460d-9714-2218b424dc52	1	Other	Other
+9bbcf1ec-f080-43d9-9c1c-342cefac0826	1	Other	Other
+9bbd4307-9e10-438d-b5a7-73de2cfac454	1	Other	Other
+9bbd8cf5-7de8-4182-a92c-ca068c33aaa1	1	Other	Other
+9bbda3b9-850c-4553-99a3-22cdf534fa4f	1	\N	Other
+9bbe0cc0-4caa-4975-98bd-e74a4b1de60d	1	Other	Other
+9bbe26fa-0d18-4029-8284-b2f37ba34897	1	Other	Other
+9bbe4fe3-e577-4784-aa42-4eaec40fa55a	1	Other	Other
+9bbe77e6-e22b-4471-b3c8-9e0d26b540c1	1	Other	Other
+9bbecf86-775b-4e95-89dd-adb4a38d01f1	1	Other	Other
+9bbf5545-90fc-47fa-9f85-96757ed4e454	1	Other	Other
+9bbf7d90-e094-454b-bb51-3b15c1917b63	1	Other	Other
+9bbfb13c-3580-421a-9fa6-3d15c7a699b0	1	Other	Other
+9bc0390c-3a0b-432d-9899-979cf224060a	1	Other	Other
+9bc052bb-9643-4b87-baed-e0597d2a7e06	1	Other	Other
+9bc05443-1745-4c35-a789-44d0cfc62e50	1	Other	Other
+9bc0a3a3-034e-41d5-a911-2a26d5d1c627	1	Other	Other
+9bc10136-3145-462b-90c2-a1630e65544d	1	Other	Other
+9bc12c5c-df0a-4420-97e0-7e33ce62c112	1	Other	Other
+9bc13b69-92b6-4b7c-9054-5ec7b673c900	1	Other	Other
+9bc147a4-2087-4e4b-abde-f5254d8b30f3	1	Other	Other
+9bc180d4-9fbc-41f0-9443-31acc2ba5a45	1	Other	Other
+9bc18983-d874-4645-af72-dfa12c33be32	1	Other	Other
+9bc19dcf-902f-40c8-b4cb-e8044077e1d2	1	Other	Other
+9bc1daff-e5ef-4481-83c0-e15938cdbc97	1	Other	Other
+9bc1df7b-b8fd-4bc7-b38e-e1d08b181da6	1	Other	Other
+9bc1eeff-132d-4831-a6b7-e6cbea14819a	1	Other	Other
+9bc1ff9b-a578-4c53-b5f7-f11b3a104e2b	1	Other	Other
+9bc24649-3125-4bcc-9c8d-c20eab06223f	1	Other	Other
+9bc25253-130d-4a31-8346-3f5b04d70dad	1	Other	Other
+9bc29d3b-b28d-46f7-8a70-4dc73dd2bb11	1	Other	Other
+9bc2f92f-e96c-4dd8-af9e-c9efbfb8350a	1	Other	Other
+9bc30102-0367-428f-9571-381a1f7e6a3c	1	Other	Other
+9bc31207-b14a-4d01-b29f-646d973d8647	1	Other	Other
+9bc34677-263d-4cf9-8d87-c570c478ee7b	1	Other	Other
+9bc3bc9f-6107-4eac-9688-c04ba6fabfc4	1	Other	Other
+9bc3dab9-a854-4f66-ac63-fc4ae5b7d4c3	1	Other	Other
+9bc40cb2-08f3-4d16-a692-382580179b34	1	Other	Other
+9bc4d25d-116e-4ff2-b653-94984df1f50d	1	Other	Other
+9bc4d7d1-a166-4f5a-8f18-36854fd413ed	1	Other	Other
+9bc4f19b-8f4e-43b7-90b8-83dc73b8a606	1	Other	Other
+9bc53feb-a888-4f6a-9dc6-0a0640bef247	1	Other	Other
+9bc54b03-b3d9-4a36-9dd3-1adc71bb0f91	1	Other	Other
+9bc58b20-0489-4395-aaf0-522c634ef79a	1	Other	Other
+9bc5a179-0e0e-47d1-9eac-13219344a348	1	Other	Other
+9bc5b92d-c6f2-46f2-a643-fbf190e96238	1	Other	Other
+9bc5bc20-adc5-4d75-a930-93e1aa675e1f	1	Other	Other
+9bc5c494-e79e-421e-a2d5-e275aec4c897	1	Other	Other
+9bc5d8d8-4d35-4c20-a504-caea80118e08	1	Other	Other
+9bc6048e-61af-447b-a8e3-7c9758c4534a	1	Other	Other
+9bc66efd-c8be-40f6-89dc-5efd47da48e5	1	Other	Other
+9bc677b0-817a-48dc-b7a1-e1d6583119fb	1	Other	Other
+9bc687fe-8508-492d-b392-605cbd42a3e6	1	Other	Other
+9bc694b4-75c6-48bc-b963-49a74aaa5bc0	1	Other	Other
+9bc6f394-b1e7-4b4c-b0f9-f0af8d541a55	1	Other	Other
+9bc709e7-a1c1-42e5-8662-2871b80443cb	1	Other	Other
+9bc71167-948e-47b1-826e-9c01903ce805	1	Other	Other
+9bc71423-97ec-488e-badc-3cc2bc45a0ab	1	Other	Other
+9bc780d0-0467-4292-a978-96476f6c9067	1	Other	Other
+9bc78f3d-d6c8-4b83-9c31-9517dbc0510f	1	Other	Other
+9bc79954-adad-41dd-9a1b-fcac2a207554	1	Other	Other
+9bc7afd0-8047-412f-8a33-7b96adb256c5	1	James	Other
+9bc7c75a-588d-44be-b0b6-573be66cc2b4	1	Other	Other
+9bc7c87e-d308-450d-831c-3c9c66dc3d59	1	Other	Other
+9bc7c94e-aa8c-42ec-a73f-3fdf33ab2c51	1	\N	Other
+9bc7d41e-29be-4445-ba2c-8866e90afca0	1	Other	Other
+9bc80125-24b1-4c08-8087-069f5d09e1e3	1	Other	Other
+9bc818ea-f73a-49ed-a2c4-46462d6aa3e8	1	Other	Other
+9bc818fc-1115-445e-b44f-68694e9cc281	1	Other	Other
+9bc8312d-51dd-4c71-8c26-dda1d3a596b5	1	Other	Other
+9bc8981d-7fbf-4271-8e8d-73da53339c9f	1	Other	Other
+9bc8e1c8-0691-4812-8219-a3caa8361554	1	Other	Other
+9bc9148a-307f-40c8-9a77-c4b50379f888	1	Other	Other
+9bc91d69-df6d-4893-9dc7-dba02331e8c5	1	Other	Other
+9bc95630-3bbc-41da-ae00-28c684203312	1	Other	Other
+9bc95b6e-f565-4347-8ef1-2cca1118b320	1	Other	Other
+9bc9601e-bbcb-47a2-962b-8ed4bca75ced	1	Other	Other
+9bc9680a-6005-40b9-b845-af3e06b000cf	1	Other	Other
+9bc9c5c9-6c7d-4cdc-bc5e-ba1c15448359	1	Other	Other
+9bc9fe7b-56e3-4f17-b949-1590e4ad9cc2	1	Other	Other
+9bca010b-681d-46a6-8095-31c600f73771	1	Other	Other
+9bca0fb6-4c5c-4528-a034-c3a22d809cba	1	Other	Other
+9bca2709-67f6-4827-bc51-7f939ca5fe65	1	Other	Other
+9bca33e3-d6a8-4f71-ba1c-f6f0571b6a5a	1	Other	Other
+9bca38c4-313a-4838-a0cc-de7ca2ee75c2	1	Other	Other
+9bca403e-11c8-40b7-9760-9e17dbb27e3f	1	Other	Other
+9bca72b5-c7cb-43d4-abf2-1806f8cd26df	1	Other	Other
+9bca88e3-13ca-4446-be61-702ee33b689b	1	Other	Other
+9bca9c54-e538-428f-9179-0a6390ab4327	1	Other	Other
+9bcaaf9d-81b2-45b6-90c0-4d52a7acdb81	1	Other	Other
+9bcad237-1a9f-4ecc-9ba8-b87c36ae2da1	1	Other	Other
+9bcad8ff-fce8-42c6-862b-7d4dc9ccebb1	1	Other	Other
+9bcaf773-b2c8-44c5-8d77-b6199e90232a	1	Other	Other
+9bcb1162-2809-4998-84ea-bd88f430458c	1	Other	Other
+9bcb61af-30ce-4dff-a414-6a2d8d4ca8cf	1	Other	Other
+9bcb73cd-dd61-4915-a3f8-c8164bbde283	1	Other	Other
+9bcb8365-ac8e-4305-b076-b8a2ddd6ab04	1	Other	Other
+9bcbf0eb-fca7-4f93-be2c-ffecd77ff612	1	Other	Other
+9bcc86aa-afa0-4ba4-b883-2cc66ce1f7a9	1	Other	Other
+9bccf975-26c4-4fe0-8578-2600f2b3f7df	1	Other	Other
+9bcd6a43-8fa8-4014-8522-dc78443b62a2	1	Other	Other
+9bcd74d7-bae7-41df-ac6d-5a5a74de7ce3	1	Other	Other
+9bcda980-b0e4-45fb-a17d-8365a3882f68	1	Other	Other
+9bcdbfda-9891-4df5-b13d-be0e3f377948	1	Other	Other
+9bcdf197-1a4f-48df-b67d-878362cdc1a3	1	Other	Other
+9bce490e-5f79-4ff2-9d26-99ae3cf70f10	1	Other	Other
+9bceac1b-addd-4399-92fc-87cae22ab1e0	1	Other	Other
+9bcee99f-27ed-4293-b5e8-6daca65cf0f4	1	Other	Other
+9bcf1e14-da5a-45eb-9228-1e0e297cc30e	1	Other	Other
+9bcfd318-b208-4535-a00d-5767b1108874	1	Other	Other
+9bd05b6b-3c8c-4c2b-b28a-bc9c18776fc2	1	Other	Other
+9bd06fa9-a4e2-419e-b0b8-5588cc71faba	1	Other	Other
+9bd08e87-b1e7-479e-9f7d-a51fe346c8a7	1	Other	Other
+9bd097ee-4c6e-41d8-9d0b-8c54b8d4b0df	1	Other	Other
+9bd0f9c2-7f1e-43c6-9312-799d531a9166	1	Other	Other
+9bd13658-86df-4e50-b734-a32aa12e8c29	1	Other	Other
+9bd1669a-f81f-4e93-a804-9379a74a5738	1	Other	Other
+9bd1a91d-e0c0-442d-bf44-800936d0e8db	1	Other	Other
+9bd1acf2-4da2-4be8-be40-58f1cae5562f	1	Other	Other
+9bd1d3b6-ce2a-4902-8cb4-e15fe74b424b	1	Other	Other
+9bd1f2b7-ae21-4341-b497-d512524550cb	1	Other	Other
+9bd21c26-adb9-4113-ba2d-a40e0ec8d571	1	Other	Other
+9bd22f22-acb7-4bb0-88cb-b5f1e775301d	1	Other	Other
+9bd299c4-6d35-45e8-8cc1-32fc5a0a57b6	1	James	Other
+9bd29fca-d7a9-46d2-b793-180c8e1e8ffa	1	James	Other
+9bd2be35-74c0-4a3a-94a4-021163b0e330	1	Other	Other
+9bd2fe13-e619-4874-bae0-12825491b211	1	Other	Other
+9bd3328a-4543-499f-bc9c-be1960b9ae5e	1	\N	Other
+9bd35748-931a-4117-abf8-592467624049	1	Other	Other
+9bd35f21-4d5f-4376-8010-e38fd132aee9	1	Other	Other
+9bd36c8a-358c-48e0-bd01-03e676b3235d	1	Other	Other
+9bd37d59-e337-42a5-99d8-c2efc4939cf9	1	Other	Other
+9bd39ffb-932b-4be0-87bc-e6920acbc975	1	Other	Other
+9bd3e5ec-c536-494d-bdc4-9bc6fdd39f5c	1	Other	Other
+9bd43edf-ab70-4abd-ba8c-70ea3d525050	1	Other	Other
+9bd4ea32-60cb-401b-95df-e08b294b45a2	1	Other	Other
+9bd54083-2b69-496d-9084-8ca56692d624	1	Other	Other
+9bd54d6f-d904-4089-8f23-4642c5b25186	1	\N	Other
+9bd596ff-0425-4271-a7ed-517def82a2c0	1	\N	Other
+9bd59e1d-eeff-48c9-9922-e568f667cc42	1	Other	Other
+9bd5e3f1-bce1-49e1-8c55-a34967c212b5	1	\N	Other
+9bd5fa26-b746-4f42-8e44-05b4ae294f76	1	Other	Other
+9bd64d92-5819-482d-beca-13687f529fb1	1	Other	Other
+9bd67463-0728-41df-a980-950841d181df	1	Other	Other
+9bd679ce-9022-448f-b346-6a2cf4624a2e	1	Other	Other
+9bd69d9f-461e-47e8-84e3-5d73269cb52e	1	Other	Other
+9bd6b35d-2296-4e3f-aa1e-ff546a5fda88	1	Other	Other
+9bd6cad6-2605-4934-a95b-87ede878d44b	1	\N	Other
+9bd77b22-378a-42d4-934e-99eaf2ec60d5	1	Other	Other
+9bd79bf5-a2c2-4380-a002-2fa88571e07f	1	Other	Other
+9bd7a45f-d107-4b91-9021-4c6410608728	1	Other	Other
+9bd7b423-e146-40a5-b2ee-ab5814fec67f	1	Other	Other
+9bd7c1de-4ca9-4e11-a8bc-dbbf36f1bd4e	1	Other	Other
+9bd7d813-4c43-4c37-8475-ddc855762b32	1	Other	Other
+9bd7e1e5-4955-491e-9986-7c3ef157b58b	1	Other	Other
+9bd7f4c7-f74e-4d91-bc7c-29fd5788ebc9	1	Other	Other
+9bd88f37-41ed-476a-936c-73af22cfa81f	1	Other	Other
+9bd898b5-4882-4de1-81b8-afd5d6a001a1	1	Other	Other
+9bd90cfe-fb9a-4c09-88bc-6d5074397771	1	Other	Other
+9bd9492f-a059-494d-9402-e3b58298bc56	1	Other	Other
+9bd94cfc-817c-4379-a9b3-b16e24e49478	1	Other	Other
+9bd94f49-ccc1-40f2-9da8-9d0d94bb747b	1	Other	Other
+9bd9644b-faa6-49da-b3d0-e7df253e35d4	1	Other	Other
+9bda598a-e129-49ef-848a-92e1f090af38	1	Other	Other
+9bdac703-02e3-4b71-a70d-fdae15233528	1	Other	Other
+9bdae211-f40b-408f-aed1-13a3b4fb0191	1	Other	Other
+9bdb0424-aea7-40f0-bcdf-6e4ff1bf6b84	1	Other	Other
+9bdb0ab1-12de-479d-b90d-61f621451ede	1	Other	Other
+9bdb3bc5-65a8-4c4c-9e97-62bb58d7fad9	1	Other	Other
+9bdb7e6b-6d68-47a5-b060-ee32eb630f39	1	Other	Other
+9bdb8299-2151-4ba4-bb1b-e3c8ad9e68fd	1	Other	Other
+9bdb8cb3-517b-4287-8e46-503ee076005d	1	Other	Other
+9bdbbcd9-3dac-47d0-964d-5f566dac5bf2	1	Other	Other
+9bdc0b58-9208-4cbf-9771-67a52a1e1cb0	1	Other	Other
+9bdc1833-817b-4797-b078-bfb3ee0badc4	1	Other	Other
+9bdc3e14-a5eb-4dc7-b2a5-3c33a65ee256	1	\N	Other
+9bdc4efb-61be-43a1-9070-d8b87c8877f1	1	Other	Other
+9bdcd4d1-e2d0-4480-8afe-9c69719c3cbd	1	Other	Other
+9bdcdf48-9d54-4444-b578-937d52aa0eb1	1	Other	Other
+9bdd202a-f7a5-427e-94dd-92c78d16de1e	1	Other	Other
+9bdd97b6-0b96-4a26-b71c-b5581c948877	1	Other	Other
+9bddbc01-4549-4bdc-950d-58e3e583d4b8	1	Other	Other
+9bddfcc7-355d-43d6-b9a8-6e5a47f1816c	1	Other	Other
+9bde1368-5de7-4213-93a4-58a7ee7fa23f	1	Other	Other
+9bde1560-d63e-4f93-8d7f-5a2f1101ba9b	1	Other	Other
+9bde36bf-0f28-4ac5-a8ef-5ef6f38af17b	1	Other	Other
+9bde4d46-9e87-4bb2-b42e-551a200f2632	1	Other	Other
+9bde7a8a-78ac-471c-a430-578c241d13cf	1	Other	Other
+9bde9aee-b591-4fec-8650-fe33717132b3	1	Other	Other
+9bded39f-6e56-4956-a582-5e1900367549	1	Other	Other
+9bdee89a-09e6-4c78-8823-cc31d1b2bfb6	1	Other	Other
+9bdef1dd-3af8-4f1e-8e78-122e5c3150fe	1	Other	Other
+9bdef778-3d09-4ed7-927d-5414954e9660	1	Other	Other
+9bdf0054-81fa-4002-ac7f-e7fe9db0f59f	1	Other	Other
+9bdf2169-1171-4f9e-b6d1-c1dc3afeb68e	1	Other	Other
+9bdf37b1-fb0e-433d-9e27-975bd6c74ad1	1	Other	Other
+9bdf4a52-f942-4b66-a996-2639a3f822c0	1	Other	Other
+9bdfa14f-f5e8-4e35-a910-736ef599c8ce	1	\N	Other
+9bdff9b6-f3bb-4297-a5d9-e2e4f5ac1177	1	Other	Other
+9be006f5-8457-4305-b523-f128c12d6774	1	Other	Other
+9be025fc-50c2-4bac-8b52-73b22f786130	1	Other	Other
+9be069b6-9e2f-4ded-bb9d-dd42216c8a08	1	Other	Other
+9be0c6d2-32c7-4f99-a1f2-0749a00d8931	1	Other	Other
+9be0fa33-f263-4720-83f2-3ce99668793b	1	Other	Other
+9be11e64-0e0e-4fdc-81e8-63a7a39877a2	1	Other	Other
+9be15d64-f620-4c28-a37c-1b14cd684f78	1	Other	Other
+9be189fd-405d-4b3e-8005-8e07268d728e	1	Other	Other
+9be199a2-be11-4a7e-93c4-de2b9bb0727a	1	Other	Other
+9be20994-e175-4111-a644-093c973b3361	1	Other	Other
+9be262b5-60da-4d14-b932-ca1a5656b3e8	1	Other	Other
+9be2c692-df56-4951-95ba-fa5d6fd29743	1	Other	Other
+9be2c9bf-8960-49bd-a4c1-59221eb46bf3	1	Other	Other
+9be2f9ae-ceaf-4444-889a-8510b12e9037	1	Other	Other
+9be31091-f6b7-4407-aae5-90677c6f7191	1	Other	Other
+9be32ed8-c9ad-4fbe-872a-4fc141bf7464	1	Other	Other
+9be3418b-b62c-427b-b34a-9306833d3155	1	Other	Other
+9be364c1-0a2a-4ffb-ba5e-98b642692806	1	Other	Other
+9be36636-9fe0-4056-b300-5c8427d9500d	1	Other	Other
+9be3684c-7752-4d83-8450-4f6412a69929	1	Other	Other
+9be37187-d375-4bb9-adbc-0bcbc28ab2e9	1	\N	Other
+9be3e3f7-cf58-47d5-9821-c30759755475	1	James	Other
+9be42c4d-7f02-48fb-9510-0fbba16d5d85	1	Other	Other
+9be44516-67dc-4f79-978a-2b52458a8ddc	1	Other	Other
+9be47c17-c1e3-4797-af19-24d71c2c1c9b	1	Other	Other
+9be48cbe-303e-4c92-b389-fb82199392e6	1	Other	Other
+9be4b155-f02e-4051-a799-f1da09cc5a71	1	Other	Other
+9be4bebc-b478-47b9-8602-9411a74702d4	1	Other	Other
+9be523c3-25f0-4d08-a239-c5d65e79619e	1	Other	Other
+9be52ec3-0d3a-44b0-9990-d59f0ff56428	1	Other	Other
+9be532b5-c321-4402-97e8-09461c07d867	1	Other	Other
+9be55326-225f-44a4-9445-eafadd590059	1	Other	Other
+9be55e4b-b843-4514-ac35-0bef28854c6d	1	Other	Other
+9be57dd5-87f5-461a-9a03-b692e6af1701	1	Other	Other
+9be5a1e3-45eb-49a3-bba5-23962004f112	1	Other	Other
+9be5d228-6d56-43e4-900c-f2d769741470	1	Other	Other
+9be5f268-0c69-4426-881d-039c4fe00486	1	Other	Other
+9be621b2-c0c5-41e5-ac23-ebd8713c1c2d	1	Other	Other
+9be6305a-1b3b-461e-a96d-8b9533097609	1	Other	Other
+9be66e03-51e2-4635-9d34-c4ff63a8b4d3	1	Other	Other
+9be687a4-83d3-4bbe-9e72-efd9f1b667d0	1	Other	Other
+9be6e111-3cb4-4108-a673-8ffdc59f9940	1	Other	Other
+9be7022d-9ff4-409a-89b8-a46ec607e7c9	1	Other	Other
+9be772e9-b564-49ae-976b-9cbc190c64ea	1	Other	Other
+9be7db24-d72d-4639-b071-e45217598876	1	Other	Other
+9be846d4-3b35-40d9-8650-816fbb075071	1	Other	Other
+9be85a7d-cb75-4984-9236-fee2ec524dd8	1	Other	Other
+9be89c26-e61d-4073-85d9-d3a4f9aed630	1	Other	Other
+9be89f11-260e-46ae-8b4a-3ef725082520	1	Other	Other
+9be8a3c5-45cc-4724-8b44-112f02007da7	1	Other	Other
+9be8e412-8a80-437f-ad17-31907661c644	1	James	Other
+9be8e866-fd8a-4183-b31d-4cd1061c1b68	1	Other	Other
+9be937e7-aaaf-4585-856c-94e7192ae43b	1	Other	Other
+9be9a8b9-d752-47f5-8dee-9a2655b814ee	1	Other	Other
+9be9b389-aa4b-4dae-b3f2-8ee90f447c6d	1	Other	Other
+9be9f8ea-c6db-48cd-a28a-600257701bb9	1	Other	Other
+9bea2f77-b889-482f-8760-adb8d7e0fb0d	1	Other	Other
+9bea8217-75de-45b7-8c76-2bb152f01049	1	Other	Other
+9bea8473-5b3f-41f9-9a4b-d601432f9f02	1	Other	Other
+9beaaf45-c8f7-446e-9c90-f3aef0bca517	1	Other	Other
+9beab272-aa69-449d-805c-3e1a30ff21b0	1	Other	Other
+9bead421-c6c4-41d5-932b-c9c92cfc69a6	1	Other	Other
+9beb3fd7-e303-475f-b51e-ab002dbef355	1	Other	Other
+9beb6e98-1561-4b69-9c77-8b09c51b756c	1	James	Other
+9beb955a-9759-4ffa-b637-0d0b2775f9d8	1	Other	Other
+9beb996b-6fcf-4630-bdc2-c0f8697c8576	1	Other	Other
+9bebba40-f83f-435e-aa9e-ea4587ea06a1	1	Other	Other
+9bebc0ef-cf43-4cc4-80bd-5a6a68b5f284	1	Other	Other
+9bebc4d0-ad4f-4548-bc47-202f0c0614c0	1	Other	Other
+9bebd122-697d-4a6d-9d27-d3fbea369b56	1	Other	Other
+9bec009e-34c9-4766-bdc0-052ab26b3ac2	1	Other	Other
+9bec15f5-9a9a-42a2-9e92-c585d5e08733	1	Other	Other
+9bec3742-8c86-4cb3-bd31-8c4d9865f1ab	1	Other	Other
+9bec59b7-9790-45d3-b9bf-6b8272addf21	1	James	Other
+9bec61d4-bd74-4d2f-962e-2d6d6584c060	1	Other	Other
+9becab9e-28bf-4860-a1af-b36d833535b1	1	Other	Other
+9becafed-7922-4ad8-aaeb-90a0520db1bd	1	Other	Other
+9becb88a-feaa-445a-a414-2c742c884121	1	Other	Other
+9becef8e-9b64-4ecc-be59-60588dc96934	1	Other	Other
+9bed0246-5574-4859-8a0c-773eb1fa4696	1	Other	Other
+9bed49bd-4f6d-4944-92a4-90c0dc39dc8d	1	Other	Other
+9bede06c-8cd0-4bcd-8bca-03c03f89a818	1	Other	Other
+9bee3866-0e47-44ce-9e3b-287947a721f8	1	Other	Other
+9bee52a0-a682-4de1-9900-fe1d63375379	1	Other	Other
+9beea89b-a8b1-4b97-ae1e-da9c3c22a2ef	1	Other	Other
+9beed0d2-f413-4d61-b307-55225b313026	1	Other	Other
+9bef44b1-ea14-4c28-8dbd-6c87d2a5660b	1	Other	Other
+9bef8b67-dd97-4dbe-ac0e-12060b64c9e1	1	Other	Other
+9befaf8d-0202-48af-8b87-549264ad3055	1	Other	Other
+9befbf46-dd46-4c91-9914-74ca29c027ae	1	Other	Other
+9bf00260-eec6-4e64-977f-5acf41964be0	1	Other	Other
+9bf02391-3dfb-4926-9c24-df082cbb3f46	1	Other	Other
+9bf02cc3-934d-47fe-8954-8345da7525f9	1	\N	Other
+9bf03a68-1ebd-44c8-8634-9b0f2072458e	1	Other	Other
+9bf0503a-dc72-4fa9-9bea-eb6e63aabb92	1	Other	Other
+9bf122e6-ae38-4fb0-936c-f54db466b6c6	1	Other	Other
+9bf134b6-d0a3-4d19-b494-5096788e0c50	1	Other	Other
+9bf1610f-e9d8-4f60-ac93-9d44f67d76b6	1	Other	Other
+9bf17faf-51ec-42ba-8151-cb510fb3d060	1	Other	Other
+9bf19bc0-e0ca-41df-992d-3f28a3064b6a	1	Other	Other
+9bf1cf4d-3fc8-4f84-b721-1335803a2aff	1	Other	Other
+9bf21696-fcb3-4d13-ade1-ef1a193f100b	1	Other	Other
+9bf269a0-0e44-4698-8b5a-a39abe871bec	1	Other	Other
+9bf2a512-8555-4721-b7a8-0b424d376134	1	Other	Other
+9bf2b919-86c1-43be-aee5-b51b02865b36	1	Other	Other
+9bf30d4b-4c25-4ee4-b335-e8b626aa1f64	1	Other	Other
+9bf33469-df8a-4652-b172-45ba85816c6e	1	Other	Other
+9bf3d0e2-6670-4e88-8584-9c7858726d2a	1	Other	Other
+9bf3d683-6801-4abe-a348-d5caa3eb42c2	1	Other	Other
+9bf3dbcd-d809-44b1-89d8-af51be1d28ae	1	\N	Other
+9bf3e08e-6c21-44e5-b87b-5c4b2b0d5c3f	1	Other	Other
+9bf44951-1cb4-4923-905d-f94e9891f84c	1	Other	Other
+9bf498a0-34c1-4449-924d-a125bb29f860	1	Other	Other
+9bf4e183-5408-4f24-9044-d5b1f4a79a10	1	Other	Other
+9bf4f92a-9888-4240-86fe-e9e77295dccb	1	Other	Other
+9bf525a3-2a0b-4b06-a27a-f24b8d403a9d	1	Other	Other
+9bf56af5-a522-4893-a3a9-5c469b58e44e	1	Other	Other
+9bf5bfb3-87fe-4b96-bb33-e40301aff192	1	Other	Other
+9bf5bfff-08b0-474e-a15c-2a34fb372a7b	1	Other	Other
+9bf5cc4d-54e0-4c7b-9307-b9ddef670d05	1	Other	Other
+9bf60dc6-c7b3-412e-92fa-dc8199a8156e	1	Other	Other
+9bf61ce7-4cdc-4d41-8f17-84461097193d	1	Other	Other
+9bf66a54-aafb-44cf-b3ea-e84fa925cd68	1	Other	Other
+9bf68464-5425-46c3-aec9-f8b6839c2866	1	Other	Other
+9bf6a890-f783-41d1-81ba-c6fc244ac6fb	1	Other	Other
+9bf6d091-7cbf-4b04-82e9-ea902eb80186	1	Other	Other
+9bf70778-9f15-4406-8df5-4d4d1cbbb578	1	Other	Other
+9bf71006-ce76-4eac-ac4c-6e4c7f8a3adc	1	Other	Other
+9bf770b0-4de6-448d-8ee3-102dc3b5eaf7	1	Other	Other
+9bf7be7d-327b-4888-8875-9bd2cacac21a	1	Other	Other
+9bf7c965-e6f8-4415-b46c-1a20e5fa8d85	1	Other	Other
+9bf82795-5067-4105-b86b-48cf94bd201f	1	Other	Other
+9bf843cc-2bd2-4ec8-bf82-32e262baacd0	1	Other	Other
+9bf843ef-e5ad-4018-9119-e4295e38d0f5	1	Other	Other
+9bf86196-e37c-4796-ac9b-6a9b88474a26	1	Other	Other
+9bf86513-1841-43a1-8072-6bf16dc52648	1	Other	Other
+9bf8851e-9e5c-4023-b802-a58fd75cecc3	1	\N	Other
+9bf8903b-0d8e-4184-adfc-4f10c9641079	1	Other	Other
+9bf8aa6c-909f-4a43-8167-b490adcc898f	1	Other	Other
+9bf8bf07-c73a-428c-a69a-ee7d3f7bc5f4	1	Other	Other
+9bf8f108-c9e8-4d1b-a6f1-92c2cb008971	1	\N	Other
+9bf9018c-92e0-4fa7-8159-f4c652e692c5	1	Other	Other
+9bf90ab3-9f7d-4706-996d-9ba64585c82e	1	Other	Other
+9bf90d2d-6a8a-4802-9652-cf911090b398	1	Other	Other
+9bf923d9-dded-4830-b5ba-4a9d9b70fa78	1	\N	Other
+9bf930d3-4335-4043-a973-235ff75fd5a1	1	Other	Other
+9bf987c7-d4ef-4270-9fa7-24372df8fe92	1	Other	Other
+9bf9e6db-9dde-45ca-8d23-5c27d22c6215	1	Other	Other
+9bfa0227-ae3a-4927-add4-269d0f25d77e	1	Other	Other
+9bfa3622-2d00-4b43-88dc-8c8d3f898b73	1	Other	Other
+9bfa5300-2b13-4af0-bd01-bf357c330b2f	1	Other	Other
+9bfa54d4-0e3d-495f-bfa4-84990a4dfb64	1	Other	Other
+9bfa8834-b1d7-47ca-bdd5-e6834a5c6380	1	Other	Other
+9bfab29e-f5b4-47b9-bd27-f9f4ca9d2fb9	1	Other	Other
+9bfac0cf-5734-4789-83e1-b9abb615728d	1	Other	Other
+9bfad3a8-223d-4e53-81f3-c221fe0d4be8	1	Other	Other
+9bfad494-584b-480d-999f-ad5087ea98bf	1	\N	Other
+9bfb15d6-77b1-4f2e-a8dc-b4f53a79fea9	1	Other	Other
+9bfb1d7f-3ef4-4c47-9090-4d548a31907a	1	Other	Other
+9bfb7935-1753-4895-ab15-0f01bc56fb2a	1	Other	Other
+9bfb9902-f23d-4f26-a4ca-e1f80ec6aff6	1	Other	Other
+9bfba6a4-0081-40de-9083-9dadf28ec904	1	\N	Other
+9bfba911-4e17-4558-964d-5685f58b6997	1	Other	Other
+9bfc5326-09a9-4beb-b996-732bef269aad	1	Other	Other
+9bfcd907-5f51-4b83-8ffe-9b497e3629e7	1	Other	Other
+9bfd82c0-0e03-4a5f-a54b-2cd9c7856b10	1	Other	Other
+9bfda5cd-abe0-4a01-a851-44297fd79cd8	1	Other	Other
+9bfe0218-8edb-45b2-810d-798411afdcac	1	Other	Other
+9bfe034b-14e5-462d-a5c4-92a76c7fd1b0	1	Other	Other
+9bfe1794-c78a-4e66-bd5e-cb3b112e0246	1	Other	Other
+9bfe4ae3-9c8a-4684-bd91-b88efce00957	1	Other	Other
+9bfe61cf-1c5e-493b-906a-41f9627b8ca9	1	Other	Other
+9bfe7ffd-c960-4362-9d3a-e0bc033f5295	1	Other	Other
+9bfe83cb-ea91-438a-965f-f584f09814a6	1	\N	Other
+9bfe906b-f802-41fe-98e2-c5b10b6ec453	1	Other	Other
+9bfe9e73-e050-48ea-956e-23ad65a2ffa2	1	Other	Other
+9bfec3c6-558b-4a23-9915-7660bf395cc1	1	Other	Other
+9bffbaa6-896e-4ce7-a37a-d2c4bb91c028	1	Other	Other
+9bffd7b5-ef89-40c6-8107-51a88af19b57	1	Other	Other
+9bffebd5-f4a1-4ba7-b438-50c025efc9e7	1	Other	Other
+9c000150-5c80-4252-950f-26c3f7cff9cf	1	Other	Other
+9c00b515-9045-458e-a541-ef97025a9d54	1	Other	Other
+9c0108fc-d3db-4e4c-aff4-ab60820dd52f	1	Other	Other
+9c015b52-7f43-4a0a-b9d8-753ecf1c1837	1	Other	Other
+9c015fb1-ac6c-4c2a-8495-1c5ee0d84215	1	Other	Other
+9c0196bb-c449-4ce0-a6b3-104efff66cd1	1	Other	Other
+9c01bbfd-ee4a-4aa0-8aab-8161da81928d	1	Other	Other
+9c01d7c6-6b44-4af5-977e-386d13728333	1	Other	Other
+9c02d9b9-0f29-46ce-bdeb-df259f02ef3f	1	Other	Other
+9c02ef3e-5746-4820-8a52-8f74173e6b56	1	Other	Other
+9c02fb25-4e14-400e-87c7-90662e6086f9	1	Other	Other
+9c030b63-de9d-4701-90be-6c690657a6b9	1	Other	Other
+9c033965-be61-4c83-9d36-fdfdb2ef1768	1	Other	Other
+9c035d5d-8251-4bf5-9d00-82b966061d0f	1	Other	Other
+9c0373ea-889f-4508-8b71-d28e5289a522	1	Other	Other
+9c037400-fb7d-42d9-8f41-1ef6201864da	1	Other	Other
+9c038d58-001e-48fe-825b-21844087dca4	1	Other	Other
+9c03b3e6-5bee-4a48-be2c-4fc728b710cc	1	Other	Other
+9c03bb87-fecb-43f6-b06f-1a02a36129f0	1	Other	Other
+9c03d928-a545-4e04-9b0c-9b7ef55cf9e9	1	Other	Other
+9c03e5d5-6155-4aad-9ae4-43191ae9c503	1	Other	Other
+9c04afdb-4c37-4ea9-8e8d-f670d0d2c6ac	1	Other	Other
+9c04f067-7eef-4d9d-903c-e07a126ea3de	1	Other	Other
+9c05278d-cfab-4c3d-bdea-35180ec14f55	1	Other	Other
+9c0578b2-e1cd-4d68-8e76-9d81bde5c1f0	1	James	Other
+9c063bab-9e4c-4b65-b01f-97998486ed79	1	Other	Other
+9c066f40-18c0-42a7-a79b-7af3ab1622c9	1	\N	Other
+9c06a775-6e1b-4589-b4ed-47995e22fa69	1	Other	Other
+9c06aee6-eaeb-4241-98b2-272b7da30017	1	Other	Other
+9c06c19f-01c8-4a82-8bc6-76e23d2e15d2	1	Other	Other
+9c06c650-4283-490a-a1c9-b0495eeb958e	1	Other	Other
+9c06e174-0076-4594-8674-08b01c8ce6cd	1	Other	Other
+9c06e344-7c5e-49a2-a348-466cf473b662	1	Other	Other
+9c070efc-0aae-4102-8854-6781f3f2d7cf	1	Other	Other
+9c073f15-2911-4933-be2d-b65cb5d04f9d	1	Other	Other
+9c07599d-33e7-4713-b1a2-c5d9c4332676	1	Other	Other
+9c079052-dba7-4831-a47b-bf001511e2d3	1	Other	Other
+9c07af2d-a6c3-4a23-90da-99bcb949848b	1	Other	Other
+9c07f817-e71e-4773-b796-a2da0ddb85f0	1	Other	Other
+9c08267c-60f3-43dd-b3a6-b07c19917581	1	\N	Other
+9c087d03-95fb-4f70-8fc3-d1075353b7a8	1	Other	Other
+9c08a1ac-0a48-433e-8928-78202b3e7a86	1	Other	Other
+9c08d607-3bf3-49ab-8d1d-d0ed7985822e	1	Other	Other
+9c08ec02-1987-4538-abf2-9979413f2c8d	1	Other	Other
+9c08ecb2-5f04-42de-a9cf-08451f3584fe	1	Other	Other
+9c090155-a660-43c2-a421-2b7bcd567309	1	Other	Other
+9c094d34-e990-4b8f-a82e-ab3962580a63	1	Other	Other
+9c098410-3257-4fb8-b995-9dd6fdc6ecd7	1	Other	Other
+9c09abb9-3a91-439a-8f9f-214315f8940b	1	Other	Other
+9c09e84f-ac66-4967-a6e7-71bb2523f093	1	Other	Other
+9c0a126e-e954-468a-aa5c-4730c8d348b9	1	Other	Other
+9c0a16b1-9a4f-496c-86b6-ad4ce12ab8f8	1	Other	Other
+9c0a180d-1386-49b8-b9e5-98ec39172dd3	1	Other	Other
+9c0a1e11-51a2-4986-8dbc-35541b5574a7	1	Other	Other
+9c0a2f9c-00c8-45aa-bf7c-fd3314375a25	1	Other	Other
+9c0a9a14-1a2f-4990-829c-c190a822a392	1	Other	Other
+9c0aa6eb-c013-45db-b682-55a379e2b35d	1	\N	Other
+9c0ab3d3-b7cb-448f-b223-a08c82a735f2	1	Other	Other
+9c0b9106-0ead-47ee-a024-08a3249912f7	1	Other	Other
+9c0ba416-a7c1-4f5f-b54d-692f59a7673c	1	Other	Other
+9c0bd941-f2ae-45da-9ac8-926e9e29c456	1	Other	Other
+9c0bfa95-bcbe-4c59-bef3-2c2858f9e99b	1	Other	Other
+9c0c0b75-6b1b-4436-84bc-7b3038e87a5a	1	Other	Other
+9c0c242e-5d15-47fe-a42f-b69202da310f	1	Other	Other
+9c0c5e23-af99-47d1-9a47-322aed307e3a	1	Other	Other
+9c0c737d-115b-4cef-81e3-8056c3bc980e	1	Other	Other
+9c0c93e1-78d9-43ef-aa6e-72e11d28ad62	1	Other	Other
+9c0ca332-37ec-467b-b7e6-8d606164e82e	1	Other	Other
+9c0cb892-cbde-4636-a603-7497050b5b36	1	\N	Other
+9c0d5ef5-f4c3-4d3d-9527-5deda442a750	1	Other	Other
+9c0d6818-363d-48db-b5c7-02258b6c6060	1	Other	Other
+9c0e39d3-32bd-4424-8241-4fbac3340c40	1	Other	Other
+9c0e4676-beb8-4890-9822-65da8647a151	1	Other	Other
+9c0e53c3-0f2f-4e46-ac1f-0069007ef4be	1	Other	Other
+9c0e8b1c-ef89-49cf-8052-6e8c1c7648b2	1	Other	Other
+9c0e9721-8cba-4405-b0b4-c9cf21cc9034	1	Other	Other
+9c0ea463-a75a-42f8-86df-ec6cd5a8797d	1	\N	Other
+9c0ea989-97e5-4aae-a11f-2a0941248369	1	Other	Other
+9c0f03e3-6cf9-4767-98aa-99a892e4dc52	1	Other	Other
+9c0f2250-1d48-4531-9855-c2913e57622b	1	Other	Other
+9c0f311a-1b48-4963-af4d-9115acddab0f	1	\N	Other
+9c0f4042-2417-4c18-8df1-6dd9215a531e	1	\N	Other
+9c0f447d-331e-4776-925c-370be7084f49	1	Other	Other
+9c0f89dc-ea95-40cf-a714-dabe55aa05ec	1	Other	Other
+9c0fc8e1-7582-40f2-b4ba-b77ec2399773	1	Other	Other
+9c105360-0270-4325-a5d9-fcbcb2cb1cbc	1	Other	Other
+9c1095f9-ae31-40fc-97ff-aef7e5be850d	1	Other	Other
+9c109dbb-ffbf-4db5-9f93-d2c32d9f5418	1	Other	Other
+9c10b074-b265-4b02-af35-d83271d79a51	1	Other	Other
+9c10bb78-7c60-47cf-b929-e304662cc5d8	1	Other	Other
+9c10bee8-b05b-4627-94eb-cd90222d11bb	1	Other	Other
+9c10da4d-f51f-4321-8031-63b3f99b1757	1	Other	Other
+9c10fbe3-2739-44a0-be44-59157f68aab3	1	Other	Other
+9c1160a0-8fd8-4766-96f5-812f1af046fa	1	Other	Other
+9c118165-428d-44c9-9bae-57cae8857813	1	Other	Other
+9c118a64-0640-4da8-bf1a-d224a345cd50	1	Other	Other
+9c120c62-11ce-43fa-a50c-acea33c84a48	1	Other	Other
+9c1249ff-9ded-425d-8b61-038591145cf5	1	Other	Other
+9c125920-3e54-4da8-a3ef-369eec1a4105	1	Other	Other
+9c127ba6-ea0b-40c3-b44f-2983014a8f68	1	\N	Other
+9c13b8ed-8caa-440d-b254-2b6fea974b69	1	Other	Other
+9c13e57f-36d7-42a0-8544-88df36ab6a5b	1	Other	Other
+9c13e800-2e7b-466b-b3b4-6ef80512c1f0	1	Other	Other
+9c13f21c-37bb-4230-b310-aac28acd69df	1	Other	Other
+9c1403f1-84e9-4e45-9f4e-0a9801255803	1	\N	Other
+9c1441e8-5b00-4e5c-a0c1-9acdcb9f9da5	1	Other	Other
+9c147374-763b-44d3-baaa-80fde2941237	1	Other	Other
+9c147c0e-b05e-4b77-bb21-e117ff25c0ac	1	Other	Other
+9c14aff8-4e0f-4fe7-9eba-d03e0b5c513c	1	Other	Other
+9c14c003-47e6-4bf0-a0c6-95900baecfd5	1	Other	Other
+9c150211-7da8-4983-aa17-907ce6c76d22	1	Other	Other
+9c1521fd-6b4e-4e3a-8a8f-092ca43329df	1	Other	Other
+9c153737-bfc9-4073-811a-5c7a1653144c	1	Other	Other
+9c15a734-5d2b-459d-a08b-3ae0a12c75b0	1	Other	Other
+9c15ad64-1902-422c-ad8f-f38e72bb0d0d	1	Other	Other
+9c15d974-21f1-4fcc-926f-3f8aeaac9626	1	Other	Other
+9c15f9a1-481e-4917-89fb-b6ae8ae9a2a5	1	\N	Other
+9c16039c-ad8e-40fe-ba0d-90df97860742	1	Other	Other
+9c1666b0-a483-43af-beb9-fd4c393006dd	1	Other	Other
+9c16a9d8-2bb1-4a75-8c51-8324789b9000	1	James	Other
+9c16e513-70f2-4875-b80d-bb27e4544a8c	1	Other	Other
+9c16f5b9-6ac5-41af-8d52-786156ff24d1	1	Other	Other
+9c174757-781a-4132-a6d9-903823873cef	1	Other	Other
+9c174f39-d064-492f-8690-6e1e7f200f2a	1	Other	Other
+9c175f59-224e-4298-a675-7bd5d5b55129	1	Other	Other
+9c176add-ba80-46ba-8879-bedf5221aa1b	1	Other	Other
+9c1795f6-eff5-4483-9e24-b6855d11a6f1	1	Other	Other
+9c17970e-e3e8-43b0-b817-c5b9e04b48c7	1	Other	Other
+9c17cb26-9dc4-447a-a86e-b94837b11591	1	Other	Other
+9c180692-3f65-4733-b1e2-e0243dff7d3b	1	Other	Other
+9c18672e-de17-44cd-85e0-deb0dd89c09f	1	Other	Other
+9c18ed8e-f362-40ba-958e-8d2b87f16420	1	Other	Other
+9c1924bc-14e6-4fdc-aec8-9c12c1132f44	1	Other	Other
+9c1924e5-c8c3-4ab2-91e3-e3e2444a1909	1	Other	Other
+9c1952da-d760-4456-a021-2a8aac8b078b	1	Other	Other
+9c19c25f-b11a-44a7-a771-b5affbb9efbd	1	Other	Other
+9c1a08b2-05dd-476f-be62-85bbd8918764	1	Other	Other
+9c1a19e3-4832-4620-9453-02ba3582fe38	1	Other	Other
+9c1ab883-1ee6-4df6-a095-f29b4b7a07da	1	Other	Other
+9c1aedb0-0b3d-11e8-ac6a-fa163e8624cc	63dfcd94-143a-11e7-bec8-fa163e4dd901	Other	Other
+9c1afb03-a222-4fe7-b0d8-481d1cc5ebcb	1	Other	Other
+9c1affbc-3f91-46f2-9b97-1cdf6a14c0ce	1	Other	Other
+9c1b8416-7f67-4639-ac70-904d65fa2ccb	1	\N	Other
+9c1c4ca4-323d-4f6b-a324-2705b0acd7fd	1	Other	Other
+9c1c8cf7-c667-49a0-b859-ad94938a4e91	1	Other	Other
+9c1cb454-1d80-4f1d-8e76-a53fc621b1f7	1	Other	Other
+9c1cc47d-eacc-4180-b9b2-91606a5711b8	1	Other	Other
+9c1cd9fa-5267-44d6-adba-14e57b720e64	1	Other	Other
+9c1ce321-c79e-4fac-bbe8-3b312ff4a71e	1	Other	Other
+9c1cf3d4-fa22-4304-b463-b8967a61a353	1	Other	Other
+9c1d848b-2e50-464e-bed3-d372c2470032	1	Other	Other
+9c1d9dd1-fe17-4eb1-8251-e2b4932338fb	1	Other	Other
+9c1e29fd-dd10-47b2-8bda-ad8fcea626d2	1	Other	Other
+9c1e499b-c743-45fe-b5ca-63f211b99e23	1	Other	Other
+9c1e82f3-fd05-4019-a305-8f0cedfffd01	1	Other	Other
+9c1eca46-202c-4669-bc6a-8fbb92371352	1	Other	Other
+9c1ee6f2-0928-47b5-a9b3-7a6265983978	1	Other	Other
+9c1f1bc6-a8ce-4e8e-a6a8-2c2e58123a3b	1	Other	Other
+9c1f331f-5827-48f9-ae70-b19f6e846a26	1	Other	Other
+9c1f5b35-d4f3-42cd-98ec-1c18258836f8	1	Other	Other
+9c1f7782-2917-4390-9e6a-645d9dca7a17	1	Other	Other
+9c1fa9e2-861c-4ea6-b286-17fd0164a243	1	Other	Other
+9c1fabc7-14f1-4592-8e93-f38a12480e80	1	Other	Other
+9c1fc6ac-4205-48b8-b49f-2b52240ae0ab	1	Other	Other
+9c1ff9a5-effa-4085-a35b-52009f25f369	1	Other	Other
+9c20162c-8307-42cb-be0c-7f7f50c0d777	1	Other	Other
+9c20170e-36f7-40a7-8e61-c999cd16fed1	1	Other	Other
+9c20212f-b3b8-49e8-9079-8b7e38f4937d	1	Other	Other
+9c20e3cc-721d-45d7-a448-98e477e26f30	1	Other	Other
+9c2102a8-088b-46ef-a2d7-0e0885783139	1	Other	Other
+9c210c1c-8369-43ee-8594-5b8bea267fdd	1	Other	Other
+9c216b96-19b9-4370-a35d-8efcea20468a	1	Other	Other
+9c219333-f3b4-48b5-aa1c-72a88e179f2a	1	Other	Other
+9c21e1d1-eacb-403b-b947-50b04e7e2bcd	1	Other	Other
+9c21f357-1c42-498d-9559-7ba02355c8aa	1	Other	Other
+9c223c38-e7d1-4ba8-bdb4-71dd375fb9e2	1	\N	Other
+9c22b104-b3b6-4517-a04f-851b7a4dc287	1	Other	Other
+9c22c6df-bf59-46a7-bb52-9b9a9b288a88	1	Other	Other
+9c231765-58cb-4f5a-9347-5db2a9c191f8	1	Other	Other
+9c23190b-14b8-4b0f-8133-c6e70d575316	1	Other	Other
+9c237e8a-7d97-4994-b01b-1137d2f5acd0	1	Other	Other
+9c23ada4-32e6-4d5f-a883-b9c550567805	1	Other	Other
+9c23c9ac-46c2-426e-8cdb-d0629e974c09	1	Other	Other
+9c23c9ae-6005-426a-8ae4-3a0da6db3bab	1	Other	Other
+9c243f82-9ab5-4344-a8a8-3bb760170691	1	Other	Other
+9c2466f2-e4bf-4281-aedf-0b0833988249	1	Other	Other
+9c2467b5-bde2-44e5-b532-f19f401c56e5	1	Other	Other
+9c247b96-47e6-4a47-af89-51fb53fd98e1	1	Other	Other
+9c247c91-0ffe-456b-b093-d946fc76939a	1	Other	Other
+9c24d9ca-4ba2-469c-81cf-af319896cd2a	1	James	Other
+9c250bcb-2c6f-443c-8329-14679c6f98c7	1	Other	Other
+9c2527db-a02d-4660-8e3d-30200b59c73a	1	Other	Other
+9c2584a5-54f4-4452-adae-b8268511f1c1	1	Other	Other
+9c25a3a4-75f8-4723-8796-524595f58187	1	Other	Other
+9c25a5a3-f26c-48e5-869c-0ceef3357a51	1	Other	Other
+9c26181f-bf13-4101-b85e-907f3de52836	1	Other	Other
+9c262342-1460-4ed1-a66b-c7c1426c2b48	1	Other	Other
+9c26315f-2c76-45f5-8e55-fdab9ff39160	1	Other	Other
+9c265a3c-27bd-4fd4-b958-ba9ab5ad8583	1	Other	Other
+9c270792-e986-40ef-8745-fa37140c391a	1	Other	Other
+9c273279-2f5c-4df7-8fd5-a27a057de877	1	Other	Other
+9c276fe7-f38e-49c3-bc88-f5d372913869	1	Other	Other
+9c27a2a5-0d8d-49fe-a26c-4d70fe9e1f7d	1	Other	Other
+9c283874-16e1-46a3-9a40-4f491d375081	1	Other	Other
+9c285635-650a-46eb-b842-f6becf646afc	1	Other	Other
+9c286c40-b262-43a3-8b9d-5a77b6e29e57	1	Other	Other
+9c287a99-464c-4ae3-91ed-e8b6f06c20c3	1	Other	Other
+9c28ae70-75cb-4faf-96f3-da94d81bc0c2	1	Other	Other
+9c297490-418a-445a-8873-30427ea56fd5	1	Other	Other
+9c2988fd-6f5e-4673-a1e4-607cb3d94b77	1	Other	Other
+9c29af11-7e32-4a30-9795-4c8b0b94946e	1	Other	Other
+9c29bbcd-adb6-4ab5-8f38-7eb36d84f4e9	1	Other	Other
+9c29d8bd-42ef-4cca-a70f-ec14de1f808b	1	Other	Other
+9c29fce2-1b6b-498d-b8a9-46bd5c458037	1	Other	Other
+9c2a414a-3b9e-40e8-95ed-852710fa6269	1	\N	Other
+9c2a4e6d-b819-4647-bd3b-0a4c74cf0362	1	Other	Other
+9c2a6024-01b9-4e1d-a9b9-ec87a72ead64	1	James	Other
+9c2a84c7-07cb-42dc-9b72-9e9bfe3cb0a7	1	Other	Other
+9c2a9ad6-c261-43ee-9d24-0bab174dbfd6	1	Other	Other
+9c2aeee8-9f32-4d8a-b0a6-19c9f7aba952	1	\N	Other
+9c2af46c-2590-48e2-93bb-166455ec5059	1	Other	Other
+9c2afd4f-ff59-4811-9310-73bbb3ece0d8	1	Other	Other
+9c2b2a53-bc51-403a-b0a2-37ef17c98507	1	Other	Other
+9c2b3f9f-0d8a-48c2-9821-df5c1b8ad1d4	1	Other	Other
+9c2bd235-f3d3-4e0a-953d-db524de09532	1	Other	Other
+9c2bd896-2ede-456d-99d5-c44106f1342f	1	Other	Other
+9c2bf493-e1de-47c5-a26c-5f010a25618c	1	Other	Other
+9c2c1b18-0440-4ea7-aa8c-60a2fed36196	1	Other	Other
+9c2c3bf8-14b9-4dc0-b737-b5b084057023	1	Other	Other
+9c2c6426-12d8-435c-9bae-3c925ce8dd2a	1	Other	Other
+9c2ca503-bee0-4f3e-ab3e-8d9d381189ef	1	Other	Other
+9c2cb7ae-efdd-47fa-a6f9-be94d4bba058	1	Other	Other
+9c2ccd10-1c01-4fb5-ba8e-276960406032	1	Other	Other
+9c2cd5b5-96e8-4d41-8a3e-888d82001a43	1	Other	Other
+9c2d08ba-b584-412e-b360-036d1b9d1d49	1	\N	Other
+9c2d0eee-5953-4c51-88e0-8b13a0f703ed	1	Other	Other
+9c2d285a-9a42-4241-8285-66dcb342ff20	1	Other	Other
+9c2d3646-5b36-4204-aa14-d3ab69a59fc9	1	Other	Other
+9c2d9352-b097-452a-a41e-39d516395ad8	1	Other	Other
+9c2db044-3c4f-4405-8e92-edac1b37392d	1	Other	Other
+9c2dfa30-fc81-43db-ae83-e962394ae96b	1	Other	Other
+9c2e0715-2a88-4a57-8978-65b6a896d782	1	Other	Other
+9c2e11b7-40e0-4d65-9870-2cc6ebe8492f	1	Other	Other
+9c2e4e66-39bd-4d13-bcea-a41c02040546	1	Other	Other
+9c2e805a-50d5-4f5d-a2a6-36aad9a4c33a	1	Other	Other
+9c2ea0e0-ae70-4e98-ab95-949e46f68948	1	Other	Other
+9c2ec557-bca8-4e28-a9bf-9e0afd99e4bb	1	Other	Other
+9c2ed0e4-415b-45b0-8ebf-e2b628c0397b	1	Other	Other
+9c2eeab6-014f-4124-8ffa-ccf4293689aa	1	Other	Other
+9c2f39a5-b0f8-4d81-89e9-95b593e1eed4	1	Other	Other
+9c2f7ed8-ab9d-4ab5-b844-6f99c0b702b8	1	Other	Other
+9c2f9697-fb9e-4985-98e0-1d8e88d4011b	1	Other	Other
+9c2fd1e2-a987-401e-a362-e86d4e849cb1	1	Other	Other
+9c2fe03d-5784-4343-aa22-2cfcbda53ded	1	Other	Other
+9c3070ae-010d-4561-90b5-e526b18ae722	1	Other	Other
+9c30e5bf-6aed-47a1-81fd-03cd8eca397d	1	Other	Other
+9c30eb0a-060a-40a7-9fd0-cd7eb489d618	1	Other	Other
+9c310504-1d71-4e8b-815d-6cd40c0d8e8b	1	Other	Other
+9c312e12-2080-4a40-8192-309bad774a99	1	Other	Other
+9c3134f4-6ad3-47c1-86c5-abaa14538106	1	Other	Other
+9c313b24-82f6-4de4-9b66-844c8d3fd92c	1	Other	Other
+9c31647b-9ac5-426e-959b-70ce36d41c1e	1	Other	Other
+9c318e4f-8dab-4763-8576-85e143b37a37	1	Other	Other
+9c31ca47-cabb-4f96-854e-0d824f5a3013	1	\N	Other
+9c31d59c-00cc-4c99-b0f7-c5b1c78e8254	1	Other	Other
+9c31eb10-80ed-4a75-bb5c-b8a285b3e149	1	Other	Other
+9c321298-d10a-447a-a9f2-71026f8c9493	1	Other	Other
+9c321299-edac-4862-b512-521df5125af6	1	Other	Other
+9c3237e7-ecd9-41de-a550-822248bf1020	1	Other	Other
+9c324ea7-f9f3-4c02-b8c6-864d0d6340c6	1	Other	Other
+9c32523e-7e72-437b-a87f-53849cf82739	1	Other	Other
+9c3267cd-21cb-4628-aab6-ee9e4371ced0	1	Other	Other
+9c3275fd-eec5-44a4-bea0-399cfa2e5774	1	Other	Other
+9c3286cf-2596-4da2-a534-6d3a67ca75c3	1	Other	Other
+9c3297ce-35ce-4666-90c2-c8f0739a06eb	1	Other	Other
+9c32b591-a13d-43f6-89bb-a26af0d7666a	1	Other	Other
+9c330dc2-78fd-4f14-9d89-608782d6ff78	1	Other	Other
+9c333f24-ab87-4e13-8522-6e1cd1e692e5	1	Other	Other
+9c335a52-7dba-49b5-afce-0c98580e17bb	1	Other	Other
+9c338a16-ed18-4e71-803b-53b178d3f4d1	1	James	Other
+9c33b893-a326-4fde-91c2-2ea8c2de2a21	1	Other	Other
+9c342481-6c5e-4c2a-bb33-973313307ee7	1	Other	Other
+9c34260d-0506-437d-b663-ba1097b3ed16	1	Other	Other
+9c344dae-22bf-4bf6-acf6-5a7becac7457	1	Other	Other
+9c346f0b-12db-41ab-bee3-f190ebea87f7	1	Other	Other
+9c348fac-4a51-42bd-9d60-d1d8ff4b193a	1	Other	Other
+9c34dd1b-4e8a-4be5-96e0-53c673007b14	1	\N	Other
+9c34e702-c090-41d4-b9db-9247a6e1c453	1	Other	Other
+9c34fdd8-652a-4dfd-875d-ca61705a42c5	1	Other	Other
+9c3533a4-8b5f-402e-aa99-c8f711b17617	1	Other	Other
+9c356b7f-d766-4a76-a8d5-772cf042caeb	1	Other	Other
+9c35895b-707d-40e7-91d6-a1c5e7846043	1	Other	Other
+9c35dc35-86dc-4cf9-a902-cd7ec01baa6e	1	Other	Other
+9c360bf9-2b7c-42d1-b367-c102c086a400	1	Other	Other
+9c3626df-f790-4e4e-a654-36e252151adb	1	Other	Other
+9c362c56-dee0-461f-98ef-48ada96adc38	1	Other	Other
+9c36376a-ae30-46f9-9e90-622fcec7ecc4	1	Other	Other
+9c364b13-c784-49ce-ad64-02e3f60ed235	1	Other	Other
+9c36579b-6c0b-409e-82c5-33fcbdf9f1d4	1	Other	Other
+9c366f12-3c7f-4b19-b796-6cd60d3799b0	1	Other	Other
+9c368c13-b15f-4503-b2f6-25b5e5a63c6a	1	Other	Other
+9c36da5e-470d-4668-bbea-6cfc5c3cefc6	1	Other	Other
+9c36e651-010a-4cfc-a6a3-37c3a303b0f9	1	Other	Other
+9c36f08d-9644-4d9d-8fb4-0023c4ad0a77	1	Other	Other
+9c37573f-05a6-492a-8bad-4818759a500b	1	Other	Other
+9c378cbc-243b-4524-be9e-73c0095e8556	1	Other	Other
+9c37985e-9e0e-4bff-b3e2-917b368ee840	1	Other	Other
+9c37cdd2-5e62-451e-8a93-d766afc8687a	1	Other	Other
+9c38b6ff-feb7-4d9b-bcaf-e93441faf5b4	1	Other	Other
+9c38e3b9-b1e5-4cac-b74b-c469cce061fa	1	Other	Other
+9c39223e-e745-4af5-bfff-a8e8b2c33133	1	Other	Other
+9c39395f-f1a7-4c03-99f1-1ee1839339f1	1	Other	Other
+9c39acac-4dfc-4351-bd4d-dd0507832f81	1	Other	Other
+9c39bb54-bcd4-451e-917e-93f3b27e8f27	1	Other	Other
+9c39d4c3-37da-4f7c-a2b3-035b5d84c77d	1	Other	Other
+9c39e548-c793-4f23-b8df-b867de8875ad	1	James	Other
+9c3a03d4-8acf-492b-9963-2cc5ed752485	1	Other	Other
+9c3a044b-1727-40e8-9ba0-602b2e6667a8	1	Other	Other
+9c3a5d87-320b-416a-980a-e754e261879a	1	Other	Other
+9c3ab900-fc8b-46fb-b691-daf44ad1eaca	1	Other	Other
+9c3abd59-675f-41a8-b76f-39f3bb0fa038	1	Other	Other
+9c3ba100-a326-4478-bc8d-784622705ed5	1	Other	Other
+9c3ba49d-154a-47b1-b7a9-dbdbd7739027	1	Other	Other
+9c3bb4fc-b0ba-45ab-b350-904cea9e58b4	1	Other	Other
+9c3be260-63fa-473d-9368-7bf85ad439aa	1	Other	Other
+9c3be52d-bc57-4e4e-90a5-e187bc3d252a	1	Other	Other
+9c3c58f3-f383-4d08-a8f5-22dee1794c10	1	Other	Other
+9c3c80b1-79ea-4a78-86a1-1c99ea5fc04f	1	James	Other
+9c3c82c2-5d03-48df-93af-db7ed49cbe72	1	Other	Other
+9c3c8c88-614f-4788-849c-eacbaac2c43d	1	Other	Other
+9c3c8e44-a44f-4634-a1fb-2d5a74cc4328	1	Other	Other
+9c3cebb1-d545-4be2-b274-740109834fc0	1	Other	Other
+9c3d0ff5-6e0d-44b7-8a11-28a57ba888b2	1	Other	Other
+9c3d52f4-bc88-43f3-b9c8-54e970d320b4	1	Other	Other
+9c3d81fe-c7ae-4f48-8dd6-4a0c660ce137	1	Other	Other
+9c3da48b-2901-45a7-aa04-950c8a5958db	1	Other	Other
+9c3e0247-c0af-4c6b-a01a-63a9050b35ae	1	Other	Other
+9c3e0ce6-8fac-49b8-84ac-d451aea882ac	1	Other	Other
+9c3e13a3-5aca-465e-8074-f5b749be3123	1	Other	Other
+9c3e89b8-44c3-4ed2-863c-f227efc1ea1c	1	Other	Other
+9c3e9b51-b956-4204-bd9a-c5cbd34a8575	1	Other	Other
+9c3eab8c-b3cf-4c4a-910c-6ef7247b518d	1	Other	Other
+9c3ebb8d-415d-456c-a638-34bc68c05603	1	Other	Other
+9c3ef637-917b-41a5-b6eb-2d1417e6ad4d	1	Other	Other
+9c3f0b84-d367-48c3-92d9-92fa23b5021f	1	Other	Other
+9c4012a3-13e5-4be9-9b78-dc2c73c43ebb	1	Other	Other
+9c410914-bbfd-4109-a15e-6264bbcaf61d	1	Other	Other
+9c4111af-2479-4afe-b572-2de2c91e47c1	1	Other	Other
+9c41b3e6-705c-4a41-8245-e1592fa4fcb7	1	Other	Other
+9c41d385-24b4-4b8e-96ed-fcb119a31148	1	Other	Other
+9c41f706-41a2-48f3-8f1a-1ca0e3bbc022	1	Other	Other
+9c422070-3ffa-4ea3-a44a-5842c1d4fb6e	1	Other	Other
+9c422ce8-801f-45bc-946d-61ed3ac61fbf	1	Other	Other
+9c4254c5-62fb-460f-8406-f16ac4a4f1b0	1	Other	Other
+9c42a435-a844-4add-a870-5324e23c0986	1	Other	Other
+9c42ad8e-e45f-420f-b32e-c622a9e6512e	1	\N	Other
+9c42b29d-9576-4ed0-974b-32052c40329f	1	Other	Other
+9c42fad7-dacc-4e22-ab79-7b18128ac4a3	1	Other	Other
+9c432d69-657e-49b2-a1f9-f7641697c8cc	1	Other	Other
+9c43a904-b570-46d2-bf8a-8101809ee0cf	1	Other	Other
+9c43b3e4-7c53-45fd-a9ad-0ef44e45840b	1	Other	Other
+9c43e0bd-d7a5-4b3b-8f9f-866dbb2aae64	1	Other	Other
+9c43e441-b68f-40c6-8f9e-4ce53bfbae9e	1	Other	Other
+9c44092a-8808-4240-aaab-28ed8a7518c7	1	\N	Other
+9c441d08-967a-43f6-a7ec-5f768943c415	1	Other	Other
+9c442d43-febe-419f-a1c7-54885bebf265	1	Other	Other
+9c445e15-af69-4371-bcb6-e1ca9e1dfc50	1	Other	Other
+9c44bb75-9ab8-45fe-9f5f-b3b8d5e54f0e	1	Other	Other
+9c44c167-ca8e-4a47-8e19-282f85d8ca43	1	Other	Other
+9c4504fd-f8bc-4741-834e-a8305588e40e	1	Other	Other
+9c456b40-d6da-4619-9c70-3a7e10f5ad89	1	Other	Other
+9c457685-84ab-45e3-b3d7-161a85de0e8a	1	Other	Other
+9c45947f-bf59-47c3-8252-5809c4a191fa	1	Other	Other
+9c45b93f-f570-48d7-b608-980cc3c2a13a	1	Other	Other
+9c45c8b3-0095-4824-b295-c3e176c446e2	1	Other	Other
+9c45c8f0-ac26-47f9-85d4-b132e4f8f2c3	1	Other	Other
+9c4608aa-15cb-4672-89d2-9e98f3b18cc7	1	\N	Other
+9c46489d-4019-46b3-a6ba-4636a4c1d57a	1	Other	Other
+9c467f36-93f8-4244-bdbd-57fd87b05ffe	1	Other	Other
+9c46857a-e54e-4273-ae21-9edbe2ea2bfe	1	Other	Other
+9c468d0b-e627-44e1-ab60-760854b69c15	1	Other	Other
+9c469192-20c2-4560-86c2-47a41a54ac95	1	Other	Other
+9c46d348-8e68-45cb-86fc-88f551316da8	1	Other	Other
+9c46d961-8409-400c-b7d7-b3ec7fcd4aa4	1	Other	Other
+9c46da98-85e4-44e7-90b2-3a87ea272d7b	1	Other	Other
+9c473aca-4f2d-4654-9d5b-5fe5414496b5	1	Other	Other
+9c473fab-e997-4d2d-b995-49494fe8834e	1	\N	Other
+9c47b351-37c8-49ce-a195-4bad8910e6c0	1	Other	Other
+9c47bb45-359a-4baf-9d4b-fb7d131adcb1	1	Other	Other
+9c47c355-5e10-4cb5-8d3f-d78e1c7b6669	1	Other	Other
+9c480a0d-21b6-4b0a-bac1-4476d0f23052	1	Other	Other
+9c482d71-c535-4105-99df-0ab39e30b078	1	Other	Other
+9c483279-bedd-45d3-a5ac-cb29c9a61d1d	1	Other	Other
+9c48f4a5-3429-4af8-8378-16bb72a7b48e	1	Other	Other
+9c491f28-7e0c-40af-b12b-f0cae4519b2f	1	Other	Other
+9c4939b6-1f5f-4709-92ba-a81023419101	1	Other	Other
+9c498cd7-2a3e-4175-9f7a-e4b7f4c001d1	1	Other	Other
+9c49b689-965f-4f1f-8c94-c0dfe6149ce0	1	Other	Other
+9c49cb56-679c-4b8c-96af-cd7f9adc5304	1	Other	Other
+9c49cbc7-c7d1-4b49-a6af-bbe1a4066279	1	Other	Other
+9c49f15b-f152-401f-b58d-5186ae05d156	1	Other	Other
+9c4a09c2-ebae-4878-91d1-0af3310285b3	1	Other	Other
+9c4a1558-6408-46e6-ad71-6077a3259524	1	Other	Other
+9c4a2380-b566-4693-b88b-22404c37d0f9	1	Other	Other
+9c4a7c7d-5b44-4a71-a683-3324035ae644	1	Other	Other
+9c4ab717-3d0f-4d83-89fb-909db6136c16	1	Other	Other
+9c4aba52-0797-4930-8e2f-837fa420b76d	1	Other	Other
+9c4b68a4-b36d-4cff-8c12-c2ed42c28af0	1	Other	Other
+9c4bebce-cc26-4dc9-9c0e-a4e5642f4866	1	Other	Other
+9c4bebd9-adc0-455a-a9da-b3b149e3038d	1	\N	Other
+9c4c397d-e639-4ef1-a563-30aef0943241	1	Other	Other
+9c4cac31-eef2-458d-a379-06c07d06678d	1	Other	Other
+9c4cfcee-c947-4bf9-a505-3b732b9a7d80	1	Other	Other
+9c4d47f7-bc63-473e-add2-672a80dd2372	1	Other	Other
+9c4d4ca8-7648-4f23-bcc9-c9791a42050a	1	Other	Other
+9c4d711b-f5de-4949-ba64-e75d725496a7	1	Other	Other
+9c4d9344-c842-4dae-bea0-dff6b685ecc0	1	Other	Other
+9c4dd8ac-adbe-4161-bc59-3a16ccfd105e	1	Other	Other
+9c4e7302-7335-445f-a193-8c20fd507a3b	1	Other	Other
+9c4e83f5-3ab2-407c-96f5-c7d662408804	1	Other	Other
+9c4e97c6-deac-4008-a331-1b2d0bb30ca1	1	Other	Other
+9c4ebd37-fba8-4a7f-9d67-fcc8500aff21	1	Other	Other
+9c4ebecf-ace6-4664-9def-418f5d4c7803	1	Other	Other
+9c4ec2e4-6cde-4495-b67b-e1c8677f968d	1	Other	Other
+9c4ecf43-5651-4d6f-8601-52259ce866cb	1	Other	Other
+9c4ee821-a479-4b59-a1a2-58958a4b5ed5	1	Other	Other
+9c4f04e6-111f-11e8-8f19-fa163e8624cc	1	\N	Other
+9c4f0994-3d96-40a7-b135-a68ddcd69e00	1	Other	Other
+9c4f7cee-6b52-4505-a684-87367d816029	1	Other	Other
+9c4fb296-568a-46d5-afe4-4aaa87b86538	1	Other	Other
+9c4fd831-8669-4606-8e63-2dbb4627a3be	1	Other	Other
+9c4ff420-027d-49b6-a440-9e94fec91d96	1	Other	Other
+9c500b5c-5989-4d18-9a5e-7166d0d7ac20	1	Other	Other
+9c502c37-904f-421a-8975-106546f85993	1	Other	Other
+9c503094-dd3d-456b-9c12-d3e25b4ad1cf	1	Other	Other
+9c50740d-766c-4cfe-bd1a-f6d44bdb1bf9	1	Other	Other
+9c508e97-71e9-4383-9fbe-3b7e7cfb535d	1	Other	Other
+9c50a5a3-5f4d-49c6-b89e-648397807bc6	1	Other	Other
+9c50b751-aff9-428e-a2d8-575d4ebb603c	1	Other	Other
+9c50f2a9-20e9-45e5-8243-6228f09be648	1	Other	Other
+9c510365-3e44-436a-b7e4-0b72ced872d0	1	Other	Other
+9c51139b-ec37-49ab-8f18-079c3812b546	1	Other	Other
+9c51268e-6327-4f9c-979a-cbd48b18601d	1	Other	Other
+9c513c84-9668-4f86-a9d2-ce9bcd5d126d	1	Other	Other
+9c5146c4-e49b-4ad4-9bfe-c845eaf51785	1	Other	Other
+9c5149ee-8917-43fd-8e61-86a1e2d9dc28	1	James	Other
+9c515768-9055-4e46-a9bb-bdcb28081207	1	Other	Other
+9c5161b0-0026-404e-99c6-dcfb64740434	1	Other	Other
+9c517129-57e6-4b37-8799-f305ad9c8e67	1	Other	Other
+9c51a824-c4b2-4d26-946f-be94a29ab685	1	Other	Other
+9c51b7ff-3f43-457d-8e19-33879b716c3a	1	\N	Other
+9c51ee54-5388-4048-a29f-293c2d27d34f	1	Other	Other
+9c5205a3-ead3-46fd-86e6-cefad6eefe28	1	Other	Other
+9c520ab7-fe97-495e-bb4a-bc1692557e5b	1	Other	Other
+9c520be7-0931-48b1-b328-26dc6584e623	1	Other	Other
+9c52a4f0-a784-4581-b0e8-efaeb8d85c8c	1	Other	Other
+9c52d067-2a8c-48df-a977-edadf00ffd46	1	Other	Other
+9c52ecc8-8e7b-42b2-a64d-6ed3270c9a65	1	Other	Other
+9c5300f8-1cd2-42a9-a783-740b71e96de3	1	Other	Other
+9c53e04a-e351-4f2c-bda3-1b3db10887bb	1	Other	Other
+9c53ee82-9c5a-4b78-8b32-c74b575b68d9	1	Other	Other
+9c543849-d098-4cf2-a097-9161c26791c5	1	Other	Other
+9c546302-1546-452f-aaee-fd32e740807c	1	\N	Other
+9c548e57-02d7-456d-99ee-c21a84b31e16	1	Other	Other
+9c548ff6-60b3-48bc-b9da-3e476ac988df	1	Other	Other
+9c549fc8-461a-4fb1-a38f-c8769ca27d7c	1	Other	Other
+9c54f031-7d87-4cb8-8dda-dc3b4b89bc6f	1	Other	Other
+9c558406-2daf-4f0a-8196-a4623baabb36	1	\N	Other
+9c55e85b-eb34-4bfa-b898-3e46951977dd	1	Other	Other
+9c55faae-a7c8-4c2b-a41f-6826d0fbc4d5	1	Other	Other
+9c565029-adbf-4c5c-9d98-9aae7a8daed1	1	Other	Other
+9c566738-ea9d-4203-80ff-befa6323c5b9	1	Other	Other
+9c56845b-1f06-42f9-9d64-195b0cb475b2	1	Other	Other
+9c56c48d-cdd4-4c74-9adb-4c792060566e	1	\N	Other
+9c57349c-2994-42c7-8ad2-3d630359fa57	1	Other	Other
+9c575b8d-d485-4f0d-b20c-81a34d64bce6	1	Other	Other
+9c575c9d-04d6-4fcc-95e0-9f26bcaa46c6	1	Other	Other
+9c57aac8-7362-4c1c-82e0-d48a305f015f	1	Other	Other
+9c57de20-e85b-485f-a865-01923c2bf1f5	1	Other	Other
+9c58394e-5565-4928-995f-8656998d7254	1	Other	Other
+9c58a2fa-54ac-46fe-a7d5-72246646c639	1	Other	Other
+9c58c173-8d8a-49e6-8509-47c037a3e442	1	Other	Other
+9c58f552-0c42-4ef7-9686-b6c49d1db3c9	1	Other	Other
+9c58f66d-f0ce-4458-81fb-eefd30127c6e	1	Other	Other
+9c591df1-a8bd-4b36-bc5b-90df0a99759c	1	Other	Other
+9c591ef4-38be-4833-9b3d-19a9e938fbcd	1	Other	Other
+9c593499-c4d1-4ce2-863f-375d207d06b0	1	Other	Other
+9c596776-ec9a-4769-b092-f5685cb17c96	1	Other	Other
+9c59e91d-39ab-4952-958b-7e05114f3d2e	1	Other	Other
+9c5a2945-6efa-46ec-a7c8-87b07cca5b04	1	Other	Other
+9c5a8208-b139-45f8-ac16-c3c60da4257d	1	Other	Other
+9c5a9e53-2a54-4caa-81c7-4a8f4c617f7f	1	Other	Other
+9c5ac930-d5df-493a-a03c-254926316dd5	1	Other	Other
+9c5ae81a-d118-4ea3-bb3e-59ed40320a90	1	Other	Other
+9c5b08c3-4508-4e14-9134-2786c39f9a45	1	Other	Other
+9c5b0d15-9efd-4165-909a-be2f2364b591	1	Other	Other
+9c5b188b-1479-4dee-90db-87e81dbb73d7	1	Other	Other
+9c5b55c7-6ff4-4787-af69-9a72c82fd33a	1	Other	Other
+9c5b9990-9cb5-4a09-976e-6a944770ffb3	1	Other	Other
+9c5ba64f-6b31-4195-9e48-1fd54225058b	1	\N	Other
+9c5c31f7-4b01-4048-a9dd-4aa79b49ec87	1	Other	Other
+9c5c420a-29ee-4412-8fa1-af2afa45e1dd	1	Other	Other
+9c5c5258-8065-4a0e-bdc6-382a567d2f42	1	Other	Other
+9c5cc353-c45a-40d2-9297-592f84c306a1	1	Other	Other
+9c5d1d06-5b5b-4182-8534-efa40b4298b1	1	Other	Other
+9c5d5ce7-4cc2-4f89-8606-eb954d8040f6	1	\N	Other
+9c5d72ec-8eb0-45f1-9a7d-c593fa871a26	1	Other	Other
+9c5d8900-cd38-404b-a899-2c0a225711c2	1	Other	Other
+9c5da8ae-fc05-49a7-a8c9-6be005fd63aa	1	Other	Other
+9c5df45c-ab3c-436f-9864-d6d106e9e73e	1	Other	Other
+9c5e1133-d6fd-4747-8b57-441008bf7926	1	Other	Other
+9c5e5ffb-ccb3-4be0-aa94-2cd66fb1e53e	1	Other	Other
+9c5e8005-2f76-4e67-9e7c-3c2388637b1d	1	Other	Other
+9c5e9020-42c3-4a57-af87-0d2e9397eaf0	1	Other	Other
+9c5e957c-7a50-4607-9647-18cff0b9b1f0	1	Other	Other
+9c5ef752-ce2a-44c2-a946-81baf66b0223	1	Other	Other
+9c5f2127-56a0-494a-a0f6-3c6dbda86506	1	Other	Other
+9c5f4bbf-3d56-44e0-97b9-91ade054326d	1	Other	Other
+9c5f651f-b6aa-470d-8915-70e68b10d912	1	Other	Other
+9c5f92a0-6d30-4d7c-8b5a-74b6d5cf7270	1	Other	Other
+9c5fdafd-7edf-4dad-a134-4bd318e95c69	1	Other	Other
+9c607891-23dd-4aca-a458-c1d9541d26d9	1	Other	Other
+9c609810-e40a-11e7-8262-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+9c60bf98-c83f-44b7-9229-0ebff601c722	1	Other	Other
+9c6123f3-b333-48c8-8654-55413128e684	1	Other	Other
+9c615ab9-cee7-4b67-b7ba-d0fde370e0fb	1	Other	Other
+9c619f6c-9702-11e7-9c7f-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9c621980-48b2-4858-9cd3-6f3a35241cd1	1	Other	Other
+9c6232a3-5a0c-4580-92c9-027e28287d94	1	Other	Other
+9c626243-cc5a-4f5a-bbb5-9dd6c4639c04	1	Other	Other
+9c629f38-d3ee-4c02-a809-1e6b2aa255d0	1	Other	Other
+9c62c75d-1359-4afe-8668-a1b4a8c98b47	1	Other	Other
+9c62d203-c45d-41ab-b1ef-da6c3cc883d9	1	Other	Other
+9c631dac-730b-4c89-9023-f68f0f41b1c9	1	Other	Other
+9c6320cf-5200-41a1-afa8-1b2d6391068e	1	Other	Other
+9c632e11-ccba-4bf6-8f33-2e16b7eb8880	1	Other	Other
+9c632e63-7717-47f7-9d11-68a846b25711	1	Other	Other
+9c635066-3d3e-4dda-98e2-2c9b522b8f61	1	Other	Other
+9c63761f-2e93-48a7-b873-02dc31be9b6e	1	Other	Other
+9c637da5-d166-40c6-a8e4-1f4bf85f65b5	1	Other	Other
+9c638602-f960-4f3e-a03a-57e6facd53c1	1	Other	Other
+9c63962c-e280-4fda-9c3f-401f0fa67825	1	Other	Other
+9c639ad9-d5a7-4dbb-9d5a-8f1cfc48b079	1	Other	Other
+9c63ac52-53ec-4e0b-a8f1-af78c3059874	1	Other	Other
+9c64292e-a370-48c6-9a7e-5334de687db2	1	Other	Other
+9c643d3a-8085-46e0-8541-488085f87f59	1	Other	Other
+9c649d02-6711-4449-8992-800f963565a8	1	Other	Other
+9c64f653-e82c-45a8-8a89-72fbd2e71a36	1	\N	Other
+9c650ddb-6b9e-49dd-9e02-add9e2abbea9	1	Other	Other
+9c656bb1-5000-4e26-bf14-f313ca4e752e	1	Other	Other
+9c6572d0-e867-483c-97d4-df377bf3289e	1	\N	Other
+9c658789-339e-49ce-b169-12d31fb54e85	1	Other	Other
+9c658b28-a64e-4ad2-b966-f6f548e632c0	1	Other	Other
+9c659f49-3766-4451-9f92-1b1deaf30856	1	Other	Other
+9c65b052-196c-4bf2-8bc6-e7c44230d35d	1	Other	Other
+9c65ed39-413d-4c8f-a5de-ad4c161d1a08	1	Other	Other
+9c665275-3db7-4cce-8ec5-1ca2591f0168	1	Other	Other
+9c667e40-e78c-4687-b614-2a7ca27a12f1	1	Other	Other
+9c668fad-280f-4c44-8670-3b85ebd57a15	1	Other	Other
+9c66bdb1-e202-428e-b3bb-fdd00ce44033	1	Other	Other
+9c671c1d-bf1a-4655-bb0a-dec8d20245b4	1	Other	Other
+9c6734d7-240e-4493-8a4b-1e95dea830ff	1	Other	Other
+9c6770a7-9f33-4521-8432-e34402b179d7	1	Other	Other
+9c6784a8-badf-4d0d-917b-f58e54a22d2d	1	Other	Other
+9c67c108-6cba-4e78-8b08-93d487f6150f	1	Other	Other
+9c68149a-878c-4d2e-b7bd-d39e3c180520	1	Other	Other
+9c685302-d996-44f7-9709-75d55942c6c4	1	Other	Other
+9c687e5d-e02a-425d-9b87-d909ac6ca267	1	Other	Other
+9c687ea5-1552-4973-8c15-9315f8fa92cf	1	Other	Other
+9c68b718-b36e-45e9-acc2-a519f2fe53f8	1	Other	Other
+9c690925-281c-4389-891c-645d443c376b	1	\N	Other
+9c698559-7fff-409a-9809-d4b919af5f55	1	Other	Other
+9c69d024-1a18-4015-8a0a-d467b3db72d7	1	Other	Other
+9c6a065a-b7fd-4b03-bdda-6c75ed683e79	1	Other	Other
+9c6a2bf5-ceb6-4ad8-90bf-0e8b9f171b55	1	Other	Other
+9c6a5cb7-2e2b-4902-9884-147f66caf1e5	1	Other	Other
+9c6a67de-a5cb-4081-b525-9559a8e1998b	1	Other	Other
+9c6a9866-9501-4478-a696-4a65ce67b6c0	1	Other	Other
+9c6aea7a-8dbf-4c57-9e9f-6eaa3f15f471	1	Other	Other
+9c6b26a2-5e14-4484-bb72-293d38e8a48b	1	Other	Other
+9c6b2fa2-c56d-4467-a139-f9780d376dd8	1	Other	Other
+9c6b3111-f96e-4235-a29f-a77938ab4a74	1	Other	Other
+9c6b4ca1-c98a-47c5-bd5e-4f987e48fc7c	1	Other	Other
+9c6b796a-1d1a-4593-a8f1-f1dd7154385e	1	Other	Other
+9c6bc9c6-7882-47fa-9fea-dfff6cbe08a6	1	\N	Other
+9c6be5ec-580c-4573-8f5b-50f3f1da1de7	1	Other	Other
+9c6bea7d-f9e6-436a-af02-94603869d59e	1	\N	Other
+9c6c0093-233a-43da-a396-509a50accbfa	1	Other	Other
+9c6c4fd6-92d5-4013-9b95-9a17d2fc4313	1	Other	Other
+9c6c57f4-95bf-44f2-9b82-dc5297c90b10	1	Other	Other
+9c6c9d3e-d105-44ce-89a2-e3739b0b3e5a	1	James	Other
+9c6cb666-e4bf-409b-b6d8-d0491e8c12c0	1	Other	Other
+9c6d443a-d811-41fc-b6a8-102a87a22bbc	1	Other	Other
+9c6d46df-355c-430e-aaad-ff4b41615072	1	Other	Other
+9c6d9070-418d-48de-bfbe-42302aeab25b	1	Other	Other
+9c6dbac9-7021-4f8d-9ec2-7d0d4b580cfa	1	Other	Other
+9c6dbead-d747-4010-a72e-fc7ddf83a7b1	1	Other	Other
+9c6dd00d-aa09-41c2-89d8-1d34e57629c4	1	Other	Other
+9c6df9d9-25d6-4cc7-b434-fa7e52b6ea0e	1	Other	Other
+9c6e7242-3a05-4f0b-82ab-73288fd25b89	1	Other	Other
+9c6ecb73-14dc-45d7-aeb8-f33118780af3	1	Other	Other
+9c6ee2d6-9be7-40af-9588-5aa554eb4549	1	Other	Other
+9c6f1e17-a101-45dd-9a45-540571a0737a	1	Other	Other
+9c6f8ac5-e68f-48a1-a36a-2fc0538368d7	1	Other	Other
+9c6fb228-833d-4801-afed-adba3a9ab524	1	Other	Other
+9c6fc326-0673-44bc-8ae4-c829191dd8ae	1	Other	Other
+9c6ffc38-22bb-40cf-933b-aa280047443b	1	Other	Other
+9c700fb3-1907-4127-929e-e64c8a32327e	1	\N	Other
+9c7023d3-01d6-40ee-bbf1-865f7ea3bc26	1	James	Other
+9c703d3d-151d-467f-8840-8890544b4fc8	1	Other	Other
+9c703fa6-34ba-410f-b339-d1b26238831a	1	Other	Other
+9c708338-f57a-484e-b0d3-d58986b9047e	1	Other	Other
+9c70864c-f373-4293-a064-76b62952d1ca	1	\N	Other
+9c70a60f-a7e2-404f-b46e-63312f39f177	1	Other	Other
+9c70c1c7-822d-4775-99e6-aba8da34a00d	1	Other	Other
+9c712e88-52e5-4a24-9941-e0c05c98c2a5	1	Other	Other
+9c7145c6-a905-4501-b997-da1031b9aaf3	1	Other	Other
+9c71846b-7ded-4388-9901-31fee4e32261	1	Other	Other
+9c718c7f-5567-4c7c-9e5b-5b3c77c214ba	1	Other	Other
+9c720304-8832-4ee1-9bcb-540ddbd20dce	1	Other	Other
+9c721cf5-4a21-450b-b007-3ad1995fb362	1	Other	Other
+9c722ad7-a994-464a-a215-b755c25e6e7b	1	\N	Other
+9c726699-137d-4d4c-99a6-6263eb96021c	1	Other	Other
+9c727955-1650-41ce-a793-dc4279c763b5	1	Other	Other
+9c728c98-b155-43b2-a291-09536a2536fe	1	Other	Other
+9c72ad27-b6f2-4190-a2d4-5b62096efaa1	1	Other	Other
+9c72b67b-d84b-459b-9396-e7d311f430bf	1	Other	Other
+9c731986-804e-4603-aee3-736dd9cc9f54	1	Other	Other
+9c734758-fb8f-41eb-8b8f-e54e7bc21d6b	1	Other	Other
+9c7362e9-8350-48cc-9b00-87b5c8c64005	1	Other	Other
+9c73756e-c548-4e80-85e6-092fc41d884f	1	Other	Other
+9c73945b-1207-45c9-a919-7e8d27e498c7	1	Other	Other
+9c73de44-6592-445f-bdd9-86e6d0734826	1	\N	Other
+9c742b2e-ac58-4300-a784-fe8047ed9abd	1	Other	Other
+9c74359f-5e92-456a-b472-5a4220b32e10	1	Other	Other
+9c74464e-21fb-4835-a5d2-2bb4b9f673c2	1	Other	Other
+9c7449be-f2ca-423f-9b5b-2e2c704d8ff7	1	James	Other
+9c745ce6-8213-4696-8a9d-edfd5e7de546	1	Other	Other
+9c7472c0-6e63-4ffa-b7f3-bc57e60b6b42	1	Other	Other
+9c748373-cdc6-4da6-a51f-f3d450f26092	1	Other	Other
+9c748851-9417-468f-b7f8-fedb70e147c0	1	Other	Other
+9c749912-c6cf-4f1b-976a-e3914f323c32	1	Other	Other
+9c74b075-17a8-46e8-81fe-799122fcf4c4	1	Other	Other
+9c74bb94-f9e4-4ab5-9f20-4871a08b05cf	1	James	Other
+9c74bd89-ff10-4d82-941a-3d0dd4614241	1	Other	Other
+9c74ee3e-02f2-4666-aed9-87decded1569	1	Other	Other
+9c74f55f-313d-47d0-a749-a645e6318263	1	Other	Other
+9c756d07-8058-4f2b-9993-e5884cb48d83	1	Other	Other
+9c756fb9-6ee5-40ec-98c4-a0cfc4f2ed07	1	Other	Other
+9c7577c5-13af-4a79-b347-e6b6a3a65475	1	Other	Other
+9c758052-3e0a-4d19-900d-d15d97ecc3a6	1	Other	Other
+9c75de41-1115-4681-a964-54fa332aee2a	1	Other	Other
+9c76318d-9079-438d-9ac4-75ec53fa252f	1	Other	Other
+9c7636e7-27a4-47ca-9fef-8d13adf9e237	1	Other	Other
+9c7649f5-ff84-44d8-b540-06feeaf7cb49	1	\N	Other
+9c76bdaa-2edd-4c73-8609-deddac212d5e	1	Other	Other
+9c772492-9e1e-41c8-b695-5e8100d46e3c	1	Other	Other
+9c77f90c-9d56-4f3d-ac40-fbf5d27d05aa	1	Other	Other
+9c78080d-a7d7-4245-9ecc-02a5aadf1219	1	Other	Other
+9c781451-1cec-429a-bf9b-6ba7771157a2	1	Other	Other
+9c7824d9-22a8-4b44-b6c6-22f03f4c784e	1	Other	Other
+9c785a5b-5310-4f4d-b5ae-22910f33889a	1	Other	Other
+9c787d3d-24c3-4615-b7bf-7fd60b28f9c6	1	Other	Other
+9c78a530-e170-4206-aa9a-7d017f6ca533	1	Other	Other
+9c78ba81-06dd-494d-bc17-851a158b39ef	1	Other	Other
+9c79736b-8e13-4a2b-861a-db000686444f	1	Other	Other
+9c7999f5-315e-40e0-a89e-168954641c7b	1	Other	Other
+9c79e686-4729-41af-917b-955250b06834	1	Other	Other
+9c79ecf0-fb82-45ce-8569-57b819f8674c	1	Other	Other
+9c7a1e52-f386-4510-b9e9-21416732d516	1	Other	Other
+9c7a6f81-49b9-4fff-966d-07bc09a7d3f5	1	Other	Other
+9c7a7514-fe1d-48a5-926e-1a5c70aca162	1	Other	Other
+9c7a886f-cd96-479f-b340-f13918993d9b	1	Other	Other
+9c7ac42f-81a1-42fb-91d3-9cfc70df136d	1	Other	Other
+9c7b072b-6b2c-4ddc-9ad7-9ae8992ec96d	1	Other	Other
+9c7b95c5-d33b-4ebb-8a69-b5c4a2303109	1	Other	Other
+9c7bcf1c-3e7f-4a07-b483-40bcc02cee91	1	Other	Other
+9c7bd32b-c3e3-4c1c-8bf8-c55874e0d5b4	1	Other	Other
+9c7be9d1-f810-49b5-9e6e-41b9473952c0	1	Other	Other
+9c7c2338-4033-458c-a4b5-7d5ea9ddd6cc	1	Other	Other
+9c7c252a-da70-4112-b626-e8e1b25eed5b	1	Other	Other
+9c7c7767-f255-4944-b752-0d4d9a72ccf4	1	Other	Other
+9c7cb6f7-3901-4792-a1d2-b2a38c6984f0	1	Other	Other
+9c7cbc37-4c92-4238-bb65-d0fcd8042260	1	Other	Other
+9c7ccb20-0b89-4e81-8734-10835f5c7638	1	Other	Other
+9c7cf807-5406-4cf6-a9cc-2f768144250c	1	Other	Other
+9c7d0f35-807a-434e-921b-12e662130d7a	1	Other	Other
+9c7d69b3-50cd-4457-8f32-1212dbea13cb	1	Other	Other
+9c7dbc5d-668f-4120-ba21-7b338decc694	1	Other	Other
+9c7dcdf6-74b4-419c-956a-98f47290566b	1	Other	Other
+9c7de42a-e329-4b17-aec9-1fbe3ea7152c	1	Other	Other
+9c7de67c-f83f-4f58-a7a6-0bae611c204e	1	Other	Other
+9c7e07ac-636a-454c-aa37-616a4536b00b	1	Other	Other
+9c7e481a-a955-42c6-a328-8454e5abd6e0	1	Other	Other
+9c7e6364-8e12-4a9a-a7b2-3cf125dd190a	1	Other	Other
+9c7edc2b-81cc-436a-a3f2-a7b99393045c	1	Other	Other
+9c7eec2a-0835-4fa1-9b8d-23aa9ff57eba	1	Other	Other
+9c7f22a0-e461-4064-9c94-82f0c0a82c84	1	Other	Other
+9c7f281c-5af1-4d1c-b88e-8db5eba1f9a9	1	Other	Other
+9c806b10-e91d-4531-b668-ac7707bf44fa	1	Other	Other
+9c80a083-0bad-4d55-9a85-aacd5b774a3c	1	Other	Other
+9c80aced-73d8-4797-bd3d-45f789c1f3b2	1	Other	Other
+9c80ec6b-0687-4f1d-8c2f-af95b4fc22c6	1	Other	Other
+9c80ee23-3602-4dd8-a79d-5067169fdcff	1	Other	Other
+9c80eea1-94bf-4e57-a500-7924ca097339	1	Other	Other
+9c813067-a71f-44e7-a771-bd477049b8a0	1	Other	Other
+9c81824e-721a-4a0b-a346-c040cfa366a4	1	Other	Other
+9c818975-4295-4089-937f-2773f741fbd6	1	Other	Other
+9c8190b6-82ae-4326-8315-9a837f3680d1	1	Other	Other
+9c819c23-4dae-412e-8637-35092300d3bf	1	Other	Other
+9c81eeea-80c1-4f2a-90cc-de8bca44e70c	1	Other	Other
+9c82280b-2bb5-4d56-ab7a-e1c05cdb5030	1	Other	Other
+9c829000-7e86-4ca8-a45d-b476d187456e	1	\N	Other
+9c82d2b0-84d3-446d-82d2-934923029ec2	1	Other	Other
+9c82fc77-458f-40cc-b5fa-6f68b27ff452	1	Other	Other
+9c830044-6f42-4011-9da6-18da2c545a8a	1	Other	Other
+9c834d25-fb00-47a4-b521-287dbc0b178b	1	Other	Other
+9c8377a2-d419-4fff-b18d-37de12f27e98	1	Other	Other
+9c83b8e7-2543-47dd-bc4f-66bd57aaf7cb	1	Other	Other
+9c83c8dd-c56c-4501-ae31-ecae978558a5	1	Other	Other
+9c83e723-38b5-47fd-9c35-0c0d24f56333	1	Other	Other
+9c8400ba-c99e-4022-80b2-c8f3ce37a1ed	1	Other	Other
+9c84020f-fa40-4c9e-9078-a2d1c975f750	1	Other	Other
+9c84107b-ef8f-4137-9ec9-1d08f15890f2	1	Other	Other
+9c84e830-9592-4bf3-8a30-e294cfc5987c	1	Other	Other
+9c84fa79-5d7f-4b4f-a165-83b0fffa4fee	1	Other	Other
+9c854c8d-909c-433f-9146-3af96b63160d	1	Other	Other
+9c8568ad-5f86-473c-bd49-0d780d5139e8	1	Other	Other
+9c856d91-29df-4ac6-999e-0c169c9befa9	1	Other	Other
+9c85806a-a0a3-490b-a54f-03aa3659a3c9	1	Other	Other
+9c859277-cd4b-4a32-8a11-9eee970d75ab	1	Other	Other
+9c85bf7d-65aa-42ba-9c35-baadeae8f87b	1	Other	Other
+9c8647c6-7d0a-4b4d-b3e2-86481acd28a3	1	\N	Other
+9c865a70-2aca-4ead-9f1f-360fe85ed87a	1	Other	Other
+9c86ac88-5fc6-420c-af26-75e38e85be53	1	Other	Other
+9c86cefb-106a-45e7-9808-db5a725ecfba	1	Other	Other
+9c87307e-0006-4022-adae-7204b87b12b2	1	Other	Other
+9c876354-51ff-49c9-a3d4-6369961c4655	1	Other	Other
+9c878887-3124-439e-9ccd-5a5e491c36a0	1	Other	Other
+9c879a1e-5d81-454c-baeb-5400b43f3572	1	Other	Other
+9c87b048-158f-4d76-8d2f-7502f39d35ed	1	\N	Other
+9c87bdd6-ca81-4854-9fa3-7878314adfd0	1	Other	Other
+9c8825c6-55e0-4455-86d5-7036892e9895	1	Other	Other
+9c88636d-c4fa-448d-bbe6-bcb94987fda8	1	Other	Other
+9c8863d4-c960-4302-aecf-4cd1b530809e	1	Other	Other
+9c88eee0-a682-4bc5-8002-f00c88b6584e	1	Other	Other
+9c88fdee-5088-4990-8209-9b810ee6f55c	1	Other	Other
+9c89072f-a970-4787-8da4-d7f4bd0d40b9	1	Other	Other
+9c890d3a-9570-4cad-ad2b-290e34ad7846	1	Other	Other
+9c89379c-a8f2-4075-8b4b-1f462000134e	1	Other	Other
+9c89600a-d823-4055-9b72-6e91768df895	1	Other	Other
+9c89895c-b06f-490d-929e-91ebb01e0d15	1	Other	Other
+9c89ed75-7807-4b3a-b557-b04944110c30	1	Other	Other
+9c8a0ef9-b179-4f83-8abf-69208324026b	1	Other	Other
+9c8a110b-047b-4660-a037-d7f68a534605	1	Other	Other
+9c8a43dc-d349-410b-aef6-e1192e37b172	1	Other	Other
+9c8a5028-6a19-4780-be20-df1d5d118ec7	1	Other	Other
+9c8a5836-700f-4df6-b89b-84909bfc2229	1	Other	Other
+9c8a5d15-650a-47a6-bbdc-b5de0089fdf3	1	Other	Other
+9c8aa319-59d0-489d-acc1-1b8a4cdb57f2	1	Other	Other
+9c8aec91-62fc-495d-b6d8-f2429d2edd0f	1	Other	Other
+9c8aefcd-2911-43b1-aaec-d51eccde1223	1	Other	Other
+9c8afd6a-ba19-499b-9da8-c624cc2775f0	1	Other	Other
+9c8b5fc4-74eb-4cb4-b199-322533b1efa7	1	Other	Other
+9c8b7752-b80e-412b-8fd2-5cb067f04476	1	Other	Other
+9c8b7f09-095b-4187-8e89-08c5eda425db	1	Other	Other
+9c8bfe5e-2137-4fec-85f3-4607e1109129	1	Other	Other
+9c8c4790-aac4-40f7-b030-5bf330fb7b18	1	Other	Other
+9c8cceb7-2d02-49d8-abdc-a983239cbe7b	1	Other	Other
+9c8cfa6b-1a4d-4ea1-98fb-f9829ac6ed2f	1	Other	Other
+9c8d0a2a-9af6-40ce-9fce-b57577152c2a	1	Other	Other
+9c8d6a47-2c5c-4855-8240-d2f035eac4b0	1	Other	Other
+9c8d96fe-a746-4fbd-b1ea-417c971b3cf1	1	Other	Other
+9c8e572a-e3b1-43ce-8c68-24bc4f6fa7c3	1	Other	Other
+9c8e7a59-0987-456c-ae72-5b3088ed62ab	1	James	Other
+9c8e98c0-2984-4df6-bb0c-d1c51cd05681	1	James	Other
+9c8ebe88-a29f-427c-a1da-c7c81af73d24	1	Other	Other
+9c8ed21f-052e-43c1-ab55-ff6d3f175645	1	Other	Other
+9c8f5b95-a0ef-4da7-b773-adb6245f93d1	1	Other	Other
+9c8f6da8-3ca5-4a79-9b2b-739582cc41a2	1	Other	Other
+9c8fa386-dbce-463e-8583-7d1704ce44f7	1	Other	Other
+9c8fb43d-290b-4ec6-916a-123c9546a1e3	1	Other	Other
+9c8fe723-86f8-4e5b-8b92-d8b6ef86f027	1	\N	Other
+9c900bb5-e822-484a-a8ec-d1b2b087dcf5	1	Other	Other
+9c9015b8-8e1b-43da-9160-9c4fc78144c3	1	Other	Other
+9c90309c-eee0-45e7-afbb-b9647f880223	1	Other	Other
+9c9049a0-bb68-40c5-95ff-ec69c37e06af	1	Other	Other
+9c907d06-6352-4c72-a691-91bdd1525eab	1	Other	Other
+9c90bc1b-7ebc-4bac-a705-fb977d50daff	1	James	Other
+9c90f4ea-0fb4-4f36-87dc-e6b90189a5f5	1	Other	Other
+9c911c76-bc87-4560-98c2-1f630aa1dbf4	1	Other	Other
+9c912117-dc02-48d7-8c3f-628ec035220e	1	Other	Other
+9c9129b4-c734-4875-90f9-0759d664791c	1	Other	Other
+9c9173ce-211f-4475-b13e-d702e8ff4fec	1	Other	Other
+9c91a926-0a6c-44dd-9417-13a6548fe03a	1	Other	Other
+9c91bf35-5a96-4a7d-aee6-6a9bc6c540cc	1	\N	Other
+9c91c56d-33c7-4e29-8190-4f91f5a820f7	1	Other	Other
+9c91d8fc-4e3e-4aa9-a368-ba389b50f627	1	\N	Other
+9c91de3d-2fb3-448b-94c4-5be630ac44ce	1	Other	Other
+9c926db5-8d3a-49a5-991d-41ae52f2dc8b	1	Other	Other
+9c929fed-fb5e-4d4d-bb24-6bb394b80f85	1	Other	Other
+9c92dcbd-8584-4aa7-b98c-78f8d2a18e3f	1	Other	Other
+9c92e3a3-f79e-41f9-a369-06da76024b3d	1	Other	Other
+9c9307a0-ef06-4c0b-9145-65bc832e7907	1	Other	Other
+9c933a87-9d80-47d7-a447-43ebec47bbba	1	Other	Other
+9c9354c1-e2e4-45b6-8e54-21c5672a2659	1	Other	Other
+9c936c90-18e8-4443-a394-0b2e568ab910	1	Other	Other
+9c93b783-f932-4743-9e0f-8bba994d1d41	1	Other	Other
+9c94081d-247c-417e-afbb-1d2acf61e6f7	1	Other	Other
+9c94396a-ddf8-48e6-bf79-d4ee4719ccec	1	Other	Other
+9c944948-3e8b-4a2a-b1c0-6096714b151d	1	Other	Other
+9c945412-e529-48ce-accb-2117aee231e2	1	Other	Other
+9c9454cc-1b38-4a48-9065-381d160aec28	1	Other	Other
+9c94a338-0349-4c45-807b-256979fc873d	1	Other	Other
+9c94cb24-c4da-49ce-bc95-ae731cc7a301	1	Other	Other
+9c94d057-8a20-4e97-a287-4c7ba467710b	1	Other	Other
+9c95133a-2b81-4682-bfb3-cd5c0825fe01	1	Other	Other
+9c953ee9-908d-4a69-aebf-e102d8769997	1	Other	Other
+9c954451-25b5-423e-b4c2-f09060bff3bd	1	Other	Other
+9c957b0e-114f-4f23-878c-2d7d4c00ed1c	1	Other	Other
+9c95a0ff-c77d-4ed6-b634-392554039d20	1	Other	Other
+9c95aeea-7436-4fbe-a101-7a9489079cfd	1	Other	Other
+9c95b9ce-fd1e-4f3c-bcd2-43c4fa19310b	1	Other	Other
+9c96085e-891b-4d71-8416-5a82fbf1bb29	1	Other	Other
+9c96224e-2275-4e3a-82a2-5094b657e81a	1	Other	Other
+9c964743-f358-46e7-9765-2960e9bac8f0	1	Other	Other
+9c96ab3d-a5bf-4e7f-ad15-8912e1c32b39	1	Other	Other
+9c96e9b6-e33d-47dd-95ec-300c37e8531b	1	Other	Other
+9c96f032-c106-4087-9452-34a1b30dc2ab	1	Other	Other
+9c970623-39d9-4a54-9f2a-6fbe84c363e1	1	Other	Other
+9c974a12-f553-4964-9ed3-f1927c0ee574	1	Other	Other
+9c97689b-152d-4d30-8dcc-01097a65819b	1	Other	Other
+9c976c87-d1a9-40e4-b68b-e5cd1b476ec5	1	Other	Other
+9c97734b-6252-457c-ae7a-23000bc496a9	1	Other	Other
+9c977bd2-1612-4614-b44c-e2b8f086dee6	1	Other	Other
+9c978e2d-cd6b-411c-9719-2f5b55f1741c	1	Other	Other
+9c97d101-029b-4812-aab8-9d4964db0179	1	Other	Other
+9c97e27f-de24-4873-8bd6-8686e641f622	1	Other	Other
+9c97f14d-944f-4135-9683-0d29e54587c8	1	Other	Other
+9c983bc5-cf3e-4fc4-a636-5a1cd2b4b1b9	1	Other	Other
+9c9891d4-5ab1-4ac0-96cc-7f4b52691a6d	1	James	Other
+9c98c83b-21a9-4cde-9152-065626de7eac	1	Other	Other
+9c98ce9d-23e2-4152-9801-17e62391e7c4	1	Other	Other
+9c9910fc-8018-4721-a222-02059ff30377	1	Other	Other
+9c992a7f-6452-4797-a462-d54f02c4c51d	1	Other	Other
+9c997c5b-1b8a-4727-abba-2b76fec22c4e	1	Other	Other
+9c99bf38-5523-4af1-bfc1-410f91cac505	1	Other	Other
+9c99df62-7b5b-4942-aa8b-d752b7a04888	1	Other	Other
+9c99e37c-4446-455a-bf67-5c2883e0fae2	1	Other	Other
+9c9a1059-ef85-41d7-b707-28aa35aa7e20	1	Other	Other
+9c9a687c-59ab-45ad-8708-b164bc191f85	1	\N	Other
+9c9b03ff-ed46-4613-892e-1b54370a5256	1	Other	Other
+9c9b2207-8f1c-4f39-9553-60fa145bdb43	1	Other	Other
+9c9b35e3-20f8-4a4d-91f8-b1141960aa66	1	Other	Other
+9c9b421b-3fd3-47d2-a4a8-c7561e093a3d	1	Other	Other
+9c9b5193-1aa2-4a8f-809f-adb3d38ae40a	1	Other	Other
+9c9bbcd1-b4fd-444f-94b9-18c99ce71e1d	1	Other	Other
+9c9bc546-a190-4cdf-a973-09f2e68e20c3	1	Other	Other
+9c9c1542-bb7c-474a-b0d2-3353d74df07e	1	Other	Other
+9c9c15e8-fd97-4cb4-829e-90812de7d7fa	1	Other	Other
+9c9c51d1-b2d4-41d4-9a93-bdadf475bb6d	1	Other	Other
+9c9cb2ff-c42c-4f09-8e3d-e44f1a091cc5	1	Other	Other
+9c9cb77f-a144-441e-b318-0016efe9b9ca	1	Other	Other
+9c9cb7fd-58fa-4d9b-acd1-9c8bbba1a565	1	Other	Other
+9c9cd058-1c6d-40a6-a2c2-6de60c4976d1	1	Other	Other
+9c9ceb38-b2df-4b32-9b81-237dee1d229d	1	Other	Other
+9c9d5c5d-c291-4a97-9bce-5d69cc5d7b95	1	Other	Other
+9c9d9f67-8de0-4440-b5c8-27bef2b45cd4	1	Other	Other
+9c9da1e5-ff38-4721-913f-54468389ff00	1	Other	Other
+9c9dd87e-5fc6-4945-a77e-887f754d8bcd	1	Other	Other
+9c9e010f-4b70-4284-9231-4d7dacf1d1cf	1	Other	Other
+9c9e38b8-d296-4ed9-80ce-dcc98d2569b6	1	Other	Other
+9c9e55f4-0a43-459b-974d-76920fa78509	1	Other	Other
+9c9e88ff-e55c-44d8-8aec-92fe6da86c73	1	Other	Other
+9c9eb62f-7ed3-405c-b01a-766d8e9e3ed6	1	Other	Other
+9c9f0c2a-b34f-4c3a-a4a7-119baa157bf7	1	Other	Other
+9c9f3b2c-ba4f-40dd-acd4-e9e1b144ab74	1	Other	Other
+9c9f521b-3669-43d8-9e42-64f050aee093	1	Other	Other
+9c9f6d49-074e-4a30-acfa-1368ae0c6b0c	1	Other	Other
+9c9f7366-6806-4154-9709-2922b643aa40	1	Other	Other
+9c9f8013-297a-42d8-afa5-922834729a48	1	James	Other
+9c9f90fe-7d05-4107-b57b-68edbcc41f17	1	Other	Other
+9c9f97d9-2ba7-491b-9624-9be0e1d8b237	1	Other	Other
+9c9fde83-2e4e-4302-9c65-21a632f71989	1	Other	Other
+9ca02048-c382-4d7b-8626-ef418d31439c	1	Other	Other
+9ca082b5-5d13-4226-a23b-394c11cb2d7e	1	Other	Other
+9ca0f73d-74fb-4885-9af1-36b79a0d0d04	1	Other	Other
+9ca10908-4419-4cc0-a7be-66cee4251522	1	Other	Other
+9ca10bf1-6d71-4e3d-82f2-0327435a037f	1	Other	Other
+9ca1189f-a50c-4f1e-824e-058349a50dad	1	Other	Other
+9ca16452-f5f3-470a-a218-09224b50f807	1	James	Other
+9ca16a5d-27fb-4827-9723-81b4f19ce07e	1	Other	Other
+9ca1d9fa-e216-444f-9561-551d0b37d4ff	1	Other	Other
+9ca1ed00-c95a-4b23-82a5-2c0fa09b3c84	1	Other	Other
+9ca21c62-4eb8-47c2-98d0-a652c8e46592	1	Other	Other
+9ca25fb6-1d0b-469e-abe4-d3871c4af0cd	1	Other	Other
+9ca29e82-323b-46b9-b050-b4259ac7d1ca	1	Other	Other
+9ca2b22f-7fab-45fb-b425-0ec7b5b9df05	1	Other	Other
+9ca34d4b-5651-4d87-b797-1a8d50e7a7cc	1	Other	Other
+9ca3704c-009a-41fa-a488-5a7a152fd754	1	Other	Other
+9ca3c7bd-05ca-4a80-9e96-d1d5cd8769d2	1	Other	Other
+9ca3ca7a-a077-4f73-9f74-6f96358e8d94	1	Other	Other
+9ca5040c-e583-4638-932b-d21b64b52f2c	1	Other	Other
+9ca52671-5c71-4d2b-b03d-dc95ee180e80	1	Other	Other
+9ca5288c-28f7-42dc-98d8-5ed39f7cd8c9	1	Other	Other
+9ca583cc-dc8d-4ab8-a2d7-6d367528c3be	1	Other	Other
+9ca5dbef-3fe0-4ced-8908-cb9ed5661670	1	Other	Other
+9ca5e3ee-3640-4d7c-ae2f-e12c45e6d53f	1	Other	Other
+9ca61188-604d-406a-9804-2429e530c7de	1	\N	Other
+9ca61ed0-d260-431f-86ea-2c81660a6167	1	Other	Other
+9ca63ba9-f712-42a8-b65e-698189870ac7	1	Other	Other
+9ca6a05e-3176-4259-8bf0-d441911f0e0b	1	Other	Other
+9ca6b8c3-485c-487a-8735-dc170e925567	1	Other	Other
+9ca6ca6b-cf0d-43e8-ab55-b4b231834ac7	1	Other	Other
+9ca6debf-dc85-4979-9167-cec54b8a7f26	1	Other	Other
+9ca718a7-2b71-4be9-a8d4-9399878a16cb	1	Other	Other
+9ca72ba0-1946-4cc0-9718-052639a8ffc4	1	Other	Other
+9ca758ca-cdbc-464c-871b-f49babab39d5	1	Other	Other
+9ca7701b-535e-44c4-b1a3-083c6ad95ecb	1	Other	Other
+9ca789f5-2fb5-498a-9ebe-fdb13001bdee	1	Other	Other
+9ca7a5b0-747e-4973-af5d-cccb719e875d	1	Other	Other
+9ca7cc31-2e28-4614-8d57-b94f4abfcd60	1	Other	Other
+9ca7cca4-b149-422f-9d13-6f5e9a008fb0	1	Other	Other
+9ca7d715-4414-4140-aa66-04d6deb1e37d	1	Other	Other
+9ca7e860-c388-4769-9823-c5b8e488b4f0	1	Other	Other
+9ca7ee8e-5820-4b30-8eca-4475647accb4	1	Other	Other
+9ca823e6-844f-4ed4-9667-0b9388030bf2	1	Other	Other
+9ca83902-1acb-4df1-8fdf-2c606dc6b6a1	1	Other	Other
+9ca895ad-adf9-46fc-b070-2d7c00b8d496	1	Other	Other
+9ca8b862-62b9-4fb0-81d0-33b147826cf1	1	Other	Other
+9ca8c9cb-ebc1-4f4a-8e8b-ee3461410894	1	Other	Other
+9ca8ee7d-4168-4c65-9de7-5058cde0969b	1	Other	Other
+9ca90e6b-eecd-4a90-b405-1caf8618a63c	1	Other	Other
+9ca92214-1633-4747-8a37-bceb5e46315f	1	Other	Other
+9ca9699f-c39c-4d40-9437-6d421e69a51f	1	Other	Other
+9ca97b32-1642-4453-8fe0-06c07d6691e1	1	Other	Other
+9ca9c967-0ab5-45c3-acc5-6baf5a37c62b	1	Other	Other
+9ca9d0e2-0ee5-42c6-9e54-e8a764386f80	1	Other	Other
+9ca9d3c9-b9c8-4ee1-9a0d-abf10fd35e41	1	Other	Other
+9caa159b-8b41-4c05-9293-0eba396a6c36	1	Other	Other
+9caa35a8-6cae-45f1-a2f0-b080d03a9ba0	1	Other	Other
+9caab2b1-0014-491f-b080-96b6426b7955	1	Other	Other
+9caac403-45df-47f3-9d62-24499143500e	1	Other	Other
+9caacdd2-4c26-47d6-b6fa-33c1c4a24dce	1	Other	Other
+9caad0b3-8691-495b-8360-6723cf0d6e5b	1	Other	Other
+9caadc29-0f2d-4a13-9c68-beab0af7ca81	1	Other	Other
+9cab4714-4709-494a-821a-2d99aae33583	1	Other	Other
+9cabaf91-2ee7-4c11-be45-30a7bd8aa119	1	Other	Other
+9cabf187-f1c6-4d2f-afc9-b17a2dca5b6d	1	Other	Other
+9cac50a5-5f9a-4fbc-aa4b-c3b0a0045760	1	Other	Other
+9cac6845-6638-4198-a15d-3860b70fef70	1	Other	Other
+9cacc0de-308e-4a56-9347-09d01ac4e6d4	1	Other	Other
+9cacf03d-6859-409e-b8a3-7b375b0ffe00	1	Other	Other
+9cad2770-6f1d-4349-97bf-cde35bd1520b	1	Other	Other
+9cad31d3-03bd-45c4-bafa-fa236bb108c1	1	Other	Other
+9cad52d3-ddac-43e9-a208-3acfa151c17e	1	Other	Other
+9cad8b15-afd5-43ea-bfce-b82c7768c0f7	1	Other	Other
+9cada32c-ed92-4719-bf4c-2e260e84ed34	1	Other	Other
+9cadf78a-bd77-4e0c-a42b-433ecd0e69c8	1	Other	Other
+9cae204d-5827-4517-baaf-62f481e656d5	1	Other	Other
+9cae30f5-2f00-4140-84a8-e7c59b9f023f	1	Other	Other
+9cae373d-2cfb-4b1b-9d32-bf35f3f53776	1	Other	Other
+9cae4a56-bb6b-4949-927f-87d88af15fbd	1	Other	Other
+9cae625c-3382-48cb-ad92-a7cccc00fd04	1	Other	Other
+9caea087-7908-4fd1-8d50-428b8560506c	1	Other	Other
+9caee9d7-fa72-4fa4-a5b5-c31460a7baa1	1	Other	Other
+9caeea8f-7f7d-4d2d-9f71-db5bfd673c24	1	Other	Other
+9caf0291-976e-44c5-9cc2-e244c4af3560	1	Other	Other
+9caf9bc2-5c67-4a14-8749-5a62ab49827d	1	Other	Other
+9cafaa39-93b6-41eb-b079-fb7189f22a86	1	Other	Other
+9cafb765-f7eb-432b-a758-d588e72b0de2	1	Other	Other
+9cb03227-7274-4c99-a3c1-56ec44357ace	1	Other	Other
+9cb0347a-6b14-4ac0-8273-6a47ddf370f9	1	Other	Other
+9cb15bfa-cfa1-48c8-898a-c359d7054626	1	Other	Other
+9cb17260-d1d5-4751-8258-8c9b19b6c555	1	Other	Other
+9cb18ade-2391-4905-b4c9-6d85ab177aaf	1	Other	Other
+9cb18b32-4603-4958-9b3d-7d41630d28e6	1	Other	Other
+9cb19e51-e0d7-4504-b2e2-6e6a25db6fe0	1	Other	Other
+9cb1ad8f-95d9-42c8-8bc6-2465cc8f00db	1	Other	Other
+9cb26508-abc4-4b3f-9dbf-cc95882b4f3b	1	Other	Other
+9cb2915b-ee2c-4304-a869-bbced3cd3296	1	James	Other
+9cb318c0-923b-49a7-81f6-8ecfa66bb746	1	Other	Other
+9cb358f8-9603-410b-8463-01a2b14bde4a	1	Other	Other
+9cb36f99-ebe6-4509-a173-0eb032d62797	1	Other	Other
+9cb3ae69-b403-498b-a2e8-5dc8196dbeb9	1	Other	Other
+9cb3f911-def8-4a32-8091-676f0948ede2	1	Other	Other
+9cb422bf-9370-4ee8-a3a5-bf3e29ad300b	1	Other	Other
+9cb4250e-16d7-4d09-924b-c96c05e1109f	1	Other	Other
+9cb44cfc-9844-4c87-997e-86b4b330ee0e	1	Other	Other
+9cb477d8-f85f-4b7a-bc41-d6585f853d0d	1	Other	Other
+9cb47dd6-7b66-4cc6-89c2-3c334f6a64fa	1	Other	Other
+9cb49b02-cb81-4ca0-a898-8e6702a15ac3	1	Other	Other
+9cb4bc99-8281-49bb-ad59-91130642882a	1	Other	Other
+9cb4ddb4-7f75-4a8a-a3ff-e35d611ee6f3	1	Other	Other
+9cb4e696-1fce-4e1b-b60d-4861e5602431	1	Other	Other
+9cb51b6b-c302-4c4f-a578-d8fddeb209b3	1	Other	Other
+9cb6373f-13c5-4767-b4b5-f15ed1a23f96	1	Other	Other
+9cb65300-6a43-4b02-8113-0c01436d4f5f	1	Other	Other
+9cb65531-1b03-4803-af8f-924494b5f5fd	1	Other	Other
+9cb65b45-b2f1-4ba4-b11f-99cccf8c192a	1	Other	Other
+9cb6908b-c461-4faa-8f9f-5fa880883c7d	1	Other	Other
+9cb6b25e-e38b-4138-b5c9-6753101ab516	1	Other	Other
+9cb6e386-01ad-4f50-967f-25a0e2186ce1	1	Other	Other
+9cb77aa9-3502-41af-a317-8c0138c38a85	1	Other	Other
+9cb79a97-62cf-400a-ba07-d1b8e928cc0e	1	Other	Other
+9cb79f14-5f38-40bb-9c94-0acfdd86ea57	1	Other	Other
+9cb7da49-8e9d-4b9e-963a-a7389cfedfea	1	Other	Other
+9cb7dbf4-8584-4df9-8889-433a69b96c1b	1	Other	Other
+9cb7e40f-fd9e-4972-b2e4-cbe0a8f9ad49	1	Other	Other
+9cb811c7-f3a5-44cd-97b4-4669483a2c9f	1	Other	Other
+9cb8288f-44c6-457b-9080-f20ff2e1c012	1	Other	Other
+9cb841d4-e8a4-4ec0-a76f-dcd10ca9f55e	1	Other	Other
+9cb868d7-ada3-4e43-9618-f733d14df644	1	Other	Other
+9cb88e98-9fe7-4592-993e-28db031e4f07	1	Other	Other
+9cb91e99-7316-4f0f-9eaf-f59c84bb8763	1	Other	Other
+9cb95b8c-6779-49db-94c9-624e95dfb3ac	1	Other	Other
+9cb9940a-511c-4bb8-a969-8e5650c974b5	1	Other	Other
+9cb9b5cf-c43a-497a-86bb-cd48053ce6a3	1	Other	Other
+9cb9ef4f-2b7c-41ca-b27f-fb9359077c39	1	Other	Other
+9cba4970-87cd-44d7-9124-ed1f89188c0c	1	Other	Other
+9cba53ee-e83c-4b98-89b0-06533b471417	1	Other	Other
+9cba5dde-373e-40b0-bf6d-e22986aff8c8	1	Other	Other
+9cba9870-aa98-4d13-b163-75c40580ceaf	1	Other	Other
+9cbb4456-8606-4519-b69b-5189a2a5b321	1	Other	Other
+9cbb4adb-0c88-4c90-8976-4cd481f5115b	1	\N	Other
+9cbb82c9-1755-4eb9-8bc0-c2a05bcbea9d	1	James	Other
+9cbb918e-bb0a-4cd0-8ba4-1c0b4178d718	1	Other	Other
+9cbba9bb-c60f-47f7-a2a8-2d4289f3a6cd	1	\N	Other
+9cbbd6dd-3d99-46e3-b404-0b954f526793	1	Other	Other
+9cbbe9a6-445b-40cc-b6b8-9f31cd92cabc	1	Other	Other
+9cbbed86-4228-4602-ab63-d9c01250fa18	1	Other	Other
+9cbc0dfe-50f7-4478-935c-1d3e45392dab	1	Other	Other
+9cbc1ba6-64d5-435b-86de-d527944db3c2	1	Other	Other
+9cbc6f98-429e-4a81-b67f-7feeb68aa66f	1	Other	Other
+9cbc7673-8570-466e-addb-fa4bf1fe00a8	1	Other	Other
+9cbc99f7-bca4-429a-8cec-1aacf5049216	1	Other	Other
+9cbcdab0-bec3-41b5-961b-7967a041043e	1	Other	Other
+9cbd030f-3054-43b7-98d9-42eb878d4db5	1	Other	Other
+9cbd38ef-f624-40ac-b7fb-f6e6f1a8bcf4	1	Other	Other
+9cbd5ac8-9801-4ad6-a15c-f066840a21a3	1	Other	Other
+9cbd5dac-56df-440b-9baf-8a04ca3cc16b	1	Other	Other
+9cbd8ae2-b8ca-4b33-8ed5-d9c834c5deb3	1	Other	Other
+9cbd8b5c-75ca-4b89-9c21-496d64caa452	1	Other	Other
+9cbd912d-ccdf-44bb-af47-755b26038a28	1	\N	Other
+9cbdfed3-c0be-4fc4-9b05-5b43105e7687	1	Other	Other
+9cbe4b90-61c4-4079-bf85-80dafdc4a3ac	1	Other	Other
+9cbeb3ea-128b-4856-98d9-258f9a460720	1	Other	Other
+9cbee12e-b323-4bae-823f-3536dec9a7c7	1	Other	Other
+9cbf01ba-31e4-4237-abef-3c9a74734978	1	Other	Other
+9cbf06a8-6a7e-4928-a107-a513ac7e6a55	1	Other	Other
+9cbf5cc7-72de-4928-800e-d06dd3a72470	1	Other	Other
+9cbf87d0-de77-48eb-af1f-dee57ca839e3	1	Other	Other
+9cbfaae7-ba8f-42d2-b90b-f5ab6b4bc457	1	Other	Other
+9cbfac91-07b1-453a-bd7d-e579d884cae9	1	Other	Other
+9cc04309-fd98-4892-930e-04ac91cae15a	1	Other	Other
+9cc0d2ca-d02f-4e15-8b94-c74c6dd4dd21	1	Other	Other
+9cc0e6e6-25a1-42aa-a192-659dc42b07cb	1	\N	Other
+9cc0f625-2f4f-44c1-b018-20a9e176dcd7	1	Other	Other
+9cc14a71-e877-4fd6-a8ff-2be1a4609ae0	1	Other	Other
+9cc1c790-b891-4f51-8781-2f2d72ece6a2	1	Other	Other
+9cc1ec9d-dd8a-4aee-b057-bb351d72352b	1	Other	Other
+9cc2136a-6e12-4719-99d9-f476cb5dee48	1	Other	Other
+9cc22364-2433-486a-b5ee-2a3279b94a4e	1	Other	Other
+9cc24818-6cf4-4336-a7f9-2ae1e6a60dc9	1	\N	Other
+9cc301ea-9baf-41d9-a0d3-45fb7739def8	1	Other	Other
+9cc323fe-b82d-4336-97b6-d1124e165e58	1	Other	Other
+9cc41caa-e58c-42d4-80e3-ae66f9050133	1	Other	Other
+9cc44069-b25e-4822-b6e2-d5fc0246e124	1	Other	Other
+9cc4566c-f878-42f4-a636-678db0590a41	1	Other	Other
+9cc463e3-480b-4eed-9779-e65154728f2e	1	Other	Other
+9cc49175-0ba5-4389-bbb2-e83d5b24dbd5	1	Other	Other
+9cc4a58d-03d3-4cd2-819d-5343eca35eb1	1	Other	Other
+9cc4e973-b074-4b4d-a565-3b99b42fe928	1	Other	Other
+9cc51806-bafb-48cb-868f-ab39c9365499	1	Other	Other
+9cc5710f-8c82-462c-9eb0-6bb3deb838ac	1	Other	Other
+9cc575d5-023d-433e-9d4f-a7d0da331df8	1	Other	Other
+9cc577f6-bbff-41f2-85fd-6c834cd9a64e	1	Other	Other
+9cc5b52a-a4c5-46be-964f-34981edcfa26	1	Other	Other
+9cc5b818-e03c-4cca-ba25-7b3fc2570db1	1	Other	Other
+9cc5d551-b1a3-4827-a98b-4c12af6b2043	1	Other	Other
+9cc5dda2-bd45-4c95-978c-1af77df40956	1	Other	Other
+9cc65386-ad65-48e0-853b-32b0713330c5	1	Other	Other
+9cc6aa6e-46eb-494a-8423-1525e0c8e7e7	1	Other	Other
+9cc6d82d-185b-4bb3-a298-1ab91e018871	1	Other	Other
+9cc6ffbb-4bc0-4ee4-bea7-16c747341301	1	Other	Other
+9cc70c01-130c-4bd8-98cc-879ba5e361a8	1	Other	Other
+9cc70d39-63ae-4436-b4c9-25d1da3b5d72	1	Other	Other
+9cc70f68-0cfe-4dd1-b050-0ae64d6734b3	1	Other	Other
+9cc726bf-a0d4-4e58-b6ef-40ac72fc8501	1	James	Other
+9cc79322-b293-4ee3-a050-5697fe4040a0	1	Other	Other
+9cc7be01-c01f-4610-8e71-6daad1a28b63	1	Other	Other
+9cc82372-daed-418d-9d63-4ab8b7c1d766	1	Other	Other
+9cc8388b-d2c6-43d7-8068-9c92d98ce09f	1	Other	Other
+9cc856e2-6cd1-4916-acc4-5f613acd356c	1	Other	Other
+9cc88f55-0631-4cd4-8d21-8ae08e12f8ac	1	Other	Other
+9cc8dc08-895d-485b-a599-6f81a4818aec	1	Other	Other
+9cc9a415-2c1b-4b28-a59a-0a16ceba3c95	1	Other	Other
+9cc9b3c8-ac8a-4c4a-81da-dce5d6bcc1fc	1	Other	Other
+9cc9ba69-80fc-4cf8-a949-8ef2bbcbf795	1	Other	Other
+9cc9f6aa-e689-46bc-a354-fbad08d2de90	1	Other	Other
+9cca4242-0340-48c3-acb2-e07b39b15e93	1	James	Other
+9cca517c-8642-4603-a2b5-446d738dc645	1	\N	Other
+9cca519a-fe93-4a30-9edc-7de9bcfa002f	1	Other	Other
+9cca6e5d-53c4-4760-9bc4-eb0915ddb5ff	1	Other	Other
+9cca8ce4-efec-44cb-b2fb-bde537d0c3bd	1	Other	Other
+9cca8dfd-4d23-46ce-89a0-668ecae2b69c	1	Other	Other
+9ccaaa6b-bf5a-4e69-9158-e27351fa661d	1	Other	Other
+9ccad6c1-dba3-4359-bbdc-a9f0c020b09d	1	Other	Other
+9ccaf65b-d536-4a5e-a795-b5fd5c901768	1	Other	Other
+9ccb175f-9b65-4617-9bed-726d3b4fa45f	1	Other	Other
+9ccb22ac-3992-4660-85b8-f5b3defbaab6	1	Other	Other
+9ccbaeae-bee0-40d2-a061-46742ef3caf1	1	Other	Other
+9ccbcad7-26b7-4454-83b9-ac34a6b35243	1	Other	Other
+9ccbfb25-3536-4e1b-9c1c-ab10b559edcc	1	Other	Other
+9ccc0b2e-b681-40ac-96d5-7eeb736e6cde	1	Other	Other
+9ccc1394-de30-43bc-a0d0-875cf913b6bc	1	Other	Other
+9ccc4b8a-92c7-47fc-af15-fdc3ceb99345	1	Other	Other
+9ccce2cd-22c5-4bfc-a842-49e64d9a9927	1	Other	Other
+9ccd8cc6-f04c-4f71-841e-9871d7e6d75c	1	Other	Other
+9ccea223-ffae-489d-96d1-9c5cd4fa82c3	1	Other	Other
+9ccecf7c-4f4f-4c1c-8ff8-9d6fa6055ada	1	Other	Other
+9cceda46-70b9-486a-ab91-133767b9a1ed	1	Other	Other
+9ccf29ed-f8ba-44e4-a2ca-98c90e5324c4	1	Other	Other
+9ccf2d24-a464-11e7-8d17-fa163e8624cc	1	Other	Other
+9ccf53e3-38df-4e08-aee8-bbfe918d595e	1	Other	Other
+9ccf5cbf-8233-4a32-9151-1fff894c8afd	1	Other	Other
+9ccf7e60-5673-4c64-a129-af11b59f3fdf	1	Other	Other
+9ccf9f7e-ca02-42f0-85e9-07aed0d4297e	1	Other	Other
+9ccfd20e-5a69-4a4f-a456-50074397f6a7	1	Other	Other
+9ccfe387-1b3f-4dbf-a9c4-6141f5d07684	1	Other	Other
+9ccfeff3-7d3b-48fb-9882-7ef485cca012	1	Other	Other
+9cd0225e-14dc-4a57-8444-fac4ec731db4	1	Other	Other
+9cd0baf1-6a0d-40a1-bef3-ee7a5c46d25a	1	Other	Other
+9cd0c48a-6008-445f-82b2-4456f6c5a318	1	Other	Other
+9cd0d126-36b0-4d87-85e5-18784660e16a	1	Other	Other
+9cd13f24-a84c-405e-b353-8f77e0eb8803	1	Other	Other
+9cd16da3-2b22-4fbe-be1a-55d6fa4d1841	1	Other	Other
+9cd17986-d862-4812-a054-365018ce657a	1	Other	Other
+9cd1c663-7f55-4b03-a96a-6757a2c4e142	1	Other	Other
+9cd1ce89-ca9f-4125-be25-3715d0c550fe	1	Other	Other
+9cd1ced2-0a04-4e9e-9699-3f8830af42cd	1	Other	Other
+9cd1e702-a6d8-4164-9dc0-e8191caf9bb3	1	Other	Other
+9cd23ecb-c038-44b6-8794-d3cf84495a09	1	Other	Other
+9cd2a514-1bf9-45a3-a510-0198911f7f38	1	Other	Other
+9cd34064-fc1a-413c-913c-4c4ebf22b391	1	Other	Other
+9cd35cd5-ed4a-4f4a-814a-8ad08695ba0a	1	Other	Other
+9cd37d38-ec71-4680-8ebd-79dac75382c3	1	Other	Other
+9cd3bf21-06dc-408d-b97a-2f7ff6436b49	1	Other	Other
+9cd3c226-9262-40ae-9e06-ec40878ffa07	1	Other	Other
+9cd3f76a-ebb2-4204-9b7c-af599f23f204	1	Other	Other
+9cd4ebb9-ef84-4e77-a512-f19611953b43	1	Other	Other
+9cd51d5e-e42b-4ceb-bbb0-af8e35fbf98c	1	\N	Other
+9cd59c46-74e6-428d-9e21-8cea445b8307	1	Other	Other
+9cd5bdb9-1d4c-4ccc-991e-ce6c3fa55593	1	Other	Other
+9cd5bdd8-17b4-4e68-ada5-b3de8082cb07	1	Other	Other
+9cd5df8f-064b-4900-96e0-ff7804d1c4e1	1	Other	Other
+9cd63d04-e5d1-48f5-afd1-069619cc6229	1	Other	Other
+9cd65b8c-2a69-47ab-8ee5-c0c3bf79f187	1	Other	Other
+9cd673fb-244f-4d91-bcb8-4d2b2ff4e440	1	Other	Other
+9cd6868a-62aa-459d-b873-5d4e49add9b2	1	Other	Other
+9cd6ecf8-7bd4-4c87-9d17-5bdcf5b68da3	1	Other	Other
+9cd71d02-3ddc-4226-9cab-f7d9246c0b40	1	Other	Other
+9cd72357-6d6d-4db1-8f9c-961e68ccbb85	1	Other	Other
+9cd7634a-9387-444c-bd56-dbcfa4a55ee1	1	Other	Other
+9cd766d8-5194-4a2f-9471-4e0a02360e6d	1	Other	Other
+9cd7bdb5-ebca-46c7-b740-6b108e1a94cf	1	Other	Other
+9cd7f567-710c-460f-a70a-b81dd7c74cae	1	Other	Other
+9cd91e53-02e9-4c1b-a77e-911ca956efa2	1	Other	Other
+9cd93653-ff96-49b3-ad57-6a11bdf51ab7	1	James	Other
+9cd96585-e4ab-4f89-a9d8-878b3605d211	1	Other	Other
+9cd984b9-ceda-424f-a03d-0e61fb86358c	1	Other	Other
+9cd99a25-1456-4cde-823a-697104dabfd8	1	Other	Other
+9cd9b58d-b239-4a24-a90d-1b17cb1dcce2	1	Other	Other
+9cd9d925-d1ce-4d08-bb4c-dd8aad468dc0	1	Other	Other
+9cda1d06-dcd2-46f6-8f7d-2a00816b2422	1	Other	Other
+9cda3faa-f416-43aa-b7f0-220d6adab700	1	\N	Other
+9cda4429-78a9-4025-b214-00c5b6a51256	1	Other	Other
+9cda4c38-fd9b-4513-8df4-e8a9a85e9a6a	1	Other	Other
+9cda5d4c-c0fe-443d-a16a-4718e5ddb47b	1	Other	Other
+9cda6bd5-bbab-4233-a803-eb5749430244	1	Other	Other
+9cda9d03-c508-4615-b99e-5de867415a21	1	Other	Other
+9cdaa100-e280-45ba-9bad-a1dec4e473d4	1	Other	Other
+9cdab42a-523d-4960-a3f0-5950d97fc6a5	1	Other	Other
+9cdb2a72-13c2-4c09-a7bc-7edff1695e83	1	Other	Other
+9cdba49e-10fa-4fdf-b327-e25072865aac	1	Other	Other
+9cdbd4bd-2cdf-484a-8996-16917a911921	1	\N	Other
+9cdc2582-4fcd-48e7-ae3d-124e3f08a2cf	1	Other	Other
+9cdc4221-78bb-4ef8-baf1-a730bf3ab1ad	1	Other	Other
+9cdc48bc-f63c-4478-93e9-9aec47f8c185	1	Other	Other
+9cdc5f96-74e3-420e-8ac0-142b812634c7	1	Other	Other
+9cdc77ad-e2d6-4d87-8f15-b3115e59fdb6	1	Other	Other
+9cdcae6e-a0ce-4ee8-9cbf-fb453128e8c2	1	James	Other
+9cdccc33-424b-4f1c-b20c-16135480d28e	1	Other	Other
+9cdcd941-1f22-4fba-9c16-23082cc1c0cc	1	Other	Other
+9cdcde9d-3ae6-49f0-9ffc-d706b92abf68	1	Other	Other
+9cdd22bd-9d1e-47bd-8cbc-3230e6377311	1	Other	Other
+9cdd2f79-6c5b-4afa-bdb1-5481746e41ec	1	Other	Other
+9cdd3bd0-248f-4bf1-9aee-acfe5df4e86d	1	Other	Other
+9cdd5895-5846-4609-9270-289f77f60eb2	1	Other	Other
+9cdd600c-84dc-4a17-83c8-cf1f720b7300	1	Other	Other
+9cdd71ea-cdf5-41d3-8a24-ec9cc752e7f4	1	Other	Other
+9cddb9e9-ad4c-429d-829a-d4b490ea02f9	1	James	Other
+9cddc8d4-02f9-4ca3-bd53-4225238951e1	1	James	Other
+9cddcf55-0683-40b5-9605-4bf6d04ab1cc	1	Other	Other
+9cdde6f8-62fb-477c-8b6e-ecc2d8477980	1	Other	Other
+9cde5176-20bf-41d5-90ea-b2d77f619099	1	Other	Other
+9cdeb6d3-0d6c-4495-8636-c55ac5eb17cb	1	Other	Other
+9cdedecd-736a-4f1f-a688-02d1e3718658	1	Other	Other
+9cdf18dc-eaa9-4637-ac27-0c820492bdf0	1	Other	Other
+9cdf2c99-7239-4361-b629-2940233dc27d	1	Other	Other
+9cdf4b87-f85d-4c63-9578-68cd8d1289f3	1	\N	Other
+9cdfc3cb-ce22-4e5a-8c47-85fbea416368	1	Other	Other
+9ce0217a-3316-4101-96dc-c85fee3a9cc5	1	Other	Other
+9ce04fea-5500-47be-a63a-de8cdf6d909d	1	Other	Other
+9ce05716-6781-420a-99c2-162aa40483c2	1	Other	Other
+9ce0572e-cfe5-4360-9427-36ad0f9ee07c	1	Other	Other
+9ce083e7-db01-4dd1-a92f-170a02cc4a15	1	Other	Other
+9ce0a6b6-6886-47d4-abb9-351d84e24625	1	Other	Other
+9ce0e0c5-540f-49b2-939a-48aa218a2c2c	1	Other	Other
+9ce15c11-a57d-4401-ad4d-7f71bfaff50c	1	Other	Other
+9ce16718-92a5-4b75-8cbe-fe6648f4b070	1	Other	Other
+9ce2357c-ab67-4aab-b143-ea826b5d3f0c	1	Other	Other
+9ce24126-e39a-4a85-941e-dff05831fd2e	1	Other	Other
+9ce2682c-f7b7-4770-be8e-6363597edf1f	1	Other	Other
+9ce32c4a-79ec-43c4-82f6-1cca52276c5d	1	Other	Other
+9ce398e7-acd7-46e8-91e9-d943d4e40242	1	Other	Other
+9ce3b44d-2e9f-4a57-8977-b159a144133b	1	Other	Other
+9ce3b79d-4940-4e16-adc1-829b1ad4f7dd	1	Other	Other
+9ce3c033-a4d0-4172-af08-fcfdd48d3213	1	Other	Other
+9ce3edc1-9d75-45a4-ad94-ed2d55b409b1	1	Other	Other
+9ce3fa42-0955-4045-bf27-2f4f7f541b38	1	Other	Other
+9ce410d0-c4cd-4567-ba7a-5f521f2e7843	1	Other	Other
+9ce42679-001a-4d7b-9250-46e8e28d6b38	1	Other	Other
+9ce42dcf-b5b9-46aa-b6c6-fe70925a91d9	1	Other	Other
+9ce4436b-af62-4d0e-b65f-158c75f0498b	1	Other	Other
+9ce494ca-2636-4f77-ba76-7d584ac46548	1	Other	Other
+9ce4b16e-c5ae-4264-8301-323343b813fa	1	Other	Other
+9ce4e69c-3eff-4689-b50b-0b1c690fea1f	1	Other	Other
+9ce52f5d-1053-4ba9-934a-3479c1e23bb6	1	Other	Other
+9ce542a3-a8c2-41e7-b589-e84447194fec	1	\N	Other
+9ce5bf6f-3f77-4bd4-83cf-b0c3a482f0d8	1	Other	Other
+9ce63c92-8746-4317-bb9a-54fd69417ff3	1	Other	Other
+9ce643e1-d31f-4986-80ac-815aa26d38d2	1	Other	Other
+9ce64c47-5047-4994-a09d-e7f6b42dec27	1	Other	Other
+9ce70aec-dd6d-4a35-9c9e-01356f50607f	1	Other	Other
+9ce710da-bddf-4d1b-a25d-dd53ea22da42	1	Other	Other
+9ce78fbd-fd79-44b0-8196-5980eea4c982	1	Other	Other
+9ce7abb3-3c4d-4951-bbee-abe495519b5d	1	Other	Other
+9ce7c035-9e08-4721-9d98-799779db5663	1	Other	Other
+9ce8ac19-5d69-4280-97de-8211c71646bd	1	Other	Other
+9ce8b2b5-a441-4d6e-9125-1db1321a63bb	1	Other	Other
+9ce90ef5-1d01-4f55-a394-1eea96540357	1	Other	Other
+9ce911a2-96f7-473d-a0b1-50d10a22ff56	1	\N	Other
+9ce95378-d930-4877-9c12-c86f16fdb71b	1	Other	Other
+9ce97750-742b-405a-8cf6-bfad50226be2	1	Other	Other
+9ce9a302-201b-4236-8e5e-43fe1a21b587	1	Other	Other
+9ce9b39c-b6b6-4b8a-927c-3bef6ad90628	1	Other	Other
+9cea1ce1-660c-4e17-86f3-b32c65e5565f	1	Other	Other
+9cea2d20-7cf0-4b0e-b4f1-3821b5bc8dc7	1	Other	Other
+9cea4513-41f9-4bc7-b569-01c721d9761f	1	Other	Other
+9cea45c2-41e9-4c15-9f71-3f79d6c7167e	1	Other	Other
+9cea7090-2259-4c14-929f-3eaac2aeba32	1	Other	Other
+9cea8494-21d4-4f65-8aa6-3759dd89b387	1	Other	Other
+9cea9881-b8b4-4450-a86d-96e703261018	1	Other	Other
+9cea9ccf-22d5-4ed6-b387-070882b648e9	1	Other	Other
+9ceac9a5-585e-4a1c-8720-d47eaa8c15a1	1	Other	Other
+9cead970-01ec-4f20-be53-f5d7cc67dd11	1	Other	Other
+9ceb15e2-9a1a-4b71-ad52-520c35a63f4c	1	Other	Other
+9ceb2f2d-133a-4ffb-9a8f-4fb492ca854e	1	Other	Other
+9ceb6d14-f636-43ff-9e8b-3a2a2fe043ba	1	Other	Other
+9ceba33b-670d-4ee3-a90e-f010bd0ad507	1	Other	Other
+9cebb84f-7f62-47d9-860c-a470b7cf2b52	1	Other	Other
+9cebc2f4-5f77-4ea2-b263-194420293dc1	1	Other	Other
+9cec31a9-9cc6-4b94-a7ce-e7a721a2fec5	1	Other	Other
+9cec40e7-e265-4161-835a-e7a933e18041	1	Other	Other
+9cec9755-7947-45c8-991e-7ce2c5c7a05d	1	Other	Other
+9cecd5e0-4834-45c5-90dd-e0f676caa003	1	Other	Other
+9cecda71-bb82-4aa6-b853-522f8ea6a919	1	Other	Other
+9ced6c8c-4250-4c64-87c8-ab173c2dc7f6	1	Other	Other
+9ced6ed0-00f1-11e8-9dc9-fa163e8624cc	1	Other	Other
+9ced9405-7c71-4d01-b2af-3103d2ed0344	1	Other	Other
+9ceda3b9-1adb-4e53-b3f7-c54f9b6d5e34	1	Other	Other
+9cedfd18-8da7-4534-bf47-2d0487326e85	1	Other	Other
+9cee1011-b63a-4317-ae75-0682536d8c5e	1	\N	Other
+9cee690c-8150-46a8-bc11-d30d1edca27a	1	Other	Other
+9cee7093-7e4b-4434-96f8-fedcc9e57ebf	1	Other	Other
+9ceea789-5c46-41f7-b58a-64a37308a6c8	1	Other	Other
+9ceebdd5-d6df-4981-ad51-e1e511052541	1	Other	Other
+9ceee829-3624-4f06-8819-4025dfaa4b7e	1	Other	Other
+9ceef476-90a6-45cf-b14e-4593864faeca	1	Other	Other
+9cef44e9-5b65-4c29-835c-e68597fab64e	1	Other	Other
+9cef4f3b-8ee2-4774-abcc-6fafa60d5660	1	Other	Other
+9cef6f1d-3519-4a13-9fcc-def14019ab99	1	Other	Other
+9cef75b0-01a2-4c01-8a95-ee597aeb4825	1	Other	Other
+9cefa059-ea9f-4c57-804c-54f86ea457b7	1	Other	Other
+9cefbef1-b8e5-490f-a2cc-adb5cd29f026	1	Other	Other
+9cefc25e-3e38-400d-a2e0-5c7079d24bfd	1	James	Other
+9cf00227-0efe-4781-ae2c-08c7afbe913c	1	Other	Other
+9cf09b8b-00a8-4a64-bc2f-8a9858972032	1	Other	Other
+9cf0b47c-112d-4c04-a6ca-e9db95f24f3f	1	Other	Other
+9cf0e418-1c11-46a0-8ffd-af2a94ceef05	1	Other	Other
+9cf13157-54a9-443b-8eed-b860d0ac3574	1	Other	Other
+9cf151c4-05fa-4ef1-9001-1b6bfaac3f6a	1	Other	Other
+9cf15a7d-485a-411f-b35a-ca4f5c2f2db3	1	Other	Other
+9cf15e7c-2eb7-4daa-86a6-4fde2625f36b	1	Other	Other
+9cf1749c-85d2-499d-b8c4-77090571654f	1	Other	Other
+9cf1af3c-82ed-4c76-8cf8-526100519c5c	1	Other	Other
+9cf1ddba-e33e-46f5-a657-edf63dff5448	1	Other	Other
+9cf20a21-dffb-4d40-8ef1-4ad4475bb89b	1	Other	Other
+9cf23f41-e12e-44b0-88b2-4d22ed0520d5	1	Other	Other
+9cf2eff8-1f8a-44fc-9407-a54d8b07568b	1	Other	Other
+9cf2f931-8d29-4ee8-8a2a-52be6839ca7f	1	\N	Other
+9cf33cea-3394-4ed5-a259-b5a3c0884142	1	Other	Other
+9cf387b4-8740-41ba-b371-9e24d30e1c59	1	Other	Other
+9cf390f6-3bc1-44b1-ae7c-91799dd68336	1	Other	Other
+9cf3ab4a-462c-4fed-8605-9f609398bdf0	1	Other	Other
+9cf3b815-8a31-4ecc-b394-32d1fc3c276b	1	Other	Other
+9cf3bb11-156d-4163-ac51-4b387ca4f14d	1	Other	Other
+9cf3e57a-16c4-447b-adcd-72a85d694e76	1	Other	Other
+9cf4a1ff-bad7-4447-a872-c02f956143f8	1	Other	Other
+9cf4cf91-2477-4f9e-88ad-c0764c8a567f	1	\N	Other
+9cf4f257-0195-4358-ac51-ef75cac88971	1	Other	Other
+9cf4f7a9-0821-4d43-958f-08505f96415e	1	Other	Other
+9cf59166-a016-4b6b-9563-f6c6fc9fc039	1	Other	Other
+9cf5b928-6c39-496c-b63a-fd125bd79e6d	1	Other	Other
+9cf5d7e6-8ec6-4518-8153-db7a1a073daa	1	Other	Other
+9cf64838-3a1b-43f8-b302-3e5b4b7f846d	1	Other	Other
+9cf64962-0588-48e5-954d-b4cf28372bab	1	Other	Other
+9cf64f0b-eb79-4959-9b08-f6f281301b86	1	Other	Other
+9cf656b4-e37c-4fe1-b2fd-0e73c8a4ab9a	1	Other	Other
+9cf667e5-4efb-42d7-b7a2-95fc8da8d3ec	1	Other	Other
+9cf6af1d-23f3-4402-ac3d-24628546a6f1	1	Other	Other
+9cf6f03e-c0ee-437a-87d1-859be5b0d3fb	1	Other	Other
+9cf70cbf-b2d1-4786-bd41-ee53e2137b25	1	Other	Other
+9cf73d09-e05c-4c2c-ad7c-803fc933a513	1	Other	Other
+9cf744d7-fcc8-4114-9e08-2ff62131c772	1	Other	Other
+9cf758a4-79c7-4eb9-918a-7f99dbad59b4	1	Other	Other
+9cf77205-5453-4c1b-b177-3e6b86903bc2	1	Other	Other
+9cf78940-0784-4dcf-9ac9-c8610b841274	1	Other	Other
+9cf82250-e711-4eac-96db-3e81c29a4b18	1	Other	Other
+9cf85b60-c535-450a-8ec7-53e1b067c07e	1	Other	Other
+9cf8d63d-ab52-4c90-8cd1-ab12d1253da0	1	Other	Other
+9cf90c8e-3f42-411b-989b-d10fa2f0bafa	1	Other	Other
+9cf92d78-1b51-41e5-af0e-a56fec946e8f	1	Other	Other
+9cf943f0-9cf0-4193-a191-81b3773c782c	1	Other	Other
+9cf967c9-d88b-40e6-939b-7052cc4b0855	1	Other	Other
+9cf9834e-7fa3-4acb-9558-50fe906a7e7e	1	Other	Other
+9cf988bd-d145-4fee-bb3f-427a846c8496	1	Other	Other
+9cfa0319-95b0-45e4-a461-7185b70379ee	1	Other	Other
+9cfa4d58-7c29-44cf-a42e-75dd084825ae	1	Other	Other
+9cfa5e2c-6e3a-421d-a273-0bbdf2ca5eba	1	Other	Other
+9cfa7b54-ad1b-4fa9-9bf9-9431dddd6bff	1	Other	Other
+9cfa9af7-c810-446e-add1-b1dd80cddce5	1	\N	Other
+9cfabc79-b109-4c8c-bd49-d4720f24d2cd	1	Other	Other
+9cfaec43-f53a-4005-8ad9-371f03f6f40f	1	Other	Other
+9cfb1d30-8763-4d7a-b0ee-6583afdc65dd	1	Other	Other
+9cfb2538-38b5-459f-ba04-50ceccac7dd7	1	Other	Other
+9cfb6d8b-6d14-4e80-ba8d-12ff8cef01be	1	Other	Other
+9cfb8384-c9b4-4a2e-a21f-8fdb28b85d9b	1	Other	Other
+9cfb86e1-0ca4-4d43-8348-fe57599db8bc	1	\N	Other
+9cfbcb73-a4c3-44b0-a480-02cc444623db	1	Other	Other
+9cfbfaa9-48b4-4af7-9e51-c1a81d42af59	1	Other	Other
+9cfbfcab-d465-46e5-89f7-052bc4f32dab	1	Other	Other
+9cfc47e6-2551-49d8-9b0a-cd6e8b80c447	1	Other	Other
+9cfc5223-202a-4c2d-8c67-c6d639d5d158	1	Other	Other
+9cfc59bb-4f3f-4a7c-8133-ca3613ec4040	1	Other	Other
+9cfc7050-f98c-4501-b147-e1ba3191cd77	1	Other	Other
+9cfc7ca8-5cc3-4122-a0fa-2d2259f989ba	1	Other	Other
+9cfc838c-2f94-4657-8932-76dc6482a53a	1	Other	Other
+9cfcab81-ec0d-4e4d-af08-6afcb6f55c90	1	Other	Other
+9cfd56fa-09c4-4ae0-931d-1f4ff3e93fe5	1	Other	Other
+9cfd746b-69c8-4392-8199-fb56e91553af	1	Other	Other
+9cfdb06e-dec4-4ab0-9e29-ca3ddf1999fc	1	Other	Other
+9cfe26b9-a4fb-4d96-adb7-a8dbc4e95967	1	Other	Other
+9cfe93b5-6599-4115-89fc-e67ce0a45a68	1	\N	Other
+9cfe9b06-bbd6-49fc-9cf3-ad10a9192ad9	1	Other	Other
+9cfebc00-15dc-4efa-9f93-a43bc711a6c4	1	Other	Other
+9cfed2fd-f720-430b-a607-ab08852a1c45	1	Other	Other
+9cfedb34-f5b6-4ee2-9054-c91141b991d0	1	Other	Other
+9cfeff2a-f0b0-405a-8920-5882d72b3937	1	Other	Other
+9cff3e8a-d98a-489d-900d-ca1a4a36dd9b	1	Other	Other
+9cff5190-15f4-4a08-aa68-e64ba760ddd6	1	Other	Other
+9cff5482-ffae-4e30-9e4e-4b9e34567093	1	Other	Other
+9cff8317-0488-47d6-b144-f218f393e58c	1	Other	Other
+9cff9a5d-ceed-43af-b450-bc44eade1ed4	1	Other	Other
+9cffdaba-3e30-4fac-bfa5-f6957aa472aa	1	Other	Other
+9cfff7ff-b0a3-4424-b378-4fa837f6b41a	1	Other	Other
+9d002899-f8cd-42b9-81ec-190b53df2799	1	Other	Other
+9d00d879-6125-477f-b947-ee44fb61fb8e	1	Other	Other
+9d00e5c5-a5f9-4329-a686-5b684df6b2dc	1	Other	Other
+9d015525-83be-464d-a6f7-ce367115be88	1	Other	Other
+9d015dd9-c215-4d00-95b6-b204c0e51111	1	James	Other
+9d015f86-19e5-49a9-95dc-5d011c85f489	1	Other	Other
+9d0170a7-802b-4f25-9d15-3832cca26f10	1	Other	Other
+9d017d97-13cb-4271-9414-2271e7f4bfd0	1	Other	Other
+9d0181bf-817a-42db-9134-ab59687dd94c	1	Other	Other
+9d0194bc-940f-433a-8652-7662e7ccde19	1	Other	Other
+9d01a02e-21e5-459c-884c-9bd22603c011	1	Other	Other
+9d01b05c-5253-4909-95d8-7187ab4530eb	1	Other	Other
+9d01b786-9f4f-4fb1-aef1-ba06b2c131d4	1	Other	Other
+9d01d6d2-4804-488d-a11c-795f7e6ce22a	1	Other	Other
+9d01e15b-d0cd-440d-aef5-f90ca8764af7	1	Other	Other
+9d020bea-2ad4-41b2-aa5d-c2df20b42a9e	1	James	Other
+9d02e2f8-aa1a-4317-8f83-b81230cd6910	1	James	Other
+9d02e589-e04a-41ed-8dd2-d0ff272f789c	1	Other	Other
+9d02e856-ea0f-4bae-bce6-3985b9b5c7c5	1	Other	Other
+9d03005c-147e-44cc-ae96-d4117fa2d7d4	1	Other	Other
+9d0371a3-34f1-4fbc-99d5-c064d21b137f	1	Other	Other
+9d03f943-ee5a-498e-908a-7fd7ff6c3dc5	1	Other	Other
+9d03feab-ab7d-4665-9fcf-d20489c2e03a	1	Other	Other
+9d0405fc-42d2-4f59-94fe-c2c59621bcab	1	Other	Other
+9d045953-2709-4002-a315-203c373cf5b2	1	Other	Other
+9d046a53-1767-4440-898e-e33b452cc899	1	Other	Other
+9d04bbb2-0b3a-4904-8c11-5424671a818b	1	Other	Other
+9d052985-437c-435d-8488-3a302490bef6	1	Other	Other
+9d054310-9794-45b5-ad90-a5f3eae8efcc	1	Other	Other
+9d0577ed-338a-4d66-9fdb-a39f663a5b2a	1	\N	Other
+9d05b13c-3125-43da-81aa-f1097463c13a	1	Other	Other
+9d05f8c3-9ce3-4486-9e29-576d38201481	1	Other	Other
+9d061aaf-0a33-48ae-9473-4155503aadaf	1	Other	Other
+9d066032-9f0e-4ee5-b5ae-fa5a8c80b044	1	Other	Other
+9d074136-622a-45bd-b51c-fa3283e5b002	1	Other	Other
+9d075be7-2e9c-4ce4-a54a-90462d4542a0	1	Other	Other
+9d076849-39a2-42a7-900a-46b1ed759be1	1	Other	Other
+9d078cdb-025d-4949-8722-08635bd05680	1	Other	Other
+9d07a31c-ac04-4f80-8467-42bb6c85c1df	1	James	Other
+9d07b8f5-ff3a-48d5-8a1e-9a0502fbcca4	1	Other	Other
+9d082dbd-4ffd-4b3f-be09-52a074979926	1	\N	Other
+9d085839-af20-4111-80f7-5ef7e11cb2cb	1	Other	Other
+9d08b179-7c70-4ba3-9513-df53eb1a3654	1	Other	Other
+9d08ca18-09d8-40f9-adbb-c30a19773ebb	1	Other	Other
+9d08cbac-155e-415e-b117-9a8620cb18e3	1	Other	Other
+9d090823-efa0-4d1f-9d89-edc9f4d8bead	1	Other	Other
+9d09203c-7d9a-490f-9737-dcac68ea0f27	1	Other	Other
+9d09469d-063f-4793-9f5a-b5fe3bc7c4e6	1	Other	Other
+9d0951f5-fff9-4fd8-a973-77a60abbd1ba	1	Other	Other
+9d09a596-7dbb-4859-9da8-5626f8bf56ab	1	\N	Other
+9d09aad1-1ae3-47d3-bb6d-9cba53ec04b1	1	Other	Other
+9d09ff08-11f3-4b55-a6fd-ea8d93dff4ee	1	\N	Other
+9d0a60a3-776a-4ae9-b1df-2a53a9f588b7	1	Other	Other
+9d0a6d38-d340-4b8b-9e6a-0e0f86e5f561	1	Other	Other
+9d0b1010-be1a-41d8-9be7-a87ee3297075	1	Other	Other
+9d0b5084-2cad-440b-b225-8ae05918f454	1	James	Other
+9d0ba5eb-1508-4e95-b654-5d45d78cad36	1	Other	Other
+9d0bb528-81de-40ca-8084-09d27c310d06	1	Other	Other
+9d0bee85-d31f-454b-bca4-d536b6f7553c	1	Other	Other
+9d0c5567-89ae-4196-83d0-90d8a93f042a	1	Other	Other
+9d0c7b89-3736-4ca1-96a5-e60e005c1f04	1	Other	Other
+9d0cb46b-f7dc-4de8-befa-7a5770c535f4	1	Other	Other
+9d0cb87a-7691-4bc0-a88e-e6de1d0fc950	1	Other	Other
+9d0cf298-335d-4abd-b4b6-4392e1fdb384	1	Other	Other
+9d0d3a06-c223-4638-89a3-5dc678159fa6	1	James	Other
+9d0d3f2a-6708-4cc1-b477-43302179509b	1	Other	Other
+9d0d561b-e4b4-4504-b465-a84e43156c46	1	Other	Other
+9d0d5ea8-e608-4bdd-aed2-0498f8b9e59f	1	Other	Other
+9d0db10f-04ab-4f27-9c9f-9e0d7ae91f88	1	Other	Other
+9d0dcb3b-34f1-4832-98ee-0dccda43d2db	1	Other	Other
+9d0ddced-2b9a-44ef-b2b8-0cc5b3ebe74d	1	Other	Other
+9d0de277-5359-4d38-adcf-6a9d9205a31f	1	Other	Other
+9d0e3641-0e55-42dd-bb80-64851049e2a9	1	Other	Other
+9d0e8cf7-ecc0-4bea-894f-a214464dd8a9	1	Other	Other
+9d0ebdd7-67c5-4c9c-a516-b58af41860bb	1	Other	Other
+9d0ef90e-309c-44b2-af8c-52530aac16e1	1	Other	Other
+9d0f658a-4cd6-4778-bf9e-449e26696812	1	Other	Other
+9d0f72f7-f6e5-448b-876f-8f2e782d4b71	1	Other	Other
+9d0f9256-0c07-40c2-a5f9-a7ad04da7ad9	1	Other	Other
+9d0f9b26-1225-4ad1-a520-f04a3daefc7f	1	\N	Other
+9d0fb56e-b467-48fe-8439-f28fde13a421	1	Other	Other
+9d1015f8-e381-4d5e-9018-c2488277f01c	1	Other	Other
+9d1026fb-e76d-4324-be4b-4109f14cdaf3	1	Other	Other
+9d103698-237f-480b-8338-96271b33cf1d	1	Other	Other
+9d10ab4b-bae7-4c9b-bae4-cbaaaf296b3e	1	Other	Other
+9d10c1d2-45b3-462d-b913-0b98fc98f7b7	1	James	Other
+9d10c94c-b8e2-4cec-94e4-ef222825678a	1	Other	Other
+9d10fdd4-4ada-47bb-bef0-37ed57f9cf25	1	Other	Other
+9d111366-b089-4994-bc5e-1aa45c9b5836	1	Other	Other
+9d1136f5-b5d4-4926-81af-d54a8b0f65ab	1	Other	Other
+9d116c08-a73d-4f3d-9187-a73e082ead12	1	Other	Other
+9d117660-19b5-43fe-9029-f9b61f00ae7f	1	Other	Other
+9d119146-d11e-44da-9258-bc8a801074cc	1	Other	Other
+9d11c203-619a-461f-a69e-fe4ef30c3245	1	Other	Other
+9d11cb25-be25-489f-a804-a79297d9b1e7	1	Other	Other
+9d11f104-172e-4bad-a7d3-9567e7723c28	1	Other	Other
+9d11f521-d1e2-4b99-afff-8fbbb970e11e	1	Other	Other
+9d1201eb-a1a6-4eb4-a663-70e744ec8c76	1	Other	Other
+9d120dca-b4ea-4d71-889d-c7fc1dd109c7	1	Other	Other
+9d122927-2496-4d67-bcc5-b430a288551e	1	Other	Other
+9d12ae92-3c89-4589-8222-74d8ba4fd72c	1	Other	Other
+9d12f7f6-72bf-4ae6-b926-f81fc106997d	1	James	Other
+9d133403-664e-42ef-99b1-6500d7b77c72	1	Other	Other
+9d133622-8957-4c61-bafa-835a21c7d66b	1	Other	Other
+9d135ff2-2d06-4e1f-8dfa-00e0c4a51e9f	1	Other	Other
+9d137662-620c-459c-86cf-95f4ae7fa8fa	1	Other	Other
+9d13a1d5-b233-4e5f-99cd-712b91101191	1	Other	Other
+9d13bc19-a96c-4de9-9245-bd08421912bf	1	Other	Other
+9d13f476-b2cd-40d9-a816-8893ba78a8a5	1	Other	Other
+9d141a04-a749-4c5f-9be1-6a9d567cc63b	1	Other	Other
+9d142845-a663-4662-9475-986e4ead0f5f	1	Other	Other
+9d142ca7-f2f6-4a9e-8907-d7b0ed943000	1	Other	Other
+9d14420f-2902-4752-9d5a-ab4b31d32367	1	Other	Other
+9d144747-c99e-4547-967f-5d36b41084c2	1	Other	Other
+9d145381-11be-44d2-ac89-04267e2c86c6	1	Other	Other
+9d145b7c-2a9e-4011-9b5e-0fd52e29e19a	1	Other	Other
+9d146a68-cd6c-44c5-b344-d9c87ff6c49d	1	Other	Other
+9d147993-1ad0-4e85-bf04-36cb28dff8ab	1	Other	Other
+9d1489d7-b098-401d-8a66-3e29687b0443	1	Other	Other
+9d14d1e8-8ab4-4a7e-9b0b-c4ede54a95b8	1	Other	Other
+9d14d2d6-5880-4584-90b1-c1643eedee71	1	Other	Other
+9d14e2b8-710f-4c0b-9d6e-de0b604f7727	1	Other	Other
+9d14fe85-6eeb-404e-831d-f9b23bc6fcbe	1	Other	Other
+9d151208-8703-462f-8584-90dd9718e88b	1	Other	Other
+9d1536ca-bbeb-4dbc-99f7-a3c69b20cb80	1	Other	Other
+9d15866d-d725-4d31-b220-9150b67571f2	1	Other	Other
+9d15f183-7ce5-4d45-b039-c9db47c2c021	1	Other	Other
+9d162d51-fdd3-45bd-884b-010dcd7d2ae2	1	Other	Other
+9d165e81-58d4-468c-bf93-976e97480ab5	1	Other	Other
+9d166ba6-85f9-42ad-9d2e-666d2c2174b8	1	Other	Other
+9d1678e3-7a33-443e-8540-bb0b2511902e	1	Other	Other
+9d168bc5-d7f1-4f60-8ade-3516e116dc45	1	Other	Other
+9d16b1ef-24ff-4045-a835-8cf0ba45a1aa	1	Other	Other
+9d16fa48-feb7-4eb1-baa9-21e9289b4d19	1	Other	Other
+9d17034a-af5c-4943-b91a-3896fa46cd32	1	Other	Other
+9d1771d7-db5d-44b7-b1b9-2b84e91bc577	1	Other	Other
+9d179d8a-8353-419f-94e4-04a92b138cca	1	Other	Other
+9d17e5a8-ab4f-4fea-a2c0-8cea4f684767	1	Other	Other
+9d17f09e-840d-4328-a0c6-f57488ab29b2	1	Other	Other
+9d18473c-c725-4f5a-9aa1-be16019ecf74	1	Other	Other
+9d190174-5535-4b21-a673-0cd32ecc3d52	1	Other	Other
+9d195288-3f75-4872-a1ea-0ac413741f4b	1	Other	Other
+9d196545-6a55-47e5-bcd4-68904da79d3d	1	Other	Other
+9d196a45-3262-4192-9791-19f5c85394ed	1	Other	Other
+9d19ae01-e2c8-45c3-9946-f32e3bf4fd82	1	Other	Other
+9d19fda5-d969-4600-a62c-74d015c38b91	1	Other	Other
+9d1a3500-bfe6-4644-8bdb-74c4dc8b3832	1	\N	Other
+9d1abb57-a8a8-4c31-a652-a978b400eda0	1	Other	Other
+9d1ace1a-247e-490a-8721-7e6e45ee7d4a	1	Other	Other
+9d1aea72-0672-437d-a0fc-dc7d3ffcae28	1	Other	Other
+9d1b22ee-79cb-4d50-bf9e-f33559741a56	1	Other	Other
+9d1bb843-e1a4-4139-8984-ddaa6d0abbec	1	Other	Other
+9d1c0d3e-21ac-4f10-b98d-d1aab38e44c2	1	Other	Other
+9d1c12fe-ad7b-4e2d-9e7a-e3243e445d5a	1	Other	Other
+9d1c3fba-cd2e-4324-bdec-d458fb104cdb	1	\N	Other
+9d1cb6ab-7034-4e69-a581-6297eab24e15	1	Other	Other
+9d1ce689-119a-4df2-b8e5-1f72a87a4047	1	Other	Other
+9d1d0a5a-85bf-4489-9411-f36d5d51f3dd	1	Other	Other
+9d1d0d14-b116-45bd-8a8e-fd633a40a186	1	Other	Other
+9d1dfd0e-c01b-4e72-8b8e-e805d0e51716	1	Other	Other
+9d1e04e1-fafa-4413-ade5-01e147449b24	1	Other	Other
+9d1e144f-a7ba-4abd-a9d8-782b788f5a9f	1	Other	Other
+9d1e600a-ca00-4b91-a967-07b0d7afa3e2	1	Other	Other
+9d1e7a61-dcf1-4969-9ec8-6eb2f5ac9aab	1	Other	Other
+9d1ed325-2d3c-45e9-ab64-42fe58e85571	1	Other	Other
+9d1ee17c-0cd7-4e34-9d31-e4a40b5edfa5	1	Other	Other
+9d1f42f9-f72d-4666-8baf-8a2253c55f0e	1	Other	Other
+9d1f4e49-2c7a-48e6-bdce-b5fa2e34fe68	1	Other	Other
+9d1fcde8-f9ae-4102-8e9f-d0b935289981	1	Other	Other
+9d1fcefd-4601-4f78-a321-79d659255aaa	1	Other	Other
+9d1fd86c-7943-48e3-8b80-0e99623ace38	1	Other	Other
+9d1fdcdc-9b0e-4a6b-806d-bfe93de8be95	1	Other	Other
+9d1feb18-e5df-4b56-a2dd-75e7fb145b2d	1	Other	Other
+9d207305-bb28-4a23-b34b-fc4704d33d65	1	Other	Other
+9d20ff7a-b3c6-4895-8f08-f2ec95e4b15b	1	\N	Other
+9d2103d1-f3cb-49f9-9b75-4f3b83fd16cc	1	Other	Other
+9d211d2c-1c93-4b4b-bb5e-647887b3ae3d	1	Other	Other
+9d211ebb-8734-4a0e-a3b6-059777a2617d	1	Other	Other
+9d2128a0-e36a-4ec3-a0bd-7e0d232d67ec	1	Other	Other
+9d21610c-edf9-4fc2-8169-969a242b81f4	1	Other	Other
+9d218b40-3a0c-4139-b510-c585cdf5b2b3	1	Other	Other
+9d218dbe-31e6-4997-8117-91da3e8d1ab7	1	Other	Other
+9d22049f-cd38-4ca6-84f1-d0b3ea014593	1	Other	Other
+9d221269-05d7-42c5-995b-1ee68eca6936	1	Other	Other
+9d223765-bbe0-48aa-ac60-cf0b6da783d2	1	Other	Other
+9d2269ee-52e9-41e0-b974-41136c36b141	1	Other	Other
+9d22a2cb-9a61-48a8-95ec-2faa1abc472d	1	Other	Other
+9d22d058-efd9-4f11-80cc-02a34a0f887e	1	Other	Other
+9d22fa2e-0409-43d4-bd91-82947a2a3142	1	Other	Other
+9d23701e-b92c-4fbe-ad7b-b16088dc2022	1	Other	Other
+9d23a5bd-f908-4a68-bf05-8feaf00b240b	1	Other	Other
+9d23ceb8-1340-4342-8125-c9c812f7a331	1	Other	Other
+9d23f14b-ce8d-4f0b-83d0-cf5aa8e19a56	1	Other	Other
+9d24111d-acc8-4e69-8e6e-f7d64ba92893	1	Other	Other
+9d242aec-d87e-405c-9d6f-9f0dfcaa73dc	1	Other	Other
+9d2462c6-339e-40bd-87f3-e2799583e56c	1	Other	Other
+9d254830-890b-4a10-8d55-a7a97aa826f6	1	Other	Other
+9d2558a2-8817-4a1c-b9b5-2f8c2eec46c9	1	Other	Other
+9d257bc4-f379-4faf-8676-869f7d77540b	1	Other	Other
+9d25dd0d-82d7-4d57-b56b-8511aed5985f	1	Other	Other
+9d2607b3-c5e0-4e75-b250-3d98fb46a428	1	Other	Other
+9d26c6d9-2b53-403a-b167-8030b99750fc	1	Other	Other
+9d26f731-ffed-4b41-8468-991d200be699	1	Other	Other
+9d271119-5761-4ab7-a4b0-ea7f2a389cb8	1	Other	Other
+9d271798-2d00-4bbb-9f9f-cb7f4dac52c2	1	Other	Other
+9d27351a-22f3-4be7-aec4-03d3a1743a98	1	Other	Other
+9d276fc6-337a-4870-8b56-f682d787ea15	1	Other	Other
+9d27779f-21b0-4428-8e89-d7c74388e4d8	1	Other	Other
+9d277988-9c96-4a4d-82cf-8c8628738ec1	1	Other	Other
+9d27e43e-54d8-49ad-83a4-39b67210293c	1	Other	Other
+9d27f0f5-f612-4f1f-aec4-932469347dd9	1	Other	Other
+9d282500-77a8-412f-9edd-813bf8ce5859	1	Other	Other
+9d284c9f-c8bd-45e9-bd76-055465bb4cc4	1	Other	Other
+9d287e37-92d0-4e12-baf7-ced438e2aeac	1	Other	Other
+9d2896e0-e287-41e1-ba7c-d8337a830efc	1	Other	Other
+9d2924c9-a546-4699-b688-8be0153ebcc4	1	Other	Other
+9d29641f-3378-40ae-a825-0adcf0fe26d5	1	Other	Other
+9d297353-ee9b-418e-8d5c-adff0dddb81f	1	Other	Other
+9d2a0e28-1ade-4465-9abd-8680a69720a2	1	Other	Other
+9d2a2277-bea9-4fd6-a797-50274ea6eb57	1	Other	Other
+9d2aa99b-237d-45cd-b4e5-55e87e5cfa85	1	Other	Other
+9d2ab8d2-7134-4bdb-9718-cb4dc87101c0	1	Other	Other
+9d2abb88-375b-4467-a151-abe3dda7cb1e	1	Other	Other
+9d2b7416-a584-451f-8203-3bd93dbe04ee	1	Other	Other
+9d2b9be5-346c-4e6f-a86f-c11ad6657e9f	1	Other	Other
+9d2be48c-1878-45dc-9ef5-c84ea31750be	1	Other	Other
+9d2bee6a-76a6-4eec-860c-09113bc5d948	1	Other	Other
+9d2bf796-f7c9-4d39-b02a-1a6384343785	1	Other	Other
+9d2c345f-f7fa-4422-bb0e-dddf0b399396	1	Other	Other
+9d2c39bf-a604-4b7b-b3fc-732b78db0cab	1	Other	Other
+9d2c3e5c-a69c-4260-a0c7-db2f9d6aae81	1	\N	Other
+9d2c4b5c-8460-46dd-b7b1-9eba65dbfcbd	1	Other	Other
+9d2c9ec2-f24f-4a52-8629-4861feb534f2	1	Other	Other
+9d2cb200-1e27-4438-8418-4582df338eea	1	James	Other
+9d2ce96d-d318-4318-a2a9-d8fd01229871	1	Other	Other
+9d2cfefd-bef3-46a5-9d54-02cb39f8b1fb	1	Other	Other
+9d2d2026-f485-4f13-b2c5-a037a30a12e1	1	Other	Other
+9d2dfcb3-1c28-43d3-992d-cefb4699ead0	1	Other	Other
+9d2e5424-ac7b-4ae3-874d-abf860fbae9d	1	Other	Other
+9d2e64b4-efee-41c7-91e4-72631cf88a80	1	Other	Other
+9d2e8398-ff7b-4154-9a78-e5b37cea772e	1	\N	Other
+9d2ea8c2-1cde-42cc-97be-32ba453f37e5	1	Other	Other
+9d2eb0b8-4494-4b91-8cae-55028faea04b	1	Other	Other
+9d2ec666-89fe-4f47-9069-0f1bcb9b536a	1	Other	Other
+9d2efc37-ae5f-4456-8d9a-c7c148cad134	1	Other	Other
+9d2f35f6-f1c0-4685-8e38-f17681d43d91	1	Other	Other
+9d2f94bf-3162-4c56-9759-5b19d15548f1	1	Other	Other
+9d2fd3d0-4207-4b25-a36f-d649c93be134	1	Other	Other
+9d2fe4b6-f3b1-4eeb-9697-de3280dec74a	1	Other	Other
+9d30c1bf-20a4-47fb-b5d2-f357c12ad11b	1	Other	Other
+9d30df71-ef7d-45ea-b17b-7dedceb66f58	1	Other	Other
+9d30e473-7744-4a5e-9530-d16bb8b013a5	1	Other	Other
+9d310619-36f7-49e3-9f68-de1e4105930f	1	Other	Other
+9d32000a-4b30-4fce-a65b-a5bf175e980f	1	Other	Other
+9d32493c-25e5-49f7-9019-036bb2f0af60	1	Other	Other
+9d326e4a-c8de-487f-830f-57fc0d3df4f2	1	Other	Other
+9d3281f0-8d66-4e6b-bd82-576821c863b5	1	Other	Other
+9d32919a-c59d-49d8-8bdb-7645a66d77ce	1	Other	Other
+9d3299bb-e263-4751-b5f5-3be68df84d74	1	Other	Other
+9d32a984-9fd0-47dc-98d6-6fe2200277f1	1	Other	Other
+9d32b97c-476e-4cfc-8c94-ef5e6eab0226	1	\N	Other
+9d32eb96-756d-49ba-bfaf-6cf8a11c0d52	1	Other	Other
+9d330d77-7360-4e56-82ae-bc78287540e5	1	Other	Other
+9d335e35-1e19-4a76-8130-a7efa124e31c	1	Other	Other
+9d339f86-25f6-4d84-aaa9-c214860e05c1	1	Other	Other
+9d33c9f4-18eb-4578-8250-59614012990d	1	Other	Other
+9d33ce3c-0f0a-450a-9813-6c59cc723ddd	1	Other	Other
+9d33e12a-a163-4abf-b10d-63b8d092beb2	1	Other	Other
+9d33e649-cda8-431e-8918-9667019f990b	1	Other	Other
+9d33efef-d2a9-4d95-b537-f24bb2dfd163	1	Other	Other
+9d340487-c1c2-4847-b9d4-fd07ac7678f3	1	Other	Other
+9d3428ff-e31e-4176-aca4-02ab459a55e4	1	Other	Other
+9d342b69-9b32-4c23-9af0-2b02cbad8339	1	Other	Other
+9d344221-157d-430d-8f06-0b8228634fbc	1	Other	Other
+9d34562e-e719-44b9-899c-cb198282cca5	1	Other	Other
+9d348d06-8b15-4db0-978b-3449f7caacbe	1	Other	Other
+9d349fa0-afc6-4fd7-b359-25aab1e9469b	1	\N	Other
+9d34b9e1-b329-4c5d-a194-7000365b8a9c	1	Other	Other
+9d350520-b655-475d-96f5-c2372a011a12	1	Other	Other
+9d3542fa-b23c-4f35-98f1-652897b83f03	1	\N	Other
+9d35779c-2ad8-4775-afbb-aae30f6e6eb4	1	Other	Other
+9d357f25-a537-468d-a35f-fa4448d48961	1	Other	Other
+9d3589c7-7106-4ab2-9238-adeccf0ced23	1	Other	Other
+9d35dcb5-ae56-489f-a677-8e1a4c69e56d	1	Other	Other
+9d35f815-069e-4a50-840c-aea85eee3895	1	Other	Other
+9d36113e-b740-4956-b922-6594007f3bdf	1	Other	Other
+9d363642-5026-46a9-947e-26b972b3c077	1	Other	Other
+9d3647f6-99de-4d6d-b5fc-ebdc7a17c67f	1	Other	Other
+9d36b68c-0ece-43fb-92b7-e424ca4fabcf	1	Other	Other
+9d36ca62-f17a-4db1-bed6-526f2b6eda1a	1	Other	Other
+9d37282c-1589-4a3b-857a-2356a7d8fb7d	1	Other	Other
+9d374c77-f3db-4e01-8bfd-e38bf821afbc	1	Other	Other
+9d37b8ac-7480-483d-a53a-4087d6f7aea1	1	Other	Other
+9d37ea2a-4b7e-4b7b-be49-2ecefb4c145a	1	Other	Other
+9d37f1de-0d08-4834-b4e7-cb7080acfe1b	1	James	Other
+9d381a5d-b539-43fe-8d67-25fb276f195f	1	Other	Other
+9d382767-87a4-426e-a774-0621f77481ed	1	Other	Other
+9d387dcb-3812-40e8-ae50-4b07cf52e0eb	1	Other	Other
+9d38bd61-6345-4451-bb10-7262c254906a	1	Other	Other
+9d38df85-0d3f-4db4-a510-d3983d520756	1	Other	Other
+9d398fe0-1126-43c3-bc58-56bb75687726	1	Other	Other
+9d3993c4-34d8-4909-a1a0-eb2c33e84196	1	Other	Other
+9d39eba1-13f4-4214-8687-2fd9389c8a19	1	Other	Other
+9d39f703-a4b5-41d0-a861-eef36d20708a	1	Other	Other
+9d3a3886-28d4-4d16-9803-c49fe84d8217	1	Other	Other
+9d3a5c92-a853-44ec-9e0f-4529dfd9443a	1	Other	Other
+9d3a671d-522f-4e83-9c58-7f076cb65db0	1	Other	Other
+9d3a9d8b-eabe-473f-92e8-7af10c92a00d	1	Other	Other
+9d3aaea6-423e-42d6-b512-84c2ee1bca6e	1	Other	Other
+9d3acc19-5540-4b8a-9faa-c3546a1bf27b	1	Other	Other
+9d3ad1e8-1f6a-4960-80d9-3afa28998a3b	1	Other	Other
+9d3ae5f9-d06d-450a-a5e3-622c8ee274d9	1	Other	Other
+9d3af36a-920e-4d87-a046-7d94f8a52f93	1	Other	Other
+9d3b974f-32ab-4a39-8d41-c63a05213767	1	Other	Other
+9d3ba630-ba73-4a72-9979-a948c44d6865	1	Other	Other
+9d3bde01-7d7d-4526-a899-3f372c3a4dc7	1	Other	Other
+9d3c7f47-7aac-4c59-9f6b-dcca8185beac	1	Other	Other
+9d3c8d01-0586-4baa-95fb-23691ce84b5f	1	Other	Other
+9d3cc838-8de9-48c6-a851-309242873b15	1	Other	Other
+9d3ce65d-0c76-43b3-b207-2aaafbc0bd1b	1	Other	Other
+9d3cfebd-31dd-45a2-837e-2d871f6f8a65	1	Other	Other
+9d3d24c6-2a27-4624-bbdb-18796962a18e	1	\N	Other
+9d3d6146-b58b-41e1-8570-d9afd559b209	1	Other	Other
+9d3d82b7-e25f-495b-9f66-b85793008c73	1	Other	Other
+9d3df199-9d1f-4f3c-a5ae-91814bb68667	1	Other	Other
+9d3df9a5-4f9e-4b2a-9647-1c724a00696e	1	Other	Other
+9d3e3443-d9de-4ea5-9fcc-c9aad9371d1a	1	Other	Other
+9d3e4cc5-dbd2-4a43-8f63-122786421d25	1	\N	Other
+9d3e670d-18be-4cd0-ba25-ee6c73ed3d06	1	Other	Other
+9d3e9a09-182c-49c9-bb68-5a7fa92d14a4	1	Other	Other
+9d3e9f0d-6ec4-4df1-b930-787611d8a482	1	\N	Other
+9d3f0cb0-ca1a-448b-92c2-d0d961bc6eaf	1	Other	Other
+9d3f3a9c-e064-4bbe-bbd1-06a10c537cba	1	Other	Other
+9d3f5ce6-7904-41a3-ba9b-7978634405ee	1	\N	Other
+9d3f6931-f450-4092-8cd6-554d83d4336a	1	Other	Other
+9d404d4c-13ae-400b-9a68-49236f399797	1	Other	Other
+9d405cbf-ada1-4e16-a108-fcfa9580a544	1	Other	Other
+9d407ecb-3e3c-4db3-9b0e-9872af48369d	1	Other	Other
+9d4094ff-ff5f-4e15-80bc-e252eb647ea4	1	Other	Other
+9d40fd8e-9b1f-4c1a-9141-deec89281157	1	Other	Other
+9d41271e-454a-45df-8c86-234544aed865	1	Other	Other
+9d41337b-8778-4da7-8300-77d1f0cf8d89	1	Other	Other
+9d41655f-428a-4333-b89e-09e7c2d9f746	1	Other	Other
+9d4191b1-0a66-4c42-babf-6f0f7781cc36	1	Other	Other
+9d41bbc2-235e-4686-bb5d-06dc1d25c459	1	Other	Other
+9d4243e5-4b08-4a0b-8c74-063c3cc92bb3	1	Other	Other
+9d428c6d-2bf7-4b08-ac19-517b99379d8a	1	Other	Other
+9d42eec7-7830-4ae0-845f-972c04d7ff46	1	Other	Other
+9d431d49-0115-442f-a51a-f9bf2b51ec65	1	Other	Other
+9d434642-acf5-4032-9a5e-6aa0e10e7008	1	Other	Other
+9d438703-a88d-4ba9-ab29-32af2a2426fa	1	Other	Other
+9d43a4a2-97ab-4797-8e32-fa61ed2892f0	1	Other	Other
+9d43b9c2-878d-444a-98a9-57e82296a0c0	1	Other	Other
+9d43d4e0-9d37-4e80-a2d1-e0e26199042b	1	Other	Other
+9d440464-de01-4bbb-ae0d-cf4bee09e920	1	Other	Other
+9d44207f-ad15-4488-9f9f-4c299fcf7d30	1	Other	Other
+9d442537-82be-4fce-b0e4-b356f25615a9	1	Other	Other
+9d445182-8389-41bc-95e0-0743e29f5f37	1	Other	Other
+9d44a23a-4c4c-4cf8-8cf6-bb3e184efb01	1	Other	Other
+9d44a6b9-8722-4a61-a0c0-55351a659863	1	Other	Other
+9d451be2-7c5a-4821-9196-7a98c935336d	1	Other	Other
+9d453dbd-af80-47aa-9c62-59034e27b181	1	Other	Other
+9d45b445-9300-49ac-a467-c1b7123b515b	1	Other	Other
+9d45b6f7-add5-46c1-9450-9b7c9c886ee4	1	Other	Other
+9d45d356-ca20-44f9-931f-82b49b84aa96	1	James	Other
+9d462410-2824-4a67-b1c1-1103ca78e182	1	Other	Other
+9d462844-5611-4f03-90be-a2f33d5d6feb	1	Other	Other
+9d464fff-abe0-404b-9d2f-5465081f9bf3	1	Other	Other
+9d467eb2-0614-42ff-87f0-c05a581e1250	1	Other	Other
+9d469bdc-014a-4271-b04a-8d3d55e00336	1	Other	Other
+9d470466-b0b3-411e-94c9-c3be56edd799	1	Other	Other
+9d4723c5-cd86-40d7-aee9-121bf3fd6e0e	1	Other	Other
+9d4752ab-fbe1-4e85-bfc3-d8e70a268486	1	Other	Other
+9d47570c-317b-45d2-9713-8487424d007b	1	Other	Other
+9d478e1a-c769-4990-8ecb-af07f31cf45f	1	James	Other
+9d47cf55-8633-4cce-8ee7-0e634b31947a	1	Other	Other
+9d47e0b6-3b36-4406-bb2d-d8e613c62b06	1	Other	Other
+9d480d99-35a4-45ba-96f3-0aea5f8af81f	1	Other	Other
+9d4859b1-dec6-4283-bfb6-c7df3d1bd2fa	1	Other	Other
+9d48673e-5f77-4cc6-8fcd-fcc6c5554b37	1	James	Other
+9d4894a0-c08f-41fe-9db0-c6f0470558ba	1	Other	Other
+9d48a50d-54a6-498a-9836-b4b2d7110c48	1	Other	Other
+9d48a5d2-371b-4c36-bbea-6819b1ab07db	1	Other	Other
+9d492b88-e4e4-4438-b611-89073749b75c	1	Other	Other
+9d4995b3-8e48-41e0-8ca2-488f3e48eacf	1	Other	Other
+9d49b209-fe9a-4dfa-af2a-c426ba064169	1	Other	Other
+9d49eeea-c0e2-4536-9522-50d5129f3c89	1	Other	Other
+9d4a1a70-79ee-453e-8b58-2f9ac6a4fb9f	1	Other	Other
+9d4a4aa4-cdb7-40aa-800f-07f6022153f8	1	Other	Other
+9d4a5242-b87a-45b2-80a4-167ad24007f5	1	Other	Other
+9d4a8502-bc3a-42d3-8a7a-dcf5d0476111	1	Other	Other
+9d4acdf4-10e3-4430-bd92-7e836b56599d	1	Other	Other
+9d4b3681-ca76-4b46-af0c-580111074347	1	Other	Other
+9d4b4269-9901-4931-92c9-f28a81345dd4	1	Other	Other
+9d4b580e-766b-4cb1-aa37-7c1c936d761b	1	Other	Other
+9d4b58a2-38f4-4381-aab0-8be6ad392a95	1	Other	Other
+9d4b7225-72f0-48d8-af50-2318bb1a7bf6	1	Other	Other
+9d4b8d97-80d9-4438-8c86-cd4283a4ffab	1	Other	Other
+9d4b915c-9232-4de4-a507-0fa30ed1183e	1	Other	Other
+9d4bd3b3-f98a-4d51-832d-b7ec777f437e	1	Other	Other
+9d4bdb7c-8342-4654-bb43-384bbc22936e	1	Other	Other
+9d4be744-5c23-4027-b498-773530c82693	1	Other	Other
+9d4bf4a0-1758-11e8-ae93-fa163e8624cc	1	\N	Other
+9d4bf4bb-63f9-4c7d-b9f3-a25a6e7a36e0	1	Other	Other
+9d4c4580-e17d-46dc-8d34-93e8f1a1886f	1	James	Other
+9d4c47e5-f877-4b31-bc0e-4852c6a9b2c5	1	\N	Other
+9d4c5b15-6134-40d8-9b87-d8f7a24629da	1	Other	Other
+9d4c8ec5-6a18-4d7d-b503-d0d0e8add66d	1	Other	Other
+9d4d245d-02be-4ba4-bdb1-0a6a9191ff0e	1	Other	Other
+9d4d2dcd-b84b-49ca-81ea-5ee204eccbe4	1	Other	Other
+9d4d4089-3ccc-44eb-9c1f-6a671ce3e2c6	1	Other	Other
+9d4d50e5-e23d-469e-8dc3-1af45a7bd073	1	Other	Other
+9d4d6303-f44a-4a48-a7ae-9cd04fd63143	1	Other	Other
+9d4d76c3-efc3-4702-a226-44f04f28447c	1	Other	Other
+9d4db757-ed9c-4943-abeb-b6949a296e99	1	Other	Other
+9d4e8d2b-7e43-4731-9e8c-98bdbf9b9d2e	1	Other	Other
+9d4e8eb2-87aa-4fed-977b-d17f31c5e2c0	1	Other	Other
+9d4fe24e-0668-463e-810f-560fb5ea5144	1	Other	Other
+9d4ffb7d-7989-49c8-aa37-e701ffa642f4	1	Other	Other
+9d5070a4-8c85-4efd-9c03-52af35bcd98c	1	Other	Other
+9d507a32-18b0-41a2-a0ee-79ab96dd5792	1	Other	Other
+9d508765-27f7-4648-87f6-794b45a984a4	1	Other	Other
+9d50b97d-07b5-4130-8f29-ce0953e4e6fa	1	Other	Other
+9d50ebbc-8389-48a6-9608-7f91ba4692c0	1	Other	Other
+9d511ad6-e0ac-4853-a373-c269bcfadcbf	1	Other	Other
+9d511b43-fcbb-444a-900a-79e9df2fb8e4	1	Other	Other
+9d512d2a-58a3-44b2-80c7-8cd2103dae38	1	Other	Other
+9d519090-f0b3-418b-b2c5-32f505bc8de0	1	Other	Other
+9d51958e-0c6c-44b9-9e85-a0a950a93ddd	1	Other	Other
+9d525462-3793-4b41-aace-466108848ada	1	Other	Other
+9d5280d2-79d2-4853-a41b-35aabff4aa35	1	Other	Other
+9d52dd8b-a3aa-4067-b761-4f343caddba0	1	Other	Other
+9d531adf-2255-4da9-9d0b-918b3394a3b7	1	Other	Other
+9d538255-fa2d-4fe1-b497-720e0c1f7bc6	1	Other	Other
+9d53e0eb-1594-423c-a9ae-3e89e8790463	1	Other	Other
+9d53eb17-35e3-4100-a607-e3e520f1ce9a	1	Other	Other
+9d53fcc9-b0fd-43aa-b05f-01866a689caf	1	Other	Other
+9d54796c-dd93-4614-b16d-ac7e62b3de59	1	Other	Other
+9d5484f7-6686-4dfc-960f-d70f9e9a8820	1	Other	Other
+9d549dec-b598-47b9-a7ef-f5b941d55c47	1	Other	Other
+9d54c861-282d-46b9-a3db-279f9a7e0643	1	Other	Other
+9d54e0c6-931f-480b-876b-88a7c37bc627	1	Other	Other
+9d54eddf-99af-40db-aad1-5ca55506edfe	1	Other	Other
+9d551216-903b-46e1-9d92-21926d49087c	1	Other	Other
+9d55a05c-45e6-4727-87b9-af0034fa0eec	1	Other	Other
+9d56065c-f801-4a01-a93a-285ba77d9b76	1	Other	Other
+9d56192a-52bb-4664-905c-c1be160f47ae	1	Other	Other
+9d564084-0e00-4468-b02e-6e75fdcfac7e	1	Other	Other
+9d567fa8-e7da-497e-8f71-89293beaf021	1	Other	Other
+9d569262-d7bb-40df-9b6f-31a40a8f3c9e	1	Other	Other
+9d56a726-77ec-4e21-8fbc-76b2f1f5f714	1	Other	Other
+9d56ac46-5a54-4e3e-ae10-64fb410c8bac	1	Other	Other
+9d56df18-3bee-40ac-99c8-5df2c58017fc	1	Other	Other
+9d56fb41-4873-4050-b48a-a868955a3f01	1	Other	Other
+9d571be9-16ef-4bc7-b7b3-261c143fcd89	1	Other	Other
+9d572ab6-cdb8-4bae-96ad-fd4fe76a3865	1	Other	Other
+9d57365e-3cb2-4442-8ced-9ea0178058c9	1	Other	Other
+9d575437-b67f-4688-8af6-a7aecff503b4	1	Other	Other
+9d57a9ee-565c-43c6-8cf2-daf90ccecf21	1	James	Other
+9d57d607-e7ae-4025-a685-ba01f262fc5a	1	Other	Other
+9d57e4ce-0979-47a2-afcb-a0081237829d	1	Other	Other
+9d586771-cdef-4bec-8e15-f03b624aabac	1	Other	Other
+9d58d35a-6796-43ad-bde3-20cf870e4baf	1	Other	Other
+9d58d8b7-f0fa-44a2-88d3-93aa1d998d21	1	Other	Other
+9d5904db-5011-40fe-910c-6f53c7570a95	1	Other	Other
+9d5965c3-80c1-4835-ad0e-14e49aa3498a	1	Other	Other
+9d5989ca-0bef-4ea5-81ec-353c78cf5c0d	1	Other	Other
+9d598e7e-c3d2-49e9-b0d2-11ae5cb4147c	1	Other	Other
+9d59a2be-4b0a-43e7-b776-906990df0725	1	Other	Other
+9d59e619-e3b8-4f33-b68f-6ac29199a2a5	1	James	Other
+9d5a057e-571a-4800-945b-128d34320301	1	Other	Other
+9d5a1f19-143b-414a-b93f-f0c7e424b701	1	\N	Other
+9d5a231b-6f7a-4773-ab7c-92c5588c4181	1	Other	Other
+9d5ad165-26d4-4b72-b932-5dfac6def51f	1	Other	Other
+9d5ae662-a3f7-4ec3-b96c-989e1b2458a7	1	Other	Other
+9d5b1a44-07e3-4dcb-8e37-53b1bf7a5d15	1	Other	Other
+9d5b5cb3-e97a-4f35-8a4b-09307420cae2	1	Other	Other
+9d5b9d97-2b41-44bd-bfb8-9524587c65e1	1	Other	Other
+9d5bbbf9-2c68-40f7-9236-176b31ee536e	1	James	Other
+9d5bc7ba-9e88-456c-9e74-d399cd943f20	1	\N	Other
+9d5bd551-fdd1-4c0a-b9c5-7ac57adb4eee	1	Other	Other
+9d5c0972-d2ed-4a73-8fde-59978837fec7	1	Other	Other
+9d5c5b9b-e30b-4c4d-9925-b462fae72299	1	\N	Other
+9d5c8f49-e8ea-43e2-b0e0-38b387788838	1	Other	Other
+9d5c9674-62c3-42ba-94c0-4b6266716667	1	Other	Other
+9d5cbd8e-16d6-495a-ba60-fe80c10a1469	1	Other	Other
+9d5ccba6-8c0b-4a32-b6fe-a9d3b53eb9fb	1	Other	Other
+9d5cd7b2-aa89-4fe4-acd0-dc7a33ba1813	1	Other	Other
+9d5ce0c4-825b-4b30-b915-ea837a360f8f	1	Other	Other
+9d5d1027-a49e-4595-b65a-e38322cbdbb6	1	Other	Other
+9d5d2394-9e35-4f75-ac34-6680c2f6e03c	1	Other	Other
+9d5d3db1-dfc2-42c1-85c3-246a87a2afe6	1	Other	Other
+9d5d9e5a-befe-4258-8bf9-e25d08f77ffb	1	Other	Other
+9d5da10b-5f4d-41aa-b42d-db3ff9af2c92	1	Other	Other
+9d5dafbd-f7e4-498b-b2a0-1dac1eb4ae71	1	\N	Other
+9d5dc766-0705-4e4d-8193-a8ad9c967ec4	1	Other	Other
+9d5e6116-7847-4ea8-bfdc-d212e716e299	1	Other	Other
+9d5e8a17-3d7f-484b-8dfd-496a8f8a2b56	1	Other	Other
+9d5f3344-33d3-404a-baf6-66872f32ac62	1	Other	Other
+9d5f4fac-e945-415e-a06d-990564678bea	1	Other	Other
+9d5f697f-1a07-405c-b0e3-bef06d1bde00	1	Other	Other
+9d5faf07-f37e-4829-baeb-efe4185df24b	1	Other	Other
+9d5fcd01-e171-453b-b89e-0526d1bef8fa	1	James	Other
+9d5ffdcf-11bd-4cfd-80c4-0aeb04835fc7	1	Other	Other
+9d600d38-d648-4298-aa2f-73139418f396	1	Other	Other
+9d6032b4-e210-4aaa-99be-1f05813fa980	1	Other	Other
+9d6038c8-994e-4f58-bc5b-4dc72a8bcd8a	1	Other	Other
+9d60ee9c-d727-421d-b1e9-99dc0b5c240e	1	Other	Other
+9d60f816-4627-4aa0-a086-40517ef163c0	1	Other	Other
+9d60fe74-76fd-4fff-8662-3b2b34c0f713	1	Other	Other
+9d6119ff-e8af-4810-861b-3af95f825d88	1	Other	Other
+9d619181-eaeb-4e55-9c54-f393aa1369e7	1	Other	Other
+9d621ab1-f02f-4dba-ba02-0eaaff3e9321	1	Other	Other
+9d622ee9-519c-477c-bbcd-d6beedf30993	1	Other	Other
+9d6276b6-cfa7-4f43-9610-653cee360f98	1	Other	Other
+9d629404-4f45-4a9e-a9be-c729c6ea20d7	1	Other	Other
+9d62b57a-e20c-4b9a-9f75-a39b55b9dd19	1	Other	Other
+9d62bcc7-1f1d-446a-9fc1-48b903315035	1	Other	Other
+9d62def3-2bc9-466f-938a-4b02cb14086b	1	Other	Other
+9d62fe59-1bf2-4c5e-b956-b321a746741d	1	Other	Other
+9d63095f-b350-4abc-bbcd-1d81680d1137	1	Other	Other
+9d633252-d4a2-4e6a-9d48-85cd251aba43	1	\N	Other
+9d636759-d379-4bd2-b738-30d5461e9716	1	Other	Other
+9d639587-719c-44c8-b46a-f8d4b4994ae0	1	Other	Other
+9d63b976-a668-4c9a-ad9d-5bcca0cc43f9	1	Other	Other
+9d63d62a-d5b6-4905-8807-b0adf44ef0ef	1	Other	Other
+9d642a46-74db-4687-afbc-c4e46facd122	1	Other	Other
+9d647d2d-3ebc-4347-9068-fa709ef736f9	1	Other	Other
+9d6488a4-5905-4264-93c0-e3f42ac868af	1	Other	Other
+9d6496c4-76f5-444f-8c3d-5e160655e467	1	Other	Other
+9d649e4d-8710-449f-84a1-b65b0e009f0e	1	Other	Other
+9d64c5cb-8624-437e-9ac4-2438bfa2c819	1	Other	Other
+9d6541ae-e3df-4539-9d3f-804ebb3064a8	1	Other	Other
+9d663672-699b-4496-b202-192eb4c7a7c4	1	Other	Other
+9d665a5f-2850-40d0-8570-245dd7c9fa0b	1	Other	Other
+9d667d1b-cc23-46a3-afa2-95ee8291b78d	1	Other	Other
+9d66854a-28b8-476b-8725-f32491df5ffa	1	Other	Other
+9d66c4c6-381f-497f-aa56-fd73b99cff6a	1	Other	Other
+9d66c95c-20a2-4e87-b1b0-92c73821f362	1	Other	Other
+9d66ee14-5345-49b8-9cfb-e5788cc78d73	1	Other	Other
+9d66f254-8745-489d-98cc-66ef10235fdd	1	Other	Other
+9d66f40f-7abf-4b46-bc7b-c883334e888f	1	Other	Other
+9d6753f7-91f8-40a5-8f90-12b3ee91214b	1	Other	Other
+9d67965f-e4d7-4c2e-af9f-184f3421fd08	1	Other	Other
+9d67a9f7-b828-4d02-9919-28aaf6a9f24d	1	Other	Other
+9d67b1d8-9d0a-4abd-8906-cae050dad46e	1	Other	Other
+9d67c3b1-bf73-4537-b272-821051eeedac	1	Other	Other
+9d67d919-e0fb-4fcc-bae1-e0022b7781e2	1	Other	Other
+9d67f65f-e6b9-4fcc-ade7-42c2d47013ee	1	Other	Other
+9d67fe6e-784d-432c-abbb-466eb8cfaaa6	1	Other	Other
+9d6849db-6e83-4db4-8d3f-fb6077a9470d	1	Other	Other
+9d685a84-72b4-4b57-84bf-f6c6683fabba	1	Other	Other
+9d686d9e-77ac-4f74-987c-b2bc39169116	1	Other	Other
+9d686ff0-c38f-4d16-908b-3a45e8adb9f0	1	Other	Other
+9d68abe1-a6c5-4ff5-8cb5-37ea103e952f	1	Other	Other
+9d699c10-4968-40dd-851c-5661354dc071	1	Other	Other
+9d69b456-e0e1-4f9a-bfc6-420ba11665a0	1	Other	Other
+9d6a18d9-770a-47c4-b139-e78fd0c77201	1	Other	Other
+9d6a8459-73a3-4ada-860f-d4601b270c21	1	Other	Other
+9d6a96cf-91bc-42f9-82a3-5202d2c532ef	1	James	Other
+9d6ad11d-e503-47cb-96df-3f6ca7c0899a	1	Other	Other
+9d6ad9ea-69a4-42e8-988a-c70ae2b452dc	1	Other	Other
+9d6adf65-fcf5-4efe-865f-77cd8c26a5ce	1	Other	Other
+9d6ae82f-947d-443e-8c1b-c79802b3f4bb	1	Other	Other
+9d6b2cfa-345b-47a8-b0d3-982cddab2ca5	1	Other	Other
+9d6b4389-c43a-4d85-baf6-f2055058f489	1	Other	Other
+9d6b498a-d45f-43ad-b3d0-fa0f432a7e6e	1	Other	Other
+9d6b8ba5-7f96-4413-bc65-73d5ff8cee21	1	Other	Other
+9d6ba2a0-4c0b-4bf6-a966-1cccf5b13be7	1	Other	Other
+9d6bc1c7-820c-42a6-8e56-dce601b64937	1	Other	Other
+9d6c1832-1b0a-4ccf-826e-f7e4e379b854	1	Other	Other
+9d6c40f7-df89-4388-b3b1-3dc9184f8e52	1	Other	Other
+9d6cca76-0612-4bad-9700-b88372427593	1	Other	Other
+9d6cdd87-0089-49df-a760-79c7b1f4c560	1	Other	Other
+9d6cf48f-cdf0-455f-aed6-597c04599adb	1	Other	Other
+9d6d7c99-7162-484f-bfb3-1c1f051f3fab	1	Other	Other
+9d6d8639-312a-4cff-916a-49fc6fe5b603	1	Other	Other
+9d6dc9cb-2a28-409c-9d40-6350bab71e4b	1	Other	Other
+9d6df220-90cd-4594-b469-f14ab0e1d35b	1	Other	Other
+9d6df88b-ec91-4b7c-9a10-ccc3f6dcf6b5	1	Other	Other
+9d6e0fa4-a574-4037-82fa-cc1c4ac867ea	1	Other	Other
+9d6e3490-b6b4-4457-933f-4a4a0652f6b9	1	Other	Other
+9d6e4f8d-a037-440b-a215-7624585d409d	1	Other	Other
+9d6e7a74-2f9b-40a6-91b1-040a7d68e2b6	1	Other	Other
+9d6ea5eb-d0b5-4f2d-bf91-cc4ac7f7bc06	1	Other	Other
+9d6eb9c8-99a5-4e99-a9e0-a63ee8064d69	1	Other	Other
+9d6ebb38-23b6-4018-ae70-8d390314bec5	1	Other	Other
+9d6eca29-7362-4cb3-9f4b-9e6989a469bd	1	Other	Other
+9d6f1453-240c-4100-b83f-3c63d58937dd	1	Other	Other
+9d6f2ce4-6346-4a09-91da-ca4a69722851	1	Other	Other
+9d6f4cd9-de95-4a40-bcf8-82bb4c260b2e	1	Other	Other
+9d6f4d68-f508-417e-8c3b-ecd7f0f74b5e	1	Other	Other
+9d6f52cf-1da5-4e47-9f99-7e328d15de95	1	Other	Other
+9d6f80e1-f1a5-4612-81b9-b37722d78aea	1	Other	Other
+9d6fd28b-955c-4a22-9934-9853a81a8d2b	1	Other	Other
+9d6fd509-b5ba-49a9-b68e-82fd10842ad4	1	Other	Other
+9d7013ef-f80b-4282-8480-5fdc1421a14b	1	Other	Other
+9d701d80-5fbf-44ca-ac3b-b8b51cf0fe75	1	Other	Other
+9d70a641-d97a-4afb-97b9-dcdf75006159	1	Other	Other
+9d70a837-0716-4d2f-a4e7-f44b31b049f6	1	Other	Other
+9d70cba9-c56a-4d03-a6e5-2cc6bed94384	1	Other	Other
+9d711303-8dc0-4046-82b8-d81ad44123b4	1	Other	Other
+9d715b0d-7cb4-4601-a76a-959e1265c1ac	1	Other	Other
+9d7187b3-b769-402e-b5fb-6f882a89864d	1	Other	Other
+9d720436-9114-460b-b1f7-9e1df7a83845	1	Other	Other
+9d721331-2b27-49d8-9833-f755d7f4d59b	1	Other	Other
+9d7238e6-eec1-4e02-8061-ca3fe1aab336	1	Other	Other
+9d72d005-8faa-4400-91b3-2463fc01b39e	1	Other	Other
+9d7364d5-2343-4ded-8063-99b1a86a159b	1	Other	Other
+9d73864d-be6a-4e3a-b4b7-bae21cf09592	1	Other	Other
+9d73a61f-bc07-409b-932f-879d04fe9e2e	1	Other	Other
+9d73ac94-0bc7-40da-a0b9-ca351f65ad2f	1	Other	Other
+9d73b37c-4abf-4e4a-b1ba-84df357e0487	1	Other	Other
+9d7417cf-ac12-419a-a5b3-1e6da0b4918f	1	Other	Other
+9d741e02-ecd2-4366-bb05-f8b861e210b8	1	Other	Other
+9d744f70-1f3b-4c8a-a664-fa97f099331f	1	Other	Other
+9d74e9a5-1cc8-4be9-84b8-5ec37ebcd3a0	1	Other	Other
+9d7583eb-c396-4795-a236-26234fb495fe	1	Other	Other
+9d75d036-60e7-42bb-a69e-3ce3d830db02	1	Other	Other
+9d75d3bd-a83d-48bb-a476-ea25fad2a076	1	Other	Other
+9d76d938-abee-470c-8fe6-48a35c1ea642	1	Other	Other
+9d771ee4-5779-400f-9d91-3ad024e7d080	1	Other	Other
+9d77429f-8bec-4797-8153-bba5d600c545	1	Other	Other
+9d77ae56-7bde-4769-93b6-1f3f1c535266	1	Other	Other
+9d77c1f9-d1ac-44c9-ab88-e9ef77e7e8b5	1	Other	Other
+9d77c617-1592-458c-a193-7e0f4739b502	1	Other	Other
+9d77f250-3a86-4220-aed9-3df5319b25d7	1	Other	Other
+9d77f48a-d6ea-4ac2-81e3-9b9fd94133b1	1	Other	Other
+9d78355c-5349-436a-8a73-5249474b15d6	1	Other	Other
+9d786609-b9a1-41aa-bc69-2dfee18f8704	1	Other	Other
+9d788d9c-1331-464c-8378-f36b1906129a	1	Other	Other
+9d788fbc-d6fc-457c-8aee-04e4f30b4042	1	Other	Other
+9d789c54-2e9b-449e-978c-1a451921ef43	1	Other	Other
+9d78b281-4b09-4035-9880-cbe356605ada	1	Other	Other
+9d78cf52-cb75-4eae-a75c-915e27ae83da	1	Other	Other
+9d78e7e9-46c2-46ea-970c-2ab2fdafc872	1	Other	Other
+9d78e828-00b3-4d1b-8f23-f47b78edf4e8	1	Other	Other
+9d791530-0d18-4514-b039-5bc23e146f92	1	Other	Other
+9d7956c3-e9ba-48ba-82b3-54169c7b239b	1	Other	Other
+9d797964-ee13-4c18-bce8-d1ffdbc10c48	1	Other	Other
+9d79bce5-535c-41fc-a480-c701cc2b6207	1	Other	Other
+9d7a37f7-5647-4197-86c7-88979e4bfd74	1	Other	Other
+9d7a6116-3c70-4023-8fc8-6bd843269f58	1	Other	Other
+9d7a7a49-0582-488a-8598-37682a5e81bc	1	Other	Other
+9d7a8b36-ee1b-4f29-884e-273f05d4723f	1	Other	Other
+9d7ae37d-10d9-4f4d-a0a8-79f15837b94f	1	Other	Other
+9d7b96a8-2bbd-4d8c-a204-1bb982dfee00	1	Other	Other
+9d7bd9e1-d3e8-46b4-96f2-3d330d32dad8	1	Other	Other
+9d7bdbf7-4213-4489-adf9-8193192d1f63	1	Other	Other
+9d7bdcba-d834-4fa7-b838-e51a3943810c	1	Other	Other
+9d7c6893-c327-454c-bf2d-60b3c89fefc0	1	Other	Other
+9d7c69b5-0d79-41f2-b795-a483c71fa5c2	1	Other	Other
+9d7c727d-2c85-47dd-bd0c-89898782282f	1	Other	Other
+9d7cdbb2-78d7-402d-b6cc-499e4bbedb7e	1	Other	Other
+9d7d0612-bf1b-40af-925d-747cfe27d20d	1	Other	Other
+9d7d066b-f731-4c69-ab3d-0b36375170b9	1	Other	Other
+9d7d0f1d-a7d8-4922-b12b-6c2151b95eae	1	Other	Other
+9d7d116d-a11c-4d37-a084-4c0eea031e16	1	Other	Other
+9d7d6683-ec42-4c93-9d73-e6030cd871a1	1	Other	Other
+9d7d9c1b-8190-4bca-8df9-d083551f0d07	1	\N	Other
+9d7dab08-59ec-408f-bd72-3f81fd3e9c08	1	Other	Other
+9d7db5f4-9c42-4536-b485-9257c6f12e1d	1	Other	Other
+9d7dd171-a7e7-47ae-bcc6-96737cff8192	1	Other	Other
+9d7e1a2d-e7f8-4836-babd-fe622b3391d2	1	Other	Other
+9d7e2104-7ae3-450f-b64a-3640c16d3cc9	1	Other	Other
+9d7e4d03-936c-4ce6-b4eb-0527c323cd91	1	Other	Other
+9d7e56ba-32a0-4385-8259-167bdb3b8cd2	1	Other	Other
+9d7e7aa0-44ac-4a07-8e93-0380920c22b6	1	Other	Other
+9d7e9116-fe9a-4a2e-a706-f60ebc45bd18	1	Other	Other
+9d7ea9bb-930b-466c-8e83-d748d66dd75d	1	Other	Other
+9d7ee76f-8597-4c5c-a232-6f910d08f21b	1	Other	Other
+9d7efc23-1ae7-477f-b008-232b04592afa	1	Other	Other
+9d7fcf84-5d7c-42a7-9f11-ee473d186af8	1	Other	Other
+9d7ffce6-1758-11e8-b812-fa163e8624cc	1	\N	Other
+9d7fff72-4a26-43a2-927e-330e1cafab49	1	Other	Other
+9d81346b-43c4-4d11-8683-d60ddb573f3f	1	Other	Other
+9d81f39b-418b-41e6-91df-949659b1d67d	1	Other	Other
+9d81f9aa-a7ad-44d4-a35d-d1e8556474c0	1	Other	Other
+9d82648a-dbd6-4741-9a49-6476fe96dc1c	1	Other	Other
+9d828b3b-5e28-4abe-900d-c372bdfc684d	1	Other	Other
+9d829adc-361c-4f64-a3a8-35178cbb5d41	1	Other	Other
+9d82debc-fdf1-47c7-a55c-b3cb90682aed	1	Other	Other
+9d82fb11-dda5-456d-9f0d-accdf8fce440	1	Other	Other
+9d8304ae-566f-4715-9fab-42fbe1a5051c	1	Other	Other
+9d833120-17cc-4054-9f09-d56958b4cffc	1	Other	Other
+9d833744-746c-4448-ae7e-1714f86995f5	1	Other	Other
+9d836ca7-d04c-44f9-9c1c-e36b56400f86	1	Other	Other
+9d83bf9c-0409-491f-ad10-ea53f5150def	1	Other	Other
+9d83d6d1-7db1-4a76-9f6b-2b62fd1c55de	1	Other	Other
+9d83e298-b454-4b3d-9d65-9133ce865e70	1	Other	Other
+9d83f824-6e8f-4cb9-a11e-f087b1dd738d	1	Other	Other
+9d841a07-01db-4b94-af15-e6808105096f	1	James	Other
+9d8505d5-db90-4301-9b42-599cdc6fa48f	1	Other	Other
+9d851eb5-8217-4a69-950a-7c1ae44723e2	1	Other	Other
+9d856713-b7e1-4846-8294-fb0d24c5f14d	1	Other	Other
+9d85b25d-1986-4cf7-a2b3-b6cc3185f426	1	Other	Other
+9d85c16c-7f05-4b28-b2a2-f846d64e86cd	1	Other	Other
+9d85d583-5f70-443c-9533-c44d0e796e29	1	Other	Other
+9d85d6b2-bcad-4b1d-9a0e-c744151872ba	1	Other	Other
+9d85efc6-cd22-42fd-9bb1-06185603f187	1	Other	Other
+9d864764-aa90-4868-a512-62a8eb7ba2dd	1	Other	Other
+9d865d36-d718-4270-8210-1bea56f224b8	1	Other	Other
+9d8669bd-c20d-4697-86eb-67535417eb1c	1	Other	Other
+9d867a12-282f-4ca8-ac66-ba9223b54a2d	1	Other	Other
+9d87008f-f035-4807-abcd-59e63bab0aeb	1	Other	Other
+9d87276b-7869-43d1-b732-82debfc9faf9	1	Other	Other
+9d873634-7e6a-48fa-964a-b5cbfa7af442	1	Other	Other
+9d87766b-c748-4704-85b0-e6ac93c824c8	1	Other	Other
+9d878083-6250-40ab-9ef9-b588182294a5	1	Other	Other
+9d87a6e5-33b5-4e64-abc9-886bacda439d	1	Other	Other
+9d882aeb-0165-43a9-a848-0cbdb8768acb	1	Other	Other
+9d8850d4-9705-43ca-81cb-599a574ba078	1	Other	Other
+9d8909c8-ddb0-4316-b6c4-0efc82107557	1	Other	Other
+9d89253c-9dfd-42aa-93aa-223ea5a044e3	1	Other	Other
+9d898a43-520f-4b90-9068-9e16aa8eab48	1	Other	Other
+9d899b67-63a9-4f14-bfe2-76917799b972	1	Other	Other
+9d8b1f55-ecee-47a8-b12c-76a671a11171	1	\N	Other
+9d8b5f93-3730-489b-bdee-f6781c0b9922	1	Other	Other
+9d8bc7f4-c85e-4bf8-a502-c85923683f36	1	Other	Other
+9d8bf0c1-3ca1-4dd5-aa7e-b10c551db030	1	Other	Other
+9d8c0d82-6363-419c-a4a4-1d7f23036a35	1	Other	Other
+9d8c164e-4c0e-4f2f-b6a2-a18ee23d7e02	1	Other	Other
+9d8c7eea-6ec6-45cd-b704-f77792380536	1	Other	Other
+9d8cb568-c16b-4c9b-91d1-cb94fd90beb5	1	Other	Other
+9d8cbb74-6d30-403f-8dd9-88de90f3c00e	1	Other	Other
+9d8cfced-fb40-433d-a3f9-55ebb966c5e3	1	Other	Other
+9d8d085f-f4da-47a0-a644-1c9db612be23	1	Other	Other
+9d8d0a3f-86c5-4a01-9270-75ce5fa09a64	1	\N	Other
+9d8d46c2-ef2a-457e-bf68-1fade6267c50	1	Other	Other
+9d8ddd7e-0d69-4bfc-a1e8-d2fdfb00a22a	1	Other	Other
+9d8deb73-335a-4f15-9022-fcfd76613620	1	Other	Other
+9d8e6bac-b450-4649-906b-bea8950e7d09	1	\N	Other
+9d8eb0ff-c713-4f76-9d83-0a08dd9260ba	1	Other	Other
+9d8eb3f1-9b63-46c5-935d-74407a6d8da5	1	Other	Other
+9d8ebc08-0d94-4bc4-9588-544a54385a87	1	Other	Other
+9d8ec758-d46e-4bdb-9adc-50856b336048	1	\N	Other
+9d8ecbb0-6d8b-4785-9dcb-ee128c4acbe1	1	Other	Other
+9d8ee44b-8046-41d7-b937-ca211c202693	1	Other	Other
+9d8f1b3f-91ff-4a8d-bc3e-c5f0601d2e3f	1	Other	Other
+9d8f25a7-35fa-4bc1-a2a7-d25326f0109c	1	Other	Other
+9d8f272a-fbf3-4d94-bc5b-55eaa863b7c2	1	Other	Other
+9d8f4622-0eb4-44d8-92a9-e6b8f623a694	1	Other	Other
+9d9061cb-ff6d-4720-9f5a-f1177967bbc8	1	Other	Other
+9d908dbc-c9f2-4c78-bb03-35398e241ddd	1	Other	Other
+9d9095fc-d475-4a32-a61f-fd69f7fe23af	1	Other	Other
+9d90c52c-f95b-47f0-a364-8c2915fa9429	1	Other	Other
+9d90e139-f4ee-4997-add7-de7617bb4852	1	Other	Other
+9d90e18b-9ecd-48ca-9fe9-85eaa854748e	1	Other	Other
+9d9147ef-0b99-4b28-91b4-9540a9522c13	1	Other	Other
+9d915537-6248-46e9-bf01-ae19483888d8	1	Other	Other
+9d9155bc-f10e-434d-b128-432470936b2d	1	Other	Other
+9d915828-ef77-4060-b204-7b6546d147a0	1	Other	Other
+9d919aba-6077-4aaa-ad66-643239bc2967	1	Other	Other
+9d919c71-709c-4ecb-a8d7-8c3d70980bb6	1	Other	Other
+9d91eca5-008b-4315-bf2a-6e158535b843	1	Other	Other
+9d92090d-63d1-4ae5-b362-1efe0eabba12	1	Other	Other
+9d924f15-df3a-4ec1-bc03-235579df0c5e	1	Other	Other
+9d92942c-b3f5-446d-9411-5566a7282812	1	Other	Other
+9d92b56e-2787-4ea4-862e-8486342f5d42	1	Other	Other
+9d92fba8-4b59-41a2-8744-06a3673f7f9b	1	Other	Other
+9d938a99-733a-46d2-8230-3c14650214f5	1	Other	Other
+9d93d0cd-ac9e-42ea-991a-4592abd16ee9	1	Other	Other
+9d94decb-98b5-4b12-a9b6-7bfc03f32091	1	Other	Other
+9d955bb6-d3d9-4182-be7a-86ba6fa55714	1	Other	Other
+9d9574dd-4a19-4252-a4fc-355ea4c907e2	1	Other	Other
+9d958966-0f49-470b-887c-5a6029b6e973	1	Other	Other
+9d95a64e-923b-4908-9a9e-f0a4e335340d	1	Other	Other
+9d95dc65-b00f-4865-98c4-27d5c5179e51	1	Other	Other
+9d95ded0-ad6f-4bae-8a5d-e9a9e0abc59a	1	Other	Other
+9d95e4b9-46ad-49a6-8003-ce707c7123b5	1	Other	Other
+9d964adc-f74d-478f-9b28-5c89c5b146f7	1	Other	Other
+9d965a57-cb76-4b90-a39c-987f556b7842	1	Other	Other
+9d968748-800a-43d3-adf7-4aa06086a13a	1	Other	Other
+9d96d1e7-0f70-47da-bff2-21670dd3b2a2	1	Other	Other
+9d96f97b-978b-4bf3-b327-e54f8a9c92f5	1	Other	Other
+9d970a6f-0b58-4a4b-9004-93c4952d1e1d	1	Other	Other
+9d971829-d93a-4460-bf90-b0b62e4a2745	1	Other	Other
+9d97501f-81aa-4677-855e-15e4a3ceba27	1	Other	Other
+9d97a8f3-ad54-41d3-98db-90a65dd0d285	1	Other	Other
+9d97d053-302e-4fba-90f2-632d3bb31e33	1	Other	Other
+9d980f1c-d5bf-40c9-b9ec-706a466d6852	1	Other	Other
+9d985133-14c7-40d1-980b-7617c109fbea	1	\N	Other
+9d98b225-5fb8-4bcb-939e-bda4900bd681	1	Other	Other
+9d9952b6-9cea-4878-b994-f3c268bec403	1	James	Other
+9d997278-8c25-4618-b027-9848efea1a6e	1	Other	Other
+9d99b08f-0952-4f23-ae2d-f59abf4ebc7e	1	Other	Other
+9d99b90d-41bc-462b-bef1-fcb9d12b6079	1	Other	Other
+9d99db42-a552-4e78-b6e4-59dcf611255a	1	Other	Other
+9d99df7e-e281-447c-84f0-9b5b75745c16	1	Other	Other
+9d9a008e-0fb9-4f16-80cb-51f4e5f271c8	1	Other	Other
+9d9a20f3-f257-457f-be18-bba805681a86	1	Other	Other
+9d9abdc4-8c3c-4fd0-9bc4-5c7e45de50d5	1	Other	Other
+9d9b16e4-6cd2-4257-be5e-7397218b8b21	1	Other	Other
+9d9b4d0d-96ec-4f54-ab7f-38a10c45e2bc	1	Other	Other
+9d9b6c9c-ae2a-49b7-92a1-3313709eacbd	1	Other	Other
+9d9b6ee3-2939-453a-93a3-8f9e951624fa	1	Other	Other
+9d9b76b0-acbb-4776-9e15-95ca619976bc	1	Other	Other
+9d9b8f7d-b80f-4172-848a-cb0a1559101f	1	Other	Other
+9d9bc180-7fd7-4982-9dc4-546b6151c44f	1	Other	Other
+9d9be6ed-a0f0-4450-805f-c57655854760	1	\N	Other
+9d9bef19-c5e2-43ce-80fc-b280513d3e15	1	Other	Other
+9d9c0215-9128-407b-ad90-f7b723ea0e0a	1	Other	Other
+9d9c27e4-bcfa-474d-a93f-f5e4aeeafd25	1	\N	Other
+9d9c38f9-88ab-4fe8-a015-c7d7f430cee3	1	Other	Other
+9d9d88e5-8317-434a-8dad-143b57181965	1	Other	Other
+9d9d98a5-974c-4a7a-afae-2bd2bbae833b	1	Other	Other
+9d9df57d-c112-4890-9aac-3654d0c19298	1	Other	Other
+9d9e264f-a090-4686-b9f3-867efea4f5a2	1	Other	Other
+9d9e4769-a447-49bc-ad1b-93cff9aa776e	1	Other	Other
+9d9e4f47-11bb-4077-ba82-a260d2d3627e	1	Other	Other
+9d9e8f30-6208-4af3-a839-990e17f8f76c	1	Other	Other
+9d9ec742-c920-11e7-ade0-fa163e8624cc	1	Other	Other
+9d9f0787-ee15-4cc9-8fa8-beebf7c2728e	1	Other	Other
+9d9f9841-4855-4edd-8ac3-8bb869ff4c7e	1	Other	Other
+9da075ef-11f8-47ca-a2e1-ae72b1db194f	1	Other	Other
+9da14d44-76c1-4cf1-9d1b-0b730cb7c3c3	1	\N	Other
+9da183d9-2fd6-456d-84f7-fe165cac1ce1	1	Other	Other
+9da19d3d-7ee2-4450-83d2-f06a0003fe98	1	Other	Other
+9da1a441-8792-4cb5-819b-fe93d59f457d	1	Other	Other
+9da1cd1c-d050-4952-a7b3-3d2446d81cdd	1	Other	Other
+9da207e0-7c94-40a2-a7d8-a30b30c2d192	1	Other	Other
+9da22c13-1d15-435e-8801-fb954370bec5	1	Other	Other
+9da24f57-96db-4159-8ea4-98487b95a29e	1	Other	Other
+9da2c918-0c8d-4bae-822b-a461d6214f39	1	Other	Other
+9da2d65e-fb9e-4124-a7fd-fee75962fd1b	1	Other	Other
+9da2e628-4281-466b-a19b-b44358a3c7d1	1	Other	Other
+9da2f983-5994-47af-866c-c9b96c2b6609	1	Other	Other
+9da2fb88-f464-4818-8449-5d7b50dc43d7	1	Other	Other
+9da32b47-8fc1-42ce-964e-974026f24170	1	Other	Other
+9da34dec-86e7-4e8e-baf6-a97a20eac98d	1	Other	Other
+9da37737-18c1-42ce-a3f5-dbc3216792cd	1	Other	Other
+9da3e825-de66-49a8-9bdd-31df58e10619	1	Other	Other
+9da416b5-5abd-4f94-a06c-f8085248264f	1	Other	Other
+9da47f90-65ad-4129-b177-742081b2b8dc	1	Other	Other
+9da48398-b7ae-499c-b749-06a89d5ba7ce	1	Other	Other
+9da4dd44-091f-4615-993c-b07c2a6e7861	1	Other	Other
+9da4e1a2-4cf6-4046-92dc-bac081e897fc	1	Other	Other
+9da5185c-ef93-4fd8-b714-0016b71e194c	1	Other	Other
+9da5b776-2d8f-4559-a787-aa074788fe48	1	Other	Other
+9da605a8-fa9c-416c-9e1b-83dd1f28c4d9	1	Other	Other
+9da62755-7360-4088-8a03-94b61b52036b	1	Other	Other
+9da63494-2997-4932-8072-c412ee212746	1	Other	Other
+9da65c06-1577-4916-89d2-7340fdbf23b3	1	Other	Other
+9da67f57-6fb5-4701-bf56-5d0c09cf2389	1	Other	Other
+9da72898-06b7-44e8-a17a-0f198e3729a4	1	Other	Other
+9da752e7-a4c1-46d6-ab6a-060168280ca0	1	Other	Other
+9da76818-f60e-4f5d-99bb-9f80fa72bbbd	1	Other	Other
+9da78255-af75-4407-8815-18fc1b3b829b	1	Other	Other
+9da797bf-9d3e-4a07-9709-f1bf9e4c9d4d	1	Other	Other
+9da7df42-a15a-46dc-a559-9c82ed8150fb	1	\N	Other
+9da8005b-3ef6-4f4c-864b-9a2d567abb98	1	\N	Other
+9da84811-15a6-4ed8-bc5c-7ea0464b68b3	1	Other	Other
+9da848fc-c16c-440a-ad52-76e8b0b90604	1	Other	Other
+9da85bb5-de5d-40a4-a3d1-180db72f3048	1	Other	Other
+9da897a7-bef0-43b5-8e58-b965bcf67852	1	Other	Other
+9da93c7c-6b89-4382-adac-5a23b49433ec	1	Other	Other
+9da95b4f-36ce-44c0-a7aa-5cdd5067363f	1	Other	Other
+9da994b3-e8b3-481f-a909-a935600b48cb	1	Other	Other
+9da99fb3-dd32-4953-98c7-3c036b5a3e0a	1	Other	Other
+9daa0c51-553c-4eba-85e9-dbb65fb7bbb3	1	Other	Other
+9daa347e-db7c-4c5b-9643-abd85113215c	1	Other	Other
+9daa9bfb-1830-4b7f-a7f1-6186a3c22020	1	Other	Other
+9daab0d2-e265-45bd-8c44-fcf145bc24cf	1	Other	Other
+9daaca1f-31a6-4a9a-a53f-e16314330073	1	Other	Other
+9dab0cb7-d57c-42c7-b287-21d5c75c24a3	1	Other	Other
+9dabffa2-a2c3-45d4-92fc-0be68b37fa76	1	Other	Other
+9dac1d43-c3da-4f6c-8f25-add78ad67276	1	Other	Other
+9dac38e4-3d8f-4170-98e6-060c765aa5e2	1	Other	Other
+9dac4b6c-60c2-4252-9b40-baef9e0d8521	1	James	Other
+9dac752f-7f8e-43ce-914f-e12171726dc2	1	Other	Other
+9dacbaf2-e8c7-4093-a2be-46d9adfd58b7	1	Other	Other
+9dacf809-915c-4abd-b7cb-897d5ecd9092	1	Other	Other
+9dad1ec1-7b77-431f-a72f-5b5189973e33	1	Other	Other
+9dad4106-1089-4657-a369-3b3b760a737a	1	Other	Other
+9dad61ca-630b-48c4-aeb0-199dd4fecd2f	1	Other	Other
+9dade1f3-ba13-483e-a081-30d0199aad32	1	Other	Other
+9dadf70c-1bec-42a2-8924-eef4be88d891	1	Other	Other
+9dae6fdd-0803-425d-93b2-94b93a6c4c4e	1	Other	Other
+9dae7074-06c8-43a0-b5e2-6756dc8af732	1	Other	Other
+9daecf5d-5b01-444d-bb2f-6c418ad8a860	1	Other	Other
+9daee4d3-d4e7-4d16-bb55-820d33ca2553	1	Other	Other
+9daeea35-f1d6-4620-99e4-a05965387523	1	Other	Other
+9daef9fb-90c5-429a-b77c-ebbdb040f5ad	1	Other	Other
+9daf37a7-eabc-4b04-a2d4-e5ab2d3df656	1	Other	Other
+9daf58eb-744c-4561-8cea-7d600bb9fe40	1	Other	Other
+9daf62a5-ddd4-4489-87be-7567d9164ceb	1	James	Other
+9daf6b7c-1f58-49ea-8088-bcc0f76aed8a	1	Other	Other
+9daf9c9c-6a8f-4322-b339-e133eb234336	1	Other	Other
+9dafba53-b2eb-478e-874f-67bf8b362c52	1	Other	Other
+9db02a09-e4b4-4ee3-90a9-366d98c1ed23	1	Other	Other
+9db07272-9b35-4c35-84fd-1a0a9f295eab	1	Other	Other
+9db08439-db1d-4ddc-bee2-f5a920d171b3	1	Other	Other
+9db096e6-21a3-477c-902a-6b50f9e8cb55	1	Other	Other
+9db0d460-840e-4923-9f51-142c5770b616	1	Other	Other
+9db101c5-ba90-4b50-a6b1-d505ddf9b643	1	\N	Other
+9db14ac2-6cce-469d-9283-7e79334ad11c	1	Other	Other
+9db16560-7538-4799-ba61-4520447fff02	1	Other	Other
+9db17f87-62af-4025-9dae-fd3cda1a5ac7	1	Other	Other
+9db18216-6135-4ac5-9f51-e0e05b957887	1	Other	Other
+9db1abcf-a34b-4fd7-a645-147b85557562	1	Other	Other
+9db1f716-0d76-4bc9-bfdc-c9fc948cbf34	1	Other	Other
+9db226f5-c469-4367-9d63-0de0bf2ba7aa	1	Other	Other
+9db23f12-9fa1-478f-b34f-bab64306de5a	1	Other	Other
+9db298e1-8584-4750-af8f-3ccdea458426	1	Other	Other
+9db2d933-0172-41c8-9dfe-1c826792416f	1	Other	Other
+9db30561-9d76-4550-9cfb-23fbdc80a158	1	Other	Other
+9db31b93-3e57-408e-aac3-146df84e6fc1	1	Other	Other
+9db32740-52a9-431a-a1de-3a796751dcaf	1	Other	Other
+9db33773-079b-4ee0-adff-aaa019e7a8b7	1	Other	Other
+9db33d07-d8d1-40a5-b23b-61e08696cb94	1	Other	Other
+9db35299-bdde-48af-874e-a300ba35a315	1	Other	Other
+9db37aed-fba8-4efc-8ae7-c988ed648345	1	Other	Other
+9db387f5-6439-414d-a18f-e9f2c37a60e2	1	Other	Other
+9db3a94f-3eac-4367-bc3b-0e9d19323c70	1	Other	Other
+9db3ccf1-15b4-486d-be14-87f0ac0872a8	1	\N	Other
+9db3d5ad-216d-4a24-9b94-a62cafeeb1cd	1	Other	Other
+9db3e34e-89f7-411b-85c3-eb023506308b	1	Other	Other
+9db3fab8-9dd4-4c1b-9575-e40201234edb	1	Other	Other
+9db40be8-5bc2-4054-a63c-1b67607b8334	1	Other	Other
+9db42567-65fa-4f67-8be3-18e17edbc43f	1	Other	Other
+9db432db-859c-4b5e-bffa-b3fd54dded09	1	Other	Other
+9db481b0-76d2-4a63-aed8-5fff8b4f3d99	1	Other	Other
+9db49a87-5293-4e7d-9096-582daca0b693	1	Other	Other
+9db4a671-a50b-497e-8b40-fe53de998dfc	1	Other	Other
+9db4c7de-d9ce-434b-a8da-b0ad568800db	1	Other	Other
+9db4cc51-d853-44c5-88af-c0c7a73a90ac	1	Other	Other
+9db4d953-2059-498a-ad9e-39c4d0a30ed0	1	Other	Other
+9db54d1d-ed61-492d-9412-a524a3865e46	1	Other	Other
+9db587d3-7a31-49c1-abdb-86091e41f5d7	1	Other	Other
+9db5bb0b-1798-44d9-8ce8-a4107bfc7b90	1	Other	Other
+9db61df3-ff4c-4985-8e12-bdbc3618af95	1	Other	Other
+9db6238a-1ffa-4638-8af3-17dad354dd09	1	Other	Other
+9db653fc-a7cf-43e5-bd74-1572dd84b64c	1	Other	Other
+9db65cff-c23c-480d-baef-60d5e11c3fee	1	Other	Other
+9db6be5a-d7ae-4be4-a12f-13dfeb864539	1	Other	Other
+9db6f8a6-abb6-44af-aed2-6e1dab675b92	1	Other	Other
+9db7319f-48e2-4957-9482-a6657ce3f967	1	Other	Other
+9db790c3-f188-4707-a071-dc3d21077d8b	1	\N	Other
+9db79347-9329-4fb7-8486-6c6d4aa4025a	1	\N	Other
+9db799c4-2262-4015-a768-92d3d062ac43	1	Other	Other
+9db7aec1-107d-48a5-8ca6-0d3e5dfa1016	1	Other	Other
+9db7af70-72fb-497c-a23a-61cc47a3960b	1	Other	Other
+9db80ae7-634b-4679-b367-008525174c4e	1	Other	Other
+9db82498-be19-49d4-9a3d-7dcb7a9e7cea	1	Other	Other
+9db834f8-6a3d-4ae6-baae-7c3b360b5bae	1	Other	Other
+9db84f5c-e69f-4840-ab16-cda963e09746	1	Other	Other
+9db85f1c-df3c-43bc-9fae-3b4b4ed87671	1	Other	Other
+9db85f92-53e4-4d39-8dd3-c7626c90ce0c	1	Other	Other
+9db86a32-56c9-4d8d-b9b8-6acd83bb5248	1	Other	Other
+9db89893-9d99-4fad-94e3-56a1ba357e71	1	Other	Other
+9db8dbfc-c4b8-434d-bb0d-aa4da9b7151b	1	Other	Other
+9db94a1f-fb01-47f5-b77e-e6d9e9511634	1	\N	Other
+9db963bf-79e1-48a6-b7fd-a9a5af1a17dd	1	Other	Other
+9db982d8-0c27-440b-916d-fa5735d43603	1	Other	Other
+9db9d3b3-69f9-468b-9564-b3e34834b699	1	Other	Other
+9db9ff98-46c3-4c94-88a2-a8cd1d047077	1	Other	Other
+9dba2064-af5c-4300-b310-0fdf8f038315	1	Other	Other
+9dba6b61-3467-48f3-a678-258dd019f0fa	1	Other	Other
+9dba7e45-66b1-4624-b1a0-7a7c17da1771	1	Other	Other
+9dba877b-e942-4d41-ae63-b13700b8a070	1	Other	Other
+9dbab190-1c57-4208-9bdb-07dc7c97aab9	1	Other	Other
+9dbace98-c7ae-432f-8c7d-2420bb11835a	1	Other	Other
+9dbafbdb-6c23-4b4c-b603-f6e2d189e06d	1	Other	Other
+9dbb21b8-2766-4c63-97e9-a0329556e967	1	Other	Other
+9dbb5e17-e1f8-4966-bc69-f835d85ffcd6	1	\N	Other
+9dbb94e5-2bbb-4c64-9f85-8657b14cf095	1	Other	Other
+9dbb96f7-07e7-42a4-9479-25284e5025ce	1	\N	Other
+9dbbc711-ffca-47fc-8b34-14e43b6fab98	1	Other	Other
+9dbbe2d8-569f-4391-b9d0-fca92c33faa0	1	Other	Other
+9dbbea71-98b5-4f3d-a235-5c52ab5606a6	1	\N	Other
+9dbbef28-fcd0-431f-9a13-e86f4aed94bf	1	Other	Other
+9dbc0fca-9f0f-4014-a62d-7b9df01ab401	1	\N	Other
+9dbc243c-6154-45f4-96ef-86fbf7e7c0e7	1	Other	Other
+9dbc993e-f077-4355-a1e1-d35ad245e83f	1	Other	Other
+9dbc9cae-c239-4afc-bd6d-c3f6c8010301	1	Other	Other
+9dbce826-44f0-45d5-b672-ebcac9d59ad6	1	Other	Other
+9dbd0263-5cf8-4e45-a4b0-5bc39acb2c6c	1	Other	Other
+9dbd20a3-ae96-49ad-a2ab-501e5a06f72f	1	\N	Other
+9dbd2e45-04dd-4a03-a84d-cdf9a846bf47	1	Other	Other
+9dbd306e-b23c-45ee-a0e6-0ffd3681970f	1	Other	Other
+9dbd3ab2-36e2-47dc-9546-a2f9109f4783	1	\N	Other
+9dbd3c4f-8f63-4e65-8b2f-e5a74ef8dab0	1	Other	Other
+9dbd90d6-4696-4336-9278-b1a8ae511d06	1	Other	Other
+9dbdc03a-70d9-4223-aee9-013fba791c66	1	Other	Other
+9dbdcd7b-0780-4351-b038-c99317f760a0	1	Other	Other
+9dbe08c9-1205-48e2-b693-f2dc4fe8e02e	1	Other	Other
+9dbe201e-d9d7-43a7-a5bf-d9021e295fe6	1	Other	Other
+9dbe2eb6-4ed5-4df5-b72a-90fccc839059	1	Other	Other
+9dbe4053-08e1-452e-b253-4b35a81f3287	1	Other	Other
+9dbe52c7-e866-4337-9f08-f31875b16f59	1	Other	Other
+9dbe5363-77c5-4885-820f-42f9ed05d503	1	James	Other
+9dbe8502-53bf-428d-ab93-13c873973833	1	Other	Other
+9dbf2495-890f-43c6-ba23-06a8e89f0d9f	1	Other	Other
+9dbfc06d-6fc3-47e3-8349-9faee358f16f	1	Other	Other
+9dbfc17c-cac3-4125-9113-a2e509f9a1f4	1	Other	Other
+9dbfd40b-1e13-4532-bf82-6f9e658242be	1	Other	Other
+9dc02b5a-fad7-4922-a1ac-ae46693620e6	1	Other	Other
+9dc06d84-6790-4ef1-aa96-3f3498ceade5	1	Other	Other
+9dc0adcd-e7b8-44ad-a0e7-84cbb7da3bef	1	Other	Other
+9dc0e2fd-2c29-49ee-ac3b-d4f3a8d9b33a	1	Other	Other
+9dc19c16-72bf-490b-8974-c8d9a9d9e680	1	Other	Other
+9dc1cc01-de3c-453d-bb66-5771a93228f4	1	Other	Other
+9dc1db2a-eef7-4173-8c4f-ace3d100c53d	1	Other	Other
+9dc1fe8d-ae17-4d9d-b658-bc419be10289	1	Other	Other
+9dc21dbc-3df0-4ca8-96c3-9d679f22bb1e	1	Other	Other
+9dc24d3b-c373-4ab4-8bef-c2abd87f03ae	1	James	Other
+9dc2bd31-544d-4b12-92ce-9b214820f086	1	Other	Other
+9dc2e47e-06c0-4e71-8b3a-e77780921f55	1	Other	Other
+9dc31e8a-f8ac-4b7a-ab07-6da2eb913635	1	Other	Other
+9dc32bd5-a61f-4059-bbe2-9e14bf4a010e	1	Other	Other
+9dc36f27-5987-402b-b4aa-d528ae7feedd	1	Other	Other
+9dc382e4-7083-4776-b4f8-46d10b7822ed	1	Other	Other
+9dc38329-fdec-4826-b690-fd6ad65b31d7	1	Other	Other
+9dc47b37-6f34-4b4a-b8a5-27757e173660	1	Other	Other
+9dc48854-7217-4ad1-9665-5cb65614b600	1	Other	Other
+9dc4bc47-3c65-455d-8148-6d52c40a9469	1	Other	Other
+9dc4bfcf-7047-41f3-b87a-18c6fb7e674c	1	Other	Other
+9dc4d3c4-4f00-4356-bbbc-2d63f1771b19	1	Other	Other
+9dc50943-4d1d-4b43-b4ab-1d7dcc3972bb	1	Other	Other
+9dc50db3-145d-4d50-b0ab-9c27c2a34d1f	1	Other	Other
+9dc51db5-9e00-41d9-9427-ed8de190c130	1	Other	Other
+9dc5612e-19a2-4c7e-8fd1-597224e9dbe2	1	\N	Other
+9dc5733a-24fb-4d25-9762-3e09db2a1df7	1	Other	Other
+9dc68dca-85f9-4075-b46b-2636ef8ee882	1	Other	Other
+9dc6ebce-9e5b-470a-877d-3503a57ec34c	1	Other	Other
+9dc6f69c-0de5-40e6-8bc8-11feecaf9c45	1	Other	Other
+9dc700e7-1f42-4077-8ec4-d417404819f6	1	Other	Other
+9dc70e36-9091-4283-8343-8aefc1448567	1	\N	Other
+9dc71135-338b-4340-8f34-05a10c19ea73	1	Other	Other
+9dc7194d-a674-49dd-8512-7b34d4b4e453	1	Other	Other
+9dc73c85-3bee-4b4d-9580-8e615d15e4ea	1	Other	Other
+9dc75928-348f-4310-b362-5fdd6a2258a9	1	Other	Other
+9dc7d680-8436-413c-8cbd-f606f05d5857	1	Other	Other
+9dc81495-0d36-491c-a08e-0346be02989c	1	\N	Other
+9dc8349c-5aee-4657-84d8-04b6f3f58abb	1	Other	Other
+9dc845c7-5ba9-4583-b824-3917c5285c25	1	Other	Other
+9dc8596d-16a6-4bac-926f-e98fd73f9667	1	Other	Other
+9dc866a1-ae96-475e-b8fc-6dbdcab624c3	1	James	Other
+9dc86762-a2b9-4a7c-bcd1-e259312c3903	1	Other	Other
+9dc876dd-c9e6-4c36-af1d-8ba17a01050b	1	Other	Other
+9dc88b77-399b-44ba-b766-9d893ef99b1a	1	Other	Other
+9dc891b2-21fc-43e2-8d72-3e93a0049d24	1	Other	Other
+9dc89793-6695-44cd-9b4a-3825e496bbfb	1	Other	Other
+9dc8fe43-5674-4539-90c6-3659fc26ecb8	1	Other	Other
+9dc950d0-abd5-4bf7-8d81-013b5f221d9d	1	Other	Other
+9dc998b7-b674-4dfc-b4bc-e3827dcbe2e9	1	Other	Other
+9dc9f494-67ae-4226-a75f-64d7fc8613f6	1	Other	Other
+9dca0cdb-1205-4108-99ec-41f176ee0601	1	Other	Other
+9dca1254-f691-425d-999f-77726a4f188e	1	Other	Other
+9dca15d5-4033-4079-a061-3011ee190e24	1	Other	Other
+9dcae65d-ea19-43ed-8880-aac3e7f8ce9a	1	Other	Other
+9dcb45ee-1703-4b52-a938-349c512c7129	1	Other	Other
+9dcb7fa6-8b21-4b9b-b073-b587fa4f7015	1	Other	Other
+9dcbaa7e-436f-4cd1-9631-dd617cef4ee7	1	\N	Other
+9dcbb9c9-60c0-47cd-863e-a7a4baa05a20	1	Other	Other
+9dcbbdbf-6902-42e3-ad37-00e6965ab20b	1	Other	Other
+9dcc0786-1b7e-46d2-b4f7-aefe090c2686	1	Other	Other
+9dcc780d-a83e-422e-bb59-1d20a716b6fd	1	Other	Other
+9dcceafd-8981-42a6-b934-bb4fddce810e	1	Other	Other
+9dccf2f1-c979-423e-b6fa-b3da58ea9dc8	1	Other	Other
+9dcd0071-5486-416b-92a8-2fea5f6bfb35	1	Other	Other
+9dcd2a2e-26e1-4176-9faa-423740d9d39b	1	Other	Other
+9dcd31cc-1087-4d36-a9f0-8f17c2758cbc	1	Other	Other
+9dcdbd47-ab3a-4031-8377-9d2c9e0702f0	1	Other	Other
+9dcdc2a4-000c-4769-bc18-abf0c809de32	1	Other	Other
+9dcdd3db-6491-41b9-8f77-bd9fd34fef13	1	Other	Other
+9dce001f-313b-432b-ba22-7922bccc99a9	1	Other	Other
+9dce00c5-8093-4ede-93ff-eed595c26dd7	1	Other	Other
+9dce2f45-04b3-452a-9d66-cf83f2bda344	1	Other	Other
+9dcecbcc-b9eb-49f7-9e1c-c1aa84144093	1	Other	Other
+9dcf1112-bf41-4cda-ad91-9f33137d5500	1	Other	Other
+9dcf7b44-577b-4ef5-84ff-63490234299b	1	Other	Other
+9dcf9b43-7b4f-4311-bb9c-19842ab66829	1	Other	Other
+9dcfda47-6d9c-4386-a315-d90d54338f4d	1	Other	Other
+9dcff278-4a74-43c9-976e-839528bd617b	1	Other	Other
+9dd0507c-847a-486b-a7c0-c5a7ed821633	1	Other	Other
+9dd090d9-99ee-4e85-a5b2-03d67801d62d	1	Other	Other
+9dd0a26c-3b95-47b1-93eb-b4e6ace8eb6a	1	Other	Other
+9dd0e334-c05f-4d9e-8170-54b89da6f4c5	1	Other	Other
+9dd0ee70-e0b7-4535-b5c0-f199ae885192	1	Other	Other
+9dd0f066-df6a-4848-af7d-32a7a12c8017	1	\N	Other
+9dd0fcb6-6489-4490-9853-adc161ce3f69	1	Other	Other
+9dd10a6f-e1ac-4f4e-aff6-25822cb51292	1	Other	Other
+9dd1308d-a95f-4ed5-b73b-b6ad33c69455	1	Other	Other
+9dd14508-11bc-40a3-841f-268b3666816c	1	Other	Other
+9dd17683-5055-47dd-9450-7962c607becb	1	Other	Other
+9dd18c17-ee5c-4b82-ac48-76d4ec81c115	1	Other	Other
+9dd1b17f-7496-4c7b-bff4-6c609ea0e922	1	Other	Other
+9dd1b66e-7f66-4881-8699-7a6c301cf241	1	James	Other
+9dd1ca6b-f90f-44f0-a60f-3bc0e79b75fb	1	Other	Other
+9dd1e08c-c0fe-4b37-ba9d-0b86f3279ccb	1	Other	Other
+9dd23397-d79d-41d0-b38a-86de6b5f20b2	1	Other	Other
+9dd30b93-9429-4eed-9bd1-a0933d117a72	1	Other	Other
+9dd30ee4-a736-465c-a069-bd114ec99bbd	1	Other	Other
+9dd334d0-a975-4737-aa58-75478a68cffd	1	Other	Other
+9dd33e2b-47bc-468a-a8f8-6818e68e7362	1	Other	Other
+9dd344e0-0f42-4ed6-8140-9a1b49c520df	1	Other	Other
+9dd3e8c2-5811-4610-aec7-81cb8b684f42	1	Other	Other
+9dd41b12-2bdd-4dac-91d5-c646de8356b0	1	Other	Other
+9dd43441-dc2b-47bc-aa5a-51303f7ec869	1	Other	Other
+9dd45350-53a5-4972-8acd-a0e6ad1e9ed7	1	Other	Other
+9dd476f0-48a9-460c-80d6-7ef27e7045f4	1	Other	Other
+9dd47f45-a5e2-4adb-919c-f13c298faa0f	1	Other	Other
+9dd4a255-2116-48b5-a0ba-36546baa1e92	1	Other	Other
+9dd4aba2-3a67-4de5-935e-e73c02d6bbac	1	Other	Other
+9dd4e2c1-cda9-40e4-ab45-4ad1ccaf50b8	1	Other	Other
+9dd50c88-27bb-4004-bd99-9c9e1ee5e2ef	1	Other	Other
+9dd5304f-e37b-43a1-974f-12ab420489e6	1	Other	Other
+9dd53cbf-d0d6-43b1-b5ec-70eddc20fcec	1	Other	Other
+9dd56f4a-f98f-4963-82cb-b46325e124d5	1	Other	Other
+9dd5bece-ceb0-4aa8-a04c-fe7f82a4632a	1	Other	Other
+9dd5fc78-57f5-4e10-bbf9-972e97146e7a	1	Other	Other
+9dd60979-9c7a-4b95-a6db-e7330343dceb	1	Other	Other
+9dd65e55-8c68-4de0-b5eb-a98532604f2b	1	Other	Other
+9dd66cd1-b5e2-4834-b6fd-ebc27bbbc9dc	1	Other	Other
+9dd67821-ad34-4b07-9dc6-e895f2dfa1bd	1	Other	Other
+9dd6960c-b3d5-45bb-96de-015fbff10272	1	Other	Other
+9dd6a241-0e51-4d44-b089-3b4b6018c987	1	Other	Other
+9dd6a648-547b-4b76-afdd-06f96745b856	1	Other	Other
+9dd74985-b5d5-463a-9caa-7eba6f9bff42	1	Other	Other
+9dd7801b-6c59-46fd-aab4-cc34444409ed	1	Other	Other
+9dd7caf2-0cb7-4a3f-91af-2c80a8dce564	1	Other	Other
+9dd8fb61-04a8-4e42-8254-6bb4b8fa1c1b	1	Other	Other
+9dd97d34-31d8-408c-aad4-7e8bb90d4745	1	Other	Other
+9dd98587-f1e8-4800-9325-67011d2e998e	1	Other	Other
+9dd9a986-e134-495b-a87f-6a84d3c5147d	1	Other	Other
+9dd9c08c-fe23-4acc-bc37-543f17ab8814	1	Other	Other
+9dd9e096-9f18-43b0-823c-09d51e4dfd15	1	Other	Other
+9dda04d0-5516-4668-8abb-20920eda21e2	1	Other	Other
+9dda2b76-626a-4884-baf4-29091bdb822c	1	\N	Other
+9ddacb5e-44c7-4fe4-b97b-9b72f22f72f1	1	Other	Other
+9ddb2a92-f2df-497c-a022-393e20d679e8	1	Other	Other
+9ddb952e-554d-4f68-a4bc-682a4983abe7	1	Other	Other
+9ddb9938-5162-4b2a-a1dd-5771b4d943f3	1	Other	Other
+9ddbbfa5-96fd-42f1-8e2f-23fe001c18a6	1	Other	Other
+9ddc01db-e39b-4a8a-bdc0-ae32926f121b	1	Other	Other
+9ddc0874-3e8f-4572-abaa-9f523d605cf8	1	Other	Other
+9ddc58e2-517b-4fc5-ac0b-b93b47624e56	1	\N	Other
+9ddc67a2-8dd6-4f15-99cc-c496dfe37458	1	Other	Other
+9ddcb763-9112-4d57-916b-dd68b81b27ee	1	Other	Other
+9ddcc5eb-a59a-417f-a1c6-6759a5bd2ee0	1	Other	Other
+9ddccf39-729c-420b-9181-446f944de034	1	Other	Other
+9ddceebd-dacd-4549-85fe-f56c5e628ff2	1	\N	Other
+9ddd3434-b9ab-4552-88d7-26b994f947a9	1	Other	Other
+9ddd6629-ef1d-466a-aad1-4bc822fb4f22	1	Other	Other
+9ddd79da-c26a-42bb-b710-7a7a21e71c76	1	Other	Other
+9ddd86e8-ef80-4aee-9af2-1a3cfe3d0c6a	1	Other	Other
+9dde1175-a24e-46a3-b50f-9b26abe7b3e0	1	Other	Other
+9dde2a67-ecf6-4332-b88c-37f1e683f168	1	Other	Other
+9dde5ffd-adf5-4fee-94d8-a7fc511dfc53	1	Other	Other
+9dde8293-8332-4db2-8060-c18d0012f801	1	Other	Other
+9dde855e-ebef-4168-b387-1639a7c8ff39	1	Other	Other
+9ddee412-444c-48f1-b349-27c07931657b	1	Other	Other
+9ddf05c5-a21d-4474-9061-a10b576c8520	1	Other	Other
+9ddf2d11-28ef-4c86-928f-a0fb8b027bf8	1	Other	Other
+9de005ac-e522-4ab7-897e-9e71257050dd	1	Other	Other
+9de0391a-7b4d-4197-ae19-857e08ca0921	1	Other	Other
+9de0471e-f49e-4edd-9ff5-08d6fe5462ce	1	Other	Other
+9de0492a-30d6-4d96-9bae-6a55dc6c12e1	1	Other	Other
+9de062ff-632b-4d91-a91e-08e3c80ab413	1	Other	Other
+9de06598-0bae-41d2-a545-7ddf2d0ebe47	1	Other	Other
+9de077d7-579f-4872-bf79-644c7c97e348	1	Other	Other
+9de0bf1a-ca98-41d6-b7ff-893ce4a1c2d7	1	Other	Other
+9de1a01c-2c13-4c95-b91f-9b3161dbc8e7	1	Other	Other
+9de1c9f4-5b1b-44d8-9687-dbf603b561bb	1	Other	Other
+9de22e55-0adf-4789-99c4-e2f124ccf287	1	Other	Other
+9de2731b-f2c9-43be-a27c-1b4306e31be0	1	Other	Other
+9de2ab3e-ee06-4fd6-a0ee-554a50d9abac	1	Other	Other
+9de2f9aa-3307-4c2d-8ca0-fba988115a78	1	Other	Other
+9de30f04-9a1c-4997-a481-bb862b86df32	1	Other	Other
+9de33d9e-44cf-4788-90db-013a0a572ea7	1	Other	Other
+9de381ad-1d18-4246-b350-89a55c337788	1	\N	Other
+9de3b645-051d-4577-aa8b-7ab582ae342d	1	James	Other
+9de3f8f8-34c1-4472-93dc-ac31d0a8b6c2	1	Other	Other
+9de3fdf9-c03b-4ff3-94b6-5acbf7d67819	1	Other	Other
+9de40dba-5ad8-474a-8668-43c794c1a8e5	1	Other	Other
+9de41c48-293f-4421-b265-f204f3045c65	1	Other	Other
+9de4914d-68a6-4d4d-a061-2513f88938a0	1	Other	Other
+9de49443-3f25-4e2d-b7f9-c44a28a453f3	1	Other	Other
+9de4bfb2-40c0-4572-bd17-11db94771dd3	1	Other	Other
+9de4c7b5-6960-45cb-88bc-54bf0a181713	1	Other	Other
+9de50ec1-ba82-4387-978f-f524c0405a1f	1	Other	Other
+9de55063-a6a2-4a17-bd2d-ab252d259adc	1	Other	Other
+9de55463-350a-4a4e-acce-440be8aa34d0	1	James	Other
+9de55521-8249-442e-a400-040e8e4ce08b	1	Other	Other
+9de562fd-7eae-4c72-98c4-931a0a734f4f	1	Other	Other
+9de57eb3-1da5-434a-aee6-ec374e50b54b	1	Other	Other
+9de5a1fc-2414-4736-964a-639c23b4196c	1	Other	Other
+9de5ab71-f988-4cce-a610-467575323a96	1	\N	Other
+9de5b76f-5182-4226-8225-c14d7ca4ec10	1	\N	Other
+9de5e33f-4099-42c8-ae28-174042fe15b8	1	Other	Other
+9de5e5d3-b4c7-4c6c-a186-1f211051d874	1	Other	Other
+9de6061a-5792-4e32-9377-1da89225e72f	1	Other	Other
+9de6569e-2180-4b15-9d32-34ef68504906	1	James	Other
+9de65a19-ba74-43ae-9753-a7563c422ffe	1	Other	Other
+9de68d51-0546-4f0e-8da4-40a8c5d65cce	1	Other	Other
+9de6b4df-99e4-49e5-b68b-db999e2ac78e	1	\N	Other
+9de6f4e4-a68f-487f-a316-bb33f181380f	1	Other	Other
+9de70197-2172-4b68-9ff5-452b97352f60	1	Other	Other
+9de74a85-1cf2-46a0-b02c-bb47d49e4197	1	Other	Other
+9de763a2-59f5-43c7-9f23-f14b510ff98a	1	Other	Other
+9de7dc82-c013-42a4-8875-ff35af9e8e7f	1	Other	Other
+9de7e56d-9048-48fb-9950-723b37007880	1	Other	Other
+9de7fb7a-4655-4192-81ee-363d48a15210	1	Other	Other
+9de7fcc0-2acf-4ba9-bf9b-29e3a3c748aa	1	Other	Other
+9de86d45-20c3-4fa6-8627-0bff6b469abf	1	Other	Other
+9de8d2cc-156d-41f7-9bcf-8d758adf08d1	1	Other	Other
+9de9467b-d485-45c2-9644-f7654b8a7b5c	1	Other	Other
+9de9f254-a302-4d32-aa42-b2cef3bbf188	1	Other	Other
+9dea4158-9302-403f-8172-1971daf9d2f4	1	Other	Other
+9dea4673-b430-46cb-963a-5cd184ea3caa	1	Other	Other
+9dea750f-7fd0-47a8-9d76-1edbede820fc	1	Other	Other
+9dea9401-2c27-4363-aaae-29254fdd4660	1	Other	Other
+9deac03a-7827-4b9f-a53b-4ccbc03b74e9	1	Other	Other
+9deac546-a130-427e-8b6b-7f4d264b176a	1	Other	Other
+9deb09e7-e046-4e57-8c8e-ec4aa7fa300a	1	Other	Other
+9deb1a19-d02e-4214-84b3-c97cf022f32c	1	Other	Other
+9deb568b-867a-4509-873b-f786f5e34972	1	Other	Other
+9deb5795-a0b8-46f5-b0ba-8ec62668b6d9	1	Other	Other
+9deb72a9-a4e5-4744-bb7a-04df47ea0866	1	Other	Other
+9deba34c-a70d-4afa-8ef0-d27c913580e2	1	Other	Other
+9debbacd-e501-40c6-9e89-eb4c46bd3d07	1	Other	Other
+9debfd4a-7474-4eba-b344-3e0020da5a6f	1	\N	Other
+9dec4654-87f6-4870-8b07-7f43cd60002c	1	Other	Other
+9dec6e87-ee1a-4cda-89e3-cc86e67b974d	1	\N	Other
+9deca7c8-ac97-4b96-a0bd-be0f4426c036	1	Other	Other
+9decf2db-e461-4bb5-ae9c-9121e9947ca6	1	Other	Other
+9ded07df-7c05-4389-b811-cf6f00227276	1	Other	Other
+9ded1141-db38-4c96-af12-2b7ca586d354	1	Other	Other
+9ded2877-5755-4299-84f0-2d4549258535	1	Other	Other
+9ded537d-8477-4442-9145-6f035ce3214e	1	Other	Other
+9dedab79-4349-49d0-9791-7d3c5fff9270	1	Other	Other
+9dede017-b36a-48d9-8d58-171e0ec6788a	1	James	Other
+9dedfee9-4bc2-41ec-8717-51ce63834f54	1	Other	Other
+9dee5d4a-56e6-4c90-b073-54461dfc2621	1	Other	Other
+9dee5fff-26a4-4119-b7a7-1d2affb18066	1	Other	Other
+9dee604a-56a5-4bbb-bb04-3190a24ab49b	1	Other	Other
+9deeb95e-dc9a-46c7-9096-f4818b0fad98	1	Other	Other
+9deec0ce-13f6-4aa6-a2a6-1c1487a02595	1	Other	Other
+9def45a6-11de-408e-b243-259a030aa4c3	1	Other	Other
+9def7ce4-ff9d-4c1d-b4b3-ff57453b315e	1	Other	Other
+9defadbd-28c6-4882-9c0d-b89fa30c46ab	1	Other	Other
+9defaed9-55ca-4671-86e0-8fdf0ca72e6b	1	Other	Other
+9df071aa-1ce0-4f24-8c01-e504ac555f93	1	Other	Other
+9df0be10-ba4a-4450-9523-43adc5ad8214	1	Other	Other
+9df139a5-8d77-4e1b-af51-8c4a4bb7601d	1	Other	Other
+9df16a49-1ca5-4e48-8bea-726427f0e4d4	1	Other	Other
+9df17307-19b5-4143-b5f6-acd295b2145a	1	Other	Other
+9df176c8-7dc5-4c2d-b1ce-6fa3066c4be4	1	Other	Other
+9df19ce7-ecf5-4381-a06d-a7918d5b7b1b	1	Other	Other
+9df1fc3f-b2fc-4c9c-8b0b-7dcd24297b54	1	Other	Other
+9df22e2d-04b5-4057-a819-b706f272be09	1	Other	Other
+9df24d66-4ac8-4a9f-b578-55e0e782edd0	1	Other	Other
+9df29cf4-e86e-4a05-8b11-3e1da6f41a60	1	Other	Other
+9df2ae18-1451-4efc-99fe-8a0f556c851e	1	Other	Other
+9df2f0dc-2934-439f-b3f9-581e246a2bbf	1	Other	Other
+9df3482e-1c07-4158-97f3-a7160168c4e4	1	Other	Other
+9df35511-c8db-4fe6-9e29-6a3b3aab829b	1	Other	Other
+9df36789-2381-483a-99c3-0de00b84a184	1	Other	Other
+9df3d792-a6d7-49f3-9cee-4bae50244b99	1	Other	Other
+9df3e29c-87fc-4bf3-b442-695fc690dff8	1	Other	Other
+9df3ef20-2b4d-41c9-b2d3-1e572ce31eff	1	Other	Other
+9df407d6-f210-4bb6-bb61-d6f0917a317b	1	James	Other
+9df40819-80ed-4a1b-bacd-f9d27eea6f33	1	Other	Other
+9df43203-c04c-4264-bbc4-33a666ce45cb	1	\N	Other
+9df4447d-ba48-4832-8a51-4ba1a88648f5	1	Other	Other
+9df461da-30a6-4505-82b2-eccf85d2f6f9	1	Other	Other
+9df4bffc-5940-4d91-a793-4b0290610ad4	1	Other	Other
+9df4f562-444a-4781-b600-bdbc661f81d1	1	Other	Other
+9df51748-5c1a-4d12-89e8-db2fe23224f7	1	Other	Other
+9df51bb1-c4c0-4cd4-b19c-5cb77421a6cd	1	Other	Other
+9df57e63-c02f-4da1-85c0-73a43c7a308d	1	Other	Other
+9df57fab-792a-4678-9cd0-8e06d08113e7	1	Other	Other
+9df5a36e-5b33-4481-a371-185110b4032f	1	Other	Other
+9df5e1e7-1da4-42dd-afee-0eaea15290f1	1	Other	Other
+9df60842-0c77-4c0a-8398-a769793eeeb1	1	Other	Other
+9df614b2-fe51-4f2d-888a-adf62ff69c7d	1	Other	Other
+9df62de7-5f28-4cbc-84f5-d7f0316a9245	1	Other	Other
+9df65fbc-3ca2-42c5-b2d7-00dbc221d0f8	1	Other	Other
+9df67201-0b1c-40d7-9a00-89b40b10ca4d	1	Other	Other
+9df672dd-4ad6-4ff3-bd66-f80765439696	1	Other	Other
+9df6838b-a1e1-472f-a32c-19877a855217	1	Other	Other
+9df74d2c-88fc-4eb8-8087-6b98e95ba2a1	1	Other	Other
+9df75dac-ea5f-4919-ad19-c3c69805eff4	1	Other	Other
+9df78fb7-b3b9-4d53-9087-583de75e62fb	1	Other	Other
+9df7983b-49f3-4e95-9be0-fa8d716d8b06	1	Other	Other
+9df7a01c-108a-4244-96ca-4dc75885573d	1	Other	Other
+9df7a606-a28c-42a1-be0f-918320f2490c	1	Other	Other
+9df8102e-8dcb-4de6-b700-84371a8109ae	1	Other	Other
+9df82156-5cd7-442a-a9b0-f8f1f681a5ea	1	Other	Other
+9df8218e-c505-49a0-a0be-4426a8d7530a	1	Other	Other
+9df84374-2b8b-493c-a44f-e143a387e67e	1	Other	Other
+9df86110-dd30-4c15-a5cb-65fe12182092	1	Other	Other
+9df8769b-54ad-4f9f-9a8b-8c0da9446800	1	Other	Other
+9df8ab5b-2bfd-4de1-a790-1be2bf73ebc2	1	Other	Other
+9df8bdca-2d15-43dc-b210-9505de90e4a9	1	Other	Other
+9df8d096-d860-4886-808b-a36f55640b01	1	Other	Other
+9df8d3b8-62b9-49c2-8670-1335219e54e7	1	Other	Other
+9df8d9fc-b064-4a1b-b0db-b1f33710600b	1	Other	Other
+9df8e139-4714-4540-b3f1-1879c7125988	1	Other	Other
+9df90837-3657-4d09-8b09-454fba4228e2	1	Other	Other
+9df92eb3-5661-408b-a907-4d143e6e5332	1	Other	Other
+9df93adb-d053-4cc5-82d0-074c7e6c5755	1	Other	Other
+9df9478c-e4f7-4e6d-bba7-f7fcc9c48b76	1	Other	Other
+9df947f8-4e24-452e-89f2-37242f583a7d	1	Other	Other
+9df956d7-6cb3-4ae5-8ce2-5f2e1bcecdb5	1	Other	Other
+9df95f7a-6928-4eda-9fac-da6ca1ecc31f	1	Other	Other
+9df966c2-e01d-4398-a31a-445088f7c690	1	Other	Other
+9df98c69-41ec-43c1-b978-1313d86f43ce	1	Other	Other
+9df98e54-603e-4aaa-b4d3-b7da7c4ad1a9	1	Other	Other
+9df9b005-c067-41e1-93b4-ecb5f4bba8c7	1	James	Other
+9df9d5fb-d5cf-46a3-b0a7-1c132bb56426	1	Other	Other
+9df9e332-0ac7-4859-b301-97217aaf82c3	1	Other	Other
+9dfa6d4a-ab1f-49c8-9575-61c523f5c1bd	1	Other	Other
+9dfa8373-d0ab-41e3-be15-6a8b8d7f3691	1	Other	Other
+9dfa9850-4500-4d04-b16d-eb33888f5249	1	Other	Other
+9dfab25b-bdfb-4c16-a725-09837bb54737	1	Other	Other
+9dfada96-e327-49eb-8e2e-3373da898e48	1	Other	Other
+9dfaf36c-239f-11e8-9e38-fa163e8624cc	1	Other	Other
+9dfaf63a-0f6c-4ca5-a19b-e05442460002	1	Other	Other
+9dfb3068-cca9-4f3a-b700-486191d4f5aa	1	Other	Other
+9dfb3cf4-eb05-46b0-a4cb-3ef2adc9a314	1	Other	Other
+9dfb9dde-a54a-431b-bd67-dfb748c986f9	1	Other	Other
+9dfbf524-f200-4359-b50e-7c83acb8c3ee	1	Other	Other
+9dfc0d6b-efa9-4bc9-90c0-cacde9c1c2e3	1	Other	Other
+9dfc102e-e9a4-4517-a251-3ed08ae706c7	1	\N	Other
+9dfcb8e7-2e95-4c7f-9865-23a652deac41	1	Other	Other
+9dfcc4d6-686a-4c06-84f7-7cc9ea38f33c	1	Other	Other
+9dfce7c0-9d57-4898-a2b0-099745e207e6	1	\N	Other
+9dfcf6e3-6869-4f9a-ba64-e77f9fc4f2fb	1	\N	Other
+9dfd059e-d361-4174-b100-f92fbb8e75fc	1	Other	Other
+9dfd1088-a8b2-4dc7-b561-c6114dd75f92	1	\N	Other
+9dfd3842-867a-47c7-bb5d-d1bf6c7debf3	1	\N	Other
+9dfde654-4169-4a6c-94e8-2fde75fd1b5e	1	Other	Other
+9dfe2982-bc37-4e38-be6e-d5802c8185a2	1	Other	Other
+9dfe5aa2-a89d-490d-8cfc-95436dfa2c88	1	Other	Other
+9dfe5e6b-b705-4755-a9ad-9bd1fd48d0b2	1	Other	Other
+9dfeac09-ea16-4884-b5a3-ec2a1c77695b	1	Other	Other
+9dfeeb49-757d-4165-8ffd-fb84b498d543	1	Other	Other
+9dff51ba-592d-4cae-b62a-9a5bdb465627	1	Other	Other
+9dff5d42-c927-4fdd-b8c0-7527dd7b960d	1	Other	Other
+9dffe7c8-2a73-44f5-ae03-73ce70707019	1	Other	Other
+9e002f78-ef6e-43bc-80d2-2ac6dbf70d31	1	Other	Other
+9e0030ec-2d29-4a1a-9e41-0fdbdb10c7c9	1	Other	Other
+9e008ab3-43b7-4f81-9aff-6013fd1ad820	1	Other	Other
+9e00cdc2-707a-4596-8684-29275ded3695	1	Other	Other
+9e00e4e7-e315-41e9-ad50-2b5004822e22	1	Other	Other
+9e013ae0-a848-448a-b9c0-8b9ed55c766d	1	Other	Other
+9e0169f8-5f11-4735-b7e2-ec9234fb9fb4	1	Other	Other
+9e016a16-444f-498e-b443-51153610a8b3	1	Other	Other
+9e019168-cfe6-4b03-ac06-38d71968348b	1	Other	Other
+9e01dd3f-e66e-4ba4-a238-341f783ab45a	1	Other	Other
+9e025b29-52d6-4a21-a553-2a997ad40e93	1	Other	Other
+9e026450-7fa9-413f-87e6-96b906f55ef7	1	Other	Other
+9e0282c4-857b-42fb-a10c-d0216b814ffd	1	Other	Other
+9e02a95c-bb0f-4c2a-ad13-7f5cf5b703fa	1	Other	Other
+9e0363e2-a210-4f62-aa0e-56ed85ab0364	1	Other	Other
+9e0437f3-7120-4e01-81e6-d60da653241f	1	Other	Other
+9e0438a5-d5a2-4701-bc9f-b8510aea59f0	1	Other	Other
+9e04caaf-2c51-4793-9068-a797c7c5cddf	1	Other	Other
+9e04ff1e-f323-488b-93ea-6d45be02a3ad	1	Other	Other
+9e054b09-1b54-44a7-b9d8-0e49b17a52a3	1	Other	Other
+9e057bbf-805e-4df1-9e84-eb9cd8a50e38	1	Other	Other
+9e058a87-2ba5-4393-8329-ccf3666dd4b6	1	Other	Other
+9e058d56-be41-4d6f-9158-066b05ea49b0	1	Other	Other
+9e05c435-6cd2-40bb-80e5-544c180e8ed9	1	Other	Other
+9e05c638-2f43-46b6-8a95-b37df16d7a94	1	Other	Other
+9e05cc9d-8901-44f7-a2c0-7d98a7c9b9ac	1	Other	Other
+9e05dab6-9a0c-487e-a370-657e69e48bfc	1	Other	Other
+9e064e8a-24c7-4cf8-a4fd-bc562d1af065	1	Other	Other
+9e06a0e3-eb72-4722-aac9-c31adc7ceee6	1	Other	Other
+9e06fccf-bc9a-4426-b901-c33da6901c0b	1	Other	Other
+9e07a66c-af7d-498d-8588-1d0a1c2a3463	1	Other	Other
+9e07c167-852d-4d50-aa8c-c2220ec7a14a	1	Other	Other
+9e07f55c-e8d0-4a9b-a7d2-cda2074fc808	1	Other	Other
+9e083e02-8654-43aa-b50c-fc73474221e9	1	Other	Other
+9e084759-3275-4ba7-9c2e-dead5c043906	1	Other	Other
+9e08ca02-1129-4ec3-9f93-5fee6e5ad0e6	1	Other	Other
+9e08ccff-226a-4e9f-b164-2575bb204f4f	1	\N	Other
+9e08fb58-c4ec-48ed-b61b-69e188187055	1	Other	Other
+9e0900a3-d2d8-435f-b49c-5eb27716c3d0	1	Other	Other
+9e090cdb-ee4c-4524-a167-a4899320fceb	1	\N	Other
+9e09257d-283b-46f1-ac8f-712f3a70eb26	1	Other	Other
+9e095dca-db51-4016-861c-6119cad9bfdb	1	Other	Other
+9e096070-e9ad-49f1-a35e-71fb6358dcc3	1	Other	Other
+9e09b52e-fd5c-4553-b76e-96519585fd7e	1	Other	Other
+9e0a3e77-5f8f-467b-b3c0-c9ed209cc824	1	Other	Other
+9e0ac106-421c-4491-8b7a-60ed8692ad66	1	Other	Other
+9e0afebb-291a-47f9-8a10-988c74f1defa	1	Other	Other
+9e0b0a30-a097-4ab7-9812-3a850891d5e1	1	\N	Other
+9e0b93f2-d7d2-4ace-91a5-ca95ffec20ed	1	Other	Other
+9e0c3ebf-8fd7-41ad-8dd8-abcd2e955f22	1	Other	Other
+9e0c6f04-abf1-4c8b-8c5a-0dab38e303fb	1	Other	Other
+9e0c8613-8f75-4bd5-a697-edf4b6eb8979	1	Other	Other
+9e0c9292-8ce8-48b1-8827-6b752861c760	1	Other	Other
+9e0cc248-2b2c-4608-950a-b8af9c4a33d5	1	Other	Other
+9e0ce187-eb7d-4b9d-9007-2e39690c3f7a	1	Other	Other
+9e0d0762-8b89-4b59-80c0-bfcfa81e3b36	1	Other	Other
+9e0d98d9-3697-41d9-b0dd-76caa339dc22	1	Other	Other
+9e0d9c49-a1a4-47db-b055-d7806765ea1e	1	Other	Other
+9e0db9e2-1b9b-4d06-a627-e81b7a96aae9	1	Other	Other
+9e0e2c11-3221-483f-ab86-b5cdd0aa1c37	1	Other	Other
+9e0e34f2-470c-4c5d-ad79-e37dcc5d7c71	1	Other	Other
+9e0e4a13-0982-4bd8-a584-39f1ae967c28	1	Other	Other
+9e0e5516-f4c2-4f73-ba74-9ba792b186d4	1	Other	Other
+9e0e5dbc-8a7d-4a01-803c-b967388c4472	1	Other	Other
+9e0e8da6-d9c8-4d61-b243-4e8db1d4cffa	1	Other	Other
+9e0eb4ba-3dd6-4708-98db-17d185ba0411	1	James	Other
+9e0ecab5-caff-4f0a-a1b1-23639198cecc	1	Other	Other
+9e0ee9e5-e801-42ef-b88c-6d8ddb4b4228	1	Other	Other
+9e0f2a42-7441-4e0d-afb8-43a17870b707	1	Other	Other
+9e0f3a8d-12ad-4554-9531-6fc501e245d9	1	Other	Other
+9e0f53b8-598e-4454-9d2b-2280688c5d78	1	Other	Other
+9e0f6587-20ac-4fef-882b-edfd53fdbb93	1	Other	Other
+9e0f7209-5784-4ada-bc72-982f97780131	1	Other	Other
+9e0fda06-b16e-44db-b940-d047b489374d	1	Other	Other
+9e100ca4-c5cc-4ac9-9ae9-7758a0382f8f	1	Other	Other
+9e10137e-ceee-4970-a5a6-0c93279c5a0e	1	Other	Other
+9e105660-d02f-4aec-89b6-45f39f68cb40	1	Other	Other
+9e10a726-1f15-4444-9a9d-4004179dfe27	1	Other	Other
+9e10d252-86fa-467a-8220-4e8ae7d68625	1	Other	Other
+9e110bc9-aec4-4858-9039-88f8c22ca46c	1	Other	Other
+9e111092-a6dd-4300-bef3-703486b9daa4	1	James	Other
+9e11361c-35e0-40c8-9f04-f0353ccd7672	1	\N	Other
+9e11388b-9244-4d23-a7ce-4ab4ccd7d954	1	Other	Other
+9e115811-0107-4f80-a621-a57b6dfdc683	1	Other	Other
+9e11bcce-d896-438c-8634-6b483ce32471	1	Other	Other
+9e11cfa7-5468-43bd-9406-5464a1919cbc	1	Other	Other
+9e11d12b-07eb-44f9-ae10-9bdba6ae1903	1	Other	Other
+9e11f2cc-9cce-49a0-8b60-2d53df0b4e15	1	Other	Other
+9e126202-5014-455b-b1d6-6d603e404b75	1	Other	Other
+9e12919b-19ad-40d7-a6ce-c0a9dc055c25	1	Other	Other
+9e12c874-c0ff-4e55-aa6c-fe42089efb2f	1	Other	Other
+9e1314a5-b926-4fbb-8ff5-86bf845d471a	1	Other	Other
+9e133532-4209-48fa-8302-2913e1c0da30	1	Other	Other
+9e133cac-e61d-4c67-916d-8c25daa526b6	1	James	Other
+9e13432e-0a8c-46d5-92af-379d922d3bc9	1	Other	Other
+9e135367-f9c3-476f-a3a7-f706c4c44d52	1	Other	Other
+9e135d52-e423-4fc1-892b-3ebe74c06570	1	Other	Other
+9e13d201-e2a0-4cd0-af65-0267b2415779	1	Other	Other
+9e13fb05-2d28-49c1-8f23-aa86681bfdab	1	Other	Other
+9e141447-2f14-4379-baf6-16085ad2767a	1	Other	Other
+9e1423b8-c7d1-483b-aa51-67dd76462d8e	1	Other	Other
+9e142991-e222-4c2d-bbdd-9d9c048195fe	1	Other	Other
+9e14327d-510a-448d-8727-4bc305271478	1	Other	Other
+9e14591d-a046-4066-96ea-3282753b39d2	1	Other	Other
+9e14bdff-63c4-424b-be72-e98f10506a64	1	Other	Other
+9e14d36f-531c-4301-9c6e-da74b8aef634	1	Other	Other
+9e151391-4455-4130-a08c-6edaaf21a79c	1	Other	Other
+9e152e6a-6a8e-4126-87cf-7bc5e00ffaf8	1	Other	Other
+9e154507-efc2-4d18-944f-d22719fce670	1	Other	Other
+9e1591e7-70bd-41d9-bec5-092370fbde02	1	Other	Other
+9e15927b-5c06-460d-963e-33f491dba3bd	1	Other	Other
+9e1594b5-5f9b-443c-af12-99791f94f494	1	Other	Other
+9e15d58c-bc03-48c5-a897-d9f36c70a859	1	Other	Other
+9e160239-a4a8-4aec-ad24-f83a17e448e5	1	Other	Other
+9e169d30-38d2-4933-b1b3-472f804121b6	1	Other	Other
+9e16ef9c-4666-4629-b014-cc3009c071b8	1	\N	Other
+9e171e25-7f6e-4eaf-8308-a15a169baca6	1	Other	Other
+9e174741-d671-4532-a37d-cfda19e6c721	1	Other	Other
+9e1770ed-8ea2-4fe2-a4e8-53acdef659ed	1	Other	Other
+9e17da5c-fd77-4593-920d-b421d175e34f	1	Other	Other
+9e17ecc4-78dc-4d84-abe3-1dfc11b440d2	1	Other	Other
+9e18e092-1493-4e5d-872a-0ca4c5520e05	1	Other	Other
+9e18e0c8-5d70-4827-add5-b95528edb717	1	\N	Other
+9e1905c3-22f7-4a24-98d8-2e20ddaefc5e	1	Other	Other
+9e196445-3889-4530-a23e-d552311103f6	1	Other	Other
+9e199ea5-a73a-49f8-8b9a-6c69165f36d3	1	Other	Other
+9e19ac42-1938-4132-b5bd-63bb696c0a36	1	Other	Other
+9e19d0ce-fea9-4745-8e15-a07941f959eb	1	Other	Other
+9e1a2b04-6248-40bf-99a9-32bcc7b00d7f	1	Other	Other
+9e1a7f5d-6cc0-4c2e-85e7-603c75bc1d65	1	Other	Other
+9e1a88f3-349f-44e8-b0df-0629e99430f0	1	Other	Other
+9e1a8ce4-10f0-49d6-b111-2561755a0261	1	Other	Other
+9e1aea79-0adf-49e7-a209-caaa5317bb79	1	Other	Other
+9e1aec5f-2410-43ab-bf3c-6f68df5b7760	1	Other	Other
+9e1af560-062f-4fd8-af85-87ee1ca7dc19	1	Other	Other
+9e1b79f4-d268-4294-af52-30021d98b699	1	Other	Other
+9e1bb92a-6e0b-475c-beec-72be6a899c5a	1	Other	Other
+9e1bcf88-068a-11e8-b8d4-fa163e8624cc	1	James	Other
+9e1be223-aafa-4569-86fc-940157d0d6d0	1	Other	Other
+9e1ca785-74a0-434b-97c5-07a3a5415d5d	1	Other	Other
+9e1d050b-15e3-4423-9690-f7a39e644bfd	1	Other	Other
+9e1d0e33-143e-4fa3-8e68-b87744d4e063	1	Other	Other
+9e1d13c3-9e1f-44d9-8920-b6ee3e813255	1	Other	Other
+9e1d5dde-4cdf-4f2c-bee4-c86e831611ce	1	Other	Other
+9e1d8e8c-c893-4836-978f-683f45ee349d	1	Other	Other
+9e1d9546-6840-45ee-bbd0-13b9fa78636f	1	Other	Other
+9e1dc909-97b9-448c-81f7-8466c5c1c22f	1	Other	Other
+9e1df2c8-c09a-42b8-9d6c-533ca5f768ad	1	Other	Other
+9e1e2be4-55ce-4984-ba6b-5e070c179a5d	1	Other	Other
+9e1e4586-7f02-47d9-bfa0-386449daa1b8	1	Other	Other
+9e1e9fce-7bca-4a5f-8877-7a04cec2909b	1	Other	Other
+9e1ead71-1c93-41a9-acc9-0863a6efbfe3	1	Other	Other
+9e1ec667-2040-4895-bf77-435b2662449a	1	Other	Other
+9e1ed619-c876-4541-88c0-e56cb0b2a7e1	1	Other	Other
+9e1f2c28-c6d4-4ac1-8120-8d96d258fcc2	1	Other	Other
+9e1f6b52-68e2-487d-8093-5b2a1b4d22a6	1	Other	Other
+9e1f7376-080b-4b35-84a3-7898a40e415d	1	Other	Other
+9e1f9a3d-cd50-4d4f-a78d-48020a08d488	1	Other	Other
+9e1fc42b-9884-4ad9-8c5c-24e3a6d2097d	1	Other	Other
+9e20116d-5ff3-4ca4-9482-3965af576728	1	Other	Other
+9e204826-b33f-4c55-b1fb-5016f13819a8	1	Other	Other
+9e207cc6-6043-4c8f-85f9-d92b814311cb	1	Other	Other
+9e207d27-2aa2-4e83-804a-08f5082fa749	1	\N	Other
+9e209b3c-9f50-4d0b-8838-2191d3fd75e3	1	Other	Other
+9e20e7e1-17ce-4916-ad5f-93a41e70f980	1	Other	Other
+9e20eed8-5152-4c36-ab8a-4a4a084a87d3	1	Other	Other
+9e210408-ab8d-48f6-a5fa-587d26e2b7d4	1	Other	Other
+9e21051d-97cf-4524-a656-5c45192f24ce	1	Other	Other
+9e211822-3c56-4b31-9319-631e141889b9	1	Other	Other
+9e212e3a-e540-44ce-8e3a-d91210146c56	1	Other	Other
+9e215c37-b345-4c56-a50e-babff08898a0	1	Other	Other
+9e216e1d-5559-48de-8d24-0b51a7eab2bd	1	Other	Other
+9e217ddc-ccad-4513-8eff-75fbb0e4444b	1	Other	Other
+9e21f6fa-8d7f-4012-9ddd-e54b94c74411	1	Other	Other
+9e21f99c-402c-4702-8646-e2a2395d979a	1	Other	Other
+9e21fcda-0204-461a-80aa-d6740ab85a79	1	Other	Other
+9e22084f-cfc5-4afe-886d-bc3436483fa4	1	Other	Other
+9e220d08-0f6a-4c88-b55e-33a60001fed7	1	Other	Other
+9e223274-f986-474d-89d4-2fa1235dd6af	1	\N	Other
+9e22537b-9a5a-4be1-aaaf-9df3677d7e7c	1	Other	Other
+9e22956a-3226-4baf-b424-ee7db171b90a	1	Other	Other
+9e22af19-ac27-4251-b8df-5f1ba5320b31	1	Other	Other
+9e22e255-f577-4e80-aa87-274552245b91	1	Other	Other
+9e230100-0a0b-4c9b-8f82-d9ace17115b4	1	Other	Other
+9e23325a-276a-461d-b266-de071de1aa1a	1	Other	Other
+9e234437-e0cb-48cf-9505-033c81bc4627	1	Other	Other
+9e237299-1833-409a-a176-19683fc0492f	1	Other	Other
+9e23e77f-17d2-4910-bb8a-12abad0389a8	1	Other	Other
+9e244d0b-be42-406a-8bf1-9a92bd2ba9ae	1	Other	Other
+9e246c9d-8097-4069-bda8-d4aa764ada08	1	Other	Other
+9e24d561-b4dd-430d-8ead-7b52a9f06a0e	1	Other	Other
+9e250a24-67f0-4a8f-8476-114993c100af	1	Other	Other
+9e2511d6-ef1b-41d8-a652-3262aca25dc8	1	Other	Other
+9e252014-61ca-426f-ba59-353119f79513	1	Other	Other
+9e252ba9-82ee-4cc3-8749-e1453133bba5	1	Other	Other
+9e254409-9a66-47b7-9b32-09910abc8144	1	\N	Other
+9e2555df-0fcb-42fd-89e0-3b138f61fbfb	1	Other	Other
+9e25618b-598a-40d8-916d-9b892faaaaf3	1	Other	Other
+9e25eba8-23ab-4b79-9444-15490e2fbbe1	1	Other	Other
+9e264e00-df5f-46a8-b21f-cfe4e4f82c65	1	Other	Other
+9e2658f0-8c67-4216-a065-1eb4f8d860ba	1	Other	Other
+9e26643f-741c-454e-bfd3-ab20c9541f12	1	Other	Other
+9e26781f-05b5-4264-a4bb-c6daa40da18c	1	\N	Other
+9e26bdb7-6ebd-47ea-84ff-bd1e6b2e3021	1	Other	Other
+9e26da30-2276-434c-8f59-06aefe11cadf	1	Other	Other
+9e26fec3-3792-4eb9-bc7a-243368f462dd	1	Other	Other
+9e279511-df83-4f7d-9630-7ceb5731bde9	1	Other	Other
+9e27f2f5-6f28-422d-8185-d7866dd8bc90	1	Other	Other
+9e281213-9bd8-4d66-9035-81fa77b18408	1	Other	Other
+9e281cf0-6e66-47bf-a112-a2da9c338686	1	James	Other
+9e2897a4-bdca-4017-846b-dbd52c90c18b	1	Other	Other
+9e289ee6-aa6d-4586-bd5d-560e6f7fd873	1	Other	Other
+9e28be21-5753-47a9-9953-2b494b9b561e	1	Other	Other
+9e28ca28-4c41-4706-b613-e8c2291f6368	1	Other	Other
+9e28fbd2-766e-4541-82e4-a2231bc85a44	1	Other	Other
+9e290674-c5ab-4416-bfec-5681dba731a3	1	Other	Other
+9e290a60-78cb-428e-b920-f5c6a5cdece1	1	Other	Other
+9e292483-89f7-43e9-b28e-1018c905fa25	1	Other	Other
+9e295106-b9c7-4def-a5fd-ffafab6bac2c	1	Other	Other
+9e29732d-1370-4c42-a0c2-ec0accb9409e	1	\N	Other
+9e29b02e-3110-4c3b-82a8-ce91ae6df1a0	1	\N	Other
+9e29c8d3-4f67-42a8-9256-3c55ba4ae990	1	Other	Other
+9e2a3861-6d0c-45a9-b3f0-369e01ac93cb	1	Other	Other
+9e2a51a0-d63e-47ef-9970-d9b8efab17c6	1	Other	Other
+9e2a62b3-4948-4292-b793-6a305b85a9c4	1	Other	Other
+9e2ac17d-99a7-421b-aabb-56bff7bb0288	1	Other	Other
+9e2aeed6-34f4-461d-a365-f421c9d40d4a	1	Other	Other
+9e2b2343-7289-414b-96b1-8a9c0c8ca4fc	1	Other	Other
+9e2b3586-a0aa-4273-92d7-ad739aaff3c6	1	Other	Other
+9e2b3626-129d-4580-a7e1-50502fce5ed7	1	Other	Other
+9e2b4ec7-9d3b-49e6-9fab-a1b87970348b	1	Other	Other
+9e2b590b-d600-490c-8ff5-5c3da09335fb	1	Other	Other
+9e2b9f22-bf55-42c8-a360-8bbdb195ff94	1	Other	Other
+9e2bab55-0249-4d2c-b3ed-32bce9ffa79f	1	Other	Other
+9e2bac59-7a8d-422c-8f70-4688679fb761	1	Other	Other
+9e2bb7c7-5739-496c-a61e-3385e5ae18f7	1	Other	Other
+9e2bb932-e73e-429f-8ace-57f822fda7c9	1	Other	Other
+9e2bd18c-a53c-4b13-80a2-d6d8f63b0722	1	Other	Other
+9e2c4c31-9874-4ec1-8286-c45cfa8e49a3	1	\N	Other
+9e2c6490-c3d0-4a8e-8691-f2bf04e88ba7	1	Other	Other
+9e2c6b72-b51a-4ecd-ae5d-5f88cab7fa2c	1	Other	Other
+9e2caa62-1b34-4e0e-900d-f0ac75467c56	1	Other	Other
+9e2cb543-1e5c-4b05-a732-33dbebda82ed	1	Other	Other
+9e2cb5f3-c06c-4edb-ab61-ac08332f6d6e	1	Other	Other
+9e2cd5aa-5aab-41de-a538-ba0b0b0ba66e	1	Other	Other
+9e2d09d4-994e-4a8d-96f3-0ec55d22d590	1	Other	Other
+9e2d11c8-50b4-4bb1-8e77-3e7bac49ae81	1	Other	Other
+9e2d1759-7bd8-48dc-bc98-9f3cbc48ef33	1	Other	Other
+9e2d1ff8-6dea-4111-be1f-38c956acb5ee	1	Other	Other
+9e2d489e-f57f-4430-9869-a85f78db15f2	1	Other	Other
+9e2d6589-371b-4c64-bc7c-cca71a2dd031	1	Other	Other
+9e2d8f7b-3ec8-4808-b9c2-f6ab7ddb83fb	1	Other	Other
+9e2dd750-40ff-47ca-815a-514411e27320	1	Other	Other
+9e2df5a4-953f-44e9-aa67-313b8fbbc2e6	1	Other	Other
+9e2df890-272c-46e3-9bad-b48a450ee8c7	1	Other	Other
+9e2e0b93-a22f-4ee6-b3da-84be3072b870	1	Other	Other
+9e2e2353-8f2a-4403-b090-5dace421a3e1	1	Other	Other
+9e2e2ad3-170a-4553-8792-6eea6e6d7a13	1	James	Other
+9e2e9089-cdd5-42b9-8719-16ae057e5ce9	1	Other	Other
+9e2ebf1f-5462-439d-a634-789ace97297f	1	Other	Other
+9e2ece99-21a4-4516-bc4a-3a40b5a19e0d	1	Other	Other
+9e2f40de-904f-4c19-873e-74181604ef86	1	Other	Other
+9e2f81e3-4163-4a5b-8240-4b1d985cfc9b	1	Other	Other
+9e2fd178-1d8e-47c9-80d6-787e7da0275e	1	Other	Other
+9e2fe0c8-00e3-4733-be05-42f9b61ebd1e	1	Other	Other
+9e30359d-1574-4cb3-b806-ca43820feaac	1	Other	Other
+9e3054bd-54fd-47d4-8633-4f12cdfffc60	1	Other	Other
+9e3062fd-8c20-49ce-9b2d-b404542f0b81	1	Other	Other
+9e30cbc0-b346-4f50-882d-584180cdd140	1	Other	Other
+9e3110db-f5e8-4184-9013-f74f75e7a641	1	Other	Other
+9e311690-2a05-44cb-9692-47ad77fc0885	1	Other	Other
+9e3135b5-3cf0-434b-aefd-0d58238d39e4	1	Other	Other
+9e313bec-2f37-4850-8a28-f2e0ad6826c6	1	Other	Other
+9e316a19-14a2-4282-a23f-cd39d9e6067b	1	Other	Other
+9e318041-093b-4d13-b8ec-f776e2fef3ec	1	Other	Other
+9e318e0a-282d-43fa-b437-1b087174346a	1	Other	Other
+9e31f7db-37a9-4978-90b3-bef7014635aa	1	Other	Other
+9e325a98-0025-45a0-943d-3fb3c8ff422b	1	Other	Other
+9e327b4c-1948-4f1b-9baf-0e78d1359ad1	1	Other	Other
+9e32878b-fb05-47fd-8fe8-1e485fa2230d	1	Other	Other
+9e32b716-35de-4a6a-9657-6435ae6ca7d8	1	Other	Other
+9e32b869-bb11-4d0d-93be-9f7747302cba	1	Other	Other
+9e32d6d8-d9a7-4320-81f2-db4aa680f5b4	1	Other	Other
+9e32e1fb-9e00-4101-8396-0b704aabed76	1	Other	Other
+9e32fa0c-3d7b-4167-afb2-e5d81e4ae65b	1	Other	Other
+9e33030e-fcb0-4a55-b316-046ec4d131ae	1	Other	Other
+9e3315ff-f9a0-4e14-bd46-66ef548c516a	1	Other	Other
+9e3317ad-5452-4e3d-82db-38fccc67dcaf	1	Other	Other
+9e331862-641f-4697-b78c-70da614df10b	1	Other	Other
+9e3332f9-f849-4a5c-9c00-2d17dcc38af6	1	James	Other
+9e336728-42a4-469a-9d3f-05f40a316a44	1	James	Other
+9e338c24-1c6f-4ed3-9f89-84073821ab8e	1	Other	Other
+9e33d8f9-7f19-4267-be18-aa558c8171b4	1	Other	Other
+9e3479d4-8727-4732-84eb-875f1b0fe4e7	1	James	Other
+9e3490d8-8c2c-4b96-b57c-08e9049d538a	1	Other	Other
+9e349ea0-0a10-4a97-bc13-acb5524b05eb	1	Other	Other
+9e34ae61-9a24-4f35-9b16-7b63f971e0b2	1	Other	Other
+9e34cdc1-5d8a-4652-b35e-92538e7f7287	1	Other	Other
+9e3508f7-a599-49e0-a974-3c7343841b40	1	Other	Other
+9e35370a-bc2a-46ef-b401-bd96e19ee588	1	Other	Other
+9e354c72-3960-4a3e-b956-2976aac7eb42	1	Other	Other
+9e3585f8-3e18-4bab-bc19-dfa0cd299222	1	Other	Other
+9e3611f2-8143-48f8-af86-2ca498576e0d	1	\N	Other
+9e36b6b3-8774-4029-97a6-349037a4e79c	1	Other	Other
+9e36e10c-ec9c-47db-8ef8-226254f148a8	1	Other	Other
+9e37419b-e05e-4284-86d6-af066982735d	1	Other	Other
+9e37474c-4af2-4c7f-a449-4987a3e7d099	1	Other	Other
+9e3779f0-6c50-4b80-9103-e367ad964b07	1	Other	Other
+9e37a9fd-b2e3-44ef-81ae-df77511c08f4	1	Other	Other
+9e37ac11-518d-4996-855f-028b64f78997	1	Other	Other
+9e37c671-c0a2-410a-9a5b-4a00ea021ae6	1	Other	Other
+9e38124c-49df-41e9-b7bd-95270dfc29a4	1	Other	Other
+9e38507b-78d1-43d2-9a7c-dee8d3ef4e8c	1	Other	Other
+9e38bc2e-b503-49fb-9579-bfb7e8b149a6	1	Other	Other
+9e3995f4-e94b-4b71-8813-5725c4734651	1	Other	Other
+9e39f48e-3642-41de-83c3-184c3546cdaf	1	Other	Other
+9e3a7719-ef0d-4f44-a6b7-5bf5d251cafe	1	Other	Other
+9e3abf22-9773-4f6d-a8ac-88c48f977214	1	Other	Other
+9e3ac03c-af74-47f3-adfb-3f31853723e3	1	Other	Other
+9e3ac8eb-514c-44a4-a86e-180df8316a20	1	Other	Other
+9e3acb19-3e5c-40a6-a884-3addb86d418e	1	Other	Other
+9e3b5a95-a7d5-49bc-9397-97cf48740ac0	1	Other	Other
+9e3bba2e-4921-4a1e-819a-cbddf78aa091	1	Other	Other
+9e3bd0ef-accf-485c-bd66-5775d96037f5	1	Other	Other
+9e3bf6d8-0c7c-4290-9f83-1fc76dda062d	1	Other	Other
+9e3bfd35-77b8-4e24-8e8b-148390d48b70	1	Other	Other
+9e3c1607-4d2c-49c7-8b73-7ecfa1d7c416	1	Other	Other
+9e3c1abd-4cb9-4083-b0ba-365ea3ef5111	1	Other	Other
+9e3c22a1-bf12-4cb5-bcd4-c25547827765	1	Other	Other
+9e3c3e94-d7fd-4910-99ce-a72dfa3c712b	1	Other	Other
+9e3c44ac-f188-47e0-8bfe-fe9ed061174e	1	Other	Other
+9e3c4b5f-7c5c-4415-af71-44d3e4087f65	1	Other	Other
+9e3c6b4c-25ab-483a-9764-30f48aece4ca	1	Other	Other
+9e3c71a7-8cc9-4de1-9eaf-87b97d3ec525	1	Other	Other
+9e3d00c8-c0a5-4b43-95cc-05ba9eb747fe	1	Other	Other
+9e3d1985-6436-44df-99e5-2edae291f754	1	Other	Other
+9e3d540a-30fd-4d51-ac82-1c80598fde9a	1	Other	Other
+9e3d5918-2a00-4113-8f47-0d59b8404ee7	1	Other	Other
+9e3dc7d4-7ff4-4755-97b3-ab6699c97258	1	Other	Other
+9e3ded6d-1265-4ce7-9657-675aec14e2f4	1	Other	Other
+9e3e3606-55c5-4409-a89a-62c419d05448	1	Other	Other
+9e3e781a-baf1-4c9e-93f9-04393b3fb3b5	1	Other	Other
+9e3e8ecc-6cb9-4b62-9b01-7bce3bd9c477	1	Other	Other
+9e3eb8de-1adf-42b9-86c4-99608052f1df	1	Other	Other
+9e3f1267-6757-4b51-97f9-efbcd8bfa762	1	James	Other
+9e3f22cc-d1cf-4696-ab59-8baee2b3568a	1	\N	Other
+9e3f4181-aeb8-4ac3-9da1-034419a7f6c1	1	Other	Other
+9e3f8709-203e-4083-859b-b0a350ae2b0c	1	Other	Other
+9e3f91ec-6743-47a6-b1b4-ba2a2ef4aa0f	1	Other	Other
+9e3fae4b-3b0b-41f9-a989-3ed392f086dc	1	Other	Other
+9e402fd5-925d-46b9-a9ae-5bcdc1644428	1	Other	Other
+9e406422-bc1c-4d2d-82ef-707da264b374	1	James	Other
+9e406546-1308-40ae-8890-7a6228852adf	1	Other	Other
+9e40895b-e167-4727-b522-c9bc2c47ad65	1	Other	Other
+9e40a7ad-a3f7-4448-ba65-4d14871cd1f7	1	Other	Other
+9e40b455-77b2-4f20-a18a-c801223bd7a3	1	\N	Other
+9e411c26-f385-47b2-a32b-f2e99788b282	1	\N	Other
+9e413364-6161-4661-8f52-b63f467d7c35	1	Other	Other
+9e41491a-89de-4121-bd69-c37d7f26e21a	1	\N	Other
+9e4156b9-d2e4-41e7-8450-29faa0d26199	1	Other	Other
+9e419253-54a3-4435-8047-a2362085dc10	1	Other	Other
+9e42090f-e5a2-4fa8-8cf4-923171fa15b8	1	\N	Other
+9e422553-58ab-4b11-ac09-24feefab7f4f	1	Other	Other
+9e4245b0-b4ee-4ff9-aedd-a5941cc5ea85	1	Other	Other
+9e429247-ee18-47c5-8c46-85402be9a338	1	Other	Other
+9e42bc00-f373-446b-9857-834f0f66e3d6	1	Other	Other
+9e431ec9-f5fa-49ce-b7b1-624caa083d98	1	Other	Other
+9e431f64-5717-460c-9170-fc830eca2895	1	Other	Other
+9e43205d-643b-4111-aab0-ccea36b4dcf4	1	Other	Other
+9e432cdc-e399-471c-9a96-2137bd022644	1	Other	Other
+9e4354b6-28db-46bc-a757-65c6961e9a4c	1	Other	Other
+9e43a8d1-830d-4593-a47d-7b8cb7093340	1	Other	Other
+9e43d59d-a228-44af-b9d5-64f2773ac2ff	1	Other	Other
+9e4450b8-33cc-4270-961d-65acf9aa2d42	1	Other	Other
+9e44714c-3661-4de8-9127-383ff84dd6b0	1	Other	Other
+9e447de2-c53f-46d2-8f77-03f18b2285c7	1	Other	Other
+9e448507-f1e0-4a0c-a34d-783f50d6f4ac	1	Other	Other
+9e448b7c-7ac0-44f9-8d1e-c400dc4a6326	1	Other	Other
+9e44c493-2af2-49e7-8125-e9b0a0222f1b	1	Other	Other
+9e44d222-7ce3-43c7-9eca-ee51eaec50c0	1	Other	Other
+9e452a07-cd90-418b-be54-d9f6f6dfe82b	1	Other	Other
+9e4532e6-e182-4bb2-bb84-d960f6605865	1	Other	Other
+9e454975-5330-4d4f-a93d-84d8d83c8327	1	\N	Other
+9e4597c0-1bcb-417f-be1d-193de20c1f61	1	Other	Other
+9e45a46a-3f2b-4980-8204-a48cdf3e37af	1	Other	Other
+9e46463a-19e6-48dd-91a6-058adde7e193	1	Other	Other
+9e46575b-d989-4196-bf39-17c547912c53	1	Other	Other
+9e467415-a9ec-4e8c-b598-850c542df235	1	Other	Other
+9e468ffa-bc97-4dd6-8334-bf3f8d9842f2	1	Other	Other
+9e46993f-b8e9-42b4-9364-02858d98e8ac	1	Other	Other
+9e46c230-8f3c-42b4-9d59-20fbdb123abd	1	Other	Other
+9e46ca46-dc61-4466-ba4d-e543b5320440	1	\N	Other
+9e471137-0b7e-4cda-a292-103caa427779	1	Other	Other
+9e478ece-4065-4492-aa6a-272f6bc1d06c	1	Other	Other
+9e47977b-45c6-4143-94f2-82bc16e5c23d	1	Other	Other
+9e479fd2-433f-4a2a-8612-43ba5244b53d	1	Other	Other
+9e47a54b-2579-4864-8e8f-2860bf6af436	1	Other	Other
+9e47e586-2c6a-4fb9-b7bd-f2b5999c5e8b	1	Other	Other
+9e482c35-c062-4706-9cdb-fb9520a0500d	1	Other	Other
+9e48639e-7a07-465b-988e-00d1238ed456	1	Other	Other
+9e486b3e-3dae-42ff-8432-55abc86ee0e5	1	Other	Other
+9e487f95-48da-4c58-9f76-2a4bab5283a1	1	Other	Other
+9e48b796-6a42-498c-956a-03f0987a11b3	1	Other	Other
+9e48e0ba-0e5d-4aaf-82d7-56954af083d8	1	Other	Other
+9e48eea8-c64d-4596-87ac-fa44f0285ddb	1	Other	Other
+9e491695-b10d-471c-b5e2-68b1e2a65798	1	Other	Other
+9e494dc2-5cb7-49d4-b28d-dfde17a43fc3	1	Other	Other
+9e498122-baf4-4e3a-8467-b6a78eb8c04d	1	Other	Other
+9e4988eb-5086-4413-bd8b-c08420411eac	1	Other	Other
+9e49b739-8576-40fd-ac04-4f6b066e552b	1	Other	Other
+9e49d547-2f05-4c38-a5d8-67707f5643c2	1	Other	Other
+9e4a18f5-394a-4517-a494-8aef16daaf47	1	Other	Other
+9e4a5411-9e00-41fb-8fc3-4a22fe04fffb	1	Other	Other
+9e4aa349-5d3a-498b-bf76-ccb24dc2901a	1	Other	Other
+9e4ab96f-22e2-4552-96b3-b69067f1cb15	1	Other	Other
+9e4af0fb-beca-4fa6-9ad4-e547bf71a291	1	Other	Other
+9e4b1a5f-9208-4cbd-822a-25585ac5650a	1	Other	Other
+9e4b41e3-be2b-4925-aede-2e22511500a7	1	Other	Other
+9e4b5fea-f06e-4d27-b291-bb9ded0ffe49	1	Other	Other
+9e4c27cf-16ba-4ff1-89d6-76e55d29ab4d	1	Other	Other
+9e4c3a6f-e0de-4a80-a422-0780bcfeb97d	1	Other	Other
+9e4c3e1e-dc89-457f-afb8-90a14979e273	1	Other	Other
+9e4c6cdd-139e-43cd-8b74-e4edaa9031ce	1	Other	Other
+9e4c7574-fd87-4445-a9bb-5c2e4152c70f	1	Other	Other
+9e4c99cd-5492-4c0e-b0a3-3600f894abc9	1	Other	Other
+9e4ca52f-04cc-4c7a-8a78-a86497bbc2d0	1	Other	Other
+9e4ca5e6-f961-47f3-9590-bb4abaddae50	1	Other	Other
+9e4cf812-a278-43e6-99c9-e8cd1faf9f05	1	Other	Other
+9e4d085b-3997-4537-8858-a3637025bdc1	1	Other	Other
+9e4d27b2-e111-489e-ae63-4eab301dc8bb	1	Other	Other
+9e4d4523-9fa1-4371-8680-fa1bff87baf4	1	Other	Other
+9e4d5222-e06a-42dc-9cb6-fa697e8b17cf	1	Other	Other
+9e4db927-b77d-4a7b-9c86-45d99bb755a2	1	James	Other
+9e4dd44d-77bb-4976-8dbe-bf8837c50815	1	James	Other
+9e4dfc05-eac6-4a72-bdb0-a5ba44f43056	1	Other	Other
+9e4e3c41-ffb2-4044-b5c2-cb4eb8dceaef	1	Other	Other
+9e4ecbed-569f-453d-be45-49231a83706a	1	Other	Other
+9e4ed16d-3298-49b2-bdf1-b95a13e26ae9	1	Other	Other
+9e4ef25a-d219-4b22-b9c0-96c64d1bd2c4	1	Other	Other
+9e4f15f7-30e5-438c-b653-1e7b9dad3a93	1	Other	Other
+9e4f7594-5c80-404f-b5ab-50499c01764c	1	Other	Other
+9e4fb130-5ced-4629-b99c-e7ead76675b5	1	Other	Other
+9e4fb883-8d6d-4ac9-b854-d9112e38838d	1	Other	Other
+9e4fe364-2e55-4ddc-a348-9adbff0e322b	1	Other	Other
+9e4fe3ef-cc5a-40db-8755-d9f63e3c8bf7	1	Other	Other
+9e4fe999-73f2-4c52-b7d2-775252e3028e	1	Other	Other
+9e4ffa03-297e-4807-9454-434583944e05	1	Other	Other
+9e4ffb0a-0a13-41f9-81ae-ad01f00c1dad	1	Other	Other
+9e501bef-e321-4853-80da-a12baeb657cd	1	Other	Other
+9e5093f2-0ede-4533-ba09-4daffe71dfd5	1	Other	Other
+9e50efa4-51ab-4c8e-83c7-bde5090c5bd8	1	Other	Other
+9e50f07c-bf0a-4489-9f67-8bc8c532d4ac	1	Other	Other
+9e511166-207d-4af5-8a98-a15b3af1db39	1	Other	Other
+9e511336-27a4-4f0a-bbea-00921194d79c	1	Other	Other
+9e5113f2-59a4-4bd8-93f8-89760abb1b7f	1	James	Other
+9e5122bd-56a6-41b3-9f06-86ec9a3bae87	1	Other	Other
+9e5159f5-b1c2-4957-bf65-64a46cd09701	1	James	Other
+9e516537-2e60-4387-8109-71121b863bd1	1	Other	Other
+9e521539-4af2-4832-a622-40cfa5438ba9	1	Other	Other
+9e5250e1-4d55-452c-b5af-46d3fd5a5179	1	Other	Other
+9e52aebd-35a6-42f3-8f2b-8a512f4ccf82	1	Other	Other
+9e52e3d7-16b5-4da6-94dd-51b5874aef69	1	Other	Other
+9e53413c-06c3-45ef-a899-8bcded139999	1	Other	Other
+9e5343ed-332c-4f12-9824-1300665d987f	1	Other	Other
+9e534d17-3fad-4ec4-92bd-f69fbbf481d4	1	Other	Other
+9e536ef1-6e4f-457c-9c9e-15853575da68	1	Other	Other
+9e537718-7189-404e-b106-2addac4c935b	1	Other	Other
+9e538f06-6275-4e88-a06c-bbfbf6d20f1d	1	Other	Other
+9e53eb0d-27c8-44f0-bdd0-a2127c0ca1f2	1	Other	Other
+9e54974d-c2b0-4cf5-b215-ee6a6b883168	1	Other	Other
+9e54dfd7-83ca-4bb5-92a1-451985836715	1	Other	Other
+9e54f189-21e5-4a77-a095-eb0e821b9a97	1	Other	Other
+9e5530a5-093b-4a67-ae8e-669e2689fe22	1	Other	Other
+9e5538fa-74b8-4cb3-9820-775a1d994d79	1	Other	Other
+9e5543d8-9556-4356-a37b-5a10ce12e2b2	1	Other	Other
+9e55ac3b-585d-459e-a1a1-7c3f78df3cfa	1	Other	Other
+9e55b678-8b52-45c8-a978-638b584270ab	1	\N	Other
+9e55cd97-1983-43dd-a939-6de852471d91	1	Other	Other
+9e55e8dd-9cf1-4c6c-b444-5719ac0c3b3c	1	Other	Other
+9e55f4a0-64c8-42cb-8043-62052741367c	1	Other	Other
+9e563e1b-a7bf-4ccb-b9f9-ca8efaefcf7f	1	Other	Other
+9e563f64-ed92-45cd-b34d-4af176e3c23b	1	Other	Other
+9e565056-69c8-4989-a428-ea76e36e46e9	1	Other	Other
+9e5675ec-4325-45bf-9ade-d02f150c057f	1	Other	Other
+9e570506-da7c-4179-84ae-6d7208a38372	1	Other	Other
+9e575126-8817-42a3-8af3-903d05165165	1	Other	Other
+9e5787ec-4d62-43d8-9bca-484dbb69f0b3	1	\N	Other
+9e57bcbb-58e4-4b93-8f86-c54c328fd192	1	Other	Other
+9e57db4b-314e-40c0-b876-49fe33185460	1	Other	Other
+9e57f7b5-2560-4837-9b90-eb40207daaeb	1	Other	Other
+9e58198c-d259-4b56-b696-7ba65bfb2605	1	Other	Other
+9e589364-2725-48fe-8397-04a7b89f6421	1	Other	Other
+9e59495f-2978-4ca8-8326-84ccb9cc26d9	1	Other	Other
+9e597eae-f780-4ff7-85c7-da62d9ff8e71	1	Other	Other
+9e59a437-5680-4d35-8144-d79edde8463b	1	Other	Other
+9e59b142-ae05-4c4f-a11d-7a42c896288e	1	Other	Other
+9e59cee5-0d62-4a8a-8a0e-4301e5dab89a	1	Other	Other
+9e59def1-cb7c-4e2e-b045-398813a6fc64	1	Other	Other
+9e59e106-c620-4981-a39b-7ac650711050	1	Other	Other
+9e5a0179-cda7-4898-a6e0-13569c52f76e	1	Other	Other
+9e5a074c-309e-4946-9294-34312fe1e54c	1	\N	Other
+9e5a1386-bac1-4812-92ac-9e8124919070	1	Other	Other
+9e5a2776-6d4f-48bc-8b46-2ffdb661135f	1	Other	Other
+9e5a7e2f-a47d-4c3d-b357-a67dae26adbb	1	Other	Other
+9e5aaefd-8e3e-4cd1-a83e-aff3ce060203	1	Other	Other
+9e5b0234-9e68-4643-8c1e-19351ab6c14f	1	Other	Other
+9e5b50f0-782d-42db-9c58-b25dd9602026	1	Other	Other
+9e5b8d1c-d727-4c65-a162-1b1392d46650	1	Other	Other
+9e5bbbde-fdc8-4da1-a932-18539bdaf638	1	Other	Other
+9e5bc8cf-c306-4896-9c85-6f21d24b315c	1	Other	Other
+9e5be694-cbe9-4aed-b609-011aadb619f4	1	Other	Other
+9e5c55a4-1a33-45e7-9cda-9b9fe136bb94	1	Other	Other
+9e5c9f7b-57b7-4b99-82d7-564aac92f108	1	Other	Other
+9e5ccd89-58e1-4222-be16-6d5e0ba4cab5	1	Other	Other
+9e5cd967-e746-4895-9138-01c2cfe914cd	1	Other	Other
+9e5d1685-f3a4-4ea1-b364-5f500077ba7f	1	Other	Other
+9e5d2b10-3831-4322-831d-60b5281ad9ad	1	Other	Other
+9e5d5146-372b-4a7f-b69e-b80c0fcf6114	1	Other	Other
+9e5d8f9f-18c6-440d-a150-43131be9ca83	1	Other	Other
+9e5ddfaf-0dfa-4b9c-b77b-b18d1943c31c	1	Other	Other
+9e5df174-9306-475e-b2b5-99f2ae67c9a0	1	Other	Other
+9e5e2e79-b960-490a-8cf3-e22f0847b097	1	Other	Other
+9e5ee5f3-54bd-4348-ad00-c0e937f037e9	1	Other	Other
+9e5f3ad7-af4a-4ddb-8e6e-f59f020f6ab8	1	Other	Other
+9e5f5f9c-350c-4a53-b089-b563df6e14fc	1	Other	Other
+9e5f6b31-cbf0-43c8-8567-10adbc23f6d5	1	Other	Other
+9e5f9cf8-f5e5-4338-8675-062b4a0abe84	1	Other	Other
+9e6010b2-0636-4ca9-91a3-4de5520a5150	1	Other	Other
+9e601940-615f-4b17-807d-7c01d3ff63c3	1	Other	Other
+9e611ade-db82-4e06-9e8f-ce1412289767	1	Other	Other
+9e611bae-ead2-4f90-91fe-47c855802c9a	1	Other	Other
+9e6121b0-5143-4229-93e0-799eab69301b	1	Other	Other
+9e61977c-dcd3-4f0c-9dba-7a2c3b3e4e19	1	Other	Other
+9e61af55-8c82-4b87-abbc-dfa0dd2a8bc2	1	Other	Other
+9e61ebae-da14-4098-956a-ee0ddec079a2	1	\N	Other
+9e61f972-3b61-4fd2-bc88-92a0d9d0ba77	1	Other	Other
+9e61fec2-46a6-4e2f-9307-61f9bce4ced6	1	Other	Other
+9e62059b-f0b6-415c-9188-910a2f369200	1	Other	Other
+9e6205b9-76e0-4b62-9f59-4b75823b6edd	1	Other	Other
+9e622424-ad1e-41e9-b4ed-b1c86f25081a	1	Other	Other
+9e62901a-0dcc-4093-bb9b-67a63526fdc6	1	Other	Other
+9e62e7cd-d45b-421b-a09e-0cbd298c12fa	1	Other	Other
+9e635406-2d52-44b1-9fa9-28ab425e2b4c	1	Other	Other
+9e638e73-4dd1-453a-a277-e28414361918	1	Other	Other
+9e63a0eb-d82f-4445-9780-f2fb9d597751	1	Other	Other
+9e63ff95-6105-40bb-b94a-91f6e9340677	1	Other	Other
+9e640686-cb34-4365-94f1-323bcea5010c	1	Other	Other
+9e64631c-e8f3-4636-86c2-f50d883ed2da	1	Other	Other
+9e64ebe1-6b60-49db-8c51-5e266fbd5cc2	1	Other	Other
+9e651ae7-73c2-4a03-9e2d-14d400cdb123	1	Other	Other
+9e654ad9-1e85-475e-b0a8-7294dbd7eaa3	1	Other	Other
+9e655011-0c27-49a1-9402-88c5be7aaa04	1	Other	Other
+9e6587e9-2cd8-4933-a606-576ce09e02b3	1	Other	Other
+9e6591e3-ed35-4426-b52c-546fe52976e4	1	Other	Other
+9e65d84f-8ca0-4b44-8092-54401da8b0eb	1	Other	Other
+9e65e49e-6161-4198-b958-63e4b0be29c2	1	Other	Other
+9e660daf-fceb-4265-b1f8-ab050ddf511f	1	Other	Other
+9e663236-681a-44ae-a5e1-9c5460095b52	1	Other	Other
+9e667ad5-b143-4aef-951d-024fb992ddf6	1	Other	Other
+9e6686b0-a19a-4763-a297-ad48ee6ea21a	1	Other	Other
+9e66e8a9-9b19-40a3-81b8-e89f986a1ea2	1	Other	Other
+9e670811-d0e4-4887-a1af-fbda31b17783	1	Other	Other
+9e671e42-c412-4aa4-aae0-83ab6df1a783	1	Other	Other
+9e6738b1-e3c8-425a-ab57-9f72b8cbc1a9	1	Other	Other
+9e677e0a-afe6-46b7-a635-e75c59bcb98c	1	Other	Other
+9e6781e7-53ed-4ebf-a648-85d6a946e17a	1	Other	Other
+9e67aa60-efdf-40f5-9aa5-62428988cfc3	1	\N	Other
+9e682a44-f539-4580-afe9-2c75f6b4f1a2	1	Other	Other
+9e682b6f-cb7b-473d-b7a8-b091dbc0ef19	1	Other	Other
+9e6852bc-533b-4932-a0df-9d66bd78f781	1	Other	Other
+9e68ba71-6b64-46bc-bf19-93d45eb53f39	1	Other	Other
+9e68da68-ad40-491b-aa9f-5724ebefd7c7	1	Other	Other
+9e68deb0-e884-4b53-bfc6-3c2f76e54554	1	Other	Other
+9e6991ba-31c9-447a-bac1-dc5cb1d8758f	1	Other	Other
+9e69a1d8-e1ae-4a28-b589-d4319b6fc695	1	Other	Other
+9e69ab7d-6a8f-48d5-bb4d-ac880eeac90b	1	Other	Other
+9e69d990-ef1b-4ed7-ac0c-c5068edfa48a	1	Other	Other
+9e69da76-89a9-43fe-8879-5bf7832d48e0	1	Other	Other
+9e6a0c2c-43f7-41e1-967c-b59900f0ed2b	1	Other	Other
+9e6a11a5-caa4-4043-9d46-2b3677b883f0	1	Other	Other
+9e6a1e57-0b50-422a-b26e-01eed7d54156	1	Other	Other
+9e6abc3b-ed74-423d-84dc-fb9aea7a9068	1	Other	Other
+9e6ae078-8466-46ba-82e8-10c9780ab050	1	Other	Other
+9e6aebbc-563a-4467-9650-7f8ffc8627b0	1	Other	Other
+9e6b68e7-7757-405c-b109-5e4163cae389	1	Other	Other
+9e6bc1fa-5707-4781-b7a5-8d2749f20e97	1	Other	Other
+9e6be0ca-09f6-4b9d-87b8-7f3821a6690e	1	Other	Other
+9e6be65b-0529-4d58-9dc6-60ae0f627af6	1	Other	Other
+9e6bf8ed-67c1-4e31-9a4b-78cc0e38c7bd	1	Other	Other
+9e6c2a64-d29c-423f-978d-64dd9c28f444	1	\N	Other
+9e6c3a8e-48f1-4df3-ad58-ec01a14274e1	1	Other	Other
+9e6c41cd-6e52-46c5-b013-0188302b465f	1	Other	Other
+9e6c7871-2076-4663-84c7-ccd651eaa786	1	Other	Other
+9e6c94a7-6085-4285-98c6-1979254f0466	1	Other	Other
+9e6c998d-61a2-423d-8c64-4e250412c0e2	1	Other	Other
+9e6cadaf-d55f-4f36-9550-d753b0260975	1	Other	Other
+9e6cb54b-ebe3-463a-b2df-7e128e5774c7	1	Other	Other
+9e6ccad3-fff0-40d8-b084-2d54ad811c2e	1	Other	Other
+9e6cf769-e19f-44de-8508-bd07333419d6	1	Other	Other
+9e6d6582-a8b9-4b82-a8da-3675b8400ae7	1	Other	Other
+9e6d8192-e878-44f1-bdcc-47eac271bd11	1	Other	Other
+9e6daa24-6f5b-4db1-b6c4-2ce942f83829	1	Other	Other
+9e6df47a-73fb-4bac-9c4a-6174ea752466	1	Other	Other
+9e6e2824-1d41-4594-91d6-c80df798909a	1	Other	Other
+9e6e906f-9b97-4477-830d-91c4ab3b0eec	1	\N	Other
+9e6f13d4-e9e1-410f-b2dd-7c8c4d20d363	1	Other	Other
+9e6f4e3f-f091-4711-85bb-db60bde82673	1	Other	Other
+9e6f7eaa-5021-4210-a677-0c59a72428e7	1	Other	Other
+9e6f883d-06a8-41a5-af87-833d64fb3c0e	1	Other	Other
+9e6f8f2c-ef20-4dde-b03b-f017ad846ac5	1	Other	Other
+9e6faf4d-dcfa-4484-9a0b-d3c6775cefa0	1	Other	Other
+9e6fed24-1023-4473-8d05-8bfdf3da1185	1	Other	Other
+9e702e0d-8b65-4e5b-80b6-c6d9ea415196	1	Other	Other
+9e703f51-b488-4db8-a6d7-26ac93c82c74	1	Other	Other
+9e70a7d1-59a7-48e7-991b-685ea0d69911	1	Other	Other
+9e70ce9a-9e8d-457e-b412-3d40d9239971	1	Other	Other
+9e70eb45-7639-4b20-b056-78edfc023753	1	Other	Other
+9e71c21d-4572-424b-8e49-05e295110c91	1	Other	Other
+9e720e31-9097-487c-bc14-fceaf93cdbe3	1	Other	Other
+9e72c196-0c5c-4427-b3e4-0e1df32b8034	1	Other	Other
+9e72c36b-6285-438d-8587-261552108f52	1	Other	Other
+9e72c5c6-8273-4122-accd-a42d8996b6a7	1	Other	Other
+9e733d51-5283-4fc8-bbe6-d1af00afc9c1	1	Other	Other
+9e7355d7-63ef-47b5-ab7e-98b8c02a3664	1	Other	Other
+9e73b5f7-dc23-4c85-95b6-4a0358ccb06d	1	Other	Other
+9e7408df-5bca-4683-b756-79c4768dc310	1	Other	Other
+9e745a5c-d5a7-4031-937b-1dc9076113e3	1	Other	Other
+9e74c25e-24d3-4700-bc0f-8a7c72f9076a	1	Other	Other
+9e74fa62-34cb-4ae8-9bbb-8f1667648314	1	Other	Other
+9e74fb09-b98a-4f1a-871b-925533c21d67	1	Other	Other
+9e7508be-1dd7-4dc2-b4c0-166f4a73b8f3	1	Other	Other
+9e75bb8f-32b4-40cc-9ef4-2a42720f8d31	1	Other	Other
+9e75bea4-cb40-42ae-95d8-239a5d65c123	1	Other	Other
+9e75e8a4-7fd9-4bbd-b198-da86270948e1	1	Other	Other
+9e75ff80-84df-4ab5-bb4c-2bf44e4a674c	1	Other	Other
+9e761a62-0927-479f-ab8b-aa839f81a9a0	1	Other	Other
+9e765b4c-b8e3-4cc7-9865-825b3d70595b	1	Other	Other
+9e7665a2-be3e-4996-baba-7c68791a8c2f	1	Other	Other
+9e76bf24-051a-4450-a055-57c2320d1a32	1	Other	Other
+9e76d5ca-f758-4a7d-a9c6-18c1a4fa80e0	1	Other	Other
+9e76dd26-25e2-4a4c-ae74-97b2cf77ed99	1	Other	Other
+9e76f3e7-33e8-4b40-812b-7ba47ceca433	1	Other	Other
+9e76f843-d4d3-4a10-9de8-2ed8e63b90f8	1	Other	Other
+9e77230c-3c3f-4506-8160-0c01b5afc7eb	1	Other	Other
+9e7739fc-841a-448b-901f-84cdd5b71657	1	Other	Other
+9e778b08-c4e9-414f-953d-507db386fe57	1	Other	Other
+9e77deed-97a8-426a-8174-7078b5ed0aac	1	Other	Other
+9e78178a-267b-4480-a1cb-89a69e612115	1	Other	Other
+9e781bed-7de0-4759-be07-d1d8f7bdf3f2	1	Other	Other
+9e784cdc-d726-43c9-a841-177a9d8dfd47	1	Other	Other
+9e784f79-3409-4016-8407-272c211ca13e	1	Other	Other
+9e78506d-d4e2-41fb-9451-21ba0ad2b581	1	Other	Other
+9e786332-97b6-4274-b8d6-aa9a3ec543e4	1	Other	Other
+9e788ab1-011e-4ef5-bfec-2ed9dc4ab4ba	1	Other	Other
+9e78d66a-4769-4ed3-aae9-92a032df9c86	1	Other	Other
+9e78db96-65ce-4192-81c6-2d0c73af4122	1	Other	Other
+9e78fdd9-ea02-4224-bb40-ffaa2c7c8952	1	Other	Other
+9e7906fc-dfeb-44ba-b156-e7e64392f991	1	Other	Other
+9e791274-2275-4e48-9c46-caba0227245c	1	Other	Other
+9e7915f9-c990-44d6-9d29-4f1c7ccc78d2	1	Other	Other
+9e793321-f65a-4c56-85d8-da52141a73dd	1	Other	Other
+9e795ec0-ef12-4ac8-b084-771290fff0b9	1	Other	Other
+9e79ab25-e2b4-4238-a37a-78f0ebc4314d	1	Other	Other
+9e79bf29-6378-4782-817c-1814cf5f94fd	1	Other	Other
+9e79bfa3-218f-4cf6-a259-8736c77c3f91	1	Other	Other
+9e79ec6e-1088-4d72-a224-9c34eb4dc9df	1	James	Other
+9e7a23ee-93a7-4b76-b553-97b7930da31a	1	\N	Other
+9e7a31b8-c33e-4207-85a8-51ab4644ee03	1	Other	Other
+9e7aa96f-ba4f-4d66-b803-839087ac8354	1	Other	Other
+9e7b1e98-2f63-4180-9624-e2e25df7c46d	1	Other	Other
+9e7b38de-980e-49be-b270-ba2ad9e036bb	1	Other	Other
+9e7b40de-b4b6-42e3-bc85-beeaf22f9ba5	1	Other	Other
+9e7b4b77-aac4-46ef-9739-6dfe5f988be8	1	Other	Other
+9e7b5d65-c74e-4a26-9f32-655395f25dd0	1	Other	Other
+9e7baa27-95d5-45ed-86f3-a2af665453ba	1	Other	Other
+9e7c1b2a-1bd7-442d-967c-0639e14ae33a	1	Other	Other
+9e7c2204-e97e-4cb2-8581-4439393c7ba8	1	Other	Other
+9e7c2fc8-7ae7-47ea-83a4-eb83fb4984a1	1	Other	Other
+9e7c6eb4-6e37-4a25-a6bc-20080bcd95d2	1	Other	Other
+9e7cf24a-86d1-40de-a782-8979d8036987	1	Other	Other
+9e7d0772-00a9-4623-9125-5d1404935a19	1	\N	Other
+9e7d1ab7-d7b7-4faf-a5bb-2facb3b23e06	1	Other	Other
+9e7d1dfe-01c5-4ab9-8e9e-01b158c8a6ce	1	Other	Other
+9e7d4fcf-a0db-4e21-9135-0ad9bc0dfdee	1	Other	Other
+9e7d576f-a7da-41c9-900e-3200b20cfd9f	1	Other	Other
+9e7d8b95-fabf-41a4-8bef-70062d417d24	1	Other	Other
+9e7d9d27-06e1-4bd1-a60c-aee855f418a3	1	Other	Other
+9e7dd37c-59ba-45a8-899d-5bd3abf13a90	1	Other	Other
+9e7e738d-88b0-4706-a214-37e099344ca4	1	Other	Other
+9e7ea984-7528-4815-b844-89f612290465	1	Other	Other
+9e7eb444-60e0-412d-9515-a3b3af6596aa	1	Other	Other
+9e7ec6c9-c375-42c1-bd8b-7b8400d5d52d	1	Other	Other
+9e7f1cfd-646e-463c-953f-109382c4bb2c	1	Other	Other
+9e7f30e8-e7a9-4897-b55f-ab26530825d2	1	Other	Other
+9e7fac05-a411-4bf4-a834-4109e7c4c8a5	1	Other	Other
+9e7fc0b4-2f16-4741-a857-0ab4a800c1f7	1	Other	Other
+9e7fcac7-df14-4ddb-91d5-43fad4822c95	1	Other	Other
+9e7fd703-7415-46b2-834b-4db2456e672a	1	Other	Other
+9e7ff2b7-c63d-4c8c-afc2-f11d33fe55b3	1	Other	Other
+9e7ff38d-e522-4f8a-9921-9e4551663c81	1	Other	Other
+9e803fd1-005c-4a26-af1e-dfbbcc5cb7ca	1	Other	Other
+9e8048fd-3693-455c-9ebc-98dffac5cf06	1	Other	Other
+9e80fcb8-1897-11e8-8a97-fa163e8624cc	1	Other	Other
+9e80fe67-36df-4b75-91c3-a51ca1f120d8	1	Other	Other
+9e811181-9c31-4a33-8d5f-0f45ceb8cbe6	1	Other	Other
+9e816b25-4a79-4664-aada-aa1d254ac4ca	1	Other	Other
+9e818da0-a296-4ad7-a4e2-18c93b8a2bdd	1	Other	Other
+9e81913c-1dfb-40f5-8099-e0f1e5e11669	1	Other	Other
+9e819ebd-f562-4dc7-81c9-2c7064fe5b2e	1	Other	Other
+9e81d8b4-8fdd-441b-9306-f47c1af47ca2	1	Other	Other
+9e81f78c-1bc3-4545-b84e-0290685aa740	1	Other	Other
+9e823b77-d210-4334-bb75-5d93a0401320	1	Other	Other
+9e827005-f5c6-4f2e-94ae-5bb9901d18d1	1	Other	Other
+9e829807-990a-416f-ad91-413557231298	1	Other	Other
+9e83304e-1844-4b90-88bb-33065ef6d115	1	Other	Other
+9e8358ee-d55f-41e8-a7ff-5b585e877a33	1	Other	Other
+9e83d93a-ce94-4042-9acd-6434357ed028	1	Other	Other
+9e83f97d-592f-45e6-8ce7-a1dd8527e64e	1	Other	Other
+9e841bf1-68bb-4084-b48d-836832c7bd3c	1	Other	Other
+9e845712-731d-4172-a428-d93458d7e1bc	1	Other	Other
+9e849753-e4fa-4999-9ad9-09eeb060036d	1	Other	Other
+9e84a926-070a-46dc-98fd-01d06bfbff0e	1	Other	Other
+9e84bba9-0bda-421c-bb78-bd5aa6be574f	1	Other	Other
+9e84cda1-7c31-4d95-9ee2-4a12914bea7f	1	Other	Other
+9e84e0e9-8837-4854-8a34-efdc33482a05	1	Other	Other
+9e84fb5c-ecb7-4c7b-8bb8-e50f1eb4a23e	1	Other	Other
+9e85867c-ae61-4f1a-899f-4aab36a3d3e1	1	Other	Other
+9e8586be-b597-4271-9474-fdba39efafe9	1	Other	Other
+9e85bad8-c088-43f7-b8b6-ac8444e05d48	1	Other	Other
+9e85d0db-7e27-4e55-ac7f-d561dad9d5aa	1	Other	Other
+9e85f35d-3b5b-43e4-bf2a-4c5233a7a8b3	1	Other	Other
+9e863ba4-bb25-4257-bcf7-dd2e7b8f943a	1	Other	Other
+9e86741e-1b75-4766-ad39-1adbb2bdd9e2	1	Other	Other
+9e86902c-119c-483c-b86b-030af62a7a41	1	Other	Other
+9e872ca4-a701-412d-b08b-aa8850116cc6	1	\N	Other
+9e873ad5-5796-4375-8cb7-825955e4ef33	1	Other	Other
+9e877f89-2149-4c66-88b1-0fd184e08013	1	Other	Other
+9e879e21-63db-4f57-8d2d-1392d2a4d01c	1	Other	Other
+9e87c145-6661-4676-b52c-1e929260e04b	1	\N	Other
+9e87cba8-0424-40e4-988b-244aed7e0100	1	Other	Other
+9e87cf3c-8937-4196-bb61-e54f1f6d83af	1	Other	Other
+9e8807f3-bc98-4c09-8601-054939350f9e	1	Other	Other
+9e881b9a-218f-42d2-963c-c6879a379d62	1	Other	Other
+9e88298f-896d-47f0-86a7-26e98d52e128	1	Other	Other
+9e886827-45a2-4501-bd8f-30a8befbd756	1	Other	Other
+9e888c2d-78fd-4436-a63e-ca58ea7c770c	1	Other	Other
+9e8896c9-c042-4cb8-9d92-bac712c5dd51	1	Other	Other
+9e88a090-4634-4236-8113-9a60cc5d4a7c	1	Other	Other
+9e88b4eb-ef45-4918-812b-02f9c27a078a	1	Other	Other
+9e88bff7-9ad0-4c91-a2b0-83e7ea8f4b83	1	Other	Other
+9e88cb05-ddbd-4771-8805-1a16fd6563f2	1	Other	Other
+9e88e585-e6ce-4955-b2fe-e429fdb38c4c	1	Other	Other
+9e88f002-4627-4982-a1f6-9e9dcbd5bc04	1	Other	Other
+9e8926af-539c-4b61-8a4a-e2280ca6dd73	1	Other	Other
+9e895528-55f6-4b70-85ca-ef5bf354a82c	1	Other	Other
+9e89596e-c8ed-4865-b82f-06d1ba2ce503	1	Other	Other
+9e898759-87e5-41c9-9f77-e456f99a43e0	1	Other	Other
+9e89f37f-f366-4eca-b3c7-cff14381756d	1	Other	Other
+9e89f8a3-1482-432f-8674-a01be2e97f87	1	Other	Other
+9e8a4e44-a1de-4e6c-b0d9-83daf8199545	1	Other	Other
+9e8a5ce9-00e5-441c-9dac-b2e66cbebdbd	1	Other	Other
+9e8a8951-cc42-40d0-b839-861a6d483c92	1	Other	Other
+9e8a8d52-bc47-456d-9468-63b00b586917	1	Other	Other
+9e8a9725-d68e-4a26-8cfd-a27f02ebb0a5	1	Other	Other
+9e8af4ea-be60-4a01-9652-3837ae87f745	1	Other	Other
+9e8b1db4-de4e-4c6b-b83e-b689fb44a541	1	Other	Other
+9e8b306e-c211-4bad-88ba-0afc929bcc06	1	\N	Other
+9e8b4330-0f3d-4f90-86da-608e9cf95c18	1	\N	Other
+9e8b9d42-6b83-4d85-a89f-30dd1cdaf6d9	1	Other	Other
+9e8c179b-edd8-49dc-b88f-ddf366d4e4f4	1	Other	Other
+9e8cc2ad-0e3e-499c-a235-d17d3676d047	1	Other	Other
+9e8cc675-8db0-4d86-ab81-5ab6217b0576	1	Other	Other
+9e8d0339-7cc7-4814-bae3-5f55efe562e3	1	Other	Other
+9e8d0f60-ffca-4e52-95a5-8486b20f189a	1	Other	Other
+9e8d3753-d161-46ba-b3dc-15fc6b4b8f4d	1	Other	Other
+9e8d9e70-db1a-49cb-91e4-808679890ab3	1	Other	Other
+9e8daad2-13fe-436d-84ec-1537ebebfc6f	1	Other	Other
+9e8deea2-a397-458c-bc16-1bf8ea02fc52	1	Other	Other
+9e8e18ee-7a45-4ade-9567-eea3e0d18f72	1	Other	Other
+9e8e4bf3-bdeb-4d65-981d-cb19b9cb1dc6	1	Other	Other
+9e8e683f-cd1c-4e5e-956c-dadab271bd89	1	Other	Other
+9e8e6d86-24ca-4565-8fcf-69f33cee8ee4	1	Other	Other
+9e8ed722-8ca4-4507-a609-59352b32f721	1	Other	Other
+9e8f5caa-6b0f-4236-9b57-0d77ef5a1b40	1	Other	Other
+9e8f7810-82d0-47b8-8a44-b1a652b1b2ec	1	Other	Other
+9e8f8f47-1689-46fa-b564-7122270e5a9e	1	Other	Other
+9e8fae56-e272-43f8-b4be-6406d9825358	1	Other	Other
+9e904ca1-82f1-422f-8923-0e85495b0c76	1	Other	Other
+9e905152-7a1b-4ac8-adc9-16837950e357	1	Other	Other
+9e905276-3f9d-4a7d-be42-b7f8d2278293	1	Other	Other
+9e906785-f977-43dd-af9c-710fc6447beb	1	Other	Other
+9e908523-ac11-4dbf-a106-27df9f60f57f	1	Other	Other
+9e90a2e9-b48a-400b-8018-191f213218d1	1	Other	Other
+9e90a3a0-d1ac-4275-a7a0-34f98cf26306	1	Other	Other
+9e90aa96-2ebb-4afa-8b60-b483797f08d2	1	Other	Other
+9e90b354-e45e-47de-914b-60e04e2a3e60	1	Other	Other
+9e90bab3-3f77-4c43-8c47-5b7fc63c4a03	1	Other	Other
+9e90e4f4-9499-4c63-8508-cf24ec925437	1	Other	Other
+9e9103f7-47ca-4a1d-bf6d-66ff7bae3270	1	Other	Other
+9e91808a-f855-4ca6-bf7c-26ac1983012b	1	Other	Other
+9e919b90-9cb9-4081-a883-3f5456c62b9d	1	Other	Other
+9e91b265-f6c2-41fb-bfd3-d688a1a52336	1	Other	Other
+9e91fff6-4257-4565-b6c7-4fffaef3d454	1	Other	Other
+9e92182f-1d28-463a-8c6b-bb18447d1218	1	Other	Other
+9e924b88-1ffd-44b9-a79c-9a49fb7b6665	1	Other	Other
+9e92653d-45bb-418d-941e-34c81b59c213	1	Other	Other
+9e9285e6-c0c9-4338-9034-49a34ecd120f	1	James	Other
+9e93000f-23d1-428f-8241-de376293c5ab	1	Other	Other
+9e935ee5-a9a0-45dc-a30f-e5842d46d3f2	1	Other	Other
+9e9393bf-0b23-47d7-941e-0c8d74193a6e	1	Other	Other
+9e93b0e2-1209-46fd-8553-ca2b9feaec69	1	Other	Other
+9e93b5e3-b354-4704-a1bf-9efdc4a51019	1	Other	Other
+9e93e142-186d-4168-a200-679a486cd5aa	1	Other	Other
+9e93e9a7-037d-432e-b7fc-b1739713999f	1	Other	Other
+9e940068-f2e1-4bdf-92f1-cb4bdc6d82aa	1	Other	Other
+9e941b60-47a4-47ff-8cc3-ec264cbede69	1	Other	Other
+9e94d199-c1d5-44ba-8075-92498d157ad2	1	Other	Other
+9e94d330-ab05-4390-982e-4819bb333046	1	Other	Other
+9e94d5c8-9ce7-4825-9c25-7f86aa4c7a21	1	Other	Other
+9e9559c0-74ad-4f40-be1e-ae0058694e9b	1	Other	Other
+9e956b82-ba57-4304-b42b-df636d3a12fe	1	Other	Other
+9e95ed80-6d40-4142-929a-3e19e13986a2	1	Other	Other
+9e9631ad-6ff5-49c2-9b80-062906e2146f	1	Other	Other
+9e963cb2-9d0b-4509-8cd1-cb138a94b627	1	Other	Other
+9e969150-072c-4127-9b6e-4bade43ef001	1	Other	Other
+9e96ab30-c991-46b1-bce2-75175a4f0733	1	Other	Other
+9e96de9c-87fe-47d7-adc2-3d02a2832e6b	1	Other	Other
+9e97456a-879b-4c1c-970d-c95d2c054f19	1	Other	Other
+9e978072-d63d-45fa-844e-57c602b058df	1	Other	Other
+9e98159d-1326-4713-9c90-74251d2bb017	1	Other	Other
+9e9815a0-f312-4bb0-9301-413121f7a403	1	Other	Other
+9e981e22-9cff-48e6-bbe5-42f6175d76bb	1	Other	Other
+9e9877d0-4ecd-4134-9812-0b60580f5b67	1	James	Other
+9e988428-5a2c-4c49-ab6e-032fbbf759f3	1	Other	Other
+9e989e12-ae77-434a-9277-6134a2ebd559	1	\N	Other
+9e98da06-534a-42e9-a859-e96aad74954d	1	Other	Other
+9e995df0-4a28-45ef-a210-4404e72bc8cd	1	Other	Other
+9e9a17c1-e784-4b5f-aab3-ddc371d2298c	1	Other	Other
+9e9a2c5b-27c7-477d-968e-2b781811de79	1	Other	Other
+9e9a35a4-7b96-4a55-89b0-b05aac7e9159	1	Other	Other
+9e9a7b13-348e-4914-9624-003a0728b699	1	Other	Other
+9e9ad623-4e93-4828-8489-b28a7dae6fdb	1	\N	Other
+9e9b5bc0-e588-4d28-8a57-027c9fcc80c6	1	Other	Other
+9e9b8683-b438-4c9f-bdbc-5b39a96489ed	1	Other	Other
+9e9b9046-2ee4-46bf-8705-808b2f01542b	1	Other	Other
+9e9bb7c1-1362-463d-bc5c-49f2a01d6b49	1	Other	Other
+9e9bcd97-a2fc-4f1e-8631-308e5490ac69	1	Other	Other
+9e9be68c-1933-4072-a9dd-5e7fbd22d8b7	1	Other	Other
+9e9c3817-2bb5-4800-b73d-1420ce8a1be8	1	\N	Other
+9e9c779a-a088-4f09-9b8a-9c854ab5d301	1	Other	Other
+9e9ca388-98ec-47da-9500-bea4fad5f4b0	1	Other	Other
+9e9ca600-96c7-4d3e-82fb-94c13fc0e634	1	Other	Other
+9e9ce1b0-9584-44c6-892a-0f2f8d457ba2	1	Other	Other
+9e9cecfd-9fce-4702-9420-4a1aa42d95d3	1	Other	Other
+9e9d5240-ad14-4677-9d93-2c9d0c85aab4	1	Other	Other
+9e9d6e4b-e13a-49e1-9932-5be75b3f5707	1	Other	Other
+9e9d6fd5-fe6a-4de0-89d3-91b3ed9a75f0	1	Other	Other
+9e9d7af5-0473-46e1-a457-2ebff129314d	1	Other	Other
+9e9d94c7-c177-4328-a299-e58405def8e0	1	Other	Other
+9e9d992d-50b8-4777-a9b3-9644fed58edd	1	Other	Other
+9e9e06b9-b67e-4bb3-b8a1-91357a6c5c62	1	Other	Other
+9e9e08c2-ddd9-4f42-98be-b983bbd4317f	1	Other	Other
+9e9e18de-9dc1-4397-88da-37bf4fe4f6b2	1	Other	Other
+9e9e8398-be79-4c83-bacb-f46d7a000f33	1	Other	Other
+9e9e9d13-d4d7-495e-bef8-a048f81b6408	1	Other	Other
+9e9ee500-27a0-4664-b088-4f9feae9e00a	1	Other	Other
+9e9efffa-0033-11e8-9be8-fa163e8624cc	1	Other	Other
+9e9f3c94-c5cf-46ee-a24d-5a82857cb20e	1	Other	Other
+9e9f4249-f18f-4a60-8d99-a6df6765c3bc	1	Other	Other
+9e9f7085-86c9-43a3-a0d2-8fbef5b3a8f6	1	Other	Other
+9e9f747c-170c-4251-ba69-de0cad552246	1	Other	Other
+9e9f9ce6-7833-47f3-9c0d-a434362b8724	1	Other	Other
+9e9faf98-fcc1-4d84-b8a2-62ae056d4e52	1	Other	Other
+9ea030f6-e115-422d-ad4f-8cfd9a3ffc8b	1	Other	Other
+9ea0c433-6b60-47c7-8106-d947b3d56ae8	1	Other	Other
+9ea1309b-03f9-4ca5-9b49-afe828c0dec7	1	Other	Other
+9ea15857-cf00-4922-ba1c-bf933b90f56a	1	Other	Other
+9ea1651b-8076-4dd9-866a-d4b5d8ee7083	1	Other	Other
+9ea16621-65cb-42c5-9b04-8e3aaef93c13	1	Other	Other
+9ea16809-71ef-493d-9ea4-79eb382411a9	1	Other	Other
+9ea1bdfe-b349-4ea1-adb6-59139d518e08	1	Other	Other
+9ea1d36a-ec93-4a27-81b4-b355815f194e	1	Other	Other
+9ea2045d-939c-4e0e-aaac-d9a0e8a0ca1a	1	Other	Other
+9ea214dc-9993-4449-bc78-54bf6f9c6f78	1	Other	Other
+9ea2552e-6131-4dcb-92bd-e83d578fa621	1	Other	Other
+9ea276fe-7e98-473a-8a2b-c31f4cea0078	1	Other	Other
+9ea2778b-0e31-4bce-b1dd-30be3325da99	1	Other	Other
+9ea29e9f-bcd9-4abc-b254-7a2e3c6f3751	1	Other	Other
+9ea2ba8d-84cc-42ab-aa7e-15ac4424bfbc	1	Other	Other
+9ea2c269-3145-420c-9fdd-3b48ea095fb1	1	Other	Other
+9ea2d795-62b9-475f-9b60-e452053ba550	1	Other	Other
+9ea31753-2ca9-4da7-a1c9-9413c911cfab	1	Other	Other
+9ea34a95-d2f3-4349-be28-f67b7dfd77c3	1	Other	Other
+9ea38daa-637f-4652-bf10-0af483a0ff62	1	Other	Other
+9ea392d2-0abe-49e1-b710-ca2eae7f90bd	1	Other	Other
+9ea394df-bbcb-46f5-ba13-00715c554a23	1	Other	Other
+9ea39d87-f57a-4475-8ac3-18548c37ce7f	1	Other	Other
+9ea39e19-8311-4e5b-9d41-6880d08c44f9	1	Other	Other
+9ea3b685-e5a4-4e9d-aa4b-5a78bbef1f63	1	Other	Other
+9ea3e5ce-aeba-4993-8e31-f7db6ed6710f	1	Other	Other
+9ea45785-db95-4ae3-95bc-8f43b771c802	1	Other	Other
+9ea461f8-6f1a-4231-b7fe-f215f4490449	1	Other	Other
+9ea46d05-492f-42ac-a8d7-9d756b0770e7	1	Other	Other
+9ea4e939-2a94-45b8-8c85-26d350bcda3e	1	Other	Other
+9ea5f3a9-fa3e-44ba-b831-cada60ce85fa	1	Other	Other
+9ea61e2d-3b1a-49e4-a34a-6833f56979f1	1	Other	Other
+9ea68091-1656-4444-a713-72ae5b3f20f4	1	Other	Other
+9ea6adab-5ace-4aab-a71c-deca1f9a7d60	1	Other	Other
+9ea6d3f2-e844-4283-808d-76c4e5f71b01	1	\N	Other
+9ea6d678-fb31-42e0-b934-4928e48073c6	1	Other	Other
+9ea6e56f-027b-4777-8df7-46420d270efb	1	Other	Other
+9ea70a18-0dea-4be2-82c6-d102ed7669a1	1	Other	Other
+9ea7651a-9f8e-4835-b9ce-e7f30d8dedc4	1	Other	Other
+9ea772a1-5bbf-4bbf-b148-6e0065419cd9	1	Other	Other
+9ea77567-efb4-4ee1-99c5-2da056a69d96	1	Other	Other
+9ea7b82b-42b6-412b-b7e4-56f351fe9afd	1	Other	Other
+9ea7dc8e-0b71-46b2-a34a-517ad5572380	1	Other	Other
+9ea7e515-9a3b-41a8-884a-0f2361f3d297	1	Other	Other
+9ea7f8a4-d951-48d4-887e-7d1fbe2e1d54	1	Other	Other
+9ea806cc-114b-4bc6-ba77-c0319426295a	1	Other	Other
+9ea816b8-9413-4738-8c59-c73a98820687	1	Other	Other
+9ea84f4a-63f8-433f-8c5a-84aef94e6547	1	Other	Other
+9ea85f79-8cbc-4b62-b00a-8628676ed2cb	1	Other	Other
+9ea87de6-3449-45d9-9dc2-998bb28f9e32	1	Other	Other
+9ea8d7b5-0346-4bd1-b94f-60d9e7e65413	1	Other	Other
+9ea90b92-fe9f-47f4-a1f8-91902d344e40	1	Other	Other
+9ea95510-ea98-4b15-a2e0-c2cdd335fb07	1	Other	Other
+9ea96e41-a044-4d36-be81-1632987eed16	1	Other	Other
+9ea97742-f78c-4a96-b989-826cb568904d	1	Other	Other
+9ea995a4-ef44-4f8b-8bbd-c98115ff706d	1	Other	Other
+9eaa1676-1d12-43ce-8a3c-a2bfd3500179	1	Other	Other
+9eaa1c31-a60d-411e-b9f4-6beb00b72015	1	Other	Other
+9eaa24dc-998f-4ceb-bbec-649221844add	1	Other	Other
+9eaa30ae-91aa-4685-a29e-185359f63357	1	Other	Other
+9eaa5f07-c7ce-44de-a86c-8158d4d2244d	1	Other	Other
+9eaa6e97-9932-44b7-a6d8-1590224fb9e7	1	Other	Other
+9eaa889e-91dd-4d19-8d06-5295e22893cc	1	Other	Other
+9eaa9f5e-a51e-40eb-bcf8-ec57f3bb3fa0	1	Other	Other
+9eaab14e-294f-4169-9d61-411a12450653	1	\N	Other
+9eaadf9a-83a4-4ab5-bacb-07628c123cf1	1	Other	Other
+9eaaf447-1a0c-4aec-b3d5-cf0cc13e094a	1	\N	Other
+9eab039e-7eb7-4fbf-ba52-add93503c530	1	Other	Other
+9eab6f2d-f46f-4b2b-a5d1-ff60d9fcedb2	1	\N	Other
+9eab7932-063f-4b9b-b49a-4fda0e158d9c	1	Other	Other
+9eab91b1-5979-465c-9bc0-25dbe581c17b	1	\N	Other
+9eabd4f2-ddb1-4535-9ca0-bc5f38b5db3a	1	Other	Other
+9eabf2e3-8c88-4aea-b3a0-0e053e3a9775	1	Other	Other
+9eac1d09-f7a8-4d06-96f4-2a99422faf03	1	Other	Other
+9eac2516-c0ce-40c4-874e-9eeea5392a57	1	Other	Other
+9eac3e3e-b48a-45a5-b4eb-3dc7bccd1746	1	James	Other
+9eac4815-7ac4-4165-90de-40867fd6582f	1	\N	Other
+9eac488b-237a-4e1a-9b7b-60ff36f38cf6	1	Other	Other
+9eac505a-1957-4ecc-9037-00c9405a7a1e	1	\N	Other
+9eacc905-2147-4e01-805e-54d25ab04c43	1	Other	Other
+9ead50b4-eaa7-49ba-be51-bcfd3b3f0f01	1	Other	Other
+9ead6ce5-fe17-449b-b991-294b6e3bb247	1	Other	Other
+9eae0a4e-aa07-494c-9b01-81f4a15decc0	1	Other	Other
+9eae1913-ca8f-42a2-8dc6-4514e60356fa	1	Other	Other
+9eae1a23-557e-461f-9f34-521295dd9e45	1	Other	Other
+9eae7348-ac67-461b-a275-827140a500ea	1	James	Other
+9eaeba69-e7b6-46d2-8d37-7056322a689c	1	Other	Other
+9eaec0ce-5cfc-4de8-ab68-c8081989c85e	1	Other	Other
+9eaece9f-b413-4d54-944c-55c889dbeb1c	1	Other	Other
+9eaed4cc-2543-4b7d-b2f4-456aff7ea339	1	Other	Other
+9eafa3e5-9d44-4eab-9fc2-9da12cd83858	1	Other	Other
+9eaffbd6-ec41-40aa-affe-4807bff9fd32	1	Other	Other
+9eb019e7-8e5b-42e6-a0f4-bfb8c32a24a7	1	Other	Other
+9eb07588-8a4e-4aa3-8347-71e6f290fed4	1	\N	Other
+9eb086f6-1a0a-4376-b57a-dc8c4af67d5d	1	Other	Other
+9eb0bbfb-1127-421a-bf25-44bab87f74c7	1	Other	Other
+9eb198f6-f284-4593-913b-2b559fb4c432	1	Other	Other
+9eb1e436-1964-40ed-b970-4960cc8542ce	1	Other	Other
+9eb1ea67-09b8-45a5-ad21-9c3a56e730d7	1	Other	Other
+9eb1f0f1-0903-4788-9324-1d139a699652	1	Other	Other
+9eb22ca5-dcb4-41ed-a32d-52eb2c07ca81	1	Other	Other
+9eb2aa2f-ab63-46da-9fb8-3318e930ef7b	1	Other	Other
+9eb2c738-23f7-4ffb-9423-f91d78fe3239	1	\N	Other
+9eb33e37-4a7f-42e3-bbff-69829287eb2d	1	Other	Other
+9eb353e4-4adb-4d2b-b68e-f8bdc42b8b70	1	Other	Other
+9eb3c552-0290-4fda-8e7e-e6cfe0b66dc7	1	Other	Other
+9eb3e142-6044-442c-bdf5-99293e975f8d	1	Other	Other
+9eb3e56a-e165-4f30-8a47-61f6e01fd077	1	Other	Other
+9eb3fa1c-bd10-4fc9-b532-0be49b7c087d	1	Other	Other
+9eb42455-b656-440d-be0d-50265952bd1d	1	Other	Other
+9eb428d5-14c7-489c-a793-fdf79e4eae69	1	Other	Other
+9eb46670-080a-43ea-aa7e-4d07845ec570	1	Other	Other
+9eb4b25b-a689-44c5-988f-d0f1fc24666b	1	Other	Other
+9eb4b6ef-426c-4564-94bd-3e8c412737e1	1	Other	Other
+9eb5300c-df24-45f3-8f58-fbec5cb18d19	1	Other	Other
+9eb557da-ca27-41bc-acf2-8a7fa14c2970	1	Other	Other
+9eb566d0-7780-48a1-bfd6-a218f62f4efd	1	Other	Other
+9eb57fb7-5f13-4f00-8c17-0eb026887aa2	1	Other	Other
+9eb5b561-1385-4fef-924c-f39563bb246b	1	Other	Other
+9eb5b5d3-6892-4c8a-ac25-491054a50764	1	Other	Other
+9eb5ecea-25ae-46ed-a2f8-6ee516e32268	1	Other	Other
+9eb5ecf0-15e0-4500-b8b7-cf86e1f6c225	1	Other	Other
+9eb64c8b-ea12-44f0-8d82-7e80cf03f746	1	Other	Other
+9eb678f9-32a9-44f7-93ea-83e99b382b00	1	Other	Other
+9eb691b1-f418-4114-bcce-d3a10c6d0311	1	Other	Other
+9eb6e184-9d60-4e34-948d-03c60b65e0d3	1	Other	Other
+9eb73ebd-2ef7-4b02-af96-f48a70230a00	1	Other	Other
+9eb7625a-7442-440f-aadf-d29e9fff61b5	1	Other	Other
+9eb791b8-bb52-4e30-9aad-b4357830878e	1	Other	Other
+9eb7c64d-c1d7-4654-b251-eb920d4d4836	1	Other	Other
+9eb7eec5-732a-44d4-aa71-9585dd445fc1	1	Other	Other
+9eb835a0-9825-4777-9c7b-be5f21a68acf	1	Other	Other
+9eb86bb0-484d-48fd-84d7-47a32cbd5aaf	1	Other	Other
+9eb87d6d-540e-4efb-bbef-c470673cb9ef	1	Other	Other
+9eb88627-a09d-46ca-aa7c-21a16e48962f	1	Other	Other
+9eb89384-06df-455e-ac5c-ac1d353ee509	1	Other	Other
+9eb90237-93a0-403f-8c78-3c72f69ae9e1	1	Other	Other
+9eb91697-0938-4c10-b292-5e7866136884	1	Other	Other
+9eb9232f-a233-45e3-bd85-1102e84bb85c	1	Other	Other
+9eb95d8b-4cad-4bb4-8559-d0445c1e132b	1	Other	Other
+9eb95e80-77a1-4798-91ca-b573057d847e	1	Other	Other
+9eb9c44a-b77b-4808-b39c-c5d4fb2f1802	1	Other	Other
+9eb9c4a6-9a23-40fa-807f-eef43bd3a3db	1	\N	Other
+9eb9d134-99b0-4f2f-a5a6-4f48b2bcc74b	1	Other	Other
+9eb9e3ba-6436-4733-8bf6-3f681c30a980	1	Other	Other
+9eb9ea91-346a-4045-b3a3-ade03a85e660	1	Other	Other
+9eb9ec97-c2e9-4211-a55a-dea7d68d52e8	1	Other	Other
+9eba1f95-16e8-431d-8942-ddc3397eb037	1	Other	Other
+9eba2cba-b101-4329-944e-8e8780542644	1	Other	Other
+9eba70a6-f689-4315-9432-9ee0e2aea276	1	Other	Other
+9eba70db-e1cb-4d1d-a7aa-597830dfea2a	1	Other	Other
+9eba7ed0-5597-4f41-86b9-5fae3d812d33	1	Other	Other
+9ebaacd1-e9bb-4d02-adaa-5c583446fe73	1	Other	Other
+9ebabafa-85f8-400d-86f3-4be106d32dfa	1	Other	Other
+9ebac24f-f40d-4465-8a68-c6258ed64ee7	1	Other	Other
+9ebac929-d45c-4c85-933c-0d2505927987	1	\N	Other
+9ebacac1-b276-4a2c-a755-7d05370756b4	1	Other	Other
+9ebae7d6-1186-4f08-9335-4d10f8a47bc4	1	Other	Other
+9ebaf994-f567-48bd-8bc6-5e65b2e3ab2f	1	Other	Other
+9ebb0028-9847-4171-a1c0-413c9790d6f5	1	Other	Other
+9ebb54fe-a155-4726-b2c6-df8aa3e42420	1	Other	Other
+9ebb83ad-1d71-4557-a30c-3cff5e40a970	1	Other	Other
+9ebbd587-f208-454d-9ade-3d71ae0a8ee6	1	Other	Other
+9ebc7924-3aa2-4479-be37-a37286528ae7	1	Other	Other
+9ebc832a-b2ba-4f55-bf6c-bedc8a9eca54	1	Other	Other
+9ebca949-53af-4178-b4a2-5c220fcdc9f3	1	Other	Other
+9ebcbd90-24b9-48a3-8ebd-26e803291a3f	1	Other	Other
+9ebcd4e2-c899-42b8-b14c-3bac82daca2b	1	Other	Other
+9ebd761d-dd7c-4c77-acc1-22a0ee66aa1a	1	Other	Other
+9ebd7d23-3c5a-43a5-9652-5c1f23c95dc1	1	Other	Other
+9ebd95fe-b35f-4d8f-8763-b55b7e69f32b	1	Other	Other
+9ebda904-c65b-4bc7-9788-50d9709ad531	1	Other	Other
+9ebdbc46-aaa7-4353-8daa-917631aeac55	1	Other	Other
+9ebdda07-2e6a-475c-93df-8e3949f53ac3	1	Other	Other
+9ebde02d-a3d6-457e-a970-55a5448ae98a	1	Other	Other
+9ebeaadd-d4b1-4198-8414-5e7f8c4c7983	1	Other	Other
+9ebf2bbf-b5cf-4c79-a9fe-4e6ca962ce62	1	Other	Other
+9ebf6101-ae3a-43c3-8180-e40effd9ccb4	1	Other	Other
+9ebf6aff-51c8-4fcc-85c2-cd3b08b41586	1	Other	Other
+9ebf7289-a758-4b3f-938b-5a36e9bde5a2	1	Other	Other
+9ebfa406-1d39-421d-a0df-19e6d0be745c	1	Other	Other
+9ebfa80b-6598-4999-bd48-4e9488ded4ae	1	Other	Other
+9ebfaed9-44de-439d-b925-c0a2f3eae711	1	Other	Other
+9ebff1d8-0b36-417a-94b1-47191a94f57e	1	Other	Other
+9ebff962-b1c9-406e-b6fd-ec2f260bbe04	1	Other	Other
+9ec06f2a-d524-40b2-965c-504d6ceb0eb4	1	Other	Other
+9ec0af7d-b052-472c-a8a5-a476bb34e828	1	Other	Other
+9ec0ba47-f748-4f5e-b93b-6a28fe6aafc1	1	Other	Other
+9ec10389-b200-4197-b3da-b6189a7a941d	1	Other	Other
+9ec1050c-c577-4b75-a208-fe346642cdf1	1	Other	Other
+9ec106af-58bb-4bdd-8d28-ca69d311b33b	1	Other	Other
+9ec1135b-9a07-4cbc-9979-1156efd6f526	1	Other	Other
+9ec12e30-c11f-41f2-a82c-b5fc1996cbc8	1	Other	Other
+9ec140fc-43ad-49ac-9c66-14ebd9d063f3	1	Other	Other
+9ec14b24-364d-4198-80bb-cb6b1c2d8f79	1	Other	Other
+9ec1847c-4a32-4539-9f13-418fb599cbb9	1	\N	Other
+9ec289b2-dac2-4acc-98b9-e9f5f6a76316	1	Other	Other
+9ec2c42d-26ae-4598-8a42-8908b402ecf3	1	Other	Other
+9ec338ad-cca4-4c6f-85fe-0fe1878e66a2	1	Other	Other
+9ec348fa-09b7-4f13-9adb-8d88c1177d42	1	Other	Other
+9ec37da5-7607-44a5-89af-8c173adf42e5	1	Other	Other
+9ec3b651-f5c7-4253-95a2-687e097a4f8d	1	Other	Other
+9ec3cb03-9521-4d7e-8c58-c311685e15c2	1	Other	Other
+9ec3f6b3-2532-4fb8-b0e5-009d20e63516	1	Other	Other
+9ec3fcd3-0b0c-4210-a35e-ff2589173ed5	1	Other	Other
+9ec414ce-5b49-49fb-a2b7-7e35b9d3c758	1	Other	Other
+9ec44403-2f06-420c-9afa-4b33435248e5	1	Other	Other
+9ec46202-7e33-4a94-8e55-def555d28740	1	Other	Other
+9ec4a3ff-47fe-4271-8b18-2f6d463db625	1	Other	Other
+9ec4d101-e281-4768-8dc0-33d7a62e9a49	1	Other	Other
+9ec4d645-21b4-4558-a892-5ea553aecf59	1	Other	Other
+9ec4ee80-9314-4d09-801b-0e440f234233	1	Other	Other
+9ec4fdf3-cee9-42c1-953a-003c836e741e	1	Other	Other
+9ec53a00-4e89-409a-bd01-35c1ad29699c	1	Other	Other
+9ec55c02-30a2-4e2a-a920-eddf814ff98f	1	Other	Other
+9ec58a66-a20f-49f1-9780-754617f2a448	1	\N	Other
+9ec5ce72-2fb0-46fa-ac11-2a71da186250	1	Other	Other
+9ec60e0d-e338-47b9-92ab-ceaa5e91081f	1	Other	Other
+9ec67cbc-f12a-4c8c-b7de-0fc323e9a2be	1	Other	Other
+9ec68901-2409-4836-b5a6-fbf126277962	1	Other	Other
+9ec6fe72-6a89-4708-9e3a-6eab5cbfc65c	1	Other	Other
+9ec72c75-0a86-4604-943e-eada0bb0d7b4	1	Other	Other
+9ec7424a-ed21-4303-b2e6-e768308aa9b4	1	Other	Other
+9ec77742-474c-43b0-9e0f-497635f4e979	1	Other	Other
+9ec7802a-6767-48b7-ae76-7233e1d87ea1	1	Other	Other
+9ec78cb4-1fad-4f75-af02-33098fd68074	1	Other	Other
+9ec7995c-2b94-4f76-8f40-b3ca23a17cdc	1	Other	Other
+9ec7cc7b-d0fe-4307-95c6-36f0bb7c3e1d	1	Other	Other
+9ec7db91-be93-437e-a2fa-d8832df19925	1	Other	Other
+9ec7e0df-2f7f-42a4-aa34-493d5fd62509	1	Other	Other
+9ec81c0f-c1aa-489d-9e87-04df153c1fb5	1	Other	Other
+9ec82c4a-6123-4734-ac6a-efc47f4ecd95	1	Other	Other
+9ec8507a-026e-42ab-af46-06cfb4dce403	1	Other	Other
+9ec8531e-9dc7-43df-95ea-a06ac43e076c	1	Other	Other
+9ec88c46-c77f-4fbf-9d1f-800dae64104c	1	Other	Other
+9ec89374-edd3-4091-a4ee-ac543521ebd8	1	Other	Other
+9ec8a7b7-bfe8-4f84-9c0e-a42a34d3e882	1	Other	Other
+9ec8af2c-704a-477a-991e-df04a50f33db	1	Other	Other
+9ec8c2e1-b832-4e7c-b1eb-fe6d698e1167	1	Other	Other
+9ec8f0e9-6c51-41c9-9f61-c700e2e3a6bc	1	Other	Other
+9ec91a54-3b72-40b8-b14c-eb0d86b37550	1	Other	Other
+9ec91f68-63e0-4a19-97fb-f3c889dd00e8	1	\N	Other
+9ec939d2-016c-42fd-b987-e7d622555f2f	1	Other	Other
+9ec95207-4fb1-4d1c-8a41-6180aed656e7	1	Other	Other
+9ec99db3-d9ac-4a1c-b199-64f36bcef5e2	1	Other	Other
+9ec9ac11-3afd-489b-8685-fe76d478f7a7	1	Other	Other
+9ec9c02b-0ea2-4318-add2-dfb0d44a6043	1	Other	Other
+9ec9d1ac-d971-43d3-9691-ec7ab313838d	1	Other	Other
+9ec9ff71-ee27-46f0-a6ac-e6d4a15a5fb1	1	\N	Other
+9eca09cf-9f9d-4f2a-9891-ed1c1f861822	1	Other	Other
+9eca3353-2401-4bfb-8e05-9b7cd1df4826	1	\N	Other
+9eca6662-141e-4cee-8f8c-1dec316d17ba	1	\N	Other
+9ecaa88c-2038-439e-b996-c609120f18f8	1	\N	Other
+9ecaabd3-833b-40da-a965-2a49672bf6a5	1	Other	Other
+9ecad2be-4e7f-4a27-9a32-0357a5ef6ec7	1	Other	Other
+9ecad653-3146-40ae-a87a-eb3bf30869ad	1	Other	Other
+9ecb23b7-0e45-49d3-8334-1028a51d3060	1	Other	Other
+9ecb3fac-4280-4bcb-b18d-9412949cc14f	1	Other	Other
+9ecb4061-6915-4344-b20f-4b8dae2b5cd9	1	Other	Other
+9ecbb322-0662-4056-87ae-00eb92047730	1	Other	Other
+9ecbc113-7159-4816-93bf-a80e975512fd	1	Other	Other
+9ecbcc08-5710-4eff-9d9f-924a210b9512	1	Other	Other
+9ecbfea3-501b-4ba4-8f94-12ed885e3347	1	Other	Other
+9ecc2a6f-d200-4397-bd36-1d80a2fda5eb	1	Other	Other
+9ecc5dfa-37ca-4b59-a13e-fa9d4f374b70	1	Other	Other
+9eccae87-8526-4df7-a065-f29a368895e1	1	Other	Other
+9ecd27c9-cfd6-4925-88e1-1ca786bfcfe6	1	Other	Other
+9ecd3e47-58a8-4cba-a00f-223225719630	1	Other	Other
+9ecd4d31-1dfb-4ab1-b18d-1063ac6802c3	1	Other	Other
+9ecd5759-e6bc-4687-9c3a-0d1383f5fe51	1	Other	Other
+9ecda040-6251-412a-a4b9-568f02f9e9da	1	Other	Other
+9ecdbe85-9b1c-4038-b9a3-9107acb0126b	1	\N	Other
+9ecdee9e-58e3-4560-ab30-ccb71f7a8d82	1	\N	Other
+9ecdfc2d-fd84-420d-a39f-648089807895	1	Other	Other
+9ece41ff-7256-4b76-83c6-cc00f3630b26	1	Other	Other
+9ecefddf-9fc2-433c-8864-b226b3873124	1	Other	Other
+9ecf2326-09bb-400a-b0a3-fb55c7fd62e9	1	Other	Other
+9ecf3e63-bd7f-424f-b03d-17c1c0bb61db	1	Other	Other
+9ecf7bd8-aa04-4bc2-aebd-af6611f11673	1	Other	Other
+9ecf803d-cbbd-4dd2-8ed5-4c1f77ae8626	1	Other	Other
+9ecf9cb9-d749-4f7b-8460-b05d4e46bab9	1	Other	Other
+9ecfb857-856d-430e-97ae-71d5bc5faf8a	1	Other	Other
+9ecfd264-8afe-4ec7-8c43-d88e14901ab7	1	Other	Other
+9ecfe816-f991-4f8c-a52e-f78350ecc3ee	1	Other	Other
+9ecfe9f8-ba03-4c06-aa5f-e925529320c4	1	Other	Other
+9ecff516-c0bd-450e-a14e-aa51a4cdd358	1	Other	Other
+9ed00628-a775-4c91-8ac1-f26e4c391588	1	Other	Other
+9ed05e7e-534a-4609-9a74-e6fe8a78cfa9	1	Other	Other
+9ed0cb88-7cbe-4ef9-81ca-c29af4ef7ad1	1	Other	Other
+9ed13665-d04b-4c77-9787-a65a6b0bfb13	1	Other	Other
+9ed13b8b-0acd-444c-83f6-7a3d7e29b7fd	1	Other	Other
+9ed13c97-4b22-4275-a08e-6178edbc8e8f	1	Other	Other
+9ed14123-c039-4ef1-842b-64a31db8e7cb	1	Other	Other
+9ed15b9f-efa7-4585-8a33-17a06e4f0579	1	Other	Other
+9ed196d2-4da5-49fb-b9af-34ad0c39583e	1	Other	Other
+9ed1aea2-4da1-498a-ac98-b7621f80171a	1	Other	Other
+9ed1d2f3-0712-4176-a270-d87960320a65	1	Other	Other
+9ed20c2a-6d3b-4ba2-8e34-167172969b5b	1	\N	Other
+9ed22a0b-15fd-4c3f-85c6-24caf08b785a	1	Other	Other
+9ed2b563-878d-41f7-8f10-12a3e28ab96b	1	Other	Other
+9ed2bb1b-6f9f-48f4-a4a5-4714c0cb6538	1	Other	Other
+9ed2f4a7-ef2b-4efc-a876-13e881e85014	1	Other	Other
+9ed3467b-f5af-4843-801d-76a73033d06b	1	Other	Other
+9ed36618-a939-4ddb-92a1-6240a9b262c8	1	Other	Other
+9ed3aec1-a2f9-48c6-a598-a6adbbf8d068	1	Other	Other
+9ed3cb07-7ed2-4e65-848b-1a0d1bb6c891	1	Other	Other
+9ed4ab44-c865-4dae-8693-238f23585207	1	Other	Other
+9ed4c3b3-7a9f-4497-9d5b-4945ccd92c1a	1	Other	Other
+9ed4e884-08e1-44ed-822a-d230ef8af1eb	1	Other	Other
+9ed5daea-f273-4fee-a35f-5405d105e423	1	Other	Other
+9ed5f247-067a-45d4-9949-3a3b87766d4e	1	Other	Other
+9ed69a5e-2a60-41f8-b110-5d89fac4ea73	1	Other	Other
+9ed6ad00-9f79-4d51-bcd7-bda173717092	1	Other	Other
+9ed6e7ef-a7a0-4cdf-88e1-e56a4cb0e18a	1	Other	Other
+9ed6ea8e-1652-453f-ab8f-7f2c1b0d36fc	1	Other	Other
+9ed6f0e1-b983-4952-a90c-5749277a4ad6	1	Other	Other
+9ed702db-da5b-4ebb-951c-2841fef4b67c	1	Other	Other
+9ed77e0f-8992-42e9-b3d1-7eed0810aca3	1	Other	Other
+9ed78f7e-290a-417a-a9ef-0f1660cf82b6	1	Other	Other
+9ed795f7-261c-4ceb-9962-0b78e8162b2e	1	Other	Other
+9ed7c1b7-57c0-4cfc-b7a6-0fd1ac1c2dd7	1	Other	Other
+9ed8722b-d6be-432c-a732-0ee7a2ff8ebd	1	Other	Other
+9ed87552-ace2-4d33-9745-5d100c9fe841	1	Other	Other
+9ed8fffb-cabe-4569-a073-50eb1edd569e	1	Other	Other
+9ed901e8-44f2-48bf-9c1e-4e941d630a14	1	Other	Other
+9ed91c6b-b079-489b-afe4-358b021f613a	1	Other	Other
+9ed93e11-df60-4465-a5b0-18fe076952a2	1	Other	Other
+9ed9489f-b1f3-4284-952e-fc33bd1e4397	1	Other	Other
+9ed9585a-5e97-4913-831c-c3cc4d45a35d	1	Other	Other
+9ed96207-39ab-435e-985a-90fd688d34f7	1	\N	Other
+9ed9b3e8-d92b-495f-b0c0-d5c17e60961d	1	Other	Other
+9eda1cdc-4d94-4377-abfa-fc9319375777	1	\N	Other
+9edac79f-270e-4712-a43e-0b53c8fc2394	1	\N	Other
+9edaf7f5-cbb2-4e35-9d40-53017cbd718e	1	Other	Other
+9edb0973-31d8-409f-846c-222611691f1f	1	Other	Other
+9edb33dc-ba24-4157-8e79-32d23f76f57e	1	Other	Other
+9edbaea6-93b3-46be-8f96-61a98ced1c16	1	Other	Other
+9edbda3f-2a4c-44ab-8120-6694e3efa6a4	1	Other	Other
+9edbe327-5848-4eee-b1ad-84432fe72806	1	Other	Other
+9edbf13a-42a4-4497-b7ab-5b142366b441	1	Other	Other
+9edc2256-94ed-49c9-ac01-cb96c9732c9f	1	Other	Other
+9edc2e43-61fe-43cf-8ab5-c4f830c0270b	1	Other	Other
+9edc3e62-2aef-40ad-a46f-ed77fa86562a	1	Other	Other
+9edc40ba-402e-4518-8400-715dac18a94b	1	Other	Other
+9edc46c0-b6fb-4672-b0c1-4d9583157f37	1	Other	Other
+9edc691e-26f2-4520-891b-1bd8ffecfc57	1	James	Other
+9edc93a9-5d4e-449a-a6c7-e770c2ba4d71	1	Other	Other
+9edcbde7-4ff4-43a4-8ad1-f354c1934126	1	Other	Other
+9edceaa2-e902-4130-bfed-266e41559062	1	Other	Other
+9edcf417-bdcf-40f3-a621-92b0697d26ee	1	Other	Other
+9edcf677-bd91-4a63-bb9d-7efe4b78b173	1	Other	Other
+9edcfa67-5e8a-4351-ab5a-2832ed37f63a	1	Other	Other
+9edd401d-2054-4be0-9fc8-6aad3551f59e	1	Other	Other
+9edd47ad-ae51-408c-8492-4f8551807e7e	1	Other	Other
+9eddb6cd-171d-419e-9494-ee1264ca1022	1	Other	Other
+9edde1c8-4097-43ed-aca0-7f5fad743de5	1	Other	Other
+9edea8e5-27b4-468a-a39b-bbf0cedc2dda	1	Other	Other
+9ededd56-4da5-4311-9388-a759c0d195e2	1	Other	Other
+9edf2ad3-e391-4e79-b149-4ff6e003cb28	1	Other	Other
+9edf4233-6d8b-4655-af6e-64696e42e2e7	1	Other	Other
+9edf7cee-a861-45f3-85b3-4c8215ebc0e1	1	Other	Other
+9ee05e3e-94fa-4822-bbd5-b1625b141ce6	1	Other	Other
+9ee0880e-d3c7-4ced-9752-95f9d5e59d03	1	Other	Other
+9ee0c9aa-8a8b-445b-ba69-c35cdf6f1daa	1	Other	Other
+9ee0eb79-a94f-4aad-b6e3-8c6c52cdec6b	1	Other	Other
+9ee13d50-7113-47cb-bb7a-fd81135a1c33	1	Other	Other
+9ee15586-4f60-4f91-a368-3861b7c65d3c	1	Other	Other
+9ee15c93-5c63-4c31-9f8f-ae4a673c54b1	1	Other	Other
+9ee1ac4f-edb7-4973-b91c-08b0cb01c171	1	Other	Other
+9ee1ad5e-f50d-4a64-bf4e-6b4fb637b379	1	Other	Other
+9ee1e9de-4728-47e8-808b-0282a45f53d6	1	Other	Other
+9ee22e01-a1ff-44f8-988d-084a69e5b165	1	Other	Other
+9ee29dd6-f939-4f5d-8dfb-f72a23d8a5d4	1	Other	Other
+9ee2b32c-568a-4cf6-adb1-a5b3bcb8804f	1	Other	Other
+9ee2f4e6-ff29-4c81-82aa-aad2f6af418c	1	Other	Other
+9ee38470-e224-4eaf-a175-4c4a47f8ce9b	1	Other	Other
+9ee38946-4591-4c43-84ac-2bae0f78a1b2	1	Other	Other
+9ee394ee-e3f2-43c6-ba09-58576ade0953	1	Other	Other
+9ee3bb78-7e21-4dd8-bea7-d2f7285f9ee1	1	Other	Other
+9ee3d62d-2b5b-4faa-96c3-4c8763285206	1	Other	Other
+9ee43730-473c-45f4-89f7-b3dbbdabc8d1	1	Other	Other
+9ee44cf7-3afc-4bcc-8caf-7a5f294be71f	1	Other	Other
+9ee493a7-fcdb-46cc-bdaa-b24370356f43	1	Other	Other
+9ee50ef4-7980-4ac3-affc-ac47a667e4b1	1	Other	Other
+9ee56de9-7665-473c-bfda-d102c9832b9e	1	Other	Other
+9ee57e47-05f3-4bca-adb1-95f0c2fff70a	1	Other	Other
+9ee5874c-c155-4f70-9b6d-0449d69fd38d	1	Other	Other
+9ee5f1b8-6e0e-4a67-8caf-2357bb16f34e	1	Other	Other
+9ee5fdc5-49d8-4e55-93e4-44be15c95d95	1	Other	Other
+9ee60744-01a5-4ec0-aa2c-8f533a39532e	1	Other	Other
+9ee61d68-d908-42e5-acc9-ef01534f793e	1	Other	Other
+9ee654a0-6322-4a12-b405-ec71c5ccb987	1	Other	Other
+9ee66862-975a-4f64-9fcf-b453a395c60d	1	Other	Other
+9ee66fbe-1a34-40e4-b436-18356ec55a34	1	Other	Other
+9ee6f1dd-4326-413b-aed7-705b94ce9898	1	Other	Other
+9ee6f343-9bc5-480e-8041-d0ed7117b23a	1	Other	Other
+9ee70d8f-ea09-4a91-96f7-d25efd6fba54	1	Other	Other
+9ee77271-3d89-4f0b-ad79-78804780dd40	1	Other	Other
+9ee783a9-4ea8-47b5-b6c0-4afcd0419df4	1	Other	Other
+9ee7bf83-9e5a-4ea0-bd09-a85d083fadde	1	Other	Other
+9ee8365e-9cc1-4198-9e29-a2383b5716ed	1	Other	Other
+9ee8411b-288e-41b7-a1a2-2a3d2230b1c4	1	Other	Other
+9ee84ff5-94e2-4cd9-9bf9-7adb2174554c	1	Other	Other
+9ee86ae0-2cd0-4769-9436-f7e187023e1f	1	Other	Other
+9ee87bb4-a322-4686-845e-8f656df2af44	1	Other	Other
+9ee88263-4f61-431b-b377-7de62a4c1899	1	Other	Other
+9ee912a5-436e-45d5-9050-8ed7706f06ba	1	Other	Other
+9ee91cc0-9c14-43e0-b140-a220eed58997	1	Other	Other
+9ee937e2-a09a-4fb4-ab85-2cf096581e3c	1	Other	Other
+9ee93867-17b7-42f6-8a11-86069655f7c1	1	\N	Other
+9ee95219-0419-4f26-a3b6-21b4f818804c	1	Other	Other
+9ee99966-11bb-47c3-8cc7-df6f8204d711	1	Other	Other
+9ee9b893-54db-41f2-8841-dbc607796f1b	1	Other	Other
+9eea1933-6df1-4e99-b256-685d13523b5b	1	Other	Other
+9eea3de7-4012-4698-b7ee-c9eb1d751475	1	Other	Other
+9eea95f9-6a97-4aee-bc35-988cc741363b	1	Other	Other
+9eeaab54-0d22-49f8-bea0-d2e45c3b11e5	1	Other	Other
+9eeaad15-fe14-46d3-9c05-fe2d23ec4f91	1	Other	Other
+9eeac685-a22a-4b97-8f52-a28b2024ae6e	1	Other	Other
+9eeaec0c-2793-43e7-820b-2847922499e3	1	Other	Other
+9eeb0723-1c7a-4cc5-ab26-dafdcd32e13e	1	Other	Other
+9eeb2b8f-1abf-4ed2-8671-b4f8276dbebf	1	Other	Other
+9eeb482e-dd11-4390-bee9-d3eb2682993c	1	Other	Other
+9eeb90be-87fc-443b-b2a7-e21d81c8afee	1	Other	Other
+9eebdae9-caf0-42b1-881c-eaafbccc491e	1	Other	Other
+9eebdf56-6a03-49c1-81e7-8d9d5900e5b7	1	Other	Other
+9eebedde-769f-4b90-8e77-cb73c6796c77	1	Other	Other
+9eebfa78-1ce0-4a43-af84-2d987c189bfd	1	Other	Other
+9eec81c0-ce55-4ce6-b3e4-ec25050d63eb	1	Other	Other
+9eec990e-0450-4da4-aaa7-d3d255de860b	1	Other	Other
+9eed4145-e332-4c4d-acca-29b4c9fc1b4e	1	Other	Other
+9eed4406-19f6-40b7-a398-4b5bbb883b90	1	Other	Other
+9eed6023-2fab-47db-9929-4937e1d181a9	1	Other	Other
+9eed66a7-73fb-4ab4-afa2-fdf8c015f31d	1	Other	Other
+9eedf1f0-66ba-4014-ade9-b19588d6eab9	1	Other	Other
+9eee3f85-6265-479d-933b-9a37e4ced7a6	1	Other	Other
+9eee5547-8e36-4247-8dc5-c4275601b655	1	Other	Other
+9eee896e-b56b-4676-8c9d-4b9c5f75a39b	1	Other	Other
+9eeeb404-ec3c-4b0f-8f12-72fc3d2ba2e6	1	Other	Other
+9eef044e-af1d-4653-89a2-70ef9977571b	1	Other	Other
+9eef237e-3755-41f1-8bd2-27005dc88171	1	Other	Other
+9eefd579-86b6-4214-b219-542b466429bd	1	Other	Other
+9ef03f14-8ba2-40bf-b775-1fd72134810d	1	Other	Other
+9ef0ab8a-927e-4c0b-b84b-126a16991193	1	Other	Other
+9ef0b29f-5112-4ea5-9082-d1f3a457d3d1	1	Other	Other
+9ef0bbb4-69b6-4a89-b119-627c176d6dbf	1	Other	Other
+9ef15e92-71a8-4c3d-a5ef-8215c52fcb50	1	Other	Other
+9ef175b1-52a2-408b-a507-be7e9fde6ce1	1	Other	Other
+9ef1d5e0-96eb-4eeb-8bc9-14e5e5677dd3	1	Other	Other
+9ef2322c-55ac-48a6-8d29-d104538d6de4	1	Other	Other
+9ef27f32-e259-4ee0-83c4-6c31666a2d41	1	Other	Other
+9ef29400-70c8-4dd6-be92-378c1efef4f2	1	Other	Other
+9ef2a08b-84e3-44b3-8a99-82697c9b51d5	1	Other	Other
+9ef2d1e9-78c2-40c4-8075-05b7c5d1a3f9	1	Other	Other
+9ef32231-5f09-4986-b425-736084d971c8	1	Other	Other
+9ef32bcc-920b-442a-b0ed-05356673d10b	1	Other	Other
+9ef343d8-30d3-45fa-acb9-513aba657e4b	1	\N	Other
+9ef34cf2-18cd-4cfa-a643-147dd0e77672	1	Other	Other
+9ef3556e-d82e-48eb-88e3-b564adc8449a	1	Other	Other
+9ef40d19-626e-42fd-9974-ea582cd2abff	1	Other	Other
+9ef431ad-c96d-44ce-80de-4ff015ffb50a	1	Other	Other
+9ef4b69e-d2d8-4827-bbfa-19f61f0062fc	1	Other	Other
+9ef4ce8c-8f36-4b3c-882d-457447a533c5	1	Other	Other
+9ef5094e-a29b-40f4-b1d3-1a63a6192238	1	Other	Other
+9ef52c89-85ba-4795-a5c9-69a4a64e7d1b	1	Other	Other
+9ef5518a-662d-42de-9c92-9917a9f80499	1	Other	Other
+9ef5618d-a31e-41ad-969a-49a795e1f353	1	Other	Other
+9ef56c2c-8cd1-403e-8572-5dd735ec85b5	1	Other	Other
+9ef5ab81-6518-47c5-996c-4a7a5a9c9b41	1	Other	Other
+9ef5e7a1-c735-4b1f-9419-7428eef38597	1	Other	Other
+9ef6296c-21a3-458c-91de-fad84d3c06b6	1	Other	Other
+9ef62db8-c152-4d69-95e6-49545eebc50e	1	Other	Other
+9ef6876d-fdd6-4bdf-b2bf-a1f62e0110ed	1	Other	Other
+9ef6a839-563c-4de1-a4cd-3b02073a2e25	1	Other	Other
+9ef6a905-3011-41f6-a774-63faf1871702	1	Other	Other
+9ef6ba83-1d1e-4d17-bf33-6b60fedf51b1	1	Other	Other
+9ef6c134-bd4b-11e7-b556-fa163e8624cc	1	Other	Other
+9ef6ef0f-1686-45ec-aaed-97f262ce9a47	1	\N	Other
+9ef70238-e639-4192-8c3a-592284806579	1	Other	Other
+9ef7804b-bc85-48dd-afc9-9a8e36b59d8c	1	Other	Other
+9ef7d9b9-ed84-4e7d-875e-d01050f4e8e1	1	Other	Other
+9ef84e16-9931-44aa-9d2a-b16d01ae254f	1	Other	Other
+9ef868bd-414b-43ed-afcd-4179c40efcbf	1	Other	Other
+9ef8b55a-56ea-425e-a01a-eb0afcf0ee60	1	Other	Other
+9ef8dd63-ece4-4d37-8cf2-92976920e915	1	Other	Other
+9ef9464f-c9f7-4077-970f-2f282856500c	1	Other	Other
+9ef949fb-eedb-4f96-a6ad-b02a7428986e	1	Other	Other
+9ef9555c-7322-4dca-bf68-c75027b2826b	1	Other	Other
+9ef968e6-177c-4fef-9654-d89269603c70	1	Other	Other
+9ef9a4c6-9ca3-4890-9e63-ba0307f6f1f8	1	Other	Other
+9ef9c7e2-2cf8-4f2e-8924-48f066161dcc	1	Other	Other
+9efa0e27-b1f5-42d2-82ec-796424fba346	1	Other	Other
+9efa3007-66f6-4819-a962-f5b0f5e9bf96	1	Other	Other
+9efa56b0-eea2-488b-90c1-0f16560267d1	1	Other	Other
+9efa9cae-9f4f-4a77-9bec-6c247385afd3	1	Other	Other
+9efaa141-093c-4ebb-bd5e-6a64a4293fe6	1	Other	Other
+9efae3a4-3341-465f-9ad8-b075752925e9	1	Other	Other
+9efb0feb-64cb-4af3-b675-55cb36d6da5b	1	Other	Other
+9efb15a5-ac95-4ec5-91cf-d3773cbc44d8	1	Other	Other
+9efb4277-7e3d-460a-946b-06838bc28b11	1	Other	Other
+9efb43bc-870e-43bd-8167-46b8435bafcc	1	Other	Other
+9efb5254-a2ee-49c2-9ccc-09bd1cae3c6b	1	Other	Other
+9efb97f6-d8a0-4a37-ba2a-75270ff31be2	1	Other	Other
+9efba4d7-e37c-4f29-b5bd-679f3d1dce42	1	Other	Other
+9efbf4d1-632e-403d-b06a-6f8630887de6	1	James	Other
+9efbfd3f-c2e9-4883-a862-4c0d10d80bb7	1	Other	Other
+9efc0a5d-5345-42fa-90ee-55aaf43869fc	1	Other	Other
+9efc7779-db5b-451b-acfc-6df6353f5e42	1	Other	Other
+9efcabb0-943b-4e4d-a5fc-33e323f158e0	1	Other	Other
+9efd1f5d-9ae2-4b58-b314-e72921b4c68a	1	Other	Other
+9efd60e9-7ed8-4f22-9576-62bf0506cbb0	1	Other	Other
+9efd7397-2bff-4182-a6d9-871d3e6cb9c0	1	Other	Other
+9efd8795-f461-4ff7-a42b-2fd9fea48569	1	Other	Other
+9efda36e-5851-491a-9849-cbf8caeae884	1	Other	Other
+9efdb1bd-7282-4f5b-b9d7-afd8bfa19446	1	Other	Other
+9efdd9d5-00bb-4305-af68-373c743547cc	1	Other	Other
+9efde3bf-70fc-4974-b235-527218927a78	1	Other	Other
+9efdf00b-3d33-4119-a47a-32582a3dcfc0	1	Other	Other
+9efdfffa-4d33-4661-964b-601903c71640	1	Other	Other
+9efe3e36-e249-4c94-af4a-19536f7b445e	1	Other	Other
+9efe5ff2-d28a-44ae-9a1c-0924d1ff272c	1	Other	Other
+9efe8b04-28e5-41eb-b1f9-4e7c1f262af5	1	Other	Other
+9efea5a8-cf87-46c6-bd11-0e8d04ec5d39	1	Other	Other
+9efea5ce-41f6-4b43-a8f6-72e4616fbafe	1	Other	Other
+9efec253-5a8e-4d7d-a998-f0894c8ba12e	1	Other	Other
+9eff1f32-bcd9-42eb-aa42-fec139ddce58	1	Other	Other
+9eff273a-b137-4936-9cab-720ad4194f90	1	James	Other
+9eff5d38-2320-44b1-872f-be63e7125643	1	Other	Other
+9eff60c1-4288-4718-b4e1-9a54d4182be4	1	Other	Other
+9effcfed-d7eb-4fc5-88ab-b7b1bb8df9c7	1	Other	Other
+9f0000b8-f599-46e2-b243-1cd3c3324ade	1	Other	Other
+9f001780-d2d4-4039-bf01-d945ddfa0e5f	1	Other	Other
+9f002333-2b8f-4e91-8dea-f368f6a80425	1	Other	Other
+9f0083f3-c1d4-4a77-9dde-2ed999f5d33c	1	Other	Other
+9f0096e8-21ea-4d03-b75e-c966845af237	1	Other	Other
+9f00e874-6be7-4bd4-a9c4-27441b09ebfa	1	Other	Other
+9f014903-d12a-4048-9484-7f73138b06fb	1	Other	Other
+9f0162b8-81f0-4098-9d63-37df028672e4	1	Other	Other
+9f016955-2933-46c0-a5ec-5187eced26e2	1	Other	Other
+9f018292-737d-4d36-a971-ca675f3b7791	1	Other	Other
+9f01a8e9-60af-4dea-aed0-595acf3b2a01	1	Other	Other
+9f01e2a2-b77b-49ef-a94a-e56b79ec610e	1	Other	Other
+9f01e74d-290d-48e2-adf1-6c0e5dff51a9	1	Other	Other
+9f01fb87-7c40-424b-b17e-5bdb6b188841	1	Other	Other
+9f023afc-cf4a-4e78-94af-bf38daea72e1	1	Other	Other
+9f025b49-9c19-4b63-91b2-800904e57675	1	Other	Other
+9f026080-16e0-4d19-8734-7f6e290b83be	1	Other	Other
+9f02fec4-98eb-4c92-8ff6-e9c685905569	1	Other	Other
+9f03656f-1724-4c94-a3e0-72e5a88e5fd2	1	Other	Other
+9f0372b1-7db1-4541-a144-64dbb28b6897	1	Other	Other
+9f03ab1c-c0ea-4339-a362-2c8aa7b28221	1	Other	Other
+9f03b7cf-9a27-42e7-9794-3c2c02f2d36a	1	Other	Other
+9f03e5cf-9a2f-417e-ab05-b721fe1a2adc	1	Other	Other
+9f03ef75-1ee8-43e8-8d18-183240763938	1	Other	Other
+9f043200-8810-49a6-8dce-8ef4a13e582f	1	Other	Other
+9f047b07-c4cc-49d9-8890-b32a5c28611b	1	Other	Other
+9f0487e6-4be4-434e-bcd5-3d86f29fdd6b	1	Other	Other
+9f049118-7f43-4921-9bc0-b093bad73b2d	1	Other	Other
+9f04af05-4e8c-49c1-a6b8-fe805a411448	1	Other	Other
+9f04af55-f3e6-4b53-adfa-17bd7de218c6	1	Other	Other
+9f04b6a3-f52c-497f-9493-8843fb147724	1	Other	Other
+9f04d148-f7be-4530-90b1-0a9b92d2cf63	1	Other	Other
+9f04df56-2de4-44a5-a603-75e6d8447ca1	1	\N	Other
+9f050e28-2524-4358-afb6-5da15997ce82	1	\N	Other
+9f052ce1-776e-4ae0-8140-0b6991a96192	1	Other	Other
+9f053e4f-d0aa-4b63-ba53-3a7c140df3a7	1	Other	Other
+9f05e5f1-5a88-430c-adbb-c330d5a3a881	1	Other	Other
+9f063f58-ad16-43a8-88c1-44cdfda2b4c2	1	Other	Other
+9f065e54-2579-4447-823e-cd32bfd7eb74	1	Other	Other
+9f0660d4-0819-4e3c-ab66-d3011f7f2756	1	Other	Other
+9f06881b-41b8-47a6-a28e-c150d60bf88e	1	Other	Other
+9f06a186-455d-11e8-b2e5-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+9f06a20d-e98b-4709-b565-4071781fb78c	1	\N	Other
+9f06d5da-cbf7-461a-a179-b02fca1d464b	1	James	Other
+9f0720b0-4a82-43f6-80e6-e93e4e46af6b	1	Other	Other
+9f0734ad-d254-42cd-8936-c0fbcf286d44	1	Other	Other
+9f075c40-6589-43c5-a8f6-5d5b7a342620	1	Other	Other
+9f076735-a1bf-4043-85e7-64dd4aa0fc25	1	\N	Other
+9f076981-105b-4f0e-9dfa-4d1043f4eadf	1	\N	Other
+9f078585-98bf-4017-a2dd-920c8cff6a7c	1	Other	Other
+9f07c977-29da-42dd-8a0f-60581f03859f	1	\N	Other
+9f07cdcc-28a5-418a-b2ee-6d68336b82c8	1	Other	Other
+9f07de64-1d90-48c2-8648-eb604c80a005	1	Other	Other
+9f07e811-25a4-40d7-81dd-224a3951c0be	1	Other	Other
+9f07f776-049a-4032-9991-fae912b51234	1	Other	Other
+9f08651b-006b-4441-bcf8-c842b2e8337f	1	Other	Other
+9f087832-4090-4208-af1f-abf69dc773b2	1	Other	Other
+9f0888cf-99f1-440b-b115-26830ade2ecf	1	\N	Other
+9f0898a8-9ab0-4206-ac6b-c223ca58cb2b	1	Other	Other
+9f0908f4-89c4-43b8-b732-8927e283face	1	Other	Other
+9f093b8b-a57c-4100-9fa7-489af623b0ca	1	Other	Other
+9f096e27-b180-4d40-ad21-481f519f0d38	1	Other	Other
+9f0995f1-8008-491a-b05d-176de12f04ac	1	Other	Other
+9f0a522b-90eb-4e70-9fb2-73f8c4c6bbcb	1	Other	Other
+9f0a62b0-9085-4dd3-aa29-51742dadd0e9	1	Other	Other
+9f0acd65-b8d9-468b-90fe-4ab1cdffd782	1	Other	Other
+9f0afcc6-31fe-419a-9b8c-71bbdb575842	1	Other	Other
+9f0b5aa4-7914-4047-8177-cf12c7531907	1	Other	Other
+9f0bd0f7-9c03-421f-8bc9-44050cf50b5c	1	Other	Other
+9f0bd272-2330-45b1-a784-82ed8aea4aef	1	Other	Other
+9f0bd2bf-a6c4-4a58-a5d6-e0e82e963751	1	Other	Other
+9f0bde98-7e97-4bd5-8b53-8a6a3c3d1f50	1	Other	Other
+9f0c22c9-2aea-4457-9260-39f81ddca917	1	Other	Other
+9f0c2948-f975-4fd1-b3db-cdf089aa68b0	1	Other	Other
+9f0c5991-c088-4cfa-8227-5f9640f43423	1	Other	Other
+9f0c6436-0e36-4fb6-aa4b-3b340e0cc9f2	1	Other	Other
+9f0c7aed-b9c3-4441-aa0c-937c7cb2de74	1	\N	Other
+9f0c905f-47fb-4b85-aa2b-17878c2ca4c3	1	Other	Other
+9f0c98a3-90ad-46e7-beb6-b281d0e341b4	1	Other	Other
+9f0ca9d3-7b04-407a-a2bf-4516e09d991a	1	Other	Other
+9f0cbe73-1360-4d7e-855f-6913a3aee0ee	1	Other	Other
+9f0cbee5-b72c-4444-b69d-6d765872d40f	1	Other	Other
+9f0cc3bc-b362-4682-aa32-84b45a21ed70	1	Other	Other
+9f0cf7da-6eb7-49ea-a97d-817f08807ff2	1	Other	Other
+9f0d35ad-36d3-4266-b441-33db00953a95	1	Other	Other
+9f0db948-67a2-4a3c-bd4e-e23eddddebd1	1	Other	Other
+9f0dbc3a-7124-4f0f-b144-b2abdcd79b1d	1	Other	Other
+9f0dbfab-c910-4643-b6a9-4ff3aaedd9d1	1	Other	Other
+9f0dc659-0cb1-44ad-b7b6-a055ed89df9f	1	\N	Other
+9f0df1b6-cdc8-4c84-93fe-aa98df1e0aa3	1	James	Other
+9f0e0d0a-1e68-4c71-b124-0910b332a70b	1	Other	Other
+9f0e13c8-bffb-449c-a093-03e094145d04	1	Other	Other
+9f0e14e0-5dae-4258-8ae7-1ee158269eb0	1	Other	Other
+9f0e5149-c4c6-4bea-9ec0-480fd28e941b	1	Other	Other
+9f0e7c1f-9bbd-41be-9ea7-c6194cb62399	1	Other	Other
+9f0e7ca2-5df9-426b-a15f-7240b8e27c8f	1	\N	Other
+9f0ea9e3-e2c3-4bc8-b1d9-d2d36a9d68c2	1	Other	Other
+9f0ec14b-5ec3-4794-b4a6-403cae49fbac	1	Other	Other
+9f0ede6d-0512-43d9-97a1-365922bf9177	1	Other	Other
+9f0ee93c-1a98-413d-a3d1-a6ab45b30e40	1	Other	Other
+9f0eec4d-ca3a-430a-8cdc-6cb96fa066dc	1	Other	Other
+9f0f1fae-4566-478f-88dd-098d32acaf86	1	Other	Other
+9f0f7246-307d-4f32-8b8a-ac55976ef0f2	1	Other	Other
+9f0f889f-c386-4601-ae5e-32bfab4ae8ed	1	Other	Other
+9f0fd10e-b808-48c1-b28c-055ba7139b9c	1	Other	Other
+9f104e71-9ab4-476b-9b85-1154f5714e52	1	Other	Other
+9f1058c4-5f27-447c-a542-831a856866d9	1	Other	Other
+9f108c90-8f35-440a-96c1-435452912e4b	1	Other	Other
+9f10bc96-4a27-4e45-b0f1-c0625a63753a	1	Other	Other
+9f10ce96-db09-4312-a397-2265ce36f04c	1	Other	Other
+9f10ed32-0edd-4726-8024-3952a1dd10a8	1	Other	Other
+9f1146db-f6f9-4cc4-b131-5defcf3a83bf	1	\N	Other
+9f1155ed-859b-4cb2-8d04-695a9c04ad41	1	Other	Other
+9f1173c1-ad4d-4113-a2aa-99ee04a7218a	1	Other	Other
+9f119c31-51c9-4289-8493-4935a51d4d4b	1	Other	Other
+9f11d047-fbd1-4589-a146-749f9ec0c202	1	Other	Other
+9f11d849-e54b-464d-b8ec-8858446820b8	1	Other	Other
+9f11dd83-27f8-4368-9549-a3a705f8cb31	1	\N	Other
+9f122c70-7585-44dc-8665-b55571984627	1	Other	Other
+9f122f2b-d795-411d-8f9c-0ef613588efa	1	Other	Other
+9f124a34-1004-43a1-888a-e9c58715b110	1	Other	Other
+9f1250be-4bf5-4c84-bdba-718c59dd021c	1	James	Other
+9f126823-c071-427e-8dc1-48a08c7ef2c8	1	Other	Other
+9f12704d-bcbf-4a84-becd-2bbcc1074543	1	Other	Other
+9f12750d-04e0-40d2-80e8-25fbcbaf2b35	1	Other	Other
+9f128837-e11f-4042-9cee-d6f22bbe5c95	1	Other	Other
+9f1294d8-f3a9-4da7-9cef-47e4ab2716f9	1	Other	Other
+9f12b32e-8b0d-41d5-bae4-b9fd4b69b473	1	Other	Other
+9f12ba63-a12a-4d5b-a556-d0606e3eeb56	1	Other	Other
+9f1333ef-4bf3-4041-bfc6-00cf7588fb83	1	Other	Other
+9f135060-4339-4d36-91f9-29dfa9f79579	1	Other	Other
+9f139b7b-4dfe-4879-a367-b3095defc369	1	Other	Other
+9f13c8b4-fa54-4798-b107-99a8285e78f6	1	Other	Other
+9f13f447-d84f-4481-8c72-a3cbf99bbfe8	1	\N	Other
+9f1409c4-8d2c-492d-aa72-f3a897d68296	1	Other	Other
+9f1443b2-4697-4d32-8f38-4d1af503f42e	1	Other	Other
+9f144dd7-a1c4-487e-bcc5-129c3eb451e8	1	Other	Other
+9f148db7-a14f-4022-a237-f574cc7b9b90	1	Other	Other
+9f14973e-9946-4e4a-85ad-767b53e8807d	1	Other	Other
+9f14a91d-6cf8-4b9d-ad4c-8d2a143e634d	1	Other	Other
+9f14ee7d-e5d2-4a20-8b16-c03e07396f4f	1	Other	Other
+9f150767-ad74-49d2-8776-b0553fbc7f10	1	Other	Other
+9f150911-3f79-4658-86f7-16478fb753ba	1	Other	Other
+9f15d0eb-ca9e-478f-befb-3ea18a66404a	1	Other	Other
+9f15df26-b286-11e7-aff0-fa163e8624cc	1	Other	Other
+9f160aa1-5e5e-4dd6-acc7-1d516e1b2140	1	Other	Other
+9f1613a6-18ac-48dd-ad10-4178301d8ebf	1	Other	Other
+9f166cb4-f8ed-48fc-97ef-90ff54a4b6c9	1	\N	Other
+9f167fa7-39ca-48fb-9c4b-63d2014b87ab	1	Other	Other
+9f16ade3-8ed7-4b5a-953c-7c4686286cab	1	Other	Other
+9f16e9a3-dbb1-43a6-9fbd-b937a19df13a	1	Other	Other
+9f16f7b3-7191-4d00-9174-6bed4c6fa6ad	1	Other	Other
+9f170803-70e4-4f13-8281-2d575ece061a	1	Other	Other
+9f172d47-3271-4301-b0cb-3432f15df34d	1	Other	Other
+9f173b83-5aa1-4f8a-8c4c-f6c4ed475e33	1	Other	Other
+9f17450a-e8bb-4b3b-ba07-11d15fb4907f	1	Other	Other
+9f174f2c-89c0-4f24-8dcc-47e4bb850d19	1	Other	Other
+9f179cab-a632-4d34-a90d-a28e70cf2bc4	1	Other	Other
+9f182207-b799-4199-973e-8b69eb63f183	1	Other	Other
+9f1834ee-9156-45c6-a451-b7599185000d	1	Other	Other
+9f184f6e-837d-40a0-b24f-0e1bf62934fa	1	\N	Other
+9f186158-aa8d-4031-b4ce-70d190908e5c	1	Other	Other
+9f1861e7-d75f-44a9-ad5b-a31234754172	1	Other	Other
+9f187f23-5604-4f70-bb75-bf723e7137de	1	Other	Other
+9f188cd8-9917-426a-ad49-f0311889fb90	1	Other	Other
+9f189f75-90c3-4deb-abd0-064fbb4062e3	1	Other	Other
+9f18aa19-3dfa-4f43-83f3-fcd20d3f7849	1	Other	Other
+9f18e526-4bbf-401a-92c9-0edbdb0a885b	1	Other	Other
+9f18eb12-c9c2-43a0-a504-bf4cd46d6ff1	1	James	Other
+9f193cf2-e930-4e47-9bf3-a0577c9c4f5b	1	Other	Other
+9f1995de-640f-4442-a5a3-7fbe4da965bc	1	Other	Other
+9f19da8d-48e5-4615-9ce7-9be0a9e2e56a	1	Other	Other
+9f19f004-6123-45a4-ab60-2f72b9a5803a	1	\N	Other
+9f1a0f77-bfe4-49bf-9086-516d840db666	1	Other	Other
+9f1a23bd-1ecc-428e-a1d9-6f698606cb37	1	Other	Other
+9f1a904c-ae6b-4a82-8ecb-6a9bd24f42f9	1	Other	Other
+9f1a9084-5b88-4b03-9550-f3eb0c4ea6c8	1	Other	Other
+9f1aa1d4-488e-45af-8f26-49c129abe3c0	1	Other	Other
+9f1ae74b-d6c3-4ea3-bf2c-350b0c6d4c27	1	Other	Other
+9f1b0bf0-1a14-4308-9119-4a0d55c9d30d	1	Other	Other
+9f1b0f59-741f-4a49-94b1-2ca3cdfeafc6	1	Other	Other
+9f1b1f44-1703-4c39-bd1b-19eb7beba406	1	Other	Other
+9f1b77d0-9d0d-4259-974a-aeba09cb1693	1	Other	Other
+9f1bb376-3dbe-45b7-8523-a88910f9cced	1	Other	Other
+9f1bcbda-f6db-44e2-8c40-b151e44d5bc2	1	Other	Other
+9f1c8303-906c-4fa3-ac83-587bce9252c0	1	Other	Other
+9f1c9019-2a1c-4cb6-ad8e-c806766bd29b	1	Other	Other
+9f1cc616-82fa-4e83-8aad-f2e537a93da5	1	Other	Other
+9f1cf647-cda8-4f94-9a6b-fcb79be089d6	1	Other	Other
+9f1d081a-1da8-4b6b-96aa-c28f567422c0	1	Other	Other
+9f1d2672-74ae-4ba1-9f8b-6b40c1f48d46	1	Other	Other
+9f1d4e5d-b859-44f3-bc7b-2bf250057751	1	Other	Other
+9f1e3547-3543-42e9-af1e-63ea6cb88a4d	1	Other	Other
+9f1e3d66-40ba-41eb-8986-4a1fa1563c01	1	Other	Other
+9f1e588b-5388-4b28-8e31-279bf632984c	1	Other	Other
+9f1e996a-e039-42dd-83f4-dc3cc1495b1c	1	Other	Other
+9f1eae88-c38a-439b-b107-19966378094d	1	Other	Other
+9f1eb880-a669-4406-85b2-7fcec5004a15	1	Other	Other
+9f1ebcac-915e-40cb-ae5a-a6520d31355f	1	Other	Other
+9f1ee9e7-8a76-4d95-9d7d-5330589ae68d	1	James	Other
+9f1efe61-8946-4c76-8e24-d94ce242cf06	1	Other	Other
+9f1f154d-ccf5-4e26-8078-2b37a54a949a	1	Other	Other
+9f1f3b01-4f78-4cde-82cb-54d957a498fa	1	Other	Other
+9f1f482d-15bf-4f90-b942-90220d26b3a8	1	Other	Other
+9f1f58c7-ddd8-4cb1-8833-c47ec663adcb	1	Other	Other
+9f1f63cf-3ce6-49b6-a014-7bcbaab34475	1	Other	Other
+9f1f6421-33d1-4337-abe0-65f4cae76ee2	1	Other	Other
+9f1f71a2-e671-4325-92ec-37d13fcc7e6a	1	Other	Other
+9f20042d-41a7-4331-9929-11e178376cd0	1	Other	Other
+9f20137d-e344-46dd-a943-1f3c95878068	1	Other	Other
+9f21125a-b25a-4562-b3b5-50e418d79c4e	1	Other	Other
+9f211e45-6c46-4644-be7f-81080c58bf59	1	Other	Other
+9f219b76-a18f-49a4-9cc9-5960cdfbec83	1	Other	Other
+9f21cf5f-3b90-4744-8be9-ba84e1f30ded	1	Other	Other
+9f21fd7e-dec7-405d-85fd-8adc0266413b	1	Other	Other
+9f2218e8-55ea-40be-adcd-aa38f34f50f2	1	Other	Other
+9f2259b3-5f16-45d3-849f-0b67527eb3c0	1	Other	Other
+9f22898c-6846-4f2d-b9eb-55d26e8ff280	1	Other	Other
+9f229b8a-df28-4ead-93e0-0c20d9a32504	1	Other	Other
+9f229e63-a28f-457d-99b0-8ff68c2fb434	1	Other	Other
+9f22a7fd-c3f7-4682-93f8-7d6a9777c280	1	Other	Other
+9f23094e-67a1-48f9-b55a-dad5f6d54212	1	Other	Other
+9f233e80-e661-4763-afa9-ee42853bea5d	1	Other	Other
+9f234f0c-b5f1-4e44-85f9-4680920bae40	1	Other	Other
+9f236d41-0251-499a-bee4-4fd46b163ed3	1	Other	Other
+9f23923f-927e-48ce-bcd0-f31518da0a09	1	Other	Other
+9f23b720-3860-492c-b78b-0c053bf64065	1	Other	Other
+9f23e5d6-6a11-44b6-b586-66c147d75747	1	Other	Other
+9f23fe29-fe33-4d59-8476-b3c7abdacf56	1	Other	Other
+9f241e10-840c-4aa5-9538-8494bc76baea	1	Other	Other
+9f24890e-0c96-47d8-a926-86c34b6f46d8	1	Other	Other
+9f248960-d301-423b-84ea-aaf729f83735	1	Other	Other
+9f24c40c-b46b-4c26-8e0e-5e2a398624b2	1	Other	Other
+9f24e112-751c-443c-8825-e54b92dd32d6	1	Other	Other
+9f254186-d81d-4854-97cb-03644d71ee07	1	Other	Other
+9f25482e-77e9-4566-8ba2-ed22fd63e0b3	1	Other	Other
+9f2558dc-8054-4fcb-834d-d7ff4103c3e6	1	Other	Other
+9f259194-eb66-4550-bf05-abd6ae6a9d60	1	Other	Other
+9f263a37-5725-4815-aafd-e8286b4c6674	1	Other	Other
+9f264f75-8717-40cb-ab89-0f644ae26d8a	1	Other	Other
+9f2677f8-b5ff-482f-bc31-31f2e5834a8f	1	Other	Other
+9f267e4a-99ee-4059-af87-98666fbec1d8	1	Other	Other
+9f26e2b0-65b6-446e-b2eb-69af4af2b253	1	Other	Other
+9f26e3e3-e8bd-4b37-870f-d10be09d4b72	1	Other	Other
+9f26f5d0-055b-4f68-8f4a-bbd62b7c90fd	1	Other	Other
+9f272cc0-5812-41cb-b7d0-934f92d62d97	1	Other	Other
+9f27b08e-fa18-4d28-9dac-9ce260e81998	1	Other	Other
+9f27de84-d6fe-4692-b669-4e75fcf93098	1	Other	Other
+9f27e373-95e8-4e59-ac34-fff4ec38e062	1	Other	Other
+9f27e5c3-65a7-4288-b977-f39f27efddcc	1	Other	Other
+9f2802d0-f8db-4d66-8514-ef10240d7920	1	Other	Other
+9f280a4e-214c-486a-b9c9-5fd6920ce58f	1	Other	Other
+9f28346a-7517-42b5-8b10-a87f55d8a6b0	1	Other	Other
+9f2865e2-9d45-405b-a38a-a1fc3dc618e2	1	Other	Other
+9f28e8f0-6b17-4346-9371-7639c45daa75	1	Other	Other
+9f29037b-497a-4c50-a37a-fdef17c91ee2	1	Other	Other
+9f293d28-ad3d-4e97-81a8-2cc863a1088c	1	Other	Other
+9f2953f9-74a1-46d2-ab4e-30f205297ce8	1	Other	Other
+9f29733b-408d-4b12-90e3-8f6405da9dd0	1	Other	Other
+9f2982ca-e2b7-43d3-9dea-f61cb30ac99f	1	Other	Other
+9f29a91a-a874-4929-a6c6-205fd59c0bd0	1	Other	Other
+9f2a0cd0-4e13-4e1d-88f9-aa6ccfcb5431	1	Other	Other
+9f2a23d6-c22e-45bc-87c3-2fa6204f5903	1	Other	Other
+9f2a290c-35e8-4e65-bae0-7a9785958829	1	Other	Other
+9f2a87fd-1c79-4b4f-a696-506cbbe19cd8	1	Other	Other
+9f2aa455-846d-43fd-bbac-6f48967dfd10	1	Other	Other
+9f2aca47-dda8-4b57-a503-c6f687b52b0f	1	Other	Other
+9f2af2fe-5629-4a45-a458-64e392dbf5ae	1	Other	Other
+9f2b0e1f-5db2-48ec-80c3-a2cbaddf9b30	1	\N	Other
+9f2b14b9-f87c-4620-a12f-00be9b23f338	1	Other	Other
+9f2c217b-139b-4ed5-926e-30bd21bfce7b	1	Other	Other
+9f2c4157-65d3-48b7-bc89-cf9f55fc8a9d	1	Other	Other
+9f2d0183-6929-4eeb-9ad5-b2ad98cfa0bb	1	Other	Other
+9f2d66e1-2067-456b-8c97-5c2528195195	1	Other	Other
+9f2d756d-55cf-4bb7-bed5-2f77e3e3a6d6	1	Other	Other
+9f2dad05-5198-49a0-9b0d-2720b999770c	1	Other	Other
+9f2dc7e5-8336-4eb8-aa5a-0a34645c82cf	1	Other	Other
+9f2e3e25-51f7-4878-b90a-7ceabdc76748	1	James	Other
+9f2e4d8d-22a4-40f5-b66a-508c3c193bcb	1	Other	Other
+9f2ed9c3-19de-4d61-8603-fda28668eb6e	1	Other	Other
+9f2f3bcd-566e-4f56-b36d-07ac4cf51b67	1	Other	Other
+9f2f8851-170d-4596-a007-b411dff6f29f	1	Other	Other
+9f2f9254-348b-4eac-95d6-e426567a0e2a	1	Other	Other
+9f2fd677-daff-4372-8d14-6f099b713cf3	1	Other	Other
+9f300da0-3cc2-4a83-b92e-3569facb04e8	1	Other	Other
+9f30254d-05bc-4192-82c0-f8f2b1dd0431	1	\N	Other
+9f302cbf-87c6-4b33-b98d-f2c877544856	1	Other	Other
+9f30358c-d2f7-4ef1-8076-57cf7933fa57	1	Other	Other
+9f306d19-97b3-4b8a-8533-5eb9ff0f05a7	1	\N	Other
+9f30bbf2-d4dc-443e-b5d3-ab13bb27abba	1	Other	Other
+9f30be08-54bf-441a-bbfe-b77a9f798b03	1	Other	Other
+9f30d0bf-0404-4fcf-85cb-aaf10a9c5c87	1	Other	Other
+9f30d169-ef9d-42ce-83aa-4cb5824689f5	1	Other	Other
+9f3106d0-b432-4d60-ab1d-f13fd4c75e7b	1	Other	Other
+9f316de3-46a0-4e86-b92f-15ecdb8bbcb1	1	Other	Other
+9f316e74-9647-41f7-8d50-e5e4c57aa4ad	1	Other	Other
+9f3192e5-3383-4a92-80cc-d95fcd808227	1	Other	Other
+9f319b9e-3041-4fa6-980e-5a77ba0fd898	1	Other	Other
+9f31a04c-6005-40c2-bf3d-6b5f44412cae	1	\N	Other
+9f31a357-e429-4751-9d33-0c41efc9007b	1	Other	Other
+9f31afbe-4348-4aa0-9b08-5cea47c299cd	1	Other	Other
+9f31b328-4a9b-4e0a-95cb-6b59dc6666c5	1	Other	Other
+9f31e1a2-19fa-4268-88be-28918dddb1c3	1	Other	Other
+9f31e46c-e66d-4b5c-9c40-059d18de28e8	1	Other	Other
+9f327cfa-8e65-4410-a10f-e58a762692a0	1	Other	Other
+9f32ba97-a1fc-41d7-bd0b-a8984ce375bd	1	Other	Other
+9f32c8bf-2af8-4a28-8c21-a72136f3fead	1	Other	Other
+9f32ce9e-aab0-4816-b374-bd3a914d13ae	1	Other	Other
+9f332d1b-823d-4c1c-ae45-746ca31e218c	1	Other	Other
+9f333e04-a865-430c-9d6f-021b98942a05	1	Other	Other
+9f33ffe8-4c7f-41bd-8360-154fd2728e24	1	Other	Other
+9f3403ff-365e-4b11-87a8-c8c10fa2d281	1	Other	Other
+9f3483fb-8b99-4263-999c-64cdb6ac58a4	1	Other	Other
+9f34b7c6-e9b3-46d7-bb87-3fd0bf2c6aef	1	Other	Other
+9f34cf67-a236-4d71-8e17-bc290ec9016e	1	Other	Other
+9f34e401-880b-4170-876f-86a358ce3f49	1	Other	Other
+9f34ec3e-7c9c-4773-96be-16eb4d0e4f1b	1	Other	Other
+9f35041f-ebf4-4b94-88d0-89e671b390bd	1	Other	Other
+9f351c46-d585-4feb-a477-58ec9e83bc29	1	Other	Other
+9f35245a-fca7-4d65-8214-cd793f65c422	1	Other	Other
+9f352da2-f416-4f06-8eab-970b225f9978	1	Other	Other
+9f358c89-ab0a-450f-bbb0-418e001f5cdc	1	Other	Other
+9f36384b-adcf-4fa5-86d5-0a1da5fba8c9	1	Other	Other
+9f36ad0a-55b5-424d-81dd-ef5713239489	1	Other	Other
+9f36c1cb-1856-4f6d-a991-da6ba036eb9a	1	Other	Other
+9f36c704-f616-4a1d-b4c3-530ea33f0611	1	Other	Other
+9f36dfac-c577-47fb-868e-abbcade7976d	1	\N	Other
+9f371fa5-b20f-4287-b6a0-8111bb3a1c73	1	Other	Other
+9f3747d4-3540-4767-9242-273d0b44605c	1	Other	Other
+9f375ca3-6f6b-47eb-b42a-327b5701d326	1	Other	Other
+9f3761a7-9e8a-44f7-a816-8b92ce714752	1	Other	Other
+9f37a683-33c4-43da-88f3-36700f583f78	1	Other	Other
+9f37ac05-a558-46fe-8fae-eee295d0d161	1	Other	Other
+9f37bb6f-9541-4572-b33c-4f1e6a5e120a	1	Other	Other
+9f381768-17b1-4cbe-9350-bce6cf2e220a	1	Other	Other
+9f386d14-5d82-4c06-8751-6eaa6ab0fda4	1	Other	Other
+9f38722c-a56c-4cc0-8d6c-0523c809031f	1	Other	Other
+9f38772d-5739-45c1-a0a5-4d83f98c08de	1	Other	Other
+9f3881bb-565d-4062-b814-ed3baf8b56ba	1	Other	Other
+9f38ba2a-0e59-426f-b419-9a56291d7328	1	Other	Other
+9f38fa49-2476-4288-a4bc-6fd32264b5d4	1	Other	Other
+9f39417a-92a8-44ec-9544-9b246d0e9f41	1	Other	Other
+9f399010-ac7a-437c-bcb4-1d00dd8f9ba5	1	Other	Other
+9f39914d-94cc-4477-9ea8-7cffaedc2750	1	Other	Other
+9f3a10a8-4734-405e-8b08-07481385cb4d	1	Other	Other
+9f3a14da-5746-471a-963d-95a9e8348fa9	1	Other	Other
+9f3a330d-ef18-42bd-ac7f-2be145b9bfc6	1	Other	Other
+9f3a706d-438f-4d4b-abe4-bfd2b468ead2	1	Other	Other
+9f3a8168-a360-46f1-a187-32228274341f	1	Other	Other
+9f3b6b58-cb89-435b-afbe-92f17e2bb35a	1	Other	Other
+9f3b738c-0218-43dd-9e2e-db2f69ec5199	1	Other	Other
+9f3b87b1-81a2-436a-aeae-37e470ea909f	1	Other	Other
+9f3ba2a8-cdbd-4ec3-8e7f-6d34fd5d7a4d	1	Other	Other
+9f3c5ff0-bb21-488d-a8e2-faaa51ed32dc	1	Other	Other
+9f3ce6c9-850b-4281-817f-c798601cc8f8	1	Other	Other
+9f3d18c2-02db-46a8-834a-606f85253575	1	\N	Other
+9f3d9632-e090-47dc-b91e-c8eda54a90ea	1	Other	Other
+9f3daa5a-d197-4965-81da-d86040e9d06e	1	Other	Other
+9f3dd6ee-9193-4070-bb98-c0a95d7a5636	1	Other	Other
+9f3dfe5f-f0e1-4873-933b-317922257cba	1	Other	Other
+9f3e153a-4328-4a60-a74f-4a2dd02603a2	1	Other	Other
+9f3e79a4-bef3-41cb-8ff9-a162bd101e59	1	James	Other
+9f3e9c1b-acf0-4696-8cde-d4974a839ba6	1	Other	Other
+9f3ed6a8-db09-45ec-91d3-83029a1d9f95	1	Other	Other
+9f3ee4c6-da8d-40be-912b-45cc7e0437e1	1	Other	Other
+9f3ee70c-734f-4423-8194-76399700ea9c	1	Other	Other
+9f3ee7ae-37ed-43a6-8869-9ca6059596b7	1	\N	Other
+9f3efba0-1f03-497a-8e94-49e35aa911eb	1	Other	Other
+9f3f32ac-082a-4494-9a11-9441044cadd0	1	Other	Other
+9f3f7451-e419-47fd-ac1c-6caa7ead0f3b	1	Other	Other
+9f3f9539-7129-4536-8020-55d4a5cd3479	1	Other	Other
+9f3f9ed6-b930-495c-b4e3-f298ec314287	1	Other	Other
+9f3fd675-88ed-48a2-b9ce-dc0a3a49d68d	1	Other	Other
+9f3fdc8c-bddb-4125-958c-e97ee1854ae0	1	Other	Other
+9f4003f6-3fcf-42ec-9d23-cf693dbe6436	1	Other	Other
+9f405c51-9233-43c7-bc5c-99754ca9f495	1	Other	Other
+9f4067e1-48d2-40a1-a766-5765d8340b69	1	Other	Other
+9f40a856-e3f8-4bca-ac12-ca3847f6086e	1	Other	Other
+9f40bc6b-2eaa-43c4-b1e5-88fc8d0c1a7a	1	Other	Other
+9f40ddeb-c4a9-4c9d-bdb8-e635057218ab	1	Other	Other
+9f412813-5a20-465a-9b2a-dd2abd0b70e2	1	Other	Other
+9f41fb83-c7e3-4e0f-aefa-ec8f4fb32a76	1	Other	Other
+9f4201e1-71a0-4ff8-8c86-b108f9ad87b8	1	Other	Other
+9f4213e2-61e5-4186-9aa5-3f4b4c90a9a1	1	Other	Other
+9f425e67-e17b-4c71-ac26-5e6ef33bd1e2	1	Other	Other
+9f4273b8-5e37-4858-bb20-11065b16756b	1	Other	Other
+9f4298bd-6700-4e75-ac1f-7c1105c6840d	1	Other	Other
+9f42a1ce-ab45-4ff9-899b-c8877b862fd3	1	Other	Other
+9f42dde9-1934-4aed-8a3c-e5b54baa63f2	1	Other	Other
+9f4312c2-43cf-4d66-9ccd-299022dc12c7	1	Other	Other
+9f433c3c-be2a-4ca2-8a27-1d71b9ff1926	1	Other	Other
+9f437d33-89f3-4e9b-9bfb-6d4b5ea41bb3	1	Other	Other
+9f438a90-4582-43c8-b427-8300808ce525	1	Other	Other
+9f43abdd-8f55-476b-9a1b-232198847fd7	1	Other	Other
+9f43e2fd-e89f-43cb-ac00-1f52f3cd1e76	1	\N	Other
+9f43e426-f90a-43db-a17d-88de60f781ff	1	Other	Other
+9f440f7b-1f26-403c-9231-1b0c5cdb56f7	1	Other	Other
+9f4419ae-bdad-4a5f-a5f8-e37d59e812ff	1	Other	Other
+9f442e59-dbc9-47c7-a49d-298f7caa36b4	1	Other	Other
+9f4462be-6f73-4a1f-b79e-5b46800e6cd4	1	Other	Other
+9f447b0c-fd54-42b9-b655-7029ad422ad0	1	Other	Other
+9f44916a-c797-4e42-bb9a-474dad79a547	1	Other	Other
+9f449d1b-fd3e-4c93-8e4b-30fa4dc26157	1	Other	Other
+9f44aec9-1a2a-4cdb-ba8e-83ba218b5c53	1	Other	Other
+9f44db60-d8ce-4f22-960e-e70bb15c5fd5	1	Other	Other
+9f450798-932c-4180-a28b-6fcd646a45f6	1	Other	Other
+9f45240b-79dd-4039-9419-6abff492eb01	1	Other	Other
+9f4554f6-ee54-46f6-9f30-c0dc9db6f9ea	1	Other	Other
+9f45961c-9a3b-4a3c-964e-f2bbe9823fe6	1	Other	Other
+9f459e56-59de-48e2-adf9-bcb131ddffc5	1	Other	Other
+9f45af38-f0e7-433c-bb21-ff8e8cc811c5	1	Other	Other
+9f45e0ab-3db7-4dd7-9b5d-f449fe5587a4	1	Other	Other
+9f45fa64-768e-4521-81bb-3075dfbaf055	1	Other	Other
+9f461583-0981-4f08-ba9c-dfee202ec048	1	Other	Other
+9f4628d7-4ff2-402e-adfd-35aae05d85a2	1	Other	Other
+9f465c45-d750-4ede-bdc6-33a5d1cc2b44	1	Other	Other
+9f46775a-4632-4510-8063-377b5a4293aa	1	Other	Other
+9f4684b3-40a0-4787-a9c0-a706a897d4b5	1	Other	Other
+9f47bbfc-6aef-4270-b7a0-3ca79bcf2173	1	Other	Other
+9f48389c-10c7-4782-a6a1-aeb0d6d48a91	1	Other	Other
+9f483a37-0798-4467-a3e7-213d05613ef7	1	\N	Other
+9f483d8e-80a9-40a8-94bb-71be806f453d	1	\N	Other
+9f48bb1b-0612-45a0-bb9f-504ca4e852fd	1	Other	Other
+9f48cbdc-d370-4f4b-906b-1d5cc760699c	1	Other	Other
+9f490bd3-fbae-4110-8794-eb8e86afa7eb	1	Other	Other
+9f492869-839a-4e3a-91b0-039a7afc62e0	1	Other	Other
+9f49520a-6074-43ab-8ad8-fa38c2422e58	1	Other	Other
+9f4953d8-cc98-47b8-8050-7daeafa6879e	1	Other	Other
+9f495c65-63f0-49d3-bd69-ed0a5dc4f916	1	Other	Other
+9f49b2de-bcba-4f2f-83d9-fc0192f600b6	1	Other	Other
+9f4a2217-10f9-4b32-850e-e662347c33d3	1	Other	Other
+9f4a2cf7-c267-4e08-972e-815e10f70936	1	Other	Other
+9f4a6b90-8c3d-47ef-8ff6-8ead43cefd2f	1	Other	Other
+9f4a9be5-9164-44bf-a93b-7de7c5006542	1	Other	Other
+9f4ab5d9-c71e-4be7-a66f-54f1f8fe6e82	1	Other	Other
+9f4b881f-5951-4d2c-9c9b-11ccceb59fcb	1	Other	Other
+9f4ba758-84b5-4944-936b-b3bae3bb90c6	1	Other	Other
+9f4ba9f0-75df-48a3-be89-be7bd5ef43a9	1	Other	Other
+9f4bd0c1-0de4-47d6-b81b-372e2dd4af29	1	Other	Other
+9f4c3e33-5655-452d-86df-5cbc1a6d2e48	1	Other	Other
+9f4c8439-3984-4321-a46f-35f57ca0772e	1	Other	Other
+9f4c9751-3f8d-4b1e-a7af-a9f73a128c2b	1	Other	Other
+9f4cb79a-ee32-4f77-8024-1326090a2877	1	Other	Other
+9f4ce099-c1c4-4bf8-913e-011641b45d7f	1	Other	Other
+9f4d5c28-339b-43f9-b6fb-fdec2c38cc6c	1	Other	Other
+9f4d606b-9a6b-415c-b1d7-46b503f248cd	1	\N	Other
+9f4d7af1-30f2-4b79-8f11-2b41662ba8d7	1	Other	Other
+9f4dc873-a59b-4bca-98eb-a781550778f8	1	Other	Other
+9f4eb085-ebfb-4a86-83af-7c99a6f062ad	1	James	Other
+9f4eb1a7-6355-43fb-818c-034f92a6591a	1	\N	Other
+9f4ec628-5375-43ad-8904-a7677ade0f80	1	Other	Other
+9f4ee5ab-1423-4ed2-995f-0e2a00088971	1	Other	Other
+9f4ee65d-c1e9-4be0-8291-19bd57d274c6	1	Other	Other
+9f4f06cf-b9bc-49d6-9e94-fdd09344dea1	1	Other	Other
+9f4f1e59-6837-45d9-ad70-4d27f69ec257	1	Other	Other
+9f4f3525-3c8e-4ee0-a8e6-439e5c9847cb	1	Other	Other
+9f4f6fee-2d64-4954-bd97-7532283b3357	1	Other	Other
+9f4fa5cd-dfed-4ab7-8c49-591f6b5994e1	1	James	Other
+9f501f5c-e720-4497-bdbb-f65c38228a40	1	Other	Other
+9f502800-d635-461d-b54a-a0d2dbba3ed2	1	Other	Other
+9f503479-a017-477d-9375-1b59635f358b	1	\N	Other
+9f508228-47c1-4713-8780-d171edbaa980	1	Other	Other
+9f5105d0-8be5-4cb8-a09d-7d6124af1e66	1	\N	Other
+9f5127be-1a31-4d26-a0f5-386c2d31d6c2	1	Other	Other
+9f516b56-5072-43c3-89ab-0e1e6df59b21	1	Other	Other
+9f519108-b3d4-4f0e-a733-73b6355ef020	1	Other	Other
+9f51d942-8dec-4fd3-a8d9-0fc3999e6a09	1	Other	Other
+9f52093b-52f6-4e04-a851-53362ead1ac6	1	Other	Other
+9f5243df-d34b-4ecc-8bc5-79ed9e415bd1	1	Other	Other
+9f5254e7-cd96-4512-ba6b-9ecb732e0091	1	Other	Other
+9f526ce5-fdba-4d75-a7fa-5a91290cda79	1	Other	Other
+9f526dc7-b3f0-4102-a921-a98e4678f4ca	1	Other	Other
+9f52cd9c-b664-46e5-a28e-0b7aa6a9c8ae	1	Other	Other
+9f536817-8a9d-4bbd-a41b-8c22fac4d958	1	Other	Other
+9f539876-f997-47a4-9546-fc718f6a6862	1	Other	Other
+9f53a167-5a29-4a74-b23b-8dc8e7a08efd	1	Other	Other
+9f53aaf9-e27f-4555-b6eb-f5d3a25e79d3	1	Other	Other
+9f53ad1d-c11b-461a-b247-2abf51ce754d	1	Other	Other
+9f53d7bb-a0ee-4faf-8b46-059fe9876496	1	Other	Other
+9f543b54-a891-4e8c-8c2e-0c9a49f8eb05	1	Other	Other
+9f5466bb-900c-4794-aaa3-ddafbf521a2c	1	Other	Other
+9f546f39-0d6f-48c7-8ef6-7509861f6aed	1	Other	Other
+9f54d2ed-522c-45ef-b7f8-4573722125fe	1	Other	Other
+9f54e1db-50e3-40eb-a988-b712a1688378	1	Other	Other
+9f55055e-9a9b-4680-b8d0-1690367f3589	1	Other	Other
+9f550d85-90b4-4791-9fde-9507082bf6d4	1	Other	Other
+9f552fe6-d252-447e-b705-d2575b273e40	1	Other	Other
+9f553e74-f99e-465a-bd94-499de6000396	1	Other	Other
+9f554e92-f3be-4f37-8568-1b2ee4ab81a4	1	Other	Other
+9f5550e0-66d9-43ae-ab36-f285c3eaf2fc	1	Other	Other
+9f5551cd-67de-4fd5-81e6-5d83fc4dec06	1	Other	Other
+9f556e8c-a5c1-4f51-9753-ff62b3204c3b	1	Other	Other
+9f557f4e-0633-4bd5-9311-d1ebc2ad7c33	1	Other	Other
+9f55b3ec-ca10-4d6f-9c59-e190cbd73fcd	1	Other	Other
+9f561349-ffd2-4063-895d-59767b1b001c	1	Other	Other
+9f5640e2-9e19-4b43-8674-d879c0b6baa4	1	Other	Other
+9f56583a-ffe2-4896-a325-1024d9fc5797	1	Other	Other
+9f5658dd-0f3a-421a-a3ae-9fffa5cb8ab3	1	Other	Other
+9f5691ed-b366-411d-9093-d154fe7bf33b	1	Other	Other
+9f569848-3c9f-4fd2-aa24-c46353ce1695	1	Other	Other
+9f56bd3b-ffb5-4eb7-becc-de3ddb869b45	1	Other	Other
+9f56e15d-49ed-4a7a-ad7f-1437f50ba9ca	1	Other	Other
+9f570e6f-c04a-4ccf-82ac-9aa1ad2cd987	1	Other	Other
+9f57137b-f30c-4849-92cf-077f5f56ce65	1	Other	Other
+9f572a61-98dd-4c7f-ae6e-3f036bc888e4	1	Other	Other
+9f576f49-04be-4f8a-a50f-a30bea13bf2a	1	Other	Other
+9f57b608-c118-4846-ab0c-9845f2a266be	1	Other	Other
+9f57c56d-34f7-4e54-91d1-d8779e7ceee5	1	Other	Other
+9f5885d2-dcae-4b2a-863b-b51efcacd2b4	1	\N	Other
+9f589ef4-851a-4d71-b3d7-8f20da24ccc1	1	Other	Other
+9f58b3ea-1370-4e1e-9631-7df6b68ecd20	1	Other	Other
+9f5953d8-776b-49d4-ae0d-477f98a06f2b	1	\N	Other
+9f597b7b-8a76-4216-9db7-acd4962d3a0e	1	Other	Other
+9f59dc3e-e0aa-4fe8-91a5-5b9ace3be9af	1	Other	Other
+9f5a441c-5dfd-4401-9de9-7c8cb67566cd	1	Other	Other
+9f5a5d13-6634-4250-9c62-5a830009dcf7	1	Other	Other
+9f5a6c60-4e40-4fc7-9c12-5daf996b4e5e	1	Other	Other
+9f5a7734-a58f-4704-8ec1-edc45f8fa1d9	1	Other	Other
+9f5aeac3-31c9-4cbf-b5e5-dde379ea26aa	1	Other	Other
+9f5b05ea-2421-402a-a458-9c24d122e88d	1	Other	Other
+9f5b0792-888c-493c-9860-6408e697e9e1	1	Other	Other
+9f5b16fa-18a7-43cb-be89-798d4f5af671	1	Other	Other
+9f5b1cb4-2a42-424c-83e7-ec6bca127961	1	Other	Other
+9f5b31f1-6d0d-42cf-8ab2-5ccff17eeb5e	1	Other	Other
+9f5b588b-fb4c-4f1e-bdeb-f22fae062bd5	1	Other	Other
+9f5be0cb-fc9f-40c4-8b18-ff95eecf3e12	1	Other	Other
+9f5bfa6b-75ca-42db-9037-121b381fc47e	1	Other	Other
+9f5c9b9b-221b-43c9-99ba-8a4103b40777	1	Other	Other
+9f5d31a0-436c-482e-add8-b7bc8fb0f01e	1	Other	Other
+9f5d3b30-9942-4be1-b685-5f35f354817e	1	Other	Other
+9f5d50b6-f79b-41fc-bd20-74d837ece7ea	1	Other	Other
+9f5d5c7c-4aff-41df-b22c-3e2f7f4fccd3	1	Other	Other
+9f5dbf4e-6cdf-47f8-aff8-c5f96e7e44db	1	Other	Other
+9f5dcdb3-5ea1-4966-96db-85d37ff325d6	1	Other	Other
+9f5dd6a8-5a62-4fae-af6b-b0709effef7f	1	Other	Other
+9f5de88a-4f71-409e-b1fa-af3c9920c442	1	Other	Other
+9f5e16fe-c5c0-4340-90ec-e74f3df3d6fc	1	\N	Other
+9f5e27b9-5be2-4595-9cf1-bbd2d0a092e3	1	Other	Other
+9f5ea7bf-9031-4b62-bb93-6539d23f364c	1	Other	Other
+9f5eb68b-3616-43a4-9e5a-d8daa7d7d768	1	Other	Other
+9f5ef641-e487-4479-95c6-0f18aceec8e3	1	Other	Other
+9f5f06f5-a2f7-4063-aa4c-235933dd6b26	1	Other	Other
+9f5f6b79-6a2c-44d8-92ad-7487c1e5d4c0	1	Other	Other
+9f5fab96-3d21-4a38-a832-b9b419a2d22b	1	Other	Other
+9f5fbb8a-61ba-4042-ba0d-9ac68d143c53	1	Other	Other
+9f5fbcd3-4773-4831-8195-8f02bb7c1860	1	Other	Other
+9f60d63b-ecc4-4c24-a07c-bf9be39d38a2	1	Other	Other
+9f60d791-3582-4f88-908d-bedb67d92329	1	Other	Other
+9f613ec9-74b7-46d1-8fa0-8f1548c1bd2f	1	Other	Other
+9f614047-ce9a-4082-aa20-ba5605910abd	1	Other	Other
+9f61c325-681c-4a54-84cc-104c59ff2ffe	1	Other	Other
+9f61fa2d-6f84-4cd9-a8d3-e5cb07d14b4e	1	Other	Other
+9f627e07-e8fd-4b0d-8fbf-a6fc801e3abe	1	Other	Other
+9f62949a-bda7-4d0c-abaf-8968090e197f	1	Other	Other
+9f62d372-c2a5-49dd-8fb5-58a1bde361bd	1	Other	Other
+9f62fa2d-3b78-47f5-b1d6-1eb9c8ddbd77	1	Other	Other
+9f631880-66ae-4af1-9ac9-14d72402c883	1	Other	Other
+9f6333dd-ffe4-4eff-b6cb-1a3ae7073574	1	Other	Other
+9f634ee1-d5af-4456-b8b1-5c3a91e1fa5c	1	Other	Other
+9f63941a-1625-484c-9729-137eef0532e4	1	Other	Other
+9f639847-b75c-4c3e-a81a-25e1d436353d	1	Other	Other
+9f63af0e-d522-4a22-be43-47b34555865b	1	\N	Other
+9f63bcc4-0c7e-486c-af0f-64337b221c1c	1	Other	Other
+9f63eef7-d563-49ba-b196-03828fd495bc	1	Other	Other
+9f640ac0-c958-48ac-8b29-05d9b90f37b8	1	Other	Other
+9f6414ba-cf29-468e-8efd-ec5ef0c25222	1	Other	Other
+9f644010-bb57-49d7-86e6-b548b2c6d3d1	1	Other	Other
+9f64bed6-fc52-40a6-8c44-22f2a20b155b	1	Other	Other
+9f64ef3b-d0cd-469c-a508-c9c6a56f23c2	1	Other	Other
+9f6511a3-b0c4-4d7c-8904-167f8ebc98e6	1	Other	Other
+9f6518c4-29aa-44dd-9903-c9300b6f52f5	1	Other	Other
+9f653361-2c91-4445-8a11-6601d79b7864	1	Other	Other
+9f653ef9-e80b-4f0f-8706-69037fc2c613	1	Other	Other
+9f655bde-ded0-4c1d-94b2-d291f45e7138	1	Other	Other
+9f65ae12-1f70-4989-af15-576898d4c9a9	1	Other	Other
+9f65b44c-7300-4d32-b1ee-f37d56c26164	1	Other	Other
+9f65db81-a12f-4524-b388-d9527641f845	1	Other	Other
+9f661f23-777d-45fb-8ccc-f8c93a634861	1	Other	Other
+9f663260-f6b5-4423-9332-90ebae60914b	1	Other	Other
+9f6657d6-e58a-4029-9453-1733ed6690a1	1	Other	Other
+9f66661c-bf4f-4828-84ec-7f428bd18fa3	1	Other	Other
+9f668d1d-9ed6-45b3-bbb1-403cb15c3e39	1	Other	Other
+9f66c66e-be37-4d49-b345-10f8440b236f	1	Other	Other
+9f66d164-6f23-4d8b-b4d7-853e34ff476b	1	Other	Other
+9f66dc76-42fe-45da-a5f6-28e19ef31a13	1	Other	Other
+9f66fea2-90c3-4f51-b3f4-66791ae0fe4f	1	Other	Other
+9f673aec-daa5-43bb-b529-95e732b32ccc	1	Other	Other
+9f673b92-1e22-447a-8b27-42ac25b53821	1	Other	Other
+9f67cd0b-dd0a-465e-97c9-0ec947cae2db	1	Other	Other
+9f67ce2e-c07b-46b6-bf58-f2e006e2bb26	1	Other	Other
+9f6853d2-595c-4778-90c2-31e9cfe2ac45	1	Other	Other
+9f68b769-ff53-444e-86e4-a96c542e8a2e	1	Other	Other
+9f695bec-be6f-4606-9343-8f73591d3d1b	1	James	Other
+9f69cefc-835c-4590-a899-d58203f410fb	1	Other	Other
+9f69e0aa-93ba-4cb0-8905-c2e427ecf963	1	\N	Other
+9f69fe40-3077-46f3-b004-ce1027a62f27	1	Other	Other
+9f6a09a0-8bfc-43e9-bdc1-6bca169c890f	1	Other	Other
+9f6a3a8c-da02-47e5-a647-06fd29d9ce43	1	Other	Other
+9f6a678f-460e-4a9e-9bf7-ca7277d2c102	1	Other	Other
+9f6aa48a-9d21-4daa-8549-d4d72f3d802a	1	Other	Other
+9f6ae0c8-5ae7-4ae8-ad00-ee8876e7068f	1	\N	Other
+9f6af6ce-fe5d-4583-8ff8-9192de6b5fb9	1	Other	Other
+9f6b184b-48fa-4a6e-89d7-7d9c993dc9a4	1	Other	Other
+9f6b2c24-99af-4b87-9fce-d9d4f07984e0	1	Other	Other
+9f6b595b-ac93-4ae8-9ffb-aebc4576981f	1	Other	Other
+9f6c5149-8a54-4342-8359-981ee790a424	1	Other	Other
+9f6c84e2-311b-485f-a9af-f7e55f62d180	1	Other	Other
+9f6c98b0-5e5a-4925-9c04-3fdeb61671a5	1	Other	Other
+9f6ccd7d-b37d-450e-b0b1-7d7570455a28	1	Other	Other
+9f6d452a-111f-11e8-9ee1-fa163e8624cc	1	\N	Other
+9f6d696f-00c1-4f74-9cc4-04ca36fa6a25	1	Other	Other
+9f6dc771-e154-4f40-b271-05b3ebbf96c4	1	Other	Other
+9f6df619-daf7-4753-be63-c49c6101f8f7	1	Other	Other
+9f6e30e4-a0f8-4c73-85a9-87dc21d9bcbc	1	Other	Other
+9f6e88cc-38b1-438b-88ac-1b518d24450b	1	Other	Other
+9f6eac40-5223-4c39-b214-0499d408e8d4	1	Other	Other
+9f6f683a-a44b-4d9c-a983-130c5dd8eac5	1	Other	Other
+9f6f7f31-7b24-415a-9afb-56c540cf1ce2	1	Other	Other
+9f6f9d5d-b87a-41be-9256-0db2d1c7d1f6	1	Other	Other
+9f6fb08b-2ec0-4389-898e-b8638ce1942b	1	Other	Other
+9f6fb91d-5f0b-47a8-bdc5-df187517bc04	1	Other	Other
+9f6fde88-0b61-454d-b649-579ab9a9cbd9	1	Other	Other
+9f6ff547-d77f-4000-92cf-542faf355843	1	Other	Other
+9f6ff5d6-a033-4380-a1ed-b39a20c37d5f	1	Other	Other
+9f6ffc1f-3c8c-492c-be4c-2bb346af6a19	1	Other	Other
+9f70c8db-51b8-461f-80e9-ada0bd72624a	1	Other	Other
+9f71020a-cccb-4459-86b5-a5b114cffabc	1	Other	Other
+9f715f9c-e6e4-46b0-a196-2f2d3be09cc2	1	Other	Other
+9f717d35-e64e-4b60-9ae0-66076901886d	1	Other	Other
+9f719c4e-17d2-4b8a-97e2-2d6ac13a7086	1	Other	Other
+9f71c426-8f35-448b-9ba4-ffe875a60cf1	1	Other	Other
+9f71e6dc-0abc-4ba7-9886-a5e5edbd150a	1	Other	Other
+9f72015d-d673-409c-b260-ad70557f1671	1	Other	Other
+9f724efc-ba51-43bf-a474-80cbaf28860f	1	Other	Other
+9f727d1b-e4c6-4298-9ef2-fd144c3b4a6d	1	Other	Other
+9f72ba9b-37e3-4760-9e4a-e53380f9ee24	1	Other	Other
+9f72bb74-02f5-4438-9739-8eb31ff4947c	1	Other	Other
+9f7354ee-b90c-481c-8f64-2fdd04170079	1	Other	Other
+9f7381cd-1410-4160-8f20-4686875a001a	1	Other	Other
+9f73e6ed-1996-44ed-86db-fa6d239420eb	1	Other	Other
+9f741fd1-6004-4652-94d9-c5b242e7dd1e	1	Other	Other
+9f743a4c-da37-42e0-8f5f-1ee949c112ee	1	Other	Other
+9f7453a5-b074-40d9-a9e7-6de7f078e733	1	Other	Other
+9f7461a4-e4e1-45dc-89f2-d0b0c8d68989	1	Other	Other
+9f747c6a-77de-46cd-afb2-d402159bdfdb	1	Other	Other
+9f74a5a9-c71d-452b-9044-f68fe5c9de89	1	Other	Other
+9f74a65c-1438-45db-b515-81d2686167dc	1	Other	Other
+9f74a83b-7087-4d9b-8a50-bc04f679face	1	Other	Other
+9f74d066-dfc1-45a1-97a0-97e1b7bc4ea2	1	Other	Other
+9f74d297-8a92-4f7a-8325-156149f2e9a4	1	Other	Other
+9f74fee0-0079-4043-9ab4-937570ff3a5f	1	Other	Other
+9f75b745-5b7e-48ee-88b7-12cd206409bf	1	Other	Other
+9f75bf44-aea6-4daf-8329-4a1cccc5b0a7	1	Other	Other
+9f75e847-ef55-49be-87fa-3d6934ac7874	1	Other	Other
+9f766256-0d79-4ec8-b59d-3ab479dc2353	1	Other	Other
+9f769ec2-34e1-4059-8eac-f25271d62474	1	Other	Other
+9f77b7c4-2cfe-434f-87c0-c3fe27ea502b	1	Other	Other
+9f783760-e98f-4894-8c5a-152020aaf5d2	1	Other	Other
+9f786578-c2ef-41a5-b678-edd3ce6cc7ac	1	Other	Other
+9f79010b-a3f1-42dd-8bbe-385568229f61	1	\N	Other
+9f790737-ef9e-43ce-9b1c-4c77fa268d8f	1	Other	Other
+9f792b43-d7c3-4127-88af-003b5f217fa6	1	Other	Other
+9f797171-0ea5-4950-9bb4-35daa8943670	1	Other	Other
+9f798f10-f8d9-4fca-affe-44aeb5e919a2	1	Other	Other
+9f799476-93a5-42c2-b2cd-bf95375e52d9	1	Other	Other
+9f79bfbc-d040-49a0-853b-2fdae314dcf5	1	Other	Other
+9f7a2bcd-21a5-4d9b-b506-87d151326600	1	Other	Other
+9f7a31b1-e412-4e52-9272-dacf2c4ccf9f	1	Other	Other
+9f7a42b6-9029-46d2-b167-fc0edc991654	1	Other	Other
+9f7a53f8-d18d-4429-8400-823a48251cb6	1	Other	Other
+9f7a60d4-56e8-4489-9ea4-78bffe9522d1	1	Other	Other
+9f7ab682-2cc8-4b00-ab5e-6a4400c8a35c	1	Other	Other
+9f7b23db-d73e-4e98-8942-c9e0ec3029eb	1	Other	Other
+9f7c3405-bb12-4963-b325-c240793e7cf3	1	Other	Other
+9f7c4cab-7516-49e0-ad34-ab62e43d9777	1	Other	Other
+9f7c5ad3-706a-44bf-9fe9-b56a90ae4f0f	1	Other	Other
+9f7d055a-f34a-4142-9104-dd2a2adab2da	1	Other	Other
+9f7d370e-69d4-47a3-9060-3356964dcf64	1	Other	Other
+9f7d5598-7b55-449e-8840-96d86721607a	1	Other	Other
+9f7ec6a1-f7a0-4155-ab44-67af9f08bd5e	1	Other	Other
+9f7eff85-4a8d-408e-a05b-d50e3be64470	1	Other	Other
+9f7f0388-3f5b-42b1-a892-bf7ff086f53a	1	Other	Other
+9f7f1011-f4d9-4876-89d7-7d4ff0d50966	1	Other	Other
+9f7f2a38-9427-478e-b7da-ce00615e5364	1	Other	Other
+9f7f39e3-3183-4fee-b78d-e15a60175903	1	Other	Other
+9f7f9309-19f3-4f03-82c6-cabc7b757b4e	1	Other	Other
+9f802741-4691-4ddd-b61c-d899c39443c6	1	Other	Other
+9f80300c-b706-4469-851c-b02ddcba6ee9	1	Other	Other
+9f80371c-1c19-402e-a042-477a8f97c833	1	Other	Other
+9f80432c-bd77-40cd-9f0f-b84898404819	1	Other	Other
+9f808453-bf83-4a63-b487-303091fca513	1	Other	Other
+9f80956b-46a3-4599-b109-a5909a58aab8	1	Other	Other
+9f80b3b2-b2a2-4e4c-9fb3-f180e91dbaad	1	Other	Other
+9f80cfdc-7e23-456e-818a-8191264e4340	1	Other	Other
+9f8159a7-7a3e-49f4-9d1c-7fb66c4e911a	1	Other	Other
+9f818de1-df92-471b-93d8-e22134ebda5d	1	Other	Other
+9f81e79b-58d2-49d8-8afe-f74587125153	1	Other	Other
+9f821caa-daf8-4b34-9823-7e00e52e044d	1	Other	Other
+9f825785-1589-4c6e-b5e7-9d0ff7d98724	1	\N	Other
+9f8258df-4524-45a3-b93d-495c0582aa72	1	Other	Other
+9f826889-7228-459e-a001-d968b8fe9a57	1	Other	Other
+9f839ac3-e9be-4991-9b0e-3b0c7d341b8c	1	Other	Other
+9f83b688-2d69-4ab2-a011-4bd4fcc89c20	1	Other	Other
+9f83dcc6-1b97-4504-b0bf-0184adc4088e	1	Other	Other
+9f83fad2-29cd-4886-af2e-8deea3d924dd	1	Other	Other
+9f842164-eb1c-4c51-bfe8-34783170f354	1	Other	Other
+9f845dd3-6bc6-4eae-81a8-fdde82902fcb	1	Other	Other
+9f847837-e3c3-4906-a069-8f71fdb49475	1	Other	Other
+9f84ca33-0455-4c30-8579-97f809fa70c9	1	Other	Other
+9f84fb96-000d-4134-bf74-8cbb1e92a32f	1	Other	Other
+9f8504ef-8dd6-4728-b60f-860299a0610d	1	Other	Other
+9f850521-233a-4d4b-91d8-7858781af9f2	1	Other	Other
+9f851112-9be0-4e54-9271-fb03db10d9b3	1	Other	Other
+9f856d3f-c0c3-44b9-849f-851a15a2ea61	1	Other	Other
+9f8589c1-1e45-44b4-944a-5647e8a6fded	1	Other	Other
+9f859e1a-1376-4bb7-afed-e70a8701720f	1	Other	Other
+9f85f855-81b6-4a57-a7bc-734c214edd71	1	Other	Other
+9f85ff01-4d2a-4068-bb62-007eb01dc130	1	Other	Other
+9f8623a7-e5f1-4032-8ffc-af9f665685a6	1	Other	Other
+9f86638c-15a9-443e-b402-ee8691e3d77a	1	Other	Other
+9f86663f-be29-42ec-99ea-59ec98d714fa	1	Other	Other
+9f86923e-499b-438a-82dc-f6a4d56dacf6	1	Other	Other
+9f86cfdb-5f0b-40ba-a597-dad33408af4a	1	Other	Other
+9f86fd65-92eb-4d8c-aa54-7e0b94333832	1	Other	Other
+9f87250d-5bde-4f25-9512-b23513bd6d15	1	Other	Other
+9f874c7c-b450-44b1-9a66-5c2ccd2695c6	1	Other	Other
+9f87ae77-de69-4e86-a08c-48d0abaae2c1	1	Other	Other
+9f8808e7-6293-4f52-933d-0429b00987fa	1	Other	Other
+9f8810e9-8561-4f2c-b222-c5b8bbab7ece	1	Other	Other
+9f88bdca-c052-4027-88eb-dc04e2d969f3	1	Other	Other
+9f88c99b-b5b7-4fdf-895b-f93aa46f3fb5	1	Other	Other
+9f89045c-204f-406c-be97-b753d893cd7c	1	Other	Other
+9f892238-1d81-4636-abf3-7a9e8ab44a8c	1	Other	Other
+9f8944d6-1dc1-4a89-9d60-e3768823e47c	1	Other	Other
+9f894706-d0d8-44ec-be5b-5e0ad49dc361	1	Other	Other
+9f897857-5085-4aed-9584-5297f15bf2fa	1	Other	Other
+9f89b8b9-38d7-42cd-ae6a-9face44b4aaf	1	Other	Other
+9f89c05c-6577-4235-88b4-725374561de7	1	Other	Other
+9f89ce2f-1dd5-4d1c-82cf-4b63d814aee3	1	Other	Other
+9f8a12b0-8090-443c-876b-3c6a0dd237b5	1	Other	Other
+9f8a139f-a3cd-4a05-b853-733d5167ff14	1	Other	Other
+9f8a1fbb-cd21-41dc-93d5-3817c6db457c	1	Other	Other
+9f8a2045-96fc-4c1b-98d7-efabf87722ae	1	Other	Other
+9f8a2d01-eb58-4619-b8c4-5d161a3fc8c7	1	Other	Other
+9f8a3f3b-7e9b-47f3-bf11-5b173aa3145f	1	Other	Other
+9f8a44dc-d306-4af6-882c-16c251cf78fb	1	Other	Other
+9f8a4691-8589-4129-9761-787313c25c8b	1	Other	Other
+9f8b17d5-c827-41e0-bb14-2c4c25de32ec	1	Other	Other
+9f8b3267-ff95-49b9-839e-84f3a614929c	1	Other	Other
+9f8b6551-470b-49df-b92e-835fb34b3a75	1	Other	Other
+9f8b693b-4ccc-4484-af5b-d5d76f051538	1	Other	Other
+9f8b843f-33c7-46b8-97c3-6f03265554fe	1	Other	Other
+9f8bbd24-fd75-4ba6-a898-709e88d0b392	1	Other	Other
+9f8bd7c0-b287-11e7-bf14-fa163e8624cc	1	Other	Other
+9f8befcf-9c68-4e62-ad27-2022bbd7a4de	1	Other	Other
+9f8bf3db-272e-4699-abf2-d90a32c4b234	1	Other	Other
+9f8c3057-07de-4479-b908-3adf0fc88347	1	Other	Other
+9f8c498d-f842-47c2-9c4c-2da20d652879	1	Other	Other
+9f8c68db-027b-42fa-a0e7-b4a29c1e90fb	1	Other	Other
+9f8c6a3a-a854-4f8c-8363-b267e3ae3226	1	Other	Other
+9f8d452f-1c0d-45b1-97ec-9e3e65f686e1	1	Other	Other
+9f8d51d5-3a3a-4087-b86b-da91f5e3451e	1	Other	Other
+9f8d74a5-b596-4263-ba10-4d5f72caf657	1	Other	Other
+9f8d904d-fe34-4f98-9e0e-9db57cdd08b4	1	Other	Other
+9f8de282-c486-4c47-a3b6-d39d63936c2f	1	Other	Other
+9f8df031-8337-4558-b63a-afb4e5b28e1b	1	Other	Other
+9f8e99b3-b956-424e-bf4b-cd03892f153d	1	Other	Other
+9f8ec34a-0d95-11e8-83b2-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9f8f11f6-ee50-4339-8daa-ea076a4d931d	1	Other	Other
+9f8f6c2f-67c8-4055-8e1c-db7163943650	1	Other	Other
+9f8f8559-ad83-434f-a445-733a61f42a25	1	Other	Other
+9f8f8c4d-e1ad-4aa9-b22e-7aeb61eea075	1	Other	Other
+9f8f9320-c87b-4e29-959f-60eb36f339fc	1	Other	Other
+9f8fe2c8-f954-494c-9f21-f10bfd2b85a5	1	\N	Other
+9f902bd7-2926-4c14-bfc7-452e9d884f39	1	Other	Other
+9f904a0f-e585-4707-8f09-acbcb0e0b754	1	Other	Other
+9f90a799-2a0c-4ae5-9e01-50431898e37c	1	Other	Other
+9f90a812-149a-4b49-a618-5c872f059ac6	1	Other	Other
+9f910276-23eb-42b4-99fb-f6ac9a4bc96c	1	\N	Other
+9f914216-9cc0-4077-9ae6-2088f17516a9	1	Other	Other
+9f9168cd-bfce-4d3e-97c4-95ba6c20e079	1	Other	Other
+9f91925b-cf88-467a-ac6d-5ff56f10cea5	1	Other	Other
+9f91d238-5dd4-4461-8837-0773348bcdb4	1	Other	Other
+9f91ef52-5fc3-4364-a359-cd9650f24a76	1	Other	Other
+9f9203f6-ddc2-442e-bfc8-472e4d2e21d1	1	Other	Other
+9f9221aa-fbca-43de-b3fd-e77ddfba96f4	1	Other	Other
+9f924a7b-31e2-4848-b0b4-79d8a3cee887	1	Other	Other
+9f925e55-0796-44f6-8d6d-ea0d0744c1ae	1	Other	Other
+9f927928-599c-4fb7-8fba-47a02419dcdf	1	Other	Other
+9f92f97a-871a-4ef0-b400-efd5d27a07fb	1	Other	Other
+9f931252-9090-449d-8a7a-4cbd809cd7d3	1	Other	Other
+9f93224a-f996-401e-9799-86ea4a15a0ec	1	Other	Other
+9f9322ea-2ef2-41ab-a427-bd408011dbe1	1	Other	Other
+9f93b91d-9c28-4453-9c1d-5a379be1802f	1	Other	Other
+9f93c9d2-e294-44ee-8398-24e49294da59	1	Other	Other
+9f93cc9d-dc4d-4035-af7d-ae0211574a51	1	Other	Other
+9f9434a2-f5f2-4f35-8e2c-9765c1215c58	1	Other	Other
+9f943774-3595-43d7-be4c-5ee8a235fa8b	1	Other	Other
+9f94cacc-692a-4e52-8ac4-d6ab34f00f50	1	Other	Other
+9f950ab1-3302-4409-ab07-d0488dddc7bd	1	Other	Other
+9f951ca2-56e3-40a9-9dcd-8d9ade536ef2	1	Other	Other
+9f9526e1-8dda-4619-a3be-5ed9f3f25c79	1	Other	Other
+9f9540bc-0995-4894-92b9-de6cc5a25b99	1	Other	Other
+9f957d76-aaeb-4c83-b037-c3e650fa4a51	1	Other	Other
+9f95ca9e-d82b-4fa9-b16a-31f035d7f2f6	1	Other	Other
+9f9652a6-75e4-4568-867a-ca2a04ce16ff	1	Other	Other
+9f96c27b-45fe-432d-96b4-48365aa3066d	1	Other	Other
+9f96d3b0-f2d6-4653-a069-d0d1550c0fd2	1	Other	Other
+9f970350-3f7b-4333-bd5f-3075f37b54cd	1	Other	Other
+9f976710-5991-4804-b0a4-5d8c3cae8797	1	Other	Other
+9f977840-9509-4df7-96bf-cb2070e55202	1	Other	Other
+9f97d641-f73a-4a27-91bb-30c6349329eb	1	Other	Other
+9f97d92f-4aeb-48fe-9368-b6d2b902f5f7	1	Other	Other
+9f97f8ba-910d-4dcf-bf5e-2a368253e683	1	Other	Other
+9f981e16-d2b7-4b74-8d3b-fab0af8fd55e	1	Other	Other
+9f9822d7-9069-4b3c-886e-e329ace30471	1	Other	Other
+9f985806-be6e-4c05-9a76-989d7947acc0	1	Other	Other
+9f98ff2e-290f-4e7e-85fe-f706c714d7fd	1	Other	Other
+9f99293e-ac93-42fc-83b0-d88e667f07c7	1	Other	Other
+9f992d05-d912-483c-86ce-e7b11f320ef5	1	Other	Other
+9f9938aa-d84b-419d-a2b0-32d0f7d7a601	1	Other	Other
+9f993c16-164f-4bb2-aefe-7d67bfb90d96	1	Other	Other
+9f995585-9a2f-41b0-8f44-8938fe28a813	1	Other	Other
+9f997fcc-6456-4195-8be2-0796e510edef	1	Other	Other
+9f9989c0-52f3-4d57-8dec-568e5f6d42c5	1	\N	Other
+9f999a77-df84-4f39-9636-2e8f2962ea09	1	Other	Other
+9f99d3f1-7105-4f81-86c0-c590e83b6954	1	Other	Other
+9f99ffc2-9c06-4568-a810-5754767bbef5	1	Other	Other
+9f9a2236-5473-4c82-80eb-69e3402d7099	1	Other	Other
+9f9a6bec-fb55-4db1-b521-78fffe35bf50	1	Other	Other
+9f9afae4-fcbe-4338-9fe4-784e2975f1b6	1	Other	Other
+9f9b1bd3-2f80-4b64-804a-0f4f594f5f54	1	Other	Other
+9f9b3303-7a87-4f7e-9a93-ae718a37e6cf	1	Other	Other
+9f9b4b6a-7e36-470f-8309-d511e06d8390	1	Other	Other
+9f9b66a9-581a-409b-9d9a-63182e3372e2	1	Other	Other
+9f9ba23b-48cb-4609-97f4-540da2e30f0f	1	Other	Other
+9f9bcc3f-332f-468f-a96f-fb1dc16ee95f	1	Other	Other
+9f9bd1f5-58a8-4d4e-976a-199e7689f621	1	Other	Other
+9f9bd2ee-82ee-42b0-b203-fea4b8799577	1	Other	Other
+9f9c1254-486c-4359-802e-8bdcdcbb3c4c	1	Other	Other
+9f9c1300-6fb8-410f-bfd6-4135ba44ef78	1	Other	Other
+9f9c78df-7955-4a23-b264-eb6fe1fcfc75	1	Other	Other
+9f9cbe0e-3c8a-46a0-9443-332d347a8e76	1	Other	Other
+9f9d08b1-855f-40f0-a2c6-b065c219140f	1	Other	Other
+9f9d5513-5aac-406b-8bed-7aa7748f70f0	1	Other	Other
+9f9d9f59-5e9a-4cb4-810d-d65ed52ed5f5	1	Other	Other
+9f9da89e-2834-46d2-a72d-c07e56f43c00	1	Other	Other
+9f9dd187-614d-433f-a3ee-958d17ad68cc	1	Other	Other
+9f9e0c39-0b1a-49f1-90ff-0a7debaa41f4	1	Other	Other
+9f9e1c7f-31a5-4125-9cbd-91199299fe7b	1	Other	Other
+9f9e2da0-cc03-4791-a2ee-32e416293c7f	1	Other	Other
+9f9e33d3-63cb-4993-9858-4aa7d07e2456	1	Other	Other
+9f9e6366-2f48-4658-ae83-306b7a90d93e	1	Other	Other
+9f9e66c1-6692-4bb5-ac70-88459a51f493	1	Other	Other
+9f9e6811-f5cb-4431-a03d-0a9db23df342	1	Other	Other
+9f9ea64d-4488-4a39-8b2c-818dc265fc2a	1	Other	Other
+9f9ef193-1adb-4dc6-8d91-349ff6bad7d1	1	Other	Other
+9f9f019a-b3e8-4780-86e0-b8b5fececf1b	1	Other	Other
+9f9f02f5-d8f0-4af8-84f3-510fccec2ff2	1	Other	Other
+9f9f042e-b0ae-4d0b-b6ee-609b6d1af6a1	1	Other	Other
+9f9f7e97-2692-4e03-a245-2d0690113660	1	Other	Other
+9f9f90c8-f8cc-46ed-9560-f7387019896f	1	Other	Other
+9f9f9f8a-e000-400c-957c-7d8528de542d	1	Other	Other
+9f9fa144-d110-45d1-bd95-b36ff87e4ad3	1	Other	Other
+9f9fa5a6-e146-42a3-858b-c5a3121d0301	1	Other	Other
+9f9fbd77-b6e0-436e-ad04-098ae8e994a9	1	Other	Other
+9f9fc518-3b55-496a-89b1-c80fa14a4cbb	1	\N	Other
+9f9fe342-65ae-4f20-a1d9-4c5393fb5426	1	Other	Other
+9f9feded-9b14-4cab-984e-4b5baf8b2920	1	Other	Other
+9fa02ec7-11c2-42d8-a7a5-691898e03346	1	Other	Other
+9fa03240-2649-4d31-9c0f-228e9613f19b	1	Other	Other
+9fa068aa-eccd-4813-a65d-38914160fbdd	1	Other	Other
+9fa07ae6-ade5-4675-b9f6-4ea57e80da9c	1	Other	Other
+9fa08e47-aa53-43f9-a294-c4166921771b	1	Other	Other
+9fa09a4c-1de2-4f0e-8627-814603af70b5	1	Other	Other
+9fa0b714-8f7d-4a05-83fc-a3afde97623b	1	Other	Other
+9fa0d980-3d1f-4048-9888-66269de93401	1	Other	Other
+9fa0fede-3b20-4114-b36e-54b1297fa121	1	Other	Other
+9fa102e4-41ed-416a-9f2b-f4354d145e30	1	Other	Other
+9fa18564-955e-4ea4-81a5-25e923c4fb1d	1	Other	Other
+9fa1d351-7867-40b6-824b-cb1de948e704	1	Other	Other
+9fa1d6df-b346-4d41-a443-8eb347c1ac82	1	Other	Other
+9fa21f0b-2c12-458b-ab07-3114dd4329db	1	\N	Other
+9fa237f7-412b-4fe7-b573-216f53454ad1	1	Other	Other
+9fa25ef1-dcac-471b-96d5-fdc23248fb5f	1	Other	Other
+9fa2c1ed-441a-4a07-980a-1c009b05ac10	1	Other	Other
+9fa2de2e-ee07-467b-8a60-e861cf75b249	1	Other	Other
+9fa30007-dab8-4eb5-ad27-fec11799574f	1	Other	Other
+9fa31605-a942-4a86-9d3f-38892178a0c0	1	Other	Other
+9fa3491b-05f9-489d-8691-7abfcef82c0f	1	Other	Other
+9fa349f8-2c96-402b-a2f4-0c1c1c413810	1	Other	Other
+9fa389ca-414d-46c1-8ad3-31a42532bd0e	1	Other	Other
+9fa3a42f-685c-4bd1-a9fc-7cade5519870	1	Other	Other
+9fa3fbdc-c9ea-46fe-a227-a0d92b814b3c	1	Other	Other
+9fa40eda-d44b-4bbb-a4ea-80f0fcfeda42	1	\N	Other
+9fa54b7c-5d18-4594-a850-2cd9c32a3c63	1	Other	Other
+9fa56885-cf74-436f-b6c6-88455cf84dc9	1	Other	Other
+9fa5962d-1c35-4b98-b0d6-1be4f016db2e	1	Other	Other
+9fa5f1dc-29e6-44f2-a829-729feb02f38a	1	Other	Other
+9fa608a5-d583-4c09-ac0b-db7e54a16297	1	Other	Other
+9fa61683-992a-4452-9f08-8237f6632789	1	Other	Other
+9fa6438e-6783-485c-b124-abbf6aeb968a	1	Other	Other
+9fa64ff7-24de-440e-96a4-ea47afa769ff	1	Other	Other
+9fa6613e-11bf-4b80-a5df-a0e7ce0ce037	1	Other	Other
+9fa6635e-8683-425d-ad5a-444601fae9da	1	Other	Other
+9fa6e49a-8a72-4ec8-b764-cc9d0a050c98	1	Other	Other
+9fa71317-c28c-462a-9629-7f8138615a89	1	Other	Other
+9fa72980-838a-4271-886d-feb77ca5ea2b	1	Other	Other
+9fa76817-8fb9-47f9-a8f9-0833e72b9a44	1	Other	Other
+9fa78e9f-145c-4bf0-aead-e468e13e17e8	1	Other	Other
+9fa7909c-eb52-4c19-b499-4d1b75d1deb8	1	Other	Other
+9fa794e3-211f-47e5-841d-c3a7229b3d97	1	Other	Other
+9fa7a398-79aa-4a56-977d-1d6694049a86	1	Other	Other
+9fa7afc6-0d96-11e8-96e3-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+9fa7fede-db82-4dfa-9e9f-0008b9cbfaff	1	Other	Other
+9fa8658a-8d25-4b09-aa99-1b6c62f75d3f	1	Other	Other
+9fa8ae07-70d8-44eb-a1df-c310196a5bc6	1	\N	Other
+9fa8e1f0-5c86-4d82-ab47-37d3c9174614	1	Other	Other
+9fa90a90-87de-427b-80e7-c3a482279ad7	1	Other	Other
+9fa939e4-4c9a-47c4-9199-be41fd95fd42	1	Other	Other
+9fa98395-dd2b-4d8b-b500-5a67d825236c	1	Other	Other
+9faa0f04-4d1e-41e9-ac01-85224d82286a	1	Other	Other
+9faa328c-4f0a-496b-ac78-ae85bc22a389	1	Other	Other
+9faa3b7f-a008-404e-b5e4-4d4f8147d498	1	Other	Other
+9faaacff-794d-4412-9b62-da213aeb6d2b	1	Other	Other
+9faaacff-ba3a-446a-8a2e-8707cf3fa7dc	1	Other	Other
+9fab0cfb-ff2f-4ddf-afa0-3c7aae31e286	1	Other	Other
+9fab1cf2-5ad6-433b-bb7b-0d1dd7003f1b	1	Other	Other
+9fab1ff8-db96-44d5-95cf-b2a80bdaa6a3	1	Other	Other
+9fab29d4-3f24-4ba3-b203-76fb7b069845	1	Other	Other
+9fab54cb-a07e-4dae-a84f-a6c4bb3ea545	1	Other	Other
+9fab8625-a9c2-4f37-8812-43068c5654b8	1	Other	Other
+9fabbccb-3a7a-4911-834a-20d404827875	1	Other	Other
+9fabe09d-d366-4ae1-8327-af177e00c86f	1	Other	Other
+9fabfb90-3ec4-4de3-9a52-2f0392fc0406	1	Other	Other
+9fac243b-5ff7-431a-8314-3913720cfbd0	1	Other	Other
+9fac49a3-bfd5-4116-ae04-f4921e672600	1	Other	Other
+9facf0ba-4454-4382-b784-49a88397b5f7	1	Other	Other
+9fad1b87-9f66-4a66-b64c-b18f96be2f62	1	Other	Other
+9fad4961-a904-4ca9-83e4-e023c06ef117	1	Other	Other
+9fad61b5-a385-4fb5-9402-4ede4797ef6e	1	Other	Other
+9fad94de-d5bb-4d96-bbdd-75a39091078a	1	Other	Other
+9fadacfb-78bd-4cee-8e73-dd1d5220e2f6	1	Other	Other
+9fade197-c2bb-4788-9677-35c81940368b	1	Other	Other
+9fae1391-17c4-4e63-9d5a-c5f7b4eeaedd	1	Other	Other
+9fae4a18-33bb-4fcb-82f5-1294c0957520	1	James	Other
+9fae9fd8-52b9-4c5f-b877-2310959e808e	1	Other	Other
+9faed731-b8b2-4e66-80fc-666cd3ada240	1	Other	Other
+9faef90b-2db1-479b-a79d-3717b8cd8924	1	Other	Other
+9faf21ba-1439-4943-bffd-f3422c40396c	1	Other	Other
+9faf2808-8205-45fe-95d3-98bcf36ead7f	1	Other	Other
+9faf5bfc-4fff-4253-ba8a-77291717fb02	1	Other	Other
+9fafff0f-a46e-462f-82f5-bf098a0ea0aa	1	Other	Other
+9fb03519-e99a-4026-acf2-96ea281cf348	1	Other	Other
+9fb062f9-671e-49ee-9c3d-5fbfc96d830b	1	James	Other
+9fb078eb-274f-4403-9885-5a4bf0337938	1	Other	Other
+9fb080cc-c544-4ebc-a827-5db4d93cd788	1	Other	Other
+9fb0862a-f551-49bd-9d2e-b75213a6f0bb	1	Other	Other
+9fb094a3-b762-44df-9a85-2fe83f255aa2	1	Other	Other
+9fb0ae22-c492-45e6-a299-c26d0ea368fc	1	Other	Other
+9fb0bd3a-1dcf-49a2-a8c4-072e29d2db9f	1	Other	Other
+9fb0cc82-0b9f-4201-8dcb-0fc994b359be	1	Other	Other
+9fb131fe-ad0e-4ed5-a643-ac631bb77096	1	Other	Other
+9fb13a2c-117a-4f53-ade2-57ec1f09e851	1	Other	Other
+9fb141ae-c5a0-411a-8d21-c33f8ca462c9	1	Other	Other
+9fb19201-29e5-49ca-8f2d-4e6ef9599269	1	Other	Other
+9fb1bfa6-cb0f-42b6-b1ec-4d810ed1ffc4	1	Other	Other
+9fb1d073-12c9-4e4b-829d-2315977b4f2f	1	Other	Other
+9fb20560-4e13-49e8-9d72-43b62119ba8e	1	Other	Other
+9fb21d86-b199-41aa-8d20-662ea5a3d4b7	1	Other	Other
+9fb235e7-2ec1-4dbb-874e-046c7062bf2a	1	Other	Other
+9fb273e6-68bb-4315-8c50-907b720aee81	1	Other	Other
+9fb2c083-66d2-40b0-8c6c-37138c907339	1	Other	Other
+9fb2c3fe-cb5d-44d6-8b26-cdbd914c27bc	1	Other	Other
+9fb2c89b-5b94-4fb7-83a3-9b6b1e5722c4	1	Other	Other
+9fb32b88-5ddd-4350-9b5c-9f1b2b3b07e7	1	Other	Other
+9fb339a7-9688-4c9d-bf95-7b7a5096de74	1	Other	Other
+9fb33a30-9e7a-49c1-bdb9-8cbb1a60ba5c	1	Other	Other
+9fb3e5d7-2fa2-4214-a929-77750dda6065	1	Other	Other
+9fb40a9e-0455-4dea-bb5a-a1127f4339d4	1	Other	Other
+9fb41379-6e79-4ab8-b192-68679b88490b	1	Other	Other
+9fb41938-da75-4411-92ea-43474f6b2421	1	Other	Other
+9fb4391b-b183-4e84-9251-851679fba9c1	1	Other	Other
+9fb45ff5-0f53-48b9-b010-50557ec87263	1	Other	Other
+9fb46326-01ed-4258-be5b-93df0dc25afc	1	Other	Other
+9fb477f5-a01a-4f3d-a68f-5569455788bd	1	Other	Other
+9fb47ce0-79f2-450f-9ec1-6b575dc08e24	1	Other	Other
+9fb48199-0053-4d4c-8766-ead54a4c6b35	1	Other	Other
+9fb492ac-68ad-40e2-9682-71c361475a69	1	Other	Other
+9fb49d45-e4e2-494e-9c67-70baca7c2088	1	Other	Other
+9fb4df1d-69d6-4888-b029-f6eb7aa9e2e4	1	Other	Other
+9fb4e795-d24f-4b4a-bebc-3ab6ebb60724	1	\N	Other
+9fb4ec94-2904-48d1-8c99-b4d528ccf7d4	1	Other	Other
+9fb543f8-97c1-41aa-93aa-ebd29e269a9b	1	Other	Other
+9fb54819-cdb0-46fa-a0a9-9d30841a432c	1	Other	Other
+9fb586d5-1207-438b-bd64-b43bb373ddca	1	Other	Other
+9fb64bb8-6bde-4cc2-ae9d-33dcc5ec316a	1	Other	Other
+9fb6734b-f9c6-443b-a404-df6e6a93f38b	1	Other	Other
+9fb67c1e-9523-4b34-8940-2469ecd54534	1	Other	Other
+9fb6d130-b705-4e17-aba5-8709a1591811	1	Other	Other
+9fb7048f-bf1d-4f73-92b2-73ca6dbb1cf9	1	Other	Other
+9fb754fb-e0da-4737-a1fb-08dbec59afd7	1	Other	Other
+9fb7a6c5-59fa-41e1-bfc3-379f0415ffec	1	Other	Other
+9fb7b73b-7c6c-463b-8f90-19b0afbdc645	1	Other	Other
+9fb7e8d7-7aa5-4995-b0f1-7e0e51dfb190	1	Other	Other
+9fb806b8-300a-4d00-b50f-e2868006e7f9	1	Other	Other
+9fb84e15-af3c-4a54-a070-5d170a89ad8b	1	Other	Other
+9fb85074-c492-467e-b56c-ff98f3a6b95d	1	Other	Other
+9fb86a18-e341-44c6-8b29-d61f889402c7	1	Other	Other
+9fb8ccdf-87cb-4600-a627-7c4e2dfdb942	1	Other	Other
+9fb8d99d-0d53-4c77-8c48-d2225ed26b07	1	Other	Other
+9fb8f2a8-de29-42d6-8b77-316854e46f49	1	Other	Other
+9fb92c15-c9fb-447a-abfc-3b3e9153adf9	1	Other	Other
+9fb9b2f6-a0da-496e-8a8a-2bcc49ebd615	1	Other	Other
+9fb9d491-efd5-425c-9acc-f30acfd2ed73	1	Other	Other
+9fb9f7b1-b3c5-4239-a61f-1feccf944c34	1	Other	Other
+9fba42bf-0a33-4eec-a534-9507ec1147c6	1	Other	Other
+9fba556c-3c24-4b5b-a11a-bf79c61e1162	1	Other	Other
+9fba6a6d-6dbe-496b-910a-6fbf0eec33df	1	Other	Other
+9fbb0743-2eea-42e9-94ca-b24decec0a05	1	Other	Other
+9fbb4e49-64f3-48b6-89a5-e71d850b7df0	1	Other	Other
+9fbb8133-bd22-4be7-8329-1843bbc21cb5	1	Other	Other
+9fbb9bc1-0036-49e7-abef-5ca471698640	1	Other	Other
+9fbbb046-79ad-4d24-a360-cf7c86c8eada	1	\N	Other
+9fbbcd93-8310-4769-8662-6983bac78e06	1	Other	Other
+9fbc0333-c846-4d52-863c-e3bb9b0e8d67	1	Other	Other
+9fbc12e8-f564-429f-9ab9-75d2e605913b	1	Other	Other
+9fbc414a-4f29-46bd-a76b-448207c06620	1	Other	Other
+9fbc48c3-2e90-4148-ac15-67c9664d8711	1	Other	Other
+9fbc53a7-83b1-4cb8-b52d-8a7cabbf9ad6	1	Other	Other
+9fbc662d-e0b0-42ce-ae98-e1e0f097498c	1	Other	Other
+9fbc7cad-a73c-4a8c-b527-6417260c8239	1	Other	Other
+9fbc8a89-5160-4549-8236-c59cb326ba82	1	Other	Other
+9fbcb501-33e3-44ca-8fef-6847f2321bb1	1	Other	Other
+9fbcec1a-f1d5-4214-b82b-a2c1f32a32c4	1	Other	Other
+9fbda536-abe5-444e-bb92-6aeccada2e28	1	Other	Other
+9fbdb06d-80cc-4b89-a6a1-edd6356662d4	1	Other	Other
+9fbddf52-6e47-443d-83f2-c8d321bd7fa9	1	Other	Other
+9fbe0670-438c-4573-9553-a2cb98e6bbb9	1	James	Other
+9fbe0dc6-1cb9-4a15-b052-55ec8ab6a5a1	1	Other	Other
+9fbe24d0-7cbd-43ca-8795-74e468a80d01	1	Other	Other
+9fbe9399-cf24-40c8-be5f-936cf3e23107	1	Other	Other
+9fbeb696-e1e1-4e9d-abc8-da18877fdeef	1	Other	Other
+9fbeeb78-01a7-4cf0-afea-74b3d27adaf1	1	Other	Other
+9fbf1761-1132-41a6-8a70-a3ee307261a3	1	Other	Other
+9fbf2e38-0dad-49c1-86b8-3a312169a3e2	1	Other	Other
+9fbf8e91-db0b-4254-8abe-ebdb005c4dde	1	\N	Other
+9fbfaa36-1b7b-421d-8d9a-4eb582f8983b	1	Other	Other
+9fbfcfa9-1f87-4cec-b300-e4aebda01004	1	Other	Other
+9fc01fa8-c896-4c6d-aa8e-68686163886a	1	Other	Other
+9fc0493d-7aa4-4f77-bb08-359273eebf1c	1	Other	Other
+9fc069db-ad6f-4e90-8009-efbb59330825	1	Other	Other
+9fc0b69d-5fcd-45ae-9b6a-853ec4c10c7b	1	Other	Other
+9fc0f547-a544-4ef1-a590-267372150866	1	Other	Other
+9fc112f8-8006-4302-ba44-973092fcf90e	1	Other	Other
+9fc159e6-f790-4c90-b71b-34dfea90b79d	1	Other	Other
+9fc18795-3d90-4985-a1f4-736ba90b72f7	1	Other	Other
+9fc1a41e-6382-4a83-86df-e9ffa67af651	1	Other	Other
+9fc1f3ef-21a1-4c6f-8b1a-7cf30de72cbd	1	Other	Other
+9fc20281-80bc-4d09-ad94-38a00336ad92	1	Other	Other
+9fc2cef6-c9d7-43f2-a843-adcc665426fd	1	Other	Other
+9fc30848-13e3-45bd-8a54-910a6a660930	1	Other	Other
+9fc37db0-17fc-41e0-ba79-20d1d95475be	1	James	Other
+9fc37e62-6e33-4c51-bc36-00a0d29fcfcc	1	Other	Other
+9fc3d35b-9fd3-4692-8c4d-bb846011f02f	1	Other	Other
+9fc3df6a-c6d0-485f-8fe9-17dd3fc0e6e4	1	Other	Other
+9fc3f295-ca38-4544-b5b6-47b71bb5c4fe	1	Other	Other
+9fc3f6d4-c30f-4fb4-bbcb-906ff46c8a12	1	Other	Other
+9fc41f38-e0f2-47e3-84a3-f99c49093408	1	Other	Other
+9fc4ade4-0315-4a32-9a6e-65aa91dc63e0	1	Other	Other
+9fc4e31c-4253-4559-9aa8-bd359a58e599	1	Other	Other
+9fc4f125-8734-4ba5-9932-0a8a2ff28b5f	1	Other	Other
+9fc50cc3-17ee-4d48-a812-fc653ddf28be	1	Other	Other
+9fc5106d-87f1-469f-8bed-07abf26199d8	1	Other	Other
+9fc55094-19a7-4938-b580-a91fc4b302ef	1	Other	Other
+9fc57ba1-2282-454b-9e5e-3e931c286d2e	1	Other	Other
+9fc5b997-3c4d-4120-8c55-3eb809ffddf5	1	Other	Other
+9fc5cb74-cfad-453b-b8d3-c6ef8fc4b7e4	1	Other	Other
+9fc5ee67-ce5d-400a-bcef-41c40dbc9352	1	Other	Other
+9fc5fd4a-b0cf-44ed-8e8b-7dfa0f55dffb	1	Other	Other
+9fc62ca8-983d-47d2-810a-5049fb7ad328	1	Other	Other
+9fc676e5-785f-4d5e-a377-5faac0200846	1	Other	Other
+9fc6c0f6-61cb-41aa-aa54-309704cbc9a4	1	Other	Other
+9fc6f916-6264-4b61-b5a8-b8fd38d82263	1	Other	Other
+9fc72f97-4b2f-4c3c-9448-6be0ef8c4485	1	Other	Other
+9fc754e2-ba36-4c59-9325-e1336d010672	1	Other	Other
+9fc754fd-97cb-47fb-ba13-64af04c93716	1	Other	Other
+9fc7a3a6-e90b-43e0-aed8-fd6aeed30c03	1	Other	Other
+9fc7dbca-145e-4502-8589-a0b914383c02	1	Other	Other
+9fc7f2b7-9b25-4b72-b806-323d5b818f52	1	Other	Other
+9fc8443e-d76e-4bc3-9cda-686506cfee1d	1	Other	Other
+9fc84e95-7e5c-4c4b-93e0-5ae6346d8107	1	Other	Other
+9fc860e1-f722-425d-95e8-d2f12a175be3	1	Other	Other
+9fc8b075-965b-47e7-a6d6-5e019f6d9c68	1	Other	Other
+9fc8c593-506b-460b-91a3-df48039a7ea6	1	Other	Other
+9fc8efa6-0350-4f97-8416-72b8763a08fd	1	Other	Other
+9fc906fa-9935-47dd-a0b1-6b63cb6cc7a6	1	Other	Other
+9fc936f8-42b4-42c8-a069-a50c5175ada8	1	Other	Other
+9fc95a7e-d67e-4d0e-9734-68773065d72c	1	Other	Other
+9fc9af1c-09cb-4c06-971b-46c0abfe0da1	1	Other	Other
+9fc9c31f-9595-4b58-a831-fd9fd0b5ebd5	1	Other	Other
+9fca39b4-e87f-424f-83f4-3fccda550e43	1	Other	Other
+9fca8d99-e0c3-463b-aa0c-5bd733ce40b8	1	Other	Other
+9fcae8c7-c337-49e7-972e-021efd606b8f	1	Other	Other
+9fcaf11c-eff2-49cc-8fa7-3738a5eaadef	1	Other	Other
+9fcafa81-e3dd-48b2-94bb-8acc4b53a26d	1	Other	Other
+9fcb1b2e-f0b2-4fac-ba80-995cf50a6090	1	Other	Other
+9fcb950c-c65e-44c3-b336-ea0636923c86	1	Other	Other
+9fcbeb1c-7e7c-4830-aa05-afc1af355777	1	Other	Other
+9fcc8724-39f6-448f-97d7-0408da7d8dcd	1	Other	Other
+9fccac08-2dbd-44f6-9805-4a7031f8099b	1	Other	Other
+9fccb61b-784f-440c-b46e-8ce932684b2f	1	Other	Other
+9fccd261-a668-4adb-8485-e1217ffa267b	1	Other	Other
+9fcd1118-b5dc-4764-b34e-d3c47e4bf051	1	Other	Other
+9fcd51e4-c80a-4659-8598-61ead21b649f	1	Other	Other
+9fcd67c1-828f-48cd-88ec-0d01701de043	1	Other	Other
+9fcd8f34-76fd-49d8-b611-111edc6c601a	1	Other	Other
+9fcde160-734e-479c-8c3d-0b262c0af5b6	1	Other	Other
+9fce1976-fe31-4879-bdf9-eec8309b2886	1	Other	Other
+9fcee963-3ea2-443d-8c81-ad16e6304442	1	Other	Other
+9fcf0f66-e940-445a-b968-cbf96207f338	1	Other	Other
+9fcf1a83-43c3-4ea5-8c88-8caafeb89a74	1	Other	Other
+9fcf3cb6-b968-4280-b115-0340e4608e5e	1	Other	Other
+9fcf547f-35aa-4081-a9f1-0f3b9de62b5d	1	Other	Other
+9fcf7fbf-d595-4e67-a195-0b903b64ed67	1	Other	Other
+9fcf9b74-d600-4936-9157-d0a1f9a8511d	1	Other	Other
+9fcfbf62-2f0c-49f2-8b01-65ef3c0cb4a8	1	Other	Other
+9fcfe3f6-a42e-471e-a31e-e5a36a62b88c	1	Other	Other
+9fd02426-9b53-423a-8346-13645b227c16	1	Other	Other
+9fd05144-ed94-46b1-b812-253ccb74fe79	1	Other	Other
+9fd0d45b-b998-47d5-af0a-2a48989a1c8b	1	Other	Other
+9fd0d9ce-a070-45da-8268-6871c62e3d97	1	Other	Other
+9fd0e841-bd62-479c-9e73-126423ad2e05	1	Other	Other
+9fd115b7-5ce9-4d96-b3e8-9060b6570ce0	1	Other	Other
+9fd1612e-e1f4-4493-a4f5-aa1ed6872d99	1	James	Other
+9fd186c8-6d76-417a-9b85-c0c40c581505	1	Other	Other
+9fd26659-60c6-4ff6-9870-f36356c86f23	1	Other	Other
+9fd27651-c7d7-48fa-91ed-021bb617f7e9	1	Other	Other
+9fd2e88f-8b95-46a4-9e47-82164c0942ca	1	Other	Other
+9fd2ff48-c215-4f39-94c4-bca66f87eff7	1	\N	Other
+9fd35f82-e438-4e57-aa48-1142bea4287b	1	Other	Other
+9fd3775d-2466-436b-83d6-d48ba73c2315	1	Other	Other
+9fd3acdc-fb9c-46b4-a909-e8d91c864fae	1	Other	Other
+9fd3bd6b-2036-4a5d-b4a0-b45ef8b40e13	1	Other	Other
+9fd3cb40-87d6-4989-8d13-d654bccda7fa	1	Other	Other
+9fd3d21c-741f-4611-bec8-5b992eacbb18	1	Other	Other
+9fd3f993-40f9-405a-875b-3de8f0c5a4c9	1	Other	Other
+9fd47737-d9c7-4a76-bebd-795e5cee9755	1	Other	Other
+9fd4836d-90c5-4bcc-acbe-386945829adf	1	Other	Other
+9fd485a1-e8b0-4944-a3e2-c01ebf003de1	1	Other	Other
+9fd4acc5-a305-4ea8-9e38-bdc11d91f161	1	Other	Other
+9fd5557c-762b-4d07-9680-c08dbbdc743e	1	Other	Other
+9fd5771f-2412-4ddc-886c-05d95499746e	1	Other	Other
+9fd57c55-e84a-464c-85c3-23fbf99970ac	1	Other	Other
+9fd60273-afce-4072-8fe4-23bddf6da7b4	1	Other	Other
+9fd62d36-efd2-497a-9b8b-2d040b6075ce	1	Other	Other
+9fd64b3c-cdc8-469a-ab60-2e81678b4209	1	Other	Other
+9fd64f58-c7ae-488f-90b9-5633b9166a94	1	Other	Other
+9fd6d414-0aaf-473c-a883-1c33033290ff	1	Other	Other
+9fd6fed0-ca3d-458c-8380-114422022c11	1	Other	Other
+9fd72be1-f31a-46bd-9338-a30c8bd2d8f1	1	Other	Other
+9fd7c7a3-9496-4761-ba4c-54e63b79b04a	1	Other	Other
+9fd7dfd2-2199-4540-a930-ad14f5d3db8d	1	Other	Other
+9fd7ed2f-607a-44b4-a094-48bc10207292	1	Other	Other
+9fd814fa-eeaa-419a-b8c0-017bf4fe3ac5	1	Other	Other
+9fd85727-ba06-4095-83f7-787005d920c9	1	Other	Other
+9fd85be7-4d71-474a-957b-eccc4b1b21a8	1	Other	Other
+9fd88529-368b-49ea-b864-baa31bce33b0	1	Other	Other
+9fd8a233-ea58-4a5c-933e-b8f0bd2d6354	1	Other	Other
+9fd90903-25d2-413a-8585-d5745839aafb	1	Other	Other
+9fd9209b-ae3d-4993-966f-93e0b0c25a3e	1	Other	Other
+9fd926a9-4db5-4b10-b7c0-202c04011a52	1	Other	Other
+9fd96318-ae6a-4f92-b22e-3acacec34b74	1	Other	Other
+9fd974c2-a11b-4e05-99f6-ea15b8e44641	1	Other	Other
+9fd98125-de51-46ec-b1a1-dc248a5463f1	1	Other	Other
+9fd9bf7e-146b-466e-a6b7-a9e03280ce8f	1	Other	Other
+9fd9d092-ceb0-4b00-8b91-66a589bea2fa	1	Other	Other
+9fda3ebd-80fc-4587-a2c7-c6f798be3b9c	1	Other	Other
+9fdaa613-49e7-46f4-bc9d-324a96b02b70	1	Other	Other
+9fdaadd6-c6b6-4cb8-a95c-2af48ff092cc	1	Other	Other
+9fdac93b-86ee-4400-b84d-b621423105dd	1	Other	Other
+9fdac9d3-f189-464f-8ec0-b53dc796f29e	1	Other	Other
+9fdaca33-9396-40a9-a76f-cb4565db0718	1	Other	Other
+9fdacb60-8c4c-4eb1-854d-ce6defd14b64	1	Other	Other
+9fdae363-727b-4575-9a60-b5c26f54a81a	1	Other	Other
+9fdaef4e-e621-4ab8-9180-84d42b6d3c3a	1	Other	Other
+9fdafb6b-9c8f-418a-afee-b82ba616e6bb	1	Other	Other
+9fdb0010-6a7d-40da-84a5-1d96574a1f6b	1	Other	Other
+9fdb00b2-0caf-40dd-bf8a-04ba0f383159	1	Other	Other
+9fdb1f33-d62f-47cc-ad9a-b8e27e84733a	1	Other	Other
+9fdb4086-bdcb-4092-89b4-61b2ef5cecb3	1	Other	Other
+9fdb731b-30e4-452b-ad01-580edb610834	1	Other	Other
+9fdba269-72cd-4f6d-999b-a2c6f4b35a43	1	Other	Other
+9fdbf8e1-aca4-4bc5-b73d-9af6e22b24ff	1	Other	Other
+9fdc4514-44c5-4d00-aee8-d485df525def	1	Other	Other
+9fdc56fe-cfba-4305-8dae-820845a7c968	1	Other	Other
+9fdc76b2-6f7f-4c03-bed9-df763dfc997b	1	Other	Other
+9fdc8006-1ed9-4ba3-b1b2-d22a638ce0b3	1	Other	Other
+9fdc93d7-64cd-4a1d-ab9b-7568d208d0c7	1	Other	Other
+9fdcb574-4362-4edc-be1a-2bbd4cdffb7e	1	Other	Other
+9fdccd55-d0ae-4ddc-bdc7-7efd912627e0	1	Other	Other
+9fdde273-3c70-4071-9f84-a5d12297081c	1	Other	Other
+9fddf82a-7849-4277-b2e7-932229306fec	1	Other	Other
+9fddfad2-bead-4080-ae01-2baccae3aa87	1	Other	Other
+9fddff9e-592b-4791-93fc-03510a48cdcb	1	Other	Other
+9fde8d8d-2a04-440a-8349-e920946afa91	1	Other	Other
+9fde95ac-5785-432f-b250-36052b514124	1	James	Other
+9fdf0e72-0e72-483c-934b-b75c70e85663	1	Other	Other
+9fdf1b60-44cc-40ab-b392-b818e1c097d2	1	\N	Other
+9fdf8f20-8235-4d4c-a4c8-8b53282e8cd1	1	Other	Other
+9fdf9728-6bee-4d0d-9f6e-12663dd43a87	1	Other	Other
+9fdfe9ba-c916-4b4d-9379-df146eb32e45	1	Other	Other
+9fdfeca5-9819-4a0d-a724-28e2096b25ba	1	Other	Other
+9fe069e2-30be-4881-82c2-594cd42a0fd5	1	Other	Other
+9fe08da1-c58d-43ab-aefd-9f02d366c6c7	1	Other	Other
+9fe14639-37f6-4769-bc0a-e263d660b4ff	1	Other	Other
+9fe14c25-77c2-4f32-adf6-17ee4e122c72	1	\N	Other
+9fe164ce-e19c-46cc-ae65-5edc4eacf7b6	1	Other	Other
+9fe16bfd-f46b-4891-b39b-10432b1442fc	1	Other	Other
+9fe1c9e4-fc09-4dea-ba9a-f3ca7b7b69df	1	Other	Other
+9fe1d649-8d75-40ea-894c-a355a0d111d0	1	Other	Other
+9fe20d76-47ac-4486-b4bd-8bf1411c4e15	1	Other	Other
+9fe2123a-f256-45cb-9ad7-a6c70f01edf0	1	Other	Other
+9fe2232c-85d0-43fa-ae1c-5e4d043e1f81	1	Other	Other
+9fe25926-095a-48b9-9edb-70d463889040	1	Other	Other
+9fe34cdf-d8e1-4f72-9cf5-5013934398ca	1	Other	Other
+9fe4575f-3369-47d7-83a2-da80a9733a3a	1	Other	Other
+9fe4e55c-b452-49e2-9143-9d0c57c3fde4	1	Other	Other
+9fe4e6e6-4f69-4bff-8ccd-f55f1a4994cd	1	Other	Other
+9fe4f292-694b-4cd8-8e7d-d6ffe593052b	1	Other	Other
+9fe5331d-fede-4e73-9cad-e3907aef2e31	1	Other	Other
+9fe54b84-bb41-4895-9883-e1470b276772	1	Other	Other
+9fe58741-c3ab-4b31-9553-9647d52f8b25	1	Other	Other
+9fe59ede-a430-46a4-863c-269220ad6f6e	1	Other	Other
+9fe5f677-2a29-4e05-b2fa-d80556cfee52	1	Other	Other
+9fe5fc74-ebe0-4aac-976a-940c74fbbb66	1	\N	Other
+9fe600d4-9bc2-46a2-bbee-dd155b55d927	1	Other	Other
+9fe61a84-39dd-4e2b-953d-d79ef1af4f9e	1	Other	Other
+9fe68813-2a59-4ca3-a500-379ab951c284	1	Other	Other
+9fe6aae1-ed3f-4cc7-86fb-d17c09a1a099	1	Other	Other
+9fe6ae00-c3e5-4e35-acbc-ce70fc2215a4	1	Other	Other
+9fe6d55f-c4ab-45b0-b768-6fc1e1470c04	1	Other	Other
+9fe706ab-2e81-4ea0-bc02-51e80a69579e	1	Other	Other
+9fe72429-4ff2-41c2-b9e8-4f9feaa7bd22	1	Other	Other
+9fe73bb9-8f51-4745-ad1f-47bd8c3e23c3	1	Other	Other
+9fe76709-5fd0-419f-907f-9a0712da582b	1	Other	Other
+9fe76b9b-e2fc-454a-a7eb-f1f9a13e147b	1	Other	Other
+9fe78e8e-44c8-4732-a46f-4c015ce556de	1	Other	Other
+9fe7bcad-822c-425e-aced-3fb1c4726de3	1	Other	Other
+9fe7cd32-898d-4815-a15b-f519ca92f7c5	1	Other	Other
+9fe8646f-d425-4a03-9a4d-acc04f62893b	1	Other	Other
+9fe88a81-6342-40dd-b3b7-954897cd6f15	1	Other	Other
+9fe8b794-01a7-4d17-936e-7ee150f94996	1	Other	Other
+9fe8e12a-99b3-4bb3-9858-721cc6149ac2	1	Other	Other
+9fe9049b-1c44-427a-a81d-61c24dd46b5f	1	Other	Other
+9fe9119f-ed63-4b8e-8842-4077de5e2356	1	Other	Other
+9fe96b47-8d0c-42d5-a84f-05205c9aa96d	1	Other	Other
+9fe98d14-9145-40ff-801d-2c78e8faf58b	1	Other	Other
+9fe9c3a1-e87e-42d9-a1dc-bb161c2c5d96	1	Other	Other
+9fea6059-4d15-48d5-a0d1-c9dc1b679cfe	1	Other	Other
+9fea60cf-861b-42fe-bd70-e62539caeff7	1	Other	Other
+9fea6154-c576-4e96-8e23-311cd5c9e36c	1	Other	Other
+9fea8a31-4518-4597-82c2-3e50e90a035f	1	Other	Other
+9feab83a-061b-421b-92cc-eb71c768a6c8	1	Other	Other
+9feabab4-8ea7-4a37-9454-c4695d65a188	1	Other	Other
+9feb23ad-fdfa-4a2e-83f8-ced2cb652802	1	Other	Other
+9feb4050-27cd-41a5-ac1a-b1f694a49bd6	1	Other	Other
+9feb46dc-e9d5-4e67-be44-99d47cebfa15	1	Other	Other
+9febe3fc-7e4e-475e-9bcd-942e27260dc0	1	Other	Other
+9fec2522-caa5-48e6-8d41-a85c9e0f05ae	1	Other	Other
+9feca24b-2f52-49ac-ad6f-0b8a29ee9088	1	Other	Other
+9fecd97d-f724-47b2-bf15-0a89b2f3bd78	1	Other	Other
+9fed0612-45e5-49da-aab8-ff13b9e68dd6	1	Other	Other
+9fed0901-a439-40b0-ade6-3050befebb75	1	Other	Other
+9fed2276-9eac-4518-bc13-3cac8b8f995d	1	\N	Other
+9fed37fb-bce3-49dc-8b3a-bc6825c77ee8	1	Other	Other
+9fed53b0-82e1-4614-97f8-458693c00637	1	Other	Other
+9fed823c-2ded-4130-818a-9aee131b0583	1	\N	Other
+9fed8367-4b58-4c70-bac7-f83b4d6a7b2c	1	Other	Other
+9fed944b-d21f-4f3e-b140-09b30cc470b5	1	Other	Other
+9fedb771-705a-4ccc-b669-fd8a4fa40e6d	1	Other	Other
+9fedcfda-16ef-410c-a52f-b1d9846ab7a4	1	Other	Other
+9fee6246-f88c-4c13-bbd3-4d65cad6f644	1	Other	Other
+9fee72b8-269b-4331-87df-7036d3155729	1	Other	Other
+9feea73a-efc9-4b97-9bff-691607524309	1	Other	Other
+9feec90a-de2a-4672-a525-33dd078d4908	1	Other	Other
+9fef09ee-68c5-4d4c-93ae-7e8514cd02ee	1	Other	Other
+9fef298e-db7c-46bf-a575-04f39bda5f99	1	Other	Other
+9fef6904-df5c-432b-8501-98c49f18a1f1	1	Other	Other
+9fef97e0-fb5b-414d-a6d7-93c146ec6f64	1	Other	Other
+9fefbaec-97fd-4392-a7ae-f78626d9e562	1	Other	Other
+9ff035bd-6908-45ef-a94a-1efc277e2b54	1	Other	Other
+9ff03893-6851-437e-96c9-0930046f0548	1	Other	Other
+9ff0407e-a25b-4a3f-b06f-b6e9017a0dff	1	Other	Other
+9ff04b01-1362-49cd-81e3-9d57baaada33	1	Other	Other
+9ff0610d-6524-479c-b40e-c1586956c256	1	Other	Other
+9ff0cbb9-5f0c-4ad0-8201-937d60a7015b	1	Other	Other
+9ff0da05-3ecf-406c-b8da-833544e3d518	1	James	Other
+9ff130ed-fab6-4121-a824-837f0b55a983	1	Other	Other
+9ff14699-799c-49ec-8c76-ec6bc5dd754d	1	Other	Other
+9ff17686-a333-4653-9af8-9c967e34eac7	1	Other	Other
+9ff17e6a-cd22-4dc6-9bbb-1d81eb07c21b	1	Other	Other
+9ff1cd3a-4542-422b-91ee-1a25d2456d81	1	Other	Other
+9ff1f132-7a4b-4011-83a5-f3fc654b5e8f	1	Other	Other
+9ff226c7-66e2-4700-aa02-d1cfe5308ba1	1	Other	Other
+9ff260aa-97c1-45e7-875b-dccfa5d9d576	1	Other	Other
+9ff262a5-14bc-43e2-8a7a-ff64a7a92162	1	Other	Other
+9ff26872-4ce1-4fbb-a37b-1c6b84d2964e	1	\N	Other
+9ff26a23-189f-4523-8b20-c7a48a1b9c7f	1	Other	Other
+9ff2b646-6a91-4637-96c2-bd9da27c520c	1	Other	Other
+9ff2f6c5-4f41-42a6-b77a-1530dc1b318b	1	Other	Other
+9ff31db1-16c8-46ea-91bf-c7a90d3cee48	1	James	Other
+9ff368fb-cbcd-4472-beaa-f1d225c40a0c	1	Other	Other
+9ff3c895-f65e-4080-89b8-a8b7c7e19e6a	1	Other	Other
+9ff3d5e3-549c-4cc4-8d35-f5fdba5a7df5	1	Other	Other
+9ff3d6d1-d9ea-4e6f-9e6f-65c2a3d6ca75	1	Other	Other
+9ff40d2b-f6a0-4006-8dc9-dc0d7f2435b6	1	Other	Other
+9ff473ee-0a00-4a91-a89b-7ed78f36ab8f	1	Other	Other
+9ff48b6e-7688-4b7b-9dbd-d161cb4a77ad	1	Other	Other
+9ff4e23b-6429-47bd-97b4-772514a53d8a	1	Other	Other
+9ff4e92c-e01e-4663-a75e-4d679048b254	1	Other	Other
+9ff5d586-197d-442b-8746-26299f7743e3	1	Other	Other
+9ff60f70-9130-4fd3-bb06-eee7c7dcf4cb	1	Other	Other
+9ff61191-0422-4d1d-957b-e9b4266c76d6	1	Other	Other
+9ff64c59-1ea9-4a4a-a1f0-dab1922a0c79	1	Other	Other
+9ff79663-0911-4c27-8265-a41f7e244e29	1	Other	Other
+9ff7bb4f-4c3c-40d9-bce4-d430ba6834c1	1	Other	Other
+9ff7cb2e-1531-49c9-9b83-90b30e317ff7	1	Other	Other
+9ff8384c-0c32-4aa5-a574-017b1287fbb7	1	Other	Other
+9ff83e22-1215-4ac7-8829-11cba8363d9a	1	Other	Other
+9ff88ddc-1365-49f8-9b02-79f689210497	1	Other	Other
+9ff8bcc4-58e1-4f38-9885-bd45e7796823	1	Other	Other
+9ff94ea0-2abb-4944-ae85-7015bdfaa379	1	Other	Other
+9ff96de6-dc91-407b-9984-3e3da3fd3873	1	Other	Other
+9ff96dff-27ad-4283-b922-b99396c0ae98	1	Other	Other
+9ff97a76-5772-43c5-8a5c-f487e9f1ba2f	1	Other	Other
+9ff9ccf8-a401-4351-bc3c-742661a55dd0	1	Other	Other
+9ffa0eba-6c66-4a38-8b6c-75c856ed5413	1	Other	Other
+9ffa8604-69a3-46b6-b422-d41b267fc81c	1	Other	Other
+9ffa9c36-880d-40ca-b8aa-4ae40f58c408	1	Other	Other
+9ffaa357-a9b4-4e49-a475-936c07f8541c	1	Other	Other
+9ffaf015-f742-477d-a261-6fe2cea3e417	1	Other	Other
+9ffaf5b8-4121-4179-8624-2312352b15c8	1	Other	Other
+9ffb09db-4984-4b26-b0f0-d90b35a02b82	1	Other	Other
+9ffb5810-2024-4148-ad1a-9bb9148b6dd3	1	Other	Other
+9ffb7040-dd6e-4e16-a03e-c4b13ff7dbf6	1	Other	Other
+9ffb8f78-056e-4a81-b871-e770a8623e30	1	Other	Other
+9ffb927c-dfe1-460e-81ed-15b0aa66af4b	1	Other	Other
+9ffbbe02-553d-4d6a-a7d8-44a1b9813bda	1	Other	Other
+9ffbcc98-13e3-4b45-8154-092ae9c4452d	1	Other	Other
+9ffbcdaf-3112-4a63-8794-c2dbcb1a0980	1	Other	Other
+9ffc8d24-5224-429f-820d-c9a6667eb1ba	1	Other	Other
+9ffcaf52-f2bd-463e-be60-ad62a70c4399	1	Other	Other
+9ffcb454-ccba-4e15-a077-a9d13c88064a	1	Other	Other
+9ffcd27d-31e5-453f-952b-5a2c32555d06	1	Other	Other
+9ffd4994-5fe2-4695-9f00-5999e84fd6d2	1	Other	Other
+9ffd6808-05a6-4ab4-8eb4-032f8d64e470	1	\N	Other
+9ffd9898-6fc5-47d6-b382-5d0ab79991c4	1	Other	Other
+9ffdd253-1877-46a5-b897-0cc8dd324450	1	Other	Other
+9ffddc25-2a71-4f99-bdea-81c13eb1803b	1	Other	Other
+9ffdf3c3-c227-4b1d-b9ca-9909c5f808f9	1	Other	Other
+9ffdf48e-e94a-41ca-914b-96ae37a44fc7	1	Other	Other
+9ffdfb26-425b-4669-92d2-34be1f7bbb0d	1	Other	Other
+9ffe80ad-72d8-4029-99e6-05011a5277ee	1	Other	Other
+9ffead25-b5db-4c59-b2ab-0d5644e1d95b	1	Other	Other
+9ffeb07d-2826-4a53-a364-d8f4c189a79e	1	Other	Other
+9ffeda45-ed66-4d66-b6cb-657a7a3b16ae	1	Other	Other
+9fff09cf-e386-4a6f-b449-d5fcd28a9ef8	1	Other	Other
+9fff12db-473d-41d7-b618-3f23c872db13	1	Other	Other
+9fff28d6-48da-43e7-8399-ede93d52a835	1	Other	Other
+9fff2bfc-982f-4184-9328-ad1b0e9383a3	1	Other	Other
+9fff8b44-77cf-4146-9ff2-a3e86819642c	1	Other	Other
+9fffb4ac-39b9-4a07-8a45-ddcc6bc52e0b	1	Other	Other
+9fffba67-3cc7-4140-b873-ac1eb2f33971	1	Other	Other
+9fffca97-0368-4c50-86e9-bdc1e07d9275	1	Other	Other
+a0003ab0-84fd-492a-acfb-ddfb2688ea6e	1	Other	Other
+a00074d6-4a9c-4de2-9a0d-402e8aa934f6	1	Other	Other
+a00099fd-aebe-48ee-b3ca-cb8b0d78173b	1	Other	Other
+a000e0ef-a5a2-404d-80ab-48f775ccb0bf	1	\N	Other
+a0015c5a-6eb8-4bcb-b218-8acb3b735a1d	1	Other	Other
+a0016d45-8ea3-4710-b531-19d44fd58095	1	Other	Other
+a001b987-db1d-4480-bcd0-eabfdb23dc44	1	Other	Other
+a001deaa-4d8f-45c0-bc46-88e9b6eb4b26	1	Other	Other
+a002004d-3a3f-45f7-970a-c451c55b6cb9	1	Other	Other
+a0022c18-9f5a-4854-ab03-447aa7480252	1	Other	Other
+a002525c-c144-420b-9e6e-fc4023235acd	1	Other	Other
+a002bd3e-7c05-4f9e-bd97-d0f15abd9a71	1	\N	Other
+a002d745-ab18-4d41-a599-81cf9b480f02	1	Other	Other
+a0032b54-512f-475b-9e40-680c34986ddd	1	Other	Other
+a003439d-b089-48d7-85f4-eb43d7450cee	1	Other	Other
+a003bf90-7a8f-42d8-988f-544022afdd95	1	Other	Other
+a003c0c9-28c7-46c1-8173-7814cc261428	1	Other	Other
+a003c27a-14e6-4253-a9a3-1882cdb081af	1	Other	Other
+a003f9fb-e444-4a79-a2af-4281ccade9d5	1	Other	Other
+a0042502-3dc0-4b7f-8a95-c81665acc5b5	1	Other	Other
+a0042bfa-cf07-4925-b156-4bd329e40f4d	1	Other	Other
+a0043eba-8a7c-4012-b317-1937c4dffc44	1	Other	Other
+a00464d1-ff74-435e-9ff2-57ac578253ce	1	Other	Other
+a0048b81-902a-426a-8f88-60641ade51d6	1	Other	Other
+a00494f1-7eab-4c56-b8ae-53a58e482c22	1	Other	Other
+a0049f43-5463-48a3-851a-ba9c70561954	1	\N	Other
+a004e8e9-7381-4440-8033-d7e23bf9e472	1	Other	Other
+a0050c9c-94ee-4869-a836-5258026fb4e3	1	Other	Other
+a00539cb-6851-4fe2-ae1c-bbdd7da7cc09	1	Other	Other
+a00547e2-f903-49df-88d4-e65f5392d14b	1	Other	Other
+a005a93d-06f3-4e9f-9026-98746ff1bd80	1	Other	Other
+a005bd99-0fe5-41ef-95f4-1c86b0b79fe3	1	Other	Other
+a005ca0e-550d-4caa-859b-3ec180807f1f	1	Other	Other
+a005e472-c2c8-4d00-ab5b-39b9a61c7634	1	Other	Other
+a00601df-8788-41ed-903c-347c61b01c07	1	Other	Other
+a0061616-6c31-438b-89ad-07d5c1bde55f	1	Other	Other
+a00619c2-2262-4d3a-9795-61f9cfab3cae	1	Other	Other
+a0068df0-b79d-4a50-8a1d-10bd271e8f73	1	Other	Other
+a006a259-53ea-455a-8e58-20c559f666b8	1	Other	Other
+a006cd5b-2b82-469e-b277-0d29225b6a70	1	Other	Other
+a006dc33-1c0b-454a-9ed5-ce510417e2a1	1	Other	Other
+a006ed3b-7454-4f09-b355-9b3b10823545	1	Other	Other
+a006ef6c-0d92-4075-a570-17ca4bdae3ed	1	Other	Other
+a00730b2-f954-4cbf-9556-43e05d8b5253	1	\N	Other
+a00740b9-0733-4fe5-b313-3b7ce1c29354	1	\N	Other
+a0075787-6c8e-4af3-a7e4-57febe218daa	1	Other	Other
+a007fd81-1066-4ca4-839e-cb975afd1ec5	1	Other	Other
+a0084129-522c-44c3-a494-789d92cb574f	1	Other	Other
+a00852e0-3116-44d7-9af3-b71d2b31e1fa	1	Other	Other
+a0086338-b685-4680-8446-f811c8881813	1	Other	Other
+a008e96e-03a0-4c79-9f1a-13ab180ba67b	1	Other	Other
+a0090167-32f6-40b0-8fa6-d4d9ffe5561c	1	Other	Other
+a00919af-c0f4-4f0d-9dae-9edee6b09a6e	1	Other	Other
+a009362d-c1f1-4762-ac87-93a43dfc40c8	1	Other	Other
+a009729e-756c-449c-be20-ff445f596650	1	Other	Other
+a009990a-155d-4066-ac30-a0b43014a535	1	Other	Other
+a009fb30-dd96-48d9-9452-0c29b673f416	1	Other	Other
+a00a0e82-abb1-48d1-b666-61b03020c6c0	1	Other	Other
+a00a2e62-9e62-4290-a7d8-620f03c5d9a7	1	Other	Other
+a00a34c2-0d8d-45cc-bc76-19e6fff5083d	1	Other	Other
+a00a3ce6-9e9f-44c5-bf01-3cdb14039a4f	1	Other	Other
+a00a5d46-272f-4328-b680-0670508cb9ca	1	Other	Other
+a00a60e0-8b99-4640-b43c-fb312abf7c3a	1	Other	Other
+a00a8d74-05e2-409d-8f87-02f60eb0cd2c	1	Other	Other
+a00aa58b-3dab-484a-b28a-a01d7eda8fc5	1	Other	Other
+a00ab9e4-4e6d-4c8a-8e49-47d050eac772	1	James	Other
+a00b2945-83de-4ff5-816a-66482ec8234f	1	Other	Other
+a00b6bc8-af82-44a0-a846-850118f56968	1	\N	Other
+a00b7e74-3727-4164-b863-dbef17958977	1	Other	Other
+a00b94db-cdc1-4d3c-b44e-f559173a00b0	1	Other	Other
+a00b9b86-804a-45c5-aa41-033b1f7456a7	1	Other	Other
+a00bc5a0-5d43-4593-9d39-079c5e4f8dc3	1	Other	Other
+a00be9b1-db41-48e8-a9f2-9ed749803b04	1	Other	Other
+a00c5b32-464d-4209-bbbd-607ba6f984bc	1	James	Other
+a00cad93-e1d6-47ae-8bb5-28f444c4abfc	1	Other	Other
+a00d757b-51ca-428a-82c1-1a2db99d2c2b	1	Other	Other
+a00d76ed-8389-4d49-a049-2bbec2359208	1	Other	Other
+a00dfe05-ef8e-4e17-aec4-e828e7facb68	1	Other	Other
+a00e10f2-602b-4b00-b559-bda5d11da1f0	1	Other	Other
+a00e22da-40d0-4106-a844-caaba73d7c29	1	Other	Other
+a00e273f-137f-4a24-9b2e-f289bc4712d4	1	Other	Other
+a00e5d12-f4d1-4cf0-b1eb-fb9954c834fd	1	Other	Other
+a00eae6b-4469-4fa1-9e96-cb7cdec89413	1	Other	Other
+a00eb22c-7acb-44e9-afad-c5d49432457e	1	Other	Other
+a00ed42a-7359-441e-83da-beab4f50ab4b	1	Other	Other
+a00ef6f1-5194-4a5e-abe9-992dd3a5edfe	1	Other	Other
+a00f04ce-2184-4c7e-9b87-972bd44060ab	1	Other	Other
+a00fca84-0763-4318-8123-8ea0af23adc1	1	Other	Other
+a00fe888-de2d-4fb6-9f4d-1293461b96f4	1	Other	Other
+a00ffb17-506b-443e-ae2c-951ae3b6aeb4	1	Other	Other
+a0100274-c274-4d2a-b78e-608613291ff4	1	Other	Other
+a010091e-5a24-4daa-8be0-c4a0654b7317	1	Other	Other
+a01031ee-519c-4aa2-abb8-8d1b824fd653	1	Other	Other
+a0104c25-1373-4beb-8f7d-8f1a13e9b68c	1	Other	Other
+a0107a6b-5b78-464a-b6cb-fc580cb3ffc2	1	Other	Other
+a010a2af-94f6-4657-ac22-d6a2fc67ba97	1	Other	Other
+a010c737-4a8f-4030-b60a-5cfd5bf3b8f5	1	James	Other
+a010cefa-ab59-4115-983d-276d2e3725a5	1	Other	Other
+a010e94f-50de-479b-9bf3-5756e2528d0c	1	Other	Other
+a0112982-3c7d-435e-b316-d71537920e12	1	Other	Other
+a0116ba7-76e7-45ba-9708-bf38dfc07f45	1	Other	Other
+a0119d5f-8053-414a-a0aa-b7214de446a6	1	\N	Other
+a011dd2c-4dfc-4a0a-a167-53e20a966180	1	\N	Other
+a011e713-9706-4c83-9306-6b7aabca5e96	1	Other	Other
+a0121058-c24f-4790-bec0-e3e66704aab3	1	Other	Other
+a0126a61-f5c2-4b8a-abb6-56d491efeed7	1	Other	Other
+a012723f-8ead-4f4d-8b9d-b4ffa1c41423	1	Other	Other
+a0128877-5b07-449e-9637-105f255f070a	1	Other	Other
+a0135528-4a33-451b-885b-4b5910b6c4d4	1	Other	Other
+a01367a8-edfd-42a7-a173-19e048fcb8d4	1	Other	Other
+a01406a1-2f1e-41d9-be20-f35fe0a58725	1	Other	Other
+a014358f-d5d2-4bf4-8745-7ea94607fc7c	1	Other	Other
+a0143f05-3496-42c6-a4f1-9f2d1995d16d	1	Other	Other
+a014696c-ca94-4ad6-9cc8-9d27e83bf99d	1	Other	Other
+a014819a-ee0f-415b-931c-75baae4389f6	1	Other	Other
+a014b4dc-9e82-410e-8068-c292ff6fbb32	1	Other	Other
+a014d19a-f148-4082-9208-46c303ad165c	1	Other	Other
+a014ed19-c7f4-4828-937c-52a84347f88c	1	Other	Other
+a0151073-cbd9-4800-9c2a-e52098abacc9	1	Other	Other
+a0151d90-367a-4202-841e-441bdc23c361	1	Other	Other
+a015cfd6-503f-4b00-8411-09a044633efd	1	Other	Other
+a016037f-f965-4128-abaf-a346a8a94746	1	Other	Other
+a016174e-c9d7-4dee-a51a-5aea44958439	1	Other	Other
+a0164839-c0e1-494a-9161-6c0fc9429bb3	1	Other	Other
+a01668e2-45c4-4dc9-b057-2f1de9fb1e4e	1	Other	Other
+a016896f-22fa-43bf-8443-ee7ca537d8fb	1	Other	Other
+a0169448-fbf9-4b89-9cb1-9e8104cb10c2	1	Other	Other
+a01696be-71b0-45f5-a5d4-9bba9239e0f9	1	Other	Other
+a016a65a-9943-4e01-b6e2-2358bc20fc37	1	Other	Other
+a016b569-4387-4cf0-b143-4a2d4482fba9	1	Other	Other
+a016da82-ade6-4804-aeca-35a04ad4bfbc	1	Other	Other
+a0173cf7-6063-401c-b771-8229a88b66c6	1	Other	Other
+a01782ef-e4cc-4b70-9a14-9e0c39570199	1	Other	Other
+a01787ce-d291-4e3a-8b52-3c83b51890e6	1	Other	Other
+a017caf0-19cd-430a-ba51-0f5a513284a2	1	Other	Other
+a017ff64-0775-468d-9e12-ccf03b9d4f83	1	Other	Other
+a01838e9-c17c-49ff-bfad-6058b68e0317	1	Other	Other
+a018a097-303a-42ce-9b10-34a50e3b125a	1	Other	Other
+a018b8c0-8838-48df-a992-b4d0806c35f5	1	Other	Other
+a019102a-319d-4182-9290-f5a16eb134d3	1	Other	Other
+a0191162-6ea1-4291-b3d7-b4404d109e02	1	Other	Other
+a019737b-669f-4ba2-b08b-31fa281ce8f0	1	Other	Other
+a0197c9f-38e9-4044-90a7-d312e78dbf97	1	Other	Other
+a019a828-8486-445f-a64b-b8af742cd577	1	Other	Other
+a01a0538-c6fb-4eca-b9a2-dc9d86620d50	1	Other	Other
+a01a1cae-0584-446f-ab9f-a062f3e1323f	1	Other	Other
+a01a21e2-5683-4f94-a41f-8bbce53fad4c	1	Other	Other
+a01ad194-1c0b-40db-a9eb-aad845c49937	1	Other	Other
+a01ad822-f92c-4e1c-902e-a95db10f865a	1	James	Other
+a01adbb7-b08f-40fe-aec7-b631d14f8c92	1	Other	Other
+a01b2dd8-74e3-45a4-84d2-b625b8b82155	1	Other	Other
+a01b6dde-9153-4534-b853-f125071ad24e	1	Other	Other
+a01bdf3e-969e-4444-be78-6c7c8d4d627e	1	Other	Other
+a01bf9a2-6831-4a9c-96e0-c3bb864b2334	1	Other	Other
+a01c21f9-8664-4cf8-b4e8-5601c3e5f636	1	Other	Other
+a01c6091-c20c-452b-a080-3273c99b9c78	1	Other	Other
+a01c60e9-ede4-49dd-96f6-bfdb53b8eda9	1	Other	Other
+a01c7213-5e96-4328-b635-ad71b0c229e5	1	Other	Other
+a01c732b-5b3d-4a3e-b6e7-f893a0d5f0d7	1	Other	Other
+a01c81b3-232c-4b77-9b91-9e7e4fb061e4	1	Other	Other
+a01c987f-cf7c-42da-9480-5942ca9042d6	1	\N	Other
+a01ce1bd-d8fc-4efe-a5a2-cf2b32458529	1	Other	Other
+a01d0b33-bca2-4cd3-980a-30b3dc90848d	1	Other	Other
+a01d0efb-432f-4d86-8738-e91283c3c07e	1	Other	Other
+a01d27af-8a6c-499e-89a8-502575f6e029	1	James	Other
+a01d39a8-a828-4f24-962f-c404f0e2d1d4	1	Other	Other
+a01df429-3227-4ac1-8433-42ba0b33890d	1	Other	Other
+a01e64a1-724d-4a9f-9904-83f698284ae6	1	Other	Other
+a01e9576-8d7b-4266-b046-8745378ee6df	1	Other	Other
+a01ebf5c-d3f4-4def-b29e-669a7dc30118	1	Other	Other
+a01ecc81-7885-4b9c-868e-fa642a70b1e6	1	Other	Other
+a01f623b-d753-42f0-949f-ab1292a57e14	1	Other	Other
+a01f83bb-07d4-4fa0-81aa-a7235f5f2234	1	Other	Other
+a01fa063-00a0-4ad7-a0a1-c1f039766cb3	1	Other	Other
+a01fde72-086e-4b89-982c-ced421ed201b	1	Other	Other
+a01ffb05-2374-4b68-a1e4-223d373f4278	1	Other	Other
+a0200337-5fb2-4c3a-b6fc-6adf1d8aa89e	1	Other	Other
+a020e197-b286-4886-a3b2-ba95e49c94ad	1	Other	Other
+a021333b-3d4b-450d-a742-1ec10d422817	1	Other	Other
+a021382f-f831-4687-9325-7e83405db87f	1	Other	Other
+a0213f83-d3a7-4013-99cf-ba89f87e4679	1	Other	Other
+a021920f-98db-4872-9c2f-2c7459dec02c	1	Other	Other
+a021ab4a-368d-4492-a4ba-d6a203fa6fcd	1	Other	Other
+a021d470-01a3-4d42-9fef-7f7570958c2d	1	Other	Other
+a021f983-e228-466d-ac00-c039d9578ff3	1	James	Other
+a0220752-fd51-4d63-8514-a040e9d7d853	1	Other	Other
+a0220b04-f84f-4c33-be85-c940733d961f	1	Other	Other
+a0224972-91fe-4597-86c6-4d558f063cb4	1	Other	Other
+a0226f88-5f5e-4716-86b1-d6183571b9ff	1	Other	Other
+a0231665-908a-4974-8ddd-8b2488451289	1	Other	Other
+a023581a-aea3-416c-b1d5-5a6ec5056d3c	1	Other	Other
+a0235aa0-200d-4411-80f9-08bd77cca90c	1	Other	Other
+a0237c2c-8c52-42fb-9a79-c05ced9f004b	1	\N	Other
+a023ca8f-693d-433f-bb68-037e73a876ed	1	Other	Other
+a023e23b-92e3-4365-9e63-212e4af1d132	1	Other	Other
+a0240033-4178-4cb4-b3d3-9c3aed7ccc23	1	Other	Other
+a02421ac-8c54-4b31-99e6-09932de7fc27	1	Other	Other
+a0243042-c35b-4ae7-80fb-442fdad16332	1	Other	Other
+a0243fc0-8688-4486-9203-19108f71c523	1	Other	Other
+a0247069-8fa3-4bb3-8ae1-8558c0d4b9d6	1	Other	Other
+a024b2f6-2d65-4d62-afeb-aa5ee496c87e	1	Other	Other
+a024ba98-68bc-4bc0-82a7-1729d88888e1	1	Other	Other
+a0252529-3fc3-4194-a10c-c8de3c2077e9	1	Other	Other
+a0254d9b-2256-4653-bb93-aa50690f7407	1	Other	Other
+a02556e4-2514-4665-9334-b4eb71efe610	1	\N	Other
+a025582c-0759-4322-9a69-6edae818a9df	1	\N	Other
+a0259215-f53e-4ae7-8ee1-a5f4a9a1c4b2	1	Other	Other
+a02641b9-59ce-43e6-993a-9e323acbd499	1	Other	Other
+a026a229-4e0b-4316-a568-d7b930ba23da	1	Other	Other
+a0273896-7c36-492b-9010-a8118c2eb928	1	Other	Other
+a0274be9-7239-448e-9bf2-2947538fe101	1	Other	Other
+a02755f6-b5e5-4516-a3a4-9986f19e05cc	1	James	Other
+a0277838-c54f-4ece-b831-868931e5e9ae	1	Other	Other
+a027dabc-66bb-492c-b61d-2aa3502f0886	1	Other	Other
+a027f0a4-99e6-46d3-91ce-9d91e1a7ad5e	1	Other	Other
+a0280b37-ab24-4b39-a857-f1ccab9781f2	1	Other	Other
+a0283065-4451-4b97-90cd-477b3a216bd8	1	Other	Other
+a02830cf-5189-415f-b408-bc54bb2cd099	1	Other	Other
+a02843a6-1cfb-49c6-891b-81ecf8585979	1	Other	Other
+a02850a4-404a-4266-958a-0b7dc6c5e59a	1	Other	Other
+a0286afc-5795-4a81-a3c9-52a04b39158e	1	Other	Other
+a0286c47-6364-431e-b2a9-1f9159ac795d	1	Other	Other
+a0287b52-5de0-4f7e-9796-b61410eb36e5	1	Other	Other
+a02883ca-d2f3-42da-85ee-6f18c21e5f66	1	Other	Other
+a0288e7e-799d-41bc-912f-a740d62b7874	1	Other	Other
+a02917b1-c5d6-481e-93d0-19ca7db75228	1	Other	Other
+a0295ded-61c6-4447-866f-91ee0a13aed5	1	Other	Other
+a02993d5-088e-4466-9c08-f06e1a9dda5e	1	Other	Other
+a0299a72-6a54-4907-8b56-1dfef1472fb9	1	Other	Other
+a029e6c9-8a44-4d84-b00f-f0719606f232	1	Other	Other
+a02a0708-8c6f-4040-9dd7-917c13c6e91b	1	Other	Other
+a02a1f0a-efe8-4fac-916a-bf930dbd48da	1	Other	Other
+a02a9dd8-b9c5-4a1b-b610-c420c9f678f8	1	Other	Other
+a02a9f80-7e3d-4a29-9df4-cd9e9d15b95e	1	Other	Other
+a02abb29-0be9-426f-b5a2-5ebe1b808c2f	1	Other	Other
+a02aec24-f33a-4500-b5b5-b98b3f1584d1	1	Other	Other
+a02af120-8e7f-4fcd-adf3-881a2dd047e2	1	James	Other
+a02b2ffa-426d-4661-8401-6c8224fa8840	1	Other	Other
+a02b50eb-eef8-4c0e-a74c-8f7aba134e21	1	Other	Other
+a02b8156-1e54-4ca8-a49c-d15820373bdf	1	Other	Other
+a02be84a-dd36-4096-a1c9-9c07fbd74e44	1	Other	Other
+a02c0331-848d-4a13-8718-f345e46ae3c6	1	Other	Other
+a02c047b-9a69-4c94-87b9-16980dbdb52f	1	Other	Other
+a02c04fd-0160-4e2c-8322-83023bc62290	1	Other	Other
+a02c624d-67c9-4f2e-9533-2f9ecf5c23d4	1	Other	Other
+a02c6a10-768a-44cf-a370-6589e04440df	1	\N	Other
+a02cd1e2-846c-423a-beb2-0bc7a0262b1d	1	Other	Other
+a02d0031-3862-489f-8f0f-aa76d9c70de8	1	Other	Other
+a02d1544-d597-4b5a-8928-25c5aa1ce8ce	1	Other	Other
+a02d5898-ba4b-4e56-a6ea-c165bbbfa500	1	Other	Other
+a02d9aad-8ecc-4952-8567-b01590a24863	1	Other	Other
+a02df3fe-157d-4f9c-86f3-3816a90344be	1	Other	Other
+a02df862-c998-47ef-aa8a-1d55571f7beb	1	Other	Other
+a02e0dfd-a9a9-4310-9bea-8505fce5f056	1	Other	Other
+a02e3594-4af9-4ed0-a4e7-ab3e06df28fa	1	Other	Other
+a02e74dd-0012-4d61-a3a9-ea18d27682c4	1	Other	Other
+a02ed56f-e1c4-451d-b055-06cd165aa4d1	1	Other	Other
+a02ef6a5-a00f-48f7-b626-42fc83ae1f85	1	James	Other
+a02f06fd-4296-487b-8106-a778e1ba763f	1	James	Other
+a02f68a3-c6aa-4729-b54c-552a5bb0c358	1	Other	Other
+a02f7f15-9266-4621-bcf1-499ab3ba09ef	1	Other	Other
+a02fa15e-9a88-4ba2-9eb4-352c53bdc893	1	Other	Other
+a02fbdcb-8ce0-4984-ae8d-455c8a508653	1	Other	Other
+a02feaba-6b59-44a5-92a0-e48fbd415499	1	Other	Other
+a030488a-cd42-42d0-bb1a-d518b07dfa0b	1	Other	Other
+a03051ad-baf7-487d-ac90-0092cb34d931	1	Other	Other
+a0305d0e-d919-4aac-9ffa-6501116819d8	1	Other	Other
+a030cb30-a8d2-4cf6-9b4d-4a511e3971da	1	Other	Other
+a030cbe8-14e2-4849-b458-e401f5e2bde1	1	Other	Other
+a030d131-d749-43f5-8da2-d5c55d6acf70	1	Other	Other
+a030f279-638d-4c26-b90e-c5c5bc4c74fd	1	\N	Other
+a0310756-ffc7-405a-8df8-331c2fddfdf9	1	Other	Other
+a03158ef-9552-497f-abd8-e4220855b3d5	1	Other	Other
+a0315c57-7fc8-4115-815f-99737c580b2c	1	Other	Other
+a031abce-6a60-4541-8069-01c715e239d8	1	Other	Other
+a031b235-8f48-4038-a288-681c40a05c60	1	Other	Other
+a031d5ae-8db5-4935-9c37-869303dba962	1	Other	Other
+a031d82e-6e77-4dc8-a531-d08dee4a0e14	1	Other	Other
+a031e7d7-a6cf-4eef-b446-e103cb8a9b9e	1	Other	Other
+a031ed00-2366-4abe-8b5d-b74acfb20ba0	1	Other	Other
+a032148b-e933-4385-ad54-e6ae3ec2bf35	1	Other	Other
+a032246e-fb3f-4297-9436-23ad783032b0	1	Other	Other
+a0325264-8731-465b-be8c-abad1d9d7c2f	1	Other	Other
+a0326d47-9eff-4c1b-94d5-8232a2d6d55a	1	Other	Other
+a032767c-4abe-47c9-9bd0-69176e20f4b8	1	Other	Other
+a032d154-1cfa-4d6f-b58b-b34aca087b8a	1	Other	Other
+a032e8b4-6ce8-4265-957e-0823c580618f	1	Other	Other
+a032f3b1-e86a-4a0b-ae15-69c09f6619c2	1	\N	Other
+a03402fc-1335-4aa4-be17-ba74830e90b1	1	Other	Other
+a03407aa-1ae8-4ef5-8d90-e7084cbe4ca5	1	Other	Other
+a0340a83-584e-4010-a107-8129fb820be7	1	\N	Other
+a03436dc-7f57-4ed4-9cb3-40ecc136e9c0	1	Other	Other
+a0344985-2438-4a09-a008-37ace8c8b17a	1	Other	Other
+a0347692-a8ed-40f7-88d1-58ebcbf38d16	1	Other	Other
+a034790d-7679-47d3-8bec-6dd632c58d4e	1	Other	Other
+a034c099-2909-44f3-b3a7-b44637144280	1	Other	Other
+a034e4c8-f577-413c-8310-5b0ce50727a7	1	Other	Other
+a034eb49-8ee9-4ac3-ac6a-053d7da0bdb0	1	Other	Other
+a034f3bb-7f87-4e56-8820-e0115582fe88	1	Other	Other
+a03555e5-9e5d-492c-81a3-215c091c3e09	1	Other	Other
+a0356e6a-74fa-442e-bb7e-f317b8be6654	1	Other	Other
+a0363b94-81c9-4787-a7cd-05f869b0d540	1	Other	Other
+a036d0ed-591a-4793-b127-2b1416f70b1b	1	Other	Other
+a036f546-b855-4ac5-8c47-5d15dfcc8d79	1	Other	Other
+a03705e2-5559-4569-acfe-7abd9499ea5b	1	Other	Other
+a0370606-8202-4bee-aa31-c89d8859fcd8	1	Other	Other
+a03742fe-1e60-40f9-9926-556e98c28593	1	Other	Other
+a037d063-f4d6-4137-bedc-27eac96242a8	1	Other	Other
+a037fe5d-54e9-4ce2-a318-a3c8bcc29e02	1	James	Other
+a0386691-de7b-44e5-a476-c717a0db95dd	1	Other	Other
+a038793b-cc7e-4d9a-95c6-97113d601b98	1	Other	Other
+a03885b2-992c-407c-8a6e-69453dafd69c	1	Other	Other
+a038bf01-5dfb-46df-b61b-2d10aa2857fe	1	Other	Other
+a038e2af-29a6-49b9-8c7d-a0425decfce3	1	Other	Other
+a039235f-968a-4833-a6eb-11f1afdf58a8	1	Other	Other
+a0398cb4-3f50-40ca-9116-a75c9f42d133	1	Other	Other
+a0398e7e-cd83-401c-8300-19ac8e92fb07	1	Other	Other
+a039e157-2add-4b74-956f-654e61fd1181	1	Other	Other
+a03a0e90-480b-456a-9ab6-19ceb04f8816	1	Other	Other
+a03a2929-01a0-45ab-b9c7-f8e602ddd3ac	1	Other	Other
+a03ab58c-1bb1-428a-833d-1d2a04028192	1	Other	Other
+a03ade9b-dd30-4506-975d-9ad19de895d3	1	Other	Other
+a03b1a47-aaa0-45b0-b2b6-d7948fd8ae93	1	Other	Other
+a03b9f72-5714-4961-83e3-42e9817752cd	1	Other	Other
+a03ba9c8-8980-11e7-b903-fa163e8624cc	1	Other	Other
+a03bcacf-64af-4ebc-bec2-05dd05c85fa2	1	Other	Other
+a03c3f77-160c-418c-983b-811d7d8cf454	1	Other	Other
+a03c6e66-6e14-4b78-9d30-940dd7aaac06	1	Other	Other
+a03c826d-c1bd-46aa-8872-b141d3e62277	1	Other	Other
+a03cbe31-bdea-4e11-a6ae-eea9c474445f	1	Other	Other
+a03ce495-2b76-4eac-84e3-aa00e9077434	1	Other	Other
+a03ceecc-c3f3-4631-a1c9-f99f0e29a785	1	Other	Other
+a03d2966-37b5-4f79-8eaf-8208eb7c15c9	1	Other	Other
+a03d84db-d9c1-4835-8c55-05eaacf2f437	1	Other	Other
+a03d9221-ec7b-47ad-bd50-20a4089e8117	1	Other	Other
+a03da93d-5b0e-4da8-96e0-829091645209	1	Other	Other
+a03db339-b1e9-4767-be4b-0f7b6e572be9	1	Other	Other
+a03e188e-1765-4cf4-818b-ce31ca65d206	1	Other	Other
+a03e6f3b-756c-4165-b3f9-d407439a6a53	1	Other	Other
+a03e8091-5961-4e88-9605-6beb7d296eab	1	Other	Other
+a03ef3d7-b8ac-4597-b66f-dae5d309cbe0	1	Other	Other
+a03efd37-7e2e-4c57-9521-9ac499c6964a	1	Other	Other
+a03f2950-7e9a-416b-87dd-a4a8757ae66e	1	Other	Other
+a03f303b-c737-48ec-a4fc-a42613288c19	1	Other	Other
+a03f4066-c0e3-46d3-b946-dba4855d9258	1	Other	Other
+a03f45ed-6beb-4dd3-b363-770e883286f4	1	Other	Other
+a03fd36b-7518-4c49-b61c-4e62768a51f5	1	Other	Other
+a03fe58a-b77d-43c8-9446-53769cfa9214	1	Other	Other
+a03ff67f-3680-4ba4-a532-c9ca84525d6e	1	Other	Other
+a04042ed-a6df-4210-a31f-a2d2e1b8b89d	1	Other	Other
+a04073db-b2f1-4b3f-971e-07856320213a	1	\N	Other
+a0407780-6c06-4c69-b463-50e5761266a2	1	Other	Other
+a0409f24-93a7-11e7-9ae1-fa163e8624cc	1	Other	Other
+a040dde6-efbc-477f-8895-d5e1e930f737	1	Other	Other
+a040e385-80e0-4540-9304-ab7b3308b52d	1	Other	Other
+a0410083-59de-4d9b-9b95-094e79317c0c	1	Other	Other
+a0411727-0219-4746-a850-f23ba506ae1d	1	Other	Other
+a0412c71-47e1-4b19-a2cc-fb1c5d7c15da	1	Other	Other
+a0415c92-3b81-46fa-9387-3e909beb3312	1	Other	Other
+a041853b-3220-4102-acc0-4c12d6548a44	1	Other	Other
+a0419e1e-a663-47cd-9f28-0149d0eb5da3	1	Other	Other
+a041b4cb-b9dc-4ae2-9bd6-f3d4e79a7d1a	1	Other	Other
+a041e38a-f09f-4ed5-baca-4c7a32b48a63	1	Other	Other
+a0422c63-9f27-4f57-9eb3-81ef7d5e9239	1	Other	Other
+a042efca-c5c3-41c4-82f3-a7a62a5a5b4c	1	Other	Other
+a043357c-ec57-4532-8732-b1e4fc510105	1	Other	Other
+a04347f2-02ec-4909-976f-d19d630f7262	1	Other	Other
+a04354e3-557e-4c4f-88b0-c1f989df2db7	1	Other	Other
+a0435711-6e2c-42cf-ad0c-e5108979dbe6	1	Other	Other
+a0435886-8ec2-41a7-96b6-c6f9c91bb32c	1	Other	Other
+a0437739-20d1-4557-a272-c51203092c72	1	Other	Other
+a04380ab-ce14-4384-b580-16593489c706	1	Other	Other
+a0438c00-4dc5-4276-81bc-1aa1f707d75f	1	Other	Other
+a043ae59-6e0e-4a9d-83f5-b19f7e74c6d1	1	Other	Other
+a043bc97-dff4-4d16-8c4e-80e8522f086a	1	Other	Other
+a043c6d4-2038-4feb-ae49-460f6f7728d2	1	Other	Other
+a044246f-4c12-47d3-8669-6bd4ca8c7de2	1	Other	Other
+a044c813-5ac8-4c22-97cc-a2dad1710644	1	Other	Other
+a045e924-a2f9-4cbc-b728-0ae447b8e008	1	Other	Other
+a046026e-c81a-44ff-b24f-0181895fa7d0	1	Other	Other
+a046698e-5a13-4af2-bcc1-1403f34c0490	1	Other	Other
+a04671cf-fefb-4412-920e-43473932a64a	1	Other	Other
+a046d392-9dec-47c9-97f6-c7e6da1341ce	1	Other	Other
+a04764c8-3964-4fc3-be68-16438a850562	1	Other	Other
+a0478714-3660-4c60-8dd1-22a6835729f0	1	Other	Other
+a047ab7c-3613-4daf-b733-2d31798ec37f	1	Other	Other
+a0480255-2506-4f46-a9f2-2a6e6eb4a8ed	1	Other	Other
+a0483f9a-69af-47d8-a5f5-76dfb3090a31	1	Other	Other
+a04878ca-3900-4e2b-b10a-187e1b6fd106	1	Other	Other
+a0489e19-209a-4e7e-9dad-804e811f9719	1	Other	Other
+a048ee4a-a6e1-4998-ab9a-1ac202892609	1	Other	Other
+a04915af-a3ab-4e98-96fa-75971341918b	1	Other	Other
+a0491626-77fd-443a-a89d-8bd1b6a26623	1	Other	Other
+a04933f6-103e-4114-a212-b96f3ac1e36b	1	Other	Other
+a0493ad4-aa4b-44a1-80cd-87ffc58b1c7e	1	Other	Other
+a049438a-f3fe-45fd-b663-a3ea1643f182	1	Other	Other
+a0494810-005a-4321-ba09-b53ad29b79ed	1	Other	Other
+a0497074-d3cf-4b45-8fef-bb78b798f22c	1	Other	Other
+a049e303-5f90-4ddc-9aae-b6409e6a0de7	1	Other	Other
+a049ff83-ce35-4053-8a38-922c5ded89b1	1	Other	Other
+a04a0273-ca75-440a-b55b-ec9aa5c76460	1	Other	Other
+a04a0547-29d7-405d-8602-23e02a38c4eb	1	Other	Other
+a04a1fc2-4066-499c-8b4e-07727a758802	1	Other	Other
+a04a24c0-dacd-4555-8b1b-cbfeb727747d	1	Other	Other
+a04a3f03-0c20-430f-b33a-abdbab728e34	1	Other	Other
+a04a43f6-840e-4bfc-a25b-e186114d7cb8	1	Other	Other
+a04a61b3-f039-48fe-93d4-8f9583366063	1	Other	Other
+a04a62a0-82a6-4efc-9df0-f271cd7046b2	1	Other	Other
+a04aa2bf-f49c-4d89-86c1-c01c2cc38e2c	1	Other	Other
+a04ab935-3f3d-4a94-b106-f77d712ab6f4	1	Other	Other
+a04aba87-21d1-4aa3-8d7c-a296367cacb4	1	Other	Other
+a04b0000-73eb-45a5-9f49-a573618b9999	1	\N	Other
+a04b44f8-d8a6-443b-9f20-c9e909a58341	1	Other	Other
+a04ba2b5-bd38-4cfb-a528-db1884bee8d6	1	Other	Other
+a04c0e51-a283-49db-9ca5-e66474181110	1	Other	Other
+a04c28b1-654d-47dc-8f76-8d995eebdc62	1	Other	Other
+a04c6f8e-fddf-4c82-b465-ad86d6bf9d06	1	Other	Other
+a04c7e5c-8ff1-40f4-8c1b-792b95c1d178	1	\N	Other
+a04cc572-5254-48a6-9c0a-3b553de914b2	1	Other	Other
+a04cd8b1-ef97-43a4-b742-da66e6f123d6	1	Other	Other
+a04cfdc7-8705-4d5f-a5e6-6ea76f05050f	1	Other	Other
+a04d51b3-e322-40f8-8dec-191cef88960f	1	Other	Other
+a04e2eb0-feaa-45df-811d-1db0f208006a	1	James	Other
+a04e494a-18a1-441f-93ba-8fb9a9bde4f2	1	James	Other
+a04e63dd-ff88-446c-a06a-a96f9f82ae4a	1	Other	Other
+a04e67ca-135d-4a0d-9fc7-4f5cae6ce4a0	1	Other	Other
+a04e685c-9dde-4565-ba73-ccc65c74c87d	1	Other	Other
+a04e9774-a938-4208-89d1-f8d9a5072f26	1	Other	Other
+a04ebeed-ce2e-472f-abd5-4c1c88b9db9f	1	Other	Other
+a04ef24f-a6a0-4704-b4a6-f02b02593b63	1	Other	Other
+a04ef773-82b9-4a1b-bd3c-3c1c630368a6	1	Other	Other
+a04ef9c2-8394-41c8-8304-69845ddf77e4	1	Other	Other
+a04f2c01-1fea-4e72-a821-a5e2f99bce95	1	Other	Other
+a04f5b76-9a3e-4b08-a441-198512624cb2	1	Other	Other
+a04fe342-dda5-4adb-b329-a50989141bd8	1	Other	Other
+a05080d4-21a8-4963-a7b9-96c98d557843	1	Other	Other
+a05094c0-18a8-4558-90c3-b9dee5880038	1	Other	Other
+a0509939-8868-43d9-8f2f-aa84eff4d821	1	Other	Other
+a05099a2-a2c0-4bfc-9bd5-f4fe26d22ba7	1	Other	Other
+a050af63-10fd-49d1-bf25-7ec5cd5393de	1	Other	Other
+a051032b-187d-4443-97a0-634665595e7d	1	Other	Other
+a051267b-d95e-473a-be6c-354b5f5ef683	1	Other	Other
+a051448c-f201-4fea-b040-0f0d64d4ced5	1	Other	Other
+a0515c74-e021-4ece-b79b-1288e9fee20a	1	Other	Other
+a05170cf-44cf-4f5d-87db-706ae61fc854	1	Other	Other
+a0519b07-ba60-413f-a4fc-e086f195d634	1	Other	Other
+a0519c31-46d0-4d27-b944-8bacd23a5e9a	1	Other	Other
+a0527127-84f1-412c-a104-c42593774834	1	Other	Other
+a0527960-9f47-4573-a1c1-e5a01ef81357	1	Other	Other
+a0528464-b92c-42d5-9798-c6d9b5d78d2e	1	Other	Other
+a052a40d-2a4e-4fee-9c95-17bd67322151	1	Other	Other
+a052a7c2-1fa1-4076-8efa-a63d10e7dd57	1	Other	Other
+a052d6e6-5509-46d5-b455-b3a9e04891f7	1	Other	Other
+a05309d4-a21b-4d7c-8cfe-a4efc2a673fd	1	Other	Other
+a0531539-15f5-4961-9162-a970c210a54e	1	James	Other
+a05326cd-43c4-43a7-a7bc-12a8921b307a	1	Other	Other
+a0534abd-f4b9-4e76-b818-ec5c6f818ae6	1	\N	Other
+a0535153-2db7-4a14-942c-ad9e7a4d7c37	1	Other	Other
+a0535fd1-2a9b-4cc6-9e41-86d2feb7fc95	1	Other	Other
+a053c981-7a21-41c3-9b8e-4da7ee489349	1	Other	Other
+a053d4ab-dbac-4639-b147-2a6f7ca83fea	1	Other	Other
+a05427dc-9dc2-4eeb-b5af-f5a11fd2e9f7	1	Other	Other
+a0546d5b-9ece-4e22-8f5a-b4f912560780	1	Other	Other
+a055060f-510c-445e-914f-35ef1daa3062	1	Other	Other
+a05575ec-5c36-4332-8a1d-4cdb1bb1503e	1	Other	Other
+a055af4a-647b-4e39-88b6-57d9dbef94ad	1	Other	Other
+a055c907-38a8-4d09-8d36-a5beaedb6a33	1	Other	Other
+a055f2c1-f68c-49bd-a632-fef88c1e9b86	1	Other	Other
+a0560182-4372-44cb-a269-411900064e0d	1	\N	Other
+a056bea6-de24-45ef-9986-d1d2982ba561	1	Other	Other
+a05775f4-ccb3-4324-9452-644a940c1e16	1	Other	Other
+a057b99e-1821-4a96-9364-105bbe11e4cc	1	Other	Other
+a057bf55-f6cd-4cec-b917-af3253f44465	1	Other	Other
+a058ee70-b977-4789-b642-68713c39c8d0	1	Other	Other
+a058f62b-0e8e-4ee6-8a44-43edd8dab41a	1	Other	Other
+a059444f-f8ab-4d29-a00a-7edacf004ad4	1	Other	Other
+a059625b-eae0-4ecc-ada2-36de8aa6d1a5	1	Other	Other
+a059653c-2f20-4d32-8db4-f08d2e3d53c8	1	Other	Other
+a05972b6-7148-4242-80d1-468cce66aafc	1	Other	Other
+a0597921-714a-4255-b7e8-c3bf8468d4f4	1	\N	Other
+a0597ade-63ba-486d-a68d-754b33a1a19d	1	Other	Other
+a059b80e-c4d3-4f73-9a40-be490a24da4c	1	Other	Other
+a05a1c62-4133-433d-bbf8-752da84e1135	1	Other	Other
+a05a1ead-0d06-49e8-abee-26d778aa0d7d	1	Other	Other
+a05a526f-6cba-460f-8930-d9c07b0dd9f0	1	Other	Other
+a05a6d59-a360-4941-a722-0b98924ebc7d	1	Other	Other
+a05a8c62-db90-43d4-ba35-19f1fea33d92	1	Other	Other
+a05b3e1e-e42f-4da5-babb-b2cdd6843d08	1	Other	Other
+a05b78f9-a4c6-4922-9363-16436ae218ba	1	Other	Other
+a05bccc8-1000-431c-8ead-68e507e2cdc6	1	James	Other
+a05bd64e-44f9-488d-a840-43beff3cf753	1	Other	Other
+a05bd6c7-df68-4565-ac5a-c0ba1ae4490d	1	\N	Other
+a05c004b-0eb0-47b2-adf1-8ccd72ff7578	1	Other	Other
+a05c20ea-3b17-47af-969f-5e4de9884c2b	1	Other	Other
+a05c4068-5575-4a49-934d-026df7785bee	1	Other	Other
+a05c442c-3bb4-48af-a305-91e29fdb1b1b	1	Other	Other
+a05c7915-12e3-44e6-8e4d-5b075c549418	1	Other	Other
+a05c8307-7b59-40ed-a15f-884aa18c330a	1	Other	Other
+a05c8ee2-68ad-422d-965d-7277f3e3524e	1	Other	Other
+a05cec9e-2ac2-4c4d-8f67-88c0ef6e9844	1	Other	Other
+a05d18e8-65fc-499d-879e-7f36d765caed	1	Other	Other
+a05d3d8b-725d-4fc3-b7de-5a687605072f	1	Other	Other
+a05db7ab-cfa7-4329-bff4-e09d39df5e7d	1	Other	Other
+a05dc616-320c-43db-8bbc-7fcc9af6cb05	1	Other	Other
+a05df77f-cbf9-4d40-8e9b-23b7f35719ef	1	Other	Other
+a05e046b-3a21-4c4e-a0b5-c18ffeb43bc8	1	Other	Other
+a05e5f4c-8391-4c31-b66a-f4d0fdc6cc59	1	Other	Other
+a05eabe2-fb93-402f-9cc5-732f657150c9	1	Other	Other
+a05f0a80-7df1-4b78-98a5-d18eb504aff7	1	Other	Other
+a05f145e-7f0f-4b35-bad4-8dfcdc4a353a	1	Other	Other
+a05f222d-5ac3-47ac-a69a-19a95a835839	1	Other	Other
+a05f2d3f-54d3-4cb0-91d8-ed7f9450d0f0	1	Other	Other
+a05f3866-4aeb-497a-af69-f36c78b0b917	1	Other	Other
+a05f61ad-fe1f-413e-a29b-dee2111812b8	1	Other	Other
+a05fefd0-367c-4a93-964b-0cfc90eab2f9	1	Other	Other
+a0600cd9-d540-48c3-ac36-e6d3c2852313	1	Other	Other
+a060198c-9dca-4190-a322-4ada8833226f	1	Other	Other
+a060372e-1ad8-42fc-ac4f-aa38371a6c82	1	Other	Other
+a060c80d-d6ae-4e29-9d40-136712a091f8	1	Other	Other
+a060d698-87b8-4f06-af88-ad4257ea7cf6	1	\N	Other
+a06155f5-3f73-49a3-afc5-a2a5a9142d5f	1	James	Other
+a06199ae-b0be-4d32-8826-69338dd87ea3	1	Other	Other
+a061ef80-657b-49eb-8a35-065a6943468e	1	Other	Other
+a0624862-5d71-419d-b22d-94c03893e188	1	Other	Other
+a0624de0-d432-4c92-870f-d21deac78a5b	1	Other	Other
+a0627824-4006-45fd-8d12-3cdcd5a47582	1	Other	Other
+a062a28b-5026-4214-b518-d587cc510e49	1	Other	Other
+a062b0a2-d39a-4b9e-9997-6a0cdc135ada	1	Other	Other
+a062bb41-b0c6-407e-8348-5e6f25f6722a	1	Other	Other
+a0631170-2381-4723-b8f3-f5eace4fad7e	1	Other	Other
+a06337d2-bf34-4655-84f8-7490c342a9b4	1	Other	Other
+a063654e-962f-42e0-8f1d-b2ac23b70c5b	1	Other	Other
+a063911e-6f81-42e6-9877-e822f71cdf2a	1	James	Other
+a063960a-7b5e-4974-ae31-193371f0de53	1	Other	Other
+a063d021-8e97-4ce7-9503-2b85c4184f45	1	Other	Other
+a0644c2f-1f2a-47c0-983c-b56f38206054	1	Other	Other
+a0647dda-6407-4eaa-92e0-9140b59d87be	1	Other	Other
+a06482fe-9619-4dd6-ac64-5faadead20ec	1	Other	Other
+a064a836-9cb9-40ee-bbc6-55bbb6729e6a	1	Other	Other
+a064b621-4498-4bab-998b-066b18cfb20f	1	Other	Other
+a0651e71-9d35-4acd-9963-ff725c31fe02	1	Other	Other
+a06526c9-3388-41f7-940a-0d7fc723d3cd	1	Other	Other
+a0655753-32bd-4604-a7b8-b63282b6cdda	1	Other	Other
+a0656f0c-4595-4f9f-bc21-57bd6e6ea4a2	1	Other	Other
+a065869f-670c-40ea-9168-4261f3207e44	1	Other	Other
+a065aece-23d6-43f0-8f5d-55b44876300c	1	Other	Other
+a065bca1-e1b9-4aac-b7c7-7e8b133e8609	1	Other	Other
+a066040c-8779-4b0c-ae81-3ddde9ec2481	1	Other	Other
+a0662295-0183-459d-9914-cb07fd7d9e65	1	Other	Other
+a066673c-3cc0-409b-99d2-2c03fe2fd702	1	Other	Other
+a06688b3-216b-4a16-bb3a-11c4d1e1ca06	1	Other	Other
+a066b00a-11d8-4b32-b9ef-5d21a041fa8a	1	Other	Other
+a066c06f-848a-4ac1-b5cf-04b262d033d6	1	Other	Other
+a066c38e-488f-4f51-a550-7af2dae64b45	1	Other	Other
+a067180d-d2cc-4670-b695-1b0eb2507e5d	1	Other	Other
+a0672037-cf4f-405b-9d4e-7d2581e09fa5	1	Other	Other
+a0675084-0af7-4fc3-bd5b-b002204adc83	1	Other	Other
+a067688f-8efb-4acd-b539-4d253a2f42c8	1	Other	Other
+a0678c65-2f82-4836-9d76-2c3d43a22834	1	Other	Other
+a0679a2f-3e3a-4314-ba46-a8d8aad7c3e0	1	Other	Other
+a067f511-5929-4fbe-9e85-11a7c2baab97	1	Other	Other
+a068276f-089f-4dac-84e4-b4ed171edad1	1	Other	Other
+a068298d-8865-4988-93a2-543ad08247d9	1	Other	Other
+a06847fe-145e-4f5d-93a4-8ca57bdabc9d	1	Other	Other
+a068548c-903c-49cc-8494-eb9831893625	1	Other	Other
+a06859f8-0976-4063-8ff4-79abec4b5355	1	Other	Other
+a0685fd0-0991-4c0d-9edd-c2756acf8075	1	Other	Other
+a068629e-42a4-4d80-addd-bae43d9f0ab6	1	\N	Other
+a06885d9-76c3-4675-bdc4-fbdcf861df87	1	Other	Other
+a0688a60-42ad-4e5f-a138-f11d0838bff6	1	Other	Other
+a0688d7d-c6f8-4768-aee5-7bce3fbd9809	1	Other	Other
+a069268b-9751-41d0-9cd6-1a85a6dead48	1	Other	Other
+a069564f-e338-4433-ac4a-62d48f43ccb9	1	Other	Other
+a069dd6f-6964-407b-a364-b56e6faeb916	1	Other	Other
+a069f16f-7f65-4553-b027-a5c78f7da2f4	1	Other	Other
+a069f695-1b34-4c4c-aefb-f2e58372b401	1	Other	Other
+a06a3ca7-2222-423a-9376-c1b1846991c8	1	Other	Other
+a06a49f6-9063-4256-9716-d032e8ba8dc2	1	Other	Other
+a06a6408-3523-418d-9e58-1c107d3b0c43	1	James	Other
+a06a6dc7-716f-488d-a412-9528ab57d20c	1	Other	Other
+a06a739d-3656-4339-a024-997d5f2b5fd8	1	Other	Other
+a06a9e0f-dbb2-4447-bd4d-f030265b3d9a	1	\N	Other
+a06acaf6-3e58-4429-8019-e7c95fd04786	1	Other	Other
+a06afcf3-09d8-477c-a857-7e31bcc50d84	1	Other	Other
+a06b0865-3539-42c2-978b-6ee5d0269085	1	Other	Other
+a06b10c2-1b65-443a-80a1-3d521bbd6d05	1	Other	Other
+a06b1306-5fbb-4420-a2a7-600997b32158	1	Other	Other
+a06b2742-e696-43bc-a4ec-4d8cf2d4098c	1	Other	Other
+a06ba22e-435e-41af-ae35-2cb5b9e9f9c6	1	\N	Other
+a06bb2c5-4025-4cc9-844b-045f1d68fc3c	1	Other	Other
+a06bde61-d584-4dd5-a0c2-8dbe608503f6	1	Other	Other
+a06be3e0-2864-4182-b7d9-e5e63499f2d2	1	Other	Other
+a06c346b-206a-42a5-8401-ec82223da79e	1	Other	Other
+a06c4d4f-770b-4f44-8326-444c4f0ce859	1	Other	Other
+a06c6e12-761a-4557-8868-84e359470ab3	1	Other	Other
+a06c708d-e1f7-4b5a-a467-21249e4d5c50	1	Other	Other
+a06c7ccc-fb40-4646-95f9-855ee0b05323	1	Other	Other
+a06c8520-247c-4a06-bd64-d249efaa2c4b	1	Other	Other
+a06d83a6-2560-4464-8346-2e4182e49cab	1	Other	Other
+a06d976e-02d9-4505-92bd-9227858aa07a	1	Other	Other
+a06dbe52-4197-4459-a5e4-46c10a5e24d9	1	Other	Other
+a06dccd2-bf4a-4d0e-81fb-849473574afd	1	Other	Other
+a06e0f0a-1464-464a-812f-67fc2b02e6ce	1	Other	Other
+a06e2843-a0d1-40f6-bad5-f55094ef3d61	1	Other	Other
+a06e84f0-28d2-4833-9571-0d21e1aba3a1	1	Other	Other
+a06e9ed2-2ee3-49f3-851b-faafdd1dec38	1	Other	Other
+a06eaeb6-9d6e-4c9c-b1e0-608a228a3317	1	Other	Other
+a06eb294-af86-4025-87a0-e9f95b7dafd5	1	\N	Other
+a06f18e8-c3d6-44e0-bbbf-e2c2b757c081	1	Other	Other
+a06f19ae-c7a2-442e-9e29-a94a5606f9cd	1	Other	Other
+a06f542d-79e1-483d-a26b-0ed00e3ddf24	1	Other	Other
+a06f58b2-c01f-44fd-b243-450d044850a8	1	Other	Other
+a06f5e47-c7f9-4220-aba0-b0d935b551d7	1	Other	Other
+a06fb4bc-f361-4dad-9b78-7cfbc3fc736a	1	Other	Other
+a0704941-182b-4f49-9a60-0ba7d32deeda	1	Other	Other
+a0704af7-4efe-45d5-b496-6517cfaf66d7	1	James	Other
+a070d6b4-db14-47de-8d6f-5c9339358234	1	Other	Other
+a0713d7d-094a-418b-a84a-d6aaa94c6075	1	Other	Other
+a0714943-044f-4ef1-84bd-53dafcfd8591	1	\N	Other
+a0714e65-84a9-43e1-9873-44f23f115aa0	1	Other	Other
+a0715a5a-ac56-4f1a-a5e4-81e2fddb3a04	1	Other	Other
+a0717f71-fbb4-4a36-bd01-021355fc0191	1	Other	Other
+a0718d36-eaff-4ba2-990c-6305ab1f4316	1	Other	Other
+a071a81d-cee2-4da5-b1ef-44c0d5221ca3	1	Other	Other
+a071ad0f-3f1a-4dbc-aadc-d0cff9e4f7c5	1	Other	Other
+a071eada-cb74-4b08-96b4-1f0b3832bb7a	1	Other	Other
+a0721f28-a61b-4f29-adc3-a6e97be9df97	1	Other	Other
+a0722384-64b5-49f7-9c40-fd5f45c5fc04	1	Other	Other
+a072665c-0ddb-467d-bedb-8222792a4a97	1	Other	Other
+a072b72b-5e43-447b-a96d-54f80368a54b	1	Other	Other
+a072bda8-efe2-4300-979c-00492b6ca1a6	1	Other	Other
+a072e25d-b6f6-4a39-b7a7-0f7324f0bc91	1	Other	Other
+a0731195-cd19-4edb-8f04-c4875619b3f7	1	James	Other
+a073144a-924d-41c1-be1b-d1845d456c91	1	Other	Other
+a07454e4-4bbc-4e3b-aa64-0e7a0fc52cb8	1	Other	Other
+a07456aa-4a29-442f-ab33-560ce5d0e9dd	1	Other	Other
+a07466df-e1dd-4d75-8393-789de43ae071	1	Other	Other
+a07471d9-4eef-4edc-9276-5d0436e47fd8	1	Other	Other
+a074ad5c-34b7-4ebb-897c-a94c60d3c410	1	Other	Other
+a074ea43-9d9b-442b-9a57-7ac0bf0cd0ba	1	Other	Other
+a0759c40-ad26-4f54-bd8c-3f75eb35b94a	1	Other	Other
+a075c787-5b30-41ef-aff5-15adc738f520	1	Other	Other
+a075dc62-bbbb-43fa-b183-18acc180cc40	1	James	Other
+a075f1be-5b76-4e14-b197-49f09f5e0604	1	Other	Other
+a0760638-8574-4034-a489-1a44f227fb63	1	Other	Other
+a07686e0-b0e4-454f-ab1c-ea00c8f507bd	1	Other	Other
+a076897f-48f6-4148-a82d-30e14a3d54f0	1	Other	Other
+a076c01e-d812-4371-b760-1ff6c08ffd12	1	Other	Other
+a0774ebd-c174-487c-aab2-fa48139e9777	1	Other	Other
+a0776d0a-9a77-4779-82e9-84070bd414f0	1	Other	Other
+a0777d5c-b617-4434-aa49-74e891057168	1	Other	Other
+a07794ce-54e7-4f32-b8ef-b532f613f653	1	Other	Other
+a077aff8-1b04-4ff2-985e-65a57f7f5dfe	1	Other	Other
+a077c4b4-124d-4a90-92d7-23af4768dee0	1	\N	Other
+a0780a6f-af2a-465a-9402-d8e83d8fb99e	1	Other	Other
+a0780cd5-120d-48ae-810d-77aa83f31f32	1	Other	Other
+a0781a74-efe9-4ed2-91cf-9776f023d46f	1	Other	Other
+a0781f97-cce0-4032-aa9f-90ebe3e8277d	1	Other	Other
+a0788b82-181a-4134-8fd0-012aeaf05c94	1	Other	Other
+a078da41-2f0b-4e4c-b4e1-89a9f0206c22	1	Other	Other
+a078fefe-d7d6-46e8-a220-c2b3217d5367	1	Other	Other
+a0790233-0656-416e-9073-510f86821504	1	Other	Other
+a0793482-f331-49bc-9cd2-cdb31c8f3ed1	1	Other	Other
+a07977cb-a408-409a-9eff-9de0e4317c22	1	Other	Other
+a0797a1c-b33a-11e7-b658-fa163e8624cc	1	Other	Other
+a079ab21-f797-478c-a050-8374b5eaf059	1	Other	Other
+a079fef5-a008-45aa-ad8a-90c0d10eef2b	1	Other	Other
+a07a00f2-287f-4616-9833-9d99ffa80a1c	1	Other	Other
+a07a03c8-c911-43c8-adb5-aac13f59aa9c	1	Other	Other
+a07a197d-de09-4fca-97a9-a919dc94a200	1	Other	Other
+a07a3368-baca-4708-905e-d0344eee383e	1	Other	Other
+a07a5e6c-2847-40b0-8a81-35b2e82f0e41	1	Other	Other
+a07a6577-9015-4a8f-af5e-97f248c906b5	1	Other	Other
+a07a7a07-3ac1-423b-aa2d-27452527d7fa	1	Other	Other
+a07a831c-1a72-4fee-9c3a-54f5edb6be82	1	Other	Other
+a07a93f8-f7a1-4027-8e07-2d78560bc89c	1	Other	Other
+a07a98c0-677d-4dbe-8d83-4066338da2ad	1	Other	Other
+a07b1fd1-6ccc-498b-b2ec-6300825fd4cd	1	Other	Other
+a07b2adf-8f84-4961-9c26-3c1587b49058	1	Other	Other
+a07bcdef-9e49-40bb-8b42-c29c67dc8724	1	Other	Other
+a07c40b7-8ac4-4cd7-973c-ecbc736688a9	1	Other	Other
+a07c7647-60a5-4d35-a235-e53f3e8ae1f6	1	Other	Other
+a07c7e84-2175-4cfc-b73e-050d9942baaf	1	\N	Other
+a07cb5e4-cfee-4a44-b399-4abf69fcb058	1	Other	Other
+a07d3490-55fe-49eb-bcf2-1de6d3bbaf33	1	Other	Other
+a07d4b5b-0f94-45ee-a200-21003d7ea982	1	Other	Other
+a07d4f0f-daee-4f59-bc32-de69597c2827	1	Other	Other
+a07d5456-739d-464a-8323-6cbe065d4d3e	1	Other	Other
+a07d5994-bd24-432f-b286-b1686da4364c	1	Other	Other
+a07da145-bd32-41cf-9f73-2c386c1bb62c	1	Other	Other
+a07da6a2-5e12-44ae-9f24-c935ec8ae211	1	Other	Other
+a07dabff-0f63-4a29-8a5a-d1f34811dfd1	1	Other	Other
+a07dc590-6449-41fe-8b77-8757a3c10b20	1	Other	Other
+a07df07c-552c-4f65-bd4e-ba292a1ce312	1	Other	Other
+a07df132-b6ce-4a08-b87b-7a9497a34433	1	Other	Other
+a07e0fed-d273-45dd-ab7a-3444e4eadc6c	1	Other	Other
+a07e16da-0cbc-464b-b96c-379eba6e6b38	1	Other	Other
+a07e91fb-cf20-47a0-8b5d-be39bc156196	1	Other	Other
+a07edb50-2418-485f-ab35-6745d3d358b7	1	Other	Other
+a07f0ab2-1d1c-4a3a-bcad-6ba5a9f08284	1	Other	Other
+a07f316b-7d6a-4ea9-bc64-c66844973cd1	1	Other	Other
+a07f3889-08e4-48e5-9708-19dd5a278032	1	Other	Other
+a07f6dd1-5302-447b-b68e-a3ed7ae15eb0	1	Other	Other
+a07f99ee-7c04-41e0-adc4-ae3e622a5fee	1	Other	Other
+a0801e96-931d-4957-b6db-98b6b911391d	1	Other	Other
+a08024b9-2a05-4644-aab2-9dad92e68e7a	1	Other	Other
+a080274f-3856-4520-90cc-50cd77f3c592	1	Other	Other
+a0803cdd-be22-4eb7-bdfe-9de2780df72c	1	Other	Other
+a080b1de-119b-453a-ae33-a6747149b8d5	1	Other	Other
+a080df19-4383-423e-8928-22e343eb7023	1	Other	Other
+a0812ae2-0c24-4d94-96d9-e8b0285cc2cb	1	Other	Other
+a081418e-efb0-40be-9b10-84f6aed56150	1	Other	Other
+a081cb70-885c-467e-88a5-3c5870292131	1	Other	Other
+a0821673-f60f-46fa-9802-57c4beddc42e	1	Other	Other
+a082428c-35b1-4ef8-aaa7-fa8174902918	1	\N	Other
+a082fa75-6d64-4707-b283-72105c383e12	1	Other	Other
+a0832db7-26c1-4b04-a809-f13c3ec5ad56	1	Other	Other
+a08359a7-753c-4087-bbed-987123663d07	1	Other	Other
+a083ac19-39e4-48ff-97b0-ceb74dfc234f	1	Other	Other
+a083ee5d-1714-4f88-a8a4-c7ff9bf5f29a	1	Other	Other
+a0842c4b-f8c6-4865-8eb3-b93798592fea	1	Other	Other
+a0844d36-1d21-411e-a464-90247c8f42d0	1	Other	Other
+a0856cb7-1c6e-4b78-a6e2-c5861d63c02a	1	Other	Other
+a0856e6b-4f48-45ee-b255-69b399e13a8f	1	\N	Other
+a085742d-6f1d-4d3c-b316-1ef4251c0149	1	Other	Other
+a085cebc-8dd8-44be-8577-a6f1fe357a63	1	Other	Other
+a086473c-86f5-467d-808c-968c8b5f772e	1	Other	Other
+a08666bd-c532-487a-bf53-f97366306c06	1	Other	Other
+a086a3b8-6e14-4812-a650-d4fc326ffca1	1	Other	Other
+a086df3f-8295-4969-9138-260c3a714a37	1	Other	Other
+a086e4a1-e193-4df0-a8f7-abd0ed9899b6	1	\N	Other
+a08711a7-01e6-42ab-ba8a-14a82ee003f8	1	Other	Other
+a0871e50-dcea-4af6-a49a-68a90622a281	1	Other	Other
+a0873fae-9072-4d3e-b06e-d7816a64b8e6	1	Other	Other
+a087cbd0-6a97-4698-9f15-3608ba899820	1	Other	Other
+a0880c4c-cd31-4ccc-84dc-c7015991da52	1	Other	Other
+a0882848-29fc-4ea8-9563-d56cfa68e614	1	Other	Other
+a0882d08-36a9-41ec-9e73-6d4f036781e3	1	Other	Other
+a088853f-e204-477e-a635-f9cd660c2ddb	1	Other	Other
+a0889a88-9474-4fd5-8246-1b7b71096869	1	Other	Other
+a0891d61-9f34-41db-91ad-2131a9201351	1	Other	Other
+a0892080-5dfb-4316-88cf-5b11764c35e3	1	Other	Other
+a0892085-0e04-4e0d-ab85-ec01b0083060	1	Other	Other
+a0892c53-b106-4863-95cf-d77194000e51	1	Other	Other
+a089c15b-1a79-4f9e-9068-9a6cf7e0b737	1	Other	Other
+a089cee6-549d-4af7-bafb-c6d6a74a7c9c	1	Other	Other
+a08a0a88-f49c-46ed-b7d3-7621f7434cf1	1	Other	Other
+a08b2ba1-a784-4383-bfd6-674ace0821e3	1	Other	Other
+a08b7f95-4ecc-45f7-b195-670a6b5cafbf	1	Other	Other
+a08b94b3-4919-46c5-abf6-45b02b58a852	1	Other	Other
+a08b9743-f03e-4335-bd97-b2c99824c07e	1	Other	Other
+a08bac87-38df-40f8-87ee-87bfca4b096a	1	Other	Other
+a08becb2-4379-403d-a85b-01b4841cb858	1	Other	Other
+a08c0dc0-f628-46fd-b423-8a61ab70074c	1	Other	Other
+a08c21ae-f3a2-4cf3-b19a-2e0674bafb95	1	Other	Other
+a08c437a-7aa7-4b24-b492-af75512e8be2	1	Other	Other
+a08c4795-dc03-4c25-b999-ba5bf8995a32	1	Other	Other
+a08c5db9-931c-4e3f-8db3-0ab106c36aaa	1	Other	Other
+a08c6a0a-57b7-415d-8e24-cb92ccc5f7ea	1	Other	Other
+a08c71a5-67ea-4afc-81bb-2ee2d813c15d	1	Other	Other
+a08ccf43-43f8-4752-bae5-d48c28757be2	1	Other	Other
+a08cf7c2-3c63-4d48-8a3d-f761967ffc0e	1	Other	Other
+a08d120b-73b3-46a5-9196-69379f269405	1	Other	Other
+a08d45c3-6cde-48ed-9eb5-d3f2de4ac507	1	Other	Other
+a08d5769-00d5-4609-ac3d-78b2ef2c4b4c	1	Other	Other
+a08d79ca-c0d9-4091-9c72-7c1bfbb8176c	1	Other	Other
+a08da409-35ca-4cb2-bbd8-846d04b1a684	1	Other	Other
+a08daae6-691e-4c2d-8659-f0e33178f7bd	1	Other	Other
+a08dc998-1d42-4de2-9bde-c1143558bec2	1	Other	Other
+a08dcf62-38ca-4853-8fe0-e17ae5e4cdc2	1	Other	Other
+a08e2bf2-04b4-47ef-a2a1-b65985d82517	1	Other	Other
+a08e4297-e79a-4303-9290-6530aaace250	1	Other	Other
+a08e4358-ed9d-4b10-8809-65c24b7f19f7	1	Other	Other
+a08e51c5-1e1f-4e91-8fc1-07f7cf93448b	1	Other	Other
+a08e6f5e-3823-4e08-8b7f-79a289fc19f2	1	Other	Other
+a08e7fe1-13db-45e1-9804-bdd5b4210437	1	Other	Other
+a08ea3a2-ce8d-453b-bd0a-ba62c05ab386	1	Other	Other
+a08ec2d8-1ec8-487b-936f-8cd4a9da0fe4	1	Other	Other
+a08ecbed-9b6e-46fb-b401-d50c2cf32080	1	Other	Other
+a08f3510-5466-43e6-8837-a8cf05ff507b	1	Other	Other
+a08f77db-1fa1-410b-af1c-8c3eff029be8	1	Other	Other
+a08fe503-591a-4cd6-bc41-62dcb0d225d7	1	James	Other
+a08ff214-1d0d-40ae-a89b-fb21c98989c4	1	Other	Other
+a0900112-2837-4e7a-b357-3a32136e43e9	1	Other	Other
+a090874f-12a9-4c82-9e98-494cfb68ded7	1	Other	Other
+a0908bee-a86b-44a8-8103-783c010bd2b6	1	Other	Other
+a090b0d9-7a97-41f1-8b25-c161fead5b3b	1	Other	Other
+a090b387-d509-4577-99a0-fb595d40b9cb	1	Other	Other
+a090d431-9f67-4f97-925a-91b927bc206a	1	Other	Other
+a0911461-eece-47a9-8e5f-1feb3078a4ca	1	Other	Other
+a0915dfc-aa5d-4d7d-8071-fea3e8f32819	1	Other	Other
+a091cc1b-3505-450e-b4ab-f34d591ef2e2	1	Other	Other
+a091e11a-32b0-4e9a-9f61-05e1fc346cab	1	Other	Other
+a09203b6-d403-438f-bca2-2460c7d8313a	1	Other	Other
+a0920c02-1945-4b6a-8c79-9df883cec65d	1	Other	Other
+a09212f3-bc1f-42ce-b290-429de21f4adb	1	Other	Other
+a092355d-b7c2-4d77-9bb3-8718fd3e1fc0	1	Other	Other
+a0924ec4-8384-4734-ab67-a283c8f4d838	1	Other	Other
+a092e162-4fc4-495b-a0da-688cbae479ce	1	Other	Other
+a09338a5-d8c1-46de-bbf5-dd38fbf26415	1	Other	Other
+a093d4a8-5485-4512-bacc-9b18e0a49aae	1	Other	Other
+a093dfe4-9068-43ed-85ba-3da3baba3127	1	Other	Other
+a09400e1-803c-4516-9226-4113025a702f	1	Other	Other
+a0943e60-da5e-4588-9402-13a372c9601d	1	Other	Other
+a094690d-292a-441b-977a-5f6d8842e96b	1	Other	Other
+a09474bc-c598-4bce-8a4c-c39bf5a87c70	1	Other	Other
+a095041a-22f8-4fb1-84d2-f48be7be0ef1	1	Other	Other
+a095064a-d90d-4773-8e6e-1ee2d0d2bbd5	1	Other	Other
+a095365f-7b8c-4af8-bb70-3c0135269213	1	Other	Other
+a0953aab-7331-49a7-860a-afdca9423258	1	Other	Other
+a095449f-5b61-42d7-a668-8b85814e7fa3	1	Other	Other
+a0954ddb-de62-4adf-b034-3764b238baab	1	Other	Other
+a0954fa9-b10f-41a9-abca-5af219e4a9a8	1	Other	Other
+a095e256-831f-4dc4-8751-0143d6d23eba	1	Other	Other
+a0960195-fb00-4e54-b5e3-55c4ba4fce42	1	Other	Other
+a09633b6-9e97-4bde-b03c-a14f92381443	1	\N	Other
+a096766a-e5bd-4233-b8f2-b2bfa16f2935	1	Other	Other
+a09678b1-b8de-4805-a807-f84c38f0576a	1	Other	Other
+a096a1af-42f0-4278-b972-4a5f23988c25	1	Other	Other
+a096ac29-2b23-4c70-bdac-a3e0a1a94bbf	1	Other	Other
+a096cfc2-0047-4e3d-ace3-05ffbceef859	1	Other	Other
+a096f913-a8e6-4b38-9979-a1466e8daf4c	1	Other	Other
+a0972190-ae54-40f3-9828-612f7c4066fc	1	Other	Other
+a09737ec-e54f-4f30-b6b2-ac06fe37f8a8	1	Other	Other
+a09752c0-a8ee-4fac-9e14-a054e22426ea	1	Other	Other
+a09787af-db22-4dd3-ae5e-1e1c24e99379	1	Other	Other
+a097ae35-8091-4c29-ae9f-460982731f47	1	Other	Other
+a097ddc1-0391-46dd-8fde-f4e23139267e	1	Other	Other
+a0985066-19c0-48b1-80a2-0bc6a9fb94f3	1	Other	Other
+a0988671-2476-4945-a401-01c610e607b2	1	Other	Other
+a098903c-3ffe-4833-b24d-cc8a21d9497b	1	Other	Other
+a098bf96-56e0-4205-a71d-5ab0ebfeb22e	1	Other	Other
+a098d989-6f6d-4c3f-903a-f85f03ccbcbc	1	James	Other
+a098f0dd-e601-4752-948c-88373ae87115	1	Other	Other
+a0991d02-8e06-4445-ae29-e253ad3b207a	1	Other	Other
+a099ec76-8d5b-4ff9-8aa7-9ae5260f3d71	1	Other	Other
+a09a2795-cf1f-405e-9578-3a83f22f0960	1	Other	Other
+a09a33e0-ca74-44e1-9d66-8277945f637c	1	Other	Other
+a09a5d37-2a4e-4c1f-b1e6-c59c93fe2e6a	1	\N	Other
+a09a6960-997d-4276-b809-0ca58d0d4ea9	1	Other	Other
+a09a71b8-1b28-4e96-99a2-6e48cd436c07	1	Other	Other
+a09aabc4-3c28-4c93-95c2-9588eefc57d9	1	Other	Other
+a09b0243-3fa1-4539-9dd0-f7ceb654a4b9	1	Other	Other
+a09b22b1-d3fd-47d5-ae95-bca79911ea27	1	Other	Other
+a09b73cb-712b-4c55-83e6-21e94f3c9e60	1	Other	Other
+a09b8ac4-9217-4e19-87c8-15de173de772	1	Other	Other
+a09bc526-fbab-4bec-8f8d-818ebed09d8e	1	Other	Other
+a09c0846-cba5-487e-becb-d00d5fd1d075	1	Other	Other
+a09c62e0-b3ef-4ab3-9719-bd515f828a2d	1	Other	Other
+a09cb2e9-61e1-4364-ad95-9cebe6418acc	1	Other	Other
+a09cdf26-3705-4431-a0b2-2750f8817202	1	Other	Other
+a09cf62b-f521-49b2-b36c-3c52681e3f46	1	Other	Other
+a09d025d-e3c3-4fab-b87f-4b0ee5b01527	1	Other	Other
+a09d155f-05cc-47dd-b393-bc1e7c923b79	1	Other	Other
+a09d2e80-c791-42dc-8e11-5a1df6ca3dc9	1	Other	Other
+a09d49f0-7813-45f5-bead-55ce9ba87973	1	Other	Other
+a09d8165-ee49-470f-9ff9-eff650cde504	1	Other	Other
+a09d8494-1265-4e1b-b214-f357cebe94cd	1	Other	Other
+a09db0f0-574b-41f0-bf4f-b12b2d749576	1	Other	Other
+a09dbfe1-7b5c-4c21-b116-35ac052c5644	1	Other	Other
+a09dc1a5-70c6-4eba-a1ff-0ef1b7263f36	1	Other	Other
+a09dfabc-c9c6-4be1-9671-e4a21910a1db	1	Other	Other
+a09e2b96-3e19-49a2-b9de-a80f2faf22fb	1	Other	Other
+a09e7ec4-6228-45ab-99e8-06fa41093cd1	1	Other	Other
+a09eae62-9523-496f-9970-b47c2a5cb99f	1	Other	Other
+a09ec2b3-bf4e-4df8-bd2d-c53fedd8aba2	1	Other	Other
+a09ec689-fb18-4309-a70e-638c16f55256	1	Other	Other
+a09ee4ff-aca5-4196-b39c-0f7828e96b3d	1	Other	Other
+a09f0613-5142-4e25-ad85-d137df257a5b	1	James	Other
+a09f19ba-048a-4896-8096-eaff882b78db	1	\N	Other
+a09f4791-9591-4ab0-881c-520801fced4e	1	Other	Other
+a09fb684-5a10-40e0-9ac4-b96e1194db6c	1	Other	Other
+a0a0906f-efe2-426a-9fa9-68f629cfbee6	1	Other	Other
+a0a09990-5c41-46aa-8432-ae7acc07a6e8	1	Other	Other
+a0a0a93a-c0c5-4b97-bc82-cb1950c5bbfe	1	Other	Other
+a0a0b63e-ad77-4031-949d-b74011288645	1	Other	Other
+a0a10259-3a8a-4fbe-9cf1-6eacafed52f1	1	Other	Other
+a0a16151-73ae-468a-8459-b18f1a579e66	1	Other	Other
+a0a16376-078a-46f0-b336-d8916064f388	1	Other	Other
+a0a1f54c-e727-4f55-9964-255d1339bc3d	1	Other	Other
+a0a20f95-e5c7-402d-bf9e-6880870af56f	1	Other	Other
+a0a21802-aef1-4653-8068-550fd4a108b0	1	Other	Other
+a0a21efd-3038-4b29-b5ea-45c4cd2241ca	1	Other	Other
+a0a25fb5-19ea-4c42-a259-f55302d0631f	1	Other	Other
+a0a2c790-11aa-486e-a02e-53684139e28d	1	Other	Other
+a0a3092e-b3b8-46f7-a394-ff9eddde4916	1	Other	Other
+a0a3352d-fb45-47a0-85f6-135676342839	1	Other	Other
+a0a3444e-7f3f-4bb1-88f6-c8485cd9a6dc	1	Other	Other
+a0a34e28-0c09-11e8-b744-fa163e8624cc	1	Other	Other
+a0a36d8f-7623-483f-8b0a-f32b453ca004	1	Other	Other
+a0a38fa9-e197-4370-b8d3-1a6f1d577672	1	Other	Other
+a0a3b907-cfd2-4bf8-afc8-5fc16ff72133	1	Other	Other
+a0a3b9a1-da9b-4b0b-a662-9c7671b8ed2d	1	Other	Other
+a0a3bba3-1aab-4dd0-afde-53384ad7d07a	1	\N	Other
+a0a3d913-7be2-4fb7-8215-b6665116a41c	1	Other	Other
+a0a3f624-e0e0-440c-a612-aca3c501d0b9	1	Other	Other
+a0a4369c-b79c-425c-b007-f98fb5739b9e	1	Other	Other
+a0a4f294-11b6-43cc-966d-63f2120e4bd1	1	Other	Other
+a0a4f7b5-f319-4cac-ad81-fc7ffa612fcb	1	Other	Other
+a0a579e5-b424-4bb0-8a6b-f93e6e65267d	1	Other	Other
+a0a58752-3d6c-4b6b-9d04-ad6efcd1b4fa	1	Other	Other
+a0a5d046-3eec-4862-9f78-889e78f7cf50	1	Other	Other
+a0a60954-e58e-4a7a-a90b-48fe4149b49b	1	Other	Other
+a0a66a14-fa1e-490a-8a13-d2c687c31e75	1	Other	Other
+a0a6c60b-e91f-4712-aacc-39a3a063df99	1	Other	Other
+a0a6fe5d-2187-40c6-b337-9686a9e131fe	1	Other	Other
+a0a753bd-59ca-4260-ab23-00515d9b49cb	1	Other	Other
+a0a850f1-6267-4827-86a5-be7620ffa4c4	1	Other	Other
+a0a8de6f-edbc-411d-860e-3f6e5fc7e992	1	Other	Other
+a0a8ea33-db5c-4676-a12f-1bd7023d19c8	1	Other	Other
+a0a8eb83-9f8c-47b8-8778-19cc0934ec3d	1	Other	Other
+a0a903a0-b30c-4ea4-b3b3-ec39cd60b356	1	Other	Other
+a0a90aac-6560-423d-bc50-7eb6f4b121bf	1	Other	Other
+a0a9297e-2c73-4d6f-b8f7-a35215018654	1	Other	Other
+a0a93825-6b8d-494d-9df1-39be01096da4	1	Other	Other
+a0a9a3a9-0077-4a78-b749-cde71a0607d2	1	Other	Other
+a0a9ec2c-f882-482b-92b2-f1de8e4e8d9a	1	Other	Other
+a0a9f0ed-ec92-4421-bfb5-3ad0cccde306	1	Other	Other
+a0aa0ffd-00b8-4813-ac4a-d08819e8a5e0	1	Other	Other
+a0aaa71b-a5a3-4f59-9038-706c833257ec	1	Other	Other
+a0aafa6b-4804-4f3b-b9c3-e808acb7dcd8	1	Other	Other
+a0ab15a7-d588-4eab-9bf6-ded2fb62a9f4	1	Other	Other
+a0ab35fb-9a76-4793-bbaa-40e2a80188a6	1	Other	Other
+a0ab5761-1214-420a-b8cc-dbec06147269	1	Other	Other
+a0ab6bf6-3a21-4836-8511-7aba004adf52	1	Other	Other
+a0ab6c77-0396-4634-867c-88f1ec36f679	1	Other	Other
+a0abceb1-070b-4af5-b396-7cfa1ff15ebf	1	James	Other
+a0ac0ac9-0efa-4245-820e-0a56c061f7e4	1	Other	Other
+a0ac459f-33e0-44f5-aafd-5cff114d9f2d	1	Other	Other
+a0ac6d14-27f5-41a0-b4d8-a017020865d6	1	Other	Other
+a0ac73fb-995a-4a12-a2de-a781ab663e66	1	Other	Other
+a0ac7ca7-83a8-4803-b43e-0eff0711d6a9	1	Other	Other
+a0acc594-fbec-4cfd-8953-c21851ebcd6c	1	Other	Other
+a0acc624-edd4-41c7-8ffb-ca37a1eb673f	1	Other	Other
+a0acd600-37cd-4b69-b21d-4594a50c9799	1	Other	Other
+a0acebe4-a7bd-4669-9a54-3e10c608ec04	1	Other	Other
+a0ad46c9-5098-4cf0-972a-cbec69f67d50	1	Other	Other
+a0ad8e76-1db3-4093-8a5e-899ce394ea4b	1	Other	Other
+a0ae3467-ce57-44ef-9cfe-fb3559d86314	1	Other	Other
+a0ae886d-b50c-4de1-a39c-50193c54d803	1	Other	Other
+a0af0f8b-6037-474e-8cff-3aac60a841d6	1	Other	Other
+a0af11be-aebf-4eec-af64-005a21a65ee9	1	Other	Other
+a0af7c03-a7ca-467c-bae1-1b1739e3f02e	1	Other	Other
+a0af7cce-a5cf-4195-a550-e8c4c651f436	1	Other	Other
+a0af9061-57d5-439f-a9fc-2c8271217353	1	Other	Other
+a0af977b-91c7-4fb4-9664-622ad8e50c62	1	Other	Other
+a0afcf0c-10f5-430d-a1de-a1c731c8df83	1	Other	Other
+a0afdecf-9476-4726-9ffe-0195d53df3b1	1	Other	Other
+a0afe33a-aaed-4cf1-8e2a-580847f03296	1	James	Other
+a0b02362-d747-4d3c-bb66-893eb59b6fde	1	Other	Other
+a0b02c69-edec-4a29-a8ed-e7e1174f18df	1	Other	Other
+a0b03621-e901-46b0-a7b5-d1457e9b5356	1	Other	Other
+a0b0b198-0b79-4198-bc28-ae75e5d6300f	1	\N	Other
+a0b0b44e-61a1-458c-9977-e7b2a773ef0d	1	James	Other
+a0b0e3c1-c0f0-44ff-841c-1de30a089d12	1	Other	Other
+a0b0e7a2-2ad2-4913-86f2-49342367f327	1	Other	Other
+a0b12552-aa57-4b74-b46d-d1d4c6ef4bfd	1	Other	Other
+a0b176a2-c004-4a6b-85f4-113928d071b1	1	\N	Other
+a0b1c9a2-41c6-4584-a22e-0243d17acdde	1	Other	Other
+a0b1cda2-c987-4c76-b7ee-b589fc802213	1	Other	Other
+a0b23b94-8f5d-4bcf-a2a2-20f590086b92	1	Other	Other
+a0b27378-c021-417a-a485-3da303ca62aa	1	Other	Other
+a0b28f84-dd34-4d53-8d2f-5e711fea3904	1	Other	Other
+a0b2bd59-a6e2-4493-960f-0c090b2aa11f	1	Other	Other
+a0b2bf95-e49e-4866-81c0-0eb7aa3c2de3	1	Other	Other
+a0b2f9f8-f2c1-4206-a676-5303108f1f85	1	\N	Other
+a0b32696-c8cc-47cc-9184-76a3d2627855	1	James	Other
+a0b35164-3ce9-44d3-aefa-e26fb569d890	1	Other	Other
+a0b36527-26f4-4735-b468-d171c1cf7433	1	Other	Other
+a0b37464-0fe5-4a76-a707-e16733032a75	1	Other	Other
+a0b3c25a-704c-4c88-9053-1330f1302f5f	1	\N	Other
+a0b3dfe3-dbaf-4066-b8be-17db7c25b572	1	Other	Other
+a0b43b16-c6c9-45cf-8595-e89994247e09	1	Other	Other
+a0b49333-892f-482a-8937-ef025d16b3c1	1	Other	Other
+a0b4afb6-65ae-4dfd-95be-449b1112b4d3	1	Other	Other
+a0b4d6d7-933f-42e0-ba57-3f9e3c99ee69	1	Other	Other
+a0b524d9-060e-460b-af81-c688964f7392	1	Other	Other
+a0b56350-7e56-4f17-865b-4f2b967f5445	1	Other	Other
+a0b58357-c426-4fe9-a7df-5d0f147128e8	1	Other	Other
+a0b5d526-3b62-4fdd-a340-d2d6fa241cf1	1	Other	Other
+a0b60186-ba5a-4971-9051-3864ce56960e	1	Other	Other
+a0b604c2-9cab-42a1-b085-991af28cb2f6	1	Other	Other
+a0b60af8-df69-4915-a6ab-e9b35521d045	1	Other	Other
+a0b61f15-7dce-4e82-864b-14aaa47f622a	1	Other	Other
+a0b63241-7465-4578-ba45-7e3d43156cfb	1	Other	Other
+a0b65fbd-91a3-46db-a704-3a49e20c58ba	1	Other	Other
+a0b6d0f4-a58f-41c6-ad83-7634013eff9d	1	Other	Other
+a0b700e5-96cb-4a0a-8353-fdc4340f6eb0	1	Other	Other
+a0b71156-9661-4d52-90e4-5e1624c007be	1	Other	Other
+a0b721d5-ca54-4dc5-82f5-9b35be5e44ee	1	Other	Other
+a0b72b54-60ac-46fb-8a34-8813a1b7f238	1	Other	Other
+a0b820aa-742b-420b-a380-af371a4af16e	1	Other	Other
+a0b88397-9778-47e4-9f33-2b08cd52dab2	1	Other	Other
+a0b8a5dd-d165-4b08-8433-80a7e960ffcd	1	Other	Other
+a0b8bd6e-2439-4a38-9bdc-145035e2de5f	1	Other	Other
+a0b95082-b6a4-41ce-8bc5-7a3f8b3e7895	1	Other	Other
+a0b97cf1-98d3-4e1d-9e3d-4b795a55995e	1	Other	Other
+a0b98118-12c8-473f-b513-aed40ff57979	1	Other	Other
+a0ba1a2c-4fe2-4c3c-97c9-c55e5f47c1ad	1	Other	Other
+a0ba5226-0fe0-482c-94e1-443512ed3d8f	1	Other	Other
+a0ba57e4-a32a-430e-ba64-3295e49294d7	1	Other	Other
+a0ba85f7-1df0-426a-82dd-876f5623d46b	1	Other	Other
+a0ba9a5c-4db3-44ef-9248-9a2365cd79cd	1	Other	Other
+a0baa9fb-186e-4ac1-97d0-4bc04d81bace	1	Other	Other
+a0bae0d8-1092-4482-aad4-ff719b8df849	1	Other	Other
+a0bb1fc7-0ef7-4463-8956-bc77d8c395d5	1	Other	Other
+a0bb3f0b-8a6e-45ff-a2f4-4eec13fbd529	1	Other	Other
+a0bb7a15-9b73-4406-a3fd-a525acef41eb	1	Other	Other
+a0bbb867-955a-4e01-be11-f7ec0b9c4fbc	1	\N	Other
+a0bbd716-8aae-4236-bd6e-c8532ed985cc	1	Other	Other
+a0bbd770-6524-49fc-96ac-717eba37377f	1	Other	Other
+a0bbdc13-6b2d-4761-91e7-1a997561d6e7	1	Other	Other
+a0bbe152-fc64-4ac1-9e3d-9d1bf1273be0	1	Other	Other
+a0bc0f72-5e29-490b-bc74-36b311eed95a	1	Other	Other
+a0bc8b42-6545-4ef5-8cc4-5d6af85e9477	1	Other	Other
+a0bc9d30-b45d-4e2b-aa60-4e879d1e2073	1	Other	Other
+a0bcaae4-9343-4aee-bf9a-f03b48d528bf	1	Other	Other
+a0bcddb6-3029-49cd-8580-6c10b360fdee	1	Other	Other
+a0bce4f7-279f-4e70-9b0e-10eb8025652c	1	Other	Other
+a0bcefd5-ee60-4445-8861-255f27cba1c1	1	Other	Other
+a0bd4d1b-262c-4f33-b7f0-7078f5644717	1	Other	Other
+a0bd622d-6627-43ae-ad0d-23d1beb7c42f	1	Other	Other
+a0bd6615-22ed-4882-9303-4420b1109382	1	Other	Other
+a0bd6e66-d869-4ad4-9243-77c1e22b2446	1	Other	Other
+a0bdbbcc-63bd-41a3-b863-696120f6044b	1	Other	Other
+a0bdbe96-904b-457f-8b09-9b44c669c897	1	Other	Other
+a0bdd042-7d76-4bc3-894b-7e69bd9e46ee	1	Other	Other
+a0be776d-c780-40c2-99fb-b52d61c0961a	1	Other	Other
+a0be87d1-2d47-4411-88f0-476a4e06bba8	1	Other	Other
+a0bf0318-d5a7-4505-a091-a11ff24327fd	1	Other	Other
+a0bf1a07-6ffa-4566-9993-6439301bfc20	1	Other	Other
+a0bf3859-f721-456e-b038-aba33cb51ca5	1	Other	Other
+a0bf4b2d-3621-4350-85f4-e53957fe8b9d	1	Other	Other
+a0bfbdf5-8330-4030-a428-b39f216ad8ad	1	Other	Other
+a0c01cd0-095c-4594-9262-6d8ab0659931	1	Other	Other
+a0c05d72-462f-49bd-b693-f795fabd93fe	1	Other	Other
+a0c081dd-c870-4abb-9321-1517ff8bdcce	1	Other	Other
+a0c0828c-86f1-448c-8390-1cce7cc5803d	1	Other	Other
+a0c085dd-b284-44b2-8e9d-b095b32219da	1	Other	Other
+a0c0a8f1-bb02-41f6-80ad-99118ad120fd	1	Other	Other
+a0c0beae-356e-4c78-862a-41d1aae6de59	1	\N	Other
+a0c0d9eb-2709-4ce2-abdd-e29bc941056d	1	Other	Other
+a0c0f1ab-e0d5-433c-8f53-1f78dbe69851	1	James	Other
+a0c21684-5853-44db-a604-e3f0bb012c3b	1	Other	Other
+a0c2505f-5b1d-47d5-8850-b5f3a81586c9	1	Other	Other
+a0c26b23-4ffb-4dc1-905d-66baafe745ef	1	Other	Other
+a0c3072c-a7b3-4c58-baee-3f46e2dab7f5	1	\N	Other
+a0c362a6-5035-4250-8ca0-e14eca4f08cb	1	Other	Other
+a0c387c7-d410-405d-b5e4-70d6f5c9a58c	1	Other	Other
+a0c3b801-bf27-4a73-b6b8-9e5ccf025b90	1	Other	Other
+a0c405f3-7ad4-4c3a-ba53-079bb5571536	1	Other	Other
+a0c43566-fdef-4251-a838-11f21e67805f	1	Other	Other
+a0c44755-9a9b-43f8-9303-31e6da84432b	1	Other	Other
+a0c49aa2-4cbf-4df7-b8ab-06421070f9bf	1	Other	Other
+a0c4de70-0cf6-4732-83ff-cd80d43fe569	1	Other	Other
+a0c55000-daab-445f-ab7c-e98666388f4b	1	Other	Other
+a0c574dd-292c-4a24-8a22-7957f6985bec	1	Other	Other
+a0c58bf3-9961-4b3c-a2f9-4a55b79cc2d7	1	Other	Other
+a0c5b2b1-5751-4d48-ac64-ab20111b7d8b	1	Other	Other
+a0c5b6b6-a7d3-4da6-94aa-6537a8fbd1e0	1	Other	Other
+a0c5d3ca-6f83-4dd4-b271-9ad60327610a	1	Other	Other
+a0c5fe47-1055-4aaf-a1be-7790b0119128	1	Other	Other
+a0c622c0-ac74-4eb8-ab16-6cc78810dacf	1	Other	Other
+a0c63639-5959-4211-8b50-df93c443649d	1	Other	Other
+a0c6398a-78c6-44f8-840d-1c2c09605f84	1	Other	Other
+a0c6b449-6eb6-4d28-b2e4-f864d9809a41	1	Other	Other
+a0c6eaeb-5f54-4207-af24-fa79e448deb2	1	Other	Other
+a0c70b3f-c34e-4b6c-baf9-0e411dfdfd7b	1	Other	Other
+a0c70f96-3df7-40eb-a579-b2c060c32c17	1	Other	Other
+a0c762dd-7ddf-4612-af8d-0d4988f52add	1	Other	Other
+a0c779c3-5eae-4fa5-a51c-9e301132a0e8	1	Other	Other
+a0c7ba4b-b526-4ef7-8ddf-9b001a41213a	1	Other	Other
+a0c7daf0-bb47-4c9b-ac2c-db638c0a2d2b	1	Other	Other
+a0c7e1f9-9e30-4d89-b38c-d14022c0454d	1	Other	Other
+a0c824c4-2879-4cd7-b838-4bdc6378fa0e	1	Other	Other
+a0c84977-45d7-4167-bffa-7815f017a959	1	\N	Other
+a0c8602a-a72c-405a-afb4-10c6350cf24f	1	\N	Other
+a0c897f7-19e8-4277-a634-303c7ab6dca4	1	Other	Other
+a0c89c7c-c649-4a19-9418-20e326beeedf	1	Other	Other
+a0c89f29-67de-43f8-8910-ce437db0e159	1	Other	Other
+a0c8a082-7ae9-4743-8c61-9bc07be257ff	1	Other	Other
+a0c8e399-ac33-42c4-98f6-96dcd24950e7	1	Other	Other
+a0c98637-8575-4810-bd25-ab61bf758d7a	1	Other	Other
+a0ca1766-7073-4991-b9b0-3c436771b6b2	1	Other	Other
+a0ca56e4-24b1-4a97-8825-cd85d12ad86c	1	Other	Other
+a0ca6cc9-2187-458d-b080-5b562d727a5e	1	Other	Other
+a0ca7dfd-4a5b-4d93-8559-6b6e5b8bc352	1	Other	Other
+a0cabd99-c186-45dc-8a76-2555dc6f2bab	1	Other	Other
+a0caefa7-179b-4c32-a97e-387f1f453e49	1	Other	Other
+a0cb0310-e21a-43fe-9bad-630b56d42b9e	1	Other	Other
+a0cb08fb-bfb7-4190-b696-5718fa14be04	1	Other	Other
+a0cb5712-61f2-425d-96de-1d7040d1b486	1	Other	Other
+a0cb78a1-5cf5-4778-9c9c-3c0825d3a959	1	Other	Other
+a0cbabd7-89c4-4814-a82e-3fa116675700	1	Other	Other
+a0cbed34-dc37-441e-b601-b4eca2fd3a57	1	Other	Other
+a0cbf468-15b1-4791-b6ef-419dcb8d3147	1	Other	Other
+a0cbfd5a-3127-45a5-a05e-cd5b30c49703	1	Other	Other
+a0cc2309-b7c4-4e30-8a1c-c1382968a8e7	1	Other	Other
+a0cc5113-a300-4bea-a684-dc0d492439fe	1	Other	Other
+a0cc765d-9e4d-4789-961c-c70028154c98	1	\N	Other
+a0cc79f5-931e-47a0-b133-74a15726678d	1	Other	Other
+a0cd084c-d077-40eb-b1c2-b0db5a519a09	1	Other	Other
+a0cd1e78-755b-4063-8817-50d8890a1847	1	Other	Other
+a0cd26bb-916f-43d6-bd53-82a6a514272a	1	Other	Other
+a0cd3965-121f-4222-b5f2-ab0cd61c1c5d	1	Other	Other
+a0cdccce-3746-4f14-b837-422eb50e42d2	1	Other	Other
+a0cdd045-d544-432c-a4e7-da0d2dfb3a0a	1	Other	Other
+a0ce4ab4-ef18-484c-9d1a-b15c2c5b8bb7	1	Other	Other
+a0ce95b9-8e4a-4a5f-a53e-a304e8f2ddb7	1	Other	Other
+a0ceaf06-03dd-4fde-bf45-ca0a3349dd8f	1	Other	Other
+a0ceafa4-9308-43e6-875e-ac592508950b	1	Other	Other
+a0cf5048-3c25-444d-819e-c6a3ac396ee7	1	Other	Other
+a0cf5a5a-b51e-4680-9a82-7d4d1ca323c6	1	Other	Other
+a0cfccf4-4d5c-419a-a9a9-77554399736f	1	Other	Other
+a0cfe653-ae32-4ea7-b9d9-4f588cf2ed3e	1	Other	Other
+a0d02130-0058-4586-8201-85316603dfaa	1	Other	Other
+a0d02c11-72db-413e-b194-d18ad4ab8c28	1	Other	Other
+a0d04cec-3742-423b-8e54-89e96840a1c0	1	Other	Other
+a0d0ab09-945e-4ba5-bc34-38d309b22582	1	Other	Other
+a0d11020-0ff0-4816-9f00-4f5e2fc2508d	1	Other	Other
+a0d14d2e-2099-4666-92d3-a62441c485b1	1	Other	Other
+a0d16fa3-c601-4128-8a7d-d9d6e4128566	1	Other	Other
+a0d17e47-46cb-44a0-94e4-30f322e8c957	1	Other	Other
+a0d20b5d-9a23-402f-b6d6-a3d215f906bd	1	Other	Other
+a0d21f63-9ac6-498c-8d94-109c00514def	1	Other	Other
+a0d22467-ed8b-4e1b-afe8-15c2fb03440e	1	Other	Other
+a0d23b92-0791-4dcb-8a83-9859f0ffe59b	1	Other	Other
+a0d26846-3ffc-4366-abe1-78589b3f34ec	1	Other	Other
+a0d26ea1-0547-4db0-9eb5-c92ee1b4e100	1	Other	Other
+a0d281cf-d790-4935-9aa7-3bd5799c05d3	1	Other	Other
+a0d2fbdd-d373-4c02-bd3d-1713971d01b1	1	Other	Other
+a0d30b94-7a3f-4fe0-891d-610e646d8e93	1	Other	Other
+a0d3174e-d204-4105-82bb-b92b470f15d1	1	Other	Other
+a0d33ed3-6f24-4215-bb66-cb564d9ecb1d	1	Other	Other
+a0d357a7-0e72-4931-8433-4333e5160e94	1	Other	Other
+a0d39966-8bac-4d7b-8ecf-ddf3fd04739e	1	Other	Other
+a0d39bbe-0bda-41fd-a12a-4e0a961fe419	1	Other	Other
+a0d3ad30-abea-47e6-b9bf-4a51d3fcefe2	1	Other	Other
+a0d3af13-08b7-4c3e-8350-742a0090a13e	1	Other	Other
+a0d3ba2c-fc42-4ea3-9ff8-f65c9da9caf2	1	\N	Other
+a0d427c9-1252-476b-8eb2-d336ec3e599a	1	James	Other
+a0d462c1-e7e7-4e7b-beb4-25017a46148a	1	Other	Other
+a0d47a9b-b700-42c2-be84-0b5a780aadda	1	Other	Other
+a0d4ba59-4cd8-4178-8b8c-807e82d4d4e8	1	Other	Other
+a0d58639-2056-47f6-abd0-f7069767590f	1	Other	Other
+a0d5f098-603e-4e1c-9b40-2194a31a38d4	1	Other	Other
+a0d72474-a325-4088-8db7-83f94704ed27	1	Other	Other
+a0d76be4-e928-43f9-96eb-b9b0b58d0f76	1	\N	Other
+a0d7acbc-10d2-4687-bebc-106783382eb5	1	Other	Other
+a0d7e55b-58a9-4c91-a205-23bc29bd361f	1	Other	Other
+a0d84686-2c64-4c98-a09a-ff3875290e56	1	Other	Other
+a0d85804-9aab-4db6-942b-da1fcc8929be	1	Other	Other
+a0d87b27-8265-4d57-9990-ebcbe5893f97	1	Other	Other
+a0d88fba-3138-49cc-a96b-2b19d8df29c3	1	Other	Other
+a0d898ac-fe1a-453a-8142-084fa8080ac3	1	Other	Other
+a0d8ac39-8e1b-4548-afe8-cd5cfb0bc4f2	1	Other	Other
+a0d8af3b-6252-4e6c-9c07-4428c86fc525	1	Other	Other
+a0d8f121-65d2-4b49-a82e-51dac00c76d5	1	Other	Other
+a0d8ff95-fba3-4bf9-a224-3a858da98b88	1	Other	Other
+a0d934ec-a9f0-44bc-9505-d0c9b4588229	1	Other	Other
+a0d9c0ce-7408-41ba-b701-a4f170098191	1	Other	Other
+a0d9d690-8420-47ae-afdb-590b894cf9a7	1	Other	Other
+a0d9e781-72bf-4f95-bc07-3e913fb085af	1	Other	Other
+a0da366c-9f91-4f8d-92f3-b9b9ac807abc	1	Other	Other
+a0da7d6b-71a2-4938-a580-b7aeb51f8ac7	1	Other	Other
+a0dac392-15de-4941-a8d7-f57e3efa2c28	1	Other	Other
+a0dacadd-3871-4376-9ab2-7d3bfa4de1d9	1	Other	Other
+a0dad874-6a70-4c11-8ff6-91ca7c693f52	1	Other	Other
+a0db86ce-2299-4ee2-a495-19839b464b24	1	James	Other
+a0dbafc5-aadb-42f4-a434-9fd522a5492f	1	Other	Other
+a0dbcf6d-f7c3-4587-8196-2d2d96802a75	1	Other	Other
+a0dc15f1-b035-46f2-80e6-182482e13064	1	Other	Other
+a0dc6a92-6847-4347-9783-e1c157c4b871	1	Other	Other
+a0dc8da0-55f5-458a-8b60-dbaac344cff5	1	Other	Other
+a0dccffe-fbd4-4c05-b4f3-4881dd160f0e	1	Other	Other
+a0dcf7ac-7dfc-454f-8d6d-c4b26edc8afe	1	Other	Other
+a0dd4683-7bf0-427a-a5d6-8a730a782afa	1	Other	Other
+a0dd4903-7308-46d4-94be-3b22e4a4eb0f	1	Other	Other
+a0dd6f4e-da69-11e7-8d79-fa163e8624cc	1274fc8c-64ed-11e7-ab3f-fa163e4dd901	Other	Other
+a0dd8804-2785-4715-8e43-05a5b1ce4892	1	Other	Other
+a0ddcf29-9e98-4516-a769-bc6e9de71cf8	1	Other	Other
+a0ddebf9-1449-44b8-a0f7-5b3b188fcbfd	1	Other	Other
+a0de6ab2-387b-4736-a354-3c628640c48f	1	\N	Other
+a0de832a-8400-49c6-8002-a98c32366844	1	Other	Other
+a0dea1b5-06a9-4296-9e05-9a1241b751aa	1	Other	Other
+a0df3c2a-2139-4b3d-9325-47279d5b6e31	1	Other	Other
+a0df938b-3646-4b60-821d-37d03a517b57	1	Other	Other
+a0df9637-e682-42de-804e-a7fbc518e4d6	1	Other	Other
+a0dfd82c-08a5-4500-9773-3a730f6b6849	1	Other	Other
+a0dffdf2-5892-4f88-857a-9fbd7960d94c	1	Other	Other
+a0e077c4-aac3-45ba-bedb-651b52bfde6f	1	Other	Other
+a0e0e133-363b-47bf-bb23-1bd372b99b44	1	Other	Other
+a0e18aac-6dff-4e26-bcab-93c9de71a9ff	1	Other	Other
+a0e19933-1130-4795-9c60-1b425135214e	1	Other	Other
+a0e1b840-f980-40cb-9ff5-102ee4065971	1	Other	Other
+a0e1d948-f520-423f-94b3-032baa5f72ed	1	Other	Other
+a0e22ee1-0645-40f6-813e-6abeebbeeaa6	1	Other	Other
+a0e28009-6ce0-4815-a206-9f43960f1a94	1	Other	Other
+a0e2d115-1d4e-4378-a576-2ccca10d5b8c	1	Other	Other
+a0e2d2d1-19c5-433e-b93b-5f5518c7502a	1	Other	Other
+a0e2e1d1-5eb0-40e8-8a4c-c7467f983e6b	1	Other	Other
+a0e2f845-4cd3-4e81-bb1e-5e1c7bd05780	1	Other	Other
+a0e31160-afb9-4de8-aec3-36ef1cfad06d	1	Other	Other
+a0e350f9-cc74-47c4-aad3-851ca0bef610	1	Other	Other
+a0e354cf-6e10-4424-8cbb-a302c83474c4	1	Other	Other
+a0e360aa-6b82-4143-9069-cc596a6d2e8c	1	Other	Other
+a0e3af9f-a7a3-473f-9613-d232479630cb	1	Other	Other
+a0e3b33d-27d2-4cba-b1b7-e107b2f66fc1	1	Other	Other
+a0e3dcc1-e6ce-432c-af3d-c3b12b19f104	1	Other	Other
+a0e400fe-f6cf-4526-8308-ffb747d97e77	1	Other	Other
+a0e40555-0ec5-4bc9-9dc3-83b9c7f8db54	1	Other	Other
+a0e40e29-dd9c-4079-b58d-651c1577407d	1	Other	Other
+a0e45348-d773-4757-80ed-f7b8781fc8bb	1	Other	Other
+a0e4d3dd-a907-4aa7-861d-9c71db9fd288	1	Other	Other
+a0e4e410-338f-4787-a0d4-ecac01d6e1a0	1	Other	Other
+a0e4f352-5441-4161-8452-3859edf7f7ce	1	Other	Other
+a0e5283c-d494-419d-afa0-5973b111df17	1	Other	Other
+a0e577b8-1704-4e4d-8766-0cd2ca668a7e	1	Other	Other
+a0e5bcce-1aa3-4eb4-8474-c2643c03b3e9	1	Other	Other
+a0e5beb2-f8b0-4c4d-8c53-0f613e7034aa	1	Other	Other
+a0e5f943-dde9-47e4-9a10-ffc56e607d39	1	Other	Other
+a0e690b4-ffbe-406f-956d-3221e1fe7e3c	1	Other	Other
+a0e6fc3f-44f1-4faf-8b47-a81df8203851	1	Other	Other
+a0e717da-aa55-4021-82e3-c3b4079a9df3	1	Other	Other
+a0e72f73-3a3b-4b74-8313-7a64ee7a2ea8	1	Other	Other
+a0e7430b-ed18-4f6c-9969-993c51362cd5	1	Other	Other
+a0e74de4-85b3-4449-b6ea-76778ff69e29	1	Other	Other
+a0e7cb6d-9db3-4d9c-8674-606e91a67b35	1	Other	Other
+a0e7d0f7-f1cc-452d-8ba1-811794a9bd99	1	Other	Other
+a0e7df26-de65-4f7b-ac4f-2c06d6483d61	1	Other	Other
+a0e7ea14-731c-422c-bd73-535e6e4a51e9	1	Other	Other
+a0e86b83-2529-44a1-a983-0dfb7d7206f9	1	Other	Other
+a0e879ab-6419-4a9a-a783-98b4bdd56dfc	1	Other	Other
+a0e8a82e-4dc3-475d-aacb-0fe6f0693595	1	Other	Other
+a0e8d206-159c-4dc0-8f83-5dc9d96c488d	1	Other	Other
+a0e8eb27-6871-4645-bd47-9aff7d210d3c	1	Other	Other
+a0e91875-940a-4b64-bfa6-75e29e04820e	1	Other	Other
+a0e95820-7acd-45c8-8c1f-8d208d651b3f	1	Other	Other
+a0e96dd4-09be-4f48-94a7-9c879f993f06	1	Other	Other
+a0e9e458-9a53-4a43-8a58-27e2501171a8	1	Other	Other
+a0e9eb60-10f0-486f-ac35-3401e5536e4a	1	Other	Other
+a0e9f456-cc98-44ad-b339-91444dd4ffb7	1	Other	Other
+a0ea072c-f13c-49cc-afda-23e8f864b343	1	Other	Other
+a0ea1692-576a-4161-b77c-a0aa5630fe3d	1	Other	Other
+a0eaa394-1454-40f1-88bf-b4e96b8d887b	1	Other	Other
+a0eab8ba-7a83-497f-801b-acb8991ea8ab	1	Other	Other
+a0eafa79-3750-4713-acdd-4cf9fdb75de4	1	Other	Other
+a0eb2f81-efe1-4ec5-aa34-296db6c4f033	1	Other	Other
+a0eb4dbc-93bc-4c90-afc8-8b3f773f34c5	1	Other	Other
+a0eb9265-76ca-4c60-a714-f6f5f220d8d2	1	\N	Other
+a0eba306-fd6b-4532-8b03-e9b64b8dbc0c	1	Other	Other
+a0ebef8b-3e57-4ec0-96d2-80383185a40f	1	Other	Other
+a0ebffbd-4d80-431f-9d2e-20f154b08b5d	1	Other	Other
+a0ec0cd8-ec47-4c57-8c63-b9edfe4b0f77	1	Other	Other
+a0ec40f8-acb4-42a1-96d1-a3c4c371ac75	1	Other	Other
+a0ec5b7c-69f6-4b20-b84f-7f27ca549918	1	Other	Other
+a0ecb730-aea6-41ae-a875-7fefc346654b	1	Other	Other
+a0ecf4d9-1f4d-4d3e-ae5f-114c4623875a	1	Other	Other
+a0ed1604-c27f-4737-91ea-28ee0a01aca1	1	Other	Other
+a0ed2718-8976-4a7d-8452-8c948f6a399a	1	Other	Other
+a0ed47cb-70d3-4191-82a8-fd5e49ad3f6e	1	Other	Other
+a0ed4812-065b-4c28-aad2-0eb5a8c9b55c	1	Other	Other
+a0ed5890-1298-4070-9da8-6457060a8426	1	Other	Other
+a0ed70b8-66a2-45cd-a73c-bbdac12e737c	1	Other	Other
+a0ef21ab-639f-4156-9d2b-38e6519f934e	1	Other	Other
+a0ef921a-8a0f-488e-93b6-9aff3af4dd21	1	Other	Other
+a0efcbbd-54d4-4177-a1a4-7b79df269369	1	Other	Other
+a0eff85f-2a4d-48a0-b51b-52ed3f64feaa	1	Other	Other
+a0f002ee-d5e7-43f4-b3df-e9f76f26adb2	1	\N	Other
+a0f00c2d-4c97-45c6-bdea-3fc4ccb2e165	1	Other	Other
+a0f02e61-5c0e-4ce5-ad7c-eed4409f969a	1	Other	Other
+a0f09b57-60d9-4279-bf97-03680dfced2e	1	Other	Other
+a0f0c6fd-9bf7-41e8-9791-5abf9c5bf652	1	Other	Other
+a0f0f0c6-13af-4e01-a7a2-60f9555e9eee	1	Other	Other
+a0f10b80-dcc0-4aac-969b-eb5975aac60d	1	Other	Other
+a0f11e05-e56e-4676-8e43-a0979002410c	1	Other	Other
+a0f12c69-b6b7-41d4-878c-9041e765a217	1	Other	Other
+a0f13a3a-8dd9-4eb4-91b0-2c471488286a	1	Other	Other
+a0f1fa3d-8e3d-4c18-bd45-283498410127	1	Other	Other
+a0f22666-627c-43c0-80b3-9c79d7d4fc58	1	Other	Other
+a0f23765-bf11-4709-b933-0c35d73b9799	1	Other	Other
+a0f24246-d060-4006-82a5-4efed309645b	1	Other	Other
+a0f2579e-fd8a-43cc-839e-13cbe9009c12	1	Other	Other
+a0f2c581-c9a8-4923-8570-79ce269fc736	1	Other	Other
+a0f2defb-f116-4522-98d4-dae210781781	1	Other	Other
+a0f2e6cf-0da6-405a-80ec-fad35d9f6bff	1	Other	Other
+a0f2facf-b4a5-45ac-a923-77b8be0637dd	1	Other	Other
+a0f305e5-a3af-48ef-952e-13fe87a25e45	1	Other	Other
+a0f338ec-cff5-41b9-bc82-71dff2250255	1	Other	Other
+a0f3438b-6d08-4010-9ea1-4ae8e3a4a078	1	Other	Other
+a0f3555d-1d3c-4349-aabb-6a835898187c	1	Other	Other
+a0f3a9ac-efe5-4aa2-b7d1-f168d7031e72	1	Other	Other
+a0f3bf6f-310a-417a-a0ce-9112bb3437d0	1	Other	Other
+a0f3cae1-48ff-42ce-89f6-d5bfaa18f790	1	Other	Other
+a0f41cbd-7c21-4852-80ab-8df3cb7e1cf4	1	Other	Other
+a0f436a5-f5eb-4b81-aa39-11a1185f5b2f	1	Other	Other
+a0f491d9-f2d0-430f-935b-6ca81d2e1d12	1	Other	Other
+a0f4b766-bd08-4e38-a1ba-83ae183166c6	1	Other	Other
+a0f4c109-0382-4267-9957-be7ffe8ca528	1	James	Other
+a0f4c379-4b98-45e4-8042-8599346effa3	1	Other	Other
+a0f4e4c9-3963-4794-a043-e36af4d84468	1	Other	Other
+a0f4f000-a1f9-4cde-a161-ff041cdf0a6d	1	Other	Other
+a0f4f02a-ae32-4199-b459-6954cf347c40	1	Other	Other
+a0f50cda-b11c-4243-bbba-21980ef7bbf0	1	Other	Other
+a0f50f09-2366-4e1e-8d13-c950744aa495	1	Other	Other
+a0f5715d-ff87-4589-933e-a3b5b6914036	1	Other	Other
+a0f5a968-5996-4755-a826-58bfbd1b5853	1	Other	Other
+a0f5af81-616f-442c-9b74-bceb2c5fb872	1	Other	Other
+a0f5d20d-ead3-465a-bfc3-8fc1ff2882dc	1	Other	Other
+a0f5e8d9-cd6f-4ae0-b8eb-af0845deee14	1	Other	Other
+a0f61e6c-7c2a-446e-a90d-c5fe9e13ec16	1	Other	Other
+a0f64aa4-3735-4ce7-b434-41159ded0f18	1	Other	Other
+a0f6612a-c382-4778-89ad-e59efe0d4dad	1	Other	Other
+a0f6989b-c74e-488e-87dd-bf38717019e1	1	Other	Other
+a0f6ea9a-d6c7-4f7a-b0f6-2e32b69d3ae9	1	Other	Other
+a0f764fb-9b76-4491-b79d-4b82ffd8a60a	1	Other	Other
+a0f7689f-db83-4999-9701-88cdc23e2169	1	Other	Other
+a0f7b8ef-4529-4713-a9bb-56eb6faf2df5	1	Other	Other
+a0f7d726-6d6f-48f0-80cd-312378888bb5	1	Other	Other
+a0f855bf-d0a9-4138-923a-dfae383b3678	1	Other	Other
+a0f867d2-930f-483f-9708-e67792807bfb	1	Other	Other
+a0f8a60d-ac7c-4d24-8deb-867a7a25b8f6	1	Other	Other
+a0f8b791-64a4-4804-b4c4-9b996eb888ef	1	Other	Other
+a0f8c489-28a1-4a84-a522-9ca30c9dbcc8	1	Other	Other
+a0f8faef-b5f2-4ca8-b125-8ca4c42f65ec	1	Other	Other
+a0f90085-b2b2-45ce-8bc5-20258fe299a2	1	Other	Other
+a0f91343-0f5d-4910-9841-bcea84522761	1	Other	Other
+a0f9ea67-a094-4253-9f1f-11d4f80cdf2a	1	Other	Other
+a0f9ed2b-4ffe-4ea2-8f61-627e20b28411	1	Other	Other
+a0fa3fbf-5690-4cfe-83ae-727fcfa6c441	1	Other	Other
+a0faf8f3-459f-4b54-828b-6beb8ffb0933	1	James	Other
+a0fb23f3-f95a-45c7-82fa-675be8d9ae2c	1	Other	Other
+a0fb5431-b12e-492a-9ece-a63f0d30bee7	1	Other	Other
+a0fb7a71-f23f-4025-a2af-f746ab64abdf	1	Other	Other
+a0fb7de4-bd77-4279-8acf-66be03589af1	1	Other	Other
+a0fb9166-011f-4602-b600-470f69bfda29	1	Other	Other
+a0fbb504-5b60-44aa-848e-b0c69e91a674	1	Other	Other
+a0fbd06f-4100-4779-a1e3-3e0fc8d0f50f	1	Other	Other
+a0fcd3de-69ab-48f6-9a96-59ce7b0ec1ff	1	Other	Other
+a0fcf406-df56-4dfb-a2c4-e8ac761f9f7e	1	Other	Other
+a0fd38d0-7b43-47d5-b4cf-7abe4fd715c9	1	Other	Other
+a0fd44bd-6a21-41ce-aafd-1f5186d2c96c	1	Other	Other
+a0fd78dc-bba0-46c4-ae10-5161ff6be7a2	1	Other	Other
+a0fd7923-8124-4200-b106-62fcb07ca645	1	Other	Other
+a0fd7b68-ef6b-4d88-8ee3-5cc4516d878c	1	Other	Other
+a0fd96b8-d157-4d70-bab4-18aecdcee183	1	Other	Other
+a0fd9b63-aea4-4aab-bb05-1c3d30154a00	1	Other	Other
+a0fdd68b-c723-4731-9187-d7597efa27f7	1	Other	Other
+a0fe546c-d6c5-4f35-b4f4-c9284793c964	1	Other	Other
+a0fea536-87e9-4378-bf1f-cabd60ef42b9	1	Other	Other
+a0feff18-471d-47b2-afc8-c5b26de66576	1	Other	Other
+a0ff08b5-550c-4549-b0a8-f605a4eb2785	1	Other	Other
+a0ff1d92-1d6c-11e8-b2a9-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a0ff2292-7901-4629-985b-7c949205966a	1	Other	Other
+a0ff85ee-9567-430b-954a-896b21fca968	1	Other	Other
+a0ff9c24-9eb8-4317-bfed-6feae42a4057	1	Other	Other
+a0fff293-b348-4a22-9fa7-0d443cf522db	1	Other	Other
+a0fffe3a-3d3f-406e-9f5e-3846a8379559	1	Other	Other
+a0ffffbe-a455-4ddb-b733-4f420fdcd734	1	Other	Other
+a1008c90-a72b-4db4-8ca2-0821bc56b6d8	1	Other	Other
+a10090c4-4a9c-4329-9edb-cb02c73831dd	1	Other	Other
+a100d5aa-4880-4314-b756-804e4f52b521	1	Other	Other
+a100d9d4-eecc-40b0-954d-69e0a13181cb	1	Other	Other
+a1010ebc-4b69-4825-a46b-903beacaf7fa	1	Other	Other
+a1011301-da95-4904-b40a-a120d62ba526	1	Other	Other
+a10153ca-be40-4f50-a246-b9da13d9b842	1	Other	Other
+a1016023-053f-405a-8642-0fc36758b315	1	Other	Other
+a10161bb-729d-46bd-acee-a916034eaffc	1	Other	Other
+a1017b0e-a901-4f5c-803e-e6c6854d505c	1	Other	Other
+a101813d-37e6-4cf0-8950-9eeacb373028	1	Other	Other
+a101c347-647f-46e1-9b8d-ed96478afee6	1	Other	Other
+a101d8da-a924-47eb-9a22-56dfeb96f12b	1	Other	Other
+a102026f-4501-4b32-abaf-af2be77baa9b	1	Other	Other
+a102040e-26da-4879-ad07-bfd5f31e136c	1	Other	Other
+a10207fc-3323-4ff6-8ddf-bfe9a68380dd	1	Other	Other
+a10235dc-2460-4054-89bd-548894a3ad24	1	Other	Other
+a1025113-9734-433c-88f6-8b272acf8038	1	Other	Other
+a102938b-dff5-4e01-a0f4-1e157d0e47a1	1	Other	Other
+a102c13c-3386-403b-b139-d0096d7dfa9a	1	Other	Other
+a102e7a1-333e-4ced-840a-939a1f793f9e	1	Other	Other
+a1030e5b-ceec-47b7-a230-fc90f3be6ad7	1	Other	Other
+a1036ab2-f607-4cc2-a606-1cd2c96e7327	1	Other	Other
+a103714f-2e20-4249-b31d-74636f883b59	1	Other	Other
+a1046b8c-0f58-4520-b75e-4316ee926251	1	Other	Other
+a104971e-3f35-4ed1-807f-85596ea64ca3	1	Other	Other
+a104c3ef-a18d-4e54-be13-d202a30c1e20	1	Other	Other
+a1051624-764e-49a6-a4f3-55b6ff63528e	1	Other	Other
+a1054cc0-7f22-4dbf-ad2b-ebea15b42f29	1	Other	Other
+a1055178-4ff2-4c8f-8260-1812dc0591f4	1	Other	Other
+a1057bee-faf9-42c5-b85f-15a3df2eebb4	1	Other	Other
+a1058158-6d3c-4ac7-b714-62bbc262ad55	1	Other	Other
+a105bb28-eae5-47fa-9e0e-c17848c0ecca	1	Other	Other
+a105d31c-db9d-4c2c-b8c3-4234fffdab41	1	Other	Other
+a1065399-590b-453b-80d9-6d7607a4bad6	1	Other	Other
+a1068a0f-e9ce-476f-af8b-c50ed4c07a71	1	Other	Other
+a106b0e2-a35c-485e-ac5b-7f7a7439ab96	1	Other	Other
+a106c85b-2617-49f1-97dd-7e5d077d9118	1	Other	Other
+a106ce66-3fd3-4394-879f-218c7c663f10	1	Other	Other
+a10770d6-cd93-41d3-8677-7ada69c0215a	1	Other	Other
+a1078688-e0fb-4b6f-8407-5edf46170c3a	1	Other	Other
+a10798c8-54be-4496-97ed-fd42f50f2e26	1	Other	Other
+a107fba0-2c39-47eb-97a5-230da22d7305	1	Other	Other
+a1080c11-10c3-4ffd-ba7d-78a527d46d5a	1	Other	Other
+a1081ab8-8d7f-438d-8ae8-cc11093a6ab5	1	Other	Other
+a108221c-9f11-4f58-b1f4-a2eb5a2cec08	1	Other	Other
+a1082dac-a930-4582-bb6f-65c84ed4e5d0	1	Other	Other
+a1089634-a901-4c69-83c2-4b4cc1728534	1	Other	Other
+a108f270-9dba-46bd-b36c-93aed1f21b76	1	Other	Other
+a108f9cd-641a-4565-9582-039d4ce35ae0	1	Other	Other
+a109528b-8f51-428c-ac27-48a5df30c2a4	1	Other	Other
+a1097268-88dc-4c62-8a3d-efd8556d03cc	1	Other	Other
+a109a62c-8f27-49b9-9398-a1a5b1706edf	1	Other	Other
+a109e870-3aee-481c-b7f0-e33cd2a7e8cf	1	Other	Other
+a10a50f5-7dea-42fc-9e80-301a855d3bb1	1	Other	Other
+a10a7226-1221-4e26-bd62-96e3196c86dd	1	Other	Other
+a10a77f1-29a3-4d26-aea6-d4fa67af415c	1	Other	Other
+a10a9a4f-a2f9-433a-a387-f467a7ababa0	1	Other	Other
+a10aa559-8264-4ca4-8edf-5a6cb8647c2a	1	Other	Other
+a10ab41f-b8d1-44b5-8569-97aef50fca2e	1	Other	Other
+a10b0853-5704-4c35-991d-f33eba1d38d2	1	Other	Other
+a10b5a5d-7f9b-4dfe-85e0-410384eff2d0	1	Other	Other
+a10bab64-ac6a-4dea-b561-f7695e8c7d4d	1	James	Other
+a10c1330-70b9-4e6f-8ef2-4e69cc253d3d	1	Other	Other
+a10c2366-3cbd-4d2e-995e-580fc42aa80c	1	Other	Other
+a10c33b0-448f-44fd-ab8b-b73649ae7944	1	Other	Other
+a10c61ef-23a6-4cd0-958d-2711a2fa2d94	1	Other	Other
+a10c6d22-3f86-435c-b986-748b712c097a	1	Other	Other
+a10c7380-06ef-4a7e-aa83-adc877f6c152	1	Other	Other
+a10c9724-2ce6-42da-afa6-4626045b7bc1	1	Other	Other
+a10c9a34-d3e2-4765-94bf-dad578b1d352	1	Other	Other
+a10d0dba-f798-48e1-ad3b-d7fc9440a1ea	1	Other	Other
+a10d21f4-5f70-4897-b7e1-056fe1737812	1	Other	Other
+a10d3593-ea9d-43ea-ac79-89b8262d9efe	1	Other	Other
+a10d6bc6-b0d4-4279-a296-d3138eb3d646	1	\N	Other
+a10d7b6d-adc4-4c04-b33e-eda0c783ce34	1	Other	Other
+a10dc3c1-1d67-4194-a561-9f3691467851	1	Other	Other
+a10ded48-cb94-4d73-b654-7aab65bf4168	1	Other	Other
+a10deec8-8c71-4a5b-a2b6-a9fcb7741a06	1	Other	Other
+a10e5056-0cab-4955-b849-a2af384173c8	1	Other	Other
+a10e6072-2f27-4497-8a08-7bc4585f9b8e	1	Other	Other
+a10f0930-3782-4ba9-b643-71c4eeac2bd9	1	Other	Other
+a10f1d72-c952-444e-a3f2-dd304a336c26	1	Other	Other
+a10f26d3-a957-42fa-a96a-01f5679fb2b5	1	Other	Other
+a10f2a7d-10e3-44a5-827e-d2b5862633d2	1	Other	Other
+a10f2f5d-8c4b-4628-82df-8c75a7890478	1	Other	Other
+a10f67ae-6a4f-4519-85dd-518cef57f293	1	Other	Other
+a10f7e5d-4c3d-4a42-911c-afd0fe85f86e	1	Other	Other
+a10f9730-a331-4c4e-8566-80a93c3d0b2b	1	Other	Other
+a10fe974-740b-46f6-9fb6-fd74a41e3045	1	Other	Other
+a1101533-55ec-4a7c-a1ec-dc4a74c26ea2	1	Other	Other
+a1105156-09a0-4b89-b11d-a115f097194e	1	Other	Other
+a1106b59-6a8e-450d-ba68-162c787ada59	1	Other	Other
+a110788b-ba25-4489-8ab6-46e8b374f5f9	1	Other	Other
+a11102e1-2232-46e3-8657-290314abd68c	1	Other	Other
+a1110332-0237-4138-9a4d-e2607dab15d3	1	Other	Other
+a11124ed-7068-45e7-b376-d7744aa95178	1	Other	Other
+a111253b-dff9-4674-afc9-6d62b706a886	1	Other	Other
+a11143f0-0f27-4354-8a28-de03c0fd5a85	1	Other	Other
+a1117c62-b9de-425b-8487-3ee8bb8923b8	1	Other	Other
+a111ad64-cf02-4947-9b87-89c7e532575b	1	Other	Other
+a111dd45-1ce5-4fa7-a45f-97409eeb2ada	1	Other	Other
+a1120a4b-9281-481f-bb88-57601a437b8d	1	Other	Other
+a11224a4-1215-490a-b51f-575c389a22b1	1	Other	Other
+a112401b-ddec-4891-a7a7-3cead3420ab5	1	Other	Other
+a112c2ad-8672-4a5f-b748-f15f2af919c4	1	Other	Other
+a112ea8a-4b1c-4e1e-88bb-d9a59d9920e4	1	Other	Other
+a112f003-7a94-4d92-8684-82e7af6d86dd	1	Other	Other
+a1132ba4-9462-4cdb-aeb3-54e3375de3b0	1	Other	Other
+a1136624-4bd7-4497-ba49-10c82061a9d6	1	Other	Other
+a1139f94-d765-4f28-aff5-8aea44c356fd	1	Other	Other
+a113d0c4-9aa3-4943-a076-0b0994319d02	1	Other	Other
+a113d14d-e13a-4aca-adbe-9b2af2e469a2	1	Other	Other
+a113f93e-e71b-43d6-bf4c-7fec914aca1a	1	Other	Other
+a114247e-6c05-431d-bb9b-edb293720315	1	Other	Other
+a1143926-e514-41aa-b997-360c89b99924	1	Other	Other
+a1149de5-d98a-409c-bd9a-d79f9d71aebf	1	Other	Other
+a114a172-6e4c-481e-9bc4-a440c0d3cd31	1	Other	Other
+a114d6e4-f54f-4503-8124-53aed770a937	1	Other	Other
+a115192f-e270-4080-a7c6-93101bf77ffa	1	Other	Other
+a115273e-7d7e-4c8f-96e1-6cffb30c9496	1	Other	Other
+a1154377-e0ab-4473-8062-4b5f62b8bf53	1	Other	Other
+a1156788-77f8-4636-ac33-961eee81d3a0	1	Other	Other
+a11579e4-9f73-46c1-b1e2-d148cbca2bd4	1	Other	Other
+a1157b25-ac7d-43e3-b46f-37788b7f8f9b	1	Other	Other
+a11599ac-b708-4d7d-8cdb-676671b0de79	1	Other	Other
+a115ac1a-c98b-4dc9-b83d-87e383c76cb2	1	Other	Other
+a11607e4-e964-44ba-8f51-cbf0ad8a3805	1	Other	Other
+a11639cb-fb88-44a2-b5ba-d30c3409e2af	1	Other	Other
+a1163a16-574b-47b5-bfc0-99f738cb0deb	1	Other	Other
+a1167d11-3fe7-4830-889c-5f039c998af6	1	Other	Other
+a116bf61-6aed-4dcc-8305-003822935206	1	Other	Other
+a11717b4-7cd2-42ee-a5d9-d37a830bedc3	1	Other	Other
+a1172f5e-e1ed-4586-9207-c1ed97ba9da5	1	Other	Other
+a11737f8-a47a-4c40-8d93-fb23750d336c	1	Other	Other
+a1173839-29d3-4080-96ef-fb1071971e84	1	Other	Other
+a117750a-5ea1-4321-a27a-dcc3d19ee1db	1	Other	Other
+a117938e-ae8b-439c-9a82-ba1e13439295	1	James	Other
+a117bd5d-0e83-4f97-86cd-4cb63ee68ded	1	Other	Other
+a1189746-c678-41f3-8273-fae2bb4809d0	1	Other	Other
+a118e1f4-9932-45f2-82f0-07ee91d473e7	1	Other	Other
+a1192fdb-a5eb-4e30-bce5-75b83a505b6b	1	Other	Other
+a1193174-c374-491f-98f7-863e8768584a	1	Other	Other
+a1195720-207a-40e3-bd30-554bfb4fe202	1	Other	Other
+a119634c-a141-41cc-b1dc-060a56bf322c	1	Other	Other
+a1197850-ccdd-411d-a7e8-e9e626b6e92b	1	Other	Other
+a119ad9e-f18d-46b3-96d3-1b6dd90b6575	1	Other	Other
+a119e11d-e073-4158-a78f-f466f426fcc8	1	Other	Other
+a11a45b7-d64b-4700-88e7-26141e04f6c6	1	Other	Other
+a11a6cc9-4dcb-4437-ba5c-902b464269f0	1	\N	Other
+a11a82b1-e6bb-437e-b8d5-f1eeb3bfafa7	1	Other	Other
+a11a9913-111e-4524-b7f2-521c605b5f12	1	Other	Other
+a11ade87-1025-4c56-8ee4-5c90cc935cb5	1	Other	Other
+a11adfde-6eb8-42c6-9d90-365ce944cfca	1	Other	Other
+a11b0b0a-35aa-48be-a88b-537677101500	1	Other	Other
+a11b1183-f2c1-4619-83b2-0571dad5b510	1	Other	Other
+a11b1370-5571-435a-9459-3f70629861b4	1	Other	Other
+a11b1814-66a9-47be-a466-57849bcb88cc	1	\N	Other
+a11b49ae-bbd0-463f-a00b-6217d1a7f0e7	1	Other	Other
+a11b97d6-5a83-4aae-924f-8e379d170574	1	Other	Other
+a11c10c9-05ab-4c75-8219-92b27b20f92d	1	Other	Other
+a11c28f0-9e21-40ef-8f80-82d9e7fb093f	1	James	Other
+a11c2c33-a0e9-4573-9e6f-1a71c4b9a497	1	Other	Other
+a11c3c23-072e-48de-8f6f-44d7d15930e9	1	Other	Other
+a11c4278-49c0-4f10-aa99-0f241ce31254	1	Other	Other
+a11c9221-0886-475a-b126-27814762afcc	1	Other	Other
+a11cc32d-fc18-433e-874e-e84ce9f37e12	1	Other	Other
+a11cc967-3978-492d-a88c-716c4e9ee2ef	1	Other	Other
+a11d1f83-c17b-438b-bfdd-0f82268a0171	1	\N	Other
+a11d3d98-c761-4b50-a9f6-8dc6517b427d	1	James	Other
+a11d88c8-2ee0-4689-9b0f-67303b80d6b1	1	Other	Other
+a11da735-452a-4ecb-827a-1aced2ddce7e	1	\N	Other
+a11de004-b975-48ad-8d86-abc137d1078b	1	Other	Other
+a11ec366-deaa-46b5-96be-408daf487e7b	1	Other	Other
+a11f0d90-31a4-4a3d-8ec3-6aa9410ee113	1	Other	Other
+a11f183c-6b3b-4add-be5c-512c0e6c642a	1	Other	Other
+a11f60ce-6c8e-4846-8593-d00df02a21af	1	Other	Other
+a11fc130-34d5-46b3-9026-d401ddfbb3a8	1	Other	Other
+a1204d5d-96d5-4e3f-9129-e079fbe9976b	1	Other	Other
+a12064cb-5cab-44be-8f32-5eb6ea1efee4	1	Other	Other
+a12073f7-993f-4cfb-a471-7cd5a6357b77	1	Other	Other
+a120beca-0bdf-4f47-b858-344291afbf7b	1	Other	Other
+a120d8d3-1ea4-4016-b074-8f2a33c758ae	1	Other	Other
+a120f0ee-193b-47cf-a17d-68a5e11da3b4	1	Other	Other
+a1212bb2-d62a-4528-80f7-ae1d2a4da449	1	Other	Other
+a12194f9-841e-4b46-b69f-f0e6d50d0225	1	Other	Other
+a1220ec6-e615-4b5c-ba07-e8bbd22abf22	1	Other	Other
+a1221d24-c5c0-4ad3-8134-44a06eee4e19	1	Other	Other
+a1222e22-900a-4df4-a564-7818d611ebd9	1	Other	Other
+a122a06e-14a6-4086-8d79-84d2d77b3038	1	Other	Other
+a122c0ae-fdc1-436e-b093-1778efbc4d22	1	Other	Other
+a122c2fd-8393-45ca-aadb-505791d63731	1	Other	Other
+a122c3a7-3276-4a77-b9b9-60639ba9e3e7	1	Other	Other
+a122da09-4832-49eb-9e6f-bd76d5b6aae7	1	Other	Other
+a1230307-87bf-492c-bcf4-0554e446a25b	1	James	Other
+a12367ac-19b9-4997-baee-ed2eb437cc93	1	Other	Other
+a123cdbb-be92-4a6b-a30f-f6412c249127	1	Other	Other
+a123d8b9-db7a-4ae9-95f8-a759de9c98d0	1	Other	Other
+a123f969-67e3-4ca0-bff9-168ac7e77a5d	1	Other	Other
+a12405f0-60af-4197-ad0f-20f0e676b459	1	Other	Other
+a124269c-8b52-465b-bbe2-5f33312f0b47	1	Other	Other
+a1242c86-aa67-4d6a-a20d-b5638142b3fe	1	Other	Other
+a12454c8-6383-4b08-9179-35077b800122	1	Other	Other
+a124743a-cb1d-4554-972b-5298f642e0a5	1	Other	Other
+a12478f4-8698-4ad3-a9a3-3ceb3783e8b7	1	Other	Other
+a1247bd0-2d8b-4e48-a857-ba7fec784240	1	Other	Other
+a1247fb1-8287-466d-bb13-332eddcc431d	1	Other	Other
+a124aacc-8e70-4a70-a1d6-7c345c22f914	1	Other	Other
+a1256372-9d7b-4a81-a154-cc48da0a27cb	1	Other	Other
+a1257046-4f74-4d36-9d9e-31e64944da60	1	Other	Other
+a1258f11-4575-41ab-86ac-adf629698540	1	Other	Other
+a125b89f-1932-43bc-8383-3b775b05a99f	1	Other	Other
+a125bfb3-5296-4051-a974-6b304568bd94	1	Other	Other
+a125c5fa-62b9-4a84-b281-235ab5d6db78	1	Other	Other
+a1260151-b256-4fae-a233-1750e6335bb4	1	Other	Other
+a12638db-4b41-489c-8ea5-bafdf8fc3f2e	1	Other	Other
+a1269e90-d99c-4313-8690-9820fbc655fd	1	Other	Other
+a126a276-8c0c-4d60-aef3-be842b740dbd	1	Other	Other
+a126bb67-e083-4469-8aad-f126e5a6e74a	1	Other	Other
+a126c5ec-0fd5-4a75-ad3d-f0e4450506cd	1	\N	Other
+a126d3f8-6e99-482e-af26-69e2016a75d1	1	Other	Other
+a126f11e-edf0-4893-aba5-302b5d74a660	1	Other	Other
+a1270759-eb9f-4e15-8a41-67f95a9c4518	1	Other	Other
+a1275fe8-4180-4fb8-9316-4b138cef8135	1	Other	Other
+a127c922-cbc6-461b-89db-5daa77b539dc	1	Other	Other
+a127f76d-cc1d-4673-9ac5-7f60b499f150	1	Other	Other
+a127fe33-c367-4731-b98f-3a8c6ab85247	1	Other	Other
+a128032b-890e-4cc8-b6d5-7153a60b00a7	1	Other	Other
+a1281007-54d5-4ec7-9c0e-e814dbefd049	1	Other	Other
+a1288647-a3a1-4120-a9d5-0d29bd5c8725	1	Other	Other
+a1288e50-27a5-4e56-8747-36d3ff58e1a4	1	Other	Other
+a129238f-7e59-4b00-b2ad-ea84c9abb67d	1	Other	Other
+a129ab65-727c-45d4-ad93-a9e8e5162f57	1	Other	Other
+a12a54b6-d058-49b1-b0a0-589d772da240	1	Other	Other
+a12a5b03-1247-44fe-9d6f-32cffb3d7e99	1	Other	Other
+a12a8329-e527-4a2c-abb8-0d753c3d42b3	1	Other	Other
+a12abd73-d64b-4718-8551-1a91061775fb	1	Other	Other
+a12b1f99-738a-4b90-bc19-a8bdc9e53046	1	Other	Other
+a12b5031-a9f1-458c-85ea-b87911c2a391	1	Other	Other
+a12b5cb7-fbce-428e-9bc1-31a46d2f2eba	1	Other	Other
+a12b7b63-8b87-4b7d-9eea-50f685c43492	1	Other	Other
+a12b8856-7933-467c-8f7c-910fddc47c3d	1	Other	Other
+a12baef6-1183-4496-a5c4-e7e5a425c013	1	Other	Other
+a12bb407-76d6-4026-8443-208a4c03acb0	1	Other	Other
+a12bed05-5c0b-41fd-a948-de88d8a40686	1	Other	Other
+a12c0a28-2ba8-484d-8e47-303a8a2352f8	1	Other	Other
+a12c2140-101c-4a92-905d-6183de091016	1	Other	Other
+a12c68a5-9fc6-4f7c-8d78-0fb629081967	1	Other	Other
+a12c6b1c-d9f0-4f45-8308-4c250186d862	1	Other	Other
+a12ce9cf-de73-4a41-bc67-2fa62753b65f	1	Other	Other
+a12d103b-5a15-4396-aca6-ef7cd055a629	1	Other	Other
+a12d170f-0e37-43a5-bf14-8a10ebc5d7e4	1	Other	Other
+a12d2082-bc7b-4dd8-8964-863f580d00ce	1	Other	Other
+a12d76a6-4c0e-4d47-9cb3-ee3c0275868b	1	Other	Other
+a12d898a-a5df-465e-aab3-7478975238f8	1	Other	Other
+a12d9957-9bb9-4a8b-9824-2118849b5c8e	1	Other	Other
+a12dbfca-8fb6-4571-8d57-d71fdaa352d9	1	Other	Other
+a12dce49-611b-4cec-be94-5da4f03477c4	1	Other	Other
+a12df576-8716-4e19-aa86-0e4cfe67532e	1	Other	Other
+a12e09c7-90ca-4bd4-88cb-41df8d34c52d	1	Other	Other
+a12e8044-3830-45f2-8f48-7e23cbb40485	1	Other	Other
+a12e87e2-4149-4923-bc1c-c465679f864d	1	Other	Other
+a12f1801-2a71-4960-a527-9ae759ad64c7	1	Other	Other
+a12f2d7d-fb5e-451c-8c6a-7b88fd256b6c	1	Other	Other
+a12f3b05-13af-41b1-a845-313279536fa5	1	Other	Other
+a12f48ab-5d01-49ae-9f57-0c19939cb322	1	Other	Other
+a12f6b01-e457-49ae-9277-3d6f048c9651	1	Other	Other
+a12fab9f-f454-4223-9782-55e0f1366741	1	Other	Other
+a12faee0-8c1d-4071-bd4a-195174d41d5c	1	Other	Other
+a1302abc-13df-49a9-a46f-86db95e34e05	1	Other	Other
+a1304128-ca58-4d29-8e3a-cb6dc9f1e4cc	1	Other	Other
+a130467a-7462-4620-be17-d347ba7b3355	1	Other	Other
+a1304b3c-d8bd-45ad-a793-8b94f7ad7155	1	Other	Other
+a13106e0-07fa-4215-956d-dade0413229c	1	Other	Other
+a13108e1-d683-470f-8a05-bf93fc7f06f4	1	Other	Other
+a131907c-8d62-485b-a2b6-29980ec31f34	1	Other	Other
+a131a91e-cfcb-487d-a2ff-dc22624a979d	1	Other	Other
+a131b7aa-a8e3-481f-9191-6160f69143e3	1	Other	Other
+a131cc4d-a544-4195-8c14-231b52ab6c1e	1	Other	Other
+a131e476-f5f6-41f4-a583-e01ad806ee82	1	Other	Other
+a1320c0f-16f7-451e-aac6-d1774a9b7cd2	1	Other	Other
+a13212af-ebc8-4c1a-bcc8-9d751bbf1da0	1	Other	Other
+a132208f-069c-4646-9683-ae9d60cdb182	1	Other	Other
+a1327d1e-f07f-4da1-9703-3161e8ad82a8	1	Other	Other
+a132c2c0-5084-49f4-8d73-d3105cc8e6d7	1	Other	Other
+a1331868-9872-473a-82b2-ca17199d93a1	1	Other	Other
+a1331d19-5dec-40dd-b757-04c7d8fd04e4	1	Other	Other
+a1332549-0d25-40cc-8463-1b12e867a70f	1	Other	Other
+a13326a1-15d4-4216-9cea-cab9cb8edda6	1	Other	Other
+a13356ed-80ae-4d49-98d3-2af264e8e90f	1	Other	Other
+a1338ca3-e8be-49ab-8c81-b34d3becf22c	1	Other	Other
+a13391a9-6ba7-4242-a82c-d6cce4be2d5e	1	Other	Other
+a133e7fa-f346-4310-9ebd-837340e964c7	1	Other	Other
+a1341366-5bf9-4509-b15d-87a7b262b499	1	Other	Other
+a1346f36-3744-4ca3-bfc4-7c2be6058bc5	1	Other	Other
+a1348065-7101-42af-87e5-38c4b8414829	1	Other	Other
+a134bbaa-d185-479d-988e-a6b14c6933be	1	Other	Other
+a134d31b-596a-41bc-9bcb-4754c2a6df8b	1	Other	Other
+a134fda3-5c88-403e-b441-68c184df5708	1	Other	Other
+a1350a02-b10a-4c11-83b6-5a7d69792fd7	1	Other	Other
+a1353ad6-aaa4-47a8-82cc-cdf2cc1ba4fd	1	Other	Other
+a135534b-830c-445b-b1ad-56ec01791e36	1	Other	Other
+a135629f-633b-4228-955c-71dded46a9a6	1	Other	Other
+a135a10e-0603-47ab-9921-0cfc7a6c3372	1	Other	Other
+a135db65-3548-4631-ba7d-d7a7363bf594	1	Other	Other
+a1360124-3ee6-4e32-89cd-e63c76fa2d20	1	James	Other
+a1362f9a-ca51-46f9-84b7-4af98e02f41f	1	Other	Other
+a136a21e-99d4-4918-9ce9-753df538e635	1	Other	Other
+a136e150-6235-4a44-ac41-f5f134f5a135	1	Other	Other
+a1374f92-68ae-4821-8ceb-cffba4da2e3e	1	Other	Other
+a137a571-eae8-450c-84da-1a2e90fd0984	1	Other	Other
+a1388f32-628b-4600-bb2a-da5440d17f05	1	Other	Other
+a138ac2b-c7f6-4985-98d9-42720a5400e0	1	Other	Other
+a138b8f5-0eee-4900-b936-088f450450fc	1	Other	Other
+a13916e4-932e-463c-8fda-8ae241b3ecd6	1	James	Other
+a139295b-cfd3-4769-b0cc-f75e0c2d7f4b	1	\N	Other
+a1395693-9f76-4031-a74e-b1c1d0c7a554	1	Other	Other
+a139a02b-04b6-4341-bdbf-ad7dd0905924	1	Other	Other
+a139b14a-195d-4355-a9c7-31d9c55cfe8d	1	Other	Other
+a139e65d-c30a-4da2-b721-4319c269b8d6	1	Other	Other
+a13a4fad-afec-4bc1-85c7-11cff254f836	1	Other	Other
+a13a612b-41b3-4175-91f0-2d40b5e153ed	1	Other	Other
+a13a6fb5-8edf-4086-9311-a11f894f058e	1	Other	Other
+a13a9b21-fb27-4241-8393-5eec8985a982	1	Other	Other
+a13ab6f2-e217-4541-9563-5ff58dc91d38	1	Other	Other
+a13b19b4-20ac-4af2-9df2-cdfff1fd2f9c	1	Other	Other
+a13b993d-3049-48e2-9de4-95f2dd054ef2	1	Other	Other
+a13bb9b7-8eeb-4cce-95dd-052304401b80	1	Other	Other
+a13bdf70-addb-4a10-9723-170ee39faa3a	1	Other	Other
+a13bf16b-0cf7-42ff-a837-928c3f9f50de	1	Other	Other
+a13bf889-16f9-4382-b5ca-72fd5406d36d	1	Other	Other
+a13c4c69-3d72-4582-adfa-139e56e08e8e	1	Other	Other
+a13c8200-6b77-464c-935f-7945010dd9c0	1	Other	Other
+a13c8388-2e84-4288-b0af-2fd7e6e9d1ee	1	Other	Other
+a13cc23b-c7a1-488c-8548-059c4ea274b3	1	Other	Other
+a13cc3f0-c9d8-4d3c-8c2a-8fcc2e6e2c70	1	Other	Other
+a13cd482-285a-422e-ba81-1e61a98f0bd7	1	Other	Other
+a13cecfd-5dd6-4e13-a716-b73ad3662a70	1	\N	Other
+a13d0187-8d3f-4712-a7a9-510ebe27060e	1	Other	Other
+a13d0e17-6ccf-4541-8bdc-a75c5ef25585	1	Other	Other
+a13d1b33-3c10-437f-b56f-d168a567802c	1	Other	Other
+a13d2982-b1f2-4013-9637-1401d8d99eb4	1	Other	Other
+a13da787-2175-4480-9485-21fb725f5f78	1	Other	Other
+a13db2e8-7699-416f-becd-16f8934046c8	1	Other	Other
+a13db611-ff4e-42a8-b6f7-b11573ef36e9	1	Other	Other
+a13db847-6c21-43ec-99be-0a8ca03790c8	1	Other	Other
+a13e97db-a547-44e9-9cc1-83c1c19d82fd	1	Other	Other
+a13e9d64-c415-4e28-8115-37dc438ce840	1	\N	Other
+a13ea748-c957-4435-bbef-2cf75201e135	1	Other	Other
+a13ec0e7-90e7-4d25-adb0-fb6482a0b0a8	1	Other	Other
+a13f2189-d2a9-404e-92fb-861eee3fd3b1	1	Other	Other
+a13f2318-6a99-4a33-b391-caa565d63396	1	Other	Other
+a13f8951-5941-488c-83b8-a01aec728d07	1	Other	Other
+a13fca90-5c89-4ab2-9c5d-06e6f6d56986	1	Other	Other
+a13fd45a-b259-44a9-892e-e3fd0bf0687f	1	Other	Other
+a1402486-414c-453c-b0e5-fcd904bfe5be	1	Other	Other
+a1404993-baa9-44a5-ac36-f1a4a82f5cfe	1	Other	Other
+a1409a29-661c-4e5d-89cf-1fd8ebe119b9	1	Other	Other
+a1409d00-df4e-486b-bbe4-2b77be87a9f5	1	Other	Other
+a1409e7f-fcd7-46d4-9c7e-063696042aa1	1	Other	Other
+a140a706-f517-4bb5-a9d0-545999dc19b2	1	Other	Other
+a140bc68-243b-4a9c-afb1-19429dd5c108	1	Other	Other
+a140ca46-9d78-4a7d-b014-dceb4a9ba1ca	1	Other	Other
+a140e850-5cdb-453e-8df9-b04b71bea46a	1	Other	Other
+a140ebcd-a34d-41a2-b40b-9e0a050488d3	1	Other	Other
+a141276e-ccdf-4bd2-8315-5efdc99ae3f8	1	Other	Other
+a1416c33-7dc6-4bd8-9b2b-f3d6fefc0cde	1	Other	Other
+a1417c9a-f63c-42c9-ad09-ca2ff22d9e27	1	Other	Other
+a141a91a-c567-42fb-872f-091646888f5c	1	Other	Other
+a141da8b-42d6-4dfe-9777-4663495fca51	1	Other	Other
+a141fe6c-9500-4097-a422-09477b38c1dd	1	Other	Other
+a1421241-d41c-40d5-b6da-aaffa96872e7	1	Other	Other
+a14216f3-e922-4380-b0c1-3f69c0845121	1	Other	Other
+a1421791-70e7-489a-ae62-560e304e9499	1	Other	Other
+a1422e74-9507-48cc-9087-d24b5c849bbd	1	Other	Other
+a1424154-e58c-4289-a0b0-6a6325561e9c	1	Other	Other
+a14245f7-c39e-4bad-ad39-ee979ec30b3e	1	Other	Other
+a1426a90-4aee-4956-a751-1ce6a9c84724	1	Other	Other
+a14273ce-9e62-4d8b-b796-6eb80ed42f83	1	James	Other
+a1429f86-9ddb-43d6-85f1-3c500ae8873f	1	Other	Other
+a142be94-c2ec-4912-a035-42be9bf120f8	1	Other	Other
+a142d885-ead5-4ade-b8fc-f56cf456b8dd	1	Other	Other
+a14345f6-2ec9-4f48-86a6-0ab0a3a033f8	1	Other	Other
+a143608e-c517-4392-a9f4-2e4d617fa9e9	1	Other	Other
+a143c438-8931-4bfa-89ff-e4279d243f18	1	Other	Other
+a144a411-3f66-44cb-99df-36edef2c5869	1	Other	Other
+a144e6b1-8e99-4d1b-ab61-250090c08ee2	1	Other	Other
+a144efc9-2f8a-4787-b5d7-eb0411d8c459	1	Other	Other
+a144f7bc-7dbf-4bc7-8875-b09e0c7e90a9	1	Other	Other
+a14504b1-4028-46df-94b3-2ee7f6cd1a61	1	Other	Other
+a1454988-10d2-46c2-88ad-8a4d07e94043	1	Other	Other
+a1457bb4-94d5-427a-8ec3-c3af2d595de6	1	Other	Other
+a1458a72-dc53-4fab-b59e-602fa221c721	1	Other	Other
+a145f594-4f1a-478b-a0e5-7185df29e75d	1	Other	Other
+a146097a-fd87-4c3b-936d-11787fd72d36	1	Other	Other
+a146512f-13b6-49bf-be62-bea77594aaa8	1	Other	Other
+a146e9a4-c091-413e-b3a0-b95e05acd7d7	1	Other	Other
+a14722fd-23dd-48fb-ab58-b50599cac2a1	1	Other	Other
+a1472a5d-1d89-4acc-8b19-e66272ee4d47	1	Other	Other
+a147b944-3b3c-437e-8828-3f5a18879c11	1	Other	Other
+a147c5fb-8cf5-4c6d-b895-f96219bea42c	1	Other	Other
+a148135f-e7c9-44c2-b0f5-ee0dd8d1aae9	1	Other	Other
+a1481da8-fc27-4e52-93fb-9a530e1d9cfa	1	Other	Other
+a1489bbf-ca63-4235-93fa-2a5578b01451	1	Other	Other
+a148aeec-8830-4a56-8d67-b0b401b14e6e	1	Other	Other
+a148b22c-bd16-40d7-8990-2c761a510ff9	1	Other	Other
+a148bf55-181d-4bd0-a90f-1ecd530bdff8	1	Other	Other
+a148f8bb-c009-494a-a28e-a257e9404cfd	1	Other	Other
+a1496b47-b887-40fe-8336-924442eb16a6	1	Other	Other
+a149a6d0-5fa2-4f68-97df-4f53ff317bf0	1	Other	Other
+a149b533-2630-41ef-bd3d-95070a6b2487	1	Other	Other
+a149e1ed-7b8c-4191-b752-a5b7e8aa85b3	1	Other	Other
+a14a1233-8143-4aaa-ab08-b369219eaf19	1	Other	Other
+a14a90b4-0181-441a-a2a5-a1497a47532a	1	Other	Other
+a14abfc8-f31a-45b0-a615-06477b8b22c4	1	Other	Other
+a14b5644-bd24-4b2c-9e49-b7ed5ddb5ad8	1	Other	Other
+a14b81d7-6bb6-4877-9f48-ea1e1949ec2d	1	Other	Other
+a14bce22-8187-45e6-afa8-26c47e5a9d64	1	Other	Other
+a14c1355-7f54-45e2-a25d-5d46f65bbaa9	1	Other	Other
+a14c2ed0-1ca6-4179-ac53-b1f11df1d0bb	1	Other	Other
+a14c84e9-eb87-49e8-bdd2-809ce017246c	1	Other	Other
+a14cb5fe-f752-4b6f-ab5c-32bab6215d83	1	Other	Other
+a14cbb7f-bd0d-4f10-8892-350ee54c42d2	1	Other	Other
+a14cc732-72e9-4f4c-9503-e686b21aaff5	1	Other	Other
+a14cc8a4-5c63-421c-8801-6b0c8a6ab3f6	1	Other	Other
+a14cd440-d1c5-4adb-af97-56aeb04d80d1	1	Other	Other
+a14d0731-1bfa-4734-9b61-a8dfcd2ff791	1	Other	Other
+a14d0bcf-ff24-4041-a4a7-2429deff2d35	1	Other	Other
+a14d6d8e-9715-4aca-ac60-f5803c095df3	1	Other	Other
+a14d8705-fb24-47ed-89ec-c7c615f35c7c	1	Other	Other
+a14d9edd-4e49-48c1-aee4-25a614cc8ff9	1	Other	Other
+a14db075-12ec-4b14-8aeb-c2b4929578ba	1	Other	Other
+a14dd295-a4a3-41cb-980f-d72d1ed5fdc5	1	Other	Other
+a14e11cb-ee1a-440e-8f4e-d61b81666b23	1	Other	Other
+a14e7ba7-f147-4ee0-ac5e-3d94ec39f36e	1	Other	Other
+a14ec4e0-7242-471f-9840-e3f648d66a16	1	Other	Other
+a14eefb6-e0a5-4e37-834d-cb4e4cfb2ed3	1	Other	Other
+a14f01cf-4e0b-4c91-b9f0-27fab26b5a1f	1	Other	Other
+a14f8ba3-f882-4110-9bc6-fd8505e99308	1	Other	Other
+a14fdd1d-903a-41d6-9df6-325273a085cc	1	Other	Other
+a14fddab-fd49-44e3-a275-0bb43d904c2a	1	Other	Other
+a14fe7dd-0778-40f6-a83c-bc3e86f8d558	1	Other	Other
+a15072e9-2641-42cc-b141-6cb7c5c53eb5	1	Other	Other
+a1507785-bc26-48a2-8022-7e710ec73c8c	1	Other	Other
+a150911b-42ea-4cfc-a5c1-093db5847491	1	Other	Other
+a150d9e0-f3f4-4b91-a39d-c67866ca41d5	1	Other	Other
+a150e88e-264a-4c77-b209-ef2ef66a4f27	1	Other	Other
+a1510d14-abb4-4874-b104-20449b56fd20	1	Other	Other
+a15185d7-90e0-4cbf-a550-05424978ca9a	1	Other	Other
+a1522259-57a3-4a80-b1a1-a90ff38d82e9	1	Other	Other
+a1523256-8868-43bb-a8f5-3c1c604fcd81	1	Other	Other
+a15245a5-e5b6-459b-8a61-4b79d2bdc1d9	1	Other	Other
+a1525b92-46b7-4210-a0ac-a9d8c819ccde	1	Other	Other
+a1528218-8c15-4991-885a-faf761e7745a	1	Other	Other
+a152899a-86ac-4c3a-8612-16d05f18ca7c	1	Other	Other
+a152c5b9-78e3-4a7b-a04e-cd1c33b4c5e7	1	Other	Other
+a152d522-956b-440d-b31d-5c3ad49b6936	1	Other	Other
+a1530fd4-ab6f-4e9f-b933-b820ac1c5187	1	Other	Other
+a153aaa5-6b1b-4c8d-a7e7-600a0c496c24	1	Other	Other
+a153df74-9c86-11e7-9261-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a153e0dc-c859-459a-976c-f35d252ab322	1	\N	Other
+a153fc28-c191-4006-a65b-7a540afec514	1	Other	Other
+a1546f08-5f76-4258-8bc2-7a2b35425836	1	Other	Other
+a1547413-1242-41a1-a8fc-0ebca7cc80e7	1	Other	Other
+a15592cd-7f13-405f-8a43-12896c18a6c3	1	Other	Other
+a155a48a-b9ce-4f5f-a526-da26bf8ae2e6	1	Other	Other
+a155b191-40f2-4abe-a6ae-26b726167e40	1	Other	Other
+a155bac2-23f3-49ad-be06-ff4e7d9f0b64	1	Other	Other
+a155c921-2f01-45af-ab1c-e0e602b382f7	1	James	Other
+a15604af-d306-441e-bac2-b6b5caaec49b	1	Other	Other
+a156179e-ad46-4793-a4dc-73ff37e1e308	1	Other	Other
+a1561915-ecfd-459f-b672-a542a9a27dd1	1	Other	Other
+a1565bf0-b28a-4e89-95db-4cfd58e9583c	1	Other	Other
+a15677b4-1df9-49e4-a7e7-00e5cb3c6cd8	1	Other	Other
+a156cdd0-fb06-4f0e-94d1-ba98d3add870	1	Other	Other
+a156eabc-ee60-43ab-9184-b6828313d794	1	\N	Other
+a156f771-854a-4d57-9a3d-bd36784388a5	1	Other	Other
+a1570d01-cb2b-43ce-803d-1655d48a41e6	1	Other	Other
+a1572111-4424-4b87-ab54-a8057d230254	1	Other	Other
+a1575360-0e05-4e1d-acaf-899cc4fb8706	1	\N	Other
+a15756dc-1f1f-4808-b73f-5fee468d8284	1	Other	Other
+a157bac7-5c1e-4347-b34e-7de0e90a3788	1	Other	Other
+a157d4b3-847a-462e-aa6c-f1eafefd298b	1	Other	Other
+a1587866-5882-4415-984e-b3ed554254d7	1	Other	Other
+a15908e0-9a77-462e-9782-d941f93de8f4	1	Other	Other
+a1591bee-e201-486b-9ff6-9b678cf9d65b	1	Other	Other
+a1592d45-34d9-44d8-9f45-1929543a3395	1	Other	Other
+a1594f62-ee98-462b-b243-3caaaaf91b04	1	James	Other
+a1595214-fbc4-46d5-8227-f5177e79222a	1	Other	Other
+a159586f-924d-4754-a41b-56a59dae1fa3	1	Other	Other
+a1598d30-26c8-488a-bf18-f0517e4c074f	1	Other	Other
+a159ab9a-8570-4f36-baed-3704c9b53879	1	Other	Other
+a159ae86-2c48-496f-914a-707d183f08e0	1	Other	Other
+a15ac9a1-214c-4fb6-8f4d-5b8be7e9d80c	1	Other	Other
+a15adca9-7eb8-4e4b-bc08-725c5c331b8a	1	Other	Other
+a15af65e-f96f-4caa-9317-4d61e2067aee	1	Other	Other
+a15b3ac7-a57d-4642-806f-db26f2e0c06c	1	\N	Other
+a15b3e16-043f-44ea-beef-f0d08e996f3d	1	Other	Other
+a15bc5e4-6e08-4794-afe8-59bdc21ace85	1	Other	Other
+a15beefc-34d8-46a2-87bc-5fabff8df745	1	Other	Other
+a15c2250-63bc-4c21-ae61-d9543b451c69	1	Other	Other
+a15c3e57-acd7-4ea8-96fb-c871f7295e94	1	Other	Other
+a15c70e8-93c8-4d6f-9271-2f2c03bd286b	1	Other	Other
+a15c86ff-8f98-4daa-8bc1-69415d822623	1	\N	Other
+a15ccd31-d8b4-4e47-8360-bff4588f826c	1	\N	Other
+a15cdb71-95f8-4219-aa64-fad05520f1c6	1	Other	Other
+a15d4833-7d14-4e3d-94f5-a4878e701839	1	Other	Other
+a15d9239-8209-41ab-ad16-9991231996f0	1	\N	Other
+a15d9d43-08bc-44d2-b6af-4b43c4ce8fd9	1	Other	Other
+a15dbf3c-251f-4f10-b215-3c7220c7aa7a	1	Other	Other
+a15dd654-e602-4a29-80d6-6746d86947e8	1	Other	Other
+a15de565-a44b-4c58-8369-ef508148901d	1	Other	Other
+a15e71cd-6eab-4449-9a95-0d0daf2966ff	1	Other	Other
+a15eafa0-f1af-4681-90ff-c8462d3a8ebe	1	Other	Other
+a15ed974-d7af-43bb-86f1-836a773679b4	1	Other	Other
+a15f14fb-477d-4aed-9c94-bc7d45b3b9a7	1	Other	Other
+a15f21fa-b9b6-42dc-a66e-65bf4d8fd349	1	Other	Other
+a15f7628-0590-4175-983b-d48be6cf4cf0	1	Other	Other
+a15fa091-8c60-4c48-9006-c88892442b21	1	Other	Other
+a15fef7e-fb7b-45a7-b1d4-6e0be6bd6961	1	Other	Other
+a16001c8-5f38-484e-9980-d9638d2069c5	1	Other	Other
+a16003eb-428a-4ab9-bc5d-305ed3a3717d	1	Other	Other
+a1602032-03a4-4e57-8ebf-c8b7ab0d2f0e	1	Other	Other
+a16031de-e262-4a2d-bfb1-185ae6366827	1	Other	Other
+a1603ea5-ca1e-4a01-8348-aea7c50869e9	1	Other	Other
+a16059a2-5c3d-45a3-a890-87b4b9bb44d8	1	Other	Other
+a16096e1-5c63-4292-9282-14a563b8418f	1	Other	Other
+a1614aa8-aaf0-4061-934b-61d0354f668f	1	Other	Other
+a1615293-1309-4a71-8870-75f74ba4ba9d	1	Other	Other
+a16165fe-93d2-4c20-bd64-433f91e47a23	1	Other	Other
+a161733d-3e5e-4c77-816f-16fe2ded746a	1	Other	Other
+a161948d-84a6-4417-9019-edc0b770f132	1	Other	Other
+a16194d5-b352-4cfa-98ed-4516b9c89dca	1	Other	Other
+a161b4d8-2499-4e25-b9e8-767b6a310c2c	1	Other	Other
+a161bd1c-63e4-45cb-9c14-c0f4f1e2744e	1	\N	Other
+a161ccc5-b05f-431a-8c57-7d2a3e412fd9	1	\N	Other
+a161ced0-1c22-42d3-a03d-ad39a5a74e22	1	James	Other
+a1625660-4321-4759-933c-baf6a92292b8	1	Other	Other
+a1630af7-239a-459a-b54c-5064d82102b6	1	Other	Other
+a1633761-b08c-482a-b59f-21184ca8d797	1	Other	Other
+a1637a06-eafb-4da1-a948-16145147af15	1	Other	Other
+a1641242-b93b-4fd5-83dd-3de7516f86c4	1	Other	Other
+a1644ca9-483a-4c0d-82b6-b4063ff65561	1	Other	Other
+a1645caf-53da-42e0-9697-3a26fa97b1c4	1	Other	Other
+a1646e54-8fe1-4342-8ccc-7729d46e70f0	1	Other	Other
+a1654b3f-81b7-4a03-ab9c-476071d61331	1	Other	Other
+a1654b7b-ab45-4557-acbf-9929c5a154c0	1	Other	Other
+a1656148-5514-49ce-977d-6b9c51be0daa	1	Other	Other
+a16578c4-93a5-49e2-96e8-c7cbad556ebd	1	Other	Other
+a165ba99-e6ca-43bc-86ac-5cfae4d70e80	1	Other	Other
+a165f65a-1584-4328-a3c9-f99618ceb706	1	Other	Other
+a1661aec-ef2a-44b4-a7cb-072a90b0fd5c	1	Other	Other
+a1663cfb-8223-42f6-a0eb-ab670213e899	1	Other	Other
+a1666e17-42aa-4b1f-8932-70354f791fec	1	Other	Other
+a166705c-7f0a-4c0f-95fb-87c545ffbd21	1	Other	Other
+a166b922-78ce-45e2-a2c3-fe72ee2c9464	1	Other	Other
+a166eebe-7b53-4227-b87e-7846c9a70700	1	Other	Other
+a16792f9-1cbc-40f3-bfcc-a01b5755b363	1	Other	Other
+a1680032-cd80-42d4-a958-d9e10183d5a6	1	Other	Other
+a1684b50-4532-45c8-bed0-10970f9d551f	1	Other	Other
+a1686d97-49dc-41fa-84f5-a95687751acb	1	Other	Other
+a168b302-5e99-4609-b550-eb994fc443bb	1	Other	Other
+a168c846-1f6d-4eca-b429-081cd0831d0b	1	Other	Other
+a168da79-3cee-485a-91ad-6fe40e5dce8e	1	Other	Other
+a168e3d8-11a3-49d9-9aef-740c4d201ae1	1	Other	Other
+a16908d0-9779-4328-9d23-5a1ccfd77dae	1	Other	Other
+a1698951-081d-4886-9ae2-bc51396279a4	1	Other	Other
+a1699a85-a078-4317-a349-e1b7f71fb753	1	Other	Other
+a169a817-d888-45a4-a788-485bbaaa3159	1	Other	Other
+a16a12ad-91ca-40e7-93b9-7ca1c4366f9e	1	Other	Other
+a16a3741-d516-4917-b321-b4262da4f92b	1	Other	Other
+a16b01d1-26f1-45f3-a1b5-181ac874c9cb	1	Other	Other
+a16b682c-f8e7-4e3d-9b93-8eb33b225c90	1	Other	Other
+a16be086-5640-4baf-b802-52702cdb896e	1	Other	Other
+a16bf5df-c734-4340-aa31-e3dd44c0664a	1	Other	Other
+a16c369b-662c-4cb9-a374-dff467e1a153	1	Other	Other
+a16c6ec2-5e55-4f8d-ba95-3ef25ea84525	1	Other	Other
+a16c6f33-3866-474d-8c02-23ee839d5b9f	1	Other	Other
+a16d3d39-ec10-4fbd-b800-2ec16ce46912	1	Other	Other
+a16d6064-a554-4758-872a-d14d6627b8fa	1	Other	Other
+a16da674-c1c9-436d-8d99-2d36f1aaa90f	1	Other	Other
+a16e18aa-8ad4-405b-a323-01e4d926bf38	1	Other	Other
+a16e9464-e61f-40e1-ae19-4c63ffb70935	1	Other	Other
+a16edfce-35b6-4071-8828-95884d7e17be	1	Other	Other
+a16f17f8-fc7a-4a9b-b7c9-603e191956dd	1	Other	Other
+a16f207a-8c08-4516-880a-a32ca11189cd	1	James	Other
+a16f382a-ee20-427e-a2d8-33e5d8c9211b	1	Other	Other
+a16f3b3e-89db-4bbd-b7ce-e0f65044a4e8	1	Other	Other
+a16f5ff2-b76e-481b-820d-fcc777e12c57	1	Other	Other
+a16f86ea-c350-4601-a069-f2b0b4de8ac5	1	Other	Other
+a1700496-83d4-4ddc-943e-75bb2c4affe6	1	Other	Other
+a1706c08-5584-4b87-87d2-78a20f0f6450	1	Other	Other
+a170ebcc-e98a-4e56-abe0-d74a4ec40dfa	1	Other	Other
+a1714d4f-8188-4cf3-89f2-0f5a2e3ed507	1	James	Other
+a1715170-e612-4edc-9a6e-19b2089d27a4	1	Other	Other
+a17159b8-6ab1-4cf1-ba1c-1650a02197e5	1	Other	Other
+a1716f6b-604b-41b1-9c77-6fc3c3b87570	1	Other	Other
+a171c253-8d70-4893-99b1-f66e3a1271ee	1	Other	Other
+a171c4d2-9456-4b79-90e2-53578d12e118	1	Other	Other
+a171e12c-4fa9-4140-9973-587a2c40a320	1	Other	Other
+a171f63d-cd9d-4f9e-bd35-944a564ef345	1	Other	Other
+a172731f-b406-4f28-88c6-7eb93680ab98	1	Other	Other
+a172ae09-1abc-4c54-8cf8-b62225cc131e	1	Other	Other
+a172ef8e-3b6a-49ef-ba9e-bf9f24a29fba	1	\N	Other
+a172f4c2-3449-4561-a073-a8142811071a	1	Other	Other
+a172f8c0-8aba-49aa-b4c2-96520d74ac70	1	Other	Other
+a173030f-4e8e-44e7-8262-07f6548ec1f2	1	Other	Other
+a17341ec-6ee4-4365-9574-e96ef3e1a996	1	\N	Other
+a1739ae0-5bea-48f4-aad6-64da0acc1801	1	Other	Other
+a173aee4-7cc6-409d-aeee-9523f6680cf8	1	Other	Other
+a173e3e1-7bfa-414d-93d5-3e12dd35b991	1	Other	Other
+a173f328-d177-4439-9fdf-3674167dcdef	1	Other	Other
+a17407e3-3779-4b98-a037-f08c5e87b9f0	1	Other	Other
+a17412da-3ffc-4bf6-abfe-f1be253548c3	1	Other	Other
+a1743608-bddc-4a96-bd67-0809353cc5e4	1	Other	Other
+a1746821-c1d6-490a-b196-2bdddb06931e	1	Other	Other
+a1747b7f-7fbc-4245-818d-3c2af0187895	1	Other	Other
+a174e8f5-dda2-48e8-9c85-31a20a7e6e3d	1	Other	Other
+a174ec56-2b91-4b6e-9cd7-a093d1b1f7d1	1	Other	Other
+a174fa22-6a8d-4041-abfe-1556d828eb1b	1	Other	Other
+a1752308-b218-46fd-b6f2-bcdaac5affad	1	Other	Other
+a1753f00-8cc9-4bd4-9513-6e6cc8eb94e8	1	James	Other
+a1755474-c980-47b2-8f56-8e7a06247dfd	1	Other	Other
+a175c433-99f3-4013-8fed-b4be7ea71a56	1	Other	Other
+a176303f-438a-44d2-9951-fa4713cb862a	1	Other	Other
+a1764191-85c0-4a27-a7e2-4b65f1d6e648	1	Other	Other
+a1767396-3fea-4169-a6d8-d5f36bf03f56	1	Other	Other
+a1767a2a-abb6-44fe-97cb-a139ffb94b71	1	Other	Other
+a176d712-87e8-4e47-9115-1cab89976b22	1	Other	Other
+a176f1c5-08b9-4e4f-8c03-f7249fb2181b	1	Other	Other
+a1776475-2ae8-433a-82f2-1bd4c6e86114	1	Other	Other
+a1776be0-0b97-428a-8ca2-ec046b87b6f6	1	Other	Other
+a177755a-8f6f-439a-a5de-e2d99a99a941	1	Other	Other
+a1779644-f5d5-486f-97f4-4ec9d3199ac6	1	Other	Other
+a177c589-002c-421b-beec-97d9dc86a0c3	1	Other	Other
+a1783daa-e130-48c9-a7d6-f35cffbdbb3a	1	Other	Other
+a1784627-8a12-4fa1-a092-f54c93593571	1	Other	Other
+a17863ea-6c1c-4728-954c-70ccb57870f0	1	Other	Other
+a1789ed9-280e-45bd-9950-8e89c9f65501	1	Other	Other
+a178c4e2-89ec-48cc-81bb-5d032365cbb1	1	Other	Other
+a178c893-071a-4337-847c-fa5a318e733c	1	Other	Other
+a1792cc4-6850-44a5-a05a-91f9ba4361e8	1	Other	Other
+a17941eb-45e5-44c7-b099-4160412ecfba	1	Other	Other
+a179c9c7-bc1e-4f04-8347-97b12fa780e6	1	Other	Other
+a179d6af-4f52-4373-bb16-d46ffecc4a14	1	Other	Other
+a17a3dfb-df4c-4c56-bc8b-896faf9f22e1	1	Other	Other
+a17a498e-6bc8-46d9-a462-16bcfea1e178	1	Other	Other
+a17a50cf-8a7b-4c1a-bd4e-f63c31822c4d	1	Other	Other
+a17a9757-1e52-440c-b5af-44a2f23e2ff2	1	Other	Other
+a17ab03f-11bc-4399-99ae-7cf935d5eefa	1	Other	Other
+a17aca29-4e84-457d-89a3-43d36d1fe1a9	1	Other	Other
+a17acb42-d196-4a10-98d9-10494e1fa860	1	Other	Other
+a17b0387-a7c7-4a3b-a13b-7570d66c1405	1	Other	Other
+a17b914c-2f46-40b7-ab98-981522f9edc8	1	Other	Other
+a17b9db9-fe6a-4756-9b4b-7116b4cda4c9	1	Other	Other
+a17bfcfe-dc80-4384-a330-ff7335aab3c0	1	Other	Other
+a17c0d7a-02c8-4b90-aa5e-1f52bf00dca4	1	Other	Other
+a17c1bc6-dfaf-4ece-afec-20bb6547a649	1	Other	Other
+a17c2e3f-6c89-438f-bf6e-e5fe53351403	1	Other	Other
+a17c4ce8-d0ee-4407-b259-00372a7439c0	1	Other	Other
+a17c62e1-5ee1-43e5-bd1d-3131c3f79395	1	Other	Other
+a17c7813-0fac-4b48-bcf5-0cacac11b448	1	Other	Other
+a17cc0bc-3f41-4765-81a5-6d5d9b2feff8	1	Other	Other
+a17cf569-478f-4fa5-bd7d-a1dd90b94ea2	1	Other	Other
+a17d35ee-ec3c-46f9-93b3-2406bc0f800e	1	Other	Other
+a17d3e83-9142-4e88-bb05-c89d1f82594f	1	Other	Other
+a17d8de6-b5f4-498c-8b96-a0670c5d32ae	1	Other	Other
+a17e3669-ac34-4e23-9bfc-ed9db1b99cec	1	Other	Other
+a17e43a6-5d68-4a1b-9140-4d215c5ade85	1	Other	Other
+a17e6188-0886-49b0-b9a3-06a75349b00d	1	Other	Other
+a17e654a-d1c2-4a85-b125-11f369650da5	1	Other	Other
+a17eec87-d35d-4283-b8f8-8f091db76bd2	1	Other	Other
+a17eed9c-6425-4719-9ef9-6b6f5352a6a2	1	Other	Other
+a17f0b78-3f19-4b86-a791-3c7335d3f405	1	Other	Other
+a17f2b68-1ef1-4c2f-b0f5-b7d75f6a6bd2	1	Other	Other
+a17f30a0-cba0-4823-8c3c-bc6aa4c1035a	1	Other	Other
+a17fab16-f2bc-4db2-b408-cbc9a67e2307	1	Other	Other
+a17fda5f-efe3-4a01-b456-96028b55a444	1	Other	Other
+a18026e7-d09c-4041-8a19-4464b1ddbd49	1	Other	Other
+a1802a59-3428-4d59-be7a-0f190d4e3ac5	1	Other	Other
+a180545f-e9c8-4103-a195-32825adc9e17	1	Other	Other
+a180bdcd-26d6-4e12-aac8-4e5f0ce866cc	1	Other	Other
+a180df1a-be83-4af3-abfc-cc01dcb0db79	1	Other	Other
+a180df35-d606-4c9f-86a9-cf832ea4429b	1	Other	Other
+a181751e-f8ab-4c3b-9213-740ecff633c9	1	Other	Other
+a1817ed1-b4f0-4f41-831a-15896cb6c4fa	1	Other	Other
+a181f358-d8fb-41a6-9dfd-a0193462c050	1	Other	Other
+a18204d9-c5a4-406f-ab93-60beed7eee38	1	Other	Other
+a1820518-5014-4c07-915a-86d6c439aad1	1	Other	Other
+a1821a0a-e809-4bda-b2aa-851d16fb3c13	1	Other	Other
+a1822542-7017-4bf0-bca5-e6530018a715	1	Other	Other
+a1827fd8-fc91-4432-9f87-c196a91b3197	1	Other	Other
+a182830f-52a4-4f55-8abc-8e4a1566870c	1	Other	Other
+a1828fbb-883f-42ee-82e4-2e58796754be	1	Other	Other
+a18298b2-0f64-4167-8c60-c862079a8ea3	1	\N	Other
+a182a78d-76f8-4a37-b69a-aaa1086838cf	1	\N	Other
+a182f9b0-f832-4b12-85c6-7ee8bede717d	1	Other	Other
+a18367db-75f9-4cb2-b285-69a795430485	1	Other	Other
+a1839e24-7274-4302-9535-911d2e181225	1	Other	Other
+a183a754-5493-4174-8e60-fab5dc2ed3c2	1	Other	Other
+a183badd-c21b-4641-9c01-037edb6481a5	1	Other	Other
+a183f725-6802-47c3-b611-5e9ae4ceefb3	1	Other	Other
+a183fbff-41a3-4ce6-bc30-985a5bfe1c79	1	Other	Other
+a18449fd-5cc6-44e3-91e1-f007d14eeb5a	1	Other	Other
+a184b7c2-8382-4a32-97fe-2fe1327b8a43	1	Other	Other
+a184bfda-74af-4cfb-8ba2-e65e0de64876	1	Other	Other
+a184e46a-d4a0-4c27-b4ca-3a4e1f307b9d	1	Other	Other
+a1852649-b1ef-40c0-88d5-2a9378f16214	1	Other	Other
+a1855658-e4cb-471e-bb6e-56c4bdd8341c	1	Other	Other
+a18558c3-285c-458c-a2ff-4650e937c9c9	1	Other	Other
+a185bcaa-9f5b-4269-bf24-1a06584a4fac	1	Other	Other
+a18607e2-856d-4abf-ad3c-23006c541b98	1	Other	Other
+a18608dc-53a2-4db5-9682-0d02634c68fa	1	Other	Other
+a1863549-78ab-49d6-a306-cdd77650ec6a	1	Other	Other
+a18662b6-6916-4307-abe7-e370348d3b51	1	Other	Other
+a1869218-71ea-4088-9330-c25c30bc9552	1	\N	Other
+a186af77-4754-4965-a80f-15e2317df108	1	Other	Other
+a187016f-bc95-47b7-b105-3fb5ef00eceb	1	Other	Other
+a1876ee2-5975-46f0-8c5a-e29ccc7f55f1	1	Other	Other
+a1877d5a-dd0b-4153-8b68-cb54d4418f5b	1	Other	Other
+a1879542-f60d-4b9d-9bd9-909ae15e7769	1	Other	Other
+a187a53b-1110-4b59-8605-9fa75cb51fe9	1	Other	Other
+a18846e5-2d63-426a-be5c-ce9ee7fdfff1	1	Other	Other
+a1887e43-6d9d-41ea-b5c9-4a93ad68844b	1	Other	Other
+a18880b2-c6f4-467a-b6eb-a82e3356d485	1	James	Other
+a188cd7e-d33b-4173-83c1-03effba33640	1	Other	Other
+a188d8c7-4bb0-4eb9-b4f1-38a0f0adc228	1	Other	Other
+a188da3d-ced8-49ff-acae-1f114fa3eae7	1	Other	Other
+a188f4bf-0a83-41d0-ae6d-f52665c02529	1	Other	Other
+a18934e5-ad13-4e36-ae7c-adf39e0bab41	1	\N	Other
+a1896d7a-f67b-4104-85c0-a85bf66c902d	1	Other	Other
+a189c30d-b0a7-4823-9b44-22b32b2f397a	1	Other	Other
+a189ffcc-51e1-4495-be03-ced88da57a17	1	Other	Other
+a18a38e7-f4cb-4c7b-a2dc-6aaf79edeea4	1	Other	Other
+a18aef30-9bd5-4e7c-b699-3928721b0ff1	1	Other	Other
+a18b16d0-782e-4a31-aa20-0522438cb606	1	\N	Other
+a18b6e15-eda0-4ee8-8342-babd29bff2eb	1	Other	Other
+a18c0548-0e65-47f3-ab56-411053bcc29c	1	Other	Other
+a18c0992-53df-4b3e-95c2-40d3918c30ee	1	Other	Other
+a18c13f4-86da-49f3-9197-6216963250f4	1	Other	Other
+a18c52f6-9b1f-486a-93a5-229b284a7448	1	Other	Other
+a18c95c1-a7f0-4d2b-8fdb-a37d16b20a74	1	Other	Other
+a18cbb9d-ceaa-43c1-a26c-30d7671a3c1e	1	Other	Other
+a18d118f-51fa-4eaa-8c58-eb32dc2a528a	1	Other	Other
+a18d4057-fe2b-4840-943f-e93f77164d4b	1	Other	Other
+a18d47d9-10a3-46fc-be18-893985688e04	1	Other	Other
+a18db218-2132-4c1a-b0bf-b474b77ed80e	1	Other	Other
+a18db839-9b19-400d-a1ad-c0b0a78ab80a	1	Other	Other
+a18e205a-8917-4741-9063-1e571f243a53	1	Other	Other
+a18e4d4e-d45f-4c58-93b3-903519828d02	1	Other	Other
+a18e7db3-195a-405c-ad0a-06ed450c5a1e	1	Other	Other
+a18ee844-f60d-4300-ae92-3ddfd115437c	1	Other	Other
+a18effcf-aad4-4b5d-936b-6503bdfafb39	1	Other	Other
+a18f074e-e0fe-476c-bc92-1e2aff47300d	1	James	Other
+a18f0e27-0781-49b2-a03a-3fdd30448270	1	Other	Other
+a18f2d01-82d2-4b67-baab-19e2f5f4fdb1	1	Other	Other
+a18f4af3-d6e7-4749-a1de-42e67624c9c5	1	\N	Other
+a18f4b44-ee3d-44ca-a865-9f5f254a1969	1	Other	Other
+a18f4ec7-0d5b-4be4-acae-8b43010467c6	1	Other	Other
+a18f72b1-d49b-44bf-a31f-0ff6d4a6c1e9	1	Other	Other
+a18f934c-2fa9-47b5-9684-fe93e780e8e8	1	Other	Other
+a18f9fb6-2b90-43b4-9ada-0d5cb84bbda1	1	Other	Other
+a18fa96f-5f79-4dd5-a4af-99eb48e0ca98	1	Other	Other
+a18fb941-2a8f-4c8d-a392-a57dcb2ac3a4	1	Other	Other
+a18fe783-b823-4158-ab2a-c4c4f0458c1a	1	Other	Other
+a18feda5-60f8-4b5b-8242-94f48c5f1a36	1	Other	Other
+a1900e33-9aa3-4509-901f-687ff84b0079	1	Other	Other
+a1900fca-b2ae-462f-880e-225085cf60cd	1	Other	Other
+a1907bf8-5ffc-4ea9-9782-aacb32f86cab	1	Other	Other
+a1909b81-9471-4db2-a0a6-5bfd6a8519a3	1	Other	Other
+a190f647-c50d-447f-9cb9-e677dc72ac51	1	Other	Other
+a1914e14-7e43-4c40-9480-29291b47c2c0	1	Other	Other
+a1917ad2-afab-46d4-a473-fbc178a1f83c	1	Other	Other
+a191c035-e93b-45ae-8e15-7b173c6e7790	1	Other	Other
+a1920841-4a7e-4623-aa7b-5ecc00b45bc0	1	Other	Other
+a192138f-71f1-4bf4-9575-265a310cf57f	1	Other	Other
+a19232f6-56cb-4210-9d2b-5009972dcff1	1	Other	Other
+a1924d64-abf5-4c8b-850f-ac889866da4b	1	Other	Other
+a1924e3d-9371-42ac-a706-02b5c2185bcf	1	Other	Other
+a1928999-dacf-42ec-abe4-42aedbd4d19d	1	Other	Other
+a1929416-f733-4cc8-854d-f67ec6c01187	1	Other	Other
+a192be24-24a7-41a7-b830-86c20c625bc9	1	Other	Other
+a19323ff-378c-46b0-9b4a-70765e71f488	1	Other	Other
+a19367c2-fc18-4a45-9582-34589638eafd	1	Other	Other
+a1936eeb-9c03-4a77-8e2d-72e82c3d4529	1	Other	Other
+a19384ed-ef26-47fa-afe1-eb5e68c5fe7d	1	Other	Other
+a193cb0c-95a5-4718-814b-f51156db7670	1	Other	Other
+a193d3de-e003-46f7-a357-eee5ddc809fb	1	Other	Other
+a193fdc5-2334-4b35-a57a-1f2d1fcb05af	1	Other	Other
+a193ff30-68ab-4cca-b2ef-179b73409121	1	Other	Other
+a1947a7b-f2ef-48d4-b767-15be4f87808c	1	Other	Other
+a194b46b-1a69-4ba0-9d46-bde0edd97f29	1	Other	Other
+a194efa9-833a-4719-9858-8e362a2fe645	1	Other	Other
+a1952299-1a9b-4cd4-bc43-ed3d09c9e890	1	Other	Other
+a195865f-13b0-41ab-bc73-1d7c563f1f0c	1	Other	Other
+a195bd69-6bd1-4a39-b7b6-eeb5e239b818	1	Other	Other
+a196ad50-73bc-43e4-b119-41e100a2e92e	1	Other	Other
+a196ca37-0156-4533-9bef-c43bc6cc66ac	1	Other	Other
+a196e3c2-a649-4a2f-b5bb-fcd29019ba38	1	Other	Other
+a1971763-2c5b-4fc8-83c1-1a7cd688870d	1	Other	Other
+a1978346-eaf4-4ec1-a104-91d0cbd6bdae	1	Other	Other
+a19811d1-34e2-4e53-b61b-d7eb9abc053f	1	Other	Other
+a1984aef-e3ec-4146-8827-95af0f32515d	1	Other	Other
+a198f484-852c-45f6-afd6-fbaf83383793	1	Other	Other
+a19988ed-a768-462a-adaa-d025684619cc	1	\N	Other
+a199e695-8b73-4c4c-8b22-b880358ca7af	1	Other	Other
+a199f001-c262-4133-ad40-1e55795b50f2	1	Other	Other
+a19a09ad-a719-4280-9a29-444b747908cc	1	Other	Other
+a19a4acc-1277-4280-a7e6-2754acd5abf7	1	\N	Other
+a19ac191-1f22-4d57-b2c7-8d4ec8cfac87	1	Other	Other
+a19b7107-a055-4a17-9b67-9d926c545742	1	James	Other
+a19b7b22-59f3-474f-a157-22b67e673e7e	1	Other	Other
+a19b9b6b-b6c6-40d5-a422-9f5622783491	1	Other	Other
+a19c0126-bf2d-4258-8550-c2efad090233	1	Other	Other
+a19c1d65-a377-4fc4-aa44-bfb4beba3d6f	1	\N	Other
+a19c3832-7c85-4c10-8801-6f4797f40aed	1	Other	Other
+a19c3b17-8bc2-41a7-bf66-bd392b7506bb	1	Other	Other
+a19c560e-ce43-4507-a614-a3af4e089be0	1	Other	Other
+a19c5b02-b4f4-47a7-bc2d-70a76f899656	1	Other	Other
+a19cd67a-474f-4f2c-8aab-8c9d5c80ad84	1	Other	Other
+a19ce0b2-c60b-4acc-8a77-eb54ff9d686a	1	Other	Other
+a19d41b6-711d-40f4-9c57-377f71b3a89d	1	Other	Other
+a19d913a-652b-42b2-8c13-ab8d040bf368	1	Other	Other
+a19dd8a4-fc74-47eb-a330-76ae221f0fdf	1	Other	Other
+a19e3f9e-e0a7-4f91-bc81-a9b9088651bd	1	Other	Other
+a19e6105-c0f0-430c-89db-d0837b7ff54b	1	Other	Other
+a19e6894-f7ba-4474-b670-59a447bfa258	1	Other	Other
+a19e8581-a547-4e3a-b035-870f61147135	1	Other	Other
+a19eaa45-651f-431c-b9bd-6618acea5029	1	Other	Other
+a19ef753-d96d-4b3a-b04c-9fb252d285c3	1	Other	Other
+a19f145c-7506-4bca-9dc3-49b53b8d7214	1	Other	Other
+a19f3ff4-9df3-43e9-b296-74980de60f50	1	Other	Other
+a19f6a66-2366-4f95-92ac-3a514e16ed20	1	Other	Other
+a1a00ec0-9235-433d-b3ad-6ee22cd1d968	1	Other	Other
+a1a045da-9652-44a1-9f70-ed9b1d3ca375	1	Other	Other
+a1a054f9-db6c-40cb-9b13-7303e0ebfc8f	1	Other	Other
+a1a09441-2dbe-4b51-a8dc-4d132ab78230	1	Other	Other
+a1a0b7ca-37df-4521-b5a4-68b7e90f6650	1	Other	Other
+a1a0c5bb-08fc-4db1-baeb-dc11ef9996e3	1	\N	Other
+a1a0e077-e6f6-449e-a4e5-252e65b79b99	1	Other	Other
+a1a10ab3-f5c5-4bd9-b412-be7dc988f2e0	1	Other	Other
+a1a18a2a-97f9-49b1-af3e-8030444d64da	1	Other	Other
+a1a21ae2-36f5-475e-814a-e20550f42f69	1	Other	Other
+a1a22315-9503-46cb-bebc-7eec9603dc6d	1	Other	Other
+a1a28a8c-82fe-4001-a42b-a900eb2b6e9b	1	Other	Other
+a1a2dfea-d716-468e-9c84-c9f3c74e63ea	1	Other	Other
+a1a2eab3-f540-4829-b6ca-a79bbb3e9b97	1	Other	Other
+a1a37d60-70ea-4288-baeb-cf5ef7e78e9b	1	Other	Other
+a1a37d6f-7921-4555-83e1-7921e609b407	1	Other	Other
+a1a38f4c-420c-4707-8522-6369f45b54cc	1	Other	Other
+a1a39651-dd66-4d86-8839-ecca386ce6cc	1	Other	Other
+a1a3bcb3-286a-4714-ba4b-a0dbef3f9f4e	1	Other	Other
+a1a3eec0-cf51-4a67-a176-510b76553f1f	1	Other	Other
+a1a3fd16-843f-403b-b148-1c8c73a9466b	1	Other	Other
+a1a44b11-9ecf-4f12-af21-178a69be3867	1	Other	Other
+a1a44cd6-1e0d-45ea-9689-e8868579c145	1	Other	Other
+a1a551ca-d6bb-4466-90a2-027d649402a3	1	Other	Other
+a1a5aa1d-d088-4e7b-96aa-88cf3564b17d	1	Other	Other
+a1a5af44-72f1-41da-bc65-862cca0fb21d	1	Other	Other
+a1a67ac7-2d3d-4595-9ddc-35e3448a7106	1	Other	Other
+a1a6823b-0f0f-4d69-ace3-42cd7c15533d	1	Other	Other
+a1a686fe-3476-4f12-8c77-4b615b8c906d	1	Other	Other
+a1a6a934-3834-4ee5-99aa-10d497195500	1	Other	Other
+a1a6ba9a-6a3c-4d35-93aa-307d9d81dd97	1	Other	Other
+a1a7085f-a202-4bc1-b1ae-662a59b6b35a	1	Other	Other
+a1a78ec0-14de-40c1-8c8f-f1cac97e5b9c	1	James	Other
+a1a85280-f6de-4a29-b1ea-5a392d013ec0	1	Other	Other
+a1a8b602-76d7-422e-bf55-db8209717a98	1	Other	Other
+a1aa247f-bf4a-4d65-9159-808daa41f82f	1	\N	Other
+a1aa4a49-0ccc-48aa-b394-17743b3dc06a	1	Other	Other
+a1aa5d07-9031-4b06-ac06-e63321405573	1	Other	Other
+a1aa673c-1ef7-4977-ac5f-994c3d792e9c	1	Other	Other
+a1aa6784-95e1-4482-899a-2f144882ff2a	1	Other	Other
+a1aa7b63-4781-4640-bec1-cf43e4e7e7a4	1	Other	Other
+a1aa92e5-45f9-4ab7-afbf-383b70cb193d	1	Other	Other
+a1aa9fba-4cce-4aa5-a526-b3acb85fcb9d	1	Other	Other
+a1ab4f4e-a6f3-4944-8a2d-910bfac5632d	1	Other	Other
+a1ab862a-328c-4405-8d63-fd9022b9a79c	1	Other	Other
+a1ab9580-a4df-48e3-ae81-5e28fb5e5138	1	Other	Other
+a1abaf23-3a44-453e-ad7d-964a9bb98707	1	Other	Other
+a1abb9f0-e680-4b3c-ae6c-a9b5e8eaa776	1	Other	Other
+a1abe2ae-830c-41f5-a2ef-dc98aba0316a	1	Other	Other
+a1ac027a-f0ff-4799-992c-ae33e59cafb1	1	Other	Other
+a1ac6626-ae52-41af-987a-d8116bcc7362	1	Other	Other
+a1ac92c3-5f86-4782-ba1c-dddff6dc523b	1	Other	Other
+a1ad42b2-9feb-4cff-bfc8-1f0d8158cd68	1	Other	Other
+a1ad4dc8-019c-4425-abcf-8353e0dbfd6d	1	Other	Other
+a1ad7954-6431-4ed5-bb8f-71648963a669	1	Other	Other
+a1ad9265-aba3-4c97-8dc0-36f46cdda1d6	1	Other	Other
+a1ae0b62-43b3-42bc-b2d9-b0209985b5f5	1	Other	Other
+a1ae348a-535d-46ee-b301-ea951f4eb20d	1	Other	Other
+a1ae376b-6d24-43b8-a4f2-9abdfbad39d4	1	Other	Other
+a1ae6355-5b7b-4e60-9c10-212714379b8a	1	Other	Other
+a1aed61f-8037-4cc4-bdd9-300f379041bf	1	Other	Other
+a1aef218-82d6-4646-8627-576463bf6fa5	1	\N	Other
+a1afa31f-0d94-4f0b-a2d0-f319fdcc3719	1	Other	Other
+a1aff6dc-673c-442c-a77e-cce6dc5863fa	1	Other	Other
+a1b00cac-26c1-467a-8456-0d5b2d2b5b72	1	Other	Other
+a1b02a7e-d842-4bbb-81a5-d95328d2b94a	1	Other	Other
+a1b07626-ae0c-49c3-8ee9-027fd19822f9	1	Other	Other
+a1b0eea3-9fa1-4b54-9e69-a01276df9fc4	1	Other	Other
+a1b0f690-a70b-40be-b49e-bc164c496379	1	\N	Other
+a1b10022-a4e7-4dd7-8740-91bd1edf7a79	1	Other	Other
+a1b10537-51b2-41a8-a50a-d2c0d6a0223b	1	Other	Other
+a1b19819-5d04-4636-8432-2ee68009f4d1	1	Other	Other
+a1b1a797-a919-4bca-beab-51e022e16408	1	Other	Other
+a1b1ea1f-2af3-4da6-a931-12c30d1340da	1	Other	Other
+a1b20661-11e9-492e-a22a-3baefed3c6fb	1	Other	Other
+a1b22f7f-1058-4cb7-90f4-8f4553cff92e	1	James	Other
+a1b23d11-f2f0-4057-ae05-d1ce18c7d011	1	Other	Other
+a1b2ca49-1bb3-458f-a62c-e5035b9f86fd	1	Other	Other
+a1b2d765-d73b-478f-9552-e71bca502fb4	1	Other	Other
+a1b2ded7-6c01-47bc-809b-e5f20da3189c	1	Other	Other
+a1b350e6-ec46-4e3a-a9cc-65889c4b4f5c	1	Other	Other
+a1b35982-dac6-4b08-9dc4-f73dba756c1c	1	Other	Other
+a1b37770-3262-44db-87b2-3cec2c50712a	1	Other	Other
+a1b37855-a7a4-4de9-8aed-e4bf7c229384	1	Other	Other
+a1b39ee8-91b3-4c7a-92e8-c3cd0846268d	1	\N	Other
+a1b3a074-db92-4977-bda5-e5f17e870964	1	Other	Other
+a1b3ad2f-f570-406c-af53-3b654128c21a	1	Other	Other
+a1b3b48f-5525-4721-8750-c08fad5edf95	1	Other	Other
+a1b3d0b0-b04d-456e-9b80-1d224476485f	1	Other	Other
+a1b42672-dacb-4492-b081-2484dcd25907	1	Other	Other
+a1b46286-4227-4c7c-abb9-70206adc3b66	1	Other	Other
+a1b47213-2d9a-49fd-a716-866237deb273	1	Other	Other
+a1b4a67b-7019-48a8-80a1-dc0683a777ef	1	Other	Other
+a1b4adc6-87c3-4684-8d76-31947d54e2af	1	Other	Other
+a1b4b893-d8e8-4354-b2d7-8b05901e161e	1	Other	Other
+a1b4bcfc-653c-400c-9ad4-b0377ecb675f	1	Other	Other
+a1b54f00-60a8-4b0c-ba74-c7a0ca852446	1	Other	Other
+a1b56875-4f76-4aeb-be2f-f03d6c801f08	1	Other	Other
+a1b59302-b94b-482f-8314-49c20efb372c	1	Other	Other
+a1b5aaf0-da4b-4061-9f73-e7968461d9db	1	\N	Other
+a1b62584-64d8-425a-b0c1-88bbb56faa2d	1	Other	Other
+a1b68f3a-db29-4add-aea8-556ca622a195	1	Other	Other
+a1b6a3ac-2283-41d9-abdd-ae88a995766f	1	Other	Other
+a1b6bc5f-6967-4d17-8a9d-fdb4c60482b6	1	Other	Other
+a1b73f66-c0ca-4b7e-a26a-79806eb93040	1	Other	Other
+a1b77882-b431-4307-85b4-087db9c294db	1	Other	Other
+a1b7ef70-9235-45df-9033-9da84a38897c	1	Other	Other
+a1b898ab-c12f-4cf9-bd4a-72eec9c70cc1	1	Other	Other
+a1b8ba47-7538-47e1-bdb4-67a8e6fd73dc	1	Other	Other
+a1b8e81d-f39d-4daf-a8b8-a7e145a8127d	1	Other	Other
+a1b91ef9-617d-4d6d-9465-60c743779999	1	Other	Other
+a1b93110-cb70-4677-8561-06a424ea152e	1	Other	Other
+a1b965cb-fff6-40ee-9054-a54733368b6f	1	Other	Other
+a1b99e04-4258-404c-8b13-9b9391717b26	1	Other	Other
+a1b9c13b-bb5d-471c-9a18-81d3e6850900	1	Other	Other
+a1b9c459-c318-4b96-9499-b7c58b05a5ac	1	Other	Other
+a1b9f9a7-13f7-4d31-ab00-f44e02b8296f	1	Other	Other
+a1ba1d50-6bbf-4f9b-ba27-21c8ce17a431	1	Other	Other
+a1ba43ea-6649-47af-ae47-bf72c1ca8fbd	1	Other	Other
+a1ba4856-915d-44e5-990d-db14922e7a19	1	Other	Other
+a1ba554c-21cd-45db-9874-1afd119431ba	1	Other	Other
+a1ba5a92-d798-44a4-a43b-014de0089d5d	1	Other	Other
+a1ba6311-28af-41f6-a7b0-5179a82b542c	1	Other	Other
+a1bab762-ebf8-4091-ab4b-17a0ea157af9	1	Other	Other
+a1bb47ca-d905-4f07-8fb6-c3e81e34ddd8	1	Other	Other
+a1bb60bd-2dc1-418a-9456-9e6d31e86d50	1	Other	Other
+a1bb90e1-c827-4195-b39e-8595f4d6f159	1	Other	Other
+a1bbc230-aa63-488a-b89c-3f3058bf39d3	1	Other	Other
+a1bbc8dd-c644-47bf-878e-1d5e50462ab4	1	Other	Other
+a1bbcf63-7924-4fc3-a925-00c24d68a464	1	Other	Other
+a1bbee3b-29a2-4d66-b769-fe011da183ed	1	Other	Other
+a1bc70a5-6fe1-48d8-9360-b517b0e0bd26	1	\N	Other
+a1bc921b-8c39-4fbf-a91f-6bb0684cba53	1	Other	Other
+a1bc97ce-209e-43f0-8ccd-bbc8a89d8b36	1	Other	Other
+a1bd1b9c-b246-46d7-900c-b2ab3df08344	1	Other	Other
+a1bd4237-6c17-4596-b7ca-567c3abd5332	1	Other	Other
+a1bd43de-d793-4ac8-b1f0-74b46c33be6d	1	Other	Other
+a1bdc38d-c659-428f-b946-0a2ec562e769	1	Other	Other
+a1bdd45f-86cb-4e19-8c3d-d38ced92649a	1	Other	Other
+a1bdd57c-c944-486a-9e20-96a99e125045	1	Other	Other
+a1bddfcf-6cba-4f6c-acb6-833e8b5a84fb	1	Other	Other
+a1be1838-a5d0-494a-8d13-3a923529bfcc	1	Other	Other
+a1be99fd-db14-4d3b-91bf-0457d078f522	1	Other	Other
+a1befcd8-d2d6-4a2e-bd2a-bbb2e76d46c9	1	Other	Other
+a1bf3a0e-db6c-4295-b51f-332df1ce5415	1	Other	Other
+a1bf636c-6c61-49c7-b912-b35875635128	1	Other	Other
+a1bf75a1-e685-473e-998a-bb110a429335	1	Other	Other
+a1bfc537-88f9-4347-add0-bed445d71d4f	1	Other	Other
+a1bff9b3-1a44-46ab-b7b2-edf3671e527b	1	Other	Other
+a1c01f47-83ad-4695-9987-fd7565d99006	1	\N	Other
+a1c076fd-ddf0-47f7-9c7d-539d51b2b76b	1	Other	Other
+a1c0a4b3-b0a4-4fe2-905b-8a6c98df1c5d	1	Other	Other
+a1c0b492-bf3c-44fc-8171-84fa6c6a4f3e	1	Other	Other
+a1c0bfcc-b8b6-46a8-b154-21317e6cb5df	1	Other	Other
+a1c0c940-d397-4bfd-95f3-643a3e03ae89	1	Other	Other
+a1c15425-bc2c-40bf-b8e2-6087f399a9f6	1	Other	Other
+a1c154fd-5232-4215-afb5-55ce7ac2d9eb	1	Other	Other
+a1c1603c-4cd2-4516-b5fa-17ed7bf96aef	1	Other	Other
+a1c193ac-6f7c-4475-9892-143c51f053fc	1	Other	Other
+a1c1a2df-0f58-445a-981f-ce54e5506211	1	Other	Other
+a1c1d36c-4bee-489a-a391-0dfc72fbbb7e	1	Other	Other
+a1c265f4-8a9a-4d8f-b12d-f49d3f7ba1ae	1	Other	Other
+a1c27a46-871f-4761-b4bf-ea670e06c5bb	1	Other	Other
+a1c27ac9-535d-42e7-8d59-c96ee573fac3	1	Other	Other
+a1c2938e-6436-49bc-8585-dcc0862a7600	1	Other	Other
+a1c29bb3-499c-465a-9685-7c5acb1ae26f	1	Other	Other
+a1c2c828-317b-4d68-9208-7f1b656f87cb	1	\N	Other
+a1c2c951-79cd-4447-9f6a-c0f6f755a794	1	Other	Other
+a1c2cb6b-1824-4b8e-a393-f9a1d1d5f2cd	1	Other	Other
+a1c2d708-6de4-4cfa-9602-42c506fd96e8	1	Other	Other
+a1c2dd88-68dc-4ee5-81d7-e89fb822d4dd	1	Other	Other
+a1c3097f-355f-47b8-9505-9edaea8dc0f8	1	Other	Other
+a1c30ce2-bf5a-4939-97de-a4275ff29846	1	Other	Other
+a1c321e7-32ea-46ea-b12e-5d1fd224f22b	1	Other	Other
+a1c3a068-006e-4ca5-a1b5-941e42905dc4	1	Other	Other
+a1c4114a-8c91-48ad-9032-29d4c398f96f	1	Other	Other
+a1c4284d-7309-4f11-a89c-100c72d10cbc	1	James	Other
+a1c44007-5a04-4a3a-8034-e24e78fa92f6	1	Other	Other
+a1c47e86-d555-499d-8ddf-24fed7829b99	1	Other	Other
+a1c4ad3c-411f-46ea-b069-1c2c2bac1623	1	James	Other
+a1c4adb0-2f95-4819-ac17-fda997f62a46	1	Other	Other
+a1c4b8a6-7fbf-4c26-b4b6-1f1fd5ea5ab6	1	Other	Other
+a1c4ebb6-87b8-4cc1-9c7a-921168d52074	1	Other	Other
+a1c519af-f521-4e4e-a7e3-1863bf0d1874	1	Other	Other
+a1c5259d-3daa-4926-b76a-df685f2dce56	1	Other	Other
+a1c53b9b-4b3f-4873-84e1-25bb99e5d252	1	Other	Other
+a1c53c01-bf9d-4f7a-8ec7-e6901dc0c2eb	1	Other	Other
+a1c5511b-181c-4321-97c5-a6611474defc	1	James	Other
+a1c55dd6-37f6-4d62-9227-c86ba5cb42c0	1	Other	Other
+a1c5894d-b871-48a7-8446-fe6745a4e846	1	Other	Other
+a1c5a7f1-43fd-4956-9f80-62510bd7c686	1	Other	Other
+a1c5acad-2587-46d2-909d-eda76649301a	1	Other	Other
+a1c5bb31-4f8f-4f08-bb76-f5446f3bddc7	1	Other	Other
+a1c5ede4-d21c-4ccc-917a-dbeef1d21063	1	Other	Other
+a1c61b83-44cf-444b-8c77-88524da39d45	1	Other	Other
+a1c630e6-789f-42c0-95c7-b3bf7e82c25a	1	Other	Other
+a1c670a7-3801-491c-9442-12832280bfcd	1	Other	Other
+a1c69fa6-9b1d-422f-8f84-73f3dd3b3505	1	Other	Other
+a1c6b5cd-f98b-42cc-8392-f24e7335ef25	1	Other	Other
+a1c6c780-c17e-4904-994c-1c135754c628	1	Other	Other
+a1c7523e-393b-4a35-9468-016952d338e2	1	Other	Other
+a1c78a43-85d6-4b97-b37f-5737c85f4839	1	Other	Other
+a1c7ce1f-4c3c-4eda-8003-0b9cbdc23ebc	1	Other	Other
+a1c7d393-e708-4da3-9f48-cf558023e10f	1	Other	Other
+a1c7f11e-158d-43e1-8ba7-b3e9583084af	1	Other	Other
+a1c7f254-f2f0-4210-a026-4be3a51e6751	1	\N	Other
+a1c87251-d619-4ff4-9838-4bf2ef841c57	1	Other	Other
+a1c8a012-11b1-4775-964f-cb1f37d846d3	1	Other	Other
+a1c8cec6-cab7-4346-b07e-da6938a1b90f	1	Other	Other
+a1c8d586-7624-4858-8717-87d38afc5661	1	Other	Other
+a1c8f5de-cb17-4553-8fcc-29be50137b3c	1	Other	Other
+a1c913cc-59d4-4224-8505-dc2a6ae6fe03	1	Other	Other
+a1c91ce1-b0e3-457d-b0bb-3a862badce5f	1	Other	Other
+a1c940b8-a3d4-457b-bf70-c0b088e58d9e	1	Other	Other
+a1c9c7a1-23e3-4c84-b7ee-657a15771e48	1	Other	Other
+a1c9d860-8bfa-438d-b75e-baa04c201910	1	Other	Other
+a1c9ea73-aab8-43f0-a2cd-55ac104780e7	1	Other	Other
+a1c9fc38-fbc5-4b50-adaf-780deec256e6	1	Other	Other
+a1ca0dd0-e57a-480d-b7f4-0f8934d11d67	1	Other	Other
+a1ca268b-9233-4aec-b61c-be2e44d569e3	1	Other	Other
+a1ca3ee3-bc3e-4226-99bf-74b4b91096fd	1	Other	Other
+a1ca5b52-5d53-4375-ad3f-f9f0c991042a	1	Other	Other
+a1caa256-5a15-4375-9f3d-e4ea6e63023b	1	Other	Other
+a1caf1f0-e53d-4a96-a9d1-660ff5616265	1	\N	Other
+a1cafa08-75d5-4ee5-900d-b287ff8948f1	1	Other	Other
+a1cb2baa-ff1b-432d-baa6-4b8c5c9707d1	1	Other	Other
+a1cb4a91-d751-4c0b-9893-ea5ea9c39e65	1	Other	Other
+a1cb4bcc-0c1f-4e21-81dd-339ff4b36bcc	1	Other	Other
+a1cbda59-febc-4bcd-b475-889a0959bd19	1	Other	Other
+a1cbfa75-7013-4d47-9f20-e0628757d08d	1	Other	Other
+a1cc026c-c331-42fa-a1ee-33676646e117	1	\N	Other
+a1cc07d9-dcef-4fbb-b86c-5b40c561af52	1	Other	Other
+a1cc6ca0-6fac-4938-8215-a2dff1e40f82	1	Other	Other
+a1ccaf73-f87c-4128-92aa-4201cd79cc47	1	Other	Other
+a1ccca8f-8272-4a52-b594-935a29dcbeba	1	Other	Other
+a1ccd2c6-e4a7-47b9-bdc8-e3de43975961	1	Other	Other
+a1ccd471-60de-4fe8-94a4-8a77f2d1d50b	1	Other	Other
+a1cd044b-f0eb-4d9d-8b6a-4a2e659c5c91	1	Other	Other
+a1cd4da3-db30-4e4c-a5cc-e20dfde86a3e	1	Other	Other
+a1cd5fcd-39c6-4c1a-b076-e7670493e73a	1	Other	Other
+a1cd77e8-825a-42ce-bb69-dd8b7d4e88c7	1	Other	Other
+a1cdeadc-20d7-49fb-864a-8259d2144bad	1	James	Other
+a1ce383d-b7e0-4716-98db-c9f04744e08d	1	Other	Other
+a1ce6f3b-150e-4776-aa3d-64f82e38fab9	1	Other	Other
+a1ceb8b0-28b7-4d97-9fc4-3173f8a2b7a5	1	Other	Other
+a1cf0dbc-2d19-4661-a34d-a1fff21e323c	1	Other	Other
+a1cf3ae9-d866-43e7-9094-a8b8e57e9090	1	Other	Other
+a1cf4345-e57d-4f20-a455-dda76853a274	1	Other	Other
+a1cf5eb9-5f04-42f8-9f5f-3715d97150da	1	Other	Other
+a1cf6670-ce2b-47c8-8901-ec23346f3f04	1	Other	Other
+a1cf9ead-0f41-4ecf-9a6c-48c3ce761ef4	1	Other	Other
+a1cfd6b7-3a44-4841-9c7c-5a243a0ebc3e	1	Other	Other
+a1cfefa9-1c00-48ea-b3d0-125bf172d96b	1	Other	Other
+a1cff321-19f7-4127-97ee-271841903594	1	Other	Other
+a1d0254b-1a10-4610-b07f-faec314d80e5	1	Other	Other
+a1d05d7d-b305-4fb4-86fd-0d592b347702	1	Other	Other
+a1d0afc5-f005-429d-9675-3a8b3d85d57e	1	Other	Other
+a1d152dc-731e-412a-855d-3b9bdad00d47	1	Other	Other
+a1d1bc20-7720-4c7d-8012-fcee5df4331d	1	Other	Other
+a1d1cdd0-de47-48f9-939f-c4fd4643cb28	1	Other	Other
+a1d1eefb-b36d-4a7d-9be3-cfa070177bc1	1	Other	Other
+a1d22a6a-bea8-4ffe-a847-cb5e5778383c	1	Other	Other
+a1d23ce6-f445-427a-8ca5-7a65620edb90	1	Other	Other
+a1d25448-3af0-4676-af04-9d0833063414	1	Other	Other
+a1d25d43-e0f4-44a1-97e2-31e1c71128d9	1	\N	Other
+a1d2a336-b531-47da-8fcc-7f9e144d87b7	1	Other	Other
+a1d2d7d9-cff1-4efb-8e1f-01171c138820	1	Other	Other
+a1d344e3-92f8-4dd4-8cbb-5a5144c21bb1	1	Other	Other
+a1d373e6-0a04-4627-9c3c-a94ee2c4aaef	1	Other	Other
+a1d37e73-f154-4dab-a331-dc008e4f0c87	1	Other	Other
+a1d39f4c-0f57-4e24-8152-39860f3a902d	1	Other	Other
+a1d3a371-9bf8-4adb-aceb-3a04c867513c	1	Other	Other
+a1d3cc5a-f19b-4593-802c-f791e823e22f	1	Other	Other
+a1d3cea5-d834-47a9-a999-b4ee0fee2201	1	Other	Other
+a1d3e779-5270-4567-96df-4f2ab8ddda4b	1	Other	Other
+a1d3f8b5-dae4-41d3-b811-92d04af50953	1	Other	Other
+a1d3fc22-2c29-4154-bee4-bd9629fd06b3	1	Other	Other
+a1d404b8-11da-4be9-a28b-4a9cea228037	1	Other	Other
+a1d413bf-8054-4fe9-a305-c7f9eccbc616	1	Other	Other
+a1d41beb-3111-4f9f-a007-ac25e8978fd3	1	Other	Other
+a1d425d0-d7fe-42a3-838b-7c4f4e8c98b0	1	Other	Other
+a1d44d81-a24a-49c8-803e-4672e2baecb6	1	Other	Other
+a1d45237-9d1e-41ec-82e3-99f760345aed	1	Other	Other
+a1d4ad1e-2fe6-491a-a1ea-4e2bd043f946	1	Other	Other
+a1d4d502-d18a-45d0-8ceb-d2f0d9fcaf5f	1	Other	Other
+a1d537ee-6f41-4c3b-9631-32f0fe6e2473	1	Other	Other
+a1d5548d-05b2-4839-863d-00368cc8fd0c	1	Other	Other
+a1d59c0d-2897-498e-a889-efd66f1ae068	1	Other	Other
+a1d5a885-4c89-419e-ad70-f4479eccf388	1	Other	Other
+a1d5d6f1-973d-4d15-951a-b6a7a40685f4	1	Other	Other
+a1d5e817-82dd-4ebf-a9e9-34180dbab3c2	1	Other	Other
+a1d5eee5-6246-43c5-ac50-9a9367fd47cf	1	Other	Other
+a1d604fd-eedf-4e2c-b6f8-ea04878719b6	1	Other	Other
+a1d62ad4-7d09-4a84-bc49-c13173f62c31	1	Other	Other
+a1d63748-34e2-4c0c-842d-0422ad598fcf	1	Other	Other
+a1d64311-ecbc-4514-890b-6ae1f6ddd4b5	1	Other	Other
+a1d68316-c3a3-45e8-aa4a-fac5e7238a04	1	Other	Other
+a1d6a412-bd6d-439e-ab5b-026a669285b2	1	Other	Other
+a1d6a72b-4987-423e-93e9-b1074836da7a	1	Other	Other
+a1d6c894-0729-4d4e-b422-7b42d15b0d82	1	Other	Other
+a1d6e621-7f86-40b4-897a-ecf4448b9b13	1	Other	Other
+a1d76aa5-ce49-40a4-9bd7-38532e1aba14	1	Other	Other
+a1d76add-8192-4a45-aef8-b2e95ff3a537	1	Other	Other
+a1d774cd-d0f4-4e41-94f2-10384b078584	1	Other	Other
+a1d79a7f-0c35-4e5a-bc3a-6b8ad9052fa3	1	Other	Other
+a1d85cb0-1316-4fac-90b8-f2ff04b345f1	1	Other	Other
+a1d8711a-dcc5-482f-abbb-1d76330fc2bc	1	Other	Other
+a1d88391-e8a5-48a4-a66e-686d1365f03b	1	Other	Other
+a1d8f61f-4014-4d0d-bd88-bfb72989cccf	1	Other	Other
+a1d8f685-2bc8-405e-85bb-5a03a16e8d74	1	Other	Other
+a1d9129a-8ba8-473d-960d-e9fc82aff348	1	\N	Other
+a1d94f1d-3ea0-4d14-8c38-e9ce900a6c40	1	Other	Other
+a1d95a88-b723-4a6b-a64f-235e0b394425	1	Other	Other
+a1d95aef-1641-4848-a997-1f9ce285b73b	1	Other	Other
+a1d96662-cfa1-41f2-bffb-09fdceaefdac	1	Other	Other
+a1d96de3-f982-4d02-93fd-d8f50e10984d	1	James	Other
+a1d995d5-b00d-45dd-bbbb-26dc9c567b07	1	Other	Other
+a1da53e8-4f2b-4079-b70e-1ba8402c1246	1	Other	Other
+a1da6a92-c1a5-48d0-9ff6-a535b4bcf065	1	Other	Other
+a1da6f29-7286-492d-9b8c-5fa5baf62fc7	1	Other	Other
+a1db19f6-e90d-44e6-bd89-77a7d4fabf19	1	Other	Other
+a1dbf723-90fe-4184-be1c-cc7bf3f1c706	1	Other	Other
+a1dc318d-50f5-4f18-b210-d1e65302ebd7	1	Other	Other
+a1dc5597-3589-4e5f-b69e-e708e8872d94	1	Other	Other
+a1dcacc4-9002-43f4-b64b-c7ad8832f51c	1	Other	Other
+a1dd06dc-d33e-4a06-9df5-2ff8f68d61ca	1	Other	Other
+a1dd2a04-7278-4542-a657-617942e69c77	1	Other	Other
+a1dd4b73-f958-446c-93ea-67d9853b6dfe	1	Other	Other
+a1dd5ff3-7200-4d9a-848d-adc717c887c8	1	Other	Other
+a1dd7020-6c0b-453f-8ade-b87b6f03c44b	1	Other	Other
+a1dd9631-a79a-4d92-aaf1-3beadae4efe8	1	Other	Other
+a1de2287-fa0b-4b3c-984e-bd47605d2d8c	1	Other	Other
+a1de22b2-45d7-4b18-b86d-2495ad110a8b	1	Other	Other
+a1de4841-30bd-4524-890d-8038ce6e4112	1	Other	Other
+a1de5a5c-6fd6-4451-852b-73c8423049c7	1	Other	Other
+a1de642c-2f3b-46e4-af7c-d060912317ba	1	Other	Other
+a1deaba0-fea6-4312-83b6-f4a30714430e	1	Other	Other
+a1dee602-8c96-43a9-8280-aeddd512e407	1	Other	Other
+a1df0d10-3dc6-4107-95cd-3ed60c16136d	1	Other	Other
+a1df70b7-6420-430f-89fd-dc6c2e4f30ed	1	Other	Other
+a1df9da7-613d-4c32-9ee4-58a216360476	1	Other	Other
+a1dfc6d3-621e-4069-bd58-b9caa9844628	1	Other	Other
+a1dfd284-f1d6-431b-8c4e-9c4548557450	1	Other	Other
+a1dff718-75de-4e7b-a280-cc6491855884	1	Other	Other
+a1dffad8-eda4-4590-aaad-d88e25ebf6a1	1	Other	Other
+a1e082b6-3c2d-460a-98f0-d7724364b85a	1	James	Other
+a1e0a85e-2cd8-48a7-8af0-9f426293300c	1	Other	Other
+a1e14fb1-da13-438d-b570-c5ab4fa579f1	1	\N	Other
+a1e1890c-0519-4136-a56c-1e785c628d17	1	Other	Other
+a1e1a1ef-38da-4b32-aff3-ad4462309b74	1	Other	Other
+a1e1a3ac-dac0-461e-af54-c98e85b2ce79	1	Other	Other
+a1e1c320-5c71-4976-8834-e1416fee3b27	1	Other	Other
+a1e1d139-a0be-4c2c-b09b-4cd60e6a61d3	1	Other	Other
+a1e1d1c9-2421-4095-93b4-103d2e92286f	1	Other	Other
+a1e1dd94-3e62-4b48-a38b-fdd263ea33dd	1	Other	Other
+a1e1fe1b-6c5c-4433-a99d-2235743dc712	1	Other	Other
+a1e23ba2-2bd9-4627-801c-cad14da536fe	1	Other	Other
+a1e2539a-68f3-4c01-875e-c327632563af	1	Other	Other
+a1e2e2e2-7b7b-4ac9-9780-4fb2f7854489	1	Other	Other
+a1e2fd81-8128-4972-b274-53e8b8757891	1	Other	Other
+a1e32f01-5c12-4eab-8d15-d7270bab47aa	1	Other	Other
+a1e37855-a5a4-4de4-a5ac-354375fdcde4	1	Other	Other
+a1e4790b-2ba8-422b-911b-dcd053b1684c	1	Other	Other
+a1e49b67-0499-4b3c-8c72-41f65d5ef17c	1	Other	Other
+a1e4b1e0-a46b-4a49-b765-81fe726f7aaf	1	Other	Other
+a1e4bebc-2b72-49d7-915c-44d720afb035	1	Other	Other
+a1e4cc79-b1db-43de-b618-09053ceaffe7	1	Other	Other
+a1e4d846-7423-492b-bf42-3cf79978423e	1	Other	Other
+a1e4e62c-d21b-434a-9676-68d04fdc37ba	1	Other	Other
+a1e4f5d9-9cfb-46ce-98eb-f2b5becdcf77	1	Other	Other
+a1e5071a-52d3-4911-a12c-14d92029adf3	1	Other	Other
+a1e5636c-3d20-46f1-add8-0b74da0efb65	1	Other	Other
+a1e5a7c4-99d8-4d59-82bd-3109c9fdbd77	1	Other	Other
+a1e5d6da-6de1-41e6-be19-787464030f6a	1	Other	Other
+a1e5e156-1407-40c7-8550-597ff74dd0bd	1	Other	Other
+a1e5f261-4cbb-4e77-9a3c-d4eed895b426	1	Other	Other
+a1e613af-868e-4b3b-9ce7-cd981ff24ba8	1	Other	Other
+a1e61c3f-22bd-407c-af44-f7d800f86c15	1	Other	Other
+a1e623be-bddf-49fb-a877-c939a0236be8	1	Other	Other
+a1e6da96-ef31-4d7c-bb6f-e776ba0e1ff6	1	Other	Other
+a1e74ffe-cb9f-4828-81aa-8d65961553f3	1	Other	Other
+a1e76c91-6fd9-4fd2-9534-3b938a93cfbe	1	Other	Other
+a1e78684-8db6-41c8-b252-fc912fef1362	1	\N	Other
+a1e7e826-e916-4a0a-8411-cb3e75c70f24	1	Other	Other
+a1e81f24-ef11-4599-9ce1-e4e83f85b949	1	Other	Other
+a1e82133-3a32-42f7-9857-54610a3ee3d5	1	Other	Other
+a1e8a241-c5aa-4522-9982-7791d1e27931	1	Other	Other
+a1e8b271-acbf-41b3-a634-87ac989a1f7d	1	Other	Other
+a1e8ce21-9ff4-45cb-af8b-cf19834c9c73	1	Other	Other
+a1e91326-919f-4463-b9fc-c4caaa94fff4	1	Other	Other
+a1e956c4-2632-4d5e-94e7-54ac510487d5	1	Other	Other
+a1e9571d-d6fb-43c7-8b7f-7b356bda7b8b	1	Other	Other
+a1e9a2db-5e78-4e9a-861f-2e0b902cfb46	1	Other	Other
+a1e9b380-80a4-425f-a5ee-1eded7511c56	1	Other	Other
+a1e9cd25-2737-441e-94fe-fb6cd7b004d5	1	Other	Other
+a1e9df1b-7280-48af-b6a2-fb08903f8df5	1	Other	Other
+a1e9fef9-29d4-453a-86ff-a6bd0c2aa280	1	Other	Other
+a1ea00db-a36a-4c2b-80d1-d9a1f81ed594	1	Other	Other
+a1ea5a62-47af-4cf8-aa91-6db0038f5dec	1	Other	Other
+a1ea71ac-7b61-4f95-a07f-3e635a0ec4ea	1	Other	Other
+a1ea7e2e-12e4-4f72-939c-c929538a070f	1	Other	Other
+a1eb4d29-ede2-4346-ba95-da8247aa158a	1	Other	Other
+a1eb9be7-7834-4992-84ff-ab707d59efb3	1	Other	Other
+a1ebcd9f-e12e-477a-ac33-8df2ce8e5c2b	1	Other	Other
+a1ebfb16-5283-484f-8e2f-25a430cc8dab	1	Other	Other
+a1ec024b-1073-4e4f-be77-9d9255097d9d	1	Other	Other
+a1ec3ec0-a0b1-43ee-8ae6-0683ffb79a7b	1	Other	Other
+a1ec5336-837f-4eec-ab86-eb82386b6df5	1	Other	Other
+a1ec5c15-0382-4b26-820f-99a23e8ddd3e	1	Other	Other
+a1ec7c99-e275-4898-bb61-a00b8aec87ab	1	\N	Other
+a1ecad90-0bec-4e20-90ff-099f1863282f	1	\N	Other
+a1ecbfe7-2134-4345-999c-97491f317e57	1	Other	Other
+a1ecd72b-a58b-4171-a531-61a231480fc2	1	Other	Other
+a1ecf538-f4fe-4faf-99d5-c80ea390cd02	1	Other	Other
+a1ed3d9e-1a07-4d23-bdb6-02a76a11d8ec	1	Other	Other
+a1ed6cc9-7e47-455d-985f-c66d7ee405c2	1	Other	Other
+a1edc4c4-d159-4473-85ce-6a8fb5bd62a7	1	Other	Other
+a1eddfc0-4267-4f39-a9d4-d93fb1bd2506	1	Other	Other
+a1edf658-1db3-47bc-bbee-703c48c22da6	1	\N	Other
+a1edf736-219f-4d3e-b01e-04b959ade532	1	Other	Other
+a1ee0be5-625e-46d0-a917-26d6fca34eaa	1	Other	Other
+a1ee3c58-4473-4847-bc58-957c95b1d522	1	Other	Other
+a1ee42e2-b660-4dab-a2dd-9f127cb01682	1	Other	Other
+a1ee5d54-82f6-4935-bf8f-3cabde6da251	1	Other	Other
+a1ee7a96-e75d-41b8-ae5c-1a2fb799816c	1	Other	Other
+a1eeb9e4-10c2-4b66-85be-51b01e11b219	1	Other	Other
+a1eefc02-b6bd-4d0d-a8e3-3e29d61648d1	1	Other	Other
+a1ef22c3-5f00-412f-8c0f-942ba4a62374	1	Other	Other
+a1ef23b2-c159-4d0e-8a00-bde981376c99	1	Other	Other
+a1ef32c1-061c-4915-80d0-c58226f51745	1	Other	Other
+a1ef499e-2e54-41a4-9124-6c17973dab0f	1	Other	Other
+a1ef4c37-7b33-44a1-b3e5-0da8d4e86dbf	1	Other	Other
+a1ef5570-24cc-4677-8a6d-70ac52d3ad88	1	Other	Other
+a1ef5e95-e29d-4de1-bfed-705d18c1f5e3	1	James	Other
+a1ef6f5c-8ce6-4215-a9fd-d123433900e2	1	Other	Other
+a1ef742b-b6a7-4f0e-b399-72cdfb063286	1	Other	Other
+a1efc715-4896-408f-ab70-4e14c144faae	1	Other	Other
+a1efc9db-9b10-4c18-a546-9b2b1dd1b819	1	Other	Other
+a1f05bc2-8799-4cde-be0d-2171e13c7d62	1	\N	Other
+a1f0614d-247a-46f7-9eae-8939e36a56ff	1	Other	Other
+a1f087b5-7bec-4cd7-811c-f41334ee701d	1	Other	Other
+a1f0992e-f7c2-4c03-b952-c97206d0692d	1	Other	Other
+a1f09d28-4337-423e-89da-c8afcbcf8e9e	1	James	Other
+a1f0b15a-c04d-4e7d-a310-8821dc31e20b	1	Other	Other
+a1f0c53b-f166-4be7-9783-c2252d53e1c4	1	Other	Other
+a1f0eb7b-8d1b-4984-95f4-9b4fc98afc2c	1	Other	Other
+a1f0ece1-a571-4e70-a600-fe3af62b541c	1	Other	Other
+a1f0f891-09fd-425b-9e99-f7497c59506e	1	Other	Other
+a1f1466a-996f-4f95-a99a-4a84484b5344	1	Other	Other
+a1f1a06e-dd65-468d-8c10-b94d7351d5d3	1	Other	Other
+a1f1b305-5631-40fd-baab-bb372405fb33	1	Other	Other
+a1f1e3d9-5667-4c57-aa10-5387c9ef88ba	1	Other	Other
+a1f1ff58-dc60-4f37-8713-72f576706185	1	Other	Other
+a1f212b9-9243-4afd-8662-e3e583da57fd	1	Other	Other
+a1f24a8f-871c-480a-9a7f-fdae27b89e2a	1	Other	Other
+a1f26fe9-9662-4ca4-88ab-3985c4ffde8b	1	Other	Other
+a1f27901-cf9c-4e7e-b8f6-65b0eed9aacb	1	Other	Other
+a1f27f0b-583d-4ca6-99e5-7f707f582749	1	Other	Other
+a1f27f84-d2ee-459d-b3be-1ed6fc5a336a	1	\N	Other
+a1f287f7-98a3-49ef-8f21-75214ec12932	1	Other	Other
+a1f2a2e4-0041-4fca-821e-4e6384e33fc9	1	Other	Other
+a1f3217a-5e76-4b78-a1ec-539fd5bc133d	1	Other	Other
+a1f32743-3dcd-4387-87f1-0387cb0ae5a5	1	Other	Other
+a1f3960d-50f6-446e-9044-4f05592af846	1	Other	Other
+a1f3e404-9156-46fe-b405-81e88726b772	1	\N	Other
+a1f43f67-d607-442f-9af7-0af8bab5c929	1	Other	Other
+a1f46953-2f79-4971-8deb-622b11b5555d	1	Other	Other
+a1f47372-cc11-4001-86f7-e70be1c4cd56	1	Other	Other
+a1f4ad30-9e1d-4240-b7e2-1dc9eedb693e	1	Other	Other
+a1f4aea3-6e77-47bc-9e7f-c91db7b5afe4	1	Other	Other
+a1f4b106-0aae-48f4-bf0f-d8a5c3493a65	1	Other	Other
+a1f4cf2f-f03e-416c-9284-0a6b168368e0	1	Other	Other
+a1f4edb4-e02b-4760-9bd3-f60184b22084	1	Other	Other
+a1f50a8e-12c7-4ede-9efe-45e90180d853	1	Other	Other
+a1f51287-fa55-4c6b-b703-57c534748b6b	1	Other	Other
+a1f53c22-9ce3-403b-add3-94ae351bce0a	1	Other	Other
+a1f53cdf-a025-4f79-aa89-f4ab3d8eccc8	1	Other	Other
+a1f53e7a-7cb0-42e3-8b91-400c83b079a3	1	Other	Other
+a1f56d42-eb85-46d2-a9f5-8a11ab6d0ad1	1	Other	Other
+a1f59169-6142-4c4a-9dfd-1f7c633a4def	1	Other	Other
+a1f5a3e9-3785-49e3-9f0f-9e6888792b61	1	\N	Other
+a1f5a647-8738-4018-aac5-97c6e2c64a23	1	Other	Other
+a1f5b6a7-1d11-4e5d-9c82-e10f0eec9636	1	Other	Other
+a1f6c591-cd82-4c9f-8aaf-e3e5f21369d9	1	Other	Other
+a1f6dc94-4023-481b-b573-31bfe6ae00fa	1	Other	Other
+a1f737ff-5907-488b-bd3b-ca1926adea2a	1	Other	Other
+a1f79896-5f21-4713-89df-fe8da0dedec0	1	Other	Other
+a1f7b0e1-9865-4de0-b6db-800efde42541	1	Other	Other
+a1f7d8a3-93ba-4553-a5d9-970aefaa3bb1	1	Other	Other
+a1f7dc03-3042-4507-918d-4bad6a244e16	1	Other	Other
+a1f7e80e-e891-41ab-83a9-1c748107a47f	1	Other	Other
+a1f85184-6faf-4150-ae0e-49e3c44c6bee	1	Other	Other
+a1f85eb8-14c9-44f1-8237-4c9b1d9a19f6	1	\N	Other
+a1f867c4-24c3-4748-bf9e-62f35885b006	1	Other	Other
+a1f8d35a-c269-4c9c-9211-813bd60b155d	1	Other	Other
+a1f8db31-f7da-43e8-b775-73583715d55b	1	Other	Other
+a1f8dcce-5b42-4dde-a481-4dfb75649198	1	Other	Other
+a1f8e579-ecfe-4c8a-8c2b-a5784ac0cea1	1	Other	Other
+a1f92fa2-0a1d-4fe0-8925-2c64f47ea704	1	Other	Other
+a1f9b501-8c7d-4b0a-86f3-666d126fedd9	1	Other	Other
+a1f9e5a3-b7c5-40df-ac35-89bab218f447	1	Other	Other
+a1faa429-ee49-4305-87b5-f768c9ed2edf	1	Other	Other
+a1faa594-8131-41b7-af89-3fa063b7bb34	1	Other	Other
+a1fac9fe-8f8a-4ccb-ab6e-5df9eb356f57	1	Other	Other
+a1fb2861-d3cb-4ca4-9f76-674e2c5be03c	1	Other	Other
+a1fb5e06-9fb0-4f9b-b3e6-279397585ac4	1	Other	Other
+a1fb7f24-7044-406f-a080-1d90a4f32b6a	1	Other	Other
+a1fb9148-98a2-49f1-b97c-fe772a6c40ca	1	Other	Other
+a1fbbb52-87fa-479b-af95-22558965f736	1	Other	Other
+a1fbc363-9fbf-4f4f-99a5-d1b7c98b6cc3	1	Other	Other
+a1fc381c-1795-425c-b0cf-21bfcd186a8a	1	Other	Other
+a1fc6447-0c24-4627-97de-ea8069ddf672	1	Other	Other
+a1fc699a-d6c3-4cd5-9a46-9e15bc14e565	1	Other	Other
+a1fc6bdb-ea55-4aee-923a-a2b81a72907a	1	Other	Other
+a1fc7a88-58d0-475c-b1f0-045589a198ac	1	Other	Other
+a1fc8be6-6237-4c86-8c06-47b13d61abdc	1	Other	Other
+a1fcce54-3b6f-48d5-8f5e-82d96519a46e	1	James	Other
+a1fcdfbf-edf0-495f-a3e0-e90f406c2b3c	1	Other	Other
+a1fd1ff5-73e5-495e-8235-5346f1485c97	1	Other	Other
+a1fd2336-bc62-4735-a092-c0e76948f5e2	1	Other	Other
+a1fd8738-8f91-4bd7-903b-6e28d8d131d6	1	Other	Other
+a1fe4c13-abff-407f-9f5d-042791f00c8b	1	Other	Other
+a1fe6bb4-e81e-460f-b870-5df7cccf81b0	1	Other	Other
+a1ff1ae9-dd20-4c8b-a73e-9e65b2c0dc54	1	Other	Other
+a1ff5fe7-4e0f-427d-8b5f-b2a2611c8a6c	1	Other	Other
+a1ff7fe9-3491-4f31-bd95-7c8289f43280	1	Other	Other
+a1ffa21d-c6d1-4e74-8a8c-e9f72db1c856	1	Other	Other
+a1ffec1a-e2f1-4fdc-a08c-c862bb47e31b	1	Other	Other
+a2002491-3ec6-4a0e-9bd8-7806f6462f15	1	James	Other
+a20039ca-e632-4874-9608-6702f369c1cb	1	Other	Other
+a2003de8-2d74-449b-b7cf-d47d1b1d5bc4	1	Other	Other
+a20043f5-4c80-4edf-9806-0ac0dfdc53eb	1	Other	Other
+a200a5df-e8df-44a1-8464-fa0c10e81255	1	\N	Other
+a200bac1-6f9f-420d-8e31-0294549a8ee2	1	Other	Other
+a200c1ac-675d-4a60-a4e9-7429fdffcde7	1	Other	Other
+a2013afa-1a67-4b2b-9f38-a80de5652b8e	1	Other	Other
+a2013b43-b7a5-4552-a022-eb38cb3121f1	1	\N	Other
+a201eb64-9849-4dd4-b074-53a57ebb2a03	1	Other	Other
+a2020ea7-003d-4127-bf40-1ed7f34a1f8b	1	Other	Other
+a20251e3-010e-4c21-9f2d-df9bdc27f969	1	James	Other
+a2027e70-1e3a-4969-9cf8-954421afc150	1	Other	Other
+a202caaa-47fb-4b66-8484-5adbefb1f0d8	1	Other	Other
+a202dc5c-f2d7-47ee-a4b4-d1904a418946	1	Other	Other
+a202ea77-b269-4c13-bf6b-1fc8ce41dfb5	1	Other	Other
+a2032375-dd07-407e-ae91-3e0f752dc0fb	1	Other	Other
+a203256b-10dd-46c0-b73a-3df18ac686f3	1	Other	Other
+a2032ce9-3c03-40ec-816c-4dd96ec8dd3c	1	Other	Other
+a2034e77-db4b-4179-bb9c-850106d3a9ec	1	Other	Other
+a2037b45-4575-4743-9143-0ea9c0f17a20	1	Other	Other
+a203b793-a5cb-4918-b595-9a0f70a8f67b	1	Other	Other
+a203f85e-156d-11e8-bef1-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a2040703-049a-4873-807b-3d5314e43e9c	1	Other	Other
+a204d9e7-9884-4f5c-b5bd-6277732b50ef	1	Other	Other
+a20522cc-365c-4ff2-9ba6-f3b2c4bef353	1	Other	Other
+a20549b7-98e7-4df8-931d-dea488d0d10d	1	Other	Other
+a2054c33-b88e-497d-b3fe-a0e1c49c3940	1	Other	Other
+a20566a0-b234-4409-91d2-d657f3cf7eb2	1	Other	Other
+a205d5c3-f429-4f13-84b2-6db8b321f4d8	1	Other	Other
+a205f376-b534-4a4c-970f-a6e495500aa4	1	\N	Other
+a20601a2-a344-42e2-9007-bf79886818e4	1	Other	Other
+a2062315-f856-4386-b911-8e0a5e236fdf	1	Other	Other
+a20642bd-1149-4fb4-b757-0f5759faccd0	1	Other	Other
+a20660cb-96ad-424e-834e-d7110d8cffb9	1	Other	Other
+a2068184-572b-45f2-9b57-9fa1ed3697b3	1	Other	Other
+a20682f2-a4db-4989-beab-50daeffcf1b7	1	Other	Other
+a206909a-3a1b-4a6c-9684-09e80d21e33b	1	Other	Other
+a206b367-4e37-412f-939d-f5b7f5980886	1	Other	Other
+a206cd2d-c53d-497c-835d-6f45ddbb6e48	1	Other	Other
+a206e7b8-1148-4b42-9f7f-f7b8a0c74990	1	Other	Other
+a206fe93-9ec6-43c1-8959-aaa2839c183d	1	Other	Other
+a20717ce-c3c6-4b49-9aaa-828dc0fb88b2	1	Other	Other
+a20776e9-d268-494d-8aca-72fdfc49d3be	1	Other	Other
+a2077be3-e5c3-432a-ba62-6fb7512957d2	1	Other	Other
+a207a87f-54b1-457e-a055-4e53d7d357cc	1	Other	Other
+a207b6b0-c726-4ae3-bf5b-6137a34a985b	1	Other	Other
+a207c235-ce10-45b9-aa78-a3bb9ecb00fb	1	Other	Other
+a207de3c-c41d-43bc-851c-3931d11513aa	1	Other	Other
+a207dee8-4ec2-430e-8727-a05e4c399b76	1	Other	Other
+a2080dc7-bd60-420c-86c7-04669cbcc807	1	Other	Other
+a2080e69-5ec0-4524-a83e-c6df1eb7b1ff	1	Other	Other
+a208272c-714f-493a-ab68-7b1bbb0b0760	1	Other	Other
+a20858d6-4237-4960-8463-a2e802530e7f	1	\N	Other
+a208e6a2-3a6c-424b-b38d-f21e3b908bb0	1	Other	Other
+a208ed6d-753f-443b-91f1-72bdba76c8ce	1	Other	Other
+a2090e2c-7776-4255-939f-5ec01e1c005d	1	Other	Other
+a2096740-93f2-444c-8075-01311c6bcdc8	1	Other	Other
+a2097699-4170-452d-8cf3-1a551c0634b1	1	Other	Other
+a2098102-5813-4355-88f7-4e778b524b52	1	Other	Other
+a2098a24-7deb-49eb-9544-abc1b8345763	1	Other	Other
+a209d558-985e-46c3-a065-b63dbd85f4b8	1	Other	Other
+a209d5d1-b1a9-4ea3-a471-9a4b5e1f05ee	1	Other	Other
+a20a38b8-db21-49ee-ba95-28e078dc3ca5	1	Other	Other
+a20a3a76-39f3-41a2-b376-8fabb6650ee6	1	Other	Other
+a20a54ee-bfda-4dd0-8cac-5a4a19581ab6	1	Other	Other
+a20a895a-7608-4f65-aff6-9bb9365e0389	1	Other	Other
+a20ab7da-23d7-4360-b62a-fcf4cf470e57	1	Other	Other
+a20ad7cd-c02e-4baa-bf93-8fb5b8119765	1	Other	Other
+a20b45b9-02a4-4e26-b79f-ebc99a41ed0d	1	Other	Other
+a20b6c4c-fdf4-4ac7-b1ce-adc5fd5d266f	1	Other	Other
+a20b6c79-1b68-41c5-9a5d-d22448bda52a	1	Other	Other
+a20b902d-7a71-4e1b-ba6a-f2d3230b1ab7	1	Other	Other
+a20cba9a-e6ad-4dd5-ab0b-7785e13f9dc1	1	Other	Other
+a20cc3c1-0703-46c2-b47f-2ee884cfe1cd	1	Other	Other
+a20d4c2b-aaff-4a46-a1b5-a873c2ea8a03	1	Other	Other
+a20d6c0f-ff5f-426d-a96b-c04fb87b9110	1	Other	Other
+a20d90da-fdd5-46b7-bb98-5525ad4d0ad0	1	Other	Other
+a20da789-d28c-406e-879b-98752de2d78b	1	Other	Other
+a20de187-be65-4036-9a6e-d9271605f6d5	1	Other	Other
+a20e0aa4-50b0-47fb-a82d-eb149798f7ee	1	Other	Other
+a20e8075-1bf4-4cb8-94d8-4e62cc9d1a85	1	Other	Other
+a20ea493-cf60-4a7c-85dc-95769281896c	1	Other	Other
+a20ed641-e0ee-4322-a14c-9d2f1bc09af0	1	Other	Other
+a20ef9f4-5b7c-4adc-ae7c-60bd93b2390d	1	Other	Other
+a20f06aa-ca70-4aab-a22a-1921304295e9	1	Other	Other
+a20f0ab5-f74a-402f-9828-a240b133fd23	1	Other	Other
+a20f3374-b646-46a6-bf75-0097296cc85a	1	Other	Other
+a20f58a7-7179-4687-b008-367c7805bb76	1	Other	Other
+a20f7063-d12d-4785-84fe-88fa09300063	1	Other	Other
+a20ff446-ddcd-4945-b8a2-37642cac5e72	1	Other	Other
+a2101597-fa72-4f21-a67d-788728456201	1	Other	Other
+a2109487-6db3-403c-bcbf-58ec6e406cbd	1	\N	Other
+a210afe9-84e2-4294-b105-08cd6359ae6a	1	Other	Other
+a210dd89-3f20-487f-9c7f-ab7a90b4ef57	1	Other	Other
+a210f363-057b-4c6f-9e39-f8abdf409a89	1	Other	Other
+a2111a09-bb23-49e9-b1c2-5e35f414fe9c	1	Other	Other
+a2112c6d-64c9-4ca5-9b0f-068ccdf23546	1	Other	Other
+a211419b-ff4a-4aea-a882-33cb50e8af16	1	\N	Other
+a2121bd4-b85d-4575-a45e-74ca24c51ed1	1	Other	Other
+a2126936-91fc-4973-be8e-9a1e6a7736fb	1	Other	Other
+a2129110-8218-4810-93a5-847d09582ddd	1	Other	Other
+a2129c65-0ef2-4405-affc-f870f832e6e5	1	Other	Other
+a212a6a3-fb20-483c-ac21-2eb5233c30c3	1	Other	Other
+a212f440-fe5b-4be9-bbcf-2788a1bf6b5a	1	James	Other
+a21314da-417b-4ab5-a53c-1a09b6db1aad	1	Other	Other
+a2131990-2d27-4b23-92d1-ec921f33009c	1	Other	Other
+a2133e66-cd6e-4bd9-bccd-8364bbd9a43c	1	Other	Other
+a213d732-fca8-4bab-8d88-b354fa11b065	1	Other	Other
+a21442fd-c6fc-4212-a1c0-79dc73c4a5a7	1	Other	Other
+a2145a03-594d-4864-b50b-78eb17827c8c	1	Other	Other
+a214704a-0263-4134-939f-148e0cb8566d	1	Other	Other
+a214b35c-c583-4cbb-bcf6-a4ea0cd5c6e1	1	Other	Other
+a214c0b4-d40d-40dd-b31d-b032ba4a1c1d	1	Other	Other
+a214d98f-f993-4646-b584-46866fe61c8c	1	Other	Other
+a214f530-74e1-42be-937a-033c294e4d88	1	Other	Other
+a215285d-f0a1-4361-8526-f2da14c36d32	1	Other	Other
+a2155e8c-2ce9-4716-bda7-b7cb6aa59bf0	1	Other	Other
+a21569ce-c867-454e-b792-89e03b5a1794	1	Other	Other
+a2156a1f-0f22-490c-9a12-b9d0aa57456a	1	Other	Other
+a2156d06-3fed-4fe0-a2ea-f0519cc96eb4	1	Other	Other
+a2159c42-c6e4-4189-89a4-d2a96b14a9f4	1	Other	Other
+a215b9dd-e3a3-455d-ad29-48fc64cbf2ea	1	Other	Other
+a215da84-8ad2-481c-a65d-655eb62769dd	1	Other	Other
+a215faaa-58ba-42e2-9edb-7f06d357bfbd	1	Other	Other
+a21609c1-25fa-4de9-bb2a-b7101e87da4b	1	Other	Other
+a2165005-8f7f-447e-84cf-1a1834150225	1	Other	Other
+a2169ef7-677d-467e-9fa7-bd74bd74edf3	1	Other	Other
+a216a354-ac27-46ea-be36-3b5b4d4c3994	1	Other	Other
+a216c762-b57b-4c7d-a518-7725fb3f6834	1	Other	Other
+a216d696-99e1-4eb0-8987-1e1db9338a6e	1	Other	Other
+a216d713-395a-4cf6-a02a-0e569d6e89ba	1	Other	Other
+a2172b24-97dd-4923-a472-b60bedadacf0	1	Other	Other
+a2172c88-bce9-4389-bec1-97f5ac19eedb	1	Other	Other
+a2174661-36fe-49dd-8a64-5c003e168990	1	Other	Other
+a217585a-4024-4ee6-88ac-476a2e20f04d	1	Other	Other
+a217c696-4c2d-4b8a-8a83-d646dcc8d5e0	1	Other	Other
+a217d016-a58f-4230-9279-f6d0e2ef13aa	1	Other	Other
+a217f98d-47ca-4268-87ac-128b883dbd1d	1	Other	Other
+a21898a4-9890-44bb-abf5-25d70ec73400	1	Other	Other
+a218bf72-2e39-4669-9961-0b594d7c0ed6	1	Other	Other
+a218f99b-053f-426b-95b9-69073b8be3d8	1	Other	Other
+a2193edd-e69c-437e-bc29-8cf5b1249983	1	Other	Other
+a219472c-0931-4875-b802-bb38bfc01cf6	1	Other	Other
+a2197916-b593-4014-934a-7582f3518e8d	1	Other	Other
+a2197c35-de07-44bb-ae0e-fbf25c88c562	1	Other	Other
+a21a0240-0f78-4603-a263-e922a6520898	1	Other	Other
+a21a0f0f-7377-43d5-b709-2037c36c3db7	1	Other	Other
+a21abb34-3864-479d-8aac-a3296cfda0bd	1	Other	Other
+a21af4e9-d8af-4537-b8ac-d0340e5fb609	1	Other	Other
+a21afd3e-827d-4885-8ebc-0dd1043e97bc	1	Other	Other
+a21b0179-ab55-4594-b216-3f709426275d	1	Other	Other
+a21b040b-ca76-47ec-a79f-91150b7b878b	1	Other	Other
+a21b2792-e46a-44c0-833b-41a9592c53fd	1	Other	Other
+a21b6c36-9e31-4571-a2f1-1bf0f28ce216	1	Other	Other
+a21bba15-7555-496e-963e-bf0bd8d2849a	1	Other	Other
+a21bd76b-c715-49ae-a49d-1516a32989ef	1	Other	Other
+a21beb2f-54ea-4ac7-8138-84f57dbb626e	1	Other	Other
+a21c0689-8ca6-45ef-b954-21d73d3197ff	1	Other	Other
+a21c1e9b-c73c-4126-912d-73db21e2b6d9	1	Other	Other
+a21c3b4a-4df5-4ab3-b809-38f73d1a4652	1	Other	Other
+a21c44bb-e98f-4760-87e0-a010d7f45d0e	1	Other	Other
+a21c4a6f-d6f3-4ea7-a048-db9d1a91a0a4	1	Other	Other
+a21c5058-a410-4091-a5dd-ac0c1797b811	1	Other	Other
+a21c7522-da75-462d-b230-f9cca4e4347b	1	Other	Other
+a21c9df0-7cf0-4e14-82e7-5a7367472210	1	Other	Other
+a21d4639-4a73-44a6-ac7f-98e0ee0e7be4	1	Other	Other
+a21d491b-34d3-4030-a446-1f022e00db42	1	Other	Other
+a21db720-81c5-41c0-ae2e-207a8db63e29	1	Other	Other
+a21dc046-ef32-459c-a23d-ab86f5b1e165	1	Other	Other
+a21dc095-0a0d-4e9d-9103-7451d7deb9b3	1	Other	Other
+a21dddc6-ae01-48f4-aed1-191521952691	1	Other	Other
+a21eb9d0-2f26-4c31-982c-afeb595344e3	1	Other	Other
+a21ebaf0-0ba2-4696-b39a-02f0d4a343ea	1	Other	Other
+a21ef400-4ebc-11e8-964b-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a21f22fa-7776-4ab2-8416-6c4a88d982a6	1	Other	Other
+a21f3f56-27a5-4c3d-974b-1056598e93b7	1	Other	Other
+a21f4dc2-804f-4644-b3e5-ad1ab1522db2	1	Other	Other
+a21f50ee-4fff-49cf-9572-12c750f7f586	1	Other	Other
+a21fb584-e9ba-48ab-916b-be41a63b8e49	1	Other	Other
+a21fbcdf-c733-430e-b89f-ad2157b31b03	1	Other	Other
+a21fcca7-d934-4d48-a13d-e4cc9d81759d	1	Other	Other
+a2201f5c-a61a-4594-aec2-e5903e00f561	1	Other	Other
+a22053dc-a9b2-43f4-a103-125b243dd775	1	Other	Other
+a220635f-3098-49ea-a393-1cbd91df1593	1	Other	Other
+a220f8a2-41d8-4e00-a253-862f128b9df6	1	Other	Other
+a2212a0d-68fd-447f-8a48-05b11323c5e2	1	Other	Other
+a2214ad6-ea17-4a95-9e35-4be8e4ef2c04	1	Other	Other
+a221df70-c9d6-43fd-8844-4432d220f7f8	1	Other	Other
+a221e017-387b-4de9-99d2-7a297a0da565	1	Other	Other
+a221fb41-6769-40a5-b003-4582d93bb189	1	Other	Other
+a221fea1-737d-4606-835d-0c06a1e6d5e8	1	Other	Other
+a22221ad-c42b-4ad1-9460-08af714ba762	1	Other	Other
+a2222360-cf21-4244-845d-44fcc9dddf28	1	Other	Other
+a2225bf8-168f-44dd-91ba-07059e8f6cb2	1	Other	Other
+a222a236-048a-4c6e-84e9-c5848becfb28	1	Other	Other
+a222b312-e0c2-4be4-b72f-d134e38eda41	1	Other	Other
+a2232221-adf0-4242-86fe-32388889fe43	1	Other	Other
+a2237c6a-6f65-49e2-b07f-e998ad7a4ab8	1	Other	Other
+a22383f4-0745-45d3-93c9-b78f22386429	1	Other	Other
+a22430fa-c4e9-405e-bf1b-89faf37aa733	1	Other	Other
+a22432c4-6696-452d-9d78-4af42742029a	1	Other	Other
+a2244ad7-a979-4f4b-975a-2b2251cefb87	1	Other	Other
+a224ed3c-d62d-49c7-a14c-89d456fda2fa	1	Other	Other
+a2251e39-02f8-495e-a049-666a16f8623b	1	Other	Other
+a22524a6-660f-4ca0-98d6-68f75c440f3e	1	Other	Other
+a2253d68-94b4-48a4-84dc-73d1d29fd7f8	1	Other	Other
+a22543b8-ef8a-4805-8f97-e37f948423df	1	Other	Other
+a225935c-c154-4e34-9bb6-c8da9279e3be	1	Other	Other
+a2263527-2504-4ba3-9c92-c63838c3fee0	1	Other	Other
+a22649aa-b4dd-4d4d-b1f3-f17663a2403f	1	Other	Other
+a2267628-3d48-4fd7-a622-f1c63f572b55	1	Other	Other
+a226974d-d322-4304-8118-97f97d69dbcb	1	Other	Other
+a226977f-a02c-4e20-8dc7-54917d54bdb8	1	Other	Other
+a226aa4c-413f-4255-a230-dbb7759f3d84	1	Other	Other
+a226ab19-0b67-4920-8834-a041c92283dd	1	Other	Other
+a226cf5e-a274-438b-9701-203c4ff7a318	1	Other	Other
+a226d2db-f359-4f99-8a2a-fbac9744bc46	1	Other	Other
+a2270eb5-bd3c-4a60-9ab4-01c484a54dba	1	Other	Other
+a22737c6-6363-40e4-963f-3c5b69ec4c60	1	Other	Other
+a227b4ea-d664-4093-8f8c-1f6aaa3875ad	1	Other	Other
+a227ec33-d87e-4de7-80de-00085aefbcc7	1	Other	Other
+a22801aa-186d-484d-81ea-9ef745b11072	1	Other	Other
+a228593b-5012-4e99-92f8-16ec18e9ed4a	1	Other	Other
+a2287908-87e8-4e06-b9b3-680f31098dc3	1	Other	Other
+a228a892-af07-4d48-bef4-e06ecd69b1fd	1	Other	Other
+a228e90b-2aaa-4c1f-bd33-da6697d547c5	1	Other	Other
+a228f2f2-be06-48ea-b302-01b8e02991d3	1	Other	Other
+a2294792-cd95-4fa9-9281-4af4c14205eb	1	Other	Other
+a22974fd-9f85-488f-b7f8-d4cf6ddab049	1	Other	Other
+a229763d-5ce7-4fe1-be66-f0b1be378c56	1	Other	Other
+a2297c91-ad00-4689-a464-de636ab411a5	1	Other	Other
+a229c902-e9a6-4914-95ea-734c395613d7	1	Other	Other
+a22ad7a9-8571-425f-9674-a24894fc803f	1	Other	Other
+a22b3ac4-fb7f-4e4a-b68d-0b367a4b14f1	1	Other	Other
+a22bb242-c9eb-43cb-9a0f-f29953fcc828	1	Other	Other
+a22be28e-28a6-4b1e-aa03-177c9e78ae84	1	Other	Other
+a22c05d1-8760-4b47-a33e-03d6b35d10b5	1	Other	Other
+a22c35ce-86c3-441e-868f-8b0a6bc9230e	1	Other	Other
+a22c66c4-85cf-4fa0-a601-111d7c7c9df3	1	Other	Other
+a22c9b7c-141d-4753-98b4-02b0d4a2ceb7	1	Other	Other
+a22ce78e-2d2e-4285-abb7-b00f1e56a151	1	Other	Other
+a22d0523-6f68-4bd9-8b00-58cba9569d55	1	Other	Other
+a22d250a-bdef-4201-abeb-a438456e3bab	1	Other	Other
+a22d6f0e-e421-4ad6-923f-037945872a90	1	Other	Other
+a22da68f-032e-49d0-ac5b-9fb5a93c5f32	1	Other	Other
+a22daab9-71f1-4aff-bf47-333908b825b9	1	Other	Other
+a22e0a83-1b0f-4d07-83af-944647c9ee10	1	Other	Other
+a22e390b-cf5e-4227-b2ef-aed2908823ee	1	Other	Other
+a22e6302-d3e1-4132-b819-62fea11d25e2	1	James	Other
+a22f07ea-e2af-4a2a-b4f7-feeea7c58393	1	Other	Other
+a22f178e-e83d-48ca-b3cc-5c5f12d18643	1	Other	Other
+a22f51e5-5543-481c-b188-2dfe4bac6083	1	Other	Other
+a22fd9ac-e469-465a-911e-b0f88f30086a	1	Other	Other
+a22ff445-1051-4eab-8103-33d50ad0ca64	1	Other	Other
+a230134e-5805-4457-9afe-0fc668502c4c	1	Other	Other
+a2302f2f-5e70-4bf3-8711-27562427e80f	1	Other	Other
+a23050a6-a28c-4392-89bf-4a2cbd9ab19e	1	Other	Other
+a2309327-791d-4fa9-b780-2cf3fcee6e64	1	Other	Other
+a230d6f5-52af-413a-9771-6231b80f1d62	1	Other	Other
+a2313ea0-290a-41de-83fb-38d5529713d3	1	Other	Other
+a2319220-6f98-4ff3-92d2-2937071b3407	1	Other	Other
+a231cd7f-a383-4c03-ac86-aeb8b1233a83	1	Other	Other
+a231dec9-4ab8-441c-93db-f1610506d25e	1	Other	Other
+a232059c-2518-4292-a8c9-a39136fc91c8	1	Other	Other
+a2321539-5a4c-4e88-88fd-318a30278938	1	Other	Other
+a2323fe8-7160-4cda-b358-e16ea04b49e9	1	Other	Other
+a2325cd9-5dd1-478c-8c75-2455a34c6e2b	1	Other	Other
+a232712a-78af-4e49-9e81-f78ac3f4d4f4	1	Other	Other
+a2329460-c83f-4d76-b64e-a0fcbbfe079b	1	Other	Other
+a232e454-3ced-42bb-91a9-8146e55e4913	1	Other	Other
+a23314af-0416-48f4-b633-4bc8762a0e48	1	Other	Other
+a23318f0-cb4a-41a6-b1c2-c09d86581049	1	Other	Other
+a23360c1-866b-41a0-934a-b12ad662b595	1	Other	Other
+a233ea41-2fa7-4f76-9f54-b6d65deeaecb	1	Other	Other
+a2342df2-7b42-42ae-8f2c-8fb5852e1449	1	Other	Other
+a2347347-8d98-488b-a6ff-589d369ee842	1	Other	Other
+a2348c86-546c-4826-af9b-b4b7911dd1f4	1	Other	Other
+a234a8f9-b389-4d3e-818d-919590419aa2	1	Other	Other
+a235066a-47ba-4a29-a7f5-f28334c709c7	1	\N	Other
+a2359d34-83d8-4aaf-ba62-9793089ec385	1	Other	Other
+a235c26d-16fb-493c-9be5-42cf2c948567	1	\N	Other
+a235df1c-e4aa-4bca-bd41-48875e40524c	1	Other	Other
+a235f5b8-d8d2-4655-b53c-c6631e1898a0	1	Other	Other
+a2363d64-726b-49cc-bbc2-36dac67edfd3	1	Other	Other
+a2365cf1-e6d8-4d20-ba03-b397502d42cd	1	Other	Other
+a236dd0e-5913-420c-96f1-4e18fdd695a0	1	Other	Other
+a236df4b-93aa-4c3e-bb6c-aa857c300e0c	1	Other	Other
+a23782cf-faff-4c11-8a31-3e6d68c042e1	1	Other	Other
+a2378c3a-e039-4967-8afc-2ad805c3f847	1	Other	Other
+a2379957-a1f7-4c18-93bd-39d7c74ee663	1	Other	Other
+a237aa45-390b-43a7-b9e9-788008486119	1	Other	Other
+a237d1d6-cec0-4b3f-9b51-1780ece60598	1	Other	Other
+a237e85d-42b3-443d-b218-07d5c1047bd2	1	Other	Other
+a2383f1e-543d-4bec-abf9-623020fa8c10	1	\N	Other
+a23886a9-b8bb-4de9-997f-7fa7d2b3abe8	1	Other	Other
+a2389707-a33a-4282-8762-1e10c4a00423	1	Other	Other
+a238aeb9-97c3-4a0c-b027-60f6c39045bc	1	Other	Other
+a238b030-4828-4562-b9ef-c5702104cb71	1	Other	Other
+a238b306-5305-4525-9641-0630892014cd	1	Other	Other
+a238de4e-541d-43de-8538-56dc9006b69a	1	Other	Other
+a238f871-756b-4e45-8636-6dd1813d0e62	1	Other	Other
+a2392625-554a-4e98-b053-bd15ce0c1ebc	1	Other	Other
+a2398251-ba27-48e7-b5a9-6142a3a34484	1	Other	Other
+a2399714-f55e-417a-8c2f-65c614497259	1	Other	Other
+a239be04-5ed6-4843-8a23-dbc399445141	1	Other	Other
+a239be9d-08d6-49a0-afdc-052c4d69ba95	1	Other	Other
+a239f07d-9166-4295-a2c2-9c27f50c3511	1	Other	Other
+a239fade-191e-4f23-95bb-50ae28b95731	1	Other	Other
+a239fd70-a7a1-4070-8566-9fdb07c46b94	1	Other	Other
+a23a7304-e4a0-4329-8431-29cef1cbb6fd	1	Other	Other
+a23ab736-663f-4ea3-ac96-7b151045ba38	1	Other	Other
+a23abceb-edf6-4e6d-b2de-6e79a628ceef	1	Other	Other
+a23ade74-b80c-4315-9aa6-e2b636a1e2bf	1	Other	Other
+a23af230-a0c3-48c6-a7a5-f2be10e59f42	1	Other	Other
+a23afe40-ded4-4e54-9a04-95df137c13f3	1	Other	Other
+a23b0efd-3535-4122-905b-f8fd88ac48e8	1	Other	Other
+a23b3d9e-5c29-4cb4-9342-93fe0c15f1ac	1	Other	Other
+a23bc68a-80d6-4ccc-8f47-d4710c31bd5e	1	Other	Other
+a23c2541-4644-46fb-b1ed-13bb39b37e90	1	Other	Other
+a23c4aff-d95c-4ff2-a23f-26783320ab4e	1	Other	Other
+a23cf675-16e2-44a5-bb84-fb02504e993e	1	Other	Other
+a23cf752-ae62-42f3-bc0d-89eb60abfc67	1	Other	Other
+a23d0ace-f16f-44e2-b03d-c78dd8724c75	1	Other	Other
+a23d13f9-aff2-4fbb-aa4d-e6a9c291bc43	1	Other	Other
+a23d3202-951d-4e65-bb09-2e3595e33901	1	Other	Other
+a23dc287-7471-4ed0-8d41-8d6093457022	1	Other	Other
+a23e0df6-181b-44ec-9822-0e4380db8ed7	1	Other	Other
+a23e56df-c72e-48e2-91a2-4401d3ab1c89	1	James	Other
+a23f0847-512e-44c0-a784-42a58115ff62	1	Other	Other
+a23f3f35-5d84-4ca4-8332-d59cc7931d0b	1	\N	Other
+a23f7555-f4ab-4bd4-823c-e00c15ad1497	1	Other	Other
+a23fb89c-ae60-441a-9108-fa12a657fcbb	1	Other	Other
+a23fbe3a-8132-4e38-bb71-896178cf3b86	1	Other	Other
+a2403065-53cd-40dc-ae61-7f8bd07e0187	1	Other	Other
+a24067b4-2883-41df-9ba4-3e44e9699e62	1	Other	Other
+a2406d84-bb5f-4474-9681-78460995cab9	1	\N	Other
+a2408572-6be2-4479-b451-b8e42ebe3187	1	Other	Other
+a2408cc2-85b0-45c7-b88c-6d9de48d3dd5	1	Other	Other
+a240a5ba-9ad1-42c9-8969-85d8551873c4	1	Other	Other
+a2412e5f-bb99-48fe-8cf2-40afeb110573	1	James	Other
+a24179d8-fa0c-44f8-8f07-0eca3443e7c8	1	Other	Other
+a241c63b-246a-4e84-8607-2edd95e142b3	1	Other	Other
+a242ef1d-6916-46d2-84f2-49d57d2e49e0	1	Other	Other
+a24317b9-15af-43e5-9496-f1736b5c77f9	1	Other	Other
+a24335d6-0763-4762-bb7f-692d2b1fc623	1	Other	Other
+a243440d-622a-43d1-9e13-1cccafccb401	1	Other	Other
+a243ca76-c312-401d-9330-d4bde0cacff3	1	Other	Other
+a24432fb-c7f7-4ff0-afda-5d7091e1f6fd	1	Other	Other
+a2443458-c469-4a09-8317-b3c74f2475d2	1	Other	Other
+a24463c7-fbfb-4fc7-ad02-d5cd6b711d0a	1	Other	Other
+a244bfba-09cb-46e6-bc02-7a2d3f2942ab	1	Other	Other
+a244c29d-5118-41b6-a627-de18b5e1defd	1	Other	Other
+a245816f-634e-4c47-b9c0-3c3be5893005	1	Other	Other
+a24585c0-93f7-4585-bbab-a78c55457abc	1	Other	Other
+a2458793-2dc5-467d-9eae-c6ddbb6387ce	1	Other	Other
+a245a4aa-9a46-484b-9b8e-f7f70e3c549d	1	Other	Other
+a245a5a0-2330-47cc-88e5-57e75a3b9304	1	Other	Other
+a2460908-38a0-4135-8a9c-14920625f4c4	1	Other	Other
+a2463899-8100-4629-b358-e5dc60916f08	1	Other	Other
+a2469d22-c75c-437f-9852-acc8660f70ff	1	\N	Other
+a2469e8b-b60a-4727-912b-ec42e82f3182	1	Other	Other
+a246ad3a-4d15-459e-853e-606493e8d1ab	1	Other	Other
+a246d9ae-0be2-45c7-a3c5-e4c6fd5f2b6e	1	Other	Other
+a2470277-e603-4227-a64d-bf8026bfde75	1	Other	Other
+a247302d-f877-4be8-bbd4-8d5f3bbe16ea	1	Other	Other
+a24759ee-d381-4e54-944c-44e7d64e4835	1	Other	Other
+a2476cd9-c138-4041-86c6-5ba369261de2	1	Other	Other
+a2478387-9d60-4302-bac8-5f89970ae580	1	Other	Other
+a2479e0c-3783-43e3-828f-308e14cd0421	1	Other	Other
+a247cebe-7cbf-4ad6-a5b3-1214aace7a5b	1	Other	Other
+a247e507-e0a9-4058-a9cc-66be5b690708	1	Other	Other
+a2488db6-5677-4e99-85b7-a076b335cbb9	1	Other	Other
+a248f0c7-8b42-4e1b-b3b0-ba3f1fb79385	1	Other	Other
+a2494bcf-c875-4325-91d0-f01d8a4504a4	1	Other	Other
+a2495231-0d94-49a8-bc6a-988e581554e5	1	Other	Other
+a24960ad-ce62-44a1-ac70-48ce02280f88	1	Other	Other
+a2496d78-340f-49a4-91c8-e18649fee405	1	Other	Other
+a249736b-0329-4da7-8602-bec52f3e94c1	1	Other	Other
+a24a0db6-f838-4fa9-b70b-c5e342f763f1	1	Other	Other
+a24a6401-4c5a-4f1c-b935-ab57db3800fd	1	Other	Other
+a24a8e3d-26ce-462a-8c06-85be6ee2440b	1	Other	Other
+a24ab2b9-5fef-40f4-89d1-ee94132817c4	1	Other	Other
+a24ad035-8df4-4565-aea4-4bdf0c63e923	1	Other	Other
+a24adc55-7fe9-433f-9c6c-3454f11dded6	1	Other	Other
+a24b0a72-9c33-4594-81bd-e86c7999b616	1	Other	Other
+a24b2231-742c-486f-a930-db9204ca507b	1	Other	Other
+a24bfc7f-9663-4aab-a839-bf0b4a07ad75	1	Other	Other
+a24c61fc-bc5b-4abe-8123-07531e322599	1	Other	Other
+a24cf999-168e-4ca7-a7e6-8ed3ecd08de4	1	Other	Other
+a24d11fb-ec3c-4757-b67d-aad918d1fc2b	1	Other	Other
+a24d1790-fa42-4e0d-ab8a-540ed04103ef	1	Other	Other
+a24d2b40-331a-4761-9010-1ec89500ed24	1	Other	Other
+a24d6804-c857-4fb9-ae58-a46297f9c8cb	1	Other	Other
+a24d8c6b-94de-4de8-acd1-7e1e9a86f715	1	Other	Other
+a24db172-49a6-470d-af8c-475278041da5	1	Other	Other
+a24dccb4-ad9a-46a8-8f86-e224999e7094	1	Other	Other
+a24de2e5-044a-4b9b-921f-b5b64342de17	1	Other	Other
+a24e12ec-8f3d-4fc4-a717-f6827f5e0d9c	1	Other	Other
+a24e27ba-5b8a-4707-9404-6058b135b54e	1	Other	Other
+a24e311a-3bc8-4e58-a86a-2f71b51624b6	1	Other	Other
+a24e98fd-1f13-4790-9441-3d9f25362b0b	1	Other	Other
+a24ea088-7da9-41c3-a88f-f3d137c24e05	1	Other	Other
+a24eb5e6-34a6-4846-bee1-6285cce07a49	1	Other	Other
+a24ed836-40f7-4e3d-be34-2f41102c2e44	1	Other	Other
+a24f70a4-77cf-44f0-b978-ea043922a7b5	1	\N	Other
+a24f843e-9fb9-47e5-8f1a-f8fe0e10d8fd	1	Other	Other
+a24fb0fc-281d-4356-935b-e19db0a069d5	1	Other	Other
+a24ff123-297a-4ccc-b57c-0bf8cdd6436c	1	Other	Other
+a25015e5-5d59-4afa-a23c-773dfa389eea	1	Other	Other
+a25081e1-11fe-4969-9a02-69f31645f1e6	1	Other	Other
+a2509769-36f1-472a-9e5e-b6e325d2bbdc	1	Other	Other
+a250b458-5016-458a-8655-07744d760140	1	Other	Other
+a251213d-d65b-46fa-ba5b-d40ddb3067b8	1	Other	Other
+a25148f5-23c9-4903-a05b-0edee06f974d	1	Other	Other
+a2517c0a-ba37-4e40-be79-38d89a2f7f7c	1	Other	Other
+a2518491-810d-45fa-b0c8-d6e66746dbf8	1	Other	Other
+a252300f-b745-42b6-b1a4-aaec37fb2a67	1	Other	Other
+a252361b-7418-48f9-840a-2950d9636403	1	Other	Other
+a2526318-37eb-4725-a228-f3e18a1c65c5	1	Other	Other
+a2529763-808a-4d10-995b-4f9a6bd4da3e	1	Other	Other
+a252ecca-444b-44d2-b3ba-671df763d798	1	Other	Other
+a2532ad7-8baa-4d63-b59e-cff00c4f4720	1	Other	Other
+a2537d70-d53b-439a-a8ba-5e02c6841b33	1	Other	Other
+a253ac64-a385-4a46-a4a2-696db8cee0f9	1	Other	Other
+a253b41e-0ff4-4475-80ec-0e0e12978a1a	1	Other	Other
+a253d7c9-0545-4b3d-a327-1c4d2f6642f6	1	Other	Other
+a253dcdd-12bf-4004-ad4a-82a572a28313	1	Other	Other
+a253ee59-dd01-41c0-8392-19ddc4cb5bfa	1	Other	Other
+a254baa7-096b-4312-b592-8d45f6472c2b	1	Other	Other
+a254f558-2c5c-4c67-b5b6-6abd55cf7a98	1	Other	Other
+a2550e6b-8cbd-4903-b2c2-775bd046caf9	1	Other	Other
+a2553b8c-d443-46e0-8d24-a7d32462aa87	1	Other	Other
+a255797b-3622-4fac-8f17-a4e315c6ca0b	1	Other	Other
+a25579be-fefb-441c-9481-6f00b0f1db71	1	Other	Other
+a2559474-e1f4-428d-bf3d-b4db84554b10	1	Other	Other
+a255a850-28b2-40dd-824e-a8a9459782d5	1	Other	Other
+a255b368-ca38-4daa-a853-b3d7a9ad74ae	1	Other	Other
+a255bc8f-2ba6-45ab-b307-77a119e27df5	1	Other	Other
+a255cd31-1781-475f-a2d4-2bf940699ece	1	Other	Other
+a2562a9b-22ef-4bc7-819d-2d1f7ad97550	1	Other	Other
+a25673f2-7653-4064-8009-bbe0bfbbb067	1	Other	Other
+a256e6c2-2e52-4b56-bd59-86f3df10076c	1	Other	Other
+a256f739-f5ad-4124-be64-d66a8a1ff0b4	1	Other	Other
+a256f9f0-83d2-4e56-bbee-4ce8df7c4197	1	Other	Other
+a2577842-f170-4123-afb6-9a5fae63395c	1	Other	Other
+a257a0a5-7095-425f-9f86-523b24b3f326	1	Other	Other
+a257a2d7-cf7a-42be-a75d-334a118816ec	1	Other	Other
+a257a673-9d3a-41d8-998f-a4030bc5ffc0	1	\N	Other
+a257da38-fda2-4c8e-9a9c-5e34fdeb7214	1	Other	Other
+a257ee91-d033-47a7-8b40-ba2f8158314f	1	Other	Other
+a257fd74-6950-466d-9152-10c77e880f2d	1	Other	Other
+a2582f15-8ab1-4c10-b2d9-8bfef3e56f34	1	Other	Other
+a2583483-2548-467b-a550-5043821d95f6	1	Other	Other
+a2586056-e5e0-49a8-ae3f-02281de93243	1	Other	Other
+a2587717-1dd8-4f14-b5c0-07607d8dc712	1	Other	Other
+a258a843-6b79-4fc3-8e2b-f3c8be58299a	1	Other	Other
+a2596a96-ee05-41d1-b37c-2e8a56ee37f9	1	Other	Other
+a259ab90-ebbf-45aa-a754-06c479d308d7	1	Other	Other
+a259cea6-ab15-46b9-b644-d033a0780e90	1	Other	Other
+a25a01ce-b6e4-4f7a-9063-d3616248aeeb	1	Other	Other
+a25a1459-cdc7-4a86-909c-5e54030aec90	1	Other	Other
+a25a46aa-25b2-4081-895f-c8526d9534d0	1	Other	Other
+a25b1841-f4aa-4909-b381-46454766c3f2	1	Other	Other
+a25b567b-16a6-4e0e-8989-72f30ffdf102	1	Other	Other
+a25b581b-d78f-442e-8dd5-fa68b70b6948	1	Other	Other
+a25b9fdb-c66e-416d-bb13-865bbe072d89	1	Other	Other
+a25bc0be-3d01-4ffb-a431-d3e01cc76c7d	1	Other	Other
+a25be1c7-ccff-4f5d-8c9f-fc4db996a55c	1	Other	Other
+a25c4422-3d9d-4e7a-a343-e3c16fe457e0	1	Other	Other
+a25c5f05-7075-4fd6-88da-3f6c3339de87	1	Other	Other
+a25ca313-5286-4ba9-b0ca-c70c496e0d15	1	Other	Other
+a25cc1dd-62de-4706-95b5-bfbc6319fcb7	1	Other	Other
+a25d0269-0404-4cbf-b625-723a6741699e	1	Other	Other
+a25d5a3f-9bd0-4581-802f-602cfa480bec	1	\N	Other
+a25d74ae-e985-4c3e-9470-d1f2991705eb	1	Other	Other
+a25d7f09-bf39-4bfc-8e39-3a3c2412fb60	1	Other	Other
+a25da87b-c587-4424-8288-6f051163dd0c	1	Other	Other
+a25e8952-fe98-46f4-914d-40b801059913	1	Other	Other
+a25eb35f-3861-451d-bf44-f28dcc573548	1	Other	Other
+a25f4bdf-843a-42ed-83bd-aeb2ed6975d7	1	Other	Other
+a25ff2c4-1a37-4b7c-b10d-06c41b03d3fe	1	\N	Other
+a26045a1-d67a-42d2-bfbb-19638cdcb7dc	1	Other	Other
+a2604f5a-b786-457a-9cbc-56cc6cc99209	1	James	Other
+a260d0e5-41fd-4bec-8608-73d7294136dc	1	Other	Other
+a260d871-ef84-4356-85a2-3f277240f41b	1	Other	Other
+a2612f19-e125-4297-89cb-10544045eae9	1	Other	Other
+a2613fa5-99d5-4cb8-977a-5195ca67efac	1	Other	Other
+a2615a5c-8551-4bc1-8d85-105a451a10b8	1	Other	Other
+a26199b9-f898-4e9e-86ed-267f44132c67	1	Other	Other
+a261cc52-b8ac-479f-8bdd-5f7f49ae49c6	1	Other	Other
+a262375a-297c-493d-a6dc-4a0968efcaaf	1	Other	Other
+a2625997-1247-4597-b4bb-7e2c8cd5b0da	1	Other	Other
+a262a138-6349-40cf-84c0-d45c664bb33e	1	Other	Other
+a262e56c-4d0a-46f5-aba2-7f91f70ea78b	1	Other	Other
+a2633b2c-3dad-496e-9def-e7b3e4b4981d	1	Other	Other
+a2634824-f5be-4041-ad01-fce00355ed15	1	Other	Other
+a2635abc-dc1b-42f5-9670-e3bfcf73c80e	1	Other	Other
+a26384e1-8b2b-4fa4-b63c-3ead21224e31	1	Other	Other
+a263bf6f-2e59-48b0-a3d6-1c3799569e85	1	Other	Other
+a263d019-0129-4edf-92f1-52121b19cb0d	1	Other	Other
+a264a201-f773-493e-8191-331b4e912535	1	Other	Other
+a264d282-316b-4fc6-a904-fb60b6ad0a4e	1	Other	Other
+a264de6a-6a88-4458-96d1-cd9b3d53a1ad	1	Other	Other
+a264e733-710d-4a8a-8c78-c47afc38470e	1	Other	Other
+a26523c5-d946-4bcc-b893-8238a3e11dbd	1	Other	Other
+a26533a2-6307-4d2e-a541-0ef6eb89dbc1	1	Other	Other
+a265a6cd-256c-4c56-be6f-d2f2151d127c	1	Other	Other
+a265ad3b-eaca-4b3c-8587-dc0ceabe8dc9	1	Other	Other
+a265cc70-1c4c-4737-a2b2-1f202285044e	1	Other	Other
+a265e0a4-66ec-411d-b6be-3cb9f10e60fd	1	Other	Other
+a265f078-00ef-11e8-9d5b-fa163e8624cc	1	Other	Other
+a2660dd9-c69b-4cfc-9b6a-8622274939a3	1	Other	Other
+a2667dbf-efdb-4c78-b769-166f8982985f	1	Other	Other
+a2669316-001f-4404-b8a9-cb203737e6d1	1	Other	Other
+a266af71-6a30-47f9-8f5e-d54ccc2da529	1	Other	Other
+a26700a8-2ce9-4a47-8e26-7e3a472be9b0	1	Other	Other
+a2670272-902a-495a-b0dc-c95780f0441c	1	Other	Other
+a2670f80-ea39-4f89-b64d-6bfc5bcf346b	1	Other	Other
+a2678209-011c-4b26-8ca8-5da73a317657	1	Other	Other
+a267b31b-59b6-49e3-907c-99be9545f1de	1	Other	Other
+a2686c34-fe32-442c-83eb-6b6fa9b79f97	1	Other	Other
+a268d67a-2608-44ea-a788-ce4bb0184383	1	Other	Other
+a268e699-be73-42e6-b4ad-3b1996440283	1	Other	Other
+a268e7a7-cc57-421c-9aa3-6220457c90fb	1	Other	Other
+a2695990-6902-43dc-a8c5-28b2f5575ae0	1	Other	Other
+a26974cf-c887-4768-901e-3a195b01a899	1	Other	Other
+a26985fc-3dd6-424c-8917-4f22dcd7bfc2	1	Other	Other
+a2698cd9-7baf-4512-bbbd-417e1ab5b317	1	Other	Other
+a269d790-8075-4870-a780-cb171860f6d7	1	Other	Other
+a269fd2f-78b6-47b5-8a6b-42d1a9788a02	1	Other	Other
+a26a0ec1-c560-4458-9eef-13fa55dc4e3f	1	Other	Other
+a26a207b-85c1-4c0e-b83d-110dea2a288e	1	Other	Other
+a26a9860-a0fb-4804-845e-4adb44856563	1	\N	Other
+a26ac068-f4a3-46f6-b915-df116ba53e64	1	Other	Other
+a26ae9df-443a-429b-9d3e-ab8870581670	1	Other	Other
+a26b1983-b802-469b-9721-a05b6034f0e2	1	Other	Other
+a26b26a6-5442-46fd-ac56-14117ba0104d	1	Other	Other
+a26b4739-545a-40a5-aacc-3a75ebad795c	1	Other	Other
+a26b567e-ebb3-429e-a30d-cc752b1aa48b	1	Other	Other
+a26b6f00-1433-4013-a026-a4a73eaa20fa	1	Other	Other
+a26b9a56-f227-4970-b6a3-13b34122de54	1	Other	Other
+a26bd0c3-3d00-4117-95c1-af3162a2bcad	1	Other	Other
+a26bfcbc-4c1b-45b6-9505-180093b67f5c	1	\N	Other
+a26bfdde-592b-47a2-b98a-ace8be91fa35	1	Other	Other
+a26c16fc-854f-440e-9908-1a8e607dd67a	1	Other	Other
+a26c8f19-99ea-42e8-abc3-f8cf8cfd1af1	1	Other	Other
+a26cb5ee-8c60-45a3-9533-c37954e100e0	1	Other	Other
+a26cc278-a431-4628-b937-ec53b3b2ddc3	1	Other	Other
+a26cd309-3476-493b-ac3e-141862744b37	1	\N	Other
+a26ce959-0eff-42c0-9ae4-6d68825e8c3e	1	Other	Other
+a26d1b00-f4b4-4734-96fa-2b91a14ddd2f	1	Other	Other
+a26d3c5b-3d12-40ca-9611-4408c938b9ae	1	Other	Other
+a26d6ec8-6875-4521-81c9-bfdcae01188c	1	Other	Other
+a26dc492-f692-4a58-b9b1-2be15738bba5	1	Other	Other
+a26e13db-2a6d-49f7-b5dd-1ffd8ed0fdc4	1	Other	Other
+a26e7a3d-5e22-4e54-b5cf-f105d5c1f2b8	1	Other	Other
+a26e8330-d8ff-4e6d-87cb-cdeacc1b8aef	1	Other	Other
+a26ed723-079a-48c4-937b-73d3378e41a1	1	Other	Other
+a26eda7d-9fb6-47de-b781-2eefe2ac6654	1	Other	Other
+a26ef867-4694-47a4-8224-3e4b4aa43332	1	Other	Other
+a26f7e1c-5c0a-4e60-b2dc-e94d65281136	1	Other	Other
+a26ffb91-e85a-46ed-946c-4d0dac848ff7	1	Other	Other
+a27023b3-60f4-41e9-9bac-7ba88e8f5874	1	Other	Other
+a2704c54-bacf-4c04-bea9-d635ab700f18	1	Other	Other
+a27067ad-1880-4d05-b15f-b976119d0c02	1	Other	Other
+a2708cbb-6d8d-41c9-890a-5417ee234e62	1	Other	Other
+a270bf8c-6dec-403b-9e51-503a18612d2e	1	Other	Other
+a270d85e-9be7-48fe-89f7-04e13cc0fb8b	1	Other	Other
+a2713571-fefd-4250-85be-7811d7313b7a	1	Other	Other
+a2718554-e81f-4fc1-90b7-e74079b57df2	1	Other	Other
+a271abd1-dbac-4c19-add8-b2a60b3dbfcf	1	Other	Other
+a271f839-00bb-48ce-93f5-7fcbdc20f8b7	1	Other	Other
+a27201c8-e1f8-4127-aeb8-d1690caf91f6	1	Other	Other
+a2725d25-ba46-4e3c-96e5-0a5c01a3468f	1	Other	Other
+a2727c0c-3298-4e28-a28a-009a154b2c96	1	Other	Other
+a2728b67-68c2-4db0-8737-ee76ed73f74f	1	\N	Other
+a272a317-98ee-46b7-8467-b7a56d858bd6	1	Other	Other
+a272be94-c065-4df6-a38c-ae2355850db5	1	Other	Other
+a272c5a5-e067-4792-974e-1126815b5cbf	1	Other	Other
+a272ca28-b6c5-4406-9857-f6610a4d5d1b	1	Other	Other
+a272ce64-f3b6-440f-b71a-f552d91648e9	1	Other	Other
+a272d1d1-8f4c-4e3f-b624-24da37b5815e	1	Other	Other
+a2730e11-fa5c-43e3-abe8-964fe73c409f	1	Other	Other
+a2732b38-6d6a-40f9-ae81-bc125b18453b	1	Other	Other
+a27393da-7f68-48c8-ab1c-96faa5029935	1	Other	Other
+a273b9cc-fdc3-4ec4-9487-2eee3a61030b	1	Other	Other
+a273ecf7-da3a-417c-bb81-ea186fd78f9d	1	Other	Other
+a27542f8-2229-4200-9c7c-a1d3e334a9ed	1	Other	Other
+a27543c2-6e9a-49fe-8ee6-0c3b827ef21c	1	Other	Other
+a27571ca-0645-46f0-ba04-8f14d155ed70	1	\N	Other
+a27590ef-15b3-4c90-a045-a69d19f41457	1	Other	Other
+a275abd6-8448-4ead-b101-4a9ac29c091f	1	Other	Other
+a2760cf5-9931-41c6-961b-7e4915a30cd9	1	Other	Other
+a276b64e-a347-4d38-a7d2-9e4ce4e63941	1	Other	Other
+a276bbd8-083f-4562-bf3a-4a712377c6ea	1	Other	Other
+a276be86-122b-479c-9837-71f57eba33be	1	Other	Other
+a276e11f-a592-4c1f-9bcc-41cd1858722f	1	Other	Other
+a276f78d-6f5c-484c-b776-6e12533dd233	1	Other	Other
+a2771139-11cb-48d8-b1a6-6c607f394632	1	Other	Other
+a2772e8f-ce5a-4b26-a710-b5e79ce3dd03	1	Other	Other
+a2777489-618b-47a2-83f9-b8e237276b4a	1	Other	Other
+a2778a73-e7a8-4774-ba78-e200b10917ea	1	Other	Other
+a277e00c-d94c-4587-a313-42c6dd26ce24	1	Other	Other
+a2785589-5173-497a-b38a-5529c31b2a51	1	\N	Other
+a278578c-9661-430b-bd6a-c528b689aee2	1	Other	Other
+a2788166-205d-4ead-9f52-40554c6ef4aa	1	Other	Other
+a278e483-d9b3-41a8-9a2b-7174ddeacedb	1	Other	Other
+a2793860-4edc-4dcf-96dc-8d9dcbab533d	1	Other	Other
+a279a2a7-8159-433a-bbb0-0f9b3a9c3bd4	1	Other	Other
+a279baa0-eecb-4753-858f-6cb0076581ed	1	Other	Other
+a279c4d8-efe5-4c7d-a5e7-521d5a74f82b	1	Other	Other
+a279f816-3ace-4fc0-bf13-4a99d193a7f9	1	Other	Other
+a279fb56-daee-4cf0-9d25-36075bcfb4ee	1	Other	Other
+a27a394d-493f-4c51-b213-71bed38b9462	1	Other	Other
+a27a3c02-67a2-44ca-bb7d-25db2c548051	1	Other	Other
+a27a7cf5-68e5-442d-9f6c-6bdf2a7884cf	1	Other	Other
+a27ab22b-7457-4892-8fa4-2ce1e2cc23a5	1	Other	Other
+a27acf49-7ca2-4cd0-abbd-ab13c829f4fa	1	Other	Other
+a27b2e25-7188-4b7b-8251-ef41241deec8	1	Other	Other
+a27b426a-0d42-49c7-8b6b-585405941f53	1	Other	Other
+a27b5172-cc0c-42a7-a645-f512705b856f	1	Other	Other
+a27baf81-18f1-4f8b-a2f0-fb5624f9e052	1	Other	Other
+a27c296f-2f22-47a2-a584-87e99f185464	1	Other	Other
+a27c32e6-40eb-47f4-ab86-e63032ce50fb	1	Other	Other
+a27c4a6e-3217-4e20-ab1c-28548fe0801b	1	Other	Other
+a27c6e82-f23f-476e-86f9-a453049d312c	1	Other	Other
+a27cdbda-c673-4c23-b5e2-d45fa208dfc7	1	Other	Other
+a27ce13b-2b30-476c-8e7a-d1216974d3c6	1	Other	Other
+a27d0015-bd6a-4809-8ed4-0ace389bfdc5	1	Other	Other
+a27d0c94-6dc8-469d-b1f9-06f359244437	1	Other	Other
+a27deb41-7a4e-47f9-83c6-8626d9a1178e	1	\N	Other
+a27e2305-450c-400d-8213-9a437f127ca5	1	Other	Other
+a27e4bee-07e8-4f54-a155-badce55864ab	1	Other	Other
+a27e7305-e529-4217-987b-7533c6fbfb1d	1	Other	Other
+a27ea408-410f-4f93-8cd3-dc7401cdf68d	1	Other	Other
+a27ec33c-e312-4a0d-ad75-7ec52e8abc9f	1	Other	Other
+a27f9bcc-48f1-4a93-92d8-c770c4015887	1	Other	Other
+a27fa0db-24cd-4570-85cf-f843fca0b91f	1	Other	Other
+a28043dc-e577-48dd-ae48-1da1bbc977b8	1	Other	Other
+a280d6fe-9a67-45cd-bc10-d64b54ba1c9b	1	Other	Other
+a280ed1f-df5a-42d2-9eec-23f448f927be	1	Other	Other
+a280fd60-871f-47bc-b2bf-77d07eaf205f	1	Other	Other
+a281060a-3e52-4cf2-b48b-2ac6d09b48d1	1	Other	Other
+a2812cba-d77b-4972-a5ee-19809dcf0ff6	1	\N	Other
+a28150f3-107d-43ae-bf9f-1a43d795ffe1	1	Other	Other
+a2815b36-546d-4521-8483-f20f94bff460	1	Other	Other
+a281f00e-f94e-46db-9d9d-df1c829f230a	1	Other	Other
+a2835aa2-dcb7-4149-8632-04ec21deb179	1	Other	Other
+a2836194-a218-492d-99fe-167fab78ec7e	1	Other	Other
+a283a60c-b7ae-471d-9fb9-25fe1b34ccc3	1	Other	Other
+a283db37-7268-4237-9e32-7cc1b186793b	1	Other	Other
+a2843dbf-2522-4b96-91d4-6a69a5eac308	1	Other	Other
+a28489d6-b878-4b6e-8f53-8166c67f23e8	1	Other	Other
+a284b775-86af-4cf3-b551-cba417063b85	1	Other	Other
+a2851019-ecfe-4465-a8ac-fcab6b74e544	1	Other	Other
+a2856194-64ff-4f6c-8c14-61fc49846b08	1	Other	Other
+a285c071-df1f-4c5a-98fd-597abcee0e30	1	Other	Other
+a286003b-1bc3-48db-b4b6-1cb65f5cd7bf	1	Other	Other
+a2862f72-0ca5-488a-8ea1-97491ce520a6	1	Other	Other
+a2868132-2dce-424c-a720-b2fce85c1679	1	Other	Other
+a2869281-9fe7-47c2-8d76-3e5853b1bd51	1	Other	Other
+a286b3f9-d0e0-45ef-962e-62dd4c906530	1	Other	Other
+a286feb7-131e-4d1d-bf66-11056f8b1bb9	1	Other	Other
+a2873552-5790-4460-bb8c-aaf047b15b6d	1	Other	Other
+a2874da4-f1a9-4e10-957f-4f7c4785ae08	1	Other	Other
+a28766fc-6b83-4b72-92b1-eae86e82c630	1	Other	Other
+a28768cc-4dfb-4ab5-b891-5ff2cb9427cc	1	Other	Other
+a28795b4-dc0e-4544-bb6c-a9c6ffa7ed0e	1	Other	Other
+a287f980-d9b5-4b86-bbae-5ab4e9f8322c	1	Other	Other
+a28847e3-ed5f-4258-a560-17b33417aa86	1	\N	Other
+a288501b-045a-421a-873c-ad3c5e162149	1	Other	Other
+a28891cc-1d99-402a-9b15-190157035c0f	1	Other	Other
+a288bfba-1c74-4bb0-8809-c990a950d5ae	1	Other	Other
+a289ca10-56b0-4ab5-9b2f-0370ef0796c5	1	Other	Other
+a289ffa5-6f56-4d7c-b531-da21fb609902	1	Other	Other
+a28a1392-c264-413b-8617-26c7275daf27	1	Other	Other
+a28a2434-ab9f-40d0-bf42-cc1ef18da325	1	Other	Other
+a28a32a2-cd7c-421c-ae17-7b185a2ba7c9	1	Other	Other
+a28a4733-2a4b-4cbd-b051-5c39587b3de2	1	Other	Other
+a28a7b84-5bb9-49f5-b383-a17486441e89	1	Other	Other
+a28aa96e-fb5c-492b-8c9c-6b9cb1bab18a	1	Other	Other
+a28ac006-cd23-4076-ac3f-8d59aac7bb12	1	Other	Other
+a28acb3e-1ae2-448c-8376-bc1960300552	1	Other	Other
+a28b04ee-ef54-420f-980b-70a5cf5631ff	1	Other	Other
+a28b1015-30c7-4a66-9c07-153dd5cf817e	1	Other	Other
+a28b1483-e5de-473b-ae00-89fe13e2dd32	1	Other	Other
+a28b17eb-2773-48cd-a938-4abcc1000867	1	Other	Other
+a28b7172-f017-4f40-9215-9a56ab4a09b3	1	Other	Other
+a28b738e-738f-4b9a-9ca8-9cfa5aeb6357	1	Other	Other
+a28b9d08-94d6-473f-8a8b-f69a104fe24a	1	Other	Other
+a28bc692-7733-4068-8f37-267d959ec502	1	Other	Other
+a28bdc55-fe48-44c2-a393-1531b7fe6dba	1	Other	Other
+a28c0779-7c5c-4793-8593-13a173e4a8a8	1	Other	Other
+a28c1bd9-220d-47bd-97ec-f01abf2ac50e	1	Other	Other
+a28c53db-4eab-44c1-bf6a-6fb359f48dc0	1	Other	Other
+a28c7386-3e5d-4416-80d4-fc381b335799	1	Other	Other
+a28c9d7a-eca1-4f0e-ab3f-97847f13c337	1	Other	Other
+a28ce137-cd3b-4fff-8523-53b677fee0ef	1	Other	Other
+a28d0546-be9a-498a-b5c0-c55e2951dacb	1	Other	Other
+a28d261a-0465-491e-bb55-71e0f9aad13c	1	Other	Other
+a28d549f-518b-4277-b6e8-b1e09f1fcce6	1	Other	Other
+a28d9779-86a1-483c-9715-eaf4c2e7b8a5	1	Other	Other
+a28dac3c-e517-44f7-ae04-4590b95850b1	1	Other	Other
+a28dffc7-bda2-4e6f-afd5-17c5b6e140bc	1	Other	Other
+a28e733f-bde9-43e8-920b-3b57aa0b89f6	1	Other	Other
+a28e78e1-87be-4c6f-b598-bb40876f3f74	1	Other	Other
+a28e89d3-2bc2-4691-ac34-d7511e2ca094	1	Other	Other
+a28eaba6-a1dd-40ff-91b5-ca67c3bb8103	1	Other	Other
+a28eadb9-cc56-4bfb-adef-af832fff6ab6	1	Other	Other
+a28ed9e8-8e4b-4ceb-a5f9-029709ff3f31	1	Other	Other
+a28ef120-6d68-48eb-bc86-6c6c7e98a070	1	Other	Other
+a28f87ba-b40c-4c32-b10c-e424391613de	1	Other	Other
+a28fbbcb-e836-4eea-8b3b-0cf5daa6abb3	1	Other	Other
+a2900c15-94d2-4a6a-88d4-4b5e7fa60d07	1	Other	Other
+a290318d-6a7b-48c1-8a14-ef6fe436d7f9	1	Other	Other
+a2908979-76b9-446e-b19e-05a449b2966e	1	Other	Other
+a2909614-9c9d-46de-bff1-ce8fd59d37e9	1	Other	Other
+a290a720-c20a-40e9-a425-d012389bc2e9	1	Other	Other
+a290b8e1-5be0-43f9-9cac-073cd7652c99	1	Other	Other
+a2911475-654b-42a7-a496-2fb0f5a11a6f	1	Other	Other
+a2911ae4-5cb2-4524-8a88-aca2b295bcd1	1	Other	Other
+a2915bf4-e9ee-41f8-ab00-7765bcaf6a7a	1	James	Other
+a2918763-4ea5-441f-baaa-45f1e4fb20ba	1	Other	Other
+a2918f88-f9fc-40b1-8a36-d6d9a5a161ae	1	Other	Other
+a291b481-a8e0-4eb1-a326-6419c175c89c	1	Other	Other
+a291c9fe-43a2-439a-bed0-036c328b9996	1	Other	Other
+a292245a-888b-43cc-9f85-fa9c2dc2ceac	1	\N	Other
+a2925a43-749d-458f-b3a4-5df7fa78624e	1	Other	Other
+a2925f42-c67f-4640-b64d-3bd4c7af36cd	1	Other	Other
+a29273ba-d3f0-4a57-ac13-745b78d992bf	1	Other	Other
+a292e0c0-ca52-4214-a443-715e0ec58eae	1	Other	Other
+a2933651-3bbc-457b-8aa2-1ff3d4a907e7	1	Other	Other
+a2933fd9-514d-41b0-8e4e-a70ff491289e	1	Other	Other
+a29356bb-6bd5-4420-90d4-b2a68e6d31ae	1	Other	Other
+a293af0d-de0d-4d2d-9ea5-53d0e842d48f	1	Other	Other
+a293e2d7-df70-4e15-a6cc-67fcb427b32a	1	Other	Other
+a293fae6-53c6-45f7-a213-766c48ab724c	1	Other	Other
+a29406d7-4171-4df4-bd7c-36a88a0e1b41	1	Other	Other
+a29418cf-2aba-49c6-a699-517aa8fba3ac	1	Other	Other
+a2942010-2c5c-4869-b20f-0075df1e848c	1	Other	Other
+a2945aa1-4647-46b9-9437-f5061c525bf2	1	Other	Other
+a2945b37-d0c1-4522-984b-2aaad640aa46	1	Other	Other
+a29496a3-9748-4f02-9857-5ba213c0ec1e	1	Other	Other
+a294bd24-3de8-47a6-9d5a-e18b7deef18c	1	Other	Other
+a294c8f3-65e1-4180-a3f2-ec4438b1a288	1	Other	Other
+a294e09f-4be0-400f-9155-11d3a1cb6e3f	1	Other	Other
+a2951ac5-e125-46d5-bcb4-e18218690fb2	1	Other	Other
+a29526a7-44e0-4c2e-9d5a-1815403e8f3a	1	Other	Other
+a29534d9-a421-486b-bfea-1d0dffdcc32e	1	Other	Other
+a2955c74-adf3-40ea-a68b-3d236683693a	1	Other	Other
+a2956b85-ffa8-44a7-aad3-42fb5fc49a81	1	Other	Other
+a295c184-4a9e-4d59-9349-f92efe9f604d	1	\N	Other
+a2963579-a59b-4aeb-898a-41f8c52777eb	1	Other	Other
+a296441d-aace-4457-8025-613c60e16dd8	1	Other	Other
+a2965b99-83a1-426a-991d-6ab848fb5849	1	Other	Other
+a296d58e-dc34-4880-9922-4870a9a5b285	1	Other	Other
+a296d9b7-0543-4b8b-8ab8-ce8712f36897	1	Other	Other
+a296ea82-e34c-4e95-9ee6-cf8b650dd362	1	Other	Other
+a296eabf-7694-4799-8523-dcf2e353b81b	1	Other	Other
+a296fb9b-82ca-4484-9f0a-527d9908222d	1	Other	Other
+a2972e27-cd27-45c8-9c64-a2f164c64996	1	Other	Other
+a297742d-eb17-40dd-a82a-2ffeadd7bc1b	1	Other	Other
+a297d235-758b-4773-8ee7-6a89d8f0bde0	1	Other	Other
+a297d378-b024-4581-9130-aa5408495a91	1	Other	Other
+a297e14b-06ea-4bb7-9b83-85aab6980b33	1	Other	Other
+a298089f-dd71-48ad-9280-55d7f22669e6	1	Other	Other
+a2980bf7-3d04-4de5-b799-c7bdf865bed3	1	Other	Other
+a2982364-1c8f-49ee-922e-4f9bd0f9d8df	1	James	Other
+a2982b08-7a95-41c2-bc36-604868871ba2	1	Other	Other
+a298a823-5697-42c4-a4c1-0d28e9147c8d	1	Other	Other
+a298b502-43c7-43b0-b477-caa2ac83d903	1	Other	Other
+a298e265-75cf-4304-a83c-1eddaa42ab1e	1	Other	Other
+a298fe70-66db-4f4f-98d2-bb8f1fae565e	1	Other	Other
+a298ff5d-4517-4209-b206-ce93544aacd3	1	Other	Other
+a299289c-e7b7-4008-9d51-cc7f486bfa44	1	Other	Other
+a299581c-4521-4634-9e93-8aaf2f167988	1	Other	Other
+a2997015-0559-461c-9e30-0538a1a16ce7	1	Other	Other
+a29972c2-1209-4958-b001-03a9cb970302	1	Other	Other
+a2999c08-3ad2-4ab5-8dc5-a1867f5743e5	1	Other	Other
+a299ecca-709f-4e24-afa8-707707f2d1fe	1	Other	Other
+a29a2680-c927-4032-9daf-f90ba46cbef1	1	Other	Other
+a29a7c3c-cf67-4913-b056-2ec07f340b63	1	Other	Other
+a29a81c7-66cf-41ea-b6d9-ed12f74ec989	1	Other	Other
+a29b0f56-3a4c-4456-8342-a72d7f04ecce	1	Other	Other
+a29b42ec-3ee5-4c3c-a054-dce897fb2156	1	Other	Other
+a29b5275-a75a-47a3-968a-b6814415a945	1	Other	Other
+a29b76b7-48c2-4a38-b017-3cea43a04320	1	Other	Other
+a29b8263-50a3-43dd-b89b-52a4f0bf378f	1	Other	Other
+a29bff05-f66a-4210-8df5-1c81c005f025	1	Other	Other
+a29c5628-ae12-405f-a91f-c116d6bbabad	1	Other	Other
+a29c6f8a-fe68-41c5-96f6-eb2da237535d	1	Other	Other
+a29ce6bd-3205-44da-b8e8-652d8ccb7202	1	Other	Other
+a29d8c60-50a0-476f-aa3a-104a552d4180	1	Other	Other
+a29d8e69-3cb3-46d0-a405-cc7e9e42795d	1	Other	Other
+a29d9d0c-1486-4417-88a6-256581c7a246	1	Other	Other
+a29dd940-28bd-4e13-8ca0-df277e733766	1	Other	Other
+a29e29ff-8fa1-43ea-ad02-107ff246e57d	1	Other	Other
+a29e3f4c-ae2f-4ec8-a232-18a1667440a9	1	Other	Other
+a29e8e6c-dabf-48f3-ba50-8a9252285566	1	Other	Other
+a29eae69-a1c4-4847-8eda-65e189c95cb7	1	Other	Other
+a29f5e3e-5a2a-47e6-9686-89a210c1637a	1	Other	Other
+a29f7314-122e-4e5c-9936-1c9840b56d1d	1	Other	Other
+a29fb793-a258-4fbf-a23c-ed4ec6f00bfe	1	Other	Other
+a2a0491e-4768-48ff-8122-28de7abdad40	1	Other	Other
+a2a09ef8-abdb-4a6d-86c3-8b0fbc715c52	1	Other	Other
+a2a11f5b-5440-45b5-aca7-1f23c5fa0737	1	Other	Other
+a2a13939-7997-41d6-b0e9-74edeaf6d0d7	1	Other	Other
+a2a1723f-2ecb-4d37-89b4-7fa98905a52c	1	Other	Other
+a2a1be18-ed1c-4de8-aeea-3f83e8aa4ef8	1	Other	Other
+a2a1db35-dc36-4a12-b448-8108583eed9c	1	Other	Other
+a2a1e075-e1ae-40fd-bfac-155cb82a2a87	1	Other	Other
+a2a26fb5-b93f-46ba-b4aa-667abeb97f6a	1	Other	Other
+a2a2b0d8-f97e-48e2-ac1e-e09a61ad132d	1	Other	Other
+a2a2d3d5-93c6-4bac-a702-d7c2f7055f8d	1	Other	Other
+a2a2ed5b-8d05-43e1-a377-cd10ba758fd6	1	Other	Other
+a2a31e30-66bc-466d-a039-fa234dfb43d4	1	Other	Other
+a2a32455-d645-49c7-9f07-a04b505b1869	1	Other	Other
+a2a33a5c-6168-42b0-941d-aca78bc94e65	1	Other	Other
+a2a363a6-4918-4eb3-9b2d-32ef061f82d9	1	Other	Other
+a2a3a2a2-3cc9-41ff-bd50-a7b2be3a07e4	1	Other	Other
+a2a3bd22-8c5a-454d-83f4-22fcdb212de4	1	Other	Other
+a2a3d80f-0210-46a7-87bd-dab2851f2e63	1	Other	Other
+a2a3e6a9-b6d5-474d-815d-bc54584d0383	1	Other	Other
+a2a44ce1-5774-467a-b1eb-05f8d43002b3	1	Other	Other
+a2a478aa-e907-4ac9-98f7-0a31cf7551e4	1	\N	Other
+a2a4d25e-91ba-49d7-89fd-ca02fbf7a5f6	1	Other	Other
+a2a4dd4a-eb99-4e32-b460-2202c59c8b0b	1	Other	Other
+a2a4e760-48fc-43f3-a032-2060d3d06083	1	Other	Other
+a2a4f474-38bb-4398-b46a-73189ea227a4	1	Other	Other
+a2a55342-4ed1-4e86-963b-6e75815a4cde	1	Other	Other
+a2a558d6-5dde-44ae-a8ea-09a3cf57a71e	1	Other	Other
+a2a5740f-c015-481f-b8be-40c1ff81c652	1	Other	Other
+a2a57ebd-6222-4425-9f21-745906c74395	1	Other	Other
+a2a58a3d-8fe3-44a2-b1ba-c7f19278e412	1	Other	Other
+a2a5b021-2d90-42bc-a63f-0c08f5108e52	1	Other	Other
+a2a5b94b-7729-4df9-924c-b481b430b5fa	1	Other	Other
+a2a5d607-2085-4b3b-a4d7-a74cafe7689c	1	Other	Other
+a2a618af-39d8-4a44-8363-071b6a2cd3bd	1	Other	Other
+a2a624de-7070-4a7a-a786-f8ee52d8ab72	1	Other	Other
+a2a65811-c4e9-4cfc-95cf-283700b7a96d	1	Other	Other
+a2a6b3ef-828b-4ddb-947a-66e2487a5128	1	Other	Other
+a2a707a1-30f5-4b77-96a6-70e92cb92c14	1	Other	Other
+a2a73094-946f-4e89-afbe-0e901828b427	1	Other	Other
+a2a7324a-6f58-403b-ace3-33c5849495e4	1	Other	Other
+a2a766d4-d59a-4a0e-a2a0-0570894b2e00	1	Other	Other
+a2a7892d-49c5-420e-ba34-80880f1cafb8	1	Other	Other
+a2a7b36a-316b-43d9-b2d8-8e6d48359f16	1	Other	Other
+a2a7e2e1-c72b-4d60-8b41-65106e19a95d	1	Other	Other
+a2a7f60b-9916-4d3d-b2f1-1c7de4302391	1	James	Other
+a2a7fc0e-9238-4268-b99c-0dad5583a68e	1	Other	Other
+a2a80bfa-faac-49bd-bc12-f5ce709444aa	1	Other	Other
+a2a819ce-f1ab-4f05-bacb-4b0620a62ca7	1	Other	Other
+a2a81d1c-6c98-4b91-8c51-8e568d5c3c7f	1	Other	Other
+a2a90b55-e23c-4589-b947-818b47cfbc75	1	Other	Other
+a2a94f75-97b2-4b1e-929d-e1212421ea13	1	Other	Other
+a2a9c56c-c2c6-4634-bde2-1d8ece796162	1	Other	Other
+a2aa24f3-fead-443d-bfee-ba53beb5c922	1	Other	Other
+a2aa3a56-87bd-4d4f-a161-ab6bc57cd2ca	1	Other	Other
+a2aa4eb6-bcef-415d-bae3-f332278a6ec0	1	Other	Other
+a2aa593f-0ec6-4568-b8d7-8a6213c518ef	1	Other	Other
+a2aa85aa-2cee-4ae7-980c-70f609a4ec6a	1	Other	Other
+a2aaad3d-2da8-4e3e-81f5-93802be9c60f	1	Other	Other
+a2aad216-c607-4b00-8715-d1fd7569eeb6	1	Other	Other
+a2aad6d6-1ccc-4f20-ab41-09f6ad65e7c3	1	Other	Other
+a2aada37-ab58-4ba3-bdd4-38b4122e0cd7	1	\N	Other
+a2aae778-b178-471d-94f5-10408bcb57d2	1	Other	Other
+a2aafe68-a0c1-4fea-b7a5-da8e53efa630	1	Other	Other
+a2ab050d-3108-4bbc-9022-576f4335f2b3	1	Other	Other
+a2ab16f4-5ab8-4430-aef8-b77ef00ce305	1	Other	Other
+a2ab321f-91a9-4d52-8047-8046f26e19b2	1	Other	Other
+a2ab3e90-4cce-42ca-baed-36e4e5a3103e	1	Other	Other
+a2ab7c98-75e2-4d21-bbfb-cda1ad2b226c	1	Other	Other
+a2ab9eda-ef4e-4f9b-bf7f-e3558bae10b2	1	\N	Other
+a2aba3ee-99b1-4c6a-84f2-f6dc56894f25	1	Other	Other
+a2abbf6a-0b55-477b-9f73-1dbd13775e86	1	Other	Other
+a2ac0907-ff22-47db-8b9e-8f6d3047e7ca	1	Other	Other
+a2ac0e6f-2d71-4aa5-8164-b3fe655cce74	1	Other	Other
+a2ac1e9c-a44c-4403-ad3f-e2c34027dbc2	1	Other	Other
+a2ac20e7-8f8d-4613-9b4a-0622b20c4e7b	1	Other	Other
+a2ac70c9-6895-4141-a9b5-915a2a158a39	1	Other	Other
+a2ac9d86-d96e-49cf-9762-3427a3d90735	1	Other	Other
+a2acb43a-3422-4ad6-a412-9eb49ae6516e	1	Other	Other
+a2accdd4-0735-4b88-adff-d9799b2919ee	1	Other	Other
+a2ace8e2-a315-4d8c-9e71-9bca5fd86eda	1	Other	Other
+a2ad045b-791c-44de-a50b-a4fa581dd44b	1	Other	Other
+a2ad1a29-c8c1-4f3f-95bd-f716ed26831e	1	Other	Other
+a2ad1faa-6dd2-48f0-90be-a81062f251da	1	Other	Other
+a2ad7727-46a7-4256-b199-13966e71e15d	1	Other	Other
+a2ad775c-889f-4345-9f03-004b3136ac6b	1	Other	Other
+a2ad81bc-8357-44a6-b6e5-f22292ee4a11	1	Other	Other
+a2adcad5-2ad8-40ef-bfe9-720913dbeb71	1	Other	Other
+a2ae0cd1-f3d4-4176-8f2b-61e547e45c24	1	Other	Other
+a2ae14c8-2459-49cd-bf55-5033c180790f	1	Other	Other
+a2ae3203-7d1f-4931-805d-fbfce57e3869	1	\N	Other
+a2ae4ad4-4d18-4426-ad11-ccc5d6a9cb11	1	Other	Other
+a2ae588f-e482-4a64-b34a-e77a35e25365	1	Other	Other
+a2ae59cc-5746-4fb1-a501-77ee06019abe	1	Other	Other
+a2ae6147-ceff-4858-8eb6-aaf19ab3ed11	1	Other	Other
+a2ae6cdd-047b-4052-9ec2-c16811fc3c7b	1	Other	Other
+a2aeab12-fcbe-488a-947e-e278c65e2a54	1	Other	Other
+a2aee70c-1c6f-4a7a-b73e-cc452c7418cc	1	Other	Other
+a2aee79d-1aae-4a39-b5cc-e153d4cdd20b	1	Other	Other
+a2af43ea-8c74-4148-b924-bc1fe1f07ea5	1	Other	Other
+a2af446d-eed0-483c-8310-dd0190f7db12	1	\N	Other
+a2af79b5-4560-45f3-9a4a-5f06bc8b5bf1	1	Other	Other
+a2afb5a0-69f2-45a5-8a8c-4efe0fe46905	1	Other	Other
+a2b0880f-d3cb-4f71-89ae-f9f5e1dac8f4	1	Other	Other
+a2b0a116-14dc-4fa9-83c2-262bdf0e6cb0	1	Other	Other
+a2b0a6b1-896c-4f58-a056-7ca0a8d35855	1	Other	Other
+a2b0abe3-33a2-4f0a-bd5e-f4d085716b97	1	\N	Other
+a2b13383-7500-4b3e-bc95-fdafff44228b	1	Other	Other
+a2b1479d-ca50-4164-9082-71474f878427	1	\N	Other
+a2b1a64b-e53e-4e3a-b427-1020b39f83e6	1	Other	Other
+a2b1cff7-cbef-445d-bfd4-d091df705ba6	1	Other	Other
+a2b23278-41c8-49f2-98ba-6c724b133f34	1	Other	Other
+a2b27f6b-05bd-461f-99b8-3edb3768a715	1	Other	Other
+a2b2adfa-f27a-414f-868a-7195f8d29ffe	1	Other	Other
+a2b33992-2727-48f1-8d86-11af8712423d	1	Other	Other
+a2b350e1-1fdb-44e7-a232-471373d99f02	1	\N	Other
+a2b35395-6bf1-4055-8536-bb3bcd1987fe	1	Other	Other
+a2b378b6-3988-4cad-9124-2653ee297942	1	Other	Other
+a2b39591-8de3-422e-9b0a-026d8df15047	1	Other	Other
+a2b3b4ca-aa6f-4690-8a39-9a2c2f2e79ec	1	Other	Other
+a2b3b5c0-2393-46a4-b2fa-bfb7d93a237d	1	Other	Other
+a2b42ccb-d6ae-4b9e-b607-55f10a6832e1	1	Other	Other
+a2b438b5-a1c9-4753-941d-f44222f0929c	1	Other	Other
+a2b46640-303e-4779-8ee2-542b9aa7615f	1	Other	Other
+a2b4aa38-f890-4b0d-be5e-19d47b5c1dfd	1	Other	Other
+a2b5575f-2505-4422-a086-49a6a1c4498e	1	James	Other
+a2b5645a-1372-49dd-b176-6556fafd6c4d	1	Other	Other
+a2b56ac2-e1ab-4fdb-bc25-a82e64b341d8	1	Other	Other
+a2b592f9-bf62-46e0-a384-aa427e2c0f1e	1	\N	Other
+a2b5e158-89fb-4bb5-b084-d7c8b525daa0	1	Other	Other
+a2b5e7b5-2dfb-4f01-bb84-62d8f8705da1	1	Other	Other
+a2b6022d-ba8a-4d21-b2fc-893f76c64826	1	Other	Other
+a2b63067-e2ea-4697-bcd2-397c75c97500	1	Other	Other
+a2b63a2d-dce0-4742-9695-85e2b7eac37e	1	Other	Other
+a2b63fee-2a69-4f00-9482-62a1389c6d3d	1	Other	Other
+a2b686ed-2fb4-4e19-954e-d7ddac5f994e	1	Other	Other
+a2b69042-5a20-4fe0-90cc-7a1590a8bb1d	1	\N	Other
+a2b6ac0f-68f1-4e46-8df0-48806547a214	1	Other	Other
+a2b6e7ab-070a-4615-a804-8d18923be333	1	Other	Other
+a2b719b0-dbeb-4ba1-bc52-5e56e59a5ae7	1	Other	Other
+a2b745ef-7818-4fcf-ae38-6c89952462b2	1	Other	Other
+a2b78aed-a81c-4a81-9ac5-19ba7453e32d	1	Other	Other
+a2b797e2-e5dd-448d-b72e-1aeeebf57dd4	1	Other	Other
+a2b7a596-f09c-421e-bce5-09a2be95cbd8	1	Other	Other
+a2b7c7e0-91c3-4762-a277-b532c8edfc93	1	Other	Other
+a2b84336-397a-4df2-8b7b-e0ca2217699b	1	Other	Other
+a2b8e82f-6c64-4fbc-a4cb-9621f33ad782	1	Other	Other
+a2b8ed17-a462-46fa-8b9f-b1f406b62353	1	Other	Other
+a2b923bb-a844-4d58-9a9b-8594d85ea62d	1	Other	Other
+a2b92747-0959-4985-a092-a89bd042abf2	1	Other	Other
+a2b95912-a7ed-4a15-b22e-5af320a1e229	1	Other	Other
+a2b9aeb7-d552-47e1-8022-509f8377d65b	1	Other	Other
+a2ba066a-6c57-4821-8921-cabde16e2a00	1	Other	Other
+a2ba3234-3a49-4147-ab1a-f3c5d0945933	1	Other	Other
+a2ba3b76-7dca-4de9-b9ea-13f10485554b	1	Other	Other
+a2ba5b70-f11e-4df0-a025-a94615bc9e02	1	Other	Other
+a2ba6be1-3750-4949-9f5d-d209f2fa9950	1	Other	Other
+a2baa07d-ecb6-442c-8761-87cded4a5b97	1	Other	Other
+a2bac803-e2f0-460d-aceb-69ffb72b15dc	1	Other	Other
+a2bacec3-de48-48c5-a67a-d1e6aad19303	1	Other	Other
+a2bad425-a4fe-47dd-86c3-013cc95f6f0c	1	Other	Other
+a2bb017e-5a8f-4f14-aa13-452bedef0561	1	Other	Other
+a2bb640f-9c23-4c18-a80c-b5dc6025a108	1	Other	Other
+a2bb8945-612b-43fc-8107-3854e537ad64	1	Other	Other
+a2bbd86f-49a6-40b2-8815-d9bac979d4ba	1	Other	Other
+a2bc0cab-7dd7-41f9-bb8f-56bcc918ae7f	1	\N	Other
+a2bc5d49-c1bb-4880-b038-98506bb05916	1	Other	Other
+a2bc7b13-b93c-4cc2-8789-82dbbb115b14	1	Other	Other
+a2bc84af-4300-4900-b5b9-a38a66c08082	1	Other	Other
+a2bc8dc2-bebe-4fef-8103-72e82f3420a2	1	Other	Other
+a2bc8e47-db9b-4013-a48b-8c732c800c52	1	Other	Other
+a2bc91d2-3756-4edc-8db5-61b123e68bb5	1	Other	Other
+a2bcc13a-18a3-45cc-b596-e5e8ffdc9c1d	1	Other	Other
+a2bcd4f5-694a-4e39-b873-7a272bac02d6	1	Other	Other
+a2bcd6b9-176b-493c-b904-4ad2f3a81ea7	1	Other	Other
+a2bcecb8-c830-4d7c-9948-85c0dd329a9c	1	Other	Other
+a2bcf433-bbb7-4cac-9acd-45e1ca3cf38f	1	Other	Other
+a2bd56cc-64a9-4cec-b491-5e142af38da1	1	Other	Other
+a2bea53d-8dac-406b-be6d-6e175b357e7e	1	Other	Other
+a2bf74a1-70b3-44bc-9ff0-e8a7a77ea09c	1	Other	Other
+a2bf8017-a457-4535-9441-b697298c8463	1	Other	Other
+a2bf9da4-0bd9-47ea-bd8d-5e9f2908680c	1	Other	Other
+a2bfb1ee-0e51-45e6-8964-93c099149865	1	Other	Other
+a2bfc0a3-a360-42e0-a4a7-900404dd2901	1	Other	Other
+a2bfc0bc-9e10-4221-a5ef-9d703bdea897	1	Other	Other
+a2c03b10-a93e-4696-b593-9b23c3ebfb36	1	\N	Other
+a2c05327-c6db-4379-b7a8-2ca1cfd98b21	1	Other	Other
+a2c05e74-130c-4934-aef1-349cbe191efe	1	Other	Other
+a2c084e9-e739-471b-a02d-41e467c20c85	1	Other	Other
+a2c0a88c-9baf-45f5-ba6d-bff888f2072e	1	Other	Other
+a2c0dd04-40ab-4d2c-87e9-d598b1d11bc1	1	Other	Other
+a2c1346f-f18a-4992-aefe-2bb0b0f7a174	1	Other	Other
+a2c13a19-d92c-4fcd-975e-8bcc656a96c8	1	\N	Other
+a2c1877d-57a8-4919-a088-66be1395dd3f	1	Other	Other
+a2c19f61-651d-4d70-9756-f3119e3c1232	1	Other	Other
+a2c1c659-3e40-4319-8ff9-23c0226a6029	1	Other	Other
+a2c1ddb9-fbc1-4ea3-b78c-e617eb7552bb	1	Other	Other
+a2c1de95-1781-4d09-bd13-a41937ac5f6c	1	Other	Other
+a2c1ee99-cf53-4813-bcca-1defc16c63e5	1	Other	Other
+a2c23900-5faa-4d37-851e-b77f51e7d69a	1	\N	Other
+a2c28a5b-b6cc-42d2-8bcf-68443a6bd7e8	1	Other	Other
+a2c2a7fa-00f2-41d7-8773-c564808a037b	1	Other	Other
+a2c2d3a3-d59c-4564-ba7a-a4ea076ad9fb	1	Other	Other
+a2c2da38-f998-4bc1-b311-c1ae9e6b57eb	1	Other	Other
+a2c2dff3-66f5-45b6-bcd5-71b6ed40a215	1	Other	Other
+a2c2ffed-4725-48c4-9c5d-ecc57bfd4495	1	Other	Other
+a2c3198f-a635-4726-ba4f-cf19753f8460	1	Other	Other
+a2c35742-94ba-4738-916b-a19d036f90d9	1	Other	Other
+a2c447b8-47f2-489a-89d3-6e80681d9ab5	1	Other	Other
+a2c4bc85-c291-4289-afbc-71ab9320d118	1	Other	Other
+a2c4ca5e-c253-43ea-b2f4-d876b698789a	1	Other	Other
+a2c4cc14-660f-47f4-b588-32439d571f8f	1	Other	Other
+a2c518c7-97bb-4dbf-baac-f56d1ef40872	1	Other	Other
+a2c51c77-8a9b-46f0-9a52-4a4e99144fed	1	Other	Other
+a2c54b47-cf3e-4bab-9bc2-5a3f7f7e4b65	1	Other	Other
+a2c58cdb-d9a1-4bbd-83ba-d2e19bdd07eb	1	Other	Other
+a2c5961c-754e-4b46-aac3-a3e15497f5cf	1	Other	Other
+a2c5c741-b174-4d2c-b002-d7df31069bcc	1	Other	Other
+a2c5e7c8-baa5-4c09-a441-7e2270e08b60	1	Other	Other
+a2c61abe-b43a-4bb2-bc67-20fa9f09e8bd	1	Other	Other
+a2c620c5-1bee-4cce-903e-841d6e614377	1	Other	Other
+a2c65316-ffca-458e-8f7b-b7fb4c788a5a	1	Other	Other
+a2c6725d-bf6a-4a74-8fa3-717f7cf692ce	1	\N	Other
+a2c675fd-eb00-41be-80bd-d70824967de5	1	Other	Other
+a2c67d48-38d4-4fe0-85de-27166af36b0e	1	Other	Other
+a2c68110-ff95-41ad-964f-e13dbb5fc15f	1	Other	Other
+a2c6fcc1-246e-4802-9211-a5a05f94a290	1	Other	Other
+a2c70695-a330-42bb-81f1-f21adf547bc4	1	James	Other
+a2c710ed-25b8-4716-8d4b-1b083c0ecefb	1	Other	Other
+a2c74bbc-00a1-4761-9869-e0fbe0d18147	1	Other	Other
+a2c78acf-61a1-4942-8e32-8824d132c5ff	1	Other	Other
+a2c7c6c2-8e75-40b0-bbae-1c515575173d	1	Other	Other
+a2c83ef7-0ab6-4cbe-9343-ec661072dca1	1	Other	Other
+a2c8634e-f2ca-4801-9e56-f97ebf84af8f	1	Other	Other
+a2c87177-a0fb-4ef2-b689-de82851732d1	1	Other	Other
+a2c8845f-26aa-4a9c-af67-0f55488f360f	1	Other	Other
+a2c8ed30-660a-423a-8756-0dd2087c03a5	1	Other	Other
+a2c906a6-6ebf-4e31-9cb7-4f1829aa6a76	1	Other	Other
+a2c94feb-9282-43f2-82fc-74266626881c	1	Other	Other
+a2c95464-4015-4868-8f6b-a3eb5979d409	1	Other	Other
+a2c997b0-28e8-4a38-b0eb-3ec04a5d7ee3	1	Other	Other
+a2c9dbca-3529-4494-b7ab-63a375f4f061	1	Other	Other
+a2c9fbc8-fcf3-4a4e-9e57-346b930c8c45	1	Other	Other
+a2ca1bbb-a5d3-4552-aeb2-6358e0915f76	1	Other	Other
+a2ca45a3-16be-4b1b-90b6-61f5bfe96118	1	Other	Other
+a2ca79dd-ee4a-4461-be3f-8675600da3bd	1	Other	Other
+a2ca9c3c-4665-458d-b250-ecf190bcdd1c	1	Other	Other
+a2cabb42-551b-4d14-a273-b54292388e10	1	Other	Other
+a2cace8f-df5d-4257-8296-095256317a8d	1	Other	Other
+a2cad653-6075-4c67-a154-afc0ca1edbe4	1	Other	Other
+a2cb0cff-9a83-4880-98e7-9b0e52e5702e	1	\N	Other
+a2cb34f4-7061-4e5b-bd8e-31ef1c02abf1	1	Other	Other
+a2cb3e33-c0c6-4ac5-b9ad-42a1144c8567	1	Other	Other
+a2cb76c3-3f81-43b8-813c-19f8593a41a1	1	Other	Other
+a2cb88a2-b1f7-4caa-9b02-2a7ff3e2eefe	1	Other	Other
+a2cb9237-684b-4b7a-a40b-d81af507f2e6	1	Other	Other
+a2cba497-b8aa-4792-9dc0-2ea6a904f824	1	Other	Other
+a2cbc897-9a5f-4b34-bddf-e200260d8c13	1	Other	Other
+a2cc38d7-c5d2-4fe5-bbe9-6b48edf762d2	1	Other	Other
+a2cc5e94-d37a-4ff1-bc4c-a2e0c5841fd2	1	Other	Other
+a2ccbb24-cf06-43d7-9cf1-9fcc1741f0bc	1	Other	Other
+a2ccbd82-7f08-4edc-8857-8bae585c28cb	1	Other	Other
+a2ccc424-883c-4c72-ae96-2ce6367cbf03	1	James	Other
+a2cceec0-654f-4d76-83fb-b49f41471d2d	1	Other	Other
+a2ccfcd1-e2b6-46ba-8440-7c6321551846	1	Other	Other
+a2cd0d18-50d7-4e49-92d1-27bd66fa949b	1	Other	Other
+a2cd0f45-b434-4c22-a2e6-0206bcfd5770	1	Other	Other
+a2cd4752-7c12-420a-b633-429adf9b4c8b	1	Other	Other
+a2cd4e60-f91c-491f-b863-f1d17af26907	1	Other	Other
+a2cdac26-5540-479c-bdfa-e6a6e08c6d46	1	Other	Other
+a2cdd284-2235-4c21-9802-dd2c640796e4	1	Other	Other
+a2cddeb8-7924-4d1b-b12b-caf288f2166a	1	James	Other
+a2ce28e0-c2a0-4a55-9f34-850b322037ee	1	Other	Other
+a2ce972d-1f3d-4787-a8a4-3e0631128051	1	Other	Other
+a2ce9966-227d-43c4-8a38-a68604199a15	1	Other	Other
+a2cf6f35-87d1-43d4-a180-7ebcd1568935	1	Other	Other
+a2cf7b5f-75b5-42fb-a6a0-b80f1bc31adc	1	Other	Other
+a2cfc038-a6d6-4918-9a78-85bb06510e0b	1	Other	Other
+a2cfe76e-7a26-41f9-86d9-a536157e3ff5	1	Other	Other
+a2d00cd2-0006-4361-896a-33e6f5789e5a	1	Other	Other
+a2d0ffd2-024e-4e9f-8675-1c58ff9caa52	1	Other	Other
+a2d100d1-0a99-4d0b-958f-e3694372ddf2	1	Other	Other
+a2d10145-14b7-44cb-b23e-53d4f7e2930c	1	Other	Other
+a2d161e0-55c3-404f-bef2-6b6e37c28231	1	Other	Other
+a2d169a1-f080-4ee6-84a5-39c7dee9940d	1	Other	Other
+a2d17257-2d58-4e84-8faa-9c1de854d7fe	1	Other	Other
+a2d1b0b5-723a-4a7b-ba3c-1bff871ffd8d	1	Other	Other
+a2d1cb01-a0ca-4545-8466-8300f085fbdf	1	Other	Other
+a2d1f778-188a-4e9a-94ec-41bc340bfa48	1	Other	Other
+a2d2416f-fdfb-4cfb-89a6-c06e9bd0cf29	1	Other	Other
+a2d25d42-b84f-45a3-af85-19452b20ef39	1	Other	Other
+a2d26f23-cfaf-42b9-9083-0acb48c3bfe1	1	Other	Other
+a2d2a30c-9919-4557-a4b1-697aa0626a80	1	Other	Other
+a2d2ae92-4bdd-4fcd-a445-43f92ed5411a	1	Other	Other
+a2d2ed17-8859-420f-aeb9-12e8cd0f2cad	1	Other	Other
+a2d32ad1-79e1-4c40-8779-bbff9f9771e3	1	Other	Other
+a2d355a4-e69b-4447-aef8-2f10e2dab359	1	Other	Other
+a2d359bc-c176-4c8b-9dce-c9f8024b6cfd	1	Other	Other
+a2d3aa57-2031-438f-be2f-b265c87eb757	1	Other	Other
+a2d3b685-8e62-4e52-b064-a882291c83f0	1	Other	Other
+a2d3c1ea-c696-4a28-96ad-222dacbe1ba4	1	Other	Other
+a2d3f5a4-9ad3-43d7-8af5-a58633a758ac	1	Other	Other
+a2d44dbe-ea72-44ff-acc4-f4dd58e4037b	1	James	Other
+a2d45522-17f2-4cfe-95d6-af928090d720	1	Other	Other
+a2d47461-112c-485c-8993-6ede57eb2bd3	1	Other	Other
+a2d47af6-e033-4148-847c-7894f6a2aa78	1	Other	Other
+a2d481f3-5f74-4a65-af4a-151b9f0c3bdf	1	\N	Other
+a2d4d714-151a-4f49-b834-12714eeb96c5	1	Other	Other
+a2d4de9b-1828-4c73-9340-14b95bc537cb	1	Other	Other
+a2d4fd08-2be6-44a7-98ba-d03052f15ada	1	Other	Other
+a2d5080b-14e5-4e4d-9239-c5081b5d5d6f	1	Other	Other
+a2d52b9f-0479-4f10-98f3-4d6e533f0b25	1	\N	Other
+a2d676a2-91b2-41f0-ba8c-06c48e7d4653	1	Other	Other
+a2d69698-6cbd-4c52-a787-ce881b262147	1	Other	Other
+a2d6a853-6a08-4585-bd17-905d85a68fee	1	Other	Other
+a2d72dd9-0139-46f8-afe0-9da2e6e3deaf	1	Other	Other
+a2d79b21-49ce-4dc8-9c20-c924f9f7b2ae	1	Other	Other
+a2d7e6e3-0bc1-4fbc-992d-c4a02770bb27	1	Other	Other
+a2d823cf-b755-4eeb-b1ae-bcd8a1926d4b	1	Other	Other
+a2d8861e-2c79-45bc-81e2-b1468304916c	1	Other	Other
+a2d89ad6-9c8d-11e7-87e1-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a2d8b926-4804-4371-b042-321539219949	1	Other	Other
+a2d8cb28-153c-4d63-9626-c472a23d1630	1	Other	Other
+a2d8cdf0-4b58-42da-8482-c8254b90b626	1	Other	Other
+a2d8e104-7900-4628-8854-5546378fa053	1	Other	Other
+a2d8eb45-9303-468a-ac18-37d15303fb3d	1	Other	Other
+a2d929c7-798a-40b1-861d-b87aeaf26b48	1	Other	Other
+a2d94d0b-8149-4c48-87e4-41c28e0639ff	1	Other	Other
+a2d9cd7a-9391-4906-9e9f-886309fb3ec7	1	Other	Other
+a2d9dffa-437d-4435-9a0b-2742a02801f9	1	Other	Other
+a2d9f30e-e515-4190-b14c-61550604561c	1	Other	Other
+a2da26cd-7cbe-4676-985c-cf1962fedb6c	1	Other	Other
+a2da59cb-1f3f-4140-9e77-d26c40f48f65	1	Other	Other
+a2dac018-9c47-4a18-a912-0d91d3213318	1	Other	Other
+a2db07ce-00a8-4f67-9c94-a8c6c44d853c	1	Other	Other
+a2db27ed-5878-4b0e-90d5-6738893a774c	1	Other	Other
+a2db47db-8da1-4d00-9b94-3fdeb223db7c	1	Other	Other
+a2db5695-5f9a-4a0f-89ba-406ca7fb237e	1	Other	Other
+a2dba9fc-8bc0-42b3-b8df-d18b41832091	1	Other	Other
+a2dbad8b-0aa3-48a7-8616-981f9505ca1d	1	Other	Other
+a2dbad8f-4ddb-460c-a9b2-8b08800686a8	1	Other	Other
+a2dbbc9a-82fb-479b-aab1-a6373d85b260	1	James	Other
+a2dbbd74-bedc-49ac-86d8-7f34ad06b613	1	Other	Other
+a2dbebdd-fce9-431d-a4bc-35afc0a818a4	1	Other	Other
+a2dc30e0-f5fd-40fd-b50c-9db6c694eef5	1	Other	Other
+a2dc3bf4-3a80-448e-b7ba-bf4aacb35301	1	Other	Other
+a2dc43f6-5699-45d7-b45b-6a912474b9e0	1	Other	Other
+a2dc6523-d0bc-4a93-9478-7ca912caae4b	1	Other	Other
+a2dd38cb-0738-4352-8c06-0b001bbd560e	1	Other	Other
+a2dd3a02-8ea3-4ab1-b17a-00614ed77017	1	Other	Other
+a2ddaab0-213f-450d-89e7-5e3aa57e0e26	1	Other	Other
+a2ddd329-1400-405a-a035-2e3f6eb937d5	1	Other	Other
+a2ddd613-94b6-48dc-98d2-a4c9510fc345	1	Other	Other
+a2de1a11-bd2e-4bed-9d02-b3beee3dadf1	1	Other	Other
+a2de676b-6b0e-4862-98c7-4cff3a53565c	1	Other	Other
+a2de8a43-f030-4f31-b0cf-49fc21754d91	1	Other	Other
+a2de9f4e-431a-4c22-b4eb-f04cc29ab964	1	Other	Other
+a2dedd8e-fc06-49ca-89db-6c472cd84c08	1	Other	Other
+a2df9341-909e-4712-b966-b901f106d8bd	1	Other	Other
+a2df9ea1-34a2-43bf-85cc-d040960d2fbe	1	Other	Other
+a2dfc069-d0e2-4e2a-b36c-509e7aa43aa7	1	Other	Other
+a2dfd59d-24fc-4e97-9a65-e7dc93a320ef	1	Other	Other
+a2dfed22-76e1-455d-a39b-0266723afb57	1	Other	Other
+a2e00b18-cfb5-4b8f-a884-618d664ef823	1	Other	Other
+a2e03fe4-a892-44aa-aee1-a7670b7375e9	1	Other	Other
+a2e04133-7934-4dc8-8cae-1a3a0a7d2802	1	Other	Other
+a2e04f64-8d33-4003-8412-7967b4967408	1	Other	Other
+a2e06881-b0d0-4255-8c90-d78c57cbccfa	1	\N	Other
+a2e0981e-ab1c-4fbe-99c0-439c7eff335b	1	\N	Other
+a2e0d116-7ffb-41bb-bfdc-56b96efdf8e3	1	Other	Other
+a2e11fdf-9454-463f-b1ad-18ba1a9ff811	1	Other	Other
+a2e13eb5-7508-4483-aa57-53ce195e5f93	1	Other	Other
+a2e1a7e2-2af9-4818-b607-442c3c852790	1	Other	Other
+a2e1c931-a95e-47f6-a137-b1bc0efd25ce	1	\N	Other
+a2e1dc6d-92f2-4acd-8a48-9e44730bdecd	1	Other	Other
+a2e1fac6-0857-48bf-ae33-9bb37b5e7f80	1	Other	Other
+a2e20881-27cf-4313-b15e-55b7a61c483d	1	Other	Other
+a2e2861f-379c-42cb-a54c-f2377bcca6dc	1	Other	Other
+a2e299c0-979a-4369-a807-c635bcb909cd	1	Other	Other
+a2e2f3e3-e1b6-42a2-a38b-ab0935cc8470	1	Other	Other
+a2e33d89-b0eb-4af6-8542-01f21b7c4fd8	1	Other	Other
+a2e3695b-8281-49c4-a0be-7bd117c352cc	1	Other	Other
+a2e3c876-3648-4b7b-8db6-8d108259c026	1	Other	Other
+a2e3c8e4-a2f9-4f32-905f-21d2a7ff0756	1	James	Other
+a2e3ef4b-8565-4e7a-8129-80284ba57f50	1	Other	Other
+a2e400a8-be7b-42c6-81d7-6db98e1c95f2	1	Other	Other
+a2e41bab-a19b-4f2f-964f-69e5ee05c5f0	1	Other	Other
+a2e45aae-caf1-44b8-b9a2-f46d0b4e9414	1	Other	Other
+a2e47bb4-6059-4c86-a81f-c4b77dd53175	1	Other	Other
+a2e4b925-2516-4484-ad54-cf68093d8bc6	1	Other	Other
+a2e4d0fc-7ec4-4cf2-8e49-6560d7fea521	1	Other	Other
+a2e4e2f8-bbe1-41f4-9303-05736da564f5	1	\N	Other
+a2e56233-83bd-47b7-ae02-18621119066f	1	Other	Other
+a2e5997d-8bec-44f7-8b21-215c168d1e70	1	Other	Other
+a2e5a754-8d7e-4789-9966-54c642e2862a	1	Other	Other
+a2e5adbf-bce6-4301-b4a7-ac3313548d0f	1	Other	Other
+a2e5b591-9801-4a29-b580-2ca115d43cb4	1	Other	Other
+a2e5b6ef-a45f-4361-b3c8-9ad247395f69	1	Other	Other
+a2e5c66c-61af-4905-90cb-8f35f87d4841	1	Other	Other
+a2e5f375-b0e1-49d7-b621-7db72ccd53b5	1	Other	Other
+a2e62da3-8b89-40cf-8aae-e1e771b813f8	1	Other	Other
+a2e630c1-77e5-45d1-a33a-1b27a249b117	1	Other	Other
+a2e63d0c-75f4-4c7e-840c-de67b8ea924a	1	Other	Other
+a2e64477-4676-497b-ba42-73593c60a3c6	1	Other	Other
+a2e6453b-a564-431e-95bd-b0349e51d49a	1	Other	Other
+a2e66a14-c385-4c4f-a6cb-7788fb2cc872	1	Other	Other
+a2e6d485-3db5-4b64-9386-c0d7e2ab8d1f	1	Other	Other
+a2e6ee09-6fe8-481c-96b4-a86980c84738	1	Other	Other
+a2e728a4-6420-4672-9c3f-3d3d3cadac63	1	Other	Other
+a2e73f52-2f9a-414c-b320-a40535d795aa	1	Other	Other
+a2e78868-15c2-4faf-b3af-2f8deac47be7	1	Other	Other
+a2e79a59-88d1-4d55-b23b-10cf0da63cc3	1	Other	Other
+a2e7b5a4-b432-4a5d-9fb6-8b1492090f2f	1	Other	Other
+a2e7d030-4484-4f99-829f-fc9b1a0ee5f3	1	\N	Other
+a2e87ba5-c27f-498a-ba8b-833eed27b31a	1	Other	Other
+a2e8d54b-44bc-4f9d-a36f-09ecb8761b20	1	Other	Other
+a2e91580-1fb8-4c62-aa95-15f796333bba	1	Other	Other
+a2e94367-9adc-47c2-88b9-a4b3d8fb770e	1	Other	Other
+a2e95994-e81b-4e4e-9749-fd3f3552dfc7	1	Other	Other
+a2e98e79-a05d-4dbc-bd6e-cf5782a4f7ab	1	Other	Other
+a2e9e8a8-09a2-480f-9f10-5c89439d7e05	1	Other	Other
+a2ea045d-9eae-4993-9979-16b03329b7aa	1	Other	Other
+a2ea5f1e-6574-4e27-a001-e70410c61b80	1	Other	Other
+a2ea9bb7-1583-46f3-875f-aa176c4a1e45	1	Other	Other
+a2eb1e1e-4f04-4404-b680-55055e581eb8	1	Other	Other
+a2eb30bb-23df-448b-9c2b-ffe0a67a9c07	1	Other	Other
+a2eb39f4-f4bb-449c-8eb7-bfd45ce1e741	1	Other	Other
+a2ebd80c-c8d9-4590-ad3a-04e6b7b3ceba	1	Other	Other
+a2ec3d1d-4b3f-48da-a3ee-9baf57595662	1	Other	Other
+a2ec5e31-cf55-4dcf-a4ad-83eeb374aecc	1	Other	Other
+a2ecbeef-b621-4f28-9ce9-e43285e38734	1	Other	Other
+a2eccec6-8c04-40bb-ad0e-eaa7b6c4ec6f	1	Other	Other
+a2ecd8b1-6cea-4246-aee6-7df40c77a13a	1	Other	Other
+a2ecf107-8f83-4ee4-bca7-004533496a42	1	Other	Other
+a2ed012d-7a15-4672-9f91-b1d06b40928d	1	Other	Other
+a2ed245e-b017-433a-815f-4da15c0740dc	1	Other	Other
+a2ed5180-d235-4e4b-aee4-69f062cd6dc8	1	Other	Other
+a2ed83f3-9ed5-4b99-8407-743e66835682	1	Other	Other
+a2edb78a-8737-4fcb-bf1a-00dd93f52136	1	Other	Other
+a2edd5e0-cb8c-4cbc-8876-f3b444466424	1	Other	Other
+a2ee0610-bf06-4bb0-b2d0-c1614e57a607	1	James	Other
+a2ee2546-1aeb-46aa-bfd2-bd3ba78bb7a7	1	Other	Other
+a2ee3089-a5cf-4c9c-b66e-113c5803f434	1	James	Other
+a2eea8b8-b60d-4df5-a873-83c1c8a57928	1	Other	Other
+a2eed289-e69a-412c-b834-028473e8c0af	1	Other	Other
+a2eeedec-792c-48c1-a4a5-f8f810fc67b3	1	Other	Other
+a2eefba2-ed88-4cdf-8f6b-c04efc4c50c7	1	Other	Other
+a2ef0f21-3f06-4936-8fff-cbe13b5ed452	1	Other	Other
+a2efec6a-336d-4372-aa59-0335ba64ffbd	1	Other	Other
+a2efedba-8cb2-4e66-9b67-f0e88da140a4	1	Other	Other
+a2effba7-152b-44e2-b6ae-36bdde824909	1	Other	Other
+a2efffa4-f9c2-405e-9a7b-190ffcb6ecf9	1	Other	Other
+a2f029fa-1e70-40fd-9db9-8111fb0bdb73	1	Other	Other
+a2f02a6f-7542-4568-9ecb-589b5b824094	1	Other	Other
+a2f069eb-e2e9-48c0-9118-5c9c3009495b	1	Other	Other
+a2f0a61d-221a-4a19-8299-7ba5072086dc	1	Other	Other
+a2f0ab95-7ae7-4b3b-a151-c2a48d7d39aa	1	Other	Other
+a2f0c10b-3f0b-4317-813a-1ab09fee6b29	1	Other	Other
+a2f0de66-4833-4aaf-909b-3af9a740b580	1	\N	Other
+a2f0e293-ca9e-4b7a-b91a-f307e2ef47e6	1	Other	Other
+a2f139ea-2cef-4908-b226-9fc5eaba2240	1	Other	Other
+a2f16746-8afe-48bf-bbc0-f656f0c1e94b	1	Other	Other
+a2f18754-86d9-4e2f-873a-37fbf0a3a415	1	Other	Other
+a2f24d1c-0807-48f3-9c80-89a1832a4f0b	1	Other	Other
+a2f2578a-0a91-4f97-b8d1-d4365cbd1f94	1	Other	Other
+a2f2715a-116e-42fd-9928-7eb7985bc65e	1	Other	Other
+a2f29c0d-b603-4a35-945e-8ded7d27afa6	1	Other	Other
+a2f2bad0-597e-4534-9370-2e4903a53a84	1	Other	Other
+a2f2e9a2-f305-44a4-9c14-a1612332b34f	1	Other	Other
+a2f31a3f-c7bf-4fde-8ca8-bbf62a30ec23	1	Other	Other
+a2f328b2-6d38-456b-855b-dd3438ee98d3	1	Other	Other
+a2f351fe-d54d-4939-beb0-566a19c30979	1	Other	Other
+a2f3586d-a298-4071-8fb5-983b315a685d	1	Other	Other
+a2f38433-ef09-40c3-8cf1-f006c2eef108	1	Other	Other
+a2f399c6-1da3-42c5-91fa-3d6abb47c6fe	1	Other	Other
+a2f3fa1b-549d-46ea-92cf-46184d200514	1	Other	Other
+a2f422d6-e3e6-45cc-bf3e-c0a7c361109c	1	Other	Other
+a2f436c0-2de0-468b-8c4e-1ce689d6cfb4	1	Other	Other
+a2f4383a-bdec-4eda-afbb-b6fe091d782b	1	Other	Other
+a2f43d5c-49c5-4fe9-b1ae-c10fb98ab008	1	Other	Other
+a2f4451b-924c-4d8a-a0de-721454b00484	1	Other	Other
+a2f4791c-db93-4eba-b524-3e0ae9655e90	1	Other	Other
+a2f4932a-b715-4f43-bad6-73850dd09a38	1	\N	Other
+a2f49368-96ac-44e8-8130-1a983ff4b0fe	1	Other	Other
+a2f49b62-ca44-4d47-922f-c977f4923354	1	Other	Other
+a2f4df87-28fc-4ff8-bd55-f138d2493992	1	Other	Other
+a2f567ef-7e20-4435-9a73-cef09a768d52	1	Other	Other
+a2f58065-7756-4660-a0be-aca7ca12b74b	1	Other	Other
+a2f59828-476e-4e0b-a1ca-f874cff5b8b4	1	Other	Other
+a2f5ab2a-ea6d-41fa-9507-291170299063	1	Other	Other
+a2f5b40b-ac66-4f5e-8017-81fc1189c54e	1	Other	Other
+a2f64aae-4e70-45d0-b20d-d524495725e7	1	Other	Other
+a2f64ab4-9175-41f9-8c3e-172c3a67af74	1	Other	Other
+a2f64bec-325f-4cfd-9e0b-2943b8d2abd0	1	Other	Other
+a2f65463-e388-479a-8f12-be19699504a5	1	Other	Other
+a2f6b9af-d815-4aea-957a-ad28e3f3afa9	1	Other	Other
+a2f6ce58-321d-47f9-9352-0a2d17a574e3	1	Other	Other
+a2f6ede2-51c4-4efb-895e-23659238db1e	1	Other	Other
+a2f6f6d4-5166-4ef5-9954-f459ada357cf	1	Other	Other
+a2f7019c-3d73-4c0c-bf7d-ea74a2ec57be	1	Other	Other
+a2f70bbc-c076-429e-ade6-8dd8acef6845	1	Other	Other
+a2f72e7d-2d4e-45d0-9b8c-cb034d034ca0	1	Other	Other
+a2f738e2-bad3-4466-af64-f96d0083e521	1	Other	Other
+a2f7d9fb-d5ba-4694-a501-d3a010f0f023	1	Other	Other
+a2f7dd2a-30e0-4f72-b309-3d679dcd9077	1	Other	Other
+a2f7eaee-1078-40fc-89a3-8f07343fe18f	1	Other	Other
+a2f817df-e7f5-4c06-a993-f0251a2e5215	1	Other	Other
+a2f81af4-c1e6-40ca-97a3-31d4836e7992	1	Other	Other
+a2f8447b-1565-4cca-b015-5d055f6a7d21	1	Other	Other
+a2f86d02-7b66-4f35-b861-763a667a22ce	1	Other	Other
+a2f8af2f-0ab2-43f3-a298-3666755da45c	1	Other	Other
+a2f8b480-a346-4495-bdfd-6c11f1294905	1	Other	Other
+a2f8fb58-63ce-4ea2-a521-2b727b4ed7a5	1	Other	Other
+a2f91340-b452-48f6-b99e-e91d430f53de	1	Other	Other
+a2f9468e-5c01-4aaa-9d54-877913325578	1	Other	Other
+a2f95c53-e72c-4701-83fe-6cf978a44279	1	Other	Other
+a2f9653c-9d22-43ee-ae4c-c18dda6fba90	1	Other	Other
+a2f99f0c-573a-4bff-aaa7-72ae13286852	1	Other	Other
+a2f9e210-5d64-471f-80ea-31bdc35545f3	1	Other	Other
+a2f9ea01-c085-4337-81ed-21df949e64c9	1	Other	Other
+a2fa023b-3392-4f9d-a9db-b5ba27476027	1	Other	Other
+a2fa0b32-ac20-4efa-a80d-ee895c4d3577	1	\N	Other
+a2fa0bf3-be29-45e2-8319-62b2e265249a	1	Other	Other
+a2fa522f-826a-4d2e-9aee-3e6468d3bced	1	Other	Other
+a2fa67dd-5f05-4ca9-852c-6e9e000e3088	1	Other	Other
+a2fa6f3c-e928-47af-8058-471f38c32ec4	1	Other	Other
+a2fa836a-99fd-47be-a209-3877fee17213	1	Other	Other
+a2fa964f-5611-43c5-89ca-a8bd9f2406ae	1	Other	Other
+a2fab398-b8d4-4e82-a073-8c31151bf8bb	1	\N	Other
+a2facb4d-e9d6-46f8-8090-7564318858da	1	Other	Other
+a2fae2c1-55b3-46d0-a649-82c2a9a89fa4	1	Other	Other
+a2faeeb1-9f03-4180-b527-2f686557329f	1	Other	Other
+a2fb37ab-e438-4b6e-94f1-6da1492e7695	1	Other	Other
+a2fb38c1-f42a-4d63-a086-4610853be8fb	1	Other	Other
+a2fb47ae-11ec-4b16-872c-b1b56b0800b3	1	Other	Other
+a2fbebb5-a8bb-40f9-9c32-87a9bd058c39	1	Other	Other
+a2fc02fc-1814-4ec5-9060-8bcf8e9ee522	1	Other	Other
+a2fc40fd-068d-4c09-9125-684b082238a5	1	Other	Other
+a2fc4808-09ad-4291-a111-6752ff0e4f86	1	Other	Other
+a2fc7dc4-fe55-47f1-9edb-5812672e3612	1	Other	Other
+a2fcb600-076f-49a2-b8a8-e1ca488cc47a	1	Other	Other
+a2fd20be-7009-46a8-991e-1c7f237167d0	1	Other	Other
+a2fdba16-bc7a-467b-92fa-7a4fdb777e7e	1	Other	Other
+a2fdde07-b00e-4fd9-89de-27f41a250ecf	1	Other	Other
+a2fe01da-d7b2-4444-ae49-8b51373f2563	1	Other	Other
+a2fe13f7-1714-499e-9de1-823eb603cd54	1	Other	Other
+a2fe1b9b-b809-4fcf-9537-c8286242452f	1	Other	Other
+a2fe5b6d-e55f-4d94-9b8a-246fc9f31f15	1	Other	Other
+a2fe83b7-a172-4620-a51e-03c338032e4f	1	Other	Other
+a2fea49e-9416-4539-92cf-bda56401c59f	1	Other	Other
+a2ff6d68-4c26-4aaf-9362-b5fd8784d9f7	1	Other	Other
+a2ff8edc-4d28-44b5-ac62-3d2224620f6e	1	Other	Other
+a2fffd01-34dd-4c77-bb3d-cd9b19d98f4c	1	Other	Other
+a3000455-8514-4f97-9240-3d50c711618b	1	Other	Other
+a30053ae-ea5d-48c4-8bea-1f11b3ceaabf	1	Other	Other
+a3006d20-0f92-4689-9c36-2a55835379a0	1	Other	Other
+a300992e-68c5-4ef9-a4bc-5987bcdadd92	1	Other	Other
+a300d69e-9581-4929-89dd-be0ba496d392	1	Other	Other
+a3011629-f997-4abd-b174-fd21a4de67c0	1	Other	Other
+a30118d1-65d3-47ad-9619-939ae4fb5511	1	Other	Other
+a3017b78-7c24-4db0-953b-053fc0ada58a	1	Other	Other
+a3018452-cc0e-415a-bf8a-d3e13dc54109	1	Other	Other
+a3018537-1560-47f8-8c48-7c1d28a7e33d	1	Other	Other
+a30285d6-b287-441d-a983-7147c93ecac0	1	Other	Other
+a3028e73-8dc9-4dd4-8c81-5ee75bc829cc	1	Other	Other
+a302ad99-5115-446e-aa78-cb665caec0c9	1	Other	Other
+a302b746-cb40-4a92-aea2-f1a5a88229d8	1	Other	Other
+a3031187-899b-444e-b612-b17a2d064462	1	Other	Other
+a303172e-062f-4ac9-9760-3319351444bb	1	Other	Other
+a3033d4a-b8e3-4e19-9a03-61728dea4d70	1	Other	Other
+a3033f14-d1ac-4b91-a686-944e11ba1806	1	Other	Other
+a30398ae-bc57-4d44-b835-75a6b1734245	1	Other	Other
+a303a901-61b3-4253-8d24-22c4eea2b218	1	Other	Other
+a303b2fa-f638-419b-8c2a-05b63099f983	1	Other	Other
+a303fa77-7435-4925-a788-f4fd9cc3537b	1	\N	Other
+a304264a-fccc-47ab-b7a4-059f1f7e2074	1	Other	Other
+a304eefd-ded9-4137-959d-0edd3e9f68b6	1	Other	Other
+a304f3c6-69ca-4122-b487-54809db1933a	1	James	Other
+a3058010-a619-4ea6-b980-93fb645036b4	1	Other	Other
+a3058039-274e-4b99-b51e-ae6f6d3fe78b	1	Other	Other
+a305b172-5c7f-4bd2-8a90-92dd57faffd8	1	Other	Other
+a305b877-0d13-4b47-bdb7-b635b4f90a5f	1	Other	Other
+a305c8b1-85c0-4ec5-aee3-f69a9ca027b0	1	Other	Other
+a305d528-2c65-41c8-9c5e-c7d3e40fb21b	1	Other	Other
+a30622f0-07db-4461-98fc-6aa98d87e4de	1	Other	Other
+a3063a1b-9a75-4c8c-9eca-1917b4b84212	1	Other	Other
+a30661e5-337e-4bbe-abf9-178e15b9915e	1	Other	Other
+a3066a2b-f007-4ddd-bcc1-ce3ea2150124	1	Other	Other
+a3072f7c-8a94-4bb7-b4c5-124bf374124d	1	Other	Other
+a30747f4-74cb-4ea7-a7d2-341aa327b842	1	Other	Other
+a30754de-f2b8-496b-8b7b-7c0240c0fe44	1	Other	Other
+a30771ef-98cb-46ec-8d35-e440f776e8e5	1	Other	Other
+a3079b56-20ff-4c1e-b784-d50eefbdbd37	1	Other	Other
+a307a0a8-9eca-486e-bd2c-2bfbf3813664	1	Other	Other
+a307c7e6-4e1d-4686-9382-06f32f0d47cd	1	\N	Other
+a307d6c7-4663-4e0e-8034-4765b93c307a	1	Other	Other
+a307ec99-992e-43bf-aebe-db7390091a50	1	Other	Other
+a307efef-b886-4067-8108-40a2bb9603cc	1	Other	Other
+a307fde5-8925-4393-9d62-66ebd005fc4c	1	\N	Other
+a308163d-1e65-4ef1-9622-4e09924e0816	1	Other	Other
+a308166b-93e8-4ca8-b230-71237c1b504c	1	Other	Other
+a30855ba-fc9f-4240-b32e-354a3cd5deaf	1	Other	Other
+a308793e-55ca-4e3f-b883-6a30de0c33ef	1	\N	Other
+a3089ab2-bd4b-42d4-8543-39ac2256f91b	1	Other	Other
+a308abfd-540b-49cb-b487-0b6581c29f97	1	Other	Other
+a308bccf-690e-4dbc-9935-7be7f43bb773	1	\N	Other
+a3092b90-98dc-48f7-b28f-545dd675c4e4	1	Other	Other
+a309346a-ff80-441c-accf-4ba7a6b6468b	1	Other	Other
+a3099e4a-d6c8-46f6-bb07-64de6935be41	1	Other	Other
+a30a17a7-ecac-46d5-be26-2ac51868fc1f	1	Other	Other
+a30a273d-3db6-48a0-b93c-5ef6d76eb242	1	Other	Other
+a30a2d8e-b8c6-4bbd-a3c4-44413e46b1e7	1	James	Other
+a30a3067-15e9-4965-95c8-8dd97f7fb502	1	Other	Other
+a30a7124-fbd8-41c2-b357-4ef05781ee55	1	Other	Other
+a30a877c-de6e-4d8e-9a64-07085323882c	1	Other	Other
+a30a8e14-98c6-4bee-8640-e3bd248f023f	1	Other	Other
+a30aba34-1dee-49bd-8e67-268bcdd86bba	1	Other	Other
+a30acde5-80e3-4a4a-b693-d8616f73419e	1	Other	Other
+a30b5fbf-6ba6-4c4c-b544-16d2c30cc91b	1	Other	Other
+a30b6d1b-cf69-443d-be99-b0c9431b42ee	1	Other	Other
+a30bd6d3-d2bf-4823-9936-8da62a12e66b	1	Other	Other
+a30be0a8-128a-4a5d-8b38-de3222d618b1	1	Other	Other
+a30be26a-6b81-4093-aa48-b439e85e7824	1	Other	Other
+a30be9cc-3960-4e87-8d65-da5359b447f0	1	Other	Other
+a30c0727-5f52-43ae-8eef-f2c378831a30	1	Other	Other
+a30c1509-7d00-41b5-a01c-bf75da89c84f	1	Other	Other
+a30cb2f8-d357-48ae-af87-240361002411	1	Other	Other
+a30d2a66-772e-4f77-8d3f-956e56c82a5a	1	Other	Other
+a30d4588-a9fb-4bd9-84e4-268ef9b69e8a	1	Other	Other
+a30d8e11-4e4d-4f22-bc20-cd148c21d0be	1	James	Other
+a30d9d11-8271-42c6-9c2d-d9423906dded	1	Other	Other
+a30dc8a4-995f-4f4a-b6b8-aca80c7bba3a	1	Other	Other
+a30de17d-447a-4015-820b-2b5709846821	1	Other	Other
+a30e030b-b4cb-43e7-9949-286ee4ad68fd	1	Other	Other
+a30e06fb-1872-464f-832c-707bb40edd7c	1	Other	Other
+a30e145b-dbc0-43b5-81b5-464a8d753cfd	1	Other	Other
+a30e59a6-4bfb-4e4e-b378-ea83f6d0ba98	1	Other	Other
+a30e5be9-b8b6-4b16-bb9b-52d1616426ef	1	Other	Other
+a30e9411-7585-4c54-92e1-a9292047859f	1	Other	Other
+a30eda88-3990-408b-9aba-3974511c7373	1	\N	Other
+a30f2c1a-b9a6-42a3-bde4-ff884052722e	1	Other	Other
+a30f70b7-ce90-4cc4-a767-68db8a91a2e3	1	Other	Other
+a30f7e38-77c8-4bab-9bbb-30f8e274d12a	1	Other	Other
+a30f8491-41d4-4e7c-a460-81ac175cda0d	1	Other	Other
+a30fa6a4-dc7a-400f-a7fc-98d249036a42	1	Other	Other
+a30fa927-8aec-4dba-b1a1-c4d5cdc097a1	1	Other	Other
+a30fc381-6a09-4db2-b582-25cd404e3109	1	Other	Other
+a30fedae-49c6-4d65-9fe9-ace0fb9d16c0	1	Other	Other
+a3100960-39b3-4b33-8614-f9cb869b4c49	1	Other	Other
+a3105185-0a68-4d9e-8295-296b19b9d45c	1	Other	Other
+a3108a3a-d022-4479-813e-27ec4d7f3a69	1	Other	Other
+a310d67a-7ea7-4179-8455-b71278dd8d9c	1	Other	Other
+a310e4bb-0c50-4754-bac6-b0fc1fdbb3b2	1	Other	Other
+a31166ae-ed3a-4eee-ab07-30277a057229	1	Other	Other
+a311b42d-c7e3-4406-a5a5-c9f33a4f3c4e	1	Other	Other
+a311cde4-efe2-4f24-85f1-2efae295d685	1	Other	Other
+a311d6b3-3716-467a-829f-6cdc8c589763	1	Other	Other
+a3127161-d862-48fd-8174-d6e7d48e6451	1	Other	Other
+a31279ae-c849-40c5-b9a1-e78275b7647b	1	Other	Other
+a3127b53-82e5-4a1e-9d31-347382702788	1	James	Other
+a3127dfe-3938-42cd-bf56-e1da14184320	1	Other	Other
+a312827d-9612-4de8-8a05-b6981cade89c	1	Other	Other
+a3129b92-c66e-445a-a10b-6aae4253f6cc	1	Other	Other
+a312a1ef-7377-4877-ab5c-e44cc1327cf5	1	Other	Other
+a312b242-caeb-43ad-ab6e-2796661d6a48	1	Other	Other
+a312bd89-d917-4487-a986-5b3678c9eded	1	Other	Other
+a3130b81-5ca1-4b31-9422-071bd4fb8d37	1	Other	Other
+a313318c-2b5a-4119-957d-01ae53159a16	1	Other	Other
+a3136c7b-9abe-4b33-a3a0-635ecc383ef6	1	Other	Other
+a3146c5c-ab7a-4fa8-808a-1b801197209f	1	\N	Other
+a314b1fa-8b7b-45a6-91d9-d03204925129	1	Other	Other
+a314d69f-7246-414a-bf33-8aa38b3bd800	1	Other	Other
+a314f1f9-dcd2-4f9e-b9b8-7a2ca1609786	1	Other	Other
+a3153584-e259-49b1-a4b3-0346b51033dd	1	Other	Other
+a3154153-ff24-4a53-8a48-d2b3501b7b3c	1	Other	Other
+a31583a4-5b3b-420a-b87d-160e5517d2fc	1	Other	Other
+a315d721-78d6-4850-937f-c28a8b708c07	1	Other	Other
+a31604fb-2d0b-4b7c-bcec-a10d064caf7a	1	Other	Other
+a31614c6-ccb4-4142-bab5-a0e206f9ed5b	1	Other	Other
+a3163694-d02b-4088-a41d-88a21b018f08	1	Other	Other
+a3164d56-1162-40cc-82a6-b10dcca7c4c1	1	Other	Other
+a316e150-0e12-4a39-8921-c2680fa6456e	1	Other	Other
+a3177647-8b20-4f2c-8846-2b653126f15f	1	Other	Other
+a317a99e-19b7-42d0-a265-2b9fdabf56e2	1	Other	Other
+a317bf12-ec17-4975-89c3-41af65a9a7bb	1	Other	Other
+a317df0a-dfee-4972-a785-da340a0fc8ee	1	Other	Other
+a317f836-0a62-45fd-ac41-fc6c8a8756e5	1	Other	Other
+a31812dc-279b-4af1-a65e-34875ccd95bf	1	Other	Other
+a3184f55-18fe-4c0c-b67c-767deee68db3	1	Other	Other
+a318739c-ef44-42be-8fa8-6f860f52611e	1	Other	Other
+a318ca99-81c6-4020-8436-a49abff1f3d7	1	Other	Other
+a3191a21-e1e0-4a95-b5b9-088089a3e33e	1	Other	Other
+a3191ede-89a8-44fb-b700-f5773648a058	1	Other	Other
+a3193005-5728-4445-b2ac-f4dd410aa409	1	Other	Other
+a31964a0-32d6-4e70-aabb-220ecc8807ab	1	Other	Other
+a3198894-2453-498a-a646-31be94e9c214	1	Other	Other
+a319bead-cc1f-4649-9fd2-e0c76af21d81	1	Other	Other
+a31a71d0-01ef-4037-a0ae-171c33b3c234	1	Other	Other
+a31b10f9-2f75-48aa-854c-e9b295cd4b04	1	James	Other
+a31b52e1-74f3-43d6-b14c-6285c671ed69	1	Other	Other
+a31b948c-ebf7-4b44-9dad-9b9e86c729aa	1	Other	Other
+a31bc2aa-a61c-4a1b-bbb8-15d19b044276	1	Other	Other
+a31c11ff-df80-4ed2-b347-a2e4872730f5	1	Other	Other
+a31c1e8b-b7b2-42b2-a4a8-765346596e4e	1	Other	Other
+a31c7ee6-4bf0-4451-814d-ea95d15dfb03	1	James	Other
+a31c8d80-d6fd-42d1-879f-63dc97f6f518	1	Other	Other
+a31c8fa2-851c-4ecc-8088-104de68bea97	1	Other	Other
+a31ca919-3b86-4e74-b63e-6d3c475fb85c	1	Other	Other
+a31ccc8d-7cec-4b2d-9a23-e850c18eb41e	1	Other	Other
+a31d71a3-ebf6-463e-a63b-741a18f5e86d	1	Other	Other
+a31dd38e-905b-4522-b69e-5f8f4e78e434	1	Other	Other
+a31e0dbf-35f1-4595-99ac-1edaa4c5de92	1	Other	Other
+a31e1289-5ed2-45cb-a8be-1ce1f745b01a	1	Other	Other
+a31e521b-d9b7-4dab-8fa2-c8c971887472	1	\N	Other
+a31e5231-1fc7-4bb8-a586-d51d1278c800	1	Other	Other
+a31e8641-b0fb-4e2f-a39b-fa4481ab9e29	1	Other	Other
+a31ec594-7fbb-47b5-9596-6a8c0e24d079	1	Other	Other
+a31ec79d-8b36-49f1-9ece-116ab682a539	1	Other	Other
+a31f6966-1c43-40a7-835f-7e3370224083	1	Other	Other
+a31f816d-ae96-4323-9e90-982f2bcdd38b	1	Other	Other
+a31fb4cd-10f7-4607-a9d6-f37fbfa67f84	1	Other	Other
+a31fc725-02ba-4764-9a7f-ea9245742cd8	1	Other	Other
+a31fd46a-e6a8-4ed5-a258-cf95b03fd43d	1	Other	Other
+a320428d-dd68-40c4-b99c-11dcc89b3c79	1	Other	Other
+a320bb50-4a9c-43a5-bc51-58beac080c97	1	Other	Other
+a3211608-62a7-4e65-a9ee-14558dd11bf6	1	Other	Other
+a321b786-a340-49f7-a20b-de4b4229ff6c	1	Other	Other
+a321db21-10a8-4e55-a43e-3288b7e78d78	1	Other	Other
+a321ee07-40b6-4285-bb84-c385f21ec0c4	1	Other	Other
+a3222e31-7952-4009-8304-2fabf6c1c175	1	Other	Other
+a322569c-a448-4420-8a33-779b0c3033b4	1	Other	Other
+a322b238-b19c-4e5c-93a7-445c4128a25c	1	Other	Other
+a322b6a5-bb31-4e03-affd-f51629c8ca9f	1	\N	Other
+a322d9ca-9ed1-4944-a41c-b2a90c04ff98	1	Other	Other
+a323086a-441a-488f-8165-46ecff420b16	1	Other	Other
+a3230a25-0588-439a-ab2b-f3776693a622	1	Other	Other
+a323209d-70f2-44ea-a971-2e700baf7409	1	Other	Other
+a323464c-be3a-4012-8684-a9b45ce23046	1	Other	Other
+a323472b-d655-4798-806b-28fd624cc964	1	Other	Other
+a3236575-8c4f-4564-91c3-184cd554a9c0	1	Other	Other
+a323baaa-bb9e-4cbc-9ef2-05b16b83e739	1	Other	Other
+a323d87f-f373-44a6-a41f-f27737c0b054	1	Other	Other
+a3241916-c321-48ae-8864-e5aabdd60ebb	1	Other	Other
+a324c803-ba0e-44d9-a634-400f62ef7fbf	1	Other	Other
+a324d314-db43-4f1a-a450-bdcae7a27c19	1	Other	Other
+a324ff0f-892b-4385-9f74-10d849b4f89c	1	Other	Other
+a325619f-2f06-4e1e-bde2-dff37b492172	1	Other	Other
+a325a3a7-4cbf-4384-8367-1f275eaa4b91	1	Other	Other
+a325ed29-9b03-49e0-aa7c-0d9e5c7d692a	1	Other	Other
+a325fa2c-a243-477b-abbf-e85147234038	1	Other	Other
+a32615ee-e9e1-4dac-929b-8fd2ae7aa537	1	Other	Other
+a32626f2-41db-4d6d-962a-9a9035bd3828	1	\N	Other
+a3264f91-bb4b-4e2a-babe-3759a20e03e1	1	Other	Other
+a32688fa-0ceb-4aec-9ed8-ad4cf0c637b6	1	Other	Other
+a326d8f4-5817-418c-a857-7a41b213d901	1	Other	Other
+a326f261-05f1-46de-8664-b2a9d1b643ed	1	Other	Other
+a32729c2-a183-4998-95db-8456001a3a1b	1	Other	Other
+a32742a7-a975-4d97-9694-fd8f493ffa83	1	Other	Other
+a3276cd5-c92b-4b7a-ad2d-9a1f3e737c69	1	Other	Other
+a327ae10-8629-4b28-b956-f7027f7c1eb0	1	Other	Other
+a327b6aa-cf51-49e2-b11e-4d3d6ad14bf7	1	Other	Other
+a327c886-4a83-40d3-b5cd-783556436959	1	Other	Other
+a327f76d-a8b1-4825-9132-e8cd106a4c0b	1	Other	Other
+a327fa7b-7617-43b5-82e0-034e288a4336	1	Other	Other
+a328011b-6a96-436e-86f7-560f06491c64	1	Other	Other
+a3281004-6011-4d94-bd5a-e3b3d88f93e5	1	Other	Other
+a3282ffb-7683-4dd6-9d6b-6289e7537e8c	1	Other	Other
+a32877df-3517-4297-b0c9-f045e62f1d5b	1	Other	Other
+a3289bec-3de3-4fc2-b312-10a31617db82	1	Other	Other
+a328a725-009d-4bd9-90fe-9f6b9cfe8b5a	1	Other	Other
+a329210b-9cd7-4ab2-ad42-3adf85f10aad	1	Other	Other
+a3297921-ff21-4cad-ac1e-e3d05602a3eb	1	Other	Other
+a3299e39-0df5-4966-a30f-0bcd72dec852	1	Other	Other
+a329bac8-c646-4ca7-977d-35096b456767	1	Other	Other
+a329eae0-45d1-4261-ae0d-15b865f1a039	1	Other	Other
+a32a36ef-75d9-409c-83bb-21a75f117ba8	1	Other	Other
+a32a6ef9-aa13-4767-864b-ee0553f4e43f	1	Other	Other
+a32a7fd4-5b42-4e02-a7a7-71758d78a8b2	1	Other	Other
+a32a9086-721e-4bff-b839-00f2a2acf8fc	1	Other	Other
+a32a9c21-a0d0-45ed-a607-826f29392955	1	Other	Other
+a32a9fa9-7857-4406-bf38-1242eede4c2e	1	Other	Other
+a32aadb6-3e6a-4d4f-867a-10de8f742c19	1	Other	Other
+a32abd76-65f5-44fa-a339-2873781b7a90	1	Other	Other
+a32ad7ec-57de-4991-b9bc-35373871b81f	1	Other	Other
+a32addd5-f4de-4c11-bfc0-1216de8165f4	1	Other	Other
+a32b005c-475b-44b4-aa21-9fef24286a17	1	Other	Other
+a32b06f1-858b-4464-b2fa-35dfcc78bc59	1	Other	Other
+a32b133d-feaa-45c9-a81f-58db7b6f1a89	1	Other	Other
+a32b3432-940e-444d-83e3-62a8f343e63b	1	Other	Other
+a32b82c6-644b-4a16-9842-1878c76832db	1	Other	Other
+a32bb37a-f0e3-4bbf-acbf-a366d50201d0	1	Other	Other
+a32bb9ad-c9f3-4551-a80a-a9a6f22f03ff	1	Other	Other
+a32bbdae-ba84-4edd-b6ad-e2107b16bd72	1	Other	Other
+a32c78a2-08e0-4b07-b69a-a949eb1cbf15	1	Other	Other
+a32c990e-03af-4405-b0f1-16e7a1b91450	1	Other	Other
+a32c9d50-527b-4ed4-b6df-68284506e964	1	Other	Other
+a32d02b0-115c-4f43-9676-28facea873e2	1	Other	Other
+a32d48bf-fca8-46ea-b8e4-e963de27fcad	1	Other	Other
+a32d7d63-924c-4ae6-b275-4f31f921e912	1	Other	Other
+a32de7d0-019d-49bd-b878-840a79117cbf	1	Other	Other
+a32e6f4c-fe17-4d1f-b8a2-3b8d8c5776ae	1	Other	Other
+a32e971e-ff6c-4644-844d-c44231ebc803	1	Other	Other
+a32ea13b-9945-4c7c-9471-01ec3a358d8b	1	Other	Other
+a32ee19a-b81d-41c3-b118-76c183c817f2	1	Other	Other
+a32f0667-9d1f-4365-ad53-f9497406ff0f	1	Other	Other
+a32f663a-fec7-4258-903d-905824ce0811	1	Other	Other
+a32f8ee9-9fdf-444f-9e07-e69c5d7e5689	1	James	Other
+a32fed9d-9955-4305-b27c-229b53b08bfe	1	Other	Other
+a32ff0bf-a30a-4022-bb9e-9c3faf4a49a6	1	Other	Other
+a3300888-50a0-44ff-936a-582c9b6c6d63	1	Other	Other
+a33021a9-128d-4316-be96-69f88eb14241	1	Other	Other
+a330345a-ee5f-49fe-b539-03bb29f88951	1	Other	Other
+a330421f-dac3-439e-8277-3c1c54c3c0a0	1	Other	Other
+a3307f6d-cc38-491a-806e-41eb27ba0f36	1	Other	Other
+a330a3a0-1efd-4a00-8d6d-1c475331131e	1	Other	Other
+a330c9a7-6d42-46a0-a89e-cdde62ec553d	1	Other	Other
+a330d4f4-8953-43cd-a49d-134646d40132	1	Other	Other
+a3313d1c-2ac4-4d57-b47e-01102b36bcea	1	Other	Other
+a3314a41-ff5e-4da9-a81e-be0fb72b084e	1	Other	Other
+a33161c5-be44-4653-a8bf-021a7ddbf7d0	1	Other	Other
+a3319166-5d9b-46ca-8640-13b2876fb4cc	1	Other	Other
+a3320478-8b7f-41e6-a4d1-84da3a6f7767	1	Other	Other
+a3325b93-77d1-4606-9e12-5421d5bff0e1	1	Other	Other
+a3327633-a76c-42f3-8fb7-55738b982fab	1	Other	Other
+a332842c-7e66-4343-ba63-57443e5ed0be	1	\N	Other
+a3330258-ff59-4c5b-948a-0dc2f8b617cb	1	Other	Other
+a33314f7-d2c8-40ef-8369-fff8eb1f02c5	1	Other	Other
+a33386af-4905-4261-b209-54621861a8e6	1	Other	Other
+a3339a2d-2b85-4f2d-850e-b5a435857365	1	Other	Other
+a333f326-d70c-45e1-b71c-3f7b60b94846	1	Other	Other
+a33413e6-34f1-4963-9c30-88e691b6ac9e	1	Other	Other
+a3347ab4-74a8-469b-b784-befdc2d70c1f	1	Other	Other
+a334f5ba-5e66-4824-8ed7-d7611ffad68a	1	Other	Other
+a33512be-8132-48cc-9eef-e870807b54b6	1	Other	Other
+a33515d4-01fd-47d1-9394-f0a8ec1271f1	1	\N	Other
+a335737c-f59b-4d22-862a-88f4f4580836	1	Other	Other
+a335a7c8-c7f4-4c3c-84b1-73edfd2fcbc0	1	Other	Other
+a335b461-6b69-4861-b5c5-00743ceb3883	1	Other	Other
+a3360493-82e2-462a-a0b8-8e307625f4e9	1	Other	Other
+a336237a-abf2-42db-b0b8-cb37b22ddc50	1	Other	Other
+a336514f-2d76-4fb2-b660-e0e5423dbd87	1	Other	Other
+a336c3d7-4262-436c-8f01-2f311df3108e	1	Other	Other
+a336cb2a-9329-4281-8684-65120fd6cfb9	1	Other	Other
+a336cf90-d678-4bd7-98f0-058a4a82ef43	1	Other	Other
+a336e29b-a5a6-4b87-a3bf-3db4ef5136a9	1	Other	Other
+a336ff7a-78b5-4ea0-8583-c1c1dfd65ced	1	Other	Other
+a337274c-cac3-4c56-a190-3571ecb80768	1	Other	Other
+a3373cae-9210-4ef9-921d-775071132687	1	Other	Other
+a3374b0a-1c5b-42b6-95b8-992fa701aa5a	1	Other	Other
+a337653a-4cf4-4c2d-a547-8012ffeb320e	1	Other	Other
+a337974b-8896-4dc5-b9cf-1f3320a4872e	1	Other	Other
+a337a410-3583-42a6-8e8a-fb225e4190eb	1	Other	Other
+a337c5a6-1815-468d-bceb-d6763fcdcf1d	1	Other	Other
+a337df4a-0e27-4303-8653-8d26ef906c13	1	Other	Other
+a33804a3-31c0-4260-b08b-18f335c258b7	1	Other	Other
+a3380cb9-3f8e-4348-b51f-b51919240f01	1	Other	Other
+a3387a87-f46f-4a44-8635-2e096d6b5b0f	1	Other	Other
+a338ac9a-3106-464b-b5da-238d8308cd4f	1	Other	Other
+a338b010-32ff-4ede-8290-302d5b182292	1	Other	Other
+a338d568-97c6-431c-aed0-c9ed6d5f4fbe	1	Other	Other
+a3390e1e-ab62-406e-9480-555cfa307141	1	Other	Other
+a3392cbb-a54d-4531-a1f4-db44f56e7650	1	Other	Other
+a3395370-ad94-4bc9-8c5f-907b19856ae6	1	Other	Other
+a339731d-79f8-4ffa-94b4-2459681d4bf0	1	Other	Other
+a339743e-7e04-4c8b-b276-ea2c6badeb0f	1	Other	Other
+a33977df-5944-4745-baac-1d30c0f9fbd9	1	Other	Other
+a33a3506-f768-44f0-8d5e-99ecd6a47530	1	Other	Other
+a33a64af-bd12-4782-a738-63887ee7a12a	1	Other	Other
+a33ab2e3-8ab5-4a8b-9948-145d3cea6937	1	Other	Other
+a33ae8bf-4bc1-4a0b-be14-98acb82fedb0	1	Other	Other
+a33b0a59-6f48-4cbe-8a54-2123a389c0a6	1	Other	Other
+a33b5472-0647-4cf8-8196-ae333580caeb	1	Other	Other
+a33b5ec9-40f5-479b-aed7-8ab3feb7fca1	1	Other	Other
+a33b8e45-e2ff-4a90-b97d-1218b7b26bf5	1	Other	Other
+a33bb9a0-fd95-4c14-8620-59e96ff7326d	1	Other	Other
+a33c031a-b5cb-470a-976f-3d6df21b7dfc	1	Other	Other
+a33c1e74-fb9e-4cf2-8c24-e9b61a3c5da1	1	Other	Other
+a33c6588-1edf-4bcc-96da-be6a94dbd0d3	1	James	Other
+a33c66f9-c657-4d1d-a9e2-d0dd8eba21bc	1	Other	Other
+a33c935f-9aad-4b88-ab25-8c1ff02fa82f	1	Other	Other
+a33cb9bc-b074-4f8b-ae71-75f3d85995ea	1	Other	Other
+a33d18b7-6ebf-4d07-b085-ec6c407926e8	1	Other	Other
+a33d1fb2-2004-427f-9b09-14135a10a11d	1	Other	Other
+a33d8eb9-7fc8-4b97-b166-9cd0e0b76346	1	Other	Other
+a33db7c6-3310-4b04-b689-b288616aa70c	1	Other	Other
+a33dbb60-89f5-48ad-9f24-1ef26d10145b	1	Other	Other
+a33dd6b4-9743-48b8-838f-501965885a22	1	Other	Other
+a33eb013-cc19-42b2-839a-9cf7137555eb	1	Other	Other
+a33ec1ca-e530-48c3-89b1-6157e4fc8af5	1	\N	Other
+a33f1e3a-a63c-485b-93ef-3a893f24b84b	1	Other	Other
+a33f2dfb-e0f4-408b-b6f4-a9aa42d72e76	1	Other	Other
+a33f3e52-cb23-4758-b2a0-1733dec98c81	1	Other	Other
+a33f4beb-4ba8-46c9-938b-74f1d4db363b	1	Other	Other
+a33f8c8d-6077-415f-8d67-38175e2c7522	1	Other	Other
+a33f9959-1397-4bc3-a5f7-b547869ab17c	1	Other	Other
+a33fb5dd-eacd-4cb7-8c0b-9cada6dad973	1	Other	Other
+a33fc77b-2416-4ca3-8ef9-b260665ffb9f	1	Other	Other
+a33fd0c3-68b9-44ad-a7da-d63428e23c7b	1	Other	Other
+a33fe7b0-4933-11e8-88ed-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+a33ff0bd-b2cd-4186-a62e-ce78475161a0	1	Other	Other
+a3400bed-92eb-466b-b71f-c101d8aedb38	1	Other	Other
+a34017fe-5bfc-409d-85cc-34d7c283034e	1	Other	Other
+a3401a64-868f-4ee9-9516-8e616c5f4506	1	Other	Other
+a34069ec-96fc-44fd-a9d9-4d5382962fd8	1	Other	Other
+a34077a2-72d3-4636-8fce-60e569a7240c	1	Other	Other
+a34081a1-1e97-45be-8636-accf5d57683f	1	Other	Other
+a340ae70-9ea0-44de-8c55-6a5c17703fc8	1	Other	Other
+a340b321-a781-493c-8da3-8a9b03b1fe01	1	Other	Other
+a340c748-59ba-4b3b-adfc-85e3a083d06d	1	Other	Other
+a340f559-a89a-4af2-8638-276228eddffd	1	Other	Other
+a3412261-c68f-413b-9ef3-59f6d00cb6cb	1	Other	Other
+a34146a1-cef0-4e15-a845-f4fd0d6719c2	1	Other	Other
+a341569c-91ed-49f0-b19b-e7cec9421799	1	Other	Other
+a3416345-1a73-4601-8d64-7ab33077d141	1	Other	Other
+a3416d3e-df3e-4e0e-a372-a3137e92f19c	1	Other	Other
+a3420978-2ed0-43f0-8df4-ecdd0c5542a1	1	Other	Other
+a34259fd-d913-490e-85ef-4de83f82394b	1	Other	Other
+a342831f-f944-4365-bda3-dd4fd3c92769	1	Other	Other
+a34286e3-2d54-4e21-bb68-8d24e082677f	1	Other	Other
+a342b89d-29a0-439e-8812-73bb2227fbd8	1	Other	Other
+a342e1f3-1ab6-4e09-b923-98958f1c4f80	1	\N	Other
+a3430550-f465-4483-b437-cbf51b1aa9a2	1	Other	Other
+a3431e10-09e7-46c8-84f8-b2d5759f1ce9	1	Other	Other
+a343a4a6-1fb9-4b70-9695-4f69735ec8fd	1	Other	Other
+a343a778-0f71-4425-8351-6250551273c5	1	Other	Other
+a343e4fd-432f-435e-96bc-7e94806949d0	1	Other	Other
+a343e611-e66e-45d8-bdec-cf943bdb9a42	1	Other	Other
+a344036d-bbe2-4c75-99a1-1df0757617b7	1	Other	Other
+a3441353-5a91-4dbb-8778-9564ccc1ef78	1	Other	Other
+a3449800-b8cb-4f3e-84f1-a989283c44d1	1	Other	Other
+a344a133-4318-4175-adf6-413fd231bf85	1	\N	Other
+a344ce22-a040-4acf-8b0b-d484af4cac47	1	Other	Other
+a3452297-816c-4fc0-8a9e-5b88fd4b7268	1	Other	Other
+a3457750-c635-4acc-9803-07e5061e1cdc	1	Other	Other
+a34589d9-0ad9-4957-ba53-1b7937839b37	1	Other	Other
+a345aa20-7e3d-41a3-b092-83a2d490c44c	1	Other	Other
+a345f430-d1bc-43ad-8718-6f1e0551f6ae	1	Other	Other
+a346003e-3737-417c-a456-1c018b1fd49d	1	Other	Other
+a346981f-38aa-40bd-be5e-6488d73b1a0f	1	Other	Other
+a346a97d-969f-42eb-a3a5-800565e1658c	1	Other	Other
+a346ab45-700a-4404-9dd3-07c581f9c441	1	Other	Other
+a346cdc3-ae6c-4ac2-9426-d5c7e16ad27d	1	Other	Other
+a346cdf8-3f1d-4798-ba5c-b6cd2476a5b4	1	Other	Other
+a3471a0a-fff8-4177-a83e-b326130dd703	1	James	Other
+a3472701-a1c1-468a-9347-b5f71ae235d6	1	Other	Other
+a3473968-2f06-4574-85ca-ba31d69e3a65	1	Other	Other
+a3477814-50de-4722-8696-8fd67ad84e48	1	Other	Other
+a347d5df-a22a-444d-8fab-6103ce830edf	1	Other	Other
+a347e4e6-3e1d-487e-b836-2dc95b01b26f	1	Other	Other
+a348493c-a946-4118-8a35-b364cb9676ac	1	Other	Other
+a34861fd-cb31-4012-80f5-db1678556c76	1	Other	Other
+a348943c-f5cc-406b-8f6e-75b804ab52a4	1	Other	Other
+a348baf0-373c-41cf-8c4b-818b09ab4a07	1	Other	Other
+a348ec0e-8c58-48b7-8a44-6e38b7784167	1	Other	Other
+a348f253-4157-40b2-bcea-267ebc99318f	1	Other	Other
+a349079e-b240-4fa3-ad44-47f3f42f10dd	1	Other	Other
+a349302a-8af3-4abe-b21a-98bf59e5b6bd	1	Other	Other
+a349394b-1874-4572-a6a4-e73a636b0731	1	Other	Other
+a3493f28-5e0e-4dab-9dd3-ba519250b8ea	1	Other	Other
+a34947f6-aebe-4c7a-bda2-07c9b6a23673	1	Other	Other
+a3497c19-a097-4c82-8988-f534a6ccfe86	1	Other	Other
+a3498077-77d2-4ae1-b3a0-2e40b16179bd	1	Other	Other
+a3498684-aef6-4df4-bc9f-dbfa21b19205	1	Other	Other
+a3499f21-9e6b-43f6-bc32-a3f76829880d	1	Other	Other
+a349d022-fa71-404d-b756-646262338ed6	1	Other	Other
+a349d44f-a38b-4d51-9f99-8757ce662296	1	Other	Other
+a349f1dc-de12-4b96-95a8-16c28ae71841	1	Other	Other
+a34a7c50-4b05-4b85-bc3d-9308027a631a	1	Other	Other
+a34ace2d-d2c3-4a4a-8ff3-c3eacb32fc93	1	Other	Other
+a34ad75a-c59d-419e-858a-bccdf550991f	1	Other	Other
+a34b2c3e-c6d2-4709-956c-4cceb01806b0	1	Other	Other
+a34b8278-9e14-4bdb-928d-b11a44828da3	1	Other	Other
+a34bae99-9d43-483e-bed4-a6618c2ed1f4	1	Other	Other
+a34be271-a0ad-49f7-a1f6-8d3bf3e3ccde	1	Other	Other
+a34c0a54-a301-4cc6-87f5-3b01f90d1067	1	Other	Other
+a34c12e4-15b8-4fc1-a65f-233977573f58	1	Other	Other
+a34c1b4d-747f-425b-9364-8a842a671db5	1	Other	Other
+a34c74f8-2f28-4d27-9cdb-f52b44c36ab1	1	Other	Other
+a34c8383-3657-417b-a671-2f1ed17f2ef0	1	Other	Other
+a34c8526-2739-4ac6-b3b3-41a620740102	1	Other	Other
+a34cc3de-cd47-4bdc-ad9b-d19aa50c00b9	1	Other	Other
+a34d0d59-fa62-4e44-ba79-f6fca2d99a51	1	Other	Other
+a34d162c-d946-4ac2-ac2b-10cb822911d6	1	Other	Other
+a34d2fc0-af61-4102-a63f-c35e58032832	1	Other	Other
+a34d460f-a330-430a-887b-5ff1ae47f6a3	1	Other	Other
+a34d911d-3121-4323-a7df-4db728290e25	1	Other	Other
+a34db38e-0b0c-4152-bd39-9eb1f35ded13	1	Other	Other
+a34dbeb9-1d32-49c0-884e-dd425c4f24a1	1	Other	Other
+a34e3dd3-f0d7-4c68-aaf9-2388ebdf7477	1	Other	Other
+a34e6a8c-3a56-4a30-8737-50e8b762034b	1	Other	Other
+a34e6e00-e0e9-45a8-96c6-943d1593f515	1	Other	Other
+a34ea38c-3d77-4a65-8507-6d38bfead0cf	1	\N	Other
+a34eab96-5faa-49e8-8c9c-f7f0ff387d35	1	Other	Other
+a34eb2e8-1c09-4400-9c30-3a7b06a2a185	1	Other	Other
+a34f30a7-1847-4cee-ba70-ec00776612f3	1	Other	Other
+a34f63c0-19c7-4c46-abe7-f57445be6a15	1	Other	Other
+a34f6f0f-646a-4431-8b82-2c75a9c999df	1	Other	Other
+a34fa4bf-f1f3-4d0d-b4d7-4acaede312c1	1	Other	Other
+a34faf94-a329-4c70-9907-392142f9b55b	1	Other	Other
+a34fb7f3-4961-44e5-bda1-6b09d5e42039	1	Other	Other
+a34fe521-b871-4883-bb40-9ad3689a14dc	1	Other	Other
+a350101a-882e-43a1-bdf1-22eac96505e2	1	Other	Other
+a35025ff-c0de-483c-b551-28a720831fed	1	Other	Other
+a350390d-7daf-44a7-9e05-c558c028cef2	1	Other	Other
+a35085af-ea7a-4fe3-b0aa-5fe31ed6a843	1	Other	Other
+a350b32d-72af-43e7-a5ae-5e24094b5e02	1	Other	Other
+a350ba9a-e88c-4615-a854-7cfdd0f82e4d	1	Other	Other
+a350dce7-ec17-4d78-99a5-b06fed62489b	1	Other	Other
+a3511ebf-4685-4dcb-9578-894fb731433c	1	\N	Other
+a35128c5-efb8-4898-b169-00787fad8634	1	Other	Other
+a3512e1a-9807-49ea-86dd-d830f62ae8e2	1	Other	Other
+a3514094-805e-4f5b-a683-100062b57e20	1	Other	Other
+a3518ed5-fc50-4b19-8e61-ee515528b6ea	1	Other	Other
+a35194d2-54bd-41d1-b8e1-c1b337a07d40	1	Other	Other
+a351b8fa-0185-4339-80f7-f238884e313a	1	Other	Other
+a351cb5c-2e48-4247-8d8a-c6a16091f8f3	1	Other	Other
+a351f34f-8bc3-4dff-8a49-56d8fac59111	1	Other	Other
+a3526875-5004-4ff4-9b2a-c6ee281a01be	1	Other	Other
+a3527bf6-243e-4032-b72e-a73000f3f5c4	1	Other	Other
+a352d4fe-1466-4273-a870-48975119fc2d	1	Other	Other
+a3535f9c-6638-4c4c-b04f-72405a1dca2c	1	Other	Other
+a3537a71-4ecc-4a6c-bc0e-5ac36f2a4aa9	1	Other	Other
+a35384ec-b6f0-48de-942d-f39bd450317c	1	Other	Other
+a353a36a-41d3-4b34-aa36-190d45977d09	1	Other	Other
+a3540730-7179-4d63-822e-37f1335f08ee	1	Other	Other
+a3542653-23b7-4c5b-95d5-665012f59e43	1	Other	Other
+a3542ed0-943a-4cae-944d-0f6ba4972549	1	Other	Other
+a3543c2c-6907-4218-84f0-1c01dbb2000d	1	\N	Other
+a354417a-e06c-4bef-8e80-2de663556c88	1	\N	Other
+a35449a9-2901-4707-83b6-fbce48a1e01f	1	Other	Other
+a354851a-deb4-4b74-bb94-d04e49555e2f	1	Other	Other
+a3548c9a-d081-4c48-af4a-fee44d662b62	1	Other	Other
+a354ca46-e03f-4341-ae3c-fd71e7fdfebd	1	Other	Other
+a354dc4b-7205-4c5e-b86b-e579513dc8a3	1	Other	Other
+a354e9b6-8c9e-4819-9547-3dc4832870c4	1	Other	Other
+a3555cf0-2977-40a8-a1da-73b3712d5614	1	Other	Other
+a35561c6-fc62-42fe-b52b-c29916b08afb	1	Other	Other
+a355ee3c-ba73-4010-8f78-93673933944d	1	Other	Other
+a356c51b-8f29-40d2-ad95-422fd9ac71a8	1	Other	Other
+a356d892-b69f-4340-928e-b475e750fcbb	1	Other	Other
+a356e1e6-7dae-4d85-ba97-68175b5cc176	1	Other	Other
+a356ee10-8a27-4145-8761-a4c67586c492	1	Other	Other
+a357324a-477a-46f6-ab51-43af5a4a5ef4	1	\N	Other
+a35740e4-3445-4228-893a-c751883d0953	1	Other	Other
+a3577718-1295-48fa-b144-fb8ef8d32882	1	Other	Other
+a3578396-73e9-4f3b-aa69-876a3d2645c5	1	Other	Other
+a357ea8a-5560-4085-b8df-da47e6360378	1	Other	Other
+a357ed5b-3c5e-4097-b443-16fe4c33aa8d	1	Other	Other
+a3586538-061e-45a7-99e4-ec3267e86111	1	Other	Other
+a3588835-a489-4036-9428-5837226a5eb6	1	Other	Other
+a358905e-e661-4174-a911-268af892693d	1	\N	Other
+a358b99a-f6ef-4f11-b7be-87edd193002a	1	Other	Other
+a35904ea-bcf2-4534-b8b8-37eab960d669	1	Other	Other
+a359124c-039a-419a-a277-844970fe1af0	1	\N	Other
+a3592178-5625-4fb4-9971-abb824ec6571	1	Other	Other
+a359225b-ebb0-4224-bfdf-7360f3dd9644	1	Other	Other
+a35947e8-84b9-458a-aba4-3db445b269e4	1	Other	Other
+a35948c1-6c97-4205-b597-7ae5dd5a894f	1	Other	Other
+a359499d-3e04-4ed3-8eab-afcb075b7493	1	Other	Other
+a3594ab0-2017-4a0b-a125-bd80ea22d53f	1	Other	Other
+a3595cce-4244-4db7-bf7c-ac04c0e7e403	1	Other	Other
+a3596f28-8b0d-419e-8514-fe90c0f48b41	1	Other	Other
+a3597647-0984-4095-96d6-0600e4455da4	1	Other	Other
+a359a46a-aba1-4299-87fa-030cd70df4ed	1	Other	Other
+a359b410-14f7-414b-a014-4f11bfd57259	1	Other	Other
+a359e2ad-3c56-4f3d-a159-e71feb925e7d	1	Other	Other
+a359e9b9-5285-4d7d-b3e5-8a5c6f5f0660	1	Other	Other
+a35a095d-8de3-4f07-955f-941c4be9cc21	1	Other	Other
+a35a14cb-908f-4e22-a23f-873b09e31419	1	Other	Other
+a35a247c-2994-4fbf-a2b5-df18d1170d59	1	Other	Other
+a35a3977-32f3-46f8-b9a2-dbca6265a26e	1	James	Other
+a35a6881-d811-4503-b1db-dc0b98f8430d	1	Other	Other
+a35a8a80-97bb-42a8-99ae-da7abc08bf85	1	Other	Other
+a35afbfe-9123-49a8-89d1-1074e6cce241	1	Other	Other
+a35b32c5-8622-473c-83e3-515835ad379a	1	\N	Other
+a35b40b6-342d-4a1e-92d8-51b38ade825b	1	Other	Other
+a35b4475-a401-40be-9575-e8efd2a1d9dc	1	Other	Other
+a35b6756-908d-4d9e-b485-7644bb605d10	1	Other	Other
+a35b8ba9-2f46-4827-9552-dace049a274e	1	Other	Other
+a35b8fb5-5cd6-44fc-b1d4-f733acd6ff5f	1	Other	Other
+a35ba6bb-a958-466b-8982-9af8ea7882a4	1	Other	Other
+a35bad52-db92-4ee9-8e04-1fc476a7d088	1	Other	Other
+a35bbcd4-6be5-4811-bcf7-741b380cdbf0	1	Other	Other
+a35bce32-2087-4ca9-9a9f-0fe34ba57f95	1	Other	Other
+a35bf061-7c94-422e-b436-2f4360c5aea4	1	\N	Other
+a35c484d-a87d-47dd-8ef7-88a9a5ad02cb	1	Other	Other
+a35c4a9e-4108-4051-9484-20681c097376	1	Other	Other
+a35c5424-c2ea-49a1-99d9-80ebc20fb509	1	\N	Other
+a35c5573-ac01-43e1-b823-87715486ef52	1	Other	Other
+a35c5606-6681-44f7-931e-4d54d9fc9df6	1	Other	Other
+a35c70c0-6674-40cd-a315-4ff19ad80ab2	1	Other	Other
+a35cbdc7-84ca-43d5-85ae-162497101a14	1	Other	Other
+a35ccd26-f572-4c4d-90a9-2c09fe58769e	1	Other	Other
+a35cd17a-363b-451d-86b4-59b840d70452	1	Other	Other
+a35cecbd-26b0-4fe5-bf88-c514e87dba7c	1	Other	Other
+a35d03b0-228c-4077-b1e5-7c8d625af3bf	1	Other	Other
+a35d206c-3ec0-45c3-b167-5f5f538d2be4	1	Other	Other
+a35d5bdd-0a7c-4fcd-aaf6-accc584cf977	1	Other	Other
+a35d638d-49ba-4d31-b14c-97e8e747997f	1	Other	Other
+a35d78ba-0bf2-425e-b6a2-5e9469f95186	1	Other	Other
+a35dda24-e26d-4228-a9c8-d1f18ffd3d76	1	Other	Other
+a35e0418-f6de-4bd9-b59a-adf64c948a72	1	Other	Other
+a35e96b5-6a35-43ff-97e1-d8e70932f5c8	1	Other	Other
+a35ea211-d08b-4228-9bb2-4ae5c026ab94	1	Other	Other
+a35eb764-3eb4-4c93-9ed7-ed6fff89cc71	1	Other	Other
+a35ef726-adbf-4609-b805-3b1c9f653a34	1	Other	Other
+a35efa5d-4c56-46f8-a317-1790d29bb923	1	Other	Other
+a35fe7f4-c0b5-4175-9cae-d689c1a777c2	1	Other	Other
+a3603083-1568-4103-af2c-343933d65f30	1	Other	Other
+a3605c58-cd04-4b45-bac3-effaa033890f	1	Other	Other
+a3608124-ec8f-4e85-96c9-4f46fac643b2	1	Other	Other
+a360a80f-8012-4786-b409-1392e9946630	1	Other	Other
+a360b57d-c6ad-444c-a2fc-83b007e158a4	1	Other	Other
+a360b8df-1810-4ddd-9e69-335a5fe3172d	1	Other	Other
+a360bb80-40e2-4b83-be0a-30898000fb5a	1	Other	Other
+a360d9cf-a679-4f6c-86b1-e0a7651c5b1d	1	Other	Other
+a3613120-db85-4bda-8ad3-b14b1f5d84d7	1	Other	Other
+a36189db-37d0-4315-bbc3-c8b83bd25ecf	1	Other	Other
+a361963d-4d84-4e30-9b3a-2928860c450b	1	Other	Other
+a3619d0a-381f-4485-a8e6-59659caf3a2c	1	Other	Other
+a361cce2-41ee-4397-a148-4d3801f8a334	1	Other	Other
+a362043d-8eb1-4e10-9c20-6220bf7a3e09	1	Other	Other
+a3627bba-8b7b-467b-be88-8d573f1d3474	1	Other	Other
+a362c97e-d8ec-4b1e-a3c1-e918ad87f8e1	1	Other	Other
+a363a860-f333-4fe4-a7c1-df2e7d021285	1	Other	Other
+a363bd00-6456-4a21-bfb2-4c36f779b6bd	1	Other	Other
+a36410c9-ab24-407e-aa69-4cc454b7cdbf	1	Other	Other
+a364602a-b9b3-41ab-82cb-fa086e3f582c	1	Other	Other
+a364744e-2155-40d3-b51e-5a4aa3967acd	1	Other	Other
+a364799d-ceda-46d7-901e-e5d6bdbb155c	1	Other	Other
+a36492ec-4772-43a1-b0ad-aa332a8b44f3	1	Other	Other
+a364bcf5-4b04-454b-80c6-b41336da6a3d	1	Other	Other
+a364fa2c-478c-4cdc-b26b-bf77e188f324	1	Other	Other
+a3655629-9c01-4510-b3bf-90290e8ab7e9	1	Other	Other
+a365973a-b693-4be8-9886-3b54858f09ce	1	Other	Other
+a365aafb-a59e-4b64-bd29-489ec8b4c51b	1	Other	Other
+a3660305-0ef8-4daa-885a-4fcad41f3ee0	1	Other	Other
+a366090c-924c-49a4-8573-466ce725a3c7	1	Other	Other
+a36616ec-d40b-4454-b881-da2fdc50f3a9	1	Other	Other
+a3661dc2-cf49-42eb-bddc-d38326f24576	1	Other	Other
+a3664512-5f9b-4598-a47f-4a08119575c4	1	Other	Other
+a3666a90-8217-4134-a0ae-7375072dcdb5	1	Other	Other
+a366dfb9-cbf8-4b52-8fab-323c7d412137	1	Other	Other
+a3670109-a601-4127-ba91-a46f5ad61aa0	1	Other	Other
+a3671332-c0e5-4061-8313-0d03b12b7f41	1	Other	Other
+a36715d7-fc1c-4af5-9382-f8045579d2c6	1	Other	Other
+a367cee8-7fec-46ca-8a44-e8d89b649f78	1	Other	Other
+a3680797-bae1-42e1-8b60-f1aba136030f	1	Other	Other
+a3680a39-74cc-41ec-adac-37142516fb82	1	Other	Other
+a368526a-50e1-4f74-9486-7cb451ec539b	1	Other	Other
+a36874e9-3aa9-4971-8eb8-48482d1de9d9	1	Other	Other
+a3688681-8d9f-493f-9ab1-e2330f106075	1	Other	Other
+a368c2a7-eaa0-4b15-8c76-bc11eec06dc8	1	Other	Other
+a3690437-aa12-4fcd-a4c2-834870f66d57	1	Other	Other
+a36930a1-c32a-4b5d-b33c-51b9bc0f0499	1	Other	Other
+a3694b29-b845-4316-ba75-66b0c1567c86	1	Other	Other
+a3694b31-4dff-45ec-9360-a1acaefd3a62	1	Other	Other
+a369600d-a352-4760-9469-c0f3d7b6772a	1	Other	Other
+a369a1e7-b928-4aba-93d1-03984bc07862	1	Other	Other
+a369a519-1371-4eca-bfc2-bf4d9fec684d	1	Other	Other
+a369bb88-7323-469d-9559-7130023d47b1	1	Other	Other
+a369d532-0cf3-46d0-b47f-da2b1d6280d6	1	Other	Other
+a369d921-056d-422e-9514-4afa96614b23	1	Other	Other
+a369e284-5842-4b97-9469-d9488d91b081	1	Other	Other
+a369e5b3-5165-4b84-ad03-39a7ce421c07	1	Other	Other
+a36a68b5-7984-4469-9054-001a3846daac	1	Other	Other
+a36a72c3-83f8-4a65-ad6c-ba7b0eb0aafa	1	Other	Other
+a36aba60-4e64-4e53-8cb5-ecea429214ee	1	\N	Other
+a36ac32f-a8ec-4bab-bc52-3c18f33d6085	1	Other	Other
+a36af027-e030-4c46-9540-ea50d9f045ff	1	Other	Other
+a36b06f2-75b9-4daf-80b2-b859d31dfa5b	1	Other	Other
+a36b14df-ae0f-46ed-9f59-bea6c149ba54	1	Other	Other
+a36b91cc-54a5-40a5-9e0a-0844fb842483	1	Other	Other
+a36ba377-666c-42bd-bac5-3a19acd4f035	1	Other	Other
+a36bbb6a-565e-4dfa-8dee-5bfe25cbad9d	1	Other	Other
+a36bc5e3-f488-4435-b5d8-0183e636c47d	1	Other	Other
+a36bfc14-73b1-4606-871b-bc66ca80f968	1	Other	Other
+a36bffcd-22a3-402a-a6a2-da8f9c63e2b5	1	Other	Other
+a36c0f16-16cd-4282-b74e-ea26e3dd394b	1	Other	Other
+a36c294e-d7ec-458b-b1c1-747d1aead4b1	1	Other	Other
+a36c5a59-7207-456d-af5a-b1afe9a39c6a	1	Other	Other
+a36ca7c7-aeaf-453c-bc2b-34d221464c10	1	Other	Other
+a36cedf4-7b76-4602-b040-d0be087370d2	1	Other	Other
+a36cfe18-6b18-46d4-9278-230d0aa7e9a5	1	Other	Other
+a36d4b6c-a446-4fd8-929b-1e669e500ab9	1	Other	Other
+a36d6676-c7ed-4a6e-82df-8714e8f9e16a	1	Other	Other
+a36d9228-8464-4824-aec6-4264b10ba920	1	Other	Other
+a36dfd3d-18e0-4e6e-8e07-f8d8952ea28a	1	Other	Other
+a36e3de0-af65-4bd3-9fb1-0e67a022b393	1	Other	Other
+a36e9166-6838-4ed0-b896-33db09c5b308	1	Other	Other
+a36ea819-d236-4362-b95f-7016d59844d8	1	Other	Other
+a36ece48-ae7b-4c8c-9fc3-fa20f20754ef	1	Other	Other
+a36efd75-c65d-4351-a8e7-47f6901561c5	1	Other	Other
+a36f16ad-e09c-4ea6-b940-50f48883b59f	1	Other	Other
+a36f8372-eca1-4df1-8b08-0aa40bef3056	1	Other	Other
+a36fac29-dee9-426b-9848-6635c0f164de	1	Other	Other
+a36fd777-7cdf-464a-96f0-593f87dd94ca	1	Other	Other
+a36fdc83-8f64-4cac-8a62-ce4ee30e96dd	1	Other	Other
+a3700bba-fe43-4436-b4b9-c92757b65fe5	1	Other	Other
+a3709ab3-5590-4955-85c3-2d37fbf3cb18	1	Other	Other
+a370a513-3ba9-4e4a-9bbc-5d7e43d2bdcc	1	Other	Other
+a370ac7c-e765-4fd3-8e3f-8e5be1e6162e	1	Other	Other
+a371438d-a7bc-4f9a-abc3-ae4f78fba9f4	1	Other	Other
+a3715b04-5292-42b2-9dc9-23bcd19c1a27	1	Other	Other
+a371627e-ed7b-4929-a93d-012657527adb	1	\N	Other
+a3718592-bca4-4f59-a222-8e06b0954cea	1	Other	Other
+a37193f3-5fef-4c9e-b9ad-57a474d67bf5	1	Other	Other
+a371959c-30a0-4c9b-9892-63df60b75cc3	1	Other	Other
+a371a26f-a47b-4d3a-80b5-360cfa6b5392	1	Other	Other
+a371ba59-4822-4946-be33-c02ba26ecfb5	1	James	Other
+a371ff2b-224c-4502-b308-05619a758202	1	Other	Other
+a37223d9-5b3c-4719-ac6d-7b2351e4d9aa	1	\N	Other
+a372a2bf-0b4b-4f93-8149-f8ba5d36f048	1	Other	Other
+a372bcb5-3444-4935-8907-662598f64d5d	1	Other	Other
+a3738943-4d94-4397-b956-71a7c4da8ce7	1	Other	Other
+a373a86d-b254-4ff4-90ee-5148855d38a0	1	Other	Other
+a373eb6b-2f2e-446f-915e-5ddb2524ac9f	1	Other	Other
+a373ed5a-2bbb-476b-a3fb-1f4dfa3aa766	1	\N	Other
+a3742274-125a-4451-ba09-6f980b33fb7d	1	Other	Other
+a3745e8d-41d0-4167-8023-3fb5d5597fc9	1	Other	Other
+a3747c9d-8ce4-4bed-9429-6eb0cf126d4a	1	Other	Other
+a374aab4-aab3-4418-8458-889f49799282	1	Other	Other
+a374b93f-f1b0-44ce-8817-f0f123dc9b38	1	Other	Other
+a374c3be-7af0-4c81-8265-2224809264a0	1	Other	Other
+a37508ff-8a61-4b3a-839a-7b5755909210	1	Other	Other
+a3751131-fb31-4bf8-99d5-64e7a3893230	1	Other	Other
+a3751c9a-3e42-4b17-96a3-2bd2d3dfb79d	1	\N	Other
+a3759380-24a3-41b6-9a14-9a475aa53191	1	Other	Other
+a375bd2c-5dd7-40cd-a5cb-ec7d96a69664	1	Other	Other
+a375e79b-8407-44c0-97ea-5ea2e463accb	1	Other	Other
+a375ea6b-4a19-46ad-b386-0008b3083ec1	1	Other	Other
+a375ffd4-b624-42a3-9254-9a474bf36d3d	1	Other	Other
+a3761884-8461-4029-a2d3-6ba8e0ad52ab	1	Other	Other
+a3761fc3-8389-4e8d-8e72-673d2f9b2665	1	Other	Other
+a3765764-5d69-47ec-9786-1cf0f2a59a19	1	\N	Other
+a3766162-6ae0-4441-90b9-ca7873413aff	1	Other	Other
+a3769a77-1b74-4c16-8d80-e9f999fd8a5e	1	Other	Other
+a376b44c-6e39-4f15-8474-af561b2db286	1	Other	Other
+a376d48b-97ed-4505-97bc-0ef8d179c4e5	1	James	Other
+a376f82c-9279-4771-9b42-d1cb3f4f76d8	1	Other	Other
+a376fe34-838c-4b37-8b80-1ee94c3e5118	1	Other	Other
+a3771f72-9f50-4b1c-9f94-c5ab0eec9960	1	James	Other
+a3772b30-dbba-4c4f-a24a-b4ad672b5cf6	1	Other	Other
+a37737a9-6fa3-4047-9694-1371d6c382de	1	Other	Other
+a3773d14-f26e-47c5-86b1-b99bae0a5e4e	1	\N	Other
+a3774a0e-bdb9-4449-9b4e-08b99ab89dc4	1	Other	Other
+a3774c3c-011a-4f50-bef5-7be5b9df343d	1	Other	Other
+a3777e98-99f3-43ce-8d6f-23242412ca12	1	Other	Other
+a377a3ee-c5cc-4156-973f-c72348f375dc	1	Other	Other
+a377dce4-434c-47d3-8cfd-83f3e30789b3	1	\N	Other
+a377e7f3-bc3a-4674-bb76-976706d2c70b	1	Other	Other
+a3780542-56fd-40cc-8a32-abbe9f3bc838	1	Other	Other
+a378458b-79fb-4c1a-a462-7e40d9153dbf	1	Other	Other
+a37888a2-0072-45c5-8474-118cf2fa9356	1	Other	Other
+a3788b57-e2e8-4a9c-b03a-e937c92e863c	1	Other	Other
+a378e375-cc83-489b-bb76-0a8108146a71	1	Other	Other
+a379076b-69a7-49b4-aaf0-d608c0372cc5	1	\N	Other
+a379460e-cd9f-424a-9326-8b3f55130524	1	Other	Other
+a37972b0-a98c-425f-84d8-04df06d68f29	1	Other	Other
+a379b5f2-813d-47f2-8a35-83313a4a1b14	1	Other	Other
+a379fcf3-c46b-4c44-994f-77577c0f29f9	1	Other	Other
+a37a0063-f18b-4931-91a3-b177aea456ef	1	Other	Other
+a37a088f-9f02-4537-8f58-53bdcfe71b62	1	Other	Other
+a37a105a-271c-41cb-bbc2-f473eb66fe80	1	Other	Other
+a37a44b5-60ff-4a4a-9168-e42fa827444a	1	Other	Other
+a37a5aaf-635f-476f-9a5c-be449107a573	1	Other	Other
+a37a758b-8b04-4bf9-a0f4-a5d4d928f9d2	1	Other	Other
+a37b031f-5748-481a-b1f0-6d4f974bea60	1	Other	Other
+a37b3d76-3035-4400-89b0-6f6448bc2571	1	Other	Other
+a37b6bce-693e-4a7f-9797-3aabdc7b7634	1	\N	Other
+a37b708b-1c12-41d8-9dd2-b0c9828423d6	1	Other	Other
+a37b8202-20c5-4ea2-8015-4ea5549a43cd	1	Other	Other
+a37c8360-fe97-45f2-bdc8-da9a99306f5d	1	Other	Other
+a37c9706-7a90-4760-8680-55b9cfeea16e	1	Other	Other
+a37cadc2-8930-4eef-a0e0-b77d819686fa	1	Other	Other
+a37d5152-e7e8-4920-bb89-6f915e24b8c8	1	Other	Other
+a37de359-7d3f-4365-ada3-f28f01b2c4d6	1	Other	Other
+a37de9ba-1e6d-4773-bcac-3624f1c3433e	1	Other	Other
+a37e3397-4283-48a9-87d2-b18aa54b2a5b	1	Other	Other
+a37eb01d-bde4-4a91-81ad-084cb02e7a32	1	Other	Other
+a37ecc86-5704-4fe1-b5a6-2a2e0a1e7b9a	1	Other	Other
+a37ed24d-36cf-4af4-96c5-80a70aef3c18	1	Other	Other
+a37efcb9-2433-49f4-b1fd-c478672ae97e	1	Other	Other
+a37f5da0-a39d-4bfa-9590-0e46d5da4958	1	Other	Other
+a37f925f-ee48-4cd2-9902-8fdb8c78e179	1	Other	Other
+a37fa354-7577-4fa5-b650-33d3b15650af	1	Other	Other
+a37fef08-1585-4a71-bf2c-dad693864583	1	Other	Other
+a380e2f1-b4d4-45ca-afde-30afd19c1934	1	Other	Other
+a38139da-9acd-43dc-964f-1839c863bb76	1	Other	Other
+a3814357-a476-448f-8b6b-1527eb3bfa4b	1	Other	Other
+a3816645-bdca-4e49-96e3-92861308bfcd	1	Other	Other
+a381772a-e140-44ff-8e2c-2b1dfa665da3	1	Other	Other
+a3819b43-f5c3-485a-8344-171592ca3486	1	Other	Other
+a381a555-9f2e-4be4-81f7-f39567166563	1	Other	Other
+a382988b-70b5-48cf-bc5b-7b2b299cda6b	1	Other	Other
+a382a4ef-289e-4d48-a720-dbed38fcb9a0	1	\N	Other
+a382ce2e-25c3-41de-b5a9-ba10c3d71323	1	Other	Other
+a382fae6-d2c9-44a7-8bf2-32249cc05a87	1	Other	Other
+a3833288-d2b2-4c9c-b684-c4c0742fd5a2	1	Other	Other
+a3836a0a-7f4b-4551-8f87-39e6eb54008d	1	Other	Other
+a383e8af-0709-439c-b404-ec9b48f8a6b4	1	Other	Other
+a3841988-fc57-470d-aa6b-c8cc745ec629	1	Other	Other
+a38431f5-5620-47a2-bbd6-72dc13167bbb	1	Other	Other
+a384794b-8b3c-4004-a5f4-0a6ff7c07007	1	Other	Other
+a3847fea-c713-439e-810d-033418bc8268	1	Other	Other
+a384848a-acf2-4b28-8dba-4e6caba19c8e	1	\N	Other
+a3849264-2a2e-4123-b50c-90a192814522	1	Other	Other
+a384f6ad-a159-49fb-b4bd-d79f43676b04	1	Other	Other
+a3853892-d6fc-468a-a1a4-42248f653e85	1	Other	Other
+a38548ed-7d63-4eb9-9f07-7b94c35d55ea	1	Other	Other
+a3855bec-44d3-4a64-a10f-207b00ae782c	1	Other	Other
+a385b608-b8cd-490c-bd3e-4b700abf68c3	1	\N	Other
+a386169f-aaf6-4b03-9789-6b1dad837d76	1	Other	Other
+a3865c4e-def4-4956-a01e-94b6664a54e3	1	Other	Other
+a38692b5-32c1-49fc-9c45-0b96a72179e8	1	Other	Other
+a386ed11-50b0-4f68-b988-2842c8638cd8	1	Other	Other
+a386f204-4d12-4e80-99ec-dbd580d7f800	1	Other	Other
+a386ff9f-5324-4a64-bb3e-567c796db6b5	1	Other	Other
+a3873ead-7ecc-4c3a-97f2-a86e9a7c6671	1	Other	Other
+a3874251-bdd6-4c65-8d84-6bd5078bde23	1	Other	Other
+a38755ba-a3b9-4666-a95e-45bbfeeb7e83	1	Other	Other
+a387bf23-178a-4318-ad28-92e1859d10d2	1	Other	Other
+a387d8b8-9adb-497b-af34-6a7bb8f89097	1	Other	Other
+a38809be-2630-41da-8e82-e6e374335dd7	1	Other	Other
+a388519f-f777-4d1b-a88b-0557fc8fc7d4	1	\N	Other
+a388fa9a-6fbf-49f2-8186-82a5a525462c	1	Other	Other
+a38900d1-659a-4d45-a442-361833b97d05	1	Other	Other
+a38924ee-ef62-4f72-9d75-8563627982a1	1	Other	Other
+a3895c67-6837-4813-8d2b-581d86828fb3	1	Other	Other
+a3897320-0b27-4a8d-9c64-dbe39d7d84b7	1	Other	Other
+a389aab2-1953-4f29-b4c4-7b77d4a1b6c4	1	Other	Other
+a389b914-ad3a-4dec-9cf2-8452de2f1135	1	Other	Other
+a38a341b-2e03-48d5-9d56-c3e55b7b9f39	1	Other	Other
+a38a3cea-dda4-486e-a4b3-b1e9b25afa1d	1	Other	Other
+a38a4478-6d53-432b-80b5-ec16a74f27c8	1	Other	Other
+a38a7672-de10-4cb2-b5cc-f28fb715f15e	1	Other	Other
+a38a7f0e-1d54-49b7-bff0-27d5128a3d44	1	Other	Other
+a38a8bb7-ba10-448e-b2fb-dbe2b89c4766	1	Other	Other
+a38abcf1-bd1b-41cc-b7d1-589343a1ee51	1	Other	Other
+a38ae0f4-1bcc-4179-88f6-a321fd982bed	1	Other	Other
+a38b0f20-e6d7-4195-b9d1-650a1b0d5ce4	1	Other	Other
+a38b55f0-9526-4dd5-8769-c9c980d85e8f	1	James	Other
+a38b73f7-2ec0-490b-bbe3-dc7de76cbc2e	1	Other	Other
+a38bc97d-03eb-422a-9b91-6fbdfd7beb8d	1	Other	Other
+a38bff01-8030-4327-b480-b4f208ebd692	1	Other	Other
+a38c388a-1582-4723-a6aa-a61fd3f38c49	1	Other	Other
+a38c8f3c-5117-4d80-8cb8-2e7e5f0b78e0	1	Other	Other
+a38ca393-d011-4807-861a-dc48c411d163	1	Other	Other
+a38d005f-4634-43fc-b692-bb558c766c3e	1	Other	Other
+a38d3107-aa3b-4138-bb98-8175033361da	1	Other	Other
+a38dc5c6-e37d-4a1c-80a0-b0eb598ea293	1	Other	Other
+a38dd543-d187-46a5-a517-7fed4257c0b4	1	\N	Other
+a38decad-c80a-44d1-9da4-e0cfe14b9f32	1	Other	Other
+a38e173e-a9b8-49bf-897f-6c728c0f24a3	1	Other	Other
+a38e5b92-2989-456b-8f5a-e95c1a3416ed	1	Other	Other
+a38e7a85-24dd-4b83-ab3f-4c9aba15a2db	1	Other	Other
+a38f11c9-1672-4dff-aef7-b3d67a877f2d	1	Other	Other
+a38f35f6-362b-4f2a-8c01-f45b4f8f89c2	1	Other	Other
+a38f3679-d252-419c-9c84-78ada5a8ade0	1	James	Other
+a38f6ea5-a25d-435c-b247-5f02e2a1a6ad	1	Other	Other
+a38f9d29-363b-44b8-b256-a059818e6811	1	Other	Other
+a38fb65c-04dc-49fa-846d-163a9d8945fa	1	Other	Other
+a38fefaf-673e-43ae-b9e2-b3b7e2f26d52	1	Other	Other
+a38ffd7d-bceb-480a-908e-784065e442ab	1	Other	Other
+a39026cd-50fa-4daa-a4ad-6026d1d1021d	1	Other	Other
+a3905aec-ac8c-4360-a336-60cf55efee3f	1	Other	Other
+a39081f2-3461-4eba-bde0-da6bd9293688	1	Other	Other
+a3908c0b-fa06-4035-bd01-24eb06362c4c	1	Other	Other
+a3908ebe-9e38-4476-b659-a763ded365e8	1	\N	Other
+a390cc1f-deec-4be8-b49c-01153be870b3	1	Other	Other
+a3910102-2f41-4567-b456-4b5b65ed8fad	1	Other	Other
+a39130f7-6d37-430e-b3ec-8c4af3eaa6ba	1	Other	Other
+a391b67f-6f0e-419b-9c75-2fd4ea39b9bd	1	Other	Other
+a3920152-1726-4b1b-a749-6195a37c6d91	1	Other	Other
+a3920cd6-3a95-4380-98ef-6835c19dcb5d	1	Other	Other
+a39261c0-e106-4014-9ac4-375df55b5f45	1	Other	Other
+a3927fe7-b979-4d28-bbf2-64138c52439f	1	Other	Other
+a3929fc4-dab7-487f-b253-f52ad799155a	1	Other	Other
+a392aa59-99ca-4558-8852-1f1e07b3a593	1	\N	Other
+a392c7c7-dccf-4fa1-9065-0f12bd2053be	1	Other	Other
+a392c8dd-e534-429c-90d2-2b262d1c07aa	1	Other	Other
+a392c985-195e-4c7e-be51-9dc0119a1fe7	1	Other	Other
+a392dd09-df48-4132-93b1-284d866fdd2a	1	Other	Other
+a3933cff-079e-4e6f-985e-24d0befc9cce	1	Other	Other
+a3933d8a-fa02-4eb7-a38e-60b13ad183be	1	James	Other
+a3936e0f-959b-40c3-91a1-57de47b3ebe2	1	Other	Other
+a39399d6-6370-41ed-a59f-2d6897fbebc8	1	\N	Other
+a393b078-9c15-4d97-800a-0258a9755bc4	1	Other	Other
+a393b8e5-a757-4166-addc-02fa0fc394f4	1	Other	Other
+a393d964-1c9c-45e9-9d4e-c66107e4c01d	1	Other	Other
+a3940b7f-a679-4b7c-8012-9b0b601246d9	1	Other	Other
+a39425ee-6ddd-47b1-ac52-6f2ddf3a6460	1	Other	Other
+a3946a08-5278-450a-bb85-353c4010ce1a	1	Other	Other
+a3949a28-3e6c-4d39-b4c2-f9ec96f0b1a4	1	Other	Other
+a3949c41-8edb-4ceb-b587-c650d1b0c5e1	1	Other	Other
+a394d8a3-9421-49f0-9312-b6ef14fd8729	1	Other	Other
+a394fdd8-64f1-4e0a-9580-33d8ddfd3281	1	Other	Other
+a395066b-6694-44de-8744-c6fd6d87a093	1	Other	Other
+a3954db3-1409-4fc0-b83a-17a05cbfa56a	1	Other	Other
+a395af52-72e4-4b09-b43c-3ba1be50dd1e	1	Other	Other
+a395cb73-0b68-408d-b830-6b0bfbcb096b	1	Other	Other
+a395d582-8167-4b40-8f45-e52098fff80f	1	Other	Other
+a396478a-efb6-4796-a3d7-e5c0c3d061fe	1	Other	Other
+a39655b1-9588-4a6f-a50a-21c8558c83cf	1	Other	Other
+a39672a3-a235-4bbe-bfcd-bd20a8a9b973	1	Other	Other
+a396c2bc-210e-40c8-9026-034c36040d30	1	Other	Other
+a396ff8d-d74b-48e6-849f-1ffcf05be6ee	1	Other	Other
+a3976551-a5d6-4f66-b245-a64331a08a87	1	Other	Other
+a3979686-cd82-4aec-8ad1-924c24a7da44	1	Other	Other
+a397b3cb-9e18-444f-9379-d4e818a18723	1	Other	Other
+a397b4b7-4435-47ef-83a5-666cae76eddd	1	Other	Other
+a397dde6-8329-4b2e-a32d-5b8e9c72b3e2	1	Other	Other
+a397fdbb-8e9c-41f2-941d-0c691472a4dc	1	Other	Other
+a39803d2-7136-432f-9d46-da447de30f5d	1	Other	Other
+a39861e9-4b36-4981-8bc9-de0bc96b2393	1	Other	Other
+a398c2d3-f527-4a14-9206-5b5bd391244f	1	Other	Other
+a398d4a5-d463-4f53-a7a4-b9fde474e9a7	1	Other	Other
+a39915c6-525e-4687-a5bd-895ce8e019d7	1	Other	Other
+a39935de-502f-4fe9-b0e5-878c8e490359	1	Other	Other
+a3995242-5fa1-4950-8055-c5072691c734	1	Other	Other
+a399dcfc-62d0-4e18-8807-1466b24741c2	1	Other	Other
+a39a2b4a-8bc2-444c-8e1f-ea8ade23b480	1	Other	Other
+a39a3895-7339-454e-8827-9faa16becd68	1	Other	Other
+a39a781f-0d92-479e-9903-986f2566e422	1	Other	Other
+a39a7844-e297-4384-95a4-c1465f257070	1	Other	Other
+a39ac014-c54b-44c4-a2cd-76d93f151aed	1	Other	Other
+a39afd03-6ace-4ae8-b4fb-d233bac69572	1	Other	Other
+a39b046a-e13e-4108-8c67-c26ba93b7893	1	Other	Other
+a39b1d6b-82cf-40a6-84d9-bc68f74a3f01	1	Other	Other
+a39b7f3a-5742-427a-b7ad-4183c3918a79	1	Other	Other
+a39c1204-bf7c-4dea-bfac-0cfdfba177d2	1	Other	Other
+a39c587b-28d0-41aa-8a7e-4fba9e17abd9	1	Other	Other
+a39cb64b-0410-49b7-b01f-e109bc78e4fc	1	Other	Other
+a39d0455-6920-417f-b450-db286a7938f1	1	Other	Other
+a39d068f-4c3c-44ec-8c23-b3b04061c90a	1	Other	Other
+a39d1943-416a-4ba5-8806-f869b0ff1a96	1	Other	Other
+a39d1e7d-877b-44e3-8277-1535e56a3e3e	1	Other	Other
+a39d27e0-157b-4be5-8d3f-2939e76bae2b	1	Other	Other
+a39d58d2-9d37-4642-892b-d6f65be3b8f1	1	Other	Other
+a39d7fab-8ec0-42e1-8a19-aaa2541f49b5	1	Other	Other
+a39dc9d1-8b25-4e8a-95b4-f85956259cac	1	Other	Other
+a39e0aa0-74e1-4d9c-ae09-78cae8c644ba	1	Other	Other
+a39e3fdb-8bb4-4c0f-83ba-707401bcbf98	1	Other	Other
+a39e4752-cf6f-42db-9484-f7df7c336065	1	Other	Other
+a39e4efd-c255-4593-9049-3b038ec1c082	1	Other	Other
+a39e909a-7136-48d6-9668-175e3bd83cef	1	Other	Other
+a39f16bc-c02a-464b-a255-f9d433a6a744	1	Other	Other
+a39f21c5-9428-4669-a2e0-608177a1feef	1	Other	Other
+a39f358c-d812-4ae1-b64f-626a2c491d2b	1	Other	Other
+a39f373a-f8e9-4cf5-9249-ae05ed37c164	1	Other	Other
+a39f6a22-107d-4c2e-80ef-1af15eab5c96	1	Other	Other
+a39f7441-c8da-4446-87b4-d248fd0a3717	1	Other	Other
+a39f8433-89da-4626-bd4f-91fcd0b141c5	1	Other	Other
+a39f9afc-f88c-4438-ad82-02e9c7f0c093	1	Other	Other
+a39f9fc4-8aa3-42d6-b8ca-020357e75806	1	Other	Other
+a39fa503-114c-49ca-80e2-938d3857f1fe	1	Other	Other
+a39fbad1-7f57-4559-a933-e8abf43d4701	1	Other	Other
+a39fd818-5ad1-4d71-98ee-a6a9c6ab31c5	1	Other	Other
+a3a0086f-7039-431e-a039-fe88e5956d25	1	Other	Other
+a3a01ee5-5299-4b01-8c30-b01f09177dd2	1	Other	Other
+a3a03070-c0f9-4a0f-bd34-0a7a98b89f3a	1	Other	Other
+a3a04e1d-7c22-4746-b680-8d36d7003f1d	1	Other	Other
+a3a073c3-fef6-446b-9c72-815cd67b3475	1	Other	Other
+a3a091f5-57e4-4d5e-bb47-5068b08b445a	1	Other	Other
+a3a0bf39-d31a-4b40-9487-85d5c0974900	1	Other	Other
+a3a0d820-5194-4322-8dd7-8bf2bf1d10f0	1	Other	Other
+a3a0fd7a-9754-4a12-b71f-811b940a3300	1	Other	Other
+a3a15041-01b7-4ab8-aafd-2b4505b5da3f	1	Other	Other
+a3a156d8-b5fd-4dd4-88d3-f1300f6f0d99	1	Other	Other
+a3a17c61-d5ed-4695-9e09-132606ab9c83	1	Other	Other
+a3a18dc7-34e5-4f06-999f-8f4ea6f4873f	1	Other	Other
+a3a1908c-98a1-4838-b7a7-afd46caa4c22	1	Other	Other
+a3a1b918-bb52-432d-af40-864c807defbe	1	Other	Other
+a3a1da5c-7a20-4847-a31a-24c22262847c	1	Other	Other
+a3a1de40-6c79-45bf-a369-c31d3972b940	1	\N	Other
+a3a220b5-e126-40d5-a9c3-9e70a3af0c92	1	Other	Other
+a3a2467d-7864-499f-94a0-559ce30dbc01	1	Other	Other
+a3a25aa6-08d6-470d-a147-fa88d8c92898	1	Other	Other
+a3a27fd3-d556-4847-85ce-404e549331c6	1	Other	Other
+a3a28a1d-0821-44c7-8a28-a49fcf5e813f	1	Other	Other
+a3a29305-45a9-4a75-852b-373c2902965c	1	Other	Other
+a3a31456-05ae-4ee2-a436-07cdbc4db029	1	Other	Other
+a3a34614-2b29-43b8-923a-20290e9a01a0	1	Other	Other
+a3a38688-03b2-451f-852b-86a9f753c9f4	1	Other	Other
+a3a3fc9d-3bed-4079-b4b8-0438b5b289fa	1	Other	Other
+a3a3fe22-f311-4d22-844c-41fcb08cdc4f	1	Other	Other
+a3a43db3-2ae4-4a10-837d-537671bdfa63	1	Other	Other
+a3a45a49-ed92-4957-a338-030e845f2354	1	Other	Other
+a3a47529-92bb-45e5-b7aa-d085f30a82d6	1	Other	Other
+a3a47827-1a76-42b8-a8d9-86c654f05e35	1	Other	Other
+a3a4c496-e80c-4d43-954c-9b8c81b6961d	1	\N	Other
+a3a4cf72-ccde-4bb4-8bfa-feed92c6eb83	1	Other	Other
+a3a50232-9de7-4aa6-b69d-a122ed05aaff	1	Other	Other
+a3a507eb-0772-4362-82f3-8cbc48ddbae3	1	Other	Other
+a3a52a86-9e5e-45aa-a2cb-1b3fc9e3c40c	1	Other	Other
+a3a59ea3-92a2-460e-a59e-2e178eb4c754	1	Other	Other
+a3a5ab3b-95dd-4b7a-9283-2ebfa6640f63	1	Other	Other
+a3a5af13-d664-425b-b856-441e84c94c92	1	Other	Other
+a3a5b267-13e7-4ef3-9ab9-f363a5cbea13	1	Other	Other
+a3a5c10e-b91d-47d5-8792-7e5d12be6b47	1	Other	Other
+a3a5f26d-74f6-4e58-8f00-638ac219613c	1	Other	Other
+a3a6422b-0a13-42c3-8dee-cf8703690db3	1	Other	Other
+a3a6a60c-0d11-417f-9269-dfca241cae3a	1	Other	Other
+a3a6fd1e-15be-40f1-922b-560b6ed271b4	1	Other	Other
+a3a7388b-b0e3-43bf-87a6-adf97f2cb362	1	Other	Other
+a3a7618d-1938-4e70-8223-5503693de90e	1	Other	Other
+a3a77f77-d186-43eb-b5b6-084e566c4f7c	1	Other	Other
+a3a796da-bb22-40af-b723-ee4f1209df93	1	Other	Other
+a3a7ae06-8f55-4276-8875-4ae0f4168998	1	Other	Other
+a3a7b241-752f-494b-8bcc-fb4b6f82dce7	1	Other	Other
+a3a7d4a5-385f-4ddc-a55b-fd3fd51ba4b4	1	Other	Other
+a3a829ec-41b1-487d-b369-4c38fbfee305	1	Other	Other
+a3a866e1-f640-4734-af67-d7ff246ac03c	1	Other	Other
+a3a8880c-2565-45ad-a185-fa3618cda196	1	Other	Other
+a3a8b91e-594b-4270-b4ca-f97622e5ed10	1	\N	Other
+a3a8b990-7bd0-4a9a-a0b6-4602a1a75185	1	Other	Other
+a3a90819-6d84-4adb-b384-03412df7a781	1	Other	Other
+a3a91a5e-eb63-4150-b64e-e6f19da2bfe8	1	\N	Other
+a3a926a7-13f2-4e30-b7cd-f99a059e9636	1	Other	Other
+a3a92864-ff67-4179-b0ba-34b50349c785	1	Other	Other
+a3a94e16-fb84-4a8b-bb43-a6fec7447a56	1	\N	Other
+a3a9c312-c68f-4785-bdf1-64c89732b801	1	Other	Other
+a3aa6f1c-80c3-4507-91d4-f90aabea0dee	1	Other	Other
+a3aa7e32-92f8-4f83-916d-1ef25c34a7ab	1	Other	Other
+a3aa9a8d-e764-4cb0-a518-a2a9e73ea8aa	1	Other	Other
+a3aa9d8c-13d4-4370-a679-8e017a4f7143	1	Other	Other
+a3aaaa33-b9cd-4b37-b13b-5c89c05c381b	1	Other	Other
+a3aae0c1-44d7-405d-a3c4-8ab286170377	1	Other	Other
+a3ab35c9-6a9b-4927-b972-5752a40a64c7	1	Other	Other
+a3ab5b8c-3a49-40c5-aebf-3b7455ba604f	1	Other	Other
+a3ab6148-5de3-4972-991a-1a42f9d99554	1	\N	Other
+a3abd846-7e17-4fd4-b5da-41aec0106db6	1	Other	Other
+a3abdbfb-13d5-42ad-8242-236c14b84487	1	Other	Other
+a3abf6d7-550b-4542-8068-3f1423824f38	1	Other	Other
+a3ac1a3c-6d8d-4078-8a6f-9b42da6cf957	1	Other	Other
+a3ac8530-5214-4ca3-8d70-55d346705a78	1	Other	Other
+a3acd260-4de2-44d5-8917-257b46e4f558	1	Other	Other
+a3acf394-7843-47b4-a231-a949a452f2a7	1	Other	Other
+a3ad08b5-7dba-482c-91a6-07530341b662	1	Other	Other
+a3ad1539-c576-4dd1-be6c-7335a8e8651a	1	Other	Other
+a3ad341d-f05e-4325-b941-429b670f88d6	1	Other	Other
+a3ad5a41-3182-47ba-b484-ad61ef91544c	1	Other	Other
+a3addff6-3ab1-4119-a94b-a820b4c21f13	1	Other	Other
+a3ae211e-0311-4a66-b6b8-a3f5e20fd74f	1	Other	Other
+a3ae386d-2ae2-41bd-af0e-9076c39fb28c	1	Other	Other
+a3ae9f62-975f-4313-94be-fc4632ceafdb	1	Other	Other
+a3aea8c5-b9a5-4511-81d5-22bb79745b94	1	Other	Other
+a3aed877-8e47-4889-9fd4-52882815b551	1	Other	Other
+a3af3588-2485-4541-aa0a-e3d45a2e92c0	1	Other	Other
+a3af51c6-e470-4d9d-8ea7-4ee83bac41ce	1	Other	Other
+a3af5d9e-1ec5-4882-b8c8-5455af06cfb0	1	Other	Other
+a3af78ac-87bb-446b-a649-631fecc920e0	1	Other	Other
+a3af81b1-97ab-4bff-bd9a-eef02a4cc145	1	Other	Other
+a3af911e-a8be-46c7-aaa3-dd7871360121	1	Other	Other
+a3afd38e-100f-45e9-9066-0d40289b212a	1	Other	Other
+a3affb34-0b8a-4845-940d-76c2f5a6d4e5	1	Other	Other
+a3b01310-d905-4bff-90a3-95ff81373edc	1	Other	Other
+a3b04644-d1f7-434e-b1ba-818b253bec55	1	Other	Other
+a3b05cdf-61de-4ce7-a3c7-4a796a64dd13	1	Other	Other
+a3b06648-b31c-4609-8a4d-dbf1f02057a3	1	Other	Other
+a3b070e4-bab3-4ecb-969b-6988302addfb	1	Other	Other
+a3b08435-21f1-42dd-b75b-e07952411202	1	Other	Other
+a3b103b9-a535-477c-b39b-ffa33f1f4780	1	Other	Other
+a3b14624-ce93-4efc-9fc6-53c74ea68e8c	1	Other	Other
+a3b14708-eeef-4bf7-ae6d-e615562f911b	1	Other	Other
+a3b19326-ed67-4bb3-85aa-f0a2d29b51a5	1	\N	Other
+a3b19b9c-2fd2-41cb-b852-7868450ddaf0	1	Other	Other
+a3b1a547-bcb9-4227-b4e5-43ff80108324	1	Other	Other
+a3b1ab61-2f2c-4483-ad36-d3f7e25411e0	1	\N	Other
+a3b1ccce-737d-4c32-ad1c-b64303a5273d	1	Other	Other
+a3b1ec1d-8c27-4289-93a0-3c8f6554bfb8	1	Other	Other
+a3b20f47-8bba-4e5f-9fbb-f9a33be2789f	1	Other	Other
+a3b210c6-14e9-4a0a-9608-874813470ff7	1	Other	Other
+a3b21447-040c-4fec-9349-1c1557ea7955	1	Other	Other
+a3b21863-beff-4def-9ee4-dbd1db7c9df2	1	\N	Other
+a3b24541-1f78-4135-92d1-ec5e6e6a12ec	1	Other	Other
+a3b24980-1169-4b1f-b3a6-e9ba6045e14c	1	Other	Other
+a3b25951-9510-446c-ae38-8ea1852cbec8	1	Other	Other
+a3b2a803-3096-47f3-8026-c8ef89648a1a	1	Other	Other
+a3b304d2-a012-4344-befc-49f6e47f4aa9	1	Other	Other
+a3b35e4f-0a29-4c13-b8c8-76a126247294	1	Other	Other
+a3b36709-6d16-4265-8230-d3eed87df19f	1	Other	Other
+a3b399e4-0a2a-45e2-b148-2452f1c82f1a	1	Other	Other
+a3b3c49f-e37b-4f6e-afc0-6852a1477332	1	Other	Other
+a3b3d2ed-11bf-4e2e-885a-1f101660c13e	1	Other	Other
+a3b3e654-7b41-4537-9be9-3d1f1854b003	1	\N	Other
+a3b40791-f1ec-4552-b394-cb55a744f742	1	Other	Other
+a3b42d17-f5de-4a1f-a5c2-822157c03bdc	1	Other	Other
+a3b432d4-2046-4fd8-926a-358d9907b21a	1	Other	Other
+a3b4623d-d2f0-4da9-8b72-30721eb9c9bf	1	Other	Other
+a3b4950a-ff10-4212-b89a-4cb36e722e10	1	Other	Other
+a3b4a874-a785-4293-979d-7655e834dc58	1	Other	Other
+a3b51b8a-e3ab-4d80-a355-294af146bf1f	1	Other	Other
+a3b54008-d37f-4667-8c5c-439732372727	1	Other	Other
+a3b540cf-cb5a-41f7-8e4a-db4588a0f4d0	1	Other	Other
+a3b5fa38-cb67-4055-8457-d4799601bd6e	1	Other	Other
+a3b61191-033c-48b2-8aa0-356fe329e2ec	1	Other	Other
+a3b62edf-708e-4997-8d5e-8095f726c1dd	1	Other	Other
+a3b69659-5783-4a2f-9c59-94c3a37cc27d	1	Other	Other
+a3b707ce-4e40-486e-914e-b9893aaa1518	1	Other	Other
+a3b748ad-af4e-4457-b15d-cf0c67b90b74	1	Other	Other
+a3b752aa-75a3-4cc0-a179-01f5c338da7c	1	Other	Other
+a3b77799-0cfc-4cdf-897d-e673be2e7989	1	Other	Other
+a3b86051-7240-4190-b713-8aca29f2fc72	1	Other	Other
+a3b88c53-f981-49c3-9bf0-081e0d121f83	1	Other	Other
+a3b896e0-c934-4642-81b3-8367e83aff61	1	Other	Other
+a3b94ff5-7f33-49c7-b810-2d01bb8b06bf	1	Other	Other
+a3b9617f-5203-46ac-b63e-671daf5aeb48	1	Other	Other
+a3b97b93-0a65-473a-b268-72c5ec80a60f	1	Other	Other
+a3b99d76-9950-4040-b9e9-dbdfa57080e0	1	Other	Other
+a3b9acbb-3767-4f0d-9c6d-2d14f54a508c	1	Other	Other
+a3ba1131-2850-4ba6-85cd-6da261258d9e	1	Other	Other
+a3ba4c73-528f-4f3d-85e1-90e18867b49d	1	Other	Other
+a3ba50fa-521a-4d59-9b1f-5eec5f520c02	1	Other	Other
+a3ba7572-92c2-4843-b5dc-2867e2eba2ea	1	Other	Other
+a3bac306-b5be-4f44-8719-35efd99e9463	1	Other	Other
+a3bac80b-f18a-4140-9aa4-c701763f598d	1	\N	Other
+a3bacff9-342e-4a18-8f6f-ef32d5ce7122	1	Other	Other
+a3bae4cc-7144-45ad-a61d-275bca8faa9b	1	Other	Other
+a3bb0481-13a6-4fe6-aac1-9a3153442df2	1	Other	Other
+a3bb9b05-1c9c-402a-9a5d-db3744b5f53c	1	Other	Other
+a3bc4e46-f426-4077-830a-5b284ebfaaed	1	Other	Other
+a3bc57eb-2eb0-49b2-bb2a-1e9d270832b6	1	Other	Other
+a3bc980e-f209-4c92-9a08-7df85a2c7228	1	Other	Other
+a3bc99c9-0745-4190-9365-39dc11a479df	1	Other	Other
+a3bca622-2a51-4aff-a628-90bfe851e4d2	1	Other	Other
+a3bcabed-b0b5-4aca-8792-e62c888ebacd	1	Other	Other
+a3bd6fa8-1e42-446f-96de-3a3b6d51407b	1	Other	Other
+a3bd9b46-a0c7-4dda-aace-9dc621f8885b	1	Other	Other
+a3be029e-60ba-4aa5-9712-d793cd0716df	1	Other	Other
+a3be6388-11bf-4b00-b7a9-47d94b23e898	1	Other	Other
+a3be7473-da74-4607-a884-2d63221eb844	1	Other	Other
+a3be7e3c-2441-4c80-a442-c89e076b3a95	1	Other	Other
+a3beda41-3bc6-4adf-8dab-caf5338a0f98	1	Other	Other
+a3bf0f89-5c1e-4d11-af5f-03a5b002ac4b	1	Other	Other
+a3bf1bde-04aa-4eea-92e2-56773699732a	1	Other	Other
+a3bf22e8-c9ba-49e3-bea9-53bd2828df1f	1	Other	Other
+a3bf39a5-9417-47fe-86e8-d6da573f3b07	1	Other	Other
+a3bf61a7-4b50-4e43-bcb2-88f4a49860cb	1	Other	Other
+a3c01de6-657e-4c99-9780-2f059907e4ae	1	Other	Other
+a3c02b76-623e-4ca7-873c-7c5ea9f71554	1	Other	Other
+a3c04cea-3449-4c46-9311-9e2f2fcb9ec2	1	Other	Other
+a3c074c4-3f5c-41d6-a4ae-b5e58bb6ff87	1	Other	Other
+a3c08057-301c-447e-a47b-7ca5f40cb809	1	Other	Other
+a3c098fe-a9d0-4290-82be-ff20115335f0	1	Other	Other
+a3c0b8e6-d7da-4416-9887-b28f9b407755	1	Other	Other
+a3c111fb-f090-41a0-b067-ad5ccc9b16e5	1	Other	Other
+a3c12262-b839-4399-a4bf-504ef7e09722	1	Other	Other
+a3c139c7-0414-44c2-ae2f-9ffd8518c4a4	1	Other	Other
+a3c18b92-4585-486e-a360-54d55251d730	1	Other	Other
+a3c197e4-8399-436f-abee-a36cd6129961	1	\N	Other
+a3c1bcf5-4c55-411d-bd09-a1406da156e9	1	Other	Other
+a3c1d0e6-3eb6-4919-af82-92a4ca118d5f	1	Other	Other
+a3c20fb8-a822-4393-baa5-f9f38d82d7ef	1	Other	Other
+a3c28a8c-0118-46b4-bdf8-9ba1577c741f	1	Other	Other
+a3c295f2-44ef-43ea-865b-71e17429fa63	1	Other	Other
+a3c2a420-b47d-49fb-a1c1-b1862b241be0	1	Other	Other
+a3c2b0aa-23af-44ab-9669-3d9bf2c25af3	1	Other	Other
+a3c2bab8-13b2-4ff2-967e-d91e3505828b	1	Other	Other
+a3c2c0ac-57f4-47d1-a611-bec532c1c097	1	Other	Other
+a3c2e7d7-a1ea-4bfe-a8cb-73f5f206c49a	1	\N	Other
+a3c2f15d-4c3a-4d5a-9558-4810b7d9f9f1	1	Other	Other
+a3c37fa6-d4b9-46cc-9557-ac60b5f0f3ab	1	Other	Other
+a3c3d4b4-5d5f-4650-ae8f-170ae6bd8bf4	1	Other	Other
+a3c404ca-f690-412c-9dbc-986d7814b3b4	1	Other	Other
+a3c49911-354a-4a7d-8a0d-f7a90859a4c3	1	Other	Other
+a3c4a06a-8f96-4c08-9987-91d7749512a9	1	Other	Other
+a3c56a4d-2166-463d-aeac-27fe35ba862a	1	Other	Other
+a3c577fc-a12c-4250-81b0-3c29912744bc	1	Other	Other
+a3c57a1e-ea3c-4753-bf4b-0fad5e6a9109	1	Other	Other
+a3c63756-7cc9-4407-923c-e139b9c8a9b1	1	Other	Other
+a3c64ebb-3cb9-4a58-bc07-d813b8fe65af	1	\N	Other
+a3c69f7e-e2f0-49d8-b0a0-51fbfbb4a12b	1	Other	Other
+a3c6c328-fe76-4b85-badd-c079eb8def12	1	Other	Other
+a3c6c519-65cd-49cf-b58b-0ed417a3ffc5	1	Other	Other
+a3c6f08a-507f-44bd-a56b-97c5d43bd440	1	Other	Other
+a3c6f0da-349f-4d93-b07b-ca9f1a9fe1c0	1	Other	Other
+a3c7094c-80e9-4717-a72e-c010cbe4a195	1	Other	Other
+a3c70bfb-da05-4ac9-ac33-d9dc738eaa3d	1	Other	Other
+a3c71d76-7e41-42a8-9a89-021a78e771ad	1	Other	Other
+a3c7613d-e369-4415-9282-d15392c7ee4c	1	Other	Other
+a3c81bee-d7cb-43df-83a3-65988bcf7b4d	1	Other	Other
+a3c84a06-77c1-4af7-b9b5-3c8e2d410217	1	Other	Other
+a3c875ce-940f-4a13-8ccc-77127f5763be	1	Other	Other
+a3c8a089-296e-420e-b3df-e6feef2a5f17	1	Other	Other
+a3c90a0a-16fc-4a0d-b897-3772c17ac587	1	Other	Other
+a3c93597-bf11-4a55-a76a-9e6f8c420183	1	Other	Other
+a3c96b79-306a-463c-b3f2-b4cdad7e4ddc	1	Other	Other
+a3c97552-5406-450c-a8b8-312ce6a1339e	1	Other	Other
+a3c98f5f-4c02-4305-951d-8364f7bf99d6	1	Other	Other
+a3c9abdc-dc55-428c-966d-abb56b21fd43	1	Other	Other
+a3c9ae2c-f7b1-4ba3-9798-55df036c1c5d	1	\N	Other
+a3ca07ed-ca3c-41b6-a855-c0cfd4496a92	1	Other	Other
+a3cb1896-685b-4fff-851c-ed88b2ae3620	1	Other	Other
+a3cb22a1-fdb5-435d-94e1-08722bbf1ed9	1	Other	Other
+a3cb3b6c-94d7-45b7-bab8-10d92d4a2e7a	1	Other	Other
+a3cb6fef-5ad4-4115-9dc3-7b96738bc865	1	Other	Other
+a3cb93f0-b153-4094-b966-7603564547f6	1	Other	Other
+a3cb9964-6355-4c52-880d-405903899136	1	Other	Other
+a3cbb643-8fad-4432-9d3e-c43196640fd9	1	Other	Other
+a3cbc625-b99b-4b64-b967-20c3ee0fb0c6	1	Other	Other
+a3cc1dc5-1baa-4bf5-b0ad-05816d8504ad	1	Other	Other
+a3cc72c8-02d6-4ab2-843f-6811ef00f7e7	1	Other	Other
+a3cc9a65-c6d3-4015-adbb-2d358f87ee0e	1	Other	Other
+a3cd06eb-99b1-49bb-b5a4-76c338c6aec0	1	Other	Other
+a3cd682a-8977-4c14-bd9e-03428b8d665e	1	Other	Other
+a3cd705f-a5ed-4881-90ca-dd396f55d2dd	1	Other	Other
+a3cd74ae-aadb-4741-88e9-5bfcec6d8a4b	1	Other	Other
+a3cdefc0-eb2d-4371-80c8-623b42fa7c94	1	\N	Other
+a3cdfd06-b392-4ca2-b415-6e92509ccd91	1	Other	Other
+a3ce1a9a-570e-4020-a572-1c70126ee88d	1	Other	Other
+a3ce8260-156e-4eec-a2aa-d5a0974f6d20	1	Other	Other
+a3ce85c9-93b7-438e-b592-1664cdd00b1b	1	Other	Other
+a3ce94e7-0d4e-4f49-928a-f133cfbe1ee6	1	Other	Other
+a3cea134-3610-4089-968c-52a70fb7c8a3	1	Other	Other
+a3cee711-daea-4608-9db6-efd382b198d9	1	Other	Other
+a3cefd6f-283c-4de5-a25a-55ab7b009417	1	Other	Other
+a3cf3434-1cb2-4771-83e6-5e1b1f0c453a	1	Other	Other
+a3cf3763-76cb-4ad2-b7c6-1e8bd564bcad	1	Other	Other
+a3cf5ed3-be73-49cf-bfc3-00ce52b9b969	1	Other	Other
+a3cf8f46-74ba-4cf9-8a34-0a10421ef17c	1	Other	Other
+a3cf98f9-935b-4727-bd8e-743ad4267c06	1	Other	Other
+a3cfcb22-a986-42a4-900e-5c7be2d4e944	1	\N	Other
+a3cfeb80-15d1-49a8-90ca-ba14431e8fb5	1	Other	Other
+a3cff0ae-64df-4c48-8634-bc6221d28f7e	1	Other	Other
+a3d01362-6b2a-4074-884b-a57d669f5e3d	1	Other	Other
+a3d028bf-2194-41d0-bd62-7c9d00d58a0d	1	Other	Other
+a3d02ce1-b03b-4a58-a9d7-d74e081bb8fe	1	\N	Other
+a3d0451c-64dc-4112-aa46-26a8e8952a39	1	Other	Other
+a3d05ed0-6bca-4d4d-b120-7c6d387bd98f	1	Other	Other
+a3d09a77-d366-4afc-9fe7-4135e11c56d0	1	Other	Other
+a3d0d91d-c904-49b9-94a1-503375dec66c	1	Other	Other
+a3d14215-19ef-484b-8189-e80fc699bfc9	1	Other	Other
+a3d15564-eb5f-47a8-8614-d7c9c8a9d9b7	1	\N	Other
+a3d1911f-7905-4f13-a559-04abd12e3776	1	Other	Other
+a3d1d20c-4c32-4a67-82c9-9a2f007518c7	1	Other	Other
+a3d1f618-5626-4aa1-81ae-3e9d67ea6020	1	Other	Other
+a3d29e62-d20a-45cb-a5ac-fc0320e15365	1	Other	Other
+a3d2b0a7-ace0-4272-90f4-8b2f7d698d13	1	Other	Other
+a3d2e2d8-61f0-44ad-bb01-c2efaf2a7787	1	Other	Other
+a3d3268d-2d11-47eb-8da0-7b7e0b201633	1	Other	Other
+a3d36c2c-6c8a-49df-a2af-3653131eb610	1	Other	Other
+a3d3e50c-e28f-4cfa-a304-64deb1c55cf5	1	Other	Other
+a3d469cc-90c2-4295-9230-b6d4ea58865e	1	Other	Other
+a3d4c4f7-d01f-4737-86c6-010c80525a60	1	Other	Other
+a3d4fe3f-d401-47b5-84ad-28140fb8d737	1	\N	Other
+a3d559af-9587-4958-8cf1-ad1484d68153	1	Other	Other
+a3d5dfb3-ea62-4c92-96d3-b6893aadc268	1	Other	Other
+a3d5e049-d00d-49d9-9a0b-d7ff5ec9d1bc	1	Other	Other
+a3d61415-5614-465a-883d-db8285d8030b	1	Other	Other
+a3d61bd1-9262-4240-bb54-be08be1ab82d	1	Other	Other
+a3d62a63-c821-4abb-9a0b-e9bcf52ec213	1	Other	Other
+a3d62f33-e169-4bac-b5ae-071e9fb8a8a2	1	Other	Other
+a3d6bb79-c587-4396-8fce-a7d037cbaec1	1	Other	Other
+a3d6d045-0951-4561-b859-a8fe17ccf095	1	Other	Other
+a3d77889-3dd9-4813-a9d0-5697cad9fca7	1	Other	Other
+a3d7b9de-709a-49b2-b075-bf4a412bcaaa	1	Other	Other
+a3d7dd85-4cbc-4bea-8658-1e50712c03a8	1	Other	Other
+a3d7e80f-15e9-4e1a-99b5-8c2049362e06	1	Other	Other
+a3d80ad4-7fe8-4232-a58b-460d7a56a4f5	1	Other	Other
+a3d8923b-ee93-43c0-86f9-5312c4101905	1	Other	Other
+a3d9a4b5-a264-438a-b371-f089ce432dd2	1	Other	Other
+a3d9b8b3-daee-4489-8e63-8b0ab7cbe972	1	\N	Other
+a3d9b8c4-e1d6-4659-888e-5ba5e0ad6435	1	Other	Other
+a3d9f81f-0e6c-4282-8984-c54817915689	1	Other	Other
+a3da71f7-4014-4a9f-b782-559683ee70cf	1	Other	Other
+a3da8461-a062-4f18-9bbf-93700aee849f	1	Other	Other
+a3dafec6-a86b-46e4-a3dd-67b78b9a26c5	1	Other	Other
+a3db10b4-7465-431b-8e31-11fad4557f18	1	Other	Other
+a3db2a37-5c39-4a79-8654-6f32f559df1e	1	\N	Other
+a3db8958-6111-4769-b593-11861e9e74b5	1	Other	Other
+a3db9462-2d34-4e88-9129-fe191063fed9	1	Other	Other
+a3dbacc4-f73e-4dca-bb1a-ad3767971ba1	1	Other	Other
+a3dbc69b-be43-430a-9aff-1470550ec30a	1	Other	Other
+a3dc0ff0-671e-4f77-b98f-0c806bcf879a	1	Other	Other
+a3dc120d-18ce-4d81-bc42-9fb95e2e17d4	1	Other	Other
+a3dc209c-af7d-4ae2-ad7b-211aefbe1b2d	1	Other	Other
+a3dd1e50-37dc-4ba3-8ee9-e9e47be5adc6	1	Other	Other
+a3dde83d-afdd-4aa8-82b3-c12b2b486636	1	Other	Other
+a3ddef4d-b378-4f3d-8c68-b7a0441246b2	1	Other	Other
+a3de70b9-86ea-4c41-b943-e533ffea862a	1	Other	Other
+a3de944b-cfae-494b-beb3-7200bd1f8406	1	Other	Other
+a3deab6e-8188-41ab-a85f-118851d781ca	1	Other	Other
+a3debf61-15d8-4a88-afb1-f71461db1135	1	\N	Other
+a3dec79d-b8b3-465d-8e76-eee6633befce	1	Other	Other
+a3ded4bd-3b83-44b7-9563-d9d165b3712e	1	Other	Other
+a3def625-368c-4b4a-bf0a-baa6ed9e235b	1	Other	Other
+a3df088b-4939-469d-bc11-8c117a113211	1	Other	Other
+a3df0a47-518c-47d7-939d-c57dee015654	1	Other	Other
+a3df0dbf-a516-434c-89ad-620d1689df99	1	Other	Other
+a3df24a0-05c4-471f-bb64-7fb1d1e03f09	1	Other	Other
+a3dfb0cf-200b-4830-8b27-b0cb74e78152	1	Other	Other
+a3e00729-89e2-48fa-9a8a-4be18538affa	1	Other	Other
+a3e01e06-9df1-4d5b-90cc-841bfbe1b9d0	1	Other	Other
+a3e08406-07df-46e2-9f0b-4faf308f35db	1	Other	Other
+a3e09579-1933-47b5-af62-cec52d54dbf8	1	Other	Other
+a3e0a3d9-276f-4856-a25e-8b388517ee6e	1	Other	Other
+a3e0bf39-0f2c-4adf-97c8-3696073c2fa1	1	Other	Other
+a3e0c60a-b4d2-4c8f-811f-9a0cc5762b13	1	Other	Other
+a3e1042e-7b85-47b9-8adc-5b12af10c3cd	1	\N	Other
+a3e13d39-418a-4c30-817c-942e745b058e	1	Other	Other
+a3e16627-f0d9-4ed7-819f-6600e26db3d3	1	James	Other
+a3e166b3-eab9-481e-962b-e2b4c692d12a	1	Other	Other
+a3e20352-f730-4bf9-9314-414ccc0856bb	1	Other	Other
+a3e21756-4ae7-445c-a94f-3b0e11ee4f1c	1	Other	Other
+a3e2461f-673d-43f7-95be-c72b7b0d0a44	1	Other	Other
+a3e25a73-0f2c-4d70-ae5d-39983f66f756	1	Other	Other
+a3e26ad3-bd3b-43da-af09-aeeadbd68e76	1	Other	Other
+a3e2749d-dc30-44f4-949d-62d4f156c60d	1	Other	Other
+a3e2f7a5-7385-4384-83b7-669073dfe1a1	1	Other	Other
+a3e3003e-5b07-45ba-b282-544bcd498144	1	Other	Other
+a3e3034b-8dfa-4b71-9585-5833692e06cd	1	Other	Other
+a3e3044a-c133-4e0a-83a4-e1f80e66a567	1	Other	Other
+a3e3090a-818a-4aa7-8695-671aaebbc153	1	Other	Other
+a3e3155e-a7a0-41a9-8b82-250022f40be0	1	Other	Other
+a3e34495-77cb-40c4-aa92-1ff169d4b8e0	1	Other	Other
+a3e38f5b-4677-4cb5-a27f-6b37b9857ab6	1	Other	Other
+a3e39587-2525-4e63-bbfc-d954abe2187e	1	Other	Other
+a3e3e383-6c11-48c9-9c8f-4fbd05cb3ab1	1	Other	Other
+a3e3e775-498e-458a-aee3-48e03290740b	1	Other	Other
+a3e42809-b682-4013-a8fb-286d40876dbd	1	Other	Other
+a3e45e42-8dfa-4688-adbc-d266da9a97e2	1	Other	Other
+a3e488ed-a6a1-4e0c-a37d-cd65d3ecb039	1	Other	Other
+a3e4c89e-ed92-42a4-997e-83a6d230ce45	1	Other	Other
+a3e4cdd4-ef08-466f-a1b3-ea5b19813298	1	Other	Other
+a3e4d004-d30a-44f1-8232-739a6ed358d7	1	Other	Other
+a3e53155-1641-4303-b84c-c30eb7b37e4d	1	Other	Other
+a3e5a662-69dc-479e-af57-56b9eaac80bd	1	Other	Other
+a3e5ed08-6788-4454-9f06-df9e570ee3d0	1	Other	Other
+a3e637c0-8a6a-4e9b-b2e4-bc618b65ac96	1	Other	Other
+a3e66248-64f2-4fb2-8be2-9c9eb6dad308	1	Other	Other
+a3e669e8-9afb-42b8-8eb0-16f9d701dd5c	1	Other	Other
+a3e6bb69-4245-4b1c-8dbb-2fd339a86d15	1	\N	Other
+a3e6c96c-50c0-4497-90da-a1eab7b1d39d	1	Other	Other
+a3e6e506-604d-4024-a7e5-894d9dc75e0f	1	Other	Other
+a3e715b4-5ec0-46dd-9706-0fe959ac2d42	1	Other	Other
+a3e751d0-7c21-4671-a969-8b9c40a96be8	1	Other	Other
+a3e761bd-0a89-462a-927a-c06ef8f17204	1	Other	Other
+a3e7b241-4216-4235-b715-6446eb963090	1	Other	Other
+a3e7be13-fba4-4758-b52a-b06b09512a2e	1	Other	Other
+a3e7c093-9a56-4f2a-9077-1d5c984d85d0	1	Other	Other
+a3e7c81c-cd65-408b-8699-e0a648103546	1	Other	Other
+a3e7d52f-ebc1-4c98-974b-554445499cb9	1	Other	Other
+a3e830c1-54da-478a-b2a0-f71533d15cd4	1	Other	Other
+a3e848b2-c561-488a-bea1-a591799eeb2b	1	Other	Other
+a3e8a11d-0afc-4c3d-aa47-7d3a5285d006	1	\N	Other
+a3e8b769-e569-4777-93c0-8a4972b41d4b	1	Other	Other
+a3e8c83a-6cd9-498f-b1b4-11d1783ea7bc	1	Other	Other
+a3e920ce-4cd3-4d0f-8cdf-2e3f33fd3405	1	Other	Other
+a3e9f5be-9d5d-4c1e-957d-4b7ed4bd2532	1	Other	Other
+a3ea217d-a522-4e81-b8bb-9e79966fe302	1	Other	Other
+a3ea8694-1c5b-4ce0-81d3-603a6c55de08	1	Other	Other
+a3eb0710-9c4c-4466-a25f-7306f384f77c	1	Other	Other
+a3eb72d3-8bc0-4666-8729-4e4e7656d158	1	Other	Other
+a3eb7948-2bf6-4c9a-acb2-a2caaec4f870	1	Other	Other
+a3ebf618-b812-4c3c-be17-b06b5db8e50a	1	Other	Other
+a3ec1e34-0bf3-4806-ae2b-0785eef6d523	1	Other	Other
+a3ec5224-5642-4bdd-9c67-f5b7b56aa1a5	1	Other	Other
+a3ec7449-4f6b-408b-ac85-0ccc5e373447	1	Other	Other
+a3eca847-945e-4ad3-9f42-920c6d84eac2	1	Other	Other
+a3eca999-a9f0-4d67-a1c3-9cb152c90aec	1	Other	Other
+a3ecc031-763e-45ca-a5b8-e0b8d80958f4	1	Other	Other
+a3ece96c-df5b-49f6-9a7a-7508e2560699	1	Other	Other
+a3ecf343-15cc-4a29-957a-c960dc1d1af7	1	Other	Other
+a3ed8fbe-1fbd-436f-a53d-6f2977242f11	1	Other	Other
+a3ed9029-0365-41b4-aa06-48ba88249a2b	1	Other	Other
+a3edb7da-ff94-44f2-8bff-26b96b3a41cb	1	Other	Other
+a3edef34-f1f6-11e7-973a-fa163e8624cc	1	Other	Other
+a3ee2f8d-3b0b-46e8-9aed-3459ad2c1bd5	1	Other	Other
+a3ee39aa-49c6-4629-9fde-645f3efdfcc3	1	Other	Other
+a3ee8b72-b514-4442-aeb5-2ccb1ae350df	1	Other	Other
+a3ee9734-796d-47d3-b023-2ce3ce9ebc06	1	\N	Other
+a3eebae4-70b1-4902-a311-feea1f8a17ae	1	Other	Other
+a3ef076e-f252-4c73-8128-3c3baf0226ce	1	Other	Other
+a3ef48d8-a5e4-484e-b768-270d13109120	1	Other	Other
+a3ef5bc4-8100-459b-88e6-2c5d44e9bd07	1	Other	Other
+a3ef8143-4007-4571-8594-122ed43b581b	1	Other	Other
+a3ef95bd-8638-4612-8db5-75885b0a2ce9	1	Other	Other
+a3efaebd-f4a6-46db-b5d9-ee85aef9e90a	1	Other	Other
+a3f00425-315b-4101-82e8-b9ec3361a546	1	Other	Other
+a3f02de9-fab3-4475-850c-b2fa4886de7b	1	Other	Other
+a3f037e9-5a54-4f24-9050-74a337dd59db	1	Other	Other
+a3f0f04e-e8e5-46d2-b2c2-87da0635fa80	1	Other	Other
+a3f11acb-eb00-44c4-8b58-fb1d3d79df29	1	\N	Other
+a3f125ed-e598-4bcf-abd5-d421af5fbaf7	1	Other	Other
+a3f16642-c492-4835-99cc-6eb7e6ca0043	1	\N	Other
+a3f1dc87-6306-4ba4-a6a2-01a47c2a39d5	1	Other	Other
+a3f1f11e-2736-4324-abb0-7999e5874f41	1	Other	Other
+a3f20ec1-b1c9-4df4-ab30-5ca862e77a7e	1	Other	Other
+a3f292df-310c-482d-b1d3-078d2f868e98	1	Other	Other
+a3f2c9b0-3c43-4452-9379-7cb00757331e	1	Other	Other
+a3f2d32c-cf1b-4ad5-9165-2c0b9f590769	1	Other	Other
+a3f2efdf-b2e8-4d6d-a59b-791ad1f70d5c	1	Other	Other
+a3f3159d-7097-475e-929d-f7b4b9cb132d	1	Other	Other
+a3f33654-ad9e-4898-954e-1111457114c5	1	\N	Other
+a3f34392-644b-40ee-bad2-ff1af14a84f8	1	Other	Other
+a3f344f3-6bfc-404b-bfb3-76d9f3f56b2b	1	Other	Other
+a3f373f3-9b99-47e2-ad89-1cd30a1cbbff	1	Other	Other
+a3f375f7-8110-4049-8059-1233f0b3915c	1	Other	Other
+a3f377a0-4270-45c5-9345-7f2a09e64c84	1	Other	Other
+a3f39890-788d-47e1-a0e2-c67ef48a7541	1	Other	Other
+a3f3c010-7ba4-4dea-8df2-9fdd969cc10b	1	Other	Other
+a3f3c402-e706-4305-9860-8ba27802f6fb	1	Other	Other
+a3f3f012-ef6d-465c-9907-3f5c9e6b1e41	1	James	Other
+a3f3fa7c-5b67-4592-957f-bf06d85e69fd	1	Other	Other
+a3f4ddca-ce2b-4afd-8660-618ea55de8bd	1	Other	Other
+a3f4eb27-8e57-43cf-b72e-efb00bd80c6c	1	Other	Other
+a3f51019-8d2b-4fda-b849-7bfee09b136d	1	Other	Other
+a3f54a7b-bc88-41fd-9cb9-b98ed85b47c0	1	Other	Other
+a3f55490-4724-40a1-bedf-52f863e73fb0	1	Other	Other
+a3f56d91-0122-4da9-a83b-2f24ffd81f94	1	Other	Other
+a3f5ad03-caa8-4d6a-b89a-87b56934a8d0	1	Other	Other
+a3f690a1-1198-4f8a-b7d9-fab6f75a142f	1	Other	Other
+a3f6d7f8-10ef-4865-b903-be48e7977602	1	Other	Other
+a3f74bdb-b515-447e-8023-e5ab7f325268	1	Other	Other
+a3f75f95-b7e2-4690-96fe-1cc0f67977a1	1	Other	Other
+a3f7c9b5-bcf7-4e5b-954a-299288ac3939	1	Other	Other
+a3f808d6-8fcf-4781-9a24-4a7658bd420c	1	\N	Other
+a3f81103-b8a2-46a3-93fc-243e1209b979	1	Other	Other
+a3f830d0-ab06-4f27-a400-412ce8727163	1	Other	Other
+a3f933a6-8b79-43b1-be0c-37f0ab2b0ee9	1	Other	Other
+a3f9571e-f9aa-4b62-a70b-62346fe850ef	1	Other	Other
+a3f9e10d-f637-4f85-a695-5953be93eef3	1	Other	Other
+a3fa5326-a521-4905-9e19-4850d14b09bc	1	Other	Other
+a3fa8fbf-ce48-45b9-87b2-eef3e0ab2bce	1	Other	Other
+a3fb2e5a-d321-4f8a-95a8-92e7953b5541	1	Other	Other
+a3fb9976-98a8-4570-b351-df2c29bd3435	1	Other	Other
+a3fbe753-46df-4882-ab34-df99047500e3	1	Other	Other
+a3fc7b6e-86ff-44c7-a6c7-672d3ff032a2	1	Other	Other
+a3fc9239-2af7-4b10-b96b-58868d6aed3b	1	Other	Other
+a3fc9317-3a90-412c-ad93-c2ba069409c0	1	Other	Other
+a3fca106-33c1-4114-b1be-b8bc2e803f32	1	Other	Other
+a3fca97e-11be-48d5-a68d-2d5d503fd91e	1	Other	Other
+a3fce35f-f3d9-43ee-aec8-2289c9efadea	1	Other	Other
+a3fd2194-9936-405c-8f21-33ae4027921f	1	Other	Other
+a3fd6183-1f90-41c6-891f-9face0e76b98	1	\N	Other
+a3fd6dfa-65e6-4af8-a041-2abc8083ae99	1	Other	Other
+a3fe1ae5-d02c-487a-94b3-915dd3680020	1	Other	Other
+a3fe1fbc-fe55-455d-9990-49011efe2d1c	1	Other	Other
+a3fe23c7-9bb6-4dae-b74f-64de2b09bbe8	1	Other	Other
+a3fe373e-4796-40c7-ae90-8b6611a99470	1	\N	Other
+a3fe3ba0-fa13-428e-ae72-4723c53666a6	1	Other	Other
+a3fe981f-7c15-4b86-9d61-589be5fc1bd9	1	Other	Other
+a3feaf3e-c5c0-43d6-88f6-2ef2e2479456	1	Other	Other
+a3fed1b7-be56-4bdf-91bf-bbfe9039b037	1	Other	Other
+a3fef412-e9c4-4c0a-a756-17ff50472f7e	1	Other	Other
+a3ff002b-8229-4c9a-aa8e-5a162be2b315	1	Other	Other
+a3ff656f-44d8-485e-b57d-bbef0c50c759	1	Other	Other
+a3ff7411-5999-4315-bd01-af6e1902dfa5	1	Other	Other
+a3ff7a9b-7903-4846-b9dd-11f6995de9cf	1	Other	Other
+a3ffacfc-881f-4d35-965d-1a5d30233acc	1	Other	Other
+a3ffbaa4-f718-48dd-876b-36b3653b12fe	1	Other	Other
+a3ffc5be-35aa-4658-9363-42a182440963	1	Other	Other
+a40055fd-a44c-4ea3-b843-b0b774c75834	1	Other	Other
+a4007b25-78a4-402f-b812-5ddc7efe9656	1	Other	Other
+a4009498-d230-440a-8eb9-311ac7a428a7	1	Other	Other
+a400e50f-07c7-437b-a3f9-8f154a2ca379	1	Other	Other
+a4014830-29e4-464a-a10f-0ec64e6a0c2d	1	Other	Other
+a4014fda-39ee-42fd-9d89-c522660a1be9	1	Other	Other
+a4015752-d584-4d03-a2b8-f97dfcb442cc	1	Other	Other
+a4016482-3bec-430d-a76c-3a3a2a6c40ad	1	Other	Other
+a40190fc-fe43-40f6-a7b5-1dac7ffe2f16	1	Other	Other
+a401996e-bc0b-42fd-ae5e-e268388c2f10	1	Other	Other
+a4027d75-eb2f-445f-b490-93699a0661fe	1	Other	Other
+a402a844-1fb0-4c43-9ed4-8322939b792f	1	Other	Other
+a402b213-5655-4d54-a097-4fdc89010bb7	1	Other	Other
+a402b8a2-eaa8-40c1-8933-d4eb38299caa	1	Other	Other
+a4043b66-8841-4c33-a554-bb69c290cbd1	1	James	Other
+a40450f7-459f-4bcc-89d8-2b751329d1fc	1	Other	Other
+a404fdac-21c9-4b01-8e03-61350d5cf25b	1	Other	Other
+a4053e03-d818-444a-bd90-0ca39fb20d9c	1	Other	Other
+a405487d-91a1-4c0a-a788-e87fc89248ed	1	James	Other
+a405869d-f442-4b20-beb4-06fef77f58c3	1	Other	Other
+a405ece6-2cbb-4f10-bf14-014e23e3fff8	1	Other	Other
+a4061c7b-9585-4159-8971-84adb4b93f59	1	Other	Other
+a406e58f-fb49-4a67-a4f0-7478a9911d3b	1	Other	Other
+a406e8a5-ec8d-48fe-8e03-44b94271cd2f	1	Other	Other
+a407420f-1162-4c7a-a2bc-838a429fa1a2	1	Other	Other
+a4074b85-5220-4c6a-83f9-aef0a3c506f7	1	Other	Other
+a40759a8-d125-4ab7-9a7b-315345ab173b	1	Other	Other
+a407791a-1a4c-4059-b254-6fe2730f78c3	1	Other	Other
+a407897c-6f0c-484c-be79-eff251bcea3f	1	Other	Other
+a407b21a-88d4-43f6-ab49-cafaf96419f6	1	James	Other
+a407c9d2-a49e-4d35-b5b0-e9347e91878e	1	Other	Other
+a4082ca4-4cdd-41a6-8385-dc314913b82d	1	Other	Other
+a4087cd9-695f-4f59-b630-4c65d5e30f0b	1	Other	Other
+a408bd3c-665b-4cd2-b8ea-ea95bffc06af	1	Other	Other
+a408c91d-571d-428f-856f-7c3a8e9e7b0e	1	Other	Other
+a408d54c-2752-479f-acd8-a8c2b93afd64	1	Other	Other
+a408eb19-0658-4795-a706-6d41995f2611	1	Other	Other
+a409274a-f2ef-434b-9c50-2782bbddfab5	1	Other	Other
+a4092d24-8138-4cb6-83c2-dab25f9bc5ff	1	Other	Other
+a409d7ea-37eb-4a9d-895e-c07e83c3bb21	1	Other	Other
+a40a0256-cc39-4cb5-9e99-863c1dfe9355	1	Other	Other
+a40a074b-5696-4db1-b7fb-b4275661f582	1	Other	Other
+a40a5f41-146b-4ebb-a44f-f1709af10b46	1	Other	Other
+a40afb06-41de-4d11-9789-da701a3e8998	1	Other	Other
+a40b0ae5-f86d-41b0-8c1f-d3a1681858c4	1	\N	Other
+a40b0f31-ddd2-4e8f-96f1-e542f5f7382a	1	Other	Other
+a40b6280-228d-445b-8363-5c4fb83aaec3	1	Other	Other
+a40bd231-ef43-476c-ad4b-47f537c05b9d	1	Other	Other
+a40bf062-3190-45e8-b11f-9d5c3b3ddc8f	1	Other	Other
+a40bf7bf-acf1-47a8-958d-d2706ec56088	1	Other	Other
+a40bf918-0ee0-4652-ab90-5ffee29d47f9	1	\N	Other
+a40c5993-862b-4003-b0ca-53c17b08b1cc	1	Other	Other
+a40ca0ee-79a6-46a7-b700-d31c250a73b2	1	Other	Other
+a40ca8a9-87ac-4e2b-9879-c3ffb3036fec	1	Other	Other
+a40cbbfc-cb56-42f8-bd39-6443452f4b07	1	Other	Other
+a40ccee5-186b-4a6d-b4ed-a91827d34efe	1	Other	Other
+a40d5fba-05cf-4ed8-b7fd-494ff9e36ac2	1	Other	Other
+a40d972e-f432-4411-8d49-9f1693c8bbb2	1	Other	Other
+a40d9759-0e5b-4664-bec1-31202623b026	1	Other	Other
+a40dab51-d0cb-47b0-94f9-1e9af19001b9	1	\N	Other
+a40dac58-f1ac-4e52-b102-8d1f652836f3	1	Other	Other
+a40db027-e3e9-4317-bbe3-dd17bb4bd74e	1	Other	Other
+a40dc005-dea1-4055-9b2f-c22725f84ec5	1	Other	Other
+a40e224d-74c5-4613-af33-8996adf60b9b	1	Other	Other
+a40e4415-57c7-4744-ac75-6751ba8e9e60	1	Other	Other
+a40e5a5e-05a2-4b00-aa48-193822fe7f7b	1	Other	Other
+a40ed6bd-9ae4-4436-be2d-b098dec19983	1	Other	Other
+a40f4f8f-b528-4c23-8eb5-9472a3fb9347	1	Other	Other
+a40f539a-281a-4e16-825a-b1c7d9833465	1	Other	Other
+a40f53f5-6ea9-4db6-a4c8-0f11d45bb587	1	Other	Other
+a40f62ad-3412-4b26-9ffd-e4b301042a8c	1	Other	Other
+a40fbb6d-79ff-4014-930b-014d7636d55d	1	Other	Other
+a40fe916-9717-442f-b0cf-2b439f32dcec	1	Other	Other
+a40fefa2-cf0c-4ebc-b6ea-10173e769771	1	Other	Other
+a40ffa2b-639e-4531-ac40-4347d292db5d	1	Other	Other
+a4102c9a-6553-4dc1-807e-914e424cf50d	1	Other	Other
+a4103e37-584f-4ae4-9cf6-a0e0d0236a2d	1	Other	Other
+a4105063-a6b1-47ca-b49a-f8315792ff3f	1	Other	Other
+a41052ee-9c10-4cb6-82f8-683cda36ad6f	1	Other	Other
+a4108692-078d-40ab-a97e-e8cd2f54c740	1	Other	Other
+a4110e89-5bc2-497e-8a03-de630b8047d5	1	Other	Other
+a41113b3-7716-4895-94d5-b00537d0582a	1	Other	Other
+a41113cc-5a3f-44b0-b056-bb4cfdbd7a9b	1	Other	Other
+a41116ba-60f6-4d5c-b54c-376aef2c002b	1	Other	Other
+a4113a8b-cd8d-43f9-bd09-8a9569a4ed51	1	Other	Other
+a411536c-89fd-47a7-b36a-cffb0e816e22	1	Other	Other
+a411b564-6f4e-4534-9c2d-344b24767d1e	1	Other	Other
+a411ea5d-7508-4d58-a9b7-3c4b50fe97f2	1	Other	Other
+a411ed4a-ce09-4ec3-9df2-226f70740bea	1	Other	Other
+a412107a-aafd-4451-9d90-fded83250948	1	Other	Other
+a41266ee-215f-4a21-8ce0-0b1078304836	1	Other	Other
+a4127ce6-8565-43a5-8879-280662a150a9	1	Other	Other
+a412ba03-a33d-4221-879c-4e390c0478ce	1	Other	Other
+a41310f5-fe0b-4b48-b9e3-9fc7e99d6efc	1	Other	Other
+a4135e87-432d-4954-a0f6-04a5b6380caa	1	Other	Other
+a4136919-04aa-4842-b5da-5243886c73fb	1	Other	Other
+a413ba16-df24-4d07-ac73-b156fcc87776	1	Other	Other
+a413bdb4-ff0d-497b-8fe6-efa5d9d2e5d9	1	Other	Other
+a413da7f-2f11-4086-88a4-7f7c1ab3f75f	1	Other	Other
+a413df94-1598-4d46-81e7-fdc02ccf62f8	1	Other	Other
+a413f183-d84f-40a9-9ab4-1d784773c23e	1	\N	Other
+a4141b93-f5ec-4fa5-af53-5108f0f42cf3	1	James	Other
+a414374b-6f92-4015-8bc2-0e8d29fe6722	1	Other	Other
+a4145951-e9c4-4b78-8d85-1391471312d4	1	Other	Other
+a41461df-09af-4024-8f23-04b62bf78d64	1	Other	Other
+a414676e-1975-4b0e-beb0-54a125c280da	1	Other	Other
+a4149d27-9958-43e7-b7ab-a1f322de71a5	1	Other	Other
+a414f033-ffb1-434c-9479-7eb3ebd80066	1	Other	Other
+a41541cd-9e89-45c3-afff-57954ca6ece1	1	Other	Other
+a4155598-6a7a-4e75-97ee-2b6c8c828c48	1	Other	Other
+a41559d1-c356-4492-81a6-59a5a74ff489	1	Other	Other
+a4155d95-9558-42e9-965f-e149074c5ac8	1	Other	Other
+a415a265-63cd-4613-a971-cbb321f59908	1	Other	Other
+a415e502-dfc6-41ac-bd22-be6aed46be54	1	Other	Other
+a415e703-9ad4-4960-85cb-b6fe7ae5690f	1	Other	Other
+a416564e-8945-451b-a1e1-a611d78abeb0	1	Other	Other
+a4165aab-16da-4108-97cb-3718a51cb4ab	1	Other	Other
+a416c7d8-1877-4b38-a011-582a011a9bc1	1	Other	Other
+a41709b6-fae5-4652-916e-791910768e99	1	Other	Other
+a417337c-9c95-4404-abef-84116fbf3a5e	1	Other	Other
+a417c6a2-02c1-4e1f-a923-0b0161ac0501	1	Other	Other
+a417d555-68cf-425a-a2c4-04416e035972	1	\N	Other
+a417f71c-fb90-43b8-a0f9-4e5c47051b14	1	Other	Other
+a4183b3f-f9ee-4ed8-b3bb-aff45cf86849	1	\N	Other
+a418e8dd-cf26-4557-933e-85a1898d6947	1	Other	Other
+a418f0bf-be93-4e48-8900-ea55d85c3151	1	Other	Other
+a418f980-eaa0-4b86-936e-0de6256bfa40	1	Other	Other
+a4193808-ae7a-4593-8952-a350a01e50ed	1	Other	Other
+a419c1ec-892d-4434-824d-c3a07ec34c26	1	Other	Other
+a41a1a4c-0dd1-403a-9ee0-22f2836bd6b5	1	Other	Other
+a41a2058-f9d6-11e7-ac05-fa163e8624cc	1	James	Other
+a41ab0f1-903a-435a-9120-77d21deabcb2	1	Other	Other
+a41b12f4-f1f3-416a-a475-c0a3b6e00b57	1	Other	Other
+a41b3aff-e530-4e24-aa3d-9101ca0b3d71	1	Other	Other
+a41b6100-3c50-4cf8-804b-cbb35be1204f	1	\N	Other
+a41bc0c8-6093-4652-a2d7-525622ddc061	1	Other	Other
+a41c7e0f-6dee-4c8f-a0f9-53b35b32e6ab	1	Other	Other
+a41c886d-5535-46ba-9c85-f99ceec43a85	1	Other	Other
+a41cc4b3-f881-45c1-939d-643a18cfb611	1	Other	Other
+a41cff01-d0e0-473a-936e-7d5c9dd210da	1	Other	Other
+a41d409b-f7e0-4f08-9337-6b09c5750fc5	1	Other	Other
+a41d6c47-7b14-4b88-b23e-263b75a5d709	1	Other	Other
+a41dc929-828b-4d6e-9a19-f2806052b9f8	1	Other	Other
+a41de2f5-eaa7-4d24-ad5a-0124c8e3fb52	1	Other	Other
+a41e0710-f57c-4c02-b880-0aed30083893	1	Other	Other
+a41e1028-a015-4e77-afa4-f3dad425deff	1	Other	Other
+a41e2ada-999e-4fad-bcfa-eaf02253f2cb	1	Other	Other
+a41e68d0-959d-403f-a863-15681f999764	1	Other	Other
+a41e7261-902d-4e7c-b9bb-b227130316cd	1	Other	Other
+a41ed1bc-6e36-4d20-97a3-ee02f1a27a55	1	Other	Other
+a41ee69c-b7f4-4535-890c-05c3401e0422	1	Other	Other
+a41f4af7-3a54-4b0f-8247-d038858942b9	1	Other	Other
+a41f994d-d850-4601-bcce-05ccd5bfab4c	1	Other	Other
+a41fc30f-2fde-4b99-a167-f32bb892c33e	1	Other	Other
+a4200767-b109-4063-b059-d2391a85157d	1	Other	Other
+a42094eb-aa61-461f-b847-053e7bae3c57	1	Other	Other
+a42109e5-2623-4b27-91ad-d662e766cb91	1	Other	Other
+a4213390-9e4c-4f47-bcb9-753a2d43beff	1	Other	Other
+a421518f-8064-40fa-b324-5fbdcf6c4d1d	1	Other	Other
+a4218292-4e04-4bbb-860d-e8a6f86f3b08	1	Other	Other
+a421a6f1-8519-4422-8d41-01d8f57f6de8	1	Other	Other
+a421a98a-a102-4067-b4c5-285699e34b5c	1	Other	Other
+a421e13d-67ce-4878-a8de-abe08556b470	1	Other	Other
+a42204f5-5dd0-4d04-bfa6-ace3d12bdd47	1	Other	Other
+a4223eb3-09a1-4ace-9e01-d47e69dcf81d	1	Other	Other
+a42257d4-d511-4ca7-b4f2-721c92abe71d	1	Other	Other
+a4229edd-7eaa-4d1b-8e47-02c2d163c10a	1	Other	Other
+a4229f26-f6de-47f9-b867-015dd0958e3a	1	Other	Other
+a422be58-51bf-4be2-83b5-4b42e7e00853	1	Other	Other
+a422dfb6-27b3-471a-aa8e-d1a4212897d1	1	Other	Other
+a4230b2f-55d1-4705-9b90-f96d94fd2384	1	Other	Other
+a42375ab-c709-437e-8011-8ad7e61c7aea	1	\N	Other
+a4239fc4-26af-4623-8259-d6afc2663a37	1	Other	Other
+a42416f4-5a77-4ad4-a532-8eb45c674d6e	1	Other	Other
+a4243b80-5fc3-4f56-91b1-f7587b7b9402	1	Other	Other
+a42448e3-f637-4440-9b7b-583999a3b50d	1	Other	Other
+a42508ec-5c5d-436b-9ce2-f51f20c728ad	1	Other	Other
+a425597c-a398-4821-98cb-748f1ad49f9e	1	\N	Other
+a4256908-7e0e-4b46-832b-92a794b39220	1	Other	Other
+a4257013-7cfe-4df1-9229-3cf881cb80ad	1	Other	Other
+a4258867-c988-4ab5-b517-36aba7847c0d	1	Other	Other
+a425aadd-2454-4848-b27d-a19d42df0727	1	Other	Other
+a425af34-f910-4955-b02c-98b3ceb2afe9	1	Other	Other
+a4269006-3528-4f42-b601-6988c356948b	1	Other	Other
+a4269381-9a4a-4b6e-acc7-d6eb22079bc2	1	Other	Other
+a4269dd3-4fe0-41af-aaa5-136b9f147d13	1	Other	Other
+a426ae3b-1816-477b-b6f0-43d754395dcc	1	Other	Other
+a4270188-4993-4aa6-9523-8a4c52df7957	1	Other	Other
+a42770ab-17c4-45de-82ff-b02f54dece78	1	Other	Other
+a427842c-0510-4e60-a01e-1c37fef185db	1	Other	Other
+a42784af-5cdd-49b8-8fe2-9a5b7fc42b60	1	Other	Other
+a4279e15-00ce-43cb-a0cd-8d50dca7d064	1	Other	Other
+a427abdd-b6f6-40da-b13a-4f26a152e113	1	Other	Other
+a427cc81-5350-48e2-b4d1-6235d29299bd	1	Other	Other
+a427f1bf-916a-4bc6-81c3-58d34a3e8342	1	Other	Other
+a4283bfc-e6b2-4d4c-83d7-7c30f4ec33e4	1	\N	Other
+a428624f-d674-4564-ad79-89185ca601d8	1	Other	Other
+a4286a9a-e037-451f-b538-2fecf09bf1d6	1	Other	Other
+a428a3aa-76ea-4ae7-9708-095b960bfb2f	1	Other	Other
+a428a97a-63df-4c94-9d91-fd54ec32694a	1	Other	Other
+a428be7a-8bc2-4c8b-961f-ef9c0fd4185f	1	Other	Other
+a428c495-ecf6-41db-8dfb-9d811529ca91	1	Other	Other
+a42901ab-d1c6-4368-97ce-62c9094f603c	1	Other	Other
+a4294291-ec88-499a-9069-d0d52343e7d6	1	Other	Other
+a4294e41-9f22-4ab9-8d81-600b1bbc26df	1	Other	Other
+a42978f8-9af9-409a-be97-6fb3c27308a1	1	Other	Other
+a429834b-255a-406f-81cb-c34e2fc6a07a	1	Other	Other
+a429ee22-8b12-43c4-b374-505b3aa7fcc9	1	Other	Other
+a42a8232-3969-4b7a-a010-bd96a03b618d	1	Other	Other
+a42a9593-f364-49b1-b98b-6bd06a427b62	1	Other	Other
+a42abc6f-c3f5-48a2-a891-55e323ac64b0	1	Other	Other
+a42ad4ba-2e6d-4a58-bbfa-4dd035d3e328	1	Other	Other
+a42adf24-2706-48b0-ae67-c060603ca070	1	Other	Other
+a42ae3fa-7f1f-4636-943c-d08e067a5edd	1	Other	Other
+a42af487-43bb-412d-945f-f0b229f14345	1	\N	Other
+a42afabe-f96c-46b9-a86a-8cb702a52d46	1	\N	Other
+a42b6fa0-bf1b-42a7-8988-e811af2d2ea5	1	Other	Other
+a42bd811-a032-4fff-97f6-15680bf2855b	1	\N	Other
+a42bdecd-5d75-4e28-8b6b-8c65e95d7a3c	1	Other	Other
+a42bf033-7520-4d79-87aa-30b1353c11f1	1	Other	Other
+a42c0910-f97b-4cb4-bcfe-f854e8bb1abb	1	Other	Other
+a42c1b2f-03b9-43c9-8269-b2d310516d54	1	Other	Other
+a42c1d8d-42d6-4f41-9325-843c0487f12f	1	Other	Other
+a42cc4fb-c40f-4a8a-827d-600f611ef543	1	Other	Other
+a42cd207-9d8d-4934-9cb5-548982b818b2	1	Other	Other
+a42cdeed-47d0-4591-a8d8-4aeffc42c630	1	Other	Other
+a42ce3d7-e824-4920-8492-4b9497dc4b0b	1	Other	Other
+a42cf9f5-6f8e-40b0-8a80-048a631bb6ac	1	Other	Other
+a42d33f6-10af-45f5-ac44-cb961d8f74e3	1	Other	Other
+a42d646c-a576-4456-b963-29a56fff9573	1	Other	Other
+a42d8f15-569a-49c5-b873-7af74ec75c28	1	Other	Other
+a42d98ae-2bf3-486f-9023-bd47b8ce711b	1	Other	Other
+a42da17d-0f0f-4b9e-b2d0-0a1ac812d9fb	1	Other	Other
+a42da970-ad75-4d40-8023-b9b53f3763a1	1	Other	Other
+a42daf4c-b97d-4d37-9e23-e3ce2f66b062	1	Other	Other
+a42dc54c-d7de-477a-aa7d-a6a26d61db9b	1	Other	Other
+a42dc60a-fa99-45c9-bc6a-1e241da381d1	1	Other	Other
+a42dd3d3-8bf3-4a9b-8a9d-1402e3481298	1	Other	Other
+a42e2591-6ee1-4151-9f93-4fd772b8e750	1	Other	Other
+a42e738a-bbe6-43b4-aedd-8253758952ee	1	Other	Other
+a42ed37d-fdda-4d1e-817b-112386f036d9	1	Other	Other
+a42f3682-ee57-45a3-9b0e-2abd0924bb64	1	Other	Other
+a42fe914-71e6-4c74-8944-1a52d4311927	1	Other	Other
+a4300eb3-00ea-4619-ac93-54c58086f3d0	1	Other	Other
+a4304112-5525-4c0f-a672-7b64fe39e41a	1	Other	Other
+a430df03-656d-4652-a169-40bd77088b24	1	Other	Other
+a430f11d-b3eb-4008-b2c2-d1716d311f40	1	Other	Other
+a431008c-0172-4810-9087-120858ab2f64	1	Other	Other
+a4310e8b-3893-497f-a963-2d666f15e60d	1	Other	Other
+a43145cf-cb64-4370-b1a2-6482c98c9e96	1	Other	Other
+a43171ea-9110-4601-903a-73c03a6f80f5	1	\N	Other
+a43182ae-c49e-4afc-a2f6-5cab31e4d1d7	1	Other	Other
+a4319d02-59bf-4b16-9fc1-fc90f38cd355	1	Other	Other
+a431d1dc-cb90-40e2-bdc3-87489c9db887	1	Other	Other
+a431f243-4e42-4979-9cdb-ba1d6e4e6afd	1	Other	Other
+a4323788-8a0a-4961-bc1b-bb997230936a	1	Other	Other
+a4334fee-49d1-46d5-9b9a-39275c49e7cf	1	Other	Other
+a433b284-e1d1-4b85-adc5-456841ba18dd	1	Other	Other
+a433e6ad-25b0-4f15-acbf-c0ca1786ebaa	1	Other	Other
+a433ee73-762e-44c2-b403-db2943bb327a	1	Other	Other
+a433f260-de40-4d78-9914-76b929643912	1	\N	Other
+a4343475-cc86-4468-8174-7a157fda6ff0	1	Other	Other
+a4343a03-9a57-4f58-bb5e-3433c0cd21da	1	Other	Other
+a434bc40-d966-4a57-abcb-2f8b5b930f7b	1	Other	Other
+a434d6b8-5aa0-4d0d-90bf-b16a49575a47	1	Other	Other
+a4352a6c-a2b1-4e9b-a745-5a92b685d359	1	\N	Other
+a4352c9e-f4c5-4f82-9702-d493e7008b4d	1	Other	Other
+a435302e-105d-477b-84ef-6dfc02dc2680	1	Other	Other
+a435342c-0be2-444c-8c77-0a858e00020c	1	Other	Other
+a435578d-0ef5-45ea-a2c4-825bb6803a99	1	Other	Other
+a435683c-7071-427c-909d-c3e3206eb12e	1	Other	Other
+a4356cab-a6c3-4b4c-b04a-154bbe9a2880	1	Other	Other
+a43583c7-c7e8-4302-b652-fbba4a460979	1	Other	Other
+a4359c3e-9be1-4783-8e1c-777f887e3270	1	Other	Other
+a4359ebc-1544-4472-9e2c-9c047c11a351	1	Other	Other
+a435cde4-0f13-4ee0-b167-b20da7da4db6	1	Other	Other
+a436296d-d8c9-40d7-beca-6c77ad2ca121	1	Other	Other
+a43634e4-c500-4441-9540-f26c4b228d02	1	Other	Other
+a4363e53-65d5-4c63-b098-f4a73a923bf8	1	Other	Other
+a436585a-1ff6-4035-aaa8-c63daeb8b345	1	Other	Other
+a436e826-6cbf-4e7f-b2f9-7c5b43403e4c	1	\N	Other
+a436ec46-0779-40de-be73-a1ca187d09d8	1	James	Other
+a436ec4d-9ef5-4def-8803-a503d12e473d	1	Other	Other
+a4370cbb-d09e-4c2d-90b3-97f0e3f7267a	1	Other	Other
+a4373ca0-642f-45cb-9a3a-fbe2b7335c7d	1	Other	Other
+a43740af-6635-4340-a62d-49b0ae09f124	1	Other	Other
+a437b226-37da-4324-b799-10defee2916f	1	Other	Other
+a437b8a4-202a-42c5-b4c5-9e79994feb00	1	Other	Other
+a437dfb3-087a-4c87-9a12-db22defee841	1	Other	Other
+a4384093-9d09-4c72-8f28-8b09f12bcb67	1	Other	Other
+a4384ae8-f10d-41b6-af5a-0650d3170c9b	1	Other	Other
+a4385a22-dd3b-481a-92f5-a104f6756db7	1	Other	Other
+a4389ede-9fee-4d33-8e0d-27bf6374ff44	1	\N	Other
+a438ce69-473a-4f6e-ac34-7e7dc10dbde7	1	\N	Other
+a438f357-f69f-4cae-af32-f201f7e2f77a	1	Other	Other
+a4392600-ac2d-47ee-a3cb-972a8923c900	1	Other	Other
+a43937ce-1cf1-420f-8719-63f53700fc44	1	\N	Other
+a4393b09-fa32-4d87-9308-d590d0239200	1	Other	Other
+a4394064-84c7-4f3d-9ad8-375ece6e80e1	1	Other	Other
+a4395945-cd15-4507-96c8-39d9c16842c5	1	Other	Other
+a439833f-c02a-4c19-a749-eec346b94101	1	Other	Other
+a439b185-9d26-474f-8de9-510bd984bdae	1	Other	Other
+a43a65da-5ac9-4fd3-953f-32cdcd88e12a	1	Other	Other
+a43a94ab-a536-4e38-b5c0-de366b09433f	1	Other	Other
+a43a9e0d-8c92-4a5d-a03e-6490502923fa	1	Other	Other
+a43adf19-3af7-42b1-958d-c153f21ef291	1	Other	Other
+a43ae730-8b2c-4381-bb4b-8a9b7ad60f02	1	Other	Other
+a43b02f3-c31c-4605-8a8f-dc49a4465ce9	1	Other	Other
+a43b2fd2-a9fd-4bbc-94a2-c11f505df7f7	1	Other	Other
+a43b3a56-df69-4fa5-870e-6ffd3d2c6b9b	1	Other	Other
+a43b606e-8ebd-417f-a51f-00c550866dca	1	Other	Other
+a43b8409-72c0-4be8-ac5c-f1bd3b4f4bb9	1	Other	Other
+a43bce09-34dd-45f1-b6f0-114cf3275806	1	Other	Other
+a43bcf05-ba7e-44a0-ae56-a6ebdd37a0e1	1	Other	Other
+a43bed20-c8e0-44b1-b807-5eb7be4a7769	1	Other	Other
+a43c2fe2-423b-4bfe-8344-76b61f8eadb3	1	Other	Other
+a43c3237-3b6b-4d96-8381-9befeada962f	1	Other	Other
+a43c52a3-697f-4f16-ad85-3d0f9cc1568a	1	Other	Other
+a43c54ee-563a-4619-82be-ce89d63453ea	1	Other	Other
+a43c5538-e971-4bf4-8486-6c579ed359e3	1	Other	Other
+a43cc6a1-8d1b-45c5-8e1d-a4539df90e30	1	\N	Other
+a43cd1ea-25ca-4095-b3dd-0f35f86a706a	1	Other	Other
+a43cf6f5-809e-467a-b26d-cd5d2b211b14	1	Other	Other
+a43d08f7-6b2d-4d9f-81fb-5ea25a5812c4	1	Other	Other
+a43d18c6-9b73-4b68-aea0-c1fc120a6709	1	\N	Other
+a43d5a8b-15e9-4668-add4-45fd658690b9	1	Other	Other
+a43d7047-0055-4623-beaf-80a548187913	1	Other	Other
+a43db030-a5a1-46f0-bcf8-e1dc44672205	1	Other	Other
+a43ddfa8-95be-44a8-9b13-a6f260ec473f	1	Other	Other
+a43e13c0-6c89-4d91-8ba7-aa7753085844	1	Other	Other
+a43e4114-30eb-451a-8547-01b5a46a5e2e	1	Other	Other
+a43e4a89-a1ec-4042-a49b-a0da7d9eaa76	1	Other	Other
+a43e4d4a-957c-4a11-8aac-23ad1dc1a8c6	1	Other	Other
+a43ea437-97dd-4cc1-bfac-6d716c098324	1	Other	Other
+a43ec159-3cd7-46b5-b65f-f94cb3176695	1	Other	Other
+a43ee0dd-9723-4723-b28b-789b30fb4ffe	1	Other	Other
+a43f150f-dda6-4b09-a52a-45fac07d1a76	1	Other	Other
+a43f5e72-fcff-4bc2-bf93-5b00705a015f	1	Other	Other
+a43f66e1-2405-4b38-88c1-7e62583ccc00	1	Other	Other
+a43f7ccf-f752-43fc-ac92-c86ff9344735	1	Other	Other
+a43f8d9a-d18e-4ee6-a058-a9b36d11d799	1	Other	Other
+a43fd7dd-cf47-44e4-b140-17bbfb8c0714	1	Other	Other
+a4400aaa-6ebb-4d38-9c4c-106dfd633d1b	1	Other	Other
+a4400b1d-dd5e-442b-8ce5-f51f7d01f12c	1	Other	Other
+a4401128-c9c8-4a79-8d0f-3a06a4afdd3e	1	Other	Other
+a4404563-6d82-4b47-a944-6f7cba70fe83	1	Other	Other
+a4404931-8385-4a45-b6c0-aec5f5ccb2fc	1	Other	Other
+a4404cc6-4e2c-4e8b-9ceb-f8ff269ae061	1	Other	Other
+a4409775-515a-46a9-8c98-a6c485860419	1	Other	Other
+a440a258-e292-4634-aae3-836d0518f290	1	Other	Other
+a440a579-ebc7-449c-96ef-5219968bdc33	1	Other	Other
+a441218c-292e-4fea-9b4b-4cbbc2ac363c	1	Other	Other
+a4412b88-907f-4582-961f-6775f25f39b5	1	Other	Other
+a44144b1-0bef-4f2f-8b81-05977dfe0eb6	1	Other	Other
+a441972b-c4bd-4332-9ae3-b8d31b3b11ca	1	Other	Other
+a441b71e-e13a-49a6-9e5b-c28698ae9ff9	1	Other	Other
+a441eda7-869a-468e-8d7a-6efa1ca02b31	1	Other	Other
+a441fe44-e824-4faf-958b-610ffe167a57	1	Other	Other
+a4420ddc-5ddb-42b4-af0c-5f98212449b5	1	Other	Other
+a44219d6-3c5c-4fff-a748-65bad3457232	1	Other	Other
+a442664b-2c62-4413-8dd2-d2b0f9b0973a	1	Other	Other
+a442eeda-ed40-4041-9279-2b9acd04fc48	1	Other	Other
+a4440774-2b18-11e8-bf1b-fa163e8624cc	1	\N	Other
+a4443fe0-9346-4196-a005-a1c94e381368	1	Other	Other
+a4447d8c-7328-4fcd-9316-84c370a05ab6	1	Other	Other
+a4448dbd-1682-491b-bd69-792660dfe190	1	Other	Other
+a44496a0-165c-4cc3-9f18-3a204e25e0d0	1	Other	Other
+a444d2fd-bedf-4e35-8a53-37319651febb	1	Other	Other
+a444d7a0-5f94-41d2-bd7a-3de32640d0d1	1	Other	Other
+a445044d-75e5-43ec-9df1-f4bef48917c3	1	Other	Other
+a4453fc8-aace-493c-a08f-1fc889be3527	1	Other	Other
+a4457c99-6264-44c5-88d2-5dbcd16fbf0a	1	Other	Other
+a44592dc-7dc1-4f2f-a526-96a6e39ae6cb	1	Other	Other
+a445b06f-a52f-43db-bf86-b64673c7863e	1	Other	Other
+a445dae1-633e-4963-8b27-fbe706ef33a5	1	Other	Other
+a445ec3b-bab2-4419-a3af-efd64851aec7	1	Other	Other
+a445fce3-f8ed-41bc-acfc-c25c0e615581	1	Other	Other
+a4461a45-c7b2-406a-a9ab-4a8bdd7c95d4	1	Other	Other
+a44663f9-243d-403e-be73-9a48b4e9bf96	1	Other	Other
+a4466f77-6554-4db3-be42-894f69754f3e	1	Other	Other
+a4469682-bd3d-42e9-8b79-f5b742f20379	1	James	Other
+a4469fd5-b14f-402e-b8a6-68a9b627d181	1	Other	Other
+a446b4f6-4d02-4ef6-bba7-8b810966d5ef	1	Other	Other
+a446b53f-2ced-4041-90ee-f032767c77c5	1	Other	Other
+a446d028-8800-4cb9-9b2d-d227a8e29811	1	Other	Other
+a446f26c-e253-49bf-97f9-7c6b12255e9c	1	Other	Other
+a447844b-d11a-451e-adb2-df158827b340	1	\N	Other
+a4479849-685c-4d3d-9d59-345c3ccdb613	1	Other	Other
+a447a9e8-59f6-4336-840b-c28fd9084ec0	1	Other	Other
+a4484f4d-aff8-4749-b335-a96396cb0a0d	1	Other	Other
+a44861c0-f6b7-439f-a8ad-382f35bda748	1	Other	Other
+a4487744-c5d1-40b8-831a-cfbee331864e	1	Other	Other
+a44897fc-49a2-45cc-a262-ea69a58c8ead	1	Other	Other
+a4490529-33cc-49a5-80e8-d5106549ea53	1	Other	Other
+a44906ab-dffb-483e-9d92-02da2f0fb8f0	1	Other	Other
+a449ed5d-d273-4db5-bfbd-1fe58f1a248f	1	Other	Other
+a449eded-3140-48be-9efd-27e2726d280b	1	Other	Other
+a449f2b4-d019-422f-9b1a-80cd57aaab2b	1	Other	Other
+a44a0d91-daf3-4d21-bd29-4a3a1cb289ea	1	Other	Other
+a44a0fc9-b4c3-4ea6-9991-6d45b237983c	1	Other	Other
+a44a2ebd-7842-4a7f-9dd4-908c92d4c729	1	Other	Other
+a44a4da7-392a-41b0-bbe3-7cb426c7c193	1	Other	Other
+a44a5104-0fe1-48f1-95f2-6fa2c3c5a9ca	1	Other	Other
+a44a6383-b267-4a53-b4a8-86a68845f8c7	1	Other	Other
+a44a6612-5f0d-49d7-829e-e84cd3296317	1	Other	Other
+a44a8e30-504b-4aaa-9732-3a278ddf8a8f	1	Other	Other
+a44b099a-34d7-4e64-96d4-aa9c9ef355b8	1	Other	Other
+a44b60a1-a129-4f04-81d2-64f7240b81c3	1	Other	Other
+a44bdb75-e09e-4b4b-954f-4a3eef4ff658	1	Other	Other
+a44be5fa-630a-44de-adbc-f84697f50a26	1	Other	Other
+a44c81ce-2140-409e-883b-f133c91ab805	1	Other	Other
+a44cc40a-12a9-4ad1-b27e-3c49cb2d91bb	1	Other	Other
+a44d1f7b-e0a3-454e-a62c-2fe25decd59e	1	Other	Other
+a44d21ef-1297-433b-916c-97ef8f63d717	1	Other	Other
+a44d6353-b590-4b82-8eca-80596f70d451	1	Other	Other
+a44d7995-5893-43c1-8cda-efb438dcc2bb	1	Other	Other
+a44d9e74-34ca-4e66-9c02-b666fb4f0890	1	Other	Other
+a44da1c9-0901-4a20-8da6-2dfcbd32ac75	1	\N	Other
+a44dd52f-cdaa-4084-b931-32bcb9961c79	1	Other	Other
+a44ddb0f-a89c-4ab5-9e05-1b0801cd3201	1	Other	Other
+a44df2bc-d88d-4152-a696-44a023eefaca	1	Other	Other
+a44e30f3-8a5b-449e-b7cd-9c86cbb120b3	1	Other	Other
+a44e7dfc-1749-4a5a-9cf5-6bb5461b704c	1	Other	Other
+a44e858c-45fe-45ff-8b25-f80d4518d3d9	1	Other	Other
+a44ea808-6d16-47f2-9ca1-1004aff73172	1	Other	Other
+a44ed8f8-4c24-420c-9c31-af67575b0cd6	1	Other	Other
+a44f04a1-a16f-4859-b6fe-437ca60edfec	1	Other	Other
+a44f80d3-1430-4211-9add-470e49b970c4	1	Other	Other
+a44f92f8-ed46-45a4-8229-0f55ecde5e77	1	Other	Other
+a44fa7e6-b509-446b-9f67-450b2fa13a57	1	\N	Other
+a44fc28b-1841-4284-9acb-aadf50fd1563	1	Other	Other
+a45017fd-e4d2-468f-96e5-207652eb5807	1	Other	Other
+a4503a17-73c4-447b-9fef-9e8c70461a7c	1	Other	Other
+a4504cf3-ddbd-4d02-b0da-38ca0ba8c659	1	Other	Other
+a4506d60-0190-4c45-8896-5d0b4b9c3313	1	Other	Other
+a450d734-5bc0-4a03-a0bd-22aaaa2aecfc	1	Other	Other
+a450e350-962f-4724-b6ef-ac3c0c16a520	1	Other	Other
+a450f029-f1c5-4ff5-88e0-5e455e37dcef	1	Other	Other
+a45127fb-6811-48da-a33f-02ed91f73450	1	James	Other
+a4513a2c-d8e5-4b53-9cb4-a0309b48a420	1	Other	Other
+a4514387-e45a-4ab7-84e2-6ddc630fd248	1	Other	Other
+a4514f87-a07c-48c7-a120-2209c460f3bf	1	Other	Other
+a451697c-0e06-46fb-a81e-db3f1fd53498	1	Other	Other
+a451c878-841d-4232-a532-c299e813803e	1	Other	Other
+a451f790-4139-4102-a06f-39cdc4bedebf	1	Other	Other
+a4521f52-091e-4693-8cd1-398bba2a7ce6	1	Other	Other
+a4524613-7c28-40eb-897f-22460fe60943	1	Other	Other
+a452e1d9-37c5-45a2-af3f-d4f6a74055fc	1	Other	Other
+a4535bb3-d077-47c5-84c3-173d008dcb9c	1	Other	Other
+a4536d5f-96b3-48a3-b9c4-ccbbc4eafd9a	1	Other	Other
+a45372c2-0a4a-4058-bacb-f72ef3d5e358	1	Other	Other
+a453d88e-1860-4a58-81e8-7945f148eb36	1	Other	Other
+a453f32d-b6bc-4170-93fb-8f0a0fe45aa3	1	Other	Other
+a454009c-0b56-4c67-ae96-27eed2858314	1	Other	Other
+a4545525-1bfe-4b91-ab7b-149d4b66f0b8	1	Other	Other
+a4547ab5-0752-47e2-8e31-c5ca00611403	1	Other	Other
+a454848b-f314-4c51-bc87-5740111d5624	1	Other	Other
+a45489f4-e54d-4181-bb17-8fb491ae12f4	1	Other	Other
+a454f411-8f9d-4cdb-acc2-a89f4d3ae306	1	Other	Other
+a454f519-ee35-4666-88d0-ab40b78b0356	1	Other	Other
+a455224a-b854-4208-a80d-e25729834aa1	1	Other	Other
+a4560e67-d064-4331-88fe-472e2e849ac7	1	Other	Other
+a4566a3f-2647-48bf-8417-0a1a0a00d07f	1	Other	Other
+a456fb04-7b44-4c9a-98ff-0bde989cf259	1	Other	Other
+a4578a2e-9c25-4f81-b85d-5973e2e1c899	1	Other	Other
+a457d5b5-e359-411d-b9dd-a05e96245b29	1	Other	Other
+a457de25-6fa7-4ef8-b595-0fd10ccedcec	1	Other	Other
+a4583591-942f-4296-9b5a-a624545ff7e3	1	James	Other
+a4584bca-ce56-4063-8ce9-2f27e42cad27	1	Other	Other
+a4588d0f-b984-4256-8ab9-534f6ec47fb1	1	Other	Other
+a458fb3d-e21f-4d4e-a235-3cd5268b95be	1	Other	Other
+a4590506-175a-439c-bd88-3c9c1ab347db	1	Other	Other
+a4591282-a93b-43f9-8d9c-38436d7dd3a0	1	Other	Other
+a459e450-ac03-4d9c-8a42-ad809f9fee63	1	Other	Other
+a459f5fe-caa9-11e7-9f82-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a459f760-72c5-476a-a1f4-ef2b3dfee67a	1	Other	Other
+a45a09a2-901c-4992-9ede-f30dda1129bc	1	Other	Other
+a45af355-f42f-4245-8d24-0c50ef240e32	1	Other	Other
+a45b017a-7f77-47a6-8cc6-d52a2f5c4f22	1	Other	Other
+a45b0dc8-d5c9-4290-8a72-f6d000fdc627	1	James	Other
+a45b1e93-2581-41ef-8433-63a0730c7ac3	1	Other	Other
+a45b4342-b798-40c5-9c45-58108373c31f	1	Other	Other
+a45b69e1-13d2-40ea-8071-8073d169972f	1	Other	Other
+a45b6c10-55a8-4815-85a8-2cad73c7f01b	1	Other	Other
+a45b9c64-bb01-4f45-ae68-77f96cb4ee20	1	Other	Other
+a45bc209-e084-4cc3-ad5d-e56c9bd66335	1	Other	Other
+a45bd1da-7dbd-4d5c-9d02-f1be73211117	1	Other	Other
+a45bdc1a-6914-4029-a02f-e11497d83446	1	Other	Other
+a45c184c-2f0b-4ddf-a38b-410ecb77633f	1	Other	Other
+a45c1c9d-6e66-49f8-8f23-dd466692e44b	1	Other	Other
+a45c2ae3-532f-45b2-b082-62322494707f	1	Other	Other
+a45c68f4-6932-4ce6-b9f2-d136afbe870f	1	Other	Other
+a45c84fa-76ef-43c1-9830-c1e6a6e66480	1	Other	Other
+a45c9052-5956-4e5b-8913-61867fc982bd	1	Other	Other
+a45cc77d-d493-4a0c-83da-8e0b182fb4ec	1	Other	Other
+a45ce363-872a-404c-907a-494f32c04705	1	Other	Other
+a45cfc7e-3443-4d6a-9d7f-19ce180bb311	1	Other	Other
+a45d1f19-ad48-4743-b99f-0d6e14996be6	1	Other	Other
+a45d3726-ccc4-4edd-83d6-b7191e4e8a17	1	Other	Other
+a45d90fd-3720-4e9d-8104-46e97910b1a6	1	Other	Other
+a45da850-14bb-4191-8483-5a6431dff360	1	Other	Other
+a45dd386-78ec-4699-bfac-7574ac291168	1	Other	Other
+a45dffc8-96e3-42dc-aa90-ff296cb9f3e0	1	Other	Other
+a45e008c-80c5-4766-b003-2bc00d086620	1	Other	Other
+a45e5a62-0542-4d00-a3d2-33b00eb9f669	1	Other	Other
+a45e741d-7b94-4099-8fcb-5de612601dc1	1	Other	Other
+a45e85b5-16aa-43f0-81ae-668c98952533	1	Other	Other
+a45ebb20-9e68-4f24-a8ac-7387c4c819f2	1	Other	Other
+a45f9c51-7103-4c24-93ab-059b6b2eac2e	1	Other	Other
+a45ff07f-149c-4f25-9bf9-e188c5a9fffc	1	Other	Other
+a4603e13-72a9-479a-9917-7c06c0af9f09	1	Other	Other
+a460473d-ed13-4cd5-89a2-2fbcb0575c8d	1	Other	Other
+a46082cc-6555-4951-88e0-c35d8a03f209	1	Other	Other
+a461010a-c4d9-4ce7-82cc-5de39bbe1c17	1	Other	Other
+a4610e14-b817-45eb-a8ad-06cecc29c90c	1	Other	Other
+a4613d54-c932-47f3-8992-f7938b96f2a1	1	Other	Other
+a4614d3b-5be6-47dc-b44b-ca43981674d0	1	Other	Other
+a46169c3-dfbd-4217-99cf-526af6c3d587	1	Other	Other
+a46173c3-8343-4c82-a145-5886c09b2864	1	Other	Other
+a461b0c3-6a90-4c04-a021-35348a8aebfd	1	Other	Other
+a461c563-577a-4a1c-a21b-192c13e70e5d	1	Other	Other
+a4623893-6e97-4c29-aa77-9f661af55bd6	1	Other	Other
+a462780f-2a62-479c-a543-2ed931381350	1	Other	Other
+a46292f3-7e13-4e66-8330-44071f173b35	1	Other	Other
+a462b545-8ebf-42ca-a462-e2af29e63812	1	Other	Other
+a462c0d1-c1e8-4528-b931-8de7639cfe78	1	Other	Other
+a462f166-eb1b-4f12-9a21-51d8c3c204f3	1	Other	Other
+a4630372-67c1-4d70-96ca-dc3dc141d4fd	1	Other	Other
+a4632fde-6dbd-4fbf-86f4-24b982a510d1	1	Other	Other
+a46334d4-7b99-4685-8bdd-f75c8d18ed48	1	Other	Other
+a4635f40-3106-47bd-a444-686195ede43e	1	Other	Other
+a463ae88-bdfb-4549-bd76-9c52866bc83e	1	Other	Other
+a463f8dc-5acb-44d2-8603-ed78d5ac9bec	1	Other	Other
+a4641ed7-aa82-4096-b934-6430a8169e69	1	Other	Other
+a4642449-bbfe-429d-b804-ef5b34f8ff55	1	Other	Other
+a46427c4-8f23-4a38-82b8-a3d222b381d8	1	Other	Other
+a4642bf4-50cd-49c9-9800-4d8530025cbb	1	Other	Other
+a46462ab-5917-4512-a154-821cc0431a8e	1	Other	Other
+a464a6a1-6653-4333-9741-298a2046d394	1	Other	Other
+a464fd9a-2202-40c0-9de1-35b1ba1bb371	1	Other	Other
+a465073d-9d8a-40bb-99fc-4bfb1b56f36b	1	Other	Other
+a4657755-846c-48e3-a969-43c59c56bdb9	1	Other	Other
+a465b42a-3c9f-4dc9-bb9e-fe92c93e4f32	1	Other	Other
+a46615fd-6ac1-4c2d-b611-948eda72797c	1	Other	Other
+a4662c96-8bd1-450a-b137-03906fbd7983	1	Other	Other
+a4665e15-bbf3-4625-85a5-7ea0b99869ec	1	Other	Other
+a466ae1d-ee3b-4080-9991-c82736c85436	1	Other	Other
+a4671adf-2bd0-497e-892e-e23d4f0483cb	1	Other	Other
+a4672a2a-36ae-4ecd-9c18-f85e86c88a94	1	Other	Other
+a46760b6-9497-4fe3-a14d-d9659f13461b	1	Other	Other
+a4676885-6db3-4a37-b525-3d80840920a9	1	Other	Other
+a4677301-5ab7-4b73-94bc-9d8bbffcc42a	1	Other	Other
+a4678e2a-1f7d-4d64-9ea3-5e18dfc02705	1	Other	Other
+a4679e9e-707f-4871-921e-0c14246149b6	1	Other	Other
+a46820c3-a007-454d-bc8c-c6c1bf22e188	1	Other	Other
+a4684380-e939-4a85-bfc9-c46339e89b9c	1	Other	Other
+a46854e3-de7f-4cd0-bbb8-1d6e19657e35	1	Other	Other
+a46879b5-2824-4424-8e62-bdc4f67861d2	1	Other	Other
+a468d374-b047-4529-b1ad-3a3838ebcafa	1	Other	Other
+a468d45e-1843-4fd2-a342-30db71e64ef6	1	Other	Other
+a468e2fc-29c7-4dbd-a0c7-eddd60fc3b28	1	Other	Other
+a4692b91-b5d1-4199-915d-3273b5d4085d	1	Other	Other
+a46957a9-6e3b-4eba-b0ef-9b9abb6899af	1	Other	Other
+a4696397-b5be-4a0a-895a-69427490c200	1	Other	Other
+a469c5ed-86c2-4755-93f2-8bbefdf2eaf9	1	Other	Other
+a469f5db-cc38-4c92-ad47-a4736e708d56	1	Other	Other
+a46a7f05-a4b5-478c-888a-7bef8deccb04	1	Other	Other
+a46a8246-a563-4026-a9ff-3fb4baef4a66	1	Other	Other
+a46a8555-511e-4f32-93d7-3372431817a3	1	Other	Other
+a46a8580-9235-4e15-9ef2-a530229d4194	1	Other	Other
+a46a8d03-7754-42b5-9720-86736f11520a	1	Other	Other
+a46ae916-53a9-4fe4-aeae-26031fbbfd5a	1	Other	Other
+a46b2a34-fad5-4965-a36a-e1301759f987	1	Other	Other
+a46bb521-d248-4be4-aeea-07bef20c0aa2	1	Other	Other
+a46c3eba-1dfc-4efd-b018-e07bf4ec8673	1	Other	Other
+a46c9a5f-073e-4836-9d10-7105685693d2	1	Other	Other
+a46cde2c-23df-45fd-b6d7-ba15e1d65505	1	Other	Other
+a46ce0c5-d47b-49dc-bd03-5ccc06a8f219	1	Other	Other
+a46d7374-f934-4dcb-b180-9749e570c1d1	1	Other	Other
+a46d9c7f-3acd-403f-a862-41268e520fc6	1	Other	Other
+a46da5ef-8546-4151-9977-afad8ce025ae	1	Other	Other
+a46dbd3f-f29c-4ae6-b0c2-fe467dfece41	1	Other	Other
+a46e19e0-6bf1-443a-a07d-87ec737f7c5d	1	Other	Other
+a46eae7e-6275-48d6-aaf7-5c68899931cb	1	Other	Other
+a46ed7db-e107-4215-9f47-1f2c3ba95505	1	Other	Other
+a46f2724-ac44-4563-a889-c1c43923f368	1	Other	Other
+a46f6cc1-936f-45aa-9890-b44bf9ca6243	1	Other	Other
+a46f7e12-6d8b-4a6d-a5f4-2fe631569fec	1	Other	Other
+a46f7fcc-94ab-4a8e-a52c-546e495ab357	1	Other	Other
+a46f8575-1ecf-430a-ac7f-3ee7224fde0f	1	Other	Other
+a46fd81c-263f-46e2-ad34-b566a0e7adc8	1	Other	Other
+a46fde31-95eb-4507-9281-7fddbae6b87b	1	Other	Other
+a46ffb02-3276-4948-827f-52a6674b49c7	1	Other	Other
+a470352e-8108-402f-a983-fb6f943c6f6d	1	\N	Other
+a4706ed1-a4e3-43ac-9e51-88a84c698405	1	Other	Other
+a4707077-81c3-4219-884c-9df326f1b8d9	1	Other	Other
+a470c4b1-53c5-431c-98a3-5bcc9559f802	1	Other	Other
+a470cb9b-38b0-42a6-a21c-ec12029dfaeb	1	Other	Other
+a470fe65-685d-4fbb-ac81-3a375c8da961	1	Other	Other
+a47123a4-2a9a-48cc-8419-36a6025b4fd3	1	Other	Other
+a4719233-1c9f-49f0-a428-84cafe1459fa	1	Other	Other
+a4725542-7a88-4bda-b807-fc834175a3b4	1	Other	Other
+a4725b15-9ab9-41b5-91ce-3111102618ed	1	Other	Other
+a472bc19-4aa0-41ab-ac6a-4d30df68006e	1	Other	Other
+a472d546-6389-43a7-816b-02fb05f49255	1	Other	Other
+a472e131-220f-42a5-8bdb-999c852dedd4	1	Other	Other
+a4731f51-a7cd-421d-9546-1a82f67e224b	1	Other	Other
+a473896c-b279-4b2f-bf7a-b16c39018dfa	1	\N	Other
+a473f881-30f5-4f2b-9c5b-173b4eabcecf	1	Other	Other
+a474307e-cfc5-4227-b779-664cf1654227	1	James	Other
+a4743f41-a16e-4abc-9f74-63950d2e1380	1	Other	Other
+a4745fbb-1676-4a23-8d29-ecc3125f4237	1	Other	Other
+a47496bb-3b9f-4c42-adfc-4d4b229255e1	1	Other	Other
+a4749bd3-461b-4a86-b744-5ea562d8bddf	1	Other	Other
+a474c87f-5c0b-4d96-905f-fe2627277942	1	Other	Other
+a474ec93-1acf-4f23-be3a-9265e26bc750	1	Other	Other
+a4750790-454f-4748-8fb6-ca0e1e93ed42	1	Other	Other
+a475341d-0b70-4d62-a16d-4c73aec35100	1	Other	Other
+a4756c9e-0cea-4089-b5b2-43048571f205	1	Other	Other
+a4756f5d-9f80-454a-b4fa-76354a23111e	1	Other	Other
+a47579df-d8be-4825-8975-943448cdc03f	1	Other	Other
+a475870c-1eb0-449c-94fc-bed71f75a81f	1	Other	Other
+a4759206-1a57-4bef-bf5e-f3becf8bd15c	1	Other	Other
+a4763956-f027-49cf-9d4b-41392621613a	1	Other	Other
+a4765cdc-b17b-429f-8662-77fbd288367b	1	\N	Other
+a4768c87-cebb-41c3-900b-35a036b886ec	1	Other	Other
+a4768d28-bc86-44da-b0fb-66b57179af14	1	Other	Other
+a4769f38-bd47-4f78-a3c2-9f1fcc162518	1	Other	Other
+a47717ab-23c6-4491-bee8-ace919bca7f1	1	Other	Other
+a47734e7-e012-4069-8d1c-d516968e19fd	1	Other	Other
+a4774100-8497-4090-a3f7-c639757a59e4	1	Other	Other
+a4774f36-1d92-41a6-b308-7a3d6091eb4c	1	Other	Other
+a477adf4-508d-40cb-82ec-ed2998a21c1c	1	Other	Other
+a477cf6c-820b-459a-8f5f-91119fa2f7bc	1	Other	Other
+a477f758-25f4-4763-80d8-c369f245b439	1	Other	Other
+a477fa77-1b2f-4eb9-904f-b5c2c76811e7	1	Other	Other
+a47810d7-21b2-43e6-9e45-160b40e461b4	1	Other	Other
+a47866b6-855f-499f-9614-1dc725640160	1	Other	Other
+a4787a3f-101c-44fb-a015-976f68ed8d42	1	Other	Other
+a4787ac6-0f7d-46fd-937c-c82da064f0c5	1	Other	Other
+a4794924-3110-4b81-8ec9-df8c354f7f31	1	Other	Other
+a47961b6-ec57-4f5f-bfc3-4975fe12db49	1	Other	Other
+a47968e1-2aca-4d32-9464-04a320cd9c6a	1	Other	Other
+a4797671-cbbc-4c0f-9e54-3ab99e3b731c	1	\N	Other
+a4799b10-8e85-47f2-8b04-d5375d681efd	1	Other	Other
+a479bfd0-9a6a-4013-ae99-594116177205	1	Other	Other
+a479fd60-7a15-4f27-8ad8-48156d69c1fb	1	Other	Other
+a47a20e4-6e26-4f8b-9db3-2550f2c5af4b	1	Other	Other
+a47a3a35-5fc3-43a1-92ff-411a570e17d0	1	Other	Other
+a47a4efd-9ee6-402d-aad0-21377d910465	1	Other	Other
+a47ab89b-cb0c-4d22-a5be-cfe67a4ca83c	1	Other	Other
+a47b366c-5d8f-437a-9da2-d995f131b78d	1	Other	Other
+a47b5b59-b78f-49c9-a4c9-9ab9eb74c65d	1	Other	Other
+a47b724c-f344-4657-a817-a89bd273a0e2	1	Other	Other
+a47ba04c-08ac-488d-bb0b-ae5c59fcce4d	1	Other	Other
+a47bb002-bf46-4bd8-91f0-a6ba8fc2f995	1	Other	Other
+a47bc545-b335-48c7-b7eb-e5f795876e1c	1	Other	Other
+a47bccfb-401d-43c8-8d62-0f5050450745	1	Other	Other
+a47be709-b1db-4d8b-a741-0ee1a3609139	1	Other	Other
+a47bf558-73a4-447d-aa48-9c721318c733	1	Other	Other
+a47c289b-800b-4a72-9438-a0a840943357	1	Other	Other
+a47c538e-5ef5-4d54-a8ed-02a011eee456	1	Other	Other
+a47cad22-936e-4a10-b95f-160992b87cb2	1	Other	Other
+a47cadf9-fca8-4785-907a-ce0d43907736	1	Other	Other
+a47cfaf8-956f-49c0-9e60-2088a3f91046	1	Other	Other
+a47d0bb5-92cd-4422-aea6-5a657321cb19	1	Other	Other
+a47d4e58-f51d-4622-9ea9-9f4127351cc9	1	Other	Other
+a47d8c1c-cf56-4a5f-9689-6804c6ec30d5	1	Other	Other
+a47daa0b-f54f-4e70-aafb-e418f2fba3e4	1	\N	Other
+a47dd838-4cd0-4019-8dc3-f2cb441738ee	1	Other	Other
+a47dee81-b775-4ffc-8348-e8f4be98f00a	1	Other	Other
+a47df278-542d-4857-8fc3-2bdb58e5ef29	1	Other	Other
+a47e08c9-afa1-47fa-8eec-024ce69a0917	1	Other	Other
+a47e3d38-ad3b-4c52-838d-6d24212df937	1	Other	Other
+a47ea79c-b7ae-4426-99a7-6fbecf2f96ad	1	Other	Other
+a47eb271-e43a-41cd-8d1e-2da74126f049	1	Other	Other
+a47eb4b9-f04a-422c-913e-1c2a9429511d	1	Other	Other
+a47ed0fd-8099-4e40-a452-8e59c9249887	1	Other	Other
+a47ee418-3a48-4030-9844-bdb80d526fca	1	Other	Other
+a47f2798-975d-4c33-9248-c8fcca7d09c4	1	\N	Other
+a47f4f4c-4f1b-4100-8a0d-801ff2160e67	1	Other	Other
+a47f5d31-ccca-48b7-83f7-25d27fe6c207	1	Other	Other
+a4803b00-e3c9-4c66-9c61-9413cb45727e	1	\N	Other
+a4804efe-f45b-4dac-be71-008a099d4ac6	1	Other	Other
+a4808840-2cbf-4403-a268-6859568349a5	1	Other	Other
+a48126a4-8418-4224-8e90-919c36f6095c	1	Other	Other
+a4813901-e92d-4fdf-ad26-15f4822dc935	1	Other	Other
+a4813f6f-ffdc-4ded-ab07-85933913416a	1	Other	Other
+a481517a-8388-43f6-8f49-2bddc7d30a5b	1	Other	Other
+a4815b9f-7a2d-418e-a279-e47e2632b092	1	Other	Other
+a481d8e5-4a3f-4095-b3f7-31e0da03fa41	1	Other	Other
+a48225fb-bd10-4267-9870-1fa45311706f	1	Other	Other
+a482342f-044c-4b6f-bbcd-116796229a46	1	Other	Other
+a4823d06-e258-4165-9b94-b51d962b8f2c	1	Other	Other
+a4828ea4-10ff-4e5b-9812-c07d3a7e8aea	1	Other	Other
+a482fc91-b9c5-4af3-aad6-cd0081a7c90f	1	Other	Other
+a4833094-7c68-4356-8fc4-7f497a338b9b	1	James	Other
+a48335ae-7daf-4291-bdf8-97930ed363ee	1	Other	Other
+a4835716-8520-4762-b115-b496850557bf	1	Other	Other
+a4836ee8-533d-4615-aa6e-93bf6a52e19b	1	Other	Other
+a483d7e8-4d50-4d06-8e0c-448a938ea0a2	1	Other	Other
+a483dfe9-ada3-45eb-a046-07636026467a	1	Other	Other
+a48425c8-f270-4bef-9877-d9842cfdce08	1	Other	Other
+a48494f1-6ecf-4532-8f21-398aca842e24	1	Other	Other
+a4849a11-8a75-4be3-9b46-4247e02978be	1	Other	Other
+a484a775-0623-46c6-a10f-a7d8c036b2e8	1	Other	Other
+a484bb2a-7273-44d4-b229-3f999bbfa1cb	1	Other	Other
+a484c672-ce52-49c7-be4c-28199bd543be	1	Other	Other
+a4853958-98da-4881-a215-0f019c2f86d1	1	Other	Other
+a4859873-b4e8-492e-9a65-0274be228a8d	1	Other	Other
+a485b567-075b-4fdd-96cf-565bcf9bc840	1	Other	Other
+a485cfec-d123-42ac-97f2-0a0edfc7f887	1	Other	Other
+a48602dd-398f-47f1-9b22-eef0778d73a3	1	Other	Other
+a486beff-7f53-40c0-b28a-83cd163b95d0	1	Other	Other
+a486caf0-313f-484c-bf91-dd8f48b1512f	1	Other	Other
+a486d41c-8560-48a6-bda9-b2aa13d2b532	1	Other	Other
+a4874f0e-dded-4d9e-8e92-61872441aacb	1	Other	Other
+a48789ac-7896-4bc6-b92b-903dc834cd38	1	Other	Other
+a487a762-7dbc-4b92-8e4c-39b1dbee0c88	1	Other	Other
+a487bf58-b01f-4365-9e04-dd835a564510	1	Other	Other
+a487c4ab-330a-4d9f-8e22-dcc79f55cc17	1	Other	Other
+a4887352-2961-434f-be45-fcf9570b2509	1	Other	Other
+a488a5e8-4332-4ca2-9766-315f31d22f9a	1	Other	Other
+a488ec26-ca50-4eb5-ab9e-c051069559f8	1	Other	Other
+a4890626-513d-42a2-9c4c-408e96d6d1af	1	\N	Other
+a4891039-f40e-44d0-a205-19c60ea0d378	1	Other	Other
+a4891848-5ad9-4fed-ba1b-747df12896ce	1	Other	Other
+a4896ed5-3e2f-496f-814e-a6a650b02939	1	Other	Other
+a489c85c-3630-4315-8189-d4a60d80383d	1	Other	Other
+a489f837-c1a0-48a5-9a22-cef6b926f566	1	Other	Other
+a489fe9e-894a-4362-ae5d-68b783a2509d	1	Other	Other
+a48a2516-6400-4b32-a26c-94bee0b89ea7	1	Other	Other
+a48a29ac-0091-4bd1-8f04-0bb46a211370	1	Other	Other
+a48a3056-dec5-4188-8151-92bc0b514d91	1	Other	Other
+a48a3244-e8df-42ba-bad4-c46839a84207	1	Other	Other
+a48a543c-ac79-454b-a0d8-df002c67e863	1	Other	Other
+a48a7a3d-5ae3-4b0e-84a1-edf2d46b8e9d	1	Other	Other
+a48aa016-495a-402e-bd18-cdb575b3a969	1	Other	Other
+a48af1cd-dd7a-4051-a9da-b698b81401c0	1	Other	Other
+a48b2337-eeb4-489d-8e81-da22edcb419b	1	Other	Other
+a48b9281-d8cd-49c1-9da5-6e6c52b8de88	1	Other	Other
+a48c032e-1fc9-4e95-8042-1d4393154f4f	1	Other	Other
+a48c2162-710a-4982-9408-4c5f5051fb18	1	Other	Other
+a48c549b-87f9-4dff-a257-ecf19279ed86	1	Other	Other
+a48c639a-8af0-4256-a40f-69c19c09ddcc	1	Other	Other
+a48c6792-2de8-4439-b064-976686b7f7b6	1	Other	Other
+a48cc206-b365-473e-84f3-f71bca1b36cd	1	Other	Other
+a48d1a62-a55e-43fc-91e8-5f34d5baca3b	1	Other	Other
+a48d1d62-85c3-4b0e-8909-82c1323a1639	1	Other	Other
+a48d3c64-3eed-4085-8368-6dc6513e9433	1	Other	Other
+a48d4e45-50ff-4456-975c-231a15738252	1	Other	Other
+a48d84a8-9684-4a8a-89cb-8d16c01c1eb4	1	Other	Other
+a48d898a-01d8-42d3-8eb7-170b943f1538	1	Other	Other
+a48ded2e-5062-486e-8cbf-b996a9768c41	1	Other	Other
+a48df5e5-1b7f-4cde-be34-3ed8b7a977be	1	Other	Other
+a48edb62-3291-4067-bda4-a633bddeb370	1	Other	Other
+a48ee2d9-89a6-4ef5-9acb-906ee211a808	1	Other	Other
+a48ee314-f4e7-401f-90c2-1ccf0af0608b	1	Other	Other
+a48f01f4-1f3e-406d-9308-f9ba24b84418	1	Other	Other
+a48f0faa-5ce3-4ff9-b6ec-24ff687ab560	1	Other	Other
+a48f8cd2-3bc4-4511-930a-6d1abb7c9601	1	Other	Other
+a48f8e86-d09b-41b5-9751-cb7f749855cd	1	Other	Other
+a48f922b-39e1-4e85-bbca-1b44accb702a	1	Other	Other
+a49008f5-c27f-4a23-8cd1-59ab5c6b1ebf	1	Other	Other
+a4901ab9-2383-4580-834a-62b3a5220d4a	1	Other	Other
+a4903d7b-cb01-406d-9901-ff284ea01d55	1	Other	Other
+a490642b-8123-4e55-aef4-c2db1732d1a0	1	Other	Other
+a4906c61-b68a-4a75-bafb-d088d5bb0960	1	Other	Other
+a490f1a6-a539-4dcf-b712-98e358c2d63a	1	Other	Other
+a49184cc-3248-49af-8676-095f8ef1cb1d	1	Other	Other
+a491de56-abed-4b75-a80a-5e8a1f961954	1	Other	Other
+a491e232-5e3f-40a4-aae9-b0083c5aae2c	1	\N	Other
+a49200c8-7474-4cc9-8a48-cb461068a8b3	1	James	Other
+a4921f37-b7aa-47d5-89cd-5847519d3c9c	1	Other	Other
+a492474d-5b33-4b27-b98f-b2f4c70814e7	1	Other	Other
+a4924db0-8c11-44d6-aec0-6ecb78a6ab79	1	James	Other
+a49260e6-db59-4d2a-83ed-811c1de8d222	1	Other	Other
+a4929b98-d855-401d-906c-be7bfe835e05	1	Other	Other
+a492b399-db2b-46c8-8186-d68b0b16c3ff	1	Other	Other
+a492b7da-4687-4087-8eef-577f708087c4	1	Other	Other
+a492d6ba-9bd0-49d5-8e37-992663b23868	1	Other	Other
+a493203e-4b8b-4fde-9be7-c3254d5e61c0	1	Other	Other
+a4935c01-c757-4621-91c3-246531489c8a	1	Other	Other
+a493e451-87c1-4a97-a35d-341221213259	1	Other	Other
+a494326c-ad0e-4065-b48a-f944a40feb91	1	Other	Other
+a4943527-dc49-47a0-9971-89ebdcb281fe	1	Other	Other
+a49464e3-3bcc-4408-b6f5-424e19ae4ae2	1	Other	Other
+a494fd5b-d3cf-4af5-8a29-5aef443609bf	1	Other	Other
+a4951451-af43-4456-ba9d-d78c668a9636	1	Other	Other
+a49569e8-424e-4360-bbd1-bec29f8c95e0	1	Other	Other
+a4958db6-ae03-4021-86a2-6801417cacba	1	Other	Other
+a495a813-6fa2-490b-b33c-5c4a683a8573	1	Other	Other
+a495ac01-7f81-4caf-9232-912963bf1f63	1	Other	Other
+a495c24d-45ab-4730-b9da-b1523b7ea1ea	1	Other	Other
+a495d3fb-e78f-48ea-ae98-0065a70e0a18	1	Other	Other
+a4960c1f-cdbb-4e0b-90db-7c42bb52bd1a	1	Other	Other
+a496ac7f-232f-45a1-8884-d0bd34e8a373	1	Other	Other
+a496c3b1-2061-43c5-93ea-58e5bb9c1eb0	1	Other	Other
+a496c677-01e5-40fe-8600-548436a3b000	1	Other	Other
+a4970124-bb9c-49ae-8503-a7728b70be9c	1	Other	Other
+a49736bd-b5a8-4bfb-bf45-9c2c045033c0	1	Other	Other
+a497860f-548e-493a-94a2-0828bf07caf9	1	Other	Other
+a497b330-7d73-4a83-8d80-c754885f6f20	1	Other	Other
+a497ce7e-c73f-46e7-a8c8-b8e42746139c	1	Other	Other
+a497e734-3945-487d-8d94-5f6a0e1db768	1	\N	Other
+a497fa27-8efa-4e0b-a5ca-7988bc60c57c	1	Other	Other
+a4980d37-6d95-42a8-9804-83cb5aeb07f1	1	Other	Other
+a4986884-1d27-433c-874c-ed55665b6c83	1	Other	Other
+a498c35a-4b9d-4eb0-98ca-66c455d879bc	1	Other	Other
+a4991e41-bafb-4b88-8ca7-25cefcc31224	1	Other	Other
+a4995170-08af-40b1-bf5a-46aac69dacb8	1	Other	Other
+a499788d-4188-44c4-adf0-31713d68cfdb	1	Other	Other
+a499a393-300e-416d-8ece-bc3606ddd4b7	1	Other	Other
+a499d600-e5bd-4b9d-ba0c-3d5ab77c8be9	1	Other	Other
+a49a0caa-fd77-4c03-88fe-7ccb96f2d50f	1	Other	Other
+a49a2291-9f14-4655-8bed-b9ac71e3cfa7	1	Other	Other
+a49a4a43-4b85-433d-af68-e5b818db51f6	1	Other	Other
+a49a85af-aed5-4237-a930-d6c47163cde9	1	Other	Other
+a49ab172-909e-4833-9392-e584b4cc507b	1	Other	Other
+a49ab217-f117-4811-835b-54dc8c5f7710	1	Other	Other
+a49b057f-9bd8-4897-b370-7994c6608690	1	Other	Other
+a49b25bb-1822-475e-bc88-8d9850b170c2	1	Other	Other
+a49b3e57-d7cd-4037-89da-101219916108	1	Other	Other
+a49b7f6f-029a-47e7-bcf5-2f25bcd56f3d	1	Other	Other
+a49ba2ad-d142-4abe-8496-12a1db86ef98	1	Other	Other
+a49bccaa-8d11-48e7-a072-34f31ddf3f69	1	Other	Other
+a49c2ae4-e87a-46c8-8386-cf2bf9e2b8ba	1	Other	Other
+a49c3d18-411a-4490-ba6e-f6404c60f9f8	1	Other	Other
+a49c4585-6aa3-4c75-99f9-8c3553688d85	1	Other	Other
+a49d27f0-c550-4177-91a4-0754c0ac3d75	1	Other	Other
+a49d4b67-3bd1-4b2f-b751-ccbc7761393d	1	Other	Other
+a49d66ad-ea7e-4a9e-b354-cc25ee3ffaef	1	Other	Other
+a49d7614-9e58-4235-aeb9-336f2892052e	1	Other	Other
+a49d7658-e21f-4a0d-8317-120b2a2af00d	1	\N	Other
+a49d7cb5-9a94-43ab-99c7-11f64794bdaf	1	Other	Other
+a49da3d8-5547-4669-a7d4-b7014c62f432	1	Other	Other
+a49deff0-ad06-49a5-971f-53ae6fbbce07	1	Other	Other
+a49e48c2-8d45-44f6-8fb0-b8a7911c8791	1	Other	Other
+a49e6a72-272b-4331-8314-c0e4220727ae	1	Other	Other
+a49e7cb8-fb4f-4230-a49b-943d6ffa972f	1	Other	Other
+a49e9775-e037-4d29-8f5c-32c81c6e9ffb	1	Other	Other
+a49ec1a3-688c-4c64-812b-2be225ca094f	1	Other	Other
+a49ed09b-11fe-4955-afc9-4a9a8c82ddcb	1	Other	Other
+a4a005f0-a97b-4953-87f0-01e99270de52	1	Other	Other
+a4a0415f-32e9-4615-b95a-d10173fc252a	1	Other	Other
+a4a08670-fbfc-4083-9591-0279645a1449	1	Other	Other
+a4a088f4-8ae0-48c9-96a2-82dc3eb0900b	1	Other	Other
+a4a08cb9-1c02-4c8e-8559-a978e1f74829	1	Other	Other
+a4a0b20a-8941-4af5-86cf-216e64d3b0ab	1	Other	Other
+a4a0f631-0819-4a23-bd87-25f33de03a10	1	\N	Other
+a4a12198-26b8-4922-a115-0cde7d733f56	1	Other	Other
+a4a1993d-e621-42d2-a16e-722ce14f199c	1	Other	Other
+a4a1e67d-f38b-4222-a4fb-432a80a2d4ea	1	Other	Other
+a4a23460-ce3f-48a3-99c4-a1b0f3c05178	1	Other	Other
+a4a254b9-184a-421c-87dc-1389e644452f	1	Other	Other
+a4a259bc-e007-48f9-a885-864e9eb6f3de	1	Other	Other
+a4a27033-86dd-4468-9413-8aa6e43a063a	1	Other	Other
+a4a2907a-81b0-4d59-a484-b2610755c1d1	1	Other	Other
+a4a2a710-f268-4383-8ca2-aa4584997114	1	Other	Other
+a4a2a8c4-0c0d-49fb-8514-e227dc1129c6	1	Other	Other
+a4a2ade9-8079-4477-bd0f-2321b518c723	1	Other	Other
+a4a2ffcc-3c95-492b-8e84-30d8e48ddfdc	1	Other	Other
+a4a3007b-d98e-45c1-a423-7866c563aa1c	1	Other	Other
+a4a33ed9-a6b0-40b2-84bb-cab02d1dcf86	1	Other	Other
+a4a3558e-ef55-45b5-b784-e615cd01c2a2	1	Other	Other
+a4a3994f-404e-451f-9351-eae7d4a241e1	1	Other	Other
+a4a39fbf-cfb3-44da-8436-cf8a9aa07ba1	1	Other	Other
+a4a3ef50-e0a9-48f3-9bfc-6136cbfdb535	1	Other	Other
+a4a407f3-cf80-47ce-a354-6c18037fd6d5	1	Other	Other
+a4a46003-6d96-4983-a8aa-c4d01c29f963	1	Other	Other
+a4a48260-465a-4d8a-8fe5-397a8e5edddf	1	Other	Other
+a4a4abab-5b4f-437b-a7d0-c007377a8c36	1	Other	Other
+a4a4da27-526b-40b8-a946-337ad1984df9	1	Other	Other
+a4a4e077-8464-4b7c-a507-e26338264626	1	Other	Other
+a4a4ea61-92ee-47cc-90b9-c6edcc00df30	1	Other	Other
+a4a51728-0fc7-4ba8-b595-f0be32b2aad2	1	Other	Other
+a4a52bfc-bb91-478a-ac6b-19e393e3e599	1	Other	Other
+a4a53283-4688-40b4-87e8-ea78922c5db6	1	Other	Other
+a4a55f60-8ec5-445c-9ba9-2cd7e428e690	1	Other	Other
+a4a5664b-79f1-4bb1-89f2-7681876d2542	1	Other	Other
+a4a5ceeb-fb98-4bbf-b54a-c63b88136f89	1	Other	Other
+a4a5cfab-979c-499f-ae69-84da7ebc7da6	1	Other	Other
+a4a61ba1-c65a-4158-bd31-8fbb996f4a5e	1	Other	Other
+a4a64e24-8368-40dc-8261-c293e955e37e	1	Other	Other
+a4a66dce-90ae-4842-bd77-be78beb2e083	1	Other	Other
+a4a66ea5-a973-4245-bf96-056e55591b30	1	Other	Other
+a4a684cd-dd9c-4631-aec1-518cbaa5a480	1	Other	Other
+a4a685f2-8b9e-4555-a501-971d5b48f418	1	Other	Other
+a4a68fa4-7766-4820-865e-02932406667f	1	Other	Other
+a4a698f9-171d-4acf-9fc3-2819b6bfbf97	1	Other	Other
+a4a6a34b-d5fb-4b12-92d0-5c3d43801e9d	1	Other	Other
+a4a6e77b-6b37-47f2-950b-c291a3342d63	1	Other	Other
+a4a723a4-150a-492b-95c1-0c4099a8feb6	1	Other	Other
+a4a7323c-54a3-4935-9897-7432d49926e1	1	Other	Other
+a4a753c6-5013-41ee-b4c1-898fc84016d5	1	Other	Other
+a4a7a1b1-00a4-492a-ac2d-985d2039760f	1	James	Other
+a4a7addf-f403-41c4-bbb3-aea117ce6634	1	Other	Other
+a4a7f785-e9d2-4c9e-bada-4f7ef1c9d98f	1	Other	Other
+a4a7fef3-12e5-4f32-9fdc-7d0e3a8a410b	1	Other	Other
+a4a8095c-cda3-46af-b9cf-45da200db21e	1	Other	Other
+a4a838c3-0683-462b-af84-34c49ee3a76a	1	Other	Other
+a4a86c60-bb06-46f0-a85b-7905473c4e5a	1	Other	Other
+a4a89c54-3751-427b-9230-04439fc854c9	1	Other	Other
+a4a94961-41cf-410f-a2da-9170bf0b4a9b	1	Other	Other
+a4a94c0e-64cc-42b5-bd51-169744f18f6b	1	Other	Other
+a4a95190-ab56-4c3b-aeb9-cce4e40e09cc	1	Other	Other
+a4a98e36-eabc-40e0-85fa-8262ede66149	1	Other	Other
+a4aa4019-f145-4097-a56a-f124352530da	1	Other	Other
+a4aaa359-76cc-4f36-a297-1175df5a121c	1	Other	Other
+a4ab01df-b2b8-48ea-bf73-db39549f87dc	1	Other	Other
+a4ab2c5d-cbcd-42f1-8f04-6beebabf6c90	1	Other	Other
+a4abb4c6-455a-4839-a786-b0f70172c217	1	Other	Other
+a4abecb1-73a7-4585-b91e-3d463aa95999	1	\N	Other
+a4ac691d-47f5-4caf-8de9-42b152b7a17e	1	Other	Other
+a4ac920d-bdad-48f9-9f46-9f77610ae441	1	Other	Other
+a4ac9dfc-5868-4355-a60c-2bf9fef0938c	1	Other	Other
+a4acb49c-2dda-41ff-b813-4cf2aa356a77	1	Other	Other
+a4acd99b-392a-4638-bdd8-4ac453c1bdb1	1	Other	Other
+a4acf652-8d99-46bd-9871-b540347c0a18	1	Other	Other
+a4ad289b-4bc9-46b8-a626-734ce8bf8c64	1	Other	Other
+a4ad5062-a2fb-4727-bd24-b6eadc1ddc55	1	Other	Other
+a4add551-7e12-4f95-858b-8a90de2aeced	1	Other	Other
+a4adeaef-7bb5-4c09-be88-b79900884cb7	1	Other	Other
+a4adf75b-dba3-4867-9dac-5832a658928b	1	Other	Other
+a4ae2862-1ffe-48f7-a6d6-103bea10ada7	1	Other	Other
+a4ae320a-cc92-4d73-8208-343052e470cb	1	Other	Other
+a4ae3480-79c1-4643-b799-dc2f8101bc76	1	Other	Other
+a4ae54ac-d9b5-4546-b041-de4dfec4cf35	1	Other	Other
+a4ae692f-f455-4ea0-b33a-7f7ce8ad880e	1	Other	Other
+a4aea8f2-3810-4c63-9779-5d46325121ac	1	Other	Other
+a4aeaa46-d70f-42be-860c-086c8a45a445	1	Other	Other
+a4af2391-88e2-4399-a23c-9ef63342d14f	1	Other	Other
+a4af4689-2d86-46fd-915a-4e17f13e8286	1	Other	Other
+a4af5971-488c-4318-a098-3895e9482a49	1	Other	Other
+a4af6e3d-1fa1-4b7d-8f67-eb43670b98db	1	Other	Other
+a4af7504-755d-40f9-b8d1-b73cf9e62c26	1	Other	Other
+a4afff2d-b3d0-4816-b6d6-a04447ab98a8	1	Other	Other
+a4b044c4-8bcd-4db0-9b21-3cb00a2cb640	1	James	Other
+a4b0838c-4de9-4f2a-8b14-19e38ee9c5b3	1	Other	Other
+a4b08755-6239-454a-a3c1-102ed4d5b24d	1	Other	Other
+a4b0b637-d430-4527-a121-52ca910966a6	1	Other	Other
+a4b0d64f-152c-4a74-a6a4-5a6d0cda1c7c	1	Other	Other
+a4b0fd42-0587-4881-9dc7-f45ab715c3b1	1	Other	Other
+a4b10d4a-3306-4cfc-aab6-fcba91ae2e09	1	Other	Other
+a4b11c61-26dd-4b3d-9ae6-a7f9c96f78d2	1	\N	Other
+a4b120b6-33e4-484d-9b80-726b45a7459a	1	Other	Other
+a4b12d0d-8a10-4031-8d2b-444c9c57714e	1	Other	Other
+a4b1e80f-28e3-4066-b10b-541f6d63fd7b	1	Other	Other
+a4b228d3-279d-488f-bda2-9ecaa0c88e3c	1	Other	Other
+a4b22cc2-0254-4bc1-a4d4-ac56b6dbf052	1	Other	Other
+a4b2471f-4ff1-4db6-9a8b-07abf1c564ce	1	Other	Other
+a4b27836-7d2b-48b3-adb6-8fc4e43cf6d9	1	Other	Other
+a4b29a95-fa03-4248-bb92-109728ae06b4	1	Other	Other
+a4b2ceb7-1126-4919-bac0-41d4c4efc3fc	1	Other	Other
+a4b2e493-43e8-42c5-9305-e80c71902540	1	Other	Other
+a4b2e6aa-dacd-4f0e-9585-1cfb6950611b	1	Other	Other
+a4b34ce9-ac33-4a3c-a4e4-47c9babcabf6	1	Other	Other
+a4b36a9e-9fd8-467d-9bdf-8ae2229cc3f2	1	Other	Other
+a4b38a0c-0078-4f64-9dce-e8409c520c51	1	Other	Other
+a4b39492-2bb2-4ae4-9fe4-83a71b3f7a55	1	Other	Other
+a4b443cc-7a38-48f1-bf59-bdcae789ef25	1	Other	Other
+a4b490a0-2aba-4371-8756-44ec80736e1d	1	Other	Other
+a4b4b176-d3f3-4e99-983f-70b069ac8ea0	1	Other	Other
+a4b4fac3-1c88-4262-bdf1-772762f9a9c2	1	Other	Other
+a4b59cf5-99af-4601-ad2b-e7b3e1e9b2b9	1	Other	Other
+a4b5dc8f-643c-4de7-92eb-7b1a5e59374c	1	Other	Other
+a4b5fc96-d364-4b12-956f-cb29f994fe01	1	Other	Other
+a4b61b4c-c976-4e39-a49c-6f84b2e1b3a4	1	Other	Other
+a4b62a56-8c8f-44b9-b72f-bf44b9eb3131	1	Other	Other
+a4b62f17-8a1c-4986-ae5c-debb16fff7a4	1	Other	Other
+a4b71a46-9392-4df9-9779-61df545a7e07	1	\N	Other
+a4b720d6-9edc-43bd-a548-f7e225b3768b	1	Other	Other
+a4b74732-ac5a-48d3-8842-d04fdd48f55f	1	Other	Other
+a4b7a677-4648-4c0c-ac3e-f25d1d1d3855	1	Other	Other
+a4b7cd38-b18d-443a-852d-1f011a5d2c79	1	Other	Other
+a4b86ceb-be5e-4c70-b2f2-0461eedc5e0c	1	Other	Other
+a4b8d321-d949-4932-95b6-4dc3509dbf49	1	Other	Other
+a4b8e694-42f0-44b5-9419-bc2a2e31cb51	1	Other	Other
+a4b8e955-8ec3-4150-bd21-fab425f7b54a	1	Other	Other
+a4b938df-a4cf-4369-b8b2-d1109b3f046b	1	Other	Other
+a4b940cb-1c2e-4d32-a2ce-ba5beddf1b80	1	\N	Other
+a4b94953-9585-4da8-9813-3d4eb544c1a0	1	Other	Other
+a4b97a7c-f07b-4b39-a338-787e01137287	1	Other	Other
+a4b9ae34-7f00-4c7c-91cf-e9f9ebde210d	1	Other	Other
+a4b9b9b5-06fd-48ce-88e8-1582afe63354	1	\N	Other
+a4b9c11b-c610-4de4-afef-a95b87d5dc94	1	Other	Other
+a4b9e4e5-7f90-46a0-967e-e8edf39bbcca	1	Other	Other
+a4ba020a-3a58-4847-9668-6bc60c821c5f	1	James	Other
+a4ba1229-7b43-484b-8f5f-3990482064ff	1	Other	Other
+a4ba15e1-fb33-48a8-9c8c-3588f844fa1b	1	Other	Other
+a4ba540c-3dcd-41a4-9e46-f2787534cc57	1	Other	Other
+a4ba6760-5152-4f83-b6b5-39450ca36093	1	Other	Other
+a4ba8671-e9bd-4d1f-9da7-a9b87f35b769	1	Other	Other
+a4ba8fc0-3010-46a1-8548-80d1864adae2	1	Other	Other
+a4bacd89-896c-48d7-adec-549638c3266e	1	Other	Other
+a4bb0adf-02c5-4b88-a195-6999a95df16a	1	Other	Other
+a4bb0d08-8fd5-42dd-b7ff-52afc31ca325	1	Other	Other
+a4bb5704-eedd-469f-bc2b-66bd6f609ee5	1	Other	Other
+a4bb6bc4-25b9-4d1c-8d57-e446aac84526	1	Other	Other
+a4bc3a13-e09e-4621-ba69-d0bd546e9a34	1	\N	Other
+a4bcd97f-9254-48d7-8ec7-6dfb141480ce	1	Other	Other
+a4bd71cd-57a9-449d-8219-023e0df67267	1	Other	Other
+a4bd7e3c-e07b-42a4-b4ef-428680a84f9e	1	Other	Other
+a4bda143-05e1-4688-b0f7-1abdf210ef82	1	\N	Other
+a4bdafcb-1b9c-4b81-9458-e9486661c752	1	Other	Other
+a4bdbb81-13f6-4710-9a53-64dba86c960f	1	\N	Other
+a4be4068-c73e-47f9-b3e1-f2ef4c9f3e9c	1	Other	Other
+a4be411c-d080-44de-ac95-3b570d86b217	1	Other	Other
+a4be6a80-9c0b-46f0-9c7c-d5559ac398a9	1	Other	Other
+a4be73c9-dad3-4671-9806-039af22f8f16	1	Other	Other
+a4be855c-0f1e-43d3-8116-61cd4f15e932	1	Other	Other
+a4bed3fb-b84b-4fbd-9e0e-9db58aaeafa7	1	Other	Other
+a4bef812-7fdc-476e-adc3-c5556293e259	1	Other	Other
+a4bf3c5f-85d0-4a1b-be43-161b1364ebe6	1	Other	Other
+a4bf66a5-3242-4bc3-9c78-8b2ecd6f431d	1	Other	Other
+a4bf8a6b-6dde-4c7c-9779-0932d2708662	1	Other	Other
+a4bfbb33-5829-46a4-8e6c-2d34a1dd40bd	1	Other	Other
+a4bfe0fa-5f06-4a0b-ac01-94c4fb5ddee6	1	Other	Other
+a4bffe32-93a5-4932-a852-1bf959390a6b	1	Other	Other
+a4bffe8c-84c1-40e6-b854-60d0f829d2f7	1	Other	Other
+a4c0145f-b33e-4fa6-ba69-99c984714b08	1	Other	Other
+a4c06637-3ead-4163-8e46-ad21caae3c9a	1	Other	Other
+a4c0736b-93f1-471f-95b2-5fb35655e483	1	James	Other
+a4c0b6e7-0a77-4d43-942f-dfefc50a8b9e	1	Other	Other
+a4c0c7bc-0e22-48fe-8c9d-908b13396a03	1	Other	Other
+a4c0f137-00b5-4e6d-8ae8-9e985d9fc4f2	1	Other	Other
+a4c0fe7f-00d9-4be5-b840-22ee4145f200	1	Other	Other
+a4c11d70-676d-4724-a283-11b5948bf20c	1	Other	Other
+a4c14582-b2f4-4d09-a3ab-19b16b572087	1	Other	Other
+a4c18ae9-d2e3-47bb-b5d8-940e0d09a688	1	Other	Other
+a4c196c0-737d-4200-bf3d-3609eb590bc0	1	Other	Other
+a4c1bd5f-3106-4466-ad71-f56305540f3b	1	Other	Other
+a4c20667-63c1-4b11-b3ba-a71da372119d	1	Other	Other
+a4c243ff-5a6e-4bb7-a135-c61161f31479	1	Other	Other
+a4c2c911-3992-4f9b-8f52-d294e81eb154	1	Other	Other
+a4c2d60e-0705-444c-849c-182f83836c31	1	Other	Other
+a4c2e087-a5d1-4193-9635-52e5ade057e2	1	Other	Other
+a4c35f0b-c8ce-4b96-94ab-a80cc583d1b8	1	Other	Other
+a4c38fe9-ce3c-4ae1-9726-b8afa5b48999	1	Other	Other
+a4c393a0-1cf2-4cad-98e0-5f31a7486c35	1	Other	Other
+a4c40a2f-7bfe-450b-9030-c5a798e3b93f	1	Other	Other
+a4c40aa0-d742-4969-8d56-f60f9f45a969	1	\N	Other
+a4c413f4-4f55-4aa3-9b86-d2a9bb31078a	1	Other	Other
+a4c4357c-0ea1-476d-bf21-4a9242555eef	1	Other	Other
+a4c44ed7-da24-4508-8f06-2bf77f9e4aaa	1	James	Other
+a4c467c5-b7a5-4b4c-8a2a-30cc07973e82	1	Other	Other
+a4c48a63-0996-4f4b-bd0f-2ac5814cddb4	1	Other	Other
+a4c4b01d-58d8-4b55-a6f1-7c015b093c35	1	Other	Other
+a4c4e3bc-1818-4bec-a04a-ce6db16907f5	1	Other	Other
+a4c5b7e3-f2b3-49de-b902-85f62c851a4e	1	Other	Other
+a4c5cae1-a673-4368-9aef-456456f3aafb	1	Other	Other
+a4c5d5d9-9a0e-4ae2-814d-9b7a4814a267	1	Other	Other
+a4c5ec3d-aa24-4edf-ba4f-f9d012f3eb25	1	\N	Other
+a4c5fb20-5128-4aed-bfe3-9661384f3399	1	Other	Other
+a4c600ae-d9f5-4d2e-9bc6-cbeae7306108	1	Other	Other
+a4c64a90-169e-4fd1-9021-aecaf5366c2d	1	Other	Other
+a4c680f2-7320-48d2-b446-61c755722691	1	Other	Other
+a4c6bc3d-d4de-49f1-aafb-9889ed4939ca	1	Other	Other
+a4c6c9ee-30ae-4dee-abaf-062d3db3e926	1	Other	Other
+a4c6d1ca-d8bd-4f2f-8662-b893e83745b3	1	Other	Other
+a4c6d1da-c9b1-4c5e-bc6b-eb1d7875918f	1	Other	Other
+a4c6e288-410b-4889-adcc-81a16105d936	1	Other	Other
+a4c6e33e-b47e-4fa0-be0d-0b06d97cc26d	1	Other	Other
+a4c6f66c-30fd-4339-9a62-40dbd8e29403	1	Other	Other
+a4c70676-58a3-487c-93ff-07381c7ca0e0	1	Other	Other
+a4c7185d-54e2-4bee-9826-32df75fb65b7	1	Other	Other
+a4c739a6-1762-415c-8b0b-20af32d97462	1	\N	Other
+a4c75e2f-48e9-4487-b161-094a23b89711	1	Other	Other
+a4c79268-4f94-48dc-9250-9227f1fe6c33	1	Other	Other
+a4c79df6-e4d7-46a1-807d-2e341a10cee5	1	Other	Other
+a4c7d344-db21-44e9-8463-6a60ee22ae7f	1	Other	Other
+a4c80982-1683-4154-a8ac-fa06b8075ff9	1	\N	Other
+a4c82dd1-08f5-4cd9-844a-4e06d0e5a887	1	Other	Other
+a4c8517f-8590-4ce1-897b-8fae216f624c	1	Other	Other
+a4c851c4-9afa-45fc-b40c-79921905fa9b	1	Other	Other
+a4c93c7e-3692-4815-960a-ffb92c25ae23	1	Other	Other
+a4c96134-b74b-44ae-a035-5c4d1ffc99f1	1	Other	Other
+a4c9d24a-aec7-4823-974c-e4f86d481b76	1	Other	Other
+a4ca62a6-9a9c-4e8c-bdcc-fe382979d7b6	1	Other	Other
+a4ca6360-ffcc-4612-b217-3b37e194470b	1	Other	Other
+a4ca66db-1a83-4ee5-a3b9-a601b932a8b8	1	Other	Other
+a4ca6c8c-1660-4e08-8062-df368f0a42b0	1	Other	Other
+a4ca8d2d-1909-4ec9-ad65-2879080f2af0	1	Other	Other
+a4ca995c-ab0f-44fc-b4ce-e9528443ef19	1	\N	Other
+a4caaa72-aefe-48b4-8067-2f9ffc31bd3c	1	Other	Other
+a4cb1016-ab85-45e6-b3c7-34f9195c38a4	1	Other	Other
+a4cb3285-f1aa-4cbe-8de1-3ea95046ce60	1	Other	Other
+a4cb42da-00c2-489f-b3ab-c824bb5b1948	1	Other	Other
+a4cb87fe-7cfb-4f5d-8534-e6c48bceacea	1	Other	Other
+a4cbf54d-892b-4195-8aae-89ad5d9feed2	1	\N	Other
+a4cc501a-a478-4ebd-8bd7-00a9c3a53c7f	1	Other	Other
+a4cca99b-8c0d-4fb6-89a9-b3c2c6145b71	1	Other	Other
+a4ccfe97-553c-4bae-bd00-219cb48462db	1	Other	Other
+a4cd1664-4308-426a-9167-046e66c22b85	1	Other	Other
+a4cd3b0a-d773-4b81-8925-c9651562eb33	1	Other	Other
+a4cd66d6-d6e0-4108-994d-02d70653c2c3	1	Other	Other
+a4cd98cd-78a4-4e77-a2b2-bc97fe3771bc	1	Other	Other
+a4cdb3d7-48a7-4851-87bd-ee4bca64255a	1	Other	Other
+a4cddaf9-a0af-4cc2-a3cf-1fb337acbccc	1	Other	Other
+a4cdebc8-6ed0-45c0-8134-cc40ed1040f3	1	Other	Other
+a4ce115e-012f-4d76-ae9b-ad9c6b968f61	1	Other	Other
+a4ceacfd-87d2-46ec-98ce-36a8385cc48c	1	Other	Other
+a4cf12ba-9dfa-4a77-9900-2473ba1df726	1	Other	Other
+a4cf4432-70ba-450a-b69a-90f7cc612c30	1	Other	Other
+a4cf5848-0e13-4384-9e74-7e749a27c228	1	Other	Other
+a4cf5a78-95e8-4719-8fe2-816f46b4495f	1	Other	Other
+a4cf9219-fc40-45b0-a8a0-431b457b2ebe	1	Other	Other
+a4cf955a-5ea2-425d-96d8-f7929ad682d3	1	Other	Other
+a4cfb54e-8d2e-4fb7-80ac-88cdf79593ea	1	Other	Other
+a4d0533b-c494-415a-95ec-0e647a571eee	1	Other	Other
+a4d06412-eed4-4b81-a861-2861196fbdd2	1	Other	Other
+a4d0a657-db1c-4980-8bbc-b4dc81dee444	1	Other	Other
+a4d0c752-f2b0-4d30-85dc-03243fb6572c	1	Other	Other
+a4d0d9de-78ac-4ba2-8e98-4787de3a2d12	1	Other	Other
+a4d0f2f0-e6f1-4cf3-a0ce-3d6cc7087358	1	Other	Other
+a4d1559e-7d5a-4db7-a96b-1349b1212123	1	Other	Other
+a4d16ddb-86a0-4f25-98f1-e7514bb86334	1	Other	Other
+a4d18a52-06e4-42c6-b199-6dc734eb90d5	1	Other	Other
+a4d19411-d9dc-4cdc-aaa2-da9de6f50cca	1	Other	Other
+a4d1bc3c-d3a4-4b42-bef0-5aa0b4f88492	1	Other	Other
+a4d1bebd-6c17-4d0c-885d-9f291182655c	1	Other	Other
+a4d2242f-b04f-44bf-8518-d3ac9d299c7b	1	Other	Other
+a4d293bb-9ffd-46b4-9350-368750949b66	1	Other	Other
+a4d2982a-2b1d-4fa9-acf1-b9823a183092	1	Other	Other
+a4d29888-9c6d-4ce3-8f1d-b9ee830ac254	1	Other	Other
+a4d2c9ad-10de-46df-92d8-1367dd000b5c	1	Other	Other
+a4d2c9be-973c-46a8-9a34-93cb004c04f2	1	Other	Other
+a4d2e672-93a8-41ba-93d6-a6c0a25780ce	1	Other	Other
+a4d32711-5f05-44cc-8e24-b988f8e6b13a	1	Other	Other
+a4d33baa-6c71-42a6-9ace-87d39004bb8a	1	Other	Other
+a4d3521f-fa40-444c-94e4-bb723cc91b17	1	Other	Other
+a4d3a084-ae46-4cd4-92ab-488e249800a0	1	Other	Other
+a4d3a33c-046b-49a0-842d-34bad2a861dc	1	Other	Other
+a4d3a5f8-b425-475f-90c0-38bea8dd3574	1	Other	Other
+a4d419f0-eeda-4f7b-ba82-a9d4956dc426	1	Other	Other
+a4d42279-2dcb-4911-ab94-b395a7117a01	1	Other	Other
+a4d43a81-2430-48f7-b2cf-09732bee145c	1	Other	Other
+a4d43cbc-39f5-4bc0-ad13-378d46a7fcdf	1	Other	Other
+a4d47d54-c1c6-42b3-8eff-d650f4dc81a0	1	Other	Other
+a4d4e18b-9a23-43ff-94ef-e602a7f7e70c	1	Other	Other
+a4d4e76e-0036-4176-80cf-c917a08ead43	1	Other	Other
+a4d4fcca-aa79-4a98-af4c-50c7cf945d6f	1	Other	Other
+a4d5478a-e00b-4ce0-9675-fd802e7844ef	1	Other	Other
+a4d57218-2087-426a-a61a-a95f4fb81841	1	Other	Other
+a4d5e446-29d9-463a-851a-a5fad88e227f	1	Other	Other
+a4d60023-e9b8-49ed-af67-e6a3f3441184	1	Other	Other
+a4d62aea-3103-4a46-8d72-c7995de2b8f4	1	Other	Other
+a4d645e5-e629-41ab-a017-22c348637bc7	1	\N	Other
+a4d6c86b-1819-448d-a67a-5d4cc1493527	1	Other	Other
+a4d6f2ed-0bdf-41ba-bf1e-c586b6b0ab2b	1	Other	Other
+a4d6fecf-4026-42be-a745-40f84c1e89eb	1	Other	Other
+a4d72737-4939-49c7-b5cb-730c23dfc420	1	Other	Other
+a4d72a91-f2d3-4082-bb2b-e231eafa6bbf	1	Other	Other
+a4d79ae1-8911-4f2f-ac3a-46cc06c665ce	1	Other	Other
+a4d7ae9a-29a7-40fc-99ce-20718e6ef3f3	1	Other	Other
+a4d7d914-d053-4f2e-b0ae-e2ec25262cec	1	Other	Other
+a4d842bc-2739-4cee-965b-84fffc271aaf	1	Other	Other
+a4d85bc2-967a-4f58-9c9a-054575306f9d	1	Other	Other
+a4d948f0-fc9e-4dd9-9055-f5099a911f9a	1	Other	Other
+a4d99e36-c54f-4964-a03d-75eb1ab99323	1	Other	Other
+a4d9a095-d48b-4c7f-98d8-4401aef9dce2	1	Other	Other
+a4d9cb80-9755-4b43-94a3-e634f65f6bb3	1	Other	Other
+a4d9ee6e-0c26-4eb0-9c5d-401730ecde03	1	Other	Other
+a4da061c-6a29-46aa-a471-6dda2731c515	1	Other	Other
+a4da4052-0376-468a-bbb4-1e75c4947fda	1	Other	Other
+a4dacfc4-9693-4604-ae1b-d900e48cda19	1	\N	Other
+a4dad23a-177c-4964-9182-9136252bb668	1	Other	Other
+a4daff9d-ae7a-49b2-9086-82cb7c70fa89	1	Other	Other
+a4db8a84-39ad-40a1-aa59-529b3ee84218	1	Other	Other
+a4dbffec-8f74-459e-8eda-d975dc927617	1	Other	Other
+a4dc1b10-4e0b-42be-8009-b1ba6dba86e5	1	Other	Other
+a4dc2a5f-4a78-4e52-83a1-38bad21cccb9	1	Other	Other
+a4dd1cc5-1f61-48fd-84bc-33f22965677b	1	Other	Other
+a4dd60d7-c7d8-4425-b734-927733d3c819	1	Other	Other
+a4dde9bc-3b2a-4621-bc28-ec27e9badf0e	1	Other	Other
+a4ddeb72-72a0-48b8-aee2-9e0ba6f62c6d	1	Other	Other
+a4de21fd-91a1-4f5e-9f53-468fb7f239bd	1	Other	Other
+a4deb408-66e1-45e9-bc43-b078ecdbfa3a	1	Other	Other
+a4dec391-dfb6-4f39-8f8f-5374f6cce158	1	Other	Other
+a4df04e6-994e-49f3-b05a-a7eba187d65f	1	Other	Other
+a4df0e83-9a06-41b6-909a-76bf7f09d017	1	Other	Other
+a4df4843-88c5-41a3-861c-92ff7710391a	1	Other	Other
+a4e008c7-863e-4e14-b3e7-5428776e17db	1	Other	Other
+a4e054f4-01aa-11e8-81fd-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a4e07f4c-157d-11e8-937c-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a4e0e7a7-21bc-4202-990f-543f39eb11ed	1	Other	Other
+a4e1148a-4dd4-4e1a-a38b-29dc7da325e0	1	Other	Other
+a4e12711-d757-427b-8c6d-dcac93bccfb7	1	Other	Other
+a4e12da0-6573-43c2-bd2e-0a25045ec841	1	Other	Other
+a4e15b36-0d77-4557-92d0-c6b8f1dd19b7	1	Other	Other
+a4e16769-39ce-4824-8a73-81f56a984685	1	Other	Other
+a4e19b7b-16fd-49a0-ab79-ecccbe21a389	1	Other	Other
+a4e1abeb-e068-45e4-9264-022b04ddb736	1	Other	Other
+a4e2399d-0d71-4656-85b0-4c0febff9ea6	1	Other	Other
+a4e23bfa-7518-439d-b498-59288bb4339b	1	Other	Other
+a4e248e9-7135-4dbf-8597-3c6e8e856d71	1	Other	Other
+a4e2f3a5-d162-461e-917c-acac546347ce	1	Other	Other
+a4e30e41-bced-4e89-adc4-4f0cdc4465df	1	Other	Other
+a4e32f81-d19f-4e99-9f31-673a736602da	1	Other	Other
+a4e3a4c1-5d6f-4ac9-a11e-d676ea8c1504	1	Other	Other
+a4e3be8f-3781-4554-99b4-f4baae6fb1f5	1	\N	Other
+a4e3ccca-9c18-460d-aa0a-4bd05ee3dc5e	1	Other	Other
+a4e3e375-4bf5-43d0-800b-852108fe08a8	1	\N	Other
+a4e3e7b8-f958-4ee3-905d-def8055d5ab7	1	Other	Other
+a4e45507-1b1d-4590-b03f-e958f152aa4c	1	Other	Other
+a4e4c133-a82b-497a-898c-6972bbdad8d4	1	Other	Other
+a4e4e379-1952-44d0-90cb-37d44d2d456c	1	Other	Other
+a4e52e4f-ecd4-480e-a5fe-5fad9897b306	1	Other	Other
+a4e5434d-a44a-45af-bcbb-deed1f382e92	1	Other	Other
+a4e589eb-5b52-4773-b695-df0a7b910c72	1	Other	Other
+a4e59bf0-63d7-477b-abb6-880dfb9158d6	1	\N	Other
+a4e605fb-bd73-4780-89cb-4797143bc47b	1	Other	Other
+a4e60b4a-d9cd-4760-a37c-22736d6dd969	1	Other	Other
+a4e6616b-6fc5-4195-b984-d0fb2340bd81	1	Other	Other
+a4e666b4-3d43-45bc-a7ff-719a834d2d6b	1	Other	Other
+a4e6cce3-b1af-46d3-b26c-9f394a02197d	1	Other	Other
+a4e717e9-d219-4f5b-8bd0-6cd03cbe3ff6	1	Other	Other
+a4e79c6a-e31b-42fa-be33-377521af5b79	1	Other	Other
+a4e7cd54-1545-4a60-8e4a-e677f8bbf5cd	1	Other	Other
+a4e7efa2-1640-47b8-b7ae-6d53bc7137a3	1	Other	Other
+a4e81f93-191f-4ba1-ad8a-f21c833ec5f3	1	Other	Other
+a4e82e41-0cdd-401f-a8f0-0a11ad6e6559	1	Other	Other
+a4e84df2-d35e-4fc9-875f-9c0021a2bfea	1	Other	Other
+a4e85c8e-b7c7-4cc6-a62e-0e5a1f8afbde	1	Other	Other
+a4e86b82-95ec-47c1-be2e-13d53ab12b5b	1	Other	Other
+a4e86e09-fd69-471d-9eef-79cc1dbdefdc	1	Other	Other
+a4e8adc3-100a-402c-9929-c21cb5dabd68	1	Other	Other
+a4e8ca48-058f-448d-9b6f-55a337df1b13	1	James	Other
+a4e9717f-b5f0-4c98-91f0-7d13b2a9807a	1	Other	Other
+a4e9b145-7b4d-40e6-ac09-294eef59ee18	1	\N	Other
+a4e9f93b-c34a-4068-b9e5-7914c015cce8	1	Other	Other
+a4e9fa66-1fa6-41dd-92bb-a70a76f41b1b	1	Other	Other
+a4ea476c-6b10-4d9e-88dd-646b25a1fe06	1	Other	Other
+a4eaa4fb-0762-41d2-9b2b-7ff4976bff18	1	James	Other
+a4eaff0a-a173-4223-ade7-61daff67fa8e	1	Other	Other
+a4eb285d-f9bb-4411-8cb1-42fe4b40c15b	1	Other	Other
+a4eb3046-ce4d-45b1-aadd-f13521c8f629	1	Other	Other
+a4eb36d9-3ac3-479e-bc95-09564055bb5a	1	Other	Other
+a4eb4fc7-98a9-467a-8217-2dda96007b94	1	Other	Other
+a4ebede2-ff01-45d9-8d43-3f6ee1698e5a	1	Other	Other
+a4ebf212-f1d1-4753-b61a-aeaa8b3bacf0	1	Other	Other
+a4ec02bd-b0e0-4a75-857a-bf09e792d14b	1	\N	Other
+a4ec0aff-644e-4df3-b2c7-9e08a200f506	1	Other	Other
+a4ec2d9c-678b-4e05-870a-078156cb2a27	1	Other	Other
+a4ec3f6e-cbd2-4a72-8f6e-95842e6f95c4	1	Other	Other
+a4ec564a-b3bc-4a45-bf31-c5a088a8f27d	1	Other	Other
+a4ec78b6-0586-44c3-8454-e09a1061db3a	1	Other	Other
+a4ec8c80-50be-4e76-9506-0623873a52fc	1	Other	Other
+a4ec99c9-b6d7-4b2e-9bee-d460ee8f4d02	1	Other	Other
+a4ecb31b-9ca3-4162-9138-229f87450b9c	1	Other	Other
+a4ecd78e-a06d-4ffd-8f57-5ae594f69ac0	1	Other	Other
+a4ed2ceb-3009-4da3-b04c-26c26b3b578c	1	Other	Other
+a4ed3a8a-de2f-4769-a2af-df4fbd952930	1	Other	Other
+a4edb014-c643-4f10-8479-bf12c7d86f16	1	Other	Other
+a4ee163b-3cbb-427e-ae6a-af7b1623b756	1	Other	Other
+a4ee3aff-bdb3-41b0-ab5c-48481fca8922	1	Other	Other
+a4ee3b5d-0526-4e6a-954f-73d4a47098bd	1	Other	Other
+a4ee5edf-7dd4-434b-8989-711d8106abf6	1	Other	Other
+a4ee7517-6dfb-4f56-92dc-124f2c96b1ed	1	Other	Other
+a4eebdce-ca34-4182-8470-b7beabf7fbcd	1	\N	Other
+a4eee14e-26cf-4362-8903-4ffd6cbb7aa1	1	Other	Other
+a4ef1114-ece0-46a4-91ba-674431ac4a8d	1	Other	Other
+a4ef2d96-f81d-4b3a-9234-5b1b9bc580ac	1	Other	Other
+a4ef3b93-7524-4e97-b7b8-fe84ddc25596	1	Other	Other
+a4ef3ca8-0a3e-4582-9672-f3befb16369b	1	Other	Other
+a4ef6ec1-13ff-4cd8-9283-b141e505b626	1	Other	Other
+a4ef7908-c27c-4c99-b007-877b588c830a	1	Other	Other
+a4ef9027-5527-44a0-9dab-3261a033b8f3	1	Other	Other
+a4efb3ce-23b7-426e-b471-539fa118f64e	1	Other	Other
+a4efbc58-dbc0-4636-b8aa-4f5271114390	1	Other	Other
+a4efd737-05b6-43e6-b7a1-d746f1b025e6	1	Other	Other
+a4f06473-3969-47fa-a944-a78dcbdbe3a8	1	Other	Other
+a4f08c42-29b7-42ac-bd00-c21ae4932718	1	Other	Other
+a4f0c09d-761d-405b-b8c9-0f30004cbf9c	1	Other	Other
+a4f18653-1e8a-4966-ba9c-1d403510b0bf	1	Other	Other
+a4f1a44d-3d10-4dea-b9d2-8a2a128715a1	1	Other	Other
+a4f1afb4-c9cc-405b-b080-e3d95768b2e2	1	Other	Other
+a4f1f3c3-c145-46a6-a598-f712e9388a02	1	Other	Other
+a4f1f51d-5a52-42fc-a557-b43a41725b04	1	Other	Other
+a4f1fc3a-c59f-4a2e-aad6-77eac18e5588	1	Other	Other
+a4f20fa0-5106-429d-9e97-35d6ef182ee0	1	Other	Other
+a4f2496b-e823-48f9-9ac2-6bf098561deb	1	Other	Other
+a4f25f9d-b76e-45ef-a247-138c028606c8	1	Other	Other
+a4f2866c-68d7-445e-bc69-c64c6478033b	1	Other	Other
+a4f293c9-a8c4-421d-8e78-72b826c5ee8f	1	Other	Other
+a4f2b2d7-e6d6-420d-93a3-ef5a8286ec0a	1	Other	Other
+a4f30b65-fb3b-40b2-9a4a-5fa776f6ac66	1	Other	Other
+a4f30f66-c2b5-44ec-bd71-0b69e555ffef	1	Other	Other
+a4f36268-6ebd-45a9-ac96-e4f364a9dcca	1	Other	Other
+a4f3c363-50a2-4f3f-bf14-6a925b498be2	1	Other	Other
+a4f42895-9e06-4b5a-95db-ee2905e3b3e1	1	Other	Other
+a4f4499c-d013-48ff-be94-aa3ddc07539d	1	Other	Other
+a4f456fa-b7b3-445d-ad86-f04d1274a15c	1	Other	Other
+a4f4705d-e087-4163-8cd2-b87bbe167e32	1	Other	Other
+a4f49d83-33ec-4d45-9978-e37382a89687	1	Other	Other
+a4f4b586-1b74-452e-841c-6eb02ac1acf1	1	Other	Other
+a4f4b7ea-d781-42f6-831e-cf22cf92202f	1	Other	Other
+a4f4ee6f-3f7a-4b3d-9ae1-8d6b03a47a7b	1	Other	Other
+a4f5d9fc-ac57-436f-8c72-5a237b2c5070	1	Other	Other
+a4f60516-0aab-457d-a02c-c997046b58b4	1	James	Other
+a4f66fce-673d-4ac0-89c8-96b7736743d2	1	Other	Other
+a4f68b33-4db6-4da1-a314-3261a69388fc	1	Other	Other
+a4f69c06-9ef7-428b-92ac-d72ce0033eae	1	Other	Other
+a4f6ff71-ffc7-4a3e-98d7-75f65089c04e	1	Other	Other
+a4f7085c-11be-48fe-8dc3-648caa0c1139	1	Other	Other
+a4f79940-f54e-4e36-8bf3-15c0628230e9	1	Other	Other
+a4f7ea8b-5391-44ae-897c-bc0209f6a482	1	Other	Other
+a4f7fa44-4846-413a-9dd7-747b279b4de7	1	Other	Other
+a4f8251f-cb0a-4b26-867b-08bdb1927313	1	Other	Other
+a4f8334a-681a-430d-b2aa-603416206651	1	Other	Other
+a4f83441-38c3-4aa1-89ab-8504519973f3	1	Other	Other
+a4f83b72-d2b2-4ddc-8a1b-99bcb5898124	1	\N	Other
+a4f842c2-dcf8-4b75-bc77-d50eb808228f	1	Other	Other
+a4f85647-8145-4006-8d6d-0b8830a40563	1	Other	Other
+a4f863bb-15a0-4d25-ae3a-9bdc6b0ea926	1	Other	Other
+a4f871bb-10a4-433b-8358-b364e4cf4f6c	1	Other	Other
+a4f8a222-936e-4c78-abec-108b0e4a318b	1	Other	Other
+a4f8e5cc-68e0-40e4-966c-be88dde0c5b2	1	Other	Other
+a4f901fa-8a1a-4fc8-840c-74d6781c2197	1	\N	Other
+a4f9084a-8659-4eb7-9feb-a47767a9201e	1	Other	Other
+a4f9235d-fd9d-44d2-91c0-d4971e7f01b7	1	Other	Other
+a4f95bb2-2fed-4d8f-90da-c79db0c65610	1	Other	Other
+a4f97f2f-84a1-4f0a-9c9c-be309ea18891	1	Other	Other
+a4f99dd5-5540-4daf-9617-3ca8be2317b4	1	Other	Other
+a4f9b50e-88b1-4fa2-b55c-a1d2bdf6d7d2	1	Other	Other
+a4f9b51b-eaa1-4e9a-9151-c9ecd64eb06d	1	Other	Other
+a4f9ef98-e15c-49fc-b5af-4360d0befdd3	1	Other	Other
+a4fa040e-b1e8-4ae1-b103-fbe3dc259e17	1	Other	Other
+a4fa0a65-9c75-4879-b359-78806b44025b	1	Other	Other
+a4fa1382-e312-47d1-87e1-2547be7b9d69	1	Other	Other
+a4fa333f-51a4-4ee9-8c5b-d3b3da5b9e70	1	Other	Other
+a4fa61c7-05c0-4544-a6b6-9db800b984d5	1	Other	Other
+a4fa6cb8-e10d-419f-a2e5-5066180b30b6	1	Other	Other
+a4fac8a9-0b81-40bb-9332-e0bea7120eed	1	Other	Other
+a4fada18-4fed-4c31-a9fe-88d71277c397	1	Other	Other
+a4fae750-4970-4cbf-a931-2aa7e465e568	1	Other	Other
+a4fb0491-663d-494c-b1ab-3b8f2f2eedf3	1	Other	Other
+a4fb1158-0a50-491c-918f-d5da4e2f7596	1	\N	Other
+a4fb4248-36b4-4eae-9468-56161567060e	1	Other	Other
+a4fb48b4-4ae2-4306-8e41-0155eb444e10	1	Other	Other
+a4fb5018-02a5-4a35-81a1-39e3d4e4284e	1	Other	Other
+a4fb6fc8-bc3a-4dee-aa8c-6d404d3aac29	1	Other	Other
+a4fb7cf2-8938-4e89-92b2-64e01b673f4e	1	Other	Other
+a4fb7fec-7492-4913-93c8-f7623b632871	1	Other	Other
+a4fbb865-98e3-4178-a270-be0b1b3224d2	1	Other	Other
+a4fc2a8c-f18c-4422-a166-9df656a24b3d	1	Other	Other
+a4fc3308-aa7b-4d6d-b3c7-ac644d49b803	1	Other	Other
+a4fca1cc-733f-4fdc-b5bb-e623b294d482	1	Other	Other
+a4fd0b00-2fd3-47ff-a5ff-e8c23357ae9c	1	Other	Other
+a4fd6a6d-0762-49ee-a3ea-fda91f61a20e	1	Other	Other
+a4fdeda8-4b54-400a-b6a7-256aa8a45c91	1	Other	Other
+a4fdf215-0570-464a-984e-8b3f25e78d14	1	Other	Other
+a4fdf279-5504-4aaa-b8ef-f245e4a57e54	1	Other	Other
+a4feb44e-5d57-41bf-a37c-5a8b5d3e8705	1	Other	Other
+a4fedc06-eafa-473a-9113-7744901f2634	1	Other	Other
+a4ff3058-8b1c-40f1-8791-867ea751a2cd	1	Other	Other
+a4ff6430-b5f0-4321-aae2-a2dbc125ea56	1	Other	Other
+a4ff699e-8c4b-4174-bf6d-ecb84bbcf3cb	1	Other	Other
+a4ff84fc-d401-4a1f-8ce7-6e860f138972	1	Other	Other
+a4ff89e3-4149-405d-b760-f0138b76deb8	1	Other	Other
+a4ff9800-80ad-4f63-a8b9-e1513494c78e	1	Other	Other
+a4fff2b6-ce59-4c9f-9ae8-ebe2a55ace91	1	Other	Other
+a4fffcb1-8ba6-45bd-9371-7e0b0dec3a8e	1	Other	Other
+a5001379-940a-46ec-aa6b-0b09a2897ed6	1	Other	Other
+a5001e38-60b1-404b-87d7-42fed7d5f4d1	1	Other	Other
+a500221f-89a6-4547-b58d-3a8657afc250	1	Other	Other
+a5009239-12bc-47ff-a54c-fe64fc1a3c42	1	Other	Other
+a5013faf-c822-4571-8a4a-9ba065606129	1	Other	Other
+a50155be-0968-40eb-868b-183b14e9705f	1	Other	Other
+a501690a-5b9b-4db7-bf72-707bdb977cfd	1	Other	Other
+a501701e-4f0b-461b-84c2-ce58e12e4c54	1	Other	Other
+a501a30b-aa94-4c88-a6cd-6e12b2d5facd	1	Other	Other
+a501ed7c-796e-46cf-8dd2-2cf5c9602584	1	Other	Other
+a501f3e2-4213-49ba-8864-5be7b5970802	1	Other	Other
+a501f7ad-751d-4a28-a1c4-4fa41c4afc0e	1	Other	Other
+a5021272-f7f2-40f4-b605-76cf1db90d2c	1	Other	Other
+a5021fea-0323-4f28-afd7-da5e21f0dcf1	1	Other	Other
+a5027b3e-6690-4f43-a1a7-ffd15362d124	1	Other	Other
+a502a854-b3f6-4001-85c7-6ead765de168	1	\N	Other
+a5030469-e824-4acf-947f-3c3e0219a8a9	1	Other	Other
+a5030db7-1562-4a08-a160-2f818f79cae0	1	Other	Other
+a5030e0d-052b-4635-97fb-fefc2b8687c0	1	Other	Other
+a5031262-2414-495f-a342-cda3e9cb7e6e	1	Other	Other
+a5032492-355b-4b19-9adf-a5246979b513	1	Other	Other
+a5037d3e-582d-41a6-9833-b18723f5a16c	1	Other	Other
+a503875b-18e0-45c8-a0c6-714f9eb47614	1	Other	Other
+a503edf0-5398-4703-ba00-9561ea90daff	1	Other	Other
+a503f63b-2d9d-42e4-9300-920dbdd8d278	1	Other	Other
+a5040c29-69a9-4e67-a6ca-de722553a5c7	1	Other	Other
+a50411fa-b2b1-466d-b171-c6c60c9a4316	1	Other	Other
+a5041655-58be-440d-8def-0414b93667d9	1	Other	Other
+a5042ca0-78ab-4388-a1fb-c1d43c068bc7	1	Other	Other
+a5044002-825c-43a5-9d2b-faee7b7b6c9b	1	Other	Other
+a504c11c-3bb0-41c9-a3e6-2fbaf121b2d0	1	\N	Other
+a504e5e6-2dc2-4d66-822f-9a2953cf8769	1	Other	Other
+a504e88e-abbc-4235-99b8-b7d0f0861b3c	1	Other	Other
+a504f347-b12e-453c-a68f-417430780217	1	Other	Other
+a50507b6-6d2f-416e-a95d-d4f50c7a5496	1	Other	Other
+a50512d0-d3b3-455a-aebb-0c77823966c5	1	Other	Other
+a505a38a-62d2-42af-8ef6-0405f9446cc0	1	Other	Other
+a505bfff-3f72-40f2-82b8-e4dc7d84d387	1	Other	Other
+a505c53b-cafd-49eb-8450-fe74ac42e189	1	Other	Other
+a505c9f1-a225-4d0e-98e5-53b36cc81f15	1	Other	Other
+a505d985-4c91-4799-ab7e-a4b1716248c5	1	Other	Other
+a505dcf6-199a-4160-8679-d17af0ddc19b	1	Other	Other
+a505ec9d-4e3a-4dd5-8e9e-84d0eb7048c6	1	Other	Other
+a5069d5d-a650-4116-861b-371eda813cf3	1	James	Other
+a506b4cd-944d-48c8-96d9-12533607f35f	1	Other	Other
+a506dcf8-9465-4b89-a63a-1dee04a3e0d6	1	Other	Other
+a5074eb6-a0ec-450f-9136-05c8ac49f4ae	1	Other	Other
+a5077aa0-1228-11e8-a253-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a507800c-411d-4a46-99c0-943185dee2e0	1	Other	Other
+a50795fb-e747-460e-9f59-d2b363d23b74	1	Other	Other
+a5079d50-1ea3-4c5e-84dc-0126d511833c	1	Other	Other
+a507b03d-768a-4137-946d-75e0206627b1	1	Other	Other
+a507b0bf-d816-4911-8064-fe96e03b515e	1	Other	Other
+a507b2e9-5b28-436a-b306-4c57c441f50c	1	Other	Other
+a507dcd8-a8c9-411f-be3f-602d1de1f9c7	1	Other	Other
+a5080624-f09a-43cc-84a2-df55f00c9eba	1	Other	Other
+a508123a-fb95-420f-9d1d-c27403a9ad52	1	\N	Other
+a50870db-2f62-4a1a-b872-6ad617a4044a	1	Other	Other
+a5087f24-ac21-4669-a5e7-507ae2ca1f52	1	Other	Other
+a508821c-1990-48e8-8b92-080505a159e3	1	Other	Other
+a5089b71-874b-4797-94be-fdcb6ac51329	1	Other	Other
+a508db9f-b200-426d-a571-1e170619a73c	1	Other	Other
+a508f684-865d-4431-9b5c-0572b799645a	1	Other	Other
+a508fdb3-bec0-454f-ab3b-d7979c9ceb1a	1	Other	Other
+a509128a-03ad-4a79-a931-295ddbf4af52	1	Other	Other
+a509209b-a0c1-47db-9798-4228d6c4ec50	1	Other	Other
+a5093794-73e0-4aec-8749-3377a87ebf65	1	Other	Other
+a5096a1d-fba6-4676-9795-aa25d651bfb6	1	Other	Other
+a5096b34-32ef-4931-ae36-d167305e3b8e	1	Other	Other
+a5096fff-0cd4-4de6-abaa-eb9f58e1c985	1	Other	Other
+a5097217-bff4-47b9-83f6-fd33e9fe36e2	1	Other	Other
+a509d1b5-1b16-4359-894d-2443ab51cbbf	1	Other	Other
+a509ef7f-d71e-41b8-aca1-a308a6213df3	1	Other	Other
+a50a118e-8d09-4768-b5b6-2d2d9cb2fa65	1	Other	Other
+a50a5d11-18f0-46d3-97c3-a41f6ed2a0f8	1	Other	Other
+a50aa8c3-cde2-42e1-bed8-2eeaafc69a95	1	Other	Other
+a50b4562-e031-45f3-a4ea-dfcdbfe98b43	1	Other	Other
+a50b4bc9-dec4-4fb7-97da-975634f6e345	1	Other	Other
+a50b7328-767f-4e4e-92fc-a0ce933015df	1	Other	Other
+a50bcfc5-8f02-496e-8460-7f9894e7b407	1	Other	Other
+a50bd5be-a13d-4def-9427-7770b7da2dd3	1	Other	Other
+a50be6c0-93cb-41d4-a67c-fa3e0a2d558c	1	Other	Other
+a50bfe9d-30db-448d-b92d-9587404a2d1a	1	Other	Other
+a50c0749-ecf3-4fa9-9bac-e9adfa64d995	1	Other	Other
+a50c0ab9-7449-4c61-8bac-1b45ef9f9a1e	1	Other	Other
+a50c1c70-365f-4d20-81d3-38a1a239cd4c	1	Other	Other
+a50cb7ac-5077-401a-a78f-b7eb104bf5a1	1	Other	Other
+a50cce4f-a1a2-47b4-a495-e83ff6e67359	1	Other	Other
+a50d53c7-438a-47bd-8bd7-ec794d94338c	1	Other	Other
+a50d9f8b-3a0a-42d0-a737-9dd50839b882	1	Other	Other
+a50dc99f-1af4-48c5-a828-6f02a3d13fbb	1	Other	Other
+a50e34a8-4398-49ca-9351-ecaf82fe3ea3	1	Other	Other
+a50e38f8-f252-47b2-ac07-536ba97000b5	1	Other	Other
+a50e3fba-39c9-46b1-a347-e86869adb0d7	1	Other	Other
+a50e7f29-541c-4a9a-aa2d-f399c168d371	1	Other	Other
+a50e8dde-6ba0-43f6-bea2-b076906be949	1	Other	Other
+a50e91c0-1a30-412d-8f8f-7a2f8bf8bf8f	1	Other	Other
+a50ee57a-6e5c-4f58-82fb-f82e175491c9	1	James	Other
+a50f0186-00cc-42c8-904a-4a9ab3393593	1	Other	Other
+a50f0561-615c-49f5-a4cd-5f4b67019ab1	1	Other	Other
+a50f27ab-2dfb-4e63-bbf4-c479b777661c	1	Other	Other
+a50f964e-d815-4cdc-89cf-3f569cebd2a7	1	Other	Other
+a50fa2a8-8fe5-43d5-bf66-678deabe748d	1	Other	Other
+a50fc389-ae9d-4c7c-ad2b-2c5cf3250e9a	1	Other	Other
+a50fdebf-b7a1-4c44-b933-4d4c7c9e13c2	1	Other	Other
+a5106abe-e8f1-440b-98ee-97c6d0d3d355	1	Other	Other
+a5107486-d217-49f8-8df7-889acd69ca99	1	Other	Other
+a510f2ea-d928-4435-b458-1270797ef0c9	1	Other	Other
+a5110b08-17aa-4199-a7e8-e9f9ff0ce4c0	1	Other	Other
+a5111f75-c99e-47f7-a310-434396a4031d	1	Other	Other
+a5113dd1-25d0-49f8-9bb0-dc7dbebfbda5	1	Other	Other
+a5114a17-675e-4cd2-b3a6-210385a41984	1	Other	Other
+a511718a-d7ff-4cef-a12f-b812a2278a8e	1	Other	Other
+a511f4a3-1b52-4edc-a95e-85f4e764264c	1	Other	Other
+a5121e0a-bf9d-496a-83b8-5ecae98c0592	1	Other	Other
+a5124ba2-40a2-4023-9d27-8495af2eaa42	1	Other	Other
+a512899e-b78f-4f7a-8b6a-3c945b9d8dbc	1	Other	Other
+a51296e7-2c26-48fc-937d-81a12ddd3bbc	1	Other	Other
+a512e638-4014-4d70-bfba-20219b70b83c	1	Other	Other
+a5132b68-38ec-4d66-8443-1ead5163a248	1	\N	Other
+a5136503-b178-4efd-ac33-32d9a0de0c2a	1	Other	Other
+a5136f20-b6be-4a89-8ad0-608b7ad6fccf	1	Other	Other
+a513a190-f741-4a58-8bdc-34b5abd2d324	1	Other	Other
+a514ddde-95ac-4753-89bf-6466b6911461	1	Other	Other
+a514de3d-ef7e-4587-833c-e873d0781bf6	1	Other	Other
+a515269c-4d6e-4def-a3d9-931063f1c393	1	Other	Other
+a5154de3-36b2-4fbc-b472-85bb8c5093d5	1	Other	Other
+a5155dac-3acd-4ddd-bbda-0815a5813f40	1	Other	Other
+a5158b04-5e32-4638-899a-ac7354b90b4a	1	Other	Other
+a5160ed7-3c44-409a-9a81-9d3fe0707e4c	1	Other	Other
+a5164c96-fa57-4ddc-a582-8124f9649708	1	Other	Other
+a516673c-63ba-4036-b286-0c3120dc45f6	1	Other	Other
+a5166c7b-d6e9-4509-b531-5f9aac038ce9	1	Other	Other
+a5166cc9-36b3-4880-9a00-eb81cc61d2a0	1	Other	Other
+a5168bf3-9f66-44fe-ab5e-be9970d9c5d9	1	\N	Other
+a5169a92-ea74-492d-ab3f-d0f362979264	1	Other	Other
+a516be3a-7a6c-4f22-bcb6-959f07f05e54	1	Other	Other
+a516e7dc-3793-4a2f-8eb0-496157dd0a72	1	Other	Other
+a51721ab-82f6-4d5d-9a82-a1524e0895a0	1	Other	Other
+a5175b14-e9c2-4508-a745-588d23cc8616	1	Other	Other
+a5178e5f-0b16-4e32-acda-468dd5fcbf61	1	Other	Other
+a517d291-1fbd-4440-abf5-1aaad81e74d7	1	Other	Other
+a517f0ba-d6ba-4404-9e72-9a797f27ba6a	1	Other	Other
+a51807b9-0049-4f6d-9418-2aa266e79802	1	Other	Other
+a5183703-ea62-4997-b698-3f7197d8607e	1	Other	Other
+a51887c9-10b3-432c-9dbd-eed3d38f2c67	1	Other	Other
+a5189c1e-eea2-468a-bff5-8b9bfc75a0eb	1	Other	Other
+a518b961-4906-4105-9a7c-680307cd1418	1	Other	Other
+a518e462-5610-498f-849f-d155f5726d05	1	Other	Other
+a5190ba0-2e69-47c2-9de0-3514c518cc21	1	Other	Other
+a5191749-df94-4a37-9941-28b29e66c21a	1	Other	Other
+a519b26f-bb80-4806-a8e5-3bd6ac13cf94	1	Other	Other
+a51a13ac-3173-489f-b2a8-3096e6c0b2d3	1	Other	Other
+a51a35b5-cacb-4795-a8c7-d105fa9d4702	1	Other	Other
+a51a4b82-4ade-4c7d-b524-bead261c7bda	1	Other	Other
+a51a9cf6-ca38-4210-8777-9628375e3f5a	1	Other	Other
+a51aa039-a616-47ad-8eaa-a7d4f1dfb43e	1	Other	Other
+a51ab744-c370-4baf-b2c6-97d6047146f3	1	Other	Other
+a51aed1f-5c32-4d3d-b96a-74ff8019f42a	1	Other	Other
+a51b6e4b-9ed3-4ffb-ad84-d2570970445b	1	Other	Other
+a51b943c-291a-4462-91fb-cbc5b0095feb	1	Other	Other
+a51c1465-3372-4d49-92fd-cfc6205ecdc7	1	Other	Other
+a51c212a-45ca-4d5e-9c09-4c5ad6155c4f	1	Other	Other
+a51c2170-8007-42d5-bd2b-6ded1b85936c	1	Other	Other
+a51c683b-5bda-4c48-a646-ea88c095adef	1	Other	Other
+a51c7c6e-9408-4220-b3f2-399d86f7c06d	1	Other	Other
+a51ccaf9-dfb5-4bd1-9a77-56a73e1d6b90	1	Other	Other
+a51ce386-638a-455a-8c19-b8e993ea7b63	1	Other	Other
+a51cf272-0c58-47d8-8d30-8e23eacb27db	1	Other	Other
+a51d2180-8f3e-488c-bd51-cde265136e2c	1	Other	Other
+a51d3c0b-183c-4b2d-b508-9805efa0083c	1	Other	Other
+a51d60b8-9b7c-4744-abbb-b4ce69578dac	1	Other	Other
+a51d94c3-208d-4ad7-894c-cb13fee3d80c	1	Other	Other
+a51dcada-e808-4d58-a2ac-b4f3c4fd1016	1	Other	Other
+a51e14ac-a289-40ae-bd44-9691a15d7c3b	1	Other	Other
+a51ef8c6-5462-4e02-b26a-0b253e545f71	1	James	Other
+a51f2a37-2986-4fd9-8b0b-2da82055cf8a	1	Other	Other
+a51f3e50-d6d3-4d77-89bc-392d26844710	1	Other	Other
+a51f962f-debe-403d-98d6-592a8f9a27f1	1	Other	Other
+a51fe078-47ac-4a57-9607-0482475318ee	1	Other	Other
+a5200be6-9c37-4b66-829f-74657e4bd6c0	1	Other	Other
+a520570e-80f9-4d35-967b-1f10e9eb6ee2	1	Other	Other
+a520b7c7-d451-4f21-8e08-c1427389e2ac	1	James	Other
+a520eb2e-b6eb-4baf-80f0-4faba3640b79	1	\N	Other
+a52137b3-2e2a-4119-8650-218aef5bf8e6	1	James	Other
+a521658e-4dc4-4cad-aca3-4a15c177e24b	1	Other	Other
+a521b13b-dfc3-44e4-a9b1-4f3be89e8700	1	Other	Other
+a521d395-8049-470e-8b8c-fe2f0d642375	1	Other	Other
+a5222671-1412-4f04-aea0-75732331ccb7	1	Other	Other
+a52251f0-4f2c-41c3-b624-6d5644d24a27	1	Other	Other
+a5226682-86c5-4aa0-94fd-6e109d3113df	1	Other	Other
+a5229513-2261-47f3-82be-e322417632f4	1	Other	Other
+a5229ecd-6844-419c-85d7-fd994d3d3c27	1	Other	Other
+a522e31e-ab05-45ab-88fc-941abb9aa67e	1	Other	Other
+a5237e2e-4fee-4b0e-b0c9-c86a3ef2f849	1	Other	Other
+a5238e64-2f2c-44f5-aa01-75612be72e1d	1	Other	Other
+a523a8a6-1307-4c4d-8206-c1a3bd7923dc	1	Other	Other
+a524792a-4eb5-489d-9e11-4ff51698a315	1	Other	Other
+a524930f-785f-4152-89df-4b421fc225d5	1	Other	Other
+a52494a8-4198-4144-ba06-f49635929fb8	1	Other	Other
+a524a6fb-f382-4096-86c6-4c0f12f425db	1	Other	Other
+a524adff-152e-425d-ac52-b9c7df18befc	1	Other	Other
+a5250006-5cdb-4a0b-9104-42a34fe0e796	1	Other	Other
+a52553ce-1581-4b1e-bb76-c3eec72d07c6	1	James	Other
+a5256c10-849f-4845-afc6-995d8e9ee994	1	Other	Other
+a5257f3d-0807-46a4-8ac5-ed89270f5966	1	Other	Other
+a5259b2d-8982-4a7a-97f0-980be0ddb068	1	Other	Other
+a525ba8a-e28b-47bc-ab28-4d3647ac2672	1	Other	Other
+a525fbc9-b2e1-458b-bb4d-671719cbdbb5	1	Other	Other
+a5261605-432e-4c28-9c41-bd5b9968bd43	1	Other	Other
+a5266319-f307-4cc1-a409-da39504bdefd	1	Other	Other
+a5269c76-ae0f-44f0-a75c-6546736785a9	1	Other	Other
+a5269cb8-1b98-4a58-a0ba-f42d9809441c	1	Other	Other
+a526c732-3935-4b25-a564-5ca7039a896e	1	Other	Other
+a526e285-9b45-496f-8483-2a796865eed2	1	Other	Other
+a526e40d-5612-4be0-b96d-8fd3063c2ea5	1	Other	Other
+a526e896-fa1b-4911-b2c4-4eff07a21610	1	Other	Other
+a5270535-8563-41a0-8616-34fcab36b4f1	1	Other	Other
+a5271618-3cd2-4e5c-a721-c2e74e871650	1	Other	Other
+a5272bc0-e08e-4ef2-9a28-851b2c62bbb4	1	Other	Other
+a527a46f-3435-4212-ad7f-e6fd7ad31503	1	Other	Other
+a527a934-a81d-4f8b-bd5b-9120f341d885	1	Other	Other
+a527abc1-33a3-4fe9-8a86-0c71de9ef333	1	Other	Other
+a527e1cc-66ba-42b2-bfb1-f56277b175ee	1	Other	Other
+a528203d-d8f3-4059-951b-fbc4d2f5f7fa	1	Other	Other
+a528329c-30b8-4f78-b362-db5a4db12c37	1	Other	Other
+a5284c1e-87bc-4864-bd31-a57cc91dd79c	1	Other	Other
+a5289ddf-cf81-4165-930a-0d3382071504	1	Other	Other
+a5293b32-e99f-48a3-adb6-0e887132b36c	1	Other	Other
+a5296457-386e-4dce-9885-0d43ae7ffe5b	1	Other	Other
+a529ae5b-d74c-4785-8905-53229639220d	1	Other	Other
+a52a18cb-2c75-4ece-babd-8a4692afd8ac	1	Other	Other
+a52a5512-ac9a-4197-b2a2-6d0b30778dce	1	Other	Other
+a52a9e10-630c-461a-a7ef-1fd8b540a010	1	Other	Other
+a52aa225-b22f-45b1-bcae-c378096248c6	1	Other	Other
+a52ab17c-4551-4a94-b24d-0cac0de8e505	1	Other	Other
+a52abaec-a7dc-49fe-a33b-897ef23150f5	1	Other	Other
+a52af76f-af91-475d-b52d-94aea1bdfd5c	1	Other	Other
+a52b17d2-df94-40f9-bbef-ebd5cbe8d9aa	1	Other	Other
+a52b59b8-a3fa-41ff-9e86-3e874799665f	1	Other	Other
+a52b670b-09fa-4020-995e-b5ba325a367f	1	Other	Other
+a52bd9c2-7b0d-4bbc-897a-a13ad0b4f80d	1	Other	Other
+a52c05fd-efe8-4d44-8143-5d7467ead5f3	1	\N	Other
+a52c47b0-401f-4640-a223-3444256cf953	1	Other	Other
+a52c9a38-1e44-4a16-864d-596c6304a10f	1	Other	Other
+a52c9c07-7ca0-4c14-b569-8f0c9fe15668	1	Other	Other
+a52cc8b8-c409-45e4-a184-c433c308150e	1	Other	Other
+a52d467f-609f-484d-ba75-926eea25a2cd	1	Other	Other
+a52d8461-38ad-4b78-bb32-dd967a919ef9	1	Other	Other
+a52ddc88-1380-4601-aa2b-751f2c9063f5	1	Other	Other
+a52e0a18-f95f-45bd-a380-c49000974786	1	Other	Other
+a52e100a-7e4b-45db-93a4-84f9c29dab94	1	Other	Other
+a52e9108-83dd-4292-97ac-1b847e2a9fb9	1	Other	Other
+a52ea594-736e-40f2-986c-f658b5bddab9	1	Other	Other
+a52ed70d-3601-439f-82bd-1446bdba189f	1	Other	Other
+a52f0103-e1e5-4749-b43f-b963e7977663	1	Other	Other
+a52f53f1-3412-4df6-b283-8ee161172f2d	1	Other	Other
+a52f562f-16a2-4762-a94c-89246d463f66	1	Other	Other
+a52f71fc-7245-4c36-b7cf-a8af1f877c44	1	\N	Other
+a52fc939-dcd9-4115-8d3b-4048bae18df7	1	Other	Other
+a52fe3c5-a18a-4ed6-98b7-8f886ce8f289	1	Other	Other
+a52ffdec-5406-419c-86c0-71875683a53d	1	Other	Other
+a5306879-dff3-49fe-b8d6-66166dd80579	1	Other	Other
+a530a3df-10f5-48ad-9968-cf4abe8c36fe	1	Other	Other
+a53141db-782d-4d6b-8d01-08642d0a8362	1	Other	Other
+a531711e-7766-48ab-ad51-d344e668ea7c	1	Other	Other
+a531763c-3c12-4dda-bf56-c92f47504dcc	1	Other	Other
+a531b540-0753-4e09-98ed-a5b8d3af9f24	1	Other	Other
+a531df16-a713-482e-8fda-5b5813d271a6	1	Other	Other
+a531f403-dba6-40e8-ae24-bdb046dab9aa	1	Other	Other
+a5329c37-9c08-4f1f-8cac-9e61c587ce7b	1	Other	Other
+a532b8cc-c9a9-468a-abb4-0faf6b38ede3	1	Other	Other
+a532f8ee-4d19-4b6b-810c-99dee74734b5	1	Other	Other
+a53333eb-f455-41b0-8d11-5a2c808512ad	1	Other	Other
+a53350e8-4228-4f36-8a14-3bf3790ed37b	1	Other	Other
+a5335d45-7a5f-4ee1-8e9c-3f854d20c2a0	1	Other	Other
+a53364ad-3848-4bec-ad81-7c3291990236	1	Other	Other
+a5336d19-e4d2-4cb9-9ac7-3a5956ef927f	1	Other	Other
+a533a186-d59a-431c-8dda-83597fe5ea7a	1	Other	Other
+a533c6f8-db94-47f3-b987-a71c6dce84c4	1	Other	Other
+a5340a0d-c56b-4055-838d-3c679700be6a	1	Other	Other
+a5340a13-c7ce-4afe-8519-e03e393a7e85	1	Other	Other
+a5340a5d-6db9-4757-bae4-c8bbcafdcbf9	1	Other	Other
+a534903c-956c-4db5-ae82-bc4d98081459	1	Other	Other
+a534d631-d76f-41c7-bd3d-1336e6101008	1	Other	Other
+a535124f-0fdb-4d4e-bbcf-036993e139b6	1	Other	Other
+a5354447-5bab-4e07-a3dd-cbd02cdfa452	1	Other	Other
+a535a52d-9a5b-4ec7-b526-400328439657	1	Other	Other
+a535dfee-6530-41d0-87f3-b21c8e588ec7	1	Other	Other
+a53604c3-e665-4652-b7a5-5c3f975861b4	1	Other	Other
+a53605c1-6b8a-4c54-9ca2-80657e64e4d0	1	\N	Other
+a536213f-31b9-437f-8a01-f183c8a9f5a5	1	Other	Other
+a5362476-f937-4ae1-a129-6b237a223893	1	Other	Other
+a5368c68-5300-4f94-acaa-625c4cccff9f	1	Other	Other
+a536e74c-6f02-4063-9600-a4ca7c5d7b82	1	Other	Other
+a5376749-4b7d-475b-b242-9bfc71eeb951	1	Other	Other
+a5378862-0443-41a4-94d1-7fa1dfdcd9ac	1	Other	Other
+a537f1ed-9592-446b-836a-e93fe0ada17a	1	\N	Other
+a53803f0-0c79-40a1-8eed-259b314de4b1	1	Other	Other
+a5382002-c1ff-43e9-8d56-f1a3197af1c9	1	James	Other
+a5383787-78d8-45b6-a23c-cdd5f4a7d1d1	1	Other	Other
+a5387604-67a3-479e-9a0d-d8e6ffffd2e1	1	Other	Other
+a538b21c-1d3c-4f9b-80b0-dd13ae299163	1	Other	Other
+a5393012-1b85-4427-a764-1b097145889e	1	Other	Other
+a5399f4c-6b42-4b83-90de-effcc9eae962	1	Other	Other
+a539f0ab-aab6-432b-b913-80215147c88a	1	Other	Other
+a53a1ee2-4f7d-421a-b8f4-ff0a785df297	1	James	Other
+a53a2a5b-f008-443e-8960-db49dac004aa	1	Other	Other
+a53a2c9e-08bb-4a44-9f6d-b1b5cd1387ef	1	Other	Other
+a53a3eeb-46e5-4608-8373-37a13c5da0cb	1	Other	Other
+a53a7e85-54b5-4a58-99fe-e8a85ae8d702	1	Other	Other
+a53a83da-f173-4eca-98e8-4dc532a90c03	1	Other	Other
+a53ac628-af73-4d41-8bf6-d80c77630f41	1	Other	Other
+a53acfd4-07e3-4e17-b073-9363cc211971	1	Other	Other
+a53ae4f8-0479-4deb-9296-943326431403	1	Other	Other
+a53b44e6-b861-4159-898d-f60e7c8e7437	1	Other	Other
+a53b76f9-e88e-4fa1-acc0-b7d613821fa5	1	Other	Other
+a53b868b-4a03-4e56-9d25-e2c3a38eb49d	1	Other	Other
+a53bf6c2-e69b-4a66-abe3-bee71f06be4e	1	Other	Other
+a53c061b-450a-4eea-82c9-5fcac5e8b8d1	1	Other	Other
+a53d1017-3c29-414f-a7f6-0d38fe7c774b	1	Other	Other
+a53d1a22-7572-42ac-a57f-a20181f37774	1	Other	Other
+a53d2819-5728-4c7a-ba48-0a92f46d68fc	1	Other	Other
+a53d911d-5fea-47e0-8ac4-db7e2cbe9346	1	Other	Other
+a53e571e-f21d-42b4-9aa5-e2464008ba1b	1	Other	Other
+a53f8938-6e1a-4f11-9115-f9572f75825a	1	Other	Other
+a53fbb2b-2a2a-49b0-8aae-a2e92550791a	1	Other	Other
+a53fff16-ef25-4200-9204-950f7261b6c3	1	Other	Other
+a53ffffa-ef5b-421e-ae1d-3b66bd63c139	1	Other	Other
+a540526b-9680-4993-97ce-d4c6695209d8	1	Other	Other
+a5408b35-59c8-4e6b-aef0-cb6e5cfee4c2	1	Other	Other
+a540c30e-4fba-425b-be97-c56966f6e27c	1	Other	Other
+a54196c2-8b1a-4066-ac53-5043378da7d3	1	Other	Other
+a541be27-65b2-4e37-92db-ab3fe47c0dfc	1	Other	Other
+a541bf0b-2716-4702-a3ac-47ba0527cb1a	1	Other	Other
+a541f058-8c33-4f03-a534-623c1601880d	1	Other	Other
+a5420d9b-e869-4d76-8453-191fba3a32d0	1	Other	Other
+a5425b10-f6ac-40cd-b651-2a6e05fb0127	1	Other	Other
+a542910f-dd50-4266-836b-6ef05c25ecb7	1	Other	Other
+a54298cb-36ce-4dc4-8fa8-4ca8cd47257f	1	Other	Other
+a5430822-5d86-4aa2-a3cd-92de9abf37c3	1	Other	Other
+a5431121-cf65-46b1-ad16-7f5b8855f483	1	Other	Other
+a5434380-fae7-41e2-b248-11de2364ce15	1	Other	Other
+a5438c2b-9fb2-4c09-aa2e-6479037990a8	1	Other	Other
+a543a5b7-d265-4e3f-a96a-011ba4ca8863	1	Other	Other
+a543a974-95db-43d4-9e58-796d4410f344	1	Other	Other
+a544196a-85fc-4963-ab06-c0182d1f4722	1	Other	Other
+a54419d4-bcfc-4219-9cad-992c6092b232	1	Other	Other
+a544217c-87e5-4164-93be-b8ab267cd56e	1	Other	Other
+a5443b96-7369-4b57-ac54-d22941d4d830	1	\N	Other
+a54444e6-eaeb-4ec8-a81b-bc61c0569c6c	1	Other	Other
+a54484bb-3ff5-434b-891b-af460f2979d3	1	Other	Other
+a544ec62-5b7c-406f-8a3f-eb83b0061807	1	\N	Other
+a5453166-3664-4af3-b625-19deea7fdc65	1	Other	Other
+a5454bd7-8553-405f-925c-b40e7de32406	1	Other	Other
+a54559eb-f2c0-4f32-8e82-ace62c2540ff	1	Other	Other
+a545bcb4-9fab-44dc-895f-3dbdb3cda59a	1	Other	Other
+a545c339-7ae5-4cae-a21e-3a0bee726fb7	1	Other	Other
+a546252f-384f-479c-94bf-d2c38b15bc5e	1	\N	Other
+a5463a97-e4f4-47e5-b2f9-20f6ee685652	1	Other	Other
+a5465ab8-2579-4d2c-afde-7fe4aca4cc74	1	Other	Other
+a5466abc-910a-4825-af62-0aaaf8470a24	1	Other	Other
+a546c5a0-395f-4eb8-8082-17feefe29b2e	1	\N	Other
+a546ce39-fd7d-4441-bbba-c9dcb9c575e5	1	Other	Other
+a5470678-acfb-4de9-8cd0-4b170870dd59	1	Other	Other
+a54725dc-393b-4925-9c60-3fcd7b75bd35	1	Other	Other
+a5472aa7-16cb-4e12-b416-c90a92ed3b4b	1	Other	Other
+a5474c97-6b73-4ef3-9862-2eff2b0a5dda	1	Other	Other
+a547d63b-df72-40cd-8a6b-5d318749a6c3	1	Other	Other
+a54821a9-1808-4b12-85ca-3440567037a7	1	Other	Other
+a548b92e-8ca0-4aba-ad25-4b8502283965	1	Other	Other
+a548bea9-2695-40d4-87ea-fee3e12c7be2	1	Other	Other
+a548c291-01df-4880-8009-ab3af27eaee3	1	Other	Other
+a548cdc6-0b92-4394-a52d-e74f99450cab	1	Other	Other
+a548e71f-b387-4d64-8163-68b102dcbef3	1	Other	Other
+a5494717-8051-448a-a781-a105b2e41e48	1	Other	Other
+a549c370-599d-43b4-a8af-4c765e25c4c8	1	Other	Other
+a549f9ed-b822-4e70-abab-5e9600b09d04	1	James	Other
+a54a253b-368e-4f08-b1ab-fb4bdd883bc4	1	Other	Other
+a54a3757-5935-4ae6-8973-3c34dd271b4c	1	Other	Other
+a54a538a-dba0-471a-bf84-77aafe08f743	1	Other	Other
+a54a7390-a9af-4e88-bef1-754168c59ab1	1	Other	Other
+a54aca62-e482-4caf-8f8f-1c44677f670b	1	Other	Other
+a54ad54a-ed2a-4e97-8def-0c181215ab30	1	Other	Other
+a54afcbe-b858-4033-943c-3d273331347b	1	Other	Other
+a54b6ef0-681b-4fb6-89c1-6876cdbf21f0	1	Other	Other
+a54b9fc6-cd54-439a-8a36-91923a4fbb80	1	Other	Other
+a54bb1a2-5baa-441d-a470-e5c0881f773d	1	Other	Other
+a54bbfb4-c6aa-4e4f-90a9-287a57800907	1	Other	Other
+a54c44e8-d8fe-49d5-ab36-a34ee87bca9f	1	Other	Other
+a54c4ce1-7db6-4f4b-8010-15f2403da80d	1	Other	Other
+a54ca554-4d0a-4bf2-ab15-86474849b9be	1	James	Other
+a54ccaf0-5f59-47db-8c40-ff69df85e9d6	1	Other	Other
+a54cfa5d-c36d-478f-8b1d-d226d7963fbf	1	Other	Other
+a54d128b-2c78-4e51-896d-6b59d20760ca	1	Other	Other
+a54d3929-e171-4d4a-84dc-287904d8bbdc	1	Other	Other
+a54d9369-695b-4fd2-87fa-69cd7ea3647d	1	\N	Other
+a54dc94e-d648-4a5c-bf24-bc5e12f6fa3a	1	Other	Other
+a54dec44-cffb-4829-8fcb-1ecc2c90793f	1	Other	Other
+a54e0957-e01a-4e9e-a8fc-186cb020d4ea	1	Other	Other
+a54e1fa4-c591-435d-8cc0-6d24f3aba775	1	Other	Other
+a54e616a-a002-473d-9644-55451dce8be2	1	\N	Other
+a54e669e-5346-4d19-b9c7-5855208412b8	1	Other	Other
+a54e675b-822c-4896-9cc1-ef3751e4569d	1	Other	Other
+a54ef074-e6fa-48f5-9b7f-53dd6b2a66c1	1	Other	Other
+a54f0ec5-8e6a-43f3-b891-352442861fc3	1	Other	Other
+a54f126f-1edd-4ff6-8594-b21b670d003d	1	Other	Other
+a54f31ea-1813-4f23-a168-d899c7f96deb	1	Other	Other
+a54f698a-e8f1-4745-ac50-3e92407e731a	1	Other	Other
+a54f956f-2f9a-4d76-97e0-17fcee71cb51	1	\N	Other
+a54fa81e-1487-41d0-ab81-76980cfe2eb8	1	Other	Other
+a54fab99-42ab-4665-9eba-90dff50fbdea	1	Other	Other
+a54fed68-a245-4ae6-b53a-1c06e6f07582	1	Other	Other
+a54ff84b-801f-49d4-a0de-df3e86f94bba	1	Other	Other
+a54ffcb4-8069-4da3-9e3b-1826e9320a75	1	Other	Other
+a5509c43-f862-4bc7-9ba5-49894aa26914	1	Other	Other
+a550e2f5-3417-4137-9490-bbf4be24e7d9	1	Other	Other
+a5515193-b605-4075-adb4-315442807684	1	Other	Other
+a551a2d2-dac8-441c-b0ea-74c824e925ba	1	Other	Other
+a5524861-36a5-47a5-a65f-6d57c81829aa	1	Other	Other
+a5526677-5d1c-4fac-b8a2-068369086876	1	Other	Other
+a552b7ce-27c1-434c-b1c4-87d83e9f83ff	1	Other	Other
+a552cfce-4cd1-4192-b393-5dc1d487597f	1	Other	Other
+a552d801-0596-4d12-b020-31db08883ab8	1	\N	Other
+a552e2b7-2868-408b-a650-7f517d1b00ce	1	Other	Other
+a552f661-5f5c-486c-b78f-2cd5aaf9a850	1	Other	Other
+a5534156-43dc-4582-af4c-d2b4ff04505b	1	Other	Other
+a553790d-724e-4976-8a40-6ec17a56159c	1	Other	Other
+a5537f16-409c-476a-ad11-eccfbab935cf	1	Other	Other
+a5539b95-0487-4ad4-85d9-abf56ca8c483	1	Other	Other
+a553a496-6817-4bef-9a38-4fcff0f02f74	1	Other	Other
+a553cc05-9be6-49ff-9f2a-af52557825ac	1	Other	Other
+a553cc1f-f75d-42e5-a665-c16a5e45a0c9	1	Other	Other
+a553d8bd-5c55-436d-9643-c72a4e03c31a	1	Other	Other
+a553e203-40ee-40a2-8d17-2ed76cc373e9	1	Other	Other
+a553e3bc-2eb4-49bc-bf05-ed526ea5e014	1	Other	Other
+a55412fc-a865-4448-9027-4d73871e1d3d	1	Other	Other
+a55443d0-3a91-4bb0-b7fe-7ab78f11f6e5	1	Other	Other
+a554ef38-e3eb-490f-892f-222a73aac6ab	1	Other	Other
+a555002e-1759-41bd-9645-40e34faa15f5	1	Other	Other
+a5551a4e-c776-4551-b162-65b9fb7fd0e2	1	Other	Other
+a5552845-f814-42af-9e6d-2983045665bc	1	\N	Other
+a5552a1d-f911-4109-927f-e343d22c0745	1	Other	Other
+a55540a6-c93d-45e0-a936-3a3a58ae5506	1	Other	Other
+a555548c-3021-4cbc-aff5-171d04d43e19	1	Other	Other
+a555e607-98b5-4b20-84be-c102aaf27161	1	Other	Other
+a555f588-7823-42a1-ad05-080def6f3eb9	1	Other	Other
+a556118e-89f0-41de-8049-952ddd40e1ab	1	Other	Other
+a55614c0-a5c0-482f-b2b2-cf80fc5bf014	1	Other	Other
+a556645b-4e13-4ba8-ae22-a2f833fe7310	1	Other	Other
+a5568b5a-fe54-4f18-8a6c-ab4f8f9654d0	1	Other	Other
+a556c649-65b4-4542-8fb3-4864db7ebc47	1	Other	Other
+a556dd3a-b771-4aa6-9bcd-f9d502cfb712	1	Other	Other
+a5570750-ee3d-43d0-bc22-02c6037478f6	1	Other	Other
+a55707ce-6d5c-4bc3-a8ff-90b5570924f3	1	Other	Other
+a5570b4a-a288-49b4-b80a-fd705ff04ade	1	\N	Other
+a5578866-1c17-49af-8e2b-845aced42aef	1	Other	Other
+a557a9de-5eae-4d9e-808f-d1219faf5655	1	Other	Other
+a557eb18-58b3-46f0-8b25-9271af815be9	1	Other	Other
+a557fbdb-3a50-4b57-8b4f-41c5824e4901	1	Other	Other
+a557fbe3-fa5e-4748-850e-0186f611bcc3	1	Other	Other
+a558142a-a885-408c-a5f2-521f169bd9f0	1	Other	Other
+a55815d7-3e3c-4854-ac91-addc6d628f29	1	Other	Other
+a5589f7c-b9b3-459f-8f6c-c1651643aabc	1	Other	Other
+a558da3a-acca-4d8c-b96a-14eff2133423	1	Other	Other
+a558e530-5ecd-4082-a9cf-e7fbeea99f3e	1	Other	Other
+a558e894-10fd-4507-aa7f-a152fe0728cb	1	Other	Other
+a55907ac-9040-4dea-b6d7-3406e41f3585	1	Other	Other
+a55933e3-3187-40ba-8b3a-ae934934a583	1	Other	Other
+a55941ef-bf4e-44ed-bc4c-80766b7ea934	1	Other	Other
+a559a807-0d09-4f81-bd58-06dbf7cc8d0e	1	James	Other
+a559cfb6-b238-42a5-a4a5-4d1f04bafcab	1	Other	Other
+a559f0af-ca14-4d19-bbce-9b99972e0829	1	Other	Other
+a559f7e2-c156-4a0d-b1f4-fea9eb7f3c0a	1	Other	Other
+a559ffa0-c057-4cd8-8bef-8081808d736f	1	Other	Other
+a55a231d-9ba0-462d-bd83-6f7104be1be2	1	Other	Other
+a55a6f15-a3b6-4882-a9bf-bf83187bfbc2	1	Other	Other
+a55a8bac-5864-4733-9c2b-6a77d8b5b657	1	Other	Other
+a55aa6f3-c9ee-4e69-acea-d0c7800f82a4	1	Other	Other
+a55b21ce-eaa9-4552-b27f-b86f352990a8	1	Other	Other
+a55b4125-1d13-48ee-ba25-507c7faa2eb1	1	Other	Other
+a55b6da0-9443-4e3a-be70-d54161c2d700	1	\N	Other
+a55b8555-8455-4f9a-a66b-951478c3a6c8	1	\N	Other
+a55b8b0e-4a58-4a25-af44-781cd3c1f2d2	1	Other	Other
+a55b8c4a-cf0a-4699-8155-b3bff5a4a700	1	Other	Other
+a55b9e58-2d90-4132-bd2c-12f77cf242c0	1	\N	Other
+a55c8028-8fb8-4261-affc-0bf2f91d08cc	1	Other	Other
+a55c8e61-8427-44f7-afdc-ee0bac8fd796	1	Other	Other
+a55c9a32-bdd8-45c9-b499-255c53fc3a86	1	James	Other
+a55cc2b0-98a6-497f-8831-c999e6828f18	1	Other	Other
+a55cf00e-43af-4525-b9b0-bcee8245a857	1	Other	Other
+a55d5699-f806-4c21-a783-e095f284d62f	1	Other	Other
+a55d835f-cc58-4212-8c57-a6e40500f9b3	1	Other	Other
+a55d857e-70aa-4dde-97cd-37f5d2da1637	1	Other	Other
+a55d9430-8767-453b-8d3f-24c0d6f0e030	1	Other	Other
+a55df528-bd3a-403e-845a-e13110b911f6	1	Other	Other
+a55e0642-238a-4e49-ae6f-919f804dc12f	1	Other	Other
+a55e2b84-0cb0-4c87-bd6c-b33891dbd9f6	1	Other	Other
+a55e2dd2-4d2f-4427-aad7-a1cd70dd6723	1	Other	Other
+a55e3d0f-1b18-4b61-87ac-52e505f5f883	1	Other	Other
+a55e7e32-fa1c-437f-bfe2-78eec7f997b2	1	\N	Other
+a55e98f5-ad92-4a07-8628-e750006a1be8	1	Other	Other
+a55f1da1-6f8b-4bfb-8d0c-c2cb854bc9f0	1	Other	Other
+a55f54f1-1545-4c01-86b9-062e48625335	1	Other	Other
+a55f5645-d4ac-4795-aa83-87b1c5deb56c	1	Other	Other
+a55f8a7a-2254-47e4-b67f-a01238c6f306	1	Other	Other
+a55fd127-fa94-4622-8214-a57e11cbd182	1	Other	Other
+a5604cbc-b1f7-46a6-ab37-ebedef4a2d36	1	Other	Other
+a56052c2-22b9-4a83-9740-e802f5835e35	1	Other	Other
+a5606076-4bd3-4ae6-bb66-0942135ec33a	1	Other	Other
+a56060b3-5e56-4642-b218-27e13d283313	1	Other	Other
+a5606576-271f-4d35-a68d-d8e200f031fd	1	James	Other
+a560c657-3601-46ec-aa6a-7976a1968f8f	1	Other	Other
+a56102fa-33fa-4aad-ae85-35d8f974bff2	1	Other	Other
+a5612778-f5ea-43bf-ae59-168ccb4a0148	1	\N	Other
+a56161cd-aff9-491d-a5eb-a5f2814577d7	1	Other	Other
+a561871f-76e6-4879-927c-9c35e21c32e4	1	Other	Other
+a561e7c8-7aa7-409d-9f0a-8b550823f846	1	Other	Other
+a562239c-c6ad-4e33-b69b-3da69e243638	1	Other	Other
+a5627410-be56-4fdf-8496-8f24da37b06b	1	Other	Other
+a5629252-2628-4dcb-ae44-504b97e55752	1	Other	Other
+a562a90a-ed58-49b7-98b5-719760bb28c6	1	Other	Other
+a562b96e-c3b7-4058-898a-a64cc54b433b	1	Other	Other
+a562f336-db2d-432d-b9e9-a2efdcad00ad	1	Other	Other
+a5630d58-aa47-438d-941d-3bbec6675ece	1	Other	Other
+a5636bf2-ed5f-4d0c-88d8-26f446af01e7	1	Other	Other
+a563f352-7b0f-4fac-acc7-062f98af38dd	1	Other	Other
+a5646449-a886-4723-8860-b3d05acaee87	1	Other	Other
+a564c400-6baf-4cb8-9ff3-eb85065551ba	1	Other	Other
+a564e09a-676b-4267-a0be-fcf654849cec	1	Other	Other
+a564e833-2c9f-4916-b432-346a908ef916	1	Other	Other
+a5651a47-0117-4314-8856-0ecfd5939d5b	1	Other	Other
+a5657d33-faed-4407-baa8-4e53bdd87af1	1	Other	Other
+a56594ed-56cf-4d13-a06e-f1905ff4ca98	1	\N	Other
+a565a36b-c45c-4aea-9d13-16f99333dea9	1	Other	Other
+a565f23d-d501-4d4b-b070-36b7737892ce	1	Other	Other
+a5660d00-8ffa-4007-bc5a-a8e902554b82	1	Other	Other
+a5667d8f-9574-456f-b138-1f4da85eec94	1	Other	Other
+a5668f4d-8229-47bc-8e3d-3ec3ea1aa9f9	1	Other	Other
+a5672f75-07eb-4900-9603-8d8fc105c688	1	Other	Other
+a5675173-4f8e-4dba-8d8b-b8919b3931b6	1	Other	Other
+a567607f-8c1f-4e5a-8f3b-5efba013dbdf	1	Other	Other
+a567618f-c3c6-4087-99b3-92e82f5f58d6	1	Other	Other
+a56784ff-8928-487a-931f-d455d869f518	1	Other	Other
+a5679a8a-371b-46c8-aa84-9576ef17d9a5	1	Other	Other
+a567cf5a-bf73-4135-a793-494fa7cfc7c9	1	Other	Other
+a567e93e-caf1-437b-954a-dc12bfc89c4f	1	Other	Other
+a5681b20-8128-43d3-ac55-f8ba27ba1a6f	1	Other	Other
+a56828c5-e877-4119-98ca-127d1ca5f9bc	1	Other	Other
+a5687da7-8115-443f-96df-0a319a3afbaa	1	Other	Other
+a568a9c7-4ce2-42f7-8d79-6f409fcc4de0	1	Other	Other
+a568dae8-a60e-490f-a32f-ad7faccef1bf	1	Other	Other
+a5692360-079f-4540-b0a4-16f370b0b222	1	Other	Other
+a56929a4-6e52-4f9d-8170-0e011bd4f393	1	\N	Other
+a5692e48-43b1-480d-aade-2301d14ad3e0	1	Other	Other
+a569307a-d1e4-4064-8374-bf02a542b506	1	Other	Other
+a5696ea4-1785-477e-8237-b7221660bcfa	1	Other	Other
+a5696f84-6e73-40c6-8fca-4b23c7ac4c8a	1	Other	Other
+a5697a63-6a3c-4121-b0c3-b6d716b365cb	1	Other	Other
+a56998aa-e1b1-4019-8dfe-c06ab5f6c773	1	Other	Other
+a569b211-52e3-42ea-9967-e2cd13372cb1	1	Other	Other
+a569c4f4-6031-4b84-929b-a434375df670	1	Other	Other
+a569ec35-e9b1-4286-acf9-b348086ec5cb	1	Other	Other
+a569ee19-933b-4fc5-a105-75ef2a55041c	1	Other	Other
+a569fe22-4c45-444b-9a52-fdff1b2e36c9	1	Other	Other
+a56a0546-2cc7-4927-87e8-3010debb74c7	1	Other	Other
+a56a28d4-aaf0-4416-8c5d-786a67df6a45	1	Other	Other
+a56a4714-f539-478a-9339-d91593180b28	1	Other	Other
+a56ab05a-e081-4e38-9d9e-bda8a11c12ed	1	Other	Other
+a56abeb2-d19e-4d1d-99bc-7d7e31fcc0cb	1	Other	Other
+a56ae284-83bb-446b-9589-ea793b193bdf	1	Other	Other
+a56b3f01-fb90-42cb-b116-02eb3fe2991d	1	Other	Other
+a56b7e5d-ebf2-4cc7-9b16-f088817b8466	1	Other	Other
+a56bca9a-18eb-4d9e-acd5-0784c4c093a9	1	Other	Other
+a56c119e-9f6f-11e7-b7a7-fa163e8624cc	1	Other	Other
+a56c2bb6-5787-46fd-a225-1397d38a15a4	1	Other	Other
+a56c63a7-46f6-408e-9aa2-9af9afbf8fc8	1	Other	Other
+a56ca017-aa27-4473-b13a-c9d7e16e0a29	1	Other	Other
+a56cd69f-f223-4c5c-9f62-b738adeba080	1	Other	Other
+a56d954d-1b0c-4038-b373-d4847c7990b4	1	Other	Other
+a56da1c3-a0e1-4fe8-9b26-9c0447abcf39	1	Other	Other
+a56db379-175d-4097-9739-60a042617084	1	Other	Other
+a56e8a2f-c4b9-4874-b773-c78b57908cde	1	Other	Other
+a56ed533-09f8-4814-8d7b-7f2fdda4a0e3	1	Other	Other
+a56ee954-fe73-45d3-a99e-f5b1e8f50231	1	Other	Other
+a56f0e24-308a-4886-8ced-522977125e1a	1	Other	Other
+a56f119d-1453-41fa-b1f8-c72695040d73	1	Other	Other
+a56f3b71-9d71-4527-9621-7f82f9724731	1	Other	Other
+a56f3bfb-55df-41a2-ae63-fe6af128f0cc	1	Other	Other
+a56faefa-96b6-4348-9b45-814cd3b1a89f	1	Other	Other
+a56fd7a3-098c-4b65-aa6e-d69c55ca371e	1	Other	Other
+a56fe3f5-9985-4d7c-81a9-1e0e58dedf0b	1	Other	Other
+a56ff612-88cb-42aa-b60b-29465ebee1eb	1	Other	Other
+a5700de5-b46e-4f18-9664-0ebd7333a3eb	1	Other	Other
+a5701b02-f230-428e-8484-8198a45c31f9	1	Other	Other
+a570434b-dd9f-44f3-82ec-5b6196cedbe7	1	James	Other
+a5705201-b64e-41f2-bbcd-c4c5b8d8d6de	1	Other	Other
+a5705ee7-3549-4469-ada2-e425372740b9	1	Other	Other
+a570658e-f1de-45fa-9fdd-a07102269012	1	Other	Other
+a5709bfa-b7ba-486a-8b68-09c546aa15ee	1	Other	Other
+a570bd58-b944-44f5-8d0b-6305879a90ac	1	Other	Other
+a570eae0-db51-4472-b1cf-86e9e3870e0e	1	Other	Other
+a570f636-7838-419f-bbdc-3eed9ad9c0ac	1	Other	Other
+a5711859-7b2a-4bea-a9c6-d45a8e160942	1	Other	Other
+a57135b3-db54-4a46-9928-b2583e90dc4f	1	Other	Other
+a5716048-e0fb-4617-ba2a-d07e88c31448	1	Other	Other
+a57223dd-d4a5-48e4-8a33-99216a87ca38	1	Other	Other
+a5725195-9d1d-4f0f-9fad-bb67714e49a2	1	Other	Other
+a572578e-36db-44a3-b516-970c644fe5c7	1	Other	Other
+a572824c-9ffe-43d7-9c94-9ad728dddf4a	1	\N	Other
+a5728a21-3eab-48af-92ad-4f6361dd6dcf	1	Other	Other
+a5733a35-fe4a-4c7d-9343-d3d51c164298	1	Other	Other
+a5735b94-8b68-4a76-9d41-b1a1ecd964f3	1	Other	Other
+a5736f5b-6506-4d38-a12a-6a4fdfa8b4eb	1	Other	Other
+a5738925-738b-49ae-a047-0d5e01939e50	1	Other	Other
+a5738b65-dd7c-4a46-bba1-74649d006e75	1	Other	Other
+a5738c78-f484-46df-ab3c-ab484fefc342	1	Other	Other
+a5738d6b-8c33-478d-9bae-bb282d1cbf9f	1	Other	Other
+a573a74c-5407-47ff-b1c9-dbcbb68bac70	1	Other	Other
+a573c2b8-04e8-4e19-a042-18ec12099383	1	\N	Other
+a573c320-0ed9-4831-bf77-c29468fca561	1	Other	Other
+a573cd7b-b4d5-41d6-af96-28e05c92d5b7	1	Other	Other
+a5740a37-c8d8-44ce-9d83-4a1cc7c23747	1	Other	Other
+a5744815-bc27-4f74-b923-9b4268621f6d	1	Other	Other
+a5746d7a-c4b8-4023-a0f7-8d0940426b32	1	Other	Other
+a5747c27-dd07-4977-88a5-17dfdc236fbb	1	Other	Other
+a574bea9-77d6-457d-9293-b94e28416edd	1	Other	Other
+a574c7ad-ae41-40e8-a0e2-20af7d92a958	1	Other	Other
+a574ed0d-fb94-4dda-b4bf-d0b780350eeb	1	Other	Other
+a57528cf-373d-4ef1-9423-1f153c216c66	1	Other	Other
+a5756f16-a261-4391-ba5f-65deb90874ea	1	Other	Other
+a575b4a1-11a8-4c46-ac43-1e85592c0780	1	Other	Other
+a575d09b-b379-4bbe-918e-c99dad0ef355	1	Other	Other
+a5763c9b-b2b9-4061-8cc7-30e418dca807	1	Other	Other
+a5764367-e89b-4891-b617-d6b1594b168b	1	Other	Other
+a576c128-68ae-43c6-a25a-fc9487913387	1	Other	Other
+a57717ea-fef9-4039-b0c6-c4c8f21004ea	1	\N	Other
+a57743b8-d765-4875-9dd8-6fd14e54073d	1	\N	Other
+a577cd19-83cc-4625-a910-37d1799f56b4	1	Other	Other
+a5781124-bef3-41ec-bcae-47921cbf0719	1	Other	Other
+a57850b9-010c-4c58-bf94-c1c8475fbb29	1	Other	Other
+a578a86d-249a-454c-838c-5b3b0df85988	1	Other	Other
+a578b0a7-283f-4c7a-8a49-5cf5fb37cb86	1	Other	Other
+a5793fd1-8ff4-4ce1-95c0-8fd6e1cfc2e1	1	Other	Other
+a5798db9-43ee-4005-8303-8c4f7acc6505	1	Other	Other
+a579adab-7a59-4fa2-b327-03632c731e71	1	Other	Other
+a579afbf-7384-4a36-873c-435f7dd44ae0	1	Other	Other
+a57a62d6-0f07-4638-bad8-fc0903620d65	1	Other	Other
+a57a7eea-4093-4858-90da-da1d115fbf42	1	Other	Other
+a57adce0-60d7-4380-b4b9-fda4be32199a	1	Other	Other
+a57b4140-c5ef-4bf8-81cb-4bf2cad30f77	1	Other	Other
+a57c6bc1-5af8-4e02-864a-c03fa3de665a	1	Other	Other
+a57c93a4-a4f4-4d3c-979b-600359ed73fb	1	Other	Other
+a57d050a-2bf0-4c39-9ccc-e66368136ad6	1	Other	Other
+a57d6996-6cfa-4243-820f-21694df92460	1	Other	Other
+a57d9c3a-69d7-454c-b328-b97dbc009675	1	Other	Other
+a57db4f9-bc86-4b54-8734-56d7d336a665	1	Other	Other
+a57de415-a405-4826-a807-9cc06e8c0842	1	Other	Other
+a57e11bb-e579-4c2c-bf89-cb9c8900ccc8	1	Other	Other
+a57e2d42-5b3e-452d-9913-48f6fb5e9412	1	Other	Other
+a57e4873-2fd4-4c7f-8ac9-fa40a1a6e4dd	1	\N	Other
+a57e98c8-e55e-47ff-8709-7feeec20db9b	1	Other	Other
+a57f0868-422a-4d80-88b4-d922d671fa75	1	Other	Other
+a57f3cfe-de50-11e7-aba2-fa163e8624cc	1	Other	Other
+a57f4c1f-5820-4a5d-bb8e-b5b31697f0e1	1	Other	Other
+a57f73d3-816d-446f-b370-fda1760eedba	1	Other	Other
+a57f9734-f0aa-4efd-8324-055c97b0a657	1	Other	Other
+a5801d86-be30-459b-8696-b88f19f0e374	1	Other	Other
+a580338c-021b-4cef-92e6-e18070730988	1	Other	Other
+a5804c45-984f-45c3-aae7-6a681d8c59a0	1	Other	Other
+a5808203-7563-4d11-b795-3b29338ae7b4	1	Other	Other
+a580a748-6eba-4c56-b931-cbb23785e0ab	1	Other	Other
+a580ef32-865a-4a37-bedc-a975277eaf99	1	Other	Other
+a58135a7-6b09-4536-b907-2e4f79a160cf	1	Other	Other
+a5813dfe-2937-4556-95d9-4bd96fa51c48	1	Other	Other
+a5817449-e496-40c0-b9be-4d8a210c468e	1	Other	Other
+a582657e-c6cd-4656-91e6-1b9c3aa4189a	1	Other	Other
+a582820c-0411-4653-af9d-29bd2c0963e2	1	Other	Other
+a582980d-2c4a-47be-84eb-b19e67f3625e	1	Other	Other
+a582bece-741f-4c70-8f8a-0ad7077d98ca	1	Other	Other
+a582db27-5244-479f-861d-8ecf138f0ed2	1	Other	Other
+a582edb2-0494-4874-bf98-e0887495105e	1	Other	Other
+a583101c-d9ea-4a82-a90a-ee11f0c48885	1	Other	Other
+a5832f1c-2939-4ef8-842b-07592b983cfa	1	Other	Other
+a583bb12-ceab-4000-badf-f53fc08ef830	1	Other	Other
+a583cb68-0108-435b-bf7a-9b3f91a0ef43	1	Other	Other
+a583eb0f-ed4c-47f5-a6f3-b1f43e4cad00	1	Other	Other
+a584485d-0687-4f4c-82ee-6805948b9ec1	1	Other	Other
+a584b1fd-4918-49dd-a9a2-468837d827c2	1	Other	Other
+a584d508-3920-44a0-b07b-fd1b35033f80	1	Other	Other
+a584d857-dcd7-42e7-a8d9-5c5de3529145	1	Other	Other
+a5853585-7d39-460a-8e55-3796775fdc8a	1	Other	Other
+a5854b32-512e-40b4-ab6f-6d1e84e5060a	1	Other	Other
+a585523e-b99d-419a-9ada-884392977a59	1	Other	Other
+a5858ed3-f865-4663-8804-aad2e4829a4a	1	Other	Other
+a5859bb2-4653-4e8c-9c32-028127006914	1	Other	Other
+a585abd5-c9b3-4160-9a46-56226cfaba8b	1	Other	Other
+a585b0be-693b-47c1-9e60-8d27ddd47d67	1	Other	Other
+a58617f3-251e-418f-9f27-995a5ec4b17e	1	Other	Other
+a5861efe-2694-4cb4-9bfc-08309553ca4b	1	Other	Other
+a586424b-fcca-46d1-85ca-ebb7ca52590d	1	Other	Other
+a5864ca1-7b35-4156-95a9-b8a45d7bc5be	1	Other	Other
+a586ed7a-8f94-4110-8e20-e0977560dbe1	1	Other	Other
+a5871fcc-3f23-4fea-a061-ea75cd23b191	1	Other	Other
+a5872177-9129-4af9-a402-01f168c824cd	1	Other	Other
+a5872409-9f4c-4b5a-9801-bf2cd27f8794	1	Other	Other
+a587c0a7-0793-4e69-afdf-829dbde3a606	1	Other	Other
+a587d15d-ab54-4eaa-bd9d-f95e547e9eb0	1	Other	Other
+a587d2ac-3f8f-41f8-8183-a7caa8a6b074	1	Other	Other
+a587ec30-f9af-4020-8001-70e24888102f	1	Other	Other
+a587ff6b-5832-44a4-8817-9b908f10a28f	1	Other	Other
+a5881a44-aa07-4c45-924d-cbbbc15641e9	1	Other	Other
+a5886e3e-e38f-445f-accf-38ba5ed68ea7	1	Other	Other
+a5889428-c59b-4d8c-832b-16076ac80850	1	Other	Other
+a58896a5-ea64-40b1-afe5-d5b531a90350	1	Other	Other
+a588a31b-c7ad-4b00-96a6-e118a933b0ce	1	Other	Other
+a588a77a-bcc8-4cac-8b6a-f77666362cff	1	Other	Other
+a588acaf-e4c8-4d76-b701-f88781b1e319	1	Other	Other
+a5893c6a-2185-4b6e-b324-3bc6bf0d8b1d	1	Other	Other
+a58941d8-b373-4dc6-8aeb-432e7c4a2c14	1	Other	Other
+a5894f18-a475-4e9f-9699-680dd7c91ae7	1	Other	Other
+a58953a6-5766-4512-be33-2bbdc6fb3d46	1	Other	Other
+a5897306-88c4-4687-8178-4b3755c6e164	1	Other	Other
+a5898fcf-fa43-4474-99ee-44a9a5c168e5	1	Other	Other
+a5899aaa-3048-4814-914a-dfdd9585d984	1	Other	Other
+a589d0ea-1cec-4f61-b83a-f3b86e22ab20	1	Other	Other
+a58a054a-bb96-4a97-823c-3449c084f21c	1	James	Other
+a58a2e08-aedf-4194-af7a-600f533f09aa	1	Other	Other
+a58a3113-59b6-444e-90a3-3881aac66c71	1	Other	Other
+a58a3809-8b27-423c-8f63-54d1e5aa02d1	1	Other	Other
+a58a428d-3ac3-4247-99f0-0f8ec2aa3187	1	Other	Other
+a58a5599-7640-4255-b25e-383a575a5c72	1	Other	Other
+a58a64a3-eded-4d94-a980-342bcc1cbfa9	1	Other	Other
+a58a7b7b-3f69-40c7-aef1-50503f85125d	1	Other	Other
+a58a9b11-db42-4606-b227-f74245660e3a	1	Other	Other
+a58ab7a8-e5e7-4434-9efe-0f6793d3c0df	1	Other	Other
+a58adaa4-71f8-4fee-ae80-da567744b367	1	Other	Other
+a58adb46-3805-460e-b82c-cc3989c7dd0d	1	Other	Other
+a58b2eab-5817-4fe0-9e97-497dbd5c3e5a	1	Other	Other
+a58b3eb6-b72c-4f77-8ffc-09a8a5946c6a	1	Other	Other
+a58b3eff-d666-4174-8632-2b768d5e886f	1	Other	Other
+a58bf1ee-3c42-462b-8311-06e7277770c3	1	Other	Other
+a58c3394-1d33-4a8a-a035-4ba47c761d37	1	Other	Other
+a58d2455-9369-4e27-a1e2-d7a0b2506239	1	Other	Other
+a58d5b98-cc37-40c1-8ef7-2f8a5a2f711c	1	Other	Other
+a58da1cb-20ca-4a40-88f8-6f87920351f7	1	Other	Other
+a58da7df-c72e-42d3-9d40-1173582ccaa6	1	Other	Other
+a58dc3a3-a6d3-4977-86de-226747931164	1	Other	Other
+a58decfa-a627-4885-9a5b-281b4dcd045b	1	Other	Other
+a58e3c56-e0f8-443f-8986-985e5db04710	1	Other	Other
+a58e50a6-ef12-4894-9535-3e7a7f3e17ae	1	Other	Other
+a58e6cbe-2261-4be9-9f19-9ad5080a95c0	1	Other	Other
+a58eb647-61c2-46cc-b668-f60a6d7edfb6	1	Other	Other
+a58f14ca-bcab-4755-833d-be688f81b03a	1	Other	Other
+a58f2ca0-c68c-44cc-9522-5d9235921a36	1	Other	Other
+a58f5c2e-2b9c-414c-bdcc-cfecda4ee0d5	1	Other	Other
+a58f778e-523e-4832-bced-3ba965eec5d7	1	Other	Other
+a58fb6e2-a81a-47a3-8030-686f47c28814	1	Other	Other
+a58fd3de-770e-4ca9-8e66-6f48495120e3	1	Other	Other
+a59023b1-f9bc-4860-81a3-a8ff9ee8fe06	1	Other	Other
+a5902ae6-32b7-4030-bbea-d21ef3ad124d	1	Other	Other
+a590445c-77d8-4d63-91b5-684d58a90ab9	1	Other	Other
+a590a95a-6eb6-4967-992e-1fbb79a263b4	1	Other	Other
+a590c774-d128-4c1c-a3f1-6b83753a3e29	1	Other	Other
+a5910a8d-8daa-41e4-9cd5-ee163fc8922a	1	Other	Other
+a59116d7-74c2-421d-8628-bde6ae71ea30	1	Other	Other
+a5916d8d-6664-4778-8a59-8a81f2457f68	1	Other	Other
+a5917c13-7364-49ac-8cb1-7c42a3ad15b2	1	Other	Other
+a5917e87-b797-4909-bbd5-49001ffe945a	1	Other	Other
+a59189ee-2e79-4ba7-88e2-e1041dc201b8	1	Other	Other
+a591b048-1e78-4728-b113-13f7126ecbcf	1	Other	Other
+a591bc28-e3d0-49e3-8388-69267aecaddf	1	Other	Other
+a591c6e8-e472-456a-8c69-e3374e1a93a6	1	Other	Other
+a591e989-c648-4a06-81df-c2f816c40424	1	Other	Other
+a592565f-6f51-46aa-aaa8-8ced5e4d6e24	1	\N	Other
+a59299e1-eab8-43f7-8394-38ae0c106ea9	1	Other	Other
+a592c512-d6fd-4bfb-b65c-dc0ffe28c34c	1	Other	Other
+a592ee42-3faf-49de-87b3-b4eb2e245d7f	1	James	Other
+a5934def-260e-441a-80fa-5ae9ceb7ddb6	1	Other	Other
+a5935bd7-454f-4b55-b7cd-6996d33397d9	1	Other	Other
+a5937e34-47ea-4ecb-aaa1-f10236a66c0a	1	Other	Other
+a59395bd-fe40-4bc9-880d-ea875e323ce2	1	Other	Other
+a593fa52-5f92-4e57-8abd-f70064416ccd	1	Other	Other
+a5945fc1-c83d-4616-9382-aee660ee3d5e	1	Other	Other
+a5948ed3-7750-40be-b8c7-14df36a438e4	1	Other	Other
+a594b821-02db-4f21-89f3-502dd9449ef1	1	Other	Other
+a594debb-ffa4-45fa-8cec-5fe5b04ebd81	1	Other	Other
+a594f0e2-a475-4600-8ab0-d6b8d0676ada	1	Other	Other
+a59505b6-99a2-4972-95b1-80d29174cfde	1	Other	Other
+a59538ee-6e3c-407e-95e7-2ccb5e181520	1	\N	Other
+a5954d93-6687-4977-a5ac-69139bae5e14	1	\N	Other
+a595d781-5a35-40f1-8cae-9102721814b8	1	Other	Other
+a595e322-a7c2-4523-b697-bb835989ce5c	1	Other	Other
+a5960383-5c3b-4012-9ca7-0ce2791f42c1	1	Other	Other
+a5963312-89c0-4e37-bd3a-dca07db1bbcc	1	Other	Other
+a5966974-fb00-4903-8dd1-a8abf0240d05	1	Other	Other
+a596b114-7be1-4f61-aa84-641490990dab	1	Other	Other
+a59722ec-d7cd-4aba-96e4-09ef4d4f8983	1	Other	Other
+a59727f9-e900-4760-9450-3e096d6638ed	1	Other	Other
+a5974288-a634-47f8-81eb-4850e21c0504	1	Other	Other
+a5975d3b-78bc-4e76-a572-25d175af44ee	1	Other	Other
+a5979d0d-4e40-474d-9ad7-e29849b58e7f	1	Other	Other
+a597f066-321f-4b27-9874-8fc28fedbe94	1	Other	Other
+a5984344-bc0b-4143-a33a-be0b3b88f447	1	\N	Other
+a598762a-a832-4f05-be82-fd4c8ec421b4	1	Other	Other
+a598da1b-124f-421c-9d3d-06e71a3a2330	1	Other	Other
+a5991de0-64ec-480d-b4ab-8e5c13f3278c	1	Other	Other
+a5995697-c23b-480b-bb17-00ffbd8d39b3	1	Other	Other
+a59a068d-6aca-4b55-9113-ea6dd2bd01ef	1	Other	Other
+a59a5b92-eccc-406f-b5c6-0d31421f8be5	1	Other	Other
+a59a6243-7c30-4610-b833-f1c510852e67	1	Other	Other
+a59a648e-83d7-4ebe-ac08-5c2ad67cbbb2	1	Other	Other
+a59aa802-f624-4253-98d0-b670e063506f	1	Other	Other
+a59aba2d-e548-4dd1-9c60-d44ce4f7dc56	1	Other	Other
+a59abebb-292c-436e-a0a4-c734df09169c	1	Other	Other
+a59adab4-6401-4ad8-be7d-15d582cafdd2	1	Other	Other
+a59adfa3-8654-4311-9ff6-8efbf6d492f8	1	Other	Other
+a59aea09-063b-453c-8add-b10aa8afaa37	1	Other	Other
+a59b08b5-484a-4486-825e-6d4c0c3004ab	1	Other	Other
+a59b176d-3aad-4d84-97ac-54931e8ccba8	1	Other	Other
+a59b35a7-3a8a-4c2c-b36c-3e1bfb5d6cca	1	Other	Other
+a59b5b63-4270-47d6-870b-d45ad7dd4e93	1	Other	Other
+a59b8736-2ea7-4dc2-8de9-0e8c3f485fff	1	Other	Other
+a59b911e-4d06-4965-a4a8-189a8a6e4b55	1	Other	Other
+a59bb780-2fe9-4b92-8062-47e208d9d76a	1	Other	Other
+a59bc950-7e90-4141-a754-d22e4af6819c	1	Other	Other
+a59c4e9f-8491-4a61-921b-0c375ee28ccb	1	Other	Other
+a59c7cfb-45fe-42da-90f0-081f329c2d86	1	Other	Other
+a59c88fd-5b20-4df0-8626-64087379b1d6	1	Other	Other
+a59c9493-24cd-4580-88a6-76a23edbcdad	1	Other	Other
+a59ca3f1-0dea-4b03-935e-add0c5d2600b	1	Other	Other
+a59cbd40-e98a-4f26-91a2-8ed5ed72978b	1	Other	Other
+a59ccae4-9f9e-461f-a6a8-d128cfb77322	1	Other	Other
+a59d048b-ac40-4819-8db0-59cd19ae5818	1	Other	Other
+a59d4b31-bd2d-40a7-aa27-bfbbce16bbfe	1	Other	Other
+a59dcc54-a332-4fee-bdaf-10ff7f44a45c	1	Other	Other
+a59dcdf8-484e-41a2-a45e-902827647b5a	1	Other	Other
+a59e4fd8-480d-41fc-a499-a5613b8ccaa8	1	Other	Other
+a59ecc96-defa-4067-b3af-7624ce0f0418	1	Other	Other
+a59f1488-ee1c-479e-82e6-fab3376748a9	1	James	Other
+a59f1e3b-fe01-41d5-b85f-fa252da8d775	1	Other	Other
+a59f7550-0814-4950-bf60-40f5efcda04c	1	Other	Other
+a59f9124-0b11-4f88-ab2a-a2d1018304a8	1	Other	Other
+a59f99f3-2018-4288-9748-17d347185e39	1	Other	Other
+a59fb7ad-f664-415d-96c4-bb958a46b1c4	1	Other	Other
+a59febaa-319b-4a46-8d14-c3cd90ad802b	1	Other	Other
+a59fed5b-a5bd-4e57-ba48-5024bc8bcf54	1	Other	Other
+a5a0102a-9feb-4053-a6a8-344f1f89a45f	1	Other	Other
+a5a025f4-50bf-4b61-b4ca-6f95e7d900e2	1	Other	Other
+a5a0627b-4d00-424c-b311-a5e63c183fc9	1	Other	Other
+a5a09ba5-7657-4fee-8d54-6d7f499db9f4	1	Other	Other
+a5a0a589-8d2d-41c7-8943-768e94b516d9	1	Other	Other
+a5a11e4c-0690-11e8-af05-fa163e8624cc	1	Other	Other
+a5a1488b-022d-42d6-82a6-9a6c33ae005e	1	Other	Other
+a5a14f91-f760-4585-b844-606e2a62ef60	1	Other	Other
+a5a15fe6-5603-4826-ace2-49bd80ef95a8	1	Other	Other
+a5a216ea-52d8-4e71-8be4-7e49d1a7f169	1	Other	Other
+a5a22966-00e5-4887-838c-61c9e7cde3b3	1	Other	Other
+a5a262f2-e873-438e-bece-0052d8788a1f	1	Other	Other
+a5a26b54-270a-4213-ba36-81ade8a7b725	1	Other	Other
+a5a2b7a5-c477-4efb-8fa6-d8e724c7794a	1	Other	Other
+a5a2e435-ce4d-4463-a80a-3a92ce4f9e64	1	Other	Other
+a5a30470-fff1-42f5-90eb-dabc1b017d4f	1	Other	Other
+a5a34412-7b84-4bf9-ac50-0a4eedc6b65e	1	Other	Other
+a5a3723c-9d46-40bb-9cbd-89587e9aa2e3	1	Other	Other
+a5a392cf-5ff8-4db6-9883-9774c27532bb	1	Other	Other
+a5a3a592-c0f6-46ec-9bfb-595125ac2486	1	Other	Other
+a5a3e0ec-0bd7-4cad-9488-b2f12c4c2c52	1	Other	Other
+a5a3e25c-f698-47d3-bfe7-35756540b647	1	Other	Other
+a5a42411-9f3f-4a57-8b39-d4e8daa93360	1	Other	Other
+a5a441ea-c16c-481c-95fa-8595076a1118	1	Other	Other
+a5a451c0-9c74-479e-8601-02884f03a983	1	Other	Other
+a5a4de63-117b-435e-ba4e-9c72fbf1ddfa	1	Other	Other
+a5a50fb2-e996-40af-88ba-58494c05b515	1	Other	Other
+a5a51512-cd46-405f-93de-cf34f64c1043	1	Other	Other
+a5a577a8-8e46-4eb8-9c4a-dc960123b127	1	Other	Other
+a5a5dea9-cf25-42b3-972b-d4b1f6dc6971	1	Other	Other
+a5a60562-c916-4571-a7c2-76da4749f5da	1	Other	Other
+a5a6a3b7-9cd5-4f73-97ad-ae76a3aa5ee4	1	Other	Other
+a5a6a6bc-6113-44f4-a9ff-debafb095e98	1	Other	Other
+a5a6a976-da75-4465-8f7e-be4faa740256	1	Other	Other
+a5a6de8b-af75-4890-a4dd-dcabead0fe69	1	Other	Other
+a5a71df1-963b-4c11-bd4f-510fe160e9ec	1	Other	Other
+a5a7588a-edae-492b-b4e9-61f0dbf3deb4	1	Other	Other
+a5a75e5d-0c83-42fb-8711-8f853ad50ba2	1	Other	Other
+a5a77894-f0da-4ea2-b4bd-f378fca0c5fd	1	Other	Other
+a5a789a5-009b-4d97-8bba-a1cc5e1b0d58	1	\N	Other
+a5a7c525-68ca-4ae0-80be-01c1b3295211	1	Other	Other
+a5a7f958-3d4a-4d27-b60b-83355e6ac500	1	Other	Other
+a5a7fc97-ca97-491c-b6cc-2562d2d13657	1	Other	Other
+a5a87c00-4646-49ac-842f-97b2807912a7	1	Other	Other
+a5a89e56-ac05-46c8-bfbf-ba6328d81f9d	1	Other	Other
+a5a8b6c3-a1e2-4835-be01-7b841c14f42d	1	Other	Other
+a5a8bcc1-10ab-494a-a7ea-b1118824a505	1	Other	Other
+a5a8c886-9e59-4cfd-b5dc-e26cb4967bf8	1	Other	Other
+a5a8cf45-971b-4420-929c-b0678437631e	1	Other	Other
+a5a8dec0-bd89-4790-bc37-19e304fb24db	1	Other	Other
+a5a90db0-39b8-4c3a-aef3-13c66476a4f1	1	Other	Other
+a5a9152f-733f-40aa-9308-2d7c4d12a972	1	Other	Other
+a5a92110-5d47-4bf5-ad50-6e6b9f2b918b	1	Other	Other
+a5a9a20e-26ae-4c5d-b90c-a74a26ecb0aa	1	Other	Other
+a5aa8aaa-8610-40ec-ba55-9856d96e3e44	1	Other	Other
+a5aab653-8252-4fe9-8349-d081f396fe26	1	Other	Other
+a5aad261-f42e-4f00-98f0-5dcd663010b5	1	Other	Other
+a5ab21bc-ffab-4c9e-8ffd-acbf29448ac0	1	Other	Other
+a5ac2464-c28f-4c88-8eda-8c289ef9a928	1	Other	Other
+a5ac2d2d-d17f-4607-b2ac-522edb574216	1	Other	Other
+a5ac43f2-b8e5-4ab6-9b95-1af6e287e728	1	Other	Other
+a5ac9e4a-ff9b-4a54-a47c-d6dc157cd0c5	1	Other	Other
+a5acc97a-dd91-456d-bef1-283f8e3c44b6	1	\N	Other
+a5ace2f2-3ea5-41f1-91a5-c5730f312fb7	1	Other	Other
+a5ad199e-db1a-4631-983f-cb0d09ee561f	1	Other	Other
+a5ad4571-a71e-4c9c-98c7-9756b63ffc43	1	Other	Other
+a5ad4a07-ccb7-4c39-b79b-7a6770186685	1	Other	Other
+a5ad524f-6892-420e-9cea-e490cdd59ebc	1	Other	Other
+a5ad9153-c712-4f26-ab3c-57a71291b1dd	1	Other	Other
+a5add117-d78a-43df-af43-6fae720761a3	1	Other	Other
+a5ae32cf-cb3f-4ec6-8a71-e9a76114160f	1	Other	Other
+a5ae8475-4f31-4a36-b387-11649bc9a0a3	1	Other	Other
+a5ae8562-0ab2-46d8-ac11-316cdbb0c749	1	Other	Other
+a5ae95ca-9cc1-4ed8-8da9-34273a19c87f	1	Other	Other
+a5aee2d5-bf8a-4647-a65d-5a8a2797a42f	1	Other	Other
+a5af00e1-8e30-448f-957f-613adc087d40	1	Other	Other
+a5af3d89-d97b-48f4-ad28-aa435d6bea8b	1	Other	Other
+a5afb969-5b49-4a50-abbd-e4a798539b51	1	Other	Other
+a5aff03e-6de9-4af1-be3f-30bda282b6e6	1	Other	Other
+a5b051cd-1379-4623-a615-e8c6e7ce7c50	1	Other	Other
+a5b0ca57-b02e-447f-9bc0-2bc2654018e6	1	Other	Other
+a5b0cc86-b140-4ba5-9186-7cd4df814b6c	1	Other	Other
+a5b0d900-b423-40ec-b22a-74a92b6a78bb	1	Other	Other
+a5b0f1b7-e428-4428-b694-c647a7253fdf	1	Other	Other
+a5b0f90d-9503-4e06-8253-697ba408f734	1	Other	Other
+a5b1b469-2663-48eb-bd4a-1b15c69c7481	1	Other	Other
+a5b20d27-b9d0-4ad1-a27b-0970742c9b2c	1	Other	Other
+a5b22d60-52c7-4528-a8e2-8a6d2db4a4fd	1	Other	Other
+a5b25359-dcc3-4d63-8bf2-600c759a6592	1	Other	Other
+a5b25e0c-6324-448f-8db9-06ab747f481d	1	Other	Other
+a5b2ae84-86a3-4ba5-937d-839b04b02b2f	1	Other	Other
+a5b2d429-540a-40c6-ac20-747b99752cbf	1	Other	Other
+a5b2fa27-7c13-4ba9-b581-210311e0f826	1	Other	Other
+a5b30aad-4e7b-44f5-b931-e1b2c02abd82	1	Other	Other
+a5b32bf6-e470-4825-a139-fbb4389df0e2	1	Other	Other
+a5b3a4d7-f535-4b16-bd95-04433528bcba	1	Other	Other
+a5b3c137-1a20-47ec-9734-548ef2557df6	1	Other	Other
+a5b3e433-15a6-4322-b3ee-ebfc739aa925	1	Other	Other
+a5b43d73-89e3-42de-b252-5d98dd2330ff	1	Other	Other
+a5b4e515-d918-49cb-807f-84772f969c61	1	Other	Other
+a5b4e5b7-0b88-4b52-875f-ff99a10b197a	1	Other	Other
+a5b4fb89-6361-4405-b6b4-1d1430ec4d98	1	Other	Other
+a5b539d0-538b-4e9c-925a-37e1385cdec3	1	Other	Other
+a5b553a8-48a1-4a7a-93e6-59d8451a63d6	1	James	Other
+a5b59e23-fcaa-4cad-9326-20d7a250a72d	1	Other	Other
+a5b5a59d-4fc6-4364-a9f0-0a6215887637	1	Other	Other
+a5b5d4e4-8fdc-45c9-85d1-a0133000ec71	1	Other	Other
+a5b6027b-3721-46e3-8031-2a6089e0bd8d	1	Other	Other
+a5b60766-e575-4eb8-8615-ca17921a02cb	1	\N	Other
+a5b64c90-d95f-40dd-abe2-8c4e71bef469	1	Other	Other
+a5b6662a-d601-490e-8e7e-b722a852e1d1	1	Other	Other
+a5b670cb-af96-4dc2-a051-d52bf8666fe9	1	Other	Other
+a5b69454-7499-45d8-9b26-02253c9a4f78	1	Other	Other
+a5b6ace5-4c55-41d4-adcc-9a7409d4ae89	1	Other	Other
+a5b6b4be-a554-4615-a1bb-bf206870d902	1	Other	Other
+a5b6e687-8a8e-44ac-89a4-d766aa417a06	1	Other	Other
+a5b6f651-3c36-49bb-b953-c6018fe7944d	1	Other	Other
+a5b717ab-53b2-44ad-8ab9-fc995080dea5	1	Other	Other
+a5b736c9-034a-4311-a832-72d38b2672a3	1	Other	Other
+a5b75f16-80a6-4f4d-a1e9-7014f8ef7e64	1	Other	Other
+a5b76fe2-fcc8-45b6-a554-6ab5b34bcdd0	1	Other	Other
+a5b7a09a-7b4b-4b41-828e-3183a24c739c	1	Other	Other
+a5b7c305-9d81-4622-a745-08abf194f057	1	Other	Other
+a5b7f989-995f-4f5c-ac26-7fd3dcf4819a	1	James	Other
+a5b81117-8679-458c-a279-0d3f156628ca	1	Other	Other
+a5b81370-39d5-47f6-ac9f-39839e6d414e	1	Other	Other
+a5b8853c-ccbe-4e89-a235-b818efad99c9	1	\N	Other
+a5b8c104-80b2-4a4e-9c0e-8ea493716654	1	Other	Other
+a5b8ce54-2c35-4219-bef3-9d85dd1a7cb3	1	Other	Other
+a5b8d32c-dde0-4f0d-a53d-f8da44519565	1	Other	Other
+a5b92718-521e-45de-b59d-10f9785e7bb6	1	Other	Other
+a5b97eff-2802-44f2-ac0d-9fca4a909b85	1	Other	Other
+a5b97fa3-0a3a-4d75-91ab-8064d0cf80fa	1	Other	Other
+a5b9a3fb-64b2-434f-81c5-862ef4550960	1	Other	Other
+a5ba1e9b-0fc1-4577-a91d-0bd6e1bfbb78	1	Other	Other
+a5ba8a4b-7aac-4d13-8fa2-65bd2adb936f	1	Other	Other
+a5ba8c3e-2e4e-4c78-b28c-c3d4267880d9	1	Other	Other
+a5baabfe-c16e-4366-9e38-4df7f7d204e9	1	Other	Other
+a5bac245-b42d-4fa3-b2fd-6e85e94768fd	1	Other	Other
+a5baf7ea-39ac-406f-ac65-93f51dabe08c	1	Other	Other
+a5bb11ab-3eab-4531-a790-ba2e6e853670	1	Other	Other
+a5bb1cf7-52c9-40f3-bb66-93af65ec03cd	1	Other	Other
+a5bb3497-5ced-4af0-b87d-5764b9c77760	1	Other	Other
+a5bb9d15-fe23-4596-b8c8-9f62d54f9cb8	1	Other	Other
+a5bbebdf-7cb9-43be-9ccb-737ff408bd2c	1	Other	Other
+a5bc03b9-8798-4e55-884d-82d81b5f8c93	1	Other	Other
+a5bc2ff2-5eef-4aaa-93ad-d1a9b6ed5559	1	Other	Other
+a5bc3822-f32f-489c-96ad-16e1ab52b510	1	Other	Other
+a5bc5dca-8d52-4000-9399-7273a42cab83	1	Other	Other
+a5bc744c-3a29-4317-ba68-082441c9b943	1	\N	Other
+a5bc8761-72a1-43c0-a4e6-b57b43de8f57	1	\N	Other
+a5bcab94-c93f-4fb9-a73c-a17e2a8e9df4	1	Other	Other
+a5bcb292-ef2d-41f9-bba1-b804d1e41efc	1	Other	Other
+a5bcdddf-5ca3-46cf-9b6b-d2d7e685493f	1	Other	Other
+a5bce8fb-4cb4-4b9c-ab41-d47f28ec40db	1	Other	Other
+a5bcfe89-b3ff-4db4-96e9-e4f6c53e94f4	1	Other	Other
+a5bd65aa-7a85-415d-8ec1-afb833c38812	1	Other	Other
+a5bd6dbd-3258-46e6-83e5-01825e93f27b	1	Other	Other
+a5bd8045-602f-426b-a9eb-f32705f0b1a0	1	Other	Other
+a5be1c95-8cf8-4e05-88d2-d620adf72b84	1	Other	Other
+a5be285a-3ad8-436a-9fc4-ef31db5003f2	1	Other	Other
+a5be46c1-c87b-4cf7-8d66-1aaaedf6e239	1	Other	Other
+a5be9294-8bec-46d2-8314-6c489473b0d7	1	Other	Other
+a5bedf7c-b6e2-488e-8dbc-98ef7999c468	1	Other	Other
+a5bf073e-01bc-4381-8b1a-256cd1b14a24	1	Other	Other
+a5bf5f95-bb2e-4773-b6dc-6e43d37e0e7b	1	Other	Other
+a5bf6223-69d4-48f3-9079-bd1183fda247	1	Other	Other
+a5bf6777-541a-4c7d-97b6-10328386df36	1	Other	Other
+a5bfa99e-5eaf-4642-83fe-9abfdf27738c	1	Other	Other
+a5bfaa0d-bcfe-4f07-aa58-cf535894a816	1	Other	Other
+a5c01731-b2ad-45eb-9761-195a1c77229c	1	Other	Other
+a5c026d8-b1c1-4fa7-83c3-ef9c8cc87ad5	1	Other	Other
+a5c03c0c-221a-4e2f-9d2d-32902afba205	1	Other	Other
+a5c088ee-a74b-11e7-b7e8-fa163e8624cc	257f6774-64eb-11e7-954b-fa163e4dd901	Other	Other
+a5c09e9f-64e1-48d4-a016-cf0b50af11b4	1	Other	Other
+a5c0a3cb-8e8f-4e11-ace4-25d0399a39f4	1	\N	Other
+a5c0d203-0f14-4188-8335-bbb45d5a5332	1	Other	Other
+a5c0f874-fccf-4f59-8688-49481bf573bf	1	Other	Other
+a5c14a43-1924-415d-9987-507b352f7da1	1	Other	Other
+a5c181bf-9c4a-4c77-8ffa-d5efa5493484	1	Other	Other
+a5c1a85f-afbb-4181-9fd9-19a45ef21f8a	1	Other	Other
+a5c1dd3f-8c80-41b2-abf4-1c4d6e421b42	1	Other	Other
+a5c1e1b8-3bf0-479a-9f76-452679a3a913	1	Other	Other
+a5c2143e-42e9-48f8-88d3-110625f0ee8b	1	Other	Other
+a5c244fc-7418-4d46-9fb3-462a4aa7a1d2	1	Other	Other
+a5c2b0a6-64fc-465b-bb62-0c87e72696ee	1	Other	Other
+a5c2b196-f7a0-4d82-9cb5-84b186f712c3	1	Other	Other
+a5c2da02-89ab-4789-9a8e-a650a6384567	1	Other	Other
+a5c388b7-c5b6-4392-902e-bda02f35def4	1	Other	Other
+a5c39c04-4650-4caa-ab50-ea2ef2694758	1	Other	Other
+a5c3fc65-6691-4b65-bae0-15bae9bdd798	1	Other	Other
+a5c4085b-3683-4016-b884-b6080e787919	1	Other	Other
+a5c40a4b-1f42-441b-8174-db661b8a9381	1	Other	Other
+a5c40ef4-4914-4977-ab44-6810bc8794a5	1	Other	Other
+a5c412ae-71fd-448e-9bc1-6e9f1662a4a9	1	Other	Other
+a5c44278-83fe-4772-8387-70285f0671d3	1	Other	Other
+a5c4aee7-3b16-40fb-b5a7-fb9c2bd00c53	1	Other	Other
+a5c50927-c53f-4632-a993-fa9bf6ac107b	1	Other	Other
+a5c51839-17af-4b3d-9f6d-a972069ec9ab	1	Other	Other
+a5c5227e-c54a-476c-9ac0-a5cdb0e7012d	1	Other	Other
+a5c5354b-5b26-4ceb-8e72-8a1511cea788	1	Other	Other
+a5c53a12-e7a1-40fd-b103-3cdd3f3f8f3e	1	Other	Other
+a5c569fa-eb21-4e0e-b378-2354c225e021	1	Other	Other
+a5c58339-5bcd-48fb-be7c-f4c7d1ffe676	1	Other	Other
+a5c59595-2608-4a9c-b25f-ec0f90ad8e69	1	Other	Other
+a5c5a7f0-90a8-4593-9abc-776544bf780e	1	Other	Other
+a5c5f68f-7ab0-435d-843a-45a6161282dd	1	Other	Other
+a5c5fda6-f52a-11e7-9a7c-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a5c60fcf-5007-4ba0-9fce-c22b3743c32a	1	Other	Other
+a5c63e11-66cb-466e-a195-406a1a68e504	1	Other	Other
+a5c76819-86f8-4d43-9a5c-d4781d6e7df7	1	Other	Other
+a5c76d9f-adee-4f10-a6c2-0129df7c106e	1	Other	Other
+a5c78805-2e07-45d9-a77a-6ef91570f6a3	1	Other	Other
+a5c79687-d908-4759-b026-a403c77f0eb8	1	Other	Other
+a5c815b9-75bc-42b9-a3fe-b078aab341b7	1	Other	Other
+a5c90772-e34b-4546-a8a8-18f8d6a6d6f3	1	Other	Other
+a5c9617a-dd32-488f-9037-5e4dcb32f267	1	Other	Other
+a5c96c4c-03d9-4d7f-a5e9-1aa404efe8b0	1	Other	Other
+a5c97031-54c3-401a-909f-c6976a997d94	1	Other	Other
+a5c99708-54ba-4c01-9c28-e0cc94e6cdfd	1	Other	Other
+a5c9b8de-2489-4d6b-9ae8-5bc75314ac24	1	Other	Other
+a5c9bc17-0faa-4d13-84ce-be8a0f7683f7	1	Other	Other
+a5c9fb0d-8487-4d55-ad6f-d487ea4760e9	1	Other	Other
+a5ca0b1b-b9c2-4af4-b6db-9d065da1b287	1	Other	Other
+a5cab743-e427-4325-909e-8d6824b8adf3	1	Other	Other
+a5cae4ab-f3cc-4936-890b-f6cc424bdeb0	1	Other	Other
+a5caeb11-3639-45d6-811c-bdd58248e0b7	1	Other	Other
+a5cafccb-f3e8-4f98-8b8b-56b285be2f89	1	Other	Other
+a5cb10ca-3017-4be1-9d20-3d8e93ae4420	1	Other	Other
+a5cb24c2-428c-4c42-844f-e6b64f07ba9d	1	Other	Other
+a5cb27c2-7a35-468f-bb92-bfb1299a3bf3	1	Other	Other
+a5cb27f0-5b8c-4db8-8ffe-61536d7a13f5	1	Other	Other
+a5cb3f7b-017f-47f1-871e-57e6c633fff6	1	Other	Other
+a5cbcc15-b751-43be-82ef-105ae0462ad4	1	Other	Other
+a5cc102b-062d-4794-8c3b-7a05c045f59e	1	Other	Other
+a5cc3ee6-825e-4a6d-b432-242dfef5b136	1	Other	Other
+a5cc4ff4-bf74-4287-a45e-cb8c36522050	1	Other	Other
+a5cc9771-5032-4667-a16d-a5ab611012ff	1	Other	Other
+a5ccb356-d68e-4545-a9fd-8d24a70445d2	1	Other	Other
+a5ccc385-4673-4de1-aada-6ac27835a8e9	1	Other	Other
+a5ccea54-7b7d-4467-97e0-47b1eb458b9b	1	Other	Other
+a5ccf483-72cb-47e1-b57b-b116271eb93f	1	Other	Other
+a5cd102e-5326-42db-b32c-24bdf73c7404	1	Other	Other
+a5cd5d43-3b60-42b4-8e44-3818e008869e	1	Other	Other
+a5cd68d5-6c76-4fce-a2ab-c544ac68d4d8	1	Other	Other
+a5cdb356-e8c8-480a-8064-2cf830a82f32	1	Other	Other
+a5cdf495-bd01-47a7-afb8-e82cd4fbc86f	1	Other	Other
+a5ce33dc-a9a1-46bf-a02c-696ef3de78ad	1	Other	Other
+a5ceaaf8-fe52-4966-a3a1-a1aa907933ae	1	James	Other
+a5cf2dba-db76-4545-8107-62cfb10afaae	1	Other	Other
+a5cf8d40-d4e1-4b88-938e-34e0cb820b41	1	Other	Other
+a5cf8f02-0064-49c1-907d-75e26da8eb8e	1	Other	Other
+a5cfdf2f-a09c-4826-b811-1914d92c7ccb	1	Other	Other
+a5d00230-9831-4643-b500-ba8ed9506a82	1	Other	Other
+a5d00481-ed49-4d57-9f20-1236b79c3eab	1	Other	Other
+a5d03e00-fcad-4dd0-a4a9-ba843d3fc2bd	1	Other	Other
+a5d0ac74-a4b6-4c8c-8d07-c3b244beca98	1	Other	Other
+a5d0b586-e3a1-4a14-8d67-bd8c72819293	1	Other	Other
+a5d0bbc4-1157-4226-b22c-3a118181583b	1	Other	Other
+a5d0d8c7-5436-4ab9-8d11-c9090be32142	1	Other	Other
+a5d11c08-80c4-4336-a2a7-b399cd05a2e0	1	Other	Other
+a5d11c0e-d23a-4e9a-ab6a-5bf5ece3de19	1	Other	Other
+a5d14537-066a-4473-9c3e-1270a9aebf6d	1	Other	Other
+a5d17453-1af4-4b4d-8ef8-a54e69f8366c	1	\N	Other
+a5d1bcb3-74bc-4648-bb10-ee68e1874176	1	Other	Other
+a5d1e7a2-18c3-492e-9a8f-ceb7751b6c03	1	Other	Other
+a5d1f24c-6398-4193-bded-201c74d089ba	1	Other	Other
+a5d205d7-0ddf-4f92-85a3-9bb0dc0a7bca	1	Other	Other
+a5d20c82-30b3-472a-bdc6-8537cc38b0fe	1	Other	Other
+a5d2f7e5-b514-4b38-b6d3-e15e2ba08910	1	Other	Other
+a5d32721-fd6d-407a-b360-ba3226ef5ac4	1	Other	Other
+a5d3600c-dbd3-4c3f-b9e8-6436ff1121d0	1	Other	Other
+a5d3be2b-6074-4934-b060-64ef64634353	1	Other	Other
+a5d40809-bcff-4aea-a116-f94e28fa50cc	1	Other	Other
+a5d40e75-886b-4037-9650-ed4005800931	1	Other	Other
+a5d40f9a-3c60-4a9b-819d-92e126a0d719	1	Other	Other
+a5d41921-523a-4ec6-a671-cc7b484988b3	1	Other	Other
+a5d45732-3d1d-4976-bbba-b420897c2280	1	Other	Other
+a5d49dcc-3e1f-4306-b9a7-d8e7fb47235c	1	Other	Other
+a5d4c1ce-0235-4793-9ab4-f96b2424fc4d	1	Other	Other
+a5d503ea-be43-479f-b205-197ed063aa83	1	\N	Other
+a5d5444f-ecdf-4a69-ab0f-bdd450358b73	1	Other	Other
+a5d59800-3aa1-4ed3-8ff7-dff867521583	1	Other	Other
+a5d5aa8d-9619-4d43-956a-794cd1d75ca7	1	James	Other
+a5d5e6a4-b49c-4f03-8b37-780431a66acc	1	Other	Other
+a5d647f3-61de-4c9f-aad2-01f8ed813bb2	1	Other	Other
+a5d68191-059d-42be-b19a-d2a4d0d70ecf	1	Other	Other
+a5d69ed8-4bbe-48de-82c4-35a218c99698	1	Other	Other
+a5d6a0b7-de5e-47c4-93e2-a49e72beb0e3	1	Other	Other
+a5d6d4c8-5c72-4249-a1b7-7b0d01d1947e	1	Other	Other
+a5d6e5b9-4658-4f2a-a35f-8a11e1714705	1	Other	Other
+a5d77939-e2e4-4a97-a054-433b30e29854	1	Other	Other
+a5d82a2b-acce-41b5-802e-6767645b77e7	1	Other	Other
+a5d82c49-f40e-48f3-82af-df825d55e1b3	1	\N	Other
+a5d8434c-bb0d-46c6-9d07-7f72dc6ac230	1	Other	Other
+a5d8b80c-6931-45ee-af99-62190df33bc5	1	Other	Other
+a5d8da36-66d3-4c72-af4b-a3d83ae40377	1	Other	Other
+a5d90778-4374-4e16-b343-61ac90a19f84	1	Other	Other
+a5d92c08-17f1-4a4b-9fcf-9a3bac78cb8c	1	Other	Other
+a5d985bc-f059-43d4-9489-5546672e7069	1	Other	Other
+a5d9e30c-a5f8-4280-84ca-ab09d81621e4	1	Other	Other
+a5da5392-8495-4f98-b7cc-cf2db2fe1adf	1	Other	Other
+a5da5670-3864-40db-b016-f8d40a947260	1	Other	Other
+a5db2b78-cf5a-4177-b87b-fe92e45b633d	1	Other	Other
+a5db7b22-0304-4491-92db-5877d818fa86	1	James	Other
+a5db9474-a3e7-4646-91af-3bd0c6d4f767	1	Other	Other
+a5dbc380-1425-47af-8bfe-1b0b87a48249	1	James	Other
+a5dbc961-7d5f-4ddd-95da-0c2dad4e24ef	1	Other	Other
+a5dbd051-8acf-42bc-815c-9a272b0a498a	1	Other	Other
+a5dbd075-4741-46e9-ba4c-a541c2c88a69	1	Other	Other
+a5dbe354-b6d8-40fe-99a6-191eecc399f4	1	Other	Other
+a5dc32a1-ab88-452a-96a4-4cf0572877aa	1	Other	Other
+a5dc44a3-31e4-4cbe-852c-6736887325c7	1	Other	Other
+a5dce01e-254f-44be-b3ab-8b271e31756d	1	\N	Other
+a5dd00e2-5b81-445b-b8e1-4e684532afe7	1	Other	Other
+a5dd8f4d-1479-43ea-bf9c-d992e8269fc3	1	Other	Other
+a5ddaede-e469-476b-8c5f-234b72fe90f7	1	Other	Other
+a5ddee8e-e8b2-477e-addf-125f20e729a3	1	Other	Other
+a5de0bbc-f1cf-481e-879b-d158e96bfbce	1	Other	Other
+a5de786e-e8f6-4019-9b05-a46992507cf3	1	Other	Other
+a5ded9b8-efce-4636-b2e5-adf9ee40d4eb	1	Other	Other
+a5deddcd-5a4e-4d7a-a764-c3c4bd98c625	1	Other	Other
+a5df0183-daad-488a-911e-8d20870ab342	1	Other	Other
+a5df34c1-49ec-4f2c-b484-3e8be35f8b85	1	Other	Other
+a5df6339-4d12-42dc-be2c-5d410cfef147	1	Other	Other
+a5df6bd3-2125-491f-b695-fb58cddc1532	1	Other	Other
+a5df8fd4-68cf-47a1-a08d-8904e4547f43	1	Other	Other
+a5dfaa7f-7f85-45fb-b707-9814291073c3	1	Other	Other
+a5dfb166-536b-4515-838a-a35c944f1e42	1	Other	Other
+a5dfcec0-3fc4-4063-9856-9d8fb28dcd8f	1	Other	Other
+a5e02b26-ce51-4ebd-926e-cb7146ea2dd7	1	Other	Other
+a5e04ad2-2401-4327-a3b6-d44791eec268	1	Other	Other
+a5e05249-f198-4810-8c26-21ae1ffd4147	1	Other	Other
+a5e067be-123b-4032-a2df-7c200e0c4faf	1	Other	Other
+a5e0817e-3067-4a7a-90ea-02051787f2d2	1	Other	Other
+a5e0b2df-bd9b-43e6-ae10-fc9fa98abcfb	1	Other	Other
+a5e0b434-3913-4b74-bdd9-a7baa3d0bc15	1	Other	Other
+a5e0fb2d-5ac2-4ae5-9efe-1babee8cfa16	1	Other	Other
+a5e11bf7-d71c-4da1-a1fa-93c8e7c4404d	1	Other	Other
+a5e162d8-b0db-4409-81fc-f1cbe4abe2df	1	Other	Other
+a5e17625-ff5c-4bc7-9e3c-2d8c189f6556	1	Other	Other
+a5e1a036-60e1-4a9f-9d81-203a3e3665a1	1	Other	Other
+a5e1fe8d-3fa1-45f1-95cd-1de18eb3081d	1	Other	Other
+a5e2086e-1713-43a1-be20-0582a6bb5b94	1	Other	Other
+a5e21e50-3359-45a5-8178-4a5de27e27eb	1	Other	Other
+a5e2661e-a9cb-4017-afcf-5cc0c443b6a9	1	Other	Other
+a5e295ad-87f3-476d-88df-5e88b8dd04c1	1	Other	Other
+a5e2bf87-5acf-4971-8a86-72c1cf512eca	1	Other	Other
+a5e2c4f1-3fd7-44a2-8763-45be9ac9b779	1	Other	Other
+a5e3563c-c1ab-489e-9999-9b2f12c62728	1	Other	Other
+a5e36514-ba3f-4afb-bb95-6787ea32eb12	1	Other	Other
+a5e395a2-b5f7-4955-a9e2-f56bcfd96380	1	Other	Other
+a5e3bc29-d16e-4e42-a35d-f2f42b6fb3cf	1	Other	Other
+a5e3f312-7c59-4c8d-9320-c91e7851efbc	1	Other	Other
+a5e44e65-c33a-46b8-88c6-f149879eea96	1	Other	Other
+a5e470cc-54cb-4fca-8d65-3b798490cef7	1	Other	Other
+a5e4d346-9617-4522-acf9-d71854bd6342	1	\N	Other
+a5e4f7ae-a595-4de9-9932-caacbe5bbe19	1	Other	Other
+a5e50507-bde7-4a86-a775-fc5948de9851	1	Other	Other
+a5e50f04-8a05-4225-84d9-a7e78e1e997c	1	Other	Other
+a5e520af-c003-45ad-a95a-577c6c41f1a7	1	Other	Other
+a5e55b91-7445-4f56-8d0f-390006208394	1	Other	Other
+a5e57013-4f17-41c8-8cf2-68490de4a1a9	1	Other	Other
+a5e57fbb-5c19-4c2a-b295-f45fb6074c03	1	Other	Other
+a5e5d2f8-b9e9-4deb-bb58-75ad1b0f7683	1	\N	Other
+a5e5d961-4864-4abb-a4a9-3a3289b0b19b	1	Other	Other
+a5e69b64-0fc7-42ba-b4a8-8c1005d7ac82	1	Other	Other
+a5e6cc50-916b-4e5e-ad22-81394a73dfe9	1	Other	Other
+a5e6d6c6-d875-4722-ae41-e2aa7f56e7a2	1	Other	Other
+a5e7f429-5c92-4e66-a4e8-d22b6929d606	1	Other	Other
+a5e83492-b8c8-4948-bdd7-762d6c3edf31	1	Other	Other
+a5e849bf-7947-490e-8bad-13d2ea13ff90	1	Other	Other
+a5e8de27-0ce1-438e-b513-0c73dbf0eb74	1	Other	Other
+a5e907be-dd13-40fd-9393-dae78c72289a	1	Other	Other
+a5e97f57-5f27-4ecf-8f28-8afe371fe319	1	Other	Other
+a5e9851f-f70f-41c5-8838-93afd214e24b	1	Other	Other
+a5e99386-7cbf-4c87-a2b6-ba1ee7ad9041	1	Other	Other
+a5e9b050-5c17-4b52-9e47-e4a31c1f37b9	1	Other	Other
+a5e9baf9-e240-45d2-b5dc-9046c81d1d82	1	Other	Other
+a5e9be82-2361-4f46-811b-eefc0ffbc748	1	Other	Other
+a5e9fde1-fe3b-4be6-bbba-5619cef563d8	1	\N	Other
+a5ea0ef2-03b7-4658-8b49-08415d3c50a8	1	\N	Other
+a5ea4985-d075-41b4-bfa3-50d4df2a70db	1	Other	Other
+a5ea7c4f-881b-408c-91d1-b0fedfb70ff9	1	\N	Other
+a5eaab76-86d3-4ded-915a-c1815a8c6c17	1	Other	Other
+a5eae19f-21a2-4c6e-83c1-edb2abc29a05	1	Other	Other
+a5eae209-969f-45c5-8eea-4c183fdc5583	1	Other	Other
+a5eaf8f7-d983-4a36-a8b2-7ccd74c4c1b4	1	Other	Other
+a5eb2014-27c8-49cc-a577-0cb8b4552338	1	Other	Other
+a5eb2263-6686-47ce-a626-942a6cbbd8c0	1	Other	Other
+a5eb393e-9c40-4b15-ae60-56279d7239ae	1	Other	Other
+a5eb7e63-a83a-4988-a8d6-29af16e68f7e	1	Other	Other
+a5eb85e7-f838-4fa7-b71f-64011843e5ba	1	Other	Other
+a5eb8af7-7911-4bd0-afd1-e57786fb5399	1	Other	Other
+a5ebb1e9-39dc-4617-b4f4-e956d728e581	1	Other	Other
+a5ebcec4-9ac0-4853-b61c-71f6f99ad876	1	Other	Other
+a5ebdb52-6349-446b-b95d-671a8739a87b	1	Other	Other
+a5ebee0d-44e3-4cef-b9fe-f6ee354522e3	1	Other	Other
+a5ec21b0-4a02-4885-9ed3-94a3ca91cc31	1	Other	Other
+a5ec25d0-7e27-48d6-b6eb-327e8f38c800	1	Other	Other
+a5ec4341-892f-4c41-a4a8-6c936ba61e7f	1	Other	Other
+a5ec575a-772e-4b59-a482-e5011ae8c20c	1	Other	Other
+a5ec806d-014b-45fa-9824-c03807a8b048	1	\N	Other
+a5ed2bcb-da77-48c8-852c-bf8c213edeb4	1	Other	Other
+a5ed650a-c992-488d-b3b8-f23ba4c0a62a	1	Other	Other
+a5ed7bb8-a1cf-4169-9222-4a51d86ab1ad	1	Other	Other
+a5eddc00-121c-4094-a41c-efe9d9258844	1	\N	Other
+a5eddf2e-3e83-40cd-97ee-36db58f90394	1	Other	Other
+a5ee38c1-6afa-4426-823a-02e64e893676	1	Other	Other
+a5ee53c8-6ae2-4cbd-9d64-b0244e779014	1	Other	Other
+a5ee661d-118a-4b43-82b0-2a46b078aa67	1	Other	Other
+a5ee69b8-529e-4d48-b637-7c3e573f2171	1	Other	Other
+a5eeb29c-214a-4678-9fe3-f410c95513f7	1	Other	Other
+a5eec94f-3637-43af-bdd0-de0662501dbd	1	Other	Other
+a5ef05c2-58a8-4b99-a5d5-63174bc6d019	1	Other	Other
+a5ef1756-ec28-4934-9739-e9baaac239d5	1	Other	Other
+a5ef25fc-de36-40aa-915e-acddf73ab9c6	1	Other	Other
+a5ef2e36-4e6a-478f-bd5c-87796f5ef7fc	1	Other	Other
+a5efa48e-8700-4e8c-8908-5d06e20d2dfc	1	Other	Other
+a5efd91f-229a-4d60-a165-1e75e8a43bbe	1	Other	Other
+a5f04108-c827-46d6-83f5-c14f521f59de	1	Other	Other
+a5f08df5-4dd6-4df1-8431-3463a4b379ec	1	Other	Other
+a5f0e684-32c4-4c00-abb4-e0aeaa5491d3	1	Other	Other
+a5f107ab-b4b9-449c-92b3-57a98364f174	1	Other	Other
+a5f1169d-c8ff-445f-a995-ae34a8b29662	1	\N	Other
+a5f13315-cf3a-4518-86c3-1d1d644d73b2	1	Other	Other
+a5f16292-9ef0-4ee4-a891-8c23e29b2dd6	1	Other	Other
+a5f1caa3-7d45-4da1-9f35-331fbbd8d798	1	Other	Other
+a5f1d104-8ae4-4045-a947-42ec6441a38f	1	Other	Other
+a5f1f375-bb7d-4f8e-ac20-9cc7f9a494a6	1	Other	Other
+a5f20c3a-a821-4a41-bd26-9d88079ecb1b	1	Other	Other
+a5f21ea5-67c6-44f1-a000-16d85873d3b9	1	Other	Other
+a5f27f79-a76a-4ff8-b3ec-6ed32e1a1d07	1	Other	Other
+a5f30402-7067-4baf-b2c3-29dfe1e5a1f2	1	Other	Other
+a5f316d5-8242-4564-8c7a-ff0ef2c70014	1	Other	Other
+a5f3943f-712a-4b32-a589-ecefd89ef224	1	Other	Other
+a5f3afce-d9c0-43e5-832c-256c911f1f56	1	Other	Other
+a5f3b0e8-c272-457a-9f10-1ccdb7179c94	1	Other	Other
+a5f3b8d0-8829-426b-a9db-3a5acda9dcc8	1	Other	Other
+a5f3d29c-10fa-47d7-a817-f445df67727b	1	Other	Other
+a5f3e2bb-310b-430c-a52c-2fad1d7cc3fb	1	Other	Other
+a5f44dcf-b866-445f-b533-bedd44369143	1	Other	Other
+a5f456ca-8c68-47e6-9c4e-dfd0e3c65253	1	Other	Other
+a5f4a6fd-512c-423b-8da4-05396d592c7d	1	Other	Other
+a5f4b15c-1932-4117-bd16-3bf33d4203f7	1	Other	Other
+a5f4de90-d9e2-47f6-8a8c-a2af47ef880e	1	Other	Other
+a5f4e73d-af1d-4f1a-b4fe-4d19880a4247	1	Other	Other
+a5f4fc27-a718-4190-9b00-b8ef6c3bd88d	1	Other	Other
+a5f515b6-580d-4102-be96-815172cf8546	1	Other	Other
+a5f542a3-ad3b-4816-97b8-68d3cb589e96	1	Other	Other
+a5f553d2-4715-4d1c-90b7-632eaff631cb	1	Other	Other
+a5f59bad-00fe-434e-82e2-1c317741200a	1	Other	Other
+a5f5cf41-4ec7-4f3a-b294-b21214e4df74	1	Other	Other
+a5f632d5-c17a-4676-afe8-fb398046972c	1	Other	Other
+a5f67899-de65-46f9-a458-387d3461f001	1	Other	Other
+a5f69191-5def-4924-8595-3aca9a98f112	1	Other	Other
+a5f6a566-69f8-4bec-9124-ff7587cf2995	1	Other	Other
+a5f6d7b6-73fd-4b91-8103-07b60164a42b	1	Other	Other
+a5f77658-5bc9-471f-a3a0-0412ab88198b	1	Other	Other
+a5f7ad42-9c6e-4702-9591-799ebb496bd1	1	Other	Other
+a5f7dde0-23e8-43ea-b352-25155654549d	1	Other	Other
+a5f8815a-56f1-482f-95e1-fb6b190a32b0	1	Other	Other
+a5f8a694-6cd4-405b-9ef3-37e30e8186a1	1	Other	Other
+a5f91e14-521f-48ec-b0ba-ae8972c41107	1	Other	Other
+a5f95650-d7df-49b0-8460-19669613b96c	1	Other	Other
+a5f98cac-effa-4c92-b376-0d0f00ecafd4	1	Other	Other
+a5f99a62-07fe-4597-ba59-06916cd58a03	1	Other	Other
+a5f9ad9c-76ff-4bf9-930e-5ed9a32622a7	1	\N	Other
+a5fa35f5-e6fd-43af-b0ae-1b44e9ef8541	1	Other	Other
+a5fa3831-97e6-4156-8c8f-aca9d9c9d061	1	Other	Other
+a5fa4180-19fb-4933-8637-dd9468c5e2ba	1	Other	Other
+a5fa7179-4922-42ec-9bd0-da6dfe74020b	1	Other	Other
+a5fa738a-4112-4afe-b38d-2b0b963fee84	1	Other	Other
+a5fafd57-d98c-40c9-9468-5754f671f11a	1	Other	Other
+a5fb1d71-1fcf-478e-ae60-cfb28ca6dd1f	1	Other	Other
+a5fb35b4-2ffb-47d5-a363-43a11a95aaf5	1	Other	Other
+a5fbb29d-24ae-4761-b204-11267700399f	1	Other	Other
+a5fbe378-ecc0-4a65-9f1f-1e7c1f40daa2	1	Other	Other
+a5fc2967-92ac-4cdb-9b96-11ccfec1ba64	1	Other	Other
+a5fc7758-d73a-411a-8526-46ef4accf3e8	1	Other	Other
+a5fc86a1-fce8-4b18-beff-2ebf84ae63f7	1	Other	Other
+a5fc9126-4655-4556-bcec-289a4951d6ab	1	Other	Other
+a5fcc0a3-07ca-4650-b21f-caf2b17c7a5e	1	Other	Other
+a5fcf05e-5339-4b2b-b033-14abec15136f	1	Other	Other
+a5fd1bb6-c3f0-49ff-b3e2-39659e5f0809	1	Other	Other
+a5fd1fbf-dd46-4dab-ad7d-f99b4e80f451	1	Other	Other
+a5fd21c2-88fa-4d71-af93-b0952b64b806	1	Other	Other
+a5fd6345-3364-49ba-b36d-6a134cc71354	1	Other	Other
+a5fda560-5caf-4b72-87c9-972487624833	1	Other	Other
+a5fdca68-c97f-4754-8635-38a27cfc183f	1	Other	Other
+a5fdec23-9034-42d1-a963-f72a117996d8	1	Other	Other
+a5fe055e-1269-4d6e-a297-7dac4b7589ff	1	Other	Other
+a5fe0f07-3429-49da-ac85-3ee4aa45a3a8	1	Other	Other
+a5fe27e2-62f9-4290-8fdb-1b3ad803c0c6	1	Other	Other
+a5fe73ba-a6d9-4298-8a0f-2221dcb98785	1	Other	Other
+a5fea1a3-d150-4988-a8e5-9fc59af27650	1	Other	Other
+a5fea9f0-21b5-40d9-9145-1ebe0db35ebd	1	\N	Other
+a5fec182-372a-4f64-ae57-c9b28dcaaf54	1	\N	Other
+a5fec1be-cae8-4d19-b555-b8925ddd1f1c	1	Other	Other
+a5fefd7e-2a08-4423-9917-8e1d54e8c83f	1	Other	Other
+a5ff003a-323c-4641-a9a8-2dbab2d7bc7c	1	Other	Other
+a5ff2585-3159-4f61-956f-a6245ad68ef2	1	Other	Other
+a5ff54bc-5180-4ff8-950b-ff00ea60193e	1	Other	Other
+a5ff6793-e739-4d48-9d3a-9bfde23fd235	1	Other	Other
+a5ff7a09-f7ad-4b12-9e56-dc2c1c734022	1	Other	Other
+a5ffe5cd-6ff5-4d4b-9956-3011174c14be	1	Other	Other
+a5ffe7ac-5301-4526-aaf1-0c61ae8de1d4	1	Other	Other
+a5fff44b-7d17-487b-8702-0979cf57f0b7	1	Other	Other
+a6003127-caab-4ad5-ad3c-942a94096c33	1	Other	Other
+a600a94d-f591-4a07-a1e1-cca511fcf6d7	1	Other	Other
+a600b7ff-fd89-4179-a074-aa964bba68a1	1	Other	Other
+a600bace-5099-45a9-83e3-4a9bc4ea4392	1	Other	Other
+a600e64a-2acf-4f1e-b73b-a99ec456b529	1	Other	Other
+a6014c01-26d9-4c3c-92a1-c2f2ff0d73c6	1	Other	Other
+a60161dc-24ae-4625-9170-31f5c6611d62	1	Other	Other
+a601631a-cb07-43bc-b8b8-7fc21d34c2f8	1	Other	Other
+a6019638-a98e-4e46-800f-c3c2385b6cae	1	Other	Other
+a601c4fb-7104-4152-8204-9da12c9fb62f	1	Other	Other
+a601d3ea-853e-476b-a6bb-d4d53f4b17eb	1	Other	Other
+a601da36-4d99-4f01-9059-2223ab667ec5	1	Other	Other
+a601f883-686c-4a33-bb04-4a9fdbf1bca0	1	Other	Other
+a6020464-346b-43e0-aaf9-3b8cc7f031f5	1	Other	Other
+a60222ae-0409-48eb-96df-454920647308	1	Other	Other
+a6022ed6-6345-4609-9733-0a7031f3dfd7	1	Other	Other
+a6027390-0f6a-47d0-a593-d38e48a970ca	1	Other	Other
+a602897b-3bf3-44f0-93fb-29bff3256e23	1	Other	Other
+a6029a5b-2c22-43ae-a9b3-e09f95fca61d	1	Other	Other
+a602d217-57c0-45aa-9532-eda53d170b41	1	Other	Other
+a602f649-ed61-480d-a610-8a88279224a5	1	Other	Other
+a6032d35-50be-4040-a7f1-ab3d606a8be7	1	Other	Other
+a6037744-d747-4871-898e-c87851294c74	1	Other	Other
+a603c1a7-e30d-4ab3-8894-18dd4d6c304c	1	Other	Other
+a6045389-583e-4a06-bd29-f834d47d54ba	1	Other	Other
+a604a642-0a3a-4c2d-a07a-0ba03baf3424	1	Other	Other
+a6053891-9168-4c59-a700-9274d6661a33	1	\N	Other
+a6053eae-c1fb-487d-8f45-336f69d3e3a5	1	Other	Other
+a6054087-5244-47a1-a5fb-b17d2659974d	1	Other	Other
+a60566c7-1669-4a0c-9c8b-d2dfab177229	1	\N	Other
+a6059591-fa93-4c31-8045-27d9d84be9ba	1	Other	Other
+a6059e73-384c-4479-bb38-94fdbad24340	1	Other	Other
+a605ad9f-62a3-43e9-a33f-665e0842b983	1	Other	Other
+a605e48a-fb72-406f-8b6c-0a08554f1c69	1	Other	Other
+a6061134-7496-47af-832e-35e7349d0f36	1	Other	Other
+a606380a-d30b-4a38-817b-222435b73d6b	1	\N	Other
+a606425d-0635-498c-ae8a-32e18143612e	1	Other	Other
+a60644ee-bf53-4a7e-b76c-95feb6f858a7	1	Other	Other
+a6064a33-03e0-4bf3-a9d1-e8900c980ce8	1	Other	Other
+a60661de-05c2-417b-8242-8e92d8ed9719	1	Other	Other
+a60672d3-2476-4264-87b1-24e4df295a36	1	Other	Other
+a60682e3-d1c6-42b7-9102-40a6b88fb2c4	1	Other	Other
+a606875f-e027-4bb9-817a-cd119059aaab	1	Other	Other
+a606a177-fb6c-4560-9021-fab074314f49	1	Other	Other
+a606d941-7c29-445b-9237-dffb5ad47060	1	Other	Other
+a606d9b9-2463-446a-872e-2e01c762c2c6	1	Other	Other
+a6071850-0621-442d-b725-e91fcab7ab17	1	Other	Other
+a6076839-d8cc-40fd-b0c9-60dab65fa019	1	Other	Other
+a6078e47-7d87-4d54-b809-19f2dc6a26f8	1	Other	Other
+a607dfbe-57b6-40fe-9e10-925c0ac865ab	1	Other	Other
+a6080093-b9d2-4f0b-a30b-40f516f48d23	1	Other	Other
+a6080573-b421-41d1-80f5-b45a85396e3f	1	Other	Other
+a608500b-f20a-446f-9041-a729e0cb7ec4	1	Other	Other
+a6086327-7ea0-43b8-850a-fcaf927447aa	1	Other	Other
+a6087f93-2955-4b52-9bd6-e0f082c69113	1	Other	Other
+a608828b-fd4b-443b-a98e-ed8abb25c4ad	1	Other	Other
+a608850e-6168-4be8-a4cd-3b0179aaa132	1	Other	Other
+a608a3f2-fd8e-4bcf-9417-242cdbdac006	1	Other	Other
+a608e89e-86f6-45c0-af1c-291f995412b4	1	Other	Other
+a609118c-2f1c-4df3-852b-718bd6cf7e1e	1	\N	Other
+a6093372-ba6b-453e-8e0b-0b316e2bb478	1	Other	Other
+a60967a6-eb50-4798-9190-23011691aced	1	Other	Other
+a60993d1-9529-469d-b948-4bff2b91969b	1	Other	Other
+a609b49a-333c-4299-913c-0f3d8da92542	1	Other	Other
+a60a2de7-f8c0-49d4-bde8-7d28a312245f	1	Other	Other
+a60ae246-3986-4929-a868-f03031cdb823	1	Other	Other
+a60b0c6d-f707-41bd-92b3-30a55c18f7d6	1	Other	Other
+a60b4a55-8473-4f18-8dba-5382adf5249f	1	Other	Other
+a60bae91-8460-4a34-8eb7-6b83bf24db93	1	Other	Other
+a60bb568-70b8-45f8-9aec-2aa958095dfc	1	Other	Other
+a60bc3a3-da3e-4514-b05e-0117ffeb125f	1	Other	Other
+a60bc758-c3ae-4df7-9dc4-78d5dbd2db32	1	Other	Other
+a60bd7c5-0b52-4fe6-92a9-04a80885ab8d	1	Other	Other
+a60c35da-dab4-44e3-b182-c164c4e7e68f	1	Other	Other
+a60c4cd2-8435-4a73-ba34-aed726e2c17d	1	Other	Other
+a60c79ce-f104-4bd9-8fff-fe94614095fd	1	Other	Other
+a60c9a1b-7bcf-4264-b2e6-1fd5395de9f9	1	Other	Other
+a60ccffb-81ac-41b3-a608-497df6b3cd2c	1	Other	Other
+a60cf824-34cc-4b09-8e91-4c1d659f21da	1	Other	Other
+a60d8124-b0b2-4e5a-a7da-e07befe57610	1	Other	Other
+a60d8b5e-8228-44a0-b3df-4e55922f974a	1	Other	Other
+a60d9c75-4a5a-47ac-8f3e-c14f3bb08f80	1	Other	Other
+a60dbf6b-d398-40b1-a977-5ea2a3e4cb07	1	Other	Other
+a60df234-aa93-4d5e-bc8f-18f5f6e43c91	1	Other	Other
+a60df9db-1380-43f1-b692-c7c701461471	1	Other	Other
+a60e0368-2754-4d81-a84a-0500e833e81f	1	Other	Other
+a60e1ce2-2856-4382-8520-684e1d95603a	1	Other	Other
+a60e3742-5b98-44b5-918d-99c24b44887a	1	Other	Other
+a60ea3a8-a447-4e94-8dce-a7064174277c	1	Other	Other
+a60f0a86-4f11-44a8-b938-47df358c80cd	1	Other	Other
+a60f3f84-a810-405d-be51-caecc67ba738	1	Other	Other
+a60f89e4-d7e4-40ed-a52b-615da0dcae5f	1	Other	Other
+a60fb4e4-6eb2-4414-a0fd-431ac1eace64	1	Other	Other
+a60fc393-add1-42ba-9438-e0c0df6245a9	1	Other	Other
+a610015a-aed1-4866-ae30-146c15eb970f	1	Other	Other
+a6104a64-ee1a-4e84-ad79-7de7d04b2fd3	1	Other	Other
+a610790f-2063-4293-a624-ba9d32284114	1	Other	Other
+a6108f22-01c9-4318-97ef-9af252380b2c	1	Other	Other
+a6110800-b2fe-4ab2-a44b-6cb624246728	1	\N	Other
+a6111576-0b80-4bff-ab9e-b5d508b3cbe5	1	Other	Other
+a6115457-1fec-427d-b722-e08fc61abd33	1	Other	Other
+a611751d-efd7-4c86-8e1f-9b4cb43bfee1	1	Other	Other
+a611bf71-b077-41fa-878d-047b33e40fea	1	Other	Other
+a611e5e5-7a68-41fd-9ea7-1aefcb8a8584	1	Other	Other
+a6121b7d-16d4-4852-9937-b75533a1e8e0	1	Other	Other
+a6122107-04db-4977-8079-9260e5118813	1	Other	Other
+a612704e-d858-4528-9476-0304f56393e1	1	Other	Other
+a6127f64-afbd-4f8b-a477-da30b25419fe	1	Other	Other
+a61298fa-74db-4de5-b85f-be343c4653dd	1	Other	Other
+a612a56a-c337-4310-b22a-76a099566e74	1	Other	Other
+a612b437-e1a9-4b54-b650-b77603ebfcb0	1	Other	Other
+a612ce27-e83a-4da7-b229-d01e1ec36f58	1	Other	Other
+a612db42-02ac-4762-a366-e059784c0d6e	1	Other	Other
+a613080c-34c6-4550-9cac-cd8ab08ad9d8	1	Other	Other
+a613183f-f798-4111-8ca3-312b72ed4fa7	1	Other	Other
+a6131a1c-6aa4-4122-90ff-b781521d3cb4	1	Other	Other
+a6135f5a-1a14-40d7-b897-cdfc648223a9	1	Other	Other
+a6138114-7dd1-4d19-862b-3913a51a0e6d	1	Other	Other
+a6138885-098d-45b3-9700-397079826fac	1	Other	Other
+a6138c2b-2cb5-4b76-ba03-e0d14cad9249	1	Other	Other
+a613a025-bcdb-4caf-843d-7ada0255c507	1	Other	Other
+a613a866-553c-4d64-b854-9a6cf624bbc5	1	Other	Other
+a613b38a-e76b-42b4-a09c-5979a4f17ae0	1	Other	Other
+a613b6f4-abc3-42eb-bff7-960cdc8a79bb	1	Other	Other
+a613ead2-070d-4517-9d7d-c1ce425ebb7e	1	Other	Other
+a6141dff-f24c-488b-90ae-99657453ddd6	1	\N	Other
+a6149b52-2e44-4ed0-8984-3a056c83bd14	1	Other	Other
+a614ca99-ca5a-4fcf-b8eb-ec06e622c65e	1	Other	Other
+a614da92-034c-44bf-a0e2-e29681c616a4	1	Other	Other
+a614f914-03ce-407c-811e-88782a2855e9	1	Other	Other
+a61512b7-783d-4d48-85ca-1a7c14b5aaa7	1	Other	Other
+a6153d15-11b7-47e4-82bd-959bc493fd5a	1	Other	Other
+a6155354-d925-403f-859d-a5e9b9ba9993	1	Other	Other
+a61562de-2976-4677-b731-64fc2f6490c5	1	Other	Other
+a6156c8c-c2e9-4d41-8c5c-421dec05a5e9	1	Other	Other
+a615a9d8-4dd9-4ca8-adb7-81fe180b4179	1	Other	Other
+a6165224-684d-4126-8b80-0eba9108a9e6	1	Other	Other
+a61654c6-f9a4-4a13-b106-bbc918dadaa9	1	Other	Other
+a6169c4c-eeb7-4c19-afd1-648950851f0c	1	Other	Other
+a616b6a7-a8fa-4c58-b7cd-7ad266e3823e	1	Other	Other
+a616d85c-d861-4b54-9dd7-6b42e2046ef6	1	Other	Other
+a616fdab-4bc4-4a47-b91a-1c14cfded68c	1	Other	Other
+a617250e-2ab7-4a91-876f-59b43465e3e9	1	Other	Other
+a6172f0c-9ed5-4bb2-bd57-775486c3af0e	1	Other	Other
+a61734e5-880d-4c93-8a38-345e1227a032	1	Other	Other
+a6176543-4f8e-440e-a7e0-77a96ea2443a	1	James	Other
+a61792e8-cc5d-419b-a2db-22a6e6267a0b	1	Other	Other
+a617b7cc-9d60-435d-897a-16ce0a588991	1	Other	Other
+a617dd34-221c-48b9-97dd-2b9d62fc4e0a	1	Other	Other
+a617e4b1-cd6e-4ce1-a779-583dcad5fe47	1	Other	Other
+a61866e4-16a1-40a1-bb75-88bf38f07a7a	1	Other	Other
+a6188615-a68a-419f-9dbc-114a29955b41	1	Other	Other
+a6188a5b-e417-4f05-9907-26cdb3b2b307	1	Other	Other
+a618997f-8e00-40da-9b4f-0a3b256bf8c1	1	Other	Other
+a618c149-1cff-45b1-bfd5-81bb6de3f608	1	Other	Other
+a618eeb7-e129-408b-9f97-06401acd89d2	1	Other	Other
+a61907f2-7b9d-41e7-8161-1d86461f3d3c	1	Other	Other
+a6192f96-a14b-4f07-bcc5-8b176b8c382c	1	Other	Other
+a619372d-b155-4f2b-af9a-d574bda5d73e	1	Other	Other
+a619650a-2ae7-4376-9e7c-4dd06f5cd4e1	1	Other	Other
+a61982ed-7ad0-4fe8-9d16-8550a3dbc048	1	Other	Other
+a619b4a2-46b0-4a5e-8038-09a25e3e17e2	1	Other	Other
+a619fc49-f203-41f0-a2fd-b6a9dd1c2bc5	1	Other	Other
+a61a009a-4ae9-4bd5-93d0-57e0fdbaef5f	1	Other	Other
+a61a075e-8c36-4934-9f15-c9a84983bffd	1	Other	Other
+a61a7352-38cf-4214-a98e-836edd247a0c	1	Other	Other
+a61a9ccb-a451-4912-bb8f-16054c53c7e5	1	\N	Other
+a61ac3b4-b6e0-4992-994d-06f099c30c9b	1	Other	Other
+a61ae341-682d-4f7a-8913-00f56f5ca8fc	1	Other	Other
+a61b033e-8731-4c78-91a1-3d684010cdff	1	Other	Other
+a61b25b1-c9e2-48d4-b3f0-8cf862a680f5	1	Other	Other
+a61b2f6e-2f0a-40c7-9fd3-ff4ba60afd21	1	Other	Other
+a61b4058-1df6-4c46-9ab0-70fb33c42324	1	Other	Other
+a61b5f7e-afd7-4a9a-af8b-8ce792d7cdab	1	Other	Other
+a61ba95f-eea9-4660-bc03-936f1bcbf5da	1	Other	Other
+a61c0a3b-b39b-4899-bb08-5c41bb020d7f	1	Other	Other
+a61c199d-fcd0-4827-ac79-94ded18b9abd	1	Other	Other
+a61c2a9e-26f2-47e5-9bcc-a8f98e154f44	1	Other	Other
+a61c3615-9bac-4fa7-84a0-deab7f4dff0b	1	Other	Other
+a61c4184-01fe-42f5-949e-7c2abb4b565a	1	Other	Other
+a61ddf2f-23d1-4b99-a58e-203094febfd9	1	Other	Other
+a61e2562-0acb-4d08-8a8e-d792848f0cd2	1	Other	Other
+a61e34c7-9542-46e7-a23a-985ecaaf10f7	1	Other	Other
+a61e8df9-bca1-4081-83fa-2f369a48d05e	1	Other	Other
+a61ebfd2-5c9a-4391-99f2-48ad762aa818	1	Other	Other
+a61ecd0f-b72d-4dbb-9baf-b3ba4aa324ea	1	Other	Other
+a61f62e2-5fe1-446b-ba11-505c2b702e00	1	Other	Other
+a61fdce5-443f-4d06-ad80-17efd27b8a20	1	Other	Other
+a6205a9d-05fe-47a6-a80d-fea486034321	1	Other	Other
+a620635c-47f5-41ec-a247-a880f935662c	1	Other	Other
+a62083fe-fbd5-4de9-86aa-5b91e656e03f	1	\N	Other
+a620b9d0-20cd-4297-9e27-5f98c8382178	1	Other	Other
+a620e473-616a-4b4e-8c9d-38b5f623c6ba	1	Other	Other
+a6211683-e3e6-4df4-b851-7a6a1e340561	1	Other	Other
+a621fb01-9477-4cd5-94e1-11cd86f5263a	1	Other	Other
+a6221211-b81d-4e69-9768-ad9673ad5c27	1	Other	Other
+a6221926-374a-4b46-bc71-2f674a01ea7e	1	Other	Other
+a6221a19-6e74-4e39-814f-cc4a8792f3dc	1	Other	Other
+a6224cf4-13eb-4cb0-bfd7-f4a6bae96fa3	1	\N	Other
+a6226705-8828-4b11-943a-41b74a32010b	1	Other	Other
+a622aee2-0ecb-4482-9fc6-3a1d31d52885	1	Other	Other
+a622e122-2b21-45f9-b20f-de484d550118	1	Other	Other
+a622e62d-5d31-4a8d-8038-2b8c68334e34	1	Other	Other
+a6230220-c27f-4c45-b16d-d48101f49680	1	\N	Other
+a623274d-7118-43df-97a4-42544bdce877	1	Other	Other
+a6234581-cdd6-4cec-9b2b-a8bc140d2b72	1	Other	Other
+a62351d8-5692-4218-8bbb-cb5ee55762dc	1	Other	Other
+a623bc99-b060-4bbf-b74c-7f14bea097cd	1	\N	Other
+a623e19a-d2e2-4d89-b21c-5d69c111abd9	1	Other	Other
+a6242f7f-b918-44ed-92c9-720837af2739	1	Other	Other
+a6244332-a7f9-4778-bfdc-d3066afc1de9	1	Other	Other
+a62472a0-45a9-407b-9ff9-8d04d825a818	1	Other	Other
+a6249018-ca79-4919-b812-38b8be7b336b	1	Other	Other
+a6251f24-cdf9-4f23-8d15-0e453dd4adbf	1	Other	Other
+a6255469-b73e-4577-8594-4709cda279eb	1	Other	Other
+a62568a5-649d-48a2-a0dd-06042465d944	1	Other	Other
+a6258169-cdba-4ce5-ac4d-e9fb0e73110a	1	Other	Other
+a62648b7-6bf4-4589-a7c2-57260489b59d	1	Other	Other
+a62666a1-9593-4bf5-bcec-f78ddfb2b1e8	1	Other	Other
+a626a3a7-079a-457b-bab1-0240fa74a90a	1	Other	Other
+a626b92e-fd6c-4305-a4c3-bb619b2a950a	1	Other	Other
+a626e144-76ef-49d0-b840-488e784b236b	1	Other	Other
+a626e9ac-6b64-4c19-b55f-4bbf681d264b	1	Other	Other
+a6270a8f-21f3-47cc-924f-e5e502f54861	1	Other	Other
+a627430b-e709-4175-905b-ea06554bedb9	1	Other	Other
+a6277540-2ce7-4256-b615-b8d8a8289412	1	Other	Other
+a6278426-8b17-4307-ad20-ca3476ef8f06	1	\N	Other
+a6278f9f-d5c9-4eb3-b221-f8fea4818ce1	1	Other	Other
+a627a802-0931-453a-81f3-ad8dbee22c7d	1	Other	Other
+a627c4a0-e977-4077-b92f-f39871c1fbb9	1	Other	Other
+a627e9ca-d9e3-41fb-9475-fba7056cc2ed	1	Other	Other
+a6289a26-d4b8-4617-a9cc-0aae198df895	1	Other	Other
+a628c3b6-ecda-43c1-aeae-57764b6ba4b4	1	Other	Other
+a628c4b3-1443-4ac8-b995-8a730ac76b75	1	Other	Other
+a6295615-3fe8-436d-81cd-535f9e3c5f12	1	Other	Other
+a629c807-be7c-432f-b2e6-bb1057825a2f	1	Other	Other
+a62a0fa6-0077-4a00-95d5-0ec2aed09646	1	Other	Other
+a62a1086-dc50-4def-bd74-a31b283058a7	1	Other	Other
+a62a4bf4-57a7-478a-bdf4-c7018719e48f	1	Other	Other
+a62a592d-33bb-4ecb-bf76-71d98a61c4a3	1	Other	Other
+a62a8eb3-f9ce-44dc-b966-d50559b2db4b	1	Other	Other
+a62a9606-9dc3-43fb-9a78-160996770109	1	Other	Other
+a62aad31-7b40-43f2-b52e-9ada9e1893fb	1	Other	Other
+a62b0178-bd97-44db-b0c9-45bbadcc678b	1	Other	Other
+a62b0255-b268-4a17-b21c-597d191bfb4a	1	Other	Other
+a62b0373-385e-47be-88d2-35f4cdc31cb7	1	Other	Other
+a62b0aa4-19d1-48a4-b923-2ab60ad98e14	1	Other	Other
+a62b20c2-7562-496c-a848-129ab8b74c08	1	Other	Other
+a62b2619-68b6-45ec-95f4-2572537284dd	1	Other	Other
+a62b34e5-f2ce-4d26-9a36-30c58641683a	1	Other	Other
+a62b363c-bdc4-4866-b2e7-7276b5168306	1	Other	Other
+a62b5780-8588-4a4e-b627-0658c814649a	1	Other	Other
+a62b7057-81dd-4343-ae4a-a9923611bf37	1	Other	Other
+a62b9d64-deb0-471b-a06b-243f05330567	1	Other	Other
+a62bf598-d5b3-490a-b60e-911b60396bf8	1	Other	Other
+a62c06d5-99bf-44ed-ae90-1a0ff73f8b02	1	Other	Other
+a62c08e5-e6c8-402a-982e-89e80933c04b	1	Other	Other
+a62c40d3-d3b5-4b45-8b64-e36805526387	1	\N	Other
+a62c6ac0-87bb-4208-9e43-93af500a96a7	1	Other	Other
+a62c8f37-81a1-40b0-9ffc-49f51850de22	1	Other	Other
+a62cbdc4-127a-4d25-a634-3a9b1e22413e	1	Other	Other
+a62cce04-ce87-4e68-81be-9c876721a5fb	1	Other	Other
+a62ce4c3-8256-43d7-aa97-c29e4cc34956	1	Other	Other
+a62d429c-7d97-4565-ae72-7181a00a1cba	1	Other	Other
+a62d5562-c482-450e-8e74-fee4ac7d8911	1	Other	Other
+a62db9ab-ee69-42c3-b096-0e2b6244d8f5	1	Other	Other
+a62dc11e-c0e3-4b70-a512-3d4ef27b6767	1	Other	Other
+a62e24cf-8d3b-4ebf-9058-46523eedce33	1	Other	Other
+a62e487d-df50-4685-a2f7-16ef2ebc116e	1	Other	Other
+a62e6c3f-7f9a-4620-9878-a12924c90f68	1	Other	Other
+a62e8601-6fd4-400f-a618-4502b6fa7975	1	Other	Other
+a62f6e0f-b050-4837-9b28-810fe0b2fa47	1	Other	Other
+a62f7e61-6bcb-45c7-9468-ac3e698b39f1	1	Other	Other
+a62fd212-b62d-4ce1-9485-74135edced2f	1	Other	Other
+a6300f04-bc69-40e5-a577-e57149d763fe	1	\N	Other
+a63088fb-8246-4927-b6fd-f9e4ca7eabd2	1	Other	Other
+a6309769-1d6e-4c31-ab56-596fa0fe765f	1	Other	Other
+a630b9e7-cac4-4cbf-86f7-6031fb0f1926	1	Other	Other
+a63105fe-b857-4869-bee8-53707242934a	1	Other	Other
+a63112e7-c8c6-46ed-a183-5f80f63daac6	1	Other	Other
+a631bff1-7f96-4abd-8248-76572b90a618	1	Other	Other
+a631dda2-ed4e-4cbe-bac4-7fe07cbaafb7	1	Other	Other
+a6329df2-8733-4697-9ed6-018ded257fdf	1	Other	Other
+a632fc3d-bea1-4c47-b804-47ba9b741a84	1	Other	Other
+a633038f-d793-456e-bae5-add222d95909	1	James	Other
+a633580b-4040-4bc7-9421-a81d320ea6fb	1	Other	Other
+a633d720-cd38-470f-837f-13dea105481f	1	Other	Other
+a633df76-c969-4965-a80e-b829052d7298	1	Other	Other
+a6341a58-868f-4186-97a5-d80477beb9be	1	Other	Other
+a634249c-18a6-444c-a996-13b1d63c7214	1	Other	Other
+a63475fa-029a-45f7-b7ef-73a75aff3232	1	\N	Other
+a6347e25-0b72-41fb-8791-b635d3d92dd0	1	Other	Other
+a634e694-5386-4459-914e-88822a958b4a	1	\N	Other
+a6350839-ad09-4842-afbe-499b80d8d239	1	Other	Other
+a6351898-b079-4c45-a2d3-38cc588de11c	1	Other	Other
+a63549df-ce6e-424f-b642-e9843eaf076b	1	Other	Other
+a6354d85-ddad-450a-be33-6a737bf77ad1	1	Other	Other
+a63567c6-ae1e-40fb-985b-a9bd2a83d1a2	1	Other	Other
+a63577ea-66fb-4296-9dbb-4b7215a6d1b8	1	Other	Other
+a6359de7-ccc2-402d-a83f-b092c6510bf4	1	Other	Other
+a635afe0-d76b-4ff2-a542-a14ae42bd8f5	1	Other	Other
+a636000c-b743-4c97-a9a4-983f62b51c87	1	Other	Other
+a63638ce-ed7c-4aa9-91a3-ab65be87206f	1	Other	Other
+a636609c-6fa4-45ff-8c40-0a2b9e810af5	1	Other	Other
+a636e297-88db-46de-9f18-400aca9f66d7	1	Other	Other
+a6373075-1288-4d52-85c6-a864e7390d11	1	Other	Other
+a6373924-6217-4f0e-a1d8-a648364268df	1	Other	Other
+a6375518-aac2-4d42-b9f9-f259759da49f	1	Other	Other
+a63771e0-b163-4900-ae19-d5446e4229be	1	Other	Other
+a637abdc-b433-49ad-9f22-76fa7c25b4da	1	Other	Other
+a637ad7d-528d-4512-bf0f-02c0635dfd98	1	Other	Other
+a637b5a5-e8ef-46af-92db-fa1960e515c9	1	Other	Other
+a637c69d-94f2-4543-aaf6-880b95602353	1	Other	Other
+a637d618-6d91-41a8-9bf1-d83f14737c48	1	Other	Other
+a637d6d6-1a16-4ee8-8c5b-5af57fd3e6e6	1	Other	Other
+a6380e96-e7e4-423d-a689-c5a31164e5e8	1	Other	Other
+a6381f21-8b2d-4cc7-a779-9dcce16877ab	1	Other	Other
+a63834fb-054e-406d-a18a-53bbcabf062b	1	Other	Other
+a6384363-1d6c-4a09-b1a1-84f3b83fe17c	1	Other	Other
+a638ccb8-26b1-43a2-9cb4-7a51d7c3d809	1	Other	Other
+a638d5b9-62d0-43fb-a1a4-4ab55df7d584	1	Other	Other
+a63917dc-e0f5-49a8-b0ee-5323280b5b1d	1	Other	Other
+a6393aef-3ed0-417d-a0dc-63f13aa7aeeb	1	Other	Other
+a6395521-5a1a-4293-9a93-e6a0535c925f	1	Other	Other
+a6397668-13e1-4130-b11b-35144192fff8	1	\N	Other
+a63983de-982e-46d4-af08-e344ef0057a9	1	Other	Other
+a63a1306-e8f5-4968-a041-99e3729720b2	1	Other	Other
+a63a1907-e8e9-40af-95f5-6ba8ff5fedf5	1	Other	Other
+a63a70e2-ba6a-4725-8262-a1af2d2d3146	1	Other	Other
+a63ad85a-5eb8-4a00-9e58-1936e77a7a5c	1	Other	Other
+a63b54ac-a40e-4986-bb62-8cbd5f7ace55	1	Other	Other
+a63b8c77-c6ec-4c4e-8f87-3b3fa39a789e	1	Other	Other
+a63c3048-9047-47b5-b7dc-aec08c4a2e4a	1	Other	Other
+a63c6796-58dd-4576-b5ab-c87c6036dd29	1	Other	Other
+a63c7800-4198-41c1-a55e-6b7697ed5944	1	Other	Other
+a63c7df0-3ab9-4642-ad33-ebc6d6b164b7	1	Other	Other
+a63c8f1c-60c0-4c9d-9228-f372866fbd5f	1	Other	Other
+a63ca146-ecbf-497a-804b-a71fb81c3f37	1	Other	Other
+a63cae90-8f04-4e7a-ad67-56024433f4b9	1	Other	Other
+a63cc1eb-ce35-4795-b33e-99e16cd38534	1	Other	Other
+a63cc325-56af-4b07-8a32-842e508430e6	1	Other	Other
+a63cc7b3-3746-4a5c-b0be-f3b2faa144a7	1	Other	Other
+a63ce16c-12da-4d96-9593-5bf71a83cb10	1	Other	Other
+a63cf7c2-d05b-4f13-81f5-e22b8d3f3a0e	1	Other	Other
+a63cf962-d105-4144-a56f-57cf4e5999b9	1	Other	Other
+a63d222e-e695-4489-a286-cc2b4ad49eed	1	Other	Other
+a63d5329-6c7f-4468-97f4-9f2c02e4c1e2	1	Other	Other
+a63d79b1-5fbb-4223-9a0f-05869dc7a34b	1	Other	Other
+a63d8e68-d839-4e36-b0ff-58a24af116c0	1	James	Other
+a63da049-b3de-4aa2-8a97-831ecffdf138	1	Other	Other
+a63e471a-f2da-49b4-9f7d-9a8c0503774c	1	Other	Other
+a63e5188-f835-4e5c-a373-ee15ed87e876	1	Other	Other
+a63e70d0-2e31-49f7-8e7e-34ea8ace0d1c	1	Other	Other
+a63f1377-d3c2-499c-8196-7f1a19cb29e3	1	Other	Other
+a63f7a5a-3bbe-4534-9164-898c838ff13a	1	Other	Other
+a63f9daa-ab46-4fec-a911-0d5fe8c886d2	1	Other	Other
+a63fd11f-fc82-4d2e-a0df-b18d3b2347c0	1	Other	Other
+a64019e8-1caf-425b-8ade-072c0ad44b72	1	Other	Other
+a6406bcf-102c-4ae7-bced-3a57471baf4b	1	Other	Other
+a6406edb-c805-48ac-8532-bbc4508ae244	1	James	Other
+a640dab9-ba67-4c6d-aa02-cc2eb3e06107	1	Other	Other
+a640e0a3-e98c-4ab9-abcf-1019d170653b	1	James	Other
+a640f5a3-172e-4bd0-8c6c-e6e9acb763e8	1	Other	Other
+a641504f-9e36-40da-a472-3b5422d8e421	1	Other	Other
+a6417078-d4f6-4301-a53d-0b6e333bd51c	1	Other	Other
+a641aace-c488-4677-954a-7a291bbf74a2	1	\N	Other
+a641b4cf-2652-465a-bc13-747661ae78a7	1	Other	Other
+a641bb0a-4751-4419-9307-feb33de4f30a	1	Other	Other
+a641bdab-4f42-409c-aa37-336796309309	1	Other	Other
+a641dbbd-809b-4589-998d-90f05463fe5b	1	Other	Other
+a642011e-3232-4c91-a1dd-f0b459c199cc	1	Other	Other
+a6426626-16d1-41dc-ae3a-a7c7b54db9db	1	Other	Other
+a6434de2-ca0b-4d6a-ab4f-631a8aa72e6e	1	James	Other
+a6435ae4-d831-4fb1-8dc4-135bc5c99b41	1	Other	Other
+a643feac-f643-4f22-a7db-348826e96119	1	Other	Other
+a6440892-ed00-4a73-879a-f95b433579b5	1	Other	Other
+a64427b6-b51c-45c1-b882-447b868c6e1b	1	Other	Other
+a6444108-46cc-4438-9353-7921101547c6	1	Other	Other
+a6444901-eb05-47f3-8caa-b5b8395ea45f	1	Other	Other
+a644c3ce-8136-45a9-a0db-2f02713fd244	1	Other	Other
+a644c553-2af9-4c75-8c5e-02b0b6a1a03f	1	Other	Other
+a644d314-89eb-4745-957e-f0d7935c737b	1	Other	Other
+a6455fc7-17bf-41d6-9f91-b5c967285cc1	1	James	Other
+a6457e11-e7f2-49da-bef4-f1c4fd7328fc	1	Other	Other
+a64587d1-8ecc-4525-99e9-c50fcd5489be	1	Other	Other
+a645a994-c880-4a49-83b8-e2a5347eab9c	1	Other	Other
+a645b423-e2f2-4e62-8ab7-99a925b9c7ce	1	Other	Other
+a645b94f-7b4a-4406-afe2-1b6e7ee1e956	1	Other	Other
+a645b984-f2b4-4728-8265-d91a068255a4	1	Other	Other
+a645d5e5-90c9-457c-9fc3-4436799e073f	1	Other	Other
+a645d97e-3f16-42a7-a413-b6c8c0239304	1	Other	Other
+a6460563-899d-44e9-a5dc-9afd3abbf2de	1	Other	Other
+a6464817-0383-42ed-9ccd-70829af6db76	1	Other	Other
+a64690ee-6624-4ae2-8204-be067a4c43f1	1	Other	Other
+a646cf2e-5b14-4dae-a15e-5e2b4b9e93f7	1	Other	Other
+a646f901-2516-4d29-8f65-86c2e7769ff9	1	Other	Other
+a64718cf-0575-43f9-a084-12dd643d4941	1	Other	Other
+a647301a-6cf4-4ab6-a867-05986f43d44b	1	Other	Other
+a6475325-e553-4432-afb9-d92d4fc95231	1	Other	Other
+a647718b-1aa8-4181-b575-bc1b9f553c9c	1	Other	Other
+a6479d9d-8751-410b-9639-ce87a8075160	1	Other	Other
+a647a9a3-da07-4210-bb8b-349c288e96cc	1	Other	Other
+a6482047-359a-419d-86a8-34820a173a12	1	Other	Other
+a64864a8-7306-4325-b564-8b08c5cd679f	1	Other	Other
+a6488f0a-79b0-415b-bb11-daae2b555bff	1	Other	Other
+a648e30c-2415-4161-b062-d38812237c6f	1	Other	Other
+a6490b10-692f-4359-95a4-735b40f5debe	1	Other	Other
+a6494cf5-b2ca-405a-971b-862f305e8a53	1	Other	Other
+a649eae5-a610-4587-9f9f-1beaa3e1ec34	1	Other	Other
+a649ee7c-40ff-4204-a84d-303731cce7bb	1	Other	Other
+a64a01ee-94ba-4123-925c-d93a3fbaf6f3	1	Other	Other
+a64a3a07-93e9-4317-bf46-6f561f7b0dca	1	Other	Other
+a64a5e2e-5b70-4524-8887-a68828e443f9	1	Other	Other
+a64a784e-64f0-4767-aea6-7dc113c59c76	1	Other	Other
+a64aaeaa-2c86-41a7-99aa-822eeadeb6f5	1	Other	Other
+a64b067e-d6cc-47de-8e35-303ce57132b5	1	James	Other
+a64b085e-963d-454a-91b9-2b6350c77e7a	1	Other	Other
+a64b4668-4c54-4f2e-9362-4edc39403603	1	Other	Other
+a64b5ac4-27cb-453f-90e6-476206f1724f	1	Other	Other
+a64bcf5e-05f9-4412-b8e9-9b78f63d0604	1	Other	Other
+a64bd394-fd3e-4552-bf14-39c2df96e52e	1	Other	Other
+a64be46b-0f34-4d84-9839-ccc40d6d57ca	1	Other	Other
+a64bf42d-a70c-46a7-98ad-b70125ec81af	1	Other	Other
+a64c153b-7b57-425a-bba1-a585c8210149	1	James	Other
+a64c208b-e409-4415-8c42-d792136bb0ee	1	Other	Other
+a64c244f-bff0-4f17-8c76-2243a0dd770f	1	Other	Other
+a64c517d-bb98-4aab-ae33-084fe30d1453	1	Other	Other
+a64c70f3-9c7d-4aee-95df-80c2c5fb4eb7	1	Other	Other
+a64c7a4a-cce1-4d25-ad52-de4b2bd51a5c	1	Other	Other
+a64c7ead-8dea-4f4f-ba92-0790ff0a6603	1	\N	Other
+a64cb60b-2632-446d-8ea8-3378b9b2a807	1	Other	Other
+a64cd224-791c-4760-9df3-fa4ad0a9fcee	1	Other	Other
+a64cd6ab-24fd-4a28-8e16-55f31d5cad47	1	Other	Other
+a64da549-6116-499d-97ce-676a74d17817	1	Other	Other
+a64e11ce-35ee-4803-8d52-66b97f7edc14	1	Other	Other
+a64e2953-a667-4ff1-a49c-1088e19c5ea7	1	Other	Other
+a64e2b79-4f02-48fd-9d0f-75da8230b08f	1	Other	Other
+a64e57d1-3cee-41ca-acb5-cc0690b91c4b	1	Other	Other
+a64e6069-b39d-42bd-9bc4-53f5d060e3ac	1	Other	Other
+a64e9692-19a8-4e10-91e5-4337af0690f7	1	Other	Other
+a64f2342-defc-44a8-beb9-90c5171a410f	1	Other	Other
+a64f44e7-0aae-41bc-9ee0-aef80f1f8c29	1	Other	Other
+a64f6cfd-1dad-422f-88ea-2e892eb29579	1	Other	Other
+a64f7abb-1221-40b1-b08a-a8785a8fd531	1	Other	Other
+a64f8ead-6d40-41d7-8ade-7471667ddeef	1	Other	Other
+a64f968f-1a09-4638-83e8-0f929b8e3e16	1	Other	Other
+a64f9f54-dd34-4192-b6e1-0e0650d8bc5b	1	Other	Other
+a64fbbf5-49d7-469d-9965-54fa92faf8d8	1	Other	Other
+a64fc999-eb48-4d8d-bfe0-eaae7d9d146a	1	Other	Other
+a64ff71c-7c6e-45e8-9e3f-c069cf61319a	1	Other	Other
+a6500141-ad02-4af4-bf80-e4edd7645fbc	1	Other	Other
+a6509808-c267-4ed5-8249-0eb72b98c624	1	Other	Other
+a650f8b0-6cd7-47f7-a3ce-3b13c97ca581	1	Other	Other
+a6517815-85b1-4f41-a2b2-bcd5dcf12456	1	Other	Other
+a65193e2-4e14-4281-a072-872886d83498	1	Other	Other
+a6519796-6e23-45ba-be3b-129ee00523b4	1	Other	Other
+a651ccd7-d96f-4100-9993-e56c6e372e50	1	Other	Other
+a6523216-deca-4855-abc3-4035b7d55a7c	1	Other	Other
+a652474e-81a7-4dc3-ab53-7d248ca351d0	1	\N	Other
+a6525ff3-97fc-4a79-bd2e-402b37c06881	1	Other	Other
+a6526fc4-da83-4a93-8c74-8b5041cdbcf9	1	Other	Other
+a652a136-5bfc-4a7f-b79d-726f13aadf4a	1	Other	Other
+a652a296-8734-431e-af81-977f770cf62d	1	Other	Other
+a652a4df-778d-48c8-a3d9-f549e48da1c8	1	Other	Other
+a652a9c0-0042-40b3-a273-62e2ee6fe35c	1	Other	Other
+a652c6eb-0fff-48a8-9e04-4275bde8c5ca	1	Other	Other
+a652fe12-3ddc-4468-8b54-17d156710fca	1	Other	Other
+a65338af-5abc-41e4-855a-b4320bdcb488	1	Other	Other
+a6534d81-ccb2-413a-9ca3-e5d596577017	1	Other	Other
+a6534fac-187c-42b9-8eec-571cc8fb27ec	1	Other	Other
+a6535d65-cf2b-4754-8f29-8fb3cb97313a	1	Other	Other
+a6537373-bdf6-4b51-b13d-a118188fb604	1	Other	Other
+a653fdd1-a413-449c-a95a-6eee5ad095a6	1	Other	Other
+a65400a8-3ddc-4df6-beca-7683a413513a	1	Other	Other
+a65406ce-b504-4e28-a615-e7ad41d78a61	1	Other	Other
+a654249a-a9d3-49cf-beab-eeb158d5b980	1	Other	Other
+a654300a-adec-4edd-b88f-81297f72cb0a	1	Other	Other
+a654630e-35f4-4c89-b376-8b214bfa99fd	1	Other	Other
+a6547f4b-0a5b-4cfb-abaa-4396de4f8011	1	Other	Other
+a6548354-6516-4d29-ba63-41a2d04be357	1	Other	Other
+a65489ed-cefb-4be1-8961-4947a5c67350	1	Other	Other
+a65497e0-eb2e-4447-9d75-974d2753b76f	1	Other	Other
+a654a21f-baa2-4dab-87ff-ec72eaaab83c	1	Other	Other
+a654f2b7-1c50-42f5-ad9b-caa55fa6cdd2	1	Other	Other
+a6552fe4-a26c-4dc1-9cff-01ebb1f8fc59	1	Other	Other
+a6557b4b-7333-4cbd-8a8a-4d8c74685036	1	Other	Other
+a6557fea-3158-4d1f-8946-9ca67698e694	1	\N	Other
+a6559c33-e930-41d2-9799-4dabf16d1f94	1	Other	Other
+a655ae8e-45b4-4d6a-a0a3-57244d02fa93	1	Other	Other
+a655dd46-d167-4418-b19f-c794dfc40d3f	1	Other	Other
+a655f93c-3902-4a60-b014-2d9a951e0cc5	1	Other	Other
+a655fda3-fdd8-447b-bcf2-47e585068df2	1	Other	Other
+a6561b87-511a-4e81-bad2-fa592a27c2be	1	Other	Other
+a656e7f2-6b59-4f9d-b949-ac163e4efd15	1	Other	Other
+a656e93a-56e8-4c47-a43b-5e8275aa925a	1	Other	Other
+a656eb9b-6a6a-472e-bd7d-b2d5a61021dc	1	Other	Other
+a656ebc1-8d00-4faa-a04c-4bd15311c17c	1	\N	Other
+a656ef43-46ba-4f93-8c1d-9365b8e8433e	1	Other	Other
+a6573b41-d93f-450f-93c5-bb0e1fe92a92	1	Other	Other
+a657699a-ac8b-447e-89c7-4db8cf66796b	1	Other	Other
+a657f385-880b-4b41-96ee-37a7ffee4e46	1	Other	Other
+a6581d85-dc7b-4d67-aace-57e97b320cfd	1	Other	Other
+a658429b-971d-4c4e-b163-531ed29b4a91	1	Other	Other
+a65844a8-9c8b-43e9-8ea0-7eac5e726514	1	Other	Other
+a6588d52-5c38-497a-ae6e-d2807ff0fde8	1	Other	Other
+a65898e7-07d6-4bb6-9158-aebf12493797	1	Other	Other
+a658d390-bb84-489a-88c5-87359fbbd660	1	Other	Other
+a658e5be-c5c5-43f7-ac36-2dbc6c1e7113	1	Other	Other
+a658fbe5-8ff0-4c03-9d97-ca800b0766a6	1	Other	Other
+a6591165-c613-40d8-9c11-ea662ff838e3	1	Other	Other
+a65943ae-05e8-43c2-bae4-347ca38dce67	1	Other	Other
+a6594a02-81cd-4e3a-8039-2ec1c49a325f	1	Other	Other
+a659a118-ddef-4d81-917b-9643781186bc	1	Other	Other
+a65a22d0-829b-4680-98ea-70025530d16d	1	Other	Other
+a65a83e3-50ff-4439-9ffd-dea58f0fce67	1	Other	Other
+a65aa136-5462-4d16-a0c3-adb3bebb31e0	1	Other	Other
+a65ab94f-f647-4287-8ba0-b5a769c5ced6	1	Other	Other
+a65acd60-65ca-4daf-8eb7-3c5fe4f796b7	1	Other	Other
+a65adb67-65d5-493c-8661-baafc026ba9b	1	Other	Other
+a65af825-7fe7-4523-8c3d-d049d20305b9	1	Other	Other
+a65b8027-ba07-4d4a-81eb-4f6870c6495e	1	Other	Other
+a65b8d7c-a8c0-4dbb-9286-ceae9dc62147	1	Other	Other
+a65ba4c3-95f0-40f4-a35c-06f690e095fa	1	Other	Other
+a65bc446-0df1-4108-b41d-9a6683229855	1	Other	Other
+a65bf132-edf3-43de-b9e4-baa48a26f1da	1	Other	Other
+a65c1472-1fd3-4385-970a-0bfa9a549cd5	1	James	Other
+a65c34cf-3030-44d4-94ac-05739497ef29	1	Other	Other
+a65cbd74-b6cb-4a7d-b25c-3e3398a25231	1	Other	Other
+a65ce058-60b9-43f7-b379-504028126565	1	Other	Other
+a65d339c-7baf-47c3-a7da-a2bf608ca821	1	Other	Other
+a65d5f8a-c48f-4f19-a039-4ca75a1e6103	1	Other	Other
+a65db3b6-07a5-4264-944e-aea7c73c787c	1	Other	Other
+a65e9171-22e2-4d85-9eac-4c38a1380bed	1	Other	Other
+a65eb67b-5845-4349-94f7-697f6792f1f9	1	Other	Other
+a65eca87-3bae-4612-afb5-550fc09bc1df	1	Other	Other
+a65efc79-d1e9-4de0-84c6-d9899db427ea	1	Other	Other
+a65f3445-9d45-47ab-b69a-4baf9e47bdce	1	Other	Other
+a65f7704-0d48-4494-8baa-1f4d84a0a3c1	1	\N	Other
+a65f8990-691a-48bb-974a-d299943043c4	1	Other	Other
+a65fe184-5fdc-4f30-af46-6fe96816ed78	1	Other	Other
+a6601aa5-dc71-48ed-a255-f15320bc88b3	1	Other	Other
+a6603df2-f87d-464f-b60c-df72bf4b8fcb	1	Other	Other
+a6605aa6-06ba-41a7-a1b4-5ced00735f4a	1	Other	Other
+a6607408-8a82-488d-be2f-c213fda031a9	1	James	Other
+a660e8f6-e357-4683-8842-cfbaa58e7e1d	1	Other	Other
+a660e908-3e5f-4b8d-a30e-40a746470b49	1	Other	Other
+a660ed46-8343-4e6a-b4d2-7cd350c29025	1	Other	Other
+a66144e0-5215-4cf1-89b5-459d8443de8f	1	Other	Other
+a661b0c5-f627-46a4-900a-448936dafca1	1	Other	Other
+a661b376-25e7-4d36-b00e-eb3a9b0093c4	1	Other	Other
+a66242d2-482f-403b-a180-b115649fcb26	1	Other	Other
+a6626c2f-ab23-4707-a1a8-95fca113a586	1	Other	Other
+a6627bab-c349-4bf8-9ea4-2eaf7ec6d720	1	\N	Other
+a662db38-4ca5-4834-bdcf-e57f19cb6952	1	Other	Other
+a662df86-4436-405e-a411-63908e7b2aab	1	Other	Other
+a662e741-1107-4509-b683-3e3f13277721	1	Other	Other
+a662e936-a320-476e-b00a-cce78459405e	1	Other	Other
+a662f719-2b79-43ab-8099-f3d33a176831	1	Other	Other
+a6631146-e15b-4877-ad18-3f9fb4fc8e8b	1	Other	Other
+a6633db0-8eeb-4c96-8c15-a358344aaf79	1	Other	Other
+a6634d85-f08c-4051-9dc0-e8e3257b7368	1	Other	Other
+a663634c-1ff2-4bae-8603-a63c03d49fbb	1	Other	Other
+a6638b1d-1c33-4b82-b80b-0495b91ecf02	1	Other	Other
+a663aeb1-d38c-41ac-9457-2d0ade8d1bd1	1	Other	Other
+a663baf2-05e0-468a-8628-0d98af46d8eb	1	Other	Other
+a663d5b0-772d-49d2-a671-8570b900677c	1	\N	Other
+a663f442-9dad-48e3-bfdb-d1e56a579526	1	Other	Other
+a664097b-74b2-40b2-bc82-9aa3e75c5bde	1	Other	Other
+a6645c89-7f3c-4b06-9a53-9cd08142dc3b	1	Other	Other
+a665b4f6-31ef-4665-a343-87a16a41b7eb	1	Other	Other
+a665b9a0-dd6b-4459-a962-bca44b71a377	1	Other	Other
+a665c722-081a-4764-87cb-45cf1b679d8e	1	Other	Other
+a665d862-4f3f-4446-9cb0-71248e92bdc0	1	\N	Other
+a665fffd-55b7-4438-b56f-f57127b9509e	1	Other	Other
+a6660f5b-fee4-472b-be62-24c52989d390	1	Other	Other
+a6664e2b-01fc-4ae9-b67e-bcb8ebca3873	1	Other	Other
+a66680ba-5bbe-4e0d-9160-d8ef083781fc	1	Other	Other
+a666db74-dc39-44b2-b820-5939e2a1da40	1	Other	Other
+a66718c8-389b-4ad6-9306-61a925490f3d	1	Other	Other
+a6672713-c69b-4a94-aff7-6f1dcb594694	1	Other	Other
+a6678128-0092-410c-b4c3-d4c9a599a572	1	Other	Other
+a667b621-484c-4865-9dd1-f24b61485616	1	Other	Other
+a667c2c4-2ea8-48ca-ada0-51050996a098	1	Other	Other
+a667f91e-2858-46bf-8b33-5a29db78c215	1	Other	Other
+a667f9a6-d1ba-4d1c-8951-78b0aa69ae4a	1	Other	Other
+a66812f5-a0e5-4350-8c54-ff893f360f4f	1	\N	Other
+a6681494-e27b-4794-9b35-c8b3de4a5100	1	Other	Other
+a668179d-ee3f-4c06-9605-9990fd710c5e	1	\N	Other
+a6682c58-3ce9-4223-862c-b7bfa4b7f10e	1	Other	Other
+a668dcd8-4cfa-424b-b2ba-faa13179b277	1	Other	Other
+a668ed06-9b7d-412f-87f3-5836151b5a9e	1	Other	Other
+a668f98b-0eda-4854-bfa6-cf0646a9686a	1	Other	Other
+a6691e1a-463b-4d0a-919a-722af698e6d3	1	Other	Other
+a6695524-40c7-4bc8-95a3-67c48e52e7b0	1	Other	Other
+a6696598-4eff-4331-976c-0d7e828c1a03	1	Other	Other
+a66965f0-813a-4a33-9ec2-cd8785f28064	1	Other	Other
+a6696e44-5a94-4a51-8de6-6d567ee85536	1	Other	Other
+a669b422-274c-4030-a377-f68cc98863a9	1	Other	Other
+a669e032-f6da-48a2-8093-c28dc97a3e0f	1	Other	Other
+a66a439e-47db-4421-bc65-932d6de03f93	1	Other	Other
+a66b2068-3963-4557-824f-5fb49c6e78c9	1	\N	Other
+a66b721a-ccb9-493d-8daf-9ca1f81b7c11	1	Other	Other
+a66bbde0-f27d-4685-abef-40bd152523de	1	Other	Other
+a66bd902-57f6-4525-9b66-8b5bd885c59b	1	Other	Other
+a66bda17-2c9d-4902-8cb4-f536b01f6db8	1	Other	Other
+a66be9f8-528d-4113-bbd4-ddcd74202659	1	Other	Other
+a66bfb1a-41df-4fbe-a322-ca6b568feb36	1	Other	Other
+a66c75ac-83e3-4f17-af6f-5c06fc4e473f	1	Other	Other
+a66cb200-e551-4e35-a356-374669da9919	1	Other	Other
+a66cb80e-b2f7-498d-8d76-640cc03ba9d4	1	Other	Other
+a66cf39b-2b27-486c-9d07-2e3d70df584f	1	Other	Other
+a66d07bb-0eea-4a34-aaf9-5cd73cd4b727	1	Other	Other
+a66d1cd6-2233-488c-8d88-3ed0650e947d	1	Other	Other
+a66d1e54-7c9f-40d6-a3df-675e69db7809	1	Other	Other
+a66d53c1-f96a-4638-9316-37a9e75b5f87	1	James	Other
+a66dadeb-12b0-4338-a22a-b95812424bd5	1	Other	Other
+a66e1975-bb04-4dd7-b0e7-b6bfe271efa7	1	\N	Other
+a66e64a8-2034-445f-9630-5e77c0e91afe	1	Other	Other
+a66eb2a8-e62a-4119-96cc-a4ad80c06d88	1	Other	Other
+a66f030c-7ff2-4c31-a6d6-e4242fd6983d	1	Other	Other
+a66f2632-e5b0-42b3-9d01-b5317ab626d2	1	Other	Other
+a66f30b7-5aa2-459a-8f99-eab37e9c527a	1	Other	Other
+a66f3720-22b7-4de4-962e-82b2e56d49b0	1	Other	Other
+a66fcd2c-f520-4481-81ed-595278271de9	1	Other	Other
+a6700bb3-1029-4a3c-a3c3-9d78756f1f76	1	Other	Other
+a6700fa4-50f0-498d-90a5-40b450206a61	1	Other	Other
+a670fda7-aa2e-4b7c-b8eb-484e6a3bf2fc	1	Other	Other
+a6710b31-30f4-4e7d-93f8-5dda0b419c64	1	Other	Other
+a6715837-cdac-4deb-9506-2601a0356971	1	Other	Other
+a671a388-522e-45b3-9ef7-c420dbb4f745	1	Other	Other
+a671d868-c2d7-4283-974d-30934172de8b	1	James	Other
+a671f414-54d2-4356-b0df-ca00be02577a	1	Other	Other
+a671fb39-2b95-4ade-8c84-6d2cd9c6d7bf	1	Other	Other
+a6725c20-4406-4555-8b96-866b4eaa051d	1	Other	Other
+a6728898-6e5c-49c1-8389-48f1dbb5ae93	1	Other	Other
+a6729e14-5ac3-45c0-b03c-eeabb4baa03a	1	Other	Other
+a672f11b-c085-4bc3-a69d-5a6671c16b9f	1	Other	Other
+a672f1b7-777f-4c09-8131-4c898a625620	1	Other	Other
+a672f211-c72f-47c0-aa2f-d9f26ac6efc6	1	Other	Other
+a6732250-7a63-4b8a-9e10-8f09424c2d38	1	Other	Other
+a67351a4-059a-4c00-a3c1-cc204247285b	1	Other	Other
+a6735489-2d24-4f60-b743-3e70c9a26aab	1	Other	Other
+a673747b-423c-4e91-a61f-ea9fd77d764a	1	Other	Other
+a673ea14-7cf0-4bde-a0f2-05dbb539cffc	1	Other	Other
+a6742913-19a0-45e5-ab7e-5c962bd7b833	1	James	Other
+a67432eb-b30c-425f-9197-47fb3088001a	1	Other	Other
+a67433fe-cc9b-467f-8733-a8c8af5cf06b	1	Other	Other
+a6744ef3-9dfe-48b7-97d3-32d1b94d45be	1	Other	Other
+a674ad2a-b4d4-4cbf-9066-735cfadbe3b8	1	Other	Other
+a675049c-7405-4d53-90b1-9394cee47a74	1	\N	Other
+a6754ebc-f17e-4b1c-8e19-dc1f74ed06e4	1	Other	Other
+a67559eb-40e7-4156-bfe8-7488c6e4b244	1	Other	Other
+a6758bd0-48f0-4a61-8acc-18c30fc4ced4	1	Other	Other
+a67615f1-2e39-4f5f-8e62-07fc732e8ab9	1	Other	Other
+a6767c08-031a-49e1-aad9-93ac4dcc4b1a	1	Other	Other
+a6769f0f-57e5-46eb-aac4-a0e0a79673bb	1	Other	Other
+a676a8ba-1f8d-416c-bc78-8f7e89b0d50d	1	Other	Other
+a676e721-a4ec-4f45-929b-f85c11527650	1	Other	Other
+a676f732-bcff-4891-b490-f9407a045e9b	1	Other	Other
+a6770c3d-8604-4f66-8734-98b1cacad8c4	1	Other	Other
+a6771618-df87-4b64-af99-141b34f5ae2f	1	Other	Other
+a67741e8-1456-4049-a19b-c42000c416fa	1	Other	Other
+a67758b5-459c-41bf-bdac-452ca7b5fd67	1	Other	Other
+a67760e9-1e88-44d9-b323-2896d53d2c87	1	Other	Other
+a677a11a-bb82-4965-af77-3093414f4e24	1	Other	Other
+a677f1a8-66e9-495c-b854-b68b2fc90aea	1	James	Other
+a677fd73-cf4f-4793-9020-ea3e26e6dc36	1	Other	Other
+a6786b31-0f79-47bd-807c-dab6f2b680de	1	Other	Other
+a6789d69-77a8-4ebb-a58b-cb48ec6f343f	1	Other	Other
+a678a8fa-6ae4-4638-93d3-7b0bbda222ca	1	Other	Other
+a678edb6-1944-43e3-b3eb-b9d67f8acb57	1	Other	Other
+a6794141-8a1a-4f68-b62d-297043e478cd	1	Other	Other
+a6794a43-5249-4863-a8ff-71d793b99067	1	\N	Other
+a6799130-f9f4-4fcd-9c6e-e07d2edc46f7	1	\N	Other
+a6799663-a0a1-4a01-bacf-7525e5d6c785	1	Other	Other
+a679b2a0-a985-4310-a236-944b6fcd5044	1	Other	Other
+a679ff71-03e8-499d-aedc-baecc25cbb28	1	Other	Other
+a67a1ae7-9d21-47eb-a1f5-249de4293361	1	\N	Other
+a67a67ad-6001-467b-aa93-9c28723fffba	1	Other	Other
+a67a8ee6-7fca-4ae6-8879-cc706c378109	1	Other	Other
+a67a98b3-b5a8-43c3-bc00-5e7c63f71bde	1	Other	Other
+a67ac6c3-2c8a-4704-9ed9-286779a47e56	1	Other	Other
+a67af771-d3ed-409b-bf43-91e4bc546322	1	Other	Other
+a67af793-009b-42f8-b495-90e0fdf41239	1	Other	Other
+a67afab6-6454-4c6c-b945-e3157a3e5a22	1	Other	Other
+a67b0651-7e2d-41a1-8c1b-3feebabd1f59	1	Other	Other
+a67b0f03-1534-45eb-9bba-81a8ba938a71	1	Other	Other
+a67b499f-eb07-4b0f-9814-d73ca5c2fef9	1	Other	Other
+a67ba506-33a1-445d-8ff9-0c6fe95523cd	1	Other	Other
+a67bac64-9785-4361-b8b7-33e7be157502	1	\N	Other
+a67bd7bb-27d5-43b7-9dfd-a536df0cd260	1	Other	Other
+a67c0f21-0c5c-4468-acb9-95d5d823fa0e	1	Other	Other
+a67c23fa-200f-43d9-be44-da20f6a71efb	1	Other	Other
+a67c5268-1097-47a1-98b1-2246dc15daef	1	Other	Other
+a67cc57a-0a81-4c98-8f48-db5c1cad5fa3	1	Other	Other
+a67cd44f-1fac-4511-8548-c0b6b265a87f	1	Other	Other
+a67d0098-7bd6-4ed3-baf8-73b6ca2fd35b	1	Other	Other
+a67d1590-9f0c-4a87-8787-e68e3ed090c6	1	Other	Other
+a67d362f-9d05-4cd7-a37b-206cd9a70e83	1	Other	Other
+a67d6a64-42cb-4ee6-b072-b3e59a0c898b	1	Other	Other
+a67dec40-3777-4526-8f25-905f77910a61	1	Other	Other
+a67e006d-e17b-48b0-bee2-569d3109c748	1	Other	Other
+a67e6583-4a35-4020-a2ad-1233908742f5	1	Other	Other
+a67e69a6-e0f7-4c09-8081-06d4039f9644	1	Other	Other
+a67e736d-3aad-4c85-8a03-92c215c029b3	1	Other	Other
+a67e9f5b-4553-4478-86b0-7ba2c4fa9d17	1	Other	Other
+a67ec46f-10d7-4174-957a-9e629bb6f64e	1	Other	Other
+a67ee447-7f6a-402d-ba87-10d5007f7992	1	Other	Other
+a67ef36d-f67b-420f-bbd2-578ec77891eb	1	Other	Other
+a67f3dd5-3cfb-4894-ae38-e53a84f1ffad	1	Other	Other
+a67f4831-391b-4d7e-a84e-9c3c81c8f6a0	1	Other	Other
+a67f58cd-80e0-489d-abb9-3bd2807027c0	1	Other	Other
+a67fde28-da28-40a5-8386-5213f93bea85	1	Other	Other
+a680219b-275e-4c74-9693-0337c5efadde	1	Other	Other
+a68081c9-e2cc-4111-bb09-a4174fa6f344	1	Other	Other
+a680892d-7d85-4309-b8e0-aeae7d3c4023	1	Other	Other
+a6815af5-a041-4729-94ea-776d1e4daaff	1	Other	Other
+a6817cfd-8d0c-4534-a385-77977b0c50ba	1	Other	Other
+a6818057-76cb-4d90-a910-07d67a9d8d04	1	Other	Other
+a68195c5-d4d4-4e8d-bcfe-62af0de27b60	1	\N	Other
+a681d623-d6f6-4215-8658-21862e0d160a	1	Other	Other
+a6820e3b-4eb8-4386-a8e2-459357fee9f9	1	Other	Other
+a6823491-c16f-477f-9e5f-68a1135eb8a0	1	Other	Other
+a6827f65-8c29-4e4d-b8ed-cedf9c8d7204	1	Other	Other
+a682af4a-bd01-4fa0-aa0f-b11021cd7c18	1	\N	Other
+a682f5e5-1d89-4686-9b0f-2ed46ff64d42	1	Other	Other
+a682fc0c-fc71-4e88-8eb3-faacd57d8248	1	Other	Other
+a683809a-75a6-4515-97b8-ebc2b7e9cf68	1	Other	Other
+a68398df-8901-4d95-89c0-0feb7bbfdd0a	1	Other	Other
+a683d05b-f8cb-4ede-b5bf-2de1f6b533d8	1	Other	Other
+a683e582-c16f-41f8-9081-c753de9d254e	1	Other	Other
+a683fdf8-98dc-4173-8177-5de3b45f55a6	1	Other	Other
+a683fecf-eefc-4a9f-9f5f-b9c37a5e6893	1	Other	Other
+a6841258-0cf0-481b-bf9f-cdd40c9b8cf2	1	Other	Other
+a6841892-d5c9-4002-acca-67f0bbacab36	1	Other	Other
+a68428c3-27f4-47a1-b36c-f71ce34489c2	1	Other	Other
+a684520b-fa86-424c-93b1-bd324b96a096	1	Other	Other
+a6845460-9344-491a-8701-6b825563351d	1	Other	Other
+a68462f5-cf26-4fc0-ac16-b6891598d4d2	1	James	Other
+a6847409-559d-429e-a794-a97ea147b50e	1	Other	Other
+a684ad9c-2a1a-4774-aafa-4c3cd04ce374	1	Other	Other
+a684ae6d-a773-4156-82e4-aa1c0aaca336	1	Other	Other
+a685038f-5535-4320-aa4c-98a404a95699	1	Other	Other
+a68527e9-5401-48e8-94d8-aad01c1584b7	1	Other	Other
+a685673b-3cdc-488f-b945-a3034accb5a2	1	Other	Other
+a68585a6-9e06-4d11-914f-6c26b2f08476	1	Other	Other
+a685ad57-26fc-462a-a19e-fe86fefcc66a	1	Other	Other
+a685b1ef-e493-490d-b539-3332d1174689	1	Other	Other
+a685f0a0-d93d-469c-a404-3e8dbd1834de	1	Other	Other
+a68659c8-7825-4fe3-bf3e-743a4c0dd892	1	Other	Other
+a686aa7e-7da4-48ed-bace-2c2a071623e4	1	Other	Other
+a686e2e1-79bc-4bbd-9eeb-efe0e5fb921d	1	Other	Other
+a686f7ac-5b36-4c7b-8299-0e2f72ecb0b4	1	Other	Other
+a6872a63-a4d9-45c8-93bd-bec65e0f5218	1	Other	Other
+a687440d-69da-41b6-bac5-eaffd1bc9723	1	Other	Other
+a68756ae-c747-44a2-9dfc-92d593379c70	1	Other	Other
+a6875f26-4cef-47d6-b488-c2e29ff6b7a4	1	Other	Other
+a68763d9-39ff-4b3f-9abc-2dc20cf1f36d	1	Other	Other
+a68784c3-2914-4623-ac7b-c7a983d3b339	1	Other	Other
+a687e879-8e9c-4a44-a259-b544996a8185	1	\N	Other
+a68827df-d123-40e1-91f3-95f88706f3e0	1	Other	Other
+a6882d63-7a13-4724-85c8-2e6f3aaf2465	1	Other	Other
+a6883064-3c92-45d9-af47-5314d5655a49	1	Other	Other
+a6886972-478c-4398-9d23-1ecbf48932e5	1	Other	Other
+a68890bc-63c7-435e-a18c-5aa578099fb7	1	Other	Other
+a688e6dd-c71b-418f-94be-eb4135555e7c	1	Other	Other
+a6892864-a62a-44dc-a2ff-179fdaa90883	1	Other	Other
+a6893f58-ee65-49b8-b5e2-082d512486ec	1	Other	Other
+a6896ad0-4a90-4194-acf9-64a8d8fdab26	1	Other	Other
+a689924c-d397-4dc6-b4e1-385d9c397b71	1	Other	Other
+a68a12bc-5091-4594-9504-b399cef27662	1	Other	Other
+a68a65e8-ed44-43fc-81de-6114c06f4e61	1	Other	Other
+a68a87b4-f410-4d87-96bc-d2940001b2f3	1	Other	Other
+a68a8b68-10d1-42d9-a68e-e409ec75b4e1	1	Other	Other
+a68a922c-bca0-4ee4-9568-a6b7d39874db	1	Other	Other
+a68ac6c8-0bff-4052-84dc-6b7675394510	1	Other	Other
+a68aef54-1397-488c-8a20-933dc75e732e	1	Other	Other
+a68b3420-1cb7-4e59-8e48-fb464461d27b	1	Other	Other
+a68b34fc-67dd-48b9-a93b-fb7c67bfe7b1	1	Other	Other
+a68b4bb6-817f-4567-a560-b389e9fcb1f3	1	Other	Other
+a68bd540-196e-4c14-847d-fa6c2fd8badc	1	Other	Other
+a68ca034-093a-4cd2-b8b5-59efd6919ece	1	\N	Other
+a68cb8f4-7519-49f1-a392-d19b90521b01	1	Other	Other
+a68ceaad-9ae1-4750-829d-61ca67f7e1d8	1	Other	Other
+a68cee08-ecf6-40d0-83dd-44c2322ebfd3	1	\N	Other
+a68cf5ac-2987-4e10-ba4d-b44c5b729052	1	Other	Other
+a68d773d-d466-4d0b-8b40-e3b8ca74f1c4	1	Other	Other
+a68d90b9-ef9c-4a98-bc66-d22fdedac99b	1	Other	Other
+a68da773-b7c4-41ef-8887-82db036349c7	1	Other	Other
+a68dd818-fd99-424b-8848-9570cb336298	1	Other	Other
+a68e09dd-bc8a-4881-8c49-dc5a49eb5e18	1	Other	Other
+a68e0da7-eedb-4407-9dd3-858542fb2a34	1	Other	Other
+a68e13ff-8ff5-4e4a-aa11-2b26f5263259	1	Other	Other
+a68e4a75-a437-4e9c-af09-c7adaa3cc00e	1	Other	Other
+a68e5955-4710-4b5d-bf61-0fb53c6411ba	1	Other	Other
+a68e84e9-3d2f-4140-a900-de637eea8a4e	1	Other	Other
+a68e911c-f3c9-482f-b6d2-d2b43c20cace	1	Other	Other
+a68eaf7d-0f1e-427c-b983-003b3978d2d3	1	Other	Other
+a68eb005-7fa0-4ad3-ba5b-55802aa35a31	1	Other	Other
+a68ec0d7-cf95-4827-bb62-42f97ac4f49d	1	Other	Other
+a68efc7c-dd95-470b-8465-9f5e5e3fec8b	1	Other	Other
+a68f6186-a3e0-49e4-8649-d26276ddd7b4	1	Other	Other
+a68f69f2-d243-48c6-b8a4-8ebb595c6f25	1	Other	Other
+a68f850c-9de8-4a01-b1f3-f466de2ce08b	1	Other	Other
+a68fe00f-cbe4-4481-bce9-4c27a1f74f63	1	Other	Other
+a68ff97d-942f-41b8-be91-35f05c66b9a2	1	Other	Other
+a68ffa91-9b1f-4747-b14c-926329fabefe	1	Other	Other
+a690764e-b9f3-4b04-b9e0-9db31c4390c4	1	Other	Other
+a6907e1a-75df-4893-87f2-549dbd033abb	1	Other	Other
+a690b56f-64c1-40af-a168-71539d134ed8	1	Other	Other
+a690d4d0-3927-41aa-b9bf-206c9950b8b6	1	Other	Other
+a690dbb6-f9ab-45b3-84ba-6d6296b56d33	1	Other	Other
+a690edc0-1fbd-4e9e-9776-e247f61adc0b	1	Other	Other
+a6911b40-47c5-4776-b0a0-b9fce0975c06	1	Other	Other
+a69186d8-4024-480e-bb1d-fe4acaffc646	1	Other	Other
+a69186d9-0958-42fd-876d-0fd64efa78a5	1	Other	Other
+a691b98d-417c-4c31-a347-603af5835ee4	1	Other	Other
+a691c9b1-1c97-4206-a512-c69bbfcbffc8	1	Other	Other
+a691cce6-2f49-48e9-82c1-b9644796c835	1	Other	Other
+a6920a74-e4e0-4ced-a524-4af5131a45b9	1	Other	Other
+a692c0c1-5f52-4c95-b9b0-500830713a8d	1	Other	Other
+a692dd9d-49f9-40c4-8784-299e79fdf875	1	Other	Other
+a6930730-5a42-40aa-98c5-8edae1ad1b23	1	Other	Other
+a6934f6e-fa1f-4013-8f77-800cae8281f7	1	\N	Other
+a6936553-d9e2-4d59-89cc-29a739509e1c	1	Other	Other
+a69370b2-a2c7-4d4a-807f-e008b4f4c2da	1	Other	Other
+a69376ff-dd2f-4638-a855-ba78915495ee	1	Other	Other
+a693e2bb-95ef-43cf-a91d-05ad84362893	1	Other	Other
+a693e343-8111-4ae3-a108-2613ee074fdc	1	Other	Other
+a693e9ee-6797-4215-a299-185e2508ac90	1	Other	Other
+a694196b-c8c0-485c-a1b8-66e6716580e5	1	Other	Other
+a6943dce-b290-48ea-92e6-e3ecf6a807e5	1	Other	Other
+a6944835-899d-4730-8d11-6b44aa0d9b3e	1	\N	Other
+a69482ba-8640-4f67-bb0e-5cd14c887e35	1	Other	Other
+a6948cc8-8aeb-4370-a7a7-dadf78f91c08	1	Other	Other
+a694a7fc-d78f-4ea7-a22d-e30348dd31b8	1	Other	Other
+a695131b-92ce-4f2f-8671-b4ae42a19a1e	1	Other	Other
+a695436d-2e2d-4f58-8431-68855c862dac	1	Other	Other
+a6958601-a156-4a09-84b1-8fcbdae63050	1	Other	Other
+a696080f-0e9b-4a53-8cfa-2b364aae8edc	1	Other	Other
+a6963d33-4df2-445e-9d35-8147fbeef4ea	1	Other	Other
+a69658ac-95c6-43e1-bb11-aad646871a82	1	Other	Other
+a696a1d1-c66f-415b-9a5e-a8f40c340692	1	Other	Other
+a696b34e-e6fc-4950-b3ae-e7a95edd01a2	1	James	Other
+a696d7d0-9e31-417e-b48e-fb0ed64cfb8f	1	Other	Other
+a6970175-a240-4db4-a63e-d512d3f8585d	1	Other	Other
+a6970b53-bf24-47a7-8ea1-25df43cff11e	1	Other	Other
+a69738c4-d4b5-48aa-944e-ec767965911b	1	Other	Other
+a6979454-d498-4e2e-9147-088211861fab	1	Other	Other
+a697e801-1221-40e7-b244-d53598abeb8b	1	James	Other
+a6981aec-8a67-4a8a-8fa2-265e882a4c2c	1	Other	Other
+a6987744-f49c-4911-bbbc-a27be45c7a59	1	Other	Other
+a698b6c1-1f58-46a1-9c2a-2aae80a28b1e	1	James	Other
+a69900ba-fa1a-49d3-a1cf-ed0dc1b34858	1	Other	Other
+a6990724-d803-44df-a22c-95715167c2ae	1	Other	Other
+a699bfd0-8a48-4038-88f2-0a2b280ea31c	1	Other	Other
+a699d0d6-b63f-4330-9045-0051f56e6bfe	1	Other	Other
+a699daf5-96e5-48c9-b9e1-4eadb2bf5a38	1	Other	Other
+a699e5f6-310d-43d1-a721-e27b2456c51a	1	Other	Other
+a69a1334-568f-4f89-a927-7cd19575ef6e	1	Other	Other
+a69a7193-51cd-4cb3-b53d-5f892d86cbe1	1	Other	Other
+a69a73d0-f1e0-44e0-8ca7-bf852ff32612	1	Other	Other
+a69a8f0f-fe10-48d1-895c-c71516eaf628	1	Other	Other
+a69ac2ec-6afc-47ee-820b-d17ece51cf5f	1	Other	Other
+a69ae72c-0171-4c9f-9f54-5534124a0440	1	Other	Other
+a69b06a5-c4fc-40e2-accf-f9c395b3068a	1	Other	Other
+a69b2024-3017-413d-80ec-180ebb7b12f9	1	\N	Other
+a69b4124-052e-49d5-8a03-f0b6481ea4cc	1	Other	Other
+a69b4a98-72bf-4a57-af15-28c383d81057	1	Other	Other
+a69b8979-333e-4c97-865e-2978835213c1	1	Other	Other
+a69bdf8c-cc06-465f-affe-0345d1ce12e9	1	Other	Other
+a69c367f-2a6a-4140-b7d7-66ea87cbb94c	1	Other	Other
+a69c79e2-a258-4880-a06c-c08906d22405	1	Other	Other
+a69cd4c8-2cf4-4d76-ac11-5bfd02b485c8	1	Other	Other
+a69cd84d-f473-483c-a33d-583004c372ec	1	Other	Other
+a69cef96-52c6-4a48-879e-f5ea27abd440	1	Other	Other
+a69d0353-9dc3-41be-b9dc-ad0cdd8cb9dc	1	Other	Other
+a69d1806-0fc8-45f5-ab3f-9e3cccf41e81	1	Other	Other
+a69d6d33-f5b5-49d5-9c6b-c94187592c57	1	Other	Other
+a69da7b2-3787-43b3-8240-dacb3755d21e	1	Other	Other
+a69de1cf-781e-4cfe-b6f6-725fcc9d444e	1	Other	Other
+a69de219-0922-4ab6-b9c0-e36ade32d9c8	1	Other	Other
+a69df079-34e3-4e00-96a0-0d9412a5276c	1	Other	Other
+a69df9ad-90d8-4e93-b81e-ccbd35e6db87	1	Other	Other
+a69e2176-b9cd-4434-b696-6e45f7548ef0	1	Other	Other
+a69e5192-25b8-4c57-b824-c05b29fae22b	1	Other	Other
+a69e5597-1645-458c-95cb-72691a1d5715	1	Other	Other
+a69e5ea4-42f8-4d4b-8488-244240393e03	1	Other	Other
+a69e8628-7a2c-4021-8bc3-8020ec7ac119	1	Other	Other
+a69eabd7-f51e-49f1-a8dc-c20eb5e3f853	1	Other	Other
+a69f0a28-804e-474d-9b02-b27d5f10d4ac	1	Other	Other
+a69f1261-e9a9-4d9e-9bb8-536180893795	1	Other	Other
+a69f3cd4-867c-4bdc-aeeb-9b262b2e194a	1	Other	Other
+a69f9088-ba11-4d9e-b660-0f9b97f1330e	1	Other	Other
+a69fd426-84c6-4575-986d-137453aecd6a	1	Other	Other
+a69fe60c-3294-49fe-8bf9-c6c5a62d1686	1	Other	Other
+a69ff17f-ce35-4c13-b653-e4f22af22532	1	Other	Other
+a69ffee0-c9bc-4118-8044-69b298bb1dc3	1	Other	Other
+a6a0043d-6553-4cdd-aa53-634c9e8d3c38	1	Other	Other
+a6a01778-b9b1-4aa5-89f6-1adf330a32a7	1	Other	Other
+a6a093e2-457b-4447-a659-d23077ec1128	1	Other	Other
+a6a0c1ee-6cdc-4d7e-880e-7d6aa3163942	1	Other	Other
+a6a0df26-bbdc-4767-87cc-89cf7afe8824	1	\N	Other
+a6a10a84-3315-4692-8bc8-05268ced4c02	1	Other	Other
+a6a167d3-b301-43a9-9fe0-f6f02c992ac7	1	Other	Other
+a6a1929e-4b4a-4204-a339-83a5e77a9164	1	Other	Other
+a6a1b17b-31b0-4a9c-8d06-8a281ab96795	1	Other	Other
+a6a1fac2-5d30-4001-9ea6-be08ab491fcf	1	Other	Other
+a6a23733-8db6-44c4-8d33-566b221a0a18	1	Other	Other
+a6a2741b-c987-4b30-8415-1a4f8c4dd211	1	Other	Other
+a6a28eb6-da0b-4e06-bf11-b7c62f7d92da	1	Other	Other
+a6a2aa53-d464-436e-90da-790131a1ca8c	1	Other	Other
+a6a2d3ca-bfbe-4f4e-8785-1e1ded876166	1	James	Other
+a6a305b7-30bc-4190-bf17-87135fcba74e	1	Other	Other
+a6a30f46-e3f8-4a03-8cf1-24ccaa3cfc49	1	Other	Other
+a6a359fa-c285-472c-94d9-1a846d6a760b	1	\N	Other
+a6a40108-4f87-4ec8-aa98-e0acd0111a46	1	Other	Other
+a6a46c4f-6037-4964-8fbe-b79d8076b764	1	Other	Other
+a6a4b46f-93d1-4d42-aea6-edf60543f720	1	Other	Other
+a6a4b977-7724-40d0-9b88-af2e035e81f4	1	Other	Other
+a6a54c76-abd6-4aa7-a6a5-5c085040e134	1	Other	Other
+a6a5ced7-269d-49c1-acb5-cb671b74429d	1	Other	Other
+a6a624ea-226b-4375-b37e-3412e13d38b7	1	Other	Other
+a6a625ea-81f3-4bea-a36a-da04751fadca	1	Other	Other
+a6a633d3-7ffe-47b5-b5bb-859e6798ca0b	1	Other	Other
+a6a6479e-e05a-4fb0-b282-f54c97c31a36	1	Other	Other
+a6a64da7-b8ed-4a5c-b47a-5437f23d121d	1	Other	Other
+a6a6590b-a56a-4b28-815a-5c28b0a5b7b7	1	\N	Other
+a6a68183-d337-4839-afae-2a1b5b78066a	1	Other	Other
+a6a6cfb8-178d-4080-b096-8e14d36e8b7e	1	Other	Other
+a6a6d187-78e8-45b1-bb39-f73ca5923b52	1	Other	Other
+a6a6dda5-2790-43e0-b00c-e9e272545dc9	1	Other	Other
+a6a6ebaf-7f66-475e-9db1-14958f124b6b	1	Other	Other
+a6a709a0-12ce-4f90-9f79-15772836bbeb	1	Other	Other
+a6a73ed8-f645-4b2a-9e75-0c67b2554685	1	Other	Other
+a6a82e7b-a210-4c72-9c42-0a4459c09550	1	Other	Other
+a6a84e00-ff69-487e-a154-f1e1b25735c9	1	Other	Other
+a6a86f30-703d-4e3d-afd5-0a47f7731780	1	Other	Other
+a6a89298-c192-4f01-9004-79ad623e579f	1	Other	Other
+a6a89e3f-5133-47e2-a625-03bfeacb3f39	1	Other	Other
+a6a8b4d0-0276-11e8-9928-fa163e8624cc	1	Other	Other
+a6a8bfdd-1137-4729-b5c0-39576b46811c	1	Other	Other
+a6a8d253-9b61-4991-814a-c504368e2010	1	Other	Other
+a6a8db72-cbf6-4c41-bc8e-5b5f442316bf	1	\N	Other
+a6a91854-3541-4532-8f46-7fe1d699d5a5	1	Other	Other
+a6a92763-bce3-4cf8-83b6-dc6542c61ece	1	Other	Other
+a6a9338e-fa8f-4189-a7a2-0668a65c01af	1	Other	Other
+a6a94751-869f-412b-8053-24d0914a682d	1	Other	Other
+a6a948bf-e4d8-4fab-9b4c-289a8c8e29ab	1	Other	Other
+a6a95d13-a64c-4c6c-8111-068d3682be65	1	Other	Other
+a6a96075-0f52-4a2b-8a7d-1b6ca8a0fe06	1	Other	Other
+a6a96c01-08c7-444b-9da0-cea7104dcef6	1	Other	Other
+a6a9812c-920a-4bcd-a3bd-3876bc90faa8	1	Other	Other
+a6a9a90f-45b8-4998-8a8f-228ada42fff7	1	Other	Other
+a6a9b663-40f1-40b8-9c26-080c8a55e788	1	Other	Other
+a6a9f1ab-7514-4272-b56b-94b0dfbd7527	1	\N	Other
+a6aa05de-4664-45d3-920f-76d43fd9be50	1	Other	Other
+a6aa90dc-a316-49fc-a65e-6582a351364a	1	Other	Other
+a6aac3a8-cd7c-40c5-a82e-f37c7b26b6fe	1	Other	Other
+a6aacb77-600d-4b7f-851b-68d20648a753	1	Other	Other
+a6aaeb86-e162-4df9-8bdf-82d5ca4eda62	1	Other	Other
+a6ab5d18-2c32-4d41-a6fc-e23bde045316	1	Other	Other
+a6ac3dcb-a2e5-45ee-a1ef-350fa96e9a88	1	Other	Other
+a6ac4707-3209-4ba2-9014-b26ceb6aa689	1	Other	Other
+a6ac6d73-c3d6-4950-9636-3b16e9df21ea	1	Other	Other
+a6ac7358-bb79-4334-a775-b9c5d09f1f35	1	Other	Other
+a6ac8198-041b-4731-9674-9dd617b72aa7	1	Other	Other
+a6acc4d9-4788-4f0e-aa26-0c23c884a3b6	1	Other	Other
+a6ad1ac5-4543-427c-ab9f-723b22e4e234	1	Other	Other
+a6ad35ec-df07-4ba0-828c-bf64496c9e91	1	Other	Other
+a6ad3d66-e86b-4cf5-8d4f-a0d2a9d7cb73	1	Other	Other
+a6ad5fb5-9fd8-43ca-afdb-082dfa2d0093	1	Other	Other
+a6ae1fc8-7b6e-45a4-8517-c72f934f0411	1	Other	Other
+a6ae321c-d02c-4a5f-b2e2-79eb29cfe1d3	1	Other	Other
+a6ae37ea-b17b-486d-8739-2d57f995bc84	1	Other	Other
+a6ae43ca-01aa-4c9d-a379-020b42ad21ac	1	Other	Other
+a6ae9e7a-272a-4e98-9cc1-cdb3ed4fa575	1	Other	Other
+a6aed704-6eb5-4f9f-9cfd-256cdd6406a1	1	Other	Other
+a6af1ef4-5e67-4113-b0c8-ad56ad7051a8	1	Other	Other
+a6af39d6-50d3-4734-a443-8956e272f90d	1	Other	Other
+a6af97b3-7594-4b94-9363-5f0bab330f7e	1	Other	Other
+a6afd93e-2bd8-46a9-9835-a39acbe3aa5c	1	Other	Other
+a6b074c8-4045-473d-bd3e-8801dee23a46	1	Other	Other
+a6b0752a-b832-44da-b376-aa021c17e9d0	1	Other	Other
+a6b0f698-cb21-4a05-be02-aac6429a76af	1	Other	Other
+a6b11782-91bc-482a-b03a-4503faee000a	1	Other	Other
+a6b1566a-54c6-44d0-974f-95673f9691b0	1	Other	Other
+a6b167c0-47c3-4597-8da0-5ba5b6fe944a	1	Other	Other
+a6b17533-2353-4bcc-b219-1c7653efd8f4	1	Other	Other
+a6b184fb-ddc9-456d-9987-f4d797c48af1	1	Other	Other
+a6b1f3d2-dbcf-4289-9278-1c4a61b3f98d	1	Other	Other
+a6b22762-8714-48b2-911b-4a381e7e3731	1	Other	Other
+a6b22d2b-0a1c-4140-a545-c397d84387f3	1	James	Other
+a6b23fa7-e255-4b01-8a75-d2a3ad8f3fdb	1	Other	Other
+a6b2ab39-6677-4bcd-8a4c-54f6918f8965	1	Other	Other
+a6b2d18d-6fcc-41ec-bf90-0872f3d94033	1	James	Other
+a6b32dec-c39e-46af-8b05-01c2f034cc17	1	Other	Other
+a6b34b8c-a9b1-4b2f-9a9f-8a83ca4ea250	1	Other	Other
+a6b37cfd-2c3a-422b-af76-cd225ba0f6bf	1	\N	Other
+a6b385ca-4a43-45cf-a1a6-ca139b1e42ed	1	Other	Other
+a6b3b6f1-ed1c-4045-8eb5-a80dd50df34a	1	Other	Other
+a6b3f0e8-75c1-43a0-9177-2e8b1a747ec5	1	Other	Other
+a6b414d4-060e-4904-93e5-bba6cb02176f	1	Other	Other
+a6b42fca-5133-49bb-bf11-46a47c08d4aa	1	Other	Other
+a6b45334-ab71-4ae5-b612-0d4d11817a95	1	Other	Other
+a6b469cd-33a5-4c43-bdde-a88982ca344b	1	Other	Other
+a6b48b92-14f5-4e0d-810e-f7cb652ffb0b	1	Other	Other
+a6b49494-001e-494a-888a-519e010f6b79	1	Other	Other
+a6b4a9a0-f8b3-4718-b49c-664dd3840f93	1	Other	Other
+a6b51fee-9021-48b8-9bbb-942aeea31b30	1	Other	Other
+a6b56343-3712-404b-a40b-9ff151baab85	1	Other	Other
+a6b583a0-ab80-4293-a8e2-795aa35b9444	1	Other	Other
+a6b5a112-7085-46b3-aa8d-7c37613eda5f	1	Other	Other
+a6b5c92d-9a38-458f-b69c-33d9c30c1f01	1	Other	Other
+a6b606e1-844e-4eb0-8d69-b5d3e4d2421c	1	Other	Other
+a6b68239-8d77-4e51-8132-809c268bec6e	1	Other	Other
+a6b6cfde-637d-45b2-bd05-c142302663c6	1	Other	Other
+a6b6d691-4c57-4c8c-9242-5fe44e832f30	1	Other	Other
+a6b70580-b6ce-4d54-8b59-ba02c0687370	1	Other	Other
+a6b715ad-992e-4f77-9a19-9d9a173b6489	1	Other	Other
+a6b73da3-b913-4b2f-a1ba-af76a4079d5b	1	Other	Other
+a6b74af6-9f33-46a0-b66f-7019eceb7926	1	Other	Other
+a6b7805f-3605-424f-b879-ae255f17a9c0	1	Other	Other
+a6b78afd-41ad-460f-88f1-b599a26aa26c	1	Other	Other
+a6b7ecbb-42f8-4942-a82b-9d1ddb93cf80	1	Other	Other
+a6b81584-a8dc-44d8-9d7a-f80d96cfcdc9	1	Other	Other
+a6b82483-7c8c-4d74-be3a-e73a640050ae	1	Other	Other
+a6b829f9-1cbc-4f65-87d6-91d292f08022	1	Other	Other
+a6b88fde-10d4-4c3c-9f43-a9b94bf6796d	1	Other	Other
+a6b8c067-3fae-434c-9030-d460534e44b4	1	Other	Other
+a6b8d8f5-c55e-455c-a919-a1f491a4e795	1	Other	Other
+a6b91810-eb24-489e-9c3e-219ce752f3d3	1	Other	Other
+a6b95585-d3fe-4589-9710-689fe9096ce8	1	Other	Other
+a6b996fc-4a30-4ecd-8ad0-939c542d1925	1	Other	Other
+a6b9a6d3-830b-4a22-820f-5062661a1df1	1	Other	Other
+a6b9aba4-cf97-4226-8a2c-1bec69a60fb6	1	Other	Other
+a6ba0ff9-32cd-485a-ad62-78bc1083134c	1	Other	Other
+a6bad4ae-7c11-495b-866f-dc45a7ef6b26	1	Other	Other
+a6baf65e-8acf-443d-89dd-79e841c8ff15	1	Other	Other
+a6bb6d76-678f-47d4-a722-d86063288b8b	1	\N	Other
+a6bb71cb-79a0-424a-86b0-a8a9a1c5da4c	1	Other	Other
+a6bb7733-64e3-4600-a443-4ae57ad77bde	1	Other	Other
+a6bb861a-81ed-4bf3-ab87-9bf517393b3d	1	Other	Other
+a6bc337c-eef3-4086-b7e7-b95b7698e310	1	Other	Other
+a6bc3f7b-3bce-489d-84a1-07c2c50085c3	1	Other	Other
+a6bce1d0-b7e0-4d54-a3a4-2a50e542a480	1	Other	Other
+a6bd0b82-ec09-42f3-8bc9-cea70371585c	1	Other	Other
+a6bd2af9-a418-420b-897b-93864d46072f	1	Other	Other
+a6bd5fe9-9153-4fca-9e35-82553669e78d	1	Other	Other
+a6bd8683-9798-42f4-bd47-0f3a8700936e	1	Other	Other
+a6be3704-b623-4225-add6-dc848fe04d08	1	Other	Other
+a6be411d-413a-42e4-a60b-4fc2f6ced34b	1	Other	Other
+a6be964e-487d-474c-83ce-67da64656e05	1	Other	Other
+a6be98f6-c0d1-4bf7-9b2e-46cb2a54607a	1	Other	Other
+a6beb0c2-51ef-43b5-895d-77934de00a85	1	Other	Other
+a6bebf5f-6ecd-4ee2-afd4-e4031048e809	1	Other	Other
+a6bedf56-6baa-40e9-936a-90010fced167	1	Other	Other
+a6beff9a-eb4c-43b7-8322-6ecc28bb9ea8	1	Other	Other
+a6bf01a9-969a-4178-b6cb-0e8b3776fbc6	1	Other	Other
+a6bf04cf-10fb-40fa-a8a2-50370103d203	1	Other	Other
+a6bf394b-f983-43dd-adf5-d550b27b990b	1	\N	Other
+a6bf8234-d9f6-4822-9bdc-6b5baeb2fbef	1	Other	Other
+a6bf8fe0-7eb8-4848-9a83-d7fdde1e7955	1	Other	Other
+a6bfb0f0-742f-44a9-938c-358682ca97ef	1	Other	Other
+a6bfb60b-94aa-40ce-bc0f-1d0937631bd7	1	\N	Other
+a6bfb9e8-05bd-4b2e-9317-9569b5f2d68d	1	Other	Other
+a6bfea54-98f2-404b-a71e-6c121e9751a8	1	Other	Other
+a6bffc39-9c96-4551-a95b-cce2f2762791	1	\N	Other
+a6c01e93-40e8-4ee4-93f7-d0434dff3f68	1	Other	Other
+a6c04820-2ebf-48e0-8b05-ed32a07d01dd	1	Other	Other
+a6c0750a-33de-4874-8f46-6c01e94f9b49	1	Other	Other
+a6c17e1a-64a3-4531-bcfe-7878cee12a6c	1	Other	Other
+a6c1880e-bb89-420f-8b67-d7e85ad25c09	1	Other	Other
+a6c19ed9-7938-44c3-9ead-91f92f4ff876	1	Other	Other
+a6c1cd51-edea-4019-85bb-bc7ddadd181c	1	Other	Other
+a6c1e089-650c-4bda-8d06-9c4401df1e4a	1	Other	Other
+a6c1fe7a-8902-4b8c-80b7-ac5812bd1bb7	1	Other	Other
+a6c26ecb-58bc-4c23-b497-091704b387c9	1	Other	Other
+a6c294d3-e066-4083-a8e5-b0ea9f6dbd5b	1	Other	Other
+a6c2cf7d-9f6e-4232-af07-7b4b5ea722ad	1	Other	Other
+a6c2d3ec-cb19-468f-9a2f-61a7bf3241e7	1	Other	Other
+a6c33539-10bc-4d9b-9ffa-b9d0e7f75272	1	Other	Other
+a6c38c0c-749f-466b-b97b-c83ac2511655	1	Other	Other
+a6c39a22-f284-4c5e-9b6c-afb4d45aeb74	1	\N	Other
+a6c3a827-68ea-48c5-a3d2-7136febdaccc	1	Other	Other
+a6c3b42d-c881-4870-8297-24b864d28aa4	1	Other	Other
+a6c3bda6-6fc2-4b2f-b914-cebd75bcdb8d	1	Other	Other
+a6c3c8c6-e2d3-4ab8-902d-305c6c970138	1	Other	Other
+a6c4032f-1678-4f2a-9d50-d0472894492c	1	Other	Other
+a6c4090e-b7b4-4b3c-904c-1b77629f3ad2	1	Other	Other
+a6c423d4-7204-4292-883d-20d13ad012d6	1	Other	Other
+a6c4248c-820d-4c94-945c-84a210bdd20e	1	Other	Other
+a6c43369-8889-4ca6-b8aa-37d34f301225	1	Other	Other
+a6c43415-b96e-4f74-8f18-21dd68f505e0	1	Other	Other
+a6c4747a-6b95-4dc4-bceb-1a37b2fee187	1	Other	Other
+a6c48a92-4c01-4678-b2e2-f7309370b886	1	Other	Other
+a6c49299-5fd4-47c5-9096-cc7dfa8a0661	1	Other	Other
+a6c4c54c-8cf3-491f-b05a-9e0cbb146d69	1	Other	Other
+a6c50050-c062-48d2-8830-91a4eecffa2d	1	Other	Other
+a6c5522f-3b84-42a6-9bbf-bfb5d83e80e7	1	Other	Other
+a6c55dee-5662-4e15-92a5-91634f1fd680	1	\N	Other
+a6c5704b-ab18-415f-8808-06debd3dda96	1	\N	Other
+a6c580ba-69b5-44a1-9f3b-7c8eac20dc80	1	Other	Other
+a6c597e9-af88-4c3e-8286-2ffc1fb604a8	1	Other	Other
+a6c599a2-6834-4041-932c-4ae8762d5662	1	Other	Other
+a6c5ead9-e13d-4eeb-80cd-2cc13b752d17	1	Other	Other
+a6c60c44-af2e-4054-afc3-c65e850604b5	1	Other	Other
+a6c6133f-ce48-481e-a788-2b67c15abc96	1	Other	Other
+a6c64eb9-f839-4f66-8f30-6acb0a99aa18	1	Other	Other
+a6c65566-aefc-4851-a6e9-b4c4aa345b2f	1	Other	Other
+a6c66095-9877-48c4-9bdf-fb196894beb8	1	James	Other
+a6c6c8a8-9428-4b3e-b855-7e6171fe5148	1	Other	Other
+a6c7714c-c625-4c89-b9da-9f595dfb2ccd	1	Other	Other
+a6c78d37-31c5-4ce4-b353-a6cd8e4eabe9	1	Other	Other
+a6c79712-b058-4b6f-a321-56055ac26ab5	1	Other	Other
+a6c7b911-7718-4933-aa85-152fd696d2ab	1	Other	Other
+a6c7e6e1-d1fa-4da8-956c-9c54120aa44e	1	Other	Other
+a6c84846-ef53-47c3-bfd1-e341af321e2a	1	Other	Other
+a6c85f38-5bac-4841-9a61-aac3f91b0190	1	Other	Other
+a6c8ae8c-f26c-44ba-a0fd-fbea5c6e7e51	1	Other	Other
+a6c8c0c7-adc7-4d0b-814f-ba9a9e4c3d8e	1	Other	Other
+a6c9140b-6024-4f31-a452-e07c15281031	1	Other	Other
+a6c93a22-81fd-4a7d-b2dc-e279db8090cf	1	Other	Other
+a6c98c62-c8ba-40f2-8011-053dc04ff8fe	1	Other	Other
+a6c98e89-d28f-4079-8c82-1a9de4d1e8fb	1	Other	Other
+a6c9bd99-db2e-4418-b6ff-97a916a3f730	1	Other	Other
+a6c9bf73-f72e-4518-b638-6a0068a886bc	1	Other	Other
+a6ca69dc-fc6d-42ee-a5e1-4260a59d8b4c	1	Other	Other
+a6ca9dd5-d9fc-4da2-8668-c13713c9af2f	1	Other	Other
+a6cae2ab-c760-46f8-909c-da8d1fdffec8	1	Other	Other
+a6cb684c-bb69-4f00-a9b5-63f7421c09dd	1	Other	Other
+a6cb75aa-e071-450e-9638-ec97ab81d2fb	1	Other	Other
+a6cb8a54-f9c6-4a31-9d8e-d1408ca2ed08	1	Other	Other
+a6cbe8c8-8afe-4bd0-81e7-bc1dcb75dbed	1	Other	Other
+a6cc0fde-1c7a-4f08-861e-a90e3995233e	1	Other	Other
+a6cc8e12-c949-46c8-998f-520250dfffac	1	Other	Other
+a6cd5449-1000-4ea6-a2e2-436f52dc6ed2	1	Other	Other
+a6cd67d7-6ed0-4add-b8ac-0b900335bb2d	1	Other	Other
+a6cdb608-707a-48be-890c-a0bff411346a	1	James	Other
+a6cdd4a1-e887-4c90-b4f8-1bedd7839e68	1	Other	Other
+a6cdf520-c0f4-42bc-9192-3e3d804b6a3a	1	Other	Other
+a6cdf6e1-619f-406d-bd44-62c8525d588e	1	Other	Other
+a6ce0d65-dcd1-4ba8-8bfb-685ab8e0e3c1	1	Other	Other
+a6ce38b2-a702-4fe8-ada7-5b90d10b0f0b	1	Other	Other
+a6ced057-000b-45f9-927b-fd92d7ab3af7	1	Other	Other
+a6cefd00-a57c-4424-aa86-d59607f1968f	1	Other	Other
+a6cf1e8a-ebdf-4e44-ba93-c590fc25fa50	1	Other	Other
+a6cf58b4-6a19-42ee-bc3a-4dabf955a2a3	1	Other	Other
+a6cf66c8-e48e-47c2-8ef3-546578e0b073	1	Other	Other
+a6cff186-54b7-4e16-8c22-4caffdf48bb7	1	Other	Other
+a6d01e80-ba8a-4bd1-befe-c82c92f80d11	1	Other	Other
+a6d07345-ccdf-4f8c-9a1d-ddcf6c770ab1	1	Other	Other
+a6d0a412-78e8-4758-a948-32a0961e30c9	1	Other	Other
+a6d0cd40-8f00-4fa2-8d14-8f4ad8b3512e	1	Other	Other
+a6d11982-99e5-4fbe-b1a8-20898ff17a62	1	Other	Other
+a6d11e6c-6ca5-46dd-8e3f-c84e4a8a39dc	1	Other	Other
+a6d13019-a3f5-4e29-90fb-dfadbcfaa868	1	Other	Other
+a6d14cc2-26b7-48cb-b231-531241562bcf	1	Other	Other
+a6d160bb-140f-4b3e-9a57-cbb7355db8e9	1	Other	Other
+a6d176d1-f0b4-435f-9a5b-a74f0e63218b	1	Other	Other
+a6d18d6b-482b-41be-9dc9-cb1e75776e4e	1	Other	Other
+a6d1bde6-8d30-4984-bb4b-0469fe2c4990	1	Other	Other
+a6d1cc68-29b0-4ce5-a6a4-8c477fbee9dd	1	Other	Other
+a6d2046a-3be0-4365-9201-7b38e38af8d3	1	Other	Other
+a6d205ee-bb7f-412f-9462-b1114d0121cb	1	Other	Other
+a6d22f58-120e-4a1a-997c-ba67a8bc2b10	1	Other	Other
+a6d23c89-0941-49e0-9dc0-1037934fd836	1	Other	Other
+a6d2ad81-4e7a-472b-a856-dc9a409e4fbf	1	Other	Other
+a6d2c4dd-bccf-4393-9585-0a6b32bca363	1	Other	Other
+a6d2ec0c-d1ea-4dee-b536-c65ad090f9af	1	Other	Other
+a6d36090-6dd1-4da4-9d59-01698f8f2581	1	Other	Other
+a6d37bb7-c5eb-4443-9727-96ef2c094af4	1	Other	Other
+a6d38acb-c71a-4e23-aca3-2faafdd5694a	1	Other	Other
+a6d3a733-f459-4898-862e-681b669f6747	1	Other	Other
+a6d3ec69-30b0-473e-9a10-2ac4917c8a39	1	Other	Other
+a6d3ff81-7cd1-452f-9c97-7add6c4f502b	1	Other	Other
+a6d450c7-a9f4-403d-ae06-4ff2452793ca	1	Other	Other
+a6d455c1-0f0f-4198-9861-a4e8d6c6dab7	1	Other	Other
+a6d45689-6a02-4587-a5e3-26ddd9faab65	1	Other	Other
+a6d47123-476b-4a12-8217-5ffc041cd9d2	1	Other	Other
+a6d47eb8-f968-43cc-bfc1-26732260e701	1	\N	Other
+a6d4dc05-4a7f-4e6f-87c7-07853e783192	1	Other	Other
+a6d502a9-d8e1-47da-89aa-22567e0a2aed	1	Other	Other
+a6d51079-d3e4-45ec-bea6-4b5c911d6997	1	Other	Other
+a6d543f4-7f5f-4125-9d61-f02418d20232	1	Other	Other
+a6d5717f-e744-42b4-b9b0-ef79ee2e37ef	1	Other	Other
+a6d58292-bc9a-4aa6-af15-ef3b037429b3	1	Other	Other
+a6d58805-7dcb-49c4-8b9c-5891abc0168d	1	Other	Other
+a6d5af9f-d7a1-423f-a94c-eb1c313765b6	1	Other	Other
+a6d5b98b-f486-41f0-8f09-ed4455b3524c	1	Other	Other
+a6d61f8d-15a9-4bcd-b10d-4916c52bc1f7	1	Other	Other
+a6d62b3d-89e4-48be-b7ed-4fa6b1d8e9d8	1	Other	Other
+a6d630b8-e93e-4385-a736-2f6382fe6144	1	Other	Other
+a6d6c191-ad4d-4f5b-b32c-5de32385b6ce	1	Other	Other
+a6d6dd36-2923-49a1-8d06-00936d48dd59	1	Other	Other
+a6d71cbd-1768-4037-81b8-684924931fcf	1	Other	Other
+a6d73b40-59f0-4ef0-ad99-a45103555d67	1	Other	Other
+a6d7631b-11a3-47a2-bb6d-60fbd9315f87	1	Other	Other
+a6d7c130-cc41-49a6-8580-190ef149f34a	1	Other	Other
+a6d7e862-fd9f-4717-bf61-10f5055e56f2	1	Other	Other
+a6d7f70e-ea08-4a1c-b1b5-e2ce45c4b9f7	1	Other	Other
+a6d7fa92-c244-45b8-b5d4-0206b43329cf	1	Other	Other
+a6d8001d-a412-4b48-b433-d3a615841a81	1	Other	Other
+a6d81034-9064-40fe-a91e-dbfa065301ca	1	Other	Other
+a6d8200a-c3ad-42c2-96e1-d241c7b67de5	1	Other	Other
+a6d8316a-b6fb-4f16-ad62-6488934c5112	1	\N	Other
+a6d8322a-ad0d-4a32-9a3b-42dc9af43a8b	1	Other	Other
+a6d86626-5cb6-4f46-a35c-43cdd2849d08	1	\N	Other
+a6d86722-b4da-4306-b0c4-421f55411463	1	Other	Other
+a6d8f7f3-621c-473f-a7c6-326042b33318	1	Other	Other
+a6d912ec-896d-4f1e-a619-fb1de0dba7fb	1	Other	Other
+a6d91e16-4e78-467d-9ca5-58dc1e018940	1	Other	Other
+a6d92b80-65d6-434b-ac87-172be07cf3d0	1	Other	Other
+a6d976a8-3655-4cf6-9ade-5e3ed643ec01	1	Other	Other
+a6d9d9cc-124b-4125-9e34-ba3f2d12d818	1	Other	Other
+a6da05c5-bd2d-4219-b98e-5b73f11ed3a3	1	Other	Other
+a6da4290-6cd0-4817-bbc7-0733bcf1d37c	1	Other	Other
+a6da75ed-f799-49c3-90aa-7d4b5278b9d3	1	Other	Other
+a6daa828-6c76-496f-abb0-4f5f7fb9772e	1	Other	Other
+a6dad022-d4a1-402e-9e65-91702bb09923	1	Other	Other
+a6db0d4e-1dc4-4443-a751-d26e74f8538c	1	Other	Other
+a6db1ab5-14d4-4e18-8710-bac8d9e68996	1	Other	Other
+a6db5cb0-2944-41b2-bec3-4f12696950be	1	Other	Other
+a6db9865-d970-4dc8-b0b5-601432f9e939	1	Other	Other
+a6dc0a71-0fc3-45f9-abd1-7dcff7afc9b1	1	Other	Other
+a6dc0d0d-9f74-4d5e-8925-ab099c22f198	1	Other	Other
+a6dc7950-b008-478b-9adc-3d2e88e343a2	1	Other	Other
+a6dcc815-4dbc-48c3-85cd-714b33b1cd9a	1	Other	Other
+a6dcc90b-d4c6-4e91-b04e-731ceba87ab3	1	Other	Other
+a6dcd7e4-4e4f-46d1-9eee-0330257f1dc7	1	Other	Other
+a6dcdec6-b7b7-46d1-845e-a9e5d1d288a7	1	Other	Other
+a6dd5c68-f78b-45be-9853-6a72f7b6c26d	1	Other	Other
+a6dd64d0-00e6-45c3-9adb-2d3e0c2969c5	1	Other	Other
+a6ddb596-f8a7-44ad-8f04-79a4a9f46d65	1	Other	Other
+a6ddd7ec-7e13-42d5-8364-d732c9912124	1	\N	Other
+a6de2802-2fc2-4c34-b660-d6a4020367af	1	Other	Other
+a6de8a20-907b-47a9-bc60-a5c7e689b067	1	Other	Other
+a6ded462-e686-4f9a-a32c-5986e5f5360d	1	Other	Other
+a6df150a-a67a-4606-afc6-a43660329564	1	Other	Other
+a6df3ee2-416f-4739-948f-775a795ba368	1	Other	Other
+a6df98c5-c731-4a43-afbd-16e844ed2e74	1	Other	Other
+a6dfa996-8ade-4e73-abab-ca4fc4a2ea72	1	Other	Other
+a6dfaafa-cdb1-4a9b-9b63-319cd16ebf9f	1	Other	Other
+a6e07bc2-3601-4afa-8359-e41ddc27c9f2	1	Other	Other
+a6e0816b-6074-4df0-bf9a-5e2cef3048ab	1	Other	Other
+a6e0f044-0a14-4b03-a753-acd31752a6cf	1	Other	Other
+a6e17ec4-03ca-4b6e-9572-f837c8a6090d	1	Other	Other
+a6e19ef1-665d-4ef8-b788-b57ef5ad752e	1	Other	Other
+a6e1d27e-1de9-4b88-a9d3-8453d0459f8c	1	Other	Other
+a6e1e62f-9415-4821-87d4-1988e8fe536d	1	Other	Other
+a6e1e88f-c5a7-4749-9a76-8e35cab70dd9	1	Other	Other
+a6e220a1-f7e4-4499-b2af-18e0ac36ada6	1	Other	Other
+a6e2462b-f076-4fbc-a55c-724cec3ce2ea	1	Other	Other
+a6e2551d-7004-492b-9f7a-ced89f20598a	1	Other	Other
+a6e25fdd-21fc-478b-8ac1-b1c34df8c4e6	1	Other	Other
+a6e26438-202a-49ce-ad07-86b8c0051ccc	1	Other	Other
+a6e2c1f2-a6f5-4b7f-ae2e-328c1fe35e4f	1	Other	Other
+a6e2ca3b-4c7c-4e20-bf66-dda58a5a5ee0	1	Other	Other
+a6e2cea8-09ab-4ee6-8b22-6a0fb6922f6c	1	Other	Other
+a6e2da5e-2b29-4655-bd88-5baef12d1fd0	1	Other	Other
+a6e3310d-1a1e-4db1-85a5-e044753d705c	1	Other	Other
+a6e333bf-e25a-4726-84ba-43cdd0aa59cf	1	Other	Other
+a6e3684a-4fa9-458c-b051-c90a025c653a	1	Other	Other
+a6e40abd-4274-4854-97f2-cae7888b6669	1	Other	Other
+a6e40f3b-371b-4a1c-bd31-ddd99eb0ded0	1	Other	Other
+a6e42191-e386-43a2-8968-f32e836aeef2	1	Other	Other
+a6e438f5-2fb2-4709-88cd-65b08edf9f89	1	Other	Other
+a6e45735-9ecc-4ece-80ab-d698e8adc69c	1	Other	Other
+a6e4615b-cd39-46b9-bee7-bb6eac099c2e	1	Other	Other
+a6e46510-d7c7-4b06-80dc-b3aa5ac28da6	1	Other	Other
+a6e476d3-efe7-44f4-95ae-9eaa9641ebc2	1	Other	Other
+a6e49c2b-f361-4245-8536-7f47174c042d	1	Other	Other
+a6e4b0bb-a65f-4c22-806b-a13907af1350	1	Other	Other
+a6e50aa9-b400-4a0f-8bdb-262ae16cd2d3	1	Other	Other
+a6e522ea-9fb7-4c84-b569-71402065a39d	1	Other	Other
+a6e55826-11e2-4586-8294-eb1746ba16f5	1	Other	Other
+a6e56181-d2ba-4189-8796-91d5d8a7ff57	1	Other	Other
+a6e577ac-946f-4d43-b0c4-e608cd057d5c	1	Other	Other
+a6e5b1a1-96e0-478f-9613-ba52303cbdfb	1	\N	Other
+a6e5e227-f876-4c8a-9d5e-4ab9833f7660	1	Other	Other
+a6e619ec-65a4-49b1-9ac1-f6129b8a2d04	1	Other	Other
+a6e642f3-e85d-4e1b-8233-b019cb2506f4	1	Other	Other
+a6e719cd-f021-4b87-9daa-3e5a1fda42c1	1	Other	Other
+a6e73117-eb81-49cd-91c9-b4d1cc4ae567	1	Other	Other
+a6e738b2-8376-480e-b03a-110069152abc	1	Other	Other
+a6e7df56-97e3-4ce6-ab6b-b0c8ac02c0c0	1	\N	Other
+a6e7e102-29fd-4ffc-9413-27b2ab59b5cb	1	Other	Other
+a6e81498-aa11-41bd-b35d-efdc05b299b3	1	Other	Other
+a6e85352-7cfb-4209-8ceb-ca96949d6e28	1	Other	Other
+a6e8564b-716b-4481-a31b-23e414596c4e	1	Other	Other
+a6e88a87-df39-4b25-9117-43bcedd97d49	1	Other	Other
+a6e8d437-9df0-4adb-b86d-1e76d40c2c4f	1	Other	Other
+a6e8e849-49cf-4afe-bb49-8c96ac30ba2b	1	Other	Other
+a6e8ff97-787a-4cd6-9f69-f9895b76f4f9	1	Other	Other
+a6e9035c-730c-422a-888a-631705f43017	1	Other	Other
+a6e96b52-fe69-4fd4-9cfb-7facb685a091	1	Other	Other
+a6e9d692-37cc-4fb4-b4b5-ae7c5dc4776d	1	Other	Other
+a6ea471f-1566-49ed-97c0-37dae0c3539b	1	Other	Other
+a6ea9b23-9b29-4e84-880b-e5a606a09c2e	1	Other	Other
+a6eb161f-67bd-4574-a506-f7f720f8a831	1	Other	Other
+a6eb8f19-752f-4683-a823-685831b64d40	1	Other	Other
+a6ebacee-4402-4623-a44f-091147835e2c	1	Other	Other
+a6ebc447-b6cb-4734-a0f5-71bd37c705e0	1	Other	Other
+a6ebc4c1-9856-4c5d-b638-089a36f554d1	1	Other	Other
+a6ebdf5b-238f-456b-954a-660bb466c8ab	1	Other	Other
+a6ebec0b-ed35-43fe-8c0d-74545021a4c7	1	James	Other
+a6ec1867-1d84-4929-a256-85153b3b64ec	1	James	Other
+a6ec69cb-7088-4742-9cc3-36305c0f7f2c	1	Other	Other
+a6ec69de-7d6a-4371-b60d-7fa094dd3715	1	Other	Other
+a6ec7c81-bdb0-407f-aec9-e76e466dc823	1	Other	Other
+a6ec8f63-68c1-46a4-9af6-2563b336c25e	1	Other	Other
+a6eca40a-e968-4abd-8d1c-c55f59635987	1	Other	Other
+a6ed437a-6f01-4911-924c-9c4b2d8aa3ef	1	Other	Other
+a6ed77be-3ecb-4c50-8499-0c7822d05185	1	Other	Other
+a6edae4a-0c01-4787-ab25-47bdc171c927	1	Other	Other
+a6edd811-e254-40ff-9aed-cf6d7b01563c	1	Other	Other
+a6ee0319-9dbb-4bea-8d06-0a375962dc91	1	Other	Other
+a6ee0ec5-aea7-465e-bd4a-48127952b3c1	1	Other	Other
+a6ee112a-b02f-465c-a359-ba145a1086b4	1	Other	Other
+a6ee2483-5274-4292-86aa-425f4c2d511a	1	Other	Other
+a6ee2916-41d4-4ad5-a8df-9c511c197104	1	Other	Other
+a6ee2ce2-1642-4142-a86c-d033f64e12e6	1	\N	Other
+a6ee3474-5f9b-407c-bf29-4325e75f475a	1	Other	Other
+a6ee3496-b8ae-4ec7-9e59-278702a33878	1	Other	Other
+a6ee5c00-6770-4e3e-967d-626e43c5f157	1	Other	Other
+a6ee62e0-d0d6-4f11-93b4-7503e69d1023	1	Other	Other
+a6ee7131-32c0-4d10-8dfc-2c3d4131adfb	1	Other	Other
+a6ee75c9-da8e-4433-9066-ccf66c81adfe	1	Other	Other
+a6eea493-a499-4e89-a338-8d25d67c8f00	1	\N	Other
+a6eea639-406d-4303-b238-fea318b29c02	1	Other	Other
+a6eeca7b-951b-4505-ae46-076748edfd86	1	Other	Other
+a6eee58a-f723-4809-8309-f1e53b886672	1	Other	Other
+a6ef0e57-900c-4a74-aae8-1d691a534b68	1	Other	Other
+a6ef3254-bb30-476e-abda-22d52b2d5afe	1	Other	Other
+a6efbb46-aa17-4167-8d3a-4724724d695e	1	Other	Other
+a6efc5ed-63b0-41f0-9c71-dd12c37c068a	1	Other	Other
+a6efe647-a34c-465f-aa82-65e9758bc48b	1	James	Other
+a6f029c3-5994-4c12-8945-cb8725be4cc6	1	Other	Other
+a6f0bad8-e391-4199-82f4-ab0e3abd4f0b	1	\N	Other
+a6f0d71b-ad01-4a6c-b573-56905bd8d38a	1	Other	Other
+a6f11c58-b24f-4534-b812-c6e9c281fbf3	1	Other	Other
+a6f14508-96f4-4262-bc98-a175ffcab7fa	1	Other	Other
+a6f1fd9c-65a0-4c0f-9084-c7f70550c4c8	1	Other	Other
+a6f22457-c6aa-490d-9392-34804511c914	1	Other	Other
+a6f29a7d-5e14-49a6-b1fc-ea1b072dbab6	1	Other	Other
+a6f29e1c-e61e-406e-9c65-9a86de1893f0	1	Other	Other
+a6f317a0-034d-452f-af13-7fb010a8b3f5	1	Other	Other
+a6f3204b-14ee-4f3b-bc02-e3e239194ab7	1	Other	Other
+a6f37d0a-a891-4289-b184-762712a5eda6	1	Other	Other
+a6f3b3e3-780d-4212-8729-21967f755b40	1	Other	Other
+a6f414aa-bc32-4285-ba95-5e647ad8f54c	1	Other	Other
+a6f490eb-7f82-424b-8dfa-87e4c3b8916e	1	Other	Other
+a6f4b013-3ee2-4021-ba94-0b6378958266	1	Other	Other
+a6f4d455-f912-41a4-b394-4f8354b9339d	1	Other	Other
+a6f4e0a0-e629-47af-96a8-70fb98a86239	1	Other	Other
+a6f4f162-7b23-4107-babf-d83340cbfdb0	1	Other	Other
+a6f50442-2e6d-440a-8a4c-9f58f28a3729	1	Other	Other
+a6f56475-77cf-4194-aa61-ef1ceb79d26d	1	Other	Other
+a6f5ab57-48f5-4c13-81ed-3945bdc0bdff	1	Other	Other
+a6f5ab5d-9b48-4897-94cf-b1f4c832f473	1	Other	Other
+a6f5e68a-07af-4615-a838-e6f3151c440a	1	Other	Other
+a6f5f7c0-fd84-4581-9331-72813e061669	1	Other	Other
+a6f60c37-bd34-4624-8eea-57c2b1b55bbc	1	Other	Other
+a6f64299-ba2c-49f9-ba66-ce952ec90740	1	Other	Other
+a6f642b4-d265-4ec7-afe4-5e552f960639	1	Other	Other
+a6f65bea-f9b4-404d-8ad6-35eccb9aa53e	1	Other	Other
+a6f66630-2a83-49fc-bfe1-18bae99f22d0	1	Other	Other
+a6f6be9d-6885-46a3-884c-a02af63a1a29	1	James	Other
+a6f6ebb6-9fea-46bc-97c6-dbbaf773c6b2	1	Other	Other
+a6f7ce39-f8b0-4938-97a0-b9e3800a0711	1	Other	Other
+a6f8002b-ce34-458e-a069-8c09f7177b17	1	Other	Other
+a6f81002-7863-4b5a-806d-dd37cfc374fa	1	Other	Other
+a6f818b2-d1a1-4c3f-b74a-0c9794663081	1	Other	Other
+a6f833ae-fa42-4338-8c76-6bea8884b5ab	1	Other	Other
+a6f89b8e-6719-4716-8cf2-af04f8995a48	1	Other	Other
+a6f8f6b4-c32d-4196-99c5-e4f3c86faf2b	1	Other	Other
+a6fa1315-10a3-489e-8a1c-2c14f6d660da	1	Other	Other
+a6fa6be6-ab52-45d4-964f-6cd144069085	1	Other	Other
+a6fa9515-7c6c-4785-8ee2-1649805ea9a3	1	Other	Other
+a6fa9f0a-b31f-4399-bb42-1f1f51faa366	1	Other	Other
+a6faccca-b6e2-4875-a517-cc3bc43295d6	1	Other	Other
+a6fae950-b365-4fe5-850f-52fe42c2390f	1	Other	Other
+a6fafbd9-fbd5-4fb6-b683-819a7459a8df	1	Other	Other
+a6fb3f39-65a1-4429-b03b-84583d94f94d	1	Other	Other
+a6fb64ba-60ec-475e-8e28-2b8045eedbd5	1	Other	Other
+a6fb6fdd-86cc-400a-ba25-b656b630df12	1	Other	Other
+a6fb8363-5a23-4e99-b9a2-4142a2360246	1	\N	Other
+a6fbb0aa-3415-4e1a-b9f6-76675a468663	1	Other	Other
+a6fbc673-df53-4c75-a9e9-17f027f9dc69	1	Other	Other
+a6fc7a07-9aeb-4d26-ba21-016f4d1befd9	1	Other	Other
+a6fc8c14-d7d5-419a-938b-09033ab89038	1	Other	Other
+a6fc9aec-002f-4a0f-b4aa-62547669b5b0	1	Other	Other
+a6fcea18-4f15-46f1-b8e8-bb74f83e395a	1	Other	Other
+a6fcfc94-bab9-43ad-a91b-08a6e8acdf92	1	Other	Other
+a6fd3132-2a2d-461e-bdbe-92d8778d3f6f	1	Other	Other
+a6fdac67-dbec-4fbe-9db1-d1b54de60846	1	Other	Other
+a6fdf963-4da6-4c5f-8c05-82ec3a3f3253	1	Other	Other
+a6fe2084-31e1-414d-8bac-98c521d6ec09	1	Other	Other
+a6fe3a4a-b03f-4a57-b856-3ce184c934e6	1	James	Other
+a6fe89d9-6b6d-4fa1-83da-9051186f6370	1	Other	Other
+a6febdd6-68aa-439e-b244-dc43a8e18e9f	1	Other	Other
+a6fedb48-d052-42be-863b-3ae50a80073d	1	Other	Other
+a6fef349-315b-4210-8c02-6bb1311d6819	1	Other	Other
+a6ff72ea-26a7-4669-bf9b-eca857268ead	1	Other	Other
+a6ff950a-cec4-42b1-89a5-50d16787823c	1	Other	Other
+a6ffbe20-cb4b-4f86-b3ad-6e753f3b1490	1	Other	Other
+a6ffdf95-081f-4c0d-95cf-48f6f0187748	1	Other	Other
+a6ffe2b4-a898-4f91-8dde-c3378376e6e2	1	Other	Other
+a7000001-e052-4ad6-9e5d-8d8e4653c1ea	1	Other	Other
+a7002549-642d-4c7c-a06e-e937c0fcc2fb	1	Other	Other
+a70027d5-8048-4a92-9635-428c5d005456	1	Other	Other
+a70108ee-0893-45f8-8c8e-5afefca18396	1	Other	Other
+a7010b6d-0a26-4923-a5a4-9e228075257e	1	Other	Other
+a701369c-c729-4b76-b031-baeb5f08864b	1	Other	Other
+a70187d0-02d8-4021-ab70-7fce35bf86e7	1	Other	Other
+a70187de-8771-4c68-a787-8d4ba0b475ba	1	Other	Other
+a7019805-d69d-4dff-bf75-6ef46107e25b	1	Other	Other
+a701ba10-f5b0-49bf-953a-87e0085e42e9	1	Other	Other
+a701c38a-3e68-4424-9b93-961e4d38e377	1	Other	Other
+a7022669-c6c3-4cb8-8849-8eb1715127d4	1	Other	Other
+a7027e51-644d-49a9-b111-12b8cde66b2f	1	Other	Other
+a702a832-584d-11e8-8c86-fa163e8624cc	dcda6718-143a-11e7-82e5-fa163e4dd901	Other	Other
+a702d89d-6d2d-4a5e-bb44-6ec595ae5408	1	Other	Other
+a702ed72-a8f7-4eed-b720-5b2a3859e6b5	1	Other	Other
+a7033885-3e4b-4df8-9594-8ce0b4145d16	1	Other	Other
+a7039d43-1a8d-4780-a171-301dc3e34e66	1	Other	Other
+a703a33b-2e41-4bda-b3c5-474838baffbd	1	Other	Other
+a7041a03-d3bd-499d-bba8-9411d1859717	1	Other	Other
+a7045426-c4e0-4eb1-8708-510ab3be42ea	1	Other	Other
+a7046583-32f1-4bb6-83fe-e28d02ab38e8	1	Other	Other
+a704ecef-4e84-4280-814e-ff170e939f1a	1	Other	Other
+a7057889-94d6-4787-b324-cbb3f99154e6	1	Other	Other
+a70587f4-8cae-4024-8859-03e74c13fa78	1	Other	Other
+a7058837-49d3-4745-b5a5-866a17b35f3a	1	Other	Other
+a7062196-e8fb-47f5-905f-6d0c6362032f	1	Other	Other
+a70623f4-acc7-4a88-a84d-af6e572ad69b	1	Other	Other
+a706424c-02fb-40b3-9675-13a126bd4db3	1	\N	Other
+a706475d-c45d-485a-8cff-ea37b137255c	1	Other	Other
+a706603a-4230-4baf-a18e-d348dd873b53	1	Other	Other
+a706a9d1-f75e-4077-8c56-1dd0b4365c67	1	Other	Other
+a7070078-6255-4b30-b174-ae208a1df2bd	1	Other	Other
+a70739b1-2f76-4cae-8ae4-f6fb35d0dade	1	Other	Other
+a7078943-0863-42f7-a696-3d9b43f9f1f2	1	\N	Other
+a70797df-c405-432d-81e6-886afe0ea1cb	1	Other	Other
+a707af9e-ad46-419f-be8f-c420fa686a3f	1	Other	Other
+a707e23a-b193-4dfc-8be4-8c235cb9b538	1	Other	Other
+a707fdee-bf17-4ee5-a5cb-0e7b145a885e	1	Other	Other
+a708194c-3ea5-4f86-976e-13b925edfc3e	1	Other	Other
+a7085ad4-1fb3-422c-8ad9-a81785ad5be1	1	Other	Other
+a7086a54-6394-4c6b-bdb8-b735decd4849	1	Other	Other
+a708d9c5-9b43-4d51-97ce-f1c2511b215c	1	Other	Other
+a7095e12-3f8f-4d53-8bd1-58ab54f8013c	1	Other	Other
+a7098062-79f6-481a-9ce2-b0ceccacbb24	1	Other	Other
+a7099a73-3111-4017-9678-4547f65ee2ad	1	Other	Other
+a709af6d-1a2c-42c9-af2a-b164056b4bf9	1	James	Other
+a709e7a2-b3a5-4016-9c5f-c591d24bf058	1	\N	Other
+a70a044d-d6a1-4dbe-ba12-ea7ab3be4239	1	James	Other
+a70a3126-c224-454a-b8e2-ec793f74c464	1	\N	Other
+a70a45e7-9a35-4322-8381-fe266ebe240c	1	Other	Other
+a70a8c7c-df79-4491-b010-8d64dee61baf	1	Other	Other
+a70ac29e-f42b-4831-92e9-ee9efd7de1e2	1	Other	Other
+a70ac4e2-a024-440b-9f0c-b39604d6ebf9	1	Other	Other
+a70ac9fa-dd95-42fb-8579-ec3207df8c6e	1	Other	Other
+a70aeaf8-80ff-4bed-aa4b-e4db06a35485	1	Other	Other
+a70b1fb6-3d16-4f02-b1b7-8882b28e61dd	1	Other	Other
+a70b2833-ff25-4fe1-8d12-8f4dcc7bde36	1	Other	Other
+a70b494a-0c01-43a7-8172-95bac030a48d	1	Other	Other
+a70bb9fe-b515-46e8-b62c-a5f101bed28e	1	Other	Other
+a70bd0e2-50e9-42cc-8c43-936ef453c7ad	1	Other	Other
+a70be489-9f00-4ce5-8df7-d0a1f5318e8e	1	Other	Other
+a70bf47b-620b-440f-8c11-03631daebfb1	1	Other	Other
+a70c1b70-5a83-4c02-acaa-7d7ac12f2f8d	1	Other	Other
+a70c4cb0-f2e7-4ae0-879f-5e84da01bf67	1	Other	Other
+a70cb211-cd47-4840-91e3-54783a357946	1	Other	Other
+a70d00e6-2343-4f1d-834a-a77af723e124	1	Other	Other
+a70d0ae5-4547-49ec-94d0-0aaec4ebcee7	1	Other	Other
+a70d1ae6-9067-4ec3-9033-7a32cc1242e4	1	Other	Other
+a70d2966-1a6c-4551-a4bc-5ae7bb7dd4b6	1	Other	Other
+a70d625f-918c-43d2-9a6b-11683b937484	1	Other	Other
+a70d6380-275a-49fa-bc2d-9d19b40c00b5	1	\N	Other
+a70d892c-326e-400f-aab2-ae5d264e68c5	1	Other	Other
+a70dbb60-2e46-43a0-9fe4-dc813afd4710	1	\N	Other
+a70dccb2-7687-40b3-9b82-5c623f73ab39	1	Other	Other
+a70dff89-2e21-4159-b5c0-31f9550d9b0f	1	Other	Other
+a70e1295-a3ae-41af-9461-e48e1ecc4279	1	Other	Other
+a70e6639-fe98-44c2-8e42-c14014ef0292	1	Other	Other
+a70e67b6-beaf-441e-868e-a46af4d392c8	1	Other	Other
+a70efc70-a911-4e48-b53d-eb2947520f52	1	Other	Other
+a70f349b-23af-47e0-9fd7-64d17232b5fa	1	Other	Other
+a70f6f9e-685e-4a10-80a7-236a1d341f1c	1	Other	Other
+a70f7432-5cb6-4bef-b622-4d0abb1df9de	1	Other	Other
+a70f9363-2472-4a80-aa33-152434c55473	1	Other	Other
+a70fb06b-b4a3-44d0-aa62-a5fdbb5aeb54	1	Other	Other
+a7100383-cf3c-48fc-9ae5-95aa71eb045a	1	Other	Other
+a710886c-4316-404c-96b2-9cf69d4dcc3b	1	Other	Other
+a7108dc6-9dc8-4e89-907a-04580cf48710	1	Other	Other
+a711516b-ffdd-4fa4-a0e1-3ecff3ce5719	1	Other	Other
+a7116052-3414-4e4d-9937-5ed85e79f32e	1	Other	Other
+a711a4bc-2366-44ac-a800-fb00af18e7a7	1	Other	Other
+a71212a7-73e3-47b1-82be-875d7cb10481	1	Other	Other
+a7122279-f5a2-45df-8a06-891faa9681b6	1	Other	Other
+a7124546-8b13-4514-b7aa-7b8db0178438	1	Other	Other
+a7124fe1-96b4-478b-aa39-cfa58fbb2f3e	1	Other	Other
+a71253bf-5951-4194-8ef7-e48c5ff25886	1	Other	Other
+a7128396-63b8-498e-bb5a-b6dfca371538	1	Other	Other
+a71301ef-5138-4ba0-a9a6-f99205030b16	1	Other	Other
+a7130661-4b46-4dd2-8188-3500079e6964	1	Other	Other
+a71308c2-8dc8-452b-814e-a1226314dd7f	1	Other	Other
+a71310d9-01a9-45be-9a1d-6f30e888e759	1	Other	Other
+a7134c1f-7fb1-4fa4-83a0-b94d4b75e063	1	Other	Other
+a713aa01-341e-45ce-99cd-1584a7a82574	1	Other	Other
+a713d518-67be-4d43-953c-06eb614d71cb	1	Other	Other
+a71430d6-6fbd-41c2-8ebc-b60913012dbf	1	Other	Other
+a71440b9-9bae-44b1-8998-39fddecaece6	1	Other	Other
+a714503f-8f61-4dea-9e2a-b30adfbd25d9	1	Other	Other
+a7146d0c-8d29-42ad-a418-64a8a02a4f89	1	Other	Other
+a7150815-57f6-4858-92ff-0becc4db6edb	1	Other	Other
+a71531df-5fd8-4a85-aacb-730ce7f0374f	1	Other	Other
+a71573fd-9ac2-4aae-a6d5-62efcb0af3af	1	Other	Other
+a7159dd3-00d2-43ab-b4d6-0f3078d09618	1	Other	Other
+a7163ae7-629d-43e2-9aaa-8e8a4ab8fd23	1	Other	Other
+a7165de8-763b-4bca-85f3-c370d5beff1c	1	Other	Other
+a7167901-ceaf-40e9-acb9-ba2b525cde38	1	Other	Other
+a716bb17-9866-4897-aa7b-0dd344403615	1	Other	Other
+a716f1fd-12d7-47c8-af8a-1d555ba151f3	1	Other	Other
+a716f89e-651b-4790-a917-b112212539da	1	Other	Other
+a7171a9a-25de-4460-89e4-960d10c3b2ec	1	Other	Other
+a7172083-debb-492f-b8ba-200cd3df72d1	1	Other	Other
+a71744ad-fcf0-4a70-b675-7cf400e46e74	1	\N	Other
+a717a774-7ab1-4567-a22e-e3afb8a8b7c3	1	Other	Other
+a717f110-0f48-4d1f-b678-b5147bb1e58f	1	Other	Other
+a7180753-f55a-4c5a-be6d-540b1af32e81	1	Other	Other
+a7189d44-bb07-461d-ae2c-1616cc9193e8	1	Other	Other
+a7191f0a-f0d4-4e72-8023-0660c6371993	1	Other	Other
+a7193cf1-2708-4e0f-b58e-a433100c627a	1	Other	Other
+a719fbb4-c6c0-4e38-8c00-2aa42fb01948	1	Other	Other
+a71a0f5f-ef29-4813-b8dc-03e24da646a7	1	Other	Other
+a71a550e-4f26-42a4-9aec-c8f19d10b7d6	1	Other	Other
+a71a8d85-2b8b-4860-8340-39485a5aab50	1	Other	Other
+a71a98f1-4f5d-4556-8e9c-64c0908daec0	1	Other	Other
+a71a9bcf-82e0-4a27-9b97-c7be6aa9a579	1	Other	Other
+a71a9d2f-aa92-4bac-b10d-898a443e9b54	1	Other	Other
+a71aa39c-92c9-4b3d-af49-56284c3f5b97	1	Other	Other
+a71aab1f-f386-47b0-9137-b7c921367f21	1	\N	Other
+a71ac522-9c82-4e25-9902-9c1220d88bed	1	Other	Other
+a71b48c7-c5d2-4179-9a7a-826bec65e7c7	1	Other	Other
+a71bcfbf-1349-4656-a10e-4d19323e1bf7	1	\N	Other
+a71bf7bb-70f7-4761-b837-14863715146f	1	Other	Other
+a71c08bd-650a-490c-865f-0e137e01f13e	1	Other	Other
+a71cf1a9-3839-4379-b7ef-ee19ecc47783	1	Other	Other
+a71cf746-368a-464c-96af-4e894b317d46	1	James	Other
+a71d1967-ecfb-4979-bf6e-9138786fda3d	1	Other	Other
+a71d1a33-c339-427f-9006-637a3a1bde59	1	Other	Other
+a71d2454-4268-40bb-bb11-f8a8f5ef2f66	1	Other	Other
+a71d3cea-acb5-4200-a958-f036f74c06c0	1	Other	Other
+a71d734c-6b0a-40fd-a512-0098898a02c1	1	Other	Other
+a71d842d-a4c0-48f2-add3-7fca653d9111	1	\N	Other
+a71d88ce-5d9a-46d9-9d12-3f9051755e68	1	Other	Other
+a71d8ea4-8bf5-45b8-93d1-6e11a2799d42	1	Other	Other
+a71d937b-8156-49a3-a3d6-903f3f1a2507	1	Other	Other
+a71dc9c7-b35f-4fff-9e3a-504742d6b4e7	1	Other	Other
+a71dcae0-6e45-47c1-81f0-e3deb829c648	1	Other	Other
+a71df247-e2c5-4919-9724-98e6e40b4bad	1	Other	Other
+a71df4a4-16c1-46cf-8728-c0a7d18a2af4	1	Other	Other
+a71e0cd4-bad7-47c2-8f61-c0ac58e1933e	1	Other	Other
+a71e19a7-652b-4066-8c84-2d8d2cbe1654	1	Other	Other
+a71e7c69-36ac-44c8-9eea-394a9f4a0faf	1	Other	Other
+a71e8646-14a3-42d1-9898-6ecb09481629	1	Other	Other
+a71eca9b-4ddc-442b-8f6f-f9cd5d9a2c82	1	Other	Other
+a71f0a31-894e-4f7b-af36-da66ab3eb6ad	1	Other	Other
+a71f1a62-f22e-4b85-ad5a-7e3c8c605967	1	Other	Other
+a71f55ab-42ec-425f-b484-285c37d005ed	1	Other	Other
+a71f6f45-d393-4cfc-beb0-950d8a6b8862	1	Other	Other
+a71f7928-28ff-4582-a503-4072b0e9f1d5	1	Other	Other
+a71f7b4a-ae53-403e-9d01-0583a204ceb8	1	Other	Other
+a71f8040-24da-4ab4-b7c2-e58cf6bbaa1a	1	\N	Other
+a71f9490-7b9e-4e77-9f93-0f940dcf9e59	1	Other	Other
+a71fa47f-7374-4e8e-97ae-953b06c20697	1	Other	Other
+a71fd6ee-1e28-450d-a939-412794ed3060	1	Other	Other
+a71fda08-2b3c-4c6d-9d03-3449db0bb3c2	1	Other	Other
+a71fe051-b590-4ef6-b829-545f5c8e9635	1	\N	Other
+a71fec01-399c-4b61-9aa0-94214d880498	1	Other	Other
+a720309d-c4a0-4342-bd36-c4e358aab96d	1	Other	Other
+a7204d69-86f5-4278-b124-983309add811	1	Other	Other
+a72090e1-54cc-4a30-a749-865233adbfc5	1	Other	Other
+a720a627-00fe-4108-a725-1b5bdd7fbfab	1	Other	Other
+a7212d28-c4ae-4fa4-a1da-6caf632da530	1	Other	Other
+a7216208-2748-4056-9c27-a31b8d996f40	1	Other	Other
+a72194b9-0e3e-44db-abea-4c2d07a7adf4	1	Other	Other
+a721a6ce-bece-4b81-93a1-b2ef1e0adca1	1	Other	Other
+a721a917-35ff-4209-99a9-d19c7c35b2ef	1	Other	Other
+a721d928-a1ba-4a5b-b8f2-897d5c7c2368	1	Other	Other
+a721df2b-6fbb-42ed-8176-38493f0e5b68	1	Other	Other
+a721e5b9-ec7e-4db5-aabe-40c42aaeceed	1	Other	Other
+a7221d93-a45d-43b8-bba7-d3a64f0ce0b0	1	Other	Other
+a7222fcb-451e-4194-b312-59a12bac93fd	1	Other	Other
+a7223e9e-c711-4fea-a072-274b2f02c1a5	1	Other	Other
+a72241e7-efa9-4009-812e-b640360d9385	1	Other	Other
+a722de52-b068-4c23-bb56-538b4273bafb	1	Other	Other
+a722e773-c090-49c4-9984-de5a96af961f	1	Other	Other
+a722ff4c-e00f-4a60-8ef8-c607062f7de3	1	Other	Other
+a7230296-9ec2-4298-a060-b926ac851908	1	Other	Other
+a7233b5b-5e94-429b-9bb7-0c8ec57c37f9	1	Other	Other
+a7238fdc-2ced-4498-bb33-e9683439055e	1	Other	Other
+a723a040-9e9c-43df-9395-3485d1976ed6	1	Other	Other
+a723a8c8-ad0c-4179-9d4b-c8a7e7414ec9	1	Other	Other
+a7241d97-d03a-47cc-828e-c2718eb5e9a2	1	Other	Other
+a72443bd-7c09-4c0a-b3e5-e110fa68a776	1	Other	Other
+a7246615-7a15-432e-b2aa-ac9ac4d180bd	1	Other	Other
+a7248145-8f52-419b-8fed-2f3c353a3106	1	Other	Other
+a72491dd-f22f-4f12-b6e7-9463d45cfe2f	1	Other	Other
+a724c55c-fd7a-4817-a804-86e8611f8320	1	Other	Other
+a724de82-1687-47bc-87e1-a13f34a333fd	1	\N	Other
+a7250561-dda1-4c67-a3e6-8da77cfeaf1d	1	Other	Other
+a7252033-ab67-4d8b-9ed8-fae3097b4532	1	Other	Other
+a7256d0a-a909-494a-a5a5-7bba3b6d0f49	1	Other	Other
+a7258964-77a4-4daa-9bb8-0ac17dfe0e4f	1	Other	Other
+a725c27a-af6b-40b4-960b-a0b7bc2ff515	1	Other	Other
+a725c3d5-684f-422e-a30f-4479dd55bfc8	1	Other	Other
+a726434f-c99a-448b-ba6b-b81dbf574e71	1	Other	Other
+a7265d7c-cdb4-4112-95b6-13d76f697dee	1	Other	Other
+a7266b51-8bcf-46c2-aa85-3f67027f0fb7	1	Other	Other
+a726a339-3c4f-400c-87d0-c0f8db412a4d	1	Other	Other
+a726c7f7-a0fe-46f9-a844-e5e55fa8766b	1	Other	Other
+a726cab5-b94c-4535-a6c0-87b81ab45729	1	Other	Other
+a726de42-7f29-4ba7-b4f1-8d40cf9570b2	1	James	Other
+a726e601-6d6e-4976-9ae3-1855f9e9d7b0	1	Other	Other
+a7272258-2113-4955-9a47-9237fcbf429c	1	Other	Other
+a727b0bd-9700-46d7-a07a-a69398eb6ae7	1	Other	Other
+a727ca59-4df6-4c65-93f5-f7365a68d68d	1	\N	Other
+a7280251-8863-4d5c-a43b-413cf9a37ae9	1	Other	Other
+a7282664-2b18-11e8-8d8e-fa163e8624cc	1	\N	Other
+a7283357-61d1-4c23-a0de-853e123a5f37	1	\N	Other
+a7284dcd-24a3-43d4-a573-48af55f461b7	1	Other	Other
+a7288347-d849-43fc-8722-435601509de3	1	Other	Other
+a728a7fe-a9c5-43ec-af9f-e726ddb1805b	1	Other	Other
+a728f41c-9810-4c13-a5ba-dae9617175b8	1	Other	Other
+a7290c5c-7ca7-4fe1-a458-ee24187a4ada	1	Other	Other
+a729673b-f66f-4f10-8877-cd91bac228b1	1	Other	Other
+a72979be-8600-427a-aae2-f609bdce7765	1	Other	Other
+a72980f6-e967-45f8-a0d2-f6c672cfc65f	1	Other	Other
+a729c540-253c-4e35-8aee-7df80f8b6e87	1	Other	Other
+a729de1b-1841-4b65-9059-567b1884d355	1	Other	Other
+a729e86e-ce6a-4908-8020-0e63bbc9690d	1	Other	Other
+a729f1ec-b427-4fbc-84f2-2248daad8054	1	Other	Other
+a72a14d2-970a-4c49-bf27-236832b4df56	1	Other	Other
+a72af2ef-0f2b-4110-83af-cdf783bc4087	1	Other	Other
+a72af628-4ebd-4604-8597-095ffeada963	1	Other	Other
+a72afcc1-d82f-40ef-a115-d2a214afd4ea	1	Other	Other
+a72b4679-c919-46df-a42f-0078a19d541f	1	Other	Other
+a72bb7f0-c96e-4d00-977d-77b4d543ac37	1	Other	Other
+a72c4611-5113-4dd5-90b6-8278295f41ad	1	Other	Other
+a72c57b5-c080-4dce-ab2a-97c8b5273165	1	Other	Other
+a72c5866-c75b-4875-a89a-95e5862f126d	1	Other	Other
+a72c6191-ed07-4a47-9eae-910bfd32a0fd	1	Other	Other
+a72c8d30-9d47-4850-9e00-52cc587419e3	1	Other	Other
+a72cbf40-2e40-4870-94e8-94757c0049aa	1	\N	Other
+a72ccd25-6493-4b74-a27d-b89faa4cd11c	1	Other	Other
+a72cebe3-9e12-4be8-9430-c3ba4990dc78	1	Other	Other
+a72d01b6-7a0f-4fee-b24d-c575ed2c62ca	1	Other	Other
+a72e1ec3-4ae4-42f1-8291-97b11ecee504	1	Other	Other
+a72e3791-6fef-4c70-9164-17781fc40544	1	Other	Other
+a72e3fce-3c73-4dc7-9934-50f7f54bb6ad	1	Other	Other
+a72ee02a-a5fe-4856-92c3-2af91ac6b6e8	1	Other	Other
+a72f1c4a-58b6-4be0-9113-551b61732317	1	Other	Other
+a72f1c82-b540-46d8-8b53-2581241f9ea2	1	Other	Other
+a72f64af-d2d8-4d96-868a-e2c604abd0af	1	\N	Other
+a730496e-a441-4111-a9dd-8d17e27e6ffb	1	Other	Other
+a7309b45-fb60-4785-90e8-6284e66bbb43	1	Other	Other
+a730ad03-29fc-4484-b567-aef4baa50284	1	\N	Other
+a730afcd-4dc1-4606-94f5-dda581f71997	1	Other	Other
+a730e232-3913-4323-bb9f-63653276ebd3	1	Other	Other
+a73126c8-b636-49d2-bb7d-2f64f02103ab	1	Other	Other
+a7313366-6c0f-4442-96ed-ae6751e19410	1	Other	Other
+a7313735-4c56-42cd-a420-3a0f30dd3df8	1	Other	Other
+a731ac7c-cae7-42d5-ac58-f08711d804df	1	Other	Other
+a731dbd7-f504-4b41-ad4d-5c1619066ebc	1	Other	Other
+a732def8-5631-4f9e-91c7-b7f3af7cc313	1	Other	Other
+a733045e-b0d2-4d18-a92a-52da99986965	1	Other	Other
+a7334511-6166-4619-bd1b-2a1d47600f57	1	Other	Other
+a733608e-a6f2-4396-9509-90c2f643fe3f	1	Other	Other
+a7338509-1ee0-408a-82e3-da6e4fa27bec	1	Other	Other
+a73394ef-5b39-43d6-8098-36135c39354b	1	Other	Other
+a733bcf7-dad3-41cc-908b-07a0822dcd1b	1	Other	Other
+a733fa9b-a333-4143-ba96-cdf0d56acb5f	1	Other	Other
+a733ffa5-b272-494c-bced-eecf4b168672	1	Other	Other
+a7342720-bd3c-4b09-819e-458c5afbc861	1	Other	Other
+a7342efa-f172-4782-8c5e-c990baf526c3	1	Other	Other
+a734307e-0880-4def-85f7-ca75cd2c5391	1	Other	Other
+a734c99a-b6b7-4583-8eeb-70aa417d93ff	1	Other	Other
+a734e0a8-2cdb-48f6-8708-71c2db7250cb	1	Other	Other
+a7351775-2dce-4a15-820f-157dfb160d20	1	Other	Other
+a7353d75-3237-403c-81e0-b020a0c21ccf	1	Other	Other
+a7353dae-3d2b-4700-926a-b70d922702e1	1	Other	Other
+a7362a4b-495e-439b-b30b-d40e78dbac77	1	Other	Other
+a736497f-29dc-4fb2-8882-2450d5f1ac25	1	Other	Other
+a736557d-5adf-49f9-8163-450e018a3cb0	1	Other	Other
+a7365ed4-0980-4613-afac-763b69d84261	1	Other	Other
+a7366624-137e-497f-ac71-4c42fc15f5e8	1	Other	Other
+a73688af-4e35-4ede-bb88-a97d80dc4d56	1	Other	Other
+a7369910-59cb-4d12-ba14-02f84c498255	1	Other	Other
+a736aae9-4fd4-4418-884e-e6f10437a931	1	Other	Other
+a736bb0d-7bcf-48bb-8b44-8f9a81b776d7	1	Other	Other
+a736cf4d-e467-4bde-8dc3-9bbedccbc5fd	1	Other	Other
+a7371e04-aaf7-44e8-a2f2-52ce25df45fa	1	Other	Other
+a737520b-7a8a-404d-82d7-b073afc53af6	1	Other	Other
+a7377470-1dbb-4a6e-ae62-d3454d3e7853	1	Other	Other
+a737eedb-df6d-4f53-acc6-4ebcb42cf585	1	Other	Other
+a737fe09-ccfb-4960-9160-81ca6c6de5db	1	Other	Other
+a73826b6-d8f2-4b15-9985-23b128a54945	1	Other	Other
+a7383364-0167-41f5-ac5b-73b890690b0d	1	Other	Other
+a7387ff0-fc58-48db-b53c-0b1d5118bca3	1	Other	Other
+a7388323-5002-4887-bbbc-b30df1503854	1	Other	Other
+a73889ee-43db-42c2-8c04-c20929d8b19c	1	Other	Other
+a73898eb-cd85-4349-931c-68f223d78524	1	Other	Other
+a738cf28-1c54-4f07-8d29-23ca2a505fbb	1	Other	Other
+a738f064-8d6d-4249-b165-a2a6598227dd	1	\N	Other
+a739385b-a8b2-4777-a58b-9cb378938162	1	Other	Other
+a7393ac5-ea37-48df-8893-2d089e38722e	1	Other	Other
+a7394ce2-6813-4d3c-9d27-6bfc5d196409	1	Other	Other
+a7397868-e6c5-4bf7-907b-4e0454e686ea	1	Other	Other
+a739cd3a-769a-464f-ae96-1901af654ed9	1	Other	Other
+a739db47-e67b-4914-9943-9941a1d4031e	1	Other	Other
+a73a0953-3b75-4e9e-8c56-9d8eaaaf55a8	1	Other	Other
+a73a22e3-8b5b-4fd8-9094-255ce391b4ee	1	Other	Other
+a73a8510-e76a-4c2d-ae14-459c619ad6f6	1	Other	Other
+a73ab3ac-5f35-4049-a5eb-9031289ba2a2	1	Other	Other
+a73b148b-3a87-46d6-bae3-b1ac41066947	1	Other	Other
+a73b2a65-b6dd-4f68-a97a-5c45cc5ec9d9	1	Other	Other
+a73b317e-d89d-4fc0-b244-fa6732de2c74	1	Other	Other
+a73b4d30-f222-46bc-b70d-ef8749ef372e	1	Other	Other
+a73bb724-7312-4f1b-9cb2-d5fd40ede398	1	Other	Other
+a73bbae3-0f78-4442-bcab-2e4948cb7c09	1	Other	Other
+a73c2569-1fc9-48e0-9626-459d92707f97	1	Other	Other
+a73c7ac4-079d-4bcd-b899-ea6a0dcf8ea9	1	Other	Other
+a73ccdda-23e2-41ae-b025-7e7c53953f42	1	Other	Other
+a73cff75-8c3a-4b0b-a2d4-06b5ca348528	1	Other	Other
+a73d1669-7630-4755-b9e7-e3f704da4aff	1	James	Other
+a73d4457-1300-4bf5-acba-c4131963e399	1	Other	Other
+a73d5631-5b5f-435f-96dd-38c56c6c8400	1	Other	Other
+a73d8246-5933-492b-83f7-3565458cee46	1	Other	Other
+a73d86c6-c6c2-4360-8aa2-eb2464f0d106	1	Other	Other
+a73da66c-3db1-4c23-ac99-6d1cd0daea86	1	Other	Other
+a73dfb40-f17d-4a90-b99d-169a9e4d95a6	1	Other	Other
+a73e487b-a43c-4b08-adc8-9631602a4dbf	1	Other	Other
+a73e9d5b-9951-4fbf-acaa-f1f5ced02343	1	Other	Other
+a73ec1f4-1d31-4ab9-bc5c-27440fd19b65	1	Other	Other
+a73ecfa2-9b7a-4e71-85d3-2a6b379177ba	1	Other	Other
+a73f191a-a07f-41e8-aba6-a39cf489653a	1	Other	Other
+a73f2aad-56e8-4df7-8b5f-0e92b4137a4a	1	Other	Other
+a73f5b66-3c2d-4ba2-81f3-dede04e21bcf	1	Other	Other
+a7407a71-55b4-4633-8beb-f0529445bdc8	1	Other	Other
+a740e0d4-f077-4c3e-9f6f-0a658d0d2ba0	1	Other	Other
+a7411b2f-898e-4fcf-b706-d1c5307afd1c	1	Other	Other
+a7414994-c903-470a-a824-9c9884eb5381	1	\N	Other
+a7415509-dc92-4272-8453-3acd613622e2	1	Other	Other
+a7416c07-6a86-4311-ad9e-703ba9f0001e	1	Other	Other
+a741c5a3-bff9-4ed7-97c5-92a211453d84	1	Other	Other
+a741c7c6-c8eb-440e-ae4a-1a141eac43c3	1	Other	Other
+a7424f2f-315d-444a-845b-40e47fc32e61	1	Other	Other
+a7429c65-4186-4a4a-a496-71d2e6c04ddb	1	Other	Other
+a742c4df-9324-4536-aca6-71468c55f92e	1	Other	Other
+a742cd65-c54a-4dd4-b024-9f9a8db3cca8	1	Other	Other
+a742f452-890e-4bca-9734-a2d58d20700f	1	Other	Other
+a743490a-d3c1-439d-8751-ccf38e4f4aba	1	Other	Other
+a74363b4-a415-4066-946e-b4a6f37b8763	1	Other	Other
+a74390b3-6a03-4662-bce6-27155799e9cb	1	Other	Other
+a743ba3a-bd5d-473a-80f3-fe0139b14b59	1	Other	Other
+a743ce2c-83c3-4456-ac96-fac2a595a288	1	Other	Other
+a743dd2b-5146-4e0d-af0d-2287fbf6e8be	1	Other	Other
+a7440070-5df8-4124-bcbd-a849c2789f41	1	Other	Other
+a7448338-f36c-4319-8786-b01453826d57	1	Other	Other
+a744a198-f23e-40a5-a745-aedaffdfbd2d	1	Other	Other
+a744d66d-dbe2-4f59-a1d5-af1add7d6600	1	Other	Other
+a74550e8-50a4-4f4f-8ced-ac9a5d0a0a7e	1	Other	Other
+a7456ddc-7446-4364-bedf-ea13895b848d	1	Other	Other
+a745bbac-14c5-4023-9e28-8ae6938253d9	1	Other	Other
+a745cfc9-841a-4ccd-a3ec-8efee61a301c	1	Other	Other
+a745fbe1-7ecb-46fb-9802-e591cfed0fb9	1	Other	Other
+a746705f-4dd0-402a-910f-d5b5c8ba070d	1	Other	Other
+a7468951-d7d3-4130-8bf1-6e8514dfa8a3	1	Other	Other
+a746e0ad-553f-443b-a361-c38c17077326	1	Other	Other
+a746e69c-e7e1-4bbb-803c-24cabf6a9af3	1	Other	Other
+a746ff15-ab18-462e-93b6-3dfcef3ec7cf	1	Other	Other
+a74755d5-1df0-42e1-8110-cb93e2f58896	1	Other	Other
+a7478fe4-e131-4d7e-87f9-00cfd6231c0c	1	Other	Other
+a747eb71-b575-4516-b3d2-1b9ca8630143	1	Other	Other
+a7482e8c-719b-4f4c-9af5-95dac3d1cb02	1	Other	Other
+a7484124-b508-48ac-8e68-307f55270213	1	Other	Other
+a748537b-3d40-48f1-bdc0-df07f6a318be	1	Other	Other
+a74858e7-3028-412f-9201-934b09740426	1	Other	Other
+a7486c98-a716-4a69-8c6e-45dfa5d4205f	1	Other	Other
+a748869d-12a9-425b-8652-c91bd22411af	1	Other	Other
+a74889c1-700d-49ad-b8a8-fb391ae86926	1	Other	Other
+a748926b-14b5-421e-847e-4eb3efd1728a	1	Other	Other
+a748a05f-0ee2-4d71-b655-9cb24461c955	1	Other	Other
+a748e9d2-c6ee-405e-97e8-d17680e9fc95	1	Other	Other
+a748ea04-7621-4403-8475-0fbc112e7954	1	Other	Other
+a749242f-cc0e-41a5-a78a-828bbe9bd73f	1	Other	Other
+a74950b4-8025-490f-99ab-5cd77a94b03a	1	Other	Other
+a7495b5b-8259-4039-a4c1-c095daee259e	1	Other	Other
+a74970de-e0ad-4285-a438-2fcbbb49ed25	1	\N	Other
+a7497a1b-08f7-49ca-a069-f8b9b028e9b5	1	Other	Other
+a749cd21-5bc8-4432-8b6d-99542ba3185a	1	Other	Other
+a74a27c6-141d-4401-a1ab-b67de9771959	1	\N	Other
+a74a6877-b538-4952-b603-59985a4d52ab	1	Other	Other
+a74ad6ab-1dd4-4586-b38c-465fd3724775	1	Other	Other
+a74b1770-69f4-4435-9e50-8d28daaef405	1	Other	Other
+a74b45b5-e394-4de6-b988-175e7f029dd0	1	Other	Other
+a74b503d-58de-45d5-99e8-5e8da1580a84	1	Other	Other
+a74b5358-a306-45da-baa1-7a9cdd9b1e9f	1	Other	Other
+a74b5359-463c-4aed-a008-8ece322604a6	1	Other	Other
+a74c023f-5cf5-441f-b99d-eae235db3538	1	Other	Other
+a74cf17d-72bb-493b-be17-5cb002008863	1	Other	Other
+a74d0e22-0dcf-405a-88b3-8732451059a6	1	Other	Other
+a74d5f6b-9ffe-4294-9d5e-7f364421e062	1	Other	Other
+a74d917b-da1d-45aa-8510-55ace2ad7888	1	Other	Other
+a74d9b0d-1f40-4df1-b73f-af7da41c5ced	1	Other	Other
+a74daeb4-b3b0-4a0e-a297-765058f5b60a	1	Other	Other
+a74de20d-fe77-470f-b05e-fbada90e25d1	1	Other	Other
+a74e289c-3aa7-4b97-a411-98bf7d399c24	1	Other	Other
+a74e3809-4909-41cb-883d-7b55dd4d615d	1	Other	Other
+a74e53e8-9434-4286-8d1c-7f72dfa97780	1	Other	Other
+a74e54e3-0bfc-4cff-a632-e8ae4666f299	1	Other	Other
+a74edfc5-4044-41b3-98a8-6c6494434165	1	Other	Other
+a74f457b-d84e-4250-94f9-03e6bb8a52d5	1	Other	Other
+a74f61fb-811b-48f1-8d1f-3a183416211c	1	Other	Other
+a74f9af5-1c26-44ce-b6ac-7305ade98e36	1	Other	Other
+a74fc3d9-ae9c-42d5-86d3-aedb3a392edb	1	Other	Other
+a75032a1-9b0f-443a-86c1-b15fad6f3bb0	1	Other	Other
+a75035e9-4d22-4b7b-a9c4-47911a0b04c0	1	Other	Other
+a75039b8-c12b-468e-9014-7f1d4eebd81f	1	\N	Other
+a75050fc-9286-497c-8fc3-500f904ba329	1	Other	Other
+a750c648-98de-481e-85b5-bb227ddd45dc	1	Other	Other
+a750c74f-612c-42a6-8732-b42c27924a8d	1	Other	Other
+a750e1c6-2c2d-46c6-ab9f-6a5ad3bb80a6	1	Other	Other
+a75108b6-67cf-40be-8f44-21206d3635d1	1	Other	Other
+a751246e-c7c2-445c-ae10-2e3d8317f7a7	1	Other	Other
+a751424b-6081-492f-9b96-79487f1e4ccd	1	Other	Other
+a7515a3f-f1d3-4f26-9a37-12f71e18602b	1	Other	Other
+a751b8ac-c4c8-4c96-98c7-8abde457d4f0	1	Other	Other
+a751c342-3fdc-4574-94c5-0f0fe0536407	1	Other	Other
+a751ec54-6b9b-4c3d-8f6a-2707ee421778	1	Other	Other
+a751fb0e-d247-457d-8044-872c3340a55c	1	Other	Other
+a751fce3-bed4-4ae4-976c-a07256403024	1	Other	Other
+a752281c-3535-4948-8b0b-93e722ca0c56	1	Other	Other
+a75241b4-c74d-42ef-b914-d9247cf9c470	1	Other	Other
+a7528e4e-5950-48b3-b9e1-d127207b1be2	1	Other	Other
+a752b22b-8689-478f-a9d1-b689587a5b88	1	Other	Other
+a7533f30-8002-4ad4-a112-f580804b6d96	1	Other	Other
+a75389f3-1367-45b6-a28d-693aab9f86b0	1	Other	Other
+a753b0df-72b1-4287-bda0-e8e16e8b6569	1	Other	Other
+a754141c-7da7-4e91-8e42-fee75e5d50ed	1	Other	Other
+a75483de-12b6-4e6e-a2d8-c9e400a9d1c3	1	Other	Other
+a754e64c-4c30-4612-b76c-7b299403c5ac	1	Other	Other
+a7550e7b-0bdd-475b-a0b4-137f4dfb93f3	1	Other	Other
+a75519c6-67fb-41bd-b57a-aa6b05e61b44	1	Other	Other
+a755297c-1263-474f-a42a-f01a626dfdf4	1	\N	Other
+a7554a90-e54c-400f-bb4e-b53fd35a4a11	1	Other	Other
+a7559b26-49fc-4fe4-833a-6a1c5720070f	1	Other	Other
+a7559cf3-6e90-48fa-96ac-4a99a4a37da8	1	Other	Other
+a7564876-0498-4466-82e0-088ab1470b80	1	Other	Other
+a7568ca8-cd27-499d-8a84-919100a6b086	1	Other	Other
+a756db1f-287a-4b8f-abe8-6ecdc239c912	1	Other	Other
+a756fac1-5905-4d8e-84f7-59127f4044ae	1	Other	Other
+a756fde5-9a51-44ce-b772-2b74ae6b4512	1	Other	Other
+a757399c-52ea-40e2-bd63-a571f5b2387f	1	Other	Other
+a7576837-cb80-49aa-b785-d6ba4f083ad1	1	Other	Other
+a7576d78-39f6-4ac2-be74-b44d2649c7bc	1	\N	Other
+a7577526-1212-419e-847a-4c7f874ec846	1	Other	Other
+a757bf7c-8f8b-4cba-83e6-84569dc76ff2	1	Other	Other
+a757c45c-6c7b-4005-a453-3efa5791be46	1	Other	Other
+a757f246-4069-4291-9bd1-ee06ff8cf194	1	Other	Other
+a75802da-0bd9-4e45-a49b-c8e449c2226b	1	\N	Other
+a7580e04-44a6-45bb-8b32-7880d72a5681	1	Other	Other
+a758268d-02e8-4afd-be1d-26d9f42e76e3	1	James	Other
+a75841b7-ce49-4c51-9d1d-a269773c9eab	1	Other	Other
+a75853f7-65d5-4868-b047-0d277d39b6dd	1	Other	Other
+a75886dd-2692-4a64-8fcd-04f2d0446fce	1	Other	Other
+a758c7af-c5d5-4b31-82ac-70f8e8e8ea73	1	Other	Other
+a758d7ad-5c51-4c14-8efc-302e07d7e54d	1	Other	Other
+a758eca9-ac49-45e1-99ba-c522941f892f	1	Other	Other
+a7591c3a-50d3-4250-9016-e1decf9eb229	1	Other	Other
+a7591d03-9731-4b76-a106-8926fe8ef4eb	1	Other	Other
+a7597405-f055-47c0-8235-ce9c4b876ad4	1	Other	Other
+a7597fc6-fc47-4d46-8150-9f77839c823a	1	Other	Other
+a759aa56-7ac7-406c-98e0-aeeca460465b	1	Other	Other
+a759bef5-a7cc-497e-9a2c-7400e7b524c2	1	Other	Other
+a759db2c-b4fd-40da-abec-76278754adf7	1	Other	Other
+a759ea06-a82b-4439-a370-9a4f3480acc4	1	Other	Other
+a75a1c9b-3bc0-4a2d-805b-bb6d96257672	1	Other	Other
+a75a1e41-ec8d-450e-b25f-cc3917dae275	1	Other	Other
+a75a20fb-c603-47fb-b2f9-c5e0a3f57153	1	Other	Other
+a75a6b35-6b5e-4db9-8c6b-63d2eb84bace	1	Other	Other
+a75a7c75-255f-424f-9079-9bb843c32724	1	Other	Other
+a75a9461-c52d-4597-87b2-167f42588375	1	Other	Other
+a75abdf8-d021-4269-a0e2-d66faae0ae67	1	Other	Other
+a75ad94a-5a57-4610-a0ba-0a3f3d4b6d4f	1	Other	Other
+a75af84e-d4c7-44e0-a360-fcd6372a5a07	1	Other	Other
+a75b9229-88a7-4ec1-83ff-c4a8c8579fef	1	Other	Other
+a75ba530-844a-4e5f-a3dc-fbab1e18dd79	1	Other	Other
+a75bc854-f786-4d9b-a6dd-6c483bc127ac	1	Other	Other
+a75bdbd7-9c71-40a6-b0dd-a046338e8f38	1	Other	Other
+a75c097f-7586-4670-a290-a67ba9c6e2c8	1	Other	Other
+a75c1642-ab6a-4ed7-99bb-b8efb00e0265	1	Other	Other
+a75c1ba9-b5d6-4620-88c9-381462b14efe	1	Other	Other
+a75cc571-71e7-41f0-b42c-5eb91e6dfc3b	1	Other	Other
+a75d4d6b-26a7-46f0-81c4-64c4a524d8cb	1	\N	Other
+a75e4138-f92c-443a-9145-64e3daf92507	1	Other	Other
+a75eab5d-1b30-4210-b0ed-603db3421041	1	Other	Other
+a75eed62-2edf-4639-96cb-2d0efbbe5aeb	1	Other	Other
+a75f52dd-7983-41c0-8c4f-6c7db005b696	1	Other	Other
+a75f5713-ffc0-4728-aab3-19f8bb13bf72	1	Other	Other
+a75f7299-ba2e-44e8-a3d5-d29398a369fb	1	Other	Other
+a75fa0fa-0b1e-4e5e-bf1d-3447fd69fbd7	1	Other	Other
+a75fa676-45d8-493a-ba2b-692d0dc6f546	1	Other	Other
+a76043a4-4eb4-4c79-8b8d-511d24367c40	1	Other	Other
+a760b824-1c56-4137-9049-d77fbe005cca	1	Other	Other
+a760cc71-e9b6-4ddc-95cb-1e8d8b4b5223	1	Other	Other
+a760cfdf-2aa9-437a-b242-b10147416efc	1	Other	Other
+a760ef1c-8c1b-443e-bee5-6ed78a3d8d91	1	Other	Other
+a760f0f2-8691-4e7d-99b9-b88fdf796eb0	1	Other	Other
+a761fffd-1f1a-4c10-a6cc-a9adb1b10163	1	Other	Other
+a7621eba-90e8-42d0-9d86-24bb7bca9990	1	Other	Other
+a762a77f-cf7b-4557-a9a2-cfc6a8a81ae6	1	Other	Other
+a762b26c-10c5-4cd0-beab-3be4c3680296	1	Other	Other
+a762c0e3-414c-4a6b-a453-dc4be8c68f67	1	Other	Other
+a762caef-ce83-434c-8d11-2f96d1ebf8bd	1	Other	Other
+a762dc4b-42dc-41fb-8115-ce2bdee7697b	1	Other	Other
+a762ec42-fbd4-4263-9a49-a0842640ad13	1	Other	Other
+a762ec73-09f3-4ddc-8fc1-7e5f3244b9a9	1	Other	Other
+a763104b-c14c-46f7-bdbe-f9085366e9f6	1	Other	Other
+a7632ed6-c7d7-4ed7-a97a-e17d0af9a394	1	Other	Other
+a7634da6-0035-11e8-b694-fa163e8624cc	1	Other	Other
+a7635f92-f244-4cdd-a6de-7bca99b92734	1	Other	Other
+a76393cb-4751-4478-8d62-6d8552b19cd2	1	Other	Other
+a7639fbc-4ba6-43ae-8167-08c235438542	1	Other	Other
+a763e408-c907-421c-bc7d-8505aea4a8d2	1	Other	Other
+a763f12c-b7bf-4650-837b-b12d4b9c9754	1	Other	Other
+a763fc41-d3cd-4102-86cf-07ddfc6b162f	1	Other	Other
+a7640c81-cc5e-43ac-a3d7-762934c52d25	1	Other	Other
+a7641a26-94b1-43a7-90f7-a122f7524bfe	1	Other	Other
+a76451bd-3376-4838-a4b7-d2c4349a20af	1	Other	Other
+a764bed1-619f-4924-b1ae-d487b6af170c	1	Other	Other
+a764cd34-def9-4b53-bd4d-fc6f72b818b7	1	Other	Other
+a764ebee-8a8f-45e6-a5ff-35d4903ea0bc	1	Other	Other
+a7650cc3-9e5e-44fe-9cc6-604c54b712c4	1	\N	Other
+a7657869-a05b-4222-ab32-0a973ac52eca	1	Other	Other
+a7659dd4-15a8-4cc3-8629-380a27f473cb	1	Other	Other
+a765a52d-3c0c-4ba2-a5c9-92dde7efe640	1	Other	Other
+a765cc49-b601-40f2-8304-38d2f05b0cb9	1	Other	Other
+a7661531-280a-470b-bc14-d3c692c3d181	1	Other	Other
+a766273b-99eb-4708-a99c-3cf7d88a8d3b	1	Other	Other
+a7663a6d-0b49-4be5-82dc-dc47bbaa22fa	1	Other	Other
+a76644cb-486f-4ec2-a94e-ac8eef3be16c	1	Other	Other
+a766580d-62df-47c3-a95c-def4d8fa8068	1	Other	Other
+a7668a2b-7d16-49d8-9f70-254b66f86ebb	1	Other	Other
+a76699e5-9e33-4300-a8a4-3ba9872f6759	1	Other	Other
+a766a1c2-3fde-4006-a44e-3015ddb6f385	1	Other	Other
+a766c0f7-3ec0-4064-b65a-0250ba1e68ec	1	\N	Other
+a766d856-79e0-4502-8210-2480905e77ef	1	Other	Other
+a766e42a-28e8-48d6-ac62-4cb43a0bced8	1	Other	Other
+a7671cf4-80ad-4e4e-bd1e-f8839615be0f	1	Other	Other
+a7675e88-6073-410f-bc9c-87b71620a5ac	1	Other	Other
+a7675fab-f576-4459-902d-3bf3fff77dc8	1	Other	Other
+a767d66a-dba2-403b-9160-6f922ba59e4f	1	\N	Other
+a768082c-b740-4ee2-a278-951611f9a585	1	Other	Other
+a7681244-1ef5-44bf-95e8-ba67da0f23be	1	Other	Other
+a7681c5f-cec8-4eab-9b7d-df0896f7faf1	1	Other	Other
+a76844ec-bde5-4a56-8e25-0b510016cd35	1	Other	Other
+a768a0a0-b623-4896-8ac0-ac367e77f3f7	1	Other	Other
+a7691dc0-bbec-4941-9e7f-2740b9c25e06	1	Other	Other
+a769280c-3a90-47a8-8cc6-a8856f5b1387	1	Other	Other
+a769542c-363c-4b9b-862e-0c279128712c	1	Other	Other
+a7697aa7-c5f3-4ea6-ba37-37a8c2803c6a	1	Other	Other
+a7699abd-f246-4218-9c20-0b7961e0e0cf	1	Other	Other
+a769eb99-9097-48f1-935e-515798752c82	1	James	Other
+a76a22d7-f934-4b19-bdba-c0b45433e20a	1	Other	Other
+a76a5c62-1054-4912-b9bd-0157f2af9dfd	1	Other	Other
+a76aa883-4ad5-429f-80a9-c394b92cecf0	1	Other	Other
+a76aaab6-927b-4805-817d-aab3a94ce6c9	1	Other	Other
+a76af88f-ddd3-4ce7-83e6-0f18418afcec	1	Other	Other
+a76bab70-5238-4096-8bed-92f3b9281293	1	Other	Other
+a76bab81-a4cb-493c-ac98-a94fb3a4f284	1	Other	Other
+a76bb474-0caf-463a-b038-8c99dd917813	1	Other	Other
+a76be0c4-3939-4997-a9ef-93dc77812a7d	1	Other	Other
+a76bf51b-90e3-4aff-a1a6-44403e532b6e	1	Other	Other
+a76c0beb-0b05-401a-adc5-4e2684d97791	1	Other	Other
+a76c0f89-1522-4545-8a0b-8d9020685722	1	Other	Other
+a76c1dae-6796-47d6-840e-5971e268890d	1	Other	Other
+a76d219b-21a7-4c1a-9bd2-cdd820f08155	1	Other	Other
+a76d25c7-01fa-406b-b9ec-5ca9f30d8626	1	Other	Other
+a76d2731-ebc5-49cd-884f-f5c44c199a2b	1	Other	Other
+a76d2943-7aa4-4d2a-a306-ff1da3938b1b	1	Other	Other
+a76d4274-3e52-4463-8da2-a67f8f983908	1	Other	Other
+a76dcd9f-46e4-4b9d-aa7c-a48049575184	1	Other	Other
+a76dd7af-0a94-401a-964b-a0e55f52135f	1	Other	Other
+a76e6293-a72e-4aa3-ae38-59e9f7047b8c	1	Other	Other
+a76e9f64-2600-4166-8e22-858c593930c1	1	Other	Other
+a76efb58-7612-4f18-935f-570dfc195e13	1	Other	Other
+a76f528f-540c-4ed8-a5d0-bcdcf8625ffd	1	Other	Other
+a76f764d-5f12-4dbc-91cb-8cf4a78530df	1	Other	Other
+a76f889c-c2ef-4420-920e-e09bbb60025c	1	Other	Other
+a76f98ad-8860-456c-910d-266b6227cdc9	1	Other	Other
+a76fb9db-4eb2-47a0-b613-2cdbdb1dc690	1	Other	Other
+a76ff74a-f503-4775-af1c-8c735571b8b4	1	Other	Other
+a7701006-e0d5-4581-b8bb-ac58d99dfd74	1	Other	Other
+a7706cce-f42c-41a5-95ee-c3234fc4bc46	1	Other	Other
+a77078f6-eac6-4147-aeb1-c24cc21a11f7	1	Other	Other
+a770a2f8-8b65-4dc0-bb70-6d30375c0a3b	1	Other	Other
+a770ac78-7991-409c-96ec-d50fa506d5df	1	Other	Other
+a77136bc-623d-47d3-84ce-5c46005b0d9a	1	Other	Other
+a771b7e4-0c48-435f-b30a-644a9001a79c	1	Other	Other
+a771c367-9414-4f9c-ad08-ff18433ff928	1	Other	Other
+a77200c9-915f-4ecd-843d-2e1b294ca032	1	Other	Other
+a7721b15-30f0-495d-923a-d0b2e4deb9a9	1	Other	Other
+a77222b0-e1c0-4b7b-b488-68cafc8c0ba8	1	\N	Other
+a7725aa9-3f82-4d24-8015-e559db35a00b	1	Other	Other
+a772cdf2-ca02-4ddf-af74-d9c668011aa3	1	Other	Other
+a772da1b-0f5e-452c-811d-07f87871251f	1	Other	Other
+a7733314-4b1b-438d-ad2c-935e6a646e47	1	Other	Other
+a773523e-c5ab-4bf3-959b-441cee434afc	1	Other	Other
+a7735b40-6c50-44b4-858a-42744cdb5d5b	1	Other	Other
+a773780e-20e1-47b3-9f2c-af8fa710f1d2	1	Other	Other
+a773bee6-1c3c-41ee-a37c-8daa425be9e3	1	Other	Other
+a773e745-6b1f-4c08-93f5-02b7801b9c83	1	Other	Other
+a773e754-95c3-4d88-a4f8-1edf568dd5da	1	Other	Other
+a7750bfb-d61a-43b1-b292-62d9d082f105	1	Other	Other
+a775119f-6578-4c1c-bfd2-b059d5bbc3c8	1	Other	Other
+a7751fd8-4ae8-4bb2-a4f3-2b428354dfeb	1	Other	Other
+a7752075-eb38-435c-b46b-28370ca113f7	1	Other	Other
+a77572ff-ed6d-4a16-bb11-1e5a91824dae	1	Other	Other
+a775bc6b-570d-481b-94f4-7e896c116760	1	Other	Other
+a775c678-8fff-4a99-8bda-662432919525	1	Other	Other
+a7762389-1338-4111-86f9-dd3c916d0257	1	Other	Other
+a7766677-d789-4991-87e5-c7ca0244a604	1	Other	Other
+a7767fa6-5a75-48c5-b033-ec1e0fca2483	1	Other	Other
+a776e462-45d9-4d14-acc1-468701f2647f	1	Other	Other
+a777011d-5f00-49c3-8689-9247cf3799ee	1	Other	Other
+a77723b0-9f9c-44b7-866c-a0ed1d2715f6	1	Other	Other
+a77799b8-6cc6-4777-a991-730d10179765	1	Other	Other
+a777f954-9c5a-4f51-a595-aed872d1f3c7	1	Other	Other
+a7787338-f250-488a-91f6-02e6425cdf24	1	Other	Other
+a7788add-8115-4493-a58e-5183c02a9f19	1	Other	Other
+a7789825-f140-4fd1-ba38-9c0c1f8f72a2	1	Other	Other
+a778acbb-9811-4e6b-bb37-e85a6216b193	1	Other	Other
+a778eb44-acc7-4710-956a-62eb94d03ce9	1	\N	Other
+a778f242-bdda-443c-be08-bb5b357aa9a8	1	Other	Other
+a7790d4c-0cdd-4473-ae75-b165506b7a03	1	Other	Other
+a779175b-834f-43f6-b05b-5d6007fe0660	1	Other	Other
+a7792d9a-c3b3-454c-bc93-8b0cb1b3a19e	1	Other	Other
+a77963aa-6eee-4b21-90f5-49916db66f81	1	Other	Other
+a779748d-b2f7-40eb-9651-a1a1b4e131ac	1	Other	Other
+a77a0fca-9700-420e-a266-696a40f61cf2	1	Other	Other
+a77a236e-eb8e-4c3b-8dc6-1742fe502d53	1	Other	Other
+a77a651d-93a3-4874-b0bd-54a150e9e72d	1	James	Other
+a77a886a-cadf-4be7-9cf1-40ccaae57a85	1	Other	Other
+a77a9449-f706-40cb-ab61-c4639aa1aefd	1	\N	Other
+a77a9ac8-edce-4b49-a0c4-1f88245d26f5	1	Other	Other
+a77ab644-9644-40b9-8b33-708634c089c4	1	Other	Other
+a77abc5e-deae-4a27-97df-c668b8b0b474	1	Other	Other
+a77ad5d1-a34d-4050-962e-4c468568cc08	1	Other	Other
+a77ae4c7-1753-4c37-85b0-8e913ef85585	1	Other	Other
+a77ae7c9-457b-47d5-9c28-a1d4cb34479c	1	Other	Other
+a77b063b-0440-486b-bb21-f33205f192a3	1	\N	Other
+a77b06d2-140c-4d62-9f70-c982d6de4ac9	1	Other	Other
+a77b7d3b-6ddd-4cae-a4c5-fd3d551f4a18	1	Other	Other
+a77b838f-90d5-425b-95ed-13bb049695cc	1	Other	Other
+a77b86be-c164-4674-b0d1-cab2ec0267f7	1	Other	Other
+a77b96e6-8b07-4dee-9fab-0e80343b9c79	1	Other	Other
+a77b9dbe-d679-4192-8094-48d2ceedc407	1	Other	Other
+a77bb3e4-080a-4d0b-85cc-7b27476fcdd0	1	\N	Other
+a77bcbfa-3333-412b-a4be-054d757e3422	1	Other	Other
+a77be906-0271-402e-86d5-e209591ce724	1	Other	Other
+a77c0481-fbe1-43b7-ac2f-d6347d9fcb25	1	Other	Other
+a77c11e6-e6ff-4ec7-a56c-94f407916f2f	1	Other	Other
+a77c1de4-4a00-4ddc-aeed-2d3a3754ab98	1	Other	Other
+a77c3a13-75eb-4bd5-856a-c0a4252f65c7	1	Other	Other
+a77c4860-3cb9-4bec-8473-e6cded21e9cc	1	Other	Other
+a77d0c3b-f27a-47ef-ac58-b11d2ee148e3	1	Other	Other
+a77d1b1a-64aa-4ef8-bf6d-c4001404a5fc	1	Other	Other
+a77d376e-d836-4ee4-922e-8026de16efa8	1	James	Other
+a77dcf95-7859-4352-b77f-3ffc1ac183b4	1	Other	Other
+a77e77e3-30da-4757-9173-ebf8c0c4d512	1	\N	Other
+a77e860f-765f-4008-a804-f19548c5f440	1	Other	Other
+a77e8c21-cb2a-4c79-a88a-3f917be289b2	1	Other	Other
+a77e8f62-1567-40c9-b5e5-aee28fe25b1d	1	Other	Other
+a77f0316-41d0-485c-86cd-d8fbe59451ad	1	Other	Other
+a77f61c1-f635-47b4-96d9-4b213f0db1e1	1	\N	Other
+a77f9608-af9a-4876-afc7-383308ff7633	1	Other	Other
+a77fbe88-223d-4982-a8a4-591e7a4af374	1	\N	Other
+a77fd87f-a93e-4a21-ab63-a920da27e194	1	Other	Other
+a77ffe7b-02a0-4acc-a8ed-49fe8986d785	1	Other	Other
+a7808de4-50fe-49fa-bce7-d03eb9346c97	1	Other	Other
+a780af4b-9e9b-4394-b756-d74891f49200	1	James	Other
+a780fda6-459d-48fe-95b8-50e6508a87c9	1	Other	Other
+a78101fa-44bf-433d-aae6-950a5ea6893f	1	Other	Other
+a78118bc-c0af-48aa-9b12-dcb5e3c0330b	1	Other	Other
+a7811d8b-ca21-4686-b89c-960340c5f0ba	1	Other	Other
+a781916b-d12c-44ee-9bcd-79a2719cac9c	1	Other	Other
+a781d9cb-592c-404e-af69-9493a977dca4	1	Other	Other
+a781efdc-5414-4096-ac6c-6bc712e9746c	1	Other	Other
+a781fa12-8a02-4ee3-997a-513c35ed977e	1	Other	Other
+a7820116-861e-41b1-bf0c-4933a3132371	1	Other	Other
+a7820708-429f-47e6-91b9-0fc546da3982	1	\N	Other
+a78209ca-1249-49ff-9de8-b648defcacf3	1	Other	Other
+a78230a4-40a2-4225-8ec7-29cd7c76a8b9	1	Other	Other
+a7823882-afd6-43f8-848c-ce02b921d299	1	Other	Other
+a7823a46-b1fa-4496-89d4-bd4c2798ab5a	1	Other	Other
+a7824dd0-a11f-4cb8-8b8a-b45f80109fa5	1	Other	Other
+a7827def-7ac5-4a5e-8b63-c4674b03410f	1	Other	Other
+a782ee60-5d0e-4cdb-b09b-519ddd5adab7	1	Other	Other
+a7833dcc-4b7e-4ba4-a449-dee0f1c0daf5	1	Other	Other
+a7835989-dd16-4a92-bdc5-bf34e5e9a233	1	Other	Other
+a784294a-dcbc-491e-a4af-6a59708d2b35	1	Other	Other
+a78461d4-5eec-4988-b0de-1ad392ced74f	1	Other	Other
+a784f096-97cd-4242-9d75-ccf42202cc3b	1	Other	Other
+a78555b0-c48b-4fa9-8421-89398ff1ec56	1	Other	Other
+a7856878-3794-4fa7-9764-dce1cf4e1863	1	Other	Other
+a7856dec-5821-41ec-991c-891e16e26d05	1	Other	Other
+a785bdd9-be78-4728-a44b-cef10fd5f08b	1	Other	Other
+a785c2fc-022b-46d4-805f-9ef206d43162	1	Other	Other
+a785d46f-c125-4dc5-b122-56b7374866c3	1	Other	Other
+a785de41-d755-40bb-bd15-aabeecebd195	1	Other	Other
+a785e1b2-948e-4ffe-867d-f4e8012a9f48	1	Other	Other
+a785f32e-49aa-4678-bc9a-b83cf629a3ed	1	Other	Other
+a7867e78-7373-472f-82b8-1d2ba30bd983	1	Other	Other
+a786a600-6fdb-4cc6-980a-ef4ba797de51	1	Other	Other
+a786c989-02a2-480a-838b-ddcf6be6ef00	1	Other	Other
+a786db5e-6805-4518-9943-3358287248db	1	Other	Other
+a7870b12-7a8f-400a-801e-9a63e8c294d8	1	Other	Other
+a78792a6-b8f3-4842-8044-6a68a0821ff1	1	Other	Other
+a787dd99-eaa5-4099-884c-eacb9896a43f	1	Other	Other
+a7881404-9d01-4f62-8deb-12ed4d529a88	1	Other	Other
+a7884dfb-1004-441e-b536-3f17a512faf9	1	Other	Other
+a788604c-68da-462f-9c35-18d2c2303560	1	Other	Other
+a78884d0-00dd-4ceb-9d04-876105a025ee	1	Other	Other
+a788a66c-784b-4ae2-9fe7-b8a99f62c22d	1	Other	Other
+a788d588-d87f-4ac1-9009-1123289dc12f	1	Other	Other
+a788fb5c-771e-4aad-8705-2e09f776b2f3	1	Other	Other
+a78938d2-f55a-438b-a3cc-0ab35b7b2b35	1	Other	Other
+a78979af-4d49-4d6d-abad-bb5d724ffe74	1	Other	Other
+a7897f1f-8ff7-4610-8227-e384963b42a3	1	Other	Other
+a789872b-ed1e-47fe-b5d5-79d76e429b7a	1	Other	Other
+a7899f55-951b-4677-8f82-f0833b935dbc	1	Other	Other
+a78a1a34-2b43-4d6a-8d49-0ea5c7bbe1c3	1	Other	Other
+a78a692b-aa12-41b9-b6eb-31d5948af3bd	1	James	Other
+a78a8495-3cb3-4f83-97a0-cce405b4ea41	1	\N	Other
+a78a9d49-9eac-453d-ab48-0adb4de89b9d	1	Other	Other
+a78ab60b-3f94-43a7-a91c-ef06275acc6a	1	Other	Other
+a78abb58-62d8-42da-862c-af50b6cb1115	1	Other	Other
+a78ad990-a2d7-40b0-9350-355613d0d2bf	1	Other	Other
+a78b0692-7ac9-4aae-8b1d-bc15809fcd4f	1	Other	Other
+a78b3dad-aeed-4482-adf5-29bde962583d	1	Other	Other
+a78b987d-499c-4614-b13d-3479ab752e76	1	Other	Other
+a78ba554-d20b-422e-9723-1136de0ed9b6	1	Other	Other
+a78c21e5-4c23-46fb-8db9-c2515ce5c2ae	1	Other	Other
+a78c3dcd-7fa3-4d9e-81e4-50891c005d4a	1	Other	Other
+a78c5291-b689-49a4-9ed4-cdea1b835535	1	Other	Other
+a78c60c3-9c33-4803-8765-6e560a2b2399	1	Other	Other
+a78ca15d-8a11-412c-9147-72d4ecc24511	1	Other	Other
+a78d165c-dc29-4bd8-8db6-1438eb5fa6df	1	Other	Other
+a78d431a-9ace-4f6b-8d12-7d2b49a4c7ea	1	James	Other
+a78d6297-12fc-4c5b-aa8f-f2cd3235ed5f	1	Other	Other
+a78d9d37-a3a8-49e2-ab54-28ddba5f63f2	1	Other	Other
+a78db407-75ce-46a5-8f3d-05858d751e14	1	Other	Other
+a78dc712-0b8d-45b2-9440-c5d2b4b43890	1	\N	Other
+a78e1a7d-af31-4329-afaf-8232791854a4	1	Other	Other
+a78e4424-2760-445b-9966-35ec93571c95	1	Other	Other
+a78e67b4-99f7-4855-8cc3-1516784854fe	1	Other	Other
+a78ec3b5-98e2-442b-ab73-fc78f7428ba8	1	Other	Other
+a78f50aa-82ae-413a-8dfa-0096f010389e	1	Other	Other
+a78f8cbe-498b-4737-b4f2-ca24c4857d0e	1	Other	Other
+a790195c-1b95-4b39-a51f-854a256426e2	1	Other	Other
+a79092af-48b4-450d-9b24-c3a838285e5d	1	Other	Other
+a790961a-cb07-4f04-9114-57e23c0bd4cd	1	Other	Other
+a790cd0b-fae9-4a74-b2a6-f058113d723d	1	Other	Other
+a7914fbb-689b-4bbb-ba5c-80e9a7b0801e	1	Other	Other
+a7915fb8-cb37-4eb5-84eb-598f06e070f9	1	Other	Other
+a79173ab-043e-42d0-ae58-c857db6f2a02	1	Other	Other
+a791a177-0002-43d2-8031-cb1f6be0229b	1	Other	Other
+a791b593-54c9-47a2-a555-01d3ebb8531f	1	Other	Other
+a791d481-b357-4231-aef5-af8fede9cb0b	1	Other	Other
+a791f1c5-46e3-45c2-99e7-69f067037fe6	1	Other	Other
+a7922d0c-cabc-4847-a892-bc2ea8ed7073	1	Other	Other
+a7924a8f-7d2f-403c-8c43-9f408e3f0bc5	1	Other	Other
+a7927b03-1541-4298-9a4a-f8b935c411de	1	Other	Other
+a79287ae-f84d-4a8c-95c9-83b5bf810cc3	1	Other	Other
+a7928bbb-ee9e-47e8-bc43-b67563da7de6	1	Other	Other
+a792af1c-85fd-4f78-b97e-338c7622684d	1	Other	Other
+a79364a1-147b-49b0-adbf-73cda248b6a1	1	Other	Other
+a79394ab-3391-439f-827f-28b712dafed3	1	Other	Other
+a793bcba-22f4-41ec-8b3f-b662ff3dd4ea	1	Other	Other
+a793d638-a9af-4ca4-aa5b-20b720b600e6	1	Other	Other
+a793dabc-1a7a-42c6-a5cc-f09a069ae87a	1	Other	Other
+a7940981-ec72-40e4-b4fc-4181a4d94bbc	1	Other	Other
+a7951dcb-7b5f-4ac2-8731-588a76fd6bbe	1	\N	Other
+a79523c7-bfe4-4c57-a4e8-3dcf288c88a6	1	Other	Other
+a7954b4e-7155-46ec-8cbf-682edf8b8c55	1	Other	Other
+a7955029-94e6-4333-8b35-819ec81abdc7	1	Other	Other
+a79563a7-f6ce-44d4-b7bd-142e5fe7f6cc	1	Other	Other
+a7959d0f-b978-4db7-a22f-b16398d33296	1	Other	Other
+a7961ce2-84b3-4ca9-9b3b-b0e68ab4b10e	1	Other	Other
+a79667c8-1ed7-400d-ae0e-cb386806b4c5	1	Other	Other
+a79692f3-4b41-4bac-8264-8e9997fc71c5	1	Other	Other
+a7970ea0-2333-44e4-8d58-f2b0b5a07b9e	1	Other	Other
+a79711ff-785a-47c2-8c7e-f160697bc536	1	Other	Other
+a7972c05-01e3-495d-b6ea-c11d0c9c5de4	1	Other	Other
+a7974930-d95a-4045-86c9-7976ca688801	1	\N	Other
+a79795ea-e475-4198-afcc-910ec863bf5f	1	Other	Other
+a797a36e-0994-4813-a8c9-ae3563a8f376	1	Other	Other
+a797b2cc-2e8e-4092-a01c-5364c1917aeb	1	Other	Other
+a797d58e-e412-4f6e-80e2-57388561216f	1	Other	Other
+a797e647-55a0-4b64-b08f-1fbce76b5c63	1	Other	Other
+a797f87f-4b72-46ad-9722-314d70a9f047	1	Other	Other
+a7982212-4e18-4476-9fd8-cc68ff1ec555	1	Other	Other
+a798545c-c2b4-4718-a9c5-4e165d659f4d	1	Other	Other
+a7985903-2171-40bc-acb6-f5c630d7b328	1	Other	Other
+a7985daa-ab9c-48bf-8909-8273b0637bb3	1	Other	Other
+a798670f-e968-4c5a-bc1c-f4bec3083402	1	Other	Other
+a79880b7-42d5-4ab5-8aab-dcd4fb404f90	1	Other	Other
+a7989b07-7b6e-4d3b-9885-56a4a305fec1	1	Other	Other
+a798d0a0-238c-4353-af3a-f0e1cb8d9f61	1	Other	Other
+a798d80b-a1be-4d5f-87bd-77182c77e852	1	Other	Other
+a798dd65-560c-48ff-ac59-87d638d25976	1	Other	Other
+a798e58b-76c7-4929-a6c2-b001674584bb	1	Other	Other
+a7991328-0901-4833-9033-2d0c883fcf88	1	Other	Other
+a7995040-dade-4638-95c4-9e774642fead	1	Other	Other
+a7995c92-e34a-43d2-a8a7-bfc1dd2f9c59	1	Other	Other
+a79977af-2a7c-4e5b-add5-3fb0ad02e25b	1	Other	Other
+a799fd84-4b7d-4e8d-9c40-9e6dba909776	1	Other	Other
+a79a0186-9999-4a4f-8d3e-e4caef23852a	1	Other	Other
+a79a431e-5ebe-4326-999d-bec8b00e3b78	1	Other	Other
+a79a571d-6e47-43c6-bad7-162dc8057998	1	Other	Other
+a79a6ae1-a377-41c9-b9a4-0b6819b0dabb	1	Other	Other
+a79a6c8c-4bf7-4741-9076-bb2be9e1e231	1	Other	Other
+a79a8ae5-d1f6-4acc-93b2-26f337284c9b	1	Other	Other
+a79ac9e9-d5c9-4790-b5ed-1dc9aff23bbc	1	Other	Other
+a79acdc5-2da3-4ebc-946e-d1b5765f4cdb	1	Other	Other
+a79b50bc-636a-4da6-8c1e-42b81f9af918	1	Other	Other
+a79b51c1-cb24-46e6-9ba7-e203642409ff	1	Other	Other
+a79b5a58-f175-428e-b8bf-bc3c0c788029	1	Other	Other
+a79b9a55-435e-4bc8-bc4a-ce5403803708	1	Other	Other
+a79bc317-688c-4f22-9a38-48d02a03d2b4	1	Other	Other
+a79bee9a-f683-4fa3-b8d0-1556da93aa4c	1	Other	Other
+a79c02ba-35f9-45cc-b06e-6cf338195bc4	1	Other	Other
+a79c3678-a7b2-4b18-aff7-692f6b56984b	1	Other	Other
+a79c6011-47da-4eab-a0e0-68ea44e971e3	1	Other	Other
+a79c71d3-fb55-441b-a7c0-d78fd8fe5ece	1	Other	Other
+a79cc947-48ad-403b-b7d7-97055b27443a	1	Other	Other
+a79cd462-d267-48ac-afa8-37bc96965a2e	1	Other	Other
+a79cf084-3bfe-4ccc-854e-f557d5c1ed44	1	Other	Other
+a79cff93-22ed-4e32-8f4e-eeba19feb90d	1	Other	Other
+a79d1751-8048-4bd9-84cd-cbcd3e12b9bf	1	Other	Other
+a79d2b53-8b33-493a-a67b-6277741285d5	1	Other	Other
+a79d75b2-932a-4b00-8674-ebd0fd68c900	1	Other	Other
+a79d81dc-fd57-4ebe-856c-7bac12e6eec2	1	Other	Other
+a79da5cb-f4bb-4ec1-aea7-b94e2c6fdd08	1	Other	Other
+a79dabbd-70ae-4f24-a2fe-dbb7db78754e	1	Other	Other
+a79de8c8-8cb9-409a-a501-572a9035b012	1	Other	Other
+a79e6503-11c3-4ab0-b3fe-0b3e5bd1f753	1	Other	Other
+a79e66c5-d110-4c32-9774-54bea6c3050d	1	Other	Other
+a79e7cb1-df33-4ce5-bd76-7eb75bd075a3	1	Other	Other
+a79efbd2-2d3c-4409-af88-f1fc1936e033	1	Other	Other
+a79fb605-6b71-42c0-912e-f74c8cd4b8b0	1	Other	Other
+a7a0942e-6c11-4796-9372-beaf55769d22	1	Other	Other
+a7a0c0f3-ac8a-4f22-a9e3-bcda4fc259f3	1	Other	Other
+a7a0d82e-8797-40ff-bee0-9df62a6b3774	1	Other	Other
+a7a0f1f1-0ff9-49e1-9f51-2d75a190960d	1	Other	Other
+a7a14521-11dc-478a-b956-1ce9b757acc1	1	Other	Other
+a7a1508e-4e71-45cc-ad93-b0e1af448bef	1	Other	Other
+a7a1b577-8c71-425d-af8e-08aee710ac9b	1	Other	Other
+a7a1c3aa-237b-4989-8a00-9c5659c4a143	1	Other	Other
+a7a222ec-4395-47af-80cf-70d5abf17eec	1	Other	Other
+a7a24c88-1800-429a-a4fa-ed5af37017a6	1	Other	Other
+a7a26ba4-baac-4334-aa24-86bfcf01e849	1	Other	Other
+a7a2a271-bd05-409f-bf37-5a2118ffaa20	1	Other	Other
+a7a2a91b-4928-4f99-989c-c157381cbdb6	1	Other	Other
+a7a2eb70-c1e0-4c91-94ef-968f752b2f99	1	Other	Other
+a7a2f918-9cab-486e-9ad2-cbcebfc70672	1	Other	Other
+a7a2fabb-6e90-4c23-888e-ca3411795813	1	Other	Other
+a7a2fbc9-2a2c-4297-9f3a-d88f4ce75601	1	Other	Other
+a7a30109-ab9f-4e15-8b7e-c280fba98a66	1	Other	Other
+a7a3319b-d1f5-441f-b691-75d6f947a5b8	1	Other	Other
+a7a37f7d-7ead-41d5-93af-297bcb1cb681	1	Other	Other
+a7a3af2a-42ed-4945-9420-bc21534cccb1	1	Other	Other
+a7a3f27b-4e7f-4f16-a804-d99e60f32f59	1	Other	Other
+a7a42209-d7e1-4618-ba1a-b0d5a608f5b1	1	Other	Other
+a7a42a8f-694e-4fb5-b7f0-cb130c98d7b0	1	Other	Other
+a7a46390-15b5-449c-bca9-7a335555066c	1	Other	Other
+a7a464d4-b530-4c48-bc6f-5721ef43c29e	1	Other	Other
+a7a47e6e-43c4-4aac-9ecf-38a296a01380	1	Other	Other
+a7a481c7-d158-4945-b0ad-c67ace622413	1	Other	Other
+a7a4843e-9ce8-40e7-9bf7-9659fc3cdfc5	1	Other	Other
+a7a48d64-1a95-428b-959c-42c096874025	1	Other	Other
+a7a4bbc9-21b8-461f-b985-a82b160488e8	1	Other	Other
+a7a4d162-04ae-4350-a536-36d2461517d3	1	Other	Other
+a7a4ec36-b177-4bdc-867a-753f33e55518	1	Other	Other
+a7a546a2-d2f4-4fba-9a35-6de2cfccb45a	1	Other	Other
+a7a562bd-f2a4-4225-911b-8285b032aa61	1	Other	Other
+a7a58198-f17d-4145-985a-32e6eb2f9107	1	Other	Other
+a7a594a6-7563-4d4a-9294-c550013b5490	1	Other	Other
+a7a59827-cf1e-4294-9f3d-04c8a5b4eed1	1	Other	Other
+a7a5a6ba-e1bc-4594-b93a-7e7ee3069dbc	1	Other	Other
+a7a5aefc-6365-4cfe-8319-29e9b40519e3	1	Other	Other
+a7a5eddd-5203-48f1-bc71-0dd0ef7ecf24	1	\N	Other
+a7a5f820-85e9-4090-9056-c2bb2484a040	1	Other	Other
+a7a632c0-068f-45ca-bbcb-a0ed979ab641	1	Other	Other
+a7a657b6-d82e-4c62-a3a1-45e5ec706068	1	Other	Other
+a7a695e8-5eb9-491f-a03f-afe6cb8286be	1	Other	Other
+a7a6b51b-0a32-4ed4-8c6a-23c3e8f37d8e	1	Other	Other
+a7a6cd94-72db-472a-b7fe-6defd47ffc52	1	Other	Other
+a7a73903-1210-4663-a00e-610b54189242	1	Other	Other
+a7a73c83-ffe0-4d14-9d3a-9156f9c50eb7	1	Other	Other
+a7a74fcf-b824-4ffa-99d4-c073a1d92d3f	1	Other	Other
+a7a7bbb3-62d3-4494-9387-a363845c0fe4	1	Other	Other
+a7a84af1-a574-4186-8be6-edeb1edc4036	1	Other	Other
+a7a885c3-3657-442a-8587-7a9a3bb917bd	1	Other	Other
+a7a8bb82-0adb-4942-becc-adc03777a065	1	Other	Other
+a7a8d720-ef6b-4db4-ae16-2ae7946d234f	1	Other	Other
+a7a97ac4-f1b3-45ea-a4c7-084325d3b1d8	1	Other	Other
+a7a98378-bc12-43f9-b39f-d7a0bf21bf8f	1	Other	Other
+a7aa138a-629f-42b3-b692-f955f362f84e	1	Other	Other
+a7aa1615-9e0f-484e-b012-cbe8d1843a53	1	Other	Other
+a7aa4a06-ab77-4792-b44b-6273f062770d	1	Other	Other
+a7aa5537-7aa8-455d-a80b-3f24cca6952e	1	Other	Other
+a7aa5e4f-6a9d-4a22-8f0b-4cee02fb82d4	1	Other	Other
+a7aa734e-7126-4fe4-9eab-a1c0cab1cbee	1	Other	Other
+a7aab10d-98f2-4028-8f28-f83c0a2fac84	1	Other	Other
+a7aad91c-45de-4d4b-af96-77b7dbb6b99a	1	Other	Other
+a7aaeba7-91eb-4e81-bb31-a99e8cfe5e6f	1	Other	Other
+a7ab4ae0-84fc-4d65-bf87-b1efcf794f91	1	Other	Other
+a7ab93e7-2a32-4026-bfa6-a6d4d4d412ba	1	Other	Other
+a7abb4b6-7203-4fd8-8d3d-4b29e681e9ac	1	Other	Other
+a7abbf7c-2901-461d-b6a1-abf5c2ef812b	1	\N	Other
+a7ac0778-1ab8-41ad-82ad-1a48e2275d48	1	Other	Other
+a7ac29bf-520e-4142-b2cf-9ef199f7d909	1	Other	Other
+a7ac57b4-57cf-4ba6-83fd-af83b433f730	1	\N	Other
+a7ac756e-400a-4677-8356-96fe772d7293	1	Other	Other
+a7ac7b46-fb50-4cd3-8388-b998797fc490	1	Other	Other
+a7ac89c7-5dd8-44dd-95fe-7e30344ab47e	1	Other	Other
+a7acc167-9636-42ee-8267-7ff4ffa7cde4	1	Other	Other
+a7ace94b-a829-4128-923a-857d84b68be7	1	Other	Other
+a7acea63-af25-44a8-ac61-2187f056a0fc	1	Other	Other
+a7ad2034-a084-4213-9dbd-2aeb63e68dba	1	Other	Other
+a7ad2053-69d4-46e6-a3e0-7c73e9a35d2f	1	James	Other
+a7ad8cd0-528e-41c9-ad2e-6bba805bcf85	1	Other	Other
+a7ad93ab-a112-4bc9-9150-f3bbd2a83771	1	Other	Other
+a7ad9bd5-9cba-48ef-bfac-80401bc29bc8	1	Other	Other
+a7adad39-4c07-4e75-909f-ad30d24fa1d6	1	Other	Other
+a7ae01af-3dd0-4380-bbb1-97807b95dba0	1	Other	Other
+a7ae038a-7673-40bb-8cf2-fccdd590cd32	1	Other	Other
+a7ae0f85-1504-443c-85a6-8661cc53157b	1	Other	Other
+a7ae491a-98ce-4739-9544-90ad6e449ac9	1	Other	Other
+a7ae72fd-0c07-4db1-974b-1c7e7c00bd3e	1	\N	Other
+a7aedb83-f171-4cc5-b910-3ec713cf7d52	1	Other	Other
+a7af1188-644b-430b-aeb5-435edbdc48c7	1	Other	Other
+a7af5271-053c-4c34-9533-00bdeb8641e4	1	Other	Other
+a7af63ac-a3f2-4087-92bd-03ea9789077c	1	Other	Other
+a7af9a70-bc16-400d-9e7a-549adee88e15	1	Other	Other
+a7afec89-817e-4671-bc62-d56ef7765ebe	1	Other	Other
+a7b01c96-b0c4-44d0-a2f6-79248bb66e74	1	Other	Other
+a7b06dad-b7ce-4dd7-8dd0-53861f26af08	1	Other	Other
+a7b07e2c-0812-4d90-a259-21ba70f6d994	1	Other	Other
+a7b0a543-11e4-4bf1-9554-772628a549ed	1	Other	Other
+a7b0c10c-8382-4ee4-ad38-0d394b287d72	1	Other	Other
+a7b0f493-d067-42cb-817b-00d5a8d6c700	1	Other	Other
+a7b0f552-84ae-4515-8ad6-857cc0f0ad7b	1	Other	Other
+a7b0f909-5044-48a9-9d92-6ae76492288c	1	Other	Other
+a7b174ef-012e-41fa-8d95-ee11ec1128bf	1	Other	Other
+a7b17cdc-5da6-4602-8ea8-3af419ba0dbf	1	Other	Other
+a7b1909b-0c13-40f6-ac1e-5e7753a4709b	1	Other	Other
+a7b1a637-f957-4c92-b276-276a16275a4e	1	Other	Other
+a7b21d4a-217d-444b-98cb-29094ab26166	1	Other	Other
+a7b2629a-8857-43af-ba43-8a6945538a9d	1	Other	Other
+a7b26aa2-acd4-41d8-a743-3d9c18d2d422	1	Other	Other
+a7b2f648-8759-4ebb-998c-874381a69463	1	Other	Other
+a7b2f80e-cbc1-406d-9180-95f0625dbb6f	1	Other	Other
+a7b30a3f-af23-4275-9619-87c0f0c50d74	1	\N	Other
+a7b33f1a-fb8a-4a55-9a66-fa555be9c258	1	Other	Other
+a7b34808-abac-447a-ae5d-f4c2aa2a51cb	1	Other	Other
+a7b36c0f-f3f3-45eb-9833-fb09f57f75fb	1	Other	Other
+a7b3781d-7bce-49cf-8e55-045c1be02901	1	Other	Other
+a7b38d78-1427-49fa-85c0-949b765e3087	1	Other	Other
+a7b3928c-7f12-4847-a643-be133f17aaaf	1	Other	Other
+a7b40e97-24c9-4346-ac61-4a5c1edfa823	1	Other	Other
+a7b4181e-a080-47af-a374-bae1127c014f	1	Other	Other
+a7b41bd6-2f8e-4385-b279-7e56cb14238b	1	Other	Other
+a7b4275a-8c9d-4ff7-84d9-307693a7aa27	1	Other	Other
+a7b4377e-7ffe-4a15-9272-663aeb816b8e	1	Other	Other
+a7b44370-64d4-4521-9f67-779e5c83d29e	1	Other	Other
+a7b4603d-0a06-45e8-b0fa-ee5a3c9d5b2c	1	Other	Other
+a7b4a1ae-1a22-4ab0-85a2-0fca7d7fa4c1	1	Other	Other
+a7b50fbf-f9e9-4aab-898b-6f5ebabab21f	1	Other	Other
+a7b5c978-183a-410e-bb6c-f56cfb18dead	1	\N	Other
+a7b5e5a2-420c-4c64-94a1-d9938aabb4a1	1	Other	Other
+a7b5f4f6-e554-45c4-a174-408155ed9a20	1	Other	Other
+a7b5fde3-63b6-4b63-809b-e8f667a1858c	1	Other	Other
+a7b62e3e-76c4-4194-8361-71b5071bc801	1	Other	Other
+a7b66b5e-06d9-45cb-8713-4b62704f82b6	1	Other	Other
+a7b6a743-a251-4131-b3cc-fdb7373d897c	1	Other	Other
+a7b6b249-a362-4765-8b7c-b52d275c2bf8	1	Other	Other
+a7b6bdc1-181b-4d6e-b5fb-c5db08526e44	1	Other	Other
+a7b6ecf0-96c7-449a-b442-6210420a23e8	1	Other	Other
+a7b7bba9-e7f6-412a-9897-40305983138d	1	Other	Other
+a7b7e197-0bd1-4b7d-a078-32badc0a5185	1	Other	Other
+a7b7e1d1-32d9-4da1-b058-4e73e6ba9f2b	1	Other	Other
+a7b88eef-07d8-4eae-b60d-dbee4e6b0104	1	Other	Other
+a7b8ca8a-b33c-4e68-9d0f-ef157073611e	1	Other	Other
+a7b8e5d7-58dd-4fb7-adcf-94186793a26b	1	Other	Other
+a7b91a1e-1100-42c2-bd22-857305ca6a14	1	Other	Other
+a7b9200a-78ca-4f94-b51a-0a51dbb75b9a	1	Other	Other
+a7b9ba14-ddeb-42f0-9445-87de7d5cb586	1	Other	Other
+a7b9dc33-8944-4a7c-ad7e-15f1fd766e89	1	Other	Other
+a7b9e929-d546-4bd9-a73c-69e6541940db	1	Other	Other
+a7ba2cb0-4a44-493a-aeeb-b215afbad2da	1	Other	Other
+a7ba4f4f-e924-4281-9095-c3ad4148a3c6	1	James	Other
+a7baebfc-5a2d-40db-9da1-53f68e966781	1	\N	Other
+a7baf50b-146c-408e-846b-f3a2c9bed6d6	1	Other	Other
+a7bb0fe5-5c2e-4e58-bf64-cd46859f20ba	1	Other	Other
+a7bb23ba-41f5-4428-b2ef-1cda40624ba8	1	Other	Other
+a7bb4e94-e3a2-41fa-acce-df95b10021cb	1	Other	Other
+a7bb52b9-735e-474c-a3ab-17a551aef319	1	Other	Other
+a7bb5d63-b380-45a1-8d88-e58208ee2bb0	1	Other	Other
+a7bb5e31-dad2-452a-a56b-3236b1211427	1	Other	Other
+a7bc02d6-e9fa-41b8-94db-dbfd904b46bf	1	Other	Other
+a7bc1ca6-3528-46e0-91c7-0d011a97e2b2	1	Other	Other
+a7bc23e5-62d3-4082-ae4a-4b560c2b3247	1	Other	Other
+a7bc46f8-1055-463f-900b-949dccba0a48	1	Other	Other
+a7bc8a70-f81c-4a5f-82a6-8a1d7bbebd07	1	Other	Other
+a7bc8c00-a444-4ba2-b4cb-cf455f38219a	1	Other	Other
+a7bceff9-be19-4299-a49f-bf3371b63e7b	1	Other	Other
+a7bd12fb-e105-40ea-a216-196b2b63d369	1	Other	Other
+a7bd302f-7560-43ef-9abf-d00a74f064bc	1	\N	Other
+a7bd71d2-fd2f-4733-90ba-faa3e9fe8695	1	Other	Other
+a7bda4b9-e6c2-4228-86bb-dc286b05d550	1	Other	Other
+a7bdab90-6325-47f2-8b44-383a116bbef6	1	Other	Other
+a7bde4ef-ceb1-4f69-8ad8-7d39218a7ec5	1	Other	Other
+a7be5a3e-1a8f-43d6-a035-949d63c346c2	1	Other	Other
+a7be5f7e-3dcb-4e1b-b644-532bdfcc4379	1	Other	Other
+a7be838d-d911-4eb3-9e4a-20b5e961e39d	1	Other	Other
+a7be929b-0dee-4f59-9564-f44a6dd9bcaa	1	Other	Other
+a7bec640-4f4a-4340-8b17-e3a8b5f2ef0a	1	Other	Other
+a7becc54-fa96-4ae2-8ae8-1b623881bf06	1	Other	Other
+a7becf35-2776-4527-b68a-d0571c4c5e46	1	Other	Other
+a7bf05e0-52c6-456a-b109-3aef9ae44d2f	1	Other	Other
+a7bf0d93-d53c-410f-8b3c-94d20aa91116	1	Other	Other
+a7bf10da-1292-4cd6-a372-e384ce0427f7	1	Other	Other
+a7bf1345-b41f-4c54-a436-af02b8345564	1	Other	Other
+a7bf1a79-259e-45cb-9b98-1876a14817e2	1	Other	Other
+a7bf4735-6fa9-4742-a1a9-fac7bb9a799e	1	Other	Other
+a7bf481c-40d5-4fad-9f0b-c636670bca38	1	Other	Other
+a7bf66e9-3ea0-4b19-acfe-bca3335e76d4	1	Other	Other
+a7bf9071-100a-45cc-a347-e1b327736edb	1	Other	Other
+a7c0038d-8707-48e7-9499-e549d6824c18	1	Other	Other
+a7c004ac-92fa-4d76-80d0-5cfed4ded843	1	Other	Other
+a7c02065-1298-4c41-8c3f-b35d734a1700	1	Other	Other
+a7c04ca2-e29f-42d2-b1b4-bc71281569c4	1	Other	Other
+a7c06fac-c6f4-4c8d-ae82-93794be9b304	1	Other	Other
+a7c07435-8fcd-485a-9328-149b179403fe	1	Other	Other
+a7c082db-3379-4699-bf85-7abc0246cf53	1	Other	Other
+a7c09b99-5a25-47f3-b2fa-f265e81bae31	1	Other	Other
+a7c0af9a-097d-4cc9-969a-bbd9a7ec1c3c	1	Other	Other
+a7c11a1e-f5c3-4f6b-b0c7-5ff12535e87a	1	\N	Other
+a7c147e1-abd4-49c4-a77c-8e2f84acdc5a	1	Other	Other
+a7c14b25-a897-4686-a850-9e3b1425e527	1	Other	Other
+a7c18aae-f520-44f1-89d8-87de4f0836f8	1	Other	Other
+a7c22bb4-ef1a-429d-8184-8fb22572933e	1	Other	Other
+a7c23a3b-877d-4148-876c-451de52ebf75	1	Other	Other
+a7c28c68-351a-44dd-8ca5-966ddba970de	1	Other	Other
+a7c2a261-278f-4a1e-af17-d58ee9e6a967	1	Other	Other
+a7c2bf4c-8e3b-4646-ac30-7e16082687e9	1	Other	Other
+a7c2f657-cebe-4ff9-a849-00cd88f33fe1	1	Other	Other
+a7c31d0d-285c-46eb-8e66-66d0494c4c17	1	Other	Other
+a7c3335c-a033-45d9-acae-f0cb93047740	1	Other	Other
+a7c35c90-c186-4894-8fd1-1bff4000914d	1	Other	Other
+a7c37ead-daa1-4b9f-ab79-fa3654f213dc	1	Other	Other
+a7c3bc20-135c-4885-a91b-d21634029145	1	Other	Other
+a7c3e5a0-e58b-44ca-81fb-e8fb0c2c9b81	1	Other	Other
+a7c462a4-a3da-47cf-8607-f3711b32e6b1	1	Other	Other
+a7c46a01-59ea-4f97-a10f-f9dde70989fa	1	Other	Other
+a7c4e3ce-1bdc-4958-8ffc-b674387a1871	1	Other	Other
+a7c51c18-f42d-4554-bffd-fc176bab87ba	1	Other	Other
+a7c52565-b938-43eb-bfec-ab9462e485a5	1	Other	Other
+a7c52b35-dcf0-4b8e-af72-c24721178e13	1	Other	Other
+a7c52ff3-b72c-4a80-8e42-bd26f5eb9084	1	Other	Other
+a7c550c9-4f51-43ae-bb21-3b2e593cd4f6	1	James	Other
diff --git a/mysql-test/std_data/ca-cert-verify-san.pem b/mysql-test/std_data/ca-cert-verify-san.pem
new file mode 100644
index 000000000000..04457ed20cf2
--- /dev/null
+++ b/mysql-test/std_data/ca-cert-verify-san.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoGgAwIBAgIJAO9Te7BEDh7eMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAklOMRIwEAYDVQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTgwNDExMTAyMzM0WhcNMjgwMjE4MTAyMzM0WjBjMQswCQYDVQQGEwJJTjESMBAG
+A1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCYW5nYWxvcmUxDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAzmDykfk/Wd1aGE3IjAZkgd/dAP8rWF3Lnw7F9Ufo
+pTJaPRW50F1ZjqKSf83jLHYseZrvoVB9SsKQx35cLOnYUO6qKfHdHlrJ3it6chk+
+1+xsPhygXWA6qKXn7QEJTL3xQybGvO6b2hyOOmkYCNOpV5W8kfLTpUR2RbeISu7f
+9pw7EJo0uJQdhs2pzzKDVKLh7Pn7cGZGD6ByjzyOSArvpXDieErp1XOJs9qZ3llt
+2xFncpZGyCrIYADUkbqZtoITj9DemdHHoEYJon55U/u2XDFS1hELeFRYI6p6dZtk
+mGX8+FOjv7fg0sdqPPZgC84abxnfHloKrpv3BlBuHCGyewIDAQABo1AwTjAdBgNV
+HQ4EFgQU7Q3134XYDQ00T4qITT5rvnXK0gAwHwYDVR0jBBgwFoAU7Q3134XYDQ00
+T4qITT5rvnXK0gAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAk2mi
+j0DKq5V8ac8MPk5giCnAfVtAcFHRgYl2bBHU7k/Onu4I4dIZTGV7LfMekM/NjgZ3
+c70/fZGD0aHPaDVV7OQu1+jZelJ/8YuXrOgFyJYnGPsksBhBXLgETmai2OW1xayv
+4D0RALZYye5HqbL2IaPdJhyuo/gF6hzuMGt1k8sDfvb014zbX2mwe10ns50+BCT0
+5V3NXHdMrVS5Z8uUzntu7G0jJxq3P6Mkb5dnOLirZP+8SAlC/mLaz+pEA5tLQldN
+Dx4AhaSr4PCUPy0QBh1Uo1NahCEcdrrQ46DIQES1kxjOTAa1KItmYkkcod8TCB37
+H6uaikrzrywKXoba+Q==
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/client-cert-verify-san.pem b/mysql-test/std_data/client-cert-verify-san.pem
new file mode 100644
index 000000000000..d8e0d55eb438
--- /dev/null
+++ b/mysql-test/std_data/client-cert-verify-san.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDPjCCAiYCAQEwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCSU4xEjAQBgNV
+BAgMCUthcm5hdGFrYTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMQswCQYDVQQDDAJDQTAeFw0xODA0MTExMDI3MDha
+Fw0yODAyMTgxMDI3MDhaMGcxCzAJBgNVBAYTAklOMRIwEAYDVQQIDAlLYXJuYXRh
+a2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEPMA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQL
+DAVNeVNRTDEPMA0GA1UEAwwGQ2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAv+FDomsx3sLX/yFM+g94YvbiO50jqf7fOC1gnzT2dsgcMxCtjlm+
+RdKpJDHaSfQ8hc76dp8hWwsahNtY2fSHvv61l6dO5NRZTn26eLpM1pDbVWz17wp0
+1zYICWtIEMrA7mxGPH+Lwy8YiSWa9/pmv0gk9BB1d6o5mBo/c0jA/n1iYujPiRHy
+6QTjZuWqZZwYK4pXF9jGuw0xwFMVjN+6/BMkoz/Pa46PpcQ/t2sblZympqN2n86Q
+cSlDlPu/sx0Y2PxHL0lkzxw1HDycLAX5cM7vg1AOpeq/3y55pmGPIZh3kOBcQVvF
+GjkMs2I3O8N3ztwb0iE/iLk0mcWHKVCFyQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQA64dUgzwuBeugtTGD22YYsnZD6h1bZXxFdkUU06GJ9kqojJmUS5KEsY+42mmDG
+JRDovhGNr6wazwDNUUhnDqLtGTarb+E3G/0X+J38CcGgicMML0Atof5/yk6SSHa5
+K27QMfX4VtCwefB7H/g/0/cDpoaEaeZ1pCdkyEk1fsX3dQEx7RS+fPcNmH233Xxu
+No604ChGlV3Ik0VXZVjss1lwDt7D6o90O4GpIY9ngnUWMAy2JZYqMZo1Od5WBs8L
+QBT8TYePJy/jcQVf+cB1DnJIDil7Pqa+owkM+DEVLsXjVdXgT9TcTC6uxteEKKY9
+PPBRX1wsgtb2b/I4ZehqH81g
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/client-key-verify-san.pem b/mysql-test/std_data/client-key-verify-san.pem
new file mode 100644
index 000000000000..fdffdaba2d62
--- /dev/null
+++ b/mysql-test/std_data/client-key-verify-san.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAv+FDomsx3sLX/yFM+g94YvbiO50jqf7fOC1gnzT2dsgcMxCt
+jlm+RdKpJDHaSfQ8hc76dp8hWwsahNtY2fSHvv61l6dO5NRZTn26eLpM1pDbVWz1
+7wp01zYICWtIEMrA7mxGPH+Lwy8YiSWa9/pmv0gk9BB1d6o5mBo/c0jA/n1iYujP
+iRHy6QTjZuWqZZwYK4pXF9jGuw0xwFMVjN+6/BMkoz/Pa46PpcQ/t2sblZympqN2
+n86QcSlDlPu/sx0Y2PxHL0lkzxw1HDycLAX5cM7vg1AOpeq/3y55pmGPIZh3kOBc
+QVvFGjkMs2I3O8N3ztwb0iE/iLk0mcWHKVCFyQIDAQABAoIBAD116jQcId04i/cs
+s3tleSo56j0uGD5bZSSZZFmanVduwZmZvf3awRecYpE1ZrZJhRlXMuLMFeMTq2ri
+15L4wIJtE71/2cVyPyjlHNWO1w3jWF4EiMIIl2RX6jsaIfs+9o1oIRc/w4TBkRpc
+8UZ87mxWr399xiKOY+RUg/5pT2g0Mxj/ZstseJy9Z69jnV2Oa/2nXhiCBxn8b89m
+lunkePcBvqjoLtZPXr0S/zQlsaUAdR0KKl+5TRD/V8rjKtW7P7VCStpdEaqa8fic
+b2uCW24jsGvmwmbtrTINYQ959M6m3/Dwxl4t8QpR9rUc+WC4I0F/KvXLgINuGCxd
+0DhnSAECgYEA6pXytFGOONQF7NbqxsFWoHW+lBaGWvIJoAGwvNbqmu+rbI7wqx1z
+biWPAn6vc2nFvNnOk+jhMH/guxXlmjE9ZlmnucV2KoaPGy4uGo6NC+kOKhuSjvGG
+GCPeMK5EFUzy9fMZcIBgVsq7Jm1kdN48+CecPRQ4Tf4rpwBDO1xYOHMCgYEA0WVS
+NNdHlIGbAbk1RTA5pNTHhVkgFZcFAsViqOZnborooCUBlX6EoVlbh0fkj9h/Lh+S
+dCeptOPdG+JFGeL4aVIJn8uuAf6kKty10rBgpeoa71yH3Gpw5cil59Y5hW7Yc0bw
+ZIwNMk6st1ua2c7fbP/OKD4GuGIt/zppXLNRRdMCgYBzrFTtTXnP09zIGIHUV+mb
+XfQHmcPOfKL6X1sDAwbUN3JUKXfLKM6Odb67ADULuBBlOxF+JctE2wm5tuZszfL0
+0Si/lfrapVdTk8XwGnK6eMUfRlFSYw44QReC8atoxXTYinL04pies4DtRevPJPbz
+drS3+Yx6COcFhj+gubxWuQKBgQCRc+RKuFAMpIrcA58xVHJ2QSfnRSW4WZMtfZcu
+4/1tGCjHNW2IPr46piuiKRpnoWeWzm+ZKAQGl1H8EI0XkkYkQsxUp9NTp2K6M15J
+4CMCnT/gjVIClh2eQGaeSHzkZz8LtHdAINj53RS0uXkzWzRwLrEx2wQoCGsTI6wU
+rKsD6QKBgBktQAc7Q+1RC94tLjteK3KYE9POvd9Q0OrCrORgiyybYnk4zfXvbafa
+cPFYZwmhsN8L3KyOm5S0SsWP+vPbm6qmoryuz/MtDwCJozgtoz7fNGxcWbILF/1S
+UQDuGs1mG14od7IKu/RqLpUK5vYTOObm+9TH4zsO7qDBaG1HNMY+
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crl-ca-cert.pem b/mysql-test/std_data/crl-ca-cert.pem
index e155007ae5c2..93c96eae0269 100644
--- a/mysql-test/std_data/crl-ca-cert.pem
+++ b/mysql-test/std_data/crl-ca-cert.pem
@@ -2,62 +2,80 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            f9:e2:f3:98:0e:2b:05:7c
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+            bf:07:54:de:af:cf:c4:de
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test ca certificate
         Validity
-            Not Before: May 17 15:08:00 2012 GMT
-            Not After : May 10 15:08:00 2042 GMT
-        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+            Not Before: Jul  1 07:44:35 2020 GMT
+            Not After : Jun 29 07:44:35 2030 GMT
+        Subject: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test ca certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:ed:ec:45:e0:22:d7:d0:d5:91:87:74:5f:ee:17:
-                    b5:c7:07:c2:4b:b3:e7:13:93:46:95:1f:5d:09:54:
-                    14:98:40:3d:0e:e6:14:5c:5e:39:c5:75:87:4e:73:
-                    24:62:d9:85:4a:69:c4:35:7d:6b:76:6c:1c:8e:56:
-                    a8:fe:9e:fe:22:ae:c9:41:14:67:d4:11:37:8d:d3:
-                    18:02:9d:8a:36:64:b1:8b:2f:a0:ba:2d:d5:fd:c0:
-                    cd:6a:7d:a5:c0:6b:6b:60:64:2f:24:45:bb:a8:ad:
-                    1c:95:a0:d5:40:79:28:5f:b1:17:97:63:a1:d5:1e:
-                    42:d4:10:70:5d:8f:2e:34:45
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c9:08:13:81:df:5a:aa:45:2a:82:1e:73:4f:d6:
+                    2f:6b:7a:78:41:a7:fb:ea:02:5c:30:15:95:6a:a4:
+                    60:6b:08:4c:7d:46:4f:1a:7c:14:67:c6:19:e0:bf:
+                    c9:12:c3:96:7f:71:12:79:ba:a1:d2:51:1b:fb:f1:
+                    0f:43:9d:22:6d:7f:46:a7:94:0c:51:c2:25:ad:36:
+                    c8:1c:59:45:91:e1:20:4d:5e:31:b1:33:b1:4b:2b:
+                    a0:62:fb:8a:c6:ee:7e:84:77:d2:aa:23:f8:31:74:
+                    d5:94:60:72:88:a7:3a:ec:f3:d8:80:28:36:c1:5a:
+                    7f:58:be:8c:d2:eb:9d:fb:22:de:ec:2c:d3:41:81:
+                    b2:e4:91:e4:da:12:b2:84:0e:8f:f7:b0:1e:36:07:
+                    88:87:8e:1d:63:ad:1b:a5:31:39:d2:02:10:e0:97:
+                    21:3f:7e:e9:f1:a2:e8:c3:aa:ad:e3:bd:05:62:e1:
+                    a2:8d:ed:d5:cd:d7:66:8a:2b:15:dd:e1:91:e2:75:
+                    18:c4:50:62:fb:a1:f9:96:93:af:84:78:f7:69:b6:
+                    7f:82:f7:c8:97:13:10:46:7b:de:a2:a9:c9:71:78:
+                    f1:8e:a1:78:b5:e5:b7:dd:69:4d:8c:1b:ae:34:0e:
+                    5f:94:26:8e:81:b3:23:6e:1f:be:de:e0:e0:41:dc:
+                    71:49
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
+                43:AB:3F:4D:D3:EB:37:3D:3D:2A:FE:BD:4E:C2:8A:DD:C9:E5:B1:B1
             X509v3 Authority Key Identifier: 
-                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
-                DirName:/C=BG/ST=Plovdiv/O=Oracle/OU=MySQL/CN=MySQL CRL test CA certificate
-                serial:F9:E2:F3:98:0E:2B:05:7C
+                keyid:43:AB:3F:4D:D3:EB:37:3D:3D:2A:FE:BD:4E:C2:8A:DD:C9:E5:B1:B1
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-        90:f7:9b:56:14:df:c4:db:46:a4:67:f5:83:68:e9:70:45:4c:
-        5d:97:07:06:fd:2c:68:0b:9a:ed:6d:7a:d1:18:be:b8:dd:08:
-        bc:ff:10:5b:d9:b2:50:1f:98:b0:5d:be:6d:0b:88:bb:30:93:
-        fa:04:34:f1:3b:f6:56:d5:86:bb:1c:31:f3:7f:7b:38:0b:d1:
-        f9:fd:87:b5:c4:63:a0:b8:46:59:95:a8:b5:ec:4f:d0:ad:df:
-        42:ed:74:4f:2f:fd:7c:65:aa:d7:60:d1:70:55:41:8b:0b:c2:
-        3b:f1:f3:2f:6b:a5:d9:48:b1:2d:84:e9:07:63:92:f0:36:04:
-        cf:5d
+    Signature Algorithm: sha256WithRSAEncryption
+         16:b8:f3:2a:4a:f7:82:7b:99:cb:40:20:a1:76:7a:2b:19:c9:
+         4f:4f:90:b3:e4:7c:6e:42:28:c8:47:4b:37:12:ab:fa:64:ec:
+         d6:50:f8:2f:bd:61:cd:d6:09:96:d3:84:b1:e6:60:ae:99:ae:
+         4a:1a:b1:34:a6:ee:b7:3b:1f:6f:cc:94:39:26:e4:9d:d2:02:
+         d9:75:ce:e7:dd:e9:3a:b2:c4:84:1a:75:0e:64:ce:32:7f:68:
+         5b:81:b7:5e:18:bd:ac:56:69:1c:1a:a0:a1:61:85:f2:11:78:
+         50:42:4e:e8:b8:67:8a:50:85:09:75:67:d9:09:e1:2a:61:64:
+         24:1a:52:79:12:5c:d1:a5:53:5f:70:63:2b:30:fe:4e:e5:c6:
+         3a:7c:f3:36:3e:7b:ab:6b:57:04:12:53:7e:dd:18:63:bf:25:
+         ae:b0:14:f8:93:bb:0a:a6:d4:7b:77:60:58:52:ee:9e:76:9c:
+         63:ef:84:40:fd:5a:be:54:74:d7:b8:4a:85:09:a0:13:0e:75:
+         75:e6:2c:73:1b:e3:94:ff:ad:73:0b:c6:e3:b0:68:56:ce:ff:
+         8d:75:f4:9d:14:5c:05:a0:8d:ad:ab:96:aa:4f:58:cb:79:cf:
+         5b:85:84:e7:4a:66:54:09:fd:da:c2:3a:3b:ee:3c:3c:0a:66:
+         36:bc:a6:f0
 -----BEGIN CERTIFICATE-----
-MIIDHDCCAoWgAwIBAgIJAPni85gOKwV8MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
-BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMjA1MTcxNTA4MDBaFw00MjA1MTAxNTA4MDBaMGgxCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
-U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0ZTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7exF4CLX0NWRh3Rf7he1xwfCS7PnE5NG
-lR9dCVQUmEA9DuYUXF45xXWHTnMkYtmFSmnENX1rdmwcjlao/p7+Iq7JQRRn1BE3
-jdMYAp2KNmSxiy+gui3V/cDNan2lwGtrYGQvJEW7qK0claDVQHkoX7EXl2Oh1R5C
-1BBwXY8uNEUCAwEAAaOBzTCByjAdBgNVHQ4EFgQUhavmp1eIfY2+62RTc5RkzUuN
-KRIwgZoGA1UdIwSBkjCBj4AUhavmp1eIfY2+62RTc5RkzUuNKRKhbKRqMGgxCzAJ
-BgNVBAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAM
-BgNVBAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZp
-Y2F0ZYIJAPni85gOKwV8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA
-kPebVhTfxNtGpGf1g2jpcEVMXZcHBv0saAua7W160Ri+uN0IvP8QW9myUB+YsF2+
-bQuIuzCT+gQ08Tv2VtWGuxwx8397OAvR+f2HtcRjoLhGWZWotexP0K3fQu10Ty/9
-fGWq12DRcFVBiwvCO/HzL2ul2UixLYTpB2OS8DYEz10=
+MIIDzzCCAregAwIBAgIJAL8HVN6vz8TeMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
+BAYTAklOMRIwEAYDVQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJlbmdhbHVydTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDEmMCQGA1UEAwwdTXlTUUwg
+Q1JMIHRlc3QgY2EgY2VydGlmaWNhdGUwHhcNMjAwNzAxMDc0NDM1WhcNMzAwNjI5
+MDc0NDM1WjB+MQswCQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYD
+VQQHDAlCZW5nYWx1cnUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwx
+JjAkBgNVBAMMHU15U1FMIENSTCB0ZXN0IGNhIGNlcnRpZmljYXRlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyQgTgd9aqkUqgh5zT9Yva3p4Qaf76gJc
+MBWVaqRgawhMfUZPGnwUZ8YZ4L/JEsOWf3ESebqh0lEb+/EPQ50ibX9Gp5QMUcIl
+rTbIHFlFkeEgTV4xsTOxSyugYvuKxu5+hHfSqiP4MXTVlGByiKc67PPYgCg2wVp/
+WL6M0uud+yLe7CzTQYGy5JHk2hKyhA6P97AeNgeIh44dY60bpTE50gIQ4JchP37p
+8aLow6qt470FYuGije3VzddmiisV3eGR4nUYxFBi+6H5lpOvhHj3abZ/gvfIlxMQ
+RnveoqnJcXjxjqF4teW33WlNjBuuNA5flCaOgbMjbh++3uDgQdxxSQIDAQABo1Aw
+TjAdBgNVHQ4EFgQUQ6s/TdPrNz09Kv69TsKK3cnlsbEwHwYDVR0jBBgwFoAUQ6s/
+TdPrNz09Kv69TsKK3cnlsbEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AQEAFrjzKkr3gnuZy0AgoXZ6KxnJT0+Qs+R8bkIoyEdLNxKr+mTs1lD4L71hzdYJ
+ltOEseZgrpmuShqxNKbutzsfb8yUOSbkndIC2XXO593pOrLEhBp1DmTOMn9oW4G3
+Xhi9rFZpHBqgoWGF8hF4UEJO6LhnilCFCXVn2QnhKmFkJBpSeRJc0aVTX3BjKzD+
+TuXGOnzzNj57q2tXBBJTft0YY78lrrAU+JO7CqbUe3dgWFLunnacY++EQP1avlR0
+17hKhQmgEw51deYscxvjlP+tcwvG47BoVs7/jXX0nRRcBaCNrauWqk9Yy3nPW4WE
+50pmVAn92sI6O+48PApmNrym8A==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-certificate-readme.txt b/mysql-test/std_data/crl-certificate-readme.txt
index 72f9468ad478..7e398eed88f8 100644
--- a/mysql-test/std_data/crl-certificate-readme.txt
+++ b/mysql-test/std_data/crl-certificate-readme.txt
@@ -1,31 +1,100 @@
 These are the instructions on how to generate test files for the CRL tests
 using openSSL.
 
+If you have root access on the system
+=====================================
+
 1. Make sure you have the right validity periods in CA.pl and openssl.cnf
 2. Create a new certification authority : CA.pl -newca
 3. Copy demoCA/cacert.pem to crl-ca-cert.pem
 4. Create one server certificate request : CA.pl -newreq
-5. Sign the server certificate request : CA.pl -signreq
+5. Sign the server certificate request : CA.pl -signCA
 6. Copy demoCA/newcert.pem to crl-server-cert.pem
 7. Remove the key from server's certificate key while copying it :
      openssl rsa -in newkey.pem -out crl-server-key.pem
 8. Create one client certificate request : CA.pl -newreq
-9. Sign the client certificate request : CA.pl -signreq
+9. Sign the client certificate request : CA.pl -signCA
 10. Copy demoCA/newcert.pem to crl-client-cert.pem
 11. Remove the key from client's certificate key while copying it :
      openssl rsa -in newkey.pem -out crl-client-key.pem
 12. Create one to-be-revoked client certificate request : CA.pl -newreq
-13. Sign the to-be-revoked client certificate request : CA.pl -signreq
-14. Copy demoCA/newcert.pem to crl-client-invalid-cert.pem
+13. Sign the to-be-revoked client certificate request : CA.pl -signCA
+14. Copy demoCA/newcert.pem to crl-client-cert-revoked.pem
 15. Remove the key from the to-be-revoked client's certificate
   key while copying it :
-     openssl rsa -in newkey.pem -out crl-client-invalid-key.pem
+     openssl rsa -in newkey.pem -out crl-client-key-revoked.pem
 16. Revoke the crl-client-invalid-cert.pem :
-     openssl ca -revoke crl-client-invalid-key.pem
+     openssl ca -revoke crl-client-invalid-cert.pem
 17. Generate a CRL file :
      openssl ca -gencrl -crldays=3650 -out crl-client-revoked.crl
 18. Clean up all the files in the crldir directory
-19. Copy the CA certificate into it :
-     cp crl-ca-cert.pem `openssl -in crl-ca-cert.pem -noout -hash`.0
-20. Copy the CRL file into it :
-     cp crl-client-revoked.crl `openssl -in crl-ca-cert.pem -noout -hash`.r0
+19. Copy the CRL file into it :
+     cp crl-client-revoked.crl `openssl crl -in crl-client-revoked.crl -noout -hash`.r0
+
+
+If you are using your own CA
+============================
+
+Prepare directory
+-----------------
+
+1. mkdir new_crlcerts && cd new_crlcerts
+2. mkdir crldir
+3. mkdir private
+
+Generate CA and 3 set of certificates
+-------------------------------------
+
+4. Generate CA
+openssl genrsa 2048 > crl-ca-key.pem
+openssl req -new -x509 -nodes -days 3650 -key crl-ca-key.pem -out crl-ca-cert.pem
+
+5. Generate Server certificate
+openssl req -newkey rsa:2048 -days 3600 -nodes -keyout crl-server-key.pem -out crl-server-req.pem
+openssl rsa -in crl-server-key.pem -out crl-server-key.pem
+openssl x509 -req -in crl-server-req.pem -days 3600 -CA crl-ca-cert.pem -CAkey crl-ca-key.pem -set_serial 01 -out crl-server-cert.pem
+
+6. Generate Client certificate
+openssl req -newkey rsa:2048 -days 3600 -nodes -keyout crl-client-key.pem -out crl-client-req.pem
+openssl rsa -in crl-client-key.pem -out crl-client-key.pem
+openssl x509 -req -in crl-client-req.pem -days 3600 -CA crl-ca-cert.pem -CAkey crl-ca-key.pem -set_serial 02 -out crl-client-cert.pem
+
+7. Generate Client certificate that will be revoked later
+openssl req -newkey rsa:2048 -days 3600 -nodes -keyout crl-client-revoked-key.pem -out crl-client-revoked-req.pem
+openssl rsa -in crl-client-revoked-key.pem -out crl-client-revoked-key.pem
+openssl x509 -req -in crl-client-revoked-req.pem -days 3600 -CA crl-ca-cert.pem -CAkey crl-ca-key.pem -set_serial 03 -out crl-client-revoked-cert.pem
+
+Prepare for certificate revocation
+----------------------------------
+
+8. cp crl-ca-cert.pem cacert.pem
+9. cp crl-ca-key.pem private/cakey.pem
+10. touch index.txt
+11. echo 1000 > crlnumber
+12. copy global openssl.cnf to current working dirctory
+13. Open local copy of openssl.cnf and in [CA_default] section
+    - Update dir to point to current working directory
+    - Update certs to point to $dir and not $dir/certs
+
+Revoke a certificate and create crl file
+----------------------------------------
+
+14. openssl ca -config openssl.cnf -revoke crl-client-revoked-cert.pem
+15. openssl ca -config openssl.cnf -gencrl -crldays 3600 -out crl-client-revoked.crl
+16. cp crl-client-revoked.crl `openssl crl -in crl-client-revoked.pem -noout -hash`.r0
+
+Replace existing certs
+----------------------
+17. Replace following files in <src>/mysql-test/std_data/ with files generated above
+    crl-ca-cert.pem
+    crl-client-cert.pem
+    crl-client-key.pem
+    crl-client-revoked-cert.pem
+    crl-client-revoked-key.pem
+    crl-client-revoked.crl
+    crl-server-cert.pem
+    crl-server-key.pem
+
+18. Remove file in <src>/mysql-test/std_data/crldir
+19. Copy file generated in step 16 above to <src>/mysql-test/std_data/crldir
+20. You may now remove new_crls directory
diff --git a/mysql-test/std_data/crl-client-cert.pem b/mysql-test/std_data/crl-client-cert.pem
index b12718535435..a0017c2441f0 100644
--- a/mysql-test/std_data/crl-client-cert.pem
+++ b/mysql-test/std_data/crl-client-cert.pem
@@ -1,62 +1,70 @@
 Certificate:
     Data:
-        Version: 3 (0x2)
-        Serial Number:
-            f9:e2:f3:98:0e:2b:05:7e
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Version: 1 (0x0)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test ca certificate
         Validity
-            Not Before: May 17 15:18:14 2012 GMT
-            Not After : May 15 15:18:14 2022 GMT
-        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate
+            Not Before: Jul  1 07:51:35 2020 GMT
+            Not After : May 10 07:51:35 2030 GMT
+        Subject: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:d8:03:97:99:2f:54:86:ec:b5:79:4f:8f:ff:bb:
-                    b8:23:e0:9b:d3:d4:ba:40:2e:34:dd:ad:8c:2c:43:
-                    f9:7b:d5:4f:5c:ef:47:bd:e3:b2:ac:76:ea:b2:d5:
-                    97:dc:99:4e:fa:d8:13:48:a2:cb:ee:3f:40:7a:fe:
-                    af:f1:d8:cd:c8:5b:1f:f7:7c:a4:7f:cf:fe:02:91:
-                    e6:d8:39:ef:e8:4f:a8:ff:b6:78:29:78:72:24:a4:
-                    f0:e4:67:8a:41:50:5e:9d:6b:a8:4f:06:f2:b4:8e:
-                    22:f9:05:e6:31:03:f9:1b:a8:29:16:6d:7c:5d:bd:
-                    60:81:ac:6e:9c:63:5b:a4:41
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:ab:7f:02:81:a3:ce:01:93:02:67:2a:56:e3:51:
+                    5a:1d:a0:57:e8:4f:bb:2f:27:4d:13:9e:18:8e:b0:
+                    ec:47:a9:9c:cc:ce:24:be:64:c2:86:3f:91:63:d3:
+                    23:22:d9:10:e4:44:d5:2e:b9:09:06:e4:8f:0f:91:
+                    90:18:a6:f6:bb:de:4c:63:13:2a:59:41:fb:42:c4:
+                    05:ce:1a:f2:9e:dd:d5:50:00:55:28:7a:56:63:a9:
+                    e0:81:f1:ef:03:61:97:00:88:39:85:a5:9e:08:11:
+                    fc:76:5a:59:23:79:d8:45:d2:d3:94:19:78:8a:ca:
+                    44:f2:dd:08:df:65:15:0d:d3:b7:df:f5:2c:6c:bb:
+                    86:fb:0e:1a:19:be:ee:8a:af:1f:3d:30:6e:4f:42:
+                    3d:ca:80:39:d5:05:2d:74:5a:6b:0a:0c:49:7c:8b:
+                    95:50:37:46:0e:90:3a:e4:36:58:73:6c:49:69:b0:
+                    76:ca:c4:aa:70:48:b2:1f:2a:86:8a:ae:a7:e0:9a:
+                    b3:af:5f:7a:67:6a:1a:f3:e8:2e:57:1e:f2:ac:96:
+                    a2:ae:39:f3:7f:e3:7f:e3:b4:0f:e1:d3:e3:95:c6:
+                    04:2a:5e:ca:7e:79:52:a5:49:be:95:66:72:80:d4:
+                    2b:7f:cc:b9:aa:1a:24:27:27:6f:3d:b9:d7:5a:fd:
+                    48:23
                 Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                7A:9B:4D:5A:CD:9A:CB:14:B2:A5:D3:B0:89:24:6E:BC:8E:1E:99:1D
-            X509v3 Authority Key Identifier: 
-                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
-
-    Signature Algorithm: sha1WithRSAEncryption
-        ba:04:f4:20:39:e3:94:2b:5b:a4:18:2b:8a:0b:12:bd:58:7d:
-        0b:0c:cd:ab:b2:7c:7a:57:2f:8b:31:06:ce:6d:26:7c:50:5c:
-        74:fd:3c:21:8c:20:04:ef:55:e9:2a:fe:f5:35:2d:86:d0:1c:
-        9f:05:96:91:9e:2f:74:a7:50:db:55:dd:ba:ff:8a:9b:ce:50:
-        03:5d:e1:10:5b:a3:4b:d5:46:73:6f:52:e8:e5:0c:b6:23:7a:
-        22:1e:30:86:9f:34:d2:3e:66:2c:dc:b6:96:0d:ee:21:59:5c:
-        17:50:23:a5:9a:2d:37:d8:ef:85:23:c0:e8:84:14:df:95:35:
-        1a:18
+    Signature Algorithm: sha256WithRSAEncryption
+         9d:4f:df:b6:eb:02:57:d5:e0:bb:f4:31:5c:2d:0e:ac:51:ce:
+         8c:5e:97:58:a8:79:cf:67:be:5c:00:7d:e5:aa:de:5e:8c:61:
+         18:39:2d:4e:e3:62:9f:ba:fc:e3:dc:94:6c:1f:40:0c:e4:98:
+         26:ac:06:45:8f:dc:73:c8:75:0e:12:b3:46:3c:71:2d:c7:d0:
+         fd:07:71:77:68:f9:55:2d:56:66:8b:27:77:c3:af:87:ee:ba:
+         21:8a:85:5e:82:93:69:e7:d9:30:3f:53:06:d5:c1:cd:0f:2f:
+         be:f8:5b:07:9c:e2:08:d1:ec:a3:a8:e1:c4:49:e7:6a:1d:37:
+         b4:41:85:a1:11:43:cd:14:7d:a9:b7:d8:32:ae:75:d1:14:6e:
+         99:cf:52:1c:7c:50:5d:57:09:1f:7c:e6:4a:70:60:cc:49:10:
+         7a:66:37:2e:a7:ee:5d:11:ed:d7:61:5c:c3:ed:dc:c2:9a:d9:
+         c4:92:54:95:67:04:81:ba:8d:ba:a7:c4:81:7a:63:63:52:28:
+         5b:35:01:4e:3b:1e:34:55:d8:62:bc:79:db:c8:7a:6f:e7:0a:
+         65:83:95:5d:bd:21:38:02:a0:24:d5:e5:5c:17:64:39:23:0d:
+         27:62:d3:7f:c5:3b:52:26:ac:f2:13:f5:8a:53:09:d0:52:26:
+         69:09:c4:e2
 -----BEGIN CERTIFICATE-----
-MIICzTCCAjagAwIBAgIJAPni85gOKwV+MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
-BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMjA1MTcxNTE4MTRaFw0yMjA1MTUxNTE4MTRaMGwxCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
-U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBjbGllbnQgY2VydGlmaWNhdGUw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANgDl5kvVIbstXlPj/+7uCPgm9PU
-ukAuNN2tjCxD+XvVT1zvR73jsqx26rLVl9yZTvrYE0iiy+4/QHr+r/HYzchbH/d8
-pH/P/gKR5tg57+hPqP+2eCl4ciSk8ORnikFQXp1rqE8G8rSOIvkF5jED+RuoKRZt
-fF29YIGsbpxjW6RBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR6m01azZrL
-FLKl07CJJG68jh6ZHTAfBgNVHSMEGDAWgBSFq+anV4h9jb7rZFNzlGTNS40pEjAN
-BgkqhkiG9w0BAQUFAAOBgQC6BPQgOeOUK1ukGCuKCxK9WH0LDM2rsnx6Vy+LMQbO
-bSZ8UFx0/TwhjCAE71XpKv71NS2G0ByfBZaRni90p1DbVd26/4qbzlADXeEQW6NL
-1UZzb1Lo5Qy2I3oiHjCGnzTSPmYs3LaWDe4hWVwXUCOlmi032O+FI8DohBTflTUa
-GA==
+MIIDdTCCAl0CAQIwDQYJKoZIhvcNAQELBQAwfjELMAkGA1UEBhMCSU4xEjAQBgNV
+BAgMCUthcm5hdGFrYTESMBAGA1UEBwwJQmVuZ2FsdXJ1MQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMSYwJAYDVQQDDB1NeVNRTCBDUkwgdGVzdCBjYSBj
+ZXJ0aWZpY2F0ZTAeFw0yMDA3MDEwNzUxMzVaFw0zMDA1MTAwNzUxMzVaMIGCMQsw
+CQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCZW5nYWx1
+cnUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxKjAoBgNVBAMMIU15
+U1FMIENSTCB0ZXN0IGNsaWVudCBjZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKt/AoGjzgGTAmcqVuNRWh2gV+hPuy8nTROeGI6w7Eep
+nMzOJL5kwoY/kWPTIyLZEORE1S65CQbkjw+RkBim9rveTGMTKllB+0LEBc4a8p7d
+1VAAVSh6VmOp4IHx7wNhlwCIOYWlnggR/HZaWSN52EXS05QZeIrKRPLdCN9lFQ3T
+t9/1LGy7hvsOGhm+7oqvHz0wbk9CPcqAOdUFLXRaawoMSXyLlVA3Rg6QOuQ2WHNs
+SWmwdsrEqnBIsh8qhoqup+Cas69femdqGvPoLlce8qyWoq4583/jf+O0D+HT45XG
+BCpeyn55UqVJvpVmcoDUK3/MuaoaJCcnbz2511r9SCMCAwEAATANBgkqhkiG9w0B
+AQsFAAOCAQEAnU/ftusCV9Xgu/QxXC0OrFHOjF6XWKh5z2e+XAB95areXoxhGDkt
+TuNin7r849yUbB9ADOSYJqwGRY/cc8h1DhKzRjxxLcfQ/Qdxd2j5VS1WZosnd8Ov
+h+66IYqFXoKTaefZMD9TBtXBzQ8vvvhbB5ziCNHso6jhxEnnah03tEGFoRFDzRR9
+qbfYMq510RRumc9SHHxQXVcJH3zmSnBgzEkQemY3LqfuXRHt12Fcw+3cwprZxJJU
+lWcEgbqNuqfEgXpjY1IoWzUBTjseNFXYYrx528h6b+cKZYOVXb0hOAKgJNXlXBdk
+OSMNJ2LTf8U7Uias8hP1ilMJ0FImaQnE4g==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-client-key.pem b/mysql-test/std_data/crl-client-key.pem
index f6bea6e07880..8a361d9ca773 100644
--- a/mysql-test/std_data/crl-client-key.pem
+++ b/mysql-test/std_data/crl-client-key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDYA5eZL1SG7LV5T4//u7gj4JvT1LpALjTdrYwsQ/l71U9c70e9
-47Ksduqy1ZfcmU762BNIosvuP0B6/q/x2M3IWx/3fKR/z/4CkebYOe/oT6j/tngp
-eHIkpPDkZ4pBUF6da6hPBvK0jiL5BeYxA/kbqCkWbXxdvWCBrG6cY1ukQQIDAQAB
-AoGBAL2RAXQcFhjGGEfaa6toaKOLlBSk5cI3CovTpmSeTo2+14PeNN5OuVkijrrc
-OQYNwELgZqPiwgZVmdeWNH+P3J2vo+QqfxskondSDM2ZDedvO8tc4W74oSQzsASr
-37ptEJlAdumzQ1XPxGwZi6E2KPzmTBQ4Q0j50UB2vagbR2cxAkEA7C3dVMyNYLew
-ycujuU7F4SQcYFY5/BMj6yanovBF80FRT2X+mxj3lSZux/tjZFvxeb9Q5vmJJRp6
-PUP/ROQVVQJBAOokfqS6jrvvNvqYZnMb54iDTP7Jx+EJyBJxYtJM53WC3NXarCQq
-EWyVD1KxJxxW1gfcmJbhVQYeUsictO24Uz0CQGEtxgJcYFfJfW6q4eUfqoAm8Z4a
-HKXB4mehchyzLLUYzTIUT5zVuxmdxLt4jr7+re9gbxN63ZlsuZt33RMlnjkCQGbF
-igkIEeqPv1QTXLSdxOz4pO0Y6HDweC8QMc4ZD2dW/1Om3fQpuugsLUOgmogn3V4q
-B5gCY+2BldiUYB4P0AkCQQDDkyhWJQvtXSLGFkfUBZ6PCzVfO+Pkb7tISQuDGT4J
-HY+UpnQBbe6WP2hGXzwaGw9rVYaA9IcvX8pOpWsCDk80
+MIIEogIBAAKCAQEAq38CgaPOAZMCZypW41FaHaBX6E+7LydNE54YjrDsR6mczM4k
+vmTChj+RY9MjItkQ5ETVLrkJBuSPD5GQGKb2u95MYxMqWUH7QsQFzhrynt3VUABV
+KHpWY6nggfHvA2GXAIg5haWeCBH8dlpZI3nYRdLTlBl4ispE8t0I32UVDdO33/Us
+bLuG+w4aGb7uiq8fPTBuT0I9yoA51QUtdFprCgxJfIuVUDdGDpA65DZYc2xJabB2
+ysSqcEiyHyqGiq6n4Jqzr196Z2oa8+guVx7yrJairjnzf+N/47QP4dPjlcYEKl7K
+fnlSpUm+lWZygNQrf8y5qhokJydvPbnXWv1IIwIDAQABAoIBADdU9mEPkdMONJNG
+pNwZDmNKrbJFr1ZKbuLqem/ng4Sno/CsfkxzxBN+hRFZORfwQzPzRXkauF/h9IqI
+Y56gmDELS0gYEezUjhX/mwPhy/AYENAMG23A8wia8dXbUkub/BVu3mhRhEiETRl+
+kw4QLQhyOlOpWCwnkNFvIYK6YW2hHye1utu7L+Hy2zyi9g6ZKyZRl8W/OrFT2ka0
+5zAOb1ttYLUdzK+ErF29GrT2X7PCL//QCNHQW2q03QWSRA7w+MbfytkJRLsCl8fg
+V1uVjP/RumuS6fLxQkytbaioukmfzO+4J0Z+JWpF2IqzixrdxlgPvMIAUDHEOVdv
+JlXuI4kCgYEA4xs75iLM+YDxHyygfyJZGI7iqwfkXbRDcKp/MECa7KcvJs0l8Eeu
+lB0jSM/uy9o92vTXLb5bi45vBiCjImAuZQL08elQZuR5JiPJZqF/b3BXsLUcPIbI
+oxO3hLdigyt9wuuk3XvhrYJkLJZ6z8lBR6Qfvre8kApqLjnlH2QGUR0CgYEAwVCS
+Wy4AL1goFHc+b/hFou0nWLjVFiMpNroDEQigvLnnRG7irMDxDsxAcotl6tYzjjys
+JKtMmBJDJnlsHnO8NK2sUn1CQTxdxoXOhVD0mtbaowU+PVZDzhp1j1dzmtzovKTo
+Qkh+DV8Z4ulbaJ+ROpgCZYCoJ5K3PEwjrrbN+j8CgYA5BZKBkwVSNBzWjfbyVOZ3
+8xBYjw+4s1UnibeLnv0HJGcDYAkBjo335GUCmCrGBlL3kfghJSWJIccgi7tKG0oq
+1JY50zH706vTdrLP0QbVLSjnVmHzlIf14jJ24TCb7KST92Sas8sTLKUISPQnDcoV
+OdE6qplutR654pFz00J+xQKBgGDM6MyxpzQN79v3rhNBfhVMrcQ2obU5HB0kXf68
+lEiMyqqw397jqpHfY3I4LWu/oQdbiFPAV1Va57cvXB2PlLHIOZ8AzBmAkfCj9js5
+w5J5fffd20G5nbBp/W4uu1vTvNMhvI/cXwpxEbRXaAdmx8FQdvq+xvUx+YE/GysU
+rOXfAoGAQ4G+nrbKq76GEKfMzGnAHunSbdYlHOY/sHJ2Z0M/5eHIcvOEBJKGXl3m
+xe6WR/wavanNwMQ4aqpRv09yufdnoVsJcWpThDDBDIlstHUvO1mnk8B7OqHL2GIy
+lbo/QtpHT/46igRZUtBZFyZu4hb5EwBIpKNm1X/MyFYU7XMrvpQ=
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crl-client-revoked-cert.pem b/mysql-test/std_data/crl-client-revoked-cert.pem
index 180dec92a9c0..d48e20e0d9e0 100644
--- a/mysql-test/std_data/crl-client-revoked-cert.pem
+++ b/mysql-test/std_data/crl-client-revoked-cert.pem
@@ -1,62 +1,70 @@
 Certificate:
     Data:
-        Version: 3 (0x2)
-        Serial Number:
-            f9:e2:f3:98:0e:2b:05:7f
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Version: 1 (0x0)
+        Serial Number: 3 (0x3)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test ca certificate
         Validity
-            Not Before: May 17 15:21:12 2012 GMT
-            Not After : May 15 15:21:12 2022 GMT
-        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate revoked
+            Not Before: Jul  1 07:52:41 2020 GMT
+            Not After : May 10 07:52:41 2030 GMT
+        Subject: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate revoked
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:a5:dd:99:d5:fd:3a:9c:06:f4:2e:1a:e0:52:1b:
-                    f6:24:ca:e8:07:41:38:a6:9c:5f:84:5a:07:43:9e:
-                    de:91:37:6d:40:44:cd:8e:48:a2:b8:c4:39:75:41:
-                    d6:aa:97:26:01:37:76:7b:02:45:18:78:e1:1e:56:
-                    5d:f8:5d:e0:cc:a4:c4:bd:0d:1b:40:6e:00:4e:e0:
-                    ba:06:61:9f:81:f2:29:ae:db:31:b2:8f:26:2e:32:
-                    c5:74:b2:09:5f:76:a8:4a:5e:b4:f1:44:59:7e:3d:
-                    2a:9c:aa:b0:71:a4:2e:70:3b:8c:f2:93:2f:87:c1:
-                    a6:87:e6:6b:7c:1f:a5:f5:6b
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c2:57:18:e7:94:ce:44:87:f3:45:8d:e1:c3:a8:
+                    a0:1f:9a:04:9a:67:de:4a:41:bc:5d:0f:31:07:9f:
+                    e3:d5:82:54:81:b9:dc:77:43:62:51:42:43:cd:8c:
+                    31:71:0f:5b:dd:e8:02:c5:f2:3a:be:e4:e9:64:99:
+                    df:e5:8f:34:fc:f9:2c:5b:1d:b1:93:8b:b7:c5:55:
+                    5e:10:f9:b5:1c:0b:9e:1a:65:3d:ab:2e:51:a5:fd:
+                    10:97:57:2d:98:6d:9a:82:0e:ae:25:21:cc:dc:26:
+                    01:16:34:8a:f4:67:30:2f:77:4b:56:7b:e4:ec:c2:
+                    cf:1e:ec:0d:0a:29:c1:49:2f:5e:6e:75:4f:d7:b4:
+                    d0:b2:73:09:9f:25:e0:a8:41:66:e0:78:d4:2b:f5:
+                    6e:3c:20:15:3e:75:d1:e3:cc:ee:47:b8:2a:fe:46:
+                    f4:bc:01:7a:9f:67:48:12:bc:a1:b9:e1:b7:31:4a:
+                    2f:6a:ed:d1:33:7a:26:ab:01:88:05:70:48:8b:87:
+                    41:4b:44:78:67:7b:e7:37:8c:b7:41:c0:6a:eb:37:
+                    3b:de:a9:91:16:75:f9:14:81:eb:b4:60:db:a0:2e:
+                    93:8a:61:91:33:ee:12:2f:85:2c:12:96:30:f1:f5:
+                    00:42:16:95:a7:e9:06:30:32:b9:a3:fe:19:1d:fb:
+                    28:ff
                 Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                20:75:FB:E7:F0:11:4F:64:48:C6:F9:85:7C:1E:3A:C7:F0:16:8F:51
-            X509v3 Authority Key Identifier: 
-                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
-
-    Signature Algorithm: sha1WithRSAEncryption
-        d9:23:63:c2:da:d4:4a:53:85:c2:87:ab:e5:a4:7b:ea:cb:8a:
-        0e:6e:6c:ef:a7:a3:e2:ff:29:9e:af:d0:24:08:40:44:0e:0c:
-        91:5c:5e:38:25:c9:1b:c5:55:b1:17:01:12:57:60:5b:78:f5:
-        e3:3c:47:e0:df:10:11:38:f6:18:ce:37:5f:ec:c6:a9:95:39:
-        db:36:5d:78:12:9a:57:f8:bc:4d:cd:e5:e9:77:85:71:72:d1:
-        66:99:0c:35:51:8a:3d:61:cf:0f:21:5e:e1:cb:4b:33:f7:68:
-        8c:d2:fc:ca:a5:44:a7:d6:d3:76:9a:60:fb:0b:17:97:ee:3a:
-        23:22
+    Signature Algorithm: sha256WithRSAEncryption
+         26:ed:c6:62:c6:37:5b:d6:5a:8d:f1:09:4e:ac:0e:d6:0c:fb:
+         3c:a0:73:c7:2c:c5:23:ed:ca:b4:27:aa:66:1e:37:e0:5c:3a:
+         ff:35:82:f2:da:2e:4a:16:0a:5c:ea:38:9b:63:ce:2e:0c:27:
+         e6:e9:77:c7:ba:16:75:f3:1c:9b:9b:83:aa:90:3a:3e:2e:1b:
+         01:07:24:d1:c7:a8:e9:d6:30:ea:04:37:7d:ed:dc:d8:36:35:
+         ca:df:83:e3:7f:49:b7:a7:06:3b:2b:fa:ed:03:7c:91:39:93:
+         44:59:b5:ed:5d:28:30:25:76:c5:5e:67:ce:28:c6:d1:68:48:
+         bf:43:33:40:8d:5d:3d:2b:cb:8e:b3:77:cb:a7:41:f2:94:20:
+         0a:ab:c7:86:1f:e4:04:84:a4:73:19:ae:e4:ba:82:9a:35:0f:
+         44:26:f0:49:0e:9d:08:d3:7d:94:b0:22:ae:62:7a:3e:60:48:
+         4b:09:11:4d:bc:1e:80:21:65:6f:21:77:43:be:8c:3d:c9:71:
+         c7:c5:88:90:5e:60:26:64:8a:43:45:2e:a3:02:0c:8d:e1:b9:
+         76:a6:c9:61:2d:7a:d2:3c:17:c4:74:01:2f:dc:eb:a0:90:f5:
+         f7:0a:19:2b:d7:38:fb:c3:aa:c7:b6:76:17:72:1a:41:8f:54:
+         95:72:94:bc
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAj6gAwIBAgIJAPni85gOKwV/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
-BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMjA1MTcxNTIxMTJaFw0yMjA1MTUxNTIxMTJaMHQxCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
-U1FMMTIwMAYDVQQDEylNeVNRTCBDUkwgdGVzdCBjbGllbnQgY2VydGlmaWNhdGUg
-cmV2b2tlZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApd2Z1f06nAb0Lhrg
-Uhv2JMroB0E4ppxfhFoHQ57ekTdtQETNjkiiuMQ5dUHWqpcmATd2ewJFGHjhHlZd
-+F3gzKTEvQ0bQG4ATuC6BmGfgfIprtsxso8mLjLFdLIJX3aoSl608URZfj0qnKqw
-caQucDuM8pMvh8Gmh+ZrfB+l9WsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-FCB1++fwEU9kSMb5hXweOsfwFo9RMB8GA1UdIwQYMBaAFIWr5qdXiH2NvutkU3OU
-ZM1LjSkSMA0GCSqGSIb3DQEBBQUAA4GBANkjY8La1EpThcKHq+Wke+rLig5ubO+n
-o+L/KZ6v0CQIQEQODJFcXjglyRvFVbEXARJXYFt49eM8R+DfEBE49hjON1/sxqmV
-Ods2XXgSmlf4vE3N5el3hXFy0WaZDDVRij1hzw8hXuHLSzP3aIzS/MqlRKfW03aa
-YPsLF5fuOiMi
+MIIDfTCCAmUCAQMwDQYJKoZIhvcNAQELBQAwfjELMAkGA1UEBhMCSU4xEjAQBgNV
+BAgMCUthcm5hdGFrYTESMBAGA1UEBwwJQmVuZ2FsdXJ1MQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMSYwJAYDVQQDDB1NeVNRTCBDUkwgdGVzdCBjYSBj
+ZXJ0aWZpY2F0ZTAeFw0yMDA3MDEwNzUyNDFaFw0zMDA1MTAwNzUyNDFaMIGKMQsw
+CQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCZW5nYWx1
+cnUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxMjAwBgNVBAMMKU15
+U1FMIENSTCB0ZXN0IGNsaWVudCBjZXJ0aWZpY2F0ZSByZXZva2VkMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlcY55TORIfzRY3hw6igH5oEmmfeSkG8
+XQ8xB5/j1YJUgbncd0NiUUJDzYwxcQ9b3egCxfI6vuTpZJnf5Y80/PksWx2xk4u3
+xVVeEPm1HAueGmU9qy5Rpf0Ql1ctmG2agg6uJSHM3CYBFjSK9GcwL3dLVnvk7MLP
+HuwNCinBSS9ebnVP17TQsnMJnyXgqEFm4HjUK/VuPCAVPnXR48zuR7gq/kb0vAF6
+n2dIEryhueG3MUovau3RM3omqwGIBXBIi4dBS0R4Z3vnN4y3QcBq6zc73qmRFnX5
+FIHrtGDboC6TimGRM+4SL4UsEpYw8fUAQhaVp+kGMDK5o/4ZHfso/wIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQAm7cZixjdb1lqN8QlOrA7WDPs8oHPHLMUj7cq0J6pm
+HjfgXDr/NYLy2i5KFgpc6jibY84uDCfm6XfHuhZ18xybm4OqkDo+LhsBByTRx6jp
+1jDqBDd97dzYNjXK34Pjf0m3pwY7K/rtA3yROZNEWbXtXSgwJXbFXmfOKMbRaEi/
+QzNAjV09K8uOs3fLp0HylCAKq8eGH+QEhKRzGa7kuoKaNQ9EJvBJDp0I032UsCKu
+Yno+YEhLCRFNvB6AIWVvIXdDvow9yXHHxYiQXmAmZIpDRS6jAgyN4bl2pslhLXrS
+PBfEdAEv3OugkPX3Chkr1zj7w6rHtnYXchpBj1SVcpS8
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-client-revoked-key.pem b/mysql-test/std_data/crl-client-revoked-key.pem
index ce7a271a8b30..dd2f2565bd18 100644
--- a/mysql-test/std_data/crl-client-revoked-key.pem
+++ b/mysql-test/std_data/crl-client-revoked-key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCl3ZnV/TqcBvQuGuBSG/YkyugHQTimnF+EWgdDnt6RN21ARM2O
-SKK4xDl1QdaqlyYBN3Z7AkUYeOEeVl34XeDMpMS9DRtAbgBO4LoGYZ+B8imu2zGy
-jyYuMsV0sglfdqhKXrTxRFl+PSqcqrBxpC5wO4zyky+HwaaH5mt8H6X1awIDAQAB
-AoGAKkkoowmAG68aKXbooYZHZnHkXZUfIDrVjyR0naSvEU6UJ8JitVeHRJuiGmbC
-l5MZOU4ugoW9n9ORcO6L3nnwiVKWmG7K561ctp2tPQbUtCEMcFmGbnrJuJHrkyJX
-I0+E7+3mg2cCsTwofjR6bUeM7NnnM0Tf6Q5rKk/aXMW90MECQQDO9d3xt4TU1u/l
-uep52w43x23ZYx+YLIHVR9VRMZrYF62B8GpSf9TOdLOQBUyifdVJiXnuV1OkdHSX
-58G3P6sjAkEAzSrw66gH9YRC72tSU/m6LrMh9xmm3VqUWIYvzgX0Mw/a51VE+blr
-q/jctYicy1rbcDRsI9iKraXmB6fBhAA1GQJAK6VESh6Wv8AYVY0wusQMqoy/SNIT
-rqbsNotwnC/m5N2RdM67zWwx99w6pgvIDpiU6243raDy/cKleAejHb8qmwJBAJyQ
-Bzcdi61MV7PSJwoUCIK4idPBjHdgNtHy3CoQmxAYKkjb5f3XBBZAm1QgQt5foBLY
-vikAhpsKfSYcWuz7J4kCQQCX22QkqP9/JnC7CYfSasb69kD0A/zOn8wT3LQi4HRj
-3c2Mh+hKSVdMUXzULEnF+oZbMADSlPRY1qgykg+fK38R
+MIIEpAIBAAKCAQEAwlcY55TORIfzRY3hw6igH5oEmmfeSkG8XQ8xB5/j1YJUgbnc
+d0NiUUJDzYwxcQ9b3egCxfI6vuTpZJnf5Y80/PksWx2xk4u3xVVeEPm1HAueGmU9
+qy5Rpf0Ql1ctmG2agg6uJSHM3CYBFjSK9GcwL3dLVnvk7MLPHuwNCinBSS9ebnVP
+17TQsnMJnyXgqEFm4HjUK/VuPCAVPnXR48zuR7gq/kb0vAF6n2dIEryhueG3MUov
+au3RM3omqwGIBXBIi4dBS0R4Z3vnN4y3QcBq6zc73qmRFnX5FIHrtGDboC6TimGR
+M+4SL4UsEpYw8fUAQhaVp+kGMDK5o/4ZHfso/wIDAQABAoIBAQCx7VAt5n2bHOVL
+zwTeQCqqBDcmruZEEj9E7D21f1v3BOYeB26j+puvTf4J2MsDek5fsqWnWYkTcT2G
+D6N/50daPT+xBFSqg4bzMp9250g7rx9Hh12YtkWmtTVVekmSfvaxEIO8F2AaRulD
+zUNTVI43Rv9A5RnI8uryoqeloGkIeK9w0Gm0lSelqDNqb3OYbSX4OkBHC3wFvQBV
+eCwDIJIS9hXc8+mt42T5iaAGvVgHEzsOyTtWlMWPlgiIVq1VzoGiyjTR3E+V+tfy
+fzB/nq8s1t0/AOpEkk5LNX8UE1TnET7kqtBw/UmZ9BJ9FtZaYXBFprjxi/hGZbTW
+oYBIaqtxAoGBAOQ9RHUb1V/mJ/qhWsLsKQdNlE/49ypevjUGwcr6YH7lcNz4YDrk
+t75NmQv1svN7UuDpYzATe84n4F+ZmaN/pESKdFOmQ7usosGp8NKGxRQ1Upqr5DEm
+P4wfz/kwsquJOMbSEczfMc7C8CTm5m6wrs9pX8r5UJq7vZHOCAnL7mr7AoGBANn6
+TpB1Pbimv5kub8c8Wi/in9/Y3kDJpBm8oy9aWPLyzVag41O8QDEma8hIxbqMF6fG
+kv9gYzTZ5+w6Uz58CSp1BYzWOaevpqpdRd4YxaMIOnI5ddDTAGQBudkCy6X2qXRl
+Dk4fnkr0GvyIlIhAKnBEnmSo5DPX7W6kPwWk9hrNAoGBAIV3nnStFhXCTVauzJh3
+6XYv068Ac+j/BlOT4/eCerM6EMnnJL7LyPcsAXeQ8liXoVuMn0gZ3KgtgXPmKoYF
+ulWqcWQJMkqpJXQCoKU70juDAw8XvZVQPJEAeWnLJHBTCjSZ23bmfgXe0PeDXvUT
+tOXtROs45/3UE4MT7HduHbnJAoGABNRS4Uh3sZugKxioSVXA+cafnCoF4pGVHSzc
+wLPTvK48dmriHnzRP0WGpc1W9Ccebw0rPJU6HXWmeclhBsVgvpwRH2mvpVNy8dtX
+LPCHkHEiOl2jipjiLVUMdQ5mzKqGXpnOk1SIAUkfP/EWuV4SkqIykDBdvfhOvmDN
+NKbO/RECgYAK2mueSaD3BRtJEiTCCnAjcov3nBIYgXj1y+BCSo5YGMdHSgLMMq7M
+45uUSjv3zNv9wr4Og5/2qDE18ISxPHTvGngNABTGDcLNgPm0j5smwJSe99BITwZb
+jTaa0WaPPdvEzPpaTiNJi81/5UWqNWc5Mg7LBlWhnCjtaYYzDOy33w==
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crl-client-revoked.crl b/mysql-test/std_data/crl-client-revoked.crl
index 4c0a2132629b..367c35bfc341 100644
--- a/mysql-test/std_data/crl-client-revoked.crl
+++ b/mysql-test/std_data/crl-client-revoked.crl
@@ -1,10 +1,41 @@
+Certificate Revocation List (CRL):
+        Version 2 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: /C=IN/ST=Karnataka/L=Bengaluru/O=Oracle/OU=MySQL/CN=MySQL CRL test ca certificate
+        Last Update: Jul  1 07:54:29 2020 GMT
+        Next Update: May 10 07:54:29 2030 GMT
+        CRL extensions:
+            X509v3 CRL Number: 
+                4096
+Revoked Certificates:
+    Serial Number: 03
+        Revocation Date: Jul  1 07:54:18 2020 GMT
+    Signature Algorithm: sha256WithRSAEncryption
+         8d:76:b6:c6:84:2d:f5:14:fa:34:2f:0b:64:7c:20:c0:65:03:
+         60:8a:6b:9d:42:0d:b7:51:93:92:75:b5:28:5d:2f:47:0e:6d:
+         a2:df:c7:a1:b9:95:49:c2:83:5e:36:41:77:63:b4:25:8b:60:
+         d9:f8:25:4e:6e:45:94:3f:a3:86:a3:b5:cc:f0:b5:eb:68:4e:
+         1e:f6:d9:5d:e2:50:a6:e5:50:0e:a0:6f:e8:4b:66:9f:1f:0d:
+         5e:e1:63:e9:c9:96:7d:98:b6:56:5e:ce:3f:d2:42:b4:d3:18:
+         73:ca:ce:7a:42:71:29:7b:1f:bf:07:88:cf:d2:8e:1d:31:9c:
+         00:92:a2:5d:bc:78:0f:7b:f1:02:fe:ed:d7:b1:dc:8d:25:9a:
+         d5:01:c1:d8:ac:fd:a2:41:96:bd:9b:72:cb:95:f5:85:a9:88:
+         b3:74:30:c9:82:5d:8b:c8:d6:8a:5c:92:e8:e7:09:f1:13:73:
+         fa:05:56:1c:e2:dd:9e:b5:49:71:82:67:e6:e3:57:53:c8:f7:
+         df:66:44:7a:d6:f8:4f:44:5f:7e:30:eb:7b:d9:15:db:e2:d0:
+         85:45:9a:7b:d4:c2:f8:44:0f:5f:8c:d0:35:45:a1:c6:82:e8:
+         43:49:73:09:3b:ba:9a:24:00:1f:3c:7a:38:bd:e6:b5:b8:45:
+         e3:33:d3:c9
 -----BEGIN X509 CRL-----
-MIIBXjCByAIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
-CBMHUGxvdmRpdjEPMA0GA1UEChMGT3JhY2xlMQ4wDAYDVQQLEwVNeVNRTDEmMCQG
-A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTEyMDUyMTE0NDEx
-NFoXDTIyMDUxOTE0NDExNFowHDAaAgkA+eLzmA4rBX8XDTEyMDUxNzE1Mjc1OVqg
-DjAMMAoGA1UdFAQDAgECMA0GCSqGSIb3DQEBBQUAA4GBAIEYWLAI+mGt21DVlg/t
-mGaQ629aabNhZL3An5+2z+tqzQbOv6bKMW5H8gNNeNrRqQR/XEJvhlg0BrxfIicM
-GbvVoud0HmECIoxNVmeI8UCNPkkeQONT+8ZW029iuJF2KgGI0m1ZJa3bjRaArian
-ag9dgLE4zLppD4aMal0ysHPZ
+MIIB7jCB1wIBATANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJJTjESMBAGA1UE
+CAwJS2FybmF0YWthMRIwEAYDVQQHDAlCZW5nYWx1cnUxDzANBgNVBAoMBk9yYWNs
+ZTEOMAwGA1UECwwFTXlTUUwxJjAkBgNVBAMMHU15U1FMIENSTCB0ZXN0IGNhIGNl
+cnRpZmljYXRlFw0yMDA3MDEwNzU0MjlaFw0zMDA1MTAwNzU0MjlaMBQwEgIBAxcN
+MjAwNzAxMDc1NDE4WqAPMA0wCwYDVR0UBAQCAhAAMA0GCSqGSIb3DQEBCwUAA4IB
+AQCNdrbGhC31FPo0LwtkfCDAZQNgimudQg23UZOSdbUoXS9HDm2i38ehuZVJwoNe
+NkF3Y7Qli2DZ+CVObkWUP6OGo7XM8LXraE4e9tld4lCm5VAOoG/oS2afHw1e4WPp
+yZZ9mLZWXs4/0kK00xhzys56QnEpex+/B4jP0o4dMZwAkqJdvHgPe/EC/u3XsdyN
+JZrVAcHYrP2iQZa9m3LLlfWFqYizdDDJgl2LyNaKXJLo5wnxE3P6BVYc4t2etUlx
+gmfm41dTyPffZkR61vhPRF9+MOt72RXb4tCFRZp71ML4RA9fjNA1RaHGguhDSXMJ
+O7qaJAAfPHo4vea1uEXjM9PJ
 -----END X509 CRL-----
diff --git a/mysql-test/std_data/crl-server-cert.pem b/mysql-test/std_data/crl-server-cert.pem
index 3316e5e80864..6328fe4fc42e 100644
--- a/mysql-test/std_data/crl-server-cert.pem
+++ b/mysql-test/std_data/crl-server-cert.pem
@@ -1,62 +1,70 @@
 Certificate:
     Data:
-        Version: 3 (0x2)
-        Serial Number:
-            f9:e2:f3:98:0e:2b:05:7d
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Version: 1 (0x0)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test ca certificate
         Validity
-            Not Before: May 17 15:09:56 2012 GMT
-            Not After : May 15 15:09:56 2022 GMT
-        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test server certificate
+            Not Before: Jul  1 07:50:41 2020 GMT
+            Not After : May 10 07:50:41 2030 GMT
+        Subject: C=IN, ST=Karnataka, L=Bengaluru, O=Oracle, OU=MySQL, CN=MySQL CRL test server certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:af:0b:31:f9:f6:20:3b:6c:3f:9a:84:d0:85:b4:
-                    d4:ed:f9:ea:29:37:44:77:2b:37:25:da:9f:b8:f9:
-                    b3:02:9d:62:fc:e5:fc:d8:c1:56:7d:4f:7e:fa:6b:
-                    4f:f5:2b:98:b2:e2:fe:7c:7e:b8:57:bb:03:a5:2b:
-                    03:86:f5:d4:c4:66:6d:41:a7:fa:2a:09:02:7a:8e:
-                    c7:cd:44:15:46:64:fc:77:99:1e:53:06:ef:c5:d6:
-                    b4:19:3a:db:7b:26:16:60:0a:f8:62:ae:40:22:1b:
-                    1b:c2:20:2e:b0:bf:18:37:96:5c:a8:16:35:81:1f:
-                    f6:4b:3a:14:fb:4c:58:8e:37
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:f6:43:d5:3b:37:86:9f:54:a7:96:23:c6:90:73:
+                    a2:cb:79:bc:77:1a:18:dc:ae:30:36:5c:41:e5:a7:
+                    d0:bc:93:08:7e:7b:2c:9a:00:bf:9d:0f:ab:82:56:
+                    e6:ad:f1:3a:6a:e2:49:5d:02:59:0e:03:10:63:b1:
+                    83:f9:73:19:40:ec:8a:a0:1e:17:c9:53:74:ca:ca:
+                    2b:2f:7a:87:98:dc:12:e6:c8:d9:6e:3b:bc:d3:c5:
+                    f3:f4:fa:14:e2:5a:12:f2:3a:79:82:b7:a9:6f:21:
+                    f6:c7:79:a0:c7:56:05:a8:01:64:e8:f0:67:81:29:
+                    af:21:dc:08:02:8e:b8:cf:38:f1:ef:a6:ea:18:14:
+                    43:63:21:e8:a3:fe:78:78:b9:f2:04:6a:c8:32:48:
+                    66:4e:6e:4f:22:28:89:42:27:42:e5:f4:76:38:77:
+                    80:88:2d:73:c8:36:ab:24:40:68:fc:34:83:ba:1c:
+                    07:99:e3:3d:69:49:08:cd:4f:74:83:4e:33:5a:c4:
+                    87:65:7f:84:dc:73:80:93:55:21:5a:4d:86:97:b0:
+                    8a:93:d1:bc:63:c5:19:b0:8a:77:85:af:c9:74:cf:
+                    dd:4b:17:8c:cf:62:b0:bc:1a:3b:3f:b4:18:6b:e7:
+                    ad:4e:56:cb:29:be:31:4f:ee:3b:89:97:d6:fa:bd:
+                    5b:2b
                 Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                E1:3D:2B:5B:A1:96:FC:80:19:27:BA:F6:88:94:58:E3:EB:F6:85:10
-            X509v3 Authority Key Identifier: 
-                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
-
-    Signature Algorithm: sha1WithRSAEncryption
-        67:04:e4:39:2e:80:71:a8:63:ad:7e:e8:61:86:c7:a3:93:9e:
-        0d:0a:82:fd:21:29:9a:68:46:fa:95:b0:8d:23:7e:78:68:0f:
-        a9:19:3a:05:a1:df:b5:78:95:7c:f1:7f:8c:2a:40:23:c0:2b:
-        c8:a5:b0:1a:0e:8a:c4:42:ac:fc:e3:9d:f2:bb:e9:7f:75:b5:
-        94:2e:64:eb:ac:33:53:cd:8f:e8:4d:17:80:f7:ad:dd:03:57:
-        3e:e9:65:76:d3:c1:14:13:62:23:4b:bf:e1:38:0e:da:d0:74:
-        8e:52:9b:9d:9e:cc:ba:e5:a1:94:d1:f2:76:f9:c5:c7:ab:60:
-        01:c8
+    Signature Algorithm: sha256WithRSAEncryption
+         51:bd:1f:2d:64:cb:8c:d3:02:f2:ff:7e:65:3a:fa:78:4c:4b:
+         65:5c:8a:75:49:24:df:14:17:6b:84:a2:6a:e1:b8:d6:84:74:
+         22:7c:e3:bc:3e:7d:81:c7:2a:df:d6:bc:7b:be:44:a7:26:63:
+         1d:09:c1:ea:25:85:4b:14:b3:2f:f8:a5:28:f4:72:36:fc:71:
+         d0:c9:8d:b2:b3:d6:88:2a:4e:98:f2:22:fa:cb:c8:4d:7b:c0:
+         3b:81:f1:dd:f9:29:bd:f4:69:a4:82:87:c6:3b:4f:2f:75:3d:
+         fc:a3:6f:b0:10:80:b4:c5:51:9b:b8:5e:9d:cc:21:38:bc:e9:
+         54:11:76:d8:df:46:88:f5:02:b3:6a:02:e2:8c:cd:d8:f7:4e:
+         ff:fd:5f:e3:b9:db:52:cb:54:39:29:9a:e6:07:84:ea:38:3f:
+         3d:4c:87:ce:6c:5f:c8:18:56:8a:54:8e:6a:d3:f2:77:34:a6:
+         6d:f3:5a:51:8a:0d:23:bd:7e:01:07:af:0e:fd:97:73:64:27:
+         26:cc:34:d8:1f:f3:58:8b:7f:4b:75:df:39:ff:92:dc:e3:04:
+         ea:42:7c:11:7f:77:ab:32:29:c7:59:7e:5d:84:2d:cd:1d:2c:
+         61:d4:be:5d:9b:0e:30:2b:31:7e:4f:e6:07:e7:20:10:18:56:
+         36:97:19:b3
 -----BEGIN CERTIFICATE-----
-MIICzTCCAjagAwIBAgIJAPni85gOKwV9MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
-BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMjA1MTcxNTA5NTZaFw0yMjA1MTUxNTA5NTZaMGwxCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
-U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBzZXJ2ZXIgY2VydGlmaWNhdGUw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK8LMfn2IDtsP5qE0IW01O356ik3
-RHcrNyXan7j5swKdYvzl/NjBVn1PfvprT/UrmLLi/nx+uFe7A6UrA4b11MRmbUGn
-+ioJAnqOx81EFUZk/HeZHlMG78XWtBk623smFmAK+GKuQCIbG8IgLrC/GDeWXKgW
-NYEf9ks6FPtMWI43AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBThPStboZb8
-gBknuvaIlFjj6/aFEDAfBgNVHSMEGDAWgBSFq+anV4h9jb7rZFNzlGTNS40pEjAN
-BgkqhkiG9w0BAQUFAAOBgQBnBOQ5LoBxqGOtfuhhhsejk54NCoL9ISmaaEb6lbCN
-I354aA+pGToFod+1eJV88X+MKkAjwCvIpbAaDorEQqz8453yu+l/dbWULmTrrDNT
-zY/oTReA963dA1c+6WV208EUE2IjS7/hOA7a0HSOUpudnsy65aGU0fJ2+cXHq2AB
-yA==
+MIIDdTCCAl0CAQEwDQYJKoZIhvcNAQELBQAwfjELMAkGA1UEBhMCSU4xEjAQBgNV
+BAgMCUthcm5hdGFrYTESMBAGA1UEBwwJQmVuZ2FsdXJ1MQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMSYwJAYDVQQDDB1NeVNRTCBDUkwgdGVzdCBjYSBj
+ZXJ0aWZpY2F0ZTAeFw0yMDA3MDEwNzUwNDFaFw0zMDA1MTAwNzUwNDFaMIGCMQsw
+CQYDVQQGEwJJTjESMBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCZW5nYWx1
+cnUxDzANBgNVBAoMBk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxKjAoBgNVBAMMIU15
+U1FMIENSTCB0ZXN0IHNlcnZlciBjZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAPZD1Ts3hp9Up5YjxpBzost5vHcaGNyuMDZcQeWn0LyT
+CH57LJoAv50Pq4JW5q3xOmriSV0CWQ4DEGOxg/lzGUDsiqAeF8lTdMrKKy96h5jc
+EubI2W47vNPF8/T6FOJaEvI6eYK3qW8h9sd5oMdWBagBZOjwZ4EpryHcCAKOuM84
+8e+m6hgUQ2Mh6KP+eHi58gRqyDJIZk5uTyIoiUInQuX0djh3gIgtc8g2qyRAaPw0
+g7ocB5njPWlJCM1PdINOM1rEh2V/hNxzgJNVIVpNhpewipPRvGPFGbCKd4WvyXTP
+3UsXjM9isLwaOz+0GGvnrU5Wyym+MU/uO4mX1vq9WysCAwEAATANBgkqhkiG9w0B
+AQsFAAOCAQEAUb0fLWTLjNMC8v9+ZTr6eExLZVyKdUkk3xQXa4SiauG41oR0Inzj
+vD59gccq39a8e75EpyZjHQnB6iWFSxSzL/ilKPRyNvxx0MmNsrPWiCpOmPIi+svI
+TXvAO4Hx3fkpvfRppIKHxjtPL3U9/KNvsBCAtMVRm7hencwhOLzpVBF22N9GiPUC
+s2oC4ozN2PdO//1f47nbUstUOSma5geE6jg/PUyHzmxfyBhWilSOatPydzSmbfNa
+UYoNI71+AQevDv2Xc2QnJsw02B/zWIt/S3XfOf+S3OME6kJ8EX93qzIpx1l+XYQt
+zR0sYdS+XZsOMCsxfk/mB+cgEBhWNpcZsw==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-server-key.pem b/mysql-test/std_data/crl-server-key.pem
index 56ddd4b5cc1f..dfc34c9ebac5 100644
--- a/mysql-test/std_data/crl-server-key.pem
+++ b/mysql-test/std_data/crl-server-key.pem
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCvCzH59iA7bD+ahNCFtNTt+eopN0R3Kzcl2p+4+bMCnWL85fzY
-wVZ9T376a0/1K5iy4v58frhXuwOlKwOG9dTEZm1Bp/oqCQJ6jsfNRBVGZPx3mR5T
-Bu/F1rQZOtt7JhZgCvhirkAiGxvCIC6wvxg3llyoFjWBH/ZLOhT7TFiONwIDAQAB
-AoGAeS6b87vURq9DPTszjU1KmFILLWuIp6OwczFuoEWmC2pgTEsAiCMZOHmfo8hF
-O6tp9HY3zoKAJqRe+qrTr0xjdkprgdOW8N34nbzQXJh4pqQJqVzsTOAtuxbzWiXs
-Ge7LOQT6HtOaxH71cIs2bgFM4ToUeXMsdxurlfZ0SReNGekCQQDmzqqt6KeBZwir
-W8CfQw3aek/KX7NP/pQQK4thFcJDKl7y9zID7fE0sf76Ga6sGol4GafP1juPHbj8
-MNh7IYcjAkEAwiZa5ucPS8ucG5jRvQluSsJblwikQnl9cniLz+4/HQU/0aHYr3U5
-U14f+S4jU4Gm+DSjZGVL0/x8rShFKz5X3QJBANzKlMHajuqeCtAJ7KEtvwHiAZRB
-qkH68d7qGOIds4EW9k+Moz7ZDuXu5FCR4uNmW10Vhc+vS7hjoYM2otBfSWsCQQCQ
-kT7e8O7S4ao8Ym7K9FrMEC1jKWwmk5B1zI1PJ3iXg3EiCAHxpLgq+8uTIGftpn1O
-FOQVvdfY4gl0ZqgaqzGBAkAghAjdEB6uOrKOkyDfgRvfz46EDdI3iJFtkVpywqdb
-cllH1bDiH5cpkGwX+yWbbnZaNjOZoSIGrAW7lJNDp22Q
+MIIEowIBAAKCAQEA9kPVOzeGn1SnliPGkHOiy3m8dxoY3K4wNlxB5afQvJMIfnss
+mgC/nQ+rglbmrfE6auJJXQJZDgMQY7GD+XMZQOyKoB4XyVN0ysorL3qHmNwS5sjZ
+bju808Xz9PoU4loS8jp5grepbyH2x3mgx1YFqAFk6PBngSmvIdwIAo64zzjx76bq
+GBRDYyHoo/54eLnyBGrIMkhmTm5PIiiJQidC5fR2OHeAiC1zyDarJEBo/DSDuhwH
+meM9aUkIzU90g04zWsSHZX+E3HOAk1UhWk2Gl7CKk9G8Y8UZsIp3ha/JdM/dSxeM
+z2KwvBo7P7QYa+etTlbLKb4xT+47iZfW+r1bKwIDAQABAoIBAHF3R6QFLW30H1M6
+IJ8l6HhAGun1iEcFqwkg8OvTqoV4aY19S0uZ1K+VLLzdNWQnpXbh1FOaZVXja4XD
+oL8qnRQg6K5lryf/3+wfwk4Z8qgnnj3fhO8ZbyNULddN8ploTxp0ftAPt22RBJdc
+Hww5Qlnqaog5XDdS8XJ0YuxqvhQbjVk/U6e7IltruByFv9bzYiT+QsZf/KJ/mDlk
+ypR/Ic9RM5eqX/86lDxrBacilE/8nBCFUbr7RlnXJhgEKf0DCYJTN2BS+4iwydaA
+TP6a/gZK64Q0JR9BGmYjAtPdl4as3pHlgi7LwIQeF97KwW9mZdAC1L/9FCu9W1Bk
+sOGBAiECgYEA/etLZdqrX5OqymN49PyEb8sQzTWojavLKrZiU6uKlPJH3qjWlu9J
+dlwW4azsgrYL2ISlAbgCo/QZ9H08CrHdumh9EQtYcZtszjjwicag5NtK1NboeZjR
+R0aJBVkNu2xkREEPd2XLNkm+U/FZ5HueGnphkGP/hWLTI+7M/abPAh0CgYEA+Eh7
+A1C3PgcqLSMjXq9axLjJ23o10AAp/H+aogb7LAyKNvkT16Tw+5DSsB2hDbETKxSg
+aQD/9N/bjiGHnK0CaEi/ft4vYoIzrRpQwgst90jRZfwgJyA4wCRfcPaKSa5y8jQm
+OwSetRTO5gKJirNZbxkzSBwaRBTWZRy1Vouhz+cCgYEA1FO3Prq15zxB6u93K9Uk
+oZ76s76U7bKkN1k/q5ucTKS0eHpSxu/dTD4BXEEPnNXB3hI9MMzAWH08XveCB6do
+NAI/4srL8GP5fhCbA3q2++hsEMKMr3GcPq+60GABXaJrza9h0YOrg//ySZtegfLk
+6FtBzk3wU4ep6zg67jhYjfkCgYAgb8eybS8jaWg3MWoDisE/Bi1JATRakkrp8/nN
+xT+3R4QfHndbKu9YzljYLWbHFSU98ZnrXfgSk9RpQzQmYev4l9h8yKZEJmJ98Pwv
+/anprpe8zS2eLvV7FMVrSqpSafoWbn24JChf2/IT1q0Fc9zxSMeMWi+MSXShDRkb
+z246bQKBgC4sdYIG51PQaP/1vqPZg7CoCsNCepqM8UAnQ7piEdGis+w8pIcmYRnG
+Q/OuCdSxVlgS0xDtuFlTMrivUfpsPrgEtQNwkkvWATytYZWL2CpvDKKV2GzgHai/
+ZgiuN7FSqdLq/hRCuJT5Sxo84ilFXb0i0cpaPKfNfE9gLZ8pUbsm
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crldir/5df06fcb.r0 b/mysql-test/std_data/crldir/5df06fcb.r0
new file mode 100644
index 000000000000..1ee040e4bb0d
--- /dev/null
+++ b/mysql-test/std_data/crldir/5df06fcb.r0
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB7jCB1wIBATANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJJTjESMBAGA1UE
+CAwJS2FybmF0YWthMRIwEAYDVQQHDAlCZW5nYWx1cnUxDzANBgNVBAoMBk9yYWNs
+ZTEOMAwGA1UECwwFTXlTUUwxJjAkBgNVBAMMHU15U1FMIENSTCB0ZXN0IGNhIGNl
+cnRpZmljYXRlFw0yMDA3MDEwNzU0MjlaFw0zMDA1MTAwNzU0MjlaMBQwEgIBAxcN
+MjAwNzAxMDc1NDE4WqAPMA0wCwYDVR0UBAQCAhAAMA0GCSqGSIb3DQEBCwUAA4IB
+AQCNdrbGhC31FPo0LwtkfCDAZQNgimudQg23UZOSdbUoXS9HDm2i38ehuZVJwoNe
+NkF3Y7Qli2DZ+CVObkWUP6OGo7XM8LXraE4e9tld4lCm5VAOoG/oS2afHw1e4WPp
+yZZ9mLZWXs4/0kK00xhzys56QnEpex+/B4jP0o4dMZwAkqJdvHgPe/EC/u3XsdyN
+JZrVAcHYrP2iQZa9m3LLlfWFqYizdDDJgl2LyNaKXJLo5wnxE3P6BVYc4t2etUlx
+gmfm41dTyPffZkR61vhPRF9+MOt72RXb4tCFRZp71ML4RA9fjNA1RaHGguhDSXMJ
+O7qaJAAfPHo4vea1uEXjM9PJ
+-----END X509 CRL-----
diff --git a/mysql-test/std_data/crldir/ab8a3803.r0 b/mysql-test/std_data/crldir/ab8a3803.r0
deleted file mode 100644
index 4c0a2132629b..000000000000
--- a/mysql-test/std_data/crldir/ab8a3803.r0
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN X509 CRL-----
-MIIBXjCByAIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
-CBMHUGxvdmRpdjEPMA0GA1UEChMGT3JhY2xlMQ4wDAYDVQQLEwVNeVNRTDEmMCQG
-A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTEyMDUyMTE0NDEx
-NFoXDTIyMDUxOTE0NDExNFowHDAaAgkA+eLzmA4rBX8XDTEyMDUxNzE1Mjc1OVqg
-DjAMMAoGA1UdFAQDAgECMA0GCSqGSIb3DQEBBQUAA4GBAIEYWLAI+mGt21DVlg/t
-mGaQ629aabNhZL3An5+2z+tqzQbOv6bKMW5H8gNNeNrRqQR/XEJvhlg0BrxfIicM
-GbvVoud0HmECIoxNVmeI8UCNPkkeQONT+8ZW029iuJF2KgGI0m1ZJa3bjRaArian
-ag9dgLE4zLppD4aMal0ysHPZ
------END X509 CRL-----
diff --git a/mysql-test/std_data/data_50722.zip b/mysql-test/std_data/data_50722.zip
new file mode 100644
index 000000000000..7fc0246ebeb1
Binary files /dev/null and b/mysql-test/std_data/data_50722.zip differ
diff --git a/mysql-test/std_data/data_57_32.zip b/mysql-test/std_data/data_57_32.zip
new file mode 100644
index 000000000000..c7bcb5faac00
Binary files /dev/null and b/mysql-test/std_data/data_57_32.zip differ
diff --git a/mysql-test/std_data/import2_57_32.zip b/mysql-test/std_data/import2_57_32.zip
new file mode 100644
index 000000000000..9c5904d586de
Binary files /dev/null and b/mysql-test/std_data/import2_57_32.zip differ
diff --git a/mysql-test/std_data/import_57_32.zip b/mysql-test/std_data/import_57_32.zip
new file mode 100644
index 000000000000..1a6877f5b032
Binary files /dev/null and b/mysql-test/std_data/import_57_32.zip differ
diff --git a/mysql-test/std_data/latin1.xml b/mysql-test/std_data/latin1.xml
index 5884416c30e5..c80ae28e05c5 100644
--- a/mysql-test/std_data/latin1.xml
+++ b/mysql-test/std_data/latin1.xml
@@ -7,13 +7,20 @@
   Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/mysql-test/std_data/replicated-bin.000001 b/mysql-test/std_data/replicated-bin.000001
new file mode 100644
index 000000000000..299091bd61b2
Binary files /dev/null and b/mysql-test/std_data/replicated-bin.000001 differ
diff --git a/mysql-test/std_data/replicated-bin.000002 b/mysql-test/std_data/replicated-bin.000002
new file mode 100644
index 000000000000..6b9774d5d0c2
Binary files /dev/null and b/mysql-test/std_data/replicated-bin.000002 differ
diff --git a/mysql-test/std_data/replicated-bin.index b/mysql-test/std_data/replicated-bin.index
new file mode 100644
index 000000000000..df826040bc99
--- /dev/null
+++ b/mysql-test/std_data/replicated-bin.index
@@ -0,0 +1,2 @@
+./replicate-relay-bin.000001
+./replicate-relay-bin.000002
diff --git a/mysql-test/std_data/server-cert-verify-san.pem b/mysql-test/std_data/server-cert-verify-san.pem
new file mode 100644
index 000000000000..fb65b76b527b
--- /dev/null
+++ b/mysql-test/std_data/server-cert-verify-san.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID5zCCAs+gAwIBAgIBATANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJJTjES
+MBAGA1UECAwJS2FybmF0YWthMRIwEAYDVQQHDAlCYW5nYWxvcmUxDzANBgNVBAoM
+Bk9yYWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMB4XDTE4MDQxMTEw
+MjUyNFoXDTI4MDIxODEwMjUyNFowcDELMAkGA1UEBhMCSU4xEjAQBgNVBAgMCUth
+cm5hdGFrYTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQ8wDQYDVQQKDAZPcmFjbGUxDjAM
+BgNVBAsMBU15U1FMMRgwFgYDVQQDDA9ub25leGlzdGVudC5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/sSYMr3chNWCyoHGc5EZmhINxGrWwnyQW
+5+kcOWgwpGgTNy3Ruvt2k26iMrBRFtFq6pR8SHzrJAAGhECY12+rWRh8uD6sQS4l
+P5+F5l8bXgtoMvqpX4Bkgxj880dqBJurOpXl1VVql69uWfBsxOHSRkeMZOJNIMTY
+VKljEjGaDcGAFXTJoKxe+Df63XPgwYyhH7OpUZdTkCfedU1M+C3Sw5782luW5L+E
+JiwulblHBGnTDN/6G9aXS4+l0gs3z4h2aElKmVjy0tKaXTv81zkYnClUhVFEnvzN
+G//gGsZm9Sn+Cv/V+BGEnS2gsK7FziCPJbitS03/rhS9xYcEDZcNAgMBAAGjgZgw
+gZUwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFI3O1OuzzKnpmZkAKgYEz2q9uRFDMB8GA1Ud
+IwQYMBaAFO0N9d+F2A0NNE+KiE0+a751ytIAMBoGA1UdEQQTMBGCCWxvY2FsaG9z
+dIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAZCgA6kj6hvo+X3TUa7kZx90KHlsH
+kxSHEiEw1wjxZVwW9GzSzX/qLnK4EZjH9V5BC2k1nbBGmUJE8i5VSzIG6unRhncX
+H1+bcEvlKIESWGQ1Hk+vFW8jEhoLGsuF62TTcE5urnvWix8k/VgLZ8GbkihSVPiM
+98syw007eHUfauBj2QTYxnZuZFlW8p5BIWclDbSMQ8iuKQqLPzmipmWEVaxgI5XI
+o/k5704aW6An7LsgPNKunXT7Ykbz4HvmH4/OVIYJSWTtuVYy3tYLyKwAFtGaCe9U
+wMe/YuA2/74ir2CxbiYtVAuDa9o4Hq8oCbTfE9gQReEmHPWsw4tcwuPVZA==
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server-key-verify-san.pem b/mysql-test/std_data/server-key-verify-san.pem
new file mode 100644
index 000000000000..7143d8ad7ab3
--- /dev/null
+++ b/mysql-test/std_data/server-key-verify-san.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAv7EmDK93ITVgsqBxnORGZoSDcRq1sJ8kFufpHDloMKRoEzct
+0br7dpNuojKwURbRauqUfEh86yQABoRAmNdvq1kYfLg+rEEuJT+fheZfG14LaDL6
+qV+AZIMY/PNHagSbqzqV5dVVapevblnwbMTh0kZHjGTiTSDE2FSpYxIxmg3BgBV0
+yaCsXvg3+t1z4MGMoR+zqVGXU5An3nVNTPgt0sOe/NpbluS/hCYsLpW5RwRp0wzf
++hvWl0uPpdILN8+IdmhJSplY8tLSml07/Nc5GJwpVIVRRJ78zRv/4BrGZvUp/gr/
+1fgRhJ0toLCuxc4gjyW4rUtN/64UvcWHBA2XDQIDAQABAoIBAQCivOwGnPhQMxay
+z09k2M+DvUAxx3E0Twa+g4f9tCbmFM1ectvtUAan9iZYgRv625pSYHBKyudyYQ+8
+eI62sz9UgsEtMOXUK0nXyZnOfXOEsmSQw6bWIAPKURnntUmNkffueEBF7MUlRz1i
+O+zHCqaEc7HOWN9eh1FWLxnWx91gYJEHXPkv8lITgsMO2eMqS7EMjmRNt0zpy+4M
+gGQpZvO+wyXQqjnxqSi+lwlLF18dXHZtCzatRgjUY7armU9AMSD21Hl1p9LBcP1A
+1wllqwz8xTf9iTZjlThdymZTDhlpDfNC8yBMA/vUaUc9IDSWzPpRUqUg4ViIArxA
+pfqJ3DiBAoGBAOK++/X2b5IVRc8ZD+s5FlAvGBIqBiT2qV/klBmuO5/XiTD9jd7C
+W9D1leubksn2yPtVSgrM/YXZuLOkazGCZlfFdvNoOPH2MQu4FME4AoYnHGysORtS
+uC+MuCQlKxXwCyMtTawY3U0rvCV5BgyAHuUtnsTb2ts/igbONxhSAql9AoGBANhs
+ZFqcCQRlcoPkiBfE2tMPHcubTvfkn3treK2pmXFAwc19p+2yjgTWQDFAdEUafg67
+40NYLp8YthAMQrfWTF9R1HKv4J3dIiyLAbsZZfkvh/EiiT2y53SStfFUpB4WM1Jj
+3WaWyz20tEE+kt/utxOPoGBcqMmmt9fGCyV0a5jRAoGAb6UUEMa3ptk8lz1C3lIs
+j2yw0HjKr7aYLTQyS/bDOu/4iBvAmBdg+CGEIQ9oFnOiAEa9f1Xx2s8aJ7HkaetI
+Ex2SdUUzDMho29lWttCqRX3KfCPMtoxjTl5eaMW4UkPwZ/CtlvhjNtU6/cR6WvtW
+uwdcbpfGSkAd6T3uWNZAo00CgYEAyTFy1Z0q8NBSdfR05AvYFc9+tnJKJj9+V2Eg
+jekVwWgfAqZm/503U53NjTvLGxa2y4G1kzyeEr8JOb/8IiTxWMecxYVlPbx+cYRE
+dqf02YNrUCr4BMiVTRS6WYCDFYkz6sr13tIeXN3pmKHQLqcfwOqLgCmDq/r1+3yb
+jhU9lZECgYEAr/rWaeKuJlE5U64kxZO+TcseDSSeUt+f8mLYf/KLBoh5xcGq1qPv
+4d9ljOLciJJZo1XBW9LZa5ryrIQ18wdZcj6B38GyjW4vgz5SZ+/H+KjuIdxbKNGa
+93Jar7+ZhdkdV2KBN6ucYNJJJ7R+H39Av6Vv91OBGs3jss8+rfMvlv8=
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/slave-relay-bin-win.index b/mysql-test/std_data/slave-relay-bin-win.index
new file mode 100644
index 000000000000..62979c505669
--- /dev/null
+++ b/mysql-test/std_data/slave-relay-bin-win.index
@@ -0,0 +1 @@
+.\master-bin.000001
diff --git a/mysql-test/std_data/slave-relay-bin.000001 b/mysql-test/std_data/slave-relay-bin.000001
new file mode 100644
index 000000000000..20426ef61400
Binary files /dev/null and b/mysql-test/std_data/slave-relay-bin.000001 differ
diff --git a/mysql-test/std_data/slave-relay-bin.index b/mysql-test/std_data/slave-relay-bin.index
new file mode 100644
index 000000000000..c122a8a05b4c
--- /dev/null
+++ b/mysql-test/std_data/slave-relay-bin.index
@@ -0,0 +1 @@
+./master-bin.000001
diff --git a/mysql-test/r/audit_plugin.result b/mysql-test/suite/audit_null/r/audit_plugin.result
similarity index 100%
rename from mysql-test/r/audit_plugin.result
rename to mysql-test/suite/audit_null/r/audit_plugin.result
diff --git a/mysql-test/r/audit_plugin_2.result b/mysql-test/suite/audit_null/r/audit_plugin_2.result
similarity index 95%
rename from mysql-test/r/audit_plugin_2.result
rename to mysql-test/suite/audit_null/r/audit_plugin_2.result
index d1b0fdf86fae..4364607d35dc 100644
--- a/mysql-test/r/audit_plugin_2.result
+++ b/mysql-test/suite/audit_null/r/audit_plugin_2.result
@@ -1,5 +1,7 @@
 call mtr.add_suppression("Event 'MYSQL_AUDIT_COMMAND_END' cannot be aborted.");
 call mtr.add_suppression("Event 'MYSQL_AUDIT_CONNECTION_DISCONNECT' cannot be aborted.");
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_RESULT' cannot be aborted.");
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_STATUS' cannot be aborted.");
 call mtr.add_suppression("Command 'Ping' cannot be aborted.");
 INSTALL PLUGIN null_audit SONAME 'adt_null.<expected_extension>';
 ################
@@ -34,6 +36,81 @@ SELECT 1;
 SET @@GLOBAL.null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="14";ABORT_RET';
 mysqld is alive
 SET @@GLOBAL.null_audit_event_order_check = NULL;
+#############
+## GENERAL ##
+#############
+##########################
+## ABORT GENERAL RESULT ##
+##########################
+SET @@null_audit_event_order_check_exact = <expected_check_exact>;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="<expected_command_start_id>";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;ABORT_RET';
+SELECT 1;
+1
+1
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+##########################################
+## ABORT GENERAL RESULT WITH MY_MESSAGE ##
+##########################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check_exact = <expected_check_exact>;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="<expected_command_start_id>";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;ABORT_RET';
+SELECT 1;
+1
+1
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+##########################
+## ABORT GENERAL STATUS ##
+##########################
+SET @@null_audit_event_order_check_exact = <expected_check_exact>;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="<expected_command_start_id>";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;ABORT_RET';
+SELECT 1;
+1
+1
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+##########################################
+## ABORT GENERAL STATUS WITH MY_MESSAGE ##
+##########################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check_exact = <expected_check_exact>;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="<expected_command_start_id>";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;ABORT_RET';
+SELECT 1;
+1
+1
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
 ###########
 ## QUERY ##
 ###########
@@ -523,6 +600,23 @@ a
 SELECT @@null_audit_event_order_check;
 @@null_audit_event_order_check
 EVENT-ORDER-OK
+SET @@null_audit_event_order_check_exact = <expected_check_exact>;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="<expected_command_id>";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="51";;'
+                                          'MYSQL_AUDIT_TABLE_ACCESS_READ;db="super_test" table="test_table";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="51";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;;'
+                                          'MYSQL_AUDIT_COMMAND_END;command_id="<expected_command_id>";';
+ANALYZE TABLE test_table;
+Table	Op	Msg_type	Msg_text
+super_test.test_table	analyze	status	OK
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-OK
 ###########################
 ## TABLE_ACCESS - INSERT ##
 ###########################
diff --git a/mysql-test/suite/audit_null/r/audit_plugin_bugs.result b/mysql-test/suite/audit_null/r/audit_plugin_bugs.result
new file mode 100644
index 000000000000..ac9511e03ac3
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/audit_plugin_bugs.result
@@ -0,0 +1,85 @@
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
+#
+# Bug #22142209: MY_MESSAGE FAILS TO ABORT MYSQL_AUDIT_SERVER_STARTUP_CLASS EVENT
+#
+# Shutdown the server
+# Load the plugin at startup and abort on STARTUP with default message
+# Search for default abort message
+# Load the plugin at startup and abort on STARTUP event with custom message
+# Search for custom abort message
+# Startup the server
+#
+# Bug #22136709: INFINITE RECURSION BY CALLING MY_MESSAGE FROM
+#   MYSQL_AUDIT_GENERAL_CLASS HANDLER
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+SET @@GLOBAL.null_audit_event_order_check= "MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET";
+SET @@GLOBAL.null_audit_abort_message= "Abort message.";
+# Try to enter error state recursively 2 times.
+SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 2;
+connect(localhost,wrong_root,,test,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'wrong_root'@'localhost' (using password: NO)
+SELECT @@null_audit_event_order_check_consume_ignore_count;
+@@null_audit_event_order_check_consume_ignore_count
+0
+# Try to enter error state infinitely. my_message calls cause stack overrun.
+SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 10000;
+connect(localhost,wrong_root,,test,MASTER_PORT,MASTER_SOCKET);
+SELECT @@null_audit_event_order_check_consume_ignore_count;
+@@null_audit_event_order_check_consume_ignore_count
+0
+SET @@GLOBAL.null_audit_event_order_check= NULL;
+SET @@GLOBAL.null_audit_abort_message= NULL;
+SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 0;
+
+#
+# Bug#27638290 - Set @@null_audit_event_record_def = 
+#                'mysql_audit_authentication_flush'; crashed
+#
+# New connection, unbound thread
+# Expect NULL
+SELECT @@null_audit_event_record_def;
+@@null_audit_event_record_def
+NULL
+
+# Invalid data
+SET @@null_audit_event_record_def = 'ABSOLUTE_NONSENSE';
+SELECT 1;
+1
+1
+# Expect NULL
+SELECT @@null_audit_event_record;
+@@null_audit_event_record
+NULL
+SELECT @@null_audit_event_record_def;
+@@null_audit_event_record_def
+ABSOLUTE_NONSENSE
+
+# Invalid data again
+SET @@null_audit_event_record_def = 'MYSQL_AUDIT_AUTHENTICATION_FLUSH;JUNK';
+SELECT 1;
+1
+1
+# Expect NULL
+SELECT @@null_audit_event_record;
+@@null_audit_event_record
+NULL
+SELECT @@null_audit_event_record_def;
+@@null_audit_event_record_def
+MYSQL_AUDIT_AUTHENTICATION_FLUSH;JUNK
+
+# Valid data
+SET @@null_audit_event_record_def = 'MYSQL_AUDIT_GENERAL_RESULT;MYSQL_AUDIT_COMMAND_END';
+SELECT 1;
+1
+1
+SELECT @@null_audit_event_record;
+@@null_audit_event_record
+MYSQL_AUDIT_GENERAL_RESULT;;
+MYSQL_AUDIT_GENERAL_STATUS;;
+MYSQL_AUDIT_COMMAND_END;command_id="<expected_command_id>";
+
+End of 5.7 tests
+# cleanup
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/audit_null/r/general_error_abort.result b/mysql-test/suite/audit_null/r/general_error_abort.result
new file mode 100644
index 000000000000..77bc7d4b9708
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/general_error_abort.result
@@ -0,0 +1,31 @@
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+SELECT * FROM mysql.non_existing_table;
+ERROR 42S02: Table 'mysql.non_existing_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+#######################################
+## ABORT GENERAL LOG WITH MY_MESSAGE ##
+#######################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+SELECT * FROM mysql.non_existing_table;
+ERROR 42S02: Table 'mysql.non_existing_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/audit_null/r/general_error_abort_ps.result b/mysql-test/suite/audit_null/r/general_error_abort_ps.result
new file mode 100644
index 000000000000..ab5a34832d8b
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/general_error_abort_ps.result
@@ -0,0 +1,76 @@
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+#############
+## PREPARE ##
+#############
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+PREPARE stmt FROM 'SELECT * FROM mysql.non_existing_table';
+ERROR 42S02: Table 'mysql.non_existing_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+#############
+## EXECUTE ##
+#############
+CREATE TABLE test.test_table(a INT);
+PREPARE stmt FROM 'SELECT * FROM test.test_table';
+DROP TABLE test.test_table;
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+EXECUTE stmt;
+ERROR 42S02: Table 'test.test_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+DROP PREPARE stmt;
+#######################################
+## ABORT GENERAL LOG WITH MY_MESSAGE ##
+#######################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+PREPARE stmt FROM 'SELECT * FROM mysql.non_existing_table';
+ERROR 42S02: Table 'mysql.non_existing_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+CREATE TABLE test.test_table(a INT);
+PREPARE stmt FROM 'SELECT * FROM test.test_table';
+DROP TABLE test.test_table;
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+EXECUTE stmt;
+ERROR 42S02: Table 'test.test_table' doesn't exist
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+DROP PREPARE stmt;
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/audit_null/r/general_log_abort.result b/mysql-test/suite/audit_null/r/general_log_abort.result
new file mode 100644
index 000000000000..8bd3ef1cd261
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/general_log_abort.result
@@ -0,0 +1,32 @@
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+SELECT 1;
+ERROR HY000: Aborted by Audit API ('MYSQL_AUDIT_GENERAL_LOG';1).
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+SELECT 1;
+1
+1
+#######################################
+## ABORT GENERAL LOG WITH MY_MESSAGE ##
+#######################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+SELECT 1;
+ERROR HY000: Abort with my_message.
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+SELECT 1;
+1
+1
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/audit_null/r/general_log_abort_ps.result b/mysql-test/suite/audit_null/r/general_log_abort_ps.result
new file mode 100644
index 000000000000..d4553b74c650
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/general_log_abort_ps.result
@@ -0,0 +1,102 @@
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+#############
+## PREPARE ##
+#############
+# Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+PREPARE stmt FROM 'SELECT 1';
+ERROR HY000: Aborted by Audit API ('MYSQL_AUDIT_GENERAL_LOG';1).
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE
+# Abort second MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+PREPARE stmt FROM 'SELECT 1';
+ERROR HY000: Aborted by Audit API ('MYSQL_AUDIT_GENERAL_LOG';1).
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE
+#######################################
+## ABORT GENERAL LOG WITH MY_MESSAGE ##
+#######################################
+# Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+PREPARE stmt FROM 'SELECT 1';
+ERROR HY000: Abort with my_message.
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE
+# Abort second MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+PREPARE stmt FROM 'SELECT 1';
+ERROR HY000: Abort with my_message.
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE
+#############
+## EXECUTE ##
+#############
+PREPARE stmt FROM 'SELECT 2';
+# Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+EXECUTE stmt;
+ERROR HY000: Aborted by Audit API ('MYSQL_AUDIT_GENERAL_LOG';1).
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+2
+2
+#######################################
+## ABORT GENERAL LOG WITH MY_MESSAGE ##
+#######################################
+# Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+EXECUTE stmt;
+ERROR HY000: Abort with my_message.
+SELECT @@null_audit_event_order_check;
+@@null_audit_event_order_check
+EVENT-ORDER-ABORT
+EXECUTE stmt;
+2
+2
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/audit_null/r/multiqueries.result b/mysql-test/suite/audit_null/r/multiqueries.result
new file mode 100644
index 000000000000..763d8c92459a
--- /dev/null
+++ b/mysql-test/suite/audit_null/r/multiqueries.result
@@ -0,0 +1,38 @@
+#
+# Bug #34207811 : Audit plugin does not log multiqueries correctly.
+#
+INSTALL PLUGIN null_audit SONAME 'adt_null.so';
+CREATE USER multiqueries_test_user34207811 IDENTIFIED BY 'secret_pswd';
+GRANT CREATE USER, SELECT, SUPER ON *.* TO multiqueries_test_user34207811;
+set @con1_tid = (select thread_id from performance_schema.threads
+where processlist_user = 'multiqueries_test_user34207811');
+SET DEBUG="+d, print_query"|
+select 1; select 2; CREATE USER u1 IDENTIFIED BY 'p1'; select 3; ALTER USER 'u1' IDENTIFIED BY 'new_pswd' PASSWORD EXPIRE; select 4;|
+1
+1
+2
+2
+3
+3
+4
+4
+SET DEBUG="-d, print_query"|
+# Check the error log if multiqueries are not logged.
+Occurrences of 'select 1; select 2; CREATE USER u1 IDENTIFIED BY 'p1'; select 3; ALTER USER 'u1' IDENTIFIED BY 'new_pswd' PASSWORD EXPIRE; select 4' in the input file: 0
+SELECT SQL_TEXT from performance_schema.events_statements_history_long where (thread_id = @con1_tid);
+SQL_TEXT
+set @con1_tid = (select thread_id from performance_schema.threads
+where processlist_user = 'multiqueries_test_user34207811')
+SET DEBUG="+d, print_query"
+select 1
+select 2
+CREATE USER 'u1'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>'
+select 3
+ALTER USER 'u1'@'%' IDENTIFIED WITH 'mysql_native_password' AS '<secret>' PASSWORD EXPIRE
+select 4
+SET DEBUG="-d, print_query"
+UNINSTALL PLUGIN null_audit;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+DROP USER u1;
+DROP USER multiqueries_test_user34207811;
diff --git a/mysql-test/t/audit_plugin-master.opt b/mysql-test/suite/audit_null/t/audit_plugin-master.opt
similarity index 100%
rename from mysql-test/t/audit_plugin-master.opt
rename to mysql-test/suite/audit_null/t/audit_plugin-master.opt
diff --git a/mysql-test/t/audit_plugin.test b/mysql-test/suite/audit_null/t/audit_plugin.test
similarity index 100%
rename from mysql-test/t/audit_plugin.test
rename to mysql-test/suite/audit_null/t/audit_plugin.test
diff --git a/mysql-test/t/audit_plugin_2-master.opt b/mysql-test/suite/audit_null/t/audit_plugin_2-master.opt
similarity index 100%
rename from mysql-test/t/audit_plugin_2-master.opt
rename to mysql-test/suite/audit_null/t/audit_plugin_2-master.opt
diff --git a/mysql-test/t/audit_plugin_2.test b/mysql-test/suite/audit_null/t/audit_plugin_2.test
similarity index 95%
rename from mysql-test/t/audit_plugin_2.test
rename to mysql-test/suite/audit_null/t/audit_plugin_2.test
index 187634c0c612..97b1a05b985a 100644
--- a/mysql-test/t/audit_plugin_2.test
+++ b/mysql-test/suite/audit_null/t/audit_plugin_2.test
@@ -3,6 +3,8 @@
 
 call mtr.add_suppression("Event 'MYSQL_AUDIT_COMMAND_END' cannot be aborted.");
 call mtr.add_suppression("Event 'MYSQL_AUDIT_CONNECTION_DISCONNECT' cannot be aborted.");
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_RESULT' cannot be aborted.");
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_STATUS' cannot be aborted.");
 call mtr.add_suppression("Command 'Ping' cannot be aborted.");
 
 connection default;
@@ -76,6 +78,78 @@ SET @@GLOBAL.null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_i
 --exec $MYSQLADMIN --no-defaults --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root ping 2>&1
 SET @@GLOBAL.null_audit_event_order_check = NULL;
 
+--echo #############
+--echo ## GENERAL ##
+--echo #############
+
+--echo ##########################
+--echo ## ABORT GENERAL RESULT ##
+--echo ##########################
+--replace_result $event_order_exact <expected_check_exact>
+eval SET @@null_audit_event_order_check_exact = $event_order_exact;
+--replace_result $command_start_id <expected_command_start_id>
+eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="$command_start_id";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;ABORT_RET';
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+
+--echo ##########################################
+--echo ## ABORT GENERAL RESULT WITH MY_MESSAGE ##
+--echo ##########################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+--replace_result $event_order_exact <expected_check_exact>
+eval SET @@null_audit_event_order_check_exact = $event_order_exact;
+--replace_result $command_start_id <expected_command_start_id>
+eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="$command_start_id";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;ABORT_RET';
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+
+--echo ##########################
+--echo ## ABORT GENERAL STATUS ##
+--echo ##########################
+--replace_result $event_order_exact <expected_check_exact>
+eval SET @@null_audit_event_order_check_exact = $event_order_exact;
+--replace_result $command_start_id <expected_command_start_id>
+eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="$command_start_id";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;ABORT_RET';
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+
+--echo ##########################################
+--echo ## ABORT GENERAL STATUS WITH MY_MESSAGE ##
+--echo ##########################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+--replace_result $event_order_exact <expected_check_exact>
+eval SET @@null_audit_event_order_check_exact = $event_order_exact;
+--replace_result $command_start_id <expected_command_start_id>
+eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="$command_start_id";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="0";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;ABORT_RET';
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+
 --echo ###########
 --echo ## QUERY ##
 --echo ###########
@@ -545,6 +619,22 @@ eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id=
 SELECT * FROM audit_temp_table;
 SELECT @@null_audit_event_order_check;
 
+--replace_result $event_order_exact <expected_check_exact>
+eval SET @@null_audit_event_order_check_exact = $event_order_exact;
+--replace_regex /;command_id="[0-9]+"/;command_id="<expected_command_id>"/
+eval SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="$command_start_id";;'
+                                          'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                          'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                          'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                          'MYSQL_AUDIT_QUERY_START;sql_command_id="51";;'
+                                          'MYSQL_AUDIT_TABLE_ACCESS_READ;db="super_test" table="test_table";;'
+                                          'MYSQL_AUDIT_QUERY_STATUS_END;sql_command_id="51";;'
+                                          'MYSQL_AUDIT_GENERAL_RESULT;;;'
+                                          'MYSQL_AUDIT_GENERAL_STATUS;;;'
+                                          'MYSQL_AUDIT_COMMAND_END;command_id="$command_end_id";';
+ANALYZE TABLE test_table;
+SELECT @@null_audit_event_order_check;
+
 --echo ###########################
 --echo ## TABLE_ACCESS - INSERT ##
 --echo ###########################
diff --git a/mysql-test/t/audit_plugin_bugs-master.opt b/mysql-test/suite/audit_null/t/audit_plugin_bugs-master.opt
similarity index 100%
rename from mysql-test/t/audit_plugin_bugs-master.opt
rename to mysql-test/suite/audit_null/t/audit_plugin_bugs-master.opt
diff --git a/mysql-test/t/audit_plugin_bugs.test b/mysql-test/suite/audit_null/t/audit_plugin_bugs.test
similarity index 76%
rename from mysql-test/t/audit_plugin_bugs.test
rename to mysql-test/suite/audit_null/t/audit_plugin_bugs.test
index b7e4e9e9ed08..8db42bf5dc71 100644
--- a/mysql-test/t/audit_plugin_bugs.test
+++ b/mysql-test/suite/audit_null/t/audit_plugin_bugs.test
@@ -95,6 +95,44 @@ SET @@GLOBAL.null_audit_event_order_check_consume_ignore_count= 0;
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
 
+--echo
+--echo #
+--echo # Bug#27638290 - Set @@null_audit_event_record_def = 
+--echo #                'mysql_audit_authentication_flush'; crashed
+--echo #
+--echo # New connection, unbound thread
+connect (con1,localhost,root,,);
+
+--echo # Expect NULL
+SELECT @@null_audit_event_record_def;
+--echo
+--echo # Invalid data
+SET @@null_audit_event_record_def = 'ABSOLUTE_NONSENSE';
+SELECT 1;
+--echo # Expect NULL
+--replace_regex /;command_id="[0-9]+"/;command_id="<expected_command_id>"/
+SELECT @@null_audit_event_record;
+SELECT @@null_audit_event_record_def;
+
+--echo
+--echo # Invalid data again
+SET @@null_audit_event_record_def = 'MYSQL_AUDIT_AUTHENTICATION_FLUSH;JUNK';
+SELECT 1;
+--echo # Expect NULL
+--replace_regex /;command_id="[0-9]+"/;command_id="<expected_command_id>"/
+SELECT @@null_audit_event_record;
+SELECT @@null_audit_event_record_def;
+--echo
+
+--echo  # Valid data
+SET @@null_audit_event_record_def = 'MYSQL_AUDIT_GENERAL_RESULT;MYSQL_AUDIT_COMMAND_END';
+SELECT 1;
+--replace_regex /;command_id="[0-9]+"/;command_id="<expected_command_id>"/
+SELECT @@null_audit_event_record;
+--disconnect con1
+connection default;
+
+--echo
 --echo End of 5.7 tests
 
 --echo # cleanup
diff --git a/mysql-test/suite/audit_null/t/general_error_abort-master.opt b/mysql-test/suite/audit_null/t/general_error_abort-master.opt
new file mode 100644
index 000000000000..bc88b4d7d915
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_error_abort-master.opt
@@ -0,0 +1 @@
+$AUDIT_NULL_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/audit_null/t/general_error_abort.test b/mysql-test/suite/audit_null/t/general_error_abort.test
new file mode 100644
index 000000000000..719ee43351cd
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_error_abort.test
@@ -0,0 +1,35 @@
+--source include/have_null_audit_plugin.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN null_audit SONAME '$AUDIT_NULL';
+
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+SELECT * FROM mysql.non_existing_table;
+SELECT @@null_audit_event_order_check;
+
+--echo #######################################
+--echo ## ABORT GENERAL LOG WITH MY_MESSAGE ##
+--echo #######################################
+
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+SELECT * FROM mysql.non_existing_table;
+SELECT @@null_audit_event_order_check;
+
+UNINSTALL PLUGIN null_audit;
diff --git a/mysql-test/suite/audit_null/t/general_error_abort_ps-master.opt b/mysql-test/suite/audit_null/t/general_error_abort_ps-master.opt
new file mode 100644
index 000000000000..bc88b4d7d915
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_error_abort_ps-master.opt
@@ -0,0 +1 @@
+$AUDIT_NULL_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/audit_null/t/general_error_abort_ps.test b/mysql-test/suite/audit_null/t/general_error_abort_ps.test
new file mode 100644
index 000000000000..e9d1b96f02b6
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_error_abort_ps.test
@@ -0,0 +1,84 @@
+--source include/have_null_audit_plugin.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+call mtr.add_suppression("Event 'MYSQL_AUDIT_GENERAL_ERROR' cannot be aborted.");
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN null_audit SONAME '$AUDIT_NULL';
+
+--echo #############
+--echo ## PREPARE ##
+--echo #############
+
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+PREPARE stmt FROM 'SELECT * FROM mysql.non_existing_table';
+SELECT @@null_audit_event_order_check;
+
+--echo #############
+--echo ## EXECUTE ##
+--echo #############
+
+CREATE TABLE test.test_table(a INT);
+PREPARE stmt FROM 'SELECT * FROM test.test_table';
+DROP TABLE test.test_table;
+
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+EXECUTE stmt;
+SELECT @@null_audit_event_order_check;
+
+DROP PREPARE stmt;
+
+--echo #######################################
+--echo ## ABORT GENERAL LOG WITH MY_MESSAGE ##
+--echo #######################################
+
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+PREPARE stmt FROM 'SELECT * FROM mysql.non_existing_table';
+SELECT @@null_audit_event_order_check;
+
+CREATE TABLE test.test_table(a INT);
+PREPARE stmt FROM 'SELECT * FROM test.test_table';
+DROP TABLE test.test_table;
+
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="0";;'
+                                     'MYSQL_AUDIT_GENERAL_ERROR;;ABORT_RET';
+--error ER_NO_SUCH_TABLE
+EXECUTE stmt;
+SELECT @@null_audit_event_order_check;
+
+DROP PREPARE stmt;
+
+UNINSTALL PLUGIN null_audit;
diff --git a/mysql-test/suite/audit_null/t/general_log_abort-master.opt b/mysql-test/suite/audit_null/t/general_log_abort-master.opt
new file mode 100644
index 000000000000..bc88b4d7d915
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_log_abort-master.opt
@@ -0,0 +1 @@
+$AUDIT_NULL_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/audit_null/t/general_log_abort.test b/mysql-test/suite/audit_null/t/general_log_abort.test
new file mode 100644
index 000000000000..f183efe7e4a6
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_log_abort.test
@@ -0,0 +1,30 @@
+--source include/have_null_audit_plugin.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN null_audit SONAME '$AUDIT_NULL';
+
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--error ER_AUDIT_API_ABORT
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+SELECT 1;
+
+--echo #######################################
+--echo ## ABORT GENERAL LOG WITH MY_MESSAGE ##
+--echo #######################################
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--error ER_AUDIT_API_ABORT
+SELECT 1;
+SELECT @@null_audit_event_order_check;
+SELECT 1;
+
+UNINSTALL PLUGIN null_audit;
diff --git a/mysql-test/suite/audit_null/t/general_log_abort_ps-master.opt b/mysql-test/suite/audit_null/t/general_log_abort_ps-master.opt
new file mode 100644
index 000000000000..bc88b4d7d915
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_log_abort_ps-master.opt
@@ -0,0 +1 @@
+$AUDIT_NULL_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/audit_null/t/general_log_abort_ps.test b/mysql-test/suite/audit_null/t/general_log_abort_ps.test
new file mode 100644
index 000000000000..1eb51b59cae6
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/general_log_abort_ps.test
@@ -0,0 +1,136 @@
+--source include/have_null_audit_plugin.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN null_audit SONAME '$AUDIT_NULL';
+
+--echo #############
+--echo ## PREPARE ##
+--echo #############
+
+--echo # Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+PREPARE stmt FROM 'SELECT 1';
+SELECT @@null_audit_event_order_check;
+--error ER_UNKNOWN_STMT_HANDLER
+EXECUTE stmt;
+
+--echo # Abort second MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+PREPARE stmt FROM 'SELECT 1';
+SELECT @@null_audit_event_order_check;
+--error ER_UNKNOWN_STMT_HANDLER
+EXECUTE stmt;
+
+--echo #######################################
+--echo ## ABORT GENERAL LOG WITH MY_MESSAGE ##
+--echo #######################################
+
+--echo # Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+PREPARE stmt FROM 'SELECT 1';
+SELECT @@null_audit_event_order_check;
+--error ER_UNKNOWN_STMT_HANDLER
+EXECUTE stmt;
+
+--echo # Abort second MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="99";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+PREPARE stmt FROM 'SELECT 1';
+SELECT @@null_audit_event_order_check;
+--error ER_UNKNOWN_STMT_HANDLER
+EXECUTE stmt;
+
+--echo #############
+--echo ## EXECUTE ##
+--echo #############
+
+PREPARE stmt FROM 'SELECT 2';
+
+--echo # Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+EXECUTE stmt;
+SELECT @@null_audit_event_order_check;
+EXECUTE stmt;
+
+# BUG - Aborting 2nd MYSQL_AUDIT_GENERAL_LOG event fails
+#--echo # Abort second MYSQL_AUDIT_GENERAL_LOG event
+#SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+#                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+#                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+#                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+#                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+#                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+#--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+#--error ER_AUDIT_API_ABORT
+#EXECUTE stmt;
+#SELECT @@null_audit_event_order_check;
+#EXECUTE stmt;
+
+--echo #######################################
+--echo ## ABORT GENERAL LOG WITH MY_MESSAGE ##
+--echo #######################################
+
+--echo # Abort first MYSQL_AUDIT_GENERAL_LOG event
+SET @@null_audit_abort_message = "Abort with my_message.";
+SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_AUDIT_API_ABORT
+EXECUTE stmt;
+SELECT @@null_audit_event_order_check;
+EXECUTE stmt;
+
+# BUG - Aborting 2nd MYSQL_AUDIT_GENERAL_LOG event fails
+#--echo # Abort second MYSQL_AUDIT_GENERAL_LOG event
+#SET @@null_audit_abort_message = "Abort with my_message.";
+#SET @@null_audit_event_order_check = 'MYSQL_AUDIT_COMMAND_START;command_id="3";;'
+#                                     'MYSQL_AUDIT_PARSE_PREPARSE;;;'
+#                                     'MYSQL_AUDIT_PARSE_POSTPARSE;;;'
+#                                     'MYSQL_AUDIT_GENERAL_LOG;;;'
+#                                     'MYSQL_AUDIT_QUERY_START;sql_command_id="100";;'
+#                                     'MYSQL_AUDIT_GENERAL_LOG;;ABORT_RET';
+#--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+#--error ER_AUDIT_API_ABORT
+#EXECUTE stmt;
+#SELECT @@null_audit_event_order_check;
+#EXECUTE stmt;
+
+UNINSTALL PLUGIN null_audit;
diff --git a/mysql-test/suite/audit_null/t/multiqueries-master.opt b/mysql-test/suite/audit_null/t/multiqueries-master.opt
new file mode 100644
index 000000000000..bc88b4d7d915
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/multiqueries-master.opt
@@ -0,0 +1 @@
+$AUDIT_NULL_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/audit_null/t/multiqueries.test b/mysql-test/suite/audit_null/t/multiqueries.test
new file mode 100644
index 000000000000..ccb52fc1404d
--- /dev/null
+++ b/mysql-test/suite/audit_null/t/multiqueries.test
@@ -0,0 +1,40 @@
+--echo #
+--echo # Bug #34207811 : Audit plugin does not log multiqueries correctly.
+--echo #
+--source include/have_debug.inc
+--source include/have_null_audit_plugin.inc
+--source include/no_protocol.inc
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN null_audit SONAME '$AUDIT_NULL';
+
+CREATE USER multiqueries_test_user34207811 IDENTIFIED BY 'secret_pswd';
+GRANT CREATE USER, SELECT, SUPER ON *.* TO multiqueries_test_user34207811;
+
+--connect(con1,localhost,multiqueries_test_user34207811,secret_pswd)
+
+set @con1_tid = (select thread_id from performance_schema.threads
+  where processlist_user = 'multiqueries_test_user34207811');
+
+delimiter |;
+SET DEBUG="+d, print_query"|
+select 1; select 2; CREATE USER u1 IDENTIFIED BY 'p1'; select 3; ALTER USER 'u1' IDENTIFIED BY 'new_pswd' PASSWORD EXPIRE; select 4;|
+SET DEBUG="-d, print_query"|
+delimiter ;|
+
+--echo # Check the error log if multiqueries are not logged.
+--let $grep_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $grep_output=print_count
+--let $grep_pattern=select 1; select 2; CREATE USER u1 IDENTIFIED BY 'p1'; select 3; ALTER USER 'u1' IDENTIFIED BY 'new_pswd' PASSWORD EXPIRE; select 4
+--source include/grep_pattern.inc
+
+# Verify the fix for the bug:
+# Bug #34569180 : P_S.events_statements_history tables store wrongdata when executing multiqueries
+SELECT SQL_TEXT from performance_schema.events_statements_history_long where (thread_id = @con1_tid);
+
+# Clean up
+connection default;
+--disconnect con1
+UNINSTALL PLUGIN null_audit;
+DROP USER u1;
+DROP USER multiqueries_test_user34207811;
\ No newline at end of file
diff --git a/mysql-test/suite/auth_sec/include/multiple_plugins.inc b/mysql-test/suite/auth_sec/include/multiple_plugins.inc
new file mode 100644
index 000000000000..6b34fb54f4b8
--- /dev/null
+++ b/mysql-test/suite/auth_sec/include/multiple_plugins.inc
@@ -0,0 +1,85 @@
+#
+# Input(s) :
+# $server_default_authentication_plugin
+#
+
+--echo # Restart the server with $server_default_authentication_plugin as default authnetication plugin
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--exec echo "restart:--default-authentication-plugin=$server_default_authentication_plugin" > $restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+
+--echo # Create users
+CREATE USER qa_test_1_user IDENTIFIED WITH qa_auth_interface AS 'qa_test_1_dest';
+CREATE USER qa_test_1_dest IDENTIFIED BY 'dest_passwd';
+GRANT ALL PRIVILEGES ON test_user_db.* TO qa_test_1_dest identified by 'dest_passwd';
+GRANT PROXY ON qa_test_1_dest TO qa_test_1_user;
+
+CREATE USER native@localhost IDENTIFIED WITH 'mysql_native_password' BY 'abcd';
+CREATE USER sha256@localhost IDENTIFIED WITH 'sha256_password' BY 'abcd';
+
+--echo # Connection tests
+
+--exec $MYSQL $PLUGIN_AUTH_OPT --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=mysql_native_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=sha256_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+
+--exec $MYSQL $PLUGIN_AUTH_OPT --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=mysql_native_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=sha256_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -uqa_test_1_user -pqa_test_1_dest --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+
+
+--exec $MYSQL $PLUGIN_AUTH_OPT --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -unative -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=mysql_native_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -unative -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=sha256_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -unative -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+
+
+--exec $MYSQL $PLUGIN_AUTH_OPT --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -usha256 -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=mysql_native_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -usha256 -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+--exec $MYSQL $PLUGIN_AUTH_OPT --default-auth=sha256_password --protocol=TCP --host=127.0.0.1 -P$MASTER_MYPORT -usha256 -pabcd --ssl-mode=DISABLED --server-public-key-path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem -e "SELECT CURRENT_USER()" 2>&1
+FLUSH PRIVILEGES;
+
+--echo # Change user tests
+
+--connect(qa_test_1_conn, localhost, qa_test_1_user, qa_test_1_dest,,,,SSL)
+--change_user sha256, abcd
+SELECT CURRENT_USER();
+--change_user
+SELECT CURRENT_USER();
+
+--connect(native_conn, localhost, native, abcd,,,,SSL)
+--change_user qa_test_1_user, qa_test_1_dest
+SELECT CURRENT_USER();
+--change_user sha256, abcd
+SELECT CURRENT_USER();
+--change_user
+SELECT CURRENT_USER();
+
+--connect(sha256_conn, localhost, sha256, abcd,,,,SSL)
+--change_user qa_test_1_user, qa_test_1_dest
+SELECT CURRENT_USER();
+--change_user
+SELECT CURRENT_USER();
+
+--connection default
+--disconnect qa_test_1_conn
+--disconnect native_conn
+--disconnect sha256_conn
+
+--echo # Drop users
+DROP USER qa_test_1_user;
+DROP USER qa_test_1_dest;
+DROP USER native@localhost;
+DROP USER sha256@localhost;
+
+--source include/force_restart.inc
diff --git a/mysql-test/suite/auth_sec/include/not_sha256_rsa_auth.inc b/mysql-test/suite/auth_sec/include/not_sha256_rsa_auth.inc
deleted file mode 100644
index dfd9634b35a3..000000000000
--- a/mysql-test/suite/auth_sec/include/not_sha256_rsa_auth.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Only run this test if YaSSL is supported
-let $shavars= query_get_value("SELECT COUNT(*) as shavars FROM information_schema.session_variables WHERE variable_name = 'sha256_password_private_key_path'", shavars, 1);
-if ($shavars != 0){
-  skip Need YaSSL support;
-}
diff --git a/mysql-test/suite/auth_sec/r/key_rotation_qa.result b/mysql-test/suite/auth_sec/r/key_rotation_qa.result
index e3e22e38c6e6..8eb35121e7bb 100644
--- a/mysql-test/suite/auth_sec/r/key_rotation_qa.result
+++ b/mysql-test/suite/auth_sec/r/key_rotation_qa.result
@@ -24,7 +24,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 ALTER INSTANCE ROTATE INNODB SLAVE KEY;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SLAVE KEY' at line 1
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 ERROR HY000: Function 'keyring_file' already exists
@@ -70,7 +70,7 @@ INSERT INTO t3 VALUES(2, "ccccc");
 keyring_tmp
 
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # Check for keyring file.
 keyring_tmp
 
@@ -103,7 +103,7 @@ c1	c2
 2	ccccc
 # restart: --early-plugin-load=keyring_file=keyring_file.so --keyring_file_data=MYSQL_TMP_DIR/keyring/keyring_new
 SELECT * FROM t1;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 CREATE TABLE t12(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
 INSERT INTO t12 VALUES(2, "ccccchfc");
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
@@ -116,21 +116,21 @@ PLUGIN_NAME	keyring_file
 PLUGIN_VERSION	1.0
 PLUGIN_STATUS	ACTIVE
 SELECT * FROM t2;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 CREATE TABLE t11(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
 SELECT * FROM t2;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 UNINSTALL PLUGIN keyring_file;
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS
 FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
 SELECT * FROM t11;
 c1	c2
 SELECT COUNT(*) FROM t1;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 CREATE TABLE t4(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 CREATE TABLE t5(c1 INT, c2 char(20)) ENGINE = InnoDB;
 INSERT INTO t5 VALUES(100, "without_enc");
 keyring
@@ -143,11 +143,11 @@ PLUGIN_NAME	keyring_file
 PLUGIN_VERSION	1.0
 PLUGIN_STATUS	ACTIVE
 CREATE TABLE t6(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 SELECT * FROM t3;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 
 SELECT * FROM t5;
 c1	c2
diff --git a/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result b/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result
index 7bc12257fbf0..e109c9b73fbe 100644
--- a/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result
+++ b/mysql-test/suite/auth_sec/r/keyring_file_data_qa.result
@@ -6,7 +6,7 @@ call mtr.add_suppression("Plugin keyring_file reported: 'Could not create keyrin
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File '/' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error reading file '/' .*");
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS
 FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
diff --git a/mysql-test/suite/auth_sec/r/multiple_plugins.result b/mysql-test/suite/auth_sec/r/multiple_plugins.result
new file mode 100644
index 000000000000..c8255cee112c
--- /dev/null
+++ b/mysql-test/suite/auth_sec/r/multiple_plugins.result
@@ -0,0 +1,162 @@
+# Check with mysql_native_password as --default-authentication-plugin
+# Restart the server with mysql_native_password as default authnetication plugin
+# Create users
+CREATE USER qa_test_1_user IDENTIFIED WITH qa_auth_interface AS 'qa_test_1_dest';
+CREATE USER qa_test_1_dest IDENTIFIED BY 'dest_passwd';
+GRANT ALL PRIVILEGES ON test_user_db.* TO qa_test_1_dest identified by 'dest_passwd';
+Warnings:
+Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
+GRANT PROXY ON qa_test_1_dest TO qa_test_1_user;
+CREATE USER native@localhost IDENTIFIED WITH 'mysql_native_password' BY 'abcd';
+CREATE USER sha256@localhost IDENTIFIED WITH 'sha256_password' BY 'abcd';
+# Connection tests
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+FLUSH PRIVILEGES;
+# Change user tests
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+# Drop users
+DROP USER qa_test_1_user;
+DROP USER qa_test_1_dest;
+DROP USER native@localhost;
+DROP USER sha256@localhost;
+# Check with sha256_password as --default-authentication-plugin
+# Restart the server with sha256_password as default authnetication plugin
+# Create users
+CREATE USER qa_test_1_user IDENTIFIED WITH qa_auth_interface AS 'qa_test_1_dest';
+CREATE USER qa_test_1_dest IDENTIFIED BY 'dest_passwd';
+GRANT ALL PRIVILEGES ON test_user_db.* TO qa_test_1_dest identified by 'dest_passwd';
+Warnings:
+Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
+GRANT PROXY ON qa_test_1_dest TO qa_test_1_user;
+CREATE USER native@localhost IDENTIFIED WITH 'mysql_native_password' BY 'abcd';
+CREATE USER sha256@localhost IDENTIFIED WITH 'sha256_password' BY 'abcd';
+# Connection tests
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+qa_test_1_user@%
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+native@localhost
+FLUSH PRIVILEGES;
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+mysql: [Warning] Using a password on the command line interface can be insecure.
+CURRENT_USER()
+sha256@localhost
+FLUSH PRIVILEGES;
+# Change user tests
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+sha256@localhost
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+SELECT CURRENT_USER();
+CURRENT_USER()
+qa_test_1_user@%
+# Drop users
+DROP USER qa_test_1_user;
+DROP USER qa_test_1_dest;
+DROP USER native@localhost;
+DROP USER sha256@localhost;
diff --git a/mysql-test/suite/auth_sec/r/tls.result b/mysql-test/suite/auth_sec/r/tls.result
index c6b66ce66151..0ee50327b2ff 100644
--- a/mysql-test/suite/auth_sec/r/tls.result
+++ b/mysql-test/suite/auth_sec/r/tls.result
@@ -7,7 +7,7 @@ Ssl_version	TLS_VERSION
 #T2: Default SSL cipher
 Variable_name	Value
 Ssl_cipher	SSL_CIPHER
-#T3: Setting TLS version TLSv1.2 (for yassl TLSv1.1) from the client
+#T3: Setting TLS version TLSv1.2 from the client
 Variable_name	Value
 Ssl_version	TLS_VERSION
 #T4: Setting TLS version TLSv1.1 from the client
diff --git a/mysql-test/suite/auth_sec/r/tls12_tls1.result b/mysql-test/suite/auth_sec/r/tls12_tls1.result
new file mode 100644
index 000000000000..c679b41caf2c
--- /dev/null
+++ b/mysql-test/suite/auth_sec/r/tls12_tls1.result
@@ -0,0 +1,15 @@
+#
+# WL#8196 TLSv1.2 support with TLSv1/TLSv1.1 client
+#
+#T1: Setting TLS version TLSv1.1 from the client
+Variable_name	Value
+Ssl_version	TLSv1.1
+#T2: Setting TLS version TLSv1 from the client
+Variable_name	Value
+Ssl_version	TLSv1
+#T3: Setting TLS version TLSv1, TLSv1.1 from the client
+Variable_name	Value
+Ssl_version	TLSv1.1
+#T4: Setting TLS version1.2 in the server and from client giving TLSv1.1, connection should fail
+# restart server using restart
+Restart server and provide ssl-cipher at server startup
diff --git a/mysql-test/suite/auth_sec/t/cert_verify.test b/mysql-test/suite/auth_sec/t/cert_verify.test
index 2be9a3e7b124..de84c4c45d53 100644
--- a/mysql-test/suite/auth_sec/t/cert_verify.test
+++ b/mysql-test/suite/auth_sec/t/cert_verify.test
@@ -9,12 +9,6 @@
 let $ssl_verify_fail_path = --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-key-verify-fail.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert-verify-fail.pem;
 let $ssl_verify_pass_path = --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-key-verify-pass.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert-verify-pass.pem;
 
-let $tls_default= TLSv1.1;
-let $openssl= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
-if ($openssl == 'Rsa_public_key'){
-  let $tls_default= TLSv1.2;
-}
-
 --echo #T1: Host name (/CN=localhost/) as OU name in the server certificate, server certificate verification should fail.
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --shutdown_server
@@ -36,7 +30,7 @@ if ($openssl == 'Rsa_public_key'){
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
---replace_result $tls_default TLS_VERSION
+--replace_result TLSv1 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1.2 TLS_VERSION
 --exec $MYSQL --protocol=tcp --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-mode=VERIFY_IDENTITY -e "SHOW STATUS like 'Ssl_version'"
 
 --echo # restart server using restart
diff --git a/mysql-test/suite/auth_sec/t/install_keyring_file-master.opt b/mysql-test/suite/auth_sec/t/install_keyring_file-master.opt
index cb6c6d2807a7..c5e9d83e5654 100644
--- a/mysql-test/suite/auth_sec/t/install_keyring_file-master.opt
+++ b/mysql-test/suite/auth_sec/t/install_keyring_file-master.opt
@@ -1 +1 @@
-$KEYRING_PLUGIN_OPT
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key
diff --git a/mysql-test/suite/auth_sec/t/keyring_file_data_qa-master.opt b/mysql-test/suite/auth_sec/t/keyring_file_data_qa-master.opt
index cb6c6d2807a7..c5e9d83e5654 100644
--- a/mysql-test/suite/auth_sec/t/keyring_file_data_qa-master.opt
+++ b/mysql-test/suite/auth_sec/t/keyring_file_data_qa-master.opt
@@ -1 +1 @@
-$KEYRING_PLUGIN_OPT
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key
diff --git a/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test b/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test
index a5b01566549e..b5f8ec5d6b52 100644
--- a/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test
+++ b/mysql-test/suite/auth_sec/t/keyring_file_data_qa.test
@@ -12,7 +12,7 @@ call mtr.add_suppression("Plugin keyring_file reported: 'Could not create keyrin
 call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File 'MYSQL_test_invalid/dir/' not found .*");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File '/' not found .*");
+call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Error reading file '/' .*");
 
 # Installing keyring plugin.
 --replace_regex /\.dll/.so/
diff --git a/mysql-test/suite/auth_sec/t/multiple_plugins-master.opt b/mysql-test/suite/auth_sec/t/multiple_plugins-master.opt
new file mode 100644
index 000000000000..9075c82eeca9
--- /dev/null
+++ b/mysql-test/suite/auth_sec/t/multiple_plugins-master.opt
@@ -0,0 +1,4 @@
+$PLUGIN_AUTH_INTERFACE_OPT
+$PLUGIN_AUTH_INTERFACE_LOAD
+--loose-sha256_password_private_key_path=$MYSQL_TEST_DIR/std_data/rsa_private_key.pem
+--loose-sha256_password_public_key_path=$MYSQL_TEST_DIR/std_data/rsa_public_key.pem
diff --git a/mysql-test/suite/auth_sec/t/multiple_plugins.test b/mysql-test/suite/auth_sec/t/multiple_plugins.test
new file mode 100644
index 000000000000..f3553b626689
--- /dev/null
+++ b/mysql-test/suite/auth_sec/t/multiple_plugins.test
@@ -0,0 +1,12 @@
+--source include/have_plugin_interface.inc
+--source include/not_embedded.inc
+--source include/have_ssl.inc
+--source include/have_sha256_rsa_auth.inc
+
+--echo # Check with mysql_native_password as --default-authentication-plugin
+let $server_default_authentication_plugin=mysql_native_password;
+--source ../include/multiple_plugins.inc
+
+--echo # Check with sha256_password as --default-authentication-plugin
+let $server_default_authentication_plugin=sha256_password;
+--source ../include/multiple_plugins.inc
diff --git a/mysql-test/suite/auth_sec/t/mysql_ssl_connection.test b/mysql-test/suite/auth_sec/t/mysql_ssl_connection.test
index 15148b8fdb14..acb63b68d258 100644
--- a/mysql-test/suite/auth_sec/t/mysql_ssl_connection.test
+++ b/mysql-test/suite/auth_sec/t/mysql_ssl_connection.test
@@ -7,7 +7,7 @@
 connection default;
 CREATE USER u_20693153@localhost IDENTIFIED BY 'abcd';
 
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --protocol=TCP -uu_20693153 -pabcd --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem -e "SHOW STATUS LIKE 'Ssl_cipher';"
 
 DROP USER u_20693153@localhost;
diff --git a/mysql-test/suite/auth_sec/t/openssl_cert_generation.test b/mysql-test/suite/auth_sec/t/openssl_cert_generation.test
index 9042b215ea67..98881d421c58 100644
--- a/mysql-test/suite/auth_sec/t/openssl_cert_generation.test
+++ b/mysql-test/suite/auth_sec/t/openssl_cert_generation.test
@@ -1,7 +1,7 @@
 --source include/no_valgrind_without_big.inc
 --source include/not_embedded.inc
 --source include/have_sha256_rsa_auth.inc
-
+--source include/allowed_ciphers.inc
 
 #-----------------------------------------------------------------------------
 
@@ -183,7 +183,7 @@ let SEARCH_PATTERN= Auto generated SSL certificates are placed in data directory
 --file_exists $MYSQLTEST_VARDIR/mysqld.1/data/public_key.pem
 
 --echo # Ensure that server is ssl enabled
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uroot --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher'"
 #-----------------------------------------------------------------------------
 
@@ -285,7 +285,7 @@ grant usage on *.* to wl7699_sha256 identified by 'abcd';
 
 # Using SSL certificates
 --echo # Should be able to connect to server using generated SSL certificates.
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uwl7699_sha256 -pabcd --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher'"
 # Using RSA key pair
 --echo # Should be able to connect to server using RSA key pair.
@@ -351,7 +351,7 @@ show variables like 'sha256%';
 
 --echo # 6.3 : SSL connection
 --echo # Should be able to connect to server using generated SSL certificates.
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uroot --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher'"
 
 
@@ -362,7 +362,7 @@ grant usage on *.* to wl7699_sha256 identified by 'abcd';
 
 # Using SSL certificates
 --echo # Should be able to connect to server using generated SSL certificates.
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uwl7699_sha256 -pabcd --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher'"
 # Using RSA key pair
 --echo # Should be able to connect to server using RSA key pair.
diff --git a/mysql-test/suite/auth_sec/t/ssl_auto_detect.test b/mysql-test/suite/auth_sec/t/ssl_auto_detect.test
index 706f8b05ec1b..fdd19926a411 100644
--- a/mysql-test/suite/auth_sec/t/ssl_auto_detect.test
+++ b/mysql-test/suite/auth_sec/t/ssl_auto_detect.test
@@ -1,4 +1,6 @@
 --source include/not_embedded.inc
+--source include/allowed_ciphers.inc
+
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 
@@ -54,7 +56,7 @@ let SEARCH_PATTERN= CA certificate .* is self signed.;
 
 --echo # Try to establish SSL connection : This must succeed.
 connect (ssl_root_1,localhost,root,,,,,SSL);
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 SHOW VARIABLES LIKE 'have_ssl';
 
@@ -68,7 +70,7 @@ connection default;
 disconnect ssl_root_1;
 
 --echo # Connect using mysql client : This must succeed.
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uroot --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher';"
 
 
@@ -140,7 +142,7 @@ let SEARCH_PATTERN= CA certificate .* is self signed.;
 --source include/search_pattern_in_file.inc
 
 --echo # Try creating SSL connection
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL -uroot --ssl-mode=REQUIRED -e "show status like 'Ssl_cipher';"
 
 
diff --git a/mysql-test/suite/auth_sec/t/tls.cnf b/mysql-test/suite/auth_sec/t/tls.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/mysql-test/suite/auth_sec/t/tls.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/mysql-test/suite/auth_sec/t/tls.test b/mysql-test/suite/auth_sec/t/tls.test
index cd9e9ee95065..1e19ed8d90fe 100644
--- a/mysql-test/suite/auth_sec/t/tls.test
+++ b/mysql-test/suite/auth_sec/t/tls.test
@@ -32,22 +32,17 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`;
 let $MYSQL_SOCKET= `SELECT @@socket`;
 let $MYSQL_PORT= `SELECT @@port`;
 
-let $cipher_default= DHE-RSA-AES256-SHA;
-let $tls_default= TLSv1.1;
-let $openssl= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
-if ($openssl == 'Rsa_public_key'){
-  let $cipher_default= DHE-RSA-AES128-GCM-SHA256;
-  let $tls_default= TLSv1.2;
-}
+let $tls_default= TLSv1.2;
+
 --echo #T1: Default TLS connection
 --replace_result $tls_default TLS_VERSION
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "SHOW STATUS like 'Ssl_version'"
 
 --echo #T2: Default SSL cipher
---replace_result $cipher_default SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "SHOW STATUS like 'Ssl_cipher'"
 
---echo #T3: Setting TLS version TLSv1.2 (for yassl TLSv1.1) from the client
+--echo #T3: Setting TLS version TLSv1.2 from the client
 --replace_result $tls_default TLS_VERSION
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT --tls-version=$tls_default -e "SHOW STATUS like 'Ssl_version'"
 
@@ -79,15 +74,7 @@ if ($openssl == 'Rsa_public_key'){
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-# This test only need to run for openssl build as Camella256 cipher is not supported by yassl
-if ($openssl == 'Rsa_public_key'){ 
-  --exec $MYSQL -h 127.0.0.1 -P $MYSQL_PORT --ssl-cipher=CAMELLIA256-SHA -e "SHOW STATUS like 'Ssl_cipher'"
-}
-
-if ($openssl != 'Rsa_public_key'){
---echo Variable_name	Value
---echo Ssl_cipher	CAMELLIA256-SHA
-}
+--exec $MYSQL -h 127.0.0.1 -P $MYSQL_PORT --ssl-cipher=CAMELLIA256-SHA -e "SHOW STATUS like 'Ssl_cipher'"
 
 --echo #T10: Permanently restricted cipher, setting in the server as well
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
diff --git a/mysql-test/suite/auth_sec/t/tls12_tls1.cnf b/mysql-test/suite/auth_sec/t/tls12_tls1.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/mysql-test/suite/auth_sec/t/tls12_tls1.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/mysql-test/suite/auth_sec/t/tls12_tls1.test b/mysql-test/suite/auth_sec/t/tls12_tls1.test
new file mode 100644
index 000000000000..24e44da23b80
--- /dev/null
+++ b/mysql-test/suite/auth_sec/t/tls12_tls1.test
@@ -0,0 +1,65 @@
+# Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
+
+-- source include/have_ssl.inc
+
+# Test requires TLSv1 and TLSv1.1
+--source include/not_min_protocol_tlsv12.inc
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+--echo #
+--echo # WL#8196 TLSv1.2 support with TLSv1/TLSv1.1 client
+--echo #
+
+--disable_query_log
+call mtr.add_suppression("Failed to set up SSL because of");
+call mtr.add_suppression("Plugin mysqlx reported: 'Failed at SSL configuration");
+--enable_query_log
+
+# We let our server restart attempts write to the file $error_log.
+let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
+
+--error 0,1
+--remove_file $error_log
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQL_SOCKET= `SELECT @@socket`;
+let $MYSQL_PORT= `SELECT @@port`;
+
+--echo #T1: Setting TLS version TLSv1.1 from the client
+--exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT --tls-version=TLSv1.1 -e "SHOW STATUS like 'Ssl_version'"
+
+--echo #T2: Setting TLS version TLSv1 from the client
+--exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT --tls-version=TLSv1 -e "SHOW STATUS like 'Ssl_version'"
+
+--echo #T3: Setting TLS version TLSv1, TLSv1.1 from the client
+--exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT --tls-version=TLSv1,TLSv1.1 -e "SHOW STATUS like 'Ssl_version'"
+
+--exec echo "restart:--tls-version=TLSv1.2 --ssl-cipher=CAMELLIA256-SHA " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo #T4: Setting TLS version1.2 in the server and from client giving TLSv1.1, connection should fail
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--exec echo "restart:--tls-version=TLSv1.2 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--error 1
+--exec $MYSQL --ssl-mode=REQUIRED --host=127.0.0.1 -P $MASTER_MYPORT --tls-version=TLSv1.1 -e "SHOW STATUS like 'Ssl_version'"
+
+--echo # restart server using restart
+--echo Restart server and provide ssl-cipher at server startup
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--exec echo "restart: " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result
deleted file mode 100644
index 17923eddbbac..000000000000
--- a/mysql-test/suite/binlog/r/binlog_base64_flag.result
+++ /dev/null
@@ -1,114 +0,0 @@
-DROP TABLE IF EXISTS t1;
-==== Test BUG#32407 ====
-select * from t1;
-a
-1
-1
-==== Test BINLOG statement w/o FD event ====
-BINLOG '
-SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
-';
-ERROR HY000: The BINLOG statement of type `Table_map` was not preceded by a format description BINLOG statement.
-select * from t1;
-a
-1
-1
-==== Test BINLOG statement with FD event ====
-BINLOG '
-ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
-BINLOG '
-TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA==
-';
-select * from t1;
-a
-1
-1
-3
-==== Test --base64-output=never on a binlog with row events ====
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-DELIMITER /*!*/;
-# at 4
-<#>ROLLBACK/*!*/;
-# at 120
-<#>use `test`/*!*/;
-SET TIMESTAMP=1360247561/*!*/;
-<#>SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=1073741824/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C utf8 *//*!*/;
-SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
-CREATE TABLE t1 (a int) engine = myisam
-/*!*/;
-# at 233
-<#>SET TIMESTAMP=1360247563/*!*/;
-BEGIN
-/*!*/;
-# at 305
-<#>ROLLBACK /* added by mysqlbinlog */ /*!*/;
-SET @@SESSION.GTID_NEXT= 'AUTOMATIC' /* added by mysqlbinlog */ /*!*/;
-DELIMITER ;
-# End of log file
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
-==== Test non-matching FD event and Row event ====
-BINLOG '
-4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAADgJ1hHEzgNAAgAEgAEBAQEEgAATwAEGggICAg=
-';
-BINLOG '
-Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA==
-';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use
-select * from t1;
-a
-1
-1
-3
-CREATE TABLE char128_utf8 ( 
-i1 INT NOT NULL, 
-c CHAR(128) CHARACTER SET utf8 NOT NULL, 
-i2 INT NOT NULL);
-CREATE TABLE char63_utf8 (
-i1 INT NOT NULL,
-c CHAR(63) CHARACTER SET utf8 NOT NULL,
-i2 INT NOT NULL);
-BINLOG '
-MuNkSA8BAAAAZgAAAGoAAAAAAAQANS4xLjI1LXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAy42RIEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
-BINLOG '
-3u9kSBMBAAAANgAAAJYBAAAAABAAAAAAAAAABHRlc3QAC2NoYXI2M191dGY4AAMD/gMC/r0A
-3u9kSBcBAAAAKgAAAMABAAAQABAAAAAAAAEAA//4AQAAAAMxMjMBAAAA
-';
-SELECT * FROM char63_utf8;
-i1	c	i2
-1	123	1
-BINLOG '
-iONkSBMBAAAANwAAAJkBAAAAABAAAAAAAAAABHRlc3QADGNoYXIxMjhfdXRmOAADA/4DAv6AAA==
-iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
-';
-ERROR HY000: master may suffer from http://bugs.mysql.com/bug.php?id=37426 so slave stops; check error log on slave for more info
-drop table t1, char63_utf8, char128_utf8;
-call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
-call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
-#
-# Bug #54393: crash and/or valgrind errors in 
-# mysql_client_binlog_statement
-#
-BINLOG '';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use
-BINLOG '123';
-ERROR HY000: Decoding of base64 string failed
-BINLOG '-2079193929';
-ERROR HY000: Decoding of base64 string failed
-BINLOG 'xç↓%~∙D╒ƒ╡';
-ERROR HY000: Decoding of base64 string failed
diff --git a/mysql-test/suite/binlog/r/binlog_cache_write_failure.result b/mysql-test/suite/binlog/r/binlog_cache_write_failure.result
new file mode 100644
index 000000000000..fe73e67a0012
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_cache_write_failure.result
@@ -0,0 +1,65 @@
+call mtr.add_suppression("An error occurred during flush stage of the commit");
+call mtr.add_suppression("Attempting backtrace. You can use the following information to find out*");
+RESET MASTER;
+CREATE TABLE t1(i INT);
+
+# Case 1 (binlog_error_action = ABORT_SERVER)
+
+SET GLOBAL binlog_error_action = ABORT_SERVER;
+
+# Case 1.1  CLIENT DISCONNECTION
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+ERROR HY000: Error writing file <tmp_file_name> (Errcode: ##)
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+
+# Case 1.2 ROLLBACK
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+ERROR HY000: Error writing file <tmp_file_name> (Errcode: ##)
+ROLLBACK;
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+
+# Case 1.3 COMMIT
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+ERROR HY000: Error writing file <tmp_file_name> (Errcode: ##)
+COMMIT;
+ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Server is being stopped.
+include/assert_grep.inc [An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'.]
+include/assert.inc [Count of elements in t1 should be 0.]
+include/assert.inc [Query is not binlogged as expected.]
+TRUNCATE TABLE t1;
+
+# Case 2 (binlog_error_action = IGNORE_ERROR)
+
+RESET MASTER;
+SET GLOBAL binlog_error_action= IGNORE_ERROR;
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+ERROR HY000: Error writing file <tmp_file_name> (Errcode: ##)
+COMMIT;
+Warnings:
+Error	3	Error writing file MYSQLTEST_VARDIR/tmp/temp_file (Errcode: ##)
+Error	1026	Error writing file MYSQLTEST_VARDIR/tmp/temp_file (Errcode: ##)
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+include/assert.inc [Count of elements in t1 should be 2.]
+SHOW BINARY LOGS;
+ERROR HY000: You are not using binary logging
+include/assert_grep.inc [An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'IGNORE_ERROR'.]
+# restart
+include/assert.inc [Count of elements in t1 should be 2.]
+DROP TABLE t1;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_check_flush_log_assertion.result b/mysql-test/suite/binlog/r/binlog_check_flush_log_assertion.result
index 5984a28e95d0..7b261e41b8b6 100644
--- a/mysql-test/suite/binlog/r/binlog_check_flush_log_assertion.result
+++ b/mysql-test/suite/binlog/r/binlog_check_flush_log_assertion.result
@@ -1,18 +1,16 @@
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
-SET GLOBAL debug='+d,error_unique_log_filename';
+# Adding debug point 'error_unique_log_filename' to @@GLOBAL.debug
 FLUSH LOGS;
 ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
 
 # restart
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
-SET GLOBAL debug='+d,error_unique_log_filename';
+# Adding debug point 'error_unique_log_filename' to @@GLOBAL.debug
 RESET MASTER;
 ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
 
-SET GLOBAL debug='-d,error_unique_log_filename';
-SET @@GLOBAL.DEBUG= @debug_save;
+# Removing debug point 'error_unique_log_filename' from @@GLOBAL.debug
 RESET MASTER;
 ERROR HY000: Target log not found in binlog index
 SET GLOBAL binlog_error_action= ABORT_SERVER;
 FLUSH LOGS;
-RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_corrupt_update_log_event.result b/mysql-test/suite/binlog/r/binlog_corrupt_update_log_event.result
new file mode 100644
index 000000000000..7a864b42c856
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_corrupt_update_log_event.result
@@ -0,0 +1,73 @@
+call mtr.add_suppression(".*error 1610.*");
+# 1. Create a database
+CREATE DATABASE ulms;
+USE ulms;
+# 2. Create a table on the server
+CREATE TABLE `t5k_trade_is_fields_rslt` (
+`CA` varchar(64) NOT NULL ,
+`SEQ` int(8) NOT NULL ,
+`MSEQ` int(8) NOT NULL ,
+`MT` char(1) DEFAULT NULL ,
+`M_CONTENT` varchar(2000) DEFAULT NULL ,
+`M_ORIGINAL_CONTENT` varchar(2000) DEFAULT NULL ,
+`SC` double(16,2) DEFAULT NULL ,
+`CUST_ID` varchar(64) DEFAULT NULL ,
+`LIST_CODE` varchar(240) DEFAULT NULL ,
+`IS_REAL_HIT` char(1) DEFAULT NULL ,
+`IS_PASS` char(1) DEFAULT NULL ,
+`CHECK_TYPE` varchar(64) DEFAULT NULL ,
+`SCREEN_STATUS` char(1) DEFAULT NULL ,
+`HANLDER` varchar(64) DEFAULT NULL ,
+`PTIME` char(19) DEFAULT NULL ,
+`RECOGNIZE_STATUS` char(1) DEFAULT '0' ,
+`RECOGNIZE_OPTION` varchar(2048) DEFAULT NULL ,
+`AUDIT_STATUS` char(1) DEFAULT NULL ,
+`AUDIT_OPTION` varchar(2048) DEFAULT NULL ,
+`AUDIT_OPTION_STATUS` char(10) DEFAULT NULL ,
+`CHECK_STATUS` char(1) DEFAULT NULL ,
+`CHECK_OPTION` varchar(2048) DEFAULT NULL ,
+`CHECK_OPTION_STATUS` varchar(10) DEFAULT NULL ,
+`APPROVE_STATUS` char(1) DEFAULT NULL ,
+PRIMARY KEY (`CA`,`SEQ`,`MSEQ`),
+KEY `T5K_TRADE_IS_FIELDS_RSLT_CUST_ID_IDX` (`CUST_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ;
+# 3. Apply an Insert log event
+INSERT INTO `ulms`.`t5k_trade_is_fields_rslt` values(
+'039c6a32-dc1b-4978-bf6c-df6ea0cd80d4-1662617934' /* VARSTRING(256) meta=256 nullable=0 is_null=0 */		,
+1 /* INT meta=0 nullable=0 is_null=0 */									,
+0 /* INT meta=0 nullable=0 is_null=0 */									,
+'1' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+'K.A.S. ' /* VARSTRING(8000) meta=8000 nullable=1 is_null=0 */						,
+'K.S.A.' /* VARSTRING(8000) meta=8000 nullable=1 is_null=0 */						,
+1 /* DOUBLE meta=8 nullable=1 is_null=0 */									,
+'625224' /* VARSTRING(256) meta=256 nullable=1 is_null=0 */							,
+'T03,T04' /* VARSTRING(960) meta=960 nullable=1 is_null=0 */							,
+'2' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+'1' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+'3:报文' /* VARSTRING(256) meta=256 nullable=1 is_null=0 */							,
+NULL /* STRING(4) meta=65028 nullable=1 is_null=1 */								,
+NULL /* VARSTRING(256) meta=256 nullable=1 is_null=1 */							,
+NULL /* STRING(76) meta=65100 nullable=1 is_null=1 */							,
+'2' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+'K.S.A. 表示沙特阿拉伯的国家缩写，不涉及相关名单' /* VARSTRING(8192) meta=8192 nullable=1 is_null=0 */	,
+'4' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+'不涉及相关名单' /* VARSTRING(8192) meta=8192 nullable=1 is_null=0 */					,
+'4' /* STRING(40) meta=65064 nullable=1 is_null=0 */								,
+'6' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+NULL /* VARSTRING(8192) meta=8192 nullable=1 is_null=1 */							,
+NULL /* VARSTRING(40) meta=40 nullable=1 is_null=1 */							,
+'' /* STRING(4) meta=65028 nullable=1 is_null=0 */
+);
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC'/*!*/;
+BINLOG 'U2EZYw8CAAAAdwAAAHsAAAAAAAQANS43LjM2LWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEzgNAAgAEgAEBAQEEgAAXwAEGggAAAAICAgCAAAACgoKKioAEjQAAYA9mSk='/*!*/;
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC';
+BEGIN;
+# 4. Apply a corrupted Update log event and expect an error.
+BINLOG '
+y6oZYxMCAAAAhwAAAKCwrTIAAH8gAAAAAAEABHVsbXMAGHQ1a190cmFkZV9pc19maWVsZHNfcnNsdAAYDwMD/g8PBQ8P/v4P/g/+/g/+D/7+Dw/+KwAB/gRAH0AfCAABwAP+BP4EAAH+BAAB/kz+BAAg/gQAIP4o/gQAICgA/gT4///M3BmQ
+06oZYx8CAAAA3AEAANwBAAAAAH8gAAAAAAMAAgAY////////NgBgLwAwMzljNmEzMi1kYzFiLTQ5NzgtYmY2Yy1kZjZlYTBjZDgwZDQtMTY2MjYxNzkzNAEAAAAAAAAAATEHAEsuQS5TLiAGAEsuUy5BLgAAAAAAAPA/BgA2MjUyMjQHAFQwMyxUMDQBMgExCAAzOuaKpeaWhwEyQwBLLlMuQS4g6KGo56S65rKZ54m56Zi/5ouJ5Lyv55qE5Zu95a6257yp5YaZ77yM5LiN5raJ5Y+K55u45YWz5ZCN5Y2VATQVAOS4jea2ieWPiuebuOWFs+WQjeWNlQE0ATYAAHBwLwAwMzljNmEzMi1kYzFiLTQ5NzgtYmY2Yy1kZjZlYTBjZDgwZDQtMTY2MjYxNzkzNAEAAAAAAAAAATEHAEsuQS5TLiAGAEsuUy5BLgAAAAAAAPA/BgA2MjUyMjQHAFQwMyxUMDQBMgExCAAzOuaKpeaWhwEyQwBLLlMuQS4g6KGo56S65rKZ54m56Zi/5ouJ5Lyv55qE5Zu95a6257yp5YaZ77yM5LiN5raJ5Y+K55u45YWz5ZCN5Y2VATQVAOS4jea2ieWPiuebuOWFs+WQjeWNlQE0APt/AAA=
+'/*!*/;
+ERROR HY000: Corrupted replication event was detected
+COMMIT;
+# 5. Cleanup
+DROP DATABASE ulms;
diff --git a/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_row_mix.result b/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_row_mix.result
new file mode 100644
index 000000000000..944dcbd4aced
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_row_mix.result
@@ -0,0 +1,22 @@
+RESET MASTER;
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+CREATE TABLE t2(a INT) ENGINE=MyISAM;
+SET @saved_binlog_format= @@SESSION.binlog_format;
+SET SESSION binlog_format= 'STATEMENT';
+CREATE TEMPORARY TABLE tmp10 (a INT);
+SET SESSION binlog_format= @saved_binlog_format;
+CREATE TEMPORARY TABLE tmp1 ENGINE=InnoDB SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp2 ENGINE=MyISAM SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp3 ENGINE=MyISAM SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp4 ENGINE=InnoDB SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp5 (a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE tmp6 (a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE tmp7 LIKE t1;
+CREATE TEMPORARY TABLE tmp8 LIKE t2;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2(a INT) ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp10 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `tmp10`
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_stmt.result b/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_stmt.result
new file mode 100644
index 000000000000..a0432263cc33
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_stmt.result
@@ -0,0 +1,28 @@
+RESET MASTER;
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+CREATE TABLE t2(a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE tmp1 ENGINE=InnoDB SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp2 ENGINE=MyISAM SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp3 ENGINE=MyISAM SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp4 ENGINE=InnoDB SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp5 (a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE tmp6 (a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE tmp7 LIKE t1;
+CREATE TEMPORARY TABLE tmp8 LIKE t2;
+SET SESSION binlog_format= 'ROW';
+CREATE TEMPORARY TABLE tmp10 (a INT);
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2(a INT) ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp1 ENGINE=InnoDB SELECT * FROM t1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp2 ENGINE=MyISAM SELECT * FROM t2
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp3 ENGINE=MyISAM SELECT * FROM t1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp4 ENGINE=InnoDB SELECT * FROM t2
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp5 (a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp6 (a INT) ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp7 LIKE t1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp8 LIKE t2
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `tmp7`,`tmp5`,`tmp4`,`tmp1`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `tmp8`,`tmp6`,`tmp3`,`tmp2`
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/binlog/r/binlog_error_action.result b/mysql-test/suite/binlog/r/binlog_error_action.result
index 90980274f04f..e562b08de004 100644
--- a/mysql-test/suite/binlog/r/binlog_error_action.result
+++ b/mysql-test/suite/binlog/r/binlog_error_action.result
@@ -97,7 +97,7 @@ CREATE TABLE t1(i INT);
 SET SESSION debug = "+d,simulate_error_during_flush_cache_to_file";
 SET GLOBAL binlog_error_action = ABORT_SERVER;
 INSERT INTO t1 VALUES (1);
-ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Hence aborting the server.
+ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Server is being stopped.
 include/assert.inc [Count of elements in t1 should be 0.]
 include/assert.inc [Query is not binlogged as expected.]
 RESET MASTER;
@@ -115,7 +115,7 @@ CREATE TABLE t1(i INT);
 SET SESSION debug = "+d,simulate_error_during_sync_binlog_file";
 SET GLOBAL binlog_error_action = ABORT_SERVER;
 INSERT INTO t1 VALUES (1);
-ERROR HY000: Binary logging not possible. Message: An error occurred during sync stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Hence aborting the server.
+ERROR HY000: Binary logging not possible. Message: An error occurred during sync stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Server is being stopped.
 DELETE FROM t1;
 RESET MASTER;
 SET SESSION debug = "+d,simulate_error_during_sync_binlog_file";
@@ -131,7 +131,7 @@ CREATE TABLE t1(i INT);
 SET SESSION debug = "+d,simulate_do_write_cache_failure";
 SET GLOBAL binlog_error_action = ABORT_SERVER;
 INSERT INTO t1 VALUES (1);
-ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Hence aborting the server.
+ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Server is being stopped.
 include/assert.inc [Count of elements in t1 should be 0.]
 include/assert.inc [Query is not binlogged as expected.]
 RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_grant_alter_user.result b/mysql-test/suite/binlog/r/binlog_grant_alter_user.result
index ace1bfd23c6d..5d9898b43c95 100644
--- a/mysql-test/suite/binlog/r/binlog_grant_alter_user.result
+++ b/mysql-test/suite/binlog/r/binlog_grant_alter_user.result
@@ -105,7 +105,7 @@ plugin	mysql_native_password
 authentication_string	#
 password_expired	N
 
-CREATE USER tu3@localhost IDENTIFIED WITH 'mysql_native_password' AS '%auth_O0s-tring';
+CREATE USER tu3@localhost IDENTIFIED WITH 'mysql_native_password' BY '%auth_O0s-tring';
 SELECT user,plugin,authentication_string,password_expired
 FROM mysql.user WHERE USER='tu3';
 user	tu3
@@ -133,7 +133,7 @@ user	tu4
 plugin	mysql_native_password
 authentication_string	#
 ssl_type	ANY
-CREATE USER tu5@localhost IDENTIFIED WITH 'mysql_native_password' AS 'dwh@#ghd$!' REQUIRE X509;
+CREATE USER tu5@localhost IDENTIFIED WITH 'mysql_native_password' BY 'dwh@#ghd$!' REQUIRE X509;
 SELECT user,plugin,authentication_string,ssl_type FROM mysql.user WHERE USER='tu5';
 user	tu5
 plugin	mysql_native_password
@@ -187,7 +187,7 @@ x509_subject	/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client
 SELECT USER();
 USER()
 u10@localhost
-CREATE USER tu6@localhost IDENTIFIED WITH 'mysql_native_password' AS '#hGrt0O6'
+CREATE USER tu6@localhost IDENTIFIED WITH 'mysql_native_password' BY '#hGrt0O6'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
@@ -253,7 +253,7 @@ u19@localhost IDENTIFIED BY 'auth_string',
 u20@localhost IDENTIFIED WITH 'mysql_native_password',
 u21@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string',
 u22@localhost IDENTIFIED WITH 'mysql_native_password',
-u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 ACCOUNT UNLOCK;
 SELECT user,plugin,authentication_string,ssl_type,ssl_cipher,
@@ -675,7 +675,7 @@ authentication_string	#
 password_expired	N
 password_last_changed	#
 password_lifetime	NULL
-CREATE USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+CREATE USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
 SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
@@ -927,7 +927,7 @@ u19@localhost IDENTIFIED BY 'auth_string',
 u20@localhost IDENTIFIED WITH 'mysql_native_password',
 u21@localhost IDENTIFIED WITH 'mysql_native_password' BY '!Y_TOdh6)',
 u22@localhost IDENTIFIED WITH 'mysql_native_password',
-u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 SELECT user,ssl_type,ssl_cipher,x509_issuer,x509_subject,
@@ -1213,12 +1213,12 @@ CREATE USER u4@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string
 SHOW CREATE USER u4@localhost;
 CREATE USER for u4@localhost
 CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
-CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user1@localhost;
 CREATE USER for user1@localhost
 CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 SHOW CREATE USER user2@localhost;
 CREATE USER for user2@localhost
 CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '<non-deterministic-password-hash>' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
@@ -1356,7 +1356,7 @@ DROP USER user1@localhost,user2@localhost,user3@localhost;
 # SET PASSWORD Tests
 
 CREATE USER user1@localhost IDENTIFIED BY 'auth_string';
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string1';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string1';
 SELECT PASSWORD('plaintext_pwd');
 PASSWORD('plaintext_pwd')
 *F42EC6870C44E0E26316EC1D4A953A4B9C2D8958
@@ -1495,22 +1495,22 @@ slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user7'@'localhost' IDENTIF
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user8'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu1'@'localhost' IDENTIFIED WITH 'mysql_native_password'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*688BC28176C50B8E37AB2D9BDFDCC945AD0CAD61'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu3'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '%auth_O0s-tring'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu3'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*4CB92EE3F6DCB4480A1ED46B0B82E3E6180947D5'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u5'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE SSL
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE X509
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu4'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*0D38B5A8766439BA457E3FDFAF84D794245A1C8B' REQUIRE SSL
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu5'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'dwh@#ghd$!' REQUIRE X509
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu5'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*87CAAC9F8E0664808E450E3E9D4CCCA455FB90F0' REQUIRE X509
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'cipher'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u8'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u9'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE SUBJECT 'sub'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*D0B4490FF0452CF4EAA50F79F6B06F859FA2B012' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu6'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '#hGrt0O6' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu6'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6F268C32216139F3B99FEBA90FC68F8D9651382A' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u11'@'localhost' IDENTIFIED WITH 'mysql_native_password' WITH MAX_QUERIES_PER_HOUR 2
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u12'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' WITH MAX_QUERIES_PER_HOUR 2
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u13'@'localhost' IDENTIFIED WITH 'mysql_native_password' WITH MAX_CONNECTIONS_PER_HOUR 2
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u14'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' WITH MAX_USER_CONNECTIONS 2 ACCOUNT LOCK
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password','u16'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u17'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'mysql_native_password','u19'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u20'@'localhost' IDENTIFIED WITH 'mysql_native_password','u21'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u22'@'localhost' IDENTIFIED WITH 'mysql_native_password','u23'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 ACCOUNT UNLOCK
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'mysql_native_password','u19'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u20'@'localhost' IDENTIFIED WITH 'mysql_native_password','u21'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u22'@'localhost' IDENTIFIED WITH 'mysql_native_password','u23'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*318C29553A414C4A571A077BC9E9A9F67D5E5634' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 ACCOUNT UNLOCK
 slave-bin.000001	#	Query	#	#	use `test`; DROP USER tu1@localhost,tu2@localhost,tu3@localhost,tu4@localhost,tu5@localhost,
 tu6@localhost,user1@'%',user2@'%',user4@localhost,user6@localhost,
 user7@localhost,user8@localhost, u1@localhost,u2@localhost,u3@localhost,
@@ -1542,7 +1542,7 @@ slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'tu1'@'localhost' IDENTIFIED
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u9'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE SUBJECT 'sub'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u9'@'localhost' REQUIRE ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u9'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*AEEAD8F349FAED7CA659DCEFCEC2F0BF90241263' REQUIRE ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' CIPHER 'DHE-RSA-AES256-SHA'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u10'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE SSL
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u11'@'localhost' IDENTIFIED WITH 'mysql_native_password' WITH MAX_QUERIES_PER_HOUR 2
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u11'@'localhost' WITH MAX_QUERIES_PER_HOUR 6
@@ -1557,7 +1557,7 @@ slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'tu2'@'localhost' IDENTIFIE
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'tu2'@'localhost' WITH MAX_QUERIES_PER_HOUR 543 MAX_USER_CONNECTIONS 12 PASSWORD EXPIRE INTERVAL 365 DAY
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password','u16'@'localhost' IDENTIFIED WITH 'mysql_native_password','u17'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u15'@'localhost' IDENTIFIED WITH 'mysql_native_password','u16'@'localhost','u17'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*5B3304C97AB136DEBC2C0B46336F27398F7AEFB6' PASSWORD EXPIRE DEFAULT
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'mysql_native_password','u19'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u20'@'localhost' IDENTIFIED WITH 'mysql_native_password','u21'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*8A92C25096CC077349306CDC1CA8BE466ED357E3','u22'@'localhost' IDENTIFIED WITH 'mysql_native_password','u23'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u18'@'localhost' IDENTIFIED WITH 'mysql_native_password','u19'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF','u20'@'localhost' IDENTIFIED WITH 'mysql_native_password','u21'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*8A92C25096CC077349306CDC1CA8BE466ED357E3','u22'@'localhost' IDENTIFIED WITH 'mysql_native_password','u23'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*318C29553A414C4A571A077BC9E9A9F67D5E5634' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'u18'@'localhost','u19'@'localhost','u20'@'localhost','u21'@'localhost','u22'@'localhost','u23'@'localhost' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 PASSWORD EXPIRE NEVER
 slave-bin.000001	#	Query	#	#	use `test`; DROP USER tu1@localhost,tu2@localhost,u1@localhost, u2@localhost, u3@localhost,
 u4@localhost,u5@localhost,u6@localhost, u7@localhost, u8@localhost,
@@ -1582,8 +1582,8 @@ slave-bin.000001	#	Query	#	#	use `test`; DROP USER u2@localhost
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE NONE
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u3'@'localhost' IDENTIFIED WITH 'mysql_native_password'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u4'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u5'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE SSL
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u6'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE X509
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u7'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE CIPHER 'cipher'
@@ -1608,7 +1608,7 @@ slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user3'@'localhost' IDENTIF
 slave-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON `mysql`.* TO 'user3'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF' REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client' ISSUER '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA' WITH MAX_QUERIES_PER_HOUR 60 MAX_UPDATES_PER_HOUR 100 MAX_CONNECTIONS_PER_HOUR 1000 MAX_USER_CONNECTIONS 20
 slave-bin.000001	#	Query	#	#	use `test`; DROP USER user1@localhost,user2@localhost,user3@localhost
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
-slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS 'auth_string1'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*BB2A6C4B68EBE1B781C294D655785971401FB13B'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'user1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*5BC789A788B4F867BF1B8DB2A6A20ACDF5B32C49'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*F03819CC796CCA4052B8928179B81D18288B05A8'
 slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user4'@'localhost' IDENTIFIED WITH 'mysql_native_password'
diff --git a/mysql-test/suite/binlog/r/binlog_group_commit_sync_delay_error.result b/mysql-test/suite/binlog/r/binlog_group_commit_sync_delay_error.result
new file mode 100644
index 000000000000..428279f4e04b
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_group_commit_sync_delay_error.result
@@ -0,0 +1,9 @@
+CREATE TABLE t(s INT);
+SET GLOBAL binlog_group_commit_sync_delay = 32;
+SET GLOBAL binlog_group_commit_sync_no_delay_count = 0;
+BEGIN;
+INSERT INTO t VALUES(10);
+COMMIT;
+SET GLOBAL binlog_group_commit_sync_delay = 0;
+SET GLOBAL binlog_group_commit_sync_no_delay_count = 0;
+DROP TABLE t;
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_exhausted.result b/mysql-test/suite/binlog/r/binlog_gtid_exhausted.result
index 71f75288e55e..384e7fec8ba4 100644
--- a/mysql-test/suite/binlog/r/binlog_gtid_exhausted.result
+++ b/mysql-test/suite/binlog/r/binlog_gtid_exhausted.result
@@ -6,7 +6,8 @@ RESET MASTER;
 SET GLOBAL gtid_purged = CONCAT(@@GLOBAL.server_uuid, ':1-9223372036854775805');
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
-ERROR HY000: Impossible to generate Global Transaction Identifier: the integer component reached the maximal value. Restart the server with a new server_uuid.
+ERROR HY000: Impossible to generate GTID: the integer component reached the maximum value. Restart the server with a new server_uuid.
+include/assert_grep.inc [ER_GNO_EXHAUSTED found in server error log]
 include/assert.inc [Count of elements in t1 should be 2.]
 # restart
 RESET MASTER;
@@ -17,6 +18,7 @@ SET GLOBAL gtid_purged = CONCAT(@@GLOBAL.server_uuid, ':1-9223372036854775805');
 INSERT INTO t1 VALUES (1);
 SET GLOBAL binlog_error_action=ABORT_SERVER;
 INSERT INTO t1 VALUES (2);
-ERROR HY000: Binary logging not possible. Message: An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'. Hence aborting the server.
+ERROR HY000: Binary logging not possible. Message: Impossible to generate GTID: the integer component reached the maximum value. Restart the server with a new server_uuid. Server is being stopped.
 RESET MASTER;
 DROP TABLE t1;
+include/assert_grep.inc [ER_GNO_EXHAUSTED server is being stopped found in server error log]
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_next_xa.result b/mysql-test/suite/binlog/r/binlog_gtid_next_xa.result
index 942cc8c6e362..6c046525abea 100644
--- a/mysql-test/suite/binlog/r/binlog_gtid_next_xa.result
+++ b/mysql-test/suite/binlog/r/binlog_gtid_next_xa.result
@@ -787,7 +787,7 @@ one
 0
 SELECT count(*) FROM mysql.gtid_executed FOR UPDATE;
 count(*)
-16
+17
 Warnings:
 Warning	3129	Please do not modify the gtid_executed table. This is a mysql internal system table to store GTIDs for committed transactions. Modifying it can lead to an inconsistent GTID state.
 [connection master]
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_ps_reprepare.result b/mysql-test/suite/binlog/r/binlog_gtid_ps_reprepare.result
new file mode 100644
index 000000000000..0a8fa2700839
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_gtid_ps_reprepare.result
@@ -0,0 +1,77 @@
+# ==== Initialize ====
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a INT);
+PREPARE stmt1 FROM 'INSERT INTO t1 VALUES (1)';
+CREATE PROCEDURE p1 ()
+BEGIN
+INSERT INTO t2 VALUES(2);
+END
+$
+CREATE PROCEDURE p2 ()
+BEGIN
+EXECUTE stmt1;
+END
+$
+# ==== Case 1 ====
+# Test case to verify gtid_next update with prepared statement re-prepare.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+BEGIN;
+EXECUTE stmt1;
+COMMIT;
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2';
+TRUNCATE TABLE t1;
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3';
+# Without fix, following statement execution fails.
+EXECUTE stmt1;
+# ==== Case 2 ====
+# Test case to verify gtid_next update with stored procedure statement
+# re-prepare.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:4';
+CALL p1();
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5';
+TRUNCATE TABLE t2;
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:6';
+# Without fix, following statement execution fails.
+CALL p1();
+# ==== Case 3 ====
+# Test case to verify gtid_next update with prepared statement re-prepare
+# in stored procedure.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:7';
+CALL p2();
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:8';
+TRUNCATE TABLE t1;
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:9';
+# Without fix, following statement execution fails.
+CALL p2();
+# === Case 4 ===
+# Test case to verify gtid_next update with prepared statement max
+# re-prepare attempt hits.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:10';
+TRUNCATE TABLE t1;
+# Adding debug point 'simulate_max_reprepare_attempts_hit_case' to @@SESSION.debug
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:11';
+# Error is reported when max re-prepare limit is hit. Transaction is
+# rolled back and gtid_next is updated.
+EXECUTE stmt1;
+ERROR HY000: Prepared statement needs to be re-prepared
+INSERT INTO t1 VALUES(10);
+ERROR HY000: When @@SESSION.GTID_NEXT is set to a GTID, you must explicitly set it to a different value after a COMMIT or ROLLBACK. Please check GTID_NEXT variable manual page for detailed explanation. Current @@SESSION.GTID_NEXT is 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:11'.
+# === Case 5 ===
+# Test case to verify gtid_next update with stored procedure statement
+# max re-prepare attempt hits.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:12';
+TRUNCATE TABLE t2;
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:13';
+# Error is reported when max re-prepare limit is hit. Transaction is
+# rolled back and gtid_next is updated.
+CALL p1;
+ERROR HY000: Prepared statement needs to be re-prepared
+INSERT INTO t2 VALUES(10);
+ERROR HY000: When @@SESSION.GTID_NEXT is set to a GTID, you must explicitly set it to a different value after a COMMIT or ROLLBACK. Please check GTID_NEXT variable manual page for detailed explanation. Current @@SESSION.GTID_NEXT is 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:13'.
+# ==== Cleanup ====
+SET gtid_next = DEFAULT;
+# Removing debug point 'simulate_max_reprepare_attempts_hit_case' from @@SESSION.debug
+DEALLOCATE PREPARE stmt1;
+DROP TABLE t1, t2;
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_purge_binlog_at_startup.result b/mysql-test/suite/binlog/r/binlog_gtid_purge_binlog_at_startup.result
new file mode 100644
index 000000000000..e127402f8ab4
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_gtid_purge_binlog_at_startup.result
@@ -0,0 +1,17 @@
+RESET MASTER;
+CREATE TABLE t (a INT);
+include/stop_mysqld.inc [server 1]
+# restart: --debug=+d,expire_logs_always_at_start --expire-logs-days=1
+include/assert.inc [GTID_PURGED is consistent]
+include/assert.inc [We have 1 binlog file]
+DROP TABLE t;
+RESET MASTER;
+CREATE TABLE t (a INT);
+FLUSH LOGS;
+INSERT INTO t VALUES (1), (2), (3);
+include/stop_mysqld.inc [server 1]
+# restart: --debug=+d,expire_logs_always_at_start --expire-logs-days=1
+include/assert.inc [GTID_PURGED is consistent]
+include/assert.inc [We have 1 binlog file]
+DROP TABLE t;
+SET GLOBAL debug = "-d,expire_logs_always_at_start";
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result b/mysql-test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result
new file mode 100644
index 000000000000..28f3981047c7
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result
@@ -0,0 +1,13 @@
+# TC1. Test if GTID consistency state is rolled back after failure
+# ----------------------------------------------------------------
+XA START 'xa1';
+XA END 'xa1';
+XA PREPARE 'xa1';
+CREATE TEMPORARY TABLE t1 (c INT) ENGINE=InnoDB;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
+SET @@SESSION.GTID_NEXT='ANONYMOUS';
+XA COMMIT 'xa1';
+# TC2. Test if GTID consistency state is persisted after success
+# --------------------------------------------------------------
+CREATE TEMPORARY TABLE t1 (c INT) ENGINE=InnoDB;
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_unknown_xid.result b/mysql-test/suite/binlog/r/binlog_gtid_unknown_xid.result
new file mode 100644
index 000000000000..33757571dfc1
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_gtid_unknown_xid.result
@@ -0,0 +1,35 @@
+CREATE TABLE t2(a INT);
+SET @@AUTOCOMMIT=0;
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:1';
+INSERT INTO t2 VALUES(1);
+XA ROLLBACK 'xa1';
+ERROR XAE04: XAER_NOTA: Unknown XID
+SET @@AUTOCOMMIT=1;
+SET @@AUTOCOMMIT=0;
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:2';
+INSERT INTO t2 VALUES(2);
+XA COMMIT 'xa1';
+ERROR XAE04: XAER_NOTA: Unknown XID
+SET @@AUTOCOMMIT=1;
+XA START 'xa1';
+XA END 'xa1';
+XA PREPARE 'xa1';
+SET @@AUTOCOMMIT=0;
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:3';
+INSERT INTO t2 VALUES(3);
+XA ROLLBACK 'xa1';
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  NON-EXISTING state
+SET @@AUTOCOMMIT=1;
+SET @@AUTOCOMMIT=0;
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:4';
+INSERT INTO t2 VALUES(4);
+XA COMMIT 'xa1';
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  NON-EXISTING state
+SET @@AUTOCOMMIT=1;
+include/assert.inc [All inserts were committed, XA statements and respective failures, were disregarded]
+SET SESSION GTID_NEXT='AUTOMATIC';
+XA ROLLBACK 'xa1';
+include/assert.inc [All XA transactions were cleared]
+DROP TABLE t2;
+SET @@AUTOCOMMIT=DEFAULT_AUTOCOMMIT;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result
index cc705e389762..4804916e5f0d 100644
--- a/mysql-test/suite/binlog/r/binlog_index.result
+++ b/mysql-test/suite/binlog/r/binlog_index.result
@@ -389,8 +389,19 @@ master-bin.000020	#
 master-bin.000021	#
 master-bin.000022	#
 DROP TABLE t1;
+SET SESSION debug="";
 # Test case11: Ends
+# Test case12: Bug#25839610 ABORT OCCUR DURING SLAVE BACKUP
+#              WHEN RELAY LOG INDEX IS LOCK
+# This test verifies that serveral retries are performed
+# if there is a failure while deleting/renaming index files.
+SET SESSION debug="+d,simulate_index_file_delete_failure";
+SET SESSION debug="+d,simulate_crash_safe_index_file_rename_failure";
+FLUSH LOGS;
+include/assert_grep.inc [Retried for delete.]
+include/assert_grep.inc [Retried for rename.]
 SET SESSION debug="";
+# Test case12: Ends
 SET GLOBAL binlog_error_action= ABORT_SERVER;
 RESET MASTER;
 End of tests
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_intvar.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_intvar.result
new file mode 100644
index 000000000000..5063c2455701
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_intvar.result
@@ -0,0 +1,18 @@
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. *");
+RESET MASTER;
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (j INT PRIMARY KEY AUTO_INCREMENT);
+SET @foo = 1;
+INSERT INTO t1 VALUES (@foo);
+INSERT INTO t1 VALUES (rand() * 10);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+INSERT INTO t2 VALUES();
+DROP TABLE t1;
+DROP TABLE t2;
+RESET MASTER;
+include/assert.inc [The t1 table should have two entries.]
+include/assert.inc [The t2 table should have one entry.]
+DROP TABLE t1;
+DROP TABLE t2;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_noop_dml_with_readonly.result b/mysql-test/suite/binlog/r/binlog_noop_dml_with_readonly.result
new file mode 100644
index 000000000000..9fafb50b9b7e
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_noop_dml_with_readonly.result
@@ -0,0 +1,40 @@
+SET @saved_value_super= @@GLOBAL.SUPER_READ_ONLY;
+SET @saved_value= @@GLOBAL.read_only;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+BEGIN;
+UPDATE t1 SET a = 1 where a =1;
+SET GLOBAL SUPER_READ_ONLY=1;
+COMMIT;
+ERROR HY000: The MySQL server is running with the --super-read-only option so it cannot execute this statement
+SET GLOBAL SUPER_READ_ONLY=0;
+CREATE TEMPORARY TABLE t2 (a INT) ENGINE=INNODB;
+BEGIN;
+UPDATE t1 SET a = 1 where a = 1;
+INSERT INTO t2 values(10);
+SET GLOBAL SUPER_READ_ONLY=1;
+COMMIT;
+ERROR HY000: The MySQL server is running with the --super-read-only option so it cannot execute this statement
+DROP TABLE t2;
+SET GLOBAL SUPER_READ_ONLY=0;
+SET GLOBAL READ_ONLY=0;
+CREATE USER test@localhost;
+GRANT CREATE TEMPORARY TABLES, UPDATE, DROP ON *.* TO test@localhost;
+BEGIN;
+UPDATE t1 SET a = 1 where a =1;
+SET GLOBAL READ_ONLY=1;
+COMMIT;
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+SET GLOBAL READ_ONLY=0;
+CREATE TEMPORARY TABLE t2 (a INT) ENGINE=INNODB;
+BEGIN;
+UPDATE t1 SET a = 1 where a = 1;
+INSERT INTO t2 values(10);
+SET GLOBAL READ_ONLY=1;
+COMMIT;
+ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+DROP TABLE t2;
+DROP USER test@localhost;
+SET GLOBAL SUPER_READ_ONLY= @saved_value_super;
+SET GLOBAL read_only= @saved_value;
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/r/binlog_purge_binary_logs_to.result b/mysql-test/suite/binlog/r/binlog_purge_binary_logs_to.result
new file mode 100644
index 000000000000..4b3db91c6764
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_purge_binary_logs_to.result
@@ -0,0 +1,12 @@
+RESET MASTER;
+# Generate master-bin.000002
+FLUSH BINARY LOGS;
+# Generate master-bin.000003
+FLUSH BINARY LOGS;
+# Generate master-bin.000004
+FLUSH BINARY LOGS;
+# Generate master-bin.000005
+FLUSH BINARY LOGS;
+FLUSH BINARY LOGS;
+PURGE BINARY LOGS TO 'master-bin.000003';
+PURGE BINARY LOGS TO 'master-bin.000005';
diff --git a/mysql-test/suite/binlog/r/binlog_reset_connection_not_reset_writeset.result b/mysql-test/suite/binlog/r/binlog_reset_connection_not_reset_writeset.result
new file mode 100644
index 000000000000..ae973a193b1c
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_reset_connection_not_reset_writeset.result
@@ -0,0 +1,15 @@
+SET GLOBAL transaction_write_set_extraction= 'XXHASH64';
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+CREATE TABLE t1(id INT, PRIMARY KEY (id));
+FLUSH LOGS;
+INSERT INTO t1(id) VALUES(1);
+INSERT INTO t1(id) VALUES(2);
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+INSERT INTO t1(id) VALUES(3);
+INSERT INTO t1(id) VALUES(4);
+include/save_binlog_position.inc
+INSERT INTO t1(id) VALUES(5);
+include/include/assert_logical_timestamps.inc [4 5]
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction= OFF;
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/r/binlog_rotate_deadlock.result b/mysql-test/suite/binlog/r/binlog_rotate_deadlock.result
new file mode 100644
index 000000000000..1efe0bd3889f
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_rotate_deadlock.result
@@ -0,0 +1,26 @@
+#
+# Bug #30215068	BINLOG ROTATION DEADLOCK WHEN INNODB CONCURRENCY LIMIT SETTED
+#
+connect  con1, localhost, root,,;
+select  @@innodb_thread_concurrency;
+@@innodb_thread_concurrency
+1
+CREATE TABLE t1 (c1 INT) Engine=InnoDB;
+CREATE TABLE t2 (c1 INT, c2 int, c3 varchar(200)) Engine=InnoDB;
+SET @debug_save= @@SESSION.DEBUG;
+SET SESSION DEBUG = '+d,force_rotate';
+SET DEBUG_SYNC = 'stop_binlog_rotation_after_acquiring_lock_log SIGNAL rotate_stopped WAIT_FOR proceed_rotate';
+INSERT INTO t1 VALUES (1);;
+connect  con2, localhost, root,,;
+SET DEBUG_SYNC= 'now WAIT_FOR rotate_stopped';
+UPDATE t2 SET C2=1 WHERE C1 = 1;;
+connect  con3, localhost, root,,;
+SET DEBUG_SYNC= 'now SIGNAL proceed_rotate';
+connection con1;
+SET @@SESSION.DEBUG= @debug_save;
+connection con2;
+connection default;
+disconnect con1;
+disconnect con2;
+disconnect con3;
+DROP TABLE t1,t2;
diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
index 015ae0c3dcee..c00d4e1707c1 100644
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result
@@ -538,7 +538,7 @@ DROP TEMPORARY TABLE tmp1;
 END//
 CALL p1();
 c1	c2	c3	d1	d2	d3
-utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	2	2	2
+utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	4	0	2
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
diff --git a/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
index fb858cb361a3..8c31d72f0925 100644
--- a/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
+++ b/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
@@ -34,26 +34,25 @@ master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TEMPORARY TABLE I
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TEMPORARY TABLE IF EXISTS `tmp2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */
 master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `tmp2`,`t` /* generated by server */
-master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `shortn2`,`table:name`,`shortn1`
 DROP DATABASE `drop-temp+table-test`;
 RESET MASTER;
-CREATE TABLE t1 ( i text );
-CREATE TEMPORARY TABLE ttmp1 ( i text );
-SET @@session.binlog_format=ROW;
-INSERT INTO t1 VALUES ('1');
-SELECT @@session.binlog_format;
-@@session.binlog_format
-ROW
+#
+# Bug 83003: Using temporary tables on slaves increases GTID sequence number
+#
+SET @saved_binlog_format= @@SESSION.binlog_format;
+SET SESSION binlog_format= STATEMENT;
+CREATE TEMPORARY TABLE temp_needs_logging(a INT) ENGINE=InnoDB;
+SET SESSION binlog_format= @saved_binlog_format;
+CREATE TEMPORARY TABLE temp_trx(a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trx(a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_needs_logging_in_stmt(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 0;
+CREATE TEMPORARY TABLE temp_binlog_disabled(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i text )
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1`
-RESET MASTER;
-DROP TABLE t1;
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE temp_needs_logging(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `temp_needs_logging`
 #
 # BUG#21638823: ASSERTION FAILED:
 # THD->GET_TRANSACTION()->IS_EMPTY(TRANSACTION_CTX::STMT) || THD
@@ -80,7 +79,6 @@ XA END 'idle_at_disconnect';
 # the temp table (row)
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `temp`
 #
 # Start XA txn and leave in XA_idle
 XA START 'idle_when_drop_temp';
@@ -90,3 +88,30 @@ DROP TEMPORARY TABLE IF EXISTS t;
 Got one of the listed errors
 XA ROLLBACK 'idle_when_drop_temp';
 RESET MASTER;
+#
+# BUG#28642318: POINT IN TIME RECOVERY USING MYSQLBINLOG BROKEN
+#               WITH TEMPORARY TABLE -> ERRORS
+# Test case for DELETE query.
+RESET MASTER;
+# Set up.
+SET @save_binlog_format= @@session.binlog_format;
+SET @@session.binlog_format=STATEMENT;
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+SET @@session.binlog_format=STATEMENT;
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+DELETE d1, d2 FROM t1 AS d1, t1 AS d2 WHERE d1.a<>d2.a;
+DROP TABLE t1;
+# DELETE query fails with table re-open error without patch.
+# Clean up.
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1;
+RESET MASTER;
+# Test case for DROP query.
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+DROP TABLE t1;
+DROP TABLE t1;
+# DROP table query fails with unknown table error without patch.
+# Clean up
+SET @@session.binlog_format= @save_binlog_format;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
index 91247a8f1a06..829b5ecf940d 100644
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
@@ -261,7 +261,6 @@ set autocommit=0;
 create table t2 (n int) engine=innodb;
 insert into t2 values (3);
 include/save_binlog_position.inc
-include/assert_binlog_events.inc [(Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*) # (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)]
 select get_lock("lock1",60);
 get_lock("lock1",60)
 1
@@ -298,8 +297,6 @@ master-bin.000001	#	Table_map	#	#	table_id: # (test.t0)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; create table t2 (n int) engine=innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ti`
-master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t1`
 do release_lock("lock1");
 drop table t0,t2;
 set autocommit=0;
diff --git a/mysql-test/suite/binlog/r/binlog_set_trans_dependency_deadlock.result b/mysql-test/suite/binlog/r/binlog_set_trans_dependency_deadlock.result
new file mode 100644
index 000000000000..7009072b505c
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_set_trans_dependency_deadlock.result
@@ -0,0 +1,34 @@
+#
+# Bug 92108: Deadlock by concurrent SHOW BINLOGS,
+# performance_schema.session_variables query, and binlog purge
+#
+RESET MASTER;
+FLUSH LOGS;
+connect con1,localhost,root,,;
+SET DEBUG_SYNC="purge_logs_after_lock_index_before_thread_count SIGNAL purge_ready WAIT_FOR finish_purge";
+PURGE BINARY LOGS BEFORE '2038-01-19';
+connect con2,localhost,root,,;
+SET DEBUG_SYNC="materialize_session_variable_array_THD_locked SIGNAL pfs_ready WAIT_FOR finish_pfs";
+SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME LIKE 'binlog_transaction_dependency_tracking';;
+connect con3,localhost,root,,;
+SET DEBUG_SYNC="show_binlogs_after_lock_log_before_lock_index SIGNAL show_ready WAIT_FOR finish_show";
+SHOW BINARY LOGS;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR purge_ready";
+SET DEBUG_SYNC="now WAIT_FOR pfs_ready";
+SET DEBUG_SYNC="now WAIT_FOR show_ready";
+SET DEBUG_SYNC="now SIGNAL finish_purge";
+SET DEBUG_SYNC="now SIGNAL finish_pfs";
+SET DEBUG_SYNC="now SIGNAL finish_show";
+connection con1;
+Warnings:
+Warning	1868	file master-bin.000002 was not purged because it is the active log file.
+disconnect con1;
+connection con2;
+VARIABLE_NAME	VARIABLE_VALUE
+binlog_transaction_dependency_tracking	COMMIT_ORDER
+disconnect con2;
+connection con3;
+disconnect con3;
+connection default;
+SET DEBUG_SYNC= 'RESET';
diff --git a/mysql-test/suite/binlog/r/binlog_shutdown_hang.result b/mysql-test/suite/binlog/r/binlog_shutdown_hang.result
new file mode 100644
index 000000000000..f1d24b19021e
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_shutdown_hang.result
@@ -0,0 +1,15 @@
+RESET MASTER;
+CREATE TABLE t (f INT PRIMARY KEY) ENGINE=INNODB;
+INSERT INTO t VALUES (10);
+SET GLOBAL autocommit= 0;
+SET GLOBAL super_read_only= ON;
+# restart
+#
+# Verify that we can get correct gtid sets after server restarts
+#
+include/assert.inc [committed gtid set is MASTER_UUID:1-2]
+SELECT * FROM mysql.gtid_executed;
+source_uuid	interval_start	interval_end
+MASTER_UUID	1	2
+DROP TABLE t;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
index 4bbe3f1ab959..cdbb3cdc00ad 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -322,7 +322,7 @@ DROP TEMPORARY TABLE tmp1;
 END//
 CALL p1();
 c1	c2	c3	d1	d2	d3
-utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	2	2	2
+utf8_general_ci	utf8_unicode_ci	utf8_unicode_ci	4	0	2
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
diff --git a/mysql-test/suite/binlog/r/binlog_stm_do_db.result b/mysql-test/suite/binlog/r/binlog_stm_do_db.result
index 4a2610d40795..8c7a75fa698b 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_do_db.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_do_db.result
@@ -33,7 +33,7 @@ ERROR HY000: Cannot execute statement: impossible to write to binary log since B
 UPDATE b42829_filtered.t1 ft1, b42829.t1 nft1 SET ft1.x=1, nft1.x=2;
 ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED.
 INSERT INTO t1 SELECT * FROM t2;
-ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging.
 COMMIT;
 ### assertion: filtered events did not make into the binlog
 include/show_binlog_events.inc
diff --git a/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
index 244e8dd005ab..5b1e5923d60f 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
@@ -60,8 +60,29 @@ master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1`
-RESET MASTER;
 DROP TABLE t1;
+RESET MASTER;
+#
+# Bug 83003: Using temporary tables on slaves increases GTID sequence number
+#
+SET @saved_binlog_format= @@SESSION.binlog_format;
+SET SESSION binlog_format= STATEMENT;
+CREATE TEMPORARY TABLE temp_needs_logging(a INT) ENGINE=InnoDB;
+SET SESSION binlog_format= @saved_binlog_format;
+CREATE TEMPORARY TABLE temp_trx(a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE temp_non_trx(a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE temp_needs_logging_in_stmt(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 0;
+CREATE TEMPORARY TABLE temp_binlog_disabled(a INT) ENGINE=InnoDB;
+SET SESSION sql_log_bin= 1;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE temp_needs_logging(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE temp_trx(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE temp_non_trx(a INT) ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE temp_needs_logging_in_stmt(a INT) ENGINE=InnoDB
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `temp_needs_logging_in_stmt`,`temp_trx`,`temp_needs_logging`
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `temp_non_trx`
 #
 # BUG#21638823: ASSERTION FAILED:
 # THD->GET_TRANSACTION()->IS_EMPTY(TRANSACTION_CTX::STMT) || THD
@@ -102,3 +123,30 @@ DROP TEMPORARY TABLE IF EXISTS t;
 Got one of the listed errors
 XA ROLLBACK 'idle_when_drop_temp';
 RESET MASTER;
+#
+# BUG#28642318: POINT IN TIME RECOVERY USING MYSQLBINLOG BROKEN
+#               WITH TEMPORARY TABLE -> ERRORS
+# Test case for DELETE query.
+RESET MASTER;
+# Set up.
+SET @save_binlog_format= @@session.binlog_format;
+SET @@session.binlog_format=STATEMENT;
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+SET @@session.binlog_format=STATEMENT;
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+DELETE d1, d2 FROM t1 AS d1, t1 AS d2 WHERE d1.a<>d2.a;
+DROP TABLE t1;
+# DELETE query fails with table re-open error without patch.
+# Clean up.
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1;
+RESET MASTER;
+# Test case for DROP query.
+CREATE TABLE t1 (a INT) ENGINE=INNODB;
+CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
+DROP TABLE t1;
+DROP TABLE t1;
+# DROP table query fails with unknown table error without patch.
+# Clean up
+SET @@session.binlog_format= @save_binlog_format;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_on_start.result b/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_on_start.result
new file mode 100644
index 000000000000..3dae8bae152a
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_on_start.result
@@ -0,0 +1,54 @@
+#
+# Test 1.a: Try starting server with TWSE=OFF and BTDT=COMMIT_ORDER. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=OFF --binlog_transaction_dependency_tracking=COMMIT_ORDER
+include/assert.inc [transaction_write_set_extraction should be OFF]
+include/assert.inc [binlog_transaction_dependency_tracking should be COMMIT_ORDER]
+#
+# Test 1.b: Try starting server with TWSE=OFF and BTDT=WRITESET. Expect FAILURE.
+#
+Occurrences of 'The transaction_write_set_extraction must be set to XXHASH64 or MURMUR32 when binlog_transaction_dependency_tracking is WRITESET or WRITESET_SESSION.' in the input file: 1
+Occurrences of '\[ERROR\] Aborting' in the input file: 1
+#
+# Test 1.c: Try starting server with TWSE=OFF and BTDT=WRITESET_SESSION. Expect FAILURE.
+#
+Occurrences of 'The transaction_write_set_extraction must be set to XXHASH64 or MURMUR32 when binlog_transaction_dependency_tracking is WRITESET or WRITESET_SESSION.' in the input file: 1
+Occurrences of '\[ERROR\] Aborting' in the input file: 1
+#
+# Test 1.d: Try starting server with TWSE=MURMUR32 and BTDT=COMMIT_ORDER. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=COMMIT_ORDER
+include/assert.inc [transaction_write_set_extraction should be MURMUR32]
+include/assert.inc [binlog_transaction_dependency_tracking should be COMMIT_ORDER]
+#
+# Test 1.e: Try starting server with TWSE=MURMUR32 and BTDT=WRITESET. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=WRITESET
+include/assert.inc [transaction_write_set_extraction should be MURMUR32]
+include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET]
+#
+# Test 1.f: Try starting server with TWSE=MURMUR32 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=WRITESET_SESSION
+include/assert.inc [transaction_write_set_extraction should be MURMUR32]
+include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET_SESSION]
+#
+# Test 1.g: Try starting server with TWSE=XXHASH64 and BTDT=COMMIT_ORDER. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=COMMIT_ORDER
+include/assert.inc [transaction_write_set_extraction should be XXHASH64]
+include/assert.inc [binlog_transaction_dependency_tracking should be COMMIT_ORDER]
+#
+# Test 1.h: Try starting server with TWSE=XXHASH64 and BTDT=WRITESET. Expect SUCCESS
+#
+# restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=WRITESET
+include/assert.inc [transaction_write_set_extraction should be XXHASH64]
+include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET]
+#
+# Test 1.i: Try starting server with TWSE=XXHASH64 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+#
+# restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=WRITESET_SESSION
+include/assert.inc [transaction_write_set_extraction should be XXHASH64]
+include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET_SESSION]
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction= OFF;
diff --git a/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_sensitive.result b/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_sensitive.result
new file mode 100644
index 000000000000..09d99e825769
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_sensitive.result
@@ -0,0 +1,34 @@
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+SET @@GLOBAL.transaction_write_set_extraction = XXHASH64;
+SET @@SESSION.transaction_write_set_extraction = XXHASH64;
+SET @@GLOBAL.binlog_transaction_dependency_tracking = WRITESET;
+SET NAMES 'utf8' COLLATE 'utf8_general_ci';
+RESET MASTER;
+CREATE TABLE t1 (
+id INT NOT NULL AUTO_INCREMENT,
+u_id INT NOT NULL,
+u_str VARCHAR(32) NOT NULL,
+PRIMARY KEY (id),
+UNIQUE KEY (u_id, u_str)
+) ENGINE=InnoDB;
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'a');
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'A');
+ERROR 23000: Duplicate entry '1-A' for key 'u_id'
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'ã');
+ERROR 23000: Duplicate entry '1-ã' for key 'u_id'
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'Ã');
+ERROR 23000: Duplicate entry '1-Ã' for key 'u_id'
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'á');
+ERROR 23000: Duplicate entry '1-á' for key 'u_id'
+DELETE FROM t1 WHERE u_id = 1 AND u_str = 'A';
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'ã');
+DELETE FROM t1 WHERE u_id = 1 AND u_str = 'Ã';
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'á');
+DROP TABLE t1;
+Processing binlog master-bin.000001
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;2 3;3 4;4 5;5 6;6 7]
+SET @@GLOBAL.binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
diff --git a/mysql-test/suite/binlog/r/binlog_unsafe_stmt_capable_engine.result b/mysql-test/suite/binlog/r/binlog_unsafe_stmt_capable_engine.result
new file mode 100644
index 000000000000..62d0b2162c5d
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_unsafe_stmt_capable_engine.result
@@ -0,0 +1,2609 @@
+#### Setup tables ####
+CREATE TABLE t0 (a CHAR(100));
+CREATE TABLE t1 (a CHAR(100));
+CREATE TABLE t2 (a CHAR(100));
+CREATE TABLE ta0 (a CHAR(100));
+CREATE TABLE ta1 (a CHAR(100));
+CREATE TABLE ta2 (a CHAR(100));
+CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+CREATE TABLE data_table (a CHAR(100));
+INSERT INTO data_table VALUES ('foo');
+CREATE TABLE trigger_table_1 (a INT);
+CREATE TABLE trigger_table_2 (a INT);
+CREATE TABLE trigger_table_3 (a INT);
+CREATE TABLE double_autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+SET @old_debug= @@global.debug;
+SET GLOBAL debug='+d,make_stmt_only_engines';
+CREATE TRIGGER double_autoinc_trig
+BEFORE INSERT ON double_autoinc_table FOR EACH ROW
+BEGIN
+INSERT INTO autoinc_table VALUES (NULL);
+END|
+CREATE FUNCTION multi_unsafe_func() RETURNS INT
+BEGIN
+INSERT INTO t0 VALUES(CONCAT(@@hostname, @@hostname));
+INSERT INTO t0 VALUES(0);
+INSERT INTO t0 VALUES(CONCAT(UUID(), @@hostname));
+RETURN 1;
+END|
+CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
+
+==== Testing UUID() unsafeness ====
+
+Invoking function func_retval_1 returning value from unsafe UUID() function.
+CREATE FUNCTION func_retval_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); RETURN UUID(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 VALUES (func_retval_1());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_1();
+
+Invoking function func_retval_2 returning value from function func_retval_1 returning value from unsafe UUID() function.
+CREATE FUNCTION func_retval_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); RETURN func_retval_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 VALUES (func_retval_2());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_2();
+DROP FUNCTION func_retval_2;
+
+Invoking function func_sidef_2 invoking function func_retval_1 returning value from unsafe UUID() function.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_retval_1 returning value from unsafe UUID() function.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 VALUES (func_retval_1()); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_retval_1 returning value from unsafe UUID() function.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from function func_retval_1 returning value from unsafe UUID() function.
+CREATE VIEW view_retval_2 AS SELECT func_retval_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking function func_retval_1 returning value from unsafe UUID() function.
+PREPARE prep_2 FROM "INSERT INTO t1 VALUES (func_retval_1())";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_retval_1;
+
+Invoking function func_sidef_1 invoking unsafe UUID() function.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (UUID()); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe UUID() function.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe UUID() function.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe UUID() function.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe UUID() function.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe UUID() function.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe UUID() function.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO t0 VALUES (UUID()); INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe UUID() function.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe UUID() function.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe UUID() function.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe UUID() function.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe UUID() function.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (UUID()); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe UUID() function.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe UUID() function.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe UUID() function.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe UUID() function.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking view view_retval_1 returning value from unsafe UUID() function.
+CREATE VIEW view_retval_1 AS SELECT UUID();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT * FROM view_retval_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_1;
+
+Invoking function func_sidef_2 invoking view view_retval_1 returning value from unsafe UUID() function.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking view view_retval_1 returning value from unsafe UUID() function.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT * FROM view_retval_1; INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking view view_retval_1 returning value from unsafe UUID() function.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from view view_retval_1 returning value from unsafe UUID() function.
+CREATE VIEW view_retval_2 AS SELECT * FROM view_retval_1;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking view view_retval_1 returning value from unsafe UUID() function.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT * FROM view_retval_1";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_2;
+DROP VIEW view_retval_1;
+
+Invoking prepared statement prep_1 invoking unsafe UUID() function.
+PREPARE prep_1 FROM "INSERT INTO t0 VALUES (UUID())";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+DROP PREPARE prep_1;
+
+Invoking unsafe UUID() function.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t0 VALUES (UUID());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT UUID();
+
+==== Testing @@hostname unsafeness ====
+
+Invoking function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE FUNCTION func_retval_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); RETURN @@hostname; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 VALUES (func_retval_1());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_1();
+
+Invoking function func_retval_2 returning value from function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE FUNCTION func_retval_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); RETURN func_retval_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 VALUES (func_retval_2());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_2();
+DROP FUNCTION func_retval_2;
+
+Invoking function func_sidef_2 invoking function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 VALUES (func_retval_1()); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from function func_retval_1 returning value from unsafe @@hostname variable.
+CREATE VIEW view_retval_2 AS SELECT func_retval_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking function func_retval_1 returning value from unsafe @@hostname variable.
+PREPARE prep_2 FROM "INSERT INTO t1 VALUES (func_retval_1())";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_retval_1;
+
+Invoking function func_sidef_1 invoking unsafe @@hostname variable.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (@@hostname); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe @@hostname variable.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe @@hostname variable.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe @@hostname variable.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe @@hostname variable.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe @@hostname variable.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe @@hostname variable.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO t0 VALUES (@@hostname); INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe @@hostname variable.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe @@hostname variable.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe @@hostname variable.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe @@hostname variable.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe @@hostname variable.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (@@hostname); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe @@hostname variable.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe @@hostname variable.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe @@hostname variable.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe @@hostname variable.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking prepared statement prep_1 invoking unsafe @@hostname variable.
+PREPARE prep_1 FROM "INSERT INTO t0 VALUES (@@hostname)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_1;
+
+Invoking unsafe @@hostname variable.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t0 VALUES (@@hostname);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+==== Testing SELECT...LIMIT unsafeness ====
+
+Invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 SELECT * FROM data_table LIMIT 1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe SELECT...LIMIT statement.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe SELECT...LIMIT statement.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO t0 SELECT * FROM data_table LIMIT 1; INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe SELECT...LIMIT statement.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe SELECT...LIMIT statement.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe SELECT...LIMIT statement.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe SELECT...LIMIT statement.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe SELECT...LIMIT statement.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 SELECT * FROM data_table LIMIT 1; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe SELECT...LIMIT statement.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe SELECT...LIMIT statement.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe SELECT...LIMIT statement.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe SELECT...LIMIT statement.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+CREATE VIEW view_retval_1 AS SELECT * FROM data_table LIMIT 1;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT * FROM view_retval_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_1;
+
+Invoking function func_sidef_2 invoking view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT * FROM view_retval_1; INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+CREATE VIEW view_retval_2 AS SELECT * FROM view_retval_1;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking view view_retval_1 returning value from unsafe SELECT...LIMIT statement.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT * FROM view_retval_1";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PREPARE prep_2;
+DROP VIEW view_retval_1;
+
+Invoking prepared statement prep_1 invoking unsafe SELECT...LIMIT statement.
+PREPARE prep_1 FROM "INSERT INTO t0 SELECT * FROM data_table LIMIT 1";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+DROP PREPARE prep_1;
+
+Invoking unsafe SELECT...LIMIT statement.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t0 SELECT * FROM data_table LIMIT 1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM data_table LIMIT 1;
+
+==== Testing unsafeness of insert of two autoinc values ====
+
+Invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO double_autoinc_table VALUES (NULL); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe update of two autoinc columns.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe update of two autoinc columns.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO double_autoinc_table VALUES (NULL); INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe update of two autoinc columns.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe update of two autoinc columns.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe update of two autoinc columns.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe update of two autoinc columns.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe update of two autoinc columns.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO double_autoinc_table VALUES (NULL); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe update of two autoinc columns.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe update of two autoinc columns.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe update of two autoinc columns.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe update of two autoinc columns.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking prepared statement prep_1 invoking unsafe update of two autoinc columns.
+PREPARE prep_1 FROM "INSERT INTO double_autoinc_table VALUES (NULL)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+DROP PREPARE prep_1;
+
+Invoking unsafe update of two autoinc columns.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO double_autoinc_table VALUES (NULL);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+
+==== Testing unsafeness of UDF's ====
+
+Invoking function func_retval_1 returning value from unsafe UDF.
+CREATE FUNCTION func_retval_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); RETURN myfunc_int(10); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 VALUES (func_retval_1());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_1();
+
+Invoking function func_retval_2 returning value from function func_retval_1 returning value from unsafe UDF.
+CREATE FUNCTION func_retval_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); RETURN func_retval_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 VALUES (func_retval_2());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT func_retval_2();
+DROP FUNCTION func_retval_2;
+
+Invoking function func_sidef_2 invoking function func_retval_1 returning value from unsafe UDF.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_retval_1 returning value from unsafe UDF.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 VALUES (func_retval_1()); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_retval_1 returning value from unsafe UDF.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 VALUES (func_retval_1()); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from function func_retval_1 returning value from unsafe UDF.
+CREATE VIEW view_retval_2 AS SELECT func_retval_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking function func_retval_1 returning value from unsafe UDF.
+PREPARE prep_2 FROM "INSERT INTO t1 VALUES (func_retval_1())";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_retval_1;
+
+Invoking function func_sidef_1 invoking unsafe UDF.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (myfunc_int(10)); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe UDF.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe UDF.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe UDF.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe UDF.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe UDF.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe UDF.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO t0 VALUES (myfunc_int(10)); INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe UDF.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe UDF.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe UDF.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe UDF.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe UDF.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 VALUES (myfunc_int(10)); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe UDF.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe UDF.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe UDF.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe UDF.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking view view_sidef_1 invoking unsafe UDF.
+CREATE VIEW view_sidef_1 AS SELECT myfunc_int(10);
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT * FROM view_sidef_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+
+Invoking function func_sidef_2 invoking view view_sidef_1 invoking unsafe UDF.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_sidef_1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking view view_sidef_1 invoking unsafe UDF.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT * FROM view_sidef_1; INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking view view_sidef_1 invoking unsafe UDF.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_sidef_1; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking view view_sidef_1 invoking unsafe UDF.
+CREATE VIEW view_sidef_2 AS SELECT * FROM view_sidef_1;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking view view_sidef_1 invoking unsafe UDF.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT * FROM view_sidef_1";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_2;
+DROP VIEW view_sidef_1;
+
+Invoking prepared statement prep_1 invoking unsafe UDF.
+PREPARE prep_1 FROM "INSERT INTO t0 VALUES (myfunc_int(10))";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+DROP PREPARE prep_1;
+
+Invoking unsafe UDF.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t0 VALUES (myfunc_int(10));
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a UDF which may not return the same value on the slave.
+
+==== Testing unsafeness of access to mysql.general_log ====
+
+Invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking unsafe use of mysql.general_log.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking unsafe use of mysql.general_log.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log; INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking unsafe use of mysql.general_log.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking unsafe use of mysql.general_log.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking unsafe use of mysql.general_log.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking unsafe use of mysql.general_log.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking unsafe use of mysql.general_log.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking unsafe use of mysql.general_log.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking unsafe use of mysql.general_log.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking unsafe use of mysql.general_log.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking unsafe use of mysql.general_log.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking view view_retval_1 returning value from unsafe use of mysql.general_log.
+CREATE VIEW view_retval_1 AS SELECT COUNT(*) FROM mysql.general_log;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t1 SELECT * FROM view_retval_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_1;
+
+Invoking function func_sidef_2 invoking view view_retval_1 returning value from unsafe use of mysql.general_log.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking view view_retval_1 returning value from unsafe use of mysql.general_log.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT * FROM view_retval_1; INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 1 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking view view_retval_1 returning value from unsafe use of mysql.general_log.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_retval_1; END;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP TRIGGER trig_2;
+
+Invoking view view_retval_2 returning value from view view_retval_1 returning value from unsafe use of mysql.general_log.
+CREATE VIEW view_retval_2 AS SELECT * FROM view_retval_1;
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t2 SELECT * FROM view_retval_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT * FROM view_retval_2;
+DROP VIEW view_retval_2;
+
+Invoking prepared statement prep_2 invoking view view_retval_1 returning value from unsafe use of mysql.general_log.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT * FROM view_retval_1";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PREPARE prep_2;
+DROP VIEW view_retval_1;
+
+Invoking prepared statement prep_1 invoking unsafe use of mysql.general_log.
+PREPARE prep_1 FROM "INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log";
+* binlog_format = STATEMENT: expect 1 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+DROP PREPARE prep_1;
+
+Invoking unsafe use of mysql.general_log.
+* binlog_format = STATEMENT: expect 1 warnings.
+INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+include/assert.inc [There should be 1 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
+* Invoke statement so that return value is discarded: expect no warning.
+SELECT COUNT(*) FROM mysql.general_log;
+
+==== Testing a statement that is unsafe several times ====
+
+Invoking function func_sidef_1 invoking statement that is unsafe several times.
+CREATE FUNCTION func_sidef_1() RETURNS VARCHAR(100) BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO ta0 VALUES (multi_unsafe_func()); RETURN 0; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t1 SELECT func_sidef_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking function func_sidef_1 invoking statement that is unsafe several times.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking function func_sidef_1 invoking statement that is unsafe several times.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT func_sidef_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking function func_sidef_1 invoking statement that is unsafe several times.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT func_sidef_1(); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking function func_sidef_1 invoking statement that is unsafe several times.
+CREATE VIEW view_sidef_2 AS SELECT func_sidef_1();
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking function func_sidef_1 invoking statement that is unsafe several times.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT func_sidef_1()";
+* binlog_format = STATEMENT: expect 2 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP FUNCTION func_sidef_1;
+
+Invoking procedure proc_1 invoking statement that is unsafe several times.
+CREATE PROCEDURE proc_1() BEGIN INSERT INTO ta0 VALUES (multi_unsafe_func()); INSERT INTO ta1 VALUES (47); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+CALL proc_1();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking procedure proc_1 invoking statement that is unsafe several times.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); RETURN 0; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking procedure proc_1 invoking statement that is unsafe several times.
+CREATE PROCEDURE proc_2() BEGIN CALL proc_1(); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking procedure proc_1 invoking statement that is unsafe several times.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); CALL proc_1(); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking procedure proc_1 invoking statement that is unsafe several times.
+PREPARE prep_2 FROM "CALL proc_1()";
+* binlog_format = STATEMENT: expect 2 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP PROCEDURE proc_1;
+
+Invoking trigger trig_1 invoking statement that is unsafe several times.
+CREATE TRIGGER trig_1 BEFORE INSERT ON trigger_table_1 FOR EACH ROW BEGIN INSERT INTO ta1 VALUES (47); INSERT INTO ta0 VALUES (multi_unsafe_func()); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO trigger_table_1 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking trigger trig_1 invoking statement that is unsafe several times.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); RETURN 0; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking trigger trig_1 invoking statement that is unsafe several times.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO trigger_table_1 VALUES (1); INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking trigger trig_1 invoking statement that is unsafe several times.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO trigger_table_1 VALUES (1); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking prepared statement prep_2 invoking trigger trig_1 invoking statement that is unsafe several times.
+PREPARE prep_2 FROM "INSERT INTO trigger_table_1 VALUES (1)";
+* binlog_format = STATEMENT: expect 2 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP TRIGGER trig_1;
+
+Invoking view view_sidef_1 invoking statement that is unsafe several times.
+CREATE VIEW view_sidef_1 AS SELECT multi_unsafe_func();
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t1 SELECT * FROM view_sidef_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+
+Invoking function func_sidef_2 invoking view view_sidef_1 invoking statement that is unsafe several times.
+CREATE FUNCTION func_sidef_2() RETURNS VARCHAR(100) BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_sidef_1; RETURN 0; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT func_sidef_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP FUNCTION func_sidef_2;
+
+Invoking procedure proc_2 invoking view view_sidef_1 invoking statement that is unsafe several times.
+CREATE PROCEDURE proc_2() BEGIN INSERT INTO t1 SELECT * FROM view_sidef_1; INSERT INTO ta2 VALUES (47); END;
+* binlog_format = STATEMENT: expect 2 warnings.
+CALL proc_2();
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PROCEDURE proc_2;
+
+Invoking trigger trig_2 invoking view view_sidef_1 invoking statement that is unsafe several times.
+CREATE TRIGGER trig_2 BEFORE INSERT ON trigger_table_2 FOR EACH ROW BEGIN INSERT INTO ta2 VALUES (47); INSERT INTO t1 SELECT * FROM view_sidef_1; END;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO trigger_table_2 VALUES (1);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER trig_2;
+
+Invoking view view_sidef_2 invoking view view_sidef_1 invoking statement that is unsafe several times.
+CREATE VIEW view_sidef_2 AS SELECT * FROM view_sidef_1;
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO t2 SELECT * FROM view_sidef_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP VIEW view_sidef_2;
+
+Invoking prepared statement prep_2 invoking view view_sidef_1 invoking statement that is unsafe several times.
+PREPARE prep_2 FROM "INSERT INTO t1 SELECT * FROM view_sidef_1";
+* binlog_format = STATEMENT: expect 2 warnings.
+EXECUTE prep_2;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_2;
+DROP VIEW view_sidef_1;
+
+Invoking prepared statement prep_1 invoking statement that is unsafe several times.
+PREPARE prep_1 FROM "INSERT INTO ta0 VALUES (multi_unsafe_func())";
+* binlog_format = STATEMENT: expect 2 warnings.
+EXECUTE prep_1;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP PREPARE prep_1;
+
+Invoking statement that is unsafe several times.
+* binlog_format = STATEMENT: expect 2 warnings.
+INSERT INTO ta0 VALUES (multi_unsafe_func());
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+include/assert.inc [There should be 2 warning(s)]
+* SQL_LOG_BIN = 0: expect nothing logged and only deprecation warnings.
+include/assert.inc [There should be 0 warning(s)]
+include/assert.inc [Only two events should exist in the binary log]
+* binlog_format = MIXED: expect error since the engine is only statement capable and doesn't have row logging capability.
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TRIGGER double_autoinc_trig;
+DROP TABLE t0, t1, t2, ta0, ta1, ta2,
+autoinc_table, double_autoinc_table,
+data_table,
+trigger_table_1, trigger_table_2, trigger_table_3;
+DROP FUNCTION myfunc_int;
+DROP FUNCTION multi_unsafe_func;
+==== Special system variables that should *not* be unsafe ====
+CREATE TABLE t1 (a VARCHAR(1000));
+CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+INSERT INTO t1 VALUES (@@session.auto_increment_increment);
+INSERT INTO t1 VALUES (@@session.auto_increment_offset);
+INSERT INTO t1 VALUES (@@session.character_set_client);
+INSERT INTO t1 VALUES (@@session.character_set_connection);
+INSERT INTO t1 VALUES (@@session.character_set_database);
+INSERT INTO t1 VALUES (@@session.character_set_server);
+INSERT INTO t1 VALUES (@@session.collation_connection);
+INSERT INTO t1 VALUES (@@session.collation_database);
+INSERT INTO t1 VALUES (@@session.collation_server);
+INSERT INTO t1 VALUES (@@session.foreign_key_checks);
+INSERT INTO t1 VALUES (@@session.identity);
+INSERT INTO t1 VALUES (@@session.last_insert_id);
+INSERT INTO t1 VALUES (@@session.lc_time_names);
+INSERT INTO t1 VALUES (@@session.pseudo_thread_id);
+INSERT INTO t1 VALUES (@@session.sql_auto_is_null);
+INSERT INTO t1 VALUES (@@session.timestamp);
+INSERT INTO t1 VALUES (@@session.time_zone);
+INSERT INTO t1 VALUES (@@session.unique_checks);
+SET @my_var= 4711;
+INSERT INTO t1 VALUES (@my_var);
+SET insert_id= 12;
+INSERT INTO autoinc_table VALUES (NULL);
+The following variables *should* give a warning, despite they are replicated.
+INSERT INTO t1 VALUES (@@session.sql_mode);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+INSERT INTO t1 VALUES (@@session.insert_id);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave.
+DROP TABLE t1, autoinc_table;
+SET GLOBAL debug= @old_debug;
+"End of tests"
diff --git a/mysql-test/suite/binlog/r/binlog_user_if_exists.result b/mysql-test/suite/binlog/r/binlog_user_if_exists.result
index 4887c9a8f25c..c9df21f13175 100644
--- a/mysql-test/suite/binlog/r/binlog_user_if_exists.result
+++ b/mysql-test/suite/binlog/r/binlog_user_if_exists.result
@@ -159,6 +159,64 @@ slave-bin.000001	#	Query	#	#	use `test`; CREATE USER IF NOT EXISTS 'u1'@'localho
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER IF EXISTS 'u1'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*52BA180A884483D54A3CEB45FB50D4E5B8071399'
 slave-bin.000001	#	Query	#	#	use `test`; ALTER USER IF EXISTS 'u2_not_exists'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*53ED7183CBBC6D9995663DD96EFFA60E2CE2C96E'
 slave-bin.000001	#	Query	#	#	use `test`; DROP USER u1@localhost
+#
+# Bug26680035:  CREATE/ALTER USER ERRORS OUT BUT GETS RECORDED IN
+#               THE BINARY LOG
+#
+call mtr.add_suppression("Following users were specified in CREATE USER IF NOT EXISTS but they already exist. *");
+# ------
+"Scenario 1: CREATE USER WITH INVALID PLUGIN"
+# ------
+#
+# Step 1.1) Create user with invalid plugin.
+#
+CREATE USER u1@localhost IDENTIFIED WITH 'plugin1';
+ERROR HY000: Plugin 'plugin1' is not loaded
+#
+# Step 1.2) Create user having 'if not exists' clause with invalid
+#           plugin.
+#
+CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED WITH 'plugin2';
+ERROR HY000: Plugin 'plugin2' is not loaded
+include/assert.inc [assert that the above events are not written to binlog]
+# ------
+"Scenario 2: ALTER USER WITH INVALID PLUGIN"
+# ------
+CREATE USER u2@localhost;
+#
+# Step 2.1) Alter user with invalid plugin.
+#
+ALTER USER u2@localhost IDENTIFIED WITH 'plugin3';
+ERROR HY000: Plugin 'plugin3' is not loaded
+#
+# Step 2.2) Alter user having 'if exists' clause with invalid plugin.
+#
+ALTER USER IF EXISTS u2@localhost IDENTIFIED WITH 'plugin4';
+ERROR HY000: Plugin 'plugin4' is not loaded
+include/assert.inc [assert that the above events are not written to binlog]
+# ------
+"Scenario 3: CREATE/ALTER USER INVALID PLUGIN WITH MULTIPLE USERS"
+# ------
+#
+# Step 3) Create/Alter user having multiple users with invalid plugin.
+#
+CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED WITH 'shsh',
+u2@localhost IDENTIFIED BY 'pass',
+u3@localhost IDENTIFIED WITH 'sha256_password';
+ERROR HY000: Plugin 'shsh' is not loaded
+ALTER USER IF EXISTS u1@localhost IDENTIFIED WITH 'shsh',
+u2@localhost IDENTIFIED BY 'xyz',
+u3@localhost IDENTIFIED WITH 'sha256_password';
+ERROR HY000: Plugin 'shsh' is not loaded
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER 'u2'@'localhost' IDENTIFIED WITH 'mysql_native_password'
+slave-bin.000001	#	Query	#	#	use `test`; CREATE USER IF NOT EXISTS 'u1'@'localhost' IDENTIFIED WITH 'shsh','u2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7','u3'@'localhost' IDENTIFIED WITH 'sha256_password'
+slave-bin.000001	#	Query	#	#	use `test`; ALTER USER IF EXISTS 'u1'@'localhost' IDENTIFIED WITH 'shsh','u2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*39C549BDECFBA8AFC3CE6B948C9359A0ECE08DE2','u3'@'localhost' IDENTIFIED WITH 'sha256_password'
+#
+# Step 4) Cleanup
+#
+DROP USER u2@localhost,u3@localhost;
 # Search warnings in the server log
 include/rpl_end.inc
 
diff --git a/mysql-test/suite/binlog/r/binlog_writeset_history_protection.result b/mysql-test/suite/binlog/r/binlog_writeset_history_protection.result
new file mode 100644
index 000000000000..aa25c13029f5
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_writeset_history_protection.result
@@ -0,0 +1,15 @@
+CREATE TABLE t1 (i INT PRIMARY KEY);
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = WRITESET;
+BEGIN;
+INSERT INTO t1 VALUES(1);
+SET DEBUG_SYNC="wait_in_get_dependency SIGNAL dep_tracker WAIT_FOR go_ahead_dml";
+commit;
+SET DEBUG_SYNC= "now WAIT_FOR dep_tracker";
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING=WRITESET_SESSION;
+include/assert.inc [con2 is waiting for LOCK_slave_trans_dep_tracker.]
+SET DEBUG_SYNC="now SIGNAL go_ahead_dml";
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING= TRACKING_MODE;
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION= EXTRACTION_ALG;
+SET DEBUG_SYNC="RESET";
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_base64_flag.test b/mysql-test/suite/binlog/t/binlog_base64_flag.test
deleted file mode 100644
index 86d3e6f3e75f..000000000000
--- a/mysql-test/suite/binlog/t/binlog_base64_flag.test
+++ /dev/null
@@ -1,170 +0,0 @@
-
-# This test case verifies that the mysqlbinlog --base64-output=X flags
-# work as expected, and that BINLOG statements with row events fail if
-# they are not preceded by BINLOG statements with Format description
-# events.
-#
-# See also BUG#32407.
-
-
-# BINLOG statement does not work in embedded mode.
-source include/not_embedded.inc;
-
-disable_warnings;
-DROP TABLE IF EXISTS t1;
-enable_warnings;
-
-# Test to show BUG#32407.  This reads a binlog created with the
-# mysql-5.1-telco-6.1 tree, specifically at the tag
-# mysql-5.1.15-ndb-6.1.23, and applies it to the database.  The test
-# should fail before BUG#32407 was fixed and succeed afterwards.
---echo ==== Test BUG#32407 ====
-
-# The binlog contains row events equivalent to:
-# CREATE TABLE t1 (a int) engine = myisam
-# INSERT INTO t1 VALUES (1), (1)
-exec $MYSQL_BINLOG suite/binlog/std_data/bug32407.001 | $MYSQL;
-# The above line should succeed and t1 should contain two ones
-select * from t1;
-
-
-# Test that a BINLOG statement encoding a row event fails unless a
-# Format_description_event as been supplied with an earlier BINLOG
-# statement.
---echo ==== Test BINLOG statement w/o FD event ====
-
-# This is a binlog statement consisting of one Table_map_log_event and
-# one Write_rows_log_event.  Together, they correspond to the
-# following query:
-# INSERT INTO TABLE test.t1 VALUES (2)
-
-error ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT;
-BINLOG '
-SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
-';
-# The above line should fail and 2 should not be in the table
-select * from t1;
-
-
-# Test that it works to read a Format_description_log_event with a
-# BINLOG statement, followed by a row-event in base64 from the same
-# version.
---echo ==== Test BINLOG statement with FD event ====
-
-# This is a binlog statement containing a Format_description_log_event
-# from the same version as the Table_map and Write_rows_log_event.
-BINLOG '
-ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
-
-# This is a Table_map_log_event+Write_rows_log_event corresponding to:
-# INSERT INTO TABLE test.t1 VALUES (3)
-BINLOG '
-TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA==
-';
-# The above line should succeed and 3 should be in the table
-select * from t1;
-
-
-# Test that mysqlbinlog stops with an error message when the
-# --base64-output=never flag is used on a binlog with base64 events.
---echo ==== Test --base64-output=never on a binlog with row events ====
-
-# mysqlbinlog should fail
---replace_regex /#[0-9][0-9][0-9][0-9][0-9][0-9] .*/<#>/   /SET \@\@session.pseudo_thread_id.*/<#>/
-error 1;
-exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/bug32407.001;
-# the above line should output the query log event and then stop
-
-
-# Test that the following fails cleanly: "First, read a
-# Format_description event which has N event types. Then, read an
-# event of type M>N"
---echo ==== Test non-matching FD event and Row event ====
-
-# This is the Format_description_log_event from
-# bug32407.001, encoded in base64. It contains only the old
-# row events (number of event types is 22)
-BINLOG '
-4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAADgJ1hHEzgNAAgAEgAEBAQEEgAATwAEGggICAg=
-';
-
-# The following is a Write_rows_log_event with event type 23, i.e.,
-# not supported by the Format_description_log_event above.  It
-# corresponds to the following query:
-# INSERT INTO t1 VALUES (5)
-error 1149;
-BINLOG '
-Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
-Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA==
-';
-# the above line should fail and 5 should not be in the binlog.
-select * from t1;
-
-# Test that BUG#37426 is triggered.
-
-CREATE TABLE char128_utf8 ( 
-    i1 INT NOT NULL, 
-    c CHAR(128) CHARACTER SET utf8 NOT NULL, 
-    i2 INT NOT NULL);
-CREATE TABLE char63_utf8 (
-      i1 INT NOT NULL,
-      c CHAR(63) CHARACTER SET utf8 NOT NULL,
-      i2 INT NOT NULL);
-
-#
-# This is the format description log event
-#
-
-BINLOG '
-MuNkSA8BAAAAZgAAAGoAAAAAAAQANS4xLjI1LXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAy42RIEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
-
-# ... this event corresponding to
-#
-#    INSERT INTO char63_utf8 VALUES ( 1, "123", 1 )
-#
-# The binlog event below shall not trigger the bug check
-
-BINLOG '
-3u9kSBMBAAAANgAAAJYBAAAAABAAAAAAAAAABHRlc3QAC2NoYXI2M191dGY4AAMD/gMC/r0A
-3u9kSBcBAAAAKgAAAMABAAAQABAAAAAAAAEAA//4AQAAAAMxMjMBAAAA
-';
-SELECT * FROM char63_utf8;
-
-# ... and this is an event corresponding to
-#
-#    INSERT INTO char128_utf8 VALUES ( 1, "123", 1 )
-#
-# The binlog event below shall trigger the bug check and produce an error
-#
-
-error ER_UNKNOWN_ERROR;
-BINLOG '
-iONkSBMBAAAANwAAAJkBAAAAABAAAAAAAAAABHRlc3QADGNoYXIxMjhfdXRmOAADA/4DAv6AAA==
-iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
-';
-
-drop table t1, char63_utf8, char128_utf8;
-
-call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
-call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
-
---echo #
---echo # Bug #54393: crash and/or valgrind errors in 
---echo # mysql_client_binlog_statement
---echo #
---error ER_SYNTAX_ERROR
-BINLOG '';
---error ER_BASE64_DECODE_ERROR
-BINLOG '123';
---error ER_BASE64_DECODE_ERROR
-BINLOG '-2079193929';
---error ER_BASE64_DECODE_ERROR
-BINLOG 'xç↓%~∙D╒ƒ╡';
diff --git a/mysql-test/suite/binlog/t/binlog_cache_write_failure-master.opt b/mysql-test/suite/binlog/t/binlog_cache_write_failure-master.opt
new file mode 100644
index 000000000000..f546e12ea4e8
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_cache_write_failure-master.opt
@@ -0,0 +1 @@
+--default-storage-engine=InnoDB --gtid-mode=on --enforce-gtid-consistency=on --log-slave-updates
diff --git a/mysql-test/suite/binlog/t/binlog_cache_write_failure.test b/mysql-test/suite/binlog/t/binlog_cache_write_failure.test
new file mode 100644
index 000000000000..11d6353aeb9d
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_cache_write_failure.test
@@ -0,0 +1,156 @@
+# === Purpose ===
+#
+# Verify that disk full/out of space errors generated during the flush
+# stage of binlog commit are properly handled by the server.
+#
+# === Implementation ===
+#
+# 1) Simulate the disk full scenario using dbug simulations so that
+#    every alternate statement fails with 'No Space Error'.
+# 2) With binlog_error_action= ABORT_SERVER, prepare a transaction
+#    and perform the following operations.
+#    2.1) Disconnect
+#    2.2) Rollback
+#    2.3) Commit
+# 3) Repeat step 2 with binlog_error_action= IGNORE_ERROR.
+#
+# === References ===
+#
+# Bug #27399620 BINLOG AND ENGINE BECOME INCONSISTENT WHEN BINLOG CACHE FILE
+# GETS OUT OF SPACE
+
+--source include/have_binlog_format_row.inc
+--source include/have_log_bin.inc
+--source include/have_debug.inc
+# Don't test this under valgrind, memory leaks will occur
+--source include/not_valgrind.inc
+# Avoid CrashReporter popup on Mac
+--source include/not_crashrep.inc
+
+call mtr.add_suppression("An error occurred during flush stage of the commit");
+call mtr.add_suppression("Attempting backtrace. You can use the following information to find out*");
+
+RESET MASTER;
+CREATE TABLE t1(i INT);
+
+--echo
+--echo # Case 1 (binlog_error_action = ABORT_SERVER)
+--echo
+--let $log_pos_before = query_get_value("SHOW BINARY LOGS", File_size, 1)
+SET GLOBAL binlog_error_action = ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--echo
+--echo # Case 1.1  CLIENT DISCONNECTION
+connect(con1,localhost,root,,);
+--connection con1
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+--replace_regex /.*Error writing file.*/Error writing file <tmp_file_name> (Errcode: ##)/
+--error ER_ERROR_ON_WRITE,
+INSERT INTO t1 VALUES (3);
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+--disconnect con1
+
+--echo
+--echo # Case 1.2 ROLLBACK
+--connection default
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+--replace_regex /.*Error writing file.*/Error writing file <tmp_file_name> (Errcode: ##)/
+--error ER_ERROR_ON_WRITE,
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+
+--echo
+--echo # Case 1.3 COMMIT
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+--replace_regex /.*Error writing file.*/Error writing file <tmp_file_name> (Errcode: ##)/
+--error ER_ERROR_ON_WRITE,
+INSERT INTO t1 VALUES (3);
+
+# Check that flush error causing server to abort and client gets
+# ER_BINLOG_LOGGING_IMPOSSIBLE when binlog_error_action= 'ABORT_SERVER'.
+--replace_result $MYSQLTEST_VARDIR/ MYSQLTEST_VARDIR/
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+COMMIT;
+
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+# Check that error is present in error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_cache_write_failure
+--let $assert_count = 1
+--let $assert_select = An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'.
+--let $assert_text = An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'ABORT_SERVER'.
+--source include/assert_grep.inc
+
+# Check that transaction is not committed
+--let $assert_cond= COUNT(*) = 0 FROM t1;
+--let $assert_text= Count of elements in t1 should be 0.
+--source include/assert.inc
+
+# Check that transaction is not binlogged as well
+--let $log_pos_after = query_get_value("SHOW BINARY LOGS", File_size, 1)
+--let $assert_cond = $log_pos_before = $log_pos_after
+--let $assert_text = Query is not binlogged as expected.
+--source include/assert.inc
+TRUNCATE TABLE t1;
+
+--echo
+--echo # Case 2 (binlog_error_action = IGNORE_ERROR)
+--echo
+RESET MASTER;
+SET GLOBAL binlog_error_action= IGNORE_ERROR;
+
+BEGIN;
+INSERT INTO t1 VALUES (1);
+SET SESSION debug= "+d,simulate_tmpdir_partition_full";
+INSERT INTO t1 VALUES (2);
+--replace_regex /.*Error writing file.*/Error writing file <tmp_file_name> (Errcode: ##)/
+--error ER_ERROR_ON_WRITE,
+INSERT INTO t1 VALUES (3);
+--replace_regex /.*Error writing file.*/Error writing file MYSQLTEST_VARDIR\/tmp\/temp_file (Errcode: ##)/
+COMMIT;
+SET SESSION debug= "-d,simulate_tmpdir_partition_full";
+
+# Check that transaction is committed
+--let $assert_cond = COUNT(*) = 2 FROM t1;
+--let $assert_text = Count of elements in t1 should be 2.
+--source include/assert.inc
+
+# Test to prove that binary log is disabled
+--error ER_NO_BINARY_LOGGING
+SHOW BINARY LOGS;
+
+# Check that error is present in error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_cache_write_failure
+--let $assert_count = 1
+--let $assert_select = An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'IGNORE_ERROR'.
+--let $assert_text = An error occurred during flush stage of the commit. 'binlog_error_action' is set to 'IGNORE_ERROR'.
+--source include/assert_grep.inc
+
+# Restart so that binary log is enabled again and we can do the below test
+--source include/restart_mysqld.inc
+
+# Check that transaction is committed (binlog position check cannot be done
+# as we would have written STOP_EVENT in the binlog while closing
+# it)
+--let $assert_cond = COUNT(*) = 2 FROM t1;
+--let $assert_text = Count of elements in t1 should be 2.
+--source include/assert.inc
+
+# Cleanup
+DROP TABLE t1;
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/t/binlog_check_flush_log_assertion.test b/mysql-test/suite/binlog/t/binlog_check_flush_log_assertion.test
index c5cc901470de..65d9e49e70c7 100644
--- a/mysql-test/suite/binlog/t/binlog_check_flush_log_assertion.test
+++ b/mysql-test/suite/binlog/t/binlog_check_flush_log_assertion.test
@@ -1,42 +1,34 @@
 # ==== Purpose ====
 #
-# Bug #20592961  'FLUSH LOGS' POST FAULT INJECTION HITS ASSERT `! IS_SET()' AT SQL_ERROR.CC:381
+# Verify that 'FLUSH LOGS' does not cause assertion failure any more,
+# even if there is no binlog file before executing it.
 #
-# If we inject some fault in binary index file using debug options,
-# then 'flush logs' command will hit the assertion failure
-# '! is_set()' at sql_error.cc:381. The root cause is that the
-# 'flush logs' command missed to handle an 'Bad file descriptor'
-# error while flushing io cache.
+# ==== Implementation ====
 #
-# To fix the problem, handle the 'Bad file descriptor' error
-# while flushing io cache in the case.
-#
-# Steps to reproduce:
 # 1) SET GLOBAL debug='d,error_unique_log_filename' to
-#    cause 'FLUSH LOGS' error and 'RESET MASTER' error.
-# 2) Execute 'FLUSH LOGS' to cause crash.
-# 3) Restart and reset the server.
+#    cause 'FLUSH LOGS' and 'RESET MASTER' commands to error out.
+# 2) Execute 'FLUSH LOGS' to verify that it does not cause
+#    assertion failure any more.
+#
+# ==== References ====
 #
+# Bug#20592961: 'FLUSH LOGS' POST FAULT INJECTION HITS ASSERT `! IS_SET()' AT SQL_ERROR.CC:381
+# Bug#29201665: ASAN MEMORY LEAK IN LOG_EVENT::WRITE_HEADER() IN MYSQL-5.7
 
 # Test in this file is binlog format agnostic, thus no need
 # to rerun them for every format.
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
-# Do not run the test with valgrind, since the
-# server may intentionally crash in the test.
---source include/not_valgrind.inc
 
 --disable_query_log
 call mtr.add_suppression("Can't generate a unique log-filename");
-call mtr.add_suppression("The server was unable to create a new log file. An incident event has been written to the binary log which will stop the slaves.");
 call mtr.add_suppression("MYSQL_BIN_LOG::open failed to generate new file name.");
 call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression('Attempting backtrace');
-call mtr.add_suppression("Either disk is full or file system is read only");
 call mtr.add_suppression('Could not open .*');
 --enable_query_log
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
-SET GLOBAL debug='+d,error_unique_log_filename';
+--let $debug_point= error_unique_log_filename
+--source include/add_debug_point.inc
 
 --error ER_NO_UNIQUE_LOGFILE
 FLUSH LOGS;
@@ -44,29 +36,17 @@ FLUSH LOGS;
 # Restart the server to enable binary log.
 --source include/restart_mysqld.inc
 SET GLOBAL binlog_error_action= IGNORE_ERROR;
-SET GLOBAL debug='+d,error_unique_log_filename';
+--source include/add_debug_point.inc
 
 --error ER_NO_UNIQUE_LOGFILE
 RESET MASTER;
 
-SET GLOBAL debug='-d,error_unique_log_filename';
-SET @@GLOBAL.DEBUG= @debug_save;
+--source include/remove_debug_point.inc
 
 --error ER_UNKNOWN_TARGET_BINLOG
 RESET MASTER;
 SET GLOBAL binlog_error_action= ABORT_SERVER;
 
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-
-# The following query may cause ER_BINLOG_LOGGING_IMPOSSIBLE error,
-# lost connection to MySQL server or succeed. And it does not cause
-# assertion failure any more.
---error 0,ER_BINLOG_LOGGING_IMPOSSIBLE,2013
+# Verify that 'FLUSH LOGS' does not cause assertion failure any more,
+# even if there is no binlog before executing it.
 FLUSH LOGS;
-
-# Restart and reset the server
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---enable_reconnect
---source include/wait_until_connected_again.inc
---disable_reconnect
-RESET MASTER;
diff --git a/mysql-test/suite/binlog/t/binlog_corrupt_update_log_event.test b/mysql-test/suite/binlog/t/binlog_corrupt_update_log_event.test
new file mode 100644
index 000000000000..dbc933265249
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_corrupt_update_log_event.test
@@ -0,0 +1,113 @@
+# === Purpose ===
+#
+# This test checks that server doesn't crash when we have a
+# corrupted Update rows log event.
+#
+# ==== Requirements ====
+#
+# R1. If a corrupted Update log event is applied on a server
+#     it should throw error and not crash.
+#
+# === Implementation ====
+#
+# 1. Create a database
+# 2. Create a table on the server
+# 3. Apply an Insert log event
+# 4. Apply a corrupted Update log event and expect an error.
+# 5. Cleanup
+#
+# === References ===
+#
+# Bug#108546 Corrupted replication event may lead mysql coredump
+
+call mtr.add_suppression(".*error 1610.*");
+
+--source include/have_log_bin.inc
+--source include/have_binlog_format_row.inc
+
+--echo # 1. Create a database
+
+CREATE DATABASE ulms;
+
+USE ulms;
+
+--echo # 2. Create a table on the server
+
+CREATE TABLE `t5k_trade_is_fields_rslt` (
+  `CA` varchar(64) NOT NULL ,
+  `SEQ` int(8) NOT NULL ,
+  `MSEQ` int(8) NOT NULL ,
+  `MT` char(1) DEFAULT NULL ,
+  `M_CONTENT` varchar(2000) DEFAULT NULL ,
+  `M_ORIGINAL_CONTENT` varchar(2000) DEFAULT NULL ,
+  `SC` double(16,2) DEFAULT NULL ,
+  `CUST_ID` varchar(64) DEFAULT NULL ,
+  `LIST_CODE` varchar(240) DEFAULT NULL ,
+  `IS_REAL_HIT` char(1) DEFAULT NULL ,
+  `IS_PASS` char(1) DEFAULT NULL ,
+  `CHECK_TYPE` varchar(64) DEFAULT NULL ,
+  `SCREEN_STATUS` char(1) DEFAULT NULL ,
+  `HANLDER` varchar(64) DEFAULT NULL ,
+  `PTIME` char(19) DEFAULT NULL ,
+  `RECOGNIZE_STATUS` char(1) DEFAULT '0' ,
+  `RECOGNIZE_OPTION` varchar(2048) DEFAULT NULL ,
+  `AUDIT_STATUS` char(1) DEFAULT NULL ,
+  `AUDIT_OPTION` varchar(2048) DEFAULT NULL ,
+  `AUDIT_OPTION_STATUS` char(10) DEFAULT NULL ,
+  `CHECK_STATUS` char(1) DEFAULT NULL ,
+  `CHECK_OPTION` varchar(2048) DEFAULT NULL ,
+  `CHECK_OPTION_STATUS` varchar(10) DEFAULT NULL ,
+  `APPROVE_STATUS` char(1) DEFAULT NULL ,
+  PRIMARY KEY (`CA`,`SEQ`,`MSEQ`),
+  KEY `T5K_TRADE_IS_FIELDS_RSLT_CUST_ID_IDX` (`CUST_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ;
+
+--echo # 3. Apply an Insert log event
+
+INSERT INTO `ulms`.`t5k_trade_is_fields_rslt` values(
+   '039c6a32-dc1b-4978-bf6c-df6ea0cd80d4-1662617934' /* VARSTRING(256) meta=256 nullable=0 is_null=0 */		,
+   1 /* INT meta=0 nullable=0 is_null=0 */									,
+   0 /* INT meta=0 nullable=0 is_null=0 */									,
+   '1' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   'K.A.S. ' /* VARSTRING(8000) meta=8000 nullable=1 is_null=0 */						,
+   'K.S.A.' /* VARSTRING(8000) meta=8000 nullable=1 is_null=0 */						,
+   1 /* DOUBLE meta=8 nullable=1 is_null=0 */									,
+   '625224' /* VARSTRING(256) meta=256 nullable=1 is_null=0 */							,
+   'T03,T04' /* VARSTRING(960) meta=960 nullable=1 is_null=0 */							,
+   '2' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   '1' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   '3:报文' /* VARSTRING(256) meta=256 nullable=1 is_null=0 */							,
+   NULL /* STRING(4) meta=65028 nullable=1 is_null=1 */								,
+   NULL /* VARSTRING(256) meta=256 nullable=1 is_null=1 */							,
+   NULL /* STRING(76) meta=65100 nullable=1 is_null=1 */							,
+   '2' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   'K.S.A. 表示沙特阿拉伯的国家缩写，不涉及相关名单' /* VARSTRING(8192) meta=8192 nullable=1 is_null=0 */	,
+   '4' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   '不涉及相关名单' /* VARSTRING(8192) meta=8192 nullable=1 is_null=0 */					,
+   '4' /* STRING(40) meta=65064 nullable=1 is_null=0 */								,
+   '6' /* STRING(4) meta=65028 nullable=1 is_null=0 */								,
+   NULL /* VARSTRING(8192) meta=8192 nullable=1 is_null=1 */							,
+   NULL /* VARSTRING(40) meta=40 nullable=1 is_null=1 */							,
+   '' /* STRING(4) meta=65028 nullable=1 is_null=0 */
+);
+
+
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC'/*!*/;
+BINLOG 'U2EZYw8CAAAAdwAAAHsAAAAAAAQANS43LjM2LWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEzgNAAgAEgAEBAQEEgAAXwAEGggAAAAICAgCAAAACgoKKioAEjQAAYA9mSk='/*!*/;
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC';
+
+
+BEGIN;
+--echo # 4. Apply a corrupted Update log event and expect an error.
+
+--error ER_SLAVE_CORRUPT_EVENT
+BINLOG '
+y6oZYxMCAAAAhwAAAKCwrTIAAH8gAAAAAAEABHVsbXMAGHQ1a190cmFkZV9pc19maWVsZHNfcnNsdAAYDwMD/g8PBQ8P/v4P/g/+/g/+D/7+Dw/+KwAB/gRAH0AfCAABwAP+BP4EAAH+BAAB/kz+BAAg/gQAIP4o/gQAICgA/gT4///M3BmQ
+06oZYx8CAAAA3AEAANwBAAAAAH8gAAAAAAMAAgAY////////NgBgLwAwMzljNmEzMi1kYzFiLTQ5NzgtYmY2Yy1kZjZlYTBjZDgwZDQtMTY2MjYxNzkzNAEAAAAAAAAAATEHAEsuQS5TLiAGAEsuUy5BLgAAAAAAAPA/BgA2MjUyMjQHAFQwMyxUMDQBMgExCAAzOuaKpeaWhwEyQwBLLlMuQS4g6KGo56S65rKZ54m56Zi/5ouJ5Lyv55qE5Zu95a6257yp5YaZ77yM5LiN5raJ5Y+K55u45YWz5ZCN5Y2VATQVAOS4jea2ieWPiuebuOWFs+WQjeWNlQE0ATYAAHBwLwAwMzljNmEzMi1kYzFiLTQ5NzgtYmY2Yy1kZjZlYTBjZDgwZDQtMTY2MjYxNzkzNAEAAAAAAAAAATEHAEsuQS5TLiAGAEsuUy5BLgAAAAAAAPA/BgA2MjUyMjQHAFQwMyxUMDQBMgExCAAzOuaKpeaWhwEyQwBLLlMuQS4g6KGo56S65rKZ54m56Zi/5ouJ5Lyv55qE5Zu95a6257yp5YaZ77yM5LiN5raJ5Y+K55u45YWz5ZCN5Y2VATQVAOS4jea2ieWPiuebuOWFs+WQjeWNlQE0APt/AAA=
+'/*!*/;
+
+COMMIT;
+
+--echo # 5. Cleanup
+
+DROP DATABASE ulms;
diff --git a/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_row_mix.test b/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_row_mix.test
new file mode 100644
index 000000000000..556671e9a005
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_row_mix.test
@@ -0,0 +1,60 @@
+# ====== Purpose =======
+#
+# This test verifies that DROP for a temporary table created
+# in Row mode is not logged in binlog at session disconnect.
+#
+# ====== Implementation ======
+#
+# Create temporary tables in Row mode using different engines,
+# also create a temporary table in Statement mode, now when you connect to the session
+# after a disconnect print the output of show binlog events.
+# This will verify that the DROP for temporary table created in statement
+# mode is written to binary log at session disconnect, but for  the temporary table
+# created in Row mode no DROP statement for temporary table is logged at session
+# disconnect.
+#
+# ====== References =======
+#
+# Bug#28606948:BACKPORT OF BUG #24670909 TO 5.7.22
+#
+# The name of this file has row_mix even though we are just testing in row
+# format because we want the name of tests to be consistent in 5.7 and 8.0
+
+--source include/have_log_bin.inc
+--source include/have_myisam.inc
+--source include/have_binlog_format_row.inc
+
+RESET MASTER;
+
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+CREATE TABLE t2(a INT) ENGINE=MyISAM;
+
+--source include/count_sessions.inc
+
+--connect(con1,localhost,root)
+
+SET @saved_binlog_format= @@SESSION.binlog_format;
+# A DROP for tmp10 should be binlogged because CREATE TABLE is
+# created in Statement mode
+
+SET SESSION binlog_format= 'STATEMENT';
+CREATE TEMPORARY TABLE tmp10 (a INT);
+SET SESSION binlog_format= @saved_binlog_format;
+
+# No DROP should be logged for any of the statements below
+CREATE TEMPORARY TABLE tmp1 ENGINE=InnoDB SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp2 ENGINE=MyISAM SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp3 ENGINE=MyISAM SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp4 ENGINE=InnoDB SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp5 (a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE tmp6 (a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE tmp7 LIKE t1;
+CREATE TEMPORARY TABLE tmp8 LIKE t2;
+
+--disconnect con1
+--connection default
+--source include/wait_until_count_sessions.inc
+
+--source include/show_binlog_events.inc
+
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_stmt.test b/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_stmt.test
new file mode 100644
index 000000000000..d8d30addf839
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_stmt.test
@@ -0,0 +1,56 @@
+# ====== Purpose =======
+#
+# This test verifies that DROP for a temporary table created
+# in Row mode is not logged in binlog at session disconnect.
+#
+# ====== Implementation ======
+#
+# Create temporary tables in statement or mixed mode using different engines,
+# also create a temporary table in Row mode, now when you connect to the session
+# after a disconnect print the output of show binlog events.
+# This will verify that the DROP for temporary table created in stmt or mixed
+# mode is written to binary log at session disconnect, but for  the temporary table
+# created in Row mode no DROP statement for temporary table is logged at session
+# disconnect.
+#
+# ====== References =======
+#
+# Bug#28606948:BACKPORT OF BUG #24670909 TO 5.7.22
+#
+
+--source include/have_log_bin.inc
+--source include/have_myisam.inc
+--source include/have_binlog_format_mixed_or_statement.inc
+
+RESET MASTER;
+
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+CREATE TABLE t2(a INT) ENGINE=MyISAM;
+
+--source include/count_sessions.inc
+
+--connect(con1,localhost,root)
+
+# A DROP should be logged for the following tables because CREATE TABLE
+# is logged
+CREATE TEMPORARY TABLE tmp1 ENGINE=InnoDB SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp2 ENGINE=MyISAM SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp3 ENGINE=MyISAM SELECT * FROM t1;
+CREATE TEMPORARY TABLE tmp4 ENGINE=InnoDB SELECT * FROM t2;
+CREATE TEMPORARY TABLE tmp5 (a INT) ENGINE=InnoDB;
+CREATE TEMPORARY TABLE tmp6 (a INT) ENGINE=MyISAM;
+CREATE TEMPORARY TABLE tmp7 LIKE t1;
+CREATE TEMPORARY TABLE tmp8 LIKE t2;
+
+SET SESSION binlog_format= 'ROW';
+# No DROP should be logged for tmp10
+CREATE TEMPORARY TABLE tmp10 (a INT);
+
+--disconnect con1
+--connection default
+--source include/wait_until_count_sessions.inc
+
+--source include/show_binlog_events.inc
+
+DROP TABLE t1, t2;
+
diff --git a/mysql-test/suite/binlog/t/binlog_grant_alter_user.test b/mysql-test/suite/binlog/t/binlog_grant_alter_user.test
index 448d085a5eab..01538a33e173 100644
--- a/mysql-test/suite/binlog/t/binlog_grant_alter_user.test
+++ b/mysql-test/suite/binlog/t/binlog_grant_alter_user.test
@@ -109,7 +109,7 @@ query_vertical SELECT user,plugin,authentication_string,
 password_expired FROM mysql.user WHERE USER='tu2';
 
 --echo
-CREATE USER tu3@localhost IDENTIFIED WITH 'mysql_native_password' AS '%auth_O0s-tring';
+CREATE USER tu3@localhost IDENTIFIED WITH 'mysql_native_password' BY '%auth_O0s-tring';
 --replace_column 3 #
 query_vertical SELECT user,plugin,authentication_string,password_expired
 FROM mysql.user WHERE USER='tu3';
@@ -130,7 +130,7 @@ CREATE USER tu4@localhost IDENTIFIED WITH 'mysql_native_password' BY 'djgsj743$'
 --replace_column 3 #
 query_vertical SELECT user,plugin,authentication_string,ssl_type FROM mysql.user WHERE USER='tu4';
 
-CREATE USER tu5@localhost IDENTIFIED WITH 'mysql_native_password' AS 'dwh@#ghd$!' REQUIRE X509;
+CREATE USER tu5@localhost IDENTIFIED WITH 'mysql_native_password' BY 'dwh@#ghd$!' REQUIRE X509;
 --replace_column 3 #
 query_vertical SELECT user,plugin,authentication_string,ssl_type FROM mysql.user WHERE USER='tu5';
 
@@ -166,7 +166,7 @@ SELECT USER();
 connection default;
 disconnect con1;
 
-CREATE USER tu6@localhost IDENTIFIED WITH 'mysql_native_password' AS '#hGrt0O6'
+CREATE USER tu6@localhost IDENTIFIED WITH 'mysql_native_password' BY '#hGrt0O6'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
             SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
@@ -212,7 +212,7 @@ CREATE USER u18@localhost,
             u20@localhost IDENTIFIED WITH 'mysql_native_password',
             u21@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string',
             u22@localhost IDENTIFIED WITH 'mysql_native_password',
-            u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+            u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2 ACCOUNT UNLOCK;
 --replace_column 3 #
@@ -426,7 +426,7 @@ query_vertical SELECT user,ssl_type,ssl_cipher,x509_issuer,x509_subject,
 plugin,authentication_string,password_expired,
 password_last_changed,password_lifetime FROM mysql.user WHERE USER='u9';
 
-CREATE USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+CREATE USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
             SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
@@ -555,7 +555,7 @@ CREATE USER u18@localhost,
             u20@localhost IDENTIFIED WITH 'mysql_native_password',
             u21@localhost IDENTIFIED WITH 'mysql_native_password' BY '!Y_TOdh6)',
             u22@localhost IDENTIFIED WITH 'mysql_native_password',
-            u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+            u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 --replace_column 7 # 11 #
@@ -732,13 +732,13 @@ CREATE USER u4@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string
 --replace_regex /AS .* REQUIRE/AS '<non-deterministic-password-hash>' REQUIRE/
 SHOW CREATE USER u4@localhost;
 
-CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 --replace_regex /AS .* REQUIRE/AS '<non-deterministic-password-hash>' REQUIRE/
 SHOW CREATE USER user1@localhost;
 
 --echo
 
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 --replace_regex /AS .* REQUIRE/AS '<non-deterministic-password-hash>' REQUIRE/
 SHOW CREATE USER user2@localhost;
 --echo
@@ -848,7 +848,7 @@ DROP USER user1@localhost,user2@localhost,user3@localhost;
 --echo # SET PASSWORD Tests
 --echo
 CREATE USER user1@localhost IDENTIFIED BY 'auth_string';
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string1';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string1';
 
 SELECT PASSWORD('plaintext_pwd');
 
diff --git a/mysql-test/suite/binlog/t/binlog_group_commit_sync_delay_error.test b/mysql-test/suite/binlog/t/binlog_group_commit_sync_delay_error.test
new file mode 100644
index 000000000000..6a937fb4f8fa
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_group_commit_sync_delay_error.test
@@ -0,0 +1,40 @@
+# ==== Purpose ====
+#
+# This test will set a value for binlog_group_commit_sync_delay
+# which will be a non multiple of delta(the waiting time is
+# broken into smaller chunks called as delta), and execute some
+# transactions after that.
+#
+# The test verifies that server does not hang when a non multiple of 10
+# is assigned to binlog_group_commit_sync_delay variable.
+#
+# Related bugs and Worklogs
+#
+# Bug#28091735:COMMIT WILL HANG IF BINLOG_GROUP_COMMIT_SYNC_DELAY
+#              IS NOT A MULTIPLE OF 10
+
+# this is binlog format agnostic
+--source include/have_binlog_format_row.inc
+
+--let $bgcd_saved = `SELECT @@GLOBAL.binlog_group_commit_sync_delay`
+--let $bgcc_saved = `SELECT @@GLOBAL.binlog_group_commit_sync_no_delay_count`
+
+CREATE TABLE t(s INT);
+
+# Set the delay to a non multiple of delta, in this case
+# delta will be 3, MAX(1, wait_time * .1) and so it will not be
+# a multiple of the waiting time which is 32
+
+SET GLOBAL binlog_group_commit_sync_delay = 32;
+SET GLOBAL binlog_group_commit_sync_no_delay_count = 0;
+
+BEGIN;
+INSERT INTO t VALUES(10);
+COMMIT; # Hangs here without the fix
+
+#cleanup
+
+--eval SET GLOBAL binlog_group_commit_sync_delay = $bgcd_saved
+--eval SET GLOBAL binlog_group_commit_sync_no_delay_count = $bgcc_saved
+DROP TABLE t;
+
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_exhausted-master.opt b/mysql-test/suite/binlog/t/binlog_gtid_exhausted-master.opt
index 7e17eec86bc7..d7b88b45b00e 100644
--- a/mysql-test/suite/binlog/t/binlog_gtid_exhausted-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_gtid_exhausted-master.opt
@@ -1 +1 @@
---skip-core-file
+--skip-core-file --log-error=$MYSQLTEST_VARDIR/tmp/binlog_gtid_exhausted.err
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_exhausted.test b/mysql-test/suite/binlog/t/binlog_gtid_exhausted.test
index bf1d42a83c82..f4ae2097bb81 100644
--- a/mysql-test/suite/binlog/t/binlog_gtid_exhausted.test
+++ b/mysql-test/suite/binlog/t/binlog_gtid_exhausted.test
@@ -24,6 +24,8 @@
 call mtr.add_suppression("An error occurred during flush stage of the commit");
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
 
+--let $assert_file = $MYSQLTEST_VARDIR/tmp/binlog_gtid_exhausted.err
+
 #Test case 1:
 SET GLOBAL binlog_error_action=IGNORE_ERROR;
 CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@@ -35,6 +37,12 @@ INSERT INTO t1 VALUES (1);
 --error ER_GNO_EXHAUSTED
 INSERT INTO t1 VALUES (2);
 
+# BUG26035544 Assert that an error was logged to the server error log.
+--let $assert_select = Impossible to generate GTID: the integer component reached the maximum value. Restart the server with a new server_uuid. Hence turning logging off for the whole duration of the MySQL server process. To turn it on again: fix the cause, shutdown the MySQL server and restart it.
+--let $assert_count = 1
+--let $assert_text = ER_GNO_EXHAUSTED found in server error log
+--source include/assert_grep.inc
+
 # Check that transaction is committed
 --let $assert_cond = COUNT(*) = 2 FROM t1;
 --let $assert_text = Count of elements in t1 should be 2.
@@ -62,3 +70,9 @@ INSERT INTO t1 VALUES (2);
 
 RESET MASTER;
 DROP TABLE t1;
+
+# BUG26035544 Assert that an error was logged to the server error log.
+--let $assert_select = Binary logging not possible. Message: Impossible to generate GTID: the integer component reached the maximum value. Restart the server with a new server_uuid. Server is being stopped.
+--let $assert_count = 1
+--let $assert_text = ER_GNO_EXHAUSTED server is being stopped found in server error log
+--source include/assert_grep.inc
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_ps_reprepare.test b/mysql-test/suite/binlog/t/binlog_gtid_ps_reprepare.test
new file mode 100644
index 000000000000..a64120b221ee
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_gtid_ps_reprepare.test
@@ -0,0 +1,197 @@
+# ==== Purpose ====
+#
+# If re-prepare of a prepared statement or statement in stored program is
+# triggered then gtid_next should not be updated. Tests in this file verifies
+# gtid_next value update with prepared statement and stored procedure
+# re-prepare. Re-prepare statement code is same for all the stored programs. So
+# behavior is verified with only stored procedure in this file.
+#
+# ==== Requirements ====
+#
+# When a session has set GTID_NEXT to a UUID:NUMBER and AUTOCOMMIT is enabled,
+# the following requirements shall hold:
+#
+#  R1. If a statement is re-prepared, it shall leave GTID_NEXT unchanged:
+#
+#      R1.1. For prepared statements (EXECUTE)
+#      R1.2. For stored procedures (CALL)
+#
+#  R2. If a statement exhausts the re-prepare count so that it fails with
+#      ER_NEED_REPREPARE, it shall set GTID_NEXT to UNDEFINED:
+#
+#      R2.1. For prepared statements (EXECUTE)
+#      R2.2. For stored procedures (CALL)
+#
+# ==== Implementation ====
+#
+#  Initialize
+#  	a) create table
+#  	b) create prepared statement and stored procedure using table created
+#          in step a.
+#
+#  1) Verify behavior with a prepared statement
+#       1.1)  SET gtid_next = UUID:NUMBER
+#       1.2)  Execute prepared statement.
+#       1.3)  SET gtid_next = UUID:NUMBER
+#       1.4)  Truncate table so that table version is updated.
+#       1.5)  SET gtid_next = UUID:NUMBER
+#       1.6)  Re-execute prepared statement. Statement re-prepare is triggered
+#             as table version is changed. This operation should *not* invalidate
+#             gtid_next.
+#
+#  2) Verify behavior with a stored procedure.
+#       2.1) SET gtid_next = UUID:NUMBER
+#       2.2) Execute stored procedure.
+#       2.3) SET gtid_next = UUID:NUMBER
+#       2.4) Truncate table so that table version is updated.
+#       2.5) SET gtid_next = UUID:NUMBER
+#       2.6) Re-execute stored procedure. Statement re-prepare is triggered as
+#            table version is changed. This operation should *not* invalidate
+#            gtid_next.
+#
+#  3) Verify behavior with a prepared statement in stored procedure.
+#       3.1) SET gtid_next = UUID:NUMBER
+#       3.2) Execute stored procedure.
+#       3.3) SET gtid_next = UUID:NUMBER
+#       3.4) Truncate table so that table version is updated.
+#       3.5) SET gtid_next = UUID:NUMBER
+#       3.6) Re-execute stored procedure. Statement re-prepare is triggered as
+#            table version is changed. This operation should *not* invalidate
+#            gtid_next.
+#
+#  4) Verify behavior with a prepared statement in max re-prepare hit situation.
+#       4.1) SET gtid_next = UUID:NUMBER
+#       4.2) Execute prepared statement.
+#       4.3) SET gtid_next = UUID:NUMBER
+#       4.4) Truncate table so that table version is updated.
+#       4.5) SET gtid_next = UUID:NUMBER
+#       4.6) Simulate max prepared statement re-prepare hit condition.
+#       4.7) Re-execute prepared statement. Statement re-prepare is triggered as
+#            table version is changed. This operation fails and gtid_next is
+#            invalidated.
+#
+#  5) Verify behavior with a stored procedure in max re-prepare hit situation.
+#       5.1) SET gtid_next = UUID:NUMBER
+#       5.2) Execute stored procedure.
+#       5.3) SET gtid_next = UUID:NUMBER
+#       5.4) Truncate table so that table version is updated.
+#       5.5) SET gtid_next = UUID:NUMBER
+#       5.6) Simulate max prepared statement re-prepare hit condition.
+#       5.7) Re-execute stored procedure. Statement re-prepare is triggered as
+#            table version is changed. This operation fails and gtid_next is
+#            invalidated.
+#
+#
+# ==== References ====
+#
+# Bug#32326510 - REPREPARE AT THE BEGINNING OF AN IMPLICIT TRANS WILL CAUSE 1837
+#                ERROR.
+#
+
+--source include/have_gtid.inc
+--source include/have_debug.inc
+
+--echo # ==== Initialize ====
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a INT);
+PREPARE stmt1 FROM 'INSERT INTO t1 VALUES (1)';
+DELIMITER $;
+CREATE PROCEDURE p1 ()
+BEGIN
+  INSERT INTO t2 VALUES(2);
+END
+$
+
+CREATE PROCEDURE p2 ()
+BEGIN
+  EXECUTE stmt1;
+END
+$
+DELIMITER ;$
+
+
+--echo # ==== Case 1 ====
+--echo # Test case to verify gtid_next update with prepared statement re-prepare.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+BEGIN;
+EXECUTE stmt1;
+COMMIT;
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:2';
+TRUNCATE TABLE t1;
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:3';
+--echo # Without fix, following statement execution fails.
+EXECUTE stmt1;
+
+
+--echo # ==== Case 2 ====
+--echo # Test case to verify gtid_next update with stored procedure statement
+--echo # re-prepare.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:4';
+CALL p1();
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:5';
+TRUNCATE TABLE t2;
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:6';
+--echo # Without fix, following statement execution fails.
+CALL p1();
+
+
+--echo # ==== Case 3 ====
+--echo # Test case to verify gtid_next update with prepared statement re-prepare
+--echo # in stored procedure.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:7';
+CALL p2();
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:8';
+TRUNCATE TABLE t1;
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:9';
+--echo # Without fix, following statement execution fails.
+CALL p2();
+
+
+--echo # === Case 4 ===
+--echo # Test case to verify gtid_next update with prepared statement max
+--echo # re-prepare attempt hits.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:10';
+TRUNCATE TABLE t1;
+
+--let $debug_point= simulate_max_reprepare_attempts_hit_case
+--let $debug_type= SESSION
+--source include/add_debug_point.inc
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:11';
+--echo # Error is reported when max re-prepare limit is hit. Transaction is
+--echo # rolled back and gtid_next is updated.
+--error ER_NEED_REPREPARE
+EXECUTE stmt1;
+--error ER_GTID_NEXT_TYPE_UNDEFINED_GROUP
+INSERT INTO t1 VALUES(10);
+
+
+--echo # === Case 5 ===
+--echo # Test case to verify gtid_next update with stored procedure statement
+--echo # max re-prepare attempt hits.
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:12';
+TRUNCATE TABLE t2;
+
+SET gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:13';
+--echo # Error is reported when max re-prepare limit is hit. Transaction is
+--echo # rolled back and gtid_next is updated.
+--error ER_NEED_REPREPARE
+CALL p1;
+--error ER_GTID_NEXT_TYPE_UNDEFINED_GROUP
+INSERT INTO t2 VALUES(10);
+
+
+--echo # ==== Cleanup ====
+SET gtid_next = DEFAULT;
+--let $debug_point= simulate_max_reprepare_attempts_hit_case
+--let $debug_type= SESSION
+--source include/remove_debug_point.inc
+DEALLOCATE PREPARE stmt1;
+DROP TABLE t1, t2;
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_purge_binlog_at_startup.test b/mysql-test/suite/binlog/t/binlog_gtid_purge_binlog_at_startup.test
new file mode 100644
index 000000000000..bc53622d4c70
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_gtid_purge_binlog_at_startup.test
@@ -0,0 +1,115 @@
+# ==== Purpose ====
+#
+# The purpose of this test is to ensure that GTID_PURGED variable is
+# properly set when binlogs need to be purged by means of
+# `expire_logs_days` usage during server startup process.
+#
+# ==== Requirements ====
+#
+# R1. When `expire_logs_days` has been expired upon server
+#     restart, binary logs should be purged and GTID_PURGED should be updated
+#     accordingly.
+#
+# ==== Implementation ====
+#
+# TC1. Restart the server with simulated `expire_logs_days` expiration
+# ---------------------------------------------------------------------------
+# 1. Create a table.
+# 2. Stop the server.
+# 3. Start the server with `--expire-logs-days` sinthetically set to
+#    expire.
+# 4. Ensure GTID_PURGED is set at the correct value.
+# 5. Ensure that we have only one binary log file.
+#
+# TC2. Restart the server with simulated `expire_logs_days`
+#      expiration and after flush
+# ----------------------------------------------------------------
+# 1. Create a table.
+# 2. Flush the logs.
+# 3. Insert a row.
+# 4. Stop the server.
+# 5. Start the server with `--expire-logs-days` sinthetically set to
+#    expire.
+# 6. Ensure GTID_PURGED is set at the correct value.
+# 7. Ensure that we have only one binary log file.
+#
+# ==== References ====
+#
+# BUG#32008512 ASSERTION `LOST_GTIDS->IS_EMPTY()' FAILED WHEN MYSQLD
+#              STARTED
+# BUG#32134875 PURGE BINLOG IN INSTANCE STARTUP CAUSE PREVIOUS_GTIDS WRONG
+#              IN NEW BINLOG FILE
+#
+--source include/have_binlog_format_row.inc
+--source include/have_gtid.inc
+--source include/have_debug.inc
+
+--let $saved_debug = `SELECT @@debug`
+
+# TC1. Restart the server with simulated `expire_logs_days` expiration
+# ---------------------------------------------------------------------------
+--let $debug_point = "+d,expire_logs_always_at_start"
+RESET MASTER;
+# 1. Create a table.
+CREATE TABLE t (a INT);
+
+# 2. Stop the server.
+--source include/stop_mysqld.inc
+# 3. Start the server with `--expire-logs-days` sinthetically set to
+#    expire.
+--let $restart_parameters = restart: --debug=$debug_point --expire-logs-days=1
+--source include/start_mysqld.inc
+
+--let $server_uuid = `SELECT @@server_uuid`
+
+# 4. Ensure GTID_PURGED is set at the correct value.
+--let $assert_text = GTID_PURGED is consistent
+--let $assert_cond = "[SELECT @@gtid_purged]" = "$server_uuid:1"
+--source include/assert.inc
+
+# 5. Ensure that we have only one binary log file.
+--let $statement = SHOW BINARY LOGS
+--let $column = Log_name
+--source include/get_row_count.inc
+--let $assert_text = We have 1 binlog file
+--let $assert_cond = $row_count = 1
+--source include/assert.inc
+
+DROP TABLE t;
+
+# TC2. Restart the server with simulated `expire_logs_days`
+#      expiration and after flush
+# ----------------------------------------------------------------
+--let $debug_point = "+d,expire_logs_always_at_start"
+RESET MASTER;
+# 1. Create a table.
+CREATE TABLE t (a INT);
+# 2. Flush the logs.
+FLUSH LOGS;
+# 3. Insert a row
+INSERT INTO t VALUES (1), (2), (3);
+
+# 4. Stop the server.
+--source include/stop_mysqld.inc
+# 5. Start the server with `--expire-logs-days` sinthetically set to
+#    expire.
+--let $restart_parameters = restart: --debug=$debug_point --expire-logs-days=1
+--source include/start_mysqld.inc
+
+--let $server_uuid = `SELECT @@server_uuid`
+
+# 7. Ensure GTID_PURGED is set at the correct value.
+--let $assert_text = GTID_PURGED is consistent
+--let $assert_cond = "[SELECT @@gtid_purged]" = "$server_uuid:1-2"
+--source include/assert.inc
+
+# 8. Ensure that we have only one binary log file.
+--let $statement = SHOW BINARY LOGS
+--let $column = Log_name
+--source include/get_row_count.inc
+--let $assert_text = We have 1 binlog file
+--let $assert_cond = $row_count = 1
+--source include/assert.inc
+
+DROP TABLE t;
+SET GLOBAL debug = "-d,expire_logs_always_at_start";
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test b/mysql-test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test
new file mode 100644
index 000000000000..ddd7f42751ca
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test
@@ -0,0 +1,71 @@
+# ==== Purpose ====
+#
+# The purpose of this test is to ensure that the server properly restores a
+# previous state or preserves a new state, for GTID consistency violation,
+# whenever a statement execution succeeds or fails.
+#
+# ==== Requirements ====
+#
+# R1. If a statement fails to execute successfully, the overall state observed
+#     prior to the statement execution must be kept after the failure.
+# R2. If a statement executes successfully, the overall state observed after the
+#     statement execution must be kept.
+#
+# ==== Implementation ====
+#
+# -- TEST CASES --
+#
+# TC1. Test if GTID consistency state is rolled back after failure
+# ----------------------------------------------------------------
+# 1) Place an XA transaction in the prepare state.
+# 2) Try to create a temporary table.
+# 3) Test if the execution state prior to the failure is restored, using
+#    DEBUG_SYNC.
+# 4) Commit the transaction.
+#
+# TC2. Test if GTID consistency state is persisted after success
+# --------------------------------------------------------------
+# 1) Try to create a temporary table.
+# 2) Test if the execution state after the successful execution is persisted,
+#    using DEBUG_SYNC.
+#
+# ==== References ====
+#
+# BUG#27903831 [MYSQL 8.0 GA DEBUG BUILD] ASSERTION
+# `!THD->HAS_GTID_CONSISTENCY_VIOLATION
+
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/not_gtid_enabled.inc    
+--source include/have_binlog_format_statement.inc
+
+--echo # TC1. Test if GTID consistency state is rolled back after failure
+--echo # ----------------------------------------------------------------
+# 1) Place an XA transaction in the prepare state.
+XA START 'xa1';
+XA END 'xa1';
+XA PREPARE 'xa1';
+#SET DEBUG_SYNC='restore_previous_state_after_statement_failed SIGNAL failure';
+# 2) Try to create a temporary table.
+--error ER_XAER_RMFAIL
+CREATE TEMPORARY TABLE t1 (c INT) ENGINE=InnoDB;
+# 3) Test if the `Rpl_state_guard` instance restored the execution state prior
+#    to the failure, using DEBUG_SYNC.
+#SET DEBUG_SYNC='now WAIT_FOR failure';
+# 4) Commit the transaction.
+SET @@SESSION.GTID_NEXT='ANONYMOUS';
+XA COMMIT 'xa1';
+
+--echo # TC2. Test if GTID consistency state is persisted after success
+--echo # --------------------------------------------------------------
+#SET DEBUG_SYNC='persist_new_state_after_statement_succeeded SIGNAL success';
+# 1) Try to create a temporary table.
+CREATE TEMPORARY TABLE t1 (c INT) ENGINE=InnoDB;
+# 2) Test if the `Rpl_state_guard` instance persisted the execution state after
+#    the successful execution, using DEBUG_SYNC.
+#SET DEBUG_SYNC='now WAIT_FOR success';
+#
+
+DROP TABLE t1;
+#SET DEBUG_SYNC='RESET';
diff --git a/mysql-test/suite/binlog/t/binlog_gtid_unknown_xid.test b/mysql-test/suite/binlog/t/binlog_gtid_unknown_xid.test
new file mode 100644
index 000000000000..7786f9067087
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_gtid_unknown_xid.test
@@ -0,0 +1,153 @@
+# ==== Purpose ====
+#
+# The purpose of this test is to ensure that the server properly disregards XA
+# transaction related statements that try to operate upon an unknown XID, when
+# on SBR.
+#
+# ==== Requirements ====
+#
+# R1. Ensure that execution proceeds normaly after trying - and failling - to
+#     execute `XA COMMIT / ROLLBACK` with an unkown XID.
+#
+# ==== Implementation ====
+#
+# Ensure that the server properly disregards XA related statements that operate
+# on unknown XIDs given the following setup / statements combinations:
+#
+# TC1. Manual GTID and apply `XA ROLLBACK` with unkown XID
+# --------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+# 2) Set `GTID_NEXT` to manually introduced value.
+# 3) Execute a DML statement.
+# 4) Execute `XA ROLLBACK` with an unknown XID.
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+#
+# TC2. Manual GTID and apply `XA ROLLBACK` with unkown XID
+# --------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+# 2) Set `GTID_NEXT` to manually introduced value.
+# 3) Execute a DML statement.
+# 4) Execute `XA ROLLBACK` with an unknown XID.
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+#
+# TC3. Manual GTID and apply `XA ROLLBACK` to an existent XA transaction
+# --------------------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+# 2) Set `GTID_NEXT` to manually introduced value.
+# 3) Execute a DML statement.
+# 4) Execute `XA ROLLBACK` with an existent XID.
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+#
+# TC4. Manual GTID and apply `XA COMMIT` to an existent XA transaction
+# -----------------------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+# 2) Set `GTID_NEXT` to manually introduced value.
+# 3) Execute a DML statement.
+# 4) Execute `XA COMMIT` with an existent XID.
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+#
+# ==== References ====
+#
+# BUG#27928837 `HEAD->VARIABLES.GTID_NEXT.TYPE != UNDEFINED_GTID`
+
+--source include/have_gtid.inc
+
+--let $current_autocommit= `SELECT @@AUTOCOMMIT`
+
+CREATE TABLE t2(a INT);
+
+# TC1. Manual GTID and apply `XA ROLLBACK` with unkown XID
+# --------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+SET @@AUTOCOMMIT=0;
+# 2) Set `GTID_NEXT` to manually introduced value.
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:1';
+# 3) Execute a DML statement.
+INSERT INTO t2 VALUES(1);
+# 4) Execute `XA ROLLBACK` with an unknown XID.
+--error ER_XAER_NOTA
+XA ROLLBACK 'xa1';
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+SET @@AUTOCOMMIT=1;
+#
+
+# TC2. Manul GTID and apply `XA ROLLBACK` with unkown XID
+# -----------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+SET @@AUTOCOMMIT=0;
+# 2) Set `GTID_NEXT` to manually introduced value.
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:2';
+# 3) Execute a DML statement.
+INSERT INTO t2 VALUES(2);
+# 4) Execute `XA COMMIT` with an unknown XID.
+--error ER_XAER_NOTA
+XA COMMIT 'xa1';
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+SET @@AUTOCOMMIT=1;
+#
+
+--connect (other_conn, 127.0.0.1,root,,test,$MASTER_MYPORT,)
+XA START 'xa1';
+XA END 'xa1';
+XA PREPARE 'xa1';
+--let $connection_id= `SELECT CONNECTION_ID()`
+--disconnect other_conn
+# Wait for the `other_conn` to be cleared from the server
+--connection default
+--let $wait_condition = SELECT COUNT(*) = 0 FROM information_schema.processlist WHERE id = '$connection_id'
+--source include/wait_condition.inc
+
+--connection default
+# TC3. Manual GTID and apply `XA ROLLBACK` to an existent XA transaction
+# --------------------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+SET @@AUTOCOMMIT=0;
+# 2) Set `GTID_NEXT` to manually introduced value.
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:3';
+# 3) Execute a DML statement.
+INSERT INTO t2 VALUES(3);
+# 4) Execute `XA ROLLBACK` with an existent XID.
+--error ER_XAER_RMFAIL
+XA ROLLBACK 'xa1';
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+SET @@AUTOCOMMIT=1;
+#
+
+# TC4. Manual GTID and apply `XA COMMIT` to an existent XA transaction
+# -----------------------------------------------------------------------
+# 1) Ensure that `AUTOCOMMIT` is OFF.
+SET @@AUTOCOMMIT=0;
+# 2) Set `GTID_NEXT` to manually introduced value.
+SET SESSION GTID_NEXT='aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee:4';
+# 3) Execute a DML statement.
+INSERT INTO t2 VALUES(4);
+# 4) Execute `XA COMMIT` with an existent XID.
+--error ER_XAER_RMFAIL
+XA COMMIT 'xa1';
+# 5) Set `AUTOCOMMIT` to the default value so that the DML statement gets
+#    commited.
+SET @@AUTOCOMMIT=1;
+#
+
+--let $assert_text= All inserts were committed, XA statements and respective failures, were disregarded
+--let $assert_cond= "[SELECT COUNT(1) FROM t2]" = "4"
+--source include/assert.inc
+
+# CLEAN UP
+SET SESSION GTID_NEXT='AUTOMATIC';
+XA ROLLBACK 'xa1';
+--let $pending = query_get_value(XA RECOVER, data, 1)
+--let $assert_text= All XA transactions were cleared
+--let $assert_cond= "$pending" = "No such row"
+--source include/assert.inc
+DROP TABLE t2;
+--replace_result $current_autocommit DEFAULT_AUTOCOMMIT
+--eval SET @@AUTOCOMMIT=$current_autocommit
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/t/binlog_hexdump.test b/mysql-test/suite/binlog/t/binlog_hexdump.test
deleted file mode 100644
index cde4dabb9d4e..000000000000
--- a/mysql-test/suite/binlog/t/binlog_hexdump.test
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#
-# Bug#11747887 - MYSQLBINLOG --HEXDUMP PRINTS LAST ROW OF HEXDUMP
-# 	         INCORRECTLY
-
---replace_regex s/	Xid = [0-9]*/	Xid = <number>/#
---exec $MYSQL_BINLOG --hexdump suite/binlog/std_data/bug11747887-bin.000003
diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test
index 45f1d685f86a..849c72e77233 100644
--- a/mysql-test/suite/binlog/t/binlog_index.test
+++ b/mysql-test/suite/binlog/t/binlog_index.test
@@ -475,9 +475,39 @@ SHOW BINARY LOGS;
 --source include/restart_mysqld.inc
 -- source include/show_binary_logs.inc
 DROP TABLE t1;
+eval SET SESSION debug="$old";
 -- echo # Test case11: Ends
 
+
+--echo # Test case12: Bug#25839610 ABORT OCCUR DURING SLAVE BACKUP
+--echo #              WHEN RELAY LOG INDEX IS LOCK
+--echo # This test verifies that serveral retries are performed
+--echo # if there is a failure while deleting/renaming index files.
+
+--disable_warnings
+SET SESSION debug="+d,simulate_index_file_delete_failure";
+SET SESSION debug="+d,simulate_crash_safe_index_file_rename_failure";
+FLUSH LOGS;
+
+# Check that delete retry is present in the error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_index
+--let $assert_count = 5
+--let $assert_select = Retrying delete
+--let $assert_text = Retried for delete.
+--source include/assert_grep.inc
+
+# Check that rename retry is present in the error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: binlog.binlog_index
+--let $assert_count = 5
+--let $assert_select = Retrying rename
+--let $assert_text = Retried for rename.
+--source include/assert_grep.inc
+--enable_warnings
 eval SET SESSION debug="$old";
+--echo # Test case12: Ends
+
 eval SET GLOBAL binlog_error_action= $saved_binlog_error_action;
 
 # Reset Master deletes all binary log files listed in the index file, resets
diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_intvar.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_intvar.test
new file mode 100644
index 000000000000..85435184fc04
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_intvar.test
@@ -0,0 +1,54 @@
+# === Purpose ===
+#
+# Verify 'mysqlbinlog --read-from-remote-server --hexdump' works for
+# USER_VAR, RAND_LOG and INTVAR log events.
+#
+# === References ===
+#
+# Bug #24674276 MYSQLBINLOG -R --HEXDUMP CRASHES FOR INTVAR, USER_VAR, OR
+#               RAND EVENTS
+
+# USER_VAR, RAND_LOG_EVENT and INTVAR_LOG_EVENT work with binlog_format
+# statement.
+--source include/have_binlog_format_statement.inc
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. *");
+
+# Initial setup
+# Purge the existing binlog.
+RESET MASTER;
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+
+CREATE TABLE t1 (i INT);
+CREATE TABLE t2 (j INT PRIMARY KEY AUTO_INCREMENT);
+
+# USER_VAR EVENT
+SET @foo = 1;
+INSERT INTO t1 VALUES (@foo);
+
+# RAND_LOG_EVENT
+INSERT INTO t1 VALUES (rand() * 10);
+
+# INTVAR_LOG_EVENT
+INSERT INTO t2 VALUES();
+--exec $MYSQL_BINLOG --hexdump --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT $binlog_file > $MYSQLTEST_VARDIR/tmp/binlog_data.sql
+
+DROP TABLE t1;
+DROP TABLE t2;
+RESET MASTER;
+
+# Load the file and verify the inserted data.
+--exec $MYSQL --user=root --host=127.0.0.1 --port=$MASTER_MYPORT < $MYSQLTEST_VARDIR/tmp/binlog_data.sql
+
+--let $assert_text= The t1 table should have two entries.
+--let $assert_cond= [SELECT count(*) FROM t1] = 2
+--source include/assert.inc
+
+--let $assert_text= The t2 table should have one entry.
+--let $assert_cond= [SELECT count(*) FROM t2] = 1
+--source include/assert.inc
+
+# Cleanup
+DROP TABLE t1;
+DROP TABLE t2;
+--remove_file $MYSQLTEST_VARDIR/tmp/binlog_data.sql
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/t/binlog_noop_dml_with_readonly.test b/mysql-test/suite/binlog/t/binlog_noop_dml_with_readonly.test
new file mode 100644
index 000000000000..781b802899f8
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_noop_dml_with_readonly.test
@@ -0,0 +1,101 @@
+# ==== Purpose ====
+#
+# Verify that in statement based replication, no operation update query
+# should not be logged into binlog if the read_only mode is ON.
+#
+# ==== Implementation ====
+#
+# 1. Create a table 't' and insert a row in it.
+# 2. Begin a transaction and execute noop UPDATE query on table 't'.
+# 3. Start another connection and set super_read_only mode to ON.
+# 4. Commit the transaction started in step #2.
+# 5. Clean up.
+#
+# ==== References ====
+#
+# Bug #29009092  NOOP UPDATE QUERY IS LOGGED TO BINLOG AFTER READ_ONLY FLAG IS SET
+
+--source include/have_binlog_format_statement.inc
+SET @saved_value_super= @@GLOBAL.SUPER_READ_ONLY;
+SET @saved_value= @@GLOBAL.read_only;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1);
+
+# Test-1: Execute only noop UPDATE in the transaction
+connect (con1,localhost,root,,test);
+BEGIN;
+UPDATE t1 SET a = 1 where a =1;
+
+connection default;
+SET GLOBAL SUPER_READ_ONLY=1;
+
+connection con1;
+--error ER_OPTION_PREVENTS_STATEMENT
+COMMIT;
+
+connection default;
+SET GLOBAL SUPER_READ_ONLY=0;
+
+# Test-2: Execute a noop UPDATE and a temporary table INSERT in the transaction
+connection con1;
+CREATE TEMPORARY TABLE t2 (a INT) ENGINE=INNODB;
+
+BEGIN;
+UPDATE t1 SET a = 1 where a = 1;
+INSERT INTO t2 values(10);
+
+connection default;
+SET GLOBAL SUPER_READ_ONLY=1;
+
+connection con1;
+--error ER_OPTION_PREVENTS_STATEMENT
+COMMIT;
+DROP TABLE t2;
+
+connection default;
+SET GLOBAL SUPER_READ_ONLY=0;
+SET GLOBAL READ_ONLY=0;
+
+# READ_ONLY does nothing to SUPER users so we setup a non-SUPER user.
+CREATE USER test@localhost;
+GRANT CREATE TEMPORARY TABLES, UPDATE, DROP ON *.* TO test@localhost;
+connect (con2,localhost,test,,test);
+
+# Test-3: A non-SUPER user execute only noop UPDATE in the transaction.
+connection con2;
+BEGIN;
+UPDATE t1 SET a = 1 where a =1;
+
+connection default;
+SET GLOBAL READ_ONLY=1;
+
+connection con2;
+--error ER_OPTION_PREVENTS_STATEMENT
+COMMIT;
+
+connection default;
+SET GLOBAL READ_ONLY=0;
+
+# Test-4: A non-SUPER user execute a noop UPDATE and a temporary table
+# INSERT in the transaction
+connection con2;
+CREATE TEMPORARY TABLE t2 (a INT) ENGINE=INNODB;
+
+BEGIN;
+UPDATE t1 SET a = 1 where a = 1;
+INSERT INTO t2 values(10);
+
+connection default;
+SET GLOBAL READ_ONLY=1;
+
+connection con2;
+--error ER_OPTION_PREVENTS_STATEMENT
+COMMIT;
+DROP TABLE t2;
+
+# Clean up
+connection default;
+DROP USER test@localhost;
+SET GLOBAL SUPER_READ_ONLY= @saved_value_super;
+SET GLOBAL read_only= @saved_value;
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_purge_binary_logs_to.test b/mysql-test/suite/binlog/t/binlog_purge_binary_logs_to.test
new file mode 100644
index 000000000000..f4b23b39c2d3
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_purge_binary_logs_to.test
@@ -0,0 +1,98 @@
+# === Purpose ===
+#
+# This test verifies that `PURGE BINARY LOGS TO` purges the binlog files
+# that have been moved to another location and their absolute path is
+# listed in the binlog index file.
+#
+# === Implementation ===
+#
+# 1. Generate binary logs.
+# 2. Move the binary logs to the tmp dir.
+# 3. Generate a new index file having the absolute path of the binlogs.
+# 4. Verify that `PURGE BINARY LOGS TO` purges the binlogs which are
+#    not in the data directory.
+#
+# === References ===
+# Bug #28284624	`PURGE BINARY LOGS TO` FAILS WHEN BINARY LOG SPECIFIED
+#               IS NOT IN BINLOG BASE DIR
+
+--source include/have_log_bin.inc
+# This test case is binlog_format agnostic
+--source include/have_binlog_format_row.inc
+
+RESET MASTER;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+--let $INDEX=$MYSQLD_DATADIR/master-bin.index
+
+--let $binlog_file1= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000002
+FLUSH BINARY LOGS;
+--let $binlog_file2= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000003
+FLUSH BINARY LOGS;
+--let $binlog_file3= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000004
+FLUSH BINARY LOGS;
+--let $binlog_file4= query_get_value(SHOW MASTER STATUS, File, 1)
+
+--echo # Generate master-bin.000005
+FLUSH BINARY LOGS;
+--let $binlog_file5= query_get_value(SHOW MASTER STATUS, File, 1)
+
+# Move the binary logs to var/tmp/ directory
+
+--move_file $MYSQLD_DATADIR/$binlog_file1 $MYSQLTEST_VARDIR/tmp/$binlog_file1
+--move_file $MYSQLD_DATADIR/$binlog_file2 $MYSQLTEST_VARDIR/tmp/$binlog_file2
+--move_file $MYSQLD_DATADIR/$binlog_file3 $MYSQLTEST_VARDIR/tmp/$binlog_file3
+--move_file $MYSQLD_DATADIR/$binlog_file4 $MYSQLTEST_VARDIR/tmp/$binlog_file4
+
+# Generate a new index file having the absolute path of the binlogs
+--exec echo $MYSQLTEST_VARDIR/tmp/$binlog_file1 > $MYSQLD_DATADIR/master-bin.index.tmp
+--exec echo $MYSQLTEST_VARDIR/tmp/$binlog_file2 >> $MYSQLD_DATADIR/master-bin.index.tmp
+--exec echo $MYSQLTEST_VARDIR/tmp/$binlog_file3 >> $MYSQLD_DATADIR/master-bin.index.tmp
+--exec echo $MYSQLTEST_VARDIR/tmp/$binlog_file4 >> $MYSQLD_DATADIR/master-bin.index.tmp
+--exec echo ./$binlog_file5 >> $MYSQLD_DATADIR/master-bin.index.tmp
+
+# Since the binlog index file has been opened by server, deleting/renaming
+# the index file will fail in Windows. So, shutdown the server, move the file
+# and restart the server.
+
+# Stop the server
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--remove_file $INDEX
+--move_file $MYSQLD_DATADIR/master-bin.index.tmp $INDEX
+
+# Restart the server
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+# Flush the binary log so that the index file is reopened.
+FLUSH BINARY LOGS;
+
+# Purge the first two binary logs
+--eval PURGE BINARY LOGS TO '$binlog_file3'
+
+# Verify that the purged binlogs do not exist.
+--let $file_does_not_exist= $MYSQLTEST_VARDIR/tmp/$binlog_file1
+--source include/file_does_not_exist.inc
+
+--let $file_does_not_exist= $MYSQLTEST_VARDIR/tmp/$binlog_file2
+--source include/file_does_not_exist.inc
+
+# Purge the next two binary logs
+--eval PURGE BINARY LOGS TO '$binlog_file5'
+
+# Verify that the purged binlogs do not exist.
+--let $file_does_not_exist= $MYSQLTEST_VARDIR/tmp/$binlog_file3
+--source include/file_does_not_exist.inc
+
+--let $file_does_not_exist= $MYSQLTEST_VARDIR/tmp/$binlog_file4
+--source include/file_does_not_exist.inc
diff --git a/mysql-test/suite/binlog/t/binlog_reset_connection_not_reset_writeset.test b/mysql-test/suite/binlog/t/binlog_reset_connection_not_reset_writeset.test
new file mode 100644
index 000000000000..052c32af82f1
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_reset_connection_not_reset_writeset.test
@@ -0,0 +1,63 @@
+###############################################################################
+# Bug#25950554:THE FUNCTION RESET_CONNECTION DOES NOT RESET WRITE SET IN      #
+#              WRITESET_SESSION.                                              #
+#                                                                             #
+# Problem: When we do reset_connection which has the same effect as           #
+#          auto-reconnect, the write set session history is not cleared,      #
+#          which in case of auto-reconnect does get cleared.                  #
+#                                                                             #
+# Fix:     Reset the write set session history when mysql_reset_connection    #
+#          is called.                                                         #
+#                                                                             #
+# Steps to reproduce:                                                         #
+#                                                                             #
+# 1) Set the variable transaction_write_set_extraction to 'XXHASH64' which is #
+#    necessary to be able to change the value of the variable                 #
+#    binlog_transaction_dependency_tracking to WRITESET or WRITESET_SESSION   #
+#                                                                             #
+# 2) Set the variable binlog_transaction_dependency_tracking to WRITESET for  #
+#    few coming transactions.                                                 #
+#                                                                             #
+# 3) Create a sample table and do few inserts.                                #
+#                                                                             #
+# 4) Change the value of binlog_transaction_dependency_tracking to            #
+#    WRITESET_SESSION, to check if the write set session history is cleared   #
+#    or not after calling reset_connection.                                   #
+#                                                                             #
+# 5) Call reset_connection.                                                   #
+#                                                                             #
+# 6) Check if the logical timestamp has the correct entry after the reset     #
+#    connection. This will mean that the write set history is cleared after a #
+#    to reset_connection.                                                     #
+###############################################################################
+
+--source include/have_binlog_format_row.inc
+
+--let $saved_binlog_transaction_dependency_tracking= `SELECT @@GLOBAL.binlog_transaction_dependency_tracking`
+--let $saved_transaction_write_set_extraction= `SELECT @@GLOBAL.transaction_write_set_extraction`
+
+SET GLOBAL transaction_write_set_extraction= 'XXHASH64';
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+
+CREATE TABLE t1(id INT, PRIMARY KEY (id));
+FLUSH LOGS;
+INSERT INTO t1(id) VALUES(1);
+INSERT INTO t1(id) VALUES(2);
+
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+INSERT INTO t1(id) VALUES(3);
+INSERT INTO t1(id) VALUES(4);
+
+reset_connection;
+
+--source include/save_binlog_position.inc
+
+INSERT INTO t1(id) VALUES(5);
+
+--let $logical_timestamps= 4 5
+--source include/assert_logical_timestamps.inc
+
+# Clean up
+--eval SET GLOBAL binlog_transaction_dependency_tracking= $saved_binlog_transaction_dependency_tracking
+--eval SET GLOBAL transaction_write_set_extraction= $saved_transaction_write_set_extraction
+DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/t/binlog_rotate_deadlock-master.opt b/mysql-test/suite/binlog/t/binlog_rotate_deadlock-master.opt
new file mode 100644
index 000000000000..dac1776737a1
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_rotate_deadlock-master.opt
@@ -0,0 +1,7 @@
+--binlog-format=MIXED
+--max_binlog_size=4096
+--innodb_thread_concurrency=1
+--innodb_thread_sleep_delay=0
+--enforce_gtid_consistency=ON
+--gtid_mode=ON
+--master-info-repository=TABLE
diff --git a/mysql-test/suite/binlog/t/binlog_rotate_deadlock.test b/mysql-test/suite/binlog/t/binlog_rotate_deadlock.test
new file mode 100644
index 000000000000..1a1325e9754a
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_rotate_deadlock.test
@@ -0,0 +1,51 @@
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+
+--echo #
+--echo # Bug #30215068	BINLOG ROTATION DEADLOCK WHEN INNODB CONCURRENCY LIMIT SETTED
+--echo #
+
+--enable_connect_log
+--connect (con1, localhost, root,,)
+select  @@innodb_thread_concurrency;
+
+CREATE TABLE t1 (c1 INT) Engine=InnoDB;
+CREATE TABLE t2 (c1 INT, c2 int, c3 varchar(200)) Engine=InnoDB;
+SET @debug_save= @@SESSION.DEBUG;
+SET SESSION DEBUG = '+d,force_rotate';
+SET DEBUG_SYNC = 'stop_binlog_rotation_after_acquiring_lock_log SIGNAL rotate_stopped WAIT_FOR proceed_rotate';
+--send INSERT INTO t1 VALUES (1);
+
+# Since innodb_thread_concurrency=1, Send txn from  a different connection
+
+--connect (con2, localhost, root,,)
+SET DEBUG_SYNC= 'now WAIT_FOR rotate_stopped';
+--SEND UPDATE t2 SET C2=1 WHERE C1 = 1;
+
+--connect (con3, localhost, root,,)
+# Verify that con1 is waiting in stop_binlog_rotation_after_acquiring_lock_log sync point and con 2 is waiting for con1 to commit
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: stop_binlog_rotation_after_acquiring_lock_log' and info = 'INSERT INTO t1 VALUES (1)'
+--source include/wait_condition.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'query end' and info = 'UPDATE t2 SET C2=1 WHERE C1 = 1'
+--source include/wait_condition.inc
+
+# Continue rotate thread (con1)
+SET DEBUG_SYNC= 'now SIGNAL proceed_rotate';
+
+--connection con1
+#without fix con1 will hang because it cannot get innodb concurrency ticket
+--reap
+SET @@SESSION.DEBUG= @debug_save;
+
+--connection con2
+--reap
+
+# Cleanup
+connection default;
+
+--disconnect con1
+--disconnect con2
+--disconnect con3
+--disable_connect_log
+DROP TABLE t1,t2;
diff --git a/mysql-test/suite/binlog/t/binlog_set_trans_dependency_deadlock.test b/mysql-test/suite/binlog/t/binlog_set_trans_dependency_deadlock.test
new file mode 100644
index 000000000000..845df98d8ede
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_set_trans_dependency_deadlock.test
@@ -0,0 +1,91 @@
+# ==== Purpose ====
+#
+# Test verifies that there is no deadlock when following commands are executed
+# in parallel.
+#
+# SHOW BINARY LOGS
+#
+# SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME LIKE
+# 'binlog_transaction_dependency_tracking'
+#
+# PURGE BINARY LOGS BEFORE $date;
+#
+# ==== Implementation ====
+#
+# With the help of DEBUG_SYNC operations simulate the deadlock environment.
+#
+# 1) PURGE LOGS BEFORE date
+#    Owns: MYSQL_BIN_LOG::LOCK_index
+#    Waits for: THD::LOCK_thd_data
+#
+# 2) select query on performance_schema.session_variables table
+#    Owns: THD::LOCK_thd_data
+#    Waits for: MYSQL_BIN_LOG::LOCK_log
+#
+# 3) SHOW BINARY LOGS
+#    Owns: MYSQL_BIN_LOG::LOCK_log
+#    Waits for: MYSQL_BIN_LOG::LOCK_index
+#
+# ==== References ====
+#
+# Bug#28511326: DEADLOCK DURING PURGE_LOGS_BEFORE_DATE
+
+--source include/have_debug_sync.inc
+--source include/have_log_bin.inc
+--source include/have_perfschema.inc
+
+--echo #
+--echo # Bug 92108: Deadlock by concurrent SHOW BINLOGS,
+--echo # performance_schema.session_variables query, and binlog purge
+--echo #
+
+RESET MASTER;
+FLUSH LOGS;
+--enable_connect_log
+--connect(con1,localhost,root,,)
+
+SET DEBUG_SYNC="purge_logs_after_lock_index_before_thread_count SIGNAL purge_ready WAIT_FOR finish_purge";
+
+--send PURGE BINARY LOGS BEFORE '2038-01-19'
+
+--connect(con2,localhost,root,,)
+
+SET DEBUG_SYNC="materialize_session_variable_array_THD_locked SIGNAL pfs_ready WAIT_FOR finish_pfs";
+
+--send SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME LIKE 'binlog_transaction_dependency_tracking';
+
+--connect(con3,localhost,root,,)
+
+SET DEBUG_SYNC="show_binlogs_after_lock_log_before_lock_index SIGNAL show_ready WAIT_FOR finish_show";
+
+--send SHOW BINARY LOGS
+
+--connection default
+
+SET DEBUG_SYNC="now WAIT_FOR purge_ready";
+SET DEBUG_SYNC="now WAIT_FOR pfs_ready";
+SET DEBUG_SYNC="now WAIT_FOR show_ready";
+
+SET DEBUG_SYNC="now SIGNAL finish_purge";
+SET DEBUG_SYNC="now SIGNAL finish_pfs";
+SET DEBUG_SYNC="now SIGNAL finish_show";
+
+--connection con1
+replace_regex /\.[\\\/]master/master/;
+reap;
+--disconnect con1
+
+--connection con2
+reap;
+--disconnect con2
+
+--connection con3
+--disable_result_log
+reap;
+--enable_result_log
+--disconnect con3
+
+--connection default
+
+SET DEBUG_SYNC= 'RESET';
+--disable_connect_log
diff --git a/mysql-test/suite/binlog/t/binlog_shutdown_hang.test b/mysql-test/suite/binlog/t/binlog_shutdown_hang.test
new file mode 100644
index 000000000000..28264503cbfb
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_shutdown_hang.test
@@ -0,0 +1,51 @@
+# ==== Purpose ====
+#
+# Test verifies that server shutdown doesn't hang when
+#
+# * Gtid's are enabled.
+# * AUTOCOMMIT=0
+# * super_read_only=ON
+#
+# ==== Implementation ====
+#
+# Do some operations on master like CREATE/INSERT so that GTIDs are generated.
+# Shutdown and restart the server.
+# Shutdown should not hang.
+# Upon restart verify the content of 'gtid_executed' table.
+#
+# ==== References ====
+#
+# Bug#28183718: CANNOT SHUTDOWN MYSQLD WHEN LAST BINLOG HAS
+# GTIDS TO SAVE AND AUTOCOMMIT=0
+#
+
+--source include/have_gtid.inc
+
+# For reseting mysql.gtid_executed table
+RESET MASTER;
+
+CREATE TABLE t (f INT PRIMARY KEY) ENGINE=INNODB;
+
+INSERT INTO t VALUES (10);
+
+SET GLOBAL autocommit= 0;
+SET GLOBAL super_read_only= ON;
+
+--source include/restart_mysqld.inc
+
+--let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+
+--echo #
+--echo # Verify that we can get correct gtid sets after server restarts
+--echo #
+--let $assert_text= committed gtid set is MASTER_UUID:1-2
+--let $assert_cond= @@GLOBAL.GTID_EXECUTED = "$master_uuid:1-2"
+--source include/assert.inc
+
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+DROP TABLE t;
+
+# Cleanup
+RESET MASTER;
diff --git a/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start-master.opt b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start-master.opt
new file mode 100644
index 000000000000..0edcc176f161
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start-master.opt
@@ -0,0 +1 @@
+--no-console --log-error=$MYSQLTEST_VARDIR/tmp/binlog_transaction_dependency_tracking.err
diff --git a/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start.test b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start.test
new file mode 100644
index 000000000000..45e6fa505e3c
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start.test
@@ -0,0 +1,164 @@
+################################################################################
+# The testcase aims to test possible correct and incorrect settings of the
+# following variables together during the start of the server:
+#  transaction_write_set_extraction (TWSE)
+#  binlog_transaction_dependency_tracking (BTDT)
+#
+# Test:
+# 0. This test requires one server.
+# 1. Try starting server with:
+#  a. TWSE=OFF      and BTDT=COMMIT_ORDER.     Expect SUCCESS.
+#  b. TWSE=OFF      and BTDT=WRITESET.         Expect FAILURE.
+#  c. TWSE=OFF      and BTDT=WRITESET_SESSION. Expect FAILURE.
+#  d. TWSE=MURMUR32 and BTDT=COMMIT_ORDER.     Expect SUCCESS.
+#  e. TWSE=MURMUR32 and BTDT=WRITESET.         Expect SUCCESS.
+#  f. TWSE=MURMUR32 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+#  g. TWSE=XXHASH64 and BTDT=COMMIT_ORDER.     Expect SUCCESS.
+#  h. TWSE=XXHASH64 and BTDT=WRITESET.         Expect SUCCESS
+#  i. TWSE=XXHASH64 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+#
+# ==== References ====
+# WL#9556: Writeset-based MTS dependency tracking on master
+################################################################################
+--source include/not_embedded.inc
+--source include/big_test.inc
+--source include/have_binlog_format_row.inc
+
+--let $saved_binlog_transaction_dependency_tracking= `SELECT @@GLOBAL.binlog_transaction_dependency_tracking`
+--let $saved_transaction_write_set_extraction= `SELECT @@GLOBAL.transaction_write_set_extraction`
+
+--echo #
+--echo # Test 1.a: Try starting server with TWSE=OFF and BTDT=COMMIT_ORDER. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=OFF --binlog_transaction_dependency_tracking=COMMIT_ORDER"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be OFF
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "OFF"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be COMMIT_ORDER
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.b: Try starting server with TWSE=OFF and BTDT=WRITESET. Expect FAILURE.
+--echo #
+# Let server restart attempts write to the file $error_log.
+--let $error_log= $MYSQLTEST_VARDIR/tmp/binlog_transaction_dependency_tracking.err
+--source include/shutdown_mysqld.inc
+
+let $mysqld=$MYSQLD_CMD --core-file --console > $error_log 2>&1 --transaction_write_set_extraction=OFF --binlog_transaction_dependency_tracking=WRITESET;
+
+--error 1
+--exec $mysqld
+--let $grep_file=$error_log
+--let $grep_pattern=The transaction_write_set_extraction must be set to XXHASH64 or MURMUR32 when binlog_transaction_dependency_tracking is WRITESET or WRITESET_SESSION.
+--let $grep_output= print_count
+--source include/grep_pattern.inc
+
+# The server restart aborts
+--let $grep_pattern= \[ERROR\] Aborting
+--let $grep_output= print_count
+--source include/grep_pattern.inc
+
+--echo #
+--echo # Test 1.c: Try starting server with TWSE=OFF and BTDT=WRITESET_SESSION. Expect FAILURE.
+--echo #
+let $mysqld=$MYSQLD_CMD --core-file --console > $error_log 2>&1 --transaction_write_set_extraction=OFF --binlog_transaction_dependency_tracking=WRITESET_SESSION;
+
+--error 1
+--exec $mysqld
+--let $grep_file=$error_log
+--let $grep_pattern=The transaction_write_set_extraction must be set to XXHASH64 or MURMUR32 when binlog_transaction_dependency_tracking is WRITESET or WRITESET_SESSION.
+--let $grep_output= print_count
+--source include/grep_pattern.inc
+
+# The server restart aborts
+--let $grep_pattern= \[ERROR\] Aborting
+--let $grep_output= print_count
+--source include/grep_pattern.inc
+
+--echo #
+--echo # Test 1.d: Try starting server with TWSE=MURMUR32 and BTDT=COMMIT_ORDER. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=COMMIT_ORDER"
+--source include/start_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be MURMUR32
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "MURMUR32"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be COMMIT_ORDER
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.e: Try starting server with TWSE=MURMUR32 and BTDT=WRITESET. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=WRITESET"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be MURMUR32
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "MURMUR32"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be WRITESET
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.f: Try starting server with TWSE=MURMUR32 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=MURMUR32 --binlog_transaction_dependency_tracking=WRITESET_SESSION"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be MURMUR32
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "MURMUR32"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be WRITESET_SESSION
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET_SESSION"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.g: Try starting server with TWSE=XXHASH64 and BTDT=COMMIT_ORDER. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=COMMIT_ORDER"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be XXHASH64
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "XXHASH64"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be COMMIT_ORDER
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.h: Try starting server with TWSE=XXHASH64 and BTDT=WRITESET. Expect SUCCESS
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=WRITESET"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be XXHASH64
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "XXHASH64"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be WRITESET
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET"
+--source include/assert.inc
+
+--echo #
+--echo # Test 1.i: Try starting server with TWSE=XXHASH64 and BTDT=WRITESET_SESSION. Expect SUCCESS.
+--echo #
+--let $restart_parameters="restart: --transaction_write_set_extraction=XXHASH64 --binlog_transaction_dependency_tracking=WRITESET_SESSION"
+--source include/restart_mysqld.inc
+--source include/wait_until_connected_again.inc
+--let $assert_text= transaction_write_set_extraction should be XXHASH64
+--let $assert_cond= "[SELECT @@GLOBAL.transaction_write_set_extraction]" = "XXHASH64"
+--source include/assert.inc
+--let $assert_text= binlog_transaction_dependency_tracking should be WRITESET_SESSION
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET_SESSION"
+--source include/assert.inc
+
+# Clean up
+--let $restart_parameters=
+--let $error_log=
+--remove_file $MYSQLTEST_VARDIR/tmp/binlog_transaction_dependency_tracking.err
+--eval SET GLOBAL binlog_transaction_dependency_tracking= $saved_binlog_transaction_dependency_tracking
+--eval SET GLOBAL transaction_write_set_extraction= $saved_transaction_write_set_extraction
diff --git a/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_sensitive.test b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_sensitive.test
new file mode 100644
index 000000000000..980227ae3a0c
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_transaction_dependency_tracking_sensitive.test
@@ -0,0 +1,77 @@
+# ==== Purpose ====
+#
+# Test timestamps generated by binlog-transaction-dependency-tracking
+# mode WRITESET when inserting/deleting/updating a single row but using
+# case and accent insensitive collations.
+#
+# As all transactions are touching a single row, the timestamps are
+# expected to always increase (every transaction should depend on the
+# previous one).
+#
+# ==== References ====
+#
+# BUG#26277771: BAD WRITE SET TRACKING WITH UNIQUE KEY ON A DELETE FOLLOWED BY AN INSERT.
+#
+--source include/have_binlog_format_row.inc
+
+#
+# Initialization
+#
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+
+SET @@GLOBAL.transaction_write_set_extraction = XXHASH64;
+SET @@SESSION.transaction_write_set_extraction = XXHASH64;
+SET @@GLOBAL.binlog_transaction_dependency_tracking = WRITESET;
+
+#
+# Test
+#
+
+# Workload
+SET NAMES 'utf8' COLLATE 'utf8_general_ci';
+
+RESET MASTER;
+
+CREATE TABLE t1 (
+  id INT NOT NULL AUTO_INCREMENT,
+  u_id INT NOT NULL,
+  u_str VARCHAR(32) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY (u_id, u_str)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'a');
+
+# Sanity check
+--error ER_DUP_ENTRY
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'A');
+--error ER_DUP_ENTRY
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'ã');
+--error ER_DUP_ENTRY
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'Ã');
+--error ER_DUP_ENTRY
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'á');
+
+# Test
+DELETE FROM t1 WHERE u_id = 1 AND u_str = 'A';
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'ã');
+DELETE FROM t1 WHERE u_id = 1 AND u_str = 'Ã';
+INSERT INTO t1 (u_id, u_str) VALUES (1, 'á');
+
+DROP TABLE t1;
+
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--echo Processing binlog $binlog_file
+FLUSH LOGS;
+
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7
+--source include/assert_logical_timestamps.inc
+
+#
+# Cleanup
+#
+SET @@GLOBAL.binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
index 78bcdd892709..564cbeed6971 100644
--- a/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
+++ b/mysql-test/suite/binlog/t/binlog_unsafe-master.opt
@@ -1 +1 @@
-$UDF_EXAMPLE_LIB_OPT --log-output=file,table
+$UDF_EXAMPLE_LIB_OPT --log-output=file,table --thread-stack=512K
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine-master.opt b/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine-master.opt
new file mode 100644
index 000000000000..488e1dfd5e05
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine-master.opt
@@ -0,0 +1 @@
+$UDF_EXAMPLE_LIB_OPT --thread-stack=512K
diff --git a/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine.test b/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine.test
new file mode 100644
index 000000000000..49cca6bcfce4
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_unsafe_stmt_capable_engine.test
@@ -0,0 +1,351 @@
+# ==== Background ====
+#
+# Some statements may execute differently on master and slave when
+# logged in statement format.  Such statements are called unsafe.
+# Unsafe statements include:
+#
+#  - statements using @@variables (with a small number of exceptions;
+#    see below);
+#  - statements using certain functions, e.g., UUID();
+#  - statements using LIMIT;
+#  - insert into two autoinc columns;
+#  - statements using UDF's.
+#  - statements reading from log tables in the mysql database.
+#  - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE
+#  - REPLACE ... SELECT
+#  - CREATE TABLE [IGNORE/REPLACE] SELECT
+#  - INSERT IGNORE...SELECT
+#  - UPDATE IGNORE
+#  - INSERT... ON DUPLICATE KEY UPDATE on a table with two UNIQUE KEYS
+#
+# Note that statements that use stored functions, stored procedures,
+# triggers, views, or prepared statements that invoke unsafe
+# statements shall also be unsafe.
+#
+# Unsafeness of a statement shall have the following consequences:
+#
+# 1. If the binlogging is on, for any unsafe statement,
+#    - If binlog_format=STATEMENT, the statement shall give a warning.
+#    - If binlog_format=MIXED or binlog_format=ROW, the statement shall
+#      be logged in row format if the engine is capable of logging in row format.
+#
+# 2. If the binlogging is on, for any unsafe statement,
+#    - If binlog_format=STATEMENT, the statement shall give a warning.
+#    - If binlog_format=MIXED or binlog_format=ROW, the statement shall
+#      error out if the engine is only statement capable.
+#
+# 3. If binlogging is off or the statement is not logged (e.g. SELECT
+#    UUID()), no warning shall be issued and the statement shall not
+#    be logged.
+#
+# Moreover, when a sub-statement of a recursive construct (i.e.,
+# stored function, stored procedure, trigger, view, or prepared
+# statement) is unsafe and binlog_format=STATEMENT, then a warning
+# shall be issued for every recursive construct.  In effect, this
+# creates a stack trace from the top-level statement to the unsafe
+# statement.
+#
+# ==== Purpose ====
+#
+# Most of this test is copied from the test binlog_unsafe,
+# but here we test the logging of unsafe statements when
+# storage engine is only capable of logging in statement format.
+#
+# This test verifies that warning/error is generated when it should,
+# according to the above rules when storage engine is only statement capable.
+#
+# All @@variables should be unsafe, with some exceptions.  Therefore,
+# this test also verifies that the exceptions do *not* generate a
+# warning.
+#
+# ==== Method ====
+#
+# 1. Each type of statements listed above is executed.
+#
+# 2. Each unsafe statement is wrapped in each type of recursive
+#    construct (stored function, stored procedure, trigger, view, or
+#    prepared statement).
+#
+# 3. Each unsafe statement is wrapped in two levels of recursive
+#    constructs (function invoking trigger invoking UUID(), etc).
+#
+# We try to insert the variables that should not be unsafe into a
+# table, and verify that *no* warning is issued.
+#
+# Execute a unsafe statement calling a trigger or stored function
+# or neither when SQL_LOG_BIN is turned ON, a warning/error should be issued
+# Execute a unsafe statement calling a trigger or stored function
+# or neither when @@SQL_LOG_BIN is turned OFF,
+# no warning/error is issued
+#
+# ==== References ====
+#
+# https://dev.mysql.com/doc/refman/5.6/en/binary-log-mixed.html
+#
+# ==== Related bugs ====
+#
+# Bug#28429993: IF THE STORAGE ENGINE SUPPORTS RBR, UNSAFE SQL STATEMENTES END UP IN BINLOG
+
+--source include/have_udf.inc
+--source include/have_debug.inc
+--source include/have_log_bin.inc
+--source include/have_binlog_format_statement.inc
+--source include/not_gtid_enabled.inc
+
+--disable_query_log
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
+
+--echo #### Setup tables ####
+
+CREATE TABLE t0 (a CHAR(100));
+CREATE TABLE t1 (a CHAR(100));
+CREATE TABLE t2 (a CHAR(100));
+CREATE TABLE ta0 (a CHAR(100));
+CREATE TABLE ta1 (a CHAR(100));
+CREATE TABLE ta2 (a CHAR(100));
+CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+CREATE TABLE data_table (a CHAR(100));
+INSERT INTO data_table VALUES ('foo');
+CREATE TABLE trigger_table_1 (a INT);
+CREATE TABLE trigger_table_2 (a INT);
+CREATE TABLE trigger_table_3 (a INT);
+CREATE TABLE double_autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+
+# Make the storage engine log only in statement format.
+SET @old_debug= @@global.debug;
+SET GLOBAL debug='+d,make_stmt_only_engines';
+
+--DELIMITER |
+CREATE TRIGGER double_autoinc_trig
+BEFORE INSERT ON double_autoinc_table FOR EACH ROW
+BEGIN
+  INSERT INTO autoinc_table VALUES (NULL);
+END|
+
+CREATE FUNCTION multi_unsafe_func() RETURNS INT
+BEGIN
+  INSERT INTO t0 VALUES(CONCAT(@@hostname, @@hostname));
+  INSERT INTO t0 VALUES(0);
+  INSERT INTO t0 VALUES(CONCAT(UUID(), @@hostname));
+  RETURN 1;
+END|
+--DELIMITER ;
+
+--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
+--eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB"
+
+# In each iteration of this loop, we select one method to make the
+# statement unsafe.
+--let $unsafe_type= 0
+while ($unsafe_type < 7) {
+
+  --echo
+
+  if ($unsafe_type == 0) {
+    --echo ==== Testing UUID() unsafeness ====
+    --let $desc_0= unsafe UUID() function
+    --let $stmt_sidef_0= INSERT INTO t0 VALUES (UUID())
+    --let $value_0= UUID()
+    --let $sel_sidef_0=
+    --let $sel_retval_0= SELECT UUID()
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 1) {
+    --echo ==== Testing @@hostname unsafeness ====
+    --let $desc_0= unsafe @@hostname variable
+    --let $stmt_sidef_0= INSERT INTO t0 VALUES (@@hostname)
+    --let $value_0= @@hostname
+    --let $sel_sidef_0=
+    # $sel_retval is going to be used in views.  Views cannot execute
+    # statements that refer to @@variables.  Hence, we set $set_retval
+    # to empty instead of SELECT @@hostname.
+    --let $sel_retval_0=
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 2) {
+    --echo ==== Testing SELECT...LIMIT unsafeness ====
+    --let $desc_0= unsafe SELECT...LIMIT statement
+    --let $stmt_sidef_0= INSERT INTO t0 SELECT * FROM data_table LIMIT 1
+    --let $value_0=
+    --let $sel_sidef_0=
+    --let $sel_retval_0= SELECT * FROM data_table LIMIT 1
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 3) {
+    --echo ==== Testing unsafeness of insert of two autoinc values ====
+    --let $desc_0= unsafe update of two autoinc columns
+    --let $stmt_sidef_0= INSERT INTO double_autoinc_table VALUES (NULL)
+    --let $value_0=
+    --let $sel_sidef_0=
+    --let $sel_retval_0=
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 4) {
+    --echo ==== Testing unsafeness of UDF's ====
+    --let $desc_0= unsafe UDF
+    --let $stmt_sidef_0= INSERT INTO t0 VALUES (myfunc_int(10))
+    --let $value_0= myfunc_int(10)
+    --let $sel_sidef_0= SELECT myfunc_int(10)
+    --let $sel_retval_0=
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 5) {
+    --echo ==== Testing unsafeness of access to mysql.general_log ====
+    --let $desc_0= unsafe use of mysql.general_log
+    --let $stmt_sidef_0= INSERT INTO t0 SELECT COUNT(*) FROM mysql.general_log
+    --let $value_0=
+    --let $sel_sidef_0=
+    --let $sel_retval_0= SELECT COUNT(*) FROM mysql.general_log
+    --let $CRC_ARG_expected_number_of_warnings= 1
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  if ($unsafe_type == 6) {
+    --echo ==== Testing a statement that is unsafe several times ====
+    --let $desc_0= statement that is unsafe several times
+    --let $stmt_sidef_0= INSERT INTO ta0 VALUES (multi_unsafe_func())
+    --let $value_0=
+    --let $sel_sidef_0= SELECT multi_unsafe_func()
+    --let $sel_retval_0=
+    --let $CRC_ARG_expected_number_of_warnings= 2
+    --let $CRC_ARG_expected_number_of_deprecation_warnings= 0
+  }
+
+  # In each iteration of the following loop, we select one way to
+  # enclose the unsafe statement as a sub-statement of a recursive
+  # construct (i.e., a function, procedure, trigger, view, or prepared
+  # statement).
+  #
+  # In the last iteration, $call_type_1=7, we don't create a recursive
+  # construct. Instead, we just invoke the unsafe statement directly.
+
+  --let $call_type_1= 0
+  while ($call_type_1 < 8) {
+    #--echo debug: level 1, types $call_type_1 -> $unsafe_type
+    --let $CRC_ARG_level= 1
+    --let $CRC_ARG_type= $call_type_1
+    --let $CRC_ARG_stmt_sidef= $stmt_sidef_0
+    --let $CRC_ARG_value= $value_0
+    --let $CRC_ARG_sel_sidef= $sel_sidef_0
+    --let $CRC_ARG_sel_retval= $sel_retval_0
+    --let $CRC_ARG_desc= $desc_0
+    --source extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc
+    --let $stmt_sidef_1= $CRC_RET_stmt_sidef
+    --let $value_1= $CRC_RET_value
+    --let $sel_sidef_1= $CRC_RET_sel_sidef
+    --let $sel_retval_1= $CRC_RET_sel_retval
+    --let $is_toplevel_1= $CRC_RET_is_toplevel
+    --let $drop_1= $CRC_RET_drop
+    --let $desc_1= $CRC_RET_desc
+
+    # Some statements must be top-level statements, i.e., cannot be
+    # called as a sub-statement of any recursive construct.  (One
+    # example is 'EXECUTE prepared_stmt').  When
+    # create_recursive_construct_stmt_capable_engine.inc creates a top-level statement, it
+    # sets $CRC_RET_is_toplevel=1.
+
+    if (!$is_toplevel_1) {
+
+      # In each iteration of this loop, we select one way to enclose
+      # the previous recursive construct in another recursive
+      # construct.
+
+      --let $call_type_2= 0
+      while ($call_type_2 < 7) {
+        #--echo debug: level 2, types $call_type_2 -> $call_type_1 -> $unsafe_type
+        --let $CRC_ARG_level= 2
+        --let $CRC_ARG_type= $call_type_2
+        --let $CRC_ARG_stmt_sidef= $stmt_sidef_1
+        --let $CRC_ARG_value= $value_1
+        --let $CRC_ARG_sel_sidef= $sel_sidef_1
+        --let $CRC_ARG_sel_retval= $sel_retval_1
+        --let $CRC_ARG_desc= $desc_1
+        --source extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc
+        --let $stmt_sidef_2= $CRC_RET_stmt_sidef
+        --let $value_2= $CRC_RET_value
+        --let $sel_sidef_2= $CRC_RET_sel_sidef
+        --let $sel_retval_2= $CRC_RET_sel_retval
+        --let $is_toplevel_2= $CRC_RET_is_toplevel
+        --let $drop_2= $CRC_RET_drop
+        --let $desc_2= $CRC_RET_desc
+
+        # Drop created object.
+        if ($drop_2) {
+          --eval $drop_2
+        }
+        --inc $call_type_2
+      } # while (call_type_2)
+    } # if (!is_toplevel_1)
+
+    # Drop created object.
+    if ($drop_1) {
+      --eval $drop_1
+    }
+    --inc $call_type_1
+  } # while (call_type_1)
+
+  --inc $unsafe_type
+} # while (unsafe_type)
+
+DROP TRIGGER double_autoinc_trig;
+DROP TABLE t0, t1, t2, ta0, ta1, ta2,
+  autoinc_table, double_autoinc_table,
+  data_table,
+  trigger_table_1, trigger_table_2, trigger_table_3;
+DROP FUNCTION myfunc_int;
+DROP FUNCTION multi_unsafe_func;
+
+
+--echo ==== Special system variables that should *not* be unsafe ====
+
+CREATE TABLE t1 (a VARCHAR(1000));
+CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
+
+INSERT INTO t1 VALUES (@@session.auto_increment_increment);
+INSERT INTO t1 VALUES (@@session.auto_increment_offset);
+INSERT INTO t1 VALUES (@@session.character_set_client);
+INSERT INTO t1 VALUES (@@session.character_set_connection);
+INSERT INTO t1 VALUES (@@session.character_set_database);
+INSERT INTO t1 VALUES (@@session.character_set_server);
+INSERT INTO t1 VALUES (@@session.collation_connection);
+INSERT INTO t1 VALUES (@@session.collation_database);
+INSERT INTO t1 VALUES (@@session.collation_server);
+INSERT INTO t1 VALUES (@@session.foreign_key_checks);
+INSERT INTO t1 VALUES (@@session.identity);
+INSERT INTO t1 VALUES (@@session.last_insert_id);
+INSERT INTO t1 VALUES (@@session.lc_time_names);
+INSERT INTO t1 VALUES (@@session.pseudo_thread_id);
+INSERT INTO t1 VALUES (@@session.sql_auto_is_null);
+INSERT INTO t1 VALUES (@@session.timestamp);
+INSERT INTO t1 VALUES (@@session.time_zone);
+INSERT INTO t1 VALUES (@@session.unique_checks);
+
+SET @my_var= 4711;
+INSERT INTO t1 VALUES (@my_var);
+
+# using insert_id implicitly should be ok.
+SET insert_id= 12;
+INSERT INTO autoinc_table VALUES (NULL);
+
+# See set_var.cc for explanation.
+--echo The following variables *should* give a warning, despite they are replicated.
+INSERT INTO t1 VALUES (@@session.sql_mode);
+INSERT INTO t1 VALUES (@@session.insert_id);
+
+
+DROP TABLE t1, autoinc_table;
+
+# Clean up
+SET GLOBAL debug= @old_debug;
+--echo "End of tests"
diff --git a/mysql-test/suite/binlog/t/binlog_user_if_exists.test b/mysql-test/suite/binlog/t/binlog_user_if_exists.test
index 6fbb44b1b64c..5398ed99a88b 100644
--- a/mysql-test/suite/binlog/t/binlog_user_if_exists.test
+++ b/mysql-test/suite/binlog/t/binlog_user_if_exists.test
@@ -132,6 +132,112 @@ DROP USER u1@localhost;
 --echo [On Slave]
 --source include/show_binlog_events.inc
 
+################################################################################
+# Bug#26680035  CREATE/ALTER USER ERRORS OUT BUT GETS RECORDED IN THE BINARY LOG
+#
+# Problem: create/alter user when used with invalid plugin errors out,
+#          but still gets recorded in binary log.
+#
+# Steps to reproduce:
+#   1) Scenario 1:
+#       1.1) Create user with invalid plugin.
+#       1.2) Create user having 'if not exists' clause with invalid plugin.
+#   2) Scenario 2:
+#       2.1) Alter user with invalid plugin.
+#       2.2) Alter user having 'if exists' clause with invalid plugin.
+#   3) Create/Alter user having multiple users with invalid plugin.
+#   4) Cleanup
+################################################################################
+--echo #
+--echo # Bug26680035:  CREATE/ALTER USER ERRORS OUT BUT GETS RECORDED IN
+--echo #               THE BINARY LOG
+--echo #
+call mtr.add_suppression("Following users were specified in CREATE USER IF NOT EXISTS but they already exist. *");
+
+# Scenario 1: Create user with invalid plugin
+--echo # ------
+--echo "Scenario 1: CREATE USER WITH INVALID PLUGIN"
+--echo # ------
+
+--let $master_pos_before_create_user= query_get_value(SHOW MASTER STATUS,Position,1)
+--let $binlog_start= $master_pos_before_create_user
+--echo #
+--echo # Step 1.1) Create user with invalid plugin.
+--echo #
+--error ER_PLUGIN_IS_NOT_LOADED
+CREATE USER u1@localhost IDENTIFIED WITH 'plugin1';
+
+--echo #
+--echo # Step 1.2) Create user having 'if not exists' clause with invalid
+--echo #           plugin.
+--echo #
+--error ER_PLUGIN_IS_NOT_LOADED
+CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED WITH 'plugin2';
+
+# Assert that the above statements are not written to binlog.
+--let $master_pos_after_create_user= query_get_value(SHOW MASTER STATUS,Position,1)
+--let $assert_text= assert that the above events are not written to binlog
+--let $assert_cond= $master_pos_before_create_user = $master_pos_after_create_user
+--source include/assert.inc
+
+
+# Scenario 2: Alter user with invalid plugin
+--echo # ------
+--echo "Scenario 2: ALTER USER WITH INVALID PLUGIN"
+--echo # ------
+
+CREATE USER u2@localhost;
+--let $master_pos_before_alter_user= query_get_value(SHOW MASTER STATUS,Position,1)
+--echo #
+--echo # Step 2.1) Alter user with invalid plugin.
+--echo #
+--error ER_PLUGIN_IS_NOT_LOADED
+ALTER USER u2@localhost IDENTIFIED WITH 'plugin3';
+
+--echo #
+--echo # Step 2.2) Alter user having 'if exists' clause with invalid plugin.
+--echo #
+--error ER_PLUGIN_IS_NOT_LOADED
+ALTER USER IF EXISTS u2@localhost IDENTIFIED WITH 'plugin4';
+
+# Assert that the above statements are not written to binlog.
+--let $master_pos_after_alter_user= query_get_value(SHOW MASTER STATUS,Position,1)
+--let $assert_text= assert that the above events are not written to binlog
+--let $assert_cond= $master_pos_before_alter_user = $master_pos_after_alter_user
+--source include/assert.inc
+
+
+# Scenario 3: Create/Alter user with invalid plugin with multiple users
+--echo # ------
+--echo "Scenario 3: CREATE/ALTER USER INVALID PLUGIN WITH MULTIPLE USERS"
+--echo # ------
+
+--echo #
+--echo # Step 3) Create/Alter user having multiple users with invalid plugin.
+--echo #
+
+# CREATE throws ERROR since shsh auth_plugin does not exist
+# but will be written to binlog as,u2 already exists and u3 will be created.
+--error ER_PLUGIN_IS_NOT_LOADED
+CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED WITH 'shsh',
+                          u2@localhost IDENTIFIED BY 'pass',
+                          u3@localhost IDENTIFIED WITH 'sha256_password';
+
+# ALTER throws ERROR since shsh auth_plugin does not exist
+# but will be written to binlog as, u2 is altered.
+--error ER_PLUGIN_IS_NOT_LOADED
+ALTER USER IF EXISTS u1@localhost IDENTIFIED WITH 'shsh',
+                     u2@localhost IDENTIFIED BY 'xyz',
+                     u3@localhost IDENTIFIED WITH 'sha256_password';
+
+# Check whether the above statements are written to binlog or not.
+--source include/show_binlog_events.inc
+
+--echo #
+--echo # Step 4) Cleanup
+--echo #
+DROP USER u2@localhost,u3@localhost;
+
 # Search for the warnings in the server log
 let server_log= $MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_FILE= $server_log;
diff --git a/mysql-test/suite/binlog/t/binlog_writeset_history_protection.test b/mysql-test/suite/binlog/t/binlog_writeset_history_protection.test
new file mode 100644
index 000000000000..5d75318b9f2c
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_writeset_history_protection.test
@@ -0,0 +1,81 @@
+#=== Purpose ===
+#
+# This test verifies that the transaction dependency writeset
+# history map has protection from concurrent access.
+#
+# === Implementation ===
+#
+# 1. Do a DML on server such that it writes the GTID in the binlog and then halt
+#    the thread in get_dependency function using debug sync utility.
+# 2. Execute 'set global binlog_transaction_dependency_tracking=WRITESET or
+#    WRITESET_SESSION'.
+# 3. Verify that the thread in step 2 waits until LOCK_slave_trans_dep_tracker
+#    lock is released by the thread in step 1.
+#
+# === References ===
+#
+# Bug#29719364 THE BUGFIX FOR BUG#28511326 SEEMS INCORRECT
+#
+# This test case is binlog_format agnostic
+--source include/have_binlog_format_row.inc
+# This test case uses debug_sync
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+CREATE TABLE t1 (i INT PRIMARY KEY);
+
+# Save the current tracking mode and extraction algorithm.
+--let $old_trx_tracker = `SELECT @@GLOBAL.BINLOG_TRANSACTION_DEPENDENCY_TRACKING`
+--let $old_trx_write_set_extraction = `SELECT @@GLOBAL.TRANSACTION_WRITE_SET_EXTRACTION`
+
+# Set the global transaction extraction algorithm and tracking mode.
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = WRITESET;
+
+--connect(con1,localhost,root,,)
+--connect(con2,localhost,root,,)
+
+# Do a DML such that it writes GTID and calls
+# get_dependency to update writeset history map.
+--connection con1
+BEGIN;
+INSERT INTO t1 VALUES(1);
+SET DEBUG_SYNC="wait_in_get_dependency SIGNAL dep_tracker WAIT_FOR go_ahead_dml";
+--send commit
+
+# Set transaction dependency tracking mode to writeset
+# so that it clears the writeset history.
+--connection con2
+--let $thread_id = `SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID =CONNECTION_ID()`
+SET DEBUG_SYNC= "now WAIT_FOR dep_tracker";
+--send SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING=WRITESET_SESSION
+
+--connection default
+# wait until it tries to take LOCK_slave_trans_dep_tracker.
+--let $wait_condition= SELECT EVENT_NAME= 'wait/synch/mutex/sql/LOCK_slave_trans_dep_tracker' FROM performance_schema.events_waits_current WHERE THREAD_ID=$thread_id
+--source include/wait_condition.inc
+
+# since one thread has taken the LOCK_slave_trans_dep_tracker,
+# the other thread has to wait in order to aquire this lock.
+--connection default
+--let $assert_text= con2 is waiting for LOCK_slave_trans_dep_tracker.
+--let $assert_cond= "[SELECT EVENT_NAME FROM performance_schema.events_waits_current WHERE THREAD_ID=$thread_id]" = "wait/synch/mutex/sql/LOCK_slave_trans_dep_tracker"
+--source include/assert.inc
+
+#Signal the thread waiting in get_dependency.
+SET DEBUG_SYNC="now SIGNAL go_ahead_dml";
+
+--connection con1
+--reap
+--connection con2
+--reap
+
+#Cleanup
+--disconnect con1
+--disconnect con2
+--connection default
+--replace_result $old_trx_tracker TRACKING_MODE
+--eval SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING= $old_trx_tracker
+--replace_result $old_trx_write_set_extraction EXTRACTION_ALG
+--eval SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION= $old_trx_write_set_extraction
+SET DEBUG_SYNC="RESET";
+DROP TABLE t1;
diff --git a/mysql-test/suite/engines/iuds/r/delete_time.result b/mysql-test/suite/engines/iuds/r/delete_time.result
index 9ece7d7e1499..948d34017c8f 100644
--- a/mysql-test/suite/engines/iuds/r/delete_time.result
+++ b/mysql-test/suite/engines/iuds/r/delete_time.result
@@ -497,10 +497,10 @@ c2
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
+11:11:11
 11:11:27
 125:00:00
 125:05:00
@@ -644,7 +644,7 @@ c1	c2
 -838:59:59	-838:59:59
 00:04:00	00:04:00
 00:54:54	00:54:54
-11:11:11	11:11:11
+02:02:02	02:02:02
 12:34:56	NULL
 SELECT * FROM t2;
 c1	c2
diff --git a/mysql-test/suite/engines/iuds/r/update_time.result b/mysql-test/suite/engines/iuds/r/update_time.result
index a1276f1c30d5..734e3e84e79a 100644
--- a/mysql-test/suite/engines/iuds/r/update_time.result
+++ b/mysql-test/suite/engines/iuds/r/update_time.result
@@ -796,10 +796,10 @@ c2
 00:09:09
 00:11:11
 00:11:11
+00:11:11
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
@@ -1337,7 +1337,7 @@ c1	c2
 00:51:51	02:22:22
 00:54:54	00:54:54
 01:01:01	02:22:22
-02:02:02	02:22:22
+02:02:02	02:02:02
 03:03:00	02:22:22
 08:08:08	00:00:00
 100:04:04	100:04:04
@@ -1379,7 +1379,7 @@ c1	c2
 00:51:51	00:51:51
 00:54:54	00:11:11
 01:01:01	01:01:01
-02:02:02	02:02:02
+02:02:02	00:11:11
 03:03:00	03:03:00
 08:08:08	08:08:08
 11:11:11	00:11:11
diff --git a/mysql-test/suite/federated/federated.result b/mysql-test/suite/federated/federated.result
index 1e0b8c57a3be..bf11e0c6a2e9 100644
--- a/mysql-test/suite/federated/federated.result
+++ b/mysql-test/suite/federated/federated.result
@@ -2245,6 +2245,52 @@ DROP TABLE federated.t2;
 connection master;
 DROP TABLE federated.t1_child;
 DROP TABLE federated.t1;
+###
+### Bug#27509959: EXCEPTION NOT CAUGHT W/IN SPROC ADDING A ROW
+###               THAT FAILS FK CHECK IN FED TABLE
+###
+CREATE TABLE federated.parent(a INT, PRIMARY KEY(a)) ENGINE=InnoDB;
+CREATE TABLE federated.child(a INT, b INT, PRIMARY KEY(b),FOREIGN KEY(a) REFERENCES federated.parent(a))ENGINE=InnoDB;
+INSERT federated.parent VALUES (1);
+INSERT federated.child VALUES (1,1);
+CREATE TABLE federated.child(a INT, b INT, PRIMARY KEY(b),
+FOREIGN KEY(a) REFERENCES federated.parent(a))
+ENGINE=FEDERATED
+CONNECTION='mysql://root@127.0.0.1:MASTER_PORT/federated/child';
+SELECT * FROM federated.child;
+a	b
+1	1
+DROP PROCEDURE IF EXISTS add_child;
+Warnings:
+Note	1305	PROCEDURE test.add_child does not exist
+CREATE PROCEDURE add_child(IN new_a INT, IN new_b INT)
+DETERMINISTIC MODIFIES SQL DATA
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+BEGIN
+GET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;
+GET DIAGNOSTICS CONDITION 1 @p3=CLASS_ORIGIN, @p4=SUBCLASS_ORIGIN, @p5=RETURNED_SQLSTATE, @p6=MESSAGE_TEXT, @p7=MYSQL_ERRNO;
+SELECT
+@p1 as 'NUMBER'
+    , @p2 as 'ROW_COUNT'
+    , @p3 as 'CLASS_ORIGIN'
+    , @p4 as 'SUBCLASS_ORIGIN'
+    , @p5 as 'RETURNED_SQLSTATE'
+    , @p6 as 'MESSAGE_TEXT'
+    , @p7 as 'MYSQL_ERRNO';
+END;
+INSERT federated.child(a, b) VALUES(new_a, new_b);
+END|
+CALL add_child(2,2);
+NUMBER	ROW_COUNT	CLASS_ORIGIN	SUBCLASS_ORIGIN	RETURNED_SQLSTATE	MESSAGE_TEXT	MYSQL_ERRNO
+1	-1	ISO 9075	ISO 9075	23000	Cannot add or update a child row: a foreign key constraint fails ()	1452
+CALL add_child(1,1);
+NUMBER	ROW_COUNT	CLASS_ORIGIN	SUBCLASS_ORIGIN	RETURNED_SQLSTATE	MESSAGE_TEXT	MYSQL_ERRNO
+1	-1	ISO 9075	ISO 9075	23000	Can't write; duplicate key in table 'child'	1022
+DROP TABLE federated.child;
+DROP PROCEDURE add_child;
+DROP TABLE federated.child;
+DROP TABLE federated.parent;
 SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
 SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
 DROP TABLE IF EXISTS federated.t1;
diff --git a/mysql-test/suite/federated/federated.test b/mysql-test/suite/federated/federated.test
index 2e92f70ed54a..95e43718bb27 100644
--- a/mysql-test/suite/federated/federated.test
+++ b/mysql-test/suite/federated/federated.test
@@ -2040,6 +2040,62 @@ DROP TABLE federated.t1_child;
 DROP TABLE federated.t1;
 --disable_connect_log
 
+--echo ###
+--echo ### Bug#27509959: EXCEPTION NOT CAUGHT W/IN SPROC ADDING A ROW
+--echo ###               THAT FAILS FK CHECK IN FED TABLE
+--echo ###
+
+connection master;
+
+CREATE TABLE federated.parent(a INT, PRIMARY KEY(a)) ENGINE=InnoDB;
+CREATE TABLE federated.child(a INT, b INT, PRIMARY KEY(b),FOREIGN KEY(a) REFERENCES federated.parent(a))ENGINE=InnoDB;
+INSERT federated.parent VALUES (1);
+INSERT federated.child VALUES (1,1);
+
+connection slave;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval CREATE TABLE federated.child(a INT, b INT, PRIMARY KEY(b),
+     FOREIGN KEY(a) REFERENCES federated.parent(a))
+     ENGINE=FEDERATED
+     CONNECTION='mysql://root@127.0.0.1:$MASTER_MYPORT/federated/child';
+
+SELECT * FROM federated.child;
+
+DROP PROCEDURE IF EXISTS add_child;
+DELIMITER |;
+CREATE PROCEDURE add_child(IN new_a INT, IN new_b INT)
+DETERMINISTIC MODIFIES SQL DATA
+BEGIN
+  DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+  BEGIN
+    GET DIAGNOSTICS @p1 = NUMBER, @p2 = ROW_COUNT;
+    GET DIAGNOSTICS CONDITION 1 @p3=CLASS_ORIGIN, @p4=SUBCLASS_ORIGIN, @p5=RETURNED_SQLSTATE, @p6=MESSAGE_TEXT, @p7=MYSQL_ERRNO;
+  SELECT
+      @p1 as 'NUMBER'
+    , @p2 as 'ROW_COUNT'
+    , @p3 as 'CLASS_ORIGIN'
+    , @p4 as 'SUBCLASS_ORIGIN'
+    , @p5 as 'RETURNED_SQLSTATE'
+    , @p6 as 'MESSAGE_TEXT'
+    , @p7 as 'MYSQL_ERRNO';
+  END;
+  INSERT federated.child(a, b) VALUES(new_a, new_b);
+END|
+DELIMITER ;|
+
+CALL add_child(2,2);
+CALL add_child(1,1);
+
+#Cleanup
+DROP TABLE federated.child;
+DROP PROCEDURE add_child;
+
+connection master;
+DROP TABLE federated.child;
+DROP TABLE federated.parent;
+
+
 connection default;
 SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
 connection slave;
diff --git a/mysql-test/suite/federated/r/percona_bug1739734.result b/mysql-test/suite/federated/r/percona_bug1739734.result
new file mode 100644
index 000000000000..5f4bdd9a1318
--- /dev/null
+++ b/mysql-test/suite/federated/r/percona_bug1739734.result
@@ -0,0 +1,44 @@
+#
+# Bug lp1739734  "Federated table returns error 1430 from storage engine"
+#
+# This is a bug introduced in the artful/gcc7 compilation fixes, caused by
+# a moved break statement.
+CREATE DATABASE federated;
+CREATE DATABASE federated;
+CREATE DATABASE lp1739734;
+use lp1739734;
+CREATE SERVER local_server
+FOREIGN DATA WRAPPER mysql
+OPTIONS (
+HOST '127.0.0.1',
+PORT MASTER_PORT,
+USER 'root',
+PASSWORD '',
+DATABASE 'lp1739734'
+);
+CREATE TABLE remote_table (
+a INT,
+b INT,
+KEY ab (a,b),
+KEY ba (b,a)
+);
+CREATE TABLE local_table (
+a INT,
+b INT,
+KEY ab (a,b),
+KEY ba (b,a)
+) ENGINE=federated CONNECTION='local_server/remote_table';
+SELECT * FROM local_table;
+a	b
+SELECT * FROM local_table USE INDEX (ab)
+WHERE a<1 AND b=0;
+a	b
+SELECT * FROM local_table USE INDEX (ba)
+WHERE a<1 AND b=0;
+a	b
+DROP DATABASE lp1739734;
+DROP SERVER local_server;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE federated;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE federated;
diff --git a/mysql-test/suite/federated/t/percona_bug1739734.test b/mysql-test/suite/federated/t/percona_bug1739734.test
new file mode 100644
index 000000000000..cbb4c90dd756
--- /dev/null
+++ b/mysql-test/suite/federated/t/percona_bug1739734.test
@@ -0,0 +1,50 @@
+--echo #
+--echo # Bug lp1739734  "Federated table returns error 1430 from storage engine"
+--echo #
+--echo # This is a bug introduced in the artful/gcc7 compilation fixes, caused by
+--echo # a moved break statement.
+
+--source suite/federated/include/federated.inc
+
+connection master;
+CREATE DATABASE lp1739734;
+use lp1739734;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval CREATE SERVER local_server
+FOREIGN DATA WRAPPER mysql
+OPTIONS (
+  HOST '127.0.0.1',
+  PORT $MASTER_MYPORT,
+  USER 'root',
+  PASSWORD '',
+  DATABASE 'lp1739734'
+);
+
+CREATE TABLE remote_table (
+  a INT,
+  b INT,
+  KEY ab (a,b),
+  KEY ba (b,a)
+);
+
+
+CREATE TABLE local_table (
+  a INT,
+  b INT,
+  KEY ab (a,b),
+  KEY ba (b,a)
+) ENGINE=federated CONNECTION='local_server/remote_table';
+
+SELECT * FROM local_table;
+
+SELECT * FROM local_table USE INDEX (ab)
+WHERE a<1 AND b=0;
+
+SELECT * FROM local_table USE INDEX (ba)
+WHERE a<1 AND b=0;
+
+DROP DATABASE lp1739734;
+DROP SERVER local_server;
+
+--source suite/federated/include/federated_cleanup.inc
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 25fc38e14e72..cbd8e7949a59 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -331,6 +331,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 asc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -345,6 +347,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 desc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -357,6 +361,8 @@ f59
 8
 9
 10
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 CREATE or REPLACE VIEW v1 AS (select f59 from tb2)
 union (select f59 from t1);
 select * FROM v1 order by f59 limit 0,10;
diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
index cc5cadfeba46..95edbdb9f1d9 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result
@@ -96,13 +96,13 @@ def	mysql	innodb_index_stats	sample_size	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	N
 def	mysql	innodb_index_stats	stat_description	8	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_bin	varchar(1024)			select,insert,update,references		
 def	mysql	innodb_index_stats	stat_name	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI		select,insert,update,references		
 def	mysql	innodb_index_stats	stat_value	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	mysql	innodb_index_stats	table_name	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI		select,insert,update,references		
+def	mysql	innodb_index_stats	table_name	2	NULL	NO	varchar	199	597	NULL	NULL	NULL	utf8	utf8_bin	varchar(199)	PRI		select,insert,update,references		
 def	mysql	innodb_table_stats	clustered_index_size	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
 def	mysql	innodb_table_stats	database_name	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI		select,insert,update,references		
 def	mysql	innodb_table_stats	last_update	3	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references		
 def	mysql	innodb_table_stats	n_rows	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
 def	mysql	innodb_table_stats	sum_of_other_index_sizes	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	mysql	innodb_table_stats	table_name	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI		select,insert,update,references		
+def	mysql	innodb_table_stats	table_name	2	NULL	NO	varchar	199	597	NULL	NULL	NULL	utf8	utf8_bin	varchar(199)	PRI		select,insert,update,references		
 def	mysql	ndb_binlog_index	deletes	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
 def	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references		
 def	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		
@@ -448,7 +448,7 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 1.0000	mysql	help_topic	example	text	65535	65535	utf8	utf8_general_ci	text
 1.0000	mysql	help_topic	url	text	65535	65535	utf8	utf8_general_ci	text
 3.0000	mysql	innodb_index_stats	database_name	varchar	64	192	utf8	utf8_bin	varchar(64)
-3.0000	mysql	innodb_index_stats	table_name	varchar	64	192	utf8	utf8_bin	varchar(64)
+3.0000	mysql	innodb_index_stats	table_name	varchar	199	597	utf8	utf8_bin	varchar(199)
 3.0000	mysql	innodb_index_stats	index_name	varchar	64	192	utf8	utf8_bin	varchar(64)
 NULL	mysql	innodb_index_stats	last_update	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	innodb_index_stats	stat_name	varchar	64	192	utf8	utf8_bin	varchar(64)
@@ -456,7 +456,7 @@ NULL	mysql	innodb_index_stats	stat_value	bigint	NULL	NULL	NULL	NULL	bigint(20) u
 NULL	mysql	innodb_index_stats	sample_size	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	mysql	innodb_index_stats	stat_description	varchar	1024	3072	utf8	utf8_bin	varchar(1024)
 3.0000	mysql	innodb_table_stats	database_name	varchar	64	192	utf8	utf8_bin	varchar(64)
-3.0000	mysql	innodb_table_stats	table_name	varchar	64	192	utf8	utf8_bin	varchar(64)
+3.0000	mysql	innodb_table_stats	table_name	varchar	199	597	utf8	utf8_bin	varchar(199)
 NULL	mysql	innodb_table_stats	last_update	timestamp	NULL	NULL	NULL	NULL	timestamp
 NULL	mysql	innodb_table_stats	n_rows	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	innodb_table_stats	clustered_index_size	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
index 71c146a1f80a..d57865a0b59f 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
@@ -96,13 +96,13 @@ def	mysql	innodb_index_stats	sample_size	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	N
 def	mysql	innodb_index_stats	stat_description	8	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_bin	varchar(1024)					
 def	mysql	innodb_index_stats	stat_name	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI				
 def	mysql	innodb_index_stats	stat_value	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned					
-def	mysql	innodb_index_stats	table_name	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI				
+def	mysql	innodb_index_stats	table_name	2	NULL	NO	varchar	199	597	NULL	NULL	NULL	utf8	utf8_bin	varchar(199)	PRI				
 def	mysql	innodb_table_stats	clustered_index_size	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned					
 def	mysql	innodb_table_stats	database_name	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI				
 def	mysql	innodb_table_stats	last_update	3	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP			
 def	mysql	innodb_table_stats	n_rows	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned					
 def	mysql	innodb_table_stats	sum_of_other_index_sizes	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned					
-def	mysql	innodb_table_stats	table_name	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_bin	varchar(64)	PRI				
+def	mysql	innodb_table_stats	table_name	2	NULL	NO	varchar	199	597	NULL	NULL	NULL	utf8	utf8_bin	varchar(199)	PRI				
 def	mysql	ndb_binlog_index	deletes	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned					
 def	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI				
 def	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)					
@@ -448,7 +448,7 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 1.0000	mysql	help_topic	example	text	65535	65535	utf8	utf8_general_ci	text
 1.0000	mysql	help_topic	url	text	65535	65535	utf8	utf8_general_ci	text
 3.0000	mysql	innodb_index_stats	database_name	varchar	64	192	utf8	utf8_bin	varchar(64)
-3.0000	mysql	innodb_index_stats	table_name	varchar	64	192	utf8	utf8_bin	varchar(64)
+3.0000	mysql	innodb_index_stats	table_name	varchar	199	597	utf8	utf8_bin	varchar(199)
 3.0000	mysql	innodb_index_stats	index_name	varchar	64	192	utf8	utf8_bin	varchar(64)
 NULL	mysql	innodb_index_stats	last_update	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	innodb_index_stats	stat_name	varchar	64	192	utf8	utf8_bin	varchar(64)
@@ -456,7 +456,7 @@ NULL	mysql	innodb_index_stats	stat_value	bigint	NULL	NULL	NULL	NULL	bigint(20) u
 NULL	mysql	innodb_index_stats	sample_size	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 3.0000	mysql	innodb_index_stats	stat_description	varchar	1024	3072	utf8	utf8_bin	varchar(1024)
 3.0000	mysql	innodb_table_stats	database_name	varchar	64	192	utf8	utf8_bin	varchar(64)
-3.0000	mysql	innodb_table_stats	table_name	varchar	64	192	utf8	utf8_bin	varchar(64)
+3.0000	mysql	innodb_table_stats	table_name	varchar	199	597	utf8	utf8_bin	varchar(199)
 NULL	mysql	innodb_table_stats	last_update	timestamp	NULL	NULL	NULL	NULL	timestamp
 NULL	mysql	innodb_table_stats	n_rows	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	innodb_table_stats	clustered_index_size	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index b9016a5186ce..545327ea9037 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -334,6 +334,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 asc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -348,6 +350,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 desc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -360,6 +364,8 @@ f59
 8
 9
 10
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 CREATE or REPLACE VIEW v1 AS (select f59 from tb2)
 union (select f59 from t1);
 select * FROM v1 order by f59 limit 0,10;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result
index 9c040ea1b678..3bdad358adfe 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views-big.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result
@@ -356,6 +356,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 asc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -370,6 +372,8 @@ f59
 10
 CREATE or REPLACE VIEW v1 AS select f59
 from tb2 group by f59 desc;
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 select * FROM v1 order by f59 limit 0,10;
 f59
 1
@@ -382,6 +386,8 @@ f59
 8
 9
 10
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 CREATE or REPLACE VIEW v1 AS (select f59 from tb2)
 union (select f59 from t1);
 select * FROM v1 order by f59 limit 0,10;
diff --git a/mysql-test/suite/gcol/inc/gcol_supported_sql_funcs_main.inc b/mysql-test/suite/gcol/inc/gcol_supported_sql_funcs_main.inc
index 12f9bc38bc8e..645755d671d6 100644
--- a/mysql-test/suite/gcol/inc/gcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/gcol/inc/gcol_supported_sql_funcs_main.inc
@@ -486,7 +486,7 @@ let $rows = 1;
 
 --echo # QUOTE()
 let $cols = a varchar(10), b varchar(10) generated always as (quote(a)) virtual;
-let $values1 = 'Don\'t',default;
+let $values1 = 'Don''t',default;
 let $rows = 1;
 --source suite/gcol/inc/gcol_supported_sql_funcs.inc
 
@@ -1136,6 +1136,21 @@ let $rows = 1;
 
 --echo # None.
 
+--echo #
+--echo # JSON functions
+--echo #
+
+--echo # JSON_PRETTY()
+let $cols = a varchar(1024), b varchar(1024) generated always as (JSON_PRETTY(a)) virtual;
+let $values1 = '{}', default;
+let $rows = 1;
+--source suite/gcol/inc/gcol_supported_sql_funcs.inc
+
+--echo # JSON_STORAGE_SIZE()
+let $cols = a varchar(1024), b varchar(1024) generated always as (JSON_STORAGE_SIZE(a)) virtual;
+let $values1 = '{}', default;
+let $rows = 1;
+--source suite/gcol/inc/gcol_supported_sql_funcs.inc
 
 --echo #
 --echo # OTHER FUNCTIONS
diff --git a/mysql-test/suite/gcol/r/gcol_bugfixes.result b/mysql-test/suite/gcol/r/gcol_bugfixes.result
index 9144c24d2a3d..4e6bbf007921 100644
--- a/mysql-test/suite/gcol/r/gcol_bugfixes.result
+++ b/mysql-test/suite/gcol/r/gcol_bugfixes.result
@@ -639,3 +639,24 @@ SELECT (SELECT MAX(c) FROM v);
 (SELECT MAX(c) FROM v)
 1
 DROP TABLE v;
+#
+# Bug #28652826	THE CONTINUATION OF BUG 27968952 .. CRASH & CORRUPTION
+# WITH GCOLS
+#
+CREATE TABLE t(
+a INT NOT NULL,
+b INT NOT NULL,
+c INT NOT NULL,
+g MEDIUMTEXT GENERATED ALWAYS AS((a <> b)) VIRTUAL,
+UNIQUE KEY i0000 (a),
+UNIQUE KEY i0001 (g(78))
+) ENGINE=INNODB;
+REPLACE INTO t(a, b, c) VALUES (1,8,9);
+REPLACE INTO t(a, b, c) VALUES (0,0,10);
+REPLACE INTO t(a, b, c) VALUES (4,4,11);
+REPLACE INTO t(a, b, c) VALUES (0,7,12);
+REPLACE INTO t(a, b, c) VALUES (0,0,13);
+SELECT * FROM t;
+a	b	c	g
+0	0	13	0
+DROP TABLE t;
diff --git a/mysql-test/suite/gcol/r/gcol_keys_innodb.result b/mysql-test/suite/gcol/r/gcol_keys_innodb.result
index 38e0613f7384..f2a4cec19cbe 100644
--- a/mysql-test/suite/gcol/r/gcol_keys_innodb.result
+++ b/mysql-test/suite/gcol/r/gcol_keys_innodb.result
@@ -719,6 +719,8 @@ EXPLAIN SELECT * FROM t1 ORDER BY f1 + 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -898,6 +900,8 @@ EXPLAIN SELECT f1 + 1, MAX(GC) FROM t1 GROUP BY f1 + 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/gcol/r/gcol_keys_myisam.result b/mysql-test/suite/gcol/r/gcol_keys_myisam.result
index 604950ad1562..0eef8d36e08b 100644
--- a/mysql-test/suite/gcol/r/gcol_keys_myisam.result
+++ b/mysql-test/suite/gcol/r/gcol_keys_myisam.result
@@ -491,6 +491,8 @@ EXPLAIN SELECT * FROM t1 ORDER BY f1 + 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": false,
@@ -669,6 +671,8 @@ EXPLAIN SELECT f1 + 1, MAX(GC) FROM t1 GROUP BY f1 + 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": false,
diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result
index ac940e6dd9f1..7274009c9890 100644
--- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result
+++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result
@@ -1163,7 +1163,7 @@ t1	CREATE TABLE `t1` (
   `a` varchar(10) DEFAULT NULL,
   `b` varchar(10) GENERATED ALWAYS AS (quote(`a`)) VIRTUAL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-insert into t1 values ('Don\'t',default);
+insert into t1 values ('Don''t',default);
 select * from t1;
 a	b
 Don't	'Don\'t'
@@ -2730,6 +2730,39 @@ drop table t1;
 set sql_warnings = 0;
 # None.
 #
+# JSON functions
+#
+# JSON_PRETTY()
+set sql_warnings = 1;
+create table t1 (a varchar(1024), b varchar(1024) generated always as (JSON_PRETTY(a)) virtual);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(1024) DEFAULT NULL,
+  `b` varchar(1024) GENERATED ALWAYS AS (json_pretty(`a`)) VIRTUAL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+insert into t1 values ('{}', default);
+select * from t1;
+a	b
+{}	{}
+drop table t1;
+set sql_warnings = 0;
+# JSON_STORAGE_SIZE()
+set sql_warnings = 1;
+create table t1 (a varchar(1024), b varchar(1024) generated always as (JSON_STORAGE_SIZE(a)) virtual);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(1024) DEFAULT NULL,
+  `b` varchar(1024) GENERATED ALWAYS AS (json_storage_size(`a`)) VIRTUAL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+insert into t1 values ('{}', default);
+select * from t1;
+a	b
+{}	5
+drop table t1;
+set sql_warnings = 0;
+#
 # OTHER FUNCTIONS
 #
 # AES_DECRYPT(), AES_ENCRYPT()
diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result
index 53436c2fa9d0..8be693e2e6ed 100644
--- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result
+++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result
@@ -1163,7 +1163,7 @@ t1	CREATE TABLE `t1` (
   `a` varchar(10) DEFAULT NULL,
   `b` varchar(10) GENERATED ALWAYS AS (quote(`a`)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('Don\'t',default);
+insert into t1 values ('Don''t',default);
 select * from t1;
 a	b
 Don't	'Don\'t'
@@ -2730,6 +2730,39 @@ drop table t1;
 set sql_warnings = 0;
 # None.
 #
+# JSON functions
+#
+# JSON_PRETTY()
+set sql_warnings = 1;
+create table t1 (a varchar(1024), b varchar(1024) generated always as (JSON_PRETTY(a)) virtual);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(1024) DEFAULT NULL,
+  `b` varchar(1024) GENERATED ALWAYS AS (json_pretty(`a`)) VIRTUAL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('{}', default);
+select * from t1;
+a	b
+{}	{}
+drop table t1;
+set sql_warnings = 0;
+# JSON_STORAGE_SIZE()
+set sql_warnings = 1;
+create table t1 (a varchar(1024), b varchar(1024) generated always as (JSON_STORAGE_SIZE(a)) virtual);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(1024) DEFAULT NULL,
+  `b` varchar(1024) GENERATED ALWAYS AS (json_storage_size(`a`)) VIRTUAL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('{}', default);
+select * from t1;
+a	b
+{}	5
+drop table t1;
+set sql_warnings = 0;
+#
 # OTHER FUNCTIONS
 #
 # AES_DECRYPT(), AES_ENCRYPT()
diff --git a/mysql-test/suite/gcol/t/gcol_bugfixes.test b/mysql-test/suite/gcol/t/gcol_bugfixes.test
index e68d2adc285d..cf3bc9660e84 100644
--- a/mysql-test/suite/gcol/t/gcol_bugfixes.test
+++ b/mysql-test/suite/gcol/t/gcol_bugfixes.test
@@ -611,3 +611,24 @@ KEY(c,b(1))) charset utf8mb4;
 INSERT INTO v (a,c) VALUES (1,1);
 SELECT (SELECT MAX(c) FROM v);
 DROP TABLE v;
+
+--echo #
+--echo # Bug #28652826	THE CONTINUATION OF BUG 27968952 .. CRASH & CORRUPTION
+--echo # WITH GCOLS
+--echo #
+
+CREATE TABLE t(
+  a INT NOT NULL,
+  b INT NOT NULL,
+  c INT NOT NULL,
+  g MEDIUMTEXT GENERATED ALWAYS AS((a <> b)) VIRTUAL,
+  UNIQUE KEY i0000 (a),
+  UNIQUE KEY i0001 (g(78))
+) ENGINE=INNODB;
+REPLACE INTO t(a, b, c) VALUES (1,8,9);
+REPLACE INTO t(a, b, c) VALUES (0,0,10);
+REPLACE INTO t(a, b, c) VALUES (4,4,11);
+REPLACE INTO t(a, b, c) VALUES (0,7,12);
+REPLACE INTO t(a, b, c) VALUES (0,0,13);
+SELECT * FROM t;
+DROP TABLE t;
diff --git a/mysql-test/suite/gis/r/geojson_functions.result b/mysql-test/suite/gis/r/geojson_functions.result
index 9e718cb007ef..67becde7ab25 100644
--- a/mysql-test/suite/gis/r/geojson_functions.result
+++ b/mysql-test/suite/gis/r/geojson_functions.result
@@ -2161,7 +2161,7 @@ SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "          { \"name\": { \"urn:ogc:def:crs:OGC:1.3:CRS84\" } }     "
 "        }                                                         "
 "  }", 1));
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 239.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 238.
 SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "  { \"type\": \"Point\", \"coordinates\": [10, 20],               "
 "      \"crs\":                                                    "
@@ -2169,7 +2169,7 @@ SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "          { \"name\": \"urn:ogc:def:crs:OGC:1.3:CRS84\" }         "
 "        }                                                         "
 "  }", 1));
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 149.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 148.
 SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "  { \"type\": \"Point\", \"coordinates\": [10, 20],               "
 "      \"crs\":                                                    "
@@ -2177,7 +2177,7 @@ SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "          { \"name\": \"urn:ogc:def:crs:OGC:1.3:CRS84\" }         "
 "        }                                                         "
 "  }", 1));
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 155.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 154.
 SELECT ST_SRID(ST_GEOMFROMGEOJSON(
 "  { \"type\": \"Point\", \"coordinates\": [10, 20],               "
 "      \"crs\":                                                    "
@@ -2360,7 +2360,7 @@ SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON(
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON(
 "{ \"type\": { \"Point\" }, \"coordinates\": [10, 15] }", 1, 0));
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 21.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 20.
 SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON(
 "{ \"type\": \"LineString\", \"coordinates\": [[100.0, 0.0, 1.0, 2.0], [101.0, 0.0]] }"));
 ERROR HY000: Unsupported number of coordinate dimensions in function st_geomfromgeojson: Found 4, expected 2
@@ -2417,7 +2417,7 @@ SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON(
 "      \"popupContent\": \"This is where the Rockies play!\"      "
 "    }                                                            "
 "  }"));
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 476.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 475.
 SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON(
 "  {                                                              "
 "  \"type\": \"Feature\", \"geometry\":                           "
@@ -2577,7 +2577,7 @@ SELECT ST_GEOMFROMGEOJSON(
 "  \"type\" : \"firstName\": \"John\"   "
 "}                                      "
 );
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 62.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or '}' after an object member." at position 61.
 PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON(?, 0, 0)";
 PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON('', ?, 0)";
 PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON('', 0, ?)";
@@ -2586,9 +2586,9 @@ PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON(?, 0, ?)";
 PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON('', ?, ?)";
 PREPARE stmt FROM "SELECT ST_GEOMFROMGEOJSON(?, ?, ?)";
 SELECT ST_GEOMFROMGEOJSON("{}foo");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The document root must not follow by other values." at position 2.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The document root must not be followed by other values." at position 2.
 SELECT ST_GEOMFROMGEOJSON("[12 foo 13]");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or ']' after an array element." at position 5.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a comma or ']' after an array element." at position 4.
 SELECT ST_GEOMFROMGEOJSON("{ \"type\": nul123 } ");
 ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid value." at position 13.
 SELECT ST_GEOMFROMGEOJSON("{ \"true\": true, \"false\": false } ");
@@ -2598,21 +2598,21 @@ ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "In
 SELECT ST_GEOMFROMGEOJSON("{ \"false\": fals123 } ");
 ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid value." at position 15.
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\u0Aa\" } ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Incorrect hex digit after \u escape in string." at position 15.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Incorrect hex digit after \u escape in string." at position 10.
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\\\0000b\" } ");
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson: Missing required member 'type'
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\uD811b\" } ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The surrogate pair in string is invalid." at position 15.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The surrogate pair in string is invalid." at position 10.
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\uD811\\uDB99\" } ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The surrogate pair in string is invalid." at position 20.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "The surrogate pair in string is invalid." at position 10.
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\uD811\\uDC01\" } ");
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson: Missing required member 'type'
 SELECT ST_GEOMFROMGEOJSON("{ \"hex\": \"\\e000G\" } ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid escape character in string." at position 11.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid escape character in string." at position 10.
 SELECT ST_GEOMFROMGEOJSON("{ \"test ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a closing quotation mark in string." at position 7.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a closing quotation mark in string." at position 8.
 SELECT ST_GEOMFROMGEOJSON("{ \"\nabel\": 123 ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid escape character in string." at position 2.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Invalid encoding in string." at position 3.
 SELECT ST_GEOMFROMGEOJSON("[ -2147483651, 4294967395 ] ");
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_GEOMFROMGEOJSON("[ -9223372036854775900, 184467440737095516700] ");
@@ -2623,11 +2623,11 @@ SELECT ST_GEOMFROMGEOJSON("["
   "000000000000000000000000000000000000000000000000000000000000000000000000000000"
   "000000000000000000000000000000000000000000000000000000000000000000000000000"
 "]");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 309.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 1.
 SELECT ST_GEOMFROMGEOJSON("[ 1. ] ");
 ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Miss fraction part in number." at position 4.
 SELECT ST_GEOMFROMGEOJSON("[ 1e1000 ] ");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 8.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 2.
 SELECT ST_GEOMFROMGEOJSON("[ 1e ] ");
 ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Miss exponent in number." at position 4.
 SELECT ST_GEOMFROMGEOJSON("[ -92233720368547759, 1844674407370955167] ");
@@ -2637,11 +2637,11 @@ ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_GEOMFROMGEOJSON("[ -0 ]");
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_GEOMFROMGEOJSON("{ \"\\u0000\" }");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 12.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 11.
 SELECT ST_GEOMFROMGEOJSON("{ \"\\u06FF\" }");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 12.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 11.
 SELECT ST_GEOMFROMGEOJSON("{ \"\\uFFFF\" }");
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 12.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Missing a colon after a name of object member." at position 11.
 SELECT ST_ASTEXT(ST_GEOMFROMGEOJSON("{ \"type\": \"Point\", \"coordinates\": [4294967295, 9223372036854775807] }"));
 ST_ASTEXT(ST_GEOMFROMGEOJSON("{ \"type\": \"Point\", \"coordinates\": [4294967295, 9223372036854775807] }"))
 POINT(4294967295 9.223372036854776e18)
@@ -4162,9 +4162,9 @@ ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_GEOMFROMGEOJSON('-1E-36181012216111515851075235238');
 ERROR HY000: Invalid GeoJSON data provided to function st_geomfromgeojson
 SELECT ST_GEOMFROMGEOJSON('1E+36181012216111515851075235238');
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 6.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 0.
 SELECT ST_GEOMFROMGEOJSON('-1E+36181012216111515851075235238');
-ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 7.
+ERROR 22032: Invalid JSON text in argument 1 to function st_geomfromgeojson: "Number too big to be stored in double." at position 0.
 #
 # Bug#21389101 ST_GEOMFROMGEOJSON: STACK OVERFLOW IN
 #              RAPIDJSON::GENERICREADER
diff --git a/mysql-test/suite/gis/r/gis_bugs_crashes.result b/mysql-test/suite/gis/r/gis_bugs_crashes.result
index 8a1f66b1b387..790e21028bdf 100644
--- a/mysql-test/suite/gis/r/gis_bugs_crashes.result
+++ b/mysql-test/suite/gis/r/gis_bugs_crashes.result
@@ -1428,7 +1428,7 @@ POLYGON((15 3.882,24.5528 -0.8944,24.6028 -0.9139,24.6518 -0.9374,24.6896 -0.947
 SET @buf = ST_BUFFER(ST_GEOMFROMTEXT(@star_of_elems), 1);
 SELECT st_area(@buf);
 st_area(@buf)
-373.4694
+373.46939430619625
 SELECT ST_ASTEXT(ST_BUFFER(@buf, 1));
 ST_ASTEXT(ST_BUFFER(@buf, 1))
 POLYGON((15 2.7639,24.1056 -1.7889,24.1905 -1.8265,24.2045 -1.8319,24.2187 -1.8387,24.3275 -1.8791,24.3273 -1.8797,24.3634 -1.8937,24.3774 -1.8977,24.3917 -1.903,24.4294 -1.9132,24.4296 -1.9126,24.5417 -1.9446,24.5556 -1.9472,24.5699 -1.951,24.6856 -1.971,24.6855 -1.9715,24.7241 -1.9787,24.7377 -1.98,24.7518 -1.9824,24.7912 -1.9855,24.7912 -1.9849,24.9088 -1.9958,24.922 -1.9957,24.9358 -1.9968,25.0546 -1.9952,25.0546 -1.9956,25.0943 -1.9956,25.107 -1.9944,25.1203 -1.9942,25.1601 -1.99,25.16 -1.9894,25.2789 -1.9783,25.291 -1.976,25.3038 -1.9746,25.4217 -1.9509,25.4218 -1.9513,25.4612 -1.9439,25.4726 -1.9406,25.4847 -1.9382,25.5235 -1.9265,25.5234 -1.926,25.6396 -1.8927,25.6501 -1.8886,25.6615 -1.8852,25.7743 -1.8396,25.7745 -1.84,25.8123 -1.8253,25.822 -1.8204,25.8327 -1.8161,25.8691 -1.7973,25.8689 -1.7969,25.9782 -1.742,25.9869 -1.7365,25.9967 -1.7315,26.1004 -1.6652,26.1006 -1.6656,26.1354 -1.6438,26.1433 -1.6378,26.1522 -1.6321,26.185 -1.6067,26.1847 -1.6063,26.2831 -1.5314,26.29 -1.525,26.2979 -1.5188,26.3888 -1.4337,26.389 -1.4339,26.4196 -1.4058,26.4256 -1.3991,26.4325 -1.3926,26.4603 -1.3612,26.46 -1.3609,26.5438 -1.2681,26.5489 -1.2612,26.5549 -1.2545,26.6294 -1.1529,26.6297 -1.1531,26.6548 -1.1194,26.659 -1.1125,26.6641 -1.1056,26.6859 -1.0693,26.6855 -1.0691,26.7515 -0.9611,26.7548 -0.9543,26.759 -0.9473,26.8141 -0.8325,26.8144 -0.8326,26.8331 -0.7945,26.8356 -0.7878,26.8389 -0.781,26.8538 -0.7408,26.8535 -0.7407,26.8988 -0.6211,26.9006 -0.6147,26.9031 -0.608,26.9366 -0.4836,26.9368 -0.4837,26.9483 -0.4423,26.9494 -0.4362,26.9511 -0.4298,26.9585 -0.387,26.9582 -0.387,26.9809 -0.2597,26.9814 -0.254,26.9824 -0.2479,26.9926 -0.1181,26.9928 -0.1181,26.9964 -0.0748,26.9964 -0.0696,26.9968 -0.0639,26.9962 -0.0201,26.9959 -0.0201,26.9948 0.1107,26.9943 0.1154,26.9942 0.1207,26.9802 0.2515,26.9804 0.2515,26.9759 0.2952,26.9751 0.2994,26.9746 0.3042,26.9658 0.3476,26.9656 0.3476,26.94 0.4772,26.9389 0.4808,26.9381 0.4851,26.9157 0.5747,24.3542 9.1129,31.06 13.304,31.1359 13.3564,31.2824 13.4681,31.4181 13.5927,31.5417 13.7293,31.6522 13.8767,31.7487 14.0337,31.8302 14.1989,31.8962 14.3709,31.9461 14.5483,31.9795 14.7295,31.996 14.913,31.9955 15.0972,31.9781 15.2806,31.9438 15.4616,31.893 15.6387,31.8261 15.8104,31.7437 15.9752,31.6465 16.1317,31.5352 16.2785,31.4109 16.4145,31.2746 16.5385,31.1275 16.6493,30.9707 16.7462,30.8057 16.8282,30.6339 16.8946,30.4567 16.945,30.2756 16.9788,30.0921 16.9957,30 17,20.3541 17,16.857 25.7428,16.8191 25.8261,16.736 25.989,16.6383 26.1436,16.5268 26.2886,16.4026 26.4228,16.2667 26.5451,16.1201 26.6544,15.9641 26.7499,15.8001 26.8307,15.6294 26.8962,15.4533 26.9458,15.2735 26.9791,15.0914 26.9958,14.9086 26.9958,14.7265 26.9791,14.5467 26.9458,14.3706 26.8962,14.1999 26.8307,14.0359 26.7499,13.8799 26.6544,13.7333 26.5451,13.5974 26.4228,13.4732 26.2886,13.3617 26.1436,13.264 25.989,13.1809 25.8261,13.143 25.7428,9.6459 17,0 17,-0.0928 16.9957,-0.2775 16.9785,-0.4598 16.9442,-0.6382 16.8932,-0.8111 16.8258,-0.9769 16.7427,-1.1344 16.6445,-1.2821 16.5322,-1.4187 16.4067,-1.543 16.269,-1.6541 16.1204,-1.7509 15.9621,-1.8326 15.7955,-1.8985 15.6221,-1.948 15.4433,-1.9808 15.2607,-1.9964 15.0758,-1.9948 14.8903,-1.9761 14.7057,-1.9402 14.5237,-1.8877 14.3457,-1.8188 14.1735,-1.7343 14.0083,-1.6349 13.8517,-1.5213 13.705,-1.3946 13.5694,-1.2559 13.4462,-1.1063 13.3364,-1.029 13.285,6.3814 8.8388,3.143 0.7428,3.1126 0.6551,3.06 0.4772,3.0241 0.2952,3.0052 0.1107,3.0036 -0.0748,3.0191 -0.2597,3.0517 -0.4423,3.1011 -0.6211,3.1669 -0.7945,3.2485 -0.9611,3.3452 -1.1194,3.4562 -1.2681,3.5804 -1.4058,3.717 -1.5314,3.8645 -1.6438,4.0219 -1.742,4.1877 -1.8252,4.3605 -1.8927,4.5388 -1.9439,4.721 -1.9783,4.9057 -1.9956,5.0912 -1.9958,5.2759 -1.9787,5.4583 -1.9446,5.6366 -1.8937,5.8095 -1.8265,5.8944 -1.7889,15 2.7639))
@@ -1440,7 +1440,7 @@ ST_ASTEXT(ST_CONVEXHULL(@buf))
 POLYGON((-0.9964 15.0843,-0.9949 14.8988,-0.959 14.7167,4.065 -0.3547,4.1466 -0.5213,4.2576 -0.6699,4.3941 -0.7955,4.5514 -0.8937,4.7242 -0.9612,4.9065 -0.9956,5.092 -0.9958,25.014 -0.9999,25.0935 -0.9956,25.1976 -0.9803,25.2758 -0.9612,25.3743 -0.9273,25.4486 -0.8937,25.5384 -0.8427,25.6059 -0.7955,25.6841 -0.7294,25.7424 -0.6699,25.8065 -0.5913,25.8534 -0.5213,25.9014 -0.433,25.935 -0.3547,30.9626 14.7292,30.996 14.9104,30.9955 15.0947,30.9612 15.2757,30.8944 15.4473,30.7971 15.6038,30.6728 15.7398,30.5257 15.8507,15.5979 25.8015,15.442 25.897,15.2712 25.9625,15.0914 25.9958,14.9086 25.9958,14.7288 25.9625,14.558 25.897,14.4021 25.8015,-0.529 15.8486,-0.6766 15.7363,-0.801 15.5986,-0.8978 15.4404,-0.9637 15.2669,-0.9964 15.0843))
 SELECT ST_ASTEXT(ST_ENVELOPE(@buf));
 ST_ASTEXT(ST_ENVELOPE(@buf))
-POLYGON((-0.9964 -0.9999,30.996 -0.9999,30.996 25.9958,-0.9964 25.9958,-0.9964 -0.9999))
+POLYGON((-0.9964394501011175 -0.9999013929047789,30.995979706343796 -0.9999013929047789,30.995979706343796 25.995811240678275,-0.9964394501011175 25.995811240678275,-0.9964394501011175 -0.9999013929047789))
 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)) as result;
 result
 0
@@ -2637,7 +2637,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10,10 0,0 10)'), 20, ST_B
 POLYGON((-10 0,-14.1421 -4.1421,-4.1421 -14.1421,-1.1114 -16.6294,2.3463 -18.4776,6.0982 -19.6157,10 -20,13.9018 -19.6157,17.6537 -18.4776,21.1114 -16.6294,24.1421 -14.1421,26.6294 -11.1114,28.4776 -7.6537,29.6157 -3.9018,30 0,30 10,29.6157 13.9018,28.4776 17.6537,26.6294 21.1114,24.1421 24.1421,21.1114 26.6294,17.6537 28.4776,13.9018 29.6157,10 30,6.0982 29.6157,2.3463 28.4776,-1.1114 26.6294,-4.1421 24.1421,-14.1421 14.1421,-10 10,-10 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(10 0,0 10))'), 50, ST_BUFFER_STRATEGY('end_flat')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(10 0,0 10))'), 50, ST_BUFFER_STRATEGY('end_flat')))
-POLYGON((5 15,-25.3553 45.3553,-35.3553 35.3553,-5 5,-35.3553 -25.3553,-25.3553 -35.3553,5 -5,35.3553 -35.3553,45.3553 -25.3553,15 5,45.3553 35.3553,35.3553 45.3553,5 15))
+POLYGON((5.000000748969793 14.999999251030207,-25.35533905932737 45.35533905932737,-35.35533905932737 35.35533905932737,-4.999999251030204 4.999999251030204,-35.35533905932737 -25.35533905932737,-25.35533905932737 -35.35533905932737,4.999999251030207 -4.999999251030207,35.35533905932737 -35.35533905932737,45.35533905932737 -25.35533905932737,14.999999251030204 5.000000748969796,45.35533905932737 35.35533905932737,35.35533905932737 45.35533905932737,5.000000748969793 14.999999251030207))
 ######################################################################################################
 # BUG#20558350 : ST_BUFFER RETURNS INCORRECT RESULT WITH NEGATIVE DISTANCE AND POLYGON WITH HOLE
 ######################################################################################################
diff --git a/mysql-test/suite/gis/r/spatial_analysis_functions_buffer.result b/mysql-test/suite/gis/r/spatial_analysis_functions_buffer.result
index 5856d7069bd6..cb360219e150 100644
--- a/mysql-test/suite/gis/r/spatial_analysis_functions_buffer.result
+++ b/mysql-test/suite/gis/r/spatial_analysis_functions_buffer.result
@@ -52,7 +52,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_center), 0))
 POINT(15 10)
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_top), 1));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_top), 1))
-POLYGON((16 25,15.9808 25.1951,15.9239 25.3827,15.8315 25.5556,15.7071 25.7071,15.5556 25.8315,15.3827 25.9239,15.1951 25.9808,15 26,14.8049 25.9808,14.6173 25.9239,14.4444 25.8315,14.2929 25.7071,14.1685 25.5556,14.0761 25.3827,14.0192 25.1951,14 25,14.0192 24.8049,14.0761 24.6173,14.1685 24.4444,14.2929 24.2929,14.4444 24.1685,14.6173 24.0761,14.8049 24.0192,15 24,15.1951 24.0192,15.3827 24.0761,15.5556 24.1685,15.7071 24.2929,15.8315 24.4444,15.9239 24.6173,15.9808 24.8049,16 25))
+POLYGON((16 25,15.98078528040323 25.195090322016124,15.923879532511288 25.382683432365088,15.831469612302547 25.555570233019598,15.70710678118655 25.707106781186546,15.555570233019605 25.831469612302545,15.382683432365093 25.923879532511286,15.195090322016132 25.98078528040323,15.000000000000002 26,14.804909677983874 25.980785280403232,14.617316567634912 25.923879532511286,14.444429766980399 25.831469612302545,14.292893218813454 25.70710678118655,14.168530387697455 25.555570233019605,14.076120467488714 25.38268343236509,14.01921471959677 25.195090322016128,14 25,14.01921471959677 24.804909677983872,14.076120467488714 24.617316567634912,14.168530387697455 24.4444297669804,14.292893218813452 24.292893218813454,14.444429766980399 24.168530387697455,14.61731656763491 24.076120467488714,14.804909677983872 24.019214719596768,15 24,15.195090322016128 24.019214719596768,15.38268343236509 24.076120467488714,15.555570233019603 24.168530387697455,15.707106781186548 24.292893218813454,15.831469612302545 24.4444297669804,15.923879532511286 24.61731656763491,15.98078528040323 24.804909677983872,16 25))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(-0 0)'), 2));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(-0 0)'), 2))
 POLYGON((2 0,1.9616 0.3902,1.8478 0.7654,1.6629 1.1111,1.4142 1.4142,1.1111 1.6629,0.7654 1.8478,0.3902 1.9616,0 2,-0.3902 1.9616,-0.7654 1.8478,-1.1111 1.6629,-1.4142 1.4142,-1.6629 1.1111,-1.8478 0.7654,-1.9616 0.3902,-2 0,-1.9616 -0.3902,-1.8478 -0.7654,-1.6629 -1.1111,-1.4142 -1.4142,-1.1111 -1.6629,-0.7654 -1.8478,-0.3902 -1.9616,0 -2,0.3902 -1.9616,0.7654 -1.8478,1.1111 -1.6629,1.4142 -1.4142,1.6629 -1.1111,1.8478 -0.7654,1.9616 -0.3902,2 0))
@@ -61,7 +61,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3))
 POLYGON((5.34 -2.34,5.2824 -1.7547,5.1116 -1.1919,4.8344 -0.6733,4.4613 -0.2187,4.0067 0.1544,3.4881 0.4316,2.9253 0.6024,2.34 0.66,1.7547 0.6024,1.1919 0.4316,0.6733 0.1544,0.2187 -0.2187,-0.1544 -0.6733,-0.4316 -1.1919,-0.6024 -1.7547,-0.66 -2.34,-0.6024 -2.9253,-0.4316 -3.4881,-0.1544 -4.0067,0.2187 -4.4613,0.6733 -4.8344,1.1919 -5.1116,1.7547 -5.2824,2.34 -5.34,2.9253 -5.2824,3.4881 -5.1116,4.0067 -4.8344,4.4613 -4.4613,4.8344 -4.0067,5.1116 -3.4881,5.2824 -2.9253,5.34 -2.34))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5))
-POLYGON((1005 -1000,1004.9039 -999.0245,1004.6194 -998.0866,1004.1573 -997.2221,1003.5355 -996.4645,1002.7779 -995.8427,1001.9134 -995.3806,1000.9755 -995.0961,1000 -995,999.0245 -995.0961,998.0866 -995.3806,997.2221 -995.8427,996.4645 -996.4645,995.8427 -997.2221,995.3806 -998.0866,995.0961 -999.0245,995 -1000,995.0961 -1000.9755,995.3806 -1001.9134,995.8427 -1002.7779,996.4645 -1003.5355,997.2221 -1004.1573,998.0866 -1004.6194,999.0245 -1004.9039,1000 -1005,1000.9755 -1004.9039,1001.9134 -1004.6194,1002.7779 -1004.1573,1003.5355 -1003.5355,1004.1573 -1002.7779,1004.6194 -1001.9134,1004.9039 -1000.9755,1005 -1000))
+POLYGON((1005 -1000,1004.9039264020162 -999.0245483899193,1004.6193976625565 -998.0865828381745,1004.1573480615127 -997.222148834902,1003.5355339059328 -996.4644660940672,1002.777851165098 -995.8426519384873,1001.9134171618255 -995.3806023374435,1000.9754516100807 -995.0960735979838,1000 -995,999.0245483899193 -995.0960735979838,998.0865828381745 -995.3806023374435,997.222148834902 -995.8426519384873,996.4644660940672 -996.4644660940672,995.8426519384873 -997.222148834902,995.3806023374435 -998.0865828381745,995.0960735979838 -999.0245483899193,995 -1000,995.0960735979838 -1000.9754516100807,995.3806023374435 -1001.9134171618255,995.8426519384873 -1002.777851165098,996.4644660940672 -1003.5355339059328,997.222148834902 -1004.1573480615127,998.0865828381745 -1004.6193976625565,999.0245483899193 -1004.9039264020162,1000 -1005,1000.9754516100807 -1004.9039264020162,1001.9134171618255 -1004.6193976625565,1002.777851165098 -1004.1573480615127,1003.5355339059328 -1003.5355339059328,1004.1573480615127 -1002.777851165098,1004.6193976625565 -1001.9134171618255,1004.9039264020162 -1000.9754516100807,1005 -1000))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(-0 0)'), 10));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(-0 0)'), 10))
 POLYGON((10 0,9.8079 1.9509,9.2388 3.8268,8.3147 5.5557,7.0711 7.0711,5.5557 8.3147,3.8268 9.2388,1.9509 9.8079,0 10,-1.9509 9.8079,-3.8268 9.2388,-5.5557 8.3147,-7.0711 7.0711,-8.3147 5.5557,-9.2388 3.8268,-9.8079 1.9509,-10 0,-9.8079 -1.9509,-9.2388 -3.8268,-8.3147 -5.5557,-7.0711 -7.0711,-5.5557 -8.3147,-3.8268 -9.2388,-1.9509 -9.8079,0 -10,1.9509 -9.8079,3.8268 -9.2388,5.5557 -8.3147,7.0711 -7.0711,8.3147 -5.5557,9.2388 -3.8268,9.8079 -1.9509,10 0))
@@ -97,7 +97,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_top_to_center), 0))
 LINESTRING(15 25,15 10)
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_line_horizontal), 1));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_line_horizontal), 1))
-POLYGON((10 16,9.8049 15.9808,9.6173 15.9239,9.4444 15.8315,9.2929 15.7071,9.1685 15.5556,9.0761 15.3827,9.0192 15.1951,9 15,9.0192 14.8049,9.0761 14.6173,9.1685 14.4444,9.2929 14.2929,9.4444 14.1685,9.6173 14.0761,9.8049 14.0192,10 14,20 14,20 14,20.1951 14.0192,20.3827 14.0761,20.5556 14.1685,20.7071 14.2929,20.8315 14.4444,20.9239 14.6173,20.9808 14.8049,21 15,20.9808 15.1951,20.9239 15.3827,20.8315 15.5556,20.7071 15.7071,20.5556 15.8315,20.3827 15.9239,20.1951 15.9808,20 16,10 16))
+POLYGON((10 16,9.804909677983874 15.98078528040323,9.617316567634912 15.923879532511288,9.444429766980399 15.831469612302547,9.292893218813454 15.707106781186548,9.168530387697455 15.555570233019603,9.076120467488714 15.382683432365091,9.01921471959677 15.19509032201613,9 15,9.01921471959677 14.804909677983872,9.076120467488714 14.61731656763491,9.168530387697455 14.444429766980399,9.292893218813452 14.292893218813452,9.444429766980399 14.168530387697455,9.61731656763491 14.076120467488714,9.804909677983872 14.01921471959677,10 14,20 14,20 14,20.195090322016128 14.01921471959677,20.38268343236509 14.076120467488714,20.5555702330196 14.168530387697455,20.707106781186546 14.292893218813452,20.831469612302545 14.444429766980399,20.923879532511286 14.61731656763491,20.980785280403232 14.804909677983872,21 15,20.980785280403232 15.195090322016128,20.923879532511286 15.38268343236509,20.831469612302545 15.555570233019601,20.707106781186546 15.707106781186548,20.5555702330196 15.831469612302545,20.38268343236509 15.923879532511286,20.195090322016128 15.98078528040323,20 16,10 16))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('LINESTRING(0 0,-0 0,0 0)'), 5));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('LINESTRING(0 0,-0 0,0 0)'), 5))
 POLYGON((5 0,4.9039 0.9755,4.6194 1.9134,4.1573 2.7779,3.5355 3.5355,2.7779 4.1573,1.9134 4.6194,0.9755 4.9039,0 5,-0.9755 4.9039,-1.9134 4.6194,-2.7779 4.1573,-3.5355 3.5355,-4.1573 2.7779,-4.6194 1.9134,-4.9039 0.9755,-5 0,-4.9039 -0.9755,-4.6194 -1.9134,-4.1573 -2.7779,-3.5355 -3.5355,-2.7779 -4.1573,-1.9134 -4.6194,-0.9755 -4.9039,0 -5,0.9755 -4.9039,1.9134 -4.6194,2.7779 -4.1573,3.5355 -3.5355,4.1573 -2.7779,4.6194 -1.9134,4.9039 -0.9755,5 0))
@@ -243,7 +243,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0
 POLYGON((10 1010,0 1010,-195.0903 990.7853,-382.6834 933.8795,-555.5702 841.4696,-707.1068 717.1068,-831.4696 565.5702,-923.8795 392.6834,-980.7853 205.0903,-1000 10,-1000 0,-980.7853 -195.0903,-923.8795 -382.6834,-831.4696 -555.5702,-707.1068 -707.1068,-555.5702 -831.4696,-382.6834 -923.8795,-195.0903 -980.7853,0 -1000,10 -1000,205.0903 -980.7853,392.6834 -923.8795,565.5702 -831.4696,717.1068 -707.1068,841.4696 -555.5702,933.8795 -382.6834,990.7853 -195.0903,1010 0,1010 10,990.7853 205.0903,933.8795 392.6834,841.4696 565.5702,717.1068 717.1068,565.5702 841.4696,392.6834 933.8795,205.0903 990.7853,10 1010))
 SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=103;
 ST_ASTEXT(ST_BUFFER(g, 20))
-POLYGON((15 -17.3607,16.0557 -17.8885,17.057 -18.2778,18.037 -18.7488,18.7915 -18.9521,19.5136 -19.2328,20.5603 -19.4287,21.601 -19.7091,22.3896 -19.771,23.1603 -19.9152,24.2159 -19.9144,25.2809 -19.998,26.0768 -19.913,26.8702 -19.9124,27.8984 -19.7183,28.9511 -19.6058,29.727 -19.3732,30.5158 -19.2243,31.4818 -18.8471,32.4868 -18.5458,33.2152 -18.1702,33.9717 -17.8748,34.8435 -17.3306,35.7675 -16.8541,36.4219 -16.3452,37.1188 -15.9102,37.8682 -15.2206,38.6814 -14.5883,39.2375 -13.9607,39.8489 -13.3982,40.4525 -12.5895,41.1293 -11.8256,41.5655 -11.0984,42.068 -10.4251,42.5078 -9.5272,43.0278 -8.6602,43.3262 -7.8562,43.6999 -7.0933,43.9638 -6.1386,44.3123 -5.1997,44.4595 -4.3452,44.6883 -3.5174,44.7705 -2.5397,44.9389 -1.5621,44.9264 -0.6856,44.9992 0.1795,44.9004 1.1464,44.8914 1.7756,46.0036 3.0049,47.9326 6.1444,49.2528 9.5845,49.9196 13.2084,49.9102 16.8932,49.225 20.5137,47.8872 23.947,45.9422 27.0766,43.4562 29.7963,40.5133 32.0138,37.2136 33.6538,33.6691 34.6606,32.3681 34.7809,31.9064 35.6851,29.678 38.5851,26.9587 41.0309,23.8396 42.9405,20.4248 44.2502,16.8287 44.9162,13.1713 44.9162,9.5752 44.2502,6.1604 42.9405,3.0413 41.0309,0.322 38.5851,-1.9064 35.6851,-2.3689 34.7793,-3.6946 34.6558,-7.2621 33.635,-10.5795 31.9727,-13.5328 29.7262,-16.0203 26.9729,-17.9564 23.8073,-19.2743 20.3387,-19.9288 16.6862,-19.8973 12.9757,-19.1809 9.3349,-17.8043 5.8891,-15.8148 2.7569,-14.8421 1.7164,-14.9992 0.1795,-14.6883 -3.5174,-13.6999 -7.0933,-12.068 -10.4251,-9.8489 -13.3982,-7.1188 -15.9102,-3.9717 -17.8748,-0.5158 -19.2243,3.1298 -19.9124,6.8397 -19.9152,10.4864 -19.2328,13.9443 -17.8885,15 -17.3607))
+POLYGON((15.000001034274 -17.360680292135,16.055728090001 -17.888543819998,17.05695241022 -18.277767398939,18.036969761672 -18.748765556701,18.791543359698 -18.952076436705,19.513605851123 -19.232770971526,20.560323430982 -19.428653186497,21.601027046921 -19.709058396185,22.389620895482 -19.770985011858,23.160268586622 -19.915204953167,24.215869804709 -19.914396496148,25.280859015937 -19.998027858096,26.076802800948 -19.91297501152,26.870235860276 -19.912363441514,27.898439945493 -19.718318771356,28.95112445877 -19.605831160941,29.727007318712 -19.373220151413,30.515848948033 -19.224344212027,31.481833991057 -18.84712011122,32.486808017295 -18.54582717789,33.215198543551 -18.170226369641,33.971663531698 -17.874821774608,34.843454553241 -17.330602224035,35.767478416673 -16.854121411289,36.421934267429 -16.345232902906,37.118766195662 -15.910232741694,37.868228891705 -15.220630359922,38.681390555289 -14.588336179073,39.23747994126 -13.960736648624,39.84886619747 -13.398177960067,40.452478682288 -12.589495516168,41.129291729157 -11.825647902577,41.565485691838 -11.098358088614,42.068021715792 -10.425096388487,42.507787320356 -9.527207557571,43.027802344439 -8.660158349006,43.32621505532 -7.856199441815,43.699872356845 -7.093290762243,43.963765683364 -6.138563136424,44.312255965376 -5.199689368395,44.459455114067 -4.345222020385,44.688266689815 -3.517407390498,44.770500401079 -2.539654230981,44.938901960873 -1.562110301703,44.926432690103 -0.685615870684,44.999194398682 0.17950878459,44.900370525731 1.146355088366,44.891418507445 1.775576406702,46.00363701272 3.004850881915,47.93259127868 6.144370715087,49.252848420451 9.584482693302,49.919594126876 13.208416951261,49.910196632822 16.893164029441,49.224974923287 20.513650260851,47.887187905897 23.946983224481,45.942244919301 27.076623159353,43.45616437569 29.796338746271,40.513332856672 32.013812983715,37.213640726934 33.653776761362,33.669091493324 34.660563766424,32.368108982336 34.780922427548,31.90644890027 35.685129179498,29.678014161645 38.585135268761,26.958748218274 41.030855905158,23.839583028956 42.940506455343,20.424823139988 44.250228411628,16.828657752429 44.916224813565,13.171342247571 44.916224813565,9.575176860011 44.250228411628,6.160416971044 42.940506455343,3.041251781726 41.030855905158,0.321985838355 38.585135268761,-1.90644890027 35.685129179498,-2.368940236166 34.779294335031,-3.694618779319 34.655782662502,-7.26206237471 33.63497920755,-10.579533192563 31.972727459883,-13.532838135665 29.726245006582,-16.020319327581 26.972859668531,-17.956353353016 23.807347742745,-19.274298564215 20.338671637916,-19.928789002022 16.686229199389,-19.897295970845 12.97574382832,-19.180903515418 9.334936864233,-17.804271106102 5.889131195082,-15.814784817162 2.756937426164,-14.842110268168 1.716355116701,-14.999194398682 0.17950878459,-14.688266689815 -3.517407390498,-13.699872356845 -7.093290762243,-12.068021715792 -10.425096388487,-9.84886619747 -13.398177960067,-7.118766195662 -15.910232741694,-3.971663531698 -17.874821774608,-0.515848948033 -19.224344212027,3.129764139724 -19.912363441514,6.839731413378 -19.915204953167,10.486394148877 -19.232770971526,13.944271909999 -17.888543819998,15.000001034274 -17.360680292135))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'), -2));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'), -2))
 POLYGON((8 2,8 8,2 8,2 2,8 2))
@@ -291,7 +291,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_collection_elems), 0))
 GEOMETRYCOLLECTION(MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),((25 0,0 15,30 15,22 10,25 0))),POLYGON((5 0,7 10,0 15,10 15,15 25,20 15,30 15,22 10,25 0,15 5,5 0)),LINESTRING(15 25,15 10),MULTIPOINT((5 0),(25 0)),POINT(15 25))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_collection_multilinestr), 1));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_collection_multilinestr), 1))
-POLYGON((7.7662 16,15.8575 29.4855,15.9403 29.6596,15.9881 29.8464,15.9992 30.0389,15.9732 30.2299,15.911 30.4124,15.8149 30.5796,15.6885 30.7252,15.5366 30.8439,15.3646 30.9311,15.1792 30.9838,14.987 30.9999,14.7954 30.9788,14.6113 30.9214,14.4417 30.8297,14.2929 30.7071,-0.7071 15.7071,-0.7555 15.6491,-0.801 15.5986,-0.8108 15.5826,-0.8232 15.5678,-0.8239 15.5665,-0.8247 15.5655,-0.8382 15.5411,-0.8615 15.4997,-0.8978 15.4404,-0.9038 15.4248,-0.9122 15.4098,-0.9147 15.4024,-0.9183 15.3959,-0.9363 15.3397,-0.9385 15.3332,-0.9637 15.2669,-0.9663 15.2525,-0.9712 15.2383,-0.9733 15.2242,-0.9774 15.2115,-0.9843 15.1519,-0.9964 15.0843,-0.9963 15.0718,-0.9983 15.0591,-0.9976 15.0382,-0.9998 15.0192,-0.9954 14.9626,-0.9949 14.8988,-0.9928 14.8885,-0.9925 14.8778,-0.9867 14.8511,-0.9848 14.8261,-0.9705 14.7748,-0.959 14.7167,-0.9559 14.709,-0.9541 14.7006,-0.941 14.6692,-0.9328 14.6396,-0.9105 14.5952,-0.8902 14.5445,-0.8868 14.5392,-0.8844 14.5332,-0.8622 14.4991,-0.8458 14.4666,-0.8177 14.4302,-0.7907 14.3878,-0.7879 14.3848,-0.7855 14.3812,-0.7529 14.3467,-0.7272 14.3135,-0.6953 14.2858,-0.664 14.2523,-0.6624 14.2511,-0.6609 14.2495,-0.6168 14.2173,-0.5812 14.1863,2.8675 11.7229,-0.8575 5.5145,-0.9414 5.3373,-0.9891 5.1472,-0.9988 4.9514,-0.9701 4.7575,-0.9042 4.5729,-0.8035 4.4047,-0.6719 4.2594,-0.5145 4.1425,-0.3373 4.0586,-0.1472 4.0109,0.0486 4.0012,0.2425 4.0299,0.4271 4.0958,0.5953 4.1965,0.7406 4.3281,0.8575 4.4855,4.5002 10.5567,5.8926 9.5621,4.0194 0.1961,4.0194 0.1956,4.0192 0.1951,4.0191 0.1943,4.0189 0.1935,4.0092 0.0982,4.0001 0.0114,4.0002 0.0102,4 0.009,4.0004 0.0044,4 0,4.0055 -0.0554,4.0081 -0.0868,4.0152 -0.1737,4.0155 -0.1748,4.0156 -0.1759,4.0183 -0.1856,4.0192 -0.1951,4.0382 -0.2576,4.0411 -0.2682,4.0643 -0.3528,4.0647 -0.3537,4.065 -0.3547,4.0719 -0.3687,4.0761 -0.3827,4.1073 -0.441,4.1074 -0.4413,4.1457 -0.5197,4.1462 -0.5205,4.1466 -0.5213,4.1592 -0.5382,4.1685 -0.5556,4.2091 -0.605,4.2565 -0.6688,4.2571 -0.6693,4.2576 -0.6699,4.2772 -0.688,4.2929 -0.7071,4.3398 -0.7456,4.393 -0.7947,4.3936 -0.7951,4.3941 -0.7955,4.4214 -0.8126,4.4444 -0.8315,4.4945 -0.8582,4.5504 -0.8932,4.5509 -0.8934,4.5514 -0.8937,4.5867 -0.9075,4.6173 -0.9239,4.6676 -0.9391,4.7234 -0.961,4.7238 -0.9611,4.7242 -0.9612,4.7671 -0.9693,4.8049 -0.9808,4.8527 -0.9855,4.9058 -0.9956,4.9062 -0.9956,4.9065 -0.9956,4.9559 -0.9957,5 -1,5.0433 -0.9957,5.0915 -0.9958,5.0918 -0.9958,5.092 -0.9958,5.1464 -0.9856,5.1951 -0.9808,5.2322 -0.9695,5.2741 -0.9617,5.2742 -0.9617,5.2743 -0.9616,5.3316 -0.9394,5.3827 -0.9239,5.4126 -0.9079,5.4472 -0.8944,15 3.882,24.5528 -0.8944,24.5874 -0.9079,24.6173 -0.9239,24.6345 -0.9291,24.6518 -0.9374,24.6576 -0.939,24.6627 -0.9414,24.6935 -0.9491,24.7257 -0.9616,24.7297 -0.9624,24.7334 -0.9638,24.7701 -0.9702,24.8049 -0.9808,24.8172 -0.982,24.8301 -0.9855,24.842 -0.9864,24.8528 -0.9891,24.8796 -0.9904,24.908 -0.9958,24.9163 -0.9958,24.9241 -0.9971,24.9625 -0.9963,25 -1,25.0068 -0.9993,25.014 -0.9999,25.0319 -0.998,25.0486 -0.9988,25.0701 -0.9956,25.0935 -0.9956,25.1057 -0.9933,25.1176 -0.9931,25.1555 -0.9848,25.1676 -0.9835,25.1951 -0.9808,25.1963 -0.9804,25.1976 -0.9803,25.2206 -0.9734,25.2425 -0.9701,25.2583 -0.9645,25.2758 -0.9612,25.2912 -0.9552,25.3066 -0.9518,25.3385 -0.938,25.3743 -0.9273,25.3785 -0.9252,25.3827 -0.9239,25.4042 -0.9124,25.4271 -0.9042,25.4371 -0.8982,25.4486 -0.8937,25.4662 -0.8827,25.4842 -0.8749,25.5093 -0.8577,25.5384 -0.8427,25.5468 -0.8362,25.5556 -0.8315,25.5744 -0.816,25.5953 -0.8035,25.6001 -0.7991,25.6059 -0.7955,25.6243 -0.7786,25.6437 -0.7653,25.662 -0.7466,25.6841 -0.7294,25.6951 -0.7169,25.7071 -0.7071,25.7226 -0.6883,25.7406 -0.6719,25.7414 -0.6708,25.7424 -0.6699,25.7599 -0.6466,25.779 -0.627,25.791 -0.6087,25.8065 -0.5913,25.8181 -0.5718,25.8315 -0.5556,25.8408 -0.5382,25.8534 -0.5213,25.8552 -0.5176,25.8575 -0.5145,25.8695 -0.4891,25.8852 -0.4652,25.8918 -0.449,25.9014 -0.433,25.9114 -0.406,25.9239 -0.3827,25.9281 -0.3687,25.935 -0.3547,25.9375 -0.3454,25.9414 -0.3373,25.9479 -0.3113,25.9582 -0.286,25.9608 -0.273,25.9656 -0.26,25.9715 -0.2256,25.9808 -0.1951,25.9817 -0.1856,25.9844 -0.1759,25.9857 -0.1609,25.9891 -0.1472,25.9904 -0.1216,25.9954 -0.096,25.9954 -0.0872,25.9969 -0.0781,25.9964 -0.0369,26 0,25.9996 0.0043,26 0.009,25.9979 0.0295,25.9988 0.0486,25.9953 0.0727,25.9952 0.0975,25.9944 0.1018,25.9943 0.1064,25.9856 0.1499,25.9811 0.1935,25.9809 0.1943,25.9808 0.1951,25.9745 0.2157,25.9737 0.2186,25.9701 0.2425,25.9626 0.2636,25.9578 0.2873,23.1771 9.5564,30.53 14.152,30.6766 14.2636,30.8002 14.4002,30.8966 14.5572,30.9626 14.7292,30.996 14.9104,30.9955 15.0947,30.9612 15.2757,30.8944 15.4473,30.7971 15.6038,30.6728 15.7398,30.5257 15.8507,30.3607 15.9327,30.1835 15.983,30 16,20.618 16,15.8944 25.4472,15.8682 25.4894,15.8453 25.5343,15.8372 25.5448,15.8315 25.5556,15.8135 25.5774,15.7972 25.6037,15.7642 25.6398,15.7339 25.6793,15.7189 25.6928,15.7071 25.7071,15.6895 25.7215,15.6729 25.7397,15.6344 25.7688,15.5979 25.8015,15.5747 25.8158,15.5556 25.8315,15.5405 25.8395,15.5257 25.8507,15.4832 25.8718,15.442 25.897,15.4099 25.9093,15.3827 25.9239,15.3717 25.9272,15.3607 25.9327,15.3157 25.9455,15.2712 25.9625,15.2304 25.9701,15.1951 25.9808,15.1894 25.9814,15.1835 25.983,15.1375 25.9873,15.0914 25.9958,15.0453 25.9958,15 26,14.9547 25.9958,14.9086 25.9958,14.8625 25.9873,14.8165 25.983,14.8106 25.9814,14.8049 25.9808,14.7696 25.9701,14.7288 25.9625,14.6843 25.9455,14.6393 25.9327,14.6283 25.9272,14.6173 25.9239,14.5901 25.9093,14.558 25.897,14.5168 25.8718,14.4743 25.8507,14.4595 25.8395,14.4444 25.8315,14.4253 25.8158,14.4021 25.8015,14.3656 25.7688,14.3271 25.7397,14.3105 25.7215,14.2929 25.7071,14.2811 25.6928,14.2661 25.6793,14.2358 25.6398,14.2028 25.6037,14.1865 25.5774,14.1685 25.5556,14.1628 25.5448,14.1547 25.5343,14.1317 25.4893,14.1056 25.4472,9.382 16,7.7662 16),(2.4142 16,9.9632 23.549,5.4338 16,2.4142 16))
+POLYGON((7.766188802991 16,15.857492925713 29.485504244572,15.940291061129 29.659628555309,15.988134057995 29.846406108749,15.999243362145 30.038893485424,15.973205987343 30.229935004293,15.910989867968 30.412428733796,15.814907876237 30.579590504793,15.688531841633 30.725206110742,15.536559768828 30.84386231962,15.364641190271 30.931148109786,15.179167145907 30.983818648851,14.987032597506 30.999915919702,14.795380109788 30.978841509403,14.611334326959 30.921378855086,14.441737115443 30.829664119825,14.292893218813 30.707106781187,-0.707106781187 15.707106781187,-0.755468841921 15.649058956452,-0.801015966379 15.598642983427,-0.810804423644 15.582638368942,-0.823172286857 15.567791674957,-0.823873533705 15.566546886139,-0.824742876616 15.565507902218,-0.838215676584 15.541084926405,-0.861530562574 15.499698608781,-0.897817667651 15.440367387137,-0.903750412172 15.424753104401,-0.912171969699 15.40980763499,-0.91472816007 15.402375638324,-0.918273137568 15.395947527863,-0.936304149186 15.339687585907,-0.938540849249 15.333188783867,-0.963714928211 15.266933581896,-0.966292388853 15.252549832205,-0.971179529001 15.238349160788,-0.973316934816 15.224186901832,-0.977369413652 15.211539663557,-0.984333182175 15.15187157115,-0.996439450101 15.084311459969,-0.996333065647 15.071777323142,-0.998254802091 15.059053789912,-0.99759462183 15.038228850995,-0.999815675461 15.01919935162,-0.995406702061 14.962633858598,-0.994864798542 14.898787191416,-0.992845977329 14.888527258781,-0.992507556683 14.877816736304,-0.986712248396 14.851063008983,-0.984770218923 14.826139090296,-0.970474552954 14.774832541528,-0.959045175771 14.716746843212,-0.955942693628 14.708981116877,-0.954126761635 14.700597056241,-0.941047222049 14.669212388824,-0.932797228049 14.639598374942,-0.910492137059 14.595215245586,-0.890213555305 14.544456559754,-0.886847054417 14.539156431191,-0.884374373667 14.533221715157,-0.862186935867 14.499091075785,-0.845845618808 14.466572226873,-0.817650819152 14.430215737237,-0.790739240858 14.387846871308,-0.787886138854 14.384794572793,-0.785543844349 14.381193997601,-0.752865464217 14.346674818878,-0.727175957447 14.313548889642,-0.695312929006 14.285758130872,-0.664046310797 14.252308554872,-0.662360719464 14.251070977228,-0.660884711646 14.24951255979,-0.616842814913 14.21732020001,-0.581238193719 14.186266528793,2.867524706499 11.722862077612,-0.857492925713 5.514495755428,-0.941389582191 5.337321292749,-0.989109164963 5.147183761963,-0.998817837225 4.951390041746,-0.970142500145 4.757464374964,-0.904185130847 4.572859216236,-0.803480434044 4.404668838285,-0.671898434757 4.259356703014,-0.514495755428 4.142507074287,-0.337321292749 4.058610417809,-0.147183761963 4.010890835037,0.048609958254 4.001182162775,0.242535625036 4.029857499855,0.427140783764 4.095814869153,0.595331161715 4.196519565956,0.740643296986 4.328101565243,0.857492925713 4.485504244572,4.50019330127 10.556670008917,5.892614926281 9.562085728793,4.019419324309 0.196116135138,4.019364011416 0.195582471188,4.019214719597 0.195090322016,4.019137935231 0.194310717269,4.018902171714 0.193512406144,4.009155651173 0.098156469837,4.000065081195 0.011408687709,4.000165105596 0.010196680724,4.000040280066 0.00897543923,4.000428326367 0.004361586531,4 0,4.005450729638 -0.055354557643,4.008094395109 -0.086787618644,4.015200021201 -0.173692261649,4.015493646129 -0.174764373367,4.015586665509 -0.175870369525,4.01828346564 -0.185627044997,4.019214719597 -0.195090322016,4.038172450076 -0.257582828587,4.041119982789 -0.268246622241,4.064302118633 -0.352802316894,4.064743623817 -0.353713912284,4.065006382158 -0.354664538112,4.071873782635 -0.36868594606,4.076120467489 -0.382683432365,4.107307172088 -0.441031517012,4.107422252034 -0.4412664797,4.145677772042 -0.519743716476,4.146209767988 -0.520460286186,4.14659891421 -0.521254819424,4.159238505439 -0.538188529317,4.168530387697 -0.55557023302,4.2090951096 -0.605000977494,4.256520218947 -0.668758413155,4.257088491709 -0.669281635932,4.257556690126 -0.669908898003,4.277193438934 -0.687977316268,4.292893218813 -0.707106781187,4.339754090104 -0.745565062976,4.393006345088 -0.794706677269,4.393567486569 -0.795056904058,4.394061690217 -0.795511637085,4.42143825433 -0.812601545918,4.44442976698 -0.831469612303,4.494473810691 -0.858218447429,4.550428549089 -0.893244373353,4.550935683057 -0.893440735303,4.551416823415 -0.89374108873,4.586726182533 -0.907529667726,4.617316567635 -0.923879532511,4.667599723332 -0.939133657633,4.723357114359 -0.960972795569,4.723784320348 -0.96105193512,4.724207552598 -0.961217210601,4.767072421995 -0.969306893654,4.804909677984 -0.980785280403,4.852743132659 -0.985494890321,4.905827487762 -0.99555589393,4.906168420866 -0.995557820361,4.906488206986 -0.995618172076,4.955908646297 -0.995656023826,5 -1,5.04327105789 -0.995736673395,5.091546005578 -0.995800847993,5.091751554664 -0.995760067657,5.091986570669 -0.995760247658,5.146373879422 -0.985582243726,5.195090322016 -0.980785280403,5.232197555352 -0.969527080439,5.274106970947 -0.961699208941,5.274207949786 -0.961659462828,5.274319707444 -0.961638548576,5.331562681726 -0.939385720229,5.382683432365 -0.923879532511,5.412638489156 -0.907868035334,5.4472135955 -0.894427191,15.0000007955 3.881966409,24.5527864045 -0.894427191,24.587352624667 -0.907864252706,24.617316567635 -0.923879532511,24.634455891058 -0.929078015948,24.651848488084 -0.937438277835,24.657610390544 -0.938989604117,24.662678707251 -0.941389582191,24.693474018469 -0.949119547972,24.725680292556 -0.961638548576,24.729733558128 -0.962397108993,24.733439590444 -0.96381821318,24.770065620098 -0.970215827365,24.804909677984 -0.980785280403,24.817224043199 -0.981997076523,24.830051352346 -0.985452919809,24.841978822599 -0.986389255112,24.852816238037 -0.989109164963,24.879561906802 -0.990435865608,24.908013429331 -0.995760247658,24.916288736963 -0.995753999079,24.924075646999 -0.997113580602,24.96253493646 -0.996310581919,25 -1,25.006792781673 -0.9993309694,25.014042950797 -0.999901392905,25.031911508875 -0.997990905966,25.048609958254 -0.998817837225,25.070125170677 -0.995636848621,25.093511793014 -0.995618172076,25.105715074874 -0.993315299337,25.117555122776 -0.993066358865,25.155540188269 -0.984781301441,25.167628038646 -0.983489619663,25.195090322016 -0.980785280403,25.196256431902 -0.98043139922,25.197556222938 -0.980291558047,25.220572638098 -0.973390115916,25.242535625036 -0.970142500145,25.25825950767 -0.964525814087,25.275792447402 -0.961217210601,25.291242026604 -0.955183503853,25.306632078379 -0.951828119205,25.338463685956 -0.938047259436,25.374340400865 -0.927291358895,25.378488869691 -0.925152165443,25.382683432365 -0.923879532511,25.404182546807 -0.912387853479,25.427140783764 -0.904185130847,25.437087777996 -0.898229579571,25.448583176585 -0.89374108873,25.466189798531 -0.882749302361,25.484225451823 -0.87494326205,25.509310971245 -0.857692629233,25.538373920834 -0.842706070564,25.546783036765 -0.836167352241,25.55557023302 -0.831469612303,25.574422829232 -0.815997686439,25.595331161715 -0.803480434044,25.600116664941 -0.799145465135,25.605938309783 -0.795511637085,25.624274170429 -0.778639669528,25.643684249166 -0.765291178164,25.66199846378 -0.746578716539,25.684069527764 -0.729416808954,25.695116884952 -0.716948820248,25.707106781187 -0.707106781187,25.722578745182 -0.688256117742,25.740643296986 -0.671898434757,25.741420870749 -0.67084970609,25.742443309874 -0.669908898003,25.759868816025 -0.646564519176,25.779036628812 -0.626978413479,25.791025081156 -0.608707338892,25.806464586458 -0.591282395129,25.818147101157 -0.57180350576,25.831469612303 -0.55557023302,25.840754978677 -0.538198534378,25.85340108579 -0.521254819424,25.855197309898 -0.517587764416,25.857492925713 -0.514495755428,25.869526250095 -0.489087825062,25.885213551082 -0.46518487613,25.891824155768 -0.448957762982,25.901390117222 -0.43300791745,25.911410085551 -0.406012945406,25.923879532511 -0.382683432365,25.928122613774 -0.368695975079,25.934993617842 -0.354664538112,25.937541555714 -0.345447624025,25.941389582191 -0.337321292749,25.947924774945 -0.311279325415,25.958238617235 -0.285969845332,25.960764846989 -0.273045418812,25.965612798269 -0.25998446842,25.971542209415 -0.225565191795,25.980785280403 -0.195090322016,25.981717787578 -0.185622417786,25.984413334491 -0.175870369525,25.985676016638 -0.160861150608,25.989109164963 -0.147183761963,25.990374857012 -0.121629699351,25.995376988335 -0.096045047207,25.995371108092 -0.087242273227,25.996945098044 -0.078105515085,25.996359518767 -0.036943767555,26 0,25.999572020933 0.004345344387,25.999959719934 0.00897543923,25.997866662349 0.029455351072,25.998817837225 0.048609958254,25.995254942624 0.072707925728,25.99523780685 0.097476703972,25.994385661567 0.101803307169,25.994319786195 0.10643384227,25.985557545267 0.149872054347,25.981097828286 0.193512406144,25.980865392958 0.194298093996,25.980785280403 0.195090322016,25.974522422658 0.215736688843,25.973688080439 0.218557562609,25.970142500145 0.242535625036,25.962616433313 0.26360105295,25.957826285221 0.287347885566,23.177098224214 9.556438748626,30.529998940003 14.152001695995,30.676573065982 14.263624493626,30.800181850636 14.400242544096,30.896629563934 14.557218535754,30.962642421023 14.729224134665,30.995979706344 14.910420847563,30.995509831641 15.094658201472,30.961248746164 15.275682513043,30.894359395295 15.447349161224,30.797112245965 15.603831157968,30.672808218785 15.739816937314,30.525666642834 15.850690649186,30.360682036347 15.932688838068,30.183454574666 15.983028188321,30 16,20.618032 16,15.894427191 25.4472135955,15.868243399231 25.489363512044,15.845322445013 25.534256458975,15.837249093741 25.544762832549,15.831469612303 25.55557023302,15.813517766841 25.577447866751,15.797188509938 25.603730469351,15.764192060128 25.639836670104,15.733900708082 25.679256763438,15.718866023622 25.692779029672,15.707106781187 25.707106781187,15.689535539553 25.721527831855,15.672882972781 25.739748947239,15.634369047803 25.768776008922,15.597937410914 25.801542795258,15.574712681402 25.815761701535,15.55557023302 25.831469612303,15.54046974181 25.839543133904,15.525731112119 25.850650808352,15.483165918214 25.87180949512,15.441979151448 25.897025322767,15.409915390307 25.909323291975,15.382683432365 25.923879532511,15.371737387165 25.927198902657,15.360729159316 25.932670613678,15.315655498843 25.945476419416,15.271241156999 25.962511420581,15.230395620696 25.97007586139,15.195090322016 25.980785280403,15.189369613183 25.981350320726,15.183479408002 25.983023553553,15.137527978709 25.987274601925,15.091432887621 25.995811240678,15.045263278577 25.995811240678,15 26,14.954734311183 25.995811240678,14.908567112379 25.995811240678,14.86247200239 25.987274598424,14.816520591998 25.983023553553,14.810631845595 25.981350641727,14.804909677984 25.980785280403,14.769596383631 25.970074380622,14.728758843001 25.962511420581,14.684337741084 25.945473826609,14.639270840684 25.932670613678,14.62826496485 25.927199963326,14.617316567635 25.923879532511,14.590078541578 25.909320964566,14.558020848552 25.897025322767,14.516830433463 25.871807261503,14.474268887881 25.850650808352,14.459536619676 25.839547149777,14.44442976698 25.831469612303,14.42528795471 25.815762090982,14.402062589086 25.801542795258,14.365614407706 25.768761128728,14.327117027219 25.739748947239,14.310467592479 25.72152970423,14.292893218813 25.707106781187,14.281142843925 25.692787005185,14.266099291918 25.679256763438,14.235803453957 25.639830832294,14.202811490062 25.603730469351,14.186470361003 25.577427892615,14.168530387697 25.55557023302,14.162762829278 25.544778348745,14.154677554987 25.534256458975,14.131745817097 25.489342391159,14.105572809 25.4472135955,9.381968 16,7.766188802991 16),(2.414215765597 16,9.963197981187 23.548984418813,5.433810141734 16,2.414215765597 16))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()'), 0));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()'), 0))
 GEOMETRYCOLLECTION()
@@ -405,7 +405,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3, ST_BUFFER_STRATEGY(
 POLYGON((5.34 -2.34,0.84 0.2581,0.84 -4.9381,5.34 -2.34))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_circle', 5)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_circle', 5)))
-POLYGON((1005 -1000,1001.5451 -995.2447,995.9549 -997.0611,995.9549 -1002.9389,1001.5451 -1004.7553,1005 -1000))
+POLYGON((1005 -1000,1001.5450849718748 -995.2447174185243,995.9549150281252 -997.0610737385376,995.9549150281252 -1002.9389262614624,1001.5450849718748 -1004.7552825814757,1005 -1000))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 10, ST_BUFFER_STRATEGY('point_circle', 10)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 10, ST_BUFFER_STRATEGY('point_circle', 10)))
 POLYGON((10 0,8.0902 5.8779,3.0902 9.5106,-3.0902 9.5106,-8.0902 5.8779,-10 0,-8.0902 -5.8779,-3.0902 -9.5106,3.0902 -9.5106,8.0902 -5.8779,10 0))
@@ -423,13 +423,13 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0)'), 100
 MULTIPOLYGON(((1100 -1000,1099.2115 -987.4667,1096.8583 -975.131,1092.9776 -963.1875,1087.6307 -951.8246,1080.9017 -941.2215,1072.8969 -931.5453,1063.7424 -922.9487,1053.5827 -915.5672,1042.5779 -909.5173,1030.9017 -904.8943,1018.7381 -901.7713,1006.2791 -900.1973,993.7209 -900.1973,981.2619 -901.7713,969.0983 -904.8943,957.4221 -909.5173,946.4173 -915.5672,936.2576 -922.9487,927.1031 -931.5453,919.0983 -941.2215,912.3693 -951.8246,907.0224 -963.1875,903.1417 -975.131,900.7885 -987.4667,900 -1000,900.7885 -1012.5333,903.1417 -1024.869,907.0224 -1036.8125,912.3693 -1048.1754,919.0983 -1058.7785,927.1031 -1068.4547,936.2576 -1077.0513,946.4173 -1084.4328,957.4221 -1090.4827,969.0983 -1095.1057,981.2619 -1098.2287,993.7209 -1099.8027,1006.2791 -1099.8027,1018.7381 -1098.2287,1030.9017 -1095.1057,1042.5779 -1090.4827,1053.5827 -1084.4328,1063.7424 -1077.0513,1072.8969 -1068.4547,1080.9017 -1058.7785,1087.6307 -1048.1754,1092.9776 -1036.8125,1096.8583 -1024.869,1099.2115 -1012.5333,1100 -1000)),((73.1233 68.1811,72.897 68.4547,63.7425 77.0513,53.5828 84.4328,42.578 90.4827,30.9018 95.1057,18.7382 98.2287,6.2792 99.8027,-6.279 99.8027,-18.738 98.2287,-30.9016 95.1057,-42.5778 90.4827,-53.5826 84.4328,-63.7423 77.0513,-72.8968 68.4547,-80.9016 58.7785,-87.6306 48.1754,-92.9775 36.8125,-96.8582 24.869,-99.2114 12.5333,-99.9999 0,-99.2114 -12.5333,-96.8582 -24.869,-92.9775 -36.8125,-87.6306 -48.1754,-80.9016 -58.7785,-72.8968 -68.4547,-72.1228 -69.1816,-71.8969 -69.4547,-62.7424 -78.0513,-52.5827 -85.4328,-41.5779 -91.4827,-29.9017 -96.1057,-17.7381 -99.2287,-5.2791 -100.8027,7.2791 -100.8027,19.7381 -99.2287,31.9017 -96.1057,43.5779 -91.4827,54.5827 -85.4328,64.7424 -78.0513,73.8969 -69.4547,81.9017 -59.7785,88.6307 -49.1754,93.9776 -37.8125,97.8583 -25.869,100.2115 -13.5333,101 -1,100.2115 11.5333,97.8583 23.869,93.9776 35.8125,88.6307 47.1754,81.9017 57.7785,73.8969 67.4547,73.1233 68.1811)))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)))
-POLYGON((10 5,5 10,0 5,5 0,10 5))
+POLYGON((10 5,4.999999999999999 10,0 4.999999999999999,5 0,10 5))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(5 5,10 10))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(5 5,10 10))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)))
-POLYGON((5 10,0 5,5 0,10 5,15 10,10 15,5 10))
+POLYGON((4.999999999999999 10,0 4.999999999999999,5 0,10 5,15 10,9.999999999999998 15,4.999999999999999 10))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)))
-POLYGON((10 5,5 10,0 5,5 0,10 5))
+POLYGON((10 5,4.999999999999999 10,0 4.999999999999999,5 0,10 5))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(10 10,15 15))'), 5, ST_BUFFER_STRATEGY('point_circle', 20)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(10 10,15 15))'), 5, ST_BUFFER_STRATEGY('point_circle', 20)))
 POLYGON((5 10,3.4549 9.7553,2.0611 9.0451,0.9549 7.9389,0.2447 6.5451,0 5,0.2447 3.4549,0.9549 2.0611,2.0611 0.9549,3.4549 0.2447,5 0,6.5451 0.2447,7.9389 0.9549,9.0451 2.0611,9.7553 3.4549,10 5,11.5451 5.2447,12.9389 5.9549,14.0451 7.0611,14.7553 8.4549,15 10,16.5451 10.2447,17.9389 10.9549,19.0451 12.0611,19.7553 13.4549,20 15,19.7553 16.5451,19.0451 17.9389,17.9389 19.0451,16.5451 19.7553,15 20,13.4549 19.7553,12.0611 19.0451,10.9549 17.9389,10.2447 16.5451,10 15,8.4549 14.7553,7.0611 14.0451,5.9549 12.9389,5.2447 11.5451,5 10))
@@ -441,13 +441,13 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 2, ST_BUFFER_STRATEGY('point_
 POLYGON((-2 -2,2 -2,2 2,-2 2,-2 -2))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3, ST_BUFFER_STRATEGY('point_square')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3, ST_BUFFER_STRATEGY('point_square')))
-POLYGON((-0.66 -5.34,5.34 -5.34,5.34 0.66,-0.66 0.66,-0.66 -5.34))
+POLYGON((-0.6600000000000001 -5.34,5.34 -5.34,5.34 0.6600000000000001,-0.6600000000000001 0.6600000000000001,-0.6600000000000001 -5.34))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_square')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_square')))
 POLYGON((995 -1005,1005 -1005,1005 -995,995 -995,995 -1005))
-SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 10, ST_BUFFER_STRATEGY('point_square')));
-ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 10, ST_BUFFER_STRATEGY('point_square')))
-POLYGON((-10 -10,10 -10,10 10,-10 10,-10 -10))
+SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0.000001)'), 10, ST_BUFFER_STRATEGY('point_square')));
+ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0.000001)'), 10, ST_BUFFER_STRATEGY('point_square')))
+POLYGON((-10 -9.999999,10 -9.999999,10 10.000001,-10 10.000001,-10 -9.999999))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 0,0 0,0 0)'), 5, ST_BUFFER_STRATEGY('point_square')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 0,0 0,0 0)'), 5, ST_BUFFER_STRATEGY('point_square')))
 POLYGON((-5 5,-5 -5,5 -5,5 5,-5 5))
@@ -457,9 +457,9 @@ MULTIPOLYGON(((5 5,15 5,15 15,5 15,5 5)),((15 15,25 15,25 25,15 25,15 15)),((25
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(10 15,15 15,15 10)'), 5, ST_BUFFER_STRATEGY('point_square')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(10 15,15 15,15 10)'), 5, ST_BUFFER_STRATEGY('point_square')))
 POLYGON((10 20,5 20,5 10,10 10,10 5,20 5,20 10,20 15,20 20,15 20,10 20))
-SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0)'), 100, ST_BUFFER_STRATEGY('point_square')));
-ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0)'), 100, ST_BUFFER_STRATEGY('point_square')))
-MULTIPOLYGON(((900 -1100,1100 -1100,1100 -900,900 -900,900 -1100)),((-99 -100,-99 -101,101 -101,101 99,100.0001 99,100.0001 100,-99.9999 100,-99.9999 -100,-99 -100)))
+SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0.000)'), 100, ST_BUFFER_STRATEGY('point_square')));
+ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0.000)'), 100, ST_BUFFER_STRATEGY('point_square')))
+MULTIPOLYGON(((900 -1100,1100 -1100,1100 -900,900 -900,900 -1100)),((-99 -100,-99 -101,101 -101,101 99,100.00012000480018 99,100.0001 100,-99.9999 100,-99.9999 -100,-99 -100)))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_square')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_square')))
 POLYGON((0 0,10 0,10 10,0 10,0 0))
@@ -501,7 +501,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0 0),(2 2,
 POLYGON((292.9 -1707.1,444.4 -1831.5,617.3 -1923.9,804.9 -1980.8,1000 -2000,1195.1 -1980.8,1382.7 -1923.9,1555.6 -1831.5,1707.1 -1707.1,1831.5 -1555.6,1923.9 -1382.7,1980.8 -1195.1,2000 -1000,1980.8 -804.9,1923.9 -617.3,1831.5 -444.4,1707.1 -292.9,736.3 677.9,692.8 725,596.8 805.9,491.3 874.1,378.2 928.5,259.1 968.4,135.9 993,10.7 1002,-114.7 995.2,-238.3 972.7,-358 934.9,-446.4 894.3,-454 891,-455.6 890.1,-472.1 882.5,-542.1 838.9,-562.1 827.1,-566.2 823.9,-578.7 816.1,-630.8 773.8,-661.3 750.1,-667.4 744.1,-676.2 736.9,-711.7 699.7,-750.1 661.3,-757.5 651.8,-763 646.1,-784.3 617.3,-827.1 562.1,-834.9 548.8,-837.6 545.1,-847.7 527.2,-891 454,-898.5 436.7,-899.1 435.6,-901.2 430.4,-940.9 338.7,-975.9 218.1,-995.6 94.1,-999.5 -31.4,-987.7 -156.4,-960.3 -279,-950.8 -305.5,-949.7 -309.8,-942.5 -328.5,-917.8 -397.1,-910.4 -411.5,-904.5 -426.9,-869.2 -492.4,-860.7 -509,-858.4 -512.5,-844.9 -537.5,-772 -639.7,-686.8 -732,-657.5 -756.7,292.9 -1707.1))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5 5,10 10))'), 10, ST_BUFFER_STRATEGY('end_round', 4)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5 5,10 10))'), 10, ST_BUFFER_STRATEGY('end_round', 4)))
-POLYGON((-7.0711 7.0711,-7.0711 -7.0711,7.0711 -7.0711,17.0711 2.9289,17.0711 2.9289,17.0711 17.0711,2.9289 17.0711,-7.0711 7.0711))
+POLYGON((-7.071067811865475 7.071067811865475,-7.071067811865475 -7.0710678118654755,7.071067811865475 -7.071067811865475,17.071067811865476 2.9289321881345254,17.071067811865476 2.9289321881345254,17.071067811865476 17.071067811865476,2.9289321881345254 17.071067811865476,-7.071067811865475 7.071067811865475))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,5 0),(0 0,0 5)))'), 10, ST_BUFFER_STRATEGY('end_round', 10)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,5 0),(0 0,0 5)))'), 10, ST_BUFFER_STRATEGY('end_round', 10)))
 POLYGON((8.7738 8.7738,8.0902 10.8779,3.0902 14.5106,-3.0902 14.5106,-8.0902 10.8779,-10 5,-10 0,-9.5106 -1.5063,-9.5106 -3.0902,-8.5796 -4.3715,-8.0902 -5.8779,-6.8088 -6.8088,-5.8779 -8.0902,-4.3715 -8.5796,-3.0902 -9.5106,-1.5063 -9.5106,0 -10,5 -10,10.8779 -8.0902,14.5106 -3.0902,14.5106 3.0902,10.8779 8.0902,8.7738 8.7738))
@@ -547,7 +547,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,0 5,5 5,5 0,0 0))'), 5
 POLYGON((-45 0,0 0,0 -45,0 -50,5 -50,14.7545 -49.0393,24.1342 -46.194,32.7785 -41.5735,40.3553 -35.3553,46.5735 -27.7785,51.194 -19.1342,54.0393 -9.7545,55 0,55 5,54.0393 14.7545,51.194 24.1342,46.5735 32.7785,40.3553 40.3553,32.7785 46.5735,24.1342 51.194,14.7545 54.0393,5 55,0 55,-9.7545 54.0393,-19.1342 51.194,-27.7785 46.5735,-35.3553 40.3553,-41.5735 32.7785,-46.194 24.1342,-49.0393 14.7545,-50 5,-50 0,-45 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0 0),(0 0,10 10))'), 100, ST_BUFFER_STRATEGY('end_flat')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0 0),(0 0,10 10))'), 100, ST_BUFFER_STRATEGY('end_flat')))
-POLYGON((0 -10,0 -100,10 -100,10 -10,70.7107 -70.7107,80.7107 -60.7107,15 5,80.7107 70.7107,70.7107 80.7107,10 20,10 100,0 100,0 20,-60.7107 80.7107,-70.7107 70.7107,-5 5,-70.7107 -60.7107,-60.7107 -70.7107,0 -10))
+POLYGON((0.0000006494107793741932 -9.99999935058922,0 -100,10 -100,9.99999935058922 -9.99999935058922,70.71067811865474 -70.71067811865474,80.71067811865474 -60.71067811865474,14.999999675294617 4.999999675294617,80.71067811865474 70.71067811865474,70.71067811865474 80.71067811865474,9.99999935058922 19.99999935058922,10 100,0 100,0.0000006494107793741932 19.99999935058922,-60.71067811865474 80.71067811865474,-70.71067811865474 70.71067811865474,-4.999999675294617 5.000000324705383,-70.71067811865474 -60.71067811865474,-60.71067811865474 -70.71067811865474,0.0000006494107793741932 -9.99999935058922))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0001 0),(2 2,4 -9.002))'), 1000, ST_BUFFER_STRATEGY('end_flat')));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0001 0),(2 2,4 -9.002))'), 1000, ST_BUFFER_STRATEGY('end_flat')))
 POLYGON((1707.1068 -292.8932,707.1069 707.1067,2.0002 2,-981.8756 -176.854,-979.8756 -187.856,-11.8904 -11.8906,-707.1067 -707.1067,-706.1068 -708.1068,292.8932 -1707.1067,444.4298 -1831.4696,617.3166 -1923.8795,804.9097 -1980.7853,1000 -2000,1195.0903 -1980.7853,1382.6834 -1923.8795,1555.5702 -1831.4696,1707.1068 -1707.1068,1831.4696 -1555.5703,1923.8795 -1382.6835,1980.7853 -1195.0904,2000 -1000,1980.7853 -804.9097,1923.8795 -617.3166,1831.4696 -444.4298,1707.1068 -292.8932))
@@ -599,7 +599,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0 0),(2 2,
 POLYGON((292.89 -1707.11,387.09 -1790.16,490.96 -1860.74,602.85 -1917.75,721.01 -1960.29,843.57 -1987.69,968.59 -1999.51,1094.11 -1995.56,1218.14 -1975.92,1338.74 -1940.88,1453.99 -1891.01,1562.08 -1827.08,1661.31 -1750.11,1750.11 -1661.31,1827.08 -1562.08,1891.01 -1453.99,1940.88 -1338.74,1975.92 -1218.14,1995.56 -1094.11,1999.51 -968.59,1987.69 -843.57,1960.29 -721.01,1917.75 -602.85,1860.74 -490.96,1790.16 -387.09,1707.11 -292.89,735.31 678.9,720.7 697.32,571.24 824.17,399.9 919.43,213.27 979.43,18.53 1001.86,-176.85 985.88,-194.48 980.85,-195.09 980.79,-201.44 978.86,-365.36 932.08,-379.37 924.88,-382.68 923.88,-415.68 906.24,-539.75 842.54,-549.85 834.53,-555.57 831.47,-609.84 786.93,-693.32 720.7,-699.7 713.19,-707.11 707.11,-772.93 626.91,-820.17 571.24,-823.45 565.34,-831.47 555.57,-895.94 434.96,-915.43 399.9,-916.56 396.37,-923.88 382.68,-972.63 221.96,-975.43 213.27,-975.52 212.44,-980.79 195.09,-1000 0,-980.79 -195.09,-930.55 -360.69,-926.08 -376.36,-925.39 -377.7,-923.88 -382.68,-897.34 -432.34,-836.54 -550.75,-714.7 -704.33,-682.91 -731.3,292.89 -1707.11))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_round', 1)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_round', 1)))
-POLYGON((-1 0,0.7071 -0.7071,5.7071 4.2929,5 6,0 6,-1 5,-1 0))
+POLYGON((-1 0,0.7071067811865475 -0.7071067811865475,5.707106781186548 4.292893218813452,5 6,0 6,-1 5,-1 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'), 5, ST_BUFFER_STRATEGY('join_round', 5)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'), 5, ST_BUFFER_STRATEGY('join_round', 5)))
 POLYGON((-5 0,-3.5355 -3.5355,0 -5,10 -5,13.5355 -3.5355,15 0,15 10,13.5355 13.5355,10 15,0 15,-3.5355 13.5355,-5 10,-5 0))
@@ -697,7 +697,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0 0),(2 2,
 POLYGON((292.9 -1707.1,36355.3 -36355.3,1707.1 -292.9,735.3 678.9,720.7 697.3,571.2 824.2,399.9 919.4,213.3 979.4,18.5 1001.9,-176.9 985.9,-194.5 980.8,-195.1 980.8,-201.3 978.9,-365.4 932.1,-379.4 924.9,-382.7 923.9,-415.6 906.3,-539.8 842.5,-549.9 834.5,-555.6 831.5,-609.9 786.9,-693.3 720.7,-699.7 713.2,-707.1 707.1,-773 626.8,-820.2 571.2,-823.5 565.3,-831.5 555.6,-896 434.8,-915.4 399.9,-916.6 396.4,-923.9 382.7,-972.7 221.7,-975.4 213.3,-975.5 212.5,-980.8 195.1,-1000 0,-980.8 -195.1,-930.6 -360.6,-926.1 -376.4,-925.4 -377.7,-923.9 -382.7,-897.4 -432.2,-836.5 -550.8,-714.7 -704.3,-683 -731.2,292.9 -1707.1))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_miter', 1)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_miter', 1)))
-POLYGON((-1 0,-0.3827 -0.9239,0.7071 -0.7071,5.7071 4.2929,5.9239 5.3827,5 6,0 6,-0.7071 5.7071,-1 5,-1 0))
+POLYGON((-1 0,-0.3826834323650898 -0.9238795325112867,0.7071067811865475 -0.7071067811865475,5.707106781186548 4.292893218813452,5.923879532511287 5.38268343236509,5 6,0 6,-0.7071067811865475 5.707106781186548,-1 5,-1 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'), 5, ST_BUFFER_STRATEGY('join_miter', 5)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'), 5, ST_BUFFER_STRATEGY('join_miter', 5)))
 POLYGON((-5 0,-5 -5,0 -5,10 -5,15 -5,15 0,15 10,15 15,10 15,0 15,-5 15,-5 10,-5 0))
@@ -706,7 +706,7 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((10 10,10 20,20 20,20 10,10 10))'),
 POLYGON((0 10,0 0,10 0,20 0,30 0,30 10,30 20,30 30,20 30,10 30,0 30,0 20,0 10))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((10 0,0 10,-10 0,0 -10,10 0 ))'), 10, ST_BUFFER_STRATEGY('join_miter', 50)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((10 0,0 10,-10 0,0 -10,10 0 ))'), 10, ST_BUFFER_STRATEGY('join_miter', 50)))
-POLYGON((17.0711 -7.0711,24.1421 0,17.0711 7.0711,7.0711 17.0711,0 24.1421,-7.0711 17.0711,-17.0711 7.0711,-24.1421 0,-17.0711 -7.0711,-7.0711 -17.0711,0 -24.1421,7.0711 -17.0711,17.0711 -7.0711))
+POLYGON((17.071067811865476 -7.071067811865475,24.14213562373095 0,17.071067811865476 7.071067811865475,7.071067811865475 17.071067811865476,0 24.14213562373095,-7.071067811865475 17.071067811865476,-17.071067811865476 7.071067811865475,-24.14213562373095 0,-17.071067811865476 -7.071067811865475,-7.071067811865475 -17.071067811865476,0 -24.14213562373095,7.071067811865475 -17.071067811865476,17.071067811865476 -7.071067811865475))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 8,8 8,8 0,0 0),(2 2,6 2,6 6,2 6,2 2))'), 1, ST_BUFFER_STRATEGY('join_miter',60)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 8,8 8,8 0,0 0),(2 2,6 2,6 6,2 6,2 2))'), 1, ST_BUFFER_STRATEGY('join_miter',60)))
 POLYGON((-1 0,-1 -1,0 -1,8 -1,9 -1,9 0,9 8,9 9,8 9,0 9,-1 9,-1 8,-1 0),(3 3,3 5,5 5,5 3,3 3))
@@ -715,10 +715,10 @@ ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,
 POLYGON((-100 0,-100 -100,0 -100,10 -100,110 -100,110 0,110 10,110 110,10 110,0 110,-100 110,-100 10,-100 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))'), 0.5, ST_BUFFER_STRATEGY('join_miter', 1)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))'), 0.5, ST_BUFFER_STRATEGY('join_miter', 1)))
-POLYGON((-0.5 0,-0.1913 -0.4619,0.3536 -0.3536,5.3536 4.6464,5.4619 5.1913,5 5.5,0 5.5,-0.3536 5.3536,-0.5 5,-0.5 0))
+POLYGON((-0.5 0,-0.1913417161825449 -0.46193976625564337,0.35355339059327373 -0.35355339059327373,5.353553390593274 4.646446609406726,5.461939766255643 5.191341716182545,5 5.5,0 5.5,-0.35355339059327373 5.353553390593274,-0.5 5,-0.5 0))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 10,10 0,0 0,0 10)),((0 0,10 10,10 0,0 0)))'), 1, ST_BUFFER_STRATEGY('join_miter', 5)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 10,10 0,0 0,0 10)),((0 0,10 10,10 0,0 0)))'), 1, ST_BUFFER_STRATEGY('join_miter', 5)))
-POLYGON((5 6.4142,0.7071 10.7071,-1 12.4142,-1 10,-1 0.4142,-2.4142 -1,-1 -1,0 -1,10 -1,11 -1,12.4142 -1,11 0.4142,11 10,11 12.4142,9.2929 10.7071,5 6.4142))
+POLYGON((5.000000781186548 6.4142127811865475,0.7071067811865475 10.707106781186548,-1 12.414213562373098,-1 10,-1.0000005720708107 0.4142129903022842,-2.414213562373095 -1,-1 -1,0 -1,10 -1,11 -1,12.414213562373098 -1,11.000000572070812 0.41421299030228437,11 10,11 12.414213562373096,9.292893218813452 10.707106781186548,5.000000781186548 6.4142127811865475))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,0 0)),((10 10,10 15,15 15,10 10)))'), 20, ST_BUFFER_STRATEGY('join_miter', 10)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,0 0)),((10 10,10 15,15 15,10 10)))'), 20, ST_BUFFER_STRATEGY('join_miter', 10)))
 POLYGON((14.1421 -14.1421,24.1421 -4.1421,29.1421 0.8579,58.2843 30,63.2843 35,15 35,10 35,-10 35,-10 30,-20 30,-20 10,-20 0,-20 -48.2843,-10 -38.2843,14.1421 -14.1421))
@@ -757,7 +757,7 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 5,
                                                               'MULTIPOLYGON(((0 0,2 2,4 0,0 0)),((3 3,3 5,5 5,5 3,3 3))))'), 10, ST_BUFFER_STRATEGY('join_miter', 10)));
 ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)),'
                                                               'MULTIPOLYGON(((0 0,2 2,4 0,0 0)),((3 3,3 5,5 5,5 3,3 3))))'), 10, ST_BUFFER_STRATEGY('join_miter', 10))
-POLYGON((-10 4.1421,-24.1421 -10,-10 -10,0 -10,4 -10,5 -10,15 -10,28.1421 -10,15 3.1421,15 5,15 15,5 15,3.1421 15,2 16.1421,0.8579 15,-7 15,-10 15,-10 5,-10 4.1421))
+POLYGON((-10 4.142134872583158,-24.142135623730944 -9.999999999999998,-10 -10,0 -10,4 -10,5 -10,15 -10,28.142135623730937 -9.999999999999998,15 3.14214370333468,15 5,15 15,5 15,3.1421312325051605 15,1.9999999999999973 16.14213562373095,0.8578698010516401 15.000005424782593,-7 15,-10 15,-10 5,-10 4.142134872583158))
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5 5,10 10),'
                                                               'POLYGON((0 0,0 5,5 5,5 0,0 0)),'
                                                               'MULTILINESTRING((0 0,5 5,10 10)),'
diff --git a/mysql-test/suite/gis/r/spatial_utility_function_distance_sphere.result b/mysql-test/suite/gis/r/spatial_utility_function_distance_sphere.result
index f3257b1a0324..794e208a2b2e 100644
--- a/mysql-test/suite/gis/r/spatial_utility_function_distance_sphere.result
+++ b/mysql-test/suite/gis/r/spatial_utility_function_distance_sphere.result
@@ -50,7 +50,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 0)'))
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'))
-20015042.81372
+20015042.813723423
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 90)'))
 10007521.40686
@@ -74,34 +74,34 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-179 -9
 10007521.40686
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'))
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0.0000 -0.000)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0.0000 -0.000)'))
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'))
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 -1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 -1)'))
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 1)'))
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 -1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 -1)'))
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 45)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 45)'))
-10007521.40686
+10007521.406861713
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 -45)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 -45)'))
-10007521.40686
+10007521.406861713
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 45)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 45)'))
-10007521.40686
+10007521.406861713
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 -45)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 -45)'))
-10007521.40686
+10007521.406861713
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('POINT(180 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('POINT(180 90)'))
 0
@@ -128,7 +128,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'))
-20015042.81372
+20015042.813723423
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 90)'))
 10007521.40686
@@ -146,31 +146,31 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(18
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1)'))
-111194.6823
+111194.68229846345
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1,1 0,1 1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1,1 0,1 1)'))
-111194.6823
+111194.68229846345
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('MULTIPOINT(180 -90,-179 90,-179 -90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('MULTIPOINT(180 -90,-179 90,-179 -90)'))
 0.00000000000681
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32)'))
-8478959.24692
+8478959.246920772
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-85 48)'), ST_GEOMFROMTEXT('MULTIPOINT(159 -49)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-85 48)'), ST_GEOMFROMTEXT('MULTIPOINT(159 -49)'))
-15442376.75884
+15442376.75883719
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(168 -21)'), ST_GEOMFROMTEXT('MULTIPOINT(-22 -32)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(168 -21)'), ST_GEOMFROMTEXT('MULTIPOINT(-22 -32)'))
-14026307.89183
+14026307.891828652
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-64 67)'), ST_GEOMFROMTEXT('MULTIPOINT(-103 45,155 57,-166 85)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-64 67)'), ST_GEOMFROMTEXT('MULTIPOINT(-103 45,155 57,-166 85)'))
 2724877.06508
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-36 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-37 45,-49 23,97 -19)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-36 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-37 45,-49 23,97 -19)'))
-7242075.61618
+7242075.616184488
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(138 86)'), ST_GEOMFROMTEXT('MULTIPOINT(15 -79,-110 -76,49 31)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(138 86)'), ST_GEOMFROMTEXT('MULTIPOINT(15 -79,-110 -76,49 31)'))
-6562054.98174
+6562054.981740507
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(164 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-11 2,-81 3,161 62,-119 31)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(164 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-11 2,-81 3,161 62,-119 31)'))
 11240807.17994
@@ -185,7 +185,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(106 76)'), ST_GEOMFROMTEXT('MULTIPOINT
 1623498.34154
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-50 36)'), ST_GEOMFROMTEXT('MULTIPOINT(-32 -64,-116 -35,148 89,-75 16,-99 87,-51 -2,-113 24,93 46,168 53)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-50 36)'), ST_GEOMFROMTEXT('MULTIPOINT(-32 -64,-116 -35,148 89,-75 16,-99 87,-51 -2,-113 24,93 46,168 53)'))
-3325569.68628
+3325569.686282281
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-139 54)'), ST_GEOMFROMTEXT('MULTIPOINT(151 -57,-74 61,10 28,170 -47,97 -45,-5 -82,121 -21,-96 -44,81 -68)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-139 54)'), ST_GEOMFROMTEXT('MULTIPOINT(151 -57,-74 61,10 28,170 -47,97 -45,-5 -82,121 -21,-96 -44,81 -68)'))
 3792274.55936
@@ -197,7 +197,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(0
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'))
-20015042.81372
+20015042.813723423
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 90)'))
 10007521.40686
@@ -218,34 +218,34 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-179 90,0 0,-179 -90)'), ST_GEOMF
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-172 -70)'), ST_GEOMFROMTEXT('POINT(45 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-172 -70)'), ST_GEOMFROMTEXT('POINT(45 90)'))
-17791149.16775
+17791149.16775415
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-157 -67)'), ST_GEOMFROMTEXT('POINT(-92 -88)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-157 -67)'), ST_GEOMFROMTEXT('POINT(-92 -88)'))
-2471277.69445
+2471277.694448198
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(156 -64,-96 57,-15 -18)'), ST_GEOMFROMTEXT('POINT(-73 -1)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(156 -64,-96 57,-15 -18)'), ST_GEOMFROMTEXT('POINT(-73 -1)'))
-6603053.68396
+6603053.68396362
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-110 43,-79 -82,-32 24)'), ST_GEOMFROMTEXT('POINT(61 27)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-110 43,-79 -82,-32 24)'), ST_GEOMFROMTEXT('POINT(61 27)'))
-9099422.92395
+9099422.923953956
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-85 87,-155 48,-163 -84)'), ST_GEOMFROMTEXT('POINT(-95 84)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-85 87,-155 48,-163 -84)'), ST_GEOMFROMTEXT('POINT(-95 84)'))
 343552.51114
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(33 -49,174 -25,-4 -56)'), ST_GEOMFROMTEXT('POINT(48 46)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(33 -49,174 -25,-4 -56)'), ST_GEOMFROMTEXT('POINT(48 46)'))
-10662878.71628
+10662878.71627671
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-36 -87,-75 20,-157 78)'), ST_GEOMFROMTEXT('POINT(-165 18)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-36 -87,-75 20,-157 78)'), ST_GEOMFROMTEXT('POINT(-165 18)'))
-6685828.52361
+6685828.523608761
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(151 17,-150 -43,-165 76,87 53)'), ST_GEOMFROMTEXT('POINT(152 27)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(151 17,-150 -43,-165 76,87 53)'), ST_GEOMFROMTEXT('POINT(152 27)'))
-1116698.09539
+1116698.095391192
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-159 -88,-177 -82,17 76,79 1)'), ST_GEOMFROMTEXT('POINT(35 -74)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-159 -88,-177 -82,17 76,79 1)'), ST_GEOMFROMTEXT('POINT(35 -74)'))
-1995604.71861
+1995604.718606601
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-130 -20,-118 -63,-57 0)'), ST_GEOMFROMTEXT('POINT(-156 89)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-130 -20,-118 -63,-57 0)'), ST_GEOMFROMTEXT('POINT(-156 89)'))
-10024915.226
+10024915.226003662
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-84 25,-52 53,125 -50,-171 51,55 -13,-4 -69)'), ST_GEOMFROMTEXT('POINT(-127 52)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-84 25,-52 53,125 -50,-171 51,55 -13,-4 -69)'), ST_GEOMFROMTEXT('POINT(-127 52)'))
 3000854.92226
@@ -256,7 +256,7 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-6 -56,-73 54,20 -74,-160
 ST_GEOMFROMTEXT('POINT(167 -17)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-6 -56,-73 54,20 -74,-160 72,-4 42,-120 -62,-54 -8,-85 48,159 -49,100 -75)'),
 ST_GEOMFROMTEXT('POINT(167 -17)'))
-3630973.43292
+3630973.4329214436
 #####################################################################################
 # ST_DISTANCE_SPHERE(multipoint, multipoint)
 #####################################################################################
@@ -265,7 +265,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOI
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'))
-20015042.81372
+20015042.813723423
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 90)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 90)'))
 10007521.40686
@@ -286,7 +286,7 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-179 90,0 0)'), ST_GEOMFROMTEXT('
 10007521.40686
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(111 11,11 1)'), ST_GEOMFROMTEXT('MULTIPOINT(1 11,11 11)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(111 11,11 1)'), ST_GEOMFROMTEXT('MULTIPOINT(1 11,11 11)'))
-1111946.82298
+1111946.8229846344
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(10 10,20 20,30 30)'), ST_GEOMFROMTEXT('MULTIPOINT(15 15,20 20,25 25)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(10 10,20 20,30 30)'), ST_GEOMFROMTEXT('MULTIPOINT(15 15,20 20,25 25)'))
 0
@@ -295,25 +295,25 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-10 -10,-20 -20,-30 -30)'), ST_GE
 0
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-150 -79)'), ST_GEOMFROMTEXT('MULTIPOINT(145 -2)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-150 -79)'), ST_GEOMFROMTEXT('MULTIPOINT(145 -2)'))
-9274204.82069
+9274204.820691504
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(164 -37)'), ST_GEOMFROMTEXT('MULTIPOINT(67 59)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(164 -37)'), ST_GEOMFROMTEXT('MULTIPOINT(67 59)'))
 13840477.43111
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(135 62)'), ST_GEOMFROMTEXT('MULTIPOINT(-116 -22)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(135 62)'), ST_GEOMFROMTEXT('MULTIPOINT(-116 -22)'))
-13142652.16581
+13142652.165808784
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-123 85)'), ST_GEOMFROMTEXT('MULTIPOINT(-54 -40)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-123 85)'), ST_GEOMFROMTEXT('MULTIPOINT(-54 -40)'))
 14239014.67884
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(152 43)'), ST_GEOMFROMTEXT('MULTIPOINT(106 76,53 20,148 -40)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(152 43)'), ST_GEOMFROMTEXT('MULTIPOINT(106 76,53 20,148 -40)'))
-4260092.91225
+4260092.912246835
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-177 -88,-165 9,153 40,2 17)'), ST_GEOMFROMTEXT('MULTIPOINT(-150 -4)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-177 -88,-165 9,153 40,2 17)'), ST_GEOMFROMTEXT('MULTIPOINT(-150 -4)'))
-2203222.52073
+2203222.520729071
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(154 84,-124 37,17 50)'), ST_GEOMFROMTEXT('MULTIPOINT(42 34)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(154 84,-124 37,17 50)'), ST_GEOMFROMTEXT('MULTIPOINT(42 34)'))
-2703109.65924
+2703109.6592360293
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(88 -65,49 85,68 77)'), ST_GEOMFROMTEXT('MULTIPOINT(125 82,-83 -5,3 -40)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(88 -65,49 85,68 77)'), ST_GEOMFROMTEXT('MULTIPOINT(125 82,-83 -5,3 -40)'))
 926947.16374
@@ -325,13 +325,13 @@ ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-140 -63,103 -42,160 -53)'), ST_G
 2653984.28106
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(137 -65,-63 13,38 9)'), ST_GEOMFROMTEXT('MULTIPOINT(-166 -35,107 -18,-83 -18,91 -24)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(137 -65,-63 13,38 9)'), ST_GEOMFROMTEXT('MULTIPOINT(-166 -35,107 -18,-83 -18,91 -24)'))
-4086108.70333
+4086108.7033282355
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-128 90,90 -17,-176 -37,40 -78,156 -82,37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32,-3 22,24 -88)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-128 90,90 -17,-176 -37,40 -78,156 -82,37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32,-3 22,24 -88)'))
-1051350.22799
+1051350.22798656
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(87 -12,-25 31,-47 23,134 83,120 69,39 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-9 -4,-171 -82,140 -26)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(87 -12,-25 31,-47 23,134 83,120 69,39 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-9 -4,-171 -82,140 -26)'))
-4245876.62671
+4245876.626705522
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-119 50,28 22,-122 -74)'), ST_GEOMFROMTEXT('MULTIPOINT(134 14,-32 -84,96 74,44 59,-88 73,-136 12)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-119 50,28 22,-122 -74)'), ST_GEOMFROMTEXT('MULTIPOINT(134 14,-32 -84,96 74,44 59,-88 73,-136 12)'))
 1897030.29194
@@ -339,7 +339,7 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-144 73,81 61,-78 4,50 -28
 ST_GEOMFROMTEXT('MULTIPOINT(-176 48,-154 -39,-140 -60,135 72,-97 28,-35 69)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-144 73,81 61,-78 4,50 -28)'),
 ST_GEOMFROMTEXT('MULTIPOINT(-176 48,-154 -39,-140 -60,135 72,-97 28,-35 69)'))
-2505975.11098
+2505975.110979326
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-14 49)'),
 ST_GEOMFROMTEXT('MULTIPOINT(-160 -51,-141 72,50 -30,96 -64,-41 -59,-128 -28,0 -77,179 -78,-84 -67)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-14 49)'),
@@ -349,39 +349,39 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-165 61,-43 -47,-89 40,-13
 ST_GEOMFROMTEXT('MULTIPOINT(63 39,98 14,-123 79,-30 -27)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-165 61,-43 -47,-89 40,-137 -64,11 26,-8 -31,28 -77,37 -44,124 51)'),
 ST_GEOMFROMTEXT('MULTIPOINT(63 39,98 14,-123 79,-30 -27)'))
-2181430.45408
+2181430.45407528
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(11 -38,-17 54,-104 73)'),
 ST_GEOMFROMTEXT('MULTIPOINT(167 -50,103 -21,-122 24,-122 80,-41 37,-175 -25,-155 48,-23 -34,-105 48)'));
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(11 -38,-17 54,-104 73)'),
 ST_GEOMFROMTEXT('MULTIPOINT(167 -50,103 -21,-122 24,-122 80,-41 37,-175 -25,-155 48,-23 -34,-105 48)'))
-898973.28964
+898973.2896405652
 #####################################################################################
 # ST_DISTANCE_SPHERE with different earth radius value
 #####################################################################################
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1)
-0.02468
+0.024682056391766436
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 10);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 10)
-0.24682
+0.24682056391766435
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 100);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 100)
-2.46821
+2.468205639176644
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 2000);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 2000)
-49.36411
+49.364112783532875
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567)
-30471.65231
+30471.652313413913
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370986);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370986)
-157249.03572
+157249.0357231545
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370987);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370987)
-157249.06041
+157249.06040521088
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567890);
 ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567890)
-30471674.28044
+30471674.280444104
 #####################################################################################
 # Invalid function calls
 #####################################################################################
diff --git a/mysql-test/suite/gis/t/gis_bugs_crashes.test b/mysql-test/suite/gis/t/gis_bugs_crashes.test
index b7037718b9d1..df3f91af5956 100644
--- a/mysql-test/suite/gis/t/gis_bugs_crashes.test
+++ b/mysql-test/suite/gis/t/gis_bugs_crashes.test
@@ -1272,7 +1272,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_of_elems), 1));
 
 SET @buf = ST_BUFFER(ST_GEOMFROMTEXT(@star_of_elems), 1);
 
---replace_numeric_round 4
 SELECT st_area(@buf);
 
 --replace_numeric_round 4
@@ -1284,7 +1283,6 @@ SELECT ST_ASTEXT(ST_CENTROID(@buf));
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_CONVEXHULL(@buf));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_ENVELOPE(@buf));
 
 SELECT ST_DISTANCE(ST_GEOMFROMTEXT(@star_of_elems),ST_GEOMFROMTEXT(@star_top)) as result;
@@ -2389,13 +2387,10 @@ SELECT ST_ASTEXT(
 --echo # BUG#20510359 : ST_BUFFER() RETURNS NULL INSTEAD OF AN EMPTY GEOMETRY
 --echo ######################################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0))'), -10));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0))'), -8));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,10 0,10 10,0 10,0 0))'), -6));
 
 --echo ######################################################################################################
@@ -2418,7 +2413,6 @@ SELECT ST_ASTEXT(ST_BUFFER(0x010100000002000000000000000000000000000000, 1));
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('LINESTRING(0 0,10 10,10 0,0 10)'), 20, ST_BUFFER_STRATEGY('end_flat')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,10 10),(10 0,0 10))'), 50, ST_BUFFER_STRATEGY('end_flat')));
 
 --echo ######################################################################################################
diff --git a/mysql-test/suite/gis/t/spatial_analysis_functions_buffer.test b/mysql-test/suite/gis/t/spatial_analysis_functions_buffer.test
index 948f53756289..a1ebcb886c2c 100644
--- a/mysql-test/suite/gis/t/spatial_analysis_functions_buffer.test
+++ b/mysql-test/suite/gis/t/spatial_analysis_functions_buffer.test
@@ -77,10 +77,8 @@ SELECT count(ST_ASTEXT(g) != 'NULL') FROM gis_geometrycollection;
 --echo # ST_BUFFER(point, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_center), 0));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_top), 1));
 
 --replace_numeric_round 4
@@ -89,7 +87,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(-0 0)'), 2));
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5));
 
 --replace_numeric_round 4
@@ -102,7 +99,6 @@ SELECT ST_ASTEXT(ST_BUFFER(g, 100)) FROM gis_geometrycollection WHERE fid=105;
 --echo # ST_BUFFER(multipoint, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_all_points), 0));
 
 --replace_numeric_round 4
@@ -124,10 +120,8 @@ SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=108;
 --echo # ST_BUFFER(linestring, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_top_to_center), 0));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_line_horizontal), 1));
 
 --replace_numeric_round 4
@@ -146,7 +140,6 @@ SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=110;
 --echo # ST_BUFFER(multilinestring, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_lines_near_vertical), 0));
 
 --replace_numeric_round 4
@@ -171,7 +164,6 @@ SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=114;
 --echo # ST_BUFFER(polygon, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star), 0));
 
 --replace_numeric_round 4
@@ -214,29 +206,23 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))')
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'), -3));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'), -5));
 
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2),(6 6,6 8,8 8,8 6,6 6))'), -1));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2),(6 6,6 8,8 8,8 6,6 6))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2),(6 6,6 8,8 8,8 6,6 6))'), -3));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2),(6 6,6 8,8 8,8 6,6 6))'), -5));
 
 --echo #####################################################################################
 --echo # ST_BUFFER(multipolygon, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_of_elems), 0));
 
 --replace_numeric_round 4
@@ -257,7 +243,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,0 10,10 10,10 0,0 0)))'), 5));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((4 4,4 6,6 6,6 4,4 4),(0 0,0 10,10 10,10 0,0 0)))'), 5));
 
 --replace_numeric_round 4
@@ -273,66 +258,50 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,0 10,10 10,10 0,0 0)),'
                                                         '((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6, 4 4)))'), 1000));
 
---replace_numeric_round 4
+--replace_numeric_round 12
 SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=103;
 
 # ST_Buffer() with negative distance value
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))'), -5));
 
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), -3));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((14 14,14 16,16 16,16 14,14 14)))'), -1));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((14 14,14 16,16 16,16 14,14 14)))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((14 14,14 16,16 16,16 14,14 14)))'), -4));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((14 14,14 16,16 16,16 14,14 14)))'), -5));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((14 14,14 16,16 16,16 14,14 14)))'), -10));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10)))'), -1));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10)))'), -3));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10)))'), -5));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10)))'), -10));
 
 --echo #####################################################################################
 --echo # ST_BUFFER(geometrycollection, distance)
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_collection_elems), 0));
 
---replace_numeric_round 4
+--replace_numeric_round 12
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT(@star_collection_multilinestr), 1));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION()'), 0));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION())'), 10));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(GEOMETRYCOLLECTION()))'), 100));
 
 # area check used because of the differences on various platforms
@@ -353,7 +322,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,0
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,0 10,10 10),GEOMETRYCOLLECTION())'), 10));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(10 10),'
                                                               'MULTIPOINT(0 0,10 10),'
                                                               'LINESTRING(1 1,2 2,3 3),'
@@ -400,28 +368,20 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTIO
 SELECT ST_ASTEXT(ST_BUFFER(g, 20)) FROM gis_geometrycollection WHERE fid=115;
 
 # ST_Buffer() with negative distance value
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)))'), -5));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10))))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10))))'), -10));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)), POLYGON((10 10,10 20,20 20,20 10,10 10)))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)), POLYGON((10 10,10 20,20 20,20 10,10 10)))'), -5));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)), MULTIPOLYGON(((10 10,10 20,20 20,20 10,10 10))))'), -2));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 10,10 10,10 0,0 0)), MULTIPOLYGON(((10 10,10 20,20 20,20 10,10 10))))'), -10));
 
 ############################################################################################
@@ -441,7 +401,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 2, ST_BUFFER_STRATEGY(
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3, ST_BUFFER_STRATEGY('point_circle', 3)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_circle', 5)));
 
 --replace_numeric_round 4
@@ -459,13 +418,10 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(10 15,15 15,15 10)'), 5,
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0.000)'), 100, ST_BUFFER_STRATEGY('point_circle', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(5 5,10 10))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_circle', 4)));
 
 --replace_numeric_round 4
@@ -475,40 +431,28 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIP
 --echo # ST_BUFFER() with 'point_square' strategy
 --echo #####################################################################################
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0)'), 2, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(2.34 -2.34)'), 3, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(1000 -1000)'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POINT(0 0.000001)'), 10, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(0 0,0 0,0 0,0 0)'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(10 10,20 20,30 30)'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(10 15,15 15,15 10)'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOINT(1 -1,1000 -1000,0.0001 0.000)'), 100, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTIPOINT(5 5,10 10))'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(5 5))'), 5, ST_BUFFER_STRATEGY('point_square')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(5 5),MULTIPOINT(10 10,15 15))'), 5, ST_BUFFER_STRATEGY('point_square')));
 
 --echo #####################################################################################
@@ -539,7 +483,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0
 --replace_numeric_round 1
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0001 0.000),(2 2,4 -9.002))'), 1000, ST_BUFFER_STRATEGY('end_round', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5 5,10 10))'), 10, ST_BUFFER_STRATEGY('end_round', 4)));
 
 --replace_numeric_round 4
@@ -583,7 +526,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,-0.00 0),(0.0 0
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 0,0 5,5 5,5 0,0 0))'), 50, ST_BUFFER_STRATEGY('end_flat')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0 0),(0 0,10 10))'), 100, ST_BUFFER_STRATEGY('end_flat')));
 
 --replace_numeric_round 4
@@ -592,7 +534,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5 5,10 10))'), 10, ST_BUFFER_STRATEGY('end_flat')));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,5 0),(0 0,0 5)))'), 10, ST_BUFFER_STRATEGY('end_flat')));
 
 --replace_numeric_round 4
@@ -633,7 +574,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0
 --replace_numeric_round 2
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0001 0.000),(2 2,4 -9.002))'), 1000, ST_BUFFER_STRATEGY('join_round', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_round', 1)));
 
 --replace_numeric_round 4
@@ -673,7 +613,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,5 0),(0 0,0 5)))'), 10, ST_BUFFER_STRATEGY('join_round', 10)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)))'), 10, ST_BUFFER_STRATEGY('join_round', 4)));
 
 --replace_numeric_round 4
@@ -727,28 +666,20 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((0 10,10 0),(10 0,0
 --replace_numeric_round 1
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTILINESTRING((1 -1,1000 -1000,0.0001 0.000),(2 2,4 -9.002))'), 1000, ST_BUFFER_STRATEGY('join_miter', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 5,5 5,0 0))'), 1, ST_BUFFER_STRATEGY('join_miter', 1)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0))'), 5, ST_BUFFER_STRATEGY('join_miter', 5)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((10 10,10 20,20 20,20 10,10 10))'), 10, ST_BUFFER_STRATEGY('join_miter', 10)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((10 0,0 10,-10 0,0 -10,10 0 ))'), 10, ST_BUFFER_STRATEGY('join_miter', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 8,8 8,8 0,0 0),(2 2,6 2,6 6,2 6,2 2))'), 1, ST_BUFFER_STRATEGY('join_miter',60)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4))'), 100, ST_BUFFER_STRATEGY('join_miter', 60)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 5,5 5,0 0)))'), 0.5, ST_BUFFER_STRATEGY('join_miter', 1)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 10,10 0,0 0,0 10)),((0 0,10 10,10 0,0 0)))'), 1, ST_BUFFER_STRATEGY('join_miter', 5)));
 
 --replace_numeric_round 4
@@ -757,7 +688,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,0 0)),
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((4 4,4 6,6 6,6 4, 4 4)))'), 4, ST_BUFFER_STRATEGY('join_miter', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(4 4,4 6,6 6,6 4,4 4)))'), 4, ST_BUFFER_STRATEGY('join_miter', 60)));
 
 --replace_numeric_round 4
@@ -766,7 +696,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5
 --replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0 0,5 0),(0 0,0 5)))'), 10, ST_BUFFER_STRATEGY('join_miter', 10)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)))'), 10, ST_BUFFER_STRATEGY('join_miter', 4)));
 
 --replace_numeric_round 4
@@ -782,7 +711,6 @@ SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(0 0,5
                                                               'MULTILINESTRING((0 0,5 5,10 10)),'
                                                               'MULTILINESTRING((0 0,10 0),(0 0,-10 0)))'), 10, ST_BUFFER_STRATEGY('join_miter', 50)));
 
---replace_numeric_round 4
 SELECT ST_ASTEXT(ST_BUFFER(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POLYGON((0 0,0 5,5 5,5 0,0 0)),'
                                                               'MULTIPOLYGON(((0 0,2 2,4 0,0 0)),((3 3,3 5,5 5,5 3,3 3))))'), 10, ST_BUFFER_STRATEGY('join_miter', 10)));
 
diff --git a/mysql-test/suite/gis/t/spatial_utility_function_distance_sphere.test b/mysql-test/suite/gis/t/spatial_utility_function_distance_sphere.test
index e7a29c8fa36e..051054efa8df 100644
--- a/mysql-test/suite/gis/t/spatial_utility_function_distance_sphere.test
+++ b/mysql-test/suite/gis/t/spatial_utility_function_distance_sphere.test
@@ -74,7 +74,6 @@ SELECT count(ST_ASTEXT(g) != 'NULL') FROM gis_geometrycollection;
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 0)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'));
 
 --replace_numeric_round 5
@@ -98,33 +97,24 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-179 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(0.0000 -0.000)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 -1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-1 -1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 45)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(90 -45)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 45)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(-90 -45)'));
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('POINT(180 90)'));
@@ -147,7 +137,6 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-179.9 -90)'), ST_GEOMFROMTEXT(
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 0)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'));
 
 --replace_numeric_round 5
@@ -162,31 +151,24 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIP
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 90,0 0,-179 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 1,1 0,1 1)'));
 
 --replace_numeric_round 14
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(180 90)'), ST_GEOMFROMTEXT('MULTIPOINT(180 -90,-179 90,-179 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-85 48)'), ST_GEOMFROMTEXT('MULTIPOINT(159 -49)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(168 -21)'), ST_GEOMFROMTEXT('MULTIPOINT(-22 -32)'));
 
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-64 67)'), ST_GEOMFROMTEXT('MULTIPOINT(-103 45,155 57,-166 85)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-36 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-37 45,-49 23,97 -19)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(138 86)'), ST_GEOMFROMTEXT('MULTIPOINT(15 -79,-110 -76,49 31)'));
 
 --replace_numeric_round 5
@@ -201,7 +183,6 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(168 -15)'), ST_GEOMFROMTEXT('MU
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(106 76)'), ST_GEOMFROMTEXT('MULTIPOINT(53 20,148 -40,-61 -90,170 -37,-64 -82,-167 85)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-50 36)'), ST_GEOMFROMTEXT('MULTIPOINT(-32 -64,-116 -35,148 89,-75 16,-99 87,-51 -2,-113 24,93 46,168 53)'));
 
 --replace_numeric_round 5
@@ -213,7 +194,6 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-139 54)'), ST_GEOMFROMTEXT('MU
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(0 0)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('POINT(180 0)'));
 
 --replace_numeric_round 5
@@ -231,34 +211,25 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-179 90,0 0,-179 -90)'), S
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-179 90,0 0,-179 -90)'), ST_GEOMFROMTEXT('POINT(-179 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-172 -70)'), ST_GEOMFROMTEXT('POINT(45 90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-157 -67)'), ST_GEOMFROMTEXT('POINT(-92 -88)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(156 -64,-96 57,-15 -18)'), ST_GEOMFROMTEXT('POINT(-73 -1)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-110 43,-79 -82,-32 24)'), ST_GEOMFROMTEXT('POINT(61 27)'));
 
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-85 87,-155 48,-163 -84)'), ST_GEOMFROMTEXT('POINT(-95 84)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(33 -49,174 -25,-4 -56)'), ST_GEOMFROMTEXT('POINT(48 46)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-36 -87,-75 20,-157 78)'), ST_GEOMFROMTEXT('POINT(-165 18)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(151 17,-150 -43,-165 76,87 53)'), ST_GEOMFROMTEXT('POINT(152 27)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-159 -88,-177 -82,17 76,79 1)'), ST_GEOMFROMTEXT('POINT(35 -74)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-130 -20,-118 -63,-57 0)'), ST_GEOMFROMTEXT('POINT(-156 89)'));
 
 --replace_numeric_round 5
@@ -267,7 +238,6 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-84 25,-52 53,125 -50,-171
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(56 -45,158 84,112 2,85 21,88 89,-151 33,-158 40)'), ST_GEOMFROMTEXT('POINT(-172 87)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-6 -56,-73 54,20 -74,-160 72,-4 42,-120 -62,-54 -8,-85 48,159 -49,100 -75)'),
                           ST_GEOMFROMTEXT('POINT(167 -17)'));
 
@@ -277,7 +247,6 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-6 -56,-73 54,20 -74,-160
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(0 0)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0)'));
 
 --replace_numeric_round 5
@@ -295,32 +264,26 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(180 0,0 0)'), ST_GEOMFROMT
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-179 90,0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(-179 0,0 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(111 11,11 1)'), ST_GEOMFROMTEXT('MULTIPOINT(1 11,11 11)'));
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(10 10,20 20,30 30)'), ST_GEOMFROMTEXT('MULTIPOINT(15 15,20 20,25 25)'));
 
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-10 -10,-20 -20,-30 -30)'), ST_GEOMFROMTEXT('MULTIPOINT(180 0,-30 -30,180 -90)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-150 -79)'), ST_GEOMFROMTEXT('MULTIPOINT(145 -2)'));
 
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(164 -37)'), ST_GEOMFROMTEXT('MULTIPOINT(67 59)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(135 62)'), ST_GEOMFROMTEXT('MULTIPOINT(-116 -22)'));
 
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-123 85)'), ST_GEOMFROMTEXT('MULTIPOINT(-54 -40)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(152 43)'), ST_GEOMFROMTEXT('MULTIPOINT(106 76,53 20,148 -40)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-177 -88,-165 9,153 40,2 17)'), ST_GEOMFROMTEXT('MULTIPOINT(-150 -4)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(154 84,-124 37,17 50)'), ST_GEOMFROMTEXT('MULTIPOINT(42 34)'));
 
 --replace_numeric_round 5
@@ -332,19 +295,15 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(174 59,91 24,26 28)'), ST_
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-140 -63,103 -42,160 -53)'), ST_GEOMFROMTEXT('MULTIPOINT(-78 -80,-133 -24,73 -15)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(137 -65,-63 13,38 9)'), ST_GEOMFROMTEXT('MULTIPOINT(-166 -35,107 -18,-83 -18,91 -24)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-128 90,90 -17,-176 -37,40 -78,156 -82,37 -42)'), ST_GEOMFROMTEXT('MULTIPOINT(57 32,-3 22,24 -88)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(87 -12,-25 31,-47 23,134 83,120 69,39 -41)'), ST_GEOMFROMTEXT('MULTIPOINT(-9 -4,-171 -82,140 -26)'));
 
 --replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-119 50,28 22,-122 -74)'), ST_GEOMFROMTEXT('MULTIPOINT(134 14,-32 -84,96 74,44 59,-88 73,-136 12)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-144 73,81 61,-78 4,50 -28)'),
                           ST_GEOMFROMTEXT('MULTIPOINT(-176 48,-154 -39,-140 -60,135 72,-97 28,-35 69)'));
 
@@ -352,11 +311,9 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-144 73,81 61,-78 4,50 -28
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-14 49)'),
                           ST_GEOMFROMTEXT('MULTIPOINT(-160 -51,-141 72,50 -30,96 -64,-41 -59,-128 -28,0 -77,179 -78,-84 -67)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(-165 61,-43 -47,-89 40,-137 -64,11 26,-8 -31,28 -77,37 -44,124 51)'),
                           ST_GEOMFROMTEXT('MULTIPOINT(63 39,98 14,-123 79,-30 -27)'));
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(11 -38,-17 54,-104 73)'),
                           ST_GEOMFROMTEXT('MULTIPOINT(167 -50,103 -21,-122 24,-122 80,-41 37,-175 -25,-155 48,-23 -34,-105 48)'));
 
@@ -364,28 +321,20 @@ SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(11 -38,-17 54,-104 73)'),
 --echo # ST_DISTANCE_SPHERE with different earth radius value
 --echo #####################################################################################
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 10);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 100);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 2000);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370986);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 6370987);
 
---replace_numeric_round 5
 SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'), 1234567890);
 
 --echo #####################################################################################
diff --git a/mysql-test/suite/innodb/include/show_last_deadlock.inc b/mysql-test/suite/innodb/include/show_last_deadlock.inc
new file mode 100644
index 000000000000..db496afb114f
--- /dev/null
+++ b/mysql-test/suite/innodb/include/show_last_deadlock.inc
@@ -0,0 +1,20 @@
+DELIMITER !;
+
+replace_regex
+  /TRANSACTIONS.*//
+  /.*LATEST DETECTED DEADLOCK//
+  /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/%DATE%/
+  /0x[0-9a-f]+/%HEXADECIMAL%/
+  /thread handle [0-9]+/thread handle %NUMBER%/
+  /\b[0-9]+ sec\b/%NUMBER% sec/
+  /heap size [0-9]+/heap size %NUMBER%/
+  /thread id [0-9]+/thread id %NUMBER%/
+  /TRANSACTION [0-9]+/TRANSACTION %NUMBER%/
+  /hex [0-9a-f]+/hex %HEXADECIMAL%/
+  /query id [0-9]+ ([^ ]+|[^ ]+ [^ ]+) [^ ]+ statistics/query id %NUMBER% %ADDRESS% %USER% statistics/
+  /trx id [0-9]+/trx id %NUMBER%/
+  /asc [^;]*;;;?([^;])/asc %ASC%;;\1/
+  /space id [0-9]+/space id %NUMBER%/
+!
+SHOW ENGINE INNODB STATUS!
+DELIMITER ;!
diff --git a/mysql-test/suite/innodb/r/alter_row_format.result b/mysql-test/suite/innodb/r/alter_row_format.result
new file mode 100644
index 000000000000..578f8f34d99f
--- /dev/null
+++ b/mysql-test/suite/innodb/r/alter_row_format.result
@@ -0,0 +1,39 @@
+#
+# Bug #32507117	INDEX SIZE LARGER THAN 767 BYTES ALLOWED FOR INNODB WITH REDUNDANT ROW_FORMAT
+#
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+set global innodb_default_row_format='redundant';
+CREATE TABLE `t1` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+`comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
+NULL DEFAULT '',
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `t2` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+`comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
+NULL DEFAULT '',
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+insert into t1(comment) values('k');
+insert into t2(comment) values('k');
+create index idx123 on t1 (`comment`);
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+set global innodb_default_row_format='dynamic';
+create index idx123 on t1 (`comment`);
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+alter table t1 add index idx123 (`comment`);
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+alter table t1 add index idx123 (`comment`), algorithm=copy ;
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t1';
+ROW_FORMAT
+Dynamic
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t2';
+ROW_FORMAT
+Redundant
+alter table t2 ROW_FORMAT=dynamic;
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t2';
+ROW_FORMAT
+Dynamic
+drop table t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/mysql-test/suite/innodb/r/analyze_index.result b/mysql-test/suite/innodb/r/analyze_index.result
new file mode 100644
index 000000000000..6f99dffbc029
--- /dev/null
+++ b/mysql-test/suite/innodb/r/analyze_index.result
@@ -0,0 +1,14 @@
+#
+# Bug #30607708	IF ANALYZE TABLE RUNS MORE THAN 600 SECONDS DIAGNOSTIC QUERY MAY CRASH SERVER
+#
+CREATE TABLE t1(a int, index inda(a)) ENGINE=INNODB;
+INSERT INTO t1 VALUES(1);
+SET DEBUG_SYNC='innodb_dict_stats_update_persistent SIGNAL analyze.running WAIT_FOR analyze.finish';
+ANALYZE TABLE t1;
+SET DEBUG_SYNC='now WAIT_FOR analyze.running';
+SELECT ENGINE,SUM(DATA_LENGTH+INDEX_LENGTH),COUNT(ENGINE),SUM(DATA_LENGTH),SUM(INDEX_LENGTH) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema', 'performance_schema', 'mysql') AND ENGINE='InnoDB';
+SET DEBUG_SYNC='now SIGNAL analyze.finish';
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET DEBUG_SYNC= 'RESET';
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/bulk_create_index_online.result b/mysql-test/suite/innodb/r/bulk_create_index_online.result
index 3aae78d5970d..a804f601ed94 100644
--- a/mysql-test/suite/innodb/r/bulk_create_index_online.result
+++ b/mysql-test/suite/innodb/r/bulk_create_index_online.result
@@ -18,3 +18,20 @@ c1	c2
 5	5
 6	6
 DROP TABLE t1;
+CREATE TABLE parent (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO parent VALUES(1,2),(2,2);
+CREATE TABLE child (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO child VALUES (10, 2);
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create
+WAIT_FOR go_ahead';
+CREATE UNIQUE INDEX idx ON parent(b);;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+INSERT INTO parent VALUES(4, 2);
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+ERROR 23000: Duplicate entry '2' for key 'idx'
+SET DEBUG_SYNC = 'now SIGNAL conn_add_fk';
+SET DEBUG_SYNC = 'now WAIT_FOR conn_add_fk';
+ALTER TABLE child ADD CONSTRAINT cfx FOREIGN KEY (b) REFERENCES parent(b);
+ERROR HY000: Cannot add foreign key constraint
+DROP TABLE child;
+DROP TABLE parent;
diff --git a/mysql-test/suite/innodb/r/create_table.result b/mysql-test/suite/innodb/r/create_table.result
index 653301f2792f..edd1460c84a4 100644
--- a/mysql-test/suite/innodb/r/create_table.result
+++ b/mysql-test/suite/innodb/r/create_table.result
@@ -17,3 +17,26 @@ SET DEBUG ='+d, simulate_max_char_col';
 create table t1(f1 varchar(1000))engine=innodb;
 ERROR HY000: Got error 1005 from storage engine
 SET DEBUG ='-d, simulate_max_char_col';
+#
+# Bug #27361662  ERROR NOT THROWN ON CREATING TEMPORARY TABLE IN
+# INNODB_FILE_PER_TABLE TABLESPACE
+#
+"Try creating temporary table with innodb_file_per_table option with STRICT mode"
+SET innodb_strict_mode = ON;
+CREATE TEMPORARY TABLE t1(c1 int) TABLESPACE innodb_file_per_table;
+ERROR HY000: InnoDB: TABLESPACE=innodb_file_per_table option is disallowed for temporary tables with INNODB_STRICT_NODE=ON. This option is deprecated and will be removed in a future release
+SELECT COUNT(*) FROM t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+"Try creating temporary table with innodb_file_per_table option without STRICT mode"
+SET innodb_strict_mode = OFF;
+CREATE TEMPORARY TABLE t1(c1 int) TABLESPACE innodb_file_per_table;
+Warnings:
+Warning	1478	InnoDB: TABLESPACE=innodb_file_per_table option is ignored. This option is deprecated and will be removed in a future release.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: TABLESPACE=innodb_file_per_table option is ignored. This option is deprecated and will be removed in a future release.
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+DROP TABLE t1;
+SET innodb_strict_mode = default;
diff --git a/mysql-test/suite/innodb/r/create_tablespace.result b/mysql-test/suite/innodb/r/create_tablespace.result
index 030c9cb21616..ff66a067b291 100644
--- a/mysql-test/suite/innodb/r/create_tablespace.result
+++ b/mysql-test/suite/innodb/r/create_tablespace.result
@@ -1311,7 +1311,69 @@ Level	Code	Message
 Error	1478	InnoDB: Tablespace `innodb_temporary` can only contain TEMPORARY tables.
 Error	1478	Table storage engine 'InnoDB' does not support the create option 'TABLESPACE'
 DROP TABLE t_not_temp;
+#
+# Try to create or move a temporary table in innodb_file_per_table
+# or innodb_temporary tablespaces with STRICT_MODE ON and OFF
+#
 CREATE TEMPORARY TABLE t_my_temp (a int, b text) TABLESPACE=`innodb_temporary`;
+Warnings:
+Warning	1478	InnoDB: TABLESPACE=innodb_temporary option is deprecated and will be removed in a future release.
+SHOW CREATE TABLE t_my_temp;
+Table	Create Table
+t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
+  `a` int(11) DEFAULT NULL,
+  `b` text
+) /*!50100 TABLESPACE `innodb_temporary` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t_my_temp;
+SET innodb_strict_mode = OFF;
+CREATE TEMPORARY TABLE t_my_temp (a int, b text);
+SHOW CREATE TABLE t_my_temp;
+Table	Create Table
+t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
+  `a` int(11) DEFAULT NULL,
+  `b` text
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t_my_temp TABLESPACE innodb_temporary;
+Warnings:
+Warning	1478	InnoDB: TABLESPACE=innodb_temporary option is deprecated and will be removed in a future release.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: TABLESPACE=innodb_temporary option is deprecated and will be removed in a future release.
+SHOW CREATE TABLE t_my_temp;
+Table	Create Table
+t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
+  `a` int(11) DEFAULT NULL,
+  `b` text
+) /*!50100 TABLESPACE `innodb_temporary` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t_my_temp TABLESPACE innodb_file_per_table;
+Warnings:
+Warning	1478	InnoDB: TABLESPACE=innodb_file_per_table option is ignored. This option is deprecated and will be removed in a future release.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: TABLESPACE=innodb_file_per_table option is ignored. This option is deprecated and will be removed in a future release.
+SHOW CREATE TABLE t_my_temp;
+Table	Create Table
+t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
+  `a` int(11) DEFAULT NULL,
+  `b` text
+) /*!50100 TABLESPACE `innodb_file_per_table` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t_my_temp;
+SET innodb_strict_mode = ON;
+CREATE TEMPORARY TABLE t_my_temp (a int, b text);
+SHOW CREATE TABLE t_my_temp;
+Table	Create Table
+t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
+  `a` int(11) DEFAULT NULL,
+  `b` text
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t_my_temp TABLESPACE=innodb_file_per_table;
+ERROR HY000: InnoDB: TABLESPACE=innodb_file_per_table option is disallowed for temporary tables with INNODB_STRICT_NODE=ON. This option is deprecated and will be removed in a future release
+ALTER TABLE t_my_temp TABLESPACE=innodb_temporary;
+Warnings:
+Warning	1478	InnoDB: TABLESPACE=innodb_temporary option is deprecated and will be removed in a future release.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: TABLESPACE=innodb_temporary option is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t_my_temp;
 Table	Create Table
 t_my_temp	CREATE TEMPORARY TABLE `t_my_temp` (
diff --git a/mysql-test/suite/innodb/r/create_tablespace_partition.result b/mysql-test/suite/innodb/r/create_tablespace_partition.result
index 50d1cf34c8fd..eb2f724a93b1 100644
--- a/mysql-test/suite/innodb/r/create_tablespace_partition.result
+++ b/mysql-test/suite/innodb/r/create_tablespace_partition.result
@@ -22,6 +22,8 @@ SUBPARTITION subpart24),
 PARTITION thousands VALUES LESS THAN (10000)
 (SUBPARTITION subpart31,
 SUBPARTITION subpart32));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SET GLOBAL innodb_file_per_table = ON;
 CREATE TABLE t2 (a INT, b INT)
 ENGINE = InnoDB
@@ -35,11 +37,15 @@ SUBPARTITION subpart22 TABLESPACE=`s``1`),
 PARTITION thousands VALUES LESS THAN (10000)
 (SUBPARTITION subpart31 DATA DIRECTORY 'MYSQL_TMP_DIR',
 SUBPARTITION subpart32 DATA DIRECTORY 'MYSQL_TMP_DIR' TABLESPACE `innodb_file_per_table`));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 ALGORITHM=COPY, ADD PARTITION
 (PARTITION tenthousands VALUES LESS THAN (20000));
 ERROR 0A000: ALGORITHM=COPY/INPLACE is not supported. Reason: Partition specific operations do not yet support LOCK/ALGORITHM. Try ALGORITHM=DEFAULT.
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION tenthousands VALUES LESS THAN (20000));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 # Only allow tablespace name as ident, not text. I.e. no 'single' quotes.
 ALTER TABLE t1 ALGORITHM=COPY, ADD PARTITION
 (PARTITION twentythousands VALUES LESS THAN (30000)
@@ -60,6 +66,8 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION twentythousands VALUES LESS THAN (30000)
 TABLESPACE = "innodb_system");
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION thirtythousands VALUES LESS THAN (40000)
 TABLESPACE = `innodb_file_per_table`);
@@ -99,9 +107,13 @@ SUBPARTITION p40k_2 TABLESPACE = innodb_file_per_table DATA DIRECTORY = 'MYSQL_T
 SET GLOBAL innodb_file_per_table = OFF;
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION fiftythousands VALUES LESS THAN (60000));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION sixtythousands VALUES LESS THAN (70000)
 TABLESPACE = `innodb_system`);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION seventythousands VALUES LESS THAN (80000)
 TABLESPACE = `innodb_file_per_table`);
@@ -121,6 +133,8 @@ ALTER TABLE t1 ALGORITHM=DEFAULT, ADD PARTITION
 (PARTITION ninetythousands VALUES LESS THAN (100000)
 (SUBPARTITION p90k_1 TABLESPACE = `innodb_file_per_table`,
 SUBPARTITION p90k_2 TABLESPACE = `innodb_system`));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 FLUSH TABLES;
 === information_schema.innodb_sys_tables  and innodb_sys_tablespaces ===
 Table Name	Tablespace	Table Flags	Columns	Row Format	Zip Size	Space Type
@@ -388,6 +402,8 @@ SUBPARTITION seventythousandssp1 ENGINE = InnoDB),
 PARTITION ninetythousands VALUES LESS THAN (100000)
 (SUBPARTITION p90k_1 ENGINE = InnoDB,
 SUBPARTITION p90k_2 TABLESPACE = innodb_system ENGINE = InnoDB)) */;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 CREATE TABLE `t2` (
 `a` int(11) DEFAULT NULL,
 `b` int(11) DEFAULT NULL
@@ -403,6 +419,8 @@ SUBPARTITION subpart22 TABLESPACE = `s``1` ENGINE = InnoDB),
 PARTITION thousands VALUES LESS THAN (10000)
 (SUBPARTITION subpart31 ENGINE = InnoDB,
 SUBPARTITION subpart32 ENGINE = InnoDB)) */;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 === information_schema.innodb_sys_tables  and innodb_sys_tablespaces ===
 Table Name	Tablespace	Table Flags	Columns	Row Format	Zip Size	Space Type
 test/t1#p#fiftythousands#sp#fiftythousandssp0	s1	161	5	Dynamic	0	General
@@ -531,6 +549,8 @@ CREATE TABLE ti
 ENGINE=INNODB
 PARTITION BY HASH( MONTH(tr_date) )
 PARTITIONS 6;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 DROP TABLE t1,ti;
 DROP TABLESPACE ts1;
 #
diff --git a/mysql-test/suite/innodb/r/deadlock_detect.result b/mysql-test/suite/innodb/r/deadlock_detect.result
index 5a3f3864f887..21d50fa5b4d5 100644
--- a/mysql-test/suite/innodb/r/deadlock_detect.result
+++ b/mysql-test/suite/innodb/r/deadlock_detect.result
@@ -23,3 +23,193 @@ ROLLBACK;
 DROP TABLE t1;
 SET GLOBAL innodb_lock_wait_timeout=default;
 SET GLOBAL innodb_deadlock_detect=default;
+#
+#Bug #23036096 INNODB LAST DETECTED DEADLOCK NOT SHOWING FULL QUERY
+#
+SET GLOBAL innodb_deadlock_detect=ON;
+SET GLOBAL innodb_lock_wait_timeout=20;
+CREATE TABLE bug(
+id INT PRIMARY KEY,
+ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA INT,
+ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB INT,
+ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC INT,
+ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD INT,
+ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE INT,
+ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF INT,
+ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG INT,
+ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH INT,
+ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII INT,
+ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ INT,
+ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK INT,
+ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM INT,
+ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN INT,
+ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO INT,
+ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP INT,
+ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ INT,
+ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR INT,
+ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS INT,
+ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT INT,
+ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU INT)
+engine = innodb;
+INSERT INTO bug(id) VALUES(0), (1);
+BEGIN;
+SELECT * FROM bug WHERE id = 0 FOR UPDATE;
+id	ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB	ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC	ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD	ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE	ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF	ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG	ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH	ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII	ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ	ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK	ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM	ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN	ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO	ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP	ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ	ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR	ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS	ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT	ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU
+0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+BEGIN;
+SELECT * FROM bug WHERE id = 1 FOR UPDATE;
+id	ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB	ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC	ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD	ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE	ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF	ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG	ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH	ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII	ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ	ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK	ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM	ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN	ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO	ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP	ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ	ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR	ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS	ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT	ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU
+1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+SET DEBUG_SYNC = 'lock_wait_will_wait SIGNAL con1_will_wait';
+SELECT * FROM bug WHERE id = 1 AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0 AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0 AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0 AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0 AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0 AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0 AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0 AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0 AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0 AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0 AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0 AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0 AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0 AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0 AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0 AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0 AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0 AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0 AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0 AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0 FOR UPDATE;;
+SET DEBUG_SYNC = 'now WAIT_FOR con1_will_wait';
+SELECT * FROM bug WHERE id = 0
+AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0
+AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0
+AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0
+AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0
+AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0
+AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0
+AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0
+AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0
+AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0
+AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0
+AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0
+AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0
+AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0
+AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0
+AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0
+AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0
+AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0
+AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0
+AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0
+AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0
+FOR UPDATE;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+id	ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB	ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC	ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD	ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE	ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF	ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG	ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH	ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII	ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ	ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK	ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM	ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN	ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO	ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP	ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ	ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR	ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS	ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT	ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU
+ROLLBACK;
+SHOW ENGINE INNODB STATUS!
+Type	Name	Status
+InnoDB		
+------------------------
+%DATE% %HEXADECIMAL%
+*** (1) TRANSACTION:
+TRANSACTION %NUMBER%, ACTIVE 0 sec starting index read
+mysql tables in use 1, locked 1
+LOCK WAIT 3 lock struct(s), heap size %NUMBER%, 2 row lock(s)
+MySQL thread id %NUMBER%, OS thread handle %NUMBER%, query id %NUMBER% %ADDRESS% %USER% statistics
+SELECT * FROM bug WHERE id = 1 AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0 AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0 AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0 AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0 AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0 AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0 AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0 AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0 AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0 AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0 AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0 AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0 AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0 AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0 AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0 AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0 AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0 AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0 AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0 AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0 FOR UPDATE
+*** (1) WAITING FOR THIS LOCK TO BE GRANTED:
+RECORD LOCKS space id %NUMBER% page no 3 n bits 72 index PRIMARY of table `test`.`bug` trx id %NUMBER% lock_mode X locks rec but not gap waiting
+Record lock, heap no 3 PHYSICAL RECORD: n_fields 23; compact format; info bits 0
+ 0: len 4; hex %HEXADECIMAL%; asc %ASC%;;
+ 1: len 6; hex %HEXADECIMAL%; asc %ASC%;;
+ 2: len 7; hex %HEXADECIMAL%; asc %ASC%;;
+ 3: SQL NULL;
+ 4: SQL NULL;
+ 5: SQL NULL;
+ 6: SQL NULL;
+ 7: SQL NULL;
+ 8: SQL NULL;
+ 9: SQL NULL;
+ 10: SQL NULL;
+ 11: SQL NULL;
+ 12: SQL NULL;
+ 13: SQL NULL;
+ 14: SQL NULL;
+ 15: SQL NULL;
+ 16: SQL NULL;
+ 17: SQL NULL;
+ 18: SQL NULL;
+ 19: SQL NULL;
+ 20: SQL NULL;
+ 21: SQL NULL;
+ 22: SQL NULL;
+
+*** (2) TRANSACTION:
+TRANSACTION %NUMBER%, ACTIVE 0 sec starting index read
+mysql tables in use 1, locked 1
+3 lock struct(s), heap size %NUMBER%, 2 row lock(s)
+MySQL thread id %NUMBER%, OS thread handle %NUMBER%, query id %NUMBER% %ADDRESS% %USER% statistics
+SELECT * FROM bug WHERE id = 0
+AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0
+AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0
+AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0
+AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0
+AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0
+AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0
+AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0
+AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0
+AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0
+AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0
+AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0
+AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0
+AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0
+AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0
+AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0
+AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0
+AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0
+AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0
+AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0
+AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0
+FOR UPDATE
+*** (2) HOLDS THE LOCK(S):
+RECORD LOCKS space id %NUMBER% page no 3 n bits 72 index PRIMARY of table `test`.`bug` trx id %NUMBER% lock_mode X locks rec but not gap
+Record lock, heap no 3 PHYSICAL RECORD: n_fields 23; compact format; info bits 0
+ 0: len 4; hex %HEXADECIMAL%; asc %ASC%;;
+ 1: len 6; hex %HEXADECIMAL%; asc %ASC%;;
+ 2: len 7; hex %HEXADECIMAL%; asc %ASC%;;
+ 3: SQL NULL;
+ 4: SQL NULL;
+ 5: SQL NULL;
+ 6: SQL NULL;
+ 7: SQL NULL;
+ 8: SQL NULL;
+ 9: SQL NULL;
+ 10: SQL NULL;
+ 11: SQL NULL;
+ 12: SQL NULL;
+ 13: SQL NULL;
+ 14: SQL NULL;
+ 15: SQL NULL;
+ 16: SQL NULL;
+ 17: SQL NULL;
+ 18: SQL NULL;
+ 19: SQL NULL;
+ 20: SQL NULL;
+ 21: SQL NULL;
+ 22: SQL NULL;
+
+*** (2) WAITING FOR THIS LOCK TO BE GRANTED:
+RECORD LOCKS space id %NUMBER% page no 3 n bits 72 index PRIMARY of table `test`.`bug` trx id %NUMBER% lock_mode X locks rec but not gap waiting
+Record lock, heap no 2 PHYSICAL RECORD: n_fields 23; compact format; info bits 0
+ 0: len 4; hex %HEXADECIMAL%; asc %ASC%;;
+ 1: len 6; hex %HEXADECIMAL%; asc %ASC%;;
+ 2: len 7; hex %HEXADECIMAL%; asc %ASC%;;
+ 3: SQL NULL;
+ 4: SQL NULL;
+ 5: SQL NULL;
+ 6: SQL NULL;
+ 7: SQL NULL;
+ 8: SQL NULL;
+ 9: SQL NULL;
+ 10: SQL NULL;
+ 11: SQL NULL;
+ 12: SQL NULL;
+ 13: SQL NULL;
+ 14: SQL NULL;
+ 15: SQL NULL;
+ 16: SQL NULL;
+ 17: SQL NULL;
+ 18: SQL NULL;
+ 19: SQL NULL;
+ 20: SQL NULL;
+ 21: SQL NULL;
+ 22: SQL NULL;
+
+*** WE ROLL BACK TRANSACTION (2)
+------------
+
+DROP TABLE bug;
+SET GLOBAL innodb_lock_wait_timeout = default;
+SET GLOBAL innodb_deadlock_detect = default;
diff --git a/mysql-test/suite/innodb/r/default_row_format_compatibility.result b/mysql-test/suite/innodb/r/default_row_format_compatibility.result
index 70c6b63481c3..72140352b00a 100644
--- a/mysql-test/suite/innodb/r/default_row_format_compatibility.result
+++ b/mysql-test/suite/innodb/r/default_row_format_compatibility.result
@@ -40,7 +40,7 @@ SET GLOBAL innodb_default_row_format=Dynamic;
 CREATE TABLE tab(a INT);
 ALTER TABLE tab DISCARD TABLESPACE;
 ALTER TABLE tab IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x4 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_DYNAMIC and the meta-data file has ROW_TYPE_COMPACT)
 DROP TABLE tab;
 SET GLOBAL innodb_default_row_format=Compact;
 SELECT @@innodb_default_row_format;
@@ -72,7 +72,7 @@ Table Name	Tablespace	Table Flags	Columns	Row Format	Zip Size	Space Type
 test/tab	test/tab	33	5	Dynamic	0	Single
 SET GLOBAL innodb_default_row_format=COMPACT;
 ALTER TABLE tab ROW_FORMAT=COMPACT;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 DROP TABLE tab;
 SET GLOBAL innodb_default_row_format=Default;
 SELECT @@innodb_default_row_format;
diff --git a/mysql-test/suite/innodb/r/deprecate_part_in_shared_ts.result b/mysql-test/suite/innodb/r/deprecate_part_in_shared_ts.result
new file mode 100644
index 000000000000..9818b99a586a
--- /dev/null
+++ b/mysql-test/suite/innodb/r/deprecate_part_in_shared_ts.result
@@ -0,0 +1,130 @@
+CREATE TABLESPACE ts add datafile 'ts.ibd';
+#########################################################################
+# Partitioned Table                                                     #
+#########################################################################
+
+DROP TABLE IF EXISTS t1;
+# Create table without explicit tablespace name
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30));
+# Try to ALTER TABLE to have general tablespace at table level
+ALTER TABLE t1 TABLESPACE=ts;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+DROP TABLE t1;
+# Create table with general tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+TABLESPACE=ts
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+DROP TABLE t1;
+# Create table with system tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+TABLESPACE=innodb_system
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+DROP TABLE t1;
+# Create table with innodb_file_per_table tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+TABLESPACE=innodb_file_per_table
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30));
+DROP TABLE t1;
+# Create table with general tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30) TABLESPACE=ts);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+DROP TABLE t1;
+# Create table with system tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30) TABLESPACE=innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+DROP TABLE t1;
+# Create table with innodb_file_per_table tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+PARTITION BY RANGE(id) (
+PARTITION p0 VALUES LESS THAN (10),
+PARTITION p1 VALUES LESS THAN (20),
+PARTITION p2 VALUES LESS THAN (30),
+PARTITION p3 VALUES LESS THAN (40) TABLESPACE=innodb_file_per_table);
+# Alter table to move a partition to general tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P0 INTO (
+PARTITION P0 VALUES LESS THAN (10) TABLESPACE=ts);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+# Alter table to move a partition to system tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P1 INTO (
+PARTITION P1 VALUES LESS THAN (20) TABLESPACE=innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+# Alter table to move a partition to file_per_table tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P2 INTO (
+PARTITION P2 VALUES LESS THAN (30) TABLESPACE=innodb_file_per_table);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `name` varchar(50) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (id)
+(PARTITION P0 VALUES LESS THAN (10) TABLESPACE = `ts` ENGINE = InnoDB,
+ PARTITION P1 VALUES LESS THAN (20) TABLESPACE = `innodb_system` ENGINE = InnoDB,
+ PARTITION P2 VALUES LESS THAN (30) TABLESPACE = `innodb_file_per_table` ENGINE = InnoDB,
+ PARTITION p3 VALUES LESS THAN (40) TABLESPACE = `innodb_file_per_table` ENGINE = InnoDB) */
+# Alter table to add a new partition in general tablespace
+ALTER TABLE t1 ADD PARTITION (
+PARTITION p4 VALUES LESS THAN (50) tablespace=ts);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+# Alter table to add a new partition in innodb_system tablespace
+ALTER TABLE t1 ADD PARTITION (
+PARTITION p5 VALUES LESS THAN (60) tablespace=innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
+# Alter table to add a new partition in innodb_file_per_table tablespace
+ALTER TABLE t1 ADD PARTITION (
+PARTITION p6 VALUES LESS THAN (70) tablespace=innodb_file_per_table);
+# Alter table to add a new partition without giving tablespace
+ALTER TABLE t1 ADD PARTITION (
+PARTITION p7 VALUES LESS THAN (80));
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) DEFAULT NULL,
+  `name` varchar(50) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (id)
+(PARTITION P0 VALUES LESS THAN (10) TABLESPACE = `ts` ENGINE = InnoDB,
+ PARTITION P1 VALUES LESS THAN (20) TABLESPACE = `innodb_system` ENGINE = InnoDB,
+ PARTITION P2 VALUES LESS THAN (30) TABLESPACE = `innodb_file_per_table` ENGINE = InnoDB,
+ PARTITION p3 VALUES LESS THAN (40) TABLESPACE = `innodb_file_per_table` ENGINE = InnoDB,
+ PARTITION p4 VALUES LESS THAN (50) TABLESPACE = `ts` ENGINE = InnoDB,
+ PARTITION p5 VALUES LESS THAN (60) TABLESPACE = `innodb_system` ENGINE = InnoDB,
+ PARTITION p6 VALUES LESS THAN (70) TABLESPACE = `innodb_file_per_table` ENGINE = InnoDB,
+ PARTITION p7 VALUES LESS THAN (80) ENGINE = InnoDB) */
+###########
+# Cleanup #
+###########
+DROP TABLE t1;
+DROP TABLESPACE ts;
diff --git a/mysql-test/suite/innodb/r/end_range_check_2.result b/mysql-test/suite/innodb/r/end_range_check_2.result
new file mode 100644
index 000000000000..156ebc31895d
--- /dev/null
+++ b/mysql-test/suite/innodb/r/end_range_check_2.result
@@ -0,0 +1,28 @@
+#
+# Bug #26300119	ASSERTION IN PREBUILT->TRX->ISOLATION_LEVEL == TRX_ISO_READ_UNCOMMITTED
+#
+CREATE PROCEDURE populate_t1(IN BASE INT, IN SIZE INT)
+BEGIN
+DECLARE i INT DEFAULT BASE;
+WHILE (i <= SIZE) DO
+INSERT INTO t1 VALUES  (i, repeat('10101010101010101010',2000));
+SET i = i + 1;
+END WHILE;
+END|
+CREATE TABLE t1 (
+pk int,
+col_blob_key blob,
+primary key (pk)
+);
+CALL populate_t1(1, 100);
+START TRANSACTION;
+CALL populate_t1(101, 199);
+SET DEBUG_SYNC='before_insertion_of_blob SIGNAL halted_insert WAIT_FOR proceed';
+INSERT INTO t1 VALUES (200, repeat('10101010101010101010',2000));;
+SET DEBUG_SYNC='now WAIT_FOR halted_insert';
+SET DEBUG_SYNC='allow_insert SIGNAL proceed';
+SELECT pk, col_blob_key FROM t1 WHERE pk between 99 and 100;
+COMMIT;
+SET DEBUG_SYNC='RESET';
+DROP PROCEDURE populate_t1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/events-merge-tmp-path.result b/mysql-test/suite/innodb/r/events-merge-tmp-path.result
new file mode 100644
index 000000000000..ce85f2329b12
--- /dev/null
+++ b/mysql-test/suite/innodb/r/events-merge-tmp-path.result
@@ -0,0 +1,19 @@
+update  performance_schema.setup_instruments set enabled='YES' where name like '%innodb_temp%';
+update performance_schema.setup_consumers set enabled='YES';
+use test;
+CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(180) NOT NULL, `name2` varchar(180) DEFAULT NULL, `name3` varchar(180) DEFAULT NULL, `name4` varchar(180) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
+set @id:=0;
+insert into t1 values
+(@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000));
+insert into `t1`(`id`,`name1`,`name2`,`name3`,`name4`)
+select  @id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000)  from
+`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6;
+create index i_dtyp_big on `t1`(name1) algorithm=inplace;
+select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%'
+and object_name like '%Innodb Merge Temp File%';
+object_name
+MYSQL_TEST_DIR#Innodb Merge Temp File
+drop table t1;
diff --git a/mysql-test/suite/innodb/r/foreign_key.result b/mysql-test/suite/innodb/r/foreign_key.result
index 33cf5f9cec9e..e573cd9adfd2 100644
--- a/mysql-test/suite/innodb/r/foreign_key.result
+++ b/mysql-test/suite/innodb/r/foreign_key.result
@@ -150,3 +150,150 @@ unique_constraint_name
 PRIMARY
 DROP TABLE t2;
 DROP TABLE t1;
+#
+# Bug#33053297 VIRTUAL INDEX CORRUPTED DURING CASCADE UPDATE ON CHILD TABLE
+#
+#Test-Case 1
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	1	2020-10-22 13:32:41	2020-10-22
+DELETE FROM `emails`;
+DELETE FROM `email_stats`;
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# Test-Case 2
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL ON UPDATE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+UPDATE `emails` SET `id` = 2 where `id` = 1;
+SELECT id FROM `email_stats` WHERE `generated_sent_date` IS NULL;
+id
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	NULL	2020-10-22 13:32:41	2020-10-22
+UPDATE `email_stats` SET `email_id`=2
+WHERE DATE(`generated_sent_date`) = '2020-10-22';
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_date
+1	2	2020-10-22 13:32:41	2020-10-22
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# test-case 3
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	1	2020-10-22 13:32:41	2020-1
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+date_sent
+2020-10-22 13:32:41
+DELETE FROM `emails`;
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	NULL	2020-10-22 13:32:41	2020- 
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+date_sent
+2020-10-22 13:32:41
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+# test-case 4
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON UPDATE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	1	2020-10-22 13:32:41	2020-1
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+date_sent
+2020-10-22 13:32:41
+UPDATE `emails` SET `id` = 2 WHERE `id` = 1;
+SELECT * FROM `email_stats`;
+id	email_id	date_sent	generated_sent_email
+1	NULL	2020-10-22 13:32:41	2020- 
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+date_sent
+2020-10-22 13:32:41
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
diff --git a/mysql-test/suite/innodb/r/fts_exec_interrupt.result b/mysql-test/suite/innodb/r/fts_exec_interrupt.result
new file mode 100644
index 000000000000..cf4968ea86f7
--- /dev/null
+++ b/mysql-test/suite/innodb/r/fts_exec_interrupt.result
@@ -0,0 +1,21 @@
+CREATE TABLE `fttest04` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`str` varchar(300) DEFAULT NULL,
+`str2` mediumtext,
+PRIMARY KEY (`id`),
+FULLTEXT KEY `idx` (`str`,`str2`)
+) ENGINE=InnoDB AUTO_INCREMENT=65520 DEFAULT CHARSET=utf8mb4;
+CREATE PROCEDURE load_test_data()
+BEGIN
+DECLARE cnt INTEGER UNSIGNED DEFAULT 1;
+WHILE (cnt <= 600220) DO
+INSERT INTO fttest04(str, str2) VALUES('徳島県','徳島県');
+SET cnt= cnt+1;
+END WHILE;
+END|
+CALL load_test_data();
+DROP PROCEDURE load_test_data;
+SELECT /*+ max_execution_time(2000) */ COUNT(id) FROM fttest04 WHERE
+MATCH (str,str2) AGAINST ('徳島県' IN BOOLEAN MODE) ;
+ERROR HY000: Query execution was interrupted, maximum statement execution time exceeded
+DROP TABLE fttest04;
diff --git a/mysql-test/suite/innodb/r/import_compress_encrypt.result b/mysql-test/suite/innodb/r/import_compress_encrypt.result
new file mode 100644
index 000000000000..245216444fb2
Binary files /dev/null and b/mysql-test/suite/innodb/r/import_compress_encrypt.result differ
diff --git a/mysql-test/suite/innodb/r/import_compress_encrypt_upgrade.result b/mysql-test/suite/innodb/r/import_compress_encrypt_upgrade.result
new file mode 100644
index 000000000000..f9e8ff7eb1ee
Binary files /dev/null and b/mysql-test/suite/innodb/r/import_compress_encrypt_upgrade.result differ
diff --git a/mysql-test/suite/innodb/r/import_tablespace_page_corrupt.result b/mysql-test/suite/innodb/r/import_tablespace_page_corrupt.result
new file mode 100644
index 000000000000..a9b5e13363b6
--- /dev/null
+++ b/mysql-test/suite/innodb/r/import_tablespace_page_corrupt.result
@@ -0,0 +1,14 @@
+CREATE TABLE t1(f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INT, f3 CHAR, f4 TEXT)
+ENGINE=InnoDB;
+DELETE FROM t1 WHERE f1%2=0;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1(f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INT, f3 CHAR, f4 TEXT)
+ENGINE=InnoDB;
+ALTER TABLE t1 DISCARD TABLESPACE;
+SET SESSION debug="+d,ib_import_page_corrupt";
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Operation cannot be performed. The table 'test.t1' is missing, corrupt or contains bad data.
+SET SESSION debug="-d,ib_import_page_corrupt";
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/import_tablespace_schema_missmatch.result b/mysql-test/suite/innodb/r/import_tablespace_schema_missmatch.result
new file mode 100644
index 000000000000..bb38498f4f9b
--- /dev/null
+++ b/mysql-test/suite/innodb/r/import_tablespace_schema_missmatch.result
@@ -0,0 +1,57 @@
+#
+# Bug #30190227 CRASH IMPORTING TABLESPACE WITH DIFFERENT DATA DIRECTORY
+# BUT NOT .CFG FILE
+#
+# Test-case-1
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+ALTER TABLE t1 DISCARD TABLESPACE;
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Table location flags do not match. The source table uses a DATA DIRECTORY but the destination table does not.)
+DROP TABLE t1;
+#
+# Test-case-2
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
+ALTER TABLE t1 DISCARD TABLESPACE;
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Table location flags do not match. The source table does not use a DATA DIRECTORY but the destination table does.)
+DROP TABLE t1;
+#
+# Bug #30190199 ERROR WHEN IMPORTING TABLESPACE WITH DIFFERENT DATA
+# DIRECTORY LACKS DETAILS
+#
+# Test-case-3
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+ALTER TABLE t1 DISCARD TABLESPACE;
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Table location flags do not match. The source table uses a DATA DIRECTORY but the destination table does not.)
+DROP TABLE t1;
+#
+# Test-case-4
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
+ALTER TABLE t1 DISCARD TABLESPACE;
+ALTER TABLE t1 IMPORT TABLESPACE;
+ERROR HY000: Schema mismatch (Table location flags do not match. The source table does not use a DATA DIRECTORY but the destination table does.)
+DROP TABLE t1;
+#
+# Cleanup
+#
diff --git a/mysql-test/suite/innodb/r/index_length.result b/mysql-test/suite/innodb/r/index_length.result
new file mode 100644
index 000000000000..a7c44067d81e
--- /dev/null
+++ b/mysql-test/suite/innodb/r/index_length.result
@@ -0,0 +1,32 @@
+CREATE TABLE abc(a int auto_increment PRIMARY KEY, b varchar(1024), c
+varchar(1024))ENGINE=INNODB;
+INSERT INTO abc (b,c) VALUES (repeat('b', 1024), repeat('c', 1024));
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+DATA_LENGTH	INDEX_LENGTH
+#	0
+ALTER TABLE abc add INDEX cc (c(800));
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+DATA_LENGTH	INDEX_LENGTH
+#	17809408
+ALTER TABLE abc add INDEX bb (b(800));
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+DATA_LENGTH	INDEX_LENGTH
+#	35618816
+DROP TABLE abc;
diff --git a/mysql-test/suite/innodb/r/innodb-alter-debug.result b/mysql-test/suite/innodb/r/innodb-alter-debug.result
index c6fa1ed0072b..c25e2582736e 100644
--- a/mysql-test/suite/innodb/r/innodb-alter-debug.result
+++ b/mysql-test/suite/innodb/r/innodb-alter-debug.result
@@ -41,7 +41,7 @@ ERROR 23000: Duplicate entry '1' for key 'uk'
 SET DEBUG_SYNC = 'now SIGNAL s2';
 /* connection default */
 /* reap */ alter table t1 add b int, ALGORITHM=inplace;
-ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '1' for key 'uk'
 SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL s1 WAIT_FOR s2';
 alter table t1 add b int, ALGORITHM=inplace;;
 /* connection con1 */
@@ -51,5 +51,25 @@ ERROR 23000: Duplicate entry '1' for key 'uk'
 SET DEBUG_SYNC = 'now SIGNAL s2';
 /* connection default */
 /* reap */ alter table t1 add b int, ALGORITHM=inplace;
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '1' for key 'uk'
 drop table t1;
+#
+# Bug #27753193  ASSERTION `PREBUILT->TRX->ERROR_KEY_NUM <
+#                HA_ALTER_INFO->KEY_COUNT'
+CREATE TABLE t1 (a INT, UNIQUE KEY(a)) ENGINE = INNODB;
+INSERT INTO t1 VALUES (1);
+SET DEBUG_SYNC = 'row_log_table_apply1_before signal S1 WAIT_FOR S2';
+OPTIMIZE TABLE t1;;
+SET DEBUG_SYNC = 'now WAIT_FOR S1';
+INSERT INTO t1 VALUES (1);
+ERROR 23000: Duplicate entry '1' for key 'a'
+SET DEBUG_SYNC = 'now SIGNAL S2';
+/* reap */ OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	error	Duplicate entry '1' for key 'a'
+test.t1	optimize	status	Operation failed
+Warnings:
+Error	1062	Duplicate entry '1' for key 'a'
+SET DEBUG_SYNC='RESET';
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-alter.result b/mysql-test/suite/innodb/r/innodb-alter.result
index 07f9a929ba6d..5b72a891e37b 100644
--- a/mysql-test/suite/innodb/r/innodb-alter.result
+++ b/mysql-test/suite/innodb/r/innodb-alter.result
@@ -825,3 +825,23 @@ ALTER TABLE t1 DROP KEY idx, ADD UNIQUE KEY uidx (col1);
 ERROR 23000: Duplicate entry '2' for key 'uidx'
 DELETE FROM t1 WHERE col1 = 2;
 DROP TABLE t1;
+#
+# BUG #26334149 MYSQL CRASHES WHEN FULL TEXT INDEXES IBD FILES ARE
+# ORPHANED DUE TO RENAME TABLE
+#
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE notes (
+id int(11) NOT NULL AUTO_INCREMENT,
+body text COLLATE utf8_unicode_ci,
+PRIMARY KEY (id)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci;
+ALTER TABLE notes ADD FULLTEXT INDEX index_ft_body (body(255));
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+DROP INDEX index_ft_body ON notes;
+CREATE DATABASE db2;
+RENAME TABLE db1.notes TO db2.notes;
+DROP DATABASE db1;
+DROP DATABASE db2;
diff --git a/mysql-test/suite/innodb/r/innodb-autoinc.result b/mysql-test/suite/innodb/r/innodb-autoinc.result
index 200a56c600bd..39aba9c68b96 100644
--- a/mysql-test/suite/innodb/r/innodb-autoinc.result
+++ b/mysql-test/suite/innodb/r/innodb-autoinc.result
@@ -1387,11 +1387,197 @@ SELECT * FROM t;
 i
 1
 301
-351
+601
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `i` int(11) NOT NULL AUTO_INCREMENT,
   KEY `i` (`i`)
-) ENGINE=InnoDB AUTO_INCREMENT=401 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=651 DEFAULT CHARSET=latin1
 DROP TABLE t;
+#
+# Bug#15851528 DUPLICATE KEY ERROR ON AUTO-INC PK WITH MIXED AUTO_INCREMENT_INCREMENT CLIENTS
+#
+# This test shows that the next record to be inserted is not affected
+# by a change in auto_increment_increment.
+# In addition, current value of auto_increment_increment by the client
+# that uses the existing autoinc value with be used to set next autoinc
+# value, which will be used by next client reguardless of its own session
+# setting for auto_increment_increment.
+#
+# Client 1: Insert a record with auto_increment_increment=2
+CREATE TABLE t(
+a SERIAL PRIMARY KEY,
+b VARCHAR(200)) ENGINE=InnoDB;
+SET SESSION auto_increment_increment=2;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `a` (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S1');
+SELECT a,b FROM t;
+a	b
+1	S1
+# Client 2: Insert records with auto_increment_increment 2,1
+SET SESSION auto_increment_increment=2;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `a` (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S2');
+SELECT a,b FROM t;
+a	b
+1	S1
+3	S2
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `a` (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S2');
+SELECT a,b FROM t;
+a	b
+1	S1
+3	S2
+5	S2
+# Client 1: Insert a record with auto_increment_increment=1
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `a` (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S1');
+SELECT a,b FROM t;
+a	b
+1	S1
+3	S2
+5	S2
+6	S1
+DROP TABLE t;
+# Autoincrement behaviour with mixed insert.
+CREATE TABLE t(
+a TINYINT AUTO_INCREMENT PRIMARY KEY,
+b VARCHAR(200)) ENGINE=InnoDB;
+SET SESSION auto_increment_increment=100;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S0'),('S1');
+SELECT a,b FROM t;
+a	b
+1	S0
+101	S1
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=latin1
+INSERT INTO t(a,b) VALUES(28,'S2');
+SELECT a,b FROM t;
+a	b
+1	S0
+28	S2
+101	S1
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S3');
+SELECT a,b FROM t;
+a	b
+1	S0
+28	S2
+101	S1
+127	S3
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `b` varchar(200) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=127 DEFAULT CHARSET=latin1
+INSERT INTO t(b) VALUES('S4');
+ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
+DROP TABLE t;
+#
+# Bug 26906787 - INCORRECT AUTO_INCREMENT IDS ISSUED WHEN CLOSE TO ULLONG_MAX
+#
+SET auto_increment_increment = 300;
+CREATE TABLE t1 (a BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b CHAR(8))
+ENGINE=innodb;
+INSERT INTO t1 VALUES (18446744073709551613, 'a');
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` char(8) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES (NULL, 'b');
+ERROR 22003: Out of range value for column 't1' at row 167
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` char(8) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1
+DROP TABLE t1;
+CREATE TABLE t1 (
+a BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+b CHAR(8)
+) ENGINE=innodb
+PARTITION BY RANGE (a) (
+PARTITION p0 VALUES LESS THAN (6),
+PARTITION p1 VALUES LESS THAN MAXVALUE
+);
+INSERT INTO t1 VALUES (18446744073709551613, 'a');
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` char(8) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p0 VALUES LESS THAN (6) ENGINE = InnoDB,
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+INSERT INTO t1 VALUES (NULL, 'b');
+ERROR 22003: Out of range value for column 't1' at row 167
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `b` char(8) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (a)
+(PARTITION p0 VALUES LESS THAN (6) ENGINE = InnoDB,
+ PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-blob.result b/mysql-test/suite/innodb/r/innodb-blob.result
index a489ee4369e8..2b4e0ccb5adf 100644
--- a/mysql-test/suite/innodb/r/innodb-blob.result
+++ b/mysql-test/suite/innodb/r/innodb-blob.result
@@ -129,3 +129,22 @@ a
 SELECT * FROM t2;
 a
 DROP TABLE t1,t2,t3;
+#
+# Bug #29866408	SERVER CRASHES WHEN ADDING LONGTEXT COLUMN
+#
+CREATE TABLE t1 (
+id int(11) COLLATE utf8mb4_unicode_ci NOT NULL,
+data longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+PRIMARY KEY (id),
+UNIQUE KEY unq_id (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+INSERT INTO t1 VALUES (1,'');
+SET @old_mode=@@sql_mode;
+SET GLOBAL SQL_MODE="";
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+ALTER TABLE t1 ADD COLUMN d3 DATETIME NOT NULL;
+ALTER TABLE t1 ADD COLUMN d2 DATETIME NOT NULL;
+ALTER TABLE t1 ADD COLUMN d1 DATETIME NOT NULL;
+SET GLOBAL SQL_MODE=@old_mode;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-import-partition.result b/mysql-test/suite/innodb/r/innodb-import-partition.result
index 5ec6c7ea9238..74a3d8650105 100644
--- a/mysql-test/suite/innodb/r/innodb-import-partition.result
+++ b/mysql-test/suite/innodb/r/innodb-import-partition.result
@@ -954,6 +954,7 @@ c1
 64
 Warnings:
 Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
+Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
 SELECT * FROM t1 ORDER BY c1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE t1 DISCARD PARTITION TABLESPACE;
@@ -1102,6 +1103,10 @@ c1
 164
 Warnings:
 Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
+Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
+Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
+Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
+Warning	1814	InnoDB: Tablespace has been discarded for table 't1'
 SELECT * FROM t1 ORDER BY c1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 ALTER TABLE t1 DISCARD PARTITION p1sp2 TABLESPACE;
diff --git a/mysql-test/suite/innodb/r/innodb-large-prefix.result b/mysql-test/suite/innodb/r/innodb-large-prefix.result
index f691d59f56f4..311c1742870a 100644
--- a/mysql-test/suite/innodb/r/innodb-large-prefix.result
+++ b/mysql-test/suite/innodb/r/innodb-large-prefix.result
@@ -5,14 +5,14 @@ CREATE TABLE t1(a int not null,key(a,a)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 ERROR 42S21: Duplicate column name 'a'
 CREATE TABLE t1(a int,b text,key(b(768))) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ROW_FORMAT=COMPACT;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 CREATE TABLE t1(a int not null,b text) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ROW_FORMAT=COMPACT;
 INSERT INTO t1 VALUES (1,''),(2,''),(3,''),(4,''),(5,''),(6,''),(7,'');
 CREATE INDEX t1aa ON t1(a,a);
 ERROR 42S21: Duplicate column name 'a'
 CREATE INDEX t1b ON t1(b(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -35,7 +35,7 @@ INSERT INTO t2 VALUES (1,''),(2,''),(3,''),(4,''),(5,''),(6,''),(7,'');
 CREATE INDEX t2aa ON t2(a,a);
 ERROR 42S21: Duplicate column name 'a'
 CREATE INDEX t2b ON t2(b(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 SELECT * FROM t2;
 a	b
 1	
diff --git a/mysql-test/suite/innodb/r/innodb-truncate-debug.result b/mysql-test/suite/innodb/r/innodb-truncate-debug.result
index a9293f91c391..d887a09ba604 100644
--- a/mysql-test/suite/innodb/r/innodb-truncate-debug.result
+++ b/mysql-test/suite/innodb/r/innodb-truncate-debug.result
@@ -112,6 +112,6 @@ SET DEBUG_SYNC= 'now SIGNAL finish_scan';
 connection con1
 connection default
 drop table t1;
-Pattern "InnoDB: Record with space id \d+ belongs to table which is being truncated therefore skipping this undo record." found
+Pattern "InnoDB: Record with space id \d+ belongs to table which is being truncated or tablespace which is missing therefore skipping this undo record." not found
 # restart server
 # restart:
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index 1228dfcf4aa9..6738b7790ec3 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -113,7 +113,7 @@ ALTER TABLE t2 DISCARD TABLESPACE;
 # List after t2 DISCARD
 t2.frm
 ALTER TABLE t2 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x4 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_DYNAMIC and the meta-data file has ROW_TYPE_COMPACT)
 ALTER TABLE t2 IMPORT TABLESPACE;
 ERROR HY000: Schema mismatch (Table has ROW_TYPE_DYNAMIC row format, .ibd file has ROW_TYPE_COMPACT row format.)
 DROP TABLE t2;
@@ -593,7 +593,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_COMPACT and the meta-data file has ROW_TYPE_REDUNDANT)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -605,7 +605,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_DYNAMIC and the meta-data file has ROW_TYPE_REDUNDANT)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -779,7 +779,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_REDUNDANT and the meta-data file has ROW_TYPE_COMPACT)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -791,7 +791,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_DYNAMIC and the meta-data file has ROW_TYPE_COMPACT)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -968,7 +968,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_COMPACT and the meta-data file has ROW_TYPE_DYNAMIC)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
@@ -980,7 +980,7 @@ SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table 't1'
 restore: t1 .ibd and .cfg files
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has ROW_TYPE_REDUNDANT and the meta-data file has ROW_TYPE_DYNAMIC)
 unlink: t1.ibd
 unlink: t1.cfg
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb_bug30113362.result b/mysql-test/suite/innodb/r/innodb_bug30113362.result
new file mode 100644
index 000000000000..8416efbfd621
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug30113362.result
@@ -0,0 +1,97 @@
+DROP TABLE IF EXISTS t1;
+SET GLOBAL innodb_adaptive_hash_index = false;
+SET GLOBAL innodb_stats_persistent = false;
+SET GLOBAL innodb_flush_log_at_trx_commit = 0;
+CREATE TABLE t1 (
+a00 CHAR(255) NOT NULL DEFAULT 'a',
+a01 CHAR(255) NOT NULL DEFAULT 'a',
+a02 CHAR(255) NOT NULL DEFAULT 'a',
+b INT NOT NULL DEFAULT 0,
+CONSTRAINT pkey PRIMARY KEY(a00, a01, a02)
+) charset latin1 ENGINE = InnoDB COMMENT='MERGE_THRESHOLD=45';
+SET GLOBAL innodb_limit_optimistic_insert_debug = 3;
+DROP PROCEDURE IF EXISTS data_load_t1;
+Warnings:
+Note	1305	PROCEDURE test.data_load_t1 does not exist
+CREATE PROCEDURE data_load_t1()
+BEGIN
+DECLARE c1 INT DEFAULT 97;
+DECLARE c2 INT DEFAULT 97;
+DECLARE c3 INT DEFAULT 97;
+WHILE c1 < 102 DO
+WHILE c2 < 123 DO
+WHILE c3 < 123 DO
+INSERT INTO t1 (a00) VALUES (CHAR(c1,c2,c3));
+SET c3 = c3 + 1;
+END WHILE;
+SET c3 = 97;
+SET c2 = c2 + 1;
+END WHILE;
+SET c2 = 97;
+SET c1 = c1 + 1;
+END WHILE;
+END |
+call data_load_t1();
+DROP PROCEDURE data_load_t1;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+CLUST_INDEX_SIZE
+1856
+SET GLOBAL innodb_limit_optimistic_insert_debug = 0;
+DELETE FROM t1 WHERE a00 = 'cnm';
+# Test start
+SET DEBUG_SYNC = 'RESET';
+SET GLOBAL innodb_purge_stop_now = ON;
+SET GLOBAL DEBUG = "+d,pessimistic_row_purge_clust";
+DELETE FROM t1 WHERE a00 = 'bii';
+SET GLOBAL innodb_purge_run_now = ON;
+SET DEBUG_SYNC = "now WAIT_FOR pessimistic_row_purge_clust_pause";
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
+SELECT a00 FROM t1 WHERE a00 = 'bcc';
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait1';
+SET GLOBAL DEBUG = "-d,pessimistic_row_purge_clust";
+SET DEBUG_SYNC = "now SIGNAL pessimistic_row_purge_clust_continue";
+a00
+bcc
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+CLUST_INDEX_SIZE
+1856
+SET DEBUG_SYNC = 'RESET';
+DELETE FROM t1 WHERE a00 = 'dpn';
+ALTER TABLE t1 COMMENT='MERGE_THRESHOLD=35';
+SET GLOBAL innodb_purge_stop_now = ON;
+SET GLOBAL DEBUG = "+d,pessimistic_row_purge_clust";
+DELETE FROM t1 WHERE a00 = 'cnd';
+SET GLOBAL innodb_purge_run_now = ON;
+SET DEBUG_SYNC = "now WAIT_FOR pessimistic_row_purge_clust_pause";
+SELECT a00 FROM t1 WHERE a00 = 'ass';
+a00
+ass
+SELECT a00 FROM t1 WHERE a00 = 'dyx';
+a00
+dyx
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
+SELECT a00 FROM t1 WHERE a00 = 'ast';
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
+SELECT a00 FROM t1 WHERE a00 = 'dyw';
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait1';
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait2';
+SET GLOBAL DEBUG = "-d,pessimistic_row_purge_clust";
+SET DEBUG_SYNC = "now SIGNAL pessimistic_row_purge_clust_continue";
+a00
+ast
+a00
+dyw
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+CLUST_INDEX_SIZE
+1856
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb_bug30594501.result b/mysql-test/suite/innodb/r/innodb_bug30594501.result
new file mode 100644
index 000000000000..addd821bbd8f
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug30594501.result
@@ -0,0 +1,16 @@
+#
+# Bug#30594501 QUERY STALLS IN "QUERY END" STATUS FOR LONG TIME
+#
+SELECT @@table_open_cache_instances;
+@@table_open_cache_instances
+1
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1);
+# Connection con1
+SELECT * FROM t1;
+a
+1
+# Connection con2
+PREPARE s FROM 'SELECT * FROM `t1`';
+# Connection default
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb_bug31205266.result b/mysql-test/suite/innodb/r/innodb_bug31205266.result
new file mode 100644
index 000000000000..04279d5d98f7
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug31205266.result
@@ -0,0 +1,22 @@
+set debug_sync='reset';
+CREATE TABLE t1 (
+id int(11) NOT NULL auto_increment,
+ggid varchar(32) binary DEFAULT '' NOT NULL,
+email varchar(64) DEFAULT '' NOT NULL,
+passwd varchar(32) binary DEFAULT '' NOT NULL,
+PRIMARY KEY (id),
+UNIQUE ggid (ggid)
+) ENGINE=innodb;
+SET GLOBAL innodb_limit_optimistic_insert_debug = 2;
+insert into t1 (ggid,passwd) values ('test1','xxx');
+insert into t1 (ggid,passwd) values ('test2','yyy');
+set debug_sync='row_search_before_mtr_restart_for_extra_clust SIGNAL reached WAIT_FOR continue';
+select * from t1 where ggid='test2';
+set debug_sync='now WAIT_FOR reached';
+update t1 set ggid='test0' where id=2;
+insert into t1 (ggid,passwd) values ('test2','www');
+set debug_sync='now SIGNAL continue';
+id	ggid	email	passwd
+2	test2		yyy
+set debug_sync='reset';
+drop table t1;
diff --git a/mysql-test/suite/innodb/r/innodb_bug34750489.result b/mysql-test/suite/innodb/r/innodb_bug34750489.result
new file mode 100644
index 000000000000..bb0022e33f5f
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_bug34750489.result
@@ -0,0 +1,12 @@
+show global variables like "innodb_sort_buffer_size";
+Variable_name	Value
+innodb_sort_buffer_size	66664
+SET debug_sync = 'alter_table_update_log signal send_concurrent WAIT_FOR concurrent_done';
+OPTIMIZE TABLE t1;;
+SET debug_sync = 'now wait_for send_concurrent';
+UPDATE t1 SET id = id + 1;
+SET debug_sync = 'now signal concurrent_done';
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb_row_log_read.result b/mysql-test/suite/innodb/r/innodb_row_log_read.result
new file mode 100644
index 000000000000..14fc0819a069
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_row_log_read.result
@@ -0,0 +1,17 @@
+#
+# Bug #31529221	ALTER TABLE FAILS AND REPORTS INCORRECT KEY FILE FOR TABLE T1
+#
+SET @old_innodb_online_alter_log_max_size := @@innodb_online_alter_log_max_size;
+SET @old_max_allowed_packet := @@max_allowed_packet;
+set global innodb_online_alter_log_max_size=1342177280000;
+set global max_allowed_packet=1024*1024*1024;
+create table t1(d1 longblob);
+insert into t1(d1) values (repeat(UNHEX('000f'), 1022*1022*88));
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL proceed_insert WAIT_FOR proceed_alter';
+alter table t1 ADD COLUMN `d2` char(128) not null default '0' after d1;;
+SET DEBUG_SYNC= 'now WAIT_FOR proceed_insert';
+SET DEBUG_SYNC= 'now SIGNAL proceed_alter';
+SET DEBUG_SYNC= 'RESET';
+drop table t1;
+SET GLOBAL innodb_online_alter_log_max_size = @old_innodb_online_alter_log_max_size;
+set global max_allowed_packet = @old_max_allowed_packet;
diff --git a/mysql-test/suite/innodb/r/innodb_sys_var_valgrind.result b/mysql-test/suite/innodb/r/innodb_sys_var_valgrind.result
new file mode 100644
index 000000000000..a34e1b5b21df
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_sys_var_valgrind.result
@@ -0,0 +1,70 @@
+#
+# Bug #29717909	MEMORY LIFETIME OF VARIABLES BETWEEN CHECK AND UPDATE INCORRECTLY MANAGED
+#
+select @@innodb_ft_server_stopword_table;
+@@innodb_ft_server_stopword_table
+NULL
+create table user_stopword_1(value varchar(30)) engine = innodb;
+create table user_stopword_2(value varchar(30)) engine = innodb;
+set @blah = 'test/user_stopword_1';
+SET GLOBAL innodb_ft_server_stopword_table= @blah;
+select @@innodb_ft_server_stopword_table;
+@@innodb_ft_server_stopword_table
+test/user_stopword_1
+set @blah = 'test/user_stopword_2';
+SET GLOBAL innodb_ft_server_stopword_table= @blah;
+select @@innodb_ft_server_stopword_table;
+@@innodb_ft_server_stopword_table
+test/user_stopword_2
+SET GLOBAL innodb_ft_server_stopword_table= NULL;
+select @@innodb_ft_server_stopword_table;
+@@innodb_ft_server_stopword_table
+NULL
+SET GLOBAL innodb_ft_server_stopword_table= default;
+select @@innodb_ft_server_stopword_table;
+@@innodb_ft_server_stopword_table
+NULL
+drop table user_stopword_1, user_stopword_2;
+select @@innodb_buffer_pool_filename;
+@@innodb_buffer_pool_filename
+ib_buffer_pool
+set @blah='hello';
+set global innodb_buffer_pool_filename = @blah;
+select @@innodb_buffer_pool_filename;
+@@innodb_buffer_pool_filename
+hello
+set global innodb_buffer_pool_filename="bye";
+select @@innodb_buffer_pool_filename;
+@@innodb_buffer_pool_filename
+bye
+set global innodb_buffer_pool_filename=NULL;
+ERROR 42000: Variable 'innodb_buffer_pool_filename' can't be set to the value of 'NULL'
+set global innodb_buffer_pool_filename=default;
+select @@innodb_buffer_pool_filename;
+@@innodb_buffer_pool_filename
+ib_buffer_pool
+CREATE TABLE t1 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
+(opening_line)) ENGINE=InnoDB;
+CREATE TABLE t2 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
+(opening_line)) ENGINE=InnoDB;
+select @@innodb_ft_aux_table;
+@@innodb_ft_aux_table
+NULL
+set @blah = 'test/t1';
+SET GLOBAL innodb_ft_aux_table = @blah;
+select @@innodb_ft_aux_table;
+@@innodb_ft_aux_table
+test/t1
+set @blah = 'test/t2';
+SET GLOBAL innodb_ft_aux_table = @blah;
+SET GLOBAL innodb_ft_aux_table = NULL;
+select @@innodb_ft_aux_table;
+@@innodb_ft_aux_table
+NULL
+SET GLOBAL innodb_ft_aux_table =default;
+select @@innodb_ft_aux_table;
+@@innodb_ft_aux_table
+NULL
+drop table t1,t2;
diff --git a/mysql-test/suite/innodb/r/innodb_tablespace.result b/mysql-test/suite/innodb/r/innodb_tablespace.result
index 5cb82e45012c..b6fb5afedf5e 100644
--- a/mysql-test/suite/innodb/r/innodb_tablespace.result
+++ b/mysql-test/suite/innodb/r/innodb_tablespace.result
@@ -582,3 +582,14 @@ FLUSH TABLES t1 FOR EXPORT;
 ERROR HY000: Tablespace has been discarded for table 't1'
 UNLOCK TABLES;
 DROP TABLE t1;
+#
+# Bug#27903881 [MYSQL 8.0 GA RELEASE & DEBUG BUILD]
+# FIL_SPACE_GET(TABLE->SPACE) != __NULL
+#
+call mtr.add_suppression("\\[Warning\\] InnoDB: Missing .ibd file for table `test`\.`t1` .* ");
+CREATE TABLE t1(c1 INT,c2 CHAR,c3 DATE)PARTITION BY HASH(DAYOFWEEK(c3));
+ALTER TABLE t1 DISCARD TABLESPACE;
+FLUSH TABLES t1 FOR EXPORT;
+ERROR HY000: Tablespace has been discarded for table 't1'
+UNLOCK TABLES;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb_wl6326.result b/mysql-test/suite/innodb/r/innodb_wl6326.result
index d4710bf3779a..b642d49df94e 100644
--- a/mysql-test/suite/innodb/r/innodb_wl6326.result
+++ b/mysql-test/suite/innodb/r/innodb_wl6326.result
@@ -288,9 +288,9 @@ SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME
 CLUST_INDEX_SIZE
 30
 SET DEBUG_SYNC = 'RESET';
-INSERT INTO t1 (a00) VALUES ('cva');
+INSERT INTO t1 (a00) VALUES ('coa');
 SET DEBUG_SYNC = 'before_insert_pessimitic_row_ins_clust SIGNAL reached WAIT_FOR continue';
-INSERT INTO t1 (a00) VALUES ('cvb');
+INSERT INTO t1 (a00) VALUES ('cob');
 SET DEBUG_SYNC = 'now WAIT_FOR reached';
 SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
 SELECT a00,a01 FROM t1 WHERE a00 = 'aa';
diff --git a/mysql-test/suite/innodb/r/iodku.result b/mysql-test/suite/innodb/r/iodku.result
new file mode 100644
index 000000000000..bdf9d1918379
--- /dev/null
+++ b/mysql-test/suite/innodb/r/iodku.result
@@ -0,0 +1,254 @@
+#
+# Bug #28799261 IODKU UNNECESSARILY GAP-LOCKS SECONDARY INDEXES
+# AFTER DUPLICATE IS ALREADY FOUND
+#
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 1: Serialized transactions (trx1, trx2)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	1
+2	2	4
+# Cleanup
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 2: Serialized transactions (trx2, trx1)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	2
+2	3	3
+# Cleanup
+DROP TABLE t1;
+#
+# Bug #11758237 INSERT ON DUPLICATE KEY UPDATE SOMETIMES
+# WRITES BINLOG POSITION INCORRECT
+#
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 3: Interleaved transactions (trx1 conflicts on index b)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Connection default:
+# Transaction trx1:
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+a	b	c
+1	1	2
+# Connection other:
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+# Connection default:
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+a	b	c
+1	1	2
+2	3	4
+COMMIT;
+# Connection other:
+# Connection default:
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	2
+2	3	3
+# Cleanup
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 4: Serialized transactions (trx1, trx2)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	2
+2	2	4
+# Cleanup
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 5: Serialized transactions (trx2, trx1)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	2
+3	2	3
+# Cleanup
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  UNIQUE KEY `a` (`a`),
+  UNIQUE KEY `b` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+# Scenario 6: Interleaved transactions (trx1 conflicts on index a)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+a	b	c
+1	1	1
+# Connection default:
+# Transaction trx1:
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+a	b	c
+1	1	2
+# Connection other:
+START TRANSACTION;
+SET innodb_lock_wait_timeout = 1;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+COMMIT;
+# Connection default:
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+# Result:
+SELECT * FROM t1;
+a	b	c
+1	1	2
+3	2	4
+# Cleanup
+DROP TABLE t1;
+CREATE TABLE t1(f1 INT PRIMARY KEY,
+f2 INT, f3 INT, UNIQUE KEY(f2))ENGINE=INNODB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) DEFAULT NULL,
+  `f3` int(11) DEFAULT NULL,
+  PRIMARY KEY (`f1`),
+  UNIQUE KEY `f2` (`f2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t1(f1, f2, f3) VALUES(1, 10, 100);
+SELECT * FROM t1;
+f1	f2	f3
+1	10	100
+# Connection other:
+START TRANSACTION;
+INSERT INTO t1 VALUES(2, 10, 200) ON DUPLICATE KEY UPDATE f3 = 120;
+# Connection default
+START TRANSACTION;
+SET innodb_lock_wait_timeout = 1;
+INSERT INTO t1 VALUES(2, 20, 300) ON DUPLICATE KEY UPDATE f3 = 500;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+COMMIT;
+# Connection other:
+COMMIT;
+# Connection default
+# Verify Results:
+SELECT * FROM t1;
+f1	f2	f3
+1	10	120
+DROP TABLE t1;
+CREATE TABLE t1(f1 INT AUTO_INCREMENT PRIMARY KEY, f2 INT, f3 INT,
+UNIQUE KEY(f2),UNIQUE KEY(f3))ENGINE=INNODB;
+INSERT INTO t1(f2,f3) VALUES(10, 100);
+INSERT INTO t1(f2,f3) VALUES(20, 200);
+UPDATE t1 SET f2=30,f3=100 WHERE f2 = 20;
+ERROR 23000: Duplicate entry '100' for key 'f3'
+SELECT * FROM t1;
+f1	f2	f3
+1	10	100
+2	20	200
+COMMIT;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/iodku_debug.result b/mysql-test/suite/innodb/r/iodku_debug.result
new file mode 100644
index 000000000000..c56a5c760515
--- /dev/null
+++ b/mysql-test/suite/innodb/r/iodku_debug.result
@@ -0,0 +1,95 @@
+#
+# Bug#25966845 INSERT ON DUPLICATE KEY GENERATE A DEADLOCK
+#
+CREATE TABLE t1(f1 int primary key,
+f2 int, f3 int, unique key(f2))engine=innodb;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) DEFAULT NULL,
+  `f3` int(11) DEFAULT NULL,
+  PRIMARY KEY (`f1`),
+  UNIQUE KEY `f2` (`f2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t1(f1, f2, f3) VALUES(1, 10, 100);
+# Connection default
+BEGIN;
+INSERT INTO t1 VALUES(2, 20, 300) ON DUPLICATE KEY UPDATE f3 = 500;
+# Connection other:
+BEGIN;
+SET DEBUG_SYNC = 'ib_after_row_insert_step SIGNAL default_commit';
+INSERT INTO t1 VALUES(2, 10, 200) ON DUPLICATE KEY UPDATE f3 = 120;
+# Connection default
+SET DEBUG_SYNC = 'now WAIT_FOR default_commit';
+COMMIT;
+# Connection other
+COMMIT;
+# Verify Results:
+SELECT * FROM t1;
+f1	f2	f3
+1	10	100
+2	20	120
+SET DEBUG_SYNC ='RESET';
+DROP TABLE t1;
+#
+# Bug #29195848	ASSERTION "!OTHER_LOCK" IN LOCK_REC_ADD_TO_QUEUE
+#
+SET GLOBAL innodb_purge_stop_now = ON;
+CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, b INT, UNIQUE KEY(b));
+INSERT INTO t1 VALUES(2, 300);
+DELETE FROM t1;
+INSERT INTO t1 VALUES(3, 300);
+SELECT * FROM t1;
+id	b
+3	300
+SET DEBUG_SYNC='ib_after_row_insert_step SIGNAL after_insert WAIT_FOR
+rollback';
+INSERT INTO t1 VALUES(2, 300);;
+SET DEBUG_SYNC='now WAIT_FOR after_insert';
+START TRANSACTION;
+INSERT INTO t1 VALUES(1, 300);
+ERROR 23000: Duplicate entry '300' for key 'b'
+SET GLOBAL innodb_purge_run_now=ON;
+SET DEBUG_SYNC='now SIGNAL rollback';
+ERROR 23000: Duplicate entry '300' for key 'b'
+COMMIT;
+DROP TABLE t1;
+SET GLOBAL innodb_purge_stop_now = ON;
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY(b));
+INSERT INTO t1 VALUES(1,10);
+DELETE FROM t1;
+INSERT INTO t1 VALUES(2,10);
+SET DEBUG_SYNC='ib_undo_mod_before_remove_clust SIGNAL during_rollback
+WAIT_FOR rollback';
+INSERT INTO t1 VALUES(1, 10) ;;
+SET DEBUG_SYNC='now WAIT_FOR during_rollback';
+SELECT * FROM t1 WHERE a = 1 LOCK IN SHARE MODE;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SET GLOBAL innodb_purge_run_now=ON;
+SET DEBUG_SYNC='now SIGNAL rollback';
+ERROR 23000: Duplicate entry '10' for key 'b'
+SELECT * FROM t1;
+a	b
+2	10
+DROP TABLE t1;
+#
+# Bug #29718243	MYQL SERVER CRASHING
+#
+CREATE TEMPORARY TABLE tmpTest(tmpField INT , UNIQUE KEY uq_tmpField (tmpField));
+CREATE TEMPORARY TABLE tmpTest1(tmpField INT , UNIQUE KEY uq_tmpField (tmpField));
+CREATE FUNCTION ZZtest() RETURNS int(11)
+BEGIN
+DECLARE l_total INTEGER;
+SET l_total = 0;
+INSERT INTO tmpTest SET tmpField = 40;
+INSERT IGNORE INTO tmpTest SET tmpField = 40;
+INSERT IGNORE INTO tmpTest1 SET tmpField = 40;
+DROP TEMPORARY TABLE IF EXISTS tmpTest;
+DROP TEMPORARY TABLE IF EXISTS tmpTest1;
+RETURN l_total;
+END|
+SELECT ZZtest() AS test;
+test
+0
+DROP FUNCTION ZZtest;
diff --git a/mysql-test/suite/innodb/r/optimizer_temporary_table.result b/mysql-test/suite/innodb/r/optimizer_temporary_table.result
index fa7795358c1e..d54730f0160f 100644
--- a/mysql-test/suite/innodb/r/optimizer_temporary_table.result
+++ b/mysql-test/suite/innodb/r/optimizer_temporary_table.result
@@ -4130,6 +4130,8 @@ select count(*) from t0;
 count(*)
 0
 set @@session.sql_mode = MAXDB;
+Warnings:
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 set @@session.tmp_table_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect tmp_table_size value: '0'
diff --git a/mysql-test/suite/innodb/r/partition-blob.result b/mysql-test/suite/innodb/r/partition-blob.result
index 619dbddf1c17..9d2bc093b2f2 100644
--- a/mysql-test/suite/innodb/r/partition-blob.result
+++ b/mysql-test/suite/innodb/r/partition-blob.result
@@ -29,3 +29,21 @@ f3
 2
 3
 DROP TABLE t1;
+#
+# Bug #28491099 [FATAL] MEMORY BLOCK IS INVALID | INNODB: ASSERTION
+# FAILURE: UT0UT.CC:670
+#
+set sql_mode='';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+CREATE TABLE t1(a INT, b TEXT NOT NULL) PARTITION BY RANGE(a)
+(PARTITION p0 VALUES LESS THAN (6), PARTITION p1 VALUES LESS THAN (9),
+PARTITION p2 VALUES LESS THAN MAXVALUE);
+INSERT INTO t1(a) VALUES(0);
+Warnings:
+Warning	1364	Field 'b' doesn't have a default value
+ALTER TABLE t1 ADD COLUMN c DATE NOT NULL;
+ALTER TABLE t1 drop partition p0;
+ALTER TABLE t1 ADD COLUMN d DATE NOT NULL;
+DROP TABLE t1;
+SET sql_mode = default;
diff --git a/mysql-test/suite/innodb/r/partition.result b/mysql-test/suite/innodb/r/partition.result
index eaee4a7d6872..4c1b1a12a2ea 100644
--- a/mysql-test/suite/innodb/r/partition.result
+++ b/mysql-test/suite/innodb/r/partition.result
@@ -237,7 +237,11 @@ INDEX (b(5), c(10), a))
 ENGINE=InnoDB stats_persistent=DEFAULT
 PARTITION BY LINEAR HASH(d) PARTITIONS 2;
 ALTER TABLE t1 TABLESPACE ts1;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 DROP PRIMARY KEY, ALGORITHM=DEFAULT;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 DROP TABLE t1;
 DROP TABLESPACE ts1;
 #
@@ -449,6 +453,8 @@ PARTITION BY RANGE (a) PARTITIONS 3
 ( PARTITION P1 VALUES LESS THAN (2) TABLESPACE ts1,
 PARTITION P2 VALUES LESS THAN (4) TABLESPACE `innodb_system`,
 PARTITION P3 VALUES LESS THAN (6));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 ALTER TABLE t1 ADD COLUMN f int;
 DROP TABLE t1;
 DROP TABLESPACE ts1;
@@ -462,6 +468,8 @@ PARTITION p1 VALUES LESS THAN (100) TABLESPACE innodb_system,
 PARTITION p2 VALUES LESS THAN (200),
 PARTITION p3 VALUES LESS THAN (300) TABLESPACE ts1,
 PARTITION p4 VALUES LESS THAN (400) TABLESPACE innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 FLUSH table t1 FOR EXPORT;
 Warnings:
 Warning	1809	InnoDB: Table '`test`.`t1` /* Partition `p1` */' in system tablespace
@@ -558,6 +566,8 @@ PARTITIONS 4
 PARTITION p2 VALUES LESS THAN (4) TABLESPACE innodb_system,
 PARTITION p3 VALUES LESS THAN (6),
 PARTITION p4  VALUES LESS THAN (8) TABLESPACE innodb_file_per_table);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -605,6 +615,8 @@ test/t1#p#p2	System	NULL
 test/t1#p#p3	General	ts2
 test/t1#p#p4	Single	test/t1#p#p4
 ALTER TABLE t1 ADD COLUMN c int, TABLESPACE ts1;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -630,6 +642,8 @@ test/t1#p#p2	System	NULL
 test/t1#p#p3	General	ts2
 test/t1#p#p4	Single	test/t1#p#p4
 ALTER TABLE t1 ADD PARTITION (PARTITION p5 VALUES LESS THAN (10) TABLESPACE ts2);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -657,6 +671,8 @@ test/t1#p#p3	General	ts2
 test/t1#p#p4	Single	test/t1#p#p4
 test/t1#p#p5	General	ts2
 ALTER TABLE t1 ADD PARTITION (PARTITION p6 VALUES LESS THAN (12));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -686,6 +702,8 @@ test/t1#p#p4	Single	test/t1#p#p4
 test/t1#p#p5	General	ts2
 test/t1#p#p6	General	ts1
 ALTER TABLE t1 REORGANIZE PARTITION p4 INTO (PARTITION p4 VALUES LESS THAN (8));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -715,6 +733,8 @@ test/t1#p#p4	General	ts1
 test/t1#p#p5	General	ts2
 test/t1#p#p6	General	ts1
 ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN (6) TABLESPACE innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -752,6 +772,8 @@ PARTITIONS 4
 PARTITION p2 VALUES LESS THAN (4) TABLESPACE innodb_system,
 PARTITION p3 VALUES LESS THAN (6),
 PARTITION p4  VALUES LESS THAN (8) TABLESPACE innodb_file_per_table);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -799,6 +821,8 @@ test/t1#p#p2	System	NULL
 test/t1#p#p3	Single	test/t1#p#p3
 test/t1#p#p4	Single	test/t1#p#p4
 ALTER TABLE t1 ADD COLUMN c int, TABLESPACE ts1;
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -824,6 +848,8 @@ test/t1#p#p2	System	NULL
 test/t1#p#p3	Single	test/t1#p#p3
 test/t1#p#p4	Single	test/t1#p#p4
 ALTER TABLE t1 ADD PARTITION (PARTITION p5 VALUES LESS THAN (10) TABLESPACE ts2);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -851,6 +877,8 @@ test/t1#p#p3	Single	test/t1#p#p3
 test/t1#p#p4	Single	test/t1#p#p4
 test/t1#p#p5	General	ts2
 ALTER TABLE t1 ADD PARTITION (PARTITION p6 VALUES LESS THAN (12));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -880,6 +908,8 @@ test/t1#p#p4	Single	test/t1#p#p4
 test/t1#p#p5	General	ts2
 test/t1#p#p6	General	ts1
 ALTER TABLE t1 REORGANIZE PARTITION p4 INTO (PARTITION p4 VALUES LESS THAN (8));
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -909,6 +939,8 @@ test/t1#p#p4	General	ts1
 test/t1#p#p5	General	ts2
 test/t1#p#p6	General	ts1
 ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN (6) TABLESPACE innodb_system);
+Warnings:
+Warning	1681	'InnoDB : A table partition in a shared tablespace' is deprecated and will be removed in a future release.
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/suite/innodb/r/stored_fk.result b/mysql-test/suite/innodb/r/stored_fk.result
index 17de0d03b95f..6fb1684497f8 100644
--- a/mysql-test/suite/innodb/r/stored_fk.result
+++ b/mysql-test/suite/innodb/r/stored_fk.result
@@ -30,3 +30,37 @@ alter table t2 add column f2 int as (f1) stored, algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
 drop table t2, t1;
 set foreign_key_checks = 1;
+#
+# BUG#26731689 FK ON TABLE WITH GENERATED COLS: ASSERTION POS < N_DEF
+#
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+SET foreign_key_checks=0;
+DROP TABLE IF EXISTS s,t;
+CREATE TABLE s (a INT, b INT GENERATED ALWAYS AS (0) STORED,  c INT,
+d INT GENERATED ALWAYS AS (0) VIRTUAL, e INT) ENGINE=innodb;
+CREATE TABLE t (a INT) ENGINE=innodb;
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (e) REFERENCES t(a) ON UPDATE SET null;
+ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'c' in the referenced table 't'
+ALTER  TABLE t ADD PRIMARY KEY(a);
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (e) REFERENCES t(a) ON UPDATE SET null;
+DROP TABLE s,t;
+CREATE TABLE s (a INT GENERATED ALWAYS AS (0) VIRTUAL,
+b INT GENERATED ALWAYS AS (0) STORED,  c INT) ENGINE=innodb;
+CREATE TABLE t (a INT) ENGINE=innodb;
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (c) REFERENCES t(a) ON UPDATE SET null;
+ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'c' in the referenced table 't'
+ALTER  TABLE t ADD PRIMARY KEY(a);
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (c) REFERENCES t(a) ON UPDATE SET null;
+DROP TABLE s,t;
+CREATE TABLE s (a INT,  b INT GENERATED ALWAYS AS (0) STORED) ENGINE=innodb;
+CREATE TABLE t (a INT PRIMARY KEY) ENGINE=innodb;
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+DROP TABLE s,t;
+CREATE TABLE s (a INT, b INT) ENGINE=innodb;
+CREATE TABLE t (a INT) ENGINE=innodb;
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+ERROR HY000: Failed to add the foreign key constaint. Missing index for constraint 'c' in the referenced table 't'
+ALTER  TABLE t ADD PRIMARY KEY(a);
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+DROP TABLE s,t;
+SET @@foreign_key_checks = @foreign_key_checks_saved;
diff --git a/mysql-test/suite/innodb/r/table_encrypt_1.result b/mysql-test/suite/innodb/r/table_encrypt_1.result
index aabf9240c9bc..edd99fb609a6 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_1.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_1.result
@@ -1,16 +1,8 @@
-call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for table `\.\.*`\.`\.\.*` in the cache.");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
-call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
 CREATE TABLE t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 CREATE TABLE t1(c1 INT, c2 char(20)) ENGINE = InnoDB;
 ALTER TABLE t1 ENCRYPTION="Y", algorithm=copy;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 DROP TABLE IF EXISTS t1;
 SET GLOBAL innodb_file_per_table = 0;
 SELECT @@innodb_file_per_table;
@@ -69,7 +61,7 @@ c1	c2
 0	aaaaa
 # restart
 SELECT * FROM t1 ORDER BY c1 LIMIT 10;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 SELECT * FROM t1 ORDER BY c1 LIMIT 10;
 c1	c2
 0	aaaaa
diff --git a/mysql-test/suite/innodb/r/table_encrypt_2.result b/mysql-test/suite/innodb/r/table_encrypt_2.result
index 05a703f80cf3..ff1b9a73d081 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_2.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_2.result
@@ -1,8 +1,3 @@
-call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("\\[ERROR\\] Function 'keyring_file' already exists");
-call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.*'.");
-call mtr.add_suppression("Plugin keyring_file reported");
 SET @@global.keyring_file_data="MYSQL_TMP_DIR/keyring";
 CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/table_encrypt_3.result b/mysql-test/suite/innodb/r/table_encrypt_3.result
index 72c29a97a4f6..980ed0129992 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_3.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_3.result
@@ -1,8 +1,3 @@
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("InnoDB: The error means that another program is using InnoDB's files");
-call mtr.add_suppression("InnoDB: The error means that another program is using InnoDB's files");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 32 in a file operation.");
 # Create encrypt table before loading keyring plugin
 SET GLOBAL innodb_file_per_table = 1;
 SELECT @@innodb_file_per_table;
@@ -10,11 +5,11 @@ SELECT @@innodb_file_per_table;
 1
 DROP TABLE IF EXISTS t_encrypt;
 CREATE TABLE t_encrypt(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 UNINSTALL PLUGIN keyring_file;
 ERROR 42000: PLUGIN keyring_file does not exist
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # Starting server with keyring plugin
 # restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
 DROP DATABASE IF EXISTS tde_db;
@@ -208,7 +203,7 @@ DROP TABLESPACE s_alt1;
 CREATE TEMPORARY TABLE tde_db.t_encrypt (a int, b text) ENCRYPTION="Y" ENGINE=InnoDB;
 ERROR HY000: This tablespace can't be encrypted.
 CREATE TABLE tde_db.t_encrypt_myisam (a int, b text) ENCRYPTION="Y" ENGINE=MyISAM;
-ERROR HY000: Table storage engine for 't_encrypt_myisam' doesn't have this option
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'ENCRYPTION'
 CREATE PROCEDURE tde_db.row_format_t_encrypt(row_form VARCHAR(1000))
 begin
 declare i int default 1;
diff --git a/mysql-test/suite/innodb/r/table_encrypt_4.result b/mysql-test/suite/innodb/r/table_encrypt_4.result
index 7e9163a8d45f..133679ad9a17 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_4.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_4.result
@@ -127,7 +127,7 @@ ALTER TABLE test.t1 DISCARD TABLESPACE;
 # Import without .cfp file
 # copying .cfg and .ibd file
 ALTER TABLE test.t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table is in an encrypted tablespace, but can't find the encryption meta-data file in importing)
+ERROR HY000: Schema mismatch (Table is in an encrypted tablespace, but the encryption meta-data file cannot be found while importing.)
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
 # Import without .idb file
 # copying .cfp and .cfg file
@@ -139,7 +139,7 @@ DROP TABLE t1;
 CREATE TABLE test.t1(c1 INT, c2 char(20)) ENGINE = InnoDB;
 ALTER TABLE test.t1 DISCARD TABLESPACE;
 ALTER TABLE test.t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Encryption attribute is no matched)
+ERROR HY000: Schema mismatch (Encryption attribute in the file does not match the dictionary.)
 # Import got expected error.
 DROP TABLE t1;
 CREATE TABLE test.t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
diff --git a/mysql-test/suite/innodb/r/table_encrypt_5.result b/mysql-test/suite/innodb/r/table_encrypt_5.result
index bee34cef86c7..994a05a203c0 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_5.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_5.result
@@ -1,19 +1,3 @@
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("InnoDB: Operating system error number");
-call mtr.add_suppression("The error means the system cannot find the path specified");
-call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
-call mtr.add_suppression("Could not find a valid tablespace file");
-call mtr.add_suppression("InnoDB: Ignoring tablespace");
-call mtr.add_suppression("InnoDB: Failed to find tablespace for table");
-call mtr.add_suppression("InnoDB: Cannot open table tde_db/t_encrypt.* from the internal data dictionary of InnoDB though the .frm file for the table exists");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Table tde_db/t_encrypt.* in the InnoDB data dictionary has tablespace id .*, but tablespace with that id or name does not exist");
-call mtr.add_suppression("\\[Warning\\] InnoDB: Please refer to .* for how to resolve the issue");
-call mtr.add_suppression("Error while loading keyring content. The keyring might be malformed");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 # Starting server with keyring plugin  
 # restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
 DROP DATABASE IF EXISTS tde_db;
@@ -202,7 +186,7 @@ COUNT(*)
 64
 # Error on "ALTER INSTANCE ..." after UNINSTALL PLUGIN
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # new encrypt table creation is blocked after uninstall
 CREATE TABLE tde_db.t_encrypt_3(c2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c3 CHAR(255) Default 'No text',
@@ -212,7 +196,7 @@ c6 INT GENERATED ALWAYS AS (JSON_EXTRACT(c4,'$.key_b')) VIRTUAL,
 c7 POINT NOT NULL,
 spatial INDEX idx2 (c7)
 )  ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # new non encrypt table 
 CREATE TABLE tde_db.t_non_encrypt_3(c2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c3 CHAR(255) Default 'No text',
@@ -537,9 +521,9 @@ c2	right(c3,20)	c4	c5	c6	ST_AsText(c7)
 # restart: 
 # encrypt table not accessible
 SELECT COUNT(*) FROM tde_db.t_encrypt;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 SELECT COUNT(*) FROM tde_db.t_encrypt_2;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # NON encrypt table are accessible
 SELECT COUNT(*) FROM tde_db.t_non_encrypt;
 COUNT(*)
@@ -556,7 +540,7 @@ c6 INT GENERATED ALWAYS AS (JSON_EXTRACT(c4,'$.key_b')) VIRTUAL,
 c7 POINT NOT NULL,
 spatial INDEX idx2 (c7)
 )  ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # non encrypt table possible
 CREATE TABLE tde_db.t_non_encrypt_4(c2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c3 CHAR(255) Default 'No text',
@@ -571,12 +555,12 @@ SELECT COUNT(*) FROM tde_db.t_non_encrypt_4;
 COUNT(*)
 64
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # encrypt table not accessible 
 SELECT COUNT(*) FROM tde_db.t_encrypt;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 SELECT COUNT(*) FROM tde_db.t_encrypt_2;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 DROP TABLE tde_db.t_encrypt , tde_db.t_encrypt_2;
 DROP TABLE tde_db.t_non_encrypt , tde_db.t_non_encrypt_2 ,tde_db.t_non_encrypt_4;
 DROP DATABASE tde_db;
@@ -725,9 +709,10 @@ c2	right(c3,20)	c4	c5	c6	ST_AsText(c7)
 9	aaaaaaaaaaaaaaaa0001	{"key_a": 1, "key_b": 2, "key_c": 3}	1	2	POINT(383293632 1754448)
 13	aaaaaaaaaaaaaaaa0001	{"key_a": 1, "key_b": 2, "key_c": 3}	1	2	POINT(383293632 1754448)
 14	aaaaaaaaaaaaaaaa0001	{"key_a": 1, "key_b": 2, "key_c": 3}	1	2	POINT(383293632 1754448)
-# restart without --early-plugin-load and keyring_file_data
-# AND explicitly install plugin to access old table
-# restart: 
+# restart without --early-plugin-load (still need to provide with
+# keyring_file_data otherwise it would point to default location which might be
+# non-writable to mtr). Instead explicitly install plugin to access old table
+# restart: --loose-keyring_file_data=MYSQL_TMP_DIR/mydummy_keyring
 # Install keyring plugin
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 # Set keyring_file_data as old file so as to access old tables
@@ -910,9 +895,9 @@ c6 INT GENERATED ALWAYS AS (JSON_EXTRACT(c4,'$.key_b')) VIRTUAL,
 c7 POINT NOT NULL,
 spatial INDEX idx2 (c7)
 )  ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 #-----------------------------------------------------------------------
 # Test 4 : Restart with new keyring_data_file
 # Old encrypt table not accessible , non encrypt tables accessible
@@ -988,9 +973,9 @@ c2	right(c3,20)	c4	c5	c6	ST_AsText(c7)
 # restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring_new --plugin-dir=KEYRING_PLUGIN_PATH
 # encrypt table not accessible
 SELECT COUNT(*) FROM tde_db.t_encrypt;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 SELECT COUNT(*) FROM tde_db.t_encrypt_2;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # NON encrypt table are accessible
 SELECT COUNT(*) FROM tde_db.t_non_encrypt;
 COUNT(*)
diff --git a/mysql-test/suite/innodb/r/table_encrypt_fts.result b/mysql-test/suite/innodb/r/table_encrypt_fts.result
new file mode 100644
index 000000000000..1d0caba8f518
--- /dev/null
+++ b/mysql-test/suite/innodb/r/table_encrypt_fts.result
@@ -0,0 +1,46 @@
+#
+# Bug#30787535 : FULLTEXT INDEX TABLES CREATED IN ENCRYPTED SCHEMA ARE NOT ENCRYPTED
+#
+#########
+# SETUP #
+#########
+
+#########################################################################
+# RESTART 1 : WITH KEYRING PLUGIN
+#########################################################################
+# restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
+# Create a new 'unencrypted' table
+CREATE TABLE t1 (id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+C1 TEXT(500),
+C2 VARCHAR(200),
+C3 VARCHAR(200)) ENCRYPTION='N' ENGINE=InnoDB;
+set global innodb_buf_flush_list_now = 1;
+# ---------------------------------------------------------------
+# Test 1 : t1 un-encrypted, FTS tables should also be unencrypted
+# ---------------------------------------------------------------
+# Check that tablespace file is not encrypted
+# Print result
+table space is Unencrypted.
+CREATE FULLTEXT INDEX idx ON t1(C1);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+set global innodb_buf_flush_list_now = 1;
+# Check that FTS tablespaces file is not encrypted
+# Print result
+table space is Unencrypted.
+# ---------------------------------------------------------------
+# Test 1 : t1 encrypted, FTS tables should also be unencrypted
+# ---------------------------------------------------------------
+ALTER TABLE t1 ENCRYPTION='Y';
+# Check that tablespace file is encrypted now
+# Print result
+table space is Encrypted.
+# Check that FTS tablespace file is encrypted now
+# Print result
+table space is Encrypted.
+###########
+# CLEANUP #
+###########
+DROP TABLE test.t1;
+# Restarting server without keyring to restore server state
+# restart: 
diff --git a/mysql-test/suite/innodb/r/table_encrypt_kill.result b/mysql-test/suite/innodb/r/table_encrypt_kill.result
index 965f46973487..5d69ec6fbd30 100644
--- a/mysql-test/suite/innodb/r/table_encrypt_kill.result
+++ b/mysql-test/suite/innodb/r/table_encrypt_kill.result
@@ -1,21 +1,3 @@
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("does not exist in the InnoDB internal data dictionary though MySQL is trying to drop it");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("InnoDB: Operating system error number");
-call mtr.add_suppression("The error means the system cannot find the path specified");
-call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
-call mtr.add_suppression("Could not find a valid tablespace file");
-call mtr.add_suppression("InnoDB: Ignoring tablespace");
-call mtr.add_suppression("InnoDB: Failed to find tablespace for table");
-call mtr.add_suppression("InnoDB: Cannot open table tde_db/t_encrypt.* from the internal data dictionary of InnoDB though the .frm file for the table exists");
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Table tde_db/t_encrypt.* in the InnoDB data dictionary has tablespace id .*, but tablespace with that id or name does not exist");
-call mtr.add_suppression("\\[Warning\\] InnoDB: Please refer to .* for how to resolve the issue");
-call mtr.add_suppression("Cannot create keyring directory");
-call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
 # Starting server with keyring plugin
 # restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
 DROP DATABASE IF EXISTS tde_db;
diff --git a/mysql-test/suite/innodb/r/table_encryption.result b/mysql-test/suite/innodb/r/table_encryption.result
new file mode 100644
index 000000000000..a36802300cdf
--- /dev/null
+++ b/mysql-test/suite/innodb/r/table_encryption.result
@@ -0,0 +1,86 @@
+# Starting server with keyring plugin  
+# restart: --early-plugin-load=keyring_file=keyring_file.so --loose-keyring_file_data=MYSQL_TMP_DIR/mysecret_keyring --plugin-dir=KEYRING_PLUGIN_PATH
+SET GLOBAL innodb_file_per_table = 1;
+SELECT @@innodb_file_per_table;
+@@innodb_file_per_table
+1
+#
+# BUG#29543447: ALTER TABLE ALLOWS TDE ENCRYPTION ON MYISAM ENGINE
+# We disallow ENCRYPTION clause requesting for table encryption.
+# We allow ENCRYPTION clause with 'n' or 'N' for Heap/CSV engines.
+# MyISAM engine rejects even 'n' or 'N' in some cases, we keep
+# this behavior as is for now.
+#
+# CREATE TABLE requesting ENCRYPTION
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='Y', ENGINE= MyISAM;
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'ENCRYPTION'
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='n', ENGINE= MyISAM;
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='n', ENGINE= HEAP;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=latin1 ENCRYPTION='n'
+DROP TABLE t1;
+# ALTER TABLE requesting ENCRYPTION
+CREATE TABLE t1 (fld1 INT) ENGINE=MyISAM;
+ALTER TABLE t1 ENCRYPTION= 'Y';
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'ENCRYPTION'
+ALTER TABLE t1 ENCRYPTION= 'N';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ENCRYPTION='N'
+# ALTER TABLE requesting ENCRYPTION with INPLACE algo.
+# Without patch, no error was reported.
+ALTER TABLE t1 ENCRYPTION= 'y', ALGORITHM=INPLACE;
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'ENCRYPTION'
+ALTER TABLE t1 ENCRYPTION= 'n', ALGORITHM=INPLACE;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ENCRYPTION='n'
+DROP TABLE t1;
+# ALTER TABLE requesting ENCRYPTION with COPY algo.
+# Without patch, error was reported by SE. With
+# this patch the error is reported by SQL server.
+CREATE TABLE t1 (fld1 INT NOT NULL) ENGINE=MyISAM;
+ALTER TABLE t1 ENCRYPTION= 'y', ALGORITHM=COPY;
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'ENCRYPTION'
+ALTER TABLE t1 ENCRYPTION= 'n', ALGORITHM=COPY;
+ERROR HY000: Table storage engine for '#sql-temporary' doesn't have this option
+# CSV/Heap allows values 'n' or 'N'.
+ALTER TABLE t1 ENGINE=CSV, ENCRYPTION= 'n', ALGORITHM=COPY;
+ALTER TABLE t1 ENGINE=Heap, ENCRYPTION= 'n', ALGORITHM=COPY;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=latin1 ENCRYPTION='n'
+DROP TABLE t1;
+# CREATE TABLE with ENCRYPTION=''.
+# Allow it as it is not requesting for encryption.
+CREATE TABLE t1 (fld1 INT) ENGINE=MyISAM, ENCRYPTION="";
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t1 ENCRYPTION= '';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+# Move encrypted InnoDB table to Heap.
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='Y', ENGINE=InnoDB;
+ALTER TABLE t1 ENGINE= Heap;
+ERROR HY000: Table storage engine 'MEMORY' does not support the create option 'ENCRYPTION'
+DROP TABLE t1;
+# Starting server without keyring
+# restart: 
+SET GLOBAL innodb_file_per_table=1;
diff --git a/mysql-test/suite/innodb/r/tinytext-groupby.result b/mysql-test/suite/innodb/r/tinytext-groupby.result
new file mode 100644
index 000000000000..5c555e91621d
--- /dev/null
+++ b/mysql-test/suite/innodb/r/tinytext-groupby.result
@@ -0,0 +1,33 @@
+#
+# Bug #29207450 TINYTEXT COLUMN TAKES LONG TIME IN THE GROUP BY OPERATION.
+#
+create table t1 (id serial primary key auto_increment,a varchar(100),b varchar(100));
+create table t2 (id serial primary key auto_increment,a varchar(100),b tinytext);
+insert into t1 (a, b) values('a', '746d847beb7e'),('a','746d847beb7e'),('a', '746d847beb7e'),('a','746d847beb7e'),('a','746d847beb7e');
+insert into t1 (a, b) select 'a', '746d847beb7e' from t1 t1,t1 t2,t1 t3,t1 t4;
+insert into t1 (a, b) select 'a', '746d847beb7e' from t1 t1,t1 t2;
+insert into t2 (a, b) values('a', '746d847beb7e'),('a','746d847beb7e'),('a', '746d847beb7e'),('a','746d847beb7e'),('a','746d847beb7e');
+insert into t2 (a, b) select 'a', '746d847beb7e' from t2 t1,t2 t2,t2 t3,t2 t4;
+insert into t2 (a, b) select 'a', '746d847beb7e' from t2 t1,t2 t2;
+select count(*) from t1;
+count(*)
+397530
+select count(*) from t2;
+count(*)
+397530
+set global internal_tmp_disk_storage_engine = 'innodb';
+select b, count(*) from t1 group by b;
+b	count(*)
+746d847beb7e	397530
+select b, count(*) from t2 group by b;
+b	count(*)
+746d847beb7e	397530
+set global internal_tmp_disk_storage_engine = 'myisam';
+select b, count(*) from t1 group by b;
+b	count(*)
+746d847beb7e	397530
+select b, count(*) from t2 group by b;
+b	count(*)
+746d847beb7e	397530
+set global internal_tmp_disk_storage_engine = default;
+drop table t1, t2;
diff --git a/mysql-test/suite/innodb/r/virtual_debug.result b/mysql-test/suite/innodb/r/virtual_debug.result
index f466f0fe7f32..c35838402a7d 100644
--- a/mysql-test/suite/innodb/r/virtual_debug.result
+++ b/mysql-test/suite/innodb/r/virtual_debug.result
@@ -125,10 +125,10 @@ SET DEBUG_SYNC = 'now SIGNAL go_ahead';
 /* connection default */ optimize table t;
 Table	Op	Msg_type	Msg_text
 test.t	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.t	optimize	error	Duplicate entry 'NULL' for key 'b'
+test.t	optimize	error	Duplicate entry 'NULL' for key 'c'
 test.t	optimize	status	Operation failed
 Warnings:
-Error	1062	Duplicate entry 'NULL' for key 'b'
+Error	1062	Duplicate entry 'NULL' for key 'c'
 SELECT c FROM t;
 c
 1
@@ -237,4 +237,309 @@ SELECT * FROM t;
 b	v
 fubar	fub
 DROP TABLE t;
+#
+# Bug#26375771 INNODB: ASSERTION FAILURE: MACH0DATA.IC:308:VAL > 0X7F
+#
+create table ibstd_07 (a int not null, d int not null, b blob not null, c text, vadcol int as (a+length(d)) stored, vbcol char(2) as (substr(b,2,2)) virtual, vbidxcol char(3) as (substr(b,1,3)) virtual , index(d  desc), index(a  desc), index(vbidxcol  desc), index(vbidxcol  desc,d  asc), unique key (b(101)  desc, a  asc, d ), index(c(255)  desc, b(255)  asc), index(b(5)  desc, c(10)  asc, a ) ) engine=InnoDB default charset=latin1 row_format=redundant;
+insert into ibstd_07 values (2, 2, repeat('rocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaooc','281'),repeat('ouolrculuouocououooalcoraooaulouuacrolrocooraoaooooolaccralacalooolalocoaacoorarorcurccarocucla','317'), default, default, default);
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead';
+alter table ibstd_07  add primary key (b(11)  desc,a  asc, d );;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+update ibstd_07 set c=repeat('0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo','70');
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+SELECT * FROM ibstd_07;
+a	d	b	c	vadcol	vbcol	vbidxcol
+2	2	rocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaoocrocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaooc	0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo	3	oc	roc
+DROP TABLE ibstd_07;
 SET DEBUG_SYNC = 'RESET';
+#
+# BUG#28448853 - ASSERTION FAILURE: ROW0LOG.CC:2153 ROW_LOG_TABLE_APPLY (THR=0X7F7C7C050030
+#
+CREATE TABLE t1(a INT NOT NULL, d INT NOT NULL, b VARCHAR(198) NOT NULL, c CHAR(84), vbcol CHAR(2) AS (substr(b, 2, 2)) VIRTUAL);
+INSERT INTO t1(a, d, b, c) VALUES(200, 300, '1.3.1415926535', 'hello world');
+SELECT * FROM t1;
+a	d	b	c	vbcol
+200	300	1.3.1415926535	hello world	.3
+SET DEBUG_SYNC = 'inplace_after_index_build SIGNAL altered WAIT_FOR dmls_done';
+ALTER TABLE t1 ROW_FORMAT = COMPRESSED;;
+SET DEBUG_SYNC = 'now WAIT_FOR altered';
+START TRANSACTION;
+UPDATE t1 SET b = '6.1516179' WHERE a = 200;
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dmls_done';
+SET DEBUG_SYNC = 'reset';
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL,
+  `d` int(11) NOT NULL,
+  `b` varchar(198) NOT NULL,
+  `c` char(84) DEFAULT NULL,
+  `vbcol` char(2) GENERATED ALWAYS AS (substr(`b`,2,2)) VIRTUAL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
+SELECT * FROM t1;
+a	d	b	c	vbcol
+200	300	1.3.1415926535	hello world	.3
+DROP TABLE t1;
+#
+# Bug#28825718 - ASSERTION FAILURE: TRX0REC.CC:NNN:N_IDX > 0 WHILE DOING REPLACE/INSERT
+#
+CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT GENERATED ALWAYS AS(b+1) VIRTUAL) ENGINE=InnoDB;
+INSERT INTO t1(a, b) VALUES(1, 1);
+SET DEBUG_SYNC = 'row_log_apply_after SIGNAL s1 WAIT_FOR s2';
+SET lock_wait_timeout = 1;
+ALTER TABLE t1 ADD UNIQUE INDEX(c, b);
+SET DEBUG_SYNC = 'now WAIT_FOR s1';
+SET DEBUG_SYNC = 'row_ins_sec_index_enter SIGNAL s2 WAIT_FOR s3';
+INSERT INTO t1(a, b) VALUES(2, 2);
+/* con1 reap */ ALTER TABLE t1 ADD UNIQUE INDEX(c, b);
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SET DEBUG_SYNC ='now SIGNAL s3';
+ALTER TABLE t1 ADD KEY(b);
+INSERT INTO t1(a, b) VALUES(3, 3);
+SELECT * FROM t1;
+a	b	c
+1	1	2
+2	2	3
+3	3	4
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
+#
+# Bug#28834208 ROW_LOG_TABLE_APPLY_UPDATE*INPLACE_ALTER_TABLE
+#
+CREATE TABLE t1 (
+pkey INT(11) PRIMARY KEY,
+a VARCHAR(100),
+v VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(a,2,2)) VIRTUAL,
+c varchar(100),
+UNIQUE KEY k (v)
+);
+INSERT INTO t1 ( pkey,a,c) VALUES (149,'bata','test');
+SELECT pkey,a,v FROM t1;
+pkey	a	v
+149	bata	at
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+OPTIMIZE TABLE t1;
+# Connect to con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET a='tata' WHERE pkey=149;
+SET DEBUG_SYNC ='now signal S2';
+SELECT pkey,a,v FROM t1;
+pkey	a	v
+149	tata	at
+# Connect to Default
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+SELECT * FROM t1;
+pkey	a	v	c
+149	tata	at	test
+DROP TABLE t1;
+CREATE TABLE t1 (
+pkey INT(11) PRIMARY KEY,
+a VARCHAR(100),
+v VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(a,2,2)) VIRTUAL,
+c varchar(100),
+v1 VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(c,2,2)) VIRTUAL,
+KEY k (v),
+KEY v (v1)
+);
+INSERT INTO t1 (pkey, a, c) VALUES (149, 'bata', 'test');
+INSERT INTO t1 (pkey, a, c) VALUES (150, 'bata', 'test');
+INSERT INTO t1 (pkey, a, c) VALUES (160, 'bata', 'test');
+SELECT pkey, a, v, c, v1 FROM t1;
+pkey	a	v	c	v1
+149	bata	at	test	es
+150	bata	at	test	es
+160	bata	at	test	es
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+OPTIMIZE TABLE t1;
+# Connect to con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET c = 'best' WHERE pkey = 149;
+UPDATE t1 SET a = 'tata' WHERE pkey = 150;
+UPDATE t1 SET a = 'tata', c = 'best' WHERE pkey = 160;
+SET DEBUG_SYNC ='now signal S2';
+SELECT pkey, a, v, c, v1 FROM t1;
+pkey	a	v	c	v1
+149	bata	at	best	es
+150	tata	at	test	es
+160	tata	at	best	es
+# Connect to Default
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+SELECT * FROM t1;
+pkey	a	v	c	v1
+149	bata	at	best	es
+150	tata	at	test	es
+160	tata	at	best	es
+DROP TABLE t1;
+CREATE TABLE t1(
+j SERIAL PRIMARY KEY,
+a VARCHAR(36),
+isa BOOLEAN,
+ab VARCHAR(36) AS (IF(`isa`,`a`,NULL )),
+KEY k(ab)
+);
+INSERT INTO t1 (a, isa) VALUES ('test', 1);
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+OPTIMIZE TABLE t1;
+# Connect to con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET isa=0 ;
+SET DEBUG_SYNC ='now signal S2';
+SELECT j,a,isa,ab FROM t1;
+j	a	isa	ab
+1	test	0	NULL
+# Connect to Default
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+SELECT j,a,isa,ab FROM t1;
+j	a	isa	ab
+1	test	0	NULL
+UPDATE t1 SET isa = 1 WHERE a = 'test' AND isa = 0;
+SELECT j,a,isa,ab FROM t1;
+j	a	isa	ab
+1	test	1	test
+DROP TABLE t1;
+#
+# Bug#29451999: CRASH WITH RANGE QUERIES
+#
+CREATE TABLE t1 (c1 JSON, c2 TINYTEXT, c3 TIMESTAMP(4), c4 JSON, c5 DOUBLE, c6 TIME(4), c7 LONGTEXT GENERATED ALWAYS AS ('20:30:44') VIRTUAL NOT NULL, KEY k1 (c7(12))) ENGINE=INNODB;
+INSERT INTO t1 (c1, c2, c3, c4) VALUES('{}', 1, '1991-05-27', '{}');
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+128
+SET GLOBAL innodb_purge_stop_now= ON;
+DELETE FROM t1;
+SELECT c4 FROM t1 WHERE c7 BETWEEN '16383' AND '2015-01-01';
+c4
+SET GLOBAL innodb_purge_run_now = ON;
+DROP TABLE t1;
+CREATE TABLE t2 (
+i INT NOT NULL,
+gc INT GENERATED ALWAYS AS (i) VIRTUAL NOT NULL,
+KEY (gc)
+);
+INSERT INTO t2 (i) VALUES (-1), (0), (1), (2);
+BEGIN;
+SELECT i FROM t2 FORCE INDEX (gc) WHERE gc <= -1;
+i
+-1
+SELECT gc FROM t2 FORCE INDEX (gc) WHERE gc <= -1;
+gc
+-1
+COMMIT;
+DROP TABLE t2;
+#
+# Bug #30556595  FAILING ASSERTION: !CURSOR->INDEX->IS_COMMITTED()
+# ON TABLE WITH GCOLS
+#
+# Testcase-1
+CREATE TABLE t (pid int PRIMARY KEY,
+uid int,
+vid int AS (uid) VIRTUAL);
+# Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+# Insert a record to generate an insert row log for the new index.
+# LOG-1 idx_vid : INSERT [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+# Update the record changing PK. It should generate 2 row logs for the new index.
+# LOG-2 idx_vid : DELETE [10, 1]
+# LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SELECT * FROM t;
+pid	uid	vid
+2	10	10
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+# Insert a record to re-use the delete marked record in idx_vid [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+SELECT * FROM t;
+pid	uid	vid
+1	10	10
+2	10	10
+DROP TABLE t;
+# Testcase-2
+CREATE TABLE t (pid int PRIMARY KEY,
+uid int,
+vid int AS (uid) VIRTUAL);
+# Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+# Start transaction
+BEGIN;
+# Insert a record to generate an insert row log for the new index.
+# LOG-1 idx_vid : INSERT [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+# Update the record changing PK. It should generate 2 row logs for the new index.
+# LOG-2 idx_vid : DELETE [10, 1]
+# LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SELECT * FROM t;
+pid	uid	vid
+2	10	10
+# Rollback transaction
+# LOG-4 idx_vid : DELETE [10, 2]
+# LOG-5 idx_vid : INSERT [10, 1]
+# LOG-6 idx_vid : DELETE [10, 1]
+ROLLBACK;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+# Insert a record to check valid entry in idx_vid [NULL, 1]
+INSERT INTO t(pid) VALUES (1);
+SELECT * FROM t;
+pid	uid	vid
+1	NULL	NULL
+DROP TABLE t;
+# Testcase-3
+CREATE TABLE t (pid int PRIMARY KEY,
+uid int,
+vid int AS (uid) VIRTUAL);
+INSERT INTO t(pid, uid) VALUES (1,10);
+# Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+# Update the record changing PK. It should generate 2 row logs for the new index.
+# LOG-2 idx_vid : DELETE [10, 1]
+# LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+# Read [2, 10, 10] row using idx_vid index key.
+select * from t where VID=10;
+pid	uid	vid
+2	10	10
+DROP TABLE t;
+# Testcase-4
+CREATE TABLE t (pid int PRIMARY KEY,
+uid int,
+vid int AS (uid) VIRTUAL);
+INSERT INTO t(pid, uid) VALUES (1,10);
+# Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+# Update the record changing PK. It should generate 2 row logs for the new index.
+# LOG-2 idx_vid : DELETE [10, 1]
+# LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+# Delete a record.
+delete from t limit 1;
+DROP TABLE t;
diff --git a/mysql-test/suite/innodb/r/virtual_fk.result b/mysql-test/suite/innodb/r/virtual_fk.result
index b51ff264f88e..f8867a6153c2 100644
--- a/mysql-test/suite/innodb/r/virtual_fk.result
+++ b/mysql-test/suite/innodb/r/virtual_fk.result
@@ -829,3 +829,41 @@ SELECT f1, f3 FROM t2;
 f1	f3
 3	2
 DROP TABLE t2, t1;
+#
+# Bug#32124113 MYSQL CRASH FOR GENERATED COLUMN DELETE WITH FOREIGN KEY
+#
+CREATE TABLE `emails` (
+`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int(10) unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_ES1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `emails_metadata` (
+`email_id` int(10) unsigned NOT NULL,
+PRIMARY KEY (`email_id`),
+CONSTRAINT `FK_EM1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+INSERT INTO `emails_metadata` VALUES (1);
+DELETE FROM `emails`;
+DROP TABLE `email_stats`;
+DROP TABLE `emails_metadata`;
+DROP TABLE `emails`;
diff --git a/mysql-test/suite/innodb/r/virtual_index.result b/mysql-test/suite/innodb/r/virtual_index.result
index e0f8646bb86d..a588a631e323 100644
--- a/mysql-test/suite/innodb/r/virtual_index.result
+++ b/mysql-test/suite/innodb/r/virtual_index.result
@@ -198,3 +198,41 @@ ALTER TABLE t1 ADD COLUMN col7a INT GENERATED ALWAYS AS (col1 % col2)
 VIRTUAL, ADD UNIQUE index idx (col1), algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: INPLACE ADD or DROP of virtual columns cannot be combined with other ALTER TABLE actions. Try ALGORITHM=COPY.
 DROP TABLE t1;
+#
+# Bug 27122803 - BACKPORT FIX FOR BUG 25899959 TO MYSQL-5.7
+#
+CREATE TABLE t1 (col1 int(10)) DEFAULT CHARSET=utf8mb4;
+ALTER TABLE t1 ADD col2 char(21) AS (col1 * col1), ADD INDEX n (col2);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `col1` int(10) DEFAULT NULL,
+  `col2` char(21) GENERATED ALWAYS AS ((`col1` * `col1`)) VIRTUAL,
+  KEY `n` (`col2`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+DROP TABLE t1;
+#
+# Bug 23014521 - mysqld crash at row_upd_sec_index_entry_low
+#
+SET @org_mode=@@sql_mode;
+SET @@sql_mode='';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+CREATE TABLE t1 (
+col1 blob,
+col3 blob,
+col4 blob,
+col5 blob GENERATED ALWAYS AS ((col1 - col4)) VIRTUAL,
+col5x blob GENERATED ALWAYS AS ((col1 / col3)) VIRTUAL,
+col9 text,
+col2b blob GENERATED ALWAYS AS ((col5x / col5)) VIRTUAL,
+KEY idx7 (col9(10), col5(5)),
+KEY idx10 (col9(10), col2b(5))
+) ENGINE=InnoDB;
+INSERT INTO t1 (col1,col3,col4,col9) VALUES (REPEAT('a',20),REPEAT('a',20),REPEAT('a',20),REPEAT('a',20));
+UPDATE t1 SET col1 = 50;
+DELETE FROM t1;
+DROP TABLE t1;
+SET @@sql_mode=@org_mode;
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
diff --git a/mysql-test/suite/innodb/r/xa_prepare_lock_release.result b/mysql-test/suite/innodb/r/xa_prepare_lock_release.result
new file mode 100644
index 000000000000..0c07795bf076
--- /dev/null
+++ b/mysql-test/suite/innodb/r/xa_prepare_lock_release.result
@@ -0,0 +1,56 @@
+#
+# Bug#27189701 INNODB: EARLY RELEASE OF GAP LOCKS FOR RC
+# ISOLATION [XA PREPARE]
+#
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int);
+Connection: default
+SET DEBUG='+d,ib_force_release_gap_lock_prepare';
+# 1.Test GAP lock only on supremum record
+XA START 'lock_trx';
+SELECT * FROM t1;
+col1	col2
+# Update empty table acquire GAP lock on supremum
+UPDATE t1 SET col2 = 100 where col1 = 10;
+Connection: con1
+INSERT INTO t1 values(10, 100);
+Connection: default
+XA END 'lock_trx';
+XA PREPARE 'lock_trx';
+Connection: con1
+INSERT INTO t1 values(20, 200);
+SELECT * FROM t1 ORDER BY col1;
+col1	col2
+10	100
+20	200
+Connection: default
+XA COMMIT 'lock_trx';
+# 2.Test GAP lock on multiple records
+XA START 'lock_trx_1';
+# Update table acquire GAP lock on all rows
+UPDATE t1 SET col2 = col2 + 1;
+Connection: con1
+INSERT INTO t1 values(5, 50);
+Connection: default
+XA END 'lock_trx_1';
+XA PREPARE 'lock_trx_1';
+Connection: con1
+INSERT INTO t1 values(15, 150);
+INSERT INTO t1 values(25, 150);
+SELECT * FROM t1 ORDER BY col1;
+col1	col2
+5	50
+10	100
+15	150
+20	200
+25	150
+Connection: default
+XA COMMIT 'lock_trx_1';
+SELECT * FROM t1 ORDER BY col1;
+col1	col2
+5	50
+10	101
+15	150
+20	201
+25	150
+SET DEBUG='-d,ib_force_release_gap_lock_prepare';
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/alter_crash.test b/mysql-test/suite/innodb/t/alter_crash.test
index 5417ec88e701..c48216eb63a0 100644
--- a/mysql-test/suite/innodb/t/alter_crash.test
+++ b/mysql-test/suite/innodb/t/alter_crash.test
@@ -1,6 +1,7 @@
 # Crash-safe InnoDB ALTER operations
 
 --source include/not_valgrind.inc
+--source include/not_asan.inc
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
diff --git a/mysql-test/suite/innodb/t/alter_kill.test b/mysql-test/suite/innodb/t/alter_kill.test
index 432716c6ce66..25787916c8e6 100644
--- a/mysql-test/suite/innodb/t/alter_kill.test
+++ b/mysql-test/suite/innodb/t/alter_kill.test
@@ -135,7 +135,7 @@ XA PREPARE 'x';
 
 -- echo # Attempt to start without an *.ibd file.
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
--- error 3
+-- error 3,42
 -- exec $MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: Tablespace [0-9]+ was not found at .*test.bug16735660.ibd;
diff --git a/mysql-test/suite/innodb/t/alter_row_format.test b/mysql-test/suite/innodb/t/alter_row_format.test
new file mode 100644
index 000000000000..8a7e16f708d1
--- /dev/null
+++ b/mysql-test/suite/innodb/t/alter_row_format.test
@@ -0,0 +1,45 @@
+--source include/have_innodb_16k.inc
+--echo #
+--echo # Bug #32507117	INDEX SIZE LARGER THAN 767 BYTES ALLOWED FOR INNODB WITH REDUNDANT ROW_FORMAT
+--echo #
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+set global innodb_default_row_format='redundant';
+
+CREATE TABLE `t1` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
+NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE `t2` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
+NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+insert into t1(comment) values('k');
+insert into t2(comment) values('k');
+
+--error ER_INDEX_COLUMN_TOO_LONG
+create index idx123 on t1 (`comment`);
+
+set global innodb_default_row_format='dynamic';
+--error ER_INDEX_COLUMN_TOO_LONG
+create index idx123 on t1 (`comment`);
+
+--error ER_INDEX_COLUMN_TOO_LONG
+alter table t1 add index idx123 (`comment`);
+
+alter table t1 add index idx123 (`comment`), algorithm=copy ;
+
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t1';
+
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t2';
+alter table t2 ROW_FORMAT=dynamic;
+SELECT ROW_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t2';
+
+drop table t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/mysql-test/suite/innodb/t/analyze_index.test b/mysql-test/suite/innodb/t/analyze_index.test
new file mode 100644
index 000000000000..23c4675a03bb
--- /dev/null
+++ b/mysql-test/suite/innodb/t/analyze_index.test
@@ -0,0 +1,32 @@
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+
+--echo	#
+--echo  # Bug #30607708	IF ANALYZE TABLE RUNS MORE THAN 600 SECONDS DIAGNOSTIC QUERY MAY CRASH SERVER
+--echo	#
+
+CREATE TABLE t1(a int, index inda(a)) ENGINE=INNODB;
+INSERT INTO t1 VALUES(1);
+
+SET DEBUG_SYNC='innodb_dict_stats_update_persistent SIGNAL analyze.running WAIT_FOR analyze.finish';
+--send ANALYZE TABLE t1
+
+# ANALYZE TABLE is running. Query for stats.
+
+--connect(con1, localhost, root)
+SET DEBUG_SYNC='now WAIT_FOR analyze.running';
+
+--disable_result_log
+SELECT ENGINE,SUM(DATA_LENGTH+INDEX_LENGTH),COUNT(ENGINE),SUM(DATA_LENGTH),SUM(INDEX_LENGTH) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema', 'performance_schema', 'mysql') AND ENGINE='InnoDB';
+--enable_result_log
+
+# let the ANALYZE TABLE to finish
+SET DEBUG_SYNC='now SIGNAL analyze.finish';
+--disconnect con1
+
+--connection default
+--reap
+SET DEBUG_SYNC= 'RESET';
+DROP TABLE t1;
+
diff --git a/mysql-test/suite/innodb/t/bulk_create_index_online.test b/mysql-test/suite/innodb/t/bulk_create_index_online.test
index c5da3d00aa34..f56563c9a235 100644
--- a/mysql-test/suite/innodb/t/bulk_create_index_online.test
+++ b/mysql-test/suite/innodb/t/bulk_create_index_online.test
@@ -33,3 +33,45 @@ DROP TABLE t1;
 # Clean up temporary files left by crash.
 let MYSQLD_DATADIR= `SELECT @@datadir`;
 --remove_files_wildcard $MYSQLD_DATADIR/test #sql*.frm
+
+#
+## Bug #26654685   INDEX->ID == BTR_PAGE_GET_INDEX_ID(PAGE)
+##		   AT BTR_CUR_SEARCH_TO_NTH_LEVEL IN BTR/B
+#
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+--source include/have_innodb_max_16k.inc
+
+CREATE TABLE parent (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO parent VALUES(1,2),(2,2);
+CREATE TABLE child (a INT PRIMARY KEY, b INT NOT NULL) ENGINE = InnoDB;
+INSERT INTO child VALUES (10, 2);
+
+# This should rollback due to dup key
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create
+WAIT_FOR go_ahead';
+--send CREATE UNIQUE INDEX idx ON parent(b);
+
+# Make table ref_count > 1
+connect (con1,localhost,root,,);
+connection con1;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+INSERT INTO parent VALUES(4, 2);
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+
+connection default;
+--error ER_DUP_ENTRY
+reap;
+SET DEBUG_SYNC = 'now SIGNAL conn_add_fk';
+
+connection con1;
+SET DEBUG_SYNC = 'now WAIT_FOR conn_add_fk';
+--error ER_CANNOT_ADD_FOREIGN
+ALTER TABLE child ADD CONSTRAINT cfx FOREIGN KEY (b) REFERENCES parent(b);
+
+--connection default
+DROP TABLE child;
+DROP TABLE parent;
+--disconnect con1
diff --git a/mysql-test/suite/innodb/t/check_sector_size-master.opt b/mysql-test/suite/innodb/t/check_sector_size-master.opt
index b5be2b8ba67d..68ec1504454b 100644
--- a/mysql-test/suite/innodb/t/check_sector_size-master.opt
+++ b/mysql-test/suite/innodb/t/check_sector_size-master.opt
@@ -1,3 +1,4 @@
 --innodb_flush_method=O_DIRECT
 $KEYRING_PLUGIN_OPT
 $KEYRING_PLUGIN_LOAD
+--loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key
diff --git a/mysql-test/suite/innodb/t/create_table.test b/mysql-test/suite/innodb/t/create_table.test
index 44361477fc7d..6ffcfd06c444 100644
--- a/mysql-test/suite/innodb/t/create_table.test
+++ b/mysql-test/suite/innodb/t/create_table.test
@@ -17,3 +17,33 @@ SET DEBUG ='+d, simulate_max_char_col';
 --error 1030
 create table t1(f1 varchar(1000))engine=innodb;
 SET DEBUG ='-d, simulate_max_char_col';
+
+--echo #
+--echo # Bug #27361662  ERROR NOT THROWN ON CREATING TEMPORARY TABLE IN
+--echo # INNODB_FILE_PER_TABLE TABLESPACE
+--echo #
+
+--echo "Try creating temporary table with innodb_file_per_table option with STRICT mode"
+# Enable STRICT mode
+SET innodb_strict_mode = ON;
+--error ER_ILLEGAL_HA_CREATE_OPTION
+CREATE TEMPORARY TABLE t1(c1 int) TABLESPACE innodb_file_per_table;
+
+# Validate that the table is not created
+--error ER_NO_SUCH_TABLE
+SELECT COUNT(*) FROM t1;
+
+--echo "Try creating temporary table with innodb_file_per_table option without STRICT mode"
+# Disable STRICT mode
+SET innodb_strict_mode = OFF;
+CREATE TEMPORARY TABLE t1(c1 int) TABLESPACE innodb_file_per_table;
+
+SHOW WARNINGS;
+
+# Validate temporary table exists
+SELECT COUNT(*) FROM t1;
+
+DROP TABLE t1;
+
+# Reset STRICT mode to default
+SET innodb_strict_mode = default;
diff --git a/mysql-test/suite/innodb/t/create_tablespace.test b/mysql-test/suite/innodb/t/create_tablespace.test
index fcc8a2b15e1f..47b7adb2b183 100644
--- a/mysql-test/suite/innodb/t/create_tablespace.test
+++ b/mysql-test/suite/innodb/t/create_tablespace.test
@@ -787,10 +787,42 @@ ALTER TABLE t_not_temp TABLESPACE=`innodb_temporary`;
 SHOW WARNINGS;
 DROP TABLE t_not_temp;
 
+--echo #
+--echo # Try to create or move a temporary table in innodb_file_per_table
+--echo # or innodb_temporary tablespaces with STRICT_MODE ON and OFF
+--echo #
 CREATE TEMPORARY TABLE t_my_temp (a int, b text) TABLESPACE=`innodb_temporary`;
 SHOW CREATE TABLE t_my_temp;
 DROP TABLE t_my_temp;
 
+SET innodb_strict_mode = OFF;
+
+CREATE TEMPORARY TABLE t_my_temp (a int, b text);
+SHOW CREATE TABLE t_my_temp;
+
+ALTER TABLE t_my_temp TABLESPACE innodb_temporary;
+SHOW WARNINGS;
+SHOW CREATE TABLE t_my_temp;
+
+ALTER TABLE t_my_temp TABLESPACE innodb_file_per_table;
+SHOW WARNINGS;
+SHOW CREATE TABLE t_my_temp;
+
+DROP TABLE t_my_temp;
+
+SET innodb_strict_mode = ON;
+CREATE TEMPORARY TABLE t_my_temp (a int, b text);
+SHOW CREATE TABLE t_my_temp;
+
+--error ER_ILLEGAL_HA_CREATE_OPTION
+ALTER TABLE t_my_temp TABLESPACE=innodb_file_per_table;
+
+ALTER TABLE t_my_temp TABLESPACE=innodb_temporary;
+SHOW WARNINGS;
+SHOW CREATE TABLE t_my_temp;
+
+DROP TABLE t_my_temp;
+
 --echo #
 --echo # Try to create or move a table into the redo tablespace
 --echo # or any tablespace using the reserved `innodb_` prefix.
diff --git a/mysql-test/suite/innodb/t/deadlock_detect.test b/mysql-test/suite/innodb/t/deadlock_detect.test
index a54a24af11de..3faa8324401f 100644
--- a/mysql-test/suite/innodb/t/deadlock_detect.test
+++ b/mysql-test/suite/innodb/t/deadlock_detect.test
@@ -1,3 +1,5 @@
+--source include/have_debug_sync.inc
+
 #
 # wl#9383 INNODB: ADD AN OPTION TO TURN OFF/ON DEADLOCK CHECKER
 #
@@ -54,3 +56,96 @@ disconnect con1;
 
 SET GLOBAL innodb_lock_wait_timeout=default;
 SET GLOBAL innodb_deadlock_detect=default;
+
+
+--echo #
+--echo #Bug #23036096 INNODB LAST DETECTED DEADLOCK NOT SHOWING FULL QUERY
+--echo #
+
+#This test will check whether the detected deadlock shows full query or not
+
+SET GLOBAL innodb_deadlock_detect=ON;
+SET GLOBAL innodb_lock_wait_timeout=20;
+
+connect(con1, localhost, root,,);
+connect(con2, localhost, root,,);
+
+CREATE TABLE bug(
+    id INT PRIMARY KEY,
+    ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA INT,
+    ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB INT,
+    ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC INT,
+    ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD INT,
+    ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE INT,
+    ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF INT,
+    ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG INT,
+    ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH INT,
+    ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII INT,
+    ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ INT,
+    ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK INT,
+    ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM INT,
+    ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN INT,
+    ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO INT,
+    ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP INT,
+    ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ INT,
+    ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR INT,
+    ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS INT,
+    ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT INT,
+    ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU INT)
+    engine = innodb;
+
+INSERT INTO bug(id) VALUES(0), (1);
+
+--connection con1
+    BEGIN;
+    SELECT * FROM bug WHERE id = 0 FOR UPDATE;
+
+--connection con2
+    BEGIN;
+    SELECT * FROM bug WHERE id = 1 FOR UPDATE;
+
+--connection con1
+    SET DEBUG_SYNC = 'lock_wait_will_wait SIGNAL con1_will_wait';
+    --send SELECT * FROM bug WHERE id = 1 AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0 AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0 AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0 AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0 AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0 AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0 AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0 AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0 AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0 AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0 AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0 AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0 AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0 AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0 AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0 AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0 AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0 AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0 AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0 AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0 FOR UPDATE;
+
+--connection con2
+    SET DEBUG_SYNC = 'now WAIT_FOR con1_will_wait';
+    --error ER_LOCK_DEADLOCK
+    SELECT * FROM bug WHERE id = 0
+        AND ColumnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = 0
+        AND ColumnBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB = 0
+        AND ColumnCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC = 0
+        AND ColumnDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD = 0
+        AND ColumnEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE = 0
+        AND ColumnFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF = 0
+        AND ColumnGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG = 0
+        AND ColumnHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH = 0
+        AND ColumnIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII = 0
+        AND ColumnJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ = 0
+        AND ColumnKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK = 0
+        AND ColumnMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM = 0
+        AND ColumnNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN = 0
+        AND ColumnOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO = 0
+        AND ColumnPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP = 0
+        AND ColumnQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ = 0
+        AND ColumnRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR = 0
+        AND ColumnSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS = 0
+        AND ColumnTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT = 0
+        AND ColumnUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU = 0
+    FOR UPDATE;
+
+--connection con1
+    --reap
+    ROLLBACK;
+
+--source suite/innodb/include/show_last_deadlock.inc
+
+--connection default
+    DROP TABLE bug;
+
+disconnect con1;
+disconnect con2;
+
+SET GLOBAL innodb_lock_wait_timeout = default;
+SET GLOBAL innodb_deadlock_detect = default;
+
diff --git a/mysql-test/suite/innodb/t/default_row_format_compatibility.test b/mysql-test/suite/innodb/t/default_row_format_compatibility.test
index 0fce0c4e5157..9753350fa27b 100644
--- a/mysql-test/suite/innodb/t/default_row_format_compatibility.test
+++ b/mysql-test/suite/innodb/t/default_row_format_compatibility.test
@@ -160,7 +160,7 @@ SELECT * FROM tab;
 SET GLOBAL innodb_default_row_format=COMPACT;
 
 # Check error ERROR 1709 (HY000): Index column size too large
--- error ER_INDEX_COLUMN_TOO_LONG
+--error ER_TOO_LONG_KEY
 ALTER TABLE tab ROW_FORMAT=COMPACT;
 
 # Cleanup
diff --git a/mysql-test/suite/innodb/t/deprecate_part_in_shared_ts.test b/mysql-test/suite/innodb/t/deprecate_part_in_shared_ts.test
new file mode 100644
index 000000000000..4deb332b2f8b
--- /dev/null
+++ b/mysql-test/suite/innodb/t/deprecate_part_in_shared_ts.test
@@ -0,0 +1,119 @@
+################################################################################
+# Test case to test deprecation warning message to be thrown when a partition  #
+# of a partitioned table is found in a shared tablespace.                      #
+#                                                                              #
+# This test case will test                                                     #
+#    - Partitioned Table create/alter with different combination of tablespace #
+#      at table level and partition level.                                     #
+################################################################################
+
+--source include/no_valgrind_without_big.inc
+CREATE TABLESPACE ts add datafile 'ts.ibd';
+
+--echo #########################################################################
+--echo # Partitioned Table                                                     #
+--echo #########################################################################
+--echo
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--echo # Create table without explicit tablespace name
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30));
+
+--echo # Try to ALTER TABLE to have general tablespace at table level
+ALTER TABLE t1 TABLESPACE=ts;
+DROP TABLE t1;
+
+--echo # Create table with general tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	TABLESPACE=ts
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30));
+DROP TABLE t1;
+
+--echo # Create table with system tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	TABLESPACE=innodb_system
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30));
+DROP TABLE t1;
+
+--echo # Create table with innodb_file_per_table tablespace at table level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	TABLESPACE=innodb_file_per_table
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30));
+DROP TABLE t1;
+
+--echo # Create table with general tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30) TABLESPACE=ts);
+DROP TABLE t1;
+
+--echo # Create table with system tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30) TABLESPACE=innodb_system);
+DROP TABLE t1;
+
+--echo # Create table with innodb_file_per_table tablespace at partition level
+CREATE TABLE t1 (id INT, name VARCHAR(50))
+	PARTITION BY RANGE(id) (
+		PARTITION p0 VALUES LESS THAN (10),
+		PARTITION p1 VALUES LESS THAN (20),
+		PARTITION p2 VALUES LESS THAN (30),
+		PARTITION p3 VALUES LESS THAN (40) TABLESPACE=innodb_file_per_table);
+
+--echo # Alter table to move a partition to general tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P0 INTO (
+	PARTITION P0 VALUES LESS THAN (10) TABLESPACE=ts);
+
+--echo # Alter table to move a partition to system tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P1 INTO (
+	PARTITION P1 VALUES LESS THAN (20) TABLESPACE=innodb_system);
+
+--echo # Alter table to move a partition to file_per_table tablespace.
+ALTER TABLE t1 REORGANIZE PARTITION P2 INTO (
+	PARTITION P2 VALUES LESS THAN (30) TABLESPACE=innodb_file_per_table);
+
+SHOW CREATE TABLE t1;
+
+--echo # Alter table to add a new partition in general tablespace
+ALTER TABLE t1 ADD PARTITION (
+	PARTITION p4 VALUES LESS THAN (50) tablespace=ts);
+
+--echo # Alter table to add a new partition in innodb_system tablespace
+ALTER TABLE t1 ADD PARTITION (
+	PARTITION p5 VALUES LESS THAN (60) tablespace=innodb_system);
+
+--echo # Alter table to add a new partition in innodb_file_per_table tablespace
+ALTER TABLE t1 ADD PARTITION (
+	PARTITION p6 VALUES LESS THAN (70) tablespace=innodb_file_per_table);
+
+--echo # Alter table to add a new partition without giving tablespace
+ALTER TABLE t1 ADD PARTITION (
+	PARTITION p7 VALUES LESS THAN (80));
+
+SHOW CREATE TABLE t1;
+
+--echo ###########
+--echo # Cleanup #
+--echo ###########
+DROP TABLE t1;
+DROP TABLESPACE ts;
diff --git a/mysql-test/suite/innodb/t/end_range_check_2.test b/mysql-test/suite/innodb/t/end_range_check_2.test
new file mode 100644
index 000000000000..2c2f55efefa8
--- /dev/null
+++ b/mysql-test/suite/innodb/t/end_range_check_2.test
@@ -0,0 +1,55 @@
+--source include/have_innodb.inc
+--source include/have_innodb_16k.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug #26300119	ASSERTION IN PREBUILT->TRX->ISOLATION_LEVEL == TRX_ISO_READ_UNCOMMITTED
+--echo #
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+DELIMITER |;
+CREATE PROCEDURE populate_t1(IN BASE INT, IN SIZE INT)
+BEGIN
+        DECLARE i INT DEFAULT BASE;
+        WHILE (i <= SIZE) DO
+                INSERT INTO t1 VALUES  (i, repeat('10101010101010101010',2000));
+                SET i = i + 1;
+        END WHILE;
+END|
+DELIMITER ;|
+
+CREATE TABLE t1 (
+        pk int,
+        col_blob_key blob,
+        primary key (pk)
+);
+
+CALL populate_t1(1, 100);
+
+connection con1;
+START TRANSACTION;
+CALL populate_t1(101, 199);
+SET DEBUG_SYNC='before_insertion_of_blob SIGNAL halted_insert WAIT_FOR proceed';
+--send INSERT INTO t1 VALUES (200, repeat('10101010101010101010',2000));
+
+connection con2;
+SET DEBUG_SYNC='now WAIT_FOR halted_insert';
+SET DEBUG_SYNC='allow_insert SIGNAL proceed';
+--disable_result_log
+SELECT pk, col_blob_key FROM t1 WHERE pk between 99 and 100;
+--enable_result_log
+
+connection con1;
+--reap
+COMMIT;
+
+connection default;
+disconnect con1;
+disconnect con2;
+
+SET DEBUG_SYNC='RESET';
+DROP PROCEDURE populate_t1;
+DROP TABLE t1;
+
diff --git a/mysql-test/suite/innodb/t/events-merge-tmp-path-master.opt b/mysql-test/suite/innodb/t/events-merge-tmp-path-master.opt
new file mode 100644
index 000000000000..0467aea4f12b
--- /dev/null
+++ b/mysql-test/suite/innodb/t/events-merge-tmp-path-master.opt
@@ -0,0 +1 @@
+--performance_schema_events_waits_history_long_size=100000 --innodb_sort_buffer_size=64k --innodb-buffer-pool-size=8M --tmpdir=$MYSQLTEST_VARDIR_ABS
diff --git a/mysql-test/suite/innodb/t/events-merge-tmp-path.test b/mysql-test/suite/innodb/t/events-merge-tmp-path.test
new file mode 100644
index 000000000000..584ec92dfcc1
--- /dev/null
+++ b/mysql-test/suite/innodb/t/events-merge-tmp-path.test
@@ -0,0 +1,31 @@
+### test to check if performance_schema.events_waits_history_long
+### reflects correct data
+
+### disable for embedded server
+--source include/not_embedded.inc
+update  performance_schema.setup_instruments set enabled='YES' where name like '%innodb_temp%';
+update performance_schema.setup_consumers set enabled='YES';
+use test;
+CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(180) NOT NULL, `name2` varchar(180) DEFAULT NULL, `name3` varchar(180) DEFAULT NULL, `name4` varchar(180) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
+ set @id:=0;
+
+### populate random data
+ insert into t1 values
+  (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
+, (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000));
+insert into `t1`(`id`,`name1`,`name2`,`name3`,`name4`)
+select  @id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000)  from
+`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6;
+
+#create inplace index and check if data is mention in events_waits_h
+create index i_dtyp_big on `t1`(name1) algorithm=inplace;
+
+--replace_regex /[\\\/]Innodb Merge Temp File/#Innodb Merge Temp File/
+--replace_result $MYSQLTEST_VARDIR_ABS MYSQL_TEST_DIR
+
+select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%'
+and object_name like '%Innodb Merge Temp File%';
+drop table t1;
+
diff --git a/mysql-test/suite/innodb/t/foreign_key.test b/mysql-test/suite/innodb/t/foreign_key.test
index f4b0dee2f993..7368a8e29d85 100644
--- a/mysql-test/suite/innodb/t/foreign_key.test
+++ b/mysql-test/suite/innodb/t/foreign_key.test
@@ -113,3 +113,143 @@ WHERE table_name = 't2';
 
 DROP TABLE t2;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#33053297 VIRTUAL INDEX CORRUPTED DURING CASCADE UPDATE ON CHILD TABLE
+--echo #
+
+--echo #Test-Case 1
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+DELETE FROM `emails`;
+DELETE FROM `email_stats`;
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # Test-Case 2
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `IDX_ES1` (`email_id`),
+KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+CONSTRAINT `FK_EA1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL ON UPDATE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+UPDATE `emails` SET `id` = 2 where `id` = 1;
+SELECT id FROM `email_stats` WHERE `generated_sent_date` IS NULL;
+SELECT * FROM `email_stats`;
+UPDATE `email_stats` SET `email_id`=2
+WHERE DATE(`generated_sent_date`) = '2020-10-22';
+SELECT * FROM `email_stats`;
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # test-case 3
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+DELETE FROM `emails`;
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
+
+--echo # test-case 4
+CREATE TABLE `emails` (
+`id` int unsigned NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+CREATE TABLE `email_stats` (
+`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+`email_id` int unsigned DEFAULT NULL,
+`date_sent` datetime NOT NULL,
+`generated_sent_email` varchar(20) GENERATED ALWAYS AS
+(CONCAT(YEAR(`date_sent`),'-', COALESCE(`email_id`, ' '))) VIRTUAL,
+PRIMARY KEY (`id`),
+KEY `idx_es1` (`email_id`),
+KEY `mautic_generated_sent_date_email`
+(`generated_sent_email`,`email_id`),
+CONSTRAINT `fk_ea1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON UPDATE SET NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-1';
+UPDATE `emails` SET `id` = 2 WHERE `id` = 1;
+SELECT * FROM `email_stats`;
+SELECT `date_sent` FROM `email_stats` WHERE `generated_sent_email` = '2020-';
+
+#clean up.
+DROP TABLE `email_stats`;
+DROP TABLE `emails`;
diff --git a/mysql-test/suite/innodb/t/fts_exec_interrupt.test b/mysql-test/suite/innodb/t/fts_exec_interrupt.test
new file mode 100644
index 000000000000..0c9b25a0efc6
--- /dev/null
+++ b/mysql-test/suite/innodb/t/fts_exec_interrupt.test
@@ -0,0 +1,37 @@
+--source include/not_embedded.inc
+--source include/have_statement_timeout.inc
+--source include/have_query_cache.inc
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+--source include/big_test.inc
+
+CREATE TABLE `fttest04` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `str` varchar(300) DEFAULT NULL,
+  `str2` mediumtext,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `idx` (`str`,`str2`)
+) ENGINE=InnoDB AUTO_INCREMENT=65520 DEFAULT CHARSET=utf8mb4;
+
+--disable_result_log
+DELIMITER |;
+CREATE PROCEDURE load_test_data()
+BEGIN
+
+DECLARE cnt INTEGER UNSIGNED DEFAULT 1;
+	WHILE (cnt <= 600220) DO
+		INSERT INTO fttest04(str, str2) VALUES('徳島県','徳島県');
+		SET cnt= cnt+1;
+	END WHILE;
+END|
+DELIMITER ;|
+
+CALL load_test_data();
+DROP PROCEDURE load_test_data;
+
+--enable_result_log
+--error ER_QUERY_TIMEOUT
+SELECT /*+ max_execution_time(2000) */ COUNT(id) FROM fttest04 WHERE
+MATCH (str,str2) AGAINST ('徳島県' IN BOOLEAN MODE) ;
+
+DROP TABLE fttest04;
diff --git a/mysql-test/suite/innodb/t/import_compress_encrypt.test b/mysql-test/suite/innodb/t/import_compress_encrypt.test
new file mode 100644
index 000000000000..c8def35a55a9
--- /dev/null
+++ b/mysql-test/suite/innodb/t/import_compress_encrypt.test
@@ -0,0 +1,173 @@
+# Test "ALTER TABLE ... IMPORT TABLESPACE" in InnoDB
+
+--source include/have_lowercase0.inc
+--source include/have_innodb_16k.inc
+--source include/have_punch_hole.inc
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug#31313533 : IMPORT FAILS FOR ENCRYPT AND COMPRESSION ENABLED TDE TABLES
+--echo #
+
+--disable_query_log
+call mtr.add_suppression("Resizing redo log");
+call mtr.add_suppression("Starting to delete and rewrite log files");
+call mtr.add_suppression("New log files created");
+# Table 'performance_schema'.'processlist' was added in 5.7.39
+# It is not present in the 5.7.32 import test file.
+call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing");
+--enable_query_log
+
+--echo # SETUP
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+
+--echo # RESTART WITH KEYRING PLUGIN
+let $restart_parameters = restart: --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR $KEYRING_PLUGIN_OPT KEYRING_PLUGIN_OPT
+--source include/restart_mysqld.inc
+
+--echo
+--echo # Test 1 : Check that EXPORT and IMPORT is working fine on same FS
+--echo
+
+CREATE TABLE t1(c1 int NOT NULL AUTO_INCREMENT,
+                c2 varchar(65000) DEFAULT NULL,
+                c3 varchar(255) GENERATED ALWAYS AS (substr(c2,2,100)) STORED,
+                c4 varchar(255) GENERATED ALWAYS AS (substr(c2,10,200)) VIRTUAL,
+                b bit(64) DEFAULT NULL,
+                p_c1 bigint DEFAULT NULL,
+                PRIMARY KEY (c1)) ENGINE=Innodb AUTO_INCREMENT=50001 DEFAULT CHARSET=latin1 COMPRESSION='zlib' ENCRYPTION='Y';
+
+--disable_query_log
+--let $i = 1
+while ($i < 6000) {
+  INSERT INTO t1(c2,b,p_c1) VALUES(AES_ENCRYPT("5dd0786a3c7adf503202b8e234a95cbe643bc752028e1792ca8e6ef86c69582eb1cc478670c8e5d6c0133d1b4e5c98017aeb893f9db5f1bff397bc9e0f5fde48","abc"),10,100);
+  --inc $i
+}
+--enable_query_log
+
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Flush tables for export
+FLUSH TABLES t1 FOR EXPORT;
+
+--echo # Copy .cfp .cfg .ibd file to temp
+--copy_file $MYSQLD_DATADIR/test/t1.cfp $MYSQLTEST_VARDIR/tmp/t1.cfp
+--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLTEST_VARDIR/tmp/t1.cfg
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLTEST_VARDIR/tmp/t1.ibd
+
+UNLOCK TABLES;
+
+DROP TABLE t1;
+
+CREATE TABLE t1(c1 int NOT NULL AUTO_INCREMENT,
+                c2 varchar(65000) DEFAULT NULL,
+                c3 varchar(255) GENERATED ALWAYS AS (substr(c2,2,100)) STORED,
+                c4 varchar(255) GENERATED ALWAYS AS (substr(c2,10,200)) VIRTUAL,
+                b bit(64) DEFAULT NULL,
+                p_c1 bigint DEFAULT NULL,
+                PRIMARY KEY (c1)) ENGINE=Innodb AUTO_INCREMENT=50001 DEFAULT CHARSET=latin1 COMPRESSION='zlib' ENCRYPTION='Y';
+
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--echo # Copy .cfp/.cfg and .ibd files from temp to datadir
+--copy_file $MYSQLTEST_VARDIR/tmp/t1.cfp $MYSQLD_DATADIR/test/t1.cfp
+--copy_file $MYSQLTEST_VARDIR/tmp/t1.cfg $MYSQLD_DATADIR/test/t1.cfg
+--copy_file $MYSQLTEST_VARDIR/tmp/t1.ibd $MYSQLD_DATADIR/test/t1.ibd
+
+--echo # Start import
+ALTER TABLE t1 IMPORT TABLESPACE;
+
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Cleanup
+DROP TABLE t1;
+--remove_file $MYSQLTEST_VARDIR/tmp/t1.cfp
+--remove_file $MYSQLTEST_VARDIR/tmp/t1.cfg
+--remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
+
+--echo
+--echo # Test 2 : Check that EXPORT and IMPORT is working fine on different FS
+--echo
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+
+--echo # Copy and unzip the dir having cfg/cfg/ibd file from a different FS Block Size
+--copy_file $MYSQLTEST_VARDIR/std_data/import2_57_32.zip $MYSQL_TMP_DIR/import2_57_32.zip
+--file_exists $MYSQL_TMP_DIR/import2_57_32.zip
+--exec unzip -qo $MYSQL_TMP_DIR/import2_57_32.zip -d $MYSQL_TMP_DIR
+--file_exists $MYSQL_TMP_DIR/import2_57_32/t1.cfp
+--file_exists $MYSQL_TMP_DIR/import2_57_32/t1.cfg
+--file_exists $MYSQL_TMP_DIR/import2_57_32/t1.ibd
+
+CREATE TABLE t1(c1 int NOT NULL AUTO_INCREMENT,
+                c2 varchar(65000) DEFAULT NULL,
+                c3 varchar(255) GENERATED ALWAYS AS (substr(c2,2,100)) STORED,
+                c4 varchar(255) GENERATED ALWAYS AS (substr(c2,10,200)) VIRTUAL,
+                b bit(64) DEFAULT NULL,
+                p_c1 bigint DEFAULT NULL,
+                PRIMARY KEY (c1)) ENGINE=Innodb AUTO_INCREMENT=50001 DEFAULT CHARSET=latin1 COMPRESSION='zlib' ENCRYPTION='Y';
+
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--echo # Copy .cfp/.cfg and .ibd files from temp to datadir
+--copy_file $MYSQL_TMP_DIR/import2_57_32/t1.cfp $MYSQLD_DATADIR/test/t1.cfp
+--copy_file $MYSQL_TMP_DIR/import2_57_32/t1.cfg $MYSQLD_DATADIR/test/t1.cfg
+--copy_file $MYSQL_TMP_DIR/import2_57_32/t1.ibd $MYSQLD_DATADIR/test/t1.ibd
+
+--echo # Start import
+ALTER TABLE t1 IMPORT TABLESPACE;
+
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+--echo # Remove copied files
+--file_exists $MYSQL_TMP_DIR/import2_57_32.zip
+#--rmdir $MYSQL_TMP_DIR/import2_57_32
+--remove_file $MYSQL_TMP_DIR/import2_57_32.zip
+
+--echo
+--echo # Test 3 : Check that IMPORT works fine from previous version on same FS
+--echo
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+
+--echo # Copy and unzip the dir having cfg/cfg/ibd file from previous version.
+--copy_file $MYSQLTEST_VARDIR/std_data/import_57_32.zip $MYSQL_TMP_DIR/import_57_32.zip
+--file_exists $MYSQL_TMP_DIR/import_57_32.zip
+--exec unzip -qo $MYSQL_TMP_DIR/import_57_32.zip -d $MYSQL_TMP_DIR
+--file_exists $MYSQL_TMP_DIR/import_57_32/t1.cfp
+--file_exists $MYSQL_TMP_DIR/import_57_32/t1.cfg
+--file_exists $MYSQL_TMP_DIR/import_57_32/t1.ibd
+
+CREATE TABLE t1(c1 int NOT NULL AUTO_INCREMENT,
+                c2 varchar(65000) DEFAULT NULL,
+                c3 varchar(255) GENERATED ALWAYS AS (substr(c2,2,100)) STORED,
+                c4 varchar(255) GENERATED ALWAYS AS (substr(c2,10,200)) VIRTUAL,
+                b bit(64) DEFAULT NULL,
+                p_c1 bigint DEFAULT NULL,
+                PRIMARY KEY (c1)) ENGINE=Innodb AUTO_INCREMENT=50001 DEFAULT CHARSET=latin1 COMPRESSION='zlib' ENCRYPTION='Y';
+
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--echo # Copy .cfp/.cfg and .ibd files from temp to datadir
+--copy_file $MYSQL_TMP_DIR/import_57_32/t1.cfp $MYSQLD_DATADIR/test/t1.cfp
+--copy_file $MYSQL_TMP_DIR/import_57_32/t1.cfg $MYSQLD_DATADIR/test/t1.cfg
+--copy_file $MYSQL_TMP_DIR/import_57_32/t1.ibd $MYSQLD_DATADIR/test/t1.ibd
+
+--echo # Start import
+ALTER TABLE t1 IMPORT TABLESPACE;
+
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+--echo # Remove copied files
+--file_exists $MYSQL_TMP_DIR/import_57_32.zip
+#--rmdir $MYSQL_TMP_DIR/import_57_32
+--remove_file $MYSQL_TMP_DIR/import_57_32.zip
+
+--source include/force_restart.inc
diff --git a/mysql-test/suite/innodb/t/import_compress_encrypt_upgrade.test b/mysql-test/suite/innodb/t/import_compress_encrypt_upgrade.test
new file mode 100644
index 000000000000..80684258fadb
--- /dev/null
+++ b/mysql-test/suite/innodb/t/import_compress_encrypt_upgrade.test
@@ -0,0 +1,63 @@
+# Test "ALTER TABLE ... IMPORT TABLESPACE" in InnoDB
+
+--source include/have_lowercase0.inc
+--source include/have_innodb_16k.inc
+--source include/have_punch_hole.inc
+--source include/not_embedded.inc
+--source include/have_64bit.inc # The disk keyring_file data are not portable
+
+--echo #
+--echo # Bug#31313533 : IMPORT FAILS FOR ENCRYPT AND COMPRESSION ENABLED TDE TABLES
+--echo # upgrade section
+--echo #
+
+--disable_query_log
+call mtr.add_suppression("Resizing redo log");
+call mtr.add_suppression("Starting to delete and rewrite log files");
+call mtr.add_suppression("New log files created");
+# Table 'performance_schema'.'processlist' was added in 5.7.39
+# It is not present in the 5.7.32 import test file.
+call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing");
+--enable_query_log
+
+--echo
+--echo # Test 4 : check table from old version are read correctly after upgrade
+--echo
+
+--echo # Stop the running the server
+--source include/shutdown_mysqld.inc
+
+--echo # Copy and unzip the datadir.
+--copy_file $MYSQLTEST_VARDIR/std_data/data_57_32.zip $MYSQL_TMP_DIR/data_57_32.zip
+--file_exists $MYSQL_TMP_DIR/data_57_32.zip
+--exec unzip -qo $MYSQL_TMP_DIR/data_57_32.zip -d $MYSQL_TMP_DIR
+let $DATADIR = $MYSQL_TMP_DIR/data;
+
+--echo # Restart the server against the unzipped datadir
+--replace_result $DATADIR DATADIR $KEYRING_PLUGIN_OPT KEYRING_PLUGIN_OPT
+--let $restart_parameters = restart: --datadir=$DATADIR --innodb-page-size=16k --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/data/keyring $KEYRING_PLUGIN_OPT
+--let $wait_counter=3000
+--source include/start_mysqld.inc
+
+--echo # Verify tables after upgrade
+USE test;
+SHOW CREATE TABLE t1;
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Run some DML statements
+INSERT INTO t1(c2,b,p_c1) VALUES(AES_ENCRYPT("5dd0786a3c7adf503202b8e234a95cbe643bc752028e1792ca8e6ef86c69582eb1cc478670c8e5d6c0133d1b4e5c98017aeb893f9db5f1bff397bc9e0f5fde48","abc"),10,100);
+DELETE FROM t1 WHERE c1=50001;
+
+--echo # Verify results
+SELECT c1, SUBSTRING(c2, 10, 10), SUBSTRING(c3, 10, 10), SUBSTRING(c4, 10, 10), b FROM t1 ORDER BY c1 limit 10;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+--let $restart_parameters= restart
+--source include/restart_mysqld.inc
+
+--echo # Remove copied files
+--file_exists $MYSQL_TMP_DIR/data_57_32.zip
+#--force-rmdir $MYSQL_TMP_DIR/data
+--remove_file $MYSQL_TMP_DIR/data_57_32.zip
diff --git a/mysql-test/suite/innodb/t/import_tablespace_page_corrupt.test b/mysql-test/suite/innodb/t/import_tablespace_page_corrupt.test
new file mode 100644
index 000000000000..e14137dfb3cc
--- /dev/null
+++ b/mysql-test/suite/innodb/t/import_tablespace_page_corrupt.test
@@ -0,0 +1,41 @@
+#
+#Bug #29454828 ASSERTION ON IMPORT VIA TRANSPORTABLE TABLESPACE
+#
+--source include/have_debug.inc
+--let $MYSQLD_DATADIR=`select @@datadir`
+--let $DB = `SELECT DATABASE()`
+
+CREATE TABLE t1(f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INT, f3 CHAR, f4 TEXT)
+ENGINE=InnoDB;
+--let $inserts= 2000
+--disable_query_log
+while ($inserts)
+{
+  INSERT INTO t1(f2,f3,f4) VALUES(mod(floor(rand() * 100000),99969),
+  char(65 + mod(floor(rand() * 27),26)),
+  repeat(char(65 + mod(floor(rand() * 27),26)),
+  mod(floor(rand() * 200),+100) + 1));
+  --dec $inserts
+}
+--enable_query_log
+
+DELETE FROM t1 WHERE f1%2=0;
+
+FLUSH TABLES t1 FOR EXPORT;
+--copy_file $MYSQLD_DATADIR/$DB/t1.ibd $MYSQL_TMP_DIR/t1.ibd
+--copy_file $MYSQLD_DATADIR/$DB/t1.cfg $MYSQL_TMP_DIR/t1.cfg
+
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1(f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INT, f3 CHAR, f4 TEXT)
+ENGINE=InnoDB;
+ALTER TABLE t1 DISCARD TABLESPACE;
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQLD_DATADIR/$DB/t1.ibd
+--move_file $MYSQL_TMP_DIR/t1.cfg $MYSQLD_DATADIR/$DB/t1.cfg
+
+SET SESSION debug="+d,ib_import_page_corrupt";
+--error ER_TABLE_CORRUPT
+ALTER TABLE t1 IMPORT TABLESPACE;
+SET SESSION debug="-d,ib_import_page_corrupt";
+DROP TABLE t1;
+--remove_file $MYSQLD_DATADIR/$DB/t1.ibd
diff --git a/mysql-test/suite/innodb/t/import_tablespace_schema_missmatch.test b/mysql-test/suite/innodb/t/import_tablespace_schema_missmatch.test
new file mode 100644
index 000000000000..302ab5352a0e
--- /dev/null
+++ b/mysql-test/suite/innodb/t/import_tablespace_schema_missmatch.test
@@ -0,0 +1,119 @@
+--echo #
+--echo # Bug #30190227 CRASH IMPORTING TABLESPACE WITH DIFFERENT DATA DIRECTORY
+--echo # BUT NOT .CFG FILE
+--echo #
+--echo # Test-case-1
+# Source tablespace is created with DATA DIRECTORY clause,
+# whereas destination table is defined without DATA DIRECTORY clause.
+
+--let $MYSQLD_DATADIR=`select @@datadir`
+--let $DB = `SELECT DATABASE()`
+--let $data_directory = DATA DIRECTORY='$MYSQL_TMP_DIR/alt_dir'
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) $data_directory;
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file '$MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd' $MYSQL_TMP_DIR/t1.ibd
+
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQLD_DATADIR/$DB/t1.ibd
+--error ER_TABLE_SCHEMA_MISMATCH
+
+ALTER TABLE t1 IMPORT TABLESPACE;
+DROP TABLE t1;
+--remove_file $MYSQLD_DATADIR/$DB/t1.ibd
+
+--echo #
+--echo # Test-case-2
+# Source tablespace is created without DATA DIRECTORY clause,
+# whereas destination table is defined with DATA DIRECTORY clause.
+
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file '$MYSQLD_DATADIR/$DB/t1.ibd' $MYSQL_TMP_DIR/t1.ibd
+
+UNLOCK TABLES;
+DROP TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) $data_directory;
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd
+
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t1 IMPORT TABLESPACE;
+DROP TABLE t1;
+--remove_file $MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd
+
+
+--echo #
+--echo # Bug #30190199 ERROR WHEN IMPORTING TABLESPACE WITH DIFFERENT DATA
+--echo # DIRECTORY LACKS DETAILS
+--echo #
+--echo # Test-case-3
+# Same as test-case-1 but .cfg file is available during
+# import tablespace.
+
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) $data_directory;
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file '$MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd' $MYSQL_TMP_DIR/t1.ibd
+--copy_file '$MYSQL_TMP_DIR/alt_dir/$DB/t1.cfg' $MYSQL_TMP_DIR/t1.cfg
+
+UNLOCK TABLES;
+DROP TABLE t1;
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--move_file $MYSQL_TMP_DIR/t1.cfg $MYSQLD_DATADIR/$DB/t1.cfg
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQLD_DATADIR/$DB/t1.ibd
+
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t1 IMPORT TABLESPACE;
+DROP TABLE t1;
+--remove_file $MYSQLD_DATADIR/$DB/t1.ibd
+--remove_file $MYSQLD_DATADIR/$DB/t1.cfg
+
+--echo #
+--echo # Test-case-4
+# Same as test-case-2 but .cfg file is available during
+# import tablespace.
+
+CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1), (2), (3);
+FLUSH TABLES t1 FOR EXPORT;
+
+--copy_file '$MYSQLD_DATADIR/$DB/t1.ibd' $MYSQL_TMP_DIR/t1.ibd
+--copy_file '$MYSQLD_DATADIR/$DB/t1.cfg' $MYSQL_TMP_DIR/t1.cfg
+
+UNLOCK TABLES;
+DROP TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (id int unsigned NOT NULL PRIMARY KEY) $data_directory;
+ALTER TABLE t1 DISCARD TABLESPACE;
+
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd
+--move_file $MYSQL_TMP_DIR/t1.cfg $MYSQL_TMP_DIR/alt_dir/$DB/t1.cfg
+
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t1 IMPORT TABLESPACE;
+DROP TABLE t1;
+--remove_file $MYSQL_TMP_DIR/alt_dir/$DB/t1.ibd
+--remove_file $MYSQL_TMP_DIR/alt_dir/$DB/t1.cfg
+
+--echo #
+--echo # Cleanup
+--echo #
+
+--rmdir $MYSQL_TMP_DIR/alt_dir/test
+--rmdir $MYSQL_TMP_DIR/alt_dir
diff --git a/mysql-test/suite/innodb/t/index_length.test b/mysql-test/suite/innodb/t/index_length.test
new file mode 100644
index 000000000000..586785bcaad1
--- /dev/null
+++ b/mysql-test/suite/innodb/t/index_length.test
@@ -0,0 +1,31 @@
+--source include/have_innodb_16k.inc
+CREATE TABLE abc(a int auto_increment PRIMARY KEY, b varchar(1024), c
+varchar(1024))ENGINE=INNODB;
+INSERT INTO abc (b,c) VALUES (repeat('b', 1024), repeat('c', 1024));
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+INSERT INTO abc (b,c) SELECT b,c FROM abc;
+
+--replace_column 1 #
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+ALTER TABLE abc add INDEX cc (c(800));
+--replace_column 1 #
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+ALTER TABLE abc add INDEX bb (b(800));
+--replace_column 1 #
+SELECT DATA_LENGTH, INDEX_LENGTH from information_schema.TABLES WHERE
+TABLE_SCHEMA = 'test' AND TABLE_NAME = 'abc';
+DROP TABLE abc;
diff --git a/mysql-test/suite/innodb/t/innodb-alter-debug.test b/mysql-test/suite/innodb/t/innodb-alter-debug.test
index 59cc1307c848..b964d61c3001 100644
--- a/mysql-test/suite/innodb/t/innodb-alter-debug.test
+++ b/mysql-test/suite/innodb/t/innodb-alter-debug.test
@@ -76,3 +76,31 @@ drop table t1;
 
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
+
+--echo #
+--echo # Bug #27753193  ASSERTION `PREBUILT->TRX->ERROR_KEY_NUM <
+--echo #                HA_ALTER_INFO->KEY_COUNT'
+
+CREATE TABLE t1 (a INT, UNIQUE KEY(a)) ENGINE = INNODB;
+INSERT INTO t1 VALUES (1);
+
+SET DEBUG_SYNC = 'row_log_table_apply1_before signal S1 WAIT_FOR S2';
+--send OPTIMIZE TABLE t1;
+
+CONNECT (con1,localhost,root,,);
+CONNECTION con1;
+SET DEBUG_SYNC = 'now WAIT_FOR S1';
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES (1);
+SET DEBUG_SYNC = 'now SIGNAL S2';
+
+CONNECTION default;
+--echo /* reap */ OPTIMIZE TABLE t1;
+--reap
+DISCONNECT con1;
+SET DEBUG_SYNC='RESET';
+
+DROP TABLE t1;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test
index 05672650d6e3..41aaa60cab5a 100644
--- a/mysql-test/suite/innodb/t/innodb-alter.test
+++ b/mysql-test/suite/innodb/t/innodb-alter.test
@@ -464,3 +464,23 @@ INSERT INTO t1 (col1, col2) VALUES (2 , 'A');
 ALTER TABLE t1 DROP KEY idx, ADD UNIQUE KEY uidx (col1);
 DELETE FROM t1 WHERE col1 = 2;
 DROP TABLE t1;
+
+--echo #
+--echo # BUG #26334149 MYSQL CRASHES WHEN FULL TEXT INDEXES IBD FILES ARE
+--echo # ORPHANED DUE TO RENAME TABLE
+--echo #
+CREATE DATABASE db1; USE db1;
+CREATE TABLE notes (
+   id int(11) NOT NULL AUTO_INCREMENT,
+   body text COLLATE utf8_unicode_ci,
+   PRIMARY KEY (id)
+   ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci;
+
+ALTER TABLE notes ADD FULLTEXT INDEX index_ft_body (body(255));
+DROP INDEX index_ft_body ON notes;
+
+CREATE DATABASE db2;
+RENAME TABLE db1.notes TO db2.notes;
+DROP DATABASE db1;
+DROP DATABASE db2;
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test
index c7c20e7da930..5d5b30d1b590 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc.test
+++ b/mysql-test/suite/innodb/t/innodb-autoinc.test
@@ -702,3 +702,96 @@ INSERT INTO t VALUES (NULL);
 SELECT * FROM t;
 SHOW CREATE TABLE t;
 DROP TABLE t;
+
+
+--echo #
+--echo # Bug#15851528 DUPLICATE KEY ERROR ON AUTO-INC PK WITH MIXED AUTO_INCREMENT_INCREMENT CLIENTS
+--echo #
+--echo # This test shows that the next record to be inserted is not affected
+--echo # by a change in auto_increment_increment.
+--echo # In addition, current value of auto_increment_increment by the client
+--echo # that uses the existing autoinc value with be used to set next autoinc
+--echo # value, which will be used by next client reguardless of its own session
+--echo # setting for auto_increment_increment.
+--echo #
+
+--connection default
+--echo # Client 1: Insert a record with auto_increment_increment=2
+CREATE TABLE t(
+  a SERIAL PRIMARY KEY,
+  b VARCHAR(200)) ENGINE=InnoDB;
+SET SESSION auto_increment_increment=2;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S1');
+SELECT a,b FROM t;
+--connect(con1,localhost,root,,)
+
+--connection con1
+--echo # Client 2: Insert records with auto_increment_increment 2,1
+SET SESSION auto_increment_increment=2;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S2');
+SELECT a,b FROM t;
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S2');
+SELECT a,b FROM t;
+disconnect con1;
+
+--connection default
+--echo # Client 1: Insert a record with auto_increment_increment=1
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S1');
+SELECT a,b FROM t;
+DROP TABLE t;
+
+--echo # Autoincrement behaviour with mixed insert.
+CREATE TABLE t(
+  a TINYINT AUTO_INCREMENT PRIMARY KEY,
+  b VARCHAR(200)) ENGINE=InnoDB;
+SET SESSION auto_increment_increment=100;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S0'),('S1');
+SELECT a,b FROM t;
+SHOW CREATE TABLE t;
+INSERT INTO t(a,b) VALUES(28,'S2');
+SELECT a,b FROM t;
+SET SESSION auto_increment_increment=1;
+SHOW CREATE TABLE t;
+INSERT INTO t(b) VALUES('S3');
+SELECT a,b FROM t;
+SHOW CREATE TABLE t;
+--error ER_DUP_ENTRY
+INSERT INTO t(b) VALUES('S4');
+DROP TABLE t;
+
+--echo #
+--echo # Bug 26906787 - INCORRECT AUTO_INCREMENT IDS ISSUED WHEN CLOSE TO ULLONG_MAX
+--echo #
+
+SET auto_increment_increment = 300;
+CREATE TABLE t1 (a BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b CHAR(8))
+ENGINE=innodb;
+INSERT INTO t1 VALUES (18446744073709551613, 'a');
+SHOW CREATE TABLE t1;
+--error ER_WARN_DATA_OUT_OF_RANGE
+INSERT INTO t1 VALUES (NULL, 'b');
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+    a BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+    b CHAR(8)
+) ENGINE=innodb
+PARTITION BY RANGE (a) (
+    PARTITION p0 VALUES LESS THAN (6),
+    PARTITION p1 VALUES LESS THAN MAXVALUE
+);
+INSERT INTO t1 VALUES (18446744073709551613, 'a');
+SHOW CREATE TABLE t1;
+--error ER_WARN_DATA_OUT_OF_RANGE
+INSERT INTO t1 VALUES (NULL, 'b');
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
diff --git a/mysql-test/suite/innodb/t/innodb-blob.test b/mysql-test/suite/innodb/t/innodb-blob.test
index c1f9ee5992f8..e0519fdd2bc2 100644
--- a/mysql-test/suite/innodb/t/innodb-blob.test
+++ b/mysql-test/suite/innodb/t/innodb-blob.test
@@ -211,3 +211,31 @@ SELECT a FROM t3;
 SELECT * FROM t2;
 
 DROP TABLE t1,t2,t3;
+
+--echo #
+--echo # Bug #29866408	SERVER CRASHES WHEN ADDING LONGTEXT COLUMN
+--echo #
+
+CREATE TABLE t1 (
+  id int(11) COLLATE utf8mb4_unicode_ci NOT NULL,
+  data longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY unq_id (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO t1 VALUES (1,'');
+SET @old_mode=@@sql_mode;
+SET GLOBAL SQL_MODE="";
+
+let $num = 3;
+while($num)
+{
+connect (con1,localhost,root,,);
+connection con1;
+eval ALTER TABLE t1 ADD COLUMN d$num DATETIME NOT NULL;
+disconnect con1;
+dec $num;
+}
+connection default;
+SET GLOBAL SQL_MODE=@old_mode;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb-large-prefix.test b/mysql-test/suite/innodb/t/innodb-large-prefix.test
index 57dc11002af0..b1e9b7c3cb5d 100644
--- a/mysql-test/suite/innodb/t/innodb-large-prefix.test
+++ b/mysql-test/suite/innodb/t/innodb-large-prefix.test
@@ -9,7 +9,7 @@
 
 --error ER_DUP_FIELDNAME
 CREATE TABLE t1(a int not null,key(a,a)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 CREATE TABLE t1(a int,b text,key(b(768))) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ROW_FORMAT=COMPACT;
 CREATE TABLE t1(a int not null,b text) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -17,7 +17,7 @@ ROW_FORMAT=COMPACT;
 INSERT INTO t1 VALUES (1,''),(2,''),(3,''),(4,''),(5,''),(6,''),(7,'');
 --error ER_DUP_FIELDNAME
 CREATE INDEX t1aa ON t1(a,a);
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 CREATE INDEX t1b ON t1(b(768));
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
@@ -28,7 +28,7 @@ ROW_FORMAT=COMPACT;
 INSERT INTO t2 VALUES (1,''),(2,''),(3,''),(4,''),(5,''),(6,''),(7,'');
 --error ER_DUP_FIELDNAME
 CREATE INDEX t2aa ON t2(a,a);
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 CREATE INDEX t2b ON t2(b(768));
 SELECT * FROM t2;
 DROP TABLE t2;
diff --git a/mysql-test/suite/innodb/t/innodb-truncate-debug.test b/mysql-test/suite/innodb/t/innodb-truncate-debug.test
index b165b1990b64..e6606b23c9b5 100644
--- a/mysql-test/suite/innodb/t/innodb-truncate-debug.test
+++ b/mysql-test/suite/innodb/t/innodb-truncate-debug.test
@@ -179,8 +179,11 @@ disconnect con1;
 
 drop table t1;
 
+# Note: Because of fix for bug#32912868,
+#       truncate table doesn't allow concurrent purge operations.
+#       So, this test might not work as intended, or not needed.
 let SEARCH_FILE = $MYSQLTEST_VARDIR/log/mysqld.1.err;
-let SEARCH_PATTERN = InnoDB: Record with space id \d+ belongs to table which is being truncated therefore skipping this undo record.;
+let SEARCH_PATTERN = InnoDB: Record with space id \d+ belongs to table which is being truncated or tablespace which is missing therefore skipping this undo record.;
 --source include/search_pattern.inc
 
 #cleanup
diff --git a/mysql-test/suite/innodb/t/innodb-wl6445-2.test b/mysql-test/suite/innodb/t/innodb-wl6445-2.test
index 0e5b93fd91f9..388f3109eeaa 100644
--- a/mysql-test/suite/innodb/t/innodb-wl6445-2.test
+++ b/mysql-test/suite/innodb/t/innodb-wl6445-2.test
@@ -180,7 +180,7 @@ let SEARCH_FILE= $error_log;
 --echo #    This confirms server is not automatically started in read-only mode.
 #----------------------------------------------------------------------------------
 # Detailed explanations of what happens are placed nearby the checks.
---error 1
+--error 1,42
 --exec $MYSQLD_CMD --core-file --loose-console > $error_log 2>&1
 
 # We get depending on the platform either "./ibdata1" or ".\ibdata1".
diff --git a/mysql-test/suite/innodb/t/innodb_bug30113362.test b/mysql-test/suite/innodb/t/innodb_bug30113362.test
new file mode 100644
index 000000000000..eabc30ff764d
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug30113362.test
@@ -0,0 +1,211 @@
+#
+# Test for Bug#30113362 : BTR_CUR_WILL_MODIFY_TREE() IS INSUFFICIENT FOR HIGHER TREE LEVEL
+#
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/have_innodb_16k.inc
+
+--disable_query_log
+SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
+SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index;
+SET @old_innodb_stats_persistent = @@innodb_stats_persistent;
+SET @old_innodb_flush_log_at_trx_commit = @@innodb_flush_log_at_trx_commit;
+--enable_query_log
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+SET GLOBAL innodb_adaptive_hash_index = false;
+SET GLOBAL innodb_stats_persistent = false;
+SET GLOBAL innodb_flush_log_at_trx_commit = 0;
+
+--connect (con1,localhost,root,,)
+--connect (con2,localhost,root,,)
+
+CREATE TABLE t1 (
+  a00 CHAR(255) NOT NULL DEFAULT 'a',
+  a01 CHAR(255) NOT NULL DEFAULT 'a',
+  a02 CHAR(255) NOT NULL DEFAULT 'a',
+  b INT NOT NULL DEFAULT 0,
+  CONSTRAINT pkey PRIMARY KEY(a00, a01, a02)
+) charset latin1 ENGINE = InnoDB COMMENT='MERGE_THRESHOLD=45';
+
+#
+# Prepare primary key index tree to be used for this test.
+#
+
+SET GLOBAL innodb_limit_optimistic_insert_debug = 3;
+
+DROP PROCEDURE IF EXISTS data_load_t1;
+delimiter |;
+CREATE PROCEDURE data_load_t1()
+BEGIN
+  DECLARE c1 INT DEFAULT 97;
+  DECLARE c2 INT DEFAULT 97;
+  DECLARE c3 INT DEFAULT 97;
+
+  WHILE c1 < 102 DO
+    WHILE c2 < 123 DO
+      WHILE c3 < 123 DO
+        INSERT INTO t1 (a00) VALUES (CHAR(c1,c2,c3));
+        SET c3 = c3 + 1;
+      END WHILE;
+      SET c3 = 97;
+      SET c2 = c2 + 1;
+    END WHILE;
+    SET c2 = 97;
+    SET c1 = c1 + 1;
+  END WHILE;
+END |
+delimiter ;|
+call data_load_t1();
+DROP PROCEDURE data_load_t1;
+
+# all node pages are sparse (max 3 node_ptrs)
+ANALYZE TABLE t1;
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+
+# causes "domino falling" merges to upper level
+SET GLOBAL innodb_limit_optimistic_insert_debug = 0;
+DELETE FROM t1 WHERE a00 = 'cnm';
+--source include/wait_innodb_all_purged.inc
+
+# at this moment, in the tree,
+# ...
+# level 4: ...(ast,avw,ayz)(bcc,bff,bii,bll,boo,brr,buu,bxx,cba,ced,cqp,cts)(cwv,czy,ddb)...
+# ...
+
+--echo # Test start
+
+# (1) Similar case to the first reported corefile at bug#30113362
+#     - Deleting 'bii' causes "domino falling" merges and the node_ptr becomes left_most of level 4.
+#       So, the operation needs upper level pages' X-latch, though doesn't cause merge more.
+SET DEBUG_SYNC = 'RESET';
+
+SET GLOBAL innodb_purge_stop_now = ON;
+SET GLOBAL DEBUG = "+d,pessimistic_row_purge_clust";
+DELETE FROM t1 WHERE a00 = 'bii';
+SET GLOBAL innodb_purge_run_now = ON;
+SET DEBUG_SYNC = "now WAIT_FOR pessimistic_row_purge_clust_pause";
+
+--connection con1
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
+# Blocked
+--send
+SELECT a00 FROM t1 WHERE a00 = 'bcc';
+
+--connection default
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait1';
+# bug#30113362 caused deadlock
+# signal purge thread to go
+SET GLOBAL DEBUG = "-d,pessimistic_row_purge_clust";
+SET DEBUG_SYNC = "now SIGNAL pessimistic_row_purge_clust_continue";
+
+--connection con1
+--reap
+
+--connection default
+
+--source include/wait_innodb_all_purged.inc
+ANALYZE TABLE t1;
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+
+
+# (2) Confirm blocking domain caused by DELETE modify_tree for tall index tree
+SET DEBUG_SYNC = 'RESET';
+
+# at this moment, in the tree,
+# ...
+# level 4: ...(ajk,amn,apq)(ast,avw,ayz,bll,boo,brr,buu,bxx,cba,ced,cqp,cts)(cwv,czy,ddb)(dge,djh,dmk)(dpn,dsq,dvt)(dyw,ebz,efc)...
+# ...
+
+# makes >17 records in level4 [(2^(4-1))*2 + 1]. (causes never left_most records)
+DELETE FROM t1 WHERE a00 = 'dpn';
+--source include/wait_innodb_all_purged.inc
+# at this moment, in the tree,
+# (* before "]" and after "[" records are treated as left_most possible records)
+# ...
+# level 4: ...(ajk,amn,apq)(ast,avw,ayz,bll,boo,brr,buu,bxx],cba,ced,[cqp,cts,cwv,czy,ddb,dge,dsq,dvt)(dyw,ebz,efc)...
+# level 3: ...(cba,ccb,cdc)(ced,cfe,cgf,chg],cih,cji,[ckj,clk,con,cpo)(cqp,crq,csr)...
+# level 2: ...(ckj,cks,clb)(clk,clt],cmc,cml,cmu,cnd,[cnv,coe)(con,cow,cpf)...
+# level 1: ...(cmu,cmx,cna)(cnd],cng,cnj,cnp,[cns)(cnv,cny,cob)...
+# level 0: ...(cnd,cne,cnf)(cng,cnh,cni)(cnj,cnk,cnl,cnn,cno)(cnp,cnq,cnr)...
+
+# deletes just 'ced' node_ptr only from level 4. doesn't cause merge and never left_most.
+# adjusts MERGE_THRESHOLD to do so.
+ALTER TABLE t1 COMMENT='MERGE_THRESHOLD=35';
+SET GLOBAL innodb_purge_stop_now = ON;
+SET GLOBAL DEBUG = "+d,pessimistic_row_purge_clust";
+DELETE FROM t1 WHERE a00 = 'cnd';
+SET GLOBAL innodb_purge_run_now = ON;
+SET DEBUG_SYNC = "now WAIT_FOR pessimistic_row_purge_clust_pause";
+
+# The expectation should be...
+# level 0: (#cnd#,cne,cnf): causes merge
+# level 1: (#cnd#],cng,cnj,cnp,[cns): left_most
+# level 2: (clk,clt],cmc,cml,cmu,#cnd#,[cnv,coe): causes merge
+# level 3: (ced,cfe,cgf,chg],cih,cji,[ckj,#clk#,con,cpo): left_most possible (not cause merge)
+# level 4: (ast,avw,ayz,bll,boo,brr,buu,bxx],cba,#ced#,[cqp,cts,cwv,czy,ddb,dge,dsq,dvt): no merge, not left_most possible
+# So, the top X-latch page is at level4. (ast~dvt)
+
+# blocking domain based on whether its ancestor is latched or not.
+# (*[]: ancestor is X-latched)
+# level 0: ...(asq,asr,ass) [(ast,asu,asv)...(dyt,dyu,dyv)] (dyw,dyx,dyy)...
+
+# Not blocked searches
+SELECT a00 FROM t1 WHERE a00 = 'ass';
+SELECT a00 FROM t1 WHERE a00 = 'dyx';
+
+--connection con1
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
+# Blocked
+--send
+SELECT a00 FROM t1 WHERE a00 = 'ast';
+
+--connection con2
+SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
+# Blocked
+--send
+SELECT a00 FROM t1 WHERE a00 = 'dyw';
+
+--connection default
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait1';
+SET DEBUG_SYNC = 'now WAIT_FOR lockwait2';
+# signal purge thread to go
+SET GLOBAL DEBUG = "-d,pessimistic_row_purge_clust";
+SET DEBUG_SYNC = "now SIGNAL pessimistic_row_purge_clust_continue";
+
+--connection con1
+--reap
+
+--connection con2
+--reap
+
+--connection default
+ANALYZE TABLE t1;
+SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
+
+
+# Cleanup
+SET DEBUG_SYNC = 'RESET';
+
+--connection default
+--disconnect con1
+--disconnect con2
+
+DROP TABLE t1;
+
+--disable_query_log
+SET GLOBAL innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
+SET GLOBAL innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index;
+SET GLOBAL innodb_stats_persistent = @old_innodb_stats_persistent;
+SET GLOBAL innodb_flush_log_at_trx_commit = @old_innodb_flush_log_at_trx_commit;
+--enable_query_log
+
+# Wait till all disconnects are completed.
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb_bug30594501-master.opt b/mysql-test/suite/innodb/t/innodb_bug30594501-master.opt
new file mode 100644
index 000000000000..0fac11d0be1c
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug30594501-master.opt
@@ -0,0 +1 @@
+--table_open_cache_instances=1
diff --git a/mysql-test/suite/innodb/t/innodb_bug30594501.test b/mysql-test/suite/innodb/t/innodb_bug30594501.test
new file mode 100644
index 000000000000..0d403c36f82b
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug30594501.test
@@ -0,0 +1,28 @@
+--echo #
+--echo # Bug#30594501 QUERY STALLS IN "QUERY END" STATUS FOR LONG TIME
+--echo #
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--connect (con1,localhost,root,,)
+--connect (con2,localhost,root,,)
+
+SELECT @@table_open_cache_instances;
+
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1);
+
+--echo # Connection con1
+connection con1;
+SELECT * FROM t1;
+disconnect con1;
+
+--echo # Connection con2
+connection con2;
+PREPARE s FROM 'SELECT * FROM `t1`';
+disconnect con2;
+
+--echo # Connection default
+connection default;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb_bug31205266.test b/mysql-test/suite/innodb/t/innodb_bug31205266.test
new file mode 100644
index 000000000000..f27c90386980
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug31205266.test
@@ -0,0 +1,59 @@
+# Test for Bug#31205266 : CONCURRENT UPDATE CAUSE CRASH IN ROW_SEARCH_MVCC
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+--disable_query_log
+SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug;
+--enable_query_log
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+--connect(con1,localhost,root,'',)
+
+set debug_sync='reset';
+
+connection default;
+CREATE TABLE t1 (
+  id int(11) NOT NULL auto_increment,
+  ggid varchar(32) binary DEFAULT '' NOT NULL,
+  email varchar(64) DEFAULT '' NOT NULL,
+  passwd varchar(32) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE ggid (ggid)
+) ENGINE=innodb;
+
+SET GLOBAL innodb_limit_optimistic_insert_debug = 2;
+
+insert into t1 (ggid,passwd) values ('test1','xxx');
+insert into t1 (ggid,passwd) values ('test2','yyy');
+
+set debug_sync='row_search_before_mtr_restart_for_extra_clust SIGNAL reached WAIT_FOR continue';
+--send
+select * from t1 where ggid='test2';
+
+connection con1;
+set debug_sync='now WAIT_FOR reached';
+
+#moves the record to the another place and causes split at the page
+update t1 set ggid='test0' where id=2;
+insert into t1 (ggid,passwd) values ('test2','www');
+
+set debug_sync='now SIGNAL continue';
+
+connection default;
+reap;
+
+disconnect con1;
+
+set debug_sync='reset';
+drop table t1;
+
+--disable_query_log
+SET GLOBAL innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug;
+--enable_query_log
+
+# Wait till all disconnects are completed.
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb_bug34750489-master.opt b/mysql-test/suite/innodb/t/innodb_bug34750489-master.opt
new file mode 100644
index 000000000000..2dbadb899461
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug34750489-master.opt
@@ -0,0 +1 @@
+--innodb_sort_buffer_size=66664
diff --git a/mysql-test/suite/innodb/t/innodb_bug34750489.test b/mysql-test/suite/innodb/t/innodb_bug34750489.test
new file mode 100644
index 000000000000..0c7dd1f52e8d
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_bug34750489.test
@@ -0,0 +1,48 @@
+# Bug#34750489 : applying a updated online log may access out-of-bounds memory
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+
+show global variables like "innodb_sort_buffer_size";
+
+connect(conn1,localhost,root,,);
+connect(conn2,localhost,root,,);
+
+connection default;
+--disable_query_log
+CREATE TABLE t1(
+  id INT,
+  name VARCHAR(1000),
+  g_col VARCHAR(20) GENERATED ALWAYS AS (concat(id, substr(`name`, 0, 10))) VIRTUAL,
+  KEY idx_id_g_col(id, g_col));
+
+let $i= 0;
+while ($i < 80)
+{
+  eval INSERT INTO `t1`(id, name) VALUES($i, repeat("a",1000));
+  inc $i;
+}
+--enable_query_log
+
+# main operation
+connection conn1;
+SET debug_sync = 'alter_table_update_log signal send_concurrent WAIT_FOR concurrent_done';
+--send OPTIMIZE TABLE t1;
+
+# concurrent operations
+connection conn2;
+SET debug_sync = 'now wait_for send_concurrent';
+UPDATE t1 SET id = id + 1;
+SET debug_sync = 'now signal concurrent_done';
+disconnect conn2;
+
+connection conn1;
+reap;
+disconnect conn1;
+
+# teardown
+connection default;
+
+DROP TABLE t1;
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/innodb_bug70867.test b/mysql-test/suite/innodb/t/innodb_bug70867.test
index 692d92e07f78..71080c9cbebd 100644
--- a/mysql-test/suite/innodb/t/innodb_bug70867.test
+++ b/mysql-test/suite/innodb/t/innodb_bug70867.test
@@ -25,7 +25,7 @@ let $args = --loose-console --core-file > $SEARCH_FILE 2>&1;
 
 --mkdir $MYSQL_DATA_DIR/tmpdata
 --chmod 0400 $MYSQL_DATA_DIR/tmpdata
---error 1
+--error 1,42
 --exec $MYSQLD_CMD --innodb_data_home_dir=$MYSQL_DATA_DIR/tmpdata $args
 let SEARCH_PATTERN = returned OS error 113;
 --source ./include/search_pattern.inc
diff --git a/mysql-test/suite/innodb/t/innodb_page_size_func.test b/mysql-test/suite/innodb/t/innodb_page_size_func.test
index 3255d1a95eef..93d5af83ceef 100644
--- a/mysql-test/suite/innodb/t/innodb_page_size_func.test
+++ b/mysql-test/suite/innodb/t/innodb_page_size_func.test
@@ -120,7 +120,7 @@ let $mysqld=$MYSQLD_CMD --core-file --console > $error_log 2>&1 --innodb-page-si
 #----------------------------------------------------------------------------------
 --echo # 1.1 The value assigned is a number.
 # Detailed explanations of what happens are placed nearby the checks.
---error 1
+--error 1,42
 --exec $mysqld=$other_page_size
 if ( $default_page_size != $other_page_size )
 {
@@ -134,7 +134,7 @@ let SEARCH_PATTERN=Data file '.*ibdata1' uses page size $start_page_size, but th
 let SEARCH_PATTERN= \[ERROR\] Aborting;
 --source include/search_pattern_in_file.inc
 --echo # 1.2 The value assigned is a number followed by 'k'.
---error 1
+--error 1,42
 --exec $mysqld=$other_page_size_nk
 if ( $default_page_size != $other_page_size )
 {
@@ -159,7 +159,7 @@ let SEARCH_PATTERN= \[ERROR\] Aborting;
 # 1. not supported
 # 2. below the smallest supported one
 # The restart attempt has to fail.
---error 1
+--error 1,42
 --exec $mysqld=$out_range_page_size
 # The innodb page size gets raised to the lowest or biggest legal value.
 let SEARCH_PATTERN= \[Warning\] option 'innodb-page-size': unsigned value $out_range_page_size adjusted to $adjust_page_size;
@@ -185,7 +185,7 @@ if ($zero_test)
    {
      --echo # We do not omit the test.
    }
---error 1
+--error 1,42
 --exec $mysqld=garbage
 # General server properties cause that
 # - the plain wrong value "garbage" assigned to innodb page size gets
@@ -220,7 +220,7 @@ let SEARCH_PATTERN= \[ERROR\] InnoDB: Invalid page size=$illegal_pagesize;
 --echo #    <number>k is a legal page size.
 #---------------------------------------------------------------------------------
 # The restart attempt has to fail.
---error 1
+--error 1,42
 --exec $mysqld=$other_page_size_nkaramel
 # The plain wrong value "<number>karamel" assigned to innodb page size seems
 # to get mangled to "<number>k" which is a legal value.
diff --git a/mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test b/mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test
index 07cdfb4db014..2a94bf27d7b2 100644
--- a/mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test
+++ b/mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test
@@ -204,7 +204,7 @@ DROP TABLE tab5;
 let NEW_CMD = $MYSQLD --no-defaults $KEYRING_PLUGIN_OPT --lc_messages_dir=$MYSQL_SHAREDIR --innodb_page_size=64K --basedir=$MYSQLD_BASEDIR --datadir=$MYSQLD_DATADIR1 --innodb_log_file_size=5M --innodb_log_files_in_group=2 --innodb_undo_tablespaces=0</dev/null>>$MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
 
 --echo # Check Server startup failure when page size 64K
---error 1
+--error 1,42
 --exec $NEW_CMD
 
 # Search for particular warning during server startup
diff --git a/mysql-test/suite/innodb/t/innodb_row_log_read.test b/mysql-test/suite/innodb/t/innodb_row_log_read.test
new file mode 100644
index 000000000000..5e1841c3b26b
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_row_log_read.test
@@ -0,0 +1,46 @@
+--echo #
+--echo # Bug #31529221	ALTER TABLE FAILS AND REPORTS INCORRECT KEY FILE FOR TABLE T1
+--echo #
+
+--source include/have_innodb_16k.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/big_test.inc
+--source include/not_embedded.inc
+
+SET @old_innodb_online_alter_log_max_size := @@innodb_online_alter_log_max_size;
+SET @old_max_allowed_packet := @@max_allowed_packet;
+set global innodb_online_alter_log_max_size=1342177280000;
+set global max_allowed_packet=1024*1024*1024;
+
+create table t1(d1 longblob);
+
+--connect (con1,localhost,root,,test,,)
+insert into t1(d1) values (repeat(UNHEX('000f'), 1022*1022*88));
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL proceed_insert WAIT_FOR proceed_alter';
+--send alter table t1 ADD COLUMN `d2` char(128) not null default '0' after d1;
+
+--connect (con2,localhost,root,,test,,)
+SET DEBUG_SYNC= 'now WAIT_FOR proceed_insert';
+
+#insert sufficient records so that the operation gets logged in the temporary file
+--disable_query_log
+let $c=3241;
+while($c) {
+  insert into t1(d1) values (repeat(UNHEX('000f'), 1022*3));
+  dec $c;
+}
+--enable_query_log
+SET DEBUG_SYNC= 'now SIGNAL proceed_alter';
+
+--connection con1
+--reap
+
+--connection default
+disconnect con1;
+disconnect con2;
+SET DEBUG_SYNC= 'RESET';
+drop table t1;
+SET GLOBAL innodb_online_alter_log_max_size = @old_innodb_online_alter_log_max_size;
+set global max_allowed_packet = @old_max_allowed_packet;
+
diff --git a/mysql-test/suite/innodb/t/innodb_sys_var_valgrind.test b/mysql-test/suite/innodb/t/innodb_sys_var_valgrind.test
new file mode 100644
index 000000000000..4e7dadcfc8dd
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_sys_var_valgrind.test
@@ -0,0 +1,67 @@
+--echo #
+--echo # Bug #29717909	MEMORY LIFETIME OF VARIABLES BETWEEN CHECK AND UPDATE INCORRECTLY MANAGED
+--echo #
+
+#Test innodb_ft_server_stopword_table (global variable)
+select @@innodb_ft_server_stopword_table;
+create table user_stopword_1(value varchar(30)) engine = innodb;
+create table user_stopword_2(value varchar(30)) engine = innodb;
+
+set @blah = 'test/user_stopword_1';
+SET GLOBAL innodb_ft_server_stopword_table= @blah;
+select @@innodb_ft_server_stopword_table;
+
+set @blah = 'test/user_stopword_2';
+SET GLOBAL innodb_ft_server_stopword_table= @blah;
+select @@innodb_ft_server_stopword_table;
+
+SET GLOBAL innodb_ft_server_stopword_table= NULL;
+select @@innodb_ft_server_stopword_table;
+
+SET GLOBAL innodb_ft_server_stopword_table= default;
+select @@innodb_ft_server_stopword_table;
+
+drop table user_stopword_1, user_stopword_2;
+
+#Test innodb_buffer_pool_filename (global variable)
+
+select @@innodb_buffer_pool_filename;
+
+set @blah='hello';
+set global innodb_buffer_pool_filename = @blah;
+select @@innodb_buffer_pool_filename;
+
+set global innodb_buffer_pool_filename="bye";
+select @@innodb_buffer_pool_filename;
+
+--error ER_WRONG_VALUE_FOR_VAR
+set global innodb_buffer_pool_filename=NULL;
+
+set global innodb_buffer_pool_filename=default;
+select @@innodb_buffer_pool_filename;
+
+#Test innodb_ft_aux_table (global variable)
+CREATE TABLE t1 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
+(opening_line)) ENGINE=InnoDB;
+
+CREATE TABLE t2 ( id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+opening_line TEXT(500), author VARCHAR(200), title VARCHAR(200), FULLTEXT idx
+(opening_line)) ENGINE=InnoDB;
+
+select @@innodb_ft_aux_table;
+
+set @blah = 'test/t1';
+SET GLOBAL innodb_ft_aux_table = @blah;
+select @@innodb_ft_aux_table;
+
+set @blah = 'test/t2';
+SET GLOBAL innodb_ft_aux_table = @blah;
+
+SET GLOBAL innodb_ft_aux_table = NULL;
+select @@innodb_ft_aux_table;
+
+SET GLOBAL innodb_ft_aux_table =default;
+select @@innodb_ft_aux_table;
+
+drop table t1,t2;
diff --git a/mysql-test/suite/innodb/t/innodb_tablespace.test b/mysql-test/suite/innodb/t/innodb_tablespace.test
index 43b69f6c9f6f..85e61dccb8b6 100644
--- a/mysql-test/suite/innodb/t/innodb_tablespace.test
+++ b/mysql-test/suite/innodb/t/innodb_tablespace.test
@@ -422,3 +422,14 @@ FLUSH TABLES t1 FOR EXPORT;
 UNLOCK TABLES;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#27903881 [MYSQL 8.0 GA RELEASE & DEBUG BUILD]
+--echo # FIL_SPACE_GET(TABLE->SPACE) != __NULL
+--echo #
+call mtr.add_suppression("\\[Warning\\] InnoDB: Missing .ibd file for table `test`\.`t1` .* ");
+CREATE TABLE t1(c1 INT,c2 CHAR,c3 DATE)PARTITION BY HASH(DAYOFWEEK(c3));
+ALTER TABLE t1 DISCARD TABLESPACE;
+--error ER_TABLESPACE_DISCARDED
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb_wl6326.test b/mysql-test/suite/innodb/t/innodb_wl6326.test
index 7f4c5421b181..939dc1edcc89 100644
--- a/mysql-test/suite/innodb/t/innodb_wl6326.test
+++ b/mysql-test/suite/innodb/t/innodb_wl6326.test
@@ -373,23 +373,23 @@ SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME
 
 
 
-# (2) Insert records to leaf page (cv..) and cause modify_page
-#     - root page is X latched, because node_ptr for 'cv'
-#       is 2nd record for (co,cv,dc,dj,dq,dx,ee)
+# (2) Insert records to leaf page (co..) and cause modify_page
+#     - root page is X latched, because node_ptr for 'co'
+#       is 1st record for (co,cv,dc,dj,dq,dx,ee)
 #
 # * ordinary pessimitic insert might be done by pessistic update
 #   and we should consider possibility node_ptr to be deleted.
 
 SET DEBUG_SYNC = 'RESET';
 
-# Filling leaf page (cv..)
-INSERT INTO t1 (a00) VALUES ('cva');
+# Filling leaf page (co..)
+INSERT INTO t1 (a00) VALUES ('coa');
 
 --connection con1
 SET DEBUG_SYNC = 'before_insert_pessimitic_row_ins_clust SIGNAL reached WAIT_FOR continue';
 # Cause modify_tree
 --send
-INSERT INTO t1 (a00) VALUES ('cvb');
+INSERT INTO t1 (a00) VALUES ('cob');
 
 --connection con2
 SET DEBUG_SYNC = 'now WAIT_FOR reached';
diff --git a/mysql-test/suite/innodb/t/iodku.test b/mysql-test/suite/innodb/t/iodku.test
new file mode 100644
index 000000000000..a851bebff58f
--- /dev/null
+++ b/mysql-test/suite/innodb/t/iodku.test
@@ -0,0 +1,245 @@
+--echo #
+--echo # Bug #28799261 IODKU UNNECESSARILY GAP-LOCKS SECONDARY INDEXES
+--echo # AFTER DUPLICATE IS ALREADY FOUND
+--echo #
+
+--source include/have_innodb.inc
+--source include/count_sessions.inc
+
+#Test 1
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 1: Serialized transactions (trx1, trx2)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+#Test 2
+
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 2: Serialized transactions (trx2, trx1)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+--echo #
+--echo # Bug #11758237 INSERT ON DUPLICATE KEY UPDATE SOMETIMES
+--echo # WRITES BINLOG POSITION INCORRECT
+--echo #
+
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 3: Interleaved transactions (trx1 conflicts on index b)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Connection default:
+
+--echo # Transaction trx1:
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 1, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+
+--echo # Connection other:
+--connect (other,localhost,root,,test,,)
+--send
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+
+--echo # Connection default:
+--connection default
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.innodb_trx
+  WHERE trx_query =
+  'INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c)' AND
+  trx_operation_state = 'inserting' AND
+  trx_state = 'LOCK WAIT';
+
+--source include/wait_condition.inc
+
+INSERT INTO t1 VALUES (2, 3, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+COMMIT;
+
+--echo # Connection other:
+--connection other
+reap;
+
+--echo # Connection default:
+connection default;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+#Test 4
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 4: Serialized transactions (trx1, trx2)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+#Test 5
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 5: Serialized transactions (trx2, trx1)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Transaction trx2
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Transaction trx1
+START TRANSACTION;
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+#Test 6
+CREATE TABLE t1 (a INT UNIQUE KEY, b INT UNIQUE KEY, c INT) ENGINE = InnoDB;
+SHOW CREATE TABLE t1;
+
+--echo # Scenario 6: Interleaved transactions (trx1 conflicts on index a)
+INSERT INTO t1 VALUES (1, 1, 1);
+SELECT * FROM t1;
+
+--echo # Connection default:
+
+--echo # Transaction trx1:
+START TRANSACTION;
+INSERT INTO t1 VALUES (1, 2, 2) ON DUPLICATE KEY UPDATE c=VALUES(c);
+SELECT * FROM t1;
+
+--echo # Connection other:
+connection other;
+START TRANSACTION;
+SET innodb_lock_wait_timeout = 1;
+--error  ER_LOCK_WAIT_TIMEOUT
+INSERT INTO t1 VALUES (2, 2, 3) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Connection default:
+--connection default
+INSERT INTO t1 VALUES (3, 2, 4) ON DUPLICATE KEY UPDATE c=VALUES(c);
+COMMIT;
+
+--echo # Result:
+SELECT * FROM t1;
+
+--echo # Cleanup
+DROP TABLE t1;
+
+#test 7
+CREATE TABLE t1(f1 INT PRIMARY KEY,
+                f2 INT, f3 INT, UNIQUE KEY(f2))ENGINE=INNODB;
+
+SHOW CREATE TABLE t1;
+
+INSERT INTO t1(f1, f2, f3) VALUES(1, 10, 100);
+SELECT * FROM t1;
+
+--echo # Connection other:
+connection other;
+START TRANSACTION;
+INSERT INTO t1 VALUES(2, 10, 200) ON DUPLICATE KEY UPDATE f3 = 120;
+
+--echo # Connection default
+connection default;
+START TRANSACTION;
+SET innodb_lock_wait_timeout = 1;
+--error  ER_LOCK_WAIT_TIMEOUT
+INSERT INTO t1 VALUES(2, 20, 300) ON DUPLICATE KEY UPDATE f3 = 500;
+COMMIT;
+
+--echo # Connection other:
+--connection other
+COMMIT;
+
+--echo # Connection default
+connection default;
+
+--echo # Verify Results:
+SELECT * FROM t1;
+
+disconnect other;
+
+DROP TABLE t1;
+
+
+#Test 8
+#Test added to cover the undo update path
+CREATE TABLE t1(f1 INT AUTO_INCREMENT PRIMARY KEY, f2 INT, f3 INT,
+UNIQUE KEY(f2),UNIQUE KEY(f3))ENGINE=INNODB;
+INSERT INTO t1(f2,f3) VALUES(10, 100);
+INSERT INTO t1(f2,f3) VALUES(20, 200);
+
+--error ER_DUP_ENTRY
+UPDATE t1 SET f2=30,f3=100 WHERE f2 = 20;
+SELECT * FROM t1;
+COMMIT;
+DROP TABLE t1;
+
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/iodku_debug.test b/mysql-test/suite/innodb/t/iodku_debug.test
new file mode 100644
index 000000000000..2651933b4a3c
--- /dev/null
+++ b/mysql-test/suite/innodb/t/iodku_debug.test
@@ -0,0 +1,201 @@
+--source include/have_innodb.inc
+--source include/count_sessions.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug#25966845 INSERT ON DUPLICATE KEY GENERATE A DEADLOCK
+--echo #
+
+CREATE TABLE t1(f1 int primary key,
+                f2 int, f3 int, unique key(f2))engine=innodb;
+
+SHOW CREATE TABLE t1;
+INSERT INTO t1(f1, f2, f3) VALUES(1, 10, 100);
+
+--echo # Connection default
+BEGIN;
+INSERT INTO t1 VALUES(2, 20, 300) ON DUPLICATE KEY UPDATE f3 = 500;
+
+--echo # Connection other:
+--connect (other,localhost,root,,test,,)
+BEGIN;
+SET DEBUG_SYNC = 'ib_after_row_insert_step SIGNAL default_commit';
+--send INSERT INTO t1 VALUES(2, 10, 200) ON DUPLICATE KEY UPDATE f3 = 120
+
+--echo # Connection default
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR default_commit';
+COMMIT;
+
+--echo # Connection other
+connection other;
+--reap
+COMMIT;
+
+connection default;
+disconnect other;
+
+--echo # Verify Results:
+SELECT * FROM t1;
+
+SET DEBUG_SYNC ='RESET';
+DROP TABLE t1;
+--source include/wait_until_count_sessions.inc
+
+--echo #
+--echo # Bug #29195848	ASSERTION "!OTHER_LOCK" IN LOCK_REC_ADD_TO_QUEUE
+--echo #
+# Test 1 :- Partial rollback of Insert (secondary Index):
+# Pre condition-1: Secondary index has one unpurged delete marked key
+#                  [say K1] that matches exactly with the key to be inserted
+#                  (including cluster index key).
+# Pre-condition-2: Secondary index has one committed key [say K2] that matches
+#		   with the key to be inserted but with different cluster index key.
+
+# Test: During Insert, secondary index entry [K1] is not updated (un-delete marked)
+#       because of duplicate key [K2].In this case the transaction doesn't
+#       hold implicit lock on secondary index key and partial rollback should
+#	not try to convert it to explicit lock.
+
+SET GLOBAL innodb_purge_stop_now = ON;
+CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, b INT, UNIQUE KEY(b));
+
+INSERT INTO t1 VALUES(2, 300);
+#It generates the delete marked key [K1]
+DELETE FROM t1;
+
+#It generates the committed key [K2] 300,3 in Secondary index.
+INSERT INTO t1 VALUES(3, 300);
+SELECT * FROM t1;
+
+connect (conn1,localhost,root,,);
+connect (conn2,localhost,root,,);
+
+connection conn1;
+SET DEBUG_SYNC='ib_after_row_insert_step SIGNAL after_insert WAIT_FOR
+rollback';
+
+# We have inserted successfully the cluster index key [2]
+# when ib_after_row_insert_step is reached. We failed to un-delete mark
+# the secondary index key K1 [300,2] because of duplicate key K2 [300,3].
+# So key K1 [300,2] stays delete marked and the transaction have shared
+# lock on it instead of implicit lock.
+--send INSERT INTO t1 VALUES(2, 300);
+
+connection conn2;
+SET DEBUG_SYNC='now WAIT_FOR after_insert';
+START TRANSACTION;
+# We acquire S lock on delete marked secondary index key K1 [300, 2].
+--error ER_DUP_ENTRY
+INSERT INTO t1 VALUES(1, 300);
+
+connection default;
+# For purge going
+SET GLOBAL innodb_purge_run_now=ON;
+SET DEBUG_SYNC='now SIGNAL rollback';
+
+connection conn1;
+# The transaction is partially rolled back here.
+# Before the fix, it would assert while trying to create explicit lock on K1 [300,2]
+# because other transaction already holds shared lock on it.
+# Since we don't have implicit lock here, the fix makes sure that we don't try to
+# create explicit lock during such partial rollback for a delete marked record.
+--error ER_DUP_ENTRY
+--reap
+
+connection conn2;
+COMMIT;
+
+disconnect conn1;
+disconnect conn2;
+connection default;
+DROP TABLE t1;
+
+# Test 2 Partial Rollback of Insert (Cluster Index):
+# Pre condition-1: Cluster index has one unpurged delete marked key [say PK1]
+#		  that matches exactly with the key to be inserted.
+# Pre-condition-2: Unique 2ndary index has one committed key [say K1] that matches
+#                  with the key to be inserted but with different cluster index key.
+# Test: During Insert, the cluster index Key K1 is reused by undelete marking it.
+#      The command fails and goes for partial rollback because of matching secondary
+#      index key K1. During partial rollback, the implicit lock is released when we
+#      update the cluster index key replacing with previous delete marked key.The
+#      test verifies that the implicit lock is converted to explicit lock before
+#      releasing it.
+
+SET GLOBAL innodb_purge_stop_now = ON;
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY(b));
+
+#Create delete marked key PK1 (1) in cluster index and (10, 1) K1 in Secondary index.
+INSERT INTO t1 VALUES(1,10);
+DELETE FROM t1;
+
+#Create committed key (2) in cluster index and (10, 2) K2 in Secondary index.
+INSERT INTO t1 VALUES(2,10);
+
+connect (conn1,localhost,root,,);
+connect (conn2,localhost,root,,);
+
+connection conn1;
+SET DEBUG_SYNC='ib_undo_mod_before_remove_clust SIGNAL during_rollback
+WAIT_FOR rollback';
+
+#Try to Insert with cluster index key matching PK1
+--send INSERT INTO t1 VALUES(1, 10) ;
+
+connection conn2;
+
+SET DEBUG_SYNC='now WAIT_FOR during_rollback';
+# In Conn1, we have got duplicate key error due to mathing secondary index key
+# and at this stage half way through partial rollback. We are waiting after rolling
+# back cluster index key with old delete marked key K1. The implicit lock on PK1
+# is already released.Try to lock the cluster index key PK1. The bug has the issue
+# that Conn1 transaction has not created the explicit lock on PK1 but implicit lock
+# is already released,so taking a shared lock would succeeded which caused assert
+# when conn1 tried to rollback. After the fix we ensure that implicit lock is
+# converted to explicit before the implicit protection is released,therfore the
+# share lock request times out
+
+--error ER_LOCK_WAIT_TIMEOUT
+SELECT * FROM t1 WHERE a = 1 LOCK IN SHARE MODE;
+
+connection default;
+SET GLOBAL innodb_purge_run_now=ON;
+SET DEBUG_SYNC='now SIGNAL rollback';
+
+connection conn1;
+--error ER_DUP_ENTRY
+--reap
+
+disconnect conn1;
+disconnect conn2;
+connection default;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+
+--echo #
+--echo  # Bug #29718243	MYQL SERVER CRASHING
+--echo #
+
+CREATE TEMPORARY TABLE tmpTest(tmpField INT , UNIQUE KEY uq_tmpField (tmpField));
+CREATE TEMPORARY TABLE tmpTest1(tmpField INT , UNIQUE KEY uq_tmpField (tmpField));
+
+DELIMITER |;
+CREATE FUNCTION ZZtest() RETURNS int(11)
+BEGIN
+DECLARE l_total INTEGER;
+SET l_total = 0;
+
+INSERT INTO tmpTest SET tmpField = 40;
+INSERT IGNORE INTO tmpTest SET tmpField = 40;
+INSERT IGNORE INTO tmpTest1 SET tmpField = 40;
+
+DROP TEMPORARY TABLE IF EXISTS tmpTest;
+DROP TEMPORARY TABLE IF EXISTS tmpTest1;
+
+RETURN l_total;
+END|
+DELIMITER ;|
+SELECT ZZtest() AS test;
+DROP FUNCTION ZZtest;
diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test
index 786118be15b2..404def6343d9 100644
--- a/mysql-test/suite/innodb/t/log_corruption.test
+++ b/mysql-test/suite/innodb/t/log_corruption.test
@@ -8,7 +8,7 @@ let $args=--no-defaults --datadir=$newdir --secure-file-priv="" --loose-skip-sha
 
 --echo # redo log from before MySQL 5.7.9
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log was created before MySQL 5\\.7\\.9\\.;
 --source include/search_pattern_in_file.inc
@@ -16,7 +16,7 @@ let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log
 --echo # redo log from before MySQL 5.7.9, with corrupted log checkpoint
 --remove_file $newdir/ib_logfile0
 --copy_file $newdir/ib_logfile1  $newdir/ib_logfile0
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log was created before MySQL 5\\.7\\.9, and we did not find a valid checkpoint;
 --source include/search_pattern_in_file.inc
@@ -24,7 +24,7 @@ let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log
 --echo # redo log from before MySQL 5.7.9, with corrupted log block
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption0.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log was created before MySQL 5\\.7\\.9, and it appears corrupted;
 --source include/search_pattern_in_file.inc
@@ -32,7 +32,7 @@ let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported. This redo log
 --echo # redo log from "after" MySQL 5.7.9, but with invalid header checksum
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption1.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Invalid redo log header checksum;
 --source include/search_pattern_in_file.inc
@@ -40,7 +40,7 @@ let SEARCH_PATTERN=InnoDB: Invalid redo log header checksum;
 --echo # distant future redo log format, with valid header checksum
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption2.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\. Please follow the instructions at http://dev.mysql.com/doc/refman/5.7/en/upgrading-downgrading.html;
 --source include/search_pattern_in_file.inc
@@ -48,7 +48,7 @@ let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created
 --echo # valid header, but old-format checkpoint blocks
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption3.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: No valid checkpoint found .corrupted redo log;
 --source include/search_pattern_in_file.inc
@@ -58,7 +58,7 @@ let SEARCH_PATTERN=InnoDB: No valid checkpoint found .corrupted redo log;
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption4.zip -d $newdir > $SEARCH_FILE
 # Anything below innodb_force_recovery=6 must find a valid redo log.
 # Missing tablespace files are tolerated already with innodb_force_recovery=1.
---error 1
+--error 1,42
 --exec $MYSQLD $args --innodb-force-recovery=5
 let SEARCH_PATTERN=InnoDB: Log block 2372 at lsn 1213952 has valid header, but checksum field contains 144444122, should be 3362026715;
 --source include/search_pattern_in_file.inc
@@ -67,7 +67,7 @@ let SEARCH_PATTERN=InnoDB: Ignoring the redo log due to missing MLOG_CHECKPOINT
 let SEARCH_PATTERN=Plugin 'InnoDB' registration as a STORAGE ENGINE failed;
 --source include/search_pattern_in_file.inc
 --echo # --innodb-force-recovery=6 (skip the entire redo log)
---error 1
+--error 1,42
 --exec $MYSQLD $args --innodb-force-recovery=6
 let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in read-only mode;
 --source include/search_pattern_in_file.inc
@@ -77,14 +77,14 @@ let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in r
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption4a.zip -d $newdir > $SEARCH_FILE
 # Anything below innodb_force_recovery=6 must find a valid redo log.
 # Missing tablespace files are tolerated already with innodb_force_recovery=1.
---error 1
+--error 1,42
 --exec $MYSQLD $args --innodb-force-recovery=5
 let SEARCH_PATTERN=InnoDB: Ignoring the redo log due to missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\.;
 --source include/search_pattern_in_file.inc
 let SEARCH_PATTERN=Plugin 'InnoDB' registration as a STORAGE ENGINE failed;
 --source include/search_pattern_in_file.inc
 --echo # --innodb-force-recovery=6 (skip the entire redo log)
---error 1
+--error 1,42
 --exec $MYSQLD $args --innodb-force-recovery=6
 let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in read-only mode;
 --source include/search_pattern_in_file.inc
@@ -93,7 +93,7 @@ let SEARCH_PATTERN=InnoDB: Cannot create sys_virtual system tables. running in r
 --echo # valid header, valid checkpoint 1, all-zero (invalid) checkpoint 2
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption5.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: Log scan progressed past the checkpoint lsn 1213964;
 --source include/search_pattern_in_file.inc
@@ -110,7 +110,7 @@ let SEARCH_PATTERN=InnoDB: Set innodb_force_recovery to ignore this error;
 --echo # valid header, invalid checkpoint 1, valid checkpoint 2
 --remove_file $newdir/ib_logfile0
 --exec unzip $MYSQL_TEST_DIR/suite/innodb/t/log_corruption6.zip -d $newdir > $SEARCH_FILE
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=InnoDB: The log file was created by mysqlbackup --apply-log at ibbackup was here!!!1!\. The following crash recovery is part of a normal restore\.;
 --source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/log_file.test b/mysql-test/suite/innodb/t/log_file.test
index 2559c285e308..9b848382773a 100644
--- a/mysql-test/suite/innodb/t/log_file.test
+++ b/mysql-test/suite/innodb/t/log_file.test
@@ -25,7 +25,7 @@ EOF
 
 --echo # Start mysqld without the possibility to create innodb_undo_tablespaces
 --mkdir $bugdir/undo002
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=\[ERROR\] InnoDB: Could not create undo tablespace '.*undo002';
 --source include/search_pattern_in_file.inc
@@ -43,7 +43,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --list_files $bugdir
 
 --echo # Start mysqld with non existent innodb_log_group_home_dir
---error 1
+--error 1,42
 --exec $MYSQLD $args --innodb_log_group_home_dir=/path/to/non-existent/
 let SEARCH_PATTERN=File .path.to.non-existent.*ib_logfile101: 'create' returned OS error \d+;
 --source include/search_pattern_in_file.inc
@@ -59,7 +59,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 # complaining about mysql.* tables. This is sufficient for testing
 # missing tablespaces.
 --echo # Start mysqld to create tablespaces according to my.cnf
---error 1
+--error 1,42
 --exec $MYSQLD $args --skip-grant-tables --innodb-unknown-parameter
 let SEARCH_PATTERN=unknown option '--innodb-unknown-parameter';
 --source include/search_pattern_in_file.inc
@@ -78,7 +78,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 
 --echo # 1. With ibdata2, Without ibdata1
 --remove_file $bugdir/ibdata1
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=The innodb_system data file 'ibdata1' was not found but one of the other data files 'ibdata2' exists;
 --source include/search_pattern_in_file.inc
@@ -90,7 +90,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 
 --echo # 2. With ibdata1, without ibdata2
 --remove_file $bugdir/ibdata2
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=Tablespace size stored in header is \d+ pages, but;
 --source include/search_pattern_in_file.inc
@@ -104,7 +104,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/ibdata1
 --remove_file $bugdir/ibdata2
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
@@ -118,7 +118,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_files_wildcard $bugdir ibdata*
 --remove_files_wildcard $bugdir ib_logfile*
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
@@ -134,7 +134,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_files_wildcard $bugdir ib_logfile*
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
@@ -151,7 +151,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/undo001
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=undo tablespace .*undo003.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
@@ -164,7 +164,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --echo # 7. With ibdata files & Without undo002
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able;
 --source include/search_pattern_in_file.inc
@@ -179,7 +179,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/undo001
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able;
 --source include/search_pattern_in_file.inc
@@ -196,7 +196,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_files_wildcard $bugdir undo00*
 --remove_file $bugdir/ib_logfile1
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=redo log file .*ib_logfile0.* exists\. Creating system tablespace with existing redo log files is not recommended\. Please delete all redo log files before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
@@ -210,7 +210,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 #--remove_file $bugdir/ib_logfile0
 # The below would start the server. Since we cannot start a parallel
 # server, do not test the below case
-#--error 1
+#--error 1,42
 #--exec $MYSQLD $args
 
 # clean up & Restore
@@ -219,7 +219,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --echo # 11. With ibdata*, without ib_logfile1
 --remove_file $bugdir/ib_logfile1
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=Only one log file found;
 --source include/search_pattern_in_file.inc
@@ -232,7 +232,7 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --echo # 12. With ibdata*, without ib_logfile2
 --remove_file $bugdir/ib_logfile2
 --list_files $bugdir
---error 1
+--error 1,42
 --exec $MYSQLD $args
 let SEARCH_PATTERN=Resizing redo log from \d+\*\d+ to \d+\*\d+ pages, LSN=\d+;
 --source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/log_file_name.test b/mysql-test/suite/innodb/t/log_file_name.test
index abe80bb81b7f..8a2054dd2241 100644
--- a/mysql-test/suite/innodb/t/log_file_name.test
+++ b/mysql-test/suite/innodb/t/log_file_name.test
@@ -35,7 +35,7 @@ let $mysqld=$MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
 
 # This could fail to refuse startup, in case there was a log
 # checkpoint after the INSERT. That is what we checked above.
---error 1
+--error 1,42
 --exec $mysqld
 
 let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Another data file called .*t1.ibd exists with the same space ID;
@@ -49,7 +49,7 @@ let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Ano
 --echo # Fault 2: Wrong space_id in a dirty file, and a missing file.
 --move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t1.ibd
 
---error 3
+--error 3,42
 --exec $mysqld
 
 let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t1.ibd' with space ID;
@@ -67,7 +67,7 @@ let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at.*t3.ibd;
 --move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t3.ibd
 --move_file $MYSQLD_DATADIR/test/t.ibd $MYSQLD_DATADIR/test/t2.ibd
 
---error 3
+--error 3,42
 --exec $mysqld
 
 let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t[23].ibd' with space ID;
@@ -88,7 +88,7 @@ let SEARCH_PATTERN= InnoDB: Set innodb_force_recovery=1 to ignore this and to pe
 
 --echo # Fault 4: Missing data file
 
---error 3
+--error 3,42
 --exec $mysqld
 
 let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t[12].ibd.
@@ -108,7 +108,7 @@ let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t[12].ibd.
 # Create a short file.
 --exec echo "" > $MYSQLD_DATADIR/test/t2.ibd
 
---error 3
+--error 3,42
 --exec $mysqld
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: Datafile .*t2.*\. Cannot determine the space ID from the first 64 pages;
@@ -188,7 +188,7 @@ EOF
 
 --copy_file $MYSQLD_DATADIR/test/u6.ibd $MYSQLD_DATADIR/test/u4.ibd
 
---error 1
+--error 1,42
 --exec $mysqld --innodb-force-recovery=1
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: Header page consists of zero bytes in datafile: .*u1.ibd;
@@ -213,7 +213,7 @@ let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot read first page of .*u2.ibd.*;
 
 --echo # Fault 7: Missing or wrong data file and innodb_force_recovery
 
---error 1
+--error 1,42
 --exec $mysqld --innodb-force-recovery=1
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: Header page consists of zero bytes in datafile: .*u1.ibd;
@@ -227,7 +227,7 @@ let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot rename '.*u5.ibd' to '.*u6.ibd' for
 
 --remove_file $MYSQLD_DATADIR/test/u6.ibd
 
---error 1
+--error 1,42
 --exec $mysqld --innodb-force-recovery=1 --innodb-nonexistent-option
 let SEARCH_PATTERN= \[ERROR\] unknown option '--innodb-nonexistent-option';
 --source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test
index a08dd3d63ae4..6650c5a45357 100644
--- a/mysql-test/suite/innodb/t/log_file_size.test
+++ b/mysql-test/suite/innodb/t/log_file_size.test
@@ -68,7 +68,7 @@ let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args --innodb-read-only
 let SEARCH_PATTERN= InnoDB: Recovery skipped, --innodb-read-only set!;
 --source include/search_pattern_in_file.inc
@@ -93,7 +93,7 @@ let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args --innodb-read-only
 let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-only-mode;
 --source include/search_pattern_in_file.inc
@@ -113,7 +113,7 @@ let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 # this crashes right after deleting all log files
 --remove_file $SEARCH_FILE
 
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args --innodb-read-only
 let SEARCH_PATTERN= InnoDB: Cannot create log files in read-only mode;
 --source include/search_pattern_in_file.inc
@@ -136,7 +136,7 @@ let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 # Rename the log files, and trigger an error in recovery.
 --move_file $MYSQLD_DATADIR/ib_logfile101 $MYSQLD_DATADIR/ib_logfile0
 --move_file $MYSQLD_DATADIR/ib_logfile1 $MYSQLD_DATADIR/ib_logfile1_hidden
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: Only one log file found;
 --source include/search_pattern_in_file.inc
@@ -148,7 +148,7 @@ die unless open(FILE, ">$ENV{MYSQLD_DATADIR}/ib_logfile0");
 print FILE "garbage";
 close(FILE);
 EOF
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: Log file .*ib_logfile0 size 7 is not a multiple of innodb_page_size;
 --source include/search_pattern_in_file.inc
@@ -162,7 +162,7 @@ print FILE "junkfill" x 131072;
 close(FILE);
 EOF
 
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: Log file .*ib_logfile1 is of different size 1048576 bytes than other log files;
 --source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/log_file_size_1.test b/mysql-test/suite/innodb/t/log_file_size_1.test
index 5494d4f522e1..3f16bd0e47c4 100644
--- a/mysql-test/suite/innodb/t/log_file_size_1.test
+++ b/mysql-test/suite/innodb/t/log_file_size_1.test
@@ -180,7 +180,7 @@ let SEARCH_PATTERN= syntax error in innodb_log_group_home_dir;
 --remove_file $SEARCH_FILE
 
 --echo "test misc 3"
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args --innodb-read-only
 let SEARCH_PATTERN= InnoDB: Cannot resize log files in read-only mode;
 --source include/search_pattern_in_file.inc
@@ -191,7 +191,7 @@ let SEARCH_PATTERN= InnoDB: Cannot resize log files in read-only mode;
 # Rename the log files, and trigger an error in recovery.
 #--move_file $MYSQLD_DATADIR/ib_logfile101 $MYSQLD_DATADIR/ib_logfile0
 --move_file $MYSQLD_DATADIR/ib_logfile1 $MYSQLD_DATADIR/ib_logfile1_hidden
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: Only one log file found;
 --source include/search_pattern_in_file.inc
@@ -207,7 +207,7 @@ die unless open(FILE, ">$ENV{MYSQLD_DATADIR}/ib_logfile0");
 print FILE "garbage";
 close(FILE);
 EOF
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: .*ib_logfile0 size 7 is not a multiple of innodb_page_size;
 --source include/search_pattern_in_file.inc
@@ -224,7 +224,7 @@ print FILE "junkfill" x 131072;
 close(FILE);
 EOF
 
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $args
 let SEARCH_PATTERN= InnoDB: .*ib_logfile1 is of different size;
 --source include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/innodb/t/partition-blob.test b/mysql-test/suite/innodb/t/partition-blob.test
index 420f71d16d6f..629b04e39ee0 100644
--- a/mysql-test/suite/innodb/t/partition-blob.test
+++ b/mysql-test/suite/innodb/t/partition-blob.test
@@ -34,3 +34,19 @@ HAVING (SELECT 1 FROM t1 HAVING f2 LIMIT 1)
 ORDER BY f3;
 
 DROP TABLE t1;
+
+
+--echo #
+--echo # Bug #28491099 [FATAL] MEMORY BLOCK IS INVALID | INNODB: ASSERTION
+--echo # FAILURE: UT0UT.CC:670
+--echo #
+set sql_mode='';
+CREATE TABLE t1(a INT, b TEXT NOT NULL) PARTITION BY RANGE(a)
+(PARTITION p0 VALUES LESS THAN (6), PARTITION p1 VALUES LESS THAN (9),
+PARTITION p2 VALUES LESS THAN MAXVALUE);
+INSERT INTO t1(a) VALUES(0);
+ALTER TABLE t1 ADD COLUMN c DATE NOT NULL;
+ALTER TABLE t1 drop partition p0;
+ALTER TABLE t1 ADD COLUMN d DATE NOT NULL;
+DROP TABLE t1;
+SET sql_mode = default;
diff --git a/mysql-test/suite/innodb/t/stored_fk.test b/mysql-test/suite/innodb/t/stored_fk.test
index 90e1c318f3fa..da8df775523e 100644
--- a/mysql-test/suite/innodb/t/stored_fk.test
+++ b/mysql-test/suite/innodb/t/stored_fk.test
@@ -38,3 +38,68 @@ create table t2(f1 int not null,
 alter table t2 add column f2 int as (f1) stored, algorithm=inplace;
 drop table t2, t1;
 set foreign_key_checks = 1;
+
+--echo #
+--echo # BUG#26731689 FK ON TABLE WITH GENERATED COLS: ASSERTION POS < N_DEF
+--echo #
+
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+SET foreign_key_checks=0;
+
+--disable_warnings
+DROP TABLE IF EXISTS s,t;
+--enable_warnings
+
+CREATE TABLE s (a INT, b INT GENERATED ALWAYS AS (0) STORED,  c INT,
+		d INT GENERATED ALWAYS AS (0) VIRTUAL, e INT) ENGINE=innodb;
+
+CREATE TABLE t (a INT) ENGINE=innodb;
+
+# This would fail. No corresponding index
+--error ER_FK_NO_INDEX_PARENT
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (e) REFERENCES t(a) ON UPDATE SET null;
+
+ALTER  TABLE t ADD PRIMARY KEY(a);
+
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (e) REFERENCES t(a) ON UPDATE SET null;
+
+DROP TABLE s,t;
+
+CREATE TABLE s (a INT GENERATED ALWAYS AS (0) VIRTUAL,
+		b INT GENERATED ALWAYS AS (0) STORED,  c INT) ENGINE=innodb;
+
+CREATE TABLE t (a INT) ENGINE=innodb;
+
+# This would fail. No corresponding index
+--error ER_FK_NO_INDEX_PARENT
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (c) REFERENCES t(a) ON UPDATE SET null;
+
+ALTER  TABLE t ADD PRIMARY KEY(a);
+
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (c) REFERENCES t(a) ON UPDATE SET null;
+
+DROP TABLE s,t;
+
+CREATE TABLE s (a INT,  b INT GENERATED ALWAYS AS (0) STORED) ENGINE=innodb;
+
+CREATE TABLE t (a INT PRIMARY KEY) ENGINE=innodb;
+
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+
+DROP TABLE s,t;
+
+CREATE TABLE s (a INT, b INT) ENGINE=innodb;
+
+CREATE TABLE t (a INT) ENGINE=innodb;
+
+# This would fail. No corresponding index
+--error ER_FK_NO_INDEX_PARENT
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+
+ALTER  TABLE t ADD PRIMARY KEY(a);
+
+ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
+
+DROP TABLE s,t;
+
+SET @@foreign_key_checks = @foreign_key_checks_saved;
diff --git a/mysql-test/suite/innodb/t/table_encrypt_1.test b/mysql-test/suite/innodb/t/table_encrypt_1.test
index c7f36a36b792..966802ca9a00 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_1.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_1.test
@@ -10,14 +10,17 @@
 
 # Create a table with encryption, should fail since keyring is not
 # loaded
+--disable_query_log
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for table `\.\.*`\.`\.\.*` in the cache.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted");
 call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
+--enable_query_log
+
 --error ER_CANNOT_FIND_KEY_IN_KEYRING
 CREATE TABLE t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
 
diff --git a/mysql-test/suite/innodb/t/table_encrypt_2-master.opt b/mysql-test/suite/innodb/t/table_encrypt_2-master.opt
index 4be41e0f321b..465a20f4178f 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_2-master.opt
+++ b/mysql-test/suite/innodb/t/table_encrypt_2-master.opt
@@ -1,2 +1,3 @@
 $KEYRING_PLUGIN_OPT
 $KEYRING_PLUGIN_LOAD
+--loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key
diff --git a/mysql-test/suite/innodb/t/table_encrypt_2.test b/mysql-test/suite/innodb/t/table_encrypt_2.test
index d7233555147b..9404df7c963d 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_2.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_2.test
@@ -5,11 +5,12 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
-call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
+--disable_query_log
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[ERROR\\] Function 'keyring_file' already exists");
 call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.*'.");
 call mtr.add_suppression("Plugin keyring_file reported");
+--enable_query_log
 
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 eval SET @@global.keyring_file_data="$MYSQL_TMP_DIR/keyring";
diff --git a/mysql-test/suite/innodb/t/table_encrypt_3.test b/mysql-test/suite/innodb/t/table_encrypt_3.test
index b7664910e2d7..0855992d00c1 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_3.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_3.test
@@ -6,11 +6,12 @@
 --source include/not_embedded.inc
 --source include/have_innodb_max_16k.inc
 
+--disable_query_log
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
-call mtr.add_suppression("InnoDB: The error means that another program is using InnoDB's files");
 call mtr.add_suppression("InnoDB: The error means that another program is using InnoDB's files");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 32 in a file operation.");
+--enable_query_log
+
 let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
 
 #------------------------------------------------------------------------------
@@ -210,7 +211,7 @@ DROP TABLESPACE s_alt1;
 CREATE TEMPORARY TABLE tde_db.t_encrypt (a int, b text) ENCRYPTION="Y" ENGINE=InnoDB;
 
 # Now error/warning shown
---error ER_ILLEGAL_HA
+--error ER_ILLEGAL_HA_CREATE_OPTION
 CREATE TABLE tde_db.t_encrypt_myisam (a int, b text) ENCRYPTION="Y" ENGINE=MyISAM;
 
 # Create a table with encryption and different row format
diff --git a/mysql-test/suite/innodb/t/table_encrypt_4.test b/mysql-test/suite/innodb/t/table_encrypt_4.test
index b0ecc03fffd4..4abda7bc733a 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_4.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_4.test
@@ -21,7 +21,7 @@ call mtr.add_suppression("Operating system error number .* in a file operation")
 call mtr.add_suppression("InnoDB: The error means the system cannot find the path specified.");
 call mtr.add_suppression("'delete' returned OS error 7");
 call mtr.add_suppression("InnoDB: Trying to import a tablespace, but could not open the tablespace file");
-call mtr.add_suppression("InnoDB: Table is not in an encrypted tablespace, but the data file which trying to import is an encrypted tablespace");
+call mtr.add_suppression("Table is not in an encrypted tablespace, but the data file intended for import is an encrypted tablespace");
 --enable_query_log
 
 --disable_warnings
diff --git a/mysql-test/suite/innodb/t/table_encrypt_5.test b/mysql-test/suite/innodb/t/table_encrypt_5.test
index 425c9eaccd59..08926ee0e59e 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_5.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_5.test
@@ -18,9 +18,9 @@
 --source include/not_embedded.inc
 
 # Suppress warnings
+--disable_query_log
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted");
 call mtr.add_suppression("InnoDB: Operating system error number");
 call mtr.add_suppression("The error means the system cannot find the path specified");
 call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
@@ -34,6 +34,7 @@ call mtr.add_suppression("Error while loading keyring content. The keyring might
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_file initialization failure.");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
+--enable_query_log
 
 let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
 
@@ -424,9 +425,10 @@ SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS
 SELECT @@global.keyring_file_data;
 --echo # init tables
 call tde_db.init_setup();
---echo # restart without --early-plugin-load and keyring_file_data
---echo # AND explicitly install plugin to access old table
-let $restart_parameters = restart: ;
+--echo # restart without --early-plugin-load (still need to provide with
+--echo # keyring_file_data otherwise it would point to default location which might be
+--echo # non-writable to mtr). Instead explicitly install plugin to access old table
+let $restart_parameters = restart: --loose-keyring_file_data=$MYSQL_TMP_DIR/mydummy_keyring;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR $KEYRING_PLUGIN_OPT --plugin-dir=KEYRING_PLUGIN_PATH $KEYRING_PLUGIN keyring_file.so
 --source include/restart_mysqld.inc
 
diff --git a/mysql-test/suite/innodb/t/table_encrypt_debug.test b/mysql-test/suite/innodb/t/table_encrypt_debug.test
index 2eda1fea3723..9574cc13e2e5 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_debug.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_debug.test
@@ -19,8 +19,7 @@
 
 --disable_query_log
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted");
 call mtr.add_suppression("does not exist in the InnoDB internal data dictionary though MySQL is trying to drop it");
 call mtr.add_suppression("Cannot open table tde_db/.* from the internal data dictionary of InnoDB");
 call mtr.add_suppression("\\[Warning\\] InnoDB: Tablespace for table `tde_db`.`t1` is set as discarded");
diff --git a/mysql-test/suite/innodb/t/table_encrypt_fts.test b/mysql-test/suite/innodb/t/table_encrypt_fts.test
new file mode 100644
index 000000000000..dced1002a21d
--- /dev/null
+++ b/mysql-test/suite/innodb/t/table_encrypt_fts.test
@@ -0,0 +1,83 @@
+--echo #
+--echo # Bug#30787535 : FULLTEXT INDEX TABLES CREATED IN ENCRYPTED SCHEMA ARE NOT ENCRYPTED
+--echo #
+
+################################################################################
+# For an encrypted table, this test case checks physical ibd file for :
+#	- table
+#	- fts table created for an FTS index on table
+#	- Other aux tables created for FTS index
+#  to see if they are encrypted.
+################################################################################
+--source include/have_debug.inc
+# Disable in valgrind because of timeout, cf. Bug#22760145
+--source include/not_valgrind.inc
+# Waiting time when (re)starting the server
+--let $explicit_default_wait_counter=10000;
+
+--echo #########
+--echo # SETUP #
+--echo #########
+--echo
+let datadir=`SELECT @@datadir`;
+let search_pattern=supremum;
+
+--echo #########################################################################
+--echo # RESTART 1 : WITH KEYRING PLUGIN
+--echo #########################################################################
+let $restart_parameters = restart: --early-plugin-load=keyring_file=$KEYRING_PLUGIN --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR $KEYRING_PLUGIN_OPT --plugin-dir=KEYRING_PLUGIN_PATH $KEYRING_PLUGIN keyring_file.so
+--replace_regex /\.dll/.so/
+--source include/restart_mysqld.inc
+
+--echo # Create a new 'unencrypted' table
+CREATE TABLE t1 (id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+                 C1 TEXT(500),
+                 C2 VARCHAR(200),
+                 C3 VARCHAR(200)) ENCRYPTION='N' ENGINE=InnoDB;
+
+# Make sure all pages are flushed
+set global innodb_buf_flush_list_now = 1;
+
+--echo # ---------------------------------------------------------------
+--echo # Test 1 : t1 un-encrypted, FTS tables should also be unencrypted
+--echo # ---------------------------------------------------------------
+--echo # Check that tablespace file is not encrypted
+--let ts_name=test/t1.ibd
+--source include/if_encrypted.inc
+
+CREATE FULLTEXT INDEX idx ON t1(C1);
+
+# Make sure all pages are flushed
+set global innodb_buf_flush_list_now = 1;
+
+--let ts_name = `select NAME from information_schema.innodb_sys_tables where name like "%INDEX_1%";`
+--let ts_name = $ts_name.ibd
+--echo # Check that FTS tablespaces file is not encrypted
+--source include/if_encrypted.inc
+
+--echo # ---------------------------------------------------------------
+--echo # Test 1 : t1 encrypted, FTS tables should also be unencrypted
+--echo # ---------------------------------------------------------------
+# Now, change the encryption property of table
+ALTER TABLE t1 ENCRYPTION='Y';
+
+--echo # Check that tablespace file is encrypted now
+--let ts_name=test/t1.ibd
+--source include/if_encrypted.inc
+
+--let ts_name = `select NAME from information_schema.innodb_sys_tables where name like "%INDEX_1%";`
+--let ts_name = $ts_name.ibd
+--echo # Check that FTS tablespace file is encrypted now
+--source include/if_encrypted.inc
+
+--echo ###########
+--echo # CLEANUP #
+--echo ###########
+DROP TABLE test.t1;
+remove_file $MYSQLTEST_VARDIR/tmpfile.txt;
+remove_file $MYSQL_TMP_DIR/mysecret_keyring;
+
+--echo # Restarting server without keyring to restore server state
+let $restart_parameters = restart: ;
+--source include/restart_mysqld.inc
diff --git a/mysql-test/suite/innodb/t/table_encrypt_kill.test b/mysql-test/suite/innodb/t/table_encrypt_kill.test
index 4c18057ceb1f..11699f865013 100644
--- a/mysql-test/suite/innodb/t/table_encrypt_kill.test
+++ b/mysql-test/suite/innodb/t/table_encrypt_kill.test
@@ -15,14 +15,10 @@
 --source include/not_crashrep.inc
 
 #suppress warning
+--disable_query_log
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
+call mtr.add_suppression("ibd can't be decrypted");
 call mtr.add_suppression("does not exist in the InnoDB internal data dictionary though MySQL is trying to drop it");
-
-call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded");
-call mtr.add_suppression("Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
 call mtr.add_suppression("InnoDB: Operating system error number");
 call mtr.add_suppression("The error means the system cannot find the path specified");
 call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
@@ -34,6 +30,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Table tde_db/t_encrypt.* in the In
 call mtr.add_suppression("\\[Warning\\] InnoDB: Please refer to .* for how to resolve the issue");
 call mtr.add_suppression("Cannot create keyring directory");
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'Could not create keyring directory");
+--enable_query_log
 
 
 
diff --git a/mysql-test/suite/innodb/t/table_encryption-master.opt b/mysql-test/suite/innodb/t/table_encryption-master.opt
new file mode 100644
index 000000000000..cb6c6d2807a7
--- /dev/null
+++ b/mysql-test/suite/innodb/t/table_encryption-master.opt
@@ -0,0 +1 @@
+$KEYRING_PLUGIN_OPT
diff --git a/mysql-test/suite/innodb/t/table_encryption.test b/mysql-test/suite/innodb/t/table_encryption.test
new file mode 100644
index 000000000000..58d3cdf9cd53
--- /dev/null
+++ b/mysql-test/suite/innodb/t/table_encryption.test
@@ -0,0 +1,90 @@
+#
+# Test cases for bugs fixes related to InnoDB table encryption
+#
+
+--source include/no_valgrind_without_big.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+let $innodb_file_per_table = `SELECT @@innodb_file_per_table`;
+
+--echo # Starting server with keyring plugin  
+let $restart_parameters = restart: --early-plugin-load="keyring_file=$KEYRING_PLUGIN" --loose-keyring_file_data=$MYSQL_TMP_DIR/mysecret_keyring $KEYRING_PLUGIN_OPT;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR $KEYRING_PLUGIN_OPT --plugin-dir=KEYRING_PLUGIN_PATH $KEYRING_PLUGIN keyring_file.so
+--replace_regex /\.dll/.so/
+--source include/restart_mysqld.inc
+
+#------------------------------------------------------------------------------
+# Initial setup for test which create encrypt and non encrypt tables
+SET GLOBAL innodb_file_per_table = 1;
+SELECT @@innodb_file_per_table;
+
+--echo #
+--echo # BUG#29543447: ALTER TABLE ALLOWS TDE ENCRYPTION ON MYISAM ENGINE
+--echo # We disallow ENCRYPTION clause requesting for table encryption.
+--echo # We allow ENCRYPTION clause with 'n' or 'N' for Heap/CSV engines.
+--echo # MyISAM engine rejects even 'n' or 'N' in some cases, we keep
+--echo # this behavior as is for now.
+--echo #
+
+--echo # CREATE TABLE requesting ENCRYPTION
+--error ER_ILLEGAL_HA_CREATE_OPTION
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='Y', ENGINE= MyISAM;
+--error ER_ILLEGAL_HA
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='n', ENGINE= MyISAM;
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='n', ENGINE= HEAP;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo # ALTER TABLE requesting ENCRYPTION
+CREATE TABLE t1 (fld1 INT) ENGINE=MyISAM;
+--error ER_ILLEGAL_HA_CREATE_OPTION
+ALTER TABLE t1 ENCRYPTION= 'Y';
+ALTER TABLE t1 ENCRYPTION= 'N';
+SHOW CREATE TABLE t1;
+
+--echo # ALTER TABLE requesting ENCRYPTION with INPLACE algo.
+--echo # Without patch, no error was reported.
+--error ER_ILLEGAL_HA_CREATE_OPTION
+ALTER TABLE t1 ENCRYPTION= 'y', ALGORITHM=INPLACE;
+ALTER TABLE t1 ENCRYPTION= 'n', ALGORITHM=INPLACE;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo # ALTER TABLE requesting ENCRYPTION with COPY algo.
+--echo # Without patch, error was reported by SE. With
+--echo # this patch the error is reported by SQL server.
+CREATE TABLE t1 (fld1 INT NOT NULL) ENGINE=MyISAM;
+--error ER_ILLEGAL_HA_CREATE_OPTION
+ALTER TABLE t1 ENCRYPTION= 'y', ALGORITHM=COPY;
+
+--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
+--error ER_ILLEGAL_HA
+ALTER TABLE t1 ENCRYPTION= 'n', ALGORITHM=COPY;
+--echo # CSV/Heap allows values 'n' or 'N'.
+ALTER TABLE t1 ENGINE=CSV, ENCRYPTION= 'n', ALGORITHM=COPY;
+ALTER TABLE t1 ENGINE=Heap, ENCRYPTION= 'n', ALGORITHM=COPY;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo # CREATE TABLE with ENCRYPTION=''.
+--echo # Allow it as it is not requesting for encryption.
+CREATE TABLE t1 (fld1 INT) ENGINE=MyISAM, ENCRYPTION="";
+SHOW CREATE TABLE t1;
+ALTER TABLE t1 ENCRYPTION= '';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo # Move encrypted InnoDB table to Heap.
+CREATE TABLE t1 (fld1 INT) ENCRYPTION='Y', ENGINE=InnoDB;
+--error ER_ILLEGAL_HA_CREATE_OPTION
+ALTER TABLE t1 ENGINE= Heap;
+DROP TABLE t1;
+
+--echo # Starting server without keyring
+let $restart_parameters = restart: ;
+--source include/restart_mysqld.inc
+
+# Cleanup
+eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table;
+--remove_file $MYSQL_TMP_DIR/mysecret_keyring
diff --git a/mysql-test/suite/innodb/t/tablespace_crash.test b/mysql-test/suite/innodb/t/tablespace_crash.test
index 0ea200d3e389..c75affe94c11 100644
--- a/mysql-test/suite/innodb/t/tablespace_crash.test
+++ b/mysql-test/suite/innodb/t/tablespace_crash.test
@@ -146,7 +146,7 @@ INSERT INTO t4 VALUES (6);
 --exec echo $MYSQL_TMP_DIR/bad/tablespace1.ibd > $MYSQLD_DATADIR/tablespace1.isl
 
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
---error 3
+--error 3,42
 --exec $MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: ISL file '.*tablespace1.isl' was found but the linked file '.*tablespace1.ibd' could not be opened or is not correct;
@@ -166,7 +166,7 @@ let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot continue operation;
 --exec echo $MYSQL_TMP_DIR/tablespace1.ibd > $MYSQLD_DATADIR/tablespace1.isl
 --exec echo $MYSQL_TMP_DIR/bad/t3.ibd > $MYSQLD_DATADIR/test/t3.isl
 
---error 3
+--error 3,42
 --exec $MYSQLD_CMD --core-file --console > $SEARCH_FILE 2>&1;
 
 let SEARCH_PATTERN= \[ERROR\] InnoDB: ISL file '.*t3.isl' was found but the linked file '.*t3.ibd' could not be opened or is not correct;
diff --git a/mysql-test/suite/innodb/t/tinytext-groupby.test b/mysql-test/suite/innodb/t/tinytext-groupby.test
new file mode 100644
index 000000000000..33cac9e0ede3
--- /dev/null
+++ b/mysql-test/suite/innodb/t/tinytext-groupby.test
@@ -0,0 +1,26 @@
+--source include/big_test.inc
+--source include/not_valgrind.inc
+--echo #
+--echo # Bug #29207450 TINYTEXT COLUMN TAKES LONG TIME IN THE GROUP BY OPERATION.
+--echo #
+
+create table t1 (id serial primary key auto_increment,a varchar(100),b varchar(100));
+create table t2 (id serial primary key auto_increment,a varchar(100),b tinytext);
+
+insert into t1 (a, b) values('a', '746d847beb7e'),('a','746d847beb7e'),('a', '746d847beb7e'),('a','746d847beb7e'),('a','746d847beb7e');
+insert into t1 (a, b) select 'a', '746d847beb7e' from t1 t1,t1 t2,t1 t3,t1 t4;
+insert into t1 (a, b) select 'a', '746d847beb7e' from t1 t1,t1 t2;
+insert into t2 (a, b) values('a', '746d847beb7e'),('a','746d847beb7e'),('a', '746d847beb7e'),('a','746d847beb7e'),('a','746d847beb7e');
+insert into t2 (a, b) select 'a', '746d847beb7e' from t2 t1,t2 t2,t2 t3,t2 t4;
+insert into t2 (a, b) select 'a', '746d847beb7e' from t2 t1,t2 t2;
+select count(*) from t1;
+select count(*) from t2;
+
+set global internal_tmp_disk_storage_engine = 'innodb';
+select b, count(*) from t1 group by b;
+select b, count(*) from t2 group by b;
+set global internal_tmp_disk_storage_engine = 'myisam';
+select b, count(*) from t1 group by b;
+select b, count(*) from t2 group by b;
+set global internal_tmp_disk_storage_engine = default;
+drop table t1, t2;
diff --git a/mysql-test/suite/innodb/t/virtual_debug.test b/mysql-test/suite/innodb/t/virtual_debug.test
index 74838c2250b3..d023c47266ee 100644
--- a/mysql-test/suite/innodb/t/virtual_debug.test
+++ b/mysql-test/suite/innodb/t/virtual_debug.test
@@ -281,8 +281,381 @@ CHECK TABLE t;
 SELECT * FROM t;
 DROP TABLE t;
 
+--echo #
+--echo # Bug#26375771 INNODB: ASSERTION FAILURE: MACH0DATA.IC:308:VAL > 0X7F
+--echo #
+create table ibstd_07 (a int not null, d int not null, b blob not null, c text, vadcol int as (a+length(d)) stored, vbcol char(2) as (substr(b,2,2)) virtual, vbidxcol char(3) as (substr(b,1,3)) virtual , index(d  desc), index(a  desc), index(vbidxcol  desc), index(vbidxcol  desc,d  asc), unique key (b(101)  desc, a  asc, d ), index(c(255)  desc, b(255)  asc), index(b(5)  desc, c(10)  asc, a ) ) engine=InnoDB default charset=latin1 row_format=redundant;
+
+insert into ibstd_07 values (2, 2, repeat('rocalrulcrcaurcuccoolrouuocacaooaucauualcucuoucucclolcllloocuarcoorlaccarocouuaoorcolloucraoaaooc','281'),repeat('ouolrculuouocououooalcoraooaulouuacrolrocooraoaooooolaccralacalooolalocoaacoorarorcurccarocucla','317'), default, default, default);
+
+
+SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead';
+--send alter table ibstd_07  add primary key (b(11)  desc,a  asc, d );
+
+# Do a concurrent update
+connection con1;
+SET DEBUG_SYNC = 'now WAIT_FOR start_create';
+
+update ibstd_07 set c=repeat('0.366710324443464crllooolarlollorlulololucrluacoorrrluroluroocouauacacruloulcurlraorcrclrolcocrrcoccolourrooclrcocruruauallo','70');
+
+
+SET DEBUG_SYNC = 'now SIGNAL go_ahead';
+
+connection default;
+reap;
+
+SELECT * FROM ibstd_07;
+DROP TABLE ibstd_07;
+
 disconnect con1;
 
 SET DEBUG_SYNC = 'RESET';
 
 --source include/wait_until_count_sessions.inc
+
+
+
+--echo #
+--echo # BUG#28448853 - ASSERTION FAILURE: ROW0LOG.CC:2153 ROW_LOG_TABLE_APPLY (THR=0X7F7C7C050030
+--echo #
+
+CREATE TABLE t1(a INT NOT NULL, d INT NOT NULL, b VARCHAR(198) NOT NULL, c CHAR(84), vbcol CHAR(2) AS (substr(b, 2, 2)) VIRTUAL);
+
+INSERT INTO t1(a, d, b, c) VALUES(200, 300, '1.3.1415926535', 'hello world');
+
+SELECT * FROM t1;
+
+connect (conn1, localhost, root,,);
+
+connection default;
+
+SET DEBUG_SYNC = 'inplace_after_index_build SIGNAL altered WAIT_FOR dmls_done';
+
+--send ALTER TABLE t1 ROW_FORMAT = COMPRESSED;
+
+connection conn1;
+
+SET DEBUG_SYNC = 'now WAIT_FOR altered';
+
+START TRANSACTION;
+UPDATE t1 SET b = '6.1516179' WHERE a = 200;
+ROLLBACK;
+
+SET DEBUG_SYNC = 'now SIGNAL dmls_done';
+
+disconnect conn1;
+
+connection default;
+
+reap;
+
+SET DEBUG_SYNC = 'reset';
+
+CHECK TABLE t1;
+
+SHOW CREATE TABLE t1;
+
+SELECT * FROM t1;
+
+DROP TABLE t1;
+
+
+
+--echo #
+--echo # Bug#28825718 - ASSERTION FAILURE: TRX0REC.CC:NNN:N_IDX > 0 WHILE DOING REPLACE/INSERT
+--echo #
+
+CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT GENERATED ALWAYS AS(b+1) VIRTUAL) ENGINE=InnoDB;
+
+INSERT INTO t1(a, b) VALUES(1, 1);
+
+connect (con1,localhost,root,,);
+connection con1;
+SET DEBUG_SYNC = 'row_log_apply_after SIGNAL s1 WAIT_FOR s2';
+SET lock_wait_timeout = 1;
+--send ALTER TABLE t1 ADD UNIQUE INDEX(c, b)
+
+connection default;
+
+SET DEBUG_SYNC = 'now WAIT_FOR s1';
+SET DEBUG_SYNC = 'row_ins_sec_index_enter SIGNAL s2 WAIT_FOR s3';
+--send INSERT INTO t1(a, b) VALUES(2, 2)
+
+connection con1;
+--echo /* con1 reap */ ALTER TABLE t1 ADD UNIQUE INDEX(c, b);
+--error ER_LOCK_WAIT_TIMEOUT
+reap;
+
+SET DEBUG_SYNC ='now SIGNAL s3';
+
+disconnect con1;
+
+connection default;
+reap;
+
+ALTER TABLE t1 ADD KEY(b);
+
+INSERT INTO t1(a, b) VALUES(3, 3);
+
+SELECT * FROM t1;
+
+CHECK TABLE t1;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#28834208 ROW_LOG_TABLE_APPLY_UPDATE*INPLACE_ALTER_TABLE
+--echo #
+
+CREATE TABLE t1 (
+   pkey INT(11) PRIMARY KEY,
+   a VARCHAR(100),
+   v VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(a,2,2)) VIRTUAL,
+   c varchar(100),
+  UNIQUE KEY k (v)
+);
+INSERT INTO t1 ( pkey,a,c) VALUES (149,'bata','test');
+SELECT pkey,a,v FROM t1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+--send OPTIMIZE TABLE t1
+connect (con1,localhost,root,,);
+--echo # Connect to con1
+--connection con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET a='tata' WHERE pkey=149;
+SET DEBUG_SYNC ='now signal S2';
+SELECT pkey,a,v FROM t1;
+disconnect con1;
+--connection default
+--echo # Connect to Default
+reap;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+   pkey INT(11) PRIMARY KEY,
+   a VARCHAR(100),
+   v VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(a,2,2)) VIRTUAL,
+   c varchar(100),
+   v1 VARCHAR(100) GENERATED ALWAYS AS (SUBSTRING(c,2,2)) VIRTUAL,
+   KEY k (v),
+   KEY v (v1)
+);
+INSERT INTO t1 (pkey, a, c) VALUES (149, 'bata', 'test');
+INSERT INTO t1 (pkey, a, c) VALUES (150, 'bata', 'test');
+INSERT INTO t1 (pkey, a, c) VALUES (160, 'bata', 'test');
+SELECT pkey, a, v, c, v1 FROM t1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+--send OPTIMIZE TABLE t1
+connect (con1,localhost,root,,);
+--echo # Connect to con1
+--connection con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET c = 'best' WHERE pkey = 149;
+UPDATE t1 SET a = 'tata' WHERE pkey = 150;
+UPDATE t1 SET a = 'tata', c = 'best' WHERE pkey = 160;
+SET DEBUG_SYNC ='now signal S2';
+SELECT pkey, a, v, c, v1 FROM t1;
+disconnect con1;
+--connection default
+--echo # Connect to Default
+reap;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+CREATE TABLE t1(
+   j SERIAL PRIMARY KEY,
+   a VARCHAR(36),
+   isa BOOLEAN,
+   ab VARCHAR(36) AS (IF(`isa`,`a`,NULL )),
+   KEY k(ab)
+);
+INSERT INTO t1 (a, isa) VALUES ('test', 1);
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL index_built WAIT_FOR S2';
+--send OPTIMIZE TABLE t1
+connect (con1,localhost,root,,);
+--echo # Connect to con1
+--connection con1
+SET DEBUG_SYNC = 'now WAIT_FOR index_built';
+UPDATE t1 SET isa=0 ;
+SET DEBUG_SYNC ='now signal S2';
+SELECT j,a,isa,ab FROM t1;
+disconnect con1;
+--echo # Connect to Default
+--connection default
+reap;
+SELECT j,a,isa,ab FROM t1;
+UPDATE t1 SET isa = 1 WHERE a = 'test' AND isa = 0;
+SELECT j,a,isa,ab FROM t1;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#29451999: CRASH WITH RANGE QUERIES
+--echo #
+
+CREATE TABLE t1 (c1 JSON, c2 TINYTEXT, c3 TIMESTAMP(4), c4 JSON, c5 DOUBLE, c6 TIME(4), c7 LONGTEXT GENERATED ALWAYS AS ('20:30:44') VIRTUAL NOT NULL, KEY k1 (c7(12))) ENGINE=INNODB;
+INSERT INTO t1 (c1, c2, c3, c4) VALUES('{}', 1, '1991-05-27', '{}');
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+INSERT INTO t1 (c1, c2, c3, c4) SELECT c1, c2, c3, c4 FROM t1;
+SELECT COUNT(*) FROM t1;
+
+SET GLOBAL innodb_purge_stop_now= ON;
+DELETE FROM t1;
+
+SELECT c4 FROM t1 WHERE c7 BETWEEN '16383' AND '2015-01-01';
+
+#Cleanup
+SET GLOBAL innodb_purge_run_now = ON;
+DROP TABLE t1;
+
+CREATE TABLE t2 (
+  i INT NOT NULL,
+  gc INT GENERATED ALWAYS AS (i) VIRTUAL NOT NULL,
+  KEY (gc)
+);
+
+INSERT INTO t2 (i) VALUES (-1), (0), (1), (2);
+
+BEGIN;
+--disable_query_log
+--let $i = 2000
+while ($i > 0)
+{
+  INSERT INTO t2 (i) VALUES (-10);
+  dec $i;
+}
+--enable_query_log
+
+CONNECT (con1,localhost,root,,);
+# This query used to return zero rows.
+SELECT i FROM t2 FORCE INDEX (gc) WHERE gc <= -1;
+# Similar query using covering index was correct even before.
+SELECT gc FROM t2 FORCE INDEX (gc) WHERE gc <= -1;
+DISCONNECT con1;
+CONNECTION default;
+
+COMMIT;
+
+DROP TABLE t2;
+
+--echo #
+--echo # Bug #30556595  FAILING ASSERTION: !CURSOR->INDEX->IS_COMMITTED()
+--echo # ON TABLE WITH GCOLS
+--echo #
+
+--echo # Testcase-1
+CREATE TABLE t (pid int PRIMARY KEY,
+                uid int,
+                vid int AS (uid) VIRTUAL);
+connect(con1,localhost,root,,);
+--echo # Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+--send ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+--echo # Insert a record to generate an insert row log for the new index.
+--echo # LOG-1 idx_vid : INSERT [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+--echo # Update the record changing PK. It should generate 2 row logs for the new index.
+--echo # LOG-2 idx_vid : DELETE [10, 1]
+--echo # LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SELECT * FROM t;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+connection con1;
+--reap
+connection default;
+--echo # Insert a record to re-use the delete marked record in idx_vid [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+SELECT * FROM t;
+disconnect con1;
+DROP TABLE t;
+
+--echo # Testcase-2
+CREATE TABLE t (pid int PRIMARY KEY,
+                uid int,
+                vid int AS (uid) VIRTUAL);
+connect(con1,localhost,root,,);
+--echo # Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+--send ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+--echo # Start transaction
+BEGIN;
+--echo # Insert a record to generate an insert row log for the new index.
+--echo # LOG-1 idx_vid : INSERT [10, 1]
+INSERT INTO t(pid, uid) VALUES (1,10);
+--echo # Update the record changing PK. It should generate 2 row logs for the new index.
+--echo # LOG-2 idx_vid : DELETE [10, 1]
+--echo # LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SELECT * FROM t;
+--echo # Rollback transaction
+--echo # LOG-4 idx_vid : DELETE [10, 2]
+--echo # LOG-5 idx_vid : INSERT [10, 1]
+--echo # LOG-6 idx_vid : DELETE [10, 1]
+ROLLBACK;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+connection con1;
+--reap
+connection default;
+--echo # Insert a record to check valid entry in idx_vid [NULL, 1]
+INSERT INTO t(pid) VALUES (1);
+SELECT * FROM t;
+disconnect con1;
+DROP TABLE t;
+
+--echo # Testcase-3
+CREATE TABLE t (pid int PRIMARY KEY,
+                uid int,
+                vid int AS (uid) VIRTUAL);
+INSERT INTO t(pid, uid) VALUES (1,10);
+connect(con1,localhost,root,,);
+--echo # Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+--send ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+--echo # Update the record changing PK. It should generate 2 row logs for the new index.
+--echo # LOG-2 idx_vid : DELETE [10, 1]
+--echo # LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+connection con1;
+--reap
+connection default;
+--echo # Read [2, 10, 10] row using idx_vid index key.
+--sleep 1
+select * from t where VID=10;
+disconnect con1;
+DROP TABLE t;
+
+--echo # Testcase-4
+CREATE TABLE t (pid int PRIMARY KEY,
+                uid int,
+                vid int AS (uid) VIRTUAL);
+INSERT INTO t(pid, uid) VALUES (1,10);
+connect(con1,localhost,root,,);
+--echo # Create index on virtual column and stop before applying row logs.
+SET DEBUG_SYNC = 'row_log_apply_before SIGNAL start_dml WAIT_FOR resume_ddl';
+--send ALTER TABLE t ADD INDEX idx_vid(vid), algorithm=inplace
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR start_dml';
+--echo # Update the record changing PK. It should generate 2 row logs for the new index.
+--echo # LOG-2 idx_vid : DELETE [10, 1]
+--echo # LOG-3 idx_vid : INSERT [10, 2]
+UPDATE t SET pid = 2 WHERE pid = 1;
+SET DEBUG_SYNC= 'now SIGNAL resume_ddl';
+connection con1;
+--reap
+connection default;
+--echo # Delete a record.
+delete from t limit 1;
+disconnect con1;
+DROP TABLE t;
diff --git a/mysql-test/suite/innodb/t/virtual_fk.test b/mysql-test/suite/innodb/t/virtual_fk.test
index e390338160a8..de95d40fb95e 100644
--- a/mysql-test/suite/innodb/t/virtual_fk.test
+++ b/mysql-test/suite/innodb/t/virtual_fk.test
@@ -733,3 +733,48 @@ UPDATE t1 SET f1 = 3;
 EXPLAIN SELECT f1, f3 FROM t2;
 SELECT f1, f3 FROM t2;
 DROP TABLE t2, t1;
+
+--echo #
+--echo # Bug#32124113 MYSQL CRASH FOR GENERATED COLUMN DELETE WITH FOREIGN KEY
+--echo #
+
+CREATE TABLE `emails` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `email_stats` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `email_id` int(10) unsigned DEFAULT NULL,
+  `date_sent` datetime NOT NULL,
+  `generated_sent_date` date GENERATED ALWAYS AS
+(concat(year(`date_sent`),'-',lpad(month(`date_sent`),2,'0'),
+'-',lpad(dayofmonth(`date_sent`),2,'0'))) VIRTUAL,
+  PRIMARY KEY (`id`),
+  KEY `IDX_ES1` (`email_id`),
+  KEY `mautic_generated_sent_date_email_id`
+(`generated_sent_date`,`email_id`),
+  CONSTRAINT `FK_ES1` FOREIGN KEY (`email_id`) REFERENCES
+  `emails` (`id`) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `emails_metadata` (
+  `email_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`email_id`),
+  CONSTRAINT `FK_EM1` FOREIGN KEY (`email_id`) REFERENCES
+`emails` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+ROW_FORMAT=DYNAMIC;
+
+INSERT INTO `emails` VALUES (1);
+INSERT INTO `email_stats` (`id`, `email_id`,  `date_sent`) VALUES
+(1,1,'2020-10-22 13:32:41');
+INSERT INTO `emails_metadata` VALUES (1);
+DELETE FROM `emails`;
+
+#cleanup
+DROP TABLE `email_stats`;
+DROP TABLE `emails_metadata`;
+DROP TABLE `emails`;
diff --git a/mysql-test/suite/innodb/t/virtual_index.test b/mysql-test/suite/innodb/t/virtual_index.test
index 3054645024e7..cca681f28c15 100644
--- a/mysql-test/suite/innodb/t/virtual_index.test
+++ b/mysql-test/suite/innodb/t/virtual_index.test
@@ -218,3 +218,73 @@ ALTER TABLE t1 ADD COLUMN col7a INT GENERATED ALWAYS AS (col1 % col2)
 VIRTUAL, ADD UNIQUE index idx (col1), algorithm=inplace;
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug 27122803 - BACKPORT FIX FOR BUG 25899959 TO MYSQL-5.7
+--echo #
+
+CREATE TABLE t1 (col1 int(10)) DEFAULT CHARSET=utf8mb4;
+ALTER TABLE t1 ADD col2 char(21) AS (col1 * col1), ADD INDEX n (col2);
+SHOW CREATE TABLE t1;
+
+DROP TABLE t1;
+
+#Disable the test case because it's being failed on ASAN.
+#TODO : Bug #28556793 INNODB UPDATE_ROW ASAN FAILURE HEAP-USE-AFTER-FREE
+if (0)
+{
+	--echo #
+	--echo # Bug #27968952  INNODB CRASH/CORRUPTION WITH TEXT PREFIX INDEXES
+	SET sql_mode='';
+	CREATE TABLE t1(
+		a INT not null,
+		b CHAR(4) not null,
+		c TEXT GENERATED ALWAYS AS ((a <> b)) VIRTUAL,
+		UNIQUE KEY i1 (a),
+		UNIQUE KEY i2 (c(1))
+		) ENGINE=INNODB;
+	insert into t1 set a=1;
+	insert into t1 set a=0;
+	replace into t1 set b ='1';
+	DROP TABLE t1;
+
+	SET names utf8;
+	CREATE TABLE t1 (
+		a VARCHAR(1000) GENERATED ALWAYS AS ('1') VIRTUAL,
+		b VARCHAR(1000) NOT NULL,
+		c VARCHAR(1000) GENERATED ALWAYS AS (b) STORED NOT NULL,
+		KEY (b(1)),
+		KEY (a(1))
+		) ENGINE=INNODB
+		ROW_FORMAT=COMPRESSED
+		KEY_BLOCK_SIZE=1;
+	INSERT INTO t1(b) VALUES(REPEAT('a',947));
+	DELETE FROM t1;
+	DROP TABLE t1;
+	SET sql_mode = default;
+}
+
+--echo #
+--echo # Bug 23014521 - mysqld crash at row_upd_sec_index_entry_low
+--echo #
+SET @org_mode=@@sql_mode;
+SET @@sql_mode='';
+
+CREATE TABLE t1 (
+  col1 blob,
+  col3 blob,
+  col4 blob,
+  col5 blob GENERATED ALWAYS AS ((col1 - col4)) VIRTUAL,
+  col5x blob GENERATED ALWAYS AS ((col1 / col3)) VIRTUAL,
+  col9 text,
+  col2b blob GENERATED ALWAYS AS ((col5x / col5)) VIRTUAL,
+  KEY idx7 (col9(10), col5(5)),
+  KEY idx10 (col9(10), col2b(5))
+) ENGINE=InnoDB;
+INSERT INTO t1 (col1,col3,col4,col9) VALUES (REPEAT('a',20),REPEAT('a',20),REPEAT('a',20),REPEAT('a',20));
+UPDATE t1 SET col1 = 50;
+DELETE FROM t1;
+
+DROP TABLE t1;
+
+SET @@sql_mode=@org_mode;
diff --git a/mysql-test/suite/innodb/t/xa_prepare_lock_release.test b/mysql-test/suite/innodb/t/xa_prepare_lock_release.test
new file mode 100644
index 000000000000..4fb4b0287d91
--- /dev/null
+++ b/mysql-test/suite/innodb/t/xa_prepare_lock_release.test
@@ -0,0 +1,75 @@
+--echo #
+--echo # Bug#27189701 INNODB: EARLY RELEASE OF GAP LOCKS FOR RC
+--echo # ISOLATION [XA PREPARE]
+--echo #
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/count_sessions.inc
+
+CREATE TABLE t1 (col1 INT PRIMARY KEY, col2 int);
+
+--echo Connection: default
+SET DEBUG='+d,ib_force_release_gap_lock_prepare';
+
+--echo # 1.Test GAP lock only on supremum record
+XA START 'lock_trx';
+SELECT * FROM t1;
+
+--echo # Update empty table acquire GAP lock on supremum
+UPDATE t1 SET col2 = 100 where col1 = 10;
+
+connect (con1,localhost,root);
+--echo Connection: con1
+--send INSERT INTO t1 values(10, 100)
+
+connection default;
+--echo Connection: default
+XA END 'lock_trx';
+XA PREPARE 'lock_trx';
+
+connection con1;
+--echo Connection: con1
+--reap
+INSERT INTO t1 values(20, 200);
+SELECT * FROM t1 ORDER BY col1;
+
+connection default;
+--echo Connection: default
+XA COMMIT 'lock_trx';
+
+--echo # 2.Test GAP lock on multiple records
+XA START 'lock_trx_1';
+
+--echo # Update table acquire GAP lock on all rows
+UPDATE t1 SET col2 = col2 + 1;
+
+connection con1;
+--echo Connection: con1
+--send INSERT INTO t1 values(5, 50)
+
+connection default;
+--echo Connection: default
+XA END 'lock_trx_1';
+XA PREPARE 'lock_trx_1';
+
+connection con1;
+--echo Connection: con1
+--reap
+INSERT INTO t1 values(15, 150);
+INSERT INTO t1 values(25, 150);
+
+SELECT * FROM t1 ORDER BY col1;
+
+disconnect con1;
+
+connection default;
+--echo Connection: default
+XA COMMIT 'lock_trx_1';
+SELECT * FROM t1 ORDER BY col1;
+
+SET DEBUG='-d,ib_force_release_gap_lock_prepare';
+
+DROP TABLE t1;
+
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb_fts/include/ngram.inc b/mysql-test/suite/innodb_fts/include/ngram.inc
index f275e2905777..a644a6ce1346 100644
--- a/mysql-test/suite/innodb_fts/include/ngram.inc
+++ b/mysql-test/suite/innodb_fts/include/ngram.inc
@@ -66,7 +66,7 @@ SELECT * FROM articles_1 WHERE
 SELECT * FROM articles_1 WHERE
 	MATCH(title_varchar) AGAINST('nd');
 SELECT * FROM articles_1 WHERE
-	MATCH(title_varchar) AGAINST('0,');
+	MATCH(title_varchar) AGAINST('50');
 SELECT * FROM articles_1 WHERE
 	MATCH(title_text) AGAINST('se');
 SELECT * FROM articles_1 WHERE
@@ -201,7 +201,7 @@ SHOW CREATE TABLE articles;
 
 # natural language search
 SELECT * FROM articles WHERE
-	MATCH(c1) AGAINST('啊! ');
+	MATCH(c1) AGAINST('救命');
 SELECT * FROM articles WHERE
 	MATCH(c2) AGAINST('我幾');
 
@@ -258,7 +258,7 @@ SELECT * FROM articles WHERE
         MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 
 SELECT * FROM articles WHERE
-        MATCH(k2) AGAINST('-Ch +요*');
+        MATCH(k2) AGAINST('-Ch +해요');
 
 SELECT * FROM articles WHERE
         MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
@@ -266,7 +266,7 @@ SELECT * FROM articles WHERE
 
 # Query expansion mode
 SELECT * FROM articles WHERE
-        MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+        MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 SELECT * FROM articles WHERE
         MATCH(j2) AGAINST('やっそう' WITH QUERY EXPANSION);
 SELECT * FROM articles WHERE
@@ -299,7 +299,7 @@ SELECT COUNT(*) FROM articles t1,articles t2
         WHERE MATCH(t2.j1,t2.j3) AGAINST("右さ +の長" IN BOOLEAN MODE)
         AND t1.seq = t2.seq ;
 SELECT COUNT(*) FROM articles t1,articles t2
-        WHERE MATCH(t1.c1) AGAINST("啊! ")
+        WHERE MATCH(t1.c1) AGAINST("命啊")
         AND t1.seq != t2.seq
         AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 SELECT COUNT(*) FROM articles t1,articles t2
@@ -331,7 +331,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -389,7 +389,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
    ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -415,7 +415,7 @@ ANALYZE TABLE 名字;
 -- enable_result_log
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -446,7 +446,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
    ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -507,7 +507,7 @@ ANALYZE TABLE 名字;
 -- enable_result_log
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -561,7 +561,7 @@ ANALYZE TABLE 名字;
 -- enable_result_log
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 SELECT * FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST('やっ');
 SELECT * FROM 名字 WHERE
@@ -608,10 +608,10 @@ ANALYZE TABLE 名字;
 -- enable_result_log
 
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-        MATCH(c1) AGAINST('啊! ');
+        MATCH(c1) AGAINST('命啊');
 DELETE FROM 名字 WHERE
         MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
diff --git a/mysql-test/suite/innodb_fts/r/basic.result b/mysql-test/suite/innodb_fts/r/basic.result
index 435ef2c8e6ab..ae23b93dc847 100644
--- a/mysql-test/suite/innodb_fts/r/basic.result
+++ b/mysql-test/suite/innodb_fts/r/basic.result
@@ -274,14 +274,20 @@ drop table t1;
 create table t1 (f1 int not null primary key, f2 varchar(100),
 FTS_DOC_ID bigint(20) unsigned not null auto_increment,
 unique key `FTS_DOC_ID_INDEX` (`FTS_DOC_ID`),
-fulltext key (f2))engine=innodb, auto_increment=100000;
+fulltext key (f2))engine=innodb;
 set auto_increment_increment = 65535;
 insert into t1(f1, f2) values(1, "This is the first record");
 insert into t1(f1, f2) values(2, "This is the second record");
 insert into t1(f1, f2) values(3, "This is the third record");
 select FTS_DOC_ID from t1;
 FTS_DOC_ID
+1
+65536
 131071
-196606
-262141
 drop table t1;
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Doc ID 20030101000000 is too big. Its difference with largest used Doc ID 0 cannot exceed or equal to 65535");
+CREATE TABLE t1 (FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+title VARCHAR(200), FULLTEXT(title)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (NULL, NULL), (20030101000000, 20030102000000);
+ERROR HY000: Invalid InnoDB FTS Doc ID
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/r/bug_32831765.result b/mysql-test/suite/innodb_fts/r/bug_32831765.result
new file mode 100644
index 000000000000..6918888f337b
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/r/bug_32831765.result
@@ -0,0 +1,111 @@
+#
+# Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
+# INNODB TABLES WITH FTS INDEXES
+#
+create table t1 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t2 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t3 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+create table t4 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+#create procedure to inset into the table.
+CREATE  PROCEDURE `proc_insert`(IN tab_name VARCHAR(40))
+BEGIN
+DECLARE i INT DEFAULT 1;
+SET @insert_tbl =CONCAT('INSERT INTO ', tab_name, '( `col01`, `col02`,
+	`col03`, `col04`, `col05`, `col06`, `col07`, `col08`, `col09`, `col10`,
+	`col11`, `col12`, `col13`, `col14`, `col15`, `col16`, `col17`, `col18`,
+	`col19`, `col20`, `col21`, `col22`, `col23`, `col24`, `col25`, `col26`,
+	`col27`, `col28`, `col29`, `col30`)
+	VALUES ( MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()))');
+PREPARE ins_stmt FROM @insert_tbl;
+while (i <= 2000) DO
+EXECUTE ins_stmt;
+SET i = i + 1;
+END WHILE;
+DEALLOCATE PREPARE ins_stmt;
+END |
+call proc_insert('t1');;
+call proc_insert('t1');;
+call proc_insert('t2');;
+call proc_insert('t2');;
+call proc_insert('t3');;
+call proc_insert('t3');;
+call proc_insert('t4');;
+call proc_insert('t4');;
+SET GLOBAL DEBUG="+d,fts_optimize_wq_count_check";
+SET GLOBAL DEBUG="-d,fts_optimize_wq_count_check";
+# clean up
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP PROCEDURE proc_insert;
diff --git a/mysql-test/suite/innodb_fts/r/fulltext_table_evict.result b/mysql-test/suite/innodb_fts/r/fulltext_table_evict.result
new file mode 100644
index 000000000000..410bf2a34e15
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/r/fulltext_table_evict.result
@@ -0,0 +1,19 @@
+#
+# Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
+# [FATAL] INNODB: SEMAPHORE WAIT HAS LASTED > 600
+#
+CREATE TABLE t1 (
+id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+f1 TEXT(500),
+FULLTEXT idx (f1)
+) ENGINE=InnoDB;
+insert into t1 (f1) values ('fjdhfsjhf'),('dhjfhjshfj'),('dhjafjhfj');
+# restart
+set @save_table_definition_cache=@@global.table_definition_cache;
+set @save_table_open_cache=@@global.table_open_cache;
+set global table_definition_cache=400;
+set global table_open_cache= 1024;
+SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
+set @@global.table_definition_cache=@save_table_definition_cache;
+set @@global.table_open_cache=@save_table_open_cache;
+drop table t1;
diff --git a/mysql-test/suite/innodb_fts/r/limit_union.result b/mysql-test/suite/innodb_fts/r/limit_union.result
index 8fd5cfc72c87..623bda32d13d 100644
--- a/mysql-test/suite/innodb_fts/r/limit_union.result
+++ b/mysql-test/suite/innodb_fts/r/limit_union.result
@@ -156,3 +156,24 @@ SET DEBUG = '-d,fts_union_limit_off';
 DROP TABLE articles;
 Warnings:
 Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
+#
+# Bug #31228694 FTS QUERY WITH LIMIT CRASH
+#
+# restart: --ngram_token_size=1
+select @@ngram_token_size;
+@@ngram_token_size
+1
+CREATE TABLE t1 (
+id INT(10) unsigned NOT NULL AUTO_INCREMENT,
+name VARCHAR(45) NOT NULL,
+PRIMARY KEY (id) USING BTREE,
+FULLTEXT KEY search_name (name)  WITH PARSER ngram
+) ENGINE=InnoDB;
+INSERT INTO t1(name) VALUES('x'), ('mx'), ('mx'), ('mx'), ('mx');
+SELECT * FROM t1 WHERE MATCH (`name`) AGAINST ('mx*' IN BOOLEAN MODE) LIMIT 3;
+id	name
+2	mx
+3	mx
+4	mx
+DROP TABLE t1;
+# restart: 
diff --git a/mysql-test/suite/innodb_fts/r/ngram_1.result b/mysql-test/suite/innodb_fts/r/ngram_1.result
index 308eaa26a457..1c746af543f8 100644
--- a/mysql-test/suite/innodb_fts/r/ngram_1.result
+++ b/mysql-test/suite/innodb_fts/r/ngram_1.result
@@ -85,7 +85,7 @@ seq	title_char	title_varchar	title_text
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
-MATCH(title_varchar) AGAINST('0,');
+MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -454,7 +454,7 @@ articles	CREATE TABLE `articles` (
   FULLTEXT KEY `con9` (`e1`) /*!50100 WITH PARSER `ngram` */ 
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('救命');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -528,14 +528,14 @@ SELECT * FROM articles WHERE
 MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(k2) AGAINST('-Ch +요*');
+MATCH(k2) AGAINST('-Ch +해요');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 2	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row row1 value
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -578,7 +578,7 @@ AND t1.seq = t2.seq ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM articles t1,articles t2
-WHERE MATCH(t1.c1) AGAINST("啊! ")
+WHERE MATCH(t1.c1) AGAINST("命啊")
 AND t1.seq != t2.seq
 AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 COUNT(*)
@@ -613,7 +613,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -846,7 +846,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -878,7 +878,7 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -925,7 +925,7 @@ SAVEPOINT B;
 INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -1003,7 +1003,7 @@ ROLLBACK;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -1121,7 +1121,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -1193,13 +1193,14 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
@@ -1208,12 +1209,12 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 SELECT * FROM 名字;
@@ -1306,7 +1307,7 @@ seq	title_char	title_varchar	title_text
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
-MATCH(title_varchar) AGAINST('0,');
+MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -1675,7 +1676,7 @@ articles	CREATE TABLE `articles` (
   FULLTEXT KEY `con9` (`e1`) /*!50100 WITH PARSER `ngram` */ 
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('救命');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -1749,14 +1750,14 @@ SELECT * FROM articles WHERE
 MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(k2) AGAINST('-Ch +요*');
+MATCH(k2) AGAINST('-Ch +해요');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 2	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row row1 value
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -1799,7 +1800,7 @@ AND t1.seq = t2.seq ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM articles t1,articles t2
-WHERE MATCH(t1.c1) AGAINST("啊! ")
+WHERE MATCH(t1.c1) AGAINST("命啊")
 AND t1.seq != t2.seq
 AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 COUNT(*)
@@ -1834,7 +1835,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -2067,7 +2068,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -2099,7 +2100,7 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -2146,7 +2147,7 @@ SAVEPOINT B;
 INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -2224,7 +2225,7 @@ ROLLBACK;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -2342,7 +2343,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -2414,13 +2415,14 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
@@ -2429,12 +2431,12 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 SELECT * FROM 名字;
@@ -2527,7 +2529,7 @@ seq	title_char	title_varchar	title_text
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
-MATCH(title_varchar) AGAINST('0,');
+MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -2896,7 +2898,7 @@ articles	CREATE TABLE `articles` (
   FULLTEXT KEY `con9` (`e1`) /*!50100 WITH PARSER `ngram` */ 
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('救命');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -2970,14 +2972,14 @@ SELECT * FROM articles WHERE
 MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(k2) AGAINST('-Ch +요*');
+MATCH(k2) AGAINST('-Ch +해요');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 2	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row row1 value
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -3020,7 +3022,7 @@ AND t1.seq = t2.seq ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM articles t1,articles t2
-WHERE MATCH(t1.c1) AGAINST("啊! ")
+WHERE MATCH(t1.c1) AGAINST("命啊")
 AND t1.seq != t2.seq
 AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 COUNT(*)
@@ -3055,7 +3057,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -3288,7 +3290,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -3320,7 +3322,7 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -3367,7 +3369,7 @@ SAVEPOINT B;
 INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -3445,7 +3447,7 @@ ROLLBACK;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -3563,7 +3565,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -3635,13 +3637,14 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
@@ -3650,12 +3653,12 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 SELECT * FROM 名字;
@@ -3748,7 +3751,7 @@ seq	title_char	title_varchar	title_text
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
-MATCH(title_varchar) AGAINST('0,');
+MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -4117,7 +4120,7 @@ articles	CREATE TABLE `articles` (
   FULLTEXT KEY `con9` (`e1`) /*!50100 WITH PARSER `ngram` */ 
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('救命');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -4191,14 +4194,14 @@ SELECT * FROM articles WHERE
 MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(k2) AGAINST('-Ch +요*');
+MATCH(k2) AGAINST('-Ch +해요');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 2	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row row1 value
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -4241,7 +4244,7 @@ AND t1.seq = t2.seq ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM articles t1,articles t2
-WHERE MATCH(t1.c1) AGAINST("啊! ")
+WHERE MATCH(t1.c1) AGAINST("命啊")
 AND t1.seq != t2.seq
 AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 COUNT(*)
@@ -4276,7 +4279,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -4509,7 +4512,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -4541,7 +4544,7 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -4588,7 +4591,7 @@ SAVEPOINT B;
 INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -4666,7 +4669,7 @@ ROLLBACK;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -4784,7 +4787,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -4856,13 +4859,14 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
@@ -4871,12 +4875,12 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 SELECT * FROM 名字;
@@ -4969,7 +4973,7 @@ seq	title_char	title_varchar	title_text
 3	English arose in the Anglo-Saxon kingdoms	its from of England and what is now southeast Scotland	Following the extensive influence of Great Britain and the United Kingdom
 1	English is a West Germanic language	It was first spoken in early medieval England	most widely used language in the world
 SELECT * FROM articles_1 WHERE
-MATCH(title_varchar) AGAINST('0,');
+MATCH(title_varchar) AGAINST('50');
 seq	title_char	title_varchar	title_text
 7	spread across states by  United Kingdom ~ England army	The Oxford English Dictionary liSts over 250,000 distinct words+	it became the dominant language in the United States, Canada, Australia and New Zealand
 SELECT * FROM articles_1 WHERE
@@ -5338,7 +5342,7 @@ articles	CREATE TABLE `articles` (
   FULLTEXT KEY `con9` (`e1`) /*!50100 WITH PARSER `ngram` */ 
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('救命');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -5412,14 +5416,14 @@ SELECT * FROM articles WHERE
 MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(k2) AGAINST('-Ch +요*');
+MATCH(k2) AGAINST('-Ch +해요');
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 2	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row row1 value
 SELECT * FROM articles WHERE
 MATCH(e1) AGAINST("row1 -row" IN BOOLEAN MODE) ;
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 SELECT * FROM articles WHERE
-MATCH(c1) AGAINST('啊! ' WITH QUERY EXPANSION);
+MATCH(c1) AGAINST('命啊' WITH QUERY EXPANSION);
 seq	c1	c2	c3	j1	j2	j3	k1	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM articles WHERE
@@ -5462,7 +5466,7 @@ AND t1.seq = t2.seq ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM articles t1,articles t2
-WHERE MATCH(t1.c1) AGAINST("啊! ")
+WHERE MATCH(t1.c1) AGAINST("命啊")
 AND t1.seq != t2.seq
 AND MATCH(t2.k2) AGAINST("국말" IN BOOLEAN MODE) ;
 COUNT(*)
@@ -5497,7 +5501,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 3	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -5730,7 +5734,7 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -5762,7 +5766,7 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -5809,7 +5813,7 @@ SAVEPOINT B;
 INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -5887,7 +5891,7 @@ ROLLBACK;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST('やっ');
@@ -6005,7 +6009,7 @@ ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
 COMMIT;
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
@@ -6077,13 +6081,14 @@ INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
 ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
 ANALYZE TABLE 名字;
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
 SELECT * FROM 名字 WHERE
-MATCH(c1) AGAINST('啊! ');
+MATCH(c1) AGAINST('命啊');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
 SELECT * FROM 名字 WHERE
@@ -6092,15 +6097,36 @@ seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 SELECT * FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 0	你好嗎?	我幾好，你呢	好耐冇見	左右	左右される	☆右折⇔左折	제 이름은 Charles입니다.	운동을 좋아해요*	row value
-0	你好嗎?	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
+0	救命啊!	火啊! 你好	生日快樂	雨季	雨が降りそう つやってみよう	雨雲	저분은 영어를 잘 합니다	저는 서울에서 살고 있습니다.	recording test
 DELETE FROM 名字 WHERE
 MATCH (행운을빈다) AGAINST('니다');
 SELECT * FROM 名字;
 seq	c1	c2	c3	さようなら	j2	j3	행운을빈다	k2	e1
 DROP TABLE 名字;
 SET GLOBAL innodb_file_per_table = 1;
+SET GLOBAL innodb_ft_enable_stopword=OFF;
+SET innodb_ft_enable_stopword=OFF;
+CREATE TABLE ft_test3(
+id INT NOT NULL,
+contents TEXT,
+PRIMARY KEY(id),
+FULLTEXT INDEX fx_contents(contents) WITH PARSER NGRAM
+) ENGINE=INNODB;
+SET GLOBAL innodb_ft_aux_table='test/ft_test3';
+INSERT INTO ft_test3 VALUES (1, 'xy,yz');
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE ORDER BY position;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+xy	2	2	1	2	0
+yz	2	2	1	2	3
+SELECT * FROM ft_test3 WHERE MATCH(contents) AGAINST('y,' IN BOOLEAN MODE);
+id	contents
+SELECT * FROM ft_test3 WHERE MATCH(contents) AGAINST('y,' IN NATURAl LANGUAGE MODE);
+id	contents
+SET GLOBAL innodb_ft_enable_stopword = ON;
+SET GLOBAL innodb_ft_aux_table = @old_innodb_ft_aux_table;
+DROP TABLE ft_test3;
diff --git a/mysql-test/suite/innodb_fts/r/opt.result b/mysql-test/suite/innodb_fts/r/opt.result
index 1ed2b6d174aa..c6f543b67c13 100644
--- a/mysql-test/suite/innodb_fts/r/opt.result
+++ b/mysql-test/suite/innodb_fts/r/opt.result
@@ -1543,6 +1543,8 @@ DROP TABLE t1;
 CREATE TABLE t1 (f1 CHAR(1), FULLTEXT KEY (f1));
 SELECT 1 FROM t1 NATURAL JOIN t1 a GROUP BY MATCH(t1.f1) AGAINST ("1") DESC;
 1
+Warnings:
+Warning	1287	'GROUP BY with ASC/DESC' is deprecated and will be removed in a future release. Please use GROUP BY ... ORDER BY ... ASC/DESC instead
 DROP TABLE t1;
 #
 # Bug#20261601 ASSERTION FAILED: !FIRST_QEP_TAB->TABLE()->NO_KEYREAD
diff --git a/mysql-test/suite/innodb_fts/r/phrase_clear_no_match.result b/mysql-test/suite/innodb_fts/r/phrase_clear_no_match.result
new file mode 100644
index 000000000000..7ce86606717d
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/r/phrase_clear_no_match.result
@@ -0,0 +1,87 @@
+#
+# Bug #30933728 INNODB FTS PHRASE SEARCH CRASH
+#
+# Case 1 : test phrase search with ngram.
+# restart: --ngram_token_size=1
+select @@ngram_token_size;
+@@ngram_token_size
+1
+select @@innodb_ft_enable_stopword;
+@@innodb_ft_enable_stopword
+1
+create table t1(
+FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+content varchar(100) COLLATE utf8_danish_ci
+)DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+create fulltext index fts_index on t1(content) with parser ngram;
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+3	Maria
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+4	Marib
+drop table t1;
+# Case 2: test with ngram without stopword
+# restart: --ngram_token_size=1 --innodb_ft_enable_stopword=off
+select @@ngram_token_size;
+@@ngram_token_size
+1
+select @@innodb_ft_enable_stopword;
+@@innodb_ft_enable_stopword
+0
+create table t1(
+FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+content varchar(100) COLLATE utf8_danish_ci
+) DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+create fulltext index fts_index on t1(content) with parser ngram;
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+3	Maria
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+4	Marib
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+3	Maria
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+4	Marib
+drop table t1;
+# Case 3: test phrase search without ngram.
+create table t1(
+FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+content varchar(100) COLLATE utf8_danish_ci
+) DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+create fulltext index fts_index on t1(content);
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+3	Maria
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+4	Marib
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+1	Mar�a
+3	Maria
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+FTS_DOC_ID	content
+2	Mar�b
+4	Marib
+drop table t1;
diff --git a/mysql-test/suite/innodb_fts/r/sync.result b/mysql-test/suite/innodb_fts/r/sync.result
index 4180980a621e..2a34b9f7fef4 100644
--- a/mysql-test/suite/innodb_fts/r/sync.result
+++ b/mysql-test/suite/innodb_fts/r/sync.result
@@ -13,15 +13,16 @@ SET DEBUG_SYNC= 'now WAIT_FOR written';
 SET GLOBAL innodb_ft_aux_table="test/t1";
 SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
 WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 database	2	3	2	2	0
 database	2	3	2	3	6
 mysql	1	3	2	1	0
 mysql	1	3	2	3	0
-SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
-WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
 SET GLOBAL innodb_ft_aux_table=default;
 SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
 FTS_DOC_ID	title
+3	mysql database
 1	mysql
 2	database
 SET DEBUG_SYNC= 'now SIGNAL selected';
@@ -132,3 +133,32 @@ id	title
 2	database
 3	good
 DROP TABLE t1;
+#
+# Bug #31310404 I_S_FTS_INDEX_CACHE_FILL_ONE_INDEX() IS NOT PROTECTED BY THE  +LOCK
+#
+CREATE TABLE t1 (
+FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+title VARCHAR(200),
+FULLTEXT(title)
+) ENGINE = InnoDB;
+INSERT INTO t1(title) VALUES('mysql');
+INSERT INTO t1(title) VALUES('database');
+SET SESSION debug="+d,fts_instrument_sync_request";
+INSERT INTO t1(title) VALUES('mysql database');
+SET SESSION debug="-d,fts_instrument_sync_request";
+SET GLOBAL innodb_ft_aux_table="test/t1";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+WORD	FIRST_DOC_ID	LAST_DOC_ID	DOC_COUNT	DOC_ID	POSITION
+database	2	3	2	2	0
+database	2	3	2	3	6
+mysql	1	3	2	1	0
+mysql	1	3	2	3	0
+SET GLOBAL innodb_ft_aux_table=default;
+SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
+FTS_DOC_ID	title
+3	mysql database
+1	mysql
+2	database
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/r/sync_ddl.result b/mysql-test/suite/innodb_fts/r/sync_ddl.result
new file mode 100644
index 000000000000..23b962c15b07
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/r/sync_ddl.result
@@ -0,0 +1,116 @@
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_sync_before_syncing,ib_trunc_sleep_before_fts_cache_clear";
+INSERT INTO t1 (value) VALUES
+('By default or with the IN NATURAL LANGUAGE MODE modifier')
+;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_sync_before_syncing,ib_trunc_sleep_before_fts_cache_clear";
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_write_words_before_select_index,ib_trunc_sleep_before_fts_cache_clear";
+INSERT INTO t1 (value) VALUES
+('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+('performs a natural language search for a string'),
+('collection is a set of one or more columns included'),
+('returns a relevance value; that is, a similarity measure'),
+('and the text in that row in the columns named in'),
+('By default, the search is performed in case-insensitive'),
+('sensitive full-text search, use a binary collation '),
+('example, a column that uses the latin1 character'),
+('collation of latin1_bin to make it case sensitive')
+;
+TRUNCATE TABLE t1;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_write_words_before_select_index,ib_trunc_sleep_before_fts_cache_clear";
+CREATE TABLE t1 (
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+INSERT INTO t1 (value) VALUES
+('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+('performs a natural language search for a string'),
+('collection is a set of one or more columns included'),
+('returns a relevance value; that is, a similarity measure'),
+('and the text in that row in the columns named in'),
+('By default, the search is performed in case-insensitive'),
+('sensitive full-text search, use a binary collation '),
+('example, a column that uses the latin1 character'),
+('collation of latin1_bin to make it case sensitive')
+;
+DROP INDEX idx1 ON t1;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+CREATE TABLE t1 (
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+INSERT INTO t1 (value) VALUES
+('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+('performs a natural language search for a string'),
+('collection is a set of one or more columns included'),
+('returns a relevance value; that is, a similarity measure'),
+('and the text in that row in the columns named in'),
+('By default, the search is performed in case-insensitive'),
+('sensitive full-text search, use a binary collation '),
+('example, a column that uses the latin1 character'),
+('collation of latin1_bin to make it case sensitive')
+;
+ALTER TABLE t1
+DROP INDEX idx1,
+ALGORITHM=INPLACE;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+CREATE TABLE t1 (
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+INSERT INTO t1 (value) VALUES
+('example, a column that uses the latin1 character'),
+('collation of latin1_bin to make it case sensitive')
+;
+ALTER TABLE t1
+DROP INDEX idx1,
+ALGORITHM=COPY;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+CREATE TABLE t1 (
+id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+value VARCHAR(1024)
+) ENGINE=InnoDB;
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+Warnings:
+Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+INSERT INTO t1 (value) VALUES
+('example, a column that uses the latin1 character'),
+('collation of latin1_bin to make it case sensitive')
+;
+ALTER TABLE t1
+DROP COLUMN id1,
+ADD COLUMN id2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+DROP INDEX idx1,
+ADD FULLTEXT INDEX idx2(value),
+ALGORITHM=INPLACE;
+DROP TABLE t1;
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
diff --git a/mysql-test/suite/innodb_fts/t/basic.test b/mysql-test/suite/innodb_fts/t/basic.test
index af1e089098d8..58f36be08a52 100644
--- a/mysql-test/suite/innodb_fts/t/basic.test
+++ b/mysql-test/suite/innodb_fts/t/basic.test
@@ -240,7 +240,7 @@ drop table t1;
 create table t1 (f1 int not null primary key, f2 varchar(100),
 		 FTS_DOC_ID bigint(20) unsigned not null auto_increment,
 		 unique key `FTS_DOC_ID_INDEX` (`FTS_DOC_ID`),
-		 fulltext key (f2))engine=innodb, auto_increment=100000;
+		 fulltext key (f2))engine=innodb;
 
 set auto_increment_increment = 65535;
 insert into t1(f1, f2) values(1, "This is the first record");
@@ -248,3 +248,10 @@ insert into t1(f1, f2) values(2, "This is the second record");
 insert into t1(f1, f2) values(3, "This is the third record");
 select FTS_DOC_ID from t1;
 drop table t1;
+
+call mtr.add_suppression("\\[ERROR\\] InnoDB: Doc ID 20030101000000 is too big. Its difference with largest used Doc ID 0 cannot exceed or equal to 65535");
+CREATE TABLE t1 (FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+		 title VARCHAR(200), FULLTEXT(title)) ENGINE=InnoDB;
+--error 182
+INSERT INTO t1 VALUES (NULL, NULL), (20030101000000, 20030102000000);
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/t/bug_32831765.test b/mysql-test/suite/innodb_fts/t/bug_32831765.test
new file mode 100644
index 000000000000..76b593e55af8
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/t/bug_32831765.test
@@ -0,0 +1,196 @@
+--echo #
+--echo # Bug#32831765 SERVER HITS OOM CONDITION WHEN LOADING TWO
+--echo # INNODB TABLES WITH FTS INDEXES
+--echo #
+
+--source include/have_debug.inc
+
+create table t1 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+create table t2 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+
+create table t3 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+create table t4 ( `id` int unsigned NOT NULL AUTO_INCREMENT, `col01` text,
+`col02` text, `col03` text, `col04` text, `col05` text, `col06` text, `col07`
+text, `col08` text, `col09` text, `col10` text, `col11` text, `col12` text,
+`col13` text, `col14` text, `col15` text, `col16` text, `col17` text, `col18`
+text, `col19` text, `col20` text, `col21` text, `col22` text, `col23` text,
+`col24` text, `col25` text, `col26` text, `col27` text, `col28` text, `col29`
+text, `col30` text, PRIMARY KEY (`id`), FULLTEXT KEY (`col01`), FULLTEXT KEY
+(`col02`), FULLTEXT KEY (`col03`), FULLTEXT KEY (`col04`), FULLTEXT KEY
+(`col05`), FULLTEXT KEY (`col06`), FULLTEXT KEY (`col07`), FULLTEXT KEY
+(`col08`), FULLTEXT KEY (`col09`), FULLTEXT KEY (`col10`), FULLTEXT KEY
+(`col11`), FULLTEXT KEY (`col12`), FULLTEXT KEY (`col13`), FULLTEXT KEY
+(`col14`), FULLTEXT KEY (`col15`), FULLTEXT KEY (`col16`), FULLTEXT KEY
+(`col17`), FULLTEXT KEY (`col18`), FULLTEXT KEY (`col19`), FULLTEXT KEY
+(`col20`), FULLTEXT KEY (`col21`), FULLTEXT KEY (`col22`), FULLTEXT KEY
+(`col23`), FULLTEXT KEY (`col24`), FULLTEXT KEY (`col25`), FULLTEXT KEY
+(`col26`), FULLTEXT KEY (`col27`), FULLTEXT KEY (`col28`), FULLTEXT KEY
+(`col29`), FULLTEXT KEY (`col30`)) engine=innodb;
+
+delimiter |;
+
+--echo #create procedure to inset into the table.
+CREATE  PROCEDURE `proc_insert`(IN tab_name VARCHAR(40))
+BEGIN
+	DECLARE i INT DEFAULT 1;
+	SET @insert_tbl =CONCAT('INSERT INTO ', tab_name, '( `col01`, `col02`,
+	`col03`, `col04`, `col05`, `col06`, `col07`, `col08`, `col09`, `col10`,
+	`col11`, `col12`, `col13`, `col14`, `col15`, `col16`, `col17`, `col18`,
+	`col19`, `col20`, `col21`, `col22`, `col23`, `col24`, `col25`, `col26`,
+	`col27`, `col28`, `col29`, `col30`)
+	VALUES ( MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()), MD5(RAND()),
+	MD5(RAND()))');
+	PREPARE ins_stmt FROM @insert_tbl;
+	while (i <= 2000) DO
+		EXECUTE ins_stmt;
+		SET i = i + 1;
+	END WHILE;
+	DEALLOCATE PREPARE ins_stmt;
+END |
+
+delimiter ;|
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+connect (con3,localhost,root,,);
+connect (con4,localhost,root,,);
+connect (con5,localhost,root,,);
+connect (con6,localhost,root,,);
+connect (con7,localhost,root,,);
+connect (con8,localhost,root,,);
+
+connection con1;
+--send call proc_insert('t1');
+
+connection con2;
+--send call proc_insert('t1');
+
+connection con3;
+--send call proc_insert('t2');
+
+connection con4;
+--send call proc_insert('t2');
+
+connection con5;
+--send call proc_insert('t3');
+
+connection con6;
+--send call proc_insert('t3');
+
+connection con7;
+--send call proc_insert('t4');
+
+connection con8;
+--send call proc_insert('t4');
+
+connection default;
+
+# Check if number of SYNC requests are more than 1000.
+SET GLOBAL DEBUG="+d,fts_optimize_wq_count_check";
+
+# Wait for 1 minute to make sure INSERTs into FTS table will trigger
+# FTS_SYNC request
+let $loop=60;
+while($loop > 1)
+{
+  sleep 1;
+  dec $loop;
+}
+
+SET GLOBAL DEBUG="-d,fts_optimize_wq_count_check";
+
+connection con1;
+reap;
+disconnect con1;
+
+connection con2;
+reap;
+disconnect con2;
+
+connection con3;
+reap;
+disconnect con3;
+
+connection con4;
+reap;
+disconnect con4;
+
+connection con5;
+reap;
+disconnect con5;
+
+connection con6;
+reap;
+disconnect con6;
+
+connection con7;
+reap;
+disconnect con7;
+
+connection con8;
+reap;
+disconnect con8;
+
+connection default;
+--echo # clean up
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP PROCEDURE proc_insert;
diff --git a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
new file mode 100644
index 000000000000..245f00bc3367
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
@@ -0,0 +1,47 @@
+--echo #
+--echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
+--echo # [FATAL] INNODB: SEMAPHORE WAIT HAS LASTED > 600
+--echo #
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+CREATE TABLE t1 (
+       id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+       f1 TEXT(500),
+       FULLTEXT idx (f1)
+       ) ENGINE=InnoDB;
+insert into t1 (f1) values ('fjdhfsjhf'),('dhjfhjshfj'),('dhjafjhfj');
+
+--source include/restart_mysqld.inc
+
+set @save_table_definition_cache=@@global.table_definition_cache;
+set @save_table_open_cache=@@global.table_open_cache;
+
+set global table_definition_cache=400;
+set global table_open_cache= 1024;
+
+SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
+#Create 1000 tables, try the best to evict t1 .
+
+--disable_query_log
+let $loop=1000;
+while($loop)
+{
+  eval create table t_$loop(id int, name text(100), fulltext idxt_$loop(name) )engine=innodb;
+  dec $loop;
+}
+
+let $loop=1000;
+while($loop)
+{
+  eval drop table t_$loop;
+  dec $loop;
+}
+
+SET GLOBAL DEBUG="-d,crash_if_fts_table_is_evicted";
+--enable_query_log
+set @@global.table_definition_cache=@save_table_definition_cache;
+set @@global.table_open_cache=@save_table_open_cache;
+drop table t1;
+
diff --git a/mysql-test/suite/innodb_fts/t/limit_union.test b/mysql-test/suite/innodb_fts/t/limit_union.test
index 5f1a156ffd04..4f2d3f9f580c 100644
--- a/mysql-test/suite/innodb_fts/t/limit_union.test
+++ b/mysql-test/suite/innodb_fts/t/limit_union.test
@@ -141,3 +141,27 @@ DROP TABLE articles;
 --disable_query_log
 --eval SET GLOBAL query_cache_size = $default_cache_size
 --enable_query_log
+
+--echo #
+--echo # Bug #31228694 FTS QUERY WITH LIMIT CRASH
+--echo #
+
+let $restart_parameters = restart: --ngram_token_size=1;
+--source include/restart_mysqld.inc
+select @@ngram_token_size;
+
+CREATE TABLE t1 (
+  id INT(10) unsigned NOT NULL AUTO_INCREMENT,
+  name VARCHAR(45) NOT NULL,
+  PRIMARY KEY (id) USING BTREE,
+  FULLTEXT KEY search_name (name)  WITH PARSER ngram
+) ENGINE=InnoDB;
+
+INSERT INTO t1(name) VALUES('x'), ('mx'), ('mx'), ('mx'), ('mx');
+
+SELECT * FROM t1 WHERE MATCH (`name`) AGAINST ('mx*' IN BOOLEAN MODE) LIMIT 3;
+DROP TABLE t1;
+
+# restore config
+let $restart_parameters = restart: ;
+--source include/restart_mysqld.inc
diff --git a/mysql-test/suite/innodb_fts/t/ngram_1.test b/mysql-test/suite/innodb_fts/t/ngram_1.test
index a08a8bf6e0bb..eeae4b2128ac 100644
--- a/mysql-test/suite/innodb_fts/t/ngram_1.test
+++ b/mysql-test/suite/innodb_fts/t/ngram_1.test
@@ -36,3 +36,29 @@ LET $table_row_format =  ROW_FORMAT=COMPRESSED ;
 --source suite/innodb_fts/include/ngram.inc
 
 EVAL SET GLOBAL innodb_file_per_table = $per_table;
+
+#
+## Bug #25873310  FULLTEXT SEARCH CAN NOT FIND WORD WHICH CONTAINS "," OR "."
+#
+
+SET GLOBAL innodb_ft_enable_stopword=OFF;
+SET innodb_ft_enable_stopword=OFF;
+
+let @old_innodb_ft_aux_table = `select @@innodb_ft_aux_table`;
+CREATE TABLE ft_test3(
+       id INT NOT NULL,
+       contents TEXT,
+       PRIMARY KEY(id),
+       FULLTEXT INDEX fx_contents(contents) WITH PARSER NGRAM
+     ) ENGINE=INNODB;
+
+SET GLOBAL innodb_ft_aux_table='test/ft_test3';
+INSERT INTO ft_test3 VALUES (1, 'xy,yz');
+
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE ORDER BY position;
+SELECT * FROM ft_test3 WHERE MATCH(contents) AGAINST('y,' IN BOOLEAN MODE);
+SELECT * FROM ft_test3 WHERE MATCH(contents) AGAINST('y,' IN NATURAl LANGUAGE MODE);
+
+SET GLOBAL innodb_ft_enable_stopword = ON;
+SET GLOBAL innodb_ft_aux_table = @old_innodb_ft_aux_table;
+DROP TABLE ft_test3;
diff --git a/mysql-test/suite/innodb_fts/t/phrase_clear_no_match.test b/mysql-test/suite/innodb_fts/t/phrase_clear_no_match.test
new file mode 100644
index 000000000000..605dee38d809
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/t/phrase_clear_no_match.test
@@ -0,0 +1,71 @@
+--echo #
+--echo # Bug #30933728 INNODB FTS PHRASE SEARCH CRASH
+--echo #
+
+--source include/not_embedded.inc
+
+--echo # Case 1 : test phrase search with ngram.
+
+let $restart_parameters = restart: --ngram_token_size=1;
+--source include/restart_mysqld.inc
+
+select @@ngram_token_size;
+select @@innodb_ft_enable_stopword;
+
+create table t1(
+	FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+	content varchar(100) COLLATE utf8_danish_ci
+)DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+
+create fulltext index fts_index on t1(content) with parser ngram;
+
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+
+drop table t1;
+
+--echo # Case 2: test with ngram without stopword
+
+let $restart_parameters = restart: --ngram_token_size=1 --innodb_ft_enable_stopword=off;
+--source include/restart_mysqld.inc
+
+select @@ngram_token_size;
+select @@innodb_ft_enable_stopword;
+
+
+create table t1(
+	FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+	content varchar(100) COLLATE utf8_danish_ci
+) DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+
+create fulltext index fts_index on t1(content) with parser ngram;
+
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+
+drop table t1;
+
+--echo # Case 3: test phrase search without ngram.
+create table t1(
+	FTS_DOC_ID bigint unsigned auto_increment not null primary key,
+	content varchar(100) COLLATE utf8_danish_ci
+) DEFAULT CHARSET=utf8 COLLATE=utf8_danish_ci;
+
+create fulltext index fts_index on t1(content);
+
+insert into t1(content) values('Mar�a'), ('Mar�b'), ('Maria'), ('Marib');
+
+select * from t1 where match(content) against('+Mar�a' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Mar�b' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Maria' IN BOOLEAN MODE);
+select * from t1 where match(content) against('+Marib' IN BOOLEAN MODE);
+
+drop table t1;
diff --git a/mysql-test/suite/innodb_fts/t/sync.test b/mysql-test/suite/innodb_fts/t/sync.test
index c62cbcd11966..e445ae224b09 100644
--- a/mysql-test/suite/innodb_fts/t/sync.test
+++ b/mysql-test/suite/innodb_fts/t/sync.test
@@ -169,3 +169,31 @@ SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database good');
 DROP TABLE t1;
 
 --source include/wait_until_count_sessions.inc
+
+--echo #
+--echo # Bug #31310404 I_S_FTS_INDEX_CACHE_FILL_ONE_INDEX() IS NOT PROTECTED BY THE  +LOCK
+--echo #
+
+CREATE TABLE t1 (
+        FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
+        title VARCHAR(200),
+        FULLTEXT(title)
+) ENGINE = InnoDB;
+
+INSERT INTO t1(title) VALUES('mysql');
+INSERT INTO t1(title) VALUES('database');
+
+SET SESSION debug="+d,fts_instrument_sync_request";
+INSERT INTO t1(title) VALUES('mysql database');
+SET SESSION debug="-d,fts_instrument_sync_request";
+
+SET GLOBAL innodb_ft_aux_table="test/t1";
+
+# If FTS SYNC is in progress then wait for SYNC to finish.
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
+SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
+SET GLOBAL innodb_ft_aux_table=default;
+
+SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
+
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/t/sync_ddl.test b/mysql-test/suite/innodb_fts/t/sync_ddl.test
new file mode 100644
index 000000000000..3e35afc27b1d
--- /dev/null
+++ b/mysql-test/suite/innodb_fts/t/sync_ddl.test
@@ -0,0 +1,176 @@
+#
+# BUG#27082268 FTS synchronization issues
+#
+
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+#--------------------------------------
+# Check FTS_sync vs TRUNCATE (1)
+#--------------------------------------
+
+CREATE TABLE t1 (
+    id INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_sync_before_syncing,ib_trunc_sleep_before_fts_cache_clear";
+
+INSERT INTO t1 (value) VALUES
+    ('By default or with the IN NATURAL LANGUAGE MODE modifier')
+    ;
+
+TRUNCATE TABLE t1;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_sync_before_syncing,ib_trunc_sleep_before_fts_cache_clear";
+
+#--------------------------------------
+# Check FTS sync vs DROP INDEX (2)
+#--------------------------------------
+
+CREATE TABLE t1 (
+    id INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_write_words_before_select_index,ib_trunc_sleep_before_fts_cache_clear";
+
+INSERT INTO t1 (value) VALUES
+    ('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+    ('performs a natural language search for a string'),
+    ('collection is a set of one or more columns included'),
+    ('returns a relevance value; that is, a similarity measure'),
+    ('and the text in that row in the columns named in'),
+    ('By default, the search is performed in case-insensitive'),
+    ('sensitive full-text search, use a binary collation '),
+    ('example, a column that uses the latin1 character'),
+    ('collation of latin1_bin to make it case sensitive')
+    ;
+
+TRUNCATE TABLE t1;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_write_words_before_select_index,ib_trunc_sleep_before_fts_cache_clear";
+
+#--------------------------------------
+# Check FTS sync vs DROP INDEX
+#--------------------------------------
+
+CREATE TABLE t1 (
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+INSERT INTO t1 (value) VALUES
+    ('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+    ('performs a natural language search for a string'),
+    ('collection is a set of one or more columns included'),
+    ('returns a relevance value; that is, a similarity measure'),
+    ('and the text in that row in the columns named in'),
+    ('By default, the search is performed in case-insensitive'),
+    ('sensitive full-text search, use a binary collation '),
+    ('example, a column that uses the latin1 character'),
+    ('collation of latin1_bin to make it case sensitive')
+    ;
+
+DROP INDEX idx1 ON t1;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+#--------------------------------------
+# Check FTS sync vs ALTER TABLE DROP INDEX (INPLACE)
+#--------------------------------------
+
+CREATE TABLE t1 (
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+INSERT INTO t1 (value) VALUES
+    ('By default or with the IN NATURAL LANGUAGE MODE modifier'),
+    ('performs a natural language search for a string'),
+    ('collection is a set of one or more columns included'),
+    ('returns a relevance value; that is, a similarity measure'),
+    ('and the text in that row in the columns named in'),
+    ('By default, the search is performed in case-insensitive'),
+    ('sensitive full-text search, use a binary collation '),
+    ('example, a column that uses the latin1 character'),
+    ('collation of latin1_bin to make it case sensitive')
+    ;
+
+ALTER TABLE t1
+    DROP INDEX idx1,
+    ALGORITHM=INPLACE;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+#--------------------------------------
+# Check FTS sync vs ALTER TABLE DROP INDEX (COPY)
+#--------------------------------------
+
+CREATE TABLE t1 (
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+INSERT INTO t1 (value) VALUES
+    ('example, a column that uses the latin1 character'),
+    ('collation of latin1_bin to make it case sensitive')
+    ;
+
+ALTER TABLE t1
+    DROP INDEX idx1,
+    ALGORITHM=COPY;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+#--------------------------------------
+# Check FTS sync vs ALTER TABLE (INPLACE, new cluster)
+#--------------------------------------
+
+CREATE TABLE t1 (
+    id1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    value VARCHAR(1024)
+    ) ENGINE=InnoDB;
+
+CREATE FULLTEXT INDEX idx1 ON t1(value);
+
+SET GLOBAL debug="+d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
+
+INSERT INTO t1 (value) VALUES
+    ('example, a column that uses the latin1 character'),
+    ('collation of latin1_bin to make it case sensitive')
+    ;
+
+ALTER TABLE t1
+    DROP COLUMN id1,
+    ADD COLUMN id2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    DROP INDEX idx1,
+    ADD FULLTEXT INDEX idx2(value),
+    ALGORITHM=INPLACE;
+
+DROP TABLE t1;
+
+SET GLOBAL debug="-d,fts_instrument_sync_request,fts_instrument_msg_sync_sleep";
diff --git a/mysql-test/suite/innodb_gis/r/create_spatial_index.result b/mysql-test/suite/innodb_gis/r/create_spatial_index.result
index b02f61a313a5..a5bcdf39d137 100644
--- a/mysql-test/suite/innodb_gis/r/create_spatial_index.result
+++ b/mysql-test/suite/innodb_gis/r/create_spatial_index.result
@@ -1401,7 +1401,7 @@ CREATE SPATIAL INDEX idx2 ON t1(c1);
 DROP TABLE t1;
 CREATE TABLE mysql.innodb_table_stats (
 database_name varchar(64) COLLATE utf8_bin NOT NULL,
-table_name varchar(64) COLLATE utf8_bin NOT NULL,
+table_name varchar(199) COLLATE utf8_bin NOT NULL,
 last_update timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 n_rows bigint(20) unsigned NOT NULL,
 clustered_index_size bigint(20) unsigned NOT NULL,
diff --git a/mysql-test/suite/innodb_gis/r/precise.result b/mysql-test/suite/innodb_gis/r/precise.result
index cb3c06528fe0..2715458161bc 100644
--- a/mysql-test/suite/innodb_gis/r/precise.result
+++ b/mysql-test/suite/innodb_gis/r/precise.result
@@ -121,10 +121,10 @@ ST_DISTANCE(ST_geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), ST_geomfromtext('
 0.8944271909999159
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
 ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')))
-POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.855421686746986 29.819277108433734,21.951219512195124 27.4390243902439))
+POLYGON((21.951219512195124 27.4390243902439,26.470588235294116 23.823529411764707,29.28994082840237 26.36094674556213,23.85542168674699 29.819277108433734,21.951219512195124 27.4390243902439))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')))
-MULTIPOINT((21.951219512195124 27.4390243902439),(23.855421686746986 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
+MULTIPOINT((21.951219512195124 27.4390243902439),(23.85542168674699 29.819277108433734),(26.470588235294116 23.823529411764707),(29.28994082840237 26.36094674556213))
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')))
 POINT(29.28994082840237 26.36094674556213)
@@ -151,7 +151,7 @@ ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_Geom
 GEOMETRYCOLLECTION(POLYGON((0 0,50 45,40 50,0 0)),MULTILINESTRING((-10 -10,0 0),(46.666666666666664 46.666666666666664,200 200,199 201,45.333333333333336 47.333333333333336),(8 10,-11 -9)))
 select ST_astext(ST_buffer(ST_geometryfromtext('point(1 1)'), 1));
 ST_astext(ST_buffer(ST_geometryfromtext('point(1 1)'), 1))
-POLYGON((2 1,1.9808 1.1951,1.9239 1.3827,1.8315 1.5556,1.7071 1.7071,1.5556 1.8315,1.3827 1.9239,1.1951 1.9808,1 2,0.8049 1.9808,0.6173 1.9239,0.4444 1.8315,0.2929 1.7071,0.1685 1.5556,0.0761 1.3827,0.0192 1.1951,0 1,0.0192 0.8049,0.0761 0.6173,0.1685 0.4444,0.2929 0.2929,0.4444 0.1685,0.6173 0.0761,0.8049 0.0192,1 0,1.1951 0.0192,1.3827 0.0761,1.5556 0.1685,1.7071 0.2929,1.8315 0.4444,1.9239 0.6173,1.9808 0.8049,2 1))
+POLYGON((2 1,1.98078528040323 1.19509032201612,1.92387953251129 1.38268343236509,1.83146961230255 1.5555702330196,1.70710678118655 1.70710678118655,1.5555702330196 1.83146961230254,1.38268343236509 1.92387953251129,1.19509032201613 1.98078528040323,1 2,0.80490967798387 1.98078528040323,0.61731656763491 1.92387953251129,0.4444297669804 1.83146961230255,0.29289321881345 1.70710678118655,0.16853038769746 1.5555702330196,0.07612046748871 1.38268343236509,0.01921471959677 1.19509032201613,0 1,0.01921471959677 0.80490967798387,0.07612046748871 0.61731656763491,0.16853038769745 0.4444297669804,0.29289321881345 0.29289321881345,0.4444297669804 0.16853038769745,0.61731656763491 0.07612046748871,0.80490967798387 0.01921471959677,1 0,1.19509032201613 0.01921471959677,1.38268343236509 0.07612046748871,1.5555702330196 0.16853038769745,1.70710678118655 0.29289321881345,1.83146961230255 0.4444297669804,1.92387953251129 0.61731656763491,1.98078528040323 0.80490967798387,2 1))
 create table t1(geom geometrycollection)engine=innodb;
 insert into t1 values (ST_geomfromtext('POLYGON((0 0, 10 10, 0 8, 0 0))'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
diff --git a/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch_2.result b/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch_2.result
new file mode 100644
index 000000000000..b9345e572643
--- /dev/null
+++ b/mysql-test/suite/innodb_gis/r/rtree_concurrent_srch_2.result
@@ -0,0 +1,35 @@
+CREATE TABLE g (
+id INT PRIMARY KEY,
+p GEOMETRY NOT NULL,
+SPATIAL KEY p_idx(p)
+) ENGINE=InnoDB;
+create procedure populate_g(IN `rows` INT)
+begin
+declare i int default 1;
+while (i <= `rows`) DO
+insert into test.g (id, p) values (i, POINT(i, i));
+set i = i + 1;
+end while;
+end|
+call populate_g(650);
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+id
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+insert into g values(1103, POINT(100, 1));
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+id
+commit;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+insert into g values(1103, POINT(100, 1));
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+commit;
+DROP TABLE g;
+DROP PROCEDURE populate_g;
+set innodb_lock_wait_timeout = default;
diff --git a/mysql-test/suite/innodb_gis/r/rtree_split.result b/mysql-test/suite/innodb_gis/r/rtree_split.result
index 37ce67a9f2c4..514d3e98cd3f 100644
--- a/mysql-test/suite/innodb_gis/r/rtree_split.result
+++ b/mysql-test/suite/innodb_gis/r/rtree_split.result
@@ -84,3 +84,38 @@ count(*)
 57344
 # restart
 drop table t1;
+#
+# Bug #29465567 INNODB: RTREE SPLIT ASSERTION FAILURE
+#
+create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
+insert into t1 values(1, Point(1,1));
+insert into t1 values(2, Point(2,2));
+insert into t1 values(3, Point(3,3));
+insert into t1 values(4, Point(4,4));
+insert into t1 values(5, Point(5,5));
+insert into t1 values(6, Point(6,6));
+insert into t1 values(7, Point(7,7));
+insert into t1 values(8, Point(8,8));
+insert into t1 values(9, Point(9,9));
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+start transaction;
+insert into t1 select * from t1;
+rollback;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+SET SESSION debug="+d, rtr_page_need_first_split";
+insert into t1 select * from t1;
+SET SESSION debug="-d, rtr_page_need_first_split";
+drop table t1;
diff --git a/mysql-test/suite/innodb_gis/t/create_spatial_index.test b/mysql-test/suite/innodb_gis/t/create_spatial_index.test
index 986a7530a18d..410e35ebfaca 100644
--- a/mysql-test/suite/innodb_gis/t/create_spatial_index.test
+++ b/mysql-test/suite/innodb_gis/t/create_spatial_index.test
@@ -1165,7 +1165,7 @@ CREATE SPATIAL INDEX idx2 ON t1(c1);
 DROP TABLE t1;
 CREATE TABLE mysql.innodb_table_stats (
   database_name varchar(64) COLLATE utf8_bin NOT NULL,
-  table_name varchar(64) COLLATE utf8_bin NOT NULL,
+  table_name varchar(199) COLLATE utf8_bin NOT NULL,
   last_update timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   n_rows bigint(20) unsigned NOT NULL,
   clustered_index_size bigint(20) unsigned NOT NULL,
diff --git a/mysql-test/suite/innodb_gis/t/precise.test b/mysql-test/suite/innodb_gis/t/precise.test
index 9a86ed659d8b..e05b50992dbe 100644
--- a/mysql-test/suite/innodb_gis/t/precise.test
+++ b/mysql-test/suite/innodb_gis/t/precise.test
@@ -64,9 +64,7 @@ select ST_DISTANCE(ST_geomfromtext('linestring(0 0, 3 6, 6 3, 0 0)'), ST_geomfro
 
 
 # Operations tests
---replace_result 23.85542168674699 23.855421686746986
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
---replace_result 23.85542168674699 23.855421686746986
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POINT(20 20)')));
@@ -80,14 +78,13 @@ select ST_astext(ST_symdifference(ST_geomfromtext('polygon((0 0, 1 0, 0 1, 0 0))
 select ST_astext(ST_UNION(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('LINESTRING(-10 -10, 200 200, 199 201, -11 -9)')));
 
 # Buffer() tests
---replace_numeric_round 4
+--replace_numeric_round 14
 select ST_astext(ST_buffer(ST_geometryfromtext('point(1 1)'), 1));
 create table t1(geom geometrycollection)engine=innodb;
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 insert into t1 values (ST_geomfromtext('POLYGON((0 0, 10 10, 0 8, 0 0))'));
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 insert into t1 values (ST_geomfromtext('POLYGON((1 1, 10 10, 0 8, 1 1))'));
---replace_numeric_round 4
 select ST_astext(geom), ST_area(geom),ST_area(ST_buffer(geom,2)) from t1;
 select ST_NUMPOINTS(ST_EXTERIORRING(ST_buffer(geom,2))) from t1;
 
diff --git a/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch_2.test b/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch_2.test
new file mode 100644
index 000000000000..7f3f639474b5
--- /dev/null
+++ b/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch_2.test
@@ -0,0 +1,66 @@
+# This test case will test concurrent search on R-tree.
+# Not supported in embedded
+--source include/not_embedded.inc
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_innodb_16k.inc
+
+CREATE TABLE g (
+  id INT PRIMARY KEY,
+  p GEOMETRY NOT NULL,
+  SPATIAL KEY p_idx(p)
+) ENGINE=InnoDB;
+
+delimiter |;
+create procedure populate_g(IN `rows` INT)
+begin
+        declare i int default 1;
+        while (i <= `rows`) DO
+                insert into test.g (id, p) values (i, POINT(i, i));
+                set i = i + 1;
+        end while;
+end|
+delimiter ;|
+
+call populate_g(650);
+
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+
+connect (a,localhost,root,,);
+connection a;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+
+--error ER_LOCK_WAIT_TIMEOUT
+insert into g values(1103, POINT(100, 1));
+
+connect (b,localhost,root,,);
+connection b;
+start transaction;
+select id from g WHERE MBRContains(ST_GeomFromText('Polygon((100 0,100 5,105
+5,105 0,100 0))'),p) for update;
+
+connection default;
+commit;
+
+connection a;
+set innodb_lock_wait_timeout = 1;
+set transaction isolation level serializable;
+
+--error ER_LOCK_WAIT_TIMEOUT
+insert into g values(1103, POINT(100, 1));
+disconnect a;
+--source include/wait_until_disconnected.inc
+
+connection b;
+commit;
+disconnect b;
+--source include/wait_until_disconnected.inc
+
+connection default;
+DROP TABLE g;
+DROP PROCEDURE populate_g;
+set innodb_lock_wait_timeout = default;
diff --git a/mysql-test/suite/innodb_gis/t/rtree_split.test b/mysql-test/suite/innodb_gis/t/rtree_split.test
index e6925940fcd0..d294a9a18c36 100644
--- a/mysql-test/suite/innodb_gis/t/rtree_split.test
+++ b/mysql-test/suite/innodb_gis/t/rtree_split.test
@@ -100,3 +100,46 @@ let $restart_parameters = restart;
 
 # Clean up.
 drop table t1;
+
+--echo #
+--echo # Bug #29465567 INNODB: RTREE SPLIT ASSERTION FAILURE
+--echo #
+
+# Create table with R-tree index.
+create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
+
+# Insert enough values to let R-tree split.
+insert into t1 values(1, Point(1,1));
+insert into t1 values(2, Point(2,2));
+insert into t1 values(3, Point(3,3));
+insert into t1 values(4, Point(4,4));
+insert into t1 values(5, Point(5,5));
+insert into t1 values(6, Point(6,6));
+insert into t1 values(7, Point(7,7));
+insert into t1 values(8, Point(8,8));
+insert into t1 values(9, Point(9,9));
+
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+start transaction;
+insert into t1 select * from t1;
+rollback;
+check table t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+
+#Check first round spliting.
+SET SESSION debug="+d, rtr_page_need_first_split";
+insert into t1 select * from t1;
+SET SESSION debug="-d, rtr_page_need_first_split";
+
+# Clean up.
+drop table t1;
diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix.result b/mysql-test/suite/innodb_zip/r/index_large_prefix.result
index 7f466e957f35..f4a43c413a01 100644
--- a/mysql-test/suite/innodb_zip/r/index_large_prefix.result
+++ b/mysql-test/suite/innodb_zip/r/index_large_prefix.result
@@ -494,11 +494,11 @@ drop table worklog5743;
 ### Test 6 ###
 create table worklog5743(a TEXT not null, primary key (a(1000)))
 row_format=compact;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create table worklog5743(a TEXT)
 row_format=compact;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx on worklog5743(a(767));
 insert into worklog5743 values(repeat("a", 20000));
 begin;
@@ -546,12 +546,12 @@ drop table worklog5743;
 SET sql_mode= default;
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 SET GLOBAL innodb_file_per_table=1;
diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result
index 36d232f1e614..923e77892a7a 100644
--- a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result
+++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result
@@ -362,7 +362,7 @@ create table worklog5743(a TEXT not null, primary key (a(1000)));
 ERROR 42000: Specified key was too long; max key length is 768 bytes
 create table worklog5743(a TEXT) ROW_FORMAT=COMPACT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx on worklog5743(a(767));
 insert into worklog5743 values(repeat("a", 20000));
 begin;
@@ -417,12 +417,12 @@ insert into worklog5743 values(repeat("a", 768));
 drop table worklog5743;
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 SET GLOBAL innodb_file_per_table=1;
diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result
index c9ee289123ee..f7eb850524a1 100644
--- a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result
+++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result
@@ -404,10 +404,10 @@ drop table worklog5743;
 ### Test 6 ###
 create table worklog5743(a TEXT not null, primary key (a(1000)))
 row_format=compact;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create table worklog5743(a TEXT) row_format=compact;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx on worklog5743(a(767));
 insert into worklog5743 values(repeat("a", 20000));
 begin;
@@ -455,12 +455,12 @@ worklog5743	CREATE TABLE `worklog5743` (
 drop table worklog5743;
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
 create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 SET GLOBAL innodb_file_per_table=1;
diff --git a/mysql-test/suite/innodb_zip/r/innochecksum_2.result b/mysql-test/suite/innodb_zip/r/innochecksum_2.result
index 0b6adaa33a20..44c5e27bcbb2 100644
--- a/mysql-test/suite/innodb_zip/r/innochecksum_2.result
+++ b/mysql-test/suite/innodb_zip/r/innochecksum_2.result
@@ -19,7 +19,7 @@ INSERT INTO t1 SELECT * from t1;
 [2]:# Run the innochecksum when file isn't provided.
 # It will print the innochecksum usage similar to --help option.
 innochecksum Ver #.#.#
-Copyright (c) YEAR, YEAR , Oracle and/or its affiliates. All rights reserved.
+Copyright (c) YEAR, YEAR , Oracle and/or its affiliates.
 
 Oracle is a registered trademark of Oracle Corporation and/or its
 affiliates. Other names may be trademarks of their respective
diff --git a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
index fd2def62c494..fd9b2ac93c5e 100644
--- a/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
+++ b/mysql-test/suite/innodb_zip/r/prefix_index_liftedlimit.result
@@ -30,9 +30,9 @@ col_1_varchar = REPEAT("c", 4000)
 0
 1
 ALTER TABLE worklog5743 ROW_FORMAT=REDUNDANT;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 ALTER TABLE worklog5743 ROW_FORMAT=COMPACT;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
 ALTER TABLE worklog5743 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
 DROP TABLE worklog5743;
 CREATE TABLE worklog5743 (
diff --git a/mysql-test/suite/innodb_zip/r/wl6469.result b/mysql-test/suite/innodb_zip/r/wl6469.result
index ad328188efbd..2842eb858e2d 100644
--- a/mysql-test/suite/innodb_zip/r/wl6469.result
+++ b/mysql-test/suite/innodb_zip/r/wl6469.result
@@ -270,8 +270,9 @@ SET sql_mode = default;
 set global innodb_large_prefix = 1;
 Warnings:
 Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-SET sql_mode='NO_ENGINE_SUBSTITUTION';
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 Warnings:
+Warning	3135	'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 SET innodb_strict_mode=OFF;
 create temporary table t (
@@ -279,7 +280,8 @@ a int not null,
 b blob not null,
 index sk (b(3021))
 ) row_format = compact engine=innodb;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 a int not null,
 b blob not null,
@@ -292,6 +294,7 @@ b blob not null,
 index sk (b(3021))
 ) row_format = compressed engine=innodb;
 drop table t;
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 SET GLOBAL innodb_large_prefix=default;
 set global innodb_file_per_table = 0;
 create temporary table t (
@@ -299,7 +302,8 @@ a int not null,
 b blob not null,
 index sk (b(3021))
 ) row_format = compact engine=innodb;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 a int not null,
 b blob not null,
diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix.test b/mysql-test/suite/innodb_zip/t/index_large_prefix.test
index 532ffc4b60e5..694eb69bdd77 100644
--- a/mysql-test/suite/innodb_zip/t/index_large_prefix.test
+++ b/mysql-test/suite/innodb_zip/t/index_large_prefix.test
@@ -370,7 +370,7 @@ drop table worklog5743;
 
 -- echo ### Test 6 ###
 # Create a table with old format, and the limit is 768 bytes.
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create table worklog5743(a TEXT not null, primary key (a(1000)))
 row_format=compact;
 
@@ -378,7 +378,7 @@ create table worklog5743(a TEXT)
 row_format=compact;
 
 # Excercise the column length check in ha_innobase::add_index()
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 
 # This should be successful
@@ -426,13 +426,13 @@ SET sql_mode= default;
 
 # We have a limit of 767 bytes for Antelope tables
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test
index a0229abc4f8f..0d4b86d6a4de 100644
--- a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test
+++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test
@@ -334,7 +334,7 @@ create table worklog5743(a TEXT not null, primary key (a(1000)));
 create table worklog5743(a TEXT) ROW_FORMAT=COMPACT;
 
 # Excercise the column length check in ha_innobase::add_index()
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 
 # This should be successful
@@ -385,13 +385,13 @@ drop table worklog5743;
 
 # We have a limit of 767 bytes for Antelope tables
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test
index 00a97249a957..c940915c01ca 100644
--- a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test
+++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test
@@ -360,14 +360,14 @@ drop table worklog5743;
 
 -- echo ### Test 6 ###
 # Create a table with old format, and the limit is 768 bytes.
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create table worklog5743(a TEXT not null, primary key (a(1000)))
 row_format=compact;
 
 create table worklog5743(a TEXT) row_format=compact;
 
 # Excercise the column length check in ha_innobase::add_index()
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 
 # This should be successful
@@ -414,13 +414,13 @@ drop table worklog5743;
 
 # We have a limit of 767 bytes for Antelope tables
 create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
 
 create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT;
--- error ER_INDEX_COLUMN_TOO_LONG
+-- error ER_TOO_LONG_KEY
 create index idx on worklog5743(a(768));
 create index idx2 on worklog5743(a(767));
 drop table worklog5743;
diff --git a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test
index dfc3777c58a0..9c21b7982984 100644
--- a/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test
+++ b/mysql-test/suite/innodb_zip/t/prefix_index_liftedlimit.test
@@ -47,9 +47,9 @@ WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
 INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
 DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
 SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
---error ER_INDEX_COLUMN_TOO_LONG
+--error ER_TOO_LONG_KEY
 ALTER TABLE worklog5743 ROW_FORMAT=REDUNDANT;
---error ER_INDEX_COLUMN_TOO_LONG
+--error ER_TOO_LONG_KEY
 ALTER TABLE worklog5743 ROW_FORMAT=COMPACT;
 ALTER TABLE worklog5743 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
 DROP TABLE worklog5743;
diff --git a/mysql-test/suite/innodb_zip/t/wl6469.test b/mysql-test/suite/innodb_zip/t/wl6469.test
index ebd5f727009f..8603748faa3c 100644
--- a/mysql-test/suite/innodb_zip/t/wl6469.test
+++ b/mysql-test/suite/innodb_zip/t/wl6469.test
@@ -219,15 +219,17 @@ SET sql_mode = default;
 #
 set global innodb_large_prefix = 1;
 #
-SET sql_mode='NO_ENGINE_SUBSTITUTION';
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 SET innodb_strict_mode=OFF;
 --disable_warnings
---error ER_INDEX_COLUMN_TOO_LONG
+--error ER_TOO_LONG_KEY
 create temporary table t (
 	a int not null,
 	b blob not null,
 	index sk (b(3021))
 	) row_format = compact engine=innodb;
+
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 #
 create temporary table t (
 	a int not null,
@@ -243,16 +245,18 @@ create temporary table t (
 	) row_format = compressed engine=innodb;
 drop table t;
 #
+SET sql_mode='NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES';
 SET GLOBAL innodb_large_prefix=default;
 set global innodb_file_per_table = 0;
 #
---error ER_INDEX_COLUMN_TOO_LONG
+--error ER_TOO_LONG_KEY
 create temporary table t (
 	a int not null,
 	b blob not null,
 	index sk (b(3021))
 	) row_format = compact engine=innodb;
 #
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 create temporary table t (
 	a int not null,
 	b blob not null,
diff --git a/mysql-test/suite/innodb_zip/t/wl6560.test b/mysql-test/suite/innodb_zip/t/wl6560.test
index 041dd453c725..fe5ff13d5dba 100644
--- a/mysql-test/suite/innodb_zip/t/wl6560.test
+++ b/mysql-test/suite/innodb_zip/t/wl6560.test
@@ -381,13 +381,13 @@ drop table t1;
 #
 --source include/shutdown_mysqld.inc
 --echo "try starting server with temp-tablespace size < min. threshold"
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $sizeoftempfile1
 let SEARCH_PATTERN = Tablespace size must be at least;
 --source ./include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo "try starting server with sys-tablespace size < min. threshold"
---error 1
+--error 1,42
 --exec $MYSQLD_CMD $sizeoftempfile2
 let SEARCH_PATTERN = Tablespace size must be at least;
 --source ./include/search_pattern_in_file.inc
diff --git a/mysql-test/suite/json/inc/json_functions.inc b/mysql-test/suite/json/inc/json_functions.inc
index 90bc001c507d..c0cec7b5fe3f 100644
--- a/mysql-test/suite/json/inc/json_functions.inc
+++ b/mysql-test/suite/json/inc/json_functions.inc
@@ -570,7 +570,9 @@ INSERT INTO json_merge_t VALUES
 (3, '[1,2]'),
 (4, '{"a":["x", "y"]}'),
 (5, '{"a":"b","c":"d"}');
-SELECT t1.j, t2.j, json_merge(t1.j, t2.j), json_merge(t2.j, t1.j)
+SELECT t1.j, t2.j,
+       JSON_MERGE_PRESERVE(t1.j, t2.j) AS m1,
+       JSON_MERGE_PRESERVE(t2.j, t1.j) AS m2
 FROM json_merge_t t1, json_merge_t t2 ORDER BY t1.i, t2.i;
 DROP TABLE json_merge_t;
 
@@ -1409,7 +1411,7 @@ create procedure merge_docs
 )
 language sql deterministic contains sql
 begin
-  set out_value = json_merge( in_value, inout_value );
+  set out_value = json_merge_preserve(in_value, inout_value);
   set inout_value = in_value;
 end//
 delimiter ;//
@@ -1958,7 +1960,7 @@ JSON_ARRAY_APPEND(j, '\$', 2),
 JSON_SET(j, '\$[0]', 2),
 JSON_INSERT(j, '\$[0]', 2),
 JSON_REPLACE(j, '\$[0]', 2),
-JSON_MERGE(j, j),
+JSON_MERGE_PRESERVE(j, j),
 JSON_SEARCH(j, 'one', 'abc'),
 JSON_CONTAINS(j, '[1]'),
 JSON_CONTAINS_PATH(j, 'all', '\$.a'),
@@ -1967,7 +1969,9 @@ JSON_DEPTH(j),
 JSON_ARRAY(j, j),
 JSON_OBJECT('k', j),
 JSON_UNQUOTE(CAST(j AS CHAR)),
-JSON_QUOTE(CAST(j AS CHAR))
+JSON_QUOTE(CAST(j AS CHAR)),
+JSON_PRETTY(j),
+JSON_STORAGE_SIZE(j)
 FROM T_WITH_NULLS
 ORDER BY i;
 eval $query;
@@ -2006,7 +2010,7 @@ SELECT JSON_INSERT(json_text, json_path, json_atom_text)
 FROM t_latin1 ORDER BY id;
 SELECT JSON_REPLACE(json_text, json_path, json_atom_text)
 FROM t_latin1 ORDER BY id;
-SELECT JSON_MERGE(json_text, json_text) FROM t_latin1 ORDER BY id;
+SELECT JSON_MERGE_PRESERVE(json_text, json_text) FROM t_latin1 ORDER BY id;
 SELECT JSON_SEARCH(json_text, CONVERT('one' USING latin1), json_atom_text,
                   CONVERT(X'F8' USING latin1), json_path)
 FROM t_latin1 ORDER BY id;
@@ -2982,8 +2986,8 @@ drop table t1;
 
 CREATE TABLE t (doc json);
 INSERT INTO t VALUES('{"array":[1,2,3,4]}');
-UPDATE t SET doc=JSON_MERGE(doc,doc);
-UPDATE t SET doc=JSON_MERGE(doc,doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
 drop table t;
 
 --echo #
@@ -3349,6 +3353,280 @@ DELETE FROM t WHERE j IN (SELECT CAST('not json' AS JSON) FROM DUAL WHERE 1);
 SELECT * FROM t;
 DROP TABLE t;
 
+--echo # Bug#22522073: Assertion failed: !thd->is_error() in optimize_cond()
+
+CREATE TABLE s(a INTEGER, b CHAR(1));
+INSERT INTO s VALUES (1,0), (1,0), (1,0);
+
+CREATE TABLE t(c JSON);
+INSERT INTO t VALUES (), (), ();
+
+--error ER_SUBQUERY_NO_1_ROW
+SELECT 1
+FROM s WHERE a NOT IN (SELECT 1
+                       FROM s WHERE (SELECT c FROM t) = b);
+
+DROP TABLE s, t;
+
+--echo #
+--echo # WL#9191: JSON_PRETTY function
+--echo #
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT,
+               uc VARCHAR(128) CHARACTER SET utf8mb4,
+               lc VARCHAR(128) CHARACTER SET latin1,
+               j JSON);
+INSERT INTO t(uc) VALUES
+(NULL),
+('{}'),
+('[]'),
+('[1,2,3]'),
+('{"a":1,"b":2}'),
+('{"a":[1,{}],"b":[]}'),
+('{"a":{"b":{"c":{"d":{"e":{"f":null}}}}}}'),
+('true'),
+('false'),
+('null'),
+('1'),
+('1.1'),
+('"hello"'),
+(JSON_ARRAY('abc
+def', '"abc"'));
+UPDATE t SET lc = uc, j = uc;
+SELECT JSON_PRETTY(uc) AS c1 FROM t ORDER BY id;
+SELECT JSON_PRETTY(lc) AS c1 FROM t ORDER BY id;
+SELECT JSON_PRETTY(j) AS c1 FROM t ORDER BY id;
+SELECT DISTINCT CHARSET(JSON_PRETTY(uc)) AS c1,
+                CHARSET(JSON_PRETTY(lc)) AS c2,
+                CHARSET(JSON_PRETTY(j)) AS c3 FROM t;
+DROP TABLE t;
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+SELECT JSON_PRETTY('this is not JSON') AS j;
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_PRETTY();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_PRETTY('{}', 2);
+
+--echo #
+--echo # WL#9192: Add JSON_STORAGE_SIZE / JSON_STORAGE_FREE functions
+--echo #
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_STORAGE_SIZE();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_STORAGE_SIZE('{}', '[]');
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+SELECT JSON_STORAGE_SIZE('this is not JSON') AS j;
+SELECT JSON_STORAGE_SIZE(NULL);
+SELECT JSON_STORAGE_SIZE(JSON_ARRAY(1,2,3));
+CREATE TABLE t(id INT PRIMARY KEY, j JSON, v VARCHAR(100));
+INSERT INTO t(id, j) VALUES (0, NULL), (1, '[["abc", "def", "ghi", "jkl"]]');
+UPDATE t SET v = j;
+let $dump_table=
+SELECT *,
+       JSON_STORAGE_SIZE(j), JSON_STORAGE_SIZE(v),
+       JSON_STORAGE_SIZE(j->'\$[0]'), JSON_STORAGE_SIZE(v->'\$[0]')
+       FROM t ORDER BY id;
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0][1]', NULL, '$[0][3]', 'X'),
+             v = JSON_SET(v, '$[0][1]', NULL, '$[0][3]', 'X');
+--eval $dump_table
+DROP TABLE t;
+
+--echo #
+--echo # Get some extra coverage for partial update of JSON, WL#8963.
+--echo # Partial update will not happen in MySQL 5.7, since WL#8963 has not
+--echo # been backported. The test cases are kept in order to exercise
+--echo # the JSON_STORAGE_SIZE function.
+--echo #
+
+CREATE TABLE t(id INT PRIMARY KEY, j JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a"}'), (2, '{"a":"b", "b":"b"}'), (3, '{"a":"c", "c":"c"}');
+--let $dump_table= SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$.a', 'x');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$.a', 'y', '$.b', j->'$.a');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$.a', 'z'), j = JSON_SET(j, '$.b', j->'$.a');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$.a', 'w'),
+             j = JSON_SET(j, '$.a', 'v', '$.b', j->'$.a');
+--eval $dump_table
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '1', '$.c', '2', '$.a', '3');
+--eval $dump_table
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '4'), j = JSON_REPLACE(j, '$.c', '5'),
+             j = JSON_REPLACE(j, '$.a', '6');
+--eval $dump_table
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '');
+--eval $dump_table
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'a');
+--eval $dump_table
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'ab');
+--eval $dump_table
+DROP TABLE t;
+
+CREATE TABLE t(id INT PRIMARY KEY, j1 JSON, j2 JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}'),
+(2, NULL, NULL),
+(3, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}');
+let $dump_table= SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+                           JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+--eval $dump_table
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 'x'),
+             j2 = JSON_SET(j2, '$.a', 'y'),
+             j1 = JSON_SET(j1, '$.b', 'z');
+--eval $dump_table
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 's'),
+             j2 = JSON_SET(j2, '$.a', 'abcdefghi'),
+             j1 = JSON_SET(j1, '$.b', 't');
+--eval $dump_table
+UPDATE t SET j1 = JSON_SET(j1, '$.x.y.z', 'abc', '$.b', 'X');
+--eval $dump_table
+UPDATE t SET j1 = JSON_REPLACE(j1, '$.x', 'abc', '$.b', 'Y');
+--eval $dump_table
+UPDATE t SET j1 = JSON_SET(j1, '$.x', 'abc', '$.b', 'Z');
+--eval $dump_table
+DROP TABLE t;
+
+CREATE TABLE t(j JSON,
+               i INT DEFAULT 42,
+               db DOUBLE DEFAULT 2.34e-10,
+               dc DECIMAL(5, 3) DEFAULT 98.765,
+               ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+               gc JSON GENERATED ALWAYS AS (JSON_ARRAY(i, db, dc, ts)))
+ENGINE=InnoDB;  # Generated columns are not supported in NDB.
+INSERT INTO t(j, ts) VALUES
+('[null, "abc", true, "def", false]', '2017-01-02 14:15:16');
+--let $dump_table= SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t
+--eval $dump_table
+# The update of $[3] to a longer value should be able to reuse the space freed
+# by the update of $[1] to a shorter value.
+UPDATE t SET j = JSON_SET(j, '$[1]', 'xy', '$[3]', 'xyzw');
+--eval $dump_table
+# Again, increasing the size of $[3] is OK as long as $[1] shrinks first, also
+# when done in two separate operations.
+UPDATE t SET j = JSON_SET(j, '$[1]', 'a');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[3]', 'abcde');
+--eval $dump_table
+# Test update to some other data types.
+UPDATE t SET j = JSON_ARRAY('abcdefghijklmnopqrstuvwxyz');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', 3.14e0);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(10000000000 AS UNSIGNED));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(4000000000 AS SIGNED));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(123 AS UNSIGNED));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(456 AS SIGNED));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', -123);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', -4000000000);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', TRUE);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', NULL);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('abc' AS BINARY));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-23 13:16:40' AS DATETIME));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-24' AS DATE));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('14:17:41' AS TIME));
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', 1.23);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', i);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', db);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', dc);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', ts);
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[0]');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[1]');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[2]');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[3]');
+--eval $dump_table
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[4]');
+--eval $dump_table
+DROP TABLE t;
+
+# Some multi-table updates which perform partial updates.
+CREATE TABLE t1(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t1 VALUES (1, '{"a":11}', 1), (2, '{"a":22}', 2);
+--let $dump_t1= SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id
+--eval $dump_t1
+CREATE TABLE t2(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t2 VALUES (1, '{"b":33}', 3), (2, '{"b":44}', 4);
+--let $dump_t2= SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id
+--eval $dump_t2
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.j->'$.b') WHERE t1.id = t2.id;
+--eval $dump_t1
+--eval $dump_t2
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.x),
+                  t2.j = JSON_SET(t2.j, '$.b', t1.x)
+              WHERE t1.id = t2.id;
+--eval $dump_t1
+--eval $dump_t2
+UPDATE t1, t2 SET t1.j = '[123]', t2.j = JSON_SET(t2.j, '$.b', 99);
+--eval $dump_t1
+--eval $dump_t2
+DROP TABLE t1, t2;
+
+--echo #
+--echo # WL#9692: Add JSON_MERGE_PATCH
+--echo #
+
+CREATE TABLE merge_t(
+id INT PRIMARY KEY AUTO_INCREMENT,
+target VARCHAR(100), patch VARCHAR(100)
+);
+INSERT INTO merge_t(target, patch) VALUES
+('{"a":"b"}', '{"a":"c"}'),
+('{"a":"b"}', '{"b":"c"}'),
+('{"a":"b"}', '{"a":null}'),
+('{"a":"b", "b":"c"}', '{"a":null}'),
+('{"a":["b"]}', '{"a":"c"}'),
+('{"a":"c"}', '{"a":["b"]}'),
+('{"a": {"b":"c"}}', '{"a": {"b":"d", "c":null}}'),
+('{"a":[{"b":"c"}]}', '{"a": [1]}'),
+('["a","b"]', '["c","d"]'),
+('{"a":"b"}', '["c"]'),
+('{"a":"foo"}', 'null'),
+('{"a":"foo"}', '"bar"'),
+('{"e":null}', '{"a":1}'),
+('[1,2]', '{"a":"b", "c":null}'),
+('{}', '{"a":{"bb":{"ccc":null}}}'),
+(NULL, '{}'),
+('{}', NULL);
+SELECT id, target, patch,
+       JSON_MERGE_PATCH(target, patch) AS merged,
+       JSON_EXTRACT(JSON_MERGE_PATCH(target, patch), '$.a') AS a
+FROM merge_t ORDER BY id;
+DROP TABLE merge_t;
+
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '{"c":"d"}');
+SELECT JSON_MERGE_PATCH(NULL, '[1,2,3]');
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '[1,2,3]', '{"c":null,"d":"e"}');
+
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_MERGE_PATCH();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+SELECT JSON_MERGE_PATCH('{}');
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+SELECT JSON_MERGE_PATCH('{', '[1,2,3]');
+--error ER_INVALID_JSON_TEXT_IN_PARAM
+SELECT JSON_MERGE_PATCH('{"a":"b"}', '[1,');
 
 # Local Variables:
 # mode: sql
diff --git a/mysql-test/suite/json/r/json_agg.result b/mysql-test/suite/json/r/json_agg.result
new file mode 100644
index 000000000000..7ad8983349de
--- /dev/null
+++ b/mysql-test/suite/json/r/json_agg.result
@@ -0,0 +1,1168 @@
+#
+# Setup test.
+#
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(1, 1, "alfa"),
+(1, 2, null),
+(2, 3, "doi"),
+(1, 4, "unu"),
+(3, 5, "trei"),
+(4, 6, null),
+(4, 7, null),
+(1, 8, "one");
+#
+# Test JSON_ARRAYAGG.
+#
+FLUSH STATUS;
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT SQL_BIG_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+SELECT SQL_SMALL_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT JSON_ARRAYAGG(b) FROM t1;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+SELECT SQL_BIG_RESULT JSON_ARRAYAGG(b) FROM t1;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+SELECT SQL_SMALL_RESULT JSON_ARRAYAGG(b) FROM t1;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+SELECT SQL_BUFFER_RESULT JSON_ARRAYAGG(b) FROM t1;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+PREPARE p1 FROM "SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a";
+EXECUTE p1;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+EXECUTE p1;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+deallocate prepare p1;
+PREPARE p3 FROM
+"SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a";
+EXECUTE p3;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+EXECUTE p3;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+deallocate prepare p3;
+PREPARE p4 FROM "SELECT JSON_ARRAYAGG(b) FROM t1";
+EXECUTE p4;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+EXECUTE p4;
+JSON_ARRAYAGG(b)
+["alfa", null, "doi", "unu", "trei", null, null, "one"]
+deallocate prepare p4;
+SELECT JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1;
+JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]')
+["alfa", null, "doi", "unu", "trei", null, null, "one", true, false]
+PREPARE p1 FROM
+"SELECT a, JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1 GROUP BY a";
+EXECUTE p1;
+a	JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]')
+1	["alfa", null, "unu", "one", true, false]
+2	["doi", true, false]
+3	["trei", true, false]
+4	[null, null, true, false]
+EXECUTE p1;
+a	JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]')
+1	["alfa", null, "unu", "one", true, false]
+2	["doi", true, false]
+3	["trei", true, false]
+4	[null, null, true, false]
+deallocate prepare p1;
+PREPARE p4 FROM
+"SELECT JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1";
+EXECUTE p4;
+JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]')
+["alfa", null, "doi", "unu", "trei", null, null, "one", true, false]
+EXECUTE p4;
+JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]')
+["alfa", null, "doi", "unu", "trei", null, null, "one", true, false]
+deallocate prepare p4;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	Using filesort
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN SELECT JSON_ARRAYAGG(b) FROM t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1`
+EXPLAIN FORMAT=json SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "10.60"
+    },
+    "grouping_operation": {
+      "using_filesort": true,
+      "cost_info": {
+        "sort_cost": "8.00"
+      },
+      "table": {
+        "table_name": "t1",
+        "access_type": "ALL",
+        "rows_examined_per_scan": 8,
+        "rows_produced_per_join": 8,
+        "filtered": "100.00",
+        "cost_info": {
+          "read_cost": "1.00",
+          "eval_cost": "1.60",
+          "prefix_cost": "2.60",
+          "data_read_per_join": "192"
+        },
+        "used_columns": [
+          "a",
+          "b"
+        ]
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN FORMAT=json SELECT SQL_BIG_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "10.60"
+    },
+    "grouping_operation": {
+      "using_filesort": true,
+      "cost_info": {
+        "sort_cost": "8.00"
+      },
+      "table": {
+        "table_name": "t1",
+        "access_type": "ALL",
+        "rows_examined_per_scan": 8,
+        "rows_produced_per_join": 8,
+        "filtered": "100.00",
+        "cost_info": {
+          "read_cost": "1.00",
+          "eval_cost": "1.60",
+          "prefix_cost": "2.60",
+          "data_read_per_join": "192"
+        },
+        "used_columns": [
+          "a",
+          "b"
+        ]
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_big_result `test`.`t1`.`a` AS `a`,json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN FORMAT=json SELECT SQL_SMALL_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "10.60"
+    },
+    "grouping_operation": {
+      "using_filesort": true,
+      "cost_info": {
+        "sort_cost": "8.00"
+      },
+      "table": {
+        "table_name": "t1",
+        "access_type": "ALL",
+        "rows_examined_per_scan": 8,
+        "rows_produced_per_join": 8,
+        "filtered": "100.00",
+        "cost_info": {
+          "read_cost": "1.00",
+          "eval_cost": "1.60",
+          "prefix_cost": "2.60",
+          "data_read_per_join": "192"
+        },
+        "used_columns": [
+          "a",
+          "b"
+        ]
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_small_result `test`.`t1`.`a` AS `a`,json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN FORMAT=json SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "10.60"
+    },
+    "grouping_operation": {
+      "using_filesort": true,
+      "cost_info": {
+        "sort_cost": "8.00"
+      },
+      "buffer_result": {
+        "using_temporary_table": true,
+        "table": {
+          "table_name": "t1",
+          "access_type": "ALL",
+          "rows_examined_per_scan": 8,
+          "rows_produced_per_join": 8,
+          "filtered": "100.00",
+          "cost_info": {
+            "read_cost": "1.00",
+            "eval_cost": "1.60",
+            "prefix_cost": "2.60",
+            "data_read_per_join": "192"
+          },
+          "used_columns": [
+            "a",
+            "b"
+          ]
+        }
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_buffer_result `test`.`t1`.`a` AS `a`,json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN FORMAT=json SELECT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "2.60"
+    },
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "rows_examined_per_scan": 8,
+      "rows_produced_per_join": 8,
+      "filtered": "100.00",
+      "cost_info": {
+        "read_cost": "1.00",
+        "eval_cost": "1.60",
+        "prefix_cost": "2.60",
+        "data_read_per_join": "192"
+      },
+      "used_columns": [
+        "b"
+      ]
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1`
+EXPLAIN FORMAT=json SELECT SQL_BIG_RESULT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "2.60"
+    },
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "rows_examined_per_scan": 8,
+      "rows_produced_per_join": 8,
+      "filtered": "100.00",
+      "cost_info": {
+        "read_cost": "1.00",
+        "eval_cost": "1.60",
+        "prefix_cost": "2.60",
+        "data_read_per_join": "192"
+      },
+      "used_columns": [
+        "b"
+      ]
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_big_result json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1`
+EXPLAIN FORMAT=json SELECT SQL_SMALL_RESULT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "2.60"
+    },
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "rows_examined_per_scan": 8,
+      "rows_produced_per_join": 8,
+      "filtered": "100.00",
+      "cost_info": {
+        "read_cost": "1.00",
+        "eval_cost": "1.60",
+        "prefix_cost": "2.60",
+        "data_read_per_join": "192"
+      },
+      "used_columns": [
+        "b"
+      ]
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_small_result json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1`
+EXPLAIN FORMAT=json SELECT SQL_BUFFER_RESULT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "2.60"
+    },
+    "buffer_result": {
+      "using_temporary_table": true,
+      "table": {
+        "table_name": "t1",
+        "access_type": "ALL",
+        "rows_examined_per_scan": 8,
+        "rows_produced_per_join": 8,
+        "filtered": "100.00",
+        "cost_info": {
+          "read_cost": "1.00",
+          "eval_cost": "1.60",
+          "prefix_cost": "2.60",
+          "data_read_per_join": "192"
+        },
+        "used_columns": [
+          "b"
+        ]
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select sql_buffer_result json_arrayagg(`test`.`t1`.`b`) AS `JSON_ARRAYAGG(b)` from `test`.`t1`
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a WITH ROLLUP;
+a	JSON_ARRAYAGG(b)
+1	["alfa", null, "unu", "one"]
+2	["doi"]
+3	["trei"]
+4	[null, null]
+NULL	["alfa", null, "unu", "one", "doi", "trei", null, null]
+SELECT a, JSON_ARRAYAGG(b) as jarray
+FROM t1
+GROUP BY a
+HAVING jarray= JSON_ARRAY("trei");
+a	jarray
+3	["trei"]
+#
+# Test JSON_OBJECTAGG.
+#
+FLUSH STATUS;
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "alfa", "2": null, "4": "unu", "8": "one"}
+2	{"3": "doi"}
+3	{"5": "trei"}
+4	{"6": null, "7": null}
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT JSON_OBJECTAGG(k, b) FROM t1;
+JSON_OBJECTAGG(k, b)
+{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+PREPARE p1 FROM "SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a";
+EXECUTE p1;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "alfa", "2": null, "4": "unu", "8": "one"}
+2	{"3": "doi"}
+3	{"5": "trei"}
+4	{"6": null, "7": null}
+EXECUTE p1;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "alfa", "2": null, "4": "unu", "8": "one"}
+2	{"3": "doi"}
+3	{"5": "trei"}
+4	{"6": null, "7": null}
+deallocate prepare p1;
+PREPARE p4 FROM "SELECT JSON_OBJECTAGG(k, b) FROM t1";
+EXECUTE p4;
+JSON_OBJECTAGG(k, b)
+{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}
+EXECUTE p4;
+JSON_OBJECTAGG(k, b)
+{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}
+deallocate prepare p4;
+SELECT a, JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1 GROUP BY a;
+a	JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+1	[{"1": "alfa", "2": null, "4": "unu", "8": "one"}, true, false]
+2	[{"3": "doi"}, true, false]
+3	[{"5": "trei"}, true, false]
+4	[{"6": null, "7": null}, true, false]
+SELECT JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1;
+JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+[{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}, true, false]
+PREPARE p1 FROM
+"SELECT a, JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+FROM t1
+GROUP BY a";
+EXECUTE p1;
+a	JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+1	[{"1": "alfa", "2": null, "4": "unu", "8": "one"}, true, false]
+2	[{"3": "doi"}, true, false]
+3	[{"5": "trei"}, true, false]
+4	[{"6": null, "7": null}, true, false]
+EXECUTE p1;
+a	JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+1	[{"1": "alfa", "2": null, "4": "unu", "8": "one"}, true, false]
+2	[{"3": "doi"}, true, false]
+3	[{"5": "trei"}, true, false]
+4	[{"6": null, "7": null}, true, false]
+deallocate prepare p1;
+PREPARE p4 FROM
+"SELECT JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1";
+EXECUTE p4;
+JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+[{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}, true, false]
+EXECUTE p4;
+JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+[{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}, true, false]
+deallocate prepare p4;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	Using filesort
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,json_objectagg(`test`.`t1`.`k`,`test`.`t1`.`b`) AS `JSON_OBJECTAGG(k, b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN SELECT JSON_OBJECTAGG(k, b) FROM t1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	8	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select json_objectagg(`test`.`t1`.`k`,`test`.`t1`.`b`) AS `JSON_OBJECTAGG(k, b)` from `test`.`t1`
+EXPLAIN FORMAT=json SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "10.60"
+    },
+    "grouping_operation": {
+      "using_filesort": true,
+      "cost_info": {
+        "sort_cost": "8.00"
+      },
+      "table": {
+        "table_name": "t1",
+        "access_type": "ALL",
+        "rows_examined_per_scan": 8,
+        "rows_produced_per_join": 8,
+        "filtered": "100.00",
+        "cost_info": {
+          "read_cost": "1.00",
+          "eval_cost": "1.60",
+          "prefix_cost": "2.60",
+          "data_read_per_join": "192"
+        },
+        "used_columns": [
+          "a",
+          "k",
+          "b"
+        ]
+      }
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,json_objectagg(`test`.`t1`.`k`,`test`.`t1`.`b`) AS `JSON_OBJECTAGG(k, b)` from `test`.`t1` group by `test`.`t1`.`a`
+EXPLAIN FORMAT=json SELECT JSON_OBJECTAGG(k, b) FROM t1;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost_info": {
+      "query_cost": "2.60"
+    },
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "rows_examined_per_scan": 8,
+      "rows_produced_per_join": 8,
+      "filtered": "100.00",
+      "cost_info": {
+        "read_cost": "1.00",
+        "eval_cost": "1.60",
+        "prefix_cost": "2.60",
+        "data_read_per_join": "192"
+      },
+      "used_columns": [
+        "k",
+        "b"
+      ]
+    }
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select json_objectagg(`test`.`t1`.`k`,`test`.`t1`.`b`) AS `JSON_OBJECTAGG(k, b)` from `test`.`t1`
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a WITH ROLLUP;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "alfa", "2": null, "4": "unu", "8": "one"}
+2	{"3": "doi"}
+3	{"5": "trei"}
+4	{"6": null, "7": null}
+NULL	{"1": "alfa", "2": null, "3": "doi", "4": "unu", "5": "trei", "6": null, "7": null, "8": "one"}
+SELECT a, JSON_OBJECTAGG(k, b) as jobject
+FROM t1
+GROUP BY a
+HAVING jobject = JSON_OBJECT(3, "doi");
+a	jobject
+2	{"3": "doi"}
+#
+# NULL values.
+#
+SELECT a, JSON_ARRAYAGG(null) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(null)
+1	[null, null, null, null]
+2	[null]
+3	[null]
+4	[null, null]
+SELECT JSON_ARRAYAGG(null) FROM t1;
+JSON_ARRAYAGG(null)
+[null, null, null, null, null, null, null, null]
+SELECT a, JSON_OBJECTAGG(k, null) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, null)
+1	{"1": null, "2": null, "4": null, "8": null}
+2	{"3": null}
+3	{"5": null}
+4	{"6": null, "7": null}
+SELECT JSON_OBJECTAGG(k, null) FROM t1;
+JSON_OBJECTAGG(k, null)
+{"1": null, "2": null, "3": null, "4": null, "5": null, "6": null, "7": null, "8": null}
+SELECT a, JSON_OBJECTAGG(null, b) FROM t1 GROUP BY a;
+ERROR 22032: JSON documents may not contain NULL member names.
+SELECT JSON_OBJECTAGG(null, b) FROM t1;
+ERROR 22032: JSON documents may not contain NULL member names.
+#
+# Coverage test for fix_fields: Disable_semijoin_flattening.
+#
+CREATE TABLE t(a INT);
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN format=json SELECT (SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)));
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "message": "No tables used",
+    "optimized_away_subqueries": [
+      {
+        "dependent": true,
+        "cacheable": false,
+        "query_block": {
+          "select_id": 2,
+          "cost_info": {
+            "query_cost": "1.20"
+          },
+          "table": {
+            "table_name": "t",
+            "access_type": "ALL",
+            "rows_examined_per_scan": 1,
+            "rows_produced_per_join": 1,
+            "filtered": "100.00",
+            "cost_info": {
+              "read_cost": "1.00",
+              "eval_cost": "0.20",
+              "prefix_cost": "1.20",
+              "data_read_per_join": "8"
+            },
+            "attached_condition": "json_arrayagg(<in_optimizer>(1,<exists>(/* select#3 */ select 1 from `test`.`t` where 1)))"
+          },
+          "optimized_away_subqueries": [
+            {
+              "dependent": false,
+              "cacheable": true,
+              "query_block": {
+                "select_id": 3,
+                "cost_info": {
+                  "query_cost": "1.20"
+                },
+                "table": {
+                  "table_name": "t",
+                  "access_type": "ALL",
+                  "rows_examined_per_scan": 1,
+                  "rows_produced_per_join": 1,
+                  "filtered": "100.00",
+                  "cost_info": {
+                    "read_cost": "1.00",
+                    "eval_cost": "0.20",
+                    "prefix_cost": "1.20",
+                    "data_read_per_join": "8"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
+Warnings:
+Note	1003	/* select#1 */ select (/* select#2 */ select 1 from `test`.`t` where json_arrayagg(<in_optimizer>(1,<exists>(/* select#3 */ select 1 from `test`.`t` where 1)))) AS `(SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)))`
+SELECT (SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)));
+(SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)))
+NULL
+DROP TABLE t;
+#
+# Coverage test for fix_fields: check_cols.
+#
+SELECT JSON_ARRAYAGG((SELECT 1, 1));
+ERROR 21000: Operand should contain 1 column(s)
+#
+# Coverage test for fix_fields: resolve_type.
+#
+CREATE TABLE t2(gid int, a int);
+SELECT JSON_ARRAYAGG(ST_PointFromText('POINT(10 10)')) FROM t2;
+ERROR HY000: Incorrect arguments to json_arrayagg(
+#
+# Coverage test for fix_fields: check_sum_func.
+#
+SELECT (SELECT JSON_ARRAYAGG(COUNT(a)) FROM t2)  FROM t1;
+ERROR HY000: Invalid use of group function
+DROP TABLE t2;
+#
+# Empty table.
+#
+TRUNCATE TABLE t1;
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+SELECT JSON_ARRAYAGG(b) FROM t1;
+JSON_ARRAYAGG(b)
+NULL
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, b)
+SELECT JSON_OBJECTAGG(k, b) FROM t1;
+JSON_OBJECTAGG(k, b)
+NULL
+#
+# Tests for max_allowed_packet.
+#
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, x INT);
+INSERT INTO t(x) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+INSERT INTO t(x) SELECT t1.x from t t1, t t2, t t3;
+SET GLOBAL net_buffer_length = 1024;
+SET GLOBAL max_allowed_packet = 1024;
+SELECT JSON_ARRAYAGG(x) FROM t;
+JSON_ARRAYAGG(x)
+NULL
+Warnings:
+Warning	1301	Result of json_arrayagg(() was larger than max_allowed_packet (1024) - truncated
+SELECT JSON_OBJECTAGG(id, x) FROM t;
+JSON_OBJECTAGG(id, x)
+NULL
+Warnings:
+Warning	1301	Result of json_objectagg(() was larger than max_allowed_packet (1024) - truncated
+SELECT id % 2 AS i, JSON_ARRAYAGG(x) FROM t GROUP BY i;
+i	JSON_ARRAYAGG(x)
+0	NULL
+1	NULL
+Warnings:
+Warning	1301	Result of json_arrayagg(() was larger than max_allowed_packet (1024) - truncated
+Warning	1301	Result of json_arrayagg(() was larger than max_allowed_packet (1024) - truncated
+SELECT id % 2 AS i, JSON_OBJECTAGG(id, x) FROM t GROUP BY i;
+i	JSON_OBJECTAGG(id, x)
+0	NULL
+1	NULL
+Warnings:
+Warning	1301	Result of json_objectagg(() was larger than max_allowed_packet (1024) - truncated
+Warning	1301	Result of json_objectagg(() was larger than max_allowed_packet (1024) - truncated
+SET GLOBAL max_allowed_packet = default;
+SET GLOBAL net_buffer_length = default;
+DROP TABLE t;
+#
+# Cleanup test.
+#
+DROP TABLE t1;
+#
+# Bug #24368053
+# WL#7987: ASSERTION `!TABLE || (!TABLE->WRITE_SET || BITMAP_IS_SET(TABLE-> ...
+#
+CREATE TABLE C(col_int int);
+CREATE TABLE CC(col_int int);
+INSERT INTO CC VALUES (1),(2),(3);
+SELECT JSON_OBJECTAGG(table1.`col_int` ,table1.`col_int`) AS field2,
+(SELECT JSON_ARRAYAGG(SUBQUERY2_t1.`col_int`)
+FROM CC AS SUBQUERY2_t1
+WHERE SUBQUERY2_t1.`col_int` <> table1.`col_int`) AS field5
+FROM (CC AS table1)
+WHERE (table1.`col_int` <> ALL (SELECT SUBQUERY4_t1.`col_int`
+       FROM (CC AS SUBQUERY4_t1 STRAIGHT_JOIN C)))
+GROUP BY
+field5;
+field2	field5
+{"3": 3}	[1, 2]
+{"2": 2}	[1, 3]
+{"1": 1}	[2, 3]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+DROP TABLE C;
+DROP TABLE CC;
+#
+# Bug #24367384
+# WL#7987: INNODB: ASSERTION FAILURE: ROW0SEL.CC:2558:FIELD->PREFIX_LEN > 0 ...
+#
+CREATE TABLE BB (pk INT AUTO_INCREMENT PRIMARY KEY, col_varchar_key VARCHAR(1));
+INSERT INTO BB VALUES(1,'a');
+SELECT (SELECT JSON_ARRAYAGG(`pk`) FROM BB as t1
+WHERE t1.`col_varchar_key` <> t2.`col_varchar_key`) AS field2
+FROM BB as t2
+GROUP BY field2;
+field2
+NULL
+SELECT (SELECT JSON_ARRAYAGG(`pk`) FROM BB as t1
+WHERE t1.`col_varchar_key` = t2.`col_varchar_key`) AS field2
+FROM BB as t2
+GROUP BY field2;
+field2
+[1]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+DROP TABLE BB;
+#
+# Bug #24365264
+# WL#7987: SIG 11 IN ITEM::MARK_FIELD_IN_MAP|SQL/ITEM.H
+#
+CREATE TABLE C (col_int int);
+INSERT INTO C VALUES  (1);
+SELECT *
+FROM C WHERE col_int < (SELECT JSON_ARRAYAGG(col_int) FROM C )
+ORDER BY col_int ;
+col_int
+1
+DROP TABLE C;
+#
+# Bug #24366341
+# WL#7987: SIG 6 IN JSON_WRAPPER::TYPE|SQL/JSON_DOM.CC
+#
+CREATE TABLE CC(col_varchar_key varchar(1));
+INSERT INTO CC VALUES ('a');
+SELECT JSON_ARRAYAGG(col_varchar_key) AS field1 FROM CC HAVING field1 > 9;
+field1
+["a"]
+SELECT JSON_OBJECTAGG(col_varchar_key, col_varchar_key) AS field1 FROM  CC
+HAVING (field1 <> 'a' AND field1 != 'e');
+field1
+{"a": "a"}
+DROP TABLE CC;
+#
+# with ROLLUP + two/three groups
+#
+CREATE TABLE tg (g1 int, g2 int, k int, b VARCHAR(10));
+INSERT INTO tg VALUES
+(1, 1, 1, "alfa"),
+(1, 2, 2, null),
+(2, 3, 3, "doi"),
+(1, 1, 4, "unu"),
+(3, 2, 5, "trei"),
+(4, 3, 6, null),
+(4, 1, 7, null),
+(1, 2, 8, "one");
+SELECT g1, g2, JSON_ARRAYAGG(g2) FROM tg GROUP BY g1, g2 with rollup;
+g1	g2	JSON_ARRAYAGG(g2)
+1	1	[1, 1]
+1	2	[2, 2]
+1	NULL	[1, 1, 2, 2]
+2	3	[3]
+2	NULL	[3]
+3	2	[2]
+3	NULL	[2]
+4	1	[1]
+4	3	[3]
+4	NULL	[1, 3]
+NULL	NULL	[1, 1, 2, 2, 3, 2, 1, 3]
+SELECT g1, g2, JSON_OBJECTAGG(k, g1) FROM tg GROUP BY g1, g2 with rollup;
+g1	g2	JSON_OBJECTAGG(k, g1)
+1	1	{"1": 1, "4": 1}
+1	2	{"2": 1, "8": 1}
+1	NULL	{"1": 1, "2": 1, "4": 1, "8": 1}
+2	3	{"3": 2}
+2	NULL	{"3": 2}
+3	2	{"5": 3}
+3	NULL	{"5": 3}
+4	1	{"7": 4}
+4	3	{"6": 4}
+4	NULL	{"6": 4, "7": 4}
+NULL	NULL	{"1": 1, "2": 1, "3": 2, "4": 1, "5": 3, "6": 4, "7": 4, "8": 1}
+CREATE TABLE tg3 (g1 int, g2 int, g3 int, k int, b VARCHAR(10));
+INSERT INTO tg3 VALUES
+(1, 1, 1, 1, "1.1.1"),
+(1, 1, 2, 2, "1.1.2"),
+(1, 1, 3, 3, "1.1.3"),
+(1, 2, 1, 4, "1.2.1"),
+(1, 2, 2, 5, "1.2.2"),
+(1, 2, 3, 6, "1.2.3"),
+(1, 3, 1, 7, "1.3.1"),
+(1, 3, 2, 8, "1.3.2"),
+(1, 3, 3, 9, "1.3.3"),
+(2, 1, 1, 10, "2.1.1"),
+(2, 1, 2, 11, "2.1.2"),
+(2, 1, 3, 12, "2.1.3"),
+(2, 2, 1, 13, "2.2.1"),
+(2, 2, 2, 14, "2.2.2"),
+(2, 2, 3, 15, "2.2.3"),
+(2, 3, 1, 16, "2.3.1"),
+(2, 3, 2, 17, "2.3.2"),
+(2, 3, 3, 18, "2.3.3"),
+(3, 1, 1, 19, "3.1.1"),
+(3, 1, 2, 20, "3.1.2"),
+(3, 1, 3, 21, "3.1.3"),
+(3, 2, 1, 22, "3.2.1"),
+(3, 2, 2, 23, "3.2.2"),
+(3, 2, 3, 24, "3.2.3"),
+(3, 3, 1, 25, "3.3.1"),
+(3, 3, 2, 26, "3.3.2"),
+(3, 3, 3, 27, "3.3.3");
+SELECT g1, g2, g3, JSON_ARRAYAGG(b) FROM tg3 GROUP BY g1, g2, g3 with rollup;
+g1	g2	g3	JSON_ARRAYAGG(b)
+1	1	1	["1.1.1"]
+1	1	2	["1.1.2"]
+1	1	3	["1.1.3"]
+1	1	NULL	["1.1.1", "1.1.2", "1.1.3"]
+1	2	1	["1.2.1"]
+1	2	2	["1.2.2"]
+1	2	3	["1.2.3"]
+1	2	NULL	["1.2.1", "1.2.2", "1.2.3"]
+1	3	1	["1.3.1"]
+1	3	2	["1.3.2"]
+1	3	3	["1.3.3"]
+1	3	NULL	["1.3.1", "1.3.2", "1.3.3"]
+1	NULL	NULL	["1.1.1", "1.1.2", "1.1.3", "1.2.1", "1.2.2", "1.2.3", "1.3.1", "1.3.2", "1.3.3"]
+2	1	1	["2.1.1"]
+2	1	2	["2.1.2"]
+2	1	3	["2.1.3"]
+2	1	NULL	["2.1.1", "2.1.2", "2.1.3"]
+2	2	1	["2.2.1"]
+2	2	2	["2.2.2"]
+2	2	3	["2.2.3"]
+2	2	NULL	["2.2.1", "2.2.2", "2.2.3"]
+2	3	1	["2.3.1"]
+2	3	2	["2.3.2"]
+2	3	3	["2.3.3"]
+2	3	NULL	["2.3.1", "2.3.2", "2.3.3"]
+2	NULL	NULL	["2.1.1", "2.1.2", "2.1.3", "2.2.1", "2.2.2", "2.2.3", "2.3.1", "2.3.2", "2.3.3"]
+3	1	1	["3.1.1"]
+3	1	2	["3.1.2"]
+3	1	3	["3.1.3"]
+3	1	NULL	["3.1.1", "3.1.2", "3.1.3"]
+3	2	1	["3.2.1"]
+3	2	2	["3.2.2"]
+3	2	3	["3.2.3"]
+3	2	NULL	["3.2.1", "3.2.2", "3.2.3"]
+3	3	1	["3.3.1"]
+3	3	2	["3.3.2"]
+3	3	3	["3.3.3"]
+3	3	NULL	["3.3.1", "3.3.2", "3.3.3"]
+3	NULL	NULL	["3.1.1", "3.1.2", "3.1.3", "3.2.1", "3.2.2", "3.2.3", "3.3.1", "3.3.2", "3.3.3"]
+NULL	NULL	NULL	["1.1.1", "1.1.2", "1.1.3", "1.2.1", "1.2.2", "1.2.3", "1.3.1", "1.3.2", "1.3.3", "2.1.1", "2.1.2", "2.1.3", "2.2.1", "2.2.2", "2.2.3", "2.3.1", "2.3.2", "2.3.3", "3.1.1", "3.1.2", "3.1.3", "3.2.1", "3.2.2", "3.2.3", "3.3.1", "3.3.2", "3.3.3"]
+SELECT g1, g2, g3, JSON_OBJECTAGG(k, b) FROM tg3 GROUP BY g1, g2, g3 with rollup;
+g1	g2	g3	JSON_OBJECTAGG(k, b)
+1	1	1	{"1": "1.1.1"}
+1	1	2	{"2": "1.1.2"}
+1	1	3	{"3": "1.1.3"}
+1	1	NULL	{"1": "1.1.1", "2": "1.1.2", "3": "1.1.3"}
+1	2	1	{"4": "1.2.1"}
+1	2	2	{"5": "1.2.2"}
+1	2	3	{"6": "1.2.3"}
+1	2	NULL	{"4": "1.2.1", "5": "1.2.2", "6": "1.2.3"}
+1	3	1	{"7": "1.3.1"}
+1	3	2	{"8": "1.3.2"}
+1	3	3	{"9": "1.3.3"}
+1	3	NULL	{"7": "1.3.1", "8": "1.3.2", "9": "1.3.3"}
+1	NULL	NULL	{"1": "1.1.1", "2": "1.1.2", "3": "1.1.3", "4": "1.2.1", "5": "1.2.2", "6": "1.2.3", "7": "1.3.1", "8": "1.3.2", "9": "1.3.3"}
+2	1	1	{"10": "2.1.1"}
+2	1	2	{"11": "2.1.2"}
+2	1	3	{"12": "2.1.3"}
+2	1	NULL	{"10": "2.1.1", "11": "2.1.2", "12": "2.1.3"}
+2	2	1	{"13": "2.2.1"}
+2	2	2	{"14": "2.2.2"}
+2	2	3	{"15": "2.2.3"}
+2	2	NULL	{"13": "2.2.1", "14": "2.2.2", "15": "2.2.3"}
+2	3	1	{"16": "2.3.1"}
+2	3	2	{"17": "2.3.2"}
+2	3	3	{"18": "2.3.3"}
+2	3	NULL	{"16": "2.3.1", "17": "2.3.2", "18": "2.3.3"}
+2	NULL	NULL	{"10": "2.1.1", "11": "2.1.2", "12": "2.1.3", "13": "2.2.1", "14": "2.2.2", "15": "2.2.3", "16": "2.3.1", "17": "2.3.2", "18": "2.3.3"}
+3	1	1	{"19": "3.1.1"}
+3	1	2	{"20": "3.1.2"}
+3	1	3	{"21": "3.1.3"}
+3	1	NULL	{"19": "3.1.1", "20": "3.1.2", "21": "3.1.3"}
+3	2	1	{"22": "3.2.1"}
+3	2	2	{"23": "3.2.2"}
+3	2	3	{"24": "3.2.3"}
+3	2	NULL	{"22": "3.2.1", "23": "3.2.2", "24": "3.2.3"}
+3	3	1	{"25": "3.3.1"}
+3	3	2	{"26": "3.3.2"}
+3	3	3	{"27": "3.3.3"}
+3	3	NULL	{"25": "3.3.1", "26": "3.3.2", "27": "3.3.3"}
+3	NULL	NULL	{"19": "3.1.1", "20": "3.1.2", "21": "3.1.3", "22": "3.2.1", "23": "3.2.2", "24": "3.2.3", "25": "3.3.1", "26": "3.3.2", "27": "3.3.3"}
+NULL	NULL	NULL	{"1": "1.1.1", "2": "1.1.2", "3": "1.1.3", "4": "1.2.1", "5": "1.2.2", "6": "1.2.3", "7": "1.3.1", "8": "1.3.2", "9": "1.3.3", "10": "2.1.1", "11": "2.1.2", "12": "2.1.3", "13": "2.2.1", "14": "2.2.2", "15": "2.2.3", "16": "2.3.1", "17": "2.3.2", "18": "2.3.3", "19": "3.1.1", "20": "3.1.2", "21": "3.1.3", "22": "3.2.1", "23": "3.2.2", "24": "3.2.3", "25": "3.3.1", "26": "3.3.2", "27": "3.3.3"}
+DROP TABLE tg;
+DROP TABLE tg3;
+#
+# Tests duplicates for JSON_OBJECTAGG
+#
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(1, 1, "1.1"),
+(1, 1, "1.2"),
+(1, 1, "1.3"),
+(2, 2, "2.1"),
+(2, 2, "2.2"),
+(2, 2, "2.3");
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "1.1"}
+2	{"2": "2.1"}
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["1.1", "1.2", "1.3"]
+2	["2.1", "2.2", "2.3"]
+DROP TABLE t1;
+#
+# Tests with ORDER BY, DISTINCT
+#
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(2, 8, "2.3"),
+(1, 7, "1.1"),
+(3, 6, "3.2"),
+(2, 5, "2.2"),
+(3, 9, "3.1"),
+(1, 4, "1.2"),
+(3, 3, "3.3"),
+(2, 2, "2.1"),
+(1, 1, "1.3");
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["1.1", "1.2", "1.3"]
+2	["2.3", "2.2", "2.1"]
+3	["3.2", "3.1", "3.3"]
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+a	JSON_ARRAYAGG(b)
+1	["1.1", "1.2", "1.3"]
+2	["2.3", "2.2", "2.1"]
+3	["3.2", "3.1", "3.3"]
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a ORDER BY a ASC;
+a	JSON_ARRAYAGG(b)
+1	["1.1", "1.2", "1.3"]
+2	["2.3", "2.2", "2.1"]
+3	["3.2", "3.1", "3.3"]
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a ORDER BY a DESC;
+a	JSON_ARRAYAGG(b)
+3	["3.2", "3.1", "3.3"]
+2	["2.3", "2.2", "2.1"]
+1	["1.1", "1.2", "1.3"]
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "1.3", "4": "1.2", "7": "1.1"}
+2	{"2": "2.1", "5": "2.2", "8": "2.3"}
+3	{"3": "3.3", "6": "3.2", "9": "3.1"}
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "1.3", "4": "1.2", "7": "1.1"}
+2	{"2": "2.1", "5": "2.2", "8": "2.3"}
+3	{"3": "3.3", "6": "3.2", "9": "3.1"}
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a ORDER BY a ASC;
+a	JSON_OBJECTAGG(k, b)
+1	{"1": "1.3", "4": "1.2", "7": "1.1"}
+2	{"2": "2.1", "5": "2.2", "8": "2.3"}
+3	{"3": "3.3", "6": "3.2", "9": "3.1"}
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a ORDER BY a DESC;
+a	JSON_OBJECTAGG(k, b)
+3	{"3": "3.3", "6": "3.2", "9": "3.1"}
+2	{"2": "2.1", "5": "2.2", "8": "2.3"}
+1	{"1": "1.3", "4": "1.2", "7": "1.1"}
+DROP TABLE t1;
+#
+# Tests with joins
+#
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, t1 INT, t2 INT);
+CREATE TABLE p(id INT PRIMARY KEY AUTO_INCREMENT, p1 INT, p2 INT);
+INSERT INTO t(t1, t2) VALUES (1, 1), (2, 1), (3,3), (1, 4);
+INSERT INTO p(p1, p2) VALUES (2, 1), (1, 1), (3,3), (2, 4);
+FLUSH STATUS;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT JSON_ARRAYAGG(t2) FROM t join p on t.t1=p.p1;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT t1, JSON_ARRAYAGG(t2) FROM t join p on t.t1=p.p1 group by t1;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+Variable_name	Value
+Handler_update	0
+SELECT (SELECT 1 AS foo ORDER BY JSON_ARRAYAGG(t2)) AS x FROM t;
+x
+1
+SELECT t1 FROM t ORDER BY (SELECT JSON_ARRAYAGG(t1) FROM t AS t2);
+t1
+1
+2
+3
+1
+SELECT JSON_ARRAYAGG(t1) FROM t
+ORDER BY (SELECT JSON_ARRAYAGG(t1) FROM t AS t2);
+JSON_ARRAYAGG(t1)
+[1, 2, 3, 1]
+SELECT (SELECT JSON_ARRAYAGG(t1_outer.t1) FROM t AS t1_inner LIMIT 1) as f
+FROM t AS t1_outer GROUP BY t1_outer.t2;
+f
+[1, 2]
+[3]
+[1]
+DROP TABLE t;
+DROP TABLE p;
+#
+# Tests with JSON
+#
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, k INT, j JSON);
+INSERT INTO t(k, j) VALUES
+(1, '[1,2,3,4]'),
+(2, '{"prop1": 1}'),
+(1, '[3]'),
+(2, '{"prop2": 2, "prop10": 10}'),
+(1, '[99]');
+SELECT k, JSON_ARRAYAGG(j) FROM t GROUP BY k;
+k	JSON_ARRAYAGG(j)
+1	[[1, 2, 3, 4], [3], [99]]
+2	[{"prop1": 1}, {"prop2": 2, "prop10": 10}]
+SELECT k, JSON_OBJECTAGG(id, j) FROM t GROUP BY k;
+k	JSON_OBJECTAGG(id, j)
+1	{"1": [1, 2, 3, 4], "3": [3], "5": [99]}
+2	{"2": {"prop1": 1}, "4": {"prop2": 2, "prop10": 10}}
+DROP TABLE t;
+#
+# Coverage tests for val_* functions
+#
+CREATE TABLE t2(gid int, a int);
+INSERT INTO t2(gid, a) VALUES (1, 1), (1, 2), (2, 4), (2, 8);
+SELECT gid, 1.0 * JSON_ARRAYAGG(a) FROM t2 GROUP BY gid;
+gid	1.0 * JSON_ARRAYAGG(a)
+1	0.0
+2	0.0
+Warnings:
+Warning	3156	Invalid JSON value for CAST to DOUBLE from column json_arrayagg( at row 3
+Warning	3156	Invalid JSON value for CAST to DOUBLE from column json_arrayagg( at row 5
+SELECT gid, 0x30 << JSON_ARRAYAGG(a) FROM t2 GROUP BY gid;
+gid	0x30 << JSON_ARRAYAGG(a)
+1	48
+2	48
+Warnings:
+Warning	3156	Invalid JSON value for CAST to INTEGER from column json_arrayagg( at row 3
+Warning	3156	Invalid JSON value for CAST to INTEGER from column json_arrayagg( at row 5
+SELECT gid, DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY)
+FROM t2 GROUP BY gid;
+gid	DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY)
+1	NULL
+2	NULL
+Warnings:
+Warning	3156	Invalid JSON value for CAST to DATE/TIME/DATETIME/TIMESTAMP from column json_arrayagg( at row 3
+Warning	3156	Invalid JSON value for CAST to DATE/TIME/DATETIME/TIMESTAMP from column json_arrayagg( at row 5
+SELECT gid, ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998')
+FROM t2 GROUP BY gid;
+gid	ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998')
+1	NULL
+2	NULL
+Warnings:
+Warning	3156	Invalid JSON value for CAST to DATE/TIME/DATETIME/TIMESTAMP from column json_arrayagg( at row 3
+Warning	3156	Invalid JSON value for CAST to DATE/TIME/DATETIME/TIMESTAMP from column json_arrayagg( at row 5
+SELECT gid, SEC_TO_TIME(JSON_ARRAYAGG(a)) FROM t2 GROUP BY gid;
+gid	SEC_TO_TIME(JSON_ARRAYAGG(a))
+1	00:00:00
+2	00:00:00
+Warnings:
+Warning	3156	Invalid JSON value for CAST to DECIMAL from column json_arrayagg( at row 3
+Warning	3156	Invalid JSON value for CAST to DECIMAL from column json_arrayagg( at row 5
+TRUNCATE TABLE t2;
+SELECT 1.0 * JSON_ARRAYAGG(a) FROM t2;
+1.0 * JSON_ARRAYAGG(a)
+NULL
+SELECT 0x30 << JSON_ARRAYAGG(a) FROM t2;
+0x30 << JSON_ARRAYAGG(a)
+NULL
+SELECT DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY) FROM t2;
+DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY)
+NULL
+SELECT ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998') FROM t2;
+ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998')
+NULL
+SELECT SEC_TO_TIME(JSON_ARRAYAGG(a)) FROM t2;
+SEC_TO_TIME(JSON_ARRAYAGG(a))
+NULL
+DROP TABLE t2;
diff --git a/mysql-test/suite/json/r/json_functions_innodb.result b/mysql-test/suite/json/r/json_functions_innodb.result
index f34733e058e6..c2fa1dd9edef 100644
--- a/mysql-test/suite/json/r/json_functions_innodb.result
+++ b/mysql-test/suite/json/r/json_functions_innodb.result
@@ -4714,9 +4714,11 @@ INSERT INTO json_merge_t VALUES
 (3, '[1,2]'),
 (4, '{"a":["x", "y"]}'),
 (5, '{"a":"b","c":"d"}');
-SELECT t1.j, t2.j, json_merge(t1.j, t2.j), json_merge(t2.j, t1.j)
+SELECT t1.j, t2.j,
+JSON_MERGE_PRESERVE(t1.j, t2.j) AS m1,
+JSON_MERGE_PRESERVE(t2.j, t1.j) AS m2
 FROM json_merge_t t1, json_merge_t t2 ORDER BY t1.i, t2.i;
-j	j	json_merge(t1.j, t2.j)	json_merge(t2.j, t1.j)
+j	j	m1	m2
 NULL	NULL	NULL	NULL
 NULL	true	NULL	NULL
 NULL	5	NULL	NULL
@@ -5523,10 +5525,10 @@ json_type(ifnull(cast(3 as json), NULL))
 INTEGER
 SELECT JSON_TYPE(IFNULL(JSON_EXTRACT(CONCAT(t1.j, 'abc'), '$'), t2.j))
 FROM t t1, t t2;
-ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "The document root must not follow by other values." at position 9.
+ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "The document root must not be followed by other values." at position 9.
 SELECT JSON_TYPE(IFNULL(t1.j, JSON_EXTRACT(CONCAT(t2.j, 'abc'), '$')))
 FROM t t1, t t2;
-ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "The document root must not follow by other values." at position 9.
+ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "The document root must not be followed by other values." at position 9.
 # ----------------------------------------------------------------------
 # Json values used in text contexts
 # ----------------------------------------------------------------------
@@ -5801,7 +5803,7 @@ out out_value json
 )
 language sql deterministic contains sql
 begin
-set out_value = json_merge( in_value, inout_value );
+set out_value = json_merge_preserve(in_value, inout_value);
 set inout_value = in_value;
 end//
 create procedure merge_doc_types
@@ -6463,7 +6465,7 @@ JSON_ARRAY_APPEND(j, '$', 2),
 JSON_SET(j, '$[0]', 2),
 JSON_INSERT(j, '$[0]', 2),
 JSON_REPLACE(j, '$[0]', 2),
-JSON_MERGE(j, j),
+JSON_MERGE_PRESERVE(j, j),
 JSON_SEARCH(j, 'one', 'abc'),
 JSON_CONTAINS(j, '[1]'),
 JSON_CONTAINS_PATH(j, 'all', '$.a'),
@@ -6472,16 +6474,22 @@ JSON_DEPTH(j),
 JSON_ARRAY(j, j),
 JSON_OBJECT('k', j),
 JSON_UNQUOTE(CAST(j AS CHAR)),
-JSON_QUOTE(CAST(j AS CHAR))
+JSON_QUOTE(CAST(j AS CHAR)),
+JSON_PRETTY(j),
+JSON_STORAGE_SIZE(j)
 FROM T_WITH_NULLS
 ORDER BY i;
-JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	[[1], [1]]	{"k": [1]}	[1]	"[1]"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	[{"a": "b"}, {"a": "b"}]	{"k": {"a": "b"}}	{"a": "b"}	"{\"a\": \"b\"}"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["abc", "abc"]	{"k": "abc"}	abc	"\"abc\""
+JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE_PRESERVE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))	JSON_PRETTY(j)	JSON_STORAGE_SIZE(j)
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	[[1], [1]]	{"k": [1]}	[1]	"[1]"	[
+  1
+]	8
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	[{"a": "b"}, {"a": "b"}]	{"k": {"a": "b"}}	{"a": "b"}	"{\"a\": \"b\"}"	{
+  "a": "b"
+}	15
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["abc", "abc"]	{"k": "abc"}	abc	"\"abc\""	"abc"	5
 ALTER TABLE T_WITH_NULLS MODIFY COLUMN j TEXT;
 SELECT
 JSON_VALID(j),
@@ -6493,7 +6501,7 @@ JSON_ARRAY_APPEND(j, '$', 2),
 JSON_SET(j, '$[0]', 2),
 JSON_INSERT(j, '$[0]', 2),
 JSON_REPLACE(j, '$[0]', 2),
-JSON_MERGE(j, j),
+JSON_MERGE_PRESERVE(j, j),
 JSON_SEARCH(j, 'one', 'abc'),
 JSON_CONTAINS(j, '[1]'),
 JSON_CONTAINS_PATH(j, 'all', '$.a'),
@@ -6502,16 +6510,22 @@ JSON_DEPTH(j),
 JSON_ARRAY(j, j),
 JSON_OBJECT('k', j),
 JSON_UNQUOTE(CAST(j AS CHAR)),
-JSON_QUOTE(CAST(j AS CHAR))
+JSON_QUOTE(CAST(j AS CHAR)),
+JSON_PRETTY(j),
+JSON_STORAGE_SIZE(j)
 FROM T_WITH_NULLS
 ORDER BY i;
-JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	["[1]", "[1]"]	{"k": "[1]"}	[1]	"[1]"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	["{\"a\": \"b\"}", "{\"a\": \"b\"}"]	{"k": "{\"a\": \"b\"}"}	{"a": "b"}	"{\"a\": \"b\"}"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["\"abc\"", "\"abc\""]	{"k": "\"abc\""}	abc	"\"abc\""
+JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE_PRESERVE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))	JSON_PRETTY(j)	JSON_STORAGE_SIZE(j)
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	["[1]", "[1]"]	{"k": "[1]"}	[1]	"[1]"	[
+  1
+]	8
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	["{\"a\": \"b\"}", "{\"a\": \"b\"}"]	{"k": "{\"a\": \"b\"}"}	{"a": "b"}	"{\"a\": \"b\"}"	{
+  "a": "b"
+}	15
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["\"abc\"", "\"abc\""]	{"k": "\"abc\""}	abc	"\"abc\""	"abc"	5
 DROP TABLE T_WITH_NULLS;
 CREATE TABLE t_latin1(id INT PRIMARY KEY AUTO_INCREMENT,
 json_text VARCHAR(20),
@@ -6573,8 +6587,8 @@ FROM t_latin1 ORDER BY id;
 JSON_REPLACE(json_text, json_path, json_atom_text)
 ["åøæ"]
 {"æøå": "åøæ"}
-SELECT JSON_MERGE(json_text, json_text) FROM t_latin1 ORDER BY id;
-JSON_MERGE(json_text, json_text)
+SELECT JSON_MERGE_PRESERVE(json_text, json_text) FROM t_latin1 ORDER BY id;
+JSON_MERGE_PRESERVE(json_text, json_text)
 ["æøå", "æøå"]
 {"æøå": ["æøå", "æøå"]}
 SELECT JSON_SEARCH(json_text, CONVERT('one' USING latin1), json_atom_text,
@@ -8840,8 +8854,8 @@ drop table t1;
 #
 CREATE TABLE t (doc json);
 INSERT INTO t VALUES('{"array":[1,2,3,4]}');
-UPDATE t SET doc=JSON_MERGE(doc,doc);
-UPDATE t SET doc=JSON_MERGE(doc,doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
 drop table t;
 #
 # Bug#21224267 DEEPLY NESTED JSON OBJECTS MAY CAUSE CRASH
@@ -9034,7 +9048,7 @@ SET NAMES latin1;
 CREATE TABLE t (j JSON);
 INSERT INTO t VALUES ('{}');
 UPDATE t SET j='1', j='1111-11-11', j=('1' NOT BETWEEN j AND '1');
-ERROR 22032: Invalid JSON text: "The document root must not follow by other values." at position 4 in value for column 't.j'.
+ERROR 22032: Invalid JSON text: "The document root must not be followed by other values." at position 4 in value for column 't.j'.
 SELECT * FROM t;
 j
 {}
@@ -9488,3 +9502,566 @@ j
 {"a": "b"}
 {"a": "b"}
 DROP TABLE t;
+# Bug#22522073: Assertion failed: !thd->is_error() in optimize_cond()
+CREATE TABLE s(a INTEGER, b CHAR(1));
+INSERT INTO s VALUES (1,0), (1,0), (1,0);
+CREATE TABLE t(c JSON);
+INSERT INTO t VALUES (), (), ();
+SELECT 1
+FROM s WHERE a NOT IN (SELECT 1
+FROM s WHERE (SELECT c FROM t) = b);
+ERROR 21000: Subquery returns more than 1 row
+DROP TABLE s, t;
+#
+# WL#9191: JSON_PRETTY function
+#
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT,
+uc VARCHAR(128) CHARACTER SET utf8mb4,
+lc VARCHAR(128) CHARACTER SET latin1,
+j JSON);
+INSERT INTO t(uc) VALUES
+(NULL),
+('{}'),
+('[]'),
+('[1,2,3]'),
+('{"a":1,"b":2}'),
+('{"a":[1,{}],"b":[]}'),
+('{"a":{"b":{"c":{"d":{"e":{"f":null}}}}}}'),
+('true'),
+('false'),
+('null'),
+('1'),
+('1.1'),
+('"hello"'),
+(JSON_ARRAY('abc
+def', '"abc"'));
+UPDATE t SET lc = uc, j = uc;
+SELECT JSON_PRETTY(uc) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT JSON_PRETTY(lc) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT JSON_PRETTY(j) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT DISTINCT CHARSET(JSON_PRETTY(uc)) AS c1,
+CHARSET(JSON_PRETTY(lc)) AS c2,
+CHARSET(JSON_PRETTY(j)) AS c3 FROM t;
+c1	c2	c3
+utf8mb4	utf8mb4	utf8mb4
+DROP TABLE t;
+SELECT JSON_PRETTY('this is not JSON') AS j;
+ERROR 22032: Invalid JSON text in argument 1 to function json_pretty: "Invalid value." at position 1.
+SELECT JSON_PRETTY();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_PRETTY'
+SELECT JSON_PRETTY('{}', 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_PRETTY'
+#
+# WL#9192: Add JSON_STORAGE_SIZE / JSON_STORAGE_FREE functions
+#
+SELECT JSON_STORAGE_SIZE();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_STORAGE_SIZE'
+SELECT JSON_STORAGE_SIZE('{}', '[]');
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_STORAGE_SIZE'
+SELECT JSON_STORAGE_SIZE('this is not JSON') AS j;
+ERROR 22032: Invalid JSON text in argument 1 to function json_storage_size: "Invalid value." at position 1.
+SELECT JSON_STORAGE_SIZE(NULL);
+JSON_STORAGE_SIZE(NULL)
+NULL
+SELECT JSON_STORAGE_SIZE(JSON_ARRAY(1,2,3));
+JSON_STORAGE_SIZE(JSON_ARRAY(1,2,3))
+14
+CREATE TABLE t(id INT PRIMARY KEY, j JSON, v VARCHAR(100));
+INSERT INTO t(id, j) VALUES (0, NULL), (1, '[["abc", "def", "ghi", "jkl"]]');
+UPDATE t SET v = j;
+SELECT *,
+JSON_STORAGE_SIZE(j), JSON_STORAGE_SIZE(v),
+JSON_STORAGE_SIZE(j->'$[0]'), JSON_STORAGE_SIZE(v->'$[0]')
+FROM t ORDER BY id;
+id	j	v	JSON_STORAGE_SIZE(j)	JSON_STORAGE_SIZE(v)	JSON_STORAGE_SIZE(j->'$[0]')	JSON_STORAGE_SIZE(v->'$[0]')
+0	NULL	NULL	NULL	NULL	NULL	NULL
+1	[["abc", "def", "ghi", "jkl"]]	[["abc", "def", "ghi", "jkl"]]	40	40	33	33
+UPDATE t SET j = JSON_SET(j, '$[0][1]', NULL, '$[0][3]', 'X'),
+v = JSON_SET(v, '$[0][1]', NULL, '$[0][3]', 'X');
+SELECT *,
+JSON_STORAGE_SIZE(j), JSON_STORAGE_SIZE(v),
+JSON_STORAGE_SIZE(j->'$[0]'), JSON_STORAGE_SIZE(v->'$[0]')
+FROM t ORDER BY id;
+id	j	v	JSON_STORAGE_SIZE(j)	JSON_STORAGE_SIZE(v)	JSON_STORAGE_SIZE(j->'$[0]')	JSON_STORAGE_SIZE(v->'$[0]')
+0	NULL	NULL	NULL	NULL	NULL	NULL
+1	[["abc", null, "ghi", "X"]]	[["abc", null, "ghi", "X"]]	34	34	27	27
+DROP TABLE t;
+#
+# Get some extra coverage for partial update of JSON, WL#8963.
+# Partial update will not happen in MySQL 5.7, since WL#8963 has not
+# been backported. The test cases are kept in order to exercise
+# the JSON_STORAGE_SIZE function.
+#
+CREATE TABLE t(id INT PRIMARY KEY, j JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a"}'), (2, '{"a":"b", "b":"b"}'), (3, '{"a":"c", "c":"c"}');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "a"}	15
+2	{"a": "b", "b": "b"}	25
+3	{"a": "c", "c": "c"}	25
+UPDATE t SET j = JSON_SET(j, '$.a', 'x');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "x"}	15
+2	{"a": "x", "b": "b"}	25
+3	{"a": "x", "c": "c"}	25
+UPDATE t SET j = JSON_SET(j, '$.a', 'y', '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "y", "b": "x"}	25
+2	{"a": "y", "b": "x"}	25
+3	{"a": "y", "b": "x", "c": "c"}	35
+UPDATE t SET j = JSON_SET(j, '$.a', 'z'), j = JSON_SET(j, '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "z", "b": "z"}	25
+2	{"a": "z", "b": "z"}	25
+3	{"a": "z", "b": "z", "c": "c"}	35
+UPDATE t SET j = JSON_SET(j, '$.a', 'w'),
+j = JSON_SET(j, '$.a', 'v', '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "v", "b": "w"}	25
+2	{"a": "v", "b": "w"}	25
+3	{"a": "v", "b": "w", "c": "c"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '1', '$.c', '2', '$.a', '3');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "3", "b": "w"}	25
+2	{"a": "3", "b": "w"}	25
+3	{"a": "3", "b": "w", "c": "2"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '4'), j = JSON_REPLACE(j, '$.c', '5'),
+j = JSON_REPLACE(j, '$.a', '6');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "6", "b": "w"}	25
+2	{"a": "6", "b": "w"}	25
+3	{"a": "6", "b": "w", "c": "5"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "", "b": "w"}	24
+2	{"a": "", "b": "w"}	24
+3	{"a": "", "b": "w", "c": "5"}	34
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "a", "b": "w"}	25
+2	{"a": "a", "b": "w"}	25
+3	{"a": "a", "b": "w", "c": "5"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'ab');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "ab", "b": "w"}	26
+2	{"a": "ab", "b": "w"}	26
+3	{"a": "ab", "b": "w", "c": "5"}	36
+DROP TABLE t;
+CREATE TABLE t(id INT PRIMARY KEY, j1 JSON, j2 JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}'),
+(2, NULL, NULL),
+(3, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "a", "b": "b"}	{"a": "a", "b": "b"}	25	25
+2	NULL	NULL	NULL	NULL
+3	{"a": "a", "b": "b"}	{"a": "a", "b": "b"}	25	25
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 'x'),
+j2 = JSON_SET(j2, '$.a', 'y'),
+j1 = JSON_SET(j1, '$.b', 'z');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "x", "b": "z"}	{"a": "y", "b": "b"}	25	25
+2	NULL	NULL	NULL	NULL
+3	{"a": "x", "b": "z"}	{"a": "y", "b": "b"}	25	25
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 's'),
+j2 = JSON_SET(j2, '$.a', 'abcdefghi'),
+j1 = JSON_SET(j1, '$.b', 't');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "t"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "t"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_SET(j1, '$.x.y.z', 'abc', '$.b', 'X');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "X"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "X"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_REPLACE(j1, '$.x', 'abc', '$.b', 'Y');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "Y"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "Y"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_SET(j1, '$.x', 'abc', '$.b', 'Z');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "Z", "x": "abc"}	{"a": "abcdefghi", "b": "b"}	37	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "Z", "x": "abc"}	{"a": "abcdefghi", "b": "b"}	37	33
+DROP TABLE t;
+CREATE TABLE t(j JSON,
+i INT DEFAULT 42,
+db DOUBLE DEFAULT 2.34e-10,
+dc DECIMAL(5, 3) DEFAULT 98.765,
+ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+gc JSON GENERATED ALWAYS AS (JSON_ARRAY(i, db, dc, ts)))
+ENGINE=InnoDB;
+INSERT INTO t(j, ts) VALUES
+('[null, "abc", true, "def", false]', '2017-01-02 14:15:16');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "abc", true, "def", false]	ARRAY	28
+UPDATE t SET j = JSON_SET(j, '$[1]', 'xy', '$[3]', 'xyzw');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "xy", true, "xyzw", false]	ARRAY	28
+UPDATE t SET j = JSON_SET(j, '$[1]', 'a');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "a", true, "xyzw", false]	ARRAY	27
+UPDATE t SET j = JSON_SET(j, '$[3]', 'abcde');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "a", true, "abcde", false]	ARRAY	28
+UPDATE t SET j = JSON_ARRAY('abcdefghijklmnopqrstuvwxyz');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["abcdefghijklmnopqrstuvwxyz"]	ARRAY	35
+UPDATE t SET j = JSON_SET(j, '$[0]', 3.14e0);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[3.14]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(10000000000 AS UNSIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[10000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(4000000000 AS SIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[4000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(123 AS UNSIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[123]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(456 AS SIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[456]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', -123);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[-123]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', -4000000000);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[-4000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', TRUE);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[true]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', NULL);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('abc' AS BINARY));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["base64:type253:YWJj"]	ARRAY	13
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-23 13:16:40' AS DATETIME));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2016-12-23 13:16:40.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-24' AS DATE));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2016-12-24"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('14:17:41' AS TIME));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["14:17:41.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', 1.23);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[1.23]	ARRAY	14
+UPDATE t SET j = JSON_SET(j, '$[0]', i);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[42]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', db);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[0.000000000234]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', dc);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[98.765]	ARRAY	15
+UPDATE t SET j = JSON_SET(j, '$[0]', ts);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2017-01-02 14:15:16.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[0]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[42]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[1]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[0.000000000234]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[2]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[98.765]	ARRAY	15
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[3]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2017-01-02 14:15:16.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[4]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null]	ARRAY	8
+DROP TABLE t;
+CREATE TABLE t1(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t1 VALUES (1, '{"a":11}', 1), (2, '{"a":22}', 2);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 11}	1	13
+2	{"a": 22}	2	13
+CREATE TABLE t2(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t2 VALUES (1, '{"b":33}', 3), (2, '{"b":44}', 4);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 33}	3	13
+2	{"b": 44}	4	13
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.j->'$.b') WHERE t1.id = t2.id;
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 33}	1	13
+2	{"a": 44}	2	13
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 33}	3	13
+2	{"b": 44}	4	13
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.x),
+t2.j = JSON_SET(t2.j, '$.b', t1.x)
+WHERE t1.id = t2.id;
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 3}	1	13
+2	{"a": 4}	2	13
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 1}	3	13
+2	{"b": 2}	4	13
+UPDATE t1, t2 SET t1.j = '[123]', t2.j = JSON_SET(t2.j, '$.b', 99);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	[123]	1	8
+2	[123]	2	8
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 99}	3	13
+2	{"b": 99}	4	13
+DROP TABLE t1, t2;
+#
+# WL#9692: Add JSON_MERGE_PATCH
+#
+CREATE TABLE merge_t(
+id INT PRIMARY KEY AUTO_INCREMENT,
+target VARCHAR(100), patch VARCHAR(100)
+);
+INSERT INTO merge_t(target, patch) VALUES
+('{"a":"b"}', '{"a":"c"}'),
+('{"a":"b"}', '{"b":"c"}'),
+('{"a":"b"}', '{"a":null}'),
+('{"a":"b", "b":"c"}', '{"a":null}'),
+('{"a":["b"]}', '{"a":"c"}'),
+('{"a":"c"}', '{"a":["b"]}'),
+('{"a": {"b":"c"}}', '{"a": {"b":"d", "c":null}}'),
+('{"a":[{"b":"c"}]}', '{"a": [1]}'),
+('["a","b"]', '["c","d"]'),
+('{"a":"b"}', '["c"]'),
+('{"a":"foo"}', 'null'),
+('{"a":"foo"}', '"bar"'),
+('{"e":null}', '{"a":1}'),
+('[1,2]', '{"a":"b", "c":null}'),
+('{}', '{"a":{"bb":{"ccc":null}}}'),
+(NULL, '{}'),
+('{}', NULL);
+SELECT id, target, patch,
+JSON_MERGE_PATCH(target, patch) AS merged,
+JSON_EXTRACT(JSON_MERGE_PATCH(target, patch), '$.a') AS a
+FROM merge_t ORDER BY id;
+id	target	patch	merged	a
+1	{"a":"b"}	{"a":"c"}	{"a": "c"}	"c"
+2	{"a":"b"}	{"b":"c"}	{"a": "b", "b": "c"}	"b"
+3	{"a":"b"}	{"a":null}	{}	NULL
+4	{"a":"b", "b":"c"}	{"a":null}	{"b": "c"}	NULL
+5	{"a":["b"]}	{"a":"c"}	{"a": "c"}	"c"
+6	{"a":"c"}	{"a":["b"]}	{"a": ["b"]}	["b"]
+7	{"a": {"b":"c"}}	{"a": {"b":"d", "c":null}}	{"a": {"b": "d"}}	{"b": "d"}
+8	{"a":[{"b":"c"}]}	{"a": [1]}	{"a": [1]}	[1]
+9	["a","b"]	["c","d"]	["c", "d"]	NULL
+10	{"a":"b"}	["c"]	["c"]	NULL
+11	{"a":"foo"}	null	null	NULL
+12	{"a":"foo"}	"bar"	"bar"	NULL
+13	{"e":null}	{"a":1}	{"a": 1, "e": null}	1
+14	[1,2]	{"a":"b", "c":null}	{"a": "b"}	"b"
+15	{}	{"a":{"bb":{"ccc":null}}}	{"a": {"bb": {}}}	{"bb": {}}
+16	NULL	{}	NULL	NULL
+17	{}	NULL	NULL	NULL
+DROP TABLE merge_t;
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '{"c":"d"}');
+JSON_MERGE_PATCH('{"a":"b"}', NULL, '{"c":"d"}')
+NULL
+SELECT JSON_MERGE_PATCH(NULL, '[1,2,3]');
+JSON_MERGE_PATCH(NULL, '[1,2,3]')
+[1, 2, 3]
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '[1,2,3]', '{"c":null,"d":"e"}');
+JSON_MERGE_PATCH('{"a":"b"}', NULL, '[1,2,3]', '{"c":null,"d":"e"}')
+{"d": "e"}
+SELECT JSON_MERGE_PATCH();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PATCH'
+SELECT JSON_MERGE_PATCH('{}');
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PATCH'
+SELECT JSON_MERGE_PATCH('{', '[1,2,3]');
+ERROR 22032: Invalid JSON text in argument 1 to function json_merge_patch: "Missing a name for object member." at position 1.
+SELECT JSON_MERGE_PATCH('{"a":"b"}', '[1,');
+ERROR 22032: Invalid JSON text in argument 2 to function json_merge_patch: "Invalid value." at position 3.
diff --git a/mysql-test/suite/json/r/json_functions_ndb.result b/mysql-test/suite/json/r/json_functions_ndb.result
index 9c580899085c..14ff3019aa2a 100644
--- a/mysql-test/suite/json/r/json_functions_ndb.result
+++ b/mysql-test/suite/json/r/json_functions_ndb.result
@@ -4734,9 +4734,11 @@ INSERT INTO json_merge_t VALUES
 (3, '[1,2]'),
 (4, '{"a":["x", "y"]}'),
 (5, '{"a":"b","c":"d"}');
-SELECT t1.j, t2.j, json_merge(t1.j, t2.j), json_merge(t2.j, t1.j)
+SELECT t1.j, t2.j,
+JSON_MERGE_PRESERVE(t1.j, t2.j) AS m1,
+JSON_MERGE_PRESERVE(t2.j, t1.j) AS m2
 FROM json_merge_t t1, json_merge_t t2 ORDER BY t1.i, t2.i;
-j	j	json_merge(t1.j, t2.j)	json_merge(t2.j, t1.j)
+j	j	m1	m2
 NULL	NULL	NULL	NULL
 NULL	true	NULL	NULL
 NULL	5	NULL	NULL
@@ -5857,7 +5859,7 @@ out out_value json
 )
 language sql deterministic contains sql
 begin
-set out_value = json_merge( in_value, inout_value );
+set out_value = json_merge_preserve(in_value, inout_value);
 set inout_value = in_value;
 end//
 create procedure merge_doc_types
@@ -6539,7 +6541,7 @@ JSON_ARRAY_APPEND(j, '$', 2),
 JSON_SET(j, '$[0]', 2),
 JSON_INSERT(j, '$[0]', 2),
 JSON_REPLACE(j, '$[0]', 2),
-JSON_MERGE(j, j),
+JSON_MERGE_PRESERVE(j, j),
 JSON_SEARCH(j, 'one', 'abc'),
 JSON_CONTAINS(j, '[1]'),
 JSON_CONTAINS_PATH(j, 'all', '$.a'),
@@ -6548,16 +6550,22 @@ JSON_DEPTH(j),
 JSON_ARRAY(j, j),
 JSON_OBJECT('k', j),
 JSON_UNQUOTE(CAST(j AS CHAR)),
-JSON_QUOTE(CAST(j AS CHAR))
+JSON_QUOTE(CAST(j AS CHAR)),
+JSON_PRETTY(j),
+JSON_STORAGE_SIZE(j)
 FROM T_WITH_NULLS
 ORDER BY i;
-JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	[[1], [1]]	{"k": [1]}	[1]	"[1]"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	[{"a": "b"}, {"a": "b"}]	{"k": {"a": "b"}}	{"a": "b"}	"{\"a\": \"b\"}"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["abc", "abc"]	{"k": "abc"}	abc	"\"abc\""
+JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE_PRESERVE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))	JSON_PRETTY(j)	JSON_STORAGE_SIZE(j)
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	[[1], [1]]	{"k": [1]}	[1]	"[1]"	[
+  1
+]	8
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	[{"a": "b"}, {"a": "b"}]	{"k": {"a": "b"}}	{"a": "b"}	"{\"a\": \"b\"}"	{
+  "a": "b"
+}	15
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["abc", "abc"]	{"k": "abc"}	abc	"\"abc\""	"abc"	5
 ALTER TABLE T_WITH_NULLS MODIFY COLUMN j TEXT;
 Warnings:
 Warning	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
@@ -6571,7 +6579,7 @@ JSON_ARRAY_APPEND(j, '$', 2),
 JSON_SET(j, '$[0]', 2),
 JSON_INSERT(j, '$[0]', 2),
 JSON_REPLACE(j, '$[0]', 2),
-JSON_MERGE(j, j),
+JSON_MERGE_PRESERVE(j, j),
 JSON_SEARCH(j, 'one', 'abc'),
 JSON_CONTAINS(j, '[1]'),
 JSON_CONTAINS_PATH(j, 'all', '$.a'),
@@ -6580,16 +6588,22 @@ JSON_DEPTH(j),
 JSON_ARRAY(j, j),
 JSON_OBJECT('k', j),
 JSON_UNQUOTE(CAST(j AS CHAR)),
-JSON_QUOTE(CAST(j AS CHAR))
+JSON_QUOTE(CAST(j AS CHAR)),
+JSON_PRETTY(j),
+JSON_STORAGE_SIZE(j)
 FROM T_WITH_NULLS
 ORDER BY i;
-JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	["[1]", "[1]"]	{"k": "[1]"}	[1]	"[1]"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	["{\"a\": \"b\"}", "{\"a\": \"b\"}"]	{"k": "{\"a\": \"b\"}"}	{"a": "b"}	"{\"a\": \"b\"}"
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL
-1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["\"abc\"", "\"abc\""]	{"k": "\"abc\""}	abc	"\"abc\""
+JSON_VALID(j)	JSON_TYPE(j)	JSON_KEYS(j)	JSON_EXTRACT(j, '$')	JSON_REMOVE(j, '$.a.b.c')	JSON_ARRAY_APPEND(j, '$', 2)	JSON_SET(j, '$[0]', 2)	JSON_INSERT(j, '$[0]', 2)	JSON_REPLACE(j, '$[0]', 2)	JSON_MERGE_PRESERVE(j, j)	JSON_SEARCH(j, 'one', 'abc')	JSON_CONTAINS(j, '[1]')	JSON_CONTAINS_PATH(j, 'all', '$.a')	JSON_LENGTH(j)	JSON_DEPTH(j)	JSON_ARRAY(j, j)	JSON_OBJECT('k', j)	JSON_UNQUOTE(CAST(j AS CHAR))	JSON_QUOTE(CAST(j AS CHAR))	JSON_PRETTY(j)	JSON_STORAGE_SIZE(j)
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	ARRAY	NULL	[1]	[1]	[1, 2]	[2]	[1]	[2]	[1, 1]	NULL	1	0	1	2	["[1]", "[1]"]	{"k": "[1]"}	[1]	"[1]"	[
+  1
+]	8
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	OBJECT	["a"]	{"a": "b"}	{"a": "b"}	[{"a": "b"}, 2]	2	{"a": "b"}	2	{"a": ["b", "b"]}	NULL	0	1	1	2	["{\"a\": \"b\"}", "{\"a\": \"b\"}"]	{"k": "{\"a\": \"b\"}"}	{"a": "b"}	"{\"a\": \"b\"}"	{
+  "a": "b"
+}	15
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	[null, null]	{"k": null}	NULL	NULL	NULL	NULL
+1	STRING	NULL	"abc"	"abc"	["abc", 2]	2	"abc"	2	["abc", "abc"]	"$"	0	0	1	1	["\"abc\"", "\"abc\""]	{"k": "\"abc\""}	abc	"\"abc\""	"abc"	5
 DROP TABLE T_WITH_NULLS;
 CREATE TABLE t_latin1(id INT PRIMARY KEY AUTO_INCREMENT,
 json_text VARCHAR(20),
@@ -6651,8 +6665,8 @@ FROM t_latin1 ORDER BY id;
 JSON_REPLACE(json_text, json_path, json_atom_text)
 ["åøæ"]
 {"æøå": "åøæ"}
-SELECT JSON_MERGE(json_text, json_text) FROM t_latin1 ORDER BY id;
-JSON_MERGE(json_text, json_text)
+SELECT JSON_MERGE_PRESERVE(json_text, json_text) FROM t_latin1 ORDER BY id;
+JSON_MERGE_PRESERVE(json_text, json_text)
 ["æøå", "æøå"]
 {"æøå": ["æøå", "æøå"]}
 SELECT JSON_SEARCH(json_text, CONVERT('one' USING latin1), json_atom_text,
@@ -8981,8 +8995,8 @@ CREATE TABLE t (doc json);
 Warnings:
 Warning	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 INSERT INTO t VALUES('{"array":[1,2,3,4]}');
-UPDATE t SET doc=JSON_MERGE(doc,doc);
-UPDATE t SET doc=JSON_MERGE(doc,doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
+UPDATE t SET doc=JSON_MERGE_PRESERVE(doc, doc);
 drop table t;
 #
 # Bug#21224267 DEEPLY NESTED JSON OBJECTS MAY CAUSE CRASH
@@ -9651,3 +9665,568 @@ j
 {"a": "b"}
 {"a": "b"}
 DROP TABLE t;
+# Bug#22522073: Assertion failed: !thd->is_error() in optimize_cond()
+CREATE TABLE s(a INTEGER, b CHAR(1));
+INSERT INTO s VALUES (1,0), (1,0), (1,0);
+CREATE TABLE t(c JSON);
+Warnings:
+Warning	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+INSERT INTO t VALUES (), (), ();
+SELECT 1
+FROM s WHERE a NOT IN (SELECT 1
+FROM s WHERE (SELECT c FROM t) = b);
+ERROR 21000: Subquery returns more than 1 row
+DROP TABLE s, t;
+#
+# WL#9191: JSON_PRETTY function
+#
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT,
+uc VARCHAR(128) CHARACTER SET utf8mb4,
+lc VARCHAR(128) CHARACTER SET latin1,
+j JSON);
+INSERT INTO t(uc) VALUES
+(NULL),
+('{}'),
+('[]'),
+('[1,2,3]'),
+('{"a":1,"b":2}'),
+('{"a":[1,{}],"b":[]}'),
+('{"a":{"b":{"c":{"d":{"e":{"f":null}}}}}}'),
+('true'),
+('false'),
+('null'),
+('1'),
+('1.1'),
+('"hello"'),
+(JSON_ARRAY('abc
+def', '"abc"'));
+UPDATE t SET lc = uc, j = uc;
+SELECT JSON_PRETTY(uc) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT JSON_PRETTY(lc) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT JSON_PRETTY(j) AS c1 FROM t ORDER BY id;
+c1
+NULL
+{}
+[]
+[
+  1,
+  2,
+  3
+]
+{
+  "a": 1,
+  "b": 2
+}
+{
+  "a": [
+    1,
+    {}
+  ],
+  "b": []
+}
+{
+  "a": {
+    "b": {
+      "c": {
+        "d": {
+          "e": {
+            "f": null
+          }
+        }
+      }
+    }
+  }
+}
+true
+false
+null
+1
+1.1
+"hello"
+[
+  "abc\ndef",
+  "\"abc\""
+]
+SELECT DISTINCT CHARSET(JSON_PRETTY(uc)) AS c1,
+CHARSET(JSON_PRETTY(lc)) AS c2,
+CHARSET(JSON_PRETTY(j)) AS c3 FROM t;
+c1	c2	c3
+utf8mb4	utf8mb4	utf8mb4
+DROP TABLE t;
+SELECT JSON_PRETTY('this is not JSON') AS j;
+ERROR 22032: Invalid JSON text in argument 1 to function json_pretty: "Invalid value." at position 1.
+SELECT JSON_PRETTY();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_PRETTY'
+SELECT JSON_PRETTY('{}', 2);
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_PRETTY'
+#
+# WL#9192: Add JSON_STORAGE_SIZE / JSON_STORAGE_FREE functions
+#
+SELECT JSON_STORAGE_SIZE();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_STORAGE_SIZE'
+SELECT JSON_STORAGE_SIZE('{}', '[]');
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_STORAGE_SIZE'
+SELECT JSON_STORAGE_SIZE('this is not JSON') AS j;
+ERROR 22032: Invalid JSON text in argument 1 to function json_storage_size: "Invalid value." at position 1.
+SELECT JSON_STORAGE_SIZE(NULL);
+JSON_STORAGE_SIZE(NULL)
+NULL
+SELECT JSON_STORAGE_SIZE(JSON_ARRAY(1,2,3));
+JSON_STORAGE_SIZE(JSON_ARRAY(1,2,3))
+14
+CREATE TABLE t(id INT PRIMARY KEY, j JSON, v VARCHAR(100));
+INSERT INTO t(id, j) VALUES (0, NULL), (1, '[["abc", "def", "ghi", "jkl"]]');
+UPDATE t SET v = j;
+SELECT *,
+JSON_STORAGE_SIZE(j), JSON_STORAGE_SIZE(v),
+JSON_STORAGE_SIZE(j->'$[0]'), JSON_STORAGE_SIZE(v->'$[0]')
+FROM t ORDER BY id;
+id	j	v	JSON_STORAGE_SIZE(j)	JSON_STORAGE_SIZE(v)	JSON_STORAGE_SIZE(j->'$[0]')	JSON_STORAGE_SIZE(v->'$[0]')
+0	NULL	NULL	NULL	NULL	NULL	NULL
+1	[["abc", "def", "ghi", "jkl"]]	[["abc", "def", "ghi", "jkl"]]	40	40	33	33
+UPDATE t SET j = JSON_SET(j, '$[0][1]', NULL, '$[0][3]', 'X'),
+v = JSON_SET(v, '$[0][1]', NULL, '$[0][3]', 'X');
+SELECT *,
+JSON_STORAGE_SIZE(j), JSON_STORAGE_SIZE(v),
+JSON_STORAGE_SIZE(j->'$[0]'), JSON_STORAGE_SIZE(v->'$[0]')
+FROM t ORDER BY id;
+id	j	v	JSON_STORAGE_SIZE(j)	JSON_STORAGE_SIZE(v)	JSON_STORAGE_SIZE(j->'$[0]')	JSON_STORAGE_SIZE(v->'$[0]')
+0	NULL	NULL	NULL	NULL	NULL	NULL
+1	[["abc", null, "ghi", "X"]]	[["abc", null, "ghi", "X"]]	34	34	27	27
+DROP TABLE t;
+#
+# Get some extra coverage for partial update of JSON, WL#8963.
+# Partial update will not happen in MySQL 5.7, since WL#8963 has not
+# been backported. The test cases are kept in order to exercise
+# the JSON_STORAGE_SIZE function.
+#
+CREATE TABLE t(id INT PRIMARY KEY, j JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a"}'), (2, '{"a":"b", "b":"b"}'), (3, '{"a":"c", "c":"c"}');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "a"}	15
+2	{"a": "b", "b": "b"}	25
+3	{"a": "c", "c": "c"}	25
+UPDATE t SET j = JSON_SET(j, '$.a', 'x');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "x"}	15
+2	{"a": "x", "b": "b"}	25
+3	{"a": "x", "c": "c"}	25
+UPDATE t SET j = JSON_SET(j, '$.a', 'y', '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "y", "b": "x"}	25
+2	{"a": "y", "b": "x"}	25
+3	{"a": "y", "b": "x", "c": "c"}	35
+UPDATE t SET j = JSON_SET(j, '$.a', 'z'), j = JSON_SET(j, '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "z", "b": "z"}	25
+2	{"a": "z", "b": "z"}	25
+3	{"a": "z", "b": "z", "c": "c"}	35
+UPDATE t SET j = JSON_SET(j, '$.a', 'w'),
+j = JSON_SET(j, '$.a', 'v', '$.b', j->'$.a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "v", "b": "w"}	25
+2	{"a": "v", "b": "w"}	25
+3	{"a": "v", "b": "w", "c": "c"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '1', '$.c', '2', '$.a', '3');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "3", "b": "w"}	25
+2	{"a": "3", "b": "w"}	25
+3	{"a": "3", "b": "w", "c": "2"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '4'), j = JSON_REPLACE(j, '$.c', '5'),
+j = JSON_REPLACE(j, '$.a', '6');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "6", "b": "w"}	25
+2	{"a": "6", "b": "w"}	25
+3	{"a": "6", "b": "w", "c": "5"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', '');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "", "b": "w"}	24
+2	{"a": "", "b": "w"}	24
+3	{"a": "", "b": "w", "c": "5"}	34
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'a');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "a", "b": "w"}	25
+2	{"a": "a", "b": "w"}	25
+3	{"a": "a", "b": "w", "c": "5"}	35
+UPDATE t SET j = JSON_REPLACE(j, '$.a', 'ab');
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t ORDER BY id;
+id	j	ss
+1	{"a": "ab", "b": "w"}	26
+2	{"a": "ab", "b": "w"}	26
+3	{"a": "ab", "b": "w", "c": "5"}	36
+DROP TABLE t;
+CREATE TABLE t(id INT PRIMARY KEY, j1 JSON, j2 JSON);
+INSERT INTO t VALUES
+(1, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}'),
+(2, NULL, NULL),
+(3, '{"a":"a","b":"b"}', '{"a":"a","b":"b"}');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "a", "b": "b"}	{"a": "a", "b": "b"}	25	25
+2	NULL	NULL	NULL	NULL
+3	{"a": "a", "b": "b"}	{"a": "a", "b": "b"}	25	25
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 'x'),
+j2 = JSON_SET(j2, '$.a', 'y'),
+j1 = JSON_SET(j1, '$.b', 'z');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "x", "b": "z"}	{"a": "y", "b": "b"}	25	25
+2	NULL	NULL	NULL	NULL
+3	{"a": "x", "b": "z"}	{"a": "y", "b": "b"}	25	25
+UPDATE t SET j1 = JSON_SET(j1, '$.a', 's'),
+j2 = JSON_SET(j2, '$.a', 'abcdefghi'),
+j1 = JSON_SET(j1, '$.b', 't');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "t"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "t"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_SET(j1, '$.x.y.z', 'abc', '$.b', 'X');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "X"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "X"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_REPLACE(j1, '$.x', 'abc', '$.b', 'Y');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "Y"}	{"a": "abcdefghi", "b": "b"}	25	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "Y"}	{"a": "abcdefghi", "b": "b"}	25	33
+UPDATE t SET j1 = JSON_SET(j1, '$.x', 'abc', '$.b', 'Z');
+SELECT *, JSON_STORAGE_SIZE(j1) ss1,
+JSON_STORAGE_SIZE(j2) ss2 FROM t ORDER BY id;
+id	j1	j2	ss1	ss2
+1	{"a": "s", "b": "Z", "x": "abc"}	{"a": "abcdefghi", "b": "b"}	37	33
+2	NULL	NULL	NULL	NULL
+3	{"a": "s", "b": "Z", "x": "abc"}	{"a": "abcdefghi", "b": "b"}	37	33
+DROP TABLE t;
+CREATE TABLE t(j JSON,
+i INT DEFAULT 42,
+db DOUBLE DEFAULT 2.34e-10,
+dc DECIMAL(5, 3) DEFAULT 98.765,
+ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+gc JSON GENERATED ALWAYS AS (JSON_ARRAY(i, db, dc, ts)))
+ENGINE=InnoDB;
+INSERT INTO t(j, ts) VALUES
+('[null, "abc", true, "def", false]', '2017-01-02 14:15:16');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "abc", true, "def", false]	ARRAY	28
+UPDATE t SET j = JSON_SET(j, '$[1]', 'xy', '$[3]', 'xyzw');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "xy", true, "xyzw", false]	ARRAY	28
+UPDATE t SET j = JSON_SET(j, '$[1]', 'a');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "a", true, "xyzw", false]	ARRAY	27
+UPDATE t SET j = JSON_SET(j, '$[3]', 'abcde');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null, "a", true, "abcde", false]	ARRAY	28
+UPDATE t SET j = JSON_ARRAY('abcdefghijklmnopqrstuvwxyz');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["abcdefghijklmnopqrstuvwxyz"]	ARRAY	35
+UPDATE t SET j = JSON_SET(j, '$[0]', 3.14e0);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[3.14]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(10000000000 AS UNSIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[10000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(4000000000 AS SIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[4000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(123 AS UNSIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[123]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST(456 AS SIGNED));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[456]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', -123);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[-123]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', -4000000000);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[-4000000000]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', TRUE);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[true]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', NULL);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('abc' AS BINARY));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["base64:type253:YWJj"]	ARRAY	13
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-23 13:16:40' AS DATETIME));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2016-12-23 13:16:40.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('2016-12-24' AS DATE));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2016-12-24"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', CAST('14:17:41' AS TIME));
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["14:17:41.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', 1.23);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[1.23]	ARRAY	14
+UPDATE t SET j = JSON_SET(j, '$[0]', i);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[42]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', db);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[0.000000000234]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', dc);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[98.765]	ARRAY	15
+UPDATE t SET j = JSON_SET(j, '$[0]', ts);
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2017-01-02 14:15:16.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[0]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[42]	ARRAY	8
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[1]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[0.000000000234]	ARRAY	16
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[2]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[98.765]	ARRAY	15
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[3]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+["2017-01-02 14:15:16.000000"]	ARRAY	18
+UPDATE t SET j = JSON_SET(j, '$[0]', gc->'$[4]');
+SELECT j, JSON_TYPE(j) jt, JSON_STORAGE_SIZE(j) ss FROM t;
+j	jt	ss
+[null]	ARRAY	8
+DROP TABLE t;
+CREATE TABLE t1(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t1 VALUES (1, '{"a":11}', 1), (2, '{"a":22}', 2);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 11}	1	13
+2	{"a": 22}	2	13
+CREATE TABLE t2(id INT PRIMARY KEY, j JSON, x INT);
+INSERT INTO t2 VALUES (1, '{"b":33}', 3), (2, '{"b":44}', 4);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 33}	3	13
+2	{"b": 44}	4	13
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.j->'$.b') WHERE t1.id = t2.id;
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 33}	1	13
+2	{"a": 44}	2	13
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 33}	3	13
+2	{"b": 44}	4	13
+UPDATE t1, t2 SET t1.j = JSON_SET(t1.j, '$.a', t2.x),
+t2.j = JSON_SET(t2.j, '$.b', t1.x)
+WHERE t1.id = t2.id;
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	{"a": 3}	1	13
+2	{"a": 4}	2	13
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 1}	3	13
+2	{"b": 2}	4	13
+UPDATE t1, t2 SET t1.j = '[123]', t2.j = JSON_SET(t2.j, '$.b', 99);
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t1 ORDER BY id;
+id	j	x	ss
+1	[123]	1	8
+2	[123]	2	8
+SELECT *, JSON_STORAGE_SIZE(j) ss FROM t2 ORDER BY id;
+id	j	x	ss
+1	{"b": 99}	3	13
+2	{"b": 99}	4	13
+DROP TABLE t1, t2;
+#
+# WL#9692: Add JSON_MERGE_PATCH
+#
+CREATE TABLE merge_t(
+id INT PRIMARY KEY AUTO_INCREMENT,
+target VARCHAR(100), patch VARCHAR(100)
+);
+INSERT INTO merge_t(target, patch) VALUES
+('{"a":"b"}', '{"a":"c"}'),
+('{"a":"b"}', '{"b":"c"}'),
+('{"a":"b"}', '{"a":null}'),
+('{"a":"b", "b":"c"}', '{"a":null}'),
+('{"a":["b"]}', '{"a":"c"}'),
+('{"a":"c"}', '{"a":["b"]}'),
+('{"a": {"b":"c"}}', '{"a": {"b":"d", "c":null}}'),
+('{"a":[{"b":"c"}]}', '{"a": [1]}'),
+('["a","b"]', '["c","d"]'),
+('{"a":"b"}', '["c"]'),
+('{"a":"foo"}', 'null'),
+('{"a":"foo"}', '"bar"'),
+('{"e":null}', '{"a":1}'),
+('[1,2]', '{"a":"b", "c":null}'),
+('{}', '{"a":{"bb":{"ccc":null}}}'),
+(NULL, '{}'),
+('{}', NULL);
+SELECT id, target, patch,
+JSON_MERGE_PATCH(target, patch) AS merged,
+JSON_EXTRACT(JSON_MERGE_PATCH(target, patch), '$.a') AS a
+FROM merge_t ORDER BY id;
+id	target	patch	merged	a
+1	{"a":"b"}	{"a":"c"}	{"a": "c"}	"c"
+2	{"a":"b"}	{"b":"c"}	{"a": "b", "b": "c"}	"b"
+3	{"a":"b"}	{"a":null}	{}	NULL
+4	{"a":"b", "b":"c"}	{"a":null}	{"b": "c"}	NULL
+5	{"a":["b"]}	{"a":"c"}	{"a": "c"}	"c"
+6	{"a":"c"}	{"a":["b"]}	{"a": ["b"]}	["b"]
+7	{"a": {"b":"c"}}	{"a": {"b":"d", "c":null}}	{"a": {"b": "d"}}	{"b": "d"}
+8	{"a":[{"b":"c"}]}	{"a": [1]}	{"a": [1]}	[1]
+9	["a","b"]	["c","d"]	["c", "d"]	NULL
+10	{"a":"b"}	["c"]	["c"]	NULL
+11	{"a":"foo"}	null	null	NULL
+12	{"a":"foo"}	"bar"	"bar"	NULL
+13	{"e":null}	{"a":1}	{"a": 1, "e": null}	1
+14	[1,2]	{"a":"b", "c":null}	{"a": "b"}	"b"
+15	{}	{"a":{"bb":{"ccc":null}}}	{"a": {"bb": {}}}	{"bb": {}}
+16	NULL	{}	NULL	NULL
+17	{}	NULL	NULL	NULL
+DROP TABLE merge_t;
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '{"c":"d"}');
+JSON_MERGE_PATCH('{"a":"b"}', NULL, '{"c":"d"}')
+NULL
+SELECT JSON_MERGE_PATCH(NULL, '[1,2,3]');
+JSON_MERGE_PATCH(NULL, '[1,2,3]')
+[1, 2, 3]
+SELECT JSON_MERGE_PATCH('{"a":"b"}', NULL, '[1,2,3]', '{"c":null,"d":"e"}');
+JSON_MERGE_PATCH('{"a":"b"}', NULL, '[1,2,3]', '{"c":null,"d":"e"}')
+{"d": "e"}
+SELECT JSON_MERGE_PATCH();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PATCH'
+SELECT JSON_MERGE_PATCH('{}');
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PATCH'
+SELECT JSON_MERGE_PATCH('{', '[1,2,3]');
+ERROR 22032: Invalid JSON text in argument 1 to function json_merge_patch: "Missing a name for object member." at position 1.
+SELECT JSON_MERGE_PATCH('{"a":"b"}', '[1,');
+ERROR 22032: Invalid JSON text in argument 2 to function json_merge_patch: "Invalid value." at position 3.
diff --git a/mysql-test/suite/json/r/json_insert_innodb.result b/mysql-test/suite/json/r/json_insert_innodb.result
index 25f28b14d55f..fdf6f332be0b 100644
--- a/mysql-test/suite/json/r/json_insert_innodb.result
+++ b/mysql-test/suite/json/r/json_insert_innodb.result
@@ -102,7 +102,7 @@ ERROR 22032: Invalid JSON text: "not a JSON text, may need CAST" at position 0 i
 INSERT INTO t1(j) VALUES (PI());
 ERROR 22032: Invalid JSON text: "not a JSON text, may need CAST" at position 0 in value for column 't1.j'.
 INSERT INTO t1(j) select ts from auxtbl;
-ERROR 22032: Invalid JSON text: "The document root must not follow by other values." at position 4 in value for column 't1.j'.
+ERROR 22032: Invalid JSON text: "The document root must not be followed by other values." at position 4 in value for column 't1.j'.
 DROP TABLE auxtbl;
 INSERT INTO t1(j) VALUES (CAST('15:52:00' as TIME));
 ERROR 22032: Invalid JSON text: "not a JSON text, may need CAST" at position 0 in value for column 't1.j'.
@@ -130,7 +130,7 @@ execute ps1 using @c;
 execute ps1 using @d;
 execute ps1 using @e;
 execute ps1 using @f;
-ERROR 22032: Invalid JSON text in argument 1 to function cast_as_json: "The document root must not follow by other values." at position 4.
+ERROR 22032: Invalid JSON text in argument 1 to function cast_as_json: "The document root must not be followed by other values." at position 4.
 execute ps1 using @g;
 execute ps2 using @a;
 ERROR 22032: Invalid JSON text: "not a JSON text, may need CAST" at position 0 in value for column 'pt2.j'.
@@ -141,7 +141,7 @@ execute ps2 using @d;
 ERROR 22032: Invalid JSON text: "not a JSON text, may need CAST" at position 0 in value for column 'pt2.j'.
 execute ps2 using @e;
 execute ps2 using @f;
-ERROR 22032: Invalid JSON text: "The document root must not follow by other values." at position 4 in value for column 'pt2.j'.
+ERROR 22032: Invalid JSON text: "The document root must not be followed by other values." at position 4 in value for column 'pt2.j'.
 execute ps2 using @g;
 select json_type(j), j from pt1 order by j;
 json_type(j)	j
diff --git a/mysql-test/suite/json/r/json_no_table.result b/mysql-test/suite/json/r/json_no_table.result
index f39febc23f7e..c602ad57078e 100644
--- a/mysql-test/suite/json/r/json_no_table.result
+++ b/mysql-test/suite/json/r/json_no_table.result
@@ -685,150 +685,166 @@ JSON_REMOVE
 )
 {"a": "foo", "b": [true, {"c": 123, "d": 456}]}
 # ----------------------------------------------------------------------
-# Test of JSON_MERGE function.
+# Test of JSON_MERGE_PRESERVE function.
 # ----------------------------------------------------------------------
 
 # not enough args
-select json_merge();
-ERROR 42000: Incorrect parameter count in the call to native function 'json_merge'
+SELECT JSON_MERGE_PRESERVE();
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PRESERVE'
 
 # not enough args
-select json_merge( '[ 1, 2, 3 ]' );
-ERROR 42000: Incorrect parameter count in the call to native function 'json_merge'
-select json_merge( null, null );
-json_merge( null, null )
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]');
+ERROR 42000: Incorrect parameter count in the call to native function 'JSON_MERGE_PRESERVE'
+SELECT JSON_MERGE_PRESERVE(NULL, NULL);
+JSON_MERGE_PRESERVE(NULL, NULL)
 NULL
-select json_merge( null, '[ 1, 2, 3 ]' );
-json_merge( null, '[ 1, 2, 3 ]' )
+SELECT JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]');
+JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]')
 NULL
-select json_merge( '[ 1, 2, 3 ]', null );
-json_merge( '[ 1, 2, 3 ]', null )
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL);
+JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL)
 NULL
-select json_merge( null, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]' );
-json_merge( null, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]' )
+SELECT JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]');
+JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]')
 NULL
-select json_merge( '[ 1, 2, 3 ]', null, '[ 4, 5, 6 ]' );
-json_merge( '[ 1, 2, 3 ]', null, '[ 4, 5, 6 ]' )
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL, '[ 4, 5, 6 ]');
+JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL, '[ 4, 5, 6 ]')
 NULL
-select json_merge( '[ 1, 2, 3 ]', '[ 4, 5, 6 ]', null );
-json_merge( '[ 1, 2, 3 ]', '[ 4, 5, 6 ]', null )
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', '[ 4, 5, 6 ]', NULL);
+JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', '[ 4, 5, 6 ]', NULL)
 NULL
-select json_merge( '[1, 2]', '[3, 4' );
-ERROR 22032: Invalid JSON text in argument 2 to function json_merge: "Missing a comma or ']' after an array element." at position 5.
-select json_merge( '[1, 2', '[3, 4]' );
-ERROR 22032: Invalid JSON text in argument 1 to function json_merge: "Missing a comma or ']' after an array element." at position 5.
-select json_merge( '1', '2' );
-json_merge( '1', '2' )
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '[3, 4');
+ERROR 22032: Invalid JSON text in argument 2 to function json_merge_preserve: "Missing a comma or ']' after an array element." at position 5.
+SELECT JSON_MERGE_PRESERVE('[1, 2', '[3, 4]');
+ERROR 22032: Invalid JSON text in argument 1 to function json_merge_preserve: "Missing a comma or ']' after an array element." at position 5.
+SELECT JSON_MERGE_PRESERVE('1', '2');
+JSON_MERGE_PRESERVE('1', '2')
 [1, 2]
-select json_merge( '1', '[2, 3]' );
-json_merge( '1', '[2, 3]' )
+SELECT JSON_MERGE_PRESERVE('1', '[2, 3]');
+JSON_MERGE_PRESERVE('1', '[2, 3]')
 [1, 2, 3]
-select json_merge( '[1, 2]', '3' );
-json_merge( '[1, 2]', '3' )
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '3');
+JSON_MERGE_PRESERVE('[1, 2]', '3')
 [1, 2, 3]
-select json_merge( '1', '{ "a": 2 }' );
-json_merge( '1', '{ "a": 2 }' )
+SELECT JSON_MERGE_PRESERVE('1', '{ "a": 2 }');
+JSON_MERGE_PRESERVE('1', '{ "a": 2 }')
 [1, {"a": 2}]
-select json_merge( '{ "a": 2 }', '1' );
-json_merge( '{ "a": 2 }', '1' )
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '1');
+JSON_MERGE_PRESERVE('{ "a": 2 }', '1')
 [{"a": 2}, 1]
-select json_merge( '[1, 2]', '[3, 4]' );
-json_merge( '[1, 2]', '[3, 4]' )
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '[3, 4]');
+JSON_MERGE_PRESERVE('[1, 2]', '[3, 4]')
 [1, 2, 3, 4]
-select json_merge( '{ "a": 2 }', '{ "b": 3}' );
-json_merge( '{ "a": 2 }', '{ "b": 3}' )
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '{ "b": 3}');
+JSON_MERGE_PRESERVE('{ "a": 2 }', '{ "b": 3}')
 {"a": 2, "b": 3}
-select json_merge( '[1, 2]', '{ "a": 2 }' );
-json_merge( '[1, 2]', '{ "a": 2 }' )
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '{ "a": 2 }');
+JSON_MERGE_PRESERVE('[1, 2]', '{ "a": 2 }')
 [1, 2, {"a": 2}]
-select json_merge( '{ "a": 2 }', '[1, 2]' );
-json_merge( '{ "a": 2 }', '[1, 2]' )
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '[1, 2]');
+JSON_MERGE_PRESERVE('{ "a": 2 }', '[1, 2]')
 [{"a": 2}, 1, 2]
-select json_merge( '{"a": 1, "b": 2 }', '{"b": 3, "d": 4 }' );
-json_merge( '{"a": 1, "b": 2 }', '{"b": 3, "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": 3, "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": 3, "d": 4 }')
 {"a": 1, "b": [2, 3], "d": 4}
-select json_merge( '{"a": 1, "b": 2 }', '{"b": [3, 4], "d": 4 }' );
-json_merge( '{"a": 1, "b": 2 }', '{"b": [3, 4], "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": [3, 4], "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": [3, 4], "d": 4 }')
 {"a": 1, "b": [2, 3, 4], "d": 4}
-select json_merge( '{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }' );
-json_merge( '{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }')
 {"a": 1, "b": [2, 3, 4], "d": 4}
-select json_merge( '{"a": 1, "b": 2 }', '{"b": {"e": 7, "f": 8}, "d": 4 }' );
-json_merge( '{"a": 1, "b": 2 }', '{"b": {"e": 7, "f": 8}, "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": {"e": 7, "f": 8}, "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+'{"b": {"e": 7, "f": 8}, "d": 4 }')
 {"a": 1, "b": [2, {"e": 7, "f": 8}], "d": 4}
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": 2 }' );
-json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": 2 }' )
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{"a": 1, "b": 2 }');
+JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{"a": 1, "b": 2 }')
 {"a": 1, "b": [{"e": 7, "f": 8}, 2], "d": 4}
-select json_merge( '{"a": 1, "b": [2, 9] }', '{"b": [10, 11], "d": 4 }' );
-json_merge( '{"a": 1, "b": [2, 9] }', '{"b": [10, 11], "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+'{"b": [10, 11], "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+'{"b": [10, 11], "d": 4 }')
 {"a": 1, "b": [2, 9, 10, 11], "d": 4}
-select json_merge( '{"a": 1, "b": [2, 9] }', '{"b": {"e": 7, "f": 8}, "d": 4 }' );
-json_merge( '{"a": 1, "b": [2, 9] }', '{"b": {"e": 7, "f": 8}, "d": 4 }' )
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+'{"b": {"e": 7, "f": 8}, "d": 4 }');
+JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+'{"b": {"e": 7, "f": 8}, "d": 4 }')
 {"a": 1, "b": [2, 9, {"e": 7, "f": 8}], "d": 4}
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": [2, 9] }' );
-json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": [2, 9] }' )
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{"a": 1, "b": [2, 9] }');
+JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{"a": 1, "b": [2, 9] }')
 {"a": 1, "b": [{"e": 7, "f": 8}, 2, 9], "d": 4}
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{ "a": 1, "b": {"e": 20, "g": 21 } }' );
-json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{ "a": 1, "b": {"e": 20, "g": 21 } }' )
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{ "a": 1, "b": {"e": 20, "g": 21 } }');
+JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+'{ "a": 1, "b": {"e": 20, "g": 21 } }')
 {"a": 1, "b": {"e": [7, 20], "f": 8, "g": 21}, "d": 4}
-select json_merge( '1', '2', '3' );
-json_merge( '1', '2', '3' )
+SELECT JSON_MERGE_PRESERVE('1', '2', '3');
+JSON_MERGE_PRESERVE('1', '2', '3')
 [1, 2, 3]
-select json_merge( '[1, 2 ]', '3', '[4, 5]' );
-json_merge( '[1, 2 ]', '3', '[4, 5]' )
+SELECT JSON_MERGE_PRESERVE('[1, 2 ]', '3', '[4, 5]');
+JSON_MERGE_PRESERVE('[1, 2 ]', '3', '[4, 5]')
 [1, 2, 3, 4, 5]
-select json_merge
+SELECT JSON_MERGE_PRESERVE
 (
 '{ "a": true, "b": { "c": 3, "d": 4 }, "e": [ 1, 2 ] }',
 '{ "d": false, "b": { "g": 3, "d": 5 }, "f": [ 1, 2 ] }',
 '{ "m": true, "b": { "h": 8, "d": 4 }, "e": [ 3, 4 ] }'
 );
-json_merge
+JSON_MERGE_PRESERVE
 (
 '{ "a": true, "b": { "c": 3, "d": 4 }, "e": [ 1, 2 ] }',
 '{ "d": false, "b": { "g": 3, "d": 5 }, "f": [ 1, 2 ] }',
 '{ "m": true, "b": { "h": 8, "d": 4 }, "e": [ 3, 4 ] }'
 )
 {"a": true, "b": {"c": 3, "d": [4, 5, 4], "g": 3, "h": 8}, "d": false, "e": [1, 2, 3, 4], "f": [1, 2], "m": true}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '[ 5, 6]'
 );
-JSON_MERGE
+JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '[ 5, 6]'
 )
 [{"a": "foo", "b": [true, {"c": 123}]}, 5, 6]
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '{ "b": [ false, 34 ] }'
 );
-JSON_MERGE
+JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '{ "b": [ false, 34 ] }'
 )
 {"a": "foo", "b": [true, {"c": 123}, false, 34]}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '{ "b": "bar" }'
 );
-JSON_MERGE
+JSON_MERGE_PRESERVE
 (
 '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
 '{ "b": "bar" }'
 )
 {"a": "foo", "b": [true, {"c": 123}, "bar"]}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
 '{ "a" : { "b" : 1 } }',
 '{ "a" : { "c" : 1 } }'
 );
-JSON_MERGE
+JSON_MERGE_PRESERVE
 (
 '{ "a" : { "b" : 1 } }',
 '{ "a" : { "c" : 1 } }'
@@ -879,7 +895,7 @@ select json_type('3.14');
 json_type('3.14')
 DOUBLE
 select json_type(CAST(CAST('2015-01-15' AS DATE) as CHAR CHARACTER SET 'utf8'));
-ERROR 22032: Invalid JSON text in argument 1 to function json_type: "The document root must not follow by other values." at position 4.
+ERROR 22032: Invalid JSON text in argument 1 to function json_type: "The document root must not be followed by other values." at position 4.
 # ----------------------------------------------------------------------
 # Test of CAST(literal AS JSON)
 # ----------------------------------------------------------------------
@@ -3135,11 +3151,11 @@ SELECT JSON_EXTRACT('1E+308', '$');
 JSON_EXTRACT('1E+308', '$')
 1e308
 SELECT JSON_EXTRACT('1E+309', '$');
-ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 6.
+ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 0.
 SELECT JSON_EXTRACT('1E+36181012216111515851075235238', '$');
-ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 6.
+ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 0.
 SELECT JSON_EXTRACT('-1E+36181012216111515851075235238', '$');
-ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 7.
+ERROR 22032: Invalid JSON text in argument 1 to function json_extract: "Number too big to be stored in double." at position 0.
 #
 # Bug#21383284: ASSERTION IN SELECT_LEX::SETUP_CONDS
 #
@@ -3283,3 +3299,32 @@ Warning	1235	This version of MySQL doesn't yet support 'comparison of JSON in th
 Warning	1235	This version of MySQL doesn't yet support 'comparison of JSON in the LEAST and GREATEST operators'
 Warning	1235	This version of MySQL doesn't yet support 'comparison of JSON in the LEAST and GREATEST operators'
 Warning	1235	This version of MySQL doesn't yet support 'comparison of JSON in the LEAST and GREATEST operators'
+#
+# Bug#22961128: WRONG RESULT WHEN MANIPULATING RESULT OF JSON_MERGE
+#
+SELECT JSON_SET(JSON_ARRAY(JSON_MERGE_PRESERVE('{"a":1}', '{"a":2}')),
+'$[0].a', 123);
+JSON_SET(JSON_ARRAY(JSON_MERGE_PRESERVE('{"a":1}', '{"a":2}')),
+'$[0].a', 123)
+[{"a": 123}]
+#
+# WL#9692: Deprecate the JSON_MERGE function
+#
+# Expect a deprecation warning.
+SELECT JSON_MERGE('{}', '{}');
+JSON_MERGE('{}', '{}')
+{}
+Warnings:
+Warning	1287	'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
+# Expect a deprecation warning when creating the view.
+CREATE VIEW v AS SELECT JSON_MERGE('{}', '{}') AS col;
+Warnings:
+Warning	1287	'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
+# The view uses the non-deprecated variant of the function.
+SHOW CREATE VIEW v;
+View	Create View	character_set_client	collation_connection
+v	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v` AS select json_merge_preserve('{}','{}') AS `col`	utf8	utf8_general_ci
+SELECT * FROM v;
+col
+{}
+DROP VIEW v;
diff --git a/mysql-test/suite/json/t/json_agg.test b/mysql-test/suite/json/t/json_agg.test
new file mode 100644
index 000000000000..ac018dc40f71
--- /dev/null
+++ b/mysql-test/suite/json/t/json_agg.test
@@ -0,0 +1,494 @@
+###############################################################################
+#                                                                             #
+# Tests JSON aggregation functions added in WL#7987                           #
+#                                                                             #
+###############################################################################
+
+
+--echo #
+--echo # Setup test.
+--echo #
+
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(1, 1, "alfa"),
+(1, 2, null),
+(2, 3, "doi"),
+(1, 4, "unu"),
+(3, 5, "trei"),
+(4, 6, null),
+(4, 7, null),
+(1, 8, "one");
+
+--echo #
+--echo # Test JSON_ARRAYAGG.
+--echo #
+
+FLUSH STATUS;
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+SELECT SQL_BIG_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SELECT SQL_SMALL_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+
+SELECT JSON_ARRAYAGG(b) FROM t1;
+SELECT SQL_BIG_RESULT JSON_ARRAYAGG(b) FROM t1;
+SELECT SQL_SMALL_RESULT JSON_ARRAYAGG(b) FROM t1;
+SELECT SQL_BUFFER_RESULT JSON_ARRAYAGG(b) FROM t1;
+
+PREPARE p1 FROM "SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a";
+EXECUTE p1;
+EXECUTE p1;
+deallocate prepare p1;
+
+PREPARE p3 FROM
+"SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a";
+EXECUTE p3;
+EXECUTE p3;
+deallocate prepare p3;
+
+PREPARE p4 FROM "SELECT JSON_ARRAYAGG(b) FROM t1";
+EXECUTE p4;
+EXECUTE p4;
+deallocate prepare p4;
+
+
+SELECT JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1;
+
+PREPARE p1 FROM
+"SELECT a, JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1 GROUP BY a";
+EXECUTE p1;
+EXECUTE p1;
+deallocate prepare p1;
+
+
+PREPARE p4 FROM
+"SELECT JSON_MERGE_PRESERVE(JSON_ARRAYAGG(b), '[true, false]') FROM t1";
+EXECUTE p4;
+EXECUTE p4;
+deallocate prepare p4;
+
+
+ANALYZE TABLE t1;
+
+EXPLAIN SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+EXPLAIN SELECT JSON_ARRAYAGG(b) FROM t1;
+
+EXPLAIN FORMAT=json SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+EXPLAIN FORMAT=json SELECT SQL_BIG_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+EXPLAIN FORMAT=json SELECT SQL_SMALL_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+EXPLAIN FORMAT=json SELECT SQL_BUFFER_RESULT  a, JSON_ARRAYAGG(b)
+FROM t1
+GROUP BY a;
+
+EXPLAIN FORMAT=json SELECT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN FORMAT=json SELECT SQL_BIG_RESULT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN FORMAT=json SELECT SQL_SMALL_RESULT JSON_ARRAYAGG(b) FROM t1;
+EXPLAIN FORMAT=json SELECT SQL_BUFFER_RESULT JSON_ARRAYAGG(b) FROM t1;
+
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a WITH ROLLUP;
+SELECT a, JSON_ARRAYAGG(b) as jarray
+FROM t1
+GROUP BY a
+HAVING jarray= JSON_ARRAY("trei");
+
+--echo #
+--echo # Test JSON_OBJECTAGG.
+--echo #
+
+FLUSH STATUS;
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+SELECT JSON_OBJECTAGG(k, b) FROM t1;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+
+PREPARE p1 FROM "SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a";
+EXECUTE p1;
+EXECUTE p1;
+deallocate prepare p1;
+
+PREPARE p4 FROM "SELECT JSON_OBJECTAGG(k, b) FROM t1";
+EXECUTE p4;
+EXECUTE p4;
+deallocate prepare p4;
+
+SELECT a, JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1 GROUP BY a;
+SELECT JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1;
+
+PREPARE p1 FROM
+"SELECT a, JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]')
+FROM t1
+GROUP BY a";
+EXECUTE p1;
+EXECUTE p1;
+deallocate prepare p1;
+
+
+PREPARE p4 FROM
+"SELECT JSON_MERGE_PRESERVE(JSON_OBJECTAGG(k, b), '[true, false]') FROM t1";
+EXECUTE p4;
+EXECUTE p4;
+deallocate prepare p4;
+
+ANALYZE TABLE t1;
+
+EXPLAIN SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+EXPLAIN SELECT JSON_OBJECTAGG(k, b) FROM t1;
+
+EXPLAIN FORMAT=json SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+EXPLAIN FORMAT=json SELECT JSON_OBJECTAGG(k, b) FROM t1;
+
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a WITH ROLLUP;
+SELECT a, JSON_OBJECTAGG(k, b) as jobject
+FROM t1
+GROUP BY a
+HAVING jobject = JSON_OBJECT(3, "doi");
+
+--echo #
+--echo # NULL values.
+--echo #
+
+SELECT a, JSON_ARRAYAGG(null) FROM t1 GROUP BY a;
+SELECT JSON_ARRAYAGG(null) FROM t1;
+
+SELECT a, JSON_OBJECTAGG(k, null) FROM t1 GROUP BY a;
+SELECT JSON_OBJECTAGG(k, null) FROM t1;
+
+
+--error ER_JSON_DOCUMENT_NULL_KEY
+SELECT a, JSON_OBJECTAGG(null, b) FROM t1 GROUP BY a;
+
+--error ER_JSON_DOCUMENT_NULL_KEY
+SELECT JSON_OBJECTAGG(null, b) FROM t1;
+
+--echo #
+--echo # Coverage test for fix_fields: Disable_semijoin_flattening.
+--echo #
+
+CREATE TABLE t(a INT);
+ANALYZE TABLE t1;
+EXPLAIN format=json SELECT (SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)));
+SELECT (SELECT 1 FROM t WHERE JSON_ARRAYAGG(1 IN (SELECT 1 FROM t)));
+DROP TABLE t;
+
+--echo #
+--echo # Coverage test for fix_fields: check_cols.
+--echo #
+
+--error ER_OPERAND_COLUMNS
+SELECT JSON_ARRAYAGG((SELECT 1, 1));
+
+--echo #
+--echo # Coverage test for fix_fields: resolve_type.
+--echo #
+
+CREATE TABLE t2(gid int, a int);
+--error ER_WRONG_ARGUMENTS
+SELECT JSON_ARRAYAGG(ST_PointFromText('POINT(10 10)')) FROM t2;
+
+--echo #
+--echo # Coverage test for fix_fields: check_sum_func.
+--echo #
+
+--error ER_INVALID_GROUP_FUNC_USE
+SELECT (SELECT JSON_ARRAYAGG(COUNT(a)) FROM t2)  FROM t1;
+
+DROP TABLE t2;
+
+--echo #
+--echo # Empty table.
+--echo #
+
+TRUNCATE TABLE t1;
+
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SELECT JSON_ARRAYAGG(b) FROM t1;
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+SELECT JSON_OBJECTAGG(k, b) FROM t1;
+
+--echo #
+--echo # Tests for max_allowed_packet.
+--echo #
+
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, x INT);
+INSERT INTO t(x) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+INSERT INTO t(x) SELECT t1.x from t t1, t t2, t t3;
+
+SET GLOBAL net_buffer_length = 1024;
+SET GLOBAL max_allowed_packet = 1024;
+CONNECT (con1,localhost,root,,);
+SELECT JSON_ARRAYAGG(x) FROM t;
+SELECT JSON_OBJECTAGG(id, x) FROM t;
+SELECT id % 2 AS i, JSON_ARRAYAGG(x) FROM t GROUP BY i;
+SELECT id % 2 AS i, JSON_OBJECTAGG(id, x) FROM t GROUP BY i;
+CONNECTION default;
+DISCONNECT con1;
+SET GLOBAL max_allowed_packet = default;
+SET GLOBAL net_buffer_length = default;
+
+DROP TABLE t;
+
+--echo #
+--echo # Cleanup test.
+--echo #
+
+DROP TABLE t1;
+
+
+--echo #
+--echo # Bug #24368053
+--echo # WL#7987: ASSERTION `!TABLE || (!TABLE->WRITE_SET || BITMAP_IS_SET(TABLE-> ...
+--echo #
+
+CREATE TABLE C(col_int int);
+CREATE TABLE CC(col_int int);
+INSERT INTO CC VALUES (1),(2),(3);
+
+SELECT JSON_OBJECTAGG(table1.`col_int` ,table1.`col_int`) AS field2,
+(SELECT JSON_ARRAYAGG(SUBQUERY2_t1.`col_int`)
+ FROM CC AS SUBQUERY2_t1
+ WHERE SUBQUERY2_t1.`col_int` <> table1.`col_int`) AS field5
+FROM (CC AS table1)
+WHERE (table1.`col_int` <> ALL (SELECT SUBQUERY4_t1.`col_int`
+       FROM (CC AS SUBQUERY4_t1 STRAIGHT_JOIN C)))
+GROUP BY
+field5;
+
+DROP TABLE C;
+DROP TABLE CC;
+
+--echo #
+--echo # Bug #24367384
+--echo # WL#7987: INNODB: ASSERTION FAILURE: ROW0SEL.CC:2558:FIELD->PREFIX_LEN > 0 ...
+--echo #
+CREATE TABLE BB (pk INT AUTO_INCREMENT PRIMARY KEY, col_varchar_key VARCHAR(1));
+INSERT INTO BB VALUES(1,'a');
+
+SELECT (SELECT JSON_ARRAYAGG(`pk`) FROM BB as t1
+        WHERE t1.`col_varchar_key` <> t2.`col_varchar_key`) AS field2
+FROM BB as t2
+GROUP BY field2;
+
+SELECT (SELECT JSON_ARRAYAGG(`pk`) FROM BB as t1
+        WHERE t1.`col_varchar_key` = t2.`col_varchar_key`) AS field2
+FROM BB as t2
+GROUP BY field2;
+
+DROP TABLE BB;
+
+--echo #
+--echo # Bug #24365264
+--echo # WL#7987: SIG 11 IN ITEM::MARK_FIELD_IN_MAP|SQL/ITEM.H
+--echo #
+
+CREATE TABLE C (col_int int);
+INSERT INTO C VALUES  (1);
+
+SELECT *
+FROM C WHERE col_int < (SELECT JSON_ARRAYAGG(col_int) FROM C )
+ORDER BY col_int ;
+
+DROP TABLE C;
+
+
+--echo #
+--echo # Bug #24366341
+--echo # WL#7987: SIG 6 IN JSON_WRAPPER::TYPE|SQL/JSON_DOM.CC
+--echo #
+
+CREATE TABLE CC(col_varchar_key varchar(1));
+INSERT INTO CC VALUES ('a');
+
+SELECT JSON_ARRAYAGG(col_varchar_key) AS field1 FROM CC HAVING field1 > 9;
+
+SELECT JSON_OBJECTAGG(col_varchar_key, col_varchar_key) AS field1 FROM  CC
+HAVING (field1 <> 'a' AND field1 != 'e');
+
+DROP TABLE CC;
+
+--echo #
+--echo # with ROLLUP + two/three groups
+--echo #
+
+CREATE TABLE tg (g1 int, g2 int, k int, b VARCHAR(10));
+INSERT INTO tg VALUES
+(1, 1, 1, "alfa"),
+(1, 2, 2, null),
+(2, 3, 3, "doi"),
+(1, 1, 4, "unu"),
+(3, 2, 5, "trei"),
+(4, 3, 6, null),
+(4, 1, 7, null),
+(1, 2, 8, "one");
+
+
+SELECT g1, g2, JSON_ARRAYAGG(g2) FROM tg GROUP BY g1, g2 with rollup;
+SELECT g1, g2, JSON_OBJECTAGG(k, g1) FROM tg GROUP BY g1, g2 with rollup;
+
+
+CREATE TABLE tg3 (g1 int, g2 int, g3 int, k int, b VARCHAR(10));
+INSERT INTO tg3 VALUES
+(1, 1, 1, 1, "1.1.1"),
+(1, 1, 2, 2, "1.1.2"),
+(1, 1, 3, 3, "1.1.3"),
+(1, 2, 1, 4, "1.2.1"),
+(1, 2, 2, 5, "1.2.2"),
+(1, 2, 3, 6, "1.2.3"),
+(1, 3, 1, 7, "1.3.1"),
+(1, 3, 2, 8, "1.3.2"),
+(1, 3, 3, 9, "1.3.3"),
+(2, 1, 1, 10, "2.1.1"),
+(2, 1, 2, 11, "2.1.2"),
+(2, 1, 3, 12, "2.1.3"),
+(2, 2, 1, 13, "2.2.1"),
+(2, 2, 2, 14, "2.2.2"),
+(2, 2, 3, 15, "2.2.3"),
+(2, 3, 1, 16, "2.3.1"),
+(2, 3, 2, 17, "2.3.2"),
+(2, 3, 3, 18, "2.3.3"),
+(3, 1, 1, 19, "3.1.1"),
+(3, 1, 2, 20, "3.1.2"),
+(3, 1, 3, 21, "3.1.3"),
+(3, 2, 1, 22, "3.2.1"),
+(3, 2, 2, 23, "3.2.2"),
+(3, 2, 3, 24, "3.2.3"),
+(3, 3, 1, 25, "3.3.1"),
+(3, 3, 2, 26, "3.3.2"),
+(3, 3, 3, 27, "3.3.3");
+
+
+SELECT g1, g2, g3, JSON_ARRAYAGG(b) FROM tg3 GROUP BY g1, g2, g3 with rollup;
+SELECT g1, g2, g3, JSON_OBJECTAGG(k, b) FROM tg3 GROUP BY g1, g2, g3 with rollup;
+
+
+DROP TABLE tg;
+DROP TABLE tg3;
+
+--echo #
+--echo # Tests duplicates for JSON_OBJECTAGG
+--echo #
+
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(1, 1, "1.1"),
+(1, 1, "1.2"),
+(1, 1, "1.3"),
+(2, 2, "2.1"),
+(2, 2, "2.2"),
+(2, 2, "2.3");
+
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Tests with ORDER BY, DISTINCT
+--echo #
+
+CREATE TABLE t1 (a int, k int, b VARCHAR(10));
+INSERT INTO t1 VALUES
+(2, 8, "2.3"),
+(1, 7, "1.1"),
+(3, 6, "3.2"),
+(2, 5, "2.2"),
+(3, 9, "3.1"),
+(1, 4, "1.2"),
+(3, 3, "3.3"),
+(2, 2, "2.1"),
+(1, 1, "1.3");
+
+SELECT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a;
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a ORDER BY a ASC;
+SELECT DISTINCT a, JSON_ARRAYAGG(b) FROM t1 GROUP BY a ORDER BY a DESC;
+
+SELECT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a;
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a ORDER BY a ASC;
+SELECT DISTINCT a, JSON_OBJECTAGG(k, b) FROM t1 GROUP BY a ORDER BY a DESC;
+
+DROP TABLE t1;
+
+--echo #
+--echo # Tests with joins
+--echo #
+
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, t1 INT, t2 INT);
+CREATE TABLE p(id INT PRIMARY KEY AUTO_INCREMENT, p1 INT, p2 INT);
+
+INSERT INTO t(t1, t2) VALUES (1, 1), (2, 1), (3,3), (1, 4);
+INSERT INTO p(p1, p2) VALUES (2, 1), (1, 1), (3,3), (2, 4);
+
+FLUSH STATUS;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+#Since the JSON_*AGG does not have the ORDER BY clause order is not predictable
+disable_result_log;
+SELECT JSON_ARRAYAGG(t2) FROM t join p on t.t1=p.p1;
+enable_result_log;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+disable_result_log;
+SELECT t1, JSON_ARRAYAGG(t2) FROM t join p on t.t1=p.p1 group by t1;
+enable_result_log;
+SHOW SESSION STATUS LIKE 'Handler_update%';
+
+# Subquery in ORDER BY with outer reference
+SELECT (SELECT 1 AS foo ORDER BY JSON_ARRAYAGG(t2)) AS x FROM t;
+SELECT t1 FROM t ORDER BY (SELECT JSON_ARRAYAGG(t1) FROM t AS t2);
+SELECT JSON_ARRAYAGG(t1) FROM t
+ORDER BY (SELECT JSON_ARRAYAGG(t1) FROM t AS t2);
+
+SELECT (SELECT JSON_ARRAYAGG(t1_outer.t1) FROM t AS t1_inner LIMIT 1) as f
+FROM t AS t1_outer GROUP BY t1_outer.t2;
+
+DROP TABLE t;
+DROP TABLE p;
+
+--echo #
+--echo # Tests with JSON
+--echo #
+
+CREATE TABLE t(id INT PRIMARY KEY AUTO_INCREMENT, k INT, j JSON);
+INSERT INTO t(k, j) VALUES
+(1, '[1,2,3,4]'),
+(2, '{"prop1": 1}'),
+(1, '[3]'),
+(2, '{"prop2": 2, "prop10": 10}'),
+(1, '[99]');
+
+
+SELECT k, JSON_ARRAYAGG(j) FROM t GROUP BY k;
+SELECT k, JSON_OBJECTAGG(id, j) FROM t GROUP BY k;
+
+DROP TABLE t;
+
+--echo #
+--echo # Coverage tests for val_* functions
+--echo #
+
+CREATE TABLE t2(gid int, a int);
+INSERT INTO t2(gid, a) VALUES (1, 1), (1, 2), (2, 4), (2, 8);
+
+SELECT gid, 1.0 * JSON_ARRAYAGG(a) FROM t2 GROUP BY gid;
+SELECT gid, 0x30 << JSON_ARRAYAGG(a) FROM t2 GROUP BY gid;
+SELECT gid, DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY)
+FROM t2 GROUP BY gid;
+SELECT gid, ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998')
+FROM t2 GROUP BY gid;
+SELECT gid, SEC_TO_TIME(JSON_ARRAYAGG(a)) FROM t2 GROUP BY gid;
+
+TRUNCATE TABLE t2;
+
+SELECT 1.0 * JSON_ARRAYAGG(a) FROM t2;
+SELECT 0x30 << JSON_ARRAYAGG(a) FROM t2;
+SELECT DATE_ADD(JSON_ARRAYAGG(a), INTERVAL 31 DAY) FROM t2;
+SELECT ADDTIME(JSON_ARRAYAGG(a), '02:00:00.999998') FROM t2;
+SELECT SEC_TO_TIME(JSON_ARRAYAGG(a)) FROM t2;
+
+DROP TABLE t2;
diff --git a/mysql-test/suite/json/t/json_no_table.test b/mysql-test/suite/json/t/json_no_table.test
index ad65125140ec..1a886e04c0a5 100644
--- a/mysql-test/suite/json/t/json_no_table.test
+++ b/mysql-test/suite/json/t/json_no_table.test
@@ -493,55 +493,63 @@ SELECT JSON_REMOVE
 );
 
 --echo # ----------------------------------------------------------------------
---echo # Test of JSON_MERGE function.
+--echo # Test of JSON_MERGE_PRESERVE function.
 --echo # ----------------------------------------------------------------------
 
 --echo
 --echo # not enough args
 --error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
-select json_merge();
+SELECT JSON_MERGE_PRESERVE();
 --echo
 --echo # not enough args
 --error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
-select json_merge( '[ 1, 2, 3 ]' );
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]');
 
 # null args result in NULL value
-select json_merge( null, null );
-select json_merge( null, '[ 1, 2, 3 ]' );
-select json_merge( '[ 1, 2, 3 ]', null );
-select json_merge( null, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]' );
-select json_merge( '[ 1, 2, 3 ]', null, '[ 4, 5, 6 ]' );
-select json_merge( '[ 1, 2, 3 ]', '[ 4, 5, 6 ]', null );
+SELECT JSON_MERGE_PRESERVE(NULL, NULL);
+SELECT JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]');
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL);
+SELECT JSON_MERGE_PRESERVE(NULL, '[ 1, 2, 3 ]', '[ 4, 5, 6 ]');
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', NULL, '[ 4, 5, 6 ]');
+SELECT JSON_MERGE_PRESERVE('[ 1, 2, 3 ]', '[ 4, 5, 6 ]', NULL);
 
 --error ER_INVALID_JSON_TEXT_IN_PARAM
-select json_merge( '[1, 2]', '[3, 4' );
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '[3, 4');
 --error ER_INVALID_JSON_TEXT_IN_PARAM
-select json_merge( '[1, 2', '[3, 4]' );
-
-# good json_merge() expressions
-select json_merge( '1', '2' );
-select json_merge( '1', '[2, 3]' );
-select json_merge( '[1, 2]', '3' );
-select json_merge( '1', '{ "a": 2 }' );
-select json_merge( '{ "a": 2 }', '1' );
-select json_merge( '[1, 2]', '[3, 4]' );
-select json_merge( '{ "a": 2 }', '{ "b": 3}' );
-select json_merge( '[1, 2]', '{ "a": 2 }' );
-select json_merge( '{ "a": 2 }', '[1, 2]' );
-
-select json_merge( '{"a": 1, "b": 2 }', '{"b": 3, "d": 4 }' );
-select json_merge( '{"a": 1, "b": 2 }', '{"b": [3, 4], "d": 4 }' );
-select json_merge( '{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }' );
-select json_merge( '{"a": 1, "b": 2 }', '{"b": {"e": 7, "f": 8}, "d": 4 }' );
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": 2 }' );
-select json_merge( '{"a": 1, "b": [2, 9] }', '{"b": [10, 11], "d": 4 }' );
-select json_merge( '{"a": 1, "b": [2, 9] }', '{"b": {"e": 7, "f": 8}, "d": 4 }' );
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{"a": 1, "b": [2, 9] }' );
-select json_merge( '{"b": {"e": 7, "f": 8}, "d": 4 }', '{ "a": 1, "b": {"e": 20, "g": 21 } }' );
-
-select json_merge( '1', '2', '3' );
-select json_merge( '[1, 2 ]', '3', '[4, 5]' );
-select json_merge
+SELECT JSON_MERGE_PRESERVE('[1, 2', '[3, 4]');
+
+# good json_merge_preserve() expressions
+SELECT JSON_MERGE_PRESERVE('1', '2');
+SELECT JSON_MERGE_PRESERVE('1', '[2, 3]');
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '3');
+SELECT JSON_MERGE_PRESERVE('1', '{ "a": 2 }');
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '1');
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '[3, 4]');
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '{ "b": 3}');
+SELECT JSON_MERGE_PRESERVE('[1, 2]', '{ "a": 2 }');
+SELECT JSON_MERGE_PRESERVE('{ "a": 2 }', '[1, 2]');
+
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+                           '{"b": 3, "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+                           '{"b": [3, 4], "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 3] }', '{"b": 4, "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": 2 }',
+                           '{"b": {"e": 7, "f": 8}, "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+                           '{"a": 1, "b": 2 }');
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+                           '{"b": [10, 11], "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"a": 1, "b": [2, 9] }',
+                           '{"b": {"e": 7, "f": 8}, "d": 4 }');
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+                           '{"a": 1, "b": [2, 9] }');
+SELECT JSON_MERGE_PRESERVE('{"b": {"e": 7, "f": 8}, "d": 4 }',
+                           '{ "a": 1, "b": {"e": 20, "g": 21 } }');
+
+SELECT JSON_MERGE_PRESERVE('1', '2', '3');
+SELECT JSON_MERGE_PRESERVE('[1, 2 ]', '3', '[4, 5]');
+SELECT JSON_MERGE_PRESERVE
 (
   '{ "a": true, "b": { "c": 3, "d": 4 }, "e": [ 1, 2 ] }',
   '{ "d": false, "b": { "g": 3, "d": 5 }, "f": [ 1, 2 ] }',
@@ -550,28 +558,28 @@ select json_merge
 
 # examples from the wl7909 spec
 # returns [{"a": "foo", "b": [true, {"c": 123}]}, 5, 6]
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
   '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
   '[ 5, 6]'
 );
 
 # returns {"a": "foo", "b": [true, {"c": 123}, false, 34]}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
   '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
   '{ "b": [ false, 34 ] }'
 );
 
 # returns {"a": "foo", "b": [true, {"c": 123}, "bar"]}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
   '{ "a" : "foo", "b" : [ true, { "c" : 123 } ] }',
   '{ "b": "bar" }'
 );
 
 # returns {"a": {"b": 1, "c": 1}}
-SELECT JSON_MERGE
+SELECT JSON_MERGE_PRESERVE
 (
   '{ "a" : { "b" : 1 } }',
   '{ "a" : { "c" : 1 } }'
@@ -2287,3 +2295,20 @@ SELECT JSON_ARRAY(LEAST(NULL, NULL), GREATEST(NULL, NULL), LEAST(j1, NULL),
                   GREATEST(NULL, j2), LEAST(j1, j2), GREATEST(j1, j2)) AS j
 FROM (SELECT CAST('1' AS JSON) AS j1, CAST('2' AS JSON) AS j2) t;
 
+--echo #
+--echo # Bug#22961128: WRONG RESULT WHEN MANIPULATING RESULT OF JSON_MERGE
+--echo #
+SELECT JSON_SET(JSON_ARRAY(JSON_MERGE_PRESERVE('{"a":1}', '{"a":2}')),
+                '$[0].a', 123);
+
+--echo #
+--echo # WL#9692: Deprecate the JSON_MERGE function
+--echo #
+--echo # Expect a deprecation warning.
+SELECT JSON_MERGE('{}', '{}');
+--echo # Expect a deprecation warning when creating the view.
+CREATE VIEW v AS SELECT JSON_MERGE('{}', '{}') AS col;
+--echo # The view uses the non-deprecated variant of the function.
+SHOW CREATE VIEW v;
+SELECT * FROM v;
+DROP VIEW v;
diff --git a/mysql-test/suite/max_parts/t/disabled.def b/mysql-test/suite/max_parts/t/disabled.def
new file mode 100644
index 000000000000..e45f734ef9cd
--- /dev/null
+++ b/mysql-test/suite/max_parts/t/disabled.def
@@ -0,0 +1,23 @@
+
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+max_parts.innodb-import-partition-1 : Bug#27413612 Ashish Fails consistently on hudson jobs. Disabled until bug is fixed.
+max_parts.innodb_partition_open_files_limit @windows        : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_parts_list_innodb @windows          : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_parts_hash_innodb @windows          : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_parts_key_innodb @windows           : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_parts_inv_innodb @windows           : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_sub_parts_range_innodb @windows     : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_sub_parts_key_range_innodb @windows : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_sub_parts_key_list_innodb @windows  : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_parts_range_innodb @windows         : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+max_parts.partition_max_sub_parts_list_innodb @windows      : Bug#27681900 20.02.2018 Ashish Disabling max_parts tests on windows.
+
diff --git a/mysql-test/suite/memcached/r/memc255_change_containers_and_flush.result b/mysql-test/suite/memcached/r/memc255_change_containers_and_flush.result
new file mode 100644
index 000000000000..a0d1760e564e
--- /dev/null
+++ b/mysql-test/suite/memcached/r/memc255_change_containers_and_flush.result
@@ -0,0 +1,36 @@
+SET @tx_isolation= @@global.tx_isolation;
+Warnings:
+Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+"innodb_only", "innodb_only", "innodb_only");
+INSERT INTO config_options VALUES("separator", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+INSERT INTO containers VALUES ("desc_t2", "test", "t2",
+"c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+USE test;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(1024),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+CREATE TABLE t2 LIKE t1;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT SLEEP(2);
+SLEEP(2)
+0
+Get @@desc_t1 returned test/t1
+Get @@desc_t2 returned test/t2
+Flush all returned 1
+DROP TABLE t1;
+DROP TABLE t2;
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;
+Warnings:
+Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
diff --git a/mysql-test/suite/memcached/r/memc276_1_table.result b/mysql-test/suite/memcached/r/memc276_1_table.result
index 72808fe5e3a4..40ee51449a78 100644
--- a/mysql-test/suite/memcached/r/memc276_1_table.result
+++ b/mysql-test/suite/memcached/r/memc276_1_table.result
@@ -64,11 +64,13 @@ Oldenburg|Mitte|87654|Deich|2|B|b|Y
 Koeln|West|76543|Rhein|3|C|c|X
 Stuttgart|Nord|65432|Fernsehturm|4|D|d|U
 Here the memcached results with c2 of desct13:
+test/t1
 D|City
 O|Mitte
 K|West
 S|Nord
 Here the memcached results with c2 of desct12:
+test/t1
 D|Duesseldorf
 O|Oldenburg
 K|Koeln
diff --git a/mysql-test/suite/memcached/r/memc_api_disable_rowlock.result b/mysql-test/suite/memcached/r/memc_api_disable_rowlock.result
new file mode 100644
index 000000000000..7e315c45d9d9
--- /dev/null
+++ b/mysql-test/suite/memcached/r/memc_api_disable_rowlock.result
@@ -0,0 +1,48 @@
+SET @tx_isolation= @@global.tx_isolation;
+Warnings:
+Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+"innodb_only", "innodb_only", "innodb_only");
+INSERT INTO config_options VALUES("separator", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+USE test;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(1024),
+c21 VARCHAR(1024),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT @@global.daemon_memcached_r_batch_size;
+@@global.daemon_memcached_r_batch_size
+1
+SET @@global.daemon_memcached_r_batch_size=100;
+ERROR HY000: Variable 'daemon_memcached_r_batch_size' is a read only variable
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+SELECT SLEEP(2);
+SLEEP(2)
+0
+Here the memcached results with D,B,H,C:
+SELECT c1,c2,c21 FROM t1;
+c1	c2	c21
+B	Berlin	Mitte
+C	Cottbus	West
+D	Darmstadt	City
+H	Hamburg	Norderstedt
+DROP TABLE t1;
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
+SET @@global.tx_isolation= @tx_isolation;
+Warnings:
+Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
diff --git a/mysql-test/suite/memcached/r/memc_api_trx_level.result b/mysql-test/suite/memcached/r/memc_api_trx_level.result
new file mode 100644
index 000000000000..39314818893b
--- /dev/null
+++ b/mysql-test/suite/memcached/r/memc_api_trx_level.result
@@ -0,0 +1,23 @@
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+"innodb_only", "innodb_only", "innodb_only");
+INSERT INTO config_options VALUES("separator", "|");
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+"c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+USE test;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1        (c1 VARCHAR(32),
+c2 VARCHAR(1024),
+c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+INSERT INTO t1 VALUES ('B', 'Berlin', 0, 0, 0);
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT SLEEP(2);
+SLEEP(2)
+0
+begin;
+INSERT INTO t1 VALUES ('H', 'Hamburg', 0, 0, 0);
+Here the memcached results with H:
+commit;
+DROP TABLE t1;
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
diff --git a/mysql-test/suite/memcached/t/memc213_2_intcols.test b/mysql-test/suite/memcached/t/memc213_2_intcols.test
index ba55e49721eb..d34292262f0a 100644
--- a/mysql-test/suite/memcached/t/memc213_2_intcols.test
+++ b/mysql-test/suite/memcached/t/memc213_2_intcols.test
@@ -1,8 +1,3 @@
-#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights
-# reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc234_r_batch_1.test b/mysql-test/suite/memcached/t/memc234_r_batch_1.test
index 930e7bf44576..aed9736b81c5 100644
--- a/mysql-test/suite/memcached/t/memc234_r_batch_1.test
+++ b/mysql-test/suite/memcached/t/memc234_r_batch_1.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc245_w_batch_2.test b/mysql-test/suite/memcached/t/memc245_w_batch_2.test
index a925c1bbeb15..2ba0bd2d8d78 100644
--- a/mysql-test/suite/memcached/t/memc245_w_batch_2.test
+++ b/mysql-test/suite/memcached/t/memc245_w_batch_2.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc255_change_containers_and_flush-master.opt b/mysql-test/suite/memcached/t/memc255_change_containers_and_flush-master.opt
new file mode 100644
index 000000000000..246e6d52528e
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc255_change_containers_and_flush-master.opt
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_option="-p11255"
diff --git a/mysql-test/suite/memcached/t/memc255_change_containers_and_flush.test b/mysql-test/suite/memcached/t/memc255_change_containers_and_flush.test
new file mode 100644
index 000000000000..ac31916c95a8
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc255_change_containers_and_flush.test
@@ -0,0 +1,82 @@
+source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
+--disable_query_log
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("Warning: MySQL is trying to drop");
+--enable_query_log
+
+--enable_connect_log
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+# Create the memcached tables
+--disable_query_log
+source include/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+
+INSERT INTO containers VALUES ("desc_t2", "test", "t2",
+			       "c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+USE test;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(1024),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+CREATE TABLE t2 LIKE t1;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+SELECT SLEEP(2);
+
+perl;
+use DBI;
+use Cache::Memcached;
+
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11255" ],
+  'connect_timeout' => 20,
+  'select_timeout' => 20,
+};
+
+$key = '@@desc_t1';
+$val=$memd->get($key);
+print "Get $key returned $val\n";
+$key = '@@desc_t2';
+$val=$memd->get($key);
+print "Get $key returned $val\n";
+$res = $memd->flush_all;
+print "Flush all returned $res\n";
+$memd->disconnect_all;
+
+EOF
+
+
+DROP TABLE t1;
+DROP TABLE t2;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
+
+SET @@global.tx_isolation= @tx_isolation;
diff --git a/mysql-test/suite/memcached/t/memc276_1_table.test b/mysql-test/suite/memcached/t/memc276_1_table.test
index b249497bb964..352dfa5e9280 100644
--- a/mysql-test/suite/memcached/t/memc276_1_table.test
+++ b/mysql-test/suite/memcached/t/memc276_1_table.test
@@ -117,6 +117,7 @@ $val = $memd->get('@@desct11.S');
 if ($val) { print "$val\n"; }
 print "Here the memcached results with c2 of desct13:\n";
 $val = $memd->get('@@desct13');
+if ($val) { print "$val\n"; }
 $val = $memd->get('Duesseldorf');
 if ($val) { print "$val\n"; }
 $val = $memd->get("Oldenburg");
@@ -127,6 +128,7 @@ $val = $memd->get('Stuttgart');
 if ($val) { print "$val\n"; }
 print "Here the memcached results with c2 of desct12:\n";
 $val = $memd->get('@@desct12');
+if ($val) { print "$val\n"; }
 $val = $memd->get('Duesseldorf');
 if ($val) { print "$val\n"; }
 $val = $memd->get("Oldenburg");
diff --git a/mysql-test/suite/memcached/t/memc283_misc.test b/mysql-test/suite/memcached/t/memc283_misc.test
index b34b99a0d959..e7b620e0311d 100644
--- a/mysql-test/suite/memcached/t/memc283_misc.test
+++ b/mysql-test/suite/memcached/t/memc283_misc.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc284_misc.test b/mysql-test/suite/memcached/t/memc284_misc.test
index 7967ecf78b31..2de49691f417 100644
--- a/mysql-test/suite/memcached/t/memc284_misc.test
+++ b/mysql-test/suite/memcached/t/memc284_misc.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc285_FTWRL.test b/mysql-test/suite/memcached/t/memc285_FTWRL.test
index 92987267a4cf..96e8712e32c6 100644
--- a/mysql-test/suite/memcached/t/memc285_FTWRL.test
+++ b/mysql-test/suite/memcached/t/memc285_FTWRL.test
@@ -1,8 +1,3 @@
-#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights
-# reserved.
-#
-
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
 source include/not_windows.inc;
diff --git a/mysql-test/suite/memcached/t/memc290_read_committed.test b/mysql-test/suite/memcached/t/memc290_read_committed.test
index a8f34d4de7f7..c58295abee61 100644
--- a/mysql-test/suite/memcached/t/memc290_read_committed.test
+++ b/mysql-test/suite/memcached/t/memc290_read_committed.test
@@ -1,8 +1,3 @@
-#
-## Copyright (c) 2017, Oracle and/or its affiliates. All rights
-##reserved.
-#
-
 # Bug#20205934 - ENABLE VALGRIND FOR MEMCACHED TESTS
 source include/not_valgrind.inc;
 source include/have_memcached_plugin.inc;
diff --git a/mysql-test/suite/memcached/t/memc_api_disable_rowlock-master.opt b/mysql-test/suite/memcached/t/memc_api_disable_rowlock-master.opt
new file mode 100644
index 000000000000..97ddf8d91e06
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc_api_disable_rowlock-master.opt
@@ -0,0 +1,3 @@
+$DAEMON_MEMCACHED_OPT
+--loose-innodb-api-disable-rowlock=1
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
diff --git a/mysql-test/suite/memcached/t/memc_api_disable_rowlock.test b/mysql-test/suite/memcached/t/memc_api_disable_rowlock.test
new file mode 100644
index 000000000000..9e68aed68b85
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc_api_disable_rowlock.test
@@ -0,0 +1,91 @@
+source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
+--disable_query_log
+CALL mtr.add_suppression("daemon-memcached-r-batch-size': value");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+--enable_query_log
+
+--enable_connect_log
+SET @tx_isolation= @@global.tx_isolation;
+SET GLOBAL TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+# Create the memcached tables
+--disable_query_log
+source include/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2,c21", "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(1024),
+			c21 VARCHAR(1024),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('D', 'Darmstadt', 'City', 0, 0, 0);
+INSERT INTO t1 VALUES ('B', 'Berlin', 'Mitte', 0, 0, 0);
+INSERT INTO t1 VALUES ('C', 'Cottbus', 'West', 0, 0 ,0);
+INSERT INTO t1 VALUES ('H', 'Hamburg', 'Norderstedt', 0, 0, 0);
+
+# Tables must exist before plugin can be started!
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+--echo SELECT @@global.daemon_memcached_r_batch_size;
+--disable_query_log
+SELECT @@global.daemon_memcached_r_batch_size;
+--enable_query_log
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@global.daemon_memcached_r_batch_size=100;
+
+# The following select is writing all to  memcache otherwisw memcache is empty.
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+SELECT SLEEP(2);
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11234" ],
+  'connect_timeout' => 20,
+  'select_timeout' => 20
+};
+print "Here the memcached results with D,B,H,C:\n";
+$val = $memd->get("D");
+if ($val) { print "$val\n"; }
+$val = $memd->get("B");
+if ($val) { print "$val\n"; }
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$val = $memd->get("C");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+
+--sorted_result
+SELECT c1,c2,c21 FROM t1;
+
+DROP TABLE t1;
+
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
+
+SET @@global.tx_isolation= @tx_isolation;
diff --git a/mysql-test/suite/memcached/t/memc_api_trx_level-master.opt b/mysql-test/suite/memcached/t/memc_api_trx_level-master.opt
new file mode 100644
index 000000000000..c7a54a370da6
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc_api_trx_level-master.opt
@@ -0,0 +1,4 @@
+$DAEMON_MEMCACHED_OPT
+--loose-daemon_memcached_engine_lib_path=$INNODB_ENGINE_DIR
+--loose-daemon_memcached_option="-p11242"
+--loose-innodb_api_trx_level=1
diff --git a/mysql-test/suite/memcached/t/memc_api_trx_level.test b/mysql-test/suite/memcached/t/memc_api_trx_level.test
new file mode 100644
index 000000000000..7d6e485e307c
--- /dev/null
+++ b/mysql-test/suite/memcached/t/memc_api_trx_level.test
@@ -0,0 +1,65 @@
+source include/not_valgrind.inc;
+source include/have_memcached_plugin.inc;
+source include/not_windows.inc;
+source include/have_innodb.inc;
+
+--disable_query_log
+CALL mtr.add_suppression("daemon-memcached-w-batch-size': unsigned");
+CALL mtr.add_suppression("Could not obtain server's UPN to be used as target service name");
+CALL mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop");
+--enable_query_log
+
+--enable_connect_log
+
+# Create the memcached tables
+--disable_query_log
+source include/memcache_config.inc;
+--enable_query_log
+
+INSERT INTO cache_policies VALUES("cache_policy", "innodb_only",
+				  "innodb_only", "innodb_only", "innodb_only");
+
+INSERT INTO config_options VALUES("separator", "|");
+
+# describe table for memcache
+INSERT INTO containers VALUES ("desc_t1", "test", "t1",
+			       "c1", "c2",  "c3", "c4", "c5", "PRIMARY");
+
+USE test;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1        (c1 VARCHAR(32),
+			c2 VARCHAR(1024),
+			c3 INT, c4 BIGINT UNSIGNED, c5 INT, primary key(c1))
+ENGINE = INNODB;
+
+INSERT INTO t1 VALUES ('B', 'Berlin', 0, 0, 0);
+
+INSTALL PLUGIN daemon_memcached SONAME 'libmemcached.so';
+
+SELECT SLEEP(2);
+begin;
+INSERT INTO t1 VALUES ('H', 'Hamburg', 0, 0, 0);
+
+perl;
+use DBI;
+use Cache::Memcached;
+my $memd = new Cache::Memcached {
+  'servers' => [ "127.0.0.1:11242" ],
+  'connect_timeout' => 20,
+  'select_timeout' => 20
+};
+print "Here the memcached results with H:\n";
+$val = $memd->get("H");
+if ($val) { print "$val\n"; }
+$memd->disconnect_all;
+EOF
+commit;
+
+DROP TABLE t1;
+
+# Stop plugin befor innodb_memcached configuration
+UNINSTALL PLUGIN daemon_memcached;
+DROP DATABASE innodb_memcache;
diff --git a/mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result b/mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result
index b260420d6f86..aa8d6e93b4d5 100644
--- a/mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result
+++ b/mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result
@@ -7239,4 +7239,79 @@ NDB_PUSHED_QUERIES_DROPPED	0
 NDB_SORTED_SCAN_COUNT	0
 drop table server_counts_at_startup;
 set ndb_join_pushdown = @save_ndb_join_pushdown;
+CREATE TABLE f (
+col_int_key int DEFAULT NULL
+) ENGINE=ndbcluster;
+CREATE TABLE p (
+col_int int DEFAULT NULL,
+col_int_unique int DEFAULT NULL,
+UNIQUE KEY ix1 (col_int,col_int_unique) USING HASH
+) ENGINE=ndbcluster;
+Warnings:
+Warning	1121	Ndb does not support unique index on NULL valued attributes, index access with NULL value will become full table scan
+insert into f values (1),(NULL);
+insert into p values (NULL,1);
+explain SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int IS NULL
+AND table4.col_int_unique = table2.col_int_key;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition (`test`.`table2`.`col_int_key` is not null)
+1	SIMPLE	table4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	10	const,test.table2.col_int_key	1	100.00	Using where with pushed condition isnull(`test`.`table4`.`col_int`)
+Warnings:
+Note	1003	/* select#1 */ select `test`.`table2`.`col_int_key` AS `col_int_key`,`test`.`table4`.`col_int` AS `col_int`,`test`.`table4`.`col_int_unique` AS `col_int_unique` from `test`.`f` `table2` straight_join `test`.`p` `table4` where ((`test`.`table4`.`col_int_unique` = `test`.`table2`.`col_int_key`) and isnull(`test`.`table4`.`col_int`))
+SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int IS NULL
+AND table4.col_int_unique = table2.col_int_key;
+col_int_key	col_int	col_int_unique
+1	NULL	1
+explain SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = 1
+AND table4.col_int_unique = table2.col_int_key;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	2	100.00	Parent of 2 pushed join@1; Using where with pushed condition (`test`.`table2`.`col_int_key` is not null)
+1	SIMPLE	table4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	10	const,test.table2.col_int_key	1	100.00	Child of 'table2' in pushed join@1
+Warnings:
+Note	1003	/* select#1 */ select `test`.`table2`.`col_int_key` AS `col_int_key`,`test`.`table4`.`col_int` AS `col_int`,`test`.`table4`.`col_int_unique` AS `col_int_unique` from `test`.`f` `table2` straight_join `test`.`p` `table4` where ((`test`.`table4`.`col_int_unique` = `test`.`table2`.`col_int_key`) and (`test`.`table4`.`col_int` = 1))
+SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = 1
+AND table4.col_int_unique = table2.col_int_key;
+col_int_key	col_int	col_int_unique
+explain SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int <=> table2.col_int_key
+AND table4.col_int_unique = table2.col_int_key;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	2	100.00	Parent of 2 pushed join@1; Using where with pushed condition (`test`.`table2`.`col_int_key` is not null)
+1	SIMPLE	table4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	10	test.table2.col_int_key,test.table2.col_int_key	1	100.00	Child of 'table2' in pushed join@1; Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`table2`.`col_int_key` AS `col_int_key`,`test`.`table4`.`col_int` AS `col_int`,`test`.`table4`.`col_int_unique` AS `col_int_unique` from `test`.`f` `table2` straight_join `test`.`p` `table4` where ((`test`.`table4`.`col_int_unique` = `test`.`table2`.`col_int_key`) and (`test`.`table4`.`col_int` <=> `test`.`table2`.`col_int_key`))
+SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int <=> table2.col_int_key
+AND table4.col_int_unique = table2.col_int_key;
+col_int_key	col_int	col_int_unique
+explain SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+AND table4.col_int_unique <=> table2.col_int_key;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	2	100.00	Parent of 2 pushed join@1; Using where with pushed condition (`test`.`table2`.`col_int_key` is not null)
+1	SIMPLE	table4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	10	test.table2.col_int_key,test.table2.col_int_key	1	100.00	Child of 'table2' in pushed join@1; Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`table2`.`col_int_key` AS `col_int_key`,`test`.`table4`.`col_int` AS `col_int`,`test`.`table4`.`col_int_unique` AS `col_int_unique` from `test`.`f` `table2` straight_join `test`.`p` `table4` where ((`test`.`table4`.`col_int` = `test`.`table2`.`col_int_key`) and (`test`.`table4`.`col_int_unique` <=> `test`.`table2`.`col_int_key`))
+SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+AND table4.col_int_unique <=> table2.col_int_key;
+col_int_key	col_int	col_int_unique
+explain SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+AND table4.col_int_unique = table2.col_int_key;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	table2	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where with pushed condition ((`test`.`table2`.`col_int_key` is not null) and (`test`.`table2`.`col_int_key` is not null))
+1	SIMPLE	table4	p0,p1,p2,p3,p4,p5,p6,p7	ref	ix1	ix1	10	test.table2.col_int_key,test.table2.col_int_key	1	100.00	Using join buffer (Batched Key Access)
+Warnings:
+Note	1003	Cannot push table 'table4' as child of table 'table2'. Doing so would prevent using join buffer for table 'table4'.
+Note	1003	/* select#1 */ select `test`.`table2`.`col_int_key` AS `col_int_key`,`test`.`table4`.`col_int` AS `col_int`,`test`.`table4`.`col_int_unique` AS `col_int_unique` from `test`.`f` `table2` straight_join `test`.`p` `table4` where ((`test`.`table4`.`col_int` = `test`.`table2`.`col_int_key`) and (`test`.`table4`.`col_int_unique` = `test`.`table2`.`col_int_key`))
+SELECT * FROM f AS table2
+STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+AND table4.col_int_unique = table2.col_int_key;
+col_int_key	col_int	col_int_unique
+DROP TABLE f,p;
 set @@global.optimizer_switch=default;
diff --git a/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test b/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test
index 8973988a655d..20036ceb0c01 100644
--- a/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test
+++ b/mysql-test/suite/ndb/t/ndb_join_pushdown_bka.test
@@ -22,4 +22,87 @@ set @@global.optimizer_switch='batched_key_access=on';
 
 --source ndb_join_pushdown.inc 
 
+################################
+# BKA specific test cases / bugs
+#
+
+#Bug#32774281  MULTI-RANGE LOOKUP FAILS,
+#              ERROR 4316 'KEY ATTRIBUTES ARE NOT ALLOWED TO BE NULL'
+#
+# The MRR flag HA_MRR_NO_NULL_ENDPOINTS was specified even if
+# such a guarantee could not be made: If the join condition
+# contained a IS NULL predicate, or the '<=>' 'NULL-safe' equal
+# operator was used in the predicate, NULL values keys _are_
+# generated during execution.
+#
+# Note1: The HA_MRR_NO_NULL_ENDPOINTS flag is only used by the
+#         ha_ndcluster handler.
+#
+# Note2: HA_MRR_NO_NULL_ENDPOINTS is only checked for a
+#        'UNIQUE KEY   ... USING HASH'
+
+CREATE TABLE f (
+  col_int_key int DEFAULT NULL
+) ENGINE=ndbcluster;
+
+CREATE TABLE p (
+  col_int int DEFAULT NULL,
+  col_int_unique int DEFAULT NULL,
+  UNIQUE KEY ix1 (col_int,col_int_unique) USING HASH
+) ENGINE=ndbcluster;
+
+insert into f values (1),(NULL);
+insert into p values (NULL,1);
+
+# A IS NULL predicate will generate MRR NULL value keys
+# -> A BKA access should not be generated
+let $query=
+SELECT * FROM f AS table2
+  STRAIGHT_JOIN p AS table4 ON table4.col_int IS NULL
+                           AND table4.col_int_unique = table2.col_int_key;
+
+eval explain $query;
+--sorted_result
+eval $query;
+
+# Using a literal instead will -> BKA access
+let $query=
+SELECT * FROM f AS table2
+  STRAIGHT_JOIN p AS table4 ON table4.col_int = 1
+                           AND table4.col_int_unique = table2.col_int_key;
+
+eval explain $query;
+--sorted_result
+eval $query;
+
+
+# Similar test cases with '<=>' vs '='
+# Only '=' guarantee HA_MRR_NO_NULL_ENDPOINTS
+let $query=
+SELECT * FROM f AS table2
+  STRAIGHT_JOIN p AS table4 ON table4.col_int <=> table2.col_int_key
+                           AND table4.col_int_unique = table2.col_int_key;
+eval explain $query;
+--sorted_result
+eval $query;
+
+let $query=
+SELECT * FROM f AS table2
+  STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+                           AND table4.col_int_unique <=> table2.col_int_key;
+eval explain $query;
+--sorted_result
+eval $query;
+
+let $query=
+SELECT * FROM f AS table2
+  STRAIGHT_JOIN p AS table4 ON table4.col_int = table2.col_int_key
+                           AND table4.col_int_unique = table2.col_int_key;
+eval explain $query;
+--sorted_result
+eval $query;
+
+DROP TABLE f,p;
+
+
 set @@global.optimizer_switch=default;
diff --git a/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result b/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
index 193b81e1fcd7..749c2a1005fa 100644
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
@@ -4,31 +4,14 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 ==== Initialize ====
-[on slave]
-SET @old_binlog_format= @@global.binlog_format;
-INSTALL PLUGIN example SONAME 'ha_example.so';
 [on master]
-SET @old_binlog_format= @@global.binlog_format;
-INSTALL PLUGIN example SONAME 'ha_example.so';
+[connection master]
 CREATE TABLE t (a VARCHAR(100)) ENGINE = MYISAM;
 CREATE TABLE t_self_logging (a VARCHAR(100)) ENGINE = NDB;
-CREATE TABLE t_row (a VARCHAR(100)) ENGINE = INNODB;
-CREATE TABLE t_stmt (a VARCHAR(100)) ENGINE = EXAMPLE;
-CREATE TABLE t_slave_stmt (a VARCHAR(100)) ENGINE = MYISAM;
-CREATE TABLE t_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
-CREATE TABLE t_double_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
-CREATE TRIGGER trig_autoinc BEFORE INSERT ON t_autoinc FOR EACH ROW BEGIN INSERT INTO t_stmt VALUES ('x'); END;
-CREATE TRIGGER trig_double_autoinc BEFORE INSERT ON t_double_autoinc FOR EACH ROW BEGIN INSERT INTO t_autoinc VALUES (NULL); END;
-CREATE DATABASE other;
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 [on slave]
-DROP TABLE t_slave_stmt;
-CREATE TABLE t_slave_stmt (a INT) ENGINE = EXAMPLE;
+include/sync_slave_sql_with_master.inc
 [on master]
-BINLOG '
-1gRVSg8BAAAAZgAAAGoAAAABAAQANS4xLjM2LWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAADWBFVKEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
+[connection master]
 ==== Test ====
 ---- binlog_format=row ----
 * Modify tables of more than one engine, one of which is self-logging
@@ -40,131 +23,7 @@ SELECT * FROM t_self_logging /* Should be empty */;
 a
 SELECT * FROM t /* Should be empty */;
 a
-* Modify both row-only and stmt-only table
-CREATE TRIGGER trig_2 AFTER INSERT ON t_stmt FOR EACH ROW BEGIN INSERT INTO t_row VALUES(1); END;
-INSERT INTO t_stmt VALUES (1);
-ERROR HY000: Cannot execute statement: impossible to write to binary log since both row-incapable engines and statement-incapable engines are involved.
-SELECT * FROM t_stmt /* should be empty */;
-a
-DROP TRIGGER trig_2;
-* Stmt-only table and binlog_format=row
-INSERT INTO t_stmt VALUES (1);
-ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = ROW and at least one table uses a storage engine limited to statement-based logging.
-SELECT * FROM t_stmt /* should be empty */;
-a
-* Row injection and stmt-only table: in slave sql thread
-INSERT INTO t_slave_stmt VALUES (1);
-[on slave]
-include/wait_for_slave_sql_error_and_skip.inc [errno=1664]
-Last_SQL_Error = 'Error executing row event: 'Cannot execute statement: impossible to write to binary log since statement is in row format and at least one table uses a storage engine limited to statement-based logging.''
-SELECT * FROM t_slave_stmt /* should be empty */;
-a
-[on master]
-* Row injection and stmt-only table: use BINLOG statement
-BINLOG '
-1gRVShMBAAAALwAAAEABAAAAABcAAAAAAAAABHRlc3QABnRfc3RtdAABDwJkAAE=
-1gRVShcBAAAAIAAAAGABAAAQABcAAAAAAAEAAf/+ATE=
-';
-ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is in row format and at least one table uses a storage engine limited to statement-based logging.
-SELECT * FROM t_stmt /* should be empty */;
-a
----- binlog_format=mixed ----
-[on slave]
-include/stop_slave.inc
-SET @@global.binlog_format = MIXED;
-include/start_slave.inc
-[on master]
-SET @@global.binlog_format = MIXED;
-SET @@session.binlog_format = MIXED;
-* Unsafe statement and stmt-only engine
-INSERT INTO t_stmt VALUES (UUID());
-ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
-* Multi-unsafe statement and stmt-only engine
-INSERT INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
-ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
----- binlog_format=statement ----
-[on slave]
-include/stop_slave.inc
-SET @@global.binlog_format = STATEMENT;
-include/start_slave.inc
-[on master]
-SET @@global.binlog_format = STATEMENT;
-SET @@session.binlog_format = STATEMENT;
-* Row-only engine and binlog_format=statement: innodb-specific message
-INSERT INTO t_row VALUES (1);
-ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED.
-SELECT * FROM t_row /* should be empty */;
-a
-* Row-only engine and binlog_format=statement: generic message
-SET @@session.debug= '+d,no_innodb_binlog_errors';
-INSERT INTO t_row VALUES (1);
-ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging.
-SELECT * FROM t_row /* should be empty */;
-a
-* Same statement, but db filtered out - no error
-USE other;
-INSERT INTO test.t_row VALUES (1);
-USE test;
-SET @@session.debug= '';
-SELECT * FROM t_row /* should contain the value 1 */;
-a
-1
-* Row injection and binlog_format=statement: BINLOG statement
-BINLOG '
-cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
-cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
-';
-ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT.
-SELECT * FROM t /* should be empty */;
-a
-* Same statement, but db filtered out - no error
-USE other;
-BINLOG '
-cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
-cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
-';
-USE test;
-SELECT * FROM t /* should contain the value 1 */;
-a
-1
-DELETE FROM t;
-* Unsafe statement and binlog_format=statement
-INSERT INTO t VALUES (COALESCE(1, UUID()));
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
-SELECT * FROM t /* should contain the value 1 */;
-a
-1
-DELETE FROM t;
-* Same statement, but db filtered out - no message
-USE other;
-INSERT INTO test.t VALUES (COALESCE(1, UUID()));
-USE test;
-SELECT * FROM t /* should contain the value 1 */;
-a
-1
-DELETE FROM t;
----- master: binlog_format=mixed, slave: binlog_format=statement ----
-SET @@global.binlog_format = MIXED;
-SET @@session.binlog_format = MIXED;
-* Row injection and binlog_format=statement: in slave sql thread
-INSERT INTO t VALUES (COALESCE(1, UUID()));
-[on slave]
-include/wait_for_slave_sql_error_and_skip.inc [errno=1666]
-Last_SQL_Error = 'Error executing row event: 'Cannot execute statement: impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT.''
-SELECT * FROM t /* should be empty */;
-a
-[on master]
 ==== Clean up ====
-DROP TRIGGER trig_autoinc;
-DROP TRIGGER trig_double_autoinc;
-DROP TABLE t, t_self_logging, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
-DROP DATABASE other;
-SET @@global.binlog_format = @old_binlog_format;
-SET @@session.binlog_format = @old_binlog_format;
-UNINSTALL PLUGIN example;
-[on slave]
-SET @@global.binlog_format = @old_binlog_format;
-SET @@session.binlog_format = @old_binlog_format;
-UNINSTALL PLUGIN example;
+DROP TABLE t, t_self_logging;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test b/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test
index 92a5a726bcb8..4fdc635a3d87 100644
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test
@@ -1,24 +1,40 @@
 # ==== Purpose ====
+# The purpose of this script is to test that binary logging returns an error
+# if more than one engine is involved and at least one of them it's doing its
+# own logging (is *self-logging*), which is the case for NDB engine.
 #
-# Verify that errors or warnings are issued for all error conditions
-# related to deciding the binlog format of a statement.  The possible
-# errors are listed in a comment above decide_logging_format() in
-# sql_base.cc.
+# ==== Requirements ====
 #
-# ==== Method ====
+# R1. When more than one engine is involved in binary logging and at least one
+#     engine is self-logging then binary logging should return error
+#     `ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE`.
 #
-# Each error condition is executed; we verify that there is an error.
+# ==== Implementation ====
 #
-# ==== Related bugs ====
+# TC1. Verify that when more than one engine is involved in binary logging and
+#      at least one engine is self-logging then binary logging should return
+#      error `ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE`.
+# ------------------------------------------------------------------
+# With BINLOG_FORMAT = ROW :
+# 1) Create a trigger which inserts data in MYISAM engine upon insertion of
+#    data in NDB engine.
+# 2) Try to insert data in the NDB ENGINE.
+# 3) Verify that error `ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE` is returned.
+# 4) Verify that no data was inserted in the NDB engine.
+# 5) Verify that no data was inserted in MYISAM engine.
+#
+# ==== References ====
 #
 # BUG#39934: Slave stops for engine that only support row-based logging
-# BUG#42829: binlogging enabled for all schemas regardless of binlog-db-db / binlog-ignore-db
+# BUG#42829: binlogging enabled for all schemas regardless of binlog-db-db /
+# binlog-ignore-db
 #
 # ==== Related test cases ====
 #
-# binlog.binlog_unsafe verifies more thoroughly that a warning is
-# given for the case when an unsafe statement is executed and
-# binlog_format = STATEMENT.
+# rpl.rpl_binlog_format_errors verifies that binary logging returns an error
+# for the conditions 1 to 7 listed in the comments section of method
+# decide_logging_format(). Condition 8 requires a self-logging engine which
+# is the case of NDB and therefore it is tested in this script.
 
 # Need debug so that 'SET @@session.debug' works.
 --source include/have_debug.inc
@@ -28,61 +44,31 @@
 # under more than one binlog format.
 --source include/have_binlog_format_row.inc
 --source include/have_ndb.inc
---source include/have_innodb.inc
+# The test requires MyISAM engine
+--source include/have_myisam.inc
+# Test requires GTIDs off
+--source include/not_gtid_enabled.inc
 --source suite/ndb_rpl/ndb_master-slave.inc
 
-disable_query_log;
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-call mtr.add_suppression("Cannot execute statement: impossible to write to binary log");
-enable_query_log;
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+CALL mtr.add_suppression("Cannot execute statement: impossible to write to binary log");
+--enable_query_log
 
 --echo ==== Initialize ====
 
---echo [on slave]
---connection slave
-
-SET @old_binlog_format= @@global.binlog_format;
-INSTALL PLUGIN example SONAME 'ha_example.so';
 
 --echo [on master]
---connection master
-
-SET @old_binlog_format= @@global.binlog_format;
-INSTALL PLUGIN example SONAME 'ha_example.so';
+--source include/rpl_connection_master.inc
 
 CREATE TABLE t (a VARCHAR(100)) ENGINE = MYISAM;
 CREATE TABLE t_self_logging (a VARCHAR(100)) ENGINE = NDB;
-CREATE TABLE t_row (a VARCHAR(100)) ENGINE = INNODB;
-CREATE TABLE t_stmt (a VARCHAR(100)) ENGINE = EXAMPLE;
-CREATE TABLE t_slave_stmt (a VARCHAR(100)) ENGINE = MYISAM;
-CREATE TABLE t_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
-CREATE TABLE t_double_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
-
---eval CREATE TRIGGER trig_autoinc BEFORE INSERT ON t_autoinc FOR EACH ROW BEGIN INSERT INTO t_stmt VALUES ('x'); END
---eval CREATE TRIGGER trig_double_autoinc BEFORE INSERT ON t_double_autoinc FOR EACH ROW BEGIN INSERT INTO t_autoinc VALUES (NULL); END
-
-CREATE DATABASE other;
-
-# This makes the innodb table row-only
-SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 
 --echo [on slave]
---sync_slave_with_master
-
-DROP TABLE t_slave_stmt;
-CREATE TABLE t_slave_stmt (a INT) ENGINE = EXAMPLE;
+--source include/sync_slave_sql_with_master.inc
 
 --echo [on master]
---connection master
-
-# This is a format description event.  It is needed because any BINLOG
-# statement containing a row event must be preceded by a BINLOG
-# statement containing a format description event.
-BINLOG '
-1gRVSg8BAAAAZgAAAGoAAAABAAQANS4xLjM2LWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAADWBFVKEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
-';
-
+--source include/rpl_connection_master.inc
 
 --echo ==== Test ====
 
@@ -96,169 +82,8 @@ DROP trigger trig_1;
 SELECT * FROM t_self_logging /* Should be empty */;
 SELECT * FROM t /* Should be empty */;
 
---echo * Modify both row-only and stmt-only table
---eval CREATE TRIGGER trig_2 AFTER INSERT ON t_stmt FOR EACH ROW BEGIN INSERT INTO t_row VALUES(1); END
---error ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE
-INSERT INTO t_stmt VALUES (1);
-SELECT * FROM t_stmt /* should be empty */;
-DROP TRIGGER trig_2;
-
---echo * Stmt-only table and binlog_format=row
---error ER_BINLOG_ROW_MODE_AND_STMT_ENGINE
-INSERT INTO t_stmt VALUES (1);
-SELECT * FROM t_stmt /* should be empty */;
-
---echo * Row injection and stmt-only table: in slave sql thread
-INSERT INTO t_slave_stmt VALUES (1);
---echo [on slave]
---connection slave
-# 1664 = ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE
---let $slave_sql_errno= 1664
---let $show_slave_sql_error= 1
---source include/wait_for_slave_sql_error_and_skip.inc
---connection slave
-SELECT * FROM t_slave_stmt /* should be empty */;
-
---echo [on master]
---connection master
---echo * Row injection and stmt-only table: use BINLOG statement
-# This is a Table_map_event and a Write_rows_event. Together, they are
-# equivalent to 'INSERT INTO t_stmt VALUES (1)'
---error ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE
-BINLOG '
-1gRVShMBAAAALwAAAEABAAAAABcAAAAAAAAABHRlc3QABnRfc3RtdAABDwJkAAE=
-1gRVShcBAAAAIAAAAGABAAAQABcAAAAAAAEAAf/+ATE=
-';
-SELECT * FROM t_stmt /* should be empty */;
-
-
---echo ---- binlog_format=mixed ----
-
---echo [on slave]
---sync_slave_with_master
---source include/stop_slave.inc
-SET @@global.binlog_format = MIXED;
---source include/start_slave.inc
---echo [on master]
---connection master
-SET @@global.binlog_format = MIXED;
-SET @@session.binlog_format = MIXED;
-
---echo * Unsafe statement and stmt-only engine
---error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
-INSERT INTO t_stmt VALUES (UUID());
-
-# Concatenate two unsafe values, and then concatenate NULL to
-# that so that the result is NULL and we instead use autoinc.
---echo * Multi-unsafe statement and stmt-only engine
---error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
-INSERT INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
-
-
---echo ---- binlog_format=statement ----
-
---echo [on slave]
---sync_slave_with_master
---source include/stop_slave.inc
-SET @@global.binlog_format = STATEMENT;
---source include/start_slave.inc
---echo [on master]
---connection master
-SET @@global.binlog_format = STATEMENT;
-SET @@session.binlog_format = STATEMENT;
-
---echo * Row-only engine and binlog_format=statement: innodb-specific message
---error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE
-INSERT INTO t_row VALUES (1);
-SELECT * FROM t_row /* should be empty */;
-
-# Commented out since innodb gives an error (this is a bug)
-#--echo * Same statement, but db filtered out - no error
-#USE other;
-#INSERT INTO test.t_row VALUES (1);
-#USE test;
-
---echo * Row-only engine and binlog_format=statement: generic message
-SET @@session.debug= '+d,no_innodb_binlog_errors';
---error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE
-INSERT INTO t_row VALUES (1);
-SELECT * FROM t_row /* should be empty */;
-
---echo * Same statement, but db filtered out - no error
-USE other;
-INSERT INTO test.t_row VALUES (1);
-USE test;
-SET @@session.debug= '';
-SELECT * FROM t_row /* should contain the value 1 */;
-
---echo * Row injection and binlog_format=statement: BINLOG statement
-# This is a Table_map_event and a Write_rows_event. Together, they are
-# equivalent to 'INSERT INTO t VALUES (1)'.
---error ER_BINLOG_ROW_INJECTION_AND_STMT_MODE
-BINLOG '
-cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
-cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
-';
-SELECT * FROM t /* should be empty */;
-
---echo * Same statement, but db filtered out - no error
-# This is a Table_map_event and a Write_rows_event. Together, they are
-# equivalent to 'INSERT INTO t VALUES (1)'.
-USE other;
-BINLOG '
-cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
-cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
-';
-USE test;
-SELECT * FROM t /* should contain the value 1 */;
-DELETE FROM t;
-
---echo * Unsafe statement and binlog_format=statement
-# This will give a warning.
-INSERT INTO t VALUES (COALESCE(1, UUID()));
-SELECT * FROM t /* should contain the value 1 */;
-DELETE FROM t;
-
---echo * Same statement, but db filtered out - no message
-USE other;
-INSERT INTO test.t VALUES (COALESCE(1, UUID()));
-USE test;
-SELECT * FROM t /* should contain the value 1 */;
-DELETE FROM t;
-
-
---echo ---- master: binlog_format=mixed, slave: binlog_format=statement ----
-
-SET @@global.binlog_format = MIXED;
-SET @@session.binlog_format = MIXED;
-
---echo * Row injection and binlog_format=statement: in slave sql thread
-INSERT INTO t VALUES (COALESCE(1, UUID()));
---echo [on slave]
---connection slave
-# 1666 = ER_BINLOG_ROW_INJECTION_AND_STMT_MODE
---let $slave_sql_errno= 1666
---let $show_sql_error= 1
---source include/wait_for_slave_sql_error_and_skip.inc
---connection slave
-SELECT * FROM t /* should be empty */;
---echo [on master]
---connection master
-
-
 --echo ==== Clean up ====
-
-DROP TRIGGER trig_autoinc;
-DROP TRIGGER trig_double_autoinc;
-DROP TABLE t, t_self_logging, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
-DROP DATABASE other;
-SET @@global.binlog_format = @old_binlog_format;
-SET @@session.binlog_format = @old_binlog_format;
-UNINSTALL PLUGIN example;
---echo [on slave]
---sync_slave_with_master
-SET @@global.binlog_format = @old_binlog_format;
-SET @@session.binlog_format = @old_binlog_format;
-UNINSTALL PLUGIN example;
+DROP TABLE t, t_self_logging;
+--source include/sync_slave_sql_with_master.inc
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/opt_trace/include/range.inc b/mysql-test/suite/opt_trace/include/range.inc
index 0a80473a6a8a..c9d64c47d2c8 100644
--- a/mysql-test/suite/opt_trace/include/range.inc
+++ b/mysql-test/suite/opt_trace/include/range.inc
@@ -304,12 +304,6 @@ SELECT * FROM information_schema.OPTIMIZER_TRACE;
 --echo
 drop table t1;
 
---echo #
---echo # Tracing of when test_if_skip_sort_order() switches to another
---echo # index and we abandon ICP,
---echo # see "disabling_pushed_condition_on_old_index" in trace.
---echo #
-
 CREATE TABLE t1 (
   c1 VARCHAR(2) NOT NULL,
   i1 INTEGER NOT NULL,
diff --git a/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result b/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
index 776110fad3ec..c96f88b716c1 100644
--- a/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
+++ b/mysql-test/suite/opt_trace/r/bugs_no_prot_all.result
@@ -3244,6 +3244,8 @@ SELECT 1 FROM t1 WHERE 1 LIKE
                                 {
                                   "reconsidering_access_paths_for_index_ordering": {
                                     "clause": "ORDER BY",
+                                    "steps": [
+                                    ] /* steps */,
                                     "index_order_summary": {
                                       "table": "`t1`",
                                       "index_provides_order": true,
@@ -3623,6 +3625,8 @@ EXPLAIN SELECT c1, c2 FROM t1 ORDER BY c1 DESC LIMIT 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result b/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
index b26ce54a8eee..82bd7c72adec 100644
--- a/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
+++ b/mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
@@ -2405,6 +2405,8 @@ SELECT 1 FROM t1 WHERE 1 LIKE
                                 {
                                   "reconsidering_access_paths_for_index_ordering": {
                                     "clause": "ORDER BY",
+                                    "steps": [
+                                    ] /* steps */,
                                     "index_order_summary": {
                                       "table": "`t1`",
                                       "index_provides_order": true,
@@ -2784,6 +2786,8 @@ EXPLAIN SELECT c1, c2 FROM t1 ORDER BY c1 DESC LIMIT 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result b/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
index d066b990f89a..017bc8c42add 100644
--- a/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
+++ b/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result
@@ -3085,6 +3085,8 @@ SELECT 1 FROM t1 WHERE 1 LIKE
                                 {
                                   "reconsidering_access_paths_for_index_ordering": {
                                     "clause": "ORDER BY",
+                                    "steps": [
+                                    ] /* steps */,
                                     "index_order_summary": {
                                       "table": "`t1`",
                                       "index_provides_order": true,
@@ -3464,6 +3466,8 @@ EXPLAIN SELECT c1, c2 FROM t1 ORDER BY c1 DESC LIMIT 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result b/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
index 62d69e09860a..03b8e53c8b02 100644
--- a/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
+++ b/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
@@ -2286,6 +2286,8 @@ SELECT 1 FROM t1 WHERE 1 LIKE
                                 {
                                   "reconsidering_access_paths_for_index_ordering": {
                                     "clause": "ORDER BY",
+                                    "steps": [
+                                    ] /* steps */,
                                     "index_order_summary": {
                                       "table": "`t1`",
                                       "index_provides_order": true,
@@ -2665,6 +2667,8 @@ EXPLAIN SELECT c1, c2 FROM t1 ORDER BY c1 DESC LIMIT 1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/general_no_prot_all.result b/mysql-test/suite/opt_trace/r/general_no_prot_all.result
index 1b703fb50abb..6e08400af2df 100644
--- a/mysql-test/suite/opt_trace/r/general_no_prot_all.result
+++ b/mysql-test/suite/opt_trace/r/general_no_prot_all.result
@@ -7737,11 +7737,11 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-4 where d>7000	{
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 12,
-                "key_length": 7,
+                "row_length": 13,
+                "key_length": 9,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 87381
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
@@ -12103,7 +12103,7 @@ insert into v1 values("z", 100)	{
         "select#": 2,
         "steps": [
           {
-            "expanded_query": "/* select#2 */ select straight_join `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
+            "expanded_query": "/* select#2 */ select `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
           }
         ] /* steps */
       } /* join_preparation */
@@ -12127,7 +12127,7 @@ delete from v1 where data=100	{
         "select#": 2,
         "steps": [
           {
-            "expanded_query": "/* select#2 */ select straight_join `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
+            "expanded_query": "/* select#2 */ select `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
           }
         ] /* steps */
       } /* join_preparation */
diff --git a/mysql-test/suite/opt_trace/r/general_no_prot_none.result b/mysql-test/suite/opt_trace/r/general_no_prot_none.result
index 56310a3bd6d1..74b1be610d41 100644
--- a/mysql-test/suite/opt_trace/r/general_no_prot_none.result
+++ b/mysql-test/suite/opt_trace/r/general_no_prot_none.result
@@ -6900,11 +6900,11 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-4 where d>7000	{
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 12,
-                "key_length": 7,
+                "row_length": 13,
+                "key_length": 9,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 87381
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
@@ -11296,7 +11296,7 @@ insert into v1 values("z", 100)	{
         "select#": 2,
         "steps": [
           {
-            "expanded_query": "/* select#2 */ select straight_join `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
+            "expanded_query": "/* select#2 */ select `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
           }
         ] /* steps */
       } /* join_preparation */
@@ -11320,7 +11320,7 @@ delete from v1 where data=100	{
         "select#": 2,
         "steps": [
           {
-            "expanded_query": "/* select#2 */ select straight_join `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
+            "expanded_query": "/* select#2 */ select `t1`.`id` AS `id`,`t1`.`data` AS `data` from `t1` where (`t1`.`id` < 'c')"
           }
         ] /* steps */
       } /* join_preparation */
diff --git a/mysql-test/suite/opt_trace/r/general_ps_prot_all.result b/mysql-test/suite/opt_trace/r/general_ps_prot_all.result
index fe585f8fbded..87af234993d5 100644
--- a/mysql-test/suite/opt_trace/r/general_ps_prot_all.result
+++ b/mysql-test/suite/opt_trace/r/general_ps_prot_all.result
@@ -7642,11 +7642,11 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-4 where d>7000	{
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 12,
-                "key_length": 7,
+                "row_length": 13,
+                "key_length": 9,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 87381
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
diff --git a/mysql-test/suite/opt_trace/r/general_ps_prot_none.result b/mysql-test/suite/opt_trace/r/general_ps_prot_none.result
index 9acca49bcf3d..28db82accf9f 100644
--- a/mysql-test/suite/opt_trace/r/general_ps_prot_none.result
+++ b/mysql-test/suite/opt_trace/r/general_ps_prot_none.result
@@ -6816,11 +6816,11 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-4 where d>7000	{
             "creating_tmp_table": {
               "tmp_table_info": {
                 "table": "intermediate_tmp_table",
-                "row_length": 12,
-                "key_length": 7,
+                "row_length": 13,
+                "key_length": 9,
                 "unique_constraint": false,
                 "location": "memory (heap)",
-                "row_limit_estimate": 87381
+                "row_limit_estimate": 80659
               } /* tmp_table_info */
             } /* creating_tmp_table */
           },
diff --git a/mysql-test/suite/opt_trace/r/range_no_prot.result b/mysql-test/suite/opt_trace/r/range_no_prot.result
index 972e20257fb7..80b09ae3fc84 100644
--- a/mysql-test/suite/opt_trace/r/range_no_prot.result
+++ b/mysql-test/suite/opt_trace/r/range_no_prot.result
@@ -895,6 +895,8 @@ EXPLAIN SELECT key2, MIN(key2_1) FROM t2 GROUP BY key2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -1121,6 +1123,8 @@ EXPLAIN SELECT DISTINCT key2 FROM t2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -1438,6 +1442,8 @@ GROUP BY key2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -4751,71 +4757,75 @@ EXPLAIN SELECT * FROM t1 WHERE i1 > '2' ORDER BY i1, i2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
-              "rows_estimation": {
-                "table": "`t1`",
-                "index": "k2",
-                "range_analysis": {
-                  "table_scan": {
-                    "rows": 2,
-                    "cost": 4.5049
-                  } /* table_scan */,
-                  "potential_range_indexes": [
-                    {
-                      "index": "k1",
-                      "usable": false,
-                      "cause": "not_applicable"
-                    },
-                    {
-                      "index": "k2",
-                      "usable": true,
-                      "key_parts": [
-                        "i1",
-                        "i2"
-                      ] /* key_parts */
-                    }
-                  ] /* potential_range_indexes */,
-                  "setup_range_conditions": [
-                  ] /* setup_range_conditions */,
-                  "group_index_range": {
-                    "chosen": false,
-                    "cause": "not_group_by_or_distinct"
-                  } /* group_index_range */,
-                  "analyzing_range_alternatives": {
-                    "range_scan_alternatives": [
-                      {
-                        "index": "k2",
-                        "ranges": [
-                          "2 < i1"
-                        ] /* ranges */,
-                        "index_dives_for_eq_ranges": true,
-                        "rowid_ordered": false,
-                        "using_mrr": false,
-                        "index_only": false,
+              "steps": [
+                {
+                  "rows_estimation": {
+                    "table": "`t1`",
+                    "index": "k2",
+                    "range_analysis": {
+                      "table_scan": {
                         "rows": 2,
-                        "cost": 3.41,
+                        "cost": 4.5049
+                      } /* table_scan */,
+                      "potential_range_indexes": [
+                        {
+                          "index": "k1",
+                          "usable": false,
+                          "cause": "not_applicable"
+                        },
+                        {
+                          "index": "k2",
+                          "usable": true,
+                          "key_parts": [
+                            "i1",
+                            "i2"
+                          ] /* key_parts */
+                        }
+                      ] /* potential_range_indexes */,
+                      "setup_range_conditions": [
+                      ] /* setup_range_conditions */,
+                      "group_index_range": {
+                        "chosen": false,
+                        "cause": "not_group_by_or_distinct"
+                      } /* group_index_range */,
+                      "analyzing_range_alternatives": {
+                        "range_scan_alternatives": [
+                          {
+                            "index": "k2",
+                            "ranges": [
+                              "2 < i1"
+                            ] /* ranges */,
+                            "index_dives_for_eq_ranges": true,
+                            "rowid_ordered": false,
+                            "using_mrr": false,
+                            "index_only": false,
+                            "rows": 2,
+                            "cost": 3.41,
+                            "chosen": true
+                          }
+                        ] /* range_scan_alternatives */,
+                        "analyzing_roworder_intersect": {
+                          "usable": false,
+                          "cause": "too_few_roworder_scans"
+                        } /* analyzing_roworder_intersect */
+                      } /* analyzing_range_alternatives */,
+                      "chosen_range_access_summary": {
+                        "range_access_plan": {
+                          "type": "range_scan",
+                          "index": "k2",
+                          "rows": 2,
+                          "ranges": [
+                            "2 < i1"
+                          ] /* ranges */
+                        } /* range_access_plan */,
+                        "rows_for_plan": 2,
+                        "cost_for_plan": 3.41,
                         "chosen": true
-                      }
-                    ] /* range_scan_alternatives */,
-                    "analyzing_roworder_intersect": {
-                      "usable": false,
-                      "cause": "too_few_roworder_scans"
-                    } /* analyzing_roworder_intersect */
-                  } /* analyzing_range_alternatives */,
-                  "chosen_range_access_summary": {
-                    "range_access_plan": {
-                      "type": "range_scan",
-                      "index": "k2",
-                      "rows": 2,
-                      "ranges": [
-                        "2 < i1"
-                      ] /* ranges */
-                    } /* range_access_plan */,
-                    "rows_for_plan": 2,
-                    "cost_for_plan": 3.41,
-                    "chosen": true
-                  } /* chosen_range_access_summary */
-                } /* range_analysis */
-              } /* rows_estimation */,
+                      } /* chosen_range_access_summary */
+                    } /* range_analysis */
+                  } /* rows_estimation */
+                }
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5083,6 +5093,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5095,6 +5107,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5120,6 +5134,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5414,67 +5430,69 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AND v = 'a' AND pk < 3	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 5,
-                  "cost": 4.1
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  },
-                  {
-                    "index": "i1_idx",
-                    "usable": true,
-                    "key_parts": [
-                      "i1",
-                      "pk"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "v_idx",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "best_covering_index_scan": {
-                  "index": "v_idx",
-                  "cost": 2.0063,
-                  "chosen": true
-                } /* best_covering_index_scan */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "chosen": false,
-                  "cause": "not_group_by_or_distinct"
-                } /* group_index_range */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 5,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
+                    {
+                      "index": "PRIMARY",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    },
                     {
                       "index": "i1_idx",
-                      "ranges": [
-                        "1 <= i1 <= 1 AND pk < 3"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": false,
-                      "rows": 1,
-                      "cost": 2.21,
-                      "chosen": false,
-                      "cause": "cost"
+                      "usable": true,
+                      "key_parts": [
+                        "i1",
+                        "pk"
+                      ] /* key_parts */
+                    },
+                    {
+                      "index": "v_idx",
+                      "usable": false,
+                      "cause": "not_applicable"
                     }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                  ] /* potential_range_indexes */,
+                  "best_covering_index_scan": {
+                    "index": "v_idx",
+                    "cost": 2.0063,
+                    "chosen": true
+                  } /* best_covering_index_scan */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "chosen": false,
+                    "cause": "not_group_by_or_distinct"
+                  } /* group_index_range */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "i1_idx",
+                        "ranges": [
+                          "1 <= i1 <= 1 AND pk < 3"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": false,
+                        "rows": 1,
+                        "cost": 2.21,
+                        "chosen": false,
+                        "cause": "cost"
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "attaching_conditions_to_tables": {
@@ -5796,75 +5814,77 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AND i2 = 1  AND v = 'a' AND pk < 3	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 5,
-                  "cost": 4.1
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  },
-                  {
-                    "index": "v_idx",
-                    "usable": true,
-                    "key_parts": [
-                      "v",
-                      "i1",
-                      "pk"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "i1_i2_idx",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "chosen": false,
-                  "cause": "not_group_by_or_distinct"
-                } /* group_index_range */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 5,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
                     {
+                      "index": "PRIMARY",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    },
+                    {
+                      "index": "v_idx",
+                      "usable": true,
+                      "key_parts": [
+                        "v",
+                        "i1",
+                        "pk"
+                      ] /* key_parts */
+                    },
+                    {
+                      "index": "i1_i2_idx",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    }
+                  ] /* potential_range_indexes */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "chosen": false,
+                    "cause": "not_group_by_or_distinct"
+                  } /* group_index_range */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "v_idx",
+                        "ranges": [
+                          "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": false,
+                        "rows": 1,
+                        "cost": 2.21,
+                        "chosen": true
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */,
+                  "chosen_range_access_summary": {
+                    "range_access_plan": {
+                      "type": "range_scan",
                       "index": "v_idx",
+                      "rows": 1,
                       "ranges": [
                         "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": false,
-                      "rows": 1,
-                      "cost": 2.21,
-                      "chosen": true
-                    }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */,
-                "chosen_range_access_summary": {
-                  "range_access_plan": {
-                    "type": "range_scan",
-                    "index": "v_idx",
-                    "rows": 1,
-                    "ranges": [
-                      "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
-                    ] /* ranges */
-                  } /* range_access_plan */,
-                  "rows_for_plan": 1,
-                  "cost_for_plan": 2.21,
-                  "chosen": true
-                } /* chosen_range_access_summary */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                      ] /* ranges */
+                    } /* range_access_plan */,
+                    "rows_for_plan": 1,
+                    "cost_for_plan": 2.21,
+                    "chosen": true
+                  } /* chosen_range_access_summary */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "access_type_changed": {
@@ -6142,89 +6162,50 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 4,
-                  "cost": 3.9
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": true,
-                    "key_parts": [
-                      "a",
-                      "b"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "b",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "best_covering_index_scan": {
-                  "index": "b",
-                  "cost": 1.8044,
-                  "chosen": true
-                } /* best_covering_index_scan */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "potential_group_range_indexes": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 4,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
                     {
                       "index": "PRIMARY",
-                      "covering": true,
-                      "index_dives_for_eq_ranges": true,
-                      "ranges": [
-                        "1 <= a <= 1 AND b < 2"
-                      ] /* ranges */,
-                      "rows": 2,
-                      "cost": 1.6
-                    }
-                  ] /* potential_group_range_indexes */
-                } /* group_index_range */,
-                "best_group_range_summary": {
-                  "type": "index_group",
-                  "index": "PRIMARY",
-                  "group_attribute": "b",
-                  "min_aggregate": false,
-                  "max_aggregate": true,
-                  "distinct_aggregate": false,
-                  "rows": 2,
-                  "cost": 1.6,
-                  "key_parts_used_for_access": [
-                    "a"
-                  ] /* key_parts_used_for_access */,
-                  "ranges": [
-                    "1 <= a <= 1 AND b < 2"
-                  ] /* ranges */,
-                  "chosen": true
-                } /* best_group_range_summary */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+                      "usable": true,
+                      "key_parts": [
+                        "a",
+                        "b"
+                      ] /* key_parts */
+                    },
                     {
-                      "index": "PRIMARY",
-                      "ranges": [
-                        "1 <= a <= 1 AND b < 2"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": true,
-                      "rows": 2,
-                      "cost": 2.41,
-                      "chosen": false,
-                      "cause": "cost"
+                      "index": "b",
+                      "usable": false,
+                      "cause": "not_applicable"
                     }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */,
-                "chosen_range_access_summary": {
-                  "range_access_plan": {
+                  ] /* potential_range_indexes */,
+                  "best_covering_index_scan": {
+                    "index": "b",
+                    "cost": 1.8044,
+                    "chosen": true
+                  } /* best_covering_index_scan */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "potential_group_range_indexes": [
+                      {
+                        "index": "PRIMARY",
+                        "covering": true,
+                        "index_dives_for_eq_ranges": true,
+                        "ranges": [
+                          "1 <= a <= 1 AND b < 2"
+                        ] /* ranges */,
+                        "rows": 2,
+                        "cost": 1.6
+                      }
+                    ] /* potential_group_range_indexes */
+                  } /* group_index_range */,
+                  "best_group_range_summary": {
                     "type": "index_group",
                     "index": "PRIMARY",
                     "group_attribute": "b",
@@ -6238,14 +6219,55 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
                     ] /* key_parts_used_for_access */,
                     "ranges": [
                       "1 <= a <= 1 AND b < 2"
-                    ] /* ranges */
-                  } /* range_access_plan */,
-                  "rows_for_plan": 2,
-                  "cost_for_plan": 1.6,
-                  "chosen": true
-                } /* chosen_range_access_summary */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                    ] /* ranges */,
+                    "chosen": true
+                  } /* best_group_range_summary */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "PRIMARY",
+                        "ranges": [
+                          "1 <= a <= 1 AND b < 2"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": true,
+                        "rows": 2,
+                        "cost": 2.41,
+                        "chosen": false,
+                        "cause": "cost"
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */,
+                  "chosen_range_access_summary": {
+                    "range_access_plan": {
+                      "type": "index_group",
+                      "index": "PRIMARY",
+                      "group_attribute": "b",
+                      "min_aggregate": false,
+                      "max_aggregate": true,
+                      "distinct_aggregate": false,
+                      "rows": 2,
+                      "cost": 1.6,
+                      "key_parts_used_for_access": [
+                        "a"
+                      ] /* key_parts_used_for_access */,
+                      "ranges": [
+                        "1 <= a <= 1 AND b < 2"
+                      ] /* ranges */
+                    } /* range_access_plan */,
+                    "rows_for_plan": 2,
+                    "cost_for_plan": 1.6,
+                    "chosen": true
+                  } /* chosen_range_access_summary */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "access_type_changed": {
@@ -6304,11 +6326,6 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
 }	0	0
 
 drop table t1;
-#
-# Tracing of when test_if_skip_sort_order() switches to another
-# index and we abandon ICP,
-# see "disabling_pushed_condition_on_old_index" in trace.
-#
 CREATE TABLE t1 (
 c1 VARCHAR(2) NOT NULL,
 i1 INTEGER NOT NULL,
@@ -6546,6 +6563,8 @@ EXPLAIN SELECT * FROM t1 WHERE c1 = '1' ORDER BY i1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/range_ps_prot.result b/mysql-test/suite/opt_trace/r/range_ps_prot.result
index e32a0f7ffb30..1a5814dacb6f 100644
--- a/mysql-test/suite/opt_trace/r/range_ps_prot.result
+++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result
@@ -895,6 +895,8 @@ EXPLAIN SELECT key2, MIN(key2_1) FROM t2 GROUP BY key2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -1121,6 +1123,8 @@ EXPLAIN SELECT DISTINCT key2 FROM t2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -1438,6 +1442,8 @@ GROUP BY key2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t2`",
                 "index_provides_order": true,
@@ -4751,71 +4757,75 @@ EXPLAIN SELECT * FROM t1 WHERE i1 > '2' ORDER BY i1, i2	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
-              "rows_estimation": {
-                "table": "`t1`",
-                "index": "k2",
-                "range_analysis": {
-                  "table_scan": {
-                    "rows": 2,
-                    "cost": 4.5049
-                  } /* table_scan */,
-                  "potential_range_indexes": [
-                    {
-                      "index": "k1",
-                      "usable": false,
-                      "cause": "not_applicable"
-                    },
-                    {
-                      "index": "k2",
-                      "usable": true,
-                      "key_parts": [
-                        "i1",
-                        "i2"
-                      ] /* key_parts */
-                    }
-                  ] /* potential_range_indexes */,
-                  "setup_range_conditions": [
-                  ] /* setup_range_conditions */,
-                  "group_index_range": {
-                    "chosen": false,
-                    "cause": "not_group_by_or_distinct"
-                  } /* group_index_range */,
-                  "analyzing_range_alternatives": {
-                    "range_scan_alternatives": [
-                      {
-                        "index": "k2",
-                        "ranges": [
-                          "2 < i1"
-                        ] /* ranges */,
-                        "index_dives_for_eq_ranges": true,
-                        "rowid_ordered": false,
-                        "using_mrr": false,
-                        "index_only": false,
+              "steps": [
+                {
+                  "rows_estimation": {
+                    "table": "`t1`",
+                    "index": "k2",
+                    "range_analysis": {
+                      "table_scan": {
                         "rows": 2,
-                        "cost": 3.41,
+                        "cost": 4.5049
+                      } /* table_scan */,
+                      "potential_range_indexes": [
+                        {
+                          "index": "k1",
+                          "usable": false,
+                          "cause": "not_applicable"
+                        },
+                        {
+                          "index": "k2",
+                          "usable": true,
+                          "key_parts": [
+                            "i1",
+                            "i2"
+                          ] /* key_parts */
+                        }
+                      ] /* potential_range_indexes */,
+                      "setup_range_conditions": [
+                      ] /* setup_range_conditions */,
+                      "group_index_range": {
+                        "chosen": false,
+                        "cause": "not_group_by_or_distinct"
+                      } /* group_index_range */,
+                      "analyzing_range_alternatives": {
+                        "range_scan_alternatives": [
+                          {
+                            "index": "k2",
+                            "ranges": [
+                              "2 < i1"
+                            ] /* ranges */,
+                            "index_dives_for_eq_ranges": true,
+                            "rowid_ordered": false,
+                            "using_mrr": false,
+                            "index_only": false,
+                            "rows": 2,
+                            "cost": 3.41,
+                            "chosen": true
+                          }
+                        ] /* range_scan_alternatives */,
+                        "analyzing_roworder_intersect": {
+                          "usable": false,
+                          "cause": "too_few_roworder_scans"
+                        } /* analyzing_roworder_intersect */
+                      } /* analyzing_range_alternatives */,
+                      "chosen_range_access_summary": {
+                        "range_access_plan": {
+                          "type": "range_scan",
+                          "index": "k2",
+                          "rows": 2,
+                          "ranges": [
+                            "2 < i1"
+                          ] /* ranges */
+                        } /* range_access_plan */,
+                        "rows_for_plan": 2,
+                        "cost_for_plan": 3.41,
                         "chosen": true
-                      }
-                    ] /* range_scan_alternatives */,
-                    "analyzing_roworder_intersect": {
-                      "usable": false,
-                      "cause": "too_few_roworder_scans"
-                    } /* analyzing_roworder_intersect */
-                  } /* analyzing_range_alternatives */,
-                  "chosen_range_access_summary": {
-                    "range_access_plan": {
-                      "type": "range_scan",
-                      "index": "k2",
-                      "rows": 2,
-                      "ranges": [
-                        "2 < i1"
-                      ] /* ranges */
-                    } /* range_access_plan */,
-                    "rows_for_plan": 2,
-                    "cost_for_plan": 3.41,
-                    "chosen": true
-                  } /* chosen_range_access_summary */
-                } /* range_analysis */
-              } /* rows_estimation */,
+                      } /* chosen_range_access_summary */
+                    } /* range_analysis */
+                  } /* rows_estimation */
+                }
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5083,6 +5093,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5095,6 +5107,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5120,6 +5134,8 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE i1 >= '1' ORDER BY i1 DESC	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "GROUP BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
@@ -5414,67 +5430,69 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AND v = 'a' AND pk < 3	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 5,
-                  "cost": 4.1
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  },
-                  {
-                    "index": "i1_idx",
-                    "usable": true,
-                    "key_parts": [
-                      "i1",
-                      "pk"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "v_idx",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "best_covering_index_scan": {
-                  "index": "v_idx",
-                  "cost": 2.0063,
-                  "chosen": true
-                } /* best_covering_index_scan */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "chosen": false,
-                  "cause": "not_group_by_or_distinct"
-                } /* group_index_range */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 5,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
+                    {
+                      "index": "PRIMARY",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    },
                     {
                       "index": "i1_idx",
-                      "ranges": [
-                        "1 <= i1 <= 1 AND pk < 3"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": false,
-                      "rows": 1,
-                      "cost": 2.21,
-                      "chosen": false,
-                      "cause": "cost"
+                      "usable": true,
+                      "key_parts": [
+                        "i1",
+                        "pk"
+                      ] /* key_parts */
+                    },
+                    {
+                      "index": "v_idx",
+                      "usable": false,
+                      "cause": "not_applicable"
                     }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                  ] /* potential_range_indexes */,
+                  "best_covering_index_scan": {
+                    "index": "v_idx",
+                    "cost": 2.0063,
+                    "chosen": true
+                  } /* best_covering_index_scan */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "chosen": false,
+                    "cause": "not_group_by_or_distinct"
+                  } /* group_index_range */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "i1_idx",
+                        "ranges": [
+                          "1 <= i1 <= 1 AND pk < 3"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": false,
+                        "rows": 1,
+                        "cost": 2.21,
+                        "chosen": false,
+                        "cause": "cost"
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "attaching_conditions_to_tables": {
@@ -5796,75 +5814,77 @@ EXPLAIN SELECT v FROM t1 WHERE i1 = 1 AND i2 = 1  AND v = 'a' AND pk < 3	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 5,
-                  "cost": 4.1
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  },
-                  {
-                    "index": "v_idx",
-                    "usable": true,
-                    "key_parts": [
-                      "v",
-                      "i1",
-                      "pk"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "i1_i2_idx",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "chosen": false,
-                  "cause": "not_group_by_or_distinct"
-                } /* group_index_range */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 5,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
+                    {
+                      "index": "PRIMARY",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    },
+                    {
+                      "index": "v_idx",
+                      "usable": true,
+                      "key_parts": [
+                        "v",
+                        "i1",
+                        "pk"
+                      ] /* key_parts */
+                    },
                     {
+                      "index": "i1_i2_idx",
+                      "usable": false,
+                      "cause": "not_applicable"
+                    }
+                  ] /* potential_range_indexes */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "chosen": false,
+                    "cause": "not_group_by_or_distinct"
+                  } /* group_index_range */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "v_idx",
+                        "ranges": [
+                          "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": false,
+                        "rows": 1,
+                        "cost": 2.21,
+                        "chosen": true
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */,
+                  "chosen_range_access_summary": {
+                    "range_access_plan": {
+                      "type": "range_scan",
                       "index": "v_idx",
+                      "rows": 1,
                       "ranges": [
                         "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": false,
-                      "rows": 1,
-                      "cost": 2.21,
-                      "chosen": true
-                    }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */,
-                "chosen_range_access_summary": {
-                  "range_access_plan": {
-                    "type": "range_scan",
-                    "index": "v_idx",
-                    "rows": 1,
-                    "ranges": [
-                      "a <= v <= a AND 1 <= i1 <= 1 AND pk < 3"
-                    ] /* ranges */
-                  } /* range_access_plan */,
-                  "rows_for_plan": 1,
-                  "cost_for_plan": 2.21,
-                  "chosen": true
-                } /* chosen_range_access_summary */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                      ] /* ranges */
+                    } /* range_access_plan */,
+                    "rows_for_plan": 1,
+                    "cost_for_plan": 2.21,
+                    "chosen": true
+                  } /* chosen_range_access_summary */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "access_type_changed": {
@@ -6142,89 +6162,50 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
             ] /* considered_execution_plans */
           },
           {
-            "rerunning_range_optimizer_for_single_index": [
-              {
-                "table_scan": {
-                  "rows": 4,
-                  "cost": 3.9
-                } /* table_scan */,
-                "potential_range_indexes": [
-                  {
-                    "index": "PRIMARY",
-                    "usable": true,
-                    "key_parts": [
-                      "a",
-                      "b"
-                    ] /* key_parts */
-                  },
-                  {
-                    "index": "b",
-                    "usable": false,
-                    "cause": "not_applicable"
-                  }
-                ] /* potential_range_indexes */,
-                "best_covering_index_scan": {
-                  "index": "b",
-                  "cost": 1.8044,
-                  "chosen": true
-                } /* best_covering_index_scan */,
-                "setup_range_conditions": [
-                ] /* setup_range_conditions */,
-                "group_index_range": {
-                  "potential_group_range_indexes": [
+            "check_if_range_uses_more_keyparts_than_ref": {
+              "rerunning_range_optimizer_for_single_index": {
+                "range_analysis": {
+                  "table_scan": {
+                    "rows": 4,
+                    "cost": 2e308
+                  } /* table_scan */,
+                  "potential_range_indexes": [
                     {
                       "index": "PRIMARY",
-                      "covering": true,
-                      "index_dives_for_eq_ranges": true,
-                      "ranges": [
-                        "1 <= a <= 1 AND b < 2"
-                      ] /* ranges */,
-                      "rows": 2,
-                      "cost": 1.6
-                    }
-                  ] /* potential_group_range_indexes */
-                } /* group_index_range */,
-                "best_group_range_summary": {
-                  "type": "index_group",
-                  "index": "PRIMARY",
-                  "group_attribute": "b",
-                  "min_aggregate": false,
-                  "max_aggregate": true,
-                  "distinct_aggregate": false,
-                  "rows": 2,
-                  "cost": 1.6,
-                  "key_parts_used_for_access": [
-                    "a"
-                  ] /* key_parts_used_for_access */,
-                  "ranges": [
-                    "1 <= a <= 1 AND b < 2"
-                  ] /* ranges */,
-                  "chosen": true
-                } /* best_group_range_summary */,
-                "analyzing_range_alternatives": {
-                  "range_scan_alternatives": [
+                      "usable": true,
+                      "key_parts": [
+                        "a",
+                        "b"
+                      ] /* key_parts */
+                    },
                     {
-                      "index": "PRIMARY",
-                      "ranges": [
-                        "1 <= a <= 1 AND b < 2"
-                      ] /* ranges */,
-                      "index_dives_for_eq_ranges": true,
-                      "rowid_ordered": true,
-                      "using_mrr": false,
-                      "index_only": true,
-                      "rows": 2,
-                      "cost": 2.41,
-                      "chosen": false,
-                      "cause": "cost"
+                      "index": "b",
+                      "usable": false,
+                      "cause": "not_applicable"
                     }
-                  ] /* range_scan_alternatives */,
-                  "analyzing_roworder_intersect": {
-                    "usable": false,
-                    "cause": "too_few_roworder_scans"
-                  } /* analyzing_roworder_intersect */
-                } /* analyzing_range_alternatives */,
-                "chosen_range_access_summary": {
-                  "range_access_plan": {
+                  ] /* potential_range_indexes */,
+                  "best_covering_index_scan": {
+                    "index": "b",
+                    "cost": 1.8044,
+                    "chosen": true
+                  } /* best_covering_index_scan */,
+                  "setup_range_conditions": [
+                  ] /* setup_range_conditions */,
+                  "group_index_range": {
+                    "potential_group_range_indexes": [
+                      {
+                        "index": "PRIMARY",
+                        "covering": true,
+                        "index_dives_for_eq_ranges": true,
+                        "ranges": [
+                          "1 <= a <= 1 AND b < 2"
+                        ] /* ranges */,
+                        "rows": 2,
+                        "cost": 1.6
+                      }
+                    ] /* potential_group_range_indexes */
+                  } /* group_index_range */,
+                  "best_group_range_summary": {
                     "type": "index_group",
                     "index": "PRIMARY",
                     "group_attribute": "b",
@@ -6238,14 +6219,55 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
                     ] /* key_parts_used_for_access */,
                     "ranges": [
                       "1 <= a <= 1 AND b < 2"
-                    ] /* ranges */
-                  } /* range_access_plan */,
-                  "rows_for_plan": 2,
-                  "cost_for_plan": 1.6,
-                  "chosen": true
-                } /* chosen_range_access_summary */
-              } /* range_analysis */
-            ] /* rerunning_range_optimizer_for_single_index */
+                    ] /* ranges */,
+                    "chosen": true
+                  } /* best_group_range_summary */,
+                  "analyzing_range_alternatives": {
+                    "range_scan_alternatives": [
+                      {
+                        "index": "PRIMARY",
+                        "ranges": [
+                          "1 <= a <= 1 AND b < 2"
+                        ] /* ranges */,
+                        "index_dives_for_eq_ranges": true,
+                        "rowid_ordered": true,
+                        "using_mrr": false,
+                        "index_only": true,
+                        "rows": 2,
+                        "cost": 2.41,
+                        "chosen": false,
+                        "cause": "cost"
+                      }
+                    ] /* range_scan_alternatives */,
+                    "analyzing_roworder_intersect": {
+                      "usable": false,
+                      "cause": "too_few_roworder_scans"
+                    } /* analyzing_roworder_intersect */
+                  } /* analyzing_range_alternatives */,
+                  "chosen_range_access_summary": {
+                    "range_access_plan": {
+                      "type": "index_group",
+                      "index": "PRIMARY",
+                      "group_attribute": "b",
+                      "min_aggregate": false,
+                      "max_aggregate": true,
+                      "distinct_aggregate": false,
+                      "rows": 2,
+                      "cost": 1.6,
+                      "key_parts_used_for_access": [
+                        "a"
+                      ] /* key_parts_used_for_access */,
+                      "ranges": [
+                        "1 <= a <= 1 AND b < 2"
+                      ] /* ranges */
+                    } /* range_access_plan */,
+                    "rows_for_plan": 2,
+                    "cost_for_plan": 1.6,
+                    "chosen": true
+                  } /* chosen_range_access_summary */
+                } /* range_analysis */
+              } /* rerunning_range_optimizer_for_single_index */
+            } /* check_if_range_uses_more_keyparts_than_ref */
           },
           {
             "access_type_changed": {
@@ -6304,11 +6326,6 @@ EXPLAIN SELECT MAX(b), a FROM t1 WHERE b < 2 AND a = 1 GROUP BY a	{
 }	0	0
 
 drop table t1;
-#
-# Tracing of when test_if_skip_sort_order() switches to another
-# index and we abandon ICP,
-# see "disabling_pushed_condition_on_old_index" in trace.
-#
 CREATE TABLE t1 (
 c1 VARCHAR(2) NOT NULL,
 i1 INTEGER NOT NULL,
@@ -6546,6 +6563,8 @@ EXPLAIN SELECT * FROM t1 WHERE c1 = '1' ORDER BY i1	{
           {
             "reconsidering_access_paths_for_index_ordering": {
               "clause": "ORDER BY",
+              "steps": [
+              ] /* steps */,
               "index_order_summary": {
                 "table": "`t1`",
                 "index_provides_order": true,
diff --git a/mysql-test/suite/opt_trace/r/subquery_no_prot.result b/mysql-test/suite/opt_trace/r/subquery_no_prot.result
index a97a5c33008d..5bb923a43a5b 100644
--- a/mysql-test/suite/opt_trace/r/subquery_no_prot.result
+++ b/mysql-test/suite/opt_trace/r/subquery_no_prot.result
@@ -431,6 +431,18 @@ t1.a= (SELECT a FROM t2 LIMIT 1)	{
               "steps": [
                 {
                   "transformation": "equality_propagation",
+                  "subselect_evaluation": [
+                  ] /* subselect_evaluation */,
+                  "resulting_condition": "(((/* select#2 */ select `t2`.`b` from `t2` limit 1) <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select `t2`.`b` from `t2` limit 1), `t1`.`a`))"
+                },
+                {
+                  "transformation": "constant_propagation",
+                  "subselect_evaluation": [
+                  ] /* subselect_evaluation */,
+                  "resulting_condition": "(((/* select#2 */ select `t2`.`b` from `t2` limit 1) <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select `t2`.`b` from `t2` limit 1), `t1`.`a`))"
+                },
+                {
+                  "transformation": "trivial_condition_removal",
                   "subselect_evaluation": [
                     {
                       "subselect_execution": {
@@ -477,27 +489,8 @@ t1.a= (SELECT a FROM t2 LIMIT 1)	{
                           }
                         ] /* steps */
                       } /* subselect_execution */
-                    },
-                    {
-                      "subselect_execution": {
-                        "select#": 2,
-                        "steps": [
-                        ] /* steps */
-                      } /* subselect_execution */
                     }
                   ] /* subselect_evaluation */,
-                  "resulting_condition": "((NULL <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select NULL from `t2` limit 1), `t1`.`a`))"
-                },
-                {
-                  "transformation": "constant_propagation",
-                  "subselect_evaluation": [
-                  ] /* subselect_evaluation */,
-                  "resulting_condition": "((NULL <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select NULL from `t2` limit 1), `t1`.`a`))"
-                },
-                {
-                  "transformation": "trivial_condition_removal",
-                  "subselect_evaluation": [
-                  ] /* subselect_evaluation */,
                   "resulting_condition": null
                 }
               ] /* steps */
diff --git a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result
index 1588d73a2c7a..33798eccf3ab 100644
--- a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result
+++ b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result
@@ -431,6 +431,18 @@ t1.a= (SELECT a FROM t2 LIMIT 1)	{
               "steps": [
                 {
                   "transformation": "equality_propagation",
+                  "subselect_evaluation": [
+                  ] /* subselect_evaluation */,
+                  "resulting_condition": "(((/* select#2 */ select `t2`.`b` from `t2` limit 1) <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select `t2`.`b` from `t2` limit 1), `t1`.`a`))"
+                },
+                {
+                  "transformation": "constant_propagation",
+                  "subselect_evaluation": [
+                  ] /* subselect_evaluation */,
+                  "resulting_condition": "(((/* select#2 */ select `t2`.`b` from `t2` limit 1) <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select `t2`.`b` from `t2` limit 1), `t1`.`a`))"
+                },
+                {
+                  "transformation": "trivial_condition_removal",
                   "subselect_evaluation": [
                     {
                       "subselect_execution": {
@@ -477,27 +489,8 @@ t1.a= (SELECT a FROM t2 LIMIT 1)	{
                           }
                         ] /* steps */
                       } /* subselect_execution */
-                    },
-                    {
-                      "subselect_execution": {
-                        "select#": 2,
-                        "steps": [
-                        ] /* steps */
-                      } /* subselect_execution */
                     }
                   ] /* subselect_evaluation */,
-                  "resulting_condition": "((NULL <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select NULL from `t2` limit 1), `t1`.`a`))"
-                },
-                {
-                  "transformation": "constant_propagation",
-                  "subselect_evaluation": [
-                  ] /* subselect_evaluation */,
-                  "resulting_condition": "((NULL <> (/* select#3 */ select `t2`.`a` from `t2` limit 1)) and multiple equal((/* select#2 */ select NULL from `t2` limit 1), `t1`.`a`))"
-                },
-                {
-                  "transformation": "trivial_condition_removal",
-                  "subselect_evaluation": [
-                  ] /* subselect_evaluation */,
                   "resulting_condition": null
                 }
               ] /* steps */
diff --git a/mysql-test/suite/parts/r/partition_names.result b/mysql-test/suite/parts/r/partition_names.result
new file mode 100644
index 000000000000..91653edf7b5b
--- /dev/null
+++ b/mysql-test/suite/parts/r/partition_names.result
@@ -0,0 +1,134 @@
+#
+# Bug26390736 THE FIELD TABLE_NAME (VARCHAR(64)) FROM MYSQL.INNODB_TABLE_STATS CAN OVERFLOW
+#
+show create table mysql.innodb_index_stats;
+Table	Create Table
+innodb_index_stats	CREATE TABLE `innodb_index_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_value` bigint(20) unsigned NOT NULL,
+  `sample_size` bigint(20) unsigned DEFAULT NULL,
+  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+show create table mysql.innodb_table_stats;
+Table	Create Table
+innodb_table_stats	CREATE TABLE `innodb_table_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `n_rows` bigint(20) unsigned NOT NULL,
+  `clustered_index_size` bigint(20) unsigned NOT NULL,
+  `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+create table abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij (id int) engine=innodb
+partition by range (id)
+subpartition by hash(id) (
+partition pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij values less than (10) (
+subpartition subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij,
+subpartition s02
+),
+partition pmax VALUES LESS THAN MAXVALUE (
+subpartition pmax_sub1,
+subpartition pmax_sub2
+)
+);
+select table_name,LENGTH(table_name) from mysql.innodb_table_stats where LENGTH(table_name) = 199;
+table_name	LENGTH(table_name)
+abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#p#pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#sp#subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij	199
+select table_name,LENGTH(table_name) from mysql.innodb_index_stats where LENGTH(table_name) = 199;
+table_name	LENGTH(table_name)
+abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#p#pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#sp#subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij	199
+abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#p#pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#sp#subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij	199
+abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#p#pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij#sp#subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij	199
+drop table abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij;
+CALL mtr.add_suppression("Table mysql/innodb_table_stats has length mismatch in the column name table_name.  Please run mysql_upgrade");
+CALL mtr.add_suppression("Table mysql/innodb_index_stats has length mismatch in the column name table_name.  Please run mysql_upgrade");
+alter table mysql.innodb_table_stats modify table_name varchar(64);
+alter table mysql.innodb_index_stats modify table_name varchar(64);
+show create table mysql.innodb_index_stats;
+Table	Create Table
+innodb_index_stats	CREATE TABLE `innodb_index_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_value` bigint(20) unsigned NOT NULL,
+  `sample_size` bigint(20) unsigned DEFAULT NULL,
+  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+show create table mysql.innodb_table_stats;
+Table	Create Table
+innodb_table_stats	CREATE TABLE `innodb_table_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `n_rows` bigint(20) unsigned NOT NULL,
+  `clustered_index_size` bigint(20) unsigned NOT NULL,
+  `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+mysql.columns_priv                                 OK
+mysql.db                                           OK
+mysql.engine_cost                                  OK
+mysql.event                                        OK
+mysql.func                                         OK
+mysql.general_log                                  OK
+mysql.gtid_executed                                OK
+mysql.help_category                                OK
+mysql.help_keyword                                 OK
+mysql.help_relation                                OK
+mysql.help_topic                                   OK
+mysql.innodb_index_stats                           OK
+mysql.innodb_table_stats                           OK
+mysql.ndb_binlog_index                             OK
+mysql.plugin                                       OK
+mysql.proc                                         OK
+mysql.procs_priv                                   OK
+mysql.proxies_priv                                 OK
+mysql.server_cost                                  OK
+mysql.servers                                      OK
+mysql.slave_master_info                            OK
+mysql.slave_relay_log_info                         OK
+mysql.slave_worker_info                            OK
+mysql.slow_log                                     OK
+mysql.tables_priv                                  OK
+mysql.time_zone                                    OK
+mysql.time_zone_leap_second                        OK
+mysql.time_zone_name                               OK
+mysql.time_zone_transition                         OK
+mysql.time_zone_transition_type                    OK
+mysql.user                                         OK
+mtr.global_suppressions                            OK
+mtr.test_suppressions                              OK
+sys.sys_config                                     OK
+show create table mysql.innodb_index_stats;
+Table	Create Table
+innodb_index_stats	CREATE TABLE `innodb_index_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `index_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `stat_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `stat_value` bigint(20) unsigned NOT NULL,
+  `sample_size` bigint(20) unsigned DEFAULT NULL,
+  `stat_description` varchar(1024) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`,`index_name`,`stat_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
+show create table mysql.innodb_table_stats;
+Table	Create Table
+innodb_table_stats	CREATE TABLE `innodb_table_stats` (
+  `database_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(199) COLLATE utf8_bin NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `n_rows` bigint(20) unsigned NOT NULL,
+  `clustered_index_size` bigint(20) unsigned NOT NULL,
+  `sum_of_other_index_sizes` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`database_name`,`table_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0
diff --git a/mysql-test/suite/parts/t/partition_names.test b/mysql-test/suite/parts/t/partition_names.test
new file mode 100644
index 000000000000..11e312c254bc
--- /dev/null
+++ b/mysql-test/suite/parts/t/partition_names.test
@@ -0,0 +1,51 @@
+# Becasue of Bug 28112444  disabling this test on windows
+-- source include/not_windows.inc
+-- source include/have_innodb.inc
+-- source include/mysql_upgrade_preparation.inc
+--echo #
+--echo # Bug26390736 THE FIELD TABLE_NAME (VARCHAR(64)) FROM MYSQL.INNODB_TABLE_STATS CAN OVERFLOW
+--echo #
+#Test 1 Table with maximum possible name
+
+show create table mysql.innodb_index_stats;
+show create table mysql.innodb_table_stats;
+
+create table abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij (id int) engine=innodb
+partition by range (id)
+subpartition by hash(id) (
+
+partition pbcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij values less than (10) (
+
+subpartition subdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij,
+subpartition s02
+),
+partition pmax VALUES LESS THAN MAXVALUE (
+subpartition pmax_sub1,
+subpartition pmax_sub2
+)
+);
+
+--replace_regex  /#P#/#p#/  /#SP#/#sp#/
+select table_name,LENGTH(table_name) from mysql.innodb_table_stats where LENGTH(table_name) = 199;
+--replace_regex  /#P#/#p#/  /#SP#/#sp#/
+select table_name,LENGTH(table_name) from mysql.innodb_index_stats where LENGTH(table_name) = 199;
+drop table abcdefghijklmnopqrstuvwxyz_abcdefghijklmnopqrstuvwxyz_abcdefghij;
+
+#Test 2 Check mysql-upgrade
+
+#Manually change length
+CALL mtr.add_suppression("Table mysql/innodb_table_stats has length mismatch in the column name table_name.  Please run mysql_upgrade");
+CALL mtr.add_suppression("Table mysql/innodb_index_stats has length mismatch in the column name table_name.  Please run mysql_upgrade");
+alter table mysql.innodb_table_stats modify table_name varchar(64);
+alter table mysql.innodb_index_stats modify table_name varchar(64);
+
+show create table mysql.innodb_index_stats;
+show create table mysql.innodb_table_stats;
+
+#Run upgrade to check if the length has changed.
+--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
+
+show create table mysql.innodb_index_stats;
+show create table mysql.innodb_table_stats;
+
+--source include/mysql_upgrade_cleanup.inc
diff --git a/mysql-test/suite/perfschema/include/processlist_load.inc b/mysql-test/suite/perfschema/include/processlist_load.inc
new file mode 100644
index 000000000000..5a14ea17d073
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/processlist_load.inc
@@ -0,0 +1,39 @@
+# ../include/processlist_load.inc
+#
+# SUMMARY
+#
+#   Execute PROCESSLIST queries, sorted by user
+#
+# USAGE
+#
+#   Example: Using processlist_set.inc to set @@global.performance_schema_show_processlist
+#
+#   let $pfs_spl = on/off
+#   --source ../include/processlist_set.inc
+#   --source ../include/processlist_load.inc
+#
+#   Columns
+#   1 <Id> 2 <User> 3 <Host> 4 <db> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+
+# Sort SHOW PROCESSLIST by User instead of Id because Id is not zero-padded
+# Unique usernames give best results
+--echo
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
+--sorted_result
+SHOW FULL PROCESSLIST;
+
+--echo
+--echo # Performance Schema processlist table
+--echo
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
+select * from performance_schema.processlist order by user, id;
+
+--echo
+--echo # Information Schema processlist table
+--echo
+--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
+--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
+select * from information_schema.processlist order by user, id;
+
diff --git a/mysql-test/suite/perfschema/include/processlist_set.inc b/mysql-test/suite/perfschema/include/processlist_set.inc
new file mode 100644
index 000000000000..a15e09fd989f
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/processlist_set.inc
@@ -0,0 +1,17 @@
+# ../include/processlist_set.inc
+#
+# SUMMARY
+#
+#   Set the value of performance_schema_show_proceslist then
+#   wait for the operation to complete
+#
+# USAGE
+#
+#   let $pfs_spl = on;
+#   --source ../include/processlist_set.inc
+
+eval set @@global.performance_schema_show_processlist = $pfs_spl;
+
+let $wait_condition = show variables where variable_name like '%show_processlist%' and value = '$pfs_spl';
+--source include/wait_condition.inc
+
diff --git a/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
index 05c7a8341783..e81a42b4817b 100644
--- a/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
+++ b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
@@ -13,8 +13,7 @@ let $wait_timeout= 10;
 let $wait_condition=
   SELECT COUNT(*) > 0 FROM performance_schema.threads
   WHERE THREAD_ID = @con1_thread_id
-    AND (PROCESSLIST_STATE = 'Sleep' OR PROCESSLIST_STATE IS NULL)
-    AND PROCESSLIST_INFO IS NULL;
+    AND (PROCESSLIST_STATE = 'Sleep' OR PROCESSLIST_STATE IS NULL);
 --source include/wait_condition.inc
 if(!$success)
 {
diff --git a/mysql-test/suite/perfschema/r/csv_table_io.result b/mysql-test/suite/perfschema/r/csv_table_io.result
index cc8cebd680df..0e50dc249279 100644
--- a/mysql-test/suite/perfschema/r/csv_table_io.result
+++ b/mysql-test/suite/perfschema/r/csv_table_io.result
@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/ddl_processlist.result b/mysql-test/suite/perfschema/r/ddl_processlist.result
new file mode 100644
index 000000000000..3b1b8608725b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_processlist.result
@@ -0,0 +1,20 @@
+select @@global.performance_schema_show_processlist into @save_processlist;
+set @@global.performance_schema_show_processlist = 'on';
+alter table performance_schema.processlist
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.processlist;
+ERROR HY000: Invalid performance_schema usage.
+alter table performance_schema.processlist
+add index test_index(info);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+create unique index test_index
+on performance_schema.processlist(host);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+drop index `PRIMARY`
+  on performance_schema.processlist;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE TABLE test.create_select
+AS SELECT * from performance_schema.processlist;
+DROP TABLE test.create_select;
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result
index cc2bc0a79c7b..99da7acd9719 100644
--- a/mysql-test/suite/perfschema/r/digest_table_full.result
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result
@@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	NULL	55	32	1	2
-statements_digest	21b6affb55f3e69c598b47257f4d0ec6	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
+statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
 SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2
diff --git a/mysql-test/suite/perfschema/r/digest_view.result b/mysql-test/suite/perfschema/r/digest_view.result
new file mode 100644
index 000000000000..7942b7d3c853
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/digest_view.result
@@ -0,0 +1,144 @@
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`v1`.`a` AS `a`,`test`.`v1`.`b` AS `b` from `test`.`v1`
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`v1`.`a` AS `a`,`test`.`v1`.`b` AS `b` from `test`.`v1` where (`test`.`v1`.`a` = 1)
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`v1`.`a` AS `a`,`test`.`v1`.`b` AS `b` from `test`.`v1` where (`test`.`v1`.`b` > 100)
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`v1`.`a` AS `a`,`test`.`v1`.`b` AS `b` from `test`.`v1`
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	v1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`v1`.`b` AS `b`,`test`.`v1`.`a` AS `a` from `test`.`v1`
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON TABLE
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR
+test	faacd4387467f00e5471f3620f0053ee	EXPLAIN SELECT * FROM `test` . `v1` 	1
+test	75f55ccb0b365eefb51cc8f1f1d81132	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 	1
+test	f13826a4cdfdfc626f2f338744c9c746	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 	1
+test	4204f1e3809aca8633c27c32603bcf6d	EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 	1
+test	fff8925d7c4be86c0c3da7a26c60750e	EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 	1
+test	a8465e96fae9df6be0af2b0bcaff9548	SELECT * FROM `test` . `v1` 	1
+test	90d5479e3ca1cbf7113b3b3abc96f1ff	SELECT * FROM `test` . `v1` WHERE `a` = ? 	1
+test	b660099c975325cd338eb80b2849bd61	SELECT * FROM `test` . `v1` WHERE `b` > ? 	1
+test	9b459b7b8ce957d816066ba4ee0289f9	SELECT `a` , `b` FROM `test` . `v1` 	1
+test	1c037a199783a415ae1ff2361459f1de	SELECT `b` , `a` FROM `test` . `v1` 	1
+test	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	5
+test	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+EXPLAIN SELECT * from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1`
+EXPLAIN SELECT * from test.v1 where a = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = 1)
+EXPLAIN SELECT * from test.v1 where b > 100;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`b` > 100)
+EXPLAIN SELECT a, b from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1`
+EXPLAIN SELECT b, a from test.v1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	3	100.00	NULL
+Warnings:
+Note	1003	/* select#1 */ select `test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a` from `test`.`t1`
+SELECT * from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT * from test.v1 where a = 1;
+a	b
+1	100
+SELECT * from test.v1 where b > 100;
+a	b
+2	200
+3	300
+SELECT a, b from test.v1;
+a	b
+1	100
+2	200
+3	300
+SELECT b, a from test.v1;
+b	a
+100	1
+200	2
+300	3
+#
+# DIGESTS SEEN ON VIEW
+#
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest
+ORDER BY DIGEST_TEXT;
+SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR
+test	1462d84ad90aeabc6106da2a5ba38f17	CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 	1
+test	c909e770703c59c353ca199dfe4ca154	DROP TABLE `test` . `v1` 	1
+test	faacd4387467f00e5471f3620f0053ee	EXPLAIN SELECT * FROM `test` . `v1` 	2
+test	75f55ccb0b365eefb51cc8f1f1d81132	EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 	2
+test	f13826a4cdfdfc626f2f338744c9c746	EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 	2
+test	4204f1e3809aca8633c27c32603bcf6d	EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 	2
+test	fff8925d7c4be86c0c3da7a26c60750e	EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 	2
+test	a8465e96fae9df6be0af2b0bcaff9548	SELECT * FROM `test` . `v1` 	2
+test	90d5479e3ca1cbf7113b3b3abc96f1ff	SELECT * FROM `test` . `v1` WHERE `a` = ? 	2
+test	b660099c975325cd338eb80b2849bd61	SELECT * FROM `test` . `v1` WHERE `b` > ? 	2
+test	f26fa367559d55cac36428d5ebd1d511	SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 	1
+test	9b459b7b8ce957d816066ba4ee0289f9	SELECT `a` , `b` FROM `test` . `v1` 	2
+test	1c037a199783a415ae1ff2361459f1de	SELECT `b` , `a` FROM `test` . `v1` 	2
+test	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	10
+test	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+DROP VIEW test.v1;
+DROP TABLE test.t1;
diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result
index 3ee00750f59d..467229931021 100644
--- a/mysql-test/suite/perfschema/r/dml_handler.result
+++ b/mysql-test/suite/perfschema/r/dml_handler.result
@@ -9,105 +9,108 @@ SELECT COUNT(*) FROM table_list INTO @table_count;
 # For each table in the performance schema, attempt HANDLER...OPEN,
 # which should fail with an error 1031, ER_ILLEGAL_HA.
 
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=87;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=88;
 HANDLER performance_schema.variables_by_thread OPEN;
 ERROR HY000: Table storage engine for 'variables_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=86;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=87;
 HANDLER performance_schema.users OPEN;
 ERROR HY000: Table storage engine for 'users' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=85;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=86;
 HANDLER performance_schema.user_variables_by_thread OPEN;
 ERROR HY000: Table storage engine for 'user_variables_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=84;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=85;
 HANDLER performance_schema.threads OPEN;
 ERROR HY000: Table storage engine for 'threads' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=83;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=84;
 HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
 ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=82;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=83;
 HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
 ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=81;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=82;
 HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
 ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=81;
 HANDLER performance_schema.table_handles OPEN;
 ERROR HY000: Table storage engine for 'table_handles' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
 HANDLER performance_schema.status_by_user OPEN;
 ERROR HY000: Table storage engine for 'status_by_user' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
 HANDLER performance_schema.status_by_thread OPEN;
 ERROR HY000: Table storage engine for 'status_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
 HANDLER performance_schema.status_by_host OPEN;
 ERROR HY000: Table storage engine for 'status_by_host' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
 HANDLER performance_schema.status_by_account OPEN;
 ERROR HY000: Table storage engine for 'status_by_account' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
 HANDLER performance_schema.socket_summary_by_instance OPEN;
 ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
 HANDLER performance_schema.socket_summary_by_event_name OPEN;
 ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
 HANDLER performance_schema.socket_instances OPEN;
 ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
 HANDLER performance_schema.setup_timers OPEN;
 ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
 HANDLER performance_schema.setup_objects OPEN;
 ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
 HANDLER performance_schema.setup_instruments OPEN;
 ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
 HANDLER performance_schema.setup_consumers OPEN;
 ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
 HANDLER performance_schema.setup_actors OPEN;
 ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
 HANDLER performance_schema.session_variables OPEN;
 ERROR HY000: Table storage engine for 'session_variables' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
 HANDLER performance_schema.session_status OPEN;
 ERROR HY000: Table storage engine for 'session_status' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
 HANDLER performance_schema.session_connect_attrs OPEN;
 ERROR HY000: Table storage engine for 'session_connect_attrs' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
 HANDLER performance_schema.session_account_connect_attrs OPEN;
 ERROR HY000: Table storage engine for 'session_account_connect_attrs' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
 HANDLER performance_schema.rwlock_instances OPEN;
 ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
 HANDLER performance_schema.replication_group_members OPEN;
 ERROR HY000: Table storage engine for 'replication_group_members' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
 HANDLER performance_schema.replication_group_member_stats OPEN;
 ERROR HY000: Table storage engine for 'replication_group_member_stats' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
 HANDLER performance_schema.replication_connection_status OPEN;
 ERROR HY000: Table storage engine for 'replication_connection_status' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
 HANDLER performance_schema.replication_connection_configuration OPEN;
 ERROR HY000: Table storage engine for 'replication_connection_configuration' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
 HANDLER performance_schema.replication_applier_status_by_worker OPEN;
 ERROR HY000: Table storage engine for 'replication_applier_status_by_worker' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
 HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
 ERROR HY000: Table storage engine for 'replication_applier_status_by_coordinator' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
 HANDLER performance_schema.replication_applier_status OPEN;
 ERROR HY000: Table storage engine for 'replication_applier_status' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=55;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
 HANDLER performance_schema.replication_applier_configuration OPEN;
 ERROR HY000: Table storage engine for 'replication_applier_configuration' doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=55;
+HANDLER performance_schema.processlist OPEN;
+ERROR HY000: Table storage engine for 'processlist' doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=54;
 HANDLER performance_schema.prepared_statements_instances OPEN;
 ERROR HY000: Table storage engine for 'prepared_statements_instances' doesn't have this option
diff --git a/mysql-test/suite/perfschema/r/dml_processlist.result b/mysql-test/suite/perfschema/r/dml_processlist.result
new file mode 100644
index 000000000000..f3627807a499
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_processlist.result
@@ -0,0 +1,24 @@
+select @@global.performance_schema_show_processlist into @save_processlist;
+set @@global.performance_schema_show_processlist = 'on';
+select * from performance_schema.processlist
+where user like 'event_scheduler';
+select * from performance_schema.processlist
+where user = 'FOO';
+insert into performance_schema.processlist
+values (12, 'foo', 'bar', 'test', null, 1000, 'state', 'info');
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'processlist'
+update performance_schema.processlist
+set id=12, user='foo';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'processlist'
+delete from performance_schema.processlist
+where id <> 99;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'processlist'
+delete from performance_schema.processlist;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'processlist'
+LOCK TABLES performance_schema.processlist READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'processlist'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.processlist WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'processlist'
+UNLOCK TABLES;
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index b1088a136286..3339b5a1a2c8 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -16,7 +16,9 @@ wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
 wait/synch/mutex/sql/LOCK_compress_gtid_table	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Rwlock/sql/%'
-  and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
+  and name not in (
+'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
+'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
 order by name limit 10;
 NAME	ENABLED	TIMED
 wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock	YES	YES
diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result
index b1836f0d961d..f71601d281e9 100644
--- a/mysql-test/suite/perfschema/r/global_read_lock.result
+++ b/mysql-test/suite/perfschema/r/global_read_lock.result
@@ -35,7 +35,7 @@ operation
 from performance_schema.events_waits_current
 where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
 event_name	short_source	timer_end	timer_wait	operation
-wait/synch/cond/sql/MDL_context::COND_wait_status	mdl.cc:	SET	SET	timed_wait
+wait/synch/cond/sql/MDL_context::COND_wait_status		SET	SET	timed_wait
 unlock tables;
 update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
index 040b3371cdf1..8cfff3f8f2be 100644
--- a/mysql-test/suite/perfschema/r/information_schema.result
+++ b/mysql-test/suite/perfschema/r/information_schema.result
@@ -56,6 +56,7 @@ performance_schema	mutex_instances	def
 performance_schema	objects_summary_global_by_type	def
 performance_schema	performance_timers	def
 performance_schema	prepared_statements_instances	def
+performance_schema	processlist	def
 performance_schema	replication_applier_configuration	def
 performance_schema	replication_applier_status	def
 performance_schema	replication_applier_status_by_coordinator	def
@@ -147,6 +148,7 @@ mutex_instances	BASE TABLE	PERFORMANCE_SCHEMA
 objects_summary_global_by_type	BASE TABLE	PERFORMANCE_SCHEMA
 performance_timers	BASE TABLE	PERFORMANCE_SCHEMA
 prepared_statements_instances	BASE TABLE	PERFORMANCE_SCHEMA
+processlist	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_configuration	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status_by_coordinator	BASE TABLE	PERFORMANCE_SCHEMA
@@ -238,6 +240,7 @@ mutex_instances	10	Dynamic
 objects_summary_global_by_type	10	Dynamic
 performance_timers	10	Fixed
 prepared_statements_instances	10	Dynamic
+processlist	10	Dynamic
 replication_applier_configuration	10	Fixed
 replication_applier_status	10	Fixed
 replication_applier_status_by_coordinator	10	Dynamic
@@ -328,6 +331,7 @@ mutex_instances	0
 objects_summary_global_by_type	0
 performance_timers	0
 prepared_statements_instances	0
+processlist	0
 replication_applier_configuration	0
 replication_applier_status	0
 replication_applier_status_by_coordinator	0
@@ -426,6 +430,7 @@ mutex_instances	0	0
 objects_summary_global_by_type	0	0
 performance_timers	0	0
 prepared_statements_instances	0	0
+processlist	0	0
 replication_applier_configuration	0	0
 replication_applier_status	0	0
 replication_applier_status_by_coordinator	0	0
@@ -517,6 +522,7 @@ mutex_instances	0	0	NULL
 objects_summary_global_by_type	0	0	NULL
 performance_timers	0	0	NULL
 prepared_statements_instances	0	0	NULL
+processlist	0	0	NULL
 replication_applier_configuration	0	0	NULL
 replication_applier_status	0	0	NULL
 replication_applier_status_by_coordinator	0	0	NULL
@@ -608,6 +614,7 @@ mutex_instances	NULL	NULL	NULL
 objects_summary_global_by_type	NULL	NULL	NULL
 performance_timers	NULL	NULL	NULL
 prepared_statements_instances	NULL	NULL	NULL
+processlist	NULL	NULL	NULL
 replication_applier_configuration	NULL	NULL	NULL
 replication_applier_status	NULL	NULL	NULL
 replication_applier_status_by_coordinator	NULL	NULL	NULL
@@ -699,6 +706,7 @@ mutex_instances	utf8_general_ci	NULL
 objects_summary_global_by_type	utf8_general_ci	NULL
 performance_timers	utf8_general_ci	NULL
 prepared_statements_instances	utf8_general_ci	NULL
+processlist	utf8_general_ci	NULL
 replication_applier_configuration	utf8_general_ci	NULL
 replication_applier_status	utf8_general_ci	NULL
 replication_applier_status_by_coordinator	utf8_general_ci	NULL
@@ -790,6 +798,7 @@ mutex_instances
 objects_summary_global_by_type	
 performance_timers	
 prepared_statements_instances	
+processlist	
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
@@ -881,6 +890,7 @@ mutex_instances
 objects_summary_global_by_type	
 performance_timers	
 prepared_statements_instances	
+processlist	
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
diff --git a/mysql-test/suite/perfschema/r/innodb_table_io.result b/mysql-test/suite/perfschema/r/innodb_table_io.result
index 2734a4ec79bc..286f0516e62f 100644
--- a/mysql-test/suite/perfschema/r/innodb_table_io.result
+++ b/mysql-test/suite/perfschema/r/innodb_table_io.result
@@ -71,39 +71,39 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result
index 1f244a3a0064..ba569a6a9107 100644
--- a/mysql-test/suite/perfschema/r/max_program_zero.result
+++ b/mysql-test/suite/perfschema/r/max_program_zero.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
 performance_schema_max_program_instances	0
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	1
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/memory_table_io.result b/mysql-test/suite/perfschema/r/memory_table_io.result
index 687f39fc3081..033c355dfa34 100644
--- a/mysql-test/suite/perfschema/r/memory_table_io.result
+++ b/mysql-test/suite/perfschema/r/memory_table_io.result
@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/merge_table_io.result b/mysql-test/suite/perfschema/r/merge_table_io.result
index 3fb3b26b3a39..e65cc45dc842 100644
--- a/mysql-test/suite/perfschema/r/merge_table_io.result
+++ b/mysql-test/suite/perfschema/r/merge_table_io.result
@@ -96,45 +96,45 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index c3214c1ff06b..038c442a6501 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -94,7 +94,7 @@ test	t_60905	NULL	5	5	0	1
 DROP TABLE t_60905;
 show global variables like "performance_schema_max_thread_instances";
 Variable_name	Value
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 explain select * from performance_schema.threads;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	threads	NULL	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
diff --git a/mysql-test/suite/perfschema/r/misc_global_status.result b/mysql-test/suite/perfschema/r/misc_global_status.result
new file mode 100644
index 000000000000..14080af82494
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/misc_global_status.result
@@ -0,0 +1,101 @@
+CREATE USER user1@localhost;
+CREATE USER user2@localhost;
+CREATE USER user3@localhost;
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+SET GLOBAL show_compatibility_56=0;
+TRUNCATE TABLE performance_schema.accounts;
+FLUSH PRIVILEGES;
+CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a));
+INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5);
+INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10);
+FLUSH STATUS;
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+a	b
+3	3
+4	4
+5	5
+SELECT * from performance_schema.session_status
+WHERE VARIABLE_NAME = 'Select_range';
+VARIABLE_NAME	VARIABLE_VALUE
+Select_range	1
+VARIABLE_NAME	DELTA
+Select_range	1
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+a	b
+3	3
+4	4
+5	5
+SELECT * from performance_schema.session_status
+WHERE VARIABLE_NAME = 'Select_range';
+VARIABLE_NAME	VARIABLE_VALUE
+Select_range	1
+VARIABLE_NAME	DELTA
+Select_range	2
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+a	b
+3	3
+4	4
+5	5
+SELECT * from test.t_range where (a >= 4) AND (a <= 6);
+a	b
+4	4
+5	5
+6	6
+SELECT * from performance_schema.session_status
+WHERE VARIABLE_NAME = 'Select_range';
+VARIABLE_NAME	VARIABLE_VALUE
+Select_range	2
+VARIABLE_NAME	DELTA
+Select_range	4
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+a	b
+3	3
+4	4
+5	5
+SELECT * from test.t_range where (a >= 4) AND (a <= 6);
+a	b
+4	4
+5	5
+6	6
+SELECT * from test.t_range where (a >= 5) AND (a <= 7);
+a	b
+5	5
+6	6
+7	7
+SELECT * from performance_schema.session_status
+WHERE VARIABLE_NAME = 'Select_range';
+VARIABLE_NAME	VARIABLE_VALUE
+Select_range	3
+VARIABLE_NAME	DELTA
+Select_range	7
+VARIABLE_NAME	DELTA
+Select_range	7
+SELECT `USER`, `HOST`, VARIABLE_NAME, VARIABLE_VALUE
+FROM performance_schema.status_by_account WHERE VARIABLE_NAME = 'Select_range'
+  AND `USER` LIKE 'user%'
+  ORDER BY `USER`;
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE
+user1	localhost	Select_range	1
+user2	localhost	Select_range	2
+user3	localhost	Select_range	3
+VARIABLE_NAME	DELTA
+Select_range	7
+TRUNCATE TABLE performance_schema.accounts;
+VARIABLE_NAME	DELTA
+Select_range	7
+VARIABLE_NAME	DELTA
+Select_range	7
+TRUNCATE TABLE performance_schema.accounts;
+VARIABLE_NAME	DELTA
+Select_range	7
+DROP TABLE test.t_range;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user2@localhost;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user3@localhost;
+DROP USER user1@localhost;
+DROP USER user2@localhost;
+DROP USER user3@localhost;
+SET GLOBAL show_compatibility_56=1;
+FLUSH PRIVILEGES;
diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result
index ba9c5ba4ab40..3700d0eb06e1 100644
--- a/mysql-test/suite/perfschema/r/multi_table_io.result
+++ b/mysql-test/suite/perfschema/r/multi_table_io.result
@@ -52,25 +52,25 @@ where event_name like 'wait/io/table/%'
   and object_schema in ('test','test1')
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	update	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test1	t2	delete	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result
index 0fe8710fe281..71876d53af69 100644
--- a/mysql-test/suite/perfschema/r/myisam_file_io.result
+++ b/mysql-test/suite/perfschema/r/myisam_file_io.result
@@ -20,28 +20,28 @@ where operation not like "tell"
   and event_name like "wait/io/file/myisam/%"
   order by thread_id, event_id;
 event_name	short_source	operation	number_of_bytes	short_name
-wait/io/file/myisam/kfile	mi_create.c:	create	NULL	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_create.c:	create	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	176	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	100	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_create.c:	chsize	1024	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_create.c:	close	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_create.c:	close	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	open	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	read	24	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	seek	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	read	297	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_open.c:	open	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_locking.c:	write	3	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
+wait/io/file/myisam/kfile		create	NULL	no_index_tab.MYI
+wait/io/file/myisam/dfile		create	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	176	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	100	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		chsize	1024	no_index_tab.MYI
+wait/io/file/myisam/dfile		close	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		close	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		open	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		read	24	no_index_tab.MYI
+wait/io/file/myisam/kfile		seek	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		read	297	no_index_tab.MYI
+wait/io/file/myisam/dfile		open	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	3	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/myisam_table_io.result b/mysql-test/suite/perfschema/r/myisam_table_io.result
index 7db74596a07c..9e5d95683edf 100644
--- a/mysql-test/suite/perfschema/r/myisam_table_io.result
+++ b/mysql-test/suite/perfschema/r/myisam_table_io.result
@@ -70,39 +70,39 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result
index 63f65650c6dd..a8e8fc8fcb01 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -177,15 +177,13 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 54	55	stage/sql/cleaning up	(stage)	STATEMENT	38
 55	55	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	54
 56	56	idle	idle	NULL	NULL
-57	73	statement/sql/select	select "This is the first part of a multi query" as payload;
-select "And this is the second part of a multi query" as payload;
-select "With a third part to make things complete" as payload	NULL	NULL
+57	73	statement/sql/select	select "This is the first part of a multi query" as payload	NULL	NULL
 58	63	stage/sql/starting	(stage)	STATEMENT	57
 59	59	wait/io/socket/sql/client_connection	recv	STAGE	58
 60	60	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	58
 61	61	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	58
-62	62	wait/io/file/sql/query_log	write	STAGE	58
-63	63	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	58
+62	62	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	58
+63	63	wait/io/file/sql/query_log	write	STAGE	58
 64	64	stage/sql/checking permissions	(stage)	STATEMENT	57
 65	65	stage/sql/Opening tables	(stage)	STATEMENT	57
 66	66	stage/sql/init	(stage)	STATEMENT	57
@@ -196,13 +194,12 @@ select "With a third part to make things complete" as payload	NULL	NULL
 71	71	stage/sql/closing tables	(stage)	STATEMENT	57
 72	73	stage/sql/freeing items	(stage)	STATEMENT	57
 73	73	wait/io/socket/sql/client_connection	send	STAGE	72
-74	89	statement/sql/select	select "And this is the second part of a multi query" as payload;
-select "With a third part to make things complete" as payload	NULL	NULL
+74	89	statement/sql/select	select "And this is the second part of a multi query" as payload	NULL	NULL
 75	79	stage/sql/starting	(stage)	STATEMENT	74
 76	76	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	75
 77	77	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	75
-78	78	wait/io/file/sql/query_log	write	STAGE	75
-79	79	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	75
+78	78	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	75
+79	79	wait/io/file/sql/query_log	write	STAGE	75
 80	80	stage/sql/checking permissions	(stage)	STATEMENT	74
 81	81	stage/sql/Opening tables	(stage)	STATEMENT	74
 82	82	stage/sql/init	(stage)	STATEMENT	74
diff --git a/mysql-test/suite/perfschema/r/no_threads.result b/mysql-test/suite/perfschema/r/no_threads.result
index 4631a3c34b2b..21991b159311 100644
--- a/mysql-test/suite/perfschema/r/no_threads.result
+++ b/mysql-test/suite/perfschema/r/no_threads.result
@@ -32,16 +32,16 @@ select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_current;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_history;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_history_long;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 update performance_schema.setup_instruments set enabled='YES';
 drop table test.t1;
diff --git a/mysql-test/suite/perfschema/r/one_thread_per_con.result b/mysql-test/suite/perfschema/r/one_thread_per_con.result
index d9b97a85d5f7..de8964c036ec 100644
--- a/mysql-test/suite/perfschema/r/one_thread_per_con.result
+++ b/mysql-test/suite/perfschema/r/one_thread_per_con.result
@@ -16,19 +16,19 @@ create table test.t3(a int) engine=MYISAM;
 "----------------- Connection default"
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
index bf15d8172f77..5fd557c0e0e3 100644
--- a/mysql-test/suite/perfschema/r/ortho_iter.result
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -230,34 +230,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 call check_instrument("wait/synch/mutex/");
 instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
diff --git a/mysql-test/suite/perfschema/r/part_table_io.result b/mysql-test/suite/perfschema/r/part_table_io.result
index eae0ab5e2303..6a528e7928cb 100644
--- a/mysql-test/suite/perfschema/r/part_table_io.result
+++ b/mysql-test/suite/perfschema/r/part_table_io.result
@@ -82,38 +82,38 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
index cd1e174ccf8d..3a927d95f628 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
@@ -33,6 +33,7 @@ mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' alrea
 mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'processlist' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
index 1a134c613981..b4e535f15d08 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
@@ -33,6 +33,7 @@ mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' alrea
 mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'processlist' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
index 4a0f422f9f01..0b774ede5a66 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
@@ -33,6 +33,7 @@ mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' alrea
 mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'processlist' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
index 36134b1f22bb..9b924b16d59c 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
@@ -35,6 +35,7 @@ mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' alrea
 mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'processlist' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
index dfed1199f87b..a64e226ce14e 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
@@ -35,6 +35,7 @@ mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' alrea
 mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
 mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'processlist' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
 mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
index ea6db524b531..969169b5d688 100644
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -37,34 +37,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
@@ -110,29 +111,29 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test", "mysql")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	procs_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	servers	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	user	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	tables_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	tables_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	tables_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	procs_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	servers	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/processlist.result b/mysql-test/suite/perfschema/r/processlist.result
new file mode 100644
index 000000000000..40c5a0f04a84
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist.result
@@ -0,0 +1,201 @@
+##
+## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+##
+## Test cases:
+##   1. Execute the new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
+##   2. Execute the legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
+##   3. Verify that performance_schema_show_processlist = ON executes the new implementation
+##   4. Verify that performance_schema_show_processlist = OFF executes the legacy code path
+##
+## Results must be manually verified.
+
+### Setup ###
+
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+create user user1@localhost, user2@localhost,
+user3@localhost, user4@localhost;
+
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+grant ALL on *.* to user4@localhost;
+
+flush privileges;
+
+use test;
+create table test.t1 (s1 int, s2 int, s3 int, s4 int);
+
+# Switch to (con0, localhost, root, , )
+
+insert into test.t1 values(1, 1, 1, 1);
+insert into test.t1 values(2, 2, 2, 2);
+insert into test.t1 values(3, 3, 3, 3);
+insert into test.t1 values(4, 4, 4, 4);
+
+# Lock test.t1, insert/update/deletes will block
+lock tables t1 read;
+
+# Connect (con1, localhost, user1, , )
+insert into test.t1 values (0, 0, 0, 0);
+
+# Connect (con2, localhost, user2, , )
+update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999;;
+
+# Connect (con3, localhost, user3, , )
+delete from test.t1 where s1 = 3;
+
+# Connect (con4, localhost, user4, , )
+insert into test.t1 values (4, 4, 4, 4);
+
+# Connection default
+
+# Wait for queries to appear in the processlist table
+
+
+### Execute new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
+
+set @@global.performance_schema_show_processlist = on;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+
+### Execute legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
+
+set @@global.performance_schema_show_processlist = off;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user1	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user2	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
+<Id>	user3	<Host>	test	Query	<Time>	<State>	delete from test.t1 where s1 = 3
+<Id>	user4	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (4, 4, 4, 4)
+
+
+### Verify feature code path
+
+# Enable SHOW PROCESSLIST via the Performance Schema
+set @@global.performance_schema_show_processlist = on;
+
+# Connection default, send SHOW PROCESSLIST
+SET DEBUG_SYNC='pfs_show_processlist_performance_schema SIGNAL pfs_processlist_pfs WAIT_FOR continue';
+SHOW FULL PROCESSLIST;
+
+# Connection con0
+SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_pfs';
+SET DEBUG_SYNC='now SIGNAL continue';
+
+# Connection default, reap
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	<Info>
+
+
+### Verify legacy code path
+
+# Enable the legacy SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = off;
+
+# Connection default, send SHOW PROCESSLIST
+SET DEBUG_SYNC='RESET';
+SET DEBUG_SYNC='pfs_show_processlist_legacy SIGNAL pfs_processlist_legacy WAIT_FOR continue';
+SHOW FULL PROCESSLIST;
+
+# Connection con0
+SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_legacy';
+SET DEBUG_SYNC='now SIGNAL continue';
+
+# Connection default, reap
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	<Info>
+
+
+### Clean up ###
+
+# Connection con0, unlock test.t1, disconnect
+unlock tables;
+
+# Connection con1, reap, disconnect
+# Connection con2, reap, disconnect
+# Connection con3, reap, disconnect
+# Connection con4, reap, disconnect
+
+# Connection default
+
+drop table test.t1;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/processlist_57.result b/mysql-test/suite/perfschema/r/processlist_57.result
new file mode 100644
index 000000000000..0068eb6c3cdf
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_57.result
@@ -0,0 +1,345 @@
+call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing.");
+call mtr.add_suppression("Column count of performance_schema.processlist is wrong. Expected 8, found 2. The table is probably corrupted");
+##
+## Verify fresh 5.7 instance
+##
+SELECT @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+##
+## Simulate old 5.7 instance
+##
+DROP TABLE performance_schema.processlist;
+SHOW CREATE TABLE performance_schema.processlist;
+ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
+##
+## Server shutdown
+##
+##
+### Server restart
+##
+##
+## Verify old 5.7 instance
+##
+SELECT @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+SHOW CREATE TABLE performance_schema.processlist;
+ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
+SELECT * FROM performance_schema.processlist;
+ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
+##
+## Perform broken upgrade (case 1)
+##
+CREATE TABLE performance_schema.processlist (a int, b int);
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+a	b
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+a	b
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+ERROR 42S22: Unknown column 'ID' in 'field list'
+##
+## Server shutdown
+##
+##
+### Server restart
+##
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+a	b
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+a	b
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+ERROR 42S22: Unknown column 'ID' in 'field list'
+##
+## Perform broken upgrade (case 2)
+##
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist (
+`ID` bigint(20) unsigned NOT NULL,
+`USER` varchar(32) DEFAULT NULL,
+`HOST` varchar(66) DEFAULT NULL,
+`DB` varchar(64) DEFAULT NULL,
+`COMMAND` varchar(16) DEFAULT NULL,
+`TIME` bigint(20) DEFAULT NULL,
+`STATE` varchar(64) DEFAULT NULL,
+`INFO` longtext
+);
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+##
+## Server shutdown
+##
+##
+### Server restart
+##
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+##
+## Perform broken upgrade (case 3)
+##
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist
+LIKE INFORMATION_SCHEMA.PROCESSLIST;
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `USER` varchar(32) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` int(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+##
+## Server shutdown
+##
+##
+### Server restart
+##
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(21) unsigned NOT NULL DEFAULT '0',
+  `USER` varchar(32) NOT NULL DEFAULT '',
+  `HOST` varchar(64) NOT NULL DEFAULT '',
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) NOT NULL DEFAULT '',
+  `TIME` int(7) NOT NULL DEFAULT '0',
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+##
+## Perform correct upgrade
+##
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist (
+`ID` bigint(20) unsigned NOT NULL,
+`USER` varchar(32) DEFAULT NULL,
+`HOST` varchar(66) DEFAULT NULL,
+`DB` varchar(64) DEFAULT NULL,
+`COMMAND` varchar(16) DEFAULT NULL,
+`TIME` bigint(20) DEFAULT NULL,
+`STATE` varchar(64) DEFAULT NULL,
+`INFO` longtext
+) ENGINE = 'PERFORMANCE_SCHEMA';
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SELECT * FROM performance_schema.processlist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SELECT * FROM performance_schema.processlist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SHOW PROCESSLIST
+##
+## Server shutdown
+##
+##
+### Server restart
+##
+SHOW CREATE TABLE performance_schema.processlist;
+Table	Create Table
+processlist	CREATE TABLE `processlist` (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SELECT * FROM performance_schema.processlist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	starting	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'ON';
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SELECT * FROM performance_schema.processlist
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+2	root	[HOST:PORT]	test	Query	[TIME]	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+2	root	[HOST:PORT]	test	Query	[TIME]	Sending data	SHOW PROCESSLIST
+SET GLOBAL performance_schema_show_processlist = 'OFF';
diff --git a/mysql-test/suite/perfschema/r/processlist_acl.result b/mysql-test/suite/perfschema/r/processlist_acl.result
new file mode 100644
index 000000000000..2e60b403484d
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_acl.result
@@ -0,0 +1,255 @@
+##
+## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+##
+## Verify handling of the SELECT and PROCESS privileges.
+##
+## Test cases:
+##   - Execute SHOW PROCESSLIST (new and legacy) with all privileges
+##   - Execute SELECT on the performance_schema.processlist and information_schema.processlist with all privileges
+##   - Execute SHOW PROCESSLIST (new and legacy) with no privileges
+##   - Execute SELECT on the performance_schema.processlist and information_schema.processlist with no privileges
+##
+## Results must be manually verified.
+
+### Setup ###
+
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+# Control users
+create user user_00@localhost, user_01@localhost;
+grant ALL   on *.* to user_00@localhost;
+grant ALL   on *.* to user_01@localhost;
+
+# Test users
+create user user_all@localhost, user_none@localhost;
+grant ALL   on *.* to user_all@localhost;
+grant USAGE on *.* to user_none@localhost;
+
+flush privileges;
+
+show grants for user_all@localhost;
+Grants for user_all@localhost
+GRANT ALL PRIVILEGES ON *.* TO 'user_all'@'localhost'
+
+show grants for user_none@localhost;
+Grants for user_none@localhost
+GRANT USAGE ON *.* TO 'user_none'@'localhost'
+
+use test;
+create table test.t1 (s1 int, s2 int, s3 int, s4 int);
+
+# Connect (con_00, localhost, user_00, , )
+# Connect (con_01, localhost, user_01, , )
+
+insert into test.t1 values(1, 1, 1, 1);
+insert into test.t1 values(2, 2, 2, 2);
+insert into test.t1 values(3, 3, 3, 3);
+insert into test.t1 values(4, 4, 4, 4);
+
+# Lock test.t1, insert/update/deletes will block
+lock tables t1 read;
+
+# Establish 2 connections for user_all
+# Connect (con_all_1, localhost, user_all, , )
+# Connect (con_all_2, localhost, user_all, , )
+insert into test.t1 values (0, 0, 0, 0);
+
+# Establish 4 connections for user_none 
+# Connect (con_none_1, localhost, user_none, , )
+# Connect (con_none_2, localhost, user_none, , )
+# Connect (con_none_3, localhost, user_none, , )
+# Connect (con_none_4, localhost, user_none, , )
+update test.t1 set s1 = s1 + 1, s2 = s2 + 2;;
+
+# Connection con_all_1
+
+# Wait for queries to appear in the processlist table
+
+### Execute SHOW PROCESSLIST with all privileges
+### Expect all users
+
+# New SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = on;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Legacy SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = off;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_00	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_01	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user_all	<Host>	test	Query	<Time>	<State>	insert into test.t1 values (0, 0, 0, 0)
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+
+### Execute SHOW PROCESSLIST with no SELECT and no PROCESS privileges
+### Expect processes only from user_none
+
+# New SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = on;
+
+# Connection con_none_1
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Confirm that only processes from user_none are visible
+
+select count(*) as "Expect 0" from performance_schema.processlist
+where user not in ('user_none');
+Expect 0
+0
+
+# Legacy SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = off;
+
+# Connection con_none_1
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user_none	<Host>	test	Query	<Time>	<State>	update test.t1 set s1 = s1 + 1, s2 = s2 + 2
+
+
+### Clean up ###
+
+# Disconnect con_00
+# Connection con_01, unlock test.t1, disconnect
+unlock tables;
+# Disconnect con_all_1
+# Reap con_all_2, disconnect
+# Disconnect con_none_1
+# Disconnect con_none_2
+# Disconnect con_none_3
+# Reap con_none_4, disconnect
+
+# Connection default
+
+drop table test.t1;
+drop user user_00@localhost;
+drop user user_01@localhost;
+drop user user_all@localhost;
+drop user user_none@localhost;
+
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/processlist_anonymous.result b/mysql-test/suite/perfschema/r/processlist_anonymous.result
new file mode 100644
index 000000000000..a27a6df26062
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_anonymous.result
@@ -0,0 +1,66 @@
+##
+## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+## Verify behavior for anonymous users and PROCESS_ACL.
+##
+SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
+SET @@global.performance_schema_show_processlist = OFF;
+SHOW GRANTS;
+Grants for @localhost
+GRANT USAGE ON *.* TO ''@'localhost'
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SHOW PROCESSLIST;
+ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
+SET @@global.performance_schema_show_processlist = ON;
+SHOW GRANTS;
+Grants for @localhost
+GRANT USAGE ON *.* TO ''@'localhost'
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SELECT * FROM performance_schema.processlist;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+SHOW PROCESSLIST;
+ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
+GRANT PROCESS ON *.* TO ''@'localhost';
+SET @@global.performance_schema_show_processlist = OFF;
+SHOW GRANTS;
+Grants for @localhost
+GRANT PROCESS ON *.* TO ''@'localhost'
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+count(*) >= 2
+1
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+count(*) >= 2
+1
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	BROKEN_ROWS_SENT
+statement/sql/show_processlist	SHOW PROCESSLIST	0
+TRUNCATE TABLE performance_schema.events_statements_history;
+set @@global.performance_schema_show_processlist = ON;
+SHOW GRANTS;
+Grants for @localhost
+GRANT PROCESS ON *.* TO ''@'localhost'
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+count(*) >= 2
+1
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+count(*) >= 2
+1
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	ROWS_SENT >= 2
+statement/sql/show_processlist	SHOW PROCESSLIST	1
+SET @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/processlist_no_pfs.result b/mysql-test/suite/perfschema/r/processlist_no_pfs.result
new file mode 100644
index 000000000000..16e5a13b52a8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_no_pfs.result
@@ -0,0 +1,181 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+sys
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+0
+select count(*) from performance_schema.setup_consumers;
+count(*)
+0
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+0
+select count(*) from performance_schema.setup_timers;
+count(*)
+0
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+select * from performance_schema.accounts;
+select * from performance_schema.cond_instances;
+select * from performance_schema.events_stages_current;
+select * from performance_schema.events_stages_history;
+select * from performance_schema.events_stages_history_long;
+select * from performance_schema.events_stages_summary_by_account_by_event_name;
+select * from performance_schema.events_stages_summary_by_host_by_event_name;
+select * from performance_schema.events_stages_summary_by_thread_by_event_name;
+select * from performance_schema.events_stages_summary_by_user_by_event_name;
+select * from performance_schema.events_stages_summary_global_by_event_name;
+select * from performance_schema.events_statements_current;
+select * from performance_schema.events_statements_history;
+select * from performance_schema.events_statements_history_long;
+select * from performance_schema.events_statements_summary_by_account_by_event_name;
+select * from performance_schema.events_statements_summary_by_digest;
+select * from performance_schema.events_statements_summary_by_host_by_event_name;
+select * from performance_schema.events_statements_summary_by_thread_by_event_name;
+select * from performance_schema.events_statements_summary_by_user_by_event_name;
+select * from performance_schema.events_statements_summary_global_by_event_name;
+select * from performance_schema.events_transactions_current;
+select * from performance_schema.events_transactions_history;
+select * from performance_schema.events_transactions_history_long;
+select * from performance_schema.events_transactions_summary_by_account_by_event_name;
+select * from performance_schema.events_transactions_summary_by_host_by_event_name;
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name;
+select * from performance_schema.events_transactions_summary_by_user_by_event_name;
+select * from performance_schema.events_transactions_summary_global_by_event_name;
+select * from performance_schema.events_waits_current;
+select * from performance_schema.events_waits_history;
+select * from performance_schema.events_waits_history_long;
+select * from performance_schema.events_waits_summary_by_account_by_event_name;
+select * from performance_schema.events_waits_summary_by_host_by_event_name;
+select * from performance_schema.events_waits_summary_by_instance;
+select * from performance_schema.events_waits_summary_by_thread_by_event_name;
+select * from performance_schema.events_waits_summary_by_user_by_event_name;
+select * from performance_schema.events_waits_summary_global_by_event_name;
+select * from performance_schema.memory_summary_by_account_by_event_name;
+select * from performance_schema.memory_summary_by_host_by_event_name;
+select * from performance_schema.memory_summary_by_thread_by_event_name;
+select * from performance_schema.memory_summary_by_user_by_event_name;
+select * from performance_schema.memory_summary_global_by_event_name;
+select * from performance_schema.file_instances;
+select * from performance_schema.file_summary_by_event_name;
+select * from performance_schema.file_summary_by_instance;
+select * from performance_schema.host_cache;
+select * from performance_schema.hosts;
+select * from performance_schema.memory_summary_by_account_by_event_name;
+select * from performance_schema.memory_summary_by_host_by_event_name;
+select * from performance_schema.memory_summary_by_thread_by_event_name;
+select * from performance_schema.memory_summary_by_user_by_event_name;
+select * from performance_schema.memory_summary_global_by_event_name;
+select * from performance_schema.metadata_locks;
+select * from performance_schema.mutex_instances;
+select * from performance_schema.objects_summary_global_by_type;
+select * from performance_schema.performance_timers;
+select * from performance_schema.rwlock_instances;
+select * from performance_schema.session_account_connect_attrs;
+select * from performance_schema.session_connect_attrs;
+select * from performance_schema.setup_actors;
+select * from performance_schema.setup_consumers;
+select * from performance_schema.setup_instruments;
+select * from performance_schema.setup_objects;
+select * from performance_schema.setup_timers;
+select * from performance_schema.socket_instances;
+select * from performance_schema.socket_summary_by_instance;
+select * from performance_schema.socket_summary_by_event_name;
+select * from performance_schema.table_handles;
+select * from performance_schema.table_io_waits_summary_by_index_usage;
+select * from performance_schema.table_io_waits_summary_by_table;
+select * from performance_schema.table_lock_waits_summary_by_table;
+select * from performance_schema.threads;
+select * from performance_schema.users;
+select * from performance_schema.replication_connection_configuration;
+select * from performance_schema.replication_connection_status;
+select * from performance_schema.replication_applier_configuration;
+select * from performance_schema.replication_applier_status;
+select * from performance_schema.replication_applier_status_by_coordinator;
+select * from performance_schema.replication_applier_status_by_worker;
+select * from performance_schema.global_status;
+select * from performance_schema.status_by_thread;
+select * from performance_schema.status_by_user;
+select * from performance_schema.status_by_host;
+select * from performance_schema.status_by_account;
+select * from performance_schema.session_status;
+select * from performance_schema.global_variables;
+select * from performance_schema.variables_by_thread;
+select * from performance_schema.session_variables;
+show global variables like "performance_schema%";
+Variable_name	Value
+performance_schema	OFF
+performance_schema_accounts_size	0
+performance_schema_digests_size	0
+performance_schema_events_stages_history_long_size	0
+performance_schema_events_stages_history_size	0
+performance_schema_events_statements_history_long_size	0
+performance_schema_events_statements_history_size	0
+performance_schema_events_transactions_history_long_size	0
+performance_schema_events_transactions_history_size	0
+performance_schema_events_waits_history_long_size	0
+performance_schema_events_waits_history_size	0
+performance_schema_hosts_size	0
+performance_schema_max_cond_classes	0
+performance_schema_max_cond_instances	0
+performance_schema_max_digest_length	0
+performance_schema_max_file_classes	0
+performance_schema_max_file_handles	0
+performance_schema_max_file_instances	0
+performance_schema_max_index_stat	0
+performance_schema_max_memory_classes	0
+performance_schema_max_metadata_locks	0
+performance_schema_max_mutex_classes	0
+performance_schema_max_mutex_instances	0
+performance_schema_max_prepared_statements_instances	0
+performance_schema_max_program_instances	0
+performance_schema_max_rwlock_classes	0
+performance_schema_max_rwlock_instances	0
+performance_schema_max_socket_classes	0
+performance_schema_max_socket_instances	0
+performance_schema_max_sql_text_length	0
+performance_schema_max_stage_classes	0
+performance_schema_max_statement_classes	0
+performance_schema_max_statement_stack	0
+performance_schema_max_table_handles	0
+performance_schema_max_table_instances	0
+performance_schema_max_table_lock_stat	0
+performance_schema_max_thread_classes	0
+performance_schema_max_thread_instances	0
+performance_schema_session_connect_attrs_size	0
+performance_schema_setup_actors_size	0
+performance_schema_setup_objects_size	0
+performance_schema_show_processlist	ON
+performance_schema_users_size	0
+show engine PERFORMANCE_SCHEMA status;
+show global status like "performance_schema%";
+
+select * from information_schema.engines
+where engine = "PERFORMANCE_SCHEMA";
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+PERFORMANCE_SCHEMA	YES	Performance Schema	NO	NO	NO
+
+# If the Performance Schema is disabled, then expect
+# performance-schema-show-processlist = OFF
+# regardless of its initial setting
+
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+1
+
+# If the Performance Schema is disabled, then setting
+# performance-schema-show-processlist = ON
+# succeeds, SHOW PROCESSLIST returns no data.
+
+set @@global.performance_schema_show_processlist = ON;
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+
+show global variables like "performance_schema";
+Variable_name	Value
+performance_schema	OFF
diff --git a/mysql-test/suite/perfschema/r/processlist_port.result b/mysql-test/suite/perfschema/r/processlist_port.result
new file mode 100644
index 000000000000..c11ff41f1126
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_port.result
@@ -0,0 +1,145 @@
+##
+## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+##
+## Verify the Host field (hostname:port) against the legacy implementation.
+##
+
+### Setup ###
+
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+# Control user
+create user user0@localhost;
+grant ALL on *.* to user0@localhost;
+# Test users
+
+create user user1@localhost, user2@localhost,
+user3@localhost, user4@localhost;
+
+grant USAGE on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+grant ALL on *.* to user4@localhost;
+
+flush privileges;
+
+show grants for user1@localhost;
+Grants for user1@localhost
+GRANT USAGE ON *.* TO 'user1'@'localhost'
+
+# Connect (con_user0, 127.0.0.1, user0, , , MASTER_MYPORT, )
+
+select connection_id() into @con_user0_id;
+# Connect (con_user1, 127.0.0.1, user1, , , MASTER_MYPORT, )
+# Connect (con_user2, 127.0.0.1, user2, , , MASTER_MYPORT, )
+# Connect (con_user3, 127.0.0.1, user3, , , MASTER_MYPORT, )
+# Connect (con_user4, 127.0.0.1, user4, , , MASTER_MYPORT, )
+# Connection user0
+
+### Compare the SHOW PROCESSLIST Host column between the new and old implementations
+
+## New SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = on;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Connection user1
+# Get Host:Port, new
+
+## Legacy SHOW PROCESSLIST
+set @@global.performance_schema_show_processlist = off;
+
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	SHOW FULL PROCESSLIST
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Performance Schema processlist table
+
+select * from performance_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from performance_schema.processlist order by user, id
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Information Schema processlist table
+
+select * from information_schema.processlist order by user, id;
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+<Id>	event_scheduler	<Host>	NULL	<Command>	<Time>	<State>	NULL
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user0	<Host>	test	Query	<Time>	<State>	select * from information_schema.processlist order by user, id
+<Id>	user1	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user2	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user3	<Host>	test	<Command>	<Time>	<State>	NULL
+<Id>	user4	<Host>	test	<Command>	<Time>	<State>	NULL
+
+# Connection user1
+# Get Host:Port, legacy
+
+***SUCCESS*** The SHOW PROCESSLIST Host fields match
+
+### Compare the processlist  Host column between Performance Schema and the Information Schema
+
+# Connection con_user0
+
+***SUCCESS*** The processlist Host fields match between the Performance Schema and the Information Schema
+
+
+### Clean up ###
+
+# Disconnect con_user0
+# Disconnect con_user1
+# Disconnect con_user2
+# Disconnect con_user3
+# Disconnect con_user4
+# Connection default
+
+drop user user0@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/r/processlist_reg_user.result b/mysql-test/suite/perfschema/r/processlist_reg_user.result
new file mode 100644
index 000000000000..72e879e4c092
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/processlist_reg_user.result
@@ -0,0 +1,89 @@
+##
+## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+## Verify behavior for regular users and PROCESS_ACL.
+##
+SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
+SET @@global.performance_schema_show_processlist = OFF;
+CREATE USER 'regular'@'localhost';
+SHOW GRANTS;
+Grants for regular@localhost
+GRANT USAGE ON *.* TO 'regular'@'localhost'
+SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
+USER	INFO
+regular	SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT USER, INFO FROM performance_schema.processlist;
+USER	INFO
+regular	SELECT USER, INFO FROM performance_schema.processlist
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	BROKEN_ROWS_SENT
+statement/sql/show_processlist	SHOW PROCESSLIST	0
+TRUNCATE TABLE performance_schema.events_statements_history;
+SET @@global.performance_schema_show_processlist = ON;
+SHOW GRANTS;
+Grants for regular@localhost
+GRANT USAGE ON *.* TO 'regular'@'localhost'
+SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
+USER	INFO
+regular	SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST
+SELECT USER, INFO FROM performance_schema.processlist;
+USER	INFO
+regular	SELECT USER, INFO FROM performance_schema.processlist
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	ROWS_SENT
+statement/sql/show_processlist	SHOW PROCESSLIST	1
+TRUNCATE TABLE performance_schema.events_statements_history;
+GRANT PROCESS ON *.* TO 'regular'@'localhost';
+SET @@global.performance_schema_show_processlist = OFF;
+SHOW GRANTS;
+Grants for regular@localhost
+GRANT PROCESS ON *.* TO 'regular'@'localhost'
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+count(*) >= 2
+1
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+count(*) >= 2
+1
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	BROKEN_ROWS_SENT
+statement/sql/show_processlist	SHOW PROCESSLIST	0
+TRUNCATE TABLE performance_schema.events_statements_history;
+SET @@global.performance_schema_show_processlist = ON;
+SHOW GRANTS;
+Grants for regular@localhost
+GRANT PROCESS ON *.* TO 'regular'@'localhost'
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+count(*) >= 2
+1
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+count(*) >= 2
+1
+SHOW PROCESSLIST;
+SELECT "Previous statement is now completed." as status;
+status
+Previous statement is now completed.
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
+FROM performance_schema.events_statements_history
+WHERE SQL_TEXT = "SHOW PROCESSLIST";
+EVENT_NAME	SQL_TEXT	ROWS_SENT >= 2
+statement/sql/show_processlist	SHOW PROCESSLIST	1
+TRUNCATE TABLE performance_schema.events_statements_history;
+SET @@global.performance_schema_show_processlist = @save_processlist;
+DROP USER 'regular'@'localhost';
diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result
index 0aa745151e51..01764bc8c2e1 100644
--- a/mysql-test/suite/perfschema/r/read_only.result
+++ b/mysql-test/suite/perfschema/r/read_only.result
@@ -70,6 +70,75 @@ select * from performance_schema.setup_instruments;
 # super user.
 update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
+#
+# Bug#31080309 - REGRESSION FOR BUG 81009 FIXED IN 5.7.17
+#   Bug23103937(BUG81009) - PS_TRUNCATE_ALL_TABLES() DOES NOT WORK IN
+#                           SUPER_READ_ONLY MODE.
+#
+connection default;
+# Reset read_only and super_read_only mode.
+set global read_only=0;
+set global super_read_only=0;
+# Grant truncate table and execute stored procedure privileges to pfsuser.
+grant DROP on performance_schema.* to pfsuser@localhost;
+grant EXECUTE on procedure sys.ps_truncate_all_tables to pfsuser@localhost;
+#-----------------------------------------------------------------------
+# Test case to verify truncate operation on performance schema table by
+# super user with super_read_only=ON.
+#-----------------------------------------------------------------------
+# Set super_read_only mode.
+set global super_read_only=1;
+connection con1;
+# truncate operation is allowed in super_read_only mode on performance schema
+# tables for super user.
+# Without fix following statements fail because of super read only mode.
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+#-----------------------------------------------------------------------
+# Test case to verify truncate operation on performance schema table by
+# super user with read_only=ON.
+#-----------------------------------------------------------------------
+connection default;
+# Reset super_read_only mode.
+set global super_read_only=0;
+# Set read_only mode.
+set global read_only=1;
+connection con1;
+# truncate operation is allowed in read_only mode on performance schema
+# tables for super user.
+# Without fix following statements fail because of super read only mode.
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+#-----------------------------------------------------------------------
+# Test case to verify truncate operation on performance schema table by
+# non-super user with super_read_only=ON.
+#-----------------------------------------------------------------------
+connection default;
+set global super_read_only=0;
+# Revoke SUPER privilege from pfsuser.
+revoke SUPER on *.* from pfsuser@localhost;
+# Reset super_read_only mode.
+set global super_read_only=1;
+connection con1;
+# truncate operation is allowed in super_read_only mode on performance schema
+# tables for non-super user.
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+#-----------------------------------------------------------------------
+# Test case to verify truncate operation on performance schema table by
+# non-super user with read_only=ON.
+#-----------------------------------------------------------------------
+connection default;
+# Reset super_read_only mode.
+set global super_read_only=0;
+# Set read_only mode.
+set global read_only=1;
+connection con1;
+# truncate operation is allowed in read_only mode on performance schema
+# tables for non-super user.
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+########################################################################
 disconnect con1;
 connection default;
 set global read_only= @start_read_only;
diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result
index 06348cc9c6ac..cec59acea9f2 100644
--- a/mysql-test/suite/perfschema/r/relaylog.result
+++ b/mysql-test/suite/perfschema/r/relaylog.result
@@ -23,7 +23,7 @@ from performance_schema.file_summary_by_instance
 where file_name like "%master-%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+master-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 select * from performance_schema.file_summary_by_instance
 where file_name like "%slave-%" order by file_name;
 FILE_NAME	EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
@@ -39,7 +39,7 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+master-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -51,7 +51,7 @@ where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
 wait/io/file/sql/binlog_cache	NONE	NONE	NONE	NONE
-wait/io/file/sql/binlog_index	MANY	NONE	NONE	NONE
+wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 wait/io/file/sql/binlog_index_cache	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
@@ -119,10 +119,10 @@ where file_name like "%slave-%"
 order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 slave-relay-bin.000001	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.000002	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
-slave-relay-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-relay-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 "Expect a slave binlog + binlog_index"
 select
 substring(file_name, locate("slave-", file_name)) as FILE_NAME,
@@ -135,8 +135,8 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
-slave-relay-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
+slave-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
+slave-relay-bin.index	wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result
index cb70a9be37e5..6ec7dbdcad45 100644
--- a/mysql-test/suite/perfschema/r/rollback_table_io.result
+++ b/mysql-test/suite/perfschema/r/rollback_table_io.result
@@ -41,18 +41,18 @@ where event_name like 'wait/io/table/%'
   and object_schema in ('test')
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
index 73e9525a271d..3edbae26e31b 100644
--- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result
+++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
@@ -56,7 +56,7 @@ select digest, digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-dc3177eb15d923e08c09eef29cecd9a4	SELECT ? AS `in_master_digest` 	1
+43677368d37ba0831ecd2322086c9cf5	SELECT ? AS `in_master_digest` 	1
 insert into test.marker values (2);
 **** On Slave ****
 select * from test.marker;
@@ -99,7 +99,7 @@ select digest, digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-d506c623d393ce3079467945b10cc01e	SELECT ? AS `in_slave_digest` 	1
+01f5f7c4c65eb61bb9a6afb7172c4a54	SELECT ? AS `in_slave_digest` 	1
 **** On Master ****
 delete from performance_schema.setup_objects
 where object_schema='master';
diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result
index d09c35779cf6..11676811ca99 100644
--- a/mysql-test/suite/perfschema/r/schema.result
+++ b/mysql-test/suite/perfschema/r/schema.result
@@ -61,6 +61,7 @@ mutex_instances
 objects_summary_global_by_type
 performance_timers
 prepared_statements_instances
+processlist
 replication_applier_configuration
 replication_applier_status
 replication_applier_status_by_coordinator
diff --git a/mysql-test/suite/perfschema/r/show_aggregate.result b/mysql-test/suite/perfschema/r/show_aggregate.result
index 5f1f70f4bb0e..20cee6f6013d 100644
--- a/mysql-test/suite/perfschema/r/show_aggregate.result
+++ b/mysql-test/suite/perfschema/r/show_aggregate.result
@@ -510,6 +510,27 @@ variable_name	h1	h2	h3	delta	host	Expected
 Handler_delete	6	0	0	6	6	OK
 Handler_rollback	6	0	0	6	6	OK
 ================================================================================
+TEST 8: FLUSH STATUS should clear account, host and user status
+================================================================================
+
+FLUSH STATUS;
+
+SELECT * FROM status_by_account WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE
+user1	localhost	Handler_delete	0
+user2	localhost	Handler_delete	0
+user3	localhost	Handler_delete	0
+
+SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+HOST	VARIABLE_NAME	VARIABLE_VALUE
+localhost	Handler_delete	0
+
+SELECT * FROM status_by_user WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE
+user1	Handler_delete	0
+user2	Handler_delete	0
+user3	Handler_delete	0
+================================================================================
 CLEANUP
 ================================================================================
 DROP TABLE test.t1;
diff --git a/mysql-test/suite/perfschema/r/show_coverage.result b/mysql-test/suite/perfschema/r/show_coverage.result
index 1f620449bbff..532aeff5af12 100644
--- a/mysql-test/suite/perfschema/r/show_coverage.result
+++ b/mysql-test/suite/perfschema/r/show_coverage.result
@@ -102,14 +102,43 @@ SELECT variable_value FROM status_by_thread
 WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_after;
 
 # Expect bytes_before > bytes_after
-SELECT @bytes_before > @bytes_after;
-@bytes_before > @bytes_after
+SELECT @bytes_before > @bytes_after AS 'Expect 1';
+Expect 1
 1
 
 # Expect bytes_after is zero
-SELECT @bytes_after;
-@bytes_after
+SELECT @bytes_after AS 'Expect 0';
+Expect 0
 0
 
+# TEST 6
+#
+# Bug#28291258 FLUSH STATUS ADDS TWICE TO GLOBAL VALUES
+#
+
+# Default connection
+
+# First connection
+include/assert.inc [Global value requested from the first session must not change]
+
+# Generate a slow query
+
+SET long_query_time = 2;
+SELECT SLEEP(4);
+SLEEP(4)
+0
+SET long_query_time = @@global.long_query_time;
+
+include/assert.inc [Global value requested from the first session after SLEEP() must increase by 1]
+include/assert.inc [First session value must increase by 1]
+
+# Default connection
+include/assert.inc [Global value requested from the default session after DISCONNECT must remain the same]
+include/assert.inc [Default session value must remain zero]
+
+FLUSH STATUS;
+
+include/assert.inc [Global value requested from the default session after FLUSH must remain the same]
+include/assert.inc [Default session value after FLUSH must remain zero]
 # CLEANUP
 set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/r/show_misc.result b/mysql-test/suite/perfschema/r/show_misc.result
index ba0606121b23..3612139c68af 100644
--- a/mysql-test/suite/perfschema/r/show_misc.result
+++ b/mysql-test/suite/perfschema/r/show_misc.result
@@ -88,6 +88,22 @@ Variable_name	Value
 UNLOCK TABLES;
 DROP TABLE test.t1;
 
+================================================================================
+Bug#28515475 BOGUS DATA WHEN ORDERING RESULTS FROM VARIABLES_BY_THREAD 
+================================================================================
+Verify the results from "WHERE variable_name IN(...)", particularly for those
+variables that are listed after the deprecated variable gtid_executed.
+The ORDER BY also forces an additional code path through rnd_pos().
+
+SELECT variable_name FROM performance_schema.variables_by_thread
+WHERE variable_name IN ('interactive_timeout','net_read_timeout','net_write_timeout','wait_timeout')
+ORDER BY variable_name;
+variable_name
+interactive_timeout
+net_read_timeout
+net_write_timeout
+wait_timeout
+
 ================================================================================
 CLEAN UP
 ================================================================================
diff --git a/mysql-test/suite/perfschema/r/show_sanity.result b/mysql-test/suite/perfschema/r/show_sanity.result
index fa2f2bfa3b9b..6fb33ea4d173 100644
--- a/mysql-test/suite/perfschema/r/show_sanity.result
+++ b/mysql-test/suite/perfschema/r/show_sanity.result
@@ -407,11 +407,16 @@ where show_mode = "JUNK: GLOBAL-ONLY"
     and source = "I_S.SESSION_VARIABLES")
 order by show_mode, source, variable_name;
 SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_TRACKING
 5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
 5.6	I_S.SESSION_VARIABLES	INNODB_DEADLOCK_DETECT
 5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
 5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
 5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	PERFORMANCE_SCHEMA_SHOW_PROCESSLIST
+5.6	I_S.SESSION_VARIABLES	REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
 5.6	I_S.SESSION_VARIABLES	TLS_VERSION
 
 ================================================================================
@@ -433,11 +438,16 @@ where show_mode = "JUNK: GLOBAL-ONLY"
     and source = "I_S.SESSION_VARIABLES")
 order by show_mode, source, variable_name;
 SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_TRACKING
 5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
 5.6	I_S.SESSION_VARIABLES	INNODB_DEADLOCK_DETECT
 5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
 5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
 5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	PERFORMANCE_SCHEMA_SHOW_PROCESSLIST
+5.6	I_S.SESSION_VARIABLES	REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+5.6	I_S.SESSION_VARIABLES	REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
 5.6	I_S.SESSION_VARIABLES	TLS_VERSION
 
 ================================================================================
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
index 38b50f1bebbf..fd49ee31e083 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
index 454fd64e56cb..0c581c6a11ba 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
index d2e1cb132a21..ff07ecc36a39 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
index 8fc285e81d2b..a1e9b773705b 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
index 087d782da40a..85d0372b31c5 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result
index 116bbbcfb462..d6519ab89723 100644
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest.result b/mysql-test/suite/perfschema/r/start_server_low_digest.result
index 3dff3c092eb9..3911ae063b74 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_digest.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest.result
@@ -9,4 +9,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
 event_name	digest	digest_text	sql_text
 statement/sql/truncate	de142fd9a2507cb67f197230081a2682	TRUNCATE TABLE 	truncate table events_statements_history_long
-statement/sql/select	9c2f57893fb6bcec2ace71ddb389b46f	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
+statement/sql/select	4eaf50b33b47c3d02ab230606f197063	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
index 69ec6c9cf351..906700ba2737 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
@@ -9,4 +9,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
 event_name	digest	digest_text	sql_text
 statement/sql/truncate	de142fd9a2507cb67f197230081a2682	TRUNCATE TABLE 	truncat...
-statement/sql/select	9c2f57893fb6bcec2ace71ddb389b46f	SELECT ? + ? + 	SELECT ...
+statement/sql/select	4eaf50b33b47c3d02ab230606f197063	SELECT ? + ? + 	SELECT ...
diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result
index f2439059703f..cea26f48fc11 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_index.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_index.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
+performance_schema_max_file_instances	-1
 performance_schema_max_index_stat	38
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
index f0e204935e7a..c9bd36da3869 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
 performance_schema_max_table_lock_stat	1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result
index cc7f9a324a95..a5087f664d51 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_account.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_account.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
index afd465aea899..eb28240939e0 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	0
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
index 2ec4af0df434..5688da44327e 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -126,30 +126,31 @@ performance_schema_max_cond_instances	0
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
index 042ba3f1623f..a8025c771c87 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	0
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
index f8f2dc222d7b..441defa573bb 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	0
-performance_schema_max_index_stat	5000
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result
index 38afb4570ecb..bcd24b5ed164 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_host.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_host.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	0
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result
index 983342802070..888a0da09270 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_index.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_index.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
+performance_schema_max_file_instances	-1
 performance_schema_max_index_stat	0
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
index 87f2ac8226d1..ce411ad1ee41 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
 performance_schema_max_metadata_locks	0
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
index ea1bcb258902..a540554bed46 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	0
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
index ca4100fcdc5e..c22f50a7cdf9 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	0
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
index 6345552b04de..0410edddae12 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
 performance_schema_max_mutex_instances	0
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
index 4b993eb29cdb..27051ff97eb3 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
+performance_schema_max_mutex_instances	-1
 performance_schema_max_prepared_statements_instances	0
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
index a161f5d6aebc..06f74f7651f5 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
 performance_schema_max_rwlock_classes	0
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
index 336d316f0c32..8a0e9bef97d7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
@@ -122,40 +122,41 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
 performance_schema_max_rwlock_instances	0
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_rwlock_classes";
 Variable_name	Value
-performance_schema_max_rwlock_classes	40
+performance_schema_max_rwlock_classes	50
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/rwlock/%";
 count(*) > 0
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
index 03b60b2ca0bc..0b1042472b2e 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
index a8ef5935c52d..c7589b6ef44e 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	0
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
index 9bd55cf8ad91..25e8d28a2e5a 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	0
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
index 8029fb4286ea..a3f7ea4f6fa6 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	0
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
index c5840ec78b11..c05b6a717e40 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	0
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
index c63f5a97f723..a0f4b066c6fc 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
index c354dfc60bf0..881bd12d789f 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
index be3a675cd377..bf4728f60c94 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	0
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
index 6d1532db4bdc..0c99faaa6010 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
index 633f2b5b34dd..ee20ed742310 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
index 4825823c584e..d5789acdfc6f 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
@@ -122,40 +122,41 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	0
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_table_instances";
 Variable_name	Value
-performance_schema_max_table_instances	500
+performance_schema_max_table_instances	-1
 show global variables like "performance_schema_max_table_handles";
 Variable_name	Value
 performance_schema_max_table_handles	0
@@ -170,7 +171,7 @@ a
 drop table test.instrument_me;
 show global variables like "performance_schema_max_table_instances";
 Variable_name	Value
-performance_schema_max_table_instances	500
+performance_schema_max_table_instances	-1
 select variable_value > 0 from information_schema.global_status
 where variable_name like 'PERFORMANCE_SCHEMA_TABLE_HANDLES_LOST';
 variable_value > 0
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
index fe0737909c15..46b0b9941b39 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
+performance_schema_max_file_instances	-1
 performance_schema_max_index_stat	0
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
+performance_schema_max_table_handles	-1
 performance_schema_max_table_instances	0
 performance_schema_max_table_lock_stat	0
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
@@ -158,7 +159,7 @@ Variable_name	Value
 performance_schema_max_table_instances	0
 show global variables like "performance_schema_max_table_handles";
 Variable_name	Value
-performance_schema_max_table_handles	1000
+performance_schema_max_table_handles	-1
 drop table if exists test.instrument_me;
 create table test.instrument_me(a int);
 insert into test.instrument_me values (1), (2), (3);
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
index 6a3a7e8d45fe..81acb8ad493a 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
 performance_schema_max_table_lock_stat	0
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
index d17982f16dc1..863680baa37d 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	0
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
index 9ca1f6212e14..9ba32bb001ab 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	0
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
index 767358d1bcd1..2e0f61e6a967 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
index c9598b25a798..cad715ce16ab 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result
index cf8b406fd167..aba6c1f1a4b4 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_user.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_user.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	0
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
index 031f6fd666a5..ee82e6255543 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	0
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
index 6f3a1857e8a7..77e3a9cea41e 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	0
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result
index 7be6be09ba86..12d59e757e6b 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -132,7 +132,7 @@ performance_schema_max_memory_classes	0
 performance_schema_max_metadata_locks	0
 performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
-performance_schema_max_prepared_statements_instances	100
+performance_schema_max_prepared_statements_instances	-1
 performance_schema_max_program_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
@@ -150,6 +150,7 @@ performance_schema_max_thread_instances	0
 performance_schema_session_connect_attrs_size	0
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	0
+performance_schema_show_processlist	OFF
 performance_schema_users_size	0
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
@@ -178,7 +179,7 @@ performance_schema_max_memory_classes	0
 performance_schema_max_metadata_locks	0
 performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	0
-performance_schema_max_prepared_statements_instances	100
+performance_schema_max_prepared_statements_instances	-1
 performance_schema_max_program_instances	0
 performance_schema_max_rwlock_classes	0
 performance_schema_max_rwlock_instances	0
@@ -196,6 +197,7 @@ performance_schema_max_thread_instances	0
 performance_schema_session_connect_attrs_size	0
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	0
+performance_schema_show_processlist	OFF
 performance_schema_users_size	0
 select * from performance_schema.setup_instruments
 order by name;
diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result
index 34ef1183e195..81d9b209615d 100644
--- a/mysql-test/suite/perfschema/r/start_server_off.result
+++ b/mysql-test/suite/perfschema/r/start_server_off.result
@@ -150,6 +150,7 @@ performance_schema_max_thread_instances	0
 performance_schema_session_connect_attrs_size	0
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	0
+performance_schema_show_processlist	OFF
 performance_schema_users_size	0
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result
index 116bbbcfb462..d6519ab89723 100644
--- a/mysql-test/suite/perfschema/r/start_server_on.result
+++ b/mysql-test/suite/perfschema/r/start_server_on.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index f4deac546e3d..65631bd85ca5 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -115,41 +115,41 @@ DROP TRIGGER trg;
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-statements_digest	21b6affb55f3e69c598b47257f4d0ec6	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
-statements_digest	2ebcc6539c5c79b27a33707fbd4d70b0	SELECT ? FROM `t1` 	2	0	0	0
-statements_digest	811c314bb8f68f4fdef9e30fa64acb0b	SELECT ?, ... FROM `t1` 	2	0	0	0
-statements_digest	bc458c25be72e6f386b5c646bfd2a4ac	SELECT ? FROM `t2` 	1	0	0	0
-statements_digest	ca8daaee4f2bac8419836ba3b57a945c	SELECT ?, ... FROM `t2` 	2	0	0	0
-statements_digest	15dbcb0276d0a32884e54f872e7550de	INSERT INTO `t1` VALUES (?) 	2	2	0	0
-statements_digest	69ed8a7ce05b795006d86cbbd31e0caa	INSERT INTO `t2` VALUES (?) 	1	1	0	0
-statements_digest	a33fb1d856859fc46057c7dc869ce164	INSERT INTO `t3` VALUES (...) 	4	4	0	0
-statements_digest	a77bacee82e346244fbd5d405e9acf7d	INSERT INTO `t4` VALUES (...) 	1	1	0	0
-statements_digest	5546a45fece520aaa0140e6ac7a554ca	INSERT INTO `t5` VALUES (...) 	1	1	0	0
-statements_digest	45552b7cbc35f439bb0b2cc12b4d7004	INSERT INTO `t1` VALUES (?) /* , ... */ 	2	7	0	0
-statements_digest	5e2ca7e5378a50395344cf8fb33c1289	INSERT INTO `t3` VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	5a2455a3ad5daf8ad20bad0e1ba489d8	INSERT INTO `t5` VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	db2e552003c59f77b27e8a43513fa6df	INSERT INTO `t6` VALUES (...) 	5	5	0	0
-statements_digest	6d48e7bf6ebe1075c954ca4440c313f5	SELECT ? + ? 	3	0	0	0
-statements_digest	f29eded39dd5fa102f18987679dd0c14	SELECT ? 	1	0	0	0
-statements_digest	3aeae35a7cad6d77a59795daa475ec95	CREATE SCHEMA `statements_digest_temp` 	2	2	0	0
-statements_digest	853fcddb9ccd2b9bc89b2b9ebb86b63a	DROP SCHEMA `statements_digest_temp` 	2	0	0	0
-statements_digest	35c43fea9b2c2899c5ae8576b1b00879	SELECT ? FROM `no_such_table` 	1	0	0	1
-statements_digest	0d6c1e5ce78bfc10f8f9d1c34883e431	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2	0	0	1
-statements_digest	fba453490c48b500dc5497587ac52232	DROP TABLE `dup_table` 	1	0	0	0
-statements_digest	8da8c367b38b366598c96c1f573b06ff	INSERT IGNORE INTO `t11` VALUES (?) 	1	1	1	0
+statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
+statements_digest	2470c53bba1de70e17dee0ffecf92c73	SELECT ? FROM `t1` 	2	0	0	0
+statements_digest	7aaf73121c2dc1961757af496028610b	SELECT ?, ... FROM `t1` 	2	0	0	0
+statements_digest	57175aac3e410f4a0df5900bf998b181	SELECT ? FROM `t2` 	1	0	0	0
+statements_digest	7595674dce5accccec6d0a9c0918b689	SELECT ?, ... FROM `t2` 	2	0	0	0
+statements_digest	02b23366d1c2eb07f271b27a92261850	INSERT INTO `t1` VALUES (?) 	2	2	0	0
+statements_digest	d6935b92b93f59d1d8580d71345bf785	INSERT INTO `t2` VALUES (?) 	1	1	0	0
+statements_digest	0bed9d67f8f0eed70e23d8d652f850f1	INSERT INTO `t3` VALUES (...) 	4	4	0	0
+statements_digest	5a4288f864ee631ce51c9a2250ee05f4	INSERT INTO `t4` VALUES (...) 	1	1	0	0
+statements_digest	2f3f80af62a9a0bc3e65ade97b7d9b91	INSERT INTO `t5` VALUES (...) 	1	1	0	0
+statements_digest	9282eb80534dd560d422f0ad3e2ef79e	INSERT INTO `t1` VALUES (?) /* , ... */ 	2	7	0	0
+statements_digest	84fd494f2106df4a7b68a7d64c38390c	INSERT INTO `t3` VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	8d8c2006b523c427db1f4a64d2a3071c	INSERT INTO `t5` VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	119634570de383d4e24bb246f9aa5093	INSERT INTO `t6` VALUES (...) 	5	5	0	0
+statements_digest	d8492e72ce015b008b8a29347b1574f0	SELECT ? + ? 	3	0	0	0
+statements_digest	3d4fc22e33e10d7235eced3c75a84c2c	SELECT ? 	1	0	0	0
+statements_digest	228bd1e66dfaad7a93a08eec7cfdf840	CREATE SCHEMA `statements_digest_temp` 	2	2	0	0
+statements_digest	a1b8dbf6a71e58af1c93dbdb27f2979c	DROP SCHEMA `statements_digest_temp` 	2	0	0	0
+statements_digest	80ef2cc343a9725239f4d9d88e3ed77b	SELECT ? FROM `no_such_table` 	1	0	0	1
+statements_digest	66bbd419c604f474fe5a769c3d8f091c	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2	0	0	1
+statements_digest	ae27efa5e1da98d54b2bf2af9a492780	DROP TABLE `dup_table` 	1	0	0	0
+statements_digest	164476310fd2576cb913120166b2f2b0	INSERT IGNORE INTO `t11` VALUES (?) 	1	1	1	0
 statements_digest	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	1	0	0	0
-statements_digest	da3836703213b71919f6583391fb7de4	PREPARE `stmt` FROM ? 	1	0	0	0
-statements_digest	b5243e9f1b9b0bbcc8cafd6e5acc78f7	EXECUTE `stmt` 	2	0	0	0
-statements_digest	1943fb11508045f36626b11b1c2311b4	DEALLOCATE PREPARE `stmt` 	1	0	0	0
-statements_digest	25794340d6b31e52b8a65f672acd1a02	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1	0	0	0
-statements_digest	89b975550f7e8236ee7cc9dc1662cd04	CALL `p1` ( ) 	2	0	0	0
-statements_digest	c5ab254ec788be45b08ba6f3b41008b4	DROP PROCEDURE `p1` 	1	0	0	0
-statements_digest	85e6b42a2024f757b5e43dd231827068	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1	0	0	0
-statements_digest	6de36a178c9394679a4b8d8d1113a65d	SELECT `func` (...) 	2	0	0	0
-statements_digest	98683f018cbb76cd482f47a48921513c	DROP FUNCTION `func` 	1	0	0	0
-statements_digest	3e0d38357bc7322944bdd51b4281f144	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1	0	0	0
-statements_digest	2ea818b323d4449e3474db5f70e1bdea	INSERT INTO `t12` VALUES (?) 	2	2	0	0
-statements_digest	4dd34f225aced9cd2f50dafe64e01f1b	DROP TRIGGER `trg` 	1	0	0	0
+statements_digest	ba5e1127c88c3b8737000ac83579c15b	PREPARE `stmt` FROM ? 	1	0	0	0
+statements_digest	9e1c48512fdded3c4e64f3ac9a786096	EXECUTE `stmt` 	2	0	0	0
+statements_digest	26b3d4dd928dd5321d2a0e1e63d926f7	DEALLOCATE PREPARE `stmt` 	1	0	0	0
+statements_digest	179e0cb3ea4542473dc88fd24b209049	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1	0	0	0
+statements_digest	cde8f1053b3b4a4d67658c9c8572e765	CALL `p1` ( ) 	2	0	0	0
+statements_digest	ff2582be3f542ec89d41ffc8ef018c2f	DROP PROCEDURE `p1` 	1	0	0	0
+statements_digest	bae719145a0d1e65cbbdec759665bd79	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1	0	0	0
+statements_digest	27b8b33b381b70df85aa39ae223baa19	SELECT `func` (...) 	2	0	0	0
+statements_digest	a1686531a64227fc7d1e96f090462d7b	DROP FUNCTION `func` 	1	0	0	0
+statements_digest	3a668f739568e34b3ae67491f7938639	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1	0	0	0
+statements_digest	5c24333d11c3e873088d2911f4589883	INSERT INTO `t12` VALUES (?) 	2	2	0	0
+statements_digest	e1ea7222497e0e50f3ee08a17ebd2542	DROP TRIGGER `trg` 	1	0	0	0
 ####################################
 # CLEANUP
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index e980940e8bc6..1f66c5aa8b57 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -128,41 +128,41 @@ DROP TRIGGER trg;
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-statements_digest	21b6affb55f3e69c598b47257f4d0ec6	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
-statements_digest	2ebcc6539c5c79b27a33707fbd4d70b0	SELECT ? FROM `t1` 	2
-statements_digest	811c314bb8f68f4fdef9e30fa64acb0b	SELECT ?, ... FROM `t1` 	2
-statements_digest	bc458c25be72e6f386b5c646bfd2a4ac	SELECT ? FROM `t2` 	1
-statements_digest	ca8daaee4f2bac8419836ba3b57a945c	SELECT ?, ... FROM `t2` 	2
-statements_digest	15dbcb0276d0a32884e54f872e7550de	INSERT INTO `t1` VALUES (?) 	2
-statements_digest	69ed8a7ce05b795006d86cbbd31e0caa	INSERT INTO `t2` VALUES (?) 	1
-statements_digest	a33fb1d856859fc46057c7dc869ce164	INSERT INTO `t3` VALUES (...) 	4
-statements_digest	a77bacee82e346244fbd5d405e9acf7d	INSERT INTO `t4` VALUES (...) 	1
-statements_digest	5546a45fece520aaa0140e6ac7a554ca	INSERT INTO `t5` VALUES (...) 	1
-statements_digest	45552b7cbc35f439bb0b2cc12b4d7004	INSERT INTO `t1` VALUES (?) /* , ... */ 	2
-statements_digest	5e2ca7e5378a50395344cf8fb33c1289	INSERT INTO `t3` VALUES (...) /* , ... */ 	1
-statements_digest	5a2455a3ad5daf8ad20bad0e1ba489d8	INSERT INTO `t5` VALUES (...) /* , ... */ 	1
-statements_digest	db2e552003c59f77b27e8a43513fa6df	INSERT INTO `t6` VALUES (...) 	5
-statements_digest	6d48e7bf6ebe1075c954ca4440c313f5	SELECT ? + ? 	3
-statements_digest	f29eded39dd5fa102f18987679dd0c14	SELECT ? 	1
-statements_digest	3aeae35a7cad6d77a59795daa475ec95	CREATE SCHEMA `statements_digest_temp` 	2
-statements_digest	853fcddb9ccd2b9bc89b2b9ebb86b63a	DROP SCHEMA `statements_digest_temp` 	2
-statements_digest	35c43fea9b2c2899c5ae8576b1b00879	SELECT ? FROM `no_such_table` 	1
-statements_digest	0d6c1e5ce78bfc10f8f9d1c34883e431	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2
-statements_digest	fba453490c48b500dc5497587ac52232	DROP TABLE `dup_table` 	1
-statements_digest	8da8c367b38b366598c96c1f573b06ff	INSERT IGNORE INTO `t11` VALUES (?) 	1
+statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+statements_digest	2470c53bba1de70e17dee0ffecf92c73	SELECT ? FROM `t1` 	2
+statements_digest	7aaf73121c2dc1961757af496028610b	SELECT ?, ... FROM `t1` 	2
+statements_digest	57175aac3e410f4a0df5900bf998b181	SELECT ? FROM `t2` 	1
+statements_digest	7595674dce5accccec6d0a9c0918b689	SELECT ?, ... FROM `t2` 	2
+statements_digest	02b23366d1c2eb07f271b27a92261850	INSERT INTO `t1` VALUES (?) 	2
+statements_digest	d6935b92b93f59d1d8580d71345bf785	INSERT INTO `t2` VALUES (?) 	1
+statements_digest	0bed9d67f8f0eed70e23d8d652f850f1	INSERT INTO `t3` VALUES (...) 	4
+statements_digest	5a4288f864ee631ce51c9a2250ee05f4	INSERT INTO `t4` VALUES (...) 	1
+statements_digest	2f3f80af62a9a0bc3e65ade97b7d9b91	INSERT INTO `t5` VALUES (...) 	1
+statements_digest	9282eb80534dd560d422f0ad3e2ef79e	INSERT INTO `t1` VALUES (?) /* , ... */ 	2
+statements_digest	84fd494f2106df4a7b68a7d64c38390c	INSERT INTO `t3` VALUES (...) /* , ... */ 	1
+statements_digest	8d8c2006b523c427db1f4a64d2a3071c	INSERT INTO `t5` VALUES (...) /* , ... */ 	1
+statements_digest	119634570de383d4e24bb246f9aa5093	INSERT INTO `t6` VALUES (...) 	5
+statements_digest	d8492e72ce015b008b8a29347b1574f0	SELECT ? + ? 	3
+statements_digest	3d4fc22e33e10d7235eced3c75a84c2c	SELECT ? 	1
+statements_digest	228bd1e66dfaad7a93a08eec7cfdf840	CREATE SCHEMA `statements_digest_temp` 	2
+statements_digest	a1b8dbf6a71e58af1c93dbdb27f2979c	DROP SCHEMA `statements_digest_temp` 	2
+statements_digest	80ef2cc343a9725239f4d9d88e3ed77b	SELECT ? FROM `no_such_table` 	1
+statements_digest	66bbd419c604f474fe5a769c3d8f091c	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2
+statements_digest	ae27efa5e1da98d54b2bf2af9a492780	DROP TABLE `dup_table` 	1
+statements_digest	164476310fd2576cb913120166b2f2b0	INSERT IGNORE INTO `t11` VALUES (?) 	1
 statements_digest	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	1
-statements_digest	da3836703213b71919f6583391fb7de4	PREPARE `stmt` FROM ? 	1
-statements_digest	b5243e9f1b9b0bbcc8cafd6e5acc78f7	EXECUTE `stmt` 	2
-statements_digest	1943fb11508045f36626b11b1c2311b4	DEALLOCATE PREPARE `stmt` 	1
-statements_digest	25794340d6b31e52b8a65f672acd1a02	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1
-statements_digest	89b975550f7e8236ee7cc9dc1662cd04	CALL `p1` ( ) 	2
-statements_digest	c5ab254ec788be45b08ba6f3b41008b4	DROP PROCEDURE `p1` 	1
-statements_digest	85e6b42a2024f757b5e43dd231827068	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1
-statements_digest	6de36a178c9394679a4b8d8d1113a65d	SELECT `func` (...) 	2
-statements_digest	98683f018cbb76cd482f47a48921513c	DROP FUNCTION `func` 	1
-statements_digest	3e0d38357bc7322944bdd51b4281f144	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1
-statements_digest	2ea818b323d4449e3474db5f70e1bdea	INSERT INTO `t12` VALUES (?) 	2
-statements_digest	4dd34f225aced9cd2f50dafe64e01f1b	DROP TRIGGER `trg` 	1
+statements_digest	ba5e1127c88c3b8737000ac83579c15b	PREPARE `stmt` FROM ? 	1
+statements_digest	9e1c48512fdded3c4e64f3ac9a786096	EXECUTE `stmt` 	2
+statements_digest	26b3d4dd928dd5321d2a0e1e63d926f7	DEALLOCATE PREPARE `stmt` 	1
+statements_digest	179e0cb3ea4542473dc88fd24b209049	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1
+statements_digest	cde8f1053b3b4a4d67658c9c8572e765	CALL `p1` ( ) 	2
+statements_digest	ff2582be3f542ec89d41ffc8ef018c2f	DROP PROCEDURE `p1` 	1
+statements_digest	bae719145a0d1e65cbbdec759665bd79	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1
+statements_digest	27b8b33b381b70df85aa39ae223baa19	SELECT `func` (...) 	2
+statements_digest	a1686531a64227fc7d1e96f090462d7b	DROP FUNCTION `func` 	1
+statements_digest	3a668f739568e34b3ae67491f7938639	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1
+statements_digest	5c24333d11c3e873088d2911f4589883	INSERT INTO `t12` VALUES (?) 	2
+statements_digest	e1ea7222497e0e50f3ee08a17ebd2542	DROP TRIGGER `trg` 	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 digest	digest_text
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
index e7496a19743f..74f407b61bed 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-performance_schema	7b21132f2eb5d27abf79d6f1cb853171	TRUNCATE TABLE `events_statements_summary_by_digest` 	1
-performance_schema	13388524411c28030c7bbdc499ca3a3b	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
+performance_schema	cf0f15f15c6aa949ce95632095d6a2f5	TRUNCATE TABLE `events_statements_summary_by_digest` 	1
+performance_schema	03e6b6726da02f6cde506ac276a61c08	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
index 6cbc50579dcb..071ac042e5a5 100644
--- a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
+++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
@@ -122,34 +122,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
 performance_schema_max_program_instances	7
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	2
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
index 931f9137e732..012692507d28 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
index 436ce0659e22..0b7284b0b740 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
index 38c8119635ea..698b8e8ce6d6 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
index ba15a88d2dba..e49936c366a9 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
index acd70ee0e8ed..0a7106d097d8 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
@@ -67,34 +67,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
index 941cfdb40a51..3df2763c5e54 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
@@ -66,34 +66,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
index 57f8d3449f29..c50dfcdcc2b7 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
@@ -67,34 +67,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
index 87652c6eccb8..78b75d38c8f2 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
@@ -66,34 +66,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result
index d45f76a24c72..8069d8209b80 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
index c87b15d40cb2..5fbc58262383 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
index e29ca28b9853..a36730d96d4c 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
index 0409bc416851..91cbf91c5219 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
index 953d61e02f96..d2fe34adc465 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
index c826fbf40754..accfd1b3dbad 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
index f83c8544cb0e..bf9d9b7e33b7 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
index 1b48c0ed80c3..5a7045ea4f4a 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
index 9803ca537a44..fc1dcbeab48f 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
index 2953be34d18b..659922feadc5 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
index 48b38fdf4feb..eccbedcc5b6c 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
index b6dff427bfc3..500e2e1df1d4 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
index ccda9dd78f88..e62fdeb2412b 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
index c7dda6c32b7b..d33110ad9ea6 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
index c6bea5d133aa..380a98a4328b 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
index d7458f40c52c..2f9cb5fe1ddc 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
index dc18e99bb146..4b1d7d0d959f 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
index 51deb6282b14..b5667a4875eb 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
index abcfe8fab162..7e8d9f37a2c2 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
index 273b5b4f1d06..c50fb6d14f52 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
index c80f0b6f8b3e..51717ecc4c22 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
index 5f85d8063ed5..aeeb8b982241 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
index e4b450de2264..0e880adc9ad8 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
index d058b70a6960..1405afd32192 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
@@ -69,34 +69,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
index 0f532caf7298..b24387c3d58a 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
@@ -68,34 +68,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
index d70555b02ac7..0048340ee6e0 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
index fb9342769b81..00ee54e2a058 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
index 7262794c0d52..2b18c4b19d9c 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
@@ -71,34 +71,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
index 665e924d870e..7899cda34071 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
@@ -70,34 +70,35 @@ performance_schema_events_waits_history_long_size	10000
 performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
+performance_schema_max_cond_instances	-1
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
+performance_schema_max_file_instances	-1
+performance_schema_max_index_stat	-1
 performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
+performance_schema_max_metadata_locks	-1
 performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
+performance_schema_max_mutex_instances	-1
+performance_schema_max_prepared_statements_instances	-1
+performance_schema_max_program_instances	-1
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
+performance_schema_max_socket_instances	-1
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	150
 performance_schema_max_statement_classes	193
 performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	500
+performance_schema_max_table_handles	-1
+performance_schema_max_table_instances	-1
+performance_schema_max_table_lock_stat	-1
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
+performance_schema_max_thread_instances	-1
 performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
+performance_schema_show_processlist	OFF
 performance_schema_users_size	100
 show global status like "performance_schema%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result
index b980a8cd685f..e43736607648 100644
--- a/mysql-test/suite/perfschema/r/table_schema.result
+++ b/mysql-test/suite/perfschema/r/table_schema.result
@@ -855,6 +855,14 @@ def	performance_schema	prepared_statements_instances	SUM_SORT_ROWS	32	NULL	NO	bi
 def	performance_schema	prepared_statements_instances	SUM_SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
 def	performance_schema	prepared_statements_instances	SUM_NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
 def	performance_schema	prepared_statements_instances	SUM_NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+def	performance_schema	processlist	ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+def	performance_schema	processlist	USER	2	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
+def	performance_schema	processlist	HOST	3	NULL	YES	varchar	66	198	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(66)			select,insert,update,references		
+def	performance_schema	processlist	DB	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
+def	performance_schema	processlist	COMMAND	5	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		
+def	performance_schema	processlist	TIME	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
+def	performance_schema	processlist	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
+def	performance_schema	processlist	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
 def	performance_schema	replication_applier_configuration	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
 def	performance_schema	replication_applier_configuration	DESIRED_DELAY	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
 def	performance_schema	replication_applier_status	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
diff --git a/mysql-test/suite/perfschema/r/temp_table_io.result b/mysql-test/suite/perfschema/r/temp_table_io.result
index 50ba7e1296b3..a1b16c421086 100644
--- a/mysql-test/suite/perfschema/r/temp_table_io.result
+++ b/mysql-test/suite/perfschema/r/temp_table_io.result
@@ -70,20 +70,20 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/threads_mysql.result b/mysql-test/suite/perfschema/r/threads_mysql.result
index b96339b7de04..db78c2af5315 100644
--- a/mysql-test/suite/perfschema/r/threads_mysql.result
+++ b/mysql-test/suite/perfschema/r/threads_mysql.result
@@ -3,7 +3,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
 processlist_command, processlist_info,
 IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
 AS unified_parent_thread_id,
-role, instrumented
+`role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
 ORDER BY name;
@@ -37,7 +37,7 @@ processlist_info	SELECT name, type, processlist_user, processlist_host, processl
 processlist_command, processlist_info,
 IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
 AS unified_parent_thread_id,
-role, instrumented
+`role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
 ORDER BY name
@@ -72,17 +72,17 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
 processlist_command, processlist_info,
 IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
 AS unified_parent_thread_id,
-role, instrumented
+`role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
   AND thread_id NOT IN (SELECT thread_id FROM t1)
 ORDER BY name;
 name	thread/sql/event_scheduler
 type	FOREGROUND
-processlist_user	root
+processlist_user	event_scheduler
 processlist_host	localhost
 processlist_db	NULL
-processlist_command	Sleep
+processlist_command	Daemon
 processlist_info	NULL
 unified_parent_thread_id	unified parent_thread_id
 role	NULL
@@ -100,17 +100,17 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
 processlist_command, processlist_info,
 IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
 AS unified_parent_thread_id,
-role, instrumented
+`role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
   AND thread_id NOT IN (SELECT thread_id FROM t1)
 ORDER BY name;
 name	thread/sql/event_worker
 type	FOREGROUND
-processlist_user	root
+processlist_user	event_scheduler
 processlist_host	localhost
 processlist_db	NULL
-processlist_command	Sleep
+processlist_command	Connect
 processlist_info	SELECT SLEEP(3)
 unified_parent_thread_id	unified parent_thread_id
 role	NULL
diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result
index 70c78cb00c9f..02821a481af4 100644
--- a/mysql-test/suite/perfschema/r/trigger_table_io.result
+++ b/mysql-test/suite/perfschema/r/trigger_table_io.result
@@ -83,80 +83,80 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/r/view_table_io.result b/mysql-test/suite/perfschema/r/view_table_io.result
index ec2f227d0da6..5c13064a3577 100644
--- a/mysql-test/suite/perfschema/r/view_table_io.result
+++ b/mysql-test/suite/perfschema/r/view_table_io.result
@@ -77,41 +77,41 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
diff --git a/mysql-test/suite/perfschema/t/ddl_processlist.test b/mysql-test/suite/perfschema/t/ddl_processlist.test
new file mode 100644
index 000000000000..d960bf2df894
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_processlist.test
@@ -0,0 +1,32 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+
+select @@global.performance_schema_show_processlist into @save_processlist;
+set @@global.performance_schema_show_processlist = 'on';
+
+--error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.processlist
+  add column foo integer;
+
+--error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.processlist;
+
+--error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.processlist
+  add index test_index(info);
+
+--error ER_DBACCESS_DENIED_ERROR
+create unique index test_index
+  on performance_schema.processlist(host);
+
+-- error ER_DBACCESS_DENIED_ERROR
+drop index `PRIMARY`
+  on performance_schema.processlist;
+
+CREATE TABLE test.create_select
+  AS SELECT * from performance_schema.processlist;
+
+DROP TABLE test.create_select;
+
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/t/digest_view.test b/mysql-test/suite/perfschema/t/digest_view.test
new file mode 100644
index 000000000000..8e9632de622e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/digest_view.test
@@ -0,0 +1,76 @@
+# ----------------------------------------------------
+# Tests for the performance schema statement Digests.
+# ----------------------------------------------------
+
+# Test case to show behavior of statements digest when
+# using a view
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+CREATE TABLE test.v1 (a int, b int);
+INSERT INTO test.v1 VALUES (1, 100), (2, 200), (3, 300);
+
+CREATE TABLE test.t1 (a int, b int);
+INSERT INTO test.t1 VALUES (1, 100), (2, 200), (3, 300);
+
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+#
+# test.v1 is a table.
+# Every query here is different, and should have a different digest.
+#
+
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON TABLE
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP TABLE test.v1;
+CREATE VIEW test.v1 AS SELECT * FROM test.t1;
+
+#
+# test.v1 is now a view.
+# the query digests should be unchanged.
+#
+
+EXPLAIN SELECT * from test.v1;
+EXPLAIN SELECT * from test.v1 where a = 1;
+EXPLAIN SELECT * from test.v1 where b > 100;
+EXPLAIN SELECT a, b from test.v1;
+EXPLAIN SELECT b, a from test.v1;
+
+SELECT * from test.v1;
+SELECT * from test.v1 where a = 1;
+SELECT * from test.v1 where b > 100;
+SELECT a, b from test.v1;
+SELECT b, a from test.v1;
+
+--echo #
+--echo # DIGESTS SEEN ON VIEW
+--echo #
+
+SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR
+  FROM performance_schema.events_statements_summary_by_digest
+  ORDER BY DIGEST_TEXT;
+
+DROP VIEW test.v1;
+DROP TABLE test.t1;
+
diff --git a/mysql-test/suite/perfschema/t/dml_processlist.test b/mysql-test/suite/perfschema/t/dml_processlist.test
new file mode 100644
index 000000000000..c075db3eabd9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_processlist.test
@@ -0,0 +1,39 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+
+select @@global.performance_schema_show_processlist into @save_processlist;
+set @@global.performance_schema_show_processlist = 'on';
+
+--disable_result_log
+select * from performance_schema.processlist
+  where user like 'event_scheduler';
+
+select * from performance_schema.processlist
+  where user = 'FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.processlist
+  values (12, 'foo', 'bar', 'test', null, 1000, 'state', 'info');
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.processlist
+  set id=12, user='foo';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.processlist
+  where id <> 99;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.processlist;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.processlist READ;
+UNLOCK TABLES;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.processlist WRITE;
+UNLOCK TABLES;
+
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test
index 3acf9c24e189..0a87600caba5 100644
--- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test
+++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test
@@ -25,7 +25,9 @@ select * from performance_schema.setup_instruments
 
 select * from performance_schema.setup_instruments
   where name like 'Wait/Synch/Rwlock/sql/%'
-  and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
+  and name not in (
+  'wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock',
+  'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
   order by name limit 10;
 
 # COND_handler_count is dependent on the build (Windows only)
diff --git a/mysql-test/suite/perfschema/t/misc_global_status-master.opt b/mysql-test/suite/perfschema/t/misc_global_status-master.opt
new file mode 100644
index 000000000000..26b61f08d4e9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/misc_global_status-master.opt
@@ -0,0 +1 @@
+--loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/misc_global_status.test b/mysql-test/suite/perfschema/t/misc_global_status.test
new file mode 100644
index 000000000000..2157096aaa6b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/misc_global_status.test
@@ -0,0 +1,134 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/have_query_cache_disabled.inc
+
+CREATE USER user1@localhost;
+CREATE USER user2@localhost;
+CREATE USER user3@localhost;
+
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+
+# To aggregate to accounts
+SET GLOBAL show_compatibility_56=0;
+
+TRUNCATE TABLE performance_schema.accounts;
+
+FLUSH PRIVILEGES;
+
+CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a));
+
+INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5);
+INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10);
+
+FLUSH STATUS;
+
+let $initial= `SELECT VARIABLE_VALUE FROM performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'`;
+
+# Causes Select_range to increment (+1)
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+
+SELECT * from performance_schema.session_status
+  WHERE VARIABLE_NAME = 'Select_range';
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+connect(con1, localhost, user1,,);
+# Causes Select_range to increment (+1)
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+
+SELECT * from performance_schema.session_status
+  WHERE VARIABLE_NAME = 'Select_range';
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+connect(con2, localhost, user2,,);
+# Causes Select_range to increment (+2)
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+SELECT * from test.t_range where (a >= 4) AND (a <= 6);
+
+SELECT * from performance_schema.session_status
+  WHERE VARIABLE_NAME = 'Select_range';
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+connect(con3, localhost, user3,,);
+# Causes Select_range to increment (+3)
+SELECT * from test.t_range where (a >= 3) AND (a <= 5);
+SELECT * from test.t_range where (a >= 4) AND (a <= 6);
+SELECT * from test.t_range where (a >= 5) AND (a <= 7);
+
+SELECT * from performance_schema.session_status
+  WHERE VARIABLE_NAME = 'Select_range';
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+--connection default
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+SELECT `USER`, `HOST`, VARIABLE_NAME, VARIABLE_VALUE
+  FROM performance_schema.status_by_account WHERE VARIABLE_NAME = 'Select_range'
+  AND `USER` LIKE 'user%'
+  ORDER BY `USER`;
+
+--disconnect con1
+--disconnect con2
+
+# Wait till all disconnects are completed
+let $count_sessions= 2;
+--source include/wait_until_count_sessions.inc
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+TRUNCATE TABLE performance_schema.accounts;
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+--disconnect con3
+
+# Wait till all disconnects are completed
+let $count_sessions= 1;
+--source include/wait_until_count_sessions.inc
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+# Make sure TRUNCATE on accounts does not add to global_status
+TRUNCATE TABLE performance_schema.accounts;
+
+--disable_query_log
+eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
+--enable_query_log
+
+DROP TABLE test.t_range;
+
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user2@localhost;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM user3@localhost;
+DROP USER user1@localhost;
+DROP USER user2@localhost;
+DROP USER user3@localhost;
+
+SET GLOBAL show_compatibility_56=1;
+
+FLUSH PRIVILEGES;
+
diff --git a/mysql-test/suite/perfschema/t/processlist-master.opt b/mysql-test/suite/perfschema/t/processlist-master.opt
new file mode 100644
index 000000000000..f93413a61e55
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist-master.opt
@@ -0,0 +1 @@
+--event-scheduler
diff --git a/mysql-test/suite/perfschema/t/processlist.test b/mysql-test/suite/perfschema/t/processlist.test
new file mode 100644
index 000000000000..fed22153931a
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist.test
@@ -0,0 +1,197 @@
+--echo ##
+--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+--echo ##
+--echo ## Test cases:
+--echo ##   1. Execute the new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
+--echo ##   2. Execute the legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
+--echo ##   3. Verify that performance_schema_show_processlist = ON executes the new implementation
+--echo ##   4. Verify that performance_schema_show_processlist = OFF executes the legacy code path
+--echo ##
+--echo ## Results must be manually verified.
+
+--source include/no_protocol.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/not_embedded.inc
+
+--echo
+--echo ### Setup ###
+--echo
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+--echo
+create user user1@localhost, user2@localhost,
+            user3@localhost, user4@localhost;
+--echo
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+grant ALL on *.* to user4@localhost;
+--echo
+flush privileges;
+
+--echo
+use test;
+create table test.t1 (s1 int, s2 int, s3 int, s4 int);
+
+--echo
+--echo # Switch to (con0, localhost, root, , )
+connect (con0, localhost, root, , );
+--echo
+insert into test.t1 values(1, 1, 1, 1);
+insert into test.t1 values(2, 2, 2, 2);
+insert into test.t1 values(3, 3, 3, 3);
+insert into test.t1 values(4, 4, 4, 4);
+
+--echo
+--echo # Lock test.t1, insert/update/deletes will block
+lock tables t1 read;
+
+--echo
+--echo # Connect (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+--send insert into test.t1 values (0, 0, 0, 0)
+
+--echo
+--echo # Connect (con2, localhost, user2, , )
+connect (con2, localhost, user2, , );
+# Create a query > 100 characters
+--send update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999;
+--echo
+--echo # Connect (con3, localhost, user3, , )
+connect (con3, localhost, user3, , );
+--send delete from test.t1 where s1 = 3
+
+--echo
+--echo # Connect (con4, localhost, user4, , )
+connect (con4, localhost, user4, , );
+--send insert into test.t1 values (4, 4, 4, 4)
+
+--echo
+--echo # Connection default
+--connection default
+
+--echo
+--echo # Wait for queries to appear in the processlist table
+let $wait_condition = select count(*) >= 4 from information_schema.processlist
+                      where state like '%metadata%';
+--source include/wait_condition.inc
+
+--echo
+--echo
+--echo ### Execute new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
+--echo
+let $pfs_spl = on;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo
+--echo ### Execute legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
+--echo
+let $pfs_spl = off;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo
+--echo ### Verify feature code path
+--echo
+--echo # Enable SHOW PROCESSLIST via the Performance Schema
+let $pfs_spl = on;
+--source ../include/processlist_set.inc
+
+--echo
+--echo # Connection default, send SHOW PROCESSLIST
+--connection default
+SET DEBUG_SYNC='pfs_show_processlist_performance_schema SIGNAL pfs_processlist_pfs WAIT_FOR continue';
+--send SHOW FULL PROCESSLIST
+
+--echo
+--echo # Connection con0
+--connection con0
+SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_pfs';
+SET DEBUG_SYNC='now SIGNAL continue';
+
+--echo
+--echo # Connection default, reap
+--connection default
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--sorted_result
+--reap
+
+--echo
+--echo
+--echo ### Verify legacy code path
+--echo
+--echo # Enable the legacy SHOW PROCESSLIST
+let $pfs_spl = off;
+--source ../include/processlist_set.inc
+
+--echo
+--echo # Connection default, send SHOW PROCESSLIST
+--connection default
+SET DEBUG_SYNC='RESET';
+SET DEBUG_SYNC='pfs_show_processlist_legacy SIGNAL pfs_processlist_legacy WAIT_FOR continue';
+--send SHOW FULL PROCESSLIST
+
+--echo
+--echo # Connection con0
+--connection con0
+SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_legacy';
+SET DEBUG_SYNC='now SIGNAL continue';
+
+--echo
+--echo # Connection default, reap
+--connection default
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--sorted_result
+--reap
+
+--echo
+--echo
+--echo ### Clean up ###
+--echo
+
+--echo # Connection con0, unlock test.t1, disconnect
+--connection con0
+unlock tables;
+--disconnect con0
+
+--disable_query_log
+--disable_result_log
+--echo
+--echo # Connection con1, reap, disconnect
+--connection con1
+--reap
+--disconnect con1
+
+--echo # Connection con2, reap, disconnect
+--connection con2
+--reap
+--disconnect con2
+
+--echo # Connection con3, reap, disconnect
+--connection con3
+--reap
+--disconnect con3
+
+--echo # Connection con4, reap, disconnect
+--connection con4
+--reap
+--disconnect con4
+--enable_result_log
+--enable_query_log
+
+--echo
+--echo # Connection default
+--connection default
+
+--echo
+drop table test.t1;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+--echo
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/t/processlist_57.test b/mysql-test/suite/perfschema/t/processlist_57.test
new file mode 100644
index 000000000000..748d8b7402b8
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_57.test
@@ -0,0 +1,349 @@
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+
+call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing.");
+call mtr.add_suppression("Column count of performance_schema.processlist is wrong. Expected 8, found 2. The table is probably corrupted");
+
+--echo ##
+--echo ## Verify fresh 5.7 instance
+--echo ##
+
+SELECT @@global.performance_schema_show_processlist;
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+--echo ##
+--echo ## Simulate old 5.7 instance
+--echo ##
+
+DROP TABLE performance_schema.processlist;
+
+--error ER_NO_SUCH_TABLE
+SHOW CREATE TABLE performance_schema.processlist;
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--echo ##
+--echo ## Server shutdown
+--echo ##
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo ##
+--echo ### Server restart
+--echo ##
+--exec echo "restart:">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo ##
+--echo ## Verify old 5.7 instance
+--echo ##
+
+SELECT @@global.performance_schema_show_processlist;
+
+--error ER_NO_SUCH_TABLE
+SHOW CREATE TABLE performance_schema.processlist;
+
+--error ER_NO_SUCH_TABLE
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+--error ER_NO_SUCH_TABLE
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--error ER_NO_SUCH_TABLE
+SHOW PROCESSLIST;
+
+--echo ##
+--echo ## Perform broken upgrade (case 1)
+--echo ##
+
+CREATE TABLE performance_schema.processlist (a int, b int);
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--error ER_BAD_FIELD_ERROR
+SHOW PROCESSLIST;
+
+--exec echo "wait" > $restart_file
+--echo ##
+--echo ## Server shutdown
+--echo ##
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo ##
+--echo ### Server restart
+--echo ##
+--exec echo "restart:">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--error ER_BAD_FIELD_ERROR
+SHOW PROCESSLIST;
+
+--echo ##
+--echo ## Perform broken upgrade (case 2)
+--echo ##
+
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+);
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Works and returns no data, innodb table is empty.
+SHOW PROCESSLIST;
+
+--exec echo "wait" > $restart_file
+--echo ##
+--echo ## Server shutdown
+--echo ##
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo ##
+--echo ### Server restart
+--echo ##
+--exec echo "restart:">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Works and returns no data, innodb table is empty.
+SHOW PROCESSLIST;
+
+--echo ##
+--echo ## Perform broken upgrade (case 3)
+--echo ##
+
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist
+  LIKE INFORMATION_SCHEMA.PROCESSLIST;
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Works and returns no data, innodb table is empty.
+SHOW PROCESSLIST;
+
+--exec echo "wait" > $restart_file
+--echo ##
+--echo ## Server shutdown
+--echo ##
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo ##
+--echo ### Server restart
+--echo ##
+--exec echo "restart:">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Works and returns no data, innodb table is empty.
+SHOW PROCESSLIST;
+
+--echo ##
+--echo ## Perform correct upgrade
+--echo ##
+
+DROP TABLE performance_schema.processlist;
+CREATE TABLE performance_schema.processlist (
+  `ID` bigint(20) unsigned NOT NULL,
+  `USER` varchar(32) DEFAULT NULL,
+  `HOST` varchar(66) DEFAULT NULL,
+  `DB` varchar(64) DEFAULT NULL,
+  `COMMAND` varchar(16) DEFAULT NULL,
+  `TIME` bigint(20) DEFAULT NULL,
+  `STATE` varchar(64) DEFAULT NULL,
+  `INFO` longtext
+) ENGINE = 'PERFORMANCE_SCHEMA';
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+--exec echo "wait" > $restart_file
+--echo ##
+--echo ## Server shutdown
+--echo ##
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--echo ##
+--echo ### Server restart
+--echo ##
+--exec echo "restart:">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SHOW CREATE TABLE performance_schema.processlist;
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+SET GLOBAL performance_schema_show_processlist = 'ON';
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM performance_schema.processlist;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+--replace_column 3 [HOST:PORT] 6 [TIME]
+SHOW PROCESSLIST;
+
+# Cleanup
+
+SET GLOBAL performance_schema_show_processlist = 'OFF';
+
diff --git a/mysql-test/suite/perfschema/t/processlist_acl-master.opt b/mysql-test/suite/perfschema/t/processlist_acl-master.opt
new file mode 100644
index 000000000000..f93413a61e55
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_acl-master.opt
@@ -0,0 +1 @@
+--event-scheduler
diff --git a/mysql-test/suite/perfschema/t/processlist_acl.test b/mysql-test/suite/perfschema/t/processlist_acl.test
new file mode 100644
index 000000000000..f0733865ebc0
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_acl.test
@@ -0,0 +1,196 @@
+--echo ##
+--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+--echo ##
+--echo ## Verify handling of the SELECT and PROCESS privileges.
+--echo ##
+--echo ## Test cases:
+--echo ##   - Execute SHOW PROCESSLIST (new and legacy) with all privileges
+--echo ##   - Execute SELECT on the performance_schema.processlist and information_schema.processlist with all privileges
+--echo ##   - Execute SHOW PROCESSLIST (new and legacy) with no privileges
+--echo ##   - Execute SELECT on the performance_schema.processlist and information_schema.processlist with no privileges
+--echo ##
+--echo ## Results must be manually verified.
+--echo
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+
+--echo ### Setup ###
+--echo
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+--echo
+--echo # Control users
+create user user_00@localhost, user_01@localhost;
+grant ALL   on *.* to user_00@localhost;
+grant ALL   on *.* to user_01@localhost;
+
+--echo
+--echo # Test users
+create user user_all@localhost, user_none@localhost;
+grant ALL   on *.* to user_all@localhost;
+grant USAGE on *.* to user_none@localhost;
+--echo
+flush privileges;
+
+--echo
+show grants for user_all@localhost;
+--echo
+show grants for user_none@localhost;
+
+--echo
+use test;
+create table test.t1 (s1 int, s2 int, s3 int, s4 int);
+
+--echo
+--echo # Connect (con_00, localhost, user_00, , )
+connect (con_00, localhost, user_00, , );
+
+--echo # Connect (con_01, localhost, user_01, , )
+connect (con_01, localhost, user_01, , );
+--echo
+insert into test.t1 values(1, 1, 1, 1);
+insert into test.t1 values(2, 2, 2, 2);
+insert into test.t1 values(3, 3, 3, 3);
+insert into test.t1 values(4, 4, 4, 4);
+
+--echo
+--echo # Lock test.t1, insert/update/deletes will block
+lock tables t1 read;
+
+--echo
+--echo # Establish 2 connections for user_all
+--echo # Connect (con_all_1, localhost, user_all, , )
+connect (con_all_1, localhost, user_all, , );
+
+--echo # Connect (con_all_2, localhost, user_all, , )
+connect (con_all_2, localhost, user_all, , );
+--send insert into test.t1 values (0, 0, 0, 0)
+
+--echo
+--echo # Establish 4 connections for user_none 
+--echo # Connect (con_none_1, localhost, user_none, , )
+connect (con_none_1, localhost, user_none, , );
+
+--echo # Connect (con_none_2, localhost, user_none, , )
+connect (con_none_2, localhost, user_none, , );
+
+--echo # Connect (con_none_3, localhost, user_none, , )
+connect (con_none_3, localhost, user_none, , );
+
+--echo # Connect (con_none_4, localhost, user_none, , )
+connect (con_none_4, localhost, user_none, , );
+--send update test.t1 set s1 = s1 + 1, s2 = s2 + 2;
+
+--echo
+--echo # Connection con_all_1
+--connection con_all_1
+
+# Note: When expecting processlist results for all users, the wait_condition
+# and subsequent execution of SHOW PROCESSLIST should be conducted from the
+# same connection to ensure consistent values in the Command and Info columns.
+
+--echo
+--echo # Wait for queries to appear in the processlist table
+let $wait_condition = select count(*) >= 2 from information_schema.processlist
+                      where state like '%metadata%';
+--source include/wait_condition.inc
+
+--echo
+--echo ### Execute SHOW PROCESSLIST with all privileges
+--echo ### Expect all users
+--echo
+--echo # New SHOW PROCESSLIST
+let $pfs_spl = on;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo # Legacy SHOW PROCESSLIST
+let $pfs_spl = off;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo
+--echo ### Execute SHOW PROCESSLIST with no SELECT and no PROCESS privileges
+--echo ### Expect processes only from user_none
+--echo
+--echo # New SHOW PROCESSLIST
+let $pfs_spl = on;
+--source ../include/processlist_set.inc
+
+--echo
+--echo # Connection con_none_1
+--connection con_none_1
+--source ../include/processlist_load.inc
+
+--echo
+--echo # Confirm that only processes from user_none are visible
+--echo
+select count(*) as "Expect 0" from performance_schema.processlist
+  where user not in ('user_none');
+
+--echo
+--echo # Legacy SHOW PROCESSLIST
+--connection con_00
+let $pfs_spl = off;
+--source ../include/processlist_set.inc
+
+--echo
+--echo # Connection con_none_1
+--connection con_none_1
+--source ../include/processlist_load.inc
+
+--echo
+--echo
+--echo ### Clean up ###
+--echo
+
+--echo # Disconnect con_00
+--connection con_00
+--disconnect con_00
+
+--echo # Connection con_01, unlock test.t1, disconnect
+--connection con_01
+unlock tables;
+--disconnect con_01
+
+--echo # Disconnect con_all_1
+--connection con_all_1
+--disconnect con_all_1
+
+--echo # Reap con_all_2, disconnect
+--connection con_all_2
+--reap
+--disconnect con_all_2
+
+--echo # Disconnect con_none_1
+--connection con_none_1
+--disconnect con_none_1
+
+--echo # Disconnect con_none_2
+--connection con_none_2
+--disconnect con_none_2
+
+--echo # Disconnect con_none_3
+--connection con_none_3
+--disconnect con_none_3
+
+--echo # Reap con_none_4, disconnect
+--connection con_none_4
+--reap
+--disconnect con_none_4
+
+--echo
+--echo # Connection default
+--connection default
+
+--echo
+drop table test.t1;
+drop user user_00@localhost;
+drop user user_01@localhost;
+drop user user_all@localhost;
+drop user user_none@localhost;
+--echo
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/t/processlist_anonymous.test b/mysql-test/suite/perfschema/t/processlist_anonymous.test
new file mode 100644
index 000000000000..4b8e7ec2e1f1
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_anonymous.test
@@ -0,0 +1,111 @@
+--echo ##
+--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+--echo ## Verify behavior for anonymous users and PROCESS_ACL.
+--echo ##
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+
+SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
+
+--source include/add_anonymous_users.inc
+
+SET @@global.performance_schema_show_processlist = OFF;
+
+connect (anon,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+
+SHOW GRANTS;
+
+# Empty
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Empty
+SELECT * FROM performance_schema.processlist;
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SHOW PROCESSLIST;
+
+connection default;
+
+SET @@global.performance_schema_show_processlist = ON;
+
+connection anon;
+
+SHOW GRANTS;
+
+# Empty
+SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Empty
+SELECT * FROM performance_schema.processlist;
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SHOW PROCESSLIST;
+
+disconnect anon;
+connection default;
+
+GRANT PROCESS ON *.* TO ''@'localhost';
+
+SET @@global.performance_schema_show_processlist = OFF;
+
+connect (anon2,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+
+SHOW GRANTS;
+
+# Full rows
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Full rows
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+
+# Full rows
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+connection anon2;
+
+
+connection default;
+
+TRUNCATE TABLE performance_schema.events_statements_history;
+set @@global.performance_schema_show_processlist = ON;
+
+
+connection anon2;
+
+SHOW GRANTS;
+
+# Full rows
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Full rows
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+
+# Full rows
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+
+disconnect anon2;
+connection default;
+
+--source include/delete_anonymous_users.inc
+
+SET @@global.performance_schema_show_processlist = @save_processlist;
+
diff --git a/mysql-test/suite/perfschema/t/processlist_no_pfs-master.opt b/mysql-test/suite/perfschema/t/processlist_no_pfs-master.opt
new file mode 100644
index 000000000000..6fb075f60bc9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_no_pfs-master.opt
@@ -0,0 +1,2 @@
+--loose-disable-performance-schema
+--loose-performance-schema-show-processlist=ON
diff --git a/mysql-test/suite/perfschema/t/processlist_no_pfs.test b/mysql-test/suite/perfschema/t/processlist_no_pfs.test
new file mode 100644
index 000000000000..273e180a18ae
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_no_pfs.test
@@ -0,0 +1,29 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+
+--source ../include/start_server_common.inc
+
+--echo
+select * from information_schema.engines
+  where engine = "PERFORMANCE_SCHEMA";
+
+--echo
+--echo # If the Performance Schema is disabled, then expect
+--echo # performance-schema-show-processlist = OFF
+--echo # regardless of its initial setting
+--echo
+select @@global.performance_schema_show_processlist;
+
+--echo
+--echo # If the Performance Schema is disabled, then setting
+--echo # performance-schema-show-processlist = ON
+--echo # succeeds, SHOW PROCESSLIST returns no data.
+--echo
+set @@global.performance_schema_show_processlist = ON;
+
+SHOW PROCESSLIST;
+
+--echo
+show global variables like "performance_schema";
+
diff --git a/mysql-test/suite/perfschema/t/processlist_port-master.opt b/mysql-test/suite/perfschema/t/processlist_port-master.opt
new file mode 100644
index 000000000000..f93413a61e55
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_port-master.opt
@@ -0,0 +1 @@
+--event-scheduler
diff --git a/mysql-test/suite/perfschema/t/processlist_port.test b/mysql-test/suite/perfschema/t/processlist_port.test
new file mode 100644
index 000000000000..8403b0c793b9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_port.test
@@ -0,0 +1,162 @@
+--echo ##
+--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+--echo ##
+--echo ## Verify the Host field (hostname:port) against the legacy implementation.
+--echo ##
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+
+--echo
+--echo ### Setup ###
+--echo
+select @@global.performance_schema_show_processlist into @save_processlist;
+
+--echo
+--echo # Control user
+create user user0@localhost;
+grant ALL on *.* to user0@localhost;
+
+--echo # Test users
+--echo
+create user user1@localhost, user2@localhost,
+            user3@localhost, user4@localhost;
+--echo
+# Grant no privileges to user1 to ensure only one process
+grant USAGE on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+grant ALL on *.* to user4@localhost;
+--echo
+flush privileges;
+--echo
+show grants for user1@localhost;
+
+--echo
+--echo # Connect (con_user0, 127.0.0.1, user0, , , MASTER_MYPORT, )
+connect (con_user0, 127.0.0.1, user0, , , $MASTER_MYPORT, );
+--echo
+select connection_id() into @con_user0_id;
+
+--echo # Connect (con_user1, 127.0.0.1, user1, , , MASTER_MYPORT, )
+connect (con_user1, 127.0.0.1, user1, , , $MASTER_MYPORT, );
+
+--echo # Connect (con_user2, 127.0.0.1, user2, , , MASTER_MYPORT, )
+connect (con_user2, 127.0.0.1, user2, , , $MASTER_MYPORT, );
+
+--echo # Connect (con_user3, 127.0.0.1, user3, , , MASTER_MYPORT, )
+connect (con_user3, 127.0.0.1, user3, , , $MASTER_MYPORT, );
+
+--echo # Connect (con_user4, 127.0.0.1, user4, , , MASTER_MYPORT, )
+connect (con_user4, 127.0.0.1, user4, , , $MASTER_MYPORT, );
+
+--echo # Connection user0
+--connection con_user0
+let $wait_condition = select connection_id() = @con_user0_id;
+--source include/wait_condition.inc
+
+--echo
+--echo ### Compare the SHOW PROCESSLIST Host column between the new and old implementations
+--echo
+--echo ## New SHOW PROCESSLIST
+let $pfs_spl = on;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo # Connection user1
+--connection con_user1
+
+--echo # Get Host:Port, new
+let $host_new = query_get_value(SHOW FULL PROCESSLIST, Host, 1);
+
+--echo
+--echo ## Legacy SHOW PROCESSLIST
+--connection con_user0
+let $pfs_spl = off;
+--source ../include/processlist_set.inc
+--source ../include/processlist_load.inc
+
+--echo
+--echo # Connection user1
+--connection con_user1
+
+--echo # Get Host:Port, legacy
+let $host_old = query_get_value(SHOW FULL PROCESSLIST, Host, 1);
+
+--echo
+
+## DEBUG ONLY
+## --echo DEBUG: New: $host_new  Old: $host_old
+
+if ($host_new == $host_old)
+{
+  --echo ***SUCCESS*** The SHOW PROCESSLIST Host fields match
+}
+
+if ($host_new != $host_old)
+{
+  --echo ***ERROR*** SHOW PROCESSLIST Host fields do not match. New: $host_new  Old: $host_old
+}
+
+--echo
+--echo ### Compare the processlist  Host column between Performance Schema and the Information Schema
+--echo
+--echo # Connection con_user0
+--connection con_user0
+let $count_new = `select count(*) from performance_schema.processlist`;
+let $count_old = `select count(*) from information_schema.processlist`;
+let $count_join = `select count(*) from performance_schema.processlist pspl
+                     left join information_schema.processlist ispl on pspl.host = ispl.host and pspl.id = ispl.id`;
+
+--echo
+
+if ($count_old == $count_join)
+{
+  --echo ***SUCCESS*** The processlist Host fields match between the Performance Schema and the Information Schema
+}
+
+if ($count_old != $count_join)
+{
+  --echo ***ERROR*** The processlist Host fields do not match
+  --echo Count new: $count_new   Count old: $count_old  Count join: $count_join
+  --echo
+  select * from performance_schema.processlist order by host, id;
+  --echo
+  select * from information_schema.processlist order by host, id;
+  --echo
+  select * from performance_schema.processlist pspl
+    left join information_schema.processlist ispl on pspl.host = ispl.host and pspl.id = ispl.id;
+}
+
+--echo
+--echo
+--echo ### Clean up ###
+--echo
+
+--echo # Disconnect con_user0
+--connection con_user0
+--disconnect con_user0
+--echo # Disconnect con_user1
+--connection con_user1
+--disconnect con_user1
+--echo # Disconnect con_user2
+--connection con_user2
+--disconnect con_user2
+--echo # Disconnect con_user3
+--connection con_user3
+--disconnect con_user3
+--echo # Disconnect con_user4
+--connection con_user4
+--disconnect con_user4
+
+--echo # Connection default
+--connection default
+--echo
+drop user user0@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+--echo
+set @@global.performance_schema_show_processlist = @save_processlist;
diff --git a/mysql-test/suite/perfschema/t/processlist_reg_user.test b/mysql-test/suite/perfschema/t/processlist_reg_user.test
new file mode 100644
index 000000000000..53dc8abfa635
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/processlist_reg_user.test
@@ -0,0 +1,134 @@
+--echo ##
+--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
+--echo ## Verify behavior for regular users and PROCESS_ACL.
+--echo ##
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+
+SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
+
+--source include/add_anonymous_users.inc
+
+SET @@global.performance_schema_show_processlist = OFF;
+
+CREATE USER 'regular'@'localhost';
+
+connect (reg,localhost,regular,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+
+SHOW GRANTS;
+
+# Self rows only
+SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Self rows only
+SELECT USER, INFO FROM performance_schema.processlist;
+
+# Self rows only
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+
+# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+
+TRUNCATE TABLE performance_schema.events_statements_history;
+SET @@global.performance_schema_show_processlist = ON;
+
+connection reg;
+
+SHOW GRANTS;
+
+# Self rows only
+SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Self rows only
+SELECT USER, INFO FROM performance_schema.processlist;
+
+# Self rows only
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+
+TRUNCATE TABLE performance_schema.events_statements_history;
+
+disconnect reg;
+
+GRANT PROCESS ON *.* TO 'regular'@'localhost';
+
+SET @@global.performance_schema_show_processlist = OFF;
+
+connect (reg2,localhost,regular,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+
+SHOW GRANTS;
+
+# Full rows
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Full rows
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+
+# Full rows
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+
+# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+
+TRUNCATE TABLE performance_schema.events_statements_history;
+SET @@global.performance_schema_show_processlist = ON;
+
+connection reg2;
+
+SHOW GRANTS;
+
+# Full rows
+SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
+
+# Full rows
+SELECT count(*) >= 2 FROM performance_schema.processlist;
+
+# Full rows
+--disable_result_log
+SHOW PROCESSLIST;
+--enable_result_log
+
+SELECT "Previous statement is now completed." as status;
+
+connection default;
+
+SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
+  FROM performance_schema.events_statements_history
+  WHERE SQL_TEXT = "SHOW PROCESSLIST";
+
+TRUNCATE TABLE performance_schema.events_statements_history;
+
+disconnect reg2;
+
+--source include/delete_anonymous_users.inc
+
+SET @@global.performance_schema_show_processlist = @save_processlist;
+
+DROP USER 'regular'@'localhost';
+
diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test
index 92b17761e635..859149803138 100644
--- a/mysql-test/suite/perfschema/t/read_only.test
+++ b/mysql-test/suite/perfschema/t/read_only.test
@@ -82,6 +82,93 @@ update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
 --enable_result_log
 
+--echo #
+--echo # Bug#31080309 - REGRESSION FOR BUG 81009 FIXED IN 5.7.17
+--echo #   Bug23103937(BUG81009) - PS_TRUNCATE_ALL_TABLES() DOES NOT WORK IN
+--echo #                           SUPER_READ_ONLY MODE.
+--echo #
+
+connection default;
+--echo # Reset read_only and super_read_only mode.
+set global read_only=0;
+set global super_read_only=0;
+--echo # Grant truncate table and execute stored procedure privileges to pfsuser.
+grant DROP on performance_schema.* to pfsuser@localhost;
+grant EXECUTE on procedure sys.ps_truncate_all_tables to pfsuser@localhost;
+
+--echo #-----------------------------------------------------------------------
+--echo # Test case to verify truncate operation on performance schema table by
+--echo # super user with super_read_only=ON.
+--echo #-----------------------------------------------------------------------
+--echo # Set super_read_only mode.
+set global super_read_only=1;
+
+connection con1;
+--echo # truncate operation is allowed in super_read_only mode on performance schema
+--echo # tables for super user.
+--echo # Without fix following statements fail because of super read only mode.
+--disable_result_log
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+--enable_result_log
+
+--echo #-----------------------------------------------------------------------
+--echo # Test case to verify truncate operation on performance schema table by
+--echo # super user with read_only=ON.
+--echo #-----------------------------------------------------------------------
+connection default;
+--echo # Reset super_read_only mode.
+set global super_read_only=0;
+--echo # Set read_only mode.
+set global read_only=1;
+
+connection con1;
+--echo # truncate operation is allowed in read_only mode on performance schema
+--echo # tables for super user.
+--echo # Without fix following statements fail because of super read only mode.
+--disable_result_log
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+--enable_result_log
+
+--echo #-----------------------------------------------------------------------
+--echo # Test case to verify truncate operation on performance schema table by
+--echo # non-super user with super_read_only=ON.
+--echo #-----------------------------------------------------------------------
+connection default;
+set global super_read_only=0;
+--echo # Revoke SUPER privilege from pfsuser.
+revoke SUPER on *.* from pfsuser@localhost;
+--echo # Reset super_read_only mode.
+set global super_read_only=1;
+
+connection con1;
+--echo # truncate operation is allowed in super_read_only mode on performance schema
+--echo # tables for non-super user.
+--disable_result_log
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+--enable_result_log
+
+--echo #-----------------------------------------------------------------------
+--echo # Test case to verify truncate operation on performance schema table by
+--echo # non-super user with read_only=ON.
+--echo #-----------------------------------------------------------------------
+connection default;
+--echo # Reset super_read_only mode.
+set global super_read_only=0;
+--echo # Set read_only mode.
+set global read_only=1;
+
+connection con1;
+--echo # truncate operation is allowed in read_only mode on performance schema
+--echo # tables for non-super user.
+--disable_result_log
+truncate table performance_schema.events_statements_summary_by_digest;
+call sys.ps_truncate_all_tables(0);
+--enable_result_log
+--echo ########################################################################
+
 disconnect con1;
 --source include/wait_until_disconnected.inc
 
diff --git a/mysql-test/suite/perfschema/t/show_aggregate.test b/mysql-test/suite/perfschema/t/show_aggregate.test
index e2f571100a49..b5c5d9355d7c 100644
--- a/mysql-test/suite/perfschema/t/show_aggregate.test
+++ b/mysql-test/suite/perfschema/t/show_aggregate.test
@@ -280,6 +280,20 @@ SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expec
 FROM test.status_results
 ORDER BY variable_name;
 
+
+--echo ================================================================================
+--echo TEST 8: FLUSH STATUS should clear account, host and user status
+--echo ================================================================================
+--echo
+FLUSH STATUS;
+--echo
+SELECT * FROM status_by_account WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+--echo
+SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+--echo
+SELECT * FROM status_by_user WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+
+
 --echo ================================================================================
 --echo CLEANUP
 --echo ================================================================================
diff --git a/mysql-test/suite/perfschema/t/show_coverage.test b/mysql-test/suite/perfschema/t/show_coverage.test
index ecf21a76a38e..c4b06029534b 100644
--- a/mysql-test/suite/perfschema/t/show_coverage.test
+++ b/mysql-test/suite/perfschema/t/show_coverage.test
@@ -7,6 +7,7 @@
 --source include/have_perfschema.inc
 --source include/not_embedded.inc
 --source include/no_protocol.inc
+--source include/count_sessions.inc
 
 select @@global.show_compatibility_56 into @show_compatibility_56_save;
 --echo
@@ -111,14 +112,90 @@ SELECT variable_value FROM status_by_thread
   WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_after;
 --echo
 --echo # Expect bytes_before > bytes_after
-SELECT @bytes_before > @bytes_after;
+SELECT @bytes_before > @bytes_after AS 'Expect 1';
 --echo
 --echo # Expect bytes_after is zero
-SELECT @bytes_after;
+SELECT @bytes_after AS 'Expect 0';
 
 disconnect con1;
+--source include/wait_until_count_sessions.inc
+
+
+--echo
+--echo # TEST 6
+--echo #
+--echo # Bug#28291258 FLUSH STATUS ADDS TWICE TO GLOBAL VALUES
+--echo #
+
+--echo
+--echo # Default connection
+--let $initial_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+
+--source include/count_sessions.inc
 
 --echo
+--echo # First connection
+--connect (con1, localhost, root,,)
+
+## Global value requested from the first session must not change
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 0
+--let $assert_text = Global value requested from the first session must not change
+--source include/assert.inc
+
+--echo
+--echo # Generate a slow query
+--echo
+SET long_query_time = 2;
+SELECT SLEEP(4);
+SET long_query_time = @@global.long_query_time;
+--echo
+
+## Global value requested from the first session after SLEEP() must increase by 1
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $first_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the first session after SLEEP() must increase by 1
+--source include/assert.inc
+--let $assert_cond = $first_session_value = 1
+--let $assert_text = First session value must increase by 1
+--source include/assert.inc
+
+--connection default
+--disconnect con1
+--source include/wait_until_count_sessions.inc
+
+--echo
+--echo # Default connection
+--connection default
+
+## Global value requested from the default session after DISCONNECT must remain the same
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $default_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the default session after DISCONNECT must remain the same
+--source include/assert.inc
+
+## Default session value must remain zero
+--let $assert_cond = $default_session_value = 0
+--let $assert_text = Default session value must remain zero
+--source include/assert.inc
+
+--echo
+FLUSH STATUS;
+--echo
+
+## Global value requested from the default session after FLUSH must remain the same
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $default_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the default session after FLUSH must remain the same
+--source include/assert.inc
+
+## Default session value after FLUSH must remain zero
+--let $assert_cond = $default_session_value = 0
+--let $assert_text = Default session value after FLUSH must remain zero
+--source include/assert.inc
+
 --echo # CLEANUP
 set @@global.show_compatibility_56 = @show_compatibility_56_save;
-
diff --git a/mysql-test/suite/perfschema/t/show_misc.test b/mysql-test/suite/perfschema/t/show_misc.test
index e56c859913be..39a6b65b6b5f 100644
--- a/mysql-test/suite/perfschema/t/show_misc.test
+++ b/mysql-test/suite/perfschema/t/show_misc.test
@@ -75,6 +75,21 @@ UNLOCK TABLES;
 
 DROP TABLE test.t1;
 
+
+--echo
+--echo ================================================================================
+--echo Bug#28515475 BOGUS DATA WHEN ORDERING RESULTS FROM VARIABLES_BY_THREAD 
+--echo ================================================================================
+--echo Verify the results from "WHERE variable_name IN(...)", particularly for those
+--echo variables that are listed after the deprecated variable gtid_executed.
+--echo The ORDER BY also forces an additional code path through rnd_pos().
+--echo
+
+SELECT variable_name FROM performance_schema.variables_by_thread
+  WHERE variable_name IN ('interactive_timeout','net_read_timeout','net_write_timeout','wait_timeout')
+  ORDER BY variable_name; 
+
+
 --echo
 --echo ================================================================================
 --echo CLEAN UP
diff --git a/mysql-test/suite/perfschema/t/show_sanity.test b/mysql-test/suite/perfschema/t/show_sanity.test
index 98073adacfe0..cc54d1af7448 100644
--- a/mysql-test/suite/perfschema/t/show_sanity.test
+++ b/mysql-test/suite/perfschema/t/show_sanity.test
@@ -502,6 +502,7 @@ insert into test.sanity values
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_ON_TIMEOUT"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_SEGMENTS"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SAVED_PAGE_NUMBER_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SEMAPHORE_WAIT_TIMEOUT_DEBUG"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SORT_BUFFER_SIZE"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SPIN_WAIT_DELAY"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_AUTO_RECALC"),
@@ -582,6 +583,7 @@ insert into test.sanity values
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_USE_MMAP"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYSQL_NATIVE_PASSWORD_PROXY_USERS"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NAMED_PIPE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NAMED_PIPE_FULL_ACCESS_GROUP"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_DATABASE"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_OFFLINE"),
   ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_TABLE_PREFIX"),
diff --git a/mysql-test/suite/perfschema/t/threads_mysql.test b/mysql-test/suite/perfschema/t/threads_mysql.test
index 8576c8767d67..05ce84ca0fce 100644
--- a/mysql-test/suite/perfschema/t/threads_mysql.test
+++ b/mysql-test/suite/perfschema/t/threads_mysql.test
@@ -47,7 +47,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
        processlist_command, processlist_info,
        IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
          AS unified_parent_thread_id,
-       role, instrumented
+       `role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
 ORDER BY name;
@@ -66,7 +66,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
        processlist_command, processlist_info,
        IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
          AS unified_parent_thread_id,
-       role, instrumented
+       `role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
   AND thread_id NOT IN (SELECT thread_id FROM t1)
@@ -106,7 +106,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
        processlist_command, processlist_info,
        IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
          AS unified_parent_thread_id,
-       role, instrumented
+       `role`, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
   AND thread_id NOT IN (SELECT thread_id FROM t1)
diff --git a/mysql-test/suite/query_rewrite_plugins/include/reload.inc b/mysql-test/suite/query_rewrite_plugins/include/reload.inc
index 6ebe7624b440..36fa0cbdaf9e 100644
--- a/mysql-test/suite/query_rewrite_plugins/include/reload.inc
+++ b/mysql-test/suite/query_rewrite_plugins/include/reload.inc
@@ -26,6 +26,7 @@ SELECT * FROM test.t2;
 DROP PROCEDURE query_rewrite.flush_rewrite_rules;
 DROP FUNCTION load_rewrite_rules;
 UNINSTALL PLUGIN rewriter;
+--source include/disconnect_connections.inc
 
 --echo # Check that the table is still present and didn't get dropped.
 SELECT pattern, replacement FROM query_rewrite.rewrite_rules;
diff --git a/mysql-test/suite/query_rewrite_plugins/r/digest_collision.result b/mysql-test/suite/query_rewrite_plugins/r/digest_collision.result
index 81e4c36bcea5..93d0af474409 100644
--- a/mysql-test/suite/query_rewrite_plugins/r/digest_collision.result
+++ b/mysql-test/suite/query_rewrite_plugins/r/digest_collision.result
@@ -62,7 +62,7 @@ SELECT search_error_log( '[Note]', '%Plugin Rewriter reported: ''Statement "SELE
 'WHERE a = "digest_collision.test"%' );
 search_error_log( '[Note]', '%Plugin Rewriter reported: ''Statement "SELECT * FROM test.t1 ' ||
 'WHERE a = "digest_collision.test"%' )
-[Note] Plugin Rewriter reported: 'Statement "SELECT * FROM test.t1 WHERE a = "digest_collision.test" UNION SELECT * FROM test.t1 WHERE a = "diges..." with digest "fa0ba9dd420bd6aaeea4ebb0f26f47d2" matched some rule but had different parse tree and/or literals.'
+[Note] Plugin Rewriter reported: 'Statement "SELECT * FROM test.t1 WHERE a = "digest_collision.test" UNION SELECT * FROM test.t1 WHERE a = "diges..." with digest "a791200aa1f826531b128ea5f7ca3b99" matched some rule but had different parse tree and/or literals.'
 DROP TABLE t1;
 Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/query_rewrite_plugins/r/multiple.result b/mysql-test/suite/query_rewrite_plugins/r/multiple.result
index 7afa4520e104..7a3ad69d98ad 100644
--- a/mysql-test/suite/query_rewrite_plugins/r/multiple.result
+++ b/mysql-test/suite/query_rewrite_plugins/r/multiple.result
@@ -43,6 +43,15 @@ UNINSTALL PLUGIN rewrite_example;
 Warnings:
 Note	1105	Query 'UNINSTALL PLUGIN rewrite_example' rewritten to 'uninstall plugin rewrite_example' by a query rewrite plugin
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
+Note	1105	Query 'SHOW WARNINGS' rewritten to 'show warnings' by a query rewrite plugin
+Warnings:
+Note	1105	Query 'DROP DATABASE IF EXISTS query_rewrite' rewritten to 'drop database if exists query_rewrite' by a query rewrite plugin
+Note	1105	Query 'SHOW WARNINGS' rewritten to 'show warnings' by a query rewrite plugin
 Warnings:
+Note	1105	Query 'DROP FUNCTION IF EXISTS load_rewrite_rules' rewritten to 'drop function if exists load_rewrite_rules' by a query rewrite plugin
+Note	1105	Query 'SHOW WARNINGS' rewritten to 'show warnings' by a query rewrite plugin
+Warnings:
+Note	1105	Query 'UNINSTALL PLUGIN rewriter' rewritten to 'uninstall plugin rewriter' by a query rewrite plugin
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
+Note	1105	Query 'SHOW WARNINGS' rewritten to 'show warnings' by a query rewrite plugin
 # Query rewrite plugin was queued for uninstalling.
diff --git a/mysql-test/suite/query_rewrite_plugins/r/optional_columns.result b/mysql-test/suite/query_rewrite_plugins/r/optional_columns.result
index e49b108a3403..34f55ce35d10 100644
--- a/mysql-test/suite/query_rewrite_plugins/r/optional_columns.result
+++ b/mysql-test/suite/query_rewrite_plugins/r/optional_columns.result
@@ -27,7 +27,7 @@ Warnings:
 Warning	1681	'RESET QUERY CACHE' is deprecated and will be removed in a future release.
 SELECT * FROM query_rewrite.rewrite_rules;
 id	pattern	pattern_database	replacement	enabled	message	pattern_digest	normalized_pattern
-1	SELECT ?	NULL	SELECT "literal"	YES	NULL	f29eded39dd5fa102f18987679dd0c14	select ?
+1	SELECT ?	NULL	SELECT "literal"	YES	NULL	3d4fc22e33e10d7235eced3c75a84c2c	select ?
 SELECT NULL;
 literal
 literal
@@ -82,11 +82,11 @@ id	pattern	pattern_database	replacement	enabled	message	pattern_digest	normalize
 CALL query_rewrite.flush_rewrite_rules();
 SELECT * FROM query_rewrite.rewrite_rules;
 id	pattern	pattern_database	replacement	enabled	message	pattern_digest	normalized_pattern
-2	SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ?	NULL	SELECT a FROM test.t1 WHERE a = ?	YES	NULL	b6020d860228520c135044894575f127	select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
-3	SELECT a FROM test.t1	NULL	SELECT * FROM test.t1 WHERE a = 'abc'	YES	NULL	bbb42999787762141baeef34e2039a8b	select `a` from `test`.`t1`
-4	SELECT a FROM test.t1 WHERE b = ?	NULL	SELECT * FROM test.t1 WHERE b = ?	YES	NULL	e9cacff38075dbb20dc50fb3815b5f9c	select `a` from `test`.`t1` where (`b` = ?)
-5	SELECT * FROM test.t2	NULL	SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a	YES	NULL	99a508083023390fd952abcf5dc51ab6	select `*` from `test`.`t2`
-6	SELECT * FROM test.t1 WHERE a = ? OR b = ?	NULL	SELECT * FROM test.t1 WHERE b = ? OR a = ?	YES	NULL	df65bbce43bf5bf712ed734db35be048	select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
+2	SELECT * FROM test.t1 WHERE ( a = ? AND TRUE ) OR b = ?	NULL	SELECT a FROM test.t1 WHERE a = ?	YES	NULL	abcc8e5c0ca2b1bd493606aeadb23a78	select `*` from `test`.`t1` where (((`a` = ?) and ?) or (`b` = ?))
+3	SELECT a FROM test.t1	NULL	SELECT * FROM test.t1 WHERE a = 'abc'	YES	NULL	a68f8405e383726e9a41295fe1ce5460	select `a` from `test`.`t1`
+4	SELECT a FROM test.t1 WHERE b = ?	NULL	SELECT * FROM test.t1 WHERE b = ?	YES	NULL	2500f673a570ddb20ab448b717c49ee4	select `a` from `test`.`t1` where (`b` = ?)
+5	SELECT * FROM test.t2	NULL	SELECT * FROM test.t1 JOIN test.t2 ON t1.a = t2.a	YES	NULL	938f59280d6ad2fa2f500aeeae6a5232	select `*` from `test`.`t2`
+6	SELECT * FROM test.t1 WHERE a = ? OR b = ?	NULL	SELECT * FROM test.t1 WHERE b = ? OR a = ?	YES	NULL	629ae8152128638e35ea25458b38c94e	select `*` from `test`.`t1` where ((`a` = ?) or (`b` = ?))
 # Check a query that doesn't have a rewrite rule doesn't get rewritten.
 SELECT b FROM test.t1;
 b
@@ -187,9 +187,9 @@ id	pattern	pattern_database	replacement	enabled	message	pattern_digest	normalize
 CALL query_rewrite.flush_rewrite_rules();
 SELECT * FROM query_rewrite.rewrite_rules;
 id	pattern	pattern_database	replacement	enabled	message	pattern_digest	normalized_pattern
-7	SELECT 1, ?	NULL	SELECT "rewritten w/rule 1"	YES	NULL	83ef7ed240106f12b4730d6980da9ab7	select ?,?
-8	SELECT 2, ?	NULL	SELECT "rewritten w/rule 2"	YES	NULL	83ef7ed240106f12b4730d6980da9ab7	select ?,?
-9	SELECT "The_original_query"	NULL	SELECT "The_rewritten_query"	YES	NULL	f29eded39dd5fa102f18987679dd0c14	select ?
+7	SELECT 1, ?	NULL	SELECT "rewritten w/rule 1"	YES	NULL	c99d4aa0a93768bd2b9f1ba0f551af7a	select ?,?
+8	SELECT 2, ?	NULL	SELECT "rewritten w/rule 2"	YES	NULL	c99d4aa0a93768bd2b9f1ba0f551af7a	select ?,?
+9	SELECT "The_original_query"	NULL	SELECT "The_rewritten_query"	YES	NULL	3d4fc22e33e10d7235eced3c75a84c2c	select ?
 SELECT 1, 1;
 rewritten w/rule 1
 rewritten w/rule 1
diff --git a/mysql-test/suite/query_rewrite_plugins/r/pre_parse_example.result b/mysql-test/suite/query_rewrite_plugins/r/pre_parse_example.result
index 432100eed2d0..b6e14c0a2bb2 100644
--- a/mysql-test/suite/query_rewrite_plugins/r/pre_parse_example.result
+++ b/mysql-test/suite/query_rewrite_plugins/r/pre_parse_example.result
@@ -39,6 +39,7 @@ UNINSTALL PLUGIN rewrite_example;
 Warnings:
 Note	1105	Query 'UNINSTALL PLUGIN rewrite_example' rewritten to 'uninstall plugin rewrite_example' by a query rewrite plugin
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
+Note	1105	Query 'SHOW WARNINGS' rewritten to 'show warnings' by a query rewrite plugin
 SELECT 'UPPERCASE';
 UPPERCASE
 UPPERCASE
diff --git a/mysql-test/suite/query_rewrite_plugins/r/verbose.result b/mysql-test/suite/query_rewrite_plugins/r/verbose.result
index f86660e847ac..ce35d73456b0 100644
--- a/mysql-test/suite/query_rewrite_plugins/r/verbose.result
+++ b/mysql-test/suite/query_rewrite_plugins/r/verbose.result
@@ -43,7 +43,7 @@ SELECT search_error_log( '[Note]', "%Plugin Rewriter reported: " ||
 "'Statement \"SELECT 'nonrewritten'\"%" ) INTO @line;
 SELECT @line;
 @line
-[Note] Plugin Rewriter reported: 'Statement "SELECT 'nonrewritten'" with digest "f29eded39dd5fa102f18987679dd0c14" did not match any rule.'
+[Note] Plugin Rewriter reported: 'Statement "SELECT 'nonrewritten'" with digest "3d4fc22e33e10d7235eced3c75a84c2c" did not match any rule.'
 SELECT digest INTO @pfs_digest
 FROM performance_schema.events_statements_history_long
 WHERE sql_text = "SELECT 'nonrewritten'"
diff --git a/mysql-test/suite/query_rewrite_plugins/t/errors.test b/mysql-test/suite/query_rewrite_plugins/t/errors.test
index cbd530ea9ace..2f17991f5293 100644
--- a/mysql-test/suite/query_rewrite_plugins/t/errors.test
+++ b/mysql-test/suite/query_rewrite_plugins/t/errors.test
@@ -47,6 +47,7 @@ SELECT search_error_log( '[Error]', "%Plugin Rewriter reported: 'Wrong%" );
 SHOW STATUS LIKE 'Rewriter_number_reloads';
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
+--source include/disconnect_connections.inc
 
 --echo # Create another table with insufficient number of columns.
 CREATE DATABASE query_rewrite;
@@ -65,6 +66,7 @@ SHOW STATUS LIKE 'Rewriter_reload_error';
 SHOW STATUS LIKE 'Rewriter_number_loaded_rules';
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
+--source include/disconnect_connections.inc
 
 --source suite/query_rewrite_plugins/include/install_rewriter.inc
 
@@ -267,6 +269,8 @@ WHERE NAME = 'statements_digest';
 --echo # script. The library will not be unloaded so we can still call the UDF
 --echo # but it should return an error.
 UNINSTALL PLUGIN rewriter;
+--source include/disconnect_connections.inc
+
 --error ER_CANT_INITIALIZE_UDF
 CALL query_rewrite.flush_rewrite_rules();
 --error ER_CANT_INITIALIZE_UDF
diff --git a/mysql-test/suite/query_rewrite_plugins/t/pre_parse_example.test b/mysql-test/suite/query_rewrite_plugins/t/pre_parse_example.test
index 1ff191c9c44a..901e16ec3e69 100644
--- a/mysql-test/suite/query_rewrite_plugins/t/pre_parse_example.test
+++ b/mysql-test/suite/query_rewrite_plugins/t/pre_parse_example.test
@@ -28,5 +28,6 @@ SELECT @c2p1;
 --enable_warnings
 
 UNINSTALL PLUGIN rewrite_example;
+--source include/disconnect_connections.inc
 
 SELECT 'UPPERCASE';
diff --git a/mysql-test/suite/query_rewrite_plugins/t/query_cache.test b/mysql-test/suite/query_rewrite_plugins/t/query_cache.test
index 1d55cf1a2bb5..5c3fca69691e 100644
--- a/mysql-test/suite/query_rewrite_plugins/t/query_cache.test
+++ b/mysql-test/suite/query_rewrite_plugins/t/query_cache.test
@@ -93,6 +93,7 @@ SELECT * FROM test.t1;
 DELETE FROM query_rewrite.rewrite_rules;
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
+--source include/disconnect_connections.inc
 
 SELECT * FROM test.t1;
 SELECT * FROM test.t1;
diff --git a/mysql-test/suite/query_rewrite_plugins/t/transactions.test b/mysql-test/suite/query_rewrite_plugins/t/transactions.test
index 1dc224960c42..d121239772cf 100644
--- a/mysql-test/suite/query_rewrite_plugins/t/transactions.test
+++ b/mysql-test/suite/query_rewrite_plugins/t/transactions.test
@@ -47,7 +47,7 @@ SELECT "Rewrite me conn 2";
 SELECT xxx(pattern) FROM query_rewrite.rewrite_rules;
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
-
+--source include/disconnect_connections.inc
 
 --echo #
 --echo # Now make sure that everything works as long we do as we're supposed
@@ -66,7 +66,7 @@ SELECT 'Rewrite me';
 SHOW STATUS LIKE 'Rewriter_%';
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
-
+--source include/disconnect_connections.inc
 
 --echo #
 --echo # Now check that we don't fail even if @@autocommit is 0. In this case
@@ -102,7 +102,7 @@ SELECT 'Rewrite me';
 SHOW STATUS LIKE 'Rewriter_%';
 
 --source suite/query_rewrite_plugins/include/uninstall_rewriter.inc
-
+--source include/disconnect_connections.inc
 
 --echo #
 --echo # Now let's make sure that everything works fine if we run with
diff --git a/mysql-test/suite/rpl/extension/bhs.pl b/mysql-test/suite/rpl/extension/bhs.pl
index a0bb8a4b374d..12a39399ec7b 100755
--- a/mysql-test/suite/rpl/extension/bhs.pl
+++ b/mysql-test/suite/rpl/extension/bhs.pl
@@ -1,20 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 use File::Basename;
 use File::Copy qw(copy);
 use File::Spec qw(catdir);
diff --git a/mysql-test/suite/rpl/extension/checksum.pl b/mysql-test/suite/rpl/extension/checksum.pl
index 60dca18c8f86..566161551685 100755
--- a/mysql-test/suite/rpl/extension/checksum.pl
+++ b/mysql-test/suite/rpl/extension/checksum.pl
@@ -1,20 +1,5 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 use File::Basename;
 use File::Copy qw(copy);
 use File::Spec qw(catdir);
diff --git a/mysql-test/suite/rpl/r/mysqldump_bug33630199.result b/mysql-test/suite/rpl/r/mysqldump_bug33630199.result
new file mode 100644
index 000000000000..98fdaff2a3e0
--- /dev/null
+++ b/mysql-test/suite/rpl/r/mysqldump_bug33630199.result
@@ -0,0 +1,30 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE DATABASE db;
+USE db;
+CREATE TABLE t(num INT, num2 INT);
+CREATE PROCEDURE insertParallely()
+BEGIN
+DECLARE counter INT DEFAULT 1;
+WHILE counter <= 1000 DO
+INSERT INTO db.t VALUES(counter, 1);
+SET counter = counter + 1;
+END WHILE;
+END$
+CALL insertParallely();;
+[connection server_1]
+[connection master]
+[connection slave]
+include/start_slave.inc
+[connection master]
+UPDATE db.t SET num2=2 WHERE num2=1;
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert.inc [The row count with num2=2 must be 1000 on replica]
+include/assert.inc [The replica's GTID_EXECUTED must be equal to the source's one]
+[connection master]
+DROP DATABASE db;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_alter_user.result b/mysql-test/suite/rpl/r/rpl_alter_user.result
index 46eca5def375..37030bc4daca 100644
--- a/mysql-test/suite/rpl/r/rpl_alter_user.result
+++ b/mysql-test/suite/rpl/r/rpl_alter_user.result
@@ -8,7 +8,7 @@ SET @@session.sql_mode= (select replace(@@session.sql_mode,'NO_BACKSLASH_ESCAPES
 SET @old_sql_mode_slave= @@session.sql_mode;
 SET @@session.sql_mode= (select replace(@@session.sql_mode,'NO_BACKSLASH_ESCAPES',''));
 SET GLOBAL DEBUG= '+d,force_hash_string_with_quote';
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH sha256_password AS 'auth_string1';
+CREATE USER 'user1'@'localhost' IDENTIFIED WITH sha256_password BY 'auth_string1';
 SET PASSWORD FOR 'user1'@'localhost' = 'auth_secret';
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/suite/rpl/r/rpl_apply_binlog_with_same_server_id.result b/mysql-test/suite/rpl/r/rpl_apply_binlog_with_same_server_id.result
new file mode 100644
index 000000000000..66a635f518a1
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_apply_binlog_with_same_server_id.result
@@ -0,0 +1,11 @@
+call mtr.add_suppression("using --replicate-same-server-id in conjunction with --log-replica-updates would lead to infinite loops in this server.");
+# restart: --replicate-same-server-id=1 --server_id=1 --relay-log=replicate-relay-bin
+SET GLOBAL RELAY_LOG_PURGE=OFF;
+CHANGE MASTER TO RELAY_LOG_FILE='replicate-relay-bin.000001', RELAY_LOG_POS=1, MASTER_HOST='dummy';
+START SLAVE SQL_THREAD;
+SET GLOBAL RELAY_LOG_PURGE=ON;
+STOP SLAVE SQL_THREAD;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_format_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_format_errors.result
new file mode 100644
index 000000000000..e7746cf79e9d
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_format_errors.result
@@ -0,0 +1,195 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+==== Initialize ====
+[on slave]
+[connection slave]
+SET @old_binlog_format= @@global.binlog_format;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+[on master]
+[connection master]
+SET @old_binlog_format= @@global.binlog_format;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+CREATE TABLE t (a VARCHAR(100)) ENGINE = MYISAM;
+CREATE TABLE t_row (a VARCHAR(100)) ENGINE = INNODB;
+CREATE TABLE t_stmt (a VARCHAR(100)) ENGINE = EXAMPLE;
+CREATE TABLE t_slave_stmt (a VARCHAR(100)) ENGINE = MYISAM;
+CREATE TABLE t_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
+CREATE TABLE t_double_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
+CREATE TRIGGER trig_autoinc BEFORE INSERT ON t_autoinc FOR EACH ROW BEGIN INSERT INTO t_stmt VALUES ('x'); END;
+CREATE TRIGGER trig_double_autoinc BEFORE INSERT ON t_double_autoinc FOR EACH ROW BEGIN INSERT INTO t_autoinc VALUES (NULL); END;
+CREATE DATABASE other;
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+[on slave]
+include/sync_slave_sql_with_master.inc
+DROP TABLE t_slave_stmt;
+CREATE TABLE t_slave_stmt (a INT) ENGINE = EXAMPLE;
+[on master]
+[connection master]
+BINLOG '
+1gRVSg8BAAAAZgAAAGoAAAABAAQANS4xLjM2LWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAADWBFVKEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+==== Test ====
+---- binlog_format='row' ----
+* TC1: Modify both row-only and stmt-only table
+CREATE TRIGGER trig_2 AFTER INSERT ON t_stmt FOR EACH ROW BEGIN INSERT INTO t_row VALUES(1); END;
+INSERT INTO t_stmt VALUES (1);
+ERROR HY000: Cannot execute statement: impossible to write to binary log since both row-incapable engines and statement-incapable engines are involved.
+SELECT * FROM t_stmt /* should be empty */;
+a
+SELECT * FROM t_row /* should be empty */;
+a
+DROP TRIGGER trig_2;
+* TC2: Stmt-only table and binlog_format='row'
+INSERT INTO t_stmt VALUES (1);
+ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = ROW and at least one table uses a storage engine limited to statement-based logging.
+SELECT * FROM t_stmt /* should be empty */;
+a
+* TC3: Row injection and stmt-only table: in slave sql thread
+INSERT INTO t_slave_stmt VALUES (1);
+[on slave]
+[connection slave]
+include/wait_for_slave_sql_error_and_skip.inc [errno=1664]
+Last_SQL_Error = 'Error executing row event: 'Cannot execute statement: impossible to write to binary log since statement is in row format and at least one table uses a storage engine limited to statement-based logging.''
+[connection slave]
+SELECT * FROM t_slave_stmt /* should be empty */;
+a
+[on master]
+[connection master]
+* TC4: Row injection and stmt-only table: use BINLOG statement
+BINLOG '
+1gRVShMBAAAALwAAAEABAAAAABcAAAAAAAAABHRlc3QABnRfc3RtdAABDwJkAAE=
+1gRVShcBAAAAIAAAAGABAAAQABcAAAAAAAEAAf/+ATE=
+';
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is in row format and at least one table uses a storage engine limited to statement-based logging.
+SELECT * FROM t_stmt /* should be empty */;
+a
+---- binlog_format=mixed ----
+[on slave]
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET @@global.binlog_format = MIXED;
+include/start_slave.inc
+[on master]
+[connection master]
+SET @@global.binlog_format = MIXED;
+SET @@session.binlog_format = MIXED;
+* TC5: Unsafe statement and stmt-only engine
+INSERT INTO t_stmt VALUES (UUID());
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. Statement is unsafe because it uses a system function that may return a different value on the slave.
+SELECT * FROM t_stmt;
+a
+/* should be empty */;
+* TC6: Multi-unsafe statement and stmt-only engine
+INSERT INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is unsafe, storage engine is limited to statement-based logging, and BINLOG_FORMAT = MIXED. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+SELECT * FROM t_double_autoinc;
+a
+/* should be empty */;
+---- binlog_format=statement ----
+[on slave]
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET @@global.binlog_format = STATEMENT;
+include/start_slave.inc
+[on master]
+[connection master]
+SET @@global.binlog_format = STATEMENT;
+SET @@session.binlog_format = STATEMENT;
+* TC7: Row-only engine and binlog_format=statement: innodb-specific message
+INSERT INTO t_row VALUES (1);
+ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED.
+SELECT * FROM t_row /* should be empty */;
+a
+* TC8: Same statement, but db filtered out - no error
+USE other;
+INSERT INTO test.t_row VALUES (1);
+USE test;
+SELECT * FROM t_row /* should contain the value 1 */;
+a
+1
+USE other;
+DELETE FROM test.t_row;
+USE test;
+* TC9: Row-only engine and binlog_format=statement: generic message
+SET @@session.debug= '+d,no_innodb_binlog_errors';
+INSERT INTO t_row VALUES (1);
+ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging.
+SELECT * FROM t_row /* should be empty */;
+a
+* TC10: Same statement, but db filtered out - no error
+USE other;
+INSERT INTO test.t_row VALUES (1);
+USE test;
+SET @@session.debug= '';
+SELECT * FROM t_row /* should contain the value 1 */;
+a
+1
+* TC11: Row injection and binlog_format=statement: BINLOG statement
+BINLOG '
+cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
+cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
+';
+ERROR HY000: Cannot execute statement: impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT.
+SELECT * FROM t /* should be empty */;
+a
+* TC12: Same statement, but db filtered out - no error
+USE other;
+BINLOG '
+cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
+cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
+';
+USE test;
+SELECT * FROM t /* should contain the value 1 */;
+a
+1
+DELETE FROM t;
+* TC13: Unsafe statement and binlog_format=statement
+INSERT INTO t VALUES (COALESCE(1, UUID()));
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+SELECT * FROM t /* should contain the value 1 */;
+a
+1
+DELETE FROM t;
+* TC14: Same statement, but db filtered out - no message
+USE other;
+INSERT INTO test.t VALUES (COALESCE(1, UUID()));
+USE test;
+SELECT * FROM t /* should contain the value 1 */;
+a
+1
+DELETE FROM t;
+---- master: binlog_format=mixed, slave: binlog_format=statement ----
+SET @@global.binlog_format = MIXED;
+SET @@session.binlog_format = MIXED;
+* TC15: Row injection and binlog_format=statement: in slave sql thread
+INSERT INTO t VALUES (COALESCE(1, UUID()));
+[on slave]
+[connection slave]
+include/wait_for_slave_sql_error_and_skip.inc [errno=1666]
+Last_SQL_Error = 'Error executing row event: 'Cannot execute statement: impossible to write to binary log since statement is in row format and BINLOG_FORMAT = STATEMENT.''
+[connection slave]
+SELECT * FROM t /* should be empty */;
+a
+[on master]
+[connection master]
+==== Clean up ====
+DROP TRIGGER trig_autoinc;
+DROP TRIGGER trig_double_autoinc;
+DROP TABLE t, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
+DROP DATABASE other;
+SET @@global.binlog_format = @old_binlog_format;
+SET @@session.binlog_format = @old_binlog_format;
+UNINSTALL PLUGIN example;
+[on slave]
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET @@global.binlog_format = @old_binlog_format;
+SET @@session.binlog_format = @old_binlog_format;
+include/start_slave.inc
+UNINSTALL PLUGIN example;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_history_size.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_history_size.result
new file mode 100644
index 000000000000..5dfdc4bbe060
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_history_size.result
@@ -0,0 +1,110 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET @binlog_transaction_dependency_tracking_save = @@GLOBAL.binlog_transaction_dependency_tracking;
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 1. WRITESET ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET	6
+CREATE TABLE test.tab1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
+CREATE TABLE test.tab2 (a INT);
+FLUSH LOGS;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab2 VALUES (1);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL), (NULL), (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+BEGIN;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+COMMIT;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE test.tab1, test.tab2;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;1 5;5 6;5 7;7 8;7 9;7 10;7 11;11 12;9 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 2. WRITESET_SESSION ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET_SESSION	6
+CREATE TABLE test.tab1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
+CREATE TABLE test.tab2 (a INT);
+FLUSH LOGS;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab2 VALUES (1);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL), (NULL), (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+BEGIN;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+COMMIT;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE test.tab1, test.tab2;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;1 5;5 6;5 7;7 8;7 9;7 10;7 11;11 12;9 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+######## 3. COMMIT_ORDER ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	COMMIT_ORDER	6
+CREATE TABLE test.tab1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
+CREATE TABLE test.tab2 (a INT);
+FLUSH LOGS;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab2 VALUES (1);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL), (NULL), (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+BEGIN;
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+INSERT INTO tab1 VALUES (NULL);
+COMMIT;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE test.tab1, test.tab2;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;9 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+SET GLOBAL binlog_transaction_dependency_tracking = @binlog_transaction_dependency_tracking_save;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking.result
new file mode 100644
index 000000000000..d489908a266c
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking.result
@@ -0,0 +1,810 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#### INITIALIZE ####
+call mtr.add_suppression("Transaction is tagged with inconsistent logical timestamps");
+call mtr.add_suppression("Cannot execute the current event group in the parallel mode.");
+include/stop_slave.inc
+SET @save_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @save_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET @save_slave_transaction_retries = @@GLOBAL.slave_transaction_retries;
+SET GLOBAL slave_parallel_type = LOGICAL_CLOCK;
+SET GLOBAL slave_parallel_workers = 3;
+SET GLOBAL slave_transaction_retries = 0;
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+CREATE TABLE tests (`id` INT NOT NULL, `description` VARCHAR(50), `results` VARCHAR(100), PRIMARY KEY(`id`));
+INSERT INTO `tests` (`id`, `description`, `results`) VALUES
+(1,  'Writeset',                  '0 1;1 2;1 3;1 4;3 5;3 6;4 7;7 8;6 9;9 10'),
+(2,  'Writeset+DDL',              '0 1;1 2;1 3;1 4;4 5;5 6;6 7;7 8;4 9;7 10;10 11;9 12;12 13'),
+(3,  'Writeset+rotation',         '0 1;0 2;1 3;3 4;2 5;5 6'),
+(4,  'Writeset+history',          '0 1;1 2;1 3;1 4;4 5;4 6;4 7;7 8;7 9;9 10'),
+(5,  'Writeset_session',          '0 1;1 2;1 3;2 4;3 5;3 6;5 7;7 8;7 9;9 10'),
+(6,  'Writeset_session+DDL',      '0 1;1 2;1 3;2 4;4 5;5 6;6 7;7 8;4 9;8 10;10 11;10 12;12 13'),
+(7,  'Writeset_session+rotation', '0 1;0 2;1 3;3 4;3 5;5 6'),
+(8,  'Writeset_session+history',  '0 1;1 2;1 3;2 4;4 5;4 6;5 7;7 8;7 9;9 10'),
+(9,  'Commit_order',              '0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10'),
+(10, 'Commit_order+DDL',          '0 1;1 2;1 3;3 4;4 5;5 6;6 7;7 8;4 9;9 10;10 11;10 12;12 13'),
+(11, 'Commit_order+rotation',     '0 1;0 2;2 3;3 4;3 5;5 6'),
+(12, 'Commit_order+history',      '0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10');
+FLUSH LOGS;
+#### TEST ####
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 1. WRITESET ########
+#### STEP 1.1 TEST Writeset ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000002
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;1 4;3 5;3 6;4 7;7 8;6 9;9 10]
+#### STEP 1.2 TEST Writeset+DDL ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Inserted a DDL after TRX5 and check that they run in parallel due to commit_order
+CREATE TABLE `t2` (`id` int(11) NOT NULL, `val` int(11) NOT NULL) ENGINE=InnoDB;
+ALTER TABLE t2 ADD COLUMN b INT;
+DROP TABLE `t2`;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000003
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;1 4;4 5;5 6;6 7;7 8;4 9;7 10;10 11;9 12;12 13]
+#### STEP 1.3 TEST Writeset+rotation ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Flushing logs in the middle of the set
+FLUSH LOGS;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000005
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;0 2;1 3;3 4;2 5;5 6]
+#### STEP 1.4 TEST Writeset+history ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+History size reduced to 10 to test when it becomes full
+SET GLOBAL binlog_transaction_dependency_history_size=10;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET	10
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000006
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;1 4;4 5;4 6;4 7;7 8;7 9;9 10]
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 2. WRITESET_SESSION ########
+#### STEP 2.1 TEST Writeset_session ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET_SESSION	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000007
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;3 6;5 7;7 8;7 9;9 10]
+#### STEP 2.2 TEST Writeset_session+DDL ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET_SESSION	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Inserted a DDL after TRX5 and check that they run in parallel due to commit_order
+CREATE TABLE `t2` (`id` int(11) NOT NULL, `val` int(11) NOT NULL) ENGINE=InnoDB;
+ALTER TABLE t2 ADD COLUMN b INT;
+DROP TABLE `t2`;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000008
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;4 5;5 6;6 7;7 8;4 9;8 10;10 11;10 12;12 13]
+#### STEP 2.3 TEST Writeset_session+rotation ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET_SESSION	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Flushing logs in the middle of the set
+FLUSH LOGS;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000010
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;0 2;1 3;3 4;3 5;5 6]
+#### STEP 2.4 TEST Writeset_session+history ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+History size reduced to 10 to test when it becomes full
+SET GLOBAL binlog_transaction_dependency_history_size=10;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	WRITESET_SESSION	10
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000011
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;4 5;4 6;5 7;7 8;7 9;9 10]
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+######## 3. COMMIT_ORDER ########
+#### STEP 3.1 TEST Commit_order ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	COMMIT_ORDER	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000012
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10]
+#### STEP 3.2 TEST Commit_order+DDL ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	COMMIT_ORDER	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Inserted a DDL after TRX5 and check that they run in parallel due to commit_order
+CREATE TABLE `t2` (`id` int(11) NOT NULL, `val` int(11) NOT NULL) ENGINE=InnoDB;
+ALTER TABLE t2 ADD COLUMN b INT;
+DROP TABLE `t2`;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000013
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;4 5;5 6;6 7;7 8;4 9;9 10;10 11;10 12;12 13]
+#### STEP 3.3 TEST Commit_order+rotation ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	COMMIT_ORDER	25000
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+Flushing logs in the middle of the set
+FLUSH LOGS;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000015
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;0 2;2 3;3 4;3 5;5 6]
+#### STEP 3.4 TEST Commit_order+history ####
+SET GLOBAL binlog_transaction_dependency_history_size=25000;
+History size reduced to 10 to test when it becomes full
+SET GLOBAL binlog_transaction_dependency_history_size=10;
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking,
+@@binlog_transaction_dependency_history_size;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking	@@binlog_transaction_dependency_history_size
+XXHASH64	XXHASH64	COMMIT_ORDER	10
+CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+PRIMARY KEY (`id`)) ENGINE=InnoDB;
+#TRX2 (session A, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+#TRX1 (session B, independent)
+BEGIN;
+INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+COMMIT;
+finish TRX2 after TRX1
+COMMIT;
+#TRX3 (session B, no data dependency, depends on TRX1 (session))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+COMMIT;
+#TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+BEGIN;
+INSERT INTO t1(id, val) VALUES (8, 1);
+UPDATE t1 SET val=val+1 WHERE id=1;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX4 (session C, depends on TRX2 (data))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=3;
+INSERT INTO t1(id, val) VALUES (9, 1);
+COMMIT;
+finish TRX5 after TRX4
+COMMIT;
+#TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+BEGIN;
+DELETE FROM t1 WHERE id=6;
+COMMIT;
+#TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=4;
+#TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+BEGIN;
+UPDATE t1 SET val=val+1 WHERE id=5;
+INSERT INTO t1(id, val) VALUES (6, 0);
+COMMIT;
+finish TRX8 after TRX7
+COMMIT;
+Drop table and flush logs to force binlog to rotate
+DROP TABLE t1;
+Processing binlog master-bin.000016
+FLUSH LOGS;
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10]
+
+#### Verify that replication was correct ####
+include/start_slave.inc
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:test.tests, slave:test.tests]
+DROP TABLE `tests`;
+include/sync_slave_sql_with_master.inc
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+SET GLOBAL binlog_transaction_dependency_history_size= DEFAULT;
+FLUSH LOGS;
+
+#### Bug#25616372, PART1 ####
+CREATE TABLE t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
+INSERT INTO t1 VALUES (null);
+INSERT INTO t1 VALUES (null);
+set global binlog_transaction_dependency_tracking=WRITESET;
+INSERT INTO t1 VALUES (null);
+INSERT INTO t1 VALUES (null);
+Processing binlog master-bin.000018
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;3 4;3 5]
+FLUSH LOGS;
+
+#### Bug#25616372, PART2 ####
+INSERT INTO t1 VALUES (null);
+INSERT INTO t1 VALUES (null);
+set global binlog_transaction_dependency_tracking=WRITESET;
+INSERT INTO t1 VALUES (null);
+INSERT INTO t1 VALUES (null);
+INSERT INTO t1 VALUES (null);
+Processing binlog master-bin.000019
+include/include/assert_logical_timestamps.inc [0 1;1 2;2 3;2 4;2 5]
+DROP TABLE t1;
+FLUSH LOGS;
+
+#### Test ROLLBACK TO SAVEPOINT ####
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE nopk (a INT);
+CREATE TABLE parent (a INT PRIMARY KEY);
+CREATE TABLE child (a INT PRIMARY KEY, FOREIGN KEY (a) REFERENCES parent(a));
+# 1. Hashes of rolled-back rows are removed from writeset
+FLUSH LOGS;
+INSERT INTO t1 VALUES (1);
+BEGIN;
+SAVEPOINT sp;
+UPDATE t1 SET a = 2;
+ROLLBACK TO sp;
+INSERT INTO t1 VALUES (2);
+COMMIT;
+INSERT INTO t1 VALUES (3);
+Processing binlog master-bin.000021
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3]
+# 2. If transaction is flagged as updating a non-index table, the flag is not rolled-back
+FLUSH LOGS;
+INSERT INTO t1 VALUES (4);
+BEGIN;
+SAVEPOINT sp;
+INSERT INTO nopk VALUES (1);
+ROLLBACK TO sp;
+INSERT INTO t1 VALUES (5);
+COMMIT;
+INSERT INTO t1 VALUES (6);
+Processing binlog master-bin.000022
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3]
+# 3. If transaction is flagged as updating a foreign key parent table, the flag is not rolled-back
+FLUSH LOGS;
+INSERT INTO t1 VALUES (7);
+BEGIN;
+SAVEPOINT sp;
+INSERT INTO parent VALUES (1);
+ROLLBACK TO sp;
+INSERT INTO t1 VALUES (8);
+COMMIT;
+INSERT INTO t1 VALUES (9);
+Processing binlog master-bin.000023
+include/include/assert_logical_timestamps.inc [0 1;1 2;2 3]
+# Clean up SAVEPOINT tests
+DROP TABLE t1;
+DROP TABLE nopk;
+DROP TABLE child;
+DROP TABLE parent;
+
+#### CLEANUP ####
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET @@GLOBAL.slave_parallel_type= @save_slave_parallel_type;
+SET @@GLOBAL.slave_parallel_workers= @save_slave_parallel_workers;
+SET @@GLOBAL.slave_transaction_retries= @save_slave_transaction_retries;
+include/start_slave.inc
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.binlog_transaction_dependency_history_size= @save_binlog_transaction_dependency_history_size;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.result
new file mode 100644
index 000000000000..a3ccab4077bd
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.result
@@ -0,0 +1,38 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+RESET MASTER;
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE= (test.t1);
+SET @save_binlog_transaction_dependency_tracking= @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction= @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction= XXHASH64;
+SET LOCAL transaction_write_set_extraction= XXHASH64;
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+include/sync_slave_sql_with_master.inc
+#
+# Verify that the value of last_committed is not increased,
+# since writeset history is not cleared when applying
+# these empty transactions on slave.
+#
+Processing binlog slave-bin.000001
+include/include/assert_logical_timestamps.inc [0 1;0 2;0 3;0 4]
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE= ();
+include/start_slave_sql.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result
new file mode 100644
index 000000000000..085ede182c77
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result
@@ -0,0 +1,109 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection master]
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+[connection slave]
+include/stop_slave.inc
+CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=((db1,db2)),
+REPLICATE_IGNORE_DB=(nodb);
+include/start_slave.inc
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+[connection master]
+#
+# 1. Add transactions with different dependency tracking and empty transaction
+#    on master.
+#
+CREATE DATABASE nodb;
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+USE nodb;
+CREATE TABLE nodbt1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
+USE db1;
+CREATE TABLE db1t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
+USE test;
+CREATE TABLE t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);
+USE db1;
+INSERT INTO db1t1 VALUES (NULL);
+INSERT INTO db1t1 VALUES (NULL);
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET_SESSION;
+INSERT INTO db1t1 VALUES (NULL);
+INSERT INTO db1t1 VALUES (NULL);
+USE nodb;
+INSERT INTO nodbt1 VALUES (NULL);
+INSERT INTO nodbt1 VALUES (NULL);
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+INSERT INTO nodbt1 VALUES (NULL);
+INSERT INTO nodbt1 VALUES (NULL);
+USE test;
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+DROP DATABASE nodb;
+DROP DATABASE db1;
+DROP DATABASE db2;
+DROP TABLE test.t1;
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	COMMIT_ORDER
+include/include/assert_logical_timestamps.inc
+#
+# 2. Test timestamps order with filtered and non-filtered transactions on Slave.
+#
+include/sync_slave_sql_with_master.inc
+[On Slave]
+######## 2.1. COMMIT_ORDER with SLAVE ########
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	COMMIT_ORDER
+include/include/assert_logical_timestamps.inc
+include/stop_slave.inc
+RESET SLAVE;
+RESET MASTER;
+
+######## 2.2. WRITESET with SLAVE ########
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+include/start_slave.inc
+include/sync_slave_sql_with_master.inc
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	WRITESET
+include/include/assert_logical_timestamps.inc
+include/stop_slave.inc
+RESET SLAVE;
+RESET MASTER;
+
+######## 2.3. WRITESET_SESSION with SLAVE ########
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+include/start_slave.inc
+include/sync_slave_sql_with_master.inc
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	WRITESET_SESSION
+include/include/assert_logical_timestamps.inc
+
+# 3. Clean up.
+[connection master]
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+include/sync_slave_sql_with_master.inc
+[On Slave]
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+include/stop_slave.inc
+CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=(), REPLICATE_IGNORE_DB=();
+include/start_slave.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_fk.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_fk.result
new file mode 100644
index 000000000000..9740b82f84cd
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_fk.result
@@ -0,0 +1,412 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 1. Test referential action RESTRICT with WRITESET. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE RESTRICT);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE RESTRICT);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child1`, CONSTRAINT `child1_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent1` (`a`))
+DELETE FROM parent2 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child2`, CONSTRAINT `child2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent2` (`a`))
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 2. Test referential action RESTRICT with WRITESET_SESSION. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET_SESSION
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE RESTRICT);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE RESTRICT);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child1`, CONSTRAINT `child1_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent1` (`a`))
+DELETE FROM parent2 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child2`, CONSTRAINT `child2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent2` (`a`))
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 3. Test referential action NO ACTION with WRITESET. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE NO ACTION);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE NO ACTION);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child1`, CONSTRAINT `child1_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent1` (`a`) ON UPDATE NO ACTION)
+DELETE FROM parent2 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child2`, CONSTRAINT `child2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent2` (`a`) ON DELETE NO ACTION)
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 4. Test referential action NO ACTION with WRITESET_SESSION. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET_SESSION
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE NO ACTION);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE NO ACTION);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child1`, CONSTRAINT `child1_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent1` (`a`) ON UPDATE NO ACTION)
+DELETE FROM parent2 WHERE a=1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child2`, CONSTRAINT `child2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `parent2` (`a`) ON DELETE NO ACTION)
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 5. Test referential action CASCADE with WRITESET. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE CASCADE);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE CASCADE);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+DELETE FROM parent2 WHERE a=1;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14;14 15;15 16]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 6. Test referential action CASCADE with WRITESET_SESSION. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET_SESSION
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE CASCADE);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE CASCADE);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+DELETE FROM parent2 WHERE a=1;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14;14 15;15 16]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+######## 7. Test referential action SET NULL with WRITESET. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE SET NULL);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE SET NULL);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+DELETE FROM parent2 WHERE a=1;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14;14 15;15 16]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+######## 8. Test referential action SET NULL with WRITESET_SESSION. ########
+SELECT @@local.transaction_write_set_extraction,
+@@global.transaction_write_set_extraction,
+@@binlog_transaction_dependency_tracking;
+@@local.transaction_write_set_extraction	@@global.transaction_write_set_extraction	@@binlog_transaction_dependency_tracking
+XXHASH64	XXHASH64	WRITESET_SESSION
+CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE SET NULL);
+CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE SET NULL);
+INSERT INTO parent1 VALUES (1, 1), (2, 2);
+INSERT INTO parent2 VALUES (1, 1), (2, 2);
+FLUSH LOGS;
+# Case 2.1, 2.2, 2.3
+INSERT INTO child1 VALUES (1, 1);
+INSERT INTO child2 VALUES (1, 1);
+UPDATE child1 SET a = 2;
+UPDATE child2 SET a = 2;
+DELETE FROM child1;
+DELETE FROM child2;
+# Case 1.1, 1.2, 1.3
+INSERT INTO t1 VALUES (1);
+INSERT INTO parent1 VALUES (3, 3);
+INSERT INTO t1 VALUES (2);
+# Case 1.4, 1.5
+BEGIN;
+INSERT INTO t1 VALUES (3);
+INSERT INTO child1 VALUES (1, 1);
+BEGIN;
+INSERT INTO parent1 VALUEs (4, 4);
+INSERT INTO child2 VALUES (1, 1);
+BEGIN;
+INSERT INTO t1 VALUES (4);
+COMMIT;
+COMMIT;
+COMMIT;
+INSERT INTO t1 VALUES (5);
+UPDATE parent1 SET a=5 WHERE a=1;
+DELETE FROM parent2 WHERE a=1;
+# Drop table and flush logs to force binlog to rotate
+DROP TABLE child2, parent2, child1, parent1, t1;
+FLUSH LOGS;
+# Processing binlog...
+include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14;14 15;15 16]
+# Verify that replication is correct
+include/sync_slave_sql_with_master.inc
+
+# Clean up
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_indexes.result b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_indexes.result
new file mode 100644
index 000000000000..8a6d204373c7
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_indexes.result
@@ -0,0 +1,824 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#### INITIALIZE ####
+[connection slave]
+include/stop_slave.inc
+SET @save_slave_parallel_workers= @@GLOBAL.slave_parallel_workers;
+SET @@GLOBAL.slave_parallel_workers= 4;
+include/start_slave.inc
+[connection master]
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET SESSION transaction_write_set_extraction = XXHASH64;
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+
+#### 0.0.0.0: WITHOUT PK, NULLABLE, NOT UNIQUE, NO INDEX ####
+
+CREATE TABLE t1 (a INT, b INT , c INT  );
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [6 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;8 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;10 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.0.0.1: WITHOUT PK, NULLABLE, NOT UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT , c INT  ,  INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [6 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;8 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;10 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.0.0.2: WITHOUT PK, NULLABLE, NOT UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT , c INT  ,  INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [6 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;8 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;10 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.0.1.1: WITHOUT PK, NULLABLE, UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT , c INT  , UNIQUE INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [6 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;8 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;10 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.0.1.2: WITHOUT PK, NULLABLE, UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT , c INT  , UNIQUE INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [6 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;8 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;10 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.1.0.0: WITHOUT PK, NOT NULL, NOT UNIQUE, NO INDEX ####
+
+CREATE TABLE t1 (a INT, b INT NOT NULL, c INT NOT NULL );
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.1.0.1: WITHOUT PK, NOT NULL, NOT UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT NOT NULL, c INT NOT NULL ,  INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.1.0.2: WITHOUT PK, NOT NULL, NOT UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT NOT NULL, c INT NOT NULL ,  INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;3 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;5 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.1.1.1: WITHOUT PK, NOT NULL, UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT NOT NULL, c INT NOT NULL , UNIQUE INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 0.1.1.2: WITHOUT PK, NOT NULL, UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT, b INT NOT NULL, c INT NOT NULL , UNIQUE INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.0.0.0: WITH PK, NULLABLE, NOT UNIQUE, NO INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT , c INT  );
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;1 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;7 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.0.0.1: WITH PK, NULLABLE, NOT UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT , c INT  ,  INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;1 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;7 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.0.0.2: WITH PK, NULLABLE, NOT UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT , c INT  ,  INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;1 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;7 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.0.1.1: WITH PK, NULLABLE, UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT , c INT  , UNIQUE INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;1 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;7 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.0.1.2: WITH PK, NULLABLE, UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT , c INT  , UNIQUE INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+# TRX7: independent
+INSERT INTO t1 VALUES (3, NULL, 2);
+# now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 7]
+# TRX8: independent
+INSERT INTO t2 VALUES (8);
+# TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+INSERT INTO t1 VALUES (4, NULL, 2);
+# now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 8;1 9]
+# TRX10: independent
+INSERT INTO t2 VALUES (10);
+# TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+DELETE FROM t1 WHERE a = 3;
+# now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+include/include/assert_logical_timestamps.inc [1 10;7 11]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.1.0.0: WITH PK, NOT NULL, NOT UNIQUE, NO INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL, c INT NOT NULL );
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.1.0.1: WITH PK, NOT NULL, NOT UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL, c INT NOT NULL ,  INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.1.0.2: WITH PK, NOT NULL, NOT UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL, c INT NOT NULL ,  INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;1 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.1.1.1: WITH PK, NOT NULL, UNIQUE, 1-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL, c INT NOT NULL , UNIQUE INDEX(b));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+DROP TABLE t1;
+DROP TABLE t2;
+
+#### 1.1.1.2: WITH PK, NOT NULL, UNIQUE, 2-COLUMN INDEX ####
+
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL, c INT NOT NULL , UNIQUE INDEX(b, c));
+CREATE TABLE t2 (a INT PRIMARY KEY);
+FLUSH LOGS;
+include/save_binlog_position.inc
+# TRX1: independent
+INSERT INTO t1 VALUES (1, 1, 1);
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [0 1]
+# TRX2: independent
+BEGIN;
+INSERT INTO t1 VALUES (2, 2, 2);
+INSERT INTO t2 VALUES (1);
+COMMIT;
+# now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+include/include/assert_logical_timestamps.inc [1 2]
+# TRX3: independent
+INSERT INTO t2 VALUES (3);
+# TRX4: depends on TRX2
+DELETE FROM t1 WHERE a = 2;
+# now t1 contains one row: (1, 1, 1)
+include/include/assert_logical_timestamps.inc [1 3;2 4]
+# TRX5: independent
+INSERT INTO t2 VALUES (5);
+# TRX6: conflict with TRX4 if unique, else with TRX1
+UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+# now t1 contains one row: (1, 2, 2)
+include/include/assert_logical_timestamps.inc [1 5;4 6]
+DROP TABLE t1;
+DROP TABLE t2;
+#### CLEAN UP ####
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+include/sync_slave_sql_with_master.inc
+SET @@GLOBAL.slave_parallel_workers= @save_slave_parallel_workers;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_connection.result b/mysql-test/suite/rpl/r/rpl_connection.result
index ee216015175c..731d103a896e 100644
--- a/mysql-test/suite/rpl/r/rpl_connection.result
+++ b/mysql-test/suite/rpl/r/rpl_connection.result
@@ -11,7 +11,7 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 START SLAVE;
 include/wait_for_slave_io_error.inc [errno=1045, 1593]
-include/stop_slave.inc
+include/stop_slave_sql.inc
 CHANGE MASTER TO MASTER_USER= 'root', MASTER_PASSWORD= '';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff --git a/mysql-test/suite/rpl/r/rpl_db_stmts_ignored.result b/mysql-test/suite/rpl/r/rpl_db_stmts_ignored.result
new file mode 100644
index 000000000000..f9d18c7c5dbd
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_db_stmts_ignored.result
@@ -0,0 +1,137 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# Test replicate-ignore-db=db1 filter
+#
+include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --replicate-ignore-db=db1 --skip_slave_start=FALSE]
+[connection master]
+#
+# Execute 'CREATE DATABASE db1' on Master.
+#
+CREATE DATABASE db1;
+#
+# Sync with Slave (using gtid values)
+#
+include/sync_slave_sql_with_master.inc
+#
+# Check that even after sync is completed 'db1' does not exists
+# on Slave which implies that 'CREATE DATABASE db1' is filtered
+# out.
+#
+USE db1;
+ERROR 42000: Unknown database 'db1'
+#
+# Execute other database commands (ALTER/DROP) on Master.
+#
+[connection master]
+ALTER DATABASE db1 CHARACTER SET latin1;
+DROP DATABASE db1;
+#
+# Check that we are able to sync with slave successfully
+# which implies that those commands are filtered out.
+# If they were executed by Slave, that will break replication
+# as we do not have 'db1' database on Slave.
+include/sync_slave_sql_with_master.inc
+#
+# Test replicate-do-db=db2 filter
+#
+include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --replicate-do-db=db2 --skip_slave_start=FALSE]
+[connection master]
+#
+# Execute 'CREATE DATABASE db1' on Master.
+#
+CREATE DATABASE db1;
+#
+# Sync with Slave (using gtid values)
+#
+include/sync_slave_sql_with_master.inc
+#
+# Check that even after sync is completed 'db1' does not exists
+# on Slave which implies that 'CREATE DATABASE db1' is filtered
+# out.
+#
+USE db1;
+ERROR 42000: Unknown database 'db1'
+#
+# Execute other database commands (ALTER/DROP) on Master.
+#
+[connection master]
+ALTER DATABASE db1 CHARACTER SET latin1;
+DROP DATABASE db1;
+#
+# Check that we are able to sync with slave successfully
+# which implies that those commands are filtered out.
+# If they were executed by Slave, that will break replication
+# as we do not have 'db1' database on Slave.
+include/sync_slave_sql_with_master.inc
+#
+# Test replicate-wild-ignore-table=db1.% filter
+#
+include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --replicate-wild-ignore-table=db1.% --skip_slave_start=FALSE]
+[connection master]
+#
+# Execute 'CREATE DATABASE db1' on Master.
+#
+CREATE DATABASE db1;
+#
+# Sync with Slave (using gtid values)
+#
+include/sync_slave_sql_with_master.inc
+#
+# Check that even after sync is completed 'db1' does not exists
+# on Slave which implies that 'CREATE DATABASE db1' is filtered
+# out.
+#
+USE db1;
+ERROR 42000: Unknown database 'db1'
+#
+# Execute other database commands (ALTER/DROP) on Master.
+#
+[connection master]
+ALTER DATABASE db1 CHARACTER SET latin1;
+DROP DATABASE db1;
+#
+# Check that we are able to sync with slave successfully
+# which implies that those commands are filtered out.
+# If they were executed by Slave, that will break replication
+# as we do not have 'db1' database on Slave.
+include/sync_slave_sql_with_master.inc
+#
+# Test replicate-wild-ignore-table=db1.% and --replicate-do-db=db2
+# filter combination
+include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --replicate-do-db=db2 --replicate-wild-ignore-table=db1.t% --skip_slave_start=FALSE]
+[connection master]
+#
+# Execute 'CREATE DATABASE db1' on Master.
+#
+CREATE DATABASE db1;
+#
+# Sync with Slave (using gtid values)
+#
+include/sync_slave_sql_with_master.inc
+#
+# Check that even after sync is completed 'db1' does not exists
+# on Slave which implies that 'CREATE DATABASE db1' is filtered
+# out.
+#
+USE db1;
+ERROR 42000: Unknown database 'db1'
+#
+# Execute other database commands (ALTER/DROP) on Master.
+#
+[connection master]
+ALTER DATABASE db1 CHARACTER SET latin1;
+DROP DATABASE db1;
+#
+# Check that we are able to sync with slave successfully
+# which implies that those commands are filtered out.
+# If they were executed by Slave, that will break replication
+# as we do not have 'db1' database on Slave.
+include/sync_slave_sql_with_master.inc
+#
+# Cleanup
+#
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_deadlock_runlock_channelmap_lockstatus.result b/mysql-test/suite/rpl/r/rpl_deadlock_runlock_channelmap_lockstatus.result
new file mode 100644
index 000000000000..bf1bcec4af4e
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_runlock_channelmap_lockstatus.result
@@ -0,0 +1,82 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+CALL mtr.add_suppression("Failed during slave thread initialization.*");
+include/stop_slave_sql.inc
+[connection slave1]
+SET DEBUG_SYNC='start_slave_thread_after_signal_on_start_cond SIGNAL reached_start_slave_thread WAIT_FOR continue_start_slave_thread';
+# Adding debug point 'simulate_sql_slave_error_on_init' to @@GLOBAL.debug
+# Adding debug point 'pause_after_sql_thread_stop_hook' to @@GLOBAL.debug
+[connection slave1]
+START SLAVE SQL_THREAD;
+[connection slave2]
+SET DEBUG_SYNC='dsync_show_heartbeat_period SIGNAL reached_show_heartbeat_period WAIT_FOR continue_show_thread';
+SHOW STATUS LIKE 'Slave_heartbeat_period';
+[connection slave]
+SET DEBUG_SYNC='now WAIT_FOR reached_start_slave_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_stopping_sql_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_show_heartbeat_period';
+SET DEBUG_SYNC='now SIGNAL continue_to_stop_sql_thread';
+SET DEBUG_SYNC='now SIGNAL continue_show_thread';
+SET DEBUG_SYNC='now SIGNAL continue_start_slave_thread';
+[connection slave1]
+[connection slave2]
+include/wait_for_slave_sql_error.inc [errno=1593]
+# Removing debug point 'simulate_sql_slave_error_on_init' from @@GLOBAL.debug
+# Removing debug point 'pause_after_sql_thread_stop_hook' from @@GLOBAL.debug
+SET DEBUG_SYNC='RESET';
+include/stop_slave_sql.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
+[connection slave1]
+SET DEBUG_SYNC='start_slave_thread_after_signal_on_start_cond SIGNAL reached_start_slave_thread WAIT_FOR continue_start_slave_thread';
+# Adding debug point 'simulate_sql_slave_error_on_init' to @@GLOBAL.debug
+# Adding debug point 'pause_after_sql_thread_stop_hook' to @@GLOBAL.debug
+[connection slave1]
+START SLAVE SQL_THREAD;
+[connection slave2]
+SET DEBUG_SYNC='dsync_show_heartbeat_period SIGNAL reached_show_heartbeat_period WAIT_FOR continue_show_thread';
+SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS;
+[connection slave]
+SET DEBUG_SYNC='now WAIT_FOR reached_start_slave_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_stopping_sql_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_show_heartbeat_period';
+SET DEBUG_SYNC='now SIGNAL continue_to_stop_sql_thread';
+SET DEBUG_SYNC='now SIGNAL continue_show_thread';
+SET DEBUG_SYNC='now SIGNAL continue_start_slave_thread';
+[connection slave1]
+[connection slave2]
+include/wait_for_slave_sql_error.inc [errno=1593]
+# Removing debug point 'simulate_sql_slave_error_on_init' from @@GLOBAL.debug
+# Removing debug point 'pause_after_sql_thread_stop_hook' from @@GLOBAL.debug
+SET DEBUG_SYNC='RESET';
+include/stop_slave_sql.inc
+Warnings:
+Note	3084	Replication thread(s) for channel '' are already stopped.
+[connection slave1]
+SET DEBUG_SYNC='start_slave_thread_after_signal_on_start_cond SIGNAL reached_start_slave_thread WAIT_FOR continue_start_slave_thread';
+# Adding debug point 'simulate_sql_slave_error_on_init' to @@GLOBAL.debug
+# Adding debug point 'pause_after_sql_thread_stop_hook' to @@GLOBAL.debug
+[connection slave1]
+START SLAVE SQL_THREAD;
+[connection slave2]
+SET DEBUG_SYNC='dsync_show_heartbeat_period SIGNAL reached_show_heartbeat_period WAIT_FOR continue_show_thread';
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
+[connection slave]
+SET DEBUG_SYNC='now WAIT_FOR reached_start_slave_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_stopping_sql_thread';
+SET DEBUG_SYNC='now WAIT_FOR reached_show_heartbeat_period';
+SET DEBUG_SYNC='now SIGNAL continue_to_stop_sql_thread';
+SET DEBUG_SYNC='now SIGNAL continue_show_thread';
+SET DEBUG_SYNC='now SIGNAL continue_start_slave_thread';
+[connection slave1]
+[connection slave2]
+include/wait_for_slave_sql_error.inc [errno=1593]
+# Removing debug point 'simulate_sql_slave_error_on_init' from @@GLOBAL.debug
+# Removing debug point 'pause_after_sql_thread_stop_hook' from @@GLOBAL.debug
+SET DEBUG_SYNC='RESET';
+include/start_slave_sql.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_different_index_master_slave.result b/mysql-test/suite/rpl/r/rpl_different_index_master_slave.result
new file mode 100644
index 000000000000..8f08da6829eb
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_different_index_master_slave.result
@@ -0,0 +1,31 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+==== Initialize ====
+[connection slave]
+SET @old_slave_rows_search_algorithms = @@global.slave_rows_search_algorithms;
+SET @@global.slave_rows_search_algorithms = 'INDEX_SCAN,TABLE_SCAN';
+include/start_slave.inc
+[connection master]
+SET @@session.binlog_row_image = 'MINIMAL';
+SET @@session.sql_log_bin = 0;
+CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(b));
+SET @@session.sql_log_bin = 1;
+[connection slave]
+CREATE TABLE t1 (a INT, b INT NOT NULL, UNIQUE KEY(b), PRIMARY KEY(a));
+[connection master]
+INSERT INTO t1 VALUES [100 rows];
+include/sync_slave_sql_with_master.inc
+==== Test ====
+[connection master]
+DELETE FROM t1 WHERE b != 0 ORDER BY b DESC;
+include/sync_slave_sql_with_master.inc
+include/assert.inc [The search algorithm used while deleting rows is INDEX_SCAN, in the code before this bug it was TABLE_SCAN]
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET @@global.slave_rows_search_algorithms = @old_slave_rows_search_algorithms;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_fde_write.result b/mysql-test/suite/rpl/r/rpl_fde_write.result
new file mode 100644
index 000000000000..0453c48fae11
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_fde_write.result
@@ -0,0 +1,16 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+RESET MASTER;
+include/rpl_stop_server.inc [server_number=1]
+include/rpl_start_server.inc [server_number=1]
+[connection slave]
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+CALL mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log:");
+START SLAVE;
+FLUSH LOGS;
+STOP SLAVE;
+RESET SLAVE;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_flush_log_after_sync_stage.result b/mysql-test/suite/rpl/r/rpl_flush_log_after_sync_stage.result
new file mode 100644
index 000000000000..22e90e6d83b7
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_flush_log_after_sync_stage.result
@@ -0,0 +1,22 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET @save_sync_binlog = @@GLOBAL.sync_binlog;
+SET GLOBAL sync_binlog = 1;
+SET DEBUG_SYNC = 'before_sync_binlog_file SIGNAL parked_in_sync WAIT_FOR continue';
+CREATE TABLE t1(c1 INT);
+[connection default]
+SET DEBUG_SYNC = "now WAIT_FOR parked_in_sync";
+FLUSH LOGS;
+SET DEBUG_SYNC = "now SIGNAL continue";
+[connection master]
+INSERT INTO t1 VALUES (10);
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:t1, slave:t1]
+[connection master]
+SET DEBUG_SYNC = 'RESET';
+SET GLOBAL sync_binlog = @save_sync_binlog;
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_flush_logs.result b/mysql-test/suite/rpl/r/rpl_flush_logs.result
index 9f6adb375711..4d7e498cea8d 100644
--- a/mysql-test/suite/rpl/r/rpl_flush_logs.result
+++ b/mysql-test/suite/rpl/r/rpl_flush_logs.result
@@ -56,5 +56,12 @@ flush logs;
 include/sync_slave_io_with_master.inc
 # Check the 'slave-relay-bin.000007' and 'slave-relay-bin.000008'
 # files are created after execute 'flush logs' statement.
+FLUSH SLOW LOGS;
+ERROR HY000: File not found (Errcode: ##)
+FLUSH GENERAL LOGS;
+ERROR HY000: File not found (Errcode: ##)
+include/assert.inc [assert that the above events are not written to binlog]
+include/show_binlog_events.inc
+include/sync_slave_io_with_master.inc
 include/start_slave_sql.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gcol_sec_index.result b/mysql-test/suite/rpl/r/rpl_gcol_sec_index.result
new file mode 100644
index 000000000000..ace66ad208e9
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gcol_sec_index.result
@@ -0,0 +1,72 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+
+# Create a table without generated columns.
+CREATE TABLE t1 (id INT) ENGINE=InnoDB;
+
+# Create a table with a VGC and a SGC with secondary indexes defined on
+# them.
+CREATE TABLE t2(
+id INT,
+v_gcol INT GENERATED ALWAYS AS (id + 1) VIRTUAL NOT NULL,
+s_gcol INT GENERATED ALWAYS AS (id + 1) STORED NOT NULL,
+KEY v_idx (v_gcol), KEY s_idx (s_gcol)
+) ENGINE=InnoDB;
+include/sync_slave_sql_with_master.inc
+
+# Add a VGC and also define secondary indexes on the VGC and SGC on the
+# Slave.
+ALTER TABLE t1
+ADD v_gcol INT GENERATED ALWAYS AS (id + 1) VIRTUAL NOT NULL,
+ADD s_gcol INT GENERATED ALWAYS AS (id + 1) STORED NOT NULL,
+ADD KEY v_idx (v_gcol), ADD KEY s_idx (s_gcol);
+
+# Modify the generated expression for the VGC and SGC on the Slave.
+ALTER TABLE t2
+MODIFY v_gcol INT GENERATED ALWAYS AS (id + 2) VIRTUAL NOT NULL,
+MODIFY s_gcol INT GENERATED ALWAYS AS (id + 2) STORED NOT NULL;
+[connection master]
+
+# INSERT values into the tables on the master.
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2(id) VALUES (1);
+include/sync_slave_sql_with_master.inc
+
+# Validate the table data.
+include/diff_tables.inc [master:t1, slave:t1]
+include/assert.inc [Verified that table t1 has 1 rows]
+include/diff_tables.inc [master:t2, slave:t2]
+include/assert.inc [Verified that table t2 has 1 rows]
+
+# UPDATE a record in the tables on the master.
+[connection master]
+UPDATE t1 SET id= 2 WHERE id= 1;
+UPDATE t2 SET id= 2 WHERE id= 1;
+include/sync_slave_sql_with_master.inc
+
+# Validate the table data.
+include/diff_tables.inc [master:t1, slave:t1]
+include/assert.inc [Verified that table t1 has 1 rows]
+include/diff_tables.inc [master:t2, slave:t2]
+include/assert.inc [Verified that table t2 has 1 rows]
+
+# DELETE a record in the tables on the master.
+[connection master]
+DELETE FROM t1 WHERE id= 2;
+DELETE FROM t2 WHERE id= 2;
+include/sync_slave_sql_with_master.inc
+
+# Validate the table data.
+include/diff_tables.inc [master:t1, slave:t1]
+include/assert.inc [Verified that table t1 has 0 rows]
+include/diff_tables.inc [master:t2, slave:t2]
+include/assert.inc [Verified that table t2 has 0 rows]
+
+# Cleanup
+[connection master]
+DROP TABLE t1;
+DROP TABLE t2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_grant.result b/mysql-test/suite/rpl/r/rpl_grant.result
index 2fc7dc8aa63a..75ca9d98d65c 100644
--- a/mysql-test/suite/rpl/r/rpl_grant.result
+++ b/mysql-test/suite/rpl/r/rpl_grant.result
@@ -54,6 +54,7 @@ CREATE TABLE t1 ( c1 INT, c2 INT, c3 INT );
 ##########
 CREATE USER 'b54866_user'@'localhost';
 GRANT ALL ON b54866.* TO 'b54866_user'@'localhost';
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while granting/revoking privileges in databases");
 REVOKE ALL ON b54866.* FROM 'b54866_user'@'localhost', 'b54866_fake_user';
 ERROR 42000: There is no such grant defined for user 'b54866_fake_user' on host '%'
 call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master.*");
@@ -91,6 +92,7 @@ GRANT USAGE ON *.* TO 'b54866_user'@'localhost'
 GRANT ALL PRIVILEGES ON `b54866`.* TO 'b54866_user'@'localhost'
 GRANT CREATE, DROP, ALTER ON `b54866`.`t1` TO 'b54866_user'@'localhost'
 *************************************************************
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while storing table level and column level grants in the privilege tables.");
 REVOKE ALTER ON TABLE b54866.t1 FROM 'b54866_user'@'localhost', 'b54866_fake_user';
 ERROR 42000: There is no such grant defined for user 'b54866_fake_user' on host '%'
 ****** Checking grants on the master for user: b54866_user ******
@@ -113,6 +115,7 @@ GRANT CREATE, DROP, ALTER ON `b54866`.`t1` TO 'b54866_user'@'localhost'
 ##########
 ########## setup (PART II)
 ##########
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while storing routine level grants in the privilege tables");
 CREATE PROCEDURE b54866_p() BEGIN SELECT 1; END|
 CREATE FUNCTION b54866_f() RETURNS INT BEGIN RETURN 1; END|
 GRANT EXECUTE ON PROCEDURE b54866.b54866_p TO 'b54866_user'@'localhost';
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_delete_memory_table_after_start_server.result b/mysql-test/suite/rpl/r/rpl_gtid_delete_memory_table_after_start_server.result
deleted file mode 100644
index 995f90bf71f0..000000000000
--- a/mysql-test/suite/rpl/r/rpl_gtid_delete_memory_table_after_start_server.result
+++ /dev/null
@@ -1,129 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
-CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
-CREATE DATABASE db1;
-CREATE DATABASE db2;
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT);
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t1 SELECT * FROM db2.mem_t3;
-END |
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
-include/sync_slave_sql_with_master.inc
-include/stop_slave_io.inc
-[connection master]
-XA START 'xa1';
-INSERT INTO t1 VALUES(1);
-XA END 'xa1';
-XA PREPARE 'xa1';
-include/save_master_pos.inc
-include/rpl_restart_server.inc [server_number=1]
-[connection slave]
-include/start_slave_io.inc
-include/sync_slave_sql.inc
-#
-# Test case 1: verify XA COMMIT can be binlogged correctly.
-#
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-include/gtid_step_assert.inc [count=3, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT # Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-include/rpl_diff.inc
-#
-# Test case 2: verify COM_FIELD_LIST can binlog DELETE FROM mem_xx
-#              correctly
-#
-[connection master]
-include/gtid_step_reset.inc
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t1;
-c1
-SELECT * FROM mem_t2;
-c1
-#
-# Test case 3: verify DELETE FROM mem_xx can be binlogged correctly
-#              in CREATE TABLE ... LIKE
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-CREATE TABLE t3 LIKE db2.mem_t1;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t1;
-c1
-#
-# Test case 4: verify DELETE FROM mem_xx can be binlogged correctly
-#              in DML
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t2;
-c1
-#
-# Test case 5: verify DELETE FROM mem_xx can be binlogged correctly
-#              in a trigger
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-INSERT INTO t2 VALUES(11);
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t3;
-c1
-#
-# Test case 6: Verify DELETE FROM mem_xx can be binlog correctly
-#              when ALTER the memory table.
-[connection master]
-include/gtid_step_reset.inc
-include/save_binlog_position.inc
-ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
-include/gtid_step_assert.inc [count=2, only_count=0]
-include/assert_binlog_events.inc [Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM db2.mem_t4;
-c1	c2
-#
-# Test case 7: Verify DELETE FROM mem_xx can be binlog correctly
-#              when DROP the memory table.
-[connection master]
-include/gtid_step_reset.inc
-DROP TABLE db2.mem_t5;
-include/gtid_step_assert.inc [count=1, only_count=0]
-include/sync_slave_sql_with_master.inc
-[connection master]
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-DROP DATABASE db1;
-DROP DATABASE db2;
-include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_deleted_binlog_fail_to_connect.result b/mysql-test/suite/rpl/r/rpl_gtid_deleted_binlog_fail_to_connect.result
new file mode 100644
index 000000000000..f3a8119f59c5
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_deleted_binlog_fail_to_connect.result
@@ -0,0 +1,67 @@
+#
+# 1) Create a master-slave setup.
+#
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 2) Create a table on master, sync it, stop the slave threads and dump
+#    thread on master.
+#
+CREATE TABLE t1 (a INT) ENGINE = InnoDB;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+[connection master]
+include/stop_dump_threads.inc
+#
+# 3) On master, generate a transaction, flush the binary log and delete
+#    the first binary logs so that only remaining binlog only contains
+#    transaction UUID:3.
+#
+INSERT INTO t1 VALUES (1);
+FLUSH LOGS;
+INSERT INTO t1 VALUES (2);
+#
+# 4) Verify that the slave fails if it tries to connect using CHANGE
+#    MASTER TO MASTER_AUTO_POSITION=1.
+#
+[connection slave]
+CHANGE MASTER TO MASTER_AUTO_POSITION = 1;
+START SLAVE;
+include/wait_for_slave_io_error.inc [errno=1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG]
+include/stop_slave_sql.inc
+#
+# 5) Verify that appropriate messages are logged into master's and slave's
+#    error log.
+#
+include/assert_grep.inc [Found warning containing lost GTIDs in the master error log.]
+include/assert_grep.inc [Found warning containing lost GTIDs in the slave error log.]
+#
+# 6) Verify that replication succeeds if it tries to connect using CHANGE
+#    MASTER TO MASTER_LOG_POS.
+#
+CHANGE MASTER TO MASTER_LOG_FILE = 'MASTER_FILE', MASTER_LOG_POS = MASTER_POS, MASTER_AUTO_POSITION = 0;
+include/start_slave.inc
+include/assert.inc [t1 should contain only one row with the value 2]
+include/stop_slave.inc
+[connection master]
+CALL mtr.add_suppression("Cannot replicate to server.*server has purged required binary logs.*");
+CALL mtr.add_suppression("Failed to open log");
+CALL mtr.add_suppression("Could not open log");
+[connection slave]
+CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missing transactions from elsewhere");
+#
+# 7) Cleanup.
+#
+RESET MASTER;
+RESET SLAVE;
+[connection master]
+RESET MASTER;
+[connection slave]
+include/start_slave.inc
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result b/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result
new file mode 100644
index 000000000000..85413dff8c79
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_drop_mem_table.result
@@ -0,0 +1,135 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection master]
+CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/rpl_restart_server.inc [server_number=1]
+include/start_slave.inc
+[connection master]
+include/save_binlog_position.inc
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
+include/save_binlog_position.inc
+ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)]
+include/save_binlog_position.inc
+CREATE TABLE mem_t9 LIKE mem_t3;
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)]
+include/save_binlog_position.inc
+BEGIN;
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+COMMIT;
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
+include/save_binlog_position.inc
+UPDATE mem_t6, mem_t7 SET mem_t6.c1 = mem_t6.c1 + 1, mem_t7.c1 = mem_t7.c1 + 1;
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)]
+include/save_binlog_position.inc
+SET @@session.gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+SET @@session.gtid_next = 'AUTOMATIC';
+include/sync_slave_sql_with_master.inc
+[connection master]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid/(.*'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1')# !Begin # !Insert # !Commit]
+DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
+include/rpl_reset.inc
+[connection master]
+CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+include/sync_slave_sql_with_master.inc
+include/rpl_restart_server.inc [server_number=2]
+include/start_slave.inc
+include/save_binlog_position.inc
+[connection master]
+[connection slave]
+[connection master]
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+include/save_binlog_position.inc
+[connection master]
+ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+include/save_binlog_position.inc
+[connection master]
+CREATE TABLE mem_t9 LIKE mem_t3;
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+include/save_binlog_position.inc
+[connection master]
+BEGIN;
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+COMMIT;
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+include/save_binlog_position.inc
+[connection master]
+CREATE FUNCTION f () RETURNS INT BEGIN
+INSERT INTO mem_t6 VALUES (1);
+RETURN 2;
+END|
+INSERT INTO mem_t7 VALUES (f());
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+include/save_binlog_position.inc
+[connection master]
+SET @@session.gtid_next = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+SET @@session.gtid_next = 'AUTOMATIC';
+include/sync_slave_sql_with_master.inc
+[connection slave]
+include/assert_binlog_events.inc
+[connection master]
+DROP FUNCTION f;
+DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mts_recovery_with_missing_relay_log.result b/mysql-test/suite/rpl/r/rpl_gtid_mts_recovery_with_missing_relay_log.result
new file mode 100644
index 000000000000..350377e59ec5
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_mts_recovery_with_missing_relay_log.result
@@ -0,0 +1,89 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+CALL mtr.add_suppression("Error looking for file after*");
+CALL mtr.add_suppression("Recovery from master pos*");
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_AUTO_POSITION=1;
+include/start_slave.inc
+# Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
+[connection slave]
+include/stop_slave.inc
+SET @@global.slave_parallel_workers=2;
+include/start_slave.inc
+[connection master]
+CREATE DATABASE d1;
+CREATE DATABASE d2;
+CREATE TABLE d1.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+CREATE TABLE d2.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+FLUSH LOGS;
+INSERT INTO d1.t VALUES (1, 'T1');
+include/sync_slave_sql_with_master.inc
+BEGIN;
+INSERT INTO d2.t VALUES (2, 'Slave local');
+[connection master]
+INSERT INTO d2.t VALUES (1, 'T2');
+INSERT INTO d2.t VALUES (2, 'T3');
+INSERT INTO d2.t VALUES (3, 'T4');
+INSERT INTO d1.t VALUES (2, 'T5');
+[connection slave1]
+include/rpl_stop_server.inc [server_number=2]
+[connection slave]
+include/rpl_start_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=1 --sync_master_info=1 --relay-log-recovery=1]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:d2.t, slave:d2.t]
+include/diff_tables.inc [master:d1.t, slave:d1.t]
+# Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+[connection master]
+DROP DATABASE d1;
+DROP DATABASE d2;
+include/sync_slave_sql_with_master.inc
+include/rpl_reset.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_AUTO_POSITION=1;
+include/start_slave.inc
+# Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
+[connection slave]
+include/stop_slave.inc
+SET @@global.slave_parallel_workers=2;
+include/start_slave.inc
+[connection master]
+CREATE DATABASE d1;
+CREATE DATABASE d2;
+CREATE TABLE d1.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+CREATE TABLE d2.t (a INT PRIMARY KEY, name TEXT) ENGINE=INNODB;
+FLUSH LOGS;
+INSERT INTO d1.t VALUES (1, 'T1');
+include/sync_slave_sql_with_master.inc
+BEGIN;
+INSERT INTO d2.t VALUES (2, 'Slave local');
+[connection master]
+INSERT INTO d2.t VALUES (1, 'T2');
+INSERT INTO d2.t VALUES (2, 'T3');
+INSERT INTO d2.t VALUES (3, 'T4');
+INSERT INTO d1.t VALUES (2, 'T5');
+[connection slave1]
+include/rpl_stop_server.inc [server_number=2]
+[connection slave]
+include/rpl_start_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=1 --sync_master_info=1 --relay-log-recovery=0]
+START SLAVE;
+ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log
+"Restart server with RELAY_LOG_RECOVERY=ON followed by START SLAVE
+include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=1 --sync_master_info=1 --relay-log-recovery=1]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:d2.t, slave:d2.t]
+include/diff_tables.inc [master:d1.t, slave:d1.t]
+# Sourcing extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+[connection master]
+DROP DATABASE d1;
+DROP DATABASE d2;
+include/sync_slave_sql_with_master.inc
+include/rpl_reset.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result b/mysql-test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
index 7a182d9fed8d..f882b72e2ab4 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
@@ -65,6 +65,9 @@ DELETE FROM d1.t1 where a=1;
 DELETE FROM d2.t1 where a=2;
 DELETE FROM d3.t1 where a=3;
 include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=FALSE --relay_log_info_repository=TABLE --master_info_repository=TABLE --sync_master_info=1 --relay-log-recovery=1]
+include/wait_for_slave_param.inc [Slave_IO_Running]
+include/wait_for_slave_param.inc [Slave_SQL_Running]
+include/start_slave_sql.inc
 [connection master]
 include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:d4.t1, slave:d4.t1]
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result b/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
index 6310fd7a33a2..c98bb60b0adf 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
@@ -1,37 +1,80 @@
+#
+# 1) Create a master-slave setup.
+#
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
-call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.");
-######## Initialize ########
+#
+# 2) Create a table on master, sync it, stop the slave threads and dump
+#    thread on master.
+#
 CREATE TABLE t1 (a INT) ENGINE = InnoDB;
 include/sync_slave_sql_with_master.inc
 include/stop_slave.inc
+[connection master]
 include/stop_dump_threads.inc
+#
+# 3) On master, generate a transaction, flush the binary log and execute
+#    PURGE BINARY LOGS TO command so that only remaining binlog only contains
+#    transaction UUID:3.
+#
 INSERT INTO t1 VALUES (1);
 FLUSH LOGS;
 INSERT INTO t1 VALUES (2);
 PURGE BINARY LOGS TO 'master-bin.000002';
-include/assert.inc [PURGE BINARY LOGS successfully removed all but the latest files]
-INSERT INTO t1 VALUES (2);
+include/assert.inc [PURGE BINARY LOGS successfully removed all but the latest file]
+#
+# 4) Verify that the slave fails if it tries to connect using CHANGE
+#    MASTER TO MASTER_AUTO_POSITION=1.
+#
+[connection slave]
 CHANGE MASTER TO MASTER_AUTO_POSITION = 1;
 START SLAVE;
 include/wait_for_slave_io_error.inc [errno=1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG]
 include/stop_slave_sql.inc
-CHANGE MASTER TO MASTER_LOG_FILE = 'master-bin.000002', MASTER_LOG_POS = MASTER_POS, MASTER_AUTO_POSITION = 0;
+[connection master]
+SET @saved_debug= @@GLOBAL.DEBUG;
+SET GLOBAL DEBUG= '+d,simulate_long_missing_gtids';
+[connection slave]
+START SLAVE;
+include/wait_for_slave_io_error.inc [errno=1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG]
+include/stop_slave_sql.inc
+[connection master]
+SET GLOBAL DEBUG= @saved_debug;
+[connection slave]
+#
+# 5) Verify that appropriate messages are logged into master's and slave's
+#    error log.
+#
+include/assert_grep.inc [Found the suggestions to extract the missing GTIDs in the master error log.]
+include/assert_grep.inc [Found a message about the long GTIDs in the slave error log.]
+#
+# 6) Verify that replication succeeds if it tries to connect using CHANGE
+#    MASTER TO MASTER_LOG_POS.
+#
+CHANGE MASTER TO MASTER_LOG_FILE = 'MASTER_FILE', MASTER_LOG_POS = MASTER_POS, MASTER_AUTO_POSITION = 0;
 include/start_slave.inc
 include/assert.inc [t1 should contain only one row with the value 2]
-######## Clean up ########
-=== Stop and reset slave/master (connection slave) ====
 include/stop_slave.inc
+include/assert_grep.inc [Found warning containing lost GTIDs in the master error log.]
+include/assert_grep.inc [Found warning containing lost GTIDs in the slave error log.]
+[connection master]
+CALL mtr.add_suppression("Cannot replicate to server.*server has purged required binary logs.*");
+[connection slave]
+CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missing transactions from elsewhere");
+#
+# 7) Cleanup.
+#
+[connection slave]
 RESET MASTER;
 RESET SLAVE;
-=== Stop and reset master (connection master) ====
+[connection master]
 RESET MASTER;
-=== Start slave (connection slave) ====
+[connection slave]
 include/start_slave.inc
-=== Sync slave with master (connection master/slave) ====
+[connection master]
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result b/mysql-test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result
index c82e4cc25431..21e5b891f672 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result
@@ -41,7 +41,289 @@ BEGIN;
 COMMIT;
 SET GTID_NEXT=AUTOMATIC;
 include/start_slave_sql.inc
+include/rpl_reset.inc
+[connection master]
+CREATE PROCEDURE p1()
+BEGIN
+INSERT INTO t1 VALUES (1,1);
+END//
+SET SESSION SQL_MODE= '';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+GRANT PROCESS ON `invalid_db`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR HY000: Incorrect usage of DB GRANT and GLOBAL PRIVILEGES
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE PROCESS ON `invalid_db`.* FROM u2@h, u3;
+ERROR HY000: Incorrect usage of DB GRANT and GLOBAL PRIVILEGES
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT PROXY ON `proxy_user` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE PROXY ON `proxy_user` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT EXECUTE ON PROCEDURE p1 TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE EXECUTE ON PROCEDURE p1 FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT SELECT(a) ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE SELECT(a) ON `test`.`t1` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT SELECT ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE SELECT ON `test`.`t1` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT UPDATE ON `test`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE UPDATE ON `test`.* FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT ALL ON *.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE ALL ON *.* FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+SET SESSION SQL_MODE= default;
+GRANT PROCESS ON `invalid_db`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR HY000: Incorrect usage of DB GRANT and GLOBAL PRIVILEGES
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE PROCESS ON `invalid_db`.* FROM u2@h, u3;
+ERROR HY000: Incorrect usage of DB GRANT and GLOBAL PRIVILEGES
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT PROXY ON `proxy_user` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE PROXY ON `proxy_user` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT EXECUTE ON PROCEDURE p1 TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE EXECUTE ON PROCEDURE p1 FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT SELECT(a) ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE SELECT(a) ON `test`.`t1` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT SELECT ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE SELECT ON `test`.`t1` FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT UPDATE ON `test`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE UPDATE ON `test`.* FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+GRANT ALL ON *.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+ERROR 42000: Can't find any matching row in the user table
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+include/rpl_reset.inc
+[connection master]
+SET SQL_LOG_BIN=0;
+GRANT ALL ON *.* TO u2@h;
+SET SQL_LOG_BIN=1;
+REVOKE ALL ON *.* FROM u2@h, u3;
+ERROR 42000: There is no such grant defined for user 'u3' on host '%'
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=1590]
+[connection slave]
+include/stop_slave.inc
+[connection master]
+DROP USER u2@h;
+include/rpl_reset.inc
+# Adding debug point 'simulate_cache_creation_failure' to @@GLOBAL.debug
+SET GLOBAL binlog_error_action = IGNORE_ERROR;
+GRANT SELECT(a) ON t1 TO u1@h, u2@h;
+ERROR 42000: Can't find any matching row in the user table
+SHOW BINARY LOGS;
+ERROR HY000: You are not using binary logging
+include/assert_grep.inc [Found the message about the failure of cache creation in the error log.]
+include/rpl_restart_server.inc [server_number=1]
+[connection master]
+# Adding debug point 'simulate_cache_creation_failure' to @@GLOBAL.debug
+GRANT SELECT(a) ON t1 TO u1@h, u2@h;
+ERROR HY000: Binary logging not possible. Message: Could not create IO cache while writing an incident event to the binary log for query: 'GRANT SELECT(a) ON t1 TO u1@h, u2@h'. Since GTID_MODE= ON, server is unable to proceed with logging. Server is being stopped.
+# Restart the master server
+include/rpl_reconnect.inc
+include/assert_grep.inc [Found the message about the failure of cache creation in the error log.]
+[connection master]
+CALL mtr.add_suppression("REVOKE/GRANT failed while granting/revoking privileges in databases. An incident event has been written to the binary log which will stop the slaves.");
+CALL mtr.add_suppression("REVOKE/GRANT failed while storing routine level grants in the privilege tables. An incident event has been written to the binary log which will stop the slaves.");
+CALL mtr.add_suppression("Attempting backtrace. You can use the following information to find out*");
+CALL mtr.add_suppression("ERROR.*Could not create IO cache while writing an incident event to the binary log.*");
+[connection slave]
+CALL mtr.add_suppression("Slave SQL for channel '': The incident LOST_EVENTS occured on the master. Message: REVOKE/GRANT failed while granting/revoking privileges in databases.") ;
+CALL mtr.add_suppression("Slave SQL for channel '': The incident LOST_EVENTS occured on the master. Message: REVOKE/GRANT failed while storing routine level grants in the privilege tables.");
 [connection master]
 DROP USER u1@h;
+DROP PROCEDURE p1;
 DROP TABLE t1;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_skip_with_parser_error.result b/mysql-test/suite/rpl/r/rpl_gtid_skip_with_parser_error.result
new file mode 100644
index 000000000000..582fd4164d31
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_skip_with_parser_error.result
@@ -0,0 +1,32 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/rpl_stop_server.inc [server_number=1]
+include/rpl_start_server.inc [server_number=1]
+include/assert.inc [All transactions are assumed as applied on master]
+[connection slave]
+include/start_slave_io.inc
+[connection master]
+include/sync_slave_io_with_master.inc
+START SLAVE SQL_THREAD;
+include/wait_for_slave_sql_error.inc [errno=1064]
+include/assert.inc [Only 1st transaction is applied on slave]
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:2';
+BEGIN;
+COMMIT;
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:3';
+BEGIN;
+COMMIT;
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:4';
+BEGIN;
+COMMIT;
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:6';
+BEGIN;
+COMMIT;
+SET GTID_NEXT=AUTOMATIC;
+include/start_slave_sql.inc
+include/sync_slave_sql_with_io.inc
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_skips_no_sync_master_info.result b/mysql-test/suite/rpl/r/rpl_gtid_skips_no_sync_master_info.result
new file mode 100644
index 000000000000..77e3009033fd
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_skips_no_sync_master_info.result
@@ -0,0 +1,31 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection slave]
+include/stop_slave.inc
+UPDATE performance_schema.setup_objects SET ENABLED='yes', TIMED='yes' WHERE OBJECT_TYPE='TABLE' and OBJECT_SCHEMA='mysql';
+include/start_slave.inc
+[connection master]
+CREATE TABLE t1 (f INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (20);
+INSERT INTO t1 VALUES (30);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+SET GLOBAL debug="+d,reached_heart_beat_queue_event";
+START SLAVE;
+SET DEBUG_SYNC="now WAIT_FOR check_slave_master_info";
+SET DEBUG_SYNC="now SIGNAL proceed_write_rotate";
+SET GLOBAL debug="-d,reached_heart_beat_queue_event";
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Assert that sync_master_info io_requests are the same]
+include/diff_tables.inc [master:t1, slave:t1]
+include/stop_slave.inc
+UPDATE performance_schema.setup_objects SET ENABLED='no', TIMED='no' WHERE OBJECT_TYPE='TABLE' and OBJECT_SCHEMA='mysql';
+include/start_slave.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_truncate_memory_table_after_start_server.result b/mysql-test/suite/rpl/r/rpl_gtid_truncate_memory_table_after_start_server.result
new file mode 100644
index 000000000000..03e9a7d8cc17
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_gtid_truncate_memory_table_after_start_server.result
@@ -0,0 +1,130 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
+CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+INSERT INTO t1 SELECT * FROM db2.mem_t3;
+END |
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_io.inc
+[connection master]
+XA START 'xa1';
+INSERT INTO t1 VALUES(1);
+XA END 'xa1';
+XA PREPARE 'xa1';
+include/save_master_pos.inc
+include/rpl_restart_server.inc [server_number=1]
+[connection slave]
+include/start_slave_io.inc
+include/sync_slave_sql.inc
+#
+# Test case 1: verify XA COMMIT can be binlogged correctly.
+#
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+include/gtid_step_assert.inc [count=3, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)]
+include/sync_slave_sql_with_master.inc
+include/rpl_diff.inc
+#
+# Test case 2: verify COM_FIELD_LIST can binlog TRUNCATE FROM mem_xx
+#              correctly
+#
+[connection master]
+include/gtid_step_reset.inc
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t1;
+c1
+SELECT * FROM mem_t2;
+c1
+#
+# Test case 3: verify TRUNCATE FROM mem_xx can be binlogged correctly
+#              in CREATE TABLE ... LIKE
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+CREATE TABLE t3 LIKE db2.mem_t1;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t1;
+c1
+#
+# Test case 4: verify TRUNCATE FROM mem_xx can be binlogged correctly
+#              in DML
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit]
+include/save_binlog_position.inc
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t2;
+c1
+#
+# Test case 5: verify TRUNCATE FROM mem_xx can be binlogged correctly
+#              in a trigger
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+INSERT INTO t2 VALUES(11);
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Begin]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t3;
+c1
+#
+# Test case 6: Verify TRUNCATE FROM mem_xx can be binlog correctly
+#              when ALTER the memory table.
+[connection master]
+include/gtid_step_reset.inc
+include/save_binlog_position.inc
+ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
+include/gtid_step_assert.inc [count=2, only_count=0]
+include/assert_binlog_events.inc [#Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*) ]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM db2.mem_t4;
+c1	c2
+#
+# Test case 7: Verify TRUNCATE FROM mem_xx can be binlog correctly
+#              when DROP the memory table.
+[connection master]
+include/gtid_step_reset.inc
+DROP TABLE db2.mem_t5;
+include/gtid_step_assert.inc [count=1, only_count=0]
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+DROP DATABASE db1;
+DROP DATABASE db2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result b/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
index 6608176ff53f..c138483cd64d 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
@@ -10,14 +10,16 @@ START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1236]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires. Replicate the missing transactions from elsewhere, or provision a new slave from backup. Consider increasing the master's binary log expiration period. The GTID set sent by the slave is '', and the missing transactions are 'MASTER_UUID:1-2'.''
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 SET GLOBAL GTID_PURGED= "master_uuid:1-2";
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
 include/assert.inc [Slave should be able to get GTID-3 and 4 now.]
-call mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+CALL mtr.add_suppression(".*Cannot replicate.*purged required binary logs.*");
+CALL mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+include/assert_grep.inc [Found warning continaining lost GTIDs]
 include/rpl_reset.inc
 CREATE TABLE t1(i INT);
 DROP TABLE t1;
@@ -31,7 +33,7 @@ START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1236]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave has more GTIDs than the master has, using the master's SERVER_UUID. This may indicate that the end of the binary log was truncated or that the last binary log file was lost, e.g., after a power or disk failure when sync_binlog != 1. The master may or may not have rolled back transactions that were already replica''
+Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave has more GTIDs than the master has, using the master's SERVER_UUID. This may indicate that the end of the binary log was truncated or that the last binary log file was lost, e.g., after a power or disk failure when sync_binlog != 1. The master may or may not have rolled back transactions that were already replicated to the slave. Suggest to replicate any transactions that master has rolled back from slave to master, and/or commit empty transactions on master to account for transactions that have been''
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 call mtr.add_suppression(".*Slave has more GTIDs than the master has.*");
diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
index c7a54d1e724f..b61a3c8668d7 100644
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
@@ -281,7 +281,7 @@ INSERT INTO t1 VALUES (1, 'on master', NULL);
 call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.. on query.* Error_code: 1062");
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 Heartbeat events are received while sql thread stopped (1 means 'yes'): 1
-include/stop_slave.inc
+include/stop_slave_io.inc
 DELETE FROM t1;
 include/start_slave.inc
 include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/suite/rpl/r/rpl_json.result b/mysql-test/suite/rpl/r/rpl_json.result
index a88a82cc8291..ff0a589587fb 100644
--- a/mysql-test/suite/rpl/r/rpl_json.result
+++ b/mysql-test/suite/rpl/r/rpl_json.result
@@ -762,7 +762,41 @@ i	j	j2
 28	{"type": "Point", "coordinates": [1, 1]}	{"type": "Point", "coordinates": [1, 1]}
 29	[]	[]
 30	"base64:type16:yv66vg=="	"base64:type16:yv66vg=="
-UPDATE t1 SET j2 = JSON_MERGE(j, j);
+UPDATE t1 SET j2 = JSON_MERGE_PATCH(j, '{"a": "patched", "c": null}');
+SELECT * FROM t1 ORDER BY i;
+i	j	j2
+0	NULL	NULL
+1	{"a": 2}	{"a": "patched"}
+2	[1, 2]	{"a": "patched"}
+3	{"a": "b", "c": "d", "ab": "abc", "bc": ["x", "y"]}	{"a": "patched", "ab": "abc", "bc": ["x", "y"]}
+4	["here", ["I", "am"], "!!!"]	{"a": "patched"}
+5	"scalar string"	{"a": "patched"}
+6	true	{"a": "patched"}
+7	false	{"a": "patched"}
+8	null	{"a": "patched"}
+9	-1	{"a": "patched"}
+10	1	{"a": "patched"}
+11	32767	{"a": "patched"}
+12	32768	{"a": "patched"}
+13	-32768	{"a": "patched"}
+14	-32769	{"a": "patched"}
+15	2147483647	{"a": "patched"}
+16	2147483648	{"a": "patched"}
+17	-2147483648	{"a": "patched"}
+18	-2147483649	{"a": "patched"}
+19	18446744073709551615	{"a": "patched"}
+20	1.8446744073709552e19	{"a": "patched"}
+21	3.14	{"a": "patched"}
+22	{}	{"a": "patched"}
+23	[]	{"a": "patched"}
+24	"2015-01-15 23:24:25.000000"	{"a": "patched"}
+25	"23:24:25.000000"	{"a": "patched"}
+26	"2015-01-15"	{"a": "patched"}
+27	"2015-01-15 23:24:25.000000"	{"a": "patched"}
+28	{"type": "Point", "coordinates": [1, 1]}	{"a": "patched", "type": "Point", "coordinates": [1, 1]}
+29	[]	{"a": "patched"}
+30	"base64:type16:yv66vg=="	{"a": "patched"}
+UPDATE t1 SET j2 = JSON_MERGE_PRESERVE(j, j);
 SELECT * FROM t1 ORDER BY i;
 i	j	j2
 0	NULL	NULL
@@ -1146,4 +1180,588 @@ Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JS
 [Connection Master]
 DROP TABLE t1, t2, t3, t4, t5;
 include/sync_slave_sql_with_master.inc
+#
+# WL#7987: JSON AGGREGATION FUNCTIONS
+#
+# Create tables of various data types
+CREATE TABLE data_table (pkey INT PRIMARY KEY AUTO_INCREMENT,
+txt TEXT, vcol VARCHAR(20), num INT,
+gcol INT AS (num * 2) VIRTUAL);
+CREATE TABLE json_data (nkey INT PRIMARY KEY AUTO_INCREMENT, jcol JSON);
+# Insert values into the tables using the aggregation functions
+INSERT INTO data_table(txt, vcol, num) VALUES ('ailemac', 'namor', 15),
+('nielk', 'uciov', 12),
+('nuicarc', 'ierdna', 13),
+('ihcseruj', 'elisav', 14),
+('qweasdas', 'jugcvb', 16);
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(pkey, gcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(txt) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(gcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(num , vcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(pkey , txt) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(pkey) FROM data_table;
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+# Check whether tables were created on the slave
+SELECT * FROM json_data;
+nkey	jcol
+1	{"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}
+2	["ailemac", "nielk", "nuicarc", "ihcseruj", "qweasdas"]
+3	[30, 24, 26, 28, 32]
+4	{"12": "uciov", "13": "ierdna", "14": "elisav", "15": "namor", "16": "jugcvb"}
+5	{"1": "ailemac", "2": "nielk", "3": "nuicarc", "4": "ihcseruj", "5": "qweasdas"}
+6	[1, 2, 3, 4, 5]
+SELECT JSON_OBJECTAGG(t1.pkey, t2.jcol) FROM data_table AS t1, json_data AS t2;
+JSON_OBJECTAGG(t1.pkey, t2.jcol)
+{"1": {"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}, "2": {"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}, "3": {"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}, "4": {"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}, "5": {"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}}
+SELECT JSON_ARRAYAGG(jcol) FROM json_data;
+JSON_ARRAYAGG(jcol)
+[{"1": 30, "2": 24, "3": 26, "4": 28, "5": 32}, ["ailemac", "nielk", "nuicarc", "ihcseruj", "qweasdas"], [30, 24, 26, 28, 32], {"12": "uciov", "13": "ierdna", "14": "elisav", "15": "namor", "16": "jugcvb"}, {"1": "ailemac", "2": "nielk", "3": "nuicarc", "4": "ihcseruj", "5": "qweasdas"}, [1, 2, 3, 4, 5]]
+include/diff_tables.inc [master:json_data, slave:json_data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+[Connection Master]
+# Update values in the table
+UPDATE json_data SET jcol= (SELECT JSON_ARRAYAGG(vcol) FROM data_table) WHERE nkey = 1;
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+SELECT * FROM json_data WHERE nkey = 1;
+nkey	jcol
+1	["namor", "uciov", "ierdna", "elisav", "jugcvb"]
+include/diff_tables.inc [master:json_data, slave:json_data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+[Connection Master]
+# Delete values from the table
+DELETE FROM json_data WHERE jcol  = (SELECT JSON_ARRAYAGG(pkey) FROM data_table);
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+SELECT * FROM json_data;
+nkey	jcol
+1	["namor", "uciov", "ierdna", "elisav", "jugcvb"]
+2	["ailemac", "nielk", "nuicarc", "ihcseruj", "qweasdas"]
+3	[30, 24, 26, 28, 32]
+4	{"12": "uciov", "13": "ierdna", "14": "elisav", "15": "namor", "16": "jugcvb"}
+5	{"1": "ailemac", "2": "nielk", "3": "nuicarc", "4": "ihcseruj", "5": "qweasdas"}
+include/diff_tables.inc [master:json_data, slave:json_data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+[Connection Master]
+DROP TABLE data_table;
+DROP TABLE json_data;
+include/sync_slave_sql_with_master.inc
+#
+# WL#9191: ADD JSON_PRETTY FUNCTION
+#
+[Connection Master]
+# Create tables of various data types
+CREATE TABLE data (pkey INT PRIMARY KEY AUTO_INCREMENT,
+txt TEXT, vcol VARCHAR(20), num INT,
+gcol INT AS (num * 2) VIRTUAL,
+gcol2 JSON AS (JSON_PRETTY(JSON_OBJECT(num,gcol))));
+CREATE TABLE json_data(pk INT PRIMARY KEY AUTO_INCREMENT, jcol TEXT, jgcol TEXT AS (JSON_PRETTY(jcol)));
+# Insert values into the tables using the pretty function
+INSERT INTO data (txt, vcol, num) VALUES ('abc', 'namotgr', 150),
+('fwjh4', 'ucierov', 142),
+('8942rhkjh', 'roiu3r', 913),
+('imfmf', 'r3jr2', 15),
+('32rj2jr', 'r2ihrhr', 32);
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey, gcol)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_ARRAYAGG(txt)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_PRETTY(gcol2)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECT(num , vcol)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey , txt)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_ARRAY(gcol)) FROM data;
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+# Check whether tables were created on the slave
+SELECT * FROM json_data;
+pk	jcol	jgcol
+1	{
+  "1": 300,
+  "2": 284,
+  "3": 1826,
+  "4": 30,
+  "5": 64
+}	{
+  "1": 300,
+  "2": 284,
+  "3": 1826,
+  "4": 30,
+  "5": 64
+}
+2	[
+  "abc",
+  "fwjh4",
+  "8942rhkjh",
+  "imfmf",
+  "32rj2jr"
+]	[
+  "abc",
+  "fwjh4",
+  "8942rhkjh",
+  "imfmf",
+  "32rj2jr"
+]
+3	{
+  "150": 300
+}	{
+  "150": 300
+}
+4	{
+  "142": 284
+}	{
+  "142": 284
+}
+5	{
+  "913": 1826
+}	{
+  "913": 1826
+}
+6	{
+  "15": 30
+}	{
+  "15": 30
+}
+7	{
+  "32": 64
+}	{
+  "32": 64
+}
+10	{
+  "150": "namotgr"
+}	{
+  "150": "namotgr"
+}
+11	{
+  "142": "ucierov"
+}	{
+  "142": "ucierov"
+}
+12	{
+  "913": "roiu3r"
+}	{
+  "913": "roiu3r"
+}
+13	{
+  "15": "r3jr2"
+}	{
+  "15": "r3jr2"
+}
+14	{
+  "32": "r2ihrhr"
+}	{
+  "32": "r2ihrhr"
+}
+17	{
+  "1": "abc",
+  "2": "fwjh4",
+  "3": "8942rhkjh",
+  "4": "imfmf",
+  "5": "32rj2jr"
+}	{
+  "1": "abc",
+  "2": "fwjh4",
+  "3": "8942rhkjh",
+  "4": "imfmf",
+  "5": "32rj2jr"
+}
+18	[
+  300
+]	[
+  300
+]
+19	[
+  284
+]	[
+  284
+]
+20	[
+  1826
+]	[
+  1826
+]
+21	[
+  30
+]	[
+  30
+]
+22	[
+  64
+]	[
+  64
+]
+SELECT gcol2  FROM data;
+gcol2
+{"150": 300}
+{"142": 284}
+{"913": 1826}
+{"15": 30}
+{"32": 64}
+include/diff_tables.inc [master:json_data, slave:json_data]
+include/diff_tables.inc [master:data, slave:data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+[Connection Master]
+# Update values in the table
+UPDATE json_data SET jcol= (SELECT JSON_PRETTY(JSON_ARRAYAGG(gcol2)) FROM data) WHERE pk= 2;
+UPDATE json_data SET jcol= (SELECT JSON_PRETTY(JSON_OBJECTAGG(pk,gcol)) FROM data) WHERE pk = 1;
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+SELECT * FROM json_data;
+pk	jcol	jgcol
+1	{
+  "1": 300
+}	{
+  "1": 300
+}
+2	[
+  {
+    "150": 300
+  },
+  {
+    "142": 284
+  },
+  {
+    "913": 1826
+  },
+  {
+    "15": 30
+  },
+  {
+    "32": 64
+  }
+]	[
+  {
+    "150": 300
+  },
+  {
+    "142": 284
+  },
+  {
+    "913": 1826
+  },
+  {
+    "15": 30
+  },
+  {
+    "32": 64
+  }
+]
+3	{
+  "150": 300
+}	{
+  "150": 300
+}
+4	{
+  "142": 284
+}	{
+  "142": 284
+}
+5	{
+  "913": 1826
+}	{
+  "913": 1826
+}
+6	{
+  "15": 30
+}	{
+  "15": 30
+}
+7	{
+  "32": 64
+}	{
+  "32": 64
+}
+10	{
+  "150": "namotgr"
+}	{
+  "150": "namotgr"
+}
+11	{
+  "142": "ucierov"
+}	{
+  "142": "ucierov"
+}
+12	{
+  "913": "roiu3r"
+}	{
+  "913": "roiu3r"
+}
+13	{
+  "15": "r3jr2"
+}	{
+  "15": "r3jr2"
+}
+14	{
+  "32": "r2ihrhr"
+}	{
+  "32": "r2ihrhr"
+}
+17	{
+  "1": "abc",
+  "2": "fwjh4",
+  "3": "8942rhkjh",
+  "4": "imfmf",
+  "5": "32rj2jr"
+}	{
+  "1": "abc",
+  "2": "fwjh4",
+  "3": "8942rhkjh",
+  "4": "imfmf",
+  "5": "32rj2jr"
+}
+18	[
+  300
+]	[
+  300
+]
+19	[
+  284
+]	[
+  284
+]
+20	[
+  1826
+]	[
+  1826
+]
+21	[
+  30
+]	[
+  30
+]
+22	[
+  64
+]	[
+  64
+]
+include/diff_tables.inc [master:json_data, slave:json_data]
+[Connection Master]
+# Delete values from the table
+DELETE FROM json_data WHERE JSON_PRETTY(jgcol)  = (SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey,txt)) FROM data);
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+SELECT * FROM json_data;
+pk	jcol	jgcol
+1	{
+  "1": 300
+}	{
+  "1": 300
+}
+2	[
+  {
+    "150": 300
+  },
+  {
+    "142": 284
+  },
+  {
+    "913": 1826
+  },
+  {
+    "15": 30
+  },
+  {
+    "32": 64
+  }
+]	[
+  {
+    "150": 300
+  },
+  {
+    "142": 284
+  },
+  {
+    "913": 1826
+  },
+  {
+    "15": 30
+  },
+  {
+    "32": 64
+  }
+]
+3	{
+  "150": 300
+}	{
+  "150": 300
+}
+4	{
+  "142": 284
+}	{
+  "142": 284
+}
+5	{
+  "913": 1826
+}	{
+  "913": 1826
+}
+6	{
+  "15": 30
+}	{
+  "15": 30
+}
+7	{
+  "32": 64
+}	{
+  "32": 64
+}
+10	{
+  "150": "namotgr"
+}	{
+  "150": "namotgr"
+}
+11	{
+  "142": "ucierov"
+}	{
+  "142": "ucierov"
+}
+12	{
+  "913": "roiu3r"
+}	{
+  "913": "roiu3r"
+}
+13	{
+  "15": "r3jr2"
+}	{
+  "15": "r3jr2"
+}
+14	{
+  "32": "r2ihrhr"
+}	{
+  "32": "r2ihrhr"
+}
+18	[
+  300
+]	[
+  300
+]
+19	[
+  284
+]	[
+  284
+]
+20	[
+  1826
+]	[
+  1826
+]
+21	[
+  30
+]	[
+  30
+]
+22	[
+  64
+]	[
+  64
+]
+include/diff_tables.inc [master:json_data, slave:json_data]
+[Connection Master]
+DROP TABLE data;
+DROP TABLE json_data;
+include/sync_slave_sql_with_master.inc
+#
+# WL#9692: ADD JSON_MERGE_PATCH, RENAME JSON_MERGE TO JSON_MERGE_PRESERVE
+#
+[Connection Master]
+# Create table with JSON data
+CREATE TABLE json_data(pk INT PRIMARY KEY AUTO_INCREMENT,
+id INT,
+jd JSON,
+td TEXT,
+gcol VARCHAR(30) AS (JSON_EXTRACT(JSON_MERGE_PATCH(jd,JSON_OBJECT(id,td)), '$.a')) VIRTUAL,
+KEY(gcol));
+# Insert data into the table
+INSERT INTO json_data(id,jd,td) VALUES(10,'["a","b","c","d","e"]', "pink"),
+(20,'{"a":[1,2,6,7,9]}', "floyd"),
+(30,'{"a":["ears","nose","eyes"]}', "megadeth"),
+(40,'[null,null,"null",0,1]', "def"),
+(50,'{"a":null}', "leppard");
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+# Check whether table was created on the slave
+SELECT * FROM json_data;
+pk	id	jd	td	gcol
+1	10	["a", "b", "c", "d", "e"]	pink	NULL
+2	20	{"a": [1, 2, 6, 7, 9]}	floyd	[1, 2, 6, 7, 9]
+3	30	{"a": ["ears", "nose", "eyes"]}	megadeth	["ears", "nose", "eyes"]
+4	40	[null, null, "null", 0, 1]	def	NULL
+5	50	{"a": null}	leppard	null
+include/diff_tables.inc [master:json_data, slave:json_data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+[Connection Master]
+# Create tables using the JSON_MERGE_PATCH function
+CREATE TABLE json_data2(field1 JSON);
+INSERT INTO json_data2
+SELECT JSON_MERGE_PATCH(JSON_ARRAYAGG(jd), JSON_OBJECTAGG(pk, jd))
+FROM json_data;
+CREATE TABLE json_data3(field1 JSON);
+INSERT INTO json_data3
+SELECT JSON_MERGE_PATCH(JSON_OBJECTAGG(id, gcol), JSON_ARRAYAGG(td))
+FROM json_data;
+CREATE TABLE json_data4(field1 JSON);
+INSERT INTO json_data4
+SELECT JSON_MERGE_PATCH(JSON_OBJECT(id, jd), JSON_ARRAY(gcol))
+FROM json_data;
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+# Check whether the tables were created on the slave
+SELECT * FROM json_data2;
+field1
+{"1": ["a", "b", "c", "d", "e"], "2": {"a": [1, 2, 6, 7, 9]}, "3": {"a": ["ears", "nose", "eyes"]}, "4": [null, null, "null", 0, 1], "5": {}}
+SELECT * FROM json_data3;
+field1
+["pink", "floyd", "megadeth", "def", "leppard"]
+SELECT * FROM json_data4;
+field1
+[null]
+["[1, 2, 6, 7, 9]"]
+["[\"ears\", \"nose\", \"eyes\"]"]
+[null]
+["null"]
+SELECT JSON_MERGE_PATCH(t1.field1, t2.field1) FROM json_data2 as t1, json_data3 as t2;
+JSON_MERGE_PATCH(t1.field1, t2.field1)
+["pink", "floyd", "megadeth", "def", "leppard"]
+SELECT JSON_MERGE_PRESERVE(t1.field1, t2.field1) FROM json_data3 as t1, json_data4 as t2;
+JSON_MERGE_PRESERVE(t1.field1, t2.field1)
+["pink", "floyd", "megadeth", "def", "leppard", null]
+["pink", "floyd", "megadeth", "def", "leppard", "[1, 2, 6, 7, 9]"]
+["pink", "floyd", "megadeth", "def", "leppard", "[\"ears\", \"nose\", \"eyes\"]"]
+["pink", "floyd", "megadeth", "def", "leppard", null]
+["pink", "floyd", "megadeth", "def", "leppard", "null"]
+[Connection Master]
+# Update values in the table
+UPDATE json_data SET jd = JSON_SET(jd, '$[1]', JSON_MERGE_PATCH(JSON_ARRAY(pk),JSON_ARRAY(td))) WHERE id IN (10,40);
+include/sync_slave_sql_with_master.inc
+[Connection Slave]
+include/diff_tables.inc [master:json_data, slave:json_data]
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+Warnings:
+Warning	1235	This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'
+# Check whether values were updated
+SELECT * FROM json_data;
+pk	id	jd	td	gcol
+1	10	["a", ["pink"], "c", "d", "e"]	pink	NULL
+2	20	{"a": [1, 2, 6, 7, 9]}	floyd	[1, 2, 6, 7, 9]
+3	30	{"a": ["ears", "nose", "eyes"]}	megadeth	["ears", "nose", "eyes"]
+4	40	[null, ["def"], "null", 0, 1]	def	NULL
+5	50	{"a": null}	leppard	null
+[Connection Master]
+# Clean up
+DROP TABLE json_data, json_data2, json_data3, json_data4;
+include/sync_slave_sql_with_master.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_key_rotation.result b/mysql-test/suite/rpl/r/rpl_key_rotation.result
index 5edde8833f59..7782fdb122e9 100644
--- a/mysql-test/suite/rpl/r/rpl_key_rotation.result
+++ b/mysql-test/suite/rpl/r/rpl_key_rotation.result
@@ -7,8 +7,8 @@ call mtr.add_suppression("\\[Error\\] Function 'keyring_file' already exists");
 call mtr.add_suppression("\\[Error\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.so'.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("Error 'Can't find master key from keyring, please check keyring plugin is loaded.");
-call mtr.add_suppression("\\[Warning\\] Slave: Can't find master key from keyring, please check keyring plugin is loaded.");
+call mtr.add_suppression("Error 'Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
+call mtr.add_suppression("\\[Warning\\] Slave: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped");
 [On Master]
@@ -115,7 +115,7 @@ c1	c2
 2	ccccc
 
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 # Installing keyring_file plugin on master.
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 # Cleanup
diff --git a/mysql-test/suite/rpl/r/rpl_loaddatalocal.result b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result
index a949e3de344f..d52b6d3c84bd 100644
--- a/mysql-test/suite/rpl/r/rpl_loaddatalocal.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result
@@ -85,6 +85,7 @@ LOAD/*!99999 special comments that do not expand */DATA/*!99999 code from the fu
 SET sql_mode='PIPES_AS_CONCAT,ANSI_QUOTES,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,TRADITIONAL,NO_AUTO_CREATE_USER';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 LOAD DATA LOCAL INFILE 'MYSQLD_DATADIR/bug43746.sql' INTO TABLE t1;
 [slave]
 include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/suite/rpl/r/rpl_master_connection.result b/mysql-test/suite/rpl/r/rpl_master_connection.result
index 1f9d3a16f4ec..233342ef73df 100644
--- a/mysql-test/suite/rpl/r/rpl_master_connection.result
+++ b/mysql-test/suite/rpl/r/rpl_master_connection.result
@@ -235,29 +235,39 @@ include/wait_for_slave_io_error.inc [errno=1593]
 include/stop_slave.inc
 TRUNCATE mysql.general_log;
 START SLAVE USER='root' PASSWORD='secret';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 START SLAVE USER = 'root' PASSWORD = '<secret>';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 START SLAVE IO_THREAD USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 START SLAVE IO_THREAD USER = 'root' PASSWORD = '<secret>' DEFAULT_AUTH = 'auth_test_plugin' PLUGIN_DIR = 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 START SLAVE IO_THREAD, SQL_THREAD USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 START SLAVE IO_THREAD, SQL_THREAD USER = 'root' PASSWORD = '<secret>' DEFAULT_AUTH = 'auth_test_plugin' PLUGIN_DIR = 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 START SLAVE IO_THREAD, SQL_THREAD UNTIL MASTER_LOG_FILE='dummy-log.000001', MASTER_LOG_POS=116 USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 START SLAVE IO_THREAD, SQL_THREAD UNTIL MASTER_LOG_FILE = 'dummy-log.000001', MASTER_LOG_POS = 116 USER = 'root' PASSWORD = '<secret>' DEFAULT_AUTH = 'auth_test_plugin' PLUGIN_DIR = 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 START SLAVE IO_THREAD, SQL_THREAD UNTIL RELAY_LOG_FILE='dummy-log.000001', RELAY_LOG_POS=116 USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 START SLAVE IO_THREAD, SQL_THREAD UNTIL RELAY_LOG_FILE = 'dummy-log.000001', RELAY_LOG_POS = 116 USER = 'root' PASSWORD = '<secret>' DEFAULT_AUTH = 'auth_test_plugin' PLUGIN_DIR = 'PLUGIN_AUTH_DIR';
-include/stop_slave.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 SET GLOBAL log_output= @old_log_output;
 TRUNCATE mysql.general_log;
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_master_errors.result b/mysql-test/suite/rpl/r/rpl_master_errors.result
index 3b784c005fdb..91be5fdec913 100644
--- a/mysql-test/suite/rpl/r/rpl_master_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_master_errors.result
@@ -40,6 +40,7 @@ FLUSH BINARY LOGS;
 include/stop_slave.inc
 SET GLOBAL debug= 'd,request_master_log_pos_3';
 START SLAVE IO_THREAD;
+call mtr.add_suppression(".* Got fatal error 1236 from master when reading data from binary log");
 include/wait_for_slave_io_error.inc [errno=1236]
 SET GLOBAL debug= '$slave_debug';
 #
diff --git a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
index 1e162f01f1ed..391f29f27ebb 100644
--- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
@@ -122,7 +122,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
diff --git a/mysql-test/suite/rpl/r/rpl_mta_rows_query_event_double_free.result b/mysql-test/suite/rpl/r/rpl_mta_rows_query_event_double_free.result
new file mode 100644
index 000000000000..4de81ccce674
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mta_rows_query_event_double_free.result
@@ -0,0 +1,23 @@
+include/only_with_option.inc [GLOBAL.slave_transaction_retries > 2]
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET SESSION binlog_rows_query_log_events = ON;
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+[connection master]
+INSERT INTO t1 VALUES (0, 0);
+[connection slave]
+# Adding debug point 'error_on_rows_query_event_apply' to @@GLOBAL.debug
+include/start_slave.inc
+SET DEBUG_SYNC = "now WAIT_FOR end_retries_on_rows_query_event_apply";
+[connection master]
+include/sync_slave_sql_with_master.inc
+# Removing debug point 'error_on_rows_query_event_apply' from @@GLOBAL.debug
+[connection master]
+DROP TABLE t1;
+SET SESSION binlog_rows_query_log_events = BINLOG_ROWS_QUERY_LOG_EVENTS;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.result b/mysql-test/suite/rpl/r/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.result
index dfa10f2fe6bd..19a601aef619 100644
--- a/mysql-test/suite/rpl/r/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.result
@@ -27,6 +27,7 @@ INSERT INTO child VALUES (2,1);
 INSERT INTO child VALUES (3,1);
 INSERT INTO child VALUES (4,1);
 include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
 [connection slave1]
 BEGIN;
 DELETE FROM child WHERE a=3;
@@ -34,6 +35,7 @@ DELETE FROM child WHERE a=3;
 DELETE FROM child WHERE a=3;
 DELETE FROM parent WHERE a=3;
 include/sync_slave_io_with_master.inc
+include/start_slave_sql.inc
 include/wait_for_slave_param.inc [Slave_SQL_Running_State]
 include/stop_slave_sql.inc
 [connection slave1]
diff --git a/mysql-test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_deadlock_error.result b/mysql-test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_deadlock_error.result
new file mode 100644
index 000000000000..29a97b28f449
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_deadlock_error.result
@@ -0,0 +1,141 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 1. Initial data
+#
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+CREATE TABLE t2(c1 INT PRIMARY KEY) ENGINE = InnoDB;
+include/sync_slave_sql_with_master.inc
+#
+# 2. Initial setup on Slave.
+#
+# 2.1. Enable slave_preserve_commit_order on slave for Commit order
+#      deadlock to occur.
+#
+include/stop_slave_sql.inc
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET GLOBAL slave_preserve_commit_order = ON;
+#
+# 2.2 Set innodb_lock_wait_timeout to 300 to make test work without issues
+# on slow platform runs.
+#
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET GLOBAL innodb_lock_wait_timeout = 300;
+#
+# 2.3 Adding 'rpl_fake_cod_deadlock' debug point to execute special code required
+# for the test case.
+#
+# Adding debug point 'rpl_fake_cod_deadlock' to @@GLOBAL.debug
+#
+# 2.4 Add error suppressions.
+#
+call mtr.add_suppression("Worker .* failed executing transaction");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped");
+#
+# 2.5 An extra connection needed on Slave.
+#
+#
+# 3. Actual testing starts from here.
+#
+# 3.1 Insert basic data on Master
+#
+[connection master]
+INSERT INTO t1 VALUES(1, 1),(2, 2);
+#
+# 3.2 Enabling set_commit_parent_100 debug point
+#     on Master to make two conflicting transactions
+#     run parallely by two worker threads on Slave.
+#
+# Adding debug point 'set_commit_parent_100' to @@SESSION.debug
+#
+# 3.3 Execute Transaction-1
+#
+INSERT INTO t1 VALUES(3, 1);
+#
+# 3.4 Execute Transaction-2
+#
+BEGIN;
+DELETE FROM t1 WHERE c2 <= 1;
+INSERT INTO t2 values(1);
+COMMIT;
+#
+# 3.5 On Slave, begin a transaction (Transacation-3)
+#     which will acquire MDL lock on t1
+#     (that blocks 'Transacation-1').
+#
+[connection slave1]
+BEGIN;
+INSERT INTO t1 VALUES(3, 3);
+#
+# 3.6 On Slave, begin a transaction (Transacation-4)
+#     that can block INSERT in 'Transacation-2'.
+#
+[connection slave]
+BEGIN;
+INSERT INTO t2 VALUES(1);
+#
+# 3.7 Start SQL thread, let Transaction-1 & 2 reach SQL workers
+#
+include/start_slave_sql.inc
+#
+# 3.8 Wait till the worker threads pick up those transacations
+#     (Transaction 1 and Transaction 2). They will wait for locks due
+#     local transacations (3 & 4).
+#
+# 3.9 Rollback Transaction-3 which will release MDL lock required for
+#     Transaction-1.
+#
+[connection slave1]
+ROLLBACK;
+#
+# 3.10 Wait till the worker thread detects commit order deadlock
+#      between two workers
+#      (Worker1 : Transaction-1 & Worker-2: Transaction-2).
+#
+SET debug_sync = "now WAIT_FOR reported_deadlock";
+#
+# 3.11 Commit Transaction-4 which will release MDL lock required for
+#      Transaction-2.
+#
+[connection slave]
+COMMIT;
+#
+# 3.12 Step 3.11 will cause worker 2 ("Transacation-2")
+#      to fail with 'ER_DUP_ENTRY' error (after the worker2
+#      detected the 'commit order deadlock').
+#
+include/wait_for_slave_sql_error.inc [errno=1062]
+#
+# 3.13 Check that worker 2 did not *retry* transaction-2
+#      before throwing ER_DUP_ENTRY error (non-temporary error).
+#
+include/assert_grep.inc [Found 'Duplicate entry' error only once time which proves that transaction is not retried after getting 'non-temporary error'.]
+#
+# 4. Cleanup
+# 4.1 Clear debug point.
+#
+# Removing debug point 'rpl_fake_cod_deadlock' from @@GLOBAL.debug
+#
+# 4.2 Clean the data on Slave.
+#
+include/stop_slave_io.inc
+RESET SLAVE;
+DROP TABLE t1, t2;
+#
+# 4.3 Clear system variables.
+#
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+#
+# 4.4 Clear debug point.
+#
+[connection master]
+# Removing debug point 'set_commit_parent_100' from @@SESSION.debug
+#
+# 4.5 Clean the data on Master.
+#
+DROP TABLE t1, t2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_hang_on_non_temp_error.result b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_hang_on_non_temp_error.result
new file mode 100644
index 000000000000..26816e620fda
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_hang_on_non_temp_error.result
@@ -0,0 +1,140 @@
+#
+# 1. Create source-replica topology.
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 2. Setup testing environment.
+#    2.1 Create tables on source.
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+CREATE TABLE t2(c1 INT PRIMARY KEY) ENGINE = InnoDB;
+#
+# 2.2 Setup necessary variables on replica server.
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET GLOBAL slave_preserve_commit_order = ON;
+SET @saved_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @saved_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET GLOBAL slave_parallel_type = "LOGICAL_CLOCK";
+SET GLOBAL slave_parallel_workers = 3;
+#
+# 2.3 Set innodb_lock_wait_timeout to 300 to make test work without issues
+# on slow platform runs.
+#
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET GLOBAL innodb_lock_wait_timeout = 300;
+#
+# 2.4 Adding 'rpl_fake_cod_deadlock' debug point to execute special code required
+# for the test case.
+#
+# Adding debug point 'rpl_fake_cod_deadlock' to @@GLOBAL.debug
+#
+# 2.5 Add error suppressions.
+#
+call mtr.add_suppression("Worker .* failed executing transaction");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped");
+#
+# 2.6 An extra connection needed on Slave.
+#
+#
+# 3. Actual testing starts from here.
+#
+# 3.1 Insert basic data on Master
+#
+[connection master]
+INSERT INTO t1 VALUES(1, 1),(2, 2);
+#
+# 3.2 Enabling set_commit_parent_100 debug point
+#     on Master to make two conflicting transactions
+#     run parallely by two worker threads on Slave.
+#
+# Adding debug point 'set_commit_parent_100' to @@SESSION.debug
+INSERT INTO t1 VALUES(3, 1);
+BEGIN;
+DELETE FROM t1 WHERE c2 <= 1;
+INSERT INTO t2 values(1);
+COMMIT;
+INSERT INTO t1 values(10,10);
+#
+# 3.3 On Slave, begin a transaction (Transacation 4)
+#     which will acquire MDL lock on t1
+#     (that blocks 'Transacation 1').
+#
+[connection slave1]
+BEGIN;
+INSERT INTO t1 VALUES(3, 3);
+#
+# 3.4 On Slave, begin a transaction (Transacation 5)
+#     that can block INSERT in 'Transacation 2'.
+#
+[connection slave]
+BEGIN;
+INSERT INTO t2 VALUES(1);
+#
+# 3.5 Start SQL thread, let Transaction-1 & 2 reach SQL workers
+#
+include/start_slave_sql.inc
+#
+# 3.6 Wait till the worker threads pick up those transacations
+#     (Transaction 1 and Transaction 2). They will wait for locks due
+#     local transacations (4 & 5).
+#
+# 3.7 Rollback Transaction-4 which will release MDL lock required for
+#      Transaction-1.
+#
+[connection slave1]
+ROLLBACK;
+#
+# 3.8 Wait till the worker thread detects commit order deadlock
+#      between two workers
+#      (Worker1 : Transaction-1 & Worker-2: Transaction-2).
+#
+SET debug_sync = "now WAIT_FOR reported_deadlock";
+#
+# 3.9 Commit Transaction-5 which will release MDL lock required for
+#      Transaction-2.
+#
+[connection slave]
+COMMIT;
+#
+# 3.10 Step 3.8 will cause worker 2 ("Transacation-2")
+#      to fail with 'ER_DUP_ENTRY' error (after the worker2
+#      detected the 'commit order deadlock').
+#
+include/wait_for_slave_sql_error.inc [errno=1062]
+#
+# 3.11 Check that worker 2 did not *retry* transaction-2
+#      before throwing ER_DUP_ENTRY error (non-temporary error).
+#
+include/assert_grep.inc [Found 'Duplicate entry' error only once time which proves that transaction is not retried after getting 'non-temporary error'.]
+#
+# 4. Cleanup
+# 4.1 Clear debug point.
+#
+# Removing debug point 'rpl_fake_cod_deadlock' from @@GLOBAL.debug
+#
+# 4.2 Clean the data on Slave.
+#
+include/stop_slave_io.inc
+RESET SLAVE;
+DROP TABLE t1, t2;
+#
+# 4.3 Clear system variables.
+#
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL slave_parallel_type = @saved_slave_parallel_type;
+SET GLOBAL slave_parallel_workers = @saved_slave_parallel_workers;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+#
+# 4.4 Clear debug point.
+#
+[connection master]
+# Removing debug point 'set_commit_parent_100' from @@SESSION.debug
+#
+# 4.5 Clean the data on Master.
+#
+DROP TABLE t1, t2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result
new file mode 100644
index 000000000000..51c83a50d8f1
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result
@@ -0,0 +1,125 @@
+#
+# 1. Create source-replica topology.
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 2. Setup testing environment.
+#    2.1. Create table on source and insert few rows.
+#    2.2. Setup necessary variables on replica server.
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+INSERT INTO t1 VALUES(1, NULL),(2, 2), (3, NULL), (4, 4), (5, NULL), (6, 6);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+SET @saved_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @saved_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET @saved_slave_transaction_retries = @@GLOBAL.slave_transaction_retries;
+SET GLOBAL slave_transaction_retries = 0;
+SET GLOBAL slave_parallel_type = "LOGICAL_CLOCK";
+SET GLOBAL slave_parallel_workers = 8;
+SET GLOBAL slave_preserve_commit_order = ON;
+SET GLOBAL innodb_lock_wait_timeout = 1000;
+#
+# Case 1
+# ======
+#
+# Verify replica server can find the deadlock when the victim thread
+# (DELETE) is waiting for its turn to commit and is handled properly.
+#
+# 3.1 Execute transactions on source server that would generate deadlock on the
+#     replica server.
+[connection master]
+INSERT INTO t1 VALUES(10, 10);
+# Adding debug point 'set_commit_parent_100' to @@GLOBAL.debug
+INSERT INTO t1 VALUES(11, NULL);
+DELETE FROM t1 WHERE c2 <= 3;
+INSERT INTO t1 VALUES(21, 21);
+INSERT INTO t1 VALUES(22, 22);
+INSERT INTO t1 VALUES(23, 23);
+# Removing debug point 'set_commit_parent_100' from @@GLOBAL.debug
+[connection slave]
+BEGIN;
+INSERT INTO t1 VALUES(11, 11);
+[connection slave1]
+include/start_slave_sql.inc
+[connection slave]
+ROLLBACK;
+#
+# Add error supressions.
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
+#
+# 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.
+include/wait_for_slave_sql_error.inc [errno=1213]
+#
+# 3.3. Restart replication threads, sync the replica and verify that table
+#      data is consistent.
+include/start_slave.inc
+include/rpl_diff.inc
+#
+# Case 2
+# ======
+#
+# Verify that replica server can find the deadlock when the victim
+# thread (DELETE) is in the middle of transaction and is handled
+# properly.
+#
+# 3.4 Execute transactions on source server that would generate deadlock on the
+#     replica server.
+[connection master]
+TRUNCATE t1;
+INSERT INTO t1 VALUES(1, NULL),(2, 2), (3, NULL), (4, 4), (5, NULL), (6, 6);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+[connection master]
+INSERT INTO t1 VALUES(20, NULL);
+# Adding debug point 'set_commit_parent_100' to @@GLOBAL.debug
+INSERT INTO t1 VALUES(21, NULL);
+BEGIN;
+INSERT INTO t1 VALUES(22, 22);
+DELETE FROM t1 WHERE c2 <= 3;
+INSERT INTO t1 VALUES(23, 23);
+INSERT INTO t1 VALUES(24, NULL);
+INSERT INTO t1 VALUES(25, 25);
+COMMIT;
+INSERT INTO t1 VALUES(26, 26);
+INSERT INTO t1 VALUES(27, 27);
+INSERT INTO t1 VALUES(28, 28);
+# Removing debug point 'set_commit_parent_100' from @@GLOBAL.debug
+[connection slave]
+BEGIN;
+INSERT INTO t1 VALUES(21, 21);
+[connection server_2_1]
+BEGIN;
+INSERT INTO t1 VALUES(23, 23);
+[connection slave1]
+include/start_slave_sql.inc
+[connection slave]
+ROLLBACK;
+[connection server_2_1]
+ROLLBACK;
+#
+# 3.5. Wait till the co-ordinator thread to error out with ER_MTS_INCONSISTENT_DATA.
+include/wait_for_slave_sql_error.inc [errno=1756]
+#
+# 3.6. Restart replication threads, sync the replica and verify that table
+#      data is consistent.
+include/start_slave.inc
+include/rpl_diff.inc
+#
+# 4. Cleanup.
+#
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.");
+include/stop_slave.inc
+SET GLOBAL slave_transaction_retries = @saved_slave_transaction_retries;
+SET GLOBAL slave_parallel_type = @saved_slave_parallel_type;
+SET GLOBAL slave_parallel_workers = @saved_slave_parallel_workers;
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result b/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result
new file mode 100644
index 000000000000..efb3e197e468
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result
@@ -0,0 +1,101 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE db1.t1 ( id INT(11) PRIMARY KEY ) ENGINE=INNODB;
+CREATE TABLE db2.t1 ( id INT(11) PRIMARY KEY ) ENGINE=INNODB;
+INSERT INTO db1.t1 VALUES (40);
+INSERT INTO db2.t1 VALUES (40);
+include/sync_slave_sql_with_master.inc
+SET @save_debug = @@GLOBAL.debug;
+SET @save_slave_checkpoint_group= @@GLOBAL.slave_checkpoint_group;
+SET @save_slave_checkpoint_period= @@GLOBAL.slave_checkpoint_period;
+SET GLOBAL slave_checkpoint_group=512;
+SET GLOBAL slave_checkpoint_period=3000000;
+[connection master]
+insert into db1.t1 values (30);
+insert into db2.t1 values (30);
+insert into db1.t1 values (29);
+insert into db2.t1 values (29);
+insert into db1.t1 values (28);
+insert into db2.t1 values (28);
+insert into db1.t1 values (27);
+insert into db2.t1 values (27);
+insert into db1.t1 values (26);
+insert into db2.t1 values (26);
+insert into db1.t1 values (25);
+insert into db2.t1 values (25);
+insert into db1.t1 values (24);
+insert into db2.t1 values (24);
+insert into db1.t1 values (23);
+insert into db2.t1 values (23);
+insert into db1.t1 values (22);
+insert into db2.t1 values (22);
+insert into db1.t1 values (21);
+insert into db2.t1 values (21);
+insert into db1.t1 values (20);
+insert into db2.t1 values (20);
+insert into db1.t1 values (19);
+insert into db2.t1 values (19);
+insert into db1.t1 values (18);
+insert into db2.t1 values (18);
+insert into db1.t1 values (17);
+insert into db2.t1 values (17);
+insert into db1.t1 values (16);
+insert into db2.t1 values (16);
+insert into db1.t1 values (15);
+insert into db2.t1 values (15);
+insert into db1.t1 values (14);
+insert into db2.t1 values (14);
+insert into db1.t1 values (13);
+insert into db2.t1 values (13);
+insert into db1.t1 values (12);
+insert into db2.t1 values (12);
+insert into db1.t1 values (11);
+insert into db2.t1 values (11);
+insert into db1.t1 values (10);
+insert into db2.t1 values (10);
+insert into db1.t1 values (9);
+insert into db2.t1 values (9);
+insert into db1.t1 values (8);
+insert into db2.t1 values (8);
+insert into db1.t1 values (7);
+insert into db2.t1 values (7);
+insert into db1.t1 values (6);
+insert into db2.t1 values (6);
+insert into db1.t1 values (5);
+insert into db2.t1 values (5);
+insert into db1.t1 values (4);
+insert into db2.t1 values (4);
+insert into db1.t1 values (3);
+insert into db2.t1 values (3);
+insert into db1.t1 values (2);
+insert into db2.t1 values (2);
+insert into db1.t1 values (1);
+insert into db2.t1 values (1);
+include/sync_slave_io_with_master.inc
+[connection slave]
+include/stop_slave_io.inc
+[connection master]
+BEGIN;
+INSERT INTO db1.t1 VALUES (50);
+COMMIT;
+[connection slave]
+SET global debug="d,simulate_stop_when_mts_in_group";
+include/start_slave_io.inc
+include/wait_for_slave_sql_to_stop.inc
+include/assert_grep.inc [Assert that the expected entry is in the error log during STOP SLAVE]
+SET GLOBAL debug=@save_debug;
+SET @@GLOBAL.slave_checkpoint_group= @save_slave_checkpoint_group;
+set @@GLOBAL.slave_checkpoint_period= @save_slave_checkpoint_period;
+include/start_slave.inc
+include/assert_grep.inc [Assert that the expected entry is in the error log during START SLAVE]
+[connection master]
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP DATABASE db1;
+DROP DATABASE db2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_corrupt_repository.result b/mysql-test/suite/rpl/r/rpl_multi_source_corrupt_repository.result
index fe17f3e45408..0139c06b8db1 100644
--- a/mysql-test/suite/rpl/r/rpl_multi_source_corrupt_repository.result
+++ b/mysql-test/suite/rpl/r/rpl_multi_source_corrupt_repository.result
@@ -147,10 +147,10 @@ FLUSH RELAY LOGS FOR CHANNEL 'channel_2';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel 'channel_2'.
 SHOW RELAYLOG EVENTS FOR CHANNEL 'channel_2';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel 'channel_2'.
+include/wait_for_slave_param.inc [Slave_IO_State channel=channel_2]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State channel=channel_2]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
@@ -194,10 +194,10 @@ FLUSH RELAY LOGS FOR CHANNEL 'channel_3';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel 'channel_3'.
 SHOW RELAYLOG EVENTS FOR CHANNEL 'channel_3';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel 'channel_3'.
+include/wait_for_slave_param.inc [Slave_IO_State channel=channel_3]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State channel=channel_3]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
@@ -325,10 +325,10 @@ FLUSH RELAY LOGS FOR CHANNEL '';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel ''.
 SHOW RELAYLOG EVENTS FOR CHANNEL '';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel ''.
+include/wait_for_slave_param.inc [Slave_IO_State]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
@@ -415,10 +415,10 @@ FLUSH RELAY LOGS FOR CHANNEL 'channel_3';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel 'channel_3'.
 SHOW RELAYLOG EVENTS FOR CHANNEL 'channel_3';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel 'channel_3'.
+include/wait_for_slave_param.inc [Slave_IO_State channel=channel_3]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State channel=channel_3]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
@@ -546,10 +546,10 @@ FLUSH RELAY LOGS FOR CHANNEL '';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel ''.
 SHOW RELAYLOG EVENTS FOR CHANNEL '';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel ''.
+include/wait_for_slave_param.inc [Slave_IO_State]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
@@ -593,10 +593,10 @@ FLUSH RELAY LOGS FOR CHANNEL 'channel_2';
 ===== Executing SHOW RELAYLOG EVENTS FOR CHANNEL on channel 'channel_2'.
 SHOW RELAYLOG EVENTS FOR CHANNEL 'channel_2';
 ===== Executing SHOW SLAVE FOR CHANNEL on channel 'channel_2'.
+include/wait_for_slave_param.inc [Slave_IO_State channel=channel_2]
+include/wait_for_slave_param.inc [Slave_SQL_Running_State channel=channel_2]
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Slave_IO_State = 'Waiting for master to send event'
-Slave_SQL_Running_State = 'Slave has read all relay log; waiting for more updates'
 Last_IO_Errno = '0'
 Last_IO_Error = ''
 Last_SQL_Errno = '0'
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_init_failure.result b/mysql-test/suite/rpl/r/rpl_multi_source_init_failure.result
index ac1da896fe7b..aa0b0bb311ba 100644
--- a/mysql-test/suite/rpl/r/rpl_multi_source_init_failure.result
+++ b/mysql-test/suite/rpl/r/rpl_multi_source_init_failure.result
@@ -4,11 +4,10 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 [connection slave]
-call mtr.add_suppression("Error during --relay-log-recovery");
-call mtr.add_suppression("Slave: Failed to initialize the master info structure for channel");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Recovery from master pos.* and file");
-call mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master");
+CALL mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master");
+CALL mtr.add_suppression("Error during --relay-log-recovery.*");
+CALL mtr.add_suppression("Server was not able to find a rotate event from master server.*");
+CALL mtr.add_suppression("Recovery from master pos.* and file");
 include/stop_slave.inc
 SET @@global.master_info_repository="TABLE";
 SET @@global.relay_log_info_repository="TABLE";
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_relay_log.result b/mysql-test/suite/rpl/r/rpl_multi_source_relay_log.result
index 5efbd543b05c..99be954fd295 100644
--- a/mysql-test/suite/rpl/r/rpl_multi_source_relay_log.result
+++ b/mysql-test/suite/rpl/r/rpl_multi_source_relay_log.result
@@ -1,7 +1,9 @@
 #########################################################################
 # Verify RESET SLAVE and RESET SLAVE FOR CHANNEL
-# - deletes all relay log files of named channels.
+# - deletes all relay log files of named channels and reintializes
+# them.
 # - For default channel, it restart the relay log from .000001
+# - For named channel, it restart the relay log from ch.000001
 #########################################################################
 include/master-slave.inc
 Warnings:
@@ -18,19 +20,21 @@ FLUSH RELAY LOGS FOR CHANNEL "ch2";
 # RESET SLAVE FOR CHANNEL "ch1" deletes all relay log files of ch1.
 #
 RESET SLAVE FOR CHANNEL "ch1";
+slave-relay-bin-ch1.000001
+slave-relay-bin-ch1.index
 #
 # RESET SLAVE deletes all relay log files of ch2
 #
 include/stop_slave.inc
 RESET SLAVE;
+slave-relay-bin-ch2.000001
+slave-relay-bin-ch2.index
 #
 # RESET SLAVE resets relay log of default channel from .000001
 #
 #
-# Recreate channels "ch1" and "ch2" files again.
+# Relay log files for all channels are recreated automatically.
 #
-CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=10 FOR CHANNEL "ch1";
-CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=11 FOR CHANNEL "ch2";
 #
 # RESET SLAVE ALL deletes all channels info and files.
 #
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_relay_log_recovery.result b/mysql-test/suite/rpl/r/rpl_multi_source_relay_log_recovery.result
index 3ebadab01c98..8556ef70fb1c 100644
--- a/mysql-test/suite/rpl/r/rpl_multi_source_relay_log_recovery.result
+++ b/mysql-test/suite/rpl/r/rpl_multi_source_relay_log_recovery.result
@@ -38,7 +38,7 @@ INSERT INTO d1_1.t VALUES (2, 'T5');;
 [connection server_2]
 # Now d1_1.t has two rows and d2_.t has one row.
 #
-# Generate MTS gaps for channel2.
+# Generate MTS gaps for channel3.
 #
 [connection server_3]
 [connection server_3]
diff --git a/mysql-test/suite/rpl/r/rpl_multi_source_repo_info_errors.result b/mysql-test/suite/rpl/r/rpl_multi_source_repo_info_errors.result
index 8382f92d5411..aef4647cb496 100644
--- a/mysql-test/suite/rpl/r/rpl_multi_source_repo_info_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_multi_source_repo_info_errors.result
@@ -4,12 +4,9 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 [connection slave]
-call mtr.add_suppression("Slave failed to initialize relay log info structure from the repository");
-call mtr.add_suppression("Slave: Could not start slave for channel");
-call mtr.add_suppression("Error during --relay-log-recovery: Could not locate rotate event from the master");
-call mtr.add_suppression("slave with the same server_uuid as this slave has connected to the master");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Got fatal error .* from master .* slave with the same server_uuid/server_id");
+CALL mtr.add_suppression("Got fatal error .* from master .* slave with the same server_uuid/server_id");
+CALL mtr.add_suppression("Error during --relay-log-recovery.*");
+CALL mtr.add_suppression("Server was not able to find a rotate event from master server.*");
 include/stop_slave.inc
 RESET SLAVE ALL;
 SET GLOBAL master_info_repository='TABLE';
@@ -19,11 +16,9 @@ CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=MASTER
 # RESTART SLAVE SERVER
 #
 include/rpl_restart_server.inc [server_number=2 parameters: --relay-log-recovery --skip-slave-start --master-info-repository=TABLE --relay-log-info-repository=TABLE --slave-parallel-workers=4 --relay-log-purge=0]
-START SLAVE;
-ERROR HY000: Slave failed to initialize relay log info structure from the repository
 CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=MASTER_MYPORT FOR CHANNEL 'ch1';
-START SLAVE;
-ERROR HY000: Slave failed to initialize relay log info structure from the repository
+include/start_slave.inc
+include/stop_slave.inc
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=MASTER_MYPORT FOR CHANNEL 'ch1';
 CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=MASTER_MYPORT FOR CHANNEL '';
diff --git a/mysql-test/suite/rpl/r/rpl_no_gtid_delete_memory_table_after_start_server.result b/mysql-test/suite/rpl/r/rpl_no_gtid_delete_memory_table_after_start_server.result
deleted file mode 100644
index 5338d8e880f4..000000000000
--- a/mysql-test/suite/rpl/r/rpl_no_gtid_delete_memory_table_after_start_server.result
+++ /dev/null
@@ -1,38 +0,0 @@
-include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
-[connection master]
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-include/sync_slave_sql_with_master.inc
-include/stop_slave.inc
-include/rpl_restart_server.inc [server_number=1]
-include/start_slave.inc
-# Test case 1: verify DELETE FROM mem_xx can be binlogged correctly
-#              in CREATE TABLE ... SELECT
-[connection master]
-include/save_binlog_position.inc
-CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
-include/assert_binlog_events.inc [Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t1;
-c1
-#
-# Test case 2: verify DELETE FROM mem_xx can be binlogged correctly
-#              in a DML on a MyISAM table
-[connection master]
-include/save_binlog_position.inc
-INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
-include/assert_binlog_events.inc [Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT]
-include/sync_slave_sql_with_master.inc
-SELECT * FROM mem_t2;
-c1
-[connection master]
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_no_gtid_truncate_memory_table_after_start_server.result b/mysql-test/suite/rpl/r/rpl_no_gtid_truncate_memory_table_after_start_server.result
new file mode 100644
index 000000000000..1f95b044a7c6
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_no_gtid_truncate_memory_table_after_start_server.result
@@ -0,0 +1,39 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/rpl_restart_server.inc [server_number=1]
+include/start_slave.inc
+# Test case 1: verify TRUNCATE FROM mem_xx can be binlogged correctly
+#              in CREATE TABLE ... SELECT
+[connection master]
+include/save_binlog_position.inc
+CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
+include/assert_binlog_events.inc [#Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Q(CREATE.*)]
+include/save_binlog_position.inc
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t1;
+c1
+#
+# Test case 2: verify TRUNCATE FROM mem_xx can be binlogged correctly
+#              in a DML on a MyISAM table
+[connection master]
+include/save_binlog_position.inc
+INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
+include/assert_binlog_events.inc [#Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Begin]
+include/sync_slave_sql_with_master.inc
+SELECT * FROM mem_t2;
+c1
+[connection master]
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result b/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result
index 2d787bd88dd7..15d00a1acf35 100644
--- a/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result
+++ b/mysql-test/suite/rpl/r/rpl_operation_ignore_super_read_only.result
@@ -8,9 +8,6 @@ CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
 SET GLOBAL super_read_only= 1;
 SET AUTOCOMMIT= ON;
 SHOW VARIABLES like '%autocommit%';
@@ -56,12 +53,20 @@ RESET MASTER;
 # Test Case8: SET GLOBAL GTID_PURGED command
 ####################################################################
 SET GLOBAL gtid_purged= 'MASTER_UUID:1';
+####################################################################
+# Test Case9: Server Restart
+####################################################################
+include/rpl_restart_server.inc [server_number=2]
+include/assert.inc [Read_Master_Log_Pos before and after restart are same.]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
 "Clean up"
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+SET AUTOCOMMIT= SAVED_AUTOCOMMIT;
+SET GLOBAL super_read_only= SAVED_SUPER_READ_ONLY;
+SET GLOBAL read_only= SAVED_READ_ONLY;
 include/stop_slave.inc
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
@@ -74,9 +79,6 @@ CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(1);
 DROP TABLE t1;
 include/sync_slave_sql_with_master.inc
-SET @saved_value_super= @@GLOBAL.super_read_only;
-SET @saved_value= @@GLOBAL.read_only;
-SET @saved_autocommit= @@GLOBAL.autocommit;
 SET GLOBAL super_read_only= 1;
 SET AUTOCOMMIT= OFF;
 SHOW VARIABLES like '%autocommit%';
@@ -122,12 +124,20 @@ RESET MASTER;
 # Test Case8: SET GLOBAL GTID_PURGED command
 ####################################################################
 SET GLOBAL gtid_purged= 'MASTER_UUID:1';
+####################################################################
+# Test Case9: Server Restart
+####################################################################
+include/rpl_restart_server.inc [server_number=2]
+include/assert.inc [Read_Master_Log_Pos before and after restart are same.]
+include/start_slave.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
 "Clean up"
-SET AUTOCOMMIT= @saved_autocommit;
-SET GLOBAL super_read_only= @saved_value_super;
-SET GLOBAL read_only= @saved_value;
+SET AUTOCOMMIT= SAVED_AUTOCOMMIT;
+SET GLOBAL super_read_only= SAVED_SUPER_READ_ONLY;
+SET GLOBAL read_only= SAVED_READ_ONLY;
 include/stop_slave.inc
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result
index bf9c6bab4a97..b27f8fcc0c0e 100644
--- a/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result
+++ b/mysql-test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result
@@ -55,6 +55,7 @@ include/stop_slave.inc
 drop table t;
 reset master;
 reset slave;
+reset master;
 
 # Restarting servers and setting up MTS now. Since, SQL thread and
 # coordinator are the same and follow same code path, we can skip
diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_order_by.result b/mysql-test/suite/rpl/r/rpl_perfschema_order_by.result
new file mode 100644
index 000000000000..deb347fa2f73
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_perfschema_order_by.result
@@ -0,0 +1,169 @@
+include/rpl_init.inc [topology=3->2,1->2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server_2]
+SET @save.slave_parallel_workers= @@global.slave_parallel_workers;
+# Test for Single Threaded Slave
+SET GLOBAL slave_parallel_workers= 0;
+START SLAVE;
+# 1) Create a database on server_1.
+[connection server_1]
+CREATE DATABASE db1;
+# 2) create database on server_3.
+[connection server_3]
+CREATE DATABASE db3;
+# 3)  sync the slave (server_2) with both masters (server_1 and server_3).
+[connection server_1]
+include/sync_slave_sql_with_master.inc
+[connection server_3]
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/start_slave.inc
+
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration;
+CHANNEL_NAME
+channel_3
+channel_1
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME;
+CHANNEL_NAME
+channel_1
+channel_3
+
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status;
+CHANNEL_NAME
+channel_3
+channel_1
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;
+CHANNEL_NAME
+channel_1
+channel_3
+
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_1	
+channel_3	
+
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration;
+CHANNEL_NAME	TLS_VERSION
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	TLS_VERSION
+channel_1	
+channel_3	
+
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_1	
+channel_3	
+
+[connection server_1]
+DROP DATABASE db1;
+[connection server_3]
+DROP DATABASE db3;
+[connection server_1]
+include/sync_slave_sql_with_master.inc
+[connection server_3]
+include/sync_slave_sql_with_master.inc
+# Test for Multi Threaded Slave
+STOP SLAVE;
+SET GLOBAL slave_parallel_workers = 2;
+START SLAVE;
+# 1) Create a database on server_1.
+[connection server_1]
+CREATE DATABASE db1;
+# 2) create database on server_3.
+[connection server_3]
+CREATE DATABASE db3;
+# 3)  sync the slave (server_2) with both masters (server_1 and server_3).
+[connection server_1]
+include/sync_slave_sql_with_master.inc
+[connection server_3]
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+include/start_slave.inc
+
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration;
+CHANNEL_NAME
+channel_3
+channel_1
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME;
+CHANNEL_NAME
+channel_1
+channel_3
+
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status;
+CHANNEL_NAME
+channel_3
+channel_1
+SELECT CHANNEL_NAME FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;
+CHANNEL_NAME
+channel_1
+channel_3
+
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_connection_status ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_1	
+channel_3	
+
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration;
+CHANNEL_NAME	TLS_VERSION
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, TLS_VERSION FROM performance_schema.replication_connection_configuration ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	TLS_VERSION
+channel_1	
+channel_3	
+
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_coordinator;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_3	
+channel_1	
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_coordinator ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_1	
+channel_3	
+
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_3	
+channel_3	
+channel_1	
+channel_1	
+SELECT CHANNEL_NAME, LAST_ERROR_MESSAGE FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME;
+CHANNEL_NAME	LAST_ERROR_MESSAGE
+channel_1	
+channel_1	
+channel_3	
+channel_3	
+
+[connection server_1]
+DROP DATABASE db1;
+[connection server_3]
+DROP DATABASE db3;
+[connection server_1]
+include/sync_slave_sql_with_master.inc
+[connection server_3]
+include/sync_slave_sql_with_master.inc
+STOP SLAVE;
+SET @@global.slave_parallel_workers= @save.slave_parallel_workers;
+START SLAVE;
+include/rpl_end.inc
+RESET SLAVE ALL FOR CHANNEL  'channel_3';
+RESET SLAVE ALL FOR CHANNEL  'channel_1';
diff --git a/mysql-test/suite/rpl/r/rpl_previous_gtids.result b/mysql-test/suite/rpl/r/rpl_previous_gtids.result
new file mode 100644
index 000000000000..5da996594da2
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_previous_gtids.result
@@ -0,0 +1,48 @@
+#
+# Use default connection to master.
+#
+RESET MASTER;
+SET @old_binlog_order_commits = @@global.binlog_order_commits;
+SET GLOBAL binlog_order_commits = 0;
+#
+# Create table. Use GTID 1
+#
+CREATE TABLE t1 (id INT PRIMARY KEY);
+#
+# Make another connection. Set to stop at after dec_prep_xids.
+#
+SET DEBUG_SYNC = "after_dec_prep_xids SIGNAL signal.after_dec_prep_xids_reached WAIT_FOR signal.after_dec_prep_xids_unblock";
+#
+# Use GTID 2. Stop after dec_prep_xids. If commit is executed before
+# dec_prep_xids then GTID 2 will be used out.
+#
+INSERT INTO t1 VALUES(1);
+#
+# Use default connection to master.
+#
+#
+# Wait until after_dec_prep_xids is reached
+#
+SET DEBUG_SYNC = "now WAIT_FOR signal.after_dec_prep_xids_reached";
+#
+# Use GTID 3. Force to rotate to log 'master-bin.000002'
+# All GTID 1-3 should be used in 'master-bin.000001'
+#
+SET SESSION debug = "+d,force_rotate";
+INSERT INTO t1 VALUES(2);
+SET SESSION debug = "-d,force_rotate";
+#
+# Add transaction in new binary log 'master-bin.000002'
+# GTID 4 should be used.
+#
+SET DEBUG_SYNC = 'now SIGNAL signal.after_dec_prep_xids_unblock';
+INSERT INTO t1 VALUES(3);
+#
+# Check all GTID 1-3 are used by looking at 'master-bin.000002'
+#
+include/assert.inc [Previous_gtids should use UUID:1-3 GTID]
+#
+# Cleanup
+#
+DROP TABLE t1;
+SET GLOBAL binlog_order_commits = @old_binlog_order_commits;
diff --git a/mysql-test/suite/rpl/r/rpl_relay_log_space_synchronization.result b/mysql-test/suite/rpl/r/rpl_relay_log_space_synchronization.result
new file mode 100644
index 000000000000..925e6b6731fe
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_relay_log_space_synchronization.result
@@ -0,0 +1,23 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1 (i INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+SET GLOBAL debug='+d,wait_in_purge_index_entry';
+FLUSH LOCAL RELAY LOGS;
+START SLAVE SQL_THREAD;
+SET DEBUG_SYNC="now WAIT_FOR in_purge_index_entry";
+[connection master]
+INSERT INTO t1 VALUES (1);
+[connection slave]
+include/assert.inc [IO Thread is waiting for Relay_log_info::log_space_lock.]
+SET DEBUG_SYNC="now SIGNAL go_ahead_sql";
+[connection master]
+DROP TABLE t1;
+include/sync_slave_sql_with_master.inc
+SET GLOBAL debug='-d,wait_in_purge_index_entry';
+SET DEBUG_SYNC="RESET";
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_replication_observers_example_is_stopping.result b/mysql-test/suite/rpl/r/rpl_replication_observers_example_is_stopping.result
index 2c31d4f2176b..aa088845ba2e 100644
--- a/mysql-test/suite/rpl/r/rpl_replication_observers_example_is_stopping.result
+++ b/mysql-test/suite/rpl/r/rpl_replication_observers_example_is_stopping.result
@@ -7,6 +7,10 @@ Note	####	Storing MySQL user name or password information in the master info rep
 
 ############################################################
 # 1. Install the plug-in and add error suppressions on slave
+[connection master]
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression(".*Cannot replicate.*purged required binary logs.*");
+SET SESSION sql_log_bin= 1;
 [connection slave]
 SET SESSION sql_log_bin= 0;
 CALL mtr.add_suppression("Table 't1' already exists");
diff --git a/mysql-test/suite/rpl/r/rpl_reset_restart.result b/mysql-test/suite/rpl/r/rpl_reset_restart.result
new file mode 100644
index 000000000000..15a62ff24d47
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_reset_restart.result
@@ -0,0 +1,19 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1 (c1 INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+[connection master]
+RESET MASTER;
+[connection slave]
+RESET MASTER;
+RESET SLAVE;
+include/start_slave.inc
+# Kill and restart
+include/rpl_reconnect.inc
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
index 670350f13220..ecd7d589c13c 100644
--- a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
@@ -112,7 +112,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
diff --git a/mysql-test/suite/rpl/r/rpl_row_corruption.result b/mysql-test/suite/rpl/r/rpl_row_corruption.result
index 718018434e18..1f9a7b20871a 100644
--- a/mysql-test/suite/rpl/r/rpl_row_corruption.result
+++ b/mysql-test/suite/rpl/r/rpl_row_corruption.result
@@ -16,7 +16,7 @@ SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
 include/start_slave.inc
 UPDATE t1_11753004, t2_11753004 SET t1_11753004.c1=3, t2_11753004.c1=4 WHERE t1_11753004.c1=1 OR t2_11753004.c1=2;
 include/wait_for_slave_sql_error.inc [errno=1593 ]
-include/stop_slave.inc
+include/stop_slave_io.inc
 SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
 include/start_slave.inc
 include/rpl_reset.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_gtid_disconnect_drop_temporary_table.result b/mysql-test/suite/rpl/r/rpl_row_gtid_disconnect_drop_temporary_table.result
new file mode 100644
index 000000000000..9c2e506831a5
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_gtid_disconnect_drop_temporary_table.result
@@ -0,0 +1,62 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t (a INT);
+---- 1. Disconnect after SET GTID_NEXT ----
+include/rpl_connect.inc [creating con1]
+[connection con1]
+CREATE TEMPORARY TABLE tt (a INT);
+SET GTID_NEXT = '#';
+include/save_binlog_position.inc
+include/gtid_step_reset.inc
+# Disconnecting.
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Slave should not have any open temporary tables.]
+include/gtid_step_assert.inc [count=0, only_count=0]
+---- 2. Disconnect in the middle of transaction ----
+include/rpl_connect.inc [creating con1]
+[connection con1]
+CREATE TEMPORARY TABLE tt (a INT);
+SET GTID_NEXT = '#';
+BEGIN;
+INSERT INTO t VALUES (1);
+include/save_binlog_position.inc
+include/gtid_step_reset.inc
+# Disconnecting.
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Slave should not have any open temporary tables.]
+include/gtid_step_assert.inc [count=0, only_count=0]
+---- 3. Disconnect after COMMIT ----
+include/rpl_connect.inc [creating con1]
+[connection con1]
+CREATE TEMPORARY TABLE tt (a INT);
+SET GTID_NEXT = '#';
+BEGIN;
+INSERT INTO t VALUES (1);
+COMMIT;
+include/save_binlog_position.inc
+include/gtid_step_reset.inc
+# Disconnecting.
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Slave should not have any open temporary tables.]
+include/gtid_step_assert.inc [count=0, only_count=0]
+---- 4. Disconnect after ROLLBACK ----
+include/rpl_connect.inc [creating con1]
+[connection con1]
+CREATE TEMPORARY TABLE tt (a INT);
+SET GTID_NEXT = '#';
+BEGIN;
+INSERT INTO t VALUES (1);
+ROLLBACK;
+include/save_binlog_position.inc
+include/gtid_step_reset.inc
+# Disconnecting.
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Slave should not have any open temporary tables.]
+include/gtid_step_assert.inc [count=0, only_count=0]
+---- Clean up ----
+DROP TABLE t;
+include/sync_slave_sql_with_master.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_image_check_for_insert_select.result b/mysql-test/suite/rpl/r/rpl_row_image_check_for_insert_select.result
new file mode 100644
index 000000000000..e609937dcf52
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_image_check_for_insert_select.result
@@ -0,0 +1,66 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+SET @old_binlog_row_image= @@binlog_row_image;
+[connection slave]
+SET @old_binlog_row_image= @@binlog_row_image;
+[connection master]
+# 1. Initial setup includes setting the transaction isolation level to
+#    'READ-COMMITTED' on master and setting binlog_row_image = FULL using
+#    rpl_row_img_set.inc.
+SET @old_transaction_isolation= @@session.transaction_isolation;
+SET SESSION transaction_isolation='READ-COMMITTED';
+# Set the binlog_row_image to FULL on both master and slave.
+CON: 'master', IMG: 'FULL', RESTART SLAVE: 'N'
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'slave', IMG: 'FULL', RESTART SLAVE: 'Y'
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+#
+# 2. Create two tables with same structure and insert a row into a table.
+#
+CREATE DATABASE a;
+CREATE DATABASE b;
+CREATE TABLE a.test (id INT PRIMARY KEY, name VARCHAR(50) DEFAULT NULL, age BIGINT)ENGINE=InnoDB;
+CREATE TABLE b.test (id INT PRIMARY KEY, name VARCHAR(50) DEFAULT NULL, age BIGINT)ENGINE=InnoDB;
+include/sync_slave_sql_with_master.inc
+#
+# 3. Verify that INSERT..SELECT query is logged with full image on both
+#    master and slave with the use of rpl_row_img_parts_master_slave.inc
+#    file.
+#
+[connection master]
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+INSERT INTO a.test(id, age) VALUES (1,5);
+SET sql_mode = default;
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+INSERT INTO b.test(id,age) SELECT id , age FROM a.test;
+SET sql_mode = default;
+DROP DATABASE a;
+DROP DATABASE b;
+include/sync_slave_sql_with_master.inc
+[connection master]
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+SET SESSION transaction_isolation= @old_transaction_isolation;
+[connection slave]
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result
new file mode 100644
index 000000000000..d009f093ff81
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_seconds_behind_master_mts.result
@@ -0,0 +1,228 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+# Adding debug point 'dbug.mts.force_clock_diff_eq_0' to @@GLOBAL.debug
+SET @save_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @save.slave_parallel_workers= @@global.slave_parallel_workers;
+SET @save_slave_transaction_retries= @@global.slave_transaction_retries;
+# Test for PARALLEL_DATABASE
+SET GLOBAL slave_parallel_type = 'DATABASE';
+SET @@global.slave_parallel_workers= 4;
+include/start_slave.inc
+# Scenario 1: With two workers, check if Seconds_Behind_Master is
+# calculated correctly when all the workers are waiting.
+CREATE TABLE t1 (f1 INT);
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE t2 (f1 INT);
+include/sync_slave_sql_with_master.inc
+LOCK TABLE test.t1 WRITE;
+LOCK TABLE test2.t2 WRITE;
+USE test;
+INSERT INTO t1 VALUES (1);
+USE test2;
+INSERT INTO t2 VALUES (1);
+include/sync_slave_io_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 5 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 2 and upper_bound]
+UNLOCK TABLES;
+include/sync_slave_sql_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+# Scenario 2: With two workers, check if Seconds_Behind_Master is
+# calculated correctly when first worker compeletes first.
+LOCK TABLE test2.t2 WRITE;
+USE test;
+INSERT INTO t1 VALUES (1);
+USE test2;
+INSERT INTO t2 VALUES (1);
+include/sync_slave_io_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 2 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+# Scenario 3: With three workers, check if Seconds_Behind_Master is
+# calculated correctly when second worker completes first.
+CREATE DATABASE test3;
+USE test3;
+CREATE TABLE t3 (f1 INT);
+include/sync_slave_sql_with_master.inc
+LOCK TABLE test.t1 WRITE;
+LOCK TABLE test3.t3 WRITE;
+USE test;
+INSERT INTO t1 VALUES (1);
+use test2;
+INSERT INTO t2 VALUES (1);
+USE test3;
+INSERT INTO t3 VALUES (1);
+include/sync_slave_io_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 7 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 2 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+DROP TABLE test.t1;
+DROP DATABASE test2;
+DROP DATABASE test3;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+# Test for LOGICAL_CLOCK
+SET GLOBAL slave_parallel_type = 'LOGICAL_CLOCK';
+SET GLOBAL slave_parallel_workers = 3;
+include/start_slave.inc
+# Scenario 1: With two workers, check if Seconds_Behind_Master is
+# calculated correctly when two statements are applied in parallel on
+# one database and both the workers are blocked to to lock.
+USE test;
+CREATE TABLE t1 (a int);
+CREATE TABLE t2 (a int);
+INSERT INTO t1 SET a=1;
+include/sync_slave_sql_with_master.inc
+LOCK TABLE test.t1 WRITE, test.t2 WRITE;
+BEGIN;
+INSERT INTO t1 SET a=2;
+BEGIN;
+INSERT INTO t2 SET a=4;
+COMMIT;
+COMMIT;
+include/sync_slave_io_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 3 and upper_bound]
+UNLOCK TABLES;
+include/sync_slave_sql_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+# Scenario 2: With two workers, check if Seconds_Behind_Master is
+# calculated correctly when the first worker is blocked.
+INSERT INTO t1 SET a=1;
+include/sync_slave_sql_with_master.inc
+LOCK TABLE test.t1 WRITE;
+LOCK TABLE test.t2 WRITE;
+BEGIN;
+INSERT INTO t1 SET a=2;
+BEGIN;
+INSERT INTO t2 SET a=3;
+COMMIT;
+COMMIT;
+include/sync_slave_io_with_master.inc
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 2 and upper_bound]
+UNLOCK TABLES;
+include/sync_slave_sql_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+# Scenario 3: With three workers, check if Seconds_Behind_Master is
+# calculated correctly when two workers working on table from the same
+# database and 3rd worker working on another database.
+CREATE DATABASE second_test;
+CREATE TABLE second_test.t3 (f1 INT);
+INSERT INTO test.t1 SET a=1;
+LOCK TABLE test.t1 WRITE;
+LOCK TABLE test.t2 WRITE;
+LOCK TABLE second_test.t3 WRITE;
+BEGIN;
+INSERT INTO second_test.t3 VALUES (1);
+BEGIN;
+INSERT INTO test.t1 SET a=2;
+BEGIN;
+INSERT INTO test.t2 SET a=3;
+COMMIT;
+COMMIT;
+COMMIT;
+include/sync_slave_io_with_master.inc
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 2 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 3 and upper_bound]
+UNLOCK TABLES;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be between 4 and upper_bound]
+UNLOCK TABLE;
+# Adding debug point 'mts_checkpoint' to @@GLOBAL.debug
+SET DEBUG_SYNC="RESET";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_start";
+SET DEBUG_SYNC="now WAIT_FOR mts_checkpoint_end";
+# Removing debug point 'mts_checkpoint' from @@GLOBAL.debug
+include/assert.inc [Seconds_Behind_Master must be 0]
+DROP TABLE test.t1;
+DROP TABLE test.t2;
+DROP DATABASE second_test;
+include/sync_slave_sql_with_master.inc
+include/stop_slave.inc
+# Removing debug point 'dbug.mts.force_clock_diff_eq_0' from @@GLOBAL.debug
+SET @@GLOBAL.slave_parallel_type= @save_slave_parallel_type;
+SET @@global.slave_parallel_workers= @save.slave_parallel_workers;
+SET @@global.slave_transaction_retries= @save_slave_transaction_retries;
+include/start_slave.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_add_remove_slaves.result b/mysql-test/suite/rpl/r/rpl_semi_sync_add_remove_slaves.result
new file mode 100644
index 000000000000..fd4789ef3929
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_add_remove_slaves.result
@@ -0,0 +1,120 @@
+include/rpl_init.inc [topology=1->2, 1->3, 1->4, 1->5, 1->6, 1->7, 1->8, 1->9]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+#
+# 1. Initial data.
+#
+call mtr.add_suppression("Timeout waiting for reply of binlog");
+CREATE TABLE t1(c1 INT);
+include/rpl_sync.inc
+#
+# 2. Install semisync on all the 9 servers.
+#
+[connection server_1]
+CALL mtr.add_suppression("Semi-sync master failed on net_flush.*");
+include/install_semisync_master.inc
+[connection server_2]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_3]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_4]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_5]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_6]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_7]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_8]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_9]
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+#
+# 3. Make Master aware of 8 semisync slaves.
+#
+[connection server1_1]
+SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = 8;
+#
+# 4. Insert 5000 tuples in background using 10 parallel connections.
+#
+#
+# 5. While the insert operations are going in the background, keep
+#    adding/removing semisync slaves randomly.
+#
+#
+# 6. Add all 8 semisync slaves back to Master
+#     (if they were disconnected, in above step).
+#
+#
+# 7. Make sure the data is synced on Master without any issues.
+#
+[connection server_1]
+include/rpl_sync.inc
+#
+# 8. Check on all servers semisync is enabled after the
+#    the experiment and then uninstall semisync pluging
+#    from it.
+#
+[connection server_9]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_8]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_7]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_6]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_5]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_4]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_3]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_2]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_slave.inc
+[connection server_1]
+include/assert.inc [ should be 1]
+include/uninstall_semisync_master.inc
+#
+# 9. Cleanup time.
+#
+[connection server_1]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_optimize_for_static_plugin_config.result b/mysql-test/suite/rpl/r/rpl_semi_sync_optimize_for_static_plugin_config.result
new file mode 100644
index 000000000000..ad69023de424
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_optimize_for_static_plugin_config.result
@@ -0,0 +1,501 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/sync_slave_sql_with_master.inc
+#
+# Uninstall semi-sync plugins on master and slave
+#
+include/stop_slave.inc
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+include/rpl_reset.inc
+#
+# Main test of semi-sync replication starts here
+#
+[connection master]
+[ default state of semi-sync on master should be OFF ]
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	OFF
+[ enable semi-sync on master ]
+set global rpl_semi_sync_master_enabled = 1;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+[ status of semi-sync on master should be ON even without any semi-sync slaves ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+#
+# BUG#45672 Semisync repl: ActiveTranx:insert_tranx_node: transaction node allocation failed
+# BUG#45673 Semisync reports correct operation even if no slave is connected
+#
+[ status of semi-sync on master should be OFF ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+include/rpl_reset.inc
+#
+# INSTALL PLUGIN semi-sync on slave
+#
+[connection slave]
+[ default state of semi-sync on slave should be OFF ]
+show variables like 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	OFF
+[ enable semi-sync on slave ]
+set global rpl_semi_sync_slave_enabled = 1;
+show variables like 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+[ initial master state after the semi-sync slave connected ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+create table t1(a int) engine = ENGINE_TYPE;
+[ master state after CREATE TABLE statement ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	1
+select CONNECTIONS_NORMAL_SLAVE - CONNECTIONS_NORMAL_SLAVE as 'Should be 0';
+Should be 0
+0
+[ insert records to table ]
+[ master status after inserts ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	11
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+[ slave status after replicated inserts ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+select count(distinct a) from t1;
+count(distinct a)
+10
+select min(a) from t1;
+min(a)
+1
+select max(a) from t1;
+max(a)
+10
+
+# BUG#50157
+# semi-sync replication crashes when replicating a transaction which
+# include 'CREATE TEMPORARY TABLE `MyISAM_t` SELECT * FROM `Innodb_t` ;
+[connection master]
+SET SESSION AUTOCOMMIT= 0;
+CREATE TABLE t2(c1 INT) ENGINE=innodb;
+include/sync_slave_sql_with_master.inc
+BEGIN;
+
+# Even though it is in a transaction, this statement is binlogged into binlog
+# file immediately.
+CREATE TEMPORARY TABLE t3 SELECT c1 FROM t2 where 1=1;
+
+# These statements will not be binlogged until the transaction is committed
+INSERT INTO t2 VALUES(11);
+INSERT INTO t2 VALUES(22);
+COMMIT;
+DROP TABLE t2, t3;
+SET SESSION AUTOCOMMIT= 1;
+include/sync_slave_sql_with_master.inc
+#
+# Test semi-sync master will switch OFF after one transaction
+# timeout waiting for slave reply.
+#
+include/stop_slave.inc
+[connection master]
+include/stop_dump_threads.inc
+[ master status should be ON ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+[ semi-sync replication of these transactions will fail ]
+insert into t1 values (500);
+[ master status should be OFF ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+insert into t1 values (100);
+[ master status should be OFF ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+#
+# Test semi-sync status on master will be ON again when slave catches up
+#
+[connection slave]
+[ slave status should be OFF ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+include/start_slave.inc
+[ slave status should be ON ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+select count(distinct a) from t1;
+count(distinct a)
+2
+select min(a) from t1;
+min(a)
+100
+select max(a) from t1;
+max(a)
+500
+[connection master]
+[ master status should be ON again after slave catches up ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+#
+# Test disable/enable master semi-sync on the fly.
+#
+drop table t1;
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+include/stop_slave.inc
+#
+# Flush status
+#
+[ Semi-sync master status variables before FLUSH STATUS ]
+SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	16
+FLUSH NO_WRITE_TO_BINLOG STATUS;
+[ Semi-sync master status variables after FLUSH STATUS ]
+SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+[connection master]
+show master logs;
+Log_name	master-bin.000001
+File_size	#
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+[ disable semi-sync on the fly ]
+set global rpl_semi_sync_master_enabled=0;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	OFF
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+[ enable semi-sync on the fly ]
+set global rpl_semi_sync_master_enabled=1;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+#
+# Test RESET MASTER/SLAVE
+#
+[connection slave]
+include/start_slave.inc
+[connection master]
+create table t1 (a int) engine = ENGINE_TYPE;
+drop table t1;
+include/sync_slave_sql_with_master.inc
+show status like 'Rpl_relay%';
+Variable_name	Value
+[ test reset master ]
+[connection master]
+reset master;
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+[connection slave]
+include/stop_slave.inc
+reset slave;
+reset master;
+[connection master]
+include/stop_dump_threads.inc
+include/start_slave.inc
+[connection master]
+create table t1 (a int) engine = ENGINE_TYPE;
+insert into t1 values (1);
+insert into t1 values (2), (3);
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+select * from t1;
+a
+1
+2
+3
+[connection master]
+[ master semi-sync status should be ON ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	3
+#
+# Start semi-sync replication without SUPER privilege
+#
+include/rpl_reset.inc
+[connection master]
+include/stop_dump_threads.inc
+set sql_log_bin=0;
+create user rpl@127.0.0.1 identified by 'rpl';
+grant replication slave on *.* to rpl@127.0.0.1;
+flush privileges;
+set sql_log_bin=1;
+SET @save_show_compatibility_56=@@global.show_compatibility_56;
+SET @@global.show_compatibility_56=OFF;
+[connection slave]
+create user rpl@127.0.0.1 identified by 'rpl';
+grant replication slave on *.* to rpl@127.0.0.1;
+flush privileges;
+change master to master_user='rpl',master_password='rpl';
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+[connection master]
+SET @@global.show_compatibility_56=ON;
+[connection slave]
+include/stop_slave.inc
+[connection master]
+Insert into t1 values (4);
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+[connection slave]
+include/start_slave.inc
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+[connection master]
+SET @@global.show_compatibility_56=@save_show_compatibility_56;
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+[ master semi-sync should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+insert into t1 values (5);
+insert into t1 values (6);
+[ master semi-sync should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	2
+#
+# Test semi-sync slave connect to non-semi-sync master
+#
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+include/stop_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+[connection master]
+include/stop_dump_threads.inc
+[ Semi-sync status on master should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+set global rpl_semi_sync_master_enabled= 0;
+[connection slave]
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+insert into t1 values (8);
+[ master semi-sync clients should be 1, status should be OFF ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+include/stop_slave.inc
+[ on master ]
+include/stop_dump_threads.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+[connection slave]
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+insert into t1 values (10);
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+#
+# Test non-semi-sync slave connect to semi-sync master
+#
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+set global rpl_semi_sync_master_timeout= 60000;
+/* 60s */
+set global rpl_semi_sync_master_enabled= 1;
+[connection slave]
+include/stop_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+[ uninstall semi-sync slave plugin ]
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+include/start_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+include/stop_slave.inc
+[ reinstall semi-sync slave plugin and disable semi-sync ]
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+set global rpl_semi_sync_slave_enabled= 0;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	OFF
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+include/start_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+#
+# Clean up
+#
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+include/uninstall_semisync.inc
+include/stop_slave.inc
+change master to master_user='root',master_password='';
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+drop table t1;
+include/sync_slave_sql_with_master.inc
+drop user rpl@127.0.0.1;
+flush privileges;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_sender_observe_commit_only.result b/mysql-test/suite/rpl/r/rpl_semi_sync_sender_observe_commit_only.result
new file mode 100644
index 000000000000..a24332735fc0
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_sender_observe_commit_only.result
@@ -0,0 +1,497 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+include/sync_slave_sql_with_master.inc
+#
+# Uninstall semi-sync plugins on master and slave
+#
+include/stop_slave.inc
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+include/rpl_reset.inc
+#
+# Main test of semi-sync replication starts here
+#
+[connection master]
+[ default state of semi-sync on master should be OFF ]
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	OFF
+[ enable semi-sync on master ]
+set global rpl_semi_sync_master_enabled = 1;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+[ status of semi-sync on master should be ON even without any semi-sync slaves ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+#
+# BUG#45672 Semisync repl: ActiveTranx:insert_tranx_node: transaction node allocation failed
+# BUG#45673 Semisync reports correct operation even if no slave is connected
+#
+[ status of semi-sync on master should be OFF ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+include/rpl_reset.inc
+#
+# INSTALL PLUGIN semi-sync on slave
+#
+[connection slave]
+[ default state of semi-sync on slave should be OFF ]
+show variables like 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	OFF
+[ enable semi-sync on slave ]
+set global rpl_semi_sync_slave_enabled = 1;
+show variables like 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+[ initial master state after the semi-sync slave connected ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+create table t1(a int) engine = ENGINE_TYPE;
+[ master state after CREATE TABLE statement ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	1
+select CONNECTIONS_NORMAL_SLAVE - CONNECTIONS_NORMAL_SLAVE as 'Should be 0';
+Should be 0
+0
+[ insert records to table ]
+[ master status after inserts ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	11
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+[ slave status after replicated inserts ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+select count(distinct a) from t1;
+count(distinct a)
+10
+select min(a) from t1;
+min(a)
+1
+select max(a) from t1;
+max(a)
+10
+
+# BUG#50157
+# semi-sync replication crashes when replicating a transaction which
+# include 'CREATE TEMPORARY TABLE `MyISAM_t` SELECT * FROM `Innodb_t` ;
+[connection master]
+SET SESSION AUTOCOMMIT= 0;
+CREATE TABLE t2(c1 INT) ENGINE=innodb;
+include/sync_slave_sql_with_master.inc
+BEGIN;
+
+# Even though it is in a transaction, this statement is binlogged into binlog
+# file immediately.
+CREATE TEMPORARY TABLE t3 SELECT c1 FROM t2 where 1=1;
+
+# These statements will not be binlogged until the transaction is committed
+INSERT INTO t2 VALUES(11);
+INSERT INTO t2 VALUES(22);
+COMMIT;
+DROP TABLE t2, t3;
+SET SESSION AUTOCOMMIT= 1;
+include/sync_slave_sql_with_master.inc
+#
+# Test semi-sync master will switch OFF after one transaction
+# timeout waiting for slave reply.
+#
+include/stop_slave.inc
+[connection master]
+include/stop_dump_threads.inc
+[ master status should be ON ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+[ semi-sync replication of these transactions will fail ]
+insert into t1 values (500);
+[ master status should be OFF ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+insert into t1 values (100);
+[ master status should be OFF ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+#
+# Test semi-sync status on master will be ON again when slave catches up
+#
+[connection slave]
+[ slave status should be OFF ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+include/start_slave.inc
+[ slave status should be ON ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+select count(distinct a) from t1;
+count(distinct a)
+2
+select min(a) from t1;
+min(a)
+100
+select max(a) from t1;
+max(a)
+500
+[connection master]
+[ master status should be ON again after slave catches up ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	15
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+#
+# Test disable/enable master semi-sync on the fly.
+#
+drop table t1;
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+include/stop_slave.inc
+#
+# Flush status
+#
+[ Semi-sync master status variables before FLUSH STATUS ]
+SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	12
+SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	16
+FLUSH NO_WRITE_TO_BINLOG STATUS;
+[ Semi-sync master status variables after FLUSH STATUS ]
+SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+[connection master]
+show master logs;
+Log_name	master-bin.000001
+File_size	#
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+[ disable semi-sync on the fly ]
+set global rpl_semi_sync_master_enabled=0;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	OFF
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+[ enable semi-sync on the fly ]
+set global rpl_semi_sync_master_enabled=1;
+show variables like 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+rpl_semi_sync_master_enabled	ON
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+#
+# Test RESET MASTER/SLAVE
+#
+[connection slave]
+include/start_slave.inc
+[connection master]
+create table t1 (a int) engine = ENGINE_TYPE;
+drop table t1;
+include/sync_slave_sql_with_master.inc
+show status like 'Rpl_relay%';
+Variable_name	Value
+[ test reset master ]
+[connection master]
+reset master;
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+[connection slave]
+include/stop_slave.inc
+reset slave;
+reset master;
+[connection master]
+include/stop_dump_threads.inc
+include/start_slave.inc
+[connection master]
+create table t1 (a int) engine = ENGINE_TYPE;
+insert into t1 values (1);
+insert into t1 values (2), (3);
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+select * from t1;
+a
+1
+2
+3
+[connection master]
+[ master semi-sync status should be ON ]
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	0
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	3
+#
+# Start semi-sync replication without SUPER privilege
+#
+include/rpl_reset.inc
+[connection master]
+include/stop_dump_threads.inc
+set sql_log_bin=0;
+create user rpl@127.0.0.1 identified by 'rpl';
+grant replication slave on *.* to rpl@127.0.0.1;
+flush privileges;
+set sql_log_bin=1;
+SET @save_show_compatibility_56=@@global.show_compatibility_56;
+SET @@global.show_compatibility_56=OFF;
+[connection slave]
+create user rpl@127.0.0.1 identified by 'rpl';
+grant replication slave on *.* to rpl@127.0.0.1;
+flush privileges;
+change master to master_user='rpl',master_password='rpl';
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+[connection master]
+SET @@global.show_compatibility_56=ON;
+[connection slave]
+include/stop_slave.inc
+[connection master]
+Insert into t1 values (4);
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+[connection slave]
+include/start_slave.inc
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+[connection master]
+SET @@global.show_compatibility_56=@save_show_compatibility_56;
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+[ master semi-sync should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	0
+insert into t1 values (5);
+insert into t1 values (6);
+[ master semi-sync should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+show status like 'Rpl_semi_sync_master_no_tx';
+Variable_name	Value
+Rpl_semi_sync_master_no_tx	1
+show status like 'Rpl_semi_sync_master_yes_tx';
+Variable_name	Value
+Rpl_semi_sync_master_yes_tx	2
+#
+# Test semi-sync slave connect to non-semi-sync master
+#
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+include/stop_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+[connection master]
+include/stop_dump_threads.inc
+[ Semi-sync status on master should be ON ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	0
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	ON
+set global rpl_semi_sync_master_enabled= 0;
+[connection slave]
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+insert into t1 values (8);
+[ master semi-sync clients should be 1, status should be OFF ]
+show status like 'Rpl_semi_sync_master_clients';
+Variable_name	Value
+Rpl_semi_sync_master_clients	1
+show status like 'Rpl_semi_sync_master_status';
+Variable_name	Value
+Rpl_semi_sync_master_status	OFF
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+show status like 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	ON
+include/stop_slave.inc
+[ on master ]
+include/stop_dump_threads.inc
+UNINSTALL PLUGIN rpl_semi_sync_master;
+SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+[connection slave]
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	ON
+include/start_slave.inc
+[connection master]
+insert into t1 values (10);
+include/sync_slave_sql_with_master.inc
+[ on slave ]
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+#
+# Test non-semi-sync slave connect to semi-sync master
+#
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+set global rpl_semi_sync_master_timeout= 60000;
+/* 60s */
+set global rpl_semi_sync_master_enabled= 1;
+[connection slave]
+include/stop_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+[ uninstall semi-sync slave plugin ]
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+include/start_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+include/stop_slave.inc
+[ reinstall semi-sync slave plugin and disable semi-sync ]
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+set global rpl_semi_sync_slave_enabled= 0;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+rpl_semi_sync_slave_enabled	OFF
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+include/start_slave.inc
+SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
+Variable_name	Value
+Rpl_semi_sync_slave_status	OFF
+#
+# Clean up
+#
+include/uninstall_semisync.inc
+include/stop_slave.inc
+change master to master_user='root',master_password='';
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+drop table t1;
+include/sync_slave_sql_with_master.inc
+drop user rpl@127.0.0.1;
+flush privileges;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.result b/mysql-test/suite/rpl/r/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.result
new file mode 100644
index 000000000000..a7b13d183f72
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.result
@@ -0,0 +1,299 @@
+include/rpl_init.inc [topology=1->2, 2->3, 2->4, 2->5, 2->6, 2->7, 2->8, 2->9]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server_1]
+CREATE TABLE t (a int);
+[connection server_2]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync master failed on net_flush.*");
+include/install_semisync_master.inc
+[connection server_3]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_4]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_5]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_6]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_7]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_8]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_9]
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+Variable_name	Value
+CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+include/install_semisync_slave.inc
+[connection server_2]
+SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = 7;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+[connection server_9]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_8]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_7]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_6]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_5]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_4]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_3]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_2]
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/start_slave.inc
+include/stop_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+include/stop_slave.inc
+include/start_slave.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+replication_sender_observe_commit_only = 0;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+replication_sender_observe_commit_only = 1;
+[connection server_1]
+include/rpl_sync.inc
+[connection server_2]
+include/rpl_sync.inc
+include/diff_tables.inc [server_1:t, server_9:t, server_8:t, server_7:t, server_6:t, server_5:t, server_4:t, server_3:t, server_2:t]
+[connection server_9]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_8]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_7]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_6]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_5]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_4]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_3]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_slave.inc
+[connection server_2]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+SET GLOBAL replication_sender_observe_commit_only = 0;
+include/uninstall_semisync_master.inc
+[connection server_1]
+DROP TABLE t;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_server_uuid.result b/mysql-test/suite/rpl/r/rpl_server_uuid.result
index 66f08031f362..a82d73073b69 100644
--- a/mysql-test/suite/rpl/r/rpl_server_uuid.result
+++ b/mysql-test/suite/rpl/r/rpl_server_uuid.result
@@ -62,7 +62,7 @@ include/rpl_restart_server.inc [server_number=1]
 # Master's UUID and server_id will not be cleared if both master_port
 # and master_host are not changed.
 -----------------------------------------------------------------------------
-START SLAVE IO_THREAD;
+include/start_slave_io.inc
 include/wait_for_slave_param.inc [Master_UUID]
 include/stop_slave.inc
 
@@ -72,7 +72,7 @@ include/check_slave_param.inc [Master_UUID]
 include/check_slave_param.inc [Master_Server_Id]
 CHANGE MASTER TO MASTER_PORT= MASTER_PORT,
 MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_POS;
-START SLAVE IO_THREAD;
+include/start_slave_io.inc
 include/wait_for_slave_param.inc [Master_UUID]
 
 # Only change MASTER_HOST
@@ -83,7 +83,7 @@ include/check_slave_param.inc [Master_UUID]
 include/check_slave_param.inc [Master_Server_Id]
 CHANGE MASTER TO MASTER_HOST= '127.0.0.1',
 MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_POS;
-START SLAVE IO_THREAD;
+include/start_slave_io.inc
 include/wait_for_slave_param.inc [Master_UUID]
 
 # Both MASTER_HOST and MASTER_PORT are changed
@@ -94,7 +94,7 @@ include/check_slave_param.inc [Master_UUID]
 include/check_slave_param.inc [Master_Server_Id]
 CHANGE MASTER TO MASTER_HOST= '127.0.0.1', MASTER_PORT= MASTER_PORT,
 MASTER_LOG_FILE= 'MASTER_LOG_FILE', MASTER_LOG_POS= MASTER_POS;
-START SLAVE IO_THREAD;
+include/start_slave_io.inc
 include/wait_for_slave_param.inc [Master_UUID]
 
 # Both MASTER_HOST and MASTER_PORT are NOT changed
diff --git a/mysql-test/suite/rpl/r/rpl_show_processlist_info.result b/mysql-test/suite/rpl/r/rpl_show_processlist_info.result
new file mode 100644
index 000000000000..96d0f0cc1b28
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_show_processlist_info.result
@@ -0,0 +1,14 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+
+==== Test ====
+CREATE USER IF NOT EXISTS 'user1'@'%' IDENTIFIED WITH 'mysql_native_password';
+include/sync_slave_sql_with_master.inc
+
+==== Clean up ====
+[connection master]
+DROP USER IF EXISTS 'user1'@'%';
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_shutdown_with_optimize_for_static_plugin_config.result b/mysql-test/suite/rpl/r/rpl_shutdown_with_optimize_for_static_plugin_config.result
new file mode 100644
index 000000000000..0451b7875567
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_shutdown_with_optimize_for_static_plugin_config.result
@@ -0,0 +1,7 @@
+include/install_semisync_master.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+include/stop_mysqld.inc [server 1]
+# restart
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+include/uninstall_semisync_master.inc
+SET GLOBAL replication_optimize_for_static_plugin_config = REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG;
diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_in.result b/mysql-test/suite/rpl/r/rpl_slave_load_in.result
index ae48e1ca4c05..bbc6ea0c8404 100644
--- a/mysql-test/suite/rpl/r/rpl_slave_load_in.result
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_in.result
@@ -3,7 +3,12 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
-create table t1(a int not null auto_increment, b int, primary key(a));
+# Restart the slave with a different secure path.
+[connection slave]
+include/assert.inc [Datadir is the new secure file path]
+include/start_slave.inc
+[connection master]
+create table t1(a int not null auto_increment, b int, primary key(a)) engine=myisam;
 create table t2(a int not null auto_increment, b int, primary key(a)) engine=innodb;
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 start transaction;
@@ -13,8 +18,12 @@ load data infile '../../std_data/rpl_loaddata.dat' into table t2;
 load data infile '../../std_data/rpl_loaddata.dat' into table t2;
 commit;
 include/sync_slave_sql_with_master.inc
+# Restore the old secure path on slave.
+include/assert.inc [Old secure file path is restored.]
+include/start_slave.inc
 include/diff_tables.inc [master:t1, slave:t1]
 include/diff_tables.inc [master:t2, slave:t2]
+[connection master]
 drop table t1;
 drop table t2;
 include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
index 8d752d71d9cb..30a0dab0b556 100644
--- a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
@@ -6,6 +6,7 @@ Note	####	Storing MySQL user name or password information in the master info rep
 START SLAVE;
 call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory.* Error_code: 12");
 include/wait_for_slave_sql_error.inc [errno=12]
+include/wait_for_slave_io_to_start.inc
 include/stop_slave_io.inc
 RESET SLAVE;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_ssl1.result b/mysql-test/suite/rpl/r/rpl_ssl1.result
index ef46a87c2d69..7fa02d08aade 100644
--- a/mysql-test/suite/rpl/r/rpl_ssl1.result
+++ b/mysql-test/suite/rpl/r/rpl_ssl1.result
@@ -24,14 +24,12 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 start slave;
-insert into t1 values (1);
-select * from t1;
-t
-stop slave;
-include/wait_for_slave_to_stop.inc
+include/wait_for_slave_io_error.inc [errno=1045]
+include/stop_slave_sql.inc
 change master to master_ssl=1 , master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem', master_tls_version='TLSv1.1';
 start slave;
 include/wait_for_slave_to_start.inc
+insert into t1 values (1);
 include/sync_slave_sql_with_master.inc
 select * from t1;
 t
diff --git a/mysql-test/suite/rpl/r/rpl_start_slave_after_restart_initialized_slave.result b/mysql-test/suite/rpl/r/rpl_start_slave_after_restart_initialized_slave.result
new file mode 100644
index 000000000000..9e89fca9b41e
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_start_slave_after_restart_initialized_slave.result
@@ -0,0 +1,23 @@
+include/rpl_init.inc [topology=1->2,3->2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server_2]
+CALL mtr.add_suppression("Error during --relay-log-recovery*");
+CALL mtr.add_suppression("Server was not able to find a rotate event*");
+CALL mtr.add_suppression("Recovery from master pos*");
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=1 --relay-log-recovery=1]
+[connection server_2]
+include/start_slave.inc
+include/rpl_reset.inc
+include/rpl_restart_server.inc [server_number=2 parameters: --skip_slave_start=1 --relay-log-recovery=1]
+[connection server_2]
+include/start_slave.inc
+include/rpl_reset.inc
+include/assert_grep.inc [Found the expected warning line in the error log.]
+include/rpl_end.inc
+RESET SLAVE ALL FOR CHANNEL  'channel_1';
+RESET SLAVE ALL FOR CHANNEL  'channel_3';
diff --git a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
index 1e162f01f1ed..391f29f27ebb 100644
--- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
@@ -122,7 +122,19 @@ BEGIN;
 Got one of the listed errors
 COMMIT;
 include/diff_tables.inc [master:t1,slave:t1]
-######### 8 - Bug#55375(Regression Bug) Transaction bigger than  ##########
+####### 8 - LOAD DATA INFILE INTO TABLE #######
+[connection master]
+CREATE TABLE t6 (a varchar(20)) ENGINE=Innodb;
+LOAD DATA INFILE 'temp_file' INTO TABLE t6;
+ERROR HY000: Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again
+include/assert.inc [assert that the above Event has not been added to binlog]
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [Check that the LOAD DATA didn't add any data into the table]
+[connection master]
+DROP TABLE t6;
+include/sync_slave_sql_with_master.inc
+######### 9 - Bug#55375(Regression Bug) Transaction bigger than  ##########
 #########     max_binlog_cache_size crashes slave                ##########
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_disconnect_drop_temporary_table.result b/mysql-test/suite/rpl/r/rpl_stm_mix_gtid_disconnect_drop_temporary_table.result
similarity index 100%
rename from mysql-test/suite/rpl/r/rpl_gtid_disconnect_drop_temporary_table.result
rename to mysql-test/suite/rpl/r/rpl_stm_mix_gtid_disconnect_drop_temporary_table.result
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave_with_non_transactional_update.result b/mysql-test/suite/rpl/r/rpl_stop_slave_with_non_transactional_update.result
new file mode 100644
index 000000000000..5a046d1ec8f6
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave_with_non_transactional_update.result
@@ -0,0 +1,66 @@
+#
+# 1. Create source-replica topology and initial setup on source.
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+include/sync_slave_sql_with_master.inc
+call mtr.add_suppression("Slave SQL for channel.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
+# Adding debug point 'wait_after_do_update_pos' to @@GLOBAL.debug
+#
+# 2. Execute insert statement followed by STOP SLAVE SQL_THREAD for two
+#    times. Wait for SLAVE_WAIT_GROUP_DONE(60s) after first iteration.
+#
+# 2.1 Execute a statement on source.
+[connection master]
+INSERT INTO t1 (c1) VALUES (1);;
+#
+# 2.2 Verify that applier thread is waiting on debug sync point.
+[connection slave]
+#
+# 2.3 Execute 'stop slave sql_thread' and let it wait
+#     on debug sync point.
+[START] stop slave sql_thread;
+#
+# 2.4 Continue applier thread.
+SET DEBUG_SYNC= 'now SIGNAL signal.after_do_update_pos_continue';
+#
+# 2.5 Continue 'stop slave sql_thread'.
+[END] stop slave sql_thread;
+[connection master]
+[connection slave]
+#
+# 2.6 Execute 'start slave sql_thread'.
+include/start_slave_sql.inc
+#
+# 2.1 Execute a statement on source.
+[connection master]
+INSERT INTO t1 (c1) VALUES (1);;
+#
+# 2.2 Verify that applier thread is waiting on debug sync point.
+[connection slave]
+#
+# 2.3 Execute 'stop slave sql_thread' and let it wait
+#     on debug sync point.
+[START] stop slave sql_thread;
+#
+# 2.4 Continue applier thread.
+SET DEBUG_SYNC= 'now SIGNAL signal.after_do_update_pos_continue';
+#
+# 2.5 Continue 'stop slave sql_thread'.
+[END] stop slave sql_thread;
+[connection master]
+[connection slave]
+# Removing debug point 'wait_after_do_update_pos' from @@GLOBAL.debug
+#
+# 2.6 Execute 'start slave sql_thread'.
+include/start_slave_sql.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+#
+# 3. Cleanup.
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_transaction_write_set_extraction.result b/mysql-test/suite/rpl/r/rpl_transaction_write_set_extraction.result
index 61fa23554888..007780aae221 100644
--- a/mysql-test/suite/rpl/r/rpl_transaction_write_set_extraction.result
+++ b/mysql-test/suite/rpl/r/rpl_transaction_write_set_extraction.result
@@ -3,9 +3,9 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
-include/assert.inc [The value for transaction_write_set_extraction shoudl be MURMUR32]
+include/assert.inc [The value for transaction_write_set_extraction must be XXHASH64]
 CREATE TABLE t1 (a INT PRIMARY KEY);
-SET @@GLOBAL.DEBUG= @debug_saved;
+SET @debug_saved= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert';
 INSERT INTO t1 VALUES(1);
 SET @@GLOBAL.DEBUG= @debug_saved;
@@ -15,6 +15,17 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 include/rpl_sync.inc
 DROP TABLE t1;
 include/rpl_sync.inc
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert_collation';
+INSERT INTO t1 VALUES(1);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_update_collation';
+UPDATE t1 SET a=3 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+include/rpl_sync.inc
+DROP TABLE t1;
+include/rpl_sync.inc
 CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));
 SET @@GLOBAL.DEBUG= @debug_saved;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert';
@@ -26,6 +37,17 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 include/rpl_sync.inc
 DROP TABLE t1;
 include/rpl_sync.inc
+CREATE TABLE t1(a BINARY(1), b BINARY(1), PRIMARY KEY(a, b));
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert_collation';
+INSERT INTO t1 VALUE(1, 2);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_update_collation';
+UPDATE t1 SET a=3 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+include/rpl_sync.inc
+DROP TABLE t1;
+include/rpl_sync.inc
 CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL UNIQUE, c3 INT NOT NULL UNIQUE);
 SET @@GLOBAL.DEBUG= @debug_saved;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert';
@@ -36,6 +58,16 @@ UPDATE t1 SET c1=5 WHERE c1=1;
 include/rpl_sync.inc
 DROP TABLE t1;
 include/rpl_sync.inc
+CREATE TABLE t1 (c1 BINARY(1) PRIMARY KEY, c2 BINARY(1) NOT NULL UNIQUE, c3 BINARY(1) NOT NULL UNIQUE);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert_collation';
+INSERT INTO t1 VALUES (1, 2, 3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_update_collation';
+UPDATE t1 SET c1=5 WHERE c1=1;
+include/rpl_sync.inc
+DROP TABLE t1;
+include/rpl_sync.inc
 CREATE TABLE t1 (a INT, d INT, b INT NOT NULL UNIQUE, c INT NOT NULL UNIQUE, PRIMARY KEY(a, d));
 SET @@GLOBAL.DEBUG= @debug_saved;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert';
@@ -47,6 +79,17 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 include/rpl_sync.inc
 DROP TABLE t1;
 include/rpl_sync.inc
+CREATE TABLE t1 (a BINARY(1), d BINARY(1), b BINARY(1) NOT NULL UNIQUE, c BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(a, d));
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert_collation';
+INSERT INTO t1 VALUES(1, 2, 3, 4);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_update_collation';
+UPDATE t1 SET a=5 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+include/rpl_sync.inc
+DROP TABLE t1;
+include/rpl_sync.inc
 CREATE TABLE t1 (a INT PRIMARY KEY);
 CREATE TABLE t2 (b INT PRIMARY KEY);
 CREATE TABLE t3 (c1 INT, c2 INT NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
@@ -66,4 +109,54 @@ DROP TABLE t3;
 DROP TABLE t2;
 DROP TABLE t1;
 include/rpl_sync.inc
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
+CREATE TABLE t2 (b BINARY(1) PRIMARY KEY);
+CREATE TABLE t3 (c1 BINARY(1), c2 BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (5);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_insert_collation';
+INSERT INTO t3 values(1,5);
+SET @@GLOBAL.DEBUG= @debug_saved;
+INSERT INTO t1 VALUES (3);
+include/rpl_sync.inc
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_update_collation';
+UPDATE t3 SET c1=3 WHERE c1=1;
+include/rpl_sync.inc
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t3;
+DROP TABLE t2;
+DROP TABLE t1;
+include/rpl_sync.inc
+CREATE TABLE t1(a BINARY(1), b BINARY(1), c BINARY(1), PRIMARY KEY (a,b,c));
+CREATE TABLE t2(d BINARY(1), e BINARY(1), f BINARY(1), PRIMARY KEY (d,e,f), CONSTRAINT foreign_key_t2_t1 FOREIGN KEY (d,e,f) REFERENCES t1(a,b,c));
+INSERT INTO t1 VALUES (1,2,3);
+INSERT INTO t1 VALUES (4,2,3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_insert';
+INSERT INTO t2 VALUES (1,2,3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_update';
+UPDATE t2 SET d=4 WHERE d=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t2;
+DROP TABLE t1;
+include/rpl_sync.inc
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY, b BINARY(1) NOT NULL, c BINARY(1) NOT NULL, UNIQUE KEY key_b_c(b,c));
+CREATE TABLE t2 (d BINARY(1) PRIMARY KEY, e BINARY(1) NOT NULL, f BINARY(1) NOT NULL, UNIQUE KEY key_e_f(e,f), FOREIGN KEY(e,f) REFERENCES t1(b,c));
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multiple_column_unique_key_insert';
+INSERT INTO t1 VALUES (1,2,3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+INSERT INTO t1 VALUES (4,5,6);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_insert';
+INSERT INTO t2 VALUES (1,2,3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_update';
+UPDATE t2 SET d=4,e=5,f=6 WHERE d=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t2;
+DROP TABLE t1;
+include/rpl_sync.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_trx_boundary_parser_warning.result b/mysql-test/suite/rpl/r/rpl_trx_boundary_parser_warning.result
index 3a826fddc3a7..85548319861d 100644
--- a/mysql-test/suite/rpl/r/rpl_trx_boundary_parser_warning.result
+++ b/mysql-test/suite/rpl/r/rpl_trx_boundary_parser_warning.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff --git a/mysql-test/suite/rpl/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result
index e0aa43ab3640..b5b71488d134 100644
--- a/mysql-test/suite/rpl/r/rpl_variables.result
+++ b/mysql-test/suite/rpl/r/rpl_variables.result
@@ -146,6 +146,7 @@ Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be r
 SET @@local.sql_mode = 'NO_FIELD_OPTIONS,NO_KEY_OPTIONS,NO_TABLE_OPTIONS';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 INSERT INTO tstmt(text) VALUES (@@global.sql_mode);
 INSERT INTO tstmt(text) VALUES (@@local.sql_mode);
 ---- user variables ----
@@ -543,6 +544,7 @@ Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be r
 EXECUTE p54;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 EXECUTE p55;
 EXECUTE p56;
 EXECUTE p57;
diff --git a/mysql-test/suite/rpl/r/rpl_variables_stm_innodb.result b/mysql-test/suite/rpl/r/rpl_variables_stm_innodb.result
index 88e56df4726d..c2387387186b 100644
--- a/mysql-test/suite/rpl/r/rpl_variables_stm_innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_variables_stm_innodb.result
@@ -475,28 +475,28 @@ id	num	text
 39	19	NULL
 70	13	NULL
 93	17	NULL
-94	NULL	cp1257
-95	NULL	cp1256
-96	NULL	cp1251_ukrainian_ci
-97	NULL	cp1251
-98	NULL	cp1251_bulgarian_ci
-99	NULL	cp1251
-100	NULL	latin7_bin
-101	NULL	latin7
-102	NULL	latin7_general_cs
-103	NULL	latin7
-104	NULL	Europe/Moscow
-105	NULL	Universal
-106	NULL	sv_FI
-107	NULL	no_NO
-108	NULL	latin7_general_ci
-109	NULL	latin7
-110	NULL	latin7_estonian_cs
-111	NULL	latin7
-112	NULL	47114711
-113	NULL	47124712
-114	NULL	1616
-115	NULL	1717
+112	NULL	cp1257
+113	NULL	cp1256
+114	NULL	cp1251_ukrainian_ci
+115	NULL	cp1251
+116	NULL	cp1251_bulgarian_ci
+117	NULL	cp1251
+118	NULL	latin7_bin
+119	NULL	latin7
+120	NULL	latin7_general_cs
+121	NULL	latin7
+122	NULL	Europe/Moscow
+123	NULL	Universal
+124	NULL	sv_FI
+125	NULL	no_NO
+126	NULL	latin7_general_ci
+127	NULL	latin7
+128	NULL	latin7_estonian_cs
+129	NULL	latin7
+130	NULL	47114711
+131	NULL	47124712
+132	NULL	1616
+133	NULL	1717
 include/diff_tables.inc [master:tstmt, master:tproc, master:tfunc, master:ttrig, master:tprep, slave:tstmt, slave:tproc, slave:tfunc, slave:ttrig, slave:tprep]
 ==== Clean up ====
 [on master]
diff --git a/mysql-test/suite/rpl/r/rpl_virtual_gcol.result b/mysql-test/suite/rpl/r/rpl_virtual_gcol.result
index b59bc265c67c..bec8cb5f7c96 100644
--- a/mysql-test/suite/rpl/r/rpl_virtual_gcol.result
+++ b/mysql-test/suite/rpl/r/rpl_virtual_gcol.result
@@ -50,7 +50,6 @@ INSERT INTO gtable(doc) VALUES (NULL);
 UPDATE gtable SET doc = 'POINT(4 4)' where doc IS NULL;
 UPDATE gtable SET doc = NULL WHERE ST_X(ST_GEOMFROMTEXT(doc)) = 4;
 include/sync_slave_sql_with_master.inc
-# Cleanup
 [connection master]
 DROP TABLE gtable;
 include/sync_slave_sql_with_master.inc
@@ -65,5 +64,46 @@ include/sync_slave_sql_with_master.inc
 [connection master]
 DROP TABLE gtable;
 include/sync_slave_sql_with_master.inc
+[connection master]
+CREATE TABLE gtable(geo GEOMETRY, gcol GEOMETRY AS (GEOMETRYCOLLECTION(geo, geo)));
+INSERT INTO gtable (geo) VALUES (POINT(1, 1));
+include/sync_slave_sql_with_master.inc
+[connection master]
+UPDATE gtable SET geo = LINESTRING(POINT(1, 1), POINT(2, 2));
+include/sync_slave_sql_with_master.inc
+[connection master]
+DROP TABLE gtable;
+include/sync_slave_sql_with_master.inc
+SET @slave_parallel_type_saved= @@GLOBAL.SLAVE_PARALLEL_TYPE;
+SET @slave_parallel_workers_saved= @@GLOBAL.SLAVE_PARALLEL_WORKERS;
+SET @slave_preserver_commit_order_saved= @@GLOBAL.SLAVE_PRESERVE_COMMIT_ORDER;
+include/stop_slave.inc
+SET GLOBAL slave_parallel_type= 'LOGICAL_CLOCK';
+SET GLOBAL slave_parallel_workers= 4;
+SET GLOBAL slave_preserve_commit_order= ON;
+include/start_slave.inc
+CALL mtr.add_suppression("This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'");
+[connection master]
+CREATE TABLE gtable(id INT, jd JSON, td TEXT,
+gcol JSON AS (JSON_OBJECT(id,jd,JSON_KEYS(jd),td)));
+INSERT INTO gtable(id,jd,td) VALUES(100, '{"a":1}', 'characters');
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:gtable, slave:gtable]
+[connection master]
+UPDATE gtable SET jd = JSON_REPLACE(jd, '$[0].a',"a");
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:gtable, slave:gtable]
+[connection master]
+UPDATE gtable SET jd= JSON_SET(jd, '$.key', '["h","e","l","l","o"]');
+include/sync_slave_sql_with_master.inc
+include/diff_tables.inc [master:gtable, slave:gtable]
+[connection master]
+DROP TABLE gtable;
+include/sync_slave_sql_with_master.inc
 SET @@global.slave_rows_search_algorithms= @saved_slave_rows_search_algorithms;
+include/stop_slave.inc
+SET @@GLOBAL.SLAVE_PARALLEL_TYPE= @slave_parallel_type_saved;
+SET @@GLOBAL.SLAVE_PARALLEL_WORKERS= @slave_parallel_workers_saved;
+SET @@GLOBAL.SLAVE_PRESERVE_COMMIT_ORDER= @slave_preserver_commit_order_saved;
+include/start_slave.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_writeset_add_unique_key.result b/mysql-test/suite/rpl/r/rpl_writeset_add_unique_key.result
new file mode 100644
index 000000000000..b4d7053cbfe6
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_writeset_add_unique_key.result
@@ -0,0 +1,68 @@
+include/only_with_option.inc [GLOBAL.slave_transaction_retries > 2]
+#
+# 1. Create source-replica topology.
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+#
+# 2. Save the current variable values.
+SET @old_binlog_row_image= @@binlog_row_image;
+[connection master]
+# 3. Setup neccesary variables on source.
+# 3.1 Set the binlog_row_image to MINIMAL on source.
+CON: 'master', IMG: 'MINIMAL', RESTART SLAVE: 'N'
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	MINIMAL
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET SESSION TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = WRITESET;
+#
+# 4. Create table and procedure on source.
+CREATE TABLE t( a tinyint unsigned primary key, b tinyint, c int, d bigint,
+f char(10), g char(255), h text, i longtext, unique key(g,f),
+unique key(f,c), key(c,d,b), key(i(10),f(10),b)) ENGINE=InnoDB;
+drop procedure if exists p;
+Warnings:
+Note	1305	PROCEDURE test.p does not exist
+create procedure p(p_i bigint)
+begin
+declare v_i bigint default 0;
+repeat
+replace into t values(
+floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5),
+floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5)
+),
+(
+floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5),
+floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5)
+);
+set v_i=v_i+1;
+until v_i > p_i end repeat;
+end|
+#
+#
+# 5. Switch to source and call procedure.
+[connection master]
+call p(1000);
+include/sync_slave_sql_with_master.inc
+#
+# 6. Clear system variables on source.
+#
+[connection master]
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = OLD_TRX_TRACKER;
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = OLD_TRX_WRITE_SET_EXTRACTION_GLOBAL;
+SET SESSION TRANSACTION_WRITE_SET_EXTRACTION = OLD_TRX_WRITE_SET_EXTRACTION_SESSION;
+[connection slave]
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
+[connection master]
+DROP TABLE t;
+DROP PROCEDURE p;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_xa_with_filters_binlogless_slave.result b/mysql-test/suite/rpl/r/rpl_xa_with_filters_binlogless_slave.result
new file mode 100644
index 000000000000..23fe9dcdb08c
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_xa_with_filters_binlogless_slave.result
@@ -0,0 +1,33 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection master]
+CREATE TABLE t1 (a INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+CALL mtr.add_suppression(".*You need to use --log-bin to make --binlog-format work.*");
+CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
+CALL mtr.add_suppression(".*The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave.*");
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=(test.t1);
+include/start_slave_sql.inc
+[connection master]
+XA START '1';
+INSERT INTO t1 VALUES (1);
+XA END '1';
+XA PREPARE '1';
+XA COMMIT '1';
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=3227]
+START SLAVE SQL_THREAD;
+include/wait_for_slave_sql_error.inc [errno=3227]
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=();
+include/start_slave_sql.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [table 'test.t1' record count must be 1]
+include/assert_grep.inc [Found error message regarding usage of replication filters with XA transactions]
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_xa_with_filters_error_msg.result b/mysql-test/suite/rpl/r/rpl_xa_with_filters_error_msg.result
new file mode 100644
index 000000000000..af6898392d4d
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_xa_with_filters_error_msg.result
@@ -0,0 +1,33 @@
+include/master-slave.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection master]
+[connection master]
+CREATE TABLE t1 (a INT);
+include/sync_slave_sql_with_master.inc
+include/stop_slave_sql.inc
+CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
+CALL mtr.add_suppression(".*The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave.*");
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=(test.t1);
+include/start_slave_sql.inc
+[connection master]
+XA START '1';
+INSERT INTO t1 VALUES (1);
+XA END '1';
+XA PREPARE '1';
+XA COMMIT '1';
+[connection slave]
+include/wait_for_slave_sql_error.inc [errno=3227]
+START SLAVE SQL_THREAD;
+include/wait_for_slave_sql_error.inc [errno=3227]
+include/assert_binlog_events.inc [Gtid/SET.* # Query/use.* # Gtid/SET.* # Query/XA START.* # Table_map/.* # Write_rows/.* # Query/XA END.* # XA_prepare/XA PREPARE.* # Gtid/SET.* # Query/XA COMMIT.*]
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=();
+include/start_slave_sql.inc
+[connection master]
+include/sync_slave_sql_with_master.inc
+include/assert.inc [table 'test.t1' record count must be 1]
+include/assert_grep.inc [Found error message regarding usage of replication filters with XA transactions]
+[connection master]
+DROP TABLE t1;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/mysqldump_bug33630199.cnf b/mysql-test/suite/rpl/t/mysqldump_bug33630199.cnf
new file mode 100644
index 000000000000..969fb515e6cd
--- /dev/null
+++ b/mysql-test/suite/rpl/t/mysqldump_bug33630199.cnf
@@ -0,0 +1,6 @@
+!include ../my.cnf
+
+[mysqld]
+gtid-mode=on
+enforce-gtid-consistency
+server-id=100
diff --git a/mysql-test/suite/rpl/t/mysqldump_bug33630199.opt b/mysql-test/suite/rpl/t/mysqldump_bug33630199.opt
new file mode 100644
index 000000000000..cef79bc8585a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/mysqldump_bug33630199.opt
@@ -0,0 +1 @@
+--force-restart
diff --git a/mysql-test/suite/rpl/t/mysqldump_bug33630199.test b/mysql-test/suite/rpl/t/mysqldump_bug33630199.test
new file mode 100644
index 000000000000..907979997745
--- /dev/null
+++ b/mysql-test/suite/rpl/t/mysqldump_bug33630199.test
@@ -0,0 +1,137 @@
+# ===== Purpose =====
+#
+# 1) The purpose of this test is to check if the GTIDs, and the data dumped
+#    by mysqldump are consistent. Especially the case when the server has
+#    GTIDs enabled, and there are transactions running in the background,
+#    during the dump.
+# 2) We've to also make sure that the dump file can be restored on a
+#    GTID aware server.
+#
+# ===== Implementation =====
+#
+# Consists of 2 steps
+#
+# - Step 1 -
+# 1) Create a test table 't', in database 'db'
+# 2) Create a stored procedure, which will be called just before mysqldump
+#    is executed. This will help us to mimick a scenario in which there are
+#    transactions going on in the background, while mysqldump is dumping
+#    the databases.
+# 3) Call the procedure, then start mysqldump just after that
+#
+# - Step 2 -
+# 5) Now restore the dump file to the replica
+# 6) Execute some statements on the source
+# 7) Sync source, and replica
+# 8) The replica's GTID_EXECUTED must be equal to the source's one
+#
+# ===== Requirements =====
+#
+# 1) The dump captured by mysqldump with --single-transaction and
+#    set-gtid-purged=ON must contain the exact set of transaction GTIDs
+#    that were extracted.
+# 2) The dump file can be restored without any issue
+# 3) The replication is working fine
+# 4) The replica's GTID_EXECUTED must be equal to the source's one
+#    when replication catches up.
+#
+# ===== References =====
+#
+# Bug#33630199 : mysqldump make a non-consistent backup with
+#                --single-transaction option
+
+--source include/have_binlog_format_row.inc
+--source include/have_gtid.inc
+--let $rpl_gtid_utils= 1
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+# Step 1
+# Running mysqldump, and inserting data into the tables at the same time
+
+# File, which is going to be used by mysqldump
+let $mysqldumpfile = $MYSQLTEST_VARDIR/tmp/bug33630199_dump.sql;
+
+# Create test db
+CREATE DATABASE db;
+USE db;
+# Create test table
+CREATE TABLE t(num INT, num2 INT);
+
+# Create the stored procedure.
+# We need to keep on sending insert statements to the server,
+# while on the other session, mysqldump is dumping the data.
+DELIMITER $;
+
+CREATE PROCEDURE insertParallely()
+BEGIN
+ DECLARE counter INT DEFAULT 1;
+ WHILE counter <= 1000 DO
+  INSERT INTO db.t VALUES(counter, 1);
+  SET counter = counter + 1;
+ END WHILE;
+END$
+
+DELIMITER ;$
+
+# Start sending insert statements
+--send CALL insertParallely();
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+# Dump on fast machines could be empty.
+# Make sure that somethings inserted.
+--let $wait_condition= SELECT COUNT(*) > 10 FROM db.t
+--source include/wait_condition.inc
+
+--exec $MYSQL_DUMP --compact --single-transaction --set-gtid-purged=ON -ER --databases db > $mysqldumpfile
+
+--source include/rpl_connection_master.inc
+
+--reap
+
+# End of Step 1
+
+# Step 2
+# Restoring the dump file, and syncing source-replica
+
+--source include/rpl_connection_slave.inc
+
+--exec $MYSQL_SLAVE --force < $mysqldumpfile
+--remove_file $mysqldumpfile
+
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+
+# Make sure that replication is working.
+# Execute an UPDATE that updates all the table data.
+# If some data is missing from the dump but not from the GTID set,
+# replication errors will occur.
+UPDATE db.t SET num2=2 WHERE num2=1;
+
+--let $source_gtid_executed=`SELECT @@GLOBAL.gtid_executed`
+
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_slave.inc
+
+# Count the rows in 't' with num2=2 on replica, must be 1000
+--let $row_count = `SELECT 1000 = (SELECT COUNT(*) FROM db.t WHERE num2=2)`
+--let $assert_text= The row count with num2=2 must be 1000 on replica
+--let $assert_cond= $row_count
+--source include/assert.inc
+
+# GTID_EXECUTED must be equal for both source and replica.
+--let $is_equal= `SELECT GTID_IS_EQUAL('$source_gtid_executed', @@GLOBAL.gtid_executed)`
+--let $assert_text= The replica's GTID_EXECUTED must be equal to the source's one
+--let $assert_cond= $is_equal
+--source include/assert.inc
+
+--source include/rpl_connection_master.inc
+DROP DATABASE db;
+
+--source include/rpl_end.inc
+
+# End of Step 2
diff --git a/mysql-test/suite/rpl/t/rpl_alter_user.test b/mysql-test/suite/rpl/t/rpl_alter_user.test
index 647e1cb8c98a..22b241ca93a9 100644
--- a/mysql-test/suite/rpl/t/rpl_alter_user.test
+++ b/mysql-test/suite/rpl/t/rpl_alter_user.test
@@ -32,7 +32,7 @@ SET @@session.sql_mode= (select replace(@@session.sql_mode,'NO_BACKSLASH_ESCAPES
 
 --connection master
 SET GLOBAL DEBUG= '+d,force_hash_string_with_quote';
-CREATE USER 'user1'@'localhost' IDENTIFIED WITH sha256_password AS 'auth_string1';
+CREATE USER 'user1'@'localhost' IDENTIFIED WITH sha256_password BY 'auth_string1';
 # Save master position
 --let $saved_master_pos= query_get_value('SHOW MASTER STATUS', Position, 1)
 SET PASSWORD FOR 'user1'@'localhost' = 'auth_secret';
diff --git a/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test b/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
index 49a0e41ff84b..b3a6ac09c7bc 100644
--- a/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
+++ b/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
@@ -56,6 +56,11 @@ call mtr.add_suppression("The slave coordinator and worker threads are stopped")
 --source include/wait_for_slave_sql_error.inc
 
 # Reset slave.
+# On slower machines, when the SQL thread is killed due to error
+# ER_CANT_SET_GTID_NEXT_TO_GTID_WHEN_GTID_MODE_IS_OFF, it may happen that the IO
+# thread is also killed while it is still reading events from the binlog.
+--let $slave_io_errno= 2013 #CR_SERVER_LOST
+--let $rpl_allow_error= 1
 --source include/stop_slave.inc
 RESET MASTER;
 RESET SLAVE;
diff --git a/mysql-test/suite/rpl/t/rpl_apply_binlog_with_same_server_id.test b/mysql-test/suite/rpl/t/rpl_apply_binlog_with_same_server_id.test
new file mode 100644
index 000000000000..61f0382b71ab
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_apply_binlog_with_same_server_id.test
@@ -0,0 +1,62 @@
+# ==== Purpose ====
+#
+# This test verifies that when replicate_same_server_id=1 then there should
+# not be any conflicts applying binary log files as relay log files in a
+# server that has the same server id as the server id in the files.
+#
+# ==== Implementation ====
+#
+# 1) Supress a warning.
+# 2) Initialize source datadir path.
+# 3) Stop the server.
+# 4) Rename the already executed and saved binary logs to relay
+#    logs and copy them to the data dir.
+# 5) Restart the server.
+# 6) start replica.
+# 7) Wait for replica to finish.
+# 8) Cleanup.
+#
+# ==== References ====
+#
+# Bug#27492990 PARALLEL REPLICATION ALWAYS FAILS WITH SPECIFIC WORKLOAD FROM SYSBENCH
+#
+
+# This test requires row format binlogging.
+--source include/have_binlog_format_row.inc
+--source include/have_gtid.inc
+--source include/only_mts_slave_parallel_workers.inc
+--source include/only_mts_slave_parallel_type_logical_clock.inc
+
+# 1) Supress a warning.
+call mtr.add_suppression("using --replicate-same-server-id in conjunction with --log-replica-updates would lead to infinite loops in this server.");
+
+# 2) Initialize source data dir path.
+--let $master_datadir= `select @@datadir`
+
+# 3) Stop Server.
+--source include/shutdown_mysqld.inc
+
+# 4) Rename the already executed and saved binary logs to relay logs and copy them to data dir.
+--copy_file $MYSQL_TEST_DIR/std_data/replicated-bin.000001 $master_datadir/replicate-relay-bin.000001
+--copy_file $MYSQL_TEST_DIR/std_data/replicated-bin.000002 $master_datadir/replicate-relay-bin.000002
+--copy_file $MYSQL_TEST_DIR/std_data/replicated-bin.index $master_datadir/replicate-relay-bin.index
+
+# 5) Restart the server.
+--let $restart_parameters="restart: --replicate-same-server-id=1 --server_id=1 --relay-log=replicate-relay-bin"
+--source include/start_mysqld.inc
+
+# 6) Start replica.
+SET GLOBAL RELAY_LOG_PURGE=OFF;
+CHANGE MASTER TO RELAY_LOG_FILE='replicate-relay-bin.000001', RELAY_LOG_POS=1, MASTER_HOST='dummy';
+START SLAVE SQL_THREAD;
+
+# 7) Wait for replica to finish.
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= = 'Slave has read all relay log; waiting for more updates'
+--source include/wait_show_condition.inc
+
+# 8) Cleanup.
+SET GLOBAL RELAY_LOG_PURGE=ON;
+STOP SLAVE SQL_THREAD;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
diff --git a/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-master.opt b/mysql-test/suite/rpl/t/rpl_binlog_format_errors-master.opt
similarity index 100%
rename from mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-master.opt
rename to mysql-test/suite/rpl/t/rpl_binlog_format_errors-master.opt
diff --git a/mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-slave.opt b/mysql-test/suite/rpl/t/rpl_binlog_format_errors-slave.opt
similarity index 100%
rename from mysql-test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-slave.opt
rename to mysql-test/suite/rpl/t/rpl_binlog_format_errors-slave.opt
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_format_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_format_errors.test
new file mode 100644
index 000000000000..1ef3094f4ab5
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_format_errors.test
@@ -0,0 +1,447 @@
+# ==== Purpose ====
+# The purpose of this script is to test that binary logging returns an error
+# when its format is incompatible with the statement to be logged and to verify
+# the correctness of the error message.
+#
+# ==== Requirements ====
+# For the conditions 1 to 7 listed in the comments section of method
+# decide_logging_format() verify that binary logging returns the proper error or
+# warning.
+#
+# R1. When both row-incapable and statement-incapable storage engines are
+#     involved then binary logging returns error
+#     `ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE`.
+# R2. When binlog_format = ROW and the SQL statement contains a table stored in
+#     a engine limited to statement-logging then binary logging returns error
+#      `ER_BINLOG_ROW_MODE_AND_STMT_ENGINE`.
+# R3. When binlog_format = ROW and a row is injected in a engine limited to
+#     statement-logging then binary_log returns error
+#     `ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE`.
+# R4. When binlog_format = MIXED, the SQL statement is unsafe and the storage
+#     engine is limited to statement-logging then binary logs returns error
+#     `ER_BINLOG_UNSAFE_AND_STMT_ENGINE`.
+# R5. When binlog_format = STATEMENT and the SQL statement contains a table
+#     stored in a engine limited to row-logging then binary log returns error
+#     `ER_BINLOG_STMT_MODE_AND_ROW_ENGINE`.
+# R6. When binlog_format = STATEMENT and a row is injected then binary logging
+#     returns error `ER_BINLOG_ROW_INJECTION_AND_STMT_MODE`.
+# R7. When binlog_format = STATEMENT and the SQL statement is unsafe then a
+#     warning is returned.
+#
+# ==== Implementation ====
+#
+# TC1. Verify that when both row-incapable and statement-incapable storage
+# engines are involved in a SQL statement then binary logging returns the
+# error `ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = ROW :
+# 1) Create a trigger which inserts data on a row-only table upon insertion of
+#    data in statement-only table.
+# 2) Try to insert data in the statement-only table.
+# 3) Verify that error `ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE` is returned.
+# 4) Verify that no data was inserted in the statement-only table.
+# 5) Verify that no data was inserted in the row-only table.
+#
+# TC2. Verify that when binlog_format = ROW and the SQL statement contains a
+#      table stored in a engine limited to statement-logging then binary logging
+#      returns the error `ER_BINLOG_ROW_MODE_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = ROW :
+#
+# 1) Try to insert data in a statement-only table.
+# 2) Verify that `ER_BINLOG_ROW_MODE_AND_STMT_ENGINE` is returned.
+# 3) Verify that no data was inserted in the statement-only table.
+#
+# TC3. Verify that when binlog_format = ROW and the SQL statement modifies data
+#      of a table stored on the slave server in a engine limited to
+#      statement-logging then binary logging returns the error
+#      `ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = ROW :
+# 1) On the master server insert data in a table which is stored in the slave as
+#    statement-only.
+# 2) On the slave server verify that error
+#    `ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE` is returned.
+# 3) On the slave server verify that no data was inserted in the
+#    statement-only table.
+#
+# TC4. Verify that when binlog_format = ROW and a row is injected in a table
+#      stored in a engine limited to statement-logging then binary logging
+#      returns the error
+#      `ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = ROW :
+# 1) Execute a BINLOG statement which inserts data in a
+#    statement-only table.
+# 2) Verify that error `ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE` is returned.
+# 3) Verify that no data was inserted in the statement-only
+#    table.
+#
+# TC5. Verify that when binlog_format = MIXED, the SQL statement is unsafe and
+#      the storage engine is limited to statement-logging then binary logging
+#      returns the error `ER_BINLOG_UNSAFE_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = MIXED :
+# 1) Try to execute an unsafe statement on a statement-only table.
+# 2) Verify that error `ER_BINLOG_UNSAFE_AND_STMT_ENGINE` is returned.
+# 3) Verify that no data was inserted in the statement-only table.
+#
+# TC6. Verify that when binlog_format = MIXED and a multi-unsafe statement is
+#      executed in a table stored in a engine limited to statement-logging then
+#      binary logging returns the error `ER_BINLOG_UNSAFE_AND_STMT_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = MIXED :
+# 1) Try to execute a multi-unsafe statement in a statement-only table.
+# 2) Verify that error `ER_BINLOG_UNSAFE_AND_STMT_ENGINE` is returned.
+# 3) Verify that no data was inserted in the statement-only table.
+#
+# TC7. Verify that when binlog_format = STATEMENT and the SQL statement modifies
+#      a table stored in INNODB engine as row-only then binary logging returns
+#      the error `ER_BINLOG_STMT_MODE_AND_ROW_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Try to insert data on table stored in INNODB as row-only.
+# 2) Verify that error `ER_BINLOG_STMT_MODE_AND_ROW_ENGINE` is returned.
+# 3) Verify that no data was inserted in the table.
+#
+# TC8. Verify that when binlog_format = STATEMENT and the default database is
+#      ignored by binary logging no error is returned if the SQL statement
+#      modifies a table stored in INNODB as row-only.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Set the default database to a database which is ignored by binary logging.
+# 2) Insert data in the table stored in INNODB as row-only.
+# 3) Verify that data was inserted.
+#
+# TC9. Verify that when binlog_format = STATEMENT and the SQL statement modifies
+#      a table stored in a row-only engine then binary logging returns the error
+#      `ER_BINLOG_STMT_MODE_AND_ROW_ENGINE`.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT:
+# 1) Try to insert data in a table stored in a row-only engine.
+# 2) Verify that error `ER_BINLOG_STMT_MODE_AND_ROW_ENGINE` is returned.
+# 3) Verify that no data was inserted in the row-only table.
+#
+# TC10. Verify that when binlog_format = STATEMENT and the default database is
+#       ignored by binary logging no error is returned if the SQL statement
+#       modifies a table stored in a row-only engine.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Set the default database to a database which is ignored by binary logging.
+# 2) Insert data in a table stored in the row-only engine.
+# 3) Verify that data was inserted.
+#
+# TC11. Verify that when binlog_format = STATEMENT and a row is injected then
+#       binary logging returns the error `ER_BINLOG_ROW_INJECTION_AND_STMT_MODE`.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Execute a BINLOG statement which inserts data.
+# 2) Verify that error `ER_BINLOG_ROW_INJECTION_AND_STMT_MODE` is returned.
+# 3) Verify that no data was inserted.
+#
+# TC12. Verify that when binlog_format = STATEMENT and the default database is
+#       ignored by binary logging no error is returned for row injection.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Set the default database to a database which is ignored by binary logging.
+# 2) Execute a BINLOG statement which inserts data.
+# 3) Verify that data was inserted.
+#
+# TC13. Verify that when binlog_format = STATEMENT and the SQL statement is
+#       unsafe then a warning is returned.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Execute a unsafe SQL statement.
+# 2) Verify that warning is returned.
+# 3) Verify that data was inserted.
+#
+# TC14. Verify that when binlog_format = STATEMENT and the default database is
+#       ignored by binary logging no warning is returned for an SQL unsafe
+#       statement.
+# ------------------------------------------------------------------
+# With binlog_format = STATEMENT :
+# 1) Set the default database to a database which is ignored by binary logging.
+# 2) Execute a unsafe statement.
+# 3) Verify that no warning is returned.
+# 4) Verify that data was inserted.
+#
+# TC15. Verify that when binlog_format = STATEMENT, a row is injected in the
+#       master server having binlog_format = MIXED and the slave server has
+#       binlog_format = STATEMENT then binary returns the error
+#       `ER_BINLOG_ROW_INJECTION_AND_STMT_MODE`.
+# ------------------------------------------------------------------
+# With binlog_format = MIXED for the master server and binlog_format = STATEMENT
+# for the slave server
+# 1) On the master server execute a BINLOG statement which injects a row.
+# 2) Verify that on the slave server the error
+#    `ER_BINLOG_ROW_INJECTION_AND_STMT_MODE` is returned.
+# 3) Verify that no data was inserted in the slave server.
+#
+# ==== References ====
+# BUG#39934: Slave stops for engine that only support row-based logging
+# BUG#42829: binlogging enabled for all schemas regardless of binlog-do-db /
+# binlog-ignore-db
+#
+# ==== Related test cases ====
+#
+# binlog.binlog_unsafe verifies more thoroughly that a warning is
+# given for the case when an unsafe statement is executed and
+# binlog_format = STATEMENT.
+#
+# ndb_rpl.ndb_rpl_binlog_format_errors verifies that a binlog error is issued
+# if more than one engine is involved in a statement and at least one is doing
+# it's own logging (is *self-logging*), which is the case for NDB engine.
+
+# Need debug so that 'SET @@session.debug' works.
+--source include/have_debug.inc
+# Need example plugin because it is the only statement-only engine.
+# Dynamic loading of Example does not work on Windows currently.
+--source include/not_windows.inc
+--source include/have_example_plugin.inc
+# The test changes binlog_format, so there is no reason to run it
+# under more than one binlog format.
+--source include/have_binlog_format_row.inc
+# Disable multi threaded slave since an error in a worker slave leads to an
+# upper-level error in the coordinator
+--source include/not_mts_slave_parallel_workers.inc
+# The test does not support group replication plugin since binlog_format is
+# not equal to 'ROW' for some test cases
+--source include/not_group_replication_plugin.inc
+# The test requires MyISAM engine
+--source include/have_myisam.inc
+# Test requires GTIDs off
+--source include/not_gtid_enabled.inc
+
+--source include/master-slave.inc
+
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since binlog_format = STATEMENT");
+CALL mtr.add_suppression("Cannot execute statement: impossible to write to binary log");
+--enable_query_log
+
+--echo ==== Initialize ====
+
+--echo [on slave]
+--source include/rpl_connection_slave.inc
+
+SET @old_binlog_format= @@global.binlog_format;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+
+--echo [on master]
+--source include/rpl_connection_master.inc
+
+SET @old_binlog_format= @@global.binlog_format;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+
+CREATE TABLE t (a VARCHAR(100)) ENGINE = MYISAM;
+CREATE TABLE t_row (a VARCHAR(100)) ENGINE = INNODB;
+CREATE TABLE t_stmt (a VARCHAR(100)) ENGINE = EXAMPLE;
+CREATE TABLE t_slave_stmt (a VARCHAR(100)) ENGINE = MYISAM;
+CREATE TABLE t_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
+CREATE TABLE t_double_autoinc (a INT KEY AUTO_INCREMENT) ENGINE = MYISAM;
+
+--eval CREATE TRIGGER trig_autoinc BEFORE INSERT ON t_autoinc FOR EACH ROW BEGIN INSERT INTO t_stmt VALUES ('x'); END
+--eval CREATE TRIGGER trig_double_autoinc BEFORE INSERT ON t_double_autoinc FOR EACH ROW BEGIN INSERT INTO t_autoinc VALUES (NULL); END
+
+CREATE DATABASE other;
+
+# This makes the innodb table row-only
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+
+--echo [on slave]
+--source include/sync_slave_sql_with_master.inc
+
+DROP TABLE t_slave_stmt;
+CREATE TABLE t_slave_stmt (a INT) ENGINE = EXAMPLE;
+
+--echo [on master]
+--source include/rpl_connection_master.inc
+
+# This is a format description event.  It is needed because any BINLOG
+# statement containing a row event must be preceded by a BINLOG
+# statement containing a format description event.
+BINLOG '
+1gRVSg8BAAAAZgAAAGoAAAABAAQANS4xLjM2LWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAADWBFVKEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+
+
+--echo ==== Test ====
+
+--echo ---- binlog_format='row' ----
+
+
+--echo * TC1: Modify both row-only and stmt-only table
+--eval CREATE TRIGGER trig_2 AFTER INSERT ON t_stmt FOR EACH ROW BEGIN INSERT INTO t_row VALUES(1); END
+--error ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE
+INSERT INTO t_stmt VALUES (1);
+SELECT * FROM t_stmt /* should be empty */;
+SELECT * FROM t_row /* should be empty */;
+DROP TRIGGER trig_2;
+
+--echo * TC2: Stmt-only table and binlog_format='row'
+--error ER_BINLOG_ROW_MODE_AND_STMT_ENGINE
+INSERT INTO t_stmt VALUES (1);
+SELECT * FROM t_stmt /* should be empty */;
+
+--echo * TC3: Row injection and stmt-only table: in slave sql thread
+INSERT INTO t_slave_stmt VALUES (1);
+--echo [on slave]
+--source include/rpl_connection_slave.inc
+# 1664 = ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE
+--let $slave_sql_errno= 1664
+--let $show_slave_sql_error= 1
+--source include/wait_for_slave_sql_error_and_skip.inc
+--source include/rpl_connection_slave.inc
+SELECT * FROM t_slave_stmt /* should be empty */;
+
+--echo [on master]
+--source include/rpl_connection_master.inc
+--echo * TC4: Row injection and stmt-only table: use BINLOG statement
+# This is a Table_map_event and a Write_rows_event. Together, they are
+# equivalent to 'INSERT INTO t_stmt VALUES (1)'
+--error ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE
+BINLOG '
+1gRVShMBAAAALwAAAEABAAAAABcAAAAAAAAABHRlc3QABnRfc3RtdAABDwJkAAE=
+1gRVShcBAAAAIAAAAGABAAAQABcAAAAAAAEAAf/+ATE=
+';
+SELECT * FROM t_stmt /* should be empty */;
+
+
+--echo ---- binlog_format=mixed ----
+
+--echo [on slave]
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+SET @@global.binlog_format = MIXED;
+--source include/start_slave.inc
+--echo [on master]
+--source include/rpl_connection_master.inc
+SET @@global.binlog_format = MIXED;
+SET @@session.binlog_format = MIXED;
+
+--echo * TC5: Unsafe statement and stmt-only engine
+--error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
+INSERT INTO t_stmt VALUES (UUID());
+SELECT * FROM t_stmt; /* should be empty */;
+
+# Concatenate two unsafe values, and then concatenate NULL to
+# that so that the result is NULL and we instead use autoinc.
+--echo * TC6: Multi-unsafe statement and stmt-only engine
+--error ER_BINLOG_UNSAFE_AND_STMT_ENGINE
+INSERT INTO t_double_autoinc SELECT CONCAT(UUID(), @@hostname, NULL) FROM mysql.general_log LIMIT 1;
+SELECT * FROM t_double_autoinc; /* should be empty */;
+
+
+--echo ---- binlog_format=statement ----
+
+--echo [on slave]
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+SET @@global.binlog_format = STATEMENT;
+--source include/start_slave.inc
+--echo [on master]
+--source include/rpl_connection_master.inc
+SET @@global.binlog_format = STATEMENT;
+SET @@session.binlog_format = STATEMENT;
+
+--echo * TC7: Row-only engine and binlog_format=statement: innodb-specific message
+--error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE
+INSERT INTO t_row VALUES (1);
+SELECT * FROM t_row /* should be empty */;
+
+--echo * TC8: Same statement, but db filtered out - no error
+USE other;
+INSERT INTO test.t_row VALUES (1);
+USE test;
+SELECT * FROM t_row /* should contain the value 1 */;
+USE other;
+DELETE FROM test.t_row;
+USE test;
+
+--echo * TC9: Row-only engine and binlog_format=statement: generic message
+SET @@session.debug= '+d,no_innodb_binlog_errors';
+--error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE
+INSERT INTO t_row VALUES (1);
+SELECT * FROM t_row /* should be empty */;
+
+--echo * TC10: Same statement, but db filtered out - no error
+USE other;
+INSERT INTO test.t_row VALUES (1);
+USE test;
+SET @@session.debug= '';
+SELECT * FROM t_row /* should contain the value 1 */;
+
+--echo * TC11: Row injection and binlog_format=statement: BINLOG statement
+# This is a Table_map_event and a Write_rows_event. Together, they are
+# equivalent to 'INSERT INTO t VALUES (1)'.
+--error ER_BINLOG_ROW_INJECTION_AND_STMT_MODE
+BINLOG '
+cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
+cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
+';
+SELECT * FROM t /* should be empty */;
+
+--echo * TC12: Same statement, but db filtered out - no error
+# This is a Table_map_event and a Write_rows_event. Together, they are
+# equivalent to 'INSERT INTO t VALUES (1)'.
+USE other;
+BINLOG '
+cNpVShMBAAAAKgAAADYBAAAAABcAAAAAAAAABHRlc3QAAXQAAQ8CZAAB
+cNpVShcBAAAAIAAAAFYBAAAQABcAAAAAAAEAAf/+ATE=
+';
+USE test;
+SELECT * FROM t /* should contain the value 1 */;
+DELETE FROM t;
+
+--echo * TC13: Unsafe statement and binlog_format=statement
+# This will give a warning.
+INSERT INTO t VALUES (COALESCE(1, UUID()));
+SELECT * FROM t /* should contain the value 1 */;
+DELETE FROM t;
+
+--echo * TC14: Same statement, but db filtered out - no message
+USE other;
+INSERT INTO test.t VALUES (COALESCE(1, UUID()));
+USE test;
+SELECT * FROM t /* should contain the value 1 */;
+DELETE FROM t;
+
+
+--echo ---- master: binlog_format=mixed, slave: binlog_format=statement ----
+
+SET @@global.binlog_format = MIXED;
+SET @@session.binlog_format = MIXED;
+
+--echo * TC15: Row injection and binlog_format=statement: in slave sql thread
+INSERT INTO t VALUES (COALESCE(1, UUID()));
+--echo [on slave]
+--source include/rpl_connection_slave.inc
+# 1666 = ER_BINLOG_ROW_INJECTION_AND_STMT_MODE
+--let $slave_sql_errno= 1666
+--let $show_sql_error= 1
+--source include/wait_for_slave_sql_error_and_skip.inc
+--source include/rpl_connection_slave.inc
+SELECT * FROM t /* should be empty */;
+--echo [on master]
+--source include/rpl_connection_master.inc
+
+
+--echo ==== Clean up ====
+
+DROP TRIGGER trig_autoinc;
+DROP TRIGGER trig_double_autoinc;
+DROP TABLE t, t_row, t_stmt, t_slave_stmt, t_autoinc, t_double_autoinc;
+DROP DATABASE other;
+SET @@global.binlog_format = @old_binlog_format;
+SET @@session.binlog_format = @old_binlog_format;
+UNINSTALL PLUGIN example;
+--echo [on slave]
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+SET @@global.binlog_format = @old_binlog_format;
+SET @@session.binlog_format = @old_binlog_format;
+--source include/start_slave.inc
+UNINSTALL PLUGIN example;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_sender_fseek.test b/mysql-test/suite/rpl/t/rpl_binlog_sender_fseek.test
index 2dbd28edce53..df96204eba8d 100644
--- a/mysql-test/suite/rpl/t/rpl_binlog_sender_fseek.test
+++ b/mysql-test/suite/rpl/t/rpl_binlog_sender_fseek.test
@@ -9,9 +9,9 @@
 # sometimes, cross the IO_CACHE block size. After running the workload, the test
 # case will verify the P_S counter COUNT_MISC for "wait/io/file/sql/binlog"
 # EVENT_NAME at performance_schema.file_summary_by_event_name. In a single
-# binary log file case, the counter should not be more than 5 (as there are some
+# binary log file case, the counter should not be more than 6 (as there are some
 # real file operations opening the binary log file and pointing it to the first
-# event position) or 8 in the case of GTIDs be enabled with auto positioning.
+# event position) or 9 in the case of GTIDs be enabled with auto positioning.
 #
 # ==== Related Bugs and Worklogs ====
 #
@@ -106,13 +106,13 @@ TRUNCATE performance_schema.file_summary_by_event_name;
 
 # Check the COUNT_MISC counter
 --source include/rpl_connection_master.inc
-# In a first run, the counter tops 5 without GTIDs, and tops 8 when GTIDs are
+# In a first run, the counter tops 6 without GTIDs, and tops 9 when GTIDs are
 # enabled, because of the process of searching the binary log file that
 # contains the first GTID not yet retrieved/executed by the slave.
---let $expected_count_misc= 5
+--let $expected_count_misc= 6
 if ($use_gtids)
 {
-  --let $expected_count_misc= 8
+  --let $expected_count_misc= 9
 }
 
 --let $current_count_misc=`SELECT COUNT_MISC FROM performance_schema.file_summary_by_event_name WHERE EVENT_NAME = "wait/io/file/sql/binlog"`
@@ -120,7 +120,7 @@ if ($use_gtids)
 --let $assert_text= COUNT_MISC for "wait/io/file/sql/binlog" should be minimal
 --let $assert_cond= $current_count_misc = $expected_count_misc
 --let $extra_debug_eval= $current_count_misc AS current_count_misc, $expected_count_misc as expected_count_misc
---let $extra_debug_info= COUNT_MISC should be 5 for non-GTID and 8 for GTID enabled servers
+--let $extra_debug_info= COUNT_MISC should be 6 for non-GTID and 9 for GTID enabled servers
 --source include/assert.inc
 
 # Cleanup
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size-master.opt b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size-master.opt
new file mode 100644
index 000000000000..c465ea3fc7e3
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size-master.opt
@@ -0,0 +1,3 @@
+--binlog_transaction_dependency_tracking=COMMIT_ORDER
+--transaction_write_set_extraction=XXHASH64
+--binlog_transaction_dependency_history_size=6
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size.test
new file mode 100644
index 000000000000..b74cc7ac8033
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_history_size.test
@@ -0,0 +1,142 @@
+################################################################################
+# ==== Purpose ====
+# Test timestamps are generated as expected with smaller
+# binlog_transaction_dependency_history_size.
+# Test:
+# 1. When the new writeset plus the existing history is less than the limit,
+#    the history is not cleared.
+# 2. When the new writeset plus the existing history is equal to the limit,
+#    the history is not cleared.
+# 3. When the history is less than the limit and the writeset plus the history
+#    is equal to the limit plus one:
+#    3.1. the transaction is compared with existing history
+#    3.2. the transaction is not inserted into history
+#    3.3. the history is cleared
+# 4. When the history is equal to the limit and the writeset is a singleton:
+#    3.1. the transaction is compared with existing history
+#    3.2. the transaction is not inserted into history
+#    3.3. the history is cleared
+# 5. When the history size is equal to the limit and a transaction updating
+#    only a key-less table happens, the history is not cleared.
+# 6. After history is cleared, it may fallback to COMMIT_ORDER so that a new
+#    transaction may be found to be non-conflicting with transactions not in
+#    history.
+#
+# ==== References ====
+# WL#9556: Writeset-based MTS dependency tracking on master
+################################################################################
+
+--source include/have_binlog_format_row.inc
+--let $rpl_extra_connections_per_server= 7
+--source include/master-slave.inc
+
+--connection master
+
+SET @binlog_transaction_dependency_tracking_save = @@GLOBAL.binlog_transaction_dependency_tracking;
+
+# Loop between binlog_transaction_dependency_tracking modes
+--let $type= 0
+while ($type < 3)
+{
+  --inc $type
+
+  --connection master
+  --echo
+  if ($type == 1)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+    --echo ######## 1. WRITESET ########
+  }
+  if ($type == 2)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+    --echo ######## 2. WRITESET_SESSION ########
+  }
+  if ($type == 3)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+    --echo ######## 3. COMMIT_ORDER ########
+  }
+
+  SELECT @@local.transaction_write_set_extraction,
+         @@global.transaction_write_set_extraction,
+         @@binlog_transaction_dependency_tracking,
+         @@binlog_transaction_dependency_history_size;
+
+  CREATE TABLE test.tab1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
+  CREATE TABLE test.tab2 (a INT);
+  FLUSH LOGS;
+
+  # Expected commit orders:
+  #  for WRITESET and WRITESET_SESSION it is shown below in [] bracket.
+  #  for COMMIT_ORDER it is shown below in {} bracket.
+  # [0 1] {0 1} Case 1
+  --connection server_1_1
+  INSERT INTO tab1 VALUES (NULL); # 0 + 1 = 1
+  # [1 2] {1 2} Case 1
+  --connection server_1_2
+  INSERT INTO tab1 VALUES (NULL); # 1 + 1 = 2
+  # [1 3] {2 3} Case 2
+  --connection server_1_3
+  INSERT INTO tab1 VALUES (NULL); # 2 + 1 = 3
+  # [3 4] {3 4} Case 5
+  --connection server_1_4
+  INSERT INTO tab2 VALUES (1);    # 3 + 0 = 3
+  # [1 5] {4 5} Verify case 5 + 4.1: this should be scheduled in parallel with previous transactions.
+  --connection server_1_5
+  INSERT INTO tab1 VALUES (NULL); # 3 + 1 = 4 -> reset to 0
+  # [5 6] {5 6} Verify case 4.2 + 4.3: this should not be scheduled in parallel with previous transactions.
+  --connection server_1_6
+  INSERT INTO tab1 VALUES (NULL); # 0 + 1 = 1
+  # [5 7] {6 7} Case 3.1
+  --connection server_1_1
+  INSERT INTO tab1 VALUES (NULL), (NULL), (NULL); # 1 + 3 = 4 -> reset to 0
+  # [7 8] {7 8} Verify case 3.2 + 3.3
+  --connection server_1_2
+  INSERT INTO tab1 VALUES (NULL); # 0 + 1 = 1
+  # [7 9] {8 9}
+  --connection server_1_3
+  INSERT INTO tab1 VALUES (NULL); # 1 + 1 = 2
+  # [9 13] {9 13} Case 6 (this is not committed yet, and will be scheduled in parallel with the next
+  # three transactions even if two of them are not in history when this transaction commits).
+  --connection server_1_7
+  BEGIN;
+  INSERT INTO tab1 VALUES (NULL);
+  # [7 10] {9 10}
+  --connection server_1_4
+  INSERT INTO tab1 VALUES (NULL); # 2 + 1 = 3
+  # [7 11] {10 11}
+  --connection server_1_5
+  INSERT INTO tab1 VALUES (NULL); # 3 + 1 = 4 -> reset to 0
+  # [11 12] {11 12}
+  --connection server_1_6
+  INSERT INTO tab1 VALUES (NULL); # 0 + 1 = 1
+  # [9 13] {9 13} Case 6 cont'd
+  --connection server_1_7
+  COMMIT;
+
+  --connection master
+  --echo # Drop table and flush logs to force binlog to rotate
+  DROP TABLE test.tab1, test.tab2;
+
+  --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+  FLUSH LOGS;
+
+  --echo # Processing binlog...
+  # For WRITESET and WRITESET_SESSION
+  --let $logical_timestamps=0 1;1 2;1 3;3 4;1 5;5 6;5 7;7 8;7 9;7 10;7 11;11 12;9 13;13 14
+  if ($type == 3)
+  { # For COMMIT_ORDER
+    --let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;9 13;13 14
+  }
+  --source include/assert_logical_timestamps.inc
+
+  --echo # Verify that replication is correct
+  --source include/sync_slave_sql_with_master.inc
+}
+
+--connection master
+
+SET GLOBAL binlog_transaction_dependency_tracking = @binlog_transaction_dependency_tracking_save;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking.test
new file mode 100644
index 000000000000..896d4896ff82
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking.test
@@ -0,0 +1,385 @@
+# ==== Purpose ====
+#
+# Test timestamps generated by binlog-transaction-dependency-tracking
+# modes WRITESET, WRITESET_SESSION and COMMIT_ORDER.
+#
+# The following properties are tested:
+# - With binlog-transaction-dependency-tracking=WRITESET, the logical timestamps
+#   are generated as expected, marking each transaction as conflicting with
+#   transactions having intersecting writesets.
+#   (type = 0)
+# - With binlog-transaction-dependency-tracking=WRITESET_SESSION, transactions
+#   are additionally marked as conflicting with all previous transactions in the
+#   same session.
+#   (type = 1)
+# - Additionally, transactions are marked as conflicting with any DDL.
+#   (step = 2)
+# - Additionally, transactions are marked as conflicting if one appears before
+#   and the other after a binlog rotation.
+#   (step = 3)
+# - Additionally, transactions are marked as conflicting if the writeset history
+#   was cleared between the transactions.
+#   (step = 4)
+#
+# - It tests this for INSERT, UPDATE and DELETE statements.
+#
+# ==== Implementation ====
+#
+# 1. Apply 8 transactions with different data dependencies and check the binary
+#    log generated (step 1). Do the same with DDL in the middle (step 2), with
+#    rotation (step 3) and when writeset history becomes full (step 4).
+#
+# 2. Test Bug#2561672: POST RESET MASTER/FLUSH LOGS SETTING BTDT=WRITESET
+#    BEHAVES LIKE COMMIT_ORDER
+#
+# 3. Test ROLLBACK TO SAVEPOINT.
+#
+# ==== References ====
+#
+# WL#9556: Writeset-based MTS dependency tracking on master
+#
+
+--source include/master-slave.inc
+--source include/have_binlog_format_row.inc
+
+--echo #### INITIALIZE ####
+
+--connection slave
+call mtr.add_suppression("Transaction is tagged with inconsistent logical timestamps");
+call mtr.add_suppression("Cannot execute the current event group in the parallel mode.");
+
+--source include/stop_slave.inc
+
+SET @save_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @save_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET @save_slave_transaction_retries = @@GLOBAL.slave_transaction_retries;
+
+SET GLOBAL slave_parallel_type = LOGICAL_CLOCK;
+SET GLOBAL slave_parallel_workers = 3;
+SET GLOBAL slave_transaction_retries = 0;
+
+--connection master
+
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+
+# for step 4
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+
+--connection master1
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+
+--connection server_1
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+
+--connection master
+
+CREATE TABLE tests (`id` INT NOT NULL, `description` VARCHAR(50), `results` VARCHAR(100), PRIMARY KEY(`id`));
+INSERT INTO `tests` (`id`, `description`, `results`) VALUES
+(1,  'Writeset',                  '0 1;1 2;1 3;1 4;3 5;3 6;4 7;7 8;6 9;9 10'),
+(2,  'Writeset+DDL',              '0 1;1 2;1 3;1 4;4 5;5 6;6 7;7 8;4 9;7 10;10 11;9 12;12 13'),
+(3,  'Writeset+rotation',         '0 1;0 2;1 3;3 4;2 5;5 6'),
+(4,  'Writeset+history',          '0 1;1 2;1 3;1 4;4 5;4 6;4 7;7 8;7 9;9 10'),
+(5,  'Writeset_session',          '0 1;1 2;1 3;2 4;3 5;3 6;5 7;7 8;7 9;9 10'),
+(6,  'Writeset_session+DDL',      '0 1;1 2;1 3;2 4;4 5;5 6;6 7;7 8;4 9;8 10;10 11;10 12;12 13'),
+(7,  'Writeset_session+rotation', '0 1;0 2;1 3;3 4;3 5;5 6'),
+(8,  'Writeset_session+history',  '0 1;1 2;1 3;2 4;4 5;4 6;5 7;7 8;7 9;9 10'),
+(9,  'Commit_order',              '0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10'),
+(10, 'Commit_order+DDL',          '0 1;1 2;1 3;3 4;4 5;5 6;6 7;7 8;4 9;9 10;10 11;10 12;12 13'),
+(11, 'Commit_order+rotation',     '0 1;0 2;2 3;3 4;3 5;5 6'),
+(12, 'Commit_order+history',      '0 1;1 2;1 3;3 4;4 5;4 6;6 7;7 8;7 9;9 10');
+
+# flush logs to clear previous transactions
+FLUSH LOGS;
+
+--let $idx= 0
+
+--echo #### TEST ####
+
+# loop between WRITESET and WRITESET_SESSION
+--let $type= 0
+while ($type < 3)
+{
+  --inc $type
+
+  --connection master
+  if ($type == 1)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+    --echo ######## 1. WRITESET ########
+  }
+  if ($type == 2)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+    --echo ######## 2. WRITESET_SESSION ########
+  }
+  if ($type == 3)
+  {
+    SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+    --echo ######## 3. COMMIT_ORDER ########
+  }
+
+  # loop between steps
+  --let $step= 0
+  while ($step < 4)
+  {
+    --inc $step
+    --inc $idx
+
+    --let $testname=`SELECT description FROM tests WHERE id=$idx`
+    --echo #### STEP $type.$step TEST $testname ####
+
+    SET GLOBAL binlog_transaction_dependency_history_size=25000;
+    if ($step == 4)
+    {
+      --echo History size reduced to 10 to test when it becomes full
+      SET GLOBAL binlog_transaction_dependency_history_size=10;
+    }
+
+    SELECT @@local.transaction_write_set_extraction,
+           @@global.transaction_write_set_extraction,
+           @@binlog_transaction_dependency_tracking,
+           @@binlog_transaction_dependency_history_size;
+
+    CREATE TABLE `t1` (`id` int(11) NOT NULL, `val` int(11) NOT NULL,
+      PRIMARY KEY (`id`)) ENGINE=InnoDB;
+
+    --connection master
+    --echo #TRX2 (session A, independent)
+    BEGIN;
+    INSERT INTO t1(id, val) VALUES (1, 0),(2, 0),(3, 0);
+
+    --connection master1
+    --echo #TRX1 (session B, independent)
+    BEGIN;
+      INSERT INTO t1(id, val) VALUES (4, 0),(5, 0);
+    COMMIT;
+
+    --connection master
+    --echo finish TRX2 after TRX1
+    COMMIT;
+
+    --connection master1
+    --echo #TRX3 (session B, no data dependency, depends on TRX1 (session))
+    BEGIN;
+      INSERT INTO t1(id, val) VALUES (6, 0),(7, 0);
+    COMMIT;
+
+    --connection master
+    --echo #TRX5 (session A, depends on TRX2 (session and data) and TRX1(data))
+    BEGIN;
+      INSERT INTO t1(id, val) VALUES (8, 1);
+      UPDATE t1 SET val=val+1 WHERE id=1;
+      UPDATE t1 SET val=val+1 WHERE id=4;
+
+    if ($step == 2)
+    {
+      --connection master1
+      --echo Inserted a DDL after TRX5 and check that they run in parallel due to commit_order
+      CREATE TABLE `t2` (`id` int(11) NOT NULL, `val` int(11) NOT NULL) ENGINE=InnoDB;
+      ALTER TABLE t2 ADD COLUMN b INT;
+      DROP TABLE `t2`;
+    }
+
+    # flush logs in the middle
+    if ($step == 3)
+    {
+      --connection master1
+      --echo Flushing logs in the middle of the set
+      FLUSH LOGS;
+    }
+
+    --connection server_1
+    --echo #TRX4 (session C, depends on TRX2 (data))
+    BEGIN;
+      UPDATE t1 SET val=val+1 WHERE id=3;
+      INSERT INTO t1(id, val) VALUES (9, 1);
+    COMMIT;
+
+    --connection master
+    --echo finish TRX5 after TRX4
+    COMMIT;
+
+    --connection server_1
+    --echo #TRX6 (session C, depends on TRX4 (session) and TRX3(data))
+    BEGIN;
+      DELETE FROM t1 WHERE id=6;
+    COMMIT;
+
+    --connection server_1
+    --echo #TRX8 (session C, depends on TRX5 (data) and TRX6 (session))
+    BEGIN;
+      UPDATE t1 SET val=val+1 WHERE id=4;
+
+    --connection master1
+    --echo #TRX7 (session B, depends on TRX1 and TRX6 (data) and TRX3 (session))
+    BEGIN;
+      UPDATE t1 SET val=val+1 WHERE id=5;
+      INSERT INTO t1(id, val) VALUES (6, 0);
+    COMMIT;
+
+    --connection server_1
+    --echo finish TRX8 after TRX7
+    COMMIT;
+
+    --connection master
+    --echo Drop table and flush logs to force binlog to rotate
+    DROP TABLE t1;
+
+    --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+    --echo Processing binlog $binlog_file
+    FLUSH LOGS;
+
+    --let $source_file= $server_1_datadir/$binlog_file
+    --let $logical_timestamps=`SELECT results FROM tests WHERE id=$idx`
+    --source include/assert_logical_timestamps.inc
+  }
+}
+
+--echo
+--echo #### Verify that replication was correct ####
+
+--connection slave
+--source include/start_slave.inc
+
+--connection master
+--source include/sync_slave_sql_with_master.inc
+
+--let $diff_tables= master:test.tests, slave:test.tests
+--source include/diff_tables.inc
+
+--connection master
+DROP TABLE `tests`;
+--source include/sync_slave_sql_with_master.inc
+
+--connection master
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+SET GLOBAL binlog_transaction_dependency_history_size= DEFAULT;
+FLUSH LOGS;
+
+--echo
+--echo #### Bug#25616372, PART1 ####
+CREATE TABLE t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT); # 0 1
+INSERT INTO t1 VALUES (null); # 1 2
+INSERT INTO t1 VALUES (null); # 1 3
+set global binlog_transaction_dependency_tracking=WRITESET;
+INSERT INTO t1 VALUES (null); # 3 4
+INSERT INTO t1 VALUES (null); # 3 5
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+-- echo Processing binlog $binlog_file
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;1 3;3 4;3 5
+--source include/assert_logical_timestamps.inc
+FLUSH LOGS;
+
+--echo
+--echo #### Bug#25616372, PART2 ####
+INSERT INTO t1 VALUES (null); # 0 1
+INSERT INTO t1 VALUES (null); # 0 2
+set global binlog_transaction_dependency_tracking=WRITESET;
+INSERT INTO t1 VALUES (null); # 2 3
+INSERT INTO t1 VALUES (null); # 3 4. # It should be 2 4
+INSERT INTO t1 VALUES (null); # 4 5. # It should be 2 5
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+-- echo Processing binlog $binlog_file
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;2 3;2 4;2 5
+--source include/assert_logical_timestamps.inc
+DROP TABLE t1;
+FLUSH LOGS;
+
+#
+# Test ROLLBACK TO SAVEPOINT. The rolled-back rows will still have their
+# hashes in the writeset and may cause spurious conflicts.
+#
+--echo
+-- echo #### Test ROLLBACK TO SAVEPOINT ####
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE nopk (a INT);
+CREATE TABLE parent (a INT PRIMARY KEY);
+CREATE TABLE child (a INT PRIMARY KEY, FOREIGN KEY (a) REFERENCES parent(a));
+
+--echo # 1. Hashes of rolled-back rows are removed from writeset
+FLUSH LOGS;
+INSERT INTO t1 VALUES (1);
+BEGIN;
+  SAVEPOINT sp;
+    UPDATE t1 SET a = 2;
+  ROLLBACK TO sp;
+  INSERT INTO t1 VALUES (2);
+COMMIT;
+INSERT INTO t1 VALUES (3);
+
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--echo Processing binlog $binlog_file
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;1 3
+--source include/assert_logical_timestamps.inc
+
+--echo # 2. If transaction is flagged as updating a non-index table, the flag is not rolled-back
+FLUSH LOGS;
+INSERT INTO t1 VALUES (4);
+BEGIN;
+  SAVEPOINT sp;
+    INSERT INTO nopk VALUES (1);
+  ROLLBACK TO sp;
+  INSERT INTO t1 VALUES (5);
+COMMIT;
+INSERT INTO t1 VALUES (6);
+
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--echo Processing binlog $binlog_file
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;1 3
+--source include/assert_logical_timestamps.inc
+
+--echo # 3. If transaction is flagged as updating a foreign key parent table, the flag is not rolled-back
+FLUSH LOGS;
+INSERT INTO t1 VALUES (7);
+BEGIN;
+  SAVEPOINT sp;
+    INSERT INTO parent VALUES (1);
+  ROLLBACK TO sp;
+  INSERT INTO t1 VALUES (8);
+COMMIT;
+INSERT INTO t1 VALUES (9);
+
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--echo Processing binlog $binlog_file
+--let $source_file= $server_1_datadir/$binlog_file
+--let $logical_timestamps=0 1;1 2;2 3
+--source include/assert_logical_timestamps.inc
+
+--echo # Clean up SAVEPOINT tests
+DROP TABLE t1;
+DROP TABLE nopk;
+DROP TABLE child;
+DROP TABLE parent;
+
+#
+# Cleanup
+#
+--echo
+--echo #### CLEANUP ####
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+SET @@GLOBAL.slave_parallel_type= @save_slave_parallel_type;
+SET @@GLOBAL.slave_parallel_workers= @save_slave_parallel_workers;
+SET @@GLOBAL.slave_transaction_retries= @save_slave_transaction_retries;
+
+--source include/start_slave.inc
+
+--connection master
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.binlog_transaction_dependency_history_size= @save_binlog_transaction_dependency_history_size;
+
+--source include/rpl_end.inc
+
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.test
new file mode 100644
index 000000000000..0d9321656b6d
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_empty_trxs.test
@@ -0,0 +1,71 @@
+# ==== Purpose ====
+#
+# Verify that we can avoid clearing writeset history when executing an empty
+# transaction if binlog-transaction-dependency-tracking is set to WRITESET.
+#
+# ==== Implementation ====
+#
+# 1. Exectute some DDLs and DMls on master.
+# 2. Sync slave sql with master and filter out these DDLs and DMls on slave,
+#    then they become empty transactions when applying them on slave.
+# 3. Verify that last_committed is not increased, since writeset history
+#    is not cleared when applying these empty transactions on slave.
+#
+# ==== References ====
+#
+# Bug #25982097  WRITESET DEPENDENCY TRACKING SUB-OPTIMAL AFTER ROTATION OR ON EMPTY TRANSACTIONS
+
+# Test in this file only makes sense in standard replication,
+# so it is skipped in group replication.
+--source include/not_group_replication_plugin.inc
+# Test in this file is binlog format agnostic, thus no need
+# to rerun it for every format.
+--source include/have_binlog_format_row.inc
+--source include/have_gtid.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+# The following logical timestamps check needs fresh slave server.
+RESET MASTER;
+# Set the filter rule to filter out these DDLs and DMls on slave.
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE= (test.t1);
+SET @save_binlog_transaction_dependency_tracking= @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction= @@GLOBAL.transaction_write_set_extraction;
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction= XXHASH64;
+SET LOCAL transaction_write_set_extraction= XXHASH64;
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+INSERT INTO t1 VALUES (3);
+
+--source include/sync_slave_sql_with_master.inc
+--echo #
+--echo # Verify that the value of last_committed is not increased,
+--echo # since writeset history is not cleared when applying
+--echo # these empty transactions on slave.
+--echo #
+--let $logical_timestamps=0 1;0 2;0 3;0 4
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--echo Processing binlog $binlog_file
+--let $source_file= $server_2_datadir/$binlog_file
+--source include/assert_logical_timestamps.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE= ();
+--source include/start_slave_sql.inc
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test
new file mode 100644
index 000000000000..099dbd96e396
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_filters.test
@@ -0,0 +1,183 @@
+################################################################################
+# ==== Purpose ====
+# Test that filtered transaction resets commit_parent since it doesn't generate
+# any writesets.
+# Modes checked:
+#  COMMIT_ORDER | WRITESET | WRITESET_SESSION
+#
+# ==== Implementation ====
+# 1. Add transactions with different dependency tracking and empty transactions
+#    on master.
+# 2. Test timestamps order with filtered and non-filtered transactions on Slave.
+# a) No filtering: DDL and DMLs on 'test' database are not filtered.
+# b) Empty transactions from master.
+# c) Filtering (modified transactions): DDLs and DMLs due to rerwite rule
+#    'db1->db2'.
+# d) Filtering (empty transactions): DDLs and DMLs on 'nodb' database.
+# 3. Clean up.
+#
+# ==== References ====
+# WL#9556: Writeset-based MTS dependency tracking on master
+################################################################################
+
+--source include/master-slave.inc
+--source include/have_binlog_format_row.inc
+--source include/not_mts_slave_parallel_workers.inc
+
+--source include/rpl_connection_master.inc
+# Take backup of variables.
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+# Set variables.
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+
+--source include/rpl_connection_slave.inc
+# Set filter rule.
+--source include/stop_slave.inc
+CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=((db1,db2)),
+                   REPLICATE_IGNORE_DB=(nodb);
+--source include/start_slave.inc
+# Take backup of variables.
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+# Set variables.
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET LOCAL transaction_write_set_extraction = XXHASH64;
+
+--source include/rpl_connection_master.inc
+--echo #
+--echo # 1. Add transactions with different dependency tracking and empty transaction
+--echo #    on master.
+--echo #
+CREATE DATABASE nodb; # 0 1
+CREATE DATABASE db1;  # 1 2
+CREATE DATABASE db2;  # 2 3
+USE nodb; CREATE TABLE nodbt1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT); # 3 4
+USE db1;  CREATE TABLE db1t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);  # 4 5
+USE test; CREATE TABLE t1 (a INT PRIMARY KEY NOT NULL AUTO_INCREMENT);     # 5 6
+
+USE db1;
+INSERT INTO db1t1 VALUES (NULL); # 6 7
+INSERT INTO db1t1 VALUES (NULL); # 7 8
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET_SESSION;
+INSERT INTO db1t1 VALUES (NULL); # 8 9
+INSERT INTO db1t1 VALUES (NULL); # 9 10
+USE nodb;
+INSERT INTO nodbt1 VALUES (NULL); # 10 11
+INSERT INTO nodbt1 VALUES (NULL); # 11 12
+SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
+INSERT INTO nodbt1 VALUES (NULL); # 12 13
+INSERT INTO nodbt1 VALUES (NULL); # 12 14
+USE test;
+INSERT INTO t1 VALUES (NULL); # 12 15
+INSERT INTO t1 VALUES (NULL); # 12 16
+SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
+INSERT INTO t1 VALUES (NULL); # 16 17
+INSERT INTO t1 VALUES (NULL); # 17 18
+
+DROP DATABASE nodb; # 18 19
+DROP DATABASE db1;  # 19 20
+DROP DATABASE db2;  # 20 21
+DROP TABLE test.t1; # 21 22
+
+if ( `SELECT @@GLOBAL.GTID_MODE = "ON"` )
+{
+  --disable_query_log
+  SET @@SESSION.GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+  COMMIT; # 22 23
+  --let $server1_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+  eval SET @@SESSION.GTID_NEXT = '$server1_uuid:23';
+  COMMIT; # 23 24
+  SET @@SESSION.GTID_NEXT = 'AUTOMATIC';
+  --enable_query_log
+}
+
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $dont_print_logical_timestamps= 1
+--let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;12 14;12 15;12 16;16 17;17 18;18 19;19 20;20 21;21 22
+if ( `SELECT @@GLOBAL.GTID_MODE = "ON"` )
+{
+ --let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;12 14;12 15;12 16;16 17;17 18;18 19;19 20;20 21;21 22;22 23;23 24
+}
+--source include/assert_logical_timestamps.inc
+
+--echo #
+--echo # 2. Test timestamps order with filtered and non-filtered transactions on Slave.
+--echo #
+--source include/sync_slave_sql_with_master.inc
+--echo [On Slave]
+--echo ######## 2.1. COMMIT_ORDER with SLAVE ########
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $dont_print_logical_timestamps= 1
+--let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;13 14;14 15
+if ( `SELECT @@GLOBAL.GTID_MODE = "ON"` )
+{
+ --let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;13 14;14 15;15 16;16 17;17 18;18 19;19 20;20 21;21 22;22 23;23 24
+}
+--source include/assert_logical_timestamps.inc
+
+# Clean up logs to test with WRITESET in next step.
+--source include/stop_slave.inc
+RESET SLAVE;
+RESET MASTER;
+
+--echo
+--echo ######## 2.2. WRITESET with SLAVE ########
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+--source include/start_slave.inc
+--connection master
+--source include/sync_slave_sql_with_master.inc
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $dont_print_logical_timestamps= 1
+--let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;4 6;4 7;4 8;4 9;4 10;4 11;4 12;12 13;13 14;14 15
+if ( `SELECT @@GLOBAL.GTID_MODE = "ON"` )
+{
+ --let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;6 8;6 9;6 10;6 11;6 12;6 13;6 14;6 15;6 16;6 17;6 18;6 19;19 20;20 21;21 22;22 23;22 24
+}
+--source include/assert_logical_timestamps.inc
+
+# Clean up logs to test with WRITESET_SESSION in next step.
+--source include/stop_slave.inc
+RESET SLAVE;
+RESET MASTER;
+
+--echo
+--echo ######## 2.3. WRITESET_SESSION with SLAVE ########
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+--source include/start_slave.inc
+--connection master
+--source include/sync_slave_sql_with_master.inc
+SELECT @@global.transaction_write_set_extraction, @@binlog_transaction_dependency_tracking;
+--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $dont_print_logical_timestamps= 1
+--let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;13 14;14 15
+if ( `SELECT @@GLOBAL.GTID_MODE = "ON"` )
+{
+ --let $logical_timestamps=0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10;10 11;11 12;12 13;13 14;14 15;15 16;16 17;17 18;18 19;19 20;20 21;21 22;22 23;23 24
+}
+--source include/assert_logical_timestamps.inc
+
+--echo
+--echo # 3. Clean up.
+--source include/rpl_connection_master.inc
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+
+--source include/sync_slave_sql_with_master.inc
+--echo [On Slave]
+--let $dont_print_logical_timestamps=
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+
+--source include/stop_slave.inc
+CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=(), REPLICATE_IGNORE_DB=();
+--source include/start_slave.inc
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk-master.opt b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk-master.opt
new file mode 100644
index 000000000000..12099c2d182a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk-master.opt
@@ -0,0 +1,2 @@
+--binlog_transaction_dependency_tracking=COMMIT_ORDER
+--transaction_write_set_extraction=XXHASH64
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk.test
new file mode 100644
index 000000000000..70c552ae3596
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk.test
@@ -0,0 +1,212 @@
+################################################################################
+# ==== Purpose ====
+# Test referential actions of the foreign keys with different
+# binlog_transaction_dependency_tracking modes.
+# Referential actions:
+#  RESTRICT | NO ACTION | CASCADE | SET NULL | SET DEFAULT
+#  Note* Table definition containing SET DEFAULT gets rejected thus not tested.
+# Modes:
+#  COMMIT_ORDER | WRITESET | WRITESET_SESSION
+#  Note* COMMIT_ORDER is purposefully not tested with this test.
+#
+# ==== Implementation ====
+# 1. FK parent table:
+#    1.1. Marked as conflicting with previous transactions.
+#    1.2. Clears history.
+#    1.3. Marked as conflicting with later transactions.
+#    1.4. Falls back to COMMIT_ORDER, so *not* marked as conflicting with previous transactions
+#         committing in parallel.
+#    1.5. Later transactions fall back to COMMIT_ORDER, so they are *not* marked as conflicting with
+#         this transaction if executing in parallel with it.
+#
+# 2. FK child table:
+#    2.1. Can run in parallel with previous transactions.
+#    2.2. Does not clear history.
+#    2.3. Can run in parallel with subsequent transactions.
+#
+# 3. All the above is tested with INSERT, UPDATE, and DELETEs.
+#
+# 4. All the above is tested with RESTRICT, NO ACTION, CASCADE, SET NULL.
+#
+# 5. All the above is tested with ON UPDATE and ON DELETE.
+#
+# 6. All the above is tested with WRITESET_SESSION and WRITESET.
+#
+# ==== References ====
+# WL#9556: Writeset-based MTS dependency tracking on master
+################################################################################
+--let $rpl_extra_connections_per_server= 8
+--source include/master-slave.inc
+--source include/have_binlog_format_row.inc
+
+--connection master
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+
+--let $row_count= 1
+--let $referential_action= 0
+# RESTRICT, NO ACTION, CASCADE, SET NULL
+while ($referential_action < 4)
+{
+  # WRITESET, WRITESET_SESSION
+  --let $dependency_tracking= 0
+  while ($dependency_tracking < 2)
+  {
+    --connection master
+    if ($referential_action == 0)
+    {
+      --let $ref_action= RESTRICT
+      --let $error_success= ER_ROW_IS_REFERENCED_2
+    }
+    if ($referential_action == 1)
+    {
+      --let $ref_action= NO ACTION
+      --let $error_success= ER_ROW_IS_REFERENCED_2
+    }
+    if ($referential_action == 2)
+    {
+      --let $ref_action= CASCADE
+      --let $error_success= 0
+    }
+    if ($referential_action == 3)
+    {
+      --let $ref_action= SET NULL
+      --let $error_success= 0
+    }
+
+    --echo
+    if ($dependency_tracking == 0)
+    {
+      SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+      --let $text= $row_count. Test referential action $ref_action with WRITESET.
+    }
+    if ($dependency_tracking == 1)
+    {
+      SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
+      --let $text= $row_count. Test referential action $ref_action with WRITESET_SESSION.
+    }
+
+    # Header according to all the parameters.
+    --echo ######## $text ########
+    SELECT @@local.transaction_write_set_extraction,
+           @@global.transaction_write_set_extraction,
+           @@binlog_transaction_dependency_tracking;
+
+    # In all these 8 cases, behavior should be identical.
+    CREATE TABLE parent1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+    CREATE TABLE parent2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(50));
+    CREATE TABLE t1 (a INT PRIMARY KEY);
+    --eval CREATE TABLE child1 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent1 (a) ON UPDATE $ref_action)
+    --eval CREATE TABLE child2 (a INT PRIMARY KEY, b INT, FOREIGN KEY(b) REFERENCES parent2 (a) ON DELETE $ref_action)
+    INSERT INTO parent1 VALUES (1, 1), (2, 2);
+    INSERT INTO parent2 VALUES (1, 1), (2, 2);
+    FLUSH LOGS;
+
+    --echo # Case 2.1, 2.2, 2.3
+    # [0 1]
+    --connection server_1_1
+    INSERT INTO child1 VALUES (1, 1);
+
+    # [1 2]
+    --connection server_1_2
+    INSERT INTO child2 VALUES (1, 1);
+
+    # [1 3]
+    --connection server_1_1
+    UPDATE child1 SET a = 2;
+
+    # [2 4]
+    --connection server_1_2
+    UPDATE child2 SET a = 2;
+
+    # [3 5]
+    --connection server_1_1
+    DELETE FROM child1;
+
+    # [4 6]
+    --connection server_1_2
+    DELETE FROM child2;
+
+    --echo # Case 1.1, 1.2, 1.3
+    # [1 7]
+    --connection server_1_3
+    INSERT INTO t1 VALUES (1);
+
+    # [7 8]
+    --connection server_1_4
+    INSERT INTO parent1 VALUES (3, 3);
+
+    # [8 9]
+    --connection server_1_5
+    INSERT INTO t1 VALUES (2);
+
+    --echo # Case 1.4, 1.5
+    # [8 10]
+    --connection server_1_6
+    BEGIN;
+    INSERT INTO t1 VALUES (3);
+    INSERT INTO child1 VALUES (1, 1);
+    # [9 11]
+    --connection server_1_7
+    BEGIN;
+    INSERT INTO parent1 VALUEs (4, 4);
+    INSERT INTO child2 VALUES (1, 1);
+    # [9 12]
+    --connection server_1_8
+    BEGIN;
+    INSERT INTO t1 VALUES (4);
+    # Commit the above.
+    --connection server_1_6
+    COMMIT;
+    --connection server_1_7
+    COMMIT;
+    --connection server_1_8
+    COMMIT;
+
+    # [11 13] Verify again that history is cleared
+    --connection server_1_1
+    INSERT INTO t1 VALUES (5);
+
+    # [13 14] With CASCADE and SET NULL
+    --connection server_1_2
+    --error $error_success
+    UPDATE parent1 SET a=5 WHERE a=1;
+
+    # [14 15] With CASCADE and SET NULL
+    --connection server_1_3
+    --error $error_success
+    DELETE FROM parent2 WHERE a=1;
+
+    --echo # Drop table and flush logs to force binlog to rotate
+    --connection master
+    DROP TABLE child2, parent2, child1, parent1, t1;
+
+    --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
+    FLUSH LOGS;
+
+    --echo # Processing binlog...
+    # For RESTRICT and NO ACTION
+    --let $logical_timestamps=0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14
+    if ($referential_action >= 2)
+    {
+      # For CASCADE and SET NULL
+      --let $logical_timestamps=0 1;1 2;1 3;2 4;3 5;4 6;1 7;7 8;8 9;8 10;9 11;9 12;11 13;13 14;14 15;15 16
+    }
+    --source include/assert_logical_timestamps.inc
+
+    --echo # Verify that replication is correct
+    --source include/sync_slave_sql_with_master.inc
+
+    --inc $dependency_tracking
+    --inc $row_count
+  }
+  --inc $referential_action
+}
+
+--echo
+--echo # Clean up
+--connection master
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_indexes.test b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_indexes.test
new file mode 100644
index 000000000000..ed556e96d365
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_indexes.test
@@ -0,0 +1,319 @@
+# ==== Purpose ====
+#
+# Verify that logical timestamps are generated correctly for all types
+# of indexes when binlog_transaction_dependency_tracking=WRITESET.
+#
+# The following properties are tested:
+#
+# P1. Any transaction that updates a table having no primary key, must
+#     (a) depend on the previous transaction, but (b) must not clear
+#     history.
+#
+#     P1.1. This must hold if the transaction has no writeset.
+#           (e.g. it updates only the no-pk table; a no-pk table will
+#           not add to the writeset).
+#
+#     P1.2. This must hold if the transaction has a writeset.
+#           (e.g. it updates some other table too).
+#
+# P2. Any transaction that only updates tables having primary keys
+#     must compute its dependencies using the writeset. (In contrast
+#     with P1).
+#
+# P3. A UNIQUE index with NOT NULL constraints on all columns counts
+#     as a primary key too.
+#
+# P4. If there is both a primary key and other keys, then uniqueness
+#     constraints due to the other keys generate dependencies too.
+#
+# P5. If there is both a primary key and nullable columns, then NULL
+#     values in the same column do not conflict.
+#
+# ==== Implementation ====
+#
+# Repeatedly define a table t1 with three columns a, b, c, using all
+# combinations of the following parameters:
+#
+#  A. Without/with explicit primary key on a.
+#
+#  B. Without/with NOT NULL constraints on b and c.
+#
+#  C. Without/with uniqueness constraints on b and/or c.
+#
+#  D. Without index on b and c/with index on b/with index on c.
+#     (Skip the no-index case if uniqueness constraints are required).
+#
+# This gives 20 combinations. For each such combination, execute the
+# following:
+#
+# INSERT (1, 1, 1)
+# INSERT (2, 2, 2)
+# -> should be independent
+# DELETE (2, 2, 2)
+# -> should depend on insert (2, 2, 2)
+# UPDATE (1, 1, 1) to (1, 2, 2)
+# -> if there are uniqueness constraints on b and/or c, this should
+#    depend on delete (2, 2, 2) (and that verifies P4). Otherwise, depend
+#    on insert (1, 1, 1). When there is a pk, this verifies P1.1, otherwise
+#    it verifies P2.
+# if columns b and c are nullable:
+#   INSERT (3, NULL, 2)
+#   -> should be independent
+#   INSERT (4, NULL, 2)
+#   -> should be independent since multiple NULL values are allowed.
+#      This verifies P5.
+#   DELETE (3, NULL, 2)
+#   -> should depend on insert (3, NULL, 2) but not on insert (4, NULL, 2)
+#      This verifies P5.
+#
+# To verify P1(b), execute extra, independent transactions updating
+# another table t2 after some of the statements above (e.g. after
+# delete (2, 2, 2)).  Verify that the extra transaction is marked as
+# independent of all the previous ones.
+#
+# To verify P1.2, include a statement doing an independent insert into
+# t2 within the same transaction that inserts (2, 2, 2) in t1.
+#
+# To distinguish the cases that DELETE (2, 2, 2) depends on INSERT (2,
+# 2, 2) (when there is a pk) from the case that it is executed in
+# isolation due to not having a pk, we precede it by an independent
+# transaction updating another table, t2.  Similar for UPDATE (1, 1,
+# 1) to (2, 2, 2), for INSERT (4, NULL, 2), and for DELETE (3, NULL,
+# 2).
+#
+# P3 is verified in the loop iterations where we use both NOT NULL and
+# UNIQUE.
+#
+# ==== References ====
+#
+# WL#9556: Writeset-based MTS dependency tracking on master
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--echo #### INITIALIZE ####
+
+--source include/rpl_connection_slave.inc
+--source include/stop_slave.inc
+SET @save_slave_parallel_workers= @@GLOBAL.slave_parallel_workers;
+SET @@GLOBAL.slave_parallel_workers= 4;
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
+SET @save_transaction_write_set_extraction = @@GLOBAL.transaction_write_set_extraction;
+
+SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
+SET GLOBAL transaction_write_set_extraction = XXHASH64;
+SET SESSION transaction_write_set_extraction = XXHASH64;
+SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
+
+# Tell assert_logical_timestamps to save the current position so that
+# the next call will continue where the current ended.
+--let $save_binlog_position= 1
+
+# First without any explicit PRIMARY KEY, then with one on column a.
+--let $explicit_pk= 0
+while ($explicit_pk < 2)
+{
+
+  # First with columns b and c NULL-able, then with NOT NULL on both.
+  --let $nonnull= 0
+  while ($nonnull < 2)
+  {
+
+    # First without uniqueness constraints on second index, then with.
+    --let $unique= 0
+    while ($unique < 2)
+    {
+
+      # First without index (unless $unique==1), then with 1-column
+      # index, then with 2-column index.
+      --let $colcount= $unique
+      while ($colcount < 3)
+      {
+
+        # Determine if there is a primary key. Unique non-null indexes
+        # count as primary if there is no explicit primary key.
+        --let $pk= 0
+        if ($explicit_pk)
+        {
+          --let $pk= 1
+        }
+        if ($unique)
+        {
+          if ($nonnull)
+          {
+            --let $pk= 1
+          }
+        }
+
+        # Compute table definition and header according to all the parameters.
+        --let $text= $explicit_pk.$nonnull.$unique.$colcount
+        if ($explicit_pk == 0)
+        {
+          --let $text= $text: WITHOUT PK
+          --let $first_column_def= a INT
+        }
+        if ($explicit_pk == 1)
+        {
+          --let $text= $text: WITH PK
+          --let $first_column_def= a INT PRIMARY KEY
+        }
+        if ($nonnull == 0)
+        {
+          --let $text= $text, NULLABLE
+          --let $not_null_def=
+        }
+        if ($nonnull == 1)
+        {
+          --let $text= $text, NOT NULL
+          --let $not_null_def= NOT NULL
+        }
+        if ($unique == 0)
+        {
+          --let $text= $text, NOT UNIQUE
+          --let $unique_def=
+        }
+        if ($unique == 1)
+        {
+          --let $text= $text, UNIQUE
+          --let $unique_def= UNIQUE
+        }
+        if ($colcount == 0)
+        {
+          --let $text= $text, NO INDEX
+          --let $second_index_def=
+        }
+        if ($colcount == 1)
+        {
+          --let $text= $text, 1-COLUMN INDEX
+          --let $second_index_def= , $unique_def INDEX(b)
+        }
+        if ($colcount == 2)
+        {
+          --let $text= $text, 2-COLUMN INDEX
+          --let $second_index_def= , $unique_def INDEX(b, c)
+        }
+
+        --echo
+        --echo #### $text ####
+        --echo
+
+        eval CREATE TABLE t1 ($first_column_def, b INT $not_null_def, c INT $not_null_def $second_index_def);
+        CREATE TABLE t2 (a INT PRIMARY KEY);
+
+        FLUSH LOGS;
+        --source include/save_binlog_position.inc
+
+        --echo # TRX1: independent
+        INSERT INTO t1 VALUES (1, 1, 1);
+
+        --echo # now t1 contains one row: (1, 1, 1)
+        --let $logical_timestamps= 0 1
+        --source include/assert_logical_timestamps.inc
+
+        --echo # TRX2: independent
+        BEGIN;
+        INSERT INTO t1 VALUES (2, 2, 2);
+        INSERT INTO t2 VALUES (1);
+        COMMIT;
+
+        --echo # now t1 contains two rows: (1, 1, 1), (2, 2, 2)
+        if ($pk)  { --let $logical_timestamps= 1 2
+        }
+        if (!$pk) { --let $logical_timestamps= 1 2
+        }
+        --source include/assert_logical_timestamps.inc
+
+        --echo # TRX3: independent
+        INSERT INTO t2 VALUES (3);
+        --echo # TRX4: depends on TRX2
+        DELETE FROM t1 WHERE a = 2;
+
+        --echo # now t1 contains one row: (1, 1, 1)
+        if ($pk)  { --let $logical_timestamps= 1 3;2 4
+        }
+        if (!$pk) { --let $logical_timestamps= 1 3;3 4
+        }
+        --source include/assert_logical_timestamps.inc
+
+        --echo # TRX5: independent
+        INSERT INTO t2 VALUES (5);
+        --echo # TRX6: conflict with TRX4 if unique, else with TRX1
+        UPDATE t1 SET b = 2, c = 2 WHERE a = 1;
+
+        --echo # now t1 contains one row: (1, 2, 2)
+        if ($pk) {
+          if ($unique)  { --let $logical_timestamps= 1 5;4 6
+          }
+          if (!$unique) { --let $logical_timestamps= 1 5;1 6
+          }
+        }
+        if (!$pk) { --let $logical_timestamps= 1 5;5 6
+        }
+        --source include/assert_logical_timestamps.inc
+
+        if (!$nonnull)
+        {
+
+          --echo # TRX7: independent
+          INSERT INTO t1 VALUES (3, NULL, 2);
+
+          --echo # now t1 contains two rows: (1, 2, 2), (3, NULL, 2)
+          if ($pk)  { --let $logical_timestamps= 1 7
+          }
+          if (!$pk) { --let $logical_timestamps= 6 7
+          }
+          --source include/assert_logical_timestamps.inc
+
+          --echo # TRX8: independent
+          INSERT INTO t2 VALUES (8);
+          --echo # TRX9: independent (no conflict with TRX7 since multiple NULLs are allowed)
+          INSERT INTO t1 VALUES (4, NULL, 2);
+
+          --echo # now t1 contains three rows: (1, 2, 2), (3, NULL, 2), (4, NULL, 2)
+          if ($pk)  { --let $logical_timestamps= 1 8;1 9
+          }
+          if (!$pk) { --let $logical_timestamps= 1 8;8 9
+          }
+          --source include/assert_logical_timestamps.inc
+
+          --echo # TRX10: independent
+          INSERT INTO t2 VALUES (10);
+          --echo # TRX11: conflict with TRX7 (not with TRX9 since multiple NULLs are allowed)
+          DELETE FROM t1 WHERE a = 3;
+
+          --echo # now t1 contains two rows: (1, 2, 2), (4, NULL, 2)
+          if ($pk) {  --let $logical_timestamps= 1 10;7 11
+          }
+          if (!$pk) { --let $logical_timestamps= 1 10;10 11
+          }
+          --source include/assert_logical_timestamps.inc
+
+        }
+
+        DROP TABLE t1;
+        DROP TABLE t2;
+
+        --inc $colcount
+       }
+       --inc $unique
+     }
+    --inc $nonnull
+  }
+  --inc $explicit_pk
+}
+
+--echo #### CLEAN UP ####
+
+SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
+if (`SELECT @@GLOBAL.transaction_write_set_extraction != @save_transaction_write_set_extraction`)
+{
+  SET @@GLOBAL.transaction_write_set_extraction= @save_transaction_write_set_extraction;
+}
+
+--source include/sync_slave_sql_with_master.inc
+SET @@GLOBAL.slave_parallel_workers= @save_slave_parallel_workers;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_change_master_dbug.test b/mysql-test/suite/rpl/t/rpl_change_master_dbug.test
index cfff588685d1..6a84432877ae 100644
--- a/mysql-test/suite/rpl/t/rpl_change_master_dbug.test
+++ b/mysql-test/suite/rpl/t/rpl_change_master_dbug.test
@@ -25,6 +25,7 @@ START SLAVE io_thread;
 # the error with the err_count exported in the retries field, we should
 # get 3 retries (one per second) when the IO thread gives up, ie, 
 # when it stops.
+--let $slave_io_errno= 2005
 -- source include/wait_for_slave_io_to_stop.inc
 -- let $error= query_get_value("SHOW SLAVE STATUS", Last_IO_Error, 1)
 if (!`SELECT "$error" LIKE "%retries: 3"`)
diff --git a/mysql-test/suite/rpl/t/rpl_connection.test b/mysql-test/suite/rpl/t/rpl_connection.test
index b057c260f0e0..8a0023f2bafe 100644
--- a/mysql-test/suite/rpl/t/rpl_connection.test
+++ b/mysql-test/suite/rpl/t/rpl_connection.test
@@ -17,7 +17,7 @@ CHANGE MASTER TO MASTER_USER= '', MASTER_PASSWORD= '';
 START SLAVE;
 --let $slave_io_errno= 1045, 1593
 --source include/wait_for_slave_io_error.inc
---source include/stop_slave.inc
+--source include/stop_slave_sql.inc
 
 --replace_column 2 ####
 CHANGE MASTER TO MASTER_USER= 'root', MASTER_PASSWORD= '';
diff --git a/mysql-test/suite/rpl/t/rpl_db_stmts_ignored.test b/mysql-test/suite/rpl/t/rpl_db_stmts_ignored.test
new file mode 100644
index 000000000000..a03c9cccac9a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_db_stmts_ignored.test
@@ -0,0 +1,91 @@
+#
+# ==== Purpose ====
+#
+# This test script is created to test how filtering rules act
+# against CREATE/ALTER/DROP DATABASE commands (CAD commands)
+# Also it will check that there will be gtid empty transaction
+# created after these CAD commands are filtered out.
+#
+# ==== Implementation ====
+#
+# USE-CASE 1: Test --replication-ignore-db=db1 filter
+#
+# S1: Install --replication-ignore-db=db1 filter on slave
+# S2: Try all three CAD statements (CREATE/ALTER/DROP)
+# S3: Check that they are filtered and check that there is no gap in
+#     GTID_EXECUTED_SET.
+# USE-CASE 2: Repeat S1-S3 steps against --replicate-do-db=db2 filter rule.
+# USE-CASE 3: Repeat S1-S3 steps against --replicate-wild-ignore-table=db1.%
+#             filter rule.
+# USE-CASE 4: Repeat S1-S3 steps against --replicate-do-db=db2 and
+#             --replicate-wild-ignore-table=db1.t% filter rule.
+#
+#  ==== References ====
+#
+# Bug#27308751 FILTERED REPLICATION LEAVES GTID HOLES WITH CREATE DATABASE
+#
+--source include/have_gtid.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+--echo #
+--echo # Test replicate-ignore-db=db1 filter
+--echo #
+#
+# Test replicate-ignore-db=db1 filter rule on
+# CREATE/ALTER/DROP DATABASE 'db1' command
+# These commands should be skipped.
+#
+--let $rpl_server_number= 2
+--let $rpl_start_with_gtids= 1
+--let $rpl_server_parameters=--replicate-ignore-db=db1 --skip_slave_start=FALSE
+--source include/rpl_restart_server.inc
+--source extra/rpl_tests/rpl_db_stmts_ignored.inc
+
+--echo #
+--echo # Test replicate-do-db=db2 filter
+--echo #
+#
+# Test replicate-do-db=db2 filter rule on
+# CREATE/ALTER/DROP DATABASE 'db1' command
+# These commands should be skipped.
+#
+--let $rpl_server_number= 2
+--let $rpl_start_with_gtids= 1
+--let $rpl_server_parameters=--replicate-do-db=db2 --skip_slave_start=FALSE
+--source include/rpl_restart_server.inc
+--source extra/rpl_tests/rpl_db_stmts_ignored.inc
+
+--echo #
+--echo # Test replicate-wild-ignore-table=db1.% filter
+--echo #
+#
+# Test replicate-wild-ignore-table=db1.% filter rule on
+# CREATE/ALTER/DROP DATABASE 'db1' command.
+# These commands should be skipped.
+#
+--let $rpl_server_number= 2
+--let $rpl_start_with_gtids= 1
+--let $rpl_server_parameters=--replicate-wild-ignore-table=db1.% --skip_slave_start=FALSE
+--source include/rpl_restart_server.inc
+--source extra/rpl_tests/rpl_db_stmts_ignored.inc
+
+--echo #
+--echo # Test replicate-wild-ignore-table=db1.% and --replicate-do-db=db2
+--echo # filter combination
+#
+# Test replicate-wild-ignore-table=db1.% and --replicate-do-db=db2
+# filter combination rule on CREATE/ALTER/DROP DATABASE 'db1' command.
+# These commands should be skipped.
+#
+--let $rpl_server_number= 2
+--let $rpl_start_with_gtids= 1
+--let $rpl_server_parameters= --replicate-do-db=db2 --replicate-wild-ignore-table=db1.t% --skip_slave_start=FALSE
+--source include/rpl_restart_server.inc
+--source extra/rpl_tests/rpl_db_stmts_ignored.inc
+
+--echo #
+--echo # Cleanup
+--echo #
+--source include/force_restart.inc
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_deadlock_runlock_channelmap_lockstatus.test b/mysql-test/suite/rpl/t/rpl_deadlock_runlock_channelmap_lockstatus.test
new file mode 100644
index 000000000000..ab796938aefe
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_deadlock_runlock_channelmap_lockstatus.test
@@ -0,0 +1,149 @@
+# ==== Purpose ====
+#
+# Test verifies that there is no deadlock when below threads are executed in
+# parallel.
+#
+# 1. Server thread executing START SLAVE SQL_THREAD.
+# 2. Stopping SQL Thread.
+# 3. Server thread calling show_heartbeat_period() function
+#    through any of the following queries
+#
+#    -  SHOW STATUS LIKE 'Slave_heartbeat_period'
+#    -  SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
+#    -  SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+#
+# ==== Implementation ====
+#
+# Simulate the deadlock environment using DEBUG_SYNC utility,
+#
+# 1) START SLAVE SQL_THREAD
+#    Owns: Multisource_info::m_channel_map_lock
+#    Waits for: Relay_log_info::run_lock
+#
+# 2) Stopping SQL thread
+#    Owns: Relay_log_info::run_lock
+#    Waits for: LOCK_status
+#
+# 3) SHOW STATUS LIKE 'Slave_heartbeat_period'
+#    Owns: LOCK_status
+#    Waits for: Multisource_info::m_channel_map_lock
+#
+# ==== References ====
+#
+# Bug#29697588: MYSQLD DEADLOCK OF ALL CLIENT THREADS ORIGINATING FROM 3-WAY
+#               DEADLOCK
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("Failed during slave thread initialization.*");
+# Create new connections on slave
+connect(slave2, 127.0.0.1, root, , test, $SLAVE_MYPORT, );
+
+# Iteration 1 with "SHOW STATUS LIKE 'Slave_heartbeat_period'"
+# Iteration 2 with "SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS"
+# Iteration 3 with "SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS"
+
+--let $iter=0
+while ($iter < 3)
+{
+  #############################################################################
+  # Thread 1: START SLAVE SQL_THREAD
+  #
+  # Halt the execution after the thread takes
+  # Multisource_info::m_channel_map_lock and before it reacquires
+  # Relay_log_info::run_lock after it was signaled on the start_cond.
+  #############################################################################
+  --source include/stop_slave_sql.inc
+  --source include/rpl_connection_slave1.inc
+  SET DEBUG_SYNC='start_slave_thread_after_signal_on_start_cond SIGNAL reached_start_slave_thread WAIT_FOR continue_start_slave_thread';
+
+  #############################################################################
+  # Thread 2: Stopping SQL Thread
+  #
+  # Halt the execution before the thread takes Relay_log_info::run_lock and
+  # before calling THD::release resources() where it tries to acquire
+  # LOCK_status. This is done by simulating error on slave initialization
+  # which makes SQL thread to stop and call THD::release_resources() in the
+  # end.
+  #############################################################################
+  --let debug_point= simulate_sql_slave_error_on_init
+  --source include/add_debug_point.inc
+  --let debug_point= pause_after_sql_thread_stop_hook
+  --source include/add_debug_point.inc
+  --source include/rpl_connection_slave1.inc
+  --send START SLAVE SQL_THREAD
+
+  #############################################################################
+  # Thread 3: SHOW STATUS VARIABLES LIKE '%heartbeat%'
+  #
+  # Halt the execution after the thread takes LOCK_status and in
+  # show_heartbeat_period() before it tries to acquire
+  # Multisource_info::m_channel_map_lock.
+  #############################################################################
+  --let $rpl_connection_name= slave2
+  --source include/rpl_connection.inc
+  SET DEBUG_SYNC='dsync_show_heartbeat_period SIGNAL reached_show_heartbeat_period WAIT_FOR continue_show_thread';
+
+  # The threads can enter into deadlock even when thread 3 is replaced with
+  # another thread executing any of the following queries.
+  #
+  #   1. SHOW STATUS LIKE 'Slave_heartbeat_period'
+  #   2. SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
+  #   3. SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+
+  if ($iter == 0)
+  {
+    --let $query= SHOW STATUS LIKE 'Slave_heartbeat_period'
+  }
+  if ($iter == 1)
+  {
+    --let $query= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
+  }
+  if ($iter == 2)
+  {
+    --let $query= SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  }
+  --send_eval $query
+
+  # Wait for all three threads to reach their debug sync points.
+  --source include/rpl_connection_slave.inc
+  SET DEBUG_SYNC='now WAIT_FOR reached_start_slave_thread';
+  SET DEBUG_SYNC='now WAIT_FOR reached_stopping_sql_thread';
+  SET DEBUG_SYNC='now WAIT_FOR reached_show_heartbeat_period';
+
+  # First signal the SQL thread so that it acquires run_lock and then signal
+  # other threads.
+  SET DEBUG_SYNC='now SIGNAL continue_to_stop_sql_thread';
+  SET DEBUG_SYNC='now SIGNAL continue_show_thread';
+  SET DEBUG_SYNC='now SIGNAL continue_start_slave_thread';
+
+  # Wait for the threads to complete their execution.
+  --disable_result_log
+  --let $rpl_connection_name= slave1
+  --source include/rpl_connection.inc
+  --reap
+  --let $rpl_connection_name= slave2
+  --source include/rpl_connection.inc
+  --reap
+  --enable_result_log
+
+  # Verify that SQL thread has failed during initialization.
+  --let $slave_sql_errno= convert_error(ER_SLAVE_FATAL_ERROR)
+  --source include/wait_for_slave_sql_error.inc
+
+  # Clear the debug points on slave
+  --let debug_point= simulate_sql_slave_error_on_init
+  --source include/remove_debug_point.inc
+
+  --let debug_point= pause_after_sql_thread_stop_hook
+  --source include/remove_debug_point.inc
+
+  SET DEBUG_SYNC='RESET';
+
+  --inc $iter
+}
+--source include/start_slave_sql.inc
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_different_index_master_slave.test b/mysql-test/suite/rpl/t/rpl_different_index_master_slave.test
new file mode 100644
index 000000000000..ccac9ba64b39
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_different_index_master_slave.test
@@ -0,0 +1,70 @@
+# =========== Purpose ===========
+#
+# To test that if different primary key is used on master and slave
+# and if there is an  Unique key present on slave then that should be
+# used for lookup replicated rows.
+# Earlier in above cases a TABLE_SCAN was being performed which can be
+# slower than INDEX_SCAN that will be performed after the bug fix.
+#
+# ========= Reference ==========
+# Bug#26450129:DEAD BRANCH IN SEARCH_KEY_IN_TABLE()
+
+# The status variable Slave_rows_last_search_algorithm_used is defined
+# only in Debug mode, running this test in non-debug mode will cause
+# assert failure.
+--source include/have_debug.inc
+--source include/have_binlog_format_row.inc
+--let $rpl_skip_start_slave = 1
+--source include/master-slave.inc
+
+--echo ==== Initialize ====
+
+--source include/rpl_connection_slave.inc
+SET @old_slave_rows_search_algorithms = @@global.slave_rows_search_algorithms;
+SET @@global.slave_rows_search_algorithms = 'INDEX_SCAN,TABLE_SCAN';
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+SET @@session.binlog_row_image = 'MINIMAL';
+
+SET @@session.sql_log_bin = 0;
+CREATE TABLE t1 (a INT, b INT, PRIMARY KEY(b));
+SET @@session.sql_log_bin = 1;
+--source include/rpl_connection_slave.inc
+CREATE TABLE t1 (a INT, b INT NOT NULL, UNIQUE KEY(b), PRIMARY KEY(a));
+--source include/rpl_connection_master.inc
+
+--let $row_count = 100
+--let $rows = (0, 0)
+--let $i = 1
+while ($i < $row_count) {
+  --let $rows = $rows, ($i, $i)
+  --inc $i
+}
+--disable_query_log
+--echo INSERT INTO t1 VALUES [$row_count rows];
+eval INSERT INTO t1 VALUES $rows;
+--enable_query_log
+--source include/sync_slave_sql_with_master.inc
+
+--echo ==== Test ====
+
+--source include/rpl_connection_master.inc
+
+DELETE FROM t1 WHERE b != 0 ORDER BY b DESC;
+--source include/sync_slave_sql_with_master.inc
+
+
+--let $assert_cond = "[SHOW STATUS LIKE \"Slave_rows_last_search_algorithm_used\", Value, 1]" = "INDEX_SCAN"
+--let $assert_text= The search algorithm used while deleting rows is INDEX_SCAN, in the code before this bug it was TABLE_SCAN
+--source include/assert.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+SET @@global.slave_rows_search_algorithms = @old_slave_rows_search_algorithms;
+
+--let $rpl_only_running_threads=1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt b/mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt
deleted file mode 100644
index 8f1731cbdd21..000000000000
--- a/mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-debug=+d,extra_row_data_set
diff --git a/mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt b/mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt
deleted file mode 100644
index e7068ac333ec..000000000000
--- a/mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-debug=+d,extra_row_data_check
diff --git a/mysql-test/suite/rpl/t/rpl_extra_row_data.test b/mysql-test/suite/rpl/t/rpl_extra_row_data.test
index a9d0ed242a44..b5f6d698eb1f 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_row_data.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_row_data.test
@@ -3,6 +3,13 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
+connection slave;
+--let $debug_point_silent= 1
+--let $debug_point= extra_row_data_check
+--source include/add_debug_point.inc
+connection master;
+--let $debug_point= extra_row_data_set
+--source include/add_debug_point.inc
 --echo Basic insert, update, delete from Master->Slave
 --echo DBUG code will set + check transfer of extra
 --echo row data in RBR
@@ -60,4 +67,9 @@ source include/check_slave_is_running.inc;
 connection master;
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
+--let $debug_point= extra_row_data_check
+--source include/remove_debug_point.inc
+connection master;
+--let $debug_point= extra_row_data_set
+--source include/remove_debug_point.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_fde_write.test b/mysql-test/suite/rpl/t/rpl_fde_write.test
new file mode 100644
index 000000000000..a2b33175ad42
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_fde_write.test
@@ -0,0 +1,64 @@
+# ==== Purpose ====
+#
+# Tests the statement based replication of tables in a cross version setup
+# where the master is a 8.0 server and slave is a 5.7 server, and verify
+# that there is no crash at the time of FLUSH LOGS on slave side.
+#
+# ==== Implementation ====
+#
+# Start a master server on 5.7
+# Copy the binary log file and index of a 8.0 master server to the datadir of 5.7 master server
+# Start the slave on a 5.7 server
+# Execute Flush logs command on the slave
+# Without the fix the Flush Logs command will trigger an ASAN failure
+#
+# ==== References ====
+#
+# Bug#29417234:CONTRIBUTION BY FACEBOOK: FIX WRITING FORMAT DESCRIPTION EVENT
+#
+
+--source include/have_binlog_format_statement.inc
+--source include/not_gtid_enabled.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+--let $MYSQLD_MASTER_DATADIR= `select @@datadir`
+RESET MASTER;
+--let $is_windows = `SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32', 'Win64', 'Windows')`
+
+# Stop the master
+--let $rpl_server_number= 1
+--source include/rpl_stop_server.inc
+
+# clear master datadir
+--remove_file $MYSQLD_MASTER_DATADIR/master-bin.000001
+--remove_file $MYSQLD_MASTER_DATADIR/master-bin.index
+
+# on Win* platforms path separator is backslash
+if ($is_windows)
+{
+    --copy_file std_data/slave-relay-bin-win.index $MYSQLD_MASTER_DATADIR/master-bin.index
+}
+if (!$is_windows)
+{
+   --copy_file std_data/slave-relay-bin.index $MYSQLD_MASTER_DATADIR/master-bin.index
+}
+
+--copy_file std_data/slave-relay-bin.000001 $MYSQLD_MASTER_DATADIR/master-bin.000001
+
+# Start the master
+--source include/rpl_start_server.inc
+
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
+CALL mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log:");
+START SLAVE;
+--let $wait_binlog_event= DROP
+--source include/wait_for_binlog_event.inc
+
+FLUSH LOGS;
+STOP SLAVE;
+RESET SLAVE;
+
+--let $rpl_only_running_threads= 1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_flush_log_after_sync_stage.test b/mysql-test/suite/rpl/t/rpl_flush_log_after_sync_stage.test
new file mode 100644
index 000000000000..956c867711ef
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_flush_log_after_sync_stage.test
@@ -0,0 +1,53 @@
+#
+# ==== Purpose ====
+#
+# Test verifies that when binlog rotation occurs before updating
+# MYSQL_BIN_LOG::binlog_end_pos in SYNC stage of binlog group commit, receiver
+# thread doesn't stop with an error. Receiver thread's execution should be
+# fine.
+#
+# ==== Implementation ====
+#
+# 1. Have sync_binlog= 1.
+# 2. Hold master's binlog sender thread during sync stage of binlog group
+#    commit just before updating the binary log end position.
+# 3. Execute FLUSH LOGS in another session so that binary log gets rotated.
+# 4. Allow the sync operation to proceed further in master connection.
+# 5. Slave should be in sync with master. It should not error out.
+#
+# ==== References ====
+#
+# Bug #22252394   SLAVE I/O THREAD MAY STOP WHEN BINLOG ROTATES
+#
+#
+--source include/have_debug_sync.inc
+# Testing it in one mode is enough
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+SET @save_sync_binlog = @@GLOBAL.sync_binlog;
+SET GLOBAL sync_binlog = 1;
+
+# Block the session before binlog end position is updated during sync stage.
+SET DEBUG_SYNC = 'before_sync_binlog_file SIGNAL parked_in_sync WAIT_FOR continue';
+
+send CREATE TABLE t1(c1 INT);
+
+--let $rpl_connection_name= default
+--source include/rpl_connection.inc
+SET DEBUG_SYNC = "now WAIT_FOR parked_in_sync";
+FLUSH LOGS;
+SET DEBUG_SYNC = "now SIGNAL continue";
+
+--source include/rpl_connection_master.inc
+--reap
+INSERT INTO t1 VALUES (10);
+--source include/sync_slave_sql_with_master.inc
+--let diff_tables=master:t1, slave:t1
+--source include/diff_tables.inc
+
+--source include/rpl_connection_master.inc
+SET DEBUG_SYNC = 'RESET';
+SET GLOBAL sync_binlog = @save_sync_binlog;
+DROP TABLE t1;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_flush_logs.test b/mysql-test/suite/rpl/t/rpl_flush_logs.test
index f98d0173d54a..2bed6780f532 100644
--- a/mysql-test/suite/rpl/t/rpl_flush_logs.test
+++ b/mysql-test/suite/rpl/t/rpl_flush_logs.test
@@ -1,5 +1,5 @@
 #
-# WL#5124
+# WL#5142
 # This test verifies if the 'flush individual logs' statement 
 # works fine.  
 #
@@ -147,5 +147,44 @@ file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000003;
 file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000007;
 file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000008;
 
+#
+# Bug #24786290: REPLICATION BREAKS AFTER BUG #74145 HAPPENS IN MASTER
+#
+# === Purpose ===
+#
+# This test verifies that failed FLUSH <individual> LOGS statements
+# are not written to binary log.
+
+--connection master
+--let $binlog_file= query_get_value(SHOW MASTER STATUS,File,1)
+--let $binlog_start= query_get_value(SHOW MASTER STATUS,Position,1)
+--let $master_pos_before_flush_logs= $binlog_start
+
+# Make FLUSH <individual> LOGS fail by changing
+# the permissions of the slow log and general log.
+--let $slow_log= `SELECT @@global.slow_query_log_file`
+--chmod 0000 $slow_log
+--replace_regex /.*File .* not found .*/File not found (Errcode: ##)/
+--error 29
+FLUSH SLOW LOGS;
+
+--let $general_log= `SELECT @@global.general_log_file`
+--chmod 0000 $general_log
+--replace_regex /.*File .* not found .*/File not found (Errcode: ##)/
+--error 29
+FLUSH GENERAL LOGS;
+
+# Assert that the above statements are not written to the binlog.
+--let $master_pos_after_flush_logs= query_get_value(SHOW MASTER STATUS,Position,1)
+--let $assert_text= assert that the above events are not written to binlog
+--let $assert_cond= $master_pos_before_flush_logs = $master_pos_after_flush_logs
+--source include/assert.inc
+--source include/show_binlog_events.inc
+
+# Restore permissions
+--chmod 0644 $slow_log
+--chmod 0644 $general_log
+
+--source include/sync_slave_io_with_master.inc
 --source include/start_slave_sql.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gcol_sec_index.test b/mysql-test/suite/rpl/t/rpl_gcol_sec_index.test
new file mode 100644
index 000000000000..8f3090beb14d
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gcol_sec_index.test
@@ -0,0 +1,136 @@
+#
+# === Purpose ===
+#
+# This test verifies DMLs are applied on a table by the slave when
+# 1. Table on slave has extra generated columns and containing a secondary
+#    indexes defined on the generated columns.
+# 2. Table on master has generated columns and slave modified the table by
+#    changing the generated expressions and adding a secondary index on the
+#    generated columns.
+#
+# === Implementation ===
+# Note:
+# Aliases used:
+# Virtual Generated Column -> VGC
+# Stored Generated Column -> SGC
+#
+# 1. a) Create a table without generated columns.
+#    b) Create a table with a VGC and a SGC with secondary indexes defined on
+#       them.
+#
+# 2. a) For 1.a), Add a VGC and SGC with secondary index on the Slave.
+#    b) For 1.b), Modify the generated expression for the VGC and SGC on the
+#                 Slave.
+#
+# 3. Perform INSERTs on the tables and validate table data.
+#
+# 4. Perform UPDATEs on the tables and validate table data.
+#
+# 5. Perform DELETEs on the tables and validate table data.
+#
+# === References ===
+#
+# BUG#30034874: INDEX CORRUPTION WHEN SLAVE HAS VIRTUAL COLUMNS/INDEXES
+#               AND MASTER DOESN'T
+#
+#
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+# ===========================================================================
+--echo
+--echo # Create a table without generated columns.
+CREATE TABLE t1 (id INT) ENGINE=InnoDB;
+
+--echo
+--echo # Create a table with a VGC and a SGC with secondary indexes defined on
+--echo # them.
+CREATE TABLE t2(
+id INT,
+v_gcol INT GENERATED ALWAYS AS (id + 1) VIRTUAL NOT NULL,
+s_gcol INT GENERATED ALWAYS AS (id + 1) STORED NOT NULL,
+KEY v_idx (v_gcol), KEY s_idx (s_gcol)
+) ENGINE=InnoDB;
+
+# ===========================================================================
+--source include/sync_slave_sql_with_master.inc
+--echo
+--echo # Add a VGC and also define secondary indexes on the VGC and SGC on the
+--echo # Slave.
+ALTER TABLE t1
+ADD v_gcol INT GENERATED ALWAYS AS (id + 1) VIRTUAL NOT NULL,
+ADD s_gcol INT GENERATED ALWAYS AS (id + 1) STORED NOT NULL,
+ADD KEY v_idx (v_gcol), ADD KEY s_idx (s_gcol);
+
+--echo
+--echo # Modify the generated expression for the VGC and SGC on the Slave.
+ALTER TABLE t2
+MODIFY v_gcol INT GENERATED ALWAYS AS (id + 2) VIRTUAL NOT NULL,
+MODIFY s_gcol INT GENERATED ALWAYS AS (id + 2) STORED NOT NULL;
+
+# ===========================================================================
+# Helper file for table data validation.
+--write_file $MYSQLTEST_VARDIR/tmp/validate_table_data.inc
+--let $i= 1
+while ($i != 3)
+{
+  --let diff_tables= master:t$i, slave:t$i
+  --let $mask_column_list= v_gcol, s_gcol
+  --source include/diff_tables.inc
+
+  --let $assert_text= Verified that table t$i has $expected_row_count rows
+  --let $assert_cond= [SELECT count(*) as count from t$i where t$i.v_gcol= t$i.id+$i and t$i.s_gcol= t$i.id+$i ] = $expected_row_count
+  --source include/assert.inc
+
+  --inc $i
+}
+EOF
+
+# ===========================================================================
+--source include/rpl_connection_master.inc
+--echo
+--echo # INSERT values into the tables on the master.
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2(id) VALUES (1);
+
+--source include/sync_slave_sql_with_master.inc
+--echo
+--echo # Validate the table data.
+--let $expected_row_count= 1
+--source $MYSQLTEST_VARDIR/tmp/validate_table_data.inc
+
+# ===========================================================================
+--echo
+--echo # UPDATE a record in the tables on the master.
+--source include/rpl_connection_master.inc
+UPDATE t1 SET id= 2 WHERE id= 1;
+UPDATE t2 SET id= 2 WHERE id= 1;
+
+--source include/sync_slave_sql_with_master.inc
+--echo
+--echo # Validate the table data.
+--let $expected_row_count= 1
+--source $MYSQLTEST_VARDIR/tmp/validate_table_data.inc
+
+# ===========================================================================
+--echo
+--echo # DELETE a record in the tables on the master.
+--source include/rpl_connection_master.inc
+DELETE FROM t1 WHERE id= 2;
+DELETE FROM t2 WHERE id= 2;
+
+--source include/sync_slave_sql_with_master.inc
+--echo
+--echo # Validate the table data.
+--let $expected_row_count= 0
+--source $MYSQLTEST_VARDIR/tmp/validate_table_data.inc
+
+# ===================================================================
+--echo
+--echo # Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+DROP TABLE t2;
+--remove_file $MYSQLTEST_VARDIR/tmp/validate_table_data.inc
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_grant.test b/mysql-test/suite/rpl/t/rpl_grant.test
index 40d222ceeffe..c304bba27676 100644
--- a/mysql-test/suite/rpl/t/rpl_grant.test
+++ b/mysql-test/suite/rpl/t/rpl_grant.test
@@ -66,6 +66,8 @@ CREATE TABLE t1 ( c1 INT, c2 INT, c3 INT );
 ## create user, grant and revoke (the last command fails partially)
 --eval CREATE USER '$dbuser'@'localhost'
 --eval GRANT ALL ON $dbname.* TO '$dbuser'@'localhost'
+
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while granting/revoking privileges in databases");
 --error ER_NONEXISTING_GRANT
 --eval REVOKE ALL ON $dbname.* FROM '$dbuser'@'localhost', 'b54866_fake_user'
 
@@ -107,6 +109,8 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 
 ## revoke should now fail and log a incident event
 --connection master
+
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while storing table level and column level grants in the privilege tables.");
 --error ER_NONEXISTING_GRANT
 --eval REVOKE ALTER ON TABLE $dbname.t1 FROM '$dbuser'@'localhost', 'b54866_fake_user'
 
@@ -134,6 +138,7 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 --echo ##########
 
 -- connection master
+call mtr.add_suppression("\\[ERROR\\] REVOKE/GRANT failed while storing routine level grants in the privilege tables");
 DELIMITER |;
 CREATE PROCEDURE b54866_p() BEGIN SELECT 1; END|
 CREATE FUNCTION b54866_f() RETURNS INT BEGIN RETURN 1; END|
@@ -156,7 +161,6 @@ DELIMITER ;|
 --echo ##########
 
 -- connection master
-
 -- echo #### PROCEDURE ASSERTION
 --error ER_NONEXISTING_GRANT
 --eval REVOKE EXECUTE ON PROCEDURE $dbname.b54866_p FROM '$dbuser'@'localhost', 'b54866_fake_user'
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_delete_memory_table_after_start_server.test b/mysql-test/suite/rpl/t/rpl_gtid_delete_memory_table_after_start_server.test
deleted file mode 100644
index 14427f60a615..000000000000
--- a/mysql-test/suite/rpl/t/rpl_gtid_delete_memory_table_after_start_server.test
+++ /dev/null
@@ -1,235 +0,0 @@
-################################################################################
-# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
-#              IS OVERRIDDEN BY 'DELETE' CMD
-#
-# Memory table's data will be lost after server restarts. To keep the data
-# consistency between master and slave, it just binlogs
-# 'DELETE FROM `db`.`table_name`' when the memory table is locked first time.
-# So DELETE statement could be binlogged in many statements.
-#
-# Because it was not handled correctly, it caused below problems:
-## - COM_FIELD_LIST
-#   it didn't flush binlog cache to binlog file. So the DELETEs were not
-#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
-#
-# - CREATE TABLE ... LIKE memory_table
-# - CREATE TABLE ... SELECT memory_table
-#   They were binlogged like:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
-#
-#   Both statements shared the same gtid event. That was not correct.
-#
-# - DELETE was binlogged without BEGIN and COMMIT
-#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#   it was binlogged as:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#
-# The test cases verify above statements can binlog 'DELETE' statement
-# correctly. A few extra test cases were added to verify some special
-# situations that updating or modifying a memory table.
-################################################################################
---source include/not_group_replication_plugin.inc
---source include/mysql_have_debug.inc
---source include/have_gtid.inc
---let $rpl_gtid_utils= 1
---source include/master-slave.inc
-
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
-CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
-CREATE DATABASE db1;
-CREATE DATABASE db2;
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT);
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-
---delimiter |
-CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-  INSERT INTO t1 SELECT * FROM db2.mem_t3;
-END |
---delimiter ;
-
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
-INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
-
---source include/sync_slave_sql_with_master.inc
---source include/stop_slave_io.inc
---source include/rpl_connection_master.inc
-
-XA START 'xa1';
---disable_warnings
-INSERT INTO t1 VALUES(1);
---enable_warnings
-XA END 'xa1';
-XA PREPARE 'xa1';
---source include/save_master_pos.inc
-
---let $rpl_server_number=1
---source include/rpl_restart_server.inc
-
---source include/rpl_connection_slave.inc
---source include/start_slave_io.inc
---source include/sync_slave_sql.inc
-
---echo #
---echo # Test case 1: verify XA COMMIT can be binlogged correctly.
---echo #
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
---exec echo "use test; XA COMMIT 'xa1';" > $MYSQLTEST_VARDIR/tmp/my.sql
-
-# When build-completion-hash is on, mysql client will fetch table name
-# and field name from mysql server automatically just after connecting
-# to the server correctly. it fetches the field by using COM_FIELD_LIST
-# which is expected by this test.
---exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
---remove_file $MYSQLTEST_VARDIR/tmp/my.sql
-
---let $gtid_step_count= 3
---source include/gtid_step_assert.inc
-
---let $limit= 0,8
---let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---let $event_sequence= $event_sequence # $event_sequence
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
---let $rpl_diff_statement= SELECT * FROM t1
---source include/rpl_diff.inc
-
---echo #
---echo # Test case 2: verify COM_FIELD_LIST can binlog DELETE FROM mem_xx
---echo #              correctly
---echo #
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
-
---exec echo "use db1;" > $MYSQLTEST_VARDIR/tmp/my.sql
---exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
---remove_file $MYSQLTEST_VARDIR/tmp/my.sql
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM mem_t1;
-SELECT * FROM mem_t2;
-
---echo #
---echo # Test case 3: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in CREATE TABLE ... LIKE
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-CREATE TABLE t3 LIKE db2.mem_t1;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---let $limit= 0,4
---let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t1;
-
---echo #
---echo # Test case 4: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in DML
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-# mem_t3 is empty, the UNION makes sure that a row event is binlogged.
-INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
-#--let $limit= 0,4
-#--let $event_sequence= Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t2;
-
---echo #
---echo # Test case 5: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in a trigger
-
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-INSERT INTO t2 VALUES(11);
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
-
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t3;
-
---echo #
---echo # Test case 6: Verify DELETE FROM mem_xx can be binlog correctly
---echo #              when ALTER the memory table.
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
---source include/save_binlog_position.inc
-
-ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
-
---let $gtid_step_count= 2
---source include/gtid_step_assert.inc
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM db2.mem_t4;
-
---echo #
---echo # Test case 7: Verify DELETE FROM mem_xx can be binlog correctly
---echo #              when DROP the memory table.
---source include/rpl_connection_master.inc
---source include/gtid_step_reset.inc
-DROP TABLE db2.mem_t5;
-
---let $gtid_step_count= 1
---source include/gtid_step_assert.inc
---source include/sync_slave_sql_with_master.inc
-
---source include/rpl_connection_master.inc
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
-DROP DATABASE db1;
-DROP DATABASE db2;
-
---source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_deleted_binlog_fail_to_connect.test b/mysql-test/suite/rpl/t/rpl_gtid_deleted_binlog_fail_to_connect.test
new file mode 100644
index 000000000000..6769a775df4f
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_deleted_binlog_fail_to_connect.test
@@ -0,0 +1,146 @@
+# ==== Purpose ====
+#
+# Test that the slave fails to connect to the master with
+# MASTER_AUTO_POSITION=1 if the slave is missing some transactions that
+# the user has manually deleted the binary logs that slave requires.
+#
+# ==== Implementation ====
+#
+# 1) Create a master-slave setup.
+# 2) Create a table on master, sync it, stop the slave threads and dump thread
+#    on master.
+# 3) On master, generate a transaction, flush the binary log and delete the
+#    first binary logs so that only remaining binlog only contains transaction
+#    UUID:3.
+# 4) Verify that the slave fails if it tries to connect using CHANGE MASTER TO
+#    MASTER_AUTO_POSITION=1.
+# 5) Verify that appropriate messages are logged into master's and slave's
+#    error log.
+# 6) Verify that replication succeeds if it tries to connect using CHANGE
+#    MASTER TO MASTER_LOG_POS.
+# 7) Cleanup.
+#
+# ==== References ====
+#
+# Bug#29769293 - ERROR 1236 "MASTER HAS PURGED BINARY LOGS CONTAINING GTIDS":
+#                GTID NOT LOGGED
+
+# This test is binlog format agnostic
+--source include/have_binlog_format_row.inc
+--source include/have_debug.inc
+--source include/have_gtid.inc
+--let $rpl_gtid_utils= 1
+
+--echo #
+--echo # 1) Create a master-slave setup.
+--echo #
+--source include/master-slave.inc
+
+--let $master_uuid= `SELECT @@SERVER_UUID`
+
+--echo #
+--echo # 2) Create a table on master, sync it, stop the slave threads and dump
+--echo #    thread on master.
+--echo #
+CREATE TABLE t1 (a INT) ENGINE = InnoDB;
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+--source include/rpl_connection_master.inc
+# Need to kill the dump thread explicitly: stop slave does not do
+# that, and if the dump thread is slow, it will still be reading from
+# the old binlog at the time we do PURGE BINARY LOGS below. That would
+# prevent PURGE BINARY LOGS from purging the log.
+--source include/stop_dump_threads.inc
+
+--echo #
+--echo # 3) On master, generate a transaction, flush the binary log and delete
+--echo #    the first binary logs so that only remaining binlog only contains
+--echo #    transaction UUID:3.
+--echo #
+INSERT INTO t1 VALUES (1);
+
+--let $master_file_old= query_get_value(SHOW MASTER STATUS, File, 1)
+FLUSH LOGS;
+
+--let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
+INSERT INTO t1 VALUES (2);
+--save_master_pos
+
+# Remove the binary log manually
+--let $MASTER_DATADIR= `select @@datadir`
+--remove_file $MASTER_DATADIR/$master_file_old
+
+--echo #
+--echo # 4) Verify that the slave fails if it tries to connect using CHANGE
+--echo #    MASTER TO MASTER_AUTO_POSITION=1.
+--echo #
+--source include/rpl_connection_slave.inc
+CHANGE MASTER TO MASTER_AUTO_POSITION = 1;
+
+START SLAVE;
+
+--let $slave_io_errno= 1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
+
+--echo #
+--echo # 5) Verify that appropriate messages are logged into master's and slave's
+--echo #    error log.
+--echo #
+
+# Verify that warning about the missing transactions are logged into the master's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_match= .*Cannot replicate to server with server_uuid.*The missing transactions are '.*:1'.*
+--let $assert_select= Cannot replicate to server with server_uuid
+--let $assert_text= Found warning containing lost GTIDs in the master error log.
+--source include/assert_grep.inc
+
+# Verify that an error about the missing transactions are logged into the slave's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_match= .*Replicate the missing transactions from elsewhere, or provision a new slave from backup.*the missing transactions are '.*:1'.*
+--let $assert_select= Replicate the missing transactions from elsewhere, or provision a new slave from backup
+--let $assert_text= Found warning containing lost GTIDs in the slave error log.
+--source include/assert_grep.inc
+
+--echo #
+--echo # 6) Verify that replication succeeds if it tries to connect using CHANGE
+--echo #    MASTER TO MASTER_LOG_POS.
+--echo #
+--replace_result $master_file MASTER_FILE $master_pos MASTER_POS
+--eval CHANGE MASTER TO MASTER_LOG_FILE = '$master_file', MASTER_LOG_POS = $master_pos, MASTER_AUTO_POSITION = 0
+
+--source include/start_slave.inc
+--sync_with_master
+
+--let $assert_text= t1 should contain only one row with the value 2
+--let $assert_cond= "[SELECT COUNT(*) FROM t1]" = "1" AND "[SELECT * FROM t1]" = "2"
+--source include/assert.inc
+--source include/stop_slave.inc
+
+# Suppress the error on master.
+--source include/rpl_connection_master.inc
+CALL mtr.add_suppression("Cannot replicate to server.*server has purged required binary logs.*");
+CALL mtr.add_suppression("Failed to open log");
+CALL mtr.add_suppression("Could not open log");
+
+# Suppress the error on slave.
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missing transactions from elsewhere");
+
+--echo #
+--echo # 7) Cleanup.
+--echo #
+--disable_warnings
+RESET MASTER;
+RESET SLAVE;
+--source include/rpl_connection_master.inc
+RESET MASTER;
+--source include/rpl_connection_slave.inc
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+--enable_warnings
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_disconnect_drop_temporary_table.test b/mysql-test/suite/rpl/t/rpl_gtid_disconnect_drop_temporary_table.test
deleted file mode 100644
index 577b5f1fa213..000000000000
--- a/mysql-test/suite/rpl/t/rpl_gtid_disconnect_drop_temporary_table.test
+++ /dev/null
@@ -1,119 +0,0 @@
-# ==== Purpose ====
-#
-# When a client disconnects, temporary tables created by the client
-# are dropped.  This test verifies that this works regardless of what
-# GTID_NEXT has been set to.
-#
-# The following are tested:
-#
-# - GTID_NEXT is set and no transaction started.
-# - GTID_NEXT is set and transaction started but not ended.
-# - GTID_NEXT is set and transaction committed.
-# - GTID_NEXT is set and transaction rolled back.
-#
-# The test is run both with gtid_mode=on and gtid_mode=off. If
-# gtid_mode=on, it sets gtid_next='UUID:NUMBER'. If gtid_mode=off, it
-# sets gtid_next='ANONYMOUS'.
-#
-# ==== Implementation ====
-#
-# The core of the logic is: Create a connection. Create a temporary
-# table on the connection. Set GTID_NEXT. Disconnect.
-#
-# The test does this four times, each time doing something different
-# between set gtid_next and disconnect.
-#
-# The test uses include/set_gtid_next_gtid_mode_agnostic.inc to set
-# gtid_next to 'UUID:NUMBER' if gtid_mode=on and 'ANONYMOUS' if
-# gtid_mode=off.
-
---source include/not_group_replication_plugin.inc
---let $rpl_gtid_utils= 1
---source include/master-slave.inc
-
---let $i= 1
-
-CREATE TABLE t (a INT);
-
-while ($i <= 4)
-{
-  if ($i == 1)
-  {
-    --echo ---- 1. Disconnect after SET GTID_NEXT ----
-  }
-  if ($i == 2)
-  {
-    --echo ---- 2. Disconnect in the middle of transaction ----
-  }
-  if ($i == 3)
-  {
-    --echo ---- 3. Disconnect after COMMIT ----
-  }
-  if ($i == 4)
-  {
-    --echo ---- 4. Disconnect after ROLLBACK ----
-  }
-
-  # Create con1.
-  --let $rpl_connection_name= con1
-  --let $rpl_server_number= 1
-  --source include/rpl_connect.inc
-
-  --let $rpl_connection_name= con1
-  --source include/rpl_connection.inc
-
-  # Create temp table.
-  CREATE TEMPORARY TABLE tt (a INT);
-
-  # Set gtid_next
-  --source include/set_gtid_next_gtid_mode_agnostic.inc
-
-  # Execute (partial) transaction
-  if ($i >= 2)
-  {
-    BEGIN;
-    INSERT INTO t VALUES (1);
-
-    if ($i == 3)
-    {
-      COMMIT;
-    }
-    if ($i == 4)
-    {
-      ROLLBACK;
-    }
-  }
-
-  --connection master
-  --source include/save_binlog_position.inc
-  --source include/gtid_step_reset.inc
-
-  # Disconnect
-  --echo # Disconnecting.
-  --disconnect con1
-
-  # Verify that the binlog contains the expected events.
-  --let $event_sequence= (Anonymous_)?Gtid # !Q(DROP.*TEMPORARY.*)
-  --let $wait_for_binlog_events= 1
-  --source include/assert_binlog_events.inc
-
-  # Sync with slave and assert slave has dropped the temp table.
-  --source include/sync_slave_sql_with_master.inc
-  --let $assert_text= Slave should not have any open temporary tables.
-  --let $assert_cond= VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = "SLAVE_OPEN_TEMP_TABLES"
-  --source include/assert.inc
-
-  # Verify that one gtid was added if gtid_mode=on
-  --connection master
-  --let $gtid_step_gtid_mode_agnostic= 1
-  --source include/gtid_step_assert.inc
-
-  --inc $i
-}
-
---echo ---- Clean up ----
-
-DROP TABLE t;
-
---source include/sync_slave_sql_with_master.inc
---source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.cnf b/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.cnf
new file mode 100644
index 000000000000..97c6110fe32d
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.cnf
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+gtid-mode=on
+enforce-gtid-consistency
+log-slave-updates
+
+[mysqld.2]
+gtid-mode=on
+enforce-gtid-consistency
+log-slave-updates
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test b/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test
new file mode 100644
index 000000000000..ec1ed5765901
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_drop_mem_table.test
@@ -0,0 +1,260 @@
+#  ==== Purpose ====
+#
+# The purpose of this test is to verify that TRUNCATE statement is binary
+# logged with correct GTID when a replicated memory table is fisrt updated
+# after a server crash or a server restart.
+#
+#  ==== Requirements ====
+#
+# R1. When there is a replicated memory table, and the slave crashes, the next
+# transaction that updates the memory table shall generate a TRUNCATE statement
+# in the binary log. This test verifies that this works in the below cases:
+
+# R1.1. When the update is applied on a replication channel.
+# R1.2. When the update is applied in a client session having
+#       gtid_next=UUID:NUMBER.
+#
+# R2. The TRUNCATE statement shall have a new GTID generated by the slave.
+#
+# R3. There shall not be a crash.
+#
+# ==== Implementation ====
+#
+# 1. Try to update the memory table on master after restarting the master:
+#
+# 1.1. A DML on the memory table
+# 1.2. A DDL on the memory table.
+# 1.3. A statement that reads from the memory table.
+# 1.4. A transaction containing update on the memory table along with other
+#      table updates.
+# 1.5. A statement containing update on the memory table along with other
+#      table updates.
+# 1.6. A DML on the memory table applied in a client session having
+#      gtid_next=UUID:NUMBER.
+#
+# In each of the above cases:
+# - Verify that TRUNCATE statement is binary logged on the master.
+#
+# 2. Try to update the memory table on master after restarting the slave:
+#
+# 2.1. A DML on the memory table
+# 2.2. A DDL on the memory table.
+# 2.3. A statement that reads from the memory table
+# 2.4. A transaction containing update on the memory table along with other
+#      table updates.
+# 2.5. A statement containing update on the memory table along with other
+#      table updates.
+# 2.6. A DML on the memory table applied in a client session having
+#      gtid_next=UUID:NUMBER.
+#
+# In each of the above cases:
+# - Verify that TRUNCATE statement is binary logged on the slave.
+#
+# ==== References ====
+#
+# Bug#30527929 - RESTART CREATES ANONYMOUS TRANSACTION FOR MEMORY TABLE
+#
+
+--source include/have_gtid.inc
+--source include/master-slave.inc
+
+#Scenario 1
+--source include/rpl_connection_master.inc
+CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+--source include/sync_slave_sql_with_master.inc
+
+# Restart master
+--source include/stop_slave.inc
+--let $rpl_server_number=1
+--source include/rpl_restart_server.inc
+--source include/start_slave.inc
+--source include/rpl_connection_master.inc
+--source include/save_binlog_position.inc
+
+# Scenario 1.1
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 1.2
+ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 1.3
+CREATE TABLE mem_t9 LIKE mem_t3;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 1.4:
+BEGIN;
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+COMMIT;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,14
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 1.5:
+UPDATE mem_t6, mem_t7 SET mem_t6.c1 = mem_t6.c1 + 1, mem_t7.c1 = mem_t7.c1 + 1;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+#Scenario 1.6:
+--let $explicit_gtid=aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1
+--eval SET @@session.gtid_next = '$explicit_gtid'
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+SET @@session.gtid_next = 'AUTOMATIC';
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_master.inc
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+
+# Cleanup
+DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
+--source include/rpl_reset.inc
+
+# Scenario 2:
+--source include/rpl_connection_master.inc
+CREATE TABLE mem_t1 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t2 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t3 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t4 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t5 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t6 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t7 (c1 INT) ENGINE= MEMORY;
+CREATE TABLE mem_t8 (c1 INT) ENGINE= MEMORY;
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t2 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t3 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t6 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t7 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+--source include/sync_slave_sql_with_master.inc
+
+# Restart slave
+--let $rpl_server_number=2
+--source include/rpl_restart_server.inc
+--source include/start_slave.inc
+--source include/save_binlog_position.inc
+
+# Save the UUID of master and slave
+--source include/rpl_connection_master.inc
+--let $master_uuid = `SELECT @@global.server_uuid`
+--source include/rpl_connection_slave.inc
+--let $slave_uuid = `SELECT @@global.server_uuid`
+--let $dont_print_pattern = 1
+
+# Scenario 2.1
+--source include/rpl_connection_master.inc
+INSERT INTO mem_t1 VALUES (1), (2), (3), (4);
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 0,7
+--let $event_sequence= #Gtid/(.*'$slave_uuid:1') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:17') # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 2.2
+--source include/rpl_connection_master.inc
+ALTER TABLE mem_t2 ADD COLUMN (c2 INT);
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid/(.*'$slave_uuid:2') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:18') # !Q(ALTER.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 2.3
+--source include/rpl_connection_master.inc
+CREATE TABLE mem_t9 LIKE mem_t3;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid/(.*'$slave_uuid:3') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:19') # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 2.4:
+--source include/rpl_connection_master.inc
+BEGIN;
+INSERT INTO mem_t4 VALUES (1), (2), (3), (4);
+INSERT INTO mem_t5 VALUES (1), (2), (3), (4);
+COMMIT;
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 0,14
+--let $event_sequence= #Gtid/(.*'$slave_uuid:4') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:20') # !Begin # !Insert # !Commit #Gtid/(.*'$slave_uuid:5') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:21') # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+# Scenario 2.5:
+--source include/rpl_connection_master.inc
+DELIMITER |;
+CREATE FUNCTION f () RETURNS INT BEGIN
+INSERT INTO mem_t6 VALUES (1);
+RETURN 2;
+END|
+DELIMITER ;|
+INSERT INTO mem_t7 VALUES (f());
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 2,12
+--let $event_sequence= #Gtid/(.*'$slave_uuid:6') # !Q(TRUNCATE.*) #Gtid/(.*'$slave_uuid:7') # !Q(TRUNCATE.*) #Gtid/(.*'$master_uuid:23') # !Begin # !Multi_DML # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+#Scenario 2.6:
+--source include/rpl_connection_master.inc
+--eval SET @@session.gtid_next = '$explicit_gtid'
+INSERT INTO mem_t8 VALUES (1), (2), (3), (4);
+SET @@session.gtid_next = 'AUTOMATIC';
+--source include/sync_slave_sql_with_master.inc
+--source include/rpl_connection_slave.inc
+--let $limit= 0,7
+--let $event_sequence= #Gtid/(.*'$slave_uuid:8') # !Q(TRUNCATE.*) #Gtid/(.*'$explicit_gtid')# !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP FUNCTION f;
+DROP TABLE mem_t1, mem_t2, mem_t3, mem_t4, mem_t5, mem_t6, mem_t7, mem_t8, mem_t9;
+--let $dont_print_pattern = 0
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mode.test b/mysql-test/suite/rpl/t/rpl_gtid_mode.test
index 0a23c6b9f068..c7d5a9ea2c4c 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_mode.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mode.test
@@ -377,6 +377,7 @@ START SLAVE IO_THREAD;
 --source include/rpl_connection_master.inc
 DROP TABLE t3;
 
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
 --source include/rpl_reset.inc
 
 --echo #
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.cnf b/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.cnf
new file mode 100644
index 000000000000..43642f524d7f
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.cnf
@@ -0,0 +1,19 @@
+# Use default setting for mysqld processes
+!include include/default_mysqld.cnf
+!include include/default_client.cnf
+
+[mysqld.1]
+gtid-mode=on
+enforce-gtid-consistency=on
+
+[mysqld.2]
+gtid-mode=on
+enforce-gtid-consistency=on
+slave-transaction-retries= 0
+slave-preserve_commit-order=OFF
+
+[ENV]
+MASTER_MYPORT=          @mysqld.1.port
+MASTER_MYSOCK=          @mysqld.1.socket
+SLAVE_MYPORT=           @mysqld.2.port
+SLAVE_MYSOCK=           @mysqld.2.socket
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.test b/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.test
new file mode 100644
index 000000000000..0a5d8cef181a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_mts_recovery_with_missing_relay_log.test
@@ -0,0 +1,93 @@
+# === Purpose ===
+#
+# This test verifies that MTS crash recovery succeeds with GTID Auto Position=ON
+# and --relay-log-recovery=ON irrespective of repository type when relay logs
+# that are required to fill the gaps are missing.
+#
+# === Implementation ====
+#
+# 1. Slave is made to crash at a state where gaps are present in MTS execution.
+#    This is done by sourcing
+#    "extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc" file which
+#    simulates MTS gaps and removes the relay logs that are required to fill MTS
+#    gaps.
+#
+# 2. Verify that MTS recovery succeeds on restarting the slave with
+#    --relay-log-recovery=ON.
+#
+# 3. Perform cleanup by sourcing
+#    "extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc"
+#
+# === References ===
+#
+# Bug#28830834: MTS NOT REPLICATION CRASH-SAFE WITH GTID AND ALL THE RIGHT PARAMETERS.
+#
+
+# This test case is binlog format agnostic
+--source include/have_binlog_format_row.inc
+--source include/have_slave_parallel_type_database.inc
+--source include/only_mts_slave_parallel_workers.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+--let $MYSQLD_DATADIR= `SELECT @@datadir`
+CALL mtr.add_suppression("Error looking for file after*");
+CALL mtr.add_suppression("Recovery from master pos*");
+
+--let $k=1
+while($k >= 0)
+{
+  # Enable Master Auto Position
+  --source include/stop_slave.inc
+  CHANGE MASTER TO MASTER_AUTO_POSITION=1;
+  --source include/start_slave.inc
+  # 1. Slave is made to crash at a state where gaps are present in MTS execution.
+  #    This is done by sourcing
+  #    "extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc" file which
+  #    simulates MTS gaps and removes the relay logs that are required to fill MTS
+  #    gaps.
+  --source extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_begin.inc
+  --source include/rpl_connection_slave.inc
+  --let $rpl_server_number= 2
+  --let $rpl_start_with_gtids= 1
+  --let $rpl_server_parameters= --skip_slave_start=1 --sync_master_info=1 --relay-log-recovery=$k
+  --source include/rpl_start_server.inc
+
+  # Due to Bug#29931117, executing START SLAVE after restarting the server
+  # with RELAY_LOG_RECOVERY=OFF throws an error.
+  # Restart with RELEAY_LOG_RECOVERY=ON to complete the recovery.
+  if($k==0)
+  {
+    --error ER_MASTER_INFO
+    START SLAVE;
+
+    --echo "Restart server with RELAY_LOG_RECOVERY=ON followed by START SLAVE
+    --let $rpl_server_parameters= --skip_slave_start=1 --sync_master_info=1 --relay-log-recovery=1
+    --source include/rpl_restart_server.inc
+    --source include/start_slave.inc
+  }
+  # 2. Verify that MTS recovery succeeds on restarting the slave with
+  #    --relay-log-recovery=ON.
+  if($k==1)
+  {
+    --source include/start_slave.inc
+  }
+  --source include/rpl_connection_master.inc
+  --source include/sync_slave_sql_with_master.inc
+  # Compare the tables on master and slave they should be in sync
+  let $m=2;
+  while($m)
+  {
+    --let diff_tables=master:d$m.t, slave:d$m.t
+    --source include/diff_tables.inc
+    --dec $m
+  }
+
+  # Cleanup is done by sourcing
+  # extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+  --source extra/rpl_tests/rpl_generate_mts_gap_with_missing_relaylog_end.inc
+
+  --dec $k
+}
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test b/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
index 35a964eb9a6a..0ea301fde2d7 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
@@ -6,67 +6,125 @@
 #
 # ==== Implementation ====
 #
-# Start master and slave, then stop the slave. Generate a transaction
-# on master and purge it.  Verify that the slave fails if it tries to
-# connect using CHANGE MASTER TO MASTER_AUTO_POSITION, but the slave
-# succeeds if it tries to connect using CHANGE MASTER TO
-# MASTER_LOG_POS.
+# 1) Create a master-slave setup.
+# 2) Create a table on master, sync it, stop the slave threads and dump thread
+#    on master.
+# 3) On master, generate a transaction, flush the binary log and execute PURGE
+#    BINARY LOGS TO command so that only remaining binlog only contains
+#    transaction UUID:3.
+# 4) Verify that the slave fails if it tries to connect using CHANGE MASTER TO
+#    MASTER_AUTO_POSITION=1.
+# 5) Verify that appropriate messages are logged into master's and slave's
+#    error log.
+# 6) Verify that replication succeeds if it tries to connect using CHANGE
+#    MASTER TO MASTER_LOG_POS.
+# 7) Cleanup.
 #
 # ==== References ====
 #
-# Added in WL#3584 - Global Transaction Identifiers
+# WL#3584 - Global Transaction Identifiers
+# Bug#29769293 - ERROR 1236 "MASTER HAS PURGED BINARY LOGS CONTAINING GTIDS":
+#                GTID NOT LOGGED
 
 --source include/not_group_replication_plugin.inc
 --source include/have_debug.inc
 --source include/have_gtid.inc
 --let $rpl_gtid_utils= 1
---source include/master-slave.inc
-
-call mtr.add_suppression("Got fatal error 1236 from master when reading data from binary log: 'The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires.");
 
---echo ######## Initialize ########
+--echo #
+--echo # 1) Create a master-slave setup.
+--echo #
+--source include/master-slave.inc
 
 --let $master_uuid= `SELECT @@SERVER_UUID`
+
+--echo #
+--echo # 2) Create a table on master, sync it, stop the slave threads and dump
+--echo #    thread on master.
+--echo #
 CREATE TABLE t1 (a INT) ENGINE = InnoDB;
 --source include/sync_slave_sql_with_master.inc
 --source include/stop_slave.inc
 
---connection master
+--source include/rpl_connection_master.inc
 # Need to kill the dump thread explicitly: stop slave does not do
 # that, and if the dump thread is slow, it will still be reading from
 # the old binlog at the time we do PURGE BINARY LOGS below. That would
 # prevent PURGE BINARY LOGS from purging the log.
 --source include/stop_dump_threads.inc
 
+--echo #
+--echo # 3) On master, generate a transaction, flush the binary log and execute
+--echo #    PURGE BINARY LOGS TO command so that only remaining binlog only contains
+--echo #    transaction UUID:3.
+--echo #
 INSERT INTO t1 VALUES (1);
 
 FLUSH LOGS;
 --let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
 --let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
 INSERT INTO t1 VALUES (2);
-eval PURGE BINARY LOGS TO '$master_file';
+--save_master_pos
+
+--eval PURGE BINARY LOGS TO '$master_file'
 
 --let $assert_cond= "[SHOW MASTER STATUS, File, 1]" = "$master_file"
---let $assert_text= PURGE BINARY LOGS successfully removed all but the latest files
+--let $assert_text= PURGE BINARY LOGS successfully removed all but the latest file
 --source include/assert.inc
 
---let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
---let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
-INSERT INTO t1 VALUES (2);
---save_master_pos
-
---connection slave
+--echo #
+--echo # 4) Verify that the slave fails if it tries to connect using CHANGE
+--echo #    MASTER TO MASTER_AUTO_POSITION=1.
+--echo #
+--source include/rpl_connection_slave.inc
 CHANGE MASTER TO MASTER_AUTO_POSITION = 1;
 
 START SLAVE;
+
 # BUG#13727933 causes this test to fail sporadically on the following line
 # apparently the binlog is not always purged on the master (?)
 --let $slave_io_errno= 1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG
 --source include/wait_for_slave_io_error.inc
 --source include/stop_slave_sql.inc
 
---replace_result $master_file MASTER_FILE
---replace_result $master_pos MASTER_POS
+# Testing with long set of gtids
+--source include/rpl_connection_master.inc
+SET @saved_debug= @@GLOBAL.DEBUG;
+SET GLOBAL DEBUG= '+d,simulate_long_missing_gtids';
+--source include/rpl_connection_slave.inc
+START SLAVE;
+
+--let $slave_io_errno= 1236 # ER_MASTER_FATAL_ERROR_READING_BINLOG
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
+--source include/rpl_connection_master.inc
+SET GLOBAL DEBUG= @saved_debug;
+--source include/rpl_connection_slave.inc
+
+--echo #
+--echo # 5) Verify that appropriate messages are logged into master's and slave's
+--echo #    error log.
+--echo #
+
+# Verify that suggestions to extract the missing gtids are logged into the master's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_match= .*To find the missing purged transactions.*
+--let $assert_select= To find the missing purged transactions
+--let $assert_text= Found the suggestions to extract the missing GTIDs in the master error log.
+--source include/assert_grep.inc
+
+# Verify that an error about long gtids are logged into the slave's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_match= .*The GTID sets and the missing purged transactions are too long to print in this message.*
+--let $assert_select= The GTID sets and the missing purged transactions are too long to print in this message.
+--let $assert_text= Found a message about the long GTIDs in the slave error log.
+--source include/assert_grep.inc
+
+--echo #
+--echo # 6) Verify that replication succeeds if it tries to connect using CHANGE
+--echo #    MASTER TO MASTER_LOG_POS.
+--echo #
+--replace_result $master_file MASTER_FILE $master_pos MASTER_POS
 eval CHANGE MASTER TO MASTER_LOG_FILE = '$master_file', MASTER_LOG_POS = $master_pos, MASTER_AUTO_POSITION = 0;
 
 --source include/start_slave.inc
@@ -75,23 +133,41 @@ eval CHANGE MASTER TO MASTER_LOG_FILE = '$master_file', MASTER_LOG_POS = $master
 --let $assert_text= t1 should contain only one row with the value 2
 --let $assert_cond= "[SELECT COUNT(*) FROM t1]" = "1" AND "[SELECT * FROM t1]" = "2"
 --source include/assert.inc
-
---echo ######## Clean up ########
---echo === Stop and reset slave/master (connection slave) ====
---connection slave
 --source include/stop_slave.inc
+
+# Verify that warning about the missing transactions are logged into the master's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_match= .*Cannot replicate to server with server_uuid.*The missing transactions are '.*:2'.*
+--let $assert_select= Cannot replicate to server with server_uuid
+--let $assert_text= Found warning containing lost GTIDs in the master error log.
+--source include/assert_grep.inc
+
+# Verify that an error about the missing transactions are logged into the slave's error log.
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_match= .*Replicate the missing transactions from elsewhere, or provision a new slave from backup.*the missing transactions are '.*:2'.*
+--let $assert_select= Replicate the missing transactions from elsewhere, or provision a new slave from backup
+--let $assert_text= Found warning containing lost GTIDs in the slave error log.
+--source include/assert_grep.inc
+
+# Suppress the error on master.
+--source include/rpl_connection_master.inc
+CALL mtr.add_suppression("Cannot replicate to server.*server has purged required binary logs.*");
+
+# Suppress the error on slave.
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missing transactions from elsewhere");
+
+--echo #
+--echo # 7) Cleanup.
+--echo #
+--source include/rpl_connection_slave.inc
 RESET MASTER;
 RESET SLAVE;
---echo === Stop and reset master (connection master) ====
---connection master
+--source include/rpl_connection_master.inc
 RESET MASTER;
---echo === Start slave (connection slave) ====
---connection slave
+--source include/rpl_connection_slave.inc
 --source include/start_slave.inc
---echo === Sync slave with master (connection master/slave) ====
---connection master
+--source include/rpl_connection_master.inc
 DROP TABLE t1;
 --source include/sync_slave_sql_with_master.inc
-
---connection master
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test b/mysql-test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test
index 2833503285bd..5b4fcca94f85 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test
@@ -20,6 +20,14 @@
 # See rpl_gtid_skip_incident_caused_by_insufficient_stmt_cache.test
 
 --source include/not_group_replication_plugin.inc
+--source include/have_debug.inc
+
+# Don't test this under valgrind, memory leaks will occur
+--source include/not_valgrind.inc
+
+# Avoid CrashReporter popup on Mac
+--source include/not_crashrep.inc
+
 # Test in this file is binlog format agnostic, thus no need
 # to rerun it for every format.
 --source include/have_binlog_format_row.inc
@@ -69,15 +77,242 @@ BEGIN;
 COMMIT;
 SET GTID_NEXT=AUTOMATIC;
 --source include/start_slave_sql.inc
+--source include/rpl_reset.inc
+
+#
+# Test for GRANT commands that result in error after the user is created.
+#
+# In case of partial execution, master logs an Incident event to the binary log
+# and causes the the slave SQL thread to error out with ER_SLAVE_INCIDENT.
+#
+# Since this is an expected behavior, we wait till the SQL thread errors out
+# and we prepare the slave to skip the incident event by its GTID.
+#
+# ==== References ====
+#
+# Bug #30566518: SLAVE STOPS WITH INTERMITTENT ERROR 1396: ERROR 'OPERATION
+#                DROP USER FAILED FOR
+# Bug #30324661: INVALID GRANT COMMAND BREAK GTID BASED REPLICATION
+
+--source include/rpl_connection_master.inc
+
+DELIMITER //;
+CREATE PROCEDURE p1()
+BEGIN
+   INSERT INTO t1 VALUES (1,1);
+END//
+DELIMITER ;//
+
+--let $i=2
+while ($i > 0) {
+
+  if ($i == 1) {
+    SET SESSION SQL_MODE= default;
+  }
+  if ($i == 2) {
+    SET SESSION SQL_MODE= '';
+  }
+  --let $j=7
+  while ($j > 0) {
+
+    # Test for GRANT
+    --connect(con1, localhost, root, , , $MASTER_MYPORT)
+    --connection con1
+    if ($j == 1) {
+      # Global privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT ALL ON *.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 2) {
+      # DB privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT UPDATE ON `test`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 3) {
+      # Table privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT SELECT ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 4) {
+      # Column privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT SELECT(a) ON `test`.`t1` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 5) {
+      # Procedure privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT EXECUTE ON PROCEDURE p1 TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 6) {
+      # Proxy privilege
+      --error ER_PASSWORD_NO_MATCH
+      GRANT PROXY ON `proxy_user` TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    if ($j == 7) {
+      # Mix of DB and GLOBAL ACLs
+      --error ER_WRONG_USAGE
+      GRANT PROCESS ON `invalid_db`.* TO u1@h, u2@h IDENTIFIED BY 'pass', u3;
+    }
+    --disconnect con1
+
+    --source include/rpl_connection_slave.inc
+    --let $slave_sql_errno= convert_error(ER_SLAVE_INCIDENT)
+    --source include/wait_for_slave_sql_error.inc
+    --let $rpl_only_running_threads= 1
+    --source include/rpl_reset.inc
+
+    # Test for REVOKE
+    #
+    # Before testing revoke, grant all priveleges to user u2.
+    # Since u2 doesn't exist on slave, disable the binary log for the session
+    # while executing GRANT statement.
+    --source include/rpl_connection_master.inc
+    SET SQL_LOG_BIN=0;
+    GRANT ALL ON *.* TO u2@h;
+    SET SQL_LOG_BIN=1;
+    --let $expect_incident= 1
+    --connect(con2, localhost, root, , , $MASTER_MYPORT)
+    --connection con2
+    if ($j == 1) {
+      # Global privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE ALL ON *.* FROM u2@h, u3;
+    }
+    if ($j == 2) {
+      # DB privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE UPDATE ON `test`.* FROM u2@h, u3;
+    }
+    if ($j == 3) {
+      # Table privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE SELECT ON `test`.`t1` FROM u2@h, u3;
+    }
+    if ($j == 4) {
+      # Column privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE SELECT(a) ON `test`.`t1` FROM u2@h, u3;
+    }
+    if ($j == 5) {
+      # Procedure privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE EXECUTE ON PROCEDURE p1 FROM u2@h, u3;
+    }
+    if ($j == 6) {
+      # Proxy privilege
+      --error ER_NONEXISTING_GRANT
+      REVOKE PROXY ON `proxy_user` FROM u2@h, u3;
+    }
+    if ($j == 7) {
+      # Mix of DB and GLOBAL ACLs
+      --error ER_WRONG_USAGE
+      REVOKE PROCESS ON `invalid_db`.* FROM u2@h, u3;
+      # The query is a no-op on master
+      --let $expect_incident= 0
+    }
+
+    if ($expect_incident == 1) {
+      --source include/rpl_connection_slave.inc
+      --let $slave_sql_errno= convert_error(ER_SLAVE_INCIDENT)
+      --source include/wait_for_slave_sql_error.inc
+      --let $rpl_only_running_threads= 1
+      --connection con2
+    }
+    # Cleanup for next iteration
+    --disconnect con2
+    --source include/rpl_connection_slave.inc
+    --source include/stop_slave.inc
+    --source include/rpl_connection_master.inc
+    DROP USER u2@h;
+    --let $rpl_skip_sync= 1
+    --source include/rpl_reset.inc
+    --dec $j
+  }
+  --dec $i
+}
+
+# Testing the failure of cache creation while writing incident events.
+#
+# Since generation of GTIDs is tightly coupled with IO caches, if there is any
+# failure in creating IO cache for writing GTIDs, we will allow
+# binlog_error_action to decide whether or not to abort.
+--connect(con3, localhost, root, , , $MASTER_MYPORT)
+--connection con3
+
+# Add a debug point so that cache creation fails.
+--let $debug_point= simulate_cache_creation_failure
+--source include/add_debug_point.inc
+
+# Testing with binlog_error_action = IGNORE_ERROR.
+SET GLOBAL binlog_error_action = IGNORE_ERROR;
+
+--error ER_PASSWORD_NO_MATCH
+GRANT SELECT(a) ON t1 TO u1@h, u2@h;
+
+# Test to prove that binary log is disabled
+--error ER_NO_BINARY_LOGGING
+SHOW BINARY LOGS;
+
+# Check that error is present in error log
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: rpl.rpl_gtid_skip_incident_caused_by_partially_failed_grant
+--let $assert_count = 1
+--let $assert_select = Hence turning logging off for the whole duration of the MySQL server process.
+--let $assert_text = Found the message about the failure of cache creation in the error log.
+--source include/assert_grep.inc
+
+# Restart the master server so that binary log is enabled again and we can do
+# the below test.
+--enable_reconnect
+--let $rpl_server_number= 1
+--source include/rpl_restart_server.inc
+
+--source include/rpl_connection_master.inc
+--let $debug_point= simulate_cache_creation_failure
+--source include/add_debug_point.inc
+
+# Testing with binlog_error_action = ABORT_SERVER.
+# Check that server aborts and the client gets ER_BINLOG_LOGGING_IMPOSSIBLE
+# when binlog_error_action= 'ABORT_SERVER'.
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--connection con3
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+GRANT SELECT(a) ON t1 TO u1@h, u2@h;
+
+--echo # Restart the master server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+# Check that error is present in error log
+--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_only_after = CURRENT_TEST: rpl.rpl_gtid_skip_incident_caused_by_partially_failed_grant
+--let $assert_count = 1
+--let $assert_select = Could not create IO cache while writing an incident event to the binary log.*Server is being stopped.
+--let $assert_text = Found the message about the failure of cache creation in the error log.
+--source include/assert_grep.inc
+
+# Suppress the errors on master
+--source include/rpl_connection_master.inc
+CALL mtr.add_suppression("REVOKE/GRANT failed while granting/revoking privileges in databases. An incident event has been written to the binary log which will stop the slaves.");
+CALL mtr.add_suppression("REVOKE/GRANT failed while storing routine level grants in the privilege tables. An incident event has been written to the binary log which will stop the slaves.");
+CALL mtr.add_suppression("Attempting backtrace. You can use the following information to find out*");
+CALL mtr.add_suppression("ERROR.*Could not create IO cache while writing an incident event to the binary log.*");
+
+# Suppress the errors on slave
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("Slave SQL for channel '': The incident LOST_EVENTS occured on the master. Message: REVOKE/GRANT failed while granting/revoking privileges in databases.") ;
+CALL mtr.add_suppression("Slave SQL for channel '': The incident LOST_EVENTS occured on the master. Message: REVOKE/GRANT failed while storing routine level grants in the privilege tables.");
 
 # Cleanup
 --source include/rpl_connection_master.inc
 DROP USER u1@h;
+DROP PROCEDURE p1;
 DROP TABLE t1;
 
-#--source include/sync_slave_sql_with_master.inc
-# When mts is enabled, restart slave sql threads to make 'CHANGE MASTER TO
-# MASTER_AUTO_POSITION= 0' avoid MTS GAPS.
-#--source include/restart_slave_sql.inc
-
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_skip_with_parser_error.test b/mysql-test/suite/rpl/t/rpl_gtid_skip_with_parser_error.test
new file mode 100644
index 000000000000..8b83989a9074
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_skip_with_parser_error.test
@@ -0,0 +1,107 @@
+# ==== Purpose ====
+#
+# Test that GTID auto skip works even when replication applier is applying
+# events that would lead to ER_PARSE_ERROR.
+#
+# For this test case a binary log file was generated in MySQL 5.6 creating
+# a table with a name that is a reserved word in MySQL 5.7+.
+#
+# Replicating the binary log to a 5.7+ slave shall make the applier thread
+# to stop once reaching the offending transaction.
+#
+# Supposing a DBA/operator fixed the issue manually and the GTID of the
+# offending transaction was committed so the replicated one shall be skipped
+# by GTID auto skip functionality, restarting the slave applier thread shall
+# not hit errors for this transaction anymore.
+#
+# The binary log file generated in MySQL 5.6 has the following content:
+#
+#+-------------------+------+----------------+-----------+-------------+-------------------------------------------------------------------+
+#| Log_name          | Pos  | Event_type     | Server_id | End_log_pos | Info                                                              |
+#+-------------------+------+----------------+-----------+-------------+-------------------------------------------------------------------+
+#| master-bin.000001 |    4 | Format_desc    |         1 |         120 | Server ver: 5.6.41-debug-log, Binlog ver: 4                       |
+#| master-bin.000001 |  120 | Previous_gtids |         1 |         151 |                                                                   |
+#| master-bin.000001 |  151 | Gtid           |         1 |         199 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:1' |
+#| master-bin.000001 |  199 | Query          |         1 |         308 | use `test`; CREATE TABLE t1 (a int PRIMARY KEY)                   |
+#| master-bin.000001 |  308 | Gtid           |         1 |         356 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:2' |
+#| master-bin.000001 |  356 | Query          |         1 |         458 | use `test`; CREATE TABLE GENERATED LIKE test.t1                   |
+#| master-bin.000001 |  458 | Gtid           |         1 |         506 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:3' |
+#| master-bin.000001 |  506 | Query          |         1 |         585 | BEGIN                                                             |
+#| master-bin.000001 |  585 | Query          |         1 |         701 | use `test`; INSERT INTO GENERATED VALUES (1), (2), (3)            |
+#| master-bin.000001 |  701 | Query          |         1 |         781 | COMMIT                                                            |
+#| master-bin.000001 |  781 | Gtid           |         1 |         829 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:4' |
+#| master-bin.000001 |  829 | Query          |         1 |         901 | BEGIN                                                             |
+#| master-bin.000001 |  901 | Table_map      |         1 |         953 | table_id: 75 (test.GENERATED)                                     |
+#| master-bin.000001 |  953 | Write_rows     |         1 |         993 | table_id: 75 flags: STMT_END_F                                    |
+#| master-bin.000001 |  993 | Query          |         1 |        1066 | COMMIT                                                            |
+#| master-bin.000001 | 1066 | Gtid           |         1 |        1114 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:5' |
+#| master-bin.000001 | 1114 | Query          |         1 |        1229 | use `test`; DROP TABLE `t1` /* generated by server */             |
+#| master-bin.000001 | 1229 | Gtid           |         1 |        1277 | SET @@SESSION.GTID_NEXT= '11111111-1111-1111-1111-111111111111:6' |
+#| master-bin.000001 | 1277 | Query          |         1 |        1399 | use `test`; DROP TABLE `GENERATED` /* generated by server */      |
+#+-------------------+------+----------------+-----------+-------------+-------------------------------------------------------------------+
+#
+# ==== Related Bugs and Worklogs ====
+#
+# BUG#27638268 GTID AUTO SKIP DOES NOT WORK FOR QUERIES WITH PARSER ERRORS
+#
+
+# This test case is not compatible with SBR.
+--source include/have_binlog_format_mixed_or_row.inc
+--source include/have_gtid.inc
+--let $rpl_skip_start_slave = 1
+--source include/master-slave.inc
+
+--let $MASTER_DATADIR= `select @@datadir`
+
+# Restart the master to make it use the 5.6 binary log file as its own.
+--let $rpl_server_number= 1
+--source include/rpl_stop_server.inc
+--remove_file $MASTER_DATADIR/master-bin.000001
+--copy_file std_data/binlog_56_gtid_reserved_word.000001 $MASTER_DATADIR/master-bin.000001
+--source include/rpl_start_server.inc
+
+# Assert that all 6 transactions are assumed as already applied.
+--let $assert_text= All transactions are assumed as applied on master
+--let $assert_cond= "[SELECT @@GLOBAL.gtid_executed]" = "11111111-1111-1111-1111-111111111111:1-6"
+--source include/assert.inc
+
+# Start and sync slave's receiver thread
+--source include/rpl_connection_slave.inc
+--source include/start_slave_io.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_io_with_master.inc
+
+# Start slave's applier thread. It should stop with ER_PARSE_ERROR.
+START SLAVE SQL_THREAD;
+--let $slave_sql_errno= convert_error(ER_PARSE_ERROR)
+--source include/wait_for_slave_sql_error.inc
+
+# Assert that only 1st transaction is applied.
+--let $assert_text= Only 1st transaction is applied on slave
+--let $assert_cond= "[SELECT @@GLOBAL.gtid_executed]" = "11111111-1111-1111-1111-111111111111:1"
+--source include/assert.inc
+
+# Prepare GTID auto skip of offending transactions.
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:2';
+BEGIN;
+COMMIT;
+
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:3';
+BEGIN;
+COMMIT;
+
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:4';
+BEGIN;
+COMMIT;
+
+SET GTID_NEXT='11111111-1111-1111-1111-111111111111:6';
+BEGIN;
+COMMIT;
+
+SET GTID_NEXT=AUTOMATIC;
+
+# Restart applier thread that shall sync without issues.
+--source include/start_slave_sql.inc
+--source include/sync_slave_sql_with_io.inc
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info-slave.opt b/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info-slave.opt
new file mode 100644
index 000000000000..49405b1aec32
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info-slave.opt
@@ -0,0 +1 @@
+--master-info-repository=TABLE --relay-log-info-repository=TABLE
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info.test b/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info.test
new file mode 100644
index 000000000000..30c40123869e
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_skips_no_sync_master_info.test
@@ -0,0 +1,78 @@
+# ==== Purpose ====
+#
+# Test verifies that forced sync master info doesn't happen on a
+# heartbeat/fakerotate event.
+#
+# ==== Implementation ====
+#
+# Generate some transactions on master so that they are replicated and applied
+# on slave. This will ensure that GITD_EXECUTED set is updated on slave.
+#
+# Stop and restart the slave. Receiver thread will invoke 'com_binlog_dump_gtid'
+# function call which provides existing GTID specific information on slave to
+# master.
+#
+# Master will skip all the GTID events that are present on slave and will
+# generate a HEARTBEAT event which contains the master_log_file and
+# master_log_pos at which the skipped events end.
+#
+# Upon receiving the HEARTBEAT event store the write requests that are made to
+# 'slave_master_info' table, in a variable. This value is used to verify the
+# write request to 'slave_master_info' after the HEARTBEAT event is processed.
+#
+# Apply the HEARTBEAT event and verify that no additional write request is
+# made during HEARTBEAT event processing.
+#
+# ==== References ====
+#
+# Bug#28815555: HEARTBEATS/FAKEROTATE CAUSE A FORCED SYNC_MASTER_INFO
+#
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+# Gtids are mandatory for the test.
+--source include/have_gtid.inc
+--source include/master-slave.inc
+
+--source include/rpl_connection_slave.inc
+# Enable performance schema monitoring for mysql schema
+--source include/stop_slave.inc
+UPDATE performance_schema.setup_objects SET ENABLED='yes', TIMED='yes' WHERE OBJECT_TYPE='TABLE' and OBJECT_SCHEMA='mysql';
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+CREATE TABLE t1 (f INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (20);
+INSERT INTO t1 VALUES (30);
+--source include/sync_slave_sql_with_master.inc
+
+--source include/stop_slave.inc
+SET GLOBAL debug="+d,reached_heart_beat_queue_event";
+START SLAVE;
+SET DEBUG_SYNC="now WAIT_FOR check_slave_master_info";
+let $sync_master_info_before= query_get_value(SELECT count_star FROM performance_schema.table_io_waits_summary_by_table WHERE object_schema='mysql' AND object_type='table' AND object_name='slave_master_info', count_star, 1);
+SET DEBUG_SYNC="now SIGNAL proceed_write_rotate";
+SET GLOBAL debug="-d,reached_heart_beat_queue_event";
+
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+let $sync_master_info_after= query_get_value(SELECT count_star FROM performance_schema.table_io_waits_summary_by_table WHERE object_schema='mysql' AND object_type='table' AND object_name='slave_master_info', count_star, 1);
+
+--let $assert_text= Assert that sync_master_info io_requests are the same
+--let $assert_cond= $sync_master_info_before = $sync_master_info_after
+--source include/assert.inc
+
+--let $diff_tables=master:t1, slave:t1
+--source include/diff_tables.inc
+
+# Clean up
+--source include/stop_slave.inc
+UPDATE performance_schema.setup_objects SET ENABLED='no', TIMED='no' WHERE OBJECT_TYPE='TABLE' and OBJECT_SCHEMA='mysql';
+--source include/start_slave.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_truncate_memory_table_after_start_server.test b/mysql-test/suite/rpl/t/rpl_gtid_truncate_memory_table_after_start_server.test
new file mode 100644
index 000000000000..7f9ded7cf2d2
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_truncate_memory_table_after_start_server.test
@@ -0,0 +1,244 @@
+################################################################################
+# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
+#              IS OVERRIDDEN BY 'TRUNCATE' CMD
+#
+# Memory table's data will be lost after server restarts. To keep the data
+# consistency between master and slave, it just binlogs
+# 'TRUNCATE TABLE `db`.`table_name`' when the memory table is locked first time.
+# So TRUNCATE statement could be binlogged in many statements.
+#
+# Because it was not handled correctly, it caused below problems:
+## - COM_FIELD_LIST
+#   it didn't flush binlog cache to binlog file. So the TRUNCATEs were not
+#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
+#
+# - CREATE TABLE ... LIKE memory_table
+# - CREATE TABLE ... SELECT memory_table
+#   They were binlogged like:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE FROM memory_table
+#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
+#
+#   Both statements shared the same gtid event. That was not correct.
+#
+# - TRUNCATE is binlogged with a GTID but the DML causing TRUNCATE memory
+#   table is using the same GTID of truncate.
+#   It also caused some DML binlogged without BEGIN and COMMIT.  For example:
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#   it was binlogged as:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE FROM memory_table
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#
+# The test cases verify above statements can binlog 'TRUNCATE' statement
+# correctly. A few extra test cases were added to verify some special
+# situations that updating or modifying a memory table.
+#
+# The test cases in this file will verify only when gtid mode is on.
+#
+# See rpl_no_gtid_delete_memory_table_after_start_server.test for the tests with
+# gtid_mode=off.
+################################################################################
+--source include/not_group_replication_plugin.inc
+--source include/mysql_have_debug.inc
+--source include/have_gtid.inc
+--let $rpl_gtid_utils= 1
+--source include/master-slave.inc
+
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CALL mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
+CALL mtr.add_suppression("Statement accesses nontransactional table as well as transactional or temporary table");
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db1.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t3(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t4(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE db2.mem_t5(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+
+--delimiter |
+CREATE TRIGGER tr1 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+  INSERT INTO t1 SELECT * FROM db2.mem_t3;
+END |
+--delimiter ;
+
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db1.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t1 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t2 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t3 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t4 VALUES(1),(2),(3);
+INSERT INTO db2.mem_t5 VALUES(1),(2),(3);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_io.inc
+--source include/rpl_connection_master.inc
+
+XA START 'xa1';
+--disable_warnings
+INSERT INTO t1 VALUES(1);
+--enable_warnings
+XA END 'xa1';
+XA PREPARE 'xa1';
+--source include/save_master_pos.inc
+
+--let $rpl_server_number=1
+--source include/rpl_restart_server.inc
+
+--source include/rpl_connection_slave.inc
+--source include/start_slave_io.inc
+--source include/sync_slave_sql.inc
+
+--echo #
+--echo # Test case 1: verify XA COMMIT can be binlogged correctly.
+--echo #
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+--exec echo "use test; XA COMMIT 'xa1';" > $MYSQLTEST_VARDIR/tmp/my.sql
+
+# When build-completion-hash is on, mysql client will fetch table name
+# and field name from mysql server automatically just after connecting
+# to the server correctly. it fetches the field by using COM_FIELD_LIST
+# which is expected by this test.
+--exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/my.sql
+
+--let $gtid_step_count= 3
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(TRUNCATE.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+--let $rpl_diff_statement= SELECT * FROM t1
+--source include/rpl_diff.inc
+
+--echo #
+--echo # Test case 2: verify COM_FIELD_LIST can binlog TRUNCATE FROM mem_xx
+--echo #              correctly
+--echo #
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+
+--exec echo "use db1;" > $MYSQLTEST_VARDIR/tmp/my.sql
+--exec $MYSQL --build-completion-hash  < $MYSQLTEST_VARDIR/tmp/my.sql 2>&1
+--remove_file $MYSQLTEST_VARDIR/tmp/my.sql
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM mem_t1;
+SELECT * FROM mem_t2;
+
+--echo #
+--echo # Test case 3: verify TRUNCATE FROM mem_xx can be binlogged correctly
+--echo #              in CREATE TABLE ... LIKE
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+CREATE TABLE t3 LIKE db2.mem_t1;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t1;
+
+--echo #
+--echo # Test case 4: verify TRUNCATE FROM mem_xx can be binlogged correctly
+--echo #              in DML
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+# mem_t3 is empty, the UNION makes sure that a row event is binlogged.
+INSERT INTO t3 SELECT * FROM db2.mem_t2 UNION SELECT 10;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+
+--let $limit= 0,7
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin # !Insert # !Commit
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t2;
+
+--echo #
+--echo # Test case 5: verify TRUNCATE FROM mem_xx can be binlogged correctly
+--echo #              in a trigger
+
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+INSERT INTO t2 VALUES(11);
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Begin
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t3;
+
+--echo #
+--echo # Test case 6: Verify TRUNCATE FROM mem_xx can be binlog correctly
+--echo #              when ALTER the memory table.
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+--source include/save_binlog_position.inc
+
+ALTER TABLE db2.mem_t4 ADD COLUMN c2 INT;
+
+--let $gtid_step_count= 2
+--source include/gtid_step_assert.inc
+--let $limit= 0,4
+--let $event_sequence= #Gtid # !Q(TRUNCATE.*) #Gtid # !Q(ALTER.*)
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM db2.mem_t4;
+
+--echo #
+--echo # Test case 7: Verify TRUNCATE FROM mem_xx can be binlog correctly
+--echo #              when DROP the memory table.
+--source include/rpl_connection_master.inc
+--source include/gtid_step_reset.inc
+DROP TABLE db2.mem_t5;
+
+--let $gtid_step_count= 1
+--source include/gtid_step_assert.inc
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+DROP DATABASE db1;
+DROP DATABASE db2;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test b/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
index 2f6cbdd10278..5bd9aabf9684 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
@@ -37,8 +37,9 @@ START SLAVE IO_THREAD;
 # Step-4)since Master has already purged binary logs  containing GTID 1 and 2,
 # it should throw error and I/O thread should not be started.
 #1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
---let $slave_io_errno= 1236
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
 --let $show_slave_io_error= 1
+--let $slave_io_error_replace= /$master_uuid/MASTER_UUID/
 --source include/wait_for_slave_io_error.inc
 
 # Fix the problem by setting GTID_PURGED on Slave as well.
@@ -56,7 +57,17 @@ START SLAVE IO_THREAD;
 --let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-4"
 --source include/assert.inc
 
-call mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+# Suppress the errors and warnings
+--connection master
+CALL mtr.add_suppression(".*Cannot replicate.*purged required binary logs.*");
+--connection slave
+CALL mtr.add_suppression(".*Master has purged binary logs containing GTIDs that the slave requires.*");
+
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_match= .*Cannot replicate to server with server_uuid.*The missing transactions are '$master_uuid:1-2'.*
+--let $assert_select= Cannot replicate to server with server_uuid
+--let $assert_text= Found warning continaining lost GTIDs
+--source include/assert_grep.inc
 
 ###############################################################################
 #Bug #18789758  DATA INCONSISTENCIES WHEN MASTER HAS TRUNCATED BINARY LOG WITH
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
index 29cadbb5c36d..1e23e5ae99ae 100644
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -390,7 +390,7 @@ sleep 2;
 let $rcvd_heartbeats_after= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
 let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_before) > 0 AS Result, Result, 1);
 --echo Heartbeat events are received while sql thread stopped (1 means 'yes'): $result
---source include/stop_slave.inc
+--source include/stop_slave_io.inc
 DELETE FROM t1;
 --source include/start_slave.inc
 --connection master
diff --git a/mysql-test/suite/rpl/t/rpl_json.test b/mysql-test/suite/rpl/t/rpl_json.test
index 435c7a913003..11a80cd0dcde 100644
--- a/mysql-test/suite/rpl/t/rpl_json.test
+++ b/mysql-test/suite/rpl/t/rpl_json.test
@@ -180,7 +180,10 @@ SELECT * FROM t1 ORDER BY i;
 UPDATE t1 SET j2 = JSON_REPLACE(j, '$[1]', 'abc');
 SELECT * FROM t1 ORDER BY i;
 
-UPDATE t1 SET j2 = JSON_MERGE(j, j);
+UPDATE t1 SET j2 = JSON_MERGE_PATCH(j, '{"a": "patched", "c": null}');
+SELECT * FROM t1 ORDER BY i;
+
+UPDATE t1 SET j2 = JSON_MERGE_PRESERVE(j, j);
 SELECT * FROM t1 ORDER BY i;
 
 UPDATE t1 SET j2 = JSON_SEARCH(j, 'one', 'abc');
@@ -226,6 +229,268 @@ SELECT * FROM t1 ORDER BY i;
 --connection master
 DROP TABLE t1, t2, t3, t4, t5;
 
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # WL#7987: JSON AGGREGATION FUNCTIONS
+--echo #
+
+--connection master
+
+--echo # Create tables of various data types
+CREATE TABLE data_table (pkey INT PRIMARY KEY AUTO_INCREMENT,
+                         txt TEXT, vcol VARCHAR(20), num INT,
+                         gcol INT AS (num * 2) VIRTUAL);
+
+CREATE TABLE json_data (nkey INT PRIMARY KEY AUTO_INCREMENT, jcol JSON);
+
+--echo # Insert values into the tables using the aggregation functions
+INSERT INTO data_table(txt, vcol, num) VALUES ('ailemac', 'namor', 15),
+                                              ('nielk', 'uciov', 12),
+                                              ('nuicarc', 'ierdna', 13),
+                                              ('ihcseruj', 'elisav', 14),
+                                              ('qweasdas', 'jugcvb', 16);
+
+--disable_warnings
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(pkey, gcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(txt) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(gcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(num , vcol) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_OBJECTAGG(pkey , txt) FROM data_table;
+INSERT INTO json_data(jcol) SELECT JSON_ARRAYAGG(pkey) FROM data_table;
+--enable_warnings
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+--echo # Check whether tables were created on the slave
+
+SELECT * FROM json_data;
+SELECT JSON_OBJECTAGG(t1.pkey, t2.jcol) FROM data_table AS t1, json_data AS t2;
+SELECT JSON_ARRAYAGG(jcol) FROM json_data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+--echo # Update values in the table
+--disable_warnings
+UPDATE json_data SET jcol= (SELECT JSON_ARRAYAGG(vcol) FROM data_table) WHERE nkey = 1;
+--enable_warnings
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+SELECT * FROM json_data WHERE nkey = 1;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+--echo # Delete values from the table
+--disable_warnings
+DELETE FROM json_data WHERE jcol  = (SELECT JSON_ARRAYAGG(pkey) FROM data_table);
+--enable_warnings
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+SELECT * FROM json_data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+DROP TABLE data_table;
+DROP TABLE json_data;
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # WL#9191: ADD JSON_PRETTY FUNCTION
+--echo #
+
+--echo [Connection Master]
+--connection master
+
+--echo # Create tables of various data types
+CREATE TABLE data (pkey INT PRIMARY KEY AUTO_INCREMENT,
+                         txt TEXT, vcol VARCHAR(20), num INT,
+                         gcol INT AS (num * 2) VIRTUAL,
+                         gcol2 JSON AS (JSON_PRETTY(JSON_OBJECT(num,gcol))));
+
+CREATE TABLE json_data(pk INT PRIMARY KEY AUTO_INCREMENT, jcol TEXT, jgcol TEXT AS (JSON_PRETTY(jcol)));
+
+--echo # Insert values into the tables using the pretty function
+INSERT INTO data (txt, vcol, num) VALUES ('abc', 'namotgr', 150),
+                                         ('fwjh4', 'ucierov', 142),
+                                         ('8942rhkjh', 'roiu3r', 913),
+                                         ('imfmf', 'r3jr2', 15),
+                                         ('32rj2jr', 'r2ihrhr', 32);
+
+--disable_warnings
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey, gcol)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_ARRAYAGG(txt)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_PRETTY(gcol2)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECT(num , vcol)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey , txt)) FROM data;
+INSERT INTO json_data(jcol) SELECT JSON_PRETTY(JSON_ARRAY(gcol)) FROM data;
+--enable_warnings
+
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+--echo # Check whether tables were created on the slave
+SELECT * FROM json_data;
+SELECT gcol2  FROM data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--let $diff_tables = master:data, slave:data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+--echo # Update values in the table
+--disable_warnings
+UPDATE json_data SET jcol= (SELECT JSON_PRETTY(JSON_ARRAYAGG(gcol2)) FROM data) WHERE pk= 2;
+UPDATE json_data SET jcol= (SELECT JSON_PRETTY(JSON_OBJECTAGG(pk,gcol)) FROM data) WHERE pk = 1;
+--enable_warnings
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+SELECT * FROM json_data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+
+--echo # Delete values from the table
+--disable_warnings
+DELETE FROM json_data WHERE JSON_PRETTY(jgcol)  = (SELECT JSON_PRETTY(JSON_OBJECTAGG(pkey,txt)) FROM data);
+--enable_warnings
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+SELECT * FROM json_data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+DROP TABLE data;
+DROP TABLE json_data;
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # WL#9692: ADD JSON_MERGE_PATCH, RENAME JSON_MERGE TO JSON_MERGE_PRESERVE
+--echo #
+
+--echo [Connection Master]
+--connection master
+
+--echo # Create table with JSON data
+
+CREATE TABLE json_data(pk INT PRIMARY KEY AUTO_INCREMENT,
+                       id INT,
+                       jd JSON,
+                       td TEXT,
+                       gcol VARCHAR(30) AS (JSON_EXTRACT(JSON_MERGE_PATCH(jd,JSON_OBJECT(id,td)), '$.a')) VIRTUAL,
+                       KEY(gcol));
+
+--echo # Insert data into the table
+
+INSERT INTO json_data(id,jd,td) VALUES(10,'["a","b","c","d","e"]', "pink"),
+                                      (20,'{"a":[1,2,6,7,9]}', "floyd"),
+                                      (30,'{"a":["ears","nose","eyes"]}', "megadeth"),
+                                      (40,'[null,null,"null",0,1]', "def"),
+                                      (50,'{"a":null}', "leppard");
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+--echo # Check whether table was created on the slave
+
+SELECT * FROM json_data;
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo [Connection Master]
+--connection master
+
+--echo # Create tables using the JSON_MERGE_PATCH function
+
+CREATE TABLE json_data2(field1 JSON);
+INSERT INTO json_data2
+SELECT JSON_MERGE_PATCH(JSON_ARRAYAGG(jd), JSON_OBJECTAGG(pk, jd))
+FROM json_data;
+
+CREATE TABLE json_data3(field1 JSON);
+INSERT INTO json_data3
+SELECT JSON_MERGE_PATCH(JSON_OBJECTAGG(id, gcol), JSON_ARRAYAGG(td))
+FROM json_data;
+
+CREATE TABLE json_data4(field1 JSON);
+INSERT INTO json_data4
+SELECT JSON_MERGE_PATCH(JSON_OBJECT(id, jd), JSON_ARRAY(gcol))
+FROM json_data;
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+--echo # Check whether the tables were created on the slave
+
+SELECT * FROM json_data2;
+SELECT * FROM json_data3;
+SELECT * FROM json_data4;
+
+SELECT JSON_MERGE_PATCH(t1.field1, t2.field1) FROM json_data2 as t1, json_data3 as t2;
+
+SELECT JSON_MERGE_PRESERVE(t1.field1, t2.field1) FROM json_data3 as t1, json_data4 as t2;
+
+--echo [Connection Master]
+--connection master
+
+--echo # Update values in the table
+
+UPDATE json_data SET jd = JSON_SET(jd, '$[1]', JSON_MERGE_PATCH(JSON_ARRAY(pk),JSON_ARRAY(td))) WHERE id IN (10,40);
+
+--source include/sync_slave_sql_with_master.inc
+--echo [Connection Slave]
+
+--let $diff_tables = master:json_data, slave:json_data
+--source include/diff_tables.inc
+
+--echo # Check whether values were updated
+
+SELECT * FROM json_data;
+
+--echo [Connection Master]
+--connection master
+
+--echo # Clean up
+
+DROP TABLE json_data, json_data2, json_data3, json_data4;
+
 --source include/sync_slave_sql_with_master.inc
 --source include/rpl_end.inc
+
 # End:
diff --git a/mysql-test/suite/rpl/t/rpl_key_rotation.test b/mysql-test/suite/rpl/t/rpl_key_rotation.test
index af4d4b4195c5..06f260e1610e 100644
--- a/mysql-test/suite/rpl/t/rpl_key_rotation.test
+++ b/mysql-test/suite/rpl/t/rpl_key_rotation.test
@@ -8,8 +8,8 @@ call mtr.add_suppression("\\[Error\\] Function 'keyring_file' already exists");
 call mtr.add_suppression("\\[Error\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.so'.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key, please check the keyring plugin is loaded.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded.");
-call mtr.add_suppression("Error 'Can't find master key from keyring, please check keyring plugin is loaded.");
-call mtr.add_suppression("\\[Warning\\] Slave: Can't find master key from keyring, please check keyring plugin is loaded.");
+call mtr.add_suppression("Error 'Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
+call mtr.add_suppression("\\[Warning\\] Slave: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
 call mtr.add_suppression("\\[Error\\] InnoDB: Can't generate new master key for tablespace encryption, please check the keyring plugin is loaded.");
 call mtr.add_suppression("The slave coordinator and worker threads are stopped");
 
diff --git a/mysql-test/suite/rpl/t/rpl_master_connection.test b/mysql-test/suite/rpl/t/rpl_master_connection.test
index cef8a80fdd97..8037e854d255 100644
--- a/mysql-test/suite/rpl/t/rpl_master_connection.test
+++ b/mysql-test/suite/rpl/t/rpl_master_connection.test
@@ -320,55 +320,76 @@ START SLAVE PASSWORD='secret';
 --let $slave_io_errno=1593
 --source include/wait_for_slave_io_error.inc
 
+--let $slave_io_errno= convert_error(ER_SLAVE_FATAL_ERROR)
 --source include/stop_slave.inc
 TRUNCATE mysql.general_log;
 START SLAVE USER='root' PASSWORD='secret';
 --let $rewritten= `SELECT argument FROM mysql.general_log WHERE argument LIKE "%PASSWORD = '<secret>'%"`
 # execute it to see if the rewrite generated a (syntatically) valid command 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 --eval $rewritten
 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval START SLAVE IO_THREAD USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
 --let $rewritten= `SELECT argument FROM mysql.general_log WHERE argument LIKE "%PASSWORD = '<secret>'%"`
 # execute it to see if the rewrite generated a (syntatically) valid command 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval $rewritten
 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval START SLAVE IO_THREAD, SQL_THREAD USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
 --let $rewritten= `SELECT argument FROM mysql.general_log WHERE argument LIKE "%PASSWORD = '<secret>'%"`
 # execute it to see if the rewrite generated a (syntatically) valid command 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval $rewritten
 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval START SLAVE IO_THREAD, SQL_THREAD UNTIL MASTER_LOG_FILE='dummy-log.000001', MASTER_LOG_POS=116 USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
 --let $rewritten= `SELECT argument FROM mysql.general_log WHERE argument LIKE "%PASSWORD = '<secret>'%"`
 # execute it to see if the rewrite generated a (syntatically) valid command 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval $rewritten
 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 TRUNCATE mysql.general_log;
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval START SLAVE IO_THREAD, SQL_THREAD UNTIL RELAY_LOG_FILE='dummy-log.000001', RELAY_LOG_POS=116 USER='root' PASSWORD='secret' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
 --let $rewritten= `SELECT argument FROM mysql.general_log WHERE argument LIKE "%PASSWORD = '<secret>'%"`
 # execute it to see if the rewrite generated a (syntatically) valid command 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
 --eval $rewritten
 
---source include/stop_slave.inc
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 
 --enable_warnings
 
diff --git a/mysql-test/suite/rpl/t/rpl_master_errors.test b/mysql-test/suite/rpl/t/rpl_master_errors.test
index 9f85fa19d14a..3cc3fef5d508 100644
--- a/mysql-test/suite/rpl/t/rpl_master_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_master_errors.test
@@ -88,6 +88,7 @@ SET GLOBAL debug= 'd,request_master_log_pos_3';
 
 START SLAVE IO_THREAD;
 --let $slave_io_errno= 1236
+call mtr.add_suppression(".* Got fatal error 1236 from master when reading data from binary log");
 --source include/wait_for_slave_io_error.inc
 
 SET GLOBAL debug= '$slave_debug';
diff --git a/mysql-test/suite/rpl/t/rpl_mta_rows_query_event_double_free.test b/mysql-test/suite/rpl/t/rpl_mta_rows_query_event_double_free.test
new file mode 100644
index 000000000000..0c6eb66bf9ff
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mta_rows_query_event_double_free.test
@@ -0,0 +1,74 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to test if there isn't any double-free
+# corruption when a Rows_query_event is retried by the MTA.
+#
+# ==== Requirements ====
+#
+# R1. After a Rows_log_event is retried, the event is re-read from the
+#     relay log but the reference to the original event shouldn't be
+#     disposed during context cleanup because is further accessed.
+#
+# ==== Implementation ====
+#
+# 1. Enable `binlog_rows_query_log_events` option.
+# 2. On the source, create a table.
+# 3. On the source, insert a record into the table.
+# 4. On the replica, activate a debug symbol that will force failure while
+#    applying Rows_query_event 3 times.
+# 5. On the replica, wait for a debug sync signal that notifies that the
+#    Rows_query_event was sucessfully applied.
+# 6. On the replica, remove the debug point and sync with the source.
+# 7. Clean up.
+#
+# ==== References ====
+#
+# BUG#32590974 MTS: SEGFAULT OR HEAP-USE-AFTER-FREE IN
+#              SLAVE_WORKER_EXEC_JOB_GROUP
+#
+
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_row.inc
+--source include/only_mts_slave_parallel_workers.inc
+--let $option_name = slave_transaction_retries
+--let $option_operator = >
+--let $option_value = 2
+--source include/only_with_option.inc
+--source include/master-slave.inc
+
+# 1. Enable `binlog_rows_query_log_events` option.
+--let $saved_binlog_rows_query_log_events = `SELECT @@SESSION.binlog_rows_query_log_events`
+SET SESSION binlog_rows_query_log_events = ON;
+
+# 2. On the source, create a table.
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+# 3. On the source, insert a record into the table.
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (0, 0);
+
+# 4. On the replica, activate a debug symbol that will force failure while
+#    applying Rows_query_event 3 times.
+--source include/rpl_connection_slave.inc
+--let $debug_point = error_on_rows_query_event_apply
+--source include/add_debug_point.inc
+--source include/start_slave.inc
+
+# 5. On the replica, wait for a debug sync signal that notifies that the
+#    Rows_query_event was sucessfully applied.
+SET DEBUG_SYNC = "now WAIT_FOR end_retries_on_rows_query_event_apply";
+
+# 6. On the replica, remove the debug point and sync with the source.
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let $debug_point = error_on_rows_query_event_apply
+--source include/remove_debug_point.inc
+
+# 7. Clean up.
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--replace_result $saved_binlog_rows_query_log_events BINLOG_ROWS_QUERY_LOG_EVENTS
+--eval SET SESSION binlog_rows_query_log_events = $saved_binlog_rows_query_log_events
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.test b/mysql-test/suite/rpl/t/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.test
index 45ea922f4bf8..3bc7974804f0 100644
--- a/mysql-test/suite/rpl/t/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.test
@@ -47,6 +47,7 @@ INSERT INTO child VALUES (3,1);
 INSERT INTO child VALUES (4,1);
 
 --source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
 
 #
 # Block MTS worker and put coordinator to wait on logical clock
@@ -63,6 +64,7 @@ DELETE FROM parent WHERE a=3;
 # Wait until coordinator is waiting to schedule transactions
 #
 --source include/sync_slave_io_with_master.inc
+--source include/start_slave_sql.inc
 --let $slave_param= Slave_SQL_Running_State
 --let $slave_param_value= Waiting for dependent transaction to commit
 --source include/wait_for_slave_param.inc
@@ -70,6 +72,7 @@ DELETE FROM parent WHERE a=3;
 # Stop slave and cleanup the blocking
 #
 --disable_warnings
+--let $slave_sql_errno= convert_error(ER_LOCK_WAIT_TIMEOUT)
 --source include/stop_slave_sql.inc
 --enable_warnings
 --source include/rpl_connection_slave1.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test b/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test
index 69f35e3df22f..b0113f8adc4e 100644
--- a/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test
+++ b/mysql-test/suite/rpl/t/rpl_mts_logical_clock_crash.test
@@ -80,6 +80,7 @@ LOCK TABLE t1 WRITE;
 UNLOCK TABLES;
 
 # Workers encounter duplicate error and abort coordinator
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
 --source include/wait_for_slave_sql_to_stop.inc
 
 SET GLOBAL slave_parallel_workers = @save_slave_parallel_workers;
diff --git a/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error-slave.opt b/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error-slave.opt
new file mode 100644
index 000000000000..13af78657748
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/rpl_mts_slave_preserve_commit_order_deadlock_error.2.err
diff --git a/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test b/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test
new file mode 100644
index 000000000000..019b5f0baa5d
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test
@@ -0,0 +1,212 @@
+# ==== Purpose ====
+#
+# This test verifies that when worker threads enter into
+# commit order deadlock, retry logic will not be triggered
+# if there is non-temporary error in the transaction.
+# For more information about "commit order deadlock and
+# retry logic, please see header section in
+# mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock.test.
+#
+# ==== Implementation ====
+#
+# 1) Create a situation that can cause commit order deadlock between two
+#    worker threads on slave.
+# 2) After the worker thread detects commit order deadlock, make transaction
+#    fail due to some other error (non-temp error).
+# 3) Make sure that in this non-temp error case, the worker thread stopped
+#    immediately with the error instead of retrying it again.
+#
+# ==== References ====
+# Bug#27373559 COMMIT ORDER DEADLOCK + RETRY LOGIC IS NOT CONSIDERING TRX
+# ERROR CASES
+#
+# ========
+#
+# Commit order deadlock occurs only when MTS + LOGICAL CLOCK are enabled.
+--source include/only_mts_slave_parallel_type_logical_clock.inc
+--source include/only_mts_slave_parallel_workers.inc
+--source include/have_binlog_format_statement.inc
+--source include/have_debug.inc
+--source include/master-slave.inc
+
+--echo #
+--echo # 1. Initial data
+--echo #
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+CREATE TABLE t2(c1 INT PRIMARY KEY) ENGINE = InnoDB;
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 2. Initial setup on Slave.
+--echo #
+--echo # 2.1. Enable slave_preserve_commit_order on slave for Commit order
+--echo #      deadlock to occur.
+--echo #
+--source include/stop_slave_sql.inc
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET GLOBAL slave_preserve_commit_order = ON;
+
+--echo #
+--echo # 2.2 Set innodb_lock_wait_timeout to 300 to make test work without issues
+--echo # on slow platform runs.
+--echo #
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET GLOBAL innodb_lock_wait_timeout = 300;
+
+--echo #
+--echo # 2.3 Adding 'rpl_fake_cod_deadlock' debug point to execute special code required
+--echo # for the test case.
+--echo #
+--let $debug_point= rpl_fake_cod_deadlock
+--source include/add_debug_point.inc
+
+--echo #
+--echo # 2.4 Add error suppressions.
+--echo #
+call mtr.add_suppression("Worker .* failed executing transaction");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped");
+
+--echo #
+--echo # 2.5 An extra connection needed on Slave.
+--echo #
+connect(slave2,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+
+--echo #
+--echo # 3. Actual testing starts from here.
+--echo #
+--echo # 3.1 Insert basic data on Master
+--echo #
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES(1, 1),(2, 2);
+
+--echo #
+--echo # 3.2 Enabling set_commit_parent_100 debug point
+--echo #     on Master to make two conflicting transactions
+--echo #     run parallely by two worker threads on Slave.
+--echo #
+--let $debug_type= SESSION
+--let $debug_point= set_commit_parent_100
+--source include/add_debug_point.inc
+
+--echo #
+--echo # 3.3 Execute Transaction-1
+--echo #
+INSERT INTO t1 VALUES(3, 1);
+
+--echo #
+--echo # 3.4 Execute Transaction-2
+--echo #
+BEGIN;
+DELETE FROM t1 WHERE c2 <= 1;
+INSERT INTO t2 values(1);
+COMMIT;
+
+--echo #
+--echo # 3.5 On Slave, begin a transaction (Transacation-3)
+--echo #     which will acquire MDL lock on t1
+--echo #     (that blocks 'Transacation-1').
+--echo #
+--source include/rpl_connection_slave1.inc
+BEGIN;
+INSERT INTO t1 VALUES(3, 3);
+
+--echo #
+--echo # 3.6 On Slave, begin a transaction (Transacation-4)
+--echo #     that can block INSERT in 'Transacation-2'.
+--echo #
+--source include/rpl_connection_slave.inc
+BEGIN;
+INSERT INTO t2 VALUES(1);
+
+--echo #
+--echo # 3.7 Start SQL thread, let Transaction-1 & 2 reach SQL workers
+--echo #
+--connection slave2
+--source include/start_slave_sql.inc
+
+--echo #
+--echo # 3.8 Wait till the worker threads pick up those transacations
+--echo #     (Transaction 1 and Transaction 2). They will wait for locks due
+--echo #     local transacations (3 & 4).
+#
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.threads WHERE PROCESSLIST_INFO= 'INSERT INTO t1 VALUES(3, 1)' AND NAME LIKE '%slave_worker%'
+--source include/wait_condition.inc
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.threads WHERE PROCESSLIST_INFO= 'INSERT INTO t2 values(1)' AND NAME LIKE '%slave_worker%'
+--source include/wait_condition.inc
+
+--echo #
+--echo # 3.9 Rollback Transaction-3 which will release MDL lock required for
+--echo #     Transaction-1.
+--echo #
+--source include/rpl_connection_slave1.inc
+ROLLBACK;
+
+--echo #
+--echo # 3.10 Wait till the worker thread detects commit order deadlock
+--echo #      between two workers
+--echo #      (Worker1 : Transaction-1 & Worker-2: Transaction-2).
+--echo #
+SET debug_sync = "now WAIT_FOR reported_deadlock";
+
+--echo #
+--echo # 3.11 Commit Transaction-4 which will release MDL lock required for
+--echo #      Transaction-2.
+--echo #
+--source include/rpl_connection_slave.inc
+COMMIT;
+
+--echo #
+--echo # 3.12 Step 3.11 will cause worker 2 ("Transacation-2")
+--echo #      to fail with 'ER_DUP_ENTRY' error (after the worker2
+--echo #      detected the 'commit order deadlock').
+--echo #
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
+--source include/wait_for_slave_sql_error.inc
+
+--echo #
+--echo # 3.13 Check that worker 2 did not *retry* transaction-2
+--echo #      before throwing ER_DUP_ENTRY error (non-temporary error).
+--echo #
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/rpl_mts_slave_preserve_commit_order_deadlock_error.2.err
+--let $assert_only_after = CURRENT_TEST: rpl.rpl_mts_slave_preserve_commit_order_deadlock_error
+--let $assert_count = 1
+--let $assert_select = Error 'Duplicate entry '1' for key 'PRIMARY'' on query
+--let $assert_text = Found 'Duplicate entry' error only once time which proves that transaction is not retried after getting 'non-temporary error'.
+--source include/assert_grep.inc
+
+--echo #
+--echo # 4. Cleanup
+--echo # 4.1 Clear debug point.
+--echo #
+--let $debug_type= GLOBAL
+--let $debug_point= rpl_fake_cod_deadlock
+--source include/remove_debug_point.inc
+
+--echo #
+--echo # 4.2 Clean the data on Slave.
+--echo #
+--source include/stop_slave_io.inc
+RESET SLAVE;
+DROP TABLE t1, t2;
+
+--echo #
+--echo # 4.3 Clear system variables.
+--echo #
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+
+--echo #
+--echo # 4.4 Clear debug point.
+--echo #
+--source include/rpl_connection_master.inc
+--let $debug_type= SESSION
+--let $debug_point= set_commit_parent_100
+--source include/remove_debug_point.inc
+
+--echo #
+--echo # 4.5 Clean the data on Master.
+--echo #
+DROP TABLE t1, t2;
+
+--let $rpl_only_running_threads= 1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt
new file mode 100644
index 000000000000..655998409520
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/rpl_mts_spco_deadlock_hang_on_non_temp_error.2.err
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test
new file mode 100644
index 000000000000..7d8adc30baae
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test
@@ -0,0 +1,236 @@
+# ==== Purpose ====
+#
+# This test verifies that when worker threads enter into commit order deadlock,
+# retry logic will not be triggered if there is non-temporary error in the
+# transaction and such cases are handled properly by signalling other workers.
+#
+# This test is based on
+# mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test
+# and differs from it by having an extra transaction in the waiting state.
+#
+# For more information about "commit order deadlock and
+# retry logic, please see header section in
+# mysql-test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock.test.
+#
+# ==== Implementation ====
+#
+# 1) Create source-replica topology.
+#
+# 2) Setup testing enviroment.
+#    2.1 Create table on source and insert few rows.
+#    2.2 Setup necessary variables on replica server.
+#    2.3 Set innodb_lock_wait_timeout to 300 to make test work without issues
+#        on slow platform runs.
+#    2.4 Adding 'rpl_fake_cod_deadlock' debug point to execute special code
+#        required for the test case.
+#    2.5 Add error suppressions.
+#    2.6 An extra connection needed on Slave.
+#
+# 3) Make sure that in this non-temp error case, the worker thread stopped
+#    immediately with the error instead of retrying it again.
+#
+# 4) Cleanup
+#
+# ==== References ====
+#
+# Bug #87796 Commit_order_manager can't terminate MTS worker properly when deadlock happens
+# Bug #89247 Deadlock with MTS when slave_preserve_commit_order = ON.
+# Bug #95249 stop slave permanently blocked
+# Bug #99440 Threads of MTS Slave randomly stuck
+
+--source include/have_debug.inc
+--source include/have_binlog_format_statement.inc
+
+--echo #
+--echo # 1. Create source-replica topology.
+--source include/master-slave.inc
+
+--echo #
+--echo # 2. Setup testing environment.
+--echo #    2.1 Create tables on source.
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+CREATE TABLE t2(c1 INT PRIMARY KEY) ENGINE = InnoDB;
+
+--echo #
+--echo # 2.2 Setup necessary variables on replica server.
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET GLOBAL slave_preserve_commit_order = ON;
+SET @saved_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @saved_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET GLOBAL slave_parallel_type = "LOGICAL_CLOCK";
+SET GLOBAL slave_parallel_workers = 3;
+
+# switched to slave connection
+--source include/only_mts_slave_parallel_type_logical_clock.inc
+--source include/only_mts_slave_parallel_workers.inc
+
+--echo #
+--echo # 2.3 Set innodb_lock_wait_timeout to 300 to make test work without issues
+--echo # on slow platform runs.
+--echo #
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET GLOBAL innodb_lock_wait_timeout = 300;
+
+--echo #
+--echo # 2.4 Adding 'rpl_fake_cod_deadlock' debug point to execute special code required
+--echo # for the test case.
+--echo #
+--let $debug_point= rpl_fake_cod_deadlock
+--source include/add_debug_point.inc
+
+--echo #
+--echo # 2.5 Add error suppressions.
+--echo #
+call mtr.add_suppression("Worker .* failed executing transaction");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped");
+
+--echo #
+--echo # 2.6 An extra connection needed on Slave.
+--echo #
+connect(slave2,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+
+--echo #
+--echo # 3. Actual testing starts from here.
+--echo #
+--echo # 3.1 Insert basic data on Master
+--echo #
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES(1, 1),(2, 2);
+
+--echo #
+--echo # 3.2 Enabling set_commit_parent_100 debug point
+--echo #     on Master to make two conflicting transactions
+--echo #     run parallely by two worker threads on Slave.
+--echo #
+--let $debug_type= SESSION
+--let $debug_point= set_commit_parent_100
+--source include/add_debug_point.inc
+
+INSERT INTO t1 VALUES(3, 1);  # Transaction 1
+
+BEGIN;                        # Transaction 2
+DELETE FROM t1 WHERE c2 <= 1;
+INSERT INTO t2 values(1);
+COMMIT;
+
+INSERT INTO t1 values(10,10); # Transaction 3
+
+--echo #
+--echo # 3.3 On Slave, begin a transaction (Transacation 4)
+--echo #     which will acquire MDL lock on t1
+--echo #     (that blocks 'Transacation 1').
+--echo #
+--source include/rpl_connection_slave1.inc
+BEGIN;
+INSERT INTO t1 VALUES(3, 3);
+
+--echo #
+--echo # 3.4 On Slave, begin a transaction (Transacation 5)
+--echo #     that can block INSERT in 'Transacation 2'.
+--echo #
+--source include/rpl_connection_slave.inc
+BEGIN;
+INSERT INTO t2 VALUES(1);
+
+--echo #
+--echo # 3.5 Start SQL thread, let Transaction-1 & 2 reach SQL workers
+--echo #
+--connection slave2
+--source include/start_slave_sql.inc
+
+--echo #
+--echo # 3.6 Wait till the worker threads pick up those transacations
+--echo #     (Transaction 1 and Transaction 2). They will wait for locks due
+--echo #     local transacations (4 & 5).
+
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.threads WHERE PROCESSLIST_INFO= 'INSERT INTO t1 VALUES(3, 1)' AND NAME LIKE '%slave_worker%'
+--source include/wait_condition.inc
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.threads WHERE PROCESSLIST_INFO= 'INSERT INTO t2 values(1)' AND NAME LIKE '%slave_worker%'
+--source include/wait_condition.inc
+
+--echo #
+--echo # 3.7 Rollback Transaction-4 which will release MDL lock required for
+--echo #      Transaction-1.
+--echo #
+--source include/rpl_connection_slave1.inc
+ROLLBACK;
+
+--echo #
+--echo # 3.8 Wait till the worker thread detects commit order deadlock
+--echo #      between two workers
+--echo #      (Worker1 : Transaction-1 & Worker-2: Transaction-2).
+--echo #
+SET debug_sync = "now WAIT_FOR reported_deadlock";
+
+--echo #
+--echo # 3.9 Commit Transaction-5 which will release MDL lock required for
+--echo #      Transaction-2.
+--echo #
+--source include/rpl_connection_slave.inc
+COMMIT;
+
+# Without the fix, this would make the worker 2 to exit without removing its
+# entry from the SPCO queue thus resulting in other worker threads to wait
+# forever on the signal. Meanwhile if co-ordinator was asked to go down by any
+# of the previous workers, this would make co-ordinator thread to wait for the
+# workers to finish thus leading to server hang.
+
+--echo #
+--echo # 3.10 Step 3.8 will cause worker 2 ("Transacation-2")
+--echo #      to fail with 'ER_DUP_ENTRY' error (after the worker2
+--echo #      detected the 'commit order deadlock').
+--echo #
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
+--source include/wait_for_slave_sql_error.inc
+
+--echo #
+--echo # 3.11 Check that worker 2 did not *retry* transaction-2
+--echo #      before throwing ER_DUP_ENTRY error (non-temporary error).
+--echo #
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/rpl_mts_spco_deadlock_hang_on_non_temp_error.2.err
+--let $assert_only_after = CURRENT_TEST: rpl.rpl_mts_spco_deadlock_hang_on_non_temp_error
+--let $assert_count = 1
+--let $assert_select = Error 'Duplicate entry '1' for key 'PRIMARY'' on query
+--let $assert_text = Found 'Duplicate entry' error only once time which proves that transaction is not retried after getting 'non-temporary error'.
+--source include/assert_grep.inc
+
+--echo #
+--echo # 4. Cleanup
+--echo # 4.1 Clear debug point.
+--echo #
+--let $debug_type= GLOBAL
+--let $debug_point= rpl_fake_cod_deadlock
+--source include/remove_debug_point.inc
+
+--echo #
+--echo # 4.2 Clean the data on Slave.
+--echo #
+--source include/stop_slave_io.inc
+RESET SLAVE;
+DROP TABLE t1, t2;
+
+--echo #
+--echo # 4.3 Clear system variables.
+--echo #
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL slave_parallel_type = @saved_slave_parallel_type;
+SET GLOBAL slave_parallel_workers = @saved_slave_parallel_workers;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+
+--echo #
+--echo # 4.4 Clear debug point.
+--echo #
+--source include/rpl_connection_master.inc
+--let $debug_type= SESSION
+--let $debug_point= set_commit_parent_100
+--source include/remove_debug_point.inc
+
+--echo #
+--echo # 4.5 Clean the data on Master.
+--echo #
+DROP TABLE t1, t2;
+
+--let $rpl_only_running_threads= 1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test
new file mode 100644
index 000000000000..47ca7e8c89c8
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test
@@ -0,0 +1,270 @@
+# ==== Purpose ====
+#
+# This test verifies that deadlock errors arising due to lock conflicts are
+# handled properly when --slave-preserve-commit-order is enabled on the replica
+# server.
+#
+# ==== Implementation ====
+#
+# 1. Create source-replica topolgy.
+#
+# 2. Setup testing environment.
+#
+#    2.1. Create table on source and insert few rows.
+#    2.2. Setup necessary variables on replica server.
+#
+# 3. Execute transactions on source server that would generate deadlock on the
+#    replica server.
+#
+#    The commands used to generate deadlock in this test are:
+#
+#    INSERT INTO t1 (11, NULL);
+#    DELETE FROM t1 WHERE c2 <= 3;
+#
+#    With the help of debug points on the source server, simulate that they are
+#    executed parallely on master and make sure INSERT is binlogged before
+#    DELETE.
+#
+#    On replica server, they are applied parallel by w1 and w2. And the deadlock is:
+#      w1                                        w2
+#    -------------------------                 --------------------------
+#     Applying INSERT                          Applying DELETE
+#                                              Gets the row locks first.
+#     Waits for w2 to release
+#     the row lock.
+#                                              Waits for w1 to commit.
+#
+#     For these two special statements, INSERT doesn't block DELETE, but DELETE
+#     does block the INSERT because of the gap locks.
+#
+#    CASE 1:
+#    3.1. Verify that replica server can find the deadlock when the victim
+#         thread (DELETE) is waiting for its turn to commit and is handled
+#         properly.
+#    3.2. Wait till server to handle the deadlock and till the co-ordinator
+#         thread to error out with ER_LOCK_DEADLOCK.
+#    3.3. Restart the replication threads, sync the replica and verify that
+#         table data is consistent.
+#
+#    CASE 2:
+#    3.4. Verify that replica server can find the deadlock when the victim
+#         thread (DELETE) is in the middle of transaction and is handled
+#         properly.
+#    3.5. Wait till server to handle the deadlock and till the co-ordinator
+#         thread to error out with ER_MTS_INCONSISTENT_DATA.
+#    3.6. Restart the replication threads, sync the replica and verify that
+#         table data is consistent.
+#
+# 4. Cleanup.
+#
+# ==== References ====
+#
+# Bug #87796 Commit_order_manager can't terminate MTS worker properly when deadlock happens
+# Bug #89247 Deadlock with MTS when slave_preserve_commit_order = ON.
+# Bug #95249 stop slave permanently blocked
+# Bug #99440 Threads of MTS Slave randomly stuck
+
+# The test needs debug binaries
+
+--source include/have_debug.inc
+--source include/have_binlog_format_statement.inc
+
+--echo #
+--echo # 1. Create source-replica topology.
+--source include/master-slave.inc
+
+--echo #
+--echo # 2. Setup testing environment.
+--echo #    2.1. Create table on source and insert few rows.
+--echo #    2.2. Setup necessary variables on replica server.
+CREATE TABLE t1(c1 INT PRIMARY KEY, c2 INT, INDEX(c2)) ENGINE = InnoDB;
+INSERT INTO t1 VALUES(1, NULL),(2, 2), (3, NULL), (4, 4), (5, NULL), (6, 6);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+SET @saved_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @saved_slave_parallel_workers = @@GLOBAL.slave_parallel_workers;
+SET @saved_slave_preserve_commit_order = @@GLOBAL.slave_preserve_commit_order;
+SET @saved_innodb_lock_wait_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET @saved_slave_transaction_retries = @@GLOBAL.slave_transaction_retries;
+
+SET GLOBAL slave_transaction_retries = 0;
+SET GLOBAL slave_parallel_type = "LOGICAL_CLOCK";
+SET GLOBAL slave_parallel_workers = 8;
+SET GLOBAL slave_preserve_commit_order = ON;
+# Set it to a long time to guarantee it doesn't report timeout error.
+SET GLOBAL innodb_lock_wait_timeout = 1000;
+
+--echo #
+--echo # Case 1
+--echo # ======
+--echo #
+--echo # Verify replica server can find the deadlock when the victim thread
+--echo # (DELETE) is waiting for its turn to commit and is handled properly.
+--echo #
+--echo # 3.1 Execute transactions on source server that would generate deadlock on the
+--echo #     replica server.
+--source include/rpl_connection_master.inc
+# There is a bug that the first two transactions cannot be applied parallel.
+# So we need to an extra transaction here.
+INSERT INTO t1 VALUES(10, 10);
+
+--let $debug_point = set_commit_parent_100
+--source include/add_debug_point.inc
+INSERT INTO t1 VALUES(11, NULL); # Transaction 1
+DELETE FROM t1 WHERE c2 <= 3;    # Transaction 2
+INSERT INTO t1 VALUES(21, 21);   # Transaction 3
+INSERT INTO t1 VALUES(22, 22);   # Transaction 4
+INSERT INTO t1 VALUES(23, 23);   # Transaction 5
+--source include/remove_debug_point.inc
+
+# Start a local Transaction 6 on replica to block the INSERT statement coming
+# through the replication channel. This blocks the worker thread executing
+# "INSERT INTO t1 VALUES(11, NULL)"
+--source include/rpl_connection_slave.inc
+BEGIN;
+INSERT INTO t1 VALUES(11, 11);
+
+# Wait till DELETE statement(w2) and other workers wait for the the preceding transaction(w1) to commit.
+--source include/rpl_connection_slave1.inc
+--source include/start_slave_sql.inc
+--let $wait_condition = SELECT count(*) = 4 FROM information_schema.processlist WHERE STATE = "Waiting for preceding transaction to commit"
+--source include/wait_condition.inc
+
+# Resume the INSERT statement and trigger the deadlock
+--source include/rpl_connection_slave.inc
+ROLLBACK;
+
+# When the INSERT statement proceeds, the w1 finds deadlock with w2, and it
+# will ask w2 to rollback. When w2 rolls back the transaction, it would check
+# the value of slave_trans_retries before retrying the transaction. Since, we
+# have set it to 0 throughout the test, the w2 shall not retry the transaction
+# and would call report_rollback.
+#
+# Without the fix, calling report_rollback() would make the w2 to return
+# without removing its entry from the SPCO queue thus resulting in other worker
+# threads to wait forever on the signal. Meanwhile if co-ordinator was asked to
+# go down by any of the previous workers, this would make co-ordinator thread
+# to wait for the workers to finish thus leading to server hang.
+
+--echo #
+--echo # Add error supressions.
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
+
+--echo #
+--echo # 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.
+--let $slave_sql_errno = convert_error(ER_LOCK_DEADLOCK)
+--source include/wait_for_slave_sql_error.inc
+
+--echo #
+--echo # 3.3. Restart replication threads, sync the replica and verify that table
+--echo #      data is consistent.
+--source include/start_slave.inc
+--let $rpl_diff_statement = SELECT * FROM t1;
+--source include/rpl_diff.inc
+
+--echo #
+--echo # Case 2
+--echo # ======
+--echo #
+--echo # Verify that replica server can find the deadlock when the victim
+--echo # thread (DELETE) is in the middle of transaction and is handled
+--echo # properly.
+--echo #
+--echo # 3.4 Execute transactions on source server that would generate deadlock on the
+--echo #     replica server.
+--source include/rpl_connection_master.inc
+TRUNCATE t1;
+INSERT INTO t1 VALUES(1, NULL),(2, 2), (3, NULL), (4, 4), (5, NULL), (6, 6);
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES(20, NULL);
+
+--let $debug_point = set_commit_parent_100
+--source include/add_debug_point.inc
+INSERT INTO t1 VALUES(21, NULL);  # Transaction 1
+
+BEGIN;                            # Transaction 2
+INSERT INTO t1 VALUES(22, 22);
+DELETE FROM t1 WHERE c2 <= 3;
+INSERT INTO t1 VALUES(23, 23);
+INSERT INTO t1 VALUES(24, NULL);
+INSERT INTO t1 VALUES(25, 25);
+COMMIT;
+
+INSERT INTO t1 VALUES(26, 26);    # Transaction 3
+INSERT INTO t1 VALUES(27, 27);    # Transaction 4
+INSERT INTO t1 VALUES(28, 28);    # Transaction 5
+--source include/remove_debug_point.inc
+
+--source include/rpl_connection_slave.inc
+# Start a local transaction on replica to block the INSERT statement coming
+# through the replication channel. This blocks the worker thread executing
+# "INSERT INTO t1 VALUES(21, NULL)"
+BEGIN;
+INSERT INTO t1 VALUES(21, 21);
+
+--let $rpl_connection_name = server_2_1
+--source include/rpl_connection.inc
+# Use it to block the worker applying 'INSERT INTO t1 VALUES(23, 23)';
+BEGIN;
+INSERT INTO t1 VALUES(23, 23);
+
+# Wait till DELETE statement(w2) and other workers wait for the the preceding transaction(w1) to commit.
+--source include/rpl_connection_slave1.inc
+--source include/start_slave_sql.inc
+
+# It guarantees 'DELETE FROM t1 WHERE c2 <= 3;' is applied.
+--let $wait_condition = SELECT count(*) = 1 FROM information_schema.processlist WHERE info = "INSERT INTO t1 VALUES(23, 23)"
+--source include/wait_condition.inc
+
+--let $wait_condition = SELECT count(*) = 3 FROM information_schema.processlist WHERE STATE = "Waiting for preceding transaction to commit"
+--source include/wait_condition.inc
+
+# It guarantees that both workers are waiting for locks held by above two transactions.
+--let $status_var = Innodb_row_lock_current_waits
+--let $status_var_value = 2
+--source include/wait_for_status_var.inc
+
+# Resume "INSERT INTO t1 VALUES(21, 21);" to trigger the lock conflict.
+--source include/rpl_connection_slave.inc
+ROLLBACK;
+
+# Resume "INSERT INTO t1 VALUES(23, 23);". It will be rolled back.
+--let $rpl_connection_name = server_2_1
+--source include/rpl_connection.inc
+ROLLBACK;
+
+--echo #
+--echo # 3.5. Wait till the co-ordinator thread to error out with ER_MTS_INCONSISTENT_DATA.
+--let $slave_sql_errno = convert_error(ER_MTS_INCONSISTENT_DATA)
+--source include/wait_for_slave_sql_error.inc
+
+--echo #
+--echo # 3.6. Restart replication threads, sync the replica and verify that table
+--echo #      data is consistent.
+--source include/start_slave.inc
+--let $rpl_diff_statement = SELECT * FROM t1;
+--source include/rpl_diff.inc
+
+--echo #
+--echo # 4. Cleanup.
+--echo #
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+
+# Add Test suppressions
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.");
+
+--source include/stop_slave.inc
+SET GLOBAL slave_transaction_retries = @saved_slave_transaction_retries;
+SET GLOBAL slave_parallel_type = @saved_slave_parallel_type;
+SET GLOBAL slave_parallel_workers = @saved_slave_parallel_workers;
+SET GLOBAL slave_preserve_commit_order = @saved_slave_preserve_commit_order;
+SET GLOBAL innodb_lock_wait_timeout = @saved_innodb_lock_wait_timeout;
+
+--let $rpl_only_running_threads = 1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos-slave.opt b/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos-slave.opt
new file mode 100644
index 000000000000..b424c900beaf
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos-slave.opt
@@ -0,0 +1 @@
+--relay-log-info-repository=TABLE --master-info-repository=TABLE --slave_transaction_retries=0 --sync-master-info=1
diff --git a/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test b/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test
new file mode 100644
index 000000000000..c70f00c07e04
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mts_stop_slave_report_pos.test
@@ -0,0 +1,131 @@
+# ==== Purpose ====
+#
+# Verify that the positions that are reported by the applier thread during
+# STOP SLAVE are the same as that of the most recent checkpoint in case of
+# Multi Threaded Slave.
+#
+# ==== Implementation ====
+#
+# 1) Create two databases and do some DML operations on these databases.
+# 2) Sync the slave applier with master to insure that a checkpoint is done.
+# 3) Set bigger values for slave_checkpoint_period/group so that no further
+#    checkpoints are done on slave server.
+# 4) Execute few more DMLS on master and wait till they are applied on slave.
+# 5) This is to prove that applier thread has few more committed transactions
+#    after the checkpoint done at step 2.
+# 6) Execute STOP SLAVE command.
+# 7) Assert that the positions that are reported in error log are as per the
+#    latest checkpoint.
+#
+# ==== References ====
+#
+# Bug#27300658: IN MTS SQL THREAD EXITING AND INITIALIZING
+# MESSAGE WITH DIFFERENT POSITION
+
+# This test case is binary log format agnostic
+--source include/have_binlog_format_row.inc
+--source include/have_debug.inc
+--source include/only_mts_slave_parallel_workers.inc
+--source include/master-slave.inc
+
+# Do some DMLs on master and sync with slave to make sure that one checkpoint
+# is done.
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE TABLE db1.t1 ( id INT(11) PRIMARY KEY ) ENGINE=INNODB;
+CREATE TABLE db2.t1 ( id INT(11) PRIMARY KEY ) ENGINE=INNODB;
+INSERT INTO db1.t1 VALUES (40);
+INSERT INTO db2.t1 VALUES (40);
+--source include/sync_slave_sql_with_master.inc
+
+# Save the global variables that are being modified. Set bigger values for
+# slave_checkpoint_group/period so that no further checkpoints are done
+# automatically.
+SET @save_debug = @@GLOBAL.debug;
+SET @save_slave_checkpoint_group= @@GLOBAL.slave_checkpoint_group;
+SET @save_slave_checkpoint_period= @@GLOBAL.slave_checkpoint_period;
+SET GLOBAL slave_checkpoint_group=512;
+SET GLOBAL slave_checkpoint_period=3000000;
+
+# Do some DMLs on master.
+--source include/rpl_connection_master.inc
+--let $i=30
+while ($i)
+{
+  --eval insert into db1.t1 values ($i)
+  --eval insert into db2.t1 values ($i)
+  dec $i;
+}
+--source include/sync_slave_io_with_master.inc
+
+# Wait till all the transactions are applied on slave. This will ensure that
+# at the time of STOP SLAVE few more committited transactions are present
+# above the recent LWM.
+--source include/rpl_connection_slave.inc
+--let $table=db1.t1
+--let $count=31
+--source include/wait_until_rows_count.inc
+
+--let $table=db2.t1
+--let $count=31
+--source include/wait_until_rows_count.inc
+--source include/stop_slave_io.inc
+
+# Wait for coordinator to populate worker's queues.
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= = 'Slave has read all relay log; waiting for more updates'
+--source include/wait_show_condition.inc
+
+
+# Initiate one more DML on master. While the DML is being processed by slave
+# applier it will receive a STOP SLAVE due to debug simulation. Applier will
+# execute gracefully after completing the current group in progress and print
+# appropriate exit positions.
+--source include/rpl_connection_master.inc
+BEGIN;
+INSERT INTO db1.t1 VALUES (50);
+COMMIT;
+
+--source include/rpl_connection_slave.inc
+# Debug simulation which will ensure that SLAVE STOPS as a regular exit
+# without an error. This ensures we have the same scenario as that of the bug
+# report.
+SET global debug="d,simulate_stop_when_mts_in_group";
+--source include/start_slave_io.inc
+
+--source include/wait_for_slave_sql_to_stop.inc
+--let $exec_master_log_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1)
+--let $exec_master_log_file= query_get_value(SHOW SLAVE STATUS, Relay_Master_Log_File, 1)
+
+# Assert that the positions that are reported by the applier thread during
+# STOP SLAVE are the same as that of the most recent checkpoint in case of
+# Multi Threaded Slave.
+--let $assert_text= Assert that the expected entry is in the error log during STOP SLAVE
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_only_after = Coordinator thread of multi-threaded slave is being stopped in the middle of assigning a group of events
+--let $assert_select= Slave SQL thread for channel '' exiting, replication stopped in log '$exec_master_log_file' at position $exec_master_log_pos
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+SET GLOBAL debug=@save_debug;
+SET @@GLOBAL.slave_checkpoint_group= @save_slave_checkpoint_group;
+set @@GLOBAL.slave_checkpoint_period= @save_slave_checkpoint_period;
+--source include/start_slave.inc
+
+# Assert that the positions that are reported by the applier thread during
+# START SLAVE are the same as the positions reported during STOP SLAVE.
+--let $assert_text= Assert that the expected entry is in the error log during START SLAVE
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_only_after = Slave SQL thread exiting, replication stopped in log
+--let $assert_select= Slave SQL thread for channel '' initialized, starting replication in log '$exec_master_log_file' at position $exec_master_log_pos
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+DROP DATABASE db1;
+DROP DATABASE db2;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test b/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test
index 161042560897..547564ad6ca7 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test
@@ -8,12 +8,11 @@
 # the channels allows RESET SLAVE, no crash happens.
 #
 
-call mtr.add_suppression("Error during --relay-log-recovery");
-call mtr.add_suppression("Slave: Failed to initialize the master info structure for channel");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Recovery from master pos.* and file");
 # The default channel and channel 'ch_a' will connect to the same master
-call mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master");
+CALL mtr.add_suppression("A slave with the same server_uuid/server_id as this slave has connected to the master");
+CALL mtr.add_suppression("Error during --relay-log-recovery.*");
+CALL mtr.add_suppression("Server was not able to find a rotate event from master server.*");
+CALL mtr.add_suppression("Recovery from master pos.* and file");
 
 --source include/stop_slave.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_relay_log.test b/mysql-test/suite/rpl/t/rpl_multi_source_relay_log.test
index 1fdbf1fa28fe..9e2346d18308 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_source_relay_log.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_source_relay_log.test
@@ -1,7 +1,9 @@
 --echo #########################################################################
 --echo # Verify RESET SLAVE and RESET SLAVE FOR CHANNEL
---echo # - deletes all relay log files of named channels.
+--echo # - deletes all relay log files of named channels and reintializes
+--echo # them.
 --echo # - For default channel, it restart the relay log from .000001
+--echo # - For named channel, it restart the relay log from ch.000001
 --echo #########################################################################
 # The test doesn't relate to binlog format, so it is just tested on mixed mode.
 #Skip on group replication runs
@@ -25,7 +27,7 @@ FLUSH RELAY LOGS FOR CHANNEL "ch2";
 --echo #
 eval RESET SLAVE FOR CHANNEL "ch1";
 
-# all files of "ch1" are removed
+# all files of "ch1" are deleted and recreated.
 --list_files $datadir *ch1*
 
 --echo #
@@ -36,7 +38,7 @@ eval RESET SLAVE FOR CHANNEL "ch1";
 --enable_warnings
 RESET SLAVE;
 
-# all files of "ch2" are removed
+# all files of "ch2" are deleted and recreated.
 --list_files $datadir *ch2*
 
 --echo #
@@ -50,10 +52,8 @@ RESET SLAVE;
 --file_exists $relay_log_basename.000001
 
 --echo #
---echo # Recreate channels "ch1" and "ch2" files again.
+--echo # Relay log files for all channels are recreated automatically.
 --echo #
-CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=10 FOR CHANNEL "ch1";
-CHANGE MASTER TO MASTER_HOST="localhost", MASTER_PORT=11 FOR CHANNEL "ch2";
 
 # Check that files exist.
 --let $relay_log_base_name= `SELECT @@GLOBAL.relay_log_basename`
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_relay_log_recovery.test b/mysql-test/suite/rpl/t/rpl_multi_source_relay_log_recovery.test
index 79b3f2992d68..3f75f72bce57 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_source_relay_log_recovery.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_source_relay_log_recovery.test
@@ -4,27 +4,25 @@
 # Problem:
 # ========
 # Enable MTS along with crash-safe replication tables. Make sure that the
-# server
-# is busily inserting data with multiple threads in parallel. Shutdown mysqld
-# uncleanly (kill -9 or power off server without notice).
+# server is busily inserting data with multiple threads in parallel. Shutdown
+# mysqld uncleanly (kill -9 or power off server without notice).
 #
 # Now users are restarting the server with --relay-log-recovery=1 to recover
-# the
-# crashed slave.
+# the crashed slave.
 #
 # This results in following error:
 # ================================
-# 2015-06-24 13:49:03 3895 [ERROR] --relay-log-recovery cannot
-# be executed when the slave was stopped with an error or
-# killed in MTS mode; consider using RESET SLAVE or restart
-# the server with --relay-log-recovery = 0 followed by
-# START SLAVE UNTIL SQL_AFTER_MTS_GAPS.
+# 2015-06-24 13:49:03 3895 [ERROR] --relay-log-recovery cannot be executed
+# when the slave was stopped with an error or killed in MTS mode; consideri
+# using RESET SLAVE or restart the server with --relay-log-recovery = 0
+# followed by # START SLAVE UNTIL SQL_AFTER_MTS_GAPS.
 #
 # i.e relay-log-recovery will not work in MTS mode.
 ###############################################################################
 # Following test demonstrates that when gaps are generated due to MTS crash
 # but not due to an error then recovery should be successful with
 # --relay-log-recovery=1 option.
+#
 # In case of Multi source replication all channels will go through the relay
 # log recovery process and gaps will be filled.
 
@@ -66,7 +64,7 @@ SET @save.innodb_lock_wait_timeout= @@global.innodb_lock_wait_timeout;
 --source extra/rpl_tests/rpl_multi_source_generate_mts_gap.test
 
 --echo #
---echo # Generate MTS gaps for channel2.
+--echo # Generate MTS gaps for channel3.
 --echo #
 --let $rpl_connection_name= server_3
 --source include/rpl_connection.inc
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test b/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test
index 0273e7d70af0..40aa02fa9f42 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_source_repo_info_errors.test
@@ -15,12 +15,9 @@
 # backward compatibility.
 
 --source include/rpl_connection_slave.inc
-call mtr.add_suppression("Slave failed to initialize relay log info structure from the repository");
-call mtr.add_suppression("Slave: Could not start slave for channel");
-call mtr.add_suppression("Error during --relay-log-recovery: Could not locate rotate event from the master");
-call mtr.add_suppression("slave with the same server_uuid as this slave has connected to the master");
-call mtr.add_suppression("Failed to create or recover replication info repositories");
-call mtr.add_suppression("Got fatal error .* from master .* slave with the same server_uuid/server_id");
+CALL mtr.add_suppression("Got fatal error .* from master .* slave with the same server_uuid/server_id");
+CALL mtr.add_suppression("Error during --relay-log-recovery.*");
+CALL mtr.add_suppression("Server was not able to find a rotate event from master server.*");
 --source include/stop_slave.inc
 
 # On the slave
@@ -41,27 +38,18 @@ SET GLOBAL relay_log_info_repository='TABLE';
 --let $rpl_server_parameters= --relay-log-recovery --skip-slave-start --master-info-repository=TABLE --relay-log-info-repository=TABLE --slave-parallel-workers=4 --relay-log-purge=0
 --source include/rpl_restart_server.inc
 
-# slave fails to initialize due to BUG#19021091 (default
-# channel cannot recover valid positions from the SQL
-# applier thread).
---error ER_SLAVE_RLI_INIT_REPOSITORY
-START SLAVE;
-
-# This command would fail with an error, which would
-# fail with error ER_MASTER_INFO . Later when start
-# slave was issued, the server would crash.
+# This command earlier failed with error ER_MASTER_INFO and the server would
+# crash when start slave was issued in the later stages.
 #
-# Now, CHANGE MASTER succeeds (and later START SLAVE
-# fails).
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 --eval CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=$MASTER_MYPORT FOR CHANNEL 'ch1'
 --enable_warnings
 
-# This would have crashed, but it does not anymore.
---error ER_SLAVE_RLI_INIT_REPOSITORY
-START SLAVE;
+--source include/start_slave.inc
 
+# Stop the slave to execute RESET SLAVE ALL in next step.
+--source include/stop_slave.inc
 # Lets clear the offending channel and recreate it.
 RESET SLAVE ALL FOR CHANNEL 'ch1';
 --disable_warnings
@@ -84,6 +72,7 @@ RESET SLAVE ALL FOR CHANNEL 'ch1';
 START SLAVE;
 
 # clean up
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
 --source include/stop_slave.inc
 RESET SLAVE ALL;
 --replace_result $save_mi_repo_type SAVE_MI_REPO_TYPE
diff --git a/mysql-test/suite/rpl/t/rpl_no_gtid_delete_memory_table_after_start_server.test b/mysql-test/suite/rpl/t/rpl_no_gtid_delete_memory_table_after_start_server.test
deleted file mode 100644
index 976f1fd0b611..000000000000
--- a/mysql-test/suite/rpl/t/rpl_no_gtid_delete_memory_table_after_start_server.test
+++ /dev/null
@@ -1,87 +0,0 @@
-################################################################################
-# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
-#              IS OVERRIDDEN BY 'DELETE' CMD
-#
-# Memory table's data will be lost after server restarts. To keep the data
-# consistency between master and slave, it just binlogs
-# 'DELETE FROM `db`.`table_name`' when the memory table is locked first time.
-# So DELETE statement could be binlogged in many statements.
-#
-# Because it was not handled correctly, it caused below problems:
-## - COM_FIELD_LIST
-#   it didn't flush binlog cache to binlog file. So the DELETEs were not
-#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
-#
-# - CREATE TABLE ... LIKE memory_table
-# - CREATE TABLE ... SELECT memory_table
-#   They were binlogged like:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
-#
-#   Both statements shared the same gtid event. That was not correct.
-#
-# - DELETE was binlogged without BEGIN and COMMIT
-#   It caused some DML binlogged without BEGIN and COMMIT.  For example:
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#   it was binlogged as:
-#   GTID_log_event | Anonymous_gtid_log_event
-#   DELETE FROM memory_table
-#   INSERT INTO myisam_t1 SELECT * FROM memory_table
-#
-# The test cases verify some cases that cannot be run when gtid mode is on.
-################################################################################
-
---source include/not_gtid_enabled.inc
---source include/master-slave.inc
-
-CALL mtr.add_suppression("Found 1 prepared XA transactions");
-CREATE TABLE t1(c1 INT);
-CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
-CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
-
-INSERT INTO mem_t1 VALUES(1),(2),(3);
-INSERT INTO mem_t2 VALUES(1),(2),(3);
-
---source include/sync_slave_sql_with_master.inc
---source include/stop_slave.inc
-
---let $rpl_server_number=1
---source include/rpl_restart_server.inc
-
---source include/start_slave.inc
-
---echo # Test case 1: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in CREATE TABLE ... SELECT
---source include/rpl_connection_master.inc
---source include/save_binlog_position.inc
-
-CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
-
---let $limit= 0,4
---let $event_sequence= Anonymous_Gtid # Query/.*BEGIN # Query/.*DELETE.* # Query/.*COMMIT
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_t1 have been applied the tables should be empty.
-SELECT * FROM mem_t1;
-
---echo #
---echo # Test case 2: verify DELETE FROM mem_xx can be binlogged correctly
---echo #              in a DML on a MyISAM table
---source include/rpl_connection_master.inc
---source include/save_binlog_position.inc
-
-# mem_t2 is empty, the UNION makes sure that a row event is binlogged.
-INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
-
---source include/assert_binlog_events.inc
-
---source include/sync_slave_sql_with_master.inc
-# DELETE FROM mem_xx have been applied the tables should be empty.
-SELECT * FROM mem_t2;
-
---source include/rpl_connection_master.inc
-DROP TABLE t1, t2, t3, mem_t1, mem_t2;
---source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_no_gtid_truncate_memory_table_after_start_server.test b/mysql-test/suite/rpl/t/rpl_no_gtid_truncate_memory_table_after_start_server.test
new file mode 100644
index 000000000000..a74101fa35e1
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_no_gtid_truncate_memory_table_after_start_server.test
@@ -0,0 +1,92 @@
+################################################################################
+# BUG#21045848 XA+MEMORY TABLE: POST SERVER RESTART 'XA COMMIT'
+#              IS OVERRIDDEN BY 'TRUNCATE' CMD
+#
+# Memory table's data will be lost after server restarts. To keep the data
+# consistency between master and slave, it just binlogs
+# 'TRUNCATE TABLE `db`.`table_name`' when the memory table is locked first time.
+# So TRUNCATE statement could be binlogged in many statements.
+#
+# Because it was not handled correctly, it caused below problems:
+## - COM_FIELD_LIST
+#   it didn't flush binlog cache to binlog file. So the TRUNCATEs were not
+#   binlogged in COM_FIELD_LIST, it was binlogged with next statement together.
+#
+# - CREATE TABLE ... LIKE memory_table
+# - CREATE TABLE ... SELECT memory_table
+#   They were binlogged like:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE FROM memory_table
+#   CREATE TABLE ... LIKE memory_table | CREATE TABLE ... SELECT memory_table
+#
+#   Both statements shared the same gtid event. That was not correct.
+#
+# - TRUNCATE is binlogged with a GTID but the DML which caused this
+#   truncate happen is using the same GTID.
+#   It also caused some DML binlogged without BEGIN and COMMIT. For example:
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#   it was binlogged as:
+#   GTID_log_event | Anonymous_gtid_log_event
+#   TRUNCATE FROM memory_table
+#   INSERT INTO myisam_t1 SELECT * FROM memory_table
+#
+# The test cases verify some cases that cannot be run when gtid mode is on.
+#
+# See rpl_gtid_delete_memory_table_after_start_server.test for the tests with
+# gtid_mode=on.
+################################################################################
+
+--source include/not_gtid_enabled.inc
+--source include/master-slave.inc
+
+CALL mtr.add_suppression("Found 1 prepared XA transactions");
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT) ENGINE = MyISAM;
+CREATE TABLE mem_t1(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+CREATE TABLE mem_t2(c1 INT PRIMARY KEY) ENGINE = MEMORY;
+
+INSERT INTO mem_t1 VALUES(1),(2),(3);
+INSERT INTO mem_t2 VALUES(1),(2),(3);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+--let $rpl_server_number=1
+--source include/rpl_restart_server.inc
+
+--source include/start_slave.inc
+
+--echo # Test case 1: verify TRUNCATE FROM mem_xx can be binlogged correctly
+--echo #              in CREATE TABLE ... SELECT
+--source include/rpl_connection_master.inc
+--source include/save_binlog_position.inc
+
+CREATE TABLE t3 SELECT * FROM mem_t1 UNION SELECT 10;
+
+--let $limit= 0,4
+--let $event_sequence= #Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Q(CREATE.*)
+--source include/assert_binlog_events.inc
+--source include/save_binlog_position.inc
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_t1 have been applied the tables should be empty.
+SELECT * FROM mem_t1;
+
+--echo #
+--echo # Test case 2: verify TRUNCATE FROM mem_xx can be binlogged correctly
+--echo #              in a DML on a MyISAM table
+--source include/rpl_connection_master.inc
+--source include/save_binlog_position.inc
+
+# mem_t2 is empty, the UNION makes sure that a row event is binlogged.
+INSERT INTO t2 SELECT * FROM mem_t2 UNION SELECT 10;
+--let $limit= 0,4
+--let $event_sequence= #Anonymous_Gtid # !Q(TRUNCATE.*) #Anonymous_Gtid # !Begin
+--source include/assert_binlog_events.inc
+
+--source include/sync_slave_sql_with_master.inc
+# TRUNCATE FROM mem_xx have been applied the tables should be empty.
+SELECT * FROM mem_t2;
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2, t3, mem_t1, mem_t2;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test b/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test
index a0dd55385810..a54af68ae4dc 100644
--- a/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test
+++ b/mysql-test/suite/rpl/t/rpl_operation_ignore_super_read_only.test
@@ -19,7 +19,8 @@
 #               MANY RPL CMDS.
 # Bug#26414532: MYSQLRPLSYNC ERRORS OUT BECAUSE SLAVE IS USING --SUPER-READ-ONLY
 #               OPTION
-#
+# Bug#27675107: SUPER_READ_ONLY WITH MASTER_INFO_REPOSITORY=TABLE BREAKS
+#               REPLICATION ON RESTART
 
 # Test in this file only makes sense in standard replication,
 # so it is skipped in group replication.
diff --git a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
index ae9036bc1911..55cb77d50070 100644
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
@@ -45,6 +45,7 @@ let $count= 0;
 let $table= worker_proc_list;
 source include/wait_until_rows_count.inc;
 
+--let $slave_sql_errno= convert_error(ER_MTS_INCONSISTENT_DATA)
 source include/wait_for_slave_sql_to_stop.inc;
 
 #
@@ -111,6 +112,7 @@ let $count= 0;
 let $table= worker_proc_list;
 source include/wait_until_rows_count.inc;
 
+--let $slave_sql_errno= convert_error(ER_DUP_ENTRY)
 source include/wait_for_slave_sql_to_stop.inc;
 delete from t1 where a=3;
 
diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test
index 878dba9b5876..77ccb3becc60 100644
--- a/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test
+++ b/mysql-test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test
@@ -353,6 +353,7 @@ reset master;
 
 --connection slave
 reset slave;
+reset master;
 
 --echo
 --echo # Restarting servers and setting up MTS now. Since, SQL thread and
diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_connect_status.test b/mysql-test/suite/rpl/t/rpl_perfschema_connect_status.test
index ef1bdda77333..660e3eb13c38 100644
--- a/mysql-test/suite/rpl/t/rpl_perfschema_connect_status.test
+++ b/mysql-test/suite/rpl/t/rpl_perfschema_connect_status.test
@@ -251,6 +251,7 @@ source include/assert.inc;
 --echo # after STOP SLAVE, thread_id changes to NULL and service_state to "off".
 --echo
 
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
 source include/stop_slave.inc;
 
 --echo
diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_order_by.cnf b/mysql-test/suite/rpl/t/rpl_perfschema_order_by.cnf
new file mode 100644
index 000000000000..8417bf14e3df
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_perfschema_order_by.cnf
@@ -0,0 +1,17 @@
+!include ../my.cnf
+
+[mysqld.1]
+log-slave-updates
+
+[mysqld.2]
+master-info-repository=TABLE
+relay-log-info-repository=TABLE
+log-slave-updates
+
+[mysqld.3]
+log-slave-updates
+
+[ENV]
+SERVER_MYPORT_3=                @mysqld.3.port
+SERVER_MYSOCK_3=                @mysqld.3.socket
+
diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_order_by.test b/mysql-test/suite/rpl/t/rpl_perfschema_order_by.test
new file mode 100644
index 000000000000..0d9e0882e5c0
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_perfschema_order_by.test
@@ -0,0 +1,43 @@
+# === Purpose ===
+#
+# This test verifies that ORDER BY on replication pfs tables returns
+# the correct data set.
+#
+# === Implementation ===
+#
+# 1) Setup a multi-source replication topology.
+# 2) With STS, execute DDLs on both the masters and use SQL ordering
+#    on PFS tables on slave.
+# 3) Repeat step 2 with Multi-threaded Slave.
+#
+# === References ===
+# Bug #22958077: ORDER BY LAST_SEEN_TRANSACTION RESULTS IN EMPTY SET (OR DEBUG
+#                ASSERTION)
+
+--let $rpl_topology= 3->2,1->2
+--let $rpl_multi_source= 1
+--let $rpl_skip_start_slave= 1
+--source include/rpl_init.inc
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+SET @save.slave_parallel_workers= @@global.slave_parallel_workers;
+
+--echo # Test for Single Threaded Slave
+SET GLOBAL slave_parallel_workers= 0;
+START SLAVE;
+--source extra/rpl_tests/rpl_perfschema_order_by.test
+
+--echo # Test for Multi Threaded Slave
+STOP SLAVE;
+SET GLOBAL slave_parallel_workers = 2;
+START SLAVE;
+--source extra/rpl_tests/rpl_perfschema_order_by.test
+
+#Cleanup
+STOP SLAVE;
+SET @@global.slave_parallel_workers= @save.slave_parallel_workers;
+START SLAVE;
+
+--let $rpl_skip_sync= 1
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_previous_gtids-master.opt b/mysql-test/suite/rpl/t/rpl_previous_gtids-master.opt
new file mode 100644
index 000000000000..45fc462066d3
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_previous_gtids-master.opt
@@ -0,0 +1 @@
+--log-bin=master-bin --gtid_mode=on --enforce_gtid_consistency=on
diff --git a/mysql-test/suite/rpl/t/rpl_previous_gtids.test b/mysql-test/suite/rpl/t/rpl_previous_gtids.test
new file mode 100644
index 000000000000..d21ee4a5b43a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_previous_gtids.test
@@ -0,0 +1,104 @@
+# === Purpose ===
+#
+# When binlog_order_commits is off then binlog rotate will wait for 'm_prep_xids' decrease to zero.
+# However 'm_prep_xids' is decreased before update thd's GTID to 'executed_gtids' so GTID may be missed
+# in the next binlog file's Previous_gtids event (see function MYSQL_BIN_LOG::finish_commit)
+#
+# ==== Requirements ====
+#
+# R1. Client transactions are guaranteed to have monotonically increasing GTIDs
+# without gaps between the generated numbers.
+#
+# === Implementation ====
+#
+# Ensure GTID XID is decreased after commit
+# 1. Create table t1. GTID 1
+# 2. Insert into t1. GTID 2 in a new connection. Stop after commit and decrease XID.
+# 3. Insert into t1. GTID 3. Rotate log file. XID 1-3 should be used in 'master-bin.000002'.
+# 4. Check GTID are used out by looking at log file 'master-bin.000002'.
+#
+# === References ===
+#
+# BUG #34930969	Contribution by Tencent: Previous_gtids miss gtid when binlog_order_commits off
+#
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_gtid.inc
+--source include/have_log_bin.inc
+
+--echo #
+--echo # Use default connection to master.
+--echo #
+
+--connection default
+
+RESET MASTER;
+
+SET @old_binlog_order_commits = @@global.binlog_order_commits;
+SET GLOBAL binlog_order_commits = 0;
+
+--echo #
+--echo # Create table. Use GTID 1
+--echo #
+
+CREATE TABLE t1 (id INT PRIMARY KEY);
+
+--echo #
+--echo # Make another connection. Set to stop at after dec_prep_xids.
+--echo #
+
+--connect(con1,localhost,root,,)
+SET DEBUG_SYNC = "after_dec_prep_xids SIGNAL signal.after_dec_prep_xids_reached WAIT_FOR signal.after_dec_prep_xids_unblock";
+
+--echo #
+--echo # Use GTID 2. Stop after dec_prep_xids. If commit is executed before
+--echo # dec_prep_xids then GTID 2 will be used out.
+--echo #
+
+--send
+INSERT INTO t1 VALUES(1);
+
+--echo #
+--echo # Use default connection to master.
+--echo #
+
+--connection default
+
+--echo #
+--echo # Wait until after_dec_prep_xids is reached
+--echo #
+
+SET DEBUG_SYNC = "now WAIT_FOR signal.after_dec_prep_xids_reached";
+
+--echo #
+--echo # Use GTID 3. Force to rotate to log 'master-bin.000002'
+--echo # All GTID 1-3 should be used in 'master-bin.000001'
+--echo #
+
+SET SESSION debug = "+d,force_rotate";
+INSERT INTO t1 VALUES(2);
+SET SESSION debug = "-d,force_rotate";
+
+--echo #
+--echo # Add transaction in new binary log 'master-bin.000002'
+--echo # GTID 4 should be used.
+--echo #
+
+SET DEBUG_SYNC = 'now SIGNAL signal.after_dec_prep_xids_unblock';
+INSERT INTO t1 VALUES(3);
+
+--echo #
+--echo # Check all GTID 1-3 are used by looking at 'master-bin.000002'
+--echo #
+
+--let $assert_cond = \'[\'SHOW BINLOG EVENTS IN "master-bin.000002" LIMIT 1, 1\', Info, 1]\' LIKE \'%1-3\'
+--let $assert_text = Previous_gtids should use UUID:1-3 GTID
+--source include/assert.inc
+
+--echo #
+--echo # Cleanup
+--echo #
+
+DROP TABLE t1;
+SET GLOBAL binlog_order_commits = @old_binlog_order_commits;
diff --git a/mysql-test/suite/rpl/t/rpl_relay_log_space_synchronization.test b/mysql-test/suite/rpl/t/rpl_relay_log_space_synchronization.test
new file mode 100644
index 000000000000..04d40445ef13
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_relay_log_space_synchronization.test
@@ -0,0 +1,64 @@
+# === Purpose ===
+#
+# This test verifies that SQL and IO threads update the
+# rli->relay_log_space_total variable in a synchronized manner.
+#
+# === Implementation ===
+#
+# 1. On Slave, make the SQL thread to purge relay logs and halt
+#    the SQL thread in MYSQL_BIN_LOG::purge_index_entry function
+#    using debug sync utility.
+# 2. Do a DML on master so that IO thread calls queue_event and
+#    updates rli->relay_log_space_total.
+# 3. Verify that IO thread is waiting rli->log_space_lock until it is released
+#    by SQL thread.
+#
+# === References ===
+#
+# Bug#26997096 RELAY_LOG_SPACE IS INACCURATE AND LEAKS
+
+# This test case is binlog_format agnostic
+--source include/have_binlog_format_row.inc
+# This test case uses debug_sync
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/master-slave.inc
+
+CREATE TABLE t1 (i INT);
+
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave_sql.inc
+SET GLOBAL debug='+d,wait_in_purge_index_entry';
+
+# Create a new relay log so the START SLAVE SQL_THREAD tries
+# to purge the old relay logs and hits the debug point.
+FLUSH LOCAL RELAY LOGS;
+START SLAVE SQL_THREAD;
+SET DEBUG_SYNC="now WAIT_FOR in_purge_index_entry";
+
+# Do a DML on master so that IO thread calls queue_event and
+# updates rli->relay_log_space_total.
+--source include/rpl_connection_master.inc
+INSERT INTO t1 VALUES (1);
+--source include/rpl_connection_slave.inc
+
+# Wait until IO thread tries to take a log_space_lock.
+--let $io_thread_id = `SELECT THREAD_ID FROM performance_schema.threads WHERE NAME like '%slave_io%'`
+--let $wait_condition= SELECT EVENT_NAME= 'wait/synch/mutex/sql/Relay_log_info::log_space_lock' FROM performance_schema.events_waits_current WHERE THREAD_ID=$io_thread_id
+--source include/wait_condition.inc
+
+# Since SQL thread has taken the rli->log_space_lock, IO thread should wait until
+# the lock is released. Assert that IO thread is waiting for rli->log_space_lock.
+--let $assert_text= IO Thread is waiting for Relay_log_info::log_space_lock.
+--let $assert_cond= "[SELECT EVENT_NAME FROM performance_schema.events_waits_current WHERE THREAD_ID=$io_thread_id]" = "wait/synch/mutex/sql/Relay_log_info::log_space_lock"
+--source include/assert.inc
+
+SET DEBUG_SYNC="now SIGNAL go_ahead_sql";
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/sync_slave_sql_with_master.inc
+SET GLOBAL debug='-d,wait_in_purge_index_entry';
+SET DEBUG_SYNC="RESET";
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_replication_observers_example_is_stopping.test b/mysql-test/suite/rpl/t/rpl_replication_observers_example_is_stopping.test
index 2e51c6a3c7af..6727fa5debe6 100644
--- a/mysql-test/suite/rpl/t/rpl_replication_observers_example_is_stopping.test
+++ b/mysql-test/suite/rpl/t/rpl_replication_observers_example_is_stopping.test
@@ -61,6 +61,11 @@
 --echo ############################################################
 --echo # 1. Install the plug-in and add error suppressions on slave
 
+--source include/rpl_connection_master.inc
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression(".*Cannot replicate.*purged required binary logs.*");
+SET SESSION sql_log_bin= 1;
+
 --source include/rpl_connection_slave.inc
 SET SESSION sql_log_bin= 0;
 CALL mtr.add_suppression("Table 't1' already exists");
diff --git a/mysql-test/suite/rpl/t/rpl_reset_restart-slave.opt b/mysql-test/suite/rpl/t/rpl_reset_restart-slave.opt
new file mode 100644
index 000000000000..00a660e47c10
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_reset_restart-slave.opt
@@ -0,0 +1,2 @@
+--skip-slave-start=0
+--relay-log-purge=0
diff --git a/mysql-test/suite/rpl/t/rpl_reset_restart.test b/mysql-test/suite/rpl/t/rpl_reset_restart.test
new file mode 100644
index 000000000000..45acaafdc672
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_reset_restart.test
@@ -0,0 +1,47 @@
+# ==== Purpose ====
+#
+# This test will check if reset slave is generating correct Previous_gtids
+# event in first relay log file after a RESET SLAVE.
+#
+# It will:
+# 1) generate some workload at the master;
+# 2) sync the slave with the master;
+# 3) stop slave replication threads;
+# 4) do RESET MASTER on the master;
+# 5) do RESET MASTER on the slave;
+# 6) do RESET SLAVE on the slave;
+# 7) restart the slave.
+#
+# Slave shall be able to sync with master without issues.
+#
+# ==== Related Bugs and Worklogs ====
+#
+# BUG#27636289 RPL BREAKS WITH RESTART AFTER RESET SLAVE IF --RELAY-LOG-PURGE=0
+#
+
+# This test case is binary log format agnostic
+--source include/have_binlog_format_row.inc
+--source include/have_gtid.inc
+--source include/master-slave.inc
+
+CREATE TABLE t1 (c1 INT);
+--source include/sync_slave_sql_with_master.inc
+--source include/stop_slave.inc
+
+--source include/rpl_connection_master.inc
+RESET MASTER;
+
+--source include/rpl_connection_slave.inc
+RESET MASTER;
+RESET SLAVE;
+--source include/start_slave.inc
+
+--source include/kill_and_restart_mysqld.inc
+
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test b/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test
index fd240a8d6261..1c92891ff738 100644
--- a/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test
+++ b/mysql-test/suite/rpl/t/rpl_rotate_row_trans.test
@@ -72,6 +72,7 @@ while ($restarts)
 }
 
 --echo # Stop the SQL thread (it should be in the middle of the transaction/group)
+--let $slave_sql_errno= convert_error(ER_MTS_INCONSISTENT_DATA)
 --source include/stop_slave_sql.inc
 
 --echo # Remove the debug point and restart the both threads
diff --git a/mysql-test/suite/rpl/t/rpl_row_corruption.test b/mysql-test/suite/rpl/t/rpl_row_corruption.test
index 8a0cf96683b2..545857d0d310 100644
--- a/mysql-test/suite/rpl/t/rpl_row_corruption.test
+++ b/mysql-test/suite/rpl/t/rpl_row_corruption.test
@@ -41,7 +41,7 @@ SET GLOBAL debug="+d,inject_tblmap_same_id_maps_diff_table";
 # wait for error 1593 (ER_SLAVE_FATAL_ERROR)
 --let $slave_sql_errno=1593 
 --source include/wait_for_slave_sql_error.inc
---source include/stop_slave.inc
+--source include/stop_slave_io.inc
 
 # clean up
 SET GLOBAL debug="-d,inject_tblmap_same_id_maps_diff_table";
diff --git a/mysql-test/suite/rpl/t/rpl_row_gtid_disconnect_drop_temporary_table.test b/mysql-test/suite/rpl/t/rpl_row_gtid_disconnect_drop_temporary_table.test
new file mode 100644
index 000000000000..29076f636a99
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_gtid_disconnect_drop_temporary_table.test
@@ -0,0 +1,8 @@
+# This is a wrapper for gtid_disconnect_drop_temporary_table.test
+# so that the same test can be used for mix/statement and row mode
+# The o/p of the above mentioned test varies with binlog format due to
+# Bug#28606948
+
+--source include/have_binlog_format_row.inc
+
+--source extra/rpl_tests/gtid_disconnect_drop_temporary_table.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_image_check_for_insert_select.test b/mysql-test/suite/rpl/t/rpl_row_image_check_for_insert_select.test
new file mode 100644
index 000000000000..7081edeb9d49
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_image_check_for_insert_select.test
@@ -0,0 +1,84 @@
+# ==== Purpose ====
+#
+# Verify that INSERT..SELECT query is logged as a row event and honors
+# binlog_row_image= FULL when binlog_format=MIXED with transaction isolation
+# level set to READ-COMMITTED.
+#
+# ==== Implementation ====
+#
+# 1. Initial setup includes setting the transaction isolation level to
+#    'READ-COMMITTED' on master and setting binlog_row_image = FULL using
+#    rpl_row_img_set.inc.
+# 2. Create two tables with same structure and insert a row into a table.
+# 3. Verify that INSERT..SELECT query is logged with full image on both master
+#    and slave with the use of rpl_row_img_parts_master_slave.inc file.
+#
+# Note: Please see rpl_row_img_set.inc and rpl_row_img_parts_master_slave.inc
+# for more details.
+#
+# ==== References ====
+#
+# Bug#29110804: BINLOG_ROW_IMAGE=FULL NOT ALWAYS HONOURED FOR BINROW_FORMAT=MIXED
+
+--source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
+
+# Save the value binlog_row_image
+SET @old_binlog_row_image= @@binlog_row_image;
+--source include/rpl_connection_slave.inc
+SET @old_binlog_row_image= @@binlog_row_image;
+--source include/rpl_connection_master.inc
+
+--echo # 1. Initial setup includes setting the transaction isolation level to
+--echo #    'READ-COMMITTED' on master and setting binlog_row_image = FULL using
+--echo #    rpl_row_img_set.inc.
+
+SET @old_transaction_isolation= @@session.transaction_isolation;
+SET SESSION transaction_isolation='READ-COMMITTED';
+
+--echo # Set the binlog_row_image to FULL on both master and slave.
+--let $row_img_set=master:FULL:N,slave:FULL:Y
+--source include/rpl_row_img_set.inc
+
+--echo #
+--echo # 2. Create two tables with same structure and insert a row into a table.
+--echo #
+CREATE DATABASE a;
+CREATE DATABASE b;
+
+CREATE TABLE a.test (id INT PRIMARY KEY, name VARCHAR(50) DEFAULT NULL, age BIGINT)ENGINE=InnoDB;
+CREATE TABLE b.test (id INT PRIMARY KEY, name VARCHAR(50) DEFAULT NULL, age BIGINT)ENGINE=InnoDB;
+
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 3. Verify that INSERT..SELECT query is logged with full image on both
+--echo #    master and slave with the use of rpl_row_img_parts_master_slave.inc
+--echo #    file.
+--echo #
+--source include/rpl_connection_master.inc
+--let $row_img_query= INSERT INTO a.test(id, age) VALUES (1,5)
+--let $row_img_expected_master= | 1:1 2:NULL 3:5
+--let $row_img_expected_slave = | 1:1 2:NULL 3:5
+--source include/rpl_row_img_parts_master_slave.inc
+
+--let $row_img_query= INSERT INTO b.test(id,age) SELECT id , age FROM a.test
+--let $row_img_expected_master= | 1:1 2:NULL 3:5
+--let $row_img_expected_slave = | 1:1 2:NULL 3:5
+--source include/rpl_row_img_parts_master_slave.inc
+
+# CLEAN UP
+DROP DATABASE a;
+DROP DATABASE b;
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+SET SESSION transaction_isolation= @old_transaction_isolation;
+
+--source include/rpl_connection_slave.inc
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test
new file mode 100644
index 000000000000..2e2e57e06aa1
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_mts.test
@@ -0,0 +1,48 @@
+# ==== Purpose ====
+#
+# Verify that Seconds_Behind_Master is calculated correctly on a
+# Multi-threaded Slave.
+#
+# ==== References ====
+# Bug #25407335 SLAVE DON'T REPORT SECONDS_BEHIND_MASTER WHEN RUNNING
+#               SLAVE_PARALLEL_WORKERS > 0
+#
+
+# Must be statement as we rely on PROCESSLIST's Info column
+--source include/have_binlog_format_statement.inc
+# This test uses debug_sync
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--let $rpl_skip_start_slave= 1
+--source include/master-slave.inc
+
+# Bug #25407335 SLAVE DON'T REPORT SECONDS_BEHIND_MASTER WHEN RUNNING
+#               SLAVE_PARALLEL_WORKERS > 0
+
+# Start slave in MTS mode
+connection slave;
+--let $debug_point= dbug.mts.force_clock_diff_eq_0
+--source include/add_debug_point.inc
+SET @save_slave_parallel_type = @@GLOBAL.slave_parallel_type;
+SET @save.slave_parallel_workers= @@global.slave_parallel_workers;
+SET @save_slave_transaction_retries= @@global.slave_transaction_retries;
+
+--echo # Test for PARALLEL_DATABASE
+SET GLOBAL slave_parallel_type = 'DATABASE';
+SET @@global.slave_parallel_workers= 4;
+--source extra/rpl_tests/rpl_seconds_behind_master_mts_type_database.test
+
+--echo # Test for LOGICAL_CLOCK
+SET GLOBAL slave_parallel_type = 'LOGICAL_CLOCK';
+SET GLOBAL slave_parallel_workers = 3;
+--source extra/rpl_tests/rpl_seconds_behind_master_mts_logical_clock.test
+
+#Cleanup
+--let $debug_point= dbug.mts.force_clock_diff_eq_0
+--source include/remove_debug_point.inc
+SET @@GLOBAL.slave_parallel_type= @save_slave_parallel_type;
+SET @@global.slave_parallel_workers= @save.slave_parallel_workers;
+SET @@global.slave_transaction_retries= @save_slave_transaction_retries;
+--source include/start_slave.inc
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test
index fc2734aaad0e..5dc1fde65036 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test
@@ -1,3 +1,15 @@
+# Usage:
+#
+#  [--let $rpl_test_optimize_for_static_plugin_config = 1|0]
+#  --source suite/rpl/t/rpl_semi_sync.test
+#
+# Parameters:
+#
+#  $rpl_test_optimize_for_static_plugin_config
+#    When set to `1`, will run the contained test-cases with
+#    `replication_optimize_for_static_plugin_config` option enabled.
+#
+
 # Want to skip this test from daily Valgrind execution
 --source include/no_valgrind_without_big.inc
 # Adding big test option for this test.
@@ -112,6 +124,11 @@ show status like 'Rpl_semi_sync_master_clients';
 show status like 'Rpl_semi_sync_master_status';
 show status like 'Rpl_semi_sync_master_yes_tx';
 
+if ($rpl_test_optimize_for_static_plugin_config == 1)
+{
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+}
+
 # reset master and slave so the following test starts in a clean environment
 --let $rpl_only_running_threads= 1
 --let $rpl_no_start_slave= 1
@@ -572,6 +589,10 @@ source include/stop_slave.inc;
 connection master;
 echo [ on master ];
 --source include/stop_dump_threads.inc
+if ($rpl_test_optimize_for_static_plugin_config == 1)
+{
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+}
 UNINSTALL PLUGIN rpl_semi_sync_master;
 enable_query_log;
 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
@@ -593,6 +614,10 @@ SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
 connection master;
 replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN;
 eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+if ($rpl_test_optimize_for_static_plugin_config == 1)
+{
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+}
 set global rpl_semi_sync_master_timeout= 60000; /* 60s */
 set global rpl_semi_sync_master_enabled= 1;
 
@@ -619,6 +644,11 @@ SHOW STATUS LIKE 'Rpl_semi_sync_slave_status';
 --echo #
 --echo # Clean up
 --echo #
+if ($rpl_test_optimize_for_static_plugin_config == 1)
+{
+  connection master;
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+}
 --source include/uninstall_semisync.inc
 
 connection slave;
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-master.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-master.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-slave.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-slave.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.cnf b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.cnf
new file mode 100644
index 000000000000..546452029ffe
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.cnf
@@ -0,0 +1,59 @@
+!include ../my.cnf
+
+[mysqld.1]
+log-slave-updates
+server_id=1
+
+[mysqld.2]
+log-slave-updates
+server_id=2
+
+[mysqld.3]
+log-slave-updates
+server_id=3
+
+[mysqld.4]
+log-slave-updates
+server_id=4
+
+[mysqld.5]
+log-slave-updates
+server_id=5
+
+[mysqld.6]
+log-slave-updates
+server_id=6
+
+[mysqld.7]
+log-slave-updates
+server_id=7
+
+[mysqld.8]
+log-slave-updates
+server_id=8
+
+[mysqld.9]
+log-slave-updates
+server_id=9
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
+
+SERVER_MYPORT_6=		@mysqld.6.port
+SERVER_MYSOCK_6=		@mysqld.6.socket
+
+SERVER_MYPORT_7=		@mysqld.7.port
+SERVER_MYSOCK_7=		@mysqld.7.socket
+
+SERVER_MYPORT_8=		@mysqld.8.port
+SERVER_MYSOCK_8=		@mysqld.8.socket
+
+SERVER_MYPORT_9=		@mysqld.9.port
+SERVER_MYSOCK_9=		@mysqld.9.socket
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.test b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.test
new file mode 100644
index 000000000000..0692438596f0
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.test
@@ -0,0 +1,191 @@
+#==== Purpose ====
+#
+# This test script purpose is to check semisync replication
+# behaviour when there are semisync slaves getting added and
+# removed while dml changes are happening.
+#
+#==== Implementation ====
+#
+# 1) Install semisync on one Master and 8 Slaves.
+# 2) Using mysqlslap, keep inserting data in background on Master.
+# 3) While the DMLs are going on, keep adding/removing semisync slaves.
+# 4) At the end of the step-3, check that the data is synced without any
+#    issues.
+# 5) Check semisync is still enabled on Master and all slaves.
+#
+#==== References ====
+#
+# Bug#27610678 SEMI-SYNC REPLICATION DOESN'T WORK FOR MINUTES AFTER RESTART
+#              REPLICATION
+#
+#========
+#
+# 9 servers + 5000 inserts involved in test. Hence marking it as big-test.
+#
+--source include/big_test.inc
+--source include/not_group_replication_plugin.inc
+--source include/have_binlog_format_statement.inc
+--source include/have_debug.inc
+
+#
+# One Master and 8 Slaves in the semi sync topology.
+#
+--let rpl_topology=1->2, 1->3, 1->4, 1->5, 1->6, 1->7, 1->8, 1->9
+--source include/rpl_init.inc
+
+--echo #
+--echo # 1. Initial data.
+--echo #
+call mtr.add_suppression("Timeout waiting for reply of binlog");
+CREATE TABLE t1(c1 INT);
+--source include/rpl_sync.inc
+
+--echo #
+--echo # 2. Install semisync on all the 9 servers.
+--echo #
+--let $i= 1
+while ($i < 10)
+{
+  --let $rpl_connection_name= server_$i
+  --source include/rpl_connection.inc
+  if ( $i == 1)
+  {
+    --connect(server1_1, localhost,root,,,$MASTER_MYPORT)
+    CALL mtr.add_suppression("Semi-sync master failed on net_flush.*");
+    --source include/install_semisync_master.inc
+  }
+  if ( $i != 1 )
+  {
+    CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+    --source include/install_semisync_slave.inc
+  }
+  --inc $i
+}
+
+--echo #
+--echo # 3. Make Master aware of 8 semisync slaves.
+--echo #
+--let $rpl_connection_name= server1_1
+--source include/rpl_connection.inc
+--let $slaves = 8
+--eval SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = $slaves
+
+--echo #
+--echo # 4. Insert 5000 tuples in background using 10 parallel connections.
+--echo #
+--exec_in_background $MYSQL_SLAP --create-schema=test --delimiter=";" --iterations=500 --query="INSERT INTO t1 values (1)" --concurrency=10 --silent 2>&1
+
+--echo #
+--echo # 5. While the insert operations are going in the background, keep
+--echo #    adding/removing semisync slaves randomly.
+--echo #
+--let $rpl_connection_silent = 1
+--let $include_silent= 1
+--disable_result_log
+--disable_query_log
+--let $rpl_debug= 0
+--let $iter= 1
+while ( $iter < 50 )
+{
+  # Random server_id generator ( server_id will between [2-9]
+  --let $server_id=`SELECT FLOOR(2 + ((RAND() * 100) % 8))`
+  --let $rpl_connection_name= server_$server_id
+  --source include/rpl_connection.inc
+  --let $service_state= `SELECT service_state FROM performance_schema.replication_connection_status`
+  if ($service_state == 'ON')
+  {
+    # If the replication state is ON, bring it down.
+    --source include/stop_slave.inc
+    --let $rpl_connection_name= server1_1
+    --source include/rpl_connection.inc
+    # Adjust rpl_semi_sync_master_wait_for_slave_count variable.
+    --dec $slaves
+    --eval SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = $slaves
+  }
+  if ($service_state == 'OFF')
+  {
+    # If the replication state is OFF, bring it up.
+    --source include/start_slave.inc
+    --let $rpl_connection_name= server1_1
+    --source include/rpl_connection.inc
+    # Adjust rpl_semi_sync_master_wait_for_slave_count variable.
+    --inc $slaves
+    --eval SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = $slaves
+  }
+  --inc $iter
+  # Do it slowly while insertions on the master are happening in the background.
+  sleep 1;
+}
+
+--echo #
+--echo # 6. Add all 8 semisync slaves back to Master
+--echo #     (if they were disconnected, in above step).
+--echo #
+--let $iter = 2
+while ($iter <= 9)
+{
+  --let $rpl_connection_name= server_$iter
+  --source include/rpl_connection.inc
+  --let $service_state= `SELECT service_state FROM performance_schema.replication_connection_status`
+  if ($service_state == 'OFF')
+  {
+    --source include/start_slave.inc
+    --let $rpl_connection_name= server1_1
+    --source include/rpl_connection.inc
+    # Adjust rpl_semi_sync_master_wait_for_slave_count variable.
+    --inc $slaves
+    --eval SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = $slaves
+  }
+  --inc $iter
+}
+--enable_result_log
+--enable_query_log
+--let $rpl_connection_silent = 0
+--let $include_silent= 0
+
+
+--echo #
+--echo # 7. Make sure the data is synced on Master without any issues.
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--let $wait_timeout= 60
+--let $wait_condition= SELECT count(*) = 5000 FROM t1
+--source include/wait_condition.inc
+--let $slave_timeout=600
+--source include/rpl_sync.inc
+
+--echo #
+--echo # 8. Check on all servers semisync is enabled after the
+--echo #    the experiment and then uninstall semisync pluging
+--echo #    from it.
+--echo #
+--let $i= 9
+while ($i >= 1)
+{
+  --let $rpl_connection_name= server_$i
+  --source include/rpl_connection.inc
+  if ( $i == 1)
+  {
+    --let $assert_variable_name= rpl_semi_sync_master_enabled
+    --let $assert_variable_value= 1
+    --source include/assert_variable.inc
+    --source include/uninstall_semisync_master.inc
+  }
+  if ( $i != 1 )
+  {
+    --let $assert_variable_name= rpl_semi_sync_slave_enabled
+    --let $assert_variable_value= 1
+    --source include/assert_variable.inc
+    --source include/uninstall_semisync_slave.inc
+  }
+  --dec $i
+}
+
+--echo #
+--echo # 9. Cleanup time.
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
index de232e289619..7dab9d42e687 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
@@ -48,6 +48,8 @@ CALL mtr.add_suppression("Failed to run 'after_sync' hook");
 # IO thread might have stopped. Restart it.
 --disable_result_log
 --source include/rpl_connection_slave.inc
+--let $slave_io_errno= 2003 #CR_CONN_HOST_ERROR
+--let $rpl_allow_error= 1
 --source include/start_slave_io.inc
 --enable_result_log
 
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl.test b/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl.test
index 4eaf699002cc..c401b8245ecf 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl.test
@@ -3,10 +3,6 @@
 #
 # The test verifies that ack receiver works well with yassl in semi-sync.
 #
-# Note: YaSSL code is frozen in 8.0+. Please see WL#8998. So we allow the
-# test fail in 8.0+ before pushing WL#8998. The test will work well with
-# wolfssl after pushing WL#8998. The test works well with opensll in 5.7+.
-#
 # ################################################################################
 --source include/not_group_replication_plugin.inc
 # Want to skip this test from daily Valgrind execution
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-master.opt
new file mode 100644
index 000000000000..1e8eb90679ee
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-master.opt
@@ -0,0 +1,2 @@
+$SEMISYNC_PLUGIN_OPT
+--force-restart
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-slave.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config-slave.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config.test b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config.test
new file mode 100644
index 000000000000..2e7cdff6b0f4
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_optimize_for_static_plugin_config.test
@@ -0,0 +1,24 @@
+# ==== Purpose ====
+#
+# Test the same test cases that in `suite/rpl/t/rpl_semi_sync.test` with the
+# `replication_optimize_for_static_plugin_config` enabled.
+#
+# ==== Requirements ====
+#
+# R1. All test described in `rpl_semi_sync.test` MUST pass with
+#     `replication_optimize_for_static_plugin_config` enabled.
+#
+# ==== Implementation ====
+#
+# 1. Set `$rpl_test_optimize_for_static_plugin_config` to `1`.
+# 2. Include `rpl_semi_sync.test`
+#
+# ==== References ====
+#
+# BUG#30519928 INTERMEDIATE MASTER WITH SEMISYNC SHOWS HIGH CPU USAGE DUE TO
+#              MUTEX SPINNING
+#
+
+--let $rpl_test_optimize_for_static_plugin_config = 1
+--source suite/rpl/t/rpl_semi_sync.test
+--let $rpl_test_optimize_for_static_plugin_config =
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-master.opt
new file mode 100644
index 000000000000..9719d20c83ed
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-master.opt
@@ -0,0 +1,3 @@
+$SEMISYNC_PLUGIN_OPT
+--replication-sender-observe-commit-only
+--force-restart
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-slave.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only-slave.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only.test b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only.test
new file mode 100644
index 000000000000..74ee35e703b6
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_sender_observe_commit_only.test
@@ -0,0 +1,22 @@
+# ==== Purpose ====
+#
+# Test the same test cases that in `suite/rpl/t/rpl_semi_sync.test` with the
+# `replication_sender_observe_commit_only` enabled.
+#
+# ==== Requirements ====
+#
+# R1. All test described in `rpl_semi_sync.test` MUST pass with
+#     `replication_sender_observe_commit_only` enabled.
+#
+# ==== Implementation ====
+#
+# 1. Set `replication_sender_observe_commit_only` to `1`.
+# 2. Include `rpl_semi_sync.test`
+#
+# ==== References ====
+#
+# BUG#30519928 INTERMEDIATE MASTER WITH SEMISYNC SHOWS HIGH CPU USAGE DUE TO
+#              MUTEX SPINNING
+#
+
+--source suite/rpl/t/rpl_semi_sync.test
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-master.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-master.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-master.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-slave.opt b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-slave.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-slave.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.cnf b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.cnf
new file mode 100644
index 000000000000..546452029ffe
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.cnf
@@ -0,0 +1,59 @@
+!include ../my.cnf
+
+[mysqld.1]
+log-slave-updates
+server_id=1
+
+[mysqld.2]
+log-slave-updates
+server_id=2
+
+[mysqld.3]
+log-slave-updates
+server_id=3
+
+[mysqld.4]
+log-slave-updates
+server_id=4
+
+[mysqld.5]
+log-slave-updates
+server_id=5
+
+[mysqld.6]
+log-slave-updates
+server_id=6
+
+[mysqld.7]
+log-slave-updates
+server_id=7
+
+[mysqld.8]
+log-slave-updates
+server_id=8
+
+[mysqld.9]
+log-slave-updates
+server_id=9
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
+
+SERVER_MYPORT_4=		@mysqld.4.port
+SERVER_MYSOCK_4=		@mysqld.4.socket
+
+SERVER_MYPORT_5=		@mysqld.5.port
+SERVER_MYSOCK_5=		@mysqld.5.socket
+
+SERVER_MYPORT_6=		@mysqld.6.port
+SERVER_MYSOCK_6=		@mysqld.6.socket
+
+SERVER_MYPORT_7=		@mysqld.7.port
+SERVER_MYSOCK_7=		@mysqld.7.socket
+
+SERVER_MYPORT_8=		@mysqld.8.port
+SERVER_MYSOCK_8=		@mysqld.8.socket
+
+SERVER_MYPORT_9=		@mysqld.9.port
+SERVER_MYSOCK_9=		@mysqld.9.socket
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.test b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.test
new file mode 100644
index 000000000000..53437df85364
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.test
@@ -0,0 +1,173 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to test the stability of turning on and off
+# both `replication_optimize_for_static_plugin_config` and
+# `replication_sender_observe_commit_only` global variables on intermediate
+# and leaf replicas with semi-sync enabled, while applying transactions.
+#
+# ==== Requirements ====
+#
+# R1. Both variables may be set online while both source and replica with
+#     semi-sync enabled are transmitting and applying transactions.
+#
+# ==== Implementation ====
+#
+# 1. Setup a 3 layered topology with the given topology 1->2, 2->3, 2->4,
+#    2->5, 2->6, 2->7, 2->8, 2->9
+# 2. Setup replication between 1st and 2nd layer is assynchronous and
+#    semi-synchronous between 2nd and 3rd layers.
+# 3. Using `mysqlslap`, send 5000 insert statements in the background.
+# 4. Iterate over the 2nd and 3rd layer servers and sequentially enable and
+#    disable the options while stopping and starting the applier threads.
+# 5. Sync all servers.
+# 6. Ensure that all servers have the same data.
+#
+# ==== References ====
+#
+# BUG#30519928 INTERMEDIATE MASTER WITH SEMISYNC SHOWS HIGH CPU USAGE DUE
+#              TO MUTEX SPINNING
+#
+
+--source include/not_group_replication_plugin.inc
+--source include/have_binlog_format_statement.inc
+
+--let $sources = 1
+--let $replicas_layer_1 = 1
+--let $replicas_layer_2 = 7
+--let $servers = `SELECT $replicas_layer_1 + $replicas_layer_2 + $sources`
+
+# 1. Setup a 3 layered topology with the given topology 1->2, 2->3, 2->4,
+#    2->5, 2->6, 2->7, 2->8, 2->9
+--let $rpl_topology = 1->2
+--let $i = 3
+while ($i <= $servers)
+{
+  --let $rpl_topology = $rpl_topology, 2->$i
+  --inc $i
+}
+--source include/rpl_init.inc
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+CREATE TABLE t (a int);
+
+# 2. Setup replication between 1st and 2nd layer is assynchronous and
+#    semi-synchronous between 2nd and 3rd layers.
+--let $i = 2
+while ($i <= $servers)
+{
+  --let $rpl_connection_name= server_$i
+  --source include/rpl_connection.inc
+
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+  SET GLOBAL replication_sender_observe_commit_only = 1;
+
+  if ($i == 2)
+  {
+    SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
+    CALL mtr.add_suppression("Semi-sync master failed on net_flush.*");
+    --source include/install_semisync_master.inc
+  }
+  if ($i != 2)
+  {
+    SHOW VARIABLES LIKE 'rpl_semi_sync_slave_enabled';
+    CALL mtr.add_suppression("Semi-sync slave net_flush.*");
+    --source include/install_semisync_slave.inc
+  }
+  --inc $i
+}
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--eval SET GLOBAL rpl_semi_sync_master_wait_for_slave_count = $replicas_layer_2
+
+# 3. Using `mysqlslap`, send 5000 insert statements in the background.
+--exec_in_background $MYSQL_SLAP --create-schema=test --delimiter=";" --iterations=500 --query="INSERT INTO t VALUES (1)" --concurrency=10 --silent 2>&1
+
+# 4. Iterate over the 2nd and 3rd layer servers and sequentially enable and
+#    disable the options while stopping and starting the applier threads.
+SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+           replication_sender_observe_commit_only = 1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+           replication_sender_observe_commit_only = 0;
+--source include/stop_slave.inc
+--source include/start_slave.inc
+
+--let $diff_tables = server_1:t
+--let $i = $servers
+while ($i > 1)
+{
+  --let $rpl_connection_name= server_$i
+  --source include/rpl_connection.inc
+
+  --source include/stop_slave.inc
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+             replication_sender_observe_commit_only = 0;
+  --source include/start_slave.inc
+
+  --source include/stop_slave.inc
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+             replication_sender_observe_commit_only = 1;
+  --source include/start_slave.inc
+
+  --sleep 1
+
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+             replication_sender_observe_commit_only = 0;
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+             replication_sender_observe_commit_only = 1;
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+             replication_sender_observe_commit_only = 0;
+  --source include/stop_slave.inc
+  --source include/start_slave.inc
+
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0,
+             replication_sender_observe_commit_only = 0;
+  SET GLOBAL replication_optimize_for_static_plugin_config = 1,
+             replication_sender_observe_commit_only = 1;
+
+  --let $diff_tables = $diff_tables, server_$i:t
+  --dec $i
+}
+
+# 5. Sync all servers.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--let $slave_timeout=600
+--source include/rpl_sync.inc
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--let $slave_timeout=600
+--source include/rpl_sync.inc
+
+# 6. Ensure that all servers have the same data.
+--source include/diff_tables.inc
+
+# Clean up
+--let $i = $servers
+while ($i > 1)
+{
+  --let $rpl_connection_name= server_$i
+  --source include/rpl_connection.inc
+
+  SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+  SET GLOBAL replication_sender_observe_commit_only = 0;
+
+  if ( $i == 2)
+  {
+    --source include/uninstall_semisync_master.inc
+  }
+  if ($i != 2)
+  {
+    --source include/uninstall_semisync_slave.inc
+  }
+
+  --dec $i
+}
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+DROP TABLE t;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_server_uuid.test b/mysql-test/suite/rpl/t/rpl_server_uuid.test
index 52cd4d598ce0..11869f34626c 100644
--- a/mysql-test/suite/rpl/t/rpl_server_uuid.test
+++ b/mysql-test/suite/rpl/t/rpl_server_uuid.test
@@ -133,7 +133,7 @@ connection master;
 --echo # and master_host are not changed.
 --echo -----------------------------------------------------------------------------
 connection slave;
-START SLAVE IO_THREAD;
+--source include/start_slave_io.inc
 --let $slave_param= Master_UUID
 --let $slave_param_value= $original_master_uuid
 --source include/wait_for_slave_param.inc
@@ -156,7 +156,7 @@ CHANGE MASTER TO MASTER_PORT= 1111;
 --replace_result $old_master_log_file MASTER_LOG_FILE $MASTER_MYPORT MASTER_PORT $old_master_log_pos MASTER_POS
 eval CHANGE MASTER TO MASTER_PORT= $MASTER_MYPORT,
        MASTER_LOG_FILE= '$old_master_log_file', MASTER_LOG_POS= $old_master_log_pos;
-START SLAVE IO_THREAD;
+--source include/start_slave_io.inc
 --let $slave_param= Master_UUID
 --let $slave_param_value= $original_master_uuid
 --source include/wait_for_slave_param.inc
@@ -179,7 +179,7 @@ CHANGE MASTER TO MASTER_HOST= 'localhost';
 --replace_result $old_master_log_file MASTER_LOG_FILE $MASTER_MYPORT MASTER_PORT $old_master_log_pos MASTER_POS
 eval CHANGE MASTER TO MASTER_HOST= '127.0.0.1',
        MASTER_LOG_FILE= '$old_master_log_file', MASTER_LOG_POS= $old_master_log_pos;
-START SLAVE IO_THREAD;
+--source include/start_slave_io.inc
 --let $slave_param= Master_UUID
 --let $slave_param_value= $original_master_uuid
 --source include/wait_for_slave_param.inc
@@ -200,7 +200,7 @@ CHANGE MASTER TO MASTER_HOST= '127.0.0.1', MASTER_PORT= 1111;
 --replace_result $old_master_log_file MASTER_LOG_FILE $MASTER_MYPORT MASTER_PORT $old_master_log_pos MASTER_POS
 eval CHANGE MASTER TO MASTER_HOST= '127.0.0.1', MASTER_PORT= $MASTER_MYPORT,
        MASTER_LOG_FILE= '$old_master_log_file', MASTER_LOG_POS= $old_master_log_pos;
-START SLAVE IO_THREAD;
+--source include/start_slave_io.inc
 --let $slave_param= Master_UUID
 --let $slave_param_value= $original_master_uuid
 --source include/wait_for_slave_param.inc
diff --git a/mysql-test/suite/rpl/t/rpl_show_processlist_info.test b/mysql-test/suite/rpl/t/rpl_show_processlist_info.test
new file mode 100644
index 000000000000..0c7bd24c9ac3
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_show_processlist_info.test
@@ -0,0 +1,47 @@
+################################################################################
+# ==== Purpose ====
+# The purpose of this test is to verify that, SHOW PROCESSLIST in Replica
+# shows null value instead of previously executed command in the INFO section
+# when slave_sql thread is waiting for updates from the Source.
+#
+# ==== Requirements ====
+# Replica's slave_sql thread should show null value in the SHOW PROCESSLIST
+# INFO section when it is waiting for updates from Source, even if the
+# previoulsy executed query is a rewritten query.
+#
+# ==== Implementation ====
+# 1. Perform an operation that can cause rewritten query on Source
+# 2. Verify Replica state and info through 'SHOW PROCESSLIST'
+# 3. Clean-up
+#
+# ==== References ====
+# Bug#:30521198: IDLE & CAUGHT UP SLAVE HAS OLD QUERY SHOWN IN "INFO"
+#                SECTION OF PROCESSLIST
+#
+################################################################################
+
+# Test is binlog_format-agnostic
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--echo
+--echo ==== Test ====
+# Perform an operation that can cause rewritten query on Source
+CREATE USER IF NOT EXISTS 'user1'@'%' IDENTIFIED WITH 'mysql_native_password';
+
+# Verify replica activity using SHOW PROCESSLIST;
+--source include/sync_slave_sql_with_master.inc
+
+let $show_statement= SHOW PROCESSLIST;
+let $field= State;
+let $condition= = 'Slave has read all relay log; waiting for more updates';
+--source include/wait_show_condition.inc
+--let $wait_condition= SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State='Slave has read all relay log; waiting for more updates' AND INFO IS NULL;
+--source include/wait_condition.inc
+
+--echo
+--echo ==== Clean up ====
+--source include/rpl_connection_master.inc
+DROP USER IF EXISTS 'user1'@'%';
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config-master.opt b/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config-master.opt
new file mode 100644
index 000000000000..58029d28acec
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config-master.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff --git a/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config.test b/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config.test
new file mode 100644
index 000000000000..9284dcc40ffd
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config.test
@@ -0,0 +1,44 @@
+# ==== Purpose ====
+#
+# The purpose of this script is to test that replication plugins are
+# properly unloaded when `replication_optimize_for_static_plugin_config` is
+# enabled.
+#
+# ==== Requirements ====
+#
+# R1. Upon server shutdown, all replication plugins should cleanly unload
+#     even if `replication_optimize_for_static_plugin_config` is enabled.
+#
+# ==== Implementation ====
+#
+# 1. Install a replication plugin.
+# 2. Turn `replication_optimize_for_static_plugin_config` on.
+# 3. Stop and start the server.
+# 4. Clean up.
+# 5. Let MTR check-testcase infra-structure check that no error message
+#    regarding erroneous plugin unloading has been logged to the error log.
+#
+# ==== References ====
+#
+# BUG#32798287 PROBLEM WITH UNINSTALL WHEN
+#              --REPLICATION-OPTIMIZE-FOR-STATIC-PLUGIN-CONFIG=ON
+#
+
+--source include/have_binlog_format_row.inc
+
+# 1. Install a replication plugin.
+--source include/install_semisync_master.inc
+
+# 2. Turn `replication_optimize_for_static_plugin_config` on.
+--let $saved_replication_optimize_for_static_plugin_config = `SELECT @@GLOBAL.replication_optimize_for_static_plugin_config`
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+
+# 3. Stop and start the server.
+--source include/stop_mysqld.inc
+--source include/start_mysqld.inc
+
+# 4. Clean up.
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+--source include/uninstall_semisync_master.inc
+--replace_result $saved_replication_optimize_for_static_plugin_config REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+--eval SET GLOBAL replication_optimize_for_static_plugin_config = $saved_replication_optimize_for_static_plugin_config
diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
index 6e30babe4914..dc05ad83cabf 100644
--- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
@@ -68,7 +68,7 @@ call mtr.add_suppression("Slave SQL.*Table .test.t3. doesn.t exist.* Error_code:
 call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 # in MTS case error is either of two:
-#--let $slave_sql_errno= 1146,1593
+--let $slave_sql_errno= 1146,1593
 # whereas in the single-threaded case:
 # 1146 = ER_NO_SUCH_TABLE
 #--let $slave_sql_errno= 1146
diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_in.test b/mysql-test/suite/rpl/t/rpl_slave_load_in.test
index 4a6426698046..2616db1aadf4 100644
--- a/mysql-test/suite/rpl/t/rpl_slave_load_in.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_in.test
@@ -1,20 +1,46 @@
 ##########################################################################
-# This test verifies if a slave is able to process a "LOAD DATA INFILE" 
+# This test verifies if a slave is able to process a "LOAD DATA INFILE"
 # event while the "--secure-file-priv" option is set.
-# 
+#
 # The test is divided in two steps:
 #    1 - Creates tables and populates them through "LOAD DATA INFILE".
 #    2 - Compares the master and slave.
+#
+# === References ===
+# Bug#28541204 SECURE-FILE-PRIV BREAKS LOAD DATA INFILE REPLICATION IN
+#              STATEMENT MODE ON 5.7.23
 ##########################################################################
---source include/have_innodb.inc
+
+# This test does not work with var being a softlink.
+--source include/not_var_link.inc
+--source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
+# Bug#28541204 SECURE-FILE-PRIV BREAKS LOAD DATA INFILE REPLICATION IN
+#              STATEMENT MODE ON 5.7.23
+
+--echo # Restart the slave with a different secure path.
+--source include/rpl_connection_slave.inc
+--let $old_secure_file_path=`SELECT @@GLOBAL.secure_file_priv`
+--let $datadir=`SELECT @@GLOBAL.datadir`
+--let $include_silent=1
+--let $rpl_server_number=2
+--let $rpl_server_parameters=--secure-file-priv=$datadir
+--source include/rpl_restart_server.inc
+--let $include_silent=0
+
+# Assert that @@GLOBAL.secure_file_priv equals @@GLOBAL.datadir
+--let $assert_text= Datadir is the new secure file path
+--let $assert_cond= "[SELECT @@GLOBAL.secure_file_priv]" = "[SELECT @@GLOBAL.datadir]"
+--source include/assert.inc
+--source include/start_slave.inc
+
 ##########################################################################
 #                            Loading data
 ##########################################################################
-connection master;
+--source include/rpl_connection_master.inc
 
-create table t1(a int not null auto_increment, b int, primary key(a));
+create table t1(a int not null auto_increment, b int, primary key(a)) engine=myisam;
 create table t2(a int not null auto_increment, b int, primary key(a)) engine=innodb;
 
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
@@ -31,6 +57,20 @@ commit;
 ##########################################################################
 --source include/sync_slave_sql_with_master.inc
 
+--echo # Restore the old secure path on slave.
+--let $include_silent=1
+--let $rpl_server_number=2
+--let $rpl_server_parameters=--secure-file-priv=$old_secure_file_path
+--source include/rpl_restart_server.inc
+--let $include_silent=0
+
+# Assert that @@GLOBAL.secure_file_priv is restored.
+--let $assert_text= Old secure file path is restored.
+--let $assert_cond= "[SELECT @@GLOBAL.secure_file_priv]" = "$old_secure_file_path"
+--source include/assert.inc
+
+--source include/start_slave.inc
+
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
 
@@ -40,7 +80,7 @@ source include/diff_tables.inc;
 ##########################################################################
 #                             Clean up
 ##########################################################################
-connection master;
+--source include/rpl_connection_master.inc
 
 drop table t1;
 drop table t2;
diff --git a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
index c096c7b17c87..d46b032d6083 100644
--- a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
@@ -15,7 +15,7 @@ START SLAVE;
 call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory.* Error_code: 12");
 --let $slave_sql_errno= 12
 source include/wait_for_slave_sql_error.inc;
-
+--source include/wait_for_slave_io_to_start.inc
 --source include/stop_slave_io.inc
 RESET SLAVE;
 
diff --git a/mysql-test/suite/rpl/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test
index 2ee2cdf77cc0..92911b1e990e 100644
--- a/mysql-test/suite/rpl/t/rpl_slave_status.test
+++ b/mysql-test/suite/rpl/t/rpl_slave_status.test
@@ -65,6 +65,7 @@ FLUSH PRIVILEGES;
 source include/stop_slave.inc;
 START SLAVE;
 source include/wait_for_slave_sql_to_start.inc;
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
 source include/wait_for_slave_io_to_stop.inc;
 
 --echo ==== Verify that Slave IO thread stopped with error ====
diff --git a/mysql-test/suite/rpl/t/rpl_sql_thread_error.test b/mysql-test/suite/rpl/t/rpl_sql_thread_error.test
index 7f0845da4937..5e537538481f 100644
--- a/mysql-test/suite/rpl/t/rpl_sql_thread_error.test
+++ b/mysql-test/suite/rpl/t/rpl_sql_thread_error.test
@@ -37,6 +37,7 @@ START SLAVE SQL_THREAD;
 # Step 2) Wait for SQL thread to go down with the injected error.
 # Before fix, SQL thread would not have released
 # relay_log.log_lock.
+--let $slave_sql_errno= convert_error(ER_SLAVE_RELAY_LOG_READ_FAILURE)
 --source include/wait_for_slave_sql_to_stop.inc
 
 # Step 3) Before fix, when SQL thread is trying to acquire
diff --git a/mysql-test/suite/rpl/t/rpl_ssl1.cnf b/mysql-test/suite/rpl/t/rpl_ssl1.cnf
new file mode 100644
index 000000000000..5af2504fc789
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_ssl1.cnf
@@ -0,0 +1,3 @@
+!include ../my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/mysql-test/suite/rpl/t/rpl_ssl1.test b/mysql-test/suite/rpl/t/rpl_ssl1.test
index faf77cf941bf..4b26eb0ed65b 100644
--- a/mysql-test/suite/rpl/t/rpl_ssl1.test
+++ b/mysql-test/suite/rpl/t/rpl_ssl1.test
@@ -26,17 +26,11 @@ change master to master_user='replssl',master_password='';
 start slave;
 
 #showing that replication don't work
-connection master;
-insert into t1 values (1);
-#reasonable timeout for changes to propagate to slave
-let $wait_condition= SELECT COUNT(*) = 1 FROM t1;
-source include/wait_condition_or_abort.inc;
-connection slave;
-select * from t1;
+--let $slave_io_errno= convert_error(ER_ACCESS_DENIED_ERROR)
+--source include/wait_for_slave_io_error.inc
+--source include/stop_slave_sql.inc
 
 #showing that replication could work with ssl params
-stop slave;
---source include/wait_for_slave_to_stop.inc
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --replace_column 2 ####
 eval change master to master_ssl=1 , master_ssl_ca ='$MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='$MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='$MYSQL_TEST_DIR/std_data/client-key.pem', master_tls_version='TLSv1.1';
@@ -45,6 +39,7 @@ start slave;
 
 #avoiding unneeded sleeps
 connection master;
+insert into t1 values (1);
 --source include/sync_slave_sql_with_master.inc
 
 #checking that replication is ok
diff --git a/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.cnf b/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.cnf
new file mode 100644
index 000000000000..f0f23ece7218
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.cnf
@@ -0,0 +1,13 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+master-info-repository=TABLE
+relay-log-info-repository=TABLE
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff --git a/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test b/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test
new file mode 100644
index 000000000000..8549cd8e9995
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_start_slave_after_restart_initialized_slave.test
@@ -0,0 +1,90 @@
+# ==== Purpose ====
+#
+# This test verifies that executing START SLAVE command after restart of an
+# initialized slave shall return no error.
+#
+# ==== Implementation ====
+#
+# 1. Initialize the slave by sourcing master-slave.inc without starting the
+#    slave threads.
+#
+# 2. Verify that START SLAVE doesn't throw any error when
+#
+#    2.1 Server is shutdown and restarted with --relay-log-recovery=1 so that
+#        STOP EVENT is generated in the relay log.
+#
+#    2.2 Server is killed and restarted with --relay-log-recovery=1 and when no
+#        STOP EVENTS is generated in the relay log.
+#
+# 3. Verify that a warning saying that "Server was not able to find a rotate
+#    event from a master server to initialize relay log recovery" is logged in
+#    the error log.
+#
+# ==== References ====
+#
+# Bug#28996606 REPLICATION DOES NOT START IF RESTART MYSQL AFTER INIT
+#              WITHOUT START SLAVE
+
+--source include/have_binlog_format_row.inc
+--source include/have_slave_repository_type_table.inc
+
+# 1. Initialize the slave by sourcing master-slave.inc without starting the
+#    slave threads.
+--let $rpl_multi_source= 1
+--let $rpl_topology= 1->2,3->2
+--let $rpl_skip_start_slave=1
+--source include/rpl_init.inc
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+CALL mtr.add_suppression("Error during --relay-log-recovery*");
+CALL mtr.add_suppression("Server was not able to find a rotate event*");
+CALL mtr.add_suppression("Recovery from master pos*");
+
+# 2. Verify that START SLAVE doesn't throw any error when
+#
+# 2.1 Server is shutdown and restarted with --relay-log-recovery=1 so that
+#     STOP EVENT is generated in the relay log.
+#
+# 2.2 Server is killed and restarted with --relay-log-recovery=1 and when no
+#     STOP EVENTS is generated in the relay log.
+
+--let $i=0
+while ($i < 2)
+{
+  if ($i == 1)
+  {
+    # Force kill the slave server and restart it with --relay-log-recovery=1 so
+    # that STOP_EVENT is not generated in the relay log.
+    --let $rpl_force_stop= 1
+  }
+  --let $rpl_server_number= 2
+  --let $rpl_server_parameters= --skip_slave_start=1 --relay-log-recovery=1
+  --source include/rpl_restart_server.inc
+
+  --let $rpl_connection_name= server_2
+  --source include/rpl_connection.inc
+
+  # START SLAVE should not throw any error.
+  --source include/start_slave.inc
+
+  # Reset all servers to a clean state without syncing the servers.
+  --let $rpl_skip_sync=1
+  --source include/rpl_reset.inc
+  --inc $i
+}
+
+# 3. Verify that a warning saying that "Server was not able to find a rotate
+#    event from a master server to initialize relay log recovery" is logged in
+#    the error log.
+
+--let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.2.err
+# Each test will log two warnings, one fore each channel.
+--let $assert_count= 2
+--let $assert_only_after= CURRENT_TEST: rpl.rpl_start_slave_after_restart_initialized_slave
+--let $assert_select=.* \[Warning\] Server was not able to find a rotate event
+--let $assert_text= Found the expected warning line in the error log.
+--source include/assert_grep.inc
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_mix_gtid_disconnect_drop_temporary_table.test b/mysql-test/suite/rpl/t/rpl_stm_mix_gtid_disconnect_drop_temporary_table.test
new file mode 100644
index 000000000000..f9d510af99b5
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_stm_mix_gtid_disconnect_drop_temporary_table.test
@@ -0,0 +1,8 @@
+# This is a wrapper for gtid_disconnect_drop_temporary_table.test
+# so that the same test can be used for mix/statement and row mode
+# The o/p of the above mentioned test varies with binlog format due to
+# Bug#28606948
+
+--source include/have_binlog_format_mixed_or_statement.inc
+
+--source extra/rpl_tests/gtid_disconnect_drop_temporary_table.test
diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave_with_non_transactional_update.test b/mysql-test/suite/rpl/t/rpl_stop_slave_with_non_transactional_update.test
new file mode 100644
index 000000000000..fae5fd19be82
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave_with_non_transactional_update.test
@@ -0,0 +1,122 @@
+################################################################################
+# ==== Purpose ====
+# The purpose of this test is to verify that, in single thread replication
+# mode when applier thread is handling a transaction that interacts with
+# non-transaction tables, server should not report error when applier thread is
+# being stopped in the middle of a transaction and able to complete the
+# transaction with in the timeout which is hard-coded to 60 seconds.
+#
+# ==== Requirement ====
+# In single thread replication, when applier thread is being stopped in the
+# middle of a transaction that interacts with non-transactional tables, there
+# should not be any error if the transaction is able to complete with in the
+# timeout. When the applier thread is restarted, the timeout should be reset, so
+# that the next 'stop slave sql_thread' statement again gives a 60 seconds
+# interval for non-transactional statements to complete. Also replica should
+# be stopped successfully.
+#
+# ==== Implementation ====
+# 1. Create source-replica topology and initial setup on source.
+# 2. Execute insert statement followed by STOP SLAVE SQL_THREAD for two times.
+#    2.1 Execute a statement on source.
+#    2.2 Verify that applier thread is waiting on debug sync point.
+#    2.3 Execute 'stop slave sql_thread' and let it wait on debug sync point.
+#    2.4 Continue applier thread.
+#    2.5 Continue 'stop slave sql_thread'.
+#    2.6 Execute 'start slave sql_thread'.
+# 3. Cleanup.
+#
+# ==== References ====
+# BUG#33646899: MTS + STOP SLAVE SQL_THREAD + group of rep events stops
+#               before 60 sec timeout
+################################################################################
+
+source include/have_myisam.inc;
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+source include/have_binlog_format_row.inc;
+source include/big_test.inc;
+source include/not_mts_slave_parallel_workers.inc;
+
+--echo #
+--echo # 1. Create source-replica topology and initial setup on source.
+source include/master-slave.inc;
+CREATE TABLE t1(c1 INT) ENGINE=MyISAM;
+
+--source include/sync_slave_sql_with_master.inc
+call mtr.add_suppression("Slave SQL for channel.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
+
+# Adding debug sync points to execute special code required for this test
+--let $debug_point=wait_after_do_update_pos
+--source include/add_debug_point.inc
+
+--echo #
+--echo # 2. Execute insert statement followed by STOP SLAVE SQL_THREAD for two
+--echo #    times. Wait for SLAVE_WAIT_GROUP_DONE(60s) after first iteration.
+--let $iter=0
+while ($iter < 2)
+{
+
+  --echo #
+  --echo # 2.1 Execute a statement on source.
+  --source include/rpl_connection_master.inc
+  --send INSERT INTO t1 (c1) VALUES (1);
+
+  --echo #
+  --echo # 2.2 Verify that applier thread is waiting on debug sync point.
+  --source include/rpl_connection_slave.inc
+  --let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now';
+  --source include/wait_condition.inc
+
+  --echo #
+  --echo # 2.3 Execute 'stop slave sql_thread' and let it wait
+  --echo #     on debug sync point.
+  # Let 'stop slave sql_thread' reach the point where it sets the 'abort_slave'
+  # flag for the applier thread. This ensures that the applier thread starts
+  # the 60 seconds countdown once it is unpaused.
+  --let $statement_connection = slave
+  --let $statement = stop slave sql_thread
+  --let $auxiliary_connection = server_2_1
+  --let $sync_point = terminate_slave_threads_after_set_abort_slave
+  --source include/execute_to_sync_point.inc
+
+  --echo #
+  --echo # 2.4 Continue applier thread.
+  SET DEBUG_SYNC= 'now SIGNAL signal.after_do_update_pos_continue';
+
+  --echo #
+  --echo # 2.5 Continue 'stop slave sql_thread'.
+  --source include/execute_from_sync_point.inc
+
+  --source include/rpl_connection_master.inc
+  --reap;
+
+  if ($iter == 0)
+  {
+    # Wait till SLAVE_WAIT_GROUP_DONE
+    --sleep 61
+  }
+
+  --source include/rpl_connection_slave.inc
+  if ($iter == 1)
+  {
+    # Remove debug sync point
+    --let $debug_point=wait_after_do_update_pos
+    --source include/remove_debug_point.inc
+  }
+
+  --echo #
+  --echo # 2.6 Execute 'start slave sql_thread'.
+  --source include/start_slave_sql.inc
+
+  --inc $iter
+}
+
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 3. Cleanup.
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-master.opt b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-master.opt
index 9c9f0cf61e2d..9cace383966d 100644
--- a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-master.opt
@@ -1 +1 @@
---transaction-write-set-extraction=MURMUR32
+--transaction-write-set-extraction=XXHASH64
diff --git a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-slave.opt b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-slave.opt
index 9c9f0cf61e2d..9cace383966d 100644
--- a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction-slave.opt
@@ -1 +1 @@
---transaction-write-set-extraction=MURMUR32
+--transaction-write-set-extraction=XXHASH64
diff --git a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction.test b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction.test
index e1236fe8cc2a..e50a4fe01981 100644
--- a/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction.test
+++ b/mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction.test
@@ -9,15 +9,15 @@
 --source include/have_debug.inc
 --source include/master-slave.inc
 
---let $assert_text= The value for transaction_write_set_extraction shoudl be MURMUR32
---let $assert_cond= "[SELECT @@SESSION.transaction_write_set_extraction]" = "MURMUR32"
+--let $assert_text= The value for transaction_write_set_extraction must be XXHASH64
+--let $assert_cond= "[SELECT @@SESSION.transaction_write_set_extraction]" = "XXHASH64"
 --source include/assert.inc
 
 # Table with single valued Primary key field with insert and update
 
 --connection master
 CREATE TABLE t1 (a INT PRIMARY KEY);
-SET @@GLOBAL.DEBUG= @debug_saved;
+SET @debug_saved= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert';
 INSERT INTO t1 VALUES(1);
 SET @@GLOBAL.DEBUG= @debug_saved;
@@ -28,8 +28,23 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 DROP TABLE t1;
 --source include/rpl_sync.inc
 
+# tests both writeset algorithm (with and without collation)
+--connection master
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert_collation';
+INSERT INTO t1 VALUES(1);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_update_collation';
+UPDATE t1 SET a=3 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+--source include/rpl_sync.inc
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
 # Table with multi values pimary key field with insert and update
 
+--connection master
 CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));
 SET @@GLOBAL.DEBUG= @debug_saved;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert';
@@ -42,6 +57,20 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 DROP TABLE t1;
 --source include/rpl_sync.inc
 
+# tests both writeset algorithm (with and without collation)
+--connection master
+CREATE TABLE t1(a BINARY(1), b BINARY(1), PRIMARY KEY(a, b));
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert_collation';
+INSERT INTO t1 VALUE(1, 2);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_update_collation';
+UPDATE t1 SET a=3 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+--source include/rpl_sync.inc
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
 # Table with single primary key and multiple unique key with insert and
 # updates.
 
@@ -57,9 +86,23 @@ UPDATE t1 SET c1=5 WHERE c1=1;
 DROP TABLE t1;
 --source include/rpl_sync.inc
 
+# tests both writeset algorithm (with and without collation)
+--connection master
+CREATE TABLE t1 (c1 BINARY(1) PRIMARY KEY, c2 BINARY(1) NOT NULL UNIQUE, c3 BINARY(1) NOT NULL UNIQUE);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert_collation';
+INSERT INTO t1 VALUES (1, 2, 3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_update_collation';
+UPDATE t1 SET c1=5 WHERE c1=1;
+--source include/rpl_sync.inc
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
 # Table with multi valued primary key and multiple unique key with insert and
 # updates.
 
+--connection master
 CREATE TABLE t1 (a INT, d INT, b INT NOT NULL UNIQUE, c INT NOT NULL UNIQUE, PRIMARY KEY(a, d));
 SET @@GLOBAL.DEBUG= @debug_saved;
 SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert';
@@ -72,6 +115,20 @@ SET @@GLOBAL.DEBUG= @debug_saved;
 DROP TABLE t1;
 --source include/rpl_sync.inc
 
+# tests both writeset algorithm (with and without collation)
+--connection master
+CREATE TABLE t1 (a BINARY(1), d BINARY(1), b BINARY(1) NOT NULL UNIQUE, c BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(a, d));
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert_collation';
+INSERT INTO t1 VALUES(1, 2, 3, 4);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_update_collation';
+UPDATE t1 SET a=5 WHERE a=1;
+SET @@GLOBAL.DEBUG= @debug_saved;
+--source include/rpl_sync.inc
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
 # Table with Primary Key + Unique Key and Foreign Key
 
 --connection master
@@ -97,4 +154,76 @@ DROP TABLE t2;
 DROP TABLE t1;
 --source include/rpl_sync.inc
 
+# tests both writeset algorithm (with and without collation)
+--connection master
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
+CREATE TABLE t2 (b BINARY(1) PRIMARY KEY);
+CREATE TABLE t3 (c1 BINARY(1), c2 BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
+
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (5);
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_insert_collation';
+INSERT INTO t3 values(1,5);
+SET @@GLOBAL.DEBUG= @debug_saved;
+INSERT INTO t1 VALUES (3);
+--source include/rpl_sync.inc
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_update_collation';
+UPDATE t3 SET c1=3 WHERE c1=1;
+--source include/rpl_sync.inc
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t3;
+DROP TABLE t2;
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
+# Table with multi column primary key and a foreign key to the multi column primary key
+
+--connection master
+
+CREATE TABLE t1(a BINARY(1), b BINARY(1), c BINARY(1), PRIMARY KEY (a,b,c));
+CREATE TABLE t2(d BINARY(1), e BINARY(1), f BINARY(1), PRIMARY KEY (d,e,f), CONSTRAINT foreign_key_t2_t1 FOREIGN KEY (d,e,f) REFERENCES t1(a,b,c));
+
+INSERT INTO t1 VALUES (1,2,3);
+INSERT INTO t1 VALUES (4,2,3);
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_insert';
+INSERT INTO t2 VALUES (1,2,3);
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_update';
+UPDATE t2 SET d=4 WHERE d=1;
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t2;
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
+# Table with multi column unique key and a foreign key to the multi column unique key
+
+--connection master
+
+CREATE TABLE t1 (a BINARY(1) PRIMARY KEY, b BINARY(1) NOT NULL, c BINARY(1) NOT NULL, UNIQUE KEY key_b_c(b,c));
+CREATE TABLE t2 (d BINARY(1) PRIMARY KEY, e BINARY(1) NOT NULL, f BINARY(1) NOT NULL, UNIQUE KEY key_e_f(e,f), FOREIGN KEY(e,f) REFERENCES t1(b,c));
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multiple_column_unique_key_insert';
+INSERT INTO t1 VALUES (1,2,3);
+SET @@GLOBAL.DEBUG= @debug_saved;
+INSERT INTO t1 VALUES (4,5,6);
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_insert';
+INSERT INTO t2 VALUES (1,2,3);
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_update';
+UPDATE t2 SET d=4,e=5,f=6 WHERE d=1;
+
+SET @@GLOBAL.DEBUG= @debug_saved;
+DROP TABLE t2;
+DROP TABLE t1;
+--source include/rpl_sync.inc
+
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test b/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test
index 3c114f0d8a4f..80767c0036f7 100644
--- a/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test
+++ b/mysql-test/suite/rpl/t/rpl_trx_boundary_parser_warning.test
@@ -17,6 +17,7 @@
 --source include/no_valgrind_without_big.inc
 # This test uses debug sync to stop the IO thread in the middle of a transaction
 --source include/have_debug_sync.inc
+call mtr.add_suppression("Statement is unsafe because it is being used inside a XA transaction");
 
 --source include/have_innodb.inc
 --source include/have_myisam.inc
@@ -25,7 +26,7 @@
 --source include/master-slave.inc
 
 --source include/rpl_connection_slave.inc
-# Error messages suppression
+# Error messages suppression on slave
 call mtr.add_suppression("An unexpected event sequence was detected by the IO thread");
 call mtr.add_suppression("GTID_LOG_EVENT .* is not expected in an event stream");
 call mtr.add_suppression("QUERY.* is not expected in an event stream");
diff --git a/mysql-test/suite/rpl/t/rpl_upgrade_slave_master_info.test b/mysql-test/suite/rpl/t/rpl_upgrade_slave_master_info.test
index f09e71c331ff..96a7fbd46d29 100644
--- a/mysql-test/suite/rpl/t/rpl_upgrade_slave_master_info.test
+++ b/mysql-test/suite/rpl/t/rpl_upgrade_slave_master_info.test
@@ -286,6 +286,7 @@ ALTER TABLE slave_master_info
 
 # This now should work fine now
 --let $rpl_channel_name=
+--let $slave_io_errno= convert_error(ER_MASTER_FATAL_ERROR_READING_BINLOG)
 --source include/stop_slave.inc
 RESET SLAVE ALL;
 
diff --git a/mysql-test/suite/rpl/t/rpl_virtual_gcol.test b/mysql-test/suite/rpl/t/rpl_virtual_gcol.test
index 3e214b50116c..3716f3617ba4 100644
--- a/mysql-test/suite/rpl/t/rpl_virtual_gcol.test
+++ b/mysql-test/suite/rpl/t/rpl_virtual_gcol.test
@@ -2,18 +2,15 @@
 # ==== Purpose ====
 #
 # The test checks if different operations on rows with generated fields as json,
-# geometry and double are completed without errors when
-# slave_rows_search_algorithms uses hash scan.
+# geometry, double and json using json function are completed without errors or
+# memory leaks when slave_rows_search_algorithms uses hash scan.
 #
 # ==== References ====
 #
 # BUG#26280724 ASSERT FAILURE WHEN REPLICATING TABLE WITH VIRTUAL JSON COLUMN
+# BUG#25873029 HEAP-USE-AFTER-FREE IN RPL.RPL_JSON, RPL.RPL_VIRTUAL_GCOL
 #
 
-# test disabled in valgrind and ASAN due to BUG#25873029
---source include/not_valgrind.inc
---source include/not_asan.inc
-
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
@@ -33,7 +30,7 @@ ALTER TABLE gtable ADD COLUMN gtext JSON
   GENERATED ALWAYS AS (JSON_EXTRACT(doc, '$.name')) VIRTUAL;
 --source include/sync_slave_sql_with_master.inc
 
-# update one of the rows
+# Update one of the rows
 
 --source include/rpl_connection_master.inc
 UPDATE gtable SET doc = JSON_SET(doc, '$.name', 'abcd lmnopqrstuvxz')
@@ -54,7 +51,7 @@ UPDATE gtable SET doc = '{ "id": 4, "name": "abc aba" }' where doc IS NULL;
 UPDATE gtable SET doc = NULL WHERE JSON_EXTRACT(doc, '$.id') = 4;
 --source include/sync_slave_sql_with_master.inc
 
-# cleanup
+# Cleanup
 --source include/rpl_connection_master.inc
 DROP TABLE gtable;
 --source include/sync_slave_sql_with_master.inc
@@ -71,7 +68,7 @@ INSERT INTO gtable(id, doc) VALUES(10, '{"a": 1}');
 UPDATE gtable SET doc = JSON_REPLACE(gcol, '$[0].a',"a");
 --source include/sync_slave_sql_with_master.inc
 
-# cleanup
+# Cleanup
 --source include/rpl_connection_master.inc
 DROP TABLE gtable;
 --source include/sync_slave_sql_with_master.inc
@@ -91,7 +88,7 @@ UPDATE gtable SET doc = 'POINT(4 4)' where doc IS NULL;
 UPDATE gtable SET doc = NULL WHERE ST_X(ST_GEOMFROMTEXT(doc)) = 4;
 --source include/sync_slave_sql_with_master.inc
 
---echo # Cleanup
+# Cleanup
 --source include/rpl_connection_master.inc
 DROP TABLE gtable;
 --source include/sync_slave_sql_with_master.inc
@@ -109,9 +106,84 @@ INSERT INTO gtable (a) VALUES (1);
 UPDATE gtable SET a= 2;
 --source include/sync_slave_sql_with_master.inc
 
-# cleanup
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE gtable;
+--source include/sync_slave_sql_with_master.inc
+
+#
+# Generated column as geometry using a geometry function that reads from another
+# geometry object
+#
+--source include/rpl_connection_master.inc
+CREATE TABLE gtable(geo GEOMETRY, gcol GEOMETRY AS (GEOMETRYCOLLECTION(geo, geo)));
+INSERT INTO gtable (geo) VALUES (POINT(1, 1));
+--source include/sync_slave_sql_with_master.inc
+
+--source include/rpl_connection_master.inc
+UPDATE gtable SET geo = LINESTRING(POINT(1, 1), POINT(2, 2));
+--source include/sync_slave_sql_with_master.inc
+
+# Cleanup
+--source include/rpl_connection_master.inc
+DROP TABLE gtable;
+--source include/sync_slave_sql_with_master.inc
+
+#
+# Generated column as a JSON using JSON function that reads from another JSON
+# object
+#
+
+# Save defaults and setup mts
+SET @slave_parallel_type_saved= @@GLOBAL.SLAVE_PARALLEL_TYPE;
+SET @slave_parallel_workers_saved= @@GLOBAL.SLAVE_PARALLEL_WORKERS;
+SET @slave_preserver_commit_order_saved= @@GLOBAL.SLAVE_PRESERVE_COMMIT_ORDER;
+--source include/stop_slave.inc
+SET GLOBAL slave_parallel_type= 'LOGICAL_CLOCK';
+SET GLOBAL slave_parallel_workers= 4;
+SET GLOBAL slave_preserve_commit_order= ON;
+--source include/start_slave.inc
+CALL mtr.add_suppression("This version of MySQL doesn't yet support 'sorting of non-scalar JSON values'");
+
+--source include/rpl_connection_master.inc
+CREATE TABLE gtable(id INT, jd JSON, td TEXT,
+                    gcol JSON AS (JSON_OBJECT(id,jd,JSON_KEYS(jd),td)));
+INSERT INTO gtable(id,jd,td) VALUES(100, '{"a":1}', 'characters');
+--source include/sync_slave_sql_with_master.inc
+
+# Warnings are disabled so that the warning regarding the lack of support for
+# the sorting of non-scalar JSON values is not printed
+--disable_warnings
+--let diff_tables=master:gtable, slave:gtable
+--source include/diff_tables.inc
+--enable_warnings
+
+--source include/rpl_connection_master.inc
+UPDATE gtable SET jd = JSON_REPLACE(jd, '$[0].a',"a");
+--source include/sync_slave_sql_with_master.inc
+
+--disable_warnings
+--let diff_tables=master:gtable, slave:gtable
+--source include/diff_tables.inc
+--enable_warnings
+
+--source include/rpl_connection_master.inc
+UPDATE gtable SET jd= JSON_SET(jd, '$.key', '["h","e","l","l","o"]');
+--source include/sync_slave_sql_with_master.inc
+
+--disable_warnings
+--let diff_tables=master:gtable, slave:gtable
+--source include/diff_tables.inc
+--enable_warnings
+
+# Cleanup
 --source include/rpl_connection_master.inc
 DROP TABLE gtable;
 --source include/sync_slave_sql_with_master.inc
 SET @@global.slave_rows_search_algorithms= @saved_slave_rows_search_algorithms;
+--source include/stop_slave.inc
+SET @@GLOBAL.SLAVE_PARALLEL_TYPE= @slave_parallel_type_saved;
+SET @@GLOBAL.SLAVE_PARALLEL_WORKERS= @slave_parallel_workers_saved;
+SET @@GLOBAL.SLAVE_PRESERVE_COMMIT_ORDER= @slave_preserver_commit_order_saved;
+--source include/start_slave.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test b/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test
new file mode 100644
index 000000000000..4d25103ed7ff
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_writeset_add_unique_key.test
@@ -0,0 +1,120 @@
+# ==== Purpose ====
+#
+# This test verifies that when binlog_row_image=minimum and a table has
+# both unique + primary key then there should not be any conflict running
+# the transactions on this table on the soure and replica.
+#
+# ==== Requirements ====
+# R1. In case of binlog_row_image=minimum, when generating read_sets and
+# writesets, we should include unique key also such that transaction dependencies
+# are calculated correctly and transactions do not fail on replica while running
+# in parallel.
+#
+# ==== Implementation ====
+#
+# 1) Create source-replica topology.
+# 2) Save the current variable values.
+#    2.1) Save current binlog_row_image.
+#    2.2) Save current tracking mode and extraction algorithm.
+# 3) Setup neccesary variables on source.
+#    3.1) Set the binlog_row_image to MINIMAL on source.
+#    3.2) Set the global transaction extraction algorithm to XXHASH64
+#         and the tracking mode to WRITESET.
+# 4) Create table and procedure on source.
+# 5) Switch to source and call procedure.
+# 6) Clear system variables on source.
+# 7) Cleanup.
+#
+# ==== References ====
+#
+# Bug#31636339 MTS IS UNUSABLE; ERRNO 3030, AND WORKER HA_ERR_FOUND_DUPP_KEY OR HA_ERR_LOCK_WAIT_TIMEOUT
+#
+--source include/have_binlog_format_row.inc
+--source include/only_mts_slave_parallel_type_logical_clock.inc
+--source include/only_mts_slave_parallel_workers.inc
+--let $option_name = slave_transaction_retries
+--let $option_operator = >
+--let $option_value = 2
+--source include/only_with_option.inc
+
+--echo #
+--echo # 1. Create source-replica topology.
+--source include/master-slave.inc
+
+--echo #
+--echo # 2. Save the current variable values.
+# 2.1. Save binlog_row_image value.
+SET @old_binlog_row_image= @@binlog_row_image;
+--source include/rpl_connection_master.inc
+
+# 2.2. Save the current tracking mode and extraction algorithm.
+--let $old_trx_tracker = `SELECT @@GLOBAL.BINLOG_TRANSACTION_DEPENDENCY_TRACKING`
+--let $old_trx_write_set_extraction_session = `SELECT @@SESSION.TRANSACTION_WRITE_SET_EXTRACTION`
+--let $old_trx_write_set_extraction_global = `SELECT @@GLOBAL.TRANSACTION_WRITE_SET_EXTRACTION`
+
+--echo # 3. Setup neccesary variables on source.
+--echo # 3.1 Set the binlog_row_image to MINIMAL on source.
+--let $row_img_set=master:MINIMAL:N
+--source include/rpl_row_img_set.inc
+
+# 3.2 Set the global transaction extraction algorithm and tracking mode.
+SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET SESSION TRANSACTION_WRITE_SET_EXTRACTION = 'XXHASH64';
+SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = WRITESET;
+
+--echo #
+--echo # 4. Create table and procedure on source.
+CREATE TABLE t( a tinyint unsigned primary key, b tinyint, c int, d bigint,
+f char(10), g char(255), h text, i longtext, unique key(g,f),
+unique key(f,c), key(c,d,b), key(i(10),f(10),b)) ENGINE=InnoDB;
+
+drop procedure if exists p;
+delimiter |;
+create procedure p(p_i bigint)
+begin
+  declare v_i bigint default 0;
+  repeat
+    replace into t values(
+    floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5),
+    floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5)
+    ),
+    (
+    floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5),
+    floor(rand()*5),floor(rand()*5),floor(rand()*5),floor(rand()*5)
+    );
+    set v_i=v_i+1;
+  until v_i > p_i end repeat;
+end|
+delimiter ;|
+
+--echo #
+--echo #
+--echo # 5. Switch to source and call procedure.
+--source include/rpl_connection_master.inc
+call p(1000);
+# Sync replica's sql thread with source.
+--source include/sync_slave_sql_with_master.inc
+
+--echo #
+--echo # 6. Clear system variables on source.
+--echo #
+--source include/rpl_connection_master.inc
+SET GLOBAL binlog_row_image= @old_binlog_row_image;
+SET SESSION binlog_row_image= @old_binlog_row_image;
+--replace_result $old_trx_tracker OLD_TRX_TRACKER
+--eval SET GLOBAL BINLOG_TRANSACTION_DEPENDENCY_TRACKING = $old_trx_tracker
+--replace_result $old_trx_write_set_extraction_global OLD_TRX_WRITE_SET_EXTRACTION_GLOBAL
+--eval SET GLOBAL TRANSACTION_WRITE_SET_EXTRACTION = $old_trx_write_set_extraction_global
+--replace_result $old_trx_write_set_extraction_session OLD_TRX_WRITE_SET_EXTRACTION_SESSION
+--eval SET SESSION TRANSACTION_WRITE_SET_EXTRACTION = $old_trx_write_set_extraction_session
+
+# Supress the error warning on slave.
+--source include/rpl_connection_slave.inc
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
+
+# 7. Cleanup.
+--source include/rpl_connection_master.inc
+DROP TABLE t;
+DROP PROCEDURE p;
+--source include/rpl_end.inc
+
diff --git a/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave-slave.opt b/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave-slave.opt
new file mode 100644
index 000000000000..1d2b93f580b1
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave-slave.opt
@@ -0,0 +1 @@
+--log-slave-updates=OFF --skip-log-bin
\ No newline at end of file
diff --git a/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave.test b/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave.test
new file mode 100644
index 000000000000..2f7e646e9400
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_xa_with_filters_binlogless_slave.test
@@ -0,0 +1,107 @@
+# ==== Requirements ====
+#
+# R1. When using replication filter together with XA transactions, output an
+#     error message when some statement gets filtered within the active XA
+#     transaction.
+#
+# ==== Implementation ====
+#
+# With default setup:
+# 1) Create a table that gets filtered out by the added filter
+# 2) Add a replication filter to the slave node
+# 3) Start an XA transaction and execute a statement that is filtered out by
+#    replication filter
+# 4) Ensure that the error message get logged to the slave error log file.
+#
+# ==== References ====
+#
+# BUG#27442477: ASSERT `THD->GET_HA_DATA...HAS_STATE(XID_STATE::XA_ACTIVE))' AT HANDLER.CC:1396
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--let $gtid_mode_value= `SELECT @@GLOBAL.GTID_MODE = "ON"`
+
+--source include/rpl_connection_master.inc
+#
+# 1) Create a table that gets filtered out by the added filter
+#
+CREATE TABLE t1 (a INT);
+--source include/sync_slave_sql_with_master.inc
+
+#
+# 2) Add a replication filter to the slave node
+#
+--source include/stop_slave_sql.inc
+CALL mtr.add_suppression(".*You need to use --log-bin to make --binlog-format work.*");
+CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
+CALL mtr.add_suppression(".*The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave.*");
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=(test.t1);
+--source include/start_slave_sql.inc
+
+#
+# 3) Start an XA transaction and execute a statement that is filtered out by
+#    replication filter
+#
+--source include/rpl_connection_master.inc
+XA START '1'; INSERT INTO t1 VALUES (1); XA END '1'; XA PREPARE '1';
+XA COMMIT '1';
+--let $gtid_executed_master= `SELECT @@GLOBAL.GTID_EXECUTED`
+
+#
+# Wait for the ER_XA_REPLICATION_FILTERS error to be thrown
+#
+--source include/rpl_connection_slave.inc
+--let $slave_sql_errno= convert_error(ER_XA_REPLICATION_FILTERS)
+--source include/wait_for_slave_sql_error.inc
+
+#
+# Retry the transaction
+#
+START SLAVE SQL_THREAD;
+--let $slave_sql_errno= convert_error(ER_XA_REPLICATION_FILTERS)
+--source include/wait_for_slave_sql_error.inc
+
+#
+# If GTID_MODE is ON, test that are missing GTID
+#
+if ($gtid_mode_value == 1)
+{
+  --let $gtid_executed_slave= `SELECT @@GLOBAL.GTID_EXECUTED`
+  --let $gtid_missing_slave= `SELECT GTID_SUBTRACT('$gtid_executed_master', '$gtid_executed_slave')`
+  --disable_result_log
+  --let $include_silent= 1
+  --let $assert_text= slave has missing GTIDs
+  --let $assert_cond= "$gtid_missing_slave" != ""
+  --source include/assert.inc
+  --let $include_silent=
+  --enable_result_log
+}
+
+#
+# Clear replication filters in order for the transaction to succeed.
+#
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=();
+--let $slave_sql_errno=
+--source include/start_slave_sql.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let $count = `SELECT COUNT(1) FROM test.t1;`
+--let $assert_text = table 'test.t1' record count must be 1
+--let $assert_cond = $count = 1
+--source include/assert.inc
+
+#
+# 4) Ensure that the error message get logged to the slave error log file.
+#
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_only_after= CURRENT_TEST: rpl:rpl_xa_with_filters_error_msg
+--let $assert_match= The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave
+--let $assert_select= Slave SQL
+--let $assert_text= Found error message regarding usage of replication filters with XA transactions
+--source include/assert_grep.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_xa_with_filters_error_msg.test b/mysql-test/suite/rpl/t/rpl_xa_with_filters_error_msg.test
new file mode 100644
index 000000000000..78f31bd28694
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_xa_with_filters_error_msg.test
@@ -0,0 +1,113 @@
+# ==== Requirements ====
+#
+# R1. When using replication filter together with XA transactions, output an
+#     error message when some statement gets filtered within the active XA
+#     transaction.
+#
+# ==== Implementation ====
+#
+# With default setup:
+# 1) Create a table that gets filtered out by the added filter
+# 2) Add a replication filter to the slave node
+# 3) Start an XA transaction and execute a statement that is filtered out by
+#    replication filter
+# 4) Ensure that the error message get logged to the slave error log file.
+#
+# ==== References ====
+#
+# BUG#27442477: ASSERT `THD->GET_HA_DATA...HAS_STATE(XID_STATE::XA_ACTIVE))' AT HANDLER.CC:1396
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--let $gtid_mode_value= `SELECT @@GLOBAL.GTID_MODE = "ON"`
+
+--source include/rpl_connection_master.inc
+#
+# 1) Create a table that gets filtered out by the added filter
+#
+CREATE TABLE t1 (a INT);
+--source include/sync_slave_sql_with_master.inc
+
+#
+# 2) Add a replication filter to the slave node
+#
+--source include/stop_slave_sql.inc
+CALL mtr.add_suppression(".*The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state.*");
+CALL mtr.add_suppression(".*The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave.*");
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=(test.t1);
+--source include/start_slave_sql.inc
+
+#
+# 3) Start an XA transaction and execute a statement that is filtered out by
+#    replication filter
+#
+--source include/rpl_connection_master.inc
+XA START '1'; INSERT INTO t1 VALUES (1); XA END '1'; XA PREPARE '1';
+XA COMMIT '1';
+--let $gtid_executed_master= `SELECT @@GLOBAL.GTID_EXECUTED`
+
+#
+# Wait for the ER_XA_REPLICATION_FILTERS error to be thrown
+#
+--source include/rpl_connection_slave.inc
+--let $slave_sql_errno= convert_error(ER_XA_REPLICATION_FILTERS)
+--source include/wait_for_slave_sql_error.inc
+
+#
+# Retry the transaction
+#
+START SLAVE SQL_THREAD;
+--let $slave_sql_errno= convert_error(ER_XA_REPLICATION_FILTERS)
+--source include/wait_for_slave_sql_error.inc
+
+#
+# If GTID_MODE is ON, test that are missing GTID
+#
+if ($gtid_mode_value == 1)
+{
+  --let $gtid_executed_slave= `SELECT @@GLOBAL.GTID_EXECUTED`
+  --let $gtid_missing_slave= `SELECT GTID_SUBTRACT('$gtid_executed_master', '$gtid_executed_slave')`
+  --disable_result_log
+  --let $include_silent= 1
+  --let $assert_text= slave has missing GTIDs
+  --let $assert_cond= "$gtid_missing_slave" != ""
+  --source include/assert.inc
+  --let $include_silent=
+  --enable_result_log
+}
+
+#
+# Ensure that the transaction didn't get logged into the binary log
+#
+--let $event_sequence= Gtid/SET.* # Query/use.* # Gtid/SET.* # Query/XA START.* # Table_map/.* # Write_rows/.* # Query/XA END.* # XA_prepare/XA PREPARE.* # Gtid/SET.* # Query/XA COMMIT.*
+--let $invert= 1
+--source include/assert_binlog_events.inc
+
+#
+# Clear replication filters in order for the transaction to succeed.
+#
+CHANGE REPLICATION FILTER Replicate_Ignore_Table=();
+--let $slave_sql_errno=
+--source include/start_slave_sql.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
+--let $count = `SELECT COUNT(1) FROM test.t1;`
+--let $assert_text = table 'test.t1' record count must be 1
+--let $assert_cond = $count = 1
+--source include/assert.inc
+
+#
+# 4) Ensure that the error message get logged to the slave error log file.
+#
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_only_after= CURRENT_TEST: rpl:rpl_xa_with_filters_error_msg
+--let $assert_match= The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave
+--let $assert_select= Slave SQL
+--let $assert_text= Found error message regarding usage of replication filters with XA transactions
+--source include/assert_grep.inc
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index 5ddc39a3594c..ad723ebcfe71 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -17,6 +17,10 @@ DISABLED_STORAGE_ENGINES
 DISABLED_STORAGE_ENGINES
 KEYRING_OPERATIONS
 KEYRING_OPERATIONS
+REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
+REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
+REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
 TLS_VERSION
 TLS_VERSION
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_h_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_h_size_basic.result
new file mode 100644
index 000000000000..6c7e620c74d3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_h_size_basic.result
@@ -0,0 +1,43 @@
+SET @save_binlog_transaction_dependency_history_size= @@global.binlog_transaction_dependency_history_size;
+SELECT COUNT(@@GLOBAL.binlog_transaction_dependency_history_size);
+COUNT(@@GLOBAL.binlog_transaction_dependency_history_size)
+1
+SELECT COUNT(@@SESSION.binlog_transaction_dependency_history_size);
+ERROR HY000: Variable 'binlog_transaction_dependency_history_size' is a GLOBAL variable
+SELECT VARIABLE_NAME FROM performance_schema.global_variables WHERE VARIABLE_NAME='binlog_transaction_dependency_history_size';
+VARIABLE_NAME
+binlog_transaction_dependency_history_size
+SELECT VARIABLE_NAME FROM performance_schema.session_variables WHERE variable_name='binlog_transaction_dependency_history_size';
+VARIABLE_NAME
+binlog_transaction_dependency_history_size
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1;
+include/assert.inc ['binlog_transaction_dependency_history_size is a dynamic variable']
+SET @@GLOBAL.binlog_transaction_dependency_history_size= default;
+include/assert.inc ['Default value is 25000']
+SET @@GLOBAL.binlog_transaction_dependency_history_size= ON;
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_history_size'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= OFF;
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_history_size'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= "foo";
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_history_size'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= NULL;
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_history_size'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1.0;
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_history_size'
+Expect value still set to 25000
+SELECT @@GLOBAL.binlog_transaction_dependency_history_size;
+@@GLOBAL.binlog_transaction_dependency_history_size
+25000
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 0;
+Warnings:
+Warning	1292	Truncated incorrect binlog_transaction_dependency_hi value: '0'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= -1;
+Warnings:
+Warning	1292	Truncated incorrect binlog_transaction_dependency_hi value: '-1'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 2000000;
+Warnings:
+Warning	1292	Truncated incorrect binlog_transaction_dependency_hi value: '2000000'
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1;
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 20000;
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1000000;
+SET @@GLOBAL.binlog_transaction_dependency_history_size= @save_binlog_transaction_dependency_history_size;
diff --git a/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_tracking_basic.result b/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_tracking_basic.result
new file mode 100644
index 000000000000..0eb296f92285
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/binlog_transaction_dependency_tracking_basic.result
@@ -0,0 +1,82 @@
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+SET GLOBAL transaction_write_set_extraction= 'XXHASH64';
+SELECT COUNT(@@GLOBAL.binlog_transaction_dependency_tracking);
+COUNT(@@GLOBAL.binlog_transaction_dependency_tracking)
+1
+SELECT COUNT(@@SESSION.binlog_transaction_dependency_tracking);
+ERROR HY000: Variable 'binlog_transaction_dependency_tracking' is a GLOBAL variable
+SELECT VARIABLE_NAME FROM performance_schema.global_variables WHERE VARIABLE_NAME='binlog_transaction_dependency_tracking';
+VARIABLE_NAME
+binlog_transaction_dependency_tracking
+SELECT VARIABLE_NAME FROM performance_schema.session_variables WHERE variable_name='binlog_transaction_dependency_tracking';
+VARIABLE_NAME
+binlog_transaction_dependency_tracking
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+include/assert.inc ['binlog_transaction_dependency_tracking is a dynamic variable']
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+include/assert.inc ['binlog_transaction_dependency_tracking should be COMMIT_ORDER']
+SET GLOBAL binlog_transaction_dependency_tracking= 0;
+include/assert.inc ['binlog_transaction_dependency_tracking should be COMMIT_ORDER']
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+include/assert.inc ['binlog_transaction_dependency_tracking should be WRITESET']
+SET GLOBAL binlog_transaction_dependency_tracking= 1;
+include/assert.inc ['binlog_transaction_dependency_tracking should be WRITESET']
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+include/assert.inc ['binlog_transaction_dependency_tracking should be WRITESET_SESSION']
+SET GLOBAL binlog_transaction_dependency_tracking= 2;
+include/assert.inc ['binlog_transaction_dependency_tracking should be WRITESET_SESSION']
+SET GLOBAL binlog_transaction_dependency_tracking= DEFAULT;
+include/assert.inc ['binlog_transaction_dependency_tracking should be COMMIT_ORDER']
+SET GLOBAL binlog_transaction_dependency_tracking= NULL;
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of 'NULL'
+SET GLOBAL binlog_transaction_dependency_tracking= '';
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of ''
+SET GLOBAL binlog_transaction_dependency_tracking= 1.0;
+ERROR 42000: Incorrect argument type to variable 'binlog_transaction_dependency_tracking'
+SET GLOBAL binlog_transaction_dependency_tracking= 'GARBAGE';
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of 'GARBAGE'
+SET GLOBAL binlog_transaction_dependency_tracking= ON;
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of 'ON'
+SET GLOBAL binlog_transaction_dependency_tracking= OFF;
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of 'OFF'
+SET GLOBAL binlog_transaction_dependency_tracking= 3;
+ERROR 42000: Variable 'binlog_transaction_dependency_tracking' can't be set to the value of '3'
+Expect value still set to "COMMIT_ORDER"
+SELECT @@global.binlog_transaction_dependency_tracking;
+@@global.binlog_transaction_dependency_tracking
+COMMIT_ORDER
+Case1 a): "When binlog_transaction_dependency_tracking != COMMIT_ORDER,
+transaction_write_set_extraction cannot be changed."
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+SET GLOBAL transaction_write_set_extraction= OFF;
+ERROR HY000: Incorrect usage of transaction_write_set_extraction (changed) and binlog_transaction_dependency_tracking (!= COMMIT_ORDER)
+SET GLOBAL transaction_write_set_extraction= MURMUR32;
+ERROR HY000: Incorrect usage of transaction_write_set_extraction (changed) and binlog_transaction_dependency_tracking (!= COMMIT_ORDER)
+Expect value still set to XXHASH64
+SELECT @@global.transaction_write_set_extraction;
+@@global.transaction_write_set_extraction
+XXHASH64
+Case1 b): "When binlog_transaction_dependency_tracking != COMMIT_ORDER,
+transaction_write_set_extraction cannot be changed."
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+SET GLOBAL transaction_write_set_extraction= OFF;
+ERROR HY000: Incorrect usage of transaction_write_set_extraction (changed) and binlog_transaction_dependency_tracking (!= COMMIT_ORDER)
+SET GLOBAL transaction_write_set_extraction= MURMUR32;
+ERROR HY000: Incorrect usage of transaction_write_set_extraction (changed) and binlog_transaction_dependency_tracking (!= COMMIT_ORDER)
+Expect value still set to XXHASH64
+SELECT @@global.transaction_write_set_extraction;
+@@global.transaction_write_set_extraction
+XXHASH64
+Case2: "When transaction_write_set_extraction = OFF,
+binlog_transaction_dependency_tracking cannot be set to WRITESET%"
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+SET GLOBAL transaction_write_set_extraction= OFF;
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+ERROR HY000: Incorrect usage of binlog_transaction_dependency_tracking (!= COMMIT_ORDER) and transaction_write_set_extraction (= OFF)
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+ERROR HY000: Incorrect usage of binlog_transaction_dependency_tracking (!= COMMIT_ORDER) and transaction_write_set_extraction (= OFF)
+Expect value still set to COMMIT_ORDER
+SELECT @@global.binlog_transaction_dependency_tracking;
+@@global.binlog_transaction_dependency_tracking
+COMMIT_ORDER
+SET GLOBAL transaction_write_set_extraction= XXHASH64;
diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
index 418a693d3197..5ca47804794f 100644
--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
@@ -73,8 +73,8 @@ set global innodb_adaptive_flushing=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_flushing'
 set global innodb_adaptive_flushing=2;
 ERROR 42000: Variable 'innodb_adaptive_flushing' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_adaptive_flushing=-3;
+ERROR 42000: Variable 'innodb_adaptive_flushing' can't be set to the value of '-3'
 select @@global.innodb_adaptive_flushing;
 @@global.innodb_adaptive_flushing
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result
index bc9080906273..1dbd625b52b4 100644
--- a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result
@@ -73,8 +73,8 @@ set global innodb_adaptive_hash_index=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_hash_index'
 set global innodb_adaptive_hash_index=2;
 ERROR 42000: Variable 'innodb_adaptive_hash_index' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_adaptive_hash_index=-3;
+ERROR 42000: Variable 'innodb_adaptive_hash_index' can't be set to the value of '-3'
 select @@global.innodb_adaptive_hash_index;
 @@global.innodb_adaptive_hash_index
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_deadlock_detect_basic.result b/mysql-test/suite/sys_vars/r/innodb_deadlock_detect_basic.result
index 32fd586dd425..615fc782ad5e 100644
--- a/mysql-test/suite/sys_vars/r/innodb_deadlock_detect_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_deadlock_detect_basic.result
@@ -46,6 +46,7 @@ ERROR 42000: Variable 'innodb_deadlock_detect' can't be set to the value of '2'
 set global innodb_deadlock_detect='AUTO';
 ERROR 42000: Variable 'innodb_deadlock_detect' can't be set to the value of 'AUTO'
 set global innodb_deadlock_detect=-3;
+ERROR 42000: Variable 'innodb_deadlock_detect' can't be set to the value of '-3'
 select @@global.innodb_deadlock_detect;
 @@global.innodb_deadlock_detect
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result b/mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
index c4d3f96c4858..ed5f9415861c 100644
--- a/mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
@@ -73,8 +73,8 @@ set global innodb_disable_sort_file_cache=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_disable_sort_file_cache'
 set global innodb_disable_sort_file_cache=2;
 ERROR 42000: Variable 'innodb_disable_sort_file_cache' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_disable_sort_file_cache=-3;
+ERROR 42000: Variable 'innodb_disable_sort_file_cache' can't be set to the value of '-3'
 select @@global.innodb_disable_sort_file_cache;
 @@global.innodb_disable_sort_file_cache
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_sync_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_sync_basic.result
index 53fb92bbea47..9e3f7d95eb97 100644
--- a/mysql-test/suite/sys_vars/r/innodb_flush_sync_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_sync_basic.result
@@ -73,8 +73,8 @@ set global innodb_flush_sync=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_flush_sync'
 set global innodb_flush_sync=2;
 ERROR 42000: Variable 'innodb_flush_sync' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_flush_sync=-3;
+ERROR 42000: Variable 'innodb_flush_sync' can't be set to the value of '-3'
 select @@global.innodb_flush_sync;
 @@global.innodb_flush_sync
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
index df1e27855cb0..5401e26d8a54 100644
--- a/mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result
@@ -73,8 +73,8 @@ set global innodb_ft_enable_diag_print=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_ft_enable_diag_print'
 set global innodb_ft_enable_diag_print=2;
 ERROR 42000: Variable 'innodb_ft_enable_diag_print' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_ft_enable_diag_print=-3;
+ERROR 42000: Variable 'innodb_ft_enable_diag_print' can't be set to the value of '-3'
 select @@global.innodb_ft_enable_diag_print;
 @@global.innodb_ft_enable_diag_print
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
index d1e25db952d8..d0cd535637a4 100644
--- a/mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result
@@ -99,9 +99,10 @@ set global innodb_ft_enable_stopword='AUTO';
 ERROR 42000: Variable 'innodb_ft_enable_stopword' can't be set to the value of 'AUTO'
 set session innodb_ft_enable_stopword='AUTO';
 ERROR 42000: Variable 'innodb_ft_enable_stopword' can't be set to the value of 'AUTO'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_ft_enable_stopword=-3;
+ERROR 42000: Variable 'innodb_ft_enable_stopword' can't be set to the value of '-3'
 set session innodb_ft_enable_stopword=-7;
+ERROR 42000: Variable 'innodb_ft_enable_stopword' can't be set to the value of '-7'
 select @@global.innodb_ft_enable_stopword;
 @@global.innodb_ft_enable_stopword
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result b/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result
index f5a9d3f9bc0f..c6e803ffef85 100644
--- a/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result
@@ -81,10 +81,8 @@ set global innodb_large_prefix=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_large_prefix'
 set global innodb_large_prefix=2;
 ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_large_prefix=-3;
-Warnings:
-Warning	131	Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
+ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of '-3'
 select @@global.innodb_large_prefix;
 @@global.innodb_large_prefix
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result
index 63ae636913a9..4774c2fe1d74 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_checkpoint_now_basic.result
@@ -71,6 +71,7 @@ ERROR 42000: Incorrect argument type to variable 'innodb_log_checkpoint_now'
 set global innodb_log_checkpoint_now='foo';
 ERROR 42000: Variable 'innodb_log_checkpoint_now' can't be set to the value of 'foo'
 set global innodb_log_checkpoint_now=-2;
+ERROR 42000: Variable 'innodb_log_checkpoint_now' can't be set to the value of '-2'
 set global innodb_log_checkpoint_now=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_log_checkpoint_now'
 SET @@global.innodb_log_checkpoint_now = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result b/mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
index 1ce58369dd01..a6355430f433 100644
--- a/mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
@@ -73,17 +73,17 @@ set global innodb_optimize_fulltext_only=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_optimize_fulltext_only'
 set global innodb_optimize_fulltext_only=2;
 ERROR 42000: Variable 'innodb_optimize_fulltext_only' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_optimize_fulltext_only=-3;
+ERROR 42000: Variable 'innodb_optimize_fulltext_only' can't be set to the value of '-3'
 select @@global.innodb_optimize_fulltext_only;
 @@global.innodb_optimize_fulltext_only
-1
+0
 select * from information_schema.global_variables where variable_name='innodb_optimize_fulltext_only';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_OPTIMIZE_FULLTEXT_ONLY	ON
+INNODB_OPTIMIZE_FULLTEXT_ONLY	OFF
 select * from information_schema.session_variables where variable_name='innodb_optimize_fulltext_only';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_OPTIMIZE_FULLTEXT_ONLY	ON
+INNODB_OPTIMIZE_FULLTEXT_ONLY	OFF
 set global innodb_optimize_fulltext_only='AUTO';
 ERROR 42000: Variable 'innodb_optimize_fulltext_only' can't be set to the value of 'AUTO'
 SET @@global.innodb_optimize_fulltext_only = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result b/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
index 3cc7ed59ef7d..6b940503c59c 100644
--- a/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
@@ -83,8 +83,8 @@ SET global innodb_print_all_deadlocks=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_print_all_deadlocks'
 SET global innodb_print_all_deadlocks=2;
 ERROR 42000: Variable 'innodb_print_all_deadlocks' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 SET global innodb_print_all_deadlocks=-3;
+ERROR 42000: Variable 'innodb_print_all_deadlocks' can't be set to the value of '-3'
 SELECT @@global.innodb_print_all_deadlocks;
 @@global.innodb_print_all_deadlocks
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result b/mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
index d627aa92ba71..80075be63747 100644
--- a/mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
@@ -73,17 +73,17 @@ set global innodb_random_read_ahead=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_random_read_ahead'
 set global innodb_random_read_ahead=2;
 ERROR 42000: Variable 'innodb_random_read_ahead' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_random_read_ahead=-3;
+ERROR 42000: Variable 'innodb_random_read_ahead' can't be set to the value of '-3'
 select @@global.innodb_random_read_ahead;
 @@global.innodb_random_read_ahead
-1
+0
 select * from information_schema.global_variables where variable_name='innodb_random_read_ahead';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_RANDOM_READ_AHEAD	ON
+INNODB_RANDOM_READ_AHEAD	OFF
 select * from information_schema.session_variables where variable_name='innodb_random_read_ahead';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_RANDOM_READ_AHEAD	ON
+INNODB_RANDOM_READ_AHEAD	OFF
 set global innodb_random_read_ahead='AUTO';
 ERROR 42000: Variable 'innodb_random_read_ahead' can't be set to the value of 'AUTO'
 SET @@global.innodb_random_read_ahead = @start_global_value;
diff --git a/mysql-test/suite/sys_vars/r/innodb_semaphore_wait_timeout_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_semaphore_wait_timeout_debug_basic.result
new file mode 100644
index 000000000000..c733165231b3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/innodb_semaphore_wait_timeout_debug_basic.result
@@ -0,0 +1,36 @@
+#
+# Basic test for innodb_semaphore_wait_timeout_debug
+#
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+600
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 10;
+Warnings:
+Warning	1292	Truncated incorrect innodb_semaphore_wait_timeout_de value: '10'
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+100
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 200;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+200
+SET GLOBAL innodb_semaphore_wait_timeout_debug = dummy;
+ERROR 42000: Incorrect argument type to variable 'innodb_semaphore_wait_timeout_debug'
+SET innodb_semaphore_wait_timeout_debug = 100;
+ERROR HY000: Variable 'innodb_semaphore_wait_timeout_debug' is a GLOBAL variable and should be set with SET GLOBAL
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 6000;
+Warnings:
+Warning	1292	Truncated incorrect innodb_semaphore_wait_timeout_de value: '6000'
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+600
+SET GLOBAL innodb_semaphore_wait_timeout_debug = -1;
+Warnings:
+Warning	1292	Truncated incorrect innodb_semaphore_wait_timeout_de value: '-1'
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+100
+SET GLOBAL innodb_semaphore_wait_timeout_debug = default;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+@@global.innodb_semaphore_wait_timeout_debug
+600
diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
index e8bcdfe6a327..19e4a8a67d26 100644
--- a/mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
@@ -73,8 +73,8 @@ set global innodb_stats_on_metadata=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_stats_on_metadata'
 set global innodb_stats_on_metadata=2;
 ERROR 42000: Variable 'innodb_stats_on_metadata' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_stats_on_metadata=-3;
+ERROR 42000: Variable 'innodb_stats_on_metadata' can't be set to the value of '-3'
 select @@global.innodb_stats_on_metadata;
 @@global.innodb_stats_on_metadata
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_status_output_basic.result b/mysql-test/suite/sys_vars/r/innodb_status_output_basic.result
index 2034711b177b..35731a2334bc 100644
--- a/mysql-test/suite/sys_vars/r/innodb_status_output_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_status_output_basic.result
@@ -73,8 +73,8 @@ set global innodb_status_output=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_status_output'
 set global innodb_status_output=2;
 ERROR 42000: Variable 'innodb_status_output' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_status_output=-3;
+ERROR 42000: Variable 'innodb_status_output' can't be set to the value of '-3'
 select @@global.innodb_status_output;
 @@global.innodb_status_output
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_status_output_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_status_output_locks_basic.result
index 9c89223402e5..6fc741a7975b 100644
--- a/mysql-test/suite/sys_vars/r/innodb_status_output_locks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_status_output_locks_basic.result
@@ -73,8 +73,8 @@ set global innodb_status_output_locks=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_status_output_locks'
 set global innodb_status_output_locks=2;
 ERROR 42000: Variable 'innodb_status_output_locks' can't be set to the value of '2'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_status_output_locks=-3;
+ERROR 42000: Variable 'innodb_status_output_locks' can't be set to the value of '-3'
 select @@global.innodb_status_output_locks;
 @@global.innodb_status_output_locks
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
index 5e55faa99c94..8bddb6a16944 100644
--- a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
@@ -99,9 +99,10 @@ set global innodb_strict_mode='AUTO';
 ERROR 42000: Variable 'innodb_strict_mode' can't be set to the value of 'AUTO'
 set session innodb_strict_mode='AUTO';
 ERROR 42000: Variable 'innodb_strict_mode' can't be set to the value of 'AUTO'
-NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
 set global innodb_strict_mode=-3;
+ERROR 42000: Variable 'innodb_strict_mode' can't be set to the value of '-3'
 set session innodb_strict_mode=-7;
+ERROR 42000: Variable 'innodb_strict_mode' can't be set to the value of '-7'
 select @@global.innodb_strict_mode;
 @@global.innodb_strict_mode
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
index 55dfd1ffbb76..8384ee3d361e 100644
--- a/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
@@ -97,8 +97,7 @@ SELECT @@session.innodb_support_xa;
 SET @@session.innodb_support_xa = �FF;
 ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '�FF'
 SET @@global.innodb_support_xa = -1;
-Warnings:
-Warning	131	Using innodb_support_xa is deprecated and the parameter may be removed in future releases.
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '-1'
 SELECT @@global.innodb_support_xa;
 @@global.innodb_support_xa
 1
diff --git a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
index e77424df871c..08dc5d7aaca4 100644
--- a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
@@ -55,6 +55,7 @@ SELECT @@global.innodb_table_locks;
 1
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@session.innodb_table_locks = -6;
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '-6'
 SET @@session.innodb_table_locks = 1.6;
 ERROR 42000: Incorrect argument type to variable 'innodb_table_locks'
 SET @@session.innodb_table_locks = "T";
@@ -72,6 +73,7 @@ SELECT @@session.innodb_table_locks;
 SET @@session.innodb_table_locks = �FF;
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '�FF'
 SET @@global.innodb_table_locks = -1;
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '-1'
 SET @@global.innodb_table_locks = 2;
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '2'
 SET @@global.innodb_table_locks = "T";
diff --git a/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result
index d0d4e8f6c045..1779cbb48df3 100644
--- a/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result
@@ -51,6 +51,7 @@ ERROR 42000: Incorrect argument type to variable 'innodb_trx_purge_view_update_o
 set global innodb_trx_purge_view_update_only_debug='foo';
 ERROR 42000: Variable 'innodb_trx_purge_view_update_only_debug' can't be set to the value of 'foo'
 set global innodb_trx_purge_view_update_only_debug=-2;
+ERROR 42000: Variable 'innodb_trx_purge_view_update_only_debug' can't be set to the value of '-2'
 set global innodb_trx_purge_view_update_only_debug=1e1;
 ERROR 42000: Incorrect argument type to variable 'innodb_trx_purge_view_update_only_debug'
 set global innodb_trx_purge_view_update_only_debug=2;
diff --git a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
deleted file mode 100644
index 491f25a3d070..000000000000
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
+++ /dev/null
@@ -1,180 +0,0 @@
-SET @start_global_value = @@global.myisam_repair_threads;
-SELECT @start_global_value;
-@start_global_value
-1
-SET @start_session_value = @@session.myisam_repair_threads;
-SELECT @start_session_value;
-@start_session_value
-1
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_repair_threads  = 100;
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 200;
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads  = 1;
-@@global.myisam_repair_threads  = 1
-1
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads  = 1;
-@@session.myisam_repair_threads  = 1
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_repair_threads  = 1;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 4294967295;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 655354;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_repair_threads  = 1;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 4294967295;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 655345;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-1024'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '429496729533'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-2'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@global.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@session.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_repair_threads  = TRUE;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_repair_threads  = 10;
-SELECT @@myisam_repair_threads  = @@global.myisam_repair_threads ;
-@@myisam_repair_threads  = @@global.myisam_repair_threads
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_repair_threads  = 100;
-SELECT @@myisam_repair_threads  = @@local.myisam_repair_threads ;
-@@myisam_repair_threads  = @@local.myisam_repair_threads
-1
-SELECT @@local.myisam_repair_threads  = @@session.myisam_repair_threads ;
-@@local.myisam_repair_threads  = @@session.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_repair_threads  = 1;
-SELECT @@myisam_repair_threads ;
-@@myisam_repair_threads
-1
-SELECT local.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_repair_threads  = @@session.myisam_repair_threads ;
-ERROR 42S22: Unknown column 'myisam_repair_threads' in 'field list'
-SET @@global.myisam_repair_threads  = @start_global_value;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = @start_session_value;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
diff --git a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
deleted file mode 100644
index 50589c4041cf..000000000000
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
+++ /dev/null
@@ -1,178 +0,0 @@
-SET @start_global_value = @@global.myisam_repair_threads;
-SELECT @start_global_value;
-@start_global_value
-1
-SET @start_session_value = @@session.myisam_repair_threads;
-SELECT @start_session_value;
-@start_session_value
-1
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_repair_threads  = 100;
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 200;
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads  = 1;
-@@global.myisam_repair_threads  = 1
-1
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads  = 1;
-@@session.myisam_repair_threads  = 1
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_repair_threads  = 1;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 4294967295;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 655354;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_repair_threads  = 1;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 4294967295;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 655345;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-1024'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 429496729533;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@session.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-2'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@global.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@session.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_repair_threads  = TRUE;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_repair_threads  = 10;
-SELECT @@myisam_repair_threads  = @@global.myisam_repair_threads ;
-@@myisam_repair_threads  = @@global.myisam_repair_threads
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_repair_threads  = 100;
-SELECT @@myisam_repair_threads  = @@local.myisam_repair_threads ;
-@@myisam_repair_threads  = @@local.myisam_repair_threads
-1
-SELECT @@local.myisam_repair_threads  = @@session.myisam_repair_threads ;
-@@local.myisam_repair_threads  = @@session.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_repair_threads  = 1;
-SELECT @@myisam_repair_threads ;
-@@myisam_repair_threads
-1
-SELECT local.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_repair_threads  = @@session.myisam_repair_threads ;
-ERROR 42S22: Unknown column 'myisam_repair_threads' in 'field list'
-SET @@global.myisam_repair_threads  = @start_global_value;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = @start_session_value;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
diff --git a/mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result b/mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result
new file mode 100644
index 000000000000..17cb894f2140
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result
@@ -0,0 +1,25 @@
+select @@global.named_pipe_full_access_group;
+@@global.named_pipe_full_access_group
+
+select @@session.named_pipe_full_access_group;
+ERROR HY000: Variable 'named_pipe_full_access_group' is a GLOBAL variable
+show global variables like 'named_pipe_full_access_group';
+Variable_name	Value
+named_pipe_full_access_group	
+show session variables like 'named_pipe_full_access_group';
+Variable_name	Value
+named_pipe_full_access_group	
+set global named_pipe_full_access_group = NULL;
+show session variables like 'named_pipe_full_access_group';
+Variable_name	Value
+named_pipe_full_access_group	
+set global named_pipe_full_access_group = '*everyone*';
+Warnings:
+Warning	1887	Setting named_pipe_full_access_group='*everyone*' is insecure. Consider using a Windows group with fewer members.
+select * from performance_schema.global_variables where variable_name='named_pipe_full_access_group';
+VARIABLE_NAME	VARIABLE_VALUE
+named_pipe_full_access_group	*everyone*
+select * from performance_schema.session_variables where variable_name='named_pipe_full_access_group';
+VARIABLE_NAME	VARIABLE_VALUE
+named_pipe_full_access_group	*everyone*
+set global named_pipe_full_access_group = default;
diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
index 3e183eeab97b..9ecc8ee9ae44 100644
--- a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
@@ -1,57 +1,57 @@
 SET @start_global_value = @@global.optimizer_switch;
 SELECT @start_global_value;
 @start_global_value
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 show global variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 show session variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+optimizer_switch	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 select * from information_schema.global_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 select * from information_schema.session_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+OPTIMIZER_SWITCH	index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
 set global optimizer_switch=10;
 set session optimizer_switch=5;
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 set global optimizer_switch="index_merge_sort_union=on";
 set session optimizer_switch="index_merge=off";
 select @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 show global variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+optimizer_switch	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 show session variables like 'optimizer_switch';
 Variable_name	Value
-optimizer_switch	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+optimizer_switch	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 select * from information_schema.global_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+OPTIMIZER_SWITCH	index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 select * from information_schema.session_variables where variable_name='optimizer_switch';
 VARIABLE_NAME	VARIABLE_VALUE
-OPTIMIZER_SWITCH	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+OPTIMIZER_SWITCH	index_merge=off,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 set session optimizer_switch="default";
 select @@session.optimizer_switch;
 @@session.optimizer_switch
-index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off
+index_merge=off,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=off,index_condition_pushdown=off,mrr=off,mrr_cost_based=off,block_nested_loop=off,batched_key_access=off,materialization=off,semijoin=off,loosescan=off,firstmatch=off,duplicateweedout=off,subquery_materialization_cost_based=off,use_index_extensions=off,condition_fanout_filter=off,derived_merge=off,prefer_ordering_index=off
 set global optimizer_switch=1.1;
 ERROR 42000: Incorrect argument type to variable 'optimizer_switch'
 set global optimizer_switch=1e1;
@@ -70,4 +70,4 @@ ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'e'
 SET @@global.optimizer_switch = @start_global_value;
 SELECT @@global.optimizer_switch;
 @@global.optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_program_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_program_instances_basic.result
index 331e2dacd908..a7113f2c9101 100644
--- a/mysql-test/suite/sys_vars/r/pfs_max_program_instances_basic.result
+++ b/mysql-test/suite/sys_vars/r/pfs_max_program_instances_basic.result
@@ -1,25 +1,25 @@
 select @@global.performance_schema_max_program_instances;
 @@global.performance_schema_max_program_instances
-5000
+-1
 select @@global.performance_schema_max_program_instances;
 @@global.performance_schema_max_program_instances
-5000
+-1
 select @@session.performance_schema_max_program_instances;
 ERROR HY000: Variable 'performance_schema_max_program_instances' is a GLOBAL variable
 show global variables like 'performance_schema_max_program_instances';
 Variable_name	Value
-performance_schema_max_program_instances	5000
+performance_schema_max_program_instances	-1
 show session variables like 'performance_schema_max_program_instances';
 Variable_name	Value
-performance_schema_max_program_instances	5000
+performance_schema_max_program_instances	-1
 select * from information_schema.global_variables
 where variable_name='performance_schema_max_program_instances';
 VARIABLE_NAME	VARIABLE_VALUE
-PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	5000
+PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	-1
 select * from information_schema.session_variables
 where variable_name='performance_schema_max_program_instances';
 VARIABLE_NAME	VARIABLE_VALUE
-PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	5000
+PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	-1
 set global performance_schema_max_program_instances=1;
 ERROR HY000: Variable 'performance_schema_max_program_instances' is a read only variable
 set session performance_schema_max_program_instances=1;
@@ -31,11 +31,11 @@ WHERE VARIABLE_NAME='performance_schema_max_program_instances';
 1
 select @@global.performance_schema_max_program_instances;
 @@global.performance_schema_max_program_instances
-5000
+-1
 select * from information_schema.global_variables
 where variable_name='performance_schema_max_program_instances';
 VARIABLE_NAME	VARIABLE_VALUE
-PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	5000
+PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES	-1
 SELECT @@performance_schema_max_program_instances = @@GLOBAL.performance_schema_max_program_instances;
 @@performance_schema_max_program_instances = @@GLOBAL.performance_schema_max_program_instances
 1
diff --git a/mysql-test/suite/sys_vars/r/pfs_show_processlist_basic.result b/mysql-test/suite/sys_vars/r/pfs_show_processlist_basic.result
new file mode 100644
index 000000000000..8afc7527cebc
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_show_processlist_basic.result
@@ -0,0 +1,49 @@
+select @@global.performance_schema_show_processlist into @save;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+select @@session.performance_schema_show_processlist;
+ERROR HY000: Variable 'performance_schema_show_processlist' is a GLOBAL variable
+show global variables like 'performance_schema_show_processlist';
+Variable_name	Value
+performance_schema_show_processlist	OFF
+show session variables like 'performance_schema_show_processlist';
+Variable_name	Value
+performance_schema_show_processlist	OFF
+select * from performance_schema.global_variables
+where variable_name='performance_schema_show_processlist';
+VARIABLE_NAME	VARIABLE_VALUE
+performance_schema_show_processlist	OFF
+select * from performance_schema.session_variables
+where variable_name='performance_schema_show_processlist';
+VARIABLE_NAME	VARIABLE_VALUE
+performance_schema_show_processlist	OFF
+set global performance_schema_show_processlist = 99;
+ERROR 42000: Variable 'performance_schema_show_processlist' can't be set to the value of '99'
+set global performance_schema_show_processlist = 'FOO';
+ERROR 42000: Variable 'performance_schema_show_processlist' can't be set to the value of 'FOO'
+set global performance_schema_show_processlist = 1;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+1
+set global performance_schema_show_processlist = 0;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+set global performance_schema_show_processlist = ON;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+1
+set global performance_schema_show_processlist = OFF;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+set global performance_schema_show_processlist = TRUE;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+1
+set global performance_schema_show_processlist = FALSE;
+select @@global.performance_schema_show_processlist;
+@@global.performance_schema_show_processlist
+0
+set @@global.performance_schema_show_processlist = @save;
diff --git a/mysql-test/suite/sys_vars/r/replication_optimize_for_static_plugin_config.result b/mysql-test/suite/sys_vars/r/replication_optimize_for_static_plugin_config.result
new file mode 100644
index 000000000000..d09429604c99
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/replication_optimize_for_static_plugin_config.result
@@ -0,0 +1,35 @@
+include/assert.inc [Default GLOBAL value is FALSE]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = OFF;
+include/assert.inc [Reported value matches the one set (set OFF in GLOBAL scope)]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = FALSE;
+include/assert.inc [Reported value matches the one set (set FALSE in GLOBAL scope)]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = 0;
+include/assert.inc [Reported value matches the one set (set 0 in GLOBAL scope)]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = ON;
+include/assert.inc [Reported value matches the one set (set ON in GLOBAL scope)]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = TRUE;
+include/assert.inc [Reported value matches the one set (set TRUE in GLOBAL scope)]
+SET @@GLOBAL.replication_optimize_for_static_plugin_config = 1;
+include/assert.inc [Reported value matches the one set (set 1 in GLOBAL scope)]
+CREATE USER user1;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+GRANT SUPER ON *.* TO user1@'%';
+FLUSH PRIVILEGES;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+DROP USER user1;
+BEGIN;
+SET GLOBAL replication_optimize_for_static_plugin_config = ON;
+ROLLBACK;
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_LIB';
+UNINSTALL PLUGIN rpl_semi_sync_master;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+include/assert.inc [Semi-sync not disposed because it is in use]
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+include/assert.inc [Semi-sync disposed because it is no longer in use]
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_LIB';
+UNINSTALL PLUGIN rpl_semi_sync_master;
+include/assert.inc [Semi-sync disposed because it is no longer in use]
+SET @@global.replication_optimize_for_static_plugin_config = 0;
diff --git a/mysql-test/suite/sys_vars/r/replication_sender_observe_commit_only.result b/mysql-test/suite/sys_vars/r/replication_sender_observe_commit_only.result
new file mode 100644
index 000000000000..4be48a3f0ee0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/replication_sender_observe_commit_only.result
@@ -0,0 +1,24 @@
+include/assert.inc [Default GLOBAL value is FALSE]
+SET @@GLOBAL.replication_sender_observe_commit_only = OFF;
+include/assert.inc [Reported value matches the one set (set OFF in GLOBAL scope)]
+SET @@GLOBAL.replication_sender_observe_commit_only = FALSE;
+include/assert.inc [Reported value matches the one set (set FALSE in GLOBAL scope)]
+SET @@GLOBAL.replication_sender_observe_commit_only = 0;
+include/assert.inc [Reported value matches the one set (set 0 in GLOBAL scope)]
+SET @@GLOBAL.replication_sender_observe_commit_only = ON;
+include/assert.inc [Reported value matches the one set (set ON in GLOBAL scope)]
+SET @@GLOBAL.replication_sender_observe_commit_only = TRUE;
+include/assert.inc [Reported value matches the one set (set TRUE in GLOBAL scope)]
+SET @@GLOBAL.replication_sender_observe_commit_only = 1;
+include/assert.inc [Reported value matches the one set (set 1 in GLOBAL scope)]
+CREATE USER user1;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+GRANT SUPER ON *.* TO user1@'%';
+FLUSH PRIVILEGES;
+SET GLOBAL replication_sender_observe_commit_only = 1;
+DROP USER user1;
+BEGIN;
+SET GLOBAL replication_sender_observe_commit_only = ON;
+ROLLBACK;
+SET @@global.replication_sender_observe_commit_only = 0;
diff --git a/mysql-test/suite/sys_vars/r/show_create_table_verbosity_basic.result b/mysql-test/suite/sys_vars/r/show_create_table_verbosity_basic.result
new file mode 100644
index 000000000000..d0d55e21fc9a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/show_create_table_verbosity_basic.result
@@ -0,0 +1,80 @@
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+SHOW SESSION VARIABLES LIKE 'show_create_table_verbosity';
+Variable_name	Value
+show_create_table_verbosity	OFF
+SELECT * FROM information_schema.session_variables WHERE variable_name='show_create_table_verbosity';
+VARIABLE_NAME	VARIABLE_VALUE
+SHOW_CREATE_TABLE_VERBOSITY	OFF
+#Also can be set as a global variable.
+SELECT @@global.show_create_table_verbosity;
+@@global.show_create_table_verbosity
+0
+SHOW GLOBAL VARIABLES LIKE 'show_create_table_verbosity';
+Variable_name	Value
+show_create_table_verbosity	OFF
+SELECT * FROM information_schema.global_variables WHERE variable_name='show_create_table_verbosity';
+VARIABLE_NAME	VARIABLE_VALUE
+SHOW_CREATE_TABLE_VERBOSITY	OFF
+#Test setting the variable to various values.
+#Boolean values.
+SET SESSION show_create_table_verbosity= ON;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+1
+SET SESSION show_create_table_verbosity= OFF;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+SET SESSION show_create_table_verbosity= 1;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+1
+SET SESSION show_create_table_verbosity= 0;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+#Test for DEFAULT value.
+SET SESSION show_create_table_verbosity= DEFAULT;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+#Test for invalid value.
+SET SESSION show_create_table_verbosity= 2;
+ERROR 42000: Variable 'show_create_table_verbosity' can't be set to the value of '2'
+#Test for setting the session variable
+#using different syntax.
+SET show_create_table_verbosity= 1;
+#Fetches the current session value for the variable.
+SELECT @@show_create_table_verbosity;
+@@show_create_table_verbosity
+1
+#cleanup
+SET SESSION show_create_table_verbosity= DEFAULT;
+#Test setting the global value of the variable.
+#Boolean values.
+SET GLOBAL show_create_table_verbosity= ON;
+SELECT @@global.show_create_table_verbosity;
+@@global.show_create_table_verbosity
+1
+SET GLOBAL show_create_table_verbosity= OFF;
+SELECT @@global.show_create_table_verbosity;
+@@global.show_create_table_verbosity
+0
+SET GLOBAL show_create_table_verbosity= 1;
+SELECT @@global.show_create_table_verbosity;
+@@global.show_create_table_verbosity
+1
+SET GLOBAL show_create_table_verbosity= 0;
+SELECT @@session.show_create_table_verbosity;
+@@session.show_create_table_verbosity
+0
+#Test for DEFAULT value.
+SET GLOBAL show_create_table_verbosity= DEFAULT;
+SELECT @@global.show_create_table_verbosity;
+@@global.show_create_table_verbosity
+0
+#Test for invalid value.
+SET GLOBAL show_create_table_verbosity= 2;
+ERROR 42000: Variable 'show_create_table_verbosity' can't be set to the value of '2'
diff --git a/mysql-test/suite/sys_vars/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
index 1194ceb18dc7..abd5bb94760b 100644
--- a/mysql-test/suite/sys_vars/r/sql_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_mode_basic.result
@@ -110,14 +110,20 @@ SELECT @@global.sql_mode;
 @@global.sql_mode
 NO_ENGINE_SUBSTITUTION
 SET @@global.sql_mode = NO_FIELD_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 NO_FIELD_OPTIONS
 SET @@global.sql_mode = NO_KEY_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 NO_KEY_OPTIONS
 SET @@global.sql_mode = NO_TABLE_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_TABLE_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 NO_TABLE_OPTIONS
@@ -162,34 +168,46 @@ SELECT @@global.sql_mode;
 @@global.sql_mode
 STRICT_TRANS_TABLES
 SET @@global.sql_mode = DB2;
+Warnings:
+Warning	3090	Changing sql mode 'DB2,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,DB2,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
 SET @@global.sql_mode = MAXDB;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@global.sql_mode = MSSQL;
+Warnings:
+Warning	3090	Changing sql mode 'MSSQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MSSQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
 SET @@global.sql_mode = MYSQL323;
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL323' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 MYSQL323,HIGH_NOT_PRECEDENCE
 SET @@global.sql_mode = MYSQL40;
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL40' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 MYSQL40,HIGH_NOT_PRECEDENCE
 SET @@global.sql_mode = ORACLE;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@global.sql_mode = POSTGRESQL;
+Warnings:
+Warning	3090	Changing sql mode 'POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
@@ -266,14 +284,20 @@ SELECT @@session.sql_mode;
 @@session.sql_mode
 NO_ENGINE_SUBSTITUTION
 SET @@session.sql_mode = NO_FIELD_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 NO_FIELD_OPTIONS
 SET @@session.sql_mode = NO_KEY_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_KEY_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 NO_KEY_OPTIONS
 SET @@session.sql_mode = NO_TABLE_OPTIONS;
+Warnings:
+Warning	3090	Changing sql mode 'NO_TABLE_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 NO_TABLE_OPTIONS
@@ -318,38 +342,48 @@ SELECT @@session.sql_mode;
 @@session.sql_mode
 STRICT_TRANS_TABLES
 SET @@session.sql_mode = DB2;
+Warnings:
+Warning	3090	Changing sql mode 'DB2,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,DB2,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
 SET @@session.sql_mode = MAXDB;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@session.sql_mode = MSSQL;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'MSSQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MSSQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
 SET @@session.sql_mode = MYSQL323;
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL323' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 MYSQL323,HIGH_NOT_PRECEDENCE
 SET @@session.sql_mode = MYSQL40;
+Warnings:
+Warning	3090	Changing sql mode 'MYSQL40' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 MYSQL40,HIGH_NOT_PRECEDENCE
 SET @@session.sql_mode = ORACLE;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@session.sql_mode = POSTGRESQL;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@session.sql_mode;
 @@session.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
@@ -425,16 +459,21 @@ SELECT @@global.sql_mode;
 @@global.sql_mode
 REAL_AS_FLOAT,PIPES_AS_CONCAT
 SET @@global.sql_mode = 50000;
+Warnings:
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,,,NO_UNSIGNED_SUBTRACTION,POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 SET @@global.sql_mode = 500000;
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	3090	Changing sql mode 'POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,POSTGRESQL,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,HIGH_NOT_PRECEDENCE
 SET @@global.sql_mode = 4294967295;
+Warnings:
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,,,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
@@ -479,6 +518,8 @@ SELECT @@session.sql_mode;
 @@session.sql_mode
 ANSI_QUOTES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 SET @@global.sql_mode = 'ONLY_FULL_GROUP_BY,PIPES_AS_CONCAT,REAL_AS_FLOAT,ORACLE,POSTGRESQL';
+Warnings:
+Warning	3090	Changing sql mode 'POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS' is deprecated. It will be removed in a future release.
 SELECT @@global.sql_mode;
 @@global.sql_mode
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,POSTGRESQL,ORACLE,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
diff --git a/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
index cf8d613b6830..a446363bdd86 100644
--- a/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
+++ b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
@@ -19,7 +19,7 @@ SET SESSION sql_safe_updates = ON;
 '#-----------------------------FN_DYNVARS_164_02------------------------------------#'
 Expected error : Update without key in safe mode
 DELETE FROM t1;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SELECT * FROM t1;
 a	b
 1	val1
@@ -34,16 +34,13 @@ a	b
 PREPARE stmt FROM 'DELETE FROM t1;';
 Expected error : Update without key in safe mode
 EXECUTE stmt;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 DEALLOCATE PREPARE stmt;
 '#-----------------------------FN_DYNVARS_164_03------------------------------------#'
-Expected error : Update without key in safe mode
+No error : Update without key in safe mode but with LIMIT
 DELETE FROM t1 LIMIT 2;
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 SELECT * FROM t1;
 a	b
-1	val1
-2	val2
 3	val3
 4	val4
 5	val5
@@ -54,11 +51,9 @@ a	b
 '#-----------------------------FN_DYNVARS_164_04------------------------------------#'
 Expected error : Update without key in safe mode
 DELETE FROM t1 WHERE b='val1';
-ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
+ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. 
 SELECT * FROM t1;
 a	b
-1	val1
-2	val2
 3	val3
 4	val4
 5	val5
@@ -68,11 +63,9 @@ a	b
 9	val9
 '#-----------------------------FN_DYNVARS_164_05------------------------------------#'
 This one should work
-DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=3;
 SELECT * FROM t1;
 a	b
-2	val2
-3	val3
 4	val4
 5	val5
 6	val6
@@ -88,8 +81,6 @@ This one should work
 DELETE FROM t1 WHERE b='val1';
 SELECT * FROM t1;
 a	b
-2	val2
-3	val3
 4	val4
 5	val5
 6	val6
@@ -98,13 +89,10 @@ a	b
 9	val9
 '#-----------------------------FN_DYNVARS_164_07------------------------------------#'
 This one should work
-DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=5;
 SELECT * FROM t1;
 a	b
-2	val2
-3	val3
 4	val4
-5	val5
 6	val6
 7	val7
 8	val8
@@ -114,9 +102,6 @@ This one should work
 DELETE FROM t1 LIMIT 2;
 SELECT * FROM t1;
 a	b
-4	val4
-5	val5
-6	val6
 7	val7
 8	val8
 9	val9
@@ -127,9 +112,6 @@ Bug#35392 Unexpected error occurs in this statement Can't change size of the fil
 statement is remarked because the error is uncatchable by testing framework
 SELECT * FROM t1;
 a	b
-4	val4
-5	val5
-6	val6
 7	val7
 8	val8
 9	val9
diff --git a/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_h_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_h_size_basic.test
new file mode 100644
index 000000000000..9c8f4486632e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_h_size_basic.test
@@ -0,0 +1,106 @@
+###############################################################################
+# Variable Name: binlog_transaction_dependency_history_size
+# Scope: global
+# Access Type: dynamic
+# Data Type: Numeric
+# Range: 1 - 1000000
+#
+# Description: Test of Dynamic System Variable
+#              "binlog_transaction_dependency_history_size" that checks
+#              behavior of this variable in the following ways
+#              * Scope & Access type
+#              * Default value
+#              * Valid & Invalid values
+#              * Min & Max values
+#
+# Reference: WL#9556
+###############################################################################
+
+--source include/not_embedded.inc
+--source include/have_binlog_format_row.inc
+
+# Save initial value
+SET @save_binlog_transaction_dependency_history_size= @@global.binlog_transaction_dependency_history_size;
+
+#
+# Scope: Global only
+#
+SELECT COUNT(@@GLOBAL.binlog_transaction_dependency_history_size);
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.binlog_transaction_dependency_history_size);
+
+--disable_warnings
+SELECT VARIABLE_NAME FROM performance_schema.global_variables WHERE VARIABLE_NAME='binlog_transaction_dependency_history_size';
+SELECT VARIABLE_NAME FROM performance_schema.session_variables WHERE variable_name='binlog_transaction_dependency_history_size';
+--enable_warnings
+
+#
+# Access Type: Dynamic
+#
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1;
+--let $assert_text= 'binlog_transaction_dependency_history_size is a dynamic variable'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_history_size]" = 1
+--source include/assert.inc
+
+#
+# Default value
+#
+SET @@GLOBAL.binlog_transaction_dependency_history_size= default;
+--let $assert_text= 'Default value is 25000'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_history_size]" = 25000
+--source include/assert.inc
+
+#
+# Invalid values
+#
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.binlog_transaction_dependency_history_size= ON;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.binlog_transaction_dependency_history_size= OFF;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.binlog_transaction_dependency_history_size= "foo";
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.binlog_transaction_dependency_history_size= NULL;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1.0;
+
+--echo Expect value still set to 25000
+SELECT @@GLOBAL.binlog_transaction_dependency_history_size;
+
+#
+# Minimum value: 1. Maximum value: 1000000
+#
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 0;
+--let $assert_text= 'Check minimum value of binlog_transaction_dependency_history_size'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 1
+
+SET @@GLOBAL.binlog_transaction_dependency_history_size= -1;
+--let $assert_text= 'Check minimum value of binlog_transaction_dependency_history_size'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 1
+
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 2000000;
+--let $assert_text= 'Check maximum value of binlog_transaction_dependency_history_size'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 1000000
+
+#
+# Valid values
+#
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1;
+--let $assert_text= 'binlog_transaction_dependency_history_size should be 1'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 1
+
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 20000;
+--let $assert_text= 'binlog_transaction_dependency_history_size should be 20000'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 20000
+
+SET @@GLOBAL.binlog_transaction_dependency_history_size= 1000000;
+--let $assert_text= 'binlog_transaction_dependency_history_size should be 1000000'
+--let $assert_cond= [SELECT @@GLOBAL.binlog_transaction_dependency_history_size] = 1000000
+
+# Cleanup
+eval SET @@GLOBAL.binlog_transaction_dependency_history_size= @save_binlog_transaction_dependency_history_size;
diff --git a/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_tracking_basic.test b/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_tracking_basic.test
new file mode 100644
index 000000000000..830c560683d7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/binlog_transaction_dependency_tracking_basic.test
@@ -0,0 +1,155 @@
+###############################################################################
+# Variable Name: binlog_transaction_dependency_tracking
+# Scope: global
+# Access Type: dynamic
+# Data Type: enum
+#
+# Description: Test Cases of Dynamic System Variable
+#              "binlog_transaction_dependency_history_size" that checks
+#              behavior of this variable in the following ways
+#              * Scope & Access type
+#              * Valid & Default value
+#              * Invalid values
+#              * Dependency on transaction_write_set_extraction
+#
+# Reference: WL#9556
+###############################################################################
+
+--source include/not_embedded.inc
+--source include/have_binlog_format_row.inc
+
+# Save initial value
+--let $saved_binlog_transaction_dependency_tracking= `SELECT @@global.binlog_transaction_dependency_tracking`
+--let $saved_transaction_write_set_extraction= `SELECT @@global.transaction_write_set_extraction`
+
+# Set initial values to test further
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+SET GLOBAL transaction_write_set_extraction= 'XXHASH64';
+
+#
+# Scope: Global only
+#
+SELECT COUNT(@@GLOBAL.binlog_transaction_dependency_tracking);
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.binlog_transaction_dependency_tracking);
+
+--disable_warnings
+SELECT VARIABLE_NAME FROM performance_schema.global_variables WHERE VARIABLE_NAME='binlog_transaction_dependency_tracking';
+SELECT VARIABLE_NAME FROM performance_schema.session_variables WHERE variable_name='binlog_transaction_dependency_tracking';
+--enable_warnings
+
+#
+# Access Type: Dynamic
+#
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+--let $assert_text= 'binlog_transaction_dependency_tracking is a dynamic variable'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+#
+# Valid values and Default value
+#
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+--let $assert_text= 'binlog_transaction_dependency_tracking should be COMMIT_ORDER'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= 0;
+--let $assert_text= 'binlog_transaction_dependency_tracking should be COMMIT_ORDER'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+--let $assert_text= 'binlog_transaction_dependency_tracking should be WRITESET'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= 1;
+--let $assert_text= 'binlog_transaction_dependency_tracking should be WRITESET'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+--let $assert_text= 'binlog_transaction_dependency_tracking should be WRITESET_SESSION'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET_SESSION"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= 2;
+--let $assert_text= 'binlog_transaction_dependency_tracking should be WRITESET_SESSION'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "WRITESET_SESSION"
+--source include/assert.inc
+
+SET GLOBAL binlog_transaction_dependency_tracking= DEFAULT;
+--let $assert_text= 'binlog_transaction_dependency_tracking should be COMMIT_ORDER'
+--let $assert_cond= "[SELECT @@GLOBAL.binlog_transaction_dependency_tracking]" = "COMMIT_ORDER"
+--source include/assert.inc
+
+#
+# Invalid values
+#
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= NULL;
+
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= '';
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= 1.0;
+
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= 'GARBAGE';
+
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= ON;
+
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= OFF;
+
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL binlog_transaction_dependency_tracking= 3;
+
+--echo Expect value still set to "COMMIT_ORDER"
+SELECT @@global.binlog_transaction_dependency_tracking;
+
+#
+# Test usage: Dependency on transaction_write_set_extraction
+#
+--echo Case1 a): "When binlog_transaction_dependency_tracking != COMMIT_ORDER,
+--echo  transaction_write_set_extraction cannot be changed."
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+--error ER_WRONG_USAGE
+SET GLOBAL transaction_write_set_extraction= OFF;
+--error ER_WRONG_USAGE
+SET GLOBAL transaction_write_set_extraction= MURMUR32;
+--echo Expect value still set to XXHASH64
+SELECT @@global.transaction_write_set_extraction;
+
+--echo Case1 b): "When binlog_transaction_dependency_tracking != COMMIT_ORDER,
+--echo  transaction_write_set_extraction cannot be changed."
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+--error ER_WRONG_USAGE
+SET GLOBAL transaction_write_set_extraction= OFF;
+--error ER_WRONG_USAGE
+SET GLOBAL transaction_write_set_extraction= MURMUR32;
+--echo Expect value still set to XXHASH64
+SELECT @@global.transaction_write_set_extraction;
+
+--echo Case2: "When transaction_write_set_extraction = OFF,
+--echo  binlog_transaction_dependency_tracking cannot be set to WRITESET%"
+SET GLOBAL binlog_transaction_dependency_tracking= 'COMMIT_ORDER';
+SET GLOBAL transaction_write_set_extraction= OFF;
+--error ER_WRONG_USAGE
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
+--error ER_WRONG_USAGE
+SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
+--echo Expect value still set to COMMIT_ORDER
+SELECT @@global.binlog_transaction_dependency_tracking;
+
+SET GLOBAL transaction_write_set_extraction= XXHASH64;
+
+# Clean up
+--disable_query_log
+--eval SET GLOBAL binlog_transaction_dependency_tracking= '$saved_binlog_transaction_dependency_tracking';
+--eval SET GLOBAL transaction_write_set_extraction= '$saved_transaction_write_set_extraction';
+--enable_query_log
diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test
index 9013420bbc80..d445153a3797 100644
--- a/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test
@@ -64,7 +64,7 @@ set global innodb_adaptive_flushing=1.1;
 set global innodb_adaptive_flushing=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_adaptive_flushing=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_adaptive_flushing=-3;
 select @@global.innodb_adaptive_flushing;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test
index e8ab91f6c3db..6f83d2130205 100644
--- a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test
@@ -64,7 +64,7 @@ set global innodb_adaptive_hash_index=1.1;
 set global innodb_adaptive_hash_index=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_adaptive_hash_index=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_adaptive_hash_index=-3;
 select @@global.innodb_adaptive_hash_index;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_deadlock_detect_basic.test b/mysql-test/suite/sys_vars/t/innodb_deadlock_detect_basic.test
index 98b1cc6f0049..8cac13906c87 100644
--- a/mysql-test/suite/sys_vars/t/innodb_deadlock_detect_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_deadlock_detect_basic.test
@@ -41,6 +41,7 @@ set global innodb_deadlock_detect=1e1;
 set global innodb_deadlock_detect=2;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_deadlock_detect='AUTO';
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_deadlock_detect=-3;
 select @@global.innodb_deadlock_detect;
 
diff --git a/mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test b/mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
index 9fd38ffae837..11311c7e800b 100644
--- a/mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
@@ -64,7 +64,7 @@ set global innodb_disable_sort_file_cache=1.1;
 set global innodb_disable_sort_file_cache=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_disable_sort_file_cache=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_disable_sort_file_cache=-3;
 select @@global.innodb_disable_sort_file_cache;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_flush_sync_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_sync_basic.test
index a96f16e377f6..a73575864bdd 100644
--- a/mysql-test/suite/sys_vars/t/innodb_flush_sync_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_sync_basic.test
@@ -59,7 +59,7 @@ set global innodb_flush_sync=1.1;
 set global innodb_flush_sync=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_flush_sync=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_flush_sync=-3;
 select @@global.innodb_flush_sync;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test b/mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test
index 3afb19a696aa..630ada004df2 100644
--- a/mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test
@@ -64,7 +64,7 @@ set global innodb_ft_enable_diag_print=1.1;
 set global innodb_ft_enable_diag_print=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_ft_enable_diag_print=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_ft_enable_diag_print=-3;
 select @@global.innodb_ft_enable_diag_print;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test b/mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
index e0b147239388..5eb5af4df23d 100644
--- a/mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test
@@ -78,8 +78,9 @@ set session innodb_ft_enable_stopword=2;
 set global innodb_ft_enable_stopword='AUTO';
 --error ER_WRONG_VALUE_FOR_VAR
 set session innodb_ft_enable_stopword='AUTO';
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_ft_enable_stopword=-3;
+--error ER_WRONG_VALUE_FOR_VAR
 set session innodb_ft_enable_stopword=-7;
 select @@global.innodb_ft_enable_stopword;
 select @@session.innodb_ft_enable_stopword;
diff --git a/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test b/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test
index 6cceca3df935..877fe17b003f 100644
--- a/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test
@@ -64,7 +64,7 @@ set global innodb_large_prefix=1.1;
 set global innodb_large_prefix=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_large_prefix=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_large_prefix=-3;
 select @@global.innodb_large_prefix;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test
index d9db0c4742b7..331803fff86e 100644
--- a/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_log_checkpoint_now_basic.test
@@ -66,6 +66,7 @@ set @@session.innodb_log_checkpoint_now='some';
 set global innodb_log_checkpoint_now=1.1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_log_checkpoint_now='foo';
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_log_checkpoint_now=-2;
 --error ER_WRONG_TYPE_FOR_VAR
 set global innodb_log_checkpoint_now=1e1;
diff --git a/mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test b/mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
index 57d07222eb42..08b8c1373429 100644
--- a/mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
@@ -64,7 +64,7 @@ set global innodb_optimize_fulltext_only=1.1;
 set global innodb_optimize_fulltext_only=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_optimize_fulltext_only=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_optimize_fulltext_only=-3;
 select @@global.innodb_optimize_fulltext_only;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test b/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
index b01b12664fb0..5693a8293732 100644
--- a/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
@@ -73,7 +73,7 @@ SET global innodb_print_all_deadlocks=1.1;
 SET global innodb_print_all_deadlocks=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 SET global innodb_print_all_deadlocks=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 SET global innodb_print_all_deadlocks=-3;
 SELECT @@global.innodb_print_all_deadlocks;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test b/mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
index 46bbdd4cafe9..a805fc803144 100644
--- a/mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
@@ -64,7 +64,7 @@ set global innodb_random_read_ahead=1.1;
 set global innodb_random_read_ahead=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_random_read_ahead=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_random_read_ahead=-3;
 select @@global.innodb_random_read_ahead;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_semaphore_wait_timeout_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_semaphore_wait_timeout_debug_basic.test
new file mode 100644
index 000000000000..2b912e858a59
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/innodb_semaphore_wait_timeout_debug_basic.test
@@ -0,0 +1,29 @@
+--echo #
+--echo # Basic test for innodb_semaphore_wait_timeout_debug
+--echo #
+
+# The config variable is a debug variable
+--source include/have_debug.inc
+
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 10;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 200;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET GLOBAL innodb_semaphore_wait_timeout_debug = dummy;
+
+--error ER_GLOBAL_VARIABLE
+SET innodb_semaphore_wait_timeout_debug = 100;
+
+SET GLOBAL innodb_semaphore_wait_timeout_debug = 6000;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+
+SET GLOBAL innodb_semaphore_wait_timeout_debug = -1;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
+
+SET GLOBAL innodb_semaphore_wait_timeout_debug = default;
+SELECT @@global.innodb_semaphore_wait_timeout_debug;
diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
index da037fb522b9..a0bccb50652d 100644
--- a/mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
@@ -64,7 +64,7 @@ set global innodb_stats_on_metadata=1.1;
 set global innodb_stats_on_metadata=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_stats_on_metadata=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_stats_on_metadata=-3;
 select @@global.innodb_stats_on_metadata;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_status_output_basic.test b/mysql-test/suite/sys_vars/t/innodb_status_output_basic.test
index a587b9f3f66c..8e33b364c4ee 100644
--- a/mysql-test/suite/sys_vars/t/innodb_status_output_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_status_output_basic.test
@@ -59,7 +59,7 @@ set global innodb_status_output=1.1;
 set global innodb_status_output=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_status_output=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_status_output=-3;
 select @@global.innodb_status_output;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test
index 3334d858b900..9f510c2feaac 100644
--- a/mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test
@@ -59,7 +59,7 @@ set global innodb_status_output_locks=1.1;
 set global innodb_status_output_locks=1e1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_status_output_locks=2;
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_status_output_locks=-3;
 select @@global.innodb_status_output_locks;
 --disable_warnings
diff --git a/mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test b/mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
index 71d9b0290192..243985f95dee 100644
--- a/mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
@@ -78,8 +78,9 @@ set session innodb_strict_mode=2;
 set global innodb_strict_mode='AUTO';
 --error ER_WRONG_VALUE_FOR_VAR
 set session innodb_strict_mode='AUTO';
---echo NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_strict_mode=-3;
+--error ER_WRONG_VALUE_FOR_VAR
 set session innodb_strict_mode=-7;
 select @@global.innodb_strict_mode;
 select @@session.innodb_strict_mode;
diff --git a/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
index 221ffa9a09eb..3534b988cb89 100644
--- a/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
@@ -126,7 +126,7 @@ SET @@session.innodb_support_xa = 
 
 # for global
 
-
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.innodb_support_xa = -1;
 SELECT @@global.innodb_support_xa;
 
diff --git a/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
index fc2211e2d56f..e3e4bda345e8 100644
--- a/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
@@ -106,6 +106,7 @@ SELECT @@global.innodb_table_locks;
 
 # for session
 
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.innodb_table_locks = -6;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.innodb_table_locks = 1.6;
@@ -127,6 +128,7 @@ SET @@session.innodb_table_locks = 
 # for global
 
 
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.innodb_table_locks = -1;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.innodb_table_locks = 2;
diff --git a/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test
index bc02b7e995e7..04f406a311d1 100644
--- a/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test
@@ -45,6 +45,7 @@ set @@session.innodb_trx_purge_view_update_only_debug='some';
 set global innodb_trx_purge_view_update_only_debug=1.1;
 --error ER_WRONG_VALUE_FOR_VAR
 set global innodb_trx_purge_view_update_only_debug='foo';
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_trx_purge_view_update_only_debug=-2;
 --error ER_WRONG_TYPE_FOR_VAR
 set global innodb_trx_purge_view_update_only_debug=1e1;
diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
deleted file mode 100644
index f395ffe8ee0b..000000000000
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
deleted file mode 100644
index 21ed5fd9c5fa..000000000000
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
+++ /dev/null
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-
diff --git a/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic-master.opt b/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic-master.opt
new file mode 100644
index 000000000000..e534ae1eae50
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic-master.opt
@@ -0,0 +1 @@
+--loose-enable-named-pipe
diff --git a/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic.test b/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic.test
new file mode 100644
index 000000000000..d7da426a2b67
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic.test
@@ -0,0 +1,19 @@
+--source include/windows.inc
+--source include/not_embedded.inc
+#
+# only global
+#
+select @@global.named_pipe_full_access_group;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.named_pipe_full_access_group;
+show global variables like 'named_pipe_full_access_group';
+show session variables like 'named_pipe_full_access_group';
+set global named_pipe_full_access_group = NULL;
+show session variables like 'named_pipe_full_access_group';
+set global named_pipe_full_access_group = '*everyone*';
+--disable_warnings
+select * from performance_schema.global_variables where variable_name='named_pipe_full_access_group';
+select * from performance_schema.session_variables where variable_name='named_pipe_full_access_group';
+--enable_warnings
+# Restore initial state
+set global named_pipe_full_access_group = default;
diff --git a/mysql-test/suite/sys_vars/t/pfs_show_processlist_basic.test b/mysql-test/suite/sys_vars/t/pfs_show_processlist_basic.test
new file mode 100644
index 000000000000..ce94358669ca
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/pfs_show_processlist_basic.test
@@ -0,0 +1,55 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+#
+# Only global
+#
+select @@global.performance_schema_show_processlist into @save;
+select @@global.performance_schema_show_processlist;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+select @@session.performance_schema_show_processlist;
+
+show global variables like 'performance_schema_show_processlist';
+
+show session variables like 'performance_schema_show_processlist';
+
+--disable_warnings
+select * from performance_schema.global_variables
+  where variable_name='performance_schema_show_processlist';
+
+select * from performance_schema.session_variables
+  where variable_name='performance_schema_show_processlist';
+--enable_warnings
+
+#
+# Wrong value
+#
+--Error ER_WRONG_VALUE_FOR_VAR
+set global performance_schema_show_processlist = 99;
+
+--Error ER_WRONG_VALUE_FOR_VAR
+set global performance_schema_show_processlist = 'FOO';
+
+#
+# Right value
+#
+set global performance_schema_show_processlist = 1;
+select @@global.performance_schema_show_processlist;
+
+set global performance_schema_show_processlist = 0;
+select @@global.performance_schema_show_processlist;
+
+set global performance_schema_show_processlist = ON;
+select @@global.performance_schema_show_processlist;
+
+set global performance_schema_show_processlist = OFF;
+select @@global.performance_schema_show_processlist;
+
+set global performance_schema_show_processlist = TRUE;
+select @@global.performance_schema_show_processlist;
+
+set global performance_schema_show_processlist = FALSE;
+select @@global.performance_schema_show_processlist;
+
+set @@global.performance_schema_show_processlist = @save;
diff --git a/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config-master.opt b/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config-master.opt
new file mode 100644
index 000000000000..8d9daec7ad7f
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config-master.opt
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
\ No newline at end of file
diff --git a/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config.test b/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config.test
new file mode 100644
index 000000000000..273b61e65175
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/replication_optimize_for_static_plugin_config.test
@@ -0,0 +1,138 @@
+# Variable Name: replication_optimize_for_static_plugin_config
+# Scope: Global
+# Access Type: Static
+# Data Type: boolean
+#
+# Creation Date: 2019-12-22
+# Author : Pedro Figueiredo
+
+--source include/not_embedded.inc
+--source include/have_semisync_plugin.inc
+
+--let $saved_global_replication_optimize_for_static_plugin_config = `SELECT @@global.replication_optimize_for_static_plugin_config`
+
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+
+--let $assert_text = Default GLOBAL value is FALSE
+--let $assert_cond = [SELECT @@global.replication_optimize_for_static_plugin_config = 0]
+--source include/assert.inc
+
+####################################################################
+#   Check if Value can set and that P_S reports the correct value  #
+####################################################################
+
+# 1, TRUE, ON, 0, FALSE, OFF
+--let $j=6
+
+while($j>0)
+{
+  if ($j == 6)
+  {
+    --let $to_set = OFF
+    --let $expected = OFF
+  }
+  if ($j == 5)
+  {
+    --let $to_set = FALSE
+    --let $expected = OFF
+  }
+  if ($j == 4)
+  {
+    --let $to_set = 0
+    --let $expected = OFF
+  }
+  if ($j == 3)
+  {
+    --let $to_set = ON
+    --let $expected = ON
+  }
+  if ($j == 2)
+  {
+    --let $to_set = TRUE
+    --let $expected = ON
+  }
+  if ($j == 1)
+  {
+    --let $to_set = 1
+    --let $expected = ON
+  }
+
+  --let $scope = GLOBAL
+  --let $ps_table = global_variables
+
+  --eval SET @@$scope.replication_optimize_for_static_plugin_config = $to_set
+  --let $reported=`SELECT variable_value FROM performance_schema.$ps_table WHERE variable_name = 'replication_optimize_for_static_plugin_config'`
+
+  --let $assert_text= Reported value matches the one set (set $to_set in $scope scope)
+  --let $assert_cond = "$reported" = "$expected"
+  --source include/assert.inc
+
+  --dec $j
+}
+
+####################################################################
+# Privileges                                                       #
+####################################################################
+
+CREATE USER user1;
+--connect(conn_user1,localhost,user1,,)
+
+# assert that one cannot change the value without privileges
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+
+# assert that one can change the value if SUPER is given
+--connection default
+GRANT SUPER ON *.* TO user1@'%';
+FLUSH PRIVILEGES;
+--connect(conn2_user1,localhost,user1,,)
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+
+--connection default
+DROP USER user1;
+
+####################################################################
+# Transactional context                                            #
+####################################################################
+
+BEGIN;
+
+# can change the variable's value in global scope while inside a transaction
+SET GLOBAL replication_optimize_for_static_plugin_config = ON;
+
+ROLLBACK;
+
+####################################################################
+# SQL statement                                                    #
+####################################################################
+
+SET GLOBAL replication_optimize_for_static_plugin_config = 1;
+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_LIB
+--eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'
+UNINSTALL PLUGIN rpl_semi_sync_master;
+--let $plugin_count= `SELECT COUNT(*) FROM information_schema.plugins WHERE plugin_name = 'rpl_semi_sync_master' AND plugin_status = 'DELETED'`
+--let $assert_cond= $plugin_count = 1
+--let $assert_text= Semi-sync not disposed because it is in use
+--source include/assert.inc
+
+SET GLOBAL replication_optimize_for_static_plugin_config = 0;
+--let $plugin_count= `SELECT COUNT(*) FROM information_schema.plugins WHERE plugin_name = 'rpl_semi_sync_master' AND plugin_status = 'DELETED'`
+--let $assert_cond= $plugin_count = 0
+--let $assert_text= Semi-sync disposed because it is no longer in use
+--source include/assert.inc
+
+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_LIB
+--eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'
+UNINSTALL PLUGIN rpl_semi_sync_master;
+--let $plugin_count= `SELECT COUNT(*) FROM information_schema.plugins WHERE plugin_name = 'rpl_semi_sync_master' AND plugin_status = 'DELETED'`
+--let $assert_cond= $plugin_count = 0
+--let $assert_text= Semi-sync disposed because it is no longer in use
+--source include/assert.inc
+
+####################################################################
+# End of tests                                                     #
+####################################################################
+
+--eval SET @@global.replication_optimize_for_static_plugin_config = $saved_global_replication_optimize_for_static_plugin_config
diff --git a/mysql-test/suite/sys_vars/t/replication_sender_observe_commit_only.test b/mysql-test/suite/sys_vars/t/replication_sender_observe_commit_only.test
new file mode 100644
index 000000000000..90a0673f7625
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/replication_sender_observe_commit_only.test
@@ -0,0 +1,110 @@
+# Variable Name: replication_sender_observe_commit_only
+# Scope: Global
+# Access Type: Static
+# Data Type: boolean
+#
+# Creation Date: 2019-12-22
+# Author : Pedro Figueiredo
+
+--source include/not_embedded.inc
+
+--let $saved_global_replication_sender_observe_commit_only = `SELECT @@global.replication_sender_observe_commit_only`
+
+####################################################################
+#   Displaying default value                                       #
+####################################################################
+
+--let $assert_text = Default GLOBAL value is FALSE
+--let $assert_cond = [SELECT @@global.replication_sender_observe_commit_only = 0]
+--source include/assert.inc
+
+####################################################################
+#   Check if Value can set and that P_S reports the correct value  #
+####################################################################
+
+# 1, TRUE, ON, 0, FALSE, OFF
+--let $j=6
+
+while($j>0)
+{
+  if ($j == 6)
+  {
+    --let $to_set = OFF
+    --let $expected = OFF
+  }
+  if ($j == 5)
+  {
+    --let $to_set = FALSE
+    --let $expected = OFF
+  }
+  if ($j == 4)
+  {
+    --let $to_set = 0
+    --let $expected = OFF
+  }
+  if ($j == 3)
+  {
+    --let $to_set = ON
+    --let $expected = ON
+  }
+  if ($j == 2)
+  {
+    --let $to_set = TRUE
+    --let $expected = ON
+  }
+  if ($j == 1)
+  {
+    --let $to_set = 1
+    --let $expected = ON
+  }
+
+  --let $scope = GLOBAL
+  --let $ps_table = global_variables
+
+  --eval SET @@$scope.replication_sender_observe_commit_only = $to_set
+  --let $reported=`SELECT variable_value FROM performance_schema.$ps_table WHERE variable_name = 'replication_sender_observe_commit_only'`
+
+  --let $assert_text= Reported value matches the one set (set $to_set in $scope scope)
+  --let $assert_cond = "$reported" = "$expected"
+  --source include/assert.inc
+
+  --dec $j
+}
+
+####################################################################
+# Privileges                                                       #
+####################################################################
+
+CREATE USER user1;
+--connect(conn_user1,localhost,user1,,)
+
+# assert that one cannot change the value without privileges
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET GLOBAL replication_sender_observe_commit_only = 1;
+
+# assert that one can change the value if SUPER is given
+--connection default
+GRANT SUPER ON *.* TO user1@'%';
+FLUSH PRIVILEGES;
+--connect(conn2_user1,localhost,user1,,)
+SET GLOBAL replication_sender_observe_commit_only = 1;
+
+--connection default
+DROP USER user1;
+
+####################################################################
+# Transactional context                                            #
+####################################################################
+
+BEGIN;
+
+# can change the variable's value in global scope while inside a transaction
+SET GLOBAL replication_sender_observe_commit_only = ON;
+
+ROLLBACK;
+
+####################################################################
+# End of tests                                                     #
+####################################################################
+
+--eval SET @@global.replication_sender_observe_commit_only = $saved_global_replication_sender_observe_commit_only
diff --git a/mysql-test/suite/sys_vars/t/show_create_table_verbosity_basic.test b/mysql-test/suite/sys_vars/t/show_create_table_verbosity_basic.test
new file mode 100644
index 000000000000..b20a555ac87d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/show_create_table_verbosity_basic.test
@@ -0,0 +1,69 @@
+#
+# Show the session value;
+#
+SELECT @@session.show_create_table_verbosity;
+SHOW SESSION VARIABLES LIKE 'show_create_table_verbosity';
+--disable_warnings
+SELECT * FROM information_schema.session_variables WHERE variable_name='show_create_table_verbosity';
+--enable_warnings
+
+--echo #Also can be set as a global variable.
+SELECT @@global.show_create_table_verbosity;
+SHOW GLOBAL VARIABLES LIKE 'show_create_table_verbosity';
+--disable_warnings
+SELECT * FROM information_schema.global_variables WHERE variable_name='show_create_table_verbosity';
+--enable_warnings
+
+--echo #Test setting the variable to various values.
+--echo #Boolean values.
+SET SESSION show_create_table_verbosity= ON;
+SELECT @@session.show_create_table_verbosity;
+
+SET SESSION show_create_table_verbosity= OFF;
+SELECT @@session.show_create_table_verbosity;
+
+SET SESSION show_create_table_verbosity= 1;
+SELECT @@session.show_create_table_verbosity;
+
+SET SESSION show_create_table_verbosity= 0;
+SELECT @@session.show_create_table_verbosity;
+
+--echo #Test for DEFAULT value.
+SET SESSION show_create_table_verbosity= DEFAULT;
+SELECT @@session.show_create_table_verbosity;
+
+--echo #Test for invalid value.
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION show_create_table_verbosity= 2;
+
+--echo #Test for setting the session variable
+--echo #using different syntax.
+SET show_create_table_verbosity= 1;
+
+--echo #Fetches the current session value for the variable.
+SELECT @@show_create_table_verbosity;
+
+--echo #cleanup
+SET SESSION show_create_table_verbosity= DEFAULT;
+
+--echo #Test setting the global value of the variable.
+--echo #Boolean values.
+SET GLOBAL show_create_table_verbosity= ON;
+SELECT @@global.show_create_table_verbosity;
+
+SET GLOBAL show_create_table_verbosity= OFF;
+SELECT @@global.show_create_table_verbosity;
+
+SET GLOBAL show_create_table_verbosity= 1;
+SELECT @@global.show_create_table_verbosity;
+
+SET GLOBAL show_create_table_verbosity= 0;
+SELECT @@session.show_create_table_verbosity;
+
+--echo #Test for DEFAULT value.
+SET GLOBAL show_create_table_verbosity= DEFAULT;
+SELECT @@global.show_create_table_verbosity;
+
+--echo #Test for invalid value.
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL show_create_table_verbosity= 2;
diff --git a/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
index a8ce3a8d0f7a..893d06c2bac0 100644
--- a/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
+++ b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
@@ -74,8 +74,7 @@ DEALLOCATE PREPARE stmt;
 #
 # With a LIMIT Clause
 #
---echo Expected error : Update without key in safe mode
---error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+--echo No error : Update without key in safe mode but with LIMIT
 DELETE FROM t1 LIMIT 2;
 SELECT * FROM t1;
 
@@ -93,7 +92,7 @@ SELECT * FROM t1;
 # With a key WHERE Clause
 #
 --echo This one should work
-DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=3;
 SELECT * FROM t1;
 
 --echo
@@ -118,7 +117,7 @@ SELECT * FROM t1;
 # With a key WHERE Clause
 #
 --echo This one should work
-DELETE FROM t1 WHERE a=1;
+DELETE FROM t1 WHERE a=5;
 SELECT * FROM t1;
 
 --echo '#-----------------------------FN_DYNVARS_164_08------------------------------------#'
diff --git a/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt
index 4d2a19ed4121..e76299453d39 100644
--- a/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt
@@ -1,2 +1 @@
 --innodb_lock_wait_timeout=2
---binlog-format=row
diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
index 9a6ab59c78d1..e76299453d39 100644
--- a/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
+++ b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
@@ -1,2 +1 @@
 --innodb_lock_wait_timeout=2
---binlog-format=row 
diff --git a/mysql-test/suite/sysschema/r/all_sys_objects_exist.result b/mysql-test/suite/sysschema/r/all_sys_objects_exist.result
index d89890f17478..15d9f23c2336 100644
--- a/mysql-test/suite/sysschema/r/all_sys_objects_exist.result
+++ b/mysql-test/suite/sysschema/r/all_sys_objects_exist.result
@@ -158,4 +158,4 @@ sys_config_insert_set_user
 sys_config_update_set_user
 SELECT sys_version FROM sys.version;
 sys_version
-1.5.1
+1.5.2
diff --git a/mysql-test/suite/sysschema/r/pr_ps_setup_reset_to_default.result b/mysql-test/suite/sysschema/r/pr_ps_setup_reset_to_default.result
index 106290286283..c91a6925e6fa 100644
--- a/mysql-test/suite/sysschema/r/pr_ps_setup_reset_to_default.result
+++ b/mysql-test/suite/sysschema/r/pr_ps_setup_reset_to_default.result
@@ -1,7 +1,7 @@
 CALL sys.ps_setup_reset_to_default(TRUE);
 status
 Resetting: setup_actors
-DELETE FROM performance_schema.setup_actors WHERE NOT (HOST = '%' AND USER = '%' AND ROLE = '%')
+DELETE FROM performance_schema.setup_actors WHERE NOT (HOST = '%' AND USER = '%' AND `ROLE` = '%')
 status
 Resetting: setup_actors
 INSERT IGNORE INTO performance_schema.setup_actors VALUES ('%', '%', '%', 'YES', 'YES')
diff --git a/mysql-test/suite/sysschema/r/v_version.result b/mysql-test/suite/sysschema/r/v_version.result
index ac914fc8524f..ff1e351b184e 100644
--- a/mysql-test/suite/sysschema/r/v_version.result
+++ b/mysql-test/suite/sysschema/r/v_version.result
@@ -1,3 +1,3 @@
 SELECT sys_version FROM sys.version;
 sys_version
-1.5.1
+1.5.2
diff --git a/mysql-test/t/alter_table-big.test b/mysql-test/t/alter_table-big.test
index 0aa6e6a044f6..765c6b19e1a2 100644
--- a/mysql-test/t/alter_table-big.test
+++ b/mysql-test/t/alter_table-big.test
@@ -177,3 +177,66 @@ source include/show_binlog_events.inc;
 
 --echo End of 5.1 tests
 --source include/restore_default_binlog_format.inc
+
+--echo #
+--echo # BUG#29375764: SIMPLE ALTER CAUSE UNNECESSARY INNODB INDEX REBUILDS,
+--echo #               5.7.23 OR LATER 5.7 RLSES
+--echo #
+
+############################################################################
+# In 5.7.22:
+# CREATE DATABASE my_db;
+# CREATE TABLE my_db.t1(i INT PRIMARY KEY, v VARCHAR(9), KEY (v));
+#
+# DATADIR NAME: data_50722
+# zip -r data_50722.zip data_50722
+############################################################################
+
+--echo # Copy the zipped 5.7.22 data directory and unzip it.
+--copy_file $MYSQLTEST_VARDIR/std_data/data_50722.zip $MYSQL_TMP_DIR/data_50722.zip
+--file_exists $MYSQL_TMP_DIR/data_50722.zip
+--exec unzip -qo $MYSQL_TMP_DIR/data_50722.zip -d $MYSQL_TMP_DIR
+
+let $DATADIR_50722 = $MYSQL_TMP_DIR/data_50722;
+let $MYSQLD_LOG = $MYSQL_TMP_DIR/data_50722/my_err.log;
+
+# SHUTDOWN
+--source include/shutdown_mysqld.inc
+
+--echo # Restart the server with the 5.7.22 data directory.
+--exec echo "restart: --datadir=$DATADIR_50722 --log-error=$MYSQLD_LOG --innodb_undo_tablespaces=0" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--echo # UPGRADE
+--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
+
+SET DEBUG="+d, assert_index_def_has_no_pack_flag";
+--echo # Without the patch, an assert is triggered, indicating that index definitions
+--echo # have changed that would result in a index rebuild.
+ALTER TABLE my_db.t1 COMMENT "No index rebuild necessary";
+
+--echo # CLEANUP
+DROP TABLE my_db.t1;
+DROP DATABASE my_db;
+
+# SHUTDOWN
+--source include/shutdown_mysqld.inc
+
+--echo # Remove copied files and directories.
+--remove_file $MYSQL_TMP_DIR/data_50722.zip
+--remove_files_wildcard $DATADIR_50722/sys *
+--remove_files_wildcard $DATADIR_50722/mysql *
+--remove_files_wildcard $DATADIR_50722/performance_schema *
+--remove_files_wildcard $DATADIR_50722/test *
+--remove_files_wildcard $DATADIR_50722 *
+--rmdir $DATADIR_50722/sys
+--rmdir $DATADIR_50722/mysql
+--rmdir $DATADIR_50722/performance_schema
+--rmdir $DATADIR_50722/test
+--rmdir $DATADIR_50722
+
+--echo # Restart server with default options.
+--exec echo "restart:" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 4b7a9aba0741..2b01c813bfb1 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -3044,3 +3044,177 @@ ALTER TABLE t1 MODIFY fld0 DATETIME NOT NULL;
 ALTER TABLE t2 MODIFY fld0 POINT NOT NULL;
 
 DROP TABLE t1, t2;
+
+
+--echo #
+--echo # BUG#26848813: INDEXED COLUMN CAN'T BE CHANGED FROM VARCHAR(15)
+--echo #               TO VARCHAR(40) INSTANTANEOUSLY
+
+SET @orig_sql_mode= @@sql_mode;
+SET @orig_innodb_large_prefix= @@global.innodb_large_prefix;
+
+SET GLOBAL innodb_large_prefix= ON;
+
+--echo # Tests where an error is reported under strict mode when the index
+--echo # limit exceeds the maximum supported length by SE.
+
+--error ER_TOO_LONG_KEY
+CREATE TABLE t1 (fld1 VARCHAR(768), KEY(fld1)) CHARSET latin1 ENGINE =InnoDB
+ROW_FORMAT= COMPACT;
+
+--error ER_TOO_LONG_KEY
+CREATE TABLE t2 (fld1 VARCHAR(3073), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+
+--echo # Test with innodb prefix indexes where the index limit is 767 bytes
+CREATE TABLE t1 (fld1 VARCHAR(767), KEY(fld1)) CHARSET latin1 ENGINE=INNODB
+ROW_FORMAT=COMPACT;
+
+--error ER_TOO_LONG_KEY
+ALTER TABLE t1 MODIFY fld1 VARCHAR(768), ALGORITHM= INPLACE;
+
+--error ER_TOO_LONG_KEY
+ALTER TABLE t1 MODIFY fld1 VARCHAR(768), ALGORITHM= COPY;
+
+--echo # Test with innodb prefix indexes where the index limit is 3072 bytes
+CREATE TABLE t2 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE=INNODB
+ROW_FORMAT=DYNAMIC;
+
+--error ER_TOO_LONG_KEY
+ALTER TABLE t2 MODIFY fld1 VARCHAR(3073), ALGORITHM= INPLACE;
+
+--error ER_TOO_LONG_KEY
+ALTER TABLE t2 MODIFY fld1 VARCHAR(3073), ALGORITHM= COPY;
+
+--echo # Tests with innodb_large_prefix disabled and strict mode.
+SET GLOBAL innodb_large_prefix= OFF;
+--error ER_TOO_LONG_KEY
+CREATE TABLE t3 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+
+DROP TABLE t1, t2;
+
+SET sql_mode= '';
+SET GLOBAL innodb_large_prefix= ON;
+
+--enable_warnings
+
+--echo # Test where the indexes are truncated to fit the index limit and
+--echo # a warning is reported under non-strict mode when the index exceeds
+--echo # the SE limit.
+CREATE TABLE t1 (fld1 VARCHAR(768), KEY(fld1)) ENGINE= InnoDB
+ROW_FORMAT=COMPACT;
+CREATE TABLE t2 (fld1 VARCHAR(3073), KEY(fld1)) ENGINE= InnoDB;
+
+--echo # Test with innodb prefix indexes where the index limit is 767 bytes.
+CREATE TABLE t3 (fld1 VARCHAR(767), KEY(fld1))ENGINE=INNODB ROW_FORMAT=COMPACT;
+
+ALTER TABLE t3 MODIFY fld1 VARCHAR(768), ALGORITHM= INPLACE;
+
+ALTER TABLE t3 MODIFY fld1 VARCHAR(800), ALGORITHM= COPY;
+
+--echo # Test with innodb prefix indexes where the index limit is 3072 bytes.
+CREATE TABLE t4 (fld1 VARCHAR(3072), KEY(fld1))ENGINE=INNODB
+ROW_FORMAT=DYNAMIC;
+
+ALTER TABLE t4 MODIFY fld1 VARCHAR(3073), ALGORITHM= INPLACE;
+
+ALTER TABLE t4 MODIFY fld1 VARCHAR(3074), ALGORITHM= COPY;
+
+--echo # For unique and primary keys, an error is reported even in non-strict
+--echo # mode.
+
+--error ER_TOO_LONG_KEY
+CREATE TABLE t5(fld1 VARCHAR(768) PRIMARY KEY) ENGINE= InnoDB
+ROW_FORMAT=COMPACT;
+
+--error ER_TOO_LONG_KEY
+CREATE TABLE t5(fld1 VARCHAR(3073), UNIQUE KEY(fld1)) ENGINE= InnoDB;
+
+--echo # Tests with innodb_large_prefix disabled and strict mode.
+SET GLOBAL innodb_large_prefix= OFF;
+CREATE TABLE t5 (fld1 VARCHAR(3072), KEY(fld1)) CHARSET latin1 ENGINE= InnoDB;
+
+--disable_warnings
+DROP TABLE t1, t2, t3, t4, t5;
+
+SET sql_mode= @orig_sql_mode;
+SET GLOBAL innodb_large_prefix= ON;
+
+--echo # Tests added for coverage.
+CREATE TABLE t1(fld1 VARCHAR(3), KEY(fld1)) ENGINE=MYISAM;
+
+--echo # Conversion of unpacked keys to packed keys reports
+--echo # error for INPLACE Alter.
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER TABLE t1 MODIFY fld1 VARCHAR(10), ALGORITHM=INPLACE;
+
+--echo # Succeeds with index rebuild.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(10), ALGORITHM=COPY;
+
+--echo # Succeeds since the row format is dynamic.
+CREATE TABLE t2(fld1 VARCHAR(768), KEY(fld1)) ENGINE= InnoDB ROW_FORMAT= DYNAMIC;
+
+--echo # An error is reported when the index exceeds the column size
+--echo # in both strict and non-strict mode.
+--error ER_WRONG_SUB_KEY
+ALTER TABLE t2 ADD INDEX idx1(fld1(769));
+
+SET sql_mode= '';
+
+--error ER_WRONG_SUB_KEY
+ALTER TABLE t2 ADD INDEX idx1(fld1(769));
+
+--echo # Cleanup.
+DROP TABLE t1, t2;
+SET sql_mode= @orig_sql_mode;
+SET GLOBAL innodb_large_prefix= @orig_innodb_large_prefix;
+
+--echo #
+--echo # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS
+--echo #
+
+--enable_warnings
+SET GLOBAL max_allowed_packet=17825792;
+
+--connect(con1, localhost, root,,)
+CREATE TABLE t1 (t1_fld1 TEXT) ENGINE=InnoDB;
+CREATE TABLE t2 (t2_fld1 MEDIUMTEXT) ENGINE=InnoDB;
+CREATE TABLE t3 (t3_fld1 LONGTEXT) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (REPEAT('a',300));
+INSERT INTO t2 VALUES (REPEAT('b',65680));
+INSERT INTO t3 VALUES (REPEAT('c',16777300));
+
+SELECT LENGTH(t1_fld1) FROM t1;
+SELECT LENGTH(t2_fld1) FROM t2;
+SELECT LENGTH(t3_fld1) FROM t3;
+
+--echo # With strict mode
+SET SQL_MODE='STRICT_ALL_TABLES';
+
+--error ER_DATA_TOO_LONG
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+--error ER_DATA_TOO_LONG
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+--error ER_DATA_TOO_LONG
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+
+--echo # With non-strict mode
+SET SQL_MODE='';
+
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+
+SELECT LENGTH(my_t1_fld1) FROM t1;
+SELECT LENGTH(my_t2_fld1) FROM t2;
+SELECT LENGTH(my_t3_fld1) FROM t3;
+
+# Cleanup
+--disconnect con1
+--source include/wait_until_disconnected.inc
+
+--connection default
+DROP TABLE t1, t2, t3;
+
+SET SQL_MODE=default;
+SET GLOBAL max_allowed_packet=default;
diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test
index 1858894efb06..ac3b68d47def 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/t/bigint.test
@@ -458,4 +458,28 @@ SELECT (184467440737095 BETWEEN 0 AND 18446744073709551500);
 
 SELECT 184467440737095 >= 0;
 SELECT 0 <= 18446744073709551500;
+
+--echo #
+--echo # Bug#22501606 SELECT CAST(100 AS UNSIGNED) BETWEEN 1 AND -1 RETURNS TRUE
+--echo # Bug#79857 select cast(100 as unsigned) between 1 and -1 returns true
+--echo #
+
+SELECT CAST(100 AS UNSIGNED) BETWEEN 1 AND -1;
+SELECT CAST(100 AS UNSIGNED) NOT BETWEEN 1 AND -1;
+
+SELECT CAST(0 AS UNSIGNED) BETWEEN 0 AND -1;
+SELECT CAST(0 AS UNSIGNED) NOT BETWEEN 0 AND -1;
+
+--echo #
+--echo # Bug #27691347: BETWEEN CLAUSE RETURNS INCOHERENT RESULTS COMPARING
+--echo #                NEGATIVE VALUES
+
+CREATE TABLE Reservation (id BIGINT UNSIGNED NOT NULL,
+                          transaction_id BIGINT UNSIGNED NOT NULL DEFAULT '0',
+                          KEY transaction_id_idx (transaction_id));
+INSERT INTO Reservation(id, transaction_id) VALUES(1, 1);
+
+SELECT COUNT(*) FROM Reservation WHERE transaction_id BETWEEN -2 AND -1;
+DROP TABLE Reservation;
+
 SET sql_mode = default;
diff --git a/mysql-test/t/binary.test b/mysql-test/t/binary.test
index 8e12a4176799..596e78bfcf4f 100644
--- a/mysql-test/t/binary.test
+++ b/mysql-test/t/binary.test
@@ -124,6 +124,7 @@ INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029087575');
 INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029082020');
 INSERT INTO t1 SET a=unhex('1F9480179366F2BF567E1C4B964C1EF029080707');
 
+ANALYZE table t1;
 SELECT hex(a) FROM t1 order by a;
 --replace_result 4 3
 EXPLAIN SELECT hex(a) FROM t1 order by a;
diff --git a/mysql-test/t/bug12368203.test b/mysql-test/t/bug12368203.test
index 313d3c3072ae..f0c0fb4ded44 100644
--- a/mysql-test/t/bug12368203.test
+++ b/mysql-test/t/bug12368203.test
@@ -12,7 +12,7 @@ connection master;
 # Test 'flush-logs error' command.
 #
 --echo # Test if mysqladmin supports 'flush-logs error' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs error
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs error
 
 file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
 
@@ -32,7 +32,7 @@ connection master;
 # Test 'flush-logs relay' command.
 #
 --echo # Test if mysqladmin supports 'flush-logs relay' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs relay
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs relay
 
 --source include/sync_slave_sql_with_master.inc
 --echo # Check if 'slave-relay-bin.000003' file is created
@@ -49,7 +49,7 @@ file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000002;
 # Test 'flush-logs slow' command.
 #
 --echo # Test if mysqladmin supports 'flush-logs slow' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs slow
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs slow
 
 --echo # Make sure binary logs were not be flushed
 --echo # after executing 'flush-logs slow' command.
@@ -60,7 +60,7 @@ file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000002;
 # Test 'flush-logs general' command.
 #
 --echo # Test if mysqladmin supports 'flush-logs general' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs general
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs general
 
 --echo # Make sure binary logs were not flushed
 --echo # after execute 'flush-logs general' command.
@@ -71,7 +71,7 @@ file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000002;
 # Test 'flush-logs engine' command.
 #
 --echo # Test if mysqladmin supports 'flush-logs engine' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs engine
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs engine
 
 --echo # Make sure binary logs were not flushed
 --echo # after execute 'flush-logs engine' statement.
@@ -87,7 +87,7 @@ file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000002;
 file_exists $MYSQLTEST_VARDIR/mysqld.1/data/master-bin.000002;
 
 --echo # Test if mysqladmin supports 'flush-logs binary' command.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs binary
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs binary
 
 --echo # Check if 'master-bin.000002' file is created
 --echo # after execution of 'flush-logs binary' statement.
@@ -104,7 +104,7 @@ file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000006;
 connection master;
 
 --echo # Test if mysqladmin support combining multiple kinds of logs into one statement.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs error relay
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs error relay
 
 file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
 
@@ -136,7 +136,7 @@ connection master;
 
 --echo # Test if 'flush-logs' command works fine and flush all the logs.
 
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs
 
 file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
 
@@ -156,10 +156,10 @@ file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000008;
 --echo # Test multiple options to flush-logs
 
 --echo # Must work
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs binary error ping
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs binary error ping
 
 --echo # Must work
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs ping
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs ping
 
 --error 1
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs pong 2>&1
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT flush-logs pong 2>&1
diff --git a/mysql-test/t/compare.test b/mysql-test/t/compare.test
index 3a709503b8fa..64bde98aa070 100644
--- a/mysql-test/t/compare.test
+++ b/mysql-test/t/compare.test
@@ -101,3 +101,32 @@ SET sql_mode = default;
 CREATE TABLE t1(a INT ZEROFILL);
 SELECT 1 FROM t1 WHERE t1.a IN (1, t1.a) AND t1.a=2;
 DROP TABLE t1;
+
+#
+# Bug#27897053  ILLEGAL MIX OF COLLATIONS WHEN DATE_FORMAT ON THE RIGHT SIDE
+# OF OPERATION
+#
+
+SET NAMES utf8;
+
+CREATE TABLE t1(id INT, plage TIME, plage2 DATETIME) ENGINE=InnoDB CHARSET=utf8;
+INSERT INTO t1 VALUES(1,'00:00:00', '2018-04-20 00:00:00');
+
+SELECT (date_format(plage2,'%H:%i:%s')) < plage FROM t1;
+SELECT plage > (date_format(plage2,'%H:%i:%s')) FROM t1;
+SELECT (date_format(plage2,'%H:%i:%s')) < plage COLLATE utf8_general_ci FROM t1;
+
+DROP TABLE t1;
+SET NAMES default;
+
+--echo
+--echo Bug #27452148: ASSERTION FAILED: (SLEN % 4) == 0 IN
+--echo                MY_STRNNCOLLSP_UTF32_BIN
+--echo
+SET NAMES latin1;
+CREATE TABLE t1(a CHAR(10) CHARACTER SET utf32 COLLATE utf32_bin);
+INSERT INTO t1 VALUES('a'),('b'),('c');
+SELECT ROW('1', '1') > ROW(a, '1') FROM t1;
+SELECT ROW(a, '1') > ROW('1', '1') FROM t1;
+DROP TABLE t1;
+SET NAMES default;
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index fcfb944492d2..8953e910374b 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -438,10 +438,10 @@ ALTER USER wl6587@localhost PASSWORD EXPIRE;
 --echo # mysqladmin non-password should fail
 --replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/
 --error 1
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uwl6587 --password=wl6587 status 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uwl6587 --password=wl6587 status 2>&1
 
 --echo # mysqladmin password should work
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uwl6587 --password=wl6587 password wl6587-2 --ssl-mode=REQUIRED 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uwl6587 --password=wl6587 password wl6587-2 --ssl-mode=REQUIRED 2>&1
 
 DROP USER wl6587@localhost;
 
@@ -450,6 +450,66 @@ DROP USER wl6587@localhost;
 --echo # -- End of 5.6 tests
 --echo # ------------------------------------------------------------------
 
+--echo #
+--echo # BUG#27539838: NOT ALL ABORTED CONNECTS ARE REPORTED TO ERROR.LOG
+--echo #               PROPERLY
+--echo #
+
+--let LOG_ERR=$MYSQLTEST_VARDIR/tmp/myerror.err
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/myerror.err
+
+--let restart_parameters="restart: --log-error=$LOG_ERR --log-error-verbosity=3"
+--replace_result $LOG_ERR LOG_ERR
+--source include/restart_mysqld.inc
+
+SHOW STATUS LIKE 'Aborted_connects';
+
+--echo
+--echo # Case 1: Connection attempt by an invalid user
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_ACCESS_DENIED_ERROR
+connect(con1,localhost,newuser,,);
+
+--let SEARCH_PATTERN= Access denied for user 'newuser'@'localhost' \(using password: NO\)
+--source include/search_pattern_in_file.inc
+
+--echo
+--echo # Case 2: Connection attempt by a valid user with incorrect password
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_ACCESS_DENIED_ERROR
+connect(con1,localhost,root,1234,);
+
+--let SEARCH_PATTERN= Access denied for user 'root'@'localhost' \(using password: YES\)
+--source include/search_pattern_in_file.inc
+
+# Creating a dummy database and an user with no privileges to access that database
+--connection default
+CREATE DATABASE test1;
+CREATE USER 'new1'@'localhost';
+
+--echo
+--echo # Case 3: Connection attempt by a valid user with no privileges to access a database
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_DBACCESS_DENIED_ERROR
+connect(con1,localhost,new1,,test1);
+
+--let SEARCH_PATTERN= Access denied for user 'new1'@'localhost' to database 'test1'
+--source include/search_pattern_in_file.inc
+
+--echo
+--echo # Case 4: SSL connection attempt without necessary certificates
+--error 1
+--exec $MYSQL --user=root --ssl-mode=VERIFY_CA
+
+--let SEARCH_PATTERN= Got an error reading communication packets
+--source include/search_pattern_in_file.inc
+
+SHOW STATUS LIKE 'Aborted_connects';
+
+# Cleanup
+DROP USER 'new1'@'localhost';
+DROP DATABASE test1;
+--remove_file $LOG_ERR
 
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 88459a9f89d3..df0552d63d5a 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1812,3 +1812,133 @@ DROP DATABASE db_created_with_mkdir_and_an_unrelated_file_in_data_directory;
 # Cleanup
 --remove_file $MYSQLD_DATADIR/db_created_with_mkdir_and_an_unrelated_file_in_data_directory/intruder.txt
 DROP DATABASE db_created_with_mkdir_and_an_unrelated_file_in_data_directory;
+
+
+--echo #
+--echo # BUG 27516741 - MYSQL SERVER DOES NOT WRITE INNODB ROW_TYPE
+--echo #                TO .FRM FILE WHEN DEFAULT USED
+
+--echo # Set up.
+SET @saved_innodb_default_row_format= @@global.innodb_default_row_format;
+SET @saved_show_create_table_verbosity= @@session.show_create_table_verbosity;
+
+--echo # Current InnoDB default row format and 'show_create_table_verbosity'
+--echo # values respectively.
+SELECT @@global.innodb_default_row_format;
+SELECT @@session.show_create_table_verbosity;
+
+CREATE TABLE t1(fld1 INT) ENGINE= InnoDB;
+CREATE TABLE t2(fld1 INT) ENGINE= InnoDB, ROW_FORMAT= DEFAULT;
+SET GLOBAL innodb_default_row_format= 'COMPACT';
+CREATE TABLE t3(fld1 INT) ENGINE= InnoDB;
+CREATE TABLE t4(fl1 INT) ENGINE= InnoDB, ROW_FORMAT= COMPRESSED;
+
+--echo # Test without show_create_table_verbosity enabled.
+--echo # Row format used is not displayed for all tables
+--echo # except t4 where it is explicitly specified.
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+SHOW CREATE TABLE t4;
+
+--echo # Test with show_create_table_verbosity enabled.
+--echo # Row format used is displayed for all tables.
+SET SESSION show_create_table_verbosity= ON;
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+SHOW CREATE TABLE t4;
+
+SET GLOBAL innodb_default_row_format= 'DYNAMIC';
+SET SESSION show_create_table_verbosity= OFF;
+
+--echo # Test with corresponding temporary tables.
+CREATE TEMPORARY TABLE t1(fld1 INT) ENGINE= InnoDB;
+CREATE TEMPORARY TABLE t2(fld1 INT) ENGINE= InnoDB, ROW_FORMAT= DEFAULT;
+SET GLOBAL innodb_default_row_format= 'COMPACT';
+CREATE TEMPORARY TABLE t3(fld1 INT) ENGINE= InnoDB;
+CREATE TEMPORARY TABLE t4(fl1 INT) ENGINE= InnoDB, ROW_FORMAT= COMPRESSED;
+
+--echo # Test without show_create_table_verbosity enabled.
+--echo # Row format used is not displayed for all tables
+--echo # except t4 where it is explicitly specified.
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+SHOW CREATE TABLE t4;
+
+--echo # Test with show_create_table_verbosity enabled.
+--echo # Row format used is displayed for all tables.
+SET SESSION show_create_table_verbosity= ON;
+SHOW CREATE TABLE t1;
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+SHOW CREATE TABLE t4;
+
+--echo # Clean up.
+DROP TABLE t1, t2, t3, t4;
+DROP TABLE t1, t2, t3, t4;
+SET GLOBAL innodb_default_row_format= @saved_innodb_default_row_format;
+SET SESSION show_create_table_verbosity= @saved_show_create_table_verbosity;
+
+
+--echo #
+--echo # Bug#28022129: NOW() DOESN?T HONOR NO_ZERO_DATE SQL_MODE
+--echo #
+
+SET @saved_mode= @@sql_mode;
+
+CREATE TABLE t1(fld1 int);
+
+--echo # NO_ZERO_DATE and STRICT SQL mode.
+
+CREATE TABLE t2 SELECT fld1, CURDATE() fld2 FROM t1;
+CREATE TABLE t3 AS SELECT now();
+
+--echo # With patch, zero date is not generated as default.
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+DROP TABLE t2, t3;
+
+SET SQL_MODE= "NO_ZERO_DATE";
+
+--echo # NO_ZERO_DATE SQL mode.
+CREATE TABLE t2 SELECT fld1, CURDATE() fld2 FROM t1;
+CREATE TABLE t3 AS SELECT now();
+
+--echo # Zero date is generated as default in non strict mode.
+SHOW CREATE TABLE t2;
+SHOW CREATE TABLE t3;
+DROP TABLE t1, t2, t3;
+
+SET SQL_MODE= DEFAULT;
+
+--echo # Test cases added for coverage.
+
+CREATE TABLE t1(fld1 DATETIME NOT NULL DEFAULT '1111:11:11');
+
+--echo # CREATE TABLE..SELECT using fields of another table.
+CREATE TABLE t2 AS SELECT * FROM t1;
+--echo # Default value is copied from the source table column.
+SHOW CREATE TABLE t2;
+
+DROP TABLE t1, t2;
+
+--echo # CREATE TABLE..SELECT based on trigger fields.
+CREATE TABLE t1 (fld1 INT, fld2 DATETIME DEFAULT '1211:1:1');
+
+DELIMITER |;
+CREATE TRIGGER t1_bi BEFORE INSERT ON t1
+FOR EACH ROW
+BEGIN
+  CREATE TEMPORARY TABLE t2 AS SELECT NEW.fld1, NEW.fld2;
+END
+|
+DELIMITER ;|
+
+INSERT INTO t1 VALUES (1, '1111:11:11');
+SHOW CREATE TABLE t2;
+
+DROP TABLE t1;
+DROP TEMPORARY TABLE t2;
+SET SQL_MODE= @saved_mode;
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 219f117ee504..8baed1e0ae83 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -256,7 +256,7 @@ DO CONVERT(CAST(SUBSTRING_INDEX(FORMAT(1,'1111'), FORMAT('','Zpq'),1)
 
 --echo #
 --echo # WL#1213 Implement 4-byte UTF8, UTF16 and UTF32
---echo # Testing that only utf8mb4 is superset for utf8
+--echo # Testing that utf8mb4 and utf32 are superset for all Unicode
 --echo # No other Unicode character set pairs have superset/subset relations
 --echo #
 
@@ -269,34 +269,28 @@ CREATE TABLE t1 (
 );
 INSERT INTO t1 VALUES ('','','','','');
 
-# utf8mb4 is superset only for utf8
+# utf8mb4 and utf32 are the only supersets for utf8
 SELECT CHARSET(CONCAT(utf8, utf8mb4)) FROM t1;
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8, ucs2)) FROM t1;
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8, utf16)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8, utf32)) FROM t1;
 
 
-# utf8mb4 is superset only for utf8
+# utf8mb4 is superset for everything
 SELECT CHARSET(CONCAT(utf8mb4, utf8)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8mb4, ucs2)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8mb4, utf16)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf8mb4, utf32)) FROM t1;
 
 
 # ucs2 is not a superset for the other Unicode character sets
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(ucs2, utf8)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(ucs2, utf8mb4)) FROM t1;
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(ucs2, utf16)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(ucs2, utf32)) FROM t1;
 
 
@@ -305,20 +299,14 @@ SELECT CHARSET(CONCAT(ucs2, utf32)) FROM t1;
 SELECT CHARSET(CONCAT(utf16, utf8)) FROM t1;
 --error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf16, ucs2)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf16, utf8mb4)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf16, utf32)) FROM t1;
 
 
-# utf32 is not a superset for the other Unicode character sets
---error ER_CANT_AGGREGATE_2COLLATIONS
+# utf32 is a superset for the other Unicode character sets
 SELECT CHARSET(CONCAT(utf32, utf8)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf32, ucs2)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf32, utf8mb4)) FROM t1;
---error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CHARSET(CONCAT(utf32, utf16)) FROM t1;
 
 DROP TABLE t1;
diff --git a/mysql-test/t/ctype_uca.test b/mysql-test/t/ctype_uca.test
index 3cfeb3dd3b3e..019a31f8d5ae 100644
--- a/mysql-test/t/ctype_uca.test
+++ b/mysql-test/t/ctype_uca.test
@@ -553,30 +553,11 @@ SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_ci;
 
 -- source include/not_embedded.inc
 
-# Creating a temporary file for Index.xml
---copy_file $MYSQL_CHARSETSDIR/Index.xml $MYSQLTEST_VARDIR/temp.xml
---remove_file $MYSQL_CHARSETSDIR/Index.xml
-
-# Adding an unknown collation with invalid grammer rules.
-# Please make sure the id is not used by any existing collations.
---write_file $MYSQL_CHARSETSDIR/Index.xml
-<?xml version='1.0' encoding="utf-8"?>
-<charsets max-id="99">
-<charset name="utf8">
-  <family>Unicode</family>
-  <description>UTF-8 Unicode</description>
-  <alias>utf-8</alias>
-  <collation name="utf8_test"            id="999">
-    <rules>
-      <reset>A</reset>
-    </rules>
-  </collation>
-</charset>
-</charsets>
-EOF
-
-# Restart the server
--- source include/restart_mysqld.inc
+--echo #
+--echo # Restart the server with a collation with invalid grammar rules.
+--let $restart_parameters=restart:--character-sets-dir=$MYSQL_TEST_DIR/std_data/bug16204175/
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--source include/restart_mysqld.inc
 
 --echo # Check whether the new collation is loaded after restart
 SHOW COLLATION LIKE 'utf8_test';
@@ -590,10 +571,11 @@ CREATE TABLE t1(id INT PRIMARY KEY, c CHAR(1) COLLATE utf8_test);
 call mtr.add_suppression("Shift expected at '' for COLLATION : utf8_test");
 
 # Cleanup
---remove_file $MYSQL_CHARSETSDIR/Index.xml
---copy_file $MYSQLTEST_VARDIR/temp.xml $MYSQL_CHARSETSDIR/Index.xml
---remove_file $MYSQLTEST_VARDIR/temp.xml
--- source include/restart_mysqld.inc
+--echo #
+--echo # Restart server with original character sets dir:
+--let $restart_parameters=restart:--character-sets-dir=$MYSQL_CHARSETSDIR
+--replace_result $MYSQL_CHARSETSDIR MYSQL_CHARSETSDIR
+--source include/restart_mysqld.inc
 
 --echo #
 --echo # End of 5.6 tests
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test
index 7ca0dbc9fc6f..1460d52e6011 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -411,3 +411,53 @@ do str_to_date(1, "%#");
 --echo #
 
 do timestamp(date_format('2011-11-11', right("12345" + 1, 3)));
+
+--echo #
+--echo # Bug #25949639: DATE FORMAT 'YYYYMMDD' ISN'T RECOGNIZED IN LEFT JOIN
+--echo #
+
+CREATE TABLE t1 (a varchar(10), PRIMARY KEY (a));
+CREATE TABLE t2 (a varchar(10), b date, PRIMARY KEY(a,b));
+CREATE TABLE t3 (a varchar(10), b TIME, PRIMARY KEY(a,b));
+INSERT INTO t1 VALUES ('test1');
+INSERT INTO t2 VALUES
+('test1','2016-12-13'),('test1','2016-12-14'),('test1','2016-12-15');
+INSERT INTO t3 VALUES
+('test1','11:13:14'), ('test1','12:13:14'), ('test1','10:13:14');
+
+let query1=
+SELECT *
+FROM t1 LEFT JOIN t2
+  ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+
+let query2=
+SELECT *
+FROM t1 LEFT JOIN t2 IGNORE INDEX(PRIMARY)
+  ON t2.a = 'test1' AND t2.b = '20161213'
+WHERE t1.a = 'test1';
+
+eval EXPLAIN $query1;
+eval EXPLAIN $query2;
+eval $query1;
+eval $query2;
+
+SELECT b, b = '20161213',
+       CASE b WHEN '20161213' then 'found' ELSE 'not found' END FROM t2;
+SELECT b, b IN ('20161213'), b in ('20161213', 0) FROM t2;
+
+#Uses datatype TIME
+SELECT b, b = '121314',
+       CASE b WHEN '121314' then 'found' ELSE 'not found' END FROM t3;
+SELECT b, b in ('121314'), b in ('121314', 0) FROM t3;
+
+DROP TABLE t1, t2, t3;
+
+--echo #
+--echo # Bug#34704094: Mysql str_to_date can correct convert for '2022-11-30'
+--echo #
+
+SELECT STR_TO_DATE('31/11/22', '%d/%m/%Y');
+SELECT STR_TO_DATE('2023-02-31','%Y-%m-%d');
+SELECT STR_TO_DATE('2004.09.12 10:61:59','%Y.%m.%d %T');
+SELECT STR_TO_DATE('0000-00-00','%Y-%m-%d');
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index 05313f71f132..c832569b5de8 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -146,8 +146,9 @@ INSERT INTO t2 VALUES(10),(20);
 
 SET SESSION sql_safe_updates=1;
 
+EXPLAIN DELETE t2 FROM t1 JOIN t2 WHERE t1.a = 10;
 -- error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
-DELETE t1 FROM t1 JOIN t2 WHERE t1.a = 10;
+DELETE t2 FROM t1 JOIN t2 WHERE t1.a = 10;
 
 SET SESSION sql_safe_updates=default;
 
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index d98285492436..29c42147791c 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -2899,3 +2899,44 @@ eval $query1;
 SET optimizer_switch = default;
 
 DROP TABLE t1, t2, t3, t4;
+
+--echo # Bug#30488700: Mysql chooses different execution plan in 5.7
+
+CREATE TABLE tbl1 (
+  id BIGINT NOT NULL,
+  rec_id INTEGER NOT NULL,
+  id_value2 BIGINT DEFAULT NULL,
+  PRIMARY KEY (id, rec_id)
+) ENGINE=INNODB;
+
+CREATE TABLE tbl2 (
+  t_id BIGINT NOT NULL,
+  s_date DATETIME DEFAULT NULL,
+  PRIMARY KEY (t_id)
+) ENGINE=INNODB;
+
+let select_statement =
+SELECT t1.rec_id
+FROM tbl1 AS t1 INNER JOIN
+       (SELECT a.id, a.rec_id,s_date
+        FROM tbl2 AS b, tbl1 AS a
+        WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+        ORDER BY s_date DESC) t2
+     ON t1.id = t2.id AND t1.rec_id = t2.rec_id;
+
+let update_statement =
+UPDATE tbl1 AS t1 INNER JOIN
+       (SELECT a.id, a.rec_id, b.s_date
+        FROM tbl2 AS b, tbl1 AS a
+        WHERE a.id_value2 = b.t_id AND a.id = 6889877970355107670
+        ORDER BY s_date DESC) t2
+       ON t1.id = t2.id AND t1.rec_id = t2.rec_id
+SET t1.rec_id = @ROWNUM:= @ROWNUM+1;
+
+SET @ROWNUM = 0;
+eval $select_statement;
+eval $update_statement;
+eval explain $select_statement;
+eval explain $update_statement;
+
+DROP TABLE tbl1, tbl2;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index ea40266fee8a..dc18c8418388 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -17,3 +17,4 @@ mysql_client_test_embedded : Bug#16084066 2013-01-08 Disabled since this test is
 ssl-big                  : Bug #18977126 MAIN.SSL-BIG FAILS WITH TIMEOUT Times out on weekly, disable it
 explain_for_connection_rqg_json  : Bug#20697533 2015-03-20 erlend Fails several times each day on all platforms
 explain_for_connection_rqg_trad : Bug#20697533 2015-03-20 erlend Fails several times each day on all platforms
+daemonize_opt : Bug#31335773 2020-05-12 Deepa Shutdown_report fails
diff --git a/mysql-test/t/disconnect_on_expired_password_default.test b/mysql-test/t/disconnect_on_expired_password_default.test
index d73c0ec124e8..3a048d462cca 100644
--- a/mysql-test/t/disconnect_on_expired_password_default.test
+++ b/mysql-test/t/disconnect_on_expired_password_default.test
@@ -44,8 +44,8 @@ ALTER USER 'bernt' PASSWORD EXPIRE;
 --echo # Doing something should not connect
 --replace_result $MYSQLADMIN MYSQLADMIN
 --error 1
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT --user=bernt --password=secret reload 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT --user=bernt --password=secret reload 2>&1
 --echo # Setting password should succeed
---exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret --ssl-mode=REQUIRED 2>&1
+--exec $MYSQLADMIN --no-defaults --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret --ssl-mode=REQUIRED 2>&1
 
 DROP USER 'bernt';
diff --git a/mysql-test/t/disconnect_on_expired_password_off.test b/mysql-test/t/disconnect_on_expired_password_off.test
index 64a5bb6c4a21..9d700cae4300 100644
--- a/mysql-test/t/disconnect_on_expired_password_off.test
+++ b/mysql-test/t/disconnect_on_expired_password_off.test
@@ -42,8 +42,8 @@ ALTER USER 'bernt' PASSWORD EXPIRE;
 --echo # Doing something should connect but fail
 --replace_result $MYSQLADMIN MYSQLADMIN
 --error 1
---exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT reload 2>&1
+--exec $MYSQLADMIN --no-defaults --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT reload 2>&1
 --echo # Setting password should succeed
---exec $MYSQLADMIN --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret --ssl-mode=REQUIRED 2>&1
+--exec $MYSQLADMIN --no-defaults --user=bernt --password=secret -S $MASTER_MYSOCK -P $MASTER_MYPORT password newsecret --ssl-mode=REQUIRED 2>&1
 
 DROP USER 'bernt';
diff --git a/mysql-test/t/events_1.test b/mysql-test/t/events_1.test
index 3ae35628fe0d..04824c674f51 100644
--- a/mysql-test/t/events_1.test
+++ b/mysql-test/t/events_1.test
@@ -68,7 +68,7 @@ drop event event2;
 CREATE EVENT event_starts_test ON SCHEDULE EVERY 10 SECOND COMMENT "" DO SELECT 1;
 SELECT interval_field, interval_value, body FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
-ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02';
+ALTER EVENT event_starts_test ON SCHEDULE AT date_add(now(), interval 5 day);
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 ALTER EVENT event_starts_test COMMENT "non-empty comment";
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
@@ -76,7 +76,7 @@ ALTER EVENT event_starts_test COMMENT "";
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 DROP EVENT event_starts_test;
 
-CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '2020-02-02 20:00:02' ENDS '2022-02-02 20:00:02' DO SELECT 2;
+CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS date_add(now(), interval 5 day) ENDS date_add(now(), interval 10 day) DO SELECT 2;
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
 ALTER EVENT event_starts_test COMMENT "non-empty comment";
 SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test
index 73a5e4a07015..40a85abd4b25 100644
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/t/events_bugs.test
@@ -223,11 +223,11 @@ create event e_55 on schedule at 20000101000000 do drop table t;
 show events;
 
 --error ER_PARSE_ERROR
-create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 starts 10000101000000 do drop table t;
 --error ER_PARSE_ERROR
-create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 ends 10000101000000 do drop table t;
 --error ER_PARSE_ERROR
-create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;
+create event e_55 on schedule at 20380101000000 starts 10000101000000 ends 10000101000000 do drop table t;
 --error ER_WRONG_VALUE
 create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;
 
@@ -730,7 +730,7 @@ SHOW EVENTS;
 
 # This will update event time zone.
 SET TIME_ZONE= '-03:00';
-ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2030-01-03 00:00:00'
+ALTER EVENT e1 ON SCHEDULE EVERY 1 DAY ENDS '2038-01-03 00:00:00'
   ON COMPLETION PRESERVE DISABLE;
 SHOW EVENTS;
 
@@ -1043,7 +1043,7 @@ SET GLOBAL READ_ONLY = 1;
 --echo
 
 --error ER_OPTION_PREVENTS_STATEMENT
-CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
 
 --echo
 
@@ -1067,7 +1067,7 @@ DROP EVENT e1;
 
 --echo
 
-CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1;
+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1;
 
 --echo
 
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
index 986cb92fe478..d7288a7028ee 100644
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/t/file_contents.test
@@ -52,7 +52,6 @@ if ($dir_bin =~ m|/usr/|) {
 } else {
   # tar.gz package, Windows, or developer work (in git)
   $dir_docs = $dir_bin;
-  $dir_docs =~ s|/lib||;
   if(-d "$dir_docs/docs") {
     $dir_docs = "$dir_docs/docs"; # package
   } else {
diff --git a/mysql-test/t/flush_read_lock.test b/mysql-test/t/flush_read_lock.test
index 6541639df33e..83db371518e2 100644
--- a/mysql-test/t/flush_read_lock.test
+++ b/mysql-test/t/flush_read_lock.test
@@ -1492,6 +1492,7 @@ let $skip_3rd_check= ;
 --echo # 31.d.I) SET PASSWORD is incompatible with FTWRL as it changes data.
 create user mysqltest_u1;
 let $statement= ALTER USER 'mysqltest_u1' IDENTIFIED BY '';
+let $waitfor= ALTER USER 'mysqltest_u1'@'%' IDENTIFIED WITH 'mysql_native_password';
 let $cleanup_stmt1= ;
 --echo # Skip last part of compatibility testing as our helper debug
 --echo # sync-point doesn't work for SET statements.
@@ -1844,6 +1845,7 @@ xa end 'test1';
 xa prepare 'test1';
 --echo # Disconnect temporary connection
 disconnect con_tmp;
+--source include/wait_until_disconnected.inc
 --echo # Create temporary connection for XA transaction.
 connect (con_tmp,localhost,root,,);
 xa start 'test2';
@@ -1852,6 +1854,7 @@ xa end 'test2';
 xa prepare 'test2';
 --echo # Disconnect temporary connection
 disconnect con_tmp;
+--source include/wait_until_disconnected.inc
 --echo # Switching to connection '$con_aux1'.
 connection $con_aux1;
 flush tables with read lock;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 38f08cadd7bd..803252aedbb8 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -361,9 +361,7 @@ DROP TABLE t1;
 
 CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a));
 INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 
 #
 # BUG#5686 - #1034 - Incorrect key file for table - only utf8
diff --git a/mysql-test/t/func_aes_kdf_hkdf.test b/mysql-test/t/func_aes_kdf_hkdf.test
new file mode 100644
index 000000000000..fe23649b0b7e
--- /dev/null
+++ b/mysql-test/t/func_aes_kdf_hkdf.test
@@ -0,0 +1,43 @@
+--source include/have_openssl_version_1.1.0.inc
+--echo # Tests of the AES KDF hkdf functionality
+
+--echo #### AES_ENCRYPT return type
+--echo # must work and return a string
+SELECT TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+--echo # must return 16
+SELECT LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+--echo # must return binary
+SELECT CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'));
+--echo # must be equal
+SELECT AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf') = AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf');
+
+--echo # Tests of AES strong key generation
+--echo # Strong key generation with KDF, should not be equal keys
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', repeat("y",32), '', 'hkdf');
+
+--echo # Strong key generation with KDF, should not be equal keys
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'hkdf') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'hkdf');
+
+--echo #### AES_ENCRYPT KDF hkdf parameters
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf'));
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt'));
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 'salt', 'info'));
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'hkdf'), 'my_key_string', '', 'hkdf');
+
+--echo #### AES_ENCRYPT KDF hkdf parameters with incorrect data types
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001), 'my_key_string', '', 'hkdf', 10001);
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text','my_key_string', '', 'hkdf', 10001, 2000), 'my_key_string', '', 'hkdf', 10001, 2000);
+
+--echo # KDF function name different case.
+--error ER_AES_INVALID_KDF_NAME
+select aes_encrypt("foo",repeat("x",16),NULL,'hKdF');
+
+--echo #### AES_ENCRYPT KDF hkdf parameters with initialization vector
+SET @IV=REPEAT('a', 16);
+--echo #### aes-128-cbc
+SELECT @@session.block_encryption_mode INTO @save_block_encryption_mode;
+eval SET SESSION block_encryption_mode="aes-128-cbc";
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf'), 'my_key_string', @IV, 'hkdf');
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt'), 'my_key_string', @IV, 'hkdf', 'salt');
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'hkdf', 'salt', 'info'), 'my_key_string', @IV, 'hkdf', 'salt', 'info');
+SET SESSION block_encryption_mode=@save_block_encryption_mode;
diff --git a/mysql-test/t/func_aes_kdf_pbkdf2_hmac.test b/mysql-test/t/func_aes_kdf_pbkdf2_hmac.test
new file mode 100644
index 000000000000..bbd3824097e6
--- /dev/null
+++ b/mysql-test/t/func_aes_kdf_pbkdf2_hmac.test
@@ -0,0 +1,78 @@
+--echo # Tests of the AES KDF functionality
+
+--echo #### AES_ENCRYPT return type
+--echo # must work and return a string
+SELECT TO_BASE64(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+--echo # must return 16
+SELECT LENGTH(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+--echo # must return binary
+SELECT CHARSET(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'));
+--echo # must be equal
+SELECT AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac');
+
+--echo #### AES_ENCRYPT KDF pbkdf2_hmac parameters
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac'));
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt'));
+select TO_BASE64(AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', '10001'));
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac'), 'my_key_string', '', 'pbkdf2_hmac');
+
+--echo # Tests of AES strong key generation
+
+--echo # Weak key generation without KDF, should be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '') = AES_ENCRYPT('my_text', repeat("y",32), '');
+
+--echo # Strong key generation with KDF, should not be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', repeat("y",32), '', 'pbkdf2_hmac');
+
+--echo # Strong key generation with KDF, should not be equal output
+SELECT AES_ENCRYPT('my_text', repeat("x",32), '', 'pbkdf2_hmac') = AES_ENCRYPT('my_text', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '', 'pbkdf2_hmac');
+
+--echo #### AES_ENCRYPT KDF pbkdf2_hmac parameters with incorrect data types
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, '10001'), 'my_key_string', '', 'pbkdf2_hmac',4000, '10001');
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', '', 'pbkdf2_hmac', 4000, 10001), 'my_key_string', '', 'pbkdf2_hmac',4000, 10001);
+
+--echo #### AES_ENCRYPT KDF error conditions
+
+--echo # Invalid KDF method
+--error ER_AES_INVALID_KDF_NAME
+select AES_ENCRYPT('my_text','my_key_string', '', 'invalid');
+
+--echo # Warning for big AES key and empty KDF method
+select AES_ENCRYPT('my_text', repeat("x",32));
+
+--echo # No warning for smaller key
+select AES_ENCRYPT('my_text', 'my_key');
+
+--echo # KDF pbkdf2_hmac iterations less then 1000 error.
+--error ER_AES_INVALID_KDF_ITERATIONS
+select AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', '100');
+
+--echo # KDF pbkdf2_hmac iterations as text
+--error ER_AES_INVALID_KDF_ITERATIONS
+select AES_ENCRYPT('my_text','my_key_string', '', 'pbkdf2_hmac', 'salt', 'aa');
+
+--echo # KDF function name very large.
+--error ER_AES_INVALID_KDF_OPTION_SIZE
+select aes_encrypt("foo",repeat("x",16),NULL,repeat("1",10000000000));
+
+--echo # KDF function name large
+--error ER_AES_INVALID_KDF_OPTION_SIZE
+select aes_encrypt("foo",repeat("x",16),NULL,repeat("1",300));
+
+--echo # KDF function name different case.
+--error ER_AES_INVALID_KDF_NAME
+select aes_encrypt("foo",repeat("x",16),NULL,'pbkdf2_HMac');
+
+--echo # Extra IV
+--error ER_AES_INVALID_KDF_NAME
+select aes_encrypt("foo",repeat("x",16),NULL,'pbkdf2_HMac');
+
+--echo #### AES_ENCRYPT KDF pbkdf2_hmac parameters with initialization vector
+SET @IV=REPEAT('a', 16);
+--echo #### aes-128-cbc
+SELECT @@session.block_encryption_mode INTO @save_block_encryption_mode;
+eval SET SESSION block_encryption_mode="aes-128-cbc";
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac'), 'my_key_string', @IV, 'pbkdf2_hmac');
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt');
+SELECT 'my_text' = AES_DECRYPT(AES_ENCRYPT('my_text', 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001'), 'my_key_string', @IV, 'pbkdf2_hmac', 'salt', '10001');
+SET SESSION block_encryption_mode=@save_block_encryption_mode;
diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test
index e7a3741d5622..e88cd8c0bfa8 100644
--- a/mysql-test/t/func_group.test
+++ b/mysql-test/t/func_group.test
@@ -1240,3 +1240,38 @@ WHERE 0 = (SELECT group_concat(b)
            FROM t1 t GROUP BY t1.a)
 ;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#32552332 - CAN'T WRITE; DUPLICATE KEY IN TABLE '/TMP/#SQL...'
+--echo #
+
+CREATE TABLE tr (c1 INT);
+INSERT INTO tr VALUES (1);
+
+# Generates a integer sequence from 1 to 2 and repeats
+DELIMITER |;
+CREATE FUNCTION seq_1_to_2() RETURNS INT
+BEGIN
+  DECLARE limit_value, return_value INT;
+  SET limit_value = 2;
+  SELECT c1 INTO return_value FROM tr;
+  IF (return_value < limit_value) THEN
+     UPDATE tr SET c1 = c1 + 1;
+  ELSE
+     UPDATE tr SET c1 = 1;
+  END IF;
+  RETURN (return_value);
+END|
+DELIMITER ;|
+
+CREATE TABLE t1 (c1 INT);
+INSERT INTO t1 VALUES (10);
+INSERT INTO t1 VALUES (11);
+
+SELECT seq_1_to_2() as seq, COUNT(*) FROM t1 GROUP BY seq;
+SELECT FLOOR(seq_1_to_2() * 2) AS val, COUNT(*) FROM t1 GROUP BY val;
+SELECT val, COUNT(*) FROM (SELECT FLOOR(seq_1_to_2())+1 val FROM t1) x
+  GROUP BY x.val;
+
+DROP TABLE t1, tr;
+DROP FUNCTION seq_1_to_2;
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index a2617f58673e..998341f48e34 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -868,6 +868,25 @@ DROP TABLE t2;
 select inet_aton("0.255.255.255.255");
 select inet_aton("255.255.255.2551");
 
+--echo #
+--echo # Bug #26319675:"ILLEGAL MIX OF COLLATIONS" HAPPENS IN CONCAT WITH
+--echo # NAME_CONST
+--echo #
+--let $query = SELECT CONCAT(NAME_CONST('char_col',_cp932'test' COLLATE 'cp932_japanese_ci'), NAME_CONST('num_col',0)) AS a
+--eval $query
+--eval CREATE TABLE t1 AS $query
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+
+--echo #
+--echo # Bug 33334507 - 5.7 - utf8mb4 + REPLACE(UUID(),'-','') returns duplicate UUIDs!
+--echo #
+CREATE TABLE t1(c1 CHAR(10) CHARACTER SET ascii);
+INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
+SELECT COUNT(*) FROM t1 GROUP BY COALESCE(c1, UUID());
+DROP TABLE t1;
+
 --echo
 --echo # -- Done.
 --echo
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 60cea75b41f3..15a77382b0b8 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -1868,3 +1868,56 @@ WHERE trim(leading  'A' FROM COUNTRY) = 'ustralia'
   AND trim(trailing 'a' FROM COUNTRY) = 'Australi';
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug 31320716 - SETTING VARIABLE TO CONCAT('') SETS IT TO NULL INSTEAD OF ''
+--echo #
+# expect empty string and not NULL
+SELECT @var:=CONCAT('');
+SELECT @var:=CONCAT_WS('','');
+
+# shouldn't cause an assertion to fail
+SET NAMES utf8;
+CREATE TABLE t(a INT) engine=innodb;
+INSERT INTO t VALUES(1);
+SELECT 1 FROM t WHERE WEIGHT_STRING(CONCAT_WS('1',''));
+SELECT 1 FROM t WHERE WEIGHT_STRING(CONCAT('',''));
+SET NAMES DEFAULT;
+DROP TABLE t;
+
+--echo #
+--echo # Bug#31374305 - FORMAT() NOT DISPLAYING WHOLE NUMBER SIDE CORRECTLY
+--echo #                FOR ES_MX AND ES_ES LOCALES
+--echo #
+
+DELIMITER |;
+CREATE PROCEDURE load_locale_format_table()
+BEGIN
+  DECLARE locale_list VARCHAR(1000) DEFAULT '
+  es_AR,es_BO,es_CL,es_CO,es_CR,es_DO,es_EC,es_ES,es_GT,es_HN,
+  es_MX,es_NI,es_PA,es_PE,es_PR,es_PY,es_SV,es_US,es_UY,es_VE';
+  SET @fmt_stmt = 'INSERT INTO locale_format VALUES
+                   (?, FORMAT(12131254123412541,2,?));';
+  PREPARE stmt FROM @fmt_stmt;
+  WHILE locale_list != '' DO
+    /* get the first locale from the list */
+    SET @locale =
+          TRIM(REPLACE((SUBSTRING_INDEX(locale_list, ',', 1)), '\n',''));
+    EXECUTE stmt USING @locale, @locale;
+    /* remove the first locale from the list */
+    IF LOCATE(',', locale_list) > 0 THEN
+      SET locale_list =
+      SUBSTRING(locale_list, LOCATE(',', locale_list) + 1);
+    ELSE
+      SET locale_list = '';
+    END IF;
+  END WHILE;
+  DEALLOCATE PREPARE stmt;
+END|
+DELIMITER ;|
+
+CREATE TABLE locale_format(locale VARCHAR(10), formatted_string VARCHAR(100));
+CALL load_locale_format_table();
+SELECT * FROM locale_format;
+DROP PROCEDURE load_locale_format_table;
+DROP TABLE locale_format;
diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test
index 730acaf32e44..38f60c3e7fca 100644
--- a/mysql-test/t/gis-precise.test
+++ b/mysql-test/t/gis-precise.test
@@ -69,9 +69,7 @@ select ST_DISTANCE(ST_GeomFromText('linestring(0 0, 3 6, 6 3, 0 0)'), ST_GeomFro
 
 
 # Operations tests
---replace_result 23.85542168674699 23.855421686746986
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POLYGON((50 5, 55 10, 0 45, 50 5))')));
---replace_result 23.85542168674699 23.855421686746986
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50, 0 0)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45, 50 5)')));
 select ST_astext(ST_Intersection(ST_GeomFromText('LINESTRING(0 0, 50 45, 40 50)'), ST_GeomFromText('LINESTRING(50 5, 55 10, 0 45)')));
 select ST_astext(ST_Intersection(ST_GeomFromText('POLYGON((0 0, 50 45, 40 50, 0 0))'), ST_GeomFromText('POINT(20 20)')));
@@ -92,7 +90,6 @@ create table t1(geom geometrycollection);
 insert into t1 values (ST_GeomFromText('POLYGON((0 0, 10 10, 0 8, 0 0))'));
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 insert into t1 values (ST_GeomFromText('POLYGON((1 1, 10 10, 0 8, 1 1))'));
---replace_numeric_round 5
 select ST_astext(geom), ST_area(geom),ST_area(ST_buffer(geom,2)) from t1;
 select ST_NUMPOINTS(ST_EXTERIORRING(ST_buffer(geom,2))) from t1;
 
@@ -679,7 +676,6 @@ SELECT MBRTOUCHES(ST_GEOMFROMTEXT('MULTIPOINT(5 0,10 0)'),ST_GEOMFROMTEXT('MULTI
 --error ER_BOOST_GEOMETRY_OVERLAY_INVALID_INPUT_EXCEPTION
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
 
---replace_regex /-111\.[0-9]+/-111/ /-57\.[0-9]+/-57/
 SELECT ST_AsText(@centroid_point) as centroid;
 
 SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
@@ -908,7 +904,6 @@ SELECT ST_AsText(ST_Union(ST_GeomFromText('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION
 set @centroid_point = ST_CENTROID(ST_UNION(ST_UNION(ST_GEOMFROMTEXT('MULTILINESTRING((-556 966,-721 -210),(-202 390,-954 804,682 504,-394 -254,832 371,907 -369,827 126,-567 -337,-304 -555,-957 -483,-660 792),(-965 -940,814 -804,-477 -909,-128 57,-819 880,761 497,-559 40,-431 427,179 -291,-707 315,137 -781,-416 -371,-5 -156),(-600 -570,-481 -191,991 -361,768 888,-647 566,795 -861,-82 -575,-593 539))'), ST_GEOMFROMTEXT('MULTIPOLYGON(((805 69,249 708,147 455,546 -672,-218 843,458 24,-630 -420,-83 -69, 805 69)),((196 -219,-201 663,-867 521,-910 -315,-749 801,-402 820,-167 -817,-526 -163,744 -988,-588 -370,573 695,-597 513,-246 439, 196 -219)),((32 -903,189 -871,-778 -741,784 340,403 -555,607 -540,-513 -982,700 -124,344 732,714 151,-812 -252,-440 -895,-426 231,-819 -357, 32 -903)),((-395 830,454 -143,788 -279,618 -843,-490 -507,-224 17, -395 830)))')), ST_INTERSECTION(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(-169 -570),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),MULTIPOLYGON(((266 51,851 523,-781 366,-607 -581, 266 51)),((416 -450,-973 880,103 226,-896 -857,-369 761, 416 -450)),((168 171,26 -99,-606 -490,-174 -138,-325 -218,-833 -652,-255 -445,-882 -762,-202 -560, 168 171)),((-423 -216,-531 -190,-147 821,362 441,645 -128,-997 708,134 -426,714 -9,147 842,-887 -870,688 -330,689 17,-314 -262,401 -112,-606 761, -423 -216)),((-582 -373,-360 -84,-727 -171,412 -660,750 -846,-464 718,163 -11,489 -659,586 -324,-741 -198,144 -165,644 -80,930 -487,-504 -205, -582 -373))),GEOMETRYCOLLECTION(),MULTIPOINT(384 290,-601 123,408 86,-616 -300,160 -474,-979 -4,-63 -824,-689 -765,-219 802,-54 -93,191 -982,-723 -449),MULTILINESTRING((683 4,864 -634,548 -891,727 -691,-570 32,-334 -438,127 -317,241 -12,-807 947,-987 693,-345 -867,854 -106)))'), ST_GEOMFROMTEXT('MULTIPOINT(157 69,-725 -189,-176 -41,676 375,33 -672,-76 47)')), ST_UNION(ST_ENVELOPE(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),POINT(945 -828),LINESTRING(-896 100,-793 810,243 -525,650 -373,599 170,-554 -890),POINT(945 -828),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),GEOMETRYCOLLECTION(),MULTIPOINT(-47 307,-768 -425,-3 167,-170 30,-784 721,951 146,407 790,37 850,-466 738),MULTIPOLYGON(((104 113,688 423,-859 602,272 978, 104 113)),((981 -394,189 -400,649 -325,-977 371,30 859,590 318,329 -894,-51 262,197 952,-846 -139,-920 399, 981 -394)),((-236 -759,834 757,857 747,437 -146,194 913,316 862,976 -491,-745 933,610 687,-149 -164,-803 -565,451 -275, -236 -759)),((572 96,-160 -607,529 930,-544 -132,458 294, 572 96))))')), ST_CENTROID(ST_GEOMFROMTEXT('POINT(-939 -921)'))))));
 
 
---replace_regex /-111\.[0-9]+/-111/ /-57\.[0-9]+/-57/
 SELECT ST_AsText(@centroid_point) as centroid;
 
 SELECT MBRWITHIN(@centroid_point, ST_INTERSECTION(ST_GEOMFROMTEXT('MULTILINESTRING((541 -927,-414 316,-429 -444,212 260,-125 104,445 563,-713 -975,-976 514),(-830 882,-377 914,-915 919,-535 -23,-508 979),(806 347,-87 220,226 -22,-12 468,707 598,83 951,-592 701,833 964,270 -932,743 -514,231 469,-575 -122,-99 -245,416 465,801 -587))'), ST_GEOMFROMTEXT('LINESTRING(-96 -182,-373 75,697 687,-881 -463,-557 -959,-493 810)'))) as result;
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 670f4a45cf05..950831ea61c5 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -2296,10 +2296,9 @@ DROP VIEW v2;
 CREATE TABLE t1 (g GEOMETRY);
 
 INSERT INTO t1 (g) VALUES (ST_GeomFromText("MULTIPOLYGON(((0 7,-3 -14,9 -11,0 7)))"));
-
---replace_numeric_round 4
+--replace_numeric_round 12
 SELECT ST_AsText(ST_Buffer(g, 2)), ST_AsText(ST_Buffer(g, 2)) FROM t1;
---replace_numeric_round 4
+--replace_numeric_round 12
 SELECT ST_AsText(ST_Buffer(g, 2)), ST_AsText(ST_Difference(g, g)) FROM t1;
 DROP TABLE t1;
 
@@ -2869,3 +2868,21 @@ DROP TABLE d, dp, r;
 SET collation_connection='utf32_bin';
 SELECT '2010-10-10 10:10:10' + INTERVAL
   ST_GeometryType(ST_GeomFromText('POINT(1 1)')) HOUR_SECOND;
+
+--echo #
+--echo # Bug #32975221 5.7.29+ REGRESSION, SPATIAL INDEX NOT USED ANYMORE FOR MBRCONTAINS
+--echo #
+
+CREATE TABLE t (
+  c1 VARCHAR(8) NOT NULL,
+  c2 VARCHAR(16) NOT NULL,
+  geom POINT NOT NULL,
+  PRIMARY KEY (c2,c1),
+  SPATIAL KEY coord (geom)
+) ENGINE=INNODB DEFAULT CHARSET=UTF8;
+
+INSERT INTO t VALUES (1, 2, POINT(1, 2));
+
+--replace_column 10 ## 11 ##
+EXPLAIN SELECT COUNT(*) FROM t WHERE MBRCONTAINS(ST_GEOMFROMTEXT('POLYGON((1 2, 2 2, 2 3, 1 2))'), geom) AND c1 <> '10';
+DROP TABLE t;
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index c674d47cd406..b3fdbfd350ca 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -2061,16 +2061,6 @@ GRANT REFERENCES ON mysqltest_db1.* TO mysqltest_u1@localhost;
 
 --source include/bug38347.inc
 
---echo
---echo # -- 
---echo # -- Check that global GRANT OPTION allows SHOW CREATE TABLE.
---echo # -- 
-
---echo
-GRANT GRANT OPTION ON mysqltest_db1.* TO mysqltest_u1@localhost;
-
---source include/bug38347.inc
-
 --echo
 --echo # -- 
 --echo # -- Check that global CREATE VIEW allows SHOW CREATE TABLE.
@@ -2181,16 +2171,6 @@ GRANT REFERENCES ON mysqltest_db1.t1 TO mysqltest_u1@localhost;
 
 --source include/bug38347.inc
 
---echo
---echo # -- 
---echo # -- Check that table-level GRANT OPTION allows SHOW CREATE TABLE.
---echo # -- 
-
---echo
-GRANT GRANT OPTION ON mysqltest_db1.t1 TO mysqltest_u1@localhost;
-
---source include/bug38347.inc
-
 --echo
 --echo # -- 
 --echo # -- Check that table-level CREATE VIEW allows SHOW CREATE TABLE.
@@ -2743,5 +2723,17 @@ DROP USER user_name_len_22_01234@localhost;
 DROP USER user_name_len_32_012345678901234@localhost;
 DROP USER proxy_native_0123456789@localhost;
 
+--echo #
+--echo # Bug#33578113: DROP privilege on performance_schema.* can't be revoked
+--echo #
+
+connection default;
+CREATE USER bug33578113;
+
+GRANT DROP ON performance_schema.* TO bug33578113;
+REVOKE DROP ON performance_schema.* FROM bug33578113;
+
+DROP USER bug33578113;
+
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/t/grant4.test b/mysql-test/t/grant4.test
index 84574150df5e..ae6daf303852 100644
--- a/mysql-test/t/grant4.test
+++ b/mysql-test/t/grant4.test
@@ -115,10 +115,8 @@ GRANT SHOW VIEW, SELECT ON v3 to mysqltest_u1@localhost;
 connection con1;
 use mysqltest_db1;
 --echo ** Connect as restricted user mysqltest_u1.
---echo ** SELECT FROM INFORMATION_SCHEMA.STATISTICS will succeed because any privileges will do (authentication is enough).
-#
-# this result is wrong. reported as bug#34104
-#
+--echo # The user does not have table level grants on table t5. Hence cannot get
+--echo # information about it from INFORMATION_SCHEMA.STATISTICS
 SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='t5';
 #
 # Bug27145 EXTRA_ACL trouble
diff --git a/mysql-test/t/grant_alter_user_qa.test b/mysql-test/t/grant_alter_user_qa.test
index f93449bf130e..494a9ae0b98a 100644
--- a/mysql-test/t/grant_alter_user_qa.test
+++ b/mysql-test/t/grant_alter_user_qa.test
@@ -77,7 +77,7 @@ connection default;
 disconnect con1;
 
 --echo
-CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string';
+CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 --replace_column 3 #
 query_vertical SELECT User,plugin,authentication_string FROM mysql.user
 WHERE USER='user4';
@@ -245,7 +245,7 @@ CREATE USER u18@localhost,
             u20@localhost IDENTIFIED WITH 'sha256_password',
             u21@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string',
             u22@localhost IDENTIFIED WITH 'test_plugin_server',
-            u23@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_&string'
+            u23@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 --replace_column 3 #
@@ -469,7 +469,7 @@ query_vertical SELECT User,ssl_type,ssl_cipher,x509_issuer,x509_subject,
 plugin,authentication_string,password_expired,
 password_last_changed,password_lifetime FROM mysql.user WHERE USER='u9';
 
-CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string'
+CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
                           REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
                           SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
@@ -605,7 +605,7 @@ CREATE USER u18@localhost,
             u20@localhost IDENTIFIED WITH 'sha256_password',
             u21@localhost IDENTIFIED WITH 'sha256_password' BY '!Y_TOdh6)',
             u22@localhost IDENTIFIED WITH 'sha256_password',
-            u23@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_&string'
+            u23@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_&string'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
 --replace_column 7 # 11 #
@@ -743,12 +743,12 @@ CREATE USER u4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 SHOW CREATE USER u4@localhost;
 
 
-CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string';
+CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string';
 --replace_regex /AS .* REQUIRE/AS '<non-deterministic-password-hash>' REQUIRE/
 SHOW CREATE USER user1@localhost;
 
 --echo
-CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string';
+CREATE USER user2@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string';
 --replace_regex /AS .* REQUIRE/AS '<non-deterministic-password-hash>' REQUIRE/
 SHOW CREATE USER user2@localhost;
 --echo
@@ -851,7 +851,7 @@ DROP USER user1@localhost,u1@localhost, u2@localhost, u3@localhost, u4@localhost
 --echo
 --echo # GRANT
 --echo
-CREATE USER user1@localhost IDENTIFIED WITH 'sha256_password'
+CREATE USER user1@localhost IDENTIFIED WITH 'mysql_native_password'
             AS '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
             REQUIRE SUBJECT '/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client'
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
@@ -916,7 +916,7 @@ DROP USER user1@localhost,user2@localhost,user3@localhost,user5@localhost;
 --echo # SET PASSWORD Tests
 --echo
 CREATE USER user1@localhost IDENTIFIED BY 'auth_string';
-CREATE USER user2@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string1';
+CREATE USER user2@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string1';
 
 SELECT PASSWORD('plaintext_pwd');
 
@@ -957,7 +957,7 @@ password_expired,password_lifetime FROM mysql.user where  user='user5';
 
 # Resetting password with a non-ssl connection using mysqladmin,it should throw warning.
 GRANT ALL ON *.* TO user4@localhost;
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uuser4 --password=auth_xyz password new_auth  2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uuser4 --password=auth_xyz password new_auth  2>&1
 # Testing connection
 --connect(con1, localhost, user4, new_auth)
 SELECT USER();
@@ -965,7 +965,7 @@ connection default;
 disconnect con1;
 
 # With ssl connection
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uuser4 --password=new_auth password new_auth_ssl --ssl-mode=REQUIRED 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uuser4 --password=new_auth password new_auth_ssl --ssl-mode=REQUIRED 2>&1
 
 # Testing connection
 --connect(con1, localhost, user4, new_auth_ssl)
@@ -1082,7 +1082,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
                           SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1155,7 +1155,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
             SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
             ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
             WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
            REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1261,7 +1261,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
                           SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
@@ -1335,7 +1335,7 @@ CREATE USER u10@localhost IDENTIFIED WITH 'sha256_password'
                           SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
                           ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
                           WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
-ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' AS 'auth_string'
+ALTER USER u10@localhost IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
                          REQUIRE SSL;
 ALTER USER user11@localhost IDENTIFIED WITH 'sha256_password'
                             REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
diff --git a/mysql-test/t/grant_debug.test b/mysql-test/t/grant_debug.test
index d61a4257b742..b8f06e2ca28e 100644
--- a/mysql-test/t/grant_debug.test
+++ b/mysql-test/t/grant_debug.test
@@ -171,3 +171,32 @@ SET sql_mode= @orig_sql_mode;
 DROP PROCEDURE db_1.p_def;
 DROP DATABASE db_1;
 
+--echo ###
+--echo ### Bug#27302337: MYSQL ABORTS WITHOUT PROPER ERROR MESSAGE ON
+--echo ###               STARTUP IF GRANT TABLES ARE CORRUPT
+--echo ###
+
+let $DDIR= `select @@datadir`;
+let server_log= $MYSQLTEST_VARDIR/log/mysqld.1.err;
+
+--echo # Shutdown the server
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--echo # Start the server to simulate acl_init() failure
+--error 1
+--exec $MYSQLD_CMD --datadir=$DDIR --debug=d,simulate_acl_init_failure --loose-console > $server_log 2>&1
+
+let SEARCH_FILE=$server_log;
+let SEARCH_PATTERN=Table 'user' is marked as crashed and should be repaired;
+--source include/search_pattern.inc
+let SEARCH_PATTERN=Fatal error: Failed to initialize ACL/grant/time zones structures or failed to remove temporary table files.;
+--source include/search_pattern.inc
+let SEARCH_PATTERN=Aborting;
+--source include/search_pattern.inc
+
+--echo # Restart the server
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
diff --git a/mysql-test/t/grant_user_lock_qa.test b/mysql-test/t/grant_user_lock_qa.test
index 43ff2bd8d86a..9d60950d1070 100644
--- a/mysql-test/t/grant_user_lock_qa.test
+++ b/mysql-test/t/grant_user_lock_qa.test
@@ -246,7 +246,7 @@ connection default;
 disconnect con1;
 
 --echo
-CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' AS 'auth_string'
+CREATE USER user4@localhost IDENTIFIED WITH 'sha256_password' BY 'auth_string'
 ACCOUNT LOCK PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD EXPIRE INTERVAL 90 DAY;
 --replace_column 3 #
 query_vertical SELECT user,plugin,authentication_string,password_expired,
diff --git a/mysql-test/t/import_schema_mismatch.test b/mysql-test/t/import_schema_mismatch.test
new file mode 100644
index 000000000000..b72a954d3145
--- /dev/null
+++ b/mysql-test/t/import_schema_mismatch.test
@@ -0,0 +1,32 @@
+#
+#Bug #27542720 SCHEMA MISMATCH - TABLE FLAGS DON'T MATCH,
+#	       BUT FLAGS ARE NUMBERS
+#
+
+
+--source include/have_innodb.inc
+
+--let $MYSQLD_DATADIR=`select @@datadir`
+--let $DB = `SELECT DATABASE()`
+
+SET GLOBAL innodb_default_row_format = 'compact';
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+FLUSH TABLES t1 FOR EXPORT;
+#--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--copy_file $MYSQLD_DATADIR/$DB/t1.ibd $MYSQL_TMP_DIR/t1.ibd
+--copy_file $MYSQLD_DATADIR/$DB/t1.cfg $MYSQL_TMP_DIR/t1.cfg
+
+UNLOCK TABLES;
+DROP TABLE t1;
+SET GLOBAL innodb_default_row_format = 'dynamic';
+CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
+ALTER TABLE t1 DISCARD TABLESPACE;
+--move_file $MYSQL_TMP_DIR/t1.ibd $MYSQLD_DATADIR/$DB/t1.ibd
+--move_file $MYSQL_TMP_DIR/t1.cfg $MYSQLD_DATADIR/$DB/t1.cfg
+
+--error ER_TABLE_SCHEMA_MISMATCH
+ALTER TABLE t1 IMPORT TABLESPACE;
+DROP TABLE t1;
+
+--remove_file $MYSQLD_DATADIR/$DB/t1.ibd
+--remove_file $MYSQLD_DATADIR/$DB/t1.cfg
diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test
index a4149130df80..4521e72078db 100644
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/t/init_connect.test
@@ -250,14 +250,61 @@ disconnect con0;
 disconnect con1;
 
 drop trigger trg1;
-# Set init connect back to the value provided in init_connect-master.opt
-# doesn't matter as server will be restarted
-set global init_connect="set @a='a\\0c'";
 
 revoke all privileges, grant option from mysqltest1@localhost;
 drop user mysqltest1@localhost;
 drop table t1, t2;
 
+--echo ###
+--echo ### Bug#25968185: INIT_CONNECT PREVENTS CONNECTIONS IF PASSWORD EXPIRED
+--echo ###
+
+call mtr.add_suppression("\\[Warning\\] init_connect variable is ignored for user:.* host: localhost due to expired password.");
+
+CREATE USER user1@localhost PASSWORD EXPIRE;
+CREATE USER ''@localhost;
+UPDATE mysql.user SET password_expired='Y' WHERE user='' AND host='localhost';
+SELECT user, password_expired FROM mysql.user WHERE user='' AND host='localhost';
+FLUSH PRIVILEGES;
+
+SET GLOBAL init_connect="set @a=2;";
+
+#SCENARRIO 1:- Normal user with expired password.
+connect (con1,localhost,user1,,);
+connection con1;
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_PATTERN=\[Warning\] init_connect variable is ignored for user: user1 host: localhost due to expired password.;
+--source include/search_pattern.inc
+
+--error ER_MUST_CHANGE_PASSWORD
+SELECT @a;
+SET PASSWORD = 'abc';
+SELECT @a;
+
+connection default;
+disconnect con1;
+
+#SCENARRIO 2:- Anonymous user with expired password.
+connect (con2,localhost,anonymous,,);
+connection con2;
+
+let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_PATTERN=\[Warning\] init_connect variable is ignored for user:  host: localhost due to expired password.;
+--source include/search_pattern.inc
+
+--error ER_MUST_CHANGE_PASSWORD
+SELECT @a;
+
+connection default;
+disconnect con2;
+
+DROP USER user1@localhost;
+DROP USER ''@localhost;
+
+# Set init connect back to the value provided in init_connect-master.opt
+# doesn't matter as server will be restarted
+set global init_connect="set @a='a\\0c'";
+
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
-
diff --git a/mysql-test/t/initialize-yassl-warning.test b/mysql-test/t/initialize-yassl-warning.test
deleted file mode 100644
index 9c2993121439..000000000000
--- a/mysql-test/t/initialize-yassl-warning.test
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Bug #21498544: mysqld --initialize should not complain about lack of ssl certs
-#
-
---source include/big_test.inc
---source include/not_embedded.inc
---source include/have_no_undo_tablespaces.inc
---source include/have_ssl_communication.inc
---source include/have_yassl.inc
-
-
-let BASEDIR= `select @@basedir`;
-let DDIR=$MYSQL_TMP_DIR/installdb_test;
-let MYSQLD_LOG=$MYSQL_TMP_DIR/server.log;
-let extra_args=--no-defaults --console --log-syslog=0 --basedir=$BASEDIR --lc-messages-dir=$MYSQL_SHAREDIR;
-
---echo # We don't care about innodb warnings at this point
-CALL mtr.add_suppression("InnoDB:");
-
---echo # shut server down
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server
---source include/wait_until_disconnected.inc
---echo # Server is down
-
---echo #
---echo # Try --initialize --ssl and don't exect a warning
---echo #
-
---echo # create the empty datadir
-mkdir $DDIR;
-
---echo # start a server with --initialize --ssl
---exec $MYSQLD $extra_args --initialize --ssl --datadir=$DDIR >$MYSQLD_LOG 2>&1
-
---echo # look for "ssl failed". Must get 0.
-perl;
-  use strict;
-  my $log= $ENV{'MYSQLD_LOG'} or die;
-  open(FILE, "$log") or die;
-  my $c= grep(/.Warning. Failed to set up SSL.*/gi,<FILE>);
-  print "ssl failed message found $c times\n";
-  close(FILE);
-EOF
-
-
---echo # delete datadir
---perl
-use File::Path 'rmtree';
-$DDIR=$ENV{"DDIR"};
-rmtree([ "$DDIR" ]);
-EOF
---echo # delete mysqld log
-remove_file $MYSQLD_LOG;
-
-
---echo #
---echo # Try --initialize --ssl --ssl-ca and expect a warning
---echo #
-
---echo # create the empty datadir
-mkdir $DDIR;
-
---echo # start a server with --initialize --ssl -ssl-ca
---exec $MYSQLD $extra_args --initialize --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --datadir=$DDIR >$MYSQLD_LOG 2>&1
-
---echo # look for "ssl failed". Must get 1.
-perl;
-  use strict;
-  my $log= $ENV{'MYSQLD_LOG'} or die;
-  open(FILE, "$log") or die;
-  my $c= grep(/.Warning. Failed to set up SSL.*/gi,<FILE>);
-  print "ssl failed message found $c times\n";
-  close(FILE);
-EOF
-
-
---echo # delete datadir
---perl
-use File::Path 'rmtree';
-$DDIR=$ENV{"DDIR"};
-rmtree([ "$DDIR" ]);
-EOF
---echo # delete mysqld log
-remove_file $MYSQLD_LOG;
-
-
---echo #
---echo # Cleanup
---echo #
---echo # Restarting the server
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---enable_reconnect
---source include/wait_until_connected_again.inc
diff --git a/mysql-test/t/innodb_mysql_sync.test b/mysql-test/t/innodb_mysql_sync.test
index 364e1ab926be..166122697cdf 100644
--- a/mysql-test/t/innodb_mysql_sync.test
+++ b/mysql-test/t/innodb_mysql_sync.test
@@ -1098,6 +1098,34 @@ DROP TABLE t1;
 SET debug="-d,innodb_index_drop_count_zero";
 
 
+--echo #
+--echo # BUG#26848813: INDEXED COLUMN CAN'T BE CHANGED FROM VARCHAR(15)
+--echo #               TO VARCHAR(40) INSTANTANEOUSLY
+
+CREATE TABLE t1(fld1 VARCHAR(5), KEY(fld1)) ENGINE= InnoDB;
+SET DEBUG="+d,innodb_index_drop_count_zero";
+
+--echo # Without patch, an error is reported.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(7), ALGORITHM= INPLACE;
+
+--echo # Scenario where non-packed keys is converted to packed keys
+--echo # before the patch, an error is reported.
+ALTER TABLE t1 MODIFY fld1 VARCHAR(9), ALGORITHM= INPLACE;
+
+SET DEBUG="-d,innodb_index_drop_count_zero";
+
+--echo # Tests added for covering cases where rebuild is required.
+
+--echo # Reducing the size of the field.
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 MODIFY fld1 VARCHAR(3), ALGORITHM= INPLACE;
+
+--echo # Increasing the size of the field to boundary condition.
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1 MODIFY fld1 VARCHAR(256), ALGORITHM= INPLACE;
+
+DROP TABLE t1;
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/t/insert_debug-master.opt b/mysql-test/t/insert_debug-master.opt
new file mode 100644
index 000000000000..824f656cbd5c
--- /dev/null
+++ b/mysql-test/t/insert_debug-master.opt
@@ -0,0 +1 @@
+--innodb_autoinc_lock_mode=2
diff --git a/mysql-test/t/insert_debug.test b/mysql-test/t/insert_debug.test
new file mode 100644
index 000000000000..b2b2925b405b
--- /dev/null
+++ b/mysql-test/t/insert_debug.test
@@ -0,0 +1,52 @@
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+
+connect (con1, localhost, root,,);
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+
+connection default;
+
+let $conn0_id= `SELECT CONNECTION_ID()`;
+
+CREATE TABLE t1(c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10) NOT NULL, c3 VARCHAR(10) NOT NULL);
+INSERT INTO t1(c1, c2, c3) VALUES('A1','B1','IT1'), ('A2','B2','IT1'), ('A3','B3','IT1'), ('A4','B4','IT1'), ('A5','B5','IT1'), ('A6','B6','IT1'), ('A7','B7','IT1');
+
+CREATE TABLE t2(c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10) NOT NULL, c3 VARCHAR(10) NOT NULL);
+INSERT INTO t2(c1, c2, c3) VALUES ('A3','B3','IT2'), ('A2','B2','IT2'), ('A4','B4','IT2'), ('A5','B5','II2');
+
+CREATE TABLE result(id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, c1 VARCHAR(10) NOT NULL, c2 VARCHAR(10),
+c3 VARCHAR(10), update_count INT DEFAULT 0, UNIQUE KEY uniq_idx (c1,c2), PRIMARY KEY (id)) ENGINE = innodb;
+
+# Insert one row from 't1' into the 'result' table and wait on a debug sync
+# point. The next insert statement from an session 2 inserts values that would
+# lead to unique key clash, when this insert resumes.
+# The subsequent inserts of this statement(after resume) will fail because of a
+# clash with the unique index, and are expected to update the row which clashes
+# with the unique key.
+# Without the fix for bug#30194841 a stale auto increment value, would cause a
+# collision with existing auto increment column value and ends up updating that
+# colliding row, instead of the row colliding with the unique index.
+SET DEBUG_SYNC = "ha_write_row_end WAIT_FOR flushed EXECUTE 1";
+send INSERT INTO result(c1, c2, c3) SELECT * FROM t1 ON DUPLICATE KEY UPDATE c2=t1.c2, c3='UT1', update_count=update_count+1;
+
+# While session 1 is waiting (after one insert), insert rows that will cause a clash
+# with the inserts of session 1 on the unique key.
+connection con1;
+
+# Wait for the session 1 to hit the debug sync point.
+let $wait_condition=SELECT 1 FROM information_schema.processlist WHERE id = $conn0_id AND state LIKE '%ha_write_row_end%';
+--source include/wait_condition.inc
+
+INSERT INTO result(c1, c2, c3) SELECT * FROM t2 ON DUPLICATE KEY UPDATE c2=t2.c2, c3='UT2', update_count=update_count+1;
+
+# Signal to resume the insert statement in session 1
+SET DEBUG_SYNC = "now SIGNAL flushed";
+connection default;
+reap;
+SELECT * FROM result;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE result;
diff --git a/mysql-test/t/join_file_handler.test b/mysql-test/t/join_file_handler.test
new file mode 100644
index 000000000000..74ebd102599a
--- /dev/null
+++ b/mysql-test/t/join_file_handler.test
@@ -0,0 +1,33 @@
+--echo #
+--echo # Bug#28039829: SELECT QUERY WITH COMPLEX JOINS LEAKS FILE HANDLES
+--echo #
+
+CREATE DATABASE db_28039829;
+USE db_28039829;
+
+CREATE TABLE t1 (c1 CHAR(36) NOT NULL,
+                 c2 CHAR(36) DEFAULT NULL,
+                 c3 VARCHAR(100) DEFAULT NULL,
+                 c4 VARCHAR(100) DEFAULT NULL,
+                 PRIMARY KEY (c1),
+                 KEY idx_1 (c2),
+                 KEY idx_2 (c3, c4),
+                 KEY idx_3 (c4, c3))
+                ENGINE=InnoDB;
+
+CREATE TABLE t2 (c1 CHAR(36) DEFAULT NULL)
+                ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+LOAD DATA INFILE '../../std_data/bug28039829.dat' INTO TABLE t1;
+INSERT INTO t2 VALUES ('63dfcd94-143a-11e7-bec8-fa163e4dd901'),
+                      ('dcda6718-143a-11e7-82e5-fa163e4dd901');
+
+SET optimizer_switch="block_nested_loop=OFF";
+
+SELECT t1.c1 FROM t1 INNER JOIN t2 ON t1.c2 = t2.c1
+             WHERE (t1.c3 LIKE 'James' OR t1.c4 LIKE 'abc');
+
+#Cleanup
+DROP TABLE t1, t2;
+DROP DATABASE db_28039829;
+SET optimizer_switch=DEFAULT;
diff --git a/mysql-test/t/join_outer_innodb.test b/mysql-test/t/join_outer_innodb.test
index 8fde1d0a0050..7b3a2318fa2c 100644
--- a/mysql-test/t/join_outer_innodb.test
+++ b/mysql-test/t/join_outer_innodb.test
@@ -70,3 +70,20 @@ ORDER BY pk;
 DROP TABLE t1,t2;
 
 --echo # End BUG#58456
+
+--echo #
+--echo # Bug #20939184:INNODB: UNLOCK ROW COULD NOT FIND A 2 MODE LOCK ON THE
+--echo #               RECORD
+--echo #
+CREATE  TABLE t1 (c1 INT, c2 INT, c3 INT, PRIMARY KEY (c1,c2) );
+CREATE  TABLE t2 (c1 INT, c2 INT, c3 INT, PRIMARY KEY (c1), KEY (c2));
+INSERT INTO t1 VALUES (1,2,3),(2,3,4),(3,4,5);
+INSERT INTO t2 SELECT * FROM t1;
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+START TRANSACTION;
+#unlocks rows in table t2 where c1 = 1
+SELECT * FROM t1 LEFT JOIN t2 ON t1.c2=t2.c2 AND t2.c1=1 FOR UPDATE;
+UPDATE t1 LEFT JOIN t2 ON t1.c1 = t2.c2 AND t2.c1 = 3 SET t1.c3 = RAND()*10;
+COMMIT;
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+DROP TABLE t1,t2;
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index 471f510aabfd..e726ea40338d 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -4618,7 +4618,7 @@ connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
   where state = "Waiting for table metadata lock" and
-        info = "select * from t1, t2";
+        info = "PREPARE stmt1 FROM ...";
 --source include/wait_condition.inc
 
 --echo # This ALTER TABLE upgrades SNRW lock on t1 to X lock.
diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/t/lowercase_table4.test
index a3c9a4a2a6ed..36ffe6142bb2 100644
--- a/mysql-test/t/lowercase_table4.test
+++ b/mysql-test/t/lowercase_table4.test
@@ -106,3 +106,34 @@ DROP TABLE Product_Order;
 DROP TABLE Product;
 DROP TABLE Customer;
 
+--echo #
+--echo # Bug#29957361: TABLE NOT IN THE SHOW TABLES WITH LOWER_CASE_TABLE_NAMES=2
+--echo #
+
+CREATE DATABASE my_db;
+USE my_db;
+CREATE TABLE UPPERCASE_MYISAM (a INT) ENGINE=MYISAM;
+CREATE TABLE lowercase_myisam (a INT) ENGINE=MYISAM;
+CREATE TABLE UPPERCASE_INNODB (a INT) ENGINE=InnoDB;
+CREATE TABLE lowercase_innodb (a INT) ENGINE=InnoDB;
+SHOW TABLES;
+
+# Create a new user and assign SELECT privileges on the above tables.
+CREATE USER 'test_user'@'localhost';
+GRANT SELECT ON my_db.UPPERCASE_MYISAM TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.lowercase_myisam TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.UPPERCASE_INNODB TO 'test_user'@'localhost';
+GRANT SELECT ON my_db.lowercase_innodb TO 'test_user'@'localhost';
+
+# Connect using the new user
+--connect(con1, localhost, test_user,,)
+
+USE my_db;
+--echo # Without the patch, tables with uppercase table names were not displayed.
+SHOW TABLES;
+
+--connection default
+--disconnect con1
+DROP USER 'test_user'@'localhost';
+DROP DATABASE my_db;
+USE test;
diff --git a/mysql-test/t/metadata.test b/mysql-test/t/metadata.test
index 6245d7a7d080..a989034449f7 100644
--- a/mysql-test/t/metadata.test
+++ b/mysql-test/t/metadata.test
@@ -259,3 +259,14 @@ DROP TABLE t1;
 
 --echo # End of test for Bug#22364401
 
+--echo #
+--echo # Bug #27422376: NEWDATE TYPE IS LEAKING OUT
+--echo #
+
+--enable_metadata
+SELECT CAST('2018-01-28 00:00:01' AS DATE) UNION
+SELECT CAST('2018-01-28 00:00:01' AS DATE);
+
+SELECT CAST('2018-01-28 00:00:01' AS DATE) UNION ALL
+SELECT CAST('2018-01-28 00:00:01' AS DATE);
+--disable_metadata
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 9f08f68a8514..399128557207 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -197,7 +197,7 @@ drop table t1,t2;
 set sql_safe_updates=1;
 create table t1 (n int(10), d int(10));
 create table t2 (n int(10), d int(10));
-insert into t1 values(1,1);
+insert into t1 values(1,1), (3,30);
 insert into t2 values(1,10),(2,20);
 --error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
 UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
diff --git a/mysql-test/t/multi_update_innodb.test b/mysql-test/t/multi_update_innodb.test
index 316f3fa6679f..f1c5fbc917e4 100644
--- a/mysql-test/t/multi_update_innodb.test
+++ b/mysql-test/t/multi_update_innodb.test
@@ -114,3 +114,49 @@ eval $query;
 
 SET sql_buffer_result=@old_buf_result;
 DROP TABLE t1,t2;
+
+--echo #
+--echo # Bug#28716103 - MULTI-TABLE UPDATE OF PRIMARY KEY RESULTS IN ERROR 1032
+--echo # "CAN'T FIND RECORD"
+--echo #
+
+# Make sure the size of primary key(accounting for bytes per code point)
+# is bigger than 512 bytes. This will force the use of a hash field
+# and a unique constraint on the hash field in the temporary table.
+
+CREATE TABLE t1 (c1 CHAR(255) NOT NULL);
+CREATE TABLE t2 (c1 CHAR(255) NOT NULL, c2 CHAR(255) NOT NULL,
+                 c3 CHAR(255) NOT NULL,  PRIMARY KEY (c1, c2, c3));
+INSERT INTO t1 VALUES ('x'), ('x');
+INSERT INTO t2 VALUES ('x', '', '');
+UPDATE t1, t2 SET t2.c2 = 'y', t2.c3 = 'y' WHERE t2.c1 = t1.c1;
+SELECT * FROM t2;
+DROP TABLE t1, t2;
+
+# Make sure the size of the primary key is greater than 1024 bytes.
+CREATE TABLE t1(c1 VARCHAR(350), c2 VARCHAR(350),
+                c3 INT, PRIMARY KEY(c1,c2)) charset=utf8mb3;
+
+# If the tmp storage engine is heap, irrespective of the setting of
+# global.tmp_table_size, memory to store 10 rows is always allocated.
+# Inserting 11 rows to force a migration to disk.
+
+INSERT INTO t1 VALUES ('a','a',1);
+INSERT INTO t1 VALUES ('a','b',2);
+INSERT INTO t1 VALUES ('a','c',3);
+INSERT INTO t1 VALUES ('a','d',4);
+INSERT INTO t1 VALUES ('a','e',5);
+INSERT INTO t1 VALUES ('a','f',6);
+INSERT INTO t1 VALUES ('a','g',7);
+INSERT INTO t1 VALUES ('a','h',8);
+INSERT INTO t1 VALUES ('a','i',9);
+INSERT INTO t1 VALUES ('a','j',10);
+INSERT INTO t1 VALUES ('a','k',11);
+
+# Set the size of the temp table to min value, to force migration to InnoDB
+SET @@SESSION.tmp_table_size=1024;
+UPDATE t1 a, t1 b SET a.c3=22 WHERE a.c1 = b.c1;
+SELECT COUNT(*) FROM t1 WHERE c3=22;
+# Reset to default values
+SET @@SESSION.tmp_table_size=DEFAULT;
+DROP TABLE t1;
diff --git a/mysql-test/t/myisam-blob.test b/mysql-test/t/myisam-blob.test
index a06df127c6c1..1563e9823f2b 100644
--- a/mysql-test/t/myisam-blob.test
+++ b/mysql-test/t/myisam-blob.test
@@ -6,6 +6,7 @@
 --source include/force_myisam_default.inc
 --source include/have_myisam.inc
 
+SET SQL_MODE='';
 #
 # Test bugs in the MyISAM code with blobs
 #
@@ -48,4 +49,5 @@ UPDATE IGNORE t1 set data=repeat('a',18*1024*1024);
 select length(data) from t1;
 drop table t1;
 
+SET SQL_MODE=default;
 # End of 4.1 tests
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index e4f00e558a75..1883641e45f1 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -747,8 +747,6 @@ DROP TABLE t1;
 #
 # Bug#8283 - OPTIMIZE TABLE causes data loss
 #
-SET @@myisam_repair_threads=2;
-SHOW VARIABLES LIKE 'myisam_repair%';
 #
 # Test OPTIMIZE. This creates a new data file.
 CREATE TABLE t1 (
@@ -834,8 +832,6 @@ SHOW TABLE STATUS LIKE 't1';
 SELECT _id FROM t1;
 DROP TABLE t1;
 #
-SET @@myisam_repair_threads=1;
-SHOW VARIABLES LIKE 'myisam_repair%';
 
 #
 # BUG#21310 - Trees in SQL causing a "crashed" table with MyISAM storage
@@ -1161,10 +1157,8 @@ SHOW TABLE STATUS LIKE 't1';
 #--exec myisamchk -dvv var/master-data/test/t1.MYI
 #--exec myisamchk -iev var/master-data/test/t1.MYI
 --echo # Enable keys with parallel repair
-SET @@myisam_repair_threads=2;
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
-SET @@myisam_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
@@ -1582,12 +1576,10 @@ INSERT INTO t1 SELECT a+5120,b FROM t1;
 SET myisam_sort_buffer_size=4;
 REPAIR TABLE t1;
 
-SET myisam_repair_threads=2;
 # May report different values depending on threads activity.
 --disable_result_log
 REPAIR TABLE t1;
 --enable_result_log
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 CHECK TABLE t1;
 DROP TABLE t1;
@@ -1649,20 +1641,6 @@ INSERT INTO t1 VALUES('1');
 SELECT * FROM t1, t1 AS a1 WHERE t1.a=1 AND a1.a=1;
 DROP TABLE t1;
 
---echo #
---echo # BUG#47444 - --myisam_repair_threads>1can result in all index
---echo #             cardinalities=1
---echo #
-SET myisam_repair_threads=2;
-SET myisam_sort_buffer_size=4096;
-CREATE TABLE t1(a CHAR(255), KEY(a), KEY(a), KEY(a));
-INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(0),(1),(2),(3);
-REPAIR TABLE t1;
-SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
-DROP TABLE t1;
-SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-
 --echo #
 --echo # BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN
 --echo #                USING MYISAM_USE_MMAP ON WINDOWS
diff --git a/mysql-test/t/mysql_batch_mode.test b/mysql-test/t/mysql_batch_mode.test
new file mode 100644
index 000000000000..eed1943d26fa
--- /dev/null
+++ b/mysql-test/t/mysql_batch_mode.test
@@ -0,0 +1,17 @@
+--echo #
+--echo # Bug #32015466: MYSQL BATCH MODE EXECUTE SQL
+--echo #        FAILED WITH MYSQL CLIENT
+--echo #
+
+--source include/not_embedded.inc
+
+--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+create database test1;
+create database test2;
+use `test1`;
+DROP DATABASE IF EXISTS test1;
+use `test2`;
+DROP DATABASE IF EXISTS test2;
+EOF
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql;
diff --git a/mysql-test/t/mysql_config_editor.test b/mysql-test/t/mysql_config_editor.test
index dfe3b01b688c..6af53e08b0b7 100644
--- a/mysql-test/t/mysql_config_editor.test
+++ b/mysql-test/t/mysql_config_editor.test
@@ -125,12 +125,12 @@ FLUSH PRIVILEGES;
 --echo # Now trying to connect again..
 --echo # Connecting using 'test_user1'
 --echo #
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 --exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 --echo
 --echo # Connecting using 'test_user2'
 --echo #
---exec $MYSQLADMIN --login-path=test-login-path1 --port=$MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults --login-path=test-login-path1 --port=$MASTER_MYPORT ping 2>&1
 --exec $MYSQLADMIN --no-defaults --login-path=test-login-path1 --port=$MASTER_MYPORT ping 2>&1
 
 --echo #
@@ -187,7 +187,7 @@ DROP USER test_user1, test_user2;
 --echo # The 'invalid' login file should not cause
 --echo # any problem.
 --echo #
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2> /dev/null
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2> /dev/null
 
 --echo ###############################
 --echo # Dropping the test login file
@@ -200,7 +200,7 @@ DROP USER test_user1, test_user2;
 --echo # Even if login file does not exist, the
 --echo # tools should be able to continue
 --echo # normally.
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping 2>&1
 
 --echo
 --echo ######################
@@ -218,12 +218,12 @@ CREATE USER user_name_len_26_012345678@localhost;
 
 --echo # Connecting using 'user_name_len_25_01234567'
 --echo #
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 --exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 --echo
 --echo # Connecting using 'user_name_len_26_012345678'
 --echo #
---exec $MYSQLADMIN --login-path=test-login-path_user_26 --port=$MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults --login-path=test-login-path_user_26 --port=$MASTER_MYPORT ping 2>&1
 --exec $MYSQLADMIN --no-defaults --login-path=test-login-path_user_26 --port=$MASTER_MYPORT ping 2>&1
 
 # Cleanup
@@ -255,4 +255,18 @@ DROP USER user_name_len_25_01234567@localhost,user_name_len_26_012345678@localho
 --exec $MYSQL_CONFIG_EDITOR remove --login-path=mysqld
 --remove_file $MYSQL_TEST_LOGIN_FILE
 
+--echo #
+--echo # Bug#29861961: MYSQL_CONFIG_EDITOR CAN NOT DEAL PASSWORD WITH "#"
+--echo #
+
+CREATE USER 'test#user1'@'localhost';
+--exec $MYSQL_CONFIG_EDITOR set --login-path=test --user=test#user1 --host=127.0.0.1 2>&1
+
+--exec $MYSQLADMIN --no-defaults --login-path=test --port=$MASTER_MYPORT ping 2>&1
+
+--echo # Cleanup
+DROP USER 'test#user1'@'localhost';
+--exec $MYSQL_CONFIG_EDITOR remove --login-path=test
+--remove_file $MYSQL_TEST_LOGIN_FILE
+
 --echo # End of 5.6 tests
diff --git a/mysql-test/t/mysql_ssl_default.test b/mysql-test/t/mysql_ssl_default.test
index 2fe345b6c0af..538f1a02e44f 100644
--- a/mysql-test/t/mysql_ssl_default.test
+++ b/mysql-test/t/mysql_ssl_default.test
@@ -7,6 +7,8 @@
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 
+--source include/allowed_ciphers.inc
+
 --echo #
 --echo # WL#7712 Support SSL by default in libmysql
 --echo #
@@ -14,15 +16,15 @@
 
 --echo # verify that mysql default connect with ssl channel when using TCP/IP
 --echo # connection
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "SHOW STATUS like 'Ssl_cipher'"
 
 --echo # verify that mysql --ssl=0 connect with unencrypted channel
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "SHOW STATUS like 'Ssl_cipher'" --ssl-mode=DISABLED
 
 --echo # verify that mysql --ssl=1 connect with ssl channel
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --host=127.0.0.1 -P $MASTER_MYPORT -e "SHOW STATUS like 'Ssl_cipher'" --ssl-mode=REQUIRED
 
 CREATE USER u1@localhost IDENTIFIED BY 'secret' REQUIRE SSL;
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test
index 500929e5242e..b1a74c79a63b 100644
--- a/mysql-test/t/mysqladmin.test
+++ b/mysql-test/t/mysqladmin.test
@@ -45,7 +45,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;
 --echo #
 
 --echo # Executing mysqladmin with --sleep=1 and --count=2.
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --sleep=1 --count=2 ping > $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --sleep=1 --count=2 ping > $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
 --echo # Done.
 --echo # Displaying the output :
 --cat_file $MYSQLTEST_VARDIR/tmp/mysqladmin.tmp
@@ -62,7 +62,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;
 EOF
 
 --echo # Using --defaults-extra-file option with 'cnf_file'.
---exec $MYSQLADMIN --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/cnf_file -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/cnf_file -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 
 --remove_file $MYSQLTEST_VARDIR/tmp/cnf_file
 
@@ -70,7 +70,7 @@ EOF
 --echo # Bug#12688860 : SECURITY RECOMMENDATION: PASSWORDS ON CLI
 --echo #
 
---exec $MYSQLADMIN -uroot --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults -uroot --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
 
 
 --echo #
diff --git a/mysql-test/t/mysqladmin_shutdown.test b/mysql-test/t/mysqladmin_shutdown.test
new file mode 100644
index 000000000000..5c579ad76c7f
--- /dev/null
+++ b/mysql-test/t/mysqladmin_shutdown.test
@@ -0,0 +1,28 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+# Supported on platforms with UNIX sockets only
+--source include/not_windows.inc
+
+--echo #
+--echo # Bug#28466137 MYSQLADMIN SHUTDOWN DOES NOT WAIT FOR MYSQL TO SHUT DOWN ANYMORE
+--echo #
+
+--let $_pid_file_location= `SELECT @@pid_file`
+
+# Write file to make mtr expect the shutdown and avoid implicit restart
+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+--exec echo "wait" > $_expect_file_name
+
+--exec $MYSQLADMIN -uroot --password="" -S $MASTER_MYSOCK shutdown 2>&1
+
+# pid file should be gone
+--error 1
+--file_exists $_pid_file_location
+
+--source include/wait_until_disconnected.inc
+
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
diff --git a/mysql-test/t/mysqlbinlog_base64_flag.test b/mysql-test/t/mysqlbinlog_base64_flag.test
new file mode 100644
index 000000000000..353aa4ee3882
--- /dev/null
+++ b/mysql-test/t/mysqlbinlog_base64_flag.test
@@ -0,0 +1,170 @@
+
+# This test case verifies that the mysqlbinlog --base64-output=X flags
+# work as expected, and that BINLOG statements with row events fail if
+# they are not preceded by BINLOG statements with Format description
+# events.
+#
+# See also BUG#32407.
+
+
+# BINLOG statement does not work in embedded mode.
+source include/not_embedded.inc;
+
+disable_warnings;
+DROP TABLE IF EXISTS t1;
+enable_warnings;
+
+# Test to show BUG#32407.  This reads a binlog created with the
+# mysql-5.1-telco-6.1 tree, specifically at the tag
+# mysql-5.1.15-ndb-6.1.23, and applies it to the database.  The test
+# should fail before BUG#32407 was fixed and succeed afterwards.
+--echo ==== Test BUG#32407 ====
+
+# The binlog contains row events equivalent to:
+# CREATE TABLE t1 (a int) engine = myisam
+# INSERT INTO t1 VALUES (1), (1)
+exec $MYSQL_BINLOG suite/binlog/std_data/bug32407.001 | $MYSQL;
+# The above line should succeed and t1 should contain two ones
+select * from t1;
+
+
+# Test that a BINLOG statement encoding a row event fails unless a
+# Format_description_event as been supplied with an earlier BINLOG
+# statement.
+--echo ==== Test BINLOG statement w/o FD event ====
+
+# This is a binlog statement consisting of one Table_map_log_event and
+# one Write_rows_log_event.  Together, they correspond to the
+# following query:
+# INSERT INTO TABLE test.t1 VALUES (2)
+
+error ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT;
+BINLOG '
+SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
+';
+# The above line should fail and 2 should not be in the table
+select * from t1;
+
+
+# Test that it works to read a Format_description_log_event with a
+# BINLOG statement, followed by a row-event in base64 from the same
+# version.
+--echo ==== Test BINLOG statement with FD event ====
+
+# This is a binlog statement containing a Format_description_log_event
+# from the same version as the Table_map and Write_rows_log_event.
+BINLOG '
+ODdYRw8BAAAAZgAAAGoAAAABAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAA4N1hHEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+
+# This is a Table_map_log_event+Write_rows_log_event corresponding to:
+# INSERT INTO TABLE test.t1 VALUES (3)
+BINLOG '
+TFtYRxMBAAAAKQAAAH8BAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+TFtYRxcBAAAAIgAAAKEBAAAQABAAAAAAAAEAAf/+AwAAAA==
+';
+# The above line should succeed and 3 should be in the table
+select * from t1;
+
+
+# Test that mysqlbinlog stops with an error message when the
+# --base64-output=never flag is used on a binlog with base64 events.
+--echo ==== Test --base64-output=never on a binlog with row events ====
+
+# mysqlbinlog should fail
+--replace_regex /#[0-9][0-9][0-9][0-9][0-9][0-9] .*/<#>/   /SET \@\@session.pseudo_thread_id.*/<#>/
+error 1;
+exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/bug32407.001;
+# the above line should output the query log event and then stop
+
+
+# Test that the following fails cleanly: "First, read a
+# Format_description event which has N event types. Then, read an
+# event of type M>N"
+--echo ==== Test non-matching FD event and Row event ====
+
+# This is the Format_description_log_event from
+# bug32407.001, encoded in base64. It contains only the old
+# row events (number of event types is 22)
+BINLOG '
+4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAADgJ1hHEzgNAAgAEgAEBAQEEgAATwAEGggICAg=
+';
+
+# The following is a Write_rows_log_event with event type 23, i.e.,
+# not supported by the Format_description_log_event above.  It
+# corresponds to the following query:
+# INSERT INTO t1 VALUES (5)
+error 1149;
+BINLOG '
+Dl1YRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
+Dl1YRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+BQAAAA==
+';
+# the above line should fail and 5 should not be in the binlog.
+select * from t1;
+
+# Test that BUG#37426 is triggered.
+
+CREATE TABLE char128_utf8 (
+    i1 INT NOT NULL,
+    c CHAR(128) CHARACTER SET utf8 NOT NULL,
+    i2 INT NOT NULL);
+CREATE TABLE char63_utf8 (
+      i1 INT NOT NULL,
+      c CHAR(63) CHARACTER SET utf8 NOT NULL,
+      i2 INT NOT NULL);
+
+#
+# This is the format description log event
+#
+
+BINLOG '
+MuNkSA8BAAAAZgAAAGoAAAAAAAQANS4xLjI1LXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAy42RIEzgNAAgAEgAEBAQEEgAAUwAEGggAAAAICAgC
+';
+
+# ... this event corresponding to
+#
+#    INSERT INTO char63_utf8 VALUES ( 1, "123", 1 )
+#
+# The binlog event below shall not trigger the bug check
+
+BINLOG '
+3u9kSBMBAAAANgAAAJYBAAAAABAAAAAAAAAABHRlc3QAC2NoYXI2M191dGY4AAMD/gMC/r0A
+3u9kSBcBAAAAKgAAAMABAAAQABAAAAAAAAEAA//4AQAAAAMxMjMBAAAA
+';
+SELECT * FROM char63_utf8;
+
+# ... and this is an event corresponding to
+#
+#    INSERT INTO char128_utf8 VALUES ( 1, "123", 1 )
+#
+# The binlog event below shall trigger the bug check and produce an error
+#
+
+error ER_UNKNOWN_ERROR;
+BINLOG '
+iONkSBMBAAAANwAAAJkBAAAAABAAAAAAAAAABHRlc3QADGNoYXIxMjhfdXRmOAADA/4DAv6AAA==
+iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
+';
+
+drop table t1, char63_utf8, char128_utf8;
+
+call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
+
+--echo #
+--echo # Bug #54393: crash and/or valgrind errors in
+--echo # mysql_client_binlog_statement
+--echo #
+--error ER_SYNTAX_ERROR
+BINLOG '';
+--error ER_BASE64_DECODE_ERROR
+BINLOG '123';
+--error ER_BASE64_DECODE_ERROR
+BINLOG '-2079193929';
+--error ER_BASE64_DECODE_ERROR
+BINLOG 'xç↓%~∙D╒ƒ╡';
diff --git a/mysql-test/t/mysqlbinlog_hexdump.test b/mysql-test/t/mysqlbinlog_hexdump.test
new file mode 100644
index 000000000000..332f17233733
--- /dev/null
+++ b/mysql-test/t/mysqlbinlog_hexdump.test
@@ -0,0 +1,7 @@
+
+#
+# Bug#11747887 - MYSQLBINLOG --HEXDUMP PRINTS LAST ROW OF HEXDUMP
+#                INCORRECTLY
+
+--replace_regex s/	Xid = [0-9]*/	Xid = <number>/#
+--exec $MYSQL_BINLOG --hexdump suite/binlog/std_data/bug11747887-bin.000003
diff --git a/mysql-test/t/mysqld--defaults-file.test b/mysql-test/t/mysqld--defaults-file.test
index d31982bebf15..8e0652b5a205 100644
--- a/mysql-test/t/mysqld--defaults-file.test
+++ b/mysql-test/t/mysqld--defaults-file.test
@@ -16,19 +16,21 @@ exec $MYSQLD --defaults-file=/path/with/no/extension --print-defaults 2>&1;
 --error 1
 exec $MYSQLD --defaults-file=/path/with.ext --print-defaults 2>&1;
 
---replace_result mysqld-debug mysqld $MYSQL_TEST_DIR MYSQL_TEST_DIR
+# Using $MYSQL_TEST_DIR_ABS which contains canonical path to the
+# test directory since --print-default prints the absolute path.
+--replace_result mysqld-debug mysqld $MYSQL_TEST_DIR_ABS MYSQL_TEST_DIR
 --error 1
 exec $MYSQLD --defaults-file=relative/path/with.ext --print-defaults 2>&1;
 
---replace_result mysqld-debug mysqld $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result mysqld-debug mysqld $MYSQL_TEST_DIR_ABS MYSQL_TEST_DIR
 --error 1
 exec $MYSQLD --defaults-file=relative/path/without/extension --print-defaults 2>&1;
 
---replace_result mysqld-debug mysqld $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result mysqld-debug mysqld $MYSQL_TEST_DIR_ABS MYSQL_TEST_DIR
 --error 1
 exec $MYSQLD --defaults-file=with.ext --print-defaults 2>&1;
 
---replace_result mysqld-debug mysqld $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result mysqld-debug mysqld $MYSQL_TEST_DIR_ABS MYSQL_TEST_DIR
 --error 1
 exec $MYSQLD --defaults-file=no_extension --print-defaults 2>&1;
 
diff --git a/mysql-test/t/mysqld_daemon.test b/mysql-test/t/mysqld_daemon.test
index da7e67fb77ae..acf0e6c329ce 100644
--- a/mysql-test/t/mysqld_daemon.test
+++ b/mysql-test/t/mysqld_daemon.test
@@ -37,7 +37,7 @@ let $other_page_size_nk= `SELECT CONCAT($other_page_size_k,'k')`;
 --exec $MYSQL -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root -e "SHOW DATABASES" 2>&1
 
 #  Shutdown mysqld with mysqladmin
---exec $MYSQLADMIN -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
+--exec $MYSQLADMIN --no-defaults -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
 
 # Delay introduced - mysqld_safe takes some time to restart mysqld
 --source include/wait_until_disconnected.inc
diff --git a/mysql-test/t/mysqld_safe.test b/mysql-test/t/mysqld_safe.test
index 1f7f052164da..dc45d969f5a9 100644
--- a/mysql-test/t/mysqld_safe.test
+++ b/mysql-test/t/mysqld_safe.test
@@ -65,7 +65,7 @@ connection default;
 --exec $MYSQL -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root -e "SHOW DATABASES" 2>&1
 
 # 8) Shutdown mysqld with mysqladmin
---exec $MYSQLADMIN -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
+--exec $MYSQLADMIN --no-defaults -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
 
 # Delay introduced - mysqld_safe takes some time to restart mysqld
 --source include/wait_until_disconnected.inc
diff --git a/mysql-test/t/mysqldump-binary.test b/mysql-test/t/mysqldump-binary.test
new file mode 100644
index 000000000000..c8f04cea7b15
--- /dev/null
+++ b/mysql-test/t/mysqldump-binary.test
@@ -0,0 +1,77 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+--echo # Bug#22601255 Restoring a dump of binary column, made with mysqldump, warns of invalid string
+
+CREATE TABLE t1(
+u CHAR(10),
+b BINARY(16),
+blo BLOB,
+g GEOMETRY,
+bi BIT(64));
+
+# These bytes are not valid utf8, except for the first column.
+INSERT INTO t1 VALUES(
+'basic',
+x'EE0C6D03C34C11E5B1640026B977EB17',
+x'EE0C6D03C34C11E5B1640026B977EB17',
+ST_GeomFromText('POINT(1 1)'),
+x'EE0C6D03C34C11E5');
+
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+
+# Before fix you would see
+# Warning (Code 1300): Invalid utf8mb4 character string: 'EE0C6D'
+# Warning (Code 1300): Invalid utf8mb4 character string: 'F03F00'
+
+--exec $MYSQL_DUMP --skip-comments test > $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+DROP TABLE t1;
+--exec $MYSQL --show-warnings test < $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+
+SHOW CREATE TABLE t1;
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+
+# non-extended INSERT had same problem; it has different code path
+
+--exec $MYSQL_DUMP --skip-extended-insert --skip-comments test > $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+DROP TABLE t1;
+--exec $MYSQL --show-warnings test < $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+
+SHOW CREATE TABLE t1;
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+
+# Same test with mysqlPUMP
+
+--exec $MYSQL_PUMP --include-databases test > $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+DROP TABLE t1;
+--exec $MYSQL --show-warnings test < $MYSQLTEST_VARDIR/tmp/bug22601255.sql
+
+SHOW CREATE TABLE t1;
+SELECT
+u='basic',
+HEX(b)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(blo)='EE0C6D03C34C11E5B1640026B977EB17',
+HEX(g)='000000000101000000000000000000F03F000000000000F03F',
+HEX(bi)='EE0C6D03C34C11E5',
+ST_AsText(g) FROM t1;
+
+DROP TABLE t1;
+--remove_file $MYSQLTEST_VARDIR/tmp/bug22601255.sql
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 570b4ebb471d..243daacd930a 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1782,7 +1782,7 @@ show create event ee1;
 
 ## prove three works (with spaces and tabs on the end)
 # start with one from the previous restore
-create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5;	      
+create event ee2 on schedule at '2029-12-31 21:01:23' do set @a=5;
 create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;    		
 show events;
 --exec $MYSQL_DUMP --events second > $MYSQLTEST_VARDIR/tmp/bug16853-2.sql
@@ -2719,3 +2719,21 @@ SET GLOBAL relay_log_info_repository= 'FILE';
 
 SHOW VARIABLES LIKE "master_info_repository";
 SHOW VARIABLES LIKE "relay_log_info_repository";
+
+--echo #
+--echo # Bug#27931181: RESTAURE DUMP CREATED WITH 5.7.22 ON 8.0.11
+--echo #
+
+CREATE DATABASE bug27931181;
+USE bug27931181;
+CREATE TABLE t1 (a INT);
+SET sql_mode='NO_AUTO_CREATE_USER';
+CREATE TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.a = 1;
+SET sql_mode='NO_AUTO_CREATE_USER,ONLY_FULL_GROUP_BY';
+CREATE PROCEDURE p1() SELECT 1;
+SET sql_mode=@@global.sql_mode;
+CREATE FUNCTION f1() RETURNS INT RETURN 1;
+
+--exec $MYSQL_DUMP --skip-comments --databases --events --triggers --routines bug27931181
+#cleanup
+DROP DATABASE bug27931181;
diff --git a/mysql-test/t/mysqldump_bug29998457.test b/mysql-test/t/mysqldump_bug29998457.test
new file mode 100644
index 000000000000..d3de1836ed63
--- /dev/null
+++ b/mysql-test/t/mysqldump_bug29998457.test
@@ -0,0 +1,47 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+--echo # Bug#29998457 MYSQLDUMP GENERATES INVALID INSERT STATEMENTS WITH VARBINARY COLUMNS
+
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE = '';
+let $mysqldumpfile = $MYSQLTEST_VARDIR/tmp/bug29998457.sql;
+CREATE DATABASE test_bug29998457;
+USE test_bug29998457;
+
+--echo #Pre-test cleanup
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (
+pk INT,
+v1 VARCHAR(255),
+v2 VARCHAR(255),
+v3 VARCHAR(255),
+v4 VARCHAR(128),
+v5 VARCHAR(64),
+v6 VARCHAR(16),
+v7 VARCHAR(16),
+v8 VARCHAR(8),
+v9 VARBINARY(32),
+v10 VARBINARY(32));
+
+SELECT '12345678901234567890123456789012345678901234567890' INTO @s;
+
+SELECT CONCAT(@s, @s, @s, @s, @s) INTO @s1;
+
+INSERT INTO t1 VALUES (1, @s1, @s1, @s1, @s1, @s1, @s1, @s1, @s1, '','NULL');
+
+SELECT * FROM test_bug29998457.t1;
+
+--exec $MYSQL_DUMP --skip-comments test_bug29998457 > $mysqldumpfile
+--exec $MYSQL --show-warnings test_bug29998457 < $mysqldumpfile
+
+# Ensure that there were no invalid insert statements generated in the mysqldump
+# output and the dump was restored properly.
+SELECT * FROM test_bug29998457.t1;
+
+#Cleanup
+--remove_file $mysqldumpfile
+DROP DATABASE test_bug29998457;
+SET SQL_MODE = @OLD_SQL_MODE;
diff --git a/mysql-test/t/mysqldump_bug30042589.test b/mysql-test/t/mysqldump_bug30042589.test
new file mode 100644
index 000000000000..e4838635b4b1
--- /dev/null
+++ b/mysql-test/t/mysqldump_bug30042589.test
@@ -0,0 +1,33 @@
+#
+# Bug#30042589: MYSQLDUMP LEAKS MEMORY WHEN SELECTED TABLES
+#               ARE DUMPED WITH --ORDER-BY-PRIMARY
+#
+
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS table1;
+drop database if exists database1;
+--enable_warnings
+
+CREATE DATABASE database1;
+USE database1;
+CREATE TABLE table1(a INT PRIMARY KEY, b INT UNIQUE) engine = InnoDB;
+CREATE TABLE table2(a INT PRIMARY KEY, b INT UNIQUE) engine = InnoDB;
+
+INSERT INTO table1 VALUES (1, 3);
+INSERT INTO table1 VALUES (2, 2);
+INSERT INTO table1 VALUES (3, 1);
+
+INSERT INTO table2 VALUES (1, 3);
+INSERT INTO table2 VALUES (2, 2);
+INSERT INTO table2 VALUES (3, 1);
+
+--echo ==== mysqldump with --order-by-primary ====
+--replace_regex /-- Server version.*/-- SERVER VERSION/ /-- MySQL dump .*//
+--exec $MYSQL_DUMP --skip-dump-date --order-by-primary --extended-insert=FALSE database1 table1 table2
+
+DROP TABLE table1;
+DROP TABLE table2;
+drop database database1;
diff --git a/mysql-test/t/mysqldump_bugs.test b/mysql-test/t/mysqldump_bugs.test
new file mode 100644
index 000000000000..695b1645fa60
--- /dev/null
+++ b/mysql-test/t/mysqldump_bugs.test
@@ -0,0 +1,77 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug #32141046: MYSQLDUMP SHOULD DUMP USERS REFERENCED IN DEFINER
+--echo #                CLAUSE OF STORED PROGRAMS.
+--echo #
+
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+CREATE DATABASE IF NOT EXISTS db3;
+CREATE DATABASE IF NOT EXISTS db4;
+CREATE DATABASE IF NOT EXISTS mysqj;
+CREATE DATABASE IF NOT EXISTS mysqk;
+CREATE DATABASE IF NOT EXISTS mysqll;
+
+CREATE USER IF NOT EXISTS view_u1;
+CREATE USER IF NOT EXISTS view_u2@my.oracle.com;
+
+CREATE USER IF NOT EXISTS event_u1;
+CREATE USER IF NOT EXISTS event_u2@192.1.1.140;
+
+CREATE USER IF NOT EXISTS trig_u1;
+CREATE USER IF NOT EXISTS trig_u2@xyz.com;
+
+CREATE USER IF NOT EXISTS proc_u1;
+CREATE USER IF NOT EXISTS proc_u2@localhost;
+
+CREATE USER IF NOT EXISTS func_u1;
+CREATE USER IF NOT EXISTS func_u2;
+
+CREATE USER IF NOT EXISTS user_not_referenced_as_definer;
+
+USE db1;
+CREATE TABLE t1 (i int not null, j int);
+
+CREATE DEFINER=view_u1 VIEW v1 AS SELECT * FROM t1;
+CREATE DEFINER=view_u1 VIEW v2 AS SELECT * FROM t1;
+CREATE DEFINER=view_u2@my.oracle.com VIEW v3 AS SELECT * FROM t1;
+CREATE DEFINER=view_u2@my.oracle.com VIEW v4 AS SELECT * FROM t1;
+
+CREATE DEFINER=event_u1 EVENT e1 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u1 EVENT e2 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u2@192.1.1.140 EVENT e3 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+CREATE DEFINER=event_u2@192.1.1.140 EVENT e4 ON SCHEDULE AT '2037-01-01 00:00:00' DISABLE DO SET @a = 5;
+
+CREATE DEFINER=trig_u1 TRIGGER trig1 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u1 TRIGGER trig2 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u2@xyz.com TRIGGER trig3 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+CREATE DEFINER=trig_u2@xyz.com TRIGGER trig4 BEFORE INSERT ON t1 FOR EACH ROW SET @sum = 1;
+
+CREATE DEFINER=proc_u1 PROCEDURE p1() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u1 PROCEDURE p2() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u2@localhost PROCEDURE p3() INSERT INTO t1 VALUES(10);
+CREATE DEFINER=proc_u2@localhost PROCEDURE p4() INSERT INTO t1 VALUES(10);
+
+CREATE DEFINER=func_u1 FUNCTION f1 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u1 FUNCTION f2 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u2 FUNCTION f3 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+CREATE DEFINER=func_u2 FUNCTION f4 (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT('Hello, ',s,'!');
+
+use db2;
+CREATE TABLE t1 (i int not null, j int);
+
+--echo # ensure that mysql database is dumped first before any other database is dumped.
+--exec $MYSQL_DUMP --all-databases --skip-comments --no-create-info --no-data --skip-triggers
+
+#cleanup
+DROP DATABASE IF EXISTS db1;
+DROP DATABASE IF EXISTS db2;
+DROP DATABASE IF EXISTS db3;
+DROP DATABASE IF EXISTS db4;
+DROP DATABASE IF EXISTS mysqj;
+DROP DATABASE IF EXISTS mysqk;
+DROP DATABASE IF EXISTS mysqll;
+DROP USER view_u1, view_u2@my.oracle.com, event_u1, event_u2@192.1.1.140, trig_u1, trig_u2@xyz.com,
+          proc_u1, proc_u2@localhost, func_u1, func_u2, user_not_referenced_as_definer;
diff --git a/mysql-test/t/mysqldump_gtid_state-master.opt b/mysql-test/t/mysqldump_gtid_state-master.opt
new file mode 100644
index 000000000000..53bcd2e424f0
--- /dev/null
+++ b/mysql-test/t/mysqldump_gtid_state-master.opt
@@ -0,0 +1 @@
+--log-slave-updates --enforce-gtid-consistency --gtid-mode=ON --log-bin
diff --git a/mysql-test/t/mysqldump_gtid_state.test b/mysql-test/t/mysqldump_gtid_state.test
new file mode 100644
index 000000000000..de8087cf8902
--- /dev/null
+++ b/mysql-test/t/mysqldump_gtid_state.test
@@ -0,0 +1,117 @@
+--echo #
+--echo # Bug#32843447: GTID_PURGED IS GETTING EMPTY AND GTID_EXECUTED IS
+--echo #               GETTING UPDATED AFTER RESTARTING MYSQL
+--echo #
+
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+--source include/have_gtid.inc
+
+--let $master_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+
+CREATE TABLE t (a INT PRIMARY KEY, b INT);
+INSERT INTO t VALUES (1, 1);
+INSERT INTO t VALUES (2, 1);
+INSERT INTO t VALUES (3, 1);
+INSERT INTO t VALUES (4, 1);
+INSERT INTO t VALUES (5, 1);
+INSERT INTO t VALUES (6, 1);
+
+FLUSH LOGS;
+
+--echo # BEFORE RESET
+--let $assert_text= Committed gtids :- MASTER_UUID:1-7
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-7"
+--source include/assert.inc
+--let $assert_text= No purged gtids
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = ""
+--source include/assert.inc
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+--echo # MYSQLDUMP SKIPING THE DROP DATABASE FOR MYSQL SCHEMA USING THE OPTION --skip-mysql-schema
+--let $dump_file_without_mysql = $MYSQLTEST_VARDIR/tmp/rpl_gtid_state_after_restore_without_mysql.sql
+--exec $MYSQL_DUMP --socket=$MASTER_MYSOCK --single-transaction --add-drop-database --skip-mysql-schema --databases mysql -uroot > $dump_file_without_mysql
+--let SEARCH_FILE= $dump_file_without_mysql
+--let SEARCH_PATTERN=DROP DATABASE IF EXISTS `mysql`
+--source include/search_pattern.inc
+
+--echo # MYSQLDUMP WITHOUT SKIPING THE DROP DATABASE FOR MYSQL SCHEMA
+--let $dump_file_with_mysql = $MYSQLTEST_VARDIR/tmp/rpl_gtid_state_after_restore_with_mysql.sql
+--exec $MYSQL_DUMP --socket=$MASTER_MYSOCK --single-transaction --add-drop-database --databases mysql -uroot  > $dump_file_with_mysql
+--let SEARCH_FILE= $dump_file_with_mysql
+--let SEARCH_PATTERN=DROP DATABASE IF EXISTS `mysql`
+--source include/search_pattern.inc
+
+--echo # RESET
+RESET MASTER;
+
+--echo # AFTER RESET
+--let $assert_text= No committed gtids after RESET
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = ""
+--source include/assert.inc
+--let $assert_text= No purged gtids after RESET
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = ""
+--source include/assert.inc
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+--echo # DUMP RESTORE WITH THE DUMP FILE HAVING DROP DATABASE ON MYSQL SCHEMA.
+--exec $MYSQL -h localhost -P $MASTER_MYPORT < $dump_file_with_mysql
+
+--echo # mysqldump will execute FTWRL when used with --single-transaction,
+--echo # every usage of FTWRL will cause FLUSH TABLES, which causes an
+--echo # extra GTID.
+
+--echo # AFTER RESTORE
+--let $assert_text= Committed gtids after restore :- MASTER_UUID:1-9
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-9"
+--source include/assert.inc
+--let $assert_text= Purged gtids after restore :- MASTER_UUID:1-9
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = "$master_uuid:1-9"
+--source include/assert.inc
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+--echo # INSERT
+INSERT INTO t VALUES (7, 1);
+INSERT INTO t VALUES (8, 1);
+INSERT INTO t VALUES (9, 1);
+
+--echo # AFTER INSERTING
+--let $assert_text= Committed gtids after inserting :- MASTER_UUID:1-12
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-12"
+--source include/assert.inc
+--let $assert_text= Purged gtids after inserting :- MASTER_UUID:1-9
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = "$master_uuid:1-9"
+--source include/assert.inc
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+--let $gtid_executed = `SELECT @@GLOBAL.gtid_executed`
+
+--echo # RESTART
+--source include/restart_mysqld.inc
+
+--echo # AFTER RESTART
+--let $assert_text= Committed gtids after restart :- MASTER_UUID:1-12
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$master_uuid:1-12"
+--source include/assert.inc
+--let $assert_text= Purged gtids after restart :- MASTER_UUID:1-9
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_PURGED]" = "$master_uuid:1-9"
+--source include/assert.inc
+--replace_result $master_uuid MASTER_UUID
+SELECT * FROM mysql.gtid_executed;
+
+--let $assert_text = GTID_EXECUTED is correct after the restart
+--let $assert_cond = "[SELECT @@GLOBAL.gtid_executed]" = "$gtid_executed"
+--source include/assert.inc
+
+CALL mtr.add_suppression(".*InnoDB: Table `mysql`.`innodb_table_stats` not found.*");
+
+SHOW CREATE TABLE `mysql`.`innodb_table_stats`;
+
+--echo #CLEANUP
+DROP TABLE t;
+RESET MASTER;
+--source include/restart_mysqld.inc
diff --git a/mysql-test/t/mysqldump_single_trans_min_privs-master.opt b/mysql-test/t/mysqldump_single_trans_min_privs-master.opt
new file mode 100644
index 000000000000..76f274d27224
--- /dev/null
+++ b/mysql-test/t/mysqldump_single_trans_min_privs-master.opt
@@ -0,0 +1 @@
+--gtid-mode=ON --enforce-gtid-consistency --log-bin=ON
diff --git a/mysql-test/t/mysqldump_single_trans_min_privs.test b/mysql-test/t/mysqldump_single_trans_min_privs.test
new file mode 100644
index 000000000000..27aec85987f3
--- /dev/null
+++ b/mysql-test/t/mysqldump_single_trans_min_privs.test
@@ -0,0 +1,61 @@
+#
+# BUG 35020512 - Provide an option in mysqldump to disable
+# 'FLUSH TABLES WITH READ LOCK' so that RELOAD privilege is not required
+#
+
+# Test is not required to run against embedded server
+--source include/not_embedded.inc
+
+--echo # Create the test database
+CREATE DATABASE bug_test;
+USE bug_test;
+
+--echo # Create the test table
+CREATE TABLE bug(n INT);
+
+--echo # Enter random data which could be dumped
+INSERT INTO bug VALUES(10);
+INSERT INTO bug VALUES(20);
+INSERT INTO bug VALUES(30);
+
+--echo # Create the test user
+CREATE USER test@localhost;
+
+--echo # Grant only SELECT privilege on the test database
+GRANT SELECT ON bug_test.* TO test@localhost;
+SHOW GRANTS FOR test@localhost;
+
+--echo # Create the dump file
+let $mysqldumpfile = $MYSQLTEST_VARDIR/tmp/bug35020512_dump.sql;
+
+--echo # Start the dump tests
+--echo # ----- Test 1 -----
+--echo # GTID enabled on the server, --set-gtid-purged is set to it's default value (AUTO).
+--echo # Should fail because of insufficient privileges.
+--echo # Start the dump
+--error 2
+--exec $MYSQL_DUMP bug_test -utest --single-transaction --no-tablespaces> $mysqldumpfile
+--echo # ----- Test 1 succeeded -----
+
+--echo # ----- Test 2 -----
+--echo # GTID enabled on the server, --set-gtid-purged is set to OFF
+--echo # Should succeed
+--exec $MYSQL_DUMP bug_test -utest --single-transaction --set-gtid-purged=off --no-tablespaces > $mysqldumpfile
+--echo # ----- Test 2 succeeded -----
+
+--echo # ----- Test 3 -----
+--echo # Increase the privileges of test user by granting RELOAD privilege
+GRANT RELOAD ON *.* TO test@localhost;
+SHOW GRANTS FOR test@localhost;
+--echo # Start the dump with --set-gtid-purged=ON
+--echo # Should succeed
+--exec $MYSQL_DUMP bug_test -utest --single-transaction --set-gtid-purged=ON --no-tablespaces > $mysqldumpfile
+--echo # ----- Test 3 succeeded -----
+
+--echo # ----- End of tests -----
+
+# Cleanup
+DROP USER test@localhost;
+DROP DATABASE bug_test;
+RESET MASTER;
+--remove_file $mysqldumpfile
diff --git a/mysql-test/t/mysqlpump.test b/mysql-test/t/mysqlpump.test
index e797a16d15d0..63c1a25d6a76 100644
--- a/mysql-test/t/mysqlpump.test
+++ b/mysql-test/t/mysqlpump.test
@@ -159,5 +159,57 @@ SHOW VARIABLES LIKE "relay_log_info_repository";
 # Cleanup
 --remove_file $SEARCH_FILE
 
+--echo #
+--echo # Bug #27096081: MYSQLPUMP VALIDATES ALL DATABASE OBJECTS BY
+--echo #                IGNORING --INCLUDE_DATABASES OPTION
+--echo #
+
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1(id INT);
+INSERT INTO t1 SELECT 1;
+CREATE VIEW v1 AS SELECT * FROM t1;
+
+CREATE DATABASE db2;
+USE db2;
+CREATE TABLE t2(id INT);
+INSERT INTO t2 SELECT 1;
+
+CREATE USER 'u1'@'%' IDENTIFIED BY 'abc';
+GRANT ALL ON *.* TO 'u1'@'%';
+FLUSH PRIVILEGES;
+
+--connect(conn1, localhost, u1, abc)
+
+USE db2;
+CREATE VIEW v2 AS SELECT * FROM t2;
+SHOW CREATE VIEW v2;
+
+DROP USER 'u1'@'%';
+FLUSH PRIVILEGES;
+
+--connection default
+--disconnect conn1
+
+--exec $MYSQL_PUMP --include-databases=db1 --log-error-file=$MYSQLTEST_VARDIR/log/bug27096081.log > $MYSQLTEST_VARDIR/tmp/bug27096081.sql
+
+--error 23, 42, 169, 1449
+--exec $MYSQL_PUMP --include-databases=db2 --log-error-file=$MYSQLTEST_VARDIR/log/bug27096081.log > $MYSQLTEST_VARDIR/tmp/bug27096081.sql
+
+--let SEARCH_FILE= $MYSQLTEST_VARDIR/log/bug27096081.log
+--let SEARCH_PATTERN= \[ERROR\] \(1449\) The user specified as a definer \('u1'@'%'\) does not exist
+--source include/search_pattern_in_file.inc
+--remove_file $SEARCH_FILE
+
+CREATE USER 'u1'@'%' IDENTIFIED BY 'abc';
+
+--exec $MYSQL_PUMP --include-databases=db2 --log-error-file=$MYSQLTEST_VARDIR/log/bug27096081.log > $MYSQLTEST_VARDIR/tmp/bug27096081.sql
+
+# Cleanup
+DROP USER 'u1'@'%';
+DROP DATABASE db1;
+DROP DATABASE db2;
+--remove_file $MYSQLTEST_VARDIR/tmp/bug27096081.sql
+--remove_file $MYSQLTEST_VARDIR/log/bug27096081.log
 
 # END OF TEST
diff --git a/mysql-test/t/mysqlpump_basic.test b/mysql-test/t/mysqlpump_basic.test
index 0081f6b4ceb4..f85c0ef99a9e 100644
--- a/mysql-test/t/mysqlpump_basic.test
+++ b/mysql-test/t/mysqlpump_basic.test
@@ -656,7 +656,7 @@ SHOW CREATE TABLE test.t1;
 
 --let $program= $MYSQL_PUMP --include-databases=test --include-tables=t1
 
---exec $PROGRAM >> $MYSQL_TMP_DIR/mysqlpump.sql
+--exec $PROGRAM > $MYSQL_TMP_DIR/mysqlpump.sql
 
 DROP TABLE `test`.`t1`;
 
@@ -667,3 +667,51 @@ SHOW CREATE TABLE test.t1;
 DROP TABLE `test`.`t1`;
 DROP TABLESPACE `mytbsp`;
 
+--remove_file $MYSQL_TMP_DIR/mysqlpump.sql
+
+-- echo #
+-- echo # Bug#29023216: MYSQLPUMP SHOULD WRITE USERS AND GRANTS BEFORE VIEWS AND STORED PROGRAMS
+-- echo #
+
+CREATE DATABASE DB29023216;
+CREATE USER 'VIEWUSER'@'LOCALHOST';
+GRANT ALL ON *.* TO 'VIEWUSER'@'LOCALHOST';
+
+USE DB29023216;
+#case1: view defined on another view with definer set to non existing user
+CREATE TABLE T1 (ID INT UNSIGNED NOT NULL PRIMARY KEY, VAL VARCHAR(10));
+CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY INVOKER VIEW V_T1_A AS SELECT * FROM T1;
+CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY DEFINER VIEW V_T1_B AS SELECT * FROM T1;
+CREATE SQL SECURITY DEFINER VIEW V_T1_A2 AS SELECT * FROM V_T1_A;
+CREATE SQL SECURITY DEFINER VIEW V_T1_B2 AS SELECT * FROM V_T1_B;
+
+--exec $MYSQL_PUMP --exclude-databases=mtr --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
+# restore should succeed
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+
+USE DB29023216;
+SELECT * FROM V_T1_A;
+SELECT * FROM V_T1_B;
+SELECT * FROM V_T1_A2;
+SELECT * FROM V_T1_B2;
+
+#case2: view defined on function with definer set to non existing user
+CREATE DEFINER=VIEWUSER@LOCALHOST FUNCTION TESTFUNC() RETURNS BOOL RETURN TRUE;
+CREATE VIEW V_T1_C AS SELECT DB29023216.TESTFUNC();
+
+--exec $MYSQL_PUMP --exclude-databases=mtr --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
+# restore should succeed
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+
+USE DB29023216;
+SELECT * FROM V_T1_C;
+
+#cleanup
+DROP DATABASE DB29023216;
+DROP USER 'VIEWUSER'@'LOCALHOST';
diff --git a/mysql-test/t/mysqlpump_bugs.test b/mysql-test/t/mysqlpump_bugs.test
new file mode 100644
index 000000000000..10ff743a203d
--- /dev/null
+++ b/mysql-test/t/mysqlpump_bugs.test
@@ -0,0 +1,69 @@
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug #83144: mysqlpump reads mysql_dump group, not mysqlpump in config-group
+--echo #
+
+--write_file $MYSQLTEST_VARDIR/tmp/bug83144.cnf
+[mysqlpump]
+exclude_databases=db1,mysql,mtr
+EOF
+
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+
+--exec $MYSQLPUMP --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/bug83144.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot > $MYSQLTEST_VARDIR/tmp/bug83144.dump
+
+DROP DATABASE db1;
+DROP DATABASE db2;
+
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug83144.dump
+
+SHOW DATABASES like 'db%';
+
+#cleanup
+DROP DATABASE db2;
+--remove_file $MYSQLTEST_VARDIR/tmp/bug83144.cnf
+--remove_file $MYSQLTEST_VARDIR/tmp/bug83144.dump
+
+
+--echo #
+--echo # Bug #32067013: MYSQLPUMP SEGMENTATION FAULT
+--echo #
+
+CREATE DATABASE B32067013;
+CREATE TABLE B32067013.t1(v1 INT, v2 INT);
+CREATE TABLE B32067013.t2(v1 INT, v2 INT);
+CREATE VIEW B32067013.t123 AS SELECT * FROM B32067013.t1;
+DROP TABLE B32067013.t1;
+
+--echo # Test criteria: shouldn't crash
+--error 76,1356
+--exec $MYSQL_PUMP --all-databases > $MYSQLTEST_VARDIR/tmp/bug32067013.dump 2>&1
+
+#cleanup
+DROP DATABASE B32067013;
+--remove_file $MYSQLTEST_VARDIR/tmp/bug32067013.dump
+
+
+--echo #
+--echo # Bug#33866103 : MYSQLPUMP [ERROR] (1356) WITH VIEW CONTAINING FROM SUBQUERY - REGRESSION
+--echo #
+
+CREATE DATABASE db1;
+
+CREATE TABLE db1.t1 (c1 int);
+CREATE TABLE db1.t2 (c1 int);
+
+USE db1;
+
+CREATE VIEW db1.v12 AS (SELECT * FROM (SELECT * FROM db1.t1 UNION SELECT * FROM db1.t2) AS t12);
+
+--exec $MYSQL_PUMP -u root --result-file=$MYSQLTEST_VARDIR/tmp/bug33866103.sql
+
+--remove_file $MYSQLTEST_VARDIR/tmp/bug33866103.sql
+
+DROP DATABASE db1;
+
+
+--echo # End of 5.7 tests
diff --git a/mysql-test/t/mysqlpump_partial_bkp.test b/mysql-test/t/mysqlpump_partial_bkp.test
index 1568aad14268..ac6820f5d734 100644
--- a/mysql-test/t/mysqlpump_partial_bkp.test
+++ b/mysql-test/t/mysqlpump_partial_bkp.test
@@ -1,5 +1,4 @@
 --source include/not_embedded.inc
---source include/not_valgrind.inc
 
 --echo #
 --echo # Bug#26199978 - WRONG ERROR MESSAGE FOR PARTIAL BACKUPS WITH GTID_MODE = ON
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 37f4dc8a4a0f..c6cec34a7036 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -3063,3 +3063,20 @@ SELECT 19.955934879;
 --echo # The minimum value which can be passed is 0
 --error 1
 --exec echo "replace_numeric_round -1;" | $MYSQL_TEST 2>&1
+
+--echo #
+--echo # BUG#26630826: MTR: REPLACE_RESULT IS NOT ABLE TO REPLACE LONG
+--echo #               STRINGS IN PATH NAME
+--echo #
+
+# Check whether replace_result replaces a matching long string pattern
+# when used with exec mysqltest command.
+--let $replace_string= `SELECT REPEAT('A', 550)`
+--replace_result $replace_string REPLACE_STRING
+--exec echo $replace_string
+
+# replace_result with long string pattern as argument used with exec
+# command which fails with error 1, pattern should get replaced.
+--replace_result $replace_string REPLACE_STRING tab1 t1
+--error 1
+--exec echo "SELECT $replace_string FROM tab1;" | $MYSQL_TEST  2>&1
diff --git a/mysql-test/t/no_engine_substitution-master.opt b/mysql-test/t/no_engine_substitution-master.opt
new file mode 100644
index 000000000000..bfd39f1162b9
--- /dev/null
+++ b/mysql-test/t/no_engine_substitution-master.opt
@@ -0,0 +1,2 @@
+$EXAMPLE_PLUGIN_OPT
+--disabled_storage_engines=InnoDB
diff --git a/mysql-test/t/no_engine_substitution.test b/mysql-test/t/no_engine_substitution.test
new file mode 100644
index 000000000000..aaee8a6eae20
--- /dev/null
+++ b/mysql-test/t/no_engine_substitution.test
@@ -0,0 +1,181 @@
+--source include/have_example_plugin.inc
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug#27502530: DISABLING NO_ENGINE_SUBSTITUTION DOES NOT BEHAVE AS
+--echo #               DOCUMENTED
+--echo #
+
+CALL mtr.add_suppression("default_storage_engine is set to a disabled storage engine .*");
+CALL mtr.add_suppression("default_tmp_storage_engine is set to a disabled storage engine .*");
+
+--echo # Started the server by disabling InnoDB using system variable 'disabled_storage_engines'
+SELECT @@disabled_storage_engines;
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+SELECT @@default_storage_engine;
+
+--echo
+--echo # NO_ENGINE_SUBSTITUTION enabled
+--disable_warnings
+SET SQL_MODE= 'NO_ENGINE_SUBSTITUTION';
+--enable_warnings
+
+CREATE TABLE t1(c1 INT) ENGINE= MyISAM;
+SHOW CREATE TABLE t1;
+INSERT INTO t1 VALUES(1);
+
+--error ER_DISABLED_STORAGE_ENGINE
+CREATE TABLE t2(c1 INT) ENGINE= InnoDB;
+
+--error ER_DISABLED_STORAGE_ENGINE
+CREATE TEMPORARY TABLE t2(c1 INT) ENGINE= InnoDB;
+
+--error ER_DISABLED_STORAGE_ENGINE
+ALTER TABLE t1 ENGINE= InnoDB;
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--echo # Restart the server disabling the myisam storage engine using variable 'disabled_storage_engines'
+--exec echo "restart: --disabled_storage_engines=myisam,example" >$MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SELECT @@disabled_storage_engines;
+SET @old_default_engine= @@default_storage_engine;
+
+--echo # Changing the default engine to InnoDB
+SET DEFAULT_STORAGE_ENGINE= InnoDB;
+SELECT @@default_storage_engine;
+
+--error ER_DISABLED_STORAGE_ENGINE
+CREATE TABLE t2(c1 INT) ENGINE= MyISAM;
+
+SELECT * FROM t1;
+
+--echo # Checking table creation with dynamic storage plugins
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+--ERROR ER_DISABLED_STORAGE_ENGINE
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+
+--echo
+--echo # NO_ENGINE_SUBSTITUTION disabled
+--disable_warnings
+SET SQL_MODE='';
+--enable_warnings
+
+--echo # The disabled engine is substituted with the default engine for the table.
+
+# Engine for the table substituted to InnoDB
+CREATE TABLE t2(c1 INT) ENGINE= MyISAM;
+SHOW CREATE TABLE t2;
+
+CREATE TABLE t3 LIKE t1;
+SHOW CREATE TABLE t3;
+
+CREATE TEMPORARY TABLE t4(c1 INT) ENGINE= MyISAM;
+SHOW CREATE TABLE t4;
+
+CREATE TABLE t5 (c1 INT) ENGINE= ARCHIVE;
+--echo # ALTER TABLE ... ENGINE reports a warning and the table is not altered.
+ALTER TABLE t5 ENGINE= MyISAM;
+SHOW CREATE TABLE t5;
+
+DELIMITER /;
+CREATE PROCEDURE p1()
+BEGIN
+  CREATE TABLE t6(c1 INT) ENGINE= MyISAM;
+END /
+
+DELIMITER ;/
+CALL p1();
+SHOW CREATE TABLE t6;
+
+CREATE TABLE t7 (c1 INT) ENGINE= EXAMPLE;
+SHOW CREATE TABLE t7;
+
+# If disabled engine and the default engine are the same.
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+--error ER_DISABLED_STORAGE_ENGINE
+CREATE TABLE t8 (c1 INT) ENGINE= MyISAM;
+
+# If disabled engine and default engine both are in the disabled SE list.
+--error ER_DISABLED_STORAGE_ENGINE
+CREATE TABLE t8 (c1 INT) ENGINE= EXAMPLE;
+
+# Cleanup
+UNINSTALL PLUGIN EXAMPLE;
+DROP PROCEDURE p1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE t5;
+DROP TABLE t6;
+DROP TABLE t7;
+
+SET @@default_storage_engine=@old_default_engine;
+--disable_warnings
+SET sql_mode= DEFAULT;
+--enable_warnings
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--echo # Restart the server disabling archive engine via '--skip-archive or --archive=off'
+--exec echo "restart: --archive=off" >$MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+SET @old_default_engine= @@default_storage_engine;
+SET DEFAULT_STORAGE_ENGINE= MyISAM;
+SET DEFAULT_TMP_STORAGE_ENGINE= MyISAM;
+
+--echo
+--echo # NO_ENGINE_SUBSTITUTION enabled
+--disable_warnings
+SET SQL_MODE='NO_ENGINE_SUBSTITUTION';
+--enable_warnings
+
+--error ER_UNKNOWN_STORAGE_ENGINE
+CREATE TABLE t1 (c1 INT) ENGINE= ARCHIVE;
+
+--error ER_UNKNOWN_STORAGE_ENGINE
+CREATE TEMPORARY TABLE t1 (c1 INT) ENGINE= ARCHIVE;
+
+CREATE TABLE t1 (c1 INT) ENGINE=MyISAM;
+--error ER_UNKNOWN_STORAGE_ENGINE
+ALTER TABLE t1 ENGINE= ARCHIVE;
+
+--echo
+--echo # NO_ENGINE_SUBSTITUTION disabled
+--disable_warnings
+SET SQL_MODE='';
+--enable_warnings
+
+CREATE TABLE t2 (c1 INT) ENGINE=ARCHIVE;
+SHOW CREATE TABLE t2;
+
+CREATE TEMPORARY TABLE t3 (c1 INT) ENGINE= ARCHIVE;
+SHOW CREATE TABLE t3;
+
+--echo # ALTER TABLE .. ENGINE reports a warning and the table is not altered.
+ALTER TABLE t1 ENGINE= ARCHIVE;
+SHOW CREATE TABLE t1;
+
+--echo
+# Cleanup
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+
+SET @@default_storage_engine= @old_default_engine;
+--disable_warnings
+SET sql_mode = DEFAULT;
+--enable_warnings
+
+--source include/restart_mysqld.inc
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
index 08ad2aec6e1b..d400182d58f6 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -16,20 +16,21 @@ drop table if exists t1;
 create table t1(f1 int);
 insert into t1 values (5);
 
-let $cipher_val= "DHE-RSA-AES256-SHA";
-let $shavars= query_get_value("SHOW STATUS LIKE 'Rsa_public_key'", Variable_name, 1);
-if ($shavars == 'Rsa_public_key'){
-  let $cipher_val= "DHE-RSA-AES128-GCM-SHA256";
-}
+connect (con0,localhost,root,,,,,SSL);
+connection con0;
+let $cipher= query_get_value("SHOW STATUS like 'Ssl_cipher'", Value, 1);
+let $cipher_val= "$cipher";
+connection default;
+disconnect con0;
 
 grant select on test.* to ssl_user1@localhost require SSL;
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 -- eval grant select on test.* to ssl_user2@localhost require cipher $cipher_val
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 -- eval grant select on test.* to ssl_user3@localhost require cipher $cipher_val AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 -- eval grant select on test.* to ssl_user4@localhost require cipher $cipher_val AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 -- eval grant select on test.* to ssl_user5@localhost require cipher $cipher_val AND SUBJECT "xxx"
 flush privileges;
 
@@ -43,7 +44,7 @@ connect (con5,localhost,ssl_user5,,,,,SSL);
 
 connection con1;
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 select * from t1;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -51,7 +52,7 @@ delete from t1;
 
 connection con2;
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 select * from t1;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -59,7 +60,7 @@ delete from t1;
 
 connection con3;
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 select * from t1;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -67,7 +68,7 @@ delete from t1;
 
 connection con4;
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 select * from t1;
 --error ER_TABLEACCESS_DENIED_ERROR
@@ -130,7 +131,6 @@ drop table t1;
 #
 # Bug#21611 Slave can't connect when master-ssl-cipher specified
 # - Apparently selecting a cipher doesn't work at all
-# - Usa a cipher that both yaSSL and OpenSSL supports
 #
 --exec echo "SHOW STATUS LIKE 'Ssl_cipher'; exit;" > $MYSQLTEST_VARDIR/tmp/test.sql
 --exec $MYSQL_TEST --ssl-mode=REQUIRED --ssl-cipher=DHE-RSA-AES256-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
@@ -142,7 +142,7 @@ drop table t1;
 # verification of servers certificate by setting both ca certificate
 # and ca path to NULL
 #
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-mode=REQUIRED --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
 --echo End of 5.0 tests
 
@@ -229,11 +229,9 @@ DROP TABLE t1;
 #           YaSSL to crash the server.
 #
 
-# Common ciphers to openssl and yassl
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-mode=REQUIRED --ssl-cipher=DHE-RSA-AES256-SHA
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-mode=REQUIRED --ssl-cipher=DHE-RSA-AES128-SHA:
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-mode=REQUIRED --ssl-cipher=AES256-SHA
---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-mode=REQUIRED --ssl-cipher=DHE-RSA-AES128-SHA
 --disable_query_log
 --disable_result_log
 
@@ -269,7 +267,7 @@ select 'is still running; no cipher request crashed the server' as result from d
 GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
 FLUSH PRIVILEGES;
 connect(con1,localhost,bug42158,,,,,SSL);
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 disconnect con1;
 connection default;
diff --git a/mysql-test/t/opt_costmodel_warnings.test b/mysql-test/t/opt_costmodel_warnings.test
index cfbc34069e93..0d01693ca134 100644
--- a/mysql-test/t/opt_costmodel_warnings.test
+++ b/mysql-test/t/opt_costmodel_warnings.test
@@ -1,7 +1,3 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-
 #
 # Test that provides code coverage for the code that checks and handles
 # entries in the cost constant tables that has invalid values.
diff --git a/mysql-test/t/order_by_limit.test b/mysql-test/t/order_by_limit.test
index 20ba939abf11..6a5376812e5d 100644
--- a/mysql-test/t/order_by_limit.test
+++ b/mysql-test/t/order_by_limit.test
@@ -165,3 +165,93 @@ eval $query;
 
 DROP TABLE t0, t1, t2;
 
+--echo #
+--echo # Bug 31686878 - BACKPORT MAIN BUG 30348211 TO RELEASE 5.7
+--echo #
+
+CREATE TABLE t (id BIGINT NOT NULL, other_id BIGINT NOT NULL,
+ covered_column VARCHAR(50) NOT NULL, non_covered_column VARCHAR(50) NOT NULL,
+ PRIMARY KEY (id),
+ INDEX index_other_id_covered_column (other_id, covered_column));
+
+let $n = 10;
+while ($n)
+{
+  eval INSERT INTO t (id, other_id, covered_column, non_covered_column)
+       VALUES ($n, $n, '$n', '$n');
+  dec $n;
+}
+
+SET
+  optimizer_trace = "enabled=on",
+  optimizer_trace_max_mem_size = 1000000,
+  end_markers_in_json = ON;
+
+#echo "With prefer_ordering_index=on, ordering index will be picked."
+#echo "The original plan is discarded and a new one using ordering index "
+#echo "is picked."
+SET optimizer_switch = "prefer_ordering_index=on";
+ANALYZE TABLE t;
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+#echo "With prefer_ordering_index=off, ordering index should not be picked"
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_0 FROM information_schema.optimizer_trace;
+
+#echo "With prefer_ordering_index=default, ordering index should be picked"
+SET optimizer_switch = default;
+EXPLAIN SELECT non_covered_column FROM t WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+#echo "If an order by index is forced, plan will be to pick ordering index even if"
+#echo "prefer_ordering_index is switched off"
+SET optimizer_switch = "prefer_ordering_index=on";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX(PRIMARY) WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX(PRIMARY) WHERE other_id > 3 ORDER BY id ASC LIMIT 2;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+#Insert some more data for group by
+let $n = 10;
+while ($n)
+{
+  eval INSERT INTO t (id, other_id, covered_column, non_covered_column)
+       VALUES ($n+1+10, $n, '$n', '$n');
+  dec $n;
+}
+
+--source include/turn_off_only_full_group_by.inc
+#echo "With prefer_ordering_index=on, ordering index will be picked."
+#echo "The original plan is discarded and a new one using ordering index "
+#echo "is picked."
+SET optimizer_switch = "prefer_ordering_index=on";
+ANALYZE TABLE t;
+EXPLAIN SELECT non_covered_column FROM t WHERE id > 8 GROUP BY other_id LIMIT 1;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+#echo "With prefer_ordering_index=off, ordering index should not be picked"
+SET optimizer_switch = "prefer_ordering_index=off";
+#EXPLAIN SELECT non_covered_column FROM t WHERE id > 8 GROUP BY other_id LIMIT 1;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_0 FROM information_schema.optimizer_trace;
+
+#echo "With prefer_ordering_index=default, ordering index should be picked"
+SET optimizer_switch = default;
+EXPLAIN SELECT non_covered_column FROM t WHERE id > 8 GROUP BY other_id LIMIT 1;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+#echo "If a group by index is forced, plan will be to pick ordering index "
+#echo "even if prefer_ordering_index is switched off"
+SET optimizer_switch = "prefer_ordering_index=on";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX FOR GROUP BY (index_other_id_covered_column) WHERE id > 8 GROUP BY other_id LIMIT 1;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+
+SET optimizer_switch = "prefer_ordering_index=off";
+EXPLAIN SELECT non_covered_column FROM t FORCE INDEX FOR GROUP BY (index_other_id_covered_column) WHERE id > 8 GROUP BY other_id LIMIT 1;
+SELECT (trace LIKE '%"plan_changed": true%') AS should_be_1 FROM information_schema.optimizer_trace;
+--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
+
+DROP TABLE t;
\ No newline at end of file
diff --git a/mysql-test/t/parser-master.opt b/mysql-test/t/parser-master.opt
new file mode 100644
index 000000000000..6dee8ced3487
--- /dev/null
+++ b/mysql-test/t/parser-master.opt
@@ -0,0 +1 @@
+--max_allowed_packet=18000000
diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test
index 69d9e057185d..ecc03de5999e 100644
--- a/mysql-test/t/parser.test
+++ b/mysql-test/t/parser.test
@@ -1365,3 +1365,27 @@ DROP TABLE t1, t2;
 
 --echo #
 
+--echo
+--echo Bug #27714748: @@PARSER_MAX_MEM_SIZE DOES NOT WORK FOR ROUTINES
+--echo
+
+SET parser_max_mem_size = 10000000; # minimum allowed value
+--let $s = `SELECT REPEAT('x', @@parser_max_mem_size)`
+--disable_query_log
+--error ER_CAPACITY_EXCEEDED
+--eval CREATE PROCEDURE p() SELECT 1 FROM (SELECT '$s') a
+--enable_query_log
+SET parser_max_mem_size = default;
+
+--echo #
+--echo # Bug#30528450: SPECIAL SYMBOL NAMED COLUMN NOT HONORED IN A SELECT
+--echo #
+
+CREATE TABLE t1 (c1 INT, `*` INT, c3 INT);
+INSERT INTO t1 VALUES (1, 2, 3);
+
+SELECT `*` FROM t1;
+SELECT t1.`*`, t1.* FROM t1;
+SELECT test.t1.`*`, test.t1.* FROM t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index d4a501c07831..d1c91be03fcd 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -2550,3 +2550,52 @@ PARTITION BY LINEAR KEY(a) PARTITIONS 2;
 --error ER_DATA_OUT_OF_RANGE
 SELECT 1 FROM t1 WHERE EXP(10000);
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#28573894 ALTER PARTITIONED TABLE ADD AUTO_INCREMENT DIFF RESULT
+--echo #
+CREATE TABLE t (a VARCHAR(10) NOT NULL,b INT,PRIMARY KEY (b)) ENGINE=INNODB
+PARTITION BY RANGE (b)
+(PARTITION pa VALUES LESS THAN (2),
+ PARTITION pb VALUES LESS THAN (20),
+ PARTITION pc VALUES LESS THAN (30),
+ PARTITION pd VALUES LESS THAN (40));
+
+INSERT INTO t
+VALUES('A',0),('B',1),('C',2),('D',3),('E',4),('F',5),('G',25),('H',35);
+
+ALTER TABLE t ADD COLUMN r INT UNSIGNED NOT NULL AUTO_INCREMENT, ADD UNIQUE
+KEY (r,b), ALGORITHM=INPLACE, LOCK=SHARED;
+SELECT * FROM t;
+DROP TABLE t;
+
+--echo #
+--echo # Bug #25207522: INCORRECT ORDER-BY BEHAVIOR ON A PARTITIONED TABLE
+--echo # WITH A COMPOSITE PREFIX INDEX
+--echo #
+CREATE TABLE t(  id int unsigned NOT NULL,
+        data varchar(2) DEFAULT NULL,
+        KEY data_idx (data(1),id)
+        ) DEFAULT CHARSET=utf8
+        /*!50100 PARTITION BY RANGE (id)
+        (PARTITION p10 VALUES LESS THAN (10) ,
+         PARTITION p20 VALUES LESS THAN (20) ) */;
+
+INSERT INTO t VALUES (6, 'ab'), (4, 'ab'), (5, 'ab'), (16, 'ab'), (14, 'ab'), (15, 'ab'), (5, 'ac'), (15, 'aa') ;
+SELECT id FROM t WHERE data = 'ab' ORDER BY id ASC;
+DROP TABLE t;
+
+--echo #
+--echo # Bug#29268656: BOGUS CONSTANT, RANDOM OR TIMEZONE-DEPENDENT
+--echo #               EXPRESSIONS IN (SUB)PARTITIONING FU
+--echo #
+
+# Create table with generated column containing non-deterministic expression
+CREATE TABLE t1 (c1 INT, c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32))) ENGINE=INNODB PARTITION BY HASH(c1);
+CREATE TABLE t2 (c1 INT, c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32))) ENGINE=INNODB PARTITION BY RANGE(c1) (PARTITION p1 VALUES LESS THAN(100));
+
+# Alter table with generated column containing non-deterministic expression
+CREATE TABLE t (c1 INT, c2 INT) ENGINE=INNODB PARTITION BY RANGE(c1) (PARTITION p1 VALUES LESS THAN(100));
+ALTER TABLE t MODIFY COLUMN c2 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32)) STORED;
+ALTER TABLE t ADD COLUMN c3 CHAR(32) GENERATED ALWAYS AS (RANDOM_BYTES(32));
+DROP TABLE t, t1, t2;
diff --git a/mysql-test/t/partition_debug.test b/mysql-test/t/partition_debug.test
index f89e10ecc609..77b88f4b2984 100644
--- a/mysql-test/t/partition_debug.test
+++ b/mysql-test/t/partition_debug.test
@@ -17,3 +17,36 @@ SELECT * FROM t1 WHERE b = "Seven";
 SET SESSION debug="-d,partition_fail_index_init";
 SELECT * FROM t1 WHERE b = "Seven";
 DROP TABLE t1;
+
+
+--echo #
+--echo # Bug #30355485	CRASH WHEN DOING ANY OPERATION ON SUB-PARTITIONED TABLE
+--echo #
+
+--source include/not_embedded.inc
+--let $MYSQLD_DATADIR= `select @@datadir`
+CREATE TABLE t1 (a INT, b INT) ENGINE = INNODB
+PARTITION BY RANGE(a) SUBPARTITION BY HASH(b)
+( PARTITION p0 VALUES LESS THAN (10) (SUBPARTITION s0, SUBPARTITION s1));
+
+--disable_query_log
+call mtr.add_suppression("InnoDB: Operating system error number 2 in a file operation");
+call mtr.add_suppression("InnoDB: The error means the system cannot find the path specified");
+call mtr.add_suppression("InnoDB: Cannot open datafile for read-only:");
+call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
+call mtr.add_suppression("InnoDB: Could not find a valid tablespace file for");
+call mtr.add_suppression("InnoDB: Ignoring tablespace");
+call mtr.add_suppression("InnoDB: Failed to find tablespace for table");
+call mtr.add_suppression("InnoDB: Cannot calculate statistics for table");
+call mtr.add_suppression("InnoDB: Missing .ibd file for table");
+--enable_query_log
+
+--echo # Shut down the server
+--source include/shutdown_mysqld.inc
+--echo # Removing test/t1#P#p0#SP#s0.ibd manually
+--remove_file $MYSQLD_DATADIR/test/t1#P#p0#SP#s0.ibd
+--source include/start_mysqld.inc
+
+--error ER_NO_SUCH_TABLE
+SELECT * FROM t1;
+DROP TABLE t1;
diff --git a/mysql-test/t/partition_exchange.test b/mysql-test/t/partition_exchange.test
index 78b98127d963..3e7c4f8fd796 100644
--- a/mysql-test/t/partition_exchange.test
+++ b/mysql-test/t/partition_exchange.test
@@ -674,3 +674,320 @@ DROP TABLE t, tp, tsp;
 
 SET sql_mode = default;
 SET GLOBAL innodb_default_row_format=default;
+--echo #
+--echo # Bug#19730200: EXCHANGE PARTITION FOR PARTITION WITH DATA DIRECTORY
+--echo #
+--mkdir $MYSQL_TMP_DIR/t1_dir
+--mkdir $MYSQL_TMP_DIR/p1_dir
+--mkdir $MYSQL_TMP_DIR/p2_dir
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+DATA DIRECTORY = '$MYSQL_TMP_DIR/t1_dir';
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t2 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+PARTITION BY LIST (a)
+(PARTITION p1 VALUES IN (1,3,5,7,9) DATA DIRECTORY = '$MYSQL_TMP_DIR/p1_dir',
+ PARTITION p2 VALUES IN (0,2,4,6,8) DATA DIRECTORY = '$MYSQL_TMP_DIR/p2_dir');
+INSERT INTO t1 VALUES (1, "t1"), (5, "t1");
+INSERT INTO t2 VALUES (3, "p1"), (4, "p2"), (7, "p1"), (8, "p2");
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SELECT * FROM t1;
+SELECT * FROM t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+FLUSH TABLES t1, t2;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+DROP TABLE t1, t2;
+--echo # exchage partition with data dir and range
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+DATA DIRECTORY = '$MYSQL_TMP_DIR/t1_dir';
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t2 (a int unsigned auto_increment primary key, b varchar(64))
+ENGINE = InnoDB
+PARTITION BY range (a)
+(PARTITION p1 VALUES less than (10) DATA DIRECTORY = '$MYSQL_TMP_DIR/p1_dir',
+ PARTITION p2 VALUES less than (20) DATA DIRECTORY = '$MYSQL_TMP_DIR/p2_dir');
+INSERT INTO t1 VALUES (1, "t1"), (5, "t1");
+INSERT INTO t2 VALUES (3, "p1"), (4, "p2"), (17, "p1"), (12, "p2");
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+SELECT * FROM t1;
+SELECT * FROM t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+FLUSH TABLES t1, t2;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+ALTER TABLE t2 EXCHANGE PARTITION p1 WITH TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from p1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p1_dir/test
+--echo # List files from p2_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/p2_dir/test
+DROP table t1,t2;
+--rmdir $mysql_tmp_dir/t1_dir/test
+--rmdir $mysql_tmp_dir/p1_dir/test
+--rmdir $mysql_tmp_dir/p2_dir/test
+--rmdir $mysql_tmp_dir/t1_dir
+--rmdir $mysql_tmp_dir/p1_dir
+--rmdir $mysql_tmp_dir/p2_dir
+--echo exchange subpartition
+
+--mkdir $MYSQL_TMP_DIR/t1_dir
+--mkdir $MYSQL_TMP_DIR/sp0_dir
+--mkdir $MYSQL_TMP_DIR/sp3_dir
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t1 (id INT, purchased DATE)
+ENGINE = InnoDB
+DATA DIRECTORY = '$MYSQL_TMP_DIR/t1_dir';
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+eval CREATE TABLE t2 (id INT, purchased DATE)
+PARTITION BY RANGE( YEAR(purchased) )
+SUBPARTITION BY HASH( TO_DAYS(purchased) ) (
+PARTITION p0 VALUES LESS THAN (1990) (
+SUBPARTITION s0 data directory='$MYSQL_TMP_DIR/sp0_dir',
+SUBPARTITION s1),
+PARTITION p1 VALUES LESS THAN (2000) (
+SUBPARTITION s2,
+SUBPARTITION s3 data directory='$MYSQL_TMP_DIR/sp3_dir'
+));
+insert into t2 values(1,'1987-05-12 '),(2,'1987-05-14');
+insert into t2 values(3,'1997-05-10 '),(4,'1997-05-18');
+insert into t1 values(1,'1987-05-10 '),(2,'1987-05-08');
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from sp0_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp0_dir/test
+--echo # List files from sp3_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp3_dir/test
+ALTER TABLE t2 EXCHANGE PARTITION s0 WITH TABLE t1;
+SELECT * FROM t1;
+SELECT * FROM t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from sp0_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp0_dir/test
+--echo # List files from sp3_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp3_dir/test
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+ALTER TABLE t2 EXCHANGE PARTITION s0 WITH TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from sp0_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp0_dir/test
+--echo # List files from sp3_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp3_dir/test
+delete from t1;
+insert into t1 values(3,'1997-05-8 '),(4,'1997-05-16');
+ALTER TABLE t2 EXCHANGE PARTITION s3 WITH TABLE t1;
+SELECT * FROM t1;
+SELECT * FROM t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from sp0_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp0_dir/test
+--echo # List files from sp3_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp3_dir/test
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+ALTER TABLE t2 EXCHANGE PARTITION s3 WITH TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE t2;
+--echo # List files from t1_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/t1_dir/test
+--echo # List files from sp0_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp0_dir/test
+--echo # List files from sp3_dir/test
+--replace_result #p# #P# #sp# #SP#
+--list_files $MYSQL_TMP_DIR/sp3_dir/test
+DROP table t1,t2;
+--rmdir $mysql_tmp_dir/t1_dir/test
+--rmdir $mysql_tmp_dir/sp0_dir/test
+--rmdir $mysql_tmp_dir/sp3_dir/test
+--rmdir $mysql_tmp_dir/t1_dir
+--rmdir $mysql_tmp_dir/sp0_dir
+--rmdir $mysql_tmp_dir/sp3_dir
+
+--echo #
+--echo Bug#28687608 exchange partition with different row_format
+--echo #
+
+SET @orig_default_row_format = @@global.innodb_default_row_format;
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (
+  col1 INT UNSIGNED,
+  col2 DATETIME
+)
+ENGINE=INNODB
+PARTITION BY RANGE COLUMNS(col2)
+(
+PARTITION p0 VALUES LESS THAN ('1960-01-01'),
+PARTITION p1 VALUES LESS THAN ('1980-01-01')
+);
+
+INSERT INTO t1 VALUES ('1','1958-02-17 06:25:34');
+INSERT INTO t1 VALUES ('2','1962-11-23 11:06:06');
+
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN ('2000-01-01'));
+
+INSERT INTO t1 VALUES ('3','1999-10-13 05:28:46'), ('4', '1996-09-26 20:00:00');
+
+--replace_result #p# #P# #sp# #SP#
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+
+CREATE TABLE t2 LIKE t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+
+--echo exchange compact partition with dynamic;
+
+--error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
+
+ALTER TABLE t1 EXCHANGE PARTITION p2 WITH TABLE t2;
+DROP TABLE t1,t2;
+
+SET GLOBAL innodb_default_row_format=COMPACT;
+CREATE TABLE t1 (a INT,
+  b VARCHAR(55),
+  PRIMARY KEY (a))
+PARTITION BY RANGE (a)
+SUBPARTITION BY HASH(a)
+(PARTITION p0 VALUES LESS THAN (100)
+ (SUBPARTITION sp0,
+  SUBPARTITION sp1),
+ PARTITION p1 VALUES LESS THAN  (200)
+ (SUBPARTITION sp2,
+  SUBPARTITION sp3));
+
+SET GLOBAL innodb_default_row_format=DYNAMIC;
+
+ALTER TABLE t1 ADD PARTITION (PARTITION p2 VALUES LESS THAN (300)
+(SUBPARTITION sp4,
+SUBPARTITION sp5));
+
+INSERT INTO t1(b,a) VALUES('first',40),('second',91),('third',140),
+('forth',191);
+
+--replace_result #p# #P# #sp# #SP#
+SELECT NAME,ROW_FORMAT  FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES
+WHERE NAME LIKE '%t1%' ORDER BY TABLE_ID;
+
+CREATE TABLE t2 like t1;
+ALTER TABLE t2 REMOVE PARTITIONING;
+
+--error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION
+ALTER TABLE t1 EXCHANGE PARTITION sp2 WITH TABLE t2;
+
+ALTER TABLE t1 EXCHANGE PARTITION sp4 WITH TABLE t2;
+DROP TABLE t1,t2;
+SET @@global.innodb_default_row_format=@orig_default_row_format;
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index f534a6859372..b2e5fe74dabf 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -178,6 +178,7 @@ SELECT * FROM t1;
 --echo # No changes.
 COMMIT;
 DROP TABLE t1;
+SET AUTOCOMMIT= default;
 
 
 --echo #
@@ -339,6 +340,7 @@ UPDATE t1 SET data = data*2 WHERE data = 2;
 #SHOW ENGINE InnoDB STATUS;
 
 SET @@session.tx_isolation = @old_tx_isolation;
+SET autocommit= default;
 
 DROP TABLE t1;
 
@@ -1274,3 +1276,88 @@ SELECT database_name, table_name FROM mysql.innodb_table_stats WHERE
 database_name = 'test_jfg';
 
 DROP DATABASE test_jfg;
+
+
+--echo #
+--echo # Bug#27073100: PARTITION UPDATE_TIME NOT CORRECT AFTER RESTART/REBUILD
+--echo #
+
+--echo # Set up.
+
+CREATE TABLE t1 (fld1 INT(11) NOT NULL, fld2 INT(11) NOT NULL,
+fld3 DATE NOT NULL,  fld4 DATE NOT NULL,
+PRIMARY KEY (fld1, fld3),  KEY(fld1)) PARTITION
+BY RANGE (YEAR(fld3))
+(PARTITION p01 VALUES LESS THAN (1985) ENGINE = InnoDB,
+PARTITION p02 VALUES LESS THAN (1986) ENGINE = InnoDB,
+PARTITION p03 VALUES LESS THAN MAXVALUE ENGINE = InnoDB);
+INSERT INTO t1 VALUES('11', '11111', '1984-11-16',
+'2008-11-16'), ('12', '11112', '1985-11-16', '2008-11-16'),
+('13', '11113', '1986-11-16', '2008-11-16');
+
+--echo # Fetch the count of 'update_time' which is not null.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME) FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1' ORDER BY
+PARTITION_ORDINAL_POSITION;
+
+--echo # Rebuild the table.
+ALTER TABLE t1 ENGINE=INNODB;
+
+--echo # After table rebuild, the 'update_time' will be set to NULL.
+--echo # Hence the count would return 0.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME) FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME = 't1' ORDER BY
+PARTITION_ORDINAL_POSITION;
+
+--echo # Update the table where partition p02 is updated.
+UPDATE t1 SET fld2 = 71000 WHERE fld1 = 12 AND fld3 = '1985-11-16';
+
+--echo # Without fix, the count for 'update_time' will be 2. After fix,
+--echo # it will be 1 since only partition 'p02' is updated.
+SELECT TABLE_NAME, COUNT(UPDATE_TIME)
+FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA = 'test' AND
+TABLE_NAME = 't1' ORDER BY PARTITION_ORDINAL_POSITION;
+
+DROP TABLE t1;
+
+
+--echo
+--echo BUG#26553164 - INNODB PARTITION TABLE HAS UNEXPECTED ROW LOCK
+--echo
+
+--connect (conn1,localhost,root,,)
+
+--connection default
+
+CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `dt` datetime NOT NULL,
+  `data` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`id`,`dt`),
+  KEY `idx_dt` (`dt`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (to_days(dt))
+(PARTITION p20170218 VALUES LESS THAN (736744) ENGINE = InnoDB,
+ PARTITION p20170219 VALUES LESS THAN (736745) ENGINE = InnoDB,
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
+
+INSERT INTO t1 VALUES (1, '2018-04-25 10:18:00', '1');
+INSERT INTO t1 VALUES (2, '2018-04-25 10:18:01', '2');
+INSERT INTO t1 VALUES (3, '2018-04-25 10:18:02', '3');
+
+SELECT * FROM t1;
+
+begin;
+UPDATE t1 SET data = '11' WHERE id = 1;
+
+--connection conn1
+begin;
+UPDATE t1 SET data = '22' WHERE id = 2;
+commit;
+
+--disconnect conn1
+
+--connection default
+SELECT * FROM t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/t/partition_pruning.test
index bab0ef276034..969f0c2a6420 100644
--- a/mysql-test/t/partition_pruning.test
+++ b/mysql-test/t/partition_pruning.test
@@ -4,6 +4,7 @@
 #
 --source include/no_valgrind_without_big.inc
 --source include/have_partition.inc
+--source include/have_innodb_16k.inc
 let $verify_without_partitions=0;
 
 --echo #
@@ -53,6 +54,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 
 INSERT INTO t1 VALUES (-1),(0),(1),(2),(3),(4),(5),(6),(7),(8);
+ANALYZE TABLE t1;
 
 SELECT * FROM t1 WHERE a < 1;
 --replace_column 10 #
@@ -175,6 +177,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 
 INSERT INTO t1 VALUES (-1),(0),(1),(2),(3),(4),(5),(6),(7);
+ANALYZE TABLE t1;
 
 SELECT * FROM t1 WHERE a < 1;
 --replace_column 10 #
@@ -364,6 +367,7 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
   (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-02 23:59:59'),
   (1, '2009-04-03'), (2, '2009-04-03'), (1, '2009-04-04'), (2, '2009-04-04'),
   (1, '2009-04-05'), (1, '2009-04-06'), (1, '2009-04-07');
+ANALYZE TABLE t1;
 --replace_column 10 #
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 --replace_column 10 #
@@ -480,6 +484,7 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
   (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-03'), (2, '2009-04-03'),
   (1, '2009-04-04'), (2, '2009-04-04'), (1, '2009-04-05'), (1, '2009-04-06'),
   (1, '2009-04-07');
+ANALYZE TABLE t1;
 --replace_column 10 #
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 --replace_column 10 #
@@ -595,6 +600,7 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
   (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-02 23:59:59'),
   (1, '2009-04-03'), (2, '2009-04-03'), (1, '2009-04-04'), (2, '2009-04-04'),
   (1, '2009-04-05'), (1, '2009-04-06'), (1, '2009-04-07');
+ANALYZE TABLE t1;
 --replace_column 10 #
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 --replace_column 10 #
@@ -710,6 +716,7 @@ INSERT INTO t1 VALUES (1, '2009-01-01'), (1, '2009-04-01'), (2, '2009-04-01'),
   (1, '2009-04-02'), (2, '2009-04-02'), (1, '2009-04-03'), (2, '2009-04-03'),
   (1, '2009-04-04'), (2, '2009-04-04'), (1, '2009-04-05'), (1, '2009-04-06'),
   (1, '2009-04-07');
+ANALYZE TABLE t1;
 --replace_column 10 #
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-03' AS DATETIME);
 --replace_column 10 #
@@ -822,6 +829,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 INSERT INTO t1 VALUES (1, '2009-01-01'), (2, NULL);
+ANALYZE TABLE t1;
 --echo # test with an invalid date, which lead to item->null_value is set.
 --replace_column 10 #
 EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-99' AS DATETIME);
@@ -856,6 +864,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain select * from t1 where a=5 and a=6;
 drop table t1;
@@ -869,6 +878,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions select * from t1 where a=1;
@@ -887,6 +897,7 @@ if ($verify_without_partitions)
 ALTER TABLE t2 REMOVE PARTITIONING;
 }
 insert into t2 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t2;
 
 --replace_column 10 #
 explain partitions select * from t2 where a=1;
@@ -909,6 +920,7 @@ if ($verify_without_partitions)
 ALTER TABLE t3 REMOVE PARTITIONING;
 }
 insert into t3 values (5),(15);
+ANALYZE TABLE t3;
 
 --replace_column 10 #
 explain partitions select * from t3 where a=11;
@@ -929,6 +941,7 @@ if ($verify_without_partitions)
 ALTER TABLE t4 REMOVE PARTITIONING;
 }
 insert into t4 values (10,2), (10,4);
+ANALYZE TABLE t4;
 
 # empty OR one
 --replace_column 10 #
@@ -968,6 +981,7 @@ ALTER TABLE t5 REMOVE PARTITIONING;
 }
 
 insert into t5 values (10,2,0,0), (10,4,0,0), (10,2,0,1), (10,4,0,1);
+ANALYZE TABLE t5;
 --replace_column 10 #
 explain partitions select * from t5;
 
@@ -1010,6 +1024,7 @@ if ($verify_without_partitions)
 ALTER TABLE t6 REMOVE PARTITIONING;
 }
 insert into t6 values (1),(3),(5);
+ANALYZE TABLE t6;
 
 --replace_column 10 #
 explain partitions select * from t6 where a <  1;
@@ -1051,6 +1066,7 @@ if ($verify_without_partitions)
 ALTER TABLE t6 REMOVE PARTITIONING;
 }
 insert into t6 values (1),(3),(5);
+ANALYZE TABLE t6;
 
 --replace_column 10 #
 explain partitions select * from t6 where a <  1;
@@ -1091,6 +1107,7 @@ if ($verify_without_partitions)
 ALTER TABLE t7 REMOVE PARTITIONING;
 }
 insert into t7 values (10),(30),(50);
+ANALYZE TABLE t7;
 
 # leftmost intervals
 --replace_column 10 #
@@ -1158,6 +1175,7 @@ if ($verify_without_partitions)
 ALTER TABLE t7 REMOVE PARTITIONING;
 }
 insert into t7 values (10),(30),(50);
+ANALYZE TABLE t7;
 
 # leftmost intervals
 --replace_column 10 #
@@ -1222,6 +1240,7 @@ if ($verify_without_partitions)
 ALTER TABLE t8 REMOVE PARTITIONING;
 }
 insert into t8 values ('1985-05-05'),('1995-05-05');
+ANALYZE TABLE t8;
 
 --replace_column 10 #
 explain partitions select * from t8 where a < '1980-02-02';
@@ -1237,6 +1256,7 @@ if ($verify_without_partitions)
 ALTER TABLE t9 REMOVE PARTITIONING;
 }
 insert into t9 values ('2005-05-05'), ('2005-04-04');
+ANALYZE TABLE t9;
 
 --replace_column 10 #
 explain partitions select * from t9 where a <  '2004-12-19';
@@ -1271,6 +1291,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a1 > 3;
 --replace_column 10 #
@@ -1293,6 +1314,7 @@ if ($verify_without_partitions)
 ALTER TABLE t3 REMOVE PARTITIONING;
 }
 insert into t3 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t3;
 
 --replace_column 10 #
 explain partitions select * from t3 where a=2 or b=1;
@@ -1309,6 +1331,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(2);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a is null;
 
@@ -1325,6 +1348,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1,1),(2,2),(3,3),(4,4);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions
@@ -1344,6 +1368,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(2),(3);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a >  1 and a < 3;
 --replace_column 10 #
@@ -1367,6 +1392,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1,1),(2,2),(3,3);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions select * from t1 where b >  1 and b < 3;
@@ -1388,6 +1414,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1),(1),(2),(2),(3),(4),(3),(4);
+ANALYZE TABLE t1;
 
 --echo # This won't do any table access
 --let $q = update t1 set a=100 where a=5
@@ -1471,10 +1498,12 @@ show status like 'Handler_external_lock';
 --sorted_result
 select * from t1;
 insert into t1 values (1), (1);
+ANALYZE TABLE t1;
 
 --echo # Same as above multi-table UPDATE/DELETE
 create table t2 like t1;
 insert into t2 select * from t1;
+ANALYZE TABLE t2;
 
 --let $q = update t1,t2 set t1.a=1000, t2.a=1000 where t1.a=5 and t2.a=5
 --replace_column 10 #
@@ -1536,7 +1565,7 @@ CREATE TABLE `t2` (
 
 insert into t2 select A.a + 10*(B.a + 10* C.a) from t1 A, t1 B, t1 C ;
 insert into t1 select a from t2;
-
+ANALYZE TABLE t1;
 drop table t2;
 CREATE TABLE `t2` (
   `a` int(11) default NULL,
@@ -1565,6 +1594,7 @@ insert into t2 select a,2 from t1 where a >= 200 and a < 400;
 insert into t2 select a,3 from t1 where a >= 400 and a < 600;
 insert into t2 select a,4 from t1 where a >= 600 and a < 800;
 insert into t2 select a,5 from t1 where a >= 800 and a < 1001;
+ANALYZE TABLE t2;
 
 --let $q =  select * from t2
 --replace_column 10 #
@@ -1853,6 +1883,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 set f_int1 = null;
+ANALYZE TABLE t1;
 
 select * from t1 where f_int1 is null;
 --replace_column 10 #
@@ -1876,6 +1907,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1,1),(1,2),(1,3),(1,4),
   (2,1),(2,2),(2,3),(2,4);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a=1 AND (b=1 OR b=2);
 drop table t1;
@@ -1895,6 +1927,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (1,1),(1,2),(1,3),(1,4),
   (2,1),(2,2),(2,3),(2,4), (NULL,1);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions select * from t1 where a IS NULL AND (b=1 OR b=2);
@@ -1919,6 +1952,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (NULL), (0),(1),(2),(3),(4),(5),(6);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a is null or a < 2;
 drop table t1;
@@ -1934,6 +1968,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 
 insert into t1 values (0),(1),(null);
+ANALYZE TABLE t1;
 
 select count(*) from t1 where s1 < 0 or s1 is null;
 --replace_column 10 #
@@ -1954,6 +1989,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values ('na');
+ANALYZE TABLE t1;
 select * from t1;
 select * from t1 where a like 'n%';
 drop table t1;
@@ -1967,6 +2003,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 }
 select * from t1 where s1 = 0 or s1 is null;
 insert into t1 values ('aa'),('bb'),('0');
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where s1 = 0 or s1 is null;
 drop table t1;
@@ -1985,7 +2022,7 @@ ALTER TABLE t2 REMOVE PARTITIONING;
 }
 
 insert into t2 values (1,1),(2,2);
-
+ANALYZE TABLE t2;
 --vertical_results
 --replace_column 10 #
 explain partitions select * from t2;
@@ -2015,6 +2052,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 insert into t1 values (5),(15),(105),(1005);
 insert into t1 values (18446744073709551000+1);
 insert into t1 values (18446744073709551614-1);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions select * from t1 where a < 10;
@@ -2067,6 +2105,8 @@ ALTER TABLE t2 REMOVE PARTITIONING;
 
 insert into t1 values (0x20), (0x20), (0x41), (0x41), (0xFE), (0xFE);
 insert into t2 values (0x20), (0x20), (0x41), (0x41), (0xFE), (0xFE);
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
 --replace_column 10 #
 explain partitions select * from t1 where a=0;
 --replace_column 10 #
@@ -2107,6 +2147,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 
 insert into t1 values (9),(19),(0xFFFF0000FFFF000-1), (0xFFFF0000FFFFFFF-1);
 insert into t1 values (9),(19),(0xFFFF0000FFFF000-1), (0xFFFF0000FFFFFFF-1);
+ANALYZE TABLE t1;
 
 --replace_column 10 #
 explain partitions select * from t1 where
@@ -2131,6 +2172,7 @@ if ($verify_without_partitions)
 ALTER TABLE t1 REMOVE PARTITIONING;
 }
 insert into t1 values (-15),(-5),(5),(15),(-15),(-5),(5),(15);
+ANALYZE TABLE t1;
 --replace_column 10 #
 explain partitions select * from t1 where a>-2 and a <=0;
 drop table t1;
@@ -2153,6 +2195,7 @@ INSERT INTO t1 VALUES ('2007-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-07 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-08 12:00:00');
 INSERT INTO t1 VALUES ('2007-03-15 12:00:00');
+ANALYZE TABLE t1;
 -- echo must use p0 only:
 --replace_column 10 #
 explain partitions select * from t1 where recdate < '2007-03-08 00:00:00';
@@ -2171,6 +2214,7 @@ INSERT INTO t1 VALUES ('2005-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2005-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2006-03-01 12:00:00');
 INSERT INTO t1 VALUES ('2006-03-01 12:00:00');
+ANALYZE TABLE t1;
 
 -- echo must use p0 only:
 --replace_column 10 #
@@ -2193,6 +2237,7 @@ if ($verify_without_partitions)
 ALTER TABLE t0 REMOVE PARTITIONING;
 }
 insert into t1 select A.a + 10*B.a from t0 A, t0 B;
+ANALYZE TABLE t1;
 
 # this will use interval_via_walking
 --replace_column 10 #
@@ -2216,6 +2261,7 @@ PARTITION BY LIST COLUMNS (c2)
  PARTITION p2 VALUES IN (3,4));
 INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
 INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+ANALYZE TABLE t1;
 SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
 SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
 SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test
index 3c4478bd360d..76775eae63e7 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -434,7 +434,7 @@ FLUSH PRIVILEGES;
 --exec $MYSQL -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT -e "SELECT 1"
 
 --echo # Executing 'mysqladmin'
---exec $MYSQLADMIN -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT ping
+--exec $MYSQLADMIN --no-defaults -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT ping
 
 --echo # Executing 'mysqldump'
 --exec $MYSQL_DUMP -u root -S $MASTER_MYSOCK -P $MASTER_MYPORT --compact --default-auth=auth_test_plugin $PLUGIN_AUTH_OPT test
diff --git a/mysql-test/t/plugin_auth_sha256_tls.test b/mysql-test/t/plugin_auth_sha256_tls.test
index cd9055bffbf5..45c951cab05f 100644
--- a/mysql-test/t/plugin_auth_sha256_tls.test
+++ b/mysql-test/t/plugin_auth_sha256_tls.test
@@ -2,7 +2,7 @@
 --source include/have_ssl.inc
 
 connect (ssl_con,localhost,root,,,,,SSL);
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 
 CREATE USER 'kristofer' IDENTIFIED WITH 'sha256_password';
diff --git a/mysql-test/t/read_only.test b/mysql-test/t/read_only.test
index d214c0f4491a..99b0bdadef4a 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/t/read_only.test
@@ -363,6 +363,147 @@ DROP TABLE t1;
 
 set sql_mode= @orig_sql_mode;
 
+
+--echo #
+--echo # BUG#28438114: SET READ_ONLY=1 SOMETIMES DOESN'T BLOCK CONCURRENT DDL.
+--echo #
+
+--echo # Prepare the sql file for testing DDLS.
+
+SET @save_read_only= @@global.read_only;
+
+CREATE USER test@localhost;
+GRANT CREATE, DROP, INSERT, CREATE TABLESPACE, ALTER ROUTINE, RELOAD ON *.* TO test@localhost;
+
+--echo connect (con1,localhost,test,,test);
+connect (con1,localhost,test,,test);
+
+--echo connect (con2,localhost,root,,test);
+connect (con2,localhost,root,,test);
+
+--echo # Test CREATE DATABASE statement.
+let $query= CREATE DATABASE new;
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER DATABASE statement
+--let query= ALTER DATABASE test CHARACTER SET utf8;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP DATABASE statement.
+CREATE DATABASE new;
+let $query= DROP DATABASE new;
+--source include/read_only_bug28438114.inc
+DROP DATABASE new;
+
+--echo # Test CREATE TABLE statement.
+let $query= CREATE TABLE t1(fld1 INT);
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER TABLE statement.
+CREATE TABLE t1(fld1 INT);
+let $query= ALTER TABLE t1 ADD fld2 INT;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP TABLE statement.
+let $query= DROP TABLE t1;
+--source include/read_only_bug28438114.inc
+--echo # Test CREATE INDEX statement.
+let $query= CREATE INDEX idx1 ON t1 (fld1) USING BTREE;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP INDEX statement.
+CREATE INDEX idx1 ON t1 (fld1) USING BTREE;
+let $query= DROP INDEX idx1 ON t1;
+--source include/read_only_bug28438114.inc
+DROP INDEX idx1 ON t1;
+
+--echo # Test CREATE TRIGGER statement.
+let $query= CREATE TRIGGER trg1 BEFORE INSERT ON t1
+FOR EACH ROW BEGIN END;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP TRIGGER statement.
+CREATE TRIGGER trg1 BEFORE INSERT ON t1
+FOR EACH ROW BEGIN END;
+let $query= DROP TRIGGER trg1;
+--source include/read_only_bug28438114.inc
+DROP TRIGGER trg1;
+
+--echo # Test TRUNCATE TABLE statement.
+let $query= TRUNCATE TABLE t1;
+--source include/read_only_bug28438114.inc
+
+--echo # Test CREATE VIEW statement.
+let $query= CREATE VIEW v1 AS SELECT * FROM t1;
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER VIEW statement.
+CREATE VIEW v1 AS SELECT * FROM t1;
+let $query= ALTER VIEW v1 AS SELECT 1;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP VIEW statement.
+let $query= DROP VIEW v1;
+--source include/read_only_bug28438114.inc
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo # Test CREATE TABLESPACE statement
+let $query= CREATE TABLESPACE ts1
+            ADD DATAFILE 'ts1.ibd' ENGINE=INNODB;
+--source include/read_only_bug28438114.inc
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.ibd' ENGINE=INNODB;
+--echo # Test DROP TABLESPACE statement
+let $query= DROP TABLESPACE ts1;
+--source include/read_only_bug28438114.inc
+DROP TABLESPACE ts1;
+
+--echo # Test CREATE FUNCTION statement.
+let $query= CREATE FUNCTION f1() RETURNS INT RETURN 5;
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER FUNCTION statement.
+CREATE FUNCTION f1() RETURNS INT RETURN 5;
+let $query= ALTER FUNCTION f1 COMMENT 'test';
+--source include/read_only_bug28438114.inc
+--echo # Test DROP FUNCTION statement.
+let $query= DROP FUNCTION f1;
+--source include/read_only_bug28438114.inc
+DROP FUNCTION f1;
+
+--echo # Test CREATE PROCEDURE statement
+let $query= CREATE PROCEDURE p1() select 1;
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER PROCEDURE statement.
+CREATE PROCEDURE p1() select 1;
+let $query= ALTER PROCEDURE p1 comment 'test';
+--source include/read_only_bug28438114.inc
+--echo # Test DROP PROCEDURE statement.
+let $query= DROP PROCEDURE p1;
+--source include/read_only_bug28438114.inc
+DROP PROCEDURE p1;
+
+--echo # Test CREATE EVENT statement
+let $query= CREATE EVENT event1 ON SCHEDULE
+EVERY 10 HOUR DO SELECT 1;
+--source include/read_only_bug28438114.inc
+--echo # Test ALTER EVENT statement
+CREATE EVENT event1 ON SCHEDULE EVERY 10 HOUR DO SELECT 1;
+let $query= ALTER EVENT event1 DISABLE;
+--source include/read_only_bug28438114.inc
+--echo # Test DROP EVENT statement.
+let $query= DROP EVENT event1;
+--source include/read_only_bug28438114.inc
+DROP EVENT event1;
+
+--echo # Test case added for coverage.
+CREATE TABLE t1(fld1 INT);
+connection con1;
+--echo # FTWRL and FLUSH TABLE..FOR EXPORT is not blocked
+--echo # in read_only/super_read_only mode.
+FLUSH TABLES t1 WITH READ LOCK;
+UNLOCK TABLES;
+FLUSH TABLES t1 FOR EXPORT;
+UNLOCK TABLES;
+
+--echo # Clean up.
+connection default;
+DROP TABLE t1;
+DROP USER test@localhost;
+SET GLOBAL read_only= @save_read_only;
+--disconnect con1
+--disconnect con2
+
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
-
diff --git a/mysql-test/suite/binlog/t/binlog_variables_relay_log_index-master.opt b/mysql-test/t/relay_log_index_variables-master.opt
similarity index 100%
rename from mysql-test/suite/binlog/t/binlog_variables_relay_log_index-master.opt
rename to mysql-test/t/relay_log_index_variables-master.opt
diff --git a/mysql-test/suite/binlog/t/binlog_variables_relay_log.test b/mysql-test/t/relay_log_index_variables.test
similarity index 100%
rename from mysql-test/suite/binlog/t/binlog_variables_relay_log.test
rename to mysql-test/t/relay_log_index_variables.test
diff --git a/mysql-test/suite/binlog/t/binlog_variables_relay_log-master.opt b/mysql-test/t/relay_log_variables-master.opt
similarity index 100%
rename from mysql-test/suite/binlog/t/binlog_variables_relay_log-master.opt
rename to mysql-test/t/relay_log_variables-master.opt
diff --git a/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test b/mysql-test/t/relay_log_variables.test
similarity index 100%
rename from mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
rename to mysql-test/t/relay_log_variables.test
diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
index 4ad4dceecb98..87e86729a590 100644
--- a/mysql-test/t/repair.test
+++ b/mysql-test/t/repair.test
@@ -43,17 +43,6 @@ repair table t1;
 repair table t1 use_frm;
 drop table t1;
 
-#
-# BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
-#
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES(1),(2),(3),(4),(5);
-SET myisam_repair_threads=2;
-REPAIR TABLE t1;
-SHOW INDEX FROM t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
-DROP TABLE t1;
-
 #
 # BUG#22562 - REPAIR TABLE .. USE_FRM causes server crash on Windows and
 #             server hangs on Linux
@@ -86,9 +75,7 @@ INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0');
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 
@@ -115,9 +102,7 @@ INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0');
-SET myisam_repair_threads=2;
 REPAIR TABLE t1;
-SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 
diff --git a/mysql-test/t/rpl_multi_source_mysqldump_slave.test b/mysql-test/t/rpl_multi_source_mysqldump_slave.test
index 1bfae121b967..9b7f4235889b 100644
--- a/mysql-test/t/rpl_multi_source_mysqldump_slave.test
+++ b/mysql-test/t/rpl_multi_source_mysqldump_slave.test
@@ -36,6 +36,7 @@ CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_LOG_FILE='master-bin-ch2.000001
 --echo # Execute mysql using the dump as input
 --exec $MYSQL --force < $MYSQL_TMP_DIR/chm_1_dump.sql
 --remove_file $MYSQL_TMP_DIR/chm_1_dump.sql
+--let $slave_io_errno= convert_error(ER_SLAVE_FATAL_ERROR)
 --source include/stop_slave.inc
 
 --echo #
diff --git a/mysql-test/t/select_safe.test b/mysql-test/t/select_safe.test
index c6fd77f8077a..88805ab4b7e7 100644
--- a/mysql-test/t/select_safe.test
+++ b/mysql-test/t/select_safe.test
@@ -93,3 +93,83 @@ drop table t1;
 SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, MAX_JOIN_SIZE=DEFAULT;
 
 # End of 4.1 tests
+
+--echo #
+--echo # Bug #28145710: SQL_SAFE_UPDATES ERROR IS INSUFFICIENTLY INFORMATIVE
+--echo #
+
+CREATE TABLE t1 (c1 INT NOT NULL, c2 VARCHAR(200) NOT NULL,
+                 UNIQUE KEY idx1 (c1), UNIQUE KEY idx2 (c2));
+CREATE TABLE t2 (c1 INT NOT NULL, c2 VARCHAR(200) NOT NULL,
+                 UNIQUE KEY idx1 (c1));
+INSERT INTO t1 VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd');
+INSERT INTO t2 VALUES (11, 'a'), (12, 'b'), (3, 'c'), (14, 'd');
+ANALYZE TABLE t1, t2;
+
+SET SESSION sql_safe_updates=1;
+
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= 1;
+#DELETE with range_optimizer_max_mem_size warning
+let query1= DELETE FROM t1 WHERE c1 IN (1,22);
+#UPDATE with range_optimizer_max_mem_size warning
+let query2= UPDATE t1 SET c1=20 WHERE c1 IN (1,22);
+#multi-table DELETE with conversion warning and target table uses table scan
+let query3= DELETE t1 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+#multi-table UPDATE with conversion warning and target table uses table scan
+let query4= UPDATE t1, t2 SET t1.c1=20 WHERE t1.c2 = t2.c1;
+#multi-table DELETE with target table uses eq_ref (no error)
+let query5= DELETE t2 FROM t1 JOIN t2 ON t1.c2 = t2.c1;
+#DELETE with conversion warning
+let query6= DELETE FROM t1 WHERE c2 IN(1,2222);
+#DELETE with conversion warning
+let query7= UPDATE t1 SET c1=20 WHERE c2 IN(1,2222);
+#DELETE with non-indexed column returns error
+let query8= DELETE FROM t2 WHERE c2 IN('a','e');
+#DELETE full table and test with binlog disabled
+let query9= DELETE FROM t2;
+
+
+
+eval EXPLAIN $query1;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query1;
+
+eval EXPLAIN $query2;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query2;
+SET RANGE_OPTIMIZER_MAX_MEM_SIZE= default;
+
+eval EXPLAIN $query3;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query3;
+
+eval EXPLAIN $query4;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query4;
+
+eval EXPLAIN $query5;
+eval $query5;
+
+eval EXPLAIN $query6;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query6;
+
+eval EXPLAIN $query7;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query7;
+
+eval EXPLAIN $query8;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query8;
+
+eval EXPLAIN $query9;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query9;
+
+SET sql_log_bin= 0;
+--error ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
+eval $query9;
+SET sql_log_bin= default;
+
+DROP TABLE t1, t2;
+SET SESSION sql_safe_updates=default;
diff --git a/mysql-test/t/shutdown.test b/mysql-test/t/shutdown.test
index 9efe5de6a835..dd4eea1d09e7 100644
--- a/mysql-test/t/shutdown.test
+++ b/mysql-test/t/shutdown.test
@@ -39,7 +39,7 @@ let $DDIR= `select @@datadir`;
 
 --echo # start mysqladmin with shutdown option.
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root shutdown 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root shutdown 2>&1
 --source include/wait_until_disconnected.inc
 
 --echo # start the mysql server with init file and shutdown command.
diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test
index 173c65d04661..50057490174c 100644
--- a/mysql-test/t/skip_name_resolve.test
+++ b/mysql-test/t/skip_name_resolve.test
@@ -62,7 +62,7 @@ SET @@GLOBAL.skip_name_resolve=0;
 
 CREATE USER b20438524@'%' IDENTIFIED BY 'pwd';
 --echo # set some valid addresses
-UPDATE mysql.user SET host='localhost' WHERE user='b20438524';
+UPDATE mysql.user SET host='localhost1' WHERE user='b20438524';
 FLUSH PRIVILEGES;
 
 --echo # cleanup
@@ -71,9 +71,25 @@ FLUSH PRIVILEGES;
 
 --echo # must find the pattern
 --let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_PATTERN='user' entry 'b20438524@localhost' ignored in --skip-name-resolve mode
+--let SEARCH_PATTERN='user' entry 'b20438524@localhost1' ignored in --skip-name-resolve mode
 source include/search_pattern_in_file.inc;
 
 
+--echo #
+--echo # Bug #23329861: WARNING ABOUT LOCALHOST WHEN USING SKIP-NAME-RESOLVE
+--echo #
+
+CREATE USER b20438524@'%' IDENTIFIED BY 'pwd';
+--echo # set some valid addresses
+UPDATE mysql.user SET host='localhost' WHERE user='b20438524';
+FLUSH PRIVILEGES;
+
+--echo # must not find the pattern
+--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
+--let SEARCH_PATTERN='user' entry 'b20438524@localhost' ignored in --skip-name-resolve mode
+source include/search_pattern.inc;
+
+DELETE FROM mysql.user WHERE user='b20438524';
+
 --echo End of 5.7 tests
 
diff --git a/mysql-test/t/slow_log.test b/mysql-test/t/slow_log.test
new file mode 100644
index 000000000000..f3245e252ec3
--- /dev/null
+++ b/mysql-test/t/slow_log.test
@@ -0,0 +1,77 @@
+--echo #
+--echo # Bug#33732907: Slow query log logs password in plain text on syntax error
+--echo #
+--echo
+
+--source include/not_parallel.inc
+--source include/not_valgrind.inc
+
+SET @save_sqlf=@@global.slow_query_log_file;
+SET @save_sql=@@global.slow_query_log;
+SET @save_lo=@@global.log_output;
+SET @save_lqt=@@session.long_query_time;
+
+--replace_result $MYSQL_TMP_DIR ...
+eval SET GLOBAL slow_query_log_file= '$MYSQL_TMP_DIR/slow33732907.log';
+SET @@global.slow_query_log=1;
+SET @@global.log_output='file,table';
+SET @@session.long_query_time=0;
+
+let SLOW_LOG= `SELECT @@global.slow_query_log_file`;
+
+--echo
+--echo # This succeeds, and the password is correctly obfuscated.
+CREATE USER 'duplicate_user'@'%' IDENTIFIED BY 'mypassword';
+--echo # This fails, but the password is still correctly obfuscated.
+--error ER_CANNOT_USER
+CREATE USER 'duplicate_user'@'%' IDENTIFIED BY 'mypassword';
+
+--echo
+--echo # Since we throw an error during the parse stage, we don't know which
+--echo # part of the statement is the password (or whether there even is one),
+--echo # so we cannot obfuscate it. In that case, the statement should not be
+--echo # logged, either. The general log also behaves like this by default.
+--error ER_PARSE_ERROR
+CREATE USER ‘bad_characters’@’%’ IDENTIFIED BY 'mypassword';
+
+--echo # Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+SELECT "general table>",argument
+  FROM mysql.general_log
+ WHERE INSTR(argument,"CREATE USER")=1
+ ORDER BY event_time;
+
+--echo # Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+SELECT "slow table>",sql_text
+  FROM mysql.slow_log
+ WHERE INSTR(sql_text,"CREATE USER")=1
+ ORDER BY start_time;
+
+SET @@global.slow_query_log_file=@save_sqlf;
+SET @@global.slow_query_log=@save_sql;
+SET @@global.log_output=@save_lo;
+SET @@session.long_query_time=@save_lqt;
+
+DROP USER 'duplicate_user'@'%';
+
+--echo # Expected: 1 OK stmt, 1 failed stmt, 0 unparseable stmts
+--perl
+   use strict;
+
+   my $file= $ENV{'SLOW_LOG'} or die("slow log not set");
+
+   open(FILE, "$file") or die("Unable to open $file: $!");
+   while (<FILE>) {
+     my $line = $_;
+     if ($line =~ /CREATE USER /) {
+       print "slow file>".$line; }
+   }
+   close(FILE);
+EOF
+
+--remove_file $MYSQL_TMP_DIR/slow33732907.log
+TRUNCATE mysql.slow_log;
+TRUNCATE mysql.general_log;
+
+
+--echo #
+--echo # Done.
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index d705f7f20c7e..10afff0fb31f 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -3838,3 +3838,27 @@ drop function test.f111111111122222222223333333333444444444455555555556666666666
 --error ER_WRONG_DB_NAME 
 drop function mysqltest111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjj.test;
 
+
+--echo #
+--echo # Bug #24357244: CANNOT CREATE A STORED FUNCTION IF A DATABASE IS NOT
+--echo #                SELECTED
+--echo #
+
+CREATE DATABASE mysqltest;
+USE mysqltest;
+DROP DATABASE mysqltest;
+
+# Should return NULL
+SELECT DATABASE();
+
+CREATE DATABASE mysqltest;
+CREATE FUNCTION mysqltest.f1() RETURNS INT RETURN 0;
+CREATE FUNCTION mysqltest.f2() RETURNS INT RETURN f1();
+
+USE mysqltest;
+SELECT f1();
+SELECT f2();
+
+DROP FUNCTION IF EXISTS f2;
+DROP FUNCTION IF EXISTS f1;
+DROP DATABASE mysqltest;
diff --git a/mysql-test/t/sp_debug.test b/mysql-test/t/sp_debug.test
new file mode 100644
index 000000000000..a6d6e9f28b3b
--- /dev/null
+++ b/mysql-test/t/sp_debug.test
@@ -0,0 +1,42 @@
+#
+--source include/have_debug.inc
+
+
+--echo #
+--echo # Bug#26040870 - ASSERT ON KILL'ING A STORED ROUTINE INVOCATION.
+--echo #
+
+CREATE TABLE t1 (a INT);
+DELIMITER |;
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+  INSERT INTO t1 VALUES (1);
+  RETURN 1;
+END|
+DELIMITER ;|
+
+--connect(con1,localhost,root)
+--let $sp_con_id= `SELECT CONNECTION_ID()`
+SET DEBUG_SYNC= "sp_lex_instr_before_exec_core SIGNAL sp_ready WAIT_FOR sp_finish";
+send SELECT f1();
+
+--connection default
+SET DEBUG_SYNC="now WAIT_FOR sp_ready";
+--replace_result $sp_con_id sp_con_id
+--eval KILL QUERY $sp_con_id
+SET DEBUG_SYNC="now SIGNAL sp_finish";
+
+--connection con1
+--echo # Diagnostics area is not set if routine statement execution is
+--echo # interrupted by the KILL operation. Accessing diagnostics area in such
+--echo # case results in the issue reported.
+--echo # Patch for the bug25586773, checks if diagnostics area is set before
+--echo # accessing it.
+--error ER_QUERY_INTERRUPTED
+reap;
+
+--connection default
+SET DEBUG_SYNC='RESET';
+DROP TABLE t1;
+DROP FUNCTION f1;
+disconnect con1;
diff --git a/mysql-test/t/sql_mode_default.test b/mysql-test/t/sql_mode_default.test
index 0a701706d319..7e7feda68f0f 100644
--- a/mysql-test/t/sql_mode_default.test
+++ b/mysql-test/t/sql_mode_default.test
@@ -80,3 +80,17 @@ SET sql_mode = default;
 --echo
 --echo End of wl#8326 tests!
 --echo
+
+--echo #
+--echo # Bug#29287785: PASSWORD IS NOT UPDATED WITHOUT ERRORS WHEN
+--echo #               SQL MODE IS PAD_CHAR_TO_FULL_LENGTH
+--echo #
+
+CREATE USER 'user1'@'localhost';
+SET sql_mode= 'PAD_CHAR_TO_FULL_LENGTH';
+SET PASSWORD FOR 'user1'@'localhost'= PASSWORD('abc');
+SELECT authentication_string FROM mysql.user WHERE user= 'user1';
+
+#Cleanup
+DROP USER 'user1'@'localhost';
+SET sql_mode= DEFAULT;
diff --git a/mysql-test/t/ssl-sha512.test b/mysql-test/t/ssl-sha512.test
index 229be38f90ed..bf22af40cc82 100644
--- a/mysql-test/t/ssl-sha512.test
+++ b/mysql-test/t/ssl-sha512.test
@@ -9,4 +9,3 @@ GRANT SELECT ON test.* TO u1@localhost REQUIRE SSL;
 --exec $MYSQL -uu1 -psecret -h127.0.0.1 --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-sha512.pem --ssl-cipher=DHE-RSA-AES256-SHA test -e "SHOW VARIABLES like '%ssl%';"
 
 DROP USER u1@localhost;
-
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test
index 80f11c70acd5..1ab118348686 100644
--- a/mysql-test/t/ssl.test
+++ b/mysql-test/t/ssl.test
@@ -16,7 +16,7 @@
 connect (ssl_con,localhost,root,,,,,SSL);
 
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 
 # Check ssl expiration
@@ -27,7 +27,7 @@ SHOW STATUS LIKE 'Ssl_server_not_after';
 -- source include/common-tests.inc
 
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 
 connection default;
diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
index 6750c1091d26..8fc90d018139 100644
--- a/mysql-test/t/ssl_8k_key.test
+++ b/mysql-test/t/ssl_8k_key.test
@@ -4,7 +4,7 @@
 #
 # Bug#29784 YaSSL assertion failure when reading 8k key.
 #
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-mode=REQUIRED --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
 
 ##  This test file is for testing encrypted communication only, not other
diff --git a/mysql-test/t/ssl_ca.test b/mysql-test/t/ssl_ca.test
index 87462d71aad6..732f745ba943 100644
--- a/mysql-test/t/ssl_ca.test
+++ b/mysql-test/t/ssl_ca.test
@@ -10,7 +10,7 @@
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/wrong-crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2>&1
 
 --echo # try to connect with correct '--ssl-ca' path : should connect
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
 
 --echo #
@@ -22,15 +22,15 @@
 
 --echo # try to connect with '--ssl-ca' option using tilde home directoy
 --echo # path substitution : should connect
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-ca=$mysql_test_dir_path/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
 
 --echo # try to connect with '--ssl-key' option using tilde home directoy
 --echo # path substitution : should connect
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$mysql_test_dir_path/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
 
 --echo # try to connect with '--ssl-cert' option using tilde home directoy
 --echo # path substitution : should connect
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$mysql_test_dir_path/std_data/crl-client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/t/ssl_compress.test
index be9d8eede738..b10470aaea50 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/t/ssl_compress.test
@@ -17,7 +17,7 @@
 connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
 
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 
 # Check compression turned on
@@ -27,7 +27,7 @@ SHOW STATUS LIKE 'Compression';
 -- source include/common-tests.inc
 
 # Check ssl turned on
---replace_result DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
+--replace_regex $ALLOWED_CIPHERS_REGEX
 SHOW STATUS LIKE 'Ssl_cipher';
 
 # Check compression turned on
diff --git a/mysql-test/t/ssl_crl.test b/mysql-test/t/ssl_crl.test
index db7fd05b0334..57eada67daee 100644
--- a/mysql-test/t/ssl_crl.test
+++ b/mysql-test/t/ssl_crl.test
@@ -31,10 +31,10 @@ if (!$crllen)
 
 --echo # try to connect with '--ssl-crl' option using tilde home directoy
 --echo # path substitution : should connect
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ECDHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test --ssl-crl=$mysql_test_dir_path/std_data/crl-client-revoked.crl -e "SHOW STATUS LIKE 'Ssl_cipher'"
 
 --echo # try to connect with '--ssl-crlpath' option using tilde home directoy
 --echo # path substitution : should connect
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ECDHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES128-GCM-SHA256 SSL_CIPHER DHE-RSA-AES256-SHA SSL_CIPHER
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem --ssl-crlpath=$mysql_test_dir_path/std_data/crldir test -e "SHOW STATUS LIKE 'Ssl_cipher'"
diff --git a/mysql-test/t/ssl_deprecated_tls_versions-master.opt b/mysql-test/t/ssl_deprecated_tls_versions-master.opt
new file mode 100644
index 000000000000..4303b7e89561
--- /dev/null
+++ b/mysql-test/t/ssl_deprecated_tls_versions-master.opt
@@ -0,0 +1 @@
+--tls-version=tlsv1,tlsv1.1
diff --git a/mysql-test/t/ssl_deprecated_tls_versions.cnf b/mysql-test/t/ssl_deprecated_tls_versions.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/mysql-test/t/ssl_deprecated_tls_versions.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/mysql-test/t/ssl_deprecated_tls_versions.test b/mysql-test/t/ssl_deprecated_tls_versions.test
new file mode 100644
index 000000000000..fea7620bd900
--- /dev/null
+++ b/mysql-test/t/ssl_deprecated_tls_versions.test
@@ -0,0 +1,31 @@
+--echo # Bug 32565996: backport of WL#14519: Deprecate the use of TLS v1.[01]
+
+# Can't test with embedded server
+-- source include/not_embedded.inc
+# Test needs suport for TLSv1.0 and v1.1
+--source include/not_min_protocol_tlsv12.inc
+
+--let $assert_select = A deprecated TLS version TLSv1 is enabled
+--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_count = 1
+--let $assert_text = Found a cmdline TLSv1 deprecation warning
+--let $assert_only_after = CURRENT_TEST: main.ssl_deprecated_tls_versions
+--source include/assert_grep.inc
+
+--let $assert_select = A deprecated TLS version TLSv1.1 is enabled
+--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_count = 1
+--let $assert_text = Found a cmdline TLSv1.1 deprecation warning
+--let $assert_only_after = CURRENT_TEST: main.ssl_deprecated_tls_versions
+--source include/assert_grep.inc
+
+--echo # Test for the connect warning
+--exec $MYSQL test --tls-version=tlsv1.1 --ssl_mode=required -e "select 1"
+--let $assert_select = Accepted a connection with deprecated protocol .TLSv1.1.
+--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
+--let $assert_count = 1
+--let $assert_text = An old tls version client triggers a warning
+--let $assert_only_after = CURRENT_TEST: main.ssl_deprecated_tls_versions
+--source include/assert_grep.inc
+
+--echo # End of 5.7 tests
diff --git a/mysql-test/t/ssl_verify_identity-master.opt b/mysql-test/t/ssl_verify_identity-master.opt
new file mode 100644
index 000000000000..4607f83ce948
--- /dev/null
+++ b/mysql-test/t/ssl_verify_identity-master.opt
@@ -0,0 +1,3 @@
+--ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/server-key-verify-san.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert-verify-san.pem
diff --git a/mysql-test/t/ssl_verify_identity.test b/mysql-test/t/ssl_verify_identity.test
new file mode 100644
index 000000000000..cdcedd13100e
--- /dev/null
+++ b/mysql-test/t/ssl_verify_identity.test
@@ -0,0 +1,57 @@
+# === Purpose ===
+# This test verifies that while verifying the server certificates
+# when ssl-mode=VERIFY_IDENTITY, the DNS/IPs provided in the Subject
+# Alternative Names (which can be provided as an extension in X509)
+# fields are also checked for apart from the Common Name in the subject.
+# Applicable for openssl versions 1.0.2 and greater.
+#
+# === Related bugs and/or worklogs ===
+# Bug #16211011 - SSL CERTIFICATE SUBJECT ALT NAMES WITH IPS NOT RESPECTED WITH ssl-mode=VERIFY_IDENTITY
+#
+# Note that these test cases are written keeping in mind that the openssl version used by the system will
+# be 1.0.2+. For older versions of openssl, the test will be skipped.
+
+--source include/have_openssl.inc
+--source include/have_openssl_support.inc
+--source include/check_openssl_version.inc
+--source include/not_embedded.inc
+
+--echo ### Trying to connect with ssl-mode as DISABLED. This should establish an unencrypted connection.
+--exec $MYSQL --ssl-mode=DISABLED --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+--echo ### Trying to connect with ssl-mode as REQUIRED. This should establish an encrypted connection.
+--replace_regex $ALLOWED_CIPHERS_REGEX
+--exec $MYSQL --ssl-mode=REQUIRED --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+--echo ### Trying to connect with ssl-mode as VERIFY_CA. This should establish an encrypted connection.
+--replace_regex $ALLOWED_CIPHERS_REGEX
+--exec $MYSQL --ssl-mode=VERIFY_CA --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+--echo ### Trying to connect with ssl-mode as VERIFY_IDENTITY. This should establish an encrypted connection.
+--replace_regex $ALLOWED_CIPHERS_REGEX
+--exec $MYSQL --ssl-mode=VERIFY_IDENTITY --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+--echo ### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as nonexistent. This should fail.
+--error 1
+--exec $MYSQL --host=nonexistent --ssl-mode=VERIFY_IDENTITY --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+let SEARCH_FILE= $MYSQLTEST_VARDIR/tmp/bug24732452_stderr;
+--echo #Search for the error in the file
+--let SEARCH_PATTERN= ERROR 2005 \(HY000\): Unknown MySQL server host 'nonexistent'
+--source include/search_pattern_in_file.inc
+
+--echo ### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as localhost. This should establish an encrypted connection as localhost is present in Alternative Subject Name in the certificate.
+--replace_regex $ALLOWED_CIPHERS_REGEX
+--exec $MYSQL --host=localhost --ssl-mode=VERIFY_IDENTITY --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+--echo ### Trying to connect with ssl-mode as VERIFY_IDENTITY and hostname as 127.0.0.1. This should establish an encrypted connection as localhost is present in Alternative Subject Name in the certificate.
+--replace_regex $ALLOWED_CIPHERS_REGEX
+--exec $MYSQL --host=127.0.0.1 --ssl-mode=VERIFY_IDENTITY --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify-san.pem  --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert-verify-san.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key-verify-san.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2> $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+--cat_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
+
+#Cleanup
+--remove_file $MYSQLTEST_VARDIR/tmp/bug24732452_stderr
diff --git a/mysql-test/t/status_debug.test b/mysql-test/t/status_debug.test
index 60e8cbd9dc00..99a2ccacfc93 100644
--- a/mysql-test/t/status_debug.test
+++ b/mysql-test/t/status_debug.test
@@ -78,5 +78,32 @@ DROP TABLE t1;
 
 --disable_connect_log
 
+
+--echo #
+--echo # Bug#29836204:  P_S TABLE ACCESS HANGS WHILE IN LOCK TABLES MODE
+--echo #
+
+SET @saved_show_compatibility_56= @@global.show_compatibility_56;
+--echo # Ensures that the P_S is used for the SHOW command.
+SET GLOBAL show_compatibility_56= OFF;
+CREATE TABLE t1(fld1 int) ENGINE=MYISAM;
+LOCK TABLE t1 WRITE;
+ALTER TABLE t1 DISABLE KEYS;
+
+--echo # Without patch, the SHOW command hangs.
+SHOW SESSION VARIABLES LIKE 'FOREIGN_KEY_CHECKS';
+
+--echo # Wihout patch, the SELECT from P_S hangs.
+SELECT * FROM performance_schema.global_variables WHERE variable_name="read_only";
+
+--echo # Test added for coverage (Querying from I_S)
+SET GLOBAL show_compatibility_56= @saved_show_compatibility_56;
+SHOW SESSION VARIABLES LIKE 'FOREIGN_KEY_CHECKS';
+
+--echo # Clean up.
+UNLOCK TABLES;
+DROP TABLE t1;
+
+
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index 203ca04413b1..d40029ae94d3 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -199,11 +199,11 @@ INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
@@ -220,11 +220,11 @@ INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
@@ -241,11 +241,11 @@ INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
 --error 1411
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
@@ -1600,3 +1600,29 @@ ALTER TABLE t1 ADD KEY in_c2(c1);
 SHOW WARNINGS;
 --echo # Clean-up
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#34704094: Mysql str_to_date can correct convert for '2022-11-30'
+--echo #
+
+SET sql_mode='NO_ZERO_DATE';
+select str_to_date('0000-00-00', '%Y-%m-%d');
+--echo # Not compliant with how CAST works
+select str_to_date('0000-01-00', '%Y-%m-%d');
+--echo # Not compliant with how CAST works
+select str_to_date('0000-00-01', '%Y-%m-%d');
+select str_to_date('2023-02-31', '%Y-%m-%d');
+
+SET sql_mode='NO_ZERO_IN_DATE';
+select str_to_date('0000-00-00', '%Y-%m-%d');
+select str_to_date('0000-01-00', '%Y-%m-%d');
+select str_to_date('0000-00-01', '%Y-%m-%d');
+select str_to_date('2023-02-31', '%Y-%m-%d');
+
+SET sql_mode='ALLOW_INVALID_DATES';
+select str_to_date('0000-00-00', '%Y-%m-%d');
+select str_to_date('0000-01-00', '%Y-%m-%d');
+select str_to_date('0000-00-01', '%Y-%m-%d');
+select str_to_date('2023-02-31', '%Y-%m-%d');
+
+SET sql_mode=@org_mode;
diff --git a/mysql-test/t/subquery_bugs.test b/mysql-test/t/subquery_bugs.test
new file mode 100644
index 000000000000..dc9c5f4617f0
--- /dev/null
+++ b/mysql-test/t/subquery_bugs.test
@@ -0,0 +1,59 @@
+--echo #
+--echo # Bug#27182010 SUBQUERY INCORRECTLY SHOWS DUPLICATE VALUES ON SUBQUERIES
+--echo #
+
+CREATE TABLE p (Id INT,PRIMARY KEY (Id));
+INSERT INTO p VALUES (1);
+
+--echo # Test UNIQUE KEY with NULL values
+CREATE TABLE s (Id INT, u INT, UNIQUE KEY o(Id, u) );
+INSERT INTO s VALUES (1, NULL),(1, NULL);
+
+let query1= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s.Id FROM s WHERE Id=1 AND u IS NULL)ORDER BY Id DESC;
+let query2= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s.Id FROM s WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+
+eval EXPLAIN $query1;
+eval EXPLAIN $query2;
+
+eval $query1;
+eval $query2;
+
+--echo # UNIQUE KEY without NULL values
+CREATE TABLE s1 (Id INT, u INT, UNIQUE KEY o(Id, u) );
+INSERT INTO s1 VALUES (1, 2),(1, 3);
+
+let query3= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s1.Id FROM s1 WHERE Id=1 AND u IS NOT NULL) ORDER BY Id DESC;
+let query4= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s1.Id FROM s1 WHERE Id=1 AND u != 1) ORDER BY Id DESC;
+
+eval EXPLAIN $query3;
+eval EXPLAIN $query4;
+
+eval $query3;
+eval $query4;
+
+--echo # NON UNIQUE KEY Scenario
+CREATE TABLE s2 (Id INT, u INT, KEY o(Id, u) );
+INSERT INTO s2 VALUES (1, NULL),(1, NULL);
+
+let query5= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s.Id FROM s2 s WHERE Id=1 AND u IS NULL) ORDER BY Id DESC;
+
+--echo #UNIQUE KEY with NON NULL FIELDS
+CREATE TABLE s3 (Id INT NOT NULL, u INT NOT NULL, UNIQUE KEY o(Id, u));
+INSERT INTO s3 VALUES (1, 2),(1, 3);
+
+let query6= SELECT p.Id FROM (p) WHERE p.Id IN (
+            SELECT s.Id FROM s3 s WHERE Id=1 AND u IS NOT NULL)
+            ORDER BY Id DESC;
+
+eval EXPLAIN $query5;
+eval EXPLAIN $query6;
+
+eval $query5;
+eval $query6;
+
+DROP TABLE p, s, s1, s2, s3;
\ No newline at end of file
diff --git a/mysql-test/t/timezone.test b/mysql-test/t/timezone.test
index 02c87ab9b0e1..1388f224e98c 100644
--- a/mysql-test/t/timezone.test
+++ b/mysql-test/t/timezone.test
@@ -62,3 +62,28 @@ select unix_timestamp('1970-01-01 01:00:00'),
        unix_timestamp('2038-01-19 04:14:08');
 
 # End of 4.1 tests
+
+#
+# Bug #27970159: DUPLICATE ENTRY FOR KEY '<GROUP_KEY>' ERROR
+#
+
+CREATE TABLE t1 (c1 TIMESTAMP);
+SET TIME_ZONE = '+00:00';
+
+INSERT INTO t1 VALUES('2019-10-27 00:47:42'), ('2019-10-27 00:47:42');
+INSERT INTO t1 VALUES('2019-10-27 01:47:42'), ('2019-10-27 01:47:42');
+
+SET TIME_ZONE = 'SYSTEM';
+
+SELECT DISTINCT c1 FROM t1;
+
+--error ER_GROUPING_ON_TIMESTAMP_IN_DST
+SELECT COUNT(*) FROM t1 GROUP BY c1;
+
+SET sql_mode='';
+--error ER_GROUPING_ON_TIMESTAMP_IN_DST
+SELECT COUNT(*) FROM t1 GROUP BY c1;
+SET sql_mode=DEFAULT;
+
+#Cleanup
+DROP TABLE t1;
diff --git a/mysql-test/t/type_timestamp.test b/mysql-test/t/type_timestamp.test
index 703a07191e7b..697b1e26458f 100644
--- a/mysql-test/t/type_timestamp.test
+++ b/mysql-test/t/type_timestamp.test
@@ -403,6 +403,7 @@ INSERT INTO t1 VALUES( '2010-02-01 09:31:02' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:03' );
 INSERT INTO t1 VALUES( '2010-02-01 09:31:04' );
 
+ANALYZE TABLE t1;
 SELECT * FROM t1 WHERE a >= '2010-02-01 09:31:02.0';
 SELECT * FROM t1 WHERE '2010-02-01 09:31:02.0' <= a;
 SELECT * FROM t1 WHERE a <= '2010-02-01 09:31:02.0';
@@ -427,6 +428,8 @@ INSERT INTO t2 VALUES( '2010-02-01 09:31:09' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:10' );
 INSERT INTO t2 VALUES( '2010-02-01 09:31:11' );
 
+
+ANALYZE TABLE t2;
 --echo # The bug would cause the range optimizer's comparison to use an open
 --echo # interval here. This reveals itself only in the number of reads 
 --echo # performed.
diff --git a/mysql-test/t/type_year.test b/mysql-test/t/type_year.test
index 8524cc7ac656..38a03a0f1f18 100644
--- a/mysql-test/t/type_year.test
+++ b/mysql-test/t/type_year.test
@@ -197,3 +197,15 @@ INSERT INTO t1 VALUES (TIME'25:00:00');
 SELECT * FROM t1;
 DROP TABLE t1;
 SET timestamp=DEFAULT;
+
+--echo #
+--echo # Bug#28172538 YEAR RANGE CHECK FAILS WITH MAX YEAR FLOAT CONSTANT
+--echo #
+CREATE TABLE t(y YEAR);
+INSERT INTO t VALUES (2155), (2155.0);
+SELECT * FROM t;
+--echo Used to fail
+INSERT INTO t VALUES (2155.0E00);
+INSERT INTO t VALUES (2.1550E+03);
+SELECT * FROM t;
+DROP TABLE t;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index 72c744f1ec81..0d6cba0eeb61 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -1929,3 +1929,127 @@ SELECT FOUND_ROWS();
 DROP TABLE t1;
 
 --echo #End of test for Bug#22602381
+
+--echo #
+--echo # Bug #27068222 CREATE TABLE USING SELECT WITH UNION
+--echo #               FAILS FOR DATE COLUMN
+--echo #
+
+CREATE TABLE `t1` (`date` date NOT NULL);
+
+INSERT INTO t1 VALUES ('2017-03-02'), ('2017-06-22');
+
+CREATE TABLE IF NOT EXISTS t2 AS
+SELECT * FROM t1
+UNION
+SELECT * FROM t1;
+
+DESC t2;
+SELECT * FROM t2;
+
+DROP TABLE t1, t2;
+
+# Compare INT and DATE
+
+CREATE TABLE t1 (
+ i1 INT NOT NULL,
+ i2 INT NOT NULL DEFAULT '1234',
+ # non-specified nullability => i3 is nullable
+ i3 INT,
+ i4 INT DEFAULT NULL,
+ i5 INT DEFAULT '5678',
+ d1 date NOT NULL,
+ d2 date NOT NULL DEFAULT '2018-01-25',
+ d3 date,
+ d4 date DEFAULT NULL,
+ d5 date DEFAULT '2017-11-14',
+ g1 geometry NOT NULL
+);
+
+SHOW CREATE TABLE t1;
+
+ #We'll test non-strict then strict mode
+let $c=2;
+
+SET SQL_MODE='';
+
+while ($c)
+{
+
+  dec $c;
+
+  SELECT @@SQL_MODE;
+
+  CREATE TEMPORARY TABLE t2 AS
+  SELECT * FROM t1;
+
+  --echo # we see that with CREATE SELECT (no UNION), defaults are inherited.
+
+  SHOW CREATE TABLE t2;
+
+  DROP TEMPORARY TABLE t2;
+
+  CREATE TEMPORARY TABLE t2 AS
+  SELECT * FROM t1
+  UNION
+  SELECT * FROM t1;
+
+  SHOW CREATE TABLE t2;
+
+  DROP TEMPORARY TABLE t2;
+
+  CREATE TEMPORARY TABLE t2 AS
+  SELECT * FROM t1
+  UNION ALL
+  SELECT * FROM t1;
+
+  SHOW CREATE TABLE t2;
+
+--echo # With UNION and UNION ALL, defaults are not inherited; every
+--echo # column gets, as default, NULL (if nullable) or 0 (if not
+--echo # nullable). Exception: if strict mode and a date type,
+--echo # 0000-00-00 isn't given as default
+
+# In strict mode, t2.d1 has no DEFAULT, so cannot insert;
+# in non-strict mode, no problem.
+  if ($c)
+  {
+    INSERT INTO t2 VALUES();
+  }
+
+  SELECT * FROM t2;
+
+  DROP TEMPORARY TABLE t2;
+
+  SET SQL_MODE=DEFAULT;
+
+}
+
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#27197235 USER VARIABLE + UINON + DECIMAL COLUMN RETURNS
+--echo #              WRONG VALUES
+--echo #
+
+let $old_charset= `SELECT @@character_set_client`;
+
+SET NAMES utf8;
+SET @advertAcctId = 1000003;
+select @advertAcctId as a from dual union all select 1.0 from dual;
+
+eval SET NAMES $old_charset;
+SET @advertAcctId = 1000003;
+select @advertAcctId as a from dual union all select 1.0 from dual;
+
+--echo #
+--echo # Bug #29916900 (duplicate of #27903792) [ASSERTION `FIELD_TYPE() ==
+--echo # MYSQL_TYPE_GEOMETRY' FAILED]
+--echo #
+
+# We're not interested in the result, just that it doesn't fail any assertions.
+--disable_result_log
+SELECT ST_GEOMFROMTEXT('POINT(0 0)')
+UNION
+SELECT * FROM (SELECT NULL) AS a;
+--enable_result_log
diff --git a/mysql-test/t/user_limits.test b/mysql-test/t/user_limits.test
index 73a22dfffbaa..40d6aad265c7 100644
--- a/mysql-test/t/user_limits.test
+++ b/mysql-test/t/user_limits.test
@@ -175,6 +175,56 @@ drop user mysqltest_1@localhost;
 # Final cleanup
 drop table t1;
 
+-- echo #
+-- echo # Bug #30578217 : ALTER USER IF EXISTS ... WITH_MAX_USER_CONNECTIONS 9999 NOT APPLIED CORRECTLY
+-- echo #
+
+# Test of MAX_USER_CONNECTIONS limit (using ALTER command)
+
+CREATE USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 2;
+
+connect (muc1, localhost, mysqltest_2,,);
+connection muc1;
+
+connect (muc2, localhost, mysqltest_2,,);
+connection muc2;
+
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_USER_LIMIT_REACHED
+connect (muc3, localhost, mysqltest_2,,);
+
+# Closing of one of connections should help
+disconnect muc1;
+connect (muc3, localhost, mysqltest_2,,);
+
+# Changing of limit should also help (and immediately)
+# Increasing the MAX_USER_CONNECTIONS
+connection default;
+
+ALTER USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 3;
+connect (muc4, localhost, mysqltest_2,,);
+connection muc4;
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_USER_LIMIT_REACHED
+connect (muc5, localhost, mysqltest_2,,);
+
+# Decreasing the MAX_USER_CONNECTIONS
+connection default;
+
+ALTER USER mysqltest_2@localhost WITH MAX_USER_CONNECTIONS 2;
+disconnect muc2;
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_USER_LIMIT_REACHED
+connect (muc2, localhost, mysqltest_2,,);
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+--error ER_USER_LIMIT_REACHED
+
+# Clean up
+connection default;
+disconnect muc3;
+disconnect muc4;
+DROP USER mysqltest_2@localhost;
+
 set sql_mode= @orig_sql_mode;
 
 # Wait till all disconnects are completed
diff --git a/mysql-test/t/utility_warnings.test b/mysql-test/t/utility_warnings.test
index f91ebd810836..c6d8c0121928 100644
--- a/mysql-test/t/utility_warnings.test
+++ b/mysql-test/t/utility_warnings.test
@@ -143,7 +143,7 @@ INSERT INTO t_25380000 VALUES(1);
 
 --echo #MYSQLADMIN
 --echo #Scenario 1
---exec $MYSQLADMIN --ssl-mode=DISABLED --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
+--exec $MYSQLADMIN --no-defaults --ssl-mode=DISABLED --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
 --cat_file $MYSQLTEST_VARDIR/tmp/25380000_stderr
 
 # Search for warning message in the result file
@@ -152,7 +152,7 @@ INSERT INTO t_25380000 VALUES(1);
 --source include/search_pattern.inc
 
 --echo #Scenario 2
---exec $MYSQLADMIN --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
+--exec $MYSQLADMIN --no-defaults --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
 --cat_file $MYSQLTEST_VARDIR/tmp/25380000_stderr
 
 # Search for warning message in the result file
@@ -160,7 +160,7 @@ INSERT INTO t_25380000 VALUES(1);
 --source include/search_pattern.inc
 
 --echo #Scenario 3
---exec $MYSQLADMIN --ssl-verify-server-cert --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
+--exec $MYSQLADMIN --no-defaults --ssl-verify-server-cert --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot ping > $MYSQLTEST_VARDIR/tmp/25380000_mysqladmin_result 2> $MYSQLTEST_VARDIR/tmp/25380000_stderr
 --cat_file $MYSQLTEST_VARDIR/tmp/25380000_stderr
 
 # Search for warning message in the result file
diff --git a/mysql-test/t/version_token.test b/mysql-test/t/version_token.test
index f93c9fe6ac1a..f42958ce2875 100644
--- a/mysql-test/t/version_token.test
+++ b/mysql-test/t/version_token.test
@@ -22,9 +22,12 @@ SELECT version_tokens_show();
 --replace_regex /\.dll/.so/
 eval INSTALL PLUGIN version_tokens SONAME '$VERSION_TOKEN';
 UNINSTALL PLUGIN version_tokens;
+--source include/disconnect_connections.inc
+
 --replace_regex /\.dll/.so/
 eval INSTALL PLUGIN version_tokens SONAME '$VERSION_TOKEN';
 UNINSTALL PLUGIN version_tokens;
+--source include/disconnect_connections.inc
 
 --echo # Should not crash when unloading the so through removing the UDF
 drop function version_tokens_show;
@@ -284,6 +287,8 @@ connection default;
 
 -- echo
 UNINSTALL PLUGIN version_tokens;
+--source include/disconnect_connections.inc
+
 --disable_result_log
 --disable_query_log 
 let $mysql_errno = 0;
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index 0860372e4d09..797e28e75873 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -123,6 +123,7 @@ update t1 set c = 'bb' where a = 2;
 --sleep 1
 --error ER_LOCK_DEADLOCK
 update t1 set c = 'aa' where a = 1;
+--error ER_XA_RBDEADLOCK
 select count(*) from t1;
 --error ER_XA_RBDEADLOCK
 xa end 'a','c';
diff --git a/mysql-test/t/xa_deadlock_binlog.test b/mysql-test/t/xa_deadlock_binlog.test
new file mode 100644
index 000000000000..b44bb2d0e29d
--- /dev/null
+++ b/mysql-test/t/xa_deadlock_binlog.test
@@ -0,0 +1,74 @@
+--source include/have_binlog_format_row.inc
+--source include/have_log_bin.inc
+--source include/master-slave.inc
+
+--echo #
+--echo # BUG#32707060: INCONSISTENT BINLOG CAUSES ON REPLICA ERROR 'XAER_RMFAIL:
+--echo #               THE COMMAND CANNOT BE EXECUTED WHEN GLOBAL TRANSACTION IS
+--echo #               IN THE ACTIVE STATE'
+--echo #
+
+CREATE TABLE t1 (c1 INT AUTO_INCREMENT PRIMARY KEY, c2 VARCHAR(5));
+INSERT INTO t1(c2) VALUES("a");
+INSERT INTO t1(c2) VALUES("b");
+
+XA START 'xa1_t1';
+SELECT * FROM t1 WHERE c1 = 2 FOR UPDATE;
+UPDATE t1 SET c2 = 'c' WHERE c1 = 2;
+
+--source include/rpl_connection_master1.inc
+XA START 'xa2_t1';
+SELECT * FROM t1 WHERE c1 = 1 FOR UPDATE;
+UPDATE t1 SET c2 = 'd' WHERE c1 = 1;
+
+--source include/rpl_connection_master.inc
+# This will wait for lock until "xa2_t1" triggers deadlock and gets rejected.
+--send SELECT * FROM t1 WHERE c1 = 1 FOR UPDATE
+
+--source include/rpl_connection_master1.inc
+# This will result in a rejected transaction due to detection of deadlock condition.
+--sleep 1
+--error ER_LOCK_DEADLOCK
+SELECT * FROM t1 WHERE c1 = 2 FOR UPDATE;
+
+--source include/rpl_connection_master.inc
+--reap
+UPDATE t1 SET c2 = 'e' WHERE c1 = 1;
+XA END 'xa1_t1';
+XA PREPARE 'xa1_t1';
+XA COMMIT 'xa1_t1';
+
+--source include/rpl_connection_master1.inc
+# These statements will report an error because transaction xa2_t1 accepts only
+# XA ROLLBACK.
+--error ER_XA_RBDEADLOCK
+XA END 'xa2_t1';
+--error ER_XA_RBDEADLOCK
+UPDATE t1 SET c2 = 'f' WHERE c1 = 2;
+--error ER_XA_RBDEADLOCK
+SELECT c1 FROM t1;
+--error ER_XA_RBDEADLOCK
+XA END 'xa2_t1';
+
+# Successfully rollbacks the transaction.
+XA ROLLBACK 'xa2_t1';
+
+# Assuring that the table holds the right data in its fields.
+--let $assert_text= Incorrect content in table t1. c2 should contain 'e'
+--let $assert_cond= "[SELECT c2 FROM t1 WHERE c1 = 1]" = \'e\'
+--source include/assert.inc
+--let $assert_text= Incorrect content in table t1. c2 should contain 'c'
+--let $assert_cond= "[SELECT c2 FROM t1 WHERE c1 = 2]" = \'c\'
+--source include/assert.inc
+
+--sync_slave_with_master
+--source include/rpl_connection_master.inc
+--let $binlog_file= LAST
+--source include/show_binlog_events.inc
+
+--source include/rpl_connection_master1.inc
+CREATE TABLE t2 (c1 int);
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2;
+--source include/rpl_end.inc
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 2de0be624628..71f38d2ad479 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1,14 +1,20 @@
-# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -1181,6 +1187,109 @@
    obj:*
 }
 
+{
+   OpenSSL leak 1 static SSL
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   ...
+   fun:pthread_once
+}
+
+{
+   OpenSSL leak 2 static SSL
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   ...
+   fun:pthread_once
+}
+
+{
+   OpenSSL leak 1 static SSL pthread_once_slow
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   ...
+   fun:__pthread_once_slow
+}
+
+{
+   OpenSSL leak 2 static SSL pthread_once_slow
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:CRYPTO_realloc
+   ...
+   fun:__pthread_once_slow
+}
+
+{
+   OpenSSL leak 3 static SSL
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   ...
+   fun:RAND_priv_bytes
+}
+
+{
+   OpenSSL leak 4 static SSL
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   ...
+   fun:RAND_bytes
+}
+
+# http://www.openldap.org/its/index.cgi/Software%20Bugs?id=9081;page=23
+# Memory leak in ldap_initialize/ldap_unbind
+# Version: 2.4.48
+# Fixed in RE24 (2.4.49)
+{
+   OpenLDAP bug 9081
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:calloc
+   fun:ber_memcalloc_x
+   fun:ber_memcalloc
+   fun:ber_sockbuf_alloc
+   fun:ldap_create
+   fun:ldap_initialize
+}
+
+{
+   cyrus libsasl2 still reachable one
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   ...
+   fun:sasl_client_init
+}
+
+{
+   cyrus libsasl2 still reachable two
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:calloc
+   ...
+   fun:sasl_client_init
+}
+
+{
+   cyrus libsasl2 still reachable three
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   ...
+   fun:sasl_set_path
+}
+
 {
   OpenSSL still reachable.
   Memcheck:Leak
@@ -1208,6 +1317,153 @@
   ...
 }
 
+{
+  OpenSSL 3.0
+  Memcheck:Leak
+  match-leak-kinds: reachable
+  ...
+  fun:evp_generic_fetch
+  ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:EVP_KEYMGMT_do_all_provided
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:OSSL_DECODER_CTX_new_for_pkey
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:OSSL_DECODER_do_all_provided
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:OSSL_DECODER_CTX_new_for_pkey
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:RAND_bytes_ex
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:RAND_priv_bytes_ex
+   ...
+}
+
+{
+   OpenSSL 3.0 (strange ERR_set_debug is documented to not call strdup)
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:CRYPTO_strdup
+   fun:ERR_set_debug
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:ERR_add_error_vdata
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:cache_objects
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:inner_loader_fetch
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:CRYPTO_THREAD_run_once
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:ossl_provider_doall_activated
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:_ZL8init_sslv
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:ssl_load_ciphers
+   ...
+}
+
+{
+   OpenSSL 3.0
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:RAND_get0_private
+   ...
+}
+
 #
 # Rules to suppress leaks from plugin dependencies
 #
@@ -1608,3 +1864,206 @@
   fun:_ZL17plugin_initializeP13st_plugin_int
   ...
 }
+
+{
+   TPL leak 22
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:CRYPTO_malloc
+   fun:lh_new
+   fun:int_thread_get
+   fun:int_thread_set_item
+   fun:ERR_get_state
+   fun:ERR_clear_error
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:_ZL17plugin_initializeP13st_plugin_int
+   ...
+}
+
+# Bug #25964438  LDAP: ASAN AND VALGRIND ISSUES
+{
+   LDAP_TLS_workaround1
+   Memcheck:Leak
+   fun:calloc
+   ...
+   ...
+   ...
+   ...
+   ...
+   fun:ldap_int_tls_start
+   fun:ldap_start_tls_s
+   fun:*establish_tls*
+   fun:*create*
+}
+{
+   LDAP_TLS_workaround2
+   Memcheck:Leak
+   fun:malloc
+   ...
+   ...
+   ...
+   ...
+   ...
+   fun:ldap_int_tls_start
+   fun:ldap_start_tls_s
+   fun:*establish_tls*
+   fun:*create*
+}
+{
+   LDAP_TLS_workaround3
+   Memcheck:Leak
+   fun:calloc
+   fun:PR_LoadLibraryWithFlags
+   ...
+   ...
+   ...
+   fun:PR_CallOnce
+   ...
+   ...
+   fun:_dl_init
+}
+{
+   LDAP_TLS_workaround4
+   Memcheck:Leak
+   fun:malloc
+   fun:PR_ErrorInstallTable
+   fun:PR_CallOnce
+   ...
+   ...
+   fun:PR_CallOnceWithArg
+   ...
+   fun:NSS_SetDomesticPolicy
+   ...
+   fun:PR_CallOnceWithArg
+   ...
+   ...
+   ...
+   fun:ldap_int_tls_start
+   fun:ldap_start_tls_s
+   fun:*establish_tls*
+}
+{
+   LDAP_TLS_workaround5
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:PR_LoadLibraryWithFlags
+   ...
+   ...
+   ...
+   fun:PR_CallOnce
+   ...
+   ...
+   ...
+   ...
+   fun:_dl_catch_error
+   fun:_dl_open
+   fun:dlopen_doit
+   fun:_dl_catch_error
+   fun:_dlerror_run
+}
+{
+   LDAP_TLS_workaround6
+   Memcheck:Leak
+   fun:malloc
+   fun:ber_memalloc_x
+   fun:ber_strdup_x
+   ...
+   fun:ldap_int_initialize
+   fun:ldap_create
+   fun:ldap_initialize
+   fun:*create*
+}
+{
+   LDAP_TLS_workaround7
+   Memcheck:Leak
+   fun:malloc
+   fun:*dl_close_worker*
+   fun:*dl_close*
+   fun:*dl_catch_error*
+   fun:*libc_dlclose*
+   fun:*free_mem*
+   fun:*libc_freeres*
+   fun:*vgnU_freeres*
+   fun:*run_exit_handlers*
+   fun:exit*
+   fun:*mysqld_exit*
+   fun:*mysqld_main*
+   fun:*main*
+}
+{
+   LDAP_TLS_workaround8
+   Memcheck:Leak
+   fun:malloc
+   fun:ber_memalloc_x
+   fun:ber_strdup_x
+   ...
+   fun:ldap_int_initialize
+   fun:ldap_set_option
+   fun:*configure_tls*
+}
+{
+   LDAP_TLS_workaround9
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:PR_ErrorInstallTable
+   ...
+   ...
+   ...
+   ...
+   ...
+   ...  
+   ...
+   ...
+   ...
+   ...
+   ...
+   ...
+   fun:ldap_int_tls_start
+   fun:ldap_start_tls_s
+}
+
+{
+  AWS_SDK_1_9_s2n_init
+    Memcheck:Leak
+    match-leak-kinds: reachable,definite,indirect,possible
+    ...
+    fun:s2n_init
+    ...
+}
+{
+  AWS_SDK_1_9 AWS:Init call too deep in stack
+    Memcheck:Leak
+    match-leak-kinds: indirect
+    fun:realloc
+    fun:CRYPTO_realloc
+    ...
+    fun:asn1_template_ex_d2i
+    ...
+}
+{
+  AWS_SDK_1_9_curl_init
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    ...
+    fun:curl_global_init
+    ...
+    fun:_ZN3Aws7InitAPIERKNS_10SDKOptionsE
+}
+{
+  AWS_SDK_1_9_conf_modules_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    ...
+    fun:CONF_modules_load_file
+    fun:_ZL12keyring_initPv
+    ...
+}
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 7ed7ef2313d6..cabee811c08d 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -1,19 +1,26 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys)
 
 SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c
 				errors.c hash.c list.c mf_cache.c mf_dirname.c mf_fn_ext.c
@@ -85,7 +92,3 @@ ADD_TEST(queues_test queues)
 ADD_EXECUTABLE(base64_test base64.c)
 SET_TARGET_PROPERTIES(base64_test PROPERTIES COMPILE_FLAGS "-DMAIN")
 TARGET_LINK_LIBRARIES(base64_test mysys)
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/mysys/array.c b/mysys/array.c
index cf543043a419..bd7316258a10 100644
--- a/mysys/array.c
+++ b/mysys/array.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/base64.c b/mysys/base64.c
index 3deafeab9b3a..a93953213005 100644
--- a/mysys/base64.c
+++ b/mysys/base64.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -252,7 +264,7 @@ my_base64_decoder_getch(MY_BASE64_DECODER *decoder)
     if (decoder->mark)
     {
       /* If we have scanned '=' already, then only '=' is valid */
-      DBUG_ASSERT(decoder->state == 3);
+      assert(decoder->state == 3);
       decoder->error= 1;
       decoder->src--;
       return TRUE; /* expected '=', but encoding character found */
@@ -285,7 +297,7 @@ my_base64_decoder_getch(MY_BASE64_DECODER *decoder)
     break;
 
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return TRUE; /* Wrong state, should not happen */
   }
 
diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index 098f555d63ba..128b3b6d5911 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/charset.c b/mysys/charset.c
index 0ac55fcb0759..f2913e706a3e 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -416,7 +428,7 @@ CHARSET_INFO *default_charset_info = &my_charset_latin1;
 
 void add_compiled_collation(CHARSET_INFO *cs)
 {
-  DBUG_ASSERT(cs->number < array_elements(all_charsets));
+  assert(cs->number < array_elements(all_charsets));
   all_charsets[cs->number]= cs;
   cs->state|= MY_CS_AVAILABLE;
 }
@@ -532,7 +544,7 @@ get_internal_charset(MY_CHARSET_LOADER *loader, uint cs_number, myf flags)
   char  buf[FN_REFLEN];
   CHARSET_INFO *cs;
 
-  DBUG_ASSERT(cs_number < array_elements(all_charsets));
+  assert(cs_number < array_elements(all_charsets));
 
   if ((cs= all_charsets[cs_number]))
   {
diff --git a/mysys/checksum.c b/mysys/checksum.c
index 87f3056cf19d..773b74a8b72f 100644
--- a/mysys/checksum.c
+++ b/mysys/checksum.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/errors.c b/mysys/errors.c
index b9721023a9ce..6d0a0a72b1f0 100644
--- a/mysys/errors.c
+++ b/mysys/errors.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/hash.c b/mysys/hash.c
index b02d20aa642a..8466fdffea10 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -752,7 +764,7 @@ void my_hash_replace(HASH *hash, HASH_SEARCH_STATE *current_record,
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 my_bool my_hash_check(HASH *hash)
 {
diff --git a/mysys/kqueue_timers.c b/mysys/kqueue_timers.c
index bfe1d05eece2..57184d579e1f 100644
--- a/mysys/kqueue_timers.c
+++ b/mysys/kqueue_timers.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -64,7 +71,7 @@ timer_notify_thread_func(void *arg MY_ATTRIBUTE((unused)))
     if (kev.filter == EVFILT_TIMER)
     {
       timer= kev.udata;
-      DBUG_ASSERT(timer->id == kev.ident);
+      assert(timer->id == kev.ident);
       timer->notify_function(timer);
     }
     else if (kev.filter == EVFILT_USER)
@@ -166,7 +173,7 @@ my_timer_deinitialize(void)
 int
 my_timer_create(my_timer_t *timer)
 {
-  DBUG_ASSERT(kq_fd >= 0);
+  assert(kq_fd >= 0);
 
   timer->id= (uintptr_t) timer;
 
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c
index 4f5dbeda89dd..6945f1a94067 100644
--- a/mysys/lf_alloc-pin.c
+++ b/mysys/lf_alloc-pin.c
@@ -1,14 +1,26 @@
 /* QQ: TODO multi-pinbox */
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -109,7 +121,7 @@ static void lf_pinbox_real_free(LF_PINS *pins);
 void lf_pinbox_init(LF_PINBOX *pinbox, uint free_ptr_offset,
                     lf_pinbox_free_func *free_func, void *free_func_arg)
 {
-  DBUG_ASSERT(free_ptr_offset % sizeof(void *) == 0);
+  assert(free_ptr_offset % sizeof(void *) == 0);
   compile_time_assert(sizeof(LF_PINS) == 64);
   lf_dynarray_init(&pinbox->pinarray, sizeof(LF_PINS));
   pinbox->pinstack_top_ver= 0;
@@ -194,14 +206,14 @@ void lf_pinbox_put_pins(LF_PINS *pins)
   uint32 top_ver, nr;
   nr= pins->link;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     /* This thread should not hold any pin. */
     int i;
     for (i= 0; i < LF_PINBOX_PINS; i++)
-      DBUG_ASSERT(pins->pin[i] == 0);
+      assert(pins->pin[i] == 0);
   }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
   /*
     XXX this will deadlock if other threads will wait for
@@ -386,7 +398,7 @@ void lf_alloc_init2(LF_ALLOCATOR *allocator, uint size, uint free_ptr_offset,
   allocator->element_size= size;
   allocator->constructor= ctor;
   allocator->destructor= dtor;
-  DBUG_ASSERT(size >= sizeof(void*) + free_ptr_offset);
+  assert(size >= sizeof(void*) + free_ptr_offset);
 }
 
 /*
diff --git a/mysys/lf_dynarray.c b/mysys/lf_dynarray.c
index c5cb50f0fc33..d978af0d93e3 100644
--- a/mysys/lf_dynarray.c
+++ b/mysys/lf_dynarray.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c
index b55734fa1db3..e61d0805655d 100644
--- a/mysys/lf_hash.c
+++ b/mysys/lf_hash.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -86,7 +98,8 @@ static int my_lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,
   do { /* PTR() isn't necessary below, head is a dummy node */
     cursor->curr= (LF_SLIST *)(*cursor->prev);
     lf_pin(pins, 1, cursor->curr);
-  } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF);
+  } while (my_atomic_loadptr((void**)cursor->prev) != cursor->curr &&
+                              LF_BACKOFF);
   for (;;)
   {
     if (unlikely(!cursor->curr))
@@ -100,7 +113,7 @@ static int my_lfind(LF_SLIST * volatile *head, CHARSET_INFO *cs, uint32 hashnr,
     cur_hashnr= cursor->curr->hashnr;
     cur_key= cursor->curr->key;
     cur_keylen= cursor->curr->keylen;
-    if (*cursor->prev != (intptr)cursor->curr)
+    if (my_atomic_loadptr((void**)cursor->prev) != cursor->curr)
     {
       (void)LF_BACKOFF;
       goto retry;
@@ -168,7 +181,8 @@ static int my_lfind_match(LF_SLIST * volatile *head,
   do { /* PTR() isn't necessary below, head is a dummy node */
     cursor->curr= (LF_SLIST *)(*cursor->prev);
     lf_pin(pins, 1, cursor->curr);
-  } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF);
+  } while (my_atomic_loadptr((void**)cursor->prev) != cursor->curr &&
+                              LF_BACKOFF);
   for (;;)
   {
     if (unlikely(!cursor->curr))
@@ -180,7 +194,7 @@ static int my_lfind_match(LF_SLIST * volatile *head,
       lf_pin(pins, 0, cursor->next);
     } while (link != cursor->curr->link && LF_BACKOFF);
     cur_hashnr= cursor->curr->hashnr;
-    if (*cursor->prev != (intptr)cursor->curr)
+    if (my_atomic_loadptr((void**)cursor->prev) != cursor->curr)
     {
       (void)LF_BACKOFF;
       goto retry;
@@ -265,8 +279,8 @@ static LF_SLIST *linsert(LF_SLIST * volatile *head, CHARSET_INFO *cs,
     else
     {
       node->link= (intptr)cursor.curr;
-      DBUG_ASSERT(node->link != (intptr)node); /* no circular references */
-      DBUG_ASSERT(cursor.prev != &node->link); /* no circular references */
+      assert(node->link != (intptr)node); /* no circular references */
+      assert(cursor.prev != &node->link); /* no circular references */
       if (my_atomic_casptr((void **)cursor.prev, (void **)&cursor.curr, node))
       {
         res= 1; /* inserted ok */
@@ -443,7 +457,7 @@ void lf_hash_init2(LF_HASH *hash, uint element_size, uint flags,
   hash->get_key= get_key;
   hash->hash_function= hash_function ? hash_function : cset_hash_sort_adapter;
   hash->initialize= init;
-  DBUG_ASSERT(get_key ? !key_offset && !key_length : key_length);
+  assert(get_key ? !key_offset && !key_length : key_length);
 }
 
 void lf_hash_destroy(LF_HASH *hash)
diff --git a/mysys/list.c b/mysys/list.c
index 800149fa33ae..c6af06a6bbdb 100644
--- a/mysys/list.c
+++ b/mysys/list.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_arr_appstr.c b/mysys/mf_arr_appstr.c
index 71d4ad0a9b45..aa040df39deb 100644
--- a/mysys/mf_arr_appstr.c
+++ b/mysys/mf_arr_appstr.c
@@ -1,14 +1,25 @@
-/* Copyright (C) 2007 MySQL AB
-   Use is subject to license terms
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -37,7 +48,7 @@ my_bool array_append_string_unique(const char *str,
   const char **p;
   /* end points at the terminating NULL element */
   const char **end= array + size - 1;
-  DBUG_ASSERT(*end == NULL);
+  assert(*end == NULL);
 
   for (p= array; *p; ++p)
   {
@@ -47,7 +58,7 @@ my_bool array_append_string_unique(const char *str,
   if (p >= end)
     return TRUE;                               /* Array is full */
 
-  DBUG_ASSERT(*p == NULL || strcmp(*p, str) == 0);
+  assert(*p == NULL || strcmp(*p, str) == 0);
 
   while (*(p + 1))
   {
@@ -55,7 +66,7 @@ my_bool array_append_string_unique(const char *str,
     ++p;
   }
 
-  DBUG_ASSERT(p < end);
+  assert(p < end);
   *p= str;
 
   return FALSE;                                 /* Success */
diff --git a/mysys/mf_cache.c b/mysys/mf_cache.c
index 680f39489aba..51185f052e18 100644
--- a/mysys/mf_cache.c
+++ b/mysys/mf_cache.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c
index 8ddd0ba3413b..533481c4510f 100644
--- a/mysys/mf_dirname.c
+++ b/mysys/mf_dirname.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_fn_ext.c b/mysys/mf_fn_ext.c
index 807c473f3186..91ae4945f80d 100644
--- a/mysys/mf_fn_ext.c
+++ b/mysys/mf_fn_ext.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index e3196150d244..a205c6d3ea22 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -32,8 +44,8 @@ char * fn_format(char * to, const char *name, const char *dir,
   size_t length;
   size_t dev_length;
   DBUG_ENTER("fn_format");
-  DBUG_ASSERT(name != NULL);
-  DBUG_ASSERT(extension != NULL);
+  assert(name != NULL);
+  assert(extension != NULL);
   DBUG_PRINT("enter",("name: %s  dir: %s  extension: %s  flag: %d",
 		       name,dir,extension,flag));
 
@@ -41,13 +53,13 @@ char * fn_format(char * to, const char *name, const char *dir,
   name+=(length=dirname_part(dev, (startpos=(char *) name), &dev_length));
   if (length == 0 || (flag & MY_REPLACE_DIR))
   {
-    DBUG_ASSERT(dir != NULL);
+    assert(dir != NULL);
     /* Use given directory */
     convert_dirname(dev,dir,NullS);		/* Fix to this OS */
   }
   else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(dev))
   {
-    DBUG_ASSERT(dir != NULL);
+    assert(dir != NULL);
     /* Put 'dir' before the given path */
     strmake(buff,dev,sizeof(buff)-1);
     pos=convert_dirname(dev,dir,NullS);
diff --git a/mysys/mf_getdate.c b/mysys/mf_getdate.c
index f9176bfdb095..662ae9b4bb98 100644
--- a/mysys/mf_getdate.c
+++ b/mysys/mf_getdate.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index bc5f1bb692b9..d756afa839c5 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -181,7 +193,7 @@ int init_io_cache_ext(IO_CACHE *info, File file, size_t cachesize,
         the beginning of whatever this file is, then somebody made a bad
         assumption.
       */
-      DBUG_ASSERT(seek_offset == 0);
+      assert(seek_offset == 0);
     }
     else
       info->seek_not_done= MY_TEST(seek_offset != pos);
@@ -318,9 +330,9 @@ my_bool reinit_io_cache(IO_CACHE *info, enum cache_type type,
 		      (int) clear_cache));
 
   /* One can't do reinit with the following types */
-  DBUG_ASSERT(type != READ_NET && info->type != READ_NET &&
-	      type != WRITE_NET && info->type != WRITE_NET &&
-	      type != SEQ_READ_APPEND && info->type != SEQ_READ_APPEND);
+  assert(type != READ_NET && info->type != READ_NET &&
+         type != WRITE_NET && info->type != WRITE_NET &&
+         type != SEQ_READ_APPEND && info->type != SEQ_READ_APPEND);
 
   /* If the whole file is in memory, avoid flushing to disk */
   if (! clear_cache &&
@@ -428,7 +440,7 @@ int _my_b_read(IO_CACHE *info, uchar *Buffer, size_t Count)
   /* If the buffer is not empty yet, copy what is available. */
   if ((left_length= (size_t) (info->read_end-info->read_pos)))
   {
-    DBUG_ASSERT(Count >= left_length);	/* User is not using my_b_read() */
+    assert(Count >= left_length);	/* User is not using my_b_read() */
     memcpy(Buffer,info->read_pos, left_length);
     Buffer+=left_length;
     Count-=left_length;
@@ -458,7 +470,7 @@ int _my_b_read(IO_CACHE *info, uchar *Buffer, size_t Count)
         info->file is a pipe or socket or FIFO.  We never should have tried
         to seek on that.  See Bugs#25807 and #22828 for more info.
       */
-      DBUG_ASSERT(my_errno() != ESPIPE);
+      assert(my_errno() != ESPIPE);
       info->error= -1;
       DBUG_RETURN(1);
     }
@@ -638,9 +650,9 @@ void init_io_cache_share(IO_CACHE *read_cache, IO_CACHE_SHARE *cshare,
                                 (long) read_cache, (long) cshare,
                                 (long) write_cache, num_threads));
 
-  DBUG_ASSERT(num_threads > 1);
-  DBUG_ASSERT(read_cache->type == READ_CACHE);
-  DBUG_ASSERT(!write_cache || (write_cache->type == WRITE_CACHE));
+  assert(num_threads > 1);
+  assert(read_cache->type == READ_CACHE);
+  assert(!write_cache || (write_cache->type == WRITE_CACHE));
 
   mysql_mutex_init(key_IO_CACHE_SHARE_mutex,
                    &cshare->mutex, MY_MUTEX_INIT_FAST);
@@ -971,7 +983,7 @@ int _my_b_read_r(IO_CACHE *cache, uchar *Buffer, size_t Count)
 
   if ((left_length= (size_t) (cache->read_end - cache->read_pos)))
   {
-    DBUG_ASSERT(Count >= left_length);	/* User is not using my_b_read() */
+    assert(Count >= left_length);	/* User is not using my_b_read() */
     memcpy(Buffer, cache->read_pos, left_length);
     Buffer+= left_length;
     Count-= left_length;
@@ -997,7 +1009,7 @@ int _my_b_read_r(IO_CACHE *cache, uchar *Buffer, size_t Count)
     if (lock_io_cache(cache, pos_in_file))
     {
       /* With a synchronized write/read cache we won't come here... */
-      DBUG_ASSERT(!cshare->source_cache);
+      assert(!cshare->source_cache);
       /*
         ... unless the writer has gone before this thread entered the
         lock. Simulate EOF in this case. It can be distinguished by
@@ -1094,7 +1106,7 @@ static void copy_to_read_buffer(IO_CACHE *write_cache,
 {
   IO_CACHE_SHARE *cshare= write_cache->share;
 
-  DBUG_ASSERT(cshare->source_cache == write_cache);
+  assert(cshare->source_cache == write_cache);
   /*
     write_length is usually less or equal to buffer_length.
     It can be bigger if _my_b_write() is called with a big length.
@@ -1106,7 +1118,7 @@ static void copy_to_read_buffer(IO_CACHE *write_cache,
 
     rc= lock_io_cache(write_cache, write_cache->pos_in_file);
     /* The writing thread does always have the lock when it awakes. */
-    DBUG_ASSERT(rc);
+    assert(rc);
 
     memcpy(cshare->buffer, write_buffer, copy_length);
 
@@ -1145,7 +1157,7 @@ int _my_b_seq_read(IO_CACHE *info, uchar *Buffer, size_t Count)
   /* first, read the regular buffer */
   if ((left_length=(size_t) (info->read_end-info->read_pos)))
   {
-    DBUG_ASSERT(Count > left_length);	/* User is not using my_b_read() */
+    assert(Count > left_length);	/* User is not using my_b_read() */
     memcpy(Buffer,info->read_pos, left_length);
     Buffer+=left_length;
     Count-=left_length;
@@ -1227,7 +1239,7 @@ int _my_b_seq_read(IO_CACHE *info, uchar *Buffer, size_t Count)
 
       /*
 	 added the line below to make
-	 DBUG_ASSERT(pos_in_file==info->end_of_file) pass.
+	 assert(pos_in_file==info->end_of_file) pass.
 	 otherwise this does not appear to be needed
       */
       pos_in_file += length;
@@ -1254,11 +1266,11 @@ int _my_b_seq_read(IO_CACHE *info, uchar *Buffer, size_t Count)
     size_t copy_len;
     size_t transfer_len;
 
-    DBUG_ASSERT(info->append_read_pos <= info->write_pos);
+    assert(info->append_read_pos <= info->write_pos);
     /*
       TODO: figure out if the assert below is needed or correct.
     */
-    DBUG_ASSERT(pos_in_file == info->end_of_file);
+    assert(pos_in_file == info->end_of_file);
     copy_len= MY_MIN(Count, len_in_buff);
     memcpy(Buffer, info->append_read_pos, copy_len);
     info->append_read_pos += copy_len;
@@ -1388,7 +1400,7 @@ int my_b_append(IO_CACHE *info, const uchar *Buffer, size_t Count)
     Assert that we cannot come here with a shared cache. If we do one
     day, we might need to add a call to copy_to_read_buffer().
   */
-  DBUG_ASSERT(!info->share);
+  assert(!info->share);
 
   lock_append_buffer(info);
   rest_length= (size_t) (info->write_end - info->write_pos);
@@ -1454,7 +1466,7 @@ int my_block_write(IO_CACHE *info, const uchar *Buffer, size_t Count,
     Assert that we cannot come here with a shared cache. If we do one
     day, we might need to add a call to copy_to_read_buffer().
   */
-  DBUG_ASSERT(!info->share);
+  assert(!info->share);
 
   if (pos < info->pos_in_file)
   {
@@ -1574,7 +1586,7 @@ int my_b_flush_io_cache(IO_CACHE *info,
       else
       {
 	info->end_of_file+=(info->write_pos-info->append_read_pos);
-	DBUG_ASSERT(info->end_of_file == mysql_file_tell(info->file, MYF(0)));
+	assert(info->end_of_file == mysql_file_tell(info->file, MYF(0)));
       }
 
       info->append_read_pos=info->write_pos=info->write_buffer;
@@ -1615,7 +1627,7 @@ int end_io_cache(IO_CACHE *info)
     Every thread must call remove_io_thread(). The last one destroys
     the share elements.
   */
-  DBUG_ASSERT(!info->share || !info->share->total_threads);
+  assert(!info->share || !info->share->total_threads);
 
   if ((pre_close=info->pre_close))
   {
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index c3505e6ba5a9..1c5c5c215a75 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -23,6 +35,8 @@
 #include <stdarg.h>
 #include <m_ctype.h>
 
+#include "mysql/psi/mysql_file.h"
+
 /*
   Copy contents of an IO_CACHE to a file.
 
@@ -76,7 +90,7 @@ my_off_t my_b_append_tell(IO_CACHE* info)
     Sometimes we want to make sure that the variable is not put into
     a register in debugging mode so we can see its value in the core
   */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 # define dbug_volatile volatile
 #else
 # define dbug_volatile
@@ -95,7 +109,7 @@ my_off_t my_b_append_tell(IO_CACHE* info)
   */
   mysql_mutex_lock(&info->append_buffer_lock);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Make sure EOF is where we think it is. Note that we cannot just use
     my_tell() because we have a reader thread that could have left the
@@ -103,14 +117,14 @@ my_off_t my_b_append_tell(IO_CACHE* info)
   */
   {
     volatile my_off_t save_pos;
-    save_pos = my_tell(info->file,MYF(0));
-    my_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0));
+    save_pos = mysql_file_tell(info->file,MYF(0));
+    mysql_file_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0));
     /*
       Save the value of my_tell in res so we can see it when studying coredump
     */
-    DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer)
-		== (res=my_tell(info->file,MYF(0))));
-    my_seek(info->file,save_pos,MY_SEEK_SET,MYF(0));
+    assert(info->end_of_file - (info->append_read_pos-info->write_buffer)
+           == (res=mysql_file_tell(info->file,MYF(0))));
+    mysql_file_seek(info->file,save_pos,MY_SEEK_SET,MYF(0));
   }
 #endif  
   res = info->end_of_file + (info->write_pos-info->append_read_pos);
@@ -204,7 +218,7 @@ size_t my_b_fill(IO_CACHE *info)
 
   if (info->seek_not_done)
   {					/* File touched, do seek */
-    if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) ==
+    if (mysql_file_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) ==
 	MY_FILEPOS_ERROR)
     {
       info->error= 0;
@@ -224,7 +238,7 @@ size_t my_b_fill(IO_CACHE *info)
   }
   DBUG_EXECUTE_IF ("simulate_my_b_fill_error",
                    {DBUG_SET("+d,simulate_file_read_error");});
-  if ((length= my_read(info->file,info->buffer,max_length,
+  if ((length= mysql_file_read(info->file,info->buffer,max_length,
                        info->myflags)) == (size_t) -1)
   {
     info->error= -1;
@@ -288,7 +302,7 @@ my_off_t my_b_filelength(IO_CACHE *info)
     return my_b_tell(info);
 
   info->seek_not_done= 1;
-  return my_seek(info->file, 0L, MY_SEEK_END, MYF(0));
+  return mysql_file_seek(info->file, 0L, MY_SEEK_END, MYF(0));
 }
 
 
@@ -359,7 +373,7 @@ size_t my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args)
       By this point, *fmt must be a percent;  Keep track of this location and
       skip over the percent character. 
     */
-    DBUG_ASSERT(*fmt == '%');
+    assert(*fmt == '%');
     backtrack= fmt;
     fmt++;
 
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index cb712ed65e10..c2c3041608e8 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -213,7 +225,7 @@ static void free_block(KEY_CACHE *keycache,
 #define HASH_LINK_NUMBER(h)                                                   \
   ((uint) (((char*)(h)-(char *) keycache->hash_link_root)/sizeof(HASH_LINK)))
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 static int fail_block(BLOCK_LINK *block);
 static int fail_hlink(HASH_LINK *hlink);
 static int cache_empty(KEY_CACHE *keycache);
@@ -258,7 +270,7 @@ int init_key_cache(KEY_CACHE *keycache, ulonglong key_cache_block_size,
   size_t length;
   int error;
   DBUG_ENTER("init_key_cache");
-  DBUG_ASSERT(key_cache_block_size >= 512);
+  assert(key_cache_block_size >= 512);
 
   if (keycache->key_cache_inited && keycache->disk_blocks > 0)
   {
@@ -498,7 +510,7 @@ int resize_key_cache(KEY_CACHE *keycache,
       keycache->can_be_used= 0;
       goto finish;
     }
-    DBUG_ASSERT(cache_empty(keycache));
+    assert(cache_empty(keycache));
 
     /* End the flush phase. */
     keycache->resize_in_flush= 0;
@@ -676,7 +688,7 @@ static void link_into_queue(KEYCACHE_WQUEUE *wqueue,
 {
   st_keycache_thread_var *last;
 
-  DBUG_ASSERT(!thread->next && !thread->prev);
+  assert(!thread->next && !thread->prev);
   if (! (last= wqueue->last_thread))
   {
     /* Queue is empty */
@@ -707,7 +719,7 @@ static void link_into_queue(KEYCACHE_WQUEUE *wqueue,
 static void unlink_from_queue(KEYCACHE_WQUEUE *wqueue,
                               st_keycache_thread_var *thread)
 {
-  DBUG_ASSERT(thread->next && thread->prev);
+  assert(thread->next && thread->prev);
   if (thread->next == thread)
     /* The queue contains only one member */
     wqueue->last_thread= NULL;
@@ -720,10 +732,10 @@ static void unlink_from_queue(KEYCACHE_WQUEUE *wqueue,
                                       thread->prev);
   }
   thread->next= NULL;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /*
     This makes it easier to see it's not in a chain during debugging.
-    And some DBUG_ASSERT() rely on it.
+    And some assert() rely on it.
   */
   thread->prev= NULL;
 #endif
@@ -761,8 +773,8 @@ static void wait_on_queue(KEYCACHE_WQUEUE *wqueue,
   st_keycache_thread_var *last;
 
   /* Add to queue. */
-  DBUG_ASSERT(!thread->next);
-  DBUG_ASSERT(!thread->prev); /* Not required, but must be true anyway. */
+  assert(!thread->next);
+  assert(!thread->prev); /* Not required, but must be true anyway. */
   if (! (last= wqueue->last_thread))
     thread->next= thread;
   else
@@ -833,15 +845,15 @@ static void release_whole_queue(KEYCACHE_WQUEUE *wqueue)
 
 static inline void unlink_changed(BLOCK_LINK *block)
 {
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
+  assert(block->prev_changed && *block->prev_changed == block);
   if (block->next_changed)
     block->next_changed->prev_changed= block->prev_changed;
   *block->prev_changed= block->next_changed;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /*
     This makes it easier to see it's not in a chain during debugging.
-    And some DBUG_ASSERT() rely on it.
+    And some assert() rely on it.
   */
   block->next_changed= NULL;
   block->prev_changed= NULL;
@@ -855,8 +867,8 @@ static inline void unlink_changed(BLOCK_LINK *block)
 
 static inline void link_changed(BLOCK_LINK *block, BLOCK_LINK **phead)
 {
-  DBUG_ASSERT(!block->next_changed);
-  DBUG_ASSERT(!block->prev_changed);
+  assert(!block->next_changed);
+  assert(!block->prev_changed);
   block->prev_changed= phead;
   if ((block->next_changed= *phead))
     (*phead)->prev_changed= &block->next_changed;
@@ -893,9 +905,9 @@ static void link_to_file_list(KEY_CACHE *keycache,
                               BLOCK_LINK *block, int file,
                               my_bool unlink_block)
 {
-  DBUG_ASSERT(block->status & BLOCK_IN_USE);
-  DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
-  DBUG_ASSERT(block->hash_link->file == file);
+  assert(block->status & BLOCK_IN_USE);
+  assert(block->hash_link && block->hash_link->block == block);
+  assert(block->hash_link->file == file);
   if (unlink_block)
     unlink_changed(block);
   link_changed(block, &keycache->file_blocks[FILE_HASH(file)]);
@@ -933,9 +945,9 @@ static void link_to_file_list(KEY_CACHE *keycache,
 static void link_to_changed_list(KEY_CACHE *keycache,
                                  BLOCK_LINK *block)
 {
-  DBUG_ASSERT(block->status & BLOCK_IN_USE);
-  DBUG_ASSERT(!(block->status & BLOCK_CHANGED));
-  DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
+  assert(block->status & BLOCK_IN_USE);
+  assert(!(block->status & BLOCK_CHANGED));
+  assert(block->hash_link && block->hash_link->block == block);
 
   unlink_changed(block);
   link_changed(block,
@@ -991,12 +1003,12 @@ static void link_block(KEY_CACHE *keycache, BLOCK_LINK *block, my_bool hot,
   BLOCK_LINK *ins;
   BLOCK_LINK **pins;
 
-  DBUG_ASSERT((block->status & ~BLOCK_CHANGED) == (BLOCK_READ | BLOCK_IN_USE));
-  DBUG_ASSERT(block->hash_link); /*backptr to block NULL from free_block()*/
-  DBUG_ASSERT(!block->requests);
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
-  DBUG_ASSERT(!block->next_used);
-  DBUG_ASSERT(!block->prev_used);
+  assert((block->status & ~BLOCK_CHANGED) == (BLOCK_READ | BLOCK_IN_USE));
+  assert(block->hash_link); /*backptr to block NULL from free_block()*/
+  assert(!block->requests);
+  assert(block->prev_changed && *block->prev_changed == block);
+  assert(!block->next_used);
+  assert(!block->prev_used);
 
   if (!hot && keycache->waiting_for_block.last_thread)
   {
@@ -1067,8 +1079,8 @@ static void link_block(KEY_CACHE *keycache, BLOCK_LINK *block, my_bool hot,
     keycache->used_last= keycache->used_ins= block->next_used= block;
     block->prev_used= &block->next_used;
   }
-  DBUG_ASSERT((ulong) keycache->blocks_available <=
-              keycache->blocks_used);
+  assert((ulong) keycache->blocks_available <=
+         keycache->blocks_used);
 }
 
 
@@ -1089,13 +1101,13 @@ static void link_block(KEY_CACHE *keycache, BLOCK_LINK *block, my_bool hot,
 
 static void unlink_block(KEY_CACHE *keycache, BLOCK_LINK *block)
 {
-  DBUG_ASSERT((block->status & ~BLOCK_CHANGED) == (BLOCK_READ | BLOCK_IN_USE));
-  DBUG_ASSERT(block->hash_link); /*backptr to block NULL from free_block()*/
-  DBUG_ASSERT(!block->requests);
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
-  DBUG_ASSERT(block->next_used && block->prev_used &&
-              (block->next_used->prev_used == &block->next_used) &&
-              (*block->prev_used == block));
+  assert((block->status & ~BLOCK_CHANGED) == (BLOCK_READ | BLOCK_IN_USE));
+  assert(block->hash_link); /*backptr to block NULL from free_block()*/
+  assert(!block->requests);
+  assert(block->prev_changed && *block->prev_changed == block);
+  assert(block->next_used && block->prev_used &&
+         (block->next_used->prev_used == &block->next_used) &&
+         (*block->prev_used == block));
   if (block->next_used == block)
     /* The list contains only one member */
     keycache->used_last= keycache->used_ins= NULL;
@@ -1109,10 +1121,10 @@ static void unlink_block(KEY_CACHE *keycache, BLOCK_LINK *block)
       keycache->used_ins=STRUCT_PTR(BLOCK_LINK, next_used, block->prev_used);
   }
   block->next_used= NULL;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /*
     This makes it easier to see it's not in a chain during debugging.
-    And some DBUG_ASSERT() rely on it.
+    And some assert() rely on it.
   */
   block->prev_used= NULL;
 #endif
@@ -1137,8 +1149,8 @@ static void unlink_block(KEY_CACHE *keycache, BLOCK_LINK *block)
 */
 static void reg_requests(KEY_CACHE *keycache, BLOCK_LINK *block, int count)
 {
-  DBUG_ASSERT(block->status & BLOCK_IN_USE);
-  DBUG_ASSERT(block->hash_link);
+  assert(block->status & BLOCK_IN_USE);
+  assert(block->hash_link);
 
   if (!block->requests)
     unlink_block(keycache, block);
@@ -1181,12 +1193,12 @@ static void reg_requests(KEY_CACHE *keycache, BLOCK_LINK *block, int count)
 static void unreg_request(KEY_CACHE *keycache,
                           BLOCK_LINK *block, int at_end)
 {
-  DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-  DBUG_ASSERT(block->hash_link); /*backptr to block NULL from free_block()*/
-  DBUG_ASSERT(block->requests);
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
-  DBUG_ASSERT(!block->next_used);
-  DBUG_ASSERT(!block->prev_used);
+  assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+  assert(block->hash_link); /*backptr to block NULL from free_block()*/
+  assert(block->requests);
+  assert(block->prev_changed && *block->prev_changed == block);
+  assert(!block->next_used);
+  assert(!block->prev_used);
   /*
     Unregister the request, but do not link erroneous blocks into the
     LRU ring.
@@ -1243,12 +1255,12 @@ static void unreg_request(KEY_CACHE *keycache,
 
 static void remove_reader(BLOCK_LINK *block)
 {
-  DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-  DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
-  DBUG_ASSERT(!block->next_used);
-  DBUG_ASSERT(!block->prev_used);
-  DBUG_ASSERT(block->hash_link->requests);
+  assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+  assert(block->hash_link && block->hash_link->block == block);
+  assert(block->prev_changed && *block->prev_changed == block);
+  assert(!block->next_used);
+  assert(!block->prev_used);
+  assert(block->hash_link->requests);
 
   if (! --block->hash_link->requests && block->condvar)
     mysql_cond_signal(block->condvar);
@@ -1264,19 +1276,19 @@ static void wait_for_readers(KEY_CACHE *keycache,
                              BLOCK_LINK *block,
                              st_keycache_thread_var *thread)
 {
-  DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-  DBUG_ASSERT(!(block->status & (BLOCK_IN_FLUSH | BLOCK_CHANGED)));
-  DBUG_ASSERT(block->hash_link);
-  DBUG_ASSERT(block->hash_link->block == block);
+  assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+  assert(!(block->status & (BLOCK_IN_FLUSH | BLOCK_CHANGED)));
+  assert(block->hash_link);
+  assert(block->hash_link->block == block);
   /* Linked in file_blocks or changed_blocks hash. */
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
+  assert(block->prev_changed && *block->prev_changed == block);
   /* Not linked in LRU ring. */
-  DBUG_ASSERT(!block->next_used);
-  DBUG_ASSERT(!block->prev_used);
+  assert(!block->next_used);
+  assert(!block->prev_used);
   while (block->hash_link->requests)
   {
     /* There must be no other waiter. We have no queue here. */
-    DBUG_ASSERT(!block->condvar);
+    assert(!block->condvar);
     block->condvar= &thread->suspend;
     mysql_cond_wait(&thread->suspend, &keycache->cache_lock);
     block->condvar= NULL;
@@ -1304,7 +1316,7 @@ static inline void link_hash(HASH_LINK **start, HASH_LINK *hash_link)
 
 static void unlink_hash(KEY_CACHE *keycache, HASH_LINK *hash_link)
 {
-  DBUG_ASSERT(hash_link->requests == 0);
+  assert(hash_link->requests == 0);
   if ((*hash_link->prev= hash_link->next))
     hash_link->next->prev= hash_link->prev;
   hash_link->block= NULL;
@@ -1357,7 +1369,7 @@ static HASH_LINK *get_hash_link(KEY_CACHE *keycache,
                                 st_keycache_thread_var *thread)
 {
   HASH_LINK *hash_link, **start;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   int cnt;
 #endif
 
@@ -1368,7 +1380,7 @@ static HASH_LINK *get_hash_link(KEY_CACHE *keycache,
      hash_link points to the first member of the list
   */
   hash_link= *(start= &keycache->hash_root[KEYCACHE_HASH(file, filepos)]);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   cnt= 0;
 #endif
   /* Look for an element for the pair (file, filepos) in the bucket chain */
@@ -1376,9 +1388,9 @@ static HASH_LINK *get_hash_link(KEY_CACHE *keycache,
          (hash_link->diskpos != filepos || hash_link->file != file))
   {
     hash_link= hash_link->next;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     cnt++;
-    DBUG_ASSERT(cnt <= keycache->hash_links_used);
+    assert(cnt <= keycache->hash_links_used);
 #endif
   }
   if (! hash_link)
@@ -1501,7 +1513,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
           - not changed (clean).
   */
   hash_link= get_hash_link(keycache, file, filepos, thread);
-  DBUG_ASSERT((hash_link->file == file) && (hash_link->diskpos == filepos));
+  assert((hash_link->file == file) && (hash_link->diskpos == filepos));
 
   page_status= -1;
   if ((block= hash_link->block) &&
@@ -1602,10 +1614,10 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         only. Waiting here on COND_FOR_REQUESTED works in all
         situations.
       */
-      DBUG_ASSERT(((block->hash_link != hash_link) &&
-                   (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))) ||
-                  ((block->hash_link == hash_link) &&
-                   !(block->status & BLOCK_READ)));
+      assert(((block->hash_link != hash_link) &&
+              (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))) ||
+             ((block->hash_link == hash_link) &&
+              !(block->status & BLOCK_READ)));
       wait_on_queue(&block->wqueue[COND_FOR_REQUESTED], &keycache->cache_lock,
                     thread);
       /*
@@ -1618,9 +1630,9 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         again in eviction because we registered an request on it before
         starting to wait.
       */
-      DBUG_ASSERT(block->hash_link == hash_link);
-      DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-      DBUG_ASSERT(!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH)));
+      assert(block->hash_link == hash_link);
+      assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+      assert(!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH)));
     }
     /*
       The block is in the cache. Assigned to the hash_link. Valid data.
@@ -1632,9 +1644,9 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
     {
       /* A reader can just read the block. */
       *page_st= PAGE_READ;
-      DBUG_ASSERT((hash_link->file == file) &&
-                  (hash_link->diskpos == filepos) &&
-                  (block->hash_link == hash_link));
+      assert((hash_link->file == file) &&
+             (hash_link->diskpos == filepos) &&
+             (block->hash_link == hash_link));
       DBUG_RETURN(block);
     }
 
@@ -1642,7 +1654,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
       This is a writer. No two writers for the same block can exist.
       This must be assured by locks outside of the key cache.
     */
-    DBUG_ASSERT(!(block->status & BLOCK_FOR_UPDATE) || fail_block(block));
+    assert(!(block->status & BLOCK_FOR_UPDATE) || fail_block(block));
 
     while (block->status & BLOCK_IN_FLUSH)
     {
@@ -1667,9 +1679,9 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         unreg_request(keycache, block, 1);
         goto restart;
       }
-      DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-      DBUG_ASSERT(!(block->status & BLOCK_FOR_UPDATE) || fail_block(block));
-      DBUG_ASSERT(block->hash_link == hash_link);
+      assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+      assert(!(block->status & BLOCK_FOR_UPDATE) || fail_block(block));
+      assert(block->hash_link == hash_link);
     }
 
     if (block->status & BLOCK_CHANGED)
@@ -1682,9 +1694,9 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         not yet been selected for flush, we can still add our changes.
       */
       *page_st= PAGE_READ;
-      DBUG_ASSERT((hash_link->file == file) &&
-                  (hash_link->diskpos == filepos) &&
-                  (block->hash_link == hash_link));
+      assert((hash_link->file == file) &&
+             (hash_link->diskpos == filepos) &&
+             (block->hash_link == hash_link));
       DBUG_RETURN(block);
     }
 
@@ -1798,7 +1810,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         as soon as possible. Again we must wait so that we don't find
         the same hash_link + block again and again.
       */
-      DBUG_ASSERT(hash_link->requests);
+      assert(hash_link->requests);
       hash_link->requests--;
       wait_on_queue(&block->wqueue[COND_FOR_SAVED], &keycache->cache_lock,
                     thread);
@@ -1837,8 +1849,8 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         {
           size_t block_mem_offset;
           /* There are some never used blocks, take first of them */
-          DBUG_ASSERT(keycache->blocks_used <
-                      (ulong) keycache->disk_blocks);
+          assert(keycache->blocks_used <
+                 (ulong) keycache->disk_blocks);
           block= &keycache->block_root[keycache->blocks_used];
           block_mem_offset= 
            ((size_t) keycache->blocks_used) * keycache->key_cache_block_size;
@@ -1846,14 +1858,14 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
                                     block_mem_offset,
                                     uchar*);
           keycache->blocks_used++;
-          DBUG_ASSERT(!block->next_used);
+          assert(!block->next_used);
         }
-        DBUG_ASSERT(!block->prev_used);
-        DBUG_ASSERT(!block->next_changed);
-        DBUG_ASSERT(!block->prev_changed);
-        DBUG_ASSERT(!block->hash_link);
-        DBUG_ASSERT(!block->status);
-        DBUG_ASSERT(!block->requests);
+        assert(!block->prev_used);
+        assert(!block->next_changed);
+        assert(!block->prev_changed);
+        assert(!block->hash_link);
+        assert(!block->status);
+        assert(!block->requests);
         keycache->blocks_unused--;
         block->status= BLOCK_IN_USE;
         block->length= 0;
@@ -1898,10 +1910,10 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
           while (thread->next);
           thread->opt_info= NULL;
           /* Assert that block has a request registered. */
-          DBUG_ASSERT(hash_link->block->requests);
+          assert(hash_link->block->requests);
           /* Assert that block is not in LRU ring. */
-          DBUG_ASSERT(!hash_link->block->next_used);
-          DBUG_ASSERT(!hash_link->block->prev_used);
+          assert(!hash_link->block->next_used);
+          assert(!hash_link->block->prev_used);
         }
 
         /*
@@ -1921,7 +1933,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
             Register a request on the block. This unlinks it from the
             LRU ring and protects it against eviction.
           */
-          DBUG_ASSERT(!block->requests);
+          assert(!block->requests);
           reg_requests(keycache, block,1);
           /*
             We do not need to set block->status|= BLOCK_IN_EVICTION here
@@ -1964,10 +1976,10 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
                 The block is marked BLOCK_IN_SWITCH. It should be left
                 alone except for reading. No free, no write.
               */
-              DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
-              DBUG_ASSERT(!(block->status & (BLOCK_REASSIGNED |
-                                             BLOCK_CHANGED |
-                                             BLOCK_FOR_UPDATE)));
+              assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
+              assert(!(block->status & (BLOCK_REASSIGNED |
+                                        BLOCK_CHANGED |
+                                        BLOCK_FOR_UPDATE)));
             }
             else
             {
@@ -1976,11 +1988,11 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
                 BLOCK_IN_EVICTION may be true or not. Other flags must
                 have a fixed value.
               */
-              DBUG_ASSERT((block->status & ~BLOCK_IN_EVICTION) ==
-                          (BLOCK_READ | BLOCK_IN_SWITCH |
-                           BLOCK_IN_FLUSH | BLOCK_IN_FLUSHWRITE |
-                           BLOCK_CHANGED | BLOCK_IN_USE));
-              DBUG_ASSERT(block->hash_link);
+              assert((block->status & ~BLOCK_IN_EVICTION) ==
+                     (BLOCK_READ | BLOCK_IN_SWITCH |
+                      BLOCK_IN_FLUSH | BLOCK_IN_FLUSHWRITE |
+                      BLOCK_CHANGED | BLOCK_IN_USE));
+              assert(block->hash_link);
 
               mysql_mutex_unlock(&keycache->cache_lock);
               /*
@@ -1995,10 +2007,10 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
               mysql_mutex_lock(&keycache->cache_lock);
 
               /* Block status must not have changed. */
-              DBUG_ASSERT((block->status & ~BLOCK_IN_EVICTION) ==
-                          (BLOCK_READ | BLOCK_IN_SWITCH |
-                           BLOCK_IN_FLUSH | BLOCK_IN_FLUSHWRITE |
-                           BLOCK_CHANGED | BLOCK_IN_USE) || fail_block(block));
+              assert((block->status & ~BLOCK_IN_EVICTION) ==
+                     (BLOCK_READ | BLOCK_IN_SWITCH |
+                      BLOCK_IN_FLUSH | BLOCK_IN_FLUSHWRITE |
+                      BLOCK_CHANGED | BLOCK_IN_USE) || fail_block(block));
               keycache->global_cache_write++;
             }
           }
@@ -2008,7 +2020,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
             The block comes from the LRU ring. It must have a hash_link
             assigned.
           */
-          DBUG_ASSERT(block->hash_link);
+          assert(block->hash_link);
           if (block->hash_link)
           {
             /*
@@ -2035,10 +2047,10 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
 	      a page in the cache in a sweep, without yielding control)
             */
             wait_for_readers(keycache, block, thread);
-            DBUG_ASSERT(block->hash_link && block->hash_link->block == block &&
-                        block->prev_changed);
+            assert(block->hash_link && block->hash_link->block == block &&
+                   block->prev_changed);
             /* The reader must not have been a writer. */
-            DBUG_ASSERT(!(block->status & BLOCK_CHANGED));
+            assert(!(block->status & BLOCK_CHANGED));
 
             /* Wake flushers that might have found the block in between. */
             release_whole_queue(&block->wqueue[COND_FOR_SAVED]);
@@ -2062,8 +2074,8 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
           link_to_file_list(keycache, block, file, 0);
           page_status= PAGE_TO_BE_READ;
 
-          DBUG_ASSERT(block->hash_link->block == block);
-          DBUG_ASSERT(hash_link->block->hash_link == hash_link);
+          assert(block->hash_link->block == block);
+          assert(hash_link->block->hash_link == hash_link);
         }
         else
         {
@@ -2109,12 +2121,12 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
         Register a request on the block. This is another protection
         against eviction.
       */
-      DBUG_ASSERT(((block->hash_link != hash_link) &&
-                   (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))) ||
-                  ((block->hash_link == hash_link) &&
-                   !(block->status & BLOCK_READ)) ||
-                  ((block->status & BLOCK_READ) &&
-                   !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))));
+      assert(((block->hash_link != hash_link) &&
+              (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))) ||
+             ((block->hash_link == hash_link) &&
+              !(block->status & BLOCK_READ)) ||
+             ((block->status & BLOCK_READ) &&
+              !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH))));
       reg_requests(keycache, block, 1);
       page_status= (((block->hash_link == hash_link) &&
                      (block->status & BLOCK_READ)) ?
@@ -2122,17 +2134,17 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
     }
   }
 
-  DBUG_ASSERT(page_status != -1);
+  assert(page_status != -1);
   /* Same assert basically, but be very sure. */
-  DBUG_ASSERT(block);
+  assert(block);
   /* Assert that block has a request and is not in LRU ring. */
-  DBUG_ASSERT(block->requests);
-  DBUG_ASSERT(!block->next_used);
-  DBUG_ASSERT(!block->prev_used);
+  assert(block->requests);
+  assert(!block->next_used);
+  assert(!block->prev_used);
   /* Assert that we return the correct block. */
-  DBUG_ASSERT((page_status == PAGE_WAIT_TO_BE_READ) ||
-              ((block->hash_link->file == file) &&
-               (block->hash_link->diskpos == filepos)));
+  assert((page_status == PAGE_WAIT_TO_BE_READ) ||
+         ((block->hash_link->file == file) &&
+          (block->hash_link->diskpos == filepos)));
   *page_st=page_status;
   DBUG_RETURN(block);
 }
@@ -2180,12 +2192,12 @@ static void read_block(KEY_CACHE *keycache,
       request for the block become secondary requests. For a primary
       request the block must be properly initialized.
     */
-    DBUG_ASSERT(((block->status & ~BLOCK_FOR_UPDATE) == BLOCK_IN_USE) ||
-                fail_block(block));
-    DBUG_ASSERT((block->length == 0) || fail_block(block));
-    DBUG_ASSERT((block->offset == keycache->key_cache_block_size) ||
-                fail_block(block));
-    DBUG_ASSERT((block->requests > 0) || fail_block(block));
+    assert(((block->status & ~BLOCK_FOR_UPDATE) == BLOCK_IN_USE) ||
+           fail_block(block));
+    assert((block->length == 0) || fail_block(block));
+    assert((block->offset == keycache->key_cache_block_size) ||
+           fail_block(block));
+    assert((block->requests > 0) || fail_block(block));
 
     keycache->global_cache_read++;
     /* Page is not in buffer yet, is to be read from disk */
@@ -2201,13 +2213,13 @@ static void read_block(KEY_CACHE *keycache,
       The block can now have been marked for free (in case of
       FLUSH_RELEASE). Otherwise the state must be unchanged.
     */
-    DBUG_ASSERT(((block->status & ~(BLOCK_REASSIGNED |
-                                    BLOCK_FOR_UPDATE)) == BLOCK_IN_USE) ||
-                fail_block(block));
-    DBUG_ASSERT((block->length == 0) || fail_block(block));
-    DBUG_ASSERT((block->offset == keycache->key_cache_block_size) ||
-                fail_block(block));
-    DBUG_ASSERT((block->requests > 0) || fail_block(block));
+    assert(((block->status & ~(BLOCK_REASSIGNED |
+                               BLOCK_FOR_UPDATE)) == BLOCK_IN_USE) ||
+           fail_block(block));
+    assert((block->length == 0) || fail_block(block));
+    assert((block->offset == keycache->key_cache_block_size) ||
+           fail_block(block));
+    assert((block->requests > 0) || fail_block(block));
 
     if (got_length < min_length)
       block->status|= BLOCK_ERROR;
@@ -2344,7 +2356,7 @@ uchar *key_cache_read(KEY_CACHE *keycache,
       /* Do not read beyond the end of the cache block. */
       read_length= length;
       set_if_smaller(read_length, keycache->key_cache_block_size-offset);
-      DBUG_ASSERT(read_length > 0);
+      assert(read_length > 0);
 
       if (block_length > keycache->key_cache_block_size || offset)
 	return_buffer=0;
@@ -2384,10 +2396,10 @@ uchar *key_cache_read(KEY_CACHE *keycache,
             requested file block. It does not hurt to check it for
             primary requests too.
           */
-          DBUG_ASSERT(keycache->can_be_used);
-          DBUG_ASSERT(block->hash_link->file == file);
-          DBUG_ASSERT(block->hash_link->diskpos == filepos);
-          DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+          assert(keycache->can_be_used);
+          assert(block->hash_link->file == file);
+          assert(block->hash_link->diskpos == filepos);
+          assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
         }
         else if (block->length < read_length + offset)
         {
@@ -2409,14 +2421,14 @@ uchar *key_cache_read(KEY_CACHE *keycache,
       if (!(block->status & BLOCK_ERROR))
       {
         {
-          DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+          assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
           mysql_mutex_unlock(&keycache->cache_lock);
 
           /* Copy data from the cache buffer */
           memcpy(buff, block->buffer+offset, (size_t) read_length);
 
           mysql_mutex_lock(&keycache->cache_lock);
-          DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+          assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
         }
       }
 
@@ -2551,7 +2563,7 @@ int key_cache_insert(KEY_CACHE *keycache,
       /* Do not load beyond the end of the cache block. */
       read_length= length;
       set_if_smaller(read_length, keycache->key_cache_block_size-offset);
-      DBUG_ASSERT(read_length > 0);
+      assert(read_length > 0);
 
       /* The block has been read by the caller already. */
       keycache->global_cache_read++;
@@ -2609,10 +2621,10 @@ int key_cache_insert(KEY_CACHE *keycache,
             requested file block. It does not hurt to check it for
             primary requests too.
           */
-          DBUG_ASSERT(keycache->can_be_used);
-          DBUG_ASSERT(block->hash_link->file == file);
-          DBUG_ASSERT(block->hash_link->diskpos == filepos);
-          DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+          assert(keycache->can_be_used);
+          assert(block->hash_link->file == file);
+          assert(block->hash_link->diskpos == filepos);
+          assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
         }
         else if (page_st == PAGE_TO_BE_READ)
         {
@@ -2620,10 +2632,10 @@ int key_cache_insert(KEY_CACHE *keycache,
             This is a new block in the cache. If we come here, we have
             data for the whole block.
           */
-          DBUG_ASSERT(block->hash_link->requests);
-          DBUG_ASSERT(block->status & BLOCK_IN_USE);
-          DBUG_ASSERT((page_st == PAGE_TO_BE_READ) ||
-                      (block->status & BLOCK_READ));
+          assert(block->hash_link->requests);
+          assert(block->status & BLOCK_IN_USE);
+          assert((page_st == PAGE_TO_BE_READ) ||
+                 (block->status & BLOCK_READ));
 
           mysql_mutex_unlock(&keycache->cache_lock);
           /*
@@ -2635,9 +2647,9 @@ int key_cache_insert(KEY_CACHE *keycache,
           memcpy(block->buffer+offset, buff, (size_t) read_length);
 
           mysql_mutex_lock(&keycache->cache_lock);
-          DBUG_ASSERT(block->status & BLOCK_IN_USE);
-          DBUG_ASSERT((page_st == PAGE_TO_BE_READ) ||
-                      (block->status & BLOCK_READ));
+          assert(block->status & BLOCK_IN_USE);
+          assert((page_st == PAGE_TO_BE_READ) ||
+                 (block->status & BLOCK_READ));
           /*
             After the data is in the buffer, we can declare the block
             valid. Now other threads do not need to register as
@@ -2667,8 +2679,8 @@ int key_cache_insert(KEY_CACHE *keycache,
             with the new data. If the condition is met, we can simply
             ignore the block.
           */
-          DBUG_ASSERT((page_st == PAGE_READ) &&
-                      (read_length + offset <= block->length));
+          assert((page_st == PAGE_READ) &&
+                 (read_length + offset <= block->length));
         }
 
         /*
@@ -2676,9 +2688,9 @@ int key_cache_insert(KEY_CACHE *keycache,
           requested file block. It does not hurt to check it for primary
           requests too.
         */
-        DBUG_ASSERT(block->hash_link->file == file);
-        DBUG_ASSERT(block->hash_link->diskpos == filepos);
-        DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+        assert(block->hash_link->file == file);
+        assert(block->hash_link->diskpos == filepos);
+        assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
       } /* end of if (!(block->status & BLOCK_ERROR)) */
 
       remove_reader(block);
@@ -2836,7 +2848,7 @@ int key_cache_write(KEY_CACHE *keycache,
       /* Do not write beyond the end of the cache block. */
       read_length= length;
       set_if_smaller(read_length, keycache->key_cache_block_size-offset);
-      DBUG_ASSERT(read_length > 0);
+      assert(read_length > 0);
 
       /* Request the cache block that matches file/pos. */
       keycache->global_cache_w_requests++;
@@ -2890,8 +2902,8 @@ int key_cache_write(KEY_CACHE *keycache,
                    offset + read_length >= keycache->key_cache_block_size?
                    offset : keycache->key_cache_block_size,
                    offset, (page_st == PAGE_TO_BE_READ));
-        DBUG_ASSERT(keycache->can_be_used);
-        DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+        assert(keycache->can_be_used);
+        assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
         /*
           Prevent block from flushing and from being selected for to be
           freed. This must be set when we release the cache_lock.
@@ -2903,10 +2915,10 @@ int key_cache_write(KEY_CACHE *keycache,
         The block should always be assigned to the requested file block
         here. It need not be BLOCK_READ when overwriting the whole block.
       */
-      DBUG_ASSERT(block->hash_link->file == file);
-      DBUG_ASSERT(block->hash_link->diskpos == filepos);
-      DBUG_ASSERT(block->status & BLOCK_IN_USE);
-      DBUG_ASSERT((page_st == PAGE_TO_BE_READ) || (block->status & BLOCK_READ));
+      assert(block->hash_link->file == file);
+      assert(block->hash_link->diskpos == filepos);
+      assert(block->status & BLOCK_IN_USE);
+      assert((page_st == PAGE_TO_BE_READ) || (block->status & BLOCK_READ));
       /*
         The block to be written must not be marked BLOCK_REASSIGNED.
         Otherwise it could be freed in dirty state or reused without
@@ -2915,7 +2927,7 @@ int key_cache_write(KEY_CACHE *keycache,
         the flusher could clear BLOCK_CHANGED without flushing the
         new changes again.
       */
-      DBUG_ASSERT(!(block->status & BLOCK_REASSIGNED));
+      assert(!(block->status & BLOCK_REASSIGNED));
 
       while (block->status & BLOCK_IN_FLUSHWRITE)
       {
@@ -2930,11 +2942,11 @@ int key_cache_write(KEY_CACHE *keycache,
         */
         wait_on_queue(&block->wqueue[COND_FOR_SAVED], &keycache->cache_lock,
                       thread_var);
-        DBUG_ASSERT(keycache->can_be_used);
-        DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE));
+        assert(keycache->can_be_used);
+        assert(block->status & (BLOCK_READ | BLOCK_IN_USE));
         /* Still must not be marked for free. */
-        DBUG_ASSERT(!(block->status & BLOCK_REASSIGNED));
-        DBUG_ASSERT(block->hash_link && (block->hash_link->block == block));
+        assert(!(block->status & BLOCK_REASSIGNED));
+        assert(block->hash_link && (block->hash_link->block == block));
       }
 
       /*
@@ -3091,24 +3103,24 @@ static void free_block(KEY_CACHE *keycache,
     is registered in the hash_link and free_block() will wait for it
     below.
   */
-  DBUG_ASSERT((block->status & BLOCK_IN_USE) &&
-              !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
-                                 BLOCK_REASSIGNED | BLOCK_IN_FLUSH |
-                                 BLOCK_CHANGED | BLOCK_FOR_UPDATE)));
+  assert((block->status & BLOCK_IN_USE) &&
+         !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
+                            BLOCK_REASSIGNED | BLOCK_IN_FLUSH |
+                            BLOCK_CHANGED | BLOCK_FOR_UPDATE)));
   /* Assert that the block is in a file_blocks chain. */
-  DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
+  assert(block->prev_changed && *block->prev_changed == block);
   /* Assert that the block is not in the LRU ring. */
-  DBUG_ASSERT(!block->next_used && !block->prev_used);
+  assert(!block->next_used && !block->prev_used);
   /*
     IMHO the below condition (if()) makes no sense. I can't see how it
     could be possible that free_block() is entered with a NULL hash_link
     pointer. The only place where it can become NULL is in free_block()
     (or before its first use ever, but for those blocks free_block() is
     not called). I don't remove the conditional as it cannot harm, but
-    place an DBUG_ASSERT to confirm my hypothesis. Eventually the
+    place an assert to confirm my hypothesis. Eventually the
     condition (if()) can be removed.
   */
-  DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
+  assert(block->hash_link && block->hash_link->block == block);
   if (block->hash_link)
   {
     /*
@@ -3124,14 +3136,14 @@ static void free_block(KEY_CACHE *keycache,
       checks. An additional requirement is that it must be read now
       (BLOCK_READ).
     */
-    DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
-    DBUG_ASSERT((block->status & (BLOCK_READ | BLOCK_IN_USE |
-                                  BLOCK_REASSIGNED)) &&
-                !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
-                                   BLOCK_IN_FLUSH | BLOCK_CHANGED |
-                                   BLOCK_FOR_UPDATE)));
-    DBUG_ASSERT(block->prev_changed && *block->prev_changed == block);
-    DBUG_ASSERT(!block->prev_used);
+    assert(block->hash_link && block->hash_link->block == block);
+    assert((block->status & (BLOCK_READ | BLOCK_IN_USE |
+                             BLOCK_REASSIGNED)) &&
+           !(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
+                              BLOCK_IN_FLUSH | BLOCK_CHANGED |
+                              BLOCK_FOR_UPDATE)));
+    assert(block->prev_changed && *block->prev_changed == block);
+    assert(!block->prev_used);
     /*
       Unset BLOCK_REASSIGNED again. If we hand the block to an evicting
       thread (through unreg_request() below), other threads must not see
@@ -3154,7 +3166,7 @@ static void free_block(KEY_CACHE *keycache,
     operation in this case. Assert that there are no other requests
     registered.
   */
-  DBUG_ASSERT(block->requests == 1);
+  assert(block->requests == 1);
   unreg_request(keycache, block, 0);
   /*
     Note that even without releasing the cache lock it is possible that
@@ -3169,8 +3181,8 @@ static void free_block(KEY_CACHE *keycache,
   if (!(block->status & BLOCK_ERROR))
   {
     /* Here the block must be in the LRU ring. Unlink it again. */
-    DBUG_ASSERT(block->next_used && block->prev_used &&
-                *block->prev_used == block);
+    assert(block->next_used && block->prev_used &&
+           *block->prev_used == block);
     unlink_block(keycache, block);
   }
   if (block->temperature == BLOCK_WARM)
@@ -3189,9 +3201,9 @@ static void free_block(KEY_CACHE *keycache,
   block->offset= keycache->key_cache_block_size;
 
   /* Enforced by unlink_changed(), but just to be sure. */
-  DBUG_ASSERT(!block->next_changed && !block->prev_changed);
+  assert(!block->next_changed && !block->prev_changed);
   /* Enforced by unlink_block(): not in LRU ring nor in free_block_list. */
-  DBUG_ASSERT(!block->next_used && !block->prev_used);
+  assert(!block->next_used && !block->prev_used);
   /* Insert the free block in the free list. */
   block->next_used= keycache->free_block_list;
   keycache->free_block_list= block;
@@ -3251,11 +3263,11 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
     if (!(block->status & BLOCK_FOR_UPDATE))
     {
       /* Blocks coming here must have a certain status. */
-      DBUG_ASSERT(block->hash_link);
-      DBUG_ASSERT(block->hash_link->block == block);
-      DBUG_ASSERT(block->hash_link->file == file);
-      DBUG_ASSERT((block->status & ~BLOCK_IN_EVICTION) ==
-                  (BLOCK_READ | BLOCK_IN_FLUSH | BLOCK_CHANGED | BLOCK_IN_USE));
+      assert(block->hash_link);
+      assert(block->hash_link->block == block);
+      assert(block->hash_link->file == file);
+      assert((block->status & ~BLOCK_IN_EVICTION) ==
+             (BLOCK_READ | BLOCK_IN_FLUSH | BLOCK_CHANGED | BLOCK_IN_USE));
       block->status|= BLOCK_IN_FLUSHWRITE;
       mysql_mutex_unlock(&keycache->cache_lock);
       error= (int)my_pwrite(file, block->buffer+block->offset,
@@ -3272,11 +3284,11 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
       }
       block->status&= ~BLOCK_IN_FLUSHWRITE;
       /* Block must not have changed status except BLOCK_FOR_UPDATE. */
-      DBUG_ASSERT(block->hash_link);
-      DBUG_ASSERT(block->hash_link->block == block);
-      DBUG_ASSERT(block->hash_link->file == file);
-      DBUG_ASSERT((block->status & ~(BLOCK_FOR_UPDATE | BLOCK_IN_EVICTION)) ==
-                  (BLOCK_READ | BLOCK_IN_FLUSH | BLOCK_CHANGED | BLOCK_IN_USE));
+      assert(block->hash_link);
+      assert(block->hash_link->block == block);
+      assert(block->hash_link->file == file);
+      assert((block->status & ~(BLOCK_FOR_UPDATE | BLOCK_IN_EVICTION)) ==
+             (BLOCK_READ | BLOCK_IN_FLUSH | BLOCK_CHANGED | BLOCK_IN_USE));
       /*
         Set correct status and link in right queue for free or later use.
         free_block() must not see BLOCK_CHANGED and it may need to wait
@@ -3365,7 +3377,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
     BLOCK_LINK *last_in_flush;
     BLOCK_LINK *last_for_update;
     BLOCK_LINK *block, *next;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     uint cnt=0;
 #endif
 
@@ -3384,7 +3396,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
             !(block->status & BLOCK_IN_FLUSH))
         {
           count++;
-          DBUG_ASSERT(count<= keycache->blocks_used);
+          assert(count<= keycache->blocks_used);
         }
       }
       /*
@@ -3414,9 +3426,9 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
          block ;
          block= next)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       cnt++;
-      DBUG_ASSERT(cnt <= keycache->blocks_used);
+      assert(cnt <= keycache->blocks_used);
 #endif
       next= block->next_changed;
       if (block->hash_link->file == file)
@@ -3481,7 +3493,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
             else
             {
               /* It's a temporary file */
-              DBUG_ASSERT(!(block->status & BLOCK_REASSIGNED));
+              assert(!(block->status & BLOCK_REASSIGNED));
               /*
                 free_block() must not be called with BLOCK_CHANGED. Note
                 that we must not change the BLOCK_CHANGED flag outside of
@@ -3602,14 +3614,14 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
     */
     while (first_in_switch)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       cnt= 0;
 #endif
       wait_on_queue(&first_in_switch->wqueue[COND_FOR_SAVED],
                     &keycache->cache_lock, thread_var);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       cnt++;
-      DBUG_ASSERT(cnt <= keycache->blocks_used);
+      assert(cnt <= keycache->blocks_used);
 #endif
       /*
         Do not restart here. We have flushed all blocks that were
@@ -3641,7 +3653,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
           next= block->next_changed;
 
           /* Changed blocks cannot appear in the file_blocks hash. */
-          DBUG_ASSERT(!(block->status & BLOCK_CHANGED));
+          assert(!(block->status & BLOCK_CHANGED));
           if (block->hash_link->file == file)
           {
             /* We must skip blocks that will be changed. */
@@ -3667,7 +3679,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
 
               total_found++;
               found++;
-              DBUG_ASSERT(found <= keycache->blocks_used);
+              assert(found <= keycache->blocks_used);
 
               /*
                 Register a request. This unlinks the block from the LRU
@@ -3689,7 +3701,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
                 next_hash_link= next->hash_link;
                 next_diskpos=   next_hash_link->diskpos;
                 next_file=      next_hash_link->file;
-                DBUG_ASSERT(next == next_hash_link->block);
+                assert(next == next_hash_link->block);
               }
 
               free_block(keycache, thread_var, block);
@@ -3736,7 +3748,7 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
       if (last_for_update)
       {
         /* We did not wait. Block must not have changed status. */
-        DBUG_ASSERT(last_for_update->status & BLOCK_FOR_UPDATE);
+        assert(last_for_update->status & BLOCK_FOR_UPDATE);
         wait_on_queue(&last_for_update->wqueue[COND_FOR_REQUESTED],
                       &keycache->cache_lock, thread_var);
         goto restart;
@@ -3749,9 +3761,9 @@ static int flush_key_blocks_int(KEY_CACHE *keycache,
       if (last_in_switch)
       {
         /* We did not wait. Block must not have changed status. */
-        DBUG_ASSERT(last_in_switch->status & (BLOCK_IN_EVICTION |
-                                              BLOCK_IN_SWITCH |
-                                              BLOCK_REASSIGNED));
+        assert(last_in_switch->status & (BLOCK_IN_EVICTION |
+                                         BLOCK_IN_SWITCH |
+                                         BLOCK_REASSIGNED));
         wait_on_queue(&last_in_switch->wqueue[COND_FOR_SAVED],
                       &keycache->cache_lock, thread_var);
         goto restart;
@@ -3935,12 +3947,12 @@ static int flush_all_key_blocks(KEY_CACHE *keycache,
     */
   } while (total_found);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* Now there should not exist any block any more. */
   for (idx= 0; idx < CHANGED_BLOCKS_HASH; idx++)
   {
-    DBUG_ASSERT(!keycache->changed_blocks[idx]);
-    DBUG_ASSERT(!keycache->file_blocks[idx]);
+    assert(!keycache->changed_blocks[idx]);
+    assert(!keycache->file_blocks[idx]);
   }
 #endif
 
@@ -3984,7 +3996,7 @@ int reset_key_cache_counters(const char *name MY_ATTRIBUTE((unused)),
 }
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 #define F_B_PRT(_f_, _v_) DBUG_PRINT("assert_fail", (_f_, _v_))
 
 static int fail_block(BLOCK_LINK *block)
diff --git a/mysys/mf_keycaches.c b/mysys/mf_keycaches.c
index 8622105ce313..b273c9029aa2 100644
--- a/mysys/mf_keycaches.c
+++ b/mysys/mf_keycaches.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c
index 41fb1435e27f..00be79511e2c 100644
--- a/mysys/mf_loadpath.c
+++ b/mysys/mf_loadpath.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c
index bfdce0eccba0..06db560a92d2 100644
--- a/mysys/mf_pack.c
+++ b/mysys/mf_pack.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_path.c b/mysys/mf_path.c
index d3de3b27fbdb..8a40c80b3cf4 100644
--- a/mysys/mf_path.c
+++ b/mysys/mf_path.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index 7d15fa6419d2..fe4ebc3802b5 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_qsort2.c b/mysys/mf_qsort2.c
index f54cdac9da39..08836088c16f 100644
--- a/mysys/mf_qsort2.c
+++ b/mysys/mf_qsort2.c
@@ -1,14 +1,26 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_radix.c b/mysys/mf_radix.c
index aa112df03daf..599eb89df06f 100644
--- a/mysys/mf_radix.c
+++ b/mysys/mf_radix.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_same.c b/mysys/mf_same.c
index 86c3eaf2662b..dc0987397413 100644
--- a/mysys/mf_same.c
+++ b/mysys/mf_same.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_soundex.c b/mysys/mf_soundex.c
index 88a76c2d37e9..f34c05f353c2 100644
--- a/mysys/mf_soundex.c
+++ b/mysys/mf_soundex.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index beeabbaee36b..2ac1847a7a7d 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_unixpath.c b/mysys/mf_unixpath.c
index 05df11ed8fa6..9bcda58ac3f7 100644
--- a/mysys/mf_unixpath.c
+++ b/mysys/mf_unixpath.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c
index 3d2510bf2afc..4189c6c428d2 100644
--- a/mysys/mf_wcomp.c
+++ b/mysys/mf_wcomp.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c
index e47e9f494c6b..fbac2bfcb37a 100644
--- a/mysys/mulalloc.c
+++ b/mysys/mulalloc.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_access.c b/mysys/my_access.c
index 0d66643a8a8f..673ed9c64f58 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index 1d72917aed78..c808e07f8eeb 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -112,7 +124,7 @@ void init_alloc_root(PSI_memory_key key,
 void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
                          size_t pre_alloc_size MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(alloc_root_inited(mem_root));
+  assert(alloc_root_inited(mem_root));
 
   mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
 #if defined(PREALLOCATE_MEMORY_CHUNKS)
@@ -195,7 +207,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length)
   DBUG_ENTER("alloc_root");
   DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root));
 
-  DBUG_ASSERT(alloc_root_inited(mem_root));
+  assert(alloc_root_inited(mem_root));
 
   DBUG_EXECUTE_IF("simulate_out_of_memory",
                   {
@@ -236,7 +248,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length)
   USED_MEM **prev;
   DBUG_ENTER("alloc_root");
   DBUG_PRINT("enter",("root: 0x%lx", (long) mem_root));
-  DBUG_ASSERT(alloc_root_inited(mem_root));
+  assert(alloc_root_inited(mem_root));
 
   DBUG_EXECUTE_IF("simulate_out_of_memory",
                   {
@@ -536,7 +548,7 @@ static inline my_bool is_mem_available(MEM_ROOT *mem_root, size_t size)
 */
 void set_memroot_max_capacity(MEM_ROOT *mem_root, size_t max_value)
 {
-  DBUG_ASSERT(alloc_root_inited(mem_root));
+  assert(alloc_root_inited(mem_root));
   mem_root->max_capacity= max_value;
 }
 
@@ -551,7 +563,7 @@ void set_memroot_max_capacity(MEM_ROOT *mem_root, size_t max_value)
 */
 void set_memroot_error_reporting(MEM_ROOT *mem_root, my_bool report_error)
 {
-  DBUG_ASSERT(alloc_root_inited(mem_root));
+  assert(alloc_root_inited(mem_root));
   mem_root->error_for_capacity_exceeded= report_error;
 }
 
diff --git a/mysys/my_bit.c b/mysys/my_bit.c
index d36f52bb3c0f..fd96d5165766 100644
--- a/mysys/my_bit.c
+++ b/mysys/my_bit.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 10a345c82d96..ae518f2e57d1 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -170,7 +182,7 @@ my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,
 
   else
   {
-    DBUG_ASSERT(thread_safe == 0);
+    assert(thread_safe == 0);
     map->mutex= NULL;
   }
 
@@ -237,7 +249,7 @@ my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit)
 my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit)
 {
   my_bool res;
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  assert(map->bitmap && bitmap_bit < map->n_bits);
   bitmap_lock(map);
   res= bitmap_fast_test_and_set(map, bitmap_bit);
   bitmap_unlock(map);
@@ -270,7 +282,7 @@ my_bool bitmap_fast_test_and_clear(MY_BITMAP *map, uint bitmap_bit)
 my_bool bitmap_test_and_clear(MY_BITMAP *map, uint bitmap_bit)
 {
   my_bool res;
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  assert(map->bitmap && bitmap_bit < map->n_bits);
   bitmap_lock(map);
   res= bitmap_fast_test_and_clear(map, bitmap_bit);
   bitmap_unlock(map);
@@ -281,7 +293,7 @@ my_bool bitmap_test_and_clear(MY_BITMAP *map, uint bitmap_bit)
 uint bitmap_set_next(MY_BITMAP *map)
 {
   uint bit_found;
-  DBUG_ASSERT(map->bitmap);
+  assert(map->bitmap);
   if ((bit_found= bitmap_get_first(map)) != MY_BIT_NONE)
     bitmap_set_bit(map, bit_found);
   return bit_found;
@@ -301,8 +313,8 @@ void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size)
   uint prefix_bytes, prefix_bits, d;
   uchar *m= (uchar *)map->bitmap;
 
-  DBUG_ASSERT(map->bitmap &&
-	      (prefix_size <= map->n_bits || prefix_size == (uint) ~0));
+  assert(map->bitmap &&
+         (prefix_size <= map->n_bits || prefix_size == (uint) ~0));
   set_if_smaller(prefix_size, map->n_bits);
   if ((prefix_bytes= prefix_size / 8))
     memset(m, 0xff, prefix_bytes);
@@ -323,14 +335,14 @@ my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size)
   uint prefix_bits= prefix_size % 32;
   my_bitmap_map *word_ptr= map->bitmap, last_word;
   my_bitmap_map *end_prefix= word_ptr + prefix_size / 32;
-  DBUG_ASSERT(word_ptr && prefix_size <= map->n_bits);
+  assert(word_ptr && prefix_size <= map->n_bits);
 
   /* 1: Words that should be filled with 1 */
   for (; word_ptr < end_prefix; word_ptr++)
     if (*word_ptr != 0xFFFFFFFF)
       return FALSE;
 
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->n_bits > 0);
   last_word= *map->last_word_ptr & ~map->last_word_mask;
 
   /* 2: Word which contains the end of the prefix (if any) */
@@ -366,7 +378,7 @@ my_bool bitmap_is_set_all(const MY_BITMAP *map)
   my_bitmap_map *data_ptr= map->bitmap;
   my_bitmap_map *end= map->last_word_ptr;
 
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->n_bits > 0);
   for (; data_ptr < end; data_ptr++)
     if (*data_ptr != 0xFFFFFFFF)
       return FALSE;
@@ -381,7 +393,7 @@ my_bool bitmap_is_clear_all(const MY_BITMAP *map)
   my_bitmap_map *data_ptr= map->bitmap;
   my_bitmap_map *end= map->last_word_ptr;
 
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->n_bits > 0);
   for (; data_ptr < end; data_ptr++)
     if (*data_ptr)
       return FALSE;
@@ -396,16 +408,16 @@ my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2)
 {
   my_bitmap_map *m1= map1->bitmap, *m2= map2->bitmap, *end;
 
-  DBUG_ASSERT(map1->bitmap && map2->bitmap &&
-              map1->n_bits==map2->n_bits);
+  assert(map1->bitmap && map2->bitmap &&
+         map1->n_bits==map2->n_bits);
 
   end= map1->last_word_ptr;
   for (; m1 < end; m1++, m2++)
     if (*m1 & ~(*m2))
       return FALSE;
 
-  DBUG_ASSERT(map1->n_bits > 0);
-  DBUG_ASSERT(map2->n_bits > 0);
+  assert(map1->n_bits > 0);
+  assert(map2->n_bits > 0);
 
   if ((*map1->last_word_ptr & ~map1->last_word_mask) &
       ~(*map2->last_word_ptr & ~map2->last_word_mask))
@@ -419,11 +431,11 @@ my_bool bitmap_is_overlapping(const MY_BITMAP *map1, const MY_BITMAP *map2)
 {
   my_bitmap_map *m1= map1->bitmap, *m2= map2->bitmap, *end;
 
-  DBUG_ASSERT(map1->bitmap && map2->bitmap &&
-              map1->n_bits==map2->n_bits);
+  assert(map1->bitmap && map2->bitmap &&
+         map1->n_bits==map2->n_bits);
 
-  DBUG_ASSERT(map1->n_bits > 0);
-  DBUG_ASSERT(map2->n_bits > 0);
+  assert(map1->n_bits > 0);
+  assert(map2->n_bits > 0);
 
   end= map1->last_word_ptr;
   for (; m1 < end; m1++, m2++)
@@ -442,7 +454,7 @@ void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2)
   my_bitmap_map *to= map->bitmap, *from= map2->bitmap, *end;
   uint len= no_words_in_map(map), len2 = no_words_in_map(map2);
 
-  DBUG_ASSERT(map->bitmap && map2->bitmap);
+  assert(map->bitmap && map2->bitmap);
 
   end= to + MY_MIN(len, len2);
   for (; to < end; to++, from++)
@@ -494,9 +506,9 @@ void bitmap_set_above(MY_BITMAP *map, uint from_byte, uint use_bit)
 void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2)
 {
   my_bitmap_map *to= map->bitmap, *from= map2->bitmap, *end;
-  DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->n_bits==map2->n_bits);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap && map2->bitmap &&
+         map->n_bits==map2->n_bits);
+  assert(map->n_bits > 0);
   end= map->last_word_ptr;
 
   for (; to <= end; to++, from++)
@@ -507,9 +519,9 @@ void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2)
 void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2)
 {
   my_bitmap_map *to= map->bitmap, *from= map2->bitmap, *end;
-  DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->n_bits==map2->n_bits);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap && map2->bitmap &&
+         map->n_bits==map2->n_bits);
+  assert(map->n_bits > 0);
   end= map->last_word_ptr;
 
   for (; to <= end; to++, from++)
@@ -520,9 +532,9 @@ void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2)
 void bitmap_xor(MY_BITMAP *map, const MY_BITMAP *map2)
 {
   my_bitmap_map *to= map->bitmap, *from= map2->bitmap, *end;
-  DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->n_bits==map2->n_bits);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap && map2->bitmap &&
+         map->n_bits==map2->n_bits);
+  assert(map->n_bits > 0);
   end= map->last_word_ptr;
 
   for (; to <= end; to++, from++)
@@ -533,8 +545,8 @@ void bitmap_xor(MY_BITMAP *map, const MY_BITMAP *map2)
 void bitmap_invert(MY_BITMAP *map)
 {
   my_bitmap_map *to= map->bitmap, *end;
-  DBUG_ASSERT(map->bitmap);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap);
+  assert(map->n_bits > 0);
   end= map->last_word_ptr;
 
   for (; to <= end; to++)
@@ -547,8 +559,8 @@ uint bitmap_bits_set(const MY_BITMAP *map)
   my_bitmap_map *data_ptr= map->bitmap;
   my_bitmap_map *end= map->last_word_ptr;
   uint res= 0;
-  DBUG_ASSERT(map->bitmap);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap);
+  assert(map->n_bits > 0);
 
   for (; data_ptr < end; data_ptr++)
     res+= my_count_bits_uint32(*data_ptr);
@@ -562,9 +574,9 @@ uint bitmap_bits_set(const MY_BITMAP *map)
 void bitmap_copy(MY_BITMAP *map, const MY_BITMAP *map2)
 {
   my_bitmap_map *to= map->bitmap, *from= map2->bitmap, *end;
-  DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->n_bits==map2->n_bits);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap && map2->bitmap &&
+         map->n_bits==map2->n_bits);
+  assert(map->n_bits > 0);
   end= map->last_word_ptr;
 
   for (; to <= end; to++, from++)
@@ -577,8 +589,8 @@ uint bitmap_get_first_set(const MY_BITMAP *map)
   uint word_pos;
   my_bitmap_map *data_ptr, *end= map->last_word_ptr;
 
-  DBUG_ASSERT(map->bitmap);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap);
+  assert(map->n_bits > 0);
   data_ptr= map->bitmap;
 
   for (word_pos=0; data_ptr < end; data_ptr++, word_pos++)
@@ -605,8 +617,8 @@ uint bitmap_get_next_set(const MY_BITMAP *map, uint bitmap_bit)
   unsigned char *ptr= (unsigned char*) &first_word;
   my_bitmap_map *data_ptr, *end= map->last_word_ptr;
 
-  DBUG_ASSERT(map->bitmap);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap);
+  assert(map->n_bits > 0);
 
   /* Look for the next bit */
   bitmap_bit++;
@@ -641,8 +653,8 @@ uint bitmap_get_first(const MY_BITMAP *map)
   uint word_pos;
   my_bitmap_map *data_ptr, *end= map->last_word_ptr;
 
-  DBUG_ASSERT(map->bitmap);
-  DBUG_ASSERT(map->n_bits > 0);
+  assert(map->bitmap);
+  assert(map->n_bits > 0);
   data_ptr= map->bitmap;
 
   for (word_pos=0; data_ptr < end; data_ptr++, word_pos++)
@@ -666,7 +678,7 @@ uint bitmap_lock_set_next(MY_BITMAP *map)
 void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit)
 {
   bitmap_lock(map);
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  assert(map->bitmap && bitmap_bit < map->n_bits);
   bitmap_clear_bit(map, bitmap_bit);
   bitmap_unlock(map);
 }
diff --git a/mysys/my_chmod.c b/mysys/my_chmod.c
index 389960ddeb8b..272db3ef8c84 100644
--- a/mysys/my_chmod.c
+++ b/mysys/my_chmod.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -81,7 +93,7 @@ my_bool my_chmod(const char *filename, ulong perm_flags, myf my_flags)
   int ret_val;
   MY_MODE file_perm;
   DBUG_ENTER("my_chmod");
-  DBUG_ASSERT(filename && filename[0]);
+  assert(filename && filename[0]);
 
   file_perm= get_file_perm(perm_flags);
 #ifdef _WIN32
diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c
index ca388dc1c34b..973fa3f74f65 100644
--- a/mysys/my_chsize.c
+++ b/mysys/my_chsize.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_compare.c b/mysys/my_compare.c
index a23c2a34226b..b742179319b6 100644
--- a/mysys/my_compare.c
+++ b/mysys/my_compare.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_compress.c b/mysys/my_compress.c
index 18695602bf5a..926ce1340f2a 100644
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_conio.c b/mysys/my_conio.c
index 440c142e41dd..662fbe426359 100644
--- a/mysys/my_conio.c
+++ b/mysys/my_conio.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -83,7 +90,7 @@ my_win_console_readline(const CHARSET_INFO *cs, char *mbbuf, size_t mbbufsize,
 
   HANDLE console= GetStdHandle(STD_INPUT_HANDLE);
 
-  DBUG_ASSERT(mbbufsize > 0); /* Need space for at least trailing '\0' */
+  assert(mbbufsize > 0); /* Need space for at least trailing '\0' */
   GetConsoleMode(console, &console_mode);
   SetConsoleMode(console, ENABLE_LINE_INPUT |
                           ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT);
@@ -115,7 +122,7 @@ my_win_console_readline(const CHARSET_INFO *cs, char *mbbuf, size_t mbbufsize,
                       (const char *) u16buf, nchars * sizeof(wchar_t),
                       &my_charset_utf16le_bin, &dummy_errors);
 
-  DBUG_ASSERT(mblen < mbbufsize); /* Safety */
+  assert(mblen < mbbufsize); /* Safety */
   mbbuf[mblen]= 0;
   return mbbuf;
 }
@@ -175,7 +182,7 @@ my_mbstou16s(const CHARSET_INFO *cs, const uchar * from, size_t from_length,
     if ((cnvres= (*wc_mb)(to_cs, wc, (uchar *) to, (uchar *) to_end)) > 0)
     {
       /* We can never convert only a part of wchar_t */
-      DBUG_ASSERT((cnvres % sizeof(wchar_t)) == 0);
+      assert((cnvres % sizeof(wchar_t)) == 0);
       /* cnvres returns number of bytes, convert to number of wchar_t's */
       to+= cnvres / sizeof(wchar_t);
     }
@@ -208,7 +215,7 @@ my_win_console_write(const CHARSET_INFO *cs, const char *data, size_t datalen)
 {
   static wchar_t u16buf[MAX_CONSOLE_LINE_SIZE + 1];
   size_t nchars= my_mbstou16s(cs, (const uchar *) data, datalen,
-                              u16buf, sizeof(u16buf));
+                              u16buf, sizeof(u16buf) / sizeof(u16buf[0]));
   DWORD nwritten;
   WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
                 u16buf, (DWORD) nchars, &nwritten, NULL);
@@ -289,7 +296,7 @@ my_win_translate_command_line_args(const CHARSET_INFO *cs, int *argc, char ***ar
     len= my_convert(av[i], alloced_len, cs,
                     (const char *) wargs[i], arg_len * sizeof(wchar_t),
                     &my_charset_utf16le_bin, &dummy_errors);
-    DBUG_ASSERT(len < alloced_len);
+    assert(len < alloced_len);
     av[i][len]= '\0';
   }
   *argv= av;
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index a416389c4b99..a1148b32c8be 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -58,7 +70,7 @@ int my_copy(const char *from, const char *to, myf MyFlags)
 
   from_file=to_file= -1;
   memset(&new_stat_buff, 0, sizeof(MY_STAT));
-  DBUG_ASSERT(!(MyFlags & (MY_FNABP | MY_NABP))); /* for my_read/my_write */
+  assert(!(MyFlags & (MY_FNABP | MY_NABP))); /* for my_read/my_write */
   if (MyFlags & MY_HOLD_ORIGINAL_MODES)		/* Copy stat if possible */
     new_file_stat= MY_TEST(my_stat((char*) to, &new_stat_buff, MYF(0)));
 
diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c
index 2893d35a5522..6c6fcbebe3c2 100644
--- a/mysys/my_crc32.c
+++ b/mysys/my_crc32.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2003, 2004 MySQL AB
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_create.c b/mysys/my_create.c
index a140eb7332cc..d6a747275b2f 100644
--- a/mysys/my_create.c
+++ b/mysys/my_create.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_delete.c b/mysys/my_delete.c
index 7f82e6078b5a..0727e9bd442a 100644
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_div.c b/mysys/my_div.c
index a50e3260c0de..9fee54b620e2 100644
--- a/mysys/my_div.c
+++ b/mysys/my_div.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_error.c b/mysys/my_error.c
index 92624884eb2f..06a92059b3d5 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_file.c b/mysys/my_file.c
index b2faed03643c..8510e9a6f450 100644
--- a/mysys/my_file.c
+++ b/mysys/my_file.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 2196b475abf8..34c7f93af7e2 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -105,7 +117,7 @@ static FILE *my_win_freopen(const char *path, const char *mode, FILE *stream)
   int handle_fd, fd= _fileno(stream);
   HANDLE osfh;
 
-  DBUG_ASSERT(path && stream);
+  assert(path && stream);
 
   /* Services don't have stdout/stderr on Windows, so _fileno returns -1. */
   if (fd < 0)
@@ -171,7 +183,7 @@ static FILE *my_safe_freopen(const char *path, const char *mode, FILE *stream)
   int pathfd= -1;
   int ds= -1;
 
-  DBUG_ASSERT(path != NULL && stream != NULL);
+  assert(path != NULL && stream != NULL);
   streamfd= fileno(stream);
   if (streamfd == -1)
   {
@@ -352,8 +364,8 @@ FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags)
 static void make_ftype(char * to, int flag)
 {
   /* check some possible invalid combinations */  
-  DBUG_ASSERT((flag & (O_TRUNC | O_APPEND)) != (O_TRUNC | O_APPEND));
-  DBUG_ASSERT((flag & (O_WRONLY | O_RDWR)) != (O_WRONLY | O_RDWR));
+  assert((flag & (O_TRUNC | O_APPEND)) != (O_TRUNC | O_APPEND));
+  assert((flag & (O_WRONLY | O_RDWR)) != (O_WRONLY | O_RDWR));
 
   if ((flag & (O_RDONLY|O_WRONLY)) == O_WRONLY)    
     *to++= (flag & O_APPEND) ? 'a' : 'w';  
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c
index 83d1ebb774b8..a0a4ebbd3a9b 100644
--- a/mysys/my_fstream.c
+++ b/mysys/my_fstream.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 5b48e5b32512..874b9a82f9db 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -109,7 +121,7 @@ my_bool my_gethwaddr(uchar *to)
     {
       /* Reset struct, copy interface name */
       memset(&ifr, 0, sizeof(ifr));
-      strncpy(ifr.ifr_name, ifri->ifr_name, sizeof(ifr.ifr_name));
+      memcpy(ifr.ifr_name, ifri->ifr_name, sizeof(ifr.ifr_name));
 
       /* Get HW address, break if not 0 */
       if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index f67f4a0be554..ff6267334d34 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c
index 6d650a8f3939..eb53e3892bc8 100644
--- a/mysys/my_getwd.c
+++ b/mysys/my_getwd.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
index 00bec2e5e09f..b8ce4036f22f 100644
--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@@ -1,16 +1,28 @@
 #ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
 #define MYSYS_MY_HANDLER_ERRORS_INCLUDED
 
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -104,7 +116,8 @@ static const char *handler_error_messages[]=
   "Tablespace is not empty",
   "Incorrect file name",
   "Operation is not allowed",
-  "Compute generate value failed"
+  "Compute generate value failed",
+  "Too many nested sub-expressions in a full-text search"
 };
 
 extern void my_handler_error_register(void);
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 9fe34d5c79a3..28f4bb321320 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -276,7 +288,7 @@ static void win_init_time()
   FILETIME ft;
   LARGE_INTEGER li, t_cnt;
 
-  DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency));
+  assert(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency));
 
   if (QueryPerformanceFrequency((LARGE_INTEGER *)&query_performance_frequency) == 0)
     query_performance_frequency= 0;
diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c
index 84538b6a3f33..f69df9699158 100644
--- a/mysys/my_largepage.c
+++ b/mysys/my_largepage.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index f2c29404a6ee..68a0a6fae71b 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -170,7 +182,7 @@ static char* directory_file_name(char *dst, const char *src)
 {
   /* Process as Unix format: just remove test the final slash. */
   char *end;
-  DBUG_ASSERT(strlen(src) < (FN_REFLEN + 1));
+  assert(strlen(src) < (FN_REFLEN + 1));
 
   if (src[0] == 0)
     src= (char*) ".";				/* Use empty as current */
diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index 1b4336c268e6..3c02ea804244 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 230ee5b4f1ee..5fd8a7e74745 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -77,8 +89,8 @@ my_realloc(PSI_memory_key key, void *ptr, size_t size, myf flags)
     return my_malloc(key, size, flags);
 
   old_mh= USER_TO_HEADER(ptr);
-  DBUG_ASSERT((old_mh->m_key == key) || (old_mh->m_key == PSI_NOT_INSTRUMENTED));
-  DBUG_ASSERT(old_mh->m_magic == MAGIC);
+  assert((old_mh->m_key == key) || (old_mh->m_key == PSI_NOT_INSTRUMENTED));
+  assert(old_mh->m_magic == MAGIC);
 
   old_size= old_mh->m_size;
 
@@ -88,13 +100,13 @@ my_realloc(PSI_memory_key key, void *ptr, size_t size, myf flags)
   new_ptr= my_malloc(key, size, flags);
   if (likely(new_ptr != NULL))
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     my_memory_header *new_mh= USER_TO_HEADER(new_ptr);
 #endif
 
-    DBUG_ASSERT((new_mh->m_key == key) || (new_mh->m_key == PSI_NOT_INSTRUMENTED));
-    DBUG_ASSERT(new_mh->m_magic == MAGIC);
-    DBUG_ASSERT(new_mh->m_size == size);
+    assert((new_mh->m_key == key) || (new_mh->m_key == PSI_NOT_INSTRUMENTED));
+    assert(new_mh->m_magic == MAGIC);
+    assert(new_mh->m_size == size);
 
     min_size= (old_size < size) ? old_size : size;
     memcpy(new_ptr, ptr, min_size);
@@ -113,7 +125,7 @@ void my_claim(void *ptr)
     return;
 
   mh= USER_TO_HEADER(ptr);
-  DBUG_ASSERT(mh->m_magic == MAGIC);
+  assert(mh->m_magic == MAGIC);
   mh->m_key= PSI_MEMORY_CALL(memory_claim)(mh->m_key, mh->m_size, & mh->m_owner);
 }
 
@@ -125,7 +137,7 @@ void my_free(void *ptr)
     return;
 
   mh= USER_TO_HEADER(ptr);
-  DBUG_ASSERT(mh->m_magic == MAGIC);
+  assert(mh->m_magic == MAGIC);
   PSI_MEMORY_CALL(memory_free)(mh->m_key, mh->m_size, mh->m_owner);
   /* Catch double free */
   mh->m_magic= 0xDEAD;
@@ -238,10 +250,10 @@ static void *my_raw_realloc(void *oldpoint, size_t size, myf my_flags)
   DBUG_PRINT("my",("ptr: %p  size: %lu  my_flags: %d", oldpoint,
                    (ulong) size, my_flags));
 
-  DBUG_ASSERT(size > 0);
+  assert(size > 0);
   /* These flags are mutually exclusive. */
-  DBUG_ASSERT(!((my_flags & MY_FREE_ON_ERROR) &&
-                (my_flags & MY_HOLD_ON_ERROR)));
+  assert(!((my_flags & MY_FREE_ON_ERROR) &&
+           (my_flags & MY_HOLD_ON_ERROR)));
   DBUG_EXECUTE_IF("simulate_out_of_memory",
                   point= NULL;
                   goto end;);
@@ -252,7 +264,7 @@ static void *my_raw_realloc(void *oldpoint, size_t size, myf my_flags)
 #else
   point= realloc(oldpoint, size);
 #endif
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 end:
 #endif
   if (point == NULL)
diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c
index e15dedfd5b87..1da9a67a1999 100644
--- a/mysys/my_memmem.c
+++ b/mysys/my_memmem.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_mess.c b/mysys/my_mess.c
index 0c6d24d2c0b1..73346183aa4c 100644
--- a/mysys/my_mess.c
+++ b/mysys/my_mess.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_mkdir.c b/mysys/my_mkdir.c
index 00f0a48554c0..27e8c6f883c0 100644
--- a/mysys/my_mkdir.c
+++ b/mysys/my_mkdir.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c
index b58c657214f8..f227c9ccd7d9 100644
--- a/mysys/my_mmap.c
+++ b/mysys/my_mmap.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_once.c b/mysys/my_once.c
index b0938f0bd6ac..c937e1e1083c 100644
--- a/mysys/my_once.c
+++ b/mysys/my_once.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_open.c b/mysys/my_open.c
index b67ac6fac46f..475db81c0dc1 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_pread.c b/mysys/my_pread.c
index 1511fd7fd5b8..3b41431ae0fc 100644
--- a/mysys/my_pread.c
+++ b/mysys/my_pread.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c
index 2be781f9172f..16d902fba5c1 100644
--- a/mysys/my_rdtsc.c
+++ b/mysys/my_rdtsc.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/mysys/my_read.c b/mysys/my_read.c
index c80ad1c82761..ef1105b6bcb2 100644
--- a/mysys/my_read.c
+++ b/mysys/my_read.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_redel.c b/mysys/my_redel.c
index 43e7e73efcbe..4d52900d258e 100644
--- a/mysys/my_redel.c
+++ b/mysys/my_redel.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index c8ad13042c04..7d844e5ce011 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_seek.c b/mysys/my_seek.c
index 3a73e06ef6a6..b58a4fdc29fd 100644
--- a/mysys/my_seek.c
+++ b/mysys/my_seek.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -55,7 +67,7 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, myf MyFlags)
   /*
       Make sure we are using a valid file descriptor!
   */
-  DBUG_ASSERT(fd != -1);
+  assert(fd != -1);
 #if defined (_WIN32)
   newpos= my_win_lseek(fd, pos, whence);
 #else
@@ -89,7 +101,7 @@ my_off_t my_tell(File fd, myf MyFlags)
   os_off_t pos;
   DBUG_ENTER("my_tell");
   DBUG_PRINT("my",("fd: %d  MyFlags: %d",fd, MyFlags));
-  DBUG_ASSERT(fd >= 0);
+  assert(fd >= 0);
 #if defined (HAVE_TELL) && !defined (_WIN32)
   pos= tell(fd);
 #else
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 60db888e97eb..776d22ef2f46 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_static.h b/mysys/my_static.h
index a0366133c2d7..afcdcd7393ae 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -1,16 +1,28 @@
 #ifndef MYSYS_MY_STATIC_INCLUDED
 #define MYSYS_MY_STATIC_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c
index 477792816327..e7d95829c98d 100644
--- a/mysys/my_symlink.c
+++ b/mysys/my_symlink.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c
index 0540b474fc62..359d27ee4a19 100644
--- a/mysys/my_symlink2.c
+++ b/mysys/my_symlink2.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_sync.c b/mysys/my_sync.c
index 2ddfc7deef28..a8acac3f26b7 100644
--- a/mysys/my_sync.c
+++ b/mysys/my_sync.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_syslog.c b/mysys/my_syslog.c
index e45410b9336d..f6039d6438f9 100644
--- a/mysys/my_syslog.c
+++ b/mysys/my_syslog.c
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index db0881c3e370..f0d5eb1feda3 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,7 +38,7 @@
 
 static my_bool THR_KEY_mysys_initialized= FALSE;
 static my_bool my_thread_global_init_done= FALSE;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static uint    THR_thread_count= 0;
 static uint    my_thread_end_wait_time= 5;
 static my_thread_id thread_id= 0;
@@ -41,7 +53,7 @@ mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open,
               THR_LOCK_lock, THR_LOCK_myisam, THR_LOCK_heap,
               THR_LOCK_net, THR_LOCK_charset,
               THR_LOCK_myisam_mmap;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 mysql_mutex_t THR_LOCK_threads;
 mysql_cond_t  THR_COND_threads;
 #endif
@@ -56,7 +68,7 @@ native_mutexattr_t my_errorcheck_mutexattr;
 static void install_sigabrt_handler();
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 struct st_my_thread_var
 {
   my_thread_id id;
@@ -65,14 +77,14 @@ struct st_my_thread_var
 
 static struct st_my_thread_var *mysys_thread_var()
 {
-  DBUG_ASSERT(THR_KEY_mysys_initialized);
+  assert(THR_KEY_mysys_initialized);
   return  (struct st_my_thread_var*)my_get_thread_local(THR_KEY_mysys);
 }
 
 
 static int set_mysys_thread_var(struct st_my_thread_var *mysys_var)
 {
-  DBUG_ASSERT(THR_KEY_mysys_initialized);
+  assert(THR_KEY_mysys_initialized);
   return my_set_thread_local(THR_KEY_mysys, mysys_var);
 }
 #endif
@@ -89,7 +101,7 @@ static int set_mysys_thread_var(struct st_my_thread_var *mysys_var)
 
 void my_thread_global_reinit()
 {
-  DBUG_ASSERT(my_thread_global_init_done);
+  assert(my_thread_global_init_done);
 
 #ifdef HAVE_PSI_INTERFACE
   my_init_mysys_psi_keys();
@@ -113,7 +125,7 @@ void my_thread_global_reinit()
   mysql_mutex_destroy(&THR_LOCK_charset);
   mysql_mutex_init(key_THR_LOCK_charset, &THR_LOCK_charset, MY_MUTEX_INIT_FAST);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mysql_mutex_destroy(&THR_LOCK_threads);
   mysql_mutex_init(key_THR_LOCK_threads, &THR_LOCK_threads, MY_MUTEX_INIT_FAST);
 
@@ -166,8 +178,8 @@ my_bool my_thread_global_init()
                             PTHREAD_MUTEX_ERRORCHECK);
 #endif
 
-  DBUG_ASSERT(! THR_KEY_mysys_initialized);
-#ifndef DBUG_OFF
+  assert(! THR_KEY_mysys_initialized);
+#ifndef NDEBUG
   if ((pth_ret= my_create_thread_local_key(&THR_KEY_mysys, NULL)) != 0)
   { /* purecov: begin inspected */
     my_message_local(ERROR_LEVEL, "Can't initialize threads: error %d",
@@ -202,7 +214,7 @@ my_bool my_thread_global_init()
   mysql_mutex_init(key_THR_LOCK_myisam_mmap, &THR_LOCK_myisam_mmap, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_THR_LOCK_heap, &THR_LOCK_heap, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_THR_LOCK_net, &THR_LOCK_net, MY_MUTEX_INIT_FAST);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mysql_mutex_init(key_THR_LOCK_threads, &THR_LOCK_threads, MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_THR_COND_threads, &THR_COND_threads);
 #endif
@@ -213,7 +225,7 @@ my_bool my_thread_global_init()
 
 void my_thread_global_end()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   struct timespec abstime;
   my_bool all_threads_killed= TRUE;
 
@@ -244,8 +256,8 @@ void my_thread_global_end()
   mysql_mutex_unlock(&THR_LOCK_threads);
 #endif
 
-  DBUG_ASSERT(THR_KEY_mysys_initialized);
-#ifndef DBUG_OFF
+  assert(THR_KEY_mysys_initialized);
+#ifndef NDEBUG
   my_delete_thread_local_key(THR_KEY_mysys);
 #endif
   my_delete_thread_local_key(THR_KEY_myerrno);
@@ -267,7 +279,7 @@ void my_thread_global_end()
   mysql_mutex_destroy(&THR_LOCK_heap);
   mysql_mutex_destroy(&THR_LOCK_net);
   mysql_mutex_destroy(&THR_LOCK_charset);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (all_threads_killed)
   {
     mysql_mutex_destroy(&THR_LOCK_threads);
@@ -291,7 +303,7 @@ void my_thread_global_end()
 
 my_bool my_thread_init()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   struct st_my_thread_var *tmp;
 #endif
 
@@ -302,7 +314,7 @@ my_bool my_thread_init()
   install_sigabrt_handler();
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (mysys_thread_var())
     return FALSE;
 
@@ -330,7 +342,7 @@ my_bool my_thread_init()
 
 void my_thread_end()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   struct st_my_thread_var *tmp= mysys_thread_var();
 #endif
 
@@ -343,7 +355,7 @@ void my_thread_end()
   PSI_THREAD_CALL(delete_current_thread)();
 #endif
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   if (tmp)
   {
     /* tmp->dbug is allocated inside DBUG library */
@@ -362,7 +374,7 @@ void my_thread_end()
       my_thread_init() and DBUG_xxxx
     */
     mysql_mutex_lock(&THR_LOCK_threads);
-    DBUG_ASSERT(THR_thread_count != 0);
+    assert(THR_thread_count != 0);
     if (--THR_thread_count == 0)
       mysql_cond_signal(&THR_COND_threads);
     mysql_mutex_unlock(&THR_LOCK_threads);
@@ -404,7 +416,7 @@ void set_thr_winerr(int winerr)
 #endif
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 my_thread_id my_thread_var_id()
 {
   return mysys_thread_var()->id;
@@ -421,7 +433,7 @@ struct _db_code_state_ **my_thread_var_dbug()
 {
   struct st_my_thread_var *tmp;
   /*
-    Instead of enforcing DBUG_ASSERT(THR_KEY_mysys_initialized) here,
+    Instead of enforcing assert(THR_KEY_mysys_initialized) here,
     which causes any DBUG_ENTER and related traces to fail when
     used in init / cleanup code, we are more tolerant:
     using DBUG_ENTER / DBUG_PRINT / DBUG_RETURN
@@ -432,7 +444,7 @@ struct _db_code_state_ **my_thread_var_dbug()
   tmp= mysys_thread_var();
   return tmp ? &tmp->dbug : NULL;
 }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 
 #ifdef _WIN32
diff --git a/mysys/my_thread.c b/mysys/my_thread.c
index 5db580e69ff9..c1cb2f5c6fc8 100644
--- a/mysys/my_thread.c
+++ b/mysys/my_thread.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_timer_cycles.il b/mysys/my_timer_cycles.il
index e655cad2a2eb..d6c4b4fa90be 100644
--- a/mysys/my_timer_cycles.il
+++ b/mysys/my_timer_cycles.il
@@ -1,14 +1,21 @@
-/* Copyright (c) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/mysys/my_windac.c b/mysys/my_windac.c
index affc37b6b5e7..68ea654a489b 100644
--- a/mysys/my_windac.c
+++ b/mysys/my_windac.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -217,6 +224,21 @@ void my_security_attr_free(SECURITY_ATTRIBUTES *sa)
   {
     My_security_attr *attr= (My_security_attr*)
                             (((char*)sa) + ALIGN_SIZE(sizeof(*sa)));
+
+    PACL dacl_from_descriptor= NULL;
+    BOOL dacl_present_in_descriptor= FALSE;
+    BOOL dacl_defaulted= FALSE;
+    // If the DACL in the descriptor is not the same as that in the
+    // My_security_attr, it will have been created by a call to SetEntriesInAcl
+    // and thus must be freed by a call to LocalFree.
+    if (GetSecurityDescriptorDacl(sa->lpSecurityDescriptor,
+      &dacl_present_in_descriptor,
+      &dacl_from_descriptor, &dacl_defaulted) &&
+      dacl_present_in_descriptor && !dacl_defaulted &&
+      attr->dacl != dacl_from_descriptor) {
+      LocalFree(dacl_from_descriptor);
+    }
+
     FreeSid(attr->everyone_sid);
     my_free(attr->dacl);
     my_free(sa);
diff --git a/mysys/my_winerr.c b/mysys/my_winerr.c
index 59100104e7ca..55c22422a5af 100644
--- a/mysys/my_winerr.c
+++ b/mysys/my_winerr.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/my_winfile.c b/mysys/my_winfile.c
index 293a916a50ca..a277883736e5 100644
--- a/mysys/my_winfile.c
+++ b/mysys/my_winfile.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -38,7 +45,7 @@
   Worth to note:
   - File descriptors used here are located in a range that is not compatible 
   with CRT on purpose. Attempt to use a file descriptor from Windows CRT library
-  range in my_win_* function will be punished with DBUG_ASSERT()
+  range in my_win_* function will be punished with assert()
 
   - File streams (FILE *) are actually from the C runtime. The routines provided
   here are useful only in scernarios that use low-level IO with my_win_fileno()
@@ -82,7 +89,7 @@ File my_open_osfhandle(HANDLE handle, int oflag)
 static void invalidate_fd(File fd)
 {
   DBUG_ENTER("invalidate_fd");
-  DBUG_ASSERT(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
+  assert(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
   my_file_info[fd].fhandle= 0;
   DBUG_VOID_RETURN;
 }
@@ -92,7 +99,7 @@ static void invalidate_fd(File fd)
 HANDLE my_get_osfhandle(File fd)
 {
   DBUG_ENTER("my_get_osfhandle");
-  DBUG_ASSERT(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
+  assert(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
   DBUG_RETURN(my_file_info[fd].fhandle);
 }
 
@@ -100,7 +107,7 @@ HANDLE my_get_osfhandle(File fd)
 static int my_get_open_flags(File fd)
 {
   DBUG_ENTER("my_get_open_flags");
-  DBUG_ASSERT(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
+  assert(fd >= MY_FILE_MIN && fd < (int)my_file_limit);
   DBUG_RETURN(my_file_info[fd].oflag);
 }
 
diff --git a/mysys/my_write.c b/mysys/my_write.c
index d84994955234..c9a9e473ec91 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 8b7a554b7ebb..f2199d0a612a 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/posix_timers.c b/mysys/posix_timers.c
index 2215a669db7c..7e90c1b22639 100644
--- a/mysys/posix_timers.c
+++ b/mysys/posix_timers.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -289,7 +301,7 @@ my_timer_initialize(void)
 void
 my_timer_deinitialize(void)
 {
-  DBUG_ASSERT(port_id >= 0);
+  assert(port_id >= 0);
 
   // close port
   close(port_id);
diff --git a/mysys/psi_noop.c b/mysys/psi_noop.c
index f8f06005e98c..5005009c48b1 100644
--- a/mysys/psi_noop.c
+++ b/mysys/psi_noop.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -262,6 +274,11 @@ static void set_thread_noop(PSI_thread* thread NNN)
   return;
 }
 
+static void set_thread_peer_port_noop(PSI_thread * thread NNN, uint port NNN)
+{
+  return;
+}
+
 static void delete_current_thread_noop(void)
 {
   return;
@@ -1026,7 +1043,9 @@ static PSI PSI_noop=
   set_metadata_lock_status_noop,
   destroy_metadata_lock_noop,
   start_metadata_wait_noop,
-  end_metadata_wait_noop
+  end_metadata_wait_noop,
+
+  set_thread_peer_port_noop
 };
 
 /**
diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c
index 9a06d33dccdb..3aa943ec653b 100644
--- a/mysys/ptr_cmp.c
+++ b/mysys/ptr_cmp.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -29,7 +41,7 @@ void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos)
   case 3: mi_int3store(buff,pos); break;
   case 2: mi_int2store(buff,pos); break;
   case 1: buff[0]= (uchar) pos; break;
-  default: DBUG_ASSERT(0);
+  default: assert(0);
   }
   return;
 }
@@ -48,7 +60,7 @@ my_off_t my_get_ptr(uchar *ptr, size_t pack_length)
   case 3: pos= (my_off_t) mi_uint3korr(ptr); break;
   case 2: pos= (my_off_t) mi_uint2korr(ptr); break;
   case 1: pos= (my_off_t) *(uchar*) ptr; break;
-  default: DBUG_ASSERT(0); return 0;
+  default: assert(0); return 0;
   }
  return pos;
 }
diff --git a/mysys/queues.c b/mysys/queues.c
index a15b348c37b7..047374683cff 100644
--- a/mysys/queues.c
+++ b/mysys/queues.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -209,7 +221,7 @@ void delete_queue(QUEUE *queue)
 void queue_insert(QUEUE *queue, uchar *element)
 {
   uint idx, next;
-  DBUG_ASSERT(queue->elements < queue->max_elements);
+  assert(queue->elements < queue->max_elements);
   queue->root[0]= element;
   idx= ++queue->elements;
   /* max_at_top swaps the comparison if we want to order by desc */
@@ -230,10 +242,20 @@ void queue_insert(QUEUE *queue, uchar *element)
 uchar *queue_remove(QUEUE *queue, uint idx)
 {
   uchar *element;
-  DBUG_ASSERT(idx < queue->max_elements);
+  my_bool use_downheap;
+
+  assert(idx < queue->max_elements);
+  /*
+    If we remove the top element in the queue, we use _downheap else queue_fix
+    to maintain the heap property.
+  */
+  use_downheap = (idx == 0);
   element= queue->root[++idx];  /* Intern index starts from 1 */
   queue->root[idx]= queue->root[queue->elements--];
-  _downheap(queue, idx);
+  if (use_downheap)
+    _downheap(queue, idx);
+  else
+    queue_fix(queue);
   return element;
 }
 
@@ -600,6 +622,71 @@ static void benchmark_test()
   delete_queue(queue);
 }
 
+/**
+  Bug#30301356 - SOME EVENTS ARE DELAYED AFTER DROPPING EVENT
+
+  Test that ensures heap property is not violated if we remove an
+  element from an interior node. In the below test, we remove the
+  element 90 at index 6 in the array. After 90 is removed, the
+  parent node's of the deleted node violates the heap property
+  with the queue_remove function. We need to ensure the heap
+  property is satisfied by call queue_fix after removal from an
+  interior node in the queue_remove() function.
+*/
+
+// Element comparator for comparison of elements in heap.
+static int element_comparator(void *null_arg MY_ATTRIBUTE((unused)), uchar *lhs, uchar *rhs)
+{
+  int lkey = *(int *)lhs;
+  int rkey = *(int *)rhs;
+
+  return (lkey < rkey ? -1 : (lkey > rkey ? 1 : 0));
+}
+
+static my_bool is_tree_heap(uint index, QUEUE *queue)
+{
+  uint left, right;
+
+  if (index > queue->elements) return TRUE;
+  left = 2 * index;
+  right = 2 * index + 1;
+
+  if (left <= queue->elements &&
+      element_comparator(NULL, queue->root[index], queue->root[left]) == 1)
+    return FALSE;
+
+  if (left <= queue->elements &&
+      element_comparator(NULL, queue->root[index], queue->root[right]) == 1)
+    return FALSE;
+
+  return is_tree_heap(left, queue) && is_tree_heap(right, queue);
+}
+
+// Check if queue is a valid heap
+my_bool is_queue_valid(QUEUE *queue)
+{
+  unsigned i;
+
+  for(i = 0; i <= queue->elements; i++)
+    if (queue->root[i] == NULL) return FALSE;
+
+  return is_tree_heap(1, queue);
+}
+
+static void remove_queue_element_test()
+{
+  QUEUE queue;
+  int keys[11] = {60, 65, 84, 75, 80, 85, 90, 95, 100, 105, 82};
+  int i;
+  init_queue(&queue, 11, 0, 0, element_comparator, NULL);
+  for (i = 0; i < 11; i++)
+    queue_insert(&queue, (uchar*)&keys[i]);
+  assert(is_queue_valid(&queue));
+  queue_remove(&queue, 6);
+  assert(is_queue_valid(&queue));
+  delete_queue(&queue);
+}
+
 int main()
 {
   int i, add= 1;
@@ -616,6 +703,7 @@ int main()
       return -1;
   }
   benchmark_test();
+  remove_queue_element_test();
   printf("OK\n");
   return 0;
 }
diff --git a/mysys/sql_chars.c b/mysys/sql_chars.c
index 071b0dd17cb6..5fbbee5415bf 100644
--- a/mysys/sql_chars.c
+++ b/mysys/sql_chars.c
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -33,7 +45,7 @@ void hint_lex_init_maps(charset_info_st *cs,
       hint_map[i]= HINT_CHR_DIGIT;
     else if (my_isspace(cs, i))
     {
-      DBUG_ASSERT(!my_ismb1st(cs, i));
+      assert(!my_ismb1st(cs, i));
       hint_map[i]= HINT_CHR_SPACE;
     }
     else
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c
index f4fe6c82c91a..9593b40363a2 100644
--- a/mysys/stacktrace.c
+++ b/mysys/stacktrace.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -300,13 +312,13 @@ static void get_symbol_path(char *path, size_t size)
   HANDLE hSnap; 
   char *envvar;
   char *p;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   static char pdb_debug_dir[MAX_PATH + 7];
 #endif
 
   path[0]= '\0';
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* 
     Add "debug" subdirectory of the application directory, sometimes PDB will 
     placed here by installation.
diff --git a/mysys/string.c b/mysys/string.c
index 693c28cd133a..bb6f0dafa2c7 100644
--- a/mysys/string.c
+++ b/mysys/string.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/test_charset.c b/mysys/test_charset.c
index 49e25b8d5cd9..d5f487be5ce1 100644
--- a/mysys/test_charset.c
+++ b/mysys/test_charset.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/test_dir.c b/mysys/test_dir.c
index cbcec9f0f22f..9320e173c467 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.c
@@ -1,15 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/test_xml.c b/mysys/test_xml.c
index 87967197a180..cf430030933a 100644
--- a/mysys/test_xml.c
+++ b/mysys/test_xml.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2002 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/testhash.c b/mysys/testhash.c
index a0078787e51e..c4e2cd27009d 100644
--- a/mysys/testhash.c
+++ b/mysys/testhash.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,7 +37,7 @@ static int rnd(int max_value);
 static uint testflag=0,recant=10000,reclength=37;
 static uint16 key1[1000];
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 #define hash_check(A) 0
 #else
 my_bool hash_check(HASH *hash);
diff --git a/mysys/thr_cond.c b/mysys/thr_cond.c
index 25decb41e391..97f7c4bf8ba8 100644
--- a/mysys/thr_cond.c
+++ b/mysys/thr_cond.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -56,7 +68,7 @@ int safe_cond_wait(native_cond_t *cond, my_mutex_t *mp,
   mp->thread= my_thread_self();
   if (mp->count++)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     fprintf(stderr,
 	    "safe_mutex:  Count was %d in thread 0x%x when locking mutex at %s, line %d\n",
 	    mp->count-1, my_thread_var_id(), file, line);
@@ -96,7 +108,7 @@ int safe_cond_timedwait(native_cond_t *cond, my_mutex_t *mp,
   mp->thread= my_thread_self();
   if (mp->count++)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     fprintf(stderr,
 	    "safe_mutex:  Count was %d in thread 0x%x when locking mutex at %s, line %d (error: %d (%d))\n",
 	    mp->count-1, my_thread_var_id(), file, line, error, error);
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 0fc54cb0190e..f517be9efdca 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -187,7 +199,7 @@ static void check_locks(THR_LOCK *lock, const char *where,
 	if ((int) data->type == (int) TL_READ_NO_INSERT)
 	  count++;
         /* Protect against infinite loop. */
-        DBUG_ASSERT(count <= lock->read_no_write_count);
+        assert(count <= lock->read_no_write_count);
       }
       if (count != lock->read_no_write_count)
       {
@@ -636,10 +648,10 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner,
         tries to update t1, is an example of statement which requests two
         different types of write lock on the same table).
       */
-      DBUG_ASSERT(! has_old_lock(lock->write.data, data->owner) ||
-                  ((lock_type <= lock->write.data->type ||
-                    (lock_type == TL_WRITE &&
-                     lock->write.data->type == TL_WRITE_LOW_PRIORITY))));
+      assert(! has_old_lock(lock->write.data, data->owner) ||
+             ((lock_type <= lock->write.data->type ||
+               (lock_type == TL_WRITE &&
+                lock->write.data->type == TL_WRITE_LOW_PRIORITY))));
 
       if ((lock_type == TL_WRITE_ALLOW_WRITE &&
            ! lock->write_wait.data &&
@@ -1205,14 +1217,14 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data,
                               enum thr_lock_type new_lock_type)
 {
   THR_LOCK *lock=in_data->lock;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   enum thr_lock_type old_lock_type= in_data->type;
 #endif
   DBUG_ENTER("thr_downgrade_write_only_lock");
 
   mysql_mutex_lock(&lock->mutex);
-  DBUG_ASSERT(old_lock_type == TL_WRITE_ONLY);
-  DBUG_ASSERT(old_lock_type > new_lock_type);
+  assert(old_lock_type == TL_WRITE_ONLY);
+  assert(old_lock_type > new_lock_type);
   in_data->type= new_lock_type;
   check_locks(lock,"after downgrading lock",0);
 
@@ -1373,6 +1385,7 @@ static void *test_thread(void *arg)
   THR_LOCK_DATA *multi_locks[MAX_LOCK_COUNT];
   my_thread_id id;
   mysql_cond_t COND_thr_lock;
+  COND_thr_lock.m_psi = NULL;
 
   id= param + 1; /* Main thread uses value 0. */
   mysql_cond_init(0, &COND_thr_lock);
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index f0396b759e4b..f069b1d5fe21 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -36,7 +48,7 @@ void safe_mutex_global_init(void)
 int safe_mutex_init(my_mutex_t *mp, const native_mutexattr_t *attr,
 		    const char *file, uint line)
 {
-  DBUG_ASSERT(safe_mutex_inited);
+  assert(safe_mutex_inited);
   memset(mp, 0, sizeof(*mp));
   native_mutex_init(&mp->global,MY_MUTEX_INIT_ERRCHK);
   native_mutex_init(&mp->mutex,attr);
@@ -71,7 +83,7 @@ int safe_mutex_lock(my_mutex_t *mp, my_bool try_lock,
     }
     else if (my_thread_equal(my_thread_self(),mp->thread))
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       fprintf(stderr,
               "safe_mutex: Trying to lock mutex at %s, line %d, when the"
               " mutex was already locked at %s, line %d in thread T@%u\n",
diff --git a/mysys/thr_rwlock.c b/mysys/thr_rwlock.c
index cadedda14891..d2192aa94028 100644
--- a/mysys/thr_rwlock.c
+++ b/mysys/thr_rwlock.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys/tree.c b/mysys/tree.c
index 1f21b670f51b..12e66eb6a357 100644
--- a/mysys/tree.c
+++ b/mysys/tree.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -80,7 +92,7 @@ static void rb_delete_fixup(TREE *tree,TREE_ELEMENT ***parent);
 
 	/* The actuall code for handling binary trees */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static int test_rb_tree(TREE_ELEMENT *element);
 #endif
 
@@ -731,7 +743,7 @@ static void rb_delete_fixup(TREE *tree, TREE_ELEMENT ***parent)
   x->colour=BLACK;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 	/* Test that the proporties for a red-black tree holds */
 
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 247c4d9c75bf..a2650abd8b35 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -75,8 +87,8 @@ int find_type(const char *x, const TYPELIB *typelib, uint flags)
   DBUG_ENTER("find_type");
   DBUG_PRINT("enter",("x: '%s'  lib: 0x%lx", x, (long) typelib));
 
-  DBUG_ASSERT(!(flags & ~(FIND_TYPE_NO_PREFIX | FIND_TYPE_ALLOW_NUMBER |
-                          FIND_TYPE_NO_OVERWRITE | FIND_TYPE_COMMA_TERM)));
+  assert(!(flags & ~(FIND_TYPE_NO_PREFIX | FIND_TYPE_ALLOW_NUMBER |
+                     FIND_TYPE_NO_OVERWRITE | FIND_TYPE_COMMA_TERM)));
   if (!typelib->count)
   {
     DBUG_PRINT("exit",("no count"));
diff --git a/mysys/win_timers.c b/mysys/win_timers.c
index 32fcdcec0345..ca86249b329f 100644
--- a/mysys/win_timers.c
+++ b/mysys/win_timers.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -46,7 +53,7 @@ static void CALLBACK
 timer_callback_function(PVOID timer_data, BOOLEAN timer_or_wait_fired MY_ATTRIBUTE((unused)))
 {
   my_timer_t *timer= (my_timer_t *)timer_data;
-  DBUG_ASSERT(timer != NULL);
+  assert(timer != NULL);
   timer->id.timer_state= TIMER_EXPIRED;
   PostQueuedCompletionStatus(io_compl_port, 0, (ULONG_PTR)timer, 0);
 }
@@ -100,8 +107,8 @@ delete_timer(my_timer_t *timer, int *state)
   int ret_val;
   int retry_count= 3;
 
-  DBUG_ASSERT(timer != 0);
-  DBUG_ASSERT(timer_queue != 0);
+  assert(timer != 0);
+  assert(timer_queue != 0);
 
   if (state != NULL)
     *state= 0;
@@ -292,7 +299,7 @@ my_timer_deinitialize()
 int
 my_timer_create(my_timer_t *timer)
 {
-  DBUG_ASSERT(timer_queue != 0);
+  assert(timer_queue != 0);
   timer->id.timer_handle= 0;
   return 0;
 }
@@ -310,8 +317,8 @@ my_timer_create(my_timer_t *timer)
 int
 my_timer_set(my_timer_t *timer, unsigned long time)
 {
-  DBUG_ASSERT(timer != NULL);
-  DBUG_ASSERT(timer_queue != 0);
+  assert(timer != NULL);
+  assert(timer_queue != 0);
 
   /**
     If timer set previously is expired then it will not be
@@ -345,7 +352,7 @@ my_timer_set(my_timer_t *timer, unsigned long time)
 int
 my_timer_cancel(my_timer_t *timer, int *state)
 {
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   return delete_timer(timer, state);
 }
diff --git a/mysys_ssl/CMakeLists.txt b/mysys_ssl/CMakeLists.txt
index eec1be7127ad..9c649fb4f9e0 100644
--- a/mysys_ssl/CMakeLists.txt
+++ b/mysys_ssl/CMakeLists.txt
@@ -1,18 +1,27 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/mysys_ssl
                     ${CMAKE_SOURCE_DIR}/mysys
@@ -22,20 +31,21 @@ IF(SSL_DEFINES)
 ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
 
-IF(WITH_SSL STREQUAL "bundled")
-  SET(MYSYS_AES_IMPLEMENTATION my_aes_yassl.cc)
-ELSE()
-  SET(MYSYS_AES_IMPLEMENTATION my_aes_openssl.cc)
-ENDIF()
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+    crypt_genhash_impl.cc
+    my_md5.cc
+    my_sha1.cc)
+
+SET(MYSYS_AES_IMPLEMENTATION my_aes_openssl.cc)
 
 SET(MYSYS_SSL_SOURCES
     crypt_genhash_impl.cc
     mf_tempdir.cc
     my_default.cc
     my_getopt.cc
+    my_kdf.cc
     my_aes.cc
     my_sha1.cc
-    my_sha2.cc
     my_md5.cc
     my_rnd.cc
     my_murmur3.cc
@@ -44,13 +54,14 @@ SET(MYSYS_SSL_SOURCES
 
 ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
 TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES} ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(mysys_ssl ${CMAKE_THREAD_LIBS_INIT})
 # Needed to resolve OpenSSL dependency on Windows
-IF(WIN32 AND NOT WITH_SSL STREQUAL "bundled")
+IF(WIN32)
   TARGET_LINK_LIBRARIES(mysys_ssl crypt32)
 ENDIF()
 DTRACE_INSTRUMENT(mysys_ssl)
 
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)
+# MD5_Init() MD5_Update() MD5_Final() are all deprecated
+IF(SOLARIS AND CMAKE_COMPILER_IS_GNUCXX)
+  ADD_COMPILE_FLAGS(my_md5.cc COMPILE_FLAGS "-Wno-deprecated-declarations")
 ENDIF()
-
diff --git a/mysys_ssl/crypt_genhash_impl.cc b/mysys_ssl/crypt_genhash_impl.cc
index 80b61dcc0e6b..dc0fee6bbb03 100644
--- a/mysys_ssl/crypt_genhash_impl.cc
+++ b/mysys_ssl/crypt_genhash_impl.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -19,14 +31,8 @@
 
 #ifdef HAVE_OPENSSL
 
-#ifdef HAVE_YASSL
-#include <sha.hpp>
-#include <openssl/ssl.h>
-#else
 #include <openssl/sha.h>
 #include <openssl/rand.h>
-#endif
-
 #include "crypt_genhash_impl.h"
 
 #include "m_string.h"
@@ -39,31 +45,11 @@
 #include <alloca.h>
 #endif
 
-#ifndef HAVE_YASSL
 #define	DIGEST_CTX	SHA256_CTX
 #define	DIGESTInit	SHA256_Init
 #define	DIGESTUpdate	SHA256_Update
 #define	DIGESTFinal	SHA256_Final
 #define	DIGEST_LEN	SHA256_DIGEST_LENGTH
-#else
-#define DIGEST_CTX TaoCrypt::SHA256
-#define DIGEST_LEN 32
-void DIGESTInit(DIGEST_CTX *ctx)
-{
-  ctx->Init();
-}
-
-void DIGESTUpdate(DIGEST_CTX *ctx, const void *plaintext, int len)
-{
-  ctx->Update((const TaoCrypt::byte *)plaintext, len);
-}
-
-void DIGESTFinal(void *txt, DIGEST_CTX *ctx)
-{
-  ctx->Final((TaoCrypt::byte *)txt);
-}
-
-#endif // HAVE_YASSL
 
 static const char crypt_alg_magic[] = "$5";
 
@@ -435,11 +421,7 @@ extern "C"
 void generate_user_salt(char *buffer, int buffer_len)
 {
   char *end= buffer + buffer_len - 1;
-#ifdef HAVE_YASSL
-  yaSSL::RAND_bytes((unsigned char *) buffer, buffer_len);
-#else
   RAND_bytes((unsigned char *) buffer, buffer_len);
-#endif
       
   /* Sequence must be a legal UTF8 string */
   for (; buffer < end; buffer++)
diff --git a/mysys_ssl/mf_tempdir.cc b/mysys_ssl/mf_tempdir.cc
index 2935509885ff..33ed9a8733bd 100644
--- a/mysys_ssl/mf_tempdir.cc
+++ b/mysys_ssl/mf_tempdir.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys_ssl/my_aes.cc b/mysys_ssl/my_aes.cc
index f5ebe8bd55b9..40d4159f3ad4 100644
--- a/mysys_ssl/my_aes.cc
+++ b/mysys_ssl/my_aes.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ Without limiting anything contained in the foregoing, this file,
+ which is part of C Driver for MySQL (Connector/C), is also subject to the
+ Universal FOSS Exception, version 1.0, a copy of which can be found at
+ http://oss.oracle.com/licenses/universal-foss-exception.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -32,7 +44,7 @@
 
   @param key        [in]       Key to use for real key creation
   @param key_length [in]       Length of the key
-  @param rkey       [out]      Real key (used by OpenSSL/YaSSL)
+  @param rkey       [out]      Real key (used by OpenSSL)
   @param opmode     [out]      encryption mode
 */
 
diff --git a/mysys_ssl/my_aes_impl.h b/mysys_ssl/my_aes_impl.h
index 2e18b2ea0ef5..bd4b63fa7d32 100644
--- a/mysys_ssl/my_aes_impl.h
+++ b/mysys_ssl/my_aes_impl.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+Without limiting anything contained in the foregoing, this file,
+which is part of C Driver for MySQL (Connector/C), is also subject to the
+Universal FOSS Exception, version 1.0, a copy of which can be found at
+http://oss.oracle.com/licenses/universal-foss-exception.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/mysys_ssl/my_aes_openssl.cc b/mysys_ssl/my_aes_openssl.cc
index 261ba8ab732c..0c97c76700f1 100644
--- a/mysys_ssl/my_aes_openssl.cc
+++ b/mysys_ssl/my_aes_openssl.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+Without limiting anything contained in the foregoing, this file,
+which is part of C Driver for MySQL (Connector/C), is also subject to the
+Universal FOSS Exception, version 1.0, a copy of which can be found at
+http://oss.oracle.com/licenses/universal-foss-exception.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -17,6 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <m_string.h>
 #include <my_aes.h>
 #include "my_aes_impl.h"
+#include "my_kdf.h"
 
 #include <openssl/aes.h>
 #include <openssl/evp.h>
@@ -115,40 +128,88 @@ aes_evp_type(const my_aes_opmode mode)
   }
 }
 
+/**
+  Creates required length of AES key,
+  Input key size can be smaller or bigger in length, we need exact AES key
+  size. If KDF options are valid and given, use KDF functionality. otherwise
+  use previously used method.
+
+  @param [out] rkey Output key
+  @param key Input key
+  @param key_length input key length
+  @param mode AES mode
+  @param kdf_options  KDF function options
+
+  @return 0 on success and 1 on failure
+*/
+int my_create_key(unsigned char *rkey, const unsigned char *key,
+                  uint32 key_length, enum my_aes_opmode mode,
+                  vector<string> *kdf_options) {
+  if (kdf_options) {
+    if (kdf_options->size() < 1) {
+      return 1;
+    }
+    const uint key_size = my_aes_opmode_key_sizes[mode] / 8;
+    return create_kdf_key(key, key_length, rkey, key_size, kdf_options);
+  }
+
+  my_aes_create_key(key, key_length, rkey, mode);
+  return 0;
+}
 
 int my_aes_encrypt(const unsigned char *source, uint32 source_length,
                    unsigned char *dest,
                    const unsigned char *key, uint32 key_length,
                    enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding)
+                   bool padding,
+                   vector<string> *kdf_options)
 {
-  EVP_CIPHER_CTX ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX stack_ctx;
+  EVP_CIPHER_CTX *ctx= &stack_ctx;
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   const EVP_CIPHER *cipher= aes_evp_type(mode);
   int u_len, f_len;
   /* The real key to be used for encryption */
   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-  my_aes_create_key(key, key_length, rkey, mode);
 
-  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+  if (my_create_key(rkey, key, key_length, mode, kdf_options)) {
     return MY_AES_BAD_DATA;
+  }
+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+    return MY_AES_BAD_DATA;
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_init(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
-  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
     goto aes_error;                             /* Error */
-  if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
+  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
     goto aes_error;                             /* Error */
-  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
     goto aes_error;                             /* Error */
 
-  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
     goto aes_error;                             /* Error */
 
-  EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   return u_len + f_len;
 
 aes_error:
   /* need to explicitly clean up the error if we want to ignore it */
   ERR_clear_error();
-  EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   return MY_AES_BAD_DATA;
 }
 
@@ -156,38 +217,55 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
                    unsigned char *dest,
                    const unsigned char *key, uint32 key_length,
                    enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding)
+                   bool padding,
+                   vector<string> *kdf_options)
 {
-
-  EVP_CIPHER_CTX ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX stack_ctx;
+  EVP_CIPHER_CTX *ctx= &stack_ctx;
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   const EVP_CIPHER *cipher= aes_evp_type(mode);
   int u_len, f_len;
 
   /* The real key to be used for decryption */
   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
 
-  my_aes_create_key(key, key_length, rkey, mode);
-  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
+  if (my_create_key(rkey, key, key_length, mode, kdf_options)) {
+    return MY_AES_BAD_DATA;
+  }
+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
     return MY_AES_BAD_DATA;
 
-  EVP_CIPHER_CTX_init(&ctx);
-
-  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_init(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
     goto aes_error;                             /* Error */
-  if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
+  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
     goto aes_error;                             /* Error */
-  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
     goto aes_error;                             /* Error */
-  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
     goto aes_error;                             /* Error */
 
-  EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
   return u_len + f_len;
 
 aes_error:
   /* need to explicitly clean up the error if we want to ignore it */
   ERR_clear_error();
-  EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_CIPHER_CTX_cleanup(ctx);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_CIPHER_CTX_free(ctx);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   return MY_AES_BAD_DATA;
 }
 
@@ -220,7 +298,7 @@ my_bool my_aes_needs_iv(my_aes_opmode opmode)
   int iv_length;
 
   iv_length= EVP_CIPHER_iv_length(cipher);
-  DBUG_ASSERT(iv_length == 0 || iv_length == MY_AES_IV_SIZE);
+  assert(iv_length == 0 || iv_length == MY_AES_IV_SIZE);
   return iv_length != 0 ? TRUE : FALSE;
 }
 
diff --git a/mysys_ssl/my_aes_yassl.cc b/mysys_ssl/my_aes_yassl.cc
deleted file mode 100644
index f387e34ba863..000000000000
--- a/mysys_ssl/my_aes_yassl.cc
+++ /dev/null
@@ -1,244 +0,0 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include <my_global.h>
-#include <m_string.h>
-#include <my_aes.h>
-#include "my_aes_impl.h"
-
-#include "aes.hpp"
-#include "openssl/ssl.h"
-
-/* keep in sync with enum my_aes_opmode in my_aes.h */
-const char *my_aes_opmode_names[]=
-{
-  "aes-128-ecb",
-  "aes-192-ecb",
-  "aes-256-ecb",
-  "aes-128-cbc",
-  "aes-192-cbc",
-  "aes-256-cbc",
-  NULL /* needed for the type enumeration */
-};
-
-
-/* keep in sync with enum my_aes_opmode in my_aes.h */
-static uint my_aes_opmode_key_sizes_impl[]=
-{
-  128 /* aes-128-ecb */,
-  192 /* aes-192-ecb */,
-  256 /* aes-256-ecb */,
-  128 /* aes-128-cbc */,
-  192 /* aes-192-cbc */,
-  256 /* aes-256-cbc */,
-};
-
-uint *my_aes_opmode_key_sizes= my_aes_opmode_key_sizes_impl;
-
-
-template <TaoCrypt::CipherDir DIR>
-class MyCipherCtx
-{
-public:
-  MyCipherCtx(enum my_aes_opmode mode) : m_mode(mode)
-  {
-    switch (m_mode)
-    {
-    case my_aes_128_ecb:
-    case my_aes_192_ecb:
-    case my_aes_256_ecb:
-      m_need_iv= false;
-      break;
-    default:
-      m_need_iv= true;
-      break;
-    }
-  }
-
-  bool SetKey(const unsigned char *key, uint block_size,
-              const unsigned char *iv)
-  {
-    if (m_need_iv)
-    {
-      if (!iv)
-        return TRUE;
-      cbc.SetKey(key, block_size, iv);
-    }
-    else
-      ecb.SetKey(key, block_size);
-    return false;
-  }
-
-  void Process(unsigned char *dest, const unsigned char * source,
-               uint block_size)
-  {
-    if (m_need_iv)
-      cbc.Process(dest, source, block_size);
-    else
-      ecb.Process(dest, source, block_size);
-  }
-
-  bool needs_iv() const
-  {
-    return m_need_iv;
-  }
-
-private:
-  /* we initialize the two classes to avoid dynamic allocation */
-  TaoCrypt::BlockCipher<DIR, TaoCrypt::AES, TaoCrypt::ECB> ecb;
-  TaoCrypt::BlockCipher<DIR, TaoCrypt::AES, TaoCrypt::CBC> cbc;
-  enum my_aes_opmode m_mode;
-  bool m_need_iv;
-};
-
-
-int my_aes_encrypt(const unsigned char *source, uint32 source_length,
-                   unsigned char *dest,
-                   const unsigned char *key, uint32 key_length,
-                   enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding)
-{
-  MyCipherCtx<TaoCrypt::ENCRYPTION> enc(mode);
-
-  /* 128 bit block used for padding */
-  unsigned char block[MY_AES_BLOCK_SIZE];
-  uint num_blocks;                               /* number of complete blocks */
-  uint i;
-  /* predicted real key size */
-  const uint key_size= my_aes_opmode_key_sizes[mode] / 8;
-  /* The real key to be used for encryption */
-  unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-
-  my_aes_create_key(key, key_length, rkey, mode);
-
-  if (enc.SetKey(rkey, key_size, iv))
-    return MY_AES_BAD_DATA;
-
-  num_blocks= source_length / MY_AES_BLOCK_SIZE;
-
-  /* Encode all complete blocks */
-  for (i = num_blocks; i > 0;
-       i--, source+= MY_AES_BLOCK_SIZE, dest+= MY_AES_BLOCK_SIZE)
-       enc.Process(dest, source, MY_AES_BLOCK_SIZE);
-
-  /* If no padding, return here */
-  if (!padding)
-	  return (int) (MY_AES_BLOCK_SIZE * num_blocks);
-  /*
-  Re-implement standard PKCS padding for the last block.
-  Pad the last incomplete data block (even if empty) with bytes
-  equal to the size of extra padding stored into that last packet.
-  This also means that there will always be one more block,
-  even if the source data size is dividable by the AES block size.
-  */
-  unsigned char pad_len=
-    MY_AES_BLOCK_SIZE - (source_length - MY_AES_BLOCK_SIZE * num_blocks);
-  memcpy(block, source, MY_AES_BLOCK_SIZE - pad_len);
-  memset(block + MY_AES_BLOCK_SIZE - pad_len, pad_len, pad_len);
-
-  enc.Process(dest, block, MY_AES_BLOCK_SIZE);
-
-  /* we've added a block */
-  num_blocks+= 1;
-
-  return (int) (MY_AES_BLOCK_SIZE * num_blocks);
-}
-
-int my_aes_decrypt(const unsigned char *source, uint32 source_length,
-                   unsigned char *dest,
-                   const unsigned char *key, uint32 key_length,
-                   enum my_aes_opmode mode, const unsigned char *iv,
-                   bool padding)
-{
-  MyCipherCtx<TaoCrypt::DECRYPTION> dec(mode);
-  /* 128 bit block used for padding */
-  uint8 block[MY_AES_BLOCK_SIZE];
-  uint32 num_blocks;                               /* Number of complete blocks */
-  int i;
-  /* predicted real key size */
-  const uint key_size= my_aes_opmode_key_sizes[mode] / 8;
-  /* The real key to be used for decryption */
-  unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-
-  my_aes_create_key(key, key_length, rkey, mode);
-  dec.SetKey(rkey, key_size, iv);
-
-  num_blocks= source_length / MY_AES_BLOCK_SIZE;
-
-  /*
-  Input size has to be a multiple of the AES block size.
-  And, due to the standard PKCS padding, at least one block long.
-  */
-  if ((source_length != num_blocks * MY_AES_BLOCK_SIZE) || num_blocks == 0)
-    return MY_AES_BAD_DATA;
-
-  /* Decode all but the last block */
-  for (i= padding? num_blocks - 1: num_blocks; i > 0;
-       i--, source+= MY_AES_BLOCK_SIZE, dest+= MY_AES_BLOCK_SIZE)
-       dec.Process(dest, source, MY_AES_BLOCK_SIZE);
-
-  /* If no padding, return here. */
-  if (!padding)
-	  return MY_AES_BLOCK_SIZE * num_blocks;
-
-  /* unwarp the standard PKCS padding */
-  dec.Process(block, source, MY_AES_BLOCK_SIZE);
-
-  /* Use last char in the block as size */
-  uint8 pad_len = block[MY_AES_BLOCK_SIZE - 1];
-
-  if (pad_len > MY_AES_BLOCK_SIZE)
-    return MY_AES_BAD_DATA;
-  /* We could also check whole padding but we do not really need this */
-
-  memcpy(dest, block, MY_AES_BLOCK_SIZE - pad_len);
-  return MY_AES_BLOCK_SIZE * num_blocks - pad_len;
-}
-
-/**
- Get size of buffer which will be large enough for encrypted data
-
- SYNOPSIS
-  my_aes_get_size()
- @param source_length  [in] Length of data to be encrypted
- @param mode           encryption mode
-
- @return Size of buffer required to store encrypted data
-*/
-
-int my_aes_get_size(uint32 source_length, my_aes_opmode opmode)
-{
-  return MY_AES_BLOCK_SIZE * (source_length / MY_AES_BLOCK_SIZE)
-    + MY_AES_BLOCK_SIZE;
-}
-
-/**
-  Return true if the AES cipher and block mode requires an IV
-
-  SYNOPSIS
-  my_aes_needs_iv()
-  @param mode           encryption mode
-
-  @retval TRUE   IV needed
-  @retval FALSE  IV not needed
-*/
-
-my_bool my_aes_needs_iv(my_aes_opmode opmode)
-{
-  MyCipherCtx<TaoCrypt::ENCRYPTION> enc(opmode);
-
-  return enc.needs_iv() ? TRUE : FALSE;
-}
-
diff --git a/mysys_ssl/my_default.cc b/mysys_ssl/my_default.cc
index 64a993393a57..0c92e5656f0b 100644
--- a/mysys_ssl/my_default.cc
+++ b/mysys_ssl/my_default.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -86,7 +98,7 @@ C_MODE_END
 static const char *args_separator= "----args-separator----";
 inline static void set_args_separator(char** arg)
 {
-  DBUG_ASSERT(my_getopt_use_args_separator);
+  assert(my_getopt_use_args_separator);
   *arg= (char*)args_separator;
 }
 
@@ -1031,8 +1043,12 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
       goto err;
     }
 
+    /* comments are not supported in login file */
+    if (!is_login_file)
+      end = remove_end_comment(ptr);
+    else
+      end = ptr + strlen(ptr);
 
-    end= remove_end_comment(ptr);
     if ((value= strchr(ptr, '=')))
       end= value;				/* Option without argument */
     for ( ; my_isspace(&my_charset_latin1, end[-1]) ; end--)
@@ -1312,7 +1328,7 @@ static int add_directory(MEM_ROOT *alloc, const char *dir, const char **dirs)
     return 1;  /* Failure */
   /* Should never fail if DEFAULT_DIRS_SIZE is correct size */
   err= array_append_string_unique(p, dirs, DEFAULT_DIRS_SIZE);
-  DBUG_ASSERT(err == FALSE);
+  assert(err == FALSE);
 
   return 0;
 }
diff --git a/mysys_ssl/my_default_priv.h b/mysys_ssl/my_default_priv.h
index 9c55d4776de0..823c04f5e3d3 100644
--- a/mysys_ssl/my_default_priv.h
+++ b/mysys_ssl/my_default_priv.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/mysys_ssl/my_getopt.cc b/mysys_ssl/my_getopt.cc
index 40ae171fdc22..fb304063237c 100644
--- a/mysys_ssl/my_getopt.cc
+++ b/mysys_ssl/my_getopt.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -214,8 +226,8 @@ int my_handle_options(int *argc, char ***argv,
   bool opt_found;
 
   /* handle_options() assumes arg0 (program name) always exists */
-  DBUG_ASSERT(argc && *argc >= 1);
-  DBUG_ASSERT(argv && *argv);
+  assert(argc && *argc >= 1);
+  assert(argv && *argv);
   (*argc)--; /* Skip the program name */
   (*argv)++; /*      --- || ----      */
   init_variables(longopts, init_one_value);
@@ -539,10 +551,10 @@ int my_handle_options(int *argc, char ***argv,
                 Hack the string "-XYZ" to make a "-YZ" substring in it,
                 and push that to the output as an unrecognized parameter.
               */
-              DBUG_ASSERT(optend > *pos);
-              DBUG_ASSERT(optend >= cur_arg);
-              DBUG_ASSERT(optend <= *pos + strlen(*pos));
-              DBUG_ASSERT(*optend);
+              assert(optend > *pos);
+              assert(optend >= cur_arg);
+              assert(optend <= *pos + strlen(*pos));
+              assert(*optend);
               optend--;
               optend[0]= '-'; /* replace 'X' or '-' by '-' */
               (*argv)[argvpos++]= optend;
@@ -1060,7 +1072,7 @@ ulonglong max_of_int_range(int var_type)
   case GET_ULL:
     return ULLONG_MAX;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 }
diff --git a/mysys_ssl/my_kdf.cc b/mysys_ssl/my_kdf.cc
new file mode 100644
index 000000000000..6725991876ce
--- /dev/null
+++ b/mysys_ssl/my_kdf.cc
@@ -0,0 +1,210 @@
+/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ Without limiting anything contained in the foregoing, this file,
+ which is part of C Driver for MySQL (Connector/C), is also subject to the
+ Universal FOSS Exception, version 1.0, a copy of which can be found at
+ http://oss.oracle.com/licenses/universal-foss-exception.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "my_kdf.h"
+
+#include <openssl/evp.h>
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#include <openssl/kdf.h>
+#endif
+
+#include <assert.h>
+#include <cstring>
+#include <memory>
+
+const int max_kdf_iterations_size = 65535;
+const int min_kdf_iterations_size = 1000;
+
+/*
+  return 0 on success and 1 on failure
+*/
+int create_kdf_key(const unsigned char *key, const unsigned int key_length,
+                   unsigned char *rkey, unsigned int rkey_size,
+                   vector<string> *kdf_options) {
+  assert(kdf_options != NULL);
+  if (kdf_options == NULL) {
+    return 1;
+  }
+  int nkdf_options = kdf_options->size();
+  assert(nkdf_options > 0);
+  if (nkdf_options < 1) {
+    return 1;
+  }
+
+  string kdf_name = (*kdf_options)[0];
+  Key_derivation_function *kdf_function = NULL;
+
+  if (kdf_name == "hkdf") {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    kdf_function = new Key_hkdf_function(kdf_options);
+#else
+    return 1;
+#endif
+  }
+  if (kdf_name == "pbkdf2_hmac") {
+    kdf_function = new Key_pbkdf2_hmac_function(kdf_options);
+  }
+  if (kdf_function == NULL) {
+    return 1;
+  }
+  if (kdf_function->validate_options()) {
+    delete kdf_function;
+    kdf_function = NULL;
+    return 1;
+  }
+  bool ret = kdf_function->derive_key(key, key_length, rkey, rkey_size);
+  delete kdf_function;
+  kdf_function = NULL;
+  return ret;
+}
+
+Key_derivation_function::Key_derivation_function() {
+  kdf_options_ = NULL;
+  options_valid_ = false;
+}
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
+  kdf_options_ = kdf_options;
+}
+
+/*
+  0 success
+  1 error
+*/
+int Key_hkdf_function::validate_options() {
+  int nkdf_options = kdf_options_->size();
+  if (nkdf_options > 1) {
+    salt_ = (*kdf_options_)[1];
+  }
+  if (nkdf_options > 2) {
+    info_ = (*kdf_options_)[2];
+  }
+  options_valid_ = true;
+  return 0;
+}
+
+int Key_hkdf_function::derive_key(const unsigned char *key,
+                                  const unsigned int key_length,
+                                  unsigned char *rkey, unsigned int key_size) {
+  if (!options_valid_) return 1;
+
+  EVP_PKEY_CTX *pctx = NULL;
+
+  /* Set initial key  */
+  memset(rkey, 0, key_size);
+  pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+  if (!pctx) {
+    return 1;
+  }
+  if (EVP_PKEY_derive_init(pctx) <= 0) {
+    EVP_PKEY_CTX_free(pctx);
+  }
+  if (EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha512()) <= 0) {
+    EVP_PKEY_CTX_free(pctx);
+    return 1;
+  }
+  if (!salt_.empty()) {
+    if (EVP_PKEY_CTX_set1_hkdf_salt(pctx,
+                                    (const unsigned char *)(salt_.c_str()),
+                                    salt_.length()) <= 0) {
+      EVP_PKEY_CTX_free(pctx);
+      return 1;
+    }
+  }
+  if (!info_.empty()) {
+    if (EVP_PKEY_CTX_add1_hkdf_info(pctx,
+                                    (const unsigned char *)(info_.c_str()),
+                                    info_.length()) <= 0) {
+      EVP_PKEY_CTX_free(pctx);
+      return 1;
+    }
+  }
+  if (EVP_PKEY_CTX_set1_hkdf_key(pctx, key, key_length) <= 0) {
+    EVP_PKEY_CTX_free(pctx);
+    return 1;
+  }
+  size_t len = key_size;
+  if (EVP_PKEY_derive(pctx, static_cast<unsigned char *>(rkey),
+                      static_cast<size_t *>(&len)) <= 0) {
+    EVP_PKEY_CTX_free(pctx);
+    return 1;
+  }
+  if (len != key_size) {
+    return 1;
+  }
+  if (pctx) {
+    EVP_PKEY_CTX_free(pctx);
+  }
+  return 0;
+}
+#endif
+
+Key_pbkdf2_hmac_function::Key_pbkdf2_hmac_function(
+    vector<string> *kdf_options) {
+  kdf_options_ = kdf_options;
+  iterations_ = 0;
+}
+
+/*
+  0 success
+  1 error
+*/
+int Key_pbkdf2_hmac_function::validate_options() {
+  int nkdf_options = kdf_options_->size();
+  iterations_ = min_kdf_iterations_size;
+
+  if (nkdf_options > 1) {
+    salt_ = (*kdf_options_)[1];
+  }
+  if (nkdf_options > 2) {
+    string sIterations = (*kdf_options_)[2];
+    iterations_ = atoi(sIterations.c_str());
+  }
+  if (iterations_ < min_kdf_iterations_size ||
+      iterations_ > max_kdf_iterations_size) {
+    return 1;
+  }
+  options_valid_ = true;
+  return 0;
+}
+
+/*
+  0 success
+  1 error
+*/
+int Key_pbkdf2_hmac_function::derive_key(const unsigned char *key,
+                                         const unsigned int key_length,
+                                         unsigned char *rkey,
+                                         unsigned int key_size) {
+  if (!options_valid_) return 1;
+  int res = 0;
+  res = PKCS5_PBKDF2_HMAC((const char *)key, key_length,
+                          (const unsigned char *)salt_.c_str(), salt_.length(),
+                          iterations_, EVP_sha512(), key_size, rkey);
+  return res ? 0 : 1;
+}
diff --git a/mysys_ssl/my_kdf.h b/mysys_ssl/my_kdf.h
new file mode 100644
index 000000000000..068e8fd4ab6b
--- /dev/null
+++ b/mysys_ssl/my_kdf.h
@@ -0,0 +1,126 @@
+/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <openssl/conf.h>
+#include <string>
+#include <vector>
+
+using std::string;
+using std::vector;
+
+/**
+  Creates the required size of key using supplied key and KDF options.
+
+  KDF: key derivation function (KDF) is a cryptographic algorithm that derives
+  one or more secret keys from a secret value such as a main key, a password, or
+  a passphrase using a pseudorandom function (which typically uses a
+  cryptographic hash function or block cipher)
+
+  @param key Input key
+  @param key_length Input key length
+  @param [out] rkey output key
+  @param rkey_size output key length
+  @param kdf_options  KDF function options
+
+  @return 0 on success and 1 on failure
+*/
+int create_kdf_key(const unsigned char *key, const unsigned int key_length,
+                   unsigned char *rkey, unsigned int rkey_size,
+                   vector<string> *kdf_options);
+
+class Key_derivation_function {
+ public:
+  Key_derivation_function();
+  virtual ~Key_derivation_function() {}
+  virtual int derive_key(const unsigned char *key,
+                         const unsigned int key_length, unsigned char *rkey,
+                         unsigned int key_size) = 0;
+  virtual int validate_options() = 0;
+
+ protected:
+  vector<string> *kdf_options_;
+  bool options_valid_;
+};
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+
+/** Class to implement KDF method hkdf. */
+class Key_hkdf_function : public Key_derivation_function {
+ public:
+  /**
+     hkdf Constructor
+
+     @param kdf_options
+
+     kdf_options has following KDF options:
+
+     1. KDF function name
+
+     2. KDF salt: The salt. Salts prevent attacks based on dictionaries of
+     common passwords and attacks based on rainbow tables. It is a public value
+     that can be safely stored along with the encryption key.
+
+     3. KDF info: The context and application specific information.
+  */
+  Key_hkdf_function(vector<string> *kdf_options);
+  virtual ~Key_hkdf_function() {}
+  int derive_key(const unsigned char *key, const unsigned int key_length,
+                 unsigned char *rkey, unsigned int key_size);
+  int validate_options();
+
+private:
+  string salt_;
+  string info_;
+};
+#endif
+
+/** Class to implement KDF method pbkdf2_hmac. */
+class Key_pbkdf2_hmac_function : public Key_derivation_function {
+ public:
+  /**
+     pbkdf2_hmac Constructor
+
+     @param kdf_options
+
+     kdf_options has following KDF options:
+
+     1. KDF function name
+
+     2. KDF salt: The salt. Salts prevent attacks based on dictionaries of
+     common passwords and attacks based on rainbow tables. It is a public value
+     that can be safely stored along with the encryption key.
+
+     3. KDF info: The iteration count.
+     This provides the ability to tune the algorithm.
+     It is better to use the highest count possible for the maximum resistance
+     to brute-force attacks.
+  */
+  Key_pbkdf2_hmac_function(vector<string> *kdf_options);
+  virtual ~Key_pbkdf2_hmac_function(){}
+  int derive_key(const unsigned char *key, const unsigned int key_length,
+                 unsigned char *rkey, unsigned int key_size);
+  int validate_options();
+
+private:
+  string salt_;
+  int iterations_;
+};
diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc
index 4c14366a4e3e..a343468b4992 100644
--- a/mysys_ssl/my_md5.cc
+++ b/mysys_ssl/my_md5.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -18,25 +30,13 @@
   @file
 
   @brief
-  Wrapper functions for OpenSSL and YaSSL. Also provides a Compatibility layer
-  to make available YaSSL's MD5 implementation.
+  Wrapper functions for OpenSSL.
 */
 
 #include <my_global.h>
 #include <my_md5.h>
 
-#if defined(HAVE_YASSL)
-#include "my_config.h"
-#include "md5.hpp"
-
-static void my_md5_hash(char *digest, const char *buf, int len)
-{
-  TaoCrypt::MD5 hasher;
-  hasher.Update((TaoCrypt::byte *) buf, len);
-  hasher.Final((TaoCrypt::byte *) digest);
-}
-
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/md5.h>
 
 static void my_md5_hash(unsigned char* digest, unsigned const char *buf, int len)
@@ -47,7 +47,7 @@ static void my_md5_hash(unsigned char* digest, unsigned const char *buf, int len
   MD5_Final (digest, &ctx);
 }
 
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 
 /**
     Wrapper function to compute MD5 message digest.
@@ -60,9 +60,7 @@ static void my_md5_hash(unsigned char* digest, unsigned const char *buf, int len
 */
 void compute_md5_hash(char *digest, const char *buf, int len)
 {
-#if defined(HAVE_YASSL)
-  my_md5_hash(digest, buf, len);
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   my_md5_hash((unsigned char*)digest, (unsigned const char*)buf, len);
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 }
diff --git a/mysys_ssl/my_murmur3.cc b/mysys_ssl/my_murmur3.cc
index 82dccb61ef48..7c1cc2084909 100644
--- a/mysys_ssl/my_murmur3.cc
+++ b/mysys_ssl/my_murmur3.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/mysys_ssl/my_rnd.cc b/mysys_ssl/my_rnd.cc
index 19fd37ed4af6..e074f3abb97e 100644
--- a/mysys_ssl/my_rnd.cc
+++ b/mysys_ssl/my_rnd.cc
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,22 +28,14 @@
 
 #include <my_rnd.h>
 
-#if defined(HAVE_YASSL)
-
-#if defined(YASSL_PREFIX)
-#define RAND_bytes yaRAND_bytes
-#endif /* YASSL_PREFIX */
-
-#include <openssl/ssl.h>
-
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/rand.h>
 #include <openssl/err.h>
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 
 
 /*
-  A wrapper to use OpenSSL/yaSSL PRNGs.
+  A wrapper to use OpenSSL PRNGs.
 */
 
 #ifdef __cplusplus
@@ -68,12 +72,7 @@ int
 my_rand_buffer(unsigned char *buffer, size_t buffer_size)
 {
   int rc;
-#if defined(HAVE_YASSL) /* YaSSL */
-  rc= yaSSL::RAND_bytes(buffer, buffer_size);
-
-  if (!rc)
-    return 1;
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   rc= RAND_bytes(buffer, buffer_size);
 
   if (!rc)
@@ -89,7 +88,7 @@ my_rand_buffer(unsigned char *buffer, size_t buffer_size)
 
 
 /**
-  Generate a random number using the OpenSSL/yaSSL supplied
+  Generate a random number using the OpenSSL supplied
   random number generator if available.
 
   @param rand_st [INOUT] Structure used for number generation
diff --git a/mysys_ssl/my_sha1.cc b/mysys_ssl/my_sha1.cc
index 5d9d48033b1a..d3a9c47fc988 100644
--- a/mysys_ssl/my_sha1.cc
+++ b/mysys_ssl/my_sha1.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -18,54 +30,13 @@
   @file
 
   @brief
-  Wrapper functions for OpenSSL, YaSSL implementations. Also provides a
-  Compatibility layer to make available YaSSL's SHA1 implementation.
+  Wrapper functions for OpenSSL implementations.
 */
 
 #include <my_global.h>
 #include <sha1.h>
 
-#if defined(HAVE_YASSL)
-#include "sha.hpp"
-
-/**
-  Compute SHA1 message digest using YaSSL.
-
-  @param digest [out]  Computed SHA1 digest
-  @param buf    [in]   Message to be computed
-  @param len    [in]   Length of the message
-
-  @return              void
-*/
-void mysql_sha1_yassl(uint8 *digest, const char *buf, size_t len)
-{
-  TaoCrypt::SHA hasher;
-  hasher.Update((const TaoCrypt::byte *) buf, (TaoCrypt::word32)len);
-  hasher.Final ((TaoCrypt::byte *) digest);
-}
-
-/**
-  Compute SHA1 message digest for two messages in order to
-  emulate sha1(msg1, msg2) using YaSSL.
-
-  @param digest [out]  Computed SHA1 digest
-  @param buf1   [in]   First message
-  @param len1   [in]   Length of first message
-  @param buf2   [in]   Second message
-  @param len2   [in]   Length of second message
-
-  @return              void
-*/
-void mysql_sha1_multi_yassl(uint8 *digest, const char *buf1, int len1,
-                            const char *buf2, int len2)
-{
-  TaoCrypt::SHA hasher;
-  hasher.Update((const TaoCrypt::byte *) buf1, len1);
-  hasher.Update((const TaoCrypt::byte *) buf2, len2);
-  hasher.Final((TaoCrypt::byte *) digest);
-}
-
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/sha.h>
 
 int mysql_sha1_reset(SHA_CTX *context)
@@ -87,7 +58,7 @@ int mysql_sha1_result(SHA_CTX *context,
     return SHA1_Final(Message_Digest, context);
 }
 
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 
 /**
   Wrapper function to compute SHA1 message digest.
@@ -100,15 +71,13 @@ int mysql_sha1_result(SHA_CTX *context,
 */
 void compute_sha1_hash(uint8 *digest, const char *buf, size_t len)
 {
-#if defined(HAVE_YASSL)
-  mysql_sha1_yassl(digest, buf, len);
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   SHA_CTX sha1_context;
 
   mysql_sha1_reset(&sha1_context);
   mysql_sha1_input(&sha1_context, (const uint8 *) buf, len);
   mysql_sha1_result(&sha1_context, digest);
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 }
 
 
@@ -127,15 +96,13 @@ void compute_sha1_hash(uint8 *digest, const char *buf, size_t len)
 void compute_sha1_hash_multi(uint8 *digest, const char *buf1, int len1,
                              const char *buf2, int len2)
 {
-#if defined(HAVE_YASSL)
-  mysql_sha1_multi_yassl(digest, buf1, len1, buf2, len2);
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   SHA_CTX sha1_context;
 
   mysql_sha1_reset(&sha1_context);
   mysql_sha1_input(&sha1_context, (const uint8 *) buf1, len1);
   mysql_sha1_input(&sha1_context, (const uint8 *) buf2, len2);
   mysql_sha1_result(&sha1_context, digest);
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 }
 
diff --git a/mysys_ssl/my_sha2.cc b/mysys_ssl/my_sha2.cc
deleted file mode 100644
index 00200337f088..000000000000
--- a/mysys_ssl/my_sha2.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
-
-
-/**
-  @file
-  A compatibility layer to our built-in SSL implementation, to mimic the
-  oft-used external library, OpenSSL.
-*/
-
-#include <my_global.h>
-#include <sha2.h>
-
-#ifdef HAVE_YASSL
-
-/*
-  If TaoCrypt::SHA512 or ::SHA384 are not defined (but ::SHA256 is), it's
-  probably that neither of config.h's SIZEOF_LONG or SIZEOF_LONG_LONG are
-  64 bits long.  At present, both OpenSSL and YaSSL require 64-bit integers
-  for SHA-512.  (The SIZEOF_* definitions come from autoconf's config.h .)
-*/
-
-#  define GEN_YASSL_SHA2_BRIDGE(size) \
-unsigned char* SHA##size(const unsigned char *input_ptr, size_t input_length, \
-               char unsigned *output_ptr) {                         \
-  TaoCrypt::SHA##size hasher;                                       \
-                                                                    \
-  hasher.Update(input_ptr, input_length);                           \
-  hasher.Final(output_ptr);                                         \
-  return(output_ptr);                                               \
-}
-
-
-/**
-  @fn SHA512
-  @fn SHA384
-  @fn SHA256
-  @fn SHA224
-
-  Instantiate an hash object, fill in the cleartext value, compute the digest,
-  and extract the result from the object.
-  
-  (Generate the functions.  See similar .h code for the prototypes.)
-*/
-#  ifndef OPENSSL_NO_SHA512
-GEN_YASSL_SHA2_BRIDGE(512);
-GEN_YASSL_SHA2_BRIDGE(384);
-#  else
-#    warning Some SHA2 functionality is missing.  See OPENSSL_NO_SHA512.
-#  endif
-GEN_YASSL_SHA2_BRIDGE(256);
-GEN_YASSL_SHA2_BRIDGE(224);
-
-#  undef GEN_YASSL_SHA2_BRIDGE
-
-#endif /* HAVE_YASSL */
diff --git a/packaging/WiX/AdminBackground.jpg b/packaging/WiX/AdminBackground.jpg
index 847dc6cdbede..88db51656566 100644
Binary files a/packaging/WiX/AdminBackground.jpg and b/packaging/WiX/AdminBackground.jpg differ
diff --git a/packaging/WiX/AdminHeader.jpg b/packaging/WiX/AdminHeader.jpg
index 6e2e33d404f0..96da8f155587 100644
Binary files a/packaging/WiX/AdminHeader.jpg and b/packaging/WiX/AdminHeader.jpg differ
diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt
index c2346cf9bc68..e4b499db11d0 100644
--- a/packaging/WiX/CMakeLists.txt
+++ b/packaging/WiX/CMakeLists.txt
@@ -1,100 +1,69 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-IF(NOT WIN32)
-  RETURN()
+# First we look for "wix.exe" using the CMake variable WIX_DIR, second using the
+# environment variable WIX, and then we add "$ENV{USERPROFILE}\\.dotnet\\tools"
+# to the PATH before searching the other default locations
+IF(NOT WIX_DIR AND "$ENV{WIX}")
+  SET(WIX_DIR "$ENV{WIX}")
 ENDIF()
+FIND_PATH(WIX_DIR wix.exe "$ENV{USERPROFILE}\\.dotnet\\tools")
 
-# Need an extra indirection to access ENV(ProgramFiles(x86))
-SET(MYENV "ProgramFiles(x86)")
-
-# Look in various paths for 'heat.exe'
-# Different installations have different layouts.
-# Not really necessary to use V3.8 but keep backward compatibility just in case.
-IF(MSVC_VERSION LESS 1900)
-  FOREACH(path
-      "$ENV{ProgramFiles}/WiX Toolset V3.8"
-      "$ENV{ProgramFiles}/WiX Toolset V3.8/bin"
-      "$ENV{${MYENV}}/WiX Toolset V3.8"
-      "$ENV{${MYENV}}/WiX Toolset V3.8/bin")
-    FIND_PATH(WIX_DIR heat.exe "${path}")
-    MESSAGE(STATUS "WIX_DIR ${WIX_DIR} path ${path}")
-    IF(WIX_DIR)
-      BREAK()
-    ENDIF()
-  ENDFOREACH()
-ELSE()
-  FOREACH(path
-      "$ENV{ProgramFiles}/WiX Toolset V3.10"
-      "$ENV{ProgramFiles}/WiX Toolset V3.10/bin"
-      "$ENV{${MYENV}}/WiX Toolset V3.10"
-      "$ENV{${MYENV}}/WiX Toolset V3.10/bin")
-    FIND_PATH(WIX_DIR heat.exe "${path}")
-    MESSAGE(STATUS "WIX_DIR ${WIX_DIR} path ${path}")
-    IF(WIX_DIR)
-      BREAK()
-    ENDIF()
-  ENDFOREACH()
-ENDIF()
-
-# Finally, look in environment
-IF(NOT WIX_DIR)
-  FIND_PATH(WIX_DIR heat.exe "$ENV{WIX}")
-  MESSAGE(STATUS "WIX_DIR ${WIX_DIR} looked at $ENV{WIX}")
+IF(NOT _WIX_DIR_CHECKED)
+  SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
+  IF(WIX_DIR)
+    MESSAGE(STATUS "WIX_DIR ${WIX_DIR}")
+  ELSE()
+    MESSAGE(STATUS "Cannot find \"wix.exe\", installer project will not be generated")
+  ENDIF()
 ENDIF()
 
 IF(NOT WIX_DIR)
-  IF(NOT _WIX_DIR_CHECKED)
-    SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
-    MESSAGE(STATUS "Cannot find wix 3, installer project will not be generated")
-  ENDIF()
   RETURN()
 ENDIF()
 
-ADD_SUBDIRECTORY(ca)
-
-FIND_PROGRAM(HEAT_EXECUTABLE heat ${WIX_DIR})
-FIND_PROGRAM(CANDLE_EXECUTABLE candle ${WIX_DIR})
-FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR})
+FIND_PROGRAM(WIX_EXECUTABLE wix ${WIX_DIR})
 
 # WiX wants the license text as rtf; if there is no rtf license, 
-# we create a fake one from the plain text COPYING file.
-IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
- SET(COPYING_RTF "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
+# we create a fake one from the plain text LICENSE file.
+IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
+ SET(LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
 ELSE()
-  IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
-    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
-  ELSE()
-    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING")
-  ENDIF()
+  SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE")
   FILE(READ ${LICENSE_FILE} CONTENTS)
   STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}")
   STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}")
-  FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
-  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "${CONTENTS}")
-  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "\n}\n")
-  SET(COPYING_RTF "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf")
+  FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "${CONTENTS}")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "\n}\n")
+  SET(LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf")
 ENDIF()
-# GET_TARGET_PROPERTY(WIXCA_LOCATION wixca LOCATION)
 SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake)
 SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs;${CMAKE_CURRENT_SOURCE_DIR}/custom_ui.wxs")
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(WixWin64 " Win64='yes'")
+  SET(WixWin64 " Bitness='always64'")
 ELSE()
-  SET(WixWin64 " Win64='no'")
+  SET(WixWin64 " Bitness='always32'")
 ENDIF()
 
 IF("${VERSION}" MATCHES "-ndb-")
@@ -111,22 +80,13 @@ IF("${VERSION}" MATCHES "-ndb-")
   MESSAGE(STATUS "DISPLAY_PATCH_VERSION: ${DISPLAY_PATCH_VERSION}")
 ENDIF()
 
-#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
-#  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs)
-
-ADD_CUSTOM_TARGET(
-  configure_mysql_server_extra
-  COMMAND ${CMAKE_COMMAND}
-  -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
-  -DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
-  -DWIXCA_LOCATION=$<TARGET_FILE:wixca>
-  -DMAJOR_VERSION=${MAJOR_VERSION}
-  -DMINOR_VERSION=${MINOR_VERSION}
-  -DWixWin64=${WixWin64}
-  -P ${CMAKE_CURRENT_SOURCE_DIR}/configure_file.cmake
-  )
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
+  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
+  @ONLY)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
   @ONLY)
 
@@ -134,14 +94,25 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio")
  SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_CFG_INTDIR}")
 ENDIF()
 
+# The 'dist' target will create Docs/INFO_SRC, and our top level cmake file does:
+# INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
+# We install only the copy in ${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+IF(DEFINED ENV{PB2WORKDIR})
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
+    ADD_CUSTOM_TARGET(remove_INFO_SRC_from_bs
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC
+      )
+  ENDIF()
+ENDIF()
 
 ADD_CUSTOM_TARGET(
   MSI
   COMMAND set VS_UNICODE_OUTPUT=
   COMMAND ${CMAKE_COMMAND} 
   ${CONFIG_PARAM} 
-  -DWIXCA_LOCATION=$<TARGET_FILE:wixca>
   -P  ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
 )
-ADD_DEPENDENCIES(MSI wixca)
-ADD_DEPENDENCIES(MSI configure_mysql_server_extra)
+
+IF(TARGET remove_INFO_SRC_from_bs)
+  ADD_DEPENDENCIES(MSI remove_INFO_SRC_from_bs)
+ENDIF()
diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake
index f6231e2f6e65..31feef683c9b 100644
--- a/packaging/WiX/CPackWixConfig.cmake
+++ b/packaging/WiX/CPackWixConfig.cmake
@@ -1,25 +1,47 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-SET(CPACK_COMPONENTS_USED 
-    "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts")
+SET(CPACK_COMPONENTS_USED
+  Client
+  DataFiles
+  Development
+  Documentation
+  Info
+  IniFiles
+  Readme
+  Server
+  Server_Scripts
+  SharedLibraries
+  )
 
 IF("${VERSION}" MATCHES "-ndb-")
   MESSAGE(STATUS "This is Cluster build, append additional components")
-  SET(CPACK_COMPONENTS_USED
-    "${CPACK_COMPONENTS_USED};ClusterTools;ClusterDataNode;ClusterManagementServer;ClusterManagementClient;ClusterJ;nodejs")
+  LIST(APPEND CPACK_COMPONENTS_USED
+    ClusterTools
+    ClusterDataNode
+    ClusterManagementServer
+    ClusterManagementClient
+    ClusterJ
+    )
 ENDIF()
 
 # Some components like Embedded are optional
@@ -51,6 +73,9 @@ SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
  # Subfeature "Server" (hidden)
  SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
  SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
+ # Subfeature "Shared libraries" (hidden)
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_HIDDEN 1)
  # Subfeature "Client" 
  SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
  SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
@@ -70,11 +95,6 @@ SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and lib
  SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
  SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
  
- #Subfeature "Shared libraries"
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
-  
  #Subfeature "Embedded"
  SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
  SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
@@ -135,10 +155,4 @@ IF("${VERSION}" MATCHES "-ndb-")
   SET(CPACK_COMPONENT_CLUSTERJ_GROUP "Devel")
   SET(CPACK_COMPONENT_CLUSTERJ_DISPLAY_NAME "ClusterJ Java Connector for Cluster")
   SET(CPACK_COMPONENT_CLUSTERJ_DESCRIPTION "Installs ClusterJ")
-
-  #Subfeature "nodejs"
-  SET(CPACK_COMPONENT_NODEJS_GROUP "Devel")
-  SET(CPACK_COMPONENT_NODEJS_DISPLAY_NAME "nodejs Connector for Cluster")
-  SET(CPACK_COMPONENT_NODEJS_DESCRIPTION "Installs nodejs connector")
 ENDIF()
-
diff --git a/packaging/WiX/MySQLServer.ico b/packaging/WiX/MySQLServer.ico
index a471afcda952..367abffc3e84 100644
Binary files a/packaging/WiX/MySQLServer.ico and b/packaging/WiX/MySQLServer.ico differ
diff --git a/packaging/WiX/ca/CMakeLists.txt b/packaging/WiX/ca/CMakeLists.txt
deleted file mode 100644
index c52079083e4c..000000000000
--- a/packaging/WiX/ca/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(WIX_ARCH "x64")
-ELSE()
-  SET(WIX_ARCH "x86")
-ENDIF()
-
-IF(MSVC_VERSION EQUAL 1900)
-  SET(WIX_MSVC_DIR "VS2015")
-ELSEIF(MSVC_VERSION EQUAL 1800)
-  SET(WIX_MSVC_DIR "VS2013")
-ELSEIF(MSVC_VERSION EQUAL 1600)
-  SET(WIX_MSVC_DIR "VS2010") 
-ELSE()
-  # When next VS is out, add the correct version here
-  MESSAGE(FATAL_ERROR "Unknown VS version")
-ENDIF()
-
-# Installed directory layout
-IF(IS_DIRECTORY ${WIX_DIR}/../SDK/${WIX_MSVC_DIR})
-  SET(WIX_MSVC_DIR "${WIX_DIR}/../SDK/${WIX_MSVC_DIR}")
-  INCLUDE_DIRECTORIES(${WIX_MSVC_DIR}/inc)
-# Unzipped directory layout
-ELSEIF(IS_DIRECTORY ${WIX_DIR}/SDK/${WIX_MSVC_DIR})
-  SET(WIX_MSVC_DIR "${WIX_DIR}/SDK/${WIX_MSVC_DIR}")
-  INCLUDE_DIRECTORIES(${WIX_DIR}/SDK/inc)
-ELSE()
-  MESSAGE(FATAL_ERROR "Cannot find ${WIX_MSVC_DIR} directory")
-ENDIF()
-
-# INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/${WIX_MSVC_DIR}/inc)
-LINK_DIRECTORIES(${WIX_MSVC_DIR}/lib/${WIX_ARCH})
-
-SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def)
-
-MESSAGE(STATUS "Searching for wcautil in ${WIX_MSVC_DIR}/lib/${WIX_ARCH}")
-MESSAGE(STATUS "Searching for dutil in ${WIX_MSVC_DIR}/lib/${WIX_ARCH}")
-
-FIND_LIBRARY(WIX_WCAUTIL_LIBRARY 
-  NAMES wcautil
-  PATHS ${WIX_MSVC_DIR}/lib/${WIX_ARCH})
-
-FIND_LIBRARY(WIX_DUTIL_LIBRARY 
-  NAMES dutil
-  PATHS ${WIX_MSVC_DIR}/lib/${WIX_ARCH})
-
-MESSAGE(STATUS "Found: ${WIX_WCAUTIL_LIBRARY}")
-MESSAGE(STATUS "Found: ${WIX_DUTIL_LIBRARY}")
-
-IF("${VERSION}" MATCHES "-ndb-")
-  MESSAGE(STATUS "This is Cluster build, turning on extra custom actions")
-  ADD_DEFINITIONS(-DCLUSTER_EXTRA_CUSTOM_ACTIONS)
-ENDIF()
-
-ADD_VERSION_INFO(wixca SHARED WIXCA_SOURCES)
-ADD_LIBRARY(wixca SHARED EXCLUDE_FROM_ALL ${WIXCA_SOURCES})
-TARGET_LINK_LIBRARIES(wixca ${WIX_WCAUTIL_LIBRARY} ${WIX_DUTIL_LIBRARY} 
-  msi version )
diff --git a/packaging/WiX/ca/CustomAction.cpp b/packaging/WiX/ca/CustomAction.cpp
deleted file mode 100644
index 6533df860ece..000000000000
--- a/packaging/WiX/ca/CustomAction.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#ifndef UNICODE
-#define UNICODE
-#endif
-
-#include <windows.h>
-#include <winreg.h>
-#include <msi.h>
-#include <msiquery.h>
-#include <wcautil.h>
-#include <string.h>
-#include <strsafe.h>
-#include <direct.h>
-
-/*
- * Search the registry for a service whose ImagePath starts
- * with our install directory. Stop and remove it if requested.
- */
-static TCHAR last_service_name[128];
-int remove_service(TCHAR *installdir, int check_only) {
-	HKEY hKey;
-	int done = 0;
-
-	if(wcslen(installdir) < 3) {
-		WcaLog(LOGMSG_STANDARD, "INSTALLDIR is suspiciously short, better not do anything.");
-		return 0;
-	}
-
-	if(check_only == 0) {
-		WcaLog(LOGMSG_STANDARD, "Determining number of matching services...");
-		int servicecount = remove_service(installdir, 1);
-		if(servicecount <= 0) {
-			WcaLog(LOGMSG_STANDARD, "No services found, not removing anything.");
-			return 0;
-		} else if(servicecount == 1) {
-			TCHAR buf[256];
-			swprintf_s(buf, sizeof(buf), TEXT("There is a service called '%ls' set up to run from this installation. Do you wish me to stop and remove that service?"), last_service_name);
-			int rc = MessageBox(NULL, buf, TEXT("Removing MySQL Server"), MB_ICONQUESTION|MB_YESNOCANCEL|MB_SYSTEMMODAL);
-			if(rc == IDCANCEL) return -1;
-			if(rc != IDYES) return 0;
-		} else if(servicecount > 0) {
-			TCHAR buf[256];
-			swprintf_s(buf, sizeof(buf), TEXT("There appear to be %d services set up to run from this installation. Do you wish me to stop and remove those services?"), servicecount);
-			int rc = MessageBox(NULL, buf, TEXT("Removing MySQL Server"), MB_ICONQUESTION|MB_YESNOCANCEL|MB_SYSTEMMODAL);
-			if(rc == IDCANCEL) return -1;
-			if(rc != IDYES) return 0;
-		}
-	}
-
-	if(check_only == -1) check_only = 0;
-
-	WcaLog(LOGMSG_STANDARD, "Looking for service...");
-	WcaLog(LOGMSG_STANDARD, "INSTALLDIR = %ls", installdir);
-	if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\services"), 0, KEY_READ, &hKey)==ERROR_SUCCESS) {
-		DWORD index = 0;
-		TCHAR keyname[1024];
-		DWORD keylen = sizeof(keyname);
-		FILETIME t;
-		/* Go through all services in the registry */
-		while(RegEnumKeyExW(hKey, index, keyname, &keylen, NULL, NULL, NULL, &t) == ERROR_SUCCESS) {
-			HKEY hServiceKey = 0;
-			TCHAR path[1024];
-			DWORD pathlen = sizeof(path)-1;
-			if (RegOpenKeyExW(hKey, keyname, NULL, KEY_READ, &hServiceKey) == ERROR_SUCCESS) {
-				/* Look at the ImagePath value of each service */
-				if (RegQueryValueExW(hServiceKey, TEXT("ImagePath"), NULL, NULL, (LPBYTE)path, &pathlen) == ERROR_SUCCESS) {
-					path[pathlen] = 0;
-					TCHAR *p = path;
-					if(p[0] == '"') p += 1;
-					/* See if it is similar to our install directory */
-					if(wcsncmp(p, installdir, wcslen(installdir)) == 0) {
-						WcaLog(LOGMSG_STANDARD, "Found service '%ls' with ImagePath '%ls'.", keyname, path);
-						swprintf_s(last_service_name, sizeof(last_service_name), TEXT("%ls"), keyname);
-						/* If we are supposed to stop and remove the service... */
-						if(!check_only) {
-							WcaLog(LOGMSG_STANDARD, "Trying to stop the service.");
-							SC_HANDLE hSCM = NULL; 
-							hSCM = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
-							if(hSCM != NULL) {
-								SC_HANDLE hService = NULL;
-								hService = OpenService(hSCM, keyname, SERVICE_STOP|SERVICE_QUERY_STATUS|DELETE);
-								if(hService != NULL) {
-									WcaLog(LOGMSG_STANDARD, "Waiting for the service to stop...");
-									SERVICE_STATUS status;
-									/* Attempt to stop the service */
-									if(ControlService(hService, SERVICE_CONTROL_STOP, &status)) {
-										/* Now wait until it's stopped */
-										while("it's one big, mean and cruel world out there") {
-											if(!QueryServiceStatus(hService, &status)) break;
-											if(status.dwCurrentState == SERVICE_STOPPED) break;
-											Sleep(1000);
-										}
-										WcaLog(LOGMSG_STANDARD, "Stopped the service.");
-									}
-									/* Mark the service for deletion */
-									DeleteService(hService);
-									CloseServiceHandle(hService);
-								}
-								CloseServiceHandle(hSCM);
-							}
-						}
-						done++;
-					}
-				}
-				RegCloseKey(hServiceKey);
-			}
-			index++;
-			keylen = sizeof(keyname)-1;
-		}
-		RegCloseKey(hKey);
-	} else {
-		WcaLog(LOGMSG_STANDARD, "Can't seem to go through the list of installed services in the registry.");
-	}
-	return done;
-}
-
-#ifdef CLUSTER_EXTRA_CUSTOM_ACTIONS
-UINT RunProcess(TCHAR *AppName, TCHAR *CmdLine, TCHAR * WorkDir)
-{
-    PROCESS_INFORMATION processInformation;
-    STARTUPINFO startupInfo;
-    memset(&processInformation, 0, sizeof(processInformation));
-    memset(&startupInfo, 0, sizeof(startupInfo));
-    startupInfo.cb = sizeof(startupInfo);
-
-    BOOL result;
-	UINT er = ERROR_SUCCESS;
-	
-    TCHAR tempCmdLine[MAX_PATH * 2];  //Needed since CreateProcessW may change the contents of CmdLine
-	
-	wcscpy_s(tempCmdLine, MAX_PATH *2, TEXT("\""));
-	wcscat_s(tempCmdLine, MAX_PATH *2, AppName);
-	wcscat_s(tempCmdLine, MAX_PATH *2, TEXT("\" \""));
-	wcscat_s(tempCmdLine, MAX_PATH *2, CmdLine);
-	wcscat_s(tempCmdLine, MAX_PATH *2, TEXT("\""));
-
-	result = ::CreateProcess(AppName, tempCmdLine, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, WorkDir, &startupInfo, &processInformation);
-
-    if (result == 0)
-    {
-		WcaLog(LOGMSG_STANDARD, "CreateProcess = %ls %ls failed", AppName, CmdLine);
-		er= ERROR_CANT_ACCESS_FILE;
-    }
-    else
-    {
-		WcaLog(LOGMSG_STANDARD, "CreateProcess = %ls %ls waiting to finish", AppName, CmdLine);
-        WaitForSingleObject( processInformation.hProcess, INFINITE );
-        CloseHandle( processInformation.hProcess );
-        CloseHandle( processInformation.hThread );
-		WcaLog(LOGMSG_STANDARD, "CreateProcess = %ls %ls finished", AppName, CmdLine);
-    }
-	
-	return er;
-}
-
-UINT mccPostInstall(MSIHANDLE hInstall) {
-	HRESULT hr = S_OK;
-	UINT er = ERROR_SUCCESS;
-
-	hr = WcaInitialize(hInstall, "MccPostInstall");
-	ExitOnFailure(hr, "Failed to initialize");
-
-	WcaLog(LOGMSG_STANDARD, "Initialized.");
-
-    TCHAR INSTALLDIR[1024];
-    DWORD INSTALLDIR_size = sizeof(INSTALLDIR);
-	TCHAR path[MAX_PATH * 2];
-	TCHAR param[MAX_PATH * 2];
-	
-	if(MsiGetPropertyW(hInstall, TEXT("CustomActionData"), INSTALLDIR, &INSTALLDIR_size) == ERROR_SUCCESS) {
-	
-		WcaLog(LOGMSG_STANDARD, "INSTALLDIR = %ls", INSTALLDIR);
-		
-		// C:\Program Files (x86)\MySQL\MySQL Cluster 7.2\share\mcc
-		wcscpy_s(path, MAX_PATH * 2, INSTALLDIR);
-		wcscat_s(path, MAX_PATH * 2, TEXT("\\share\\mcc\\Python\\python.exe"));
-
-		wcscpy_s(param, MAX_PATH * 2, INSTALLDIR);
-		wcscat_s(param, MAX_PATH * 2, TEXT("\\share\\mcc\\post-install.py"));
-
-		er = RunProcess(path, param, NULL);
-		
-	} else {
-		er = ERROR_CANT_ACCESS_FILE;
-	}
-
-LExit:
-	return WcaFinalize(er);
-}
-#endif
-
-UINT wrap(MSIHANDLE hInstall, char *name, int check_only) {
-	HRESULT hr = S_OK;
-	UINT er = ERROR_SUCCESS;
-
-	hr = WcaInitialize(hInstall, name);
-	ExitOnFailure(hr, "Failed to initialize");
-
-	WcaLog(LOGMSG_STANDARD, "Initialized.");
-
-    TCHAR INSTALLDIR[1024];
-    DWORD INSTALLDIR_size = sizeof(INSTALLDIR);
-	if(MsiGetPropertyW(hInstall, TEXT("CustomActionData"), INSTALLDIR, &INSTALLDIR_size) == ERROR_SUCCESS) {
-		int rc = remove_service(INSTALLDIR, check_only);
-		if(rc < 0) {
-			er = ERROR_CANCELLED;
-		}
-	} else {
-		er = ERROR_CANT_ACCESS_FILE;
-	}
-
-LExit:
-	return WcaFinalize(er);
-}
-
-UINT __stdcall RemoveServiceNoninteractive(MSIHANDLE hInstall)
-{
-	return wrap(hInstall, "RemoveServiceNoninteractive", -1);
-}
-
-UINT __stdcall RemoveService(MSIHANDLE hInstall)
-{
-	return wrap(hInstall, "RemoveService", 0);
-}
-
-UINT __stdcall TestService(MSIHANDLE hInstall)
-{
-	return wrap(hInstall, "TestService", 1);
-}
-
-UINT __stdcall RunPostInstall(MSIHANDLE hInstall)
-{
-#ifdef CLUSTER_EXTRA_CUSTOM_ACTIONS
-	return mccPostInstall(hInstall);
-#else
-	return ERROR_SUCCESS;
-#endif
-}
-
-/* DllMain - Initialize and cleanup WiX custom action utils */
-extern "C" BOOL WINAPI DllMain(
-	__in HINSTANCE hInst,
-	__in ULONG ulReason,
-	__in LPVOID
-	)
-{
-	switch(ulReason)
-	{
-	case DLL_PROCESS_ATTACH:
-		WcaGlobalInitialize(hInst);
-		break;
-
-	case DLL_PROCESS_DETACH:
-		WcaGlobalFinalize();
-		break;
-	}
-
-	return TRUE;
-}
diff --git a/packaging/WiX/ca/CustomAction.def b/packaging/WiX/ca/CustomAction.def
deleted file mode 100644
index 0082df4a2355..000000000000
--- a/packaging/WiX/ca/CustomAction.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY "wixca"
-VERSION 1.0
-
-EXPORTS
-
-RemoveService
-RemoveServiceNoninteractive
-TestService
-RunPostInstall
diff --git a/packaging/WiX/configure_file.cmake b/packaging/WiX/configure_file.cmake
deleted file mode 100644
index 0f76d1b2993a..000000000000
--- a/packaging/WiX/configure_file.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-CONFIGURE_FILE(${INPUT_FILE} ${OUTPUT_FILE})
diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index 60aaa7286bc4..188a48ac0838 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -1,14 +1,21 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -16,8 +23,7 @@
 SET(LINK_STATIC_RUNTIME_LIBRARIES "@LINK_STATIC_RUNTIME_LIBRARIES@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
-SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
+SET(WIX_EXECUTABLE "@WIX_EXECUTABLE@")
 SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
 SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
 SET(VERSION "@VERSION@")
@@ -32,8 +38,7 @@ IF("${VERSION}" MATCHES "-ndb-")
 ENDIF()
 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
 SET(MANUFACTURER "@MANUFACTURER@")
-# SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
-SET(COPYING_RTF "@COPYING_RTF@")
+SET(LICENSE_RTF "@LICENSE_RTF@")
 SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")
 SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")
 SET(PRODUCT_NAME "MySQL Server")
@@ -52,10 +57,6 @@ IF("${VERSION}" MATCHES "-ndb-")
   SET(PRODUCT_DESCRIPTION "MySQL Cluster")
   MESSAGE(STATUS "PRODUCT_DESCRIPTION: ${PRODUCT_DESCRIPTION}")
 
-  MESSAGE(STATUS "Overriding WIXCA_LOCATION ${WIXCA_LOCATION}")
-  SET(WIXCA_LOCATION "@CMAKE_BINARY_DIR@/packaging/WiX/ca/RelWithDebInfo/wixca.dll")
-  MESSAGE(STATUS "WIXCA_LOCATION: ${WIXCA_LOCATION}")
-
   # use codes different from Server codes
   MESSAGE(STATUS "Overriding UPGRADE_ID ${UPGRADE_ID}")
   SET(UPGRADE_ID "847b8aea-26b3-4440-8fc8-fa9b482a2603")
@@ -88,13 +89,11 @@ LIST(APPEND EXCLUDE_FILES
 )
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(Win64 " Win64='yes'")
+  SET(Win64 " Bitness='always64'")
   SET(Platform x64)
-  SET(PlatformProgramFilesFolder ProgramFiles64Folder)
 ELSE()
   SET(Platform x86)
-  SET(PlatformProgramFilesFolder ProgramFilesFolder)
-  SET(Win64 " Win64='no'")
+  SET(Win64 " Bitness='always32'")
 ENDIF()
 
 SET(ENV{VS_UNICODE_OUTPUT})
@@ -221,8 +220,6 @@ ENDFOREACH()
 
 
 IF(CMAKE_INSTALL_CONFIG_NAME)
-  STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" 
-    WIXCA_LOCATION "${WIXCA_LOCATION}")
   SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")
 ENDIF()
 
@@ -399,36 +396,27 @@ SET(CPACK_WIX_INCLUDES
 ENDFOREACH()
 
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
-
-SET(EXTRA_CANDLE_ARGS)
-IF("$ENV{EXTRA_CANDLE_ARGS}")
-	SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
-ENDIF()
-
-SET(EXTRA_LIGHT_ARGS)
-IF("$ENV{EXTRA_LIGHT_ARGS}")
-	SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
-ENDIF()
-
-FILE(REMOVE mysql_server.wixobj)
-EXECUTE_PROCESS(
- COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension  mysql_server.wxs ${EXTRA_CANDLE_ARGS}
- RESULT_VARIABLE CANDLE_RESULT
-)
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
+  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs
+  @ONLY)
 
-IF(CANDLE_RESULT)
-  MESSAGE(FATAL_ERROR "ERROR: can't run candle")
+SET(EXTRA_WIX_ARGS)
+IF("$ENV{EXTRA_WIX_ARGS}")
+  SET(EXTRA_WIX_ARGS "$ENV{EXTRA_WIX_ARGS}")
 ENDIF()
 
 EXECUTE_PROCESS(
- COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
-  mysql_server.wixobj  -out  ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
-  ${EXTRA_LIGHT_ARGS}
- RESULT_VARIABLE LIGHT_RESULT
+  COMMAND ${WIX_EXECUTABLE} build
+  -arch ${Platform}
+  -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext ${EXTRA_WIX_ARGS}
+  -out ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
+  mysql_server.wxs
+  RESULT_VARIABLE WIX_RESULT
+  OUTPUT_VARIABLE WIX_OUTPUT
+  ERROR_VARIABLE WIX_OUTPUT
 )
 
-IF(LIGHT_RESULT)
-  MESSAGE(FATAL_ERROR "ERROR: can't run light")
+IF(WIX_RESULT)
+  MESSAGE(FATAL_ERROR "ERROR: can't run WiX: ${WIX_RESULT} ${WIX_OUTPUT}")
 ENDIF()
diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs
index a0dba4b6d3bc..5217b879d608 100644
--- a/packaging/WiX/custom_ui.wxs
+++ b/packaging/WiX/custom_ui.wxs
@@ -1,62 +1,61 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <!--
-   Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 -->
 
   <UI Id="WixUI_Mondo_Custom">
     <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
       <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        <Publish Event="SpawnDialog" Value="CancelDlg" />
       </Control>
       <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-        <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
-        <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
-	  </Control>	  
+        <Publish Event="NewDialog" Value="LicenseAgreementDlg" Condition="NOT OLDERVERSIONBEINGUPGRADED" />
+        <Publish Event="NewDialog" Value="UpgradeDlg" Condition="OLDERVERSIONBEINGUPGRADED" />
+      </Control>
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2023, Oracle and/or its affiliates." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>
 
     <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
       <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes"  Text="Upgrade">
-        <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-        <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-        <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-        <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-        <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+        <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
+        <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
+        <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
+        <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
+        <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
       </Control>
       <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-      </Control>
-      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
-        <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
-      </Control>
-      <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
-        <Condition Action="show">NOT Installed</Condition>
+        <Publish Event="SpawnDialog" Value="CancelDlg" />
       </Control>
-      <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
-        <Condition Action="show">NOT Installed</Condition>
-      </Control>
-      <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
-      Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
+      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" DefaultCondition="WixUI_InstallMode = &quot;Remove&quot;" />
+      <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)" ShowCondition="NOT Installed" />
+      <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)" ShowCondition="NOT Installed" />
+      <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes" Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade." />
       <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
       <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -65,6 +64,7 @@
     <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
     <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
     <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+    <TextStyle Id="WixUI_Font_Title2" FaceName="Tahoma" Size="13" />
 
     <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
     <Property Id="WixUI_Mode" Value="Mondo" />
@@ -78,36 +78,36 @@
     <DialogRef Id="ResumeDlg" />
     <DialogRef Id="UserExit" />
 
-    <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+    <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
+
+    <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg" />
+    <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="LicenseAccepted = &quot;1&quot;" />
 
-    <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
-    <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
+    <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" />
+    <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg" />
+    <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg" />
+    <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg" />
 
-    <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1" Condition="WixUI_InstallMode = &quot;Change&quot;" />
+    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
+    <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
 
-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
-    <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="WixUI_InstallMode = &quot;InstallCustom&quot;" />
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2" Condition="WixUI_InstallMode = &quot;InstallTypical&quot; OR WixUI_InstallMode = &quot;InstallComplete&quot;" />
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3" Condition="WixUI_InstallMode = &quot;Change&quot;" />
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4" Condition="WixUI_InstallMode = &quot;Repair&quot; OR WixUI_InstallMode = &quot;Remove&quot;" />
 
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+    <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
 
-    <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+    <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg" />
+    <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
+    <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
+    <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
 
-    <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+    <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg" />
 
-    <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
-	
     <InstallUISequence>
-      <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
+      <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg" Condition="NOT Installed" />
     </InstallUISequence>
   </UI>
 
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in
deleted file mode 100644
index fff3d993a3e4..000000000000
--- a/packaging/WiX/extra.wxs.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--->
-
-</Include>
-
-
-
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index ee5a008455de..ee2d2d115418 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -1,44 +1,47 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
-      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <!--
-   Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 -->
 
-  <Product 
-    Id="*" 
+  <Package
     UpgradeCode="@UPGRADE_CODE@"
     Name="@PRODUCT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@" 
     Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
     Language="1033" 
-    Manufacturer="@MANUFACTURER@">
+    Manufacturer="@MANUFACTURER@"
+    InstallerVersion="200">
     
-    <Package Id='*'
+    <SummaryInformation
        Keywords='Installer'
        Description="@PRODUCT_DESCRIPTION@"
-       Manufacturer='@MANUFACTURER@'
-       InstallerVersion='200'
-       Languages='1033'
-       Compressed='yes'
-       SummaryCodepage='1252'
-       Platform='@Platform@'
-       InstallScope="perMachine"/>
+       Manufacturer='@MANUFACTURER@' />
   
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
+    <Property Id="MYSQL_INSTALLER" Secure="yes" /> 
+    <Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
+
     <!-- Upgrade -->
     <Upgrade Id="@UPGRADE_ID@">
       <?if '@PATCH_VERSION@' != '0'?>
@@ -57,48 +60,40 @@
         OnlyDetect="yes"
         Property="NEWERVERSIONDETECTED" />
     </Upgrade>
-    <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
-      NOT NEWERVERSIONDETECTED OR Installed
-    </Condition>
+    <Launch Condition="NOT NEWERVERSIONDETECTED OR Installed"
+      Message="A later version of [ProductName] is already installed. Setup will now exit." />
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallInitialize"/>
     </InstallExecuteSequence>
 
     <?if "@LINK_STATIC_RUNTIME_LIBRARIES@"="OFF" ?>
       <?if "@Platform@"="x64"?>
-        <Property Id="VS12REDISTX64">
-          <RegistrySearch Id="FindRedistVS12"
-              Win64="no"
+        <Property Id="VS14REDISTX64">
+          <RegistrySearch Id="FindRedistVS14"
+              Bitness="always64"
               Root="HKLM"
-              Key="SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x64"
+              Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
               Name="Version"
               Type="raw" />
         </Property>
-        <Condition Message="This application requires Visual Studio 2013 x64 Redistributable. Please install the Redistributable then run this installer again.">
-          Installed OR VS12REDISTX64
-        </Condition>
+        <Launch Condition="Installed OR VS14REDISTX64" Message="This application requires Visual Studio 2019 x64 Redistributable. Please install the Redistributable then run this installer again." />
       <?elseif "@Platform@"="x86" ?>
-        <Property Id="VS12REDISTX86">
-          <RegistrySearch Id="FindRedistVS12"
-              Win64="no"
+        <Property Id="VS14REDISTX86">
+          <RegistrySearch Id="FindRedistVS14"
+              Bitness="always32"
               Root="HKLM"
-              Key="SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86"
+              Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86"
               Name="Version"
               Type="raw" />
         </Property>
-        <Condition Message="This application requires Visual Studio 2013 x86 Redistributable. Please install the Redistributable then run this installer again.">
-          Installed OR VS12REDISTX86
-        </Condition>
+        <Launch Condition="Installed OR VS14REDISTX86" Message="This application requires Visual Studio 2019 x86 Redistributable. Please install the Redistributable then run this installer again." />
       <?endif?>
     <?endif?> 
  
     <!-- Save/restore install location -->
     <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
     <InstallExecuteSequence>
-      <Custom Action="SaveTargetDir" After="InstallValidate">
-        NOT
-        Installed
-      </Custom>
+      <Custom Action="SaveTargetDir" After="InstallValidate" Condition="NOT Installed" />
     </InstallExecuteSequence>
     <InstallUISequence>
       <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
@@ -116,7 +111,7 @@
     </Property>
     <CustomAction Id="SetInstall"    Property="INSTALLDIR" Value="[GETINSTALLDIR]" />
     <InstallUISequence>
-       <Custom Action="SetInstall"    After="AppSearch">Installed</Custom>
+       <Custom Action="SetInstall"    After="AppSearch" Condition="Installed" />
     </InstallUISequence>
     <Property Id="OLDERVERSION"> 
       <RegistrySearch Id="FindOlderVersion"
@@ -135,9 +130,15 @@
     </Property>
     <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
     <InstallUISequence>
-    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
+      <Custom Action="SetInstallDir2" After="AppSearch" Condition="INSTALLDIR2" /> 
     </InstallUISequence>
-
+   
+    <CustomAction Id="QtRemoveService" BinaryRef="Wix4UtilCA_X86" DllEntry="WixQuietExec"
+            Execute="deferred" Return="ignore" Impersonate="no"/>
+    <InstallExecuteSequence>
+      <Custom Action="QtRemoveService" After="InstallInitialize" Condition="(NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;) AND (NOT MYSQL_INSTALLER=&quot;YES&quot;)" />
+    </InstallExecuteSequence>
+    <SetProperty Before="QtRemoveService" Sequence="execute" Id="QtRemoveService" Value="&quot;cmd.exe&quot; /S /V:ON /C &quot;echo off&amp;set &quot;d=[INSTALLDIR]&quot;&amp;FOR /f &quot;skip=1&quot; %s in ('wmic service where ^'pathname like &quot;%!d:\=\\!%&quot;^' get name ^| findstr /r &quot;^.$&quot;') do ((for /L %k IN (1,1,20) do wmic service where 'name=&quot;%s&quot; and started=&quot;true&quot;' call stopservice | FIND /v &quot;No Instance&quot;&gt;NUL&amp;&amp;timeout /t 5 /nobreak&gt;NUL)&amp;sc delete %s&gt;NUL)&quot;" />
 
     <!-- UI -->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
@@ -162,49 +163,15 @@
     <!-- License -->
     <WixVariable
       Id="WixUILicenseRtf"
-      Value="@COPYING_RTF@"/>
-
-    <!-- How to remove the service on uninstall -->
-    <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
-    <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />
-    <CustomAction Id="RunPostInstallProperty" Property="RunPostInstall" Value="[INSTALLDIR]" Return="check" />
-    <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />
-    <CustomAction Id="UnregisterService"
-                  BinaryKey="wixca.dll"
-                  DllEntry="RemoveService"
-                  Execute="deferred"
-                  Impersonate="no"
-                  Return="check" />
-    <CustomAction Id="UnregisterServiceSilently"
-                  BinaryKey="wixca.dll"
-                  DllEntry="RemoveServiceNoninteractive"
-                  Execute="deferred"
-                  Impersonate="no"
-                  Return="check" />
-    <CustomAction Id="RunPostInstall" 
-                  BinaryKey="wixca.dll"
-                  DllEntry="RunPostInstall" 
-                  Execute="deferred" 
-                  Impersonate="no" 
-                  Return="asyncWait" />
-    <InstallExecuteSequence>
-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>
-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
-      <Custom Action="RunPostInstallProperty" After="InstallFiles">NOT(REMOVE="ALL")</Custom>
-      <Custom Action="RunPostInstall" After="RunPostInstallProperty">NOT(REMOVE="ALL")</Custom>
-    </InstallExecuteSequence>
+      Value="@LICENSE_RTF@"/>
 
     <!-- Installation root-->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='@PlatformProgramFilesFolder@'>
+      <StandardDirectory Id='ProgramFiles6432Folder'>
         <Directory Id='directory.MySQL' Name='MySQL'>
-          <Directory Id='INSTALLDIR' Name='@PRODUCT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@'>		   
+          <Directory Id='INSTALLDIR' Name='@PRODUCT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@'>
           </Directory>
         </Directory>
-      </Directory>
-    </Directory>
+      </StandardDirectory>
 
     <!-- CPACK_WIX_FEATURES -->
     @CPACK_WIX_FEATURES@
@@ -220,6 +187,5 @@
     
     <!--CPACK_WIX_INCLUDES -->
     @CPACK_WIX_INCLUDES@
-  </Product>
-
+  </Package>
 </Wix>
diff --git a/packaging/WiX/mysql_server_extra.wxs.in b/packaging/WiX/mysql_server_extra.wxs.in
index 8730521a5bd4..7419a6a6bdf5 100644
--- a/packaging/WiX/mysql_server_extra.wxs.in
+++ b/packaging/WiX/mysql_server_extra.wxs.in
@@ -1,29 +1,34 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"
+         xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
 
 <!--
-   Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 -->
     <!-- Include shortcuts -->
-    <DirectoryRef Id='INSTALLDIR'>
-    <Directory Id="DesktopFolder"/>
-    <Directory Id="ProgramMenuFolder">
+    <StandardDirectory Id="ProgramMenuFolder">
       <Directory Id="MysqlProgramMenuFolder" Name="MySQL">
         <Directory Id="MysqlProductMenuFolder" Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
-          <Component Id="MysqlProductMenuFolder" Guid="*" @WixWin64@>
+          <Component Id="MysqlProductMenuFolder" @WixWin64@>
             <!-- Include a shortcut to the mysql command line client -->
             <Shortcut Id="MysqlCommandLineShellShortcut"
                       Name="MySQL @MAJOR_VERSION@.@MINOR_VERSION@ Command Line Client"
@@ -44,7 +49,7 @@
             <!-- Write Console settings for applications with this name to the registry -->
               <RegistryKey Root="HKCU" 
                            Key="Console\MySQL @MAJOR_VERSION@.@MINOR_VERSION@ Command Line Client - Unicode"
-                           Action="createAndRemoveOnUninstall">
+                           ForceDeleteOnUninstall="yes">
                 <RegistryValue Type="string" Name="FaceName" Value="Lucida Console"/>
                 <RegistryValue Type="integer" Name="FontWeight" Value="400"/>
               </RegistryKey>
@@ -56,21 +61,20 @@
           </Component>
         </Directory>
       </Directory>
-    </Directory>
-    </DirectoryRef>
+    </StandardDirectory>
     <Feature Id="ProgramMenu" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
     <ComponentRef Id="MysqlProductMenuFolder"/>
     </Feature>    
       
     <!-- Registry -->
     <!-- We still use "MySQL AB" because we don't want to break software that expects it -->
-    <DirectoryRef Id='TARGETDIR'>
-    <Component Id="RegKeys" Guid="*">
+
+    <Component Id="RegKeys" Directory="TARGETDIR">
       <RegistryKey
         Id='MySQLKey'
         Root='HKLM'
         Key='SOFTWARE\MySQL AB\[ProductName]'
-        Action='createAndRemoveOnUninstall'>
+        ForceDeleteOnUninstall='yes'>
         <RegistryValue
           Type='string'
           Name='Location'
@@ -85,7 +89,6 @@
           Value="[DATADIR]"/>
       </RegistryKey>
     </Component>
-    </DirectoryRef>
     <Feature
     Id='RegKeys'
     Display='hidden'
@@ -95,8 +98,6 @@
 
     <!-- Datafiles that installation will copy to CommonAppData (initial database)
     They are declared Permanent and NeverOverwrite since it is user data -->
-    <DirectoryRef Id='TARGETDIR'>
-    <Directory Id="CommonAppDataFolder">
       <Directory Id="datadir.mysql" Name="MySQL">
         <Directory Id="datadir.mysql.mysqlserver"
           Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
@@ -145,8 +146,6 @@
           </Directory>
         </Directory>
       </Directory>
-    </Directory>
-    </DirectoryRef>
 
     <Feature Id='UserEditableDataFiles' 
        Title='Server data files'
diff --git a/packaging/deb-in/CMakeLists.txt b/packaging/deb-in/CMakeLists.txt
index 6ee1b39d78cb..f5138f6df7fe 100644
--- a/packaging/deb-in/CMakeLists.txt
+++ b/packaging/deb-in/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -46,6 +53,7 @@ IF (NOT DEFINED DEB_CHANGELOG_TIMESTAMP)
   )
   SET (DEB_CHANGELOG_TIMESTAMP ${DEB_CHANGELOG_TIMESTAMP} CACHE STRING "")
 ENDIF()
+
 # Commercial or community
 IF (DEB_PRODUCT STREQUAL "commercial")
   SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Commercial Server ${MYSQL_BASE_VERSION}")
@@ -53,7 +61,8 @@ IF (DEB_PRODUCT STREQUAL "commercial")
   SET (DEB_PRODUCTNAMEC "${DEB_BASE_PRODUCTC}Commercial")
   SET (DEB_NOTPRODUCTNAME "${DEB_BASE_PRODUCT}community")
   SET (DEB_LICENSENAME "Advanced")
-  SET (DEB_INSTALL_LICENSEFILE "LICENSE.mysql")
+  SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DWITH_LDAP=${WITH_LDAP}")
+  SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DWITH_SASL=${WITH_SASL}")
   SET (DEB_SERVERVERSION "${DEB_BASE_VERSION}+commercial-1")
   # List of plugins that are only in commercial packages
   # Plugins that are in both community and commercial should NOT be added here
@@ -75,6 +84,7 @@ usr/lib/mysql/plugin/audit_log.so
 usr/lib/mysql/plugin/authentication_pam.so
 usr/lib/mysql/plugin/authentication_ldap_sasl.so
 usr/lib/mysql/plugin/authentication_ldap_simple.so
+usr/lib/mysql/plugin/data_masking.so
 usr/lib/mysql/plugin/keyring_okv.so
 usr/lib/mysql/plugin/keyring_encrypted_file.so
 usr/lib/mysql/plugin/openssl_udf.so
@@ -88,6 +98,7 @@ usr/lib/mysql/plugin/debug/audit_log.so
 usr/lib/mysql/plugin/debug/authentication_pam.so
 usr/lib/mysql/plugin/debug/authentication_ldap_sasl.so
 usr/lib/mysql/plugin/debug/authentication_ldap_simple.so
+usr/lib/mysql/plugin/debug/data_masking.so
 usr/lib/mysql/plugin/debug/keyring_okv.so
 usr/lib/mysql/plugin/debug/keyring_encrypted_file.so
 usr/lib/mysql/plugin/debug/openssl_udf.so
@@ -115,7 +126,6 @@ usr/lib/mysql/plugin/debug/keyring_aws.so
     SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DWITH_CURL=${WITH_CURL}")
   ENDIF()
   SET (DEB_REMOVEPATTERN "gpl.in")
-  SET (DEB_CONTROL_BDEPS_EXTRA ",libldap2-dev, libsasl2-dev")
 ELSE()
   SET (DEB_PRODUCT "${DEB_BASE_PRODUCT}community")
   SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL Server ${MYSQL_BASE_VERSION}")
@@ -123,11 +133,50 @@ ELSE()
   SET (DEB_PRODUCTNAMEC "${DEB_BASE_PRODUCTC}Community")
   SET (DEB_NOTPRODUCTNAME "${DEB_BASE_PRODUCT}commercial")
   SET (DEB_LICENSENAME "GPL")
-  SET (DEB_INSTALL_LICENSEFILE "COPYING")
   SET (DEB_SERVERVERSION "${DEB_BASE_VERSION}-1")
   SET (DEB_REMOVEPATTERN "com.in")
-  SET (DEB_CONTROL_BDEPS_EXTRA "")
 ENDIF()
+SET (DEB_INSTALL_LICENSEFILE "LICENSE")
+
+# Generate debug symbol packages (this is done automatically in Debian9+)
+SET (DEB_RULES_STRIP_DEFAULT
+"
+override_dh_strip:
+	dh_strip -pmysql-${DEB_PRODUCTNAME}-server --dbg-package=mysql-${DEB_PRODUCTNAME}-server-dbgsym
+	dh_strip -pmysql-${DEB_PRODUCTNAME}-client --dbg-package=mysql-${DEB_PRODUCTNAME}-client-dbgsym
+	dh_strip -pmysql-${DEB_PRODUCTNAME}-test --dbg-package=mysql-${DEB_PRODUCTNAME}-test-dbgsym
+	dh_strip -pmysql-server
+	dh_strip -pmysql-client
+	dh_strip -pmysql-testsuite
+	dh_strip -plibmysqlclient20 --dbg-package=libmysqlclient20-dbgsym
+	dh_strip -plibmysqlclient-dev
+")
+SET (DEB_CONTROL_DBGSYM_DEFAULT
+"
+Package: libmysqlclient20-dbgsym
+Architecture: any
+Section: debug
+Depends: libmysqlclient20 (=\${binary:Version}), \${misc:Depends}
+Description: Debugging symbols for client library
+
+Package: mysql-${DEB_PRODUCTNAME}-test-dbgsym
+Architecture: any
+Section: debug
+Depends: mysql-${DEB_PRODUCTNAME}-test (= \${binary:Version}), \${misc:Depends}
+Description: Debugging symbols for test suite
+
+Package: mysql-${DEB_PRODUCTNAME}-server-dbgsym
+Architecture: any
+Section: debug
+Depends: mysql-${DEB_PRODUCTNAME}-server (= \${binary:Version}), \${misc:Depends}
+Description: Debugging symbols for server
+
+Package: mysql-${DEB_PRODUCTNAME}-client-dbgsym
+Architecture: any
+Section: debug
+Depends: mysql-${DEB_PRODUCTNAME}-client (= \${binary:Version}), \${misc:Depends}
+Description: Debugging symbols for client
+")
 
 # Platform specifics. The differences are generally only distro version
 # and whether or not systemd and/or apparmor are available
@@ -144,6 +193,8 @@ IF (DEB_CODENAME STREQUAL "wheezy")
   SET (DEB_INSTALL_SERVER_APPARMOR "")
   SET (DEB_SERVICE_SERVER_EXECPRE "")
   SET (DEB_INIT_APPARMOR "")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
 ELSEIF(DEB_CODENAME STREQUAL "jessie")
   SET (DEB_PLATFORMRELEASE "debian8")
   SET (DEB_CONTROL_BDEPS "dh-systemd")
@@ -159,6 +210,8 @@ ELSEIF(DEB_CODENAME STREQUAL "jessie")
   SET (DEB_SERVICE_SERVER_EXECPRE
     "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
 ELSEIF(DEB_CODENAME STREQUAL "stretch")
   SET (DEB_PLATFORMRELEASE "debian9")
   SET (DEB_CONTROL_BDEPS "dh-systemd")
@@ -174,6 +227,49 @@ ELSEIF(DEB_CODENAME STREQUAL "stretch")
   SET (DEB_SERVICE_SERVER_EXECPRE
     "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
+ELSEIF(DEB_CODENAME STREQUAL "buster")
+  SET (DEB_PLATFORMRELEASE "debian10")
+  SET (DEB_CONTROL_BDEPS ", dh-systemd")
+  SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
+  SET (DEB_RULES_INSTALL_SYSTEMD
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+  SET (DEB_RULES_INSTALL_APPARMOR "")
+  SET (DEB_RULES_APPARMOR_LOAD "")
+  SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
+  SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_APPARMOR "")
+  SET (DEB_SERVICE_SERVER_EXECPRE
+    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+  SET (DEB_INIT_APPARMOR "")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
+  IF (DEFINED WITH_NDBCLUSTER_STORAGE_ENGINE)
+    # Cluster code triggers a lot of new warnings with GCC 7.2
+    SET (DEB_DEBUG_MAINTAINER "-DMYSQL_MAINTAINER_MODE=0")
+  ENDIF()
+ELSEIF(DEB_CODENAME STREQUAL "sid")
+  IF (DEFINED DEB_GCC_SNAPSHOT)
+    SET (DEB_CMAKE_EXTRAS "${DEB_CMAKE_EXTRAS} -DCMAKE_C_COMPILER=/usr/lib/gcc-snapshot/bin/gcc -DCMAKE_CXX_COMPILER=/usr/lib/gcc-snapshot/bin/g++ -DMYSQL_MAINTAINER_MODE=0 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache")
+  ENDIF()
+  SET (DEB_PLATFORMRELEASE "debianunstable")
+  SET (DEB_CONTROL_BDEPS "dh-systemd")
+  SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
+  SET (DEB_RULES_INSTALL_SYSTEMD
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+  SET (DEB_RULES_INSTALL_APPARMOR "")
+  SET (DEB_RULES_APPARMOR_LOAD "")
+  SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
+  SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_APPARMOR "")
+  SET (DEB_SERVICE_SERVER_EXECPRE
+    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+  SET (DEB_INIT_APPARMOR "")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
 ELSEIF(DEB_CODENAME STREQUAL "trusty")
   SET (DEB_PLATFORMRELEASE "ubuntu14.04")
   SET (DEB_CONTROL_BDEPS "dh-apparmor")
@@ -189,6 +285,8 @@ ELSEIF(DEB_CODENAME STREQUAL "trusty")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_SERVICE_SERVER_EXECPRE "")
   SET (DEB_INIT_APPARMOR "/lib/init/apparmor-profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
 ELSEIF(DEB_CODENAME STREQUAL "xenial")
   SET (DEB_PLATFORMRELEASE "ubuntu16.04")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
@@ -206,6 +304,8 @@ ELSEIF(DEB_CODENAME STREQUAL "xenial")
   SET (DEB_SERVICE_SERVER_EXECPRE
     "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
 ELSEIF(DEB_CODENAME STREQUAL "zesty")
   SET (DEB_PLATFORMRELEASE "ubuntu17.04")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
@@ -223,6 +323,8 @@ ELSEIF(DEB_CODENAME STREQUAL "zesty")
   SET (DEB_SERVICE_SERVER_EXECPRE
     "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
 ELSEIF(DEB_CODENAME STREQUAL "artful")
   SET (DEB_PLATFORMRELEASE "ubuntu17.10")
   SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
@@ -240,6 +342,73 @@ ELSEIF(DEB_CODENAME STREQUAL "artful")
   SET (DEB_SERVICE_SERVER_EXECPRE
     "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
   SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM ${DEB_CONTROL_DBGSYM_DEFAULT})
+  SET (DEB_RULES_STRIP ${DEB_RULES_STRIP_DEFAULT})
+ELSEIF(DEB_CODENAME STREQUAL "bionic")
+  SET (DEB_PLATFORMRELEASE "ubuntu18.04")
+  SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
+  SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
+  SET (DEB_RULES_INSTALL_SYSTEMD
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+  SET (DEB_RULES_INSTALL_APPARMOR
+    "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
+  SET (DEB_RULES_APPARMOR_LOAD
+    "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
+  SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
+  SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
+  SET (DEB_SERVICE_SERVER_EXECPRE
+    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+  SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
+ELSEIF(DEB_CODENAME STREQUAL "cosmic")
+  SET (DEB_PLATFORMRELEASE "ubuntu18.10")
+  SET (DEB_CONTROL_BDEPS "dh-apparmor, dh-systemd (>=1.5)")
+  SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
+  SET (DEB_RULES_INSTALL_SYSTEMD
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+  SET (DEB_RULES_INSTALL_APPARMOR
+    "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
+  SET (DEB_RULES_APPARMOR_LOAD
+    "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
+  SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
+  SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
+  SET (DEB_SERVICE_SERVER_EXECPRE
+    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+  SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
+ELSEIF(DEB_CODENAME STREQUAL "disco")
+  SET (DEB_PLATFORMRELEASE "ubuntu19.04")
+  SET (DEB_CONTROL_BDEPS ", dh-apparmor, dh-systemd (>=1.5)")
+  SET (DEB_INSTALL_SOURCE_XZ "../*.tar.xz usr/src/mysql/")
+  SET (DEB_RULES_INSTALL_SYSTEMD
+    "install -m 0755 debian/extra/mysql-systemd-start debian/tmp/usr/share/mysql/")
+  SET (DEB_RULES_INSTALL_APPARMOR
+  "
+	install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld
+  ")
+  SET (DEB_RULES_APPARMOR_LOAD
+  "
+	dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld
+  ")
+  SET (DEB_RULES_SYSTEMD_ENABLE "dh_systemd_enable --name=mysql")
+  SET (DEB_RULES_SYSTEMD_START "dh_systemd_start --restart-after-upgrade")
+  SET (DEB_INSTALL_SERVER_SYSTEMD "usr/share/mysql/mysql-systemd-start")
+  SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")
+  SET (DEB_SERVICE_SERVER_EXECPRE
+    "ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
+  SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
+  SET (DEB_CONTROL_DBGSYM "")
+  SET (DEB_RULES_STRIP "")
+  IF (DEFINED WITH_NDBCLUSTER_STORAGE_ENGINE)
+    # Cluster code triggers a lot of new warnings with GCC 7.2
+    SET (DEB_DEBUG_MAINTAINER "-DMYSQL_MAINTAINER_MODE=0")
+  ENDIF()
 ELSE()
   MESSAGE(STATUS
     "Skipping deb packaging on unsupported platform ${DEB_CODENAME}.")
diff --git a/packaging/deb-in/README b/packaging/deb-in/README
index b20a64f828be..e7d7dc54c5d2 100644
--- a/packaging/deb-in/README
+++ b/packaging/deb-in/README
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/README.Maintainer b/packaging/deb-in/README.Maintainer
index 4b91c8e3f704..5b64337b66f9 100644
--- a/packaging/deb-in/README.Maintainer
+++ b/packaging/deb-in/README.Maintainer
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/control.in b/packaging/deb-in/control.in
index acba1513a5df..5c394581e605 100644
--- a/packaging/deb-in/control.in
+++ b/packaging/deb-in/control.in
@@ -4,7 +4,7 @@ Section: database
 Priority: optional
 Standards-Version: 3.9.6
 Homepage: http://www.mysql.com/
-Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, lsb-release, cmake, fakeroot, libnuma-dev, libmecab-dev, @DEB_CONTROL_BDEPS@ @DEB_CONTROL_BDEPS_EXTRA@
+Build-Depends: debhelper (>= 9.0.0), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), libjson-perl, libldap2-dev, libsasl2-dev, perl, zlib1g-dev (>= 1:1.1.3-5), po-debconf, psmisc, bison, lsb-release, cmake, fakeroot, libnuma-dev, libmecab-dev, ldap-utils, libsasl2-modules-gssapi-mit, @DEB_CONTROL_BDEPS@
 
 
 Package: mysql-server
@@ -202,7 +202,7 @@ Package: mysql-@DEB_PRODUCTNAME@-test
 Architecture: any
 Depends: mysql-@DEB_PRODUCTNAME@-server (= ${binary:Version}),
  mysql-@DEB_PRODUCTNAME@-client (= ${binary:Version}), python,
- libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends}
+ libmysqlclient-dev, libjson-perl, ${shlibs:Depends}, ${misc:Depends}
 Breaks: mysql-@DEB_PRODUCTNAME@-server (<< 5.7.14),
  mysql-@DEB_PRODUCTNAME@-client (<< 5.7.14)
 Conflicts: mysql,
@@ -227,4 +227,5 @@ Description: MySQL source
  as for embedding into mass-deployed software. MySQL is a trademark of
  Oracle.
 
+@DEB_CONTROL_DBGSYM@
 @DEB_NDB_CONTROL_EXTRAS@
diff --git a/packaging/deb-in/copyright.com.in b/packaging/deb-in/copyright.com.in
index ddc639c1506c..f84261eeb186 100644
--- a/packaging/deb-in/copyright.com.in
+++ b/packaging/deb-in/copyright.com.in
@@ -4,61 +4,21 @@ Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
 Source: http://dev.mysql.com/
 
 Files: *
-Copyright: 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2023, Oracle and/or its affiliates.
 License: Commercial
- This is a release of MySQL, a dual-license SQL database server.
- For the avoidance of doubt, this particular copy of the software
- is released under a commercial license and the GNU General Public
- License does not apply. MySQL is brought to you by Oracle.
+ This is a release of MySQL, an SQL database server.
  .
- This distribution may include materials developed by third
- parties. For license and attribution notices for these
- materials, please refer to the documentation that accompanies
- this distribution (see the "Licenses for Third-Party Components"
- appendix) or view the online documentation at
- <http://dev.mysql.com/doc/>.
+ License information can be found in the LICENSE file.
  .
- This software and related documentation are provided under a license
- agreement containing restrictions on use and disclosure and are protected by
- intellectual property laws. Except as expressly permitted in your license
- agreement or allowed by law, you may not use, copy, reproduce, translate,
- broadcast, modify, license, transmit, distribute, exhibit, perform, publish,
- or display any part, in any form, or by any means. Reverse engineering,
- disassembly, or decompilation of this software, unless required by law for
- interoperability, is prohibited.
+ This distribution may include materials developed by third parties.
+ For license and attribution notices for these materials,
+ please refer to the LICENSE file.
  .
- If this software or related documentation is delivered to the U.S.
- Government or anyone licensing it on behalf of the U.S. Government, the
- following notice is applicable:
+ For more information on MySQL, visit 
+ https://docs.oracle.com/cd/E17952_01/mysql-5.7-en/index.html
+ or http://dev.mysql.com/doc/
  .
- U.S. GOVERNMENT RIGHTS Programs, software, databases, and related
- documentation and technical data delivered to U.S. Government customers are
- "commercial computer software" or "commercial technical data" pursuant to
- the applicable Federal Acquisition Regulation and agency-specific
- supplemental regulations. As such, the use, duplication, disclosure,
- modification, and adaptation shall be subject to the restrictions and
- license terms set forth in the applicable Government contract, and, to the
- extent applicable by the terms of the Government contract, the additional
- rights set forth in FAR 52.227-19, Commercial Computer Software License
- (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA
- 94065.
+ For additional downloads of MySQL, visit
+ https://support.oracle.com/
  .
- This software is developed for general use in a variety of information
- management applications. It is not developed or intended for use in any
- inherently dangerous applications, including applications which may create a
- risk of personal injury. If you use this software in dangerous applications,
- then you shall be responsible to take all appropriate fail-safe, backup,
- redundancy, and other measures to ensure the safe use of this software.
- Oracle Corporation and its affiliates disclaim any liability for any damages
- caused by use of this software in dangerous applications.
- .
- Oracle is a registered trademark of Oracle Corporation and/or its
- affiliates. Other names may be trademarks of their respective owners.
- .
- This software and documentation may provide access to or information on
- content, products, and services from third parties. Oracle Corporation and
- its affiliates are not responsible for and expressly disclaim all warranties
- of any kind with respect to third-party content, products, and services.
- Oracle Corporation and its affiliates will not be responsible for any loss,
- costs, or damages incurred due to your access to or use of third-party
- content, products, or services.
+ MySQL is brought to you by the MySQL team at Oracle.
diff --git a/packaging/deb-in/copyright.gpl.in b/packaging/deb-in/copyright.gpl.in
index 50e29be3be65..93381997b5bb 100644
--- a/packaging/deb-in/copyright.gpl.in
+++ b/packaging/deb-in/copyright.gpl.in
@@ -3,39 +3,20 @@ Upstream-Name: @DEB_COPYRIGHT_UPSTREAMNAME@
 Upstream-Contact: MySQL Release Engineering <mysql-build@oss.oracle.com>
 Source: http://dev.mysql.com/
 
-Copyright: 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2023, Oracle and/or its affiliates.
 License:
- This is a release of MySQL, a dual-license SQL database server.
- For the avoidance of doubt, this particular copy of the software
- is released under the version 2 of the GNU General Public License.
- MySQL is brought to you by Oracle.
+ This is a release of MySQL, an SQL database server.
  .
- MySQL FOSS License Exception
- We want free and open source software applications under certain
- licenses to be able to use specified GPL-licensed MySQL client
- libraries despite the fact that not all such FOSS licenses are
- compatible with version 2 of the GNU General Public License.
- Therefore there are special exceptions to the terms and conditions
- of the GPLv2 as applied to these client libraries, which are
- identified and described in more detail in the FOSS License
- Exception at
- <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+ License information can be found in the LICENSE file.
  .
- This distribution may include materials developed by third
- parties. For license and attribution notices for these
- materials, please refer to the documentation that accompanies
- this distribution (see the "Licenses for Third-Party Components"
- appendix) or view the online documentation at
- <http://dev.mysql.com/doc/>.
+ This distribution may include materials developed by third parties.
+ For license and attribution notices for these materials,
+ please refer to the LICENSE file.
  .
- GPLv2 Disclaimer
- For the avoidance of doubt, except that if any license choice
- other than GPL or LGPL is available it will apply instead,
- Oracle elects to use only the General Public License version 2
- (GPLv2) at this time for any software where a choice of GPL
- license versions is made available with the language indicating
- that GPLv2 or any later version may be used, or where a choice
+ For further information on MySQL or additional documentation, visit
+ http://dev.mysql.com/doc/
  .
- The full text of the GNU General Public License version 2 can
- be found in the file
- `/usr/share/mysql/doc/@DEB_INSTALL_LICENSEFILE@'.
+ For additional downloads and the source of MySQL, visit
+ http://dev.mysql.com/downloads/
+ .
+ MySQL is brought to you by the MySQL team at Oracle.
diff --git a/packaging/deb-in/deb_debug.cmake b/packaging/deb-in/deb_debug.cmake
index be648304347f..f1f105bc829c 100644
--- a/packaging/deb-in/deb_debug.cmake
+++ b/packaging/deb-in/deb_debug.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -33,7 +40,7 @@ SET (DEB_RULES_DEBUG_CMAKE
 		-DINSTALL_SUPPORTFILESDIR=share/mysql \\
 		-DSYSCONFDIR=/etc/mysql \\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
-		-DWITH_SSL=bundled \\
+		-DWITH_SSL=system \\
 		-DWITH_INNODB_MEMCACHED=1 \\
 		-DWITH_MECAB=system \\
 		-DWITH_NUMA=ON \\
@@ -121,4 +128,5 @@ usr/lib/mysql/plugin/debug/replication_observers_example_plugin.so
 usr/lib/mysql/plugin/debug/rewrite_example.so
 usr/lib/mysql/plugin/debug/test_security_context.so
 usr/lib/mysql/plugin/debug/test_udf_services.so
+usr/lib/mysql/plugin/debug/udf_example.so
 ")
diff --git a/packaging/deb-in/deb_ndb.cmake b/packaging/deb-in/deb_ndb.cmake
index fe1fee4c5420..e0512ae7a950 100644
--- a/packaging/deb-in/deb_ndb.cmake
+++ b/packaging/deb-in/deb_ndb.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/conf.d/mysql.cnf b/packaging/deb-in/extra/conf.d/mysql.cnf
index 37d11e39c555..b10ffe8de5b0 100644
--- a/packaging/deb-in/extra/conf.d/mysql.cnf
+++ b/packaging/deb-in/extra/conf.d/mysql.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/my.cnf.fallback b/packaging/deb-in/extra/my.cnf.fallback
index 24940f46d238..958fc5826d8b 100644
--- a/packaging/deb-in/extra/my.cnf.fallback
+++ b/packaging/deb-in/extra/my.cnf.fallback
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/mysql-helpers b/packaging/deb-in/extra/mysql-helpers
index 44c23b541eb3..424404b08176 100644
--- a/packaging/deb-in/extra/mysql-helpers
+++ b/packaging/deb-in/extra/mysql-helpers
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/mysql-systemd-start b/packaging/deb-in/extra/mysql-systemd-start
index 8a6ad8493e34..a93f228ee6af 100644
--- a/packaging/deb-in/extra/mysql-systemd-start
+++ b/packaging/deb-in/extra/mysql-systemd-start
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/mysql.cnf b/packaging/deb-in/extra/mysql.cnf
index 7e632f29bb65..7aee2afef12b 100644
--- a/packaging/deb-in/extra/mysql.cnf
+++ b/packaging/deb-in/extra/mysql.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/extra/mysqld.cnf b/packaging/deb-in/extra/mysqld.cnf
index 46f291b70ab0..65ec6e31335f 100644
--- a/packaging/deb-in/extra/mysqld.cnf
+++ b/packaging/deb-in/extra/mysqld.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/libmysqlclient-dev.install.in b/packaging/deb-in/libmysqlclient-dev.install.in
index df8f4bd196ed..56fcf51c024c 100644
--- a/packaging/deb-in/libmysqlclient-dev.install.in
+++ b/packaging/deb-in/libmysqlclient-dev.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/libmysqlclient-dev.lintian-overrides.in b/packaging/deb-in/libmysqlclient-dev.lintian-overrides.in
index a5e535e54a97..14dd7fbd1acb 100644
--- a/packaging/deb-in/libmysqlclient-dev.lintian-overrides.in
+++ b/packaging/deb-in/libmysqlclient-dev.lintian-overrides.in
@@ -1,21 +1,27 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/LICENSE.mysql
-libmysqlclient-dev: extra-license-file usr/share/doc/libmysqlclient-dev/@DEB_INSTALL_LICENSEFILE@.gz
+libmysqlclient-dev: extra-license-file
 libmysqlclient-dev: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 libmysqlclient-dev: embedded-library
diff --git a/packaging/deb-in/libmysqlclient20-dbgsym.install.in b/packaging/deb-in/libmysqlclient20-dbgsym.install.in
new file mode 100644
index 000000000000..eb2bdfc68fc5
--- /dev/null
+++ b/packaging/deb-in/libmysqlclient20-dbgsym.install.in
@@ -0,0 +1,25 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+# legal
+usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/libmysqlclient20-dbgsym/
+usr/share/mysql/README usr/share/doc/libmysqlclient20-dbgsym/
diff --git a/packaging/deb-in/libmysqlclient20.install.in b/packaging/deb-in/libmysqlclient20.install.in
index 4adfcc33ff4c..87deb3113936 100644
--- a/packaging/deb-in/libmysqlclient20.install.in
+++ b/packaging/deb-in/libmysqlclient20.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/libmysqlclient20.lintian-overrides.in b/packaging/deb-in/libmysqlclient20.lintian-overrides.in
index 0755fe0adda9..984797e4711b 100644
--- a/packaging/deb-in/libmysqlclient20.lintian-overrides.in
+++ b/packaging/deb-in/libmysqlclient20.lintian-overrides.in
@@ -1,21 +1,27 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlclient20: extra-license-file usr/share/doc/libmysqlclient20/LICENSE.mysql
-libmysqlclient20: extra-license-file usr/share/doc/libmysqlclient20/@DEB_INSTALL_LICENSEFILE@.gz
+libmysqlclient20: extra-license-file
 libmysqlclient20: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 libmysqlclient20: embedded-library
diff --git a/packaging/deb-in/libmysqld-dev.install.in b/packaging/deb-in/libmysqld-dev.install.in
index 9728ec13e543..ff007f650cd8 100644
--- a/packaging/deb-in/libmysqld-dev.install.in
+++ b/packaging/deb-in/libmysqld-dev.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/libmysqld-dev.lintian-overrides.in b/packaging/deb-in/libmysqld-dev.lintian-overrides.in
index 557a62ec69af..92d110998328 100644
--- a/packaging/deb-in/libmysqld-dev.lintian-overrides.in
+++ b/packaging/deb-in/libmysqld-dev.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/LICENSE.mysql
-libmysqld-dev: extra-license-file usr/share/doc/libmysqld-dev/@DEB_INSTALL_LICENSEFILE@.gz
+libmysqld-dev: extra-license-file
 libmysqld-dev: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-client.install.in b/packaging/deb-in/mysql-client.install.in
index 7be84065f7a3..eb5ebffede06 100644
--- a/packaging/deb-in/mysql-client.install.in
+++ b/packaging/deb-in/mysql-client.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-client.lintian-overrides.in b/packaging/deb-in/mysql-client.lintian-overrides.in
index 2e2b13e56a42..536707828adf 100644
--- a/packaging/deb-in/mysql-client.lintian-overrides.in
+++ b/packaging/deb-in/mysql-client.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-client: extra-license-file usr/share/doc/mysql-client/LICENSE.mysql
-mysql-client: extra-license-file usr/share/doc/mysql-client/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-client: extra-license-file
 mysql-client: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-common.dirs.in b/packaging/deb-in/mysql-common.dirs.in
index b5b8280db1f3..60ef28508490 100644
--- a/packaging/deb-in/mysql-common.dirs.in
+++ b/packaging/deb-in/mysql-common.dirs.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-common.install.in b/packaging/deb-in/mysql-common.install.in
index e4ac71856753..b0ab7f17777e 100644
--- a/packaging/deb-in/mysql-common.install.in
+++ b/packaging/deb-in/mysql-common.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-common.lintian-overrides.in b/packaging/deb-in/mysql-common.lintian-overrides.in
index f0bee937f2bd..a57d801a0bc1 100644
--- a/packaging/deb-in/mysql-common.lintian-overrides.in
+++ b/packaging/deb-in/mysql-common.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-common: extra-license-file usr/share/doc/mysql-common/LICENSE.mysql
-mysql-common: extra-license-file usr/share/doc/mysql-common/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-common: extra-license-file
 mysql-common: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-common.postinst.in b/packaging/deb-in/mysql-common.postinst.in
index 3bf56a5d3c1c..bfefd5934b36 100644
--- a/packaging/deb-in/mysql-common.postinst.in
+++ b/packaging/deb-in/mysql-common.postinst.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-common.postrm.in b/packaging/deb-in/mysql-common.postrm.in
index f79a243935de..fc3790285bc3 100644
--- a/packaging/deb-in/mysql-common.postrm.in
+++ b/packaging/deb-in/mysql-common.postrm.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-auto-installer.install.in b/packaging/deb-in/mysql-packagesource-auto-installer.install.in
index 209dce91161b..77a64fb920e8 100644
--- a/packaging/deb-in/mysql-packagesource-auto-installer.install.in
+++ b/packaging/deb-in/mysql-packagesource-auto-installer.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-client-dbgsym.install.in b/packaging/deb-in/mysql-packagesource-client-dbgsym.install.in
new file mode 100644
index 000000000000..b11c9eb63ff1
--- /dev/null
+++ b/packaging/deb-in/mysql-packagesource-client-dbgsym.install.in
@@ -0,0 +1,26 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+# legal
+usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
+usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-client-dbgsym/
+
diff --git a/packaging/deb-in/mysql-packagesource-client.install.in b/packaging/deb-in/mysql-packagesource-client.install.in
index 4140718e9efc..f9bbb4b52555 100644
--- a/packaging/deb-in/mysql-packagesource-client.install.in
+++ b/packaging/deb-in/mysql-packagesource-client.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-client.lintian-overrides.in b/packaging/deb-in/mysql-packagesource-client.lintian-overrides.in
index 316d861d1bfc..e7cbbc24dcc7 100644
--- a/packaging/deb-in/mysql-packagesource-client.lintian-overrides.in
+++ b/packaging/deb-in/mysql-packagesource-client.lintian-overrides.in
@@ -1,21 +1,27 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-@DEB_PRODUCTNAME@-client: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-client/LICENSE.mysql
-mysql-@DEB_PRODUCTNAME@-client: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-clienti/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-@DEB_PRODUCTNAME@-client: extra-license-file
 mysql-@DEB_PRODUCTNAME@-client: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 mysql-@DEB_PRODUCTNAME@-client: embedded-library
diff --git a/packaging/deb-in/mysql-packagesource-data-node.install.in b/packaging/deb-in/mysql-packagesource-data-node.install.in
index 991b05d53c0d..02be170998b4 100644
--- a/packaging/deb-in/mysql-packagesource-data-node.install.in
+++ b/packaging/deb-in/mysql-packagesource-data-node.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-java.install.in b/packaging/deb-in/mysql-packagesource-java.install.in
index 8f7cea7bdaf7..dd64f40b8ac6 100644
--- a/packaging/deb-in/mysql-packagesource-java.install.in
+++ b/packaging/deb-in/mysql-packagesource-java.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-management-server.install.in b/packaging/deb-in/mysql-packagesource-management-server.install.in
index 3be0e5ceda55..78d47127d4c1 100644
--- a/packaging/deb-in/mysql-packagesource-management-server.install.in
+++ b/packaging/deb-in/mysql-packagesource-management-server.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-memcached.install.in b/packaging/deb-in/mysql-packagesource-memcached.install.in
index a5ffb7af4ee4..a3c37ad6d1f1 100644
--- a/packaging/deb-in/mysql-packagesource-memcached.install.in
+++ b/packaging/deb-in/mysql-packagesource-memcached.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server-dbgsym.install.in b/packaging/deb-in/mysql-packagesource-server-dbgsym.install.in
new file mode 100644
index 000000000000..cbf41b8ffd83
--- /dev/null
+++ b/packaging/deb-in/mysql-packagesource-server-dbgsym.install.in
@@ -0,0 +1,25 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+# legal
+usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-server-dbgsym/
+usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-server-dbgsym/
diff --git a/packaging/deb-in/mysql-packagesource-server.config.in b/packaging/deb-in/mysql-packagesource-server.config.in
index 4e801c93be45..d865d448877b 100644
--- a/packaging/deb-in/mysql-packagesource-server.config.in
+++ b/packaging/deb-in/mysql-packagesource-server.config.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.dirs.in b/packaging/deb-in/mysql-packagesource-server.dirs.in
index de6a09f8bc52..da0648972cbf 100644
--- a/packaging/deb-in/mysql-packagesource-server.dirs.in
+++ b/packaging/deb-in/mysql-packagesource-server.dirs.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.install.in b/packaging/deb-in/mysql-packagesource-server.install.in
index 7e4182f1bc97..07510550eb7d 100644
--- a/packaging/deb-in/mysql-packagesource-server.install.in
+++ b/packaging/deb-in/mysql-packagesource-server.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.lintian-overrides.in b/packaging/deb-in/mysql-packagesource-server.lintian-overrides.in
index 0b321156e99f..40c17bef0bc2 100644
--- a/packaging/deb-in/mysql-packagesource-server.lintian-overrides.in
+++ b/packaging/deb-in/mysql-packagesource-server.lintian-overrides.in
@@ -1,21 +1,27 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-@DEB_PRODUCTNAME@-server: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-server/LICENSE.mysql
-mysql-@DEB_PRODUCTNAME@-server: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-server/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-@DEB_PRODUCTNAME@-server: extra-license-file
 mysql-@DEB_PRODUCTNAME@-server: copyright-should-refer-to-common-license-file-for-lgpl
 # Due to static linking this cannot be avoided and hence being overridden
 mysql-@DEB_PRODUCTNAME@-server: embedded-library
diff --git a/packaging/deb-in/mysql-packagesource-server.mysql.init.in b/packaging/deb-in/mysql-packagesource-server.mysql.init.in
index 0ebb7aead662..4c89c0654521 100644
--- a/packaging/deb-in/mysql-packagesource-server.mysql.init.in
+++ b/packaging/deb-in/mysql-packagesource-server.mysql.init.in
@@ -14,16 +14,23 @@
 ### END INIT INFO
 #
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.mysql.service.in b/packaging/deb-in/mysql-packagesource-server.mysql.service.in
index 8c4678133031..769cb55fb4e7 100644
--- a/packaging/deb-in/mysql-packagesource-server.mysql.service.in
+++ b/packaging/deb-in/mysql-packagesource-server.mysql.service.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.mysql@.service.in b/packaging/deb-in/mysql-packagesource-server.mysql@.service.in
index a46b0c5527b1..2931fc2848b1 100644
--- a/packaging/deb-in/mysql-packagesource-server.mysql@.service.in
+++ b/packaging/deb-in/mysql-packagesource-server.mysql@.service.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.postinst.in b/packaging/deb-in/mysql-packagesource-server.postinst.in
index bbaa8cd7fd62..499dd558e707 100644
--- a/packaging/deb-in/mysql-packagesource-server.postinst.in
+++ b/packaging/deb-in/mysql-packagesource-server.postinst.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.postrm.in b/packaging/deb-in/mysql-packagesource-server.postrm.in
index 77a2dfbb2e90..f1310a5457ad 100644
--- a/packaging/deb-in/mysql-packagesource-server.postrm.in
+++ b/packaging/deb-in/mysql-packagesource-server.postrm.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.preinst.in b/packaging/deb-in/mysql-packagesource-server.preinst.in
index fa5244c2f930..42cedbd4de88 100644
--- a/packaging/deb-in/mysql-packagesource-server.preinst.in
+++ b/packaging/deb-in/mysql-packagesource-server.preinst.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-server.prerm.in b/packaging/deb-in/mysql-packagesource-server.prerm.in
index f38c8e3b9895..cbfd0bd78892 100644
--- a/packaging/deb-in/mysql-packagesource-server.prerm.in
+++ b/packaging/deb-in/mysql-packagesource-server.prerm.in
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-source.install.in b/packaging/deb-in/mysql-packagesource-source.install.in
index 3556b870337d..f59d8ab6cf14 100644
--- a/packaging/deb-in/mysql-packagesource-source.install.in
+++ b/packaging/deb-in/mysql-packagesource-source.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-source.lintian-overrides.in b/packaging/deb-in/mysql-packagesource-source.lintian-overrides.in
index d5c9ec3811f2..b8c26f475be5 100644
--- a/packaging/deb-in/mysql-packagesource-source.lintian-overrides.in
+++ b/packaging/deb-in/mysql-packagesource-source.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-@DEB_PRODUCTNAME@-source: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-source/LICENSE.mysql
-mysql-@DEB_PRODUCTNAME@-source: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-source/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-@DEB_PRODUCTNAME@-source: extra-license-file
 mysql-@DEB_PRODUCTNAME@-source: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-packagesource-test-dbgsym.install.in b/packaging/deb-in/mysql-packagesource-test-dbgsym.install.in
new file mode 100644
index 000000000000..2d7202b383d5
--- /dev/null
+++ b/packaging/deb-in/mysql-packagesource-test-dbgsym.install.in
@@ -0,0 +1,25 @@
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+# legal
+usr/share/mysql/@DEB_INSTALL_LICENSEFILE@ usr/share/doc/mysql-@DEB_PRODUCTNAME@-test-dbgsym/
+usr/share/mysql/README usr/share/doc/mysql-@DEB_PRODUCTNAME@-test-dbgsym/
diff --git a/packaging/deb-in/mysql-packagesource-test.install.in b/packaging/deb-in/mysql-packagesource-test.install.in
index 58ffa177a993..24fee7c91689 100644
--- a/packaging/deb-in/mysql-packagesource-test.install.in
+++ b/packaging/deb-in/mysql-packagesource-test.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -53,6 +60,7 @@ usr/lib/mysql/plugin/replication_observers_example_plugin.so
 usr/lib/mysql/plugin/rewrite_example.so
 usr/lib/mysql/plugin/test_security_context.so
 usr/lib/mysql/plugin/test_udf_services.so
+usr/lib/mysql/plugin/udf_example.so
 @DEB_INSTALL_DEBUG_TEST_PLUGINS@
 # test suite
 usr/lib/mysql-test/*
diff --git a/packaging/deb-in/mysql-packagesource-test.links.in b/packaging/deb-in/mysql-packagesource-test.links.in
index 51a5d94f8810..92d2b666750d 100644
--- a/packaging/deb-in/mysql-packagesource-test.links.in
+++ b/packaging/deb-in/mysql-packagesource-test.links.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-packagesource-test.lintian-overrides.in b/packaging/deb-in/mysql-packagesource-test.lintian-overrides.in
index 7680f39f7db7..3188db6fb4c5 100644
--- a/packaging/deb-in/mysql-packagesource-test.lintian-overrides.in
+++ b/packaging/deb-in/mysql-packagesource-test.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-@DEB_PRODUCTNAME@-test: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-test/LICENSE.mysql
-mysql-@DEB_PRODUCTNAME@-test: extra-license-file usr/share/doc/mysql-@DEB_PRODUCTNAME@-test/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-@DEB_PRODUCTNAME@-test: extra-license-file
 mysql-@DEB_PRODUCTNAME@-test: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-server.install.in b/packaging/deb-in/mysql-server.install.in
index 91416cc978c7..16a27a56c21d 100644
--- a/packaging/deb-in/mysql-server.install.in
+++ b/packaging/deb-in/mysql-server.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-server.lintian-overrides.in b/packaging/deb-in/mysql-server.lintian-overrides.in
index b1ab604f4966..800d0e09ec7a 100644
--- a/packaging/deb-in/mysql-server.lintian-overrides.in
+++ b/packaging/deb-in/mysql-server.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-server: extra-license-file usr/share/doc/mysql-server/LICENSE.mysql
-mysql-server: extra-license-file usr/share/doc/mysql-server/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-server: extra-license-file
 mysql-server: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/mysql-testsuite.install.in b/packaging/deb-in/mysql-testsuite.install.in
index 80d450e394ef..63bf2a78a389 100644
--- a/packaging/deb-in/mysql-testsuite.install.in
+++ b/packaging/deb-in/mysql-testsuite.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/mysql-testsuite.lintian-overrides.in b/packaging/deb-in/mysql-testsuite.lintian-overrides.in
index 66cc13fac135..f45ab90a9185 100644
--- a/packaging/deb-in/mysql-testsuite.lintian-overrides.in
+++ b/packaging/deb-in/mysql-testsuite.lintian-overrides.in
@@ -1,19 +1,25 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/LICENSE.mysql
-mysql-testsuite: extra-license-file usr/share/doc/mysql-testsuite/@DEB_INSTALL_LICENSEFILE@.gz
+mysql-testsuite: extra-license-file
 mysql-testsuite: copyright-should-refer-to-common-license-file-for-lgpl
diff --git a/packaging/deb-in/ndbclient-dev.install.in b/packaging/deb-in/ndbclient-dev.install.in
index 1b521b5337b2..8c4b0ebc5616 100644
--- a/packaging/deb-in/ndbclient-dev.install.in
+++ b/packaging/deb-in/ndbclient-dev.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/ndbclient.install.in b/packaging/deb-in/ndbclient.install.in
index aa017db18644..f695a9639899 100644
--- a/packaging/deb-in/ndbclient.install.in
+++ b/packaging/deb-in/ndbclient.install.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/patches/series b/packaging/deb-in/patches/series
index e8dd7285ace7..4fbacd18843e 100644
--- a/packaging/deb-in/patches/series
+++ b/packaging/deb-in/patches/series
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/deb-in/rules.in b/packaging/deb-in/rules.in
index 614c70b39d9d..808305c0d8d8 100644
--- a/packaging/deb-in/rules.in
+++ b/packaging/deb-in/rules.in
@@ -1,15 +1,22 @@
 #!/usr/bin/make -f
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -44,7 +51,7 @@ override_dh_auto_configure:
 		-DINSTALL_SUPPORTFILESDIR=share/mysql \
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		-DWITH_SSL=bundled \
+		-DWITH_SSL=system \
 		-DWITH_INNODB_MEMCACHED=1 \
 		-DWITH_MECAB=system \
 		-DWITH_NUMA=ON \
@@ -64,8 +71,13 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 	@echo "RULES.$@"
+	export CTEST_OUTPUT_ON_FAILURE=1
+	cd release && \
+	make test || true
 	touch $@
 
+@DEB_RULES_STRIP@
+
 override_dh_auto_install:
 
 	@echo "RULES.$@"
@@ -103,8 +115,4 @@ override_dh_install:
 		-Xusr/share/mysql/README-test \
 		-Xusr/share/mysql/docs/mysql.info \
 		-Xusr/share/man/man1/mysqlman.1 \
-		-Xusr/share/man/man1/mysqltest \
-		-Xusr/share/man/man1/mysql_client_test \
-		-Xusr/share/man/man1/mysql-stress-test.pl.1 \
-		-Xusr/share/man/man1/mysql-test-run.pl.1 \
 		-X.h.pp
diff --git a/packaging/deb-in/source/include-binaries b/packaging/deb-in/source/include-binaries
index c378131f2b0f..b5e74b3753ad 100644
--- a/packaging/deb-in/source/include-binaries
+++ b/packaging/deb-in/source/include-binaries
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -65,6 +72,7 @@ debian/extra/semisync_master-plugin
 debian/extra/semisync_slave-plugin
 debian/extra/test_security_context-plugin
 debian/extra/test_udf_services-plugin
+debian/extra/udf_example-plugin
 debian/extra/validate_password-plugin
 debian/extra/version_token-plugin
 debian/extra/connection_control-plugin
diff --git a/packaging/deb-in/source/lintian-overrides b/packaging/deb-in/source/lintian-overrides
index 479776175af2..a3219ae66afe 100644
--- a/packaging/deb-in/source/lintian-overrides
+++ b/packaging/deb-in/source/lintian-overrides
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/rpm-common/CMakeLists.txt b/packaging/rpm-common/CMakeLists.txt
index ed7461edfc64..acba22b96329 100644
--- a/packaging/rpm-common/CMakeLists.txt
+++ b/packaging/rpm-common/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/packaging/rpm-docker/CMakeLists.txt b/packaging/rpm-docker/CMakeLists.txt
index 85d583be0577..e19073207588 100644
--- a/packaging/rpm-docker/CMakeLists.txt
+++ b/packaging/rpm-docker/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/packaging/rpm-docker/mysql.spec.in b/packaging/rpm-docker/mysql.spec.in
index 34e6294357b6..0229f6841e03 100644
--- a/packaging/rpm-docker/mysql.spec.in
+++ b/packaging/rpm-docker/mysql.spec.in
@@ -1,16 +1,23 @@
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
+# along with this program. If not, write to the
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
 # MA  02110-1301  USA.
 
@@ -32,11 +39,11 @@
 
 %global src_dir               %{src_base}-%{version}
 
+%global license_files_server  %{src_dir}/LICENSE %{src_dir}/README
+
 %if 0%{?commercial}
-%global license_files_server  %{src_dir}/LICENSE.mysql %{src_dir}/README
 %global license_type          Commercial
 %else
-%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
 %global license_type          GPLv2
 %endif
 
@@ -50,7 +57,7 @@ URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-Source1:        http://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source1:        https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  perl
 BuildRequires:  perl(Time::HiRes)
@@ -60,6 +67,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libaio-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  numactl-devel
+BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -192,11 +200,11 @@ for f in innochecksum myisamchk myisam_ftdump myisamlog myisampack \
 done
 
 #  Remove test plugins
-for p in auth.so auth_test_plugin.so authentication_ldap_sasl.so \
-    authentication_ldap_simple.so daemon_example.ini libdaemon_example.so \
+for p in auth.so auth_test_plugin.so \
+    daemon_example.ini libdaemon_example.so \
     qa_auth_client.so qa_auth_interface.so qa_auth_server.so \
     replication_observers_example_plugin.so ha_example.so \
-    test_udf_services.so test_security_context.so ; do
+    test_udf_services.so test_security_context.so udf_example.so ; do
     rm -f %{buildroot}%{_libdir}/mysql/plugin/$p
 done
 
@@ -209,6 +217,7 @@ rm -f %{buildroot}%{_datadir}/mysql/{mysql.server,mysqld_multi.server,mysql-log-
 # Remove files pages we explicitly do not want to package
 rm -rf %{buildroot}%{_infodir}/mysql.info*
 rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
+rm -f %{buildroot}%{_datadir}/mysql/upgrade_firewall.sql
 rm -f %{buildroot}%{_datadir}/mysql/audit_log_filter_win_install.sql
 
 %check
@@ -234,9 +243,7 @@ rm -r $(readlink var) var
     -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
 
 %post -n mysql-%{product_suffix}-server-minimal
-/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
-/bin/chmod 0640 /var/log/mysqld.log >/dev/null 2>&1 || :
-/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || :
+[ -e /var/log/mysqld.log ] || install /dev/null -m0640 -omysql -gmysql /var/log/mysqld.log || :
 
 %files -n mysql-%{product_suffix}-server-minimal
 %defattr(-, root, root, -)
@@ -322,7 +329,10 @@ rm -r $(readlink var) var
 %if 0%{?commercial}
 %attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
 %attr(644, root, root) %{_datadir}/mysql/audit_log_filter_linux_install.sql
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_simple.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/data_masking.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_encrypted_file.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_okv.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
@@ -337,6 +347,9 @@ rm -r $(readlink var) var
 %dir %attr(750, mysql, mysql) /var/lib/mysql-keyring
 
 %changelog
+* Thu Sep 05 2019 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.28-1
+- Add License Book, remove COPYING
+
 * Tue Sep 13 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.16-1
 - Add connection_control.so to server subpackage
 
@@ -700,8 +713,7 @@ rm -r $(readlink var) var
 
 * Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
 
-- Fix some problems with the directives around "tcmalloc" (experimental),
-  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+- remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
 * Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
diff --git a/packaging/rpm-fedora/CMakeLists.txt b/packaging/rpm-fedora/CMakeLists.txt
index c46ef6f0d2de..4dd83509815d 100644
--- a/packaging/rpm-fedora/CMakeLists.txt
+++ b/packaging/rpm-fedora/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/packaging/rpm-fedora/mysql.spec.in b/packaging/rpm-fedora/mysql.spec.in
index 0631dafbfe4a..fb4fcd383ae3 100644
--- a/packaging/rpm-fedora/mysql.spec.in
+++ b/packaging/rpm-fedora/mysql.spec.in
@@ -1,16 +1,23 @@
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
+# along with this program. If not, write to the
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
 # MA  02110-1301  USA.
 
@@ -21,9 +28,17 @@
 %global mysql_vendor Oracle and/or its affiliates
 %global mysqldatadir /var/lib/mysql
 
-# By default, a build will include the bundeled "yaSSL" library for SSL.
+# By default, a build will include the system SSL library.
 %{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
 
+# Pass path to LDAP lib
+%{?with_ldap: %global ldap_option -DWITH_LDAP=%{with_ldap}}
+%{?with_ldap: %global ldap 1}
+
+# Pass path to SASL lib
+%{?with_sasl: %global sasl_option -DWITH_SASL=%{with_sasl}}
+%{?with_sasl: %global sasl 1}
+
 # Regression tests may take a long time, override the default to skip them
 %{!?runselftest:%global runselftest 1}
 
@@ -48,11 +63,11 @@
 %global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
 %endif
 
+%global license_files_server  %{src_dir}/LICENSE %{src_dir}/README
+
 %if 0%{?commercial}
-%global license_files_server  %{src_dir}/LICENSE.mysql %{src_dir}/README
 %global license_type          Commercial
 %else
-%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
 %global license_type          GPLv2
 %endif
 
@@ -65,7 +80,7 @@ Version:        @MYSQL_NO_DASH_VERSION@
 Release:        1%{?dist}
 License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-Source1:        http://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source1:        https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 %if 0%{?compatlib}
 Source2:        %{compatsrc}
 %endif
@@ -74,9 +89,38 @@ Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
 BuildRequires:  cmake
 BuildRequires:  perl
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(English)
+BuildRequires:  perl(Errno)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Fcntl)
+BuildRequires:  perl(File::Basename)
+BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(IO::File)
+BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(IO::Pipe)
+BuildRequires:  perl(IO::Select)
+BuildRequires:  perl(IO::Socket)
+BuildRequires:  perl(IO::Socket::INET)
+BuildRequires:  perl(JSON)
+BuildRequires:  perl(Memoize)
+BuildRequires:  perl(POSIX)
+BuildRequires:  perl(Sys::Hostname)
+BuildRequires:  perl(Time::HiRes)
+BuildRequires:  perl(Time::localtime)
 %if 0%{?fedora} > 24
 BuildRequires:  perl-generators
 %endif
+BuildRequires:  openssl-devel
 BuildRequires:  time
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libaio-devel
@@ -84,7 +128,7 @@ BuildRequires:  mecab-devel
 BuildRequires:  multilib-rpm-config
 BuildRequires:  ncurses-devel
 BuildRequires:  numactl-devel
-BuildRequires:  openssl-devel
+BuildRequires:  openldap-devel
 BuildRequires:  zlib-devel
 BuildRequires:  systemd
 BuildRequires:  pkgconfig(systemd)
@@ -132,7 +176,14 @@ Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 Obsoletes:      mysql-community-bench < 5.7.8
 Obsoletes:      community-mysql-bench
 Obsoletes:      mysql-bench
+Obsoletes:      mariadb-backup
 Obsoletes:      mariadb-bench
+Obsoletes:      mariadb-connector-c-config
+Obsoletes:      mariadb-cracklib-password-check
+Obsoletes:      mariadb-gssapi-server
+Obsoletes:      mariadb-rocksdb-engine
+Obsoletes:      mariadb-sphinx-engine
+Obsoletes:      mariadb-tokudb-engine
 Obsoletes:      mariadb-server
 Obsoletes:      mariadb-server-utils
 Obsoletes:      mariadb-galera-server
@@ -217,6 +268,34 @@ MySQL database server, and MySQL embedded server.
 %package        test
 Summary:        Test suite for the MySQL database server
 Group:          Applications/Databases
+Requires:       perl(Carp)
+Requires:       perl(Config)
+Requires:       perl(Cwd)
+Requires:       perl(Data::Dumper)
+Requires:       perl(English)
+Requires:       perl(Errno)
+Requires:       perl(Exporter)
+Requires:       perl(Fcntl)
+Requires:       perl(File::Basename)
+Requires:       perl(File::Copy)
+Requires:       perl(File::Find)
+Requires:       perl(File::Path)
+Requires:       perl(File::Spec)
+Requires:       perl(File::Spec::Functions)
+Requires:       perl(File::Temp)
+Requires:       perl(Getopt::Long)
+Requires:       perl(IO::File)
+Requires:       perl(IO::Handle)
+Requires:       perl(IO::Pipe)
+Requires:       perl(IO::Select)
+Requires:       perl(IO::Socket)
+Requires:       perl(IO::Socket::INET)
+Requires:       perl(JSON)
+Requires:       perl(Memoize)
+Requires:       perl(POSIX)
+Requires:       perl(Sys::Hostname)
+Requires:       perl(Time::HiRes)
+Requires:       perl(Time::localtime)
 %if 0%{?commercial}
 Requires:       mysql-commercial-server%{?_isa} >= %{min}
 Obsoletes:      mysql-community-test < %{version}-%{release}
@@ -399,6 +478,8 @@ fi
            -DWITH_EMBEDDED_SERVER=1 \
            -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
            %{?ssl_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
            -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -433,6 +514,8 @@ mkdir debug
            -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
            -DWITH_NUMA=ON \
            %{?ssl_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
            -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
   echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
@@ -515,14 +598,6 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
 rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
 rm -rf %{buildroot}%{_bindir}/mysql_embedded
 
-# Remove obsoleted man pages
-rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
-
 # Remove upcoming man pages, to avoid breakage when they materialize
 # Keep this comment as a placeholder for future cases
 # rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -550,10 +625,7 @@ rm -r $(readlink var) var
     -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
 
 %post server
-datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
-/bin/chmod 0755 "$datadir" >/dev/null 2>&1 || :
-/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
-/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || :
+[ -e /var/log/mysqld.log ] || install -m0640 -omysql -gmysql /dev/null /var/log/mysqld.log >/dev/null 2>&1 || :
 %systemd_post mysqld.service
 /usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
 
@@ -796,6 +868,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_services.so
@@ -826,6 +899,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_services.so
@@ -877,6 +951,15 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Thu Sep 05 2019 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.28-1
+- Add License Book, remove COPYING
+
+* Wed Jan 24 2018 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.23-1
+- Add perl modules for test subpackage
+
+* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.22-1
+- No longer need to remove obsoleted mysqltest man pages
+
 * Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.21-1
 - Remove obsoleted mysqltest man pages
 
@@ -1223,8 +1306,7 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 
 * Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
 
-- Fix some problems with the directives around "tcmalloc" (experimental),
-  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+- remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
 * Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
diff --git a/packaging/rpm-oel/CMakeLists.txt b/packaging/rpm-oel/CMakeLists.txt
index c3aa62726af8..d13cf1e1dec0 100644
--- a/packaging/rpm-oel/CMakeLists.txt
+++ b/packaging/rpm-oel/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/packaging/rpm-oel/mysql.init b/packaging/rpm-oel/mysql.init
index 9e037883cce8..91d9ad4470a9 100644
--- a/packaging/rpm-oel/mysql.init
+++ b/packaging/rpm-oel/mysql.init
@@ -76,7 +76,7 @@ install_validate_password_sql_file () {
 start(){
     [ -x $exec ] || exit 5
     # check to see if it's already running
-    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1)
+    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --enable-cleartext-plugin --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1)
     if [ $? = 0 ]; then
 	# already running, do nothing
 	action $"Starting $prog: " /bin/true
@@ -143,7 +143,7 @@ start(){
 	ret=0
 	TIMEOUT="$STARTTIMEOUT"
 	while [ $TIMEOUT -gt 0 ]; do
-	    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) && break
+	    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --enable-cleartext-plugin --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) && break
 	    echo "$RESPONSE" | grep -q "Access denied for user" && break
 	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
 		echo "MySQL Daemon failed to start."
@@ -175,7 +175,7 @@ stop(){
 	fi
 	MYSQLPID=$(cat "$mypidfile")
 	if [ -n "$MYSQLPID" ]; then
-	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
+	    /bin/su - mysql -s /bin/bash -c "/bin/kill $MYSQLPID" >/dev/null 2>&1
 	    ret=$?
 	    if [ $ret -eq 0 ]; then
 		TIMEOUT="$STOPTIMEOUT"
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index 444f76c6bc03..06a77f14ef32 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -1,16 +1,23 @@
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
+# along with this program. If not, write to the
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
 # MA  02110-1301  USA.
 
@@ -28,13 +35,21 @@
 # Pass --define 'with_cluster 1' to build with cluster support
 %{?with_cluster: %global cluster 1}
 
-# By default, a build will include the bundeled "yaSSL" library for SSL.
+# By default, a build will include the system SSL library.
 %{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
 
 # Pass path to mecab lib
 %{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
 %{?with_mecab: %global mecab 1}
 
+# Pass path to LDAP lib
+%{?with_ldap: %global ldap_option -DWITH_LDAP=%{with_ldap}}
+%{?with_ldap: %global ldap 1}
+
+# Pass path to SASL lib
+%{?with_sasl: %global sasl_option -DWITH_SASL=%{with_sasl}}
+%{?with_sasl: %global sasl 1}
+
 # Pass path to the AWS SDK install
 %{?with_aws_sdk: %global aws_sdk_option -DWITH_AWS_SDK=%{with_aws_sdk}}
 %{?with_aws_sdk: %global aws_sdk 1}
@@ -62,13 +77,13 @@
 %endif
 
 %if 0%{?rhel} == 6
-%global compatver             5.1.72
+%global compatver             5.1.73
 %global compatlib             16
 %global compatsrc             https://cdn.mysql.com/Downloads/MySQL-5.1/mysql-%{compatver}.tar.gz
 %endif
 
 %if 0%{?rhel} == 7
-%global compatver             5.6.37
+%global compatver             5.6.51
 %global compatlib             18
 %global compatsrc             https://cdn.mysql.com/Downloads/MySQL-5.6/mysql-%{compatver}.tar.gz
 %endif
@@ -95,11 +110,11 @@
 %global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
 %endif
 
+%global license_files_server  %{src_dir}/LICENSE %{src_dir}/README
+
 %if 0%{?commercial}
-%global license_files_server  %{src_dir}/LICENSE.mysql %{src_dir}/README
 %global license_type          Commercial
 %else
-%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
 %global license_type          GPLv2
 %endif
 
@@ -118,7 +133,7 @@ Vendor:         %{mysql_vendor}
 %if 0%{?compatlib}
 Source7:        %{compatsrc}
 %endif
-Source10:       http://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source10:       https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 Source90:       filter-provides.sh
 Source91:       filter-requires.sh
 %{?el5:BuildRequires:  cmake28 >= 2.8.2}
@@ -127,8 +142,35 @@ Source91:       filter-requires.sh
 %{?el5:BuildRequires:  gcc44}
 %{?el5:BuildRequires:  gcc44-c++}
 BuildRequires:  perl
-%{?el7:BuildRequires: perl(Time::HiRes)}
 %{?el7:BuildRequires: perl(Env)}
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(English)
+BuildRequires:  perl(Errno)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(Fcntl)
+BuildRequires:  perl(File::Basename)
+BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(IO::File)
+BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(IO::Pipe)
+BuildRequires:  perl(IO::Select)
+BuildRequires:  perl(IO::Socket)
+BuildRequires:  perl(IO::Socket::INET)
+BuildRequires:  perl(JSON)
+BuildRequires:  perl(Memoize)
+BuildRequires:  perl(POSIX)
+BuildRequires:  perl(Sys::Hostname)
+BuildRequires:  perl(Time::HiRes)
+BuildRequires:  perl(Time::localtime)
 BuildRequires:  time
 BuildRequires:  libaio-devel
 BuildRequires:  ncurses-devel
@@ -142,8 +184,12 @@ BuildRequires:  systemd
 BuildRequires:  pkgconfig(systemd)
 %endif
 BuildRequires:  cyrus-sasl-devel
-%if 0%{?commercial}
 BuildRequires:  openldap-devel
+%if 0%{?commercial}
+BuildRequires:  openldap-clients
+%if 0%{?rhel} > 6
+BuildRequires:  cyrus-sasl-scram
+%endif
 %endif
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -300,6 +346,34 @@ MySQL database server, and MySQL embedded server.
 Summary:        Test suite for the MySQL database server
 Group:          Applications/Databases
 Requires:       %{name}-server%{?_isa} >= %{min}
+Requires:       perl(Carp)
+Requires:       perl(Config)
+Requires:       perl(Cwd)
+Requires:       perl(Data::Dumper)
+Requires:       perl(English)
+Requires:       perl(Errno)
+Requires:       perl(Exporter)
+Requires:       perl(Fcntl)
+Requires:       perl(File::Basename)
+Requires:       perl(File::Copy)
+Requires:       perl(File::Find)
+Requires:       perl(File::Path)
+Requires:       perl(File::Spec)
+Requires:       perl(File::Spec::Functions)
+Requires:       perl(File::Temp)
+Requires:       perl(Getopt::Long)
+Requires:       perl(IO::File)
+Requires:       perl(IO::Handle)
+Requires:       perl(IO::Pipe)
+Requires:       perl(IO::Select)
+Requires:       perl(IO::Socket)
+Requires:       perl(IO::Socket::INET)
+Requires:       perl(JSON)
+Requires:       perl(Memoize)
+Requires:       perl(POSIX)
+Requires:       perl(Sys::Hostname)
+Requires:       perl(Time::HiRes)
+Requires:       perl(Time::localtime)
 %if 0%{?commercial}
 Provides:       MySQL-test-advanced%{?_isa} = %{version}-%{release}
 Obsoletes:      MySQL-test-advanced < %{version}-%{release}
@@ -672,7 +746,8 @@ fi
     -DFEATURE_SET="%{feature_set}" \
     -DWITH_EMBEDDED_SERVER=1 \
     -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
-    %{?ssl_option} \
+    -DWITH_SSL=system \
+    -DWITH_ZLIB=system \
     -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
     -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -714,6 +789,8 @@ mkdir debug
 %endif
            %{?ssl_option} \
            %{?mecab_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            %{?aws_sdk_option} \
            %{?curl_lib_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -749,6 +826,8 @@ mkdir release
 %endif
            %{?ssl_option} \
            %{?mecab_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            %{?aws_sdk_option} \
            %{?curl_lib_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -811,17 +890,10 @@ rm -rf %{buildroot}%{_infodir}/mysql.info*
 rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
 rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
 rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql 
+rm -f %{buildroot}%{_datadir}/mysql/upgrade_firewall.sql
 rm -rf %{buildroot}%{_bindir}/mysql_embedded
 rm -f %{buildroot}%{_datadir}/mysql/audit_log_filter_win_install.sql
 
-# Remove obsoleted man pages
-rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
-
 # Remove upcoming man pages, to avoid breakage when they materialize
 # Keep this comment as a placeholder for future cases
 # rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -849,10 +921,7 @@ rm -r $(readlink var) var
     -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
 
 %post server
-datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
-/bin/chmod 0751 "$datadir" >/dev/null 2>&1 || :
-/bin/touch /var/log/mysqld.log >/dev/null 2>&1 || :
-/bin/chown mysql:mysql /var/log/mysqld.log >/dev/null 2>&1 || :
+[ -e /var/log/mysqld.log ] || install -m0640 -omysql -gmysql /dev/null /var/log/mysqld.log >/dev/null 2>&1 || :
 %if 0%{?systemd}
 %systemd_post mysqld.service
 /usr/bin/systemctl enable mysqld >/dev/null 2>&1 || :
@@ -1015,6 +1084,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_simple.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/data_masking.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_okv.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_encrypted_file.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
@@ -1025,6 +1095,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_simple.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/data_masking.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/keyring_okv.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/keyring_encrypted_file.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
@@ -1221,6 +1292,7 @@ fi
 %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_services.so
@@ -1251,6 +1323,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_services.so
@@ -1362,6 +1435,15 @@ fi
 %endif # cluster
 
 %changelog
+* Thu Sep 05 2019 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.28-1
+- Add License Book, remove COPYING
+
+* Wed Jan 24 2018 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.23-1
+- Add perl modules for test subpackage
+
+* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.22-1
+- No longer need to remove obsoleted mysqltest man pages
+
 * Wed Nov 08 2017 Bharathy Satish <bharathy.x.satish@oracle.com> - 5.7.21-1
 - Add keyring_encrypted_file.so plugin
 
@@ -1754,8 +1836,7 @@ fi
 
 * Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
 
-- Fix some problems with the directives around "tcmalloc" (experimental),
-  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+- remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
 * Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
diff --git a/packaging/rpm-sles/CMakeLists.txt b/packaging/rpm-sles/CMakeLists.txt
index 031d3f84c413..32e103150d92 100644
--- a/packaging/rpm-sles/CMakeLists.txt
+++ b/packaging/rpm-sles/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/packaging/rpm-sles/mysql.init b/packaging/rpm-sles/mysql.init
index 8f3f793597e7..da5b2925fbb8 100644
--- a/packaging/rpm-sles/mysql.init
+++ b/packaging/rpm-sles/mysql.init
@@ -1,15 +1,22 @@
 #! /bin/bash
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -121,7 +128,7 @@ pinger () {
     ret=0
     while [ $timer -gt 0 ]; do
         sleep 1
-        mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 && break
+        mysqladmin --no-defaults --enable-cleartext-plugin --socket="$socket" ping >/dev/null 2>&1 && break
 	timer=$(expr $timer - 1)
 
 	# Check if mysqld_safe is still alive, if not there is no hope
@@ -164,7 +171,7 @@ chk_running () {
 }
 
 start () {
-    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --enable-cleartext-plugin --socket="$socket" ping >/dev/null 2>&1 ; then
 	echo -n "Starting service MySQL:"
 	rc_reset ; rc_status -v ; rc_exit
     fi
@@ -199,7 +206,7 @@ stop () {
 
     # We use a signal to avoid having to know the root password
     # Send single kill command and then wait
-    if kill $pid >/dev/null 2>&1; then
+    if su - mysql -s /bin/bash -c "kill $pid" >/dev/null 2>&1; then
 	timer=$STOPTIMEOUT
 	while [ $timer -gt 0 ]; do
             kill -0 $pid >/dev/null 2>&1 || break
@@ -230,9 +237,9 @@ restart () {
 
 reload () {
     ret=0
-    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --enable-cleartext-plugin --socket="$socket" ping >/dev/null 2>&1 ; then
 	pid=$(cat "$pidfile")
-	kill -HUP $pid >/dev/null 2>&1
+	su - mysql -s /bin/bash -c "kill -HUP $pid" >/dev/null 2>&1
 	echo -n "Reloading service MySQL:"
 	rc_reset
     else
@@ -243,7 +250,7 @@ reload () {
 }
 
 condrestart () {
-    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+    if chk_running && mysqladmin --no-defaults --enable-cleartext-plugin --socket="$socket" ping >/dev/null 2>&1 ; then
 	restart
     fi
 }
diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in
index 06cfb6a5ad8c..451880397a41 100644
--- a/packaging/rpm-sles/mysql.spec.in
+++ b/packaging/rpm-sles/mysql.spec.in
@@ -1,16 +1,23 @@
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
+# along with this program. If not, write to the
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
 # MA  02110-1301  USA.
 
@@ -20,13 +27,21 @@
 # Pass --define 'with_cluster 1' to build with cluster support
 %{?with_cluster: %global cluster 1}
 
-# By default, a build will include the bundeled "yaSSL" library for SSL.
+# By default, a build will include the system SSL library.
 %{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
 
 # Pass path to mecab lib
 %{?with_mecab: %global mecab_option -DWITH_MECAB=%{with_mecab}}
 %{?with_mecab: %global mecab 1}
 
+# Pass path to LDAP lib
+%{?with_ldap: %global ldap_option -DWITH_LDAP=%{with_ldap}}
+%{?with_ldap: %global ldap 1}
+
+# Pass path to SASL lib
+%{?with_sasl: %global sasl_option -DWITH_SASL=%{with_sasl}}
+%{?with_sasl: %global sasl 1}
+
 # Pass path to the AWS SDK install
 %{?with_aws_sdk: %global aws_sdk_option -DWITH_AWS_SDK=%{with_aws_sdk}}
 %{?with_aws_sdk: %global aws_sdk 1}
@@ -57,11 +72,11 @@
 %global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
 %endif
 
+%global license_files_server  %{src_dir}/LICENSE %{src_dir}/README
+
 %if 0%{?commercial}
-%global license_files_server  %{src_dir}/LICENSE.mysql %{src_dir}/README
 %global license_type          Commercial
 %else
-%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
 %global license_type          GPLv2
 %endif
 
@@ -91,11 +106,28 @@ Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src
 URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
 Vendor:         %{mysql_vendor}
-Source10:       http://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
+Source10:       https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 Source90:       filter-provides.sh
 Source91:       filter-requires.sh
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  perl
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(File::Basename)
+BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(IO::File)
+BuildRequires:  perl(IO::Select)
+BuildRequires:  perl(IO::Socket)
+BuildRequires:  perl(IO::Socket::INET)
+BuildRequires:  perl(JSON)
+BuildRequires:  perl(Sys::Hostname)
 BuildRequires:  libaio-devel
 BuildRequires:  libnuma-devel
 BuildRequires:  ncurses-devel
@@ -108,8 +140,9 @@ BuildRequires:  pkgconfig(systemd)
 BuildRequires:  systemd-rpm-macros
 %endif
 BuildRequires:  cyrus-sasl-devel
-%if 0%{?commercial}
 BuildRequires:  openldap2-devel
+%if 0%{?commercial}
+BuildRequires:  openldap2-client
 %endif
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -262,6 +295,23 @@ MySQL database server, and MySQL embedded server.
 Summary:        Test suite for the MySQL database server
 Group:          Applications/Databases
 Requires:       %{name}-server >= %{min}
+Requires:       perl(Config)
+Requires:       perl(Cwd)
+Requires:       perl(Data::Dumper)
+Requires:       perl(File::Basename)
+Requires:       perl(File::Copy)
+Requires:       perl(File::Find)
+Requires:       perl(File::Path)
+Requires:       perl(File::Spec)
+Requires:       perl(File::Spec::Functions)
+Requires:       perl(File::Temp)
+Requires:       perl(Getopt::Long)
+Requires:       perl(IO::File)
+Requires:       perl(IO::Select)
+Requires:       perl(IO::Socket)
+Requires:       perl(IO::Socket::INET)
+Requires:       perl(JSON)
+Requires:       perl(Sys::Hostname)
 %if 0%{?commercial}
 Provides:       MySQL-test-advanced = %{version}-%{release}
 Obsoletes:      MySQL-test-advanced < %{version}-%{release}
@@ -538,6 +588,8 @@ mkdir debug
            -DWITH_NUMA=ON \
            %{?ssl_option} \
            %{?mecab_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            %{?aws_sdk_option} \
            %{?curl_lib_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -575,6 +627,8 @@ mkdir release
            -DWITH_NUMA=ON \
            %{?ssl_option} \
            %{?mecab_option} \
+           %{?ldap_option} \
+           %{?sasl_option} \
            %{?aws_sdk_option} \
            %{?curl_lib_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -624,16 +678,9 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
 rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
 rm -rf %{buildroot}%{_bindir}/mysql_embedded
 rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql 
+rm -f %{buildroot}%{_datadir}/mysql/upgrade_firewall.sql
 rm -f %{buildroot}%{_datadir}/mysql/audit_log_filter_win_install.sql
 
-# Remove obsoleted man pages
-rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
-rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
-
 # Remove upcoming man pages, to avoid breakage when they materialize
 # Keep this comment as a placeholder for future cases
 # rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
@@ -672,10 +719,7 @@ rm -r $(readlink var) var
 %endif
 
 %post server
-datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1)
-/bin/chmod 0751 "$datadir"
-/bin/touch /var/log/mysql/mysqld.log
-/bin/chown mysql:mysql /var/log/mysql/mysqld.log >/dev/null 2>&1 || :
+[ -e /var/log/mysqld.log ] || install -m0640 -omysql -gmysql /dev/null /var/log/mysqld.log >/dev/null 2>&1 || :
 %if 0%{?systemd}
 %service_add_post mysql.service
 /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf >/dev/null 2>&1 || :
@@ -837,6 +881,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_simple.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/data_masking.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_okv.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/keyring_encrypted_file.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
@@ -847,6 +892,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_simple.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/data_masking.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/keyring_okv.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/keyring_encrypted_file.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
@@ -1041,6 +1087,7 @@ fi
 %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libtest_services.so
@@ -1071,6 +1118,7 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_services.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/udf_example.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/replication_observers_example_plugin.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_framework.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_services.so
@@ -1167,6 +1215,15 @@ fi
 %endif # cluster
 
 %changelog
+* Thu Sep 05 2019 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.28-1
+- Add License Book, remove COPYING
+
+* Wed Jan 24 2018 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.23-1
+- Add perl modules for test subpackage
+
+* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.22-1
+- No longer need to remove obsoleted mysqltest man pages
+
 * Wed Nov 08 2017 Bharathy Satish <bharathy.x.satish@oracle.com> - 5.7.21-1
 - Add keyring_encrypted_file.so plugin
 
@@ -1553,8 +1610,7 @@ fi
 
 * Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
 
-- Fix some problems with the directives around "tcmalloc" (experimental),
-  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+- remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
 * Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
diff --git a/packaging/solaris/CMakeLists.txt b/packaging/solaris/CMakeLists.txt
index 899847d0f38a..f9448c902d79 100644
--- a/packaging/solaris/CMakeLists.txt
+++ b/packaging/solaris/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/packaging/solaris/postinstall-solaris.sh b/packaging/solaris/postinstall-solaris.sh
index c56df6ad3849..619322c5a9ec 100644
--- a/packaging/solaris/postinstall-solaris.sh
+++ b/packaging/solaris/postinstall-solaris.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 #
-# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/audit_null/CMakeLists.txt b/plugin/audit_null/CMakeLists.txt
index 46b57f91a71e..25ada5248fbf 100644
--- a/plugin/audit_null/CMakeLists.txt
+++ b/plugin/audit_null/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/audit_null/audit_null.c b/plugin/audit_null/audit_null.c
index 6eecb34a1818..3b1075ca31b9 100644
--- a/plugin/audit_null/audit_null.c
+++ b/plugin/audit_null/audit_null.c
@@ -1,14 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -88,6 +94,21 @@ LEX_CSTRING event_names[][6] = {
 
 static volatile int number_of_calls;
 
+/*
+  Plugin has been installed.
+*/
+static my_bool g_plugin_installed= FALSE;
+
+/*
+  Record buffer mutex.
+*/
+static mysql_mutex_t g_record_buffer_mutex;
+
+/*
+  Event recording buffer.
+*/
+static char *g_record_buffer;
+
 #define AUDIT_NULL_VAR(x) static volatile int number_of_calls_ ## x;
 #include "audit_null_variables.h"
 #undef AUDIT_NULL_VAR
@@ -174,6 +195,13 @@ static int audit_null_plugin_init(void *arg MY_ATTRIBUTE((unused)))
     *((int*)var->value) = 0;
   }
 
+  mysql_mutex_init(PSI_NOT_INSTRUMENTED,
+                   &g_record_buffer_mutex,
+                   MY_MUTEX_INIT_FAST);
+
+  g_record_buffer= NULL;
+  g_plugin_installed= TRUE;
+
   return(0);
 }
 
@@ -193,6 +221,17 @@ static int audit_null_plugin_init(void *arg MY_ATTRIBUTE((unused)))
 
 static int audit_null_plugin_deinit(void *arg MY_ATTRIBUTE((unused)))
 {
+  if (g_plugin_installed == TRUE)
+  {
+    my_free((void *)(g_record_buffer));
+
+    g_record_buffer= NULL;
+
+    mysql_mutex_destroy(&g_record_buffer_mutex);
+
+    g_plugin_installed= FALSE;
+  }
+
   return(0);
 }
 
@@ -244,8 +283,8 @@ static LEX_CSTRING get_token(const char **str)
   return ret;
 }
 
-static void add_event(MYSQL_THD thd, const char *var, LEX_CSTRING event,
-                      const char *data, size_t data_length)
+static char *add_event(const char *var, LEX_CSTRING event,
+                       const char *data, size_t data_length)
 {
   LEX_CSTRING str;
   size_t size;
@@ -261,7 +300,7 @@ static void add_event(MYSQL_THD thd, const char *var, LEX_CSTRING event,
 
   buffer[size - (str.length == 0 ? 2 : 1)] = '\0';
 
-  THDVAR(thd, event_record)= buffer;
+  return buffer;
 }
 
 static void process_event_record(MYSQL_THD thd, LEX_CSTRING event_name,
@@ -282,11 +321,22 @@ static void process_event_record(MYSQL_THD thd, LEX_CSTRING event_name,
        a record variable */
 
     const char *buffer= THDVAR(thd, event_record);
+    char *new_buffer= NULL;
 
     /* Add event. */
-    add_event(thd, buffer, event_name, data, data_length);
+    mysql_mutex_lock(&g_record_buffer_mutex);
 
-    my_free((void *)(buffer));
+    /* Only one THD is capable of adding events into the buffer. */
+    if (buffer && (buffer == g_record_buffer))
+    {
+      new_buffer= add_event(buffer, event_name, data, data_length);
+      g_record_buffer= new_buffer;
+      my_free((void *)(buffer));
+    }
+
+    mysql_mutex_unlock(&g_record_buffer_mutex);
+
+    THDVAR(thd, event_record)= new_buffer;
 
     if (!my_charset_latin1.coll->strnncoll(&my_charset_latin1,
                                            (const uchar *)record_begin.str,
@@ -315,11 +365,18 @@ static void process_event_record(MYSQL_THD thd, LEX_CSTRING event_name,
 
     buffer= THDVAR(thd, event_record);
 
-    my_free((void *)(buffer));
+    mysql_mutex_lock(&g_record_buffer_mutex);
+
+    if (buffer == g_record_buffer)
+    {
+      my_free((void *)(buffer));
+
+      g_record_buffer= add_event("", event_name, data, data_length);
 
-    THDVAR(thd, event_record)= 0;
+      THDVAR(thd, event_record)= g_record_buffer;
+    }
 
-    add_event(thd, "", event_name, data, data_length);
+    mysql_mutex_unlock(&g_record_buffer_mutex);
 
     /* Add event. */
 
diff --git a/plugin/audit_null/audit_null_variables.h b/plugin/audit_null/audit_null_variables.h
index 4e43bd1c5138..713ac44da278 100644
--- a/plugin/audit_null/audit_null_variables.h
+++ b/plugin/audit_null/audit_null_variables.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; version 2 of the
-License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/plugin/audit_null/test_security_context.cc b/plugin/audit_null/test_security_context.cc
index 5b89b75f2971..81b8ee85cdb7 100644
--- a/plugin/audit_null/test_security_context.cc
+++ b/plugin/audit_null/test_security_context.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/auth/CMakeLists.txt b/plugin/auth/CMakeLists.txt
index 13904fd47cf8..9bc9276f7bae 100644
--- a/plugin/auth/CMakeLists.txt
+++ b/plugin/auth/CMakeLists.txt
@@ -1,15 +1,21 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 of the
-# License.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/plugin/auth/auth_socket.c b/plugin/auth/auth_socket.c
index 0237614c9745..93f7fe9f7f2d 100644
--- a/plugin/auth/auth_socket.c
+++ b/plugin/auth/auth_socket.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/plugin/auth/dialog.c b/plugin/auth/dialog.c
index 0f4d3714e6fe..11e6b67388ec 100644
--- a/plugin/auth/dialog.c
+++ b/plugin/auth/dialog.c
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/plugin/auth/mysql_no_login.c b/plugin/auth/mysql_no_login.c
index 25ab1eaace3c..d64535c63861 100644
--- a/plugin/auth/mysql_no_login.c
+++ b/plugin/auth/mysql_no_login.c
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/plugin/auth/qa_auth_client.c b/plugin/auth/qa_auth_client.c
index 61260c21caed..8d415ec60745 100644
--- a/plugin/auth/qa_auth_client.c
+++ b/plugin/auth/qa_auth_client.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/plugin/auth/qa_auth_interface.c b/plugin/auth/qa_auth_interface.c
index 7c200ef9ac88..1e1e1b3778a4 100644
--- a/plugin/auth/qa_auth_interface.c
+++ b/plugin/auth/qa_auth_interface.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/plugin/auth/qa_auth_server.c b/plugin/auth/qa_auth_server.c
index f447b4aa238d..674436707fb2 100644
--- a/plugin/auth/qa_auth_server.c
+++ b/plugin/auth/qa_auth_server.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/plugin/auth/test_plugin.c b/plugin/auth/test_plugin.c
index 3b2ad967a64b..4cbe52610c55 100644
--- a/plugin/auth/test_plugin.c
+++ b/plugin/auth/test_plugin.c
@@ -1,15 +1,21 @@
-/*  Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
-    
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+/*  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
     
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-    
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
diff --git a/plugin/connection_control/CMakeLists.txt b/plugin/connection_control/CMakeLists.txt
index bce9ccf218e8..7480f52685b7 100644
--- a/plugin/connection_control/CMakeLists.txt
+++ b/plugin/connection_control/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control.cc b/plugin/connection_control/connection_control.cc
index 47dd5014c3ce..9eed902ad8fb 100644
--- a/plugin/connection_control/connection_control.cc
+++ b/plugin/connection_control/connection_control.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control.h b/plugin/connection_control/connection_control.h
index 638143f18209..471cedc3d332 100644
--- a/plugin/connection_control/connection_control.h
+++ b/plugin/connection_control/connection_control.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control_coordinator.cc b/plugin/connection_control/connection_control_coordinator.cc
index 326d3a58ac4a..4dd924a7771b 100644
--- a/plugin/connection_control/connection_control_coordinator.cc
+++ b/plugin/connection_control/connection_control_coordinator.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -65,7 +72,7 @@ namespace connection_control
     std::vector<opt_connection_control>::iterator sys_vars_it;
     std::vector<stats_connection_control>::iterator status_vars_it;
 
-    DBUG_ASSERT(subscriber != 0);
+    assert(subscriber != 0);
 
     if (status_vars)
     {
@@ -266,7 +273,7 @@ namespace connection_control
           default:
           {
             error= true;
-            DBUG_ASSERT(FALSE);
+            assert(FALSE);
             break;
           }
         }
diff --git a/plugin/connection_control/connection_control_coordinator.h b/plugin/connection_control/connection_control_coordinator.h
index 4509c5a9d7b0..1825b7a0782f 100644
--- a/plugin/connection_control/connection_control_coordinator.h
+++ b/plugin/connection_control/connection_control_coordinator.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control_data.h b/plugin/connection_control/connection_control_data.h
index 137244793033..51b7bb48fed6 100644
--- a/plugin/connection_control/connection_control_data.h
+++ b/plugin/connection_control/connection_control_data.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control_interfaces.h b/plugin/connection_control/connection_control_interfaces.h
index 1faff23b72e4..2c5b6628a77b 100644
--- a/plugin/connection_control/connection_control_interfaces.h
+++ b/plugin/connection_control/connection_control_interfaces.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_control_memory.h b/plugin/connection_control/connection_control_memory.h
index 55a456848ca6..3742605de889 100644
--- a/plugin/connection_control/connection_control_memory.h
+++ b/plugin/connection_control/connection_control_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_delay.cc b/plugin/connection_control/connection_delay.cc
index e2d8663a2507..4b920b1967d4 100644
--- a/plugin/connection_control/connection_delay.cc
+++ b/plugin/connection_control/connection_delay.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -124,7 +131,7 @@ namespace connection_control
     const Connection_event_record * const *entry;
     const Connection_event_record *entry_info;
     entry= reinterpret_cast<const Connection_event_record* const *>(el);
-    DBUG_ASSERT(entry != NULL);
+    assert(entry != NULL);
     entry_info= *entry;
     *length= entry_info->get_length();
     return (const_cast<uchar *>(entry_info->get_userhost()));
@@ -177,7 +184,7 @@ namespace connection_control
     {
       /* We found an entry, so increment the count */
       searched_entry_info= *searched_entry;
-      DBUG_ASSERT(searched_entry_info != NULL);
+      assert(searched_entry_info != NULL);
       searched_entry_info->inc_count();
       lf_hash_search_unpin(pins);
       lf_hash_put_pins(pins);
@@ -236,7 +243,7 @@ namespace connection_control
     if (searched_entry && searched_entry != MY_ERRPTR)
     {
       searched_entry_info= *searched_entry;
-      DBUG_ASSERT(searched_entry_info != NULL);
+      assert(searched_entry_info != NULL);
       int rc= lf_hash_delete(&m_entries, pins, s.c_str(), s.length());
       lf_hash_search_unpin(pins);
       lf_hash_put_pins(pins);
@@ -692,16 +699,9 @@ namespace connection_control
         Successful connection.
         delete entry for given account from the hash
       */
-      if (user_present && m_userhost_hash.remove_entry(userhost))
+      if (user_present)
       {
-        char error_buffer[512];
-        memset(error_buffer, 0, sizeof(error_buffer));
-        my_snprintf(error_buffer, sizeof(error_buffer) - 1,
-                    "Failed to delete connection delay hash entry for acount : %s."
-                    " It might have been deleted already.",
-                    userhost.c_str());
-        error_handler->handle_error(error_buffer);
-        error= true;
+        (void) m_userhost_hash.remove_entry(userhost);
       }
     }
 
@@ -741,7 +741,7 @@ namespace connection_control
       case OPT_FAILED_CONNECTIONS_THRESHOLD:
       {
         int64 new_threshold= *(static_cast<int64 *>(new_value));
-        DBUG_ASSERT(new_threshold >= DISABLE_THRESHOLD);
+        assert(new_threshold >= DISABLE_THRESHOLD);
         set_threshold(new_threshold);
 
         if ((error= coordinator->notify_status_var(&self,
@@ -770,7 +770,7 @@ namespace connection_control
       }
       default:
         /* Should never reach here. */
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
         error_handler->handle_error("Unexpected option type for connection delay.");
     };
     DBUG_RETURN(error);
@@ -787,14 +787,14 @@ namespace connection_control
   Connection_delay_action::init(Connection_event_coordinator_services *coordinator)
   {
     DBUG_ENTER("Connection_delay_action::init");
-    DBUG_ASSERT(coordinator);
+    assert(coordinator);
     bool retval;
     Connection_event_observer *subscriber= this;
     WR_lock wr_lock(m_lock);
     retval= coordinator->register_event_subscriber(&subscriber,
                                                    &m_sys_vars,
                                                    &m_stats_vars);
-    DBUG_ASSERT(!retval);
+    assert(!retval);
     if (retval)
       retval= false;                    /* Make compiler happy */
     DBUG_VOID_RETURN;
diff --git a/plugin/connection_control/connection_delay.h b/plugin/connection_control/connection_delay.h
index 48fc5a07f8b3..8dc6362361ff 100644
--- a/plugin/connection_control/connection_delay.h
+++ b/plugin/connection_control/connection_delay.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/connection_delay_api.h b/plugin/connection_control/connection_delay_api.h
index 81a4b8911418..101dcc392fee 100644
--- a/plugin/connection_control/connection_delay_api.h
+++ b/plugin/connection_control/connection_delay_api.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/security_context_wrapper.cc b/plugin/connection_control/security_context_wrapper.cc
index 8cdfd09429d1..982cb24a744c 100644
--- a/plugin/connection_control/security_context_wrapper.cc
+++ b/plugin/connection_control/security_context_wrapper.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/connection_control/security_context_wrapper.h b/plugin/connection_control/security_context_wrapper.h
index 6261c8ae6ed3..a3e36f3723aa 100644
--- a/plugin/connection_control/security_context_wrapper.h
+++ b/plugin/connection_control/security_context_wrapper.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/daemon_example/CMakeLists.txt b/plugin/daemon_example/CMakeLists.txt
index bc05f54f1fc9..a280cb68b7b5 100644
--- a/plugin/daemon_example/CMakeLists.txt
+++ b/plugin/daemon_example/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc
index 4ea5176eba93..af5d872c7c4e 100644
--- a/plugin/daemon_example/daemon_example.cc
+++ b/plugin/daemon_example/daemon_example.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/fulltext/CMakeLists.txt b/plugin/fulltext/CMakeLists.txt
index a0c88b8ce7e7..d87be743e814 100644
--- a/plugin/fulltext/CMakeLists.txt
+++ b/plugin/fulltext/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/fulltext/example/plugin_example.c b/plugin/fulltext/example/plugin_example.c
index 5052dc9760a6..16557d9c4e58 100644
--- a/plugin/fulltext/example/plugin_example.c
+++ b/plugin/fulltext/example/plugin_example.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/fulltext/mecab.cmake b/plugin/fulltext/mecab.cmake
index a2d5b34ee6d9..c3b8f31b407e 100644
--- a/plugin/fulltext/mecab.cmake
+++ b/plugin/fulltext/mecab.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/fulltext/mecab_parser/mecabrc b/plugin/fulltext/mecab_parser/mecabrc
index 7ef9b847b9d0..78f091b06c33 100644
--- a/plugin/fulltext/mecab_parser/mecabrc
+++ b/plugin/fulltext/mecab_parser/mecabrc
@@ -1,12 +1,20 @@
-; Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 ;
-; This program is free software; you can redistribute it and/or modify it under
-; the terms of the GNU General Public License as published by the Free Software
-; Foundation; version 2 of the License.
+; This program is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License, version 2.0,
+; as published by the Free Software Foundation.
 ;
-; This program is distributed in the hope that it will be useful, but WITHOUT ANY
-; WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-; FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+; This program is also distributed with certain software (including
+; but not limited to OpenSSL) that is licensed under separate terms,
+; as designated in a particular file or component or in included license
+; documentation.  The authors of MySQL hereby grant you an additional
+; permission to link the program and your derivative works with the
+; separately licensed software that they have included with MySQL.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License, version 2.0, for more details.
 ;
 ; You should have received a copy of the GNU General Public License along with this
 ; program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
diff --git a/plugin/fulltext/mecab_parser/plugin_mecab.cc b/plugin/fulltext/mecab_parser/plugin_mecab.cc
index bda96961c861..e3964643c4dd 100644
--- a/plugin/fulltext/mecab_parser/plugin_mecab.cc
+++ b/plugin/fulltext/mecab_parser/plugin_mecab.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015,  Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -136,11 +143,12 @@ mecab_parser_plugin_init(void*)
 		delete mecab_tagger;
 		mecab_tagger = NULL;
 
+		sql_print_error("Mecab: Unsupported dictionary charset %s",
+				mecab_dict->charset);
+
 		delete mecab_model;
 		mecab_model = NULL;
 
-		sql_print_error("Mecab: Unsupported dictionary charset %s",
-				mecab_dict->charset);
 		return(1);
 	} else {
 		sql_print_information("Mecab: Loaded dictionary charset is %s",
@@ -237,7 +245,7 @@ mecab_parse(
 		bool_info->type = FT_TOKEN_RIGHT_PAREN;
 		ret = param->mysql_add_word(param, NULL, 0, bool_info);
 
-		DBUG_ASSERT(bool_info->quot == NULL);
+		assert(bool_info->quot == NULL);
 		bool_info->type = FT_TOKEN_WORD;
 	}
 
@@ -282,7 +290,7 @@ mecab_parser_parse(
 		return(1);
 	}
 
-	DBUG_ASSERT(param->cs->mbminlen == 1);
+	assert(param->cs->mbminlen == 1);
 
 	/* Create mecab lattice for parsing */
 	mecab_lattice = mecab_model->createLattice();
@@ -294,7 +302,7 @@ mecab_parser_parse(
 
 	/* Allocate a new string with '\0' in the end to avoid
 	valgrind error "Invalid read of size 1" in mecab. */
-	DBUG_ASSERT(param->length >= 0);
+	assert(param->length >= 0);
 	int	doc_length = param->length;
 	char*	doc = reinterpret_cast<char*>(malloc(doc_length + 1));
 
diff --git a/plugin/fulltext/ngram_parser/plugin_ngram.cc b/plugin/fulltext/ngram_parser/plugin_ngram.cc
index 27fd46c46d8a..40d37886e9c3 100644
--- a/plugin/fulltext/ngram_parser/plugin_ngram.cc
+++ b/plugin/fulltext/ngram_parser/plugin_ngram.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -47,7 +54,7 @@ ngram_parse(
 	int	ret = 0;
 	bool	is_first = true;
 
-	DBUG_ASSERT(cs->mbminlen == 1);
+	assert(cs->mbminlen == 1);
 
 	start = const_cast<char*>(doc);
 	next = start;
@@ -61,8 +68,12 @@ ngram_parse(
 		if (next + char_len > end || char_len == 0) {
 			break;
 		} else {
-			/* Skip SPACE */
-			if (char_len == 1 && *next == ' ') {
+			/* Skip SPACE or ","/"." etc as they are not words*/
+			int     ctype;
+			cs->cset->ctype(
+                        cs, &ctype, (uchar*) next, (uchar*) end);
+			if (char_len == 1 && (*next == ' '
+			   || !true_word_char(ctype, *next))) {
 				start = next + 1;
 				next = start;
 				n_chars = 0;
@@ -96,8 +107,8 @@ ngram_parse(
 	case MYSQL_FTPARSER_FULL_BOOLEAN_INFO:
 	case MYSQL_FTPARSER_WITH_STOPWORDS:
 		if (n_chars > 0 && is_first) {
-			DBUG_ASSERT(next > start);
-			DBUG_ASSERT(n_chars < ngram_token_size);
+                  assert(next > start);
+                  assert(n_chars < ngram_token_size);
 
 			ret = param->mysql_add_word(
 				param, start, next - start, bool_info);
@@ -161,9 +172,9 @@ ngram_term_convert(
 	int	token_size;
 	int	ret = 0;
 
-	DBUG_ASSERT(bool_info->type == FT_TOKEN_WORD);
-	DBUG_ASSERT(bool_info->quot == NULL);
-	DBUG_ASSERT(cs->mbminlen == 1);
+	assert(bool_info->type == FT_TOKEN_WORD);
+	assert(bool_info->quot == NULL);
+	assert(cs->mbminlen == 1);
 
 	/* Convert rules:
 	1. if term with wildcard and term length is less than ngram_token_size,
@@ -188,7 +199,7 @@ ngram_term_convert(
 		bool_info->type = FT_TOKEN_RIGHT_PAREN;
 		ret = param->mysql_add_word(param, NULL, 0, bool_info);
 
-		DBUG_ASSERT(bool_info->quot == NULL);
+		assert(bool_info->quot == NULL);
 		bool_info->type = FT_TOKEN_WORD;
 	}
 
@@ -240,9 +251,9 @@ ngram_parser_parse(
 						reinterpret_cast<char*>(word.pos),
 						word.len,
 						&bool_info);
-					DBUG_ASSERT(bool_info.quot == NULL);
-					DBUG_ASSERT(bool_info.type
-						== FT_TOKEN_WORD);
+					assert(bool_info.quot == NULL);
+					assert(bool_info.type
+                                               == FT_TOKEN_WORD);
 				}
 			} else {
 				ret = param->mysql_add_word(
diff --git a/plugin/innodb_memcached/CMakeLists.txt b/plugin/innodb_memcached/CMakeLists.txt
index 7b3805bc5210..91aeecf5741d 100644
--- a/plugin/innodb_memcached/CMakeLists.txt
+++ b/plugin/innodb_memcached/CMakeLists.txt
@@ -1,18 +1,85 @@
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 IF(WITH_INNODB_MEMCACHED AND UNIX)
+  MY_CHECK_C_COMPILER_FLAG("-Wdiscarded-qualifiers" HAVE_DISCARDED_QUALIFIERS)
+  IF (HAVE_DISCARDED_QUALIFIERS)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
+  ENDIF()
+  MY_CHECK_C_COMPILER_FLAG("-Wimplicit-fallthrough" HAVE_IMPLICIT_FALLTHROUGH)
+  IF (HAVE_IMPLICIT_FALLTHROUGH)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-fallthrough")
+  ENDIF()
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-sign-compare")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-undef")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-vla")
+
+  MY_CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
+    HAVE_DECLARATION_AFTER_STATEMENT)
+  IF (HAVE_DECLARATION_AFTER_STATEMENT)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-declaration-after-statement")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wduplicate-decl-specifier"
+    HAVE_DUPLICATE_DECL_SPECIFIER)
+  IF(HAVE_DUPLICATE_DECL_SPECIFIER)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-duplicate-decl-specifier")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wint-conversion" HAVE_INT_CONVERSION)
+  IF(HAVE_INT_CONVERSION)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-int-conversion")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wstringop-overflow" HAVE_STRINGOP_OVERFLOW)
+  IF(HAVE_STRINGOP_OVERFLOW)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-stringop-overflow")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION)
+  IF(HAVE_STRINGOP_TRUNCATION)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-stringop-truncation")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wsuggest-attribute=format"
+    HAVE_SUGGEST_ATTRIBUTE_FORMAT)
+  IF(HAVE_SUGGEST_ATTRIBUTE_FORMAT)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-suggest-attribute=format")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wunused-but-set-parameter"
+    HAVE_UNUSED_BUT_SET_PARAMETER)
+  IF(HAVE_UNUSED_BUT_SET_PARAMETER)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-parameter")
+  ENDIF()
+
+  MY_CHECK_C_COMPILER_FLAG("-Wunused-but-set-variable"
+    HAVE_UNUSED_BUT_SET_VARIABLE)
+  IF(HAVE_UNUSED_BUT_SET_VARIABLE)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
+  ENDIF()
+
   ADD_SUBDIRECTORY(daemon_memcached)
   ADD_SUBDIRECTORY(innodb_memcache)
 ENDIF()
diff --git a/plugin/innodb_memcached/daemon_memcached/CMakeLists.txt b/plugin/innodb_memcached/daemon_memcached/CMakeLists.txt
index 89a1543d9ca8..a948de473976 100644
--- a/plugin/innodb_memcached/daemon_memcached/CMakeLists.txt
+++ b/plugin/innodb_memcached/daemon_memcached/CMakeLists.txt
@@ -1,21 +1,27 @@
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Common defines and includes
-INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR}
-		    ${CMAKE_SOURCE_DIR}/include
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
 		    ${CMAKE_SOURCE_DIR}/sql
 		    ${CMAKE_SOURCE_DIR}/bld/include
 		    ${CMAKE_SOURCE_DIR}/regex
@@ -27,6 +33,11 @@ INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR}
 		    ${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/daemon_memcached
 
 		)
+INCLUDE_DIRECTORIES(SYSTEM ${LIBEVENT_INCLUDE_DIRS})
+
+IF(HAVE_LIBEVENT2)
+  ADD_DEFINITIONS("-DHAVE_LIBEVENT2")
+ENDIF()
 
 SET(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS} -I${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/daemon_memcached/utilities")
 
@@ -86,6 +97,6 @@ IF(ENABLE_MEMCACHED_SASL)
 ENDIF()
 
 MYSQL_ADD_PLUGIN(libmemcached ${MEMCACHED_SOURCES}
-                 LINK_LIBRARIES ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES}
+                 LINK_LIBRARIES ${LIBEVENT_LIBRARIES}
                  memcached_utilities ${SASL_LIBRARY}
 		 MODULE_ONLY MODULE_OUTPUT_NAME "libmemcached")
diff --git a/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c b/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
index 91461e1d8487..988281054c28 100644
--- a/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
+++ b/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c
@@ -3,10 +3,10 @@
  *  memcached - memory caching daemon
  *
  *       http://www.danga.com/memcached/
- *  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *  Copyright 2003 Danga Interactive, Inc.  All rights reserved.
  *  This file was modified by Oracle on 28-08-2015 and 23-03-2016.
- *  Modifications copyright (c) 2015, 2016, Oracle and/or its affiliates.
+ *  Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *  All rights reserved.
  *
  *  Use and distribution licensed under the BSD license.  See
@@ -2172,6 +2172,8 @@ static void process_bin_sasl_auth(conn *c) {
     int nkey = c->binary_header.request.keylen;
     int vlen = c->binary_header.request.bodylen - nkey;
 
+    assert(vlen >= 0);
+
     if (nkey > MAX_SASL_MECH_LEN) {
         write_bin_packet(c, PROTOCOL_BINARY_RESPONSE_EINVAL, vlen);
         c->write_and_go = conn_swallow;
@@ -2904,10 +2906,16 @@ static RESPONSE_HANDLER response_handlers[256] = {
 static void dispatch_bin_command(conn *c) {
     int protocol_error = 0;
 
-    int extlen = c->binary_header.request.extlen;
+    uint8_t extlen = c->binary_header.request.extlen;
     uint16_t keylen = c->binary_header.request.keylen;
     uint32_t bodylen = c->binary_header.request.bodylen;
 
+    if (keylen > bodylen || keylen + extlen > bodylen) {
+        write_bin_packet(c, PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND, 0);
+        c->write_and_go = conn_closing;
+        return;
+    }
+
     if (settings.require_sasl && !authenticated(c)) {
         write_bin_packet(c, PROTOCOL_BINARY_RESPONSE_AUTH_ERROR, 0);
         c->write_and_go = conn_closing;
@@ -3240,6 +3248,8 @@ static void process_bin_append_prepend(conn *c) {
     nkey = c->binary_header.request.keylen;
     vlen = c->binary_header.request.bodylen - nkey;
 
+    assert(vlen >= 0);
+
     if (settings.verbose > 1) {
         settings.extensions.logger->log(EXTENSION_LOG_DEBUG, c,
                                         "Value len is %d\n", vlen);
@@ -3583,7 +3593,12 @@ static size_t tokenize_command(char *command, token_t *tokens, const size_t max_
     return ntokens;
 }
 
-static void detokenize(token_t *tokens, int ntokens, char **out, int *nbytes) {
+#ifdef INNODB_MEMCACHED
+static void detokenize(token_t *tokens, size_t ntokens, char **out, int *nbytes)
+#else
+static void detokenize(token_t *tokens, int ntokens, char **out, int *nbytes)
+#endif
+{
     int i, nb;
     char *buf, *p;
 
diff --git a/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc b/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc
index e6ebe13362e2..7cd0253d9abc 100644
--- a/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc
+++ b/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h b/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h
index 4c2a219696fe..41559323ba59 100644
--- a/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h
+++ b/plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/daemon_memcached/daemon/thread.c b/plugin/innodb_memcached/daemon_memcached/daemon/thread.c
index 348d3ac6ea5f..ce870e775928 100644
--- a/plugin/innodb_memcached/daemon_memcached/daemon/thread.c
+++ b/plugin/innodb_memcached/daemon_memcached/daemon/thread.c
@@ -19,6 +19,9 @@
 
 #define INNODB_MEMCACHED
 
+extern void my_thread_end();
+extern void my_thread_init();
+
 static char devnull[8192];
 extern volatile sig_atomic_t memcached_shutdown;
 
diff --git a/plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h b/plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h
index 1c6eaa8e0012..a362d4cfac01 100644
--- a/plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h
+++ b/plugin/innodb_memcached/daemon_memcached/include/memcached/protocol_binary.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (c) <2008>, Sun Microsystems, Inc.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates.
  * Use is subject to license terms
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h b/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h
index d2f6e094aea9..c23d6cbbe643 100644
--- a/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h
+++ b/plugin/innodb_memcached/daemon_memcached/include/memcached/util.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates. */
 
 #ifndef UTIL_H
 #define UTIL_H
diff --git a/plugin/innodb_memcached/daemon_memcached/utilities/util.c b/plugin/innodb_memcached/daemon_memcached/utilities/util.c
index d8232a0aaf61..865878227d06 100644
--- a/plugin/innodb_memcached/daemon_memcached/utilities/util.c
+++ b/plugin/innodb_memcached/daemon_memcached/utilities/util.c
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates. */
 
 #include "config.h"
 #include <stdio.h>
diff --git a/plugin/innodb_memcached/innodb_memcache/CMakeLists.txt b/plugin/innodb_memcached/innodb_memcache/CMakeLists.txt
index d0b4ce6f917c..bd275656cf89 100644
--- a/plugin/innodb_memcached/innodb_memcache/CMakeLists.txt
+++ b/plugin/innodb_memcached/innodb_memcache/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c b/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c
index 4ce0a0570319..37b38098577c 100644
--- a/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c
+++ b/plugin/innodb_memcached/innodb_memcache/cache-src/default_engine.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 This file was modified by Oracle on 2015/02/05
-Modifications copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *****************************************************************************/
 
 #include "config.h"
diff --git a/plugin/innodb_memcached/innodb_memcache/cache-src/items.c b/plugin/innodb_memcached/innodb_memcache/cache-src/items.c
index c3ef375233d5..93cf9600fb76 100644
--- a/plugin/innodb_memcached/innodb_memcache/cache-src/items.c
+++ b/plugin/innodb_memcached/innodb_memcache/cache-src/items.c
@@ -1,4 +1,8 @@
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *  Modifications Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+ *  All rights reserved.
+ */
 #include "config.h"
 #include <fcntl.h>
 #include <errno.h>
@@ -90,6 +94,10 @@ hash_item *do_item_alloc(struct default_engine *engine,
                          const int nbytes,
                          const void *cookie) {
     hash_item *it = NULL;
+    // Avoid potential underflows.
+    if (nbytes < 0)
+        return 0;
+
     size_t ntotal = sizeof(hash_item) + nkey + nbytes;
     if (engine->config.use_cas) {
         ntotal += sizeof(uint64_t);
@@ -131,6 +139,10 @@ hash_item *do_item_alloc(struct default_engine *engine,
                          const int nbytes,
                          const void *cookie) {
     hash_item *it = NULL;
+    // Avoid potential underflows.
+    if (nbytes < 0)
+        return 0;
+
     size_t ntotal = sizeof(hash_item) + nkey + nbytes;
     if (engine->config.use_cas) {
         ntotal += sizeof(uint64_t);
diff --git a/plugin/innodb_memcached/innodb_memcache/include/handler_api.h b/plugin/innodb_memcached/innodb_memcache/include/handler_api.h
index 22e5a5706891..9e1089148857 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/handler_api.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/handler_api.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/include/innodb_api.h b/plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
index 534e33e94615..1d09ee4772fb 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/innodb_api.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h b/plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
index ad3e96cfcf2b..3f48d4bead11 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/include/innodb_config.h b/plugin/innodb_memcached/innodb_memcache/include/innodb_config.h
index ce04fa651cbc..16089865bd15 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/innodb_config.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/innodb_config.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h b/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
index 13e5d81eee14..7d82a210de0f 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/innodb_engine.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/include/innodb_utility.h b/plugin/innodb_memcached/innodb_memcache/include/innodb_utility.h
index 250ac79420e2..ecad4bb5f523 100644
--- a/plugin/innodb_memcached/innodb_memcache/include/innodb_utility.h
+++ b/plugin/innodb_memcached/innodb_memcache/include/innodb_utility.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2012, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc b/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
index f2dccb8629af..60d81d138977 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
+++ b/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/src/hash_item_util.c b/plugin/innodb_memcached/innodb_memcache/src/hash_item_util.c
index ab936a2b8ad9..3cb31357b501 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/hash_item_util.c
+++ b/plugin/innodb_memcached/innodb_memcache/src/hash_item_util.c
@@ -1,7 +1,33 @@
+/*
+  Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+*/
+
 
 
 #include "hash_item_util.h"
 
+#include <arpa/inet.h>
+
 char * hash_item_get_key(const hash_item* item) {
   char *ret = (void*)(item + 1);
   if (item->iflag & ITEM_WITH_CAS) {
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c b/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
index 5b90e2ba6b13..73d9f711ba2b 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
+++ b/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c b/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
index 7e1d9fa8660f..8b415c1d47c0 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
+++ b/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c b/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
index 51d005273b66..d9d9ba767a98 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
+++ b/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
@@ -1135,6 +1142,9 @@ innodb_conn_init(
 			}
 		}
 	} else {
+        bool auto_commit = (engine->read_batch_size == 1 &&
+                !(engine->cfg_status & IB_CFG_DISABLE_ROWLOCK)) ? true : false;
+
 		assert(conn_option == CONN_MODE_READ);
 
 		if (!read_crsr) {
@@ -1142,15 +1152,12 @@ innodb_conn_init(
 				/* This is read operation, start a trx
 				with "read_write" parameter set to false */
 				conn_data->crsr_trx = ib_cb_trx_begin(
-					engine->trx_level, false,
-					engine->read_batch_size == 1);
+					engine->trx_level, false, auto_commit);
 				trx_updated = true;
 			} else {
 				ib_cb_trx_start(conn_data->crsr_trx,
 						engine->trx_level,
-						false,
-						engine->read_batch_size == 1,
-						NULL);
+						false, auto_commit, NULL);
 			}
 
 			err = innodb_api_begin(
@@ -1183,8 +1190,7 @@ innodb_conn_init(
 			/* This is read operation, start a trx
 			with "read_write" parameter set to false */
 			conn_data->crsr_trx = ib_cb_trx_begin(
-				engine->trx_level, false,
-				engine->read_batch_size == 1);
+				engine->trx_level, false, auto_commit);
 
 			trx_updated = true;
 
@@ -1230,8 +1236,7 @@ innodb_conn_init(
 			with "read_write" parameter set to false */
 			ib_cb_trx_start(conn_data->crsr_trx,
 					engine->trx_level,
-					false,
-					engine->read_batch_size == 1,
+					false, auto_commit,
 					NULL);
 
 			ib_cb_cursor_stmt_begin(conn_data->read_crsr);
@@ -1691,6 +1696,8 @@ convert_to_char(
 			int8_t		int_val = *(int8_t*)value;
 			snprintf(buf, buf_len, "%" PRIi8, int_val);
 		}
+	} else {
+		return 0;
 	}
 
 	return(strlen(buf));
@@ -1844,6 +1851,8 @@ innodb_get(
 
 		result->col_value[MCI_COL_VALUE].value_str = conn_data->row_buf;
 		result->col_value[MCI_COL_VALUE].value_len = strlen(table_name);
+		result->col_value[MCI_COL_VALUE].is_str = true;
+		result->col_value[MCI_COL_VALUE].is_valid = true;
 	}
 
 	result->col_value[MCI_COL_KEY].value_str = (char*)key;
@@ -1956,6 +1965,8 @@ innodb_get(
 
 		result->col_value[MCI_COL_VALUE].value_str = conn_data->mul_col_buf;
 		result->col_value[MCI_COL_VALUE].value_len = total_len;
+		result->col_value[MCI_COL_VALUE].is_str = true;
+		result->col_value[MCI_COL_VALUE].is_valid = true;
 		((char*)result->col_value[MCI_COL_VALUE].value_str)[total_len] = 0;
 
 		free(result->extra_col_value);
@@ -1964,6 +1975,7 @@ innodb_get(
 		unsigned int	int_len;
 		char		int_buf[MAX_INT_CHAR_LEN];
 
+		memset(int_buf, 0, sizeof int_buf);
 		int_len = convert_to_char(
 			int_buf, sizeof int_buf,
 			&result->col_value[MCI_COL_VALUE].value_int,
@@ -1984,6 +1996,8 @@ innodb_get(
 			 conn_data->mul_col_buf;
 
 		result->col_value[MCI_COL_VALUE].value_len = int_len;
+		result->col_value[MCI_COL_VALUE].is_str = true;
+		result->col_value[MCI_COL_VALUE].is_valid = true;
 	}
 
         *item = result;
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h b/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
index cc3fefc56837..83954762580d 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
+++ b/plugin/innodb_memcached/innodb_memcache/src/innodb_engine_private.h
@@ -1,15 +1,22 @@
 /***********************************************************************
 
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/innodb_memcached/innodb_memcache/src/innodb_utility.c b/plugin/innodb_memcached/innodb_memcache/src/innodb_utility.c
index 2c23fb1e4bf4..4bfa9aea7287 100644
--- a/plugin/innodb_memcached/innodb_memcache/src/innodb_utility.c
+++ b/plugin/innodb_memcached/innodb_memcache/src/innodb_utility.c
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/plugin/keyring/CMakeLists.txt b/plugin/keyring/CMakeLists.txt
index 2fa64797ffcc..40dee3fc7d18 100644
--- a/plugin/keyring/CMakeLists.txt
+++ b/plugin/keyring/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -15,7 +22,7 @@
 
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
-INCLUDE_DIRECTORIES(${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common)
 
 SET(
@@ -40,10 +47,6 @@ IF(SSL_DEFINES)
   ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
 
-IF(WITH_KEYRING_TEST)
-  ADD_SUBDIRECTORY(keyring-test)
-ENDIF()
-
 IF(HAVE_DLOPEN)
     SET(DYNLIB_EXTENSION "so")
     SET_TARGET_PROPERTIES(keyring_file
diff --git a/plugin/keyring/buffer.cc b/plugin/keyring/buffer.cc
index a3909b04ac20..9910ab378a2a 100644
--- a/plugin/keyring/buffer.cc
+++ b/plugin/keyring/buffer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,7 +33,7 @@ namespace keyring
       data= NULL;
     }
     mark_as_empty();
-    DBUG_ASSERT(size == 0 && position == 0);
+    assert(size == 0 && position == 0);
   }
 
   my_bool Buffer::get_next_key(IKey **key)
@@ -37,7 +44,7 @@ namespace keyring
     size_t number_of_bytes_read_from_buffer = 0;
     if (data == NULL)
     {
-      DBUG_ASSERT(size == 0);
+      assert(size == 0);
       return TRUE;
     }
     if (key_ptr->load_from_buffer(data + position,
@@ -57,7 +64,7 @@ namespace keyring
 
   void Buffer::reserve(size_t memory_size)
   {
-    DBUG_ASSERT(memory_size % sizeof(size_t) == 0); //make sure size is sizeof(size_t) aligned
+    assert(memory_size % sizeof(size_t) == 0); //make sure size is sizeof(size_t) aligned
     free();
     data= reinterpret_cast<uchar*>(new size_t[memory_size / sizeof(size_t)]);//force size_t alignment
     size= memory_size;
diff --git a/plugin/keyring/buffer.h b/plugin/keyring/buffer.h
index 46358ef2424d..0d1f9984640b 100644
--- a/plugin/keyring/buffer.h
+++ b/plugin/keyring/buffer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/buffered_file_io.cc b/plugin/keyring/buffered_file_io.cc
index 2ceb528bd764..08d87d29b60f 100644
--- a/plugin/keyring/buffered_file_io.cc
+++ b/plugin/keyring/buffered_file_io.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -94,7 +101,12 @@ my_bool Buffered_file_io::is_file_version_correct(File file)
 
 my_bool Buffered_file_io::check_if_keyring_file_can_be_opened_or_created()
 {
+  // Check if the file exists
+  int file_exist= !my_access(this->keyring_filename.c_str(), F_OK);
+
+  // try creating file or opening existing
   File file= file_io.open(keyring_file_data_key, this->keyring_filename.c_str(),
+                          file_exist && keyring_open_mode ? O_RDONLY :
                           O_RDWR | O_CREAT, MYF(MY_WME));
   if (file < 0 ||
       file_io.seek(file, 0, MY_SEEK_END, MYF(MY_WME)) == MY_FILEPOS_ERROR)
@@ -200,7 +212,7 @@ my_bool Buffered_file_io::recreate_keyring_from_backup_if_backup_exists()
 
 my_bool Buffered_file_io::init(std::string *keyring_filename)
 {
-  DBUG_ASSERT(keyring_filename->empty() == FALSE);
+  assert(keyring_filename->empty() == FALSE);
 #ifdef HAVE_PSI_INTERFACE
   keyring_init_psi_file_keys();
 #endif
@@ -261,7 +273,7 @@ my_bool Buffered_file_io::flush_to_backup(ISerialized_object *serialized_object)
   }
 
   Buffer *buffer= dynamic_cast<Buffer*>(serialized_object);
-  DBUG_ASSERT(buffer != NULL);
+  assert(buffer != NULL);
   return buffer == NULL ||
          flush_buffer_to_file(buffer, backup_file) ||
          file_io.close(backup_file, MYF(MY_WME)) < 0;
@@ -291,8 +303,8 @@ my_bool Buffered_file_io::read_keyring_stat(File file)
 my_bool Buffered_file_io::flush_to_storage(ISerialized_object *serialized_object)
 {
   Buffer *buffer= dynamic_cast<Buffer*>(serialized_object);
-  DBUG_ASSERT(buffer != NULL);
-  DBUG_ASSERT(serialized_object->get_key_operation() != NONE);
+  assert(buffer != NULL);
+  assert(serialized_object->get_key_operation() != NONE);
 
   File keyring_file= file_io.open(keyring_file_data_key,
                                   this->keyring_filename.c_str(), O_CREAT | O_RDWR,
@@ -320,8 +332,13 @@ ISerializer* Buffered_file_io::get_serializer()
 
 my_bool Buffered_file_io::get_serialized_object(ISerialized_object **serialized_object)
 {
+  // Check if the file exists
+  int file_exist= !my_access(keyring_filename.c_str(), F_OK);
+
+  // try creating file or opening existing
   File file= file_io.open(keyring_file_data_key, keyring_filename.c_str(),
-                          O_CREAT | O_RDWR, MYF(MY_WME));
+                          file_exist && keyring_open_mode ? O_RDONLY :
+                          O_RDWR | O_CREAT, MYF(MY_WME));
 
   *serialized_object= NULL;
 
diff --git a/plugin/keyring/buffered_file_io.h b/plugin/keyring/buffered_file_io.h
index 6d006edb166c..da8c747b9914 100644
--- a/plugin/keyring/buffered_file_io.h
+++ b/plugin/keyring/buffered_file_io.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -19,6 +26,7 @@
 #include <my_global.h>
 #include <mysql/plugin.h>
 #include "i_keyring_io.h"
+#include "keyring.h"
 #include "logger.h"
 #include "keyring_memory.h"
 #include "buffer.h"
@@ -40,7 +48,6 @@ class Buffered_file_io : public IKeyring_io
     , file_io(logger)
     , keyring_file(-1)
   {
-    memset(&saved_keyring_stat, 0, sizeof(MY_STAT));
   }
 
   my_bool init(std::string *keyring_filename);
diff --git a/plugin/keyring/common/i_keyring_io.h b/plugin/keyring/common/i_keyring_io.h
index 516563f00808..ec382c3bb902 100644
--- a/plugin/keyring/common/i_keyring_io.h
+++ b/plugin/keyring/common/i_keyring_io.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/i_keyring_key.h b/plugin/keyring/common/i_keyring_key.h
index 055f262d651f..a1edc223244e 100644
--- a/plugin/keyring/common/i_keyring_key.h
+++ b/plugin/keyring/common/i_keyring_key.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/i_keys_container.h b/plugin/keyring/common/i_keys_container.h
index e1b7128eaf8a..507e76eb68fd 100644
--- a/plugin/keyring/common/i_keys_container.h
+++ b/plugin/keyring/common/i_keys_container.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/i_serialized_object.h b/plugin/keyring/common/i_serialized_object.h
index 866aadc7d3ff..792762c8a65a 100644
--- a/plugin/keyring/common/i_serialized_object.h
+++ b/plugin/keyring/common/i_serialized_object.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/i_serializer.h b/plugin/keyring/common/i_serializer.h
index 288aa5a8b72c..fdee9a7d0a49 100644
--- a/plugin/keyring/common/i_serializer.h
+++ b/plugin/keyring/common/i_serializer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/keyring.h b/plugin/keyring/common/keyring.h
index a6e1598cb5aa..9b25d6089a93 100644
--- a/plugin/keyring/common/keyring.h
+++ b/plugin/keyring/common/keyring.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -43,6 +50,7 @@ extern boost::movelib::unique_ptr<IKeys_container> keys;
 extern volatile my_bool is_keys_container_initialized;
 extern boost::movelib::unique_ptr<ILogger> logger;
 extern boost::movelib::unique_ptr<char[]> keyring_file_data;
+extern my_bool keyring_open_mode;
 
 #ifdef HAVE_PSI_INTERFACE
 void keyring_init_psi_keys(void);
diff --git a/plugin/keyring/common/keyring_impl.cc b/plugin/keyring/common/keyring_impl.cc
index a6aa3c71dfab..fbdab0f5afa9 100644
--- a/plugin/keyring/common/keyring_impl.cc
+++ b/plugin/keyring/common/keyring_impl.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,6 +37,7 @@ boost::movelib::unique_ptr<IKeys_container> keys(NULL);
 volatile my_bool is_keys_container_initialized= FALSE;
 boost::movelib::unique_ptr<ILogger> logger(NULL);
 boost::movelib::unique_ptr<char[]> keyring_file_data(NULL);
+my_bool keyring_open_mode= FALSE; // 0 - Read|Write|Create; 1 - Read only
 
 #ifdef HAVE_PSI_INTERFACE
 static PSI_rwlock_info all_keyring_rwlocks[]=
diff --git a/plugin/keyring/common/keyring_key.cc b/plugin/keyring/common/keyring_key.cc
index c4728c05eb3a..a3bf23de33c2 100644
--- a/plugin/keyring/common/keyring_key.cc
+++ b/plugin/keyring/common/keyring_key.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -97,7 +104,7 @@ void Key::store_in_buffer(uchar* buffer, size_t *buffer_position) const
                   sizeof(size_t);
 
   *buffer_position+= padding;
-  DBUG_ASSERT(*buffer_position % sizeof(size_t) == 0);
+  assert(*buffer_position % sizeof(size_t) == 0);
 }
 
 my_bool Key::load_string_from_buffer(const uchar *buffer, size_t *buffer_position,
@@ -161,7 +168,7 @@ my_bool Key::load_from_buffer(uchar* buffer, size_t *number_of_bytes_read_from_b
   size_t padding= (sizeof(size_t) - (buffer_position % sizeof(size_t))) %
                   sizeof(size_t);
   buffer_position+= padding;
-  DBUG_ASSERT(buffer_position % sizeof(size_t) == 0);
+  assert(buffer_position % sizeof(size_t) == 0);
 
   *number_of_bytes_read_from_buffer= buffer_position;
 
@@ -181,7 +188,7 @@ size_t Key::get_key_pod_size() const
                   sizeof(size_t);
 
   size_t key_pod_size_aligned= key_pod_size + padding;
-  DBUG_ASSERT(key_pod_size_aligned % sizeof(size_t) == 0);
+  assert(key_pod_size_aligned % sizeof(size_t) == 0);
   return key_pod_size_aligned;
 }
 
diff --git a/plugin/keyring/common/keyring_key.h b/plugin/keyring/common/keyring_key.h
index 7c9ae7e84310..6c1719928c74 100644
--- a/plugin/keyring/common/keyring_key.h
+++ b/plugin/keyring/common/keyring_key.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/keyring_memory.h b/plugin/keyring/common/keyring_memory.h
index 351a783696cf..73d4bbfac8d1 100644
--- a/plugin/keyring/common/keyring_memory.h
+++ b/plugin/keyring/common/keyring_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/keys_container.cc b/plugin/keyring/common/keys_container.cc
index c14826f772ad..1fd835ee3cf3 100644
--- a/plugin/keyring/common/keys_container.cc
+++ b/plugin/keyring/common/keys_container.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -119,8 +126,8 @@ void Keys_container::allocate_and_set_data_for_key(IKey *key,
 
 IKey*Keys_container::fetch_key(IKey *key)
 {
-  DBUG_ASSERT(key->get_key_data() == NULL);
-  DBUG_ASSERT(key->get_key_type()->empty());
+  assert(key->get_key_data() == NULL);
+  assert(key->get_key_type()->empty());
 
   IKey *fetched_key= get_key_from_hash(key);
 
diff --git a/plugin/keyring/common/keys_container.h b/plugin/keyring/common/keys_container.h
index 56cedeffd580..6a6360aa237d 100644
--- a/plugin/keyring/common/keys_container.h
+++ b/plugin/keyring/common/keys_container.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/keys_iterator.cc b/plugin/keyring/common/keys_iterator.cc
index 1c3deff785e2..5bfa7165a426 100644
--- a/plugin/keyring/common/keys_iterator.cc
+++ b/plugin/keyring/common/keys_iterator.cc
@@ -1,13 +1,20 @@
-/* Copyright (c)  2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/keys_iterator.h b/plugin/keyring/common/keys_iterator.h
index 6f2ba13b3084..e16a77297db6 100644
--- a/plugin/keyring/common/keys_iterator.h
+++ b/plugin/keyring/common/keys_iterator.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/common/logger.h b/plugin/keyring/common/logger.h
index 2dde910bf939..6f8c2585f13f 100644
--- a/plugin/keyring/common/logger.h
+++ b/plugin/keyring/common/logger.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/file_io.cc b/plugin/keyring/file_io.cc
index 367bd4dff4ba..1023718206e8 100644
--- a/plugin/keyring/file_io.cc
+++ b/plugin/keyring/file_io.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -31,7 +38,7 @@ my_bool is_super_user()
   MYSQL_SECURITY_CONTEXT sec_ctx;
   my_svc_bool has_super_privilege = FALSE;
 
-  DBUG_ASSERT(thd != NULL);
+  assert(thd != NULL);
 
   if (thd == NULL || thd_get_security_context(thd, &sec_ctx) ||
       security_context_get_option(sec_ctx, "privilege_super", &has_super_privilege))
@@ -191,7 +198,7 @@ my_bool File_io::truncate(File file, myf myFlags)
   if (ftruncate(file, (off_t) 0) && (myFlags & MY_WME))
   {
 #else
-  DBUG_ASSERT(0);
+    assert(0);
 #endif
     std::stringstream error_message;
     error_message << "Could not truncate file " << my_filename(file)
@@ -203,7 +210,7 @@ my_bool File_io::truncate(File file, myf myFlags)
     return TRUE;
   }
 //#else
-//  DBUG_ASSERT(0);
+//  assert(0);
 //#endif
   return FALSE;
 }
diff --git a/plugin/keyring/file_io.h b/plugin/keyring/file_io.h
index ba2f19c779c5..18339d76a12f 100644
--- a/plugin/keyring/file_io.h
+++ b/plugin/keyring/file_io.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/hash_to_buffer_serializer.cc b/plugin/keyring/hash_to_buffer_serializer.cc
index d953233ca6e1..d42b217334db 100644
--- a/plugin/keyring/hash_to_buffer_serializer.cc
+++ b/plugin/keyring/hash_to_buffer_serializer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/hash_to_buffer_serializer.h b/plugin/keyring/hash_to_buffer_serializer.h
index 82361354c995..64d51ae00902 100644
--- a/plugin/keyring/hash_to_buffer_serializer.h
+++ b/plugin/keyring/hash_to_buffer_serializer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/keyring/keyring-test/CMakeLists.txt b/plugin/keyring/keyring-test/CMakeLists.txt
deleted file mode 100644
index 715713184d54..000000000000
--- a/plugin/keyring/keyring-test/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-ADD_EXECUTABLE(keyring-test
-               ./keyring-test.cc
-               ../common/keyring_key.cc
-               ../common/keys_container.cc
-               ../common/keyring_impl.cc
-               ../buffered_file_io.cc
-               ../hash_to_buffer_serializer.cc
-               ../buffer.cc
-               ../file_io.cc)
-TARGET_LINK_LIBRARIES(keyring-test strings dbug regex mysys sql)
-TARGET_LINK_LIBRARIES(keyring-test binlog rpl master slave)
diff --git a/plugin/keyring/keyring-test/keyring-test.cc b/plugin/keyring/keyring-test/keyring-test.cc
deleted file mode 100644
index 60227a2cda8b..000000000000
--- a/plugin/keyring/keyring-test/keyring-test.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#undef HAVE_PSI_INTERFACE
-#include <my_global.h>
-#include <iostream>
-#include <sql_plugin_ref.h>
-#include <time.h>
-#include "../keyring.cc"
-
-my_bool random_keys= FALSE;
-my_bool verbose;
-my_bool generate_random_keys_data= FALSE;
-int number_of_keys_added= 0;
-int number_of_keys_fetched= 0;
-int number_of_keys_removed= 0;
-int number_of_keys_generated= 0;
-int max_generated_key_length= 0;
-int number_of_keys_to_generate= 0;
-
-mysql_mutex_t  LOCK_verbose;
-
-void* generate(void *arg)
-{
-  my_thread_init();
-  int number_of_keys_to_generate= *((int *)arg);
-
-  for (uint i= 0; number_of_keys_generated < number_of_keys_to_generate; i= (i+1) % number_of_keys_to_generate)
-  {
-    char key_id[12];  //Key#1000000\0
-    char key_type[16]; //KeyType#1000000\0
-    char user[13]; //User#1000000\0
-    size_t key_len= rand() % 100;
-
-    int key_nr= random_keys ? rand() % number_of_keys_to_generate : i;
-    sprintf(key_id, "Key#%d", key_nr);
-    strcpy(key_type, "AES");
-    sprintf(user, "User#%d", key_nr);
-
-    my_bool result= FALSE;
-
-    if((result= mysql_key_generate(reinterpret_cast<const char*>(key_id),
-                                   reinterpret_cast<const char*>(key_type),
-                                   reinterpret_cast<const char*>(user), key_len)) == FALSE)
-      my_atomic_add32(&number_of_keys_generated,1);
-
-    if (verbose)
-    {
-      mysql_mutex_lock(&LOCK_verbose);
-      std::cout << "Key generate " << key_id << ' ' << key_type << ' ' << user << ' ';
-      if(result==FALSE)
-        std::cout << "successfull" << std::endl;
-      else
-        std::cout << "failed" << std::endl;
-      mysql_mutex_unlock(&LOCK_verbose);
-    }
-  }
-  my_thread_end();
-  return NULL;
-}
-
-void* store(void *arg)
-{
-  my_thread_init();
-  int number_of_keys_to_store= *((int *)arg);
-
-  for (uint i= 0; number_of_keys_added < number_of_keys_to_store; i= (i+1) % number_of_keys_to_store)
-  {
-    char key_id[12];  //Key#1000000\0
-    char key_type[16]; //KeyType#1000000\0
-    char user[13]; //User#1000000\0
-    uchar key_stack[]="KEeeeeeeeEEEEEeeeeEEEEEEEEEEEEY!";
-    uchar* key;
-    size_t key_len;//= rand() % 100;
-    if (generate_random_keys_data)
-    {
-      key_len= rand() % max_generated_key_length;
-      key= (uchar*)my_malloc(keyring::key_memory_KEYRING, key_len, MYF(0));
-      assert(key != NULL);
-      assert(my_rand_buffer(key, key_len) == FALSE);
-    }
-    else
-    {
-      key= key_stack;
-      key_len= strlen(reinterpret_cast<char*>(key))+1;
-    }
-
-    int key_nr= random_keys ? rand() % number_of_keys_to_store : i;
-    sprintf(key_id, "Key#%d", key_nr);
-    strcpy(key_type, "AES");
-    sprintf(user, "User#%d", key_nr);
-
-    my_bool result= FALSE;
-
-    if((result= mysql_key_store(reinterpret_cast<const char*>(key_id),
-                                reinterpret_cast<const char*>(key_type),
-                                reinterpret_cast<const char*>(user), key, key_len)) == FALSE)
-      my_atomic_add32(&number_of_keys_added,1);
-
-    if (generate_random_keys_data)
-      my_free(key);
-
-    if (verbose)
-    {
-      mysql_mutex_lock(&LOCK_verbose);
-      std::cout << "Key store " << key_id << ' ' << key_type << ' ' << user << ' ';
-      if(result==FALSE)
-        std::cout << "successfull" << std::endl;
-      else
-        std::cout << "failed" << std::endl;
-      mysql_mutex_unlock(&LOCK_verbose);
-    }
-  }
-  my_thread_end();
-  return NULL;
-}
-
-void* fetch(void *arg)
-{
-  my_thread_init();
-  int number_of_keys_to_fetch= *((int *)arg);
-
-  for (uint i= 0; number_of_keys_fetched < number_of_keys_to_fetch; i= (i+1) % number_of_keys_to_fetch)
-  {
-    char key_id[12];  //Key#1000000\0
-    char *key_type= NULL;
-    char user[13]; //User#1000000\0
-    char key[]="KEeeeeeeeEEEEEeeeeEEEEEEEEEEEEY!";
-
-    int key_nr= random_keys ? rand() % number_of_keys_to_fetch : i;
-    sprintf(key_id, "Key#%d", key_nr);
-    sprintf(user, "User#%d", key_nr);
-
-    void *key_data= NULL;
-    size_t key_len= 0;
-
-    my_bool result= TRUE;
-
-    if((result= mysql_key_fetch(reinterpret_cast<const char*>(key_id), &key_type,
-                                reinterpret_cast<const char*>(user), &key_data,
-                                &key_len)) == FALSE && key_data != NULL)
-    {
-      my_atomic_add32(&number_of_keys_fetched,1);
-      if (generate_random_keys_data == FALSE && number_of_keys_to_generate == 0)
-      {
-        assert(key_len == strlen(key)+1);
-        assert(strcmp(reinterpret_cast<const char *>(reinterpret_cast<uchar *>(key_data)), key) == 0);
-      }
-      my_free(key_data);
-    }
-
-    if (verbose)
-    {
-      mysql_mutex_lock(&LOCK_verbose);
-      std::cout << "Key fetch " << key_id << ' ';
-      if(key_type != NULL)
-        std::cout << key_type << ' ';
-      std::cout << user << ' ';
-      if(result==FALSE)
-        std::cout << "successfull" << std::endl;
-      else
-        std::cout << "failed" << std::endl;
-      mysql_mutex_unlock(&LOCK_verbose);
-    }
-    if(key_type != NULL)
-      my_free(key_type);
-  }
-  my_thread_end();
-  return NULL;
-}
-
-
-void* remove(void *arg)
-{
-  my_thread_init();
-  int number_of_keys_to_remove= *((int *)arg);
-
-  for (uint i= 0; number_of_keys_removed < number_of_keys_to_remove; i= (i+1) % number_of_keys_to_remove)
-  {
-    char key_id[12];  //Key#1000000\0
-    char user[13]; //User#1000000\0
-
-    int key_nr= random_keys ? rand() % number_of_keys_to_remove : i;
-    sprintf(key_id, "Key#%d", key_nr);
-    sprintf(user, "User#%d", key_nr);
-
-    my_bool result= TRUE;
-
-    if((result= mysql_key_remove(reinterpret_cast<const char*>(key_id),
-                                 reinterpret_cast<const char*>(user))) == FALSE)
-      my_atomic_add32(&number_of_keys_removed,1);
-
-    if (verbose)
-    {
-      mysql_mutex_lock(&LOCK_verbose);
-      std::cout << "Key remove " << key_id << ' ' << user << ' ';
-      if(result==FALSE)
-        std::cout << "successfull" << std::endl;
-      else
-        std::cout << "failed" << std::endl;
-      mysql_mutex_unlock(&LOCK_verbose);
-    }
-  }
-  my_thread_end();
-  return NULL;
-}
-
-
-
-int main(int argc, char **argv)
-{
-  my_thread_global_init();
-  mysql_mutex_init(0, &LOCK_verbose, MY_MUTEX_INIT_FAST);
-
-  keyring::system_charset_info= &my_charset_utf8_general_ci;
-  srand(time(NULL));
-  unsigned long long threads_store_number= 0;
-  unsigned long long threads_remove_number= 0;
-  unsigned long long threads_fetch_number= 0;
-  unsigned long long threads_generate_key_number= 0;
-  int number_of_keys_to_store= 0;
-  int number_of_keys_to_fetch= 0;
-  int number_of_keys_to_remove= 0;
-  my_thread_handle *otid;
-  unsigned long long i;
-  void *tret;
-
-  if (argc != 12)
-  {
-    fprintf(stderr, "Usage: keyring_test <path_to_keyring_file> <threads_store_number> "
-                    "<threads_remove_number> <threads_fetch_number> "
-                    "<threads_generate_key_number> <number_of_keys_to_store> "
-                    "<number_of_keys_to_fetch> <number_of_keys_to_generate> "
-                    "<max_generated_key_length> <random_keys> <verbose>\n");
-    return -1;
-  }
-
-  my_init();
-
-  keyring_file_data_value= (char*)my_malloc(PSI_NOT_INSTRUMENTED, strlen(argv[1])+1, MYF(0));
-  strcpy(keyring_file_data_value, argv[1]);
-  threads_store_number= atoll(argv[2]) ;
-  threads_remove_number= atoll(argv[3]) ;
-  threads_fetch_number= atoll(argv[4]);
-  threads_generate_key_number= atoll(argv[5]);
-  number_of_keys_to_store= atoi(argv[6]);
-  number_of_keys_to_fetch= atoi(argv[7]);
-  number_of_keys_to_generate= atoi(argv[8]);
-  max_generated_key_length= atoi(argv[9]);
-  random_keys= atoi(argv[10]);
-  verbose= atoi(argv[11]);
-  number_of_keys_to_remove= number_of_keys_to_store + number_of_keys_to_generate;
-
-  remove(keyring_file_data_value);//just to be sure there are no leftovers
-
-  unsigned long long threads_number= threads_store_number + threads_fetch_number + threads_remove_number +
-                                     threads_generate_key_number;
-
-  if (!(otid= (my_thread_handle*) my_malloc(PSI_NOT_INSTRUMENTED,
-       threads_number * sizeof(*otid), MYF(0))))
-    return -2;
-
-  st_plugin_int plugin_info;
-  plugin_info.name.str= const_cast<char*>("keyring_plugin");
-  plugin_info.name.length= strlen("keyring_plugin");
-
-  if (keyring_init(&plugin_info))
-    return 1;
-
-  for (i= 0; i < threads_store_number; i++)
-    if (mysql_thread_create(PSI_NOT_INSTRUMENTED, &otid[i], NULL, store, (void *) &number_of_keys_to_store))
-      return 2;
-
-  for (i= 0; i < threads_fetch_number; i++)
-    if (mysql_thread_create(PSI_NOT_INSTRUMENTED, &otid[threads_store_number + i], NULL, fetch, (void *) &number_of_keys_to_fetch))
-      return 3;
-
-  for (i= 0; i < threads_remove_number; i++)
-    if (mysql_thread_create(PSI_NOT_INSTRUMENTED, &otid[threads_store_number + threads_fetch_number + i], NULL, remove, (void *) &number_of_keys_to_remove))
-      return 4;
-
-  for (i= 0; i < threads_generate_key_number; i++)
-    if (mysql_thread_create(PSI_NOT_INSTRUMENTED, &otid[threads_store_number + threads_fetch_number + threads_remove_number + i],
-                            NULL, generate, (void *) &number_of_keys_to_generate))
-      return 6;
-
-  for (i= 0; i < threads_number; i++)
-    my_thread_join(&otid[i], &tret);
-
-  remove(keyring_file_data_value);
-  my_free(keyring_file_data_value);
-  my_free(otid);
-  mysql_mutex_destroy(&LOCK_verbose);
-
-  keyring_deinit(NULL);
-  my_end(0);
-
-  return 0;
-}
diff --git a/plugin/keyring/keyring.cc b/plugin/keyring/keyring.cc
index c08d7153605c..51097a976ec2 100644
--- a/plugin/keyring/keyring.cc
+++ b/plugin/keyring/keyring.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -80,9 +87,14 @@ static MYSQL_SYSVAR_STR(
   update_keyring_file_data,                                    /* update()   */
   MYSQL_DEFAULT_KEYRINGFILE                                    /* default    */
 );
+static MYSQL_SYSVAR_BOOL(open_mode, keyring_open_mode,
+                         PLUGIN_VAR_INVISIBLE | PLUGIN_VAR_RQCMDARG,
+                         "Mode in which keyring file should be opened", NULL,
+                         NULL, TRUE);
 
 static struct st_mysql_sys_var *keyring_file_system_variables[]= {
   MYSQL_SYSVAR(data),
+  MYSQL_SYSVAR(open_mode),
   NULL
 };
 
@@ -94,6 +106,8 @@ static int keyring_init(MYSQL_PLUGIN plugin_info)
     keyring_init_psi_keys();
 #endif
 
+    DBUG_EXECUTE_IF("simulate_keyring_init_error", return TRUE;);
+
     if (init_keyring_locks())
       return TRUE;
 
@@ -103,7 +117,7 @@ static int keyring_init(MYSQL_PLUGIN plugin_info)
       logger->log(MY_ERROR_LEVEL, "Could not create keyring directory "
         "The keyring_file will stay unusable until correct path to the keyring "
         "directory gets provided");
-      return FALSE;
+      return TRUE;
     }
     keys.reset(new Keys_container(logger.get()));
     IKeyring_io *keyring_io= new Buffered_file_io(logger.get());
@@ -115,7 +129,7 @@ static int keyring_init(MYSQL_PLUGIN plugin_info)
         " can be created in the specified location. "
         "The keyring_file will stay unusable until correct path to the keyring file "
         "gets provided");
-      return FALSE;
+      return TRUE;
     }
     is_keys_container_initialized = TRUE;
     return FALSE;
diff --git a/plugin/keyring/keyring_stat.h b/plugin/keyring/keyring_stat.h
index 8255447cf5ea..8d862cce2934 100644
--- a/plugin/keyring/keyring_stat.h
+++ b/plugin/keyring/keyring_stat.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -25,7 +32,17 @@ typedef MY_STAT My_stat;
 struct Keyring_stat : public My_stat
 {
   Keyring_stat() : is_initialized(FALSE)
-  {}
+  {
+    // Initialize relevant fields in base class.
+    st_dev = 0;
+    st_ino = 0;
+    st_mode = 0;
+    st_uid = 0;
+    st_gid = 0;
+    st_rdev = 0;
+    st_size = 0;
+    st_mtime = 0;
+  }
 
   my_bool operator==(const MY_STAT& stat)
   {
diff --git a/plugin/password_validation/CMakeLists.txt b/plugin/password_validation/CMakeLists.txt
index 99ad44dd99cd..fdbeb384dec8 100644
--- a/plugin/password_validation/CMakeLists.txt
+++ b/plugin/password_validation/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/password_validation/validate_password.cc b/plugin/password_validation/validate_password.cc
index e00c24e48c30..a711ac63d68d 100644
--- a/plugin/password_validation/validate_password.cc
+++ b/plugin/password_validation/validate_password.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/replication_observers_example/CMakeLists.txt b/plugin/replication_observers_example/CMakeLists.txt
index 3c309ce5c143..7fb4f33a8d42 100644
--- a/plugin/replication_observers_example/CMakeLists.txt
+++ b/plugin/replication_observers_example/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/replication_observers_example/replication_observers_example.cc b/plugin/replication_observers_example/replication_observers_example.cc
index 64398b5249f1..7de803a59d7d 100644
--- a/plugin/replication_observers_example/replication_observers_example.cc
+++ b/plugin/replication_observers_example/replication_observers_example.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -607,7 +614,7 @@ int validate_plugin_server_requirements(Trans_param *param)
   size_t length;
   get_server_encoded_gtid_executed(&encoded_gtid_executed, &length);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   char *encoded_gtid_executed_string=
       encoded_gtid_set_to_string(encoded_gtid_executed, length);
 #endif
@@ -619,7 +626,7 @@ int validate_plugin_server_requirements(Trans_param *param)
       startup_pre_reqs.gtid_mode == 3 &&
       server_engine_ready &&
       encoded_gtid_executed != NULL
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
       && encoded_gtid_executed_string != NULL
 #endif
      )
@@ -630,7 +637,7 @@ int validate_plugin_server_requirements(Trans_param *param)
                           "replication_observers_example_plugin:validate_plugin_server_requirements:"
                           " failed to invoke group_replication_priv.h exported functions");
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   my_free(encoded_gtid_executed_string);
 #endif
   my_free(encoded_gtid_executed);
@@ -650,7 +657,7 @@ int validate_plugin_server_requirements(Trans_param *param)
 int test_channel_service_interface_initialization()
 {
     int error= initialize_channel_service_interface();
-    DBUG_ASSERT(error);
+    assert(error);
     return error;
 }
 
@@ -658,29 +665,29 @@ int test_channel_service_interface()
 {
     //The initialization method should return OK
     int error= initialize_channel_service_interface();
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Test channel creation
     char interface_channel[]= "example_channel";
     Channel_creation_info info;
     initialize_channel_creation_info(&info);
     error= channel_create(interface_channel, &info);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Assert the channel exists
     bool exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-    DBUG_ASSERT(exists);
+    assert(exists);
 
     //Check that a non existing channel is declared as such
     char dummy_channel[]= "dummy_channel";
     exists= channel_is_active(dummy_channel, CHANNEL_NO_THD);
-    DBUG_ASSERT(!exists);
+    assert(!exists);
 
     //Test that we cannot create a empty named channel (the default channel)
     char empty_interface_channel[]= "";
     initialize_channel_creation_info(&info);
     error= channel_create(empty_interface_channel, &info);
-    DBUG_ASSERT(error == RPL_CHANNEL_SERVICE_DEFAULT_CHANNEL_CREATION_ERROR);
+    assert(error == RPL_CHANNEL_SERVICE_DEFAULT_CHANNEL_CREATION_ERROR);
 
     //Start the applier thread (since it does not need an external server)
     Channel_connection_info connection_info;
@@ -689,97 +696,97 @@ int test_channel_service_interface()
                          &connection_info,
                          CHANNEL_APPLIER_THREAD,
                          true);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Assert that the applier thread is running
     bool running= channel_is_active(interface_channel, CHANNEL_APPLIER_THREAD);
-    DBUG_ASSERT(running);
+    assert(running);
 
     //Wait for execution of events (none in this case so it should return OK)
     error= channel_wait_until_apply_queue_applied(interface_channel, 100000);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Get the last delivered gno (should be 0)
     rpl_sid fake_sid;
     fake_sid.parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
     rpl_sidno fake_sidno= get_sidno_from_global_sid_map(fake_sid);
     rpl_gno gno= channel_get_last_delivered_gno(interface_channel, fake_sidno);
-    DBUG_ASSERT(gno == 0);
+    assert(gno == 0);
 
     //Check that for non existing channels it returns the corresponding error
     gno= channel_get_last_delivered_gno(dummy_channel, fake_sidno);
-    DBUG_ASSERT(gno == RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
+    assert(gno == RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
 
     //Extract the applier id
     long unsigned int * applier_id= NULL;
     channel_get_thread_id(interface_channel,
                           CHANNEL_APPLIER_THREAD,
                           &applier_id);
-    DBUG_ASSERT(*applier_id > 0);
+    assert(*applier_id > 0);
     my_free(applier_id);
 
-    DBUG_ASSERT(binlog_relay_applier_stop_call==0);
+    assert(binlog_relay_applier_stop_call==0);
 
     //Stop the channel applier
     error= channel_stop(interface_channel,
                         3,
                         10000);
-    DBUG_ASSERT(!error);
+    assert(!error);
     //Repeat the stop to check it goes ok
     error= channel_stop(interface_channel,
                         3,
                         10000);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
-    DBUG_ASSERT(binlog_relay_applier_stop_call>0);
-    DBUG_ASSERT(!thread_aborted);
+    assert(binlog_relay_applier_stop_call>0);
+    assert(!thread_aborted);
 
     //Assert that the applier thread is not running
     running= channel_is_active(interface_channel, CHANNEL_APPLIER_THREAD);
-    DBUG_ASSERT(!running);
+    assert(!running);
 
     //Purge the channel and assert all is OK
     error= channel_purge_queue(interface_channel, true);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Assert the channel is not there.
     exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-    DBUG_ASSERT(!exists);
+    assert(!exists);
 
     //Check that a queue in an empty channel will fail.
     char empty_event[]= "";
     error= channel_queue_packet(dummy_channel, empty_event, 0);
-    DBUG_ASSERT(error);
+    assert(error);
 
     //Test a multi thread channel
     info.channel_mts_parallel_type= CHANNEL_MTS_PARALLEL_TYPE_LOGICAL_CLOCK;
     info.channel_mts_parallel_workers= 3;
 
     error= channel_create(interface_channel, &info);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Assert the channel exists
     exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-    DBUG_ASSERT(exists);
+    assert(exists);
 
     error= channel_start(interface_channel,
                          &connection_info,
                          CHANNEL_APPLIER_THREAD,
                          true);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Extract the applier ids
     applier_id= NULL;
     int num_appliers= channel_get_thread_id(interface_channel,
                                             CHANNEL_APPLIER_THREAD,
                                             &applier_id);
-    DBUG_ASSERT(num_appliers == 4);
+    assert(num_appliers == 4);
 
     unsigned long thread_id= 0;
     for (int i = 0; i < num_appliers; i++)
     {
       thread_id= applier_id[i];
-      DBUG_ASSERT(thread_id > 0);
+      assert(thread_id > 0);
     }
     my_free(applier_id);
 
@@ -787,15 +794,15 @@ int test_channel_service_interface()
     error= channel_stop(interface_channel,
                         3,
                         10000);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Purge the channel and assert all is OK
     error= channel_purge_queue(interface_channel, true);
-    DBUG_ASSERT(!error);
+    assert(!error);
 
     //Assert the channel is not there.
     exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-    DBUG_ASSERT(!exists);
+    assert(!exists);
 
     return (error && exists && running && gno && num_appliers && thread_id);
 }
@@ -804,48 +811,48 @@ int test_channel_service_interface_io_thread()
 {
   //The initialization method should return OK
   int error= initialize_channel_service_interface();
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   char interface_channel[]= "example_channel";
 
   //Assert the channel exists
   bool exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-  DBUG_ASSERT(exists);
+  assert(exists);
 
   //Assert that the receiver is running
   bool running= channel_is_active(interface_channel, CHANNEL_RECEIVER_THREAD);
-  DBUG_ASSERT(running);
+  assert(running);
 
   //Extract the receiver id
   long unsigned int * thread_id= NULL;
   int num_threads= channel_get_thread_id(interface_channel,
                                          CHANNEL_RECEIVER_THREAD,
                                          &thread_id);
-  DBUG_ASSERT(num_threads == 1);
-  DBUG_ASSERT(*thread_id > 0);
+  assert(num_threads == 1);
+  assert(*thread_id > 0);
   my_free(thread_id);
 
   //Get the I/O thread retrieved GTID set
   char *retrieved_gtid_set;
   error= channel_get_retrieved_gtid_set(interface_channel,
                                         &retrieved_gtid_set);
-  DBUG_ASSERT(!error);
-  DBUG_ASSERT(strlen(retrieved_gtid_set) > 0);
+  assert(!error);
+  assert(strlen(retrieved_gtid_set) > 0);
   my_free(retrieved_gtid_set);
 
   //Check that the applier thread is waiting for events to be queued.
   int is_waiting= channel_is_applier_waiting(interface_channel);
-  DBUG_ASSERT(is_waiting == 1);
+  assert(is_waiting == 1);
 
   //Stop the channel
   error= channel_stop(interface_channel,
                       3,
                       10000);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert that the receiver thread is not running
   running= channel_is_active(interface_channel, CHANNEL_RECEIVER_THREAD);
-  DBUG_ASSERT(!running);
+  assert(!running);
 
   return (error && exists && running && num_threads && is_waiting);
 }
@@ -854,14 +861,14 @@ bool test_channel_service_interface_is_io_stopping()
 {
   //The initialization method should return OK
   int error= initialize_channel_service_interface();
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Initialize the channel to be used with the channel service interface
   char interface_channel[]= "example_channel";
   Channel_creation_info info;
   initialize_channel_creation_info(&info);
   error= channel_create(interface_channel, &info);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Reset the I/O stop counter
   binlog_relay_thread_stop_call= 0;
@@ -869,7 +876,7 @@ bool test_channel_service_interface_is_io_stopping()
   //Unregister the thread stop hook
   error= unregister_binlog_relay_io_observer(&relay_io_observer,
                                              (void *)plugin_info_ptr);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Start the I/O thread
   Channel_connection_info connection_info;
@@ -878,52 +885,52 @@ bool test_channel_service_interface_is_io_stopping()
                        &connection_info,
                        CHANNEL_RECEIVER_THREAD,
                        true);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert the channel exists
   bool exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-  DBUG_ASSERT(exists);
+  assert(exists);
 
   //Wait until I/O thread reached the error and is going to stop
   DBUG_EXECUTE_IF("pause_after_io_thread_stop_hook",
                   {
                     const char act[]= "now "
                                       "WAIT_FOR reached_stopping_io_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   //Register the thread stop hook again
   error= register_binlog_relay_io_observer(&relay_io_observer,
                                            (void *)plugin_info_ptr);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert that the receiver is stopping
   bool io_stopping= channel_is_stopping(interface_channel, CHANNEL_RECEIVER_THREAD);
-  DBUG_ASSERT(io_stopping);
+  assert(io_stopping);
 
   //Assert that the receiver is running
   bool io_running= channel_is_active(interface_channel, CHANNEL_RECEIVER_THREAD);
-  DBUG_ASSERT(io_running);
+  assert(io_running);
 
   //Signal to make the MTR test case to start monitoring the I/O thread
   DBUG_EXECUTE_IF("pause_after_io_thread_stop_hook",
                   {
                     const char act[]= "now "
                                       "SIGNAL reached_io_thread_started";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   DBUG_EXECUTE_IF("pause_after_io_thread_stop_hook",
                   {
                     const char act[]= "now SIGNAL continue_to_stop_io_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   // The plug-in has missed the stop
-  DBUG_ASSERT(binlog_relay_thread_stop_call==0);
+  assert(binlog_relay_thread_stop_call==0);
 
   return (error | exists | io_stopping | io_running);
 }
@@ -932,23 +939,23 @@ bool test_channel_service_interface_is_sql_stopping()
 {
   //The initialization method should return OK
   int error= initialize_channel_service_interface();
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Initialize the channel to be used with the channel service interface
   char interface_channel[]= "example_channel";
   Channel_creation_info info;
   initialize_channel_creation_info(&info);
   error= channel_create(interface_channel, &info);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert the channel exists
   bool exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-  DBUG_ASSERT(exists);
+  assert(exists);
 
   //Unregister the thread stop hook
   error= unregister_binlog_relay_io_observer(&relay_io_observer,
                                              (void *)plugin_info_ptr);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Start the I/O thread
   Channel_connection_info connection_info;
@@ -957,55 +964,55 @@ bool test_channel_service_interface_is_sql_stopping()
                        &connection_info,
                        CHANNEL_RECEIVER_THREAD,
                        true);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Start the SQL thread
   error= channel_start(interface_channel,
                        &connection_info,
                        CHANNEL_APPLIER_THREAD,
                        true);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Wait until SQL thread reached the error and is going to stop
   DBUG_EXECUTE_IF("pause_after_sql_thread_stop_hook",
                   {
                     const char act[]= "now "
                                       "WAIT_FOR reached_stopping_sql_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   //Register the thread stop hook again
   error= register_binlog_relay_io_observer(&relay_io_observer,
                                            (void *)plugin_info_ptr);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert that the applier is stopping
   bool sql_stopping= channel_is_stopping(interface_channel, CHANNEL_APPLIER_THREAD);
-  DBUG_ASSERT(sql_stopping);
+  assert(sql_stopping);
 
   //Assert that the applier is running
   bool sql_running= channel_is_active(interface_channel, CHANNEL_APPLIER_THREAD);
-  DBUG_ASSERT(sql_running);
+  assert(sql_running);
 
   //Signal to make the MTR test case to start monitoring the SQL thread
   DBUG_EXECUTE_IF("pause_after_sql_thread_stop_hook",
                   {
                     const char act[]= "now "
                                       "SIGNAL reached_sql_thread_started";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   DBUG_EXECUTE_IF("pause_after_sql_thread_stop_hook",
                   {
                     const char act[]= "now SIGNAL continue_to_stop_sql_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   //The plug-in has missed the stop
-  DBUG_ASSERT(binlog_relay_applier_stop_call==0);
+  assert(binlog_relay_applier_stop_call==0);
 
   return (error | exists | sql_stopping | sql_running);
 }
@@ -1014,7 +1021,7 @@ bool test_channel_service_interface_relay_log_renamed()
 {
   //The initialization method should return OK
   int error= initialize_channel_service_interface();
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Initialize the channel to be used with the channel service interface
   char interface_channel[]= "example_channel";
@@ -1026,11 +1033,11 @@ bool test_channel_service_interface_relay_log_renamed()
   info.hostname= channel_hostname;
   info.user= channel_user;
   error= channel_create(interface_channel, &info);
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   //Assert the channel exists
   bool exists= channel_is_active(interface_channel, CHANNEL_NO_THD);
-  DBUG_ASSERT(exists);
+  assert(exists);
 
   //Start the SQL thread
   Channel_connection_info connection_info;
@@ -1044,16 +1051,16 @@ bool test_channel_service_interface_relay_log_renamed()
   {
     THD *thd= current_thd;
     thd->clear_error();
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     const char act[]= "now SIGNAL reached_sql_thread_startup_failed";
-    DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
+    assert(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
 #endif
   }
   else
   {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     const char act[]= "now SIGNAL reached_sql_thread_started";
-    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
 #endif
   }
 
diff --git a/plugin/rewrite_example/CMakeLists.txt b/plugin/rewrite_example/CMakeLists.txt
index 935d4cf718b9..13ee0d60670e 100644
--- a/plugin/rewrite_example/CMakeLists.txt
+++ b/plugin/rewrite_example/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/rewrite_example/rewrite_example.cc b/plugin/rewrite_example/rewrite_example.cc
index e5276a51565d..c6004cae8617 100644
--- a/plugin/rewrite_example/rewrite_example.cc
+++ b/plugin/rewrite_example/rewrite_example.cc
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/plugin/rewriter/CMakeLists.txt b/plugin/rewriter/CMakeLists.txt
index 0b92c243aaef..2aac42d6b58e 100644
--- a/plugin/rewriter/CMakeLists.txt
+++ b/plugin/rewriter/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/rewriter/README b/plugin/rewriter/README
index 59bf1175f5b6..d3a7f2bd0460 100644
--- a/plugin/rewriter/README
+++ b/plugin/rewriter/README
@@ -1,13 +1,20 @@
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/install_rewriter.sql.in b/plugin/rewriter/install_rewriter.sql.in
index fa64a159002b..7bf708f085ab 100644
--- a/plugin/rewriter/install_rewriter.sql.in
+++ b/plugin/rewriter/install_rewriter.sql.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/messages.h b/plugin/rewriter/messages.h
index 116b62ccb500..297b4d081366 100644
--- a/plugin/rewriter/messages.h
+++ b/plugin/rewriter/messages.h
@@ -1,15 +1,22 @@
 #ifndef MESSAGES_INCLUDED
 #define MESSAGES_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/persisted_rule.h b/plugin/rewriter/persisted_rule.h
index c61ccba72598..be68e7a7e223 100644
--- a/plugin/rewriter/persisted_rule.h
+++ b/plugin/rewriter/persisted_rule.h
@@ -1,15 +1,22 @@
 #ifndef PERSISTED_RULE_INCLUDED
 #define PERSISTED_RULE_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/query_builder.h b/plugin/rewriter/query_builder.h
index 2a4d21010b0e..4884fc8ce265 100644
--- a/plugin/rewriter/query_builder.h
+++ b/plugin/rewriter/query_builder.h
@@ -1,15 +1,22 @@
 #ifndef QUERY_BUILDER_INCLUDED
 #define QUERY_BUILDER_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/rewriter.cc b/plugin/rewriter/rewriter.cc
index 4a7d9090744a..78724845bfdd 100644
--- a/plugin/rewriter/rewriter.cc
+++ b/plugin/rewriter/rewriter.cc
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -113,16 +120,16 @@ bool Rewriter::load_rule(MYSQL_THD thd, Persisted_rule *diskrule)
   return true;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Normal debug sync points will not work in the THD that the plugin creates,
   so we have to call the debug sync functions ourselves.
 */
 static void do_debug_sync(MYSQL_THD thd)
 {
-  DBUG_ASSERT(opt_debug_sync_timeout > 0);
+  assert(opt_debug_sync_timeout > 0);
   const char act[]= "now signal parked wait_for go";
-  DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
+  assert(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
 }
 #endif
 
diff --git a/plugin/rewriter/rewriter.h b/plugin/rewriter/rewriter.h
index 3b6a97e3d988..d547d73efb2a 100644
--- a/plugin/rewriter/rewriter.h
+++ b/plugin/rewriter/rewriter.h
@@ -1,15 +1,22 @@
 #ifndef REWRITER_INCLUDED
 #define REWRITER_INCLUDED
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/plugin/rewriter/rewriter_plugin.cc b/plugin/rewriter/rewriter_plugin.cc
index 9740869c731c..81a63dfbdaad 100644
--- a/plugin/rewriter/rewriter_plugin.cc
+++ b/plugin/rewriter/rewriter_plugin.cc
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -266,7 +273,7 @@ bool reload(MYSQL_THD thd)
   {
     message= MESSAGE_OOM;
   }
-  DBUG_ASSERT(message != NULL);
+  assert(message != NULL);
   my_plugin_log_message(&plugin_info, MY_ERROR_LEVEL, "%s", message);
   return true;
 }
@@ -338,7 +345,7 @@ static void log_nonrewritten_query(MYSQL_THD thd, const uchar *digest_buf,
 static int rewrite_query_notify(MYSQL_THD thd, mysql_event_class_t event_class,
                                  const void *event)
 {
-  DBUG_ASSERT(event_class == MYSQL_AUDIT_PARSE_CLASS);
+  assert(event_class == MYSQL_AUDIT_PARSE_CLASS);
 
   const struct mysql_event_parse *event_parse=
     static_cast<const struct mysql_event_parse *>(event);
diff --git a/plugin/rewriter/rewriter_plugin.h b/plugin/rewriter/rewriter_plugin.h
index b16d9431c5a5..5cf3e66a8437 100644
--- a/plugin/rewriter/rewriter_plugin.h
+++ b/plugin/rewriter/rewriter_plugin.h
@@ -1,15 +1,22 @@
 #ifndef REWRITER_PLUGIN_INCLUDED
 #define REWRITER_PLUGIN_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/rewriter_udf.cc b/plugin/rewriter/rewriter_udf.cc
index 1f9a02498149..80f29bb15400 100644
--- a/plugin/rewriter/rewriter_udf.cc
+++ b/plugin/rewriter/rewriter_udf.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -40,7 +47,7 @@ my_bool load_rewrite_rules_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
 char *load_rewrite_rules(UDF_INIT *initid, UDF_ARGS *args, char *result,
                          unsigned long *length, char *is_null, char *error)
 {
-  DBUG_ASSERT(get_rewriter_plugin_info() != NULL);
+  assert(get_rewriter_plugin_info() != NULL);
   const char *message= NULL;
   if (refresh_rules_table())
   {
diff --git a/plugin/rewriter/rewriter_udf.def b/plugin/rewriter/rewriter_udf.def
index bd5900699dcb..d26d2cf1c995 100644
--- a/plugin/rewriter/rewriter_udf.def
+++ b/plugin/rewriter/rewriter_udf.def
@@ -1,13 +1,20 @@
-; Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 ;
 ; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; version 2 of the License.
+; it under the terms of the GNU General Public License, version 2.0,
+; as published by the Free Software Foundation.
+;
+; This program is also distributed with certain software (including
+; but not limited to OpenSSL) that is licensed under separate terms,
+; as designated in a particular file or component or in included license
+; documentation.  The authors of MySQL hereby grant you an additional
+; permission to link the program and your derivative works with the
+; separately licensed software that they have included with MySQL.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
+; GNU General Public License, version 2.0, for more details.
 ;
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
diff --git a/plugin/rewriter/rule.cc b/plugin/rewriter/rule.cc
index e491a6f7bd25..68049f4538af 100644
--- a/plugin/rewriter/rule.cc
+++ b/plugin/rewriter/rule.cc
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -74,7 +81,7 @@ class Parse_error_recorder : public services::Condition_handler
   */
   bool handle(int sql_errno, const char*, const char *message)
   {
-    DBUG_ASSERT(message != NULL);
+    assert(message != NULL);
     if (m_message.empty())
       m_message.assign(message);
     switch (sql_errno)
diff --git a/plugin/rewriter/rule.h b/plugin/rewriter/rule.h
index 731ee5ab10d0..3fcf038acd40 100644
--- a/plugin/rewriter/rule.h
+++ b/plugin/rewriter/rule.h
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/plugin/rewriter/services.cc b/plugin/rewriter/services.cc
index d1562e044dce..3d5782daf6bb 100644
--- a/plugin/rewriter/services.cc
+++ b/plugin/rewriter/services.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/services.h b/plugin/rewriter/services.h
index 110412eb4199..b1f25458b342 100644
--- a/plugin/rewriter/services.h
+++ b/plugin/rewriter/services.h
@@ -1,15 +1,22 @@
 #ifndef SERVICES_INCLUDED
 #define SERVICES_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/rewriter/uninstall_rewriter.sql.in b/plugin/rewriter/uninstall_rewriter.sql.in
index 35ae1e806fb6..c9c22f9bd053 100644
--- a/plugin/rewriter/uninstall_rewriter.sql.in
+++ b/plugin/rewriter/uninstall_rewriter.sql.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/plugin/semisync/CMakeLists.txt b/plugin/semisync/CMakeLists.txt
index e23ae08cd239..d3ebe1a47744 100644
--- a/plugin/semisync/CMakeLists.txt
+++ b/plugin/semisync/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/plugin/semisync/semisync.cc b/plugin/semisync/semisync.cc
index 4a80360ba4d5..4ed7f6a4210c 100644
--- a/plugin/semisync/semisync.cc
+++ b/plugin/semisync/semisync.cc
@@ -1,15 +1,22 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/semisync/semisync.h b/plugin/semisync/semisync.h
index 700f1ef266e7..d64d52084b12 100644
--- a/plugin/semisync/semisync.h
+++ b/plugin/semisync/semisync.h
@@ -1,14 +1,21 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc
index e7241805f16d..84bad4e9c52b 100644
--- a/plugin/semisync/semisync_master.cc
+++ b/plugin/semisync/semisync_master.cc
@@ -1,14 +1,21 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/semisync/semisync_master.h b/plugin/semisync/semisync_master.h
index c4e100f725dd..59c6a8489e67 100644
--- a/plugin/semisync/semisync_master.h
+++ b/plugin/semisync/semisync_master.h
@@ -1,14 +1,21 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -187,7 +194,7 @@ class TranxNodeAllocator
     }
 
     /* Node does not find should never happen */
-    DBUG_ASSERT(0);
+    assert(0);
     return 1;
   }
 
diff --git a/plugin/semisync/semisync_master_ack_receiver.cc b/plugin/semisync/semisync_master_ack_receiver.cc
index fff2c7144f79..39b90b5805c2 100644
--- a/plugin/semisync/semisync_master_ack_receiver.cc
+++ b/plugin/semisync/semisync_master_ack_receiver.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -128,7 +135,9 @@ bool Ack_receiver::add_slave(THD *thd)
   const char *kWho = "Ack_receiver::add_slave";
   function_enter(kWho);
 
-  slave.thd= thd;
+  slave.thread_id= thd->thread_id();
+  slave.server_id= thd->server_id;
+  slave.net_compress= thd->get_protocol_classic()->get_compression();
   slave.vio= *thd->get_protocol_classic()->get_vio();
   slave.vio.mysql_socket.m_psi= NULL;
   slave.vio.read_timeout= 1;
@@ -163,7 +172,7 @@ void Ack_receiver::remove_slave(THD *thd)
 
   for (it= m_slaves.begin(); it != m_slaves.end(); it++)
   {
-    if (it->thd == thd)
+    if (it->thread_id == thd->thread_id())
     {
       m_slaves.erase(it);
       m_slaves_changed= true;
@@ -202,11 +211,7 @@ void Ack_receiver::run()
   NET net;
   unsigned char net_buff[REPLY_MESSAGE_MAX_LENGTH];
   uint i;
-#ifdef HAVE_POLL
-  Poll_socket_listener listener(m_slaves);
-#else
-  Select_socket_listener listener(m_slaves);
-#endif //HAVE_POLL
+  Socket_listener listener;
 
   sql_print_information("Starting ack receiver thread");
 
@@ -234,14 +239,14 @@ void Ack_receiver::run()
         mysql_mutex_unlock(&m_mutex);
         continue;
       }
-      if (!listener.init_slave_sockets())
+      if (!listener.init_slave_sockets(m_slaves))
         goto end;
       m_slaves_changed= false;
     }
+    mysql_mutex_unlock(&m_mutex);
     ret= listener.listen_on_sockets();
     if (ret <= 0)
     {
-      mysql_mutex_unlock(&m_mutex);
 
       ret= DBUG_EVALUATE_IF("rpl_semisync_simulate_select_error", -1, ret);
 
@@ -255,33 +260,32 @@ void Ack_receiver::run()
 
     set_stage_info(stage_reading_semi_sync_ack);
     i= 0;
-    while (i < m_slaves.size())
+    while (i < listener.number_of_slave_sockets() && m_status == ST_UP)
     {
       if (listener.is_socket_active(i))
       {
+        Slave slave_obj= listener.get_slave_obj(i);
         ulong len;
-        net.vio= &m_slaves[i].vio;
+        net.vio= &slave_obj.vio;
         /*
           Set compress flag. This is needed to support
           Slave_compress_protocol flag enabled Slaves
         */
-        net.compress=
-          m_slaves[i].thd->get_protocol_classic()->get_compression();
+        net.compress= slave_obj.net_compress;
 
         do {
           net_clear(&net, 0);
 
           len= my_net_read(&net);
           if (likely(len != packet_error))
-            repl_semisync.reportReplyPacket(m_slaves[i].server_id(),
+            repl_semisync.reportReplyPacket(slave_obj.server_id,
                                             net.read_pos, len);
           else if (net.last_errno == ER_NET_READ_ERROR)
             listener.clear_socket_info(i);
-        } while (net.vio->has_data(net.vio));
+        } while (net.vio->has_data(net.vio) && m_status == ST_UP);
       }
       i++;
     }
-    mysql_mutex_unlock(&m_mutex);
   }
 end:
   sql_print_information("Stopping ack receiver thread");
diff --git a/plugin/semisync/semisync_master_ack_receiver.h b/plugin/semisync/semisync_master_ack_receiver.h
index 62c1be29c21b..755e6cda4e58 100644
--- a/plugin/semisync/semisync_master_ack_receiver.h
+++ b/plugin/semisync/semisync_master_ack_receiver.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -23,11 +30,12 @@
 
 struct Slave
 {
-  THD *thd;
+  uint32_t thread_id;
   Vio vio;
+  uint server_id;
+  bool net_compress;
 
   my_socket sock_fd() const { return vio.mysql_socket.fd; }
-  uint server_id() const { return thd->server_id; }
 };
 
 typedef std::vector<Slave> Slave_vector;
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc
index affc063a7669..b62e63cad0a7 100644
--- a/plugin/semisync/semisync_master_plugin.cc
+++ b/plugin/semisync/semisync_master_plugin.cc
@@ -1,14 +1,21 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/semisync/semisync_master_socket_listener.h b/plugin/semisync/semisync_master_socket_listener.h
index ceaf249999ba..cfb79dc07a84 100644
--- a/plugin/semisync/semisync_master_socket_listener.h
+++ b/plugin/semisync/semisync_master_socket_listener.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,8 +31,7 @@
 class Poll_socket_listener
 {
 public:
-  Poll_socket_listener(const Slave_vector &slaves)
-    :m_slaves(slaves)
+  Poll_socket_listener()
   {
   }
 
@@ -45,8 +51,9 @@ class Poll_socket_listener
     m_fds[index].events= 0;
   }
 
-  bool init_slave_sockets()
+  bool init_slave_sockets(Slave_vector slaves)
   {
+    m_slaves= slaves;
     m_fds.clear();
     for (uint i= 0; i < m_slaves.size(); i++)
     {
@@ -57,19 +64,29 @@ class Poll_socket_listener
     }
     return true;
   }
+  uint number_of_slave_sockets()
+  {
+    return m_slaves.size();
+  }
+
+  Slave get_slave_obj(int index)
+  {
+    return m_slaves[index];
+  }
 
 private:
-  const Slave_vector &m_slaves;
+  Slave_vector m_slaves;
   std::vector<pollfd> m_fds;
 };
 
+typedef class Poll_socket_listener Socket_listener;
 #else //NO POLL
 
 class Select_socket_listener
 {
 public:
-  Select_socket_listener(const Slave_vector &slaves)
-    :m_slaves(slaves), m_max_fd(INVALID_SOCKET)
+  Select_socket_listener()
+    :m_max_fd(INVALID_SOCKET)
   {
   }
 
@@ -92,8 +109,9 @@ class Select_socket_listener
     FD_CLR(m_slaves[index].sock_fd(), &m_init_fds);
   }
 
-  bool init_slave_sockets()
+  bool init_slave_sockets(Slave_vector slaves)
   {
+    m_slaves= slaves;
     FD_ZERO(&m_init_fds);
     for (uint i= 0; i < m_slaves.size(); i++)
     {
@@ -112,13 +130,23 @@ class Select_socket_listener
     }
     return true;
   }
+  uint number_of_slave_sockets()
+  {
+    return m_slaves.size();
+  }
+
+  Slave get_slave_obj(int index)
+  {
+    return m_slaves[index];
+  }
 
 private:
-  const Slave_vector &m_slaves;
+  Slave_vector m_slaves;
   my_socket m_max_fd;
   fd_set m_init_fds;
   fd_set m_fds;
 };
 
+typedef class Select_socket_listener Socket_listener;
 #endif //HAVE_POLL
 #endif //SEMISYNC_MASTER_SOCKET_LISTENER
diff --git a/plugin/semisync/semisync_slave.cc b/plugin/semisync/semisync_slave.cc
index d89d1858c82d..06be7361c1ba 100644
--- a/plugin/semisync/semisync_slave.cc
+++ b/plugin/semisync/semisync_slave.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -114,9 +121,9 @@ int ReplSemiSyncSlave::slaveReply(MYSQL *mysql,
                   {
                     const char act[]=
                       "now SIGNAL sending_ack WAIT_FOR continue";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   /* Prepare the buffer of the reply. */
diff --git a/plugin/semisync/semisync_slave.h b/plugin/semisync/semisync_slave.h
index 1bf8cf31972e..b91674774d91 100644
--- a/plugin/semisync/semisync_slave.h
+++ b/plugin/semisync/semisync_slave.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc
index 50a8cfcb5f1e..fe544ad4ff64 100644
--- a/plugin/semisync/semisync_slave_plugin.cc
+++ b/plugin/semisync/semisync_slave_plugin.cc
@@ -1,15 +1,22 @@
 /* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
-   Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -44,7 +51,7 @@ int repl_semi_slave_request_dump(Binlog_relay_IO_param *param,
 {
   MYSQL *mysql= param->mysql;
   MYSQL_RES *res= 0;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   MYSQL_ROW row= NULL;
 #endif
   const char *query;
@@ -67,14 +74,14 @@ int repl_semi_slave_request_dump(Binlog_relay_IO_param *param,
   }
   else
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     row=
 #endif
       mysql_fetch_row(res);
   }
 
-  DBUG_ASSERT(mysql_error == ER_UNKNOWN_SYSTEM_VARIABLE ||
-              strtoul(row[0], 0, 10) == 0 || strtoul(row[0], 0, 10) == 1);
+  assert(mysql_error == ER_UNKNOWN_SYSTEM_VARIABLE ||
+         strtoul(row[0], 0, 10) == 0 || strtoul(row[0], 0, 10) == 1);
 
   if (mysql_error == ER_UNKNOWN_SYSTEM_VARIABLE)
   {
diff --git a/plugin/test_service_sql_api/CMakeLists.txt b/plugin/test_service_sql_api/CMakeLists.txt
index 0dc43f3320b4..0973c0faf0e7 100644
--- a/plugin/test_service_sql_api/CMakeLists.txt
+++ b/plugin/test_service_sql_api/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -15,6 +22,13 @@
 # 
 # Test session API
 
+# Silence warnings in test code for now.
+# Bug#27572037 REFACTOR CODE IN TEST_SERVICE_SQL_API
+MY_CHECK_CXX_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION)
+IF(HAVE_STRINGOP_TRUNCATION)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
+ENDIF()
+
 MYSQL_ADD_PLUGIN(test_session_in_thd test_session_in_thd.cc
   MODULE_ONLY MODULE_OUTPUT_NAME "libtest_session_in_thd")
 
diff --git a/plugin/test_service_sql_api/README b/plugin/test_service_sql_api/README
index 16a5fbef2c10..74d6c2a26d60 100644
--- a/plugin/test_service_sql_api/README
+++ b/plugin/test_service_sql_api/README
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_service_sql_api/test_session_detach.cc b/plugin/test_service_sql_api/test_session_detach.cc
index 954d492c1475..f0f9203b0e83 100644
--- a/plugin/test_service_sql_api/test_session_detach.cc
+++ b/plugin/test_service_sql_api/test_session_detach.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -246,7 +253,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_session_in_thd.cc b/plugin/test_service_sql_api/test_session_in_thd.cc
index c2aecd616a62..1aedade9c18d 100644
--- a/plugin/test_service_sql_api/test_session_in_thd.cc
+++ b/plugin/test_service_sql_api/test_session_in_thd.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_service_sql_api/test_session_info.cc b/plugin/test_service_sql_api/test_session_info.cc
index 93db95d0c3d5..18d364dbbece 100644
--- a/plugin/test_service_sql_api/test_session_info.cc
+++ b/plugin/test_service_sql_api/test_session_info.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -267,7 +274,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_2_sessions.cc b/plugin/test_service_sql_api/test_sql_2_sessions.cc
index 4f3ab4d4c7ad..ae68d198fdae 100644
--- a/plugin/test_service_sql_api/test_sql_2_sessions.cc
+++ b/plugin/test_service_sql_api/test_sql_2_sessions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -268,7 +275,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_9_sessions.cc b/plugin/test_service_sql_api/test_sql_9_sessions.cc
index 40e6baa12963..c0e350b74941 100644
--- a/plugin/test_service_sql_api/test_sql_9_sessions.cc
+++ b/plugin/test_service_sql_api/test_sql_9_sessions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_service_sql_api/test_sql_all_col_types.cc b/plugin/test_service_sql_api/test_sql_all_col_types.cc
index 815ec890433e..de6969b5e9b1 100644
--- a/plugin/test_service_sql_api/test_sql_all_col_types.cc
+++ b/plugin/test_service_sql_api/test_sql_all_col_types.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -248,7 +255,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_cmds_1.cc b/plugin/test_service_sql_api/test_sql_cmds_1.cc
index 7ad5137565e5..ccda0c08b092 100644
--- a/plugin/test_service_sql_api/test_sql_cmds_1.cc
+++ b/plugin/test_service_sql_api/test_sql_cmds_1.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_service_sql_api/test_sql_commit.cc b/plugin/test_service_sql_api/test_sql_commit.cc
index ce0ba9a162ff..1d143f311d0b 100644
--- a/plugin/test_service_sql_api/test_sql_commit.cc
+++ b/plugin/test_service_sql_api/test_sql_commit.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -248,7 +255,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_complex.cc b/plugin/test_service_sql_api/test_sql_complex.cc
index 4dfe7df6916a..0d29e4172f7a 100644
--- a/plugin/test_service_sql_api/test_sql_complex.cc
+++ b/plugin/test_service_sql_api/test_sql_complex.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -316,7 +323,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_errors.cc b/plugin/test_service_sql_api/test_sql_errors.cc
index a8983ce62502..bc19046be97b 100644
--- a/plugin/test_service_sql_api/test_sql_errors.cc
+++ b/plugin/test_service_sql_api/test_sql_errors.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -271,7 +278,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_lock.cc b/plugin/test_service_sql_api/test_sql_lock.cc
index c97cc49448a2..29bd42a5a87f 100644
--- a/plugin/test_service_sql_api/test_sql_lock.cc
+++ b/plugin/test_service_sql_api/test_sql_lock.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -247,7 +254,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_processlist.cc b/plugin/test_service_sql_api/test_sql_processlist.cc
index 8b4618dbcd43..e0f25bafd167 100644
--- a/plugin/test_service_sql_api/test_sql_processlist.cc
+++ b/plugin/test_service_sql_api/test_sql_processlist.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -261,7 +268,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_replication.cc b/plugin/test_service_sql_api/test_sql_replication.cc
index ac9b4bbc9a3b..e334be0a9711 100644
--- a/plugin/test_service_sql_api/test_sql_replication.cc
+++ b/plugin/test_service_sql_api/test_sql_replication.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -244,7 +251,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_shutdown.cc b/plugin/test_service_sql_api/test_sql_shutdown.cc
index 7b47a161153c..7ca155cfc335 100644
--- a/plugin/test_service_sql_api/test_sql_shutdown.cc
+++ b/plugin/test_service_sql_api/test_sql_shutdown.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -251,7 +258,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_sqlmode.cc b/plugin/test_service_sql_api/test_sql_sqlmode.cc
index 8ec25a0e06dd..ebd4c1dce036 100644
--- a/plugin/test_service_sql_api/test_sql_sqlmode.cc
+++ b/plugin/test_service_sql_api/test_sql_sqlmode.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -304,7 +311,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc b/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc
index ec2d1a4476e7..ba4bd4a9802f 100644
--- a/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc
+++ b/plugin/test_service_sql_api/test_sql_stored_procedures_functions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -268,7 +275,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_sql_views_triggers.cc b/plugin/test_service_sql_api/test_sql_views_triggers.cc
index 3fd3916e876c..be3d8c95710a 100644
--- a/plugin/test_service_sql_api/test_sql_views_triggers.cc
+++ b/plugin/test_service_sql_api/test_sql_views_triggers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -268,7 +275,7 @@ static int sql_get_null(void *ctx)
   uint col= pctx->current_col;
   pctx->current_col++;
 
-  strncpy(pctx->sql_str_value[row][col], "[NULL]", sizeof("[NULL]")-1);
+  strcpy(pctx->sql_str_value[row][col], "[NULL]");
   pctx->sql_str_len[row][col]=  sizeof("[NULL]")-1;
 
   DBUG_RETURN(false);
diff --git a/plugin/test_service_sql_api/test_x_sessions_deinit.cc b/plugin/test_service_sql_api/test_x_sessions_deinit.cc
index a725750d117b..6373d2485dd1 100644
--- a/plugin/test_service_sql_api/test_x_sessions_deinit.cc
+++ b/plugin/test_service_sql_api/test_x_sessions_deinit.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_service_sql_api/test_x_sessions_init.cc b/plugin/test_service_sql_api/test_x_sessions_init.cc
index 448a95b31013..9df93054ba47 100644
--- a/plugin/test_service_sql_api/test_x_sessions_init.cc
+++ b/plugin/test_service_sql_api/test_x_sessions_init.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_services/CMakeLists.txt b/plugin/test_services/CMakeLists.txt
index 90842db22d71..a61704a6f52d 100644
--- a/plugin/test_services/CMakeLists.txt
+++ b/plugin/test_services/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/test_services/README b/plugin/test_services/README
index 9ebbe7735949..bc1ccbe26663 100644
--- a/plugin/test_services/README
+++ b/plugin/test_services/README
@@ -1,13 +1,20 @@
-Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_services/test_framework.cc b/plugin/test_services/test_framework.cc
index 244414318666..f2bdb4fde032 100644
--- a/plugin/test_services/test_framework.cc
+++ b/plugin/test_services/test_framework.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_services/test_services.cc b/plugin/test_services/test_services.cc
index 0c036ff8e1ef..306bf8d1e78d 100644
--- a/plugin/test_services/test_services.cc
+++ b/plugin/test_services/test_services.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/test_services/test_services_threaded.cc b/plugin/test_services/test_services_threaded.cc
index 0ee12d748d60..b472e8c754e7 100644
--- a/plugin/test_services/test_services_threaded.cc
+++ b/plugin/test_services/test_services_threaded.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/udf_services/CMakeLists.txt b/plugin/udf_services/CMakeLists.txt
index 7b2fc4f131c3..5b92b3c1a0f4 100644
--- a/plugin/udf_services/CMakeLists.txt
+++ b/plugin/udf_services/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/udf_services/test_udf_services.cc b/plugin/udf_services/test_udf_services.cc
index 2baf65178fb8..cdd40076ff5b 100644
--- a/plugin/udf_services/test_udf_services.cc
+++ b/plugin/udf_services/test_udf_services.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/plugin/version_token/CMakeLists.txt b/plugin/version_token/CMakeLists.txt
index b838f3aa219b..c65201222eea 100644
--- a/plugin/version_token/CMakeLists.txt
+++ b/plugin/version_token/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/plugin/version_token/version_token.cc b/plugin/version_token/version_token.cc
index d5e22ba14ac4..7e52c2953aa7 100644
--- a/plugin/version_token/version_token.cc
+++ b/plugin/version_token/version_token.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -488,7 +495,7 @@ static int version_token_check(MYSQL_THD thd,
   const uchar *command= (const uchar *) event_general->general_command.str;
   size_t length= event_general->general_command.length;
 
-  DBUG_ASSERT(event_class == MYSQL_AUDIT_GENERAL_CLASS);
+  assert(event_class == MYSQL_AUDIT_GENERAL_CLASS);
 
   switch (event_general->event_subclass)
   {
diff --git a/rapid/plugin/group_replication/CMakeLists.txt b/rapid/plugin/group_replication/CMakeLists.txt
index 5bcaa8b0eddb..da296d84ccd1 100644
--- a/rapid/plugin/group_replication/CMakeLists.txt
+++ b/rapid/plugin/group_replication/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -34,7 +41,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/include/                   # config.h
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include/   # byteorder.h
   ${SSL_INCLUDE_DIRS}                            # SSL include dirs
-  ${LZ4_INCLUDE_DIR}                             # LZ4
   ${XCOM_WINDEPS_INCLUDE_DIRS}                   # win deps and sun rpc
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/sql_service
@@ -156,20 +162,11 @@ SET(GROUP_REPLICATION_SOURCES
 
 ADD_DEFINITIONS(${SSL_DEFINES})
 
-IF(WITH_SSL MATCHES "bundled")
-    # add YASSL_MYSQL_COMPATIBLE when building XCom and GCS with SSL.
-    # This needs to exist because XCom is implemented in pure C.
-    # Setting these flags will make yaSSL code to build with C compatible
-    # interface.
-    ADD_COMPILE_FLAGS(${XCOM_SOURCES} COMPILE_FLAGS
-                                             "-DYASSL_MYSQL_COMPATIBLE")
-    ADD_COMPILE_FLAGS(${GCS_SOURCES} COMPILE_FLAGS
-                                             "-DYASSL_MYSQL_COMPATIBLE")
-ENDIF()
-
 # add the definition to build XCom with SSL support
 ADD_DEFINITIONS(-DXCOM_HAVE_OPENSSL)
 
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+    libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c)
 
 IF(WITH_UNIT_TESTS)
   ADD_CONVENIENCE_LIBRARY(gr_unit_test_resource
@@ -197,6 +194,12 @@ ELSEIF(WITH_GCS_LOG_DEBUG)
                                              "-DWITH_LOG_DEBUG")
 ENDIF()
 
+MY_CHECK_C_COMPILER_FLAG("-Wcast-function-type" HAVE_CAST_FUNCTION_TYPE)
+IF(HAVE_CAST_FUNCTION_TYPE)
+  ADD_COMPILE_FLAGS(libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c
+                    COMPILE_FLAGS "-Wno-cast-function-type")
+ENDIF()
+
 ### Configuration ###
 
 # disabling warnings for generated code
@@ -210,14 +213,18 @@ ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
     "-Wno-unused-variable -Wno-unused-function -Wno-conversion -Wno-switch")
 ENDIF()
 
+IF (WIN32)
+  SET(LIBRARIES_TO_LINK ${LZ4_LIBRARY} ${SSL_LIBRARIES} ${TIRPC_LIBRARIES} crypt32)
+ELSE()
+  SET(LIBRARIES_TO_LINK ${LZ4_LIBRARY} ${SSL_LIBRARIES} ${TIRPC_LIBRARIES})
+ENDIF()
+
 # declare the plugin itself
 MYSQL_ADD_PLUGIN(group_replication
                  ${XCOM_SOURCES}
                  ${GCS_SOURCES}
                  ${GROUP_REPLICATION_SOURCES}
-                 LINK_LIBRARIES
-                 ${LZ4_LIBRARY}
-                 ${SSL_LIBRARIES}
+                 LINK_LIBRARIES ${LIBRARIES_TO_LINK}
                  MODULE_ONLY MODULE_OUTPUT_NAME "group_replication")
 
 ### INSTALLATION ###
diff --git a/rapid/plugin/group_replication/README b/rapid/plugin/group_replication/README
deleted file mode 100644
index 92844862579a..000000000000
--- a/rapid/plugin/group_replication/README
+++ /dev/null
@@ -1,563 +0,0 @@
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-=*= MySQL Group Replication =*=
-===============================
-
-The multi master plugin for MySQL is here. MySQL Group Replication enables
-virtual synchronous updates on any member in a group of MySQL servers, with
-conflict handling and failure detection. Distributed recovery is also in the
-package to ease the process of adding new servers to your group.
-
-
-* == Pre requisites == *
-
-Under the hood, the plugin is powered by group communication protocols.
-They run a failure detection and membership service, safe and totally
-ordered message delivery. All these services are key to make sure that data
-is consistently replicated across a group of servers. At the core, there is
-an implementation of Paxos (code named XCom) which acts as the group
-communication system engine.
-
-
-* == Plugin install == *
-
-Please check http://dev.mysql.com/doc/refman/5.7/en/installing.html
-
-
-* == Plugin's required configurations  == *
-
-As any new feature, the Group Replication plugin includes some limitations and
-requirements that emerge from its underlying characteristics. When configuring
-a server and your data for multi master you will need:
-
-1) Have the binlog active and its logging format set to ROW.
-
-   Like on standard replication, multi master replication is based on the
-   transmission of log events. Its inner mechanism are however based on the
-   write sets generated during row based logging so row based replication is a
-   requirement.
-
-   Server options:
-     -–log-bin
-     --binlog-format=row
-
-2) Have GTIDs enabled.
-   MySQL Group Replication depends on GTIDs, used to identify what
-   transactions were executed in the group, and for that reason vital to the
-   distributed recovery process.
-
-   Server options:
-     --gtid-mode=on
-     --enforce-gtid-consistency
-     --log-slave-updates
-
-3) Use the InnoDB engine.
-   Synchronous multi master is dependent on transactional tables so only
-   InnoDB is supported. Since this is now the default engine, you only have to
-   be careful when creating individual tables.
-
-4) Every table must have a primary key.
-   Multi master concurrency control is based on primary keys. Every change
-   made to a table line is indexed to its primary key so this is a fundamental
-   requirement.
-
-5) Table based repositories
-   The relay log info and master info repositories must have their type set to
-   TABLE. Since group replication relies on channels for its applier and
-   recovery mechanism, table repositories are needed to isolate their
-   execution info.
-
-   Server options:
-     --master-info-repository=TABLE
-     --relay-log-info-repository=TABLE
-
-6) Set the transaction write set extraction algorithm
-   The process of extracting what writes were made during a transaction is
-   crucial for conflict detection on all group servers. This extracted
-   information is then hashed using a specified algorithm that must be chosen
-   upfront. Currently there are two available algorithms: XXHASH64 and
-   MURMUR32.
-
-   Server options:
-     --transaction-write-set-extraction=XXHASH64
-
- 7) GCS engine
-    The GCS module relies on an implementation of Paxos developed at Oracle
-    (codename: XCom) as the building block to provide distributed agreement
-    between servers.
-
-    To configure the GCS engine there are four options, described here:
-
-    group_replication_local_address
-    -------------------------------
-    The member local address, i.e., host:port that member will expose
-    itself to be contacted by the group.
-    Default value: empty string.
-
-    group_replication_group_seeds
-    --------------------------------
-    The list of peers, comma separated. E.g., host1:port1,host2:port2,
-    that also belong to the group.
-    If the server is not configured to bootstrap a group it will
-    sequentially contact the peers in the group in order to be added or
-    removed from it.
-    If the list contains its member local address, it will be ignored.
-    Default value: empty string.
-
-    group_replication_bootstrap_group
-    ---------------------------------
-    If set to true, the server will bootstrap the group.
-    group_replication_group_seeds has no effect if this option is set
-    to true.
-    Default value: False.
-
-    ==> Sample configuration for a 3 member group
-
-    We are using global variables, but the configuration can be set on
-    configuration files.
-
-    Server 1:
-    > SET GLOBAL group_replication_group_name= "UUID";
-    > SET GLOBAL group_replication_local_address="192.168.0.1:10300";
-    > SET GLOBAL group_replication_group_seeds= \
-      "192.168.0.1:10300,192.168.0.2:10300,192.168.0.3:10300";
-    > SET GLOBAL group_replication_bootstrap_group= 1;
-
-    Server 2:
-    > SET GLOBAL group_replication_group_name= "UUID";
-    > SET GLOBAL group_replication_local_address="192.168.0.2:10300";
-    > SET GLOBAL group_replication_group_seeds= \
-      "192.168.0.1:10300,192.168.0.2:10300,192.168.0.3:10300";
-
-    Server 3:
-    > SET GLOBAL group_replication_group_name= "UUID";
-    > SET GLOBAL group_replication_local_address="192.168.0.3:10300";
-    > SET GLOBAL group_replication_group_seeds= \
-      "192.168.0.1:10300,192.168.0.2:10300,192.168.0.3:10300";
-
-    The group member join order must be:
-     1) server 1 (the one with group_replication_bootstrap_group= 1);
-     2) all others.
-
-    After server 1 bootstraps the group, its
-    group_replication_bootstrap_group must be set to 0, in order to it to
-    be able to leave and rejoin, if needed, the *same* group instead of
-    starting a new one.
-
-
-Other current limitations:
-
-1) Binlog Event checksum use must be OFF.
-   Due to needed changes in the checksum mechanism, multi master is
-   incompatible with these features as of now.
-
-   Server options:
-     --binlog-checksum=NONE
-
-2) No concurrent DDL
-   As of now, DDL statements can't be concurrently executed with other DDL
-   queries or even DML.
-
-* == Hands on with MySQL Group Replication == *
-
-First of all, set-up a group of servers using the provided binaries that come
-with the release or compile them yourself following the generic MySQL
-compilation instructions.
-
-To test this on you desktop, use a group of physical or virtual machines, the
-only requirement is that all your machines are network reachable. In this
-example, three machines are spawn from the same machine with different data
-folders.
-
-
-==> Start the servers with the plugin and all the necessary options
-
-Server 1
-
-  $ ./bin/mysqld --no-defaults --basedir=. --datadir=data01 -P 13001 \
-    --socket=mysqld1.sock --log-bin=master-bin --server-id=1         \
-    --gtid-mode=on --enforce-gtid-consistency --log-slave-updates    \
-    --binlog-checksum=NONE --binlog-format=row                       \
-    --master-info-repository=TABLE --relay-log-info-repository=TABLE \
-    --transaction-write-set-extraction=XXHASH64                      \
-    --plugin-dir=lib/plugin --plugin-load=group_replication.so
-
-Server 2
-
-  $ ./bin/mysqld --no-defaults --basedir=. --datadir=data02 -P 13002 \
-    --socket=mysqld2.sock --log-bin=master-bin --server-id=2         \
-    --gtid-mode=on --enforce-gtid-consistency --log-slave-updates    \
-    --binlog-checksum=NONE --binlog-format=row                       \
-    --master-info-repository=TABLE --relay-log-info-repository=TABLE \
-    --transaction-write-set-extraction=XXHASH64                      \
-    --plugin-dir=lib/plugin --plugin-load=group_replication.so
-
-Server 3
-
-  $ ./bin/mysqld --no-defaults --basedir=. --datadir=data03 -P 13003 \
-    --socket=mysqld3.sock --log-bin=master-bin --server-id=3         \
-    --gtid-mode=on --enforce-gtid-consistency --log-slave-updates    \
-    --binlog-checksum=NONE --binlog-format=row                       \
-    --master-info-repository=TABLE --relay-log-info-repository=TABLE \
-    --transaction-write-set-extraction=XXHASH64                      \
-    --plugin-dir=lib/plugin --plugin-load=group_replication.so
-
-On Windows systems the plugin filename is group_replication.dll
-
-Alternatively, if you have a running server without the plugin loaded
-you can install it on run-time. This implies that you have GTID mode
-ON, row based logging and all the above requirements correctly
-configured.
-
-  $ ./bin/mysql -uroot -h 127.0.0.1 -P 13001 --prompt='server1>'
-
-  server1> INSTALL PLUGIN group_replication SONAME 'group_replication.so';
-
-On Windows systems the plugin filename is group_replication.dll
-
-
-=> Create a replication user
-
-Needed for inter member connections, as described below, all group servers
-should have a valid replication user.
-
-  server> CREATE USER rpl_user@'%';
-  server> GRANT REPLICATION SLAVE ON *.* TO rpl_user@'%' IDENTIFIED BY 'rpl_pass';
-  server> FLUSH PRIVILEGES;
-
-
-==> Configure it
-
-The first step on configuring a MySQL Group server is to define a
-unique name that identifies the group and allows its members to join.
-This name must be defined on every member, and since it works also as the
-group UUID, it must be a valid UUID.
-
-  server1> SET GLOBAL group_replication_group_name= "8a94f357-aab4-11df-86ab-c80aa9429562";
-
-Besides this, you should also configure the access credentials for recovery.
-These settings are used by joining servers to establish a slave connection to a
-donor when entering the group, allowing them to receive missing data. Ignored
-on the first member that forms the group, you should always configure it on
-every server anyway, as they may fail and be reinstated at any moment in time.
-
-By default the configured value of the user and password to be used for
-connecting to the donor is empty i.e. "". To change the values you need to
-execute CHANGE MASTER FOR CHANNEL 'group_replication_recovery' which will
-not only create the recovery channel to connect to the donor but will also set
-the username and password value to be used.
-
-  server1> CHANGE MASTER TO MASTER_USER='rpl_user', MASTER_PASSWORD='rpl_pass' FOR CHANNEL 'group_replication_recovery';
-
-Please note: You can only set the username and password value for the
-group_replication_recovery channel. Any other valid CHANGE MASTER parameter
-set for this channel will return an error.
-
-Most of this channel parameters are automatically configured by the recovery
-process, so you can never define to which server a joiner shall connect for
-example. You can however use the recovery’s retry count and reconnect interval
-variables. These field tells recovery how many times it should try to connect
-to the available donors and how much time to wait when every attempt to connect
-to all group donors fails. By default, retry count is equal to 10 and the
-reconnect interval is set to 60 seconds.
-
-If you want to modify them, just use a variation of the example commands:
-
-  server1> SET GLOBAL group_replication_recovery_retry_count= 2;
-
-  server1> SET GLOBAL group_replication_recovery_reconnect_interval= 120;
-
-Configure group communication settings:
-  server1> SET GLOBAL group_replication_local_address="127.0.0.1:10301";
-  server1> SET GLOBAL group_replication_group_seeds= \
-           "127.0.0.1:10301,127.0.0.1:10302,127.0.0.1:10303";
-  server1> SET GLOBAL group_replication_bootstrap_group= 1;
-
-==> Start multi master replication
-
-  server1> START GROUP_REPLICATION;
-  server1> SET GLOBAL group_replication_bootstrap_group= 0;
-
-==> Check the server status
-
- server1> SELECT * FROM performance_schema.replication_connection_status\G
- *************************** 1. row ***************************
-              CHANNEL_NAME: group_replication_applier
-                GROUP_NAME: 8a94f357-aab4-11df-86ab-c80aa9429562
-               SOURCE_UUID: 8a94f357-aab4-11df-86ab-c80aa9429562
-                 THREAD_ID: NULL
-             SERVICE_STATE: ON
- COUNT_RECEIVED_HEARTBEATS: 0
-  LAST_HEARTBEAT_TIMESTAMP: 0000-00-00 00:00:00
-  RECEIVED_TRANSACTION_SET: 8a94f357-aab4-11df-86ab-c80aa9429562:1
-         LAST_ERROR_NUMBER: 0
-        LAST_ERROR_MESSAGE:
-      LAST_ERROR_TIMESTAMP: 0000-00-00 00:00:00
-
-Here you can see the information about group replication through the status of
-its main channel. Besides the name you know the group replication applier is
-running and that no error was detected.
-
-
-==> Check the group members
-
-  server1> SELECT * FROM performance_schema.replication_group_members;
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | CHANNEL_NAME              | MEMBER_ID                            | MEMBER_HOST   | MEMBER_PORT | MEMBER_STATE |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | group_replication_applier | e221c36c-c652-11e4-956d-6067203feba0 | 127.0.0.1     |       13001 | ONLINE       |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-
-
-==> Test query execution
-
-Start server 2:
-
-  server2> SET GLOBAL group_replication_group_name= "8a94f357-aab4-11df-86ab-c80aa9429562";
-  server2> CHANGE MASTER TO MASTER_USER='rpl_user', MASTER_PASSWORD='rpl_pass' FOR CHANNEL 'group_replication_recovery';
-  server2> SET GLOBAL group_replication_local_address="127.0.0.1:10302";
-  server2> SET GLOBAL group_replication_group_seeds= \
-           "127.0.0.1:10301,127.0.0.1:10302,127.0.0.1:10303";
-  server2> START GROUP_REPLICATION;
-
-  server2> SELECT * FROM performance_schema.replication_group_members;
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | CHANNEL_NAME              | MEMBER_ID                            | MEMBER_HOST   | MEMBER_PORT | MEMBER_STATE |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | group_replication_applier | c55e10ed-c654-11e4-957a-6067203feba0 | 127.0.0.1     |       13002 | ONLINE       |
-  | group_replication_applier | e221c36c-c652-11e4-956d-6067203feba0 | 127.0.0.1     |       13001 | ONLINE       |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-
-Insert some data on server 1:
-
-  server1> CREATE DATABASE test;
-  server1> CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-  server1> INSERT INTO test.t1 VALUES (1);
-
-
-Alternate between servers and check the data flow:
-
-  server2> SELECT * FROM test.t1;
-  +----+
-  | c1 |
-  +----+
-  |  1 |
-  +----+
-
-  server2> INSERT INTO test.t1 VALUES (2);
-
-  server1> SELECT * FROM test.t1;
-  +----+
-  | c1 |
-  +----+
-  |  1 |
-  |  2 |
-  +----+
-
-
-==> See distributed recovery in action
-
-When you start a new server, it will try to get all the data it is missing from
-the other group members. It will use the configured access credentials and
-connect to another member fetching the missing group transactions.
-During this period its state will be shown as 'RECOVERING', and you should not
-preform any action on this server during this phase.
-
-
-  server3> SET GLOBAL group_replication_group_name= "8a94f357-aab4-11df-86ab-c80aa9429562";
-  server3> CHANGE MASTER TO MASTER_USER='rpl_user', MASTER_PASSWORD='rpl_pass' FOR CHANNEL 'group_replication_recovery';
-  server3> SET GLOBAL group_replication_local_address="127.0.0.1:10303";
-  server3> SET GLOBAL group_replication_group_seeds= \
-           "127.0.0.1:10301,127.0.0.1:10302,127.0.0.1:10303";
-  server3> START GROUP_REPLICATION;
-
-  server3> SELECT * FROM performance_schema.replication_group_members;
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | CHANNEL_NAME              | MEMBER_ID                            | MEMBER_HOST   | MEMBER_PORT | MEMBER_STATE |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | group_replication_applier | 43d16968-c656-11e4-9583-6067203feba0 | 127.0.0.1     |       13003 | RECOVERING   |
-  | group_replication_applier | c55e10ed-c654-11e4-957a-6067203feba0 | 127.0.0.1     |       13002 | ONLINE       |
-  | group_replication_applier | e221c36c-c652-11e4-956d-6067203feba0 | 127.0.0.1     |       13001 | ONLINE       |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-
-Wait for it to be online. Truth is that here, with such a small
-amount of data, this state is hard to spot. However, you should be
-aware of this when dealing with real data sets.
-
-  server3> SELECT * FROM performance_schema.replication_group_members;
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | CHANNEL_NAME              | MEMBER_ID                            | MEMBER_HOST   | MEMBER_PORT | MEMBER_STATE |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-  | group_replication_applier | 43d16968-c656-11e4-9583-6067203feba0 | 127.0.0.1     |       13003 | ONLINE       |
-  | group_replication_applier | c55e10ed-c654-11e4-957a-6067203feba0 | 127.0.0.1     |       13002 | ONLINE       |
-  | group_replication_applier | e221c36c-c652-11e4-956d-6067203feba0 | 127.0.0.1     |       13001 | ONLINE       |
-  +---------------------------+--------------------------------------+---------------+-------------+--------------+
-
-  server3> SELECT * FROM test.t1;
-  +----+
-  | c1 |
-  +----+
-  |  1 |
-  |  2 |
-  +----+
-
-
-==> Be aware of failures on concurrency scenarios
-
-Due to the distributed nature of MySQL group replication, concurrent updates
-can result on query failure if the queries are found to be conflicting. Lets
-perform a concurrent update to the same line in the example table
-
-On server 1
-
-  server1> UPDATE test.t1 SET c1=4 where c1=1;
-
-On server 2
-
-  server2> UPDATE test.t1 SET c1=3 where c1=1;
-
-Execute in parallel
-
-  server1> UPDATE test.t1 SET c1=4 where c1=1;
-  Query OK, 1 row affected (0.06 sec)
-
-  server2> UPDATE test.t1 SET c1=3 where c1=1;
-  ERROR 1181 (HY000): Got error 149 during ROLLBACK
-
-Note that the scenario where the second update succeeds and the first one
-fails is also equally possible and only depends on the order the queries were
-ordered and certified inside the plugin.
-
-Let's check the tables.
-
-server1> SELECT * FROM test.t1;
-+----+
-| c1 |
-+----+
-|  2 |
-|  4 |
-+----+
-
-server2> SELECT * FROM test.t1;
-+----+
-| c1 |
-+----+
-|  2 |
-|  4 |
-+----+
-
-The failed query rollbacks and no server data is affected by it.
-
-
-==> Check the execution stats
-
-Check your GTID stats on each group member
-
-  server1>SELECT @@GLOBAL.GTID_EXECUTED;
-  +------------------------------------------+
-  | @@GLOBAL.GTID_EXECUTED                   |
-  +------------------------------------------+
-  | 8a94f357-aab4-11df-86ab-c80aa9429562:1-8 |
-  +------------------------------------------+
-
-  server2>SELECT @@GLOBAL.GTID_EXECUTED;
-  +------------------------------------------+
-  | @@GLOBAL.GTID_EXECUTED                   |
-  +------------------------------------------+
-  | 8a94f357-aab4-11df-86ab-c80aa9429562:1-8 |
-  +------------------------------------------+
-
-Note that in all servers the GTID executed set is the same and belongs to the
-group.
-You are maybe asking yourself why the set contains 8 transactions when we only
-executed 5 successful queries in this tutorial. The reason is that whenever a
-member joins or leaves the group a transaction is logged to mark in every member
-this moment for recovery reasons.
-
-The member execution stats are also available on the performance schema
-tables.
-
-  SELECT * FROM performance_schema.replication_group_member_stats\G
-  *************************** 1. row ***************************
-                        CHANNEL_NAME: group_replication_applier
-                             VIEW_ID: 1425918173:3
-                           MEMBER_ID: e221c36c-c652-11e4-956d-6067203feba0
-         COUNT_TRANSACTIONS_IN_QUEUE: 0
-          COUNT_TRANSACTIONS_CHECKED: 6
-            COUNT_CONFLICTS_DETECTED: 1
-       COUNT_TRANSACTIONS_VALIDATING: 0
-  TRANSACTIONS_COMMITTED_ALL_MEMBERS: 8a94f357-aab4-11df-86ab-c80aa9429562:1-8
-      LAST_CONFLICT_FREE_TRANSACTION: 8a94f357-aab4-11df-86ab-c80aa9429562:8
-
-
-Where it can be seen that, from the 6 executed queries on this tutorial, 1 was
-found to be conflicting. We can also see that the transaction in the queue are
-0, so it means no transaction are waiting validation.
-
-On the last fields, the transaction validating field is 0 because all
-transaction that were executed are already considered to be stable on all
-members, as seen in the second last field. In other words, every member knows
-all the data, so the number of possible conflicting transactions is 0.
-
-
-==> Stop group replication
-
-To stop the plugin, you just need to execute:
-
-  server1> STOP GROUP_REPLICATION;
-
-
-==> Reset group replication channels
-
-If after using group replication you want to remove the associated channel and
-files you can execute.
-
-  server1> RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
-
-Note that the "group_replication_applier" channel is not a normal slave
-channel and will not respond to generic commands like "RESET SLAVE ALL".
-
-
-==> How to start multi master replication at server boot
-
-Before configuring Group replication to start on boot, please remember that at
-least once, you need to configure the recovery access credentials.
-To allow the member to contact other servers, you must at least once start the
-server and execute a CHANGE MASTER command for group_replication_recovery channel
-with the values being set for MASTER_USER and MASTER_PASSWORD. On subsequent
-restarts on these members there is no need to run CHANGE MASTER command again
-since its values are persisted.
-
-From this point on Group Replication can now start along side with the server
-given that you configure the below options:
-
-Set the group name
-
-  --loose-group_replication_group_name
-
-Set the start on boot flag to true
-
-  --loose-group_replication_start_on_boot
-
-When using XCom you will also need the contact options.
-
---loose-group_replication_local_address="127.0.0.1:10301";
---loose-group_replication_group_seeds= "127.0.0.1:10301,127.0.0.1:10302,127.0.0.1:10303";
-
-* == Conclusion == *
-
-On his first steps, MySQL Group Replication is still in development. Feel free
-to try it and get back at us so we can make it even better for the community!
diff --git a/rapid/plugin/group_replication/configure.cmake b/rapid/plugin/group_replication/configure.cmake
index 59a074bd12da..c2a957aadf6d 100644
--- a/rapid/plugin/group_replication/configure.cmake
+++ b/rapid/plugin/group_replication/configure.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -50,8 +57,11 @@ IF (WIN32)
 ENDIF()
 
 IF (NOT WIN32)
+  MYSQL_CHECK_RPC()
+
   SET (CMAKE_REQUIRED_FLAGS_BACKUP ${CMAKE_REQUIRED_FLAGS})
   SET (CMAKE_REQUIRED_FLAGS "-Wno-error")
+  SET (CMAKE_REQUIRED_INCLUDES ${RPC_INCLUDE_DIRS})
 ENDIF()
 
 #
diff --git a/rapid/plugin/group_replication/include/applier.h b/rapid/plugin/group_replication/include/applier.h
index 3f59c1dc98d0..97dde87942e0 100644
--- a/rapid/plugin/group_replication/include/applier.h
+++ b/rapid/plugin/group_replication/include/applier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -169,6 +176,11 @@ class Applier_module: public Applier_module_interface
   */
   int initialize_applier_thread();
 
+  /**
+     Return the local applier stats.
+  */
+  Pipeline_member_stats *get_local_pipeline_stats();
+
   /**
     Terminates the applier thread.
 
diff --git a/rapid/plugin/group_replication/include/applier_channel_state_observer.h b/rapid/plugin/group_replication/include/applier_channel_state_observer.h
index bdde02b8f4ca..d32be1374d5a 100644
--- a/rapid/plugin/group_replication/include/applier_channel_state_observer.h
+++ b/rapid/plugin/group_replication/include/applier_channel_state_observer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/asynchronous_channels_state_observer.h b/rapid/plugin/group_replication/include/asynchronous_channels_state_observer.h
index 8787e6316419..f396612acac0 100644
--- a/rapid/plugin/group_replication/include/asynchronous_channels_state_observer.h
+++ b/rapid/plugin/group_replication/include/asynchronous_channels_state_observer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/auto_increment.h b/rapid/plugin/group_replication/include/auto_increment.h
index e181cae799e7..b13e63165152 100644
--- a/rapid/plugin/group_replication/include/auto_increment.h
+++ b/rapid/plugin/group_replication/include/auto_increment.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/certifier.h b/rapid/plugin/group_replication/include/certifier.h
index 9191a7384d6a..d6baffba1068 100644
--- a/rapid/plugin/group_replication/include/certifier.h
+++ b/rapid/plugin/group_replication/include/certifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -70,7 +77,7 @@ class Gtid_set_ref: public Gtid_set
   */
   size_t unlink()
   {
-    DBUG_ASSERT(reference_counter > 0);
+    assert(reference_counter > 0);
     return --reference_counter;
   }
 
@@ -197,6 +204,12 @@ class Certifier: public Certifier_interface
   Certifier();
   virtual ~Certifier();
 
+  /**
+    Key used to store errors in the certification info
+    on View_change_log_event.
+  */
+  static const std::string CERTIFICATION_INFO_ERROR_NAME;
+
   /**
     Initialize certifier.
 
@@ -296,9 +309,9 @@ class Certifier: public Certifier_interface
     @note if concurrent access is introduce to these variables,
     locking is needed in this method
 
-    @param cert_info              certification info retrieved from recovery procedure
+    @param[in] cert_info  certification info retrieved from recovery procedure
 
-    @retval  > 0  Error during setting certfication info.
+    @retval  > 0  Error during setting certification info.
     @retval  = 0  Everything went fine.
   */
   virtual int set_certification_info(std::map<std::string, std::string> *cert_info);
@@ -553,7 +566,7 @@ class Certifier: public Certifier_interface
   int64 parallel_applier_last_committed_global;
   int64 parallel_applier_sequence_number;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   bool certifier_garbage_collection_block;
   bool same_member_message_discarded;
 #endif
diff --git a/rapid/plugin/group_replication/include/certifier_stats_interface.h b/rapid/plugin/group_replication/include/certifier_stats_interface.h
index fe3efe1a950b..d108c99dafda 100644
--- a/rapid/plugin/group_replication/include/certifier_stats_interface.h
+++ b/rapid/plugin/group_replication/include/certifier_stats_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/channel_observation_manager.h b/rapid/plugin/group_replication/include/channel_observation_manager.h
index 96143402e0d4..112eae4574b1 100644
--- a/rapid/plugin/group_replication/include/channel_observation_manager.h
+++ b/rapid/plugin/group_replication/include/channel_observation_manager.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/compatibility_module.h b/rapid/plugin/group_replication/include/compatibility_module.h
index 951691568570..6ff37214c9b0 100644
--- a/rapid/plugin/group_replication/include/compatibility_module.h
+++ b/rapid/plugin/group_replication/include/compatibility_module.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -67,13 +74,15 @@ class Compatibility_module
     Checks if the given version is incompatible with another version.
     @param from  The member that may be not compatible with 'to'
     @param to    The member with which 'from' may be not compatible with
+    @param do_version_check If version compatibility check is needed
     @return the compatibility status
       @retval INCOMPATIBLE     The versions are not compatible with each other
       @retval COMPATIBLE       The versions are compatible with each other
       @retval READ_COMPATIBLE  The version 'from' can only read from 'to'
   */
   Compatibility_type check_incompatibility(Member_version &from,
-                                           Member_version &to);
+                                           Member_version &to,
+                                           bool do_version_check);
 
   /**
     Checks if the given version is incompatible with another version.
@@ -91,12 +100,13 @@ class Compatibility_module
   /**
     Checks if the given version is compatible with this member local version.
     @param to    The member with which 'from' may be not compatible with
+    @param is_lowest_version If to version is lowest in the group
     @return the compatibility status
       @retval INCOMPATIBLE     The versions are not compatible with each other
       @retval COMPATIBLE       The versions are compatible with each other
       @retval READ_COMPATIBLE  The version 'from' can only read from 'to'
   */
-  Compatibility_type check_local_incompatibility(Member_version &to);
+  Compatibility_type check_local_incompatibility(Member_version &to, bool is_lowest_version);
 
   virtual ~Compatibility_module();
 
diff --git a/rapid/plugin/group_replication/include/delayed_plugin_initialization.h b/rapid/plugin/group_replication/include/delayed_plugin_initialization.h
index 67414db93fc7..91d908131dde 100644
--- a/rapid/plugin/group_replication/include/delayed_plugin_initialization.h
+++ b/rapid/plugin/group_replication/include/delayed_plugin_initialization.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/gcs_event_handlers.h b/rapid/plugin/group_replication/include/gcs_event_handlers.h
index 5639099974f0..be6a133c93c1 100644
--- a/rapid/plugin/group_replication/include/gcs_event_handlers.h
+++ b/rapid/plugin/group_replication/include/gcs_event_handlers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -316,7 +323,7 @@ class Plugin_gcs_events_handler: public Gcs_communication_event_listener,
   /* Component stop timeout on shutdown */
   ulong stop_wait_timeout;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool set_number_of_members_on_view_changed_to_10;
 #endif
 };
diff --git a/rapid/plugin/group_replication/include/gcs_logger.h b/rapid/plugin/group_replication/include/gcs_logger.h
index 07365b8a27c7..5b7111896f03 100644
--- a/rapid/plugin/group_replication/include/gcs_logger.h
+++ b/rapid/plugin/group_replication/include/gcs_logger.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/include/gcs_operations.h b/rapid/plugin/group_replication/include/gcs_operations.h
index 933dbf631690..463b432aaedf 100644
--- a/rapid/plugin/group_replication/include/gcs_operations.h
+++ b/rapid/plugin/group_replication/include/gcs_operations.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -182,14 +189,11 @@ class Gcs_operations
   Gcs_interface *gcs_interface;
 
   /** Is the member leaving*/
-  bool leave_coordination_leaving;
+  int32 leave_coordination_leaving;
   /** Did the member already left*/
-  bool leave_coordination_left;
-  /** Is finalize ongoing*/
-  bool finalize_ongoing;
+  int32 leave_coordination_left;
 
   Checkable_rwlock *gcs_operations_lock;
-  Checkable_rwlock *finalize_ongoing_lock;
 };
 
 #endif /* GCS_OPERATIONS_INCLUDE */
diff --git a/rapid/plugin/group_replication/include/gcs_plugin_messages.h b/rapid/plugin/group_replication/include/gcs_plugin_messages.h
index 664a15d5c014..d2e9afe285fb 100644
--- a/rapid/plugin/group_replication/include/gcs_plugin_messages.h
+++ b/rapid/plugin/group_replication/include/gcs_plugin_messages.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/gcs_view_modification_notifier.h b/rapid/plugin/group_replication/include/gcs_view_modification_notifier.h
index b28fd6fc0d9b..3b8bf285190d 100644
--- a/rapid/plugin/group_replication/include/gcs_view_modification_notifier.h
+++ b/rapid/plugin/group_replication/include/gcs_view_modification_notifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -52,6 +59,15 @@ class Plugin_gcs_view_modification_notifier
    */
   bool is_injected_view_modification();
 
+  /**
+    Checks if there is a view modification ongoing.
+
+    @return
+      @retval true  there is a view modification ongoing
+      @retval false otherwise
+   */
+  bool is_view_modification_ongoing();
+
   /**
     Signals that a view modification has ended
   */
diff --git a/rapid/plugin/group_replication/include/group_partition_handling.h b/rapid/plugin/group_replication/include/group_partition_handling.h
index 6f913cc54177..379d1a392465 100644
--- a/rapid/plugin/group_replication/include/group_partition_handling.h
+++ b/rapid/plugin/group_replication/include/group_partition_handling.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/handlers/applier_handler.h b/rapid/plugin/group_replication/include/handlers/applier_handler.h
index 44d8f393c78f..e3a358c0d073 100644
--- a/rapid/plugin/group_replication/include/handlers/applier_handler.h
+++ b/rapid/plugin/group_replication/include/handlers/applier_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/handlers/certification_handler.h b/rapid/plugin/group_replication/include/handlers/certification_handler.h
index 90e88c64ae9f..c6bb7869d996 100644
--- a/rapid/plugin/group_replication/include/handlers/certification_handler.h
+++ b/rapid/plugin/group_replication/include/handlers/certification_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -16,16 +23,15 @@
 #ifndef CERTIFICATION_HANDLER_INCLUDE
 #define CERTIFICATION_HANDLER_INCLUDE
 
-#include <string>
 #include "certifier.h"
 #include <mysql/group_replication_priv.h>
+#include <string>
 
-class Certification_handler : public Event_handler
-{
+class Certification_handler : public Event_handler {
 public:
   Certification_handler();
   virtual ~Certification_handler();
-  int handle_event(Pipeline_event *ev,Continuation *cont);
+  int handle_event(Pipeline_event *ev, Continuation *cont);
   int handle_action(Pipeline_action *action);
   int initialize();
   int terminate();
@@ -34,18 +40,35 @@ class Certification_handler : public Event_handler
 
   Certifier_interface *get_certifier();
 
-  int set_certification_info(std::map<std::string, std::string>* cert_info);
+  int set_certification_info(std::map<std::string, std::string> *cert_info);
 
 private:
-  Certifier* cert_module;
+  Certifier *cert_module;
 
-  THD* applier_module_thd;
+  THD *applier_module_thd;
 
   rpl_sidno group_sidno;
 
   Data_packet *transaction_context_packet;
   Pipeline_event *transaction_context_pevent;
 
+  /** Are view change on wait for application */
+  bool m_view_change_event_on_wait;
+
+  /** View change information information stored for delay */
+  struct View_change_stored_info {
+    Pipeline_event *view_change_pevent;
+    std::string local_gtid_certified;
+    rpl_gno view_change_event_gno;
+    View_change_stored_info(Pipeline_event *vc_pevent, std::string &local_gtid_string, rpl_gno gno)
+        : view_change_pevent(vc_pevent),
+          local_gtid_certified(local_gtid_string),
+          view_change_event_gno(gno)  {}
+  };
+
+  /** All the VC events pending application due to timeout */
+  std::list<View_change_stored_info*> pending_view_change_events;
+
   /**
     Set transaction context for next event handler.
 
@@ -117,8 +140,14 @@ class Certification_handler : public Event_handler
   /**
     This methods guarantees that the view change event is logged after local
     transactions are executed.
+
+    @param local_gtid_certified_string  The set to wait.
+                                        If not defined, it extracts the current certified set
+    @retval 0                        OK
+    @retval LOCAL_WAIT_TIMEOUT_ERROR Timeout error on wait
+    @retval !=0                      Wait or interface error
   */
-  int wait_for_local_transaction_execution();
+  int wait_for_local_transaction_execution(std::string& local_gtid_certified_string);
 
   /**
     Create a transactional block for the received log event
@@ -126,8 +155,75 @@ class Certification_handler : public Event_handler
     BEGIN
     EVENT
     COMMIT
+
+    @param[in] pevent          the event to be injected
+    @param[in, out] event_gno  The transaction GTID gno
+                               If -1, one will be generated.
+    @param[in] cont            the object used to wait
+
+
+    @return the operation status
+      @retval 0      OK
+      @retval !=0    Error
+  */
+  int inject_transactional_events(Pipeline_event *pevent, rpl_gno *event_gno, Continuation *cont);
+
+  /**
+    Try to log a view change event waiting for local certified transactions to finish.
+
+    @param[in] view_pevent             the event to be injected
+    @param[in, out] local_gtid_string  The local certified transaction set to wait
+                                       If empty, one will be assigned even on timeout
+    @param[in, out] event_gno          The transaction GTID gno
+                                       If -1, one will be generated.
+    @param[in] cont                    the object used to wait
+
+
+    @return the operation status
+      @retval 0      OK
+      @retval LOCAL_WAIT_TIMEOUT_ERROR Timeout error on wait for local transactions
+      @retval !=0    Error
+  */
+  int log_view_change_event_in_order(Pipeline_event *view_pevent,
+                                     std::string &local_gtid_string,
+                                     rpl_gno *event_gno,
+                                     Continuation *cont);
+
+  /**
+    Store the event for future logging as a timeout occurred.
+    This method does 2 things:
+      1. If not stored in the past, it stores the Pipeline event to
+      be logged in the future
+      2. It queues again in the applier a fake View change log event
+      to ensure the logging method will be invoked eventually
+
+    @param[in] view_pevent        the event to be stored
+    @param[in] local_gtid_string  The local certified transaction set to wait
+    @param[in] event_gno          The transaction GTID gno
+    @param[in] cont               Used to discard or not the transaction
+
+
+    @return the operation status
+      @retval 0      OK
+      @retval !=0    Error
+  */
+  int store_view_event_for_delayed_logging(Pipeline_event *pevent,
+                                           std::string& local_gtid_certified_string,
+                                           rpl_gno event_gno,
+                                           Continuation *cont);
+
+  /**
+    Logs all the delayed View Change log events stored.
+
+    @param[in] cont       the object used to mark error or success
+
+    @return the operation status
+      @retval 0      OK
+      @retval LOCAL_WAIT_TIMEOUT_ERROR Timeout error on wait for local transactions
+      @retval !=0    Error
   */
-  int inject_transactional_events(Pipeline_event *pevent, Continuation *cont);
+  int log_delayed_view_change_events(Continuation *cont);
+
 };
 
 #endif /* CERTIFICATION_HANDLER_INCLUDE */
diff --git a/rapid/plugin/group_replication/include/handlers/event_cataloger.h b/rapid/plugin/group_replication/include/handlers/event_cataloger.h
index 1b2f2f78c395..14ca0fb20674 100644
--- a/rapid/plugin/group_replication/include/handlers/event_cataloger.h
+++ b/rapid/plugin/group_replication/include/handlers/event_cataloger.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/handlers/pipeline_handlers.h b/rapid/plugin/group_replication/include/handlers/pipeline_handlers.h
index 959ff896fd4a..2d4032fea2f8 100644
--- a/rapid/plugin/group_replication/include/handlers/pipeline_handlers.h
+++ b/rapid/plugin/group_replication/include/handlers/pipeline_handlers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -121,7 +128,7 @@ class Handler_applier_configuration_action : public Pipeline_action
     applier_shutdown_timeout(plugin_shutdown_timeout),
     group_sidno(group_sidno), initialization_conf(true)
     {
-      DBUG_ASSERT(applier_name != NULL);
+      assert(applier_name != NULL);
     }
 
   /**
diff --git a/rapid/plugin/group_replication/include/member_info.h b/rapid/plugin/group_replication/include/member_info.h
index 510b7e3fc3d1..0121694d1b3c 100644
--- a/rapid/plugin/group_replication/include/member_info.h
+++ b/rapid/plugin/group_replication/include/member_info.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -49,6 +56,16 @@
 */
 #define CNF_SINGLE_PRIMARY_MODE_F                 0x2
 
+/*
+  Valid values of lower_case_table_names are 0 - 2.
+  So when member has DEFAULT_NOT_RECEIVED value, it means its
+  lower_case_table_names value is not known.
+*/
+#define DEFAULT_NOT_RECEIVED_LOWER_CASE_TABLE_NAMES  65540
+#ifndef NDEBUG
+#define SKIP_ENCODING_LOWER_CASE_TABLE_NAMES         65541
+#endif
+
 /*
   @class Group_member_info
 
@@ -104,8 +121,11 @@ class Group_member_info: public Plugin_gcs_message
     // Length of the payload item: 2 bytes
     PIT_MEMBER_WEIGHT= 14,
 
+    // Length of the payload item: 2 bytes
+    PIT_LOWER_CASE_TABLE_NAME= 15,
+
     // No valid type codes can appear after this one.
-    PIT_MAX= 15
+    PIT_MAX= 16
   };
 
   /*
@@ -151,6 +171,8 @@ class Group_member_info: public Plugin_gcs_message
     @param[in] role_arg                               member role within the group
     @param[in] in_single_primary_mode                 is member in single mode
     @param[in] has_enforces_update_everywhere_checks  has member enforce update check
+    @param[in] member_weight_arg                      member weight
+    @param[in] lower_case_table_names_arg             lower case table names
    */
   Group_member_info(char* hostname_arg,
                     uint port_arg,
@@ -163,7 +185,8 @@ class Group_member_info: public Plugin_gcs_message
                     Group_member_info::Group_member_role role_arg,
                     bool in_single_primary_mode,
                     bool has_enforces_update_everywhere_checks,
-                    uint member_weight_arg);
+                    uint member_weight_arg,
+                    uint lower_case_table_names_arg);
 
   /**
     Copy constructor
@@ -245,6 +268,11 @@ class Group_member_info: public Plugin_gcs_message
   */
   uint32 get_configuration_flags();
 
+  /**
+    @return the global-variable lower case table names value
+  */
+  uint get_lower_case_table_names() const;
+
   /**
     @return the member state of system variable
             group_replication_single_primary_mode
@@ -394,6 +422,7 @@ class Group_member_info: public Plugin_gcs_message
   uint32 configuration_flags;
   bool conflict_detection_enable;
   uint member_weight;
+  uint lower_case_table_names;
 };
 
 
@@ -471,6 +500,20 @@ class Group_member_info_manager_interface
   update_member_status(const std::string& uuid,
                        Group_member_info::Group_member_status new_status)= 0;
 
+  /**
+    Sets the identified member as unreachable.
+
+    @param[in] uuid        member uuid
+   */
+  virtual void set_member_unreachable(const std::string &uuid) = 0;
+
+  /**
+    Sets the identified member as reachable.
+
+    @param[in] uuid        member uuid
+   */
+  virtual void set_member_reachable(const std::string &uuid) = 0;
+
   /**
     Updates the GTID sets on a single member
 
@@ -569,6 +612,10 @@ class Group_member_info_manager: public Group_member_info_manager_interface
   update_member_status(const std::string& uuid,
                        Group_member_info::Group_member_status new_status);
 
+  void set_member_unreachable(const std::string &uuid);
+
+  void set_member_reachable(const std::string &uuid);
+
   void update_gtid_sets(const std::string& uuid,
                         std::string& gtid_executed,
                         std::string& gtid_retrieved);
diff --git a/rapid/plugin/group_replication/include/member_version.h b/rapid/plugin/group_replication/include/member_version.h
index 276d043be84b..b6033cd0b007 100644
--- a/rapid/plugin/group_replication/include/member_version.h
+++ b/rapid/plugin/group_replication/include/member_version.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/observer_server_actions.h b/rapid/plugin/group_replication/include/observer_server_actions.h
index 2de5f7d14778..77b283d8bf91 100644
--- a/rapid/plugin/group_replication/include/observer_server_actions.h
+++ b/rapid/plugin/group_replication/include/observer_server_actions.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/observer_server_channels.h b/rapid/plugin/group_replication/include/observer_server_channels.h
index 4d7eea2c27f8..2fa8ac7e503e 100644
--- a/rapid/plugin/group_replication/include/observer_server_channels.h
+++ b/rapid/plugin/group_replication/include/observer_server_channels.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/observer_server_state.h b/rapid/plugin/group_replication/include/observer_server_state.h
index 50ad1edb2dc6..787c8459e39a 100644
--- a/rapid/plugin/group_replication/include/observer_server_state.h
+++ b/rapid/plugin/group_replication/include/observer_server_state.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/observer_trans.h b/rapid/plugin/group_replication/include/observer_trans.h
index d659921464e4..6998280eaf8e 100644
--- a/rapid/plugin/group_replication/include/observer_trans.h
+++ b/rapid/plugin/group_replication/include/observer_trans.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/pipeline_factory.h b/rapid/plugin/group_replication/include/pipeline_factory.h
index 76a1100b6b0e..0e0892da099d 100644
--- a/rapid/plugin/group_replication/include/pipeline_factory.h
+++ b/rapid/plugin/group_replication/include/pipeline_factory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/pipeline_interfaces.h b/rapid/plugin/group_replication/include/pipeline_interfaces.h
index 7160f26834d9..4a09e2a1556f 100644
--- a/rapid/plugin/group_replication/include/pipeline_interfaces.h
+++ b/rapid/plugin/group_replication/include/pipeline_interfaces.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/pipeline_stats.h b/rapid/plugin/group_replication/include/pipeline_stats.h
index c4d9f47f2aa1..f24fe8155016 100644
--- a/rapid/plugin/group_replication/include/pipeline_stats.h
+++ b/rapid/plugin/group_replication/include/pipeline_stats.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -207,6 +214,26 @@ class Pipeline_stats_member_collector
   */
   void increment_transactions_local();
 
+  /**
+    @returns transactions waiting to be applied.
+  */
+  int32 get_transactions_waiting_apply();
+
+  /**
+    @returns transactions certified.
+  */
+  int64 get_transactions_certified();
+
+  /**
+    @returns transactions applied of local member.
+  */
+  int64 get_transactions_applied();
+
+  /**
+    @returns local transactions proposed by member.
+  */
+  int64 get_transactions_local();
+
   /**
     Send member statistics to group.
   */
@@ -239,6 +266,13 @@ class Pipeline_member_stats
   */
   Pipeline_member_stats(Pipeline_stats_member_message &msg);
 
+  /**
+    Constructor.
+  */
+  Pipeline_member_stats(Pipeline_stats_member_collector *pipeline_stats,
+                        ulonglong applier_queue, ulonglong negative_certified,
+                        ulonglong certification_size);
+
   /**
     Destructor.
   */
@@ -269,6 +303,47 @@ class Pipeline_member_stats
   */
   int32 get_transactions_waiting_apply();
 
+  /**
+    Get transactions certified counter value.
+
+    @return the counter value
+  */
+  int64 get_transactions_certified();
+
+  /**
+    Get transactions negatively certified.
+
+    @return the counter value
+  */
+  int64 get_transactions_negative_certified();
+
+  /**
+    Get certification database counter value.
+
+    @return the counter value
+  */
+  int64 get_transactions_rows_validating();
+
+  /**
+    Get the stable group transactions.
+  */
+  void get_transaction_committed_all_members(std::string &value);
+
+  /**
+    Set the stable group transactions.
+  */
+  void set_transaction_committed_all_members(char *str, size_t len);
+
+  /**
+    Get the last positive certified transaction.
+  */
+  void get_transaction_last_conflict_free(std::string &value);
+
+  /**
+    Set the last positive certified transaction.
+  */
+  void set_transaction_last_conflict_free(std::string &value);
+
   /**
     Get transactions certified since last stats message.
 
@@ -298,7 +373,7 @@ class Pipeline_member_stats
   */
   uint64 get_stamp();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void debug(const char *member, int64 quota_size, int64 quota_used);
 #endif
 
@@ -311,6 +386,10 @@ class Pipeline_member_stats
   int64 m_delta_transactions_applied;
   int64 m_transactions_local;
   int64 m_delta_transactions_local;
+  int64 m_transactions_negative_certified;
+  int64 m_transactions_rows_validating;
+  std::string m_transactions_committed_all_members;
+  std::string m_transaction_last_conflict_free;
   uint64 m_stamp;
 };
 
diff --git a/rapid/plugin/group_replication/include/plugin.h b/rapid/plugin/group_replication/include/plugin.h
index 15f894a4f767..636a666113df 100644
--- a/rapid/plugin/group_replication/include/plugin.h
+++ b/rapid/plugin/group_replication/include/plugin.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -46,6 +53,20 @@ struct st_mysql_sys_var
 };
 typedef st_mysql_sys_var SYS_VAR;
 
+/**
+  An enum that represents the possible values of the
+  group_replication_exit_state_action sysvar.
+*/
+enum enum_exit_state_action {
+  /**
+    When configured to READ_ONLY, the server will go into super_read_only mode
+    and enter the ERROR GR state.
+  */
+  EXIT_STATE_ACTION_READ_ONLY = 0,
+  /** When configured to ABORT_SERVER, the server will abort(). */
+  EXIT_STATE_ACTION_ABORT_SERVER
+};
+
 //Plugin variables
 extern const char *group_replication_plugin_name;
 extern char *group_name_var;
@@ -57,6 +78,7 @@ extern const char *available_bindings_names[];
 extern bool known_server_reset;
 //Certification latch
 extern Wait_ticket<my_thread_id> *certification_latch;
+extern ulong exit_state_action_var;
 
 //The modules
 extern Gcs_operations *gcs_module;
@@ -97,6 +119,7 @@ int plugin_group_replication_deinit(void *p);
 int plugin_group_replication_start();
 int plugin_group_replication_stop();
 bool plugin_is_group_replication_running();
+bool get_plugin_is_stopping();
 bool plugin_get_connection_status(
     const GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS& callbacks);
 bool plugin_get_group_members(
diff --git a/rapid/plugin/group_replication/include/plugin_constants.h b/rapid/plugin/group_replication/include/plugin_constants.h
index 291449f92d4f..731054a2ae13 100644
--- a/rapid/plugin/group_replication/include/plugin_constants.h
+++ b/rapid/plugin/group_replication/include/plugin_constants.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/plugin_log.h b/rapid/plugin/group_replication/include/plugin_log.h
index d95da859102b..d0dc7588a900 100644
--- a/rapid/plugin/group_replication/include/plugin_log.h
+++ b/rapid/plugin/group_replication/include/plugin_log.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/plugin_psi.h b/rapid/plugin/group_replication/include/plugin_psi.h
index 26159fb763fe..0b9a65c7dbb8 100644
--- a/rapid/plugin/group_replication/include/plugin_psi.h
+++ b/rapid/plugin/group_replication/include/plugin_psi.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -129,7 +136,6 @@ extern PSI_rwlock_key
                key_GR_RWLOCK_cert_stable_gtid_set,
                key_GR_RWLOCK_io_cache_unused_list,
                key_GR_RWLOCK_plugin_stop,
-               key_GR_RWLOCK_gcs_operations,
-               key_GR_RWLOCK_gcs_operations_finalize_ongoing;
+               key_GR_RWLOCK_gcs_operations;
 
 #endif /* PLUGIN_PSI_INCLUDED */
diff --git a/rapid/plugin/group_replication/include/plugin_server_include.h b/rapid/plugin/group_replication/include/plugin_server_include.h
index bd961abd3ba9..b46236184860 100644
--- a/rapid/plugin/group_replication/include/plugin_server_include.h
+++ b/rapid/plugin/group_replication/include/plugin_server_include.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/plugin_utils.h b/rapid/plugin/group_replication/include/plugin_utils.h
index a4c1af7ffa36..2577715e55e4 100644
--- a/rapid/plugin/group_replication/include/plugin_utils.h
+++ b/rapid/plugin/group_replication/include/plugin_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -26,6 +33,8 @@
 
 void log_primary_member_details();
 
+void abort_plugin_process(const char *message);
+
 class Blocked_transaction_handler
 {
 public:
@@ -409,11 +418,11 @@ class Wait_ticket
     {
       struct timespec abstime;
       set_timespec(&abstime, 1);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       int error=
 #endif
       mysql_cond_timedwait(&cond, &lock, &abstime);
-      DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+      assert(error == ETIMEDOUT || error == 0);
       if (timeout >= 1)
       {
         timeout= timeout - 1;
@@ -448,7 +457,7 @@ class Mutex_autolock
   {
     DBUG_ENTER("Mutex_autolock::Mutex_autolock");
 
-    DBUG_ASSERT(arg != NULL);
+    assert(arg != NULL);
 
     mysql_mutex_lock(ptr_mutex);
     DBUG_VOID_RETURN;
@@ -472,7 +481,7 @@ class Shared_writelock
   {
     DBUG_ENTER("Shared_writelock::Shared_writelock");
 
-    DBUG_ASSERT(arg != NULL);
+    assert(arg != NULL);
 
     mysql_mutex_init(key_GR_LOCK_write_lock_protection, &write_lock, MY_MUTEX_INIT_FAST);
 
diff --git a/rapid/plugin/group_replication/include/ps_information.h b/rapid/plugin/group_replication/include/ps_information.h
index aa42d7f349b9..b39214c4e313 100644
--- a/rapid/plugin/group_replication/include/ps_information.h
+++ b/rapid/plugin/group_replication/include/ps_information.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/read_mode_handler.h b/rapid/plugin/group_replication/include/read_mode_handler.h
index 37ea88c648fd..6081ec0e4ad0 100644
--- a/rapid/plugin/group_replication/include/read_mode_handler.h
+++ b/rapid/plugin/group_replication/include/read_mode_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/recovery.h b/rapid/plugin/group_replication/include/recovery.h
index 808052687e7d..cedbae3a1d95 100644
--- a/rapid/plugin/group_replication/include/recovery.h
+++ b/rapid/plugin/group_replication/include/recovery.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/recovery_channel_state_observer.h b/rapid/plugin/group_replication/include/recovery_channel_state_observer.h
index 7279d3b4b06d..664cfda6e1ce 100644
--- a/rapid/plugin/group_replication/include/recovery_channel_state_observer.h
+++ b/rapid/plugin/group_replication/include/recovery_channel_state_observer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/recovery_message.h b/rapid/plugin/group_replication/include/recovery_message.h
index 9b444558507a..45c990ecced6 100644
--- a/rapid/plugin/group_replication/include/recovery_message.h
+++ b/rapid/plugin/group_replication/include/recovery_message.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/recovery_state_transfer.h b/rapid/plugin/group_replication/include/recovery_state_transfer.h
index e0c902c94388..0422014a51e1 100644
--- a/rapid/plugin/group_replication/include/recovery_state_transfer.h
+++ b/rapid/plugin/group_replication/include/recovery_state_transfer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -122,43 +129,43 @@ class Recovery_state_transfer
   /** Set a SSL trusted certificate authorities file */
   void set_recovery_ssl_ca(const char* ssl_ca)
   {
-    (void) strncpy(recovery_ssl_ca, ssl_ca, strlen(ssl_ca)+1);
+    memcpy(recovery_ssl_ca, ssl_ca, strlen(ssl_ca)+1);
   }
 
   /** Set a folder with SSL trusted CA files */
   void set_recovery_ssl_capath(const char* ssl_capath)
   {
-    (void) strncpy(recovery_ssl_capath, ssl_capath, strlen(ssl_capath)+1);
+    memcpy(recovery_ssl_capath, ssl_capath, strlen(ssl_capath)+1);
   }
 
   /** Set a SSL certificate for connection */
   void set_recovery_ssl_cert(const char* ssl_cert)
   {
-    (void) strncpy(recovery_ssl_cert, ssl_cert, strlen(ssl_cert)+1);
+    memcpy(recovery_ssl_cert, ssl_cert, strlen(ssl_cert)+1);
   }
 
   /** Set a SSL ciphers to be used */
   void set_recovery_ssl_cipher(const char* ssl_cipher)
   {
-    (void) strncpy(recovery_ssl_cipher, ssl_cipher, strlen(ssl_cipher)+1);
+    memcpy(recovery_ssl_cipher, ssl_cipher, strlen(ssl_cipher)+1);
   }
 
   /** Set a SSL key for connections */
   void set_recovery_ssl_key(const char* ssl_key)
   {
-    (void) strncpy(recovery_ssl_key, ssl_key, strlen(ssl_key)+1);
+    memcpy(recovery_ssl_key, ssl_key, strlen(ssl_key)+1);
   }
 
   /** Set a SSL revocation list file*/
   void set_recovery_ssl_crl(const char* ssl_crl)
   {
-    (void) strncpy(recovery_ssl_crl, ssl_crl, strlen(ssl_crl)+1);
+    memcpy(recovery_ssl_crl, ssl_crl, strlen(ssl_crl)+1);
   }
 
   /** Set a folder with SSL revocation list files*/
   void set_recovery_ssl_crlpath(const char* ssl_crlpath)
   {
-    (void) strncpy(recovery_ssl_crlpath, ssl_crlpath, strlen(ssl_crlpath)+1);
+    memcpy(recovery_ssl_crlpath, ssl_crlpath, strlen(ssl_crlpath)+1);
   }
 
   /** Set if recovery shall compare the used hostname against the certificate */
@@ -304,11 +311,13 @@ class Recovery_state_transfer
   /**
     Terminates the connection to the donor
 
+    @param purge_logs  purge recovery logs
+
     @return the operation status
       @retval 0      OK
       @retval !=0    Error
   */
-  int terminate_recovery_slave_threads();
+  int terminate_recovery_slave_threads(bool purge_logs = true);
 
   /**
     Purges relay logs and the master info object
diff --git a/rapid/plugin/group_replication/include/replication_threads_api.h b/rapid/plugin/group_replication/include/replication_threads_api.h
index 94cf9960e8fa..483546a7a529 100644
--- a/rapid/plugin/group_replication/include/replication_threads_api.h
+++ b/rapid/plugin/group_replication/include/replication_threads_api.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -68,6 +75,8 @@ class Replication_thread_api
     @param priority      The channel priority on event application
     @param retry_count   The number of retries when connecting
     @param preserve_logs If logs should be always preserved
+    @param ignore_ws_mem_limit Shall ignore write set mem limits
+    @param allow_drop_write_set Shall not require write set to be preserved
 
     @return the operation status
       @retval 0      OK
@@ -86,7 +95,9 @@ class Replication_thread_api
                          bool ssl_verify_server_cert,
                          int priority,
                          int retry_count,
-                         bool preserve_logs);
+                         bool preserve_logs,
+                         bool ignore_ws_mem_limit,
+                         bool allow_drop_write_set);
 
   /**
     Start the Applier/Receiver threads according to the given options.
diff --git a/rapid/plugin/group_replication/include/single_primary_message.h b/rapid/plugin/group_replication/include/single_primary_message.h
index 2c916fc08214..ad27c69c4d5f 100644
--- a/rapid/plugin/group_replication/include/single_primary_message.h
+++ b/rapid/plugin/group_replication/include/single_primary_message.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_command_test.h b/rapid/plugin/group_replication/include/sql_service/sql_command_test.h
index 18ae72227f09..a7d19e4cdc42 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_command_test.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_command_test.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_resultset.h b/rapid/plugin/group_replication/include/sql_service/sql_resultset.h
index f4644f0cac13..ff9e482ab250 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_resultset.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_resultset.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_service_command.h b/rapid/plugin/group_replication/include/sql_service/sql_service_command.h
index 48a0ee8eab9f..3d0fa596fdf1 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_service_command.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_service_command.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -122,8 +129,9 @@ class Sql_service_commands
     @param [in] timeout        The timeout after which the method should break
 
     @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error when executed or timeout.
+      @retval 0    OK
+      @retval -1   Timeout on the GTID wait
+      @retval 1    Error when executed
   */
   long internal_wait_for_server_gtid_executed(Sql_service_interface *sql_interface,
                                               std::string& gtid_executed,
@@ -326,9 +334,11 @@ class Sql_service_command_interface
     @param [in] gtid_executed  The GTID string to check
     @param [in] timeout        The timeout after which the method should break
 
+
     @return the error value returned
-      @retval 0      OK
-      @retval !=0    Error when executed or timeout.
+      @retval 0    OK
+      @retval -1   Timeout on the GTID wait
+      @retval 1    Error when executed
   */
   long wait_for_server_gtid_executed(std::string& gtid_executed, int timeout= 0);
 
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_service_context.h b/rapid/plugin/group_replication/include/sql_service/sql_service_context.h
index 71f9103d8311..6f5b394cc728 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_service_context.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_service_context.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_service_context_base.h b/rapid/plugin/group_replication/include/sql_service/sql_service_context_base.h
index 93e96f4c77eb..e6e5fa6c1939 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_service_context_base.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_service_context_base.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/include/sql_service/sql_service_interface.h b/rapid/plugin/group_replication/include/sql_service/sql_service_interface.h
index 4e888b0c1469..12ef0f93bb00 100644
--- a/rapid/plugin/group_replication/include/sql_service/sql_service_interface.h
+++ b/rapid/plugin/group_replication/include/sql_service/sql_service_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_event_listener.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_event_listener.h
index b4177d2b68fa..9d174cecabb7 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_event_listener.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_event_listener.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h
index a50746789c02..2b92ac30b11b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_communication_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_event_listener.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_event_listener.h
index 09edd6a653ca..d263e07ed193 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_event_listener.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_event_listener.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_interface.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_interface.h
index 4025acf2b6be..ff063a2eefad 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_control_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_identifier.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_identifier.h
index eb52ef6d72a2..666ab7b4cab6 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_identifier.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_identifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h
index 0356528fa2ca..50bdcbef4f4f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h
index fc1a4aa59910..0a8f3af8f37c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_log_system.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_log_system.h
index 488f4b7aae11..33a6848df62c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_log_system.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_log_system.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h
index 8df8c5d7404f..554abec88784 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h
index e19896dbe85f..566581024ca8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -17,6 +24,73 @@
 #define GCS_MEMBER_IDENTIFIER_INCLUDED
 
 #include <string>
+#include "gcs_types.h"
+
+
+/*
+  Internal GCS unique identifier.
+*/
+class Gcs_uuid
+{
+public:
+  /*
+    Create a GCS unique identifier.
+  */
+
+  static Gcs_uuid create_uuid();
+
+
+  /*
+    Default constructor
+  */
+  Gcs_uuid();
+
+
+  /*
+    Copies the internal buffer which is used to store a uuid to an
+    external buffer. If the parameters buffer or size point to NULL,
+    nothing is returned.
+
+    @param [out] buffer storage buffer
+    @param [out] size data size
+    @return Whether the data was returned or not.
+  */
+
+  bool encode(uchar **buffer, unsigned int *size) const;
+
+
+  /*
+    Copies the external buffer to an internal buffer. If the
+    parameter buffer points to NULL, nothing is returned.
+
+    @param [in] buffer storage buffer
+    @param [in] size data size
+    @return Whether the data was copied or not.
+  */
+
+  bool decode(const uchar *buffer, const unsigned int size);
+
+  /*
+    Return the size of the UUID in use.
+  */
+  size_t size() const;
+
+  /*
+    Unique identifier which currently only accommodates 64 bits but
+    can easily be extended to 128 bits and become a truly UUID in
+    the future.
+  */
+
+  std::string actual_value;
+
+private:
+  /*
+    Create a GCS unique identifier.
+  */
+
+  static const std::string do_create_uuid();
+};
+
 
 /**
   @class Gcs_member_identifier
@@ -41,6 +115,17 @@ class Gcs_member_identifier
   explicit Gcs_member_identifier(const std::string &member_id);
 
 
+  /**
+    Gcs_member_identifier constructor.
+
+    @param[in] member_id the member identifier
+    @param[in] uuid the member uuid
+  */
+
+  explicit Gcs_member_identifier(const std::string &member_id,
+                                 const Gcs_uuid &uuid);
+
+
   virtual ~Gcs_member_identifier() {}
 
 
@@ -50,6 +135,18 @@ class Gcs_member_identifier
 
   const std::string& get_member_id() const;
 
+  /**
+    @return the member uuid
+  */
+
+  const Gcs_uuid& get_member_uuid() const;
+
+
+  /**
+    Regenerate the member uuid
+  */
+
+  void regenerate_member_uuid();
 
   /**
     Redefinition of the operator less, to allow usage as key in maps.
@@ -76,7 +173,8 @@ class Gcs_member_identifier
 
 
 private:
-  std::string member_id;
+  std::string m_member_id;
+  Gcs_uuid m_uuid;
 };
 
 #endif // GCS_MEMBER_IDENTIFIER_INCLUDED
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_message.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_message.h
index 9e3e0bfad7be..07004b0a7ccc 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_message.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_message.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_statistics_interface.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_statistics_interface.h
index f75b57ef6a41..eba962070e41 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_statistics_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_statistics_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
index b4396a76e389..a12d501e1f31 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view.h
index 1a15a22b9e5d..3a63eb4d7df3 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,7 @@
 #include "gcs_member_identifier.h"
 
 #include <vector>
+#include <string>
 
 /**
   @class Gcs_view
@@ -146,6 +154,23 @@ class Gcs_view
   Gcs_view::Gcs_view_error_code get_error_code() const;
 
 
+  /*
+    @param[in] address Member's identifier which is usually its address
+    @return the member whose identifier matches the one provided as
+            parameter
+  */
+
+  const Gcs_member_identifier *get_member(const std::string &member_id) const;
+
+
+  /*
+    @param[in] member_id Member's identifier which is usually its address
+    @return whether there is a member whose identifier matches the one
+            provided as parameter
+  */
+
+  bool has_member(const std::string &member_id) const;
+
 private:
   std::vector<Gcs_member_identifier> *m_members;
   Gcs_view_identifier                *m_view_id;
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view_identifier.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view_identifier.h
index a9b66bd72d0f..90c075dcd6d4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view_identifier.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_view_identifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/byteorder.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/byteorder.h
index 2492cdc814f2..b3c72bf120fe 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/byteorder.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/byteorder.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_cond.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_cond.h
index c254d0066846..7c9f0032b5da 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_cond.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_cond.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h
index d8d826e91da5..77e8aba08761 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_mutex.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_thread.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_thread.h
index ed66d29e3fba..42e064a88f23 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_thread.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -79,7 +86,7 @@ struct st_native_thread_var
   int volatile abort;
   struct st_native_thread_var *next, **prev;
   void *opt_info;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void *dbug;
 #endif
 };
@@ -87,7 +94,7 @@ struct st_native_thread_var
 
 int set_mysys_thread_var(struct st_native_thread_var *mysys_var);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Returns pointer to DBUG for holding current state.
 */
diff --git a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_util.h b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_util.h
index 1327186718cd..f57c6b17e162 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_util.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/include/mysql/gcs/xplatform/my_xp_util.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc
index dda77a797c2a..5d8a6b24114a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h
index 09492bc2b44d..e39e20344381 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_internal_message.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc
index 0a259d31a175..502afbfe6757 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h
index 7a5e538d3b75..e046b9ac8a0d 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stage_lz4.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.cc
index 0e8edda975af..b1522e8d4b41 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.h
index d9ec985bc846..312f1b30761b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_message_stages.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc
index 8aaee6817f54..cb0dd80cac45 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h
index 010c17a8197b..e43128acf4f4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_communication_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc
index 4832e371420f..eecc1a13fe8f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -47,9 +54,11 @@ static void *expel_member_from_group_thread(void *ptr)
   nodes_to_kill *ntk= (nodes_to_kill *) ptr;
   unsigned int len= 0;
   char **addrs= NULL;
+  blob *uuids= NULL;
 
   len= static_cast<unsigned int>(ntk->nodes->size());
   addrs= static_cast<char **>(malloc(len * sizeof(char *)));
+  uuids= static_cast<blob *>(malloc(len * sizeof(blob)));
   node_list nl;
 
   std::vector<Gcs_member_identifier *>::const_iterator nodes_it= ntk->nodes->begin();
@@ -57,14 +66,22 @@ static void *expel_member_from_group_thread(void *ptr)
   for (int i= 0; nodes_it != nodes_end; i++, ++nodes_it)
   {
     addrs[i]= const_cast<char *>((*nodes_it)->get_member_id().c_str());
+    uuids[i].data.data_val=
+      static_cast<char *>(malloc((*nodes_it)->get_member_uuid().size() * sizeof(char)));
+    (*nodes_it)->get_member_uuid().encode(
+      reinterpret_cast<uchar **>(&uuids[i].data.data_val),
+      &(uuids[i].data.data_len)
+    );
+
     MYSQL_GCS_LOG_TRACE(
-      "expel_member_from_group_thread():: "
-      << "Node[" << i << "]=" << addrs[i]
+      "expel_member_from_group_thread():: Node[" << i << "]=(address="
+      << addrs[i] << ", uuid=" << (*nodes_it)->get_member_uuid().actual_value
+      << ")"
     );
   }
 
   nl.node_list_len= len;
-  nl.node_list_val= ntk->proxy->new_node_address(len, addrs);
+  nl.node_list_val= ntk->proxy->new_node_address_uuid(len, addrs, uuids);
   free(addrs);
 
   MYSQL_GCS_LOG_TRACE(
@@ -73,8 +90,12 @@ static void *expel_member_from_group_thread(void *ptr)
   )
 
   nodes_it= ntk->nodes->begin();
-  for (; nodes_it != nodes_end; ++nodes_it)
+  for (int i= 0; nodes_it != nodes_end; i++, ++nodes_it)
+  {
+    free(uuids[i].data.data_val);
     delete (*nodes_it);
+  }
+  free(uuids);
 
   ntk->proxy->xcom_client_remove_node(&nl, ntk->group_id_hash);
   MYSQL_GCS_LOG_TRACE(
@@ -125,25 +146,28 @@ Gcs_xcom_control(Gcs_xcom_group_member_information *group_member_information,
                  Gcs_xcom_state_exchange_interface *state_exchange,
                  Gcs_xcom_view_change_control_interface *view_control,
                  bool boot,
-                 My_xp_socket_util *socket_util)
+                 My_xp_socket_util *socket_util,
+                 Gcs_xcom_group_management *xcom_management)
   :m_gid(NULL),
   m_gid_hash(0),
   m_xcom_proxy(xcom_proxy),
   event_listeners(),
   m_local_member_id(NULL),
-  m_local_member_id_hash(0),
   m_state_exchange(state_exchange),
   m_local_node_info(NULL),
   m_xcom_thread(),
-  m_hash(0),
   m_node_list_me(),
-  m_uuid(0),
   m_socket_util(socket_util),
+  m_join_attempts(0),
+  m_join_sleep_time(0),
   m_xcom_running(false),
+  m_leave_view_requested(false),
+  m_leave_view_delivered(false),
   m_boot(boot),
   m_initial_peers(),
   m_view_control(view_control),
-  m_gcs_engine(gcs_engine)
+  m_gcs_engine(gcs_engine),
+  m_xcom_management(xcom_management)
 {
   set_local_node_info(group_member_information);
 
@@ -169,9 +193,12 @@ Gcs_xcom_control::~Gcs_xcom_control()
   delete m_gid;
   delete m_local_member_id;
 
-  if (m_node_list_me.node_list_len)
-    delete_node_address(m_node_list_me.node_list_len,
-                        m_node_list_me.node_list_val);
+  if (m_node_list_me.node_list_len != 0)
+  {
+    m_xcom_proxy->delete_node_address(m_node_list_me.node_list_len,
+                                      m_node_list_me.node_list_val);
+    m_node_list_me.node_list_len= 0;
+  }
 
   clear_peer_nodes();
 }
@@ -213,24 +240,53 @@ bool Gcs_xcom_control::is_xcom_running()
 }
 
 
+void Gcs_xcom_control::set_join_behavior(unsigned int join_attempts,
+                                         unsigned join_sleep_time)
+{
+  m_join_attempts= join_attempts;
+  MYSQL_GCS_LOG_INFO(
+    "Configured number of attempts to join: " << m_join_attempts
+  )
+
+  m_join_sleep_time= join_sleep_time;
+  MYSQL_GCS_LOG_INFO(
+    "Configured time between attempts to join: " << m_join_sleep_time
+    << " seconds"
+  )
+}
+
+
 /**
   Initializes address list.
 */
 void Gcs_xcom_control::init_me()
 {
+  blob uuid;
   Gcs_xcom_group_member_information *node= m_local_node_info;
-  char *addr= (char *)node->get_member_address().c_str();
-  blob *uuid;
+  char *addr= const_cast<char *>(node->get_member_address().c_str());
+
+  if (m_node_list_me.node_list_len != 0)
+  {
+    m_xcom_proxy->delete_node_address(m_node_list_me.node_list_len,
+                                      m_node_list_me.node_list_val);
+    m_node_list_me.node_list_len= 0;
+  }
+
+  uuid.data.data_val= static_cast<char *>(
+      malloc(m_local_member_id->get_member_uuid().size() * sizeof(char))
+  );
+  m_local_member_id->get_member_uuid().encode(
+      reinterpret_cast<uchar **>(&uuid.data.data_val),
+      &(uuid.data.data_len)
+  );
 
   m_node_list_me.node_list_len= 1;
   m_node_list_me.node_list_val=
-    m_xcom_proxy->new_node_address(m_node_list_me.node_list_len, &addr);
-  uuid= &m_node_list_me.node_list_val[0].uuid;
-
-  uuid->data.data_len= sizeof(m_local_member_id_hash);
-  uuid->data.data_val= (char *) calloc(1, uuid->data.data_len);
-  memcpy(uuid->data.data_val, &m_local_member_id_hash, uuid->data.data_len);
- }
+    m_xcom_proxy->new_node_address_uuid(
+      m_node_list_me.node_list_len, &addr, &uuid
+    );
+  free(uuid.data.data_val);
+}
 
 
 void do_function_join(Gcs_control_interface *control_if)
@@ -296,14 +352,10 @@ enum_gcs_error Gcs_xcom_control::join()
 }
 
 
-enum_gcs_error Gcs_xcom_control::do_join()
+enum_gcs_error Gcs_xcom_control::do_join(bool retry)
 {
-  /* Used to initialize xcom */
-  int local_port= m_local_node_info->get_member_port();
-  connection_descriptor* con= NULL;
-  int comm_status= XCOM_COMM_STATUS_UNDEFINED;
-  enum_gcs_error is_xcom_ready= GCS_NOK;
-  bool xcom_handlers_open= false;
+  int retry_join_count= m_join_attempts;
+  enum_gcs_error ret= GCS_NOK;
 
   if (m_xcom_running)
   {
@@ -315,6 +367,40 @@ enum_gcs_error Gcs_xcom_control::do_join()
     return GCS_NOK;
   }
 
+  while (ret == GCS_NOK)
+  {
+    ret= retry_do_join();
+
+    retry_join_count--;
+    if (retry && ret == GCS_NOK && retry_join_count >= 1)
+    {
+      MYSQL_GCS_LOG_DEBUG(
+        "Sleeping for 5 seconds before retrying to join the group. "
+        "There are " << retry_join_count << " more attempt(s) before "
+        "giving up.");
+      My_xp_util::sleep_seconds(m_join_sleep_time);
+    }
+    else
+    {
+      break;
+    }
+  }
+
+  m_view_control->end_join();
+
+  return ret;
+}
+
+
+enum_gcs_error Gcs_xcom_control::retry_do_join()
+{
+  /* Used to initialize xcom */
+  int local_port= m_local_node_info->get_member_port();
+  connection_descriptor* con= NULL;
+  int comm_status= XCOM_COMM_STATUS_UNDEFINED;
+  enum_gcs_error is_xcom_ready= GCS_NOK;
+  bool xcom_handlers_open= false;
+
   /*
     Clean up notification flags that are used to check whether XCOM
     is running or not.
@@ -335,7 +421,7 @@ enum_gcs_error Gcs_xcom_control::do_join()
   //Wait for XCom comms to become ready
   m_xcom_proxy->xcom_wait_for_xcom_comms_status_change(comm_status);
 
-  if(comm_status == XCOM_COMMS_ERROR)
+  if(comm_status != XCOM_COMMS_OK)
   {
     MYSQL_GCS_LOG_ERROR("Error joining the group while waiting for" <<
                         " the network layer to become ready.")
@@ -361,8 +447,8 @@ enum_gcs_error Gcs_xcom_control::do_join()
   if (m_boot)
   {
     MYSQL_GCS_LOG_TRACE(
-      "::join():: I am the boot node. "
-      << "Calling xcom_client_boot"
+      "::join():: I am the boot node. " <<  local_port << " "  <<
+      m_local_member_id->get_member_uuid().actual_value << ". Calling xcom_client_boot"
     )
 
     int error= 0;
@@ -387,8 +473,17 @@ enum_gcs_error Gcs_xcom_control::do_join()
     xcom_port port=  0;
     char *addr= NULL;
     std::vector<Gcs_xcom_group_member_information *>::iterator it;
-    std::string *local_node_info_str=
-      m_local_node_info->get_member_representation();
+    std::string local_node_info_str_ip;
+    bool resolve_error = false;
+    resolve_error = resolve_ip_addr_from_hostname(
+                 m_local_node_info->get_member_ip(), local_node_info_str_ip);
+
+    if (resolve_error)
+    {
+      MYSQL_GCS_LOG_ERROR("Error resolving local address name: "
+                          << m_local_node_info->get_member_ip().c_str())
+      goto err;
+    }
 
     while(con == NULL && n < Gcs_xcom_proxy::connection_attempts)
     {
@@ -397,18 +492,27 @@ enum_gcs_error Gcs_xcom_control::do_join()
           it++)
       {
         Gcs_xcom_group_member_information *peer= *(it);
-        std::string *peer_rep= peer->get_member_representation();
+        std::string peer_rep_ip;
 
-        if(peer_rep->compare(*local_node_info_str) == 0)
+        resolve_error =
+            resolve_ip_addr_from_hostname(peer->get_member_ip(), peer_rep_ip);
+        if (resolve_error)
+        {
+          MYSQL_GCS_LOG_WARN("Unable to resolve peer address "
+                             << peer->get_member_ip().c_str()
+                             << ". Skipping...")
+          continue;
+        }
+
+        if (peer_rep_ip.compare(local_node_info_str_ip) == 0 &&
+            peer->get_member_port() == m_local_node_info->get_member_port())
         {
           MYSQL_GCS_LOG_TRACE(
             "::join():: Skipping own address."
           )
           // Skip own address if configured in the peer list
-          delete peer_rep;
           continue;
         }
-        delete peer_rep;
 
         port= peer->get_member_port();
         addr= (char *)peer->get_member_ip().c_str();
@@ -429,10 +533,6 @@ enum_gcs_error Gcs_xcom_control::do_join()
       n++;
     }
 
-    // Not needed anymore since it was only used in the loop
-    // above. As such, claim back memory.
-    delete local_node_info_str;
-
     if (con != NULL)
     {
       if(m_socket_util->disable_nagle_in_socket(con->fd) < 0)
@@ -441,11 +541,20 @@ enum_gcs_error Gcs_xcom_control::do_join()
         goto err;
       }
       MYSQL_GCS_LOG_TRACE(
-        "::join():: Calling xcom_client_add_node " <<
-        local_port << " connected to " << addr << ":" << port <<
-        " to join"
+        "::join():: Calling xcom_client_add_node " << local_port << " "
+	<<  m_local_member_id->get_member_uuid().actual_value <<
+	" connected to " << addr << ":" << port << " to join"
       )
-      m_xcom_proxy->xcom_client_add_node(con, &m_node_list_me, m_gid_hash);
+      /*
+        Explicitly check the return value so that we are able to distinguish
+        between a failure in the synchronous local request from a failure in
+        the asynchronous add_node request.
+      */
+      if (!m_xcom_proxy->xcom_client_add_node(con, &m_node_list_me, m_gid_hash))
+      {
+        m_xcom_proxy->xcom_client_close_connection(con);
+        goto err;
+      }
       m_xcom_proxy->xcom_client_close_connection(con);
     }
     else
@@ -473,8 +582,6 @@ enum_gcs_error Gcs_xcom_control::do_join()
   MYSQL_GCS_LOG_DEBUG("The member has joined the group. Local port: " <<
                       local_port);
 
-  m_view_control->end_join();
-
   return GCS_OK;
 
 err:
@@ -488,7 +595,7 @@ enum_gcs_error Gcs_xcom_control::do_join()
       "Killing the group communication engine because the member failed to" <<
       " join. Local port: " << local_port
     );
-    if (m_xcom_proxy->xcom_exit(xcom_handlers_open))
+    if (comm_status != XCOM_COMMS_ERROR && m_xcom_proxy->xcom_exit(xcom_handlers_open))
     {
       MYSQL_GCS_LOG_WARN("Failed to kill the group communication engine " <<
                          "after the member failed to join. Local port: " <<
@@ -514,8 +621,6 @@ enum_gcs_error Gcs_xcom_control::do_join()
 
   m_xcom_running= false;
 
-  m_view_control->end_join();
-
   return GCS_NOK;
 }
 
@@ -588,7 +693,9 @@ enum_gcs_error Gcs_xcom_control::do_leave()
     return GCS_NOK;
   }
 
-  MYSQL_GCS_LOG_TRACE("::leave():: Contacting local node")
+  m_leave_view_delivered = false;
+  m_leave_view_requested = true;
+
   m_xcom_proxy->xcom_client_remove_node(&m_node_list_me, m_gid_hash);
 
   /*
@@ -642,43 +749,7 @@ enum_gcs_error Gcs_xcom_control::do_leave()
 
   m_view_control->end_leave();
 
-  /*
-    There is no need to synchronize here and this method can access
-    the current_view member stored in the view controller directly.
-  */
-  Gcs_view *current_view= m_view_control->get_unsafe_current_view();
-
-  if(current_view == NULL)
-  {
-    /*
-      XCOM has stopped but will not proceed with any view install. The
-      current view might be NULL due to the fact that the view with
-      the join still hasn't been delivered.
-    */
-    MYSQL_GCS_LOG_WARN("The member has left the group but the new view" <<
-                       " will not be installed, probably because it has not" <<
-                       " been delivered yet.")
-    /*
-      If the node leaves and joins within a 5 second window, it may not
-      get a global view. See BUG#23718481.
-    */
-    My_xp_util::sleep_seconds(5);
-
-    return GCS_OK;
-  }
-
-  /*
-    Notify that the node has left the group because someone has
-    requested to do so.
-  */
-  install_leave_view(Gcs_view::OK);
-
-  /*
-    Set that the node does not belong to a group anymore. Note there
-    is a small window when the node does not belong to the group
-    anymore but the view is not NULL.
-  */
-  m_view_control->set_belongs_to_group(false);
+  do_leave_view();
 
   /*
     Delete current view and set it to NULL.
@@ -694,6 +765,30 @@ enum_gcs_error Gcs_xcom_control::do_leave()
   return GCS_OK;
 }
 
+void Gcs_xcom_control::do_leave_view() {
+  /*
+    There is no need to synchronize here and this method can access
+    the current_view member stored in the view controller directly.
+  */
+  Gcs_view *current_view = m_view_control->get_unsafe_current_view();
+
+  if (current_view != NULL && !m_leave_view_delivered) {
+    MYSQL_GCS_LOG_DEBUG("Will install leave view: requested " <<
+                        m_leave_view_requested << ", delivered " <<
+                        m_leave_view_delivered);
+    install_leave_view(m_leave_view_requested ? Gcs_view::OK
+                                              : Gcs_view::MEMBER_EXPELLED);
+    if (m_leave_view_requested) {
+      m_view_control->set_belongs_to_group(false);
+    }
+
+    m_leave_view_delivered = m_leave_view_requested;
+
+    MYSQL_GCS_LOG_DEBUG("Installed leave view: requested " <<
+                        m_leave_view_requested << ", delivered " <<
+                        m_leave_view_delivered);
+  }
+}
 
 bool Gcs_xcom_control::belongs_to_group()
 {
@@ -768,10 +863,8 @@ build_total_members(Gcs_xcom_nodes *xcom_nodes,
     /*
       Build the member identifier from the address reported.
     */
-    string *member_id_str=
-      Gcs_xcom_utils::build_xcom_member_id(addresses[i]);
     Gcs_member_identifier *member_id=
-      new Gcs_member_identifier(*member_id_str);
+      new Gcs_member_identifier(addresses[i], xcom_nodes->get_uuids()[i]);
 
     /*
       Check whether the node is reported as alive or faulty.
@@ -784,8 +877,6 @@ build_total_members(Gcs_xcom_nodes *xcom_nodes,
     {
       failed_members.push_back(member_id);
     }
-
-    delete member_id_str;
   }
 }
 
@@ -818,9 +909,7 @@ build_joined_members(std::vector<Gcs_member_identifier *> &joined_members,
     }
 
     if (joined)
-      joined_members.push_back(
-        new Gcs_member_identifier((*alive_members_it)->get_member_id())
-      );
+      joined_members.push_back(new Gcs_member_identifier(*(*alive_members_it)));
   }
 }
 
@@ -935,6 +1024,7 @@ xcom_receive_local_view(Gcs_xcom_nodes *xcom_nodes)
   Gcs_view *current_view= m_view_control->get_unsafe_current_view();
   unsigned int size= xcom_nodes->get_size();
   const std::vector<std::string> &addresses= xcom_nodes->get_addresses();
+  const std::vector<Gcs_uuid> &uuids= xcom_nodes->get_uuids();
   const std::vector<bool> &statuses= xcom_nodes->get_statuses();
 
   // ignore
@@ -950,7 +1040,7 @@ xcom_receive_local_view(Gcs_xcom_nodes *xcom_nodes)
     // build the sets of servers
     for (i= 0; i < size; i++)
     {
-      Gcs_member_identifier gcs_id(addresses[i]);
+      Gcs_member_identifier gcs_id(addresses[i], uuids[i]);
 
       // filter out those that are not yet in the current view
       // delivered to the application. For example, they might
@@ -1078,6 +1168,12 @@ xcom_receive_global_view(synode_no message_id, Gcs_xcom_nodes *xcom_nodes,
     listener_ends;
   std::vector<Gcs_message_data *> exchange_data;
 
+  /*
+    Save the current set of nodes with its associated UUIDs because this may
+    be required if the group is reconfigured.
+  */
+  m_xcom_management->save_xcom_nodes(xcom_nodes);
+
   /*
     If there is no previous view installed, there is no current set
     of members.
@@ -1235,7 +1331,7 @@ xcom_receive_global_view(synode_no message_id, Gcs_xcom_nodes *xcom_nodes,
       "(My node_id is " <<
       xcom_nodes->get_node_no() << ") ::xcom_receive_global_view():: "
       "Discarding view because nothing has changed."
-      " Same view flag is " << same_view << ","
+      " Same view flag is " << same_view <<
       ", number of failed nodes is " << failed_members.size() <<
       ", number of joined nodes is " << joined_members.size() <<
       ", number of left nodes is " << left_members.size()
@@ -1383,6 +1479,7 @@ void Gcs_xcom_control::process_control_message(Gcs_message *msg)
       << configuration_id.msgno << "), node_no("
       << configuration_id.node << ")."
     )
+    delete ms_info;
     delete msg;
     return;
   }
@@ -1393,6 +1490,7 @@ void Gcs_xcom_control::process_control_message(Gcs_message *msg)
     << configuration_id.node << ")."
   )
 
+  // takes ownership of ms_info
   bool can_install_view=
     m_state_exchange->process_member_state(ms_info, msg->get_origin());
 
@@ -1563,16 +1661,14 @@ build_member_list(set<Gcs_member_identifier *> *origin,
 void Gcs_xcom_control::set_local_node_info(Gcs_xcom_group_member_information *group_member_information)
 {
   m_local_node_info= group_member_information;
-
   string address= group_member_information->get_member_address();
-
-  string *member_id= Gcs_xcom_utils::build_xcom_member_id(address);
   delete m_local_member_id;
-  m_local_member_id= new Gcs_member_identifier(*member_id);
-  m_local_member_id_hash=
-    Gcs_xcom_utils::mhash((unsigned char *) m_local_member_id->get_member_id().c_str(),
-                          m_local_member_id->get_member_id().size());
-  delete member_id;
+  /*
+    We don't care at this point about the unique identifier associated to
+    this object because it will be changed while joining a group by the
+    init_me() method.
+  */
+  m_local_member_id= new Gcs_member_identifier(address);
 }
 
 void Gcs_xcom_control::set_peer_nodes(std::vector<Gcs_xcom_group_member_information *> &xcom_peers)
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h
index 5f8af67f3f7e..b8b93b9a8e4f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -27,6 +34,7 @@
 
 #include "gcs_xcom_state_exchange.h"
 #include "gcs_xcom_group_member_information.h"
+#include "gcs_xcom_group_management.h"
 #include "gcs_xcom_interface.h"
 #include "gcs_xcom_notification.h"
 
@@ -96,18 +104,21 @@ class Gcs_xcom_control: public Gcs_control_interface
     Gcs_xcom_state_exchange_interface *state_exchange,
     Gcs_xcom_view_change_control_interface *view_control,
     bool boot,
-    My_xp_socket_util *socket_util);
+    My_xp_socket_util *socket_util,
+    Gcs_xcom_group_management *xcom_management);
 
   virtual ~Gcs_xcom_control();
 
   // Gcs_control_interface implementation
   enum_gcs_error join();
 
+  enum_gcs_error do_join(const bool retry=true);
+
   /*
     Responsible for doing the heavy lifting related to the join
     operation.
   */
-  enum_gcs_error do_join();
+  enum_gcs_error retry_do_join();
 
   enum_gcs_error leave();
 
@@ -117,6 +128,12 @@ class Gcs_xcom_control: public Gcs_control_interface
   */
   enum_gcs_error do_leave();
 
+  /**
+    Sends a leave view message to inform that XCOM has already exited or
+    is about to do so.
+  */
+  void do_leave_view();
+
   bool belongs_to_group();
 
   Gcs_view *get_current_view();
@@ -219,6 +236,16 @@ class Gcs_xcom_control: public Gcs_control_interface
   */
   bool is_xcom_running();
 
+
+  /*
+    Configure how many times the node will try to join a group.
+
+    @param[in] join_attempts number of attempts to join
+    @param[in] join_sleep_time time between attempts to join
+  */
+  void set_join_behavior(unsigned int join_attempts,
+                         unsigned int join_sleep_time);
+
 private:
   void init_me();
 
@@ -314,7 +341,6 @@ class Gcs_xcom_control: public Gcs_control_interface
 
   // Information about the local membership of this node
   Gcs_member_identifier *m_local_member_id;
-  unsigned int          m_local_member_id_hash;
 
   // A reference of the State Exchange algorithm implementation
   Gcs_xcom_state_exchange_interface *m_state_exchange;
@@ -325,16 +351,25 @@ class Gcs_xcom_control: public Gcs_control_interface
   // XCom main loop
   My_xp_thread_impl m_xcom_thread;
 
-  /* The hash of this client. */
-  unsigned int m_hash;
-
+  /*
+     Structure that contains the identification of this node
+     from XCOM's perspective
+  */
   node_list m_node_list_me;
 
-  /* UUID of this node */
-  unsigned int m_uuid;
-
   My_xp_socket_util* m_socket_util;
 
+  /*
+    Number of attempts to join a group before giving up and reporting
+    an error.
+  */
+  unsigned int m_join_attempts;
+
+  /*
+    Number of time in seconds to wait between attempts to join a group.
+  */
+  unsigned int m_join_sleep_time;
+
 protected:
   /*
     Whether the XCOM was left running or not meaning that the join
@@ -346,6 +381,17 @@ class Gcs_xcom_control: public Gcs_control_interface
   */
   bool m_xcom_running;
 
+  /*
+    Whether it was requested to make the node leave the group or not.
+  */
+  bool m_leave_view_requested;
+
+  /*
+    Whether a view saying that the node has voluntarily left the group
+    was delivered or not.
+  */
+  bool m_leave_view_delivered;
+
   /* Whether this site boots the group or not. */
   bool m_boot;
 
@@ -359,6 +405,11 @@ class Gcs_xcom_control: public Gcs_control_interface
   Gcs_xcom_engine *m_gcs_engine;
 
 private:
+  /*
+    Reference to the management interface.
+  */
+  Gcs_xcom_group_management *m_xcom_management;
+
   /*
     Disabling the copy constructor and assignment operator.
   */
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc
index 3c91347b7112..7c0a28ec52a4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -17,27 +24,43 @@
 
 #include "gcs_xcom_utils.h"
 #include "gcs_logging.h"
+#include <string.h>
 
 Gcs_xcom_group_management::
 Gcs_xcom_group_management(Gcs_xcom_proxy *xcom_proxy,
+                          Gcs_xcom_view_change_control_interface *view_control,
                           const Gcs_group_identifier& group_identifier)
   : m_xcom_proxy(xcom_proxy),
+    m_view_control(view_control),
     m_gid(new Gcs_group_identifier(group_identifier.get_group_id())),
     m_gid_hash(Gcs_xcom_utils::mhash(
      reinterpret_cast<unsigned char*>(const_cast<char *>(m_gid->get_group_id().c_str())),
-     m_gid->get_group_id().size()))
-{}
+     m_gid->get_group_id().size())),
+    m_xcom_nodes(),
+    m_xcom_nodes_mutex()
+{
+  m_xcom_nodes_mutex.init(NULL);
+}
 
 
 Gcs_xcom_group_management::~Gcs_xcom_group_management()
 {
   delete m_gid;
+  m_xcom_nodes_mutex.destroy();
+}
+
+void Gcs_xcom_group_management::save_xcom_nodes(const Gcs_xcom_nodes *xcom_nodes)
+{
+  m_xcom_nodes_mutex.lock();
+  m_xcom_nodes= *xcom_nodes;
+  m_xcom_nodes_mutex.unlock();
 }
 
 enum_gcs_error
 Gcs_xcom_group_management::
 modify_configuration(const Gcs_interface_parameters& reconfigured_group)
 {
+  int result= 0;
   // Retrieve peers_nodes parameter
   const std::string *peer_nodes_str=
                                 reconfigured_group.get_parameter("peer_nodes");
@@ -69,7 +92,7 @@ modify_configuration(const Gcs_interface_parameters& reconfigured_group)
     }
 
     MYSQL_GCS_LOG_ERROR(
-      "The peers list contains invalid addresses.Please provide a list with " <<
+      "The peers list contains invalid addresses. Please provide a list with " <<
       "only valid addresses."
     )
 
@@ -84,31 +107,89 @@ modify_configuration(const Gcs_interface_parameters& reconfigured_group)
     return GCS_NOK;
   }
 
+  Gcs_view *view= m_view_control->get_current_view();
+  if (view == NULL)
+  {
+    MYSQL_GCS_LOG_ERROR(
+      "The peer is not part of any group and cannot be used to start "
+      "a reconfiguration."
+    );
+    return GCS_NOK;
+  }
+
   unsigned int len= static_cast<unsigned int>(processed_peers.size());
-  char **addrs= (char **) malloc(len * sizeof(char *));
+  char **addrs= static_cast<char **>(malloc(len * sizeof(char *)));
+  blob *uuids= static_cast<blob *>(malloc(len * sizeof(blob)));
+  memset(uuids, 0, len * sizeof(blob));
 
+  const Gcs_member_identifier *member= NULL;
+  MYSQL_GCS_LOG_INFO("Checking members to force a new configuration.");
+  m_xcom_nodes_mutex.lock();
   std::vector<std::string>::const_iterator nodes_it= processed_peers.begin();
   std::vector<std::string>::const_iterator nodes_end= processed_peers.end();
   for (int i= 0; nodes_it != nodes_end; i++, ++nodes_it)
   {
-    //const_cast will avoid unnecessary memory allocations
-    addrs[i]= const_cast<char*>((*nodes_it).c_str());
+    member= view->get_member(*nodes_it);
+    if (member == NULL)
+    {
+      MYSQL_GCS_LOG_ERROR(
+        "The peer is trying to set up a configuration where there is a "
+        "member '" << addrs[i] << "' that doesn't belong to its current "
+        "view."
+      );
+
+      /*
+        We have to free the memory allocated to convey the uuid in blob
+        format because it will not be handed over to XCOM and noboby
+        will free it otherwise.
+      */
+      m_xcom_nodes_mutex.unlock();
+      goto error;
+    }
 
-    MYSQL_GCS_LOG_TRACE(
-      "::modify_configuration():: Node[" << i << "]=" << addrs[i])
+    addrs[i]= const_cast<char *>((*nodes_it).c_str());
+    const Gcs_uuid *local_uuid= m_xcom_nodes.get_uuid(addrs[i]);
+    if (local_uuid == NULL)
+    {
+      MYSQL_GCS_LOG_ERROR(
+        "The peer is trying to set up a configuration where there is a "
+        "member '" << addrs[i] << "' that doesn't have a valid UUID."
+      );
+      m_xcom_nodes_mutex.unlock();
+      goto error;
+    }
+    uuids[i].data.data_val= static_cast<char *>(malloc(local_uuid->size() * sizeof(char)));
+    local_uuid->encode(
+      reinterpret_cast<uchar **>(&uuids[i].data.data_val),
+      &(uuids[i].data.data_len)
+    );
+
+    MYSQL_GCS_LOG_INFO(
+      "::modify_configuration():: Node[" << i << "]=" << addrs[i]  << " "
+      << local_uuid->actual_value.c_str()
+    );
   }
+  m_xcom_nodes_mutex.unlock();
 
   node_list nl;
   nl.node_list_len= len;
-  nl.node_list_val= m_xcom_proxy->new_node_address(len, addrs);
-  free(addrs);
+  nl.node_list_val= m_xcom_proxy->new_node_address_uuid(len, addrs, uuids);
 
-  int result= m_xcom_proxy->xcom_client_force_config(&nl, m_gid_hash);
+  result= m_xcom_proxy->xcom_client_force_config(&nl, m_gid_hash);
   m_xcom_proxy->delete_node_address(len, nl.node_list_val);
 
+error:
   if (result != 1)
     MYSQL_GCS_LOG_ERROR("Error reconfiguring group.");
 
+  nodes_it= processed_peers.begin();
+  for (int i= 0; nodes_it != nodes_end; i++, ++nodes_it)
+  {
+    free(uuids[i].data.data_val);
+  }
+  free(addrs);
+  free(uuids);
+  delete view;
+
   return (result == 1)? GCS_OK: GCS_NOK;
 }
-
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h
index fefd6649d105..9316fb7a117a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_management.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,22 +25,29 @@
 
 #include "gcs_group_management_interface.h" // Base class: Gcs_group_management_interface
 #include "gcs_xcom_utils.h"
+#include "gcs_xcom_state_exchange.h"
+#include "xplatform/my_xp_mutex.h"
 
 class Gcs_xcom_group_management : public Gcs_group_management_interface
 {
 public:
   explicit Gcs_xcom_group_management(
     Gcs_xcom_proxy *xcom_proxy,
+    Gcs_xcom_view_change_control_interface *view_control,
     const Gcs_group_identifier& group_identifier);
   virtual ~Gcs_xcom_group_management();
 
   enum_gcs_error
        modify_configuration(const Gcs_interface_parameters& reconfigured_group);
+  void save_xcom_nodes(const Gcs_xcom_nodes *xcom_nodes);
 
 private:
   Gcs_xcom_proxy *m_xcom_proxy;
+  Gcs_xcom_view_change_control_interface *m_view_control;
   Gcs_group_identifier* m_gid;
   unsigned int m_gid_hash;
+  Gcs_xcom_nodes m_xcom_nodes;
+  My_xp_mutex_impl m_xcom_nodes_mutex;
 
   /*
     Disabling the copy constructor and assignment operator.
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc
index dca06dfef22e..80dc9910019b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h
index 116c70013254..da4dab4d0b53 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_group_member_information.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc
index 34782dafbfc3..e28b334d0ddb 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -19,6 +26,7 @@
 
 #include "gcs_xcom_interface.h"
 #include "synode_no.h"
+#include "site_struct.h"
 
 #include "gcs_xcom_group_member_information.h"
 
@@ -80,9 +88,11 @@ void      do_cb_xcom_receive_global_view(synode_no config_id,
 void      cb_xcom_comms(int status);
 void      cb_xcom_ready(int status);
 void      cb_xcom_exit(int status);
+void      cb_xcom_expel(int status);
+
 synode_no cb_xcom_get_app_snap(blob *gcs_snap);
 void      cb_xcom_handle_app_snap(blob *gcs_snap);
-int       cb_xcom_socket_accept(int fd);
+int       cb_xcom_socket_accept(int fd, site_def const *xcom_config);
 
 
 // XCom logging callback
@@ -312,6 +322,10 @@ Gcs_xcom_interface::configure(const Gcs_interface_parameters &interface_params)
     validated_params.get_parameter("bootstrap_group");
   const std::string *poll_spin_loops_str=
     validated_params.get_parameter("poll_spin_loops");
+  const std::string *join_attempts_str=
+    validated_params.get_parameter("join_attempts");
+  const std::string *join_sleep_time_str=
+    validated_params.get_parameter("join_sleep_time");
 
   // Mandatory
   if (group_name_str == NULL)
@@ -411,6 +425,10 @@ Gcs_xcom_interface::configure(const Gcs_interface_parameters &interface_params)
     reconfigured |= true;
   }
 
+  xcom_control->set_join_behavior(
+    static_cast<unsigned int>(atoi(join_attempts_str->c_str())),
+    static_cast<unsigned int>(atoi(join_sleep_time_str->c_str())));
+
 end:
   if (error == GCS_NOK || !reconfigured)
   {
@@ -457,6 +475,23 @@ void Gcs_xcom_interface::finalize_xcom()
   }
 }
 
+void Gcs_xcom_interface::make_gcs_leave_group_on_error()
+{
+  Gcs_group_identifier *group_identifier = NULL;
+  map<u_long, Gcs_group_identifier *>::iterator xcom_configured_groups_it;
+  Gcs_xcom_interface *intf =
+      static_cast<Gcs_xcom_interface *>(Gcs_xcom_interface::get_interface());
+
+  for (xcom_configured_groups_it = m_xcom_configured_groups.begin();
+       xcom_configured_groups_it != m_xcom_configured_groups.end();
+       xcom_configured_groups_it++)
+  {
+    group_identifier = (*xcom_configured_groups_it).second;
+    Gcs_xcom_control *control_if = static_cast<Gcs_xcom_control *>(
+        intf->get_control_session(*group_identifier));
+    control_if->do_leave_view();
+  }
+}
 
 enum_gcs_error Gcs_xcom_interface::finalize()
 {
@@ -571,6 +606,14 @@ get_group_interfaces(const Gcs_group_identifier &group_identifier)
   gcs_xcom_group_interfaces *group_interface= NULL;
   if (registered_group == m_group_interfaces.end())
   {
+    /*
+      Retrieve some initialization parameters.
+    */
+    const std::string *join_attempts_str=
+      m_initialization_parameters.get_parameter("join_attempts");
+    const std::string *join_sleep_time_str=
+      m_initialization_parameters.get_parameter("join_sleep_time");
+
     /*
       If the group interfaces do not exist, create and add them to
       the dictionary.
@@ -592,7 +635,12 @@ get_group_interfaces(const Gcs_group_identifier &group_identifier)
 
     Gcs_xcom_state_exchange_interface *se=
       new Gcs_xcom_state_exchange(group_interface->communication_interface);
-    group_interface->control_interface=
+
+    Gcs_xcom_group_management *xcom_management=
+      new Gcs_xcom_group_management(xcom_proxy, vce, group_identifier);
+    group_interface->management_interface= xcom_management;
+
+    Gcs_xcom_control *xcom_control=
       new Gcs_xcom_control(m_local_node_information,
                            m_xcom_peers,
                            group_identifier,
@@ -601,11 +649,15 @@ get_group_interfaces(const Gcs_group_identifier &group_identifier)
                            se,
                            vce,
                            m_boot,
-                           m_socket_util);
+                           m_socket_util,
+                           xcom_management);
+    group_interface->control_interface= xcom_control;
+
+    xcom_control->set_join_behavior(
+      static_cast<unsigned int>(atoi(join_attempts_str->c_str())),
+      static_cast<unsigned int>(atoi(join_sleep_time_str->c_str()))
+    );
 
-    group_interface->management_interface=
-                                      new Gcs_xcom_group_management(xcom_proxy,
-                                                                    group_identifier);
 
     // Store the created objects for later deletion
     group_interface->vce= vce;
@@ -761,6 +813,7 @@ initialize_xcom(const Gcs_interface_parameters &interface_params)
   ::set_xcom_run_cb(cb_xcom_ready);
   ::set_xcom_comms_cb(cb_xcom_comms);
   ::set_xcom_exit_cb(cb_xcom_exit);
+  ::set_xcom_expel_cb(cb_xcom_expel);
   ::set_xcom_socket_accept_cb(cb_xcom_socket_accept);
 
   const std::string *wait_time_str=
@@ -1444,6 +1497,31 @@ void cb_xcom_exit(int status MY_ATTRIBUTE((unused)))
     xcom_proxy->xcom_signal_exit();
 }
 
+void do_cb_xcom_expel() {
+  Gcs_xcom_interface *intf =
+      static_cast<Gcs_xcom_interface *>(Gcs_xcom_interface::get_interface());
+  if (intf) {
+    intf->make_gcs_leave_group_on_error();
+  }
+}
+
+/*
+  Callback function used by XCom to signal that a node has left the group
+  because of a `die_op` or a view where the node does not belong to.
+*/
+void cb_xcom_expel(int status MY_ATTRIBUTE((unused))) {
+  Gcs_xcom_notification *notification =
+      new Expel_notification(do_cb_xcom_expel);
+
+  bool scheduled = gcs_engine->push(notification);
+  if (!scheduled) {
+    MYSQL_GCS_LOG_DEBUG(
+        "Tried to enqueue an expel request but the member is about to stop.")
+    delete notification;
+  } else {
+    MYSQL_GCS_LOG_TRACE("Expel view notification: " << notification)
+  }
+}
 
 void cb_xcom_logger(int level, const char *message)
 {
@@ -1451,12 +1529,12 @@ void cb_xcom_logger(int level, const char *message)
 }
 
 
-int cb_xcom_socket_accept(int fd)
+int cb_xcom_socket_accept(int fd, site_def const *xcom_config)
 {
   Gcs_xcom_interface *intf=
     static_cast<Gcs_xcom_interface *>(Gcs_xcom_interface::get_interface());
 
   const Gcs_ip_whitelist& wl= intf->get_ip_whitelist();
 
-  return wl.shall_block(fd) ? 0 : 1;
+  return wl.shall_block(fd, xcom_config) ? 0 : 1;
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h
index 3c3831727aa8..cdee7886d809 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -165,6 +172,11 @@ class Gcs_xcom_interface: public Gcs_interface
 
   void finalize_xcom();
 
+  /**
+    Triggers the termination of GCS when an error has caused XCom to terminate
+    unexpectedly.
+  */
+  void make_gcs_leave_group_on_error();
 
   /**
     Used to initialize SSL assuming that the necessary parameters have already
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc
index 4d1b03283296..f69709e65b53 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc
@@ -1,18 +1,26 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include "gcs_xcom_group_member_information.h"
 #include "gcs_xcom_networking.h"
 #include "gcs_xcom_utils.h"
 #include "gcs_group_identifier.h"
@@ -314,15 +322,43 @@ sock_descriptor_to_sockaddr(int fd, struct sockaddr_storage *sa)
   {
     if (sa->ss_family != AF_INET && sa->ss_family != AF_INET6)
     {
-      MYSQL_GCS_LOG_WARN("Connection is not from an IPv4 nor IPv6 address. "
+      MYSQL_GCS_LOG_DEBUG("Connection is not from an IPv4 nor IPv6 address. "
                          "This is not supported. Refusing the connection!");
       res= 1;
     }
   }
   else
   {
-    MYSQL_GCS_LOG_WARN("Unable to handle socket descriptor, therefore "
-                       "refusing connection.");
+    int err = errno;
+    switch (err) {
+    case EBADF:
+      MYSQL_GCS_LOG_DEBUG("The file descriptor fd=" << fd << " is not valid");
+      break;
+    case EFAULT:
+      MYSQL_GCS_LOG_DEBUG("The sockaddr_storage pointer sa="
+                          << sa << " points to memory not in a valid part of "
+                                   "the process address space");
+      break;
+    case EINVAL:
+      MYSQL_GCS_LOG_DEBUG("The value of addr_size=" << addr_size
+                                                    << " is invalid");
+      break;
+    case ENOBUFS:
+      MYSQL_GCS_LOG_DEBUG("Insufficient resources were available in the "
+                          "system to perform the getpeername operation");
+      break;
+    case ENOTCONN:
+      MYSQL_GCS_LOG_DEBUG("The socket fd=" << fd << " is not connected");
+      break;
+    case ENOTSOCK:
+      MYSQL_GCS_LOG_DEBUG(
+          "The file descriptor fd=" << fd << " does not refer to a socket");
+      break;
+    default:
+      MYSQL_GCS_LOG_DEBUG(
+          "Unable to perform getpeername, therefore refusing connection.");
+      break;
+    }
   }
   return res ? true: false;
 }
@@ -724,12 +760,121 @@ Gcs_ip_whitelist::add_address(std::string addr, std::string mask)
 }
 
 bool
-Gcs_ip_whitelist::do_check_block(struct sockaddr_storage *sa) const
+Gcs_ip_whitelist::do_check_block_whitelist(
+  std::vector<unsigned char> const& incoming_octets) const
 {
+  /*
+    Check if the incoming IP matches any IP-mask combination in the whitelist.
+    The check compares both IPs' bytes (octets) in network byte order.
+  */
   bool block= true;
-  unsigned char *buf;
   std::set< Gcs_ip_whitelist_entry* >::const_iterator wl_it;
-  std::pair< std::vector<unsigned char>, std::vector<unsigned char> > *wl_value;
+  for (wl_it= m_ip_whitelist.begin();
+       wl_it != m_ip_whitelist.end() && block;
+       wl_it++)
+  {
+    std::pair< std::vector<unsigned char>, std::vector<unsigned char> > *wl_value= NULL;
+
+    wl_value= (*wl_it)->get_value();
+    if (wl_value == NULL)
+      continue;
+
+    std::vector<unsigned char> const& wl_range_octets= (*wl_value).first;
+    std::vector<unsigned char> const& wl_netmask_octets= (*wl_value).second;
+
+    // no point in comparing different families, e.g. IPv4 with IPv6
+    if (incoming_octets.size() != wl_range_octets.size())
+      goto cleanup_and_continue;
+
+    for (size_t octet= 0; octet < wl_range_octets.size(); octet++)
+    {
+      unsigned char const& oct_in_ip= incoming_octets[octet];
+      unsigned char const& oct_range_ip= wl_range_octets[octet];
+      unsigned char const& oct_mask_ip= wl_netmask_octets[octet];
+      // bail out on the first octet mismatch -- try next IP
+      if ((block= (oct_in_ip & oct_mask_ip) != (oct_range_ip & oct_mask_ip)))
+        break;
+    }
+
+    cleanup_and_continue:
+    // we own wl_value if the XCom member is a hostname
+    bool is_hostname=
+      dynamic_cast<Gcs_ip_whitelist_entry_hostname *>(*wl_it) != NULL;
+    if (is_hostname)
+      delete wl_value;
+  }
+  return block;
+}
+
+bool
+Gcs_ip_whitelist::do_check_block_xcom(
+  std::vector<unsigned char> const& incoming_octets,
+  site_def const *xcom_config) const
+{
+  /*
+    Check if the incoming IP matches the IP of any XCom member.
+    The check compares both IPs' bytes (octets) in network byte order.
+  */
+  bool block= true;
+  for (u_int i= 0; i < xcom_config->nodes.node_list_len && block; i++)
+  {
+    Gcs_xcom_group_member_information xcom_addr(
+      std::string(xcom_config->nodes.node_list_val[i].address));
+    struct sockaddr_storage xcom_sa;
+    Gcs_ip_whitelist_entry *xcom_addr_wl= NULL;
+    std::pair< std::vector<unsigned char>, std::vector<unsigned char> > *wl_value= NULL;
+    std::vector<unsigned char> const *xcom_octets= NULL;
+
+    /*
+      Treat the XCom member as if it is in the whitelist.
+      The XCom member can be an IP or hostname.
+      The magic-number "32" for the netmask is tied to IPv4.
+    */
+    bool is_hostname= string_to_sockaddr(xcom_addr.get_member_ip(), &xcom_sa);
+    if (is_hostname)
+      xcom_addr_wl= new Gcs_ip_whitelist_entry_hostname(
+        xcom_addr.get_member_ip(), "32");
+    else
+      xcom_addr_wl= new Gcs_ip_whitelist_entry_ip(
+        xcom_addr.get_member_ip(), "32");
+
+    bool error= xcom_addr_wl->init_value();
+    if (error)
+      goto cleanup_and_continue;
+    wl_value= xcom_addr_wl->get_value();
+    if (wl_value == NULL)
+      goto cleanup_and_continue;
+
+    xcom_octets= &wl_value->first;
+
+    // no point in comparing different families, e.g. IPv4 with IPv6
+    if (incoming_octets.size() != xcom_octets->size())
+      goto cleanup_and_continue;
+
+    for (size_t octet= 0; octet < xcom_octets->size(); octet++)
+    {
+      unsigned char const& oct_incoming= incoming_octets[octet];
+      unsigned char const& oct_xcom= (*xcom_octets)[octet];
+      // bail out on the first octet mismatch -- try next IP
+      if ((block= (oct_incoming != oct_xcom)))
+        break;
+    }
+
+    cleanup_and_continue:
+    // we own wl_value if the XCom member is a hostname
+    if (is_hostname)
+      delete wl_value;
+    delete xcom_addr_wl;
+  }
+  return block;
+}
+
+bool
+Gcs_ip_whitelist::do_check_block(struct sockaddr_storage *sa,
+                                 site_def const *xcom_config) const
+{
+  bool block= true;
+  unsigned char *buf;
   std::vector<unsigned char> ip;
 
 /* purecov: begin deadcode */
@@ -748,48 +893,21 @@ Gcs_ip_whitelist::do_check_block(struct sockaddr_storage *sa) const
     goto end;
 
   /*
-   This check works like this:
-   1. Check if the whitelist is empty.
-      - if empty, return false
-   2. If whitelist is not empty
-      - for every ip and mask
-        - check if bytes (octets) match in network byte order
-   */
-
-  if (m_ip_whitelist.empty())
-    goto end;
-
-  for (wl_it= m_ip_whitelist.begin();
-       wl_it != m_ip_whitelist.end() && block;
-       wl_it++)
-  {
-    wl_value= (*wl_it)->get_value();
-
-    if(wl_value == NULL)
-      continue;
-
-    unsigned int octet;
-    const std::vector<unsigned char> range= (*wl_value).first;
-    const std::vector<unsigned char> netmask= (*wl_value).second;
-
-    for (octet= 0; octet < range.size(); octet++)
-    {
-      unsigned char oct_in_ip= ip[octet];
-      unsigned char oct_range_ip= range[octet];
-      unsigned char oct_mask_ip= netmask[octet];
-
-      // bail out on the first octet mismatch -- try next IP
-      if ((block= (oct_in_ip & oct_mask_ip) != (oct_range_ip & oct_mask_ip)))
-        break;
-    }
-  }
+    Allow the incoming IP if it is whitelisted *or* is an XCom member.
+    XCom members are authorized by default so that XCom can create its
+    all-to-all bidirectional network.
+  */
+  if (!m_ip_whitelist.empty())
+    block= do_check_block_whitelist(ip);
+  if (block && xcom_config != NULL)
+    block= do_check_block_xcom(ip, xcom_config);
 
 end:
   return block;
 }
 
 bool
-Gcs_ip_whitelist::shall_block(int fd) const
+Gcs_ip_whitelist::shall_block(int fd, site_def const *xcom_config) const
 {
   bool ret= true;
   if (fd > 0)
@@ -802,7 +920,7 @@ Gcs_ip_whitelist::shall_block(int fd) const
       ret= true;
     }
     else
-      ret= do_check_block(&sa);
+      ret= do_check_block(&sa, xcom_config);
   }
 
   if (ret)
@@ -817,7 +935,8 @@ Gcs_ip_whitelist::shall_block(int fd) const
 }
 
 bool
-Gcs_ip_whitelist::shall_block(const std::string& ip_addr) const
+Gcs_ip_whitelist::shall_block(const std::string& ip_addr,
+                              site_def const *xcom_config) const
 {
   bool ret= true;
   if (!ip_addr.empty())
@@ -830,7 +949,7 @@ Gcs_ip_whitelist::shall_block(const std::string& ip_addr) const
       ret= true;
     }
     else
-      ret= do_check_block(&sa);
+      ret= do_check_block(&sa, xcom_config);
   }
 
   if (ret)
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h
index e052a999afa5..c5e5b595796a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,8 @@
 #include <set>
 #include <string>
 
+#include "site_struct.h"
+
 /**
   This function gets all network addresses on this host and their
   subnet masks as a string. IPv4 only. (SOCK_STREAM only)
@@ -225,20 +234,23 @@ class Gcs_ip_whitelist
    false otherwise.
 
    @param ip_addr a string representation of an IPv4 address.
+   @param xcom_config the latest XCom configuration.
 
    @return true if the ip should be blocked, false otherwise.
    */
-  bool shall_block(const std::string& ip_addr) const;
+  bool shall_block(const std::string& ip_addr,
+                   site_def const *xcom_config= NULL) const;
 
   /**
    This member function SHALL return true if the IP of the given file descriptor
    is to be blocked, false otherwise.
 
    @param fd the file descriptor of the accepted socket to check.
+   @param xcom_config the latest XCom configuration.
 
    @return true if the ip should be blocked, false otherwise.
    */
-  bool shall_block(int fd) const;
+  bool shall_block(int fd, site_def const *xcom_config= NULL) const;
 
   /**
    This member function gets the textual representation of the list as
@@ -255,7 +267,12 @@ class Gcs_ip_whitelist
   std::string to_string() const;
 
 private:
-  bool do_check_block(struct sockaddr_storage *sa) const;
+  bool do_check_block(struct sockaddr_storage *sa,
+                      site_def const *xcom_config) const;
+  bool do_check_block_whitelist(
+    std::vector<unsigned char> const& incoming_octets) const;
+  bool do_check_block_xcom(std::vector<unsigned char> const& incoming_octets,
+                           site_def const *xcom_config) const;
   bool add_address(std::string addr, std::string mask);
 
 private:
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc
index 2971f8d76531..372a15295af8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -129,6 +136,16 @@ void Local_view_notification::do_execute()
 }
 
 
+Expel_notification::Expel_notification(xcom_expel_functor *functor)
+    : m_functor(functor) {}
+
+
+Expel_notification::~Expel_notification() {}
+
+
+void Expel_notification::do_execute() { (*m_functor)(); }
+
+
 Control_notification::Control_notification(xcom_control_functor* functor,
                                            Gcs_control_interface *control_if)
  : m_functor(functor), m_control_if(control_if) { }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h
index 709a1acb120d..e51d18a504d6 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -645,4 +652,44 @@ class Control_notification : public Parameterized_notification<false>
   Control_notification(Control_notification const&);
   Control_notification& operator=(Control_notification const&);
 };
+
+typedef void(xcom_expel_functor)(void);
+
+/**
+  Notification used to inform that the node has been expelled or is about
+  to be.
+*/
+class Expel_notification : public Parameterized_notification<false> {
+ public:
+  /**
+    Constructor for Expel_notification.
+    @param functor Pointer to a function that contains that actual core of
+    the execution.
+  */
+  explicit Expel_notification(xcom_expel_functor *functor);
+
+  /**
+    Destructor for Expel_notification.
+  */
+  ~Expel_notification();
+
+ private:
+  /**
+    Task implemented by this notification.
+  */
+  void do_execute();
+
+  /*
+    Pointer to a function that contains that actual core of the execution.
+  */
+  xcom_expel_functor *m_functor;
+
+  /*
+    Disabling the copy constructor and assignment operator.
+  */
+  Expel_notification(Expel_notification const &);
+  Expel_notification &operator=(Expel_notification const &);
+
+};
+
 #endif // GCS_XCOM_NOTIFICATION_INCLUDED
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc
index ea6cab05cf7f..0066eaba2c47 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -300,7 +307,7 @@ void Gcs_xcom_state_exchange::reset_with_flush()
 
 void Gcs_xcom_state_exchange::reset()
 {
-  Gcs_xcom_communication_interface *binding_broadcaster=
+  Gcs_xcom_communication_interface *binding_broadcaster MY_ATTRIBUTE((unused)) =
     static_cast<Gcs_xcom_communication_interface *>(m_broadcaster);
   assert(binding_broadcaster->number_buffered_messages() == 0);
 
@@ -609,10 +616,16 @@ process_member_state(Xcom_member_state *ms_info,
         << m_configuration_id.node << ")."
       )
     );
+    /*
+     * ms_info will leak if we don't delete it here.
+     * If this branch is not taken, m_member_states takes ownership of the
+     * pointer below.
+     */
+    delete ms_info;
     return false;
   }
 
-  m_member_states[p_id]= ms_info;
+  save_member_state(ms_info, p_id);
 
   /*
     The rule of updating the awaited_vector at receiving is simply to
@@ -641,6 +654,17 @@ fill_member_set(std::vector<Gcs_member_identifier *> &in,
   std::copy(in.begin(), in.end(), std::inserter(pset, pset.begin()));
 }
 
+void Gcs_xcom_state_exchange::save_member_state(
+    Xcom_member_state *ms_info, const Gcs_member_identifier &p_id) {
+  /* m_member_states[p_id] may already exist. In that case we delete the
+   * existing pointer, otherwise it leaks. */
+  std::map<Gcs_member_identifier, Xcom_member_state *>::iterator
+      member_state_it = m_member_states.find(p_id);
+  bool const state_already_exists = (member_state_it != m_member_states.end());
+  if (state_already_exists) delete member_state_it->second;
+  m_member_states[p_id] = ms_info;
+}
+
 
 Gcs_xcom_view_identifier *
 Gcs_xcom_state_exchange::get_new_view_id()
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h
index fcebe3f106de..ae6e43eae302 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -506,6 +513,16 @@ class Gcs_xcom_state_exchange: public Gcs_xcom_state_exchange_interface
   void fill_member_set(std::vector<Gcs_member_identifier *> &in,
                        std::set<Gcs_member_identifier *> &pset);
 
+  /**
+   * Stores the member's state and protocol version.
+   *
+   * @param ms_info state
+   * @param p_id member
+   * @param protocol_version protocol version
+   */
+  void save_member_state(Xcom_member_state *ms_info,
+                         const Gcs_member_identifier &p_id);
+
   Gcs_communication_interface *m_broadcaster;
 
   std::map<Gcs_member_identifier, uint> m_awaited_vector;
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.cc
index 0efac3ec4202..5ca9f57dcea8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.h
index 3fb7ebc929c1..34ba51a32b29 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_statistics_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc
index 342ee86b32a9..c505ed9e8a0d 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,6 +37,7 @@
 #include <climits>
 #include <set>
 #include <limits>
+#include <assert.h>
 
 /**
   6 is the recommended value. Too large numbers
@@ -44,6 +52,17 @@ static const int XCOM_MAX_HANDLERS= 6;
 */
 static const uint64_t WAITING_TIME= 30;
 
+/*
+  Number of attempts to join a group.
+*/
+static const unsigned int JOIN_ATTEMPTS= 0;
+
+/*
+  Sleep time between attempts defined in seconds.
+*/
+static const uint64_t JOIN_SLEEP_TIME= 5;
+
+
 Gcs_xcom_utils::~Gcs_xcom_utils() {}
 
 u_long Gcs_xcom_utils::build_xcom_group_id(Gcs_group_identifier &group_id)
@@ -53,16 +72,6 @@ u_long Gcs_xcom_utils::build_xcom_group_id(Gcs_group_identifier &group_id)
 }
 
 
-std::string *Gcs_xcom_utils::build_xcom_member_id(const std::string &address)
-{
-  std::ostringstream string_builder;
-
-  string_builder << address.c_str();
-
-  return new std::string(string_builder.str());
-}
-
-
 void
 Gcs_xcom_utils::
 process_peer_nodes(const std::string *peer_nodes,
@@ -594,11 +603,10 @@ Gcs_xcom_proxy_impl::Xcom_handler::~Xcom_handler()
 }
 
 
-node_address *Gcs_xcom_proxy_impl::new_node_address(unsigned int n,
-                                                    char *names[])
+node_address *Gcs_xcom_proxy_impl::new_node_address_uuid(
+  unsigned int n, char *names[], blob uuids[])
 {
-  //Xcom will change n's type to unsigned later in a separate patch.
-  return ::new_node_address(static_cast<int>(n), names);
+  return ::new_node_address_uuid(static_cast<int>(n), names, uuids);
 }
 
 
@@ -787,7 +795,7 @@ Gcs_xcom_proxy_impl::xcom_wait_for_xcom_comms_status_change(int& status)
   if (res != 0)
   {
     // There was an error
-    status= XCOM_COMMS_ERROR;
+    status= XCOM_COMMS_OTHER;
 
     if(res == ETIMEDOUT)
     {
@@ -891,18 +899,38 @@ Gcs_xcom_proxy_impl::xcom_client_force_config(node_list *nl,
 }
 
 Gcs_xcom_nodes::Gcs_xcom_nodes(const site_def *site, node_set &nodes)
-  : m_node_no(site->nodeno), m_addresses(), m_statuses(), m_size(nodes.node_set_len)
+  : m_node_no(site->nodeno), m_addresses(), m_uuids(), m_statuses(),
+    m_size(nodes.node_set_len)
 {
+  Gcs_uuid uuid;
   for (unsigned int i= 0; i < nodes.node_set_len; ++i)
   {
+    /* Get member address and save it. */
     std::string address(site->nodes.node_list_val[i].address);
     m_addresses.push_back(address);
+
+    /* Get member uuid and save it. */
+    uuid.decode(
+      reinterpret_cast<uchar *>(site->nodes.node_list_val[i].uuid.data.data_val),
+      site->nodes.node_list_val[i].uuid.data.data_len
+    );
+    m_uuids.push_back(uuid);
+
+    /* Get member status and save it */
     m_statuses.push_back(nodes.node_set_val[i] ? true: false);
   }
   assert(m_size == m_addresses.size());
   assert(m_size == m_statuses.size());
 }
 
+
+Gcs_xcom_nodes::Gcs_xcom_nodes()
+  : m_node_no(0), m_addresses(), m_uuids(), m_statuses(),
+    m_size(0)
+{
+}
+
+
 unsigned int Gcs_xcom_nodes::get_node_no() const
 {
    return m_node_no;
@@ -913,6 +941,25 @@ const std::vector<std::string> &Gcs_xcom_nodes::get_addresses() const
   return m_addresses;
 }
 
+const std::vector<Gcs_uuid> &Gcs_xcom_nodes::get_uuids() const
+{
+  return m_uuids;
+}
+
+
+const Gcs_uuid *Gcs_xcom_nodes::get_uuid(const std::string &address) const
+{
+  for (size_t index= 0; index < m_size; index++)
+  {
+    if (!m_addresses[index].compare(address))
+    {
+      return &m_uuids[index];
+    }
+  }
+  return NULL;
+}
+
+
 const std::vector<bool> &Gcs_xcom_nodes::get_statuses() const
 {
   return m_statuses;
@@ -966,7 +1013,10 @@ fix_parameters_syntax(Gcs_interface_parameters &interface_params)
     interface_params.get_parameter("wait_time"));
   std::string *ip_whitelist_str= const_cast<std::string *>(
     interface_params.get_parameter("ip_whitelist"));
-
+  std::string *join_attempts_str= const_cast<std::string *>(
+    interface_params.get_parameter("join_attempts"));
+  std::string *join_sleep_time_str= const_cast<std::string *>(
+    interface_params.get_parameter("join_sleep_time"));
 
   // sets the default value for compression (ON by default)
   if (!compression_str)
@@ -1019,6 +1069,22 @@ fix_parameters_syntax(Gcs_interface_parameters &interface_params)
 
     interface_params.add_parameter("ip_whitelist", iplist);
   }
+
+  // sets the default join attempts
+  if (!join_attempts_str)
+  {
+    std::stringstream ss;
+    ss << JOIN_ATTEMPTS;
+    interface_params.add_parameter("join_attempts", ss.str());
+  }
+
+  // sets the default sleep time between join attempts
+  if (!join_sleep_time_str)
+  {
+    std::stringstream ss;
+    ss << JOIN_SLEEP_TIME;
+    interface_params.add_parameter("join_sleep_time", ss.str());
+  }
 }
 
 static enum_gcs_error
@@ -1063,6 +1129,10 @@ is_parameters_syntax_correct(const Gcs_interface_parameters &interface_params)
     interface_params.get_parameter("compression");
   const std::string *wait_time_str=
     interface_params.get_parameter("wait_time");
+  const std::string *join_attempts_str=
+    interface_params.get_parameter("join_attempts");
+  const std::string *join_sleep_time_str=
+    interface_params.get_parameter("join_sleep_time");
 
   /*
     -----------------------------------------------------
@@ -1222,6 +1292,26 @@ is_parameters_syntax_correct(const Gcs_interface_parameters &interface_params)
     goto end;
   }
 
+  if(join_attempts_str &&
+     (join_attempts_str->size() == 0 ||
+      !is_number(*join_attempts_str)))
+  {
+    MYSQL_GCS_LOG_ERROR("The join_attempts parameter ("
+                        << join_attempts_str << ") is not valid.")
+    error= GCS_NOK;
+    goto end;
+  }
+
+  if(join_sleep_time_str &&
+     (join_sleep_time_str->size() == 0 ||
+      !is_number(*join_sleep_time_str)))
+  {
+    MYSQL_GCS_LOG_ERROR("The join_sleep_time parameter ("
+                        << join_sleep_time_str << ") is not valid.")
+    error= GCS_NOK;
+    goto end;
+  }
+
 end:
   return error == GCS_NOK ? false : true;
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h
index d23098af4f5a..df5c9b79d416 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -65,19 +72,6 @@ class Gcs_xcom_utils
   */
   static u_long build_xcom_group_id(Gcs_group_identifier &group_id);
 
-  /**
-    Creates an XCom member identifier. It shall be on the format
-    node_number:address:port.
-
-    @param node_number node identifier in XCom
-    @param address peer address
-    @param port peer port
-
-    @return member id
-  */
-
-  static std::string *build_xcom_member_id(const std::string &address);
-
   /**
     Processes a list of comma separated peer nodes.
 
@@ -138,16 +132,19 @@ class Gcs_xcom_proxy
 
   /**
     This is an utility member function that is used to call into XCom for
-    creating the node_address list.
+    creating list with node's addresses and their associated UUIDs. Note
+    that callers must provide the UUID.
 
     @param n The number of elements in the list
     @param names The names to be put on the list
+    @param uuids The UUIDs to be put on the list
     @return a pointer to the list containing all the elements needed. The
     caller is responsible to reclaim memory once he is done with this data
     @c delete_node_address
   */
 
-  virtual node_address *new_node_address(unsigned int n, char *names[])= 0;
+  virtual node_address *new_node_address_uuid(unsigned int n, char *names[], blob uuids[])= 0;
+
 
   /**
     This function is responsible to delete the list of nodes that had been
@@ -623,7 +620,7 @@ class Gcs_xcom_proxy_impl : public Gcs_xcom_proxy
   Gcs_xcom_proxy_impl(int wt);
   virtual ~Gcs_xcom_proxy_impl();
 
-  node_address *new_node_address(unsigned int n, char *names[]);
+  node_address *new_node_address_uuid(unsigned int n, char *names[], blob uuids[]);
   void delete_node_address(unsigned int n, node_address *na);
   int xcom_client_add_node(connection_descriptor* fd, node_list *nl, uint32_t group_id);
   int xcom_client_remove_node(connection_descriptor* fd, node_list* nl, uint32_t group_id);
@@ -781,6 +778,13 @@ class Gcs_xcom_nodes
   explicit Gcs_xcom_nodes(const site_def *site, node_set &nodes);
 
 
+  /**
+    Empty constructor.
+  */
+
+  explicit Gcs_xcom_nodes();
+
+
   /**
     Return the index of the current node (i.e. member).
   */
@@ -794,6 +798,10 @@ class Gcs_xcom_nodes
 
   const std::vector<std::string> &get_addresses() const;
 
+  /**
+    Return a reference to the member uuids' vector.
+  */
+  const std::vector<Gcs_uuid> &get_uuids() const;
 
   /**
     Return a reference to the statuses' vector.
@@ -801,6 +809,12 @@ class Gcs_xcom_nodes
 
   const std::vector<bool> &get_statuses() const;
 
+  /**
+    Return the GCS UUID associated to an address if there is one.
+    If the address is not found, NULL is returned.
+  */
+  const Gcs_uuid *get_uuid(const std::string &address) const;
+
 
   /**
     Return the number of nodes.
@@ -836,6 +850,11 @@ class Gcs_xcom_nodes
   */
   std::vector<std::string> m_addresses;
 
+  /*
+    List of uuids.
+  */
+  std::vector<Gcs_uuid> m_uuids;
+
   /*
     List that defines whether a node is alive or dead.
   */
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.cc b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.cc
index 0804b248b0e7..1ad8bc55892d 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.h
index 26a67c8206e8..bb771e2e0c5c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_view_identifier.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.c
index 31f3b4b2ce40..90909caa7407 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -33,8 +40,7 @@
 #include "node_list.h"
 #include "xcom_vp_str.h"
 
-define_xdr_funcs(synode_no)
-define_xdr_funcs(app_data_ptr)
+clone_xdr_array(synode_no)
 
 static app_data_list nextp(app_data_list l);
 static unsigned long msg_count(app_data_ptr a);
@@ -130,13 +136,18 @@ static char *dbg_app_data_single(app_data_ptr a)
 
 app_data_ptr clone_app_data(app_data_ptr a)
 {
-  app_data_ptr retval = 0;
+  app_data_ptr retval = NULL;
   app_data_list p = &retval; /* Initialize p with empty list */
 
-  while(0 != a){
-    follow(p, clone_app_data_single(a));
+  while(a != NULL){
+    app_data_ptr clone = clone_app_data_single(a);
+    follow(p, clone);
     a = a->next;
     p = nextp(p);
+    if (clone == NULL && retval != NULL) {
+      XCOM_XDR_FREE(xdr_app_data, retval);
+      break;
+    }
   }
   return retval;
 }
@@ -183,7 +194,8 @@ app_data_ptr clone_app_data_single(app_data_ptr a)
       {
         p->body.app_u_u.data.data_len = 0;
         G_ERROR("Memory allocation failed.");
-        break;
+        free(p);
+        return NULL;
       }
       p->body.app_u_u.data.data_len = a->body.app_u_u.data.data_len;
       memcpy(p->body.app_u_u.data.data_val, a->body.app_u_u.data.data_val, a->body.app_u_u.data.data_len);
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.h
index 9117500767f9..64eca3d9a061 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/app_data.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.c
index 27fd14d1d290..1e6bbf29f5e9 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.h
index 62d0f1c26826..69e9d58cde65 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/bitset.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.c
index e931236bc552..773c57528bf2 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.h
index 3cc4665389b4..81d58e9464ee 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_address.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h
index cc3b9cf70d51..518a779dfb13 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_connection.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -17,16 +24,14 @@
 #ifndef NODE_CONNECTION_H
 #define	NODE_CONNECTION_H
 
+#include <stdlib.h>
+
 #ifdef XCOM_HAVE_OPENSSL
 #include "openssl/ssl.h"
 #endif
 
-/* YaSSL does not have ERR_clear_error() */
-#if defined(HAVE_YASSL)
-#define ERR_clear_error()
-#endif
-
 #include "xcom_proto.h"
+#include "xcom_vp.h"
 
 #ifdef	__cplusplus
 extern "C"
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.c
index 5be0fa66f5f0..c433ad641366 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -61,29 +68,54 @@ node_list clone_node_list(node_list list)
 /* }}} */
 
 /* OHKFIX Do something more intelligent than strcmp */
-int match_node(node_address *n1, node_address *n2)
+int match_node(node_address *n1, node_address *n2, u_int with_uid)
 {
-	return n1 != 0 && n2 != 0 && (xcom_get_port(n1->address) == xcom_get_port(n2->address) && strcmp(n1->address, n2->address) == 0);
+  int retval= ( n1 != 0 &&
+                n2 != 0 &&
+                (xcom_get_port(n1->address) == xcom_get_port(n2->address)) &&
+                strcmp(n1->address, n2->address) == 0);
+
+  if(with_uid)
+  {
+    int retval_with_uid= (n1->uuid.data.data_len == n2->uuid.data.data_len);
+    if(retval_with_uid)
+    {
+      u_int i= 0;
+      for(; i < n1->uuid.data.data_len && retval_with_uid; i++)
+      {
+        retval_with_uid &= !( n1->uuid.data.data_val[i] ^
+                              n2->uuid.data.data_val[i]);
+      }
+    }
+    retval &= retval_with_uid;
+  }
+
+  return retval;
 }
 
-int match_node_list(node_address *n1, node_address *n2, u_int len2)
+int match_node_list(node_address *n1, node_address *n2, u_int len2, u_int with_uid)
 {
 	u_int	i;
 	for (i = 0; i < len2; i++) {
-		if (match_node(n2+i, n1))
+		if (match_node(n2+i, n1, with_uid))
 			return 1;
 	}
 	return 0;
 }
 
-static int	exists(node_address *name, node_list const *nodes)
+static int	exists(node_address *name, node_list const *nodes, u_int with_uid)
 {
-	return match_node_list(name, nodes->node_list_val, nodes->node_list_len);
+	return match_node_list(name, nodes->node_list_val, nodes->node_list_len, with_uid);
 }
 
 int	node_exists(node_address *name, node_list const *nodes)
 {
-	return exists(name, nodes);
+	return exists(name, nodes, FALSE);
+}
+
+int	node_exists_with_uid(node_address *name, node_list const *nodes)
+{
+	return exists(name, nodes, TRUE);
 }
 
 static u_int	added_nodes(u_int n, node_address *names, node_list *nodes)
@@ -92,7 +124,7 @@ static u_int	added_nodes(u_int n, node_address *names, node_list *nodes)
 	u_int	added = n;
 	if (nodes->node_list_val) {
 		for (i = 0; i < n; i++) {
-			if (exists(&names[i], nodes)) {
+			if (exists(&names[i], nodes, FALSE)) {
 				added--;
 			}
 		}
@@ -122,7 +154,7 @@ void	add_node_list(u_int n, node_address *names, node_list *nodes)
 			np = &nodes->node_list_val[nodes->node_list_len];
 			for (i = 0; i < n; i++) {
 				/* 			DBGOUT(FN; STREXP(names[i])); */
-				if (!exists(&names[i], nodes)) {
+				if (!exists(&names[i], nodes, FALSE)) {
 					np->address = strdup(names[i].address);
 					np->uuid.data.data_len = names[i].uuid.data.data_len;
 					if(np->uuid.data.data_len){
@@ -153,7 +185,7 @@ void	remove_node_list(u_int n, node_address *names, node_list *nodes)
 
 	np = nodes->node_list_val;
 	for (i = 0; i < nodes->node_list_len; i++) {
-                if (match_node_list(&nodes->node_list_val[i], names, n)) {
+                if (match_node_list(&nodes->node_list_val[i], names, n, FALSE)) {
 			free(nodes->node_list_val[i].address);
                         nodes->node_list_val[i].address= 0;
 			free(nodes->node_list_val[i].uuid.data.data_val);
@@ -201,6 +233,24 @@ node_address *new_node_address(u_int n, char *names[])
   return init_node_address(na, n, names);
 }
 
+node_address *new_node_address_uuid(u_int n, char *names[], blob uuids[])
+{
+  u_int i= 0;
+  node_address *na = calloc(n, sizeof(node_address));
+  init_node_address(na, n, names);
+
+  for(; i < n; i++)
+  {
+    na[i].uuid.data.data_len = uuids[i].data.data_len;
+    na[i].uuid.data.data_val = calloc(uuids[i].data.data_len, sizeof(char));
+    na[i].uuid.data.data_val = strncpy(
+      na[i].uuid.data.data_val, uuids[i].data.data_val, uuids[i].data.data_len
+    );
+  }
+
+  return na;
+}
+
 void delete_node_address(u_int n, node_address *na)
 {
   u_int i;
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h
index c5d7f0a3245e..a19c68cdf5ac 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_list.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,10 +31,12 @@ extern "C" {
 node_list clone_node_list(node_list list);
 char *dbg_list(node_list const *nodes);
 void init_node_list(u_int n, node_address *names, node_list *nodes);
-int match_node(node_address *n1, node_address *n2);
+int match_node(node_address *n1, node_address *n2, u_int with_uid);
 void	add_node_list(u_int n, node_address *names, node_list *nodes);
 int	node_exists(node_address *name,  node_list const *nodes);
+int	node_exists_with_uid(node_address *name,  node_list const *nodes);
 node_address *new_node_address(u_int n, char *names[]);
+node_address *new_node_address_uuid(u_int n, char *names[], blob uuid[]);
 void delete_node_address(u_int n, node_address *na);
 void	remove_node_list(u_int n, node_address *names, node_list *nodes);
 node_address *init_node_address(node_address *na, u_int n, char *names[]);
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_no.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_no.h
index e4c06f2bc536..a6f09044a9ce 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_no.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_no.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.c
index 8c565c0c40ff..a0098fc23c19 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h
index b90379007689..5235a7fcfb7a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/node_set.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.c
index 63a45941195f..c06651e9f808 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -52,7 +59,14 @@ static pax_msg *init_pax_msg(pax_msg *p, int refcnt, synode_no synode, site_def
 	p->to = VOID_NODE_NO;
 	p->op = initial_op;
 	init_ballot(&p->reply_to, 0, nodeno);
-	init_ballot(&p->proposal, 0, nodeno);
+	/*
+	 -1 ensures ballot (-1,nodeno) is less than any ballot used by any
+	 proposer.
+	 Leader will use reserved ballot (0,_) for its initial 2-phase Paxos
+	 round.
+	 Remaining rounds will use ballot (1+,_) and the vanilla 3-phase Paxos.
+	 */
+	init_ballot(&p->proposal, -1, nodeno);
 	p->synode = synode;
 	p->msg_type = normal;
 	p->receivers = NULL;
@@ -92,9 +106,15 @@ pax_msg *clone_pax_msg_no_app(pax_msg *msg)
 
 pax_msg *clone_pax_msg(pax_msg *msg)
 {
-	pax_msg * p = clone_pax_msg_no_app(msg);
-	copy_app_data(&p->a, msg->a);
-	return p;
+  pax_msg * p = clone_pax_msg_no_app(msg);
+  /*
+    Need to increase the refcnt so that the msg is deleted
+    in safe_app_data_copy if there is a failure.
+  */
+  p->refcnt = 1;
+  safe_app_data_copy(&p, msg->a);
+  if (p) p->refcnt = 0;
+  return p;
 }
 
 
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.h
index be5591aff49a..15a33f5d062a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/pax_msg.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/result.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/result.h
index 4ad3a1b33317..32ee2522faf3 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/result.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/result.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/retry.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/retry.h
index 0d07b0d984c1..81a8d1d9b2d9 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/retry.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/retry.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h
index 2f4a74ef48cf..9515edd7ba37 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/server_struct.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,6 +27,7 @@
 extern "C" {
 #endif
 
+#include "task.h"
 #include "xcom_common.h"
 #include "xcom_limits.h"
 
@@ -43,6 +51,7 @@ struct server {
 	task_env * sender;  /* The sender task */
 	task_env * reply_handler;  /* The reply task */
 	srv_buf out_buf;
+        int invalid;
 };
 
 typedef struct server server;
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.c
index d36b7fd3f03a..83a7cc0ece25 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.h
index 0f01058e6ffb..30a0cafb4d49 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/simset.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.c
index 92b215f7f71d..71bb5b61334a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,7 +52,9 @@ struct site_def_ptr_array {
 };
 typedef struct site_def_ptr_array site_def_ptr_array;
 
-define_xdr_funcs(site_def_ptr)
+init_xdr_array(site_def_ptr)
+free_xdr_array(site_def_ptr)
+set_xdr_array(site_def_ptr)
 
 /* FIFO of site definitions */
 static site_def_ptr_array site_defs;
@@ -460,7 +469,7 @@ void import_config(gcs_snapshot *gcs_snap)
 			    cp->nodes.node_list_val, site);
 			site->start = cp->start;
 			site->boot_key = cp->boot_key;
-			site_install_action(site);
+			site_install_action(site, app_type);
 		}
 	}
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h
index 6b495ce118c6..5c913320808e 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_def.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h
index 81fa9248ec1a..fa7c003e7fa1 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/site_struct.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,6 +23,9 @@
 #ifndef SITE_STRUCT_H
 #define SITE_STRUCT_H
 
+#include "server_struct.h"
+#include "xcom_detector.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.c
index 97be175feeaa..ae9391810a5a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h
index ed916199f03c..caddcf4756e0 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.c
index fc6636b981d4..75718784c58c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_ix.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -42,7 +49,9 @@
 #include "x_platform.h"
 
 /* Buffer size should be always a multiple of 'struct ifreq' size */
-#define IF_INIT_BUF_SIZE (sizeof(struct ifreq) * 10)
+#define MAX_SOCKADDR_STRUCT_SIZE (int)sizeof(struct sockaddr_storage)
+#define MAX_IFCONF_ENTRY_SIZE (IFNAMSIZ + MAX_SOCKADDR_STRUCT_SIZE)
+#define IF_INIT_BUF_SIZE (MAX_IFCONF_ENTRY_SIZE * 10)
 #define IFRP_INIT_ARR_SIZE 64
 
 struct sock_probe
@@ -87,9 +96,23 @@ static int init_sock_probe(sock_probe *s)
   reset_sock_probe(s);
 
   /*
-   ioctl may overflow without returning an error. Thence we iterate to
-   make sure that we don't fill up the buffer. Then, when finally ifc_len
-   is smaller than the buffer size, we break the loop.
+    The ioctl function may overflow without returning any error, and it may
+    also overflow even without filling up the buffer, as is the case of
+    Mac OS, because it does not insert any byte of a configuration that does
+    not fit entirely in the remaining buffer. In this case, ioctl still
+    returns 0 signaling the operation as successful.
+    Due to this, and also to the fact that the entries in the buffer may have
+    variable size in some platforms and that the buffer size grows in
+    multiples of the size of the ifreq struct, we have to iterate to make sure
+    that there are no interfaces' configurations outside the buffer.
+    To circumvent this problem, we assume that any variable size information
+    will never have a size that is greater than MAX_IFCONF_ENTRY_SIZE
+    (IFNAMSIZ + (int)sizeof(sockaddr_storage)).
+    The size of the sockaddr_storage struct is used as a measuring unit
+    because this struct is large enough to contain any socket address
+    structure that the system supports.
+    See https://tools.ietf.org/html/rfc3493#section-3.10 for more details on
+    sockaddr_storage.
   */
   do
   {
@@ -115,7 +138,7 @@ static int init_sock_probe(sock_probe *s)
       abrt= TRUE;
       goto err;
     }
-  } while (s->ifc.ifc_len >= bufsize);
+  } while (s->ifc.ifc_len >= (bufsize - MAX_IFCONF_ENTRY_SIZE));
 
   DBGOUT(STRLIT("Registering interfaces:"));
 
@@ -132,7 +155,7 @@ static int init_sock_probe(sock_probe *s)
      We are just starting or have filled up all pre-allocated entries.
      Need to allocate some more.
      */
-    if (i==ifrpsize || i==0)
+    if (i==ifrpsize / (int)sizeof(struct ifreq *) || i==0)
     {
 		ifrpsize+= IFRP_INIT_ARR_SIZE * (int)sizeof(struct ifreq *);
       /* allocate one more block */
@@ -152,10 +175,13 @@ static int init_sock_probe(sock_probe *s)
 
 #if defined(SA_LEN)
     ptr+= IFNAMSIZ + SA_LEN(sa);
+    assert(MAX_IFCONF_ENTRY_SIZE >= (IFNAMSIZ + SA_LEN(sa)));
 #elif defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
     ptr+= IFNAMSIZ + sa->sa_len;
+    assert(MAX_IFCONF_ENTRY_SIZE >= (IFNAMSIZ + sa->sa_len));
 #else
     ptr+= sizeof(struct ifreq);
+    assert(MAX_IFCONF_ENTRY_SIZE >= sizeof(struct ifreq));
 #endif
 
 #if defined(TASK_DBUG_ON) && TASK_DBUG_ON
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.c
index bc8c51084d7a..8ec944ac05c5 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/sock_probe_win32.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.c
index 786b798843b0..811e3d37e3b0 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -60,8 +67,6 @@ int	synode_gt(synode_no x, synode_no y)
 }
 
 /* purecov: begin deadcode */
-define_xdr_funcs(synode_no)
-
 synode_no vp_count_to_synode(u_long high, u_long low, node_no nodeid,
                              uint32_t groupid)
 {
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h
index 362618133eaf..4697c45e0fe2 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/synode_no.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.c
index ced4231c1bcf..dfe9b80e3ae9 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,7 +47,7 @@
 
 #include <limits.h>
 #include <stdlib.h>
-#include "xcom_proto_enum.h"
+#include "xcom_vp.h"
 #include "node_connection.h"
 
 #ifndef WIN
@@ -62,10 +69,8 @@
 #include "task.h"
 #include "xcom_cfg.h"
 #ifndef _WIN32
-#ifndef USE_SELECT
 #include <sys/poll.h>
 #endif
-#endif
 
 #include "retry.h"
 #include "xdr_utils.h"
@@ -77,15 +82,6 @@ task_arg null_arg = {a_end,{0}};
 struct iotasks ;
 typedef struct iotasks iotasks;
 
-#ifdef USE_SELECT
-struct iotasks {
-	int	maxfd;
-	fd_set read_set;
-	fd_set write_set;
-	fd_set err_set;
-	linkage tasks; /* OHKFIX Should be one each for read and write */
-};
-#else
 typedef struct {
   u_int pollfd_array_len;
   pollfd *pollfd_array_val;
@@ -98,15 +94,21 @@ typedef struct {
   task_env_p *task_env_p_array_val;
 } task_env_p_array;
 
-define_xdr_funcs(pollfd)
-define_xdr_funcs(task_env_p)
+init_xdr_array(pollfd)
+free_xdr_array(pollfd)
+set_xdr_array(pollfd)
+get_xdr_array(pollfd)
+init_xdr_array(task_env_p)
+free_xdr_array(task_env_p)
+set_xdr_array(task_env_p)
+get_xdr_array(task_env_p)
 
 struct iotasks {
   int nwait;
   pollfd_array fd;
   task_env_p_array tasks;
 };
-#endif
+
 int	task_errno = 0;
 static task_env *extract_first_delayed();
 static task_env *task_ref(task_env *t);
@@ -663,169 +665,7 @@ static task_env *extract_first_delayed()
 
 
 static iotasks iot;
-#ifdef USE_SELECT
-static void iotasks_init(iotasks *iot)
-{
-	iot->maxfd = 0;
-	FD_ZERO(&iot->read_set);
-	FD_ZERO(&iot->write_set);
-	FD_ZERO(&iot->err_set);
-	link_init(&iot->tasks, type_hash("task_env"));
-}
-
-static void iotasks_deinit(iotasks *iot)
-{
-	DBGOUT(FN);
-}
-
-#if TASK_DBUG_ON
-static void poll_debug() MY_ATTRIBUTE((unused));
-static void poll_debug()
-{
-	GET_GOUT;
-#if 0
-	NDBG(FD_SETSIZE, d);
-	PTREXP(&iot.tasks);
-	NDBG(iot.tasks.type, u);
-	NDBG(cardinal(&iot.tasks), d);
-	PTREXP(iot.tasks.suc);
-	PTREXP(iot.tasks.pred);
-#endif
-	FWD_ITER(&iot.tasks, task_env,
-	    STRLIT("->");
-	    PTREXP(link_iter); PTREXP(link_iter->l.suc); PTREXP(link_iter->l.pred); NDBG(link_iter->waitfd, d);
-	    NDBG(FD_ISSET(link_iter->waitfd, &iot.read_set), d);
-	    NDBG(FD_ISSET(link_iter->waitfd, &iot.write_set), d);
-	    NDBG(FD_ISSET(link_iter->waitfd, &iot.err_set), d);
-	    );
-  PRINT_GOUT;
-  FREE_GOUT;
-}
-#endif
-
-
-static int	check_completion(task_env *t, fd_set *r, fd_set *w, fd_set *e)
-{
-	int	interrupt = 0;
-	assert(&t->l != &iot.tasks);
-	/* MAY_DBG(FN;
-		STREXP(t->name);
-		NDBG(t->waitfd,d);
-	    NDBG(FD_ISSET(t->waitfd,r),d);
-	    NDBG(FD_ISSET(t->waitfd,w),d);
-	    NDBG(FD_ISSET(t->waitfd,e),d);
-	); */
-	if (FD_ISSET(t->waitfd, e))
-		abort(); /* Close file here instead? */
-	interrupt = (t->time != 0.0 && t->time < task_now());
-	if (interrupt || /* timeout ? */
-	FD_ISSET(t->waitfd, r) || FD_ISSET(t->waitfd, w)) {
-		FD_CLR(t->waitfd, &iot.read_set);
-		FD_CLR(t->waitfd, &iot.write_set);
-		FD_CLR(t->waitfd, &iot.err_set);
-		t->interrupt = interrupt;
-		activate(t);
-		if (iot.maxfd - 1 == t->waitfd)
-			iot.maxfd = t->waitfd; /* Shrink set of watched files */
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
 
-static int poll_wait(int ms)
-{
-	/* Wait at most ms milliseconds */
-        int wake= 0;
-	struct timeval select_timeout;
-	MAY_DBG(FN; NDBG(ms,d));
-	if (ms < 0 || ms > 1000)
-		ms = 1000; /* Wait at most 1000 ms */
-	/* convert milliseconds to seconds and microseconds */
-	select_timeout.tv_sec = ms / 1000;
-	select_timeout.tv_usec = (ms % 1000) * 1000;
-	 {
-		result	nfds = {0,0};
-		fd_set r = iot.read_set;
-		fd_set w = iot.write_set;
-		fd_set e = iot.err_set;
-		MAY_DBG(FN; poll_debug());
-		SET_OS_ERR(0);
-		while ((nfds.val = select(iot.maxfd, &r, &w, &e, &select_timeout)) == -1 ) {
-			nfds.funerr = to_errno(GET_OS_ERR);
-			if (hard_select_err(nfds.funerr)) {
-				task_dump_err(nfds.funerr);
-				DBGOUT(STRLIT("select failed"); NDBG(iot.maxfd, d));
-				return 0;
-			}
-			SET_OS_ERR(0);
-			r = iot.read_set;
-			w = iot.write_set;
-			e = iot.err_set;
-		}
-		/* MAY_DBG(FN; poll_debug()); */
-		/* Wake up ready tasks */
-		/* if (nfds.val > 0) { */
-		/*   FWD_ITER(&iot.tasks, task_env,  */
-		/*            nfds.val -= check_completion(link_iter, &r, &w, &e);  */
-		/*            if (nfds.val == 0) break); */
-		/* } */
-		FWD_ITER(&iot.tasks, task_env,
-		    if(check_completion(link_iter, &r, &w, &e)) wake=1);
-	}
-        return wake;
-}
-
-
-static void add_fd(task_env *t, int fd, int op)
-{
-	MAY_DBG(FN; PTREXP(t); STREXP(t->name); NDBG(fd, d); NDBG(op, c));
-	assert(fd >= 0);
-	t->waitfd = fd;
-	if (fd >= iot.maxfd)
-		iot.maxfd = fd + 1;
-	FD_CLR(fd, &iot.err_set);
-	if ('r' == op)
-		FD_SET(fd, &iot.read_set);
-	else
-		FD_SET(fd, &iot.write_set);
-	task_wait(t, &iot.tasks);
-	/* MAY_DBG(FN; poll_debug()); */
-}
-
-
-static void unpoll(int i)
-{
-	FD_CLR(i, &iot.read_set);
-	FD_CLR(i, &iot.write_set);
-	FD_CLR(i, &iot.err_set);
-}
-
-
-static void wake_all_io()
-{
-	FWD_ITER(&iot.tasks, task_env,
-	    unpoll(link_iter->waitfd);
-	    activate(link_iter);
-	    );
-}
-
-
-void remove_and_wakeup(int fd)
-{
-	MAY_DBG(FN; NDBG(fd, d));
-	FWD_ITER(&iot.tasks, task_env,
-	    if (fd == link_iter->waitfd) {
-		unpoll(link_iter->waitfd);
-		    activate(link_iter);
-		    if (iot.maxfd - 1 == link_iter->waitfd)
-		    iot.maxfd = link_iter->waitfd; /* Shrink set of watched files */
-	}
-	);
-}
-
-#else
 static void iotasks_init(iotasks *iot)
  {
   DBGOUT(FN);
@@ -951,7 +791,6 @@ void remove_and_wakeup(int fd) {
   }
 }
 
-#endif
 task_env *stack = NULL;
 
 task_env *wait_io(task_env *t, int fd, int op)
@@ -1490,7 +1329,7 @@ result	announce_tcp(xcom_port port)
                     "0.0.0.0", port, fd.val, err);
 		goto err;
 	}
-        G_MESSAGE("Successfully bound to %s:%d (socket=%d).",
+        G_DEBUG("Successfully bound to %s:%d (socket=%d).",
                   "0.0.0.0", port, fd.val);
 	if (listen(fd.val, 32) < 0) {
           int err = to_errno(GET_OS_ERR);
@@ -1498,7 +1337,7 @@ result	announce_tcp(xcom_port port)
                     "(socket=%d, errno=%d)!", fd.val, err);
 		goto err;
 	}
-        G_MESSAGE("Successfully set listen backlog to 32 "
+        G_DEBUG("Successfully set listen backlog to 32 "
                   "(socket=%d)!", fd.val);
 	/* Make socket non-blocking */
 	unblock_fd(fd.val);
@@ -1509,8 +1348,9 @@ result	announce_tcp(xcom_port port)
                     fd.val, err);
         }
         else
-          G_MESSAGE("Successfully unblocked socket (socket=%d)!",
-                    fd.val);
+        {
+          G_DEBUG("Successfully unblocked socket (socket=%d)!", fd.val);
+        }
 	return fd;
 
  err:
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h
index 899239297e88..4a29f5809f6a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,6 +27,7 @@
 #include "xcom_common.h"
 #include "x_platform.h"
 #include "task_arg.h"
+#include "simset.h"
 
 
 #ifdef __cplusplus
@@ -36,8 +44,6 @@ extern "C" {
    	Nonblocking IO and event handling need to be rewritten for each new OS.
 */
 
-/* #define USE_SELECT */
-
 #if 0
 void add_base_event(double when, char const *file, int state);
 #define ADD_BASE_EVENT { add_base_event(seconds(),__FILE__, __LINE__); add_event(string_arg(__func__));}
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_arg.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_arg.h
index 40bb302771f9..31250a4fcadf 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_arg.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_arg.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.c
index d54a30589f5b..832a5f1f1345 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.h
index a415f74e3623..c48d6f8ecadf 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_debug.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.c
index 4f84f87de2ed..47bd8e18e7be 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -36,7 +43,7 @@
 
 #include "simset.h"
 #include "task_debug.h"
-#include "xcom_proto_enum.h"
+#include "xcom_vp.h"
 #include "task.h"
 #include "task_os.h"
 
@@ -223,7 +230,7 @@ int init_net()
 		g_critical("Could not find a usable version of Winsock.dll");
 		return 1;
 	} else {
-		G_MESSAGE("The Winsock 2.2 dll was found okay");
+		G_DEBUG("The Winsock 2.2 dll was found okay");
 		return 0;
 	}
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.h
index 36855124bb0c..03bedb1cf06a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_net.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h
index 6a7d3bb2f8c2..2ae8bb64f410 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/task_os.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,11 +41,12 @@ extern "C" {
 #define SOCK_EAGAIN WSAEINPROGRESS
 #define SOCK_EWOULDBLOCK WSAEWOULDBLOCK
 #define SOCK_EINPROGRESS WSAEINPROGRESS
+#define SOCK_EALREADY WSAEALREADY
+#define SOCK_ECONNREFUSED WSAECONNREFUSED
 #define SOCK_ERRNO task_errno
 #define SOCK_OPT_REUSEADDR SO_EXCLUSIVEADDRUSE
 #define GET_OS_ERR  WSAGetLastError()
 #define SET_OS_ERR(x) WSASetLastError(x)
-#define SOCK_ECONNREFUSED WSAECONNREFUSED
 #define CLOSESOCKET(x) closesocket(x)
 
   static inline int hard_connect_err(int err)
@@ -63,6 +71,11 @@ static inline int poll(pollfd * fds, nfds_t nfds, int timeout) {
   return WSAPoll(fds, nfds, timeout);
 }
 
+static inline int is_socket_error(int x)
+{
+ return x == SOCKET_ERROR || x < 0;
+}
+
 #else
 #include <unistd.h>
 #include <sys/socket.h>
@@ -81,11 +94,12 @@ static inline int poll(pollfd * fds, nfds_t nfds, int timeout) {
 #define SOCK_EAGAIN EAGAIN
 #define SOCK_EWOULDBLOCK EWOULDBLOCK
 #define SOCK_EINPROGRESS EINPROGRESS
+#define SOCK_EALREADY EALREADY
+#define SOCK_ECONNREFUSED ECONNREFUSED
 #define SOCK_ERRNO task_errno
 #define SOCK_OPT_REUSEADDR SO_REUSEADDR
 #define GET_OS_ERR errno
 #define SET_OS_ERR(x) errno = (x)
-#define SOCK_ECONNREFUSED ECONNREFUSED
 #define CLOSESOCKET(x) close(x)
 
   static inline int hard_connect_err(int err)
@@ -100,6 +114,11 @@ static inline int poll(pollfd * fds, nfds_t nfds, int timeout) {
 
 typedef struct pollfd pollfd;
 
+static inline int is_socket_error(int x)
+{
+ return x < 0;
+}
+
 #endif
 
 	extern void remove_and_wakeup(int fd);
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/endian.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/endian.h
index b10159d38c9f..95e9424fbc17 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/endian.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/endian.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/libintl.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/libintl.h
index 56f1ac2bd8b3..0d3fc66cc0c7 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/libintl.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/libintl.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/missing_sys_types.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/missing_sys_types.h
index 894ccaa9db6d..5421bb5d488a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/missing_sys_types.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/missing_sys_types.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/time.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/time.h
index 6a51c1faae09..6f3276bf817f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/time.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/sys/time.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/win_i18n.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/win_i18n.h
index 9d4a659b9716..febc1e327732 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/win_i18n.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/include/win_i18n.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/rpc.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/rpc.h
index 953931f26960..ca8c906d73e1 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/rpc.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/rpc.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/types.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/types.h
index 7538201918ae..17bcd7984c03 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/types.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/types.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/xdr.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/xdr.h
index d0b5d03a51cf..1cfb9c3825d5 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/xdr.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/rpc/xdr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr.c
index 4d5c97ea8ca6..64e68eec5f95 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_array.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_array.c
index af9e3bdbb8eb..26accc34cf33 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_array.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_array.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_float.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_float.c
index acf5f0cea49f..090437f7f059 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_float.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_float.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_mem.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_mem.c
index b3498bae3314..5a24a85de705 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_mem.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_mem.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_ref.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_ref.c
index 70fe85243196..f8c998601bf2 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_ref.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_ref.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_sizeof.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_sizeof.c
index 98db4ae93283..469b3867833f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_sizeof.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/windeps/sunrpc/xdr_sizeof.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h
index 07409b71f720..c87c12344f8c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/x_platform.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c
index 3b843d31480a..997c32f33a73 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -258,6 +265,10 @@
 #include <windows.h>
 #endif
 
+#ifndef _WIN32
+#include <poll.h>
+#endif
+
 #include "xdr_utils.h"
 #include "xcom_common.h"
 
@@ -358,6 +369,9 @@ static int const no_duplicate_payload = 1;
 /* Use buffered read when reading messages from the network */
 static int use_buffered_read = 1;
 
+/* Used to handle OOM errors */
+static unsigned short oom_abort = 0;
+
 /* {{{ Forward declarations */
 
 long	get_unique_long(void);
@@ -502,9 +516,6 @@ static bool_t is_dead_site(uint32_t id)
 	return FALSE;
 }
 
-define_xdr_funcs(node_no)
-
-
 extern node_set *init_node_set(node_set *set, u_int n);
 extern node_set *alloc_node_set(node_set *set, u_int n);
 
@@ -1063,6 +1074,7 @@ static xcom_state_change_cb xcom_run_cb = 0;
 static xcom_state_change_cb xcom_terminate_cb = 0;
 static xcom_state_change_cb xcom_comms_cb = 0;
 static xcom_state_change_cb xcom_exit_cb = 0;
+static xcom_state_change_cb xcom_expel_cb = 0;
 
 void set_xcom_run_cb(xcom_state_change_cb x)
 {
@@ -1084,6 +1096,11 @@ void set_xcom_exit_cb(xcom_state_change_cb x)
 	xcom_exit_cb = x;
 }
 
+void set_xcom_expel_cb(xcom_state_change_cb x)
+{
+	xcom_expel_cb = x;
+}
+
 int	xcom_taskmain2(xcom_port listen_port)
 {
   init_xcom_transport(listen_port);
@@ -1427,7 +1444,7 @@ uint32_t new_id()
 static synode_no getstart(app_data_ptr a)
 {
 	synode_no retval = null_synode;
-	G_MESSAGE("getstart group_id %x", a->group_id);
+	G_DEBUG("getstart group_id %x", a->group_id);
 	if (!a || a->group_id == null_id) {
 		retval.group_id = new_id();
 	} else {
@@ -1441,7 +1458,7 @@ static synode_no getstart(app_data_ptr a)
 	return retval;
 }
 
-void site_install_action(site_def *site)
+void site_install_action(site_def *site, cargo_type operation)
 {
 	DBGOUT(FN; NDBG(get_nodeno(get_site_def()), u));
 	if (synode_gt(site->start, max_synode))
@@ -1451,7 +1468,7 @@ void site_install_action(site_def *site)
 	DBGOUT(FN; COPY_AND_FREE_GOUT(dbg_site_def(site)));
 	set_group(get_group_id(site));
 	if(get_maxnodes(get_site_def())){
-		update_servers(site);
+		update_servers(site, operation);
 	}
 	site->install_time = task_now();
 	DBGOUT(FN; SYCEXP(site->start); SYCEXP(site->boot_key));
@@ -1476,7 +1493,7 @@ static site_def * install_ng_with_start(app_data_ptr a, synode_no start)
 {
 	if (a) {
 		site_def *site = create_site_def_with_start(a, start);
-		site_install_action(site);
+		site_install_action(site, a->body.c_t);
 		return site;
 	}
 	return 0;
@@ -1602,6 +1619,7 @@ static inline int is_config(cargo_type x)
 	    x == force_config_type;
 }
 
+static void terminate_and_exit();
 
 /* Send messages by fetching from the input queue and trying to get it accepted
    by a Paxos instance */
@@ -1769,6 +1787,13 @@ static int	proposer_task(task_arg arg)
 			/* Set the client message as current proposal */
 			assert(ep->client_msg->p);
 			replace_pax_msg(&ep->p->proposer.msg, clone_pax_msg(ep->client_msg->p));
+      if (ep->p->proposer.msg == NULL) {
+        g_critical("Node %u has run out of memory while sending a message and "
+                   "will now exit.",
+                   get_nodeno(proposer_site));
+        terminate_and_exit();
+        TERMINATE;
+      }
 			assert(ep->p->proposer.msg);
 			PAX_MSG_SANITY_CHECK(ep->p->proposer.msg);
 
@@ -2149,6 +2174,7 @@ static void	send_value(site_def const *site, node_no to, synode_no synode)
 	pax_machine * pm = get_cache(synode);
 	if (pm && pm->learner.msg) {
 		pax_msg * msg = clone_pax_msg(pm->learner.msg);
+		if (msg == NULL) return;
 		ref_msg(msg);
 		send_server_msg(site, to, msg);
 		unref_msg(&msg);
@@ -2212,7 +2238,7 @@ site_def *handle_add_node(app_data_ptr a)
 	    a->body.app_u_u.nodes.node_list_val, site);
 	site->start = getstart(a);
 	site->boot_key = a->app_key;
-	site_install_action(site);
+	site_install_action(site, a->body.c_t);
 	return site;
 }
 
@@ -2220,6 +2246,7 @@ static void	terminate_and_exit()
 {
 	XCOM_FSM(xa_terminate, int_arg(0));	/* Tell xcom to stop */
 	XCOM_FSM(xa_exit, int_arg(0));		/* Tell xcom to exit */
+	if (xcom_expel_cb) xcom_expel_cb(0);
 }
 
 int	terminator_task(task_arg arg)
@@ -2257,11 +2284,12 @@ site_def *handle_remove_node(app_data_ptr a)
 	    add_event(string_arg("nodeno"));
 	    add_event(uint_arg(get_nodeno(site)));
 	);
+
 	remove_site_def(a->body.app_u_u.nodes.node_list_len,
 	    a->body.app_u_u.nodes.node_list_val, site);
 	site->start = getstart(a);
 	site->boot_key = a->app_key;
-	site_install_action(site);
+	site_install_action(site, a->body.c_t);
 	return site;
 }
 
@@ -2741,12 +2769,19 @@ static void	propose_noop(synode_no find, pax_machine *p)
 {
 	/* Prepare to send a noop */
    	site_def const *site = find_site_def(find);
+  pax_msg *clone = NULL;
 	assert(! too_far(find));
 	replace_pax_msg(&p->proposer.msg, pax_msg_new(find, site));
 	assert(p->proposer.msg);
 	create_noop(p->proposer.msg);
 /*  	DBGOUT(FN; SYCEXP(find););  */
-	push_msg_3p(site, p, clone_pax_msg(p->proposer.msg), find, no_op);
+
+  clone = clone_pax_msg(p->proposer.msg);
+  if (clone != NULL) {
+    push_msg_3p(site, p, clone, find, no_op);
+  } else {
+    G_DEBUG("Unable to propose NoOp due to an OOM error.");
+  }
 }
 
 
@@ -2914,6 +2949,16 @@ void	reply_msg(site_def const * site, pax_msg *m)
 #define CREATE_REPLY(x) pax_msg *reply = NULL; CLONE_PAX_MSG(reply, x)
 #define SEND_REPLY reply_msg(reply); replace_pax_msg(&reply, NULL)
 
+bool_t safe_app_data_copy(pax_msg **target, app_data_ptr source) {
+  copy_app_data(&(*target)->a, source);
+  if ((*target)->a == NULL && source != NULL) {
+    oom_abort = 1;
+    replace_pax_msg(target, NULL);
+    return FALSE;
+  }
+  return TRUE;
+}
+
 static void	teach_ignorant_node(site_def const * site, pax_machine *p, pax_msg *pm, synode_no synode, linkage *reply_queue)
 {
 	CREATE_REPLY(pm);
@@ -2921,10 +2966,12 @@ static void	teach_ignorant_node(site_def const * site, pax_machine *p, pax_msg *
 	reply->synode = synode;
 	reply->proposal = p->learner.msg->proposal;
 	reply->msg_type =  p->learner.msg->msg_type;
-	copy_app_data(&reply->a, p->learner.msg->a);
-	set_learn_type(reply);
-	/* set_unique_id(reply, p->learner.msg->unique_id); */
-	SEND_REPLY;
+	safe_app_data_copy(&reply, p->learner.msg->a);
+	if (reply != NULL) {
+	  set_learn_type(reply);
+	  /* set_unique_id(reply, p->learner.msg->unique_id); */
+	  SEND_REPLY;
+	}
 }
 
 
@@ -2989,9 +3036,10 @@ static void	handle_simple_prepare(site_def const * site, pax_machine *p, pax_msg
 			if (accepted(p)) { /* We have accepted a value */
 				reply->proposal = p->acceptor.msg->proposal;
 				reply->msg_type =  p->acceptor.msg->msg_type;
-				copy_app_data(&reply->a, p->acceptor.msg->a);
 				MAY_DBG(FN; STRLIT(" already accepted value "); SYCEXP(synode));
 				reply->op = ack_prepare_op;
+				safe_app_data_copy(&reply, p->acceptor.msg->a);
+				if (reply == NULL) return;  // Failed to allocate memory for the copy.
 			} else {
 				MAY_DBG(FN; STRLIT(" no value synode "); SYCEXP(synode));
 				reply->op = ack_prepare_empty_op;
@@ -3346,9 +3394,26 @@ static void	handle_client_msg(pax_msg *p)
 static double	sent_alive = 0.0;
 static inline void	handle_alive(site_def const * site, linkage *reply_queue, pax_msg *pm)
 {
+	int not_to_oneself = (pm->from != get_nodeno(site) && pm->from != pm->to);
 	DBGOUT(FN; SYCEXP(pm->synode); NDBG(pm->from,u); NDBG(pm->to,u); );
-	if (pm->from != pm->to && !client_boot_done && /* Already done? */
-	!is_dead_site(pm->group_id)) { /* Avoid dealing with zombies */
+
+	/*
+	  This code will check if the ping is intended to us.
+	  If the encoded node does not exist in the current configuration,
+	  we avoid sending need_boot_op, since it must be from a different
+	  reincarnation of this node.
+	*/
+	if(site && pm->a && pm->a->body.c_t == xcom_boot_type)
+	{
+		DBGOUT(FN; COPY_AND_FREE_GOUT(dbg_list(&pm->a->body.app_u_u.nodes)););
+		not_to_oneself &=
+			node_exists_with_uid(&pm->a->body.app_u_u.nodes.node_list_val[0], &get_site_def()->nodes);
+	}
+
+
+	if (!client_boot_done && /* Already done? */
+	    not_to_oneself && /* Not to oneself */
+	    !is_dead_site(pm->group_id)) { /* Avoid dealing with zombies */
 		double	t = task_now();
 		if (t - sent_alive > 1.0) {
 			CREATE_REPLY(pm);
@@ -3396,15 +3461,17 @@ static void	update_max_synode(pax_msg *p)
 /* purecov: begin deadcode */
 void	add_to_cache(app_data_ptr a, synode_no synode)
 {
-	pax_machine * pm = get_cache(synode);
+  pax_machine * pm = get_cache(synode);
 	pax_msg * msg = pax_msg_new_0(synode);
 	ref_msg(msg);
 	assert(pm);
-	copy_app_data(&msg->a, a);
-	set_learn_type(msg);
-	/* msg->unique_id = a->unique_id; */
-	do_learn(0, pm, msg);
-	unref_msg(&msg);
+	safe_app_data_copy(&msg, a);
+	if (msg != NULL) {
+	  set_learn_type(msg);
+	  /* msg->unique_id = a->unique_id; */
+	  do_learn(0, pm, msg);
+	  unref_msg(&msg);
+	}
 }
 /* purecov: end */
 
@@ -3416,13 +3483,145 @@ void	add_to_cache(app_data_ptr a, synode_no synode)
 
 static int clicnt = 0;
 
+static u_int is_reincarnation_adding(app_data_ptr a)
+{
+	/* Get information on the current site definition */
+	const site_def* new_site_def= get_site_def();
+	const site_def* valid_site_def= find_site_def(executed_msg);
+
+	/* Get information on the nodes to be added */
+	u_int nodes_len  = a->body.app_u_u.nodes.node_list_len;
+	node_address* nodes_to_change= a->body.app_u_u.nodes.node_list_val;
+
+	u_int i = 0;
+	for(; i < nodes_len; i++)
+	{
+		if (node_exists(&nodes_to_change[i], &new_site_def->nodes) ||
+			node_exists(&nodes_to_change[i], &valid_site_def->nodes))
+		{
+			/*
+			We are simply ignoring the attempt to add a node to the
+			group when there is an old incarnation of it, meaning
+			that the node has crashed and restarted so fastly that
+			nobody has noticed that it has gone.
+
+			In XCOM, the group is not automatically reconfigured
+			and it is possible to start reusing a node that has
+			crashed and restarted without reconfiguring the group
+			by adding the node back to it.
+
+			However, this operation may be unsafe because XCOM
+			does not implement a crash-recovery model and nodes
+			suffer from amnesia after restarting the service. In
+			other words this may lead to inconsistency issues in
+			the paxos protocol.
+
+			Unfortunately, preventing that a node is added back
+			to the system where there is an old incarnation will
+			not fix this problem since other changes are required.
+			*/
+			G_MESSAGE("Old incarnation found while trying to add node %s %.*s.",
+				  nodes_to_change[i].address,
+				  nodes_to_change[i].uuid.data.data_len,
+				  nodes_to_change[i].uuid.data.data_val
+			);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static u_int is_reincarnation_removing(app_data_ptr a)
+{
+	/* Get information on the current site definition */
+	const site_def* new_site_def= get_site_def();
+
+	/* Get information on the nodes to be added */
+	u_int nodes_len  = a->body.app_u_u.nodes.node_list_len;
+	node_address* nodes_to_change= a->body.app_u_u.nodes.node_list_val;
+
+	u_int i = 0;
+	for(; i < nodes_len; i++)
+	{
+		if (!node_exists_with_uid(&nodes_to_change[i], &new_site_def->nodes))
+		{
+			/*
+			We cannot allow an upper-layer to remove a new incarnation
+			of a node, when it tries to remove an old one.
+			*/
+			G_MESSAGE("Old incarnation found while trying to "
+				  "remove node %s %.*s.",
+				  nodes_to_change[i].address,
+				  nodes_to_change[i].uuid.data.data_len,
+				  nodes_to_change[i].uuid.data.data_val
+			);
+
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * Logs the fact that an add/remove node request is aimed at another group.
+ *
+ * @param a a pointer to the app_data of the configuration command
+ * @param message_fmt a formatted message to log, containing a single %s that will be replaced by the node's address
+ */
+static void log_cfgchange_wrong_group(app_data_ptr a, const char *const message_fmt)
+{
+	u_int const nr_nodes = a->body.app_u_u.nodes.node_list_len;
+	u_int i;
+	for (i = 0; i < nr_nodes; i++)
+	{
+		char const *const address = a->body.app_u_u.nodes.node_list_val[i].address;
+		G_WARNING(message_fmt, address);
+	}
+}
+
+/**
+ * Validates if a configuration command can be executed.
+ * Checks whether the configuration command is aimed at the correct group.
+ * Checks whether the configuration command pertains to a node reincarnation.
+ *
+ * @param p a pointer to the pax_msg of the configuration command
+ * @retval REQUEST_OK if the reconfiguration command can be executed
+ * @retval REQUEST_RETRY if XCom is still booting
+ * @retval REQUEST_FAIL if the configuration command cannot be executed
+ */
 static client_reply_code can_execute_cfgchange(pax_msg *p)
 {
 	app_data_ptr a = p->a;
+
 	if (executed_msg.msgno <= 2)
 		return REQUEST_RETRY;
+
 	if (a && a->group_id != 0 && a->group_id != executed_msg.group_id)
+	{
+		switch (a->body.c_t) {
+		case add_node_type:
+			log_cfgchange_wrong_group(a, "The request to add %s to the group has been rejected because it is aimed at another group");
+			break;
+		case remove_node_type:
+			log_cfgchange_wrong_group(a, "The request to remove %s from the group has been rejected because it is aimed at another group");
+			break;
+		case force_config_type:
+			G_WARNING("The request to force the group membership has been rejected because it is aimed at another group");
+			break;
+		default:
+			assert(0 && "A cargo_type different from {add_node_type, remove_node_type, force_config_type} should not have hit this code path");
+		}
 		return REQUEST_FAIL;
+	}
+
+        if (a && a->body.c_t == add_node_type && is_reincarnation_adding(a))
+		return REQUEST_FAIL;
+
+        if (a && a->body.c_t == remove_node_type && is_reincarnation_removing(a))
+		return REQUEST_FAIL;
+
 	return REQUEST_OK;
 }
 
@@ -3553,6 +3752,8 @@ pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue)
 	case read_op:
 		pm = get_cache(p->synode);
 		assert(pm);
+		if(client_boot_done)
+			handle_alive(site, reply_queue, p);
 		handle_read(site, pm, reply_queue, p);
 		break;
 	case prepare_op:
@@ -3561,7 +3762,8 @@ pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue)
 		if(p->force_delivery)
 			pm->force_delivery = 1;
 		pm->last_modified = task_now();
-		handle_alive(site, reply_queue, p);
+		if(client_boot_done)
+			handle_alive(site, reply_queue, p);
 		handle_prepare(site, pm, reply_queue, p);
 		break;
 	case ack_prepare_op:
@@ -3666,7 +3868,7 @@ pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue)
 		handle_skip(site, pm, p);
 		break;
 	case i_am_alive_op:
-		/* handle_alive(site, reply_queue, p); */
+		handle_alive(site, reply_queue, p);
 		break;
 	case are_you_alive_op:
 		handle_alive(site, reply_queue, p);
@@ -3720,13 +3922,19 @@ pax_msg *dispatch_op(site_def const *site, pax_msg *p, linkage *reply_queue)
 		vector), but I am not convinced that it is worth the effort.
 		*/
 		if(!synode_lt(p->synode, executed_msg)){
-			 g_critical("Node %u unable to get message, process will now exit. Please ensure that the process is restarted",
-						get_nodeno(site));
-			 exit(1);
-		 }
+			g_critical("Node %u unable to get messages, since the "
+				   "group is too far ahead. Node will now exit.",
+				get_nodeno(site));
+			terminate_and_exit();
+		}
 	default:
 		break;
 	}
+	if (oom_abort) {
+	  g_critical("Node %u has run out of memory and will now exit.",
+	             get_nodeno(site));
+	  terminate_and_exit();
+	}
 	return(p);
 }
 
@@ -3844,7 +4052,11 @@ int	acceptor_learner_task(task_arg arg)
 			common to both the sender_task, reply_handler_task,  and the ac‐
 			ceptor_learner_task.
 		*/
+		// Allow the previous server reference to be freed.
+		if (ep->srv) srv_unref(ep->srv);
 		ep->srv = get_server(site, ep->p->from);
+		// Prevent the new server reference from being freed.
+		if (ep->srv) srv_ref(ep->srv);
 		ep->p->refcnt = 1; /* Refcnt from other end is void here */
 		MAY_DBG(FN;
 				NDBG(ep->rfd.fd, d); NDBG(task_now(), f);
@@ -3958,6 +4170,8 @@ int	acceptor_learner_task(task_arg arg)
 	if (ep->buf)
 		X_FREE(ep->buf);
 	free(ep->in_buf);
+	// Allow the server reference to be freed.
+	if (ep->srv) srv_unref(ep->srv);
 
 	TASK_END;
 }
@@ -4019,7 +4233,9 @@ int	reply_handler_task(task_arg arg)
 			pax_msg * p = ep->reply;
 			server_handle_need_snapshot(ep->s, get_site_def(), p->from);
 		}else{
-			dispatch_op(find_site_def(ep->reply->synode), ep->reply, NULL);
+			//We only handle messages from this connection is the server is valid.
+			if(ep->s->invalid == 0)
+				dispatch_op(find_site_def(ep->reply->synode), ep->reply, NULL);
 		}
 		TASK_YIELD;
 	}
@@ -4217,13 +4433,16 @@ static void	server_push_log(server *srv, synode_no push, node_no node)
 	site_def const *s = get_site_def();
 	while (!synode_gt(push, get_max_synode())) {
 		if (is_cached(push)) {
-			pax_machine * p = get_cache(push);
+			pax_machine * p = get_cache_no_touch(push);
 			if (pm_finished(p)) {
+				/* Need to clone message here since pax_machine may be re-used while message is sent */
 				pax_msg * pm = clone_pax_msg(p->learner.msg);
-				ref_msg(pm);
-				pm->op = recover_learn_op;
-				send_msg(srv, s->nodeno, node, get_group_id(s), pm);
-				unref_msg(&pm);
+				if (pm != NULL) {
+				  ref_msg(pm);
+				  pm->op = recover_learn_op;
+				  send_msg(srv, s->nodeno, node, get_group_id(s), pm);
+				  unref_msg(&pm);
+				}
 			}
 		}
 		push = incr_synode(push);
@@ -4260,7 +4479,8 @@ static void	server_handle_need_snapshot(server *srv, site_def const *s, node_no
 	synode_no app_lsn = get_app_snap(&gs->app_snap);
 	if (!synode_eq(null_synode, app_lsn) && synode_lt(app_lsn, gs->log_start)){
 		gs->log_start = app_lsn;
-	} else if (!synode_eq(null_synode, last_config_modification_id)){
+	}
+	else if (!synode_eq(null_synode, last_config_modification_id)) {
 		gs->log_start = last_config_modification_id;
 	}
 
@@ -4281,7 +4501,7 @@ const char *xcom_actions_name[] = {
 xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs)
 {
 	static int	state = 0;
-	G_MESSAGE("state %d action %s", state, xcom_actions_name[action]);
+	G_DEBUG("state %d action %s", state, xcom_actions_name[action]);
 	switch (state) {
 	default:
 		assert(state == 0);
@@ -4293,6 +4513,7 @@ xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs)
 			if (action == xa_init) {
 				xcom_shutdown = 0;
 				sent_alive = 0.0;
+				oom_abort = 0;
 			}
 			if (action == xa_u_boot) {
 /* purecov: begin deadcode */
@@ -4333,7 +4554,7 @@ xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs)
 				xcom_shutdown = 1;
 				if(xcom_exit_cb)
 					xcom_exit_cb(get_int_arg(fsmargs));
-				G_MESSAGE("Exiting xcom thread");
+				G_DEBUG("Exiting xcom thread");
 			}
 			CO_RETURN(x_start);
 		}
@@ -4379,6 +4600,7 @@ xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs)
 				client_boot_done = 0;
 				netboot_ok = 0;
 				booting = 0;
+				oom_abort = 0;
 				terminate_proposers();
 				init_proposers();
 				task_terminate(executor);
@@ -4406,6 +4628,7 @@ xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs)
 				app_data * a = get_void_arg(fsmargs);
 				site_def *s = create_site_def_with_start(a, executed_msg);
 				s->boot_key = executed_msg;
+				invalidate_servers(get_site_def(), s);
 				start_force_config(s);
 			}
 			CO_RETURN(x_run);
@@ -4624,135 +4847,107 @@ static inline result xcom_shut_close_socket(int *sock)
 	return res;
 }
 
+#define CONNECT_FAIL ret_fd = -1; goto end
+
 static int timed_connect(int fd, sockaddr *sock_addr, socklen_t sock_size)
 {
-  struct timeval timeout;
-  fd_set rfds, wfds, efds;
-  int res;
+  int timeout = 10000;
+  int ret_fd = fd;
+  int syserr;
+  int sysret;
+  struct pollfd fds;
+#ifdef WITH_LOG_DEBUG
   char buf[SYS_STRERROR_SIZE];
+#endif
 
-  timeout.tv_sec=  10;
-  timeout.tv_usec= 0;
-
-  FD_ZERO(&rfds);
-  FD_ZERO(&wfds);
-  FD_ZERO(&efds);
-  FD_SET(fd, &rfds);
-  FD_SET(fd, &wfds);
-  FD_SET(fd, &efds);
+  fds.fd = fd;
+  fds.events = POLLOUT;
+  fds.revents = 0;
 
   /* Set non-blocking */
-  if(unblock_fd(fd) < 0)
+  if (unblock_fd(fd) < 0)
     return -1;
 
   /* Trying to connect with timeout */
-  res= connect(fd, sock_addr, sock_size);
+  SET_OS_ERR(0);
+  sysret = connect(fd, sock_addr, sock_size);
+
+  if (is_socket_error(sysret)) {
+    syserr = GET_OS_ERR;
+    /* If the error is SOCK_EWOULDBLOCK or SOCK_EINPROGRESS or SOCK_EALREADY,
+     * wait. */
+    switch (syserr) {
+      case SOCK_EWOULDBLOCK:
+      case SOCK_EINPROGRESS:
+      case SOCK_EALREADY:
+        break;
+      default:
+        G_DEBUG("connect - Error connecting (socket=%d, error=%d).",
+                fd, syserr);
+        CONNECT_FAIL;
+    }
+
+    SET_OS_ERR(0);
+    while ((sysret = poll(&fds, 1, timeout)) < 0) {
+      syserr = GET_OS_ERR;
+      if (syserr != SOCK_EINTR && syserr != SOCK_EINPROGRESS) break;
+      SET_OS_ERR(0);
+    }
+    MAY_DBG(FN; STRLIT("poll - Finished. "); NEXP(sysret, d));
+
+    if (sysret == 0) {
+      G_DEBUG("Timed out while waiting for connection to be established! "
+              "Canceling connection attempt. (socket= %d, error=%d)",
+              fd, sysret);
+      CONNECT_FAIL;
+    }
+
+    if (is_socket_error(sysret)) {
+      G_DEBUG("poll - Error while connecting! (socket= %d, error=%d)",
+              fd, syserr);
+      CONNECT_FAIL;
+    }
 
-#if defined (WIN32) || defined (WIN64)
-  if (res == SOCKET_ERROR)
-  {
-    res= WSAGetLastError();
-    /* If the error is WSAEWOULDBLOCK, wait. */
-    if (res == WSAEWOULDBLOCK)
-    {
-      MAY_DBG(FN; STRLIT("connect - error=WSAEWOULDBLOCK. Invoking select..."); );
-#else
-  if (res < 0)
-  {
-    if (errno == EINPROGRESS)
     {
-      MAY_DBG(FN; STRLIT("connect - errno=EINPROGRESS. Invoking select..."); );
-#endif
-      res= select(fd + 1, &rfds, &wfds, &efds, &timeout);
-      MAY_DBG(FN; STRLIT("select - Finished. "); NEXP(res, d));
-      if (res == 0)
-      {
-        G_MESSAGE("Timed out while waiting for connection to be established! "
-                  "Cancelling connection attempt. (socket= %d, error=%d)",
-                  fd, res);
-        G_WARNING("select - Timeout! Cancelling connection...");
-        return -1;
+      int socket_errno = 0;
+      socklen_t socket_errno_len = sizeof(socket_errno);
+
+      if ((fds.revents & POLLOUT) == 0) {
+        MAY_DBG(FN; STRLIT("POLLOUT not set - Socket failure!"););
+        ret_fd = -1;
       }
-#if defined (WIN32) || defined (WIN64)
-      else if (res == SOCKET_ERROR)
-      {
-        G_WARNING("select - Error while connecting! "
-                  "(socket= %d, error=%d)",
-                  fd, WSAGetLastError());
-#else
-      else if (res < 0)
-      {
-        G_WARNING("select - Error while connecting! "
-                  "(socket= %d, error=%d, error msg='%s')",
-                  fd, errno, strerror(errno));
-#endif
-        return -1;
+
+      if (fds.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+        MAY_DBG(FN;
+                STRLIT("POLLERR | POLLHUP | POLLNVAL set - Socket failure!"););
+        ret_fd = -1;
       }
-      else
-      {
-        if (FD_ISSET(fd, &wfds) || FD_ISSET(fd, &rfds))
-        {
-          MAY_DBG(FN; STRLIT("select - Socket ready!"); );
-        }
 
-        if (FD_ISSET(fd, &efds))
-        {
-          /*
-            This is a non-blocking socket, so one needs to
-            find the issue that triggered the exception.
-           */
-          int socket_errno= 0;
-          socklen_t socket_errno_len= sizeof(errno);
-          if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &socket_errno,
-                         &socket_errno_len))
-          {
-            G_WARNING("Connection to socket %d failed. Unable to sort out the "
-                      "connection error!", fd);
-          }
-          else
-          {
-            G_WARNING("Connection to socket %d failed with error %d - %s.",
-                      fd, socket_errno, strerr_msg(buf, sizeof(buf), socket_errno));
-          }
-          return -1;
+      if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &socket_errno,
+                     &socket_errno_len) != 0) {
+        G_DEBUG("getsockopt socket %d failed.", fd);
+        ret_fd = -1;
+      } else {
+        if (socket_errno != 0) {
+          G_DEBUG("Connection to socket %d failed with error %d - %s.", fd,
+                  socket_errno, strerr_msg(buf, sizeof(buf), socket_errno));
+          ret_fd = -1;
         }
       }
     }
-    else
-    {
-#if defined (WIN32) || defined (WIN64)
-      G_WARNING("connect - Error connecting "
-                "(socket=%d, error=%d).",
-                fd, WSAGetLastError());
-#else
-      G_WARNING("connect - Error connecting "
-                "(socket=%d, error=%d, error message='%s').",
-                fd, errno, strerror(errno));
-#endif
-      return -1;
-    }
-  }
-  else
-  {
-    MAY_DBG(FN; STRLIT("connect - Connected to socket without waiting!"); );
   }
 
+end:
   /* Set blocking */
-  if(block_fd(fd) < 0)
-  {
-#if defined (WIN32) || defined (WIN64)
-    G_WARNING("Unable to set socket back to blocking state. "
-              "(socket=%d, error=%d).",
-              fd, WSAGetLastError());
-#else
-    G_WARNING("Unable to set socket back to blocking state. "
-              "(socket=%d, error=%d, error message='%s').",
-              fd, errno, strerror(errno));
-#endif
+  SET_OS_ERR(0);
+  if(block_fd(fd) < 0) {
+    G_DEBUG(
+        "Unable to set socket back to blocking state. (socket=%d, error=%d).",
+        fd, GET_OS_ERR);
     return -1;
   }
 
-  return fd;
+  return ret_fd;
 }
 
 
@@ -4763,20 +4958,22 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 	result ret = {0,0};
 	struct sockaddr_in sock_addr;
 	socklen_t sock_size;
+#ifdef WITH_LOG_DEBUG
         char buf[SYS_STRERROR_SIZE];
+#endif
 
 	DBGOUT(FN; STREXP(server); NEXP(port, d));
-	G_MESSAGE("connecting to %s %d", server, port);
+	G_DEBUG("connecting to %s %d", server, port);
 	/* Create socket */
 	if ((fd = checked_create_socket(AF_INET, SOCK_STREAM, 0)).val < 0) {
-		G_MESSAGE("Error creating sockets.");
+		G_DEBUG("Error creating sockets.");
 		return NULL;
 	}
 
 	/* Get address of server */
 	if (!init_sockaddr(server, &sock_addr, &sock_size, port)) {
 		xcom_close_socket(&fd.val);
-		G_MESSAGE("Error initializing socket addresses.");
+		G_DEBUG("Error initializing socket addresses.");
 		return NULL;
 	}
 
@@ -4785,7 +4982,7 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 	SET_OS_ERR(0);
 	if (timed_connect(fd.val, (struct sockaddr *)&sock_addr, sock_size) == -1) {
 		fd.funerr = to_errno(GET_OS_ERR);
-		G_MESSAGE("Connecting socket to address %s in port %d failed with error %d - %s.",
+		G_DEBUG("Connecting socket to address %s in port %d failed with error %d - %s.",
 				server, port, fd.funerr, strerr_msg(buf, sizeof(buf), fd.funerr));
 		xcom_close_socket(&fd.val);
 		return NULL;
@@ -4804,15 +5001,15 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 				task_dump_err(ret.funerr);
 				xcom_shut_close_socket(&fd.val);
 #if defined (WIN32) || defined (WIN64)
-				G_MESSAGE("Setting node delay failed  while connecting to %s with error %d.",
+				G_DEBUG("Setting node delay failed while connecting to %s with error %d.",
 						server, ret.funerr);
 #else
-				G_MESSAGE("Setting node delay failed  while connecting to %s with error %d - %s.",
+				G_DEBUG("Setting node delay failed while connecting to %s with error %d - %s.",
 						server, ret.funerr, strerror(ret.funerr));
 #endif
 				return NULL;
 			}
-			G_MESSAGE("client connected to %s %d fd %d", server, port, fd.val);
+			G_DEBUG("client connected to %s %d fd %d", server, port, fd.val);
 		} else {
 			/* Something is wrong */
 			socklen_t errlen = sizeof(ret.funerr);
@@ -4827,10 +5024,10 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 			}
 			xcom_shut_close_socket(&fd.val);
 #if defined (WIN32) || defined (WIN64)
-			G_MESSAGE("Getting the peer name failed while connecting to server %s with error %d.",
+			G_DEBUG("Getting the peer name failed while connecting to server %s with error %d.",
 					server, ret.funerr);
 #else
-			G_MESSAGE("Getting the peer name failed while connecting to server %s with error %d -%s.",
+			G_DEBUG("Getting the peer name failed while connecting to server %s with error %d -%s.",
 					server, ret.funerr, strerror(ret.funerr));
 #endif
 			return NULL;
@@ -4840,7 +5037,7 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 		if (xcom_use_ssl()) {
 			connection_descriptor *cd = 0;
 			SSL * ssl = SSL_new(client_ctx);
-			G_MESSAGE("Trying to connect using SSL.")
+			G_DEBUG("Trying to connect using SSL.")
 			SSL_set_fd(ssl, fd.val);
 
 			ERR_clear_error();
@@ -4870,7 +5067,7 @@ static connection_descriptor*	connect_xcom(char *server, xcom_port port)
 
 			cd = new_connection(fd.val, ssl);
 			set_connected(cd, CON_FD);
-			G_MESSAGE("Success connecting using SSL.")
+			G_DEBUG("Success connecting using SSL.")
 			return cd;
 		} else {
 			connection_descriptor *cd = new_connection(fd.val, 0);
@@ -5089,14 +5286,14 @@ int	xcom_client_boot(connection_descriptor *fd, node_list *nl, uint32_t group_id
 	return retval;
 }
 
-
 int xcom_send_app_wait(connection_descriptor *fd, app_data *a, int force)
 {
 	int retval = 0;
+	int retry_count = 10; // Same as 'connection_attempts'
 	pax_msg p;
 	pax_msg *rp = 0;
 
-	for(;;){
+	do {
 		retval = (int)xcom_send_client_app_data(fd, a, force);
 		if(retval < 0)
 			return 0;
@@ -5109,10 +5306,10 @@ int xcom_send_app_wait(connection_descriptor *fd, app_data *a, int force)
 				case REQUEST_OK:
 					return 1;
 				case REQUEST_FAIL:
-                                        G_MESSAGE("cli_err %d",cli_err);
+                                        G_DEBUG("cli_err %d",cli_err);
 					return 0;
 				case REQUEST_RETRY:
-			                G_MESSAGE("cli_err %d",cli_err);
+			                G_DEBUG("cli_err %d",cli_err);
 					xcom_sleep(1);
 					break;
 				default:
@@ -5123,7 +5320,11 @@ int xcom_send_app_wait(connection_descriptor *fd, app_data *a, int force)
 			G_WARNING("read failed");
 			return 0;
 		}
-	}
+	} while (--retry_count);
+	// Timeout after REQUEST_RETRY has been received 'retry_count' times
+	G_MESSAGE(
+	 "Request failed: maximum number of retries (10) has been exhausted.");
+	return 0;
 }
 
 int xcom_send_cfg_wait(connection_descriptor * fd, node_list *nl,
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h
index 86258e594a35..cf6497e4f4f4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -157,7 +164,7 @@ void xcom_add_node(char *addr, xcom_port port, node_list *nl);
 xcom_state xcom_fsm(xcom_actions action, task_arg fsmargs);
 void site_post_install_action(site_def *site);
 
-void site_install_action(site_def *site);
+void site_install_action(site_def *site, cargo_type operation);
 void send_client_add_node(char *srv, xcom_port port, node_list *nl);
 void send_client_remove_node(char *srv, xcom_port port, node_list *nl);
 
@@ -186,12 +193,16 @@ typedef void (*xcom_state_change_cb)(int status);
 void set_xcom_run_cb(xcom_state_change_cb x);
 void set_xcom_terminate_cb(xcom_state_change_cb x);
 void set_xcom_exit_cb(xcom_state_change_cb x);
+void set_xcom_expel_cb(xcom_state_change_cb x);
+
+app_data_ptr init_config_with_group(app_data *a, node_list *nl, cargo_type type,
+                                    uint32_t group_id);
 
 /*
  Registers a callback that is called right after
  the accept routine returns.
  */
-typedef int (*xcom_socket_accept_cb)(int fd);
+typedef int (*xcom_socket_accept_cb)(int fd, site_def const *xcom_config);
 int set_xcom_socket_accept_cb(xcom_socket_accept_cb x);
 
 connection_descriptor *xcom_open_client_connection(char *server,
@@ -217,6 +228,19 @@ int64_t xcom_client_send_data(uint32_t size, char *data,
 int	xcom_client_terminate_and_exit(connection_descriptor* fd);
 int	xcom_client_set_cache_limit(connection_descriptor *fd, uint64_t cache_limit);
 
+/**
+  Copies app data @c source into @c target and checks if the copy
+  succeeded. Sets *target to NULL if the copy fails.
+
+  @param[in, out] target The pax_msg to which the app_data will be copied.
+  @param source The app data that will be copied.
+  @retval TRUE if the copy was successful.
+  @retval FALSE if the copy failed, in which case *target is set to NULL;
+          a failed copy means that there was an error allocating memory for
+          the copy.
+*/
+bool_t safe_app_data_copy(pax_msg **target, app_data_ptr source);
+
 static inline char *strerr_msg(char *buf, size_t len, int nr)
 {
 #if defined (WIN32) || defined (WIN64)
@@ -228,12 +252,17 @@ static inline char *strerr_msg(char *buf, size_t len, int nr)
 }
 
 #define XCOM_COMMS_ERROR 1
+#define XCOM_COMMS_OTHER 2
 #define XCOM_COMMS_OK 0
 void set_xcom_comms_cb(xcom_state_change_cb x);
 
 synode_no get_delivered_msg();
 
-#define XCOM_FSM(action, arg) do {const char *s = xcom_state_name[xcom_fsm(action,arg)]; G_TRACE("%f %s:%d", seconds(), __FILE__, __LINE__); G_MESSAGE("new state %s",s);} while(0)
+#ifdef WITH_LOG_DEBUG
+#define XCOM_FSM(action, arg) do {const char *s = xcom_state_name[xcom_fsm(action,arg)]; G_TRACE("%f %s:%d", seconds(), __FILE__, __LINE__); G_DEBUG("new state %s",s);} while(0)
+#else
+#define XCOM_FSM(action, arg) do {xcom_fsm(action,arg);} while(0)
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.c
index aaf1b6d98dba..d1b58e43799d 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -183,13 +190,18 @@ static lru_machine *lru_get()
 	if (!link_empty(&probation_lru)) {
 		retval = (lru_machine * ) link_first(&probation_lru);
 	} else {
-		retval = (lru_machine * ) link_first(&protected_lru);
-		/* Since this machine is in in the cache, we need to update
-		last_removed_cache */
-		last_removed_cache = retval->pax.synode;
-
+	/* Find the first non-busy instance in the LRU */
+	FWD_ITER(&protected_lru, lru_machine,
+		if (!is_busy_machine(&link_iter->pax)) {
+			retval = link_iter;
+			/* Since this machine is in in the cache, we need to update
+			last_removed_cache */
+			last_removed_cache = retval->pax.synode;
+			break;
+		}
+	)
 	}
-	assert(!is_busy_machine(&retval->pax));
+	assert(retval && !is_busy_machine(&retval->pax));
 	return retval;
 }
 
@@ -252,7 +264,7 @@ void deinit_cache()
 
 /* static synode_no log_tail; */
 
-pax_machine *get_cache(synode_no synode)
+pax_machine *get_cache_no_touch(synode_no synode)
 {
   pax_machine * retval = hash_get(synode);
   /* DBGOUT(FN; SYCEXP(synode); STREXP(task_name())); */
@@ -268,6 +280,13 @@ pax_machine *get_cache(synode_no synode)
     init_pax_machine(retval, l, synode); /* Initialize */
     hash_in(retval);            /* Insert in hash table again */
   }
+  MAY_DBG(FN; SYCEXP(synode); PTREXP(retval));
+  return retval;
+}
+
+pax_machine *get_cache(synode_no synode)
+{
+  pax_machine * retval = get_cache_no_touch(synode);
   lru_touch_hit(retval); /* Insert in protected_lru */
   MAY_DBG(FN; SYCEXP(synode); PTREXP(retval));
   return retval;
@@ -465,8 +484,10 @@ size_t add_cache_size(size_t x)
 {
        cache_size += x;
        if (DBG_CACHE_SIZE && x)
-               G_MESSAGE("%f %s:%d cache_size %lu x %lu", seconds(), __FILE__, __LINE__,
-                         (long unsigned int)cache_size, (long unsigned int)x);
+       {
+         G_DEBUG("%f %s:%d cache_size %lu x %lu", seconds(), __FILE__, __LINE__,
+                 (long unsigned int)cache_size, (long unsigned int)x);
+       }
        return cache_size;
 }
 
@@ -475,8 +496,10 @@ size_t sub_cache_size(size_t x)
 {
        cache_size -= x;
        if (DBG_CACHE_SIZE && x)
-               G_MESSAGE("%f %s:%d cache_size %lu x %lu", seconds(), __FILE__, __LINE__,
-                         (long unsigned int)cache_size, (long unsigned int)x);
+       {
+         G_DEBUG("%f %s:%d cache_size %lu x %lu", seconds(), __FILE__, __LINE__,
+                 (long unsigned int)cache_size, (long unsigned int)x);
+       }
        return cache_size;
 }
 
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h
index d4c0a1279ddf..da6e74d8f9b5 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cache.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,6 +27,18 @@
 extern "C" {
 #endif
 
+/*
+We require that the number of elements in the cache is big enough enough that
+it is always possible to find instances that are not busy.
+Under normal circumstances the number of busy instances will be
+less than event_horizon, since the proposers only considers
+instances which belong to the local node.
+A node may start proposing no_ops for instances belonging
+to other nodes, meaning that event_horizon * NSERVERS instances may be
+involved. However, for the time being, proposing a no_op for an instance
+will not mark it as busy. This may change in the future, so a safe upper
+limit on the number of nodes marked as busy is event_horizon * NSERVERS.
+*/
 #define CACHED 50000
 
 #define is_cached(x) (hash_get(x) != NULL)
@@ -63,6 +82,7 @@ struct pax_machine {
 
 int	is_busy_machine(pax_machine *p);
 int	lock_pax_machine(pax_machine *p);
+pax_machine *get_cache_no_touch(synode_no synode);
 pax_machine *get_cache(synode_no synode);
 pax_machine *hash_get(synode_no synode);
 char *dbg_machine_nodeset(pax_machine *p, u_int nodes);
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.c
index c16de378b032..5f364b1a11a1 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,7 +23,7 @@
 #include <stdlib.h>
 #include "xcom_cfg.h"
 
-cfg_app_xcom_st* the_app_xcom_cfg;
+cfg_app_xcom_st* the_app_xcom_cfg = NULL;
 
 /* Reasonable initial cache limit */
 #define CACHE_LIMIT 1000000000ULL
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h
index a454f0d980e1..b79d263fe0e5 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_cfg.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_common.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_common.h
index 160aaf901972..7e6f3995a58c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_common.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_common.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.c
index a1245fde0f6b..49957115b6b4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -43,8 +50,8 @@ extern int	xcom_shutdown;
 /* See if node has been suspiciously still for some time */
 int	may_be_dead(detector_state const ds, node_no i, double seconds)
 {
-  /* DBGOUT(FN; NDBG(i,u); NDBG(ds[i] < seconds - 2.0, d)); */
-  return ds[i] < seconds - 2.0;
+  /* DBGOUT(FN; NDBG(i,u); NDBG(ds[i] < seconds - 4.0, d)); */
+  return ds[i] < seconds - 4.0;
 }
 
 void init_detector(detector_state ds)
@@ -189,7 +196,6 @@ static void	check_global_node_set(site_def *site, int *notify)
 	}
 }
 
-
 static void	check_local_node_set(site_def *site, int *notify)
 {
 	u_int i;
@@ -267,10 +273,10 @@ int	detector_task(task_arg arg MY_ATTRIBUTE((unused)))
 	END_ENV;
 
 	TASK_BEGIN
-	    last_p_site = 0;
-	 	last_x_site = 0;
-	    ep->notify = 1;
-	    ep->local_notify = 1;
+	last_p_site = 0;
+	last_x_site = 0;
+	ep->notify = 1;
+	ep->local_notify = 1;
 	DBGOHK(FN; );
 	while (!xcom_shutdown) {
 		site_def * p_site = (site_def * )get_proposer_site();
@@ -303,8 +309,7 @@ int	detector_task(task_arg arg MY_ATTRIBUTE((unused)))
 			DBGOHK(FN; NDBG(iamtheleader(x_site), d); NDBG(enough_live_nodes(x_site), d); );
 			/* Send xcom message if node has changed state */
 			DBGOHK(FN; NDBG(ep->notify,d));
-			if ( ep->notify && iamtheleader(x_site) &&
-			    enough_live_nodes(x_site)) {
+			if (ep->notify && iamtheleader(x_site) && enough_live_nodes(x_site)) {
 				ep->notify = 0;
 				send_my_view(x_site);
 			}
@@ -390,6 +395,11 @@ int	alive_task(task_arg arg MY_ATTRIBUTE((unused)))
 					if (i != get_nodeno(site) && may_be_dead(site->detected, i, sec)) {
 						replace_pax_msg(&ep->you_p, pax_msg_new(alive_synode, site));
 						ep->you_p->op = are_you_alive_op;
+						ep->you_p->a = new_app_data();
+						ep->you_p->a->app_key.group_id = ep->you_p->a->group_id = get_group_id(site);
+						ep->you_p->a->body.c_t = xcom_boot_type;
+						init_node_list(1, &site->nodes.node_list_val[i], &ep->you_p->a->body.app_u_u.nodes);
+						DBGOUT(FN; COPY_AND_FREE_GOUT(dbg_list(&ep->you_p->a->body.app_u_u.nodes)););
 						send_server_msg(site, i, ep->you_p);
 					}
 				}
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h
index 32948338ae91..533e03ac40df 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_detector.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.c
index 0ebd52a3622c..0e1586d3c73b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h
index b0f009b40841..3d2582857fb4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_limits.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_limits.h
index 0c196833ef01..fdcd3e976237 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_limits.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_limits.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c
index 0caa509a58e9..1061072a93b7 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h
index 9150af52b67d..d272f320c5e2 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.c
index aa5ad5a1cb99..62f20e52498b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.h
index ce1d87524f77..cf2151f478e1 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_msg_queue.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_os_layer.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_os_layer.h
index 7815a439cde5..9117ca115a9f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_os_layer.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_os_layer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto.h
index 01590816e0c3..5d9354242913 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto_enum.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto_enum.h
index ea242f8c23aa..327abc0d09ea 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto_enum.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_proto_enum.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.c
index 620c1f61ca87..0ea6aff09ed0 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,9 +52,6 @@ int	client_boot_done = 0;
 int	netboot_ok = 0;
 int	booting = 0;
 
-define_xdr_funcs(synode_no)
-define_xdr_funcs(app_data_ptr)
-
 /* purecov: begin deadcode */
 void init_recover_vars()
 {
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.h
index 277ec30699ae..47fe043dff29 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_recover.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
index 919a23b9550b..59df12ceb356 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,15 +47,6 @@ static const char* ssl_mode_options[]=
 #define TLS_VERSION_OPTION_SIZE 256
 #define SSL_CIPHER_LIST_SIZE 4096
 
-#ifdef HAVE_YASSL
-static const char* tls_ciphers_list="DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:"
-                                    "AES128-RMD:DES-CBC3-RMD:DHE-RSA-AES256-RMD:"
-                                    "DHE-RSA-AES128-RMD:DHE-RSA-DES-CBC3-RMD:"
-                                    "AES256-SHA:RC4-SHA:RC4-MD5:DES-CBC3-SHA:"
-                                    "DES-CBC-SHA:EDH-RSA-DES-CBC3-SHA:"
-                                    "EDH-RSA-DES-CBC-SHA:AES128-SHA:AES256-RMD";
-static const char* tls_cipher_blocked= "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!RC2:!RC4:!PSK:";
-#else
 static const char* tls_ciphers_list= "ECDHE-ECDSA-AES128-GCM-SHA256:"
                                      "ECDHE-ECDSA-AES256-GCM-SHA384:"
                                      "ECDHE-RSA-AES128-GCM-SHA256:"
@@ -89,7 +87,6 @@ static const char* tls_cipher_blocked= "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!RC
                                        "!DHE-DSS-DES-CBC3-SHA:!DHE-RSA-DES-CBC3-SHA:"
                                        "!ECDH-RSA-DES-CBC3-SHA:!ECDH-ECDSA-DES-CBC3-SHA:"
                                        "!ECDHE-RSA-DES-CBC3-SHA:!ECDHE-ECDSA-DES-CBC3-SHA:";
-#endif
 
 /*
   Diffie-Hellman key.
@@ -140,13 +137,21 @@ static DH *get_dh2048(void)
   DH *dh;
   if ((dh=DH_new()))
   {
-    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-    if (! dh->p || ! dh->g)
-    {
+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+    if (!p || !g
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        || !DH_set0_pqg(dh, p, NULL, g)
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+    ) {
+      /* DH_free() will free 'p' and 'g' at once. */
       DH_free(dh);
-      dh=0;
+      return NULL;
     }
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    dh->p= p;
+    dh->g= g;
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   }
   return(dh);
 }
@@ -168,7 +173,6 @@ static long process_tls_version(const char *tls_version)
 {
   const char *separator= ", ";
   char *token= NULL;
-#ifndef HAVE_YASSL
   const char *tls_version_name_list[]= {
     "TLSv1", "TLSv1.1", "TLSv1.2"
   };
@@ -180,17 +184,6 @@ static long process_tls_version(const char *tls_version)
   };
   const char* ctx_flag_default= "TLSv1,TLSv1.1,TLSv1.2";
   long tls_ctx_flag= SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2;
-#else
-  const char *tls_version_name_list[]= {"TLSv1", "TLSv1.1"};
-  #define TLS_VERSIONS_COUNTS \
-    (sizeof(tls_version_name_list) / sizeof(*tls_version_name_list))
-  unsigned int tls_versions_count= TLS_VERSIONS_COUNTS;
-  const long tls_ctx_list[TLS_VERSIONS_COUNTS]= {
-    SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1
-  };
-  const char* ctx_flag_default= "TLSv1,TLSv1.1";
-  long tls_ctx_flag= SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1;
-#endif
   unsigned int index= 0;
   char tls_version_option[TLS_VERSION_OPTION_SIZE]= "";
   int tls_found= 0;
@@ -239,7 +232,12 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, const char* cipher,
                                     const char* tls_version)
 {
   DH *dh= NULL;
+#ifdef HAVE_TLSv13
+  /* We support TLS up to 1.2, so explicitly disable TLS 1.3. */
+  long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3;
+#else
   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+#endif
   char cipher_list[SSL_CIPHER_LIST_SIZE]= {0};
   long ssl_ctx_flags= -1;
 
@@ -258,13 +256,24 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, const char* cipher,
                     SSL_OP_NO_SSLv3 |
                     SSL_OP_NO_TLSv1 |
                     SSL_OP_NO_TLSv1_1
-#ifndef HAVE_YASSL
                     | SSL_OP_NO_TLSv1_2
-#endif
+#ifdef HAVE_TLSv13
+                    | SSL_OP_NO_TLSv1_3
+#endif /* HAVE_TLSv13 */
                    );
 
   SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
 
+#ifdef HAVE_TLSv13
+  /* We do not support TLS 1.3.
+     Setting empty TLS 1.3 ciphersuites disables them. */
+  if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0)
+  {
+    G_ERROR("Failed to disable the TLS 1.3 ciphersuites.");
+    goto error;
+  }
+#endif /* HAVE_TLSv13 */
+
   /*
     Set the ciphers that can be used. Note, howerver, that the
     SSL_CTX_set_cipher_list will return 0 if none of the provided
@@ -335,7 +344,6 @@ static int configure_ssl_revocation(SSL_CTX* ssl_ctx  MY_ATTRIBUTE((unused)), co
   int retval = 0;
   if (crl_file || crl_path)
   {
-#ifndef HAVE_YASSL
     X509_STORE *store= SSL_CTX_get_cert_store(ssl_ctx);
     /* Load crls from the trusted ca */
     if (X509_STORE_load_locations(store, crl_file, crl_path) == 0 ||
@@ -346,7 +354,6 @@ static int configure_ssl_revocation(SSL_CTX* ssl_ctx  MY_ATTRIBUTE((unused)), co
       G_ERROR("X509_STORE_load_locations for CRL error");
       retval = 1;
     }
-#endif
   }
   return retval;
 }
@@ -413,14 +420,14 @@ static int init_ssl(const char *key_file, const char *cert_file,
                     const char *cipher, const char *tls_version,
                     SSL_CTX* ssl_ctx)
 {
-  G_MESSAGE("Initializing SSL with key_file: '%s'  cert_file: '%s'  "
+  G_DEBUG("Initializing SSL with key_file: '%s'  cert_file: '%s'  "
             "ca_file: '%s'  ca_path: '%s'",
             key_file ? key_file : "NULL",
             cert_file ? cert_file : "NULL",
             ca_file ? ca_file : "NULL",
             ca_path ? ca_path : "NULL");
 
-   G_MESSAGE("Additional SSL configuration is "
+   G_DEBUG("Additional SSL configuration is "
             "cipher: '%s' crl_file: '%s' crl_path: '%s'",
             cipher ? cipher : "NULL",
             crl_file ? crl_file : "NULL",
@@ -438,7 +445,7 @@ static int init_ssl(const char *key_file, const char *cert_file,
   if (configure_ssl_keys(ssl_ctx, key_file, cert_file))
     goto error;
 
-  G_MESSAGE("Success initializing SSL");
+  G_DEBUG("Success initializing SSL");
 
   return 0;
 
@@ -506,7 +513,28 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
   int verify_server= SSL_VERIFY_NONE;
   int verify_client= SSL_VERIFY_NONE;
 
+  /*
+    HAVE_STATIC_OPENSSL:
+    This is OpenSSL version >= 1.1.1 and we are linking statically.
+    We must disable all atexit() processing in OpenSSL, otherwise
+    dlclose() of plugins might destroy data structures which are needed
+    by the application.
+
+    Otherwise: "system" OpenSSL may be any version > 1.0.0
+    For 1.0.x : SSL_library_init is a function.
+    For 1.1.y : SSL_library_init is a macro: OPENSSL_init_ssl(0, NULL)
+
+    Note that we cannot in general call OPENSSL_cleanup(). Doing so from plugins
+    would break the embedding main program. Doing so from client code may
+    break e.g. ODBC clients (if the client also uses SSL).
+  */
+
+#if defined(HAVE_STATIC_OPENSSL)
+  OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
+#else
   SSL_library_init();
+#endif
+
   SSL_load_error_strings();
 
   if (ssl_mode == SSL_DISABLED) {
@@ -519,7 +547,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
     return ssl_init_done;
   }
 
-  G_MESSAGE("Configuring SSL for the server")
+  G_DEBUG("Configuring SSL for the server")
   server_ctx= SSL_CTX_new(SSLv23_server_method());
   if (!server_ctx)
   {
@@ -535,7 +563,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
     verify_server= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
   SSL_CTX_set_verify(server_ctx, verify_server, NULL);
 
-  G_MESSAGE("Configuring SSL for the client")
+  G_DEBUG("Configuring SSL for the client")
   client_ctx= SSL_CTX_new(SSLv23_client_method());
   if (!client_ctx)
   {
@@ -567,7 +595,9 @@ void xcom_cleanup_ssl()
   if(!xcom_use_ssl())
     return;
 
-  ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 }
 
 void xcom_destroy_ssl()
@@ -575,7 +605,7 @@ void xcom_destroy_ssl()
   if(!xcom_use_ssl())
     return;
 
-  G_MESSAGE("Destroying SSL");
+  G_DEBUG("Destroying SSL");
 
   ssl_init_done = 0;
 
@@ -589,9 +619,7 @@ void xcom_destroy_ssl()
     client_ctx= NULL;
   }
 
-#if defined(HAVE_YASSL) && defined(WITH_SSL_STANDALONE)
-  yaSSL_CleanUp();
-#elif defined(WITH_SSL_STANDALONE)
+#if defined(WITH_SSL_STANDALONE)
   ENGINE_cleanup();
   EVP_cleanup();
   CRYPTO_cleanup_all_ex_data();
@@ -600,7 +628,7 @@ void xcom_destroy_ssl()
 
   xcom_cleanup_ssl();
 
-  G_MESSAGE("Success destroying SSL");
+  G_DEBUG("Success destroying SSL");
 }
 
 
@@ -677,7 +705,11 @@ int ssl_verify_server_cert(SSL *ssl, const char* server_hostname)
     goto error;
   }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   cn= (char *) ASN1_STRING_data(cn_asn1);
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  cn= (char *) ASN1_STRING_get0_data(cn_asn1);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
   /* There should not be any NULL embedded in the CN */
   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h
index 35ac9d0ea4bb..d90e70f47788 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.c
index 92b3dc0f3434..0a9109bd40b6 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.h
index f389572b991c..1a8f3a66b6b8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_statistics.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c
index 17725bee2c64..2d30a9f678d4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,6 +41,7 @@
 #include "xcom_detector.h"
 #include "site_struct.h"
 #include "node_connection.h"
+#include "node_list.h"
 #include "xcom_transport.h"
 #include "xcom_statistics.h"
 #include "xcom_base.h"
@@ -417,7 +425,11 @@ x_putbytes (XDR *xdrs, const char *bp MY_ATTRIBUTE((unused)), u_int len)
 
 
 static u_int
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(HAVE_TIRPC)
+x_getpostn(XDR *xdrs)
+#else
 x_getpostn (const XDR *xdrs)
+#endif
 {
 #ifdef OLD_XDR
   return (u_int)(xdrs->x_handy);
@@ -657,7 +669,7 @@ int serialize_msg(pax_msg *p, xcom_proto x_proto, uint32_t *buflen, char **buf)
 	*buf = 0;
 
 	return old_proto_knows(x_proto, p->op) &&
-		serialize((void * )p, x_proto, buflen, (xdrproc_t)xdr_pax_msg, buf);
+						serialize((void *)p, x_proto, buflen, (xdrproc_t)xdr_pax_msg, buf);
 }
 
 int deserialize_msg(pax_msg *p, xcom_proto x_proto,  char *buf, uint32_t buflen)
@@ -724,6 +736,7 @@ mksrv(char *srv, xcom_port port)
 		abort();
 	}
 	s->garbage = 0;
+	s->invalid = 0;
 	s->refcnt = 0;
 	s->srv = srv;
 	s->port = port;
@@ -741,6 +754,12 @@ mksrv(char *srv, xcom_port port)
 		s->reply_handler = task_new(reply_handler_task, void_arg(s), "reply_handler_task", XCOM_THREAD_DEBUG);
 	}
 	reset_srv_buf(&s->out_buf);
+	/*
+	 Keep the server from being freed if the acceptor_learner_task calls
+	 srv_unref on the server before the {local_,}server_task and
+	 reply_handler_task begin.
+	*/
+	srv_ref(s);
 	return s;
 }
 
@@ -866,6 +885,9 @@ static void shut_srv(server *s)
 		task_terminate(s->sender);
 	if (s->reply_handler)
 		task_terminate(s->reply_handler);
+
+	// Allow the server to be freed. This unref pairs with the ref from mksrv.
+	srv_unref(s);
 }
 
 
@@ -903,19 +925,20 @@ int tcp_server(task_arg arg) {
   ep->refused = 0;
   unblock_fd(ep->fd);
   DBGOUT(FN; NDBG(ep->fd, d););
+  G_MESSAGE("XCom protocol version: %d", my_xcom_version);
   G_MESSAGE(
-      "Ready to accept incoming connections on %s:%d "
-      "(socket=%d)!",
-      "0.0.0.0", xcom_listen_port, ep->fd);
+      "XCom initialized and ready to accept incoming connections on port %d",
+      xcom_listen_port);
   do {
     TASK_CALL(accept_tcp(ep->fd, &ep->cfd));
     /* Callback to check that the file descriptor is accepted. */
-    if (xcom_socket_accept_callback && !xcom_socket_accept_callback(ep->cfd)) {
+    if (xcom_socket_accept_callback &&
+        !xcom_socket_accept_callback(ep->cfd, get_site_def())) {
       shut_close_socket(&ep->cfd);
       ep->cfd = -1;
     }
     if(ep->cfd == -1){
-      G_MESSAGE("accept failed");
+      G_DEBUG("accept failed");
       ep->refused = 1;
       TASK_DELAY(0.1);
     } else {
@@ -1040,7 +1063,7 @@ static inline int	_send_server_msg(site_def const *s, node_no to, pax_msg *p)
 {
 	assert(s);
 	assert(s->servers[to]);
-	if (s->servers[to] && p) {
+	if (s->servers[to] && s->servers[to]->invalid == 0 && p) {
 		send_msg(s->servers[to], s->nodeno, to, get_group_id(s), p);
 	}
 	return 0;
@@ -1779,7 +1802,7 @@ static xcom_port get_port(char *a)
 
 xcom_port xcom_get_port(char *a)
 {
-	return get_port(a);
+	return a ? get_port(a): 0;
 }
 
 
@@ -1795,7 +1818,7 @@ static server *find_server(server *table[], int n, char *name, xcom_port port)
 }
 
 
-void update_servers(site_def *s)
+void update_servers(site_def *s, cargo_type operation)
 {
 	u_int	n;
 
@@ -1815,6 +1838,8 @@ void update_servers(site_def *s)
 				DBGOUT(FN; STRLIT("re-using server "); NDBG(i, d); STREXP(name));
 				free(name);
 				s->servers[i] = sp;
+				if(sp->invalid)
+					sp->invalid= 0;
 			} else { /* No server? Create one */
 				DBGOUT(FN; STRLIT("creating new server "); NDBG(i, d); STREXP(name));
 				if (port > 0)
@@ -1827,6 +1852,41 @@ void update_servers(site_def *s)
 		for (i = n; i < NSERVERS; i++) {
 			s->servers[i] = 0;
 		}
+		/*
+		If we have a force config, mark the servers that do not belong to this
+		configuration as invalid
+		*/
+
+		if(operation == force_config_type) {
+			const site_def* old_site_def= get_prev_site_def();
+			invalidate_servers(old_site_def, s);
+		}
+
+	}
+}
+
+
+/*
+ Make a diff between 2 site_defs and mark as invalid servers
+ that do not belong to the new site_def.
+ This is only to be used if we are forcing a configuration.
+*/
+void invalidate_servers(const site_def* old_site_def,
+			const site_def* new_site_def) {
+	u_int node= 0;
+	for(; node < get_maxnodes(old_site_def); node++){
+		node_address* node_addr_from_old_site_def= &old_site_def->nodes.node_list_val[node];
+		if(!node_exists(node_addr_from_old_site_def, &new_site_def->nodes))
+		{
+			char *addr = node_addr_from_old_site_def->address;
+			char *name = get_name(addr);
+			xcom_port port = get_port(addr);
+			server *sp = find_server(all_servers, maxservers, name, port);
+			if (sp) {
+				sp->invalid= 1;
+			}
+			free(name);
+		}
 	}
 }
 
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h
index 0c94247f66bf..359f86cf6aea 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -125,7 +132,7 @@ char	*xcom_get_name(char *a);
 xcom_port xcom_get_port(char *a);
 int	send_server_msg(site_def const *s, node_no i, pax_msg *p);
 double server_active(site_def const *s, node_no i);
-void update_servers(site_def *s);
+void update_servers(site_def *s, cargo_type operation);
 void garbage_collect_servers();
 int	client_task(task_arg arg);
 int	send_msg(server *s, node_no from, node_no to, uint32_t group_id, pax_msg *p);
@@ -136,6 +143,9 @@ int	send_msg(server *s, node_no from, node_no to, uint32_t group_id, pax_msg *p)
 */
 void server_detected(server *s);
 
+void invalidate_servers(const site_def* old_site_def,
+                        const site_def* new_site_def);
+
 void shutdown_connection(connection_descriptor *con);
 void reset_connection(connection_descriptor *con);
 void close_connection(connection_descriptor *con);
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen
index 719dbc9f5cc6..b29d0218622f 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.h.gen
@@ -13,16 +13,23 @@
 extern "C" {
 #endif
 
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,7 +41,7 @@ enum xcom_proto {
 	x_unknown_proto = 0,
 	x_1_0 = 1,
 	x_1_1 = 2,
-	x_1_2 = 3,
+	x_1_2 = 3
 };
 typedef enum xcom_proto xcom_proto;
 
@@ -400,7 +407,7 @@ typedef struct pax_msg_1_2 pax_msg_1_2;
 #ifndef PAX_MSG_TYPEDEF
 #define PAX_MSG_TYPEDEF
 typedef pax_msg_1_2 pax_msg;
-extern  bool_t xdr_pax_msg (XDR *, pax_msg*);
+extern bool_t xdr_pax_msg (XDR *, pax_msg*);
 #endif
 
 typedef char *file_name;
@@ -461,8 +468,8 @@ extern  bool_t xdr_config_ptr (XDR *, config_ptr*);
 extern  bool_t xdr_configs (XDR *, configs*);
 extern  bool_t xdr_gcs_snapshot (XDR *, gcs_snapshot*);
 extern  bool_t xdr_client_reply_code (XDR *, client_reply_code*);
-extern  bool_t xdr_pax_msg_1_1(XDR *, pax_msg_1_1*);
-extern  bool_t xdr_pax_msg_1_2(XDR *, pax_msg_1_2*);
+extern  bool_t xdr_pax_msg_1_1 (XDR *, pax_msg_1_1*);
+extern  bool_t xdr_pax_msg_1_2 (XDR *, pax_msg_1_2*);
 extern  bool_t xdr_file_name (XDR *, file_name*);
 extern  bool_t xdr_file_name_array (XDR *, file_name_array*);
 extern  bool_t xdr_file_copy_data (XDR *, file_copy_data*);
@@ -508,8 +515,8 @@ extern bool_t xdr_config_ptr ();
 extern bool_t xdr_configs ();
 extern bool_t xdr_gcs_snapshot ();
 extern bool_t xdr_client_reply_code ();
-extern bool_t xdr_pax_msg_1_1();
-extern bool_t xdr_pax_msg_1_2();
+extern bool_t xdr_pax_msg_1_1 ();
+extern bool_t xdr_pax_msg_1_2 ();
 extern bool_t xdr_file_name ();
 extern bool_t xdr_file_name_array ();
 extern bool_t xdr_file_copy_data ();
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x
index 4f9639b304a7..3299a1cc17c8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp.x
@@ -1,13 +1,20 @@
-%/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+%/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 %
 %   This program is free software; you can redistribute it and/or modify
-%   it under the terms of the GNU General Public License as published by
-%   the Free Software Foundation; version 2 of the License.
+%   it under the terms of the GNU General Public License, version 2.0,
+%   as published by the Free Software Foundation.
+%
+%   This program is also distributed with certain software (including
+%   but not limited to OpenSSL) that is licensed under separate terms,
+%   as designated in a particular file or component or in included license
+%   documentation.  The authors of MySQL hereby grant you an additional
+%   permission to link the program and your derivative works with the
+%   separately licensed software that they have included with MySQL.
 %
 %   This program is distributed in the hope that it will be useful,
 %   but WITHOUT ANY WARRANTY; without even the implied warranty of
 %   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%   GNU General Public License for more details.
+%   GNU General Public License, version 2.0, for more details.
 %
 %   You should have received a copy of the GNU General Public License
 %   along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_platform.h.gen b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_platform.h.gen
index 28992add2502..af5ee0d72173 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_platform.h.gen
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_platform.h.gen
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. */
 
 /*
   Needed since rpcgen expands macros itself, we cannot put
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.c
index f71239f570e7..b6a93064a918 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.c
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.h
index bb97194fd57f..a132fa9003c4 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_str.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen
index 40542a53dfe4..481e154aafbe 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_vp_xdr.c.gen
@@ -4,16 +4,23 @@
  */
 
 #include "xcom_vp.h"
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
index 2f18bb4e56e6..63eafef10113 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xdr_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/gcs_interface_factory.cc b/rapid/plugin/group_replication/libmysqlgcs/src/gcs_interface_factory.cc
index 0b062bf108a4..f9176cbb3a36 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/gcs_interface_factory.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/gcs_interface_factory.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_group_identifier.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_group_identifier.cc
index 22cda6e6e4bd..b5ecfc9e5bf8 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_group_identifier.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_group_identifier.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
index cc1fca7cba2b..12d2c8faa054 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_member_identifier.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_member_identifier.cc
index 87dbe146a0f9..d4a45364649b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_member_identifier.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_member_identifier.cc
@@ -1,39 +1,160 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <xplatform/my_xp_util.h>
+#include <xplatform/byteorder.h>
+#include <cstring>
+#include <assert.h>
+#include <sstream>
+
 #include "gcs_member_identifier.h"
 
 Gcs_member_identifier::Gcs_member_identifier(const std::string &id):
-  member_id(id)
+  m_member_id(id), m_uuid(Gcs_uuid::create_uuid())
 {
 }
 
 
-const std::string &Gcs_member_identifier::get_member_id() const
+Gcs_member_identifier::Gcs_member_identifier(const std::string &member_id,
+                                             const Gcs_uuid &uuid):
+  m_member_id(member_id), m_uuid(uuid)
 {
-  return member_id;
+}
+
+
+const std::string& Gcs_member_identifier::get_member_id() const
+{
+  return m_member_id;
+}
+
+
+const Gcs_uuid& Gcs_member_identifier::get_member_uuid() const
+{
+  return m_uuid;
+}
+
+
+void Gcs_member_identifier::regenerate_member_uuid()
+{
+  m_uuid= Gcs_uuid::create_uuid();
 }
 
 
 bool Gcs_member_identifier::operator<(const Gcs_member_identifier &other) const
 {
-  return member_id.compare(other.member_id) < 0;
+  return m_member_id.compare(other.m_member_id) < 0;
 }
 
 
 bool Gcs_member_identifier::operator==(const Gcs_member_identifier &other) const
 {
-  return member_id.compare(other.member_id) == 0;
+  return m_member_id.compare(other.m_member_id) == 0;
+}
+
+
+Gcs_uuid::Gcs_uuid() : actual_value(do_create_uuid())
+{
+}
+
+
+const std::string Gcs_uuid::do_create_uuid()
+{
+  /* Although it is possible to have collisions if different nodes create
+     the same UUID, this is not a problem because the UUID is only used to
+     distinguish two situations:
+
+       . whether someone is trying to remove a newer node's incarnation.
+
+       . whether a new node's incarnation is trying to rejoin a group when
+         there are still references to its old incarnation.
+
+     So although there might be collisions, this is not a problem because
+     the actual node's identification is the combination of address and
+     UUID.
+
+     Note that, whatever the UUID is, we have to guarantee that successive
+     node's incarnations don't have the same UUID.
+
+     Our current solution uses a simple timestamp which is safe because it
+     is very unlikely that the same node will be able to join, fail/leave
+     and rejoin again and will keep the same uuid.
+
+     In the future, we can start generating real UUIDs if we need them for
+     any reason. The server already has the code to do it, so we could make
+     this an option and pass the information to GCS.
+  */
+  uint64_t value= My_xp_util::getsystime();
+  std::ostringstream ss;
+
+  ss << value;
+  return ss.str();
+}
+
+
+Gcs_uuid Gcs_uuid::create_uuid()
+{
+  Gcs_uuid uuid;
+  uuid.actual_value= do_create_uuid();
+  return uuid;
+}
+
+
+bool Gcs_uuid::encode(uchar **buffer, unsigned int *size) const
+{
+  if  (buffer == NULL || *buffer == NULL || size == NULL)
+  {
+/* purecov: begin tested */
+    return false;
+/* purecov: end */
+  }
+
+  /*
+    Note the value's size will not exceed the unsigned int.
+  */
+  memcpy(*buffer, actual_value.c_str(), actual_value.size());
+  *size= static_cast<unsigned int>(actual_value.size());
+
+  return true;
+}
+
+
+bool Gcs_uuid::decode(const uchar *buffer, const unsigned int size)
+{
+  if  (buffer == NULL)
+  {
+/* purecov: begin tested */
+    return false;
+/* purecov: end */
+  }
+
+  actual_value= std::string(
+    reinterpret_cast<const char *>(buffer), static_cast<size_t>(size)
+  );
+
+  return true;
+}
+
+
+size_t Gcs_uuid::size() const
+{
+  return actual_value.size();
 }
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc
index 9ea61cf567d2..28531bb5091c 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_message.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_types.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_types.cc
index 61d0c1045f22..8e86b6b8169d 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_types.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_types.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_view.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_view.cc
index f389aed43baf..3a8026ef299b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_view.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/gcs_view.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -64,7 +71,7 @@ void Gcs_view::clone(const std::vector<Gcs_member_identifier>& members,
   for (members_it= members.begin(); members_it != members.end(); ++members_it)
   {
     m_members
-      ->push_back(Gcs_member_identifier((*members_it).get_member_id()));
+      ->push_back(Gcs_member_identifier(*members_it));
   }
 
   m_leaving= new std::vector<Gcs_member_identifier>();
@@ -72,7 +79,7 @@ void Gcs_view::clone(const std::vector<Gcs_member_identifier>& members,
   for (leaving_it= leaving.begin(); leaving_it != leaving.end(); ++leaving_it)
   {
     m_leaving
-      ->push_back(Gcs_member_identifier((*leaving_it).get_member_id()));
+      ->push_back(Gcs_member_identifier(*leaving_it));
   }
 
   m_joined= new std::vector<Gcs_member_identifier>();
@@ -132,3 +139,22 @@ Gcs_view::Gcs_view_error_code Gcs_view::get_error_code() const
 {
   return m_error_code;
 }
+
+const Gcs_member_identifier *Gcs_view::get_member(const std::string &member_id) const
+{
+  std::vector<Gcs_member_identifier>::const_iterator members_it;
+  for (members_it= m_members->begin(); members_it != m_members->end(); ++members_it)
+  {
+    if ((*members_it).get_member_id() == member_id)
+    {
+      return &(*members_it);
+    }
+  }
+
+  return NULL;
+}
+
+bool Gcs_view::has_member(const std::string &member_id) const
+{
+  return get_member(member_id) != NULL;
+}
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_cond.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_cond.cc
index 83b3b842e946..3fe37cbdabce 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_cond.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_cond.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_mutex.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_mutex.cc
index 45a1c62cbfce..31e33c19a95b 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_mutex.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_mutex.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc
index a4afb70b46f1..c053a60c7d07 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_thread.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc
index 2e527b51d794..9f54d4ff410a 100644
--- a/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc
+++ b/rapid/plugin/group_replication/libmysqlgcs/src/interface/xplatform/my_xp_util.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/mysql_gcs.h.cmake b/rapid/plugin/group_replication/mysql_gcs.h.cmake
index cb11b21d9b39..017a0ffbf952 100644
--- a/rapid/plugin/group_replication/mysql_gcs.h.cmake
+++ b/rapid/plugin/group_replication/mysql_gcs.h.cmake
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/group_replication/rpcgen.cmake b/rapid/plugin/group_replication/rpcgen.cmake
index b9c5895c60ac..83d177974d86 100644
--- a/rapid/plugin/group_replication/rpcgen.cmake
+++ b/rapid/plugin/group_replication/rpcgen.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -87,6 +94,16 @@ FOREACH(X xcom_vp)
         ${XCOM_BASEDIR}/xcom_proto_enum.h
         ${XCOM_BASEDIR}/xcom_limits.h)
   ELSE()
+    FIND_PROGRAM(RPCGEN_EXECUTABLE rpcgen DOC "path to the rpcgen executable")
+    MARK_AS_ADVANCED(RPCGEN_EXECUTABLE)
+    IF(NOT RPCGEN_EXECUTABLE)
+      MESSAGE(FATAL_ERROR "Could not find rpcgen")
+    ENDIF()
+
+    MYSQL_CHECK_RPC()
+
+    MESSAGE(STATUS "RPC_INCLUDE_DIRS ${RPC_INCLUDE_DIRS}")
+
     # on unix systems try to generate them if needed
     ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c} ${x_tmp_plat_h}
       COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -103,10 +120,10 @@ FOREACH(X xcom_vp)
 
        # generate the sources
        COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_h}
-       COMMAND rpcgen  -C -h -o
+       COMMAND ${RPCGEN_EXECUTABLE}  -C -h -o
                     ${x_gen_h} ${x_tmp_x_canonical_name}
        COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_c}
-                COMMAND rpcgen  -C -c -o
+                COMMAND ${RPCGEN_EXECUTABLE}  -C -c -o
                 ${x_gen_c} ${x_tmp_x_canonical_name}
        WORKING_DIRECTORY ${gen_xdr_dir}
        DEPENDS
diff --git a/rapid/plugin/group_replication/src/applier.cc b/rapid/plugin/group_replication/src/applier.cc
index dbab2bf09748..9ab8a735a694 100644
--- a/rapid/plugin/group_replication/src/applier.cc
+++ b/rapid/plugin/group_replication/src/applier.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -285,7 +292,9 @@ Applier_module::apply_view_change_packet(View_change_packet *view_change_packet,
   Pipeline_event* pevent= new Pipeline_event(view_change_event, fde_evt, cache);
   pevent->mark_event(SINGLE_VIEW_EVENT);
   error= inject_event_into_pipeline(pevent, cont);
-  delete pevent;
+  //When discarded, the VCLE logging was delayed, so don't delete it
+  if (!cont->is_transaction_discarded())
+    delete pevent;
 
   return error;
 }
@@ -299,6 +308,11 @@ int Applier_module::apply_data_packet(Data_packet *data_packet,
   uchar* payload= data_packet->payload;
   uchar* payload_end= data_packet->payload + data_packet->len;
 
+  DBUG_EXECUTE_IF("group_replication_before_apply_data_packet", {
+    const char act[] = "now wait_for continue_apply";
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+  });
+
   if (check_single_primary_queue_status())
     return 1; /* purecov: inspected */
 
@@ -341,7 +355,7 @@ Applier_module::apply_single_primary_action_packet(Single_primary_action_packet
       certifier->disable_conflict_detection();
       break;
     default:
-      DBUG_ASSERT(0); /* purecov: inspected */
+      assert(0); /* purecov: inspected */
   }
 
   return error;
@@ -445,7 +459,7 @@ Applier_module::applier_thread_handle()
           this->incoming->pop();
           break;
       default:
-        DBUG_ASSERT(0); /* purecov: inspected */
+        assert(0); /* purecov: inspected */
     }
 
     delete packet;
@@ -478,7 +492,7 @@ Applier_module::applier_thread_handle()
   DBUG_EXECUTE_IF("applier_thd_timeout",
                   {
                     const char act[]= "now wait_for signal.applier_continue";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
 
   if (cache != NULL)
@@ -601,7 +615,7 @@ Applier_module::terminate_applier_thread()
     */
     struct timespec abstime;
     set_timespec(&abstime, 2);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int error=
 #endif
       mysql_cond_timedwait(&run_cond, &run_lock, &abstime);
@@ -614,10 +628,10 @@ Applier_module::terminate_applier_thread()
       mysql_mutex_unlock(&run_lock);
       DBUG_RETURN(1);
     }
-    DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+    assert(error == ETIMEDOUT || error == 0);
   }
 
-  DBUG_ASSERT(!applier_running);
+  assert(!applier_running);
 
 delete_pipeline:
 
@@ -678,6 +692,11 @@ void Applier_module::leave_group_on_failure()
                                          Group_member_info::MEMBER_ERROR);
 
   bool set_read_mode= false;
+  if (view_change_notifier != NULL &&
+      !view_change_notifier->is_view_modification_ongoing())
+  {
+    view_change_notifier->start_view_modification();
+  }
   Gcs_operations::enum_leave_state state= gcs_module->leave();
 
   int error= channel_stop_all(CHANNEL_APPLIER_THREAD|CHANNEL_RECEIVER_THREAD,
@@ -740,6 +759,30 @@ void Applier_module::kill_pending_transactions(bool set_read_mode,
       enable_server_read_mode(PSESSION_USE_THREAD);
   }
 
+  if (view_change_notifier != NULL)
+  {
+    log_message(MY_INFORMATION_LEVEL, "Going to wait for view modification");
+    if (view_change_notifier->wait_for_view_modification())
+    {
+      log_message(MY_ERROR_LEVEL, "On shutdown there was a timeout receiving a "
+                                  "view change. This can lead to a possible "
+                                  "inconsistent state. Check the log for more "
+                                  "details");
+    }
+  }
+
+  /*
+    Only abort() if we successfully asked to leave() the group (and we have
+    group_replication_exit_state_action set to ABORT_SERVER).
+    We don't want to abort() during the execution of START GROUP_REPLICATION or
+    STOP GROUP_REPLICATION.
+  */
+  if (set_read_mode &&
+      exit_state_action_var == EXIT_STATE_ACTION_ABORT_SERVER)
+  {
+    abort_plugin_process("Fatal error during execution of Group Replication");
+  }
+
   DBUG_VOID_RETURN;
 }
 
@@ -908,7 +951,7 @@ Applier_module::intersect_group_executed_sets(std::vector<std::string>& gtid_set
     }
   }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   char *executed_set_string;
   output_set->to_string(&executed_set_string);
   DBUG_PRINT("info", ("View change GTID information: output_set: %s",
@@ -946,3 +989,43 @@ int Applier_module::check_single_primary_queue_status()
 
   return 0;
 }
+
+Pipeline_member_stats *Applier_module::get_local_pipeline_stats()
+{
+  // We need run_lock to get protection against STOP GR command.
+
+  Mutex_autolock auto_lock_mutex(&run_lock);
+  Pipeline_member_stats *stats= NULL;
+  Certification_handler *cert= this->get_certification_handler();
+  Certifier_interface *cert_module= (cert ? cert->get_certifier() : NULL);
+  if (cert_module)
+  {
+    stats= new Pipeline_member_stats(
+        get_pipeline_stats_member_collector(), get_message_queue_size(),
+        cert_module->get_negative_certified(),
+        cert_module->get_certification_info_size());
+    {
+      char *committed_transactions_buf= NULL;
+      size_t committed_transactions_buf_length= 0;
+      int outcome= cert_module->get_group_stable_transactions_set_string(
+          &committed_transactions_buf, &committed_transactions_buf_length);
+
+      if (!outcome && committed_transactions_buf_length > 0)
+        stats->set_transaction_committed_all_members(committed_transactions_buf,
+                committed_transactions_buf_length);
+      my_free(committed_transactions_buf);
+    }
+    {
+      std::string last_conflict_free_transaction;
+      cert_module->get_last_conflict_free_transaction(
+          &last_conflict_free_transaction);
+      stats->set_transaction_last_conflict_free(last_conflict_free_transaction);
+    }
+  }
+  else
+  {
+    stats= new Pipeline_member_stats(get_pipeline_stats_member_collector(),
+                                     get_message_queue_size(), 0, 0);
+  }
+  return stats;
+}
diff --git a/rapid/plugin/group_replication/src/applier_channel_state_observer.cc b/rapid/plugin/group_replication/src/applier_channel_state_observer.cc
index 855de7223e82..17d1e2869495 100644
--- a/rapid/plugin/group_replication/src/applier_channel_state_observer.cc
+++ b/rapid/plugin/group_replication/src/applier_channel_state_observer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/asynchronous_channels_state_observer.cc b/rapid/plugin/group_replication/src/asynchronous_channels_state_observer.cc
index aab6e74a0f9e..687ac9e58606 100644
--- a/rapid/plugin/group_replication/src/asynchronous_channels_state_observer.cc
+++ b/rapid/plugin/group_replication/src/asynchronous_channels_state_observer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/auto_increment.cc b/rapid/plugin/group_replication/src/auto_increment.cc
index 4a04c806c293..2ae31830f4bb 100644
--- a/rapid/plugin/group_replication/src/auto_increment.cc
+++ b/rapid/plugin/group_replication/src/auto_increment.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/certifier.cc b/rapid/plugin/group_replication/src/certifier.cc
index 7e1fd6f0c30a..41b4700883a4 100644
--- a/rapid/plugin/group_replication/src/certifier.cc
+++ b/rapid/plugin/group_replication/src/certifier.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -24,6 +31,8 @@
 #include "sql_service_command.h"
 
 const std::string Certifier::GTID_EXTRACTED_NAME= "gtid_extracted";
+const std::string Certifier::CERTIFICATION_INFO_ERROR_NAME =
+    "certification_info_error";
 
 static void *launch_broadcast_thread(void* arg)
 {
@@ -233,7 +242,7 @@ int Certifier_broadcast_thread::broadcast_gtid_executed()
   }
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   char *encoded_gtid_executed_string=
       encoded_gtid_set_to_string(encoded_gtid_executed, length);
   DBUG_PRINT("info", ("Certifier broadcast executed_set: %s", encoded_gtid_executed_string));
@@ -257,7 +266,7 @@ Certifier::Certifier()
 {
    last_conflict_free_transaction.clear();
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   certifier_garbage_collection_block= false;
   /*
     Debug flag to block the garbage collection and discard incoming stable
@@ -447,7 +456,7 @@ void Certifier::compute_group_available_gtid_intervals()
                                              ? group_gtid_extracted
                                              : group_gtid_executed,
                                          group_gtid_sid_map_group_sidno);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (certifying_already_applied_transactions)
     DBUG_PRINT("Certifier::compute_group_available_gtid_intervals()",
                ("Generating group transaction intervals from group_gtid_extracted"));
@@ -466,18 +475,18 @@ void Certifier::compute_group_available_gtid_intervals()
   }
 
   // For each used interval find the upper bound and from there
-  // add the free GTIDs up to the next interval or MAX_GNO.
+  // add the free GTIDs up to the next interval or GNO_END.
   while ((iv= ivit.get()) != NULL)
   {
     ivit.next();
     iv_next= ivit.get();
 
     rpl_gno start= iv->end;
-    rpl_gno end= MAX_GNO;
+    rpl_gno end= GNO_END;
     if (iv_next != NULL)
       end= iv_next->start - 1;
 
-    DBUG_ASSERT(start <= end);
+    assert(start <= end);
     Gtid_set::Interval interval= {start, end, NULL};
     group_available_gtid_intervals.push_back(interval);
   }
@@ -485,7 +494,7 @@ void Certifier::compute_group_available_gtid_intervals()
   // No GTIDs used, so the available interval is the complete set.
   if (group_available_gtid_intervals.size() == 0)
   {
-    Gtid_set::Interval interval= {1, MAX_GNO, NULL};
+    Gtid_set::Interval interval= {1, GNO_END, NULL};
     group_available_gtid_intervals.push_back(interval);
   }
 
@@ -495,7 +504,7 @@ void Certifier::compute_group_available_gtid_intervals()
 Gtid_set::Interval Certifier::reserve_gtid_block(longlong block_size)
 {
   DBUG_ENTER("Certifier::reserve_gtid_block");
-  DBUG_ASSERT(block_size > 1);
+  assert(block_size > 1);
   mysql_mutex_assert_owner(&LOCK_certification_info);
 
   Gtid_set::Interval result;
@@ -505,7 +514,7 @@ Gtid_set::Interval Certifier::reserve_gtid_block(longlong block_size)
     compute_group_available_gtid_intervals();
 
   std::list<Gtid_set::Interval>::iterator it= group_available_gtid_intervals.begin();
-  DBUG_ASSERT(it != group_available_gtid_intervals.end());
+  assert(it != group_available_gtid_intervals.end());
 
   /*
     We always have one or more intervals, the only thing to check
@@ -522,8 +531,8 @@ Gtid_set::Interval Certifier::reserve_gtid_block(longlong block_size)
     result.start= it->start;
     result.end= it->start + block_size - 1;
     it->start= result.end + 1;
-    DBUG_ASSERT(result.start <= result.end);
-    DBUG_ASSERT(result.start < it->start);
+    assert(result.start <= result.end);
+    assert(result.start < it->start);
   }
 
   DBUG_RETURN(result);
@@ -538,7 +547,7 @@ void Certifier::add_to_group_gtid_executed_internal(rpl_sidno sidno,
   group_gtid_executed->_add_gtid(sidno, gno);
   if (local)
   {
-    DBUG_ASSERT(sidno >0 && gno >0);
+    assert(sidno >0 && gno >0);
     last_local_gtid.set(sidno, gno);
   }
   /*
@@ -603,7 +612,7 @@ int Certifier::initialize(ulonglong gtid_assignment_block_size)
     goto end; /* purecov: inspected */
   }
 
-  DBUG_ASSERT(gtid_assignment_block_size >= 1);
+  assert(gtid_assignment_block_size >= 1);
   this->gtid_assignment_block_size= gtid_assignment_block_size;
 
   /*
@@ -647,8 +656,8 @@ void Certifier::increment_parallel_applier_sequence_number(
   DBUG_ENTER("Certifier::increment_parallel_applier_sequence_number");
   mysql_mutex_assert_owner(&LOCK_certification_info);
 
-  DBUG_ASSERT(parallel_applier_last_committed_global <
-              parallel_applier_sequence_number);
+  assert(parallel_applier_last_committed_global <
+         parallel_applier_sequence_number);
   if (update_parallel_applier_last_committed_global)
     parallel_applier_last_committed_global= parallel_applier_sequence_number;
 
@@ -706,7 +715,7 @@ rpl_gno Certifier::certify(Gtid_set *snapshot_version,
   {
     certifying_already_applied_transactions= false;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char *group_gtid_executed_string= NULL;
     char *group_gtid_extracted_string= NULL;
     group_gtid_executed->to_string(&group_gtid_executed_string, true);
@@ -900,9 +909,9 @@ rpl_gno Certifier::certify(Gtid_set *snapshot_version,
 
     gle->last_committed= transaction_last_committed;
     gle->sequence_number= parallel_applier_sequence_number;
-    DBUG_ASSERT(gle->last_committed >= 0);
-    DBUG_ASSERT(gle->sequence_number > 0);
-    DBUG_ASSERT(gle->last_committed < gle->sequence_number);
+    assert(gle->last_committed >= 0);
+    assert(gle->sequence_number > 0);
+    assert(gle->last_committed < gle->sequence_number);
 
     increment_parallel_applier_sequence_number(!has_write_set);
   }
@@ -992,10 +1001,10 @@ rpl_gno Certifier::get_group_next_available_gtid(const char *member_uuid)
 
   if (member_uuid == NULL || gtid_assignment_block_size <= 1)
   {
-    result= get_group_next_available_gtid_candidate(1, MAX_GNO);
+    result= get_group_next_available_gtid_candidate(1, GNO_END);
     if (result < 0)
     {
-      DBUG_ASSERT(result == -1);
+      assert(result == -1);
       DBUG_RETURN(result);
     }
 
@@ -1032,7 +1041,7 @@ rpl_gno Certifier::get_group_next_available_gtid(const char *member_uuid)
       std::pair<std::string, Gtid_set::Interval> member_pair(member,
           reserve_gtid_block(gtid_assignment_block_size));
       insert_ret= member_gtids.insert(member_pair);
-      DBUG_ASSERT(insert_ret.second == true);
+      assert(insert_ret.second == true);
       it= insert_ret.first;
     }
 
@@ -1052,7 +1061,7 @@ rpl_gno Certifier::get_group_next_available_gtid(const char *member_uuid)
     gtids_assigned_in_blocks_counter++;
   }
 
-  DBUG_ASSERT(result > 0);
+  assert(result > 0);
   DBUG_RETURN(result);
 }
 
@@ -1061,8 +1070,8 @@ Certifier::get_group_next_available_gtid_candidate(rpl_gno start,
                                                    rpl_gno end) const
 {
   DBUG_ENTER("Certifier::get_group_next_available_gtid_candidate");
-  DBUG_ASSERT(start > 0);
-  DBUG_ASSERT(start <= end);
+  assert(start > 0);
+  assert(start <= end);
   mysql_mutex_assert_owner(&LOCK_certification_info);
 
   rpl_gno candidate= start;
@@ -1070,7 +1079,7 @@ Certifier::get_group_next_available_gtid_candidate(rpl_gno start,
                                              ? group_gtid_extracted
                                              : group_gtid_executed,
                                          group_gtid_sid_map_group_sidno);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (certifying_already_applied_transactions)
     DBUG_PRINT("Certifier::get_group_next_available_gtid_candidate()",
                ("Generating group transaction id from group_gtid_extracted"));
@@ -1082,9 +1091,9 @@ Certifier::get_group_next_available_gtid_candidate(rpl_gno start,
   */
   while (true)
   {
-    DBUG_ASSERT(candidate >= start);
+    assert(candidate >= start);
     const Gtid_set::Interval *iv= ivit.get();
-    rpl_gno next_interval_start= iv != NULL ? iv->start : MAX_GNO;
+    rpl_gno next_interval_start= iv != NULL ? iv->start : GNO_END;
 
     // Correct interval.
     if (candidate < next_interval_start)
@@ -1230,7 +1239,7 @@ void Certifier::garbage_collect()
   stable_gtid_set_lock->wrlock();
   while (it != certification_info.end())
   {
-    if (it->second->is_subset(stable_gtid_set))
+    if (it->second->is_subset_not_equals(stable_gtid_set))
     {
       if (it->second->unlink() == 0)
         delete it->second;
@@ -1248,7 +1257,7 @@ void Certifier::garbage_collect()
   */
   increment_parallel_applier_sequence_number(true);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /*
     This part blocks the garbage collection process for 300 sec in order to
     simulate the case that while garbage collection is going on, we should
@@ -1296,7 +1305,7 @@ int Certifier::handle_certifier_data(const uchar *data, ulong len,
 
   mysql_mutex_lock(&LOCK_members);
   std::string member_id= gcs_member_id.get_member_id();
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   if (same_member_message_discarded)
   {
     /*
@@ -1343,6 +1352,7 @@ int Certifier::handle_certifier_data(const uchar *data, ulong len,
                     "already sent the stable set. Therefore discarding the second "
                     "message.", member_info->get_hostname().c_str(),
                     member_info->get_port());
+        delete member_info;
       }
     }
 
@@ -1372,7 +1382,7 @@ int Certifier::handle_certifier_data(const uchar *data, ulong len,
     mysql_mutex_unlock(&LOCK_members); /* purecov: inspected */
   }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   if (same_member_message_discarded)
   {
     /*
@@ -1470,7 +1480,7 @@ int Certifier::stable_set_handle()
     error= 1; /* purecov: inspected */
   }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   char *executed_set_string;
   executed_set.to_string(&executed_set_string);
   DBUG_PRINT("info", ("Certifier stable_set_handle: executed_set: %s", executed_set_string));
@@ -1498,7 +1508,7 @@ void Certifier::get_certification_info(std::map<std::string, std::string> *cert_
       it != certification_info.end(); ++it)
   {
     std::string key= it->first;
-    DBUG_ASSERT(key.compare(GTID_EXTRACTED_NAME) != 0);
+    assert(key.compare(GTID_EXTRACTED_NAME) != 0);
 
     size_t len= it->second->get_encoded_length();
     uchar* buf= (uchar *)my_malloc(
@@ -1532,9 +1542,9 @@ rpl_gno Certifier::generate_view_change_group_gno()
   rpl_gno result= get_group_next_available_gtid(NULL);
 
   DBUG_EXECUTE_IF("certifier_assert_next_seqno_equal_5",
-                  DBUG_ASSERT(result == 5););
+                  assert(result == 5););
   DBUG_EXECUTE_IF("certifier_assert_next_seqno_equal_7",
-                  DBUG_ASSERT(result == 7););
+                  assert(result == 7););
 
   if (result > 0)
     add_to_group_gtid_executed_internal(group_gtid_sid_map_group_sidno, result, false);
@@ -1547,7 +1557,19 @@ rpl_gno Certifier::generate_view_change_group_gno()
 int Certifier::set_certification_info(std::map<std::string, std::string> *cert_info)
 {
   DBUG_ENTER("Certifier::set_certification_info");
-  DBUG_ASSERT(cert_info != NULL);
+  assert(cert_info != NULL);
+
+  if (cert_info->size() == 1) {
+    std::map<std::string, std::string>::iterator it =
+        cert_info->find(CERTIFICATION_INFO_ERROR_NAME);
+    if (it != cert_info->end()) {
+      log_message(MY_ERROR_LEVEL,
+                  "The certification information could not be set in this server: '%s'",
+                  it->second.c_str());
+      DBUG_RETURN(1);
+    }
+  }
+
   mysql_mutex_lock(&LOCK_certification_info);
 
   clear_certification_info();
@@ -1603,7 +1625,7 @@ int Certifier::set_certification_info(std::map<std::string, std::string> *cert_i
     certifying_already_applied_transactions= true;
     compute_group_available_gtid_intervals();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char *group_gtid_executed_string= NULL;
     char *group_gtid_extracted_string= NULL;
     group_gtid_executed->to_string(&group_gtid_executed_string, true);
@@ -1686,7 +1708,7 @@ size_t Certifier::get_local_certified_gtid(std::string& local_gtid_certified_str
 void Certifier::enable_conflict_detection()
 {
   DBUG_ENTER("Certifier::enable_conflict_detection");
-  DBUG_ASSERT(local_member_info->in_primary_mode());
+  assert(local_member_info->in_primary_mode());
 
   mysql_mutex_lock(&LOCK_certification_info);
   conflict_detection_enable= true;
@@ -1698,7 +1720,7 @@ void Certifier::enable_conflict_detection()
 void Certifier::disable_conflict_detection()
 {
   DBUG_ENTER("Certifier::disable_conflict_detection");
-  DBUG_ASSERT(local_member_info->in_primary_mode());
+  assert(local_member_info->in_primary_mode());
 
   mysql_mutex_lock(&LOCK_certification_info);
   conflict_detection_enable= false;
diff --git a/rapid/plugin/group_replication/src/channel_observation_manager.cc b/rapid/plugin/group_replication/src/channel_observation_manager.cc
index 0791a41242bf..efcec1a731ac 100644
--- a/rapid/plugin/group_replication/src/channel_observation_manager.cc
+++ b/rapid/plugin/group_replication/src/channel_observation_manager.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -60,7 +67,7 @@ std::list<Channel_state_observer*>*
 Channel_observation_manager::get_channel_state_observers()
 {
   DBUG_ENTER("Channel_observation_manager::get_channel_state_observers");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   channel_list_lock->assert_some_lock();
 #endif
   DBUG_RETURN(&channel_observers);
diff --git a/rapid/plugin/group_replication/src/compatibility_module.cc b/rapid/plugin/group_replication/src/compatibility_module.cc
index 45021a71a7d8..d6272227f891 100644
--- a/rapid/plugin/group_replication/src/compatibility_module.cc
+++ b/rapid/plugin/group_replication/src/compatibility_module.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -52,7 +59,7 @@ Compatibility_module::add_incompatibility(Member_version &from,
                                           Member_version &to_min,
                                           Member_version &to_max)
 {
-  DBUG_ASSERT(to_min.get_version() <= to_max.get_version());
+  assert(to_min.get_version() <= to_max.get_version());
   this->incompatibilities.
       insert(std::make_pair(from.get_version(),
                             std::make_pair(to_min.get_version(),
@@ -60,9 +67,9 @@ Compatibility_module::add_incompatibility(Member_version &from,
 }
 
 Compatibility_type
-Compatibility_module::check_local_incompatibility(Member_version &to)
+Compatibility_module::check_local_incompatibility(Member_version &to, bool is_lowest_version)
 {
-  return check_incompatibility(get_local_version(), to);
+  return check_incompatibility(get_local_version(), to, is_lowest_version);
 }
 
 bool
@@ -96,7 +103,8 @@ Compatibility_module::check_version_range_incompatibility(Member_version &from,
 
 Compatibility_type
 Compatibility_module::check_incompatibility(Member_version &from,
-                                            Member_version &to)
+                                            Member_version &to,
+                                            bool do_version_check)
 {
   //Check if they are the same...
   if (from == to)
@@ -127,10 +135,20 @@ Compatibility_module::check_incompatibility(Member_version &from,
   //It was not deemed incompatible by the table rules:
 
   /*
-    If they belong to the same major version
+    Version compatibility might only be against the lowest group version
   */
-  if (from.get_major_version() == to.get_major_version())
+  if(do_version_check)
+  {
+    /*
+      If they belong to the same major version
+    */
+    if (from.get_major_version() == to.get_major_version())
+      return COMPATIBLE;
+  }
+  else
+  {
     return COMPATIBLE;
+  }
 
   //If it has a higher major version then change to read mode
   if (from.get_major_version() > to.get_major_version())
diff --git a/rapid/plugin/group_replication/src/delayed_plugin_initialization.cc b/rapid/plugin/group_replication/src/delayed_plugin_initialization.cc
index 31f85f7de79e..f8791fc703a4 100644
--- a/rapid/plugin/group_replication/src/delayed_plugin_initialization.cc
+++ b/rapid/plugin/group_replication/src/delayed_plugin_initialization.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/gcs_event_handlers.cc b/rapid/plugin/group_replication/src/gcs_event_handlers.cc
index 98360b4d3081..7f22affae9e1 100644
--- a/rapid/plugin/group_replication/src/gcs_event_handlers.cc
+++ b/rapid/plugin/group_replication/src/gcs_event_handlers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -41,7 +48,7 @@ Plugin_gcs_events_handler(Applier_module_interface* applier_module,
                                        Group_member_info_pointer_comparator>();
   this->joiner_compatibility_status= new st_compatibility_types(INCOMPATIBLE);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     set_number_of_members_on_view_changed_to_10= false;
     DBUG_EXECUTE_IF("group_replication_set_number_of_members_on_view_changed_to_10",
                     { set_number_of_members_on_view_changed_to_10= true; };);
@@ -271,7 +278,7 @@ Plugin_gcs_events_handler::on_suspicions(const std::vector<Gcs_member_identifier
   if (members.empty() && unreachable.empty()) // nothing to do
     return; /* purecov: inspected */
 
-  DBUG_ASSERT(members.size() >= unreachable.size());
+  assert(members.size() >= unreachable.size());
 
   std::vector<Gcs_member_identifier> tmp_unreachable(unreachable);
   std::vector<Gcs_member_identifier>::const_iterator mit;
@@ -296,7 +303,7 @@ Plugin_gcs_events_handler::on_suspicions(const std::vector<Gcs_member_identifier
                       "Member with address %s:%u has become unreachable.",
                       member_info->get_hostname().c_str(), member_info->get_port());
 
-        member_info->set_unreachable();
+        group_member_mgr->set_member_unreachable(member_info->get_uuid());
 
         // remove to not check again against this one
         tmp_unreachable.erase(uit);
@@ -308,8 +315,10 @@ Plugin_gcs_events_handler::on_suspicions(const std::vector<Gcs_member_identifier
                       "Member with address %s:%u is reachable again.",
                       member_info->get_hostname().c_str(), member_info->get_port());
 
-        member_info->set_reachable();
+        group_member_mgr->set_member_reachable(member_info->get_uuid());
       }
+
+      delete member_info;
     }
   }
 
@@ -432,6 +441,8 @@ Plugin_gcs_events_handler::get_hosts_from_view(const std::vector<Gcs_member_iden
     {
       hosts_string << ", ";
     }
+
+    delete member_info;
   }
   all_hosts.assign (hosts_string.str());
   primary_host.assign (primary_string.str());
@@ -542,18 +553,10 @@ Plugin_gcs_events_handler::on_view_changed(const Gcs_view& new_view,
 
   if (!is_leaving)
   {
-    std::string view_id_representation= "";
-    Gcs_view *view= gcs_module->get_current_view();
-    if (view != NULL)
-    {
-      view_id_representation= view->get_view_id().get_representation();
-      delete view;
-    }
-
     log_message(MY_INFORMATION_LEVEL,
                 "Group membership changed to %s on view %s.",
                 group_member_mgr->get_string_current_view_active_hosts().c_str(),
-                view_id_representation.c_str());
+                new_view.get_view_id().get_representation().c_str());
   }
   else
   {
@@ -671,7 +674,7 @@ void Plugin_gcs_events_handler::handle_leader_election_if_needed() const
     return;
 
   bool am_i_leaving= true;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   int n=0;
 #endif
   Group_member_info* the_primary= NULL;
@@ -699,8 +702,8 @@ void Plugin_gcs_events_handler::handle_leader_election_if_needed() const
    */
   for(it= all_members_info->begin(); it != all_members_info->end(); it++)
   {
-#ifndef DBUG_OFF
-    DBUG_ASSERT(!(n > 1));
+#ifndef NDEBUG
+    assert(!(n > 1));
 #endif
 
     Group_member_info* member= *it;
@@ -708,7 +711,7 @@ void Plugin_gcs_events_handler::handle_leader_election_if_needed() const
         member->get_role() == Group_member_info::MEMBER_ROLE_PRIMARY)
     {
       the_primary= member;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       n++;
 #endif
     }
@@ -762,7 +765,7 @@ void Plugin_gcs_events_handler::handle_leader_election_if_needed() const
       {
         Group_member_info* mi= *it;
 
-        DBUG_ASSERT(mi);
+        assert(mi);
         if (mi &&
             mi->get_recovery_status() == Group_member_info::MEMBER_ONLINE)
           the_primary= mi;
@@ -909,7 +912,7 @@ update_group_info_manager(const Gcs_view& new_view,
   temporary_states->clear();
 
 err:
-  DBUG_ASSERT(temporary_states->size() == 0);
+  assert(temporary_states->size() == 0);
   return error;
 }
 
@@ -979,7 +982,7 @@ void Plugin_gcs_events_handler::handle_joining_members(const Gcs_view& new_view,
     {
       log_message(MY_ERROR_LEVEL,
                   "Group contains %lu members which is greater than"
-                  " group_replication_auto_increment_increment value of %lu."
+                  " auto_increment_increment value of %lu."
                   " This can lead to an higher rate of transactional aborts.",
                   new_view.get_members().size(), auto_increment_increment);
     }
@@ -1154,6 +1157,7 @@ process_local_exchanged_data(const Exchanged_data &exchanged_data,
                                     " information can be outdated and lead to"
                                     " errors on recovery",
                                     member_info->get_hostname().c_str(), member_info->get_port());
+        delete member_info;
       }
       continue;
       /* purecov: end */
@@ -1311,6 +1315,8 @@ update_member_status(const vector<Gcs_member_identifier>& members,
     {
       group_member_mgr->update_member_status(member_info->get_uuid(), status);
     }
+
+    delete member_info;
   }
 }
 
@@ -1329,7 +1335,7 @@ Plugin_gcs_events_handler::check_group_compatibility(size_t number_of_members) c
   /*
     Check if group size did reach the maximum number of members.
   */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (set_number_of_members_on_view_changed_to_10)
     number_of_members= 10;
 #endif
@@ -1436,13 +1442,26 @@ Plugin_gcs_events_handler::check_version_compatibility_with_group() const
 
   std::vector<Group_member_info*> *all_members= group_member_mgr->get_all_members();
   std::vector<Group_member_info*>::iterator all_members_it;
+  Member_version lowest_version(0xFFFFFF);
+
+  for (all_members_it = all_members->begin();
+       all_members_it != all_members->end(); all_members_it++)
+  {
+    if ((*all_members_it)->get_uuid() != local_member_info->get_uuid() &&
+        (*all_members_it)->get_member_version() < lowest_version)
+    {
+      lowest_version = (*all_members_it)->get_member_version();
+    }
+  }
+
   for (all_members_it= all_members->begin();
        all_members_it!= all_members->end();
        all_members_it++)
   {
     Member_version member_version= (*all_members_it)->get_member_version();
     compatibility_type=
-      compatibility_manager->check_local_incompatibility(member_version);
+      compatibility_manager->check_local_incompatibility(member_version,
+                                         member_version == lowest_version);
 
     if (compatibility_type == READ_COMPATIBLE)
     {
@@ -1683,6 +1702,24 @@ Plugin_gcs_events_handler::compare_member_option_compatibility() const
                   Group_member_info::get_configuration_flags_string(member_configuration_flags).c_str());
       goto cleaning;
     }
+
+    if ((*all_members_it)->get_lower_case_table_names() !=
+         DEFAULT_NOT_RECEIVED_LOWER_CASE_TABLE_NAMES &&
+        local_member_info->get_lower_case_table_names() !=
+        (*all_members_it)->get_lower_case_table_names())
+    {
+      result= 1;
+      log_message(MY_ERROR_LEVEL,
+                  "The member is configured with a lower_case_table_names "
+                  "option value '%lu' different from the group '%lu'. "
+                  "The member will now exit the group. If there is existing "
+                  "data on member, it may be incompatible with group if "
+                  "created with a lower_case_table_names value different from "
+                  "the group.",
+                  local_member_info->get_lower_case_table_names(),
+                  (*all_members_it)->get_lower_case_table_names());
+      goto cleaning;
+    }
   }
 
 cleaning:
diff --git a/rapid/plugin/group_replication/src/gcs_logger.cc b/rapid/plugin/group_replication/src/gcs_logger.cc
index 52cdfb9338d0..3e9baef95519 100644
--- a/rapid/plugin/group_replication/src/gcs_logger.cc
+++ b/rapid/plugin/group_replication/src/gcs_logger.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -51,7 +58,7 @@ void Gcs_gr_logger_impl::log_event(gcs_log_level_t level,
       break;
 
     default:
-      DBUG_ASSERT(0); /* purecov: inspected */
+      assert(0); /* purecov: inspected */
   }
 
   DBUG_VOID_RETURN;
diff --git a/rapid/plugin/group_replication/src/gcs_operations.cc b/rapid/plugin/group_replication/src/gcs_operations.cc
index 09567a6ac40c..7033230187e0 100644
--- a/rapid/plugin/group_replication/src/gcs_operations.cc
+++ b/rapid/plugin/group_replication/src/gcs_operations.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -25,18 +32,12 @@ const std::string Gcs_operations::gcs_engine= "xcom";
 
 Gcs_operations::Gcs_operations()
   : gcs_interface(NULL),
-    leave_coordination_leaving(false),
-    leave_coordination_left(false),
-    finalize_ongoing(false)
+    leave_coordination_leaving(0),
+    leave_coordination_left(0)
 {
   gcs_operations_lock= new Checkable_rwlock(
 #ifdef HAVE_PSI_INTERFACE
       key_GR_RWLOCK_gcs_operations
-#endif
-  );
-  finalize_ongoing_lock= new Checkable_rwlock(
-#ifdef HAVE_PSI_INTERFACE
-      key_GR_RWLOCK_gcs_operations_finalize_ongoing
 #endif
   );
 }
@@ -45,7 +46,6 @@ Gcs_operations::Gcs_operations()
 Gcs_operations::~Gcs_operations()
 {
   delete gcs_operations_lock;
-  delete finalize_ongoing_lock;
 }
 
 
@@ -56,10 +56,10 @@ Gcs_operations::initialize()
   int error= 0;
   gcs_operations_lock->wrlock();
 
-  leave_coordination_leaving= false;
-  leave_coordination_left= false;
+  my_atomic_store32(&leave_coordination_leaving, 0);
+  my_atomic_store32(&leave_coordination_left, 0);
 
-  DBUG_ASSERT(gcs_interface == NULL);
+  assert(gcs_interface == NULL);
   if ((gcs_interface=
            Gcs_interface_factory::get_interface_implementation(
                gcs_engine)) == NULL)
@@ -93,20 +93,14 @@ void
 Gcs_operations::finalize()
 {
   DBUG_ENTER("Gcs_operations::finalize");
-  finalize_ongoing_lock->wrlock();
-  finalize_ongoing= true;
   gcs_operations_lock->wrlock();
-  finalize_ongoing_lock->unlock();
 
   if (gcs_interface != NULL)
     gcs_interface->finalize();
   Gcs_interface_factory::cleanup(gcs_engine);
   gcs_interface= NULL;
 
-  finalize_ongoing_lock->wrlock();
-  finalize_ongoing= false;
   gcs_operations_lock->unlock();
-  finalize_ongoing_lock->unlock();
   DBUG_VOID_RETURN;
 }
 
@@ -206,12 +200,12 @@ Gcs_operations::leave()
   enum_leave_state state= ERROR_WHEN_LEAVING;
   gcs_operations_lock->wrlock();
 
-  if (leave_coordination_left)
+  if (my_atomic_load32(&leave_coordination_left))
   {
     state= ALREADY_LEFT;
     goto end;
   }
-  if (leave_coordination_leaving)
+  if (my_atomic_load32(&leave_coordination_leaving))
   {
     state= ALREADY_LEAVING;
     goto end;
@@ -229,7 +223,7 @@ Gcs_operations::leave()
       if (!gcs_control->leave())
       {
         state= NOW_LEAVING;
-        leave_coordination_leaving= true;
+        my_atomic_store32(&leave_coordination_leaving, 1);
         goto end;
       }
     }
@@ -261,30 +255,8 @@ void
 Gcs_operations::leave_coordination_member_left()
 {
   DBUG_ENTER("Gcs_operations::leave_coordination_member_left");
-
-  /*
-    If finalize method is ongoing, it means that GCS is waiting that
-    all messages and views are delivered to GR, if we proceed with
-    this method we will enter on the deadlock:
-      1) leave view was not delivered before wait view timeout;
-      2) finalize did start and acquired lock->wrlock();
-      3) leave view was delivered, member_left is waiting to
-         acquire lock->wrlock().
-    So, if leaving, we just do nothing.
-  */
-  finalize_ongoing_lock->rdlock();
-  if (finalize_ongoing)
-  {
-    finalize_ongoing_lock->unlock();
-    DBUG_VOID_RETURN;
-  }
-  gcs_operations_lock->wrlock();
-  finalize_ongoing_lock->unlock();
-
-  leave_coordination_leaving= false;
-  leave_coordination_left= true;
-
-  gcs_operations_lock->unlock();
+  my_atomic_store32(&leave_coordination_leaving, 0);
+  my_atomic_store32(&leave_coordination_left, 1);
   DBUG_VOID_RETURN;
 }
 
diff --git a/rapid/plugin/group_replication/src/gcs_plugin_messages.cc b/rapid/plugin/group_replication/src/gcs_plugin_messages.cc
index 184a207986fd..fb7943fbf785 100644
--- a/rapid/plugin/group_replication/src/gcs_plugin_messages.cc
+++ b/rapid/plugin/group_replication/src/gcs_plugin_messages.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/gcs_view_modification_notifier.cc b/rapid/plugin/group_replication/src/gcs_view_modification_notifier.cc
index 6925107b35e1..2ebbf4efacec 100644
--- a/rapid/plugin/group_replication/src/gcs_view_modification_notifier.cc
+++ b/rapid/plugin/group_replication/src/gcs_view_modification_notifier.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -64,6 +71,15 @@ Plugin_gcs_view_modification_notifier::is_injected_view_modification()
   return result;
 }
 
+bool
+Plugin_gcs_view_modification_notifier::is_view_modification_ongoing()
+{
+  mysql_mutex_lock(&wait_for_view_mutex);
+  bool result = view_changing;
+  mysql_mutex_unlock(&wait_for_view_mutex);
+  return result;
+}
+
 void
 Plugin_gcs_view_modification_notifier::end_view_modification()
 {
@@ -87,7 +103,7 @@ Plugin_gcs_view_modification_notifier::cancel_view_modification(int error)
 bool
 Plugin_gcs_view_modification_notifier::is_cancelled()
 {
-  DBUG_ASSERT(view_changing == false);
+  assert(view_changing == false);
   return cancelled_view_change;
 }
 
@@ -128,6 +144,6 @@ Plugin_gcs_view_modification_notifier::wait_for_view_modification(long timeout)
 int
 Plugin_gcs_view_modification_notifier::get_error()
 {
-  DBUG_ASSERT(view_changing == false);
+  assert(view_changing == false);
   return error;
 }
diff --git a/rapid/plugin/group_replication/src/group_partition_handling.cc b/rapid/plugin/group_replication/src/group_partition_handling.cc
index 978dbf544623..cf2468c44ab9 100644
--- a/rapid/plugin/group_replication/src/group_partition_handling.cc
+++ b/rapid/plugin/group_replication/src/group_partition_handling.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -148,6 +155,11 @@ void Group_partition_handling::kill_transactions_and_leave()
   if (set_read_mode)
     enable_server_read_mode(PSESSION_INIT_THREAD);
 
+  if (exit_state_action_var == EXIT_STATE_ACTION_ABORT_SERVER)
+  {
+    abort_plugin_process("Fatal error during execution of Group Replication");
+  }
+
   DBUG_VOID_RETURN;
 }
 
@@ -232,7 +244,7 @@ int Group_partition_handling::terminate_partition_handler_thread()
 
     struct timespec abstime;
     set_timespec(&abstime, 2);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int error=
 #endif
       mysql_cond_timedwait(&run_cond, &run_lock, &abstime);
@@ -247,10 +259,10 @@ int Group_partition_handling::terminate_partition_handler_thread()
       DBUG_RETURN(1);
     }
     /* purecov: inspected */
-    DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+    assert(error == ETIMEDOUT || error == 0);
   }
 
-  DBUG_ASSERT(!thread_running);
+  assert(!thread_running);
 
   mysql_mutex_unlock(&run_lock);
 
diff --git a/rapid/plugin/group_replication/src/handlers/applier_handler.cc b/rapid/plugin/group_replication/src/handlers/applier_handler.cc
index d63cfe8153d8..37ae7075d6db 100644
--- a/rapid/plugin/group_replication/src/handlers/applier_handler.cc
+++ b/rapid/plugin/group_replication/src/handlers/applier_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -70,7 +77,7 @@ Applier_handler::initialize_repositories(bool reset_logs,
                                               NULL,
                                               false,
                                               GROUP_REPLICATION_APPLIER_THREAD_PRIORITY,
-                                              0, true);
+                                              0, true, true, true);
 
   if (error)
   {
diff --git a/rapid/plugin/group_replication/src/handlers/certification_handler.cc b/rapid/plugin/group_replication/src/handlers/certification_handler.cc
index 3a5d389dd283..b0ec5618ec48 100644
--- a/rapid/plugin/group_replication/src/handlers/certification_handler.cc
+++ b/rapid/plugin/group_replication/src/handlers/certification_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -19,27 +26,37 @@
 #include "plugin_log.h"
 
 using std::string;
-const int GTID_WAIT_TIMEOUT= 30; //30 seconds
-
+const int GTID_WAIT_TIMEOUT= 10; //10 seconds
+const int LOCAL_WAIT_TIMEOUT_ERROR= -1;
 
 Certification_handler::Certification_handler()
   :cert_module(NULL), applier_module_thd(NULL),
    group_sidno(0),
    transaction_context_packet(NULL),
-   transaction_context_pevent(NULL)
+   transaction_context_pevent(NULL),
+   m_view_change_event_on_wait(false)
 {}
 
 Certification_handler::~Certification_handler()
 {
   delete transaction_context_pevent;
   delete transaction_context_packet;
+
+  for (std::list<View_change_stored_info*>::iterator stored_view_info_it =
+           pending_view_change_events.begin();
+       stored_view_info_it != pending_view_change_events.end();
+       ++stored_view_info_it)
+  {
+    delete (*stored_view_info_it)->view_change_pevent;
+    delete *stored_view_info_it;
+  }
 }
 
 int
 Certification_handler::initialize()
 {
   DBUG_ENTER("Certification_handler::initialize");
-  DBUG_ASSERT(cert_module == NULL);
+  assert(cert_module == NULL);
   cert_module= new Certifier();
   DBUG_RETURN(0);
 }
@@ -138,8 +155,8 @@ Certification_handler::set_transaction_context(Pipeline_event *pevent)
   DBUG_ENTER("Certification_handler::set_transaction_context");
   int error= 0;
 
-  DBUG_ASSERT(transaction_context_packet == NULL);
-  DBUG_ASSERT(transaction_context_pevent == NULL);
+  assert(transaction_context_packet == NULL);
+  assert(transaction_context_pevent == NULL);
 
   Data_packet *packet= NULL;
   error= pevent->get_Packet(&packet);
@@ -164,8 +181,8 @@ Certification_handler::get_transaction_context(Pipeline_event *pevent,
   DBUG_ENTER("Certification_handler::get_transaction_context");
   int error= 0;
 
-  DBUG_ASSERT(transaction_context_packet != NULL);
-  DBUG_ASSERT(transaction_context_pevent == NULL);
+  assert(transaction_context_packet != NULL);
+  assert(transaction_context_pevent == NULL);
 
   Format_description_log_event *fdle= NULL;
   if (pevent->get_FormatDescription(&fdle) && (fdle == NULL))
@@ -465,7 +482,6 @@ Certification_handler::extract_certification_info(Pipeline_event *pevent,
 {
   DBUG_ENTER("Certification_handler::extract_certification_info");
   int error= 0;
-  Log_event *event= NULL;
 
   if (pevent->get_event_context() != SINGLE_VIEW_EVENT)
   {
@@ -488,6 +504,89 @@ Certification_handler::extract_certification_info(Pipeline_event *pevent,
     On that case we need to queue it on the group applier wrapped
     on a transaction with a group generated GTID.
   */
+
+  /*
+    If there are pending view changes to apply, apply them first.
+    If we can't apply the old VCLEs probably we can't apply the new one
+  */
+  if (unlikely(m_view_change_event_on_wait))
+  {
+    error = log_delayed_view_change_events(cont);
+    m_view_change_event_on_wait = !pending_view_change_events.empty();
+  }
+
+  std::string local_gtid_certified_string;
+  rpl_gno view_change_event_gno = -1;
+  if (!error)
+  {
+    error= log_view_change_event_in_order(pevent,
+                                          local_gtid_certified_string,
+                                          &view_change_event_gno,
+                                          cont);
+  }
+
+  /*
+    If there are was a timeout applying this or an older view change,
+    just store the event for future application.
+    An packet is also added the the applier module queue to ensure the
+    eventual event application.
+  */
+  if (error)
+  {
+    if (LOCAL_WAIT_TIMEOUT_ERROR == error) {
+      error= store_view_event_for_delayed_logging(pevent,
+          local_gtid_certified_string, view_change_event_gno, cont);
+      log_message(MY_WARNING_LEVEL,
+                  "Unable to log the group change View log event in its exaction position in the log."
+                  " This will not however affect the group replication recovery process or the overall plugin process.");
+      if (error)
+        cont->signal(1, false);
+      else
+        cont->signal(0, cont->is_transaction_discarded());
+    }
+    else
+      cont->signal(1, false);
+  }
+
+  DBUG_RETURN(error);
+}
+
+int Certification_handler::log_delayed_view_change_events(Continuation *cont)
+{
+  DBUG_ENTER("Certification_handler::log_delayed_view_change_events");
+
+  int error= 0;
+
+
+  while (!pending_view_change_events.empty() && !error)
+  {
+    View_change_stored_info *stored_view_info= pending_view_change_events.front();
+    error= log_view_change_event_in_order(stored_view_info->view_change_pevent,
+                                          stored_view_info->local_gtid_certified,
+                                          &(stored_view_info->view_change_event_gno),
+                                          cont);
+    // if we timeout keep the event
+    if (LOCAL_WAIT_TIMEOUT_ERROR != error)
+    {
+      delete stored_view_info->view_change_pevent;
+      delete stored_view_info;
+      pending_view_change_events.pop_front();
+    }
+  }
+  DBUG_RETURN(error);
+}
+
+int Certification_handler::
+store_view_event_for_delayed_logging(Pipeline_event *pevent,
+                                     std::string& local_gtid_certified_string,
+                                     rpl_gno event_gno,
+                                     Continuation *cont)
+{
+  DBUG_ENTER("Certification_handler::store_view_event_for_delayed_logging");
+
+  int error= 0;
+
+  Log_event *event= NULL;
   error= pevent->get_LogEvent(&event);
   if (error || (event == NULL))
   {
@@ -495,41 +594,42 @@ Certification_handler::extract_certification_info(Pipeline_event *pevent,
     log_message(MY_ERROR_LEVEL,
                 "Failed to fetch View_change_log_event containing required"
                 " info for certification");
-    cont->signal(1, true);
     DBUG_RETURN(1);
-    /* purecov: end */
+      /* purecov: end */
   }
   View_change_log_event *vchange_event= static_cast<View_change_log_event*>(event);
+  std::string view_change_event_id(vchange_event->get_view_id());
 
-  std::map<std::string, std::string> cert_info;
-  cert_module->get_certification_info(&cert_info);
-  vchange_event->set_certification_info(&cert_info);
+  // -1 means there was a second timeout on a VCLE that we already delayed
+  if (view_change_event_id != "-1")
+  {
+    m_view_change_event_on_wait = true;
+    View_change_stored_info *vcle_info=
+        new View_change_stored_info(pevent, local_gtid_certified_string, event_gno);
+    pending_view_change_events.push_back(vcle_info);
+    //Use the discard flag to let the applier know this was delayed
+    cont->set_transation_discarded(true);
+  }
 
-  //Assure the last known local transaction was already executed
-  error= wait_for_local_transaction_execution();
-
-  /**
-    Create a transactional block for the View change log event
-    GTID
-    BEGIN
-    VCLE
-    COMMIT
-  */
-  if (!error)
-    error= inject_transactional_events(pevent,cont);
+  // Add a packet back to the applier queue so it is processed in a later stage.
+  std::string delayed_view_id("-1");
+  View_change_packet * view_change_packet= new View_change_packet(delayed_view_id);
+  applier_module->add_view_change_packet(view_change_packet);
 
   DBUG_RETURN(error);
 }
 
-int Certification_handler::wait_for_local_transaction_execution()
+int Certification_handler::wait_for_local_transaction_execution(std::string& local_gtid_certified_string)
 {
   DBUG_ENTER("Certification_handler::wait_for_local_transaction_execution");
   int error= 0;
 
-  std::string local_gtid_certified_string;
-  if (!cert_module->get_local_certified_gtid(local_gtid_certified_string))
+  if (local_gtid_certified_string.empty())
   {
-    DBUG_RETURN(0); //empty
+    if (!cert_module->get_local_certified_gtid(local_gtid_certified_string))
+    {
+      DBUG_RETURN(0); // set is empty, we don't need to wait
+    }
   }
 
   Sql_service_command_interface *sql_command_interface=
@@ -553,11 +653,12 @@ int Certification_handler::wait_for_local_transaction_execution()
                                                 GTID_WAIT_TIMEOUT)))
   {
     /* purecov: begin inspected */
-    if (error == 1) //timeout
+    if (error == -1) //timeout
     {
-      log_message(MY_ERROR_LEVEL,
+      log_message(MY_WARNING_LEVEL,
                   "Timeout when waiting for the server to execute local "
                   "transactions in order assure the group change proper logging");
+      error= LOCAL_WAIT_TIMEOUT_ERROR;
     }
     else
     {
@@ -572,6 +673,7 @@ int Certification_handler::wait_for_local_transaction_execution()
 }
 
 int Certification_handler::inject_transactional_events(Pipeline_event *pevent,
+                                                       rpl_gno *event_gno,
                                                        Continuation *cont)
 {
   DBUG_ENTER("Certification_handler::inject_transactional_events");
@@ -601,8 +703,11 @@ int Certification_handler::inject_transactional_events(Pipeline_event *pevent,
   }
 
   //GTID event
-
-  Gtid gtid= {group_sidno, cert_module->generate_view_change_group_gno()};
+  if (*event_gno == -1)
+  {
+    *event_gno= cert_module->generate_view_change_group_gno();
+  }
+  Gtid gtid= {group_sidno, *event_gno};
   if (gtid.gno <= 0)
   {
     cont->signal(1, true);
@@ -673,6 +778,80 @@ int Certification_handler::inject_transactional_events(Pipeline_event *pevent,
   DBUG_RETURN(0);
 }
 
+int Certification_handler::log_view_change_event_in_order(Pipeline_event *view_pevent,
+                                                          std::string &local_gtid_string,
+                                                          rpl_gno *event_gno,
+                                                          Continuation *cont) {
+  DBUG_ENTER("Certification_handler::log_view_change_event_in_order");
+
+  int error= 0;
+  bool first_log_attempt= (*event_gno == -1);
+
+  Log_event *event= NULL;
+  error= view_pevent->get_LogEvent(&event);
+  if (error || (event == NULL))
+  {
+    /* purecov: begin inspected */
+    log_message(MY_ERROR_LEVEL,
+                "Failed to fetch View_change_log_event containing required"
+                " info for certification");
+    DBUG_RETURN(1);
+      /* purecov: end */
+  }
+  View_change_log_event *vchange_event= static_cast<View_change_log_event*>(event);
+  std::string view_change_event_id(vchange_event->get_view_id());
+
+  /*
+    A -1 view id means this event was queued to make the applier pipeline retry the
+    logging of a view change log event that was not successful in the past.
+    The original event was however stored elsewhere so this event is ignored.
+  */
+  if (unlikely(view_change_event_id == "-1"))
+    DBUG_RETURN(0);
+
+  if (first_log_attempt)
+  {
+    std::map<std::string, std::string> cert_info;
+    cert_module->get_certification_info(&cert_info);
+    size_t event_size = 0;
+    vchange_event->set_certification_info(&cert_info, &event_size);
+
+    /*
+       If certification information is too big this event can't be transmitted
+       as it would cause failures on all group members.
+       To avoid this, we  now instead encode an error that will make the joiner
+       leave the group.
+    */
+    if (event_size > get_slave_max_allowed_packet()) {
+      cert_info.clear();
+      cert_info[Certifier::CERTIFICATION_INFO_ERROR_NAME] =
+          "Certification information is too large for transmission.";
+      vchange_event->set_certification_info(&cert_info, &event_size);
+    }
+  }
+
+  //Assure the last known local transaction was already executed
+  error= wait_for_local_transaction_execution(local_gtid_string);
+
+  if (!error) {
+    /**
+     Create a transactional block for the View change log event
+     GTID
+     BEGIN
+     VCLE
+     COMMIT
+    */
+    error= inject_transactional_events(view_pevent, event_gno, cont);
+  }
+  else if (LOCAL_WAIT_TIMEOUT_ERROR == error && first_log_attempt)
+  {
+     // Even if we can't log it, register the position
+    *event_gno= cert_module->generate_view_change_group_gno();
+  }
+
+  DBUG_RETURN(error);
+}
+
 bool Certification_handler::is_unique()
 {
   return true;
diff --git a/rapid/plugin/group_replication/src/handlers/event_cataloger.cc b/rapid/plugin/group_replication/src/handlers/event_cataloger.cc
index ddff8319c9fc..b828a03b24b9 100644
--- a/rapid/plugin/group_replication/src/handlers/event_cataloger.cc
+++ b/rapid/plugin/group_replication/src/handlers/event_cataloger.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/member_info.cc b/rapid/plugin/group_replication/src/member_info.cc
index a281c487ebde..127ff4c6f8bb 100644
--- a/rapid/plugin/group_replication/src/member_info.cc
+++ b/rapid/plugin/group_replication/src/member_info.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -32,7 +39,8 @@ Group_member_info(char* hostname_arg,
                   Group_member_info::Group_member_role role_arg,
                   bool in_single_primary_mode,
                   bool has_enforces_update_everywhere_checks,
-                  uint member_weight_arg)
+                  uint member_weight_arg,
+                  uint lower_case_table_names_arg)
   : Plugin_gcs_message(CT_MEMBER_INFO_MESSAGE),
     hostname(hostname_arg), port(port_arg), uuid(uuid_arg),
     status(status_arg),
@@ -40,8 +48,9 @@ Group_member_info(char* hostname_arg,
     gtid_assignment_block_size(gtid_assignment_block_size_arg),
     unreachable(false),
     role(role_arg),
-    configuration_flags(0), conflict_detection_enable(false),
-    member_weight(member_weight_arg)
+    configuration_flags(0), conflict_detection_enable(!in_single_primary_mode),
+    member_weight(member_weight_arg),
+    lower_case_table_names(lower_case_table_names_arg)
 {
   gcs_member_id= new Gcs_member_identifier(gcs_member_id_arg);
   member_version= new Member_version(member_version_arg.get_version());
@@ -69,7 +78,8 @@ Group_member_info::Group_member_info(Group_member_info& other)
     role(other.get_role()),
     configuration_flags(other.get_configuration_flags()),
     conflict_detection_enable(other.is_conflict_detection_enabled()),
-    member_weight(other.get_member_weight())
+    member_weight(other.get_member_weight()),
+    lower_case_table_names(other.get_lower_case_table_names())
 {
   gcs_member_id= new Gcs_member_identifier(other.get_gcs_member_id()
                                                .get_member_id());
@@ -80,7 +90,8 @@ Group_member_info::Group_member_info(Group_member_info& other)
 Group_member_info::Group_member_info(const uchar* data, uint64 len)
   : Plugin_gcs_message(CT_MEMBER_INFO_MESSAGE),
     gcs_member_id(NULL), member_version(NULL),
-    unreachable(false)
+    unreachable(false),
+    lower_case_table_names(DEFAULT_NOT_RECEIVED_LOWER_CASE_TABLE_NAMES)
 {
   decode(data, len);
 }
@@ -154,6 +165,13 @@ Group_member_info::encode_payload(std::vector<unsigned char>* buffer) const
   encode_payload_item_int2(buffer, PIT_MEMBER_WEIGHT,
                            member_weight_aux);
 
+  uint16 lower_case_table_names_aux= static_cast <uint16> (lower_case_table_names);
+#ifndef NDEBUG
+  if (lower_case_table_names != SKIP_ENCODING_LOWER_CASE_TABLE_NAMES)
+#endif
+  encode_payload_item_int2(buffer, PIT_LOWER_CASE_TABLE_NAME,
+                           lower_case_table_names_aux);
+
   DBUG_VOID_RETURN;
 }
 
@@ -267,6 +285,15 @@ Group_member_info::decode_payload(const unsigned char* buffer,
           member_weight= (uint)member_weight_aux;
         }
         break;
+
+      case PIT_LOWER_CASE_TABLE_NAME:
+        if (slider + payload_item_length <= end)
+        {
+          uint16 lower_case_table_names_aux= uint2korr(slider);
+          slider += payload_item_length;
+          lower_case_table_names= static_cast <uint>(lower_case_table_names_aux);
+        }
+        break;
     }
   }
 
@@ -365,6 +392,12 @@ Group_member_info::get_configuration_flags()
   return configuration_flags;
 }
 
+uint
+Group_member_info::get_lower_case_table_names() const
+{
+  return lower_case_table_names;
+}
+
 bool Group_member_info::in_primary_mode()
 {
   return get_configuration_flags() & CNF_SINGLE_PRIMARY_MODE_F;
@@ -623,7 +656,7 @@ get_group_member_info_by_member_id(Gcs_member_identifier idx)
   {
     if((*it).second->get_gcs_member_id() == idx)
     {
-      member= (*it).second;
+      member= new Group_member_info(*(*it).second);
       break;
     }
   }
@@ -708,6 +741,34 @@ update_member_status(const string& uuid,
   mysql_mutex_unlock(&update_lock);
 }
 
+void
+Group_member_info_manager::
+set_member_unreachable(const std::string &uuid)
+{
+  mysql_mutex_lock(&update_lock);
+
+  map<string, Group_member_info*>::iterator it = members->find(uuid);
+  if (it != members->end()) {
+    (*it).second->set_unreachable();
+  }
+
+  mysql_mutex_unlock(&update_lock);
+}
+
+void
+Group_member_info_manager::
+set_member_reachable(const std::string &uuid)
+{
+  mysql_mutex_lock(&update_lock);
+
+  map<string, Group_member_info*>::iterator it = members->find(uuid);
+  if (it != members->end()) {
+    (*it).second->set_reachable();
+  }
+
+  mysql_mutex_unlock(&update_lock);
+}
+
 void
 Group_member_info_manager::
 update_gtid_sets(const string& uuid,
@@ -818,7 +879,7 @@ get_primary_member_uuid(std::string &primary_member_uuid)
     Group_member_info* info= (*it).second;
     if (info->get_role() == Group_member_info::MEMBER_ROLE_PRIMARY)
     {
-      DBUG_ASSERT(primary_member_uuid.empty());
+      assert(primary_member_uuid.empty());
       primary_member_uuid =info->get_uuid();
     }
   }
@@ -854,16 +915,17 @@ Group_member_info_manager::get_string_current_view_active_hosts() const
 {
   std::stringstream hosts_string;
   map<string, Group_member_info*>::iterator all_members_it= members->begin();
+  bool first_entry = true;
 
   while (all_members_it != members->end())
   {
     Group_member_info* member_info= (*all_members_it).second;
-    if (member_info->get_recovery_status() == Group_member_info::MEMBER_ONLINE ||
-        member_info->get_recovery_status() == Group_member_info::MEMBER_IN_RECOVERY)
-      hosts_string << member_info->get_hostname() << ":" << member_info->get_port();
+    if (!first_entry)
+      hosts_string << ", ";
+    else
+      first_entry = false;
+    hosts_string << member_info->get_hostname() << ":" << member_info->get_port();
     all_members_it++;
-    if (all_members_it != members->end())
-      hosts_string<<", ";
   }
 
   return hosts_string.str();
diff --git a/rapid/plugin/group_replication/src/member_version.cc b/rapid/plugin/group_replication/src/member_version.cc
index 4408523e2068..09b40dc416c1 100644
--- a/rapid/plugin/group_replication/src/member_version.cc
+++ b/rapid/plugin/group_replication/src/member_version.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/observer_server_actions.cc b/rapid/plugin/group_replication/src/observer_server_actions.cc
index 98c581e6f7df..21c1517745a4 100644
--- a/rapid/plugin/group_replication/src/observer_server_actions.cc
+++ b/rapid/plugin/group_replication/src/observer_server_actions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/observer_server_channels.cc b/rapid/plugin/group_replication/src/observer_server_channels.cc
index d19d28b36315..3bd2577bd35e 100644
--- a/rapid/plugin/group_replication/src/observer_server_channels.cc
+++ b/rapid/plugin/group_replication/src/observer_server_channels.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/observer_server_state.cc b/rapid/plugin/group_replication/src/observer_server_state.cc
index 422a94cf7ec0..623b3a57bf25 100644
--- a/rapid/plugin/group_replication/src/observer_server_state.cc
+++ b/rapid/plugin/group_replication/src/observer_server_state.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -54,8 +61,7 @@ int group_replication_before_server_shutdown(Server_state_param *param)
 int group_replication_after_server_shutdown(Server_state_param *param)
 {
   server_shutdown_status= true;
-  if (plugin_is_group_replication_running())
-    group_replication_stop();
+  plugin_group_replication_stop();
 
   return 0;
 }
diff --git a/rapid/plugin/group_replication/src/observer_trans.cc b/rapid/plugin/group_replication/src/observer_trans.cc
index 6282541f175e..e15d8afe3f30 100644
--- a/rapid/plugin/group_replication/src/observer_trans.cc
+++ b/rapid/plugin/group_replication/src/observer_trans.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -258,7 +265,7 @@ int group_replication_trans_before_commit(Trans_param *param)
   DBUG_EXECUTE_IF("group_replication_before_commit_hook_wait",
                   {
                     const char act[]= "now wait_for continue_commit";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
 
   /*
@@ -268,9 +275,12 @@ int group_replication_trans_before_commit(Trans_param *param)
     lock below.
   */
   Replication_thread_api channel_interface;
-  if (channel_interface.is_own_event_applier(param->thread_id,
-                                             "group_replication_applier"))
-  {
+  if (GR_APPLIER_CHANNEL == param->rpl_channel_type) {
+    // If plugin is not initialized, there is nothing to do.
+    if (NULL == local_member_info) {
+      DBUG_RETURN(0);
+    }
+
     // If plugin is stopping, there is no point in update the statistics.
     bool fail_to_lock= shared_plugin_stop_lock->try_grab_read_lock();
     if (!fail_to_lock)
@@ -287,13 +297,14 @@ int group_replication_trans_before_commit(Trans_param *param)
 
     DBUG_RETURN(0);
   }
-  if (channel_interface.is_own_event_applier(param->thread_id,
-                                             "group_replication_recovery"))
-  {
+  if (GR_RECOVERY_CHANNEL == param->rpl_channel_type) {
     DBUG_RETURN(0);
   }
 
-  shared_plugin_stop_lock->grab_read_lock();
+  if (shared_plugin_stop_lock->try_grab_read_lock()) {
+    /* If plugin is stopping, rollback the transaction immediatly. */
+    DBUG_RETURN(1);
+  }
 
   if (is_plugin_waiting_to_set_server_read_mode())
   {
@@ -310,7 +321,7 @@ int group_replication_trans_before_commit(Trans_param *param)
     DBUG_RETURN(0);
   }
 
-  DBUG_ASSERT(applier_module != NULL && recovery_module != NULL);
+  assert(applier_module != NULL && recovery_module != NULL);
   Group_member_info::Group_member_status member_status=
       local_member_info->get_recovery_status();
 
@@ -406,7 +417,7 @@ int group_replication_trans_before_commit(Trans_param *param)
   applier_module->get_pipeline_stats_member_collector()
       ->increment_transactions_local();
 
-  DBUG_ASSERT(cache_log->type == WRITE_CACHE);
+  assert(cache_log->type == WRITE_CACHE);
   DBUG_PRINT("cache_log", ("thread_id: %u, trx_cache_log_position: %llu,"
                            " stmt_cache_log_position: %llu",
                            param->thread_id, trx_cache_log_position,
@@ -490,7 +501,7 @@ int group_replication_trans_before_commit(Trans_param *param)
         /* purecov: end */
       }
       cleanup_transaction_write_set(write_set);
-      DBUG_ASSERT(is_gtid_specified || (tcle->get_write_set()->size() > 0));
+      assert(is_gtid_specified || (tcle->get_write_set()->size() > 0));
     }
     else
     {
@@ -559,7 +570,7 @@ int group_replication_trans_before_commit(Trans_param *param)
   }
 
 
-  DBUG_ASSERT(certification_latch != NULL);
+  assert(certification_latch != NULL);
   if (certification_latch->registerTicket(param->thread_id))
   {
     /* purecov: begin inspected */
@@ -571,17 +582,17 @@ int group_replication_trans_before_commit(Trans_param *param)
     /* purecov: end */
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("test_basic_CRUD_operations_sql_service_interface",
                   {
                     DBUG_SET("-d,test_basic_CRUD_operations_sql_service_interface");
-                    DBUG_ASSERT(!sql_command_check());
+                    assert(!sql_command_check());
                   };);
 
   DBUG_EXECUTE_IF("group_replication_before_message_broadcast",
                   {
                     const char act[]= "now wait_for waiting";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
 #endif
 
@@ -615,7 +626,7 @@ int group_replication_trans_before_commit(Trans_param *param)
 
   shared_plugin_stop_lock->release_read_lock();
 
-  DBUG_ASSERT(certification_latch != NULL);
+  assert(certification_latch != NULL);
   if (certification_latch->waitTicket(param->thread_id))
   {
     /* purecov: begin inspected */
@@ -647,7 +658,7 @@ int group_replication_trans_before_commit(Trans_param *param)
     if (error == pre_wait_error)
       shared_plugin_stop_lock->release_read_lock();
 
-    DBUG_ASSERT(certification_latch != NULL);
+    assert(certification_latch != NULL);
     // Release and remove certification latch ticket.
     certification_latch->releaseTicket(param->thread_id);
     certification_latch->waitTicket(param->thread_id);
@@ -656,7 +667,7 @@ int group_replication_trans_before_commit(Trans_param *param)
   DBUG_EXECUTE_IF("group_replication_after_before_commit_hook",
                  {
                     const char act[]= "now wait_for signal.commit_continue";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                  });
   DBUG_RETURN(error);
 }
@@ -815,7 +826,7 @@ bool
 Transaction_Message::append_cache(IO_CACHE *src)
 {
   DBUG_ENTER("append_cache");
-  DBUG_ASSERT(src->type == READ_CACHE);
+  assert(src->type == READ_CACHE);
 
   uchar *buffer= src->read_pos;
   size_t length= my_b_fill(src);
@@ -825,15 +836,23 @@ Transaction_Message::append_cache(IO_CACHE *src)
     length= my_b_bytes_in_cache(src);
   }
 
-  while (length > 0 && !src->error)
+  try
   {
-    data.insert(data.end(),
-                buffer,
-                buffer + length);
+    while (length > 0 && !src->error)
+    {
+      data.insert(data.end(),
+                  buffer,
+                  buffer + length);
 
-    src->read_pos= src->read_end;
-    length= my_b_fill(src);
-    buffer= src->read_pos;
+      src->read_pos= src->read_end;
+      length= my_b_fill(src);
+      buffer= src->read_pos;
+    }
+  }
+  catch (const std::bad_alloc &)
+  {
+    log_message(MY_ERROR_LEVEL, ER_DEFAULT(ER_OUT_OF_RESOURCES));
+    DBUG_RETURN(true);
   }
 
   DBUG_RETURN(src->error ? true : false);
diff --git a/rapid/plugin/group_replication/src/pipeline_factory.cc b/rapid/plugin/group_replication/src/pipeline_factory.cc
index 3bf335cf3abd..37a4e9f3e8a8 100644
--- a/rapid/plugin/group_replication/src/pipeline_factory.cc
+++ b/rapid/plugin/group_replication/src/pipeline_factory.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/pipeline_stats.cc b/rapid/plugin/group_replication/src/pipeline_stats.cc
index 0dbfccbeb7c6..746fce123016 100644
--- a/rapid/plugin/group_replication/src/pipeline_stats.cc
+++ b/rapid/plugin/group_replication/src/pipeline_stats.cc
@@ -1,18 +1,26 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
+#include <mysql/group_replication_priv.h>
 #include "pipeline_stats.h"
 #include "plugin_server_include.h"
 #include "plugin_log.h"
@@ -225,7 +233,7 @@ void
 Pipeline_stats_member_collector::increment_transactions_waiting_apply()
 {
   mysql_mutex_lock(&m_transactions_waiting_apply_lock);
-  DBUG_ASSERT(my_atomic_load32(&m_transactions_waiting_apply) >= 0);
+  assert(my_atomic_load32(&m_transactions_waiting_apply) >= 0);
   my_atomic_add32(&m_transactions_waiting_apply, 1);
   mysql_mutex_unlock(&m_transactions_waiting_apply_lock);
 }
@@ -237,7 +245,7 @@ Pipeline_stats_member_collector::decrement_transactions_waiting_apply()
   mysql_mutex_lock(&m_transactions_waiting_apply_lock);
   if (m_transactions_waiting_apply > 0)
     my_atomic_add32(&m_transactions_waiting_apply, -1);
-  DBUG_ASSERT(my_atomic_load32(&m_transactions_waiting_apply) >= 0);
+  assert(my_atomic_load32(&m_transactions_waiting_apply) >= 0);
   mysql_mutex_unlock(&m_transactions_waiting_apply_lock);
 }
 
@@ -262,6 +270,25 @@ Pipeline_stats_member_collector::increment_transactions_local()
   my_atomic_add64(&m_transactions_local, 1);
 }
 
+int32 Pipeline_stats_member_collector::get_transactions_waiting_apply()
+{
+  return my_atomic_load32(&m_transactions_waiting_apply);
+}
+
+int64 Pipeline_stats_member_collector::get_transactions_certified()
+{
+  return my_atomic_load64(&m_transactions_certified);
+}
+
+int64 Pipeline_stats_member_collector::get_transactions_applied()
+{
+  return my_atomic_load64(&m_transactions_applied);
+}
+
+int64 Pipeline_stats_member_collector::get_transactions_local()
+{
+  return my_atomic_load64(&m_transactions_local);
+}
 
 void
 Pipeline_stats_member_collector::send_stats_member_message()
@@ -299,6 +326,10 @@ Pipeline_member_stats::Pipeline_member_stats()
     m_delta_transactions_applied(0),
     m_transactions_local(0),
     m_delta_transactions_local(0),
+    m_transactions_negative_certified(0),
+    m_transactions_rows_validating(0),
+    m_transactions_committed_all_members(),
+    m_transaction_last_conflict_free(),
     m_stamp(0)
 {}
 
@@ -312,9 +343,31 @@ Pipeline_member_stats::Pipeline_member_stats(Pipeline_stats_member_message &msg)
     m_delta_transactions_applied(0),
     m_transactions_local(msg.get_transactions_local()),
     m_delta_transactions_local(0),
+    m_transactions_negative_certified(0),
+    m_transactions_rows_validating(0),
+    m_transactions_committed_all_members(),
+    m_transaction_last_conflict_free(),
     m_stamp(0)
 {}
 
+Pipeline_member_stats::Pipeline_member_stats(
+    Pipeline_stats_member_collector *pipeline_stats, ulonglong applier_queue,
+    ulonglong negative_certified, ulonglong certification_size)
+  : m_transactions_committed_all_members(),
+    m_transaction_last_conflict_free()
+{
+  m_transactions_waiting_certification= applier_queue;
+  m_transactions_waiting_apply= pipeline_stats->get_transactions_waiting_apply();
+  m_transactions_certified= pipeline_stats->get_transactions_certified();
+  m_delta_transactions_certified= 0;
+  m_transactions_applied= pipeline_stats->get_transactions_applied();
+  m_delta_transactions_applied= 0;
+  m_transactions_local= pipeline_stats->get_transactions_local();
+  m_delta_transactions_local= 0;
+  m_transactions_negative_certified= negative_certified;
+  m_transactions_rows_validating= certification_size;
+  m_stamp= 0;
+}
 
 Pipeline_member_stats::~Pipeline_member_stats()
 {}
@@ -391,6 +444,42 @@ Pipeline_member_stats::get_delta_transactions_local()
   return m_delta_transactions_local;
 }
 
+int64 Pipeline_member_stats::get_transactions_negative_certified()
+{
+  return m_transactions_negative_certified;
+}
+
+int64 Pipeline_member_stats::get_transactions_rows_validating()
+{
+  return m_transactions_rows_validating;
+}
+
+void Pipeline_member_stats::get_transaction_committed_all_members(std::string &value)
+{
+  value.assign(m_transactions_committed_all_members);
+}
+
+void Pipeline_member_stats::set_transaction_committed_all_members(char *str, size_t len)
+{
+  m_transactions_committed_all_members.assign(str, len);
+}
+
+void Pipeline_member_stats::get_transaction_last_conflict_free(
+    std::string &value)
+{
+  value.assign(m_transaction_last_conflict_free);
+}
+
+void Pipeline_member_stats::set_transaction_last_conflict_free(
+    std::string &value)
+{
+  m_transaction_last_conflict_free.assign(value);
+}
+
+int64 Pipeline_member_stats::get_transactions_certified()
+{
+  return m_transactions_certified;
+}
 
 uint64
 Pipeline_member_stats::get_stamp()
@@ -399,7 +488,7 @@ Pipeline_member_stats::get_stamp()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void
 Pipeline_member_stats::debug(const char *member, int64 quota_size,
                              int64 quota_used)
@@ -537,7 +626,7 @@ Flow_control_module::flow_control_step()
       break;
 
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
 }
 
@@ -574,7 +663,7 @@ Flow_control_module::handle_stats_data(const uchar *data,
   if (it->second.is_flow_control_needed())
   {
     my_atomic_add32(&m_holds_in_period, 1);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     it->second.debug(it->first.c_str(),
                      my_atomic_load64(&m_quota_size),
                      my_atomic_load64(&m_quota_used));
diff --git a/rapid/plugin/group_replication/src/plugin.cc b/rapid/plugin/group_replication/src/plugin.cc
index c6e3079522f5..122d064bae26 100644
--- a/rapid/plugin/group_replication/src/plugin.cc
+++ b/rapid/plugin/group_replication/src/plugin.cc
@@ -1,19 +1,27 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #include <sstream>
+#include <mysql/service_rpl_transaction_write_set.h>
 
 #include "observer_server_actions.h"
 #include "observer_server_state.h"
@@ -31,12 +39,13 @@ unsigned int plugin_version= 0;
 
 //The plugin running flag and lock
 static mysql_mutex_t plugin_running_mutex;
-static bool group_replication_running;
+int32 group_replication_running= 0;
+int32 group_replication_stopping= 0;
 bool wait_on_engine_initialization= false;
 bool server_shutdown_status= false;
 bool plugin_is_auto_starting= false;
-static bool plugin_is_waiting_to_set_server_read_mode= false;
-static bool plugin_is_being_uninstalled= false;
+bool plugin_is_waiting_to_set_server_read_mode= false;
+bool plugin_is_being_uninstalled= false;
 
 /* Plugin modules */
 //The plugin applier
@@ -150,12 +159,21 @@ ulong recovery_reconnect_interval_var= 0;
 /* Write set extraction algorithm*/
 int write_set_extraction_algorithm= HASH_ALGORITHM_OFF;
 
+/* Lower case table name */
+uint gr_lower_case_table_names= 0;
+
 /* Generic components variables */
 ulong components_stop_timeout_var= LONG_TIMEOUT;
 
 /* The timeout before going to error when majority becomes unreachable */
 ulong timeout_on_unreachable_var= 0;
 
+/*
+ Exit state action that is executed when a server involuntarily leaves the
+ group.
+*/
+ulong exit_state_action_var;
+
 /**
   The default value for auto_increment_increment is choosen taking into
   account the maximum usable values for each possible auto_increment_increment
@@ -175,7 +193,7 @@ ulong compression_threshold_var= DEFAULT_COMPRESSION_THRESHOLD;
 /* GTID assignment block size options */
 #define DEFAULT_GTID_ASSIGNMENT_BLOCK_SIZE 1000000
 #define MIN_GTID_ASSIGNMENT_BLOCK_SIZE 1
-#define MAX_GTID_ASSIGNMENT_BLOCK_SIZE MAX_GNO
+#define MAX_GTID_ASSIGNMENT_BLOCK_SIZE GNO_END
 ulonglong gtid_assignment_block_size_var= DEFAULT_GTID_ASSIGNMENT_BLOCK_SIZE;
 
 /* Flow control options */
@@ -187,10 +205,11 @@ int flow_control_certifier_threshold_var= DEFAULT_FLOW_CONTROL_THRESHOLD;
 int flow_control_applier_threshold_var= DEFAULT_FLOW_CONTROL_THRESHOLD;
 
 /* Transaction size limits */
-#define DEFAULT_TRANSACTION_SIZE_LIMIT 0
+#define DEFAULT_TRANSACTION_SIZE_LIMIT 150000000
 #define MAX_TRANSACTION_SIZE_LIMIT 2147483647
 #define MIN_TRANSACTION_SIZE_LIMIT 0
-ulong transaction_size_limit_var= DEFAULT_TRANSACTION_SIZE_LIMIT;
+ulong transaction_size_limit_base_var= DEFAULT_TRANSACTION_SIZE_LIMIT;
+int64 transaction_size_limit_var;
 
 /* Member Weight limits */
 #define DEFAULT_MEMBER_WEIGHT 50
@@ -232,7 +251,6 @@ int configure_and_start_applier_module();
 void initialize_asynchronous_channels_observer();
 void initialize_group_partition_handler();
 int start_group_communication();
-void declare_plugin_running();
 int leave_group();
 int terminate_plugin_modules(bool flag_stop_async_channel= false);
 int terminate_applier_module();
@@ -254,7 +272,12 @@ mysql_mutex_t* get_plugin_running_lock()
 
 bool plugin_is_group_replication_running()
 {
-  return group_replication_running;
+  return my_atomic_load32(&group_replication_running);
+}
+
+bool get_plugin_is_stopping()
+{
+  return my_atomic_load32(&group_replication_stopping);
 }
 
 int plugin_group_replication_set_retrieved_certification_info(void* info)
@@ -282,12 +305,9 @@ static void option_deprecation_warning(MYSQL_THD thd, const char* name)
                         ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
                         name);
   }
-  else
-  {
-    log_message(MY_WARNING_LEVEL,
-                ER_DEFAULT(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                name);
-  }
+  log_message(MY_WARNING_LEVEL,
+              ER_DEFAULT(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+              name);
 }
 
 /*
@@ -349,6 +369,12 @@ int plugin_group_replication_start()
 
   Mutex_autolock auto_lock_mutex(&plugin_running_mutex);
 
+  DBUG_EXECUTE_IF("group_replication_wait_on_start",
+                 {
+                   const char act[]= "now signal signal.start_waiting wait_for signal.start_continue";
+                   assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                 });
+
   if (plugin_is_group_replication_running())
     DBUG_RETURN(GROUP_REPLICATION_ALREADY_RUNNING);
   if (check_if_server_properly_configured())
@@ -434,6 +460,7 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
   //Avoid unnecessary operations
   bool enabled_super_read_only= false;
   bool read_only_mode= false, super_read_only_mode=false;
+  bool write_set_limits_set = false;
 
   st_server_ssl_variables server_ssl_variables=
     {false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
@@ -487,6 +514,10 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
   if (delayed_init_thd)
     delayed_init_thd->signal_read_mode_ready();
 
+  require_full_write_set(1);
+  set_write_set_memory_size_limit(get_transaction_size_limit());
+  write_set_limits_set = true;
+
   get_server_parameters(&hostname, &port, &uuid, &server_version,
                         &server_ssl_variables);
 
@@ -514,15 +545,19 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
   }
 
   configure_compatibility_manager();
-  DBUG_EXECUTE_IF("group_replication_compatibility_rule_error",
+  DBUG_EXECUTE_IF("group_replication_compatibility_rule_error_major",
+                  {
+                    Member_version other_version= plugin_version + (0x010000);
+                    Member_version current_version= plugin_version;
+                    compatibility_mgr->add_incompatibility(current_version,
+                                                           other_version);
+                  };);
+  DBUG_EXECUTE_IF("group_replication_compatibility_rule_error_minor",
                   {
-                    //Mark this member as being another version
-                    Member_version other_version= plugin_version + (0x000001);
-                    compatibility_mgr->set_local_version(other_version);
-                    Member_version local_member_version(plugin_version);
-                    //Add an incomparability with the real plugin version
-                    compatibility_mgr->add_incompatibility(other_version,
-                                                           local_member_version);
+                    Member_version other_version= plugin_version;
+                    Member_version current_version= plugin_version + (0x000100);
+                    compatibility_mgr->add_incompatibility(current_version,
+                                                           other_version);
                   };);
   DBUG_EXECUTE_IF("group_replication_compatibility_higher_minor_version",
                   {
@@ -559,8 +594,8 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
   DBUG_EXECUTE_IF("group_replication_before_joining_the_group",
                   {
                     const char act[]= "now wait_for signal.continue_group_join";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   });
 
   if ((error= start_group_communication()))
@@ -581,7 +616,8 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
     error= view_change_notifier->get_error();
     goto err;
   }
-  group_replication_running= true;
+  my_atomic_store32(&group_replication_running, 1);
+  my_atomic_store32(&group_replication_stopping, 0);
   log_primary_member_details();
 
 err:
@@ -593,12 +629,19 @@ int initialize_plugin_and_join(enum_plugin_con_isolation sql_api_isolation,
     leave_group();
     terminate_plugin_modules();
 
+    if (write_set_limits_set) {
+      // Remove server constraints on write set collection
+      update_write_set_memory_size_limit(0);
+      require_full_write_set(0);
+    }
+
     if (!server_shutdown_status && server_engine_initialized()
         && enabled_super_read_only)
     {
       set_read_mode_state(sql_command_interface, read_only_mode,
                           super_read_only_mode);
     }
+
     if (certification_latch != NULL)
     {
       delete certification_latch; /* purecov: inspected */
@@ -672,7 +715,8 @@ int configure_group_member_manager(char *hostname, char *uuid,
                                            Group_member_info::MEMBER_ROLE_SECONDARY,
                                            single_primary_mode_var,
                                            enforce_update_everywhere_checks_var,
-                                           member_weight_var);
+                                           member_weight_var,
+                                           gr_lower_case_table_names);
 
   //Create the membership info visible for the group
   delete group_member_mgr;
@@ -799,8 +843,6 @@ int leave_group()
   // Destroy handlers and notifiers
   delete events_handler;
   events_handler= NULL;
-  delete view_change_notifier;
-  view_change_notifier= NULL;
 
   return 0;
 }
@@ -811,6 +853,12 @@ int plugin_group_replication_stop()
 
   Mutex_autolock auto_lock_mutex(&plugin_running_mutex);
 
+  DBUG_EXECUTE_IF("group_replication_wait_on_stop",
+                 {
+                   const char act[]= "now signal signal.stop_waiting wait_for signal.stop_continue";
+                   assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                 });
+
   /*
     We delete the delayed initialization object here because:
 
@@ -831,17 +879,26 @@ int plugin_group_replication_stop()
     delayed_initialization_thread= NULL;
   }
 
-  shared_plugin_stop_lock->grab_write_lock();
   if (!plugin_is_group_replication_running())
   {
-    shared_plugin_stop_lock->release_write_lock();
     DBUG_RETURN(0);
   }
+
+  my_atomic_store32(&group_replication_stopping, 1);
+
+  shared_plugin_stop_lock->grab_write_lock();
   log_message(MY_INFORMATION_LEVEL,
               "Plugin 'group_replication' is stopping.");
 
   plugin_is_waiting_to_set_server_read_mode= true;
 
+  DBUG_EXECUTE_IF("group_replication_hold_stop_before_leave_the_group", {
+    const char act[] =
+        "now signal signal.stopping_before_leave_the_group "
+        "wait_for signal.resume_stop_before_leave_the_group";
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+  });
+
   // wait for all transactions waiting for certification
   bool timeout=
       certification_latch->block_until_empty(TRANSACTION_KILL_TIMEOUT);
@@ -856,7 +913,7 @@ int plugin_group_replication_stop()
 
   int error= terminate_plugin_modules(true);
 
-  group_replication_running= false;
+  my_atomic_store32(&group_replication_running, 0);
   shared_plugin_stop_lock->release_write_lock();
   log_message(MY_INFORMATION_LEVEL,
               "Plugin 'group_replication' has been stopped.");
@@ -876,6 +933,10 @@ int plugin_group_replication_stop()
     plugin_is_waiting_to_set_server_read_mode= false;
   }
 
+  // Remove server constraints on write set collection
+  update_write_set_memory_size_limit(0);
+  require_full_write_set(0);
+
   DBUG_RETURN(error);
 }
 
@@ -893,7 +954,7 @@ int terminate_plugin_modules(bool flag_stop_async_channel)
   DBUG_EXECUTE_IF("group_replication_after_recovery_module_terminated",
                  {
                    const char act[]= "now wait_for signal.termination_continue";
-                   DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                   assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                  });
 
   /*
@@ -958,6 +1019,12 @@ int terminate_plugin_modules(bool flag_stop_async_channel)
 
 int plugin_group_replication_init(MYSQL_PLUGIN plugin_info)
 {
+  // Reset plugin local variables.
+  my_atomic_store32(&group_replication_running, 0);
+  my_atomic_store32(&group_replication_stopping, 0);
+  plugin_is_being_uninstalled= false;
+  plugin_is_waiting_to_set_server_read_mode= false;
+
   // Register all PSI keys at the time plugin init
 #ifdef HAVE_PSI_INTERFACE
   register_all_group_replication_psi_keys();
@@ -982,7 +1049,7 @@ int plugin_group_replication_init(MYSQL_PLUGIN plugin_info)
 
   plugin_info_ptr= plugin_info;
 
-  if (group_replication_init(group_replication_plugin_name))
+  if (group_replication_init())
   {
     /* purecov: begin inspected */
     log_message(MY_ERROR_LEVEL,
@@ -1026,13 +1093,17 @@ int plugin_group_replication_init(MYSQL_PLUGIN plugin_info)
   //Initialize channel observation and auto increment handlers before start
   auto_increment_handler= new Plugin_group_replication_auto_increment();
   channel_observation_manager= new Channel_observation_manager(plugin_info);
+  view_change_notifier= new Plugin_gcs_view_modification_notifier();
   gcs_module= new Gcs_operations();
 
   //Initialize the compatibility module before starting
   init_compatibility_manager();
 
+  // Set the atomic var to the value of the base plugin variable
+  transaction_size_limit_var = transaction_size_limit_base_var;
+
   plugin_is_auto_starting= start_group_replication_at_boot_var;
-  if (start_group_replication_at_boot_var && group_replication_start())
+  if (start_group_replication_at_boot_var && plugin_group_replication_start())
   {
     log_message(MY_ERROR_LEVEL,
                 "Unable to start Group Replication on boot");
@@ -1048,12 +1119,12 @@ int plugin_group_replication_deinit(void *p)
     return 0;
 
   plugin_is_being_uninstalled= true;
+  my_atomic_store32(&group_replication_stopping, 1);
   int observer_unregister_error= 0;
 
-  //plugin_group_replication_stop will be called from this method stack
-  if (group_replication_cleanup())
+  if (plugin_group_replication_stop())
     log_message(MY_ERROR_LEVEL,
-                "Failure when cleaning Group Replication server state");
+                "Failure when stopping Group Replication on plugin uninstall");
 
   if (group_member_mgr != NULL)
   {
@@ -1073,12 +1144,6 @@ int plugin_group_replication_deinit(void *p)
     compatibility_mgr= NULL;
   }
 
-  if (channel_observation_manager != NULL)
-  {
-    delete channel_observation_manager;
-    channel_observation_manager= NULL;
-  }
-
   if (unregister_server_state_observer(&server_state_observer, p))
   {
     log_message(MY_ERROR_LEVEL,
@@ -1105,9 +1170,18 @@ int plugin_group_replication_deinit(void *p)
                 "All Group Replication server observers"
                 " have been successfully unregistered");
 
+  if (channel_observation_manager != NULL)
+  {
+    delete channel_observation_manager;
+    channel_observation_manager= NULL;
+  }
+
   delete gcs_module;
   gcs_module= NULL;
 
+  delete view_change_notifier;
+  view_change_notifier= NULL;
+
   if(auto_increment_handler != NULL)
   {
     delete auto_increment_handler;
@@ -1155,11 +1229,6 @@ static bool init_group_sidno()
   DBUG_RETURN(false);
 }
 
-void declare_plugin_running()
-{
-  group_replication_running= true;
-}
-
 int configure_and_start_applier_module()
 {
   DBUG_ENTER("configure_and_start_applier_module");
@@ -1315,13 +1384,10 @@ int configure_group_communication(st_server_ssl_variables *ssl_variables)
       gcs_module_parameters.add_parameter("cipher", ssl_cipher);
       gcs_module_parameters.add_parameter("tls_version", tls_version);
 
-#if !defined(HAVE_YASSL)
-      // YaSSL does not support CRL.
       if (!ssl_crl.empty())
         gcs_module_parameters.add_parameter("crl_file", ssl_crl); /* purecov: inspected */
       if (!ssl_crlpath.empty())
         gcs_module_parameters.add_parameter("crl_path", ssl_crlpath); /* purecov: inspected */
-#endif
 
       log_message(MY_INFORMATION_LEVEL,
                   "Group communication SSL configuration: "
@@ -1413,7 +1479,6 @@ int start_group_communication()
                                    get_server_id());
   }
 
-  view_change_notifier= new Plugin_gcs_view_modification_notifier();
   events_handler= new Plugin_gcs_events_handler(applier_module,
                                                 recovery_module,
                                                 view_change_notifier,
@@ -1531,7 +1596,9 @@ bool get_allow_local_disjoint_gtids_join()
 ulong get_transaction_size_limit()
 {
   DBUG_ENTER("get_transaction_size_limit");
-  DBUG_RETURN(transaction_size_limit_var);
+  assert(my_atomic_load64(&transaction_size_limit_var)>=0);
+  ulong limit = static_cast<ulong>(my_atomic_load64(&transaction_size_limit_var));
+  DBUG_RETURN(limit);
 }
 
 bool is_plugin_waiting_to_set_server_read_mode()
@@ -1563,7 +1630,7 @@ static int check_if_server_properly_configured()
   //Struct that holds startup and runtime requirements
   Trans_context_info startup_pre_reqs;
 
-  get_server_startup_prerequirements(startup_pre_reqs, true);
+  get_server_startup_prerequirements(startup_pre_reqs, !plugin_is_auto_starting);
 
   if(!startup_pre_reqs.binlog_enabled)
   {
@@ -1650,6 +1717,16 @@ static int check_if_server_properly_configured()
     DBUG_RETURN(1);
   }
 
+  gr_lower_case_table_names= startup_pre_reqs.lower_case_table_names;
+  assert (gr_lower_case_table_names <= 2);
+#ifndef NDEBUG
+  DBUG_EXECUTE_IF("group_replication_skip_encode_lower_case_table_names",
+                {
+                  gr_lower_case_table_names = SKIP_ENCODING_LOWER_CASE_TABLE_NAMES;
+                });
+#endif
+
+
   DBUG_RETURN(0);
 }
 
@@ -1868,7 +1945,7 @@ static void update_recovery_ssl_option(MYSQL_THD thd, SYS_VAR *var,
         recovery_module->set_recovery_ssl_crlpath(new_option_val);
       break;
     default:
-      DBUG_ASSERT(0); /* purecov: inspected */
+      assert(0); /* purecov: inspected */
   }
 
   DBUG_VOID_RETURN;
@@ -2075,11 +2152,11 @@ static int check_force_members(MYSQL_THD thd, SYS_VAR *var,
   force_members_running= true;
   mysql_mutex_unlock(&force_members_running_mutex);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("group_replication_wait_on_check_force_members",
                   {
                     const char act[]= "now wait_for waiting";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
 #endif
 
@@ -2312,6 +2389,20 @@ update_member_weight(MYSQL_THD, SYS_VAR*,
   DBUG_VOID_RETURN;
 }
 
+static void update_transaction_size_limit(MYSQL_THD, SYS_VAR *, void *var_ptr,
+                                          const void *save) {
+
+  ulong in_val = *static_cast<const ulong *>(save);
+  *static_cast<ulong *>(var_ptr) = in_val;
+  my_atomic_store64(&transaction_size_limit_var, in_val);
+
+  transaction_size_limit_var = in_val;
+
+  if (plugin_is_group_replication_running()) {
+    update_write_set_memory_size_limit(transaction_size_limit_var);
+  }
+}
+
 //Base plugin variables
 
 static MYSQL_SYSVAR_STR(
@@ -2739,11 +2830,11 @@ static MYSQL_SYSVAR_INT(
 
 static MYSQL_SYSVAR_ULONG(
   transaction_size_limit,              /* name */
-  transaction_size_limit_var,          /* var */
+  transaction_size_limit_base_var,          /* var */
   PLUGIN_VAR_OPCMDARG,                 /* optional var */
   "Specifies the limit of transaction size that can be transferred over network.",
   NULL,                                /* check func. */
-  NULL,                                /* update func. */
+  update_transaction_size_limit,       /* update func. */
   DEFAULT_TRANSACTION_SIZE_LIMIT,      /* default */
   MIN_TRANSACTION_SIZE_LIMIT,          /* min */
   MAX_TRANSACTION_SIZE_LIMIT,          /* max */
@@ -2778,6 +2869,22 @@ static MYSQL_SYSVAR_UINT(
   0                                    /* block */
 );
 
+const char *exit_state_actions[]= {"READ_ONLY", "ABORT_SERVER", (char *)0};
+TYPELIB exit_state_actions_typelib_t= {array_elements(exit_state_actions) - 1,
+                                       "exit_state_actions_typelib_t",
+                                       exit_state_actions, NULL};
+static MYSQL_SYSVAR_ENUM(exit_state_action,     /* name */
+                         exit_state_action_var, /* var */
+                         PLUGIN_VAR_OPCMDARG,   /* optional var */
+                         "The action that is taken when the server "
+                         "leaves the group. "
+                         "Possible values are READ_ONLY or "
+                         "ABORT_SERVER.",                /* values */
+                         NULL,                           /* check func. */
+                         NULL,                           /* update func. */
+                         EXIT_STATE_ACTION_READ_ONLY,    /* default */
+                         &exit_state_actions_typelib_t); /* type lib */
+
 static SYS_VAR* group_replication_system_vars[]= {
   MYSQL_SYSVAR(group_name),
   MYSQL_SYSVAR(start_on_boot),
@@ -2814,6 +2921,7 @@ static SYS_VAR* group_replication_system_vars[]= {
   MYSQL_SYSVAR(transaction_size_limit),
   MYSQL_SYSVAR(unreachable_majority_timeout),
   MYSQL_SYSVAR(member_weight),
+  MYSQL_SYSVAR(exit_state_action),
   NULL,
 };
 
diff --git a/rapid/plugin/group_replication/src/plugin_psi.cc b/rapid/plugin/group_replication/src/plugin_psi.cc
index b797783dced2..e46408615538 100644
--- a/rapid/plugin/group_replication/src/plugin_psi.cc
+++ b/rapid/plugin/group_replication/src/plugin_psi.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -75,8 +82,7 @@ PSI_thread_key key_GR_THD_applier_module_receiver,
 PSI_rwlock_key key_GR_RWLOCK_cert_stable_gtid_set,
                key_GR_RWLOCK_io_cache_unused_list,
                key_GR_RWLOCK_plugin_stop,
-               key_GR_RWLOCK_gcs_operations,
-               key_GR_RWLOCK_gcs_operations_finalize_ongoing;
+               key_GR_RWLOCK_gcs_operations;
 
 #ifdef HAVE_PSI_INTERFACE
 static PSI_mutex_info all_group_replication_psi_mutex_keys[]=
@@ -149,8 +155,7 @@ static PSI_rwlock_info all_group_replication_psi_rwlock_keys[]=
   {&key_GR_RWLOCK_cert_stable_gtid_set, "RWLOCK_certifier_stable_gtid_set", PSI_FLAG_GLOBAL},
   {&key_GR_RWLOCK_io_cache_unused_list , "RWLOCK_io_cache_unused_list", PSI_FLAG_GLOBAL},
   {&key_GR_RWLOCK_plugin_stop, "RWLOCK_plugin_stop", PSI_FLAG_GLOBAL},
-  {&key_GR_RWLOCK_gcs_operations, "RWLOCK_gcs_operations", PSI_FLAG_GLOBAL},
-  {&key_GR_RWLOCK_gcs_operations_finalize_ongoing, "RWLOCK_gcs_operations_finalize_ongoing", PSI_FLAG_GLOBAL}
+  {&key_GR_RWLOCK_gcs_operations, "RWLOCK_gcs_operations", PSI_FLAG_GLOBAL}
 };
 
 void register_group_replication_mutex_psi_keys(PSI_mutex_info mutexes[],
diff --git a/rapid/plugin/group_replication/src/plugin_utils.cc b/rapid/plugin/group_replication/src/plugin_utils.cc
index 0b6899a7737b..8ba26cdaba53 100644
--- a/rapid/plugin/group_replication/src/plugin_utils.cc
+++ b/rapid/plugin/group_replication/src/plugin_utils.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -86,3 +93,12 @@ void log_primary_member_details()
     }
   }
 }
+
+void abort_plugin_process(const char *message)
+{
+  log_message(MY_ERROR_LEVEL, "The plugin encountered a critical error and will abort: %s", message);
+#if !defined(NDEBUG)
+  DBUG_SUICIDE();
+#endif
+  abort();
+}
diff --git a/rapid/plugin/group_replication/src/ps_information.cc b/rapid/plugin/group_replication/src/ps_information.cc
index 03e20bd16725..13060336e739 100644
--- a/rapid/plugin/group_replication/src/ps_information.cc
+++ b/rapid/plugin/group_replication/src/ps_information.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -15,6 +22,7 @@
 
 #include <string>
 
+#include "plugin.h"
 #include "ps_information.h"
 
 using std::string;
@@ -131,44 +139,48 @@ bool get_group_member_stats(const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS
     delete view;
   }
 
-  Certification_handler *cert= NULL;
-  //Check if the group replication has started and a valid certifier exists
-  if(applier_module != NULL &&
-     (cert = applier_module->get_certification_handler()) != NULL)
+  DBUG_EXECUTE_IF("group_replication_get_group_member_stats",
   {
-    Certifier_interface *cert_module= cert->get_certifier();
-
-    callbacks.set_transactions_conflicts_detected(
-        callbacks.context, cert_module->get_negative_certified());
-    callbacks.set_transactions_certified(
-        callbacks.context,
-        cert_module->get_positive_certified() + cert_module->get_negative_certified());
-    callbacks.set_transactions_rows_in_validation(
-        callbacks.context, cert_module->get_certification_info_size());
-    callbacks.set_transactions_in_queue(
-        callbacks.context, applier_module->get_message_queue_size());
-
-    char *committed_transactions_buf= NULL;
-    size_t committed_transactions_buf_length= 0;
-    int get_group_stable_transactions_set_string_outcome=
-        cert_module->get_group_stable_transactions_set_string(&committed_transactions_buf,
-                                                              &committed_transactions_buf_length);
-    if (!get_group_stable_transactions_set_string_outcome &&
-        committed_transactions_buf_length > 0)
-    {
-      callbacks.set_transactions_committed(callbacks.context,
-                                           *committed_transactions_buf,
-                                           committed_transactions_buf_length);
-    }
-    my_free(committed_transactions_buf);
+    const char act[] =
+        "now signal signal.reached_get_group_member_stats "
+        "wait_for signal.resume_get_group_member_stats";
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+  });
 
-    std::string last_conflict_free_transaction;
-    cert_module->get_last_conflict_free_transaction(&last_conflict_free_transaction);
-    if (!last_conflict_free_transaction.empty())
+  //Check if the group replication has started and a valid certifier exists
+  if(!get_plugin_is_stopping() && applier_module != NULL)
+  {
+    Pipeline_member_stats *pipeline_stats= applier_module->get_local_pipeline_stats();
+    if (pipeline_stats != NULL)
     {
-      callbacks.set_last_conflict_free_transaction(callbacks.context,
-                                                   *last_conflict_free_transaction.c_str(),
-                                                   last_conflict_free_transaction.length());
+      std::string last_conflict_free_transaction;
+      pipeline_stats->get_transaction_last_conflict_free(
+         last_conflict_free_transaction);
+      callbacks.set_last_conflict_free_transaction(
+         callbacks.context, *last_conflict_free_transaction.c_str(),
+         last_conflict_free_transaction.length());
+
+      std::string transaction_committed_all_members;
+      pipeline_stats->get_transaction_committed_all_members(
+         transaction_committed_all_members);
+      callbacks.set_transactions_committed(
+         callbacks.context, *transaction_committed_all_members.c_str(),
+         transaction_committed_all_members.length());
+
+      /* certification related data */
+      callbacks.set_transactions_conflicts_detected(
+         callbacks.context,
+         pipeline_stats->get_transactions_negative_certified());
+      callbacks.set_transactions_certified(
+         callbacks.context, pipeline_stats->get_transactions_certified());
+      callbacks.set_transactions_rows_in_validation(
+         callbacks.context, pipeline_stats->get_transactions_rows_validating());
+      callbacks.set_transactions_in_queue(
+         callbacks.context,
+         pipeline_stats->get_transactions_waiting_certification());
+
+      /* clean-up */
+      delete pipeline_stats;
     }
   }
 
diff --git a/rapid/plugin/group_replication/src/read_mode_handler.cc b/rapid/plugin/group_replication/src/read_mode_handler.cc
index fe45067e0f1a..85124dfd40be 100644
--- a/rapid/plugin/group_replication/src/read_mode_handler.cc
+++ b/rapid/plugin/group_replication/src/read_mode_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -21,12 +28,12 @@ long enable_super_read_only_mode(Sql_service_command_interface *command_interfac
   DBUG_ENTER("set_super_read_only_mode");
   long error =0;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("group_replication_skip_read_mode", { DBUG_RETURN(0); });
   DBUG_EXECUTE_IF("group_replication_read_mode_error", { DBUG_RETURN(1); });
 #endif
 
-  DBUG_ASSERT(command_interface != NULL);
+  assert(command_interface != NULL);
 
   // Extract server values for the super read mode
   longlong server_super_read_only_query=
@@ -55,7 +62,7 @@ long disable_super_read_only_mode(Sql_service_command_interface *command_interfa
   DBUG_ENTER("reset_super_read_mode");
   long error =0;
 
-  DBUG_ASSERT(command_interface != NULL);
+  assert(command_interface != NULL);
 
   error = command_interface->reset_read_only();
 
@@ -95,7 +102,7 @@ long get_read_mode_state(Sql_service_command_interface *sql_command_interface,
 
   long error =0;
 
-  DBUG_ASSERT(sql_command_interface != NULL);
+  assert(sql_command_interface != NULL);
 
   // Extract server values for the read mode
   longlong server_read_only_query=
diff --git a/rapid/plugin/group_replication/src/recovery.cc b/rapid/plugin/group_replication/src/recovery.cc
index 5b1359d6f2e5..be0af1adc1a4 100644
--- a/rapid/plugin/group_replication/src/recovery.cc
+++ b/rapid/plugin/group_replication/src/recovery.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -145,7 +152,7 @@ Recovery_module::stop_recovery()
     */
     struct timespec abstime;
     set_timespec(&abstime, 2);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int error=
 #endif
     mysql_cond_timedwait(&run_cond, &run_lock, &abstime);
@@ -160,10 +167,10 @@ Recovery_module::stop_recovery()
       DBUG_RETURN(1);
     }
     /* purecov: inspected */
-    DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+    assert(error == ETIMEDOUT || error == 0);
   }
 
-  DBUG_ASSERT(!recovery_running);
+  assert(!recovery_running);
 
   mysql_mutex_unlock(&run_lock);
 
@@ -185,6 +192,12 @@ void Recovery_module::leave_group_on_recovery_failure()
   group_member_mgr->update_member_status(local_member_info->get_uuid(),
                                          Group_member_info::MEMBER_ERROR);
 
+  if (view_change_notifier != NULL &&
+      !view_change_notifier->is_view_modification_ongoing())
+  {
+    view_change_notifier->start_view_modification();
+  }
+
   Gcs_operations::enum_leave_state state= gcs_module->leave();
 
   int error= channel_stop_all(CHANNEL_APPLIER_THREAD|CHANNEL_RECEIVER_THREAD,
@@ -198,6 +211,7 @@ void Recovery_module::leave_group_on_recovery_failure()
   }
 
   std::stringstream ss;
+  bool has_error= true;
   plugin_log_level log_severity= MY_WARNING_LEVEL;
   switch (state)
   {
@@ -217,9 +231,27 @@ void Recovery_module::leave_group_on_recovery_failure()
       break;
       /* purecov: end */
     case Gcs_operations::NOW_LEAVING:
-      return;
+      has_error= false;
+      break;
+  }
+
+  if (has_error)
+    log_message(log_severity, ss.str().c_str());
+
+  if (view_change_notifier != NULL)
+  {
+    log_message(MY_INFORMATION_LEVEL, "Going to wait for view modification");
+    if (view_change_notifier->wait_for_view_modification())
+    {
+      log_message(MY_WARNING_LEVEL, "On shutdown there was a timeout receiving "
+                                    "a view change. This can lead to a possible"
+                                    " inconsistent state. Check the log for "
+                                    "more details");
+    }
   }
-  log_message(log_severity, ss.str().c_str());
+
+  if (exit_state_action_var == EXIT_STATE_ACTION_ABORT_SERVER)
+    abort_plugin_process("Fatal error during execution of Group Replication");
 }
 
 /*
@@ -315,18 +347,18 @@ Recovery_module::recovery_thread_handle()
     /* purecov: end */
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("recovery_thread_start_wait_num_of_members",
                   {
-                    DBUG_ASSERT(number_of_members != 1);
+                    assert(number_of_members != 1);
                     DBUG_SET("d,recovery_thread_start_wait");
                   });
   DBUG_EXECUTE_IF("recovery_thread_start_wait",
                   {
                     const char act[]= "now wait_for signal.recovery_continue";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
-#endif // DBUG_OFF
+#endif // NDEBUG
 
   /* Step 2 */
 
@@ -345,13 +377,13 @@ Recovery_module::recovery_thread_handle()
 
   error= recovery_state_transfer.state_transfer(recovery_thd);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("recovery_thread_wait_before_finish",
                   {
                     const char act[]= "now wait_for signal.recovery_end";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                   });
-#endif // DBUG_OFF
+#endif // NDEBUG
 
   if (error)
   {
@@ -393,13 +425,13 @@ Recovery_module::recovery_thread_handle()
     leave_group_on_recovery_failure();
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("recovery_thread_wait_before_cleanup",
                   {
                     const char act[]= "now wait_for signal.recovery_end_end";
                     debug_sync_set_action(current_thd, STRING_WITH_LEN(act));
                   });
-#endif // DBUG_OFF
+#endif // NDEBUG
 
   /* Step 7 */
 
diff --git a/rapid/plugin/group_replication/src/recovery_channel_state_observer.cc b/rapid/plugin/group_replication/src/recovery_channel_state_observer.cc
index d1ab6cd7ebe3..eb9453e4dcc1 100644
--- a/rapid/plugin/group_replication/src/recovery_channel_state_observer.cc
+++ b/rapid/plugin/group_replication/src/recovery_channel_state_observer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/recovery_message.cc b/rapid/plugin/group_replication/src/recovery_message.cc
index a17fd27ce996..268f728de334 100644
--- a/rapid/plugin/group_replication/src/recovery_message.cc
+++ b/rapid/plugin/group_replication/src/recovery_message.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/recovery_state_transfer.cc b/rapid/plugin/group_replication/src/recovery_state_transfer.cc
index e6598b8e6f82..ebf9a07e9244 100644
--- a/rapid/plugin/group_replication/src/recovery_state_transfer.cc
+++ b/rapid/plugin/group_replication/src/recovery_state_transfer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -169,7 +176,7 @@ void Recovery_state_transfer::update_group_membership(bool update_donor)
 {
   DBUG_ENTER("Recovery_state_transfer::update_group_membership");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mysql_mutex_assert_owner(&donor_selection_lock);
 #endif
 
@@ -390,8 +397,16 @@ int Recovery_state_transfer::establish_donor_connection()
   {
     mysql_mutex_lock(&donor_selection_lock);
 
+    DBUG_EXECUTE_IF("gr_reset_max_connection_attempts_to_donors", {
+      if (donor_connection_retry_count == 3) {
+        const char act[] =
+            "now signal signal.connection_attempt_3 wait_for "
+            "signal.reset_recovery_retry_count_done";
+        assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+      }
+    };);
     // max number of retries reached, abort
-    if (donor_connection_retry_count == max_connection_attempts_to_donors)
+    if (donor_connection_retry_count >= max_connection_attempts_to_donors)
     {
       log_message(MY_ERROR_LEVEL,
                   "Maximum number of retries when trying to "
@@ -514,7 +529,7 @@ int Recovery_state_transfer::initialize_donor_connection()
                                                        recovery_ssl_crlpath,
                                                        recovery_ssl_verify_server_cert,
                                                        DEFAULT_THREAD_PRIORITY,
-                                                       1, false);
+                                                       1, false, true, true);
 
   if (!error)
   {
@@ -551,15 +566,15 @@ int Recovery_state_transfer::start_recovery_donor_threads()
                     {
                       const char act[]= "now "
                                         "WAIT_FOR reached_stopping_io_thread";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     };);
     DBUG_EXECUTE_IF("pause_after_sql_thread_stop_hook",
                     {
                       const char act[]= "now "
                                         "WAIT_FOR reached_stopping_sql_thread";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     };);
 
     /*
@@ -613,14 +628,14 @@ int Recovery_state_transfer::start_recovery_donor_threads()
   DBUG_EXECUTE_IF("pause_after_io_thread_stop_hook",
                   {
                     const char act[]= "now SIGNAL continue_to_stop_io_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
   DBUG_EXECUTE_IF("pause_after_sql_thread_stop_hook",
                   {
                     const char act[]= "now SIGNAL continue_to_stop_sql_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   if (error)
@@ -650,7 +665,7 @@ int Recovery_state_transfer::start_recovery_donor_threads()
   DBUG_RETURN(error);
 }
 
-int Recovery_state_transfer::terminate_recovery_slave_threads()
+int Recovery_state_transfer::terminate_recovery_slave_threads(bool purge_logs)
 {
   DBUG_ENTER("Recovery_state_transfer::terminate_recovery_slave_threads");
 
@@ -669,8 +684,11 @@ int Recovery_state_transfer::terminate_recovery_slave_threads()
   }
   else
   {
-    //If there is no repository in place nothing happens
-    error= purge_recovery_slave_threads_repos();
+    if (purge_logs)
+    {
+      //If there is no repository in place nothing happens
+      error= purge_recovery_slave_threads_repos();
+    }
   }
 
   DBUG_RETURN(error);
@@ -703,7 +721,7 @@ int Recovery_state_transfer::purge_recovery_slave_threads_repos()
                                                   NULL,
                                                   NULL,
                                                   DEFAULT_THREAD_PRIORITY,
-                                                  1, false);
+                                                  1, false, true, true);
 
   DBUG_RETURN(error);
 }
@@ -717,14 +735,21 @@ int Recovery_state_transfer::state_transfer(THD *recovery_thd)
 
   while (!donor_transfer_finished && !recovery_aborted)
   {
-    //If an applier error happened: stop the receiver thread and purge the logs
+    /*
+      If an applier error happened: stop the slave threads.
+      We do not purge logs or reset channel configuration to
+      preserve the error information on performance schema
+      tables until the next recovery attempt.
+      Recovery_state_transfer::initialize_donor_connection() will
+      take care of that.
+    */
     if (donor_channel_thread_error)
     {
       //Unsubscribe the listener until it connects again.
       channel_observation_manager
           ->unregister_channel_observer(recovery_channel_observer);
 
-      if ((error= terminate_recovery_slave_threads()))
+      if ((error= terminate_recovery_slave_threads(false)))
       {
         /* purecov: begin inspected */
         log_message(MY_ERROR_LEVEL,
@@ -798,7 +823,8 @@ int Recovery_state_transfer::state_transfer(THD *recovery_thd)
 
   channel_observation_manager
       ->unregister_channel_observer(recovery_channel_observer);
-  terminate_recovery_slave_threads();
+  // do not purge logs if an error occur, keep the diagnose on SLAVE STATUS
+  terminate_recovery_slave_threads(!error);
   connected_to_donor= false;
 
   DBUG_RETURN(error);
diff --git a/rapid/plugin/group_replication/src/replication_threads_api.cc b/rapid/plugin/group_replication/src/replication_threads_api.cc
index 4b57f2f633a1..fd32df991f6d 100644
--- a/rapid/plugin/group_replication/src/replication_threads_api.cc
+++ b/rapid/plugin/group_replication/src/replication_threads_api.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -33,7 +40,9 @@ Replication_thread_api::initialize_channel(char* hostname,
                                            bool  ssl_verify_server_cert,
                                            int   priority,
                                            int   retry_count,
-                                           bool  preserve_logs)
+                                           bool  preserve_logs,
+                                           bool ignore_ws_mem_limit,
+                                           bool allow_drop_write_set)
 {
   DBUG_ENTER("Replication_thread_api::initialize");
   int error= 0;
@@ -60,6 +69,9 @@ Replication_thread_api::initialize_channel(char* hostname,
 
   info.preserve_relay_logs= preserve_logs;
 
+  info.m_ignore_write_set_memory_limit = ignore_ws_mem_limit;
+  info.m_allow_drop_write_set = allow_drop_write_set;
+
   if( use_ssl || ssl_ca != NULL || ssl_capath != NULL || ssl_cert != NULL ||
       ssl_cipher!= NULL || ssl_key != NULL || ssl_crl != NULL ||
       ssl_crlpath != NULL || ssl_verify_server_cert)
diff --git a/rapid/plugin/group_replication/src/single_primary_message.cc b/rapid/plugin/group_replication/src/single_primary_message.cc
index bfd1968b9985..490d1b0f9a7c 100644
--- a/rapid/plugin/group_replication/src/single_primary_message.cc
+++ b/rapid/plugin/group_replication/src/single_primary_message.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_command_test.cc b/rapid/plugin/group_replication/src/sql_service/sql_command_test.cc
index 6af16255c375..955290fc8693 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_command_test.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_command_test.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -45,7 +52,7 @@ void check_sql_command_create(Sql_service_interface *srvi)
   {
     srvi->execute_query("SHOW TABLES IN test;", &rset);
     std::string str= "t1";
-    DBUG_ASSERT(rset.getString(0) == str);
+    assert(rset.getString(0) == str);
   }
   else
   {
@@ -68,10 +75,10 @@ void check_sql_command_insert(Sql_service_interface *srvi)
     insert_values.push_back("1");
     insert_values.push_back("2");
     insert_values.push_back("3");
-    DBUG_ASSERT(rset.get_rows() == 3);
+    assert(rset.get_rows() == 3);
     while (i < rset.get_rows())
     {
-      DBUG_ASSERT(rset.getString(0) == insert_values[i]);
+      assert(rset.getString(0) == insert_values[i]);
       rset.next();
       i++;
     }
@@ -98,10 +105,10 @@ void check_sql_command_update(Sql_service_interface *srvi)
     update_values.push_back("4");
     update_values.push_back("5");
     update_values.push_back("6");
-    DBUG_ASSERT(rset.get_rows() == 3);
+    assert(rset.get_rows() == 3);
     while (i < rset.get_rows())
     {
-      DBUG_ASSERT(rset.getString(0) == update_values[i]);
+      assert(rset.getString(0) == update_values[i]);
       rset.next();
       i++;
     }
@@ -121,7 +128,7 @@ void check_sql_command_drop(Sql_service_interface *srvi)
   {
     srvi->execute_query("SELECT TABLES IN test", &rset);
     std::string str= "t1";
-    DBUG_ASSERT(rset.get_rows() == 0);
+    assert(rset.get_rows() == 0);
   }
   else
   {
@@ -144,7 +151,7 @@ int sql_command_check()
   }
 
   error= srvi->open_session();
-  DBUG_ASSERT(!error);
+  assert(!error);
 
   /* Case 1 */
 
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_resultset.cc b/rapid/plugin/group_replication/src/sql_service/sql_resultset.cc
index 1697358a8c94..9a9ef7cfd782 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_resultset.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_resultset.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_command.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_command.cc
index 9ab924675cf7..5c1940f4ed81 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_service_command.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_service_command.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -45,7 +52,7 @@ int Sql_service_command_interface::
 establish_session_connection(enum_plugin_con_isolation isolation_param,
                              void *plugin_pointer)
 {
-  DBUG_ASSERT(m_server_interface == NULL);
+  assert(m_server_interface == NULL);
 
   int error = 0;
   connection_thread_isolation= isolation_param;
@@ -146,17 +153,17 @@ internal_set_super_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_set_super_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
   long srv_err= sql_interface->execute_query("SET GLOBAL super_read_only= 1;");
   if (srv_err == 0)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     long err;
     err = sql_interface->execute_query("SELECT @@GLOBAL.super_read_only;", &rset);
 
-    DBUG_ASSERT(!err && rset.get_rows() > 0 && rset.getLong(0) == 1);
+    assert(!err && rset.get_rows() > 0 && rset.getLong(0) == 1);
     log_message(MY_INFORMATION_LEVEL, "Setting super_read_only=ON.");
 #endif
   }
@@ -169,15 +176,15 @@ internal_set_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_set_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
   long srv_err= sql_interface->execute_query("SET GLOBAL read_only= 1;");
   if (srv_err == 0)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     sql_interface->execute_query("SELECT @@GLOBAL.read_only;", &rset);
-    DBUG_ASSERT(rset.getLong(0) == 1);
+    assert(rset.getLong(0) == 1);
     log_message(MY_INFORMATION_LEVEL, "Setting read_only=ON.");
 #endif
   }
@@ -216,20 +223,20 @@ internal_reset_super_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_reset_super_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
 
   const char * query= "SET GLOBAL super_read_only= 0";
   long srv_err= sql_interface->execute_query(query);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (srv_err == 0)
   {
     long err;
     query= "SELECT @@GLOBAL.super_read_only;";
     err= sql_interface->execute_query(query, &rset);
 
-    DBUG_ASSERT(!err && rset.get_rows() > 0 && rset.getLong(0) == 0);
+    assert(!err && rset.get_rows() > 0 && rset.getLong(0) == 0);
     log_message(MY_INFORMATION_LEVEL, "Setting super_read_only=OFF.");
   }
 #endif
@@ -260,21 +267,21 @@ internal_reset_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_reset_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
 
   const char* query= "SET GLOBAL read_only= 0";
   long srv_err= sql_interface->execute_query(query);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (srv_err == 0)
   {
     long err;
     query= "SELECT @@GLOBAL.read_only";
     err= sql_interface->execute_query(query, &rset);
 
-    DBUG_ASSERT(!err && rset.get_rows() > 0 && rset.getLong(0) == 0);
+    assert(!err && rset.get_rows() > 0 && rset.getLong(0) == 0);
     log_message(MY_INFORMATION_LEVEL, "Setting read_only=OFF.");
   }
 #endif
@@ -287,7 +294,7 @@ long Sql_service_command_interface::kill_session(uint32_t session_id,
 {
   DBUG_ENTER("Sql_service_command_interface::kill_session");
 
-  DBUG_ASSERT(m_server_interface != NULL);
+  assert(m_server_interface != NULL);
 
   Sql_resultset rset;
   long srv_err= 0;
@@ -334,7 +341,7 @@ internal_get_server_super_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_get_server_super_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
   long server_super_read_only= -1;
@@ -373,7 +380,7 @@ internal_get_server_read_only(Sql_service_interface *sql_interface)
 {
   DBUG_ENTER("Sql_service_commands::internal_get_server_read_only");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
   longlong server_read_only= -1;
@@ -392,7 +399,7 @@ int Sql_service_command_interface::get_server_gtid_executed(string& gtid_execute
   long error=0;
 
   /* No support for this method on thread isolation mode */
-  DBUG_ASSERT(connection_thread_isolation != PSESSION_DEDICATED_THREAD);
+  assert(connection_thread_isolation != PSESSION_DEDICATED_THREAD);
 
   if (connection_thread_isolation != PSESSION_DEDICATED_THREAD)
   {
@@ -410,7 +417,7 @@ internal_get_server_gtid_executed(Sql_service_interface *sql_interface,
 {
   DBUG_ENTER("Sql_service_command_interface::get_server_gtid_executed");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   Sql_resultset rset;
   long srv_err=
@@ -431,7 +438,7 @@ wait_for_server_gtid_executed(std::string& gtid_executed,
   long error=0;
 
   /* No support for this method on thread isolation mode */
-  DBUG_ASSERT(connection_thread_isolation != PSESSION_DEDICATED_THREAD);
+  assert(connection_thread_isolation != PSESSION_DEDICATED_THREAD);
 
   if (connection_thread_isolation != PSESSION_DEDICATED_THREAD)
   {
@@ -450,7 +457,7 @@ internal_wait_for_server_gtid_executed(Sql_service_interface *sql_interface,
 {
   DBUG_ENTER("Sql_service_commands::internal_wait_for_server_gtid_executed");
 
-  DBUG_ASSERT(sql_interface != NULL);
+  assert(sql_interface != NULL);
 
   DBUG_EXECUTE_IF("sql_int_wait_for_gtid_executed_no_timeout", { timeout= 0; });
 
@@ -466,7 +473,8 @@ internal_wait_for_server_gtid_executed(Sql_service_interface *sql_interface,
   }
 
   std::string query= ss.str();
-  long srv_err= sql_interface->execute_query(query);
+  Sql_resultset rset;
+  long srv_err= sql_interface->execute_query(query, &rset);
   if (srv_err)
   {
     /* purecov: begin inspected */
@@ -478,6 +486,11 @@ internal_wait_for_server_gtid_executed(Sql_service_interface *sql_interface,
     DBUG_RETURN(1);
     /* purecov: end */
   }
+  else if(rset.get_rows() > 0)
+  {
+    if (rset.getLong(0) == 1)
+      DBUG_RETURN(-1);
+  }
   DBUG_RETURN(0);
 }
 
@@ -597,7 +610,7 @@ Session_plugin_thread::terminate_session_thread()
 
     struct timespec abstime;
     set_timespec(&abstime, 1);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int error=
 #endif
       mysql_cond_timedwait(&m_run_cond, &m_run_lock, &abstime);
@@ -610,10 +623,10 @@ Session_plugin_thread::terminate_session_thread()
       mysql_mutex_unlock(&m_run_lock);
       DBUG_RETURN(1);
     }
-    DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+    assert(error == ETIMEDOUT || error == 0);
   }
 
-  DBUG_ASSERT(!m_session_thread_running);
+  assert(!m_session_thread_running);
 
   while (!this->incoming_methods->empty())
   {
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_context.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_context.cc
index fbb05f25d822..b6681e919442 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_service_context.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_service_context.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_context_base.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_context_base.cc
index ab7bf1c34364..4cd041ac9d21 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_service_context_base.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_service_context_base.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc
index f4e79f5b6980..bf43e05fa59c 100644
--- a/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc
+++ b/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -18,7 +25,7 @@
 #include <mysqld_error.h>
 
 /* keep it in sync with enum_server_command in my_command.h */
-const LEX_STRING command_name[]={
+const LEX_STRING command_name[] MY_ATTRIBUTE((unused)) = {
   { C_STRING_WITH_LEN("Sleep") },
   { C_STRING_WITH_LEN("Quit") },
   { C_STRING_WITH_LEN("Init DB") },
@@ -119,7 +126,7 @@ int Sql_service_interface::open_session()
 
 int Sql_service_interface::open_thread_session(void *plugin_ptr)
 {
-  DBUG_ASSERT(plugin_ptr != NULL);
+  assert(plugin_ptr != NULL);
 
   m_session= NULL;
   /* open a server session after server is in operating state */
@@ -194,8 +201,8 @@ long Sql_service_interface::execute_internal(Sql_resultset *rset,
     if (err != 0)
     {
       log_message(MY_ERROR_LEVEL, "Error running internal SQL query: %s. Got "
-                  "internal SQL error: %s(%d)", cmd.com_query.query,
-                  rset->sql_errno(), rset->err_msg().c_str());
+                  "SQL error: %s(%d)", cmd.com_query.query,
+                  rset->err_msg().c_str(), rset->sql_errno());
     }
     else
     {
@@ -229,7 +236,7 @@ long Sql_service_interface::execute_internal(Sql_resultset *rset,
 long Sql_service_interface::execute_query(std::string sql_string)
 {
   DBUG_ENTER("Sql_service_interface::execute");
-  DBUG_ASSERT(sql_string.length() <= UINT_MAX);
+  assert(sql_string.length() <= UINT_MAX);
   COM_DATA cmd;
   Sql_resultset rset;
 
@@ -249,7 +256,7 @@ long Sql_service_interface::execute_query(std::string sql_string,
                                           const CHARSET_INFO *cs_charset)
 {
   DBUG_ENTER("Sql_service_interface::execute");
-  DBUG_ASSERT(sql_string.length() <= UINT_MAX);
+  assert(sql_string.length() <= UINT_MAX);
   COM_DATA cmd;
   cmd.com_query.query= (char *) sql_string.c_str();
   cmd.com_query.length= static_cast<unsigned int>(sql_string.length());
diff --git a/rapid/plugin/group_replication/tests/collections/default.weekly b/rapid/plugin/group_replication/tests/collections/default.weekly
index 6eb09492d2f6..e813b48b30d2 100644
--- a/rapid/plugin/group_replication/tests/collections/default.weekly
+++ b/rapid/plugin/group_replication/tests/collections/default.weekly
@@ -7,3 +7,4 @@ perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=gro
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_parallel_applier-debug --vardir=var-group_replication_parallel_applier-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_ssl_mode_required-debug --vardir=var-group_replication_ssl_mode_required-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--loose-group_replication_ssl_mode=REQUIRED
 perl mysql-test-run.pl --timer --debug-server --force --parallel=6 --comment=group_replication_transaction-write-set-extraction_MURMUR32-debug --vardir=var-group_replication_transaction-write-set-extraction_MURMUR32-debug --suite=group_replication --experimental=collections/default.experimental --skip-test-list=collections/disabled-per-push.list --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--transaction-write-set-extraction=MURMUR32
+perl mysql-test-run.pl --timer --force --parallel=6 --comment=group_replication_parallel_applier_binlog-txn-dependency-tracking --vardir=var-group_replication_parallel_applier_binlog-txn-dependency-tracking --suite=group_replication --experimental=collections/default.experimental --big-test --testcase-timeout=60 --suite-timeout=360 --mysqld=--slave-parallel-workers=4 --mysqld=--slave-parallel-type=logical_clock --mysqld=--slave_preserve_commit_order=ON --mysqld=--binlog-transaction-dependency-tracking=WRITESET
diff --git a/rapid/plugin/group_replication/tests/mtr/inc/gr_clear_configuration.inc b/rapid/plugin/group_replication/tests/mtr/inc/gr_clear_configuration.inc
index 343ba94a9512..d5410b795b73 100644
--- a/rapid/plugin/group_replication/tests/mtr/inc/gr_clear_configuration.inc
+++ b/rapid/plugin/group_replication/tests/mtr/inc/gr_clear_configuration.inc
@@ -42,6 +42,7 @@ while ($_rpl_server <= $_rpl_server_max)
     SET GLOBAL group_replication_force_members= "";
     SET GLOBAL group_replication_bootstrap_group= OFF;
     SET GLOBAL read_only= FALSE;
+    SET GLOBAL group_replication_ip_whitelist= "AUTOMATIC";
 
     if (!$skip_recovery_configuration)
     {
diff --git a/rapid/plugin/group_replication/tests/mtr/inc/gr_configuration.inc b/rapid/plugin/group_replication/tests/mtr/inc/gr_configuration.inc
index 8a0526daf6b6..fb7a818b02be 100644
--- a/rapid/plugin/group_replication/tests/mtr/inc/gr_configuration.inc
+++ b/rapid/plugin/group_replication/tests/mtr/inc/gr_configuration.inc
@@ -63,6 +63,10 @@ while ($_rpl_server)
   --dec $_rpl_server
 }
 
+--let $_group_replication_ip_whitelist= 127.0.0.1/32,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,
+--let $_group_replication_host_name= `SELECT @@GLOBAL.hostname;`
+--let $_group_replication_ip_whitelist= $_group_replication_ip_whitelist$_group_replication_host_name
+--let $_group_replication_ip_whitelist= $_group_replication_ip_whitelist/8
 
 # Set XCom configuration on all servers.
 # Order is from last to first server like on rpl_init.inc.
@@ -89,6 +93,7 @@ while ($_rpl_server)
   --eval SET GLOBAL group_replication_local_address= "$_group_replication_local_address"
   --eval SET GLOBAL group_replication_group_seeds= "$_group_replication_group_seeds"
   --eval SET GLOBAL group_replication_bootstrap_group= $_group_replication_bootstrap_group
+  --eval SET GLOBAL group_replication_ip_whitelist= "$_group_replication_ip_whitelist"
 
   if (!$skip_recovery_configuration)
   {
diff --git a/rapid/plugin/group_replication/tests/mtr/inc/gr_single_primary_mode.inc b/rapid/plugin/group_replication/tests/mtr/inc/gr_single_primary_mode.inc
index 0901e1e01ae9..11269527ddc2 100644
--- a/rapid/plugin/group_replication/tests/mtr/inc/gr_single_primary_mode.inc
+++ b/rapid/plugin/group_replication/tests/mtr/inc/gr_single_primary_mode.inc
@@ -34,7 +34,10 @@ if (!$reset_single_primary_mode)
 
 while ($_i_set_single_primary_mode <= $rpl_server_count)
 {
-  --let $rpl_connection_name= server$_i_set_single_primary_mode
+  --let $rpl_connection_name= server_aux_$_i_set_single_primary_mode
+  --let $rpl_server_number= $_i_set_single_primary_mode
+  --source include/rpl_connect.inc
+  --let $rpl_connection_name= server_aux_$_i_set_single_primary_mode
   --source include/rpl_connection.inc
 
   # plugin cannot be running for us to setup these configs
@@ -62,6 +65,9 @@ while ($_i_set_single_primary_mode <= $rpl_server_count)
     SET GLOBAL group_replication_enforce_update_everywhere_checks= TRUE;
   }
 
+  --connection default
+  --disconnect server_aux_$_i_set_single_primary_mode
+
   --inc $_i_set_single_primary_mode
 }
 
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_applier_channel_stop_with_pending_transactions.result b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_channel_stop_with_pending_transactions.result
new file mode 100644
index 000000000000..a44c198f70dd
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_channel_stop_with_pending_transactions.result
@@ -0,0 +1,34 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. With both the members ONLINE. On M1 create a table
+[connection server1]
+CREATE TABLE test.t1 (a INT PRIMARY KEY);
+include/rpl_sync.inc
+
+# 2. Set a DEBUG point so transactions hang at the before commit hook on M2
+#    Execute a transaction on M1
+[connection server2]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_before_commit_hook_wait';
+[connection server1]
+INSERT INTO t1 VALUES (1);
+[connection server2]
+
+# 3. Try to stop the GR applier thread on M2, it should block.
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";;
+[connection server_2]
+
+# 4. Signal to continue_commit. The stop shall continue.
+SET DEBUG_SYNC='now SIGNAL continue_commit';
+SET @@GLOBAL.DEBUG= @debug_save;
+[connection server2]
+
+# 5. Cleanup
+include/gr_start_applier_sql_thread.inc
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_applier_early_failure.result b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_early_failure.result
index d06e8d14ef31..a7d2f7685cc8 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_applier_early_failure.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_early_failure.result
@@ -7,12 +7,18 @@ Note	####	Storing MySQL user name or password information in the master info rep
 # 1. Create a table on server 1 and replicate
 #
 [connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET SESSION sql_log_bin = 1;
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 include/rpl_sync.inc
 #
 # 2. Insert a row on server 2 with log to the binlog disabled
 #
 [connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET SESSION sql_log_bin = 1;
 SET SESSION sql_log_bin= 0;
 INSERT INTO t1 VALUES (1);
 SET SESSION sql_log_bin= 1;
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_applier_error.result b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_error.result
new file mode 100644
index 000000000000..f0da961e8c43
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_applier_error.result
@@ -0,0 +1,57 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#
+# Step-1: Initial setup (create table on both servers)
+#
+[connection server_1]
+CREATE TABLE t1(i INT PRIMARY KEY);
+include/rpl_sync.inc
+#
+# Step-2: Insert a tuple on server2 directly without writing
+#         into binlog.
+#
+[connection server_2]
+SET sql_log_bin=0;
+INSERT INTO t1 values (1);
+#
+# Step-3: Add error suppressions which are required
+#         for the test to pass.
+#
+CALL mtr.add_suppression("Could not execute Write_rows event on table test.t1");
+CALL mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+CALL mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+CALL mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+CALL mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+SET sql_log_bin=1;
+#
+# Step-4: Insert a tuple on server1
+#
+[connection server_1]
+INSERT INTO t1 VALUES (1);
+#
+# Step-5: sync will fail because the same tuple exists on server2
+#         (insert on server2 at step-2).
+#
+[connection server_2]
+include/gr_wait_for_member_state.inc
+#
+# Step-6: Grep for the expected error in server log.
+#
+include/assert_grep.inc [Found the expected error in group_replication_applier channel.]
+#
+# Step-7: Cleanup (drop table on both servers)
+#
+[connection server_1]
+DROP TABLE t1;
+# Step-7.2: Server_2 entered into 'read_only' mode due to the above error.
+#           Sync the above 'drop table' wont work.
+#           Reset the slave and 'DROP' the table manually.
+[connection server_2]
+include/stop_group_replication.inc
+RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_auto_increment_increment.result b/rapid/plugin/group_replication/tests/mtr/r/gr_auto_increment_increment.result
index f7bb2cfd0a1d..205d93acbdd7 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_auto_increment_increment.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_auto_increment_increment.result
@@ -36,8 +36,8 @@ include/assert.inc [The value of auto_increment_offset is set to 2]
 #    the auto_increment_increment value, an error is logged.
 ############################################################
 Matching lines are:
-DATE_TIME [ERROR] Plugin group_replication reported: 'Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.'
-Occurrences of 'Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.' in the input file: 1
+DATE_TIME [ERROR] Plugin group_replication reported: 'Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.'
+Occurrences of 'Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.' in the input file: 1
 ############################################################
 # 5. When auto_increment_increment and auto_increment_offset
 #    not set to default value
@@ -98,7 +98,7 @@ SET GLOBAL GROUP_REPLICATION_AUTO_INCREMENT_INCREMENT= 1;
 include/start_group_replication.inc
 include/assert.inc [The value of auto_increment_increment for server2 should be 1]
 include/assert.inc [The value of auto_increment_offset for server2 should be 2]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 SET GLOBAL GROUP_REPLICATION_AUTO_INCREMENT_INCREMENT= 9;
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_autostart_on_install.result b/rapid/plugin/group_replication/tests/mtr/r/gr_autostart_on_install.result
index 9ad743018d14..936cda3da369 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_autostart_on_install.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_autostart_on_install.result
@@ -11,8 +11,9 @@ include/start_and_bootstrap_group_replication.inc
 # Restart group replication on server 2
 # with group_replication_start_on_boot=1
 #
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
+include/gr_wait_for_member_state.inc
 include/stop_group_replication.inc
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 #
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection.result b/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection.result
index 8e141900de40..e236d631b2c1 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection.result
@@ -38,9 +38,9 @@ UPDATE t1 SET c1=2 WHERE c1=1;
 #     After garbage collection certification info will contain:
 #     WS: t1.c1=1 -> 8a94f357-aab4-11df-86ab-c80aa9422222:1-4
 #     WS: t1.c1=2 -> 8a94f357-aab4-11df-86ab-c80aa9422222:1-4
-include/assert.inc ['Count_transactions_rows_validating must be 2']
+include/assert.inc ['Count_transactions_rows_validating must be 4']
 include/assert.inc ['Transactions_committed_all_members must be equal to 8a94f357-aab4-11df-86ab-c80aa9422222:1-4']
-include/assert.inc ['Count_transactions_rows_validating must be 2']
+include/assert.inc ['Count_transactions_rows_validating must be 4']
 include/assert.inc ['Transactions_committed_all_members must be equal to 8a94f357-aab4-11df-86ab-c80aa9422222:1-4']
 
 ############################################################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection2.result b/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection2.result
new file mode 100644
index 000000000000..9050ec54ba59
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection2.result
@@ -0,0 +1,74 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+#  1. Create a table on server1.
+CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a));
+INSERT INTO t1 VALUE(1, 1);
+include/rpl_sync.inc
+
+############################################################
+#  2. Set a debug sync before broadcast message to group on
+#     connection server_1.
+#     Commit a transaction that will be block before broadcast.
+[connection server_1]
+SET @@GLOBAL.DEBUG='+d,group_replication_before_message_broadcast';
+BEGIN;
+UPDATE t1 SET b=10 WHERE a=1;
+COMMIT;
+
+############################################################
+#  3. Wait until server_1 connection reaches the
+#     group_replication_before_message_broadcast debug sync point.
+[connection server1]
+
+############################################################
+#  4. Execute a transaction on server2, that will reach first
+#     certification, since server_1 is blocked before broadcast.
+[connection server2]
+UPDATE t1 SET b=20 WHERE a=1;
+
+############################################################
+#  5. Suspend pipeline on server2.
+SET @@GLOBAL.DEBUG='+d,group_replication_before_apply_data_packet';
+
+############################################################
+#  6. Resume the transaction on server_1
+[connection server1]
+SET DEBUG_SYNC='now SIGNAL waiting';
+SET @@GLOBAL.DEBUG='-d,group_replication_before_message_broadcast';
+[connection server_1]
+ERROR HY000: Plugin instructed the server to rollback the current transaction.
+
+############################################################
+#  7. Make sure the pipeline is suspended on server2.
+[connection server2]
+
+############################################################
+#  8. Wait until certification info garbage collector does
+#     its work.
+
+############################################################
+#  9. Resume the pipeline on server2.
+SET DEBUG_SYNC='now SIGNAL continue_apply';
+SET @@GLOBAL.DEBUG='-d,group_replication_before_apply_data_packet';
+
+############################################################
+# 10. Execute a new transaction in order to have a sync point
+#     to make the test deterministic,
+#     Validate that data and GTIDs are correct.
+[connection server1]
+INSERT INTO t1 VALUE(2, 2);
+include/rpl_sync.inc
+include/assert.inc [GTID_EXECUTED must contain 6 transactions]
+[connection server2]
+include/assert.inc [GTID_EXECUTED must contain 6 transactions]
+include/diff_tables.inc [server1:t1, server2:t1]
+
+############################################################
+# 11. Clean up.
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_collations_key_conflict.result b/rapid/plugin/group_replication/tests/mtr/r/gr_collations_key_conflict.result
new file mode 100644
index 000000000000..8f5ab65ad471
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_collations_key_conflict.result
@@ -0,0 +1,99 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+###########################
+# Create a table on server1
+[connection server1]
+CREATE TABLE t1 (
+u_str VARCHAR(32) NOT NULL,
+value VARCHAR(32) NOT NULL,
+PRIMARY KEY (u_str)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+include/rpl_sync.inc
+
+######################################################################
+# Execute in concurrency transaction with equivalent keys under latin1
+
+############################################################
+# 0. Initial setup and checks.
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/gtid_step_reset.inc
+
+############################################################
+# 1. Set a debug sync before broadcast message to group on
+#    connection local_server_connection1.
+[connection server_1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='d,group_replication_before_message_broadcast';
+
+#####################################################################
+# 2. Commit local_transaction that will be blocked before broadcast.
+BEGIN;
+INSERT INTO t1 (u_str, value)  VALUES ('�',  "A value");;
+COMMIT;
+
+############################################################
+# 3. Wait until local transaction reaches the
+# group_replication_before_message_broadcast debug sync point.
+[connection server1]
+
+############################################################
+# 4. Execute a transaction on remote server, that will reach first
+#    certification, since transaction on the local server
+#    is blocked before broadcast.
+[connection server2]
+BEGIN;
+INSERT INTO t1 (u_str, value)  VALUES ('�',  "Another value");;
+COMMIT;
+
+############################################################
+# 5. Signal the waiting thread on local server to resume the
+#    transaction.
+[connection server1]
+SET DEBUG_SYNC='now SIGNAL waiting';
+SET @@GLOBAL.DEBUG= @debug_save;
+
+############################################################
+# 6. Wait for remote transaction to be executed succesfully
+on local server.
+[connection server2]
+include/sync_slave_sql_with_master.inc
+############################################################
+# 7. If the test case is conflict scenario, local transaction
+#    will end up in an error stating that it was aborted,
+#    since transactions are conflicting and transaction on
+#    remote server was ordered first. If the test case is
+#    is positive scenario, no error will be seen here.
+[connection server_1]
+ERROR HY000: Plugin instructed the server to rollback the current transaction.
+[connection server_1]
+SET @@GLOBAL.DEBUG=@debug_save;
+############################################################
+# 8. Sync everything
+include/rpl_sync.inc
+############################################################
+# 9. Assert that number of certified transactions are the
+#    expected ones.
+include/assert.inc [The value of Count_Transactions_Checked should be 3 after starting group replication]
+include/assert.inc [The value of Count_Conflicts_Detected should be 1 after starting group replication]
+############################################################
+# 10. Assert that GTID is increased as expected
+include/gtid_step_assert.inc [count=1, only_count=1]
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+############################################################
+# 11. Cleanup (restore the connection back to original)
+[connection server1]
+
+###########
+# Clean up.
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_communication_configuration.result b/rapid/plugin/group_replication/tests/mtr/r/gr_communication_configuration.result
index fc9ebbf4b8e2..ee1bb57bc086 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_communication_configuration.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_communication_configuration.result
@@ -33,9 +33,15 @@ SET SESSION sql_log_bin= 1;
 [connection server1]
 SET @local_address= @@GLOBAL.group_replication_local_address;
 SET @group_seeds= @@GLOBAL.group_replication_group_seeds;
+SET @ip_whitelist= @@GLOBAL.group_replication_ip_whitelist;
 [connection server2]
 SET @local_address= @@GLOBAL.group_replication_local_address;
 SET @group_seeds= @@GLOBAL.group_replication_group_seeds;
+SET @ip_whitelist= @@GLOBAL.group_replication_ip_whitelist;
+SET GLOBAL group_replication_ip_whitelist= @ip_whitelist;
+[connection server1]
+SET GLOBAL group_replication_ip_whitelist= @ip_whitelist;
+[connection server2]
 #######################################################
 #  1. Try setting bootstrap_group variable with invalid
 #     values. It must fail.
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules.result b/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules.result
index 5e4e5ad6f5f9..3af920b92a12 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules.result
@@ -19,7 +19,8 @@ SET session sql_log_bin=0;
 call mtr.add_suppression("Member version is incompatible with the group");
 SET session sql_log_bin=1;
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error_minor';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
 SET GLOBAL group_replication_group_name= "6db14550-03bb-11e5-b939-0800200c9a66";
 START GROUP_REPLICATION;
 ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
@@ -27,7 +28,7 @@ ERROR HY000: The server is not configured properly to be an active member of the
 # Check all is fine when we clean the rules
 #
 SET @@GLOBAL.DEBUG= @debug_save;
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/start_group_replication.inc
 include/assert.inc [On the recovered member, the table should contain 1 elements]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules_and_force_lower_version_member.result b/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules_and_force_lower_version_member.result
index b9378b584fcf..53ee7957f48e 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules_and_force_lower_version_member.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_compatibility_rules_and_force_lower_version_member.result
@@ -26,7 +26,7 @@ SET session sql_log_bin=0;
 call mtr.add_suppression("Member version is incompatible with the group");
 SET session sql_log_bin=1;
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error_major';
 SET GLOBAL group_replication_group_name= "6db14550-03bb-11e5-b939-0800200c9a13";
 SET GLOBAL group_replication_allow_local_lower_version_join= ON;
 START GROUP_REPLICATION;
@@ -38,7 +38,7 @@ ERROR HY000: The server is not configured properly to be an active member of the
 # able to join the group.
 #
 SET @@GLOBAL.DEBUG= @debug_save;
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 SET GLOBAL group_replication_allow_local_lower_version_join= ON;
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_start_uninstall.result b/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_start_uninstall.result
new file mode 100644
index 000000000000..b17fbbb43b46
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_start_uninstall.result
@@ -0,0 +1,39 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Setup GR environment and execute START GR.
+
+[connection server1]
+SET GLOBAL group_replication_bootstrap_group=ON;
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+
+# 2. Block start, so we can execute UNINSTALL.
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_on_start';
+START GROUP_REPLICATION;
+
+# 3. Execute UNINSTALL PLUGIN GR should fail with error
+#    ER_PLUGIN_CANNOT_BE_UNINSTALLED as START GR is already running.
+
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.start_waiting";
+UNINSTALL PLUGIN group_replication;
+ERROR HY000: Plugin 'group_replication' cannot be uninstalled now. Plugin is busy, it cannot be uninstalled. To force a stop run STOP GROUP_REPLICATION and then UNINSTALL PLUGIN group_replication.
+
+# 4. SIGNAL START GR to resume processing.
+
+SET DEBUG_SYNC= 'now SIGNAL signal.start_continue';
+[connection server1]
+
+# 5. Confirm GR is started
+
+include/gr_wait_for_member_state.inc
+
+# 6. Cleanup
+
+SET @@GLOBAL.DEBUG= @debug_save;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_stop_select.result b/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_stop_select.result
new file mode 100644
index 000000000000..868baf72b1c9
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_concurrent_stop_select.result
@@ -0,0 +1,33 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Block Stop Group Replication
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_on_stop';
+STOP GROUP_REPLICATION;
+
+# 2. Wait for debug sync to be reached and then execute select query
+
+[connection server_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_waiting";
+SELECT COUNT(*) FROM performance_schema.replication_connection_status;
+COUNT(*)
+2
+
+# 3. SIGNAL STOP GR to resume processing
+
+SET DEBUG_SYNC= 'now SIGNAL signal.stop_continue';
+[connection server1]
+
+# 4. Confirm Group Replication is stopped
+
+include/gr_wait_for_member_state.inc
+
+# 5. Cleanup
+
+SET @@GLOBAL.DEBUG= @debug_save;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_connect_during_delayed_start.result b/rapid/plugin/group_replication/tests/mtr/r/gr_connect_during_delayed_start.result
index 738d6f0bbcbb..b5f4cab2afb5 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_connect_during_delayed_start.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_connect_during_delayed_start.result
@@ -17,7 +17,7 @@ include/assert.inc [The delayed initialization thread is not running after start
 #
 # 3. Restart the server with start on boot enabled
 #
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_bootstrap_group=1 --loose-debug=+d,group_replication_before_joining_the_group
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_bootstrap_group=1 --loose-debug=+d,group_replication_before_joining_the_group --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 #
 # 3.1 Check the super read only mode is enabled
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server.result b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server.result
index f94e04cb3a98..5593b09224a7 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server.result
@@ -62,7 +62,7 @@ SET sql_log_bin=0;
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
 SET sql_log_bin=1;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
 include/rpl_reconnect.inc
 # check that there are 2 mebers in the group
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server_continuously.result b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server_continuously.result
index 451daac28a18..54d6ee9d330a 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server_continuously.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_donor_server_continuously.result
@@ -48,35 +48,35 @@ include/start_group_replication.inc
 [connection server_3]
 [connection server3]
 UNLOCK TABLES;
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 LOCK TABLES t1 READ;
 include/start_group_replication.inc
 [connection server_3]
 [connection server3]
 UNLOCK TABLES;
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 LOCK TABLES t1 READ;
 include/start_group_replication.inc
 [connection server_3]
 [connection server3]
 UNLOCK TABLES;
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 LOCK TABLES t1 READ;
 include/start_group_replication.inc
 [connection server_3]
 [connection server3]
 UNLOCK TABLES;
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 LOCK TABLES t1 READ;
 include/start_group_replication.inc
 [connection server_3]
 [connection server3]
 UNLOCK TABLES;
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 LOCK TABLES t1 READ;
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_recovery_server.result b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_recovery_server.result
index 68c0557ceea9..432cdd73df36 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_recovery_server.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_recovery_server.result
@@ -46,7 +46,7 @@ call dml_operations(100,200);
 [connection server3]
 UNLOCK TABLES;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
 include/rpl_reconnect.inc
 [connection server2]
@@ -69,7 +69,7 @@ call dml_operations(300,400);
 UNLOCK TABLES;
 [connection server3]
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
 include/rpl_reconnect.inc
 [connection server2]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_while_dml_and_some_server_recovering.result b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_while_dml_and_some_server_recovering.result
index 3a5f2bc01e03..8688276226b3 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_crash_while_dml_and_some_server_recovering.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_crash_while_dml_and_some_server_recovering.result
@@ -39,8 +39,10 @@ call dml_operations();
 
 UNLOCK TABLES;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+Got one of the listed errors
 include/rpl_reconnect.inc
 # check that there are 2 mebers in the group
 include/rpl_gr_wait_for_number_of_members.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_disjoint_gtids_join_option_deprecation.result b/rapid/plugin/group_replication/tests/mtr/r/gr_disjoint_gtids_join_option_deprecation.result
index f7046a3f51d0..83aeddb7e4e9 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_disjoint_gtids_join_option_deprecation.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_disjoint_gtids_join_option_deprecation.result
@@ -6,20 +6,29 @@ Note	####	Storing MySQL user name or password information in the master info rep
 
 ############################################################
 # 1. Validate that the group_replication_allow_local_disjoint_gtids_join
-#    option deprecation warning is thrown.
+#    option deprecation warning is thrown when SET command is used.
+SET GLOBAL group_replication_allow_local_disjoint_gtids_join= ON;
+Warnings:
+Warning	1681	'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
+include/assert_grep.inc [Found the expected deprecation log message.]
+
+############################################################
+# 2. Validate that the group_replication_allow_local_disjoint_gtids_join
+#    option deprecation warning is thrown when START GR is used.
 include/start_and_bootstrap_group_replication.inc
 Warnings:
 Warning	1681	'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
 include/stop_group_replication.inc
+include/assert_grep.inc [Found the expected deprecation log message.]
 
 ############################################################
-# 2. Validate that the group_replication_allow_local_disjoint_gtids_join
+# 3. Validate that the group_replication_allow_local_disjoint_gtids_join
 #    option deprecation warning is logged on server start.
-# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 include/assert_grep.inc [Found the expected deprecation log message.]
 
 ############################################################
-# 3. Clean up.
+# 4. Clean up.
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_applier_error.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_applier_error.result
new file mode 100644
index 000000000000..18e97f5c4b78
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_applier_error.result
@@ -0,0 +1,95 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Could not execute Write_rows event on table test.t1; Duplicate entry.*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+
+#########################################################################
+# 1) Force applier error on member 1.
+#########################################################################
+
+[connection server1]
+CREATE TABLE t1(a INT PRIMARY KEY);
+include/rpl_sync.inc
+SET SESSION sql_log_bin= 0;
+INSERT INTO t1 VALUES (1);
+SET SESSION sql_log_bin= 1;
+[connection server2]
+INSERT INTO t1 VALUES (1);
+include/rpl_sync.inc
+
+#########################################################################
+# 1.1) Verify that member 1 went to super_read_only mode.
+#########################################################################
+
+[connection server1]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [super_read_only should be enabled]
+
+#########################################################################
+# 2) Set exit state action to ABORT_SERVER on member 1.
+#########################################################################
+
+include/stop_group_replication.inc
+SET sql_log_bin = 0;
+DELETE FROM t1 WHERE a = 1;
+SET sql_log_bin = 1;
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+#########################################################################
+# 3) Force applier error again on member 1.
+#########################################################################
+
+include/start_group_replication.inc
+SET SESSION sql_log_bin= 0;
+INSERT INTO t1 VALUES (2);
+SET SESSION sql_log_bin= 1;
+[connection server2]
+INSERT INTO t1 VALUES (2);
+
+#########################################################################
+# 3.1) Verify that member 1 aborted.
+#########################################################################
+
+include/rpl_gr_wait_for_number_of_members.inc
+include/assert.inc [Member 1 should have aborted]
+
+#########################################################################
+# 4) Relaunch member 1.
+#########################################################################
+
+[connection server1]
+include/rpl_reconnect.inc
+[connection server1]
+SET SESSION sql_log_bin= 0;
+DELETE FROM t1 WHERE a = 2;
+SET SESSION sql_log_bin= 1;
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 5) Cleanup.
+#########################################################################
+
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_lower_version.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_lower_version.result
new file mode 100644
index 000000000000..997842733212
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_lower_version.result
@@ -0,0 +1,81 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+#########################################################################
+# 1) Simulate a higher version on M1.
+#########################################################################
+
+[connection server1]
+SET @debug_saved= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
+include/start_and_bootstrap_group_replication.inc
+
+#########################################################################
+# 2) Try to join M2 to the group.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported expected incompatibility on member version]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the
+#    group again.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported expected incompatibility on member version]
+
+#########################################################################
+# 6) Restart M2 again without group_replication_start_on_boot enabled.
+#    The server should start normally and be able to join the group.
+#########################################################################
+
+[connection server1]
+SET @@GLOBAL.DEBUG = @debug_saved;
+include/stop_group_replication.inc
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 7) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_members_exceeded.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_members_exceeded.result
new file mode 100644
index 000000000000..cdbafe20828b
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_members_exceeded.result
@@ -0,0 +1,71 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+
+#########################################################################
+# 1) Simulate a group of 10 members when member 2 joins. Member 2  will
+# be unable to join.
+#########################################################################
+
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --loose-debug=+d,group_replication_set_number_of_members_on_view_changed_to_10 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported expected excess of members in group]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Set the exit_state_action to ABORT_SERVER and simulate again a
+# group of 10 members when member 2 joins. Member 2 will be unable to
+# join again.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --loose-debug=+d,group_replication_set_number_of_members_on_view_changed_to_10 --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported expected excess of members in group]
+
+#########################################################################
+# 5) Restart M2 again without group_replication_start_on_boot enabled.
+# The server should start normally and be able to join the group.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_transaction_mismatch.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_transaction_mismatch.result
new file mode 100644
index 000000000000..9e087afbe1ed
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_transaction_mismatch.result
@@ -0,0 +1,88 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+#########################################################################
+# 1) Run a few transactions on M2.
+#########################################################################
+
+[connection server1]
+CREATE TABLE t3(a INT PRIMARY KEY);
+INSERT INTO t3 VALUES (2);
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+SET GTID_NEXT= "aaaaaaaa-bbbb-aaaa-bbbb-aaaaaaaaaaaa:1";
+CREATE TABLE t2(a INT PRIMARY KEY);
+SET GTID_NEXT= "AUTOMATIC";
+
+#########################################################################
+# 2) Restart M2 with start_on_boot enabled.
+#########################################################################
+
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+#  (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported expected transaction mismatch]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 4) Restart M2 with start_on_boot enabled and exit_state_action set to
+# ABORT_SERVER.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+#  (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported expected transaction mismatch]
+
+#########################################################################
+# 6) Restart M2 again without group_replication_start_on_boot enabled.
+# The server should start normally and be able to join the group.
+#########################################################################
+
+[connection server2]
+RESET MASTER;
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 7) Cleanup.
+#########################################################################
+
+[connection server1]
+DROP TABLE t3;
+[connection server2]
+include/stop_group_replication.inc
+SET SESSION sql_log_bin = 0;
+DROP TABLE t2;
+SET SESSION sql_log_bin = 1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.result
new file mode 100644
index 000000000000..3ef5b583a89b
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.result
@@ -0,0 +1,68 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+
+#########################################################################
+# 1) Relaunch M2 with a different gtid_assignment_block_size from M1.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_gtid_assignment_block_size=GROUP_REPLICATION_GTID_ASSIGNMENT_BLOCK_SIZE --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported that it has a different gtid_assignment_block_size value (as expected)]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Relaunch M2 with a different gtid_assignment_block_size from M1 and
+#    with exit_state_action set to ABORT_SERVER.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_gtid_assignment_block_size=GROUP_REPLICATION_GTID_ASSIGNMENT_BLOCK_SIZE --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported that it has a different gtid_assignment_block_size value (as expected)]
+
+#########################################################################
+# 5) Restart M2 again without group_replication_start_on_boot enabled.
+# The server should start normally and be able to join the group.
+#########################################################################
+
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_hash_algorithm.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_hash_algorithm.result
new file mode 100644
index 000000000000..03c1ade48b6e
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_hash_algorithm.result
@@ -0,0 +1,69 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+
+#########################################################################
+# 1) Relaunch M2 with a different hash algorithm from M1.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --transaction-write-set-extraction=HASH_ALGORITHM --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported that it has an incompatible option with the group (as expected)]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Relaunch M2 with a different hash algorithm from M1 and with
+# exit_state_action set to ABORT_SERVER.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --transaction-write-set-extraction=HASH_ALGORITHM --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported that it has an incompatible option with the group (as expected)]
+
+#########################################################################
+# 5) Restart M2 again without group_replication_start_on_boot enabled.
+# The server should start normally and be able to join the group.
+#########################################################################
+
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_single_primary_mode.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_single_primary_mode.result
new file mode 100644
index 000000000000..560dd0c66bb7
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_join_wrong_single_primary_mode.result
@@ -0,0 +1,69 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+
+#########################################################################
+# 1) Relaunch M2 with a different single_primary_mode from M1.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_single_primary_mode=FALSE --group_replication_enforce_update_everywhere_checks=FALSE--group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+#########################################################################
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#  (since it failed to join the group).
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [GR reported that it has an incompatible option with the group (as expected)]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Relaunch M2 with a different single_primary_mode from M1 and with
+# exit_state_action set to ABORT_SERVER.
+#########################################################################
+
+[connection server2]
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_start_on_boot=1 --group_replication_single_primary_mode=TRUE --group_replication_exit_state_action=ABORT_SERVER --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+
+#########################################################################
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#  (since it failed to join the group).
+#########################################################################
+
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+include/rpl_reconnect.inc
+[connection server2]
+include/assert_grep.inc [GR reported that it has an incompatible option with the group (as expected)]
+
+#########################################################################
+# 5) Restart M2 again without group_replication_start_on_boot enabled.
+# The server should start normally and be able to join the group.
+#########################################################################
+
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_majority_loss.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_majority_loss.result
new file mode 100644
index 000000000000..ee64a719f076
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_majority_loss.result
@@ -0,0 +1,104 @@
+
+#########################################################################
+# 0) Setup group of 3 members (M1, M2 and M3).
+#########################################################################
+
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("This member could not reach a majority of the members for more than.*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("\\[GCS\\] Timeout while waiting for the group communication engine to exit!");
+call mtr.add_suppression("\\[GCS\\] The member has failed to gracefully leave the group.");
+call mtr.add_suppression("\\[GCS\\] read failed");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+[connection server2]
+[connection server3]
+
+#########################################################################
+# 1) Force majority loss.
+#########################################################################
+
+[connection server2]
+[connection server3]
+
+#########################################################################
+# 1.1) Verify that member 1 went to ERROR state.
+#########################################################################
+
+[connection server1]
+include/gr_wait_for_member_state.inc
+include/assert.inc [super_read_only should be enabled]
+
+#########################################################################
+# 2) Relaunch group with exit state action to ABORT_SERVER.
+#########################################################################
+
+[connection server1]
+include/stop_group_replication.inc
+include/start_and_bootstrap_group_replication.inc
+include/rpl_reconnect.inc
+[connection server2]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER2";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER2";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_reconnect.inc
+[connection server3]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER3";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER3";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+#########################################################################
+# 3) Force another majority loss.
+#########################################################################
+
+[connection server2]
+[connection server3]
+
+#########################################################################
+# 4) Verify that member 1 aborted.
+#########################################################################
+
+[connection server1]
+
+#########################################################################
+# 5) Relaunch all members.
+#########################################################################
+
+include/rpl_reconnect.inc
+[connection server1]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_and_bootstrap_group_replication.inc
+include/rpl_reconnect.inc
+[connection server2]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER2";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER2";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_reconnect.inc
+[connection server3]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER3";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER3";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_member_expel.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_member_expel.result
new file mode 100644
index 000000000000..07fe3c4f00cc
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_member_expel.result
@@ -0,0 +1,79 @@
+
+#########################################################################
+# 0) Setup group of 3 members (M1, M2 and M3).
+#########################################################################
+
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+DROP TABLE pid_table;
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+
+#########################################################################
+# 1) Force expel of member 1.
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server3]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 1.1) Verify that member 1 went to super_read_only mode.
+#########################################################################
+
+[connection server1]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [super_read_only should be enabled]
+include/stop_group_replication.inc
+
+#########################################################################
+# 2) Set exit state action to ABORT_SERVER on member 1.
+#########################################################################
+
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3) Force expel again of member 1.
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server3]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 3.1) Wait until server is aborted.
+#########################################################################
+
+[connection server1]
+
+#########################################################################
+# 4) Relaunch member 1.
+#########################################################################
+
+include/rpl_reconnect.inc
+[connection server1]
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 5) Cleanup.
+#########################################################################
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery.result
new file mode 100644
index 000000000000..bb9ddba73597
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery.result
@@ -0,0 +1,95 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2) but only start GR on M2.
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server1]
+SET sql_log_bin = 0;
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+SET sql_log_bin = 1;
+[connection server2]
+include/start_and_bootstrap_group_replication.inc
+[connection server1]
+SET sql_log_bin = 0;
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 't1'*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code:*");
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+call mtr.add_suppression("Error while starting the group replication recovery receiver/applier threads");
+SET sql_log_bin = 1;
+
+#########################################################################
+# 1) Force error during the catch-up phase of M1.
+#########################################################################
+
+[connection server2]
+CREATE TABLE t1 (a INT PRIMARY KEY);
+[connection server1]
+include/start_group_replication.inc
+
+#########################################################################
+# 1.1) Verify that M1 goes into ERROR state and to super_read_only mode.
+#########################################################################
+
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/assert.inc [super_read_only should be enabled]
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 2) Set group_replication_exit_state_action to ABORT_SERVER on M1.
+#########################################################################
+
+[connection server1]
+include/stop_group_replication.inc
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+#########################################################################
+# 3) Force another error during the catch-up phase of M1.
+#########################################################################
+
+include/start_group_replication.inc
+
+#########################################################################
+# 3.1) Verify that M1 aborted.
+#########################################################################
+
+[connection server2]
+include/rpl_gr_wait_for_number_of_members.inc
+include/assert.inc [Member 1 should have aborted]
+
+#########################################################################
+# 4) Relaunch M1 and join the group.
+#########################################################################
+
+[connection server1]
+include/rpl_reconnect.inc
+[connection server1]
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
+RESET MASTER;
+SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
+SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 5) Cleanup.
+#########################################################################
+
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery_stage0.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery_stage0.result
new file mode 100644
index 000000000000..ddd5f40b0330
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_recovery_stage0.result
@@ -0,0 +1,98 @@
+
+#########################################################################
+# 0) Setup group of 3 members (M1, M2 and M3).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server2]
+[connection server2]
+SET sql_log_bin = 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Error 'Table 't1'*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Error writing relay log configuration.");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code:*");
+call mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("There was a previous plugin error while the member joined the group. The member will now exit the group.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET sql_log_bin = 1;
+
+#########################################################################
+# 1) Stop the applier on M2.
+#########################################################################
+
+[connection server2]
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+
+#########################################################################
+# 2) Replicate TRX from M1 to M2 but without M2 applying it.
+#########################################################################
+
+[connection server1]
+CREATE TABLE t1 (a INT PRIMARY KEY);
+[connection server2]
+
+#########################################################################
+# 3) Stop GR on M2.
+#########################################################################
+
+include/stop_group_replication.inc
+
+#########################################################################
+# 4) Start GR on M2 again so he tries to join the group.
+#########################################################################
+
+SET SESSION sql_log_bin = 0;
+CREATE TABLE t1 (a INT PRIMARY KEY);
+SET SESSION sql_log_bin = 1;
+START GROUP_REPLICATION;
+Got one of the listed errors
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 5) Set group_replication_exit_state_action sysvar to ABORT_SERVER on
+# M2.
+#########################################################################
+
+[connection server2]
+SET @group_replication_exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+SET GLOBAL group_replication_exit_state_action = ABORT_SERVER;
+
+#########################################################################
+# 6) Start GR on M2 again, so he tries to join the group. M2 should
+# not abort.
+#########################################################################
+
+START GROUP_REPLICATION;
+Got one of the listed errors
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/assert_grep.inc [The applier should error out trying to create an already existing table]
+include/gr_wait_for_member_state.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 7) Cleanup.
+#########################################################################
+
+[connection server1]
+DROP TABLE t1;
+[connection server2]
+SET SESSION sql_log_bin = 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin = 1;
+SET GLOBAL group_replication_exit_state_action = @group_replication_exit_state_action_saved;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_start_gr_cmd.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_start_gr_cmd.result
new file mode 100644
index 000000000000..49ef917a9b18
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_on_start_gr_cmd.result
@@ -0,0 +1,88 @@
+
+#########################################################################
+# 0) Setup group of 2 members (M1 and M2).
+#########################################################################
+
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+[connection server2]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Member version is incompatible with the group.");
+SET SESSION sql_log_bin = 1;
+
+#########################################################################
+# 1) Simulate a higher version on M1.
+#########################################################################
+
+[connection server1]
+SET @debug_saved= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
+include/start_and_bootstrap_group_replication.inc
+
+#########################################################################
+# 2) Try to join M2 to the group by issuing START GROUP_REPLICATION.
+#########################################################################
+
+[connection server2]
+SET @super_read_only_saved = @@GLOBAL.super_read_only;
+SET @exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+#########################################################################
+# 3) M2 should be in super_read_only mode and in OFFLINE state (since it
+# failed to join the group).
+#########################################################################
+
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert.inc [super_read_only should be enabled]
+include/assert_grep.inc [GR reported expected incompatibility on member version]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the
+# group again.
+#########################################################################
+
+[connection server2]
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+
+#########################################################################
+# 5) M2 should not abort().
+#########################################################################
+
+include/rpl_gr_wait_for_number_of_members.inc
+include/gr_wait_for_member_state.inc
+include/assert.inc [super_read_only should be enabled]
+include/assert_grep.inc [GR reported expected incompatibility on member version]
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 6) Remove the higher version from M1 and try to join M2 again. M2
+# should be able to join.
+#########################################################################
+
+SET @@GLOBAL.DEBUG = @debug_saved;
+include/stop_group_replication.inc
+include/start_and_bootstrap_group_replication.inc
+[connection server2]
+include/start_group_replication.inc
+include/rpl_gr_wait_for_number_of_members.inc
+[connection server1]
+include/rpl_gr_wait_for_number_of_members.inc
+
+#########################################################################
+# 7) Cleanup.
+#########################################################################
+
+[connection server2]
+SET @@GLOBAL.group_replication_exit_state_action = @exit_state_action_saved;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_option.result b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_option.result
new file mode 100644
index 000000000000..5ff9ec63efb6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_exit_state_action_option.result
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+#########################################################################
+# 0) The test requires one server.
+#########################################################################
+
+[connection server1]
+SET @exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+
+#########################################################################
+# 1) Check the default value. It should be READ_ONLY.
+#########################################################################
+
+SET @@GLOBAL.group_replication_exit_state_action = default;
+include/assert.inc [The default of group_replication_exit_state_action should be READ_ONLY]
+
+#########################################################################
+# 2) Set the sysvar to the possible valid values.
+#########################################################################
+
+SET GLOBAL group_replication_exit_state_action = "READ_ONLY";
+include/assert.inc [The default of group_replication_exit_state_action should be READ_ONLY]
+SET GLOBAL group_replication_exit_state_action = "ABORT_SERVER";
+include/assert.inc [The default of group_replication_exit_state_action should be ABORT_SERVER]
+
+#########################################################################
+# 3) Set the sysvar to invalid values. There should be an error and the
+#    value of the sysvar should not be altered.
+#########################################################################
+
+SET GLOBAL group_replication_exit_state_action = 42;
+ERROR 42000: Variable 'group_replication_exit_state_action' can't be set to the value of '42'
+SET GLOBAL group_replication_exit_state_action = on;
+ERROR 42000: Variable 'group_replication_exit_state_action' can't be set to the value of 'ON'
+SET GLOBAL group_replication_exit_state_action = "abort";
+ERROR 42000: Variable 'group_replication_exit_state_action' can't be set to the value of 'abort'
+SET GLOBAL group_replication_exit_state_action = "READ_ONLY";
+include/assert.inc [The default of group_replication_exit_state_action should be READ_ONLY]
+
+#########################################################################
+# 4) Cleanup.
+#########################################################################
+
+SET GLOBAL group_replication_exit_state_action = @exit_state_action_saved;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_force_peer_addresses_option.result b/rapid/plugin/group_replication/tests/mtr/r/gr_force_peer_addresses_option.result
index c60fdf135588..704da2c04de9 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_force_peer_addresses_option.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_force_peer_addresses_option.result
@@ -11,7 +11,7 @@ call mtr.add_suppression("Unable to start Group Replication on boot");
 call mtr.add_suppression("force_members can only be updated when Group Replication is running*");
 call mtr.add_suppression("The member lost contact with a majority of the members in the group. Until the network is restored.*");
 call mtr.add_suppression("\\[GCS\\] Peer address .* is not valid.");
-call mtr.add_suppression("\\[GCS\\] The peers list contains invalid addresses.Please provide a list with only valid addresses.");
+call mtr.add_suppression("\\[GCS\\] The peers list contains invalid addresses. Please provide a list with only valid addresses.");
 call mtr.add_suppression("Error setting group_replication_force_members value .* on group communication interfaces");
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 SET SESSION sql_log_bin= 1;
@@ -77,7 +77,7 @@ include/gr_wait_for_member_state.inc
 #    set. Group Replication start will error out.
 #    2 members.
 [connection server2]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_force_members=127.0.0.1:10000
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_force_members=127.0.0.1:10000 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/assert.inc [Member 2 is OFFLINE]
 
@@ -109,7 +109,7 @@ include/assert.inc [group_replication_force_members must be empty]
 ############################################################
 # 10. Kill and restart a member to group loose majority.
 [connection server1]
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_foreign_key_on_referenced_unique_key_conflict.result b/rapid/plugin/group_replication/tests/mtr/r/gr_foreign_key_on_referenced_unique_key_conflict.result
new file mode 100644
index 000000000000..e3e272612678
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_foreign_key_on_referenced_unique_key_conflict.result
@@ -0,0 +1,191 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# Create a table on server1.
+[connection server1]
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, UNIQUE KEY(c2));
+CREATE TABLE t2 (x1 INT PRIMARY KEY, x2 INT, FOREIGN KEY (x2) REFERENCES t1(c2));
+INSERT INTO t1 VALUES (1,1);
+include/rpl_sync.inc
+
+############################################################
+# 0. Initial setup and checks.
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/gtid_step_reset.inc
+
+############################################################
+# 1. Set a debug sync before broadcast message to group on
+#    connection local_server_connection1.
+[connection server_1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='d,group_replication_before_message_broadcast';
+
+#####################################################################
+# 2. Commit local_transaction that will be blocked before broadcast.
+BEGIN;
+DELETE FROM t1 WHERE c1=1;
+COMMIT;
+
+############################################################
+# 3. Wait until local transaction reaches the
+# group_replication_before_message_broadcast debug sync point.
+[connection server1]
+
+############################################################
+# 4. Execute a transaction on remote server, that will reach first
+#    certification, since transaction on the local server
+#    is blocked before broadcast.
+[connection server2]
+BEGIN;
+INSERT INTO t2 VALUES (1,1);
+COMMIT;
+
+############################################################
+# 5. Signal the waiting thread on local server to resume the
+#    transaction.
+[connection server1]
+SET DEBUG_SYNC='now SIGNAL waiting';
+SET @@GLOBAL.DEBUG= @debug_save;
+
+############################################################
+# 6. Wait for remote transaction to be executed succesfully
+on local server.
+[connection server2]
+include/sync_slave_sql_with_master.inc
+############################################################
+# 7. If the test case is conflict scenario, local transaction
+#    will end up in an error stating that it was aborted,
+#    since transactions are conflicting and transaction on
+#    remote server was ordered first. If the test case is
+#    is positive scenario, no error will be seen here.
+[connection server_1]
+ERROR HY000: Plugin instructed the server to rollback the current transaction.
+[connection server_1]
+SET @@GLOBAL.DEBUG=@debug_save;
+############################################################
+# 8. Sync everything
+include/rpl_sync.inc
+############################################################
+# 9. Assert that number of certified transactions are the
+#    expected ones.
+include/assert.inc [The value of Count_Transactions_Checked should be 5 after starting group replication]
+include/assert.inc [The value of Count_Conflicts_Detected should be 1 after starting group replication]
+############################################################
+# 10. Assert that GTID is increased as expected
+include/gtid_step_assert.inc [count=1, only_count=1]
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+############################################################
+# 11. Cleanup (restore the connection back to original)
+[connection server1]
+
+############################################################
+# Checking the positive case in which there is no conflict.
+############################################################
+
+INSERT INTO t1 VALUES (2,2);
+INSERT INTO t1 VALUES (3,3);
+include/rpl_sync.inc
+
+############################################################
+# 0. Initial setup and checks.
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils.inc
+SET SESSION sql_log_bin= 1;
+include/gtid_step_reset.inc
+
+############################################################
+# 1. Set a debug sync before broadcast message to group on
+#    connection local_server_connection1.
+[connection server_1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='d,group_replication_before_message_broadcast';
+
+#####################################################################
+# 2. Commit local_transaction that will be blocked before broadcast.
+BEGIN;
+DELETE FROM t1 WHERE c1=2;
+COMMIT;
+
+############################################################
+# 3. Wait until local transaction reaches the
+# group_replication_before_message_broadcast debug sync point.
+[connection server1]
+
+############################################################
+# 4. Execute a transaction on remote server, that will reach first
+#    certification, since transaction on the local server
+#    is blocked before broadcast.
+[connection server2]
+BEGIN;
+INSERT INTO t2 VALUES (3,3);
+COMMIT;
+
+############################################################
+# 5. Signal the waiting thread on local server to resume the
+#    transaction.
+[connection server1]
+SET DEBUG_SYNC='now SIGNAL waiting';
+SET @@GLOBAL.DEBUG= @debug_save;
+
+############################################################
+# 6. Wait for remote transaction to be executed succesfully
+on local server.
+[connection server2]
+include/sync_slave_sql_with_master.inc
+############################################################
+# 7. If the test case is conflict scenario, local transaction
+#    will end up in an error stating that it was aborted,
+#    since transactions are conflicting and transaction on
+#    remote server was ordered first. If the test case is
+#    is positive scenario, no error will be seen here.
+[connection server_1]
+[connection server_1]
+SET @@GLOBAL.DEBUG=@debug_save;
+############################################################
+# 8. Sync everything
+include/rpl_sync.inc
+############################################################
+# 9. Assert that number of certified transactions are the
+#    expected ones.
+include/assert.inc [The value of Count_Transactions_Checked should be 9 after starting group replication]
+include/assert.inc [The value of Count_Conflicts_Detected should be 1 after starting group replication]
+############################################################
+# 10. Assert that GTID is increased as expected
+include/gtid_step_assert.inc [count=2, only_count=1]
+[connection server_1]
+SET SESSION sql_log_bin= 0;
+include/gtid_utils_end.inc
+SET SESSION sql_log_bin= 1;
+############################################################
+# 11. Cleanup (restore the connection back to original)
+[connection server1]
+
+############################################################
+# Check the data sanity
+[connection server1]
+include/rpl_sync.inc
+include/assert.inc [Table t1 will contain tuple (1,1)]
+include/assert.inc [Table t1 will contain tuple (3,3)]
+include/assert.inc [Table t1 will contain 2 rows]
+include/assert.inc [Table t2 will contain tuple (1,1)]
+include/assert.inc [Table t2 will contain tuple (3,3)]
+include/assert.inc [Table t2 will contain 2 rows]
+include/diff_tables.inc [server1:test.t1, server2:test.t1]
+include/diff_tables.inc [server1:test.t2, server2:test.t2]
+
+############################################################
+# Clean up.
+DROP TABLE t2;
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_group_name_validation_on_boot.result b/rapid/plugin/group_replication/tests/mtr/r/gr_group_name_validation_on_boot.result
index 61832352b892..37be2c9d9213 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_group_name_validation_on_boot.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_group_name_validation_on_boot.result
@@ -7,9 +7,9 @@ SET SESSION sql_log_bin=1;
 [connection server1]
 [ON SERVER1]
 include/start_and_bootstrap_group_replication.inc
-# restart:--group-replication-start-on-boot=1 --group-replication-group-name=aaaaaaaa-aaaa-aaaa-aaaa-invalidvalueused --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1
+# restart:--group-replication-start-on-boot=1 --group-replication-group-name=aaaaaaaa-aaaa-aaaa-aaaa-invalidvalueused --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # Asserting that the error due to invalid group name is being thrown.
 Occurrences of 'is not a valid UUID' in the input file: 1
-# restart:--group-replication-start-on-boot=0 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1
+# restart:--group-replication-start-on-boot=0 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 SET GLOBAL group_replication_group_name="aaaaaaaa-aaaa-aaaa-aaaa-invalidvalueused";
 ERROR 42000: The group name is not a valid UUID, its length is too big
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_incorrect_group_name_join.result b/rapid/plugin/group_replication/tests/mtr/r/gr_incorrect_group_name_join.result
index 3335a5637b8e..896736e95436 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_incorrect_group_name_join.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_incorrect_group_name_join.result
@@ -5,6 +5,9 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server1]
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+SET SESSION sql_log_bin= 1;
 [connection server2]
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("Timeout on wait for view after joining group");
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result b/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result
index 6485c58274c7..c41c2896ac8f 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_key_rotation.result
@@ -10,7 +10,7 @@ call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'keyring_fil
 call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyring' not found .*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 SET @@global.keyring_file_data='MYSQL_TMP_DIR/keyring_server1/keyring_server1';
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
@@ -29,8 +29,8 @@ INSERT INTO t2 VALUEs(2,2);
 [connection server2]
 set sql_log_bin=0;
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded*");
-call mtr.add_suppression(".*Can't find master key from keyring, please check keyring plugin is loaded*");
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check keyring plugin is loaded.' on query*");
+call mtr.add_suppression(".*Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
+call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.' on query*");
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.'");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.'");
@@ -43,7 +43,7 @@ call mtr.add_suppression("\\[ERROR\\] Plugin keyring_file reported: 'File .*keyr
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'Message received while the plugin is not ready, message discarded'*");
 set sql_log_bin=1;
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 INSTALL PLUGIN keyring_file SONAME 'keyring_file.so';
 SET @@global.keyring_file_data='MYSQL_TMP_DIR/keyring_server2/keyring_server2';
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
@@ -63,9 +63,9 @@ UNINSTALL PLUGIN keyring_file;
 SELECT PLUGIN_NAME,PLUGIN_VERSION,PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE plugin_name='keyring_file';
 INSERT INTO t1 VALUES(7,'seventh');
 CREATE TABLE t3(c1 INT PRIMARY KEY, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 ALTER INSTANCE ROTATE INNODB MASTER KEY;
-ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
+ERROR HY000: Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.
 [connection server1]
 CREATE TABLE t3(c1 INT PRIMARY KEY) ENCRYPTION="Y" ENGINE = InnoDB;
 INSERT INTO t3 VALUES(1);
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_lower_case_table_names.result b/rapid/plugin/group_replication/tests/mtr/r/gr_lower_case_table_names.result
new file mode 100644
index 000000000000..d91ae471e446
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_lower_case_table_names.result
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+## 1.  Verify lower_case_table_names cannot be set while server is
+##     running and start GR on server-1.
+
+[connection server1]
+SET GLOBAL lower_case_table_names= 1;
+ERROR HY000: Variable 'lower_case_table_names' is a read only variable
+include/start_and_bootstrap_group_replication.inc
+
+## 2.  Store variables of server-2 for restart.
+
+[connection server2]
+set session sql_log_bin=0;
+call mtr.add_suppression("The member is configured with a lower_case_table_names option value .*");
+call mtr.add_suppression("lower_case_table_names was set to 2, .*");
+set session sql_log_bin=1;
+
+## 3A. Test GR start with command when lower_case_table_names matches.
+
+include/start_group_replication.inc
+include/assert.inc ['Assert server-1 and server-2 are ONLINE']
+
+## 3B. Test GR start on boot when lower_case_table_names matches.
+
+# restart:--group_replication_start_on_boot=1 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --lower_case_table_names=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+## 4A. Test GR does not start on boot when lower_case_table_names
+##     does not match.
+
+# restart:--group_replication_start_on_boot=1 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --lower_case_table_names=2 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
+include/rpl_reconnect.inc
+
+## 4B. Test GR does not start with command when lower_case_table_names
+##     does not match.
+
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/assert_grep.inc [Found the expected error about lower_case_table_names]
+include/assert.inc ['Assert server-2 is OFFLINE']
+
+## 5.  Cleanup.
+
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_failover_while_dml.result b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_failover_while_dml.result
index 1a59edc64e17..321caf26cf5f 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_failover_while_dml.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_failover_while_dml.result
@@ -27,7 +27,7 @@ call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': .
 call mtr.add_suppression("Error in Log_event::read_log_event()");
 set sql_log_bin=1;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
 include/rpl_reconnect.inc
 [connection server_1]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_2_to_1.result b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_2_to_1.result
index 979d48f27f3a..38fe3ac4dfe9 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_2_to_1.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_2_to_1.result
@@ -20,6 +20,7 @@ include/rpl_reconnect.inc
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER2";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER2";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 [connection server_1]
 include/rpl_gr_wait_for_number_of_members.inc
 INSERT INTO t1 VALUES (1);
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_restart.result b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_restart.result
index 03f861cd3c66..026ef43be336 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_restart.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_majority_loss_restart.result
@@ -5,6 +5,11 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server1]
 [connection server1]
 [connection server2]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+SET SESSION sql_log_bin= 1;
 
 ############################################################
 # 1. Crash server 2.
@@ -27,24 +32,31 @@ include/assert.inc [server 2 is marked as unreachable]
 
 ############################################################
 # 4. Restart server 2 with group_replication_start_on_boot=ON,
-#    server 2 will rejoin and unblock the group.
+#    server 2 will be refused to join the group.
 [connection server2]
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 [connection server1]
-include/gr_wait_for_member_state.inc
+include/assert.inc [server 2 is marked as unreachable]
+
+############################################################
+# 5. Unblock group with server1 as a single member.
+SET GLOBAL group_replication_force_members= "SERVER1_ADDRESS";
 
 ############################################################
-# 5. Check that statement did unblock and was applied on
-#    both members.
+# 6. Check that statement did unblock and was applied on
+#    server1.
 [connection server_1]
-include/rpl_sync.inc
 [connection server1]
+
+############################################################
+# 7. Rejoin server2
 [connection server2]
+include/start_group_replication.inc
 
 ############################################################
-# 6. Execute a transaction on both members.
+# 8. Execute a transaction on both members.
 [connection server1]
 INSERT INTO t1 VALUES (1);
 [connection server2]
@@ -52,7 +64,7 @@ INSERT INTO t1 VALUES (2);
 include/rpl_sync.inc
 
 ############################################################
-# 7. Validate data.
+# 9. Validate data.
 [connection server1]
 include/assert.inc ['There are two values in table t1']
 include/show_binlog_events.inc
@@ -90,6 +102,6 @@ server-binary-log.000003	#	Xid	#	#	COMMIT /* XID */
 include/diff_tables.inc [server1:test.t1, server2:test.t1]
 
 ############################################################
-# 8. Clean up.
+# 10. Clean up.
 DROP TABLE t1;
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_member_expel_during_shutdown.result b/rapid/plugin/group_replication/tests/mtr/r/gr_member_expel_during_shutdown.result
index 0e89367de579..d079cb9d7ffb 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_member_expel_during_shutdown.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_member_expel_during_shutdown.result
@@ -19,7 +19,7 @@ Note	####	Storing MySQL user name or password information in the master info rep
 #    assert failures on SQL service
 #    Srv_session::deinit_thread().
 [connection server4]
-# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 
 ############################################################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_member_host_port.result b/rapid/plugin/group_replication/tests/mtr/r/gr_member_host_port.result
index b543f338d25c..168f7d4124e3 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_member_host_port.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_member_host_port.result
@@ -11,7 +11,7 @@ include/assert.inc [The performance_schema.replication_group_members.MEMBER_PORT
 # 2. Verify that when startup options report-host and report-port are
 # set, performance_schema.replication_group_members.MEMBER_HOST and
 # MEMBER_PORT are set equal to report-host and report-port.
-# restart:--report-host=server1-test-host --report-port=1999 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--report-host=server1-test-host --report-port=1999 --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
 include/assert.inc [The performance_schema.replication_group_members.MEMBER_HOST matches with report-host startup option]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_groups_in_group_seeds.result b/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_groups_in_group_seeds.result
index 826c41f4a579..d024b4eb7d1c 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_groups_in_group_seeds.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_groups_in_group_seeds.result
@@ -8,8 +8,14 @@ Note	####	Storing MySQL user name or password information in the master info rep
 #
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
+set session sql_log_bin=0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+set session sql_log_bin=1;
 [connection server2]
 include/start_and_bootstrap_group_replication.inc
+set session sql_log_bin=0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+set session sql_log_bin=1;
 #
 # GROUP#1 is b0000000-7fb8-11e6-9f35-ac56a84b7f00
 # GROUP#2 is b1111111-7fb8-11e6-9f35-ac56a84b7f11
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_version_members.result b/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_version_members.result
index b6009cf74f5e..1dd87a6bfeb1 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_version_members.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_multiple_version_members.result
@@ -21,7 +21,8 @@ INSERT INTO t1 VALUES (1);
 #
 # Try to add a new member with a higher minor version
 # Version = Base version + 1 minor version
-# The member will join the group
+# The member will join the group as there are other members with the
+# same major version
 #
 server2
 SET @debug_saved_s2= @@GLOBAL.DEBUG;
@@ -34,9 +35,6 @@ include/assert.inc [On the recovered member, the table should contain 1 elements
 # It will succeed since the major version is the same
 #
 server3
-SET session sql_log_bin=0;
-call mtr.add_suppression("Member version is incompatible with the group");
-SET session sql_log_bin=1;
 include/start_group_replication.inc
 #
 # Try to add a new member with a higher major version
@@ -49,62 +47,64 @@ SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
 include/start_group_replication.inc
 include/assert.inc [On the recovered member, the table should contain 1 elements]
 #
-# Try to add a new member with a major version equal to the base version,
-# but a higher minor version.
+# Add server 4 with a higher minor version than base
 # Version = Base version + 1 minor version
-# It will fail to join since a higher major version member is present
+# The member will join the group as there are other members with the
+# same major version
 #
 server4
 SET @debug_saved_s4= @@GLOBAL.DEBUG;
-SET session sql_log_bin=0;
-call mtr.add_suppression("Member version is incompatible with the group");
-SET session sql_log_bin=1;
 SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
-SET GLOBAL group_replication_group_name= "8a1da670-05fa-11e5-b939-0800200c9a66";
-START GROUP_REPLICATION;
-ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+include/start_group_replication.inc
+include/assert.inc [On the recovered member, the table should contain 1 elements]
 #
-# Make server 3 leave so every member has the same major version
-# Try to add server 4 again with a higher minor version than base
-# Version = Base version + 1 minor version
-# The member will join the group
+# Remove server 1 and server 2
+# Try to add a new member with a base version than member 1
+# Version = Base version
+# The member will join the group because of server 4 which has
+# same major version
 #
-server3
+server1
 include/stop_group_replication.inc
-server4
+server2
+include/stop_group_replication.inc
+server5
 include/start_group_replication.inc
 include/assert.inc [On the recovered member, the table should contain 1 elements]
 #
-# Remove all servers with higher minor versions
-# Try to add a new member with a lower patch version than member 1
+# Remove all servers with base major version.
+# Try to add a new member with a base version.
 # Version = Base version
-# The member will join the group
+# The member will not join the group because of server 3
+# has higher major version.
 #
-server2
-include/stop_group_replication.inc
 server4
 include/stop_group_replication.inc
 server5
-include/start_group_replication.inc
-include/assert.inc [On the recovered member, the table should contain 1 elements]
+include/stop_group_replication.inc
+SET session sql_log_bin=0;
+call mtr.add_suppression("Member version is incompatible with the group");
+SET session sql_log_bin=1;
+SET GLOBAL group_replication_group_name= "8a1da670-05fa-11e5-b939-0800200c9a66";
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
 #
 # Clean up
 #
+server3
+include/stop_group_replication.inc
+SET @@GLOBAL.DEBUG= @debug_save_s3;
+include/start_and_bootstrap_group_replication.inc
 server1
 SET @@GLOBAL.DEBUG= @debug_save_s1;
-include/stop_group_replication.inc
 include/start_group_replication.inc
 server2
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
-include/start_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_save_s2;
-server3
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
 include/start_group_replication.inc
-SET @@GLOBAL.DEBUG= @debug_save_s3;
 server4
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
-include/start_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_save_s4;
+include/start_group_replication.inc
+server5
+include/start_group_replication.inc
 DROP TABLE t1;
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_no_user_start_failure.result b/rapid/plugin/group_replication/tests/mtr/r/gr_no_user_start_failure.result
index c1b4af25f3c7..a446a19d4c8b 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_no_user_start_failure.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_no_user_start_failure.result
@@ -17,7 +17,7 @@ include/assert_grep.inc [Found the expected error about the missing user in serv
 # Restart the server
 # Check the plugin is not running
 #
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/assert.inc [Member 1 is OFFLINE]
 #
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_parallel_applier_indexes_commit_order.result b/rapid/plugin/group_replication/tests/mtr/r/gr_parallel_applier_indexes_commit_order.result
index b5fa376cf626..7728a6bfb11e 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_parallel_applier_indexes_commit_order.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_parallel_applier_indexes_commit_order.result
@@ -18,11 +18,11 @@ Note	####	Storing MySQL user name or password information in the master info rep
 #
 [connection server1]
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 [connection server2]
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 # Create a table on all members.
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_perfschema_group_member_stats.result b/rapid/plugin/group_replication/tests/mtr/r/gr_perfschema_group_member_stats.result
index 7f39b0d6f58a..6a2cfa57755a 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_perfschema_group_member_stats.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_perfschema_group_member_stats.result
@@ -1,7 +1,7 @@
 ###################
 Cleanup and server setup
 ###################
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 server2
 RESET MASTER;
 server1
@@ -53,7 +53,7 @@ server1
 include/assert.inc [The value of member_id should be equal to server UUID after starting group replication]
 include/assert.inc [The value of Count_Transactions_checked should be 6 after starting group replication]
 include/assert.inc [The value of Count_conflicts_detected should be 0 after starting group replication]
-include/assert.inc [The value of Count_Transactions_rows_validating should be 2 after starting group replication]
+include/assert.inc [The value of Count_Transactions_rows_validating should be 6 after starting group replication]
 include/assert.inc [The value of Transactions_committed_all_members should have server 1 GTIDs before server2 start]
 include/assert.inc [The value of Last_Conflict_free_transaction should be the gtid of the last applied transaction.]
 SET SESSION sql_log_bin= 0;
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_plugin_reinstall_with_start_on_boot.result b/rapid/plugin/group_replication/tests/mtr/r/gr_plugin_reinstall_with_start_on_boot.result
index 7e1312052ca5..b623aff6bf3e 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_plugin_reinstall_with_start_on_boot.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_plugin_reinstall_with_start_on_boot.result
@@ -4,7 +4,7 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 [connection server2]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 SET SESSION SQL_LOG_BIN=0;
 call mtr.add_suppression("The group name option is mandatory");
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_psi_keys.result b/rapid/plugin/group_replication/tests/mtr/r/gr_psi_keys.result
index 663d9ac1d6e4..08861a20b512 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_psi_keys.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_psi_keys.result
@@ -42,7 +42,6 @@ wait/synch/rwlock/group_rpl/RWLOCK_certifier_stable_gtid_set	YES	YES
 wait/synch/rwlock/group_rpl/RWLOCK_io_cache_unused_list	YES	YES
 wait/synch/rwlock/group_rpl/RWLOCK_plugin_stop	YES	YES
 wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations	YES	YES
-wait/synch/rwlock/group_rpl/RWLOCK_gcs_operations_finalize_ongoing	YES	YES
 wait/synch/cond/group_rpl/COND_applier_module_run	YES	YES
 wait/synch/cond/group_rpl/COND_applier_module_suspend	YES	YES
 wait/synch/cond/group_rpl/COND_applier_module_wait	YES	YES
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_readmode_on_autostart.result b/rapid/plugin/group_replication/tests/mtr/r/gr_readmode_on_autostart.result
index 6ab3f4a8c119..e2065dfccf66 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_readmode_on_autostart.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_readmode_on_autostart.result
@@ -23,7 +23,7 @@ call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave
 call mtr.add_suppression("On plugin shutdown it was not possible to enable the server read only mode.*");
 set session sql_log_bin=1;
 SET @debug_save= @@GLOBAL.DEBUG;
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/gr_wait_for_member_state.inc
 #
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_channel.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_channel.result
index 79ea7d1274fb..ed0845d3172b 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_channel.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_channel.result
@@ -26,6 +26,7 @@ Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 include/assert.inc ['The slave channel is present']
 RESET SLAVE ALL;
+ERROR HY000: RESET SLAVE ALL FOR CHANNEL cannot be performed on channel 'group_replication_applier'.
 include/assert.inc ['The group replication recovery channel is present']
 include/assert.inc ['The group replication recovery channel is ON']
 include/assert.inc ['The slave channel is not present']
@@ -35,7 +36,7 @@ Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 include/start_slave.inc
 include/assert.inc ['The created slave channel is ON']
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_connection_options.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_connection_options.result
index d647a4455818..2b535d180d96 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_connection_options.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_connection_options.result
@@ -40,6 +40,8 @@ call mtr.add_suppression("Error leaving the group");
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
 call mtr.add_suppression(".*Invalid .* username when attempting to connect to the master server.*");
 set session sql_log_bin=1;
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 CHANGE MASTER TO MASTER_USER='$recovery_user', MASTER_PASSWORD='$recovery_bad_password' FOR CHANNEL 'group_replication_recovery';
 # Set the retry count to try only twice. One time for each member.
 SET GLOBAL group_replication_recovery_retry_count= 2;;
@@ -47,29 +49,20 @@ SET GLOBAL group_replication_recovery_retry_count= 2;;
 SET GLOBAL group_replication_recovery_reconnect_interval= 1;;
 include/assert.inc [The value of the recovery retry count should be equal to 2]
 # Start recovery and wait to verify the member is in recovery
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 include/start_group_replication.inc
-# Wake up recovery
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
-SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 # The member should error out as it can't connect
+SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 include/gr_wait_for_member_state.inc
 #
 # Set MASTER_USER to an empty user name, watching it fail
 #
-SET @debug_save= @@GLOBAL.DEBUG;
 include/stop_group_replication.inc
 CHANGE MASTER TO MASTER_USER= '', MASTER_PASSWORD= '' FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 # Start recovery and wait to verify the member is in recovery
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 include/start_group_replication.inc
-# Wake up recovery
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
 SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 include/gr_wait_for_member_state.inc
 # Verify that the show slave status shows specific IO_error
@@ -77,17 +70,12 @@ include/stop_group_replication.inc
 #
 # Set MASTER_USER to non existing user, watching it fail
 #
-SET @debug_save= @@GLOBAL.DEBUG;
 CHANGE MASTER TO MASTER_USER= 'parveez', MASTER_PASSWORD= 'me' FOR CHANNEL 'group_replication_recovery';
 Warnings:
 Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 # Start recovery and wait to verify the member is in recovery
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 include/start_group_replication.inc
-# Wake up recovery
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
 SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 include/gr_wait_for_member_state.inc
 # Verify that show slave status shows specific IO_ERROR
@@ -98,6 +86,7 @@ include/rpl_gr_wait_for_number_of_members.inc
 #
 DROP USER "recovery_user";
 SET DEBUG_SYNC='RESET';
+SET @@GLOBAL.DEBUG = @debug_save;
 SET GLOBAL group_replication_recovery_retry_count= 10;
 SET GLOBAL group_replication_recovery_reconnect_interval= 60;
 DROP TABLE t1;
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_errors_report.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_errors_report.result
new file mode 100644
index 000000000000..d2b34d4c09e5
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_errors_report.result
@@ -0,0 +1,45 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Bootstrap group on server1 and create table t1 on it.
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+############################################################
+# 2. Create the same table t1 on server1 and then join it to
+#    the group, recovery will fail.
+#    Assert that error is visible on
+#    performance_schema.replication_applier_status_by_worker
+#    and SHOW SLAVE STATUS between retry attempts.
+[connection server2]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Worker [0-9] failed executing transaction .*; Error 'Table 't1' already exists' on query.*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 't1' already exists' on query.*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code: 1050");
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin= 1;
+SET @group_replication_recovery_reconnect_interval_save= @@GLOBAL.group_replication_recovery_reconnect_interval;
+SET GLOBAL group_replication_recovery_reconnect_interval= 3600;
+SET GLOBAL group_replication_group_name= "GROUP_REPLICATION_GROUP_NAME";
+START GROUP_REPLICATION;
+# Wait until the error is reported on performance_schema.replication_applier_status_by_worker table
+include/assert.inc [Recovery channel error is reported on Last_Errno]
+include/assert.inc [Recovery channel error is reported on Last_SQL_Errno]
+include/assert.inc [MEMBER_STATE is RECOVERING]
+include/stop_group_replication.inc
+SET GLOBAL group_replication_recovery_reconnect_interval= @group_replication_recovery_reconnect_interval_save;
+
+############################################################
+# 3. Clean up.
+[connection server2]
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
+[connection server1]
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_fails_to_detect_thread_stop.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_fails_to_detect_thread_stop.result
index a4a30d6d2c65..82dc1146f756 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_fails_to_detect_thread_stop.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_fails_to_detect_thread_stop.result
@@ -7,6 +7,9 @@ Note	####	Storing MySQL user name or password information in the master info rep
 #####################################################################
 # 1. Create a table on server1 and generate workload to be recovered
 include/start_and_bootstrap_group_replication.inc
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
+SET SESSION sql_log_bin= 1;
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_lower_max_retry_count.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_lower_max_retry_count.result
new file mode 100644
index 000000000000..7a9ff5598e60
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_lower_max_retry_count.result
@@ -0,0 +1,49 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Bootstrap start a group on M1.
+
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+
+# 2. Setup environment to fail donor connection and start GR on M2.
+#    Set DEBUG on M2 to block donor connection attempt when count reaches 3.
+#    Verify M2 is in recovery state.
+
+[connection server2]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @recovery_reconnect_interval_save= @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL;
+SET @recovery_retry_count_save= @@GLOBAL.group_replication_recovery_retry_count;
+CHANGE MASTER TO MASTER_USER="user_does_not_exist" FOR CHANNEL "group_replication_recovery";
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin = 1;
+SET @@GLOBAL.DEBUG='+d,gr_reset_max_connection_attempts_to_donors';
+SET GLOBAL group_replication_recovery_reconnect_interval= 2;
+include/start_group_replication.inc
+
+# 3. Reset group_replication_recovery_retry_count to 2.
+#    Signal donor connection attempt to continue.
+
+SET DEBUG_SYNC= "now WAIT_FOR signal.connection_attempt_3";
+SET GLOBAL group_replication_recovery_retry_count= 2;
+SET DEBUG_SYNC= "now SIGNAL signal.reset_recovery_retry_count_done";
+
+# 4. Verification.
+
+include/gr_wait_for_member_state.inc
+include/assert_grep.inc [3 donor connections attempts were made.]
+include/assert_grep.inc [Post change of group_replication_recovery_retry_count, 4th donor connection attempt was not made.]
+include/assert_grep.inc [Recovery process aborted.]
+
+# 5. Clean up.
+
+SET @@GLOBAL.DEBUG= @debug_save;
+SET @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL= @recovery_reconnect_interval_save;
+SET @@GLOBAL.group_replication_recovery_retry_count= @recovery_retry_count_save;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_no_donors.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_no_donors.result
index 1812fe72528a..d3093726c562 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_no_donors.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_no_donors.result
@@ -10,6 +10,7 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server1]
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("Fatal error during the Recovery process of Group Replication.*");
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
 call mtr.add_suppression("Error leaving the group");
 call mtr.add_suppression("All donors left. Aborting group replication recovery.");
 call mtr.add_suppression("This member has more executed transactions *.*");
@@ -19,6 +20,7 @@ call mtr.add_suppression("Skipping leave operation: member already left the grou
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
 call mtr.add_suppression("Transaction cannot be executed while Group Replication is stopping.");
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
 SET GLOBAL EVENT_SCHEDULER= ON;
@@ -53,6 +55,7 @@ call mtr.add_suppression("All donors left. Aborting group replication recovery."
 call mtr.add_suppression("The member is already leaving or joining a group.");
 call mtr.add_suppression("Skipping leave operation: member already left the group.");
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 [connection server3]
 SET SESSION sql_log_bin= 0;
@@ -63,6 +66,7 @@ call mtr.add_suppression("All donors left. Aborting group replication recovery."
 call mtr.add_suppression("The member is already leaving or joining a group.");
 call mtr.add_suppression("Skipping leave operation: member already left the group.");
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 
 ############################################################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_purged_donor_failover.result b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_purged_donor_failover.result
index 5f75b6023a05..8cf3c81c5102 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_purged_donor_failover.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_recovery_purged_donor_failover.result
@@ -7,6 +7,9 @@ Note	####	Storing MySQL user name or password information in the master info rep
 # Setup a new 2 member group
 #
 include/start_and_bootstrap_group_replication.inc
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
+SET SESSION sql_log_bin= 1;
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_name_change.result b/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_name_change.result
index 9dbe35e81041..319f06138069 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_name_change.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_name_change.result
@@ -17,17 +17,18 @@ include/start_and_bootstrap_group_replication.inc
 
 ##############################################
 # 1: Restart the server enabling GR on startup
-# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON
+# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/gr_wait_for_member_state.inc
 
 #####################################################
 # 2: Restart the server changing the relay-log option
-# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --relay-log=new-relay-log-name
+# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST --relay-log=new-relay-log-name
 include/gr_wait_for_member_state.inc
 RESET SLAVE FOR CHANNEL 'group_replication_applier';
 
 #######################################################
 # 3: Restart the server again after removing the broken
 #    group_replication_applier channel
-# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --relay-log=new-relay-log-name --relay-log=new-relay-log-name
+# restart:--group-replication-start-on-boot=ON --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=ON --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST --relay-log=new-relay-log-name --relay-log=new-relay-log-name
 include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_recovery.result b/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_recovery.result
index ce0e1895b9db..3c0f47f5eb53 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_recovery.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_relay_log_recovery.result
@@ -13,14 +13,14 @@ call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave
 include/gtid_utils.inc
 SET SESSION sql_log_bin= 1;
 # This will not generate error during relay log recovery on restart as relay log for group_replication channels are ignored.
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --relay-log-recovery=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --relay-log-recovery=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 #No server crash here on starting group replication.
 include/rpl_reconnect.inc
 include/start_group_replication.inc
 # Asserting that the successful start group_replication does not purge relay logs.
 include/assert.inc [RECEIVED_GTID must be similar to the one before restart as the relay logs are not purged.]
 # This restart will not generate any error as relay-log-recovery is OFF.
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --relay-log-recovery=0
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --relay-log-recovery=0 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 #No server crash here on starting group replication.
 include/rpl_reconnect.inc
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_reset_slave_channel.result b/rapid/plugin/group_replication/tests/mtr/r/gr_reset_slave_channel.result
index 11dfd57e4129..f7bc78c5dbff 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_reset_slave_channel.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_reset_slave_channel.result
@@ -18,6 +18,7 @@ CHANGE MASTER TO MASTER_HOST="127.0.0.1", MASTER_USER="root", MASTER_PASSWORD=""
 include/assert.inc ['The group replication applier channel is present']
 include/assert.inc ['The slave channel is present']
 RESET SLAVE ALL;
+ERROR HY000: RESET SLAVE ALL FOR CHANNEL cannot be performed on channel 'group_replication_applier'.
 include/assert.inc ['The group replication applier channel is still present']
 include/assert.inc ['The group replication applier channel is ON']
 include/assert.inc ['The slave channel is not present']
@@ -33,5 +34,25 @@ include/start_group_replication.inc
 INSERT INTO t1 VALUES (5);
 include/rpl_sync.inc
 include/assert.inc [The table should contain 5 elements]
+server2
+Vefiry that group replication channels are present
+include/assert.inc ['The group replication applier channel is present']
+include/assert.inc ['The group replication recovery channel is present']
+include/stop_group_replication.inc
+RESET SLAVE command clears master and slave info repositories and will flush master info
+RESET SLAVE;
+include/assert.inc ['mysql.slave_relay_log_info contains no group replication channel information']
+include/assert.inc ['mysql.slave_master_info contains flushed group replication channel information']
+include/start_group_replication.inc
+include/assert.inc ['The group replication applier and recovery channel are present']
+include/stop_group_replication.inc
+RESET SLAVE ALL;
+include/assert.inc ['mysql.slave_relay_log_info does not contrain group replication channel information']
+include/assert.inc ['mysql.slave_master_info does not contrain group replication channel information']
+CHANGE MASTER TO MASTER_USER="root" FOR CHANNEL "group_replication_recovery";
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_group_replication.inc
 DROP TABLE t1;
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_restart.result b/rapid/plugin/group_replication/tests/mtr/r/gr_restart.result
index d2602b1b50b4..90b3f9e6a08e 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_restart.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_restart.result
@@ -17,7 +17,7 @@ INSERT INTO t1 VALUES (1);
 #####################################################################
 # 2. Restart server2 and verify that certifier sequence number is set
 # from relay log certified transactions and view change transactions
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 SET @@GLOBAL.DEBUG= '+d,certifier_assert_next_seqno_equal_5';
 include/start_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_saved;
@@ -30,7 +30,7 @@ INSERT INTO t1 VALUES (2);
 ############################################################
 # 4. Kill server2 again and verify that certifier sequence
 # number is set from GTID_EXECUTED.
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 [connection server2]
 [connection server1]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash.result b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash.result
index f3daaf056ca3..3902e70d1fd5 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash.result
@@ -17,7 +17,7 @@ SAVEPOINT s1;
 UPDATE table1 SET a= -1 where a=1;
 SAVEPOINT s2;
 [connection server1]
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_release.result b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_release.result
index c22c8bc74f4f..22ac0e0ce85d 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_release.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_release.result
@@ -22,7 +22,7 @@ UPDATE table1 SET a= -1 where a=1;
 SAVEPOINT s2;
 RELEASE SAVEPOINT s1;
 [connection server1]
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_rollback.result b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_rollback.result
index 57e0151c0dd2..483bccd76416 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_rollback.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_savepoint_crash_on_rollback.result
@@ -22,7 +22,7 @@ UPDATE table1 SET a= -1 where a=1;
 SAVEPOINT s2;
 ROLLBACK TO SAVEPOINT s1;
 [connection server1]
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS1 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml.result b/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml.result
index 5708ecf45ea8..ed89b4267d1c 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml.result
@@ -25,8 +25,12 @@ call dml_operations();
 
 [connection server_1]
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
+[connection server1]
+# CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+Got one of the listed errors
+[connection server_1]
 include/rpl_reconnect.inc
 [connection server2]
 # check that there are 2 members in the group
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml_on_other.result b/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml_on_other.result
index 078c857cc4fa..4fc807b4be5d 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml_on_other.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_server_failover_while_dml_on_other.result
@@ -27,7 +27,7 @@ call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': .
 call mtr.add_suppression("Error in Log_event::read_log_event()");
 set sql_log_bin=1;
 # killing
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 # restarting
 include/rpl_reconnect.inc
 [connection server3]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_server_id_0.result b/rapid/plugin/group_replication/tests/mtr/r/gr_server_id_0.result
index 7b589d28be8a..54b52cf75a12 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_server_id_0.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_server_id_0.result
@@ -21,7 +21,7 @@ SET SESSION sql_log_bin= 1;
 ############################################################
 # 1. Restart server with server_id=0, slave infrastructure
 #    will not be initialized.
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --server_id=0
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --server_id=0 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 
 ############################################################
@@ -47,6 +47,6 @@ ERROR HY000: The server is not configured properly to be an active member of the
 #    Restart server with server_id different from 0, so that
 #    slave infrastructure will be initialized, and RESET
 #    SLAVE operations on group_replication_end.inc do work.
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --server_id=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --server_id=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_bootstrap.result b/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_bootstrap.result
index 774e25dc9cde..4cb6ebedd859 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_bootstrap.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_bootstrap.result
@@ -9,14 +9,14 @@ SET @debug_group_replication_local_address= @@GLOBAL.group_replication_local_add
 ########################
 
 [connection server1]
-# restart:--group_replication_group_name=MEMBER_UUID --group_replication_bootstrap_group=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_start_on_boot=1
+# restart:--group_replication_group_name=MEMBER_UUID --group_replication_bootstrap_group=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/assert.inc ['Assert server1 do not join group when server_uuid and group_name are same.']
 
 ###########################
 ##  SUCCESSFUL SCENARIO  ##
 ###########################
 
-# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_bootstrap_group=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_start_on_boot=1
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_bootstrap_group=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/assert.inc ['Assert server1 joins group when server_uuid and group_name are different.']
 [connection server2]
 SET GLOBAL group_replication_bootstrap_group=OFF;
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_non_bootstrap.result b/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_non_bootstrap.result
index 24732d96a033..c0e88ca00d40 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_non_bootstrap.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_server_uuid_matches_group_name_non_bootstrap.result
@@ -13,7 +13,7 @@ include/assert.inc ['Assert server1 bootstraps, server2 will use server1 as seed
 ########################
 
 [connection server2]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=MEMBER_UUID
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=MEMBER_UUID --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/assert.inc ['Assert server2 do not join group when server_uuid and group_name are same.']
 
 ###########################
@@ -25,7 +25,7 @@ include/stop_group_replication.inc
 include/start_and_bootstrap_group_replication.inc
 include/assert.inc ['Assert server1 bootstraps, server2 will use server1 as seed.']
 [connection server2]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/assert.inc ['Assert server2 joins group when server_uuid and group_name are different.']
 
 ############################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_set_gtid_next.result b/rapid/plugin/group_replication/tests/mtr/r/gr_set_gtid_next.result
index 6e409dc37769..3f3e4e1bc3d5 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_set_gtid_next.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_set_gtid_next.result
@@ -72,14 +72,14 @@ include/assert.inc ['There is a value 3 in table t2']
 # 6. Check that stable set and certification info size are
 #    properly updated after stable set propagation and
 #    certification info garbage collection on server 1.
-include/assert.inc ['Count_transactions_rows_validating must be 0']
+include/assert.inc ['Count_transactions_rows_validating must be 2']
 include/assert.inc ['Transactions_committed_all_members must be equal to GTID_EXECUTED']
 
 ############################################################
 # 7. Check that stable set and certification info size are
 #    properly updated after stable set propagation and
 #    certification info garbage collection on server 2.
-include/assert.inc ['Count_transactions_rows_validating must be 0']
+include/assert.inc ['Count_transactions_rows_validating must be 2']
 include/assert.inc ['Transactions_committed_all_members must be equal to GTID_EXECUTED']
 
 ############################################################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_set_variable_in_read_only.result b/rapid/plugin/group_replication/tests/mtr/r/gr_set_variable_in_read_only.result
new file mode 100644
index 000000000000..ffb487c47418
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_set_variable_in_read_only.result
@@ -0,0 +1,29 @@
+include/group_replication.inc [rpl_server_count=2]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+# 1. Start GR with server1 as Primary and server2 as secondary.
+include/start_and_bootstrap_group_replication.inc
+
+[connection server2]
+include/start_group_replication.inc
+
+# 2. Change value of variable binlog_checksum on server2.
+SET @binlog_checksum_save= @@GLOBAL.binlog_checksum;
+SET GLOBAL binlog_checksum=none;
+
+# 3. Stop GR on server1.
+include/stop_group_replication.inc
+
+# 4. Assert server is in Read only mode on server1.
+include/assert.inc [Assert that server is running in super read-only.]
+include/assert.inc [Assert that server is running in read-only.]
+
+# 5. Test changing value of variables.
+
+# 6. Cleanup.
+[connection server2]
+SET @@GLOBAL.binlog_checksum= @binlog_checksum_save;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_show_global_and_session_variables.result b/rapid/plugin/group_replication/tests/mtr/r/gr_show_global_and_session_variables.result
index 0849d161007a..8fc6e839196c 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_show_global_and_session_variables.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_show_global_and_session_variables.result
@@ -7,8 +7,8 @@ Note	####	Storing MySQL user name or password information in the master info rep
 include/start_and_bootstrap_group_replication.inc
 include/stop_group_replication.inc
 
-# Test#1: Basic check that there are 35 GR variables.
-include/assert.inc [There are 35 GR variables at present.]
+# Test#1: Basic check that there are 36 GR variables.
+include/assert.inc [There are 36 GR variables at present.]
 
 # Test#2: Verify that all the group replication variables are GLOBAL variables.
 SET @@SESSION.group_replication_allow_local_disjoint_gtids_join= 1;
@@ -75,6 +75,8 @@ SET @@SESSION.group_replication_unreachable_majority_timeout= 10240;
 ERROR HY000: Variable 'group_replication_unreachable_majority_timeout' is a GLOBAL variable and should be set with SET GLOBAL
 SET @@SESSION.group_replication_member_weight= 80;
 ERROR HY000: Variable 'group_replication_member_weight' is a GLOBAL variable and should be set with SET GLOBAL
+SET @@SESSION.group_replication_exit_state_action= "READ_ONLY";
+ERROR HY000: Variable 'group_replication_exit_state_action' is a GLOBAL variable and should be set with SET GLOBAL
 Warnings:
 Warning	1681	'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
 
@@ -210,6 +212,10 @@ include/assert.inc [Verify GLOBAL value of group_replication_member_weight]
 include/assert.inc [Verify GLOBAL value of group_replication_member_weight]
 include/assert.inc [Verify SESSION value of group_replication_member_weight]
 include/assert.inc [Verify SESSION value of group_replication_member_weight]
+include/assert.inc [Verify GLOBAL value of group_replication_exit_state_action]
+include/assert.inc [Verify GLOBAL value of group_replication_exit_state_action]
+include/assert.inc [Verify SESSION value of group_replication_exit_state_action]
+include/assert.inc [Verify SESSION value of group_replication_exit_state_action]
 
 # Clean up
 include/stop_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_async_gr_start_on_boot.result b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_async_gr_start_on_boot.result
index 1c564ae01a66..729f698a26b7 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_async_gr_start_on_boot.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_async_gr_start_on_boot.result
@@ -6,7 +6,7 @@ Note	####	Storing MySQL user name or password information in the master info rep
 
 # 1. Restart server1(primary) with group replication start on boot
 [connection server1]
-# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
+# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 
 # 2. Wait for GR to come ONLINE
@@ -26,7 +26,7 @@ include/assert.inc [Verify channel ch3_1 SQL_THREAD is ON]
 [connection server2]
 
 # 5. Restart server2(secondary) with group replication start on boot
-# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
+# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 
 # 6. Wait for GR to come ONLINE
@@ -64,7 +64,7 @@ include/stop_group_replication.inc
 include/start_slave.inc
 
 # 14. Restart server2(secondary) with group replication start on boot
-# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip-slave-start=0
+# restart:--group-replication-start-on-boot=1 --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip-slave-start=0 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 
 # 15. Wait for GR to be in OFFLINE status
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_1.result b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_1.result
index 3ec5636600bc..501768f07b20 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_1.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_1.result
@@ -18,12 +18,14 @@ include/rpl_reconnect.inc
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER2";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER2";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 SET @@global.group_replication_enforce_update_everywhere_checks=OFF;
 SET @@global.group_replication_single_primary_mode=ON;
 [connection server_3]
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER3";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER3";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 SET @@global.group_replication_enforce_update_everywhere_checks=OFF;
 SET @@global.group_replication_single_primary_mode=ON;
 [connection server1]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_2.result b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_2.result
index 1d0770024eff..8ae6cb351829 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_2.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_majority_loss_2.result
@@ -19,12 +19,14 @@ include/rpl_reconnect.inc
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 SET @@global.group_replication_enforce_update_everywhere_checks=OFF;
 SET @@global.group_replication_single_primary_mode=ON;
 [connection server_3]
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER3";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER3";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 SET @@global.group_replication_enforce_update_everywhere_checks=OFF;
 SET @@global.group_replication_single_primary_mode=ON;
 [connection server2]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_stop.result b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_stop.result
index df4f472046ce..9c1f532c345d 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_stop.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_stop.result
@@ -23,6 +23,7 @@ include/rpl_gr_wait_for_number_of_members.inc
 SET @@global.group_replication_group_seeds="GROUP_SEEDS_SERVER1";
 SET @@global.group_replication_local_address="LOCAL_ADDRESS_SERVER1";
 SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_ip_whitelist="GROUP_REPLICATION_GROUP_WHITELIST";
 SET @@global.group_replication_enforce_update_everywhere_checks=0;
 SET @@global.group_replication_single_primary_mode=1;
 [connection server2]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_var_checks.result b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_var_checks.result
index 2ca3908d9f3f..52676260c662 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_var_checks.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_var_checks.result
@@ -1,5 +1,5 @@
 [connection default]
-# restart: --group_replication_enforce_update_everywhere_checks=ON --group_replication_single_primary_mode=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME
+# restart: --group_replication_enforce_update_everywhere_checks=ON --group_replication_single_primary_mode=ON --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group-replication-group-name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/group_replication.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_skip_send_lower_case_table_names.result b/rapid/plugin/group_replication/tests/mtr/r/gr_skip_send_lower_case_table_names.result
new file mode 100644
index 000000000000..f65b491ab710
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_skip_send_lower_case_table_names.result
@@ -0,0 +1,29 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+## 1.  Set debug flag so server1 does not send its value of
+##     lower_case_table_names and bootstrap group.
+
+[connection server1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_skip_encode_lower_case_table_names';
+include/start_and_bootstrap_group_replication.inc
+
+## 2.  Start server2.
+
+[connection server2]
+include/start_group_replication.inc
+
+## 3.  Verify server2 joins the group.
+
+include/assert.inc [Assert 2 servers are ONLINE]
+[connection server1]
+include/assert.inc [Assert 2 servers are ONLINE]
+
+## 4.  Cleanup.
+
+SET @@GLOBAL.DEBUG= @debug_save;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_slave_max_allowed_packet_dependency.result b/rapid/plugin/group_replication/tests/mtr/r/gr_slave_max_allowed_packet_dependency.result
index c1f1be7a51d9..f3f6f5100634 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_slave_max_allowed_packet_dependency.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_slave_max_allowed_packet_dependency.result
@@ -1,81 +1,55 @@
-include/group_replication.inc [rpl_server_count=3]
+include/group_replication.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 
-# 1.  Start three server(disable certification database garbage collection).
-
-# 1A. Bootstrap server1.
+# 1. Bootstrap server1 (disable certification database garbage collection).
+#    Set slave_max_allowed_packet to lowest value
 [connection server1]
 include/start_and_bootstrap_group_replication.inc
 SET @debug_save1= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
-# 1B. Set slave_max_allowed_packet to lowest value and start server2.
-[connection server2]
 SET @debug_save_slave_max_allowed_packet= @@GLOBAL.slave_max_allowed_packet;
 SET GLOBAL slave_max_allowed_packet=1024;
-include/start_group_replication.inc
-SET @debug_save2= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
-set session sql_log_bin=0;
-call mtr.add_suppression("Unable to convert the event into a packet on the applier.*");
-call mtr.add_suppression("Failed to fetch transaction data containing required transaction info for applier");
-call mtr.add_suppression("Error at event handling.*");
-call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
-call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
-call mtr.add_suppression("Slave SQL for channel 'group_replication_applier'.*");
-call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
-set session sql_log_bin=1;
-# 1C. Setup environment on server3, do not start GR yet.
-[connection server3]
-SET @debug_save3= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
 
 # 2.  Generate 200 transactions on server1 to increase
 #     certification database size.
-
 [connection server1]
 CREATE TABLE t1 (a INT PRIMARY KEY);
 
-# 3.  Start GR on server3, View_change packet will be high in size.
-
-[connection server3]
-include/start_group_replication.inc
-
-# 4.  Server2 can only handle small packet sizes, so it will go in error state.
+# 3. Start GR on server2, view_change packet will be high in size.
+#    Without certification information, server 2 can't join and moves to ERROR state
 
 [connection server2]
-include/gr_wait_for_member_state.inc
-include/assert_grep.inc [Found the expected error about log event entry exceeded slave_max_allowed_packet.]
-
-# 5.  Server1 can handle 1GB packet size(default) so it will become donor and
-#     assist server3 to come ONLINE.
+include/start_group_replication.inc
+include/assert_grep.inc [Found the expected error about the view change log even being over size]
 
+# 4. Set a bigger value of slave_max_allowed_packet on server1
+#    Restart server2 and see it come ONLINE.
 [connection server1]
-include/rpl_gr_wait_for_number_of_members.inc
-
-# 6.  Restart GR on server2 with large value of slave_max_allowed_packet
-#     to make it ONLINE.
-
+SET @@GLOBAL.slave_max_allowed_packet=@debug_save_slave_max_allowed_packet;
 [connection server2]
 include/stop_group_replication.inc
-SET @@GLOBAL.slave_max_allowed_packet=@debug_save_slave_max_allowed_packet;
 include/start_group_replication.inc
 [connection server1]
 include/rpl_gr_wait_for_number_of_members.inc
 
-# 7.  Verification.
-
-include/diff_tables.inc [server1:t1, server2:t1, server3:t1]
-
-# 8.  Cleanup.
+# 5.  Verification.
+include/diff_tables.inc [server1:t1, server2:t1]
 
+# 6.  Cleanup.
 DROP TABLE t1;
 [connection server1]
 SET @@GLOBAL.DEBUG= @debug_save1;
 [connection server2]
-SET @@GLOBAL.DEBUG= @debug_save2;
-[connection server3]
-SET @@GLOBAL.DEBUG= @debug_save3;
+SET session sql_log_bin=0;
+call mtr.add_suppression("The certification information could not be set in this server: 'Certification information is too large for transmission.'");
+call mtr.add_suppression("Error when processing certification information in the recovery process");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("All donors left. Aborting group replication recovery.");
+call mtr.add_suppression("Skipping leave operation: member already left the group.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET session sql_log_bin=1;
 include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_group_without_boot_node.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_group_without_boot_node.result
new file mode 100644
index 000000000000..4c857982cbf6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_group_without_boot_node.result
@@ -0,0 +1,29 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+############################################################
+# 1. Suppress expected error messages
+############################################################
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Plugin group_replication reported: 'read failed'");
+call mtr.add_suppression("Plugin group_replication reported: '\\[GCS\\] read failed'");
+call mtr.add_suppression("Plugin group_replication reported: 'Timeout on wait for view after joining group'");
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+SET SESSION sql_log_bin= 1;
+############################################################
+# 2. Define and setup seeds to force self connect
+############################################################
+SET @@global.group_replication_group_name="GROUP_REPLICATION_GROUP_NAME";
+SET @@global.group_replication_group_seeds=`localhost:XCOM_PORT, 127.0.0.1:XCOM_PORT`;
+############################################################
+# 3. Start the node and expect it to fail
+############################################################
+START GROUP_REPLICATION;
+ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
+############################################################
+# 4. Clean up
+############################################################
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_onboot_fail_restore_read_mode.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_onboot_fail_restore_read_mode.result
index 35eaf68e5c9c..eee4f8ca3e0d 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_start_onboot_fail_restore_read_mode.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_onboot_fail_restore_read_mode.result
@@ -8,7 +8,7 @@ SET SESSION sql_log_bin= 1;
 # 1. Restart server with both --group_replication_start_on_boot
 #    and --super_read_only enabled.
 ############################################################
-# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --super_read_only=1
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --super_read_only=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 
 # 2. Give some time to plugin fail to start
 ############################################################
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto.result
index 4680c9ad37e2..573a07255d46 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto.result
@@ -1,7 +1,7 @@
 SELECT @@group_replication_group_name;
 @@group_replication_group_name
 8a94f357-aab4-11df-86ab-c80aa9429564
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 SELECT @@group_replication_group_name;
 @@group_replication_group_name
 8a94f357-aab4-11df-86ab-c80aa9429564
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_ssl_recovery.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_ssl_recovery.result
index def9bf74630d..a0c5fdc7a676 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_ssl_recovery.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_ssl_recovery.result
@@ -1,4 +1,4 @@
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 #
 # On server 1 stop group replication that started at boot
 #
@@ -20,7 +20,7 @@ INSERT INTO t1 VALUES (1);
 # On server 1 restart the server. Group replication should start at boot
 #
 CHANGE MASTER TO MASTER_USER= 'rec_ssl_user' FOR CHANNEL 'group_replication_recovery';
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/gr_wait_for_member_state.inc
 #
 # On server 1 after restart, recovery should be successful
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_super_read_only.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_super_read_only.result
index 0288e2e79f83..9bb09ecb51c6 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_super_read_only.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_with_super_read_only.result
@@ -2,7 +2,7 @@
 ############################################################
 # 1. Restart server with both --group_replication_start_on_boot
 #    and --super_read_only enabled.
-# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --super_read_only=1
+# restart:--group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --super_read_only=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 
 ############################################################
 # 2. Wait until server becomes ONLINE and assert
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_write_protection.result b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_write_protection.result
index d5f852c3f1d2..02e02367b0ed 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_write_protection.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_start_replication_auto_write_protection.result
@@ -18,7 +18,7 @@ STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 #
 # On server 2 restart the server. Group replication should start at boot
 #
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=f68d2bd0-8964-11e5-a837-0800200c9a66
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_start_on_boot=1 --group-replication-group-name=f68d2bd0-8964-11e5-a837-0800200c9a66 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 [connection server_2]
 [connection server2]
 include/gr_wait_for_member_state.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_startup_check_node_seed_skips_own_address.result b/rapid/plugin/group_replication/tests/mtr/r/gr_startup_check_node_seed_skips_own_address.result
new file mode 100644
index 000000000000..3c048a6dec24
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_startup_check_node_seed_skips_own_address.result
@@ -0,0 +1,20 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+server1
+include/start_and_bootstrap_group_replication.inc
+server2
+"1. Test local address with raw address and seeds with name"
+include/start_group_replication.inc
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+"2. Test local address with name address and seeds with raw address"
+include/start_group_replication.inc
+include/gr_wait_for_member_state.inc
+include/stop_group_replication.inc
+"3. Test local address with name address and seeds with name address"
+include/start_group_replication.inc
+include/gr_wait_for_member_state.inc
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_stop_during_pfs.result b/rapid/plugin/group_replication/tests/mtr/r/gr_stop_during_pfs.result
new file mode 100644
index 000000000000..9dfa940f7f52
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_stop_during_pfs.result
@@ -0,0 +1,55 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#
+# Set the necessary debug points required for the simulation.
+#
+[connection server1]
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_wait_on_stop';
+#
+# Send STOP GR command. The query shall wait before
+# "leave_group_and_terminate_plugin_modules()" function until it is signaled.
+#
+STOP GROUP_REPLICATION;
+#
+# Wait for STOP GR to reach the debug sync point.
+#
+[connection server_1_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_waiting";
+#
+# Send PS query from different session. The query shall halt in
+# "get_group_member_stats()" function.
+#
+[connection server_1]
+SET @@GLOBAL.DEBUG= '+d,group_replication_get_group_member_stats';
+SELECT * FROM performance_schema.replication_group_member_stats;
+#
+# Block the PS query and allow STOP GR command to continue by
+# signalling it.
+#
+[connection server_1_1]
+SET DEBUG_SYNC= "now WAIT_FOR signal.reached_get_group_member_stats";
+SET DEBUG_SYNC= "now SIGNAL signal.stop_continue";
+[connection server1]
+#
+# Allow the PS query to continue.
+#
+SET DEBUG_SYNC= "now SIGNAL signal.resume_get_group_member_stats";
+[connection server_1]
+#
+# Verify that MEMBER_STATE is OFFLINE on server_1.
+#
+[connection server_1]
+include/assert.inc [Verified that MEMBER_STATE is OFFLINE on server_1]
+#
+# Verify that MEMBER_STATE is ONLINE on server_2.
+#
+[connection server_2]
+include/assert.inc [Verified that MEMBER_STATE is ONLINE on server_2]
+[connection server1]
+SET GLOBAL DEBUG= @debug_save;
+SET DEBUG_SYNC= 'RESET';
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_stop_with_running_channel.result b/rapid/plugin/group_replication/tests/mtr/r/gr_stop_with_running_channel.result
new file mode 100644
index 000000000000..fe0e663b908a
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_stop_with_running_channel.result
@@ -0,0 +1,70 @@
+include/group_replication.inc
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+
+############################################################
+# 1. Deploy a group on server1.
+[connection server1]
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Worker 1 failed executing transaction.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': ... The slave coordinator and worker threads are stopped.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Error 'Error on observer while running replication hook 'before_commit'.'.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Error in Xid_log_event: Commit could not be completed, 'Error on observer while running replication hook 'before_commit'.', Error_code: 3100");
+call mtr.add_suppression("Slave: Error on observer while running replication hook 'before_commit'. Error_code: 3100");
+SET SESSION sql_log_bin = 1;
+include/start_and_bootstrap_group_replication.inc
+
+############################################################
+# 2. Configure a channel on server1 that replicates from
+#    server2.
+[connection server1]
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=SERVER_2_PORT, MASTER_AUTO_POSITION=1 FOR CHANNEL 'ch1';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+include/start_slave.inc
+[connection server2]
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+include/sync_slave_sql_with_master.inc
+
+############################################################
+# 3. Stop group on server1, through debug sync block the stop
+#    after acquiring `shared_plugin_stop` lock.
+[connection server_1]
+SET @@GLOBAL.DEBUG= '+d,group_replication_hold_stop_before_leave_the_group';
+STOP GROUP_REPLICATION;
+[connection server1]
+SET DEBUG_SYNC='now wait_for signal.stopping_before_leave_the_group';
+
+############################################################
+# 4. Commit a transaction on server2 which will be replicated
+#    to server1 through channel 'ch1'.
+#    Channel 'ch1' will fail since the plugin is stopping.
+[connection server2]
+INSERT INTO t1 VALUES (1);
+[connection server1]
+include/wait_for_slave_sql_error.inc [errno=3100]
+
+############################################################
+# 5. Resume STOP GROUP_REPLICATION on server1.
+[connection server1]
+SET @@GLOBAL.DEBUG= '-d,group_replication_hold_stop_before_leave_the_group';
+SET DEBUG_SYNC='now signal signal.resume_stop_before_leave_the_group';
+[connection server_1]
+[connection server1]
+include/gr_wait_for_member_state.inc
+SET DEBUG_SYNC= 'RESET';
+include/assert.inc ['There are no rows on table t1 on server1']
+
+############################################################
+# 6. Clean up.
+[connection server1]
+SET @@GLOBAL.super_read_only = 0;
+DROP TABLE t1;
+RESET SLAVE ALL FOR CHANNEL  'ch1';
+[connection server2]
+DROP TABLE t1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_transaction_limit.result b/rapid/plugin/group_replication/tests/mtr/r/gr_transaction_limit.result
index bbbfdcfd7038..8b1b3da2750c 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_transaction_limit.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_transaction_limit.result
@@ -9,13 +9,14 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server2]
 set session sql_log_bin=0;
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
-call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 16. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1600. To increase the limit please adjust group_replication_transaction_size_limit option.");
 set session sql_log_bin=1;
 
 [connection server3]
 set session sql_log_bin=0;
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
-call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1024. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1600. To increase the limit please adjust group_replication_transaction_size_limit option.");
 set session sql_log_bin=1;
 
 include/rpl_gr_wait_for_number_of_members.inc
@@ -169,9 +170,12 @@ include/assert.inc ['Checking the number of records in table t1']
 ## 3.6 Delete all data from table t1 on server 2,
 ##     transaction should be rolledback
 [connection server2]
+SET @group_replication_transaction_size_limit_save= @@GLOBAL.group_replication_transaction_size_limit;
+SET GLOBAL group_replication_transaction_size_limit= 1600;
 DELETE FROM t1;
 ERROR HY000: Error on observer while running replication hook 'before_commit'.
 include/rpl_sync.inc
+SET GLOBAL group_replication_transaction_size_limit= @group_replication_transaction_size_limit_save;
 
 [connection server1]
 include/assert.inc ['Checking the number of records in table t1']
@@ -185,9 +189,12 @@ include/assert.inc ['Checking the number of records in table t1']
 ## 3.7 Delete all data from table t1 on server 3,
 ##     transaction should be rolledback
 [connection server3]
+SET @group_replication_transaction_size_limit_save= @@GLOBAL.group_replication_transaction_size_limit;
+SET GLOBAL group_replication_transaction_size_limit= 1600;
 DELETE FROM t1;
 ERROR HY000: Error on observer while running replication hook 'before_commit'.
 include/rpl_sync.inc
+SET GLOBAL group_replication_transaction_size_limit= @group_replication_transaction_size_limit_save;
 
 [connection server1]
 include/assert.inc ['Checking the number of records in table t1']
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_uninstall_while_network_blocked.result b/rapid/plugin/group_replication/tests/mtr/r/gr_uninstall_while_network_blocked.result
index dc48aa063210..27b6da8878f7 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_uninstall_while_network_blocked.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_uninstall_while_network_blocked.result
@@ -9,7 +9,7 @@ include/rpl_sync.inc
 [connection server2]
 
 # 1. Kill and restart server 2
-# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS2 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME
+# Kill and restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS2 --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_group_name=GROUP_REPLICATION_GROUP_NAME --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 include/rpl_reconnect.inc
 [connection server1]
 
@@ -36,10 +36,10 @@ ERROR HY000: Plugin 'group_replication' cannot be uninstalled now. Plugin is bus
 
 # 6. Clean-up
 [connection server1]
-include/rpl_start_server.inc [server_number=1]
-include/rpl_reconnect.inc
 # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
 Got one of the listed errors
+include/rpl_start_server.inc [server_number=1]
+include/rpl_reconnect.inc
 [connection server2]
 DROP TABLE test.t1;
 [connection server_1]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_variables_default_values.result b/rapid/plugin/group_replication/tests/mtr/r/gr_variables_default_values.result
index 3ec4c2a4b1ed..a3285599db5a 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_variables_default_values.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_variables_default_values.result
@@ -4,6 +4,7 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 [connection server1]
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
 include/start_and_bootstrap_group_replication.inc
 SET @@GLOBAL.group_replication_auto_increment_increment= default;
 ERROR 42000: Variable 'group_replication_auto_increment_increment' can't be set to the value of 'DEFAULT'
@@ -24,9 +25,9 @@ include/stop_group_replication.inc
 #
 # Test Unit#1
 # Set global group replication variables to default.
-# Curently there are 35 group replication variables.
+# Curently there are 36 group replication variables.
 #
-include/assert.inc [There are 35 GR variables at present.]
+include/assert.inc [There are 36 GR variables at present.]
 SET @@GLOBAL.group_replication_auto_increment_increment= default;
 ERROR 42000: Variable 'group_replication_auto_increment_increment' can't be set to the value of 'DEFAULT'
 SET @@GLOBAL.group_replication_compression_threshold= default;
@@ -68,6 +69,7 @@ SET @@GLOBAL.group_replication_start_on_boot= default;
 SET @@GLOBAL.group_replication_transaction_size_limit= default;
 SET @@GLOBAL.group_replication_unreachable_majority_timeout= default;
 SET @@GLOBAL.group_replication_member_weight= default;
+SET @@GLOBAL.group_replication_exit_state_action= default;
 #
 # Test Unit#2
 # Verify default values of the group replication variables.
@@ -97,9 +99,10 @@ include/assert.inc [Default group_replication_recovery_ssl_verify_server_cert is
 include/assert.inc [Default group_replication_recovery_use_ssl is OFF/0]
 include/assert.inc [Default group_replication_ssl_mode is DISABLED]
 include/assert.inc [Default group_replication_start_on_boot is ON/1]
-include/assert.inc [Default group_replication_transaction_size_limit is 0]
+include/assert.inc [Default group_replication_transaction_size_limit is 150000000]
 include/assert.inc [Default group_replication_unreachable_majority_timeout is 0]
 include/assert.inc [Default group_replication_member_weight is 50]
+include/assert.inc [Default group_replication_exit_state_action is READ_ONLY]
 #
 # Clean up
 #
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_variables_mysqladmin.result b/rapid/plugin/group_replication/tests/mtr/r/gr_variables_mysqladmin.result
index f28a4caa479f..094487bb9f90 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_variables_mysqladmin.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_variables_mysqladmin.result
@@ -3,6 +3,8 @@ Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
+include/start_and_bootstrap_group_replication.inc
 =====mysqladmin -u root -P MASTER_MYPORT --protocol=TCP check all the GR variable outputs=====
 
 group_replication_allow_local_disjoint_gtids_join
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_view_change_delayed_write_order.result b/rapid/plugin/group_replication/tests/mtr/r/gr_view_change_delayed_write_order.result
new file mode 100644
index 000000000000..1257b52a39c0
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_view_change_delayed_write_order.result
@@ -0,0 +1,72 @@
+include/group_replication.inc [rpl_server_count=3]
+Warnings:
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+[connection server1]
+#
+# 1. Create a user to ensure server 3 recovery comes from server 1
+[connection server1]
+SET SESSION sql_log_bin= 0;
+CREATE USER "recovery_user" IDENTIFIED BY "recovery_password";
+GRANT REPLICATION SLAVE ON *.* TO "recovery_user";
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+#
+# 2. Start group replication in server 1 and 2
+[connection server1]
+include/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+[connection server2]
+include/start_group_replication.inc
+#
+# 3. Block a local transaction on server 1
+[connection server1]
+SET @@GLOBAL.DEBUG='+d,group_replication_after_before_commit_hook';
+INSERT INTO t1 VALUES (1);
+#
+# 4. Start server 3, it should be stuck in recovery
+#    Even after 15 seconds it should still be stuck
+[connection server3]
+CHANGE MASTER TO MASTER_USER= 'recovery_user', MASTER_PASSWORD= 'recovery_password' FOR CHANNEL 'group_replication_recovery';
+include/start_group_replication.inc
+include/gr_wait_for_member_state.inc
+#
+# 5. Execute something on server 2, it should appear on server 3
+[connection server2]
+INSERT INTO t1 VALUES (2);
+[connection server3]
+#
+# 6. Unblock the local transaction on server 1
+[connection server_1]
+SET @@GLOBAL.DEBUG='-d,group_replication_after_before_commit_hook';
+SET DEBUG_SYNC= "now SIGNAL signal.commit_continue";
+[connection server1]
+#
+# 7. Server 3 should now be online
+[connection server3]
+include/gr_wait_for_member_state.inc
+#
+# 8. Check the logged event order in all servers
+[connection server1]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT]
+[connection server2]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction]
+[connection server3]
+include/assert_binlog_events.inc [Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT # !Gtid_transaction # !Gtid_transaction # Gtid # Query/BEGIN # View_change # Query/COMMIT]
+#
+# 9. Clean up.
+[connection server1]
+DROP TABLE t1;
+SET SESSION sql_log_bin= 0;
+DROP USER "recovery_user";
+SET SESSION sql_log_bin= 1;
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout when waiting for the server to execute local transactions*");
+call mtr.add_suppression("Unable to log the group change View log event in its exaction position in the log.*");
+SET SESSION sql_log_bin= 1;
+[connection server3]
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("There was an error when connecting to the donor server.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+SET SESSION sql_log_bin= 1;
+include/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/r/gr_xplugin_global_variables.result b/rapid/plugin/group_replication/tests/mtr/r/gr_xplugin_global_variables.result
index 25bb57dcafd5..171b6381726e 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/gr_xplugin_global_variables.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/gr_xplugin_global_variables.result
@@ -4,6 +4,7 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection server1]
 [connection server1]
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
 include/start_and_bootstrap_group_replication.inc
 INSTALL PLUGIN mysqlx SONAME 'mysqlx.so';
 include/assert.inc [group_replication_allow_local_disjoint_gtids_join is OFF]
diff --git a/rapid/plugin/group_replication/tests/mtr/r/group_replication.result b/rapid/plugin/group_replication/tests/mtr/r/group_replication.result
index 99f6c632e487..679d0a08546c 100644
--- a/rapid/plugin/group_replication/tests/mtr/r/group_replication.result
+++ b/rapid/plugin/group_replication/tests/mtr/r/group_replication.result
@@ -7,7 +7,7 @@ SET GLOBAL group_replication_group_name= "8a94f357-aab4-11df-86ab-c80aa9429563";
 SET GLOBAL group_replication_start_on_boot= 1;
 include/assert.inc [The value of group name should be 8a94f357-aab4-11df-86ab-c80aa9429563]
 include/assert.inc [The value of group_replication_start_on_boot should be 1]
-# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1
+# restart:--group_replication_local_address=GROUP_REPLICATION_LOCAL_ADDRESS --group_replication_group_seeds=GROUP_REPLICATION_GROUP_SEEDS --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=GROUP_REPLICATION_GROUP_WHITELIST
 START GROUP_REPLICATION;
 ERROR HY000: The server is not configured properly to be an active member of the group. Please see more details on error log.
 include/start_group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf b/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf
index 50e1a75d01ff..1a75bd471b84 100644
--- a/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf
+++ b/rapid/plugin/group_replication/tests/mtr/rpl_1slave_base.cnf
@@ -26,6 +26,7 @@ loose-group_replication_start_on_boot= OFF
 
 loose-group_replication_single_primary_mode= FALSE
 loose-group_replication_enforce_update_everywhere_checks= TRUE
+loose-group_replication_exit_state_action= READ_ONLY
 
 # Directory where slaves find the dumps generated by "load data"
 # on the server. The path need to have constant length otherwise
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_applier_channel_stop_with_pending_transactions.test b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_channel_stop_with_pending_transactions.test
new file mode 100644
index 000000000000..af460cf2b0ae
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_channel_stop_with_pending_transactions.test
@@ -0,0 +1,91 @@
+################################################################################
+# Test to check that
+# R1. Stopping the applier blocks while there are pending transactions in
+#     the GR hooks on that channel.
+# R2. Once those pending transactions exit the GR hook, the action of stopping
+#     the applier is unblocked and can complete.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. With both the members ONLINE. On M1 create a table
+# 2. Set a DEBUG point so transactions hang at the before commit hook on M2
+#    Execute a transaction on M1
+# 3. Try to stop the GR applier thread on M2, it should block.
+# 4. Signal to continue_commit. The stop shall continue.
+# 5. Clean up.
+################################################################################
+
+# Setup a two server Group.
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo
+--echo # 1. With both the members ONLINE. On M1 create a table
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+CREATE TABLE test.t1 (a INT PRIMARY KEY);
+
+--source include/rpl_sync.inc
+
+--echo
+--echo # 2. Set a DEBUG point so transactions hang at the before commit hook on M2
+--echo #    Execute a transaction on M1
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_before_commit_hook_wait';
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# do an insert that will block on M2
+INSERT INTO t1 VALUES (1);
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Ensuring that the insert actually hangs at the before commit hook.
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now'
+--source include/wait_condition.inc
+
+--echo
+--echo # 3. Try to stop the GR applier thread on M2, it should block.
+
+--send STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
+
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+
+--let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.threads WHERE PROCESSLIST_STATE = 'Killing slave' AND PROCESSLIST_INFO = 'STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier"'
+--source include/wait_condition.inc
+
+--echo
+--echo # 4. Signal to continue_commit. The stop shall continue.
+
+# give it an extra second to block
+--sleep 1
+
+SET DEBUG_SYNC='now SIGNAL continue_commit';
+SET @@GLOBAL.DEBUG= @debug_save;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--reap
+
+--let $wait_condition= SELECT service_state="OFF" FROM performance_schema.replication_applier_status WHERE channel_name="group_replication_applier"
+--source include/wait_condition.inc
+
+--echo
+--echo # 5. Cleanup
+
+--source ../inc/gr_start_applier_sql_thread.inc
+
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_applier_early_failure.test b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_early_failure.test
index c1c6acab4c35..cc995f16aa28 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_applier_early_failure.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_early_failure.test
@@ -31,6 +31,10 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET SESSION sql_log_bin = 1;
+
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 
 --source include/rpl_sync.inc
@@ -42,6 +46,10 @@ CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET SESSION sql_log_bin = 1;
+
 SET SESSION sql_log_bin= 0;
 INSERT INTO t1 VALUES (1);
 SET SESSION sql_log_bin= 1;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error-slave.opt
new file mode 100644
index 000000000000..78e7e5c1b5c2
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_applier_error.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error.test b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error.test
new file mode 100644
index 000000000000..259bdcf59870
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_applier_error.test
@@ -0,0 +1,93 @@
+###############################################################################
+# Bug#27368735 BINLOG NAME AND POS ARE WRONG IN GROUP_REPLICATION_APPLIER
+#               CHANNEL'S ERROR MSGS
+# Problem: When group_replication_applier channel's applier thread is facing
+#          an error, master_log_name and end_log_pos in the error message
+#          are incorrect.
+#
+# Steps to reproduce:
+# ===================
+# 0) Test require two servers in the group
+# 1) Create a table with a primary key on both servers.
+# 2) Have a tuple with key '1' on server2.
+# 3) Insert the same tuple on server1 and try to sync on server2.
+# 4) Sync (applier thread on server2) will fail because of
+#    the duplicate key error.
+# 5) Check that the error says master_log_name and end_log_pos as <unknown>
+#    instead of displaying wrong values.
+# 6) Cleanup (drop table on both servers)
+###############################################################################
+--source include/only_mts_slave_parallel_workers.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo #
+--echo # Step-1: Initial setup (create table on both servers)
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+CREATE TABLE t1(i INT PRIMARY KEY);
+--source include/rpl_sync.inc
+
+--echo #
+--echo # Step-2: Insert a tuple on server2 directly without writing
+--echo #         into binlog.
+--echo #
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+SET sql_log_bin=0;
+INSERT INTO t1 values (1);
+
+--echo #
+--echo # Step-3: Add error suppressions which are required
+--echo #         for the test to pass.
+--echo #
+CALL mtr.add_suppression("Could not execute Write_rows event on table test.t1");
+CALL mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+CALL mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+CALL mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+CALL mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+CALL mtr.add_suppression("The slave coordinator and worker threads are stopped");
+SET sql_log_bin=1;
+
+--echo #
+--echo # Step-4: Insert a tuple on server1
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (1);
+
+--echo #
+--echo # Step-5: sync will fail because the same tuple exists on server2
+--echo #         (insert on server2 at step-2).
+--echo #
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--let $group_replication_member_state= ERROR
+--source ../inc/gr_wait_for_member_state.inc
+
+--echo #
+--echo # Step-6: Grep for the expected error in server log.
+--echo #
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/gr_applier_error.2.err
+--let $assert_count = 1
+--let $assert_select = failed executing transaction '.*'; Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY, Error_code: 1062
+--let $assert_text = Found the expected error in group_replication_applier channel.
+--source include/assert_grep.inc
+
+--echo #
+--echo # Step-7: Cleanup (drop table on both servers)
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--echo # Step-7.2: Server_2 entered into 'read_only' mode due to the above error.
+--echo #           Sync the above 'drop table' wont work.
+--echo #           Reset the slave and 'DROP' the table manually.
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
+DROP TABLE t1;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_auto_increment_increment.test b/rapid/plugin/group_replication/tests/mtr/t/gr_auto_increment_increment.test
index f9677bbbf3a3..cb925a0a88b5 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_auto_increment_increment.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_auto_increment_increment.test
@@ -111,7 +111,7 @@ SET GLOBAL GROUP_REPLICATION_AUTO_INCREMENT_INCREMENT= 3;
 
 --replace_regex /[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9][0-9][0-9][0-9][0-9][0-9][-+Z][0-9:]* *[0-9]* *\[/DATE_TIME [/
 --let $grep_file=$MYSQLTEST_VARDIR/tmp/group_replication_auto_increment_increment_log.err
---let $grep_pattern=Group contains 4 members which is greater than group_replication_auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.
+--let $grep_pattern=Group contains 4 members which is greater than auto_increment_increment value of 3. This can lead to an higher rate of transactional aborts.
 --source include/grep_pattern.inc
 
 --echo ############################################################
@@ -250,8 +250,9 @@ SET GLOBAL GROUP_REPLICATION_AUTO_INCREMENT_INCREMENT= 1;
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_autostart_on_install.test b/rapid/plugin/group_replication/tests/mtr/t/gr_autostart_on_install.test
index e194a9b8e40d..5c1058518320 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_autostart_on_install.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_autostart_on_install.test
@@ -38,8 +38,9 @@
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Needed as we are not using rpl_restart_server.inc
@@ -49,6 +50,9 @@
 --let $_init_server2_auto_increment= `SELECT @@GLOBAL.AUTO_INCREMENT_INCREMENT`
 --let $_init_server2_auto_offset= `SELECT @@GLOBAL.AUTO_INCREMENT_OFFSET`
 
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
 --source include/stop_group_replication.inc
 
 # A RESET MASTER was executed in the context of include/master-slave.inc after
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection.test b/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection.test
index b29b629663bc..af2b1ec49d3c 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection.test
@@ -104,8 +104,8 @@ UPDATE t1 SET c1=2 WHERE c1=1;
 
 --connection server1
 --let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
---let $assert_text= 'Count_transactions_rows_validating must be 2'
---let $assert_cond= $count_transactions_validating = 2
+--let $assert_text= 'Count_transactions_rows_validating must be 4'
+--let $assert_cond= $count_transactions_validating = 4
 --source include/assert.inc
 
 --let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
@@ -115,8 +115,8 @@ UPDATE t1 SET c1=2 WHERE c1=1;
 
 --connection server2
 --let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
---let $assert_text= 'Count_transactions_rows_validating must be 2'
---let $assert_cond= $count_transactions_validating = 2
+--let $assert_text= 'Count_transactions_rows_validating must be 4'
+--let $assert_cond= $count_transactions_validating = 4
 --source include/assert.inc
 
 --let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection2.test b/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection2.test
new file mode 100644
index 000000000000..0d8f434aea22
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection2.test
@@ -0,0 +1,148 @@
+################################################################################
+# Validate that certification info garbage collection do not purge more data
+# than it should.
+#
+# Test:
+#  0. The test requires two servers: M1 and M2.
+#  1. Create a table on server1.
+#  2. Set a debug sync before broadcast message to group on
+#     connection server_1.
+#     Commit a transaction that will be block before broadcast.
+#  3. Wait until server_1 connection reaches the
+#     group_replication_before_message_broadcast debug sync point.
+#  4. Execute a transaction on server2, that will reach first
+#     certification, since server_1 is blocked before broadcast.
+#  5. Suspend pipeline on server2.
+#  6. Resume the transaction on server_1
+#  7. Make sure the pipeline is suspended on server2.
+#  8. Wait until certification info garbage collector does
+#     its work.
+#  9. Resume the pipeline on server2.
+# 10. Execute a new transaction in order to have a sync point
+#     to make the test deterministic,
+#     Validate that data and GTIDs are correct.
+# 11. Clean up.
+################################################################################
+--source include/have_debug_sync.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo
+--echo ############################################################
+--echo #  1. Create a table on server1.
+CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a));
+INSERT INTO t1 VALUE(1, 1);
+--source include/rpl_sync.inc
+
+--echo
+--echo ############################################################
+--echo #  2. Set a debug sync before broadcast message to group on
+--echo #     connection server_1.
+--echo #     Commit a transaction that will be block before broadcast.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG='+d,group_replication_before_message_broadcast';
+BEGIN;
+UPDATE t1 SET b=10 WHERE a=1;
+--send COMMIT
+
+--echo
+--echo ############################################################
+--echo #  3. Wait until server_1 connection reaches the
+--echo #     group_replication_before_message_broadcast debug sync point.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now'
+--source include/wait_condition.inc
+
+--echo
+--echo ############################################################
+--echo #  4. Execute a transaction on server2, that will reach first
+--echo #     certification, since server_1 is blocked before broadcast.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+UPDATE t1 SET b=20 WHERE a=1;
+
+--echo
+--echo ############################################################
+--echo #  5. Suspend pipeline on server2.
+SET @@GLOBAL.DEBUG='+d,group_replication_before_apply_data_packet';
+
+--echo
+--echo ############################################################
+--echo #  6. Resume the transaction on server_1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET DEBUG_SYNC='now SIGNAL waiting';
+SET @@GLOBAL.DEBUG='-d,group_replication_before_message_broadcast';
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--error ER_TRANSACTION_ROLLBACK_DURING_COMMIT
+--reap
+
+--echo
+--echo ############################################################
+--echo #  7. Make sure the pipeline is suspended on server2.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now'
+--source include/wait_condition.inc
+
+--echo
+--echo ############################################################
+--echo #  8. Wait until certification info garbage collector does
+--echo #     its work.
+--let $gtid_assignment_block_size= `SELECT @@GLOBAL.group_replication_gtid_assignment_block_size;`
+--let $expected_gtid_set= $group_replication_group_name:1-4:1000002
+if ($gtid_assignment_block_size == 1)
+{
+  --let $expected_gtid_set= $group_replication_group_name:1-5
+}
+--let $wait_condition= SELECT transactions_committed_all_members = "$expected_gtid_set" from performance_schema.replication_group_member_stats;
+--let $wait_timeout= 150
+--source include/wait_condition.inc
+
+--echo
+--echo ############################################################
+--echo #  9. Resume the pipeline on server2.
+SET DEBUG_SYNC='now SIGNAL continue_apply';
+SET @@GLOBAL.DEBUG='-d,group_replication_before_apply_data_packet';
+
+--echo
+--echo ############################################################
+--echo # 10. Execute a new transaction in order to have a sync point
+--echo #     to make the test deterministic,
+--echo #     Validate that data and GTIDs are correct.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUE(2, 2);
+--source include/rpl_sync.inc
+
+--let $expected_gtid_set= $group_replication_group_name:1-5:1000002
+if ($gtid_assignment_block_size == 1)
+{
+  --let $expected_gtid_set= $group_replication_group_name:1-6
+}
+
+--let $assert_text= GTID_EXECUTED must contain 6 transactions
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$expected_gtid_set";
+--source include/assert.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $assert_text= GTID_EXECUTED must contain 6 transactions
+--let $assert_cond= "[SELECT @@GLOBAL.GTID_EXECUTED]" = "$expected_gtid_set";
+--source include/assert.inc
+
+--let $diff_tables=server1:t1, server2:t1
+--source include/diff_tables.inc
+
+
+--echo
+--echo ############################################################
+--echo # 11. Clean up.
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_collations_key_conflict.test b/rapid/plugin/group_replication/tests/mtr/t/gr_collations_key_conflict.test
new file mode 100644
index 000000000000..e84c8276efee
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_collations_key_conflict.test
@@ -0,0 +1,50 @@
+##############################################################################
+# This test checks that keys that are considered the same under a collation do
+# not pass certification as being different keys.
+#
+# The default mysql-5.7 collation is latin1, so gr_collations_key_conflict
+# test and result files, which were using utf8 encoding, also have been
+# converted to latin1 collation, to avoid changing the default server collation
+# value.
+#
+# 0. 2 Server with running GR
+# 1. Create a table with collation latin1
+# 2. Execute in concurrency transaction with equivalent keys under latin1
+# 3. Cleanup
+##############################################################################
+
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo
+--echo ###########################
+--echo # Create a table on server1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+CREATE TABLE t1 (
+  u_str VARCHAR(32) NOT NULL,
+  value VARCHAR(32) NOT NULL,
+  PRIMARY KEY (u_str)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--source include/rpl_sync.inc
+
+--echo
+--echo ######################################################################
+--echo # Execute in concurrency transaction with equivalent keys under latin1
+--let $local_server_connection1=server_1
+--let $local_server_connection2=server1
+--let $remote_server_connection=server2
+--let $local_transaction= INSERT INTO t1 (u_str, value)  VALUES ('�',  "A value");
+--let $remote_transaction=INSERT INTO t1 (u_str, value)  VALUES ('�',  "Another value");
+--let $conflict_test=1
+--source ../inc/gr_parallel_local_and_remote_transactions.inc
+
+--echo
+--echo ###########
+--echo # Clean up.
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_communication_configuration.test b/rapid/plugin/group_replication/tests/mtr/t/gr_communication_configuration.test
index b23b2f28bd6c..720440a39a94 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_communication_configuration.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_communication_configuration.test
@@ -80,14 +80,26 @@ SET SESSION sql_log_bin= 1;
 --source include/rpl_connection.inc
 SET @local_address= @@GLOBAL.group_replication_local_address;
 SET @group_seeds= @@GLOBAL.group_replication_group_seeds;
+SET @ip_whitelist= @@GLOBAL.group_replication_ip_whitelist;
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 SET @local_address= @@GLOBAL.group_replication_local_address;
 SET @group_seeds= @@GLOBAL.group_replication_group_seeds;
+SET @ip_whitelist= @@GLOBAL.group_replication_ip_whitelist;
 
 # Clear XCom configuration on all servers.
 --source ../inc/gr_clear_configuration.inc
 
+SET GLOBAL group_replication_ip_whitelist= @ip_whitelist;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET GLOBAL group_replication_ip_whitelist= @ip_whitelist;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
 --echo #######################################################
 --echo #  1. Try setting bootstrap_group variable with invalid
 --echo #     values. It must fail.
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules.test b/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules.test
index b2c0524f829d..e46c8d910225 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules.test
@@ -44,7 +44,8 @@ call mtr.add_suppression("Member version is incompatible with the group");
 SET session sql_log_bin=1;
 
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error_minor';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
 SET GLOBAL group_replication_group_name= "6db14550-03bb-11e5-b939-0800200c9a66";
 
 # The start will fail as the node is declared incompatible with the group
@@ -61,8 +62,9 @@ SET @@GLOBAL.DEBUG= @debug_save;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 --let $rpl_server_number= 2
 --source include/rpl_reconnect.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules_and_force_lower_version_member.test b/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules_and_force_lower_version_member.test
index 36260be11809..2adfe3d40a99 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules_and_force_lower_version_member.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_compatibility_rules_and_force_lower_version_member.test
@@ -60,7 +60,7 @@ call mtr.add_suppression("Member version is incompatible with the group");
 SET session sql_log_bin=1;
 
 SET @debug_saved= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error';
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_rule_error_major';
 --eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
 SET GLOBAL group_replication_allow_local_lower_version_join= ON;
 
@@ -81,8 +81,9 @@ SET @@GLOBAL.DEBUG= @debug_save;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 --let $rpl_server_number= 2
 --source include/rpl_reconnect.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_start_uninstall.test b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_start_uninstall.test
new file mode 100644
index 000000000000..bf44f905f3a1
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_start_uninstall.test
@@ -0,0 +1,81 @@
+################################################################################
+# This test confirms that when START GR and UNINSTALL PLUGIN GR commands are
+# executed concurrently, no deadlock happens.
+#
+# Test:
+# 0. The test requires one server.
+# 1. Setup GR environment and execute START GR.
+# 2. Block start, so we can execute UNINSTALL.
+# 3. Execute UNINSTALL PLUGIN GR should fail with error
+#    ER_PLUGIN_CANNOT_BE_UNINSTALLED as START GR is already running.
+# 4. SIGNAL START GR to resume processing.
+# 5. Confirm GR is started
+# 6. Cleanup
+#
+################################################################################
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+--echo
+--echo # 1. Setup GR environment and execute START GR.
+--echo
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET GLOBAL group_replication_bootstrap_group=ON;
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+
+--echo
+--echo # 2. Block start, so we can execute UNINSTALL.
+--echo
+
+## If START GR gets lock and UNINSTALL blocks SQL Query execution,
+## GR used to deadlock.
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_on_start';
+
+--send START GROUP_REPLICATION
+
+--echo
+--echo # 3. Execute UNINSTALL PLUGIN GR should fail with error
+--echo #    ER_PLUGIN_CANNOT_BE_UNINSTALLED as START GR is already running.
+--echo
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+# Wait for the debug sync to be reached.
+SET DEBUG_SYNC= "now WAIT_FOR signal.start_waiting";
+
+--error ER_PLUGIN_CANNOT_BE_UNINSTALLED
+UNINSTALL PLUGIN group_replication;
+
+
+--echo
+--echo # 4. SIGNAL START GR to resume processing.
+--echo
+SET DEBUG_SYNC= 'now SIGNAL signal.start_continue';
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--reap
+
+--echo
+--echo # 5. Confirm GR is started
+--echo
+
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+
+--echo
+--echo # 6. Cleanup
+--echo
+
+SET @@GLOBAL.DEBUG= @debug_save;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_stop_select.test b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_stop_select.test
new file mode 100644
index 000000000000..b12b7a029ac9
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_stop_select.test
@@ -0,0 +1,66 @@
+################################################################################
+# This test confirms that when STOP GR and select
+# performance_schema.replication_connection_status query is executed
+# concurrently, no deadlock happens.
+#
+# Test:
+# 0. The test requires one server.
+# 1. Block Stop Group Replication
+# 2. Wait for debug sync to be reached and then execute select query
+# 3. SIGNAL STOP GR to resume processing
+# 4. Confirm Group Replication is stopped
+# 5. Cleanup
+#
+################################################################################
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo
+--echo # 1. Block Stop Group Replication
+--echo
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_wait_on_stop';
+
+--send STOP GROUP_REPLICATION
+
+
+--echo
+--echo # 2. Wait for debug sync to be reached and then execute select query
+--echo
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_waiting";
+
+SELECT COUNT(*) FROM performance_schema.replication_connection_status;
+
+
+--echo
+--echo # 3. SIGNAL STOP GR to resume processing
+--echo
+
+SET DEBUG_SYNC= 'now SIGNAL signal.stop_continue';
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--reap
+
+
+--echo
+--echo # 4. Confirm Group Replication is stopped
+--echo
+
+--let $group_replication_member_state= OFFLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+
+--echo
+--echo # 5. Cleanup
+--echo
+
+SET @@GLOBAL.DEBUG= @debug_save;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_uninstall_stop.test b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_uninstall_stop.test
index e9bbd6ef74a5..59eed268fab6 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_uninstall_stop.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_concurrent_uninstall_stop.test
@@ -1,7 +1,7 @@
 # ==== Purpose ====
 #
 # Verify that 'UNINSTALL PLUGIN' and 'STOP GROUP_REPLICATION' commands
-# run well in parallel.
+# don't run in parallel in mysql 5.7.
 #
 # ==== Implementation ====
 #
@@ -30,6 +30,10 @@ SET SESSION sql_log_bin= 1;
 
 --source ../inc/start_and_bootstrap_group_replication.inc
 
+## Warnings depends upon sequence of execution of
+## query "STOP GROUP_REPLICATION" and "UNINSTALL PLUGIN group_replication"
+--disable_warnings
+
 --send UNINSTALL PLUGIN group_replication
 
 --let $rpl_connection_name= server_1
@@ -37,15 +41,19 @@ SET SESSION sql_log_bin= 1;
 --echo #
 --echo # STOP GROUP_REPLICATION in parallel.
 --echo #
+## Uninstall will fail as STOP GR is already running.
 --error 0, ER_GROUP_REPLICATION_CONFIGURATION
 STOP GROUP_REPLICATION;
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---error 0, ER_OPTION_PREVENTS_STATEMENT
+--error 0, ER_PLUGIN_CANNOT_BE_UNINSTALLED
 --reap
 
+--enable_warnings
+
 SET @@GLOBAL.read_only= 0;
+
 # The previous UNINSTALL attempt may have failed due to SUPER_READ_ONLY=1, as
 # such we uninstall the plugin again.
 --error 0, ER_SP_DOES_NOT_EXIST
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_connect_during_delayed_start.test b/rapid/plugin/group_replication/tests/mtr/t/gr_connect_during_delayed_start.test
index eaf6d984249b..1a0450b20b18 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_connect_during_delayed_start.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_connect_during_delayed_start.test
@@ -53,8 +53,9 @@ SET @@GLOBAL.DEBUG= @debug_save;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_bootstrap_group=1 --loose-debug="+d,group_replication_before_joining_the_group"
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_bootstrap_group=1 --loose-debug="+d,group_replication_before_joining_the_group" --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server.test b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server.test
index 0dd6ccc123d5..26f2e82d878f 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server.test
@@ -165,8 +165,9 @@ SET sql_log_bin=1;
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server_continuously.test b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server_continuously.test
index 3558541b1344..06aa0e9cffe3 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server_continuously.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_donor_server_continuously.test
@@ -139,8 +139,9 @@ while($count<6)
   # kill the donor server
   --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
   --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
-  --let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
-  --replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+  --let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+  --let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+  --replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
   --source ../inc/kill_and_restart_mysqld.inc
 
   # Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_recovery_server.test b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_recovery_server.test
index daceb09cc34d..5a9b8dc9623d 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_recovery_server.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_recovery_server.test
@@ -121,8 +121,9 @@ sleep 2;
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
@@ -184,8 +185,8 @@ sleep 1;
 # Kill the recovery server
 # kill server M3
 --echo # killing
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_safe_master.test b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_safe_master.test
index a8d53050cf85..992a3b6487ca 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_safe_master.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_safe_master.test
@@ -40,6 +40,7 @@ SET sql_log_bin=1;
 
 --let $_group_replication_local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 --let $member1_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 --let $old_debug = `select @@global.debug`
 
@@ -68,7 +69,7 @@ COMMIT;
 
 --enable_reconnect
 --echo # Restart the crashed member
---exec echo "restart:--group_replication_local_address=$_group_replication_local_address_server1 --group_replication_group_seeds=$_group_replication_group_seeds_server1" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--exec echo "restart:--group_replication_local_address=$_group_replication_local_address_server1 --group_replication_group_seeds=$_group_replication_group_seeds_server1 --group_replication_ip_whitelist=$_group_replication_group_whitelist" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 --disable_reconnect
 --let $rpl_server_number= 1
@@ -154,7 +155,7 @@ COMMIT;
 --source include/wait_until_disconnected.inc
 --enable_reconnect
 --echo # Restart the crashed member
---exec echo "restart:--group_replication_local_address=$_group_replication_local_address_server1 --group_replication_group_seeds=$_group_replication_group_seeds_server1" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--exec echo "restart:--group_replication_local_address=$_group_replication_local_address_server1 --group_replication_group_seeds=$_group_replication_group_seeds_server1 --group_replication_ip_whitelist=$_group_replication_group_whitelist" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 --disable_reconnect
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_while_dml_and_some_server_recovering.test b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_while_dml_and_some_server_recovering.test
index c0f63848875e..774a92977ce5 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_crash_while_dml_and_some_server_recovering.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_crash_while_dml_and_some_server_recovering.test
@@ -123,12 +123,21 @@ UNLOCK TABLES;
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
+--let $rpl_connection_name= server$non_donor_id
+--source include/rpl_connection.inc
+--echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+--error 2006,2013
+--reap
+
+--let $rpl_connection_name= server_$non_donor_id
+--source include/rpl_connection.inc
 # Needed as we are not using rpl_restart_server.inc
 --let $rpl_server_number= $non_donor_id
 --source include/rpl_reconnect.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_disjoint_gtids_join_option_deprecation.test b/rapid/plugin/group_replication/tests/mtr/t/gr_disjoint_gtids_join_option_deprecation.test
index 119c2fb81b35..15428edce877 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_disjoint_gtids_join_option_deprecation.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_disjoint_gtids_join_option_deprecation.test
@@ -5,10 +5,12 @@
 # Test:
 # 0. The test requires one server.
 # 1. Validate that the group_replication_allow_local_disjoint_gtids_join
-#    option deprecation warning is thrown.
+#    option deprecation warning is thrown when SET command is used.
 # 2. Validate that the group_replication_allow_local_disjoint_gtids_join
+#    option deprecation warning is thrown when START GR is used.
+# 3. Validate that the group_replication_allow_local_disjoint_gtids_join
 #    option deprecation warning is logged on server start.
-# 3. Clean up.
+# 4. Clean up.
 ################################################################################
 --source include/big_test.inc
 --source ../inc/have_group_replication_plugin.inc
@@ -18,20 +20,38 @@
 --echo
 --echo ############################################################
 --echo # 1. Validate that the group_replication_allow_local_disjoint_gtids_join
---echo #    option deprecation warning is thrown.
+--echo #    option deprecation warning is thrown when SET command is used.
+SET GLOBAL group_replication_allow_local_disjoint_gtids_join= ON;
+
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/gr_disjoint_gtids_join_option_deprecation.1.err
+--let $assert_count = 1
+--let $assert_select = 'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
+--let $assert_text = Found the expected deprecation log message.
+--source include/assert_grep.inc
+
+--echo
+--echo ############################################################
+--echo # 2. Validate that the group_replication_allow_local_disjoint_gtids_join
+--echo #    option deprecation warning is thrown when START GR is used.
 --source ../inc/start_and_bootstrap_group_replication.inc
 --source include/stop_group_replication.inc
 
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/gr_disjoint_gtids_join_option_deprecation.1.err
+--let $assert_count = 2
+--let $assert_select = 'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
+--let $assert_text = Found the expected deprecation log message.
+--source include/assert_grep.inc
 
 --echo
 --echo ############################################################
---echo # 2. Validate that the group_replication_allow_local_disjoint_gtids_join
+--echo # 3. Validate that the group_replication_allow_local_disjoint_gtids_join
 --echo #    option deprecation warning is logged on server start.
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 1
@@ -41,7 +61,7 @@
 --source ../inc/gr_wait_for_member_state.inc
 
 --let $assert_file= $MYSQLTEST_VARDIR/tmp/gr_disjoint_gtids_join_option_deprecation.1.err
---let $assert_count = 1
+--let $assert_count = 3
 --let $assert_select = 'group_replication_allow_local_disjoint_gtids_join' is deprecated and will be removed in a future release.
 --let $assert_text = Found the expected deprecation log message.
 --source include/assert_grep.inc
@@ -49,5 +69,5 @@
 
 --echo
 --echo ############################################################
---echo # 3. Clean up.
+--echo # 4. Clean up.
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.cnf
new file mode 100644
index 000000000000..7b06c802ec10
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.cnf
@@ -0,0 +1,6 @@
+!include ../my.cnf
+
+[mysqld.1]
+local-infile=       true
+
+[mysqld.2]
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.test
new file mode 100644
index 000000000000..ceb14130d99d
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_applier_error.test
@@ -0,0 +1,179 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken
+# by a server once it has involuntarily left the group. Currently there are
+# only two actions: either the server continues running but with
+# super_read_only enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall test that the specified exit action is executed correctly
+# when an applier error occurs.
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Force applier error on member 1.
+# 1.1) Verify that member 1 went to super_read_only mode and changed to ERROR
+#      state.
+# 2) Relaunch member 1 with exit state action to ABORT_SERVER.
+# 3) Force applier error again on member 1.
+# 3.1) Verify that member 1 aborted.
+# 4) Relaunch member 1.
+# 5) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--source ../inc/group_replication.inc
+# Supress log errors since they are expected.
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Could not execute Write_rows event on table test.t1; Duplicate entry.*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+--let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+
+--echo
+--echo #########################################################################
+--echo # 1) Force applier error on member 1.
+--echo #########################################################################
+--echo
+# Create a table for our tests
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t1(a INT PRIMARY KEY);
+--source include/rpl_sync.inc
+# Write to it without replicating the trx
+SET SESSION sql_log_bin= 0;
+INSERT INTO t1 VALUES (1);
+SET SESSION sql_log_bin= 1;
+# Write to the same row on member 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (1);
+# The rows on member 2 will be replicated and clash with member 1, thus
+# generating an applier error
+--source include/rpl_sync.inc
+
+--echo
+--echo #########################################################################
+--echo # 1.1) Verify that member 1 went to super_read_only mode.
+--echo #########################################################################
+--echo
+# Firstly verify that the member entered an error state
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member1_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Then verify that it enabled super_read_only
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Set exit state action to ABORT_SERVER on member 1.
+--echo #########################################################################
+--echo
+# Stop GR
+--source include/stop_group_replication.inc
+
+# Delete the transaction that clashed, so the server doesn't error out right
+# when starting the applier channel.
+SET sql_log_bin = 0;
+DELETE FROM t1 WHERE a = 1;
+SET sql_log_bin = 1;
+
+# Set the exit state action sysvar to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+--echo
+--echo #########################################################################
+--echo # 3) Force applier error again on member 1.
+--echo #########################################################################
+--echo
+# Inform MTR that we are expecting an abort and that it should wait before
+# restarting the aborting member
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/start_group_replication.inc
+
+# Write to t1 without replicating the trx
+SET SESSION sql_log_bin= 0;
+INSERT INTO t1 VALUES (2);
+SET SESSION sql_log_bin= 1;
+
+# Write to the same row on member 2. This will clash with member 1's row and
+# thus generate an applier error
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (2);
+
+--echo
+--echo #########################################################################
+--echo # 3.1) Verify that member 1 aborted.
+--echo #########################################################################
+--echo
+# For simplicity, let's assume that once the group size is 1, then member 1 has
+# abort()'ed
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+# Also, the member should not be in the group view of any of the other members
+--let $assert_text = Member 1 should have aborted
+--let $assert_cond = COUNT(*) = 0 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$member1_uuid"
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Relaunch member 1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/wait_until_disconnected.inc
+# Inform MTR that it should restart the aborted member
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin= 0;
+DELETE FROM t1 WHERE a = 2;
+SET SESSION sql_log_bin= 1;
+--replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
+--eval SET @@global.group_replication_local_address="$local_address_server1"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Cleanup.
+--echo #########################################################################
+--echo
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version-slave.opt
new file mode 100644
index 000000000000..c8094b17bfe6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_lower_version.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version.test
new file mode 100644
index 000000000000..652e21801b18
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_lower_version.test
@@ -0,0 +1,180 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, the member version of
+# the joining member not being compatible with the rest of the group).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Simulate a higher version on M1.
+# 2) Try to join M2 to the group.
+# 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the group
+#    again.
+# 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 6) Restart M2 again without group_replication_start_on_boot enabled. The
+#    server should start normally and be able to join the group.
+# 7) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Simulate a higher version on M1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @debug_saved= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Try to join M2 to the group.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_lower_version.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Restart the server with group_replication_start_on_boot enabled
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected incompatibility on member version
+--let $assert_select = Member version is incompatible with the group
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the
+--echo #    group again.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected incompatibility on member version
+--let $assert_select = Member version is incompatible with the group
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Restart M2 again without group_replication_start_on_boot enabled.
+--echo #    The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+# Restore the debug sysvar to its original state on server 1, so that we may
+# finally join server 2
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG = @debug_saved;
+# We must restart the GR plugin because updates on the debug sysvar are not
+# automatically reflected on the plugin if it is already running
+--source include/stop_group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 7) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded-slave.opt
new file mode 100644
index 000000000000..5ad7d4d892de
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_members_exceeded.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded.test
new file mode 100644
index 000000000000..156752fea863
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_members_exceeded.test
@@ -0,0 +1,167 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, number of members
+# exceeded).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Simulate a group of 10 members when member 2 joins. Member 2  will be
+#    unable to join.
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 3) Set the exit_state_aciton on member 2 to ABORT_SERVER and simulate again
+#    a group of 10 members when member 2 joins. Member 2 will be unable to
+#    join again.
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 5) Restart M2 again without group_replication_start_on_boot enabled. The
+#    server should start normally and be able to join the group.
+# 6) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $allow_rpl_inited=1
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Simulate a group of 10 members when member 2 joins. Member 2  will
+--echo # be unable to join.
+--echo #########################################################################
+--echo
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_members_exceeded.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Restart server 2 with group_replication_start_on_boot enabled and with the
+# group_replication_set_number_of_members_on_view_changed_to_10 debug var
+# enabled, so that we simulate this test's scenario
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --loose-debug="+d,group_replication_set_number_of_members_on_view_changed_to_10" --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected excess of members in group
+--let $assert_select = The START GROUP_REPLICATION command failed since the group already has 9 members
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Set the exit_state_action to ABORT_SERVER and simulate again a
+--echo # group of 10 members when member 2 joins. Member 2 will be unable to
+--echo # join again.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --loose-debug="+d,group_replication_set_number_of_members_on_view_changed_to_10" --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected excess of members in group
+--let $assert_select = The START GROUP_REPLICATION command failed since the group already has 9 members
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Restart M2 again without group_replication_start_on_boot enabled.
+--echo # The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch-slave.opt
new file mode 100644
index 000000000000..74c2d2c6423c
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_transaction_mismatch.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch.test
new file mode 100644
index 000000000000..f84deb5ff195
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_transaction_mismatch.test
@@ -0,0 +1,188 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, when the joining
+# member's transaction set is not a subset of the group's transaction set).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Run a few transactions on M2.
+# 2) Restart M2 with start_on_boot enabled.
+# 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 4) Restart M2 with start_on_boot enabled and exit_state_action set to
+#    ABORT_SERVER.
+# 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 6) Restart M2 again without group_replication_start_on_boot enabled. The
+#    server should start normally and be able to join the group.
+# 7) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Run a few transactions on M2.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t3(a INT PRIMARY KEY);
+INSERT INTO t3 VALUES (2);
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $errand_transaction_uuid= aaaaaaaa-bbbb-aaaa-bbbb-aaaaaaaaaaaa
+# Advance GTID_NEXT so that we have a clashing transaction with server 1
+--eval SET GTID_NEXT= "$errand_transaction_uuid:1"
+CREATE TABLE t2(a INT PRIMARY KEY);
+SET GTID_NEXT= "AUTOMATIC";
+
+--echo
+--echo #########################################################################
+--echo # 2) Restart M2 with start_on_boot enabled.
+--echo #########################################################################
+--echo
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_transaction_mismatch.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Restart the server with group_replication_start_on_boot enabled
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #  (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected transaction mismatch
+--let $assert_select = This member has more executed transactions than those present in the group
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Restart M2 with start_on_boot enabled and exit_state_action set to
+--echo # ABORT_SERVER.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #  (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected transaction mismatch
+--let $assert_select = This member has more executed transactions than those present in the group
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Restart M2 again without group_replication_start_on_boot enabled.
+--echo # The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+# Delete all transations on server 2's binary log, so that we may join the group
+# finally
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+RESET MASTER;
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 7) Cleanup.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t3;
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+SET SESSION sql_log_bin = 0;
+DROP TABLE t2;
+SET SESSION sql_log_bin = 1;
+--source ../inc/group_replication_end.inc
+
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size-slave.opt
new file mode 100644
index 000000000000..7b26c0aa61a5
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.test
new file mode 100644
index 000000000000..e2ede3821947
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.test
@@ -0,0 +1,162 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, when the
+# group_replication_gtid_assignment_block_size value on a joining member
+# differs from the group).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Relaunch M2 with a different gtid_assignment_block_size from M1.
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 3) Relaunch M2 with a different gtid_assignment_block_size from M1 and with
+#    exit_state_action set to ABORT_SERVER.
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 5) Restart M2 again without group_replication_start_on_boot enabled. The
+#     server should start normally and be able to join the group.
+# 6) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Relaunch M2 with a different gtid_assignment_block_size from M1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# We need a different value to trigger a group incompatibility
+--let $gtid_assignment_block_size = `SELECT @@GLOBAL.group_replication_gtid_assignment_block_size`
+--inc $gtid_assignment_block_size
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Restart the server with group_replication_start_on_boot enabled
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_gtid_assignment_block_size=$gtid_assignment_block_size --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $gtid_assignment_block_size GROUP_REPLICATION_GTID_ASSIGNMENT_BLOCK_SIZE $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has a different gtid_assignment_block_size value (as expected)
+--let $assert_select = The member is configured with a group_replication_gtid_assignment_block_size option value .+ different from the group
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Relaunch M2 with a different gtid_assignment_block_size from M1 and
+--echo #    with exit_state_action set to ABORT_SERVER.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_gtid_assignment_block_size=$gtid_assignment_block_size --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $gtid_assignment_block_size GROUP_REPLICATION_GTID_ASSIGNMENT_BLOCK_SIZE $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has a different gtid_assignment_block_size value (as expected)
+--let $assert_select = The member is configured with a group_replication_gtid_assignment_block_size option value .+ different from the group
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Restart M2 again without group_replication_start_on_boot enabled.
+--echo # The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
+
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm-slave.opt
new file mode 100644
index 000000000000..7d658993a2f6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_hash_algorithm.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm.test
new file mode 100644
index 000000000000..750c19095d9b
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_hash_algorithm.test
@@ -0,0 +1,172 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, when the
+# transaction_write_set_extraction value on a joining member differs from
+# the group).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Relaunch M2 with a different hash algorithm from M1.
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 3) Relaunch M2 with a different hash algorithm from M1 and with
+#    exit_state_action set to ABORT_SERVER.
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 5) Restart M2 again without group_replication_start_on_boot enabled. The
+#    server should start normally and be able to join the group.
+# 6) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $group_hash_algorithm = `SELECT @@GLOBAL.transaction_write_set_extraction`
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Relaunch M2 with a different hash algorithm from M1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_hash_algorithm.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+
+# Choose a hash algorithm that clashes with the group
+--let $hash_algorithm = XXHASH64
+if ($group_hash_algorithm == 'XXHASH64')
+{
+  --let $hash_algorithm = MURMUR32
+}
+
+# Restart the server with group_replication_start_on_boot enabled
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --transaction-write-set-extraction=$hash_algorithm --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $hash_algorithm HASH_ALGORITHM $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has an incompatible option with the group (as expected)
+--let $assert_select = The member is configured with a transaction-write-set-extraction option value .+ different from the group
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Relaunch M2 with a different hash algorithm from M1 and with
+--echo # exit_state_action set to ABORT_SERVER.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --transaction-write-set-extraction=$hash_algorithm --group_replication_exit_state_action=ABORT_SERVER --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $hash_algorithm HASH_ALGORITHM $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #    (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has an incompatible option with the group (as expected)
+--let $assert_select = The member is configured with a transaction-write-set-extraction option value .+ different from the group
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Restart M2 again without group_replication_start_on_boot enabled.
+--echo # The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $hash_algorithm HASH_ALGORITHM $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
+
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode-slave.opt
new file mode 100644
index 000000000000..b25913444c1b
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_single_primary_mode.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode.test
new file mode 100644
index 000000000000..aa563e8fc0ef
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_join_wrong_single_primary_mode.test
@@ -0,0 +1,161 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs upon joining the group (in this case, when the
+# group_replication_single_primary_mode sysvar value on a joining member
+# differs from the group).
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Relaunch M2 with a different single_primary_mode from M1.
+# 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 3) Relaunch M2 with a different single_primary_mode from M1 and with
+#    exit_state_action set to ABORT_SERVER.
+# 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+#    (since it failed to join the group).
+# 5) Restart M2 again without group_replication_start_on_boot enabled. The
+#    server should start normally and be able to join the group.
+# 6) Cleanup.
+#
+################################################################################
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--echo
+--echo #########################################################################
+--echo # 1) Relaunch M2 with a different single_primary_mode from M1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Save all the context we'll need during the test
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_join_wrong_single_primary_mode.2.err
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Restart the server with group_replication_start_on_boot enabled
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_single_primary_mode=FALSE --group_replication_enforce_update_everywhere_checks=FALSE--group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+# Reestablish the connection to the server
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #  (since it failed to join the group).
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has an incompatible option with the group (as expected)
+--let $assert_select = The member configuration is not compatible with the group configuration. Variables such as single_primary_mode or enforce_update_everywhere_checks must have the same value
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Relaunch M2 with a different single_primary_mode from M1 and with
+--echo # exit_state_action set to ABORT_SERVER.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Restart the server again with group_replication_start_on_boot enabled and with
+# group_replication_exit_state_action set to ABORT_SERVER
+--let $allow_rpl_inited = 1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_start_on_boot=1 --group_replication_single_primary_mode=TRUE --group_replication_exit_state_action=ABORT_SERVER --group_replication_enforce_update_everywhere_checks=FALSE --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) M2 super_read_only mode shall be OFF and in OFFLINE state
+--echo #  (since it failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for server 1 to see that server 2 didn't join
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that super_read_only mode is reverted to its original value
+--let $wait_condition= SELECT @@GLOBAL.super_read_only = '0'
+--source include/wait_condition.inc
+
+--let $assert_file = $error_file
+--let $assert_text = GR reported that it has an incompatible option with the group (as expected)
+--let $assert_select = The member configuration is not compatible with the group configuration. Variables such as single_primary_mode or enforce_update_everywhere_checks must have the same value
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Restart M2 again without group_replication_start_on_boot enabled.
+--echo # The server should start normally and be able to join the group.
+--echo #########################################################################
+--echo
+# Restart server 2 again, now with group_replication_start_on_boot disabled
+--let $allow_rpl_inited=1
+--let $restart_parameters=restart:--group_replication_local_address=$local_address_server2 --group_replication_group_seeds=$group_seeds_server2 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $local_address_server2 GROUP_REPLICATION_LOCAL_ADDRESS $group_seeds_server2 GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
+
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.cnf
new file mode 100644
index 000000000000..e0b8e81174ec
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.cnf
@@ -0,0 +1,13 @@
+!include ../my.cnf
+
+[mysqld.1]
+group_replication_unreachable_majority_timeout= 10
+
+[mysqld.2]
+
+[mysqld.3]
+report-port=        @mysqld.3.port
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.test
new file mode 100644
index 000000000000..49fbbc94e5c7
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_majority_loss.test
@@ -0,0 +1,241 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken
+# by a server once it has involuntarily left the group. Currently there are
+# only two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# In order to verify the expected behaviour, this test shall test that the
+# specified exit action is executed correctly after a member can't contact the
+# rest of the group after group_replication_unreachable_timeout ellapsed.
+#
+# Test:
+# 0) Setup group of 3 members (M1, M2 and M3).
+# 1) Force majority loss.
+# 1.1) Verify that member 1 went to ERROR state.
+# 2) Relaunch group with exit state action to ABORT_SERVER.
+# 3) Force another majority loss.
+# 4) Verify that member 1 aborted.
+# 5) Relaunch all members.
+# 6) Cleanup.
+#
+################################################################################
+# This test does crashes servers, thence we skip it on valgrind.
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source include/have_debug.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 3 members (M1, M2 and M3).
+--echo #########################################################################
+--echo
+--let $rpl_server_count= 3
+--source ../inc/group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+# Supress log errors since they are expected.
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("This member could not reach a majority of the members for more than.*");
+call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("\\[GCS\\] Timeout while waiting for the group communication engine to exit!");
+call mtr.add_suppression("\\[GCS\\] The member has failed to gracefully leave the group.");
+call mtr.add_suppression("\\[GCS\\] read failed");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+
+# Get address, seeds and UUID of all servers
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $member2_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $local_address_server3= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server3= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $member3_uuid= `SELECT @@GLOBAL.server_uuid`
+
+--echo
+--echo #########################################################################
+--echo # 1) Force majority loss.
+--echo #########################################################################
+--echo
+# Crash server 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+# Crash server 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.3.expect
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+--echo
+--echo #########################################################################
+--echo # 1.1) Verify that member 1 went to ERROR state.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member1_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that it enabled super_read_only
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Relaunch group with exit state action to ABORT_SERVER.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source include/stop_group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+# First we relaunch server 2 and 3
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $group_seeds_server2 GROUP_SEEDS_SERVER2
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server2"
+--replace_result $local_address_server2 LOCAL_ADDRESS_SERVER2
+--eval SET @@global.group_replication_local_address="$local_address_server2"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+
+--let $rpl_server_number= 3
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--replace_result $group_seeds_server3 GROUP_SEEDS_SERVER3
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server3"
+--replace_result $local_address_server3 LOCAL_ADDRESS_SERVER3
+--eval SET @@global.group_replication_local_address="$local_address_server3"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+
+# Wait for everyone to settle down
+--let $group_replication_number_of_members= 3
+--source ../inc/gr_wait_for_number_of_members.inc
+
+# Then we set server 1's exit_state_action to ABORT_SERVER
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# Set the exit state action sysvar to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+--echo
+--echo #########################################################################
+--echo # 3) Force another majority loss.
+--echo #########################################################################
+--echo
+# Prevent server 1 from restart after the abort()
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+# Crash server 2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+# Crash server 3
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--enable_reconnect
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.3.expect
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--source include/wait_until_connected_again.inc
+--disable_reconnect
+
+--echo
+--echo #########################################################################
+--echo # 4) Verify that member 1 aborted.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+# Wait until the connection is dropped
+--source include/wait_until_disconnected.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Relaunch all members.
+--echo #########################################################################
+--echo
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
+--eval SET @@global.group_replication_local_address="$local_address_server1"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--replace_result $group_seeds_server2 GROUP_SEEDS_SERVER2
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server2"
+--replace_result $local_address_server2 LOCAL_ADDRESS_SERVER2
+--eval SET @@global.group_replication_local_address="$local_address_server2"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+--let $rpl_server_number= 3
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--replace_result $group_seeds_server3 GROUP_SEEDS_SERVER3
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server3"
+--replace_result $local_address_server3 LOCAL_ADDRESS_SERVER3
+--eval SET @@global.group_replication_local_address="$local_address_server3"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+# Wait for everyone to settle down
+--let $group_replication_number_of_members= 3
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.cnf
new file mode 100644
index 000000000000..044d8038024f
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.cnf
@@ -0,0 +1,13 @@
+!include ../my.cnf
+
+[mysqld.1]
+local-infile=       true
+
+[mysqld.2]
+
+[mysqld.3]
+report-port=        @mysqld.3.port
+
+[ENV]
+SERVER_MYPORT_3=		@mysqld.3.port
+SERVER_MYSOCK_3=		@mysqld.3.socket
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.test
new file mode 100644
index 000000000000..e5aaf7f10dae
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_member_expel.test
@@ -0,0 +1,173 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# In order to verify the expected behaviour, this test shall test that the
+# specified exit action is executed correctly after an expel by the other
+# members of the group.
+#
+# Test:
+# 0) Setup group of 3 members (M1, M2 and M3).
+# 1) Force expel of member 1.
+# 1.1) Verify that member 1 went to super_read_only mode.
+# 2) Relaunch member 1 with exit state action to ABORT_SERVER.
+# 3) Force expel again of member 1.
+# 3.1) Verify that member 1 aborted.
+# 4) Relaunch member 1.
+# 5) Cleanup.
+#
+################################################################################
+# Test involves sending SIGSTOP and SIGCONT signals using kill Linux command.
+--source include/linux.inc
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 3 members (M1, M2 and M3).
+--echo #########################################################################
+--echo
+--let $rpl_server_count= 3
+--source ../inc/group_replication.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+CREATE TABLE pid_table(pid_no INT PRIMARY KEY);
+--let $pid_file=`SELECT @@pid_file`
+--replace_result $pid_file pid_file
+--eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+--let $server_pid=`SELECT pid_no FROM pid_table`
+DROP TABLE pid_table;
+
+# Supress log errors since they are expected.
+call mtr.add_suppression("Member was expelled from the group due to network failures, changing member status to ERROR.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+SET SESSION sql_log_bin = 1;
+
+--let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+
+--echo
+--echo #########################################################################
+--echo # 1) Force expel of member 1.
+--echo #########################################################################
+--echo
+# Then we send a SIGSTOP to it. This will stop the server from sending the
+# keep-alive message and thus it will be viewed as a faulty node by the rest of
+# the group (and consequently expelled).
+--exec kill -19 $server_pid
+
+# Wait until the group settles on 2 members
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 1.1) Verify that member 1 went to super_read_only mode.
+--echo #########################################################################
+--echo
+# Send SIGCONT to server, so it can continue (now that he is expelled)
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--exec kill -18 $server_pid
+
+# Verify that the member entered an error state
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member1_uuid
+--source ../inc/gr_wait_for_member_state.inc
+
+# Then verify that it enabled super_read_only
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
+--source include/assert.inc
+--source include/stop_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Set exit state action to ABORT_SERVER on member 1.
+--echo #########################################################################
+--echo
+# Set the exit state action sysvar to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 3
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Force expel again of member 1.
+--echo #########################################################################
+--echo
+# Inform MTR that we are expecting an abort and that it should wait before
+# restarting the aborting member
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Send SIGSTOP again
+--exec kill -19 $server_pid
+# Wait until the group settles on 2 members
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 3.1) Wait until server is aborted.
+--echo #########################################################################
+--echo
+# Send SIGCONT to server, so it can continue (now that he is expelled)
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--exec kill -18 $server_pid
+# Wait until the connection is dropped
+--source include/wait_until_disconnected.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Relaunch member 1.
+--echo #########################################################################
+--echo
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
+--eval SET @@global.group_replication_local_address="$local_address_server1"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+# Wait for member to stabilize in the group
+--let $group_replication_number_of_members = 3
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Cleanup.
+--echo #########################################################################
+--echo
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.cnf
new file mode 100644
index 000000000000..44721a61a6d6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.cnf
@@ -0,0 +1,6 @@
+!include ../my.cnf
+
+[mysqld.1]
+loose-group_replication_recovery_retry_count= 1
+
+[mysqld.2]
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.test
new file mode 100644
index 000000000000..83eabae71ac7
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery.test
@@ -0,0 +1,182 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs during the catch-up phase of distributed recovery.
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Force error during the catch-up phase of M1.
+# 1.1) Verify that M1 goes into ERROR state and to super_read_only mode.
+# 2) Set group_replication_exit_state_action to ABORT_SERVER on M1.
+# 3) Force another error during the catch-up phase of M1.
+# 3.1) Verify that M1 aborted.
+# 4) Relaunch M1 and join the group.
+# 5) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source include/not_valgrind.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2) but only start GR on M2.
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $member1_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+# Create a table on M1 while it isn't part of the group
+SET sql_log_bin = 0;
+CREATE TABLE t1 (a INT PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+SET sql_log_bin = 1;
+# Bootstrap the rest of the group (minus M1)
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+# Suppress expected errors and warnings
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET sql_log_bin = 0;
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 't1'*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code:*");
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("Fatal error during execution of Group Replication");
+call mtr.add_suppression("Error while starting the group replication recovery receiver/applier threads");
+SET sql_log_bin = 1;
+
+--echo
+--echo #########################################################################
+--echo # 1) Force error during the catch-up phase of M1.
+--echo #########################################################################
+--echo
+# Create and replicate a table on the group
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+CREATE TABLE t1 (a INT PRIMARY KEY);
+# Add M1 to the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_start_member_state= ERROR
+--source include/start_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 1.1) Verify that M1 goes into ERROR state and to super_read_only mode.
+--echo #########################################################################
+--echo
+# Firstly verify that the member entered an error state
+--let $group_replication_member_state= ERROR
+--let $group_replication_member_id= $member1_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Then verify that it enabled super_read_only
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = 1;
+--source include/assert.inc
+# Lastly, verify that the member is not viewed as part of the group on M2 and
+# M3
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Set group_replication_exit_state_action to ABORT_SERVER on M1.
+--echo #########################################################################
+--echo
+# Stop GR
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/stop_group_replication.inc
+
+# Set the exit state action sysvar to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+
+--echo
+--echo #########################################################################
+--echo # 3) Force another error during the catch-up phase of M1.
+--echo #########################################################################
+--echo
+# Inform MTR that we are expecting an abort and that it should wait before
+# restarting the aborting member
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+# Join the group again
+--let $group_replication_start_member_state= ERROR
+--source include/start_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 3.1) Verify that M1 aborted.
+--echo #########################################################################
+--echo
+# For simplicity, let's assume that once the group size is 1, then member 1 has
+# abort()'ed
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+# Also, the member should not be in the group view of any of the other members
+--let $assert_text = Member 1 should have aborted
+--let $assert_cond = COUNT(*) = 0 FROM performance_schema.replication_group_members WHERE MEMBER_ID = "$member1_uuid"
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Relaunch M1 and join the group.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/wait_until_disconnected.inc
+# Inform MTR that it should restart the aborted member
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# Reconnect
+--let $rpl_server_number= 1
+--source include/rpl_reconnect.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+# Remove conflicting trx so M1 can stay in the group
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
+RESET MASTER;
+--replace_result $group_seeds_server1 GROUP_SEEDS_SERVER1
+--eval SET @@global.group_replication_group_seeds="$group_seeds_server1"
+--replace_result $local_address_server1 LOCAL_ADDRESS_SERVER1
+--eval SET @@global.group_replication_local_address="$local_address_server1"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
+--source include/start_group_replication.inc
+# Wait for group to stabilize
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Cleanup.
+--echo #########################################################################
+--echo
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0-slave.opt
new file mode 100644
index 000000000000..72b8d36d8720
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_recovery_stage0.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0.test
new file mode 100644
index 000000000000..1d1fa7f4f8b2
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_recovery_stage0.test
@@ -0,0 +1,203 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that the correct exit state action is executed when
+# an error occurs during the stage 0 of distributed recovery.
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Stop the applier on M2.
+# 2) Replicate TRX from M1 to M2 but without M2 applying it.
+# 3) Stop GR on M2.
+# 4) Start GR on M2 again so he tries to join the group. M2 should go to
+#    OFFLINE state.
+# 5) Set group_replication_exit_state_action sysvar to ABORT_SERVER on M2.
+# 6) Start GR on M2 again, so he tries to join the group. M2 should not abort.
+# 7) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 3 members (M1, M2 and M3).
+--echo #########################################################################
+--echo
+--source ../inc/group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--let $member2_uuid= `SELECT @@GLOBAL.server_uuid`
+--let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
+--let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+
+# Suppress expected errors and warnings
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_recovery_stage0.2.err
+
+SET sql_log_bin = 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Error 'Table 't1'*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': Worker [0-9] failed executing transaction*");
+call mtr.add_suppression("Error writing relay log configuration.");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped,*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code:*");
+call mtr.add_suppression("The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.");
+call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
+call mtr.add_suppression("Unable to confirm whether the server has left the group or not. Check performance_schema.replication_group_members to check group membership information.");
+call mtr.add_suppression("There was a previous plugin error while the member joined the group. The member will now exit the group.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET sql_log_bin = 1;
+
+--echo
+--echo #########################################################################
+--echo # 1) Stop the applier on M2.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--source ../inc/gr_stop_applier_sql_thread.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Replicate TRX from M1 to M2 but without M2 applying it.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+CREATE TABLE t1 (a INT PRIMARY KEY);
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# Verify that M2 certified one transaction but hasn't yet applied any
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.replication_group_member_stats WHERE member_id='$member2_uuid' AND count_transactions_checked = 1
+--source include/wait_condition.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Stop GR on M2.
+--echo #########################################################################
+--echo
+--source include/stop_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Start GR on M2 again so he tries to join the group.
+--echo #########################################################################
+--echo
+SET SESSION sql_log_bin = 0;
+CREATE TABLE t1 (a INT PRIMARY KEY);
+SET SESSION sql_log_bin = 1;
+
+# Start GR
+--error ER_GROUP_REPLICATION_CONFIGURATION,ER_GROUP_REPLICATION_APPLIER_INIT_ERROR
+START GROUP_REPLICATION;
+
+# Verify that the applier errored out
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = Error 'Table 't1' already exists' on query.
+--let $assert_count = 1
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.
+--let $assert_count = 1
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.
+--let $assert_count = 1
+--source include/assert_grep.inc
+
+# Verify that M2 goes into OFFLINE state
+--let $group_replication_member_state= OFFLINE
+--let $group_replication_member_id= $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+
+# Lastly, verify that the member is not viewed as part of the group on M1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 5) Set group_replication_exit_state_action sysvar to ABORT_SERVER on
+--echo # M2.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @group_replication_exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+SET GLOBAL group_replication_exit_state_action = ABORT_SERVER;
+
+--echo
+--echo #########################################################################
+--echo # 6) Start GR on M2 again, so he tries to join the group. M2 should
+--echo # not abort.
+--echo #########################################################################
+--echo
+# Start GR on M2
+--error ER_GROUP_REPLICATION_CONFIGURATION,ER_GROUP_REPLICATION_APPLIER_INIT_ERROR
+START GROUP_REPLICATION;
+
+# Verify that the applier errored out
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = Error 'Table 't1' already exists' on query.
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = The applier should error out trying to create an already existing table
+--let $assert_select = Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+# Verify that M2 goes into OFFLINE state
+--let $group_replication_member_state= OFFLINE
+--let $group_replication_member_id= $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+
+# Lastly, verify that the member is not viewed as part of the group on M1
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members= 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 7) Cleanup.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin = 1;
+SET GLOBAL group_replication_exit_state_action = @group_replication_exit_state_action_saved;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd-slave.opt
new file mode 100644
index 000000000000..bb2e0b8d3b33
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_start_gr_cmd.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd.test
new file mode 100644
index 000000000000..0f9d72d651ea
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_on_start_gr_cmd.test
@@ -0,0 +1,187 @@
+###############################################################################
+#
+# group_replication_exit_state_action sysvar specifies which action is taken by
+# a server once it has involuntarily left the group. Currently there are only
+# two actions: either the server continues running but with super_read_only
+# enabled (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test shall verify that when a join fails after issuing a START
+# GROUP_REPLICATION command, the command returns with the appropriate error
+# and does not crash or abort, even when group_replication_exit_state_action is
+# set to ABORT_SERVER.
+#
+# Test:
+# 0) Setup group of 2 members (M1 and M2).
+# 1) Simulate a higher version on M1.
+# 2) Try to join M2 to the group by issuing START GROUP_REPLICATION.
+# 3) M2 should be in super_read_only mode and in OFFLINE state (since it
+#    failed to join the group).
+# 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the group
+#    again.
+# 5) M2 should not abort().
+# 6) Remove the higher version from M1 and try to join M2 again. M2 should be
+#    able to join.
+# 7) Cleanup.
+#
+################################################################################
+# By including have_debug.inc we make sure that we are using the debug version
+# of the server. This is needed because in the debug version (the one without
+# NDEBUG defined) the abort_plugin_process() function calls DBUG_SUICIDE()
+# which does not send a SIGABRT to itself but a SIGKILL instead (and in this way
+# MTR won't assume the process crashed).
+--source include/have_debug.inc
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) Setup group of 2 members (M1 and M2).
+--echo #########################################################################
+--echo
+--let $rpl_skip_group_replication_start = 1
+--source ../inc/group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Member version is incompatible with the group.");
+SET SESSION sql_log_bin = 1;
+
+--echo
+--echo #########################################################################
+--echo # 1) Simulate a higher version on M1.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @debug_saved= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Try to join M2 to the group by issuing START GROUP_REPLICATION.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Save the super_read_only mode, so we can assert the server reverted to it when
+# it failed to join the group
+SET @super_read_only_saved = @@GLOBAL.super_read_only;
+# Save the group_replication_exit_state_action
+SET @exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+# Save the group SID, so the server gets a member ID
+--disable_query_log
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--enable_query_log
+# We expect a config error since this server's version is different from the
+# group
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo
+--echo #########################################################################
+--echo # 3) M2 should be in super_read_only mode and in OFFLINE state (since it
+--echo # failed to join the group).
+--echo #########################################################################
+--echo
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only reverted to its original state
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = @super_read_only_saved;
+--source include/assert.inc
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_exit_state_action_on_start_gr_cmd.2.err
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected incompatibility on member version
+--let $assert_select = Member version is incompatible with the group
+--let $assert_count = 1
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Change the exit_state_action to ABORT_SERVER. Try to join M2 to the
+--echo # group again.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Set the exit state action to ABORT_SERVER
+SET @@GLOBAL.group_replication_exit_state_action = ABORT_SERVER;
+# We must restart GR to trigger another join
+# We expect a config error since this server's version is different from the
+# group
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo
+--echo #########################################################################
+--echo # 5) M2 should not abort().
+--echo #########################################################################
+--echo
+# Wait for the member to realize that it couldn't join the group
+--let $member2_uuid = `SELECT @@GLOBAL.server_uuid`
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $group_replication_member_state = OFFLINE
+--let $group_replication_member_id = $member2_uuid
+--source ../inc/gr_wait_for_member_state.inc
+# Verify that super_read_only reverted to its original state
+--let $assert_text= super_read_only should be enabled
+--let $assert_cond= [SELECT @@GLOBAL.super_read_only] = @super_read_only_saved;
+--source include/assert.inc
+# Verify that the expected error occurred
+--let $assert_file = $error_file
+--let $assert_text = GR reported expected incompatibility on member version
+--let $assert_select = Member version is incompatible with the group
+--let $assert_count = 2
+--source include/assert_grep.inc
+# Verify that member 2 didn't join the group
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 1
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 6) Remove the higher version from M1 and try to join M2 again. M2
+--echo # should be able to join.
+--echo #########################################################################
+--echo
+# Restore the debug sysvar to its original state on server 1, so that we may
+# finally join server 2
+SET @@GLOBAL.DEBUG = @debug_saved;
+# We must restart the GR plugin because updates on the debug sysvar are not
+# automatically reflected on the plugin if it is already running
+--source include/stop_group_replication.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+# Start GR on server 2 and verify that the group stabilizes itself
+--source include/start_group_replication.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_number_of_members = 2
+--source ../inc/gr_wait_for_number_of_members.inc
+
+--echo
+--echo #########################################################################
+--echo # 7) Cleanup.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_exit_state_action = @exit_state_action_saved;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_option.test b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_option.test
new file mode 100644
index 000000000000..6df029e31dfa
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_exit_state_action_option.test
@@ -0,0 +1,83 @@
+################################################################################
+#
+# exit_state_action sysvar specifies which action is taken by a server once it
+# has involuntarily left the group. Currently there are only two actions:
+# either the server continues running but with super_read_only enabled
+# (READ_ONLY) or it aborts (ABORT_SERVER).
+#
+# This test verifies that the sysvar behaves as expected, meaning that the
+# default value is the expected one (READ_ONLY), that we can change it
+# and the value is maintained and that invalid values result in error.
+#
+# Test:
+# 0) The test requires one server.
+# 1) Check the default value. It should be READ_ONLY.
+# 2) Set the sysvar to the possible valid values. Verify that the valid values
+#    are accepted with no error and the values are set correctly.
+# 3) Set the sysvar to invalid values. There should be an error and the value of
+#    the sysvar should not be altered.
+# 4) Cleanup.
+#
+################################################################################
+--source include/have_debug.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+--echo
+--echo #########################################################################
+--echo # 0) The test requires one server.
+--echo #########################################################################
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @exit_state_action_saved = @@GLOBAL.group_replication_exit_state_action;
+
+--echo
+--echo #########################################################################
+--echo # 1) Check the default value. It should be READ_ONLY.
+--echo #########################################################################
+--echo
+SET @@GLOBAL.group_replication_exit_state_action = default;
+--let $assert_text= The default of group_replication_exit_state_action should be READ_ONLY
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_exit_state_action]" = "READ_ONLY"
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 2) Set the sysvar to the possible valid values.
+--echo #########################################################################
+--echo
+SET GLOBAL group_replication_exit_state_action = "READ_ONLY";
+--let $assert_text= The default of group_replication_exit_state_action should be READ_ONLY
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_exit_state_action]" = "READ_ONLY"
+--source include/assert.inc
+SET GLOBAL group_replication_exit_state_action = "ABORT_SERVER";
+--let $assert_text= The default of group_replication_exit_state_action should be ABORT_SERVER
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_exit_state_action]" = "ABORT_SERVER"
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 3) Set the sysvar to invalid values. There should be an error and the
+--echo #    value of the sysvar should not be altered.
+--echo #########################################################################
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL group_replication_exit_state_action = 42;
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL group_replication_exit_state_action = on;
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL group_replication_exit_state_action = "abort";
+SET GLOBAL group_replication_exit_state_action = "READ_ONLY";
+--let $assert_text= The default of group_replication_exit_state_action should be READ_ONLY
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_exit_state_action]" = "READ_ONLY"
+--source include/assert.inc
+
+--echo
+--echo #########################################################################
+--echo # 4) Cleanup.
+--echo #########################################################################
+--echo
+SET GLOBAL group_replication_exit_state_action = @exit_state_action_saved;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_force_member_expel.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_force_member_expel.cnf
index 30847abcd9cc..6f22932cb5ea 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_force_member_expel.cnf
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_force_member_expel.cnf
@@ -1,6 +1,7 @@
 !include ../my.cnf
 
 [mysqld.1]
+local-infile=       true
 
 [mysqld.2]
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_force_peer_addresses_option.test b/rapid/plugin/group_replication/tests/mtr/t/gr_force_peer_addresses_option.test
index fa64d5775af7..aec32fcc8604 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_force_peer_addresses_option.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_force_peer_addresses_option.test
@@ -37,7 +37,7 @@ call mtr.add_suppression("Unable to start Group Replication on boot");
 call mtr.add_suppression("force_members can only be updated when Group Replication is running*");
 call mtr.add_suppression("The member lost contact with a majority of the members in the group. Until the network is restored.*");
 call mtr.add_suppression("\\[GCS\\] Peer address .* is not valid.");
-call mtr.add_suppression("\\[GCS\\] The peers list contains invalid addresses.Please provide a list with only valid addresses.");
+call mtr.add_suppression("\\[GCS\\] The peers list contains invalid addresses. Please provide a list with only valid addresses.");
 call mtr.add_suppression("Error setting group_replication_force_members value .* on group communication interfaces");
 call mtr.add_suppression("The member resumed contact with a majority of the members in the group.*");
 SET SESSION sql_log_bin= 1;
@@ -156,8 +156,9 @@ START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_force_members="127.0.0.1:10000"
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_force_members="127.0.0.1:10000" --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 2
@@ -235,8 +236,8 @@ SET GLOBAL group_replication_force_members= "";
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
---let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_foreign_key_on_referenced_unique_key_conflict.test b/rapid/plugin/group_replication/tests/mtr/t/gr_foreign_key_on_referenced_unique_key_conflict.test
new file mode 100644
index 000000000000..b7ae4ace14cb
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_foreign_key_on_referenced_unique_key_conflict.test
@@ -0,0 +1,134 @@
+################################################################################
+# Test case to verify that concurrent transactions with intersecting
+# write set, on foreign key that references a unique key, do conflict.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. With both members ONLINE. Create a table on M1.
+# 2. Set a debug sync before broadcast message to group on M1. Commit a
+#    transaction that will be blocked before broadcast.
+# 3. Wait until M1 reaches the debug sync point.
+# 4. Execute a transaction on M2, that will reach first certification, since M1
+#    is blocked before broadcast.
+# 5. Signal the waiting thread on M1 to resume.
+# 6. It will end up in an error stating that it was aborted, since transactions
+#    are conflicting and M2 was ordered first.
+# 7. Assert that number of certified transactions are the expected ones.
+#
+# Checking the positive case in which there is no conflict:
+# 8. Set a debug sync before broadcast message to group on M1. Commit a
+#    transaction that will be block before broadcast.
+# 9. Wait until M1 reaches the debug sync point.
+# 10. Execute a transaction on M2, that will reach first certification, since M1
+#     is blocked before broadcast.
+# 11. Signal the waiting thread on M1 to resume.
+# 12. It will execute without error as the conflicting transactions have been
+#     removed.
+# 13. Assert that number of certified transactions are the expected ones.
+# 14. Clean up.
+################################################################################
+
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo
+--echo ############################################################
+--echo # Create a table on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, UNIQUE KEY(c2));
+CREATE TABLE t2 (x1 INT PRIMARY KEY, x2 INT, FOREIGN KEY (x2) REFERENCES t1(c2));
+INSERT INTO t1 VALUES (1,1);
+--source include/rpl_sync.inc
+
+#
+# DELETE:
+#   WS= {t1.c1=1, t1.c2=1}
+#
+# INSERT:
+#   WS= {t2.x1=1. t1.c2=1}
+#
+# Outcome: T1 must abort, T2 must commit.
+#
+
+--let $local_server_connection1=server_1
+--let $local_server_connection2=server1
+--let $remote_server_connection=server2
+--let $local_transaction= DELETE FROM t1 WHERE c1=1
+--let $remote_transaction=INSERT INTO t2 VALUES (1,1)
+--let $conflict_test=1
+--source ../inc/gr_parallel_local_and_remote_transactions.inc
+
+--echo
+--echo ############################################################
+--echo # Checking the positive case in which there is no conflict.
+--echo ############################################################
+--echo
+INSERT INTO t1 VALUES (2,2);
+INSERT INTO t1 VALUES (3,3);
+--source include/rpl_sync.inc
+
+#
+# DELETE:
+#   WS= {t1.c1=2, t1.c2=2}
+#
+# INSERT:
+#   WS= {t2.x1=3. t1.c2=3}
+#
+# Outcome: T1 and T2 must commit.
+#
+
+--let $local_server_connection1=server_1
+--let $local_server_connection2=server1
+--let $remote_server_connection=server2
+--let $local_transaction= DELETE FROM t1 WHERE c1=2
+--let $remote_transaction=INSERT INTO t2 VALUES (3,3)
+--let $conflict_test=0
+--source ../inc/gr_parallel_local_and_remote_transactions.inc
+
+--echo
+--echo ############################################################
+--echo # Check the data sanity
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source include/rpl_sync.inc
+
+--let $assert_text= Table t1 will contain tuple (1,1)
+--let $assert_cond= "[SELECT COUNT(*) AS count FROM t1 WHERE c1 = 1 AND c2 = 1, count, 1]" = "1"
+--source include/assert.inc
+
+--let $assert_text= Table t1 will contain tuple (3,3)
+--let $assert_cond= "[SELECT COUNT(*) AS count FROM t1 WHERE c1 = 3 AND c2 = 3, count, 1]" = "1"
+--source include/assert.inc
+
+--let $assert_text= Table t1 will contain 2 rows
+--let $assert_cond= "[SELECT COUNT(*) FROM t1]" = "2"
+--source include/assert.inc
+
+--let $assert_text= Table t2 will contain tuple (1,1)
+--let $assert_cond= "[SELECT COUNT(*) AS count FROM t2 WHERE x1 = 1 AND x2 = 1, count, 1]" = "1"
+--source include/assert.inc
+
+--let $assert_text= Table t2 will contain tuple (3,3)
+--let $assert_cond= "[SELECT COUNT(*) AS count FROM t2 WHERE x1 = 3 AND x2 = 3, count, 1]" = "1"
+--source include/assert.inc
+
+--let $assert_text= Table t2 will contain 2 rows
+--let $assert_cond= "[SELECT COUNT(*) FROM t2]" = "2"
+--source include/assert.inc
+
+--let $diff_tables= server1:test.t1, server2:test.t1
+--source include/diff_tables.inc
+
+--let $diff_tables= server1:test.t2, server2:test.t2
+--source include/diff_tables.inc
+
+
+--echo
+--echo ############################################################
+--echo # Clean up.
+DROP TABLE t2;
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_group_name_validation_on_boot.test b/rapid/plugin/group_replication/tests/mtr/t/gr_group_name_validation_on_boot.test
index f64b8993f60a..c49e83194de7 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_group_name_validation_on_boot.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_group_name_validation_on_boot.test
@@ -37,8 +37,9 @@ SET SESSION sql_log_bin=1;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name_invalid --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name_invalid --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --echo # Asserting that the error due to invalid group name is being thrown.
@@ -49,8 +50,8 @@ SET SESSION sql_log_bin=1;
 
 # Starting the server with boot option OFF
 --let $allow_rpl_inited=1
---let $restart_parameters=restart:--group-replication-start-on-boot=0 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group-replication-start-on-boot=0 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Phase 2:  Passing an incorrect value to group_name throws an error
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_incorrect_group_name_join.test b/rapid/plugin/group_replication/tests/mtr/t/gr_incorrect_group_name_join.test
index 38ee363a774c..94a459d1a912 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_incorrect_group_name_join.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_incorrect_group_name_join.test
@@ -18,6 +18,9 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 --source ../inc/start_and_bootstrap_group_replication.inc
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-master.opt
new file mode 100644
index 000000000000..f0d64fb922d0
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-master.opt
@@ -0,0 +1 @@
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-slave.opt
new file mode 100644
index 000000000000..804c2f72e6be
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-slave.opt
@@ -0,0 +1 @@
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key2
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
index 0e89e81e0553..c785a354164c 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
@@ -70,8 +70,8 @@ INSERT INTO t2 VALUEs(2,2);
 
 set sql_log_bin=0;
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption can't find master key, please check the keyring plugin is loaded*");
-call mtr.add_suppression(".*Can't find master key from keyring, please check keyring plugin is loaded*");
-call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check keyring plugin is loaded.' on query*");
+call mtr.add_suppression(".*Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.");
+call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': Error 'Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully.' on query*");
 call mtr.add_suppression(".*Slave SQL for channel 'group_replication_applier': ... The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state*");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'The applier thread execution was aborted. Unable to process more transactions, this member will now leave the group.'");
 call mtr.add_suppression("\\[Error\\] Plugin group_replication reported: 'Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.'");
@@ -173,13 +173,15 @@ DELETE FROM t1 WHERE c1=1;
 
 # Clean Up
 
-# Uninstall keyring plugin on server2
+# Uninstall keyring plugin and remove dummy keyring file on server2
 UNINSTALL PLUGIN keyring_file;
+--remove_file $MYSQL_TMP_DIR/mydummy_key2
 
-# Uninstall keyring plugin on server1
+# Uninstall keyring plugin and remove dummy keyring file on server1
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 UNINSTALL PLUGIN keyring_file;
+--remove_file $MYSQL_TMP_DIR/mydummy_key1
 
 DROP TABLE t2;
 DROP TABLE t3;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-master.opt
new file mode 100644
index 000000000000..62ab6dad1e0d
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-master.opt
@@ -0,0 +1 @@
+--lower_case_table_names=1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-slave.opt
new file mode 100644
index 000000000000..62ab6dad1e0d
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names-slave.opt
@@ -0,0 +1 @@
+--lower_case_table_names=1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names.test b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names.test
new file mode 100644
index 000000000000..85b4425b2f67
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_lower_case_table_names.test
@@ -0,0 +1,121 @@
+################################################################################
+## This test proves that group replication does not start on server when it's
+## lower_case_table_names does not match with the group.
+##
+## Test:
+## 0.  This test requires 2 members.
+## 1.  Verify lower_case_table_names cannot be set while server is
+##     running and start GR on server-1.
+## 2.  Store variables of server-2 for restart.
+## 3.  Test GR start on server when lower_case_table_names matches.
+## 3A. Test GR start with command when lower_case_table_names matches.
+## 3B. Test GR start on boot when lower_case_table_names matches.
+## 4.  Test GR does not start on server when lower_case_table_names
+##     does not match.
+## 4A. Test GR does not start on boot when lower_case_table_names
+##     does not match.
+## 4B. Test GR does not start with command when lower_case_table_names
+##     does not match.
+## 5.  Cleanup.
+################################################################################
+
+--source include/big_test.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+--source include/force_restart.inc
+
+--let $allow_rpl_inited=1
+
+--echo
+--echo ## 1.  Verify lower_case_table_names cannot be set while server is
+--echo ##     running and start GR on server-1.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+## Verify lower_case_table_names cannot be set while server is running.
+## This make sures we do not need to test variable changes while GR is running.
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET GLOBAL lower_case_table_names= 1;
+
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo ## 2.  Store variables of server-2 for restart.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+
+set session sql_log_bin=0;
+call mtr.add_suppression("The member is configured with a lower_case_table_names option value .*");
+call mtr.add_suppression("lower_case_table_names was set to 2, .*");
+set session sql_log_bin=1;
+
+--echo
+--echo ## 3A. Test GR start with command when lower_case_table_names matches.
+--echo
+--source include/start_group_replication.inc
+
+--let $assert_text= 'Assert server-1 and server-2 are ONLINE'
+--let $assert_cond= "[SELECT COUNT(*) from performance_schema.replication_group_members WHERE MEMBER_STATE=\"ONLINE\"]" = 2
+--source include/assert.inc
+
+--echo
+--echo ## 3B. Test GR start on boot when lower_case_table_names matches.
+--echo
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_start_on_boot=1 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --lower_case_table_names=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+#Needed as we are not using rpl_restart_server.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $wait_condition= SELECT COUNT(*) = 2 FROM performance_schema.replication_group_members WHERE MEMBER_STATE="ONLINE"
+--source include/wait_condition.inc
+
+--echo
+--echo ## 4A. Test GR does not start on boot when lower_case_table_names
+--echo ##     does not match.
+--echo
+
+--let $restart_parameters=restart:--group_replication_start_on_boot=1 --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --lower_case_table_names=2 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--source include/restart_mysqld.inc
+
+#Needed as we are not using rpl_restart_server.inc
+--let $rpl_server_number= 2
+--source include/rpl_reconnect.inc
+
+--let $wait_condition= SELECT COUNT(*) = 1 FROM performance_schema.replication_group_members WHERE MEMBER_STATE="OFFLINE"
+--source include/wait_condition.inc
+
+--echo
+--echo ## 4B. Test GR does not start with command when lower_case_table_names
+--echo ##     does not match.
+--echo
+
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--let $assert_only_after = CURRENT_TEST: group_replication.gr_lower_case_table_names
+--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_text = Found the expected error about lower_case_table_names
+--let $assert_select = The member is configured with a lower_case_table_names option value
+--let $assert_count = 2
+--source include/assert_grep.inc
+
+--let $assert_text= 'Assert server-2 is OFFLINE'
+--let $assert_cond= "[SELECT COUNT(*) from performance_schema.replication_group_members WHERE MEMBER_STATE=\"OFFLINE\"]" = 1
+--source include/assert.inc
+
+--echo
+--echo ## 5.  Cleanup.
+--echo
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_failover_while_dml.test b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_failover_while_dml.test
index 5303fc3beed3..3e0745642a68 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_failover_while_dml.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_failover_while_dml.test
@@ -72,9 +72,10 @@ set sql_log_bin=1;
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_2_to_1.test b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_2_to_1.test
index 413797da5463..f906a2c58645 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_2_to_1.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_2_to_1.test
@@ -56,6 +56,7 @@ SET SQL_LOG_BIN=1;
 # save this, since it will be used to recover the server later on
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
 # create a table for replicating data
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
@@ -110,6 +111,8 @@ CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 --eval SET @@global.group_replication_local_address="$local_address_server2"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 
 ###
 ### 3. issue a transaction on the server that is still up
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_restart.test b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_restart.test
index 04b3271afe26..7dca80ea6ad9 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_restart.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_majority_loss_restart.test
@@ -1,6 +1,7 @@
 ################################################################################
-# Validate that when a group loose a majority, if the faulty member rejoins the
-# group unblocks and resumes its normal behaviour.
+# Validate that when a group looses the majority, if the faulty member tries to
+# rejoin it will be disallowed to unblock the group and user needs to use
+# group_replication_force_members option.
 #
 # 0. Start with 2 servers running GR
 # 1. Crash server 2.
@@ -8,15 +9,16 @@
 #    since the group does not have majority.
 # 3. Assert that group is still blocked.
 # 4. Restart server 2 with group_replication_start_on_boot=ON,
-#    server 2 will rejoin and unblock the group.
-# 5. Check that statement did unblock and was applied on
-#    both members.
-# 6. Execute a transaction on both members.
-# 7. Validate data.
-# 8. Clean up.
+#    server 2 will be refused to join the group.
+# 5. Unblock group with server1 as a single member.
+# 6. Check that statement did unblock and was applied on
+#    server1.
+# 7. Rejoin server2
+# 8. Execute a transaction on both members.
+# 9. Validate data.
+#10. Clean up.
 ################################################################################
-# This test does crashes servers, thence we skip it on asan and valgrind.
---source include/not_asan.inc
+# This test does crashes servers, thence we skip it on valgrind.
 --source include/not_valgrind.inc
 --source include/big_test.inc
 --source include/force_restart.inc
@@ -34,6 +36,12 @@
 --let $member2_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $member2_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
 
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout on wait for view after joining group");
+call mtr.add_suppression("read failed");
+call mtr.add_suppression("The member was unable to join the group. Local port: *.*");
+SET SESSION sql_log_bin= 1;
+
 
 --echo
 --echo ############################################################
@@ -86,49 +94,62 @@
 --echo
 --echo ############################################################
 --echo # 4. Restart server 2 with group_replication_start_on_boot=ON,
---echo #    server 2 will rejoin and unblock the group.
+--echo #    server 2 will be refused to join the group.
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
---let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$member2_group_replication_group_seeds --group_replication_start_on_boot=ON --group-replication-group-name=$group_replication_group_name
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $member2_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$member2_group_replication_group_seeds --group_replication_start_on_boot=ON --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $member2_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
+# Give it some time to try and fail
+--sleep 20
+
 --let $rpl_server_number= 2
 --source include/rpl_reconnect.inc
---let $group_replication_member_state= ONLINE
+--let $group_replication_member_state= OFFLINE
 --source ../inc/gr_wait_for_member_state.inc
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---let $group_replication_member_state= ONLINE
---let $group_replication_member_id= $member2_uuid
---source ../inc/gr_wait_for_member_state.inc
---let $group_replication_member_id=
+--let $assert_text= server 2 is marked as unreachable
+--let $assert_cond= [SELECT COUNT(*) FROM performance_schema.replication_group_members WHERE member_id="$member2_uuid" AND member_state="UNREACHABLE"] = 1
+--source include/assert.inc
 
 
 --echo
 --echo ############################################################
---echo # 5. Check that statement did unblock and was applied on
---echo #    both members.
+--echo # 5. Unblock group with server1 as a single member.
+--let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
+--replace_result $local_address_server1 SERVER1_ADDRESS
+--eval SET GLOBAL group_replication_force_members= "$local_address_server1"
+
+
+--echo
+--echo ############################################################
+--echo # 6. Check that statement did unblock and was applied on
+--echo #    server1.
 --let $rpl_connection_name= server_1
 --source include/rpl_connection.inc
 --reap
---source include/rpl_sync.inc
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 --let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.tables WHERE TABLE_SCHEMA="test" AND TABLE_NAME="t1";
 --source include/wait_condition.inc
 
+
+--echo
+--echo ############################################################
+--echo # 7. Rejoin server2
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
---let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.tables WHERE TABLE_SCHEMA="test" AND TABLE_NAME="t1";
---source include/wait_condition.inc
+--source include/start_group_replication.inc
 
 
 --echo
 --echo ############################################################
---echo # 6. Execute a transaction on both members.
+--echo # 8. Execute a transaction on both members.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 INSERT INTO t1 VALUES (1);
@@ -142,7 +163,7 @@ INSERT INTO t1 VALUES (2);
 
 --echo
 --echo ############################################################
---echo # 7. Validate data.
+--echo # 9. Validate data.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 --let $assert_text= 'There are two values in table t1'
@@ -165,7 +186,7 @@ INSERT INTO t1 VALUES (2);
 
 --echo
 --echo ############################################################
---echo # 8. Clean up.
+--echo # 10. Clean up.
 DROP TABLE t1;
 
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_member_expel_during_shutdown.test b/rapid/plugin/group_replication/tests/mtr/t/gr_member_expel_during_shutdown.test
index 6b681f7404d8..5962d5cad3e0 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_member_expel_during_shutdown.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_member_expel_during_shutdown.test
@@ -63,8 +63,9 @@
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Wait for client reconnection.
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_member_host_port.test b/rapid/plugin/group_replication/tests/mtr/t/gr_member_host_port.test
index fd0230151536..d167f9442bb1 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_member_host_port.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_member_host_port.test
@@ -48,8 +48,9 @@
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--report-host=$new_host --report-port=$new_port --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--report-host=$new_host --report-port=$new_port --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # renable connection
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_groups_in_group_seeds.test b/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_groups_in_group_seeds.test
index 9e6a720d9d36..d9fdfcc91d97 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_groups_in_group_seeds.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_groups_in_group_seeds.test
@@ -37,6 +37,9 @@
 --let $group_replication_group_name= $group_name_server1
 --source ../inc/start_and_bootstrap_group_replication.inc
 --let $local_address_m1= `SELECT @@GLOBAL.group_replication_local_address;`
+set session sql_log_bin=0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+set session sql_log_bin=1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
@@ -45,6 +48,9 @@
 --let $group_replication_group_name= $group_name_server2
 --source ../inc/start_and_bootstrap_group_replication.inc
 --let $local_address_m2= `SELECT @@GLOBAL.group_replication_local_address;`
+set session sql_log_bin=0;
+call mtr.add_suppression("The request to add .*:[0-9]* to the group has been rejected because it is aimed at another group");
+set session sql_log_bin=1;
 
 --echo #
 --echo # GROUP#1 is $group_name_server1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_version_members.test b/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_version_members.test
index 1eb36c1c805a..108d3c9ea117 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_version_members.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_multiple_version_members.test
@@ -13,12 +13,13 @@
 #  (S3)   join member with the base version         (base version)         OK
 #  (S3)   member leaves
 #  (S3)   join member with a higher major version   (major version +1)     OK
-#  (S4)   join member with a higher minor version   (minor version + 1)  Failure
-#  (S3)   member leaves
 #  (S4)   join member with a higher minor version   (minor version + 1)    OK
+#  (S1)   member leaves
 #  (S2)   member leaves
-#  (S4)   member leaves
 #  (S5)   join member with the base version         (base version)         OK
+#  (S4)   member leaves
+#  (S5)   member leaves
+#  (S5)   join member with the base version         (base version)       Failure
 #
 # *) The group start happens with Server 1 joining
 #
@@ -70,7 +71,8 @@ INSERT INTO t1 VALUES (1);
 --echo #
 --echo # Try to add a new member with a higher minor version
 --echo # Version = Base version + 1 minor version
---echo # The member will join the group
+--echo # The member will join the group as there are other members with the
+--echo # same major version
 --echo #
 
 --connection server2
@@ -97,10 +99,6 @@ SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
 --connection server3
 --echo server3
 
-SET session sql_log_bin=0;
-call mtr.add_suppression("Member version is incompatible with the group");
-SET session sql_log_bin=1;
-
 --source include/start_group_replication.inc
 
 --echo #
@@ -125,41 +123,45 @@ SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_major_version';
 --source include/assert.inc
 
 --echo #
---echo # Try to add a new member with a major version equal to the base version,
---echo # but a higher minor version.
+--echo # Add server 4 with a higher minor version than base
 --echo # Version = Base version + 1 minor version
---echo # It will fail to join since a higher major version member is present
+--echo # The member will join the group as there are other members with the
+--echo # same major version
 --echo #
 
 --connection server4
 --echo server4
 
 SET @debug_saved_s4= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
+--source include/start_group_replication.inc
 
-SET session sql_log_bin=0;
-call mtr.add_suppression("Member version is incompatible with the group");
-SET session sql_log_bin=1;
+# Check the data is there
 
-# Cause the member to broadcast and compare himself using a high version
-SET @@GLOBAL.DEBUG= '+d,group_replication_compatibility_higher_minor_version';
-SET GLOBAL group_replication_group_name= "8a1da670-05fa-11e5-b939-0800200c9a66";
---error ER_GROUP_REPLICATION_CONFIGURATION
-START GROUP_REPLICATION;
+--let $assert_text= On the recovered member, the table should contain 1 elements
+--let $assert_cond= [SELECT COUNT(*) FROM t1] = 1;
+--source include/assert.inc
 
 --echo #
---echo # Make server 3 leave so every member has the same major version
---echo # Try to add server 4 again with a higher minor version than base
---echo # Version = Base version + 1 minor version
---echo # The member will join the group
+--echo # Remove server 1 and server 2
+--echo # Try to add a new member with a base version than member 1
+--echo # Version = Base version
+--echo # The member will join the group because of server 4 which has
+--echo # same major version
 --echo #
 
---connection server3
---echo server3
+--connection server1
+--echo server1
 
 --source include/stop_group_replication.inc
 
---connection server4
---echo server4
+--connection server2
+--echo server2
+
+--source include/stop_group_replication.inc
+
+--connection server5
+--echo server5
 
 --source include/start_group_replication.inc
 
@@ -170,17 +172,13 @@ START GROUP_REPLICATION;
 --source include/assert.inc
 
 --echo #
---echo # Remove all servers with higher minor versions
---echo # Try to add a new member with a lower patch version than member 1
+--echo # Remove all servers with base major version.
+--echo # Try to add a new member with a base version.
 --echo # Version = Base version
---echo # The member will join the group
+--echo # The member will not join the group because of server 3
+--echo # has higher major version.
 --echo #
 
---connection server2
---echo server2
-
---source include/stop_group_replication.inc
-
 --connection server4
 --echo server4
 
@@ -189,49 +187,49 @@ START GROUP_REPLICATION;
 --connection server5
 --echo server5
 
---source include/start_group_replication.inc
+--source include/stop_group_replication.inc
 
-# Check the data is there
+SET session sql_log_bin=0;
+call mtr.add_suppression("Member version is incompatible with the group");
+SET session sql_log_bin=1;
 
---let $assert_text= On the recovered member, the table should contain 1 elements
---let $assert_cond= [SELECT COUNT(*) FROM t1] = 1;
---source include/assert.inc
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
 
 --echo #
 --echo # Clean up
 --echo #
 
+--connection server3
+--echo server3
+
+--source include/stop_group_replication.inc
+SET @@GLOBAL.DEBUG= @debug_save_s3;
+--source ../inc/start_and_bootstrap_group_replication.inc
+
 --connection server1
 --echo server1
 
 SET @@GLOBAL.DEBUG= @debug_save_s1;
-
-# Restart group replication to reset the member version
---source include/stop_group_replication.inc
 --source include/start_group_replication.inc
 
 --connection server2
 --echo server2
 
-# Reset the version of the compatibility module
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
---source include/start_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_save_s2;
-
---connection server3
---echo server3
-
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
 --source include/start_group_replication.inc
-SET @@GLOBAL.DEBUG= @debug_save_s3;
 
 --connection server4
 --echo server4
 
-SET @@GLOBAL.DEBUG= 'd,group_replication_compatibility_restore_version';
---source include/start_group_replication.inc
 SET @@GLOBAL.DEBUG= @debug_save_s4;
+--source include/start_group_replication.inc
 
+--connection server5
+--echo server5
+
+--source include/start_group_replication.inc
 DROP TABLE t1;
 
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_no_user_start_failure.test b/rapid/plugin/group_replication/tests/mtr/t/gr_no_user_start_failure.test
index d5494fb08fa1..d8a3382226ad 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_no_user_start_failure.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_no_user_start_failure.test
@@ -52,8 +52,9 @@ START GROUP_REPLICATION;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$group_replication_group_name
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.test b/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.test
index 9e1923c3655d..a6021b488152 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_parallel_applier_indexes_commit_order.test
@@ -40,13 +40,13 @@
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 3 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 SET SESSION sql_log_bin= 0;
-call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than group_replication_auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
+call mtr.add_suppression("Plugin group_replication reported: 'Group contains 2 members which is greater than auto_increment_increment value of 1. This can lead to an higher rate of transactional aborts.");
 SET SESSION sql_log_bin= 1;
 
 --echo
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_perfschema_group_member_stats.test b/rapid/plugin/group_replication/tests/mtr/t/gr_perfschema_group_member_stats.test
index 1743f9463f39..4dee314f6730 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_perfschema_group_member_stats.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_perfschema_group_member_stats.test
@@ -31,8 +31,9 @@
 --connection server1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 #Reset the servers to delete data from previous rounds
@@ -182,8 +183,8 @@ START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 --source include/assert.inc
 
 --let $certification_db_size= query_get_value(SELECT Count_Transactions_rows_validating from performance_schema.replication_group_member_stats, Count_Transactions_rows_validating, 1)
---let $assert_text= The value of Count_Transactions_rows_validating should be 2 after starting group replication
---let $assert_cond= "$certification_db_size" = 2
+--let $assert_text= The value of Count_Transactions_rows_validating should be 6 after starting group replication
+--let $assert_cond= "$certification_db_size" = 6
 --source include/assert.inc
 
 --let $stable_set= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_plugin_reinstall_with_start_on_boot.test b/rapid/plugin/group_replication/tests/mtr/t/gr_plugin_reinstall_with_start_on_boot.test
index a80ef6da6795..ab86d23b97d1 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_plugin_reinstall_with_start_on_boot.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_plugin_reinstall_with_start_on_boot.test
@@ -31,8 +31,9 @@
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_readmode_on_autostart.test b/rapid/plugin/group_replication/tests/mtr/t/gr_readmode_on_autostart.test
index 54e2273852d8..41ff1d09270e 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_readmode_on_autostart.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_readmode_on_autostart.test
@@ -54,8 +54,9 @@ SET @debug_save= @@GLOBAL.DEBUG;
 --let $allow_rpl_inited= 1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_channel.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_channel.test
index 64c626cd5a7d..8021b84d6a4a 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_channel.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_channel.test
@@ -9,7 +9,7 @@
 # 2. Stop replication on M1. On M2 lock a table to block recovery. Start M1.
 # 3. Execute a STOP SLAVE command and see the recovery channel still active.
 # 4. Execute a RESET SLAVE ALL command and see the recovery channel is not
-#    affected on M1.
+#    affected on M1 when GR node is active.
 # 5. Kill the server M1. The recovery channel should still be there but it's
 #    not started. Recreate the slave channel to test that it started
 # 6. Clean the created channels and tables.
@@ -84,7 +84,8 @@ STOP SLAVE;
 --source include/assert.inc
 
 #
-# Phase 4: Execute a RESET SLAVE ALL command and see the channel is not affected
+# Phase 4: Execute a RESET SLAVE ALL command and see the recovery channel is
+# not affected as GR node is active.
 #
 
 --connection server1
@@ -104,6 +105,7 @@ SET GLOBAL SUPER_READ_ONLY=0; # Bug#22097534
 --let $recovery_relay_log_index= `SELECT CONCAT('$datadir_1', 'mgr-group_replication_recovery.index')`
 --file_exists $recovery_relay_log_index
 
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
 RESET SLAVE ALL;
 
 --let $assert_text= 'The group replication recovery channel is present'
@@ -139,10 +141,11 @@ RESET SLAVE ALL;
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
 # kill server 1
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
 #Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_connection_options.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_connection_options.test
index ecffe29b5b4e..91128a2b86f5 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_connection_options.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_connection_options.test
@@ -24,7 +24,7 @@
 ################################################################################
 
 --source include/big_test.inc
---source include/have_debug.inc
+--source include/have_debug_sync.inc
 --let $group_replication_group_name= b5eb4110-a3a2-11e3-a5e2-0800200c9a66
 --source ../inc/have_group_replication_plugin.inc
 
@@ -32,9 +32,6 @@
 --let $rpl_server_count= 3
 --source ../inc/group_replication.inc
 
---let $debug_save_count= `SELECT @@GLOBAL.group_replication_recovery_retry_count`
---let $debug_save_rec_int= `SELECT @@GLOBAL.group_replication_recovery_reconnect_interval`
-
 --let $recovery_user= recovery_user
 --let $recovery_password= recovery_password
 --let $recovery_bad_password= recovery_bad_password
@@ -100,6 +97,12 @@ call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave
 call mtr.add_suppression(".*Invalid .* username when attempting to connect to the master server.*");
 set session sql_log_bin=1;
 
+--let $debug_save_count= `SELECT @@GLOBAL.group_replication_recovery_retry_count`
+--let $debug_save_rec_int= `SELECT @@GLOBAL.group_replication_recovery_reconnect_interval`
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
+
 --disable_warnings
 CHANGE MASTER TO MASTER_USER='$recovery_user', MASTER_PASSWORD='$recovery_bad_password' FOR CHANNEL 'group_replication_recovery';
 --enable_warnings
@@ -114,19 +117,11 @@ CHANGE MASTER TO MASTER_USER='$recovery_user', MASTER_PASSWORD='$recovery_bad_pa
 --source include/assert.inc
 
 --echo # Start recovery and wait to verify the member is in recovery
-
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 --let $group_replication_start_member_state= RECOVERING
 --source include/start_group_replication.inc
 
---echo # Wake up recovery
-
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
-SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
-
 --echo # The member should error out as it can't connect
-
+SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 --let $group_replication_member_state= ERROR
 --source ../inc/gr_wait_for_member_state.inc
 
@@ -134,34 +129,22 @@ SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
 --echo # Set MASTER_USER to an empty user name, watching it fail
 --echo #
 
-SET @debug_save= @@GLOBAL.DEBUG;
-
 --source include/stop_group_replication.inc
 
 CHANGE MASTER TO MASTER_USER= '', MASTER_PASSWORD= '' FOR CHANNEL 'group_replication_recovery';
 
-#--echo # Set the retry count to try only once.
-#--eval SET GLOBAL group_replication_recovery_retry_count= 1;
-
 --echo # Start recovery and wait to verify the member is in recovery
-
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 --let $group_replication_start_member_state= RECOVERING
 --source include/start_group_replication.inc
 
---echo # Wake up recovery
-
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
 SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
-
 --let $group_replication_member_state= ERROR
 --source ../inc/gr_wait_for_member_state.inc
 
 --echo # Verify that the show slave status shows specific IO_error
 let $show_statement= SHOW SLAVE STATUS FOR CHANNEL 'group_replication_recovery';
-let $field= Last_IO_Error;
-let $condition= 'Fatal error: Invalid (empty) username when attempting to connect to the master server. Connection attempt terminated.';
+let $field= Last_IO_Errno;
+let $condition= = '1045';
 --source include/wait_show_condition.inc
 
 --source include/stop_group_replication.inc
@@ -170,29 +153,20 @@ let $condition= 'Fatal error: Invalid (empty) username when attempting to connec
 --echo # Set MASTER_USER to non existing user, watching it fail
 --echo #
 
-SET @debug_save= @@GLOBAL.DEBUG;
-
 CHANGE MASTER TO MASTER_USER= 'parveez', MASTER_PASSWORD= 'me' FOR CHANNEL 'group_replication_recovery';
 
 --echo # Start recovery and wait to verify the member is in recovery
-
-SET @@GLOBAL.DEBUG='d,recovery_thread_wait_before_finish';
 --let $group_replication_start_member_state= RECOVERING
 --source include/start_group_replication.inc
 
---echo # Wake up recovery
-
-SET DEBUG_SYNC= 'RESET';
-SET @@GLOBAL.DEBUG= @debug_save;
 SET DEBUG_SYNC= "now SIGNAL signal.recovery_end";
-
 --let $group_replication_member_state= ERROR
 --source ../inc/gr_wait_for_member_state.inc
 
 --echo # Verify that show slave status shows specific IO_ERROR
 let $show_statement= SHOW SLAVE STATUS FOR CHANNEL 'group_replication_recovery';
 let $field= Last_IO_Errno;
-let $condition= '1045';
+let $condition= = '1045';
 --source include/wait_show_condition.inc
 
 --source include/stop_group_replication.inc
@@ -201,7 +175,6 @@ let $condition= '1045';
 --let $group_replication_number_of_members= 2
 --source ../inc/gr_wait_for_number_of_members.inc
 
-
 --echo #
 --echo # Clean up
 --echo #
@@ -209,6 +182,7 @@ let $condition= '1045';
 --eval DROP USER "$recovery_user"
 --connection server3
 SET DEBUG_SYNC='RESET';
+SET @@GLOBAL.DEBUG = @debug_save;
 --eval SET GLOBAL group_replication_recovery_retry_count= $debug_save_count
 --eval SET GLOBAL group_replication_recovery_reconnect_interval= $debug_save_rec_int
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_errors_report.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_errors_report.test
new file mode 100644
index 000000000000..7aa7f3f590a6
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_errors_report.test
@@ -0,0 +1,90 @@
+################################################################################
+# Validate that recovery errors are properly reported between attempts on
+# performance_schema.replication_applier_status_by_worker and SHOW SLAVE STATUS.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Bootstrap group on server1 and create table t1 on it.
+# 2. Create the same table t1 on server1 and then join it to
+#    the group, recovery will fail.
+#    Assert that error is visible on
+#    performance_schema.replication_applier_status_by_worker
+#    and SHOW SLAVE STATUS between retry attempts.
+# 3. Clean up.
+################################################################################
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Bootstrap group on server1 and create table t1 on it.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--source ../inc/start_and_bootstrap_group_replication.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+
+
+--echo
+--echo ############################################################
+--echo # 2. Create the same table t1 on server1 and then join it to
+--echo #    the group, recovery will fail.
+--echo #    Assert that error is visible on
+--echo #    performance_schema.replication_applier_status_by_worker
+--echo #    and SHOW SLAVE STATUS between retry attempts.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Worker [0-9] failed executing transaction .*; Error 'Table 't1' already exists' on query.*");
+call mtr.add_suppression("Slave SQL for channel 'group_replication_recovery': Error 'Table 't1' already exists' on query.*");
+call mtr.add_suppression("Slave: Table 't1' already exists Error_code: 1050");
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+SET SESSION sql_log_bin= 1;
+
+SET @group_replication_recovery_reconnect_interval_save= @@GLOBAL.group_replication_recovery_reconnect_interval;
+# Increase the reconnect interval to avoid reconnects on slow machines.
+SET GLOBAL group_replication_recovery_reconnect_interval= 3600;
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET GLOBAL group_replication_group_name= "$group_replication_group_name"
+START GROUP_REPLICATION;
+
+--echo # Wait until the error is reported on performance_schema.replication_applier_status_by_worker table
+--let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.replication_applier_status_by_worker WHERE channel_name='group_replication_recovery' AND last_error_number=1050;
+--source include/wait_condition.inc
+
+--let $last_errno = query_get_value(SHOW SLAVE STATUS FOR CHANNEL 'group_replication_recovery', Last_Errno, 1)
+--let $assert_text= Recovery channel error is reported on Last_Errno
+--let $assert_cond= $last_errno = 1050
+--source include/assert.inc
+
+--let $last_sql_errno = query_get_value(SHOW SLAVE STATUS FOR CHANNEL 'group_replication_recovery', Last_SQL_Errno, 1)
+--let $assert_text= Recovery channel error is reported on Last_SQL_Errno
+--let $assert_cond= $last_sql_errno = 1050
+--source include/assert.inc
+
+--let $server2_uuid= `SELECT @@server_uuid`
+--let $assert_text= MEMBER_STATE is RECOVERING
+--let $assert_cond= "[SELECT MEMBER_STATE FROM performance_schema.replication_group_members WHERE MEMBER_ID=\'$server2_uuid\', MEMBER_STATE, 1]" = "RECOVERING"
+--source include/assert.inc
+
+--source include/stop_group_replication.inc
+SET GLOBAL group_replication_recovery_reconnect_interval= @group_replication_recovery_reconnect_interval_save;
+
+
+--echo
+--echo ############################################################
+--echo # 3. Clean up.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET SESSION sql_log_bin= 0;
+DROP TABLE t1;
+SET SESSION sql_log_bin= 1;
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_fails_to_detect_thread_stop.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_fails_to_detect_thread_stop.test
index 47a0c22ef013..ae69d0c54ea9 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_fails_to_detect_thread_stop.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_fails_to_detect_thread_stop.test
@@ -42,6 +42,10 @@
 
 --source ../inc/start_and_bootstrap_group_replication.inc
 
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
+SET SESSION sql_log_bin= 1;
+
 # Insert some data
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count-slave.opt
new file mode 100644
index 000000000000..20d62c2eb30e
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count-slave.opt
@@ -0,0 +1 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_recovery_lower_max_retry_count.2.err
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count.test
new file mode 100644
index 000000000000..790eacd0dc3d
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_lower_max_retry_count.test
@@ -0,0 +1,103 @@
+################################################################################
+# This test verifies that recovery aborts successfully if
+# group_replication_recovery_retry_count is made smaller then connection
+# retry count in middle of recovery donor connection attempts.
+#
+# Test:
+# 0. The test requires two servers: M1 and M2.
+# 1. Bootstrap start a group on M1.
+# 2. Setup environment to fail donor connection and start GR on M2.
+#    Set DEBUG on M2 to block donor connection attempt when count reaches 3.
+#    Verify M2 is in recovery state.
+# 3. Reset group_replication_recovery_retry_count to 2.
+#    Signal donor connection attempt to continue.
+# 4. Verification.
+# 5. Clean up.
+################################################################################
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+--let $error_file = $MYSQLTEST_VARDIR/tmp/gr_recovery_lower_max_retry_count.2.err
+
+--echo
+--echo # 1. Bootstrap start a group on M1.
+--echo
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo # 2. Setup environment to fail donor connection and start GR on M2.
+--echo #    Set DEBUG on M2 to block donor connection attempt when count reaches 3.
+--echo #    Verify M2 is in recovery state.
+--echo
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @recovery_reconnect_interval_save= @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL;
+SET @recovery_retry_count_save= @@GLOBAL.group_replication_recovery_retry_count;
+--disable_warnings
+CHANGE MASTER TO MASTER_USER="user_does_not_exist" FOR CHANNEL "group_replication_recovery";
+--enable_warnings
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+SET SESSION sql_log_bin = 1;
+SET @@GLOBAL.DEBUG='+d,gr_reset_max_connection_attempts_to_donors';
+
+SET GLOBAL group_replication_recovery_reconnect_interval= 2;
+
+--let $group_replication_start_member_state= RECOVERING
+--source include/start_group_replication.inc
+
+--echo
+--echo # 3. Reset group_replication_recovery_retry_count to 2.
+--echo #    Signal donor connection attempt to continue.
+--echo
+SET DEBUG_SYNC= "now WAIT_FOR signal.connection_attempt_3";
+
+SET GLOBAL group_replication_recovery_retry_count= 2;
+
+SET DEBUG_SYNC= "now SIGNAL signal.reset_recovery_retry_count_done";
+
+--echo
+--echo # 4. Verification.
+--echo
+
+--let $group_replication_member_state= ERROR
+--source ../inc/gr_wait_for_member_state.inc
+
+--let $assert_file = $error_file
+--let $assert_text = 3 donor connections attempts were made.
+--let $assert_select = Retrying group recovery connection with another donor. Attempt 3/10
+--let $assert_count = 1
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = Post change of group_replication_recovery_retry_count, 4th donor connection attempt was not made.
+--let $assert_select = Retrying group recovery connection with another donor. Attempt 4
+--let $assert_count = 0
+--source include/assert_grep.inc
+
+--let $assert_file = $error_file
+--let $assert_text = Recovery process aborted.
+--let $assert_select = Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.
+--let $assert_count = 1
+--source include/assert_grep.inc
+
+--echo
+--echo # 5. Clean up.
+--echo
+SET @@GLOBAL.DEBUG= @debug_save;
+SET @@GLOBAL.GROUP_REPLICATION_RECOVERY_RECONNECT_INTERVAL= @recovery_reconnect_interval_save;
+SET @@GLOBAL.group_replication_recovery_retry_count= @recovery_retry_count_save;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_no_donors.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_no_donors.test
index 98b8a99b883f..53f67f367ec0 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_no_donors.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_no_donors.test
@@ -30,6 +30,7 @@
 --let $server1_uuid= `SELECT @@GLOBAL.SERVER_UUID`
 SET SESSION sql_log_bin= 0;
 call mtr.add_suppression("Fatal error during the Recovery process of Group Replication.*");
+call mtr.add_suppression("Maximum number of retries when trying to connect to a donor reached. Aborting group replication recovery.");
 call mtr.add_suppression("Error leaving the group");
 call mtr.add_suppression("All donors left. Aborting group replication recovery.");
 call mtr.add_suppression("This member has more executed transactions *.*");
@@ -39,6 +40,7 @@ call mtr.add_suppression("Skipping leave operation: member already left the grou
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
 call mtr.add_suppression("Transaction cannot be executed while Group Replication is stopping.");
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 
 CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT NOT NULL);
@@ -82,6 +84,7 @@ call mtr.add_suppression("All donors left. Aborting group replication recovery."
 call mtr.add_suppression("The member is already leaving or joining a group.");
 call mtr.add_suppression("Skipping leave operation: member already left the group.");
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 
 --let $rpl_connection_name= server3
@@ -94,6 +97,7 @@ call mtr.add_suppression("All donors left. Aborting group replication recovery."
 call mtr.add_suppression("The member is already leaving or joining a group.");
 call mtr.add_suppression("Skipping leave operation: member already left the group.");
 call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
 SET SESSION sql_log_bin= 1;
 
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.test b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.test
index a8ca75a89de3..9cf5850f357a 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_recovery_purged_donor_failover.test
@@ -31,6 +31,10 @@
 --connection server1
 --source ../inc/start_and_bootstrap_group_replication.inc
 
+SET SESSION sql_log_bin= 0;
+CALL mtr.add_suppression("Cannot replicate to server with server_uuid*");
+SET SESSION sql_log_bin= 1;
+
 #insert some data
 CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_name_change.test b/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_name_change.test
index 7bd60fa8576e..8bcd81a370a4 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_name_change.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_name_change.test
@@ -44,8 +44,9 @@ SET SESSION sql_log_bin=1;
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group-replication-start-on-boot=ON --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=ON
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group-replication-start-on-boot=ON --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=ON --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $group_replication_member_state= ONLINE
@@ -56,7 +57,7 @@ SET SESSION sql_log_bin=1;
 --echo # 2: Restart the server changing the relay-log option
 --let $allow_rpl_inited=1
 --let $restart_parameters= $restart_parameters --relay-log=new-relay-log-name
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $wait_condition= SELECT last_error_number != 0 FROM performance_schema.replication_applier_status_by_worker where channel_name='group_replication_applier';
@@ -75,11 +76,12 @@ RESET SLAVE FOR CHANNEL 'group_replication_applier';
 --echo #    group_replication_applier channel
 --let $allow_rpl_inited=1
 --let $restart_parameters= $restart_parameters --relay-log=new-relay-log-name
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $group_replication_member_state= ONLINE
 --source ../inc/gr_wait_for_member_state.inc
 
+--source include/stop_group_replication.inc
 --let $skip_recovery_configuration= 1
 --source ../inc/gr_clear_configuration.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_recovery.test b/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_recovery.test
index e0e3d141fc90..d9f16bec0367 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_recovery.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_relay_log_recovery.test
@@ -42,8 +42,9 @@ SET SESSION sql_log_bin= 1;
 --let $rpl_server_number=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --relay-log-recovery=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --relay-log-recovery=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --echo #No server crash here on starting group replication.
@@ -63,8 +64,8 @@ SET SESSION sql_log_bin= 1;
 --let $rpl_server_number=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --relay-log-recovery=0
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --relay-log-recovery=0 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --echo #No server crash here on starting group replication.
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_reset_slave_channel.test b/rapid/plugin/group_replication/tests/mtr/t/gr_reset_slave_channel.test
index 0ab6e6039cad..a95570f39360 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_reset_slave_channel.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_reset_slave_channel.test
@@ -1,7 +1,8 @@
 ################################################################################
 # This test verifies that group replication channels are not affect by global
-# RESET SLAVE commands.
-# If a command is however used directly in a group channel it should work.
+# RESET SLAVE commands when the group replication is running.
+# If a command is used directly in a group channel it should work.
+# If a command is used when group replication is stopped it should work.
 #
 # Test:
 # 0. The test requires two servers: M1, M2 and M3.
@@ -18,7 +19,8 @@
 #  c) On M2, group applier files should now be present with the channel.
 #  b) On M2, recovery files should be present.
 #
-# 3. Phase 3: Check that the RESET SLAVE command doesn't affect GR.
+# 3. Phase 3: Check that the RESET SLAVE command doesn't affect GR specific
+#    channels when the GR member is ONLINE.
 #  a) Execute RESET SLAVE ALL command on M1.
 #  b) Validate that group applier files are still present on M1.
 #  c) Check that slave files are removed on M1.
@@ -35,6 +37,23 @@
 #  c) Add some data on M1 to check if all is fine.
 #  d) Validate that both members have all the data.
 #
+# 6. Phase 6: When GR is stopped, after global reset command all files
+#    should disappear.
+#  a) Stop GR on M2.
+#  b) Execute RESET SLAVE command on M2
+#  c) Validate that slave_master_info and slave_relay_log_info tables are
+#     cleared.
+#  d) Start GR on M2. The node should be ONLINE.
+#
+# 7. Phase 7: When GR is stopped, after global RESET SLAVE ALL command all
+#    files should disappear including recovery channel specific credentials.
+#  a) Stop GR on M2.
+#  b) Execute RESET SLAVE ALL command on M2
+#  c) Validate that slave_master_info and slave_relay_log_info tables are
+#  cleared.
+#  d) Execute CHANGE MASTER command to provide recovery channel credentials.
+#  f) Start GR on M2. The node should be ONLINE.
+#
 # 6. Phase 6: Cleanup.
 ################################################################################
 
@@ -136,11 +155,15 @@ INSERT INTO t1 VALUES (3);
 
 #
 # Phase 3: Check that the RESET SLAVE command doesn't affect group replication
-# The slave channel should not be there
+# specific channels when the GR member is ONLINE. Only the slave channel should
+# not be there
 #
 
 --connection server1
 
+# Global RESET SLAVE ALL command will not work on group replication channels
+# when the group memeber is ONLINE.
+--error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
 RESET SLAVE ALL;
 
 --let $relay_log_file=`SELECT CONCAT('$datadir_1','mgr-group_replication_applier.000001')`
@@ -216,7 +239,81 @@ INSERT INTO t1 VALUES (5);
 --source include/assert.inc
 
 #
-# Phase 6: Cleanup
+# Phase 6: After a global reset command all files should disappear
+#
+--connection server2
+--echo server2
+
+--echo Vefiry that group replication channels are present
+--let $assert_text= 'The group replication applier channel is present'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_relay_log_info WHERE channel_name="group_replication_applier", count, 1] = 1
+--source include/assert.inc
+
+--let $assert_text= 'The group replication recovery channel is present'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_relay_log_info WHERE channel_name="group_replication_recovery", count, 1] = 1
+--source include/assert.inc
+--let $datadir_2= `SELECT @@GLOBAL.datadir`
+
+--source include/stop_group_replication.inc
+
+--echo RESET SLAVE command clears master and slave info repositories and will flush master info
+RESET SLAVE;
+
+--let $assert_text= 'mysql.slave_relay_log_info contains no group replication channel information'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_relay_log_info WHERE channel_name like "group_replication%", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'mysql.slave_master_info contains flushed group replication channel information'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE channel_name like "group_replication%", count, 1] = 2
+--source include/assert.inc
+
+# Applier files are recreated
+--let $relay_log_index= `SELECT CONCAT('$datadir_2', 'mgr-group_replication_applier.index')`
+--file_exists $relay_log_index
+
+# Recovery files are recreated
+--let $recovery_relay_log_index= `SELECT CONCAT('$datadir_2', 'mgr-group_replication_recovery.index')`
+--file_exists $recovery_relay_log_index
+
+--source include/start_group_replication.inc
+
+--let $assert_text= 'The group replication applier and recovery channel are present'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_relay_log_info WHERE channel_name like "group_replication%", count, 1] = 2
+--source include/assert.inc
+
+#
+# Phase 7: After a global reset slave all command, all files should disappear
+# Executed the CHANGE MASTER command to create recovery channel and enable
+# group replication.
+#
+
+--source include/stop_group_replication.inc
+RESET SLAVE ALL;
+
+--let $assert_text= 'mysql.slave_relay_log_info does not contrain group replication channel information'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_relay_log_info WHERE channel_name like "group_replication%", count, 1] = 0
+--source include/assert.inc
+
+--let $assert_text= 'mysql.slave_master_info does not contrain group replication channel information'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM mysql.slave_master_info WHERE channel_name like "group_replication%", count, 1] = 0
+--source include/assert.inc
+
+--let $relay_log_index= `SELECT CONCAT('$datadir_2', 'mgr-group_replication_applier.index')`
+--error 1
+--file_exists $relay_log_index
+
+# Recovery files are also removed
+
+--let $recovery_relay_log_index= `SELECT CONCAT('$datadir_2', 'mgr-group_replication_recovery.index')`
+--error 1
+--file_exists $recovery_relay_log_index
+
+CHANGE MASTER TO MASTER_USER="root" FOR CHANNEL "group_replication_recovery";
+
+--source include/start_group_replication.inc
+
+#
+# Phase 8: Cleanup
 #
 
 DROP TABLE t1;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_restart.test b/rapid/plugin/group_replication/tests/mtr/t/gr_restart.test
index 4368a561612b..41697f0e1c7b 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_restart.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_restart.test
@@ -66,8 +66,9 @@ INSERT INTO t1 VALUES (1);
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 SET @@GLOBAL.DEBUG= '+d,certifier_assert_next_seqno_equal_5';
 --source include/start_group_replication.inc
@@ -86,8 +87,8 @@ INSERT INTO t1 VALUES (2);
 --echo # number is set from GTID_EXECUTED.
 
 # kill server 2
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
 #Needed as we are not using rpl_restart_server.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash.test b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash.test
index 5f42ef307d67..aecbfaf893b6 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash.test
@@ -52,8 +52,9 @@ SAVEPOINT s2;
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
---let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_release.test b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_release.test
index 8ee9e41c187f..7ece11f543e4 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_release.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_release.test
@@ -69,8 +69,9 @@ SAVEPOINT s2;
 
 --let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now'
 --source include/wait_condition.inc
---replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
 --source ../inc/kill_and_restart_mysqld.inc
 
 #reconnect clients
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_rollback.test b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_rollback.test
index 3fcd1ee16a79..ae427ef1d32f 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_rollback.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_savepoint_crash_on_rollback.test
@@ -69,8 +69,9 @@ SAVEPOINT s2;
 
 --let $wait_condition=SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE State = 'debug sync point: now'
 --source include/wait_condition.inc
---replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
---let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--replace_result $member1_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS1 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--let $restart_parameters=restart:--group_replication_local_address=$member1_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
 --source ../inc/kill_and_restart_mysqld.inc
 
 #reconnect clients
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml.test b/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml.test
index d23242c650b5..04427cc25bbc 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml.test
@@ -66,12 +66,21 @@ delimiter ;$$
 
 # Kill server1
 --echo # killing
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+--error 2006,2013
+--reap
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
 # Needed as we are not using rpl_restart_server.inc
 --let $rpl_server_number= 1
 --source include/rpl_reconnect.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml_on_other.test b/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml_on_other.test
index af49f86fc984..b1e043a6fc09 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml_on_other.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_server_failover_while_dml_on_other.test
@@ -70,9 +70,10 @@ set sql_log_bin=1;
 --echo # killing
 --let $group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
---let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 --echo # restarting
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_server_id_0.test b/rapid/plugin/group_replication/tests/mtr/t/gr_server_id_0.test
index 4ca957b1d4bd..bf23dd5e9381 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_server_id_0.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_server_id_0.test
@@ -46,8 +46,9 @@ SET SESSION sql_log_bin= 1;
 --echo # 1. Restart server with server_id=0, slave infrastructure
 --echo #    will not be initialized.
 --let $allow_rpl_inited= 1
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --server_id=0
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --server_id=0 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 # Needed as we are not using rpl_restart_server.inc
 --let $rpl_server_number= 1
@@ -88,8 +89,8 @@ START GROUP_REPLICATION;
 --echo #    slave infrastructure will be initialized, and RESET
 --echo #    SLAVE operations on group_replication_end.inc do work.
 --let $allow_rpl_inited= 1
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --server_id=$_server_id
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --server_id=$_server_id --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 # Needed as we are not using rpl_restart_server.inc
 --let $rpl_server_number= 1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_bootstrap.test b/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_bootstrap.test
index 436809fdc697..8f9e515b629c 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_bootstrap.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_bootstrap.test
@@ -51,8 +51,9 @@ SET @debug_group_replication_local_address= @@GLOBAL.group_replication_local_add
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
---let $restart_parameters=restart:--group_replication_group_name=$member1_uuid --group_replication_bootstrap_group=ON --group_replication_local_address=$_group_replication_local_address --group_replication_start_on_boot=1
---replace_result $member1_uuid MEMBER_UUID $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_group_name=$member1_uuid --group_replication_bootstrap_group=ON --group_replication_local_address=$_group_replication_local_address --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $member1_uuid MEMBER_UUID $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 ## 1.1. Assert GR do not start.
@@ -71,8 +72,8 @@ SET @debug_group_replication_local_address= @@GLOBAL.group_replication_local_add
 ## 2.   Restart server1 with unique group_name
 
 --let $group_replication_group_name= 8a94f357-aaaa-11aa-22bb-c80aa9422222
---let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_bootstrap_group=ON --group_replication_local_address=$_group_replication_local_address --group_replication_start_on_boot=1
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_bootstrap_group=ON --group_replication_local_address=$_group_replication_local_address --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $wait_condition=SELECT COUNT(*)=1 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_non_bootstrap.test b/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_non_bootstrap.test
index 95b9d625dc5b..2630626c5e67 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_non_bootstrap.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_server_uuid_matches_group_name_non_bootstrap.test
@@ -72,8 +72,9 @@ set session sql_log_bin=1;
 
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$member2_uuid
---replace_result $member2_uuid MEMBER_UUID $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$member2_uuid --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $member2_uuid MEMBER_UUID $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 ## 1.1. Assert GR do not start.
@@ -111,8 +112,8 @@ set session sql_log_bin=1;
 --source include/rpl_connection.inc
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$group_replication_group_name
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $wait_condition=SELECT COUNT(*)=2 FROM performance_schema.replication_group_members where MEMBER_STATE="ONLINE"
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_set_gtid_next.test b/rapid/plugin/group_replication/tests/mtr/t/gr_set_gtid_next.test
index 28a12c6f0f0b..67fefbadf5be 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_set_gtid_next.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_set_gtid_next.test
@@ -168,8 +168,8 @@ INSERT INTO t2 VALUES (3);
 --connection server1
 
 --let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
---let $assert_text= 'Count_transactions_rows_validating must be 0'
---let $assert_cond= $count_transactions_validating = 0
+--let $assert_text= 'Count_transactions_rows_validating must be 2'
+--let $assert_cond= $count_transactions_validating = 2
 --source include/assert.inc
 
 --let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
@@ -186,8 +186,8 @@ INSERT INTO t2 VALUES (3);
 --connection server2
 
 --let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
---let $assert_text= 'Count_transactions_rows_validating must be 0'
---let $assert_cond= $count_transactions_validating = 0
+--let $assert_text= 'Count_transactions_rows_validating must be 2'
+--let $assert_cond= $count_transactions_validating = 2
 --source include/assert.inc
 
 --let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_set_variable_in_read_only.test b/rapid/plugin/group_replication/tests/mtr/t/gr_set_variable_in_read_only.test
new file mode 100644
index 000000000000..1f4f7b7a9d7f
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_set_variable_in_read_only.test
@@ -0,0 +1,200 @@
+################################################################################
+# This test proves that SET variable option works in Read only mode.
+#
+# Test:
+# 0. The test requires two server.
+# 1. Start GR with server1 as Primary and server2 as secondary.
+# 2. Change value of variable binlog_checksum on server2.
+# 3. Stop GR on server1.
+# 4. Assert server is in Read only mode on server1.
+# 5. Test changing value of variables.
+# 6. Cleanup.
+#
+################################################################################
+
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_server_count= 2
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_group_replication_single_primary_mode=1
+--source ../inc/group_replication.inc
+
+--echo
+--echo # 1. Start GR with server1 as Primary and server2 as secondary.
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+--source include/start_group_replication.inc
+
+--echo
+--echo # 2. Change value of variable binlog_checksum on server2.
+SET @binlog_checksum_save= @@GLOBAL.binlog_checksum;
+SET GLOBAL binlog_checksum=none;
+
+--echo
+--echo # 3. Stop GR on server1.
+--let $skip_reset_read_mode=1
+--source include/stop_group_replication.inc
+
+--let $wait_condition= SELECT count(*) = 1 FROM performance_schema.replication_group_members WHERE MEMBER_STATE = 'OFFLINE';
+--source include/wait_condition.inc
+
+--echo
+--echo # 4. Assert server is in Read only mode on server1.
+--let $assert_cond= "[SELECT @@GLOBAL.super_read_only]" = 1
+--let $assert_text= Assert that server is running in super read-only.
+--source include/assert.inc
+
+--let $assert_cond= "[SELECT @@GLOBAL.read_only]" = 1
+--let $assert_text= Assert that server is running in read-only.
+--source include/assert.inc
+
+--echo
+--echo # 5. Test changing value of variables.
+--disable_query_log
+## Save values
+SET @saved_gtid_mode = @@GLOBAL.gtid_mode;
+SET @saved_gtid_executed_compression_period = @@GLOBAL.gtid_executed_compression_period;
+SET @saved_binlog_checksum = @@GLOBAL.binlog_checksum;
+SET @saved_binlog_cache_size = @@GLOBAL.binlog_cache_size;
+SET @saved_binlog_direct_non_transactional_updates = @@GLOBAL.binlog_direct_non_transactional_updates;
+SET @saved_binlog_error_action = @@GLOBAL.binlog_error_action;
+SET @saved_binlog_format = @@GLOBAL.binlog_format;
+SET @saved_binlog_group_commit_sync_delay = @@GLOBAL.binlog_group_commit_sync_delay;
+SET @saved_binlog_group_commit_sync_no_delay_count = @@GLOBAL.binlog_group_commit_sync_no_delay_count;
+SET @saved_binlog_order_commits = @@GLOBAL.binlog_order_commits;
+SET @saved_binlog_rows_query_log_events = @@GLOBAL.binlog_rows_query_log_events;
+SET @saved_binlog_stmt_cache_size = @@GLOBAL.binlog_stmt_cache_size;
+
+SET @saved_gr_allow_local_lower_version_join = @@GLOBAL.group_replication_allow_local_lower_version_join;
+SET @saved_gr_auto_increment_increment = @@GLOBAL.group_replication_auto_increment_increment;
+SET @saved_gr_bootstrap_group = @@GLOBAL.group_replication_bootstrap_group;
+SET @saved_gr_components_stop_timeout = @@GLOBAL.group_replication_components_stop_timeout;
+SET @saved_gr_compression_threshold = @@GLOBAL.group_replication_compression_threshold;
+SET @saved_gr_force_members = @@GLOBAL.group_replication_force_members;
+SET @saved_gr_group_name = @@GLOBAL.group_replication_group_name;
+SET @saved_gr_gtid_assignment_block_size = @@GLOBAL.group_replication_gtid_assignment_block_size;
+SET @saved_gr_ip_whitelist = @@GLOBAL.group_replication_ip_whitelist;
+SET @saved_gr_local_address = @@GLOBAL.group_replication_local_address;
+SET @saved_gr_group_seeds = @@GLOBAL.group_replication_group_seeds;
+SET @saved_gr_poll_spin_loops = @@GLOBAL.group_replication_poll_spin_loops;
+SET @saved_gr_recovery_complete_at = @@GLOBAL.group_replication_recovery_complete_at;
+SET @saved_gr_recovery_reconnect_interval = @@GLOBAL.group_replication_recovery_reconnect_interval;
+SET @saved_gr_recovery_retry_count = @@GLOBAL.group_replication_recovery_retry_count;
+SET @saved_gr_recovery_ssl_ca = @@GLOBAL.group_replication_recovery_ssl_ca;
+SET @saved_gr_recovery_ssl_capath = @@GLOBAL.group_replication_recovery_ssl_capath;
+SET @saved_gr_recovery_ssl_cert = @@GLOBAL.group_replication_recovery_ssl_cert;
+SET @saved_gr_recovery_ssl_cipher = @@GLOBAL.group_replication_recovery_ssl_cipher;
+SET @saved_gr_recovery_ssl_crl = @@GLOBAL.group_replication_recovery_ssl_crl;
+SET @saved_gr_recovery_ssl_crlpath = @@GLOBAL.group_replication_recovery_ssl_crlpath;
+SET @saved_gr_recovery_ssl_key = @@GLOBAL.group_replication_recovery_ssl_key;
+SET @saved_gr_recovery_ssl_verify_server_cert = @@GLOBAL.group_replication_recovery_ssl_verify_server_cert;
+SET @saved_gr_recovery_use_ssl = @@GLOBAL.group_replication_recovery_use_ssl;
+SET @saved_gr_single_primary_mode = @@GLOBAL.group_replication_single_primary_mode;
+SET @saved_gr_ssl_mode = @@GLOBAL.group_replication_ssl_mode;
+SET @saved_gr_start_on_boot = @@GLOBAL.group_replication_start_on_boot;
+SET @saved_gr_transaction_size_limit = @@GLOBAL.group_replication_transaction_size_limit;
+SET @saved_gr_unreachable_majority_timeout = @@GLOBAL.group_replication_unreachable_majority_timeout;
+SET @saved_gr_member_weight = @@GLOBAL.group_replication_member_weight;
+
+## SET values
+SET GLOBAL gtid_mode= ON_PERMISSIVE;
+SET GLOBAL gtid_executed_compression_period= 2000;
+
+SET GLOBAL binlog_checksum=CRC32;
+SET GLOBAL binlog_cache_size=4096;
+SET GLOBAL binlog_direct_non_transactional_updates=ON;
+SET GLOBAL binlog_error_action=IGNORE_ERROR;
+SET GLOBAL binlog_format=MIXED;
+SET GLOBAL binlog_group_commit_sync_delay=60;
+SET GLOBAL binlog_group_commit_sync_no_delay_count=60;
+SET GLOBAL binlog_order_commits=true;
+SET GLOBAL binlog_rows_query_log_events= ON;
+SET GLOBAL binlog_stmt_cache_size= 4096;
+
+SET GLOBAL group_replication_allow_local_lower_version_join= ON;
+SET GLOBAL group_replication_auto_increment_increment= 5;
+SET GLOBAL group_replication_bootstrap_group= ON;
+SET GLOBAL group_replication_components_stop_timeout= 10;
+SET GLOBAL group_replication_compression_threshold= 10;
+SET GLOBAL group_replication_force_members= "";
+SET GLOBAL group_replication_group_name= "aaaaaaaa-cccc-bbbb-cccc-aaaaaaaaaaaa";
+SET GLOBAL group_replication_gtid_assignment_block_size= 2;
+SET GLOBAL group_replication_ip_whitelist= "AUTOMATIC";
+SET GLOBAL group_replication_local_address= "$saved_gr_local_address";
+SET GLOBAL group_replication_group_seeds= "$saved_gr_group_seeds";
+SET GLOBAL group_replication_poll_spin_loops= 10;
+SET GLOBAL group_replication_recovery_complete_at= "TRANSACTIONS_CERTIFIED";
+SET GLOBAL group_replication_recovery_reconnect_interval= 20;
+SET GLOBAL group_replication_recovery_retry_count= 5;
+SET GLOBAL group_replication_recovery_ssl_ca= '$MYSQL_TEST_DIR/std_data/cacert.pem';
+SET GLOBAL group_replication_recovery_ssl_capath= '';
+SET GLOBAL group_replication_recovery_ssl_cert= '$MYSQL_TEST_DIR/std_data/client-cert.pem';
+SET GLOBAL group_replication_recovery_ssl_cipher= 'DHE-RSA-AES256-SHA';
+SET GLOBAL group_replication_recovery_ssl_crl= 'crl-client-revoked.crl';
+SET GLOBAL group_replication_recovery_ssl_crlpath= '';
+SET GLOBAL group_replication_recovery_ssl_key= '$MYSQL_TEST_DIR/std_data/client-key.pem';
+SET GLOBAl group_replication_recovery_ssl_verify_server_cert= ON;
+SET GLOBAl group_replication_single_primary_mode= OFF;
+SET GLOBAL group_replication_recovery_use_ssl= ON;
+SET GLOBAL group_replication_ssl_mode= "REQUIRED";
+SET GLOBAL group_replication_start_on_boot= ON;
+SET GLOBAL group_replication_transaction_size_limit= 100000;
+SET GLOBAL group_replication_unreachable_majority_timeout= 100000;
+SET GLOBAL group_replication_member_weight= 70;
+
+--echo
+--echo # 6. Cleanup.
+## Restore values for server1
+SET @@GLOBAL.gtid_mode = @saved_gtid_mode;
+SET @@GLOBAL.gtid_executed_compression_period = @saved_gtid_executed_compression_period;
+SET @@GLOBAL.binlog_checksum = @saved_binlog_checksum;
+SET @@GLOBAL.binlog_cache_size = @saved_binlog_cache_size;
+SET @@GLOBAL.binlog_direct_non_transactional_updates = @saved_binlog_direct_non_transactional_updates;
+SET @@GLOBAL.binlog_error_action = @saved_binlog_error_action;
+SET @@GLOBAL.binlog_format = @saved_binlog_format;
+SET @@GLOBAL.binlog_group_commit_sync_delay = @saved_binlog_group_commit_sync_delay;
+SET @@GLOBAL.binlog_group_commit_sync_no_delay_count = @saved_binlog_group_commit_sync_no_delay_count;
+SET @@GLOBAL.binlog_order_commits = @saved_binlog_order_commits;
+SET @@GLOBAL.binlog_rows_query_log_events = @saved_binlog_rows_query_log_events;
+SET @@GLOBAL.binlog_stmt_cache_size = @saved_binlog_stmt_cache_size;
+
+SET @@GLOBAL.group_replication_allow_local_lower_version_join= @saved_gr_allow_local_lower_version_join;
+SET @@GLOBAL.group_replication_auto_increment_increment= @saved_gr_auto_increment_increment;
+SET @@GLOBAL.group_replication_bootstrap_group= @saved_gr_bootstrap_group;
+SET @@GLOBAL.group_replication_components_stop_timeout= @saved_gr_components_stop_timeout;
+SET @@GLOBAL.group_replication_compression_threshold= @saved_gr_compression_threshold;
+SET @@GLOBAL.group_replication_single_primary_mode= @saved_gr_single_primary_mode;
+SET @@GLOBAL.group_replication_force_members= @saved_gr_force_members;
+SET @@GLOBAL.group_replication_group_name= @saved_gr_group_name;
+SET @@GLOBAL.group_replication_gtid_assignment_block_size= @saved_gr_gtid_assignment_block_size;
+SET @@GLOBAL.group_replication_ip_whitelist= @saved_gr_ip_whitelist;
+SET @@GLOBAL.group_replication_local_address= @saved_gr_local_address;
+SET @@GLOBAL.group_replication_group_seeds= @saved_gr_group_seeds;
+SET @@GLOBAL.group_replication_poll_spin_loops= @saved_gr_poll_spin_loops;
+SET @@GLOBAL.group_replication_recovery_complete_at= @saved_gr_recovery_complete_at;
+SET @@GLOBAL.group_replication_recovery_reconnect_interval= @saved_gr_recovery_reconnect_interval;
+SET @@GLOBAL.group_replication_recovery_retry_count= @saved_gr_recovery_retry_count;
+SET @@GLOBAL.group_replication_recovery_ssl_ca= @saved_gr_recovery_ssl_ca;
+SET @@GLOBAL.group_replication_recovery_ssl_capath= @saved_gr_recovery_ssl_capath;
+SET @@GLOBAL.group_replication_recovery_ssl_cert= @saved_gr_recovery_ssl_cert;
+SET @@GLOBAL.group_replication_recovery_ssl_cipher= @saved_gr_recovery_ssl_cipher;
+SET @@GLOBAL.group_replication_recovery_ssl_crl= @saved_gr_recovery_ssl_crl;
+SET @@GLOBAL.group_replication_recovery_ssl_crlpath= @saved_gr_recovery_ssl_crlpath;
+SET @@GLOBAL.group_replication_recovery_ssl_key= @saved_gr_recovery_ssl_key;
+SET @@GLOBAL.group_replication_recovery_ssl_verify_server_cert= @saved_gr_recovery_ssl_verify_server_cert;
+SET @@GLOBAL.group_replication_recovery_use_ssl= @saved_gr_recovery_use_ssl;
+SET @@GLOBAL.group_replication_ssl_mode= @saved_gr_ssl_mode;
+SET @@GLOBAL.group_replication_start_on_boot= @saved_gr_start_on_boot;
+SET @@GLOBAL.group_replication_transaction_size_limit= @saved_gr_transaction_size_limit;
+SET @@GLOBAL.group_replication_unreachable_majority_timeout= @saved_gr_unreachable_majority_timeout;
+SET @@GLOBAL.group_replication_member_weight= @saved_gr_member_weight;
+
+--enable_query_log
+
+## Restore values for server2
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+SET @@GLOBAL.binlog_checksum= @binlog_checksum_save;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_show_global_and_session_variables.test b/rapid/plugin/group_replication/tests/mtr/t/gr_show_global_and_session_variables.test
index 435a16c16fc0..4e55f2b1abcf 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_show_global_and_session_variables.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_show_global_and_session_variables.test
@@ -3,7 +3,7 @@
 #
 # Test:
 # 0. This test requires one server.
-# 1. Basic check that there are 35 GR variables.
+# 1. Basic check that there are 36 GR variables.
 # 2. Verify that all the group replication variables are GLOBAL variables.
 # 3. Verify values of GLOBAL and SESSION variables using below commands:-
 #  - SHOW GLOBAL VARIABLES LIKE 'group_replication_..'
@@ -29,12 +29,12 @@
 --sleep 30
 
 --echo
---echo # Test#1: Basic check that there are 35 GR variables.
+--echo # Test#1: Basic check that there are 36 GR variables.
 
 # Note: If a new GR variable is added or an old GR variable is removed, then
 # update this testcase for the sanity check.
---let $assert_text= There are 35 GR variables at present.
---let $assert_cond= "[SELECT COUNT(*) FROM performance_schema.global_variables WHERE VARIABLE_NAME LIKE \\'group_replication%\']" = 35
+--let $assert_text= There are 36 GR variables at present.
+--let $assert_cond= "[SELECT COUNT(*) FROM performance_schema.global_variables WHERE VARIABLE_NAME LIKE \\'group_replication%\']" = 36
 --source include/assert.inc
 
 # Take backup of GR variables
@@ -71,6 +71,7 @@
 --let $saved_gr_transaction_size_limit = `SELECT @@GLOBAL.group_replication_transaction_size_limit;`
 --let $saved_gr_unreachable_majority_timeout = `SELECT @@GLOBAL.group_replication_unreachable_majority_timeout`
 --let $saved_gr_member_weight = `SELECT @@GLOBAL.group_replication_member_weight;`
+--let $saved_gr_exit_state_action = `SELECT @@GLOBAL.group_replication_exit_state_action;`
 --enable_query_log
 
 --echo
@@ -141,6 +142,8 @@ SET @@SESSION.group_replication_transaction_size_limit= 10240;
 SET @@SESSION.group_replication_unreachable_majority_timeout= 10240;
 --error ER_GLOBAL_VARIABLE
 SET @@SESSION.group_replication_member_weight= 80;
+--error ER_GLOBAL_VARIABLE
+SET @@SESSION.group_replication_exit_state_action= "READ_ONLY";
 
 # GR variables should be set at GLOBAL level.
 # Set values to GLOBAL GR variables to test further.
@@ -177,6 +180,7 @@ SET GLOBAL group_replication_start_on_boot= ON;
 SET GLOBAL group_replication_transaction_size_limit= 100000;
 SET GLOBAL group_replication_unreachable_majority_timeout= 100000;
 SET GLOBAL group_replication_member_weight= 70;
+SET GLOBAL group_replication_exit_state_action= "READ_ONLY";
 --enable_query_log
 
 --echo
@@ -729,6 +733,23 @@ SET GLOBAL group_replication_member_weight= 70;
 --let $assert_cond= "[SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME=\'group_replication_member_weight\', VARIABLE_VALUE, 1]" = 70
 --source include/assert.inc
 
+# group_replication_exit_state_action
+--let $assert_text= Verify GLOBAL value of group_replication_exit_state_action
+--let $assert_cond= "[SHOW GLOBAL VARIABLES LIKE \'group_replication_exit_state_action\', Value, 1]" = "READ_ONLY"
+--source include/assert.inc
+
+--let $assert_text= Verify GLOBAL value of group_replication_exit_state_action
+--let $assert_cond= "[SELECT * FROM performance_schema.global_variables WHERE VARIABLE_NAME=\'group_replication_exit_state_action\', VARIABLE_VALUE, 1]" = "READ_ONLY"
+--source include/assert.inc
+
+--let $assert_text= Verify SESSION value of group_replication_exit_state_action
+--let $assert_cond= "[SHOW SESSION VARIABLES LIKE \'group_replication_exit_state_action\', Value, 1]" = "READ_ONLY"
+--source include/assert.inc
+
+--let $assert_text= Verify SESSION value of group_replication_exit_state_action
+--let $assert_cond= "[SELECT * FROM performance_schema.session_variables WHERE VARIABLE_NAME=\'group_replication_exit_state_action\', VARIABLE_VALUE, 1]" = "READ_ONLY"
+--source include/assert.inc
+
 --echo
 --echo # Clean up
 --source include/stop_group_replication.inc
@@ -767,6 +788,7 @@ SET GLOBAL group_replication_member_weight= 70;
 --eval SET @@GLOBAL.group_replication_transaction_size_limit= $saved_gr_transaction_size_limit
 --eval SET @@GLOBAL.group_replication_unreachable_majority_timeout= $saved_gr_unreachable_majority_timeout
 --eval SET @@GLOBAL.group_replication_member_weight= $saved_gr_member_weight
+--eval SET @@GLOBAL.group_replication_exit_state_action= $saved_gr_exit_state_action
 --enable_query_log
 
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_async_gr_start_on_boot.test b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_async_gr_start_on_boot.test
index 17a51c7e6cce..6950a91742b0 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_async_gr_start_on_boot.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_async_gr_start_on_boot.test
@@ -41,8 +41,9 @@
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 1
@@ -83,8 +84,8 @@
 --echo # 5. Restart server2(secondary) with group replication start on boot
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 2
@@ -168,8 +169,8 @@ START SLAVE SQL_THREAD FOR CHANNEL 'ch3_2';
 --echo # 14. Restart server2(secondary) with group replication start on boot
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip-slave-start=0
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group-replication-start-on-boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_single_primary_mode=1 --group_replication_enforce_update_everywhere_checks=0 --skip-slave-start=0 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $rpl_server_number= 2
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_1.test b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_1.test
index db6262640032..ae6a8995337b 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_1.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_1.test
@@ -43,6 +43,7 @@
 # save this, since it will be used to recover the server later on
 --let $local_address_server2= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_seeds_server2= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
@@ -94,6 +95,8 @@
 --eval SET @@global.group_replication_local_address="$local_address_server2"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 --eval SET @@global.group_replication_enforce_update_everywhere_checks=OFF
 --eval SET @@global.group_replication_single_primary_mode=ON
 
@@ -105,6 +108,8 @@
 --eval SET @@global.group_replication_local_address="$local_address_server3"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 --eval SET @@global.group_replication_enforce_update_everywhere_checks=OFF
 --eval SET @@global.group_replication_single_primary_mode=ON
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_2.test b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_2.test
index 2aeaf194734d..5000b7a0ba5b 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_2.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_majority_loss_2.test
@@ -38,6 +38,7 @@
 --source include/rpl_connection.inc
 --source include/start_group_replication.inc
 --let $member2_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
@@ -90,6 +91,8 @@
 --eval SET @@global.group_replication_local_address="$local_address_server1"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 --eval SET @@global.group_replication_enforce_update_everywhere_checks=OFF
 --eval SET @@global.group_replication_single_primary_mode=ON
 
@@ -101,6 +104,8 @@
 --eval SET @@global.group_replication_local_address="$local_address_server3"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 --eval SET @@global.group_replication_enforce_update_everywhere_checks=OFF
 --eval SET @@global.group_replication_single_primary_mode=ON
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_stop.test b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_stop.test
index 46bedc0afd34..3ac8e21aac14 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_stop.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_stop.test
@@ -32,6 +32,7 @@
 # save this, since it will be used to recover the server later on
 --let $local_address_server1= `SELECT @@GLOBAL.group_replication_local_address`
 --let $group_seeds_server1= `SELECT @@GLOBAL.group_replication_group_seeds`
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
@@ -89,6 +90,8 @@
 --eval SET @@global.group_replication_local_address="$local_address_server1"
 --replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
 --eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
+--eval SET @@global.group_replication_ip_whitelist="$_group_replication_group_whitelist"
 --eval SET @@global.group_replication_enforce_update_everywhere_checks=0
 --eval SET @@global.group_replication_single_primary_mode=1
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_var_checks.test b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_var_checks.test
index 43e29e9e5164..82f8ba19b03d 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_var_checks.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_var_checks.test
@@ -18,8 +18,9 @@
 --source include/rpl_connection.inc
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart: --group_replication_enforce_update_everywhere_checks=ON --group_replication_single_primary_mode=ON --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group-replication-group-name=$group_replication_group_name
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart: --group_replication_enforce_update_everywhere_checks=ON --group_replication_single_primary_mode=ON --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 ## verify that 'start group_replication' should fail when MySQL Server is started with
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_skip_send_lower_case_table_names.test b/rapid/plugin/group_replication/tests/mtr/t/gr_skip_send_lower_case_table_names.test
new file mode 100644
index 000000000000..f84cb4157f2c
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_skip_send_lower_case_table_names.test
@@ -0,0 +1,58 @@
+################################################################################
+## This test proves that group replication allows member to join the group if
+## it does not send its lower_case_table_names value. This is required so
+## members with higher version can join groups which has member of lower
+## version.
+##
+## Test:
+## 0.  This test requires 2 members.
+## 1.  Set debug flag so server1 does not send its value of
+##     lower_case_table_names and bootstrap group.
+## 2.  Start server2.
+## 3.  Verify server2 joins the group.
+## 4.  Cleanup.
+################################################################################
+
+--source include/have_debug.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+--echo
+--echo ## 1.  Set debug flag so server1 does not send its value of
+--echo ##     lower_case_table_names and bootstrap group.
+--echo
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_skip_encode_lower_case_table_names';
+
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+--echo
+--echo ## 2.  Start server2.
+--echo
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--source include/start_group_replication.inc
+
+--echo
+--echo ## 3.  Verify server2 joins the group.
+--echo
+--let $assert_text= Assert 2 servers are ONLINE
+--let $assert_cond= "[SELECT COUNT(*) from performance_schema.replication_group_members WHERE MEMBER_STATE=\"ONLINE\"]" = 2
+--source include/assert.inc
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $assert_text= Assert 2 servers are ONLINE
+--let $assert_cond= "[SELECT COUNT(*) from performance_schema.replication_group_members WHERE MEMBER_STATE=\"ONLINE\"]" = 2
+--source include/assert.inc
+
+--echo
+--echo ## 4.  Cleanup.
+--echo
+SET @@GLOBAL.DEBUG= @debug_save;
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.cnf
deleted file mode 100644
index 30847abcd9cc..000000000000
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.cnf
+++ /dev/null
@@ -1,11 +0,0 @@
-!include ../my.cnf
-
-[mysqld.1]
-
-[mysqld.2]
-
-[mysqld.3]
-
-[ENV]
-SERVER_MYPORT_3=		@mysqld.3.port
-SERVER_MYSOCK_3=		@mysqld.3.socket
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.test b/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.test
index f21d67ac3c97..75155e6d9c71 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_slave_max_allowed_packet_dependency.test
@@ -1,82 +1,58 @@
 ################################################################################
-# This test checks that group replication applier thread is dependant upon
-# slave_max_allowed_packet and allows processing of larger View_change packets.
+# This test checks that group replication applier thread is dependent upon
+# slave_max_allowed_packet to allow the processing of larger View_change packets.
+# If the certification database is too big to transmit, all donors will encode
+# an error instead that will make the joiner fail.
+#
+# References:
+#   BUG#26770576: ALL MEMBERS ARE EXITED FROM GR WHEN 1/3 NODE TRIED TO REJOIN AFTER SHUTDOWN
+#   BUG#28443958: ALL MEMBERS ARE EXITED FROM GR WHEN 1/4 NODE TRIED TO REJOIN AFTER NETWORK DROP
 #
 # Test:
-# 0.  The test requires three servers.
-# 1.  Start three server(disable certification database garbage collection).
-# 1A. Bootstrap server1.
-# 1B. Set slave_max_allowed_packet to lowest value and start server2.
-# 1C. Setup environment on server3, do not start GR yet.
+# 0.  The test requires two server in multi primary mode
+# 1.  Bootstrap server1 (disable certification database garbage collection).
+#     Set slave_max_allowed_packet to lowest value
 # 2.  Generate 200 transactions on server1 to increase
 #     certification database size.
-# 3.  Start GR on server3, View_change packet will be high in size.
-# 4.  Server2 can only handle small packet sizes, so it will go in error state.
-# 5.  Server1 can handle 1GB packet size(default) so it will become donor and
-#     assist server3 to come ONLINE.
-# 6.  Restart GR on server2 with large value of slave_max_allowed_packet
-#     to make it ONLINE.
-# 7.  Verification.
-# 8.  Cleanup.
+# 3.  Start GR on server2, view_change packet will be high in size.
+#     Without certification information, server 2 can't join and moves to ERROR state
+# 4.  Set a bigger value of slave_max_allowed_packet on server1
+#     Restart server2 and see it come ONLINE.
+# 5.  Verification.
+# 6.  Cleanup.
 ################################################################################
 
 --source include/big_test.inc
 --source include/have_debug.inc
 --source ../inc/have_group_replication_plugin.inc
---let $rpl_server_count= 3
 --let $rpl_skip_group_replication_start= 1
 --source ../inc/group_replication.inc
 
 --echo
---echo # 1.  Start three server(disable certification database garbage collection).
---echo
+--echo # 1. Bootstrap server1 (disable certification database garbage collection).
+--echo #    Set slave_max_allowed_packet to lowest value
 
---echo # 1A. Bootstrap server1.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 --source ../inc/start_and_bootstrap_group_replication.inc
 SET @debug_save1= @@GLOBAL.DEBUG;
 SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
 
---echo # 1B. Set slave_max_allowed_packet to lowest value and start server2.
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
 SET @debug_save_slave_max_allowed_packet= @@GLOBAL.slave_max_allowed_packet;
 SET GLOBAL slave_max_allowed_packet=1024;
---source include/start_group_replication.inc
-SET @debug_save2= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
-
-set session sql_log_bin=0;
-call mtr.add_suppression("Unable to convert the event into a packet on the applier.*");
-call mtr.add_suppression("Failed to fetch transaction data containing required transaction info for applier");
-call mtr.add_suppression("Error at event handling.*");
-call mtr.add_suppression("Fatal error during execution on the Applier process of Group Replication. The server will now leave the group.");
-call mtr.add_suppression("The server was automatically set into read only mode after an error was detected.");
-call mtr.add_suppression("Slave SQL for channel 'group_replication_applier'.*");
-call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
-set session sql_log_bin=1;
-
---echo # 1C. Setup environment on server3, do not start GR yet.
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-SET @debug_save3= @@GLOBAL.DEBUG;
-SET @@GLOBAL.DEBUG= 'd,group_replication_do_not_clear_certification_database';
 
 --echo
 --echo # 2.  Generate 200 transactions on server1 to increase
 --echo #     certification database size.
---echo
 
 ## We have disabled cleaning of certification database.
-## We have limited Member 2, packet size to 1 KB slave_max_allowed_packet.
-## Member2 will go in ERROR state if any packet is bigger then
-## MAX (slave_max_allowed_packet,binlog-row-event-max-size +
-## MAX_LOG_EVENT_HEADER i.e. 12251 as of now)
-## Member1 uses default value which is 1GB as of now. so it will process
-## View_change packet successfully.
+## We have limited packet size to 1 KB slave_max_allowed_packet.
+## The certification will not be encoded and member2 will
+## go to ERROR state if the view change log event to be generated is bigger then
+## slave_max_allowed_packet
 ## As of now size of certification database is growing to approx 13339
 ## which includes (12+48)*200 and other View_change information.
+
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 CREATE TABLE t1 (a INT PRIMARY KEY);
@@ -90,63 +66,54 @@ WHILE($rows)
 --enable_query_log
 
 --echo
---echo # 3.  Start GR on server3, View_change packet will be high in size.
---echo
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
---source include/start_group_replication.inc
+--echo # 3. Start GR on server2, view_change packet will be high in size.
+--echo #    Without certification information, server 2 can't join and moves to ERROR state
 
---echo
---echo # 4.  Server2 can only handle small packet sizes, so it will go in error state.
 --echo
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
---let $group_replication_member_state= ERROR
---source ../inc/gr_wait_for_member_state.inc
+
+--let $group_replication_start_member_state= ERROR
+--source include/start_group_replication.inc
+
+# Safety sleep against delays on writing
+--sleep 1
 
 --let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
 --let $assert_only_after = CURRENT_TEST: group_replication.gr_slave_max_allowed_packet_dependency
 --let $assert_count = 1
---let $assert_select = log event entry exceeded slave_max_allowed_packet; Increase slave_max_allowed_packet
---let $assert_text = Found the expected error about log event entry exceeded slave_max_allowed_packet.
+--let $assert_select = The certification information could not be set in this server: 'Certification information is too large for transmission.'
+--let $assert_text = Found the expected error about the view change log even being over size
 --source include/assert_grep.inc
 
 --echo
---echo # 5.  Server1 can handle 1GB packet size(default) so it will become donor and
---echo #     assist server3 to come ONLINE.
---echo
+--echo # 4. Set a bigger value of slave_max_allowed_packet on server1
+--echo #    Restart server2 and see it come ONLINE.
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---let $group_replication_number_of_members= 2
---source ../inc/gr_wait_for_number_of_members.inc
 
---echo
---echo # 6.  Restart GR on server2 with large value of slave_max_allowed_packet
---echo #     to make it ONLINE.
---echo
+SET @@GLOBAL.slave_max_allowed_packet=@debug_save_slave_max_allowed_packet;
+
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
---source include/stop_group_replication.inc
 
-SET @@GLOBAL.slave_max_allowed_packet=@debug_save_slave_max_allowed_packet;
+--source include/stop_group_replication.inc
 --let $wait_timeout=150
 --source include/start_group_replication.inc
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
---let $group_replication_number_of_members= 3
+--let $group_replication_number_of_members= 2
 --source ../inc/gr_wait_for_number_of_members.inc
 
 --echo
---echo # 7.  Verification.
---echo
+--echo # 5.  Verification.
 
---let $diff_tables=server1:t1, server2:t1, server3:t1
+--let $diff_tables=server1:t1, server2:t1
 --source include/diff_tables.inc
 
 --echo
---echo # 8.  Cleanup.
---echo
+--echo # 6.  Cleanup.
 
 DROP TABLE t1;
 
@@ -156,10 +123,15 @@ SET @@GLOBAL.DEBUG= @debug_save1;
 
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
-SET @@GLOBAL.DEBUG= @debug_save2;
 
---let $rpl_connection_name= server3
---source include/rpl_connection.inc
-SET @@GLOBAL.DEBUG= @debug_save3;
+SET session sql_log_bin=0;
+call mtr.add_suppression("The certification information could not be set in this server: 'Certification information is too large for transmission.'");
+call mtr.add_suppression("Error when processing certification information in the recovery process");
+call mtr.add_suppression("Fatal error during the recovery process of Group Replication. The server will leave the group.");
+call mtr.add_suppression("Skipping leave operation: concurrent attempt to leave the group is on-going.");
+call mtr.add_suppression("All donors left. Aborting group replication recovery.");
+call mtr.add_suppression("Skipping leave operation: member already left the group.");
+call mtr.add_suppression("On shutdown there was a timeout receiving a view change. This can lead to a possible inconsistent state. Check the log for more details");
+SET session sql_log_bin=1;
 
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_group_without_boot_node.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_group_without_boot_node.test
new file mode 100644
index 000000000000..41612637fa09
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_group_without_boot_node.test
@@ -0,0 +1,60 @@
+###############################################################################
+# Bug#27294009 - XCOM ENTERS AN INFINITE LOOP IN CASE OF A REQUEST_RETRY
+#
+# This test verifies that when the bootstrap node is not correctly set up in a
+# group, control requests (e.g., join, leave) will fail cleanly. Before fixing
+# this bug, issuing control requests to a group without the boot node correctly
+# set up would lead to nodes hanging indefinitely.
+#
+# The ideal scenario to test this bug fix would be to simultaneously start a
+# group with two (or more) nodes without setting any as the boot node. However,
+# due to the synchronous nature of MTR tests, it is not possible to do so, as
+# nodes will try (and fail) to connect to each other in succession, never
+# getting a chance to actually communicate. Hence, it is necessary to trick a
+# single node into connecting to itself.
+#
+# Test:
+# 0. This test requires one server.
+# 1. Set up seeds with alternative localhost addresses to force the node to
+#    connect to itself.
+# 2. Start group replication without setting the boot node flag to true.
+# 3. The join request fails cleanly without the node hanging.
+# 4. Clean up.
+###############################################################################
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+--echo ############################################################
+--echo # 1. Suppress expected error messages
+--echo ############################################################
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Plugin group_replication reported: 'read failed'");
+call mtr.add_suppression("Plugin group_replication reported: '\\[GCS\\] read failed'");
+call mtr.add_suppression("Plugin group_replication reported: 'Timeout on wait for view after joining group'");
+call mtr.add_suppression("\\[GCS\\] Error connecting to all peers. Member join failed. Local port:*");
+call mtr.add_suppression("\\[GCS\\] The member was unable to join the group.*");
+SET SESSION sql_log_bin= 1;
+
+--echo ############################################################
+--echo # 2. Define and setup seeds to force self connect
+--echo ############################################################
+--let $local_address= `SELECT @@GLOBAL.group_replication_local_address;`
+--let $xcom_port = `SELECT SUBSTR("$local_address",11,5);`
+--let $localhost_addr = `SELECT CONCAT("localhost:","$xcom_port");`
+--let $localhost_alt_addr = `SELECT CONCAT("127.0.0.1:","$xcom_port");`
+
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--eval SET @@global.group_replication_group_name="$group_replication_group_name"
+--replace_result $xcom_port XCOM_PORT
+--eval SET @@global.group_replication_group_seeds=`localhost:$xcom_port, 127.0.0.1:$xcom_port`
+
+--echo ############################################################
+--echo # 3. Start the node and expect it to fail
+--echo ############################################################
+--error ER_GROUP_REPLICATION_CONFIGURATION
+START GROUP_REPLICATION;
+
+--echo ############################################################
+--echo # 4. Clean up
+--echo ############################################################
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode-master.opt
new file mode 100644
index 000000000000..f8d9069dc160
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode-master.opt
@@ -0,0 +1,2 @@
+--log_error=$MYSQLTEST_VARDIR/tmp/gr_start_onboot_fail_restore_read_mode.1.err
+--no-console
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode.test
index ed30e65e9d4a..67ec82167090 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_onboot_fail_restore_read_mode.test
@@ -29,8 +29,9 @@ SET SESSION sql_log_bin= 1;
 # on MTR it is impossible to compute ports on configuration files.
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --super_read_only=1
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=0 --group_replication_start_on_boot=1 --super_read_only=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 
@@ -45,8 +46,7 @@ SET SESSION sql_log_bin= 1;
 --echo #    replication
 --echo ############################################################
 
---let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
---let $assert_only_after = CURRENT_TEST: group_replication.gr_start_onboot_fail_restore_read_mode
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/gr_start_onboot_fail_restore_read_mode.1.err
 --let $assert_count = 1
 --let $assert_select = Timeout on wait for view after joining group
 --let $assert_text = Found the expected Group Replication start error in the server log
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto.test
index fae093f2d799..af27b41dddf6 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto.test
@@ -23,8 +23,9 @@ SELECT @@group_replication_group_name;
 # on MTR it is impossible to compute ports on configuration files.
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 SELECT @@group_replication_group_name;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_ssl_recovery.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_ssl_recovery.test
index ef9d853c4bcb..f242d64cf494 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_ssl_recovery.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_ssl_recovery.test
@@ -27,8 +27,9 @@
 --connection server1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --connection server2
@@ -73,8 +74,8 @@ INSERT INTO t1 VALUES (1);
 CHANGE MASTER TO MASTER_USER= 'rec_ssl_user' FOR CHANNEL 'group_replication_recovery';
 --enable_warnings
 
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 --let $group_replication_member_state= ONLINE
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_super_read_only.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_super_read_only.test
index 5148668539b1..abe18d788a6a 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_super_read_only.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_with_super_read_only.test
@@ -22,8 +22,9 @@
 # on MTR it is impossible to compute ports on configuration files.
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --super_read_only=1
---replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_group_name=$group_replication_group_name --group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_start_on_boot=1 --super_read_only=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_write_protection.test b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_write_protection.test
index 8b65a8bcfc2c..fabdd4a52729 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_write_protection.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_start_replication_auto_write_protection.test
@@ -50,8 +50,9 @@ STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 --let $allow_rpl_inited=1
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_start_on_boot=1 --group-replication-group-name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # renable connection
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_startup_check_node_seed_skips_own_address.test b/rapid/plugin/group_replication/tests/mtr/t/gr_startup_check_node_seed_skips_own_address.test
new file mode 100644
index 000000000000..ee0197203cdb
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_startup_check_node_seed_skips_own_address.test
@@ -0,0 +1,117 @@
+###############################################################
+# The purpose of this test is to exercise all possible options
+# that avoid a node connecting to himself as seed, if a
+# misconfiguration accidentally happens, when using names.
+#
+#
+# The following combinations (as an example) must succeed:
+#
+# boot_node = off
+# local_address = name:12345 //name resolves to 127.0.0.1
+# peers = 127.0.0.1:12345,127.0.0.1:12346
+#
+# boot_node = off
+# local_address = 127.0.0.1:12345
+# peers = name:12345,127.0.0.1:12346 //name resolves to 127.0.0.1
+#
+#
+# For that one needs to:
+# - Skip start as a whole
+# - Start server 1
+# - Build scenario 1
+# - Start server 2
+# - Make sure it comes online
+# - Build and run scenario 2
+# - Cleanup
+#
+###############################################################
+
+--let $group_replication_group_name= 89ab83b0-9f17-11e3-a5e2-0800200c9a66
+
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+# Start server 1 by hand
+--connection server1
+--echo server1
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+# Go to server 2
+--connection server2
+--echo server2
+
+# Backup the original values
+--let $original_server_2_local_address= `SELECT @@GLOBAL.group_replication_local_address`
+--let $original_server_2_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
+
+--echo "1. Test local address with raw address and seeds with name"
+
+# Assemble the new values:
+# - local address with raw values
+# - local address first in seeds with name (which is default)
+--let $localhost_address= 127.0.0.1:
+--let $local_address_with_raw_address= $localhost_address$SERVER_GR_PORT_2
+
+# Set values
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$local_address_with_raw_address"
+--eval SET GLOBAL group_replication_group_seeds= "$original_server_2_local_address,$original_server_2_seeds"
+--enable_query_log
+
+# Start the server and wait for successful start
+--source include/start_group_replication.inc
+
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+# Stop the server
+--source include/stop_group_replication.inc
+
+--echo "2. Test local address with name address and seeds with raw address"
+
+# Assemble the new values:
+# - local address with name values
+# - local address first in seeds with raw value
+
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$original_server_2_local_address"
+--eval SET GLOBAL group_replication_group_seeds= "$local_address_with_raw_address,$original_server_2_seeds"
+--enable_query_log
+
+--source include/start_group_replication.inc
+
+# Start the server and wait for successful start
+
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+# Stop the server
+--source include/stop_group_replication.inc
+
+--echo "3. Test local address with name address and seeds with name address"
+
+# Assemble the new values:
+# - local address with name values
+# - local address first in seeds with name value
+
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$original_server_2_local_address"
+--eval SET GLOBAL group_replication_group_seeds= "$original_server_2_local_address,$original_server_2_seeds"
+--enable_query_log
+
+--source include/start_group_replication.inc
+
+# Start the server and wait for successful start
+
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+# Cleanup
+
+--disable_query_log
+--eval SET GLOBAL group_replication_local_address= "$original_server_2_local_address"
+--eval SET GLOBAL group_replication_group_seeds= "$original_server_2_seeds"
+--enable_query_log
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_stop_async_on_stop_gr.test b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_async_on_stop_gr.test
index 61ec6ea4d8d8..c8b2d380e7f8 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_stop_async_on_stop_gr.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_async_on_stop_gr.test
@@ -134,6 +134,7 @@ INSERT INTO t1 VALUES (1);
 --source include/rpl_connection.inc
 
 --let $rpl_channel_name=ch2_1
+--let $slave_io_errno= 1
 --source include/wait_for_slave_to_stop.inc
 --let $rpl_channel_name=
 
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_stop_during_pfs.test b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_during_pfs.test
new file mode 100644
index 000000000000..d2e1349131f1
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_during_pfs.test
@@ -0,0 +1,103 @@
+################################################################################
+# === Purpose ===
+#
+# This test verifies that parallel execution of STOP GROUP REPLICATION and
+# performance_schema queries are handled properly by the server.
+#
+# === Implementation ===
+#
+# 1. The test requires two servers: M1, M2
+# 2. Start 2 servers and add them to group replication group
+# 3. Send STOP GR command on M1 an halt the execution at a sync point using
+#    debug_sync utility.
+# 4. Send performance_schema query on M1 from a parallel client.
+# 5. Verify that concurrent queries are properly handled by server.
+# 6. Verify the consistency of the P_S queries post STOP GR.
+# 7. Cleanup
+################################################################################
+
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--source ../inc/group_replication.inc
+
+--echo #
+--echo # Set the necessary debug points required for the simulation.
+--echo #
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @debug_save= @@GLOBAL.DEBUG;
+SET @@GLOBAL.DEBUG='+d,group_replication_wait_on_stop';
+
+--echo #
+--echo # Send STOP GR command. The query shall wait before
+--echo # "leave_group_and_terminate_plugin_modules()" function until it is signaled.
+--echo #
+--send STOP GROUP_REPLICATION
+
+--echo #
+--echo # Wait for STOP GR to reach the debug sync point.
+--echo #
+--let $rpl_connection_name= server_1_1
+--source include/rpl_connection.inc
+SET DEBUG_SYNC= "now WAIT_FOR signal.stop_waiting";
+
+--echo #
+--echo # Send PS query from different session. The query shall halt in
+--echo # "get_group_member_stats()" function.
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG= '+d,group_replication_get_group_member_stats';
+--send SELECT * FROM performance_schema.replication_group_member_stats
+
+--echo #
+--echo # Block the PS query and allow STOP GR command to continue by
+--echo # signalling it.
+--echo #
+--let $rpl_connection_name= server_1_1
+--source include/rpl_connection.inc
+SET DEBUG_SYNC= "now WAIT_FOR signal.reached_get_group_member_stats";
+SET DEBUG_SYNC= "now SIGNAL signal.stop_continue";
+
+# Reap the STOP GR query.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--reap
+
+--echo #
+--echo # Allow the PS query to continue.
+--echo #
+SET DEBUG_SYNC= "now SIGNAL signal.resume_get_group_member_stats";
+
+# Reap the PS query.
+--disable_result_log
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--reap
+--enable_result_log
+
+--echo #
+--echo # Verify that MEMBER_STATE is OFFLINE on server_1.
+--echo #
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--let $assert_text= Verified that MEMBER_STATE is OFFLINE on server_1
+--let $assert_cond= "[SELECT MEMBER_STATE FROM performance_schema.replication_group_members, MEMBER_STATE, 1]" = "OFFLINE"
+--source include/assert.inc
+
+--echo #
+--echo # Verify that MEMBER_STATE is ONLINE on server_2.
+--echo #
+--let $rpl_connection_name= server_2
+--source include/rpl_connection.inc
+--let $assert_text= Verified that MEMBER_STATE is ONLINE on server_2
+--let $assert_cond= "[SELECT MEMBER_STATE FROM performance_schema.replication_group_members, MEMBER_STATE, 1]" = "ONLINE"
+--source include/assert.inc
+
+# Cleanup
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET GLOBAL DEBUG= @debug_save;
+SET DEBUG_SYNC= 'RESET';
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_stop_with_running_channel.test b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_with_running_channel.test
new file mode 100644
index 000000000000..2e550f98ecbf
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_stop_with_running_channel.test
@@ -0,0 +1,136 @@
+################################################################################
+# Validate Group Replication can be stopped even when replication channels are
+# committing transactions concurrently.
+#
+# Test:
+#   0. This test requires 2 servers:
+#        server1: group member
+#        server2: single server
+#   1. Deploy a group on server1.
+#   2. Configure a channel on server1 that replicates from
+#      server2.
+#   3. Stop group on server1, through debug sync block the stop
+#      after acquiring `shared_plugin_stop` lock.
+#   4. Commit a transaction on server2 which will be replicated
+#      to server1 through channel 'ch1'.
+#      Channel 'ch1' will fail since the plugin is stopping.
+#   5. Resume STOP GROUP_REPLICATION on server1.
+#   6. Clean up.
+###############################################################################
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--source ../inc/group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 1. Deploy a group on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin = 0;
+call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Worker 1 failed executing transaction.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': ... The slave coordinator and worker threads are stopped.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Error 'Error on observer while running replication hook 'before_commit'.'.*");
+call mtr.add_suppression("Slave SQL for channel 'ch1': Error in Xid_log_event: Commit could not be completed, 'Error on observer while running replication hook 'before_commit'.', Error_code: 3100");
+call mtr.add_suppression("Slave: Error on observer while running replication hook 'before_commit'. Error_code: 3100");
+SET SESSION sql_log_bin = 1;
+
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+
+--echo
+--echo ############################################################
+--echo # 2. Configure a channel on server1 that replicates from
+--echo #    server2.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--replace_result $SERVER_MYPORT_2 SERVER_2_PORT
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$SERVER_MYPORT_2, MASTER_AUTO_POSITION=1 FOR CHANNEL 'ch1'
+
+--let $rpl_channel_name=ch1
+--source include/start_slave.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY);
+--let $sync_slave_connection= server1
+--source include/sync_slave_sql_with_master.inc
+
+
+--echo
+--echo ############################################################
+--echo # 3. Stop group on server1, through debug sync block the stop
+--echo #    after acquiring `shared_plugin_stop` lock.
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG= '+d,group_replication_hold_stop_before_leave_the_group';
+--send STOP GROUP_REPLICATION
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET DEBUG_SYNC='now wait_for signal.stopping_before_leave_the_group';
+
+
+--echo
+--echo ############################################################
+--echo # 4. Commit a transaction on server2 which will be replicated
+--echo #    to server1 through channel 'ch1'.
+--echo #    Channel 'ch1' will fail since the plugin is stopping.
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+INSERT INTO t1 VALUES (1);
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $slave_sql_errno= convert_error(ER_RUN_HOOK_ERROR)
+--let $rpl_channel_name=ch1
+--source include/wait_for_slave_sql_error.inc
+
+
+--echo
+--echo ############################################################
+--echo # 5. Resume STOP GROUP_REPLICATION on server1.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @@GLOBAL.DEBUG= '-d,group_replication_hold_stop_before_leave_the_group';
+SET DEBUG_SYNC='now signal signal.resume_stop_before_leave_the_group';
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+--reap
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+--let $group_replication_member_state = OFFLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+SET DEBUG_SYNC= 'RESET';
+
+--let $assert_text= 'There are no rows on table t1 on server1'
+--let $assert_cond= [SELECT COUNT(*) AS count FROM t1, count, 1] = 0
+--source include/assert.inc
+
+
+--echo
+--echo ############################################################
+--echo # 6. Clean up.
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+SET @@GLOBAL.super_read_only = 0;
+DROP TABLE t1;
+
+--let $rpl_channel_name=ch1
+--let $rpl_multi_source= 1
+--let $rpl_reset_slave_all= 1
+--source include/rpl_reset_slave_helper.inc
+--let $rpl_channel_name=
+--let $rpl_multi_source=
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.cnf
index 89b727d1a68d..712d6a3e9021 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.cnf
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.cnf
@@ -4,10 +4,10 @@
 group_replication_transaction_size_limit=0
 
 [mysqld.2]
-group_replication_transaction_size_limit=1
+group_replication_transaction_size_limit=16
 
 [mysqld.3]
-group_replication_transaction_size_limit=1024
+group_replication_transaction_size_limit=1600
 
 [ENV]
 SERVER_MYPORT_3=                @mysqld.3.port
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.test b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.test
index 888ca0d019c2..df31f1b763ce 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit.test
@@ -58,7 +58,8 @@
 --source include/rpl_connection.inc
 set session sql_log_bin=0;
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
-call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 16. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1600. To increase the limit please adjust group_replication_transaction_size_limit option.");
 set session sql_log_bin=1;
 
 --echo
@@ -66,7 +67,7 @@ set session sql_log_bin=1;
 --source include/rpl_connection.inc
 set session sql_log_bin=0;
 call mtr.add_suppression("Run function 'before_commit' in plugin 'group_replication' failed");
-call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1024. To increase the limit please adjust group_replication_transaction_size_limit option.");
+call mtr.add_suppression("Error on session .*. Transaction of size .* exceeds specified limit 1600. To increase the limit please adjust group_replication_transaction_size_limit option.");
 set session sql_log_bin=1;
 
 # Make sure number of servers in the group is 3
@@ -342,7 +343,7 @@ DELETE FROM t1;
 --echo ## 3.4 Insert large sample data in table t1 on server 3,
 --echo ##     transaction should be rolledback
 
-## We will insert 100 records, so size of transaction will go beyond 1024 limit
+## We will insert 100 records, so size of transaction will go beyond 1600 limit
 ## of server 3
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
@@ -441,10 +442,17 @@ COMMIT;
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 
+# Make the transaction fail for total transaction size, not the write sets
+SET @group_replication_transaction_size_limit_save= @@GLOBAL.group_replication_transaction_size_limit;
+# 100 * 16 = 1600 bytes for writesets
+SET GLOBAL group_replication_transaction_size_limit= 1600;
+
 --error ER_RUN_HOOK_ERROR
 --eval DELETE FROM t1
 --source include/rpl_sync.inc
 
+SET GLOBAL group_replication_transaction_size_limit= @group_replication_transaction_size_limit_save;
+
 ## Confirm rows are not deleted
 ## Assert : Confirm table t1 has 100 rows on each server
 --echo
@@ -481,19 +489,26 @@ COMMIT;
 ## This test is important because in below transaction:
 ## Transaction Change size is 667
 ## Transaction Hash size is 1614
-## Limit of transaction size is 1024 for server 3
+## Limit of transaction size is 1600 for server 3
 ##
-## Since 667+1614 > 1024 transaction should be rolledback
+## Since 667+1614 > 1620 transaction should be rolledback
 ## If transaction succedds, wait_condition will fail because of different
 ## number of records before and after transaction indicating issues with code
 
 --let $rpl_connection_name= server3
 --source include/rpl_connection.inc
 
+# Make the transaction fail for total transaction size, not the write sets
+SET @group_replication_transaction_size_limit_save= @@GLOBAL.group_replication_transaction_size_limit;
+# 100 * 16 = 1600 bytes for writesets
+SET GLOBAL group_replication_transaction_size_limit= 1600;
+
 --error ER_RUN_HOOK_ERROR
 --eval DELETE FROM t1
 --source include/rpl_sync.inc
 
+SET GLOBAL group_replication_transaction_size_limit= @group_replication_transaction_size_limit_save;
+
 # Confirm rows are not deleted
 ## Assert : Confirm table t1 has 100 rows on each server
 --echo
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit_option.test b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit_option.test
index 9ddfec8aeb3e..9ffca4e955fd 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit_option.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_transaction_limit_option.test
@@ -12,7 +12,7 @@
 SET @group_replication_transaction_size_limit_save= @@GLOBAL.group_replication_transaction_size_limit;
 --let $group_replication_transaction_size_limit_max = 2147483647
 --let $group_replication_transaction_size_limit_min = 0
---let $group_replication_transaction_size_limit_default = 0
+--let $group_replication_transaction_size_limit_default = 150000000
 ################################################################################
 --echo
 --echo ## 1. Test group_replication_transaction_size_limit option.
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_network_blocked.test b/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_network_blocked.test
index 650fb4fa3b57..81094024e3bc 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_network_blocked.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_uninstall_while_network_blocked.test
@@ -40,8 +40,9 @@ CREATE TABLE t1 (a INT PRIMARY KEY);
 
 --echo
 --echo # 1. Kill and restart server 2
---let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name
---replace_result $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS2 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$member2_group_replication_local_address --group_replication_group_seeds=$group_replication_group_seeds --group_replication_group_name=$group_replication_group_name --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $member2_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS2 $group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $group_replication_group_name GROUP_REPLICATION_GROUP_NAME $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source ../inc/kill_and_restart_mysqld.inc
 
 --let $rpl_server_number= 2
@@ -96,6 +97,11 @@ UNINSTALL PLUGIN group_replication;
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 
+# terminate send calling reap
+--echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
+--error 2006,2013
+--reap
+
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --let $rpl_server_number= 1
 --source include/rpl_start_server.inc
@@ -103,11 +109,6 @@ UNINSTALL PLUGIN group_replication;
 --let $rpl_server_number= 1
 --source include/rpl_reconnect.inc
 
-# terminate send calling reap
---echo # CR_SERVER_LOST, CR_SERVER_GONE_ERROR
---error 2006,2013
---reap
-
 --let $rpl_connection_name= server2
 --source include/rpl_connection.inc
 DROP TABLE test.t1;
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_variables_default_values.test b/rapid/plugin/group_replication/tests/mtr/t/gr_variables_default_values.test
index d6c06b5e0c92..7dfb3a542f21 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_variables_default_values.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_variables_default_values.test
@@ -15,6 +15,7 @@
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
 --source ../inc/start_and_bootstrap_group_replication.inc
 
 # Try set DEFAULT values while Group Replication is running.
@@ -68,17 +69,18 @@ SET @@GLOBAL.group_replication_ip_whitelist= default;
 --let $saved_gr_transaction_size_limit = `SELECT @@GLOBAL.group_replication_transaction_size_limit;`
 --let $saved_gr_unreachable_majority_timeout = `SELECT @@GLOBAL.group_replication_unreachable_majority_timeout`
 --let $saved_gr_member_weight = `SELECT @@GLOBAL.group_replication_member_weight;`
+--let $saved_gr_exit_state_action = `SELECT @@GLOBAL.group_replication_exit_state_action;`
 
 --echo #
 --echo # Test Unit#1
 --echo # Set global group replication variables to default.
---echo # Curently there are 35 group replication variables.
+--echo # Curently there are 36 group replication variables.
 --echo #
 
 # Note: If a new GR variable is added or an old GR variable is removed, then
 # update this testcase for the sanity check.
---let $assert_text= There are 35 GR variables at present.
---let $assert_cond= "[SELECT COUNT(*) FROM performance_schema.global_variables WHERE VARIABLE_NAME LIKE \\'group_replication%\']" = 35
+--let $assert_text= There are 36 GR variables at present.
+--let $assert_cond= "[SELECT COUNT(*) FROM performance_schema.global_variables WHERE VARIABLE_NAME LIKE \\'group_replication%\']" = 36
 --source include/assert.inc
 
 --error ER_WRONG_VALUE_FOR_VAR
@@ -121,6 +123,7 @@ SET @@GLOBAL.group_replication_start_on_boot= default;
 SET @@GLOBAL.group_replication_transaction_size_limit= default;
 SET @@GLOBAL.group_replication_unreachable_majority_timeout= default;
 SET @@GLOBAL.group_replication_member_weight= default;
+SET @@GLOBAL.group_replication_exit_state_action= default;
 
 --echo #
 --echo # Test Unit#2
@@ -253,8 +256,8 @@ SET @@GLOBAL.group_replication_member_weight= default;
 --source include/assert.inc
 
 # group_replication_transaction_size_limit
---let $assert_text= Default group_replication_transaction_size_limit is 0
---let $assert_cond= "[SELECT @@GLOBAL.group_replication_transaction_size_limit]" = 0
+--let $assert_text= Default group_replication_transaction_size_limit is 150000000
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_transaction_size_limit]" = 150000000
 --source include/assert.inc
 
 # group_replication_unreachable_majority_timeout
@@ -267,6 +270,11 @@ SET @@GLOBAL.group_replication_member_weight= default;
 --let $assert_cond= "[SELECT @@GLOBAL.group_replication_member_weight]" = 50
 --source include/assert.inc
 
+#group_replication_exit_state_action
+--let $assert_text= Default group_replication_exit_state_action is READ_ONLY
+--let $assert_cond= "[SELECT @@GLOBAL.group_replication_exit_state_action]" = "READ_ONLY"
+--source include/assert.inc
+
 --echo #
 --echo # Clean up
 --echo #
@@ -306,6 +314,7 @@ SET @@GLOBAL.group_replication_member_weight= default;
 --eval SET @@GLOBAL.group_replication_transaction_size_limit= $saved_gr_transaction_size_limit
 --eval SET @@GLOBAL.group_replication_unreachable_majority_timeout= $saved_gr_unreachable_majority_timeout
 --eval SET @@GLOBAL.group_replication_member_weight= $saved_gr_member_weight
+--eval SET @@GLOBAL.group_replication_exit_state_action= $saved_gr_exit_state_action
 --enable_query_log
 
 --source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_variables_mysqladmin.test b/rapid/plugin/group_replication/tests/mtr/t/gr_variables_mysqladmin.test
index ccf2bfd75a49..e80845fe874e 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_variables_mysqladmin.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_variables_mysqladmin.test
@@ -9,8 +9,12 @@
 # 4. Cleanup
 ###############################################################################
 --source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
 --source ../inc/group_replication.inc
 
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
+--source ../inc/start_and_bootstrap_group_replication.inc
+
 #=============== Checking the group replication variable values ================
 --echo =====mysqladmin -u root -P MASTER_MYPORT --protocol=TCP check all the GR variable outputs=====
 --exec $MYSQLADMIN -u root -P $MASTER_MYPORT --protocol=TCP variables >$MYSQLTEST_VARDIR/tmp/group_replication_variables_mysqladmin.tmp
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.cnf b/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.cnf
new file mode 100644
index 000000000000..cae41a13face
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.cnf
@@ -0,0 +1,11 @@
+!include ../my.cnf
+
+[mysqld.1]
+
+[mysqld.2]
+
+[mysqld.3]
+
+[ENV]
+SERVER_MYPORT_3=                @mysqld.3.port
+SERVER_MYSOCK_3=                @mysqld.3.socket
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.test b/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.test
new file mode 100644
index 000000000000..4e40d573bacd
--- /dev/null
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_view_change_delayed_write_order.test
@@ -0,0 +1,178 @@
+################################################################################
+# This test validates that even when there is a timeout while logging a VCLE
+# in a group change, the event will be logged later with no repercussions to
+# the recovery process.
+#
+# References: Bug#28971594
+#
+# Steps:
+#  0. This test needs 3 servers, they are stopped and in Multi primary mode
+#  1. Create a user to ensure server 3 recovery comes from server 1
+#  2. Start group replication in server 1 and 2
+#  3. Block a local transaction on server 1
+#  4. Start server 3, it should be stuck in recovery
+#     Even after 15 seconds it should still be stuck
+#  5. Execute something on server 2, it should appear on server 3
+#  6. Unblock the local transaction on server 1
+#  7. Server 3 should now be online
+#  8. Check the logged event order in all servers
+#  9. Clean up
+#
+
+--source include/have_debug_sync.inc
+--source ../inc/have_group_replication_plugin.inc
+--let $rpl_skip_group_replication_start= 1
+--let $rpl_server_count= 3
+--source ../inc/group_replication.inc
+
+--echo #
+--echo # 1. Create a user to ensure server 3 recovery comes from server 1
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--let $recovery_user= recovery_user
+--let $recovery_password= recovery_password
+
+SET SESSION sql_log_bin= 0;
+--eval CREATE USER "$recovery_user" IDENTIFIED BY "$recovery_password"
+--eval GRANT REPLICATION SLAVE ON *.* TO "$recovery_user"
+FLUSH PRIVILEGES;
+SET SESSION sql_log_bin= 1;
+
+
+--echo #
+--echo # 2. Start group replication in server 1 and 2
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--source ../inc/start_and_bootstrap_group_replication.inc
+
+CREATE TABLE t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--source include/start_group_replication.inc
+
+--echo #
+--echo # 3. Block a local transaction on server 1
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.DEBUG='+d,group_replication_after_before_commit_hook';
+
+--send INSERT INTO t1 VALUES (1)
+
+--echo #
+--echo # 4. Start server 3, it should be stuck in recovery
+--echo #    Even after 15 seconds it should still be stuck
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--disable_warnings
+--eval CHANGE MASTER TO MASTER_USER= '$recovery_user', MASTER_PASSWORD= '$recovery_password' FOR CHANNEL 'group_replication_recovery'
+--enable_warnings
+
+--let $group_replication_start_member_state= RECOVERING
+--source include/start_group_replication.inc
+
+--sleep 15
+
+--let $group_replication_member_state= RECOVERING
+--source ../inc/gr_wait_for_member_state.inc
+
+--echo #
+--echo # 5. Execute something on server 2, it should appear on server 3
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+INSERT INTO t1 VALUES (2);
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $wait_condition= SELECT count(*) = 1 FROM information_schema.tables WHERE (table_schema = 'test') AND (table_name = 't1');
+--source include/wait_condition.inc
+
+--let $wait_condition= SELECT COUNT(*)=1 FROM test.t1;
+--source include/wait_condition.inc
+
+--echo #
+--echo # 6. Unblock the local transaction on server 1
+
+--let $rpl_connection_name= server_1
+--source include/rpl_connection.inc
+
+SET @@GLOBAL.DEBUG='-d,group_replication_after_before_commit_hook';
+SET DEBUG_SYNC= "now SIGNAL signal.commit_continue";
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+--reap
+
+--echo #
+--echo # 7. Server 3 should now be online
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+--let $group_replication_member_state= ONLINE
+--source ../inc/gr_wait_for_member_state.inc
+
+--echo #
+--echo # 8. Check the logged event order in all servers
+
+--let $vcle_seq= Gtid # Query/BEGIN # View_change # Query/COMMIT
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+
+# View change (s1) # Create table # View change (s2) # Insert (2) # Insert(1) # View change (s3)
+--let $event_sequence= $vcle_seq # !Gtid_transaction # $vcle_seq # !Gtid_transaction # !Gtid_transaction # $vcle_seq
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+# View change (s1) # Create table # View change (s2) # Insert (1) # View change (s3) # Insert(2)
+--let $event_sequence= $vcle_seq # !Gtid_transaction # $vcle_seq # !Gtid_transaction # $vcle_seq # !Gtid_transaction
+--source include/assert_binlog_events.inc
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+# View change (s1) # Create table # View change (s2) # Insert (2) # Insert(1) # View change (s3)
+--let $event_sequence= $vcle_seq # !Gtid_transaction # $vcle_seq # !Gtid_transaction # !Gtid_transaction # $vcle_seq
+--source include/assert_binlog_events.inc
+
+--echo #
+--echo # 9. Clean up.
+
+--let $rpl_connection_name= server1
+--source include/rpl_connection.inc
+DROP TABLE t1;
+
+SET SESSION sql_log_bin= 0;
+--eval DROP USER "$recovery_user"
+SET SESSION sql_log_bin= 1;
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("Timeout when waiting for the server to execute local transactions*");
+call mtr.add_suppression("Unable to log the group change View log event in its exaction position in the log.*");
+SET SESSION sql_log_bin= 1;
+
+--let $rpl_connection_name= server3
+--source include/rpl_connection.inc
+
+SET SESSION sql_log_bin= 0;
+call mtr.add_suppression("There was an error when connecting to the donor server.*");
+call mtr.add_suppression("For details please check performance_schema.replication_connection_status table and error log messages of Slave I/O for channel group_replication_recovery.");
+SET SESSION sql_log_bin= 1;
+
+--source ../inc/group_replication_end.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_write_set_extraction_algorithm.test b/rapid/plugin/group_replication/tests/mtr/t/gr_write_set_extraction_algorithm.test
index 765673a57960..914c6d4784ff 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_write_set_extraction_algorithm.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_write_set_extraction_algorithm.test
@@ -6,6 +6,7 @@
 # 2) Test that you cannot join a group if your algorithm is different.
 #
 
+--source include/only_binlog_transaction_dependency_tracking_commit_order.inc
 --source ../inc/have_group_replication_plugin.inc
 --let $rpl_skip_group_replication_start= 1
 --source ../inc/group_replication.inc
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_xplugin_global_variables.test b/rapid/plugin/group_replication/tests/mtr/t/gr_xplugin_global_variables.test
index 3dcf506e84ae..08998b68bb2a 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/gr_xplugin_global_variables.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/gr_xplugin_global_variables.test
@@ -32,6 +32,7 @@
 
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
+SET @@GLOBAL.group_replication_ip_whitelist= "AUTOMATIC";
 --source ../inc/start_and_bootstrap_group_replication.inc
 --replace_regex /\.dll/.so/
 --eval INSTALL PLUGIN mysqlx SONAME '$MYSQLXPLUGIN'
diff --git a/rapid/plugin/group_replication/tests/mtr/t/group_replication.test b/rapid/plugin/group_replication/tests/mtr/t/group_replication.test
index c435d65fa78a..f86657285ef6 100644
--- a/rapid/plugin/group_replication/tests/mtr/t/group_replication.test
+++ b/rapid/plugin/group_replication/tests/mtr/t/group_replication.test
@@ -48,8 +48,9 @@ SET GLOBAL group_replication_group_name= "8a94f357-aab4-11df-86ab-invalid";
 # Also it checks the shutdown hook that is provided as a part of WL#6821.
 --let $_group_replication_local_address= `SELECT @@GLOBAL.group_replication_local_address`
 --let $_group_replication_group_seeds= `SELECT @@GLOBAL.group_replication_group_seeds`
---let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1
---replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS
+--let $_group_replication_group_whitelist= `SELECT @@GLOBAL.group_replication_ip_whitelist`
+--let $restart_parameters=restart:--group_replication_local_address=$_group_replication_local_address --group_replication_group_seeds=$_group_replication_group_seeds --group_replication_bootstrap_group=1 --group_replication_ip_whitelist=$_group_replication_group_whitelist
+--replace_result $_group_replication_local_address GROUP_REPLICATION_LOCAL_ADDRESS $_group_replication_group_seeds GROUP_REPLICATION_GROUP_SEEDS $_group_replication_group_whitelist GROUP_REPLICATION_GROUP_WHITELIST
 --source include/restart_mysqld.inc
 
 # After the server restart the group name is again set to NULL which will
diff --git a/rapid/plugin/group_replication/xcom.h.cmake b/rapid/plugin/group_replication/xcom.h.cmake
index 3f4022480861..df91796b3bc4 100644
--- a/rapid/plugin/group_replication/xcom.h.cmake
+++ b/rapid/plugin/group_replication/xcom.h.cmake
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/keyring_udf/CMakeLists.txt b/rapid/plugin/keyring_udf/CMakeLists.txt
index 6adbaa9d6657..caa0bb214858 100644
--- a/rapid/plugin/keyring_udf/CMakeLists.txt
+++ b/rapid/plugin/keyring_udf/CMakeLists.txt
@@ -1,19 +1,26 @@
-## Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+## Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-INCLUDE_DIRECTORIES(${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 
 MYSQL_ADD_PLUGIN(keyring_udf
                  keyring_udf.cc
diff --git a/rapid/plugin/keyring_udf/keyring_udf.cc b/rapid/plugin/keyring_udf/keyring_udf.cc
index 0309d2927990..cf4184c67dda 100644
--- a/rapid/plugin/keyring_udf/keyring_udf.cc
+++ b/rapid/plugin/keyring_udf/keyring_udf.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -82,7 +89,7 @@ static my_bool get_current_user(std::string *current_user)
 
   if(user.length)
     current_user->append(user.str, user.length);
-  DBUG_ASSERT(host.length);
+  assert(host.length);
   current_user->append("@").append(host.str, host.length);
 
   return FALSE;
@@ -273,9 +280,9 @@ static my_bool fetch(const char* function_name, char *key_id, char **a_key,
     return TRUE;
   }
 
-  DBUG_ASSERT((key == NULL && key_len == 0) || (key != NULL &&
-            key_len <= MAX_KEYRING_UDF_KEY_TEXT_LENGTH && key_type != NULL &&
-            strlen(key_type) <= KEYRING_UDF_KEY_TYPE_LENGTH));
+  assert((key == NULL && key_len == 0) || (key != NULL &&
+                                           key_len <= MAX_KEYRING_UDF_KEY_TEXT_LENGTH && key_type != NULL &&
+                                           strlen(key_type) <= KEYRING_UDF_KEY_TYPE_LENGTH));
 
   if (a_key != NULL)
     *a_key= key;
diff --git a/rapid/plugin/x/CMakeLists.txt b/rapid/plugin/x/CMakeLists.txt
index f6d480aa56e2..fc1078ba990d 100644
--- a/rapid/plugin/x/CMakeLists.txt
+++ b/rapid/plugin/x/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -20,6 +27,9 @@ IF(SSL_DEFINES)
   ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
 
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+    mysqlxtest_src/mysql41_hash.cc)
+
 # Note that no COMPONENTS option is to be used for header only components,
 # it would try to find a library
 SET(Boost_USE_STATIC_LIBS OFF)
@@ -93,13 +103,12 @@ ELSE()
     ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
     ${CMAKE_CURRENT_BINARY_DIR}/generated
     ${SSL_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
   )
 
   INCLUDE_DIRECTORIES(SYSTEM
     ${BOOST_INCLUDE_DIR}
     ${PROTOBUF_INCLUDE_DIRS}
-    ${LIBEVENT_INCLUDE_DIR}
+    ${LIBEVENT_INCLUDE_DIRS}
   )
 
   IF(XPLUGIN_NO_LITE_PROTOBUF)
@@ -141,7 +150,7 @@ ELSE()
     src/xpl_plugin.cc
     src/xpl_performance_schema.cc
     ${xplugin_SRC} ${xplugin_HDRS} ${xplugin_PROTOBUF_SRC} ${BOOST_LIB_SOURCES}
-    LINK_LIBRARIES ${xplugin_PROTOBUF_LIB} ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES}
+    LINK_LIBRARIES ${xplugin_PROTOBUF_LIB} ${LIBEVENT_LIBRARIES}
     MODULE_ONLY MODULE_OUTPUT_NAME "mysqlx")
 
   IF(WITH_PROTOBUF STREQUAL "system")
@@ -150,7 +159,7 @@ ELSE()
 
   ADD_DEPENDENCIES(mysqlx GenError)
   IF (WITH_LIBEVENT STREQUAL "bundled")
-    ADD_DEPENDENCIES(mysqlx ${LIBEVENT_LIBRARY})
+    ADD_DEPENDENCIES(mysqlx ${LIBEVENT_LIBRARIES})
   ENDIF()
 
   IF(XPLUGIN_LOG_PROTOBUF)
@@ -214,13 +223,9 @@ ELSE()
       "NGS_DISABLE_LOGGING;USE_MYSQLX_FULL_PROTO")
   ENDIF()
 
-  TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
+  TARGET_LINK_LIBRARIES(mysqlxtest mysys strings ${FORCE_SSL_SOLARIS} mysqlclient)
   TARGET_LINK_LIBRARIES(mysqlxtest ${PROTOBUF_LIBRARY})
 
-  IF( WIN32 )
-    ADD_DEFINITIONS(-DMYSQLXTEST_EXPORTS)
-  ENDIF()
-
   IF(INSTALL_MYSQLTESTDIR)
     INSTALL(
       FILES tests/mtr/plugin.defs
diff --git a/rapid/plugin/x/mysqlx_configure.cmake b/rapid/plugin/x/mysqlx_configure.cmake
index a0d6e3589d6a..effb7430925c 100644
--- a/rapid/plugin/x/mysqlx_configure.cmake
+++ b/rapid/plugin/x/mysqlx_configure.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlx_protobuf.cmake b/rapid/plugin/x/mysqlx_protobuf.cmake
index 83005f3db27b..620638cdf011 100644
--- a/rapid/plugin/x/mysqlx_protobuf.cmake
+++ b/rapid/plugin/x/mysqlx_protobuf.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -17,6 +24,8 @@ IF(MSVC)
   SET(MYSQLX_PROTOBUF_MSVC_DISABLED_WARNINGS "/wd4267 /wd4244")
 ENDIF()
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 # Standard PROTOBUF_GENERATE_CPP modified to generate both
 # protobuf and protobuf-lite C++ files.
 FUNCTION(MYSQLX_PROTOBUF_GENERATE_CPP SRCS HDRS SRCS_LITE HDRS_LITE)
diff --git a/rapid/plugin/x/mysqlx_variables.cmake b/rapid/plugin/x/mysqlx_variables.cmake
index 0f4caa196aeb..115b5bdc0889 100644
--- a/rapid/plugin/x/mysqlx_variables.cmake
+++ b/rapid/plugin/x/mysqlx_variables.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/cmdline_options.h b/rapid/plugin/x/mysqlxtest_src/common/cmdline_options.h
index 7fcd20920a61..d085e83e2b6e 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/cmdline_options.h
+++ b/rapid/plugin/x/mysqlxtest_src/common/cmdline_options.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/compilerutils.h b/rapid/plugin/x/mysqlxtest_src/common/compilerutils.h
index 4de5e1521dc4..9b1d2fb945a3 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/compilerutils.h
+++ b/rapid/plugin/x/mysqlxtest_src/common/compilerutils.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc b/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc
index e07264d9fe73..c4eb8a2958a8 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc
+++ b/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.h b/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.h
index d155dbd8bc70..43963d73c69e 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.h
+++ b/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.cc b/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.cc
index ef582f45bc0a..0e5dd2a909f4 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.cc
+++ b/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.h b/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.h
index 330e1f0baff6..33067225a2f5 100644
--- a/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.h
+++ b/rapid/plugin/x/mysqlxtest_src/common/utils_string_parsing.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/dummy_stream.h b/rapid/plugin/x/mysqlxtest_src/dummy_stream.h
index f03b4b62fcd7..53a76d0750bb 100644
--- a/rapid/plugin/x/mysqlxtest_src/dummy_stream.h
+++ b/rapid/plugin/x/mysqlxtest_src/dummy_stream.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/message_formatter.cc b/rapid/plugin/x/mysqlxtest_src/message_formatter.cc
index 9f11e32758eb..514fc374533d 100644
--- a/rapid/plugin/x/mysqlxtest_src/message_formatter.cc
+++ b/rapid/plugin/x/mysqlxtest_src/message_formatter.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/message_formatter.h b/rapid/plugin/x/mysqlxtest_src/message_formatter.h
index 3e1eeb5c572c..6c53b0b8cc0b 100644
--- a/rapid/plugin/x/mysqlxtest_src/message_formatter.h
+++ b/rapid/plugin/x/mysqlxtest_src/message_formatter.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc b/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc
index 7559fdb1e1c5..390d7d94769f 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -21,47 +27,7 @@
 
 #include "mysql41_hash.h"
 
-#if defined(HAVE_YASSL)
-#include "sha.hpp"
-
-/**
-  Compute mysql41_hash message digest using YaSSL.
-
-  @param digest [out]  Computed mysql41_hash digest
-  @param buf    [in]   Message to be computed
-  @param len    [in]   Length of the message
-
-  @return              void
-*/
-void mysql_mysql41_hash_yassl(uint8 *digest, const char *buf, size_t len)
-{
-  TaoCrypt::SHA hasher;
-  hasher.Update((const TaoCrypt::byte *) buf, (TaoCrypt::word32)len);
-  hasher.Final ((TaoCrypt::byte *) digest);
-}
-
-/**
-  Compute mysql41_hash message digest for two messages in order to
-  emulate mysql41_hash(msg1, msg2) using YaSSL.
-
-  @param digest [out]  Computed mysql41_hash digest
-  @param buf1   [in]   First message
-  @param len1   [in]   Length of first message
-  @param buf2   [in]   Second message
-  @param len2   [in]   Length of second message
-
-  @return              void
-*/
-void mysql_mysql41_hash_multi_yassl(uint8 *digest, const char *buf1, int len1,
-                            const char *buf2, int len2)
-{
-  TaoCrypt::SHA hasher;
-  hasher.Update((const TaoCrypt::byte *) buf1, len1);
-  hasher.Update((const TaoCrypt::byte *) buf2, len2);
-  hasher.Final((TaoCrypt::byte *) digest);
-}
-
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/sha.h>
 
 int mysql_mysql41_hash_reset(SHA_CTX *context)
@@ -83,7 +49,7 @@ int mysql_mysql41_hash_result(SHA_CTX *context,
     return SHA1_Final(Message_Digest, context);
 }
 
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 
 /**
   Wrapper function to compute mysql41_hash message digest.
@@ -96,15 +62,13 @@ int mysql_mysql41_hash_result(SHA_CTX *context,
 */
 void compute_mysql41_hash(uint8 *digest, const char *buf, size_t len)
 {
-#if defined(HAVE_YASSL)
-  mysql_mysql41_hash_yassl(digest, buf, len);
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   SHA_CTX mysql41_hash_context;
 
   mysql_mysql41_hash_reset(&mysql41_hash_context);
   mysql_mysql41_hash_input(&mysql41_hash_context, (const uint8 *) buf, len);
   mysql_mysql41_hash_result(&mysql41_hash_context, digest);
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 }
 
 
@@ -123,15 +87,13 @@ void compute_mysql41_hash(uint8 *digest, const char *buf, size_t len)
 void compute_mysql41_hash_multi(uint8 *digest, const char *buf1, int len1,
                              const char *buf2, int len2)
 {
-#if defined(HAVE_YASSL)
-  mysql_mysql41_hash_multi_yassl(digest, buf1, len1, buf2, len2);
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   SHA_CTX mysql41_hash_context;
 
   mysql_mysql41_hash_reset(&mysql41_hash_context);
   mysql_mysql41_hash_input(&mysql41_hash_context, (const uint8 *) buf1, len1);
   mysql_mysql41_hash_input(&mysql41_hash_context, (const uint8 *) buf2, len2);
   mysql_mysql41_hash_result(&mysql41_hash_context, digest);
-#endif /* HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 }
 
diff --git a/rapid/plugin/x/mysqlxtest_src/mysql41_hash.h b/rapid/plugin/x/mysqlxtest_src/mysql41_hash.h
index cad1e3e4cc8d..bb9d5d064fdf 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysql41_hash.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysql41_hash.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx/mysql.h b/rapid/plugin/x/mysqlxtest_src/mysqlx/mysql.h
index 075a181e2ab8..138bf74e8bd2 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx/mysql.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx/mysql.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx/mysqlx_priv.h b/rapid/plugin/x/mysqlxtest_src/mysqlx/mysqlx_priv.h
index 899032c56473..a0373894f3b1 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx/mysqlx_priv.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx/mysqlx_priv.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_all_msgs.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_all_msgs.h
index 430650becba3..374a0eac0219 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_all_msgs.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_all_msgs.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.cc
index 81bd2709f850..47de00fa89e4 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.h
index ff62b3cd1632..21636c23e9d3 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_charset.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_common.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_common.h
deleted file mode 100644
index deb23f4cd492..000000000000
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_common.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301  USA
- */
-
-
-#ifndef _MYSQLXTEST_COMMON_H_
- #define _MYSQLXTEST_COMMON_H_
-
-
-#ifdef _WIN32
- # ifdef _DLL
- #  ifdef MYSQLXTEST_EXPORTS
- #   define MYSQLXTEST_PUBLIC __declspec(dllexport)
- #  else
- #   define MYSQLXTEST_PUBLIC __declspec(dllimport)
- #  endif
- # else
- #  define MYSQLXTEST_PUBLIC
- # endif
- #else
- # define MYSQLXTEST_PUBLIC
- #endif
-
-#ifdef NO_MYSQLXTEST
- # undef MYSQLXTEST_PUBLIC
- # define MYSQLXTEST_PUBLIC SHCORE_PUBLIC
- #endif
-
-#endif
-
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc
index 731ab27e4ada..fb3cc9c2335a 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.h
index 90fd9a821253..62ff7cd910e6 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_error.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_error.h
index 6123473428a7..6114d9ce262c 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_error.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_error.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc
index 53bed6a8a21d..20ff13c5951f 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -836,10 +842,12 @@ Message *XProtocol::recv_payload(const int mid, const std::size_t msglen)
 
     if (!ret_val->IsInitialized())
     {
-      delete[] mbuf;
-      delete ret_val;
       std::string err("Message is not properly initialized: ");
       err += ret_val->InitializationErrorString();
+
+      delete[] mbuf;
+      delete ret_val;
+
       throw Error(CR_MALFORMED_PACKET, err);
     }
   }
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.h
index 72ca452a6412..0afc5f29a32a 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -45,7 +51,6 @@
 
 #include "ngs_common/protocol_protobuf.h"
 #include "mysqlx_connection.h"
-#include "mysqlx_common.h"
 
 
 namespace mysqlx
@@ -223,7 +228,7 @@ namespace mysqlx
     IPv6,
   };
 
-  class MYSQLXTEST_PUBLIC XProtocol : public ngs::enable_shared_from_this<XProtocol>
+  class XProtocol : public ngs::enable_shared_from_this<XProtocol>
   {
   public:
     XProtocol(const Ssl_config &ssl_config, const std::size_t timeout, const bool dont_wait_for_disconnect = true, const Internet_protocol ip_mode = IPv4);
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.cc
index 0cc417d0eba2..b5877845e789 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.h
index c73983213ebd..15d6ff931172 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -30,7 +36,6 @@
 
 #include "ngs_common/xdatetime.h"
 #include "mysqlx_protocol.h"
-#include "mysqlx_common.h"
 
 
 namespace Mysqlx
@@ -61,7 +66,7 @@ namespace mysqlx
     DECIMAL
   };
 
-  struct MYSQLXTEST_PUBLIC ColumnMetadata
+  struct ColumnMetadata
   {
     FieldType type;
     std::string name;
@@ -83,7 +88,7 @@ namespace mysqlx
     uint32_t content_type;
   };
 
-  class MYSQLXTEST_PUBLIC Row
+  class Row
   {
   public:
     ~Row();
@@ -117,7 +122,7 @@ namespace mysqlx
     Mysqlx::Resultset::Row *m_data;
   };
 
-  class MYSQLXTEST_PUBLIC ResultData
+  class ResultData
   {
   public:
     ResultData(ngs::shared_ptr<std::vector<ColumnMetadata> > columns);
@@ -133,7 +138,7 @@ namespace mysqlx
     size_t m_row_index;
   };
 
-  class MYSQLXTEST_PUBLIC Result
+  class Result
   {
   public:
     ~Result();
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc
index 1ffc9e5e48c4..946169d5e83c 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_row.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_row.h
index be354e477711..28e1f67ddcd5 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_row.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_row.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_session.cc b/rapid/plugin/x/mysqlxtest_src/mysqlx_session.cc
index b3384e2fa884..6433c4d930e3 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_session.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_session.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlx_session.h b/rapid/plugin/x/mysqlxtest_src/mysqlx_session.h
index dcfda248aeb4..d441d06d8b46 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlx_session.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlx_session.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
index ed534db4ed07..9c5965bf8933 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -57,7 +63,6 @@
 const char * const CMD_ARG_BE_QUIET = "be-quiet";
 const char * const MYSQLXTEST_VERSION = "1.0";
 const char CMD_ARG_SEPARATOR = '\t';
-const unsigned short MYSQLX_PORT = 33060;
 
 #include <mysql/service_my_snprintf.h>
 #include <mysql.h>
@@ -506,7 +511,7 @@ class Connection_manager
   mysqlx::XProtocol* active()
   {
     if (!active_connection)
-      std::runtime_error("no active session");
+      throw std::runtime_error("no active session");
     return active_connection.get();
   }
 
@@ -2773,7 +2778,7 @@ class Snd_message_block_processor: public Block_processor
     {
       if (linebuf[0] == '}')
       {
-        int8_t msg_id;
+        int8_t msg_id = 0;
         std::string processed_buffer = m_buffer;
         replace_variables(processed_buffer);
 
@@ -2979,11 +2984,12 @@ class My_command_line_options : public Command_line_options
 
   void print_help()
   {
-    std::cout << "mysqlxtest <options>\n";
+    std::cout << "mysqlxtest <options> [SCHEMA]\n";
     std::cout << "Options:\n";
     std::cout << "-f, --file=<file>     Reads input from file\n";
     std::cout << "-I, --import=<dir>    Reads macro files from dir; required by -->import\n";
     std::cout << "--sql=<SQL>           Use SQL as input and execute it like in -->sql block\n";
+    std::cout << "-e=<SQL>, --execute=<SQL> Aliases for \"--sql\" option\n";
     std::cout << "-n, --no-auth         Skip authentication which is required by -->sql block (run mode)\n";
     std::cout << "--plain-auth          Use PLAIN text authentication mechanism\n";
     std::cout << "-u, --user=<user>     Connection user\n";
@@ -3186,6 +3192,10 @@ class My_command_line_options : public Command_line_options
       {
         sql = value;
       }
+      else if (check_arg_with_value(argv, i, "--execute", "-e", value))
+      {
+        sql = value;
+      }
       else if (check_arg_with_value(argv, i, "--password", "-p", value))
         connection.password = value;
       else if (check_arg_with_value(argv, i, "--ssl-key", NULL, value))
@@ -3265,6 +3275,12 @@ class My_command_line_options : public Command_line_options
       }
       else if (exit_code == 0)
       {
+        if (argc -1 == i && std::isalnum(argv[i][0]))
+        {
+          connection.schema = argv[i];
+          break;
+        }
+
         std::cerr << argv[0] << ": unknown option " << argv[i] << "\n";
         exit_code = 1;
         break;
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.cc b/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.cc
index 51816c18ebde..00145cbff49a 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.cc
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.h b/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.h
index 0c59d862234c..31646b66ac36 100644
--- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.h
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest_error_names.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/mysqlxtest_src/password_hasher.cc b/rapid/plugin/x/mysqlxtest_src/password_hasher.cc
index af31e0d1ff39..3b9aca3063fc 100644
--- a/rapid/plugin/x/mysqlxtest_src/password_hasher.cc
+++ b/rapid/plugin/x/mysqlxtest_src/password_hasher.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -18,13 +24,8 @@
  */
 
 
-#ifdef HAVE_YASSL
-#include <sha.hpp>
-#include <openssl/ssl.h>
-#else
 #include <openssl/sha.h>
 #include <openssl/rand.h>
-#endif
 
 #include <stdexcept>
 #include <cstring>
@@ -131,11 +132,7 @@ std::string Password_hasher::generate_user_salt()
   char *buffer = &result[0];
   char *end    = buffer + result.length() - 1;
 
-#ifdef HAVE_YASSL
-  yaSSL::RAND_bytes((unsigned char *) buffer, SCRAMBLE_LENGTH);
-#else
   RAND_bytes((unsigned char *) buffer, SCRAMBLE_LENGTH);
-#endif
 
   /* Sequence must be a legal UTF8 string */
   for (; buffer < end; buffer++)
@@ -154,7 +151,7 @@ bool Password_hasher::check_scramble_mysql41_hash(const char *scramble_arg, cons
   char buf[MYSQL41_HASH_SIZE];
   uint8_t hash_stage2_reassured[MYSQL41_HASH_SIZE];
 
-  DBUG_ASSERT(MYSQL41_HASH_SIZE == SCRAMBLE_LENGTH);
+  assert(MYSQL41_HASH_SIZE == SCRAMBLE_LENGTH);
   /* create key to encrypt scramble */
   compute_mysql41_hash_multi((uint8_t *)buf, message, SCRAMBLE_LENGTH, (const char *) hash_stage2, MYSQL41_HASH_SIZE);
 
@@ -185,7 +182,7 @@ std::string Password_hasher::scramble(const char *message, const char *password)
 
   result.at(SCRAMBLE_LENGTH - 1) = '\0';
 
-  DBUG_ASSERT(MYSQL41_HASH_SIZE == SCRAMBLE_LENGTH);
+  assert(MYSQL41_HASH_SIZE == SCRAMBLE_LENGTH);
 
   /* Two stage SHA1 hash of the pwd */
   compute_two_stage_mysql41_hash(password, strlen(password),
diff --git a/rapid/plugin/x/mysqlxtest_src/password_hasher.h b/rapid/plugin/x/mysqlxtest_src/password_hasher.h
index 476ff92f46c0..95a9e8598031 100644
--- a/rapid/plugin/x/mysqlxtest_src/password_hasher.h
+++ b/rapid/plugin/x/mysqlxtest_src/password_hasher.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/capabilities/configurator.h b/rapid/plugin/x/ngs/include/ngs/capabilities/configurator.h
index e35fc9ed9457..432acbd301af 100644
--- a/rapid/plugin/x/ngs/include/ngs/capabilities/configurator.h
+++ b/rapid/plugin/x/ngs/include/ngs/capabilities/configurator.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/capabilities/handler.h b/rapid/plugin/x/ngs/include/ngs/capabilities/handler.h
index 2e25cee2f968..5476a043b7a3 100644
--- a/rapid/plugin/x/ngs/include/ngs/capabilities/handler.h
+++ b/rapid/plugin/x/ngs/include/ngs/capabilities/handler.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_auth_mech.h b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_auth_mech.h
index a62463d463c5..b73255213d0b 100644
--- a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_auth_mech.h
+++ b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_auth_mech.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_readonly_value.h b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_readonly_value.h
index 60baf7f621e0..98a9313133bb 100644
--- a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_readonly_value.h
+++ b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_readonly_value.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_tls.h b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_tls.h
index 97125536daac..c444fcf57d94 100644
--- a/rapid/plugin/x/ngs/include/ngs/capabilities/handler_tls.h
+++ b/rapid/plugin/x/ngs/include/ngs/capabilities/handler_tls.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/client.h b/rapid/plugin/x/ngs/include/ngs/client.h
index 44a86b834bb7..40cc61e5b4fc 100644
--- a/rapid/plugin/x/ngs/include/ngs/client.h
+++ b/rapid/plugin/x/ngs/include/ngs/client.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/client_list.h b/rapid/plugin/x/ngs/include/ngs/client_list.h
index 56478778c16c..344118185322 100644
--- a/rapid/plugin/x/ngs/include/ngs/client_list.h
+++ b/rapid/plugin/x/ngs/include/ngs/client_list.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/client_session.h b/rapid/plugin/x/ngs/include/ngs/client_session.h
index dae453598df8..c9687d9fcda2 100644
--- a/rapid/plugin/x/ngs/include/ngs/client_session.h
+++ b/rapid/plugin/x/ngs/include/ngs/client_session.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -60,6 +66,8 @@ namespace ngs
 
     void stop_auth();
 
+    static bool can_forward_error_code_to_client(const int error_code);
+
   public:
     State state() const { return m_state; }
     State state_before_close() const { return m_state_before_close; }
diff --git a/rapid/plugin/x/ngs/include/ngs/error_code.h b/rapid/plugin/x/ngs/include/ngs/error_code.h
index d671256c7007..38ccf4a81606 100644
--- a/rapid/plugin/x/ngs/include/ngs/error_code.h
+++ b/rapid/plugin/x/ngs/include/ngs/error_code.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/client_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/client_interface.h
index f13b90ff81b4..668cdbe44751 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/client_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/client_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/connection_acceptor_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/connection_acceptor_interface.h
index 7dfd842001aa..f20640e25dc0 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/connection_acceptor_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/connection_acceptor_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/listener_factory_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/listener_factory_interface.h
index df6a6e157c72..2904a1d6bc3e 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/listener_factory_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/listener_factory_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/listener_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/listener_interface.h
index c2966e930583..c1603a8592af 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/listener_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/listener_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/server_delegate.h b/rapid/plugin/x/ngs/include/ngs/interface/server_delegate.h
index cfb4f90d8fb1..82ff0df9d36d 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/server_delegate.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/server_delegate.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/server_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/server_interface.h
index 61fb7d1144b8..70723b0a5833 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/server_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/server_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/server_task_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/server_task_interface.h
index bfcb1e6ed2f9..42e13df6ade6 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/server_task_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/server_task_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/interface/session_interface.h b/rapid/plugin/x/ngs/include/ngs/interface/session_interface.h
index 931099024de5..9ec1a19d24cb 100644
--- a/rapid/plugin/x/ngs/include/ngs/interface/session_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/interface/session_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/log.h b/rapid/plugin/x/ngs/include/ngs/log.h
index a99f4cecffd7..ce212769213b 100644
--- a/rapid/plugin/x/ngs/include/ngs/log.h
+++ b/rapid/plugin/x/ngs/include/ngs/log.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/memory.h b/rapid/plugin/x/ngs/include/ngs/memory.h
index b18ac5892cbe..894449c4086c 100644
--- a/rapid/plugin/x/ngs/include/ngs/memory.h
+++ b/rapid/plugin/x/ngs/include/ngs/memory.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/mysqlx/getter_any.h b/rapid/plugin/x/ngs/include/ngs/mysqlx/getter_any.h
index d3a2015600c8..5605a580e8ee 100644
--- a/rapid/plugin/x/ngs/include/ngs/mysqlx/getter_any.h
+++ b/rapid/plugin/x/ngs/include/ngs/mysqlx/getter_any.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/mysqlx/setter_any.h b/rapid/plugin/x/ngs/include/ngs/mysqlx/setter_any.h
index f956c8a9ea17..8d4159ec3f48 100644
--- a/rapid/plugin/x/ngs/include/ngs/mysqlx/setter_any.h
+++ b/rapid/plugin/x/ngs/include/ngs/mysqlx/setter_any.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/ngs_error.h b/rapid/plugin/x/ngs/include/ngs/ngs_error.h
index 8f8f8c525e36..65e236f13cbd 100644
--- a/rapid/plugin/x/ngs/include/ngs/ngs_error.h
+++ b/rapid/plugin/x/ngs/include/ngs/ngs_error.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/buffer.h b/rapid/plugin/x/ngs/include/ngs/protocol/buffer.h
index 797d1f5a25a6..c6b3674a6925 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/buffer.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/buffer.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/message.h b/rapid/plugin/x/ngs/include/ngs/protocol/message.h
index efbc9c847aee..ef62a47573ef 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/message.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/message.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/message_builder.h b/rapid/plugin/x/ngs/include/ngs/protocol/message_builder.h
index 63995a5a250f..0b250968af2c 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/message_builder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/message_builder.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/metadata_builder.h b/rapid/plugin/x/ngs/include/ngs/protocol/metadata_builder.h
index a380f35eca14..065ebde43064 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/metadata_builder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/metadata_builder.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/notice_builder.h b/rapid/plugin/x/ngs/include/ngs/protocol/notice_builder.h
index 8f33e0b1ae5e..28061aaf5d91 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/notice_builder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/notice_builder.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/output_buffer.h b/rapid/plugin/x/ngs/include/ngs/protocol/output_buffer.h
index 964ad0fc86ff..73bbf634f0d5 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/output_buffer.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/output_buffer.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/page_pool.h b/rapid/plugin/x/ngs/include/ngs/protocol/page_pool.h
index a064b79b9592..c957906e0747 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/page_pool.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/page_pool.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/protocol_config.h b/rapid/plugin/x/ngs/include/ngs/protocol/protocol_config.h
index ae29dceda0e0..eee52701521d 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/protocol_config.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/protocol_config.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol/row_builder.h b/rapid/plugin/x/ngs/include/ngs/protocol/row_builder.h
index a57c1150da5b..9f47b2f75328 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol/row_builder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol/row_builder.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol_authentication.h b/rapid/plugin/x/ngs/include/ngs/protocol_authentication.h
index ef1a43dc0d4b..cc2cb47e0633 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol_authentication.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol_authentication.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol_decoder.h b/rapid/plugin/x/ngs/include/ngs/protocol_decoder.h
index 94a68c898fea..4dfd4c494db8 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol_decoder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol_decoder.h
@@ -1,14 +1,20 @@
-// Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; version 2 of the
-// License.
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h b/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h
index ca1e82ca9d2b..43761930d6b7 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol_fwd.h b/rapid/plugin/x/ngs/include/ngs/protocol_fwd.h
index 33b7570f059e..7428f524d44a 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol_fwd.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol_fwd.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/protocol_monitor.h b/rapid/plugin/x/ngs/include/ngs/protocol_monitor.h
index 12e3e0d7e9e4..beb33bce8e44 100644
--- a/rapid/plugin/x/ngs/include/ngs/protocol_monitor.h
+++ b/rapid/plugin/x/ngs/include/ngs/protocol_monitor.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/scheduler.h b/rapid/plugin/x/ngs/include/ngs/scheduler.h
index 70ab325081cf..c5b7a928006b 100644
--- a/rapid/plugin/x/ngs/include/ngs/scheduler.h
+++ b/rapid/plugin/x/ngs/include/ngs/scheduler.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/server.h b/rapid/plugin/x/ngs/include/ngs/server.h
index d2c808ef6b82..b830daafda97 100644
--- a/rapid/plugin/x/ngs/include/ngs/server.h
+++ b/rapid/plugin/x/ngs/include/ngs/server.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/server_acceptors.h b/rapid/plugin/x/ngs/include/ngs/server_acceptors.h
index ab74377ae230..4535a0613848 100644
--- a/rapid/plugin/x/ngs/include/ngs/server_acceptors.h
+++ b/rapid/plugin/x/ngs/include/ngs/server_acceptors.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/server_client_timeout.h b/rapid/plugin/x/ngs/include/ngs/server_client_timeout.h
index 5a3efe27db05..c778302dc1a6 100644
--- a/rapid/plugin/x/ngs/include/ngs/server_client_timeout.h
+++ b/rapid/plugin/x/ngs/include/ngs/server_client_timeout.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/socket_events.h b/rapid/plugin/x/ngs/include/ngs/socket_events.h
index d3c316dfd495..2de296b31545 100644
--- a/rapid/plugin/x/ngs/include/ngs/socket_events.h
+++ b/rapid/plugin/x/ngs/include/ngs/socket_events.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -29,6 +35,12 @@ namespace ngs {
 
 class Socket_events: public Socket_events_interface {
 public:
+#ifdef _WIN32
+  // mimick evutil_socket_t in libevent-2.x
+  typedef intptr_t socket_type;
+#else
+  typedef int socket_type;
+#endif
   Socket_events();
   ~Socket_events();
 
@@ -39,8 +51,8 @@ class Socket_events: public Socket_events_interface {
   void break_loop();
 
 private:
-  static void timeout_call(int sock, short which, void *arg);
-  static void socket_data_avaiable(int sock, short which, void *arg);
+  static void timeout_call(socket_type sock, short which, void *arg);
+  static void socket_data_avaiable(socket_type sock, short which, void *arg);
 
   struct Timer_data;
   struct Socket_data;
diff --git a/rapid/plugin/x/ngs/include/ngs/socket_events_interface.h b/rapid/plugin/x/ngs/include/ngs/socket_events_interface.h
index b29e4df82a97..40f9236cbb6d 100644
--- a/rapid/plugin/x/ngs/include/ngs/socket_events_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs/socket_events_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs/thread.h b/rapid/plugin/x/ngs/include/ngs/thread.h
index e554c7de50b8..7000de21a7a9 100644
--- a/rapid/plugin/x/ngs/include/ngs/thread.h
+++ b/rapid/plugin/x/ngs/include/ngs/thread.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/atomic.h b/rapid/plugin/x/ngs/include/ngs_common/atomic.h
index b191880ee592..e085343acc6e 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/atomic.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/atomic.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/bind.h b/rapid/plugin/x/ngs/include/ngs_common/bind.h
index 737277b5e34c..2e1b3bd1c353 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/bind.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/bind.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/chrono.h b/rapid/plugin/x/ngs/include/ngs_common/chrono.h
index a604c8badcec..af5ef9dde41c 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/chrono.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/chrono.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/connection_type.h b/rapid/plugin/x/ngs/include/ngs_common/connection_type.h
index e46df949a90f..084e94b67506 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/connection_type.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/connection_type.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/connection_vio.h b/rapid/plugin/x/ngs/include/ngs_common/connection_vio.h
index d0df13a41e1a..3668e5f1779d 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/connection_vio.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/connection_vio.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/file_interface.h b/rapid/plugin/x/ngs/include/ngs_common/file_interface.h
index 04e54db9d84b..a13227af231b 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/file_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/file_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/operations_factory.h b/rapid/plugin/x/ngs/include/ngs_common/operations_factory.h
index c3f37c26139c..380e26b756f4 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/operations_factory.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/operations_factory.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/operations_factory_interface.h b/rapid/plugin/x/ngs/include/ngs_common/operations_factory_interface.h
index 1695d45a005c..09534bd99552 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/operations_factory_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/operations_factory_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/options.h b/rapid/plugin/x/ngs/include/ngs_common/options.h
index 1e64410a5eed..f47e9f87b7d5 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/options.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/options.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/options_ssl.h b/rapid/plugin/x/ngs/include/ngs_common/options_ssl.h
index 34e409818065..982c0d28e6be 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/options_ssl.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/options_ssl.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/protocol_const.h b/rapid/plugin/x/ngs/include/ngs_common/protocol_const.h
index 064624aacd72..12c0668f0ace 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/protocol_const.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/protocol_const.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
index eba3b8ec2670..5e28f159313b 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/smart_ptr.h b/rapid/plugin/x/ngs/include/ngs_common/smart_ptr.h
index 564c376d0828..58304349e82c 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/smart_ptr.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/smart_ptr.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/socket_interface.h b/rapid/plugin/x/ngs/include/ngs_common/socket_interface.h
index 99d5193190a3..90e090656a28 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/socket_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/socket_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/string_formatter.h b/rapid/plugin/x/ngs/include/ngs_common/string_formatter.h
index 9c1755ba49ad..0248dfe31315 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/string_formatter.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/string_formatter.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/system_interface.h b/rapid/plugin/x/ngs/include/ngs_common/system_interface.h
index 3e92c13a90f9..682398bb0356 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/system_interface.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/system_interface.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/to_string.h b/rapid/plugin/x/ngs/include/ngs_common/to_string.h
index e17fc1ab3e47..ad1f30c95250 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/to_string.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/to_string.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/types.h b/rapid/plugin/x/ngs/include/ngs_common/types.h
index 233ffc473d29..f9cb207902b1 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/types.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/types.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/xdatetime.h b/rapid/plugin/x/ngs/include/ngs_common/xdatetime.h
index 81bd2c40baca..98d3768fe17c 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/xdatetime.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/xdatetime.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/include/ngs_common/xdecimal.h b/rapid/plugin/x/ngs/include/ngs_common/xdecimal.h
index 4e7bca78e59e..d5f52913f79f 100644
--- a/rapid/plugin/x/ngs/include/ngs_common/xdecimal.h
+++ b/rapid/plugin/x/ngs/include/ngs_common/xdecimal.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/ngs_common/connection_type.cc b/rapid/plugin/x/ngs/ngs_common/connection_type.cc
index 49e41fcbdf6e..991f5821fe3a 100644
--- a/rapid/plugin/x/ngs/ngs_common/connection_type.cc
+++ b/rapid/plugin/x/ngs/ngs_common/connection_type.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/ngs_common/connection_vio.cc b/rapid/plugin/x/ngs/ngs_common/connection_vio.cc
index c559b70c3be3..cf21dad58001 100644
--- a/rapid/plugin/x/ngs/ngs_common/connection_vio.cc
+++ b/rapid/plugin/x/ngs/ngs_common/connection_vio.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -78,7 +84,7 @@ ssize_t Connection_vio::write(const char *buffer, const std::size_t buffer_size)
 
   // vio_shutdown sets the vio->fd to INVALID_SOCKET thus it is not
   // possible to use following assert without major changes in vio
-  // DBUG_ASSERT(INVALID_SOCKET != vio_fd(m_vio));
+  // assert(INVALID_SOCKET != vio_fd(m_vio));
 
   do
   {
@@ -132,7 +138,7 @@ ssize_t Connection_vio::read(char *buffer, const std::size_t buffer_size)
 
   // vio_shutdown sets the vio->fd to INVALID_SOCKET thus it is not
   // possible to use following assert without major changes in vio
-  // DBUG_ASSERT(INVALID_SOCKET != vio_fd(m_vio));
+  // assert(INVALID_SOCKET != vio_fd(m_vio));
 
   do
   {
diff --git a/rapid/plugin/x/ngs/ngs_common/operations_factory.cc b/rapid/plugin/x/ngs/ngs_common/operations_factory.cc
index 0d65c99067c0..d02e331947db 100644
--- a/rapid/plugin/x/ngs/ngs_common/operations_factory.cc
+++ b/rapid/plugin/x/ngs/ngs_common/operations_factory.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/ngs_common/options_ssl.cc b/rapid/plugin/x/ngs/ngs_common/options_ssl.cc
index 236d4933ee1f..321b4b3997a0 100644
--- a/rapid/plugin/x/ngs/ngs_common/options_ssl.cc
+++ b/rapid/plugin/x/ngs/ngs_common/options_ssl.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/capabilities/configurator.cc b/rapid/plugin/x/ngs/src/capabilities/configurator.cc
index 54c19d71dd9d..3c68cd0557ca 100644
--- a/rapid/plugin/x/ngs/src/capabilities/configurator.cc
+++ b/rapid/plugin/x/ngs/src/capabilities/configurator.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/capabilities/handler_auth_mech.cc b/rapid/plugin/x/ngs/src/capabilities/handler_auth_mech.cc
index 0fb4ef473bdb..9212ee60a3ae 100644
--- a/rapid/plugin/x/ngs/src/capabilities/handler_auth_mech.cc
+++ b/rapid/plugin/x/ngs/src/capabilities/handler_auth_mech.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/capabilities/handler_tls.cc b/rapid/plugin/x/ngs/src/capabilities/handler_tls.cc
index 2373a7903a98..49a53b142bc1 100644
--- a/rapid/plugin/x/ngs/src/capabilities/handler_tls.cc
+++ b/rapid/plugin/x/ngs/src/capabilities/handler_tls.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/client.cc b/rapid/plugin/x/ngs/src/client.cc
index 1209a83b1ddc..5663dc1ed825 100644
--- a/rapid/plugin/x/ngs/src/client.cc
+++ b/rapid/plugin/x/ngs/src/client.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -18,15 +24,15 @@
  */
 
 #include "ngs/client.h"
-#include "ngs/scheduler.h"
-#include "ngs/interface/server_interface.h"
-#include "ngs/interface/session_interface.h"
-#include "ngs/capabilities/handler_tls.h"
 #include "ngs/capabilities/handler_auth_mech.h"
 #include "ngs/capabilities/handler_readonly_value.h"
+#include "ngs/capabilities/handler_tls.h"
+#include "ngs/interface/server_interface.h"
+#include "ngs/interface/session_interface.h"
+#include "ngs/ngs_error.h"
 #include "ngs/protocol/protocol_config.h"
 #include "ngs/protocol_monitor.h"
-#include "ngs/ngs_error.h"
+#include "ngs/scheduler.h"
 #include "ngs_common/operations_factory.h"
 
 #include <string.h>
@@ -38,126 +44,106 @@
 
 #include "ngs/log.h"
 
-#undef ERROR // Needed to avoid conflict with ERROR in mysqlx.pb.h
+#undef ERROR  // Needed to avoid conflict with ERROR in mysqlx.pb.h
 #include "ngs_common/protocol_protobuf.h"
 
-
 using namespace ngs;
 
-Client::Client(Connection_ptr connection,
-               Server_interface &server,
-               Client_id client_id,
-               Protocol_monitor_interface &pmon)
-: m_client_id(client_id),
-  m_server(server),
-  m_connection(connection),
-  m_client_addr("n/c"),
-  m_client_port(0),
-  m_state(Client_invalid),
-  m_removed(false),
-  m_protocol_monitor(pmon),
-  m_close_reason(Not_closing),
-  m_msg_buffer(NULL),
-  m_msg_buffer_size(0)
-{
+Client::Client(Connection_ptr connection, Server_interface &server,
+               Client_id client_id, Protocol_monitor_interface &pmon)
+    : m_client_id(client_id),
+      m_server(server),
+      m_connection(connection),
+      m_client_addr("n/c"),
+      m_client_port(0),
+      m_state(Client_invalid),
+      m_removed(false),
+      m_protocol_monitor(pmon),
+      m_close_reason(Not_closing),
+      m_msg_buffer(NULL),
+      m_msg_buffer_size(0) {
   my_snprintf(m_id, sizeof(m_id), "%llu", static_cast<ulonglong>(client_id));
 }
 
-
-Client::~Client()
-{
+Client::~Client() {
   log_debug("%s: Delete client", m_id);
-  if (m_connection)
-    m_connection->close();
+  if (m_connection) m_connection->close();
 
-  if (m_msg_buffer)
-    ngs::free_array(m_msg_buffer);
+  if (m_msg_buffer) ngs::free_array(m_msg_buffer);
 }
 
-
-ngs::chrono::time_point Client::get_accept_time() const
-{
+ngs::chrono::time_point Client::get_accept_time() const {
   return m_accept_time;
 }
 
-void Client::reset_accept_time()
-{
+void Client::reset_accept_time() {
   m_accept_time = chrono::now();
   m_server.restart_client_supervision_timer();
 }
 
-
-void Client::activate_tls()
-{
+void Client::activate_tls() {
   log_debug("%s: enabling TLS for client", client_id());
 
-  if (m_server.ssl_context()->activate_tls(connection(), chrono::to_seconds(m_server.get_config()->connect_timeout)))
-  {
-    if (connection().options()->active_tls())
-      session()->mark_as_tls_session();
-  }
-  else
-  {
+  if (m_server.ssl_context()->activate_tls(
+          connection(),
+          chrono::to_seconds(m_server.get_config()->connect_timeout))) {
+    if (connection().options()->active_tls()) session()->mark_as_tls_session();
+  } else {
     log_warning("%s: Error during SSL handshake", client_id());
     disconnect_and_trigger_close();
   }
 }
 
-
-void Client::on_auth_timeout()
-{
+void Client::on_auth_timeout() {
   m_close_reason = Close_connect_timeout;
 
-  //XXX send an ERROR notice when it's available
+  // XXX send an ERROR notice when it's available
   disconnect_and_trigger_close();
 }
 
-
-Capabilities_configurator *Client::capabilities_configurator()
-{
+Capabilities_configurator *Client::capabilities_configurator() {
   std::vector<Capability_handler_ptr> handlers;
 
   handlers.push_back(ngs::allocate_shared<Capability_tls>(ngs::ref(*this)));
-  handlers.push_back(ngs::allocate_shared<Capability_auth_mech>(ngs::ref(*this)));
+  handlers.push_back(
+      ngs::allocate_shared<Capability_auth_mech>(ngs::ref(*this)));
 
-  handlers.push_back(ngs::allocate_shared<Capability_readonly_value>("doc.formats", "text"));
+  handlers.push_back(
+      ngs::allocate_shared<Capability_readonly_value>("doc.formats", "text"));
 
   return ngs::allocate_object<Capabilities_configurator>(handlers);
 }
 
-
-void Client::get_capabilities(const Mysqlx::Connection::CapabilitiesGet &msg)
-{
-  ngs::Memory_instrumented<Capabilities_configurator>::Unique_ptr configurator(capabilities_configurator());
-  ngs::Memory_instrumented<Mysqlx::Connection::Capabilities>::Unique_ptr caps(configurator->get());
+void Client::get_capabilities(const Mysqlx::Connection::CapabilitiesGet &msg) {
+  ngs::Memory_instrumented<Capabilities_configurator>::Unique_ptr configurator(
+      capabilities_configurator());
+  ngs::Memory_instrumented<Mysqlx::Connection::Capabilities>::Unique_ptr caps(
+      configurator->get());
 
   m_encoder->send_message(Mysqlx::ServerMessages::CONN_CAPABILITIES, *caps);
 }
 
-
-void Client::set_capabilities(const Mysqlx::Connection::CapabilitiesSet &setcap)
-{
-  ngs::Memory_instrumented<Capabilities_configurator>::Unique_ptr configurator(capabilities_configurator());
+void Client::set_capabilities(
+    const Mysqlx::Connection::CapabilitiesSet &setcap) {
+  ngs::Memory_instrumented<Capabilities_configurator>::Unique_ptr configurator(
+      capabilities_configurator());
   Error_code error_code = configurator->prepare_set(setcap.capabilities());
   m_encoder->send_result(error_code);
-  if (!error_code)
-  {
+  if (!error_code) {
     configurator->commit();
   }
 }
 
-
-void Client::handle_message(Request &request)
-{
+void Client::handle_message(Request &request) {
   log_message_recv(request);
 
   Client_state expected_state = Client_accepted;
 
-  // there is no session before authentication, so we handle the messages ourselves
+  // there is no session before authentication, so we handle the messages
+  // ourselves
   log_debug("%s: Client got message %i", client_id(), request.get_type());
 
-  switch (request.get_type())
-  {
+  switch (request.get_type()) {
     case Mysqlx::ClientMessages::CON_CLOSE:
       m_encoder->send_ok("bye!");
       m_close_reason = Close_normal;
@@ -165,28 +151,31 @@ void Client::handle_message(Request &request)
       break;
 
     case Mysqlx::ClientMessages::SESS_RESET:
-      // no-op, since we're only going to get called here before session is authenticated
+      // no-op, since we're only going to get called here before session is
+      // authenticated
       break;
 
     case Mysqlx::ClientMessages::CON_CAPABILITIES_GET:
-      get_capabilities(static_cast<const Mysqlx::Connection::CapabilitiesGet&>(*request.message()));
+      get_capabilities(static_cast<const Mysqlx::Connection::CapabilitiesGet &>(
+          *request.message()));
       break;
 
     case Mysqlx::ClientMessages::CON_CAPABILITIES_SET:
-      set_capabilities(static_cast<const Mysqlx::Connection::CapabilitiesSet&>(*request.message()));
+      set_capabilities(static_cast<const Mysqlx::Connection::CapabilitiesSet &>(
+          *request.message()));
       break;
 
     case Mysqlx::ClientMessages::SESS_AUTHENTICATE_START:
-      if (m_state.compare_exchange_strong(expected_state, Client_authenticating_first) &&
-          server().is_running())
-      {
+      if (m_state.compare_exchange_strong(expected_state,
+                                          Client_authenticating_first) &&
+          server().is_running()) {
         log_debug("%s: Authenticating client...", client_id());
 
         ngs::shared_ptr<Session_interface> s(session());
         // start redirecting incoming messages directly to the session
-        if (s)
-        {
-          // forward the message to the pre-allocated session, rest of auth will be handled by the session
+        if (s) {
+          // forward the message to the pre-allocated session, rest of auth will
+          // be handled by the session
           s->handle_message(request);
         }
         break;
@@ -196,7 +185,8 @@ void Client::handle_message(Request &request)
     default:
       // invalid message at this time
       m_protocol_monitor.on_error_unknown_msg_type();
-      log_info("%s: Invalid message %i received during client initialization", client_id(), request.get_type());
+      log_info("%s: Invalid message %i received during client initialization",
+               client_id(), request.get_type());
       m_encoder->send_result(ngs::Fatal(ER_X_BAD_MESSAGE, "Invalid message"));
       m_close_reason = Close_error;
       disconnect_and_trigger_close();
@@ -204,86 +194,67 @@ void Client::handle_message(Request &request)
   }
 }
 
-
-void Client::disconnect_and_trigger_close()
-{
-  if (m_close_reason == Not_closing)
-    m_close_reason = Close_normal;
+void Client::disconnect_and_trigger_close() {
+  if (m_close_reason == Not_closing) m_close_reason = Close_normal;
 
   shutdown_connection();
 }
 
-
 // this will be called on socket errors, but also when halt_and_wait() is called
 // which will shutdown the socket for reading and trigger a eof
 // (meaning, closed for reads, but writes would still be ok)
-void Client::on_network_error(int error)
-{
+void Client::on_network_error(int error) {
   if (error == 0)
     log_debug("%s: peer disconnected (state %i)", client_id(), m_state.load());
   else
-    log_debug("%s: network error %i (state %i)", client_id(), error, m_state.load());
+    log_debug("%s: network error %i (state %i)", client_id(), error,
+              m_state.load());
   if (m_close_reason == Not_closing && m_state != Client_closing && error != 0)
     m_close_reason = Close_net_error;
 
   m_state.exchange(Client_closing);
 
-  if (m_session && (Client_authenticating_first == m_state || Client_running == m_state))
-  {
+  if (m_session &&
+      (Client_authenticating_first == m_state || Client_running == m_state)) {
     // trigger all sessions to close and stop whatever they're doing
     log_debug("%s: killing session", client_id());
     if (Session_interface::Closing != m_session->state())
-      server().get_worker_scheduler()->post_and_wait(ngs::bind(&Client::on_kill, this, ngs::ref(*m_session)));
+      server().get_worker_scheduler()->post_and_wait(
+          ngs::bind(&Client::on_kill, this, ngs::ref(*m_session)));
   }
 }
 
+void Client::on_kill(Session_interface &session) { m_session->on_kill(); }
 
-void Client::on_kill(Session_interface &session)
-{
-  m_session->on_kill();
-}
-
-
-void Client::remove_client_from_server()
-{
-  if (false == m_removed.exchange(true))
-    m_server.on_client_closed(*this);
+void Client::remove_client_from_server() {
+  if (false == m_removed.exchange(true)) m_server.on_client_closed(*this);
 }
 
-
-void Client::on_client_addr(const bool skip_resolve)
-{
+void Client::on_client_addr(const bool skip_resolve) {
   m_client_addr.resize(INET6_ADDRSTRLEN);
 
-  switch(m_connection->connection_type())
-  {
-  case Connection_tcpip:
-  {
-    m_connection->peer_address(m_client_addr, m_client_port);
-  }
-  break;
+  switch (m_connection->connection_type()) {
+    case Connection_tcpip: {
+      m_connection->peer_address(m_client_addr, m_client_port);
+    } break;
 
-  case Connection_namedpipe:
-  case Connection_unixsocket: // fall through
-    m_client_host = "localhost";
-    return;
+    case Connection_namedpipe:
+    case Connection_unixsocket:  // fall through
+      m_client_host = "localhost";
+      return;
 
-  default:
-    return;
+    default:
+      return;
   }
 
   // turn IP to hostname for auth uses
-  if (skip_resolve)
-    return;
+  if (skip_resolve) return;
 
   m_client_host = "";
 
-  try
-  {
+  try {
     m_client_host = resolve_hostname();
-  }
-  catch(...)
-  {
+  } catch (...) {
     m_close_reason = Close_reject;
     disconnect_and_trigger_close();
 
@@ -291,59 +262,57 @@ void Client::on_client_addr(const bool skip_resolve)
   }
 }
 
-void Client::on_accept()
-{
-  log_debug("%s: Accepted client connection from %s", client_id(), client_address());
+void Client::on_accept() {
+  log_debug("%s: Accepted client connection from %s", client_id(),
+            client_address());
 
   m_connection->set_socket_thread_owner();
 
   // it can be accessed directly (no other thread access thus object)
   m_state = Client_accepted;
 
-  m_encoder.reset(ngs::allocate_object<Protocol_encoder>(m_connection, ngs::bind(&Client::on_network_error, this, ngs::placeholders::_1), ngs::ref(m_protocol_monitor)));
+  m_encoder.reset(ngs::allocate_object<Protocol_encoder>(
+      m_connection,
+      ngs::bind(&Client::on_network_error, this, ngs::placeholders::_1),
+      ngs::ref(m_protocol_monitor)));
 
   // pre-allocate the initial session
-  // this is also needed for the srv_session to correctly report us to the audit.log as in the Pre-authenticate state
-  ngs::shared_ptr<Session_interface> session(m_server.create_session(*this, *m_encoder, 1));
-  if (!session)
-  {
-    log_warning("%s: Error creating session for connection from %s", client_id(), m_client_addr.c_str());
-    m_encoder->send_init_error(ngs::Fatal(ER_OUT_OF_RESOURCES, "Could not allocate session"));
-  }
-  else
-  {
+  // this is also needed for the srv_session to correctly report us to the
+  // audit.log as in the Pre-authenticate state
+  ngs::shared_ptr<Session_interface> session(
+      m_server.create_session(*this, *m_encoder, 1));
+  if (!session) {
+    log_warning("%s: Error creating session for connection from %s",
+                client_id(), m_client_addr.c_str());
+    m_encoder->send_init_error(
+        ngs::Fatal(ER_OUT_OF_RESOURCES, "Could not allocate session"));
+  } else {
     ngs::Error_code error(session->init());
-    if (error)
-    {
-      log_warning("%s: Error initializing session for connection: %s", client_id(), error.message.c_str());
+    if (error) {
+      log_warning("%s: Error initializing session for connection: %s",
+                  client_id(), error.message.c_str());
       m_encoder->send_result(error);
       session.reset();
-    }
-    else
+    } else
       m_session = session;
   }
-  if (!session)
-  {
+  if (!session) {
     m_close_reason = Close_error;
     disconnect_and_trigger_close();
   }
 }
 
-void Client::on_session_auth_success(Session_interface &s)
-{
+void Client::on_session_auth_success(Session_interface &s) {
   // this is called from worker thread
   Client_state expected = Client_authenticating_first;
   m_state.compare_exchange_strong(expected, Client_running);
 }
 
-
-void Client::on_session_close(Session_interface &s)
-{
+void Client::on_session_close(Session_interface &s) {
   log_debug("%s: Session %i removed", client_id(), s.session_id());
 
   // no more open sessions, disconnect
-  if (m_close_reason == Not_closing)
-    m_close_reason = Close_normal;
+  if (m_close_reason == Not_closing) m_close_reason = Close_normal;
 
   m_state = Client_closing;
 
@@ -352,77 +321,68 @@ void Client::on_session_close(Session_interface &s)
   remove_client_from_server();
 }
 
-
-void Client::on_session_reset(Session_interface &s)
-{
+void Client::on_session_reset(Session_interface &s) {
   log_debug("%s: Resetting session %i", client_id(), s.session_id());
 
   m_state = Client_accepted_with_session;
-  ngs::shared_ptr<Session_interface> session(m_server.create_session(*this, *m_encoder, 1));
-  if (!session)
-  {
-    log_warning("%s: Error creating session for connection from %s", client_id(), m_client_addr.c_str());
-    m_encoder->send_result(ngs::Fatal(ER_OUT_OF_RESOURCES, "Could not allocate new session"));
+  ngs::shared_ptr<Session_interface> session(
+      m_server.create_session(*this, *m_encoder, 1));
+  if (!session) {
+    log_warning("%s: Error creating session for connection from %s",
+                client_id(), m_client_addr.c_str());
+    m_encoder->send_result(
+        ngs::Fatal(ER_OUT_OF_RESOURCES, "Could not allocate new session"));
     m_state = Client_closing;
-  }
-  else
-  {
+  } else {
     ngs::Error_code error(session->init());
-    if (error)
-    {
-      log_warning("%s: Error initializing session for connection: %s", client_id(), error.message.c_str());
+    if (error) {
+      log_warning("%s: Error initializing session for connection: %s",
+                  client_id(), error.message.c_str());
       m_encoder->send_result(error);
       session.reset();
       m_state = Client_closing;
-    }
-    else
-    {
+    } else {
       m_session = session;
       m_encoder->send_ok();
     }
   }
 }
 
-
-void Client::on_server_shutdown()
-{
-  log_info("%s: closing client because of shutdown (state: %i)", client_id(), m_state.load());
-  //XXX send a server shutdown notice
+void Client::on_server_shutdown() {
+  log_info("%s: closing client because of shutdown (state: %i)", client_id(),
+           m_state.load());
+  // XXX send a server shutdown notice
   disconnect_and_trigger_close();
 }
 
-Protocol_monitor_interface &Client::get_protocol_monitor()
-{
+Protocol_monitor_interface &Client::get_protocol_monitor() {
   return m_protocol_monitor;
 }
 
-void Client::get_last_error(int &error_code, std::string &message)
-{
+void Client::get_last_error(int &error_code, std::string &message) {
   ngs::Operations_factory operations_factory;
-  System_interface::Shared_ptr system_interface(operations_factory.create_system_interface());
+  System_interface::Shared_ptr system_interface(
+      operations_factory.create_system_interface());
 
   system_interface->get_socket_error_and_message(error_code, message);
 }
 
-void Client::shutdown_connection()
-{
+void Client::shutdown_connection() {
   m_state = Client_closing;
 
-  if (m_connection->shutdown(Connection_vio::Shutdown_recv) < 0)
-  {
+  if (m_connection->shutdown(Connection_vio::Shutdown_recv) < 0) {
     int err;
     std::string strerr;
 
     get_last_error(err, strerr);
-    log_debug("%s: connection shutdown error %s (%i)", client_id(), strerr.c_str(), err);
+    log_debug("%s: connection shutdown error %s (%i)", client_id(),
+              strerr.c_str(), err);
   }
 }
 
-Request *Client::read_one_message(Error_code &ret_error)
-{
-  union
-  {
-    char buffer[4];                             // Must be properly aligned
+Request *Client::read_one_message(Error_code &ret_error) {
+  union {
+    char buffer[4];  // Must be properly aligned
     longlong dummy;
   };
   uint32_t msg_size;
@@ -431,27 +391,27 @@ Request *Client::read_one_message(Error_code &ret_error)
     Use dummy, otherwise g++ 4.4 reports: unused variable 'dummy'
     MY_ATTRIBUTE((unused)) did not work, so we must use it.
   */
-  dummy= 0;
+  dummy = 0;
 
-  // untill we get another message to process we mark the connection as idle (for PSF)
+  // untill we get another message to process we mark the connection as idle
+  // (for PSF)
   m_connection->mark_idle();
   // read the frame
   ssize_t nread = m_connection->read(buffer, 4);
   m_connection->mark_active();
 
-  if (nread == 0) // EOF
+  if (nread == 0)  // EOF
   {
     on_network_error(0);
     return NULL;
   }
-  if (nread < 0)
-  {
+  if (nread < 0) {
     int err;
     std::string strerr;
     get_last_error(err, strerr);
-    if (!(err == EBADF && m_close_reason == Close_connect_timeout))
-    {
-      log_info("%s: ERROR reading from socket %s (%i) %i", client_id(), strerr.c_str(), err, m_close_reason);
+    if (!(err == EBADF && m_close_reason == Close_connect_timeout)) {
+      log_debug("%s: %s (%i) %i", client_id(), strerr.c_str(), err,
+                m_close_reason);
       on_network_error(err);
     }
     return NULL;
@@ -463,45 +423,44 @@ Request *Client::read_one_message(Error_code &ret_error)
   std::swap(buffer[0], buffer[3]);
   std::swap(buffer[1], buffer[2]);
 #endif
-  const uint32_t* pdata = (uint32_t*)(buffer);
+  const uint32_t *pdata = (uint32_t *)(buffer);
   msg_size = *pdata;
 
-  if (msg_size > m_server.get_config()->max_message_size)
-  {
-    log_warning("%s: Message of size %u received, exceeding the limit of %i", client_id(), msg_size, m_server.get_config()->max_message_size);
+  if (msg_size > m_server.get_config()->max_message_size) {
+    log_warning("%s: Message of size %u received, exceeding the limit of %i",
+                client_id(), msg_size, m_server.get_config()->max_message_size);
     // invalid message size
     // Don't send error, just abort connection
-    //ret_error = Fatal(ER_X_BAD_MESSAGE, "Message too large");
+    // ret_error = Fatal(ER_X_BAD_MESSAGE, "Message too large");
     return NULL;
   }
 
-  if (0 == msg_size)
-  {
-    ret_error = Error(ER_X_BAD_MESSAGE, "Messages without payload are not supported");
+  if (0 == msg_size) {
+    ret_error =
+        Error(ER_X_BAD_MESSAGE, "Messages without payload are not supported");
     return NULL;
   }
 
-  if (m_msg_buffer_size < msg_size)
-  {
+  if (m_msg_buffer_size < msg_size) {
     m_msg_buffer_size = msg_size;
-    ngs::reallocate_array(m_msg_buffer, m_msg_buffer_size, KEY_memory_x_recv_buffer);
+    ngs::reallocate_array(m_msg_buffer, m_msg_buffer_size,
+                          KEY_memory_x_recv_buffer);
   }
 
   nread = m_connection->read(&m_msg_buffer[0], msg_size);
-  if (nread == 0) // EOF
+  if (nread == 0)  // EOF
   {
     log_info("%s: peer disconnected while reading message body", client_id());
     on_network_error(0);
     return NULL;
   }
 
-  if (nread < 0)
-  {
+  if (nread < 0) {
     int err;
     std::string strerr;
 
     get_last_error(err, strerr);
-    log_info("%s: ERROR reading from socket %s (%i)", client_id(), strerr.c_str(), err);
+    log_debug("%s: %s (%i)", client_id(), strerr.c_str(), err);
     on_network_error(err);
     return NULL;
   }
@@ -511,52 +470,41 @@ Request *Client::read_one_message(Error_code &ret_error)
   int8_t type = (int8_t)m_msg_buffer[0];
   Request_unique_ptr request(ngs::allocate_object<Request>(type));
 
-  if (msg_size > 1)
-    request->buffer(&m_msg_buffer[1], msg_size - 1);
+  if (msg_size > 1) request->buffer(&m_msg_buffer[1], msg_size - 1);
 
   ret_error = m_decoder.parse(*request);
 
   return request.release();
 }
 
-
-void Client::run(const bool skip_name_resolve)
-{
-  try
-  {
+void Client::run(const bool skip_name_resolve) {
+  try {
     on_client_addr(skip_name_resolve);
     on_accept();
 
-    while (m_state != Client_closing && m_session)
-    {
+    while (m_state != Client_closing && m_session) {
       Error_code error;
       Request_unique_ptr message(read_one_message(error));
 
       // read could took some time, thus lets recheck the state
-      if (m_state == Client_closing)
-        break;
+      if (m_state == Client_closing) break;
 
-      if (error || !message)
-      {
+      if (error || !message) {
         // !message and !error = EOF
-        if (error)
-          m_encoder->send_result(ngs::Fatal(error));
+        if (error) m_encoder->send_result(ngs::Fatal(error));
         disconnect_and_trigger_close();
         break;
       }
       ngs::shared_ptr<Session_interface> s(session());
-      if (m_state != Client_accepted && s)
-      {
+      if (m_state != Client_accepted && s) {
         // pass the message to the session
         s->handle_message(*message);
-      }
-      else
+      } else
         handle_message(*message);
     }
-  }
-  catch (std::exception &e)
-  {
-    log_error("%s: Force stopping client because exception occurred: %s", client_id(), e.what());
+  } catch (std::exception &e) {
+    log_error("%s: Force stopping client because exception occurred: %s",
+              client_id(), e.what());
   }
 
   {
diff --git a/rapid/plugin/x/ngs/src/client_list.cc b/rapid/plugin/x/ngs/src/client_list.cc
index a6c27e8fb46c..a7c7d5f55aaa 100644
--- a/rapid/plugin/x/ngs/src/client_list.cc
+++ b/rapid/plugin/x/ngs/src/client_list.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/client_session.cc b/rapid/plugin/x/ngs/src/client_session.cc
index 376fcb40f65e..c51c438c8a9a 100644
--- a/rapid/plugin/x/ngs/src/client_session.cc
+++ b/rapid/plugin/x/ngs/src/client_session.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -212,9 +218,22 @@ void Session::on_auth_success(const Authentication_handler::Response &response)
 }
 
 
-void Session::on_auth_failure(const Authentication_handler::Response &responce)
+void Session::on_auth_failure(const Authentication_handler::Response &response)
 {
-  log_error("%s.%u: Unsuccessful login attempt: %s", m_client.client_id(), m_id, responce.data.c_str());
-  m_encoder->send_init_error(ngs::Fatal(ER_ACCESS_DENIED_ERROR, "%s", responce.data.c_str()));
+  int error_code = ER_ACCESS_DENIED_ERROR;
+
+  log_error("%s.%u: Unsuccessful login attempt: %s", m_client.client_id(), m_id, response.data.c_str());
+
+  if (can_forward_error_code_to_client(response.error_code))
+  {
+    error_code = response.error_code;
+  }
+
+  m_encoder->send_init_error(ngs::Fatal(error_code, "%s", response.data.c_str()));
   stop_auth();
 }
+
+bool Session::can_forward_error_code_to_client(const int error_code)
+{
+  return ER_DBACCESS_DENIED_ERROR == error_code;
+}
diff --git a/rapid/plugin/x/ngs/src/protocol/buffer.cc b/rapid/plugin/x/ngs/src/protocol/buffer.cc
index 91d029dc8b63..67c2305ccf7b 100644
--- a/rapid/plugin/x/ngs/src/protocol/buffer.cc
+++ b/rapid/plugin/x/ngs/src/protocol/buffer.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -246,7 +252,7 @@ void Buffer::add_bytes_transferred(size_t nbytes)
   for (; p != pages().end() && nbytes > 0; ++p)
   {
     // invariant: all pages after the 1st page with available space will be empty
-    DBUG_ASSERT((*p)->length == 0);
+    assert((*p)->length == 0);
     if (nbytes >= (*p)->capacity)
     {
       nbytes -= (*p)->capacity;
diff --git a/rapid/plugin/x/ngs/src/protocol/message_builder.cc b/rapid/plugin/x/ngs/src/protocol/message_builder.cc
index bc7ef836bddb..1e5d0d33198e 100644
--- a/rapid/plugin/x/ngs/src/protocol/message_builder.cc
+++ b/rapid/plugin/x/ngs/src/protocol/message_builder.cc
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
@@ -88,14 +94,14 @@ void Message_builder::start_message(Output_buffer* out_buffer, uint8 type)
   // it is possible that the size which is stored on 4-bytes will be split into 2 pages
   // in that case we need to keep 2 addresses to be able to write the size when it is known
   m_out_stream->GetDirectBufferPointer(reinterpret_cast<void**>(&m_size_addr1), &m_size_addr1_size);
-  DBUG_ASSERT(m_size_addr1_size >= 1);
+  assert(m_size_addr1_size >= 1);
   if (static_cast<size_t>(m_size_addr1_size) < sizeof(google::protobuf::uint32))
   {
     int bytes_left = sizeof(google::protobuf::uint32) - m_size_addr1_size;
     int size_addr2_size;
     m_out_stream->Skip(m_size_addr1_size);
     m_out_stream->GetDirectBufferPointer(reinterpret_cast<void**>(&m_size_addr2), &size_addr2_size);
-    DBUG_ASSERT(size_addr2_size > bytes_left);
+    assert(size_addr2_size > bytes_left);
     m_out_stream->Skip(bytes_left);
   }
   else
diff --git a/rapid/plugin/x/ngs/src/protocol/metadata_builder.cc b/rapid/plugin/x/ngs/src/protocol/metadata_builder.cc
index ddba524cddd1..624901090446 100644
--- a/rapid/plugin/x/ngs/src/protocol/metadata_builder.cc
+++ b/rapid/plugin/x/ngs/src/protocol/metadata_builder.cc
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol/notice_builder.cc b/rapid/plugin/x/ngs/src/protocol/notice_builder.cc
index 4ed04cec1b0c..b9327bb7ac95 100644
--- a/rapid/plugin/x/ngs/src/protocol/notice_builder.cc
+++ b/rapid/plugin/x/ngs/src/protocol/notice_builder.cc
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol/output_buffer.cc b/rapid/plugin/x/ngs/src/protocol/output_buffer.cc
index 2199b921836c..7b74ae99d0f8 100644
--- a/rapid/plugin/x/ngs/src/protocol/output_buffer.cc
+++ b/rapid/plugin/x/ngs/src/protocol/output_buffer.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol/page_pool.cc b/rapid/plugin/x/ngs/src/protocol/page_pool.cc
index e936d30fc321..755c66d903df 100644
--- a/rapid/plugin/x/ngs/src/protocol/page_pool.cc
+++ b/rapid/plugin/x/ngs/src/protocol/page_pool.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol/row_builder.cc b/rapid/plugin/x/ngs/src/protocol/row_builder.cc
index 9afdfc7fb3f3..29121c6b5458 100644
--- a/rapid/plugin/x/ngs/src/protocol/row_builder.cc
+++ b/rapid/plugin/x/ngs/src/protocol/row_builder.cc
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
@@ -36,7 +42,7 @@
 using namespace ngs;
 
 #define ADD_FIELD_HEADER() \
-  DBUG_ASSERT(m_row_processing); \
+  assert(m_row_processing);                             \
   google::protobuf::internal::WireFormatLite::WriteTag( \
     1, \
     google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, \
@@ -136,7 +142,7 @@ static inline int count_leading_zeroes(int i, dec1 val)
   case 2: if (val >= 100) break; ++ret;  // Fall through.
   case 1: if (val >= 10) break; ++ret;  // Fall through.
   case 0: if (val >= 1) break; ++ret;  // Fall through.
-  default: { DBUG_ASSERT(FALSE); }
+  default: { assert(FALSE); }
   }
   return ret;
 }
@@ -155,7 +161,7 @@ static dec1 *remove_leading_zeroes(const decimal_t *from, int *intg_result)
   if (intg > 0)
   {
     intg -= count_leading_zeroes((intg - 1) % DIG_PER_DEC1, *buf0);
-    DBUG_ASSERT(intg > 0);
+    assert(intg > 0);
   }
   else
     intg = 0;
@@ -176,7 +182,7 @@ static int __decimal2string(const decimal_t *from, char *to, int *to_len,
   char *s = to;
   dec1 *buf, *buf0, tmp;
 
-  DBUG_ASSERT(*to_len >= 2 + from->sign);
+  assert(*to_len >= 2 + from->sign);
 
   /* removing leading zeroes */
   buf0 = remove_leading_zeroes(from, &intg);
@@ -486,7 +492,7 @@ void Row_builder::add_bit_field(const char * const value, size_t length,
   const CHARSET_INFO * const valuecs)
 {
   ADD_FIELD_HEADER();
-  DBUG_ASSERT(length <= 8);
+  assert(length <= 8);
 
   google::protobuf::uint64 binary_value = 0;
   for (size_t i = 0; i < length; ++i)
diff --git a/rapid/plugin/x/ngs/src/protocol_authentication.cc b/rapid/plugin/x/ngs/src/protocol_authentication.cc
index b0b1b5716fac..3bc88f62d43c 100644
--- a/rapid/plugin/x/ngs/src/protocol_authentication.cc
+++ b/rapid/plugin/x/ngs/src/protocol_authentication.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol_decoder.cc b/rapid/plugin/x/ngs/src/protocol_decoder.cc
index 7babdbb5a5df..4bdce173c35f 100644
--- a/rapid/plugin/x/ngs/src/protocol_decoder.cc
+++ b/rapid/plugin/x/ngs/src/protocol_decoder.cc
@@ -1,14 +1,20 @@
-// Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; version 2 of the
-// License.
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/protocol_encoder.cc b/rapid/plugin/x/ngs/src/protocol_encoder.cc
index 2f1b130530d7..f7bbbfc8a793 100644
--- a/rapid/plugin/x/ngs/src/protocol_encoder.cc
+++ b/rapid/plugin/x/ngs/src/protocol_encoder.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/scheduler.cc b/rapid/plugin/x/ngs/src/scheduler.cc
index 21f58fc14343..fd7a98be1cbe 100644
--- a/rapid/plugin/x/ngs/src/scheduler.cc
+++ b/rapid/plugin/x/ngs/src/scheduler.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/server.cc b/rapid/plugin/x/ngs/src/server.cc
index 47d1c0c997fa..e8c4eb8ca717 100644
--- a/rapid/plugin/x/ngs/src/server.cc
+++ b/rapid/plugin/x/ngs/src/server.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/server_acceptors.cc b/rapid/plugin/x/ngs/src/server_acceptors.cc
index 40755d00225e..8ebb39f7e5d0 100644
--- a/rapid/plugin/x/ngs/src/server_acceptors.cc
+++ b/rapid/plugin/x/ngs/src/server_acceptors.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/server_client_timeout.cc b/rapid/plugin/x/ngs/src/server_client_timeout.cc
index d3d0b069cabc..7d8af472d434 100644
--- a/rapid/plugin/x/ngs/src/server_client_timeout.cc
+++ b/rapid/plugin/x/ngs/src/server_client_timeout.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/ngs/src/socket_events.cc b/rapid/plugin/x/ngs/src/socket_events.cc
index 0677e23a5479..1d15b009898d 100644
--- a/rapid/plugin/x/ngs/src/socket_events.cc
+++ b/rapid/plugin/x/ngs/src/socket_events.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -169,7 +175,7 @@ void Socket_events::break_loop() {
   event_base_loopbreak(m_evbase);
 }
 
-void Socket_events::timeout_call(int sock, short which, void *arg) {
+void Socket_events::timeout_call(socket_type sock, short which, void *arg) {
   Timer_data *data = (Timer_data*)arg;
 
   if (!data->callback()) {
@@ -189,7 +195,7 @@ void Socket_events::timeout_call(int sock, short which, void *arg) {
   }
 }
 
-void Socket_events::socket_data_avaiable(int sock, short which, void *arg) {
+void Socket_events::socket_data_avaiable(socket_type sock, short which, void *arg) {
   Socket_data *data = (Socket_data*)arg;
   Operations_factory operations_factory;
   System_interface::Shared_ptr system_interface(operations_factory.create_system_interface());
diff --git a/rapid/plugin/x/ngs/src/thread.cc b/rapid/plugin/x/ngs/src/thread.cc
index b4c928906645..ec38b2204c48 100644
--- a/rapid/plugin/x/ngs/src/thread.cc
+++ b/rapid/plugin/x/ngs/src/thread.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/process_protobuf_file.cmake b/rapid/plugin/x/process_protobuf_file.cmake
index 30eaebf4b886..3df91621250a 100644
--- a/rapid/plugin/x/process_protobuf_file.cmake
+++ b/rapid/plugin/x/process_protobuf_file.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx.proto b/rapid/plugin/x/protocol/mysqlx.proto
index 593d9a912fde..c80324243bf5 100644
--- a/rapid/plugin/x/protocol/mysqlx.proto
+++ b/rapid/plugin/x/protocol/mysqlx.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_connection.proto b/rapid/plugin/x/protocol/mysqlx_connection.proto
index e7ea7fee4d6d..dbe51fe03414 100644
--- a/rapid/plugin/x/protocol/mysqlx_connection.proto
+++ b/rapid/plugin/x/protocol/mysqlx_connection.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_crud.proto b/rapid/plugin/x/protocol/mysqlx_crud.proto
index 77e7b5b9cdbd..ab55a082c997 100644
--- a/rapid/plugin/x/protocol/mysqlx_crud.proto
+++ b/rapid/plugin/x/protocol/mysqlx_crud.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_datatypes.proto b/rapid/plugin/x/protocol/mysqlx_datatypes.proto
index e4da65a09cac..bff82b7e0997 100644
--- a/rapid/plugin/x/protocol/mysqlx_datatypes.proto
+++ b/rapid/plugin/x/protocol/mysqlx_datatypes.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_expect.proto b/rapid/plugin/x/protocol/mysqlx_expect.proto
index 48fc11f1d469..1a6fad84c5e9 100644
--- a/rapid/plugin/x/protocol/mysqlx_expect.proto
+++ b/rapid/plugin/x/protocol/mysqlx_expect.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_expr.proto b/rapid/plugin/x/protocol/mysqlx_expr.proto
index 19a268ffe7d9..906f360df42f 100644
--- a/rapid/plugin/x/protocol/mysqlx_expr.proto
+++ b/rapid/plugin/x/protocol/mysqlx_expr.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_notice.proto b/rapid/plugin/x/protocol/mysqlx_notice.proto
index ab5b5072e800..27f0b6fbe86c 100644
--- a/rapid/plugin/x/protocol/mysqlx_notice.proto
+++ b/rapid/plugin/x/protocol/mysqlx_notice.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_resultset.proto b/rapid/plugin/x/protocol/mysqlx_resultset.proto
index 9c77829879bb..92348ff9dc39 100644
--- a/rapid/plugin/x/protocol/mysqlx_resultset.proto
+++ b/rapid/plugin/x/protocol/mysqlx_resultset.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_session.proto b/rapid/plugin/x/protocol/mysqlx_session.proto
index 844efcb51139..e0ed8c2b92b3 100644
--- a/rapid/plugin/x/protocol/mysqlx_session.proto
+++ b/rapid/plugin/x/protocol/mysqlx_session.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/protocol/mysqlx_sql.proto b/rapid/plugin/x/protocol/mysqlx_sql.proto
index 08fed7d70c7b..b4aa448f2665 100644
--- a/rapid/plugin/x/protocol/mysqlx_sql.proto
+++ b/rapid/plugin/x/protocol/mysqlx_sql.proto
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/source_files.cmake b/rapid/plugin/x/source_files.cmake
index daa62d818fb4..d9f9e1c65900 100644
--- a/rapid/plugin/x/source_files.cmake
+++ b/rapid/plugin/x/source_files.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/admin_cmd_handler.cc b/rapid/plugin/x/src/admin_cmd_handler.cc
index 7a7c4073a15b..9ef2fd83552a 100644
--- a/rapid/plugin/x/src/admin_cmd_handler.cc
+++ b/rapid/plugin/x/src/admin_cmd_handler.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/admin_cmd_handler.h b/rapid/plugin/x/src/admin_cmd_handler.h
index 962531e94c14..748aa356d6fe 100644
--- a/rapid/plugin/x/src/admin_cmd_handler.h
+++ b/rapid/plugin/x/src/admin_cmd_handler.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/auth_mysql41.cc b/rapid/plugin/x/src/auth_mysql41.cc
index 491a994c322e..8ada101bc04e 100644
--- a/rapid/plugin/x/src/auth_mysql41.cc
+++ b/rapid/plugin/x/src/auth_mysql41.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/auth_mysql41.h b/rapid/plugin/x/src/auth_mysql41.h
index 89e84cf3791f..0cbbb2b3b7cf 100644
--- a/rapid/plugin/x/src/auth_mysql41.h
+++ b/rapid/plugin/x/src/auth_mysql41.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/auth_plain.h b/rapid/plugin/x/src/auth_plain.h
index d42f2e833f27..e216037b376f 100644
--- a/rapid/plugin/x/src/auth_plain.h
+++ b/rapid/plugin/x/src/auth_plain.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/buffering_command_delegate.cc b/rapid/plugin/x/src/buffering_command_delegate.cc
index 023c5f6717d1..dc2359d0683b 100644
--- a/rapid/plugin/x/src/buffering_command_delegate.cc
+++ b/rapid/plugin/x/src/buffering_command_delegate.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/buffering_command_delegate.h b/rapid/plugin/x/src/buffering_command_delegate.h
index fd4b210fd2f2..524edc9964e6 100644
--- a/rapid/plugin/x/src/buffering_command_delegate.h
+++ b/rapid/plugin/x/src/buffering_command_delegate.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/callback_command_delegate.cc b/rapid/plugin/x/src/callback_command_delegate.cc
index 6117a1d4d281..04b56cb528ff 100644
--- a/rapid/plugin/x/src/callback_command_delegate.cc
+++ b/rapid/plugin/x/src/callback_command_delegate.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/callback_command_delegate.h b/rapid/plugin/x/src/callback_command_delegate.h
index 1025b114c35c..b76845e700e4 100644
--- a/rapid/plugin/x/src/callback_command_delegate.h
+++ b/rapid/plugin/x/src/callback_command_delegate.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/cap_handles_expired_passwords.h b/rapid/plugin/x/src/cap_handles_expired_passwords.h
index 068fad73120e..149b3b3e1988 100644
--- a/rapid/plugin/x/src/cap_handles_expired_passwords.h
+++ b/rapid/plugin/x/src/cap_handles_expired_passwords.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/command_delegate.h b/rapid/plugin/x/src/command_delegate.h
index a59aeff98c21..b36e192603e6 100644
--- a/rapid/plugin/x/src/command_delegate.h
+++ b/rapid/plugin/x/src/command_delegate.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/crud_cmd_handler.cc b/rapid/plugin/x/src/crud_cmd_handler.cc
index f4d831cbc8d5..b890c288deb5 100644
--- a/rapid/plugin/x/src/crud_cmd_handler.cc
+++ b/rapid/plugin/x/src/crud_cmd_handler.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/crud_cmd_handler.h b/rapid/plugin/x/src/crud_cmd_handler.h
index 55914121a01d..34dac5dde2ab 100644
--- a/rapid/plugin/x/src/crud_cmd_handler.h
+++ b/rapid/plugin/x/src/crud_cmd_handler.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/delete_statement_builder.cc b/rapid/plugin/x/src/delete_statement_builder.cc
index 259086eb668e..5b432d52dd07 100644
--- a/rapid/plugin/x/src/delete_statement_builder.cc
+++ b/rapid/plugin/x/src/delete_statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/delete_statement_builder.h b/rapid/plugin/x/src/delete_statement_builder.h
index 6d17f79aafab..b1e61e8d08f3 100644
--- a/rapid/plugin/x/src/delete_statement_builder.h
+++ b/rapid/plugin/x/src/delete_statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/expect.cc b/rapid/plugin/x/src/expect.cc
index 3b79dafee3ab..932a534bb24e 100644
--- a/rapid/plugin/x/src/expect.cc
+++ b/rapid/plugin/x/src/expect.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/expect.h b/rapid/plugin/x/src/expect.h
index 609f1e590e33..3f43637ca3ed 100644
--- a/rapid/plugin/x/src/expect.h
+++ b/rapid/plugin/x/src/expect.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/expect_gtid.cc b/rapid/plugin/x/src/expect_gtid.cc
index fc783f38ecd9..421d2e8c359d 100644
--- a/rapid/plugin/x/src/expect_gtid.cc
+++ b/rapid/plugin/x/src/expect_gtid.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/expect_gtid.h b/rapid/plugin/x/src/expect_gtid.h
index aa2f66bc9885..e2e7df358e1c 100644
--- a/rapid/plugin/x/src/expect_gtid.h
+++ b/rapid/plugin/x/src/expect_gtid.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/expr_generator.cc b/rapid/plugin/x/src/expr_generator.cc
index d58210575c6c..fdd49f837620 100644
--- a/rapid/plugin/x/src/expr_generator.cc
+++ b/rapid/plugin/x/src/expr_generator.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/expr_generator.h b/rapid/plugin/x/src/expr_generator.h
index 3e52feaae1e0..5540609baf5b 100644
--- a/rapid/plugin/x/src/expr_generator.h
+++ b/rapid/plugin/x/src/expr_generator.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/find_statement_builder.cc b/rapid/plugin/x/src/find_statement_builder.cc
index d43891d62250..45e06fe148a7 100644
--- a/rapid/plugin/x/src/find_statement_builder.cc
+++ b/rapid/plugin/x/src/find_statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/find_statement_builder.h b/rapid/plugin/x/src/find_statement_builder.h
index 86cc283b8ae8..634c447e94bf 100644
--- a/rapid/plugin/x/src/find_statement_builder.h
+++ b/rapid/plugin/x/src/find_statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/insert_statement_builder.cc b/rapid/plugin/x/src/insert_statement_builder.cc
index d9924bbbea35..d96562114601 100644
--- a/rapid/plugin/x/src/insert_statement_builder.cc
+++ b/rapid/plugin/x/src/insert_statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/insert_statement_builder.h b/rapid/plugin/x/src/insert_statement_builder.h
index 8d3a07532002..c180276a8410 100644
--- a/rapid/plugin/x/src/insert_statement_builder.h
+++ b/rapid/plugin/x/src/insert_statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/io/xpl_listener_factory.cc b/rapid/plugin/x/src/io/xpl_listener_factory.cc
index d5f66a0ff987..2b9ea1fcede4 100644
--- a/rapid/plugin/x/src/io/xpl_listener_factory.cc
+++ b/rapid/plugin/x/src/io/xpl_listener_factory.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/io/xpl_listener_factory.h b/rapid/plugin/x/src/io/xpl_listener_factory.h
index 26f79c2a3650..9f6a52d65879 100644
--- a/rapid/plugin/x/src/io/xpl_listener_factory.h
+++ b/rapid/plugin/x/src/io/xpl_listener_factory.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/io/xpl_listener_tcp.cc b/rapid/plugin/x/src/io/xpl_listener_tcp.cc
index cdeb43848bdd..799c6b417f62 100644
--- a/rapid/plugin/x/src/io/xpl_listener_tcp.cc
+++ b/rapid/plugin/x/src/io/xpl_listener_tcp.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/io/xpl_listener_tcp.h b/rapid/plugin/x/src/io/xpl_listener_tcp.h
index 785ad913a1dd..2751038f459d 100644
--- a/rapid/plugin/x/src/io/xpl_listener_tcp.h
+++ b/rapid/plugin/x/src/io/xpl_listener_tcp.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/io/xpl_listener_unix_socket.cc b/rapid/plugin/x/src/io/xpl_listener_unix_socket.cc
index 3375f7411210..00fa57f13632 100644
--- a/rapid/plugin/x/src/io/xpl_listener_unix_socket.cc
+++ b/rapid/plugin/x/src/io/xpl_listener_unix_socket.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/io/xpl_listener_unix_socket.h b/rapid/plugin/x/src/io/xpl_listener_unix_socket.h
index cf50e146512f..95a07d91527d 100644
--- a/rapid/plugin/x/src/io/xpl_listener_unix_socket.h
+++ b/rapid/plugin/x/src/io/xpl_listener_unix_socket.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/json_utils.cc b/rapid/plugin/x/src/json_utils.cc
index 36a22bb57d7d..953cc2daa752 100644
--- a/rapid/plugin/x/src/json_utils.cc
+++ b/rapid/plugin/x/src/json_utils.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/json_utils.h b/rapid/plugin/x/src/json_utils.h
index 4ae81cdbdd40..4811656eea8e 100644
--- a/rapid/plugin/x/src/json_utils.h
+++ b/rapid/plugin/x/src/json_utils.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_function_names.cc b/rapid/plugin/x/src/mysql_function_names.cc
index 177222c39053..06e2bcc25d7e 100644
--- a/rapid/plugin/x/src/mysql_function_names.cc
+++ b/rapid/plugin/x/src/mysql_function_names.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_function_names.h b/rapid/plugin/x/src/mysql_function_names.h
index 4be6f880460d..7504abf9a4be 100644
--- a/rapid/plugin/x/src/mysql_function_names.h
+++ b/rapid/plugin/x/src/mysql_function_names.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_show_variable_wrapper.cc b/rapid/plugin/x/src/mysql_show_variable_wrapper.cc
index 50b66ed2e7e6..002b38887b72 100644
--- a/rapid/plugin/x/src/mysql_show_variable_wrapper.cc
+++ b/rapid/plugin/x/src/mysql_show_variable_wrapper.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_show_variable_wrapper.h b/rapid/plugin/x/src/mysql_show_variable_wrapper.h
index 4844807e88e5..afed86b33110 100644
--- a/rapid/plugin/x/src/mysql_show_variable_wrapper.h
+++ b/rapid/plugin/x/src/mysql_show_variable_wrapper.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_variables.cc b/rapid/plugin/x/src/mysql_variables.cc
index ea7d5edfe0a9..8d889328581a 100644
--- a/rapid/plugin/x/src/mysql_variables.cc
+++ b/rapid/plugin/x/src/mysql_variables.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysql_variables.h b/rapid/plugin/x/src/mysql_variables.h
index 10e1cadaa14b..b2d5d6bbeec8 100644
--- a/rapid/plugin/x/src/mysql_variables.h
+++ b/rapid/plugin/x/src/mysql_variables.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysqlx_ername.h.in b/rapid/plugin/x/src/mysqlx_ername.h.in
index bcd7b08cfdd6..683bab263df2 100644
--- a/rapid/plugin/x/src/mysqlx_ername.h.in
+++ b/rapid/plugin/x/src/mysqlx_ername.h.in
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysqlx_error.h.in b/rapid/plugin/x/src/mysqlx_error.h.in
index 80eb5b006c3f..50f4c1cdb355 100644
--- a/rapid/plugin/x/src/mysqlx_error.h.in
+++ b/rapid/plugin/x/src/mysqlx_error.h.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/mysqlx_version.h.in b/rapid/plugin/x/src/mysqlx_version.h.in
index 90183baa9929..b51ec2584a0f 100644
--- a/rapid/plugin/x/src/mysqlx_version.h.in
+++ b/rapid/plugin/x/src/mysqlx_version.h.in
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/notices.cc b/rapid/plugin/x/src/notices.cc
index 1ce3205d7265..b872cc0b0f4a 100644
--- a/rapid/plugin/x/src/notices.cc
+++ b/rapid/plugin/x/src/notices.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/notices.h b/rapid/plugin/x/src/notices.h
index 788874113d2e..f9dc37de2152 100644
--- a/rapid/plugin/x/src/notices.h
+++ b/rapid/plugin/x/src/notices.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/query_formatter.cc b/rapid/plugin/x/src/query_formatter.cc
index e1d3871ec8d0..34e554456a15 100644
--- a/rapid/plugin/x/src/query_formatter.cc
+++ b/rapid/plugin/x/src/query_formatter.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/query_formatter.h b/rapid/plugin/x/src/query_formatter.h
index 73a3a4af18e0..b76d605072b7 100644
--- a/rapid/plugin/x/src/query_formatter.h
+++ b/rapid/plugin/x/src/query_formatter.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/query_string_builder.cc b/rapid/plugin/x/src/query_string_builder.cc
index e1df52425070..5ffd4566a198 100644
--- a/rapid/plugin/x/src/query_string_builder.cc
+++ b/rapid/plugin/x/src/query_string_builder.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -37,7 +43,7 @@ Query_string_builder::Query_string_builder(size_t reserve)
   : m_in_quoted(false), m_in_identifier(false)
 {
   my_thread_once(&m_charset_initialized, init_charset);
-  DBUG_ASSERT(m_charset != NULL);
+  assert(m_charset != NULL);
 
   m_str.reserve(reserve);
 }
diff --git a/rapid/plugin/x/src/query_string_builder.h b/rapid/plugin/x/src/query_string_builder.h
index 7a2baf857f7d..34bb16100153 100644
--- a/rapid/plugin/x/src/query_string_builder.h
+++ b/rapid/plugin/x/src/query_string_builder.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/sql_data_context.cc b/rapid/plugin/x/src/sql_data_context.cc
index 898f6b075ba9..7e12ac4e6d01 100644
--- a/rapid/plugin/x/src/sql_data_context.cc
+++ b/rapid/plugin/x/src/sql_data_context.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -250,6 +256,7 @@ ngs::Error_code Sql_data_context::authenticate(const char *user, const char *hos
       data.com_init_db.length = static_cast<unsigned long>(strlen(db));
 
       m_callback_delegate.reset();
+
       if (command_service_run_command(m_mysql_session, COM_INIT_DB, &data, mysqld::get_charset_utf8mb4_general_ci(),
                                       m_callback_delegate.callbacks(), m_callback_delegate.representation(), &m_callback_delegate))
         return ngs::Error_code(ER_NO_DB_ERROR, "Could not set database");
@@ -265,7 +272,7 @@ ngs::Error_code Sql_data_context::authenticate(const char *user, const char *hos
         host_or_ip.c_str(), host_or_ip.length());
 #endif // HAVE_PSI_THREAD_INTERFACE
 
-    return ngs::Error_code();
+    return error;
   }
 
   log_error("Unable to switch context to user %s", user);
diff --git a/rapid/plugin/x/src/sql_data_context.h b/rapid/plugin/x/src/sql_data_context.h
index 4badaf32dbf4..55142061cc82 100644
--- a/rapid/plugin/x/src/sql_data_context.h
+++ b/rapid/plugin/x/src/sql_data_context.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/sql_data_result.cc b/rapid/plugin/x/src/sql_data_result.cc
index 8ea9b1007ec2..38c44727c454 100644
--- a/rapid/plugin/x/src/sql_data_result.cc
+++ b/rapid/plugin/x/src/sql_data_result.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/sql_data_result.h b/rapid/plugin/x/src/sql_data_result.h
index 8fbc41f71763..9acc8d0de9d5 100644
--- a/rapid/plugin/x/src/sql_data_result.h
+++ b/rapid/plugin/x/src/sql_data_result.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/sql_user_require.cc b/rapid/plugin/x/src/sql_user_require.cc
index 39af5ab79682..fb11264c1901 100644
--- a/rapid/plugin/x/src/sql_user_require.cc
+++ b/rapid/plugin/x/src/sql_user_require.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/sql_user_require.h b/rapid/plugin/x/src/sql_user_require.h
index 95aa094c6034..3e01fd1b3ff6 100644
--- a/rapid/plugin/x/src/sql_user_require.h
+++ b/rapid/plugin/x/src/sql_user_require.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/statement_builder.cc b/rapid/plugin/x/src/statement_builder.cc
index 3bdd8bb277f2..f079381cdb6b 100644
--- a/rapid/plugin/x/src/statement_builder.cc
+++ b/rapid/plugin/x/src/statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/statement_builder.h b/rapid/plugin/x/src/statement_builder.h
index 36a86eff71fe..4ad05fdebda6 100644
--- a/rapid/plugin/x/src/statement_builder.h
+++ b/rapid/plugin/x/src/statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/streaming_command_delegate.cc b/rapid/plugin/x/src/streaming_command_delegate.cc
index c44c681ddd46..361dbe7a31df 100644
--- a/rapid/plugin/x/src/streaming_command_delegate.cc
+++ b/rapid/plugin/x/src/streaming_command_delegate.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -203,7 +209,7 @@ int Streaming_command_delegate::field_metadata(struct st_send_field *field,
       xtype = Mysqlx::Resultset::ColumnMetaData::BIT;
       break;
   }
-  DBUG_ASSERT(xtype != (Mysqlx::Resultset::ColumnMetaData::FieldType)0);
+  assert(xtype != (Mysqlx::Resultset::ColumnMetaData::FieldType)0);
 
 
   if (send_column_metadata(xcollation, xtype, xflags, ctype, field))
diff --git a/rapid/plugin/x/src/streaming_command_delegate.h b/rapid/plugin/x/src/streaming_command_delegate.h
index 8a205dd39b95..6e804c33d3d6 100644
--- a/rapid/plugin/x/src/streaming_command_delegate.h
+++ b/rapid/plugin/x/src/streaming_command_delegate.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/update_statement_builder.cc b/rapid/plugin/x/src/update_statement_builder.cc
index 1ac45e688150..ea0e2dcef9ff 100644
--- a/rapid/plugin/x/src/update_statement_builder.cc
+++ b/rapid/plugin/x/src/update_statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/update_statement_builder.h b/rapid/plugin/x/src/update_statement_builder.h
index 618e1e6a7261..6b26c3dcf779 100644
--- a/rapid/plugin/x/src/update_statement_builder.h
+++ b/rapid/plugin/x/src/update_statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/user_verification_helper.h b/rapid/plugin/x/src/user_verification_helper.h
index 57fa1464a126..ab30c912fd8d 100644
--- a/rapid/plugin/x/src/user_verification_helper.h
+++ b/rapid/plugin/x/src/user_verification_helper.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -66,7 +72,7 @@ namespace xpl {
         // The query asks for primary key, thus here we should get
         // only one row
         if (!r_result_set.empty()) {
-          DBUG_ASSERT(1 == r_result_set.size());
+          assert(1 == r_result_set.size());
           if (this->verify_mysql_account_entry(r_result_set.front()))
             return ngs::Error_code();
         }
@@ -114,7 +120,7 @@ namespace xpl {
       bool is_offline_mode_and_isnt_super_user = false;
       Sql_user_require required;
 
-      DBUG_ASSERT(10 == row.fields.size());
+      assert(10 == row.fields.size());
 
       if (!get_bool_from_int_value(row, 0, require_secure_transport) ||
           !get_string_value(row, 1, db_password_hash) ||
diff --git a/rapid/plugin/x/src/view_statement_builder.cc b/rapid/plugin/x/src/view_statement_builder.cc
index 73b19a33ff28..c8a4d752ec47 100644
--- a/rapid/plugin/x/src/view_statement_builder.cc
+++ b/rapid/plugin/x/src/view_statement_builder.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
@@ -86,7 +93,7 @@ void View_statement_builder::add_algorithm(const Algorithm &algorithm) const {
       break;
 
     default:
-      DBUG_ASSERT("Unknown ALGORITHM type");
+      assert("Unknown ALGORITHM type");
   }
 }
 
@@ -103,7 +110,7 @@ void View_statement_builder::add_sql_security(const Sql_security &security)
       break;
 
     default:
-      DBUG_ASSERT("Unknown SECURITY type");
+      assert("Unknown SECURITY type");
   }
 }
 
@@ -121,7 +128,7 @@ void View_statement_builder::add_check_option(const Check_option &option)
       break;
 
     default:
-      DBUG_ASSERT("Unknown CHECK type");
+      assert("Unknown CHECK type");
   }
   m_builder.put(" CHECK OPTION");
 }
diff --git a/rapid/plugin/x/src/view_statement_builder.h b/rapid/plugin/x/src/view_statement_builder.h
index 63ec2b71a2b9..5999f3340de0 100644
--- a/rapid/plugin/x/src/view_statement_builder.h
+++ b/rapid/plugin/x/src/view_statement_builder.h
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/plugin/x/src/xpl_client.cc b/rapid/plugin/x/src/xpl_client.cc
index 9f7d3d5f8eef..02fb897c5cb5 100644
--- a/rapid/plugin/x/src/xpl_client.cc
+++ b/rapid/plugin/x/src/xpl_client.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_client.h b/rapid/plugin/x/src/xpl_client.h
index 4d68b6243b8e..b5fbc65a9b53 100644
--- a/rapid/plugin/x/src/xpl_client.h
+++ b/rapid/plugin/x/src/xpl_client.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_common_status_variables.h b/rapid/plugin/x/src/xpl_common_status_variables.h
index 4caca49bafd4..be49aac4adbf 100644
--- a/rapid/plugin/x/src/xpl_common_status_variables.h
+++ b/rapid/plugin/x/src/xpl_common_status_variables.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_dispatcher.cc b/rapid/plugin/x/src/xpl_dispatcher.cc
index 31da00c8df0a..6cf98450dc77 100644
--- a/rapid/plugin/x/src/xpl_dispatcher.cc
+++ b/rapid/plugin/x/src/xpl_dispatcher.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_dispatcher.h b/rapid/plugin/x/src/xpl_dispatcher.h
index 7adcdc8d2fd4..aeedc281f7b7 100644
--- a/rapid/plugin/x/src/xpl_dispatcher.h
+++ b/rapid/plugin/x/src/xpl_dispatcher.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_error.h b/rapid/plugin/x/src/xpl_error.h
index bd65fb6273e1..0eb0a5791db3 100644
--- a/rapid/plugin/x/src/xpl_error.h
+++ b/rapid/plugin/x/src/xpl_error.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_global_status_variables.h b/rapid/plugin/x/src/xpl_global_status_variables.h
index 633b1275e8ca..edaf62f74ea6 100644
--- a/rapid/plugin/x/src/xpl_global_status_variables.h
+++ b/rapid/plugin/x/src/xpl_global_status_variables.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_log.cc b/rapid/plugin/x/src/xpl_log.cc
index 988c7f6016ec..bb8e84415faf 100644
--- a/rapid/plugin/x/src/xpl_log.cc
+++ b/rapid/plugin/x/src/xpl_log.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_log.h b/rapid/plugin/x/src/xpl_log.h
index 12ff34742eef..ed4132bbb9c5 100644
--- a/rapid/plugin/x/src/xpl_log.h
+++ b/rapid/plugin/x/src/xpl_log.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_performance_schema.cc b/rapid/plugin/x/src/xpl_performance_schema.cc
index 8bbc7d98d0fd..1e5b1d59a96f 100644
--- a/rapid/plugin/x/src/xpl_performance_schema.cc
+++ b/rapid/plugin/x/src/xpl_performance_schema.cc
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_performance_schema.h b/rapid/plugin/x/src/xpl_performance_schema.h
index 7b4881a072ca..20056a81eb61 100644
--- a/rapid/plugin/x/src/xpl_performance_schema.h
+++ b/rapid/plugin/x/src/xpl_performance_schema.h
@@ -1,15 +1,21 @@
 /*
-* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 *
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; version 2 of the
-* License.
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2.0,
+* as published by the Free Software Foundation.
+*
+* This program is also distributed with certain software (including
+* but not limited to OpenSSL) that is licensed under separate terms,
+* as designated in a particular file or component or in included license
+* documentation.  The authors of MySQL hereby grant you an additional
+* permission to link the program and your derivative works with the
+* separately licensed software that they have included with MySQL.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License, version 2.0, for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_plugin.cc b/rapid/plugin/x/src/xpl_plugin.cc
index 7ef6cdb2b8a6..fed9ef0a7792 100644
--- a/rapid/plugin/x/src/xpl_plugin.cc
+++ b/rapid/plugin/x/src/xpl_plugin.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_regex.cc b/rapid/plugin/x/src/xpl_regex.cc
index 3cad8fb8bdc6..a12ffdf3f3bf 100644
--- a/rapid/plugin/x/src/xpl_regex.cc
+++ b/rapid/plugin/x/src/xpl_regex.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -24,7 +31,7 @@ namespace
 
 inline void check_result(const int err)
 {
-  DBUG_ASSERT( err == 0 );
+  assert( err == 0 );
 }
 
 
diff --git a/rapid/plugin/x/src/xpl_regex.h b/rapid/plugin/x/src/xpl_regex.h
index 667780152a66..bb0d054ab3b1 100644
--- a/rapid/plugin/x/src/xpl_regex.h
+++ b/rapid/plugin/x/src/xpl_regex.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_server.cc b/rapid/plugin/x/src/xpl_server.cc
index 037ab4c0350c..f5e534588728 100644
--- a/rapid/plugin/x/src/xpl_server.cc
+++ b/rapid/plugin/x/src/xpl_server.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -37,10 +43,7 @@
 #include "my_thread_local.h"
 #include "mysql/service_ssl_wrapper.h"
 #include "mysqlx_version.h"
-
-#if !defined(HAVE_YASSL)
 #include <openssl/err.h>
-#endif
 
 class Session_scheduler : public ngs::Scheduler_dynamic
 {
@@ -559,9 +562,8 @@ bool xpl::Server::on_net_startup()
                                    ssl_config,
                                    xpl::Plugin_system_variables::ssl_config);
 
-    // YaSSL doesn't support CRL according to vio
-    const char *crl = IS_YASSL_OR_OPENSSL(NULL, ssl_config.ssl_crl);
-    const char *crlpath = IS_YASSL_OR_OPENSSL(NULL, ssl_config.ssl_crlpath);
+    const char *crl = ssl_config.ssl_crl;
+    const char *crlpath = ssl_config.ssl_crlpath;
 
     const bool ssl_setup_result = ssl_ctx->setup(tls_version, ssl_config.ssl_key,
                                                  ssl_config.ssl_ca,
@@ -573,7 +575,7 @@ bool xpl::Server::on_net_startup()
     if (ssl_setup_result)
     {
       my_plugin_log_message(&xpl::plugin_handle, MY_INFORMATION_LEVEL,
-          "Using " IS_YASSL_OR_OPENSSL("YaSSL", "OpenSSL") " for TLS connections");
+          "Using OpenSSL for TLS connections");
     }
     else
     {
diff --git a/rapid/plugin/x/src/xpl_server.h b/rapid/plugin/x/src/xpl_server.h
index e3f48b8b0007..49a5a1faa975 100644
--- a/rapid/plugin/x/src/xpl_server.h
+++ b/rapid/plugin/x/src/xpl_server.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -269,10 +275,4 @@ void Server::global_status_variable(THD *thd, st_mysql_show_var *var, char *buff
 
 } // namespace xpl
 
-#ifdef HAVE_YASSL
-#define IS_YASSL_OR_OPENSSL(Y, O) Y
-#else // HAVE_YASSL
-#define IS_YASSL_OR_OPENSSL(Y, O) O
-#endif // HAVE_YASSL
-
 #endif  // _XPL_SERVER_H_
diff --git a/rapid/plugin/x/src/xpl_session.cc b/rapid/plugin/x/src/xpl_session.cc
index 22a6afc7c969..bfc0ad5f6458 100644
--- a/rapid/plugin/x/src/xpl_session.cc
+++ b/rapid/plugin/x/src/xpl_session.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_session.h b/rapid/plugin/x/src/xpl_session.h
index dba5efe96f31..67eec2230a71 100644
--- a/rapid/plugin/x/src/xpl_session.h
+++ b/rapid/plugin/x/src/xpl_session.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_session_status_variables.h b/rapid/plugin/x/src/xpl_session_status_variables.h
index 2c9ef8592196..29c6e190188b 100644
--- a/rapid/plugin/x/src/xpl_session_status_variables.h
+++ b/rapid/plugin/x/src/xpl_session_status_variables.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_system_variables.cc b/rapid/plugin/x/src/xpl_system_variables.cc
index 41a843a58cf6..a3c03767b741 100644
--- a/rapid/plugin/x/src/xpl_system_variables.cc
+++ b/rapid/plugin/x/src/xpl_system_variables.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/src/xpl_system_variables.h b/rapid/plugin/x/src/xpl_system_variables.h
index 8803ad62561c..45db6966ffd9 100644
--- a/rapid/plugin/x/src/xpl_system_variables.h
+++ b/rapid/plugin/x/src/xpl_system_variables.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/plugin/x/tests/mtr/include/connection_default_schema.inc b/rapid/plugin/x/tests/mtr/include/connection_default_schema.inc
new file mode 100644
index 000000000000..bafaffedc008
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/include/connection_default_schema.inc
@@ -0,0 +1,19 @@
+
+echo # Checking if requested schema was selected.;
+
+if ($expect_error != '')
+{
+  --replace_result $expect_error EXPECTED_ERROR_CODE
+  --error 1
+}
+exec $execute_command
+  --user=$user
+  --host=127.0.0.1
+  -e "SELECT IF(DATABASE()='$schema','Success','Failure');"
+  $schema 2>&1;
+
+--let $expect_error=
+--let $user=
+--let $schema=
+--let $execute_command=
+--let $expect_error=
diff --git a/rapid/plugin/x/tests/mtr/include/connection_ssl.inc b/rapid/plugin/x/tests/mtr/include/connection_ssl.inc
index 7af828fbb93d..a5e806f73948 100644
--- a/rapid/plugin/x/tests/mtr/include/connection_ssl.inc
+++ b/rapid/plugin/x/tests/mtr/include/connection_ssl.inc
@@ -211,7 +211,6 @@ CREATE USER user6_mysqlx@localhost
             REQUIRE x509;
 
 # openssl ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:SRP-DSS-AES-256-CBC-SHA:SRP-RSA-AES-256-CBC-SHA:SRP-AES-256-CBC-SHA:DHE-DSS-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-CAMELLIA256-SHA:DHE-DSS-CAMELLIA256-SHA:ECDH-RSA-AES256-GCM-SHA384:ECDH-ECDSA-AES256-GCM-SHA384:ECDH-RSA-AES256-SHA384:ECDH-ECDSA-AES256-SHA384:ECDH-RSA-AES256-SHA:ECDH-ECDSA-AES256-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:CAMELLIA256-SHA:PSK-AES256-CBC-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:SRP-DSS-3DES-EDE-CBC-SHA:SRP-RSA-3DES-EDE-CBC-SHA:SRP-3DES-EDE-CBC-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:ECDH-RSA-DES-CBC3-SHA:ECDH-ECDSA-DES-CBC3-SHA:DES-CBC3-SHA:PSK-3DES-EDE-CBC-SHA:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA
-# yassl   DHE-RSA-AES256-SHA:AES256-SHA:DHE-RSA-AES128-SHA:AES128-SHA:AES256-RMD:AES128-RMD:DES-CBC3-RMD:DHE-RSA-AES256-RMD:DHE-RSA-AES128-RMD:DHE-RSA-DES-CBC3-RMD:RC4-SHA:RC4-MD5:DES-CBC3-SHA:DES-CBC-SHA:EDH-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC-SHA
 CREATE USER user7_mysqlx@localhost
             IDENTIFIED WITH 'mysql_native_password' BY ''
             REQUIRE CIPHER "AES256-SHA";
diff --git a/rapid/plugin/x/tests/mtr/r/connection.result b/rapid/plugin/x/tests/mtr/r/connection.result
index 32af025035b2..d1374540989b 100644
--- a/rapid/plugin/x/tests/mtr/r/connection.result
+++ b/rapid/plugin/x/tests/mtr/r/connection.result
@@ -688,7 +688,7 @@ Mysqlx_sessions_rejected	1
 RUN SET @@session.session_track_system_variables='mysqlx_port,mysqlx_idle_worker_thread_timeout,mysqlx_max_allowed_packet,mysqlx_max_connections,mysqlx_min_worker_threads'
 
 0 rows affected
-RUN show variables like '%track%'
+RUN show variables like '%session_track%'
 Variable_name	Value
 session_track_gtids	OFF
 session_track_schema	ON
@@ -1335,6 +1335,9 @@ drop user con1@localhost;
 drop user con2@localhost;
 drop user mysqlcon1@localhost;
 drop user mysqlcon2@localhost;
+drop user ''@localhost;
+drop user special@localhost;
+drop user session@localhost;
 show status like 'Mysqlx_connections_closed';
 Variable_name	Value
 Mysqlx_connections_closed	15
diff --git a/rapid/plugin/x/tests/mtr/r/connection_default_schema.result b/rapid/plugin/x/tests/mtr/r/connection_default_schema.result
new file mode 100644
index 000000000000..e0d891f9c92f
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/r/connection_default_schema.result
@@ -0,0 +1,88 @@
+#
+## Preamble
+#
+install plugin mysqlx soname "mysqlx.so";
+call mtr.add_suppression("Plugin mysqlx reported: .Failed at SSL configuration: .SSL context is not usable without certificate and private key..");
+call mtr.add_suppression("Plugin mysqlx reported: .SSL_CTX_load_verify_locations failed.");
+#
+## Testcase prepare
+#
+call mtr.add_suppression("Plugin mysqlx reported: '.*: Unsuccessful login attempt");
+CREATE DATABASE xdb;
+CREATE DATABASE ydb;
+CREATE USER 'user_with_access_to_xdb'@'%';
+CREATE USER 'user_with_access_to_ydb'@'%';
+GRANT SELECT ON xdb.* TO 'user_with_access_to_xdb'@'%';
+GRANT SELECT ON ydb.* TO 'user_with_access_to_ydb'@'%';
+#
+## Testcase execute
+#
+#
+## Test group 1.
+##
+## Authenticate using an account which has permissions
+## to selected schema.
+#
+
+# Using MySQL client
+# Checking if requested schema was selected.
+IF(DATABASE()='xdb','Success','Failure')
+Success
+
+# Using mysqlxtest
+# Checking if requested schema was selected.
+RUN SELECT IF(DATABASE()='xdb','Success','Failure')
+IF(DATABASE()='xdb','Success','Failure')
+Success
+0 rows affected
+Mysqlx.Ok {
+  msg: "bye!"
+}
+ok
+#
+## Test group 2.
+##
+## Authenticate using an account which has not permissions
+## to selected schema.
+#
+
+# Using MySQL client
+# Checking if requested schema was selected.
+EXPECTED_ERROR_CODE(42000): Access denied for user 'user_with_access_to_xdb'@'%' to database 'ydb'
+
+# Using mysqlxtest
+# Checking if requested schema was selected.
+in main, line 0:ERROR: Access denied for user 'user_with_access_to_xdb'@'%' to database 'ydb' (EXPECTED_ERROR_CODE)
+not ok
+#
+## Test group 3.
+##
+## Authenticate using plain X Protocol flows to schame that:
+##
+## * account has permissions
+## * account has not permissions
+#
+connecting...
+active session is now 'non_roo_user'
+Login OK
+closing session non_roo_user
+Mysqlx.Ok {
+  msg: "bye!"
+}
+switched to session default
+connecting...
+active session is now 'non_roo_user'
+Got expected error: Access denied for user 'user_with_access_to_ydb'@'%' to database 'xdb' (code 1044)
+aborting session non_roo_user
+switched to session default
+Mysqlx.Ok {
+  msg: "bye!"
+}
+#
+## Cleanup
+#
+DROP USER 'user_with_access_to_xdb'@'%';
+DROP USER 'user_with_access_to_ydb'@'%';
+DROP DATABASE xdb;
+DROP DATABASE ydb;
+UNINSTALL PLUGIN mysqlx;
diff --git a/rapid/plugin/x/tests/mtr/r/connection_yassl.result b/rapid/plugin/x/tests/mtr/r/connection_yassl.result
deleted file mode 100644
index d252fe8a3dc0..000000000000
--- a/rapid/plugin/x/tests/mtr/r/connection_yassl.result
+++ /dev/null
@@ -1,919 +0,0 @@
-Preamble
-install plugin mysqlx soname "mysqlx.so";
-call mtr.add_suppression("Plugin mysqlx reported: .Failed at SSL configuration: .SSL context is not usable without certificate and private key..");
-call mtr.add_suppression("Plugin mysqlx reported: .SSL_CTX_load_verify_locations failed.");
-SET GLOBAL mysqlx_connect_timeout = 300;
-call mtr.add_suppression("Unsuccessful login attempt");
-send Mysqlx.Connection.CapabilitiesGet {
-}
-
-Mysqlx.Connection.Capabilities {
-  capabilities {
-    name: "tls"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-  capabilities {
-    name: "authentication.mechanisms"
-    value {
-      type: ARRAY
-      array {
-        value {
-          type: SCALAR
-          scalar {
-            type: V_STRING
-            v_string {
-              value: "MYSQL41"
-            }
-          }
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "doc.formats"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "text"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "node_type"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "mysql"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "client.pwd_expire_ok"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_BOOL
-          v_bool: true
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Ok {
-}
-
-Enable SSL
-send Mysqlx.Connection.CapabilitiesGet {
-}
-
-Mysqlx.Connection.Capabilities {
-  capabilities {
-    name: "tls"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: true
-      }
-    }
-  }
-  capabilities {
-    name: "authentication.mechanisms"
-    value {
-      type: ARRAY
-      array {
-        value {
-          type: SCALAR
-          scalar {
-            type: V_STRING
-            v_string {
-              value: "MYSQL41"
-            }
-          }
-        }
-        value {
-          type: SCALAR
-          scalar {
-            type: V_STRING
-            v_string {
-              value: "PLAIN"
-            }
-          }
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "doc.formats"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "text"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "node_type"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "mysql"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "client.pwd_expire_ok"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-}
-
-ok
-setting read/write  tls param with possible invalid data types V_SINT,V_UINT ,V_NULL,V_OCTETS ,V_DOUBLE,V_FLOAT,V_STRING types instead of Bool
-send Mysqlx.Connection.CapabilitiesGet {
-}
-
-Mysqlx.Connection.Capabilities {
-  capabilities {
-    name: "tls"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-  capabilities {
-    name: "authentication.mechanisms"
-    value {
-      type: ARRAY
-      array {
-        value {
-          type: SCALAR
-          scalar {
-            type: V_STRING
-            v_string {
-              value: "MYSQL41"
-            }
-          }
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "doc.formats"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "text"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "node_type"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "mysql"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "client.pwd_expire_ok"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_BOOL
-          v_bool: false
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_NULL
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_OCTETS
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_UINT
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_SINT
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-ok
-setting read/write  tls param with possible invalid data types V_SINT,V_UINT ,V_NULL,V_OCTETS ,V_DOUBLE,V_FLOAT,V_STRING types instead of Bool
-send Mysqlx.Connection.CapabilitiesGet {
-}
-
-Mysqlx.Connection.Capabilities {
-  capabilities {
-    name: "tls"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-  capabilities {
-    name: "authentication.mechanisms"
-    value {
-      type: ARRAY
-      array {
-        value {
-          type: SCALAR
-          scalar {
-            type: V_STRING
-            v_string {
-              value: "MYSQL41"
-            }
-          }
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "doc.formats"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "text"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "node_type"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_STRING
-        v_string {
-          value: "mysql"
-        }
-      }
-    }
-  }
-  capabilities {
-    name: "client.pwd_expire_ok"
-    value {
-      type: SCALAR
-      scalar {
-        type: V_BOOL
-        v_bool: false
-      }
-    }
-  }
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_BOOL
-          v_bool: false
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_NULL
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_OCTETS
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_UINT
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-send Mysqlx.Connection.CapabilitiesSet {
-  capabilities {
-    capabilities {
-      name: "tls"
-      value {
-        type: SCALAR
-        scalar {
-          type: V_SINT
-        }
-      }
-    }
-  }
-}
-
-Mysqlx.Error {
-  severity: ERROR
-  code: 5001
-  msg: "Capability prepare failed for \'tls\'"
-  sql_state: "HY000"
-}
-
-ok
-Cleanup
-SET GLOBAL mysqlx_connect_timeout = 300;
-
-
-## SSL connection testing
-RUN CREATE USER user1_mysqlx@localhost
-            IDENTIFIED WITH 'mysql_native_password' BY 'auth_string1'
-
-0 rows affected
-RUN CREATE USER user2_mysqlx@localhost
-            IDENTIFIED WITH 'mysql_native_password' BY 'auth_string2'
-            PASSWORD EXPIRE
-
-0 rows affected
-RUN CREATE USER user3_mysqlx@localhost
-IDENTIFIED WITH 'mysql_native_password' BY 'auth_string3'
-REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
-SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client"
-ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA"
-PASSWORD EXPIRE NEVER
-
-0 rows affected
-RUN CREATE USER user4_mysqlx@localhost REQUIRE SSL ACCOUNT LOCK
-
-0 rows affected
-RUN CREATE USER user5_mysqlx@localhost
-            IDENTIFIED WITH 'mysql_native_password' BY 'auth_string'
-            REQUIRE SSL
-
-0 rows affected
-RUN CREATE USER user6_mysqlx@localhost
-            IDENTIFIED WITH 'mysql_native_password' BY 'dwh@#ghd'
-            REQUIRE x509
-
-0 rows affected
-RUN CREATE USER user7_mysqlx@localhost
-            IDENTIFIED WITH 'mysql_native_password' BY ''
-            REQUIRE CIPHER "AES256-SHA"
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user1_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user2_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user3_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user4_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user5_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user6_mysqlx@localhost
-
-0 rows affected
-RUN GRANT ALL ON *.* TO user7_mysqlx@localhost
-
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-TCP/IP
-0 rows affected
-RUN SELECT USER()
-USER()
-user1_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-Application terminated with expected error: Your password has expired. To log in you must change it using a client that supports expired passwords. (code 1045)
-not ok
-NOTICE: Account password expired
-RUN ALTER USER USER() IDENTIFIED BY 'alter-new-auth'
-
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-ALTER USER user2_mysqlx@localhost PASSWORD EXPIRE;
-NOTICE: Account password expired
-RUN SET PASSWORD='set-new-auth'
-
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN ALTER USER USER() IDENTIFIED BY 'alter-new-auth'
-
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-ALTER USER user2_mysqlx@localhost PASSWORD EXPIRE;
-NOTICE: Account password expired
-RUN SET PASSWORD='set-new-auth'
-
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user2_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user3_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-Testing conenction for ACCOUNT LOCK user.
-Application terminated with expected error: Account is locked. (code 1045)
-not ok
-Unlocking user account.
-ALTER USER user4_mysqlx@localhost ACCOUNT UNLOCK;
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user4_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user5_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user5_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user6_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-Application terminated with expected error: Current account requires TLS to be activate. (code 1045)
-not ok
-Application terminated with expected error: Current account requires TLS to be activate. (code 1045)
-not ok
-Application terminated with expected error: Current user cipher isn't allowed. (code 1045)
-not ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-user7_mysqlx@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-Cert needed
-Application terminated with expected error: Current account requires TLS to be activate. (code 1045)
-not ok
-SHOW GLOBAL STATUS WHERE `Variable_name` RLIKE '^Mysqlx_ssl_(cipher_list|ctx_verify_(depth|mode)|server_not_(after|before)|verify_(depth|mode))$';
-Variable_name	Value
-Mysqlx_ssl_cipher_list	
-Mysqlx_ssl_ctx_verify_depth	0
-Mysqlx_ssl_ctx_verify_mode	0
-Mysqlx_ssl_server_not_after	Dec  1 04:48:40 2029 GMT
-Mysqlx_ssl_server_not_before	Dec  5 04:48:40 2014 GMT
-Mysqlx_ssl_verify_depth	
-Mysqlx_ssl_verify_mode	
-RUN SHOW STATUS WHERE `Variable_name` RLIKE '^Mysqlx_ssl_(cipher_list|ctx_verify_(depth|mode)|server_not_(after|before)|verify_(depth|mode))$'
-Variable_name	Value
-Mysqlx_ssl_cipher_list	DHE-RSA-AES256-SHA:AES256-SHA
-Mysqlx_ssl_ctx_verify_depth	0
-Mysqlx_ssl_ctx_verify_mode	0
-Mysqlx_ssl_server_not_after	Dec  1 04:48:40 2029 GMT
-Mysqlx_ssl_server_not_before	Dec  5 04:48:40 2014 GMT
-Mysqlx_ssl_verify_depth	0
-Mysqlx_ssl_verify_mode	0
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-call mtr.add_suppression("Plugin mysqlx reported: '.+: Unsuccessful login attempt: Secure transport required. To log in you must use TCP.SSL or UNIX socket connection.");
-SET GLOBAL require_secure_transport:=1;
-Application terminated with expected error: Secure transport required. To log in you must use TCP+SSL or UNIX socket connection. (code 1045)
-not ok
-RUN SELECT CONNECTION_TYPE from performance_schema.threads where processlist_command='Query'
-CONNECTION_TYPE
-SSL/TLS
-0 rows affected
-RUN SELECT USER()
-USER()
-root@localhost
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_version'
-Variable_name	Value
-Mysqlx_ssl_version	TLSv1
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_accepts'
-Variable_name	Value
-Mysqlx_ssl_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_finished_accepts'
-Variable_name	Value
-Mysqlx_ssl_finished_accepts	0
-0 rows affected
-RUN SHOW STATUS LIKE 'Mysqlx_ssl_cipher'
-Variable_name	Value
-Mysqlx_ssl_cipher	DHE-RSA-AES256-SHA
-0 rows affected
-Mysqlx.Ok {
-  msg: "bye!"
-}
-ok
-SET GLOBAL require_secure_transport:=0;
-UNINSTALL PLUGIN mysqlx;
-SHOW STATUS LIKE 'mysqlx%';
-Variable_name	Value
-DROP USER user1_mysqlx@localhost, user2_mysqlx@localhost, user3_mysqlx@localhost,
-user4_mysqlx@localhost, user5_mysqlx@localhost, user6_mysqlx@localhost,
-user7_mysqlx@localhost;
diff --git a/rapid/plugin/x/tests/mtr/r/crud_doc_criteria_args.result b/rapid/plugin/x/tests/mtr/r/crud_doc_criteria_args.result
index 921f543fe028..3a06a21899a4 100644
--- a/rapid/plugin/x/tests/mtr/r/crud_doc_criteria_args.result
+++ b/rapid/plugin/x/tests/mtr/r/crud_doc_criteria_args.result
@@ -1145,7 +1145,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN SELECT * FROM xtest.mycoll
 doc	_id
 {"_id": "1", "name": "watermelon_replace", "amount": null}	1
diff --git a/rapid/plugin/x/tests/mtr/r/crud_table_criteria_args.result b/rapid/plugin/x/tests/mtr/r/crud_table_criteria_args.result
index 8dd39b0d552d..e142b55b3d91 100644
--- a/rapid/plugin/x/tests/mtr/r/crud_table_criteria_args.result
+++ b/rapid/plugin/x/tests/mtr/r/crud_table_criteria_args.result
@@ -911,7 +911,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN SELECT * FROM xtest.mytable ORDER BY price
 id	name	price	info
 1	banana	null	{"color": "yellow", "third": 3, "fourth": "four"}
diff --git a/rapid/plugin/x/tests/mtr/r/crud_update_table_json.result b/rapid/plugin/x/tests/mtr/r/crud_update_table_json.result
index ee279e447914..cf1fa02f1bdc 100644
--- a/rapid/plugin/x/tests/mtr/r/crud_update_table_json.result
+++ b/rapid/plugin/x/tests/mtr/r/crud_update_table_json.result
@@ -259,7 +259,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN SELECT * FROM xtest.xtable
 xfield
 {"first": 1, "third": 3, "fourth": "four", "second": "two"}
diff --git a/rapid/plugin/x/tests/mtr/r/delete_crud_o.result b/rapid/plugin/x/tests/mtr/r/delete_crud_o.result
index aa1135b85a8d..b0c92a38a991 100644
--- a/rapid/plugin/x/tests/mtr/r/delete_crud_o.result
+++ b/rapid/plugin/x/tests/mtr/r/delete_crud_o.result
@@ -244,7 +244,7 @@ send Mysqlx.Crud.Delete {
 Mysqlx.Error {
   severity: ERROR
   code: 1175
-  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column"
+  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. "
   sql_state: "HY000"
 }
 
@@ -306,7 +306,7 @@ send Mysqlx.Crud.Delete {
 Mysqlx.Error {
   severity: ERROR
   code: 1175
-  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column"
+  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. "
   sql_state: "HY000"
 }
 
@@ -341,7 +341,7 @@ send Mysqlx.Crud.Delete {
 Mysqlx.Error {
   severity: ERROR
   code: 1175
-  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column"
+  msg: "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. "
   sql_state: "HY000"
 }
 
diff --git a/rapid/plugin/x/tests/mtr/r/delete_sql_o.result b/rapid/plugin/x/tests/mtr/r/delete_sql_o.result
index c91b60e32592..fabbc52b75f9 100644
--- a/rapid/plugin/x/tests/mtr/r/delete_sql_o.result
+++ b/rapid/plugin/x/tests/mtr/r/delete_sql_o.result
@@ -71,20 +71,20 @@ RUN DELETE FROM ExtraCategoryInfo WHERE ExtraCategoryInfoID = 1
 1 rows affected
 RUN DELETE FROM ExtraCategoryInfo WHERE MainParentCategoryName = 'People'
 While executing DELETE FROM ExtraCategoryInfo WHERE MainParentCategoryName = 'People':
-Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column (code 1175)
+Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column.  (code 1175)
 RUN DELETE FROM ExtraCategoryInfo WHERE MainParentCategoryName = 'House' AND CategoryID in (4)
 While executing DELETE FROM ExtraCategoryInfo WHERE MainParentCategoryName = 'House' AND CategoryID in (4):
-Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column (code 1175)
+Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column.  (code 1175)
 RUN DELETE FROM Categories WHERE CategoryIMEI = 1
 While executing DELETE FROM Categories WHERE CategoryIMEI = 1:
-Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column (code 1175)
+Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column.  (code 1175)
 RUN DELETE FROM ExtraCategoryInfo WHERE EXISTS 
   (SELECT * FROM Categories WHERE Categories.CategoryID = ExtraCategoryInfo.CategoryID 
   AND ExtraCategoryInfo.MainParentCategoryName = 'People' )
 While executing DELETE FROM ExtraCategoryInfo WHERE EXISTS 
   (SELECT * FROM Categories WHERE Categories.CategoryID = ExtraCategoryInfo.CategoryID 
   AND ExtraCategoryInfo.MainParentCategoryName = 'People' ):
-Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column (code 1175)
+Got expected error: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column.  (code 1175)
 RUN SELECT * FROM ExtraCategoryInfo
 ExtraCategoryInfoID	CategoryID	MainParentCategoryName
 3	2	House
diff --git a/rapid/plugin/x/tests/mtr/r/insert_crud_o.result b/rapid/plugin/x/tests/mtr/r/insert_crud_o.result
index 68edf5c03ee7..0cd289666a20 100644
--- a/rapid/plugin/x/tests/mtr/r/insert_crud_o.result
+++ b/rapid/plugin/x/tests/mtr/r/insert_crud_o.result
@@ -1467,7 +1467,7 @@ send Mysqlx.Crud.Insert {
   }
 }
 
-Got expected error: Invalid JSON text: "Missing a comma or '}' after an object member." at position 99 in value for column 'main_collection.doc'. (code 3140)
+Got expected error: Invalid JSON text: "Missing a comma or '}' after an object member." at position 98 in value for column 'main_collection.doc'. (code 3140)
 ================================================================================
 CLEAN UP
 ================================================================================
diff --git a/rapid/plugin/x/tests/mtr/r/mysqlxtest_help.result b/rapid/plugin/x/tests/mtr/r/mysqlxtest_help.result
index cfd022b42302..6e1f718eb215 100644
--- a/rapid/plugin/x/tests/mtr/r/mysqlxtest_help.result
+++ b/rapid/plugin/x/tests/mtr/r/mysqlxtest_help.result
@@ -2,11 +2,12 @@
 ############################################################
 ## Test mysqlxtest executable help printout
 ##
-mysqlxtest <options>
+mysqlxtest <options> [SCHEMA]
 Options:
 -f, --file=<file>     Reads input from file
 -I, --import=<dir>    Reads macro files from dir; required by -->import
 --sql=<SQL>           Use SQL as input and execute it like in -->sql block
+-e=<SQL>, --execute=<SQL> Aliases for "--sql" option
 -n, --no-auth         Skip authentication which is required by -->sql block (run mode)
 --plain-auth          Use PLAIN text authentication mechanism
 -u, --user=<user>     Connection user
diff --git a/rapid/plugin/x/tests/mtr/r/performance_schema.result b/rapid/plugin/x/tests/mtr/r/performance_schema.result
index 91b24448da41..fa6b899c87df 100644
--- a/rapid/plugin/x/tests/mtr/r/performance_schema.result
+++ b/rapid/plugin/x/tests/mtr/r/performance_schema.result
@@ -301,8 +301,8 @@ command ok
 1
 0 rows affected
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR
-null	21b6affb55f3e69c598b47257f4d0ec6	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
-null	f29eded39dd5fa102f18987679dd0c14	SELECT ? 	1
+null	3d4fc22e33e10d7235eced3c75a84c2c	SELECT ? 	1
+null	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
 0 rows affected
 Mysqlx.Ok {
   msg: "bye!"
diff --git a/rapid/plugin/x/tests/mtr/r/update_crud_itemmerge_o.result b/rapid/plugin/x/tests/mtr/r/update_crud_itemmerge_o.result
index 68c6b55ac27f..b2019df64ae0 100644
--- a/rapid/plugin/x/tests/mtr/r/update_crud_itemmerge_o.result
+++ b/rapid/plugin/x/tests/mtr/r/update_crud_itemmerge_o.result
@@ -90,7 +90,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic"], "amount": [4.99], "last_name": ["Otero", "Ote"]}	1
@@ -146,7 +148,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic"], "amount": [4.99], "last_name": ["Otero", "Ote"], "reference": "from Mexico"}	1
@@ -202,7 +206,9 @@ send Mysqlx.Crud.Update {
 
 
 2 rows affected
-Rows matched: 2  Changed: 2  Warnings: 0
+Rows matched: 2  Changed: 2  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic"], "amount": [4.99], "last_name": ["Otero", "Ote"], "reference": "from Mexico"}	1
@@ -258,7 +264,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2"], "amount": [4.99], "last_name": ["Otero", "Ote"], "reference": "from Mexico", "applied_operator": "< with id 2"}	1
@@ -314,7 +322,9 @@ send Mysqlx.Crud.Update {
 
 
 2 rows affected
-Rows matched: 2  Changed: 2  Warnings: 0
+Rows matched: 2  Changed: 2  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99], "last_name": ["Otero", "Ote"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -370,7 +380,9 @@ send Mysqlx.Crud.Update {
 
 
 3 rows affected
-Rows matched: 3  Changed: 3  Warnings: 0
+Rows matched: 3  Changed: 3  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99], "last_name": ["Otero", "Ote"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -426,7 +438,9 @@ send Mysqlx.Crud.Update {
 
 
 4 rows affected
-Rows matched: 4  Changed: 4  Warnings: 0
+Rows matched: 4  Changed: 4  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99, 24.8752643], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -482,7 +496,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99, 24.8752643], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -538,7 +554,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99, 24.8752643], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -606,7 +624,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99, 24.8752643], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -674,7 +694,9 @@ send Mysqlx.Crud.Update {
 
 
 2 rows affected
-Rows matched: 2  Changed: 2  Warnings: 0
+Rows matched: 2  Changed: 2  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2"], "amount": [4.99, 24.8752643, 9876.543], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -730,7 +752,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2", 199896], "amount": [4.99, 24.8752643, 9876.543], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -789,7 +813,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN select * from maincoll
 doc	_id
 {"_id": "1", "name": ["Victor", "Vic", "< with id 2", "<= with id 2", 199896], "amount": [4.99, 24.8752643, 9876.543, 452.253], "last_name": ["Otero", "Ote", "!= 4"], "reference": "from Mexico", "applied_operator": ["< with id 2", "<= with id 2"]}	1
@@ -856,7 +882,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 RUN COMMIT
 
 0 rows affected
@@ -967,7 +995,7 @@ send Mysqlx.Crud.Update {
   }
 }
 
-Got expected error: Invalid JSON text in argument 2 to function json_merge: "Missing a comma or '}' after an object member." at position 26. (code 3141)
+Got expected error: Invalid JSON text in argument 2 to function json_merge_preserve: "Missing a comma or '}' after an object member." at position 26. (code 3141)
 Update with item_merge with } missing at the start
 send Mysqlx.Crud.Update {
   collection {
@@ -1013,7 +1041,7 @@ send Mysqlx.Crud.Update {
   }
 }
 
-Got expected error: Invalid JSON text in argument 2 to function json_merge: "The document root must not follow by other values." at position 11. (code 3141)
+Got expected error: Invalid JSON text in argument 2 to function json_merge_preserve: "The document root must not be followed by other values." at position 11. (code 3141)
 Update with missing comma
 send Mysqlx.Crud.Update {
   collection {
@@ -1059,7 +1087,7 @@ send Mysqlx.Crud.Update {
   }
 }
 
-Got expected error: Invalid JSON text in argument 2 to function json_merge: "Missing a comma or '}' after an object member." at position 19. (code 3141)
+Got expected error: Invalid JSON text in argument 2 to function json_merge_preserve: "Missing a comma or '}' after an object member." at position 18. (code 3141)
 ================================================================================
 CLEAN UP
 ================================================================================
diff --git a/rapid/plugin/x/tests/mtr/r/update_doc.result b/rapid/plugin/x/tests/mtr/r/update_doc.result
index 7a0acc74f9e5..cc0f39874775 100644
--- a/rapid/plugin/x/tests/mtr/r/update_doc.result
+++ b/rapid/plugin/x/tests/mtr/r/update_doc.result
@@ -1369,7 +1369,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 Doc: Set item and merge with another document
 send Mysqlx.Crud.Update {
   collection {
@@ -1434,7 +1436,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 Doc: Merge with another document and set item
 send Mysqlx.Crud.Update {
   collection {
@@ -1499,7 +1503,9 @@ send Mysqlx.Crud.Update {
 
 
 1 rows affected
-Rows matched: 1  Changed: 1  Warnings: 0
+Rows matched: 1  Changed: 1  Warnings: 1
+Warnings generated:
+WARNING | 1287 | 'JSON_MERGE' is deprecated and will be removed in a future release. Please use JSON_MERGE_PRESERVE/JSON_MERGE_PATCH instead
 Doc: merge with NULL
 send Mysqlx.Crud.Update {
   collection {
diff --git a/rapid/plugin/x/tests/mtr/t/connection.test b/rapid/plugin/x/tests/mtr/t/connection.test
index a9801d4cd87e..0e720887dbc8 100644
--- a/rapid/plugin/x/tests/mtr/t/connection.test
+++ b/rapid/plugin/x/tests/mtr/t/connection.test
@@ -77,7 +77,7 @@ EOF
 --write_file $MYSQL_TMP_DIR/mysqlx-connection_session_track.tmp
 -->sql
 SET @@session.session_track_system_variables='mysqlx_port,mysqlx_idle_worker_thread_timeout,mysqlx_max_allowed_packet,mysqlx_max_connections,mysqlx_min_worker_threads';
-show variables like '%track%';
+show variables like '%session_track%';
 -->endsql
 
 -->stmtsql uninstall plugin mysqlx;
@@ -789,6 +789,10 @@ drop user con1@localhost;
 drop user con2@localhost;
 drop user mysqlcon1@localhost;
 drop user mysqlcon2@localhost;
+drop user ''@localhost;
+drop user special@localhost;
+drop user session@localhost;
+
 show status like 'Mysqlx_connections_closed';
 show status like 'Mysqlx_connections_accepted';
 show status like 'Mysqlx_connection_accept_errors';
diff --git a/rapid/plugin/x/tests/mtr/t/connection_default_schema.test b/rapid/plugin/x/tests/mtr/t/connection_default_schema.test
new file mode 100644
index 000000000000..6bcead71bc23
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/t/connection_default_schema.test
@@ -0,0 +1,110 @@
+--echo #
+--echo ## Preamble
+--echo #
+--source ../include/xplugin_preamble.inc
+
+--echo #
+--echo ## Testcase prepare
+--echo #
+
+--write_file $MYSQL_TMP_DIR/connection_default_schema_manual.tmp
+
+-->newsession non_roo_user	-
+-->login user_with_access_to_ydb		ydb
+-->closesession
+
+-->newsession non_roo_user	-
+-->expecterror ER_DBACCESS_DENIED_ERROR
+-->login user_with_access_to_ydb		xdb
+-->closesession abort
+
+EOF
+
+call mtr.add_suppression("Plugin mysqlx reported: '.*: Unsuccessful login attempt");
+
+CREATE DATABASE xdb;
+CREATE DATABASE ydb;
+
+CREATE USER 'user_with_access_to_xdb'@'%';
+CREATE USER 'user_with_access_to_ydb'@'%';
+
+GRANT SELECT ON xdb.* TO 'user_with_access_to_xdb'@'%';
+GRANT SELECT ON ydb.* TO 'user_with_access_to_ydb'@'%';
+
+
+--echo #
+--echo ## Testcase execute
+--echo #
+
+--echo #
+--echo ## Test group 1.
+--echo ##
+--echo ## Authenticate using an account which has permissions
+--echo ## to selected schema.
+--echo #
+--echo
+--echo # Using MySQL client
+let $execute_command=$MYSQL;
+let $user=user_with_access_to_xdb;
+let $schema=xdb;
+--source ../include/connection_default_schema.inc
+
+--echo
+--echo # Using mysqlxtest
+let $execute_command=$MYSQLXTEST;
+let $user=user_with_access_to_xdb;
+let $schema=xdb;
+--source ../include/connection_default_schema.inc
+
+
+--echo #
+--echo ## Test group 2.
+--echo ##
+--echo ## Authenticate using an account which has not permissions
+--echo ## to selected schema.
+--echo #
+
+--echo
+--echo # Using MySQL client
+let $execute_command=$MYSQL;
+let $user=user_with_access_to_xdb;
+let $schema=ydb;
+let $expect_error=ERROR 1044 ;
+--source ../include/connection_default_schema.inc
+
+--echo
+--echo # Using mysqlxtest
+let $execute_command=$MYSQLXTEST;
+let $user=user_with_access_to_xdb;
+let $schema=ydb;
+let $expect_error=code 1044;
+--source ../include/connection_default_schema.inc
+
+
+--echo #
+--echo ## Test group 3.
+--echo ##
+--echo ## Authenticate using plain X Protocol flows to schame that:
+--echo ##
+--echo ## * account has permissions
+--echo ## * account has not permissions
+--echo #
+
+exec $MYSQLXTEST
+  -uroot
+  -f $MYSQL_TMP_DIR/connection_default_schema_manual.tmp;
+
+
+--echo #
+--echo ## Cleanup
+--echo #
+
+--remove_file $MYSQL_TMP_DIR/connection_default_schema_manual.tmp
+
+DROP USER 'user_with_access_to_xdb'@'%';
+DROP USER 'user_with_access_to_ydb'@'%';
+
+DROP DATABASE xdb;
+DROP DATABASE ydb;
+
+UNINSTALL PLUGIN mysqlx;
diff --git a/rapid/plugin/x/tests/mtr/t/connection_expired_certs.cnf b/rapid/plugin/x/tests/mtr/t/connection_expired_certs.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/t/connection_expired_certs.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/rapid/plugin/x/tests/mtr/t/connection_openssl.cnf b/rapid/plugin/x/tests/mtr/t/connection_openssl.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/t/connection_openssl.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/rapid/plugin/x/tests/mtr/t/connection_openssl.test b/rapid/plugin/x/tests/mtr/t/connection_openssl.test
index 7ff6c6d2ee12..be875d6d5a6d 100644
--- a/rapid/plugin/x/tests/mtr/t/connection_openssl.test
+++ b/rapid/plugin/x/tests/mtr/t/connection_openssl.test
@@ -1,10 +1,2 @@
-
 --source include/have_ssl.inc
---source include/have_not_yassl.inc
-
-## Result files for openssl and yassl are different
-#1) yassl instead TLS1.1 prints TLS1
-#2) yassl SSL context counters (GLOBAL status variables) are always 0
-#3) other cipher list than openssl
- 
 --source  ../include/connection_ssl.inc
diff --git a/rapid/plugin/x/tests/mtr/t/connection_tls_version.cnf b/rapid/plugin/x/tests/mtr/t/connection_tls_version.cnf
new file mode 100644
index 000000000000..a4a875bfee1c
--- /dev/null
+++ b/rapid/plugin/x/tests/mtr/t/connection_tls_version.cnf
@@ -0,0 +1,3 @@
+!include include/default_my.cnf
+[ENV]
+OPENSSL_CONF=@env.OPENSSL3_LEGACY_TLS_CNF
diff --git a/rapid/plugin/x/tests/mtr/t/connection_tls_version.test b/rapid/plugin/x/tests/mtr/t/connection_tls_version.test
index 187affffc007..84d51e58b3dc 100644
--- a/rapid/plugin/x/tests/mtr/t/connection_tls_version.test
+++ b/rapid/plugin/x/tests/mtr/t/connection_tls_version.test
@@ -30,8 +30,8 @@ EOF
 --exec $MYSQLXTEST -uroot --file=$xtest_file 2>&1
 
 --let $XTESTPARAMS= -u user5_mysqlx --password='auth_string' --file=$xtest_file --ssl-cipher='DHE-RSA-AES256-SHA'
---let $ERROR1= /in main, line 0:ERROR: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: protocol version mismatch/
---let $ERROR5= /in main, line 0:ERROR: error:00000005:lib\(0\):func\(0\):DH lib/Application terminated with expected error: socket layer receive error/
+--let $ERROR1= /in main, line 0:ERROR: error:00000001:lib\(0\):.*:reason\(1\)/Application terminated with expected error: protocol version mismatch/
+--let $ERROR5= /in main, line 0:ERROR: error:00000005:lib\(0\):.*:DH lib/Application terminated with expected error: socket layer receive error/ /in main, line 0:ERROR: error:00000001:lib\(0\):.*:reason\(1\)/Application terminated with expected error: socket layer receive error/
 
 --exec $MYSQLXTEST                                     $XTESTPARAMS 2>&1
 --exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
diff --git a/rapid/plugin/x/tests/mtr/t/connection_yassl.test b/rapid/plugin/x/tests/mtr/t/connection_yassl.test
deleted file mode 100644
index 56fa5d140494..000000000000
--- a/rapid/plugin/x/tests/mtr/t/connection_yassl.test
+++ /dev/null
@@ -1,10 +0,0 @@
-
---source include/have_ssl.inc
---source include/have_yassl.inc
-
-## Result files for openssl and yassl are different
-#1) yassl instead TLS1.1 prints TLS1
-#2) yassl SSL context counters (GLOBAL status variables) are always 0
-#3) other cipher list than openssl
- 
---source  ../include/connection_ssl.inc
diff --git a/rapid/plugin/x/tests/mtr/t/create_index_crud.test b/rapid/plugin/x/tests/mtr/t/create_index_crud.test
index 8e9a10597a47..bb4c8b860c68 100644
--- a/rapid/plugin/x/tests/mtr/t/create_index_crud.test
+++ b/rapid/plugin/x/tests/mtr/t/create_index_crud.test
@@ -667,7 +667,7 @@ Mysqlx.Sql.StmtExecute {
 }
 -->recv
 
--- testcase for https://jira.oraclecorp.com/jira/browse/MYP-287
+-- testcase for JIRA issue MYP-287
 -->sql
 #DELETE FROM xplugintest.table2;
 TRUNCATE xplugintest.table2;
@@ -739,7 +739,7 @@ Mysqlx.Sql.StmtExecute {
 -->recv
 
 -->echo Create index on two fields
--- should create second virtual column for F2 as required is true now! (MYP-325)
+-- should create second virtual column for F2 as required is true now! (JIRA issue MYP-325)
 Mysqlx.Sql.StmtExecute {
   stmt: "create_collection_index"
   args {
@@ -831,7 +831,7 @@ Mysqlx.Sql.StmtExecute {
 
 -->recv
 
--- testcase for https://jira.oraclecorp.com/jira/browse/MYP-290
+-- testcase for JIRA issue MYP-290
 -->sql
 #DELETE FROM xplugintest.table2;
 TRUNCATE xplugintest.table2;
@@ -1020,7 +1020,7 @@ Mysqlx.Sql.StmtExecute {
 -->callmacro Create_index	IX10	$.b\\')) virtual not null; drop database xplugintest; alter table table3 add column x int GENERATED ALWAYS AS (JSON_EXTRACT(doc, \\'$.c
 -->callmacro Create_index	IX11	$.`b))` virtual not null; drop database xplugintest; alter table table3 add column x int GENERATED ALWAYS AS (JSON_EXTRACT(doc, $.`c`
 
--- Testing very long document path cases https://jira.oraclecorp.com/jira/browse/MY-204
+-- Testing very long document path cases (JIRA issue MYP-204)
 
 -->echo Document path 2k long
 -->callmacro Create_index	IXLong1	$.a0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678
@@ -1029,7 +1029,7 @@ Mysqlx.Sql.StmtExecute {
 SHOW CREATE TABLE xplugintest.table3;
 -->endsql
 
--- Testing many multi-field indexes https://jira.oraclecorp.com/jira/browse/MYP-337
+-- Testing many multi-field indexes JIRA issue MYP-337
 
 
 -->sql
diff --git a/rapid/unittest/gunit/CMakeLists.txt b/rapid/unittest/gunit/CMakeLists.txt
index 303b4701238e..ed124c5151a2 100644
--- a/rapid/unittest/gunit/CMakeLists.txt
+++ b/rapid/unittest/gunit/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/rapid/unittest/gunit/group_replication/CMakeLists.txt b/rapid/unittest/gunit/group_replication/CMakeLists.txt
index 7beca11f9803..a8a44a5c038d 100644
--- a/rapid/unittest/gunit/group_replication/CMakeLists.txt
+++ b/rapid/unittest/gunit/group_replication/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -42,10 +49,5 @@ FOREACH(test ${TESTS})
   ADD_EXECUTABLE(${test}-t ${test}-t.cc)
   TARGET_LINK_LIBRARIES(${test}-t gr_unit_test_resource)
   TARGET_LINK_LIBRARIES(${test}-t gunit_small)
-  # mysys_ssl/libmysys_ssl.a already includes SSL objects on Solaris
-  IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    TARGET_LINK_LIBRARIES(${test}-t mysqlclient)
-  ENDIF()
   ADD_TEST(${test} ${test}-t)
 ENDFOREACH()
-
diff --git a/rapid/unittest/gunit/group_replication/group_replication_compatibility_module-t.cc b/rapid/unittest/gunit/group_replication/group_replication_compatibility_module-t.cc
index 7c64b2b8aaba..bf38e781b3dd 100644
--- a/rapid/unittest/gunit/group_replication/group_replication_compatibility_module-t.cc
+++ b/rapid/unittest/gunit/group_replication/group_replication_compatibility_module-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -49,7 +56,7 @@ TEST_F(CompatibilityModuleTest, CheckCompatibleBySameVersion)
   Member_version member1(0x010203); //version: 1.2.3
 
   //Both members have the same version
-  Compatibility_type ret= module->check_incompatibility(*local_version, member1);
+  Compatibility_type ret= module->check_incompatibility(*local_version, member1, true);
 
   ASSERT_EQ(COMPATIBLE, ret);
 }
@@ -70,7 +77,21 @@ TEST_F(CompatibilityModuleTest, AddIncompatibilityAndFailByIt)
   module->add_incompatibility(member1, member2);
 
   //The rule forces the members to be incompatible
-  Compatibility_type ret= module->check_incompatibility(member1, member2);
+  Compatibility_type ret= module->check_incompatibility(member1, member2, true);
+
+  ASSERT_EQ(INCOMPATIBLE, ret);
+
+  Member_version member3(0x020203); //version: 2.2.3
+  Member_version min_range(0x020200); //version: 2.2.0
+  Member_version max_range(0x020205); //version: 2.2.5
+  //Add rule 1.2.3 is incompatible with version range 2.2.0 - 2.2.5
+  module->add_incompatibility(member1, min_range, max_range);
+
+  //The rule forces the members to be incompatible
+  //Member 1 is also INCOMPATIBLE_LOWER_VERSION with Member 3.
+  //INCOMPATIBLE is returned due to rule, version is not checked.
+  //Rule takes precedence over version.
+  ret= module->check_incompatibility(member1, member3, true);
 
   ASSERT_EQ(INCOMPATIBLE, ret);
 }
@@ -86,35 +107,35 @@ TEST_F(CompatibilityModuleTest, AddIncompatibilityRangeAndFailByIt)
   Member_version member2(0x010204);
 
   //The rule forces the members to be incompatible
-  Compatibility_type ret= module->check_incompatibility(member1, member2);
+  Compatibility_type ret= module->check_incompatibility(member1, member2, true);
 
   ASSERT_EQ(INCOMPATIBLE, ret);
 
   Member_version member3(0x010201);
 
   //The rule forces the members to be incompatible
-  ret= module->check_incompatibility(member1, member3);
+  ret= module->check_incompatibility(member1, member3, true);
 
   ASSERT_EQ(INCOMPATIBLE, ret);
 
   Member_version member4(0x010202);
 
   //The rule forces the members to be incompatible
-  ret= module->check_incompatibility(member1, member4);
+  ret= module->check_incompatibility(member1, member4, true);
 
   ASSERT_EQ(INCOMPATIBLE, ret);
 
   Member_version member5(0x010200);
 
   //The rule does not forces the members to be incompatible
-  ret= module->check_incompatibility(member1, member5);
+  ret= module->check_incompatibility(member1, member5, true);
 
   ASSERT_EQ(COMPATIBLE, ret);
 
   Member_version member6(0x010206);
 
   //The rule does not forces the members to be incompatible
-  ret= module->check_incompatibility(member1, member6);
+  ret= module->check_incompatibility(member1, member6, true);
 
   ASSERT_EQ(COMPATIBLE, ret);
 }
@@ -125,7 +146,7 @@ TEST_F(CompatibilityModuleTest, ReadCompatibility)
   Member_version member2(0x020204); //version: 2.2.4
 
   //Member 2 has a higher major version so it is read compatible
-  Compatibility_type ret= module->check_incompatibility(member2, member1);
+  Compatibility_type ret= module->check_incompatibility(member2, member1, true);
 
   ASSERT_EQ(READ_COMPATIBLE, ret);
 }
@@ -136,7 +157,20 @@ TEST_F(CompatibilityModuleTest, Incompatibility)
   Member_version member2(0x010204); //version: 1.2.4
 
   //Both members have the same major/minor version, so they are compatible
-  Compatibility_type ret= module->check_incompatibility(member1, member2);
+  Compatibility_type ret= module->check_incompatibility(member1, member2, true);
+
+  ASSERT_EQ(COMPATIBLE, ret);
+
+  Member_version member3(0x020203); //version: 2.2.3
+
+  //Member1 has lower major version then Member3 so it INCOMPATIBLE
+  ret= module->check_incompatibility(member1, member3, true);
+
+  ASSERT_EQ(INCOMPATIBLE_LOWER_VERSION, ret);
+
+  //Member1 has lower major version then Member3.
+  //Check is not done since do_version_check is false. COMPATIBLE is returned
+  ret= module->check_incompatibility(member1, member3, false);
 
   ASSERT_EQ(COMPATIBLE, ret);
 }
diff --git a/rapid/unittest/gunit/group_replication/group_replication_member_info-t.cc b/rapid/unittest/gunit/group_replication/group_replication_member_info-t.cc
index b89396b91da1..6d12d0841028 100644
--- a/rapid/unittest/gunit/group_replication/group_replication_member_info-t.cc
+++ b/rapid/unittest/gunit/group_replication/group_replication_member_info-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,6 +47,7 @@ class ClusterMemberInfoTest : public ::testing::Test
     uint port= 4444;
     uint plugin_version= 0x000400;
     uint write_set_algorithm= 1;
+    uint lower_case_table_names= 0;
     string executed_gtid("aaaa:1-10");
     string retrieved_gtid("bbbb:1-10");
     ulonglong gtid_assignment_block_size= 9223372036854775807ULL;
@@ -61,7 +69,7 @@ class ClusterMemberInfoTest : public ::testing::Test
                                       Group_member_info::MEMBER_ROLE_PRIMARY,
                                       in_primary_mode,
                                       has_enforces_update_everywhere_checks,
-                                      member_weight);
+                                      member_weight, lower_case_table_names);
     local_node->update_gtid_sets(executed_gtid,retrieved_gtid);
   }
 
@@ -122,6 +130,7 @@ class ClusterMemberInfoManagerTest : public ::testing::Test
     string uuid("8d7r947c-dr4a-17i3-59d1-f01faf1kkc44");
     uint port= 4444;
     uint write_set_algorithm= 1;
+    uint lower_case_table_names= 0;
     uint plugin_version= 0x000400;
     gcs_member_id= new Gcs_member_identifier("stuff");
     ulonglong gtid_assignment_block_size= 9223372036854775807ULL;
@@ -141,7 +150,7 @@ class ClusterMemberInfoManagerTest : public ::testing::Test
                                       Group_member_info::MEMBER_ROLE_SECONDARY,
                                       in_primary_mode,
                                       has_enforces_update_everywhere_checks,
-                                      member_weight);
+                                      member_weight, lower_case_table_names);
 
     cluster_member_mgr= new Group_member_info_manager(local_node);
   }
@@ -165,6 +174,7 @@ TEST_F(ClusterMemberInfoManagerTest, GetLocalInfoByUUIDTest)
   string uuid("781f947c-db4a-22e3-99d4-f01faf1a1c44");
   uint port= 4444;
   uint write_set_algorithm= 1;
+  uint lower_case_table_names= 0;
   uint plugin_version= 0x000400;
   Gcs_member_identifier gcs_member_id("another_stuff");
   string executed_gtid("aaaa:1-11");
@@ -189,7 +199,8 @@ TEST_F(ClusterMemberInfoManagerTest, GetLocalInfoByUUIDTest)
                                                        Group_member_info::MEMBER_ROLE_PRIMARY,
                                                        in_primary_mode,
                                                        has_enforces_update_everywhere_checks,
-                                                       member_weight);
+                                                       member_weight,
+                                                       lower_case_table_names);
   new_member->update_gtid_sets(executed_gtid,retrieved_gtid);
 
   cluster_member_mgr->add(new_member);
@@ -329,6 +340,7 @@ TEST_F(ClusterMemberInfoManagerTest, EncodeDecodeLargeSets)
   string uuid("781f947c-db4a-22e3-99d4-f01faf1a1c44");
   uint port= 4444;
   uint write_set_algorithm= 1;
+  uint lower_case_table_names= 0;
   uint plugin_version= 0x000400;
   Gcs_member_identifier gcs_member_id("another_stuff");
   string executed_gtid("aaaa:1-11:12-14:16-20:22-30");
@@ -354,7 +366,8 @@ TEST_F(ClusterMemberInfoManagerTest, EncodeDecodeLargeSets)
                                                        Group_member_info::MEMBER_ROLE_PRIMARY,
                                                        in_primary_mode,
                                                        has_enforces_update_everywhere_checks,
-                                                       member_weight);
+                                                       member_weight,
+                                                       lower_case_table_names);
   new_member->update_gtid_sets(executed_gtid,retrieved_gtid);
 
   cluster_member_mgr->add(new_member);
@@ -427,6 +440,8 @@ TEST_F(ClusterMemberInfoManagerTest, EncodeDecodeLargeSets)
             retrieved_local_info->get_role());
   ASSERT_EQ(local_node->get_member_weight(),
             retrieved_local_info->get_member_weight());
+  ASSERT_EQ(local_node->get_lower_case_table_names(),
+            retrieved_local_info->get_lower_case_table_names());
 
   delete retrieved_local_info;
 }
diff --git a/rapid/unittest/gunit/group_replication/group_replication_member_version-t.cc b/rapid/unittest/gunit/group_replication/group_replication_member_version-t.cc
index 3923464fc7e5..61009aed1df8 100644
--- a/rapid/unittest/gunit/group_replication/group_replication_member_version-t.cc
+++ b/rapid/unittest/gunit/group_replication/group_replication_member_version-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/CMakeLists.txt b/rapid/unittest/gunit/xplugin/CMakeLists.txt
index 3980a86892ce..64e9a9564ae9 100644
--- a/rapid/unittest/gunit/xplugin/CMakeLists.txt
+++ b/rapid/unittest/gunit/xplugin/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -17,6 +24,8 @@ IF(NOT GMOCK_FOUND)
   RETURN()
 ENDIF()
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 IF(SSL_DEFINES)
   ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
@@ -31,6 +40,16 @@ MYSQLX_PROTOBUF_GENERATE_CPP_NAMES(protobuf_SRC ${PROTOBUF_MYSQLX_FILES})
 
 IF(MSVC)
   ADD_COMPILE_FLAGS(${protobuf_SRC} COMPILE_FLAGS "/wd4018")
+  DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+    "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc")
+ELSE()
+  # DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS macro does not work in this
+  # directory when using GCC 4.4.7 compiler.
+  MY_CHECK_CXX_COMPILER_FLAG("-Wno-deprecated-declarations"
+    HAVE_NO_DEPRECATED_DECLARATIONS)
+  IF(HAVE_NO_DEPRECATED_DECLARATIONS)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+  ENDIF()
 ENDIF(MSVC)
 
 # Turn off some warning flags when compiling GUnit and proto files.
@@ -60,14 +79,19 @@ IF(HAVE_NO_IGNORED_QUALIFIERS)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-ignored-qualifiers")
 ENDIF()
 
-
-ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO -DXPLUGIN_UNIT_TESTS)
+ADD_DEFINITIONS(
+  ${GMOCK_CFLAGS}
+  -DBOOST_ALL_NO_LIB
+  -DBOOST_NO_AUTO_PTR
+  -DUSE_MYSQLX_FULL_PROTO
+  -DXPLUGIN_UNIT_TESTS
+)
 
 INCLUDE_DIRECTORIES(SYSTEM
     ${BOOST_INCLUDE_DIR}
     ${PROTOBUF_INCLUDE_DIRS}
     ${SSL_INCLUDE_DIRS}
-    ${LIBEVENT_INCLUDE_DIR}
+    ${LIBEVENT_INCLUDE_DIRS}
     ${GMOCK_INCLUDE_DIRS}
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_BINARY_DIR}/rapid/plugin/x/generated/protobuf
@@ -100,6 +124,11 @@ FILE(
   "${CMAKE_CURRENT_SOURCE_DIR}/mysqlx_pb_wrapper.cc"
   "${PROJECT_SOURCE_DIR}/rapid/plugin/x/src/mysql_function_names.cc"
   "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysqlx_row.cc"
+  "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc"
+  "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc"
+  "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysqlx_resultset.cc"
+  "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/password_hasher.cc"
+  "${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlxtest_src/mysql41_hash.cc"
 )
 
 # boost::shared_ptr depends on scoped_lock
@@ -139,8 +168,9 @@ TARGET_LINK_LIBRARIES(
   regex
   gmock
   mysqlservices
+  ${FORCE_SSL_SOLARIS}
   mysqlclient
-  ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES}
+  ${LIBEVENT_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARY}
   ${GCOV_LDFLAGS}
diff --git a/rapid/unittest/gunit/xplugin/admin_cmd_arguments_object_t.cc b/rapid/unittest/gunit/xplugin/admin_cmd_arguments_object_t.cc
index 726f6d25f2dc..6258197efcd4 100644
--- a/rapid/unittest/gunit/xplugin/admin_cmd_arguments_object_t.cc
+++ b/rapid/unittest/gunit/xplugin/admin_cmd_arguments_object_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/callback_command_delegate_t.cc b/rapid/unittest/gunit/xplugin/callback_command_delegate_t.cc
index 63eac2482f7c..de33b183b799 100644
--- a/rapid/unittest/gunit/xplugin/callback_command_delegate_t.cc
+++ b/rapid/unittest/gunit/xplugin/callback_command_delegate_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/capabilities_configurator_t.cc b/rapid/unittest/gunit/xplugin/capabilities_configurator_t.cc
index 2988224f997d..7295097a5ee7 100644
--- a/rapid/unittest/gunit/xplugin/capabilities_configurator_t.cc
+++ b/rapid/unittest/gunit/xplugin/capabilities_configurator_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/capabilities_handlers_t.cc b/rapid/unittest/gunit/xplugin/capabilities_handlers_t.cc
index 94a885d2e39d..5cb65f366681 100644
--- a/rapid/unittest/gunit/xplugin/capabilities_handlers_t.cc
+++ b/rapid/unittest/gunit/xplugin/capabilities_handlers_t.cc
@@ -1,14 +1,21 @@
 
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/crud_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/crud_statement_builder_t.cc
index b5c9d4356f64..0409bf750a93 100644
--- a/rapid/unittest/gunit/xplugin/crud_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/crud_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/delete_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/delete_statement_builder_t.cc
index c1086cd51fb8..afb31c66af3c 100644
--- a/rapid/unittest/gunit/xplugin/delete_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/delete_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/expect_noerror_t.cc b/rapid/unittest/gunit/xplugin/expect_noerror_t.cc
index 076f85ac35fe..89e8ae491463 100644
--- a/rapid/unittest/gunit/xplugin/expect_noerror_t.cc
+++ b/rapid/unittest/gunit/xplugin/expect_noerror_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/expr_generator_t.cc b/rapid/unittest/gunit/xplugin/expr_generator_t.cc
index cf3eae5bebb7..f068de6f4627 100644
--- a/rapid/unittest/gunit/xplugin/expr_generator_t.cc
+++ b/rapid/unittest/gunit/xplugin/expr_generator_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/find_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/find_statement_builder_t.cc
index d7d79a10aa0b..8982e02295cd 100644
--- a/rapid/unittest/gunit/xplugin/find_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/find_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/getter_any_t.cc b/rapid/unittest/gunit/xplugin/getter_any_t.cc
index 7fd357a72ed9..6c9d89e7944f 100644
--- a/rapid/unittest/gunit/xplugin/getter_any_t.cc
+++ b/rapid/unittest/gunit/xplugin/getter_any_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/insert_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/insert_statement_builder_t.cc
index a0cdbc4de478..e527d6ea1710 100644
--- a/rapid/unittest/gunit/xplugin/insert_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/insert_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/listener_tcp_t.cc b/rapid/unittest/gunit/xplugin/listener_tcp_t.cc
index a1592f9d031c..089df85e6716 100644
--- a/rapid/unittest/gunit/xplugin/listener_tcp_t.cc
+++ b/rapid/unittest/gunit/xplugin/listener_tcp_t.cc
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -178,7 +184,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_does_nothing_when_resolve_failes)
       _,
       _)).WillOnce(Return(POSIX_FAILURE));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -201,7 +207,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_does_resolved_IP6_and_IP4_localhos
       _,
       _)).WillOnce(Return(POSIX_FAILURE));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -218,7 +224,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_does_resolved_IP4_localhost_when_a
       _,
       _)).WillOnce(Return(POSIX_FAILURE));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -261,7 +267,7 @@ TEST_P(Listener_tcp_retry_testsuite, setup_listener_retry_socket_allocation_when
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -294,7 +300,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_bind_failure) {
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -321,7 +327,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_listen_failure) {
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 }
 
@@ -341,7 +347,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_ipv6_success) {
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -365,7 +371,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_ipv4_success) {
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -390,7 +396,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_failure_when_socket_event_registry
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 
   // SUT destructor
@@ -416,7 +422,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_ipv4_and_ip6_addresses_successful_
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai4));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -443,7 +449,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_ipv4_and_ip6_addresses_successful_
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai4));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -482,7 +488,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_ipv4_and_ip6_addresses_successful_
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai4));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -507,7 +513,7 @@ TEST_F(Listener_tcp_testsuite, setup_listener_success_evean_socket_opt_fails) {
 
   EXPECT_CALL(*m_mock_system, freeaddrinfo(&ai));
 
-  ASSERT_TRUE(sut->setup_listener(NULL));
+  ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
   // SUT destructor
@@ -533,7 +539,7 @@ TEST_F(Listener_tcp_testsuite, close_listener_does_nothing_when_socket_not_start
   sut->close_listener();
 
   //After stopping, start must not work !
-  sut->setup_listener(NULL);
+  sut->setup_listener(ngs::Listener_interface::On_connection());
 }
 
 TEST_F(Listener_tcp_testsuite, loop_does_nothing_always) {
diff --git a/rapid/unittest/gunit/xplugin/listener_unix_socket_t.cc b/rapid/unittest/gunit/xplugin/listener_unix_socket_t.cc
index ffd45597fecb..ca0558133003 100644
--- a/rapid/unittest/gunit/xplugin/listener_unix_socket_t.cc
+++ b/rapid/unittest/gunit/xplugin/listener_unix_socket_t.cc
@@ -1,16 +1,22 @@
 
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
@@ -107,7 +113,7 @@ class Listener_unix_socket_testsuite : public Test {
     ngs::Socket_interface::Shared_ptr socket = m_mock_socket;
     EXPECT_CALL(m_mock_socket_events, listen(socket, _)).WillOnce(Return(true));
 
-    ASSERT_TRUE(sut->setup_listener(NULL));
+    ASSERT_TRUE(sut->setup_listener(ngs::Listener_interface::On_connection()));
     ASSERT_TRUE(sut->get_state().is(ngs::State_listener_prepared));
 
     ASSERT_NO_FATAL_FAILURE(assert_and_clear_mocks());
@@ -141,7 +147,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_try_to_create_empty_unixsocket
 
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -153,7 +159,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_try_to_create_unixsocket_with_
 
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -167,7 +173,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_cant_create_a_lockfile) {
   EXPECT_CALL(*m_mock_system, get_pid()).WillOnce(Return(CURRENT_PID));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -183,7 +189,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_cant_open_existing_lockfile) {
   EXPECT_CALL(*m_mock_system, get_errno()).WillOnce(Return(EEXIST));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -200,7 +206,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_cant_read_existing_lockfile) {
   EXPECT_CALL(*m_mock_file, read(_,_)).WillOnce(Return(READ_ERR));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -218,7 +224,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_read_empty_lockfile) {
   EXPECT_CALL(*m_mock_file, close()).WillOnce(Return(0));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -236,7 +242,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_read_not_x_plugin_lockfile) {
   EXPECT_CALL(*m_mock_file, close()).WillOnce(Return(CLOSE_OK));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -260,7 +266,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_read_x_plugin_lockfile_but_can
   EXPECT_CALL(*m_mock_file, close()).WillOnce(Return(CLOSE_OK));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -284,7 +290,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_read_x_plugin_lockfile_same_pr
   EXPECT_CALL(*m_mock_system, unlink(StrEq(UNIX_SOCKET_LOCK_FILE))).WillOnce(Return(UNLINK_ERR));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -298,7 +304,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_write_x_plugin_lockfile_failed
   EXPECT_CALL(*m_mock_file,    write(_, _)).WillOnce(Return(WRITE_ERR));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -314,7 +320,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_fsync_x_plugin_lockfile_failed
   EXPECT_CALL(*m_mock_file,    fsync()).WillOnce(Return(FSYNC_ERR));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -331,7 +337,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_close_x_plugin_lockfile_failed
   EXPECT_CALL(*m_mock_file,    close()).WillOnce(Return(CLOSE_ERR));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -344,7 +350,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_create_socket_failed) {
   EXPECT_CALL(*m_mock_system, get_socket_error_and_message(_, _));
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -364,7 +370,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_listen_failed) {
   EXPECT_CALL(*m_mock_socket, close()).Times(2); // first call in setup_listener
                                                  // second call in SUT destructor
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
@@ -385,7 +391,7 @@ TEST_F(Listener_unix_socket_testsuite, unixsocket_event_regiester_failure) {
   ngs::Socket_interface::Shared_ptr socket = m_mock_socket;
   EXPECT_CALL(m_mock_socket_events, listen(socket, _)).WillOnce(Return(false));
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 
   // In SUT destructor
@@ -419,7 +425,7 @@ TEST_F(Listener_unix_socket_testsuite, unix_socket_unsupported) {
 
   EXPECT_CALL(*m_mock_socket_invalid, close());
 
-  ASSERT_FALSE(sut->setup_listener(NULL));
+  ASSERT_FALSE(sut->setup_listener(ngs::Listener_interface::On_connection()));
   ASSERT_TRUE(sut->get_state().is(ngs::State_listener_initializing));
 #endif
 }
diff --git a/rapid/unittest/gunit/xplugin/message_builder_t.cc b/rapid/unittest/gunit/xplugin/message_builder_t.cc
index 10c365680743..03045d193839 100644
--- a/rapid/unittest/gunit/xplugin/message_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/message_builder_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mock/capabilities.h b/rapid/unittest/gunit/xplugin/mock/capabilities.h
index 3cfbd6c0a4ad..1bf35f620a2f 100644
--- a/rapid/unittest/gunit/xplugin/mock/capabilities.h
+++ b/rapid/unittest/gunit/xplugin/mock/capabilities.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mock/ngs_general.h b/rapid/unittest/gunit/xplugin/mock/ngs_general.h
index 18fff552ecd2..2444e0781f94 100644
--- a/rapid/unittest/gunit/xplugin/mock/ngs_general.h
+++ b/rapid/unittest/gunit/xplugin/mock/ngs_general.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mock/session.h b/rapid/unittest/gunit/xplugin/mock/session.h
index 322e30457816..59ada10203b3 100644
--- a/rapid/unittest/gunit/xplugin/mock/session.h
+++ b/rapid/unittest/gunit/xplugin/mock/session.h
@@ -1,15 +1,21 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mysql_function_names_t.cc b/rapid/unittest/gunit/xplugin/mysql_function_names_t.cc
index 98029e021ed7..f789ac362278 100644
--- a/rapid/unittest/gunit/xplugin/mysql_function_names_t.cc
+++ b/rapid/unittest/gunit/xplugin/mysql_function_names_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.cc b/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.cc
index 54c90658336a..4441ca2a282d 100644
--- a/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.cc
+++ b/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.h b/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.h
index 7d04869ac44a..4be6852bf3db 100644
--- a/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.h
+++ b/rapid/unittest/gunit/xplugin/mysqlx_pb_wrapper.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/mysqlx_protocol_t.cc b/rapid/unittest/gunit/xplugin/mysqlx_protocol_t.cc
new file mode 100644
index 000000000000..d07c7c78d8a7
--- /dev/null
+++ b/rapid/unittest/gunit/xplugin/mysqlx_protocol_t.cc
@@ -0,0 +1,54 @@
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+
+#include <gtest/gtest.h>
+
+#include "mysqlx_protocol.h"
+
+
+namespace test
+{
+
+TEST(mysqlx_protocol, receive_invalid_message)
+{
+  const std::size_t empty_payload_length = 0;
+
+  mysqlx::XProtocol protocol(
+      mysqlx::Ssl_config(),
+      0,     // timeout
+      false, // dont_wait_for_disconnect
+      mysqlx::IP_any);
+
+  /*
+   Mysqlx::Notice::Frame message has one or more required fields.
+   Reception of message with empty payload, fails the check for
+   required fields which is thrown below as mysqlx::Error.
+   */
+  EXPECT_THROW(
+      protocol.recv_payload(
+          Mysqlx::ServerMessages_Type_NOTICE,
+          empty_payload_length),
+      mysqlx::Error);
+}
+
+} // namespace test
diff --git a/rapid/unittest/gunit/xplugin/obuffer_t.cc b/rapid/unittest/gunit/xplugin/obuffer_t.cc
index 46349329ed9b..efd4bca4b400 100644
--- a/rapid/unittest/gunit/xplugin/obuffer_t.cc
+++ b/rapid/unittest/gunit/xplugin/obuffer_t.cc
@@ -1,14 +1,21 @@
 
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/protobuf_message.h b/rapid/unittest/gunit/xplugin/protobuf_message.h
index 6f94f824a5a3..84132ddd85f1 100644
--- a/rapid/unittest/gunit/xplugin/protobuf_message.h
+++ b/rapid/unittest/gunit/xplugin/protobuf_message.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/query_string_builder_t.cc b/rapid/unittest/gunit/xplugin/query_string_builder_t.cc
index b91f0a93801a..ac7fd46b3156 100644
--- a/rapid/unittest/gunit/xplugin/query_string_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/query_string_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/row_builder_t.cc b/rapid/unittest/gunit/xplugin/row_builder_t.cc
index 30cbc360f7d3..b7089870dfd3 100644
--- a/rapid/unittest/gunit/xplugin/row_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/row_builder_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/sasl_authentication_t.cc b/rapid/unittest/gunit/xplugin/sasl_authentication_t.cc
index 42f4f4f1ecc3..bd41c3608020 100644
--- a/rapid/unittest/gunit/xplugin/sasl_authentication_t.cc
+++ b/rapid/unittest/gunit/xplugin/sasl_authentication_t.cc
@@ -1,14 +1,21 @@
 
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/scheduler_t.cc b/rapid/unittest/gunit/xplugin/scheduler_t.cc
index 55c63a9a17cc..a28807ea7aff 100644
--- a/rapid/unittest/gunit/xplugin/scheduler_t.cc
+++ b/rapid/unittest/gunit/xplugin/scheduler_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/server_client_timeout_t.cc b/rapid/unittest/gunit/xplugin/server_client_timeout_t.cc
index ccb40b560a24..317854202991 100644
--- a/rapid/unittest/gunit/xplugin/server_client_timeout_t.cc
+++ b/rapid/unittest/gunit/xplugin/server_client_timeout_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/stubs/command_service.cc b/rapid/unittest/gunit/xplugin/stubs/command_service.cc
index c94047741267..b359e6c17ae3 100644
--- a/rapid/unittest/gunit/xplugin/stubs/command_service.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/command_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,7 +35,7 @@ extern "C" {
                                 enum cs_text_or_binary text_or_binary,
                                 void * service_callbacks_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
diff --git a/rapid/unittest/gunit/xplugin/stubs/log_subsystem.cc b/rapid/unittest/gunit/xplugin/stubs/log_subsystem.cc
index ef5a7fab4816..5e13d2d5fc4d 100644
--- a/rapid/unittest/gunit/xplugin/stubs/log_subsystem.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/log_subsystem.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/stubs/misc.cc b/rapid/unittest/gunit/xplugin/stubs/misc.cc
index 9bc7bc5ee2d5..bc23e09c59cf 100644
--- a/rapid/unittest/gunit/xplugin/stubs/misc.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/misc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +64,7 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
                 char **hostname,
                 uint *connect_errors)
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 1;
 }
 
diff --git a/rapid/unittest/gunit/xplugin/stubs/plugin.cc b/rapid/unittest/gunit/xplugin/stubs/plugin.cc
index e5ae8be6eac2..fa194635671a 100644
--- a/rapid/unittest/gunit/xplugin/stubs/plugin.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/plugin.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/stubs/security_context_service.cc b/rapid/unittest/gunit/xplugin/stubs/security_context_service.cc
index 1dca9fe74fc5..e11c514f747d 100644
--- a/rapid/unittest/gunit/xplugin/stubs/security_context_service.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/security_context_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,31 +31,31 @@ extern "C" {
 
   my_svc_bool thd_get_security_context(MYSQL_THD, MYSQL_SECURITY_CONTEXT *out_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool thd_set_security_context(MYSQL_THD, MYSQL_SECURITY_CONTEXT in_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool security_context_create(MYSQL_SECURITY_CONTEXT *out_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool security_context_destroy(MYSQL_SECURITY_CONTEXT ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool security_context_copy(MYSQL_SECURITY_CONTEXT in_ctx, MYSQL_SECURITY_CONTEXT *out_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
@@ -56,19 +63,19 @@ extern "C" {
                                       const char *user, const char *host,
                                       const char *ip, const char *db)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool security_context_get_option(MYSQL_SECURITY_CONTEXT, const char *name, void *inout_pvalue)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_svc_bool security_context_set_option(MYSQL_SECURITY_CONTEXT, const char *name, void *pvalue)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
diff --git a/rapid/unittest/gunit/xplugin/stubs/sql_session_service.cc b/rapid/unittest/gunit/xplugin/stubs/sql_session_service.cc
index e03a62112199..9050c5265d54 100644
--- a/rapid/unittest/gunit/xplugin/stubs/sql_session_service.cc
+++ b/rapid/unittest/gunit/xplugin/stubs/sql_session_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,67 +28,67 @@ extern "C" {
 
   int srv_session_init_thread(const void *p)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   void srv_session_deinit_thread()
   {
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   MYSQL_THD srv_session_info_get_thd(MYSQL_SESSION session)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   MYSQL_SESSION srv_session_open(srv_session_error_cb errok_cb,
                                                     void *plugin_ctx)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_close(MYSQL_SESSION session)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_detach(MYSQL_SESSION session)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   my_thread_id srv_session_info_get_session_id(MYSQL_SESSION)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_server_is_available()
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_info_set_client_port(Srv_session *session, uint16_t port)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_info_set_connection_type(Srv_session *session, enum_vio_type type)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 
   int srv_session_info_killed(MYSQL_SESSION)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 #ifdef __cplusplus
diff --git a/rapid/unittest/gunit/xplugin/sync_variable_t.cc b/rapid/unittest/gunit/xplugin/sync_variable_t.cc
index 7d285b784b27..94e370c55235 100644
--- a/rapid/unittest/gunit/xplugin/sync_variable_t.cc
+++ b/rapid/unittest/gunit/xplugin/sync_variable_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/test_main.cc b/rapid/unittest/gunit/xplugin/test_main.cc
index 45af2fbd9fa2..dbccb30258e0 100644
--- a/rapid/unittest/gunit/xplugin/test_main.cc
+++ b/rapid/unittest/gunit/xplugin/test_main.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/update_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/update_statement_builder_t.cc
index a763f88d3ddb..28c3438ebb1b 100644
--- a/rapid/unittest/gunit/xplugin/update_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/update_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/user_verification_helper_t.cc b/rapid/unittest/gunit/xplugin/user_verification_helper_t.cc
index 7f40eb48ae02..d74f140a86b1 100644
--- a/rapid/unittest/gunit/xplugin/user_verification_helper_t.cc
+++ b/rapid/unittest/gunit/xplugin/user_verification_helper_t.cc
@@ -1,14 +1,21 @@
 
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/view_statement_builder_t.cc b/rapid/unittest/gunit/xplugin/view_statement_builder_t.cc
index a72be2fb3234..016b8097b458 100644
--- a/rapid/unittest/gunit/xplugin/view_statement_builder_t.cc
+++ b/rapid/unittest/gunit/xplugin/view_statement_builder_t.cc
@@ -1,14 +1,21 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2.0,
+ * as published by the Free Software Foundation.
+ *
+ * This program is also distributed with certain software (including
+ * but not limited to OpenSSL) that is licensed under separate terms,
+ * as designated in a particular file or component or in included license
+ * documentation.  The authors of MySQL hereby grant you an additional
+ * permission to link the program and your derivative works with the
+ * separately licensed software that they have included with MySQL.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License, version 2.0, for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/rapid/unittest/gunit/xplugin/xdatetime_t.cc b/rapid/unittest/gunit/xplugin/xdatetime_t.cc
index 4ca74c964f5f..c7dd6e22e9fd 100644
--- a/rapid/unittest/gunit/xplugin/xdatetime_t.cc
+++ b/rapid/unittest/gunit/xplugin/xdatetime_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/rapid/unittest/gunit/xplugin/xdecimal_t.cc b/rapid/unittest/gunit/xplugin/xdecimal_t.cc
index be1145027304..a121cf51bbac 100644
--- a/rapid/unittest/gunit/xplugin/xdecimal_t.cc
+++ b/rapid/unittest/gunit/xplugin/xdecimal_t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt
index 5cb31037b6f6..cfd187ee7440 100644
--- a/regex/CMakeLists.txt
+++ b/regex/CMakeLists.txt
@@ -1,20 +1,37 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+MY_CHECK_C_COMPILER_FLAG("-Wstringop-truncation" HAVE_STRINGOP_TRUNCATION)
+IF(HAVE_STRINGOP_TRUNCATION)
+  ADD_COMPILE_FLAGS(
+    main.c
+    COMPILE_FLAGS -Wno-stringop-truncation
+    )
+ENDIF()
+
 SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
 ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
 
diff --git a/regex/main.c b/regex/main.c
index a39d70e0c731..4b2f777ad394 100644
--- a/regex/main.c
+++ b/regex/main.c
@@ -563,7 +563,7 @@ eprint(err)
 int err;
 {
 	static char epbuf[100];
-	size_t len;
+	size_t len MY_ATTRIBUTE((unused));
 
 	len = my_regerror(MY_REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));
 	assert(len <= sizeof(epbuf));
diff --git a/regex/regcomp.c b/regex/regcomp.c
index aedbdb4d407b..f9489831ce34 100644
--- a/regex/regcomp.c
+++ b/regex/regcomp.c
@@ -3,7 +3,7 @@
 
    This file was modified by Oracle on 2015-05-18 for 32-bit compatibility.
 
-   Modifications copyright (c) 2015, Oracle and/or its affiliates. All rights
+   Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights
    reserved. */
 
 #include <my_global.h>
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index de48641571ed..7d882b100b32 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -167,12 +174,6 @@ IF(NOT WITHOUT_SERVER)
   )
 ENDIF()
 
-# TCMalloc hacks
-IF(MALLOC_LIB)
-  MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
-  INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
-ENDIF()
-
 SET(COMPILE_DEFINITIONS_WHITELIST
 )
 
@@ -308,14 +309,6 @@ ENDIF()
 SET(CLIENT_LIBS "")
 SET(LIBS "")
 
-# Avoid compatibility warning about lists with empty elements
-IF(POLICY CMP0011)
-  CMAKE_POLICY(SET CMP0011 NEW)
-ENDIF()
-IF(POLICY CMP0007)
-  CMAKE_POLICY(SET CMP0007 OLD)
-ENDIF()
-
 # Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable
 # returned string in ${var} is can be passed to linker's command line
 MACRO(EXTRACT_LINK_LIBRARIES target var)
@@ -323,17 +316,22 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
     LIST(REMOVE_ITEM ${target}_LIB_DEPENDS "")
     LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
     FOREACH(lib ${${target}_LIB_DEPENDS})
+      # Filter out -limported_openssl and -limported_crypto
       # Filter out "general", it is not a library, just CMake hint
-      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
+      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND
+          NOT lib MATCHES "imported_"
+          )
         IF (lib MATCHES "^\\-l")
-          SET(${var} "${${var}} ${lib} ") 
+          SET(${var} "${${var}} ${lib} ")
+        ELSEIF (lib MATCHES "^\\-L")
+          SET(${var} "${${var}} ${lib} ")
         ELSEIF(lib MATCHES "^/")
           # Full path, convert to just filename, strip "lib" prefix and extension
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-          SET(${var} "${${var}}-l${lib} " ) 
+          SET(${var} "${${var}}-l${lib} " )
         ELSE()
-          SET(${var} "${${var}}-l${lib} " ) 
+          SET(${var} "${${var}}-l${lib} " )
         ENDIF()
       ENDIF()
     ENDFOREACH()
@@ -346,8 +344,15 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
 ENDMACRO()
 
 EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
+IF(SOLARIS AND CMAKE_C_FLAGS MATCHES "-xatomic=gcc")
+  STRING_APPEND(CLIENT_LIBS " -xatomic=gcc")
+ENDIF()
+
 IF(WITH_EMBEDDED_SERVER)
   EXTRACT_LINK_LIBRARIES(mysqlserver EMBEDD_LIBS)
+  IF(SOLARIS AND CMAKE_C_FLAGS MATCHES "-xatomic=gcc")
+    STRING_APPEND(EMBEDD_LIBS " -xatomic=gcc")
+  ENDIF()
 ENDIF()
 
 IF(MSVC)
@@ -476,15 +481,6 @@ ELSE()
       COMPONENT ${${file}_COMPONENT}
      )
   ENDFOREACH()
-  IF(COPY_MYSQL_CONFIG)
-    CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/mysql_config
-       ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_config COPYONLY)
-    INSTALL_SCRIPT(
-      ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_config
-      DESTINATION ${INSTALL_BINDIR}
-      COMPONENT ${mysql_server_config_COMPONENT}
-    )
-  ENDIF()
 
   # Systemd files
   IF(WITH_SYSTEMD)
diff --git a/scripts/comp_sql.c b/scripts/comp_sql.c
index ecba1757ec3d..10171caa7c12 100644
--- a/scripts/comp_sql.c
+++ b/scripts/comp_sql.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -19,6 +26,7 @@
 */
 
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -79,7 +87,8 @@ static void print_query(FILE *out, const char *query)
   fprintf(out, "\"");
   while (*ptr)
   {
-    if (column >= 120)
+    /* utf-8 encoded characters are always >= 0x80 unsigned */
+    if (column >= 120 && (uint8_t)(*ptr) < 0x80)
     {
       /* Wrap to the next line, tabulated. */
       fprintf(out, "\"\n  \"");
diff --git a/scripts/dheadgen.pl b/scripts/dheadgen.pl
index 69ece2e7c81a..65224d17238f 100644
--- a/scripts/dheadgen.pl
+++ b/scripts/dheadgen.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql
index b6c1bd66eed3..8aa13d24c249 100644
--- a/scripts/fill_help_tables.sql
+++ b/scripts/fill_help_tables.sql
@@ -1,14 +1,21 @@
--- Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 -- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
--- 
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/scripts/invoke-with-relative-paths.pl b/scripts/invoke-with-relative-paths.pl
index 97480330b7f7..379c6fd9bb3d 100755
--- a/scripts/invoke-with-relative-paths.pl
+++ b/scripts/invoke-with-relative-paths.pl
@@ -1,15 +1,22 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
index 246b0e000d62..46370bfb0f2d 100644
--- a/scripts/mysql_config.pl.in
+++ b/scripts/mysql_config.pl.in
@@ -1,16 +1,23 @@
 #!@PERL_PATH@
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 93425ea6049a..d165afbd8506 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
-# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/scripts/mysql_security_commands.sql b/scripts/mysql_security_commands.sql
index b7526da34392..8c727acf39a2 100644
--- a/scripts/mysql_security_commands.sql
+++ b/scripts/mysql_security_commands.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/scripts/mysql_sys_schema.sql b/scripts/mysql_sys_schema.sql
index 94ec0d1902ca..b0c2b380cae1 100644
--- a/scripts/mysql_sys_schema.sql
+++ b/scripts/mysql_sys_schema.sql
@@ -1,21 +1,30 @@
--- Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
---
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+-- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 --
--- WARNING: THIS IS A GENERATED FILE, CHANGES NEED TO BE MADE ON THE UPSTREAM MYSQL-SYS REPOSITORY AS WELL
--- PLEASE SUBMIT A PULL REQUEST TO https://github.com/mysql/mysql-sys
+-- WARNING: THIS IS A MANUALLY GENERATED FILE,
+-- CHANGES NEED TO BE MADE IN THE scripts/sys_schema/*.sql FILES.
+--
+-- SEE scripts/sys_schema/generate_sql_file_57.sh TO GENERATE THIS FILE
 --
 
 REPLACE INTO mysql.user VALUES ('localhost','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'mysql_native_password','*THISISNOTAVALIDPASSWORDTHATCANBEUSEDHERE','N',CURRENT_TIMESTAMP,NULL,'Y');
@@ -28,11 +37,15 @@ FLUSH PRIVILEGES;
 
 SET NAMES utf8;
 
+SET @sql_log_bin = @@sql_log_bin;
+
+SET sql_log_bin = 0;
+
 CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8;
 
 USE sys;
 
-CREATE OR REPLACE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW version ( sys_version, mysql_version ) AS  SELECT '1.5.1' AS sys_version,  version() AS mysql_version;
+CREATE OR REPLACE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW version ( sys_version, mysql_version ) AS  SELECT '1.5.2' AS sys_version, version() AS mysql_version;
 
 CREATE TABLE IF NOT EXISTS sys_config ( variable VARCHAR(128) PRIMARY KEY, value VARCHAR(128), set_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, set_by VARCHAR(128) ) ENGINE = InnoDB;
 
@@ -60,7 +73,7 @@ CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_bytes ( bytes TEXT ) RETU
 
 DROP FUNCTION IF EXISTS format_path;
 
-CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_path ( in_path VARCHAR(512) ) RETURNS VARCHAR(512) CHARSET UTF8 COMMENT '\n Description\n \n Takes a raw path value, and strips out the datadir or tmpdir\n replacing with @@datadir and @@tmpdir respectively. \n \n Also normalizes the paths across operating systems, so backslashes\n on Windows are converted to forward slashes\n \n Parameters\n \n path (VARCHAR(512)):\n The raw file path value to format.\n \n Returns\n \n VARCHAR(512) CHARSET UTF8\n \n Example\n \n mysql> select @@datadir;\n +-----------------------------------------------+\n | @@datadir                                     |\n +-----------------------------------------------+\n | /Users/mark/sandboxes/SmallTree/AMaster/data/ |\n +-----------------------------------------------+\n 1 row in set (0.06 sec)\n \n mysql> select format_path(\'/Users/mark/sandboxes/SmallTree/AMaster/data/mysql/proc.MYD\') AS path;\n +--------------------------+\n | path                     |\n +--------------------------+\n | @@datadir/mysql/proc.MYD |\n +--------------------------+\n 1 row in set (0.03 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC NO SQL BEGIN DECLARE v_path VARCHAR(512); DECLARE v_undo_dir VARCHAR(1024);  DECLARE path_separator CHAR(1) DEFAULT '/';  IF @@global.version_compile_os LIKE 'win%' THEN SET path_separator = '\\'; END IF;  IF in_path LIKE '/private/%' THEN SET v_path = REPLACE(in_path, '/private', ''); ELSE SET v_path = in_path; END IF;  SET v_undo_dir = IFNULL((SELECT VARIABLE_VALUE FROM performance_schema.global_variables WHERE VARIABLE_NAME = 'innodb_undo_directory'), '');  IF v_path IS NULL THEN RETURN NULL; ELSEIF v_path LIKE CONCAT(@@global.datadir, IF(SUBSTRING(@@global.datadir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.datadir, CONCAT('@@datadir', IF(SUBSTRING(@@global.datadir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.tmpdir, IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.tmpdir, CONCAT('@@tmpdir', IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.slave_load_tmpdir, IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.slave_load_tmpdir, CONCAT('@@slave_load_tmpdir', IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.innodb_data_home_dir, IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.innodb_data_home_dir, CONCAT('@@innodb_data_home_dir', IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.innodb_log_group_home_dir, IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.innodb_log_group_home_dir, CONCAT('@@innodb_log_group_home_dir', IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(v_undo_dir, IF(SUBSTRING(v_undo_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, v_undo_dir, CONCAT('@@innodb_undo_directory', IF(SUBSTRING(v_undo_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.basedir, IF(SUBSTRING(@@global.basedir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.basedir, CONCAT('@@basedir', IF(SUBSTRING(@@global.basedir, -1) = path_separator, path_separator, ''))); END IF;  RETURN v_path; END;
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_path ( in_path VARCHAR(512) ) RETURNS VARCHAR(512) CHARSET UTF8 COMMENT '\n Description\n \n Takes a raw path value, and strips out the datadir or tmpdir\n replacing with @@datadir and @@tmpdir respectively.\n \n Also normalizes the paths across operating systems, so backslashes\n on Windows are converted to forward slashes\n \n Parameters\n \n path (VARCHAR(512)):\n The raw file path value to format.\n \n Returns\n \n VARCHAR(512) CHARSET UTF8\n \n Example\n \n mysql> select @@datadir;\n +-----------------------------------------------+\n | @@datadir                                     |\n +-----------------------------------------------+\n | /Users/mark/sandboxes/SmallTree/AMaster/data/ |\n +-----------------------------------------------+\n 1 row in set (0.06 sec)\n \n mysql> select format_path(\'/Users/mark/sandboxes/SmallTree/AMaster/data/mysql/proc.MYD\') AS path;\n +--------------------------+\n | path                     |\n +--------------------------+\n | @@datadir/mysql/proc.MYD |\n +--------------------------+\n 1 row in set (0.03 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC NO SQL BEGIN DECLARE v_path VARCHAR(512); DECLARE v_undo_dir VARCHAR(1024);  DECLARE path_separator CHAR(1) DEFAULT '/';  IF @@global.version_compile_os LIKE 'win%' THEN SET path_separator = '\\'; END IF;  IF in_path LIKE '/private/%' THEN SET v_path = REPLACE(in_path, '/private', ''); ELSE SET v_path = in_path; END IF;  SET v_undo_dir = IFNULL((SELECT VARIABLE_VALUE FROM performance_schema.global_variables WHERE VARIABLE_NAME = 'innodb_undo_directory'), '');  IF v_path IS NULL THEN RETURN NULL; ELSEIF v_path LIKE CONCAT(@@global.datadir, IF(SUBSTRING(@@global.datadir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.datadir, CONCAT('@@datadir', IF(SUBSTRING(@@global.datadir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.tmpdir, IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.tmpdir, CONCAT('@@tmpdir', IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.slave_load_tmpdir, IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.slave_load_tmpdir, CONCAT('@@slave_load_tmpdir', IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.innodb_data_home_dir, IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.innodb_data_home_dir, CONCAT('@@innodb_data_home_dir', IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.innodb_log_group_home_dir, IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.innodb_log_group_home_dir, CONCAT('@@innodb_log_group_home_dir', IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(v_undo_dir, IF(SUBSTRING(v_undo_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, v_undo_dir, CONCAT('@@innodb_undo_directory', IF(SUBSTRING(v_undo_dir, -1) = path_separator, path_separator, ''))); ELSEIF v_path LIKE CONCAT(@@global.basedir, IF(SUBSTRING(@@global.basedir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN SET v_path = REPLACE(v_path, @@global.basedir, CONCAT('@@basedir', IF(SUBSTRING(@@global.basedir, -1) = path_separator, path_separator, ''))); END IF;  RETURN v_path; END;
 
 DROP FUNCTION IF EXISTS format_statement;
 
@@ -68,7 +81,7 @@ CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_statement ( statement LON
 
 DROP FUNCTION IF EXISTS format_time;
 
-CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_time ( picoseconds TEXT ) RETURNS TEXT CHARSET UTF8 COMMENT '\n Description\n \n Takes a raw picoseconds value, and converts it to a human readable form.\n \n Picoseconds are the precision that all latency values are printed in \n within Performance Schema, however are not user friendly when wanting\n to scan output from the command line.\n \n Parameters\n \n picoseconds (TEXT): \n The raw picoseconds value to convert.\n \n Returns\n \n TEXT\n \n Example\n \n mysql> select format_time(342342342342345);\n +------------------------------+\n | format_time(342342342342345) |\n +------------------------------+\n | 00:05:42                     |\n +------------------------------+\n 1 row in set (0.00 sec)\n \n mysql> select format_time(342342342);\n +------------------------+\n | format_time(342342342) |\n +------------------------+\n | 342.34 us              |\n +------------------------+\n 1 row in set (0.00 sec)\n \n mysql> select format_time(34234);\n +--------------------+\n | format_time(34234) |\n +--------------------+\n | 34.23 ns           |\n +--------------------+\n 1 row in set (0.00 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC NO SQL BEGIN IF picoseconds IS NULL THEN RETURN NULL; ELSEIF picoseconds >= 604800000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 604800000000000000, 2), ' w'); ELSEIF picoseconds >= 86400000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 86400000000000000, 2), ' d'); ELSEIF picoseconds >= 3600000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 3600000000000000, 2), ' h'); ELSEIF picoseconds >= 60000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 60000000000000, 2), ' m'); ELSEIF picoseconds >= 1000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000000, 2), ' s'); ELSEIF picoseconds >= 1000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000, 2), ' ms'); ELSEIF picoseconds >= 1000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000, 2), ' us'); ELSEIF picoseconds >= 1000 THEN RETURN CONCAT(ROUND(picoseconds / 1000, 2), ' ns'); ELSE RETURN CONCAT(picoseconds, ' ps'); END IF; END;
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_time ( picoseconds TEXT ) RETURNS TEXT CHARSET UTF8 COMMENT '\n Description\n \n Takes a raw picoseconds value, and converts it to a human readable form.\n \n Picoseconds are the precision that all latency values are printed in\n within Performance Schema, however are not user friendly when wanting\n to scan output from the command line.\n \n Parameters\n \n picoseconds (TEXT):\n The raw picoseconds value to convert.\n \n Returns\n \n TEXT\n \n Example\n \n mysql> select format_time(342342342342345);\n +------------------------------+\n | format_time(342342342342345) |\n +------------------------------+\n | 00:05:42                     |\n +------------------------------+\n 1 row in set (0.00 sec)\n \n mysql> select format_time(342342342);\n +------------------------+\n | format_time(342342342) |\n +------------------------+\n | 342.34 us              |\n +------------------------+\n 1 row in set (0.00 sec)\n \n mysql> select format_time(34234);\n +--------------------+\n | format_time(34234) |\n +--------------------+\n | 34.23 ns           |\n +--------------------+\n 1 row in set (0.00 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC NO SQL BEGIN IF picoseconds IS NULL THEN RETURN NULL; ELSEIF picoseconds >= 604800000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 604800000000000000, 2), ' w'); ELSEIF picoseconds >= 86400000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 86400000000000000, 2), ' d'); ELSEIF picoseconds >= 3600000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 3600000000000000, 2), ' h'); ELSEIF picoseconds >= 60000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 60000000000000, 2), ' m'); ELSEIF picoseconds >= 1000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000000, 2), ' s'); ELSEIF picoseconds >= 1000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000, 2), ' ms'); ELSEIF picoseconds >= 1000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000, 2), ' us'); ELSEIF picoseconds >= 1000 THEN RETURN CONCAT(ROUND(picoseconds / 1000, 2), ' ns'); ELSE RETURN CONCAT(picoseconds, ' ps'); END IF; END;
 
 DROP FUNCTION IF EXISTS list_add;
 
@@ -84,7 +97,7 @@ CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_account_enabled ( in_host
 
 DROP FUNCTION IF EXISTS ps_is_consumer_enabled;
 
-CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_consumer_enabled ( in_consumer varchar(64) ) RETURNS enum('YES', 'NO') COMMENT '\n Description\n \n Determines whether a consumer is enabled (taking the consumer hierarchy into consideration)\n within the Performance Schema.\n \n Parameters\n \n in_consumer VARCHAR(64): \n The name of the consumer to check.\n \n Returns\n \n ENUM(\'YES\', \'NO\')\n \n Example\n \n mysql> SELECT sys.ps_is_consumer_enabled(\'events_stages_history\');\n +-----------------------------------------------------+\n | sys.ps_is_consumer_enabled(\'events_stages_history\') |\n +-----------------------------------------------------+\n | NO                                                  |\n +-----------------------------------------------------+\n 1 row in set (0.00 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC  READS SQL DATA  BEGIN RETURN ( SELECT (CASE WHEN c.NAME = 'global_instrumentation' THEN c.ENABLED WHEN c.NAME = 'thread_instrumentation' THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') WHEN c.NAME LIKE '%\_digest'           THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') WHEN c.NAME LIKE '%\_current'          THEN IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') ELSE IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES' AND ( SELECT cc.ENABLED FROM performance_schema.setup_consumers cc WHERE NAME = CONCAT(SUBSTRING_INDEX(c.NAME, '_', 2), '_current') ) = 'YES', 'YES', 'NO') END) AS IsEnabled FROM performance_schema.setup_consumers c INNER JOIN performance_schema.setup_consumers cg INNER JOIN performance_schema.setup_consumers ct WHERE cg.NAME       = 'global_instrumentation' AND ct.NAME   = 'thread_instrumentation' AND c.NAME    = in_consumer ); END;
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_consumer_enabled ( in_consumer varchar(64) ) RETURNS enum('YES', 'NO') COMMENT '\n Description\n \n Determines whether a consumer is enabled (taking the consumer hierarchy into consideration)\n within the Performance Schema.\n \n An exception with errno 3047 is thrown if an unknown consumer name is passed to the function.\n A consumer name of NULL returns NULL.\n \n Parameters\n \n in_consumer VARCHAR(64): \n The name of the consumer to check.\n \n Returns\n \n ENUM(\'YES\', \'NO\')\n \n Example\n \n mysql> SELECT sys.ps_is_consumer_enabled(\'events_stages_history\');\n +-----------------------------------------------------+\n | sys.ps_is_consumer_enabled(\'events_stages_history\') |\n +-----------------------------------------------------+\n | NO                                                  |\n +-----------------------------------------------------+\n 1 row in set (0.00 sec)\n ' SQL SECURITY INVOKER DETERMINISTIC  READS SQL DATA  BEGIN DECLARE v_is_enabled ENUM('YES', 'NO') DEFAULT NULL; DECLARE v_error_msg VARCHAR(128);  IF (in_consumer IS NULL) THEN RETURN NULL; END IF;  SET v_is_enabled = ( SELECT (CASE WHEN c.NAME = 'global_instrumentation' THEN c.ENABLED WHEN c.NAME = 'thread_instrumentation' THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') WHEN c.NAME LIKE '%\_digest'           THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') WHEN c.NAME LIKE '%\_current'          THEN IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO') ELSE IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES' AND ( SELECT cc.ENABLED FROM performance_schema.setup_consumers cc WHERE NAME = CONCAT(SUBSTRING_INDEX(c.NAME, '_', 2), '_current') ) = 'YES', 'YES', 'NO') END) AS IsEnabled FROM performance_schema.setup_consumers c INNER JOIN performance_schema.setup_consumers cg INNER JOIN performance_schema.setup_consumers ct WHERE cg.NAME       = 'global_instrumentation' AND ct.NAME   = 'thread_instrumentation' AND c.NAME    = in_consumer );  IF (v_is_enabled IS NOT NULL) THEN RETURN v_is_enabled; ELSE SET v_error_msg = CONCAT('Invalid argument error: ', in_consumer, ' in function sys.ps_is_consumer_enabled.'); SIGNAL SQLSTATE 'HY000' SET MESSAGE_TEXT = v_error_msg, MYSQL_ERRNO  = 3047; END IF; END;
 
 DROP FUNCTION IF EXISTS ps_is_instrument_default_enabled;
 
@@ -200,9 +213,9 @@ CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SE
 
 CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW x$memory_global_total ( total_allocated ) AS SELECT SUM(CURRENT_NUMBER_OF_BYTES_USED) total_allocated FROM performance_schema.memory_summary_global_by_event_name;
 
-CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW schema_index_statistics ( table_schema, table_name, index_name, rows_selected, select_latency, rows_inserted, insert_latency, rows_updated, update_latency, rows_deleted, delete_latency ) AS SELECT OBJECT_SCHEMA AS table_schema, OBJECT_NAME AS table_name, INDEX_NAME as index_name, COUNT_FETCH AS rows_selected, sys.format_time(SUM_TIMER_FETCH) AS select_latency, COUNT_INSERT AS rows_inserted, sys.format_time(SUM_TIMER_INSERT) AS insert_latency, COUNT_UPDATE AS rows_updated, sys.format_time(SUM_TIMER_UPDATE) AS update_latency, COUNT_DELETE AS rows_deleted, sys.format_time(SUM_TIMER_INSERT) AS delete_latency FROM performance_schema.table_io_waits_summary_by_index_usage WHERE index_name IS NOT NULL ORDER BY sum_timer_wait DESC;
+CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW schema_index_statistics ( table_schema, table_name, index_name, rows_selected, select_latency, rows_inserted, insert_latency, rows_updated, update_latency, rows_deleted, delete_latency ) AS SELECT OBJECT_SCHEMA AS table_schema, OBJECT_NAME AS table_name, INDEX_NAME as index_name, COUNT_FETCH AS rows_selected, sys.format_time(SUM_TIMER_FETCH) AS select_latency, COUNT_INSERT AS rows_inserted, sys.format_time(SUM_TIMER_INSERT) AS insert_latency, COUNT_UPDATE AS rows_updated, sys.format_time(SUM_TIMER_UPDATE) AS update_latency, COUNT_DELETE AS rows_deleted, sys.format_time(SUM_TIMER_DELETE) AS delete_latency FROM performance_schema.table_io_waits_summary_by_index_usage WHERE index_name IS NOT NULL ORDER BY sum_timer_wait DESC;
 
-CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW x$schema_index_statistics ( table_schema, table_name, index_name, rows_selected, select_latency, rows_inserted, insert_latency, rows_updated, update_latency, rows_deleted, delete_latency ) AS SELECT OBJECT_SCHEMA AS table_schema, OBJECT_NAME AS table_name, INDEX_NAME as index_name, COUNT_FETCH AS rows_selected, SUM_TIMER_FETCH AS select_latency, COUNT_INSERT AS rows_inserted, SUM_TIMER_INSERT AS insert_latency, COUNT_UPDATE AS rows_updated, SUM_TIMER_UPDATE AS update_latency, COUNT_DELETE AS rows_deleted, SUM_TIMER_INSERT AS delete_latency FROM performance_schema.table_io_waits_summary_by_index_usage WHERE index_name IS NOT NULL ORDER BY sum_timer_wait DESC;
+CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW x$schema_index_statistics ( table_schema, table_name, index_name, rows_selected, select_latency, rows_inserted, insert_latency, rows_updated, update_latency, rows_deleted, delete_latency ) AS SELECT OBJECT_SCHEMA AS table_schema, OBJECT_NAME AS table_name, INDEX_NAME as index_name, COUNT_FETCH AS rows_selected, SUM_TIMER_FETCH AS select_latency, COUNT_INSERT AS rows_inserted, SUM_TIMER_INSERT AS insert_latency, COUNT_UPDATE AS rows_updated, SUM_TIMER_UPDATE AS update_latency, COUNT_DELETE AS rows_deleted, SUM_TIMER_DELETE AS delete_latency FROM performance_schema.table_io_waits_summary_by_index_usage WHERE index_name IS NOT NULL ORDER BY sum_timer_wait DESC;
 
 CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW x$ps_schema_table_statistics_io ( table_schema, table_name, count_read, sum_number_of_bytes_read, sum_timer_read, count_write, sum_number_of_bytes_write, sum_timer_write, count_misc, sum_timer_misc ) AS SELECT extract_schema_from_file_name(file_name) AS table_schema, extract_table_from_file_name(file_name) AS table_name, SUM(count_read) AS count_read, SUM(sum_number_of_bytes_read) AS sum_number_of_bytes_read, SUM(sum_timer_read) AS sum_timer_read, SUM(count_write) AS count_write, SUM(sum_number_of_bytes_write) AS sum_number_of_bytes_write, SUM(sum_timer_write) AS sum_timer_write, SUM(count_misc) AS count_misc, SUM(sum_timer_misc) AS sum_timer_misc FROM performance_schema.file_summary_by_instance GROUP BY table_schema, table_name;
 
@@ -218,7 +231,7 @@ CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURI
 
 CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW x$schema_tables_with_full_table_scans ( object_schema, object_name, rows_full_scanned, latency ) AS SELECT object_schema,  object_name, count_read AS rows_full_scanned, sum_timer_wait AS latency FROM performance_schema.table_io_waits_summary_by_index_usage  WHERE index_name IS NULL AND count_read > 0 ORDER BY count_read DESC;
 
-CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW schema_unused_indexes ( object_schema, object_name, index_name ) AS SELECT object_schema, object_name, index_name FROM performance_schema.table_io_waits_summary_by_index_usage  WHERE index_name IS NOT NULL AND count_star = 0 AND object_schema != 'mysql' AND index_name != 'PRIMARY' ORDER BY object_schema, object_name;
+CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW schema_unused_indexes ( object_schema, object_name, index_name ) AS SELECT t.object_schema, t.object_name, t.index_name FROM performance_schema.table_io_waits_summary_by_index_usage t INNER JOIN information_schema.statistics s ON t.object_schema = s.table_schema AND t.object_name = s.table_name AND t.index_name = s.index_name WHERE t.index_name IS NOT NULL AND t.count_star = 0 AND t.object_schema != 'mysql' AND t.index_name != 'PRIMARY' AND s.NON_UNIQUE = 1 AND s.SEQ_IN_INDEX = 1 ORDER BY object_schema, object_name;
 
 CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW schema_table_lock_waits ( object_schema, object_name, waiting_thread_id, waiting_pid, waiting_account, waiting_lock_type, waiting_lock_duration, waiting_query, waiting_query_secs, waiting_query_rows_affected, waiting_query_rows_examined, blocking_thread_id, blocking_pid, blocking_account, blocking_lock_type, blocking_lock_duration, sql_kill_blocking_query, sql_kill_blocking_connection ) AS SELECT g.object_schema AS object_schema, g.object_name AS object_name, pt.thread_id AS waiting_thread_id, pt.processlist_id AS waiting_pid, sys.ps_thread_account(p.owner_thread_id) AS waiting_account, p.lock_type AS waiting_lock_type, p.lock_duration AS waiting_lock_duration, sys.format_statement(pt.processlist_info) AS waiting_query, pt.processlist_time AS waiting_query_secs, ps.rows_affected AS waiting_query_rows_affected, ps.rows_examined AS waiting_query_rows_examined, gt.thread_id AS blocking_thread_id, gt.processlist_id AS blocking_pid, sys.ps_thread_account(g.owner_thread_id) AS blocking_account, g.lock_type AS blocking_lock_type, g.lock_duration AS blocking_lock_duration, CONCAT('KILL QUERY ', gt.processlist_id) AS sql_kill_blocking_query, CONCAT('KILL ', gt.processlist_id) AS sql_kill_blocking_connection FROM performance_schema.metadata_locks g INNER JOIN performance_schema.metadata_locks p  ON g.object_type = p.object_type AND g.object_schema = p.object_schema AND g.object_name = p.object_name AND g.lock_status = 'GRANTED' AND p.lock_status = 'PENDING' INNER JOIN performance_schema.threads gt ON g.owner_thread_id = gt.thread_id INNER JOIN performance_schema.threads pt ON p.owner_thread_id = pt.thread_id LEFT JOIN performance_schema.events_statements_current gs ON g.owner_thread_id = gs.thread_id LEFT JOIN performance_schema.events_statements_current ps ON p.owner_thread_id = ps.thread_id WHERE g.object_type = 'TABLE';
 
@@ -322,9 +335,9 @@ CREATE OR REPLACE ALGORITHM = MERGE DEFINER = 'mysql.sys'@'localhost' SQL SECURI
 
 CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW metrics ( Variable_name, Variable_value, Type, Enabled ) AS ( SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value, 'Global Status' AS Type, 'YES' AS Enabled FROM performance_schema.global_status ) UNION ALL ( SELECT NAME AS Variable_name, COUNT AS Variable_value, CONCAT('InnoDB Metrics - ', SUBSYSTEM) AS Type, IF(STATUS = 'enabled', 'YES', 'NO') AS Enabled FROM information_schema.INNODB_METRICS WHERE NAME NOT IN ( 'lock_row_lock_time', 'lock_row_lock_time_avg', 'lock_row_lock_time_max', 'lock_row_lock_waits', 'buffer_pool_reads', 'buffer_pool_read_requests', 'buffer_pool_write_requests', 'buffer_pool_wait_free', 'buffer_pool_read_ahead', 'buffer_pool_read_ahead_evicted', 'buffer_pool_pages_total', 'buffer_pool_pages_misc', 'buffer_pool_pages_data', 'buffer_pool_bytes_data', 'buffer_pool_pages_dirty', 'buffer_pool_bytes_dirty', 'buffer_pool_pages_free', 'buffer_pages_created', 'buffer_pages_written', 'buffer_pages_read', 'buffer_data_reads', 'buffer_data_written', 'file_num_open_files', 'os_log_bytes_written', 'os_log_fsyncs', 'os_log_pending_fsyncs', 'os_log_pending_writes', 'log_waits', 'log_write_requests', 'log_writes', 'innodb_dblwr_writes', 'innodb_dblwr_pages_written', 'innodb_page_size') ) /*!50702 UNION ALL ( SELECT 'memory_current_allocated' AS Variable_name, SUM(CURRENT_NUMBER_OF_BYTES_USED) AS Variable_value, 'Performance Schema' AS Type, IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = 0, 'NO', IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = (SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%'), 'YES', 'PARTIAL')) AS Enabled FROM performance_schema.memory_summary_global_by_event_name ) UNION ALL ( SELECT 'memory_total_allocated' AS Variable_name, SUM(SUM_NUMBER_OF_BYTES_ALLOC) AS Variable_value, 'Performance Schema' AS Type, IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = 0, 'NO', IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = (SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%'), 'YES', 'PARTIAL')) AS Enabled FROM performance_schema.memory_summary_global_by_event_name ) */ UNION ALL ( SELECT 'NOW()' AS Variable_name, NOW(3) AS Variable_value, 'System Time' AS Type, 'YES' AS Enabled ) UNION ALL ( SELECT 'UNIX_TIMESTAMP()' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, 'System Time' AS Type, 'YES' AS Enabled ) ORDER BY Type, Variable_name;
 
-CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER VIEW processlist ( thd_id, conn_id, user, db, command, state, time, current_statement, statement_latency, progress, lock_latency, rows_examined, rows_sent, rows_affected, tmp_tables, tmp_disk_tables, full_scan, last_statement, last_statement_latency, current_memory, last_wait, last_wait_latency, source, trx_latency, trx_state, trx_autocommit, pid, program_name ) AS SELECT pps.thread_id AS thd_id, pps.processlist_id AS conn_id, IF(pps.name = 'thread/sql/one_connection', CONCAT(pps.processlist_user, '@', pps.processlist_host), REPLACE(pps.name, 'thread/', '')) user, pps.processlist_db AS db, pps.processlist_command AS command, pps.processlist_state AS state, pps.processlist_time AS time, sys.format_statement(pps.processlist_info) AS current_statement, IF(esc.end_event_id IS NULL, sys.format_time(esc.timer_wait), NULL) AS statement_latency, IF(esc.end_event_id IS NULL, ROUND(100 * (estc.work_completed / estc.work_estimated), 2), NULL) AS progress, sys.format_time(esc.lock_time) AS lock_latency, esc.rows_examined AS rows_examined, esc.rows_sent AS rows_sent, esc.rows_affected AS rows_affected, esc.created_tmp_tables AS tmp_tables, esc.created_tmp_disk_tables AS tmp_disk_tables, IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan, IF(esc.end_event_id IS NOT NULL, sys.format_statement(esc.sql_text), NULL) AS last_statement, IF(esc.end_event_id IS NOT NULL, sys.format_time(esc.timer_wait), NULL) AS last_statement_latency, sys.format_bytes(mem.current_allocated) AS current_memory, ewc.event_name AS last_wait, IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL, 'Still Waiting', sys.format_time(ewc.timer_wait)) last_wait_latency, ewc.source, sys.format_time(etc.timer_wait) AS trx_latency, etc.state AS trx_state, etc.autocommit AS trx_autocommit, conattr_pid.attr_value as pid, conattr_progname.attr_value as program_name FROM performance_schema.threads AS pps LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id) LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id) LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id) LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id) LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id) LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid' LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name' ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
+CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER VIEW processlist ( thd_id, conn_id, user, db, command, state, time, current_statement, statement_latency, progress, lock_latency, rows_examined, rows_sent, rows_affected, tmp_tables, tmp_disk_tables, full_scan, last_statement, last_statement_latency, current_memory, last_wait, last_wait_latency, source, trx_latency, trx_state, trx_autocommit, pid, program_name ) AS SELECT pps.thread_id AS thd_id, pps.processlist_id AS conn_id, IF(pps.name IN ('thread/sql/one_connection', 'thread/thread_pool/tp_one_connection'), CONCAT(pps.processlist_user, '@', pps.processlist_host), REPLACE(pps.name, 'thread/', '')) user, pps.processlist_db AS db, pps.processlist_command AS command, pps.processlist_state AS state, pps.processlist_time AS time, sys.format_statement(pps.processlist_info) AS current_statement, IF(esc.end_event_id IS NULL, sys.format_time(esc.timer_wait), NULL) AS statement_latency, IF(esc.end_event_id IS NULL, ROUND(100 * (estc.work_completed / estc.work_estimated), 2), NULL) AS progress, sys.format_time(esc.lock_time) AS lock_latency, esc.rows_examined AS rows_examined, esc.rows_sent AS rows_sent, esc.rows_affected AS rows_affected, esc.created_tmp_tables AS tmp_tables, esc.created_tmp_disk_tables AS tmp_disk_tables, IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan, IF(esc.end_event_id IS NOT NULL, sys.format_statement(esc.sql_text), NULL) AS last_statement, IF(esc.end_event_id IS NOT NULL, sys.format_time(esc.timer_wait), NULL) AS last_statement_latency, sys.format_bytes(mem.current_allocated) AS current_memory, ewc.event_name AS last_wait, IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL, 'Still Waiting', sys.format_time(ewc.timer_wait)) last_wait_latency, ewc.source, sys.format_time(etc.timer_wait) AS trx_latency, etc.state AS trx_state, etc.autocommit AS trx_autocommit, conattr_pid.attr_value as pid, conattr_progname.attr_value as program_name FROM performance_schema.threads AS pps LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id) LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id) LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id) LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id) LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id) LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid' LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name' ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
 
-CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER VIEW x$processlist ( thd_id, conn_id, user, db, command, state, time, current_statement, statement_latency, progress, lock_latency, rows_examined, rows_sent, rows_affected, tmp_tables, tmp_disk_tables, full_scan, last_statement, last_statement_latency, current_memory, last_wait, last_wait_latency, source, trx_latency, trx_state, trx_autocommit, pid, program_name ) AS SELECT pps.thread_id AS thd_id, pps.processlist_id AS conn_id, IF(pps.name = 'thread/sql/one_connection', CONCAT(pps.processlist_user, '@', pps.processlist_host), REPLACE(pps.name, 'thread/', '')) user, pps.processlist_db AS db, pps.processlist_command AS command, pps.processlist_state AS state, pps.processlist_time AS time, pps.processlist_info AS current_statement, IF(esc.end_event_id IS NULL, esc.timer_wait, NULL) AS statement_latency, IF(esc.end_event_id IS NULL, ROUND(100 * (estc.work_completed / estc.work_estimated), 2), NULL) AS progress, esc.lock_time AS lock_latency, esc.rows_examined AS rows_examined, esc.rows_sent AS rows_sent, esc.rows_affected AS rows_affected, esc.created_tmp_tables AS tmp_tables, esc.created_tmp_disk_tables AS tmp_disk_tables, IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan, IF(esc.end_event_id IS NOT NULL, esc.sql_text, NULL) AS last_statement, IF(esc.end_event_id IS NOT NULL, esc.timer_wait, NULL) AS last_statement_latency, mem.current_allocated AS current_memory, ewc.event_name AS last_wait, IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL, 'Still Waiting',  ewc.timer_wait) last_wait_latency, ewc.source, etc.timer_wait AS trx_latency, etc.state AS trx_state, etc.autocommit AS trx_autocommit, conattr_pid.attr_value as pid, conattr_progname.attr_value as program_name FROM performance_schema.threads AS pps LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id) LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id) LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id) LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id) LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id) LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid' LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name' ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
+CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER VIEW x$processlist ( thd_id, conn_id, user, db, command, state, time, current_statement, statement_latency, progress, lock_latency, rows_examined, rows_sent, rows_affected, tmp_tables, tmp_disk_tables, full_scan, last_statement, last_statement_latency, current_memory, last_wait, last_wait_latency, source, trx_latency, trx_state, trx_autocommit, pid, program_name ) AS SELECT pps.thread_id AS thd_id, pps.processlist_id AS conn_id, IF(pps.name IN ('thread/sql/one_connection', 'thread/thread_pool/tp_one_connection'), CONCAT(pps.processlist_user, '@', pps.processlist_host), REPLACE(pps.name, 'thread/', '')) user, pps.processlist_db AS db, pps.processlist_command AS command, pps.processlist_state AS state, pps.processlist_time AS time, pps.processlist_info AS current_statement, IF(esc.end_event_id IS NULL, esc.timer_wait, NULL) AS statement_latency, IF(esc.end_event_id IS NULL, ROUND(100 * (estc.work_completed / estc.work_estimated), 2), NULL) AS progress, esc.lock_time AS lock_latency, esc.rows_examined AS rows_examined, esc.rows_sent AS rows_sent, esc.rows_affected AS rows_affected, esc.created_tmp_tables AS tmp_tables, esc.created_tmp_disk_tables AS tmp_disk_tables, IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan, IF(esc.end_event_id IS NOT NULL, esc.sql_text, NULL) AS last_statement, IF(esc.end_event_id IS NOT NULL, esc.timer_wait, NULL) AS last_statement_latency, mem.current_allocated AS current_memory, ewc.event_name AS last_wait, IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL, 'Still Waiting',  ewc.timer_wait) last_wait_latency, ewc.source, etc.timer_wait AS trx_latency, etc.state AS trx_state, etc.autocommit AS trx_autocommit, conattr_pid.attr_value as pid, conattr_progname.attr_value as program_name FROM performance_schema.threads AS pps LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id) LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id) LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id) LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id) LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id) LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid' LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name' ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
 
 CREATE OR REPLACE DEFINER = 'mysql.sys'@'localhost' SQL SECURITY INVOKER  VIEW session AS SELECT * FROM sys.processlist WHERE conn_id IS NOT NULL AND command != 'Daemon';
 
@@ -342,7 +355,7 @@ CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE execute_prepared_stmt ( IN in_q
 
 DROP PROCEDURE IF EXISTS diagnostics;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE diagnostics ( IN in_max_runtime int unsigned, IN in_interval int unsigned, IN in_auto_config enum ('current', 'medium', 'full') ) COMMENT '\n Description\n \n Create a report of the current status of the server for diagnostics purposes. Data collected includes (some items depends on versions and settings):\n \n * The GLOBAL VARIABLES\n * Several sys schema views including metrics or equivalent (depending on version and settings)\n * Queries in the 95th percentile\n * Several ndbinfo views for MySQL Cluster\n * Replication (both master and slave) information.\n \n Some of the sys schema views are calculated as initial (optional), overall, delta:\n \n * The initial view is the content of the view at the start of this procedure.\n This output will be the same as the the start values used for the delta view.\n The initial view is included if @sys.diagnostics.include_raw = ''ON''.\n * The overall view is the content of the view at the end of this procedure.\n This output is the same as the end values used for the delta view.\n The overall view is always included.\n * The delta view is the difference from the beginning to the end. Note that for min and max values\n they are simply the min or max value from the end view respectively, so does not necessarily reflect\n the minimum/maximum value in the monitored period.\n Note: except for the metrics views the delta is only calculation between the first and last outputs.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Versions supported:\n * MySQL 5.6: 5.6.10 and later\n * MySQL 5.7: 5.7.9 and later\n \n Parameters\n \n in_max_runtime (INT UNSIGNED):\n The maximum time to keep collecting data.\n Use NULL to get the default which is 60 seconds, otherwise enter a value greater than 0.\n in_interval (INT UNSIGNED):\n How long to sleep between data collections.\n Use NULL to get the default which is 30 seconds, otherwise enter a value greater than 0.\n in_auto_config (ENUM(''current'', ''medium'', ''full''))\n Automatically enable Performance Schema instruments and consumers.\n NOTE: The more that are enabled, the more impact on the performance.\n Supported values are:\n * current - use the current settings.\n * medium - enable some settings.\n * full - enables all settings. This will have a big impact on the\n performance - be careful using this option.\n If another setting the ''current'' is chosen, the current settings\n are restored at the end of the procedure.\n \n \n Configuration Options\n \n sys.diagnostics.allow_i_s_tables\n Specifies whether it is allowed to do table scan queries on information_schema.TABLES. This can be expensive if there\n are many tables. Set to ''ON'' to allow, ''OFF'' to not allow.\n Default is ''OFF''.\n \n sys.diagnostics.include_raw\n Set to ''ON'' to include the raw data (e.g. the original output of "SELECT * FROM sys.metrics").\n Use this to get the initial values of the various views.\n Default is ''OFF''.\n \n sys.statement_truncate_len\n How much of queries in the process list output to include.\n Default is 64.\n \n sys.debug\n Whether to provide debugging output.\n Default is ''OFF''. Set to ''ON'' to include.\n \n \n Example\n \n To create a report and append it to the file diag.out:\n \n mysql> TEE diag.out;\n mysql> CALL sys.diagnostics(120, 30, ''current'');\n ...\n mysql> NOTEE;\n ' SQL SECURITY INVOKER NOT DETERMINISTIC READS SQL DATA BEGIN DECLARE v_start, v_runtime, v_iter_start, v_sleep DECIMAL(20,2) DEFAULT 0.0; DECLARE v_has_innodb, v_has_ndb, v_has_ps, v_has_replication, v_has_ps_replication VARCHAR(8) CHARSET utf8 DEFAULT 'NO'; DECLARE v_this_thread_enabled, v_has_ps_vars, v_has_metrics ENUM('YES', 'NO'); DECLARE v_table_name, v_banner VARCHAR(64) CHARSET utf8; DECLARE v_sql_status_summary_select, v_sql_status_summary_delta, v_sql_status_summary_from, v_no_delta_names TEXT; DECLARE v_output_time, v_output_time_prev DECIMAL(20,3) UNSIGNED; DECLARE v_output_count, v_count, v_old_group_concat_max_len INT UNSIGNED DEFAULT 0; DECLARE v_status_summary_width TINYINT UNSIGNED DEFAULT 50; DECLARE v_done BOOLEAN DEFAULT FALSE; DECLARE c_ndbinfo CURSOR FOR SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'ndbinfo' AND TABLE_NAME NOT IN ( 'blocks', 'config_params', 'dict_obj_types', 'disk_write_speed_base', 'memory_per_fragment', 'memoryusage', 'operations_per_fragment', 'threadblocks' ); DECLARE c_sysviews_w_delta CURSOR FOR SELECT table_name FROM tmp_sys_views_delta ORDER BY table_name;  DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;  SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_disable_thread(CONNECTION_ID()); END IF;  IF (in_max_runtime < in_interval) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_max_runtime must be greater than or equal to in_interval'; END IF; IF (in_max_runtime = 0) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_max_runtime must be greater than 0'; END IF; IF (in_interval = 0) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_interval must be greater than 0'; END IF;  IF (@sys.diagnostics.allow_i_s_tables IS NULL) THEN SET @sys.diagnostics.allow_i_s_tables = sys.sys_get_config('diagnostics.allow_i_s_tables', 'OFF'); END IF; IF (@sys.diagnostics.include_raw IS NULL) THEN SET @sys.diagnostics.include_raw      = sys.sys_get_config('diagnostics.include_raw'     , 'OFF'); END IF; IF (@sys.debug IS NULL) THEN SET @sys.debug                        = sys.sys_get_config('debug'                       , 'OFF'); END IF; IF (@sys.statement_truncate_len IS NULL) THEN SET @sys.statement_truncate_len       = sys.sys_get_config('statement_truncate_len'      , '64' ); END IF;  SET @log_bin := @@sql_log_bin; IF (@log_bin = 1) THEN SET sql_log_bin = 0; END IF;  SET v_no_delta_names = CONCAT('s%{COUNT}.Variable_name NOT IN (', '''innodb_buffer_pool_pages_total'', ', '''innodb_page_size'', ', '''last_query_cost'', ', '''last_query_partial_plans'', ', '''qcache_total_blocks'', ', '''slave_last_heartbeat'', ', '''ssl_ctx_verify_depth'', ', '''ssl_ctx_verify_mode'', ', '''ssl_session_cache_size'', ', '''ssl_verify_depth'', ', '''ssl_verify_mode'', ', '''ssl_version'', ', '''buffer_flush_lsn_avg_rate'', ', '''buffer_flush_pct_for_dirty'', ', '''buffer_flush_pct_for_lsn'', ', '''buffer_pool_pages_total'', ', '''lock_row_lock_time_avg'', ', '''lock_row_lock_time_max'', ', '''innodb_page_size''', ')');  IF (in_auto_config <> 'current') THEN IF (@sys.debug = 'ON') THEN SELECT CONCAT('Updating Performance Schema configuration to ', in_auto_config) AS 'Debug'; END IF; CALL sys.ps_setup_save(0);  IF (in_auto_config = 'medium') THEN UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME NOT LIKE '%\_history%';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES' WHERE NAME NOT LIKE 'wait/synch/%'; ELSEIF (in_auto_config = 'full') THEN UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES'; END IF;  UPDATE performance_schema.threads SET INSTRUMENTED = 'YES' WHERE PROCESSLIST_ID <> CONNECTION_ID(); END IF;  SET v_start        = UNIX_TIMESTAMP(NOW(2)), in_interval    = IFNULL(in_interval, 30), in_max_runtime = IFNULL(in_max_runtime, 60);  SET v_banner = REPEAT( '-', LEAST( GREATEST( 36, CHAR_LENGTH(VERSION()), CHAR_LENGTH(@@global.version_comment), CHAR_LENGTH(@@global.version_compile_os), CHAR_LENGTH(@@global.version_compile_machine), CHAR_LENGTH(@@global.socket), CHAR_LENGTH(@@global.datadir) ), 64 ) ); SELECT 'Hostname' AS 'Name', @@global.hostname AS 'Value' UNION ALL SELECT 'Port' AS 'Name', @@global.port AS 'Value' UNION ALL SELECT 'Socket' AS 'Name', @@global.socket AS 'Value' UNION ALL SELECT 'Datadir' AS 'Name', @@global.datadir AS 'Value' UNION ALL SELECT 'Server UUID' AS 'Name', @@global.server_uuid AS 'Value' UNION ALL SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value' UNION ALL SELECT 'MySQL Version' AS 'Name', VERSION() AS 'Value' UNION ALL SELECT 'Sys Schema Version' AS 'Name', (SELECT sys_version FROM sys.version) AS 'Value' UNION ALL SELECT 'Version Comment' AS 'Name', @@global.version_comment AS 'Value' UNION ALL SELECT 'Version Compile OS' AS 'Name', @@global.version_compile_os AS 'Value' UNION ALL SELECT 'Version Compile Machine' AS 'Name', @@global.version_compile_machine AS 'Value' UNION ALL SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value' UNION ALL SELECT 'UTC Time' AS 'Name', UTC_TIMESTAMP() AS 'Value' UNION ALL SELECT 'Local Time' AS 'Name', NOW() AS 'Value' UNION ALL SELECT 'Time Zone' AS 'Name', @@global.time_zone AS 'Value' UNION ALL SELECT 'System Time Zone' AS 'Name', @@global.system_time_zone AS 'Value' UNION ALL SELECT 'Time Zone Offset' AS 'Name', TIMEDIFF(NOW(), UTC_TIMESTAMP()) AS 'Value';  SET v_has_innodb         = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'InnoDB'), 'NO'), v_has_ndb            = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'NDBCluster'), 'NO'), v_has_ps             = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'PERFORMANCE_SCHEMA'), 'NO'), v_has_ps_replication = IF(v_has_ps = 'YES' AND EXISTS(SELECT 1 FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'replication_applier_status'), 'YES', 'NO' ), v_has_replication    = /*!50707 IF(v_has_ps_replication = 'YES', IF((SELECT COUNT(*) FROM performance_schema.replication_connection_status) > 0, 'YES', 'NO'),*/ IF(@@master_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_master_info) > 0, 'YES', 'NO'), IF(@@relay_log_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_relay_log_info) > 0, 'YES', 'NO'), 'MAYBE'))/*!50707 )*/, v_has_metrics        = IF(v_has_ps = 'YES' OR (sys.version_major() = 5 AND sys.version_minor() = 6), 'YES', 'NO'), v_has_ps_vars        = 'NO';  /*!50707 SET v_has_ps_vars = IF(@@global.show_compatibility_56, 'NO', 'YES');*/ /*!50709 SET v_has_ps_vars = 'YES';*/  IF (@sys.debug = 'ON') THEN SELECT v_has_innodb AS 'Has_InnoDB', v_has_ndb AS 'Has_NDBCluster', v_has_ps AS 'Has_Performance_Schema', v_has_ps_vars AS 'Has_P_S_SHOW_Variables', v_has_metrics AS 'Has_metrics', v_has_ps_replication 'AS Has_P_S_Replication', v_has_replication AS 'Has_Replication'; END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN SET @sys.diagnostics.sql = 'SHOW ENGINE InnoDB STATUS'; PREPARE stmt_innodb_status FROM @sys.diagnostics.sql; END IF;  IF (v_has_ps = 'YES') THEN SET @sys.diagnostics.sql = 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS'; PREPARE stmt_ps_status FROM @sys.diagnostics.sql; END IF;  IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SET @sys.diagnostics.sql = 'SHOW ENGINE NDBCLUSTER STATUS'; PREPARE stmt_ndbcluster_status FROM @sys.diagnostics.sql; END IF;  SET @sys.diagnostics.sql_gen_query_template = 'SELECT CONCAT( ''SELECT '', GROUP_CONCAT( CASE WHEN (SUBSTRING(TABLE_NAME, 3), COLUMN_NAME) IN ( (''io_global_by_file_by_bytes'', ''total''), (''io_global_by_wait_by_bytes'', ''total_requested'') ) THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -8) = ''_latency'' THEN CONCAT(''sys.format_time('', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated'' OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'') THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME) ELSE COLUMN_NAME END ORDER BY ORDINAL_POSITION SEPARATOR '',\n       '' ), ''\n  FROM tmp_'', SUBSTRING(TABLE_NAME FROM 3), ''_%{OUTPUT}'' ) AS Query INTO @sys.diagnostics.sql_select FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = ''sys'' AND TABLE_NAME = ? GROUP BY TABLE_NAME';  SET @sys.diagnostics.sql_gen_query_delta = 'SELECT CONCAT( ''SELECT '', GROUP_CONCAT( CASE WHEN FIND_IN_SET(COLUMN_NAME, diag.pk) THEN COLUMN_NAME WHEN diag.TABLE_NAME = ''io_global_by_file_by_bytes'' AND COLUMN_NAME = ''write_pct'' THEN CONCAT(''IFNULL(ROUND(100-(((e.total_read-IFNULL(s.total_read, 0))'', ''/NULLIF(((e.total_read-IFNULL(s.total_read, 0))+(e.total_written-IFNULL(s.total_written, 0))), 0))*100), 2), 0.00) AS '', COLUMN_NAME) WHEN (diag.TABLE_NAME, COLUMN_NAME) IN ( (''io_global_by_file_by_bytes'', ''total''), (''io_global_by_wait_by_bytes'', ''total_requested'') ) THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, ''-IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, 1, 4) IN (''max_'', ''min_'') AND SUBSTRING(COLUMN_NAME, -8) = ''_latency'' THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN COLUMN_NAME = ''avg_latency'' THEN CONCAT(''sys.format_time((e.total_latency - IFNULL(s.total_latency, 0))'', ''/NULLIF(e.total - IFNULL(s.total, 0), 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -12) = ''_avg_latency'' THEN CONCAT(''sys.format_time((e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency, 0))'', ''/NULLIF(e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s, 0), 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -8) = ''_latency'' THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) WHEN COLUMN_NAME IN (''avg_read'', ''avg_write'', ''avg_written'') THEN CONCAT(''sys.format_bytes(IFNULL((e.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), ''-IFNULL(s.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), '', 0))'', ''/NULLIF(e.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), ''-IFNULL(s.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), '', 0), 0), 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated'' OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'') THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) ELSE CONCAT(''(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) END ORDER BY ORDINAL_POSITION SEPARATOR '',\n       '' ), ''\n  FROM tmp_'', diag.TABLE_NAME, ''_end e LEFT OUTER JOIN tmp_'', diag.TABLE_NAME, ''_start s USING ('', diag.pk, '')'' ) AS Query INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta diag INNER JOIN information_schema.COLUMNS c ON c.TABLE_NAME = CONCAT(''x$'', diag.TABLE_NAME) WHERE c.TABLE_SCHEMA = ''sys'' AND diag.TABLE_NAME = ? GROUP BY diag.TABLE_NAME';  IF (v_has_ps = 'YES') THEN DROP TEMPORARY TABLE IF EXISTS tmp_sys_views_delta; CREATE TEMPORARY TABLE tmp_sys_views_delta ( TABLE_NAME varchar(64) NOT NULL, order_by text COMMENT 'ORDER BY clause for the initial and overall views', order_by_delta text COMMENT 'ORDER BY clause for the delta views', where_delta text COMMENT 'WHERE clause to use for delta views to only include rows with a "count" > 0', limit_rows int unsigned COMMENT 'The maximum number of rows to include for the view', pk varchar(128) COMMENT 'Used with the FIND_IN_SET() function so use comma separated list without whitespace', PRIMARY KEY (TABLE_NAME) );  IF (@sys.debug = 'ON') THEN SELECT 'Populating tmp_sys_views_delta' AS 'Debug'; END IF; INSERT INTO tmp_sys_views_delta VALUES ('host_summary'                       , '%{TABLE}.statement_latency DESC', '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC', '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'host'), ('host_summary_by_file_io'            , '%{TABLE}.io_latency DESC', '(e.io_latency-IFNULL(s.io_latency, 0)) DESC', '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'host'), ('host_summary_by_file_io_type'       , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'), ('host_summary_by_stages'             , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'), ('host_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host'), ('host_summary_by_statement_type'     , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,statement'), ('io_by_thread_by_latency'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,thread_id,processlist_id'), ('io_global_by_file_by_bytes'         , '%{TABLE}.total DESC', '(e.total-IFNULL(s.total, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'), ('io_global_by_file_by_latency'       , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'), ('io_global_by_wait_by_bytes'         , '%{TABLE}.total_requested DESC', '(e.total_requested-IFNULL(s.total_requested, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'), ('io_global_by_wait_by_latency'       , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'), ('schema_index_statistics'            , '(%{TABLE}.select_latency+%{TABLE}.insert_latency+%{TABLE}.update_latency+%{TABLE}.delete_latency) DESC', '((e.select_latency+e.insert_latency+e.update_latency+e.delete_latency)-IFNULL(s.select_latency+s.insert_latency+s.update_latency+s.delete_latency, 0)) DESC', '((e.rows_selected+e.insert_latency+e.rows_updated+e.rows_deleted)-IFNULL(s.rows_selected+s.rows_inserted+s.rows_updated+s.rows_deleted, 0)) > 0', 100, 'table_schema,table_name,index_name'), ('schema_table_statistics'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) > 0', 100, 'table_schema,table_name'), ('schema_tables_with_full_table_scans', '%{TABLE}.rows_full_scanned DESC', '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) DESC', '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) > 0', 100, 'object_schema,object_name'), ('user_summary'                       , '%{TABLE}.statement_latency DESC', '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC', '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'user'), ('user_summary_by_file_io'            , '%{TABLE}.io_latency DESC', '(e.io_latency-IFNULL(s.io_latency, 0)) DESC', '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'user'), ('user_summary_by_file_io_type'       , '%{TABLE}.user, %{TABLE}.latency DESC', 'e.user, (e.latency-IFNULL(s.latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'), ('user_summary_by_stages'             , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'), ('user_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user'), ('user_summary_by_statement_type'     , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,statement'), ('wait_classes_global_by_avg_latency' , 'IFNULL(%{TABLE}.total_latency / NULLIF(%{TABLE}.total, 0), 0) DESC', 'IFNULL((e.total_latency-IFNULL(s.total_latency, 0)) / NULLIF((e.total - IFNULL(s.total, 0)), 0), 0) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'), ('wait_classes_global_by_latency'     , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'), ('waits_by_host_by_latency'           , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event'), ('waits_by_user_by_latency'           , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event'), ('waits_global_by_latency'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'events') ; END IF;   SELECT '  =======================  Configuration  =======================  ' AS ''; SELECT 'GLOBAL VARIABLES' AS 'The following output is:'; IF (v_has_ps_vars = 'YES') THEN SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM performance_schema.global_variables ORDER BY VARIABLE_NAME; ELSE SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM information_schema.GLOBAL_VARIABLES ORDER BY VARIABLE_NAME; END IF;  IF (v_has_ps = 'YES') THEN SELECT 'Performance Schema Setup - Actors' AS 'The following output is:'; SELECT * FROM performance_schema.setup_actors;  SELECT 'Performance Schema Setup - Consumers' AS 'The following output is:'; SELECT NAME AS Consumer, ENABLED, sys.ps_is_consumer_enabled(NAME) AS COLLECTS FROM performance_schema.setup_consumers;  SELECT 'Performance Schema Setup - Instruments' AS 'The following output is:'; SELECT SUBSTRING_INDEX(NAME, '/', 2) AS 'InstrumentClass', ROUND(100*SUM(IF(ENABLED = 'YES', 1, 0))/COUNT(*), 2) AS 'EnabledPct', ROUND(100*SUM(IF(TIMED = 'YES', 1, 0))/COUNT(*), 2) AS 'TimedPct' FROM performance_schema.setup_instruments GROUP BY SUBSTRING_INDEX(NAME, '/', 2) ORDER BY SUBSTRING_INDEX(NAME, '/', 2);  SELECT 'Performance Schema Setup - Objects' AS 'The following output is:'; SELECT * FROM performance_schema.setup_objects;  SELECT 'Performance Schema Setup - Threads' AS 'The following output is:'; SELECT `TYPE` AS ThreadType, COUNT(*) AS 'Total', ROUND(100*SUM(IF(INSTRUMENTED = 'YES', 1, 0))/COUNT(*), 2) AS 'InstrumentedPct' FROM performance_schema.threads GROUP BY TYPE; END IF;   IF (v_has_replication = 'NO') THEN SELECT 'No Replication Configured' AS 'Replication Status'; ELSE SELECT CONCAT('Replication Configured: ', v_has_replication, ' - Performance Schema Replication Tables: ', v_has_ps_replication) AS 'Replication Status';  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication - Connection Configuration' AS 'The following output is:'; SELECT * FROM performance_schema.replication_connection_configuration/*!50706 ORDER BY CHANNEL_NAME*/; END IF;  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication - Applier Configuration' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME; END IF;  IF (@@master_info_repository = 'TABLE') THEN SELECT 'Replication - Master Info Repository Configuration' AS 'The following output is:'; SELECT /*!50706 Channel_name, */Host, User_name, Port, Connect_retry, Enabled_ssl, Ssl_ca, Ssl_capath, Ssl_cert, Ssl_cipher, Ssl_key, Ssl_verify_server_cert, Heartbeat, Bind, Ignored_server_ids, Uuid, Retry_count, Ssl_crl, Ssl_crlpath, Tls_version, Enabled_auto_position FROM mysql.slave_master_info/*!50706 ORDER BY Channel_name*/; END IF;  IF (@@relay_log_info_repository = 'TABLE') THEN SELECT 'Replication - Relay Log Repository Configuration' AS 'The following output is:'; SELECT /*!50706 Channel_name, */Sql_delay, Number_of_workers, Id FROM mysql.slave_relay_log_info/*!50706 ORDER BY Channel_name*/; END IF; END IF;   IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SELECT 'Cluster Thread Blocks' AS 'The following output is:'; SELECT * FROM ndbinfo.threadblocks; END IF;  IF (v_has_ps = 'YES') THEN IF (@sys.diagnostics.include_raw = 'ON') THEN SELECT '  ========================  Initial Status  ========================  ' AS ''; END IF;  DROP TEMPORARY TABLE IF EXISTS tmp_digests_start; CALL sys.statement_performance_analyzer('create_tmp', 'tmp_digests_start', NULL); CALL sys.statement_performance_analyzer('snapshot', NULL, NULL); CALL sys.statement_performance_analyzer('save', 'tmp_digests_start', NULL);  IF (@sys.diagnostics.include_raw = 'ON') THEN SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'start'); IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug'; SELECT @sys.diagnostics.sql AS 'Debug'; END IF; PREPARE stmt_gen_query FROM @sys.diagnostics.sql; END IF; SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  IF (@sys.debug = 'ON') THEN SELECT CONCAT('The following queries are for storing the initial content of ', v_table_name) AS 'Debug'; END IF;  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_start`')); CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_start` SELECT * FROM `sys`.`x$', v_table_name, '`'));  IF (@sys.diagnostics.include_raw = 'ON') THEN SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name); EXECUTE stmt_gen_query USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_start'))), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name; SELECT CONCAT('Initial ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select); END IF; END LOOP; CLOSE c_sysviews_w_delta;  IF (@sys.diagnostics.include_raw = 'ON') THEN DEALLOCATE PREPARE stmt_gen_query; END IF; END IF;  SET v_sql_status_summary_select = 'SELECT Variable_name', v_sql_status_summary_delta  = '', v_sql_status_summary_from   = '';  REPEAT  SET v_output_count = v_output_count + 1; IF (v_output_count > 1) THEN SET v_sleep = in_interval-(UNIX_TIMESTAMP(NOW(2))-v_iter_start); SELECT NOW() AS 'Time', CONCAT('Going to sleep for ', v_sleep, ' seconds. Please do not interrupt') AS 'The following output is:'; DO SLEEP(in_interval); END IF; SET v_iter_start = UNIX_TIMESTAMP(NOW(2));  SELECT NOW(), CONCAT('Iteration Number ', IFNULL(v_output_count, 'NULL')) AS 'The following output is:';  IF (@@log_bin = 1) THEN SELECT 'SHOW MASTER STATUS' AS 'The following output is:'; SHOW MASTER STATUS; END IF;  IF (v_has_replication <> 'NO') THEN SELECT 'SHOW SLAVE STATUS' AS 'The following output is:'; SHOW SLAVE STATUS;  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication Connection Status' AS 'The following output is:'; SELECT * FROM performance_schema.replication_connection_status;  SELECT 'Replication Applier Status' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;  SELECT 'Replication Applier Status - Coordinator' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status_by_coordinator ORDER BY CHANNEL_NAME;  SELECT 'Replication Applier Status - Worker' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME, WORKER_ID; END IF;  IF (@@master_info_repository = 'TABLE') THEN SELECT 'Replication - Master Log Status' AS 'The following output is:'; SELECT Master_log_name, Master_log_pos FROM mysql.slave_master_info; END IF;  IF (@@relay_log_info_repository = 'TABLE') THEN SELECT 'Replication - Relay Log Status' AS 'The following output is:'; SELECT sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos FROM mysql.slave_relay_log_info;  SELECT 'Replication - Worker Status' AS 'The following output is:'; SELECT Id, sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos, sys.format_path(Checkpoint_relay_log_name) AS Checkpoint_relay_log_name, Checkpoint_relay_log_pos, Checkpoint_master_log_name, Checkpoint_master_log_pos, Checkpoint_seqno, Checkpoint_group_size, HEX(Checkpoint_group_bitmap) AS Checkpoint_group_bitmap/*!50706 , Channel_name*/ FROM mysql.slave_worker_info ORDER BY /*!50706 Channel_name, */Id; END IF; END IF;  SET v_table_name = CONCAT('tmp_metrics_', v_output_count); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name));  CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE ', v_table_name, ' ( Variable_name VARCHAR(193) NOT NULL, Variable_value VARCHAR(1024), Type VARCHAR(225) NOT NULL, Enabled ENUM(''YES'', ''NO'', ''PARTIAL'') NOT NULL, PRIMARY KEY (Type, Variable_name) ) ENGINE = InnoDB DEFAULT CHARSET=utf8'));  IF (v_has_metrics) THEN SET @sys.diagnostics.sql = CONCAT( 'INSERT INTO ', v_table_name, ' SELECT Variable_name, REPLACE(Variable_value, ''\n'', ''\\\\n'') AS Variable_value, Type, Enabled FROM sys.metrics' ); ELSE SET @sys.diagnostics.sql = CONCAT( 'INSERT INTO ', v_table_name, '(SELECT LOWER(VARIABLE_NAME) AS Variable_name, REPLACE(VARIABLE_VALUE, ''\n'', ''\\\\n'') AS Variable_value, ''Global Status'' AS Type, ''YES'' AS Enabled FROM performance_schema.global_status ) UNION ALL ( SELECT NAME AS Variable_name, COUNT AS Variable_value, CONCAT(''InnoDB Metrics - '', SUBSYSTEM) AS Type, IF(STATUS = ''enabled'', ''YES'', ''NO'') AS Enabled FROM information_schema.INNODB_METRICS WHERE NAME NOT IN ( ''lock_row_lock_time'', ''lock_row_lock_time_avg'', ''lock_row_lock_time_max'', ''lock_row_lock_waits'', ''buffer_pool_reads'', ''buffer_pool_read_requests'', ''buffer_pool_write_requests'', ''buffer_pool_wait_free'', ''buffer_pool_read_ahead'', ''buffer_pool_read_ahead_evicted'', ''buffer_pool_pages_total'', ''buffer_pool_pages_misc'', ''buffer_pool_pages_data'', ''buffer_pool_bytes_data'', ''buffer_pool_pages_dirty'', ''buffer_pool_bytes_dirty'', ''buffer_pool_pages_free'', ''buffer_pages_created'', ''buffer_pages_written'', ''buffer_pages_read'', ''buffer_data_reads'', ''buffer_data_written'', ''file_num_open_files'', ''os_log_bytes_written'', ''os_log_fsyncs'', ''os_log_pending_fsyncs'', ''os_log_pending_writes'', ''log_waits'', ''log_write_requests'', ''log_writes'', ''innodb_dblwr_writes'', ''innodb_dblwr_pages_written'', ''innodb_page_size'') ) UNION ALL ( SELECT ''NOW()'' AS Variable_name, NOW(3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled ) UNION ALL ( SELECT ''UNIX_TIMESTAMP()'' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled ) ORDER BY Type, Variable_name;' ); END IF; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql);  CALL sys.execute_prepared_stmt( CONCAT('(SELECT Variable_value INTO @sys.diagnostics.output_time FROM ', v_table_name, ' WHERE Type = ''System Time'' AND Variable_name = ''UNIX_TIMESTAMP()'')') ); SET v_output_time = @sys.diagnostics.output_time;  SET v_sql_status_summary_select = CONCAT(v_sql_status_summary_select, ', CONCAT( LEFT(s', v_output_count, '.Variable_value, ', v_status_summary_width, '), IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'', CONCAT('' ('', ROUND(s', v_output_count, '.Variable_value/', v_output_time, ', 2), ''/sec)''), '''') ) AS ''Output ', v_output_count, ''''), v_sql_status_summary_from   = CONCAT(v_sql_status_summary_from, ' ', IF(v_output_count = 1, '  FROM ', '       INNER JOIN '), v_table_name, ' s', v_output_count, IF (v_output_count = 1, '', ' USING (Type, Variable_name)')); IF (v_output_count > 1) THEN SET v_sql_status_summary_delta  = CONCAT(v_sql_status_summary_delta, ', IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'', CONCAT(IF(s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'' OR s', v_output_count, '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'', ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value), 2), (s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value) ), '' ('', ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value)/(', v_output_time, '-', v_output_time_prev, '), 2), ''/sec)'' ), '''' ) AS ''Delta (', (v_output_count-1), ' -> ', v_output_count, ')'''); END IF;  SET v_output_time_prev = v_output_time;  IF (@sys.diagnostics.include_raw = 'ON') THEN IF (v_has_metrics) THEN SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:'; ELSE SELECT 'sys.metrics equivalent' AS 'The following output is:'; END IF; CALL sys.execute_prepared_stmt(CONCAT('SELECT Type, Variable_name, Enabled, Variable_value FROM ', v_table_name, ' ORDER BY Type, Variable_name')); END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN SELECT 'SHOW ENGINE INNODB STATUS' AS 'The following output is:'; EXECUTE stmt_innodb_status; SELECT 'InnoDB - Transactions' AS 'The following output is:'; SELECT * FROM information_schema.INNODB_TRX; END IF;  IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SELECT 'SHOW ENGINE NDBCLUSTER STATUS' AS 'The following output is:'; EXECUTE stmt_ndbcluster_status;  SELECT 'ndbinfo.memoryusage' AS 'The following output is:'; SELECT node_id, memory_type, sys.format_bytes(used) AS used, used_pages, sys.format_bytes(total) AS total, total_pages, ROUND(100*(used/total), 2) AS 'Used %' FROM ndbinfo.memoryusage;  SET v_done = FALSE; OPEN c_ndbinfo; c_ndbinfo_loop: LOOP FETCH c_ndbinfo INTO v_table_name; IF v_done THEN LEAVE c_ndbinfo_loop; END IF;  SELECT CONCAT('SELECT * FROM ndbinfo.', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(CONCAT('SELECT * FROM `ndbinfo`.`', v_table_name, '`')); END LOOP; CLOSE c_ndbinfo;  SELECT * FROM information_schema.FILES; END IF;  SELECT 'SELECT * FROM sys.processlist' AS 'The following output is:'; SELECT processlist.* FROM sys.processlist;  IF (v_has_ps = 'YES') THEN IF (sys.ps_is_consumer_enabled('events_waits_history_long') = 'YES') THEN SELECT 'SELECT * FROM sys.latest_file_io' AS 'The following output is:'; SELECT * FROM sys.latest_file_io; END IF;  IF (EXISTS(SELECT 1 FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES')) THEN SELECT 'SELECT * FROM sys.memory_by_host_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_host_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_by_thread_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_thread_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_by_user_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_user_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_global_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_global_by_current_bytes; END IF; END IF;  SET v_runtime = (UNIX_TIMESTAMP(NOW(2)) - v_start); UNTIL (v_runtime + in_interval >= in_max_runtime) END REPEAT;  IF (v_has_ps = 'YES') THEN SELECT 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS' AS 'The following output is:'; EXECUTE stmt_ps_status; END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN DEALLOCATE PREPARE stmt_innodb_status; END IF; IF (v_has_ps = 'YES') THEN DEALLOCATE PREPARE stmt_ps_status; END IF; IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN DEALLOCATE PREPARE stmt_ndbcluster_status; END IF;   SELECT '  ============================  Schema Information  ============================  ' AS '';  SELECT COUNT(*) AS 'Total Number of Tables' FROM information_schema.TABLES;  IF (@sys.diagnostics.allow_i_s_tables = 'ON') THEN SELECT 'Storage Engine Usage' AS 'The following output is:'; SELECT ENGINE, COUNT(*) AS NUM_TABLES, sys.format_bytes(SUM(DATA_LENGTH)) AS DATA_LENGTH, sys.format_bytes(SUM(INDEX_LENGTH)) AS INDEX_LENGTH, sys.format_bytes(SUM(DATA_LENGTH+INDEX_LENGTH)) AS TOTAL FROM information_schema.TABLES GROUP BY ENGINE;  SELECT 'Schema Object Overview' AS 'The following output is:'; SELECT * FROM sys.schema_object_overview;  SELECT 'Tables without a PRIMARY KEY' AS 'The following output is:'; SELECT TABLES.TABLE_SCHEMA, ENGINE, COUNT(*) AS NumTables FROM information_schema.TABLES LEFT OUTER JOIN information_schema.STATISTICS ON STATISTICS.TABLE_SCHEMA = TABLES.TABLE_SCHEMA AND STATISTICS.TABLE_NAME = TABLES.TABLE_NAME AND STATISTICS.INDEX_NAME = 'PRIMARY' WHERE STATISTICS.TABLE_NAME IS NULL AND TABLES.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys') AND TABLES.TABLE_TYPE = 'BASE TABLE' GROUP BY TABLES.TABLE_SCHEMA, ENGINE; END IF;  IF (v_has_ps = 'YES') THEN SELECT 'Unused Indexes' AS 'The following output is:'; SELECT object_schema, COUNT(*) AS NumUnusedIndexes FROM performance_schema.table_io_waits_summary_by_index_usage  WHERE index_name IS NOT NULL AND count_star = 0 AND object_schema NOT IN ('mysql', 'sys') AND index_name != 'PRIMARY' GROUP BY object_schema; END IF;  IF (v_has_ps = 'YES') THEN SELECT '  =========================  Overall Status  =========================  ' AS '';  SELECT 'CALL sys.ps_statement_avg_latency_histogram()' AS 'The following output is:'; CALL sys.ps_statement_avg_latency_histogram();  CALL sys.statement_performance_analyzer('snapshot', NULL, NULL); CALL sys.statement_performance_analyzer('overall', NULL, 'with_runtimes_in_95th_percentile');  SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'end'); IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug'; SELECT @sys.diagnostics.sql AS 'Debug'; END IF; PREPARE stmt_gen_query FROM @sys.diagnostics.sql;  SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  IF (@sys.debug = 'ON') THEN SELECT CONCAT('The following queries are for storing the final content of ', v_table_name) AS 'Debug'; END IF;  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_end`')); CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_end` SELECT * FROM `sys`.`x$', v_table_name, '`'));  IF (@sys.diagnostics.include_raw = 'ON') THEN SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name); EXECUTE stmt_gen_query USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_end'))), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name; SELECT CONCAT('Overall ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select); END IF; END LOOP; CLOSE c_sysviews_w_delta;  DEALLOCATE PREPARE stmt_gen_query;   SELECT '  ======================  Delta Status  ======================  ' AS '';  CALL sys.statement_performance_analyzer('delta', 'tmp_digests_start', 'with_runtimes_in_95th_percentile'); CALL sys.statement_performance_analyzer('cleanup', NULL, NULL);  DROP TEMPORARY TABLE tmp_digests_start;  IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view delta' AS 'Debug'; SELECT @sys.diagnostics.sql_gen_query_delta AS 'Debug'; END IF; PREPARE stmt_gen_query_delta FROM @sys.diagnostics.sql_gen_query_delta;  SET v_old_group_concat_max_len = @@session.group_concat_max_len; SET @@session.group_concat_max_len = 2048; SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  SET @sys.diagnostics.table_name = v_table_name; EXECUTE stmt_gen_query_delta USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(where_delta IS NOT NULL, CONCAT('\n WHERE ', where_delta), ''), IF(order_by_delta IS NOT NULL, CONCAT('\n ORDER BY ', order_by_delta), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name;  SELECT CONCAT('Delta ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select);  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_end`')); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_start`')); END LOOP; CLOSE c_sysviews_w_delta; SET @@session.group_concat_max_len = v_old_group_concat_max_len;  DEALLOCATE PREPARE stmt_gen_query_delta; DROP TEMPORARY TABLE tmp_sys_views_delta; END IF;  IF (v_has_metrics) THEN SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:'; ELSE SELECT 'sys.metrics equivalent' AS 'The following output is:'; END IF; CALL sys.execute_prepared_stmt( CONCAT(v_sql_status_summary_select, v_sql_status_summary_delta, ', Type, s1.Enabled', v_sql_status_summary_from, ' ORDER BY Type, Variable_name' ) );  SET v_count = 0; WHILE (v_count < v_output_count) DO SET v_count = v_count + 1; SET v_table_name = CONCAT('tmp_metrics_', v_count); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name)); END WHILE;  IF (in_auto_config <> 'current') THEN CALL sys.ps_setup_reload_saved(); SET sql_log_bin = @log_bin; END IF;  SET @sys.diagnostics.output_time            = NULL, @sys.diagnostics.sql                    = NULL, @sys.diagnostics.sql_gen_query_delta    = NULL, @sys.diagnostics.sql_gen_query_template = NULL, @sys.diagnostics.sql_select             = NULL, @sys.diagnostics.table_name             = NULL;  IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  IF (@log_bin = 1) THEN SET sql_log_bin = @log_bin; END IF; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE diagnostics ( IN in_max_runtime int unsigned, IN in_interval int unsigned, IN in_auto_config enum ('current', 'medium', 'full') ) COMMENT '\n Description\n \n Create a report of the current status of the server for diagnostics purposes. Data collected includes (some items depends on versions and settings):\n \n * The GLOBAL VARIABLES\n * Several sys schema views including metrics or equivalent (depending on version and settings)\n * Queries in the 95th percentile\n * Several ndbinfo views for MySQL Cluster\n * Replication (both master and slave) information.\n \n Some of the sys schema views are calculated as initial (optional), overall, delta:\n \n * The initial view is the content of the view at the start of this procedure.\n This output will be the same as the the start values used for the delta view.\n The initial view is included if @sys.diagnostics.include_raw = ''ON''.\n * The overall view is the content of the view at the end of this procedure.\n This output is the same as the end values used for the delta view.\n The overall view is always included.\n * The delta view is the difference from the beginning to the end. Note that for min and max values\n they are simply the min or max value from the end view respectively, so does not necessarily reflect\n the minimum/maximum value in the monitored period.\n Note: except for the metrics views the delta is only calculation between the first and last outputs.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Versions supported:\n * MySQL 5.6: 5.6.10 and later\n * MySQL 5.7: 5.7.9 and later\n \n Parameters\n \n in_max_runtime (INT UNSIGNED):\n The maximum time to keep collecting data.\n Use NULL to get the default which is 60 seconds, otherwise enter a value greater than 0.\n in_interval (INT UNSIGNED):\n How long to sleep between data collections.\n Use NULL to get the default which is 30 seconds, otherwise enter a value greater than 0.\n in_auto_config (ENUM(''current'', ''medium'', ''full''))\n Automatically enable Performance Schema instruments and consumers.\n NOTE: The more that are enabled, the more impact on the performance.\n Supported values are:\n * current - use the current settings.\n * medium - enable some settings.\n * full - enables all settings. This will have a big impact on the\n performance - be careful using this option.\n If another setting the ''current'' is chosen, the current settings\n are restored at the end of the procedure.\n \n \n Configuration Options\n \n sys.diagnostics.allow_i_s_tables\n Specifies whether it is allowed to do table scan queries on information_schema.TABLES. This can be expensive if there\n are many tables. Set to ''ON'' to allow, ''OFF'' to not allow.\n Default is ''OFF''.\n \n sys.diagnostics.include_raw\n Set to ''ON'' to include the raw data (e.g. the original output of "SELECT * FROM sys.metrics").\n Use this to get the initial values of the various views.\n Default is ''OFF''.\n \n sys.statement_truncate_len\n How much of queries in the process list output to include.\n Default is 64.\n \n sys.debug\n Whether to provide debugging output.\n Default is ''OFF''. Set to ''ON'' to include.\n \n \n Example\n \n To create a report and append it to the file diag.out:\n \n mysql> TEE diag.out;\n mysql> CALL sys.diagnostics(120, 30, ''current'');\n ...\n mysql> NOTEE;\n ' SQL SECURITY INVOKER NOT DETERMINISTIC READS SQL DATA BEGIN DECLARE v_start, v_runtime, v_iter_start, v_sleep DECIMAL(20,2) DEFAULT 0.0; DECLARE v_has_innodb, v_has_ndb, v_has_ps, v_has_replication, v_has_ps_replication VARCHAR(8) CHARSET utf8 DEFAULT 'NO'; DECLARE v_this_thread_enabled, v_has_ps_vars, v_has_metrics ENUM('YES', 'NO'); DECLARE v_table_name, v_banner VARCHAR(64) CHARSET utf8; DECLARE v_sql_status_summary_select, v_sql_status_summary_delta, v_sql_status_summary_from, v_no_delta_names TEXT; DECLARE v_output_time, v_output_time_prev DECIMAL(20,3) UNSIGNED; DECLARE v_output_count, v_count, v_old_group_concat_max_len INT UNSIGNED DEFAULT 0; DECLARE v_status_summary_width TINYINT UNSIGNED DEFAULT 50; DECLARE v_done BOOLEAN DEFAULT FALSE; DECLARE c_ndbinfo CURSOR FOR SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'ndbinfo' AND TABLE_NAME NOT IN ( 'blocks', 'config_params', 'dict_obj_types', 'disk_write_speed_base', 'memory_per_fragment', 'memoryusage', 'operations_per_fragment', 'threadblocks' ); DECLARE c_sysviews_w_delta CURSOR FOR SELECT table_name FROM tmp_sys_views_delta ORDER BY table_name; DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;  SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_disable_thread(CONNECTION_ID()); END IF;  IF (in_max_runtime < in_interval) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_max_runtime must be greater than or equal to in_interval'; END IF; IF (in_max_runtime = 0) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_max_runtime must be greater than 0'; END IF; IF (in_interval = 0) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'in_interval must be greater than 0'; END IF;  IF (@sys.diagnostics.allow_i_s_tables IS NULL) THEN SET @sys.diagnostics.allow_i_s_tables = sys.sys_get_config('diagnostics.allow_i_s_tables', 'OFF'); END IF; IF (@sys.diagnostics.include_raw IS NULL) THEN SET @sys.diagnostics.include_raw      = sys.sys_get_config('diagnostics.include_raw'     , 'OFF'); END IF; IF (@sys.debug IS NULL) THEN SET @sys.debug                        = sys.sys_get_config('debug'                       , 'OFF'); END IF; IF (@sys.statement_truncate_len IS NULL) THEN SET @sys.statement_truncate_len       = sys.sys_get_config('statement_truncate_len'      , '64' ); END IF;  SET @log_bin := @@sql_log_bin; IF (@log_bin = 1) THEN SET sql_log_bin = 0; END IF;  SET v_no_delta_names = CONCAT('s%{COUNT}.Variable_name NOT IN (', '''innodb_buffer_pool_pages_total'', ', '''innodb_page_size'', ', '''last_query_cost'', ', '''last_query_partial_plans'', ', '''qcache_total_blocks'', ', '''slave_last_heartbeat'', ', '''ssl_ctx_verify_depth'', ', '''ssl_ctx_verify_mode'', ', '''ssl_session_cache_size'', ', '''ssl_verify_depth'', ', '''ssl_verify_mode'', ', '''ssl_version'', ', '''buffer_flush_lsn_avg_rate'', ', '''buffer_flush_pct_for_dirty'', ', '''buffer_flush_pct_for_lsn'', ', '''buffer_pool_pages_total'', ', '''lock_row_lock_time_avg'', ', '''lock_row_lock_time_max'', ', '''innodb_page_size''', ')');  IF (in_auto_config <> 'current') THEN IF (@sys.debug = 'ON') THEN SELECT CONCAT('Updating Performance Schema configuration to ', in_auto_config) AS 'Debug'; END IF; CALL sys.ps_setup_save(0);  IF (in_auto_config = 'medium') THEN UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME NOT LIKE '%\_history%';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES' WHERE NAME NOT LIKE 'wait/synch/%'; ELSEIF (in_auto_config = 'full') THEN UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES'; END IF;  UPDATE performance_schema.threads SET INSTRUMENTED = 'YES' WHERE PROCESSLIST_ID <> CONNECTION_ID(); END IF;  SET v_start        = UNIX_TIMESTAMP(NOW(2)), in_interval    = IFNULL(in_interval, 30), in_max_runtime = IFNULL(in_max_runtime, 60);  SET v_banner = REPEAT( '-', LEAST( GREATEST( 36, CHAR_LENGTH(VERSION()), CHAR_LENGTH(@@global.version_comment), CHAR_LENGTH(@@global.version_compile_os), CHAR_LENGTH(@@global.version_compile_machine), CHAR_LENGTH(@@global.socket), CHAR_LENGTH(@@global.datadir) ), 64 ) ); SELECT 'Hostname' AS 'Name', @@global.hostname AS 'Value' UNION ALL SELECT 'Port' AS 'Name', @@global.port AS 'Value' UNION ALL SELECT 'Socket' AS 'Name', @@global.socket AS 'Value' UNION ALL SELECT 'Datadir' AS 'Name', @@global.datadir AS 'Value' UNION ALL SELECT 'Server UUID' AS 'Name', @@global.server_uuid AS 'Value' UNION ALL SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value' UNION ALL SELECT 'MySQL Version' AS 'Name', VERSION() AS 'Value' UNION ALL SELECT 'Sys Schema Version' AS 'Name', (SELECT sys_version FROM sys.version) AS 'Value' UNION ALL SELECT 'Version Comment' AS 'Name', @@global.version_comment AS 'Value' UNION ALL SELECT 'Version Compile OS' AS 'Name', @@global.version_compile_os AS 'Value' UNION ALL SELECT 'Version Compile Machine' AS 'Name', @@global.version_compile_machine AS 'Value' UNION ALL SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value' UNION ALL SELECT 'UTC Time' AS 'Name', UTC_TIMESTAMP() AS 'Value' UNION ALL SELECT 'Local Time' AS 'Name', NOW() AS 'Value' UNION ALL SELECT 'Time Zone' AS 'Name', @@global.time_zone AS 'Value' UNION ALL SELECT 'System Time Zone' AS 'Name', @@global.system_time_zone AS 'Value' UNION ALL SELECT 'Time Zone Offset' AS 'Name', TIMEDIFF(NOW(), UTC_TIMESTAMP()) AS 'Value';  SET v_has_innodb         = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'InnoDB'), 'NO'), v_has_ndb            = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'NDBCluster'), 'NO'), v_has_ps             = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'PERFORMANCE_SCHEMA'), 'NO'), v_has_ps_replication = IF(v_has_ps = 'YES' AND EXISTS(SELECT 1 FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'replication_applier_status'), 'YES', 'NO' ), v_has_replication    = /*!50707 IF(v_has_ps_replication = 'YES', IF((SELECT COUNT(*) FROM performance_schema.replication_connection_status) > 0, 'YES', 'NO'),*/ IF(@@master_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_master_info) > 0, 'YES', 'NO'), IF(@@relay_log_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_relay_log_info) > 0, 'YES', 'NO'), 'MAYBE'))/*!50707 )*/, v_has_metrics        = IF(v_has_ps = 'YES' OR (sys.version_major() = 5 AND sys.version_minor() = 6), 'YES', 'NO'), v_has_ps_vars        = 'NO';  /*!50707 SET v_has_ps_vars = IF(@@global.show_compatibility_56, 'NO', 'YES');*/ /*!50709 SET v_has_ps_vars = 'YES';*/  IF (@sys.debug = 'ON') THEN SELECT v_has_innodb AS 'Has_InnoDB', v_has_ndb AS 'Has_NDBCluster', v_has_ps AS 'Has_Performance_Schema', v_has_ps_vars AS 'Has_P_S_SHOW_Variables', v_has_metrics AS 'Has_metrics', v_has_ps_replication 'AS Has_P_S_Replication', v_has_replication AS 'Has_Replication'; END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN SET @sys.diagnostics.sql = 'SHOW ENGINE InnoDB STATUS'; PREPARE stmt_innodb_status FROM @sys.diagnostics.sql; END IF;  IF (v_has_ps = 'YES') THEN SET @sys.diagnostics.sql = 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS'; PREPARE stmt_ps_status FROM @sys.diagnostics.sql; END IF;  IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SET @sys.diagnostics.sql = 'SHOW ENGINE NDBCLUSTER STATUS'; PREPARE stmt_ndbcluster_status FROM @sys.diagnostics.sql; END IF;  SET @sys.diagnostics.sql_gen_query_template = 'SELECT CONCAT( ''SELECT '', GROUP_CONCAT( CASE WHEN (SUBSTRING(TABLE_NAME, 3), COLUMN_NAME) IN ( (''io_global_by_file_by_bytes'', ''total''), (''io_global_by_wait_by_bytes'', ''total_requested'') ) THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN COLUMN_NAME LIKE ''%latency'' THEN CONCAT(''sys.format_time('', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated'' OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'') THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME) ELSE COLUMN_NAME END ORDER BY ORDINAL_POSITION SEPARATOR '',\n       '' ), ''\n  FROM tmp_'', SUBSTRING(TABLE_NAME FROM 3), ''_%{OUTPUT}'' ) AS Query INTO @sys.diagnostics.sql_select FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = ''sys'' AND TABLE_NAME = ? GROUP BY TABLE_NAME';  SET @sys.diagnostics.sql_gen_query_delta = 'SELECT CONCAT( ''SELECT '', GROUP_CONCAT( CASE WHEN FIND_IN_SET(COLUMN_NAME, diag.pk) THEN COLUMN_NAME WHEN diag.TABLE_NAME = ''io_global_by_file_by_bytes'' AND COLUMN_NAME = ''write_pct'' THEN CONCAT(''IFNULL(ROUND(100-(((e.total_read-IFNULL(s.total_read, 0))'', ''/NULLIF(((e.total_read-IFNULL(s.total_read, 0))+(e.total_written-IFNULL(s.total_written, 0))), 0))*100), 2), 0.00) AS '', COLUMN_NAME) WHEN (diag.TABLE_NAME, COLUMN_NAME) IN ( (''io_global_by_file_by_bytes'', ''total''), (''io_global_by_wait_by_bytes'', ''total_requested'') ) THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, ''-IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, 1, 4) IN (''max_'', ''min_'') AND SUBSTRING(COLUMN_NAME, -8) = ''_latency'' THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '') AS '', COLUMN_NAME) WHEN COLUMN_NAME = ''avg_latency'' THEN CONCAT(''sys.format_time((e.total_latency - IFNULL(s.total_latency, 0))'', ''/NULLIF(e.total - IFNULL(s.total, 0), 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -12) = ''_avg_latency'' THEN CONCAT(''sys.format_time((e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency, 0))'', ''/NULLIF(e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s, 0), 0)) AS '', COLUMN_NAME) WHEN COLUMN_NAME LIKE ''%latency'' THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) WHEN COLUMN_NAME IN (''avg_read'', ''avg_write'', ''avg_written'') THEN CONCAT(''sys.format_bytes(IFNULL((e.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), ''-IFNULL(s.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), '', 0))'', ''/NULLIF(e.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), ''-IFNULL(s.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), '', 0), 0), 0)) AS '', COLUMN_NAME) WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated'' OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'') THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) ELSE CONCAT(''(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME) END ORDER BY ORDINAL_POSITION SEPARATOR '',\n       '' ), ''\n  FROM tmp_'', diag.TABLE_NAME, ''_end e LEFT OUTER JOIN tmp_'', diag.TABLE_NAME, ''_start s USING ('', diag.pk, '')'' ) AS Query INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta diag INNER JOIN information_schema.COLUMNS c ON c.TABLE_NAME = CONCAT(''x$'', diag.TABLE_NAME) WHERE c.TABLE_SCHEMA = ''sys'' AND diag.TABLE_NAME = ? GROUP BY diag.TABLE_NAME';  IF (v_has_ps = 'YES') THEN DROP TEMPORARY TABLE IF EXISTS tmp_sys_views_delta; CREATE TEMPORARY TABLE tmp_sys_views_delta ( TABLE_NAME varchar(64) NOT NULL, order_by text COMMENT 'ORDER BY clause for the initial and overall views', order_by_delta text COMMENT 'ORDER BY clause for the delta views', where_delta text COMMENT 'WHERE clause to use for delta views to only include rows with a "count" > 0', limit_rows int unsigned COMMENT 'The maximum number of rows to include for the view', pk varchar(128) COMMENT 'Used with the FIND_IN_SET() function so use comma separated list without whitespace', PRIMARY KEY (TABLE_NAME) );  IF (@sys.debug = 'ON') THEN SELECT 'Populating tmp_sys_views_delta' AS 'Debug'; END IF; INSERT INTO tmp_sys_views_delta VALUES ('host_summary'                       , '%{TABLE}.statement_latency DESC', '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC', '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'host'), ('host_summary_by_file_io'            , '%{TABLE}.io_latency DESC', '(e.io_latency-IFNULL(s.io_latency, 0)) DESC', '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'host'), ('host_summary_by_file_io_type'       , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'), ('host_summary_by_stages'             , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'), ('host_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host'), ('host_summary_by_statement_type'     , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,statement'), ('io_by_thread_by_latency'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,thread_id,processlist_id'), ('io_global_by_file_by_bytes'         , '%{TABLE}.total DESC', '(e.total-IFNULL(s.total, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'), ('io_global_by_file_by_latency'       , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'), ('io_global_by_wait_by_bytes'         , '%{TABLE}.total_requested DESC', '(e.total_requested-IFNULL(s.total_requested, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'), ('io_global_by_wait_by_latency'       , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'), ('schema_index_statistics'            , '(%{TABLE}.select_latency+%{TABLE}.insert_latency+%{TABLE}.update_latency+%{TABLE}.delete_latency) DESC', '((e.select_latency+e.insert_latency+e.update_latency+e.delete_latency)-IFNULL(s.select_latency+s.insert_latency+s.update_latency+s.delete_latency, 0)) DESC', '((e.rows_selected+e.insert_latency+e.rows_updated+e.rows_deleted)-IFNULL(s.rows_selected+s.rows_inserted+s.rows_updated+s.rows_deleted, 0)) > 0', 100, 'table_schema,table_name,index_name'), ('schema_table_statistics'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) > 0', 100, 'table_schema,table_name'), ('schema_tables_with_full_table_scans', '%{TABLE}.rows_full_scanned DESC', '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) DESC', '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) > 0', 100, 'object_schema,object_name'), ('user_summary'                       , '%{TABLE}.statement_latency DESC', '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC', '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'user'), ('user_summary_by_file_io'            , '%{TABLE}.io_latency DESC', '(e.io_latency-IFNULL(s.io_latency, 0)) DESC', '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'user'), ('user_summary_by_file_io_type'       , '%{TABLE}.user, %{TABLE}.latency DESC', 'e.user, (e.latency-IFNULL(s.latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'), ('user_summary_by_stages'             , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'), ('user_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user'), ('user_summary_by_statement_type'     , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,statement'), ('wait_classes_global_by_avg_latency' , 'IFNULL(%{TABLE}.total_latency / NULLIF(%{TABLE}.total, 0), 0) DESC', 'IFNULL((e.total_latency-IFNULL(s.total_latency, 0)) / NULLIF((e.total - IFNULL(s.total, 0)), 0), 0) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'), ('wait_classes_global_by_latency'     , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'), ('waits_by_host_by_latency'           , '%{TABLE}.host, %{TABLE}.total_latency DESC', 'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event'), ('waits_by_user_by_latency'           , '%{TABLE}.user, %{TABLE}.total_latency DESC', 'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event'), ('waits_global_by_latency'            , '%{TABLE}.total_latency DESC', '(e.total_latency-IFNULL(s.total_latency, 0)) DESC', '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'events') ; END IF;   SELECT '  =======================  Configuration  =======================  ' AS ''; SELECT 'GLOBAL VARIABLES' AS 'The following output is:'; IF (v_has_ps_vars = 'YES') THEN SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM performance_schema.global_variables ORDER BY VARIABLE_NAME; ELSE SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM information_schema.GLOBAL_VARIABLES ORDER BY VARIABLE_NAME; END IF;  IF (v_has_ps = 'YES') THEN SELECT 'Performance Schema Setup - Actors' AS 'The following output is:'; SELECT * FROM performance_schema.setup_actors;  SELECT 'Performance Schema Setup - Consumers' AS 'The following output is:'; SELECT NAME AS Consumer, ENABLED, sys.ps_is_consumer_enabled(NAME) AS COLLECTS FROM performance_schema.setup_consumers;  SELECT 'Performance Schema Setup - Instruments' AS 'The following output is:'; SELECT SUBSTRING_INDEX(NAME, '/', 2) AS 'InstrumentClass', ROUND(100*SUM(IF(ENABLED = 'YES', 1, 0))/COUNT(*), 2) AS 'EnabledPct', ROUND(100*SUM(IF(TIMED = 'YES', 1, 0))/COUNT(*), 2) AS 'TimedPct' FROM performance_schema.setup_instruments GROUP BY SUBSTRING_INDEX(NAME, '/', 2) ORDER BY SUBSTRING_INDEX(NAME, '/', 2);  SELECT 'Performance Schema Setup - Objects' AS 'The following output is:'; SELECT * FROM performance_schema.setup_objects;  SELECT 'Performance Schema Setup - Threads' AS 'The following output is:'; SELECT `TYPE` AS ThreadType, COUNT(*) AS 'Total', ROUND(100*SUM(IF(INSTRUMENTED = 'YES', 1, 0))/COUNT(*), 2) AS 'InstrumentedPct' FROM performance_schema.threads GROUP BY TYPE; END IF;   IF (v_has_replication = 'NO') THEN SELECT 'No Replication Configured' AS 'Replication Status'; ELSE SELECT CONCAT('Replication Configured: ', v_has_replication, ' - Performance Schema Replication Tables: ', v_has_ps_replication) AS 'Replication Status';  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication - Connection Configuration' AS 'The following output is:'; SELECT * FROM performance_schema.replication_connection_configuration/*!50706 ORDER BY CHANNEL_NAME*/; END IF;  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication - Applier Configuration' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME; END IF;  IF (@@master_info_repository = 'TABLE') THEN SELECT 'Replication - Master Info Repository Configuration' AS 'The following output is:'; SELECT /*!50706 Channel_name, */Host, User_name, Port, Connect_retry, Enabled_ssl, Ssl_ca, Ssl_capath, Ssl_cert, Ssl_cipher, Ssl_key, Ssl_verify_server_cert, Heartbeat, Bind, Ignored_server_ids, Uuid, Retry_count, Ssl_crl, Ssl_crlpath, Tls_version, Enabled_auto_position FROM mysql.slave_master_info/*!50706 ORDER BY Channel_name*/; END IF;  IF (@@relay_log_info_repository = 'TABLE') THEN SELECT 'Replication - Relay Log Repository Configuration' AS 'The following output is:'; SELECT /*!50706 Channel_name, */Sql_delay, Number_of_workers, Id FROM mysql.slave_relay_log_info/*!50706 ORDER BY Channel_name*/; END IF; END IF;   IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SELECT 'Cluster Thread Blocks' AS 'The following output is:'; SELECT * FROM ndbinfo.threadblocks; END IF;  IF (v_has_ps = 'YES') THEN IF (@sys.diagnostics.include_raw = 'ON') THEN SELECT '  ========================  Initial Status  ========================  ' AS ''; END IF;  DROP TEMPORARY TABLE IF EXISTS tmp_digests_start; CALL sys.statement_performance_analyzer('create_tmp', 'tmp_digests_start', NULL); CALL sys.statement_performance_analyzer('snapshot', NULL, NULL); CALL sys.statement_performance_analyzer('save', 'tmp_digests_start', NULL);  IF (@sys.diagnostics.include_raw = 'ON') THEN SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'start'); IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug'; SELECT @sys.diagnostics.sql AS 'Debug'; END IF; PREPARE stmt_gen_query FROM @sys.diagnostics.sql; END IF; SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  IF (@sys.debug = 'ON') THEN SELECT CONCAT('The following queries are for storing the initial content of ', v_table_name) AS 'Debug'; END IF;  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_start`')); CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_start` SELECT * FROM `sys`.`x$', v_table_name, '`'));  IF (@sys.diagnostics.include_raw = 'ON') THEN SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name); EXECUTE stmt_gen_query USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_start'))), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name; SELECT CONCAT('Initial ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select); END IF; END LOOP; CLOSE c_sysviews_w_delta;  IF (@sys.diagnostics.include_raw = 'ON') THEN DEALLOCATE PREPARE stmt_gen_query; END IF; END IF;  SET v_sql_status_summary_select = 'SELECT Variable_name', v_sql_status_summary_delta  = '', v_sql_status_summary_from   = '';  REPEAT SET v_output_count = v_output_count + 1; IF (v_output_count > 1) THEN SET v_sleep = in_interval-(UNIX_TIMESTAMP(NOW(2))-v_iter_start); SELECT NOW() AS 'Time', CONCAT('Going to sleep for ', v_sleep, ' seconds. Please do not interrupt') AS 'The following output is:'; DO SLEEP(in_interval); END IF; SET v_iter_start = UNIX_TIMESTAMP(NOW(2));  SELECT NOW(), CONCAT('Iteration Number ', IFNULL(v_output_count, 'NULL')) AS 'The following output is:';  IF (@@log_bin = 1) THEN SELECT 'SHOW MASTER STATUS' AS 'The following output is:'; SHOW MASTER STATUS; END IF;  IF (v_has_replication <> 'NO') THEN SELECT 'SHOW SLAVE STATUS' AS 'The following output is:'; SHOW SLAVE STATUS;  IF (v_has_ps_replication = 'YES') THEN SELECT 'Replication Connection Status' AS 'The following output is:'; SELECT * FROM performance_schema.replication_connection_status;  SELECT 'Replication Applier Status' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;  SELECT 'Replication Applier Status - Coordinator' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status_by_coordinator ORDER BY CHANNEL_NAME;  SELECT 'Replication Applier Status - Worker' AS 'The following output is:'; SELECT * FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME, WORKER_ID; END IF;  IF (@@master_info_repository = 'TABLE') THEN SELECT 'Replication - Master Log Status' AS 'The following output is:'; SELECT Master_log_name, Master_log_pos FROM mysql.slave_master_info; END IF;  IF (@@relay_log_info_repository = 'TABLE') THEN SELECT 'Replication - Relay Log Status' AS 'The following output is:'; SELECT sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos FROM mysql.slave_relay_log_info;  SELECT 'Replication - Worker Status' AS 'The following output is:'; SELECT Id, sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos, sys.format_path(Checkpoint_relay_log_name) AS Checkpoint_relay_log_name, Checkpoint_relay_log_pos, Checkpoint_master_log_name, Checkpoint_master_log_pos, Checkpoint_seqno, Checkpoint_group_size, HEX(Checkpoint_group_bitmap) AS Checkpoint_group_bitmap/*!50706 , Channel_name*/ FROM mysql.slave_worker_info ORDER BY /*!50706 Channel_name, */Id; END IF; END IF;  SET v_table_name = CONCAT('tmp_metrics_', v_output_count); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name));  CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE ', v_table_name, ' ( Variable_name VARCHAR(193) NOT NULL, Variable_value VARCHAR(1024), Type VARCHAR(225) NOT NULL, Enabled ENUM(''YES'', ''NO'', ''PARTIAL'') NOT NULL, PRIMARY KEY (Type, Variable_name) ) ENGINE = InnoDB DEFAULT CHARSET=utf8'));  IF (v_has_metrics) THEN SET @sys.diagnostics.sql = CONCAT( 'INSERT INTO ', v_table_name, ' SELECT Variable_name, REPLACE(Variable_value, ''\n'', ''\\\\n'') AS Variable_value, Type, Enabled FROM sys.metrics' ); ELSE SET @sys.diagnostics.sql = CONCAT( 'INSERT INTO ', v_table_name, '(SELECT LOWER(VARIABLE_NAME) AS Variable_name, REPLACE(VARIABLE_VALUE, ''\n'', ''\\\\n'') AS Variable_value, ''Global Status'' AS Type, ''YES'' AS Enabled FROM performance_schema.global_status ) UNION ALL ( SELECT NAME AS Variable_name, COUNT AS Variable_value, CONCAT(''InnoDB Metrics - '', SUBSYSTEM) AS Type, IF(STATUS = ''enabled'', ''YES'', ''NO'') AS Enabled FROM information_schema.INNODB_METRICS WHERE NAME NOT IN ( ''lock_row_lock_time'', ''lock_row_lock_time_avg'', ''lock_row_lock_time_max'', ''lock_row_lock_waits'', ''buffer_pool_reads'', ''buffer_pool_read_requests'', ''buffer_pool_write_requests'', ''buffer_pool_wait_free'', ''buffer_pool_read_ahead'', ''buffer_pool_read_ahead_evicted'', ''buffer_pool_pages_total'', ''buffer_pool_pages_misc'', ''buffer_pool_pages_data'', ''buffer_pool_bytes_data'', ''buffer_pool_pages_dirty'', ''buffer_pool_bytes_dirty'', ''buffer_pool_pages_free'', ''buffer_pages_created'', ''buffer_pages_written'', ''buffer_pages_read'', ''buffer_data_reads'', ''buffer_data_written'', ''file_num_open_files'', ''os_log_bytes_written'', ''os_log_fsyncs'', ''os_log_pending_fsyncs'', ''os_log_pending_writes'', ''log_waits'', ''log_write_requests'', ''log_writes'', ''innodb_dblwr_writes'', ''innodb_dblwr_pages_written'', ''innodb_page_size'') ) UNION ALL ( SELECT ''NOW()'' AS Variable_name, NOW(3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled ) UNION ALL ( SELECT ''UNIX_TIMESTAMP()'' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled ) ORDER BY Type, Variable_name;' ); END IF; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql);  CALL sys.execute_prepared_stmt( CONCAT('(SELECT Variable_value INTO @sys.diagnostics.output_time FROM ', v_table_name, ' WHERE Type = ''System Time'' AND Variable_name = ''UNIX_TIMESTAMP()'')') ); SET v_output_time = @sys.diagnostics.output_time;  SET v_sql_status_summary_select = CONCAT(v_sql_status_summary_select, ', CONCAT( LEFT(s', v_output_count, '.Variable_value, ', v_status_summary_width, '), IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'', CONCAT('' ('', ROUND(s', v_output_count, '.Variable_value/', v_output_time, ', 2), ''/sec)''), '''') ) AS ''Output ', v_output_count, ''''), v_sql_status_summary_from   = CONCAT(v_sql_status_summary_from, ' ', IF(v_output_count = 1, '  FROM ', '       INNER JOIN '), v_table_name, ' s', v_output_count, IF (v_output_count = 1, '', ' USING (Type, Variable_name)')); IF (v_output_count > 1) THEN SET v_sql_status_summary_delta  = CONCAT(v_sql_status_summary_delta, ', IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'', CONCAT(IF(s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'' OR s', v_output_count, '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'', ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value), 2), (s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value) ), '' ('', ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value)/(', v_output_time, '-', v_output_time_prev, '), 2), ''/sec)'' ), '''' ) AS ''Delta (', (v_output_count-1), ' -> ', v_output_count, ')'''); END IF;  SET v_output_time_prev = v_output_time;  IF (@sys.diagnostics.include_raw = 'ON') THEN IF (v_has_metrics) THEN SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:'; ELSE SELECT 'sys.metrics equivalent' AS 'The following output is:'; END IF; CALL sys.execute_prepared_stmt(CONCAT('SELECT Type, Variable_name, Enabled, Variable_value FROM ', v_table_name, ' ORDER BY Type, Variable_name')); END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN SELECT 'SHOW ENGINE INNODB STATUS' AS 'The following output is:'; EXECUTE stmt_innodb_status; SELECT 'InnoDB - Transactions' AS 'The following output is:'; SELECT * FROM information_schema.INNODB_TRX; END IF;  IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN SELECT 'SHOW ENGINE NDBCLUSTER STATUS' AS 'The following output is:'; EXECUTE stmt_ndbcluster_status;  SELECT 'ndbinfo.memoryusage' AS 'The following output is:'; SELECT node_id, memory_type, sys.format_bytes(used) AS used, used_pages, sys.format_bytes(total) AS total, total_pages, ROUND(100*(used/total), 2) AS 'Used %' FROM ndbinfo.memoryusage;  SET v_done = FALSE; OPEN c_ndbinfo; c_ndbinfo_loop: LOOP FETCH c_ndbinfo INTO v_table_name; IF v_done THEN LEAVE c_ndbinfo_loop; END IF;  SELECT CONCAT('SELECT * FROM ndbinfo.', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(CONCAT('SELECT * FROM `ndbinfo`.`', v_table_name, '`')); END LOOP; CLOSE c_ndbinfo;  SELECT * FROM information_schema.FILES; END IF;  SELECT 'SELECT * FROM sys.processlist' AS 'The following output is:'; SELECT processlist.* FROM sys.processlist;  IF (v_has_ps = 'YES') THEN IF (sys.ps_is_consumer_enabled('events_waits_history_long') = 'YES') THEN SELECT 'SELECT * FROM sys.latest_file_io' AS 'The following output is:'; SELECT * FROM sys.latest_file_io; END IF;  IF (EXISTS(SELECT 1 FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES')) THEN SELECT 'SELECT * FROM sys.memory_by_host_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_host_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_by_thread_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_thread_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_by_user_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_by_user_by_current_bytes;  SELECT 'SELECT * FROM sys.memory_global_by_current_bytes' AS 'The following output is:'; SELECT * FROM sys.memory_global_by_current_bytes; END IF; END IF;  SET v_runtime = (UNIX_TIMESTAMP(NOW(2)) - v_start); UNTIL (v_runtime + in_interval >= in_max_runtime) END REPEAT;  IF (v_has_ps = 'YES') THEN SELECT 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS' AS 'The following output is:'; EXECUTE stmt_ps_status; END IF;  IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN DEALLOCATE PREPARE stmt_innodb_status; END IF; IF (v_has_ps = 'YES') THEN DEALLOCATE PREPARE stmt_ps_status; END IF; IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN DEALLOCATE PREPARE stmt_ndbcluster_status; END IF;   SELECT '  ============================  Schema Information  ============================  ' AS '';  SELECT COUNT(*) AS 'Total Number of Tables' FROM information_schema.TABLES;  IF (@sys.diagnostics.allow_i_s_tables = 'ON') THEN SELECT 'Storage Engine Usage' AS 'The following output is:'; SELECT ENGINE, COUNT(*) AS NUM_TABLES, sys.format_bytes(SUM(DATA_LENGTH)) AS DATA_LENGTH, sys.format_bytes(SUM(INDEX_LENGTH)) AS INDEX_LENGTH, sys.format_bytes(SUM(DATA_LENGTH+INDEX_LENGTH)) AS TOTAL FROM information_schema.TABLES GROUP BY ENGINE;  SELECT 'Schema Object Overview' AS 'The following output is:'; SELECT * FROM sys.schema_object_overview;  SELECT 'Tables without a PRIMARY KEY' AS 'The following output is:'; SELECT TABLES.TABLE_SCHEMA, ENGINE, COUNT(*) AS NumTables FROM information_schema.TABLES LEFT OUTER JOIN information_schema.STATISTICS ON STATISTICS.TABLE_SCHEMA = TABLES.TABLE_SCHEMA AND STATISTICS.TABLE_NAME = TABLES.TABLE_NAME AND STATISTICS.INDEX_NAME = 'PRIMARY' WHERE STATISTICS.TABLE_NAME IS NULL AND TABLES.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys') AND TABLES.TABLE_TYPE = 'BASE TABLE' GROUP BY TABLES.TABLE_SCHEMA, ENGINE; END IF;  IF (v_has_ps = 'YES') THEN SELECT 'Unused Indexes' AS 'The following output is:'; SELECT object_schema, COUNT(*) AS NumUnusedIndexes FROM performance_schema.table_io_waits_summary_by_index_usage WHERE index_name IS NOT NULL AND count_star = 0 AND object_schema NOT IN ('mysql', 'sys') AND index_name != 'PRIMARY' GROUP BY object_schema; END IF;  IF (v_has_ps = 'YES') THEN SELECT '  =========================  Overall Status  =========================  ' AS '';  SELECT 'CALL sys.ps_statement_avg_latency_histogram()' AS 'The following output is:'; CALL sys.ps_statement_avg_latency_histogram();  CALL sys.statement_performance_analyzer('snapshot', NULL, NULL); CALL sys.statement_performance_analyzer('overall', NULL, 'with_runtimes_in_95th_percentile');  SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'end'); IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug'; SELECT @sys.diagnostics.sql AS 'Debug'; END IF; PREPARE stmt_gen_query FROM @sys.diagnostics.sql;  SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  IF (@sys.debug = 'ON') THEN SELECT CONCAT('The following queries are for storing the final content of ', v_table_name) AS 'Debug'; END IF;  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_end`')); CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_end` SELECT * FROM `sys`.`x$', v_table_name, '`'));  SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name); EXECUTE stmt_gen_query USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_end'))), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name; SELECT CONCAT('Overall ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select); END LOOP; CLOSE c_sysviews_w_delta;  DEALLOCATE PREPARE stmt_gen_query;   SELECT '  ======================  Delta Status  ======================  ' AS '';  CALL sys.statement_performance_analyzer('delta', 'tmp_digests_start', 'with_runtimes_in_95th_percentile'); CALL sys.statement_performance_analyzer('cleanup', NULL, NULL);  DROP TEMPORARY TABLE tmp_digests_start;  IF (@sys.debug = 'ON') THEN SELECT 'The following query will be used to generate the query for each sys view delta' AS 'Debug'; SELECT @sys.diagnostics.sql_gen_query_delta AS 'Debug'; END IF; PREPARE stmt_gen_query_delta FROM @sys.diagnostics.sql_gen_query_delta;  SET v_old_group_concat_max_len = @@session.group_concat_max_len; SET @@session.group_concat_max_len = 2048; SET v_done = FALSE; OPEN c_sysviews_w_delta; c_sysviews_w_delta_loop: LOOP FETCH c_sysviews_w_delta INTO v_table_name; IF v_done THEN LEAVE c_sysviews_w_delta_loop; END IF;  SET @sys.diagnostics.table_name = v_table_name; EXECUTE stmt_gen_query_delta USING @sys.diagnostics.table_name; SELECT CONCAT(@sys.diagnostics.sql_select, IF(where_delta IS NOT NULL, CONCAT('\n WHERE ', where_delta), ''), IF(order_by_delta IS NOT NULL, CONCAT('\n ORDER BY ', order_by_delta), ''), IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '') ) INTO @sys.diagnostics.sql_select FROM tmp_sys_views_delta WHERE TABLE_NAME = v_table_name;  SELECT CONCAT('Delta ', v_table_name) AS 'The following output is:'; CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select);  CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_end`')); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_start`')); END LOOP; CLOSE c_sysviews_w_delta; SET @@session.group_concat_max_len = v_old_group_concat_max_len;  DEALLOCATE PREPARE stmt_gen_query_delta; DROP TEMPORARY TABLE tmp_sys_views_delta; END IF;  IF (v_has_metrics) THEN SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:'; ELSE SELECT 'sys.metrics equivalent' AS 'The following output is:'; END IF; CALL sys.execute_prepared_stmt( CONCAT(v_sql_status_summary_select, v_sql_status_summary_delta, ', Type, s1.Enabled', v_sql_status_summary_from, ' ORDER BY Type, Variable_name' ) );  SET v_count = 0; WHILE (v_count < v_output_count) DO SET v_count = v_count + 1; SET v_table_name = CONCAT('tmp_metrics_', v_count); CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name)); END WHILE;  IF (in_auto_config <> 'current') THEN CALL sys.ps_setup_reload_saved(); SET sql_log_bin = @log_bin; END IF;  SET @sys.diagnostics.output_time            = NULL, @sys.diagnostics.sql                    = NULL, @sys.diagnostics.sql_gen_query_delta    = NULL, @sys.diagnostics.sql_gen_query_template = NULL, @sys.diagnostics.sql_select             = NULL, @sys.diagnostics.table_name             = NULL;  IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  IF (@log_bin = 1) THEN SET sql_log_bin = @log_bin; END IF; END;
 
 DROP PROCEDURE IF EXISTS ps_statement_avg_latency_histogram;
 
@@ -350,7 +363,7 @@ CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_statement_avg_latency_histog
 
 DROP PROCEDURE IF EXISTS ps_trace_statement_digest;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_trace_statement_digest ( IN in_digest VARCHAR(32), IN in_runtime INT,  IN in_interval DECIMAL(2,2), IN in_start_fresh BOOLEAN, IN in_auto_enable BOOLEAN ) COMMENT '\n Description\n \n Traces all instrumentation within Performance Schema for a specific\n Statement Digest. \n \n When finding a statement of interest within the \n performance_schema.events_statements_summary_by_digest table, feed\n the DIGEST MD5 value in to this procedure, set how long to poll for, \n and at what interval to poll, and it will generate a report of all \n statistics tracked within Performance Schema for that digest for the\n interval.\n \n It will also attempt to generate an EXPLAIN for the longest running \n example of the digest during the interval. Note this may fail, as:\n \n * Performance Schema truncates long SQL_TEXT values (and hence the \n EXPLAIN will fail due to parse errors)\n * the default schema is sys (so tables that are not fully qualified\n in the query may not be found)\n * some queries such as SHOW are not supported in EXPLAIN.\n \n When the EXPLAIN fails, the error will be ignored and no EXPLAIN\n output generated.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_digest (VARCHAR(32)):\n The statement digest identifier you would like to analyze\n in_runtime (INT):\n The number of seconds to run analysis for\n in_interval (DECIMAL(2,2)):\n The interval (in seconds, may be fractional) at which to try\n and take snapshots\n in_start_fresh (BOOLEAN):\n Whether to TRUNCATE the events_statements_history_long and\n events_stages_history_long tables before starting\n in_auto_enable (BOOLEAN):\n Whether to automatically turn on required consumers\n \n Example\n \n mysql> call ps_trace_statement_digest(\'891ec6860f98ba46d89dd20b0c03652c\', 10, 0.1, true, true);\n +--------------------+\n | SUMMARY STATISTICS |\n +--------------------+\n | SUMMARY STATISTICS |\n +--------------------+\n 1 row in set (9.11 sec)\n \n +------------+-----------+-----------+-----------+---------------+------------+------------+\n | executions | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scans |\n +------------+-----------+-----------+-----------+---------------+------------+------------+\n |         21 | 4.11 ms   | 2.00 ms   |         0 |            21 |          0 |          0 |\n +------------+-----------+-----------+-----------+---------------+------------+------------+\n 1 row in set (9.11 sec)\n \n +------------------------------------------+-------+-----------+\n | event_name                               | count | latency   |\n +------------------------------------------+-------+-----------+\n | stage/sql/checking query cache for query |    16 | 724.37 us |\n | stage/sql/statistics                     |    16 | 546.92 us |\n | stage/sql/freeing items                  |    18 | 520.11 us |\n | stage/sql/init                           |    51 | 466.80 us |\n ...\n | stage/sql/cleaning up                    |    18 | 11.92 us  |\n | stage/sql/executing                      |    16 | 6.95 us   |\n +------------------------------------------+-------+-----------+\n 17 rows in set (9.12 sec)\n \n +---------------------------+\n | LONGEST RUNNING STATEMENT |\n +---------------------------+\n | LONGEST RUNNING STATEMENT |\n +---------------------------+\n 1 row in set (9.16 sec)\n \n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n | thread_id | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scan |\n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n |    166646 | 618.43 us | 1.00 ms   |         0 |             1 |          0 |         0 |\n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n 1 row in set (9.16 sec)\n \n // Truncated for clarity...\n +-----------------------------------------------------------------+\n | sql_text                                                        |\n +-----------------------------------------------------------------+\n | select hibeventhe0_.id as id1382_, hibeventhe0_.createdTime ... |\n +-----------------------------------------------------------------+\n 1 row in set (9.17 sec)\n \n +------------------------------------------+-----------+\n | event_name                               | latency   |\n +------------------------------------------+-----------+\n | stage/sql/init                           | 8.61 us   |\n | stage/sql/Waiting for query cache lock   | 453.23 us |\n | stage/sql/init                           | 331.07 ns |\n | stage/sql/checking query cache for query | 43.04 us  |\n ...\n | stage/sql/freeing items                  | 30.46 us  |\n | stage/sql/cleaning up                    | 662.13 ns |\n +------------------------------------------+-----------+\n 18 rows in set (9.23 sec)\n \n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n | id | select_type | table        | type  | possible_keys | key       | key_len | ref         | rows | Extra |\n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n |  1 | SIMPLE      | hibeventhe0_ | const | fixedTime     | fixedTime | 775     | const,const |    1 | NULL  |\n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n 1 row in set (9.27 sec)\n \n Query OK, 0 rows affected (9.28 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN  DECLARE v_start_fresh BOOLEAN DEFAULT false; DECLARE v_auto_enable BOOLEAN DEFAULT false; DECLARE v_explain     BOOLEAN DEFAULT true; DECLARE v_this_thread_enabed ENUM('YES', 'NO'); DECLARE v_runtime INT DEFAULT 0; DECLARE v_start INT DEFAULT 0; DECLARE v_found_stmts INT;  SET @log_bin := @@sql_log_bin; SET sql_log_bin = 0;  SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); CALL sys.ps_setup_disable_thread(CONNECTION_ID());  DROP TEMPORARY TABLE IF EXISTS stmt_trace; CREATE TEMPORARY TABLE stmt_trace ( thread_id BIGINT UNSIGNED, timer_start BIGINT UNSIGNED, event_id BIGINT UNSIGNED, sql_text longtext, timer_wait BIGINT UNSIGNED, lock_time BIGINT UNSIGNED, errors BIGINT UNSIGNED, mysql_errno INT, rows_sent BIGINT UNSIGNED, rows_affected BIGINT UNSIGNED, rows_examined BIGINT UNSIGNED, created_tmp_tables BIGINT UNSIGNED, created_tmp_disk_tables BIGINT UNSIGNED, no_index_used BIGINT UNSIGNED, PRIMARY KEY (thread_id, timer_start) );  DROP TEMPORARY TABLE IF EXISTS stmt_stages; CREATE TEMPORARY TABLE stmt_stages ( event_id BIGINT UNSIGNED, stmt_id BIGINT UNSIGNED, event_name VARCHAR(128), timer_wait BIGINT UNSIGNED, PRIMARY KEY (event_id) );  SET v_start_fresh = in_start_fresh; IF v_start_fresh THEN TRUNCATE TABLE performance_schema.events_statements_history_long; TRUNCATE TABLE performance_schema.events_stages_history_long; END IF;  SET v_auto_enable = in_auto_enable; IF v_auto_enable THEN CALL sys.ps_setup_save(0);  UPDATE performance_schema.threads SET INSTRUMENTED = IF(PROCESSLIST_ID IS NOT NULL, 'YES', 'NO');  UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME NOT LIKE '%\_history' AND NAME NOT LIKE 'events_wait%' AND NAME NOT LIKE 'events_transactions%' AND NAME <> 'statements_digest';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES' WHERE NAME LIKE 'statement/%' OR NAME LIKE 'stage/%'; END IF;  WHILE v_runtime < in_runtime DO SELECT UNIX_TIMESTAMP() INTO v_start;  INSERT IGNORE INTO stmt_trace SELECT thread_id, timer_start, event_id, sql_text, timer_wait, lock_time, errors, mysql_errno,  rows_sent, rows_affected, rows_examined, created_tmp_tables, created_tmp_disk_tables, no_index_used FROM performance_schema.events_statements_history_long WHERE digest = in_digest;  INSERT IGNORE INTO stmt_stages SELECT stages.event_id, stmt_trace.event_id, stages.event_name, stages.timer_wait FROM performance_schema.events_stages_history_long AS stages JOIN stmt_trace ON stages.nesting_event_id = stmt_trace.event_id;  SELECT SLEEP(in_interval) INTO @sleep; SET v_runtime = v_runtime + (UNIX_TIMESTAMP() - v_start); END WHILE;  SELECT "SUMMARY STATISTICS";  SELECT COUNT(*) executions, sys.format_time(SUM(timer_wait)) AS exec_time, sys.format_time(SUM(lock_time)) AS lock_time, SUM(rows_sent) AS rows_sent, SUM(rows_affected) AS rows_affected, SUM(rows_examined) AS rows_examined, SUM(created_tmp_tables) AS tmp_tables, SUM(no_index_used) AS full_scans FROM stmt_trace;  SELECT event_name, COUNT(*) as count, sys.format_time(SUM(timer_wait)) as latency FROM stmt_stages GROUP BY event_name ORDER BY SUM(timer_wait) DESC;  SELECT "LONGEST RUNNING STATEMENT";  SELECT thread_id, sys.format_time(timer_wait) AS exec_time, sys.format_time(lock_time) AS lock_time, rows_sent, rows_affected, rows_examined, created_tmp_tables AS tmp_tables, no_index_used AS full_scan FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  SELECT sql_text FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  SELECT sql_text, event_id INTO @sql, @sql_id FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  IF (@sql_id IS NOT NULL) THEN SELECT event_name, sys.format_time(timer_wait) as latency FROM stmt_stages WHERE stmt_id = @sql_id ORDER BY event_id; END IF;  DROP TEMPORARY TABLE stmt_trace; DROP TEMPORARY TABLE stmt_stages;  IF (@sql IS NOT NULL) THEN SET @stmt := CONCAT("EXPLAIN FORMAT=JSON ", @sql); BEGIN DECLARE CONTINUE HANDLER FOR 1064, 1146 SET v_explain = false;  PREPARE explain_stmt FROM @stmt; END;  IF (v_explain) THEN EXECUTE explain_stmt; DEALLOCATE PREPARE explain_stmt; END IF; END IF;  IF v_auto_enable THEN CALL sys.ps_setup_reload_saved(); END IF; IF (v_this_thread_enabed = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  SET sql_log_bin = @log_bin; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_trace_statement_digest ( IN in_digest VARCHAR(32), IN in_runtime INT, IN in_interval DECIMAL(2,2), IN in_start_fresh BOOLEAN, IN in_auto_enable BOOLEAN ) COMMENT '\n Description\n \n Traces all instrumentation within Performance Schema for a specific\n Statement Digest.\n \n When finding a statement of interest within the\n performance_schema.events_statements_summary_by_digest table, feed\n the DIGEST MD5 value in to this procedure, set how long to poll for,\n and at what interval to poll, and it will generate a report of all\n statistics tracked within Performance Schema for that digest for the\n interval.\n \n It will also attempt to generate an EXPLAIN for the longest running\n example of the digest during the interval. Note this may fail, as:\n \n * Performance Schema truncates long SQL_TEXT values (and hence the\n EXPLAIN will fail due to parse errors)\n * the default schema is sys (so tables that are not fully qualified\n in the query may not be found)\n * some queries such as SHOW are not supported in EXPLAIN.\n \n When the EXPLAIN fails, the error will be ignored and no EXPLAIN\n output generated.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_digest (VARCHAR(32)):\n The statement digest identifier you would like to analyze\n in_runtime (INT):\n The number of seconds to run analysis for\n in_interval (DECIMAL(2,2)):\n The interval (in seconds, may be fractional) at which to try\n and take snapshots\n in_start_fresh (BOOLEAN):\n Whether to TRUNCATE the events_statements_history_long and\n events_stages_history_long tables before starting\n in_auto_enable (BOOLEAN):\n Whether to automatically turn on required consumers\n \n Example\n \n mysql> call ps_trace_statement_digest(\'891ec6860f98ba46d89dd20b0c03652c\', 10, 0.1, true, true);\n +--------------------+\n | SUMMARY STATISTICS |\n +--------------------+\n | SUMMARY STATISTICS |\n +--------------------+\n 1 row in set (9.11 sec)\n \n +------------+-----------+-----------+-----------+---------------+------------+------------+\n | executions | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scans |\n +------------+-----------+-----------+-----------+---------------+------------+------------+\n |         21 | 4.11 ms   | 2.00 ms   |         0 |            21 |          0 |          0 |\n +------------+-----------+-----------+-----------+---------------+------------+------------+\n 1 row in set (9.11 sec)\n \n +------------------------------------------+-------+-----------+\n | event_name                               | count | latency   |\n +------------------------------------------+-------+-----------+\n | stage/sql/checking query cache for query |    16 | 724.37 us |\n | stage/sql/statistics                     |    16 | 546.92 us |\n | stage/sql/freeing items                  |    18 | 520.11 us |\n | stage/sql/init                           |    51 | 466.80 us |\n ...\n | stage/sql/cleaning up                    |    18 | 11.92 us  |\n | stage/sql/executing                      |    16 | 6.95 us   |\n +------------------------------------------+-------+-----------+\n 17 rows in set (9.12 sec)\n \n +---------------------------+\n | LONGEST RUNNING STATEMENT |\n +---------------------------+\n | LONGEST RUNNING STATEMENT |\n +---------------------------+\n 1 row in set (9.16 sec)\n \n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n | thread_id | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scan |\n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n |    166646 | 618.43 us | 1.00 ms   |         0 |             1 |          0 |         0 |\n +-----------+-----------+-----------+-----------+---------------+------------+-----------+\n 1 row in set (9.16 sec)\n \n // Truncated for clarity...\n +-----------------------------------------------------------------+\n | sql_text                                                        |\n +-----------------------------------------------------------------+\n | select hibeventhe0_.id as id1382_, hibeventhe0_.createdTime ... |\n +-----------------------------------------------------------------+\n 1 row in set (9.17 sec)\n \n +------------------------------------------+-----------+\n | event_name                               | latency   |\n +------------------------------------------+-----------+\n | stage/sql/init                           | 8.61 us   |\n | stage/sql/Waiting for query cache lock   | 453.23 us |\n | stage/sql/init                           | 331.07 ns |\n | stage/sql/checking query cache for query | 43.04 us  |\n ...\n | stage/sql/freeing items                  | 30.46 us  |\n | stage/sql/cleaning up                    | 662.13 ns |\n +------------------------------------------+-----------+\n 18 rows in set (9.23 sec)\n \n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n | id | select_type | table        | type  | possible_keys | key       | key_len | ref         | rows | Extra |\n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n |  1 | SIMPLE      | hibeventhe0_ | const | fixedTime     | fixedTime | 775     | const,const |    1 | NULL  |\n +----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+\n 1 row in set (9.27 sec)\n \n Query OK, 0 rows affected (9.28 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN  DECLARE v_start_fresh BOOLEAN DEFAULT false; DECLARE v_auto_enable BOOLEAN DEFAULT false; DECLARE v_explain     BOOLEAN DEFAULT true; DECLARE v_this_thread_enabed ENUM('YES', 'NO'); DECLARE v_runtime INT DEFAULT 0; DECLARE v_start INT DEFAULT 0; DECLARE v_found_stmts INT;  SET @log_bin := @@sql_log_bin; SET sql_log_bin = 0;  SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); CALL sys.ps_setup_disable_thread(CONNECTION_ID());  DROP TEMPORARY TABLE IF EXISTS stmt_trace; CREATE TEMPORARY TABLE stmt_trace ( thread_id BIGINT UNSIGNED, timer_start BIGINT UNSIGNED, event_id BIGINT UNSIGNED, sql_text longtext, timer_wait BIGINT UNSIGNED, lock_time BIGINT UNSIGNED, errors BIGINT UNSIGNED, mysql_errno INT, rows_sent BIGINT UNSIGNED, rows_affected BIGINT UNSIGNED, rows_examined BIGINT UNSIGNED, created_tmp_tables BIGINT UNSIGNED, created_tmp_disk_tables BIGINT UNSIGNED, no_index_used BIGINT UNSIGNED, PRIMARY KEY (thread_id, timer_start) );  DROP TEMPORARY TABLE IF EXISTS stmt_stages; CREATE TEMPORARY TABLE stmt_stages ( event_id BIGINT UNSIGNED, stmt_id BIGINT UNSIGNED, event_name VARCHAR(128), timer_wait BIGINT UNSIGNED, PRIMARY KEY (event_id) );  SET v_start_fresh = in_start_fresh; IF v_start_fresh THEN TRUNCATE TABLE performance_schema.events_statements_history_long; TRUNCATE TABLE performance_schema.events_stages_history_long; END IF;  SET v_auto_enable = in_auto_enable; IF v_auto_enable THEN CALL sys.ps_setup_save(0);  UPDATE performance_schema.threads SET INSTRUMENTED = IF(PROCESSLIST_ID IS NOT NULL, 'YES', 'NO');  UPDATE performance_schema.setup_consumers SET ENABLED = 'YES' WHERE NAME NOT LIKE '%\_history' AND NAME NOT LIKE 'events_wait%' AND NAME NOT LIKE 'events_transactions%' AND NAME <> 'statements_digest';  UPDATE performance_schema.setup_instruments SET ENABLED = 'YES', TIMED   = 'YES' WHERE NAME LIKE 'statement/%' OR NAME LIKE 'stage/%'; END IF;  WHILE v_runtime < in_runtime DO SELECT UNIX_TIMESTAMP() INTO v_start;  INSERT IGNORE INTO stmt_trace SELECT thread_id, timer_start, event_id, sql_text, timer_wait, lock_time, errors, mysql_errno,  rows_sent, rows_affected, rows_examined, created_tmp_tables, created_tmp_disk_tables, no_index_used FROM performance_schema.events_statements_history_long WHERE digest = in_digest;  INSERT IGNORE INTO stmt_stages SELECT stages.event_id, stmt_trace.event_id, stages.event_name, stages.timer_wait FROM performance_schema.events_stages_history_long AS stages JOIN stmt_trace ON stages.nesting_event_id = stmt_trace.event_id;  SELECT SLEEP(in_interval) INTO @sleep; SET v_runtime = v_runtime + (UNIX_TIMESTAMP() - v_start); END WHILE;  SELECT "SUMMARY STATISTICS";  SELECT COUNT(*) executions, sys.format_time(SUM(timer_wait)) AS exec_time, sys.format_time(SUM(lock_time)) AS lock_time, SUM(rows_sent) AS rows_sent, SUM(rows_affected) AS rows_affected, SUM(rows_examined) AS rows_examined, SUM(created_tmp_tables) AS tmp_tables, SUM(no_index_used) AS full_scans FROM stmt_trace;  SELECT event_name, COUNT(*) as count, sys.format_time(SUM(timer_wait)) as latency FROM stmt_stages GROUP BY event_name ORDER BY SUM(timer_wait) DESC;  SELECT "LONGEST RUNNING STATEMENT";  SELECT thread_id, sys.format_time(timer_wait) AS exec_time, sys.format_time(lock_time) AS lock_time, rows_sent, rows_affected, rows_examined, created_tmp_tables AS tmp_tables, no_index_used AS full_scan FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  SELECT sql_text FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  SELECT sql_text, event_id INTO @sql, @sql_id FROM stmt_trace ORDER BY timer_wait DESC LIMIT 1;  IF (@sql_id IS NOT NULL) THEN SELECT event_name, sys.format_time(timer_wait) as latency FROM stmt_stages WHERE stmt_id = @sql_id ORDER BY event_id; END IF;  DROP TEMPORARY TABLE stmt_trace; DROP TEMPORARY TABLE stmt_stages;  IF (@sql IS NOT NULL) THEN SET @stmt := CONCAT("EXPLAIN FORMAT=JSON ", @sql); BEGIN DECLARE CONTINUE HANDLER FOR 1064, 1146 SET v_explain = false;  PREPARE explain_stmt FROM @stmt; END;  IF (v_explain) THEN EXECUTE explain_stmt; DEALLOCATE PREPARE explain_stmt; END IF; END IF;  IF v_auto_enable THEN CALL sys.ps_setup_reload_saved(); END IF; IF (v_this_thread_enabed = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  SET sql_log_bin = @log_bin; END;
 
 DROP PROCEDURE IF EXISTS ps_trace_thread;
 
@@ -396,13 +409,13 @@ SET @old_sql_mode = @@session.sql_mode, @@session.sql_mode = '';
 
 DROP PROCEDURE IF EXISTS ps_setup_reset_to_default;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_reset_to_default ( IN in_verbose BOOLEAN ) COMMENT '\n Description\n \n Resets the Performance Schema setup to the default settings.\n \n Parameters\n \n in_verbose (BOOLEAN):\n Whether to print each setup stage (including the SQL) whilst running.\n \n Example\n \n mysql> CALL sys.ps_setup_reset_to_default(true)\\G\n *************************** 1. row ***************************\n status: Resetting: setup_actors\n DELETE\n FROM performance_schema.setup_actors\n WHERE NOT (HOST = \'%\' AND USER = \'%\' AND ROLE = \'%\')\n 1 row in set (0.00 sec)\n \n *************************** 1. row ***************************\n status: Resetting: setup_actors\n INSERT IGNORE INTO performance_schema.setup_actors\n VALUES (\'%\', \'%\', \'%\')\n 1 row in set (0.00 sec)\n ...\n \n mysql> CALL sys.ps_setup_reset_to_default(false)\\G\n Query OK, 0 rows affected (0.00 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN SET @query = 'DELETE FROM performance_schema.setup_actors WHERE NOT (HOST = ''%'' AND USER = ''%'' AND ROLE = ''%'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'INSERT IGNORE INTO performance_schema.setup_actors VALUES (''%'', ''%'', ''%'', ''YES'', ''YES'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.setup_instruments SET ENABLED = sys.ps_is_instrument_default_enabled(NAME), TIMED   = sys.ps_is_instrument_default_timed(NAME)';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_instruments\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.setup_consumers SET ENABLED = IF(NAME IN (''events_statements_current'', ''events_transactions_current'', ''global_instrumentation'', ''thread_instrumentation'', ''statements_digest''), ''YES'', ''NO'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_consumers\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'DELETE FROM performance_schema.setup_objects WHERE NOT (OBJECT_TYPE IN (''EVENT'', ''FUNCTION'', ''PROCEDURE'', ''TABLE'', ''TRIGGER'') AND OBJECT_NAME = ''%''  AND (OBJECT_SCHEMA = ''mysql''              AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''performance_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''information_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''%''                  AND ENABLED = ''YES'' AND TIMED = ''YES''))';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'INSERT IGNORE INTO performance_schema.setup_objects VALUES (''EVENT''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''%''                 , ''%'', ''YES'', ''YES''), (''FUNCTION'' , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''%''                 , ''%'', ''YES'', ''YES''), (''PROCEDURE'', ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''%''                 , ''%'', ''YES'', ''YES''), (''TABLE''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''%''                 , ''%'', ''YES'', ''YES''), (''TRIGGER''  , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''%''                 , ''%'', ''YES'', ''YES'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.threads SET INSTRUMENTED = ''YES''';  IF (in_verbose) THEN SELECT CONCAT('Resetting: threads\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_reset_to_default ( IN in_verbose BOOLEAN ) COMMENT '\n Description\n \n Resets the Performance Schema setup to the default settings.\n \n Parameters\n \n in_verbose (BOOLEAN):\n Whether to print each setup stage (including the SQL) whilst running.\n \n Example\n \n mysql> CALL sys.ps_setup_reset_to_default(true)\\G\n *************************** 1. row ***************************\n status: Resetting: setup_actors\n DELETE\n FROM performance_schema.setup_actors\n WHERE NOT (HOST = \'%\' AND USER = \'%\' AND `ROLE` = \'%\')\n 1 row in set (0.00 sec)\n \n *************************** 1. row ***************************\n status: Resetting: setup_actors\n INSERT IGNORE INTO performance_schema.setup_actors\n VALUES (\'%\', \'%\', \'%\')\n 1 row in set (0.00 sec)\n ...\n \n mysql> CALL sys.ps_setup_reset_to_default(false)\\G\n Query OK, 0 rows affected (0.00 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN SET @query = 'DELETE FROM performance_schema.setup_actors WHERE NOT (HOST = ''%'' AND USER = ''%'' AND `ROLE` = ''%'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'INSERT IGNORE INTO performance_schema.setup_actors VALUES (''%'', ''%'', ''%'', ''YES'', ''YES'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.setup_instruments SET ENABLED = sys.ps_is_instrument_default_enabled(NAME), TIMED   = sys.ps_is_instrument_default_timed(NAME)';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_instruments\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.setup_consumers SET ENABLED = IF(NAME IN (''events_statements_current'', ''events_transactions_current'', ''global_instrumentation'', ''thread_instrumentation'', ''statements_digest''), ''YES'', ''NO'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_consumers\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'DELETE FROM performance_schema.setup_objects WHERE NOT (OBJECT_TYPE IN (''EVENT'', ''FUNCTION'', ''PROCEDURE'', ''TABLE'', ''TRIGGER'') AND OBJECT_NAME = ''%''  AND (OBJECT_SCHEMA = ''mysql''              AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''performance_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''information_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' ) OR (OBJECT_SCHEMA = ''%''                  AND ENABLED = ''YES'' AND TIMED = ''YES''))';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'INSERT IGNORE INTO performance_schema.setup_objects VALUES (''EVENT''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''EVENT''    , ''%''                 , ''%'', ''YES'', ''YES''), (''FUNCTION'' , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''FUNCTION'' , ''%''                 , ''%'', ''YES'', ''YES''), (''PROCEDURE'', ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''PROCEDURE'', ''%''                 , ''%'', ''YES'', ''YES''), (''TABLE''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''TABLE''    , ''%''                 , ''%'', ''YES'', ''YES''), (''TRIGGER''  , ''mysql''             , ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''performance_schema'', ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''information_schema'', ''%'', ''NO'' , ''NO'' ), (''TRIGGER''  , ''%''                 , ''%'', ''YES'', ''YES'')';  IF (in_verbose) THEN SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt;  SET @query = 'UPDATE performance_schema.threads SET INSTRUMENTED = ''YES''';  IF (in_verbose) THEN SELECT CONCAT('Resetting: threads\n', REPLACE(@query, '  ', '')) AS status; END IF;  PREPARE reset_stmt FROM @query; EXECUTE reset_stmt; DEALLOCATE PREPARE reset_stmt; END;
 
 SET @@session.sql_mode = @old_sql_mode;
 
 DROP PROCEDURE IF EXISTS ps_setup_save;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_save ( IN in_timeout INT ) COMMENT '\n Description\n \n Saves the current configuration of Performance Schema, \n so that you can alter the setup for debugging purposes, \n but restore it to a previous state.\n \n Use the companion procedure - ps_setup_reload_saved(), to \n restore the saved config.\n \n The named lock "sys.ps_setup_save" is taken before the\n current configuration is saved. If the attempt to get the named\n lock times out, an error occurs.\n \n The lock is released after the settings have been restored by\n calling ps_setup_reload_saved().\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_timeout INT\n The timeout in seconds used when trying to obtain the lock.\n A negative timeout means infinite timeout.\n \n Example\n \n mysql> CALL sys.ps_setup_save(-1);\n Query OK, 0 rows affected (0.08 sec)\n \n mysql> UPDATE performance_schema.setup_instruments \n ->    SET enabled = \'YES\', timed = \'YES\';\n Query OK, 547 rows affected (0.40 sec)\n Rows matched: 784  Changed: 547  Warnings: 0\n \n /* Run some tests that need more detailed instrumentation here */\n \n mysql> CALL sys.ps_setup_reload_saved();\n Query OK, 0 rows affected (0.32 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN DECLARE v_lock_result INT;  SET @log_bin := @@sql_log_bin; SET sql_log_bin = 0;  SELECT GET_LOCK('sys.ps_setup_save', in_timeout) INTO v_lock_result;  IF v_lock_result THEN DROP TEMPORARY TABLE IF EXISTS tmp_setup_actors; DROP TEMPORARY TABLE IF EXISTS tmp_setup_consumers; DROP TEMPORARY TABLE IF EXISTS tmp_setup_instruments; DROP TEMPORARY TABLE IF EXISTS tmp_threads;  CREATE TEMPORARY TABLE tmp_setup_actors LIKE performance_schema.setup_actors; CREATE TEMPORARY TABLE tmp_setup_consumers LIKE performance_schema.setup_consumers; CREATE TEMPORARY TABLE tmp_setup_instruments LIKE performance_schema.setup_instruments; CREATE TEMPORARY TABLE tmp_threads (THREAD_ID bigint unsigned NOT NULL PRIMARY KEY, INSTRUMENTED enum('YES','NO') NOT NULL);  INSERT INTO tmp_setup_actors SELECT * FROM performance_schema.setup_actors; INSERT INTO tmp_setup_consumers SELECT * FROM performance_schema.setup_consumers; INSERT INTO tmp_setup_instruments SELECT * FROM performance_schema.setup_instruments; INSERT INTO tmp_threads SELECT THREAD_ID, INSTRUMENTED FROM performance_schema.threads; ELSE SIGNAL SQLSTATE VALUE '90000' SET MESSAGE_TEXT = 'Could not lock the sys.ps_setup_save user lock, another thread has a saved configuration'; END IF;  SET sql_log_bin = @log_bin; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_save ( IN in_timeout INT ) COMMENT '\n Description\n \n Saves the current configuration of Performance Schema, \n so that you can alter the setup for debugging purposes, \n but restore it to a previous state.\n \n Use the companion procedure - ps_setup_reload_saved(), to \n restore the saved config.\n \n The named lock "sys.ps_setup_save" is taken before the\n current configuration is saved. If the attempt to get the named\n lock times out, an error occurs.\n \n The lock is released after the settings have been restored by\n calling ps_setup_reload_saved().\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_timeout INT\n The timeout in seconds used when trying to obtain the lock.\n A negative timeout means infinite timeout.\n \n Example\n \n mysql> CALL sys.ps_setup_save(-1);\n Query OK, 0 rows affected (0.08 sec)\n \n mysql> UPDATE performance_schema.setup_instruments \n ->    SET enabled = \'YES\', timed = \'YES\';\n Query OK, 547 rows affected (0.40 sec)\n Rows matched: 784  Changed: 547  Warnings: 0\n \n /* Run some tests that need more detailed instrumentation here */\n \n mysql> CALL sys.ps_setup_reload_saved();\n Query OK, 0 rows affected (0.32 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC MODIFIES SQL DATA BEGIN DECLARE v_lock_result INT;  SET @log_bin := @@sql_log_bin; SET sql_log_bin = 0;  SELECT GET_LOCK('sys.ps_setup_save', in_timeout) INTO v_lock_result;  IF v_lock_result THEN DROP TEMPORARY TABLE IF EXISTS tmp_setup_actors; DROP TEMPORARY TABLE IF EXISTS tmp_setup_consumers; DROP TEMPORARY TABLE IF EXISTS tmp_setup_instruments; DROP TEMPORARY TABLE IF EXISTS tmp_threads;  CREATE TEMPORARY TABLE tmp_setup_actors SELECT * FROM performance_schema.setup_actors LIMIT 0; CREATE TEMPORARY TABLE tmp_setup_consumers LIKE performance_schema.setup_consumers; CREATE TEMPORARY TABLE tmp_setup_instruments LIKE performance_schema.setup_instruments; CREATE TEMPORARY TABLE tmp_threads (THREAD_ID bigint unsigned NOT NULL PRIMARY KEY, INSTRUMENTED enum('YES','NO') NOT NULL);  INSERT INTO tmp_setup_actors SELECT * FROM performance_schema.setup_actors; INSERT INTO tmp_setup_consumers SELECT * FROM performance_schema.setup_consumers; INSERT INTO tmp_setup_instruments SELECT * FROM performance_schema.setup_instruments; INSERT INTO tmp_threads SELECT THREAD_ID, INSTRUMENTED FROM performance_schema.threads; ELSE SIGNAL SQLSTATE VALUE '90000' SET MESSAGE_TEXT = 'Could not lock the sys.ps_setup_save user lock, another thread has a saved configuration'; END IF;  SET sql_log_bin = @log_bin; END;
 
 DROP PROCEDURE IF EXISTS ps_setup_show_disabled;
 
@@ -434,8 +447,11 @@ CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_truncate_all_tables ( IN in_
 
 DROP PROCEDURE IF EXISTS statement_performance_analyzer;
 
-CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE statement_performance_analyzer ( IN in_action ENUM('snapshot', 'overall', 'delta', 'create_table', 'create_tmp', 'save', 'cleanup'), IN in_table VARCHAR(129), IN in_views SET ('with_runtimes_in_95th_percentile', 'analysis', 'with_errors_or_warnings', 'with_full_table_scans', 'with_sorting', 'with_temp_tables', 'custom') ) COMMENT '\n Description\n \n Create a report of the statements running on the server.\n \n The views are calculated based on the overall and/or delta activity.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_action (ENUM(''snapshot'', ''overall'', ''delta'', ''create_tmp'', ''create_table'', ''save'', ''cleanup'')):\n The action to take. Supported actions are:\n * snapshot      Store a snapshot. The default is to make a snapshot of the current content of\n performance_schema.events_statements_summary_by_digest, but by setting in_table\n this can be overwritten to copy the content of the specified table.\n The snapshot is stored in the sys.tmp_digests temporary table.\n * overall       Generate analyzis based on the content specified by in_table. For the overall analyzis,\n in_table can be NOW() to use a fresh snapshot. This will overwrite an existing snapshot.\n Use NULL for in_table to use the existing snapshot. If in_table IS NULL and no snapshot\n exists, a new will be created.\n See also in_views and @sys.statement_performance_analyzer.limit.\n * delta         Generate a delta analysis. The delta will be calculated between the reference table in\n in_table and the snapshot. An existing snapshot must exist.\n The action uses the sys.tmp_digests_delta temporary table.\n See also in_views and @sys.statement_performance_analyzer.limit.\n * create_table  Create a regular table suitable for storing the snapshot for later use, e.g. for\n calculating deltas.\n * create_tmp    Create a temporary table suitable for storing the snapshot for later use, e.g. for\n calculating deltas.\n * save          Save the snapshot in the table specified by in_table. The table must exists and have\n the correct structure.\n If no snapshot exists, a new is created.\n * cleanup       Remove the temporary tables used for the snapshot and delta.\n \n in_table (VARCHAR(129)):\n The table argument used for some actions. Use the format ''db1.t1'' or ''t1'' without using any backticks (`)\n for quoting. Periods (.) are not supported in the database and table names.\n \n The meaning of the table for each action supporting the argument is:\n \n * snapshot      The snapshot is created based on the specified table. Set to NULL or NOW() to use\n the current content of performance_schema.events_statements_summary_by_digest.\n * overall       The table with the content to create the overall analyzis for. The following values\n can be used:\n - A table name - use the content of that table.\n - NOW()        - create a fresh snapshot and overwrite the existing snapshot.\n - NULL         - use the last stored snapshot.\n * delta         The table name is mandatory and specified the reference view to compare the currently\n stored snapshot against. If no snapshot exists, a new will be created.\n * create_table  The name of the regular table to create.\n * create_tmp    The name of the temporary table to create.\n * save          The name of the table to save the currently stored snapshot into.\n \n in_views (SET (''with_runtimes_in_95th_percentile'', ''analysis'', ''with_errors_or_warnings'',\n ''with_full_table_scans'', ''with_sorting'', ''with_temp_tables'', ''custom''))\n Which views to include:  * with_runtimes_in_95th_percentile  Based on the sys.statements_with_runtimes_in_95th_percentile view * analysis                          Based on the sys.statement_analysis view * with_errors_or_warnings           Based on the sys.statements_with_errors_or_warnings view * with_full_table_scans             Based on the sys.statements_with_full_table_scans view * with_sorting                      Based on the sys.statements_with_sorting view * with_temp_tables                  Based on the sys.statements_with_temp_tables view * custom                            Use a custom view. This view must be specified in @sys.statement_performance_analyzer.view to an existing view or a query  Default is to include all except ''custom''.   Configuration Options  sys.statement_performance_analyzer.limit The maximum number of rows to include for the views that does not have a built-in limit (e.g. the 95th percentile view). If not set the limit is 100.  sys.statement_performance_analyzer.view Used together with the ''custom'' view. If the value contains a space, it is considered a query, otherwise it must be an existing view querying the performance_schema.events_statements_summary_by_digest table. There cannot be any limit clause including in the query or view definition if @sys.statement_performance_analyzer.limit > 0. If specifying a view, use the same format as for in_table.  sys.debug Whether to provide debugging output. Default is ''OFF''. Set to ''ON'' to include.   Example  To create a report with the queries in the 95th percentile since last truncate of performance_schema.events_statements_summary_by_digest and the delta for a 1 minute period:  1. Create a temporary table to store the initial snapshot. 2. Create the initial snapshot. 3. Save the initial snapshot in the temporary table. 4. Wait one minute. 5. Create a new snapshot. 6. Perform analyzis based on the new snapshot. 7. Perform analyzis based on the delta between the initial and new snapshots.  mysql> CALL sys.statement_performance_analyzer(''create_tmp'', ''mydb.tmp_digests_ini'', NULL); Query OK, 0 rows affected (0.08 sec)  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.02 sec)  mysql> CALL sys.statement_performance_analyzer(''save'', ''mydb.tmp_digests_ini'', NULL); Query OK, 0 rows affected (0.00 sec)  mysql> DO SLEEP(60); Query OK, 0 rows affected (1 min 0.00 sec)  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.02 sec)  mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.05 sec)  ...  mysql> CALL sys.statement_performance_analyzer(''delta'', ''mydb.tmp_digests_ini'', ''with_runtimes_in_95th_percentile''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.03 sec)  ...   To create an overall report of the 95th percentile queries and the top 10 queries with full table scans:  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.01 sec)                                     mysql> SET @sys.statement_performance_analyzer.limit = 10; Query OK, 0 rows affected (0.00 sec)            mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile,with_full_table_scans''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.01 sec)  ...  +-------------------------------------+ | Next Output                         | +-------------------------------------+ | Top 10 Queries with Full Table Scan | +-------------------------------------+ 1 row in set (0.09 sec)  ...   Use a custom view showing the top 10 query sorted by total execution time refreshing the view every minute using the watch command in Linux.  mysql> CREATE OR REPLACE VIEW mydb.my_statements AS -> SELECT sys.format_statement(DIGEST_TEXT) AS query, ->        SCHEMA_NAME AS db, ->        COUNT_STAR AS exec_count, ->        sys.format_time(SUM_TIMER_WAIT) AS total_latency, ->        sys.format_time(AVG_TIMER_WAIT) AS avg_latency, ->        ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg, ->        ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg, ->        ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0)) AS rows_affected_avg, ->        DIGEST AS digest ->   FROM performance_schema.events_statements_summary_by_digest -> ORDER BY SUM_TIMER_WAIT DESC; Query OK, 0 rows affected (0.01 sec)  mysql> CALL sys.statement_performance_analyzer(''create_table'', ''mydb.digests_prev'', NULL); Query OK, 0 rows affected (0.10 sec)  shell$ watch -n 60 "mysql sys --table -e \" > SET @sys.statement_performance_analyzer.view = ''mydb.my_statements''; > SET @sys.statement_performance_analyzer.limit = 10; > CALL statement_performance_analyzer(''snapshot'', NULL, NULL); > CALL statement_performance_analyzer(''delta'', ''mydb.digests_prev'', ''custom''); > CALL statement_performance_analyzer(''save'', ''mydb.digests_prev'', NULL); > \""  Every 60.0s: mysql sys --table -e "                                                                                                   ...  Mon Dec 22 10:58:51 2014  +----------------------------------+ | Next Output                      | +----------------------------------+ | Top 10 Queries Using Custom View | +----------------------------------+ +-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+ | query             | db    | exec_count | total_latency | avg_latency | rows_sent_avg | rows_examined_avg | rows_affected_avg | digest                           | +-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+ ... ' SQL SECURITY INVOKER NOT DETERMINISTIC CONTAINS SQL BEGIN DECLARE v_table_exists, v_tmp_digests_table_exists, v_custom_view_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY') DEFAULT ''; DECLARE v_this_thread_enabled ENUM('YES', 'NO'); DECLARE v_force_new_snapshot BOOLEAN DEFAULT FALSE; DECLARE v_digests_table VARCHAR(133); DECLARE v_quoted_table, v_quoted_custom_view VARCHAR(133) DEFAULT ''; DECLARE v_table_db, v_table_name, v_custom_db, v_custom_name VARCHAR(64); DECLARE v_digest_table_template, v_checksum_ref, v_checksum_table text; DECLARE v_sql longtext; DECLARE v_error_msg VARCHAR(128);   SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_disable_thread(CONNECTION_ID()); END IF;  SET @log_bin := @@sql_log_bin; IF (@log_bin = 1) THEN SET sql_log_bin = 0; END IF;   IF (@sys.statement_performance_analyzer.limit IS NULL) THEN SET @sys.statement_performance_analyzer.limit = sys.sys_get_config('statement_performance_analyzer.limit', '100'); END IF; IF (@sys.debug IS NULL) THEN SET @sys.debug                                = sys.sys_get_config('debug'                               , 'OFF'); END IF;   IF (in_table = 'NOW()') THEN SET v_force_new_snapshot = TRUE, in_table             = NULL; ELSEIF (in_table IS NOT NULL) THEN IF (NOT INSTR(in_table, '.')) THEN SET v_table_db   = DATABASE(), v_table_name = in_table; ELSE SET v_table_db   = SUBSTRING_INDEX(in_table, '.', 1); SET v_table_name = SUBSTRING(in_table, CHAR_LENGTH(v_table_db)+2); END IF;  SET v_quoted_table = CONCAT('`', v_table_db, '`.`', v_table_name, '`');  IF (@sys.debug = 'ON') THEN SELECT CONCAT('in_table is: db = ''', v_table_db, ''', table = ''', v_table_name, '''') AS 'Debug'; END IF;  IF (v_table_db = DATABASE() AND (v_table_name = 'tmp_digests' OR v_table_name = 'tmp_digests_delta')) THEN SET v_error_msg = CONCAT('Invalid value for in_table: ', v_quoted_table, ' is reserved table name.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  CALL sys.table_exists(v_table_db, v_table_name, v_table_exists); IF (@sys.debug = 'ON') THEN SELECT CONCAT('v_table_exists = ', v_table_exists) AS 'Debug'; END IF;  IF (v_table_exists = 'BASE TABLE') THEN SET v_checksum_ref = ( SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'events_statements_summary_by_digest' ), v_checksum_table = ( SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = v_table_db AND TABLE_NAME = v_table_name );  IF (v_checksum_ref <> v_checksum_table) THEN SET v_error_msg = CONCAT('The table ', IF(CHAR_LENGTH(v_quoted_table) > 93, CONCAT('...', SUBSTRING(v_quoted_table, -90)), v_quoted_table), ' has the wrong definition.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF; END IF; END IF;   IF (in_views IS NULL OR in_views = '') THEN SET in_views = 'with_runtimes_in_95th_percentile,analysis,with_errors_or_warnings,with_full_table_scans,with_sorting,with_temp_tables'; END IF;   CALL sys.table_exists(DATABASE(), 'tmp_digests', v_tmp_digests_table_exists); IF (@sys.debug = 'ON') THEN SELECT CONCAT('v_tmp_digests_table_exists = ', v_tmp_digests_table_exists) AS 'Debug'; END IF;  CASE WHEN in_action IN ('snapshot', 'overall') THEN IF (in_table IS NOT NULL) THEN IF (NOT v_table_exists IN ('TEMPORARY', 'BASE TABLE')) THEN SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be NULL, NOW() or specify an existing table.', ' The table ', IF(CHAR_LENGTH(v_quoted_table) > 16, CONCAT('...', SUBSTRING(v_quoted_table, -13)), v_quoted_table), ' does not exist.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF; END IF;  WHEN in_action IN ('delta', 'save') THEN IF (v_table_exists NOT IN ('TEMPORARY', 'BASE TABLE')) THEN SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be an existing table.', IF(in_table IS NOT NULL, CONCAT(' The table ', IF(CHAR_LENGTH(v_quoted_table) > 39, CONCAT('...', SUBSTRING(v_quoted_table, -36)), v_quoted_table), ' does not exist.'), '')); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  IF (in_action = 'delta' AND v_tmp_digests_table_exists <> 'TEMPORARY') THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'An existing snapshot generated with the statement_performance_analyzer() must exist.'; END IF; WHEN in_action = 'create_tmp' THEN IF (v_table_exists = 'TEMPORARY') THEN SET v_error_msg = CONCAT('Cannot create the table ', IF(CHAR_LENGTH(v_quoted_table) > 72, CONCAT('...', SUBSTRING(v_quoted_table, -69)), v_quoted_table), ' as it already exists.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  WHEN in_action = 'create_table' THEN IF (v_table_exists <> '') THEN SET v_error_msg = CONCAT('Cannot create the table ', IF(CHAR_LENGTH(v_quoted_table) > 52, CONCAT('...', SUBSTRING(v_quoted_table, -49)), v_quoted_table), ' as it already exists', IF(v_table_exists = 'TEMPORARY', ' as a temporary table.', '.')); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  WHEN in_action = 'cleanup' THEN DO (SELECT 1); ELSE SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Unknown action. Supported actions are: cleanup, create_table, create_tmp, delta, overall, save, snapshot'; END CASE;  SET v_digest_table_template = 'CREATE %{TEMPORARY}TABLE %{TABLE_NAME} ( `SCHEMA_NAME` varchar(64) DEFAULT NULL, `DIGEST` varchar(32) DEFAULT NULL, `DIGEST_TEXT` longtext, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL, `SUM_ERRORS` bigint(20) unsigned NOT NULL, `SUM_WARNINGS` bigint(20) unsigned NOT NULL, `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL, `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL, `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL, `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL, `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL, `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL, `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL, `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL, `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL, `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL, `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL, `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL, `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL, `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL, `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL, `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL, `FIRST_SEEN` timestamp NULL DEFAULT NULL, `LAST_SEEN` timestamp NULL DEFAULT NULL, INDEX (SCHEMA_NAME, DIGEST) ) DEFAULT CHARSET=utf8';  IF (v_force_new_snapshot OR in_action = 'snapshot' OR (in_action = 'overall' AND in_table IS NULL) OR (in_action = 'save' AND v_tmp_digests_table_exists <> 'TEMPORARY') ) THEN IF (v_tmp_digests_table_exists = 'TEMPORARY') THEN IF (@sys.debug = 'ON') THEN SELECT 'DROP TEMPORARY TABLE IF EXISTS tmp_digests' AS 'Debug'; END IF; DROP TEMPORARY TABLE IF EXISTS tmp_digests; END IF; CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', 'tmp_digests'));  SET v_sql = CONCAT('INSERT INTO tmp_digests SELECT * FROM ', IF(in_table IS NULL OR in_action = 'save', 'performance_schema.events_statements_summary_by_digest', v_quoted_table)); CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (in_action IN ('create_table', 'create_tmp')) THEN IF (in_action = 'create_table') THEN CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', ''), '%{TABLE_NAME}', v_quoted_table)); ELSE CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', v_quoted_table)); END IF; ELSEIF (in_action = 'save') THEN CALL sys.execute_prepared_stmt(CONCAT('DELETE FROM ', v_quoted_table)); CALL sys.execute_prepared_stmt(CONCAT('INSERT INTO ', v_quoted_table, ' SELECT * FROM tmp_digests')); ELSEIF (in_action = 'cleanup') THEN DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests; DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests_delta; ELSEIF (in_action IN ('overall', 'delta')) THEN IF (in_action = 'overall') THEN IF (in_table IS NULL) THEN SET v_digests_table = 'tmp_digests'; ELSE SET v_digests_table = v_quoted_table; END IF; ELSE SET v_digests_table = 'tmp_digests_delta'; DROP TEMPORARY TABLE IF EXISTS tmp_digests_delta; CREATE TEMPORARY TABLE tmp_digests_delta LIKE tmp_digests; SET v_sql = CONCAT('INSERT INTO tmp_digests_delta SELECT `d_end`.`SCHEMA_NAME`, `d_end`.`DIGEST`, `d_end`.`DIGEST_TEXT`, `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) AS ''COUNT_STAR'', `d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0) AS ''SUM_TIMER_WAIT'', `d_end`.`MIN_TIMER_WAIT` AS ''MIN_TIMER_WAIT'', IFNULL((`d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0))/NULLIF(`d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0), 0), 0) AS ''AVG_TIMER_WAIT'', `d_end`.`MAX_TIMER_WAIT` AS ''MAX_TIMER_WAIT'', `d_end`.`SUM_LOCK_TIME`-IFNULL(`d_start`.`SUM_LOCK_TIME`, 0) AS ''SUM_LOCK_TIME'', `d_end`.`SUM_ERRORS`-IFNULL(`d_start`.`SUM_ERRORS`, 0) AS ''SUM_ERRORS'', `d_end`.`SUM_WARNINGS`-IFNULL(`d_start`.`SUM_WARNINGS`, 0) AS ''SUM_WARNINGS'', `d_end`.`SUM_ROWS_AFFECTED`-IFNULL(`d_start`.`SUM_ROWS_AFFECTED`, 0) AS ''SUM_ROWS_AFFECTED'', `d_end`.`SUM_ROWS_SENT`-IFNULL(`d_start`.`SUM_ROWS_SENT`, 0) AS ''SUM_ROWS_SENT'', `d_end`.`SUM_ROWS_EXAMINED`-IFNULL(`d_start`.`SUM_ROWS_EXAMINED`, 0) AS ''SUM_ROWS_EXAMINED'', `d_end`.`SUM_CREATED_TMP_DISK_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_DISK_TABLES`, 0) AS ''SUM_CREATED_TMP_DISK_TABLES'', `d_end`.`SUM_CREATED_TMP_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_TABLES`, 0) AS ''SUM_CREATED_TMP_TABLES'', `d_end`.`SUM_SELECT_FULL_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_JOIN`, 0) AS ''SUM_SELECT_FULL_JOIN'', `d_end`.`SUM_SELECT_FULL_RANGE_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_RANGE_JOIN`, 0) AS ''SUM_SELECT_FULL_RANGE_JOIN'', `d_end`.`SUM_SELECT_RANGE`-IFNULL(`d_start`.`SUM_SELECT_RANGE`, 0) AS ''SUM_SELECT_RANGE'', `d_end`.`SUM_SELECT_RANGE_CHECK`-IFNULL(`d_start`.`SUM_SELECT_RANGE_CHECK`, 0) AS ''SUM_SELECT_RANGE_CHECK'', `d_end`.`SUM_SELECT_SCAN`-IFNULL(`d_start`.`SUM_SELECT_SCAN`, 0) AS ''SUM_SELECT_SCAN'', `d_end`.`SUM_SORT_MERGE_PASSES`-IFNULL(`d_start`.`SUM_SORT_MERGE_PASSES`, 0) AS ''SUM_SORT_MERGE_PASSES'', `d_end`.`SUM_SORT_RANGE`-IFNULL(`d_start`.`SUM_SORT_RANGE`, 0) AS ''SUM_SORT_RANGE'', `d_end`.`SUM_SORT_ROWS`-IFNULL(`d_start`.`SUM_SORT_ROWS`, 0) AS ''SUM_SORT_ROWS'', `d_end`.`SUM_SORT_SCAN`-IFNULL(`d_start`.`SUM_SORT_SCAN`, 0) AS ''SUM_SORT_SCAN'', `d_end`.`SUM_NO_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_INDEX_USED`, 0) AS ''SUM_NO_INDEX_USED'', `d_end`.`SUM_NO_GOOD_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_GOOD_INDEX_USED`, 0) AS ''SUM_NO_GOOD_INDEX_USED'', `d_end`.`FIRST_SEEN`, `d_end`.`LAST_SEEN` FROM tmp_digests d_end LEFT OUTER JOIN ', v_quoted_table, ' d_start ON `d_start`.`DIGEST` = `d_end`.`DIGEST` AND (`d_start`.`SCHEMA_NAME` = `d_end`.`SCHEMA_NAME` OR (`d_start`.`SCHEMA_NAME` IS NULL AND `d_end`.`SCHEMA_NAME` IS NULL) ) WHERE `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) > 0'); CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_runtimes_in_95th_percentile', in_views)) THEN SELECT 'Queries with Runtime in 95th Percentile' AS 'Next Output';  DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution1; DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution2; DROP TEMPORARY TABLE IF EXISTS tmp_digest_95th_percentile_by_avg_us;  CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution1 ( cnt bigint unsigned NOT NULL, avg_us decimal(21,0) NOT NULL, PRIMARY KEY (avg_us) ) ENGINE=InnoDB;  SET v_sql = CONCAT('INSERT INTO tmp_digest_avg_latency_distribution1 SELECT COUNT(*) cnt,  ROUND(avg_timer_wait/1000000) AS avg_us FROM ', v_digests_table, ' GROUP BY avg_us'); CALL sys.execute_prepared_stmt(v_sql);  CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution2 LIKE tmp_digest_avg_latency_distribution1; INSERT INTO tmp_digest_avg_latency_distribution2 SELECT * FROM tmp_digest_avg_latency_distribution1;  CREATE TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us ( avg_us decimal(21,0) NOT NULL, percentile decimal(46,4) NOT NULL, PRIMARY KEY (avg_us) ) ENGINE=InnoDB;  SET v_sql = CONCAT('INSERT INTO tmp_digest_95th_percentile_by_avg_us SELECT s2.avg_us avg_us, IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM ', v_digests_table, '), 0), 0) percentile FROM tmp_digest_avg_latency_distribution1 AS s1 JOIN tmp_digest_avg_latency_distribution2 AS s2 ON s1.avg_us <= s2.avg_us GROUP BY s2.avg_us HAVING percentile > 0.95 ORDER BY percentile LIMIT 1'); CALL sys.execute_prepared_stmt(v_sql);  SET v_sql = REPLACE( REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_runtimes_in_95th_percentile' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ), 'sys.x$ps_digest_95th_percentile_by_avg_us', '`sys`.`x$ps_digest_95th_percentile_by_avg_us`' ); CALL sys.execute_prepared_stmt(v_sql);  DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution1; DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution2; DROP TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us; END IF;  IF (FIND_IN_SET('analysis', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Ordered by Total Latency') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statement_analysis' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_errors_or_warnings', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Errors') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_errors_or_warnings' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_full_table_scans', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Full Table Scan') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_full_table_scans' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_sorting', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Sorting') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_sorting' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_temp_tables', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Internal Temporary Tables') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_temp_tables' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('custom', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Using Custom View') AS 'Next Output';  IF (@sys.statement_performance_analyzer.view IS NULL) THEN SET @sys.statement_performance_analyzer.view = sys.sys_get_config('statement_performance_analyzer.view', NULL); END IF; IF (@sys.statement_performance_analyzer.view IS NULL) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable must be set with the view or query to use.'; END IF;  IF (NOT INSTR(@sys.statement_performance_analyzer.view, ' ')) THEN IF (NOT INSTR(@sys.statement_performance_analyzer.view, '.')) THEN SET v_custom_db   = DATABASE(), v_custom_name = @sys.statement_performance_analyzer.view; ELSE SET v_custom_db   = SUBSTRING_INDEX(@sys.statement_performance_analyzer.view, '.', 1); SET v_custom_name = SUBSTRING(@sys.statement_performance_analyzer.view, CHAR_LENGTH(v_custom_db)+2); END IF;  CALL sys.table_exists(v_custom_db, v_custom_name, v_custom_view_exists); IF (v_custom_view_exists <> 'VIEW') THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable is set but specified neither an existing view nor a query.'; END IF;  SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = v_custom_db AND TABLE_NAME = v_custom_name ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); ELSE SET v_sql = REPLACE(@sys.statement_performance_analyzer.view, '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table); END IF;  IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF;  CALL sys.execute_prepared_stmt(v_sql); END IF; END IF;  IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  IF (@log_bin = 1) THEN SET sql_log_bin = @log_bin; END IF; END;
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE statement_performance_analyzer ( IN in_action ENUM('snapshot', 'overall', 'delta', 'create_table', 'create_tmp', 'save', 'cleanup'), IN in_table VARCHAR(129), IN in_views SET ('with_runtimes_in_95th_percentile', 'analysis', 'with_errors_or_warnings', 'with_full_table_scans', 'with_sorting', 'with_temp_tables', 'custom') ) COMMENT '\n Description\n \n Create a report of the statements running on the server.\n \n The views are calculated based on the overall and/or delta activity.\n \n Requires the SUPER privilege for "SET sql_log_bin = 0;".\n \n Parameters\n \n in_action (ENUM(''snapshot'', ''overall'', ''delta'', ''create_tmp'', ''create_table'', ''save'', ''cleanup'')):\n The action to take. Supported actions are:\n * snapshot      Store a snapshot. The default is to make a snapshot of the current content of\n performance_schema.events_statements_summary_by_digest, but by setting in_table\n this can be overwritten to copy the content of the specified table.\n The snapshot is stored in the sys.tmp_digests temporary table.\n * overall       Generate analyzis based on the content specified by in_table. For the overall analyzis,\n in_table can be NOW() to use a fresh snapshot. This will overwrite an existing snapshot.\n Use NULL for in_table to use the existing snapshot. If in_table IS NULL and no snapshot\n exists, a new will be created.\n See also in_views and @sys.statement_performance_analyzer.limit.\n * delta         Generate a delta analysis. The delta will be calculated between the reference table in\n in_table and the snapshot. An existing snapshot must exist.\n The action uses the sys.tmp_digests_delta temporary table.\n See also in_views and @sys.statement_performance_analyzer.limit.\n * create_table  Create a regular table suitable for storing the snapshot for later use, e.g. for\n calculating deltas.\n * create_tmp    Create a temporary table suitable for storing the snapshot for later use, e.g. for\n calculating deltas.\n * save          Save the snapshot in the table specified by in_table. The table must exists and have\n the correct structure.\n If no snapshot exists, a new is created.\n * cleanup       Remove the temporary tables used for the snapshot and delta.\n \n in_table (VARCHAR(129)):\n The table argument used for some actions. Use the format ''db1.t1'' or ''t1'' without using any backticks (`)\n for quoting. Periods (.) are not supported in the database and table names.\n \n The meaning of the table for each action supporting the argument is:\n \n * snapshot      The snapshot is created based on the specified table. Set to NULL or NOW() to use\n the current content of performance_schema.events_statements_summary_by_digest.\n * overall       The table with the content to create the overall analyzis for. The following values\n can be used:\n - A table name - use the content of that table.\n - NOW()        - create a fresh snapshot and overwrite the existing snapshot.\n - NULL         - use the last stored snapshot.\n * delta         The table name is mandatory and specified the reference view to compare the currently\n stored snapshot against. If no snapshot exists, a new will be created.\n * create_table  The name of the regular table to create.\n * create_tmp    The name of the temporary table to create.\n * save          The name of the table to save the currently stored snapshot into.\n \n in_views (SET (''with_runtimes_in_95th_percentile'', ''analysis'', ''with_errors_or_warnings'',\n ''with_full_table_scans'', ''with_sorting'', ''with_temp_tables'', ''custom''))\n Which views to include:  * with_runtimes_in_95th_percentile  Based on the sys.statements_with_runtimes_in_95th_percentile view * analysis                          Based on the sys.statement_analysis view * with_errors_or_warnings           Based on the sys.statements_with_errors_or_warnings view * with_full_table_scans             Based on the sys.statements_with_full_table_scans view * with_sorting                      Based on the sys.statements_with_sorting view * with_temp_tables                  Based on the sys.statements_with_temp_tables view * custom                            Use a custom view. This view must be specified in @sys.statement_performance_analyzer.view to an existing view or a query  Default is to include all except ''custom''.   Configuration Options  sys.statement_performance_analyzer.limit The maximum number of rows to include for the views that does not have a built-in limit (e.g. the 95th percentile view). If not set the limit is 100.  sys.statement_performance_analyzer.view Used together with the ''custom'' view. If the value contains a space, it is considered a query, otherwise it must be an existing view querying the performance_schema.events_statements_summary_by_digest table. There cannot be any limit clause including in the query or view definition if @sys.statement_performance_analyzer.limit > 0. If specifying a view, use the same format as for in_table.  sys.debug Whether to provide debugging output. Default is ''OFF''. Set to ''ON'' to include.   Example  To create a report with the queries in the 95th percentile since last truncate of performance_schema.events_statements_summary_by_digest and the delta for a 1 minute period:  1. Create a temporary table to store the initial snapshot. 2. Create the initial snapshot. 3. Save the initial snapshot in the temporary table. 4. Wait one minute. 5. Create a new snapshot. 6. Perform analyzis based on the new snapshot. 7. Perform analyzis based on the delta between the initial and new snapshots.  mysql> CALL sys.statement_performance_analyzer(''create_tmp'', ''mydb.tmp_digests_ini'', NULL); Query OK, 0 rows affected (0.08 sec)  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.02 sec)  mysql> CALL sys.statement_performance_analyzer(''save'', ''mydb.tmp_digests_ini'', NULL); Query OK, 0 rows affected (0.00 sec)  mysql> DO SLEEP(60); Query OK, 0 rows affected (1 min 0.00 sec)  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.02 sec)  mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.05 sec)  ...  mysql> CALL sys.statement_performance_analyzer(''delta'', ''mydb.tmp_digests_ini'', ''with_runtimes_in_95th_percentile''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.03 sec)  ...   To create an overall report of the 95th percentile queries and the top 10 queries with full table scans:  mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL); Query OK, 0 rows affected (0.01 sec)  mysql> SET @sys.statement_performance_analyzer.limit = 10; Query OK, 0 rows affected (0.00 sec)  mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile,with_full_table_scans''); +-----------------------------------------+ | Next Output                             | +-----------------------------------------+ | Queries with Runtime in 95th Percentile | +-----------------------------------------+ 1 row in set (0.01 sec)  ...  +-------------------------------------+ | Next Output                         | +-------------------------------------+ | Top 10 Queries with Full Table Scan | +-------------------------------------+ 1 row in set (0.09 sec)  ...   Use a custom view showing the top 10 query sorted by total execution time refreshing the view every minute using the watch command in Linux.  mysql> CREATE OR REPLACE VIEW mydb.my_statements AS -> SELECT sys.format_statement(DIGEST_TEXT) AS query, ->        SCHEMA_NAME AS db, ->        COUNT_STAR AS exec_count, ->        sys.format_time(SUM_TIMER_WAIT) AS total_latency, ->        sys.format_time(AVG_TIMER_WAIT) AS avg_latency, ->        ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg, ->        ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg, ->        ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0)) AS rows_affected_avg, ->        DIGEST AS digest ->   FROM performance_schema.events_statements_summary_by_digest -> ORDER BY SUM_TIMER_WAIT DESC; Query OK, 0 rows affected (0.01 sec)  mysql> CALL sys.statement_performance_analyzer(''create_table'', ''mydb.digests_prev'', NULL); Query OK, 0 rows affected (0.10 sec)  shell$ watch -n 60 "mysql sys --table -e \" > SET @sys.statement_performance_analyzer.view = ''mydb.my_statements''; > SET @sys.statement_performance_analyzer.limit = 10; > CALL statement_performance_analyzer(''snapshot'', NULL, NULL); > CALL statement_performance_analyzer(''delta'', ''mydb.digests_prev'', ''custom''); > CALL statement_performance_analyzer(''save'', ''mydb.digests_prev'', NULL); > \""  Every 60.0s: mysql sys --table -e "                                                                                                   ...  Mon Dec 22 10:58:51 2014  +----------------------------------+ | Next Output                      | +----------------------------------+ | Top 10 Queries Using Custom View | +----------------------------------+ +-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+ | query             | db    | exec_count | total_latency | avg_latency | rows_sent_avg | rows_examined_avg | rows_affected_avg | digest                           | +-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+ ... ' SQL SECURITY INVOKER NOT DETERMINISTIC CONTAINS SQL BEGIN DECLARE v_table_exists, v_tmp_digests_table_exists, v_custom_view_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY') DEFAULT ''; DECLARE v_this_thread_enabled ENUM('YES', 'NO'); DECLARE v_force_new_snapshot BOOLEAN DEFAULT FALSE; DECLARE v_digests_table VARCHAR(133); DECLARE v_quoted_table, v_quoted_custom_view VARCHAR(133) DEFAULT ''; DECLARE v_table_db, v_table_name, v_custom_db, v_custom_name VARCHAR(64); DECLARE v_digest_table_template, v_checksum_ref, v_checksum_table text; DECLARE v_sql longtext; DECLARE v_error_msg VARCHAR(128);   SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID(); IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_disable_thread(CONNECTION_ID()); END IF;  SET @log_bin := @@sql_log_bin; IF (@log_bin = 1) THEN SET sql_log_bin = 0; END IF;   IF (@sys.statement_performance_analyzer.limit IS NULL) THEN SET @sys.statement_performance_analyzer.limit = sys.sys_get_config('statement_performance_analyzer.limit', '100'); END IF; IF (@sys.debug IS NULL) THEN SET @sys.debug                                = sys.sys_get_config('debug'                               , 'OFF'); END IF;   IF (in_table = 'NOW()') THEN SET v_force_new_snapshot = TRUE, in_table             = NULL; ELSEIF (in_table IS NOT NULL) THEN IF (NOT INSTR(in_table, '.')) THEN SET v_table_db   = DATABASE(), v_table_name = in_table; ELSE SET v_table_db   = SUBSTRING_INDEX(in_table, '.', 1); SET v_table_name = SUBSTRING(in_table, CHAR_LENGTH(v_table_db)+2); END IF;  SET v_quoted_table = CONCAT('`', v_table_db, '`.`', v_table_name, '`');  IF (@sys.debug = 'ON') THEN SELECT CONCAT('in_table is: db = ''', v_table_db, ''', table = ''', v_table_name, '''') AS 'Debug'; END IF;  IF (v_table_db = DATABASE() AND (v_table_name = 'tmp_digests' OR v_table_name = 'tmp_digests_delta')) THEN SET v_error_msg = CONCAT('Invalid value for in_table: ', v_quoted_table, ' is reserved table name.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  CALL sys.table_exists(v_table_db, v_table_name, v_table_exists); IF (@sys.debug = 'ON') THEN SELECT CONCAT('v_table_exists = ', v_table_exists) AS 'Debug'; END IF;  IF (v_table_exists = 'BASE TABLE') THEN SET v_checksum_ref = ( SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'events_statements_summary_by_digest' ), v_checksum_table = ( SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = v_table_db AND TABLE_NAME = v_table_name );  IF (v_checksum_ref <> v_checksum_table) THEN SET v_error_msg = CONCAT('The table ', IF(CHAR_LENGTH(v_quoted_table) > 93, CONCAT('...', SUBSTRING(v_quoted_table, -90)), v_quoted_table), ' has the wrong definition.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF; END IF; END IF;   IF (in_views IS NULL OR in_views = '') THEN SET in_views = 'with_runtimes_in_95th_percentile,analysis,with_errors_or_warnings,with_full_table_scans,with_sorting,with_temp_tables'; END IF;   CALL sys.table_exists(DATABASE(), 'tmp_digests', v_tmp_digests_table_exists); IF (@sys.debug = 'ON') THEN SELECT CONCAT('v_tmp_digests_table_exists = ', v_tmp_digests_table_exists) AS 'Debug'; END IF;  CASE WHEN in_action IN ('snapshot', 'overall') THEN IF (in_table IS NOT NULL) THEN IF (NOT v_table_exists IN ('TEMPORARY', 'BASE TABLE')) THEN SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be NULL, NOW() or specify an existing table.', ' The table ', IF(CHAR_LENGTH(v_quoted_table) > 16, CONCAT('...', SUBSTRING(v_quoted_table, -13)), v_quoted_table), ' does not exist.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF; END IF;  WHEN in_action IN ('delta', 'save') THEN IF (v_table_exists NOT IN ('TEMPORARY', 'BASE TABLE')) THEN SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be an existing table.', IF(in_table IS NOT NULL, CONCAT(' The table ', IF(CHAR_LENGTH(v_quoted_table) > 39, CONCAT('...', SUBSTRING(v_quoted_table, -36)), v_quoted_table), ' does not exist.'), '')); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  IF (in_action = 'delta' AND v_tmp_digests_table_exists <> 'TEMPORARY') THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'An existing snapshot generated with the statement_performance_analyzer() must exist.'; END IF; WHEN in_action = 'create_tmp' THEN IF (v_table_exists = 'TEMPORARY') THEN SET v_error_msg = CONCAT('Cannot create the table ', IF(CHAR_LENGTH(v_quoted_table) > 72, CONCAT('...', SUBSTRING(v_quoted_table, -69)), v_quoted_table), ' as it already exists.'); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  WHEN in_action = 'create_table' THEN IF (v_table_exists <> '') THEN SET v_error_msg = CONCAT('Cannot create the table ', IF(CHAR_LENGTH(v_quoted_table) > 52, CONCAT('...', SUBSTRING(v_quoted_table, -49)), v_quoted_table), ' as it already exists', IF(v_table_exists = 'TEMPORARY', ' as a temporary table.', '.')); SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = v_error_msg; END IF;  WHEN in_action = 'cleanup' THEN DO (SELECT 1); ELSE SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'Unknown action. Supported actions are: cleanup, create_table, create_tmp, delta, overall, save, snapshot'; END CASE;  SET v_digest_table_template = 'CREATE %{TEMPORARY}TABLE %{TABLE_NAME} ( `SCHEMA_NAME` varchar(64) DEFAULT NULL, `DIGEST` varchar(32) DEFAULT NULL, `DIGEST_TEXT` longtext, `COUNT_STAR` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL, `SUM_ERRORS` bigint(20) unsigned NOT NULL, `SUM_WARNINGS` bigint(20) unsigned NOT NULL, `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL, `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL, `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL, `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL, `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL, `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL, `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL, `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL, `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL, `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL, `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL, `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL, `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL, `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL, `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL, `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL, `FIRST_SEEN` timestamp NULL DEFAULT NULL, `LAST_SEEN` timestamp NULL DEFAULT NULL, INDEX (SCHEMA_NAME, DIGEST) ) DEFAULT CHARSET=utf8';  IF (v_force_new_snapshot OR in_action = 'snapshot' OR (in_action = 'overall' AND in_table IS NULL) OR (in_action = 'save' AND v_tmp_digests_table_exists <> 'TEMPORARY') ) THEN IF (v_tmp_digests_table_exists = 'TEMPORARY') THEN IF (@sys.debug = 'ON') THEN SELECT 'DROP TEMPORARY TABLE IF EXISTS tmp_digests' AS 'Debug'; END IF; DROP TEMPORARY TABLE IF EXISTS tmp_digests; END IF; CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', 'tmp_digests'));  SET v_sql = CONCAT('INSERT INTO tmp_digests SELECT * FROM ', IF(in_table IS NULL OR in_action = 'save', 'performance_schema.events_statements_summary_by_digest', v_quoted_table)); CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (in_action IN ('create_table', 'create_tmp')) THEN IF (in_action = 'create_table') THEN CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', ''), '%{TABLE_NAME}', v_quoted_table)); ELSE CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', v_quoted_table)); END IF; ELSEIF (in_action = 'save') THEN CALL sys.execute_prepared_stmt(CONCAT('DELETE FROM ', v_quoted_table)); CALL sys.execute_prepared_stmt(CONCAT('INSERT INTO ', v_quoted_table, ' SELECT * FROM tmp_digests')); ELSEIF (in_action = 'cleanup') THEN DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests; DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests_delta; ELSEIF (in_action IN ('overall', 'delta')) THEN IF (in_action = 'overall') THEN IF (in_table IS NULL) THEN SET v_digests_table = 'tmp_digests'; ELSE SET v_digests_table = v_quoted_table; END IF; ELSE SET v_digests_table = 'tmp_digests_delta'; DROP TEMPORARY TABLE IF EXISTS tmp_digests_delta; CREATE TEMPORARY TABLE tmp_digests_delta LIKE tmp_digests; SET v_sql = CONCAT('INSERT INTO tmp_digests_delta SELECT `d_end`.`SCHEMA_NAME`, `d_end`.`DIGEST`, `d_end`.`DIGEST_TEXT`, `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) AS ''COUNT_STAR'', `d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0) AS ''SUM_TIMER_WAIT'', `d_end`.`MIN_TIMER_WAIT` AS ''MIN_TIMER_WAIT'', IFNULL((`d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0))/NULLIF(`d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0), 0), 0) AS ''AVG_TIMER_WAIT'', `d_end`.`MAX_TIMER_WAIT` AS ''MAX_TIMER_WAIT'', `d_end`.`SUM_LOCK_TIME`-IFNULL(`d_start`.`SUM_LOCK_TIME`, 0) AS ''SUM_LOCK_TIME'', `d_end`.`SUM_ERRORS`-IFNULL(`d_start`.`SUM_ERRORS`, 0) AS ''SUM_ERRORS'', `d_end`.`SUM_WARNINGS`-IFNULL(`d_start`.`SUM_WARNINGS`, 0) AS ''SUM_WARNINGS'', `d_end`.`SUM_ROWS_AFFECTED`-IFNULL(`d_start`.`SUM_ROWS_AFFECTED`, 0) AS ''SUM_ROWS_AFFECTED'', `d_end`.`SUM_ROWS_SENT`-IFNULL(`d_start`.`SUM_ROWS_SENT`, 0) AS ''SUM_ROWS_SENT'', `d_end`.`SUM_ROWS_EXAMINED`-IFNULL(`d_start`.`SUM_ROWS_EXAMINED`, 0) AS ''SUM_ROWS_EXAMINED'', `d_end`.`SUM_CREATED_TMP_DISK_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_DISK_TABLES`, 0) AS ''SUM_CREATED_TMP_DISK_TABLES'', `d_end`.`SUM_CREATED_TMP_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_TABLES`, 0) AS ''SUM_CREATED_TMP_TABLES'', `d_end`.`SUM_SELECT_FULL_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_JOIN`, 0) AS ''SUM_SELECT_FULL_JOIN'', `d_end`.`SUM_SELECT_FULL_RANGE_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_RANGE_JOIN`, 0) AS ''SUM_SELECT_FULL_RANGE_JOIN'', `d_end`.`SUM_SELECT_RANGE`-IFNULL(`d_start`.`SUM_SELECT_RANGE`, 0) AS ''SUM_SELECT_RANGE'', `d_end`.`SUM_SELECT_RANGE_CHECK`-IFNULL(`d_start`.`SUM_SELECT_RANGE_CHECK`, 0) AS ''SUM_SELECT_RANGE_CHECK'', `d_end`.`SUM_SELECT_SCAN`-IFNULL(`d_start`.`SUM_SELECT_SCAN`, 0) AS ''SUM_SELECT_SCAN'', `d_end`.`SUM_SORT_MERGE_PASSES`-IFNULL(`d_start`.`SUM_SORT_MERGE_PASSES`, 0) AS ''SUM_SORT_MERGE_PASSES'', `d_end`.`SUM_SORT_RANGE`-IFNULL(`d_start`.`SUM_SORT_RANGE`, 0) AS ''SUM_SORT_RANGE'', `d_end`.`SUM_SORT_ROWS`-IFNULL(`d_start`.`SUM_SORT_ROWS`, 0) AS ''SUM_SORT_ROWS'', `d_end`.`SUM_SORT_SCAN`-IFNULL(`d_start`.`SUM_SORT_SCAN`, 0) AS ''SUM_SORT_SCAN'', `d_end`.`SUM_NO_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_INDEX_USED`, 0) AS ''SUM_NO_INDEX_USED'', `d_end`.`SUM_NO_GOOD_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_GOOD_INDEX_USED`, 0) AS ''SUM_NO_GOOD_INDEX_USED'', `d_end`.`FIRST_SEEN`, `d_end`.`LAST_SEEN` FROM tmp_digests d_end LEFT OUTER JOIN ', v_quoted_table, ' d_start ON `d_start`.`DIGEST` = `d_end`.`DIGEST` AND (`d_start`.`SCHEMA_NAME` = `d_end`.`SCHEMA_NAME` OR (`d_start`.`SCHEMA_NAME` IS NULL AND `d_end`.`SCHEMA_NAME` IS NULL) ) WHERE `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) > 0'); CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_runtimes_in_95th_percentile', in_views)) THEN SELECT 'Queries with Runtime in 95th Percentile' AS 'Next Output';  DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution1; DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution2; DROP TEMPORARY TABLE IF EXISTS tmp_digest_95th_percentile_by_avg_us;  CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution1 ( cnt bigint unsigned NOT NULL, avg_us decimal(21,0) NOT NULL, PRIMARY KEY (avg_us) ) ENGINE=InnoDB;  SET v_sql = CONCAT('INSERT INTO tmp_digest_avg_latency_distribution1 SELECT COUNT(*) cnt, ROUND(avg_timer_wait/1000000) AS avg_us FROM ', v_digests_table, ' GROUP BY avg_us'); CALL sys.execute_prepared_stmt(v_sql);  CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution2 LIKE tmp_digest_avg_latency_distribution1; INSERT INTO tmp_digest_avg_latency_distribution2 SELECT * FROM tmp_digest_avg_latency_distribution1;  CREATE TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us ( avg_us decimal(21,0) NOT NULL, percentile decimal(46,4) NOT NULL, PRIMARY KEY (avg_us) ) ENGINE=InnoDB;  SET v_sql = CONCAT('INSERT INTO tmp_digest_95th_percentile_by_avg_us SELECT s2.avg_us avg_us, IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM ', v_digests_table, '), 0), 0) percentile FROM tmp_digest_avg_latency_distribution1 AS s1 JOIN tmp_digest_avg_latency_distribution2 AS s2 ON s1.avg_us <= s2.avg_us GROUP BY s2.avg_us HAVING percentile > 0.95 ORDER BY percentile LIMIT 1'); CALL sys.execute_prepared_stmt(v_sql);  SET v_sql = REPLACE( REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_runtimes_in_95th_percentile' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ), 'sys.x$ps_digest_95th_percentile_by_avg_us', '`sys`.`x$ps_digest_95th_percentile_by_avg_us`' ); CALL sys.execute_prepared_stmt(v_sql);  DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution1; DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution2; DROP TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us; END IF;  IF (FIND_IN_SET('analysis', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Ordered by Total Latency') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statement_analysis' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_errors_or_warnings', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Errors') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_errors_or_warnings' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_full_table_scans', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Full Table Scan') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_full_table_scans' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_sorting', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Sorting') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_sorting' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('with_temp_tables', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Internal Temporary Tables') AS 'Next Output'; SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_temp_tables' ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF; CALL sys.execute_prepared_stmt(v_sql); END IF;  IF (FIND_IN_SET('custom', in_views)) THEN SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Using Custom View') AS 'Next Output';  IF (@sys.statement_performance_analyzer.view IS NULL) THEN SET @sys.statement_performance_analyzer.view = sys.sys_get_config('statement_performance_analyzer.view', NULL); END IF; IF (@sys.statement_performance_analyzer.view IS NULL) THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable must be set with the view or query to use.'; END IF;  IF (NOT INSTR(@sys.statement_performance_analyzer.view, ' ')) THEN IF (NOT INSTR(@sys.statement_performance_analyzer.view, '.')) THEN SET v_custom_db   = DATABASE(), v_custom_name = @sys.statement_performance_analyzer.view; ELSE SET v_custom_db   = SUBSTRING_INDEX(@sys.statement_performance_analyzer.view, '.', 1); SET v_custom_name = SUBSTRING(@sys.statement_performance_analyzer.view, CHAR_LENGTH(v_custom_db)+2); END IF;  CALL sys.table_exists(v_custom_db, v_custom_name, v_custom_view_exists); IF (v_custom_view_exists <> 'VIEW') THEN SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable is set but specified neither an existing view nor a query.'; END IF;  SET v_sql = REPLACE( (SELECT VIEW_DEFINITION FROM information_schema.VIEWS WHERE TABLE_SCHEMA = v_custom_db AND TABLE_NAME = v_custom_name ), '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table ); ELSE SET v_sql = REPLACE(@sys.statement_performance_analyzer.view, '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table); END IF;  IF (@sys.statement_performance_analyzer.limit > 0) THEN SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit); END IF;  CALL sys.execute_prepared_stmt(v_sql); END IF; END IF;  IF (v_this_thread_enabled = 'YES') THEN CALL sys.ps_setup_enable_thread(CONNECTION_ID()); END IF;  IF (@log_bin = 1) THEN SET sql_log_bin = @log_bin; END IF; END;
 
 DROP PROCEDURE IF EXISTS table_exists;
 
 CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE table_exists ( IN in_db VARCHAR(64), IN in_table VARCHAR(64), OUT out_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY') ) COMMENT '\n Description\n \n Tests whether the table specified in in_db and in_table exists either as a regular\n table, or as a temporary table. The returned value corresponds to the table that\n will be used, so if there''s both a temporary and a permanent table with the given\n name, then ''TEMPORARY'' will be returned.\n \n Parameters\n \n in_db (VARCHAR(64)):\n The database name to check for the existance of the table in.\n \n in_table (VARCHAR(64)):\n The name of the table to check the existance of.\n \n out_exists ENUM('''', ''BASE TABLE'', ''VIEW'', ''TEMPORARY''):\n The return value: whether the table exists. The value is one of:\n * ''''           - the table does not exist neither as a base table, view, nor temporary table.\n * ''BASE TABLE'' - the table name exists as a permanent base table table.\n * ''VIEW''       - the table name exists as a view.\n * ''TEMPORARY''  - the table name exists as a temporary table.\n \n Example\n \n mysql> CREATE DATABASE db1;\n Query OK, 1 row affected (0.07 sec)\n \n mysql> use db1;\n Database changed\n mysql> CREATE TABLE t1 (id INT PRIMARY KEY);\n Query OK, 0 rows affected (0.08 sec)\n \n mysql> CREATE TABLE t2 (id INT PRIMARY KEY);\n Query OK, 0 rows affected (0.08 sec)\n \n mysql> CREATE view v_t1 AS SELECT * FROM t1;\n Query OK, 0 rows affected (0.00 sec)\n \n mysql> CREATE TEMPORARY TABLE t1 (id INT PRIMARY KEY);\n Query OK, 0 rows affected (0.00 sec)\n \n mysql> CALL sys.table_exists(''db1'', ''t1'', @exists); SELECT @exists;\n Query OK, 0 rows affected (0.00 sec)\n \n +------------+\n | @exists    |\n +------------+\n | TEMPORARY  |\n +------------+\n 1 row in set (0.00 sec)\n \n mysql> CALL sys.table_exists(''db1'', ''t2'', @exists); SELECT @exists;\n Query OK, 0 rows affected (0.00 sec)\n \n +------------+\n | @exists    |\n +------------+\n | BASE TABLE |\n +------------+\n 1 row in set (0.01 sec)\n \n mysql> CALL sys.table_exists(''db1'', ''v_t1'', @exists); SELECT @exists;\n Query OK, 0 rows affected (0.00 sec)\n \n +---------+\n | @exists |\n +---------+\n | VIEW    |\n +---------+\n 1 row in set (0.00 sec)\n \n mysql> CALL sys.table_exists(''db1'', ''t3'', @exists); SELECT @exists;\n Query OK, 0 rows affected (0.01 sec)\n \n +---------+\n | @exists |\n +---------+\n |         |\n +---------+\n 1 row in set (0.00 sec)\n ' SQL SECURITY INVOKER NOT DETERMINISTIC CONTAINS SQL BEGIN DECLARE v_error BOOLEAN DEFAULT FALSE; DECLARE CONTINUE HANDLER FOR 1050 SET v_error = TRUE; DECLARE CONTINUE HANDLER FOR 1146 SET v_error = TRUE;  SET out_exists = '';  IF (EXISTS(SELECT 1 FROM information_schema.TABLES WHERE TABLE_SCHEMA = in_db AND TABLE_NAME = in_table)) THEN SET @sys.tmp.table_exists.SQL = CONCAT('CREATE TEMPORARY TABLE `', in_db, '`.`', in_table, '` (id INT PRIMARY KEY)'); PREPARE stmt_create_table FROM @sys.tmp.table_exists.SQL; EXECUTE stmt_create_table; DEALLOCATE PREPARE stmt_create_table; IF (v_error) THEN SET out_exists = 'TEMPORARY'; ELSE SET @sys.tmp.table_exists.SQL = CONCAT('DROP TEMPORARY TABLE `', in_db, '`.`', in_table, '`'); PREPARE stmt_drop_table FROM @sys.tmp.table_exists.SQL; EXECUTE stmt_drop_table; DEALLOCATE PREPARE stmt_drop_table; SET out_exists = (SELECT TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = in_db AND TABLE_NAME = in_table); END IF; ELSE SET @sys.tmp.table_exists.SQL = CONCAT('SELECT COUNT(*) FROM `', in_db, '`.`', in_table, '`'); PREPARE stmt_select FROM @sys.tmp.table_exists.SQL; IF (NOT v_error) THEN DEALLOCATE PREPARE stmt_select; SET out_exists = 'TEMPORARY'; END IF; END IF; END;
+
+SET @@sql_log_bin = @sql_log_bin;
+
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 3d3eb02c450c..b68a583f7a35 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
@@ -92,7 +99,7 @@ SET SESSION sql_mode='NO_ENGINE_SUBSTITUTION';
 
 SET @create_innodb_table_stats="CREATE TABLE IF NOT EXISTS innodb_table_stats (
 	database_name			VARCHAR(64) NOT NULL,
-	table_name			VARCHAR(64) NOT NULL,
+	table_name			VARCHAR(199) NOT NULL,
 	last_update			TIMESTAMP NOT NULL NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	n_rows				BIGINT UNSIGNED NOT NULL,
 	clustered_index_size		BIGINT UNSIGNED NOT NULL,
@@ -102,7 +109,7 @@ SET @create_innodb_table_stats="CREATE TABLE IF NOT EXISTS innodb_table_stats (
 
 SET @create_innodb_index_stats="CREATE TABLE IF NOT EXISTS innodb_index_stats (
 	database_name			VARCHAR(64) NOT NULL,
-	table_name			VARCHAR(64) NOT NULL,
+	table_name			VARCHAR(199) NOT NULL,
 	index_name			VARCHAR(64) NOT NULL,
 	last_update			TIMESTAMP NOT NULL NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	/* there are at least:
@@ -1106,6 +1113,26 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
+--
+-- TABLE PROCESSLIST
+--
+
+SET @cmd="CREATE TABLE performance_schema.processlist("
+  "ID BIGINT unsigned not null,"
+  "USER VARCHAR(32),"
+  "HOST VARCHAR(66),"
+  "DB VARCHAR(64),"
+  "COMMAND VARCHAR(16),"
+  "TIME BIGINT,"
+  "STATE VARCHAR(64),"
+  "INFO LONGTEXT"
+  ")ENGINE=PERFORMANCE_SCHEMA;";
+
+SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0');
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
 --
 -- TABLE EVENTS_STAGES_CURRENT
 --
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index ad02366d3511..bf7da04f7a42 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -1,14 +1,21 @@
--- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 -- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
--- 
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 17537e78ff17..85ab08b23b49 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
@@ -982,4 +989,70 @@ INSERT IGNORE INTO mysql.tables_priv VALUES ('localhost', 'mysql', 'mysql.sessio
 
 INSERT IGNORE INTO mysql.db VALUES ('localhost', 'performance_schema', 'mysql.session','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
 
+--
+-- Update column definition (size and charset) for audit log tables.
+--
+
+SET @had_audit_log_user =
+  (SELECT COUNT(table_name) FROM information_schema.tables
+     WHERE table_schema = 'mysql' AND table_name = 'audit_log_user' AND
+           table_type = 'BASE TABLE');
+SET @cmd="ALTER TABLE mysql.audit_log_user DROP FOREIGN KEY audit_log_user_ibfk_1";
+SET @str = IF(@had_audit_log_user > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @had_audit_log_filter =
+  (SELECT COUNT(table_name) FROM information_schema.tables
+     WHERE table_schema = 'mysql' AND table_name = 'audit_log_filter' AND
+           table_type = 'BASE TABLE');
+SET @cmd="ALTER TABLE mysql.audit_log_filter ENGINE=InnoDB";
+SET @str = IF(@had_audit_log_filter > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @cmd="ALTER TABLE mysql.audit_log_filter CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin";
+SET @str = IF(@had_audit_log_filter > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @had_audit_log_user =
+  (SELECT COUNT(table_name) FROM information_schema.tables
+     WHERE table_schema = 'mysql' AND table_name = 'audit_log_user' AND
+           table_type = 'BASE TABLE');
+SET @cmd="ALTER TABLE mysql.audit_log_user ENGINE=InnoDB";
+SET @str = IF(@had_audit_log_user > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @cmd="ALTER TABLE mysql.audit_log_user CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin";
+SET @str = IF(@had_audit_log_user > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @cmd="ALTER TABLE mysql.audit_log_user MODIFY COLUMN USER VARCHAR(32)";
+SET @str = IF(@had_audit_log_user > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+SET @cmd="ALTER TABLE mysql.audit_log_user ADD FOREIGN KEY (FILTERNAME) REFERENCES mysql.audit_log_filter(NAME)";
+SET @str = IF(@had_audit_log_user > 0, @cmd, "SET @dummy = 0");
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
 FLUSH PRIVILEGES;
+
+--
+-- Update the column length of 'table_name' column for stats tables.
+--
+
+alter table mysql.innodb_table_stats modify table_name varchar(199);
+alter table mysql.innodb_index_stats modify table_name varchar(199);
+
diff --git a/scripts/mysql_test_data_timezone.sql b/scripts/mysql_test_data_timezone.sql
index b2d3a1329aa3..204383e9ab88 100644
--- a/scripts/mysql_test_data_timezone.sql
+++ b/scripts/mysql_test_data_timezone.sql
@@ -1,15 +1,22 @@
--- Copyright (C) 2007 MySQL AB
+-- Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 -- Use is subject to license terms
 -- 
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
--- 
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/scripts/mysqlclient.pc.in b/scripts/mysqlclient.pc.in
index 4cec28ed4985..4adccbc9cbe9 100644
--- a/scripts/mysqlclient.pc.in
+++ b/scripts/mysqlclient.pc.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index cb04b089c431..83a784de8725 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -1,16 +1,22 @@
 #!@PERL_PATH@
 
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index d9e5736d8369..333c53dc61dc 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -353,8 +353,6 @@ mysqld_ld_preload_text() {
 
 # set_malloc_lib LIB
 # - If LIB is empty, do nothing and return
-# - If LIB is 'tcmalloc', look for tcmalloc shared library in $malloc_dirs.
-#   tcmalloc is part of the Google perftools project.
 # - If LIB is an absolute path, assume it is a malloc shared library
 #
 # Put LIB in mysqld_ld_preload, which will be added to LD_PRELOAD when
@@ -364,24 +362,6 @@ set_malloc_lib() {
   malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu"
   malloc_lib="$1"
 
-  if [ "$malloc_lib" = tcmalloc ]; then
-    malloc_lib=
-    for libdir in `echo $malloc_dirs`; do
-      for flavor in _minimal '' _and_profiler _debug; do
-        tmp="$libdir/libtcmalloc$flavor.so"
-        #log_notice "DEBUG: Checking for malloc lib '$tmp'"
-        [ -r "$tmp" ] || continue
-        malloc_lib="$tmp"
-        break 2
-      done
-    done
-
-    if [ -z "$malloc_lib" ]; then
-      log_error "no shared library for --malloc-lib=tcmalloc found in $malloc_dirs"
-      exit 1
-    fi
-  fi
-
   # Allow --malloc-lib='' to override other settings
   [ -z  "$malloc_lib" ] && return
 
@@ -405,8 +385,7 @@ set_malloc_lib() {
       esac
       ;;
     *)
-      log_error "--malloc-lib must be an absolute path or 'tcmalloc'; " \
-        "ignoring value '$malloc_lib'"
+      log_error "--malloc-lib must be an absolute path ignoring value '$malloc_lib'"
       exit 1
       ;;
   esac
@@ -871,7 +850,7 @@ log_notice "Starting $MYSQLD daemon with databases from $DATADIR"
 
 # variable to track the current number of "fast" (a.k.a. subsecond) restarts
 fast_restart=0
-# maximum number of restarts before trottling kicks in
+# maximum number of restarts before throttling kicks in
 max_fast_restarts=5
 # flag whether a usable sleep command exists
 have_sleep=1
@@ -943,7 +922,7 @@ do
         sleep_state=$?
         if test $sleep_state -gt 0
         then
-          log_notice "The server is respawning too fast and no working sleep command. Turning off trottling."
+          log_notice "The server is respawning too fast and in addition no working 'sleep' command was found. Turning off throttling."
           have_sleep=0
         fi
 
diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh
index af1b42c5a928..63535201d541 100644
--- a/scripts/mysqldumpslow.sh
+++ b/scripts/mysqldumpslow.sh
@@ -1,16 +1,22 @@
 #!@PERL_PATH@
 
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/scripts/sys_schema/LICENSE b/scripts/sys_schema/LICENSE
new file mode 100644
index 000000000000..ead4108620ed
--- /dev/null
+++ b/scripts/sys_schema/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/scripts/sys_schema/after_setup.sql b/scripts/sys_schema/after_setup.sql
new file mode 100644
index 000000000000..571ed7a180bd
--- /dev/null
+++ b/scripts/sys_schema/after_setup.sql
@@ -0,0 +1,23 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+SET @@sql_log_bin = @sql_log_bin;
diff --git a/scripts/sys_schema/before_setup.sql b/scripts/sys_schema/before_setup.sql
new file mode 100644
index 000000000000..13765f685145
--- /dev/null
+++ b/scripts/sys_schema/before_setup.sql
@@ -0,0 +1,29 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+SET NAMES utf8;
+SET @sql_log_bin = @@sql_log_bin;
+SET sql_log_bin = 0;
+
+CREATE DATABASE IF NOT EXISTS sys DEFAULT CHARACTER SET utf8;
+
+USE sys;
diff --git a/scripts/sys_schema/collapse-delimiter.awk b/scripts/sys_schema/collapse-delimiter.awk
new file mode 100644
index 000000000000..9cc1116cc6aa
--- /dev/null
+++ b/scripts/sys_schema/collapse-delimiter.awk
@@ -0,0 +1,39 @@
+#  Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License, version 2.0,
+#  as published by the Free Software Foundation.
+#
+#  This program is also distributed with certain software (including
+#  but not limited to OpenSSL) that is licensed under separate terms,
+#  as designated in a particular file or component or in included license
+#  documentation.  The authors of MySQL hereby grant you an additional
+#  permission to link the program and your derivative works with the
+#  separately licensed software that they have included with MySQL.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License, version 2.0, for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# USAGE
+# awk -f collapse-delimiter.awk file.sql
+#
+# This script:
+# - removes DELIMITER $$ lines
+# - removes DELIMITER ; lines
+# - collapses every line between 'DELIMITER $$' and 'DELIMITER ;'
+#   into a single line,
+#   using a space as Output Record Separator (ORS)
+#
+
+BEGIN {ORS="\n";}
+/DELIMITER \$\$/ {ORS=" "; next;}
+/DELIMITER ;/ {ORS="\n"; next;}
+{ print; }
+END {}
+
diff --git a/scripts/sys_schema/collapse-semicolon.awk b/scripts/sys_schema/collapse-semicolon.awk
new file mode 100644
index 000000000000..c3643cb2272a
--- /dev/null
+++ b/scripts/sys_schema/collapse-semicolon.awk
@@ -0,0 +1,38 @@
+#  Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License, version 2.0,
+#  as published by the Free Software Foundation.
+#
+#  This program is also distributed with certain software (including
+#  but not limited to OpenSSL) that is licensed under separate terms,
+#  as designated in a particular file or component or in included license
+#  documentation.  The authors of MySQL hereby grant you an additional
+#  permission to link the program and your derivative works with the
+#  separately licensed software that they have included with MySQL.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License, version 2.0, for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# USAGE
+# awk -f collapse-semicolon.awk file.sql
+#
+# This script:
+# - collapses lines until a terminating ';' is found
+#
+# As a result, multi line statements terminated by a ';'
+# are printed into a single line statement.
+#
+
+BEGIN {ORS=" ";}
+/;$/ {ORS="\n"; print; print ""; ORS=" "; next;}
+{ print; }
+
+END {}
+
diff --git a/scripts/sys_schema/functions/extract_schema_from_file_name.sql b/scripts/sys_schema/functions/extract_schema_from_file_name.sql
new file mode 100644
index 000000000000..ab986d8f1702
--- /dev/null
+++ b/scripts/sys_schema/functions/extract_schema_from_file_name.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS extract_schema_from_file_name;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION extract_schema_from_file_name (
+        path VARCHAR(512)
+    )
+    RETURNS VARCHAR(64) 
+    COMMENT '
+Description
+-----------
+
+Takes a raw file path, and attempts to extract the schema name from it.
+
+Useful for when interacting with Performance Schema data 
+concerning IO statistics, for example.
+
+Currently relies on the fact that a table data file will be within a 
+specified database directory (will not work with partitions or tables
+that specify an individual DATA_DIRECTORY).
+
+Parameters
+-----------
+
+path (VARCHAR(512)):
+  The full file path to a data file to extract the schema name from.
+
+Returns
+-----------
+
+VARCHAR(64)
+
+Example
+-----------
+
+mysql> SELECT sys.extract_schema_from_file_name(\'/var/lib/mysql/employees/employee.ibd\');
++----------------------------------------------------------------------------+
+| sys.extract_schema_from_file_name(\'/var/lib/mysql/employees/employee.ibd\') |
++----------------------------------------------------------------------------+
+| employees                                                                  |
++----------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN LEFT(SUBSTRING_INDEX(SUBSTRING_INDEX(REPLACE(path, '\\', '/'), '/', -2), '/', 1), 64);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/extract_table_from_file_name.sql b/scripts/sys_schema/functions/extract_table_from_file_name.sql
new file mode 100644
index 000000000000..70c27c83225e
--- /dev/null
+++ b/scripts/sys_schema/functions/extract_table_from_file_name.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS extract_table_from_file_name;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION extract_table_from_file_name (
+        path VARCHAR(512)
+    )
+    RETURNS VARCHAR(64) 
+    COMMENT '
+Description
+-----------
+
+Takes a raw file path, and extracts the table name from it.
+
+Useful for when interacting with Performance Schema data 
+concerning IO statistics, for example.
+
+Parameters
+-----------
+
+path (VARCHAR(512)):
+  The full file path to a data file to extract the table name from.
+
+Returns
+-----------
+
+VARCHAR(64)
+
+Example
+-----------
+
+mysql> SELECT sys.extract_table_from_file_name(\'/var/lib/mysql/employees/employee.ibd\');
++---------------------------------------------------------------------------+
+| sys.extract_table_from_file_name(\'/var/lib/mysql/employees/employee.ibd\') |
++---------------------------------------------------------------------------+
+| employee                                                                  |
++---------------------------------------------------------------------------+
+1 row in set (0.02 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN LEFT(SUBSTRING_INDEX(REPLACE(SUBSTRING_INDEX(REPLACE(path, '\\', '/'), '/', -1), '@0024', '$'), '.', 1), 64);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/format_bytes.sql b/scripts/sys_schema/functions/format_bytes.sql
new file mode 100644
index 000000000000..230cab46a549
--- /dev/null
+++ b/scripts/sys_schema/functions/format_bytes.sql
@@ -0,0 +1,91 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS format_bytes;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_bytes (
+        -- We feed in and return TEXT here, as aggregates of
+        -- bytes can return numbers larger than BIGINT UNSIGNED
+        bytes TEXT
+    )
+    RETURNS TEXT
+    COMMENT '
+Description
+-----------
+
+Takes a raw bytes value, and converts it to a human readable format.
+
+Parameters
+-----------
+
+bytes (TEXT):
+  A raw bytes value.
+
+Returns
+-----------
+
+TEXT
+
+Example
+-----------
+
+mysql> SELECT sys.format_bytes(2348723492723746) AS size;
++----------+
+| size     |
++----------+
+| 2.09 PiB |
++----------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.format_bytes(2348723492723) AS size;
++----------+
+| size     |
++----------+
+| 2.14 TiB |
++----------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.format_bytes(23487234) AS size;
++-----------+
+| size      |
++-----------+
+| 22.40 MiB |
++-----------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  IF bytes IS NULL THEN RETURN NULL;
+  ELSEIF bytes >= 1125899906842624 THEN RETURN CONCAT(ROUND(bytes / 1125899906842624, 2), ' PiB');
+  ELSEIF bytes >= 1099511627776 THEN RETURN CONCAT(ROUND(bytes / 1099511627776, 2), ' TiB');
+  ELSEIF bytes >= 1073741824 THEN RETURN CONCAT(ROUND(bytes / 1073741824, 2), ' GiB');
+  ELSEIF bytes >= 1048576 THEN RETURN CONCAT(ROUND(bytes / 1048576, 2), ' MiB');
+  ELSEIF bytes >= 1024 THEN RETURN CONCAT(ROUND(bytes / 1024, 2), ' KiB');
+  ELSE RETURN CONCAT(ROUND(bytes, 0), ' bytes');
+  END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/format_path.sql b/scripts/sys_schema/functions/format_path.sql
new file mode 100644
index 000000000000..68a09b5786c8
--- /dev/null
+++ b/scripts/sys_schema/functions/format_path.sql
@@ -0,0 +1,115 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS format_path;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_path (
+        in_path VARCHAR(512)
+    )
+    RETURNS VARCHAR(512) CHARSET UTF8
+    COMMENT '
+Description
+-----------
+
+Takes a raw path value, and strips out the datadir or tmpdir
+replacing with @@datadir and @@tmpdir respectively.
+
+Also normalizes the paths across operating systems, so backslashes
+on Windows are converted to forward slashes
+
+Parameters
+-----------
+
+path (VARCHAR(512)):
+  The raw file path value to format.
+
+Returns
+-----------
+
+VARCHAR(512) CHARSET UTF8
+
+Example
+-----------
+
+mysql> select @@datadir;
++-----------------------------------------------+
+| @@datadir                                     |
++-----------------------------------------------+
+| /Users/mark/sandboxes/SmallTree/AMaster/data/ |
++-----------------------------------------------+
+1 row in set (0.06 sec)
+
+mysql> select format_path(\'/Users/mark/sandboxes/SmallTree/AMaster/data/mysql/proc.MYD\') AS path;
++--------------------------+
+| path                     |
++--------------------------+
+| @@datadir/mysql/proc.MYD |
++--------------------------+
+1 row in set (0.03 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  DECLARE v_path VARCHAR(512);
+  DECLARE v_undo_dir VARCHAR(1024);
+
+  DECLARE path_separator CHAR(1) DEFAULT '/';
+
+  IF @@global.version_compile_os LIKE 'win%' THEN
+    SET path_separator = '\\';
+  END IF;
+
+  -- OSX hides /private/ in variables, but Performance Schema does not
+  IF in_path LIKE '/private/%' THEN
+    SET v_path = REPLACE(in_path, '/private', '');
+  ELSE
+    SET v_path = in_path;
+  END IF;
+
+  -- @@global.innodb_undo_directory is only set when separate undo logs are used
+  SET v_undo_dir = IFNULL((SELECT VARIABLE_VALUE FROM performance_schema.global_variables WHERE VARIABLE_NAME = 'innodb_undo_directory'), '');
+
+  IF v_path IS NULL THEN
+    RETURN NULL;
+  ELSEIF v_path LIKE CONCAT(@@global.datadir, IF(SUBSTRING(@@global.datadir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.datadir, CONCAT('@@datadir', IF(SUBSTRING(@@global.datadir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(@@global.tmpdir, IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.tmpdir, CONCAT('@@tmpdir', IF(SUBSTRING(@@global.tmpdir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(@@global.slave_load_tmpdir, IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.slave_load_tmpdir, CONCAT('@@slave_load_tmpdir', IF(SUBSTRING(@@global.slave_load_tmpdir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(@@global.innodb_data_home_dir, IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.innodb_data_home_dir, CONCAT('@@innodb_data_home_dir', IF(SUBSTRING(@@global.innodb_data_home_dir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(@@global.innodb_log_group_home_dir, IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.innodb_log_group_home_dir, CONCAT('@@innodb_log_group_home_dir', IF(SUBSTRING(@@global.innodb_log_group_home_dir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(v_undo_dir, IF(SUBSTRING(v_undo_dir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, v_undo_dir, CONCAT('@@innodb_undo_directory', IF(SUBSTRING(v_undo_dir, -1) = path_separator, path_separator, '')));
+  ELSEIF v_path LIKE CONCAT(@@global.basedir, IF(SUBSTRING(@@global.basedir, -1) = path_separator, '%', CONCAT(path_separator, '%'))) ESCAPE '|' THEN
+    SET v_path = REPLACE(v_path, @@global.basedir, CONCAT('@@basedir', IF(SUBSTRING(@@global.basedir, -1) = path_separator, path_separator, '')));
+  END IF;
+
+  RETURN v_path;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/format_statement.sql b/scripts/sys_schema/functions/format_statement.sql
new file mode 100644
index 000000000000..ad75d1415fae
--- /dev/null
+++ b/scripts/sys_schema/functions/format_statement.sql
@@ -0,0 +1,88 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS format_statement;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_statement (
+        statement LONGTEXT
+    )
+    RETURNS LONGTEXT
+    COMMENT '
+Description
+-----------
+
+Formats a normalized statement, truncating it if it is > 64 characters long by default.
+
+To configure the length to truncate the statement to by default, update the `statement_truncate_len`
+variable with `sys_config` table to a different value. Alternatively, to change it just for just 
+your particular session, use `SET @sys.statement_truncate_len := <some new value>`.
+
+Useful for printing statement related data from Performance Schema from 
+the command line.
+
+Parameters
+-----------
+
+statement (LONGTEXT): 
+  The statement to format.
+
+Returns
+-----------
+
+LONGTEXT
+
+Example
+-----------
+
+mysql> SELECT sys.format_statement(digest_text)
+    ->   FROM performance_schema.events_statements_summary_by_digest
+    ->  ORDER by sum_timer_wait DESC limit 5;
++-------------------------------------------------------------------+
+| sys.format_statement(digest_text)                                 |
++-------------------------------------------------------------------+
+| CREATE SQL SECURITY INVOKER VI ... KE ? AND `variable_value` > ?  |
+| CREATE SQL SECURITY INVOKER VI ... ait` IS NOT NULL , `esc` . ... |
+| CREATE SQL SECURITY INVOKER VI ... ait` IS NOT NULL , `sys` . ... |
+| CREATE SQL SECURITY INVOKER VI ...  , `compressed_size` ) ) DESC  |
+| CREATE SQL SECURITY INVOKER VI ... LIKE ? ORDER BY `timer_start`  |
++-------------------------------------------------------------------+
+5 rows in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  -- Check if we have the configured length, if not, init it
+  IF @sys.statement_truncate_len IS NULL THEN
+      SET @sys.statement_truncate_len = sys_get_config('statement_truncate_len', 64);
+  END IF;
+
+  IF CHAR_LENGTH(statement) > @sys.statement_truncate_len THEN
+      RETURN REPLACE(CONCAT(LEFT(statement, (@sys.statement_truncate_len/2)-2), ' ... ', RIGHT(statement, (@sys.statement_truncate_len/2)-2)), '\n', ' ');
+  ELSE 
+      RETURN REPLACE(statement, '\n', ' ');
+  END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/format_time.sql b/scripts/sys_schema/functions/format_time.sql
new file mode 100644
index 000000000000..64274e859a20
--- /dev/null
+++ b/scripts/sys_schema/functions/format_time.sql
@@ -0,0 +1,98 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS format_time;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION format_time (
+        -- We feed in and return TEXT here, as aggregates of
+        -- picoseconds can return numbers larger than BIGINT UNSIGNED
+        picoseconds TEXT
+    )
+    RETURNS TEXT CHARSET UTF8
+    COMMENT '
+Description
+-----------
+
+Takes a raw picoseconds value, and converts it to a human readable form.
+
+Picoseconds are the precision that all latency values are printed in
+within Performance Schema, however are not user friendly when wanting
+to scan output from the command line.
+
+Parameters
+-----------
+
+picoseconds (TEXT):
+  The raw picoseconds value to convert.
+
+Returns
+-----------
+
+TEXT
+
+Example
+-----------
+
+mysql> select format_time(342342342342345);
++------------------------------+
+| format_time(342342342342345) |
++------------------------------+
+| 00:05:42                     |
++------------------------------+
+1 row in set (0.00 sec)
+
+mysql> select format_time(342342342);
++------------------------+
+| format_time(342342342) |
++------------------------+
+| 342.34 us              |
++------------------------+
+1 row in set (0.00 sec)
+
+mysql> select format_time(34234);
++--------------------+
+| format_time(34234) |
++--------------------+
+| 34.23 ns           |
++--------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  IF picoseconds IS NULL THEN RETURN NULL;
+  ELSEIF picoseconds >= 604800000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 604800000000000000, 2), ' w');
+  ELSEIF picoseconds >= 86400000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 86400000000000000, 2), ' d');
+  ELSEIF picoseconds >= 3600000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 3600000000000000, 2), ' h');
+  ELSEIF picoseconds >= 60000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 60000000000000, 2), ' m');
+  ELSEIF picoseconds >= 1000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000000, 2), ' s');
+  ELSEIF picoseconds >= 1000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000, 2), ' ms');
+  ELSEIF picoseconds >= 1000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000, 2), ' us');
+  ELSEIF picoseconds >= 1000 THEN RETURN CONCAT(ROUND(picoseconds / 1000, 2), ' ns');
+  ELSE RETURN CONCAT(picoseconds, ' ps');
+  END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/list_add.sql b/scripts/sys_schema/functions/list_add.sql
new file mode 100644
index 000000000000..549d4cc764f4
--- /dev/null
+++ b/scripts/sys_schema/functions/list_add.sql
@@ -0,0 +1,97 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS list_add;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION list_add (
+        in_list TEXT,
+        in_add_value TEXT
+    )
+    RETURNS TEXT
+    COMMENT '
+Description
+-----------
+
+Takes a list, and a value to add to the list, and returns the resulting list.
+
+Useful for altering certain session variables, like sql_mode or optimizer_switch for instance.
+
+Parameters
+-----------
+
+in_list (TEXT):
+  The comma separated list to add a value to
+
+in_add_value (TEXT):
+  The value to add to the input list
+
+Returns
+-----------
+
+TEXT
+
+Example
+--------
+
+mysql> select @@sql_mode;
++-----------------------------------------------------------------------------------+
+| @@sql_mode                                                                        |
++-----------------------------------------------------------------------------------+
+| ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
++-----------------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+
+mysql> set sql_mode = sys.list_add(@@sql_mode, ''ANSI_QUOTES'');
+Query OK, 0 rows affected (0.06 sec)
+
+mysql> select @@sql_mode;
++-----------------------------------------------------------------------------------------------+
+| @@sql_mode                                                                                    |
++-----------------------------------------------------------------------------------------------+
+| ANSI_QUOTES,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
++-----------------------------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    CONTAINS SQL
+BEGIN
+
+    IF (in_add_value IS NULL) THEN
+        SIGNAL SQLSTATE '02200'
+           SET MESSAGE_TEXT = 'Function sys.list_add: in_add_value input variable should not be NULL',
+               MYSQL_ERRNO = 1138;
+    END IF;
+
+    IF (in_list IS NULL OR LENGTH(in_list) = 0) THEN
+        -- return the new value as a single value list
+        RETURN in_add_value;
+    END IF;
+
+    RETURN (SELECT CONCAT(TRIM(BOTH ',' FROM TRIM(in_list)), ',', in_add_value));
+
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/list_drop.sql b/scripts/sys_schema/functions/list_drop.sql
new file mode 100644
index 000000000000..3df1a1782731
--- /dev/null
+++ b/scripts/sys_schema/functions/list_drop.sql
@@ -0,0 +1,98 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS list_drop;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION list_drop (
+        in_list TEXT,
+        in_drop_value TEXT
+    )
+    RETURNS TEXT
+    COMMENT '
+Description
+-----------
+
+Takes a list, and a value to attempt to remove from the list, and returns the resulting list.
+
+Useful for altering certain session variables, like sql_mode or optimizer_switch for instance.
+
+Parameters
+-----------
+
+in_list (TEXT):
+  The comma separated list to drop a value from
+
+in_drop_value (TEXT):
+  The value to drop from the input list
+
+Returns
+-----------
+
+TEXT
+
+Example
+--------
+
+mysql> select @@sql_mode;
++-----------------------------------------------------------------------------------------------+
+| @@sql_mode                                                                                    |
++-----------------------------------------------------------------------------------------------+
+| ANSI_QUOTES,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
++-----------------------------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+
+mysql> set sql_mode = sys.list_drop(@@sql_mode, ''ONLY_FULL_GROUP_BY'');
+Query OK, 0 rows affected (0.03 sec)
+
+mysql> select @@sql_mode;
++----------------------------------------------------------------------------+
+| @@sql_mode                                                                 |
++----------------------------------------------------------------------------+
+| ANSI_QUOTES,STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION |
++----------------------------------------------------------------------------+
+1 row in set (0.00 sec)
+
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    CONTAINS SQL
+BEGIN
+
+    IF (in_drop_value IS NULL) THEN
+        SIGNAL SQLSTATE '02200'
+           SET MESSAGE_TEXT = 'Function sys.list_drop: in_drop_value input variable should not be NULL',
+               MYSQL_ERRNO = 1138;
+    END IF;
+
+    IF (in_list IS NULL OR LENGTH(in_list) = 0) THEN
+        -- return the list as it was passed in
+        RETURN in_list;
+    END IF;
+
+    -- ensure that leading / trailing commas are remove, support values with either spaces or not between commas
+    RETURN (SELECT TRIM(BOTH ',' FROM REPLACE(REPLACE(CONCAT(',', in_list), CONCAT(',', in_drop_value), ''), CONCAT(', ', in_drop_value), '')));
+
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_is_account_enabled.sql b/scripts/sys_schema/functions/ps_is_account_enabled.sql
new file mode 100644
index 000000000000..d7fb50fef68b
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_is_account_enabled.sql
@@ -0,0 +1,77 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_is_account_enabled;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_account_enabled (
+        in_host VARCHAR(60), 
+        in_user VARCHAR(32)
+    ) 
+    RETURNS ENUM('YES', 'NO')
+    COMMENT '
+Description
+-----------
+
+Determines whether instrumentation of an account is enabled 
+within Performance Schema.
+
+Parameters
+-----------
+
+in_host VARCHAR(60): 
+  The hostname of the account to check.
+in_user VARCHAR(32):
+  The username of the account to check.
+
+Returns
+-----------
+
+ENUM(\'YES\', \'NO\', \'PARTIAL\')
+
+Example
+-----------
+
+mysql> SELECT sys.ps_is_account_enabled(\'localhost\', \'root\');
++------------------------------------------------+
+| sys.ps_is_account_enabled(\'localhost\', \'root\') |
++------------------------------------------------+
+| YES                                            |
++------------------------------------------------+
+1 row in set (0.01 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC 
+    READS SQL DATA 
+BEGIN
+    RETURN IF(EXISTS(SELECT 1
+                       FROM performance_schema.setup_actors
+                      WHERE (`HOST` = '%' OR in_host LIKE `HOST`)
+                        AND (`USER` = '%' OR `USER` = in_user)
+                        AND (`ENABLED` = 'YES')
+                    ),
+              'YES', 'NO'
+           );
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_is_consumer_enabled.sql b/scripts/sys_schema/functions/ps_is_consumer_enabled.sql
new file mode 100644
index 000000000000..a78737e888ef
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_is_consumer_enabled.sql
@@ -0,0 +1,105 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_is_consumer_enabled;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_consumer_enabled (
+        in_consumer varchar(64)
+   )
+   RETURNS enum('YES', 'NO')
+    COMMENT '
+Description
+-----------
+
+Determines whether a consumer is enabled (taking the consumer hierarchy into consideration)
+within the Performance Schema.
+
+An exception with errno 3047 is thrown if an unknown consumer name is passed to the function.
+A consumer name of NULL returns NULL.
+
+Parameters
+-----------
+
+in_consumer VARCHAR(64): 
+  The name of the consumer to check.
+
+Returns
+-----------
+
+ENUM(\'YES\', \'NO\')
+
+Example
+-----------
+
+mysql> SELECT sys.ps_is_consumer_enabled(\'events_stages_history\');
++-----------------------------------------------------+
+| sys.ps_is_consumer_enabled(\'events_stages_history\') |
++-----------------------------------------------------+
+| NO                                                  |
++-----------------------------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC 
+    READS SQL DATA 
+BEGIN
+    DECLARE v_is_enabled ENUM('YES', 'NO') DEFAULT NULL;
+    DECLARE v_error_msg VARCHAR(128);
+
+    -- Return NULL for a NULL argument.
+    IF (in_consumer IS NULL) THEN
+        RETURN NULL;
+    END IF;
+
+    SET v_is_enabled = (
+        SELECT (CASE
+                   WHEN c.NAME = 'global_instrumentation' THEN c.ENABLED
+                   WHEN c.NAME = 'thread_instrumentation' THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO')
+                   WHEN c.NAME LIKE '%\_digest'           THEN IF(cg.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO')
+                   WHEN c.NAME LIKE '%\_current'          THEN IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES', 'YES', 'NO')
+                   ELSE IF(cg.ENABLED = 'YES' AND ct.ENABLED = 'YES' AND c.ENABLED = 'YES'
+                           AND ( SELECT cc.ENABLED FROM performance_schema.setup_consumers cc WHERE NAME = CONCAT(SUBSTRING_INDEX(c.NAME, '_', 2), '_current')
+                               ) = 'YES', 'YES', 'NO')
+                END) AS IsEnabled
+          FROM performance_schema.setup_consumers c
+               INNER JOIN performance_schema.setup_consumers cg
+               INNER JOIN performance_schema.setup_consumers ct
+         WHERE cg.NAME       = 'global_instrumentation'
+               AND ct.NAME   = 'thread_instrumentation'
+               AND c.NAME    = in_consumer
+        );
+
+    IF (v_is_enabled IS NOT NULL) THEN
+        RETURN v_is_enabled;
+    ELSE
+        -- A value of NULL here means it is an unknown consumer name that was passed as an argument.
+        -- Only an input value of NULL is allowed to return a NULL result value, to throw a signal instead.
+        SET v_error_msg = CONCAT('Invalid argument error: ', in_consumer, ' in function sys.ps_is_consumer_enabled.');
+        SIGNAL SQLSTATE 'HY000'
+           SET MESSAGE_TEXT = v_error_msg,
+               MYSQL_ERRNO  = 3047;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_is_instrument_default_enabled.sql b/scripts/sys_schema/functions/ps_is_instrument_default_enabled.sql
new file mode 100644
index 000000000000..db4b6f3c0e03
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_is_instrument_default_enabled.sql
@@ -0,0 +1,83 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_is_instrument_default_enabled;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_instrument_default_enabled (
+        in_instrument VARCHAR(128)
+    ) 
+    RETURNS ENUM('YES', 'NO')
+    COMMENT '
+Description
+-----------
+
+Returns whether an instrument is enabled by default in this version of MySQL.
+
+Parameters
+-----------
+
+in_instrument VARCHAR(128): 
+  The instrument to check.
+
+Returns
+-----------
+
+ENUM(\'YES\', \'NO\')
+
+Example
+-----------
+
+mysql> SELECT sys.ps_is_instrument_default_enabled(\'statement/sql/select\');
++--------------------------------------------------------------+
+| sys.ps_is_instrument_default_enabled(\'statement/sql/select\') |
++--------------------------------------------------------------+
+| YES                                                          |
++--------------------------------------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC 
+    READS SQL DATA 
+BEGIN
+    DECLARE v_enabled ENUM('YES', 'NO');
+
+    -- Currently the same in all versions
+    SET v_enabled = IF(in_instrument LIKE 'wait/io/file/%'
+                        OR in_instrument LIKE 'wait/io/table/%'
+                        OR in_instrument LIKE 'statement/%'
+                        OR in_instrument LIKE 'memory/performance_schema/%'
+                        OR in_instrument IN ('wait/lock/table/sql/handler', 'idle')
+               /*!50707
+                        OR in_instrument LIKE 'stage/innodb/%'
+                        OR in_instrument = 'stage/sql/copy to tmp table'
+               */
+                      ,
+                       'YES',
+                       'NO'
+                    );
+
+    RETURN v_enabled;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_is_instrument_default_timed.sql b/scripts/sys_schema/functions/ps_is_instrument_default_timed.sql
new file mode 100644
index 000000000000..6045add11d3d
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_is_instrument_default_timed.sql
@@ -0,0 +1,82 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_is_instrument_default_timed;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_instrument_default_timed (
+        in_instrument VARCHAR(128)
+    ) 
+    RETURNS ENUM('YES', 'NO')
+    COMMENT '
+Description
+-----------
+
+Returns whether an instrument is timed by default in this version of MySQL.
+
+Parameters
+-----------
+
+in_instrument VARCHAR(128): 
+  The instrument to check.
+
+Returns
+-----------
+
+ENUM(\'YES\', \'NO\')
+
+Example
+-----------
+
+mysql> SELECT sys.ps_is_instrument_default_timed(\'statement/sql/select\');
++------------------------------------------------------------+
+| sys.ps_is_instrument_default_timed(\'statement/sql/select\') |
++------------------------------------------------------------+
+| YES                                                        |
++------------------------------------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC 
+    READS SQL DATA 
+BEGIN
+    DECLARE v_timed ENUM('YES', 'NO');
+
+    -- Currently the same in all versions
+    SET v_timed = IF(in_instrument LIKE 'wait/io/file/%'
+                        OR in_instrument LIKE 'wait/io/table/%'
+                        OR in_instrument LIKE 'statement/%'
+                        OR in_instrument IN ('wait/lock/table/sql/handler', 'idle')
+               /*!50707
+                        OR in_instrument LIKE 'stage/innodb/%'
+                        OR in_instrument = 'stage/sql/copy to tmp table'
+               */
+                      ,
+                       'YES',
+                       'NO'
+                    );
+
+    RETURN v_timed;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_is_thread_instrumented.sql b/scripts/sys_schema/functions/ps_is_thread_instrumented.sql
new file mode 100644
index 000000000000..f1635e151f8f
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_is_thread_instrumented.sql
@@ -0,0 +1,79 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_is_thread_instrumented;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_is_thread_instrumented (
+        in_connection_id BIGINT UNSIGNED
+    ) RETURNS ENUM('YES', 'NO', 'UNKNOWN')
+    COMMENT '
+Description
+-----------
+
+Checks whether the provided connection id is instrumented within Performance Schema.
+
+Parameters
+-----------
+
+in_connection_id (BIGINT UNSIGNED):
+  The id of the connection to check.
+
+Returns
+-----------
+
+ENUM(\'YES\', \'NO\', \'UNKNOWN\')
+
+Example
+-----------
+
+mysql> SELECT sys.ps_is_thread_instrumented(CONNECTION_ID());
++------------------------------------------------+
+| sys.ps_is_thread_instrumented(CONNECTION_ID()) |
++------------------------------------------------+
+| YES                                            |
++------------------------------------------------+
+'
+
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    DECLARE v_enabled ENUM('YES', 'NO', 'UNKNOWN');
+
+    IF (in_connection_id IS NULL) THEN
+        RETURN NULL;
+    END IF;
+
+    SELECT INSTRUMENTED INTO v_enabled
+      FROM performance_schema.threads 
+     WHERE PROCESSLIST_ID = in_connection_id;
+
+    IF (v_enabled IS NULL) THEN
+        RETURN 'UNKNOWN';
+    ELSE
+        RETURN v_enabled;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_thread_account.sql b/scripts/sys_schema/functions/ps_thread_account.sql
new file mode 100644
index 000000000000..ee69dc869eda
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_thread_account.sql
@@ -0,0 +1,78 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_thread_account;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_thread_account (
+        in_thread_id BIGINT UNSIGNED
+    ) RETURNS TEXT
+    COMMENT '
+Description
+-----------
+
+Return the user@host account for the given Performance Schema thread id.
+
+Parameters
+-----------
+
+in_thread_id (BIGINT UNSIGNED):
+  The id of the thread to return the account for.
+
+Example
+-----------
+
+mysql> select thread_id, processlist_user, processlist_host from performance_schema.threads where type = ''foreground'';
++-----------+------------------+------------------+
+| thread_id | processlist_user | processlist_host |
++-----------+------------------+------------------+
+|        23 | NULL             | NULL             |
+|        30 | root             | localhost        |
+|        31 | msandbox         | localhost        |
+|        32 | msandbox         | localhost        |
++-----------+------------------+------------------+
+4 rows in set (0.00 sec)
+
+mysql> select sys.ps_thread_account(31);
++---------------------------+
+| sys.ps_thread_account(31) |
++---------------------------+
+| msandbox@localhost        |
++---------------------------+
+1 row in set (0.00 sec)
+'
+
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    RETURN (SELECT IF(
+                      type = 'FOREGROUND',
+                      CONCAT(processlist_user, '@', processlist_host),
+                      type
+                     ) AS account
+              FROM `performance_schema`.`threads`
+             WHERE thread_id = in_thread_id);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_thread_id.sql b/scripts/sys_schema/functions/ps_thread_id.sql
new file mode 100644
index 000000000000..eb47591d871e
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_thread_id.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_thread_id;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_thread_id (
+        in_connection_id BIGINT UNSIGNED
+    ) RETURNS BIGINT UNSIGNED
+    COMMENT '
+Description
+-----------
+
+Return the Performance Schema THREAD_ID for the specified connection ID.
+
+Parameters
+-----------
+
+in_connection_id (BIGINT UNSIGNED):
+  The id of the connection to return the thread id for. If NULL, the current
+  connection thread id is returned.
+
+Example
+-----------
+
+mysql> SELECT sys.ps_thread_id(79);
++----------------------+
+| sys.ps_thread_id(79) |
++----------------------+
+|                   98 |
++----------------------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.ps_thread_id(CONNECTION_ID());
++-----------------------------------+
+| sys.ps_thread_id(CONNECTION_ID()) |
++-----------------------------------+
+|                                98 |
++-----------------------------------+
+1 row in set (0.00 sec)
+'
+
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    RETURN (SELECT THREAD_ID
+              FROM `performance_schema`.`threads`
+             WHERE PROCESSLIST_ID = IFNULL(in_connection_id, CONNECTION_ID())
+           );
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_thread_stack.sql b/scripts/sys_schema/functions/ps_thread_stack.sql
new file mode 100644
index 000000000000..a7bb7ec56261
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_thread_stack.sql
@@ -0,0 +1,178 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_thread_stack;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_thread_stack (
+        thd_id BIGINT UNSIGNED,
+        debug BOOLEAN
+    )
+RETURNS LONGTEXT CHARSET latin1
+    COMMENT '
+Description
+-----------
+
+Outputs a JSON formatted stack of all statements, stages and events
+within Performance Schema for the specified thread.
+
+Parameters
+-----------
+
+thd_id (BIGINT UNSIGNED):
+  The id of the thread to trace. This should match the thread_id
+  column from the performance_schema.threads table.
+in_verbose (BOOLEAN):
+  Include file:lineno information in the events.
+
+Example
+-----------
+
+(line separation added for output)
+
+mysql> SELECT sys.ps_thread_stack(37, FALSE) AS thread_stack\\G
+*************************** 1. row ***************************
+thread_stack: {"rankdir": "LR","nodesep": "0.10","stack_created": "2014-02-19 13:39:03",
+"mysql_version": "5.7.3-m13","mysql_user": "root@localhost","events": 
+[{"nesting_event_id": "0", "event_id": "10", "timer_wait": 256.35, "event_info": 
+"sql/select", "wait_info": "select @@version_comment limit 1\\nerrors: 0\\nwarnings: 0\\nlock time:
+...
+'
+SQL SECURITY INVOKER
+NOT DETERMINISTIC
+READS SQL DATA
+BEGIN
+
+    DECLARE json_objects LONGTEXT;
+
+    /*!50602
+    -- Do not track the current thread, it will kill the stack
+    UPDATE performance_schema.threads
+       SET instrumented = 'NO'
+     WHERE processlist_id = CONNECTION_ID();
+    */
+
+    SET SESSION group_concat_max_len=@@global.max_allowed_packet;
+
+    -- Select the entire stack of events
+    SELECT GROUP_CONCAT(CONCAT( '{'
+              , CONCAT_WS( ', '
+              , CONCAT('"nesting_event_id": "', IF(nesting_event_id IS NULL, '0', nesting_event_id), '"')
+              , CONCAT('"event_id": "', event_id, '"')
+              -- Convert from picoseconds to microseconds
+              , CONCAT( '"timer_wait": ', ROUND(timer_wait/1000000, 2))  
+              , CONCAT( '"event_info": "'
+                  , CASE
+                        WHEN event_name NOT LIKE 'wait/io%' THEN REPLACE(SUBSTRING_INDEX(event_name, '/', -2), '\\', '\\\\')
+                        WHEN event_name NOT LIKE 'wait/io/file%' OR event_name NOT LIKE 'wait/io/socket%' THEN REPLACE(SUBSTRING_INDEX(event_name, '/', -4), '\\', '\\\\')
+                        ELSE event_name
+                    END
+                  , '"'
+              )
+              -- Always dump the extra wait information gathered for statements
+              , CONCAT( '"wait_info": "', IFNULL(wait_info, ''), '"')
+              -- If debug is enabled, add the file:lineno information for waits
+              , CONCAT( '"source": "', IF(true AND event_name LIKE 'wait%', IFNULL(wait_info, ''), ''), '"')
+              -- Depending on the type of event, name it appropriately
+              , CASE 
+                     WHEN event_name LIKE 'wait/io/file%'      THEN '"event_type": "io/file"'
+                     WHEN event_name LIKE 'wait/io/table%'     THEN '"event_type": "io/table"'
+                     WHEN event_name LIKE 'wait/io/socket%'    THEN '"event_type": "io/socket"'
+                     WHEN event_name LIKE 'wait/synch/mutex%'  THEN '"event_type": "synch/mutex"'
+                     WHEN event_name LIKE 'wait/synch/cond%'   THEN '"event_type": "synch/cond"'
+                     WHEN event_name LIKE 'wait/synch/rwlock%' THEN '"event_type": "synch/rwlock"'
+                     WHEN event_name LIKE 'wait/lock%'         THEN '"event_type": "lock"'
+                     WHEN event_name LIKE 'statement/%'        THEN '"event_type": "stmt"'
+                     WHEN event_name LIKE 'stage/%'            THEN '"event_type": "stage"'
+                     WHEN event_name LIKE '%idle%'             THEN '"event_type": "idle"'
+                     ELSE '' 
+                END                   
+            )
+            , '}'
+          )
+          ORDER BY event_id ASC SEPARATOR ',') event
+    INTO json_objects
+    FROM (
+          /*!50600
+          -- Select all statements, with the extra tracing information available
+          (SELECT thread_id, event_id, event_name, timer_wait, timer_start, nesting_event_id, 
+                  CONCAT(sql_text, '\\n',
+                         'errors: ', errors, '\\n',
+                         'warnings: ', warnings, '\\n',
+                         'lock time: ', ROUND(lock_time/1000000, 2),'us\\n',
+                         'rows affected: ', rows_affected, '\\n',
+                         'rows sent: ', rows_sent, '\\n',
+                         'rows examined: ', rows_examined, '\\n',
+                         'tmp tables: ', created_tmp_tables, '\\n',
+                         'tmp disk tables: ', created_tmp_disk_tables, '\\n',
+                         'select scan: ', select_scan, '\\n',
+                         'select full join: ', select_full_join, '\\n',
+                         'select full range join: ', select_full_range_join, '\\n',
+                         'select range: ', select_range, '\\n',
+                         'select range check: ', select_range_check, '\\n', 
+                         'sort merge passes: ', sort_merge_passes, '\\n',
+                         'sort rows: ', sort_rows, '\\n',
+                         'sort range: ', sort_range, '\\n',
+                         'sort scan: ', sort_scan, '\\n',
+                         'no index used: ', IF(no_index_used, 'TRUE', 'FALSE'), '\\n',
+                         'no good index used: ', IF(no_good_index_used, 'TRUE', 'FALSE'), '\\n'
+                         ) AS wait_info
+             FROM performance_schema.events_statements_history_long WHERE thread_id = thd_id)
+          UNION 
+          -- Select all stages
+          (SELECT thread_id, event_id, event_name, timer_wait, timer_start, nesting_event_id, null AS wait_info
+             FROM performance_schema.events_stages_history_long WHERE thread_id = thd_id) 
+          UNION */
+          -- Select all events, adding information appropriate to the event
+          (SELECT thread_id, event_id, 
+                  CONCAT(event_name , 
+                         IF(event_name NOT LIKE 'wait/synch/mutex%', IFNULL(CONCAT(' - ', operation), ''), ''), 
+                         IF(number_of_bytes IS NOT NULL, CONCAT(' ', number_of_bytes, ' bytes'), ''),
+                         IF(event_name LIKE 'wait/io/file%', '\\n', ''),
+                         IF(object_schema IS NOT NULL, CONCAT('\\nObject: ', object_schema, '.'), ''), 
+                         IF(object_name IS NOT NULL, 
+                            IF (event_name LIKE 'wait/io/socket%',
+                                -- Print the socket if used, else the IP:port as reported
+                                CONCAT(IF (object_name LIKE ':0%', @@socket, object_name)),
+                                object_name),
+                            ''),
+                         /*!50600 IF(index_name IS NOT NULL, CONCAT(' Index: ', index_name), ''),*/'\\n'
+                         ) AS event_name,
+                  timer_wait, timer_start, nesting_event_id, source AS wait_info
+             FROM performance_schema.events_waits_history_long WHERE thread_id = thd_id)) events 
+    ORDER BY event_id;
+
+    RETURN CONCAT('{', 
+                  CONCAT_WS(',', 
+                            '"rankdir": "LR"',
+                            '"nodesep": "0.10"',
+                            CONCAT('"stack_created": "', NOW(), '"'),
+                            CONCAT('"mysql_version": "', VERSION(), '"'),
+                            CONCAT('"mysql_user": "', CURRENT_USER(), '"'),
+                            CONCAT('"events": [', IFNULL(json_objects,''), ']')
+                           ),
+                  '}');
+
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/ps_thread_trx_info.sql b/scripts/sys_schema/functions/ps_thread_trx_info.sql
new file mode 100644
index 000000000000..8d68cef6399b
--- /dev/null
+++ b/scripts/sys_schema/functions/ps_thread_trx_info.sql
@@ -0,0 +1,240 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS ps_thread_trx_info;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION ps_thread_trx_info (
+        in_thread_id BIGINT UNSIGNED
+    ) RETURNS LONGTEXT
+    COMMENT '
+Description
+-----------
+
+Returns a JSON object with info on the given threads current transaction, 
+and the statements it has already executed, derived from the
+performance_schema.events_transactions_current and
+performance_schema.events_statements_history tables (so the consumers 
+for these also have to be enabled within Performance Schema to get full
+data in the object).
+
+When the output exceeds the default truncation length (65535), a JSON error
+object is returned, such as:
+
+{ "error": "Trx info truncated: Row 6 was cut by GROUP_CONCAT()" }
+
+Similar error objects are returned for other warnings/and exceptions raised
+when calling the function.
+
+The max length of the output of this function can be controlled with the
+ps_thread_trx_info.max_length variable set via sys_config, or the
+@sys.ps_thread_trx_info.max_length user variable, as appropriate.
+
+Parameters
+-----------
+
+in_thread_id (BIGINT UNSIGNED):
+  The id of the thread to return the transaction info for.
+
+Example
+-----------
+
+SELECT sys.ps_thread_trx_info(48)\\G
+*************************** 1. row ***************************
+sys.ps_thread_trx_info(48): [
+  {
+    "time": "790.70 us",
+    "state": "COMMITTED",
+    "mode": "READ WRITE",
+    "autocommitted": "NO",
+    "gtid": "AUTOMATIC",
+    "isolation": "REPEATABLE READ",
+    "statements_executed": [
+      {
+        "sql_text": "INSERT INTO info VALUES (1, \'foo\')",
+        "time": "471.02 us",
+        "schema": "trx",
+        "rows_examined": 0,
+        "rows_affected": 1,
+        "rows_sent": 0,
+        "tmp_tables": 0,
+        "tmp_disk_tables": 0,
+        "sort_rows": 0,
+        "sort_merge_passes": 0
+      },
+      {
+        "sql_text": "COMMIT",
+        "time": "254.42 us",
+        "schema": "trx",
+        "rows_examined": 0,
+        "rows_affected": 0,
+        "rows_sent": 0,
+        "tmp_tables": 0,
+        "tmp_disk_tables": 0,
+        "sort_rows": 0,
+        "sort_merge_passes": 0
+      }
+    ]
+  },
+  {
+    "time": "426.20 us",
+    "state": "COMMITTED",
+    "mode": "READ WRITE",
+    "autocommitted": "NO",
+    "gtid": "AUTOMATIC",
+    "isolation": "REPEATABLE READ",
+    "statements_executed": [
+      {
+        "sql_text": "INSERT INTO info VALUES (2, \'bar\')",
+        "time": "107.33 us",
+        "schema": "trx",
+        "rows_examined": 0,
+        "rows_affected": 1,
+        "rows_sent": 0,
+        "tmp_tables": 0,
+        "tmp_disk_tables": 0,
+        "sort_rows": 0,
+        "sort_merge_passes": 0
+      },
+      {
+        "sql_text": "COMMIT",
+        "time": "213.23 us",
+        "schema": "trx",
+        "rows_examined": 0,
+        "rows_affected": 0,
+        "rows_sent": 0,
+        "tmp_tables": 0,
+        "tmp_disk_tables": 0,
+        "sort_rows": 0,
+        "sort_merge_passes": 0
+      }
+    ]
+  }
+]
+1 row in set (0.03 sec)
+'
+
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    DECLARE v_output LONGTEXT DEFAULT '{}';
+    DECLARE v_msg_text TEXT DEFAULT '';
+    DECLARE v_signal_msg TEXT DEFAULT '';
+    DECLARE v_mysql_errno INT;
+    DECLARE v_max_output_len BIGINT;
+    -- Capture warnings/errors such as group_concat truncation
+    -- and report as JSON error objects
+    DECLARE EXIT HANDLER FOR SQLWARNING, SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            v_msg_text = MESSAGE_TEXT,
+            v_mysql_errno = MYSQL_ERRNO;
+
+        IF v_mysql_errno = 1260 THEN
+            SET v_signal_msg = CONCAT('{ "error": "Trx info truncated: ', v_msg_text, '" }');
+        ELSE
+            SET v_signal_msg = CONCAT('{ "error": "', v_msg_text, '" }');
+        END IF;
+
+        RETURN v_signal_msg;
+    END;
+
+    -- Set configuration options
+    IF (@sys.ps_thread_trx_info.max_length IS NULL) THEN
+        SET @sys.ps_thread_trx_info.max_length = sys.sys_get_config('ps_thread_trx_info.max_length', 65535);
+    END IF;
+
+    IF (@sys.ps_thread_trx_info.max_length != @@session.group_concat_max_len) THEN
+        SET @old_group_concat_max_len = @@session.group_concat_max_len;
+        -- Convert to int value for the SET, and give some surrounding space
+        SET v_max_output_len = (@sys.ps_thread_trx_info.max_length - 5);
+        SET SESSION group_concat_max_len = v_max_output_len;
+    END IF;
+
+    SET v_output = (
+        SELECT CONCAT('[', IFNULL(GROUP_CONCAT(trx_info ORDER BY event_id), ''), '\n]') AS trx_info
+          FROM (SELECT trxi.thread_id, 
+                       trxi.event_id,
+                       GROUP_CONCAT(
+                         IFNULL(
+                           CONCAT('\n  {\n',
+                                  '    "time": "', IFNULL(sys.format_time(trxi.timer_wait), ''), '",\n',
+                                  '    "state": "', IFNULL(trxi.state, ''), '",\n',
+                                  '    "mode": "', IFNULL(trxi.access_mode, ''), '",\n',
+                                  '    "autocommitted": "', IFNULL(trxi.autocommit, ''), '",\n',
+                                  '    "gtid": "', IFNULL(trxi.gtid, ''), '",\n',
+                                  '    "isolation": "', IFNULL(trxi.isolation_level, ''), '",\n',
+                                  '    "statements_executed": [', IFNULL(s.stmts, ''), IF(s.stmts IS NULL, ' ]\n', '\n    ]\n'),
+                                  '  }'
+                           ), 
+                           '') 
+                         ORDER BY event_id) AS trx_info
+
+                  FROM (
+                        (SELECT thread_id, event_id, timer_wait, state,access_mode, autocommit, gtid, isolation_level
+                           FROM performance_schema.events_transactions_current
+                          WHERE thread_id = in_thread_id
+                            AND end_event_id IS NULL)
+                        UNION
+                        (SELECT thread_id, event_id, timer_wait, state,access_mode, autocommit, gtid, isolation_level
+                           FROM performance_schema.events_transactions_history
+                          WHERE thread_id = in_thread_id)
+                       ) AS trxi
+                  LEFT JOIN (SELECT thread_id,
+                                    nesting_event_id,
+                                    GROUP_CONCAT(
+                                      IFNULL(
+                                        CONCAT('\n      {\n',
+                                               '        "sql_text": "', IFNULL(sys.format_statement(REPLACE(sql_text, '\\', '\\\\')), ''), '",\n',
+                                               '        "time": "', IFNULL(sys.format_time(timer_wait), ''), '",\n',
+                                               '        "schema": "', IFNULL(current_schema, ''), '",\n',
+                                               '        "rows_examined": ', IFNULL(rows_examined, ''), ',\n',
+                                               '        "rows_affected": ', IFNULL(rows_affected, ''), ',\n',
+                                               '        "rows_sent": ', IFNULL(rows_sent, ''), ',\n',
+                                               '        "tmp_tables": ', IFNULL(created_tmp_tables, ''), ',\n',
+                                               '        "tmp_disk_tables": ', IFNULL(created_tmp_disk_tables, ''), ',\n',
+                                               '        "sort_rows": ', IFNULL(sort_rows, ''), ',\n',
+                                               '        "sort_merge_passes": ', IFNULL(sort_merge_passes, ''), '\n',
+                                               '      }'), '') ORDER BY event_id) AS stmts
+                               FROM performance_schema.events_statements_history
+                              WHERE sql_text IS NOT NULL
+                                AND thread_id = in_thread_id
+                              GROUP BY thread_id, nesting_event_id
+                            ) AS s 
+                    ON trxi.thread_id = s.thread_id 
+                   AND trxi.event_id = s.nesting_event_id
+                 WHERE trxi.thread_id = in_thread_id
+                 GROUP BY trxi.thread_id, trxi.event_id
+                ) trxs
+          GROUP BY thread_id
+    );
+
+    IF (@old_group_concat_max_len IS NOT NULL) THEN
+        SET SESSION group_concat_max_len = @old_group_concat_max_len;
+    END IF;
+
+    RETURN v_output;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/quote_identifier.sql b/scripts/sys_schema/functions/quote_identifier.sql
new file mode 100644
index 000000000000..a39520e39484
--- /dev/null
+++ b/scripts/sys_schema/functions/quote_identifier.sql
@@ -0,0 +1,78 @@
+-- Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS quote_identifier;
+
+DELIMITER $$
+
+-- https://dev.mysql.com/doc/refman/5.7/en/identifiers.html
+-- Maximum supported length for any of the current identifiers in 5.7.5+ is 256 characters.
+-- Before that, user variables could have any length.
+--
+-- Based on Paul Dubois' suggestion in Bug #78823/Bug #22011361.
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION quote_identifier(in_identifier TEXT)
+    RETURNS TEXT CHARSET UTF8
+    COMMENT '
+Description
+-----------
+
+Takes an unquoted identifier (schema name, table name, etc.) and
+returns the identifier quoted with backticks.
+
+Parameters
+-----------
+
+in_identifier (TEXT):
+  The identifier to quote.
+
+Returns
+-----------
+
+TEXT
+
+Example
+-----------
+
+mysql> SELECT sys.quote_identifier(''my_identifier'') AS Identifier;
++-----------------+
+| Identifier      |
++-----------------+
+| `my_identifier` |
++-----------------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.quote_identifier(''my`idenfier'') AS Identifier;
++----------------+
+| Identifier     |
++----------------+
+| `my``idenfier` |
++----------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN CONCAT('`', REPLACE(in_identifier, '`', '``'), '`');
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/sys_get_config.sql b/scripts/sys_schema/functions/sys_get_config.sql
new file mode 100644
index 000000000000..b1d43e6eacad
--- /dev/null
+++ b/scripts/sys_schema/functions/sys_get_config.sql
@@ -0,0 +1,105 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS sys_get_config;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION sys_get_config (
+        in_variable_name VARCHAR(128),
+        in_default_value VARCHAR(128)
+    )
+    RETURNS VARCHAR(128)
+    COMMENT '
+Description
+-----------
+
+Returns the value for the requested variable using the following logic:
+
+   1. If the option exists in sys.sys_config return the value from there.
+   2. Else fall back on the provided default value.
+
+Notes for using sys_get_config():
+
+   * If the default value argument to sys_get_config() is NULL and case 2. is reached, NULL is returned.
+     It is then expected that the caller is able to handle NULL for the given configuration option.
+   * The convention is to name the user variables @sys.<name of variable>. It is <name of variable> that
+     is stored in the sys_config table and is what is expected as the argument to sys_get_config().
+   * If you want to check whether the configuration option has already been set and if not assign with
+     the return value of sys_get_config() you can use IFNULL(...) (see example below). However this should
+     not be done inside a loop (e.g. for each row in a result set) as for repeated calls where assignment
+     is only needed in the first iteration using IFNULL(...) is expected to be significantly slower than
+     using an IF (...) THEN ... END IF; block (see example below).
+
+Parameters
+-----------
+
+in_variable_name (VARCHAR(128)):
+  The name of the config option to return the value for.
+
+in_default_value (VARCHAR(128)):
+  The default value to return if the variable does not exist in sys.sys_config.
+
+Returns
+-----------
+
+VARCHAR(128)
+
+Example
+-----------
+
+-- Get the configuration value from sys.sys_config falling back on 128 if the option is not present in the table.
+mysql> SELECT sys.sys_get_config(''statement_truncate_len'', 128) AS Value;
++-------+
+| Value |
++-------+
+| 64    |
++-------+
+1 row in set (0.00 sec)
+
+-- Check whether the option is already set, if not assign - IFNULL(...) one liner example.
+mysql> SET @sys.statement_truncate_len = IFNULL(@sys.statement_truncate_len, sys.sys_get_config(''statement_truncate_len'', 64));
+Query OK, 0 rows affected (0.00 sec)
+
+-- Check whether the option is already set, if not assign - IF ... THEN ... END IF example.
+IF (@sys.statement_truncate_len IS NULL) THEN
+    SET @sys.statement_truncate_len = sys.sys_get_config(''statement_truncate_len'', 64);
+END IF;
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    DECLARE v_value VARCHAR(128) DEFAULT NULL;
+
+    -- Check if we have the variable in the sys.sys_config table
+    SET v_value = (SELECT value FROM sys.sys_config WHERE variable = in_variable_name);
+  
+    -- Protection against the variable not existing in sys_config
+    IF (v_value IS NULL) THEN
+        SET v_value = in_default_value;
+    END IF;
+
+    RETURN v_value;
+END $$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/version_major.sql b/scripts/sys_schema/functions/version_major.sql
new file mode 100644
index 000000000000..af75723e496e
--- /dev/null
+++ b/scripts/sys_schema/functions/version_major.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS version_major;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION version_major ()
+    RETURNS TINYINT UNSIGNED
+    COMMENT '
+Description
+-----------
+
+Returns the major version of MySQL Server.
+
+Returns
+-----------
+
+TINYINT UNSIGNED
+
+Example
+-----------
+
+mysql> SELECT VERSION(), sys.version_major();
++--------------------------------------+---------------------+
+| VERSION()                            | sys.version_major() |
++--------------------------------------+---------------------+
+| 5.7.9-enterprise-commercial-advanced | 5                   |
++--------------------------------------+---------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN SUBSTRING_INDEX(SUBSTRING_INDEX(VERSION(), '-', 1), '.', 1);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/version_minor.sql b/scripts/sys_schema/functions/version_minor.sql
new file mode 100644
index 000000000000..5df41ded94f3
--- /dev/null
+++ b/scripts/sys_schema/functions/version_minor.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS version_minor;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION version_minor ()
+    RETURNS TINYINT UNSIGNED
+    COMMENT '
+Description
+-----------
+
+Returns the minor (release series) version of MySQL Server.
+
+Returns
+-----------
+
+TINYINT UNSIGNED
+
+Example
+-----------
+
+mysql> SELECT VERSION(), sys.server_minor();
++--------------------------------------+---------------------+
+| VERSION()                            | sys.version_minor() |
++--------------------------------------+---------------------+
+| 5.7.9-enterprise-commercial-advanced | 7                   |
++--------------------------------------+---------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN SUBSTRING_INDEX(SUBSTRING_INDEX(SUBSTRING_INDEX(VERSION(), '-', 1), '.', 2), '.', -1);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/functions/version_patch.sql b/scripts/sys_schema/functions/version_patch.sql
new file mode 100644
index 000000000000..39fd2838bfde
--- /dev/null
+++ b/scripts/sys_schema/functions/version_patch.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP FUNCTION IF EXISTS version_patch;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION version_patch ()
+    RETURNS TINYINT UNSIGNED
+    COMMENT '
+Description
+-----------
+
+Returns the patch release version of MySQL Server.
+
+Returns
+-----------
+
+TINYINT UNSIGNED
+
+Example
+-----------
+
+mysql> SELECT VERSION(), sys.version_patch();
++--------------------------------------+---------------------+
+| VERSION()                            | sys.version_patch() |
++--------------------------------------+---------------------+
+| 5.7.9-enterprise-commercial-advanced | 9                   |
++--------------------------------------+---------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    NO SQL
+BEGIN
+    RETURN SUBSTRING_INDEX(SUBSTRING_INDEX(VERSION(), '-', 1), '.', -1);
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/generate_sql_file_57.sh b/scripts/sys_schema/generate_sql_file_57.sh
new file mode 100755
index 000000000000..092d887524d3
--- /dev/null
+++ b/scripts/sys_schema/generate_sql_file_57.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+#  Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License, version 2.0,
+#  as published by the Free Software Foundation.
+#
+#  This program is also distributed with certain software (including
+#  but not limited to OpenSSL) that is licensed under separate terms,
+#  as designated in a particular file or component or in included license
+#  documentation.  The authors of MySQL hereby grant you an additional
+#  permission to link the program and your derivative works with the
+#  separately licensed software that they have included with MySQL.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License, version 2.0, for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+OUTPUTFILE="../mysql_sys_schema.sql"
+
+sed -e "s/^/-- /" LICENSE > ${OUTPUTFILE}
+echo "" >> ${OUTPUTFILE}
+
+cat >> ${OUTPUTFILE} << HERE_DOC
+--
+-- WARNING: THIS IS A MANUALLY GENERATED FILE,
+-- CHANGES NEED TO BE MADE IN THE scripts/sys_schema/*.sql FILES.
+--
+-- SEE scripts/sys_schema/generate_sql_file_57.sh TO GENERATE THIS FILE
+--
+HERE_DOC
+
+echo "" >> ${OUTPUTFILE}
+
+#
+# Concatenate all files listed in file sys_57.txt
+# Remove individual file copyrights
+# Replace newlines in COMMENTs with literal \n
+# Drop added trailing \n closing the COMMENT string
+# Remove leading spaces
+# Remove -- line comments *after removing leading spaces*
+# Collapse code limited by $$
+# Replace '$$' delimiter with ;
+# Collapse code limited by ;
+# Remove leading spaces (again), to clean up after the collapses.
+# Append to the resulting file
+# #
+
+cat `grep -v "#" sys_57.txt` | \
+sed -e "/Copyright/,/51 Franklin St/d" | \
+sed -e "/^ *COMMENT/,/^ *'/{G;s/\n/\\\n/g;}" | \
+sed -e "s/^'\\\n$/'/g" | \
+sed -e "s/^ *//g" | \
+sed -e "/^--/d" | \
+awk -f collapse-delimiter.awk | \
+sed -e "s/\\$\\$/;\n/g" | \
+awk -f collapse-semicolon.awk | \
+sed -e "s/^ *//g" \
+>> ${OUTPUTFILE}
+
+echo "$OUTPUTFILE updated"
+
diff --git a/scripts/sys_schema/init_priv.sql b/scripts/sys_schema/init_priv.sql
new file mode 100644
index 000000000000..76f0052f6523
--- /dev/null
+++ b/scripts/sys_schema/init_priv.sql
@@ -0,0 +1,33 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+REPLACE INTO mysql.user VALUES
+('localhost','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'mysql_native_password','*THISISNOTAVALIDPASSWORDTHATCANBEUSEDHERE','N',CURRENT_TIMESTAMP,NULL,'Y');
+
+REPLACE INTO mysql.db VALUES
+('localhost','sys','mysql.sys','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y');
+
+REPLACE INTO mysql.tables_priv VALUES
+('localhost','sys','mysql.sys','sys_config','root@localhost',
+CURRENT_TIMESTAMP, 'Select', '');
+
+FLUSH PRIVILEGES;
diff --git a/scripts/sys_schema/procedures/create_synonym_db.sql b/scripts/sys_schema/procedures/create_synonym_db.sql
new file mode 100644
index 000000000000..87be1ed5d542
--- /dev/null
+++ b/scripts/sys_schema/procedures/create_synonym_db.sql
@@ -0,0 +1,180 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS create_synonym_db;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE create_synonym_db (
+        IN in_db_name VARCHAR(64), 
+        IN in_synonym VARCHAR(64)
+    )
+    COMMENT '
+Description
+-----------
+
+Takes a source database name and synonym name, and then creates the 
+synonym database with views that point to all of the tables within
+the source database.
+
+Useful for creating a "ps" synonym for "performance_schema",
+or "is" instead of "information_schema", for example.
+
+Parameters
+-----------
+
+in_db_name (VARCHAR(64)):
+  The database name that you would like to create a synonym for.
+in_synonym (VARCHAR(64)):
+  The database synonym name.
+
+Example
+-----------
+
+mysql> SHOW DATABASES;
++--------------------+
+| Database           |
++--------------------+
+| information_schema |
+| mysql              |
+| performance_schema |
+| sys                |
+| test               |
++--------------------+
+5 rows in set (0.00 sec)
+
+mysql> CALL sys.create_synonym_db(\'performance_schema\', \'ps\');
++---------------------------------------+
+| summary                               |
++---------------------------------------+
+| Created 74 views in the `ps` database |
++---------------------------------------+
+1 row in set (8.57 sec)
+
+Query OK, 0 rows affected (8.57 sec)
+
+mysql> SHOW DATABASES;
++--------------------+
+| Database           |
++--------------------+
+| information_schema |
+| mysql              |
+| performance_schema |
+| ps                 |
+| sys                |
+| test               |
++--------------------+
+6 rows in set (0.00 sec)
+
+mysql> SHOW FULL TABLES FROM ps;
++------------------------------------------------------+------------+
+| Tables_in_ps                                         | Table_type |
++------------------------------------------------------+------------+
+| accounts                                             | VIEW       |
+| cond_instances                                       | VIEW       |
+| events_stages_current                                | VIEW       |
+| events_stages_history                                | VIEW       |
+...
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    DECLARE v_done bool DEFAULT FALSE;
+    DECLARE v_db_name_check VARCHAR(64);
+    DECLARE v_db_err_msg TEXT;
+    DECLARE v_table VARCHAR(64);
+    DECLARE v_views_created INT DEFAULT 0;
+
+    DECLARE db_doesnt_exist CONDITION FOR SQLSTATE '42000';
+    DECLARE db_name_exists CONDITION FOR SQLSTATE 'HY000';
+
+    DECLARE c_table_names CURSOR FOR 
+        SELECT TABLE_NAME 
+          FROM INFORMATION_SCHEMA.TABLES 
+         WHERE TABLE_SCHEMA = in_db_name;
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+    -- Check if the source database exists
+    SELECT SCHEMA_NAME INTO v_db_name_check
+      FROM INFORMATION_SCHEMA.SCHEMATA
+     WHERE SCHEMA_NAME = in_db_name;
+
+    IF v_db_name_check IS NULL THEN
+        SET v_db_err_msg = CONCAT('Unknown database ', in_db_name);
+        SIGNAL SQLSTATE 'HY000'
+            SET MESSAGE_TEXT = v_db_err_msg;
+    END IF;
+
+    -- Check if a database of the synonym name already exists
+    SELECT SCHEMA_NAME INTO v_db_name_check
+      FROM INFORMATION_SCHEMA.SCHEMATA
+     WHERE SCHEMA_NAME = in_synonym;
+
+    IF v_db_name_check = in_synonym THEN
+        SET v_db_err_msg = CONCAT('Can\'t create database ', in_synonym, '; database exists');
+        SIGNAL SQLSTATE 'HY000'
+            SET MESSAGE_TEXT = v_db_err_msg;
+    END IF;
+
+    -- All good, create the database and views
+    SET @create_db_stmt := CONCAT('CREATE DATABASE ', sys.quote_identifier(in_synonym));
+    PREPARE create_db_stmt FROM @create_db_stmt;
+    EXECUTE create_db_stmt;
+    DEALLOCATE PREPARE create_db_stmt;
+
+    SET v_done = FALSE;
+    OPEN c_table_names;
+    c_table_names: LOOP
+        FETCH c_table_names INTO v_table;
+        IF v_done THEN
+            LEAVE c_table_names;
+        END IF;
+
+        SET @create_view_stmt = CONCAT(
+            'CREATE SQL SECURITY INVOKER VIEW ',
+            sys.quote_identifier(in_synonym),
+            '.',
+            sys.quote_identifier(v_table),
+            ' AS SELECT * FROM ',
+            sys.quote_identifier(in_db_name),
+            '.',
+            sys.quote_identifier(v_table)
+        );
+        PREPARE create_view_stmt FROM @create_view_stmt;
+        EXECUTE create_view_stmt;
+        DEALLOCATE PREPARE create_view_stmt;
+
+        SET v_views_created = v_views_created + 1;
+    END LOOP;
+    CLOSE c_table_names;
+
+    SELECT CONCAT(
+        'Created ', v_views_created, ' view',
+        IF(v_views_created != 1, 's', ''), ' in the ',
+        sys.quote_identifier(in_synonym), ' database'
+    ) AS summary;
+
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/diagnostics.sql b/scripts/sys_schema/procedures/diagnostics.sql
new file mode 100644
index 000000000000..220ae2457362
--- /dev/null
+++ b/scripts/sys_schema/procedures/diagnostics.sql
@@ -0,0 +1,1123 @@
+--  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+-- 
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License, version 2.0,
+--  as published by the Free Software Foundation.
+--
+--  This program is also distributed with certain software (including
+--  but not limited to OpenSSL) that is licensed under separate terms,
+--  as designated in a particular file or component or in included license
+--  documentation.  The authors of MySQL hereby grant you an additional
+--  permission to link the program and your derivative works with the
+--  separately licensed software that they have included with MySQL.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License, version 2.0, for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program; if not, write to the Free Software
+--  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 
+
+DROP PROCEDURE IF EXISTS diagnostics;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE diagnostics (
+        IN in_max_runtime int unsigned, IN in_interval int unsigned,
+        IN in_auto_config enum ('current', 'medium', 'full')
+    )
+    COMMENT '
+Description
+-----------
+
+Create a report of the current status of the server for diagnostics purposes. Data collected includes (some items depends on versions and settings):
+
+   * The GLOBAL VARIABLES
+   * Several sys schema views including metrics or equivalent (depending on version and settings)
+   * Queries in the 95th percentile
+   * Several ndbinfo views for MySQL Cluster
+   * Replication (both master and slave) information.
+
+Some of the sys schema views are calculated as initial (optional), overall, delta:
+
+   * The initial view is the content of the view at the start of this procedure.
+     This output will be the same as the the start values used for the delta view.
+     The initial view is included if @sys.diagnostics.include_raw = ''ON''.
+   * The overall view is the content of the view at the end of this procedure.
+     This output is the same as the end values used for the delta view.
+     The overall view is always included.
+   * The delta view is the difference from the beginning to the end. Note that for min and max values
+     they are simply the min or max value from the end view respectively, so does not necessarily reflect
+     the minimum/maximum value in the monitored period.
+     Note: except for the metrics views the delta is only calculation between the first and last outputs.
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Versions supported:
+   * MySQL 5.6: 5.6.10 and later
+   * MySQL 5.7: 5.7.9 and later
+
+Parameters
+-----------
+
+in_max_runtime (INT UNSIGNED):
+  The maximum time to keep collecting data.
+  Use NULL to get the default which is 60 seconds, otherwise enter a value greater than 0.
+in_interval (INT UNSIGNED):
+  How long to sleep between data collections.
+  Use NULL to get the default which is 30 seconds, otherwise enter a value greater than 0.
+in_auto_config (ENUM(''current'', ''medium'', ''full''))
+  Automatically enable Performance Schema instruments and consumers.
+  NOTE: The more that are enabled, the more impact on the performance.
+  Supported values are:
+     * current - use the current settings.
+     * medium - enable some settings.
+     * full - enables all settings. This will have a big impact on the
+              performance - be careful using this option.
+  If another setting the ''current'' is chosen, the current settings
+  are restored at the end of the procedure.
+
+
+Configuration Options
+----------------------
+
+sys.diagnostics.allow_i_s_tables
+  Specifies whether it is allowed to do table scan queries on information_schema.TABLES. This can be expensive if there
+  are many tables. Set to ''ON'' to allow, ''OFF'' to not allow.
+  Default is ''OFF''.
+
+sys.diagnostics.include_raw
+  Set to ''ON'' to include the raw data (e.g. the original output of "SELECT * FROM sys.metrics").
+  Use this to get the initial values of the various views.
+  Default is ''OFF''.
+
+sys.statement_truncate_len
+  How much of queries in the process list output to include.
+  Default is 64.
+
+sys.debug
+  Whether to provide debugging output.
+  Default is ''OFF''. Set to ''ON'' to include.
+
+
+Example
+--------
+
+To create a report and append it to the file diag.out:
+
+mysql> TEE diag.out;
+mysql> CALL sys.diagnostics(120, 30, ''current'');
+...
+mysql> NOTEE;
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    DECLARE v_start, v_runtime, v_iter_start, v_sleep DECIMAL(20,2) DEFAULT 0.0;
+    DECLARE v_has_innodb, v_has_ndb, v_has_ps, v_has_replication, v_has_ps_replication VARCHAR(8) CHARSET utf8 DEFAULT 'NO';
+    DECLARE v_this_thread_enabled, v_has_ps_vars, v_has_metrics ENUM('YES', 'NO');
+    DECLARE v_table_name, v_banner VARCHAR(64) CHARSET utf8;
+    DECLARE v_sql_status_summary_select, v_sql_status_summary_delta, v_sql_status_summary_from, v_no_delta_names TEXT;
+    DECLARE v_output_time, v_output_time_prev DECIMAL(20,3) UNSIGNED;
+    DECLARE v_output_count, v_count, v_old_group_concat_max_len INT UNSIGNED DEFAULT 0;
+    -- The width of each of the status outputs in the summery
+    DECLARE v_status_summary_width TINYINT UNSIGNED DEFAULT 50;
+    DECLARE v_done BOOLEAN DEFAULT FALSE;
+    -- Do not include the following ndbinfo views:
+    --    'blocks'                    Static
+    --    'config_params'             Static
+    --    'dict_obj_types'            Static
+    --    'disk_write_speed_base'     Can generate lots of output - only include aggregate views here
+    --    'memory_per_fragment'       Can generate lots of output
+    --    'memoryusage'               Handled separately
+    --    'operations_per_fragment'   Can generate lots of output
+    --    'threadblocks'              Only needed once
+    DECLARE c_ndbinfo CURSOR FOR
+        SELECT TABLE_NAME
+          FROM information_schema.TABLES
+         WHERE TABLE_SCHEMA = 'ndbinfo'
+               AND TABLE_NAME NOT IN (
+                  'blocks',
+                  'config_params',
+                  'dict_obj_types',
+                  'disk_write_speed_base',
+                  'memory_per_fragment',
+                  'memoryusage',
+                  'operations_per_fragment',
+                  'threadblocks'
+               );
+    DECLARE c_sysviews_w_delta CURSOR FOR
+        SELECT table_name
+          FROM tmp_sys_views_delta
+         ORDER BY table_name;
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+    -- Do not track the current thread - no reason to clutter the output
+    SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
+    IF (v_this_thread_enabled = 'YES') THEN
+        CALL sys.ps_setup_disable_thread(CONNECTION_ID());
+    END IF;
+
+    -- Check options are sane
+    IF (in_max_runtime < in_interval) THEN
+        SIGNAL SQLSTATE '45000'
+           SET MESSAGE_TEXT = 'in_max_runtime must be greater than or equal to in_interval';
+    END IF;
+    IF (in_max_runtime = 0) THEN
+        SIGNAL SQLSTATE '45000'
+           SET MESSAGE_TEXT = 'in_max_runtime must be greater than 0';
+    END IF;
+    IF (in_interval = 0) THEN
+        SIGNAL SQLSTATE '45000'
+           SET MESSAGE_TEXT = 'in_interval must be greater than 0';
+    END IF;
+
+    -- Set configuration options
+    IF (@sys.diagnostics.allow_i_s_tables IS NULL) THEN
+        SET @sys.diagnostics.allow_i_s_tables = sys.sys_get_config('diagnostics.allow_i_s_tables', 'OFF');
+    END IF;
+    IF (@sys.diagnostics.include_raw IS NULL) THEN
+        SET @sys.diagnostics.include_raw      = sys.sys_get_config('diagnostics.include_raw'     , 'OFF');
+    END IF;
+    IF (@sys.debug IS NULL) THEN
+        SET @sys.debug                        = sys.sys_get_config('debug'                       , 'OFF');
+    END IF;
+    IF (@sys.statement_truncate_len IS NULL) THEN
+        SET @sys.statement_truncate_len       = sys.sys_get_config('statement_truncate_len'      , '64' );
+    END IF;
+
+    -- Temporary table are used - disable sql_log_bin if necessary to prevent them replicating
+    SET @log_bin := @@sql_log_bin;
+    IF (@log_bin = 1) THEN
+        SET sql_log_bin = 0;
+    END IF;
+
+    -- Some metrics variables doesn't make sense in delta and rate calculations even if they are numeric
+    -- as they really are more like settings or "current" status.
+    SET v_no_delta_names = CONCAT('s%{COUNT}.Variable_name NOT IN (',
+        '''innodb_buffer_pool_pages_total'', ',
+        '''innodb_page_size'', ',
+        '''last_query_cost'', ',
+        '''last_query_partial_plans'', ',
+        '''qcache_total_blocks'', ',
+        '''slave_last_heartbeat'', ',
+        '''ssl_ctx_verify_depth'', ',
+        '''ssl_ctx_verify_mode'', ',
+        '''ssl_session_cache_size'', ',
+        '''ssl_verify_depth'', ',
+        '''ssl_verify_mode'', ',
+        '''ssl_version'', ',
+        '''buffer_flush_lsn_avg_rate'', ',
+        '''buffer_flush_pct_for_dirty'', ',
+        '''buffer_flush_pct_for_lsn'', ',
+        '''buffer_pool_pages_total'', ',
+        '''lock_row_lock_time_avg'', ',
+        '''lock_row_lock_time_max'', ',
+        '''innodb_page_size''',
+    ')');
+
+    IF (in_auto_config <> 'current') THEN
+        IF (@sys.debug = 'ON') THEN
+            SELECT CONCAT('Updating Performance Schema configuration to ', in_auto_config) AS 'Debug';
+        END IF;
+        CALL sys.ps_setup_save(0);
+
+        IF (in_auto_config = 'medium') THEN
+            -- Enable all consumers except %history and %history_long
+            UPDATE performance_schema.setup_consumers
+                SET ENABLED = 'YES'
+            WHERE NAME NOT LIKE '%\_history%';
+
+            -- Enable all instruments except wait/synch/%
+            UPDATE performance_schema.setup_instruments
+                SET ENABLED = 'YES',
+                    TIMED   = 'YES'
+            WHERE NAME NOT LIKE 'wait/synch/%';
+        ELSEIF (in_auto_config = 'full') THEN
+            UPDATE performance_schema.setup_consumers
+                SET ENABLED = 'YES';
+
+            UPDATE performance_schema.setup_instruments
+                SET ENABLED = 'YES',
+                    TIMED   = 'YES';
+        END IF;
+
+        -- Enable all threads except this one
+        UPDATE performance_schema.threads
+           SET INSTRUMENTED = 'YES'
+         WHERE PROCESSLIST_ID <> CONNECTION_ID();
+    END IF;
+
+    SET v_start        = UNIX_TIMESTAMP(NOW(2)),
+        in_interval    = IFNULL(in_interval, 30),
+        in_max_runtime = IFNULL(in_max_runtime, 60);
+
+    -- Get a quick ref with hostname, server UUID, and the time for the report.
+    SET v_banner = REPEAT(
+                      '-',
+                      LEAST(
+                         GREATEST(
+                            36,
+                            CHAR_LENGTH(VERSION()),
+                            CHAR_LENGTH(@@global.version_comment),
+                            CHAR_LENGTH(@@global.version_compile_os),
+                            CHAR_LENGTH(@@global.version_compile_machine),
+                            CHAR_LENGTH(@@global.socket),
+                            CHAR_LENGTH(@@global.datadir)
+                         ),
+                         64
+                      )
+                   );
+    SELECT 'Hostname' AS 'Name', @@global.hostname AS 'Value'
+    UNION ALL
+    SELECT 'Port' AS 'Name', @@global.port AS 'Value'
+    UNION ALL
+    SELECT 'Socket' AS 'Name', @@global.socket AS 'Value'
+    UNION ALL
+    SELECT 'Datadir' AS 'Name', @@global.datadir AS 'Value'
+    UNION ALL
+    SELECT 'Server UUID' AS 'Name', @@global.server_uuid AS 'Value'
+    UNION ALL
+    SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value'
+    UNION ALL
+    SELECT 'MySQL Version' AS 'Name', VERSION() AS 'Value'
+    UNION ALL
+    SELECT 'Sys Schema Version' AS 'Name', (SELECT sys_version FROM sys.version) AS 'Value'
+    UNION ALL
+    SELECT 'Version Comment' AS 'Name', @@global.version_comment AS 'Value'
+    UNION ALL
+    SELECT 'Version Compile OS' AS 'Name', @@global.version_compile_os AS 'Value'
+    UNION ALL
+    SELECT 'Version Compile Machine' AS 'Name', @@global.version_compile_machine AS 'Value'
+    UNION ALL
+    SELECT REPEAT('-', 23) AS 'Name', v_banner AS 'Value'
+    UNION ALL
+    SELECT 'UTC Time' AS 'Name', UTC_TIMESTAMP() AS 'Value'
+    UNION ALL
+    SELECT 'Local Time' AS 'Name', NOW() AS 'Value'
+    UNION ALL
+    SELECT 'Time Zone' AS 'Name', @@global.time_zone AS 'Value'
+    UNION ALL
+    SELECT 'System Time Zone' AS 'Name', @@global.system_time_zone AS 'Value'
+    UNION ALL
+    SELECT 'Time Zone Offset' AS 'Name', TIMEDIFF(NOW(), UTC_TIMESTAMP()) AS 'Value';
+
+    -- Are the InnoDB, NDBCluster, and Performance Schema storage engines present?
+    SET v_has_innodb         = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'InnoDB'), 'NO'),
+        v_has_ndb            = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'NDBCluster'), 'NO'),
+        v_has_ps             = IFNULL((SELECT SUPPORT FROM information_schema.ENGINES WHERE ENGINE = 'PERFORMANCE_SCHEMA'), 'NO'),
+        v_has_ps_replication = IF(v_has_ps = 'YES'
+                                   AND EXISTS(SELECT 1 FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'replication_applier_status'),
+                                   'YES',
+                                   'NO'
+                               ),
+        v_has_replication    = /*!50707 IF(v_has_ps_replication = 'YES', IF((SELECT COUNT(*) FROM performance_schema.replication_connection_status) > 0, 'YES', 'NO'),*/
+                                  IF(@@master_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_master_info) > 0, 'YES', 'NO'),
+                                     IF(@@relay_log_info_repository = 'TABLE', IF((SELECT COUNT(*) FROM mysql.slave_relay_log_info) > 0, 'YES', 'NO'),
+                                        'MAYBE'))/*!50707 )*/,
+        v_has_metrics        = IF(v_has_ps = 'YES' OR (sys.version_major() = 5 AND sys.version_minor() = 6), 'YES', 'NO'),
+        v_has_ps_vars        = 'NO';
+
+    -- 5.7.7 introduced the possibility to get SHOW [GLOBAL|SESSION] VARIABLES and SHOW [GLOBAL|SESSION] STATUS
+    -- from the Performance Schema. But it's optional whether it's enabled.
+    -- 5.7.9 changes so the Performance Schema tables always work.
+    -- Note that @@global.show_compatibility_56 = OFF will only actually work if the Performance Schema is enabled in <=5.7.8,
+    -- however except overriding the global value there is nothing that can be done about it.
+    -- v_has_ps_vars defaults to NO
+    /*!50707 SET v_has_ps_vars = IF(@@global.show_compatibility_56, 'NO', 'YES');*/
+    /*!50709 SET v_has_ps_vars = 'YES';*/
+
+    IF (@sys.debug = 'ON') THEN
+       SELECT v_has_innodb AS 'Has_InnoDB', v_has_ndb AS 'Has_NDBCluster',
+              v_has_ps AS 'Has_Performance_Schema', v_has_ps_vars AS 'Has_P_S_SHOW_Variables',
+              v_has_metrics AS 'Has_metrics',
+              v_has_ps_replication 'AS Has_P_S_Replication', v_has_replication AS 'Has_Replication';
+    END IF;
+
+    IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN
+        -- Need to use prepared statement as just having the query as a plain command
+        -- will generate an error if the InnoDB storage engine is not present
+        SET @sys.diagnostics.sql = 'SHOW ENGINE InnoDB STATUS';
+        PREPARE stmt_innodb_status FROM @sys.diagnostics.sql;
+    END IF;
+
+    IF (v_has_ps = 'YES') THEN
+        -- Need to use prepared statement as just having the query as a plain command
+        -- will generate an error if the InnoDB storage engine is not present
+        SET @sys.diagnostics.sql = 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS';
+        PREPARE stmt_ps_status FROM @sys.diagnostics.sql;
+    END IF;
+
+    IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN
+        -- Need to use prepared statement as just having the query as a plain command
+        -- will generate an error if the NDBCluster storage engine is not present
+        SET @sys.diagnostics.sql = 'SHOW ENGINE NDBCLUSTER STATUS';
+        PREPARE stmt_ndbcluster_status FROM @sys.diagnostics.sql;
+    END IF;
+
+    SET @sys.diagnostics.sql_gen_query_template = 'SELECT CONCAT(
+           ''SELECT '',
+           GROUP_CONCAT(
+               CASE WHEN (SUBSTRING(TABLE_NAME, 3), COLUMN_NAME) IN (
+                                (''io_global_by_file_by_bytes'', ''total''),
+                                (''io_global_by_wait_by_bytes'', ''total_requested'')
+                         )
+                         THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME)
+                    WHEN COLUMN_NAME LIKE ''%latency''
+                         THEN CONCAT(''sys.format_time('', COLUMN_NAME, '') AS '', COLUMN_NAME)
+                    WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated''
+                         OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'')
+                         THEN CONCAT(''sys.format_bytes('', COLUMN_NAME, '') AS '', COLUMN_NAME)
+                    ELSE COLUMN_NAME
+               END
+               ORDER BY ORDINAL_POSITION
+               SEPARATOR '',\n       ''
+           ),
+           ''\n  FROM tmp_'', SUBSTRING(TABLE_NAME FROM 3), ''_%{OUTPUT}''
+       ) AS Query INTO @sys.diagnostics.sql_select
+  FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = ''sys'' AND TABLE_NAME = ?
+ GROUP BY TABLE_NAME';
+
+    SET @sys.diagnostics.sql_gen_query_delta = 'SELECT CONCAT(
+           ''SELECT '',
+           GROUP_CONCAT(
+               CASE WHEN FIND_IN_SET(COLUMN_NAME, diag.pk)
+                         THEN COLUMN_NAME
+                    WHEN diag.TABLE_NAME = ''io_global_by_file_by_bytes'' AND COLUMN_NAME = ''write_pct''
+                         THEN CONCAT(''IFNULL(ROUND(100-(((e.total_read-IFNULL(s.total_read, 0))'',
+                                     ''/NULLIF(((e.total_read-IFNULL(s.total_read, 0))+(e.total_written-IFNULL(s.total_written, 0))), 0))*100), 2), 0.00) AS '',
+                                     COLUMN_NAME)
+                    WHEN (diag.TABLE_NAME, COLUMN_NAME) IN (
+                                (''io_global_by_file_by_bytes'', ''total''),
+                                (''io_global_by_wait_by_bytes'', ''total_requested'')
+                         )
+                         THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, ''-IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME)
+                    WHEN SUBSTRING(COLUMN_NAME, 1, 4) IN (''max_'', ''min_'') AND SUBSTRING(COLUMN_NAME, -8) = ''_latency''
+                         THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '') AS '', COLUMN_NAME)
+                    WHEN COLUMN_NAME = ''avg_latency''
+                         THEN CONCAT(''sys.format_time((e.total_latency - IFNULL(s.total_latency, 0))'',
+                                     ''/NULLIF(e.total - IFNULL(s.total, 0), 0)) AS '', COLUMN_NAME)
+                    WHEN SUBSTRING(COLUMN_NAME, -12) = ''_avg_latency''
+                         THEN CONCAT(''sys.format_time((e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''_latency, 0))'',
+                                     ''/NULLIF(e.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s - IFNULL(s.'', SUBSTRING(COLUMN_NAME FROM 1 FOR CHAR_LENGTH(COLUMN_NAME)-12), ''s, 0), 0)) AS '', COLUMN_NAME)
+                    WHEN COLUMN_NAME LIKE ''%latency''
+                         THEN CONCAT(''sys.format_time(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME)
+                    WHEN COLUMN_NAME IN (''avg_read'', ''avg_write'', ''avg_written'')
+                         THEN CONCAT(''sys.format_bytes(IFNULL((e.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), ''-IFNULL(s.total_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''written''), '', 0))'',
+                                     ''/NULLIF(e.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), ''-IFNULL(s.count_'', IF(COLUMN_NAME = ''avg_read'', ''read'', ''write''), '', 0), 0), 0)) AS '',
+                                     COLUMN_NAME)
+                    WHEN SUBSTRING(COLUMN_NAME, -7) = ''_memory'' OR SUBSTRING(COLUMN_NAME, -17) = ''_memory_allocated''
+                         OR ((SUBSTRING(COLUMN_NAME, -5) = ''_read'' OR SUBSTRING(COLUMN_NAME, -8) = ''_written'' OR SUBSTRING(COLUMN_NAME, -6) = ''_write'') AND SUBSTRING(COLUMN_NAME, 1, 6) <> ''COUNT_'')
+                         THEN CONCAT(''sys.format_bytes(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME)
+                    ELSE CONCAT(''(e.'', COLUMN_NAME, '' - IFNULL(s.'', COLUMN_NAME, '', 0)) AS '', COLUMN_NAME)
+               END
+               ORDER BY ORDINAL_POSITION
+               SEPARATOR '',\n       ''
+           ),
+           ''\n  FROM tmp_'', diag.TABLE_NAME, ''_end e
+       LEFT OUTER JOIN tmp_'', diag.TABLE_NAME, ''_start s USING ('', diag.pk, '')''
+       ) AS Query INTO @sys.diagnostics.sql_select
+  FROM tmp_sys_views_delta diag
+       INNER JOIN information_schema.COLUMNS c ON c.TABLE_NAME = CONCAT(''x$'', diag.TABLE_NAME)
+ WHERE c.TABLE_SCHEMA = ''sys'' AND diag.TABLE_NAME = ?
+ GROUP BY diag.TABLE_NAME';
+
+    IF (v_has_ps = 'YES') THEN
+        -- Create temporary table with the ORDER BY clauses. Will be required both for the initial (if included) and end queries
+        DROP TEMPORARY TABLE IF EXISTS tmp_sys_views_delta;
+        CREATE TEMPORARY TABLE tmp_sys_views_delta (
+            TABLE_NAME varchar(64) NOT NULL,
+            order_by text COMMENT 'ORDER BY clause for the initial and overall views',
+            order_by_delta text COMMENT 'ORDER BY clause for the delta views',
+            where_delta text COMMENT 'WHERE clause to use for delta views to only include rows with a "count" > 0',
+            limit_rows int unsigned COMMENT 'The maximum number of rows to include for the view',
+            pk varchar(128) COMMENT 'Used with the FIND_IN_SET() function so use comma separated list without whitespace',
+            PRIMARY KEY (TABLE_NAME)
+        );
+
+        -- %{OUTPUT} will be replace by the suffix used for the output.
+        IF (@sys.debug = 'ON') THEN
+            SELECT 'Populating tmp_sys_views_delta' AS 'Debug';
+        END IF;
+        INSERT INTO tmp_sys_views_delta
+        VALUES ('host_summary'                       , '%{TABLE}.statement_latency DESC',
+                                                       '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC',
+                                                       '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'host'),
+               ('host_summary_by_file_io'            , '%{TABLE}.io_latency DESC',
+                                                       '(e.io_latency-IFNULL(s.io_latency, 0)) DESC',
+                                                       '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'host'),
+               ('host_summary_by_file_io_type'       , '%{TABLE}.host, %{TABLE}.total_latency DESC',
+                                                       'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'),
+               ('host_summary_by_stages'             , '%{TABLE}.host, %{TABLE}.total_latency DESC',
+                                                       'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event_name'),
+               ('host_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host'),
+               ('host_summary_by_statement_type'     , '%{TABLE}.host, %{TABLE}.total_latency DESC',
+                                                       'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,statement'),
+               ('io_by_thread_by_latency'            , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,thread_id,processlist_id'),
+               ('io_global_by_file_by_bytes'         , '%{TABLE}.total DESC',
+                                                       '(e.total-IFNULL(s.total, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'),
+               ('io_global_by_file_by_latency'       , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', 100, 'file'),
+               ('io_global_by_wait_by_bytes'         , '%{TABLE}.total_requested DESC',
+                                                       '(e.total_requested-IFNULL(s.total_requested, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'),
+               ('io_global_by_wait_by_latency'       , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_name'),
+               ('schema_index_statistics'            , '(%{TABLE}.select_latency+%{TABLE}.insert_latency+%{TABLE}.update_latency+%{TABLE}.delete_latency) DESC',
+                                                       '((e.select_latency+e.insert_latency+e.update_latency+e.delete_latency)-IFNULL(s.select_latency+s.insert_latency+s.update_latency+s.delete_latency, 0)) DESC',
+                                                       '((e.rows_selected+e.insert_latency+e.rows_updated+e.rows_deleted)-IFNULL(s.rows_selected+s.rows_inserted+s.rows_updated+s.rows_deleted, 0)) > 0',
+                                                       100, 'table_schema,table_name,index_name'),
+               ('schema_table_statistics'            , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) > 0', 100, 'table_schema,table_name'),
+               ('schema_tables_with_full_table_scans', '%{TABLE}.rows_full_scanned DESC',
+                                                       '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) DESC',
+                                                       '(e.rows_full_scanned-IFNULL(s.rows_full_scanned, 0)) > 0', 100, 'object_schema,object_name'),
+               ('user_summary'                       , '%{TABLE}.statement_latency DESC',
+                                                       '(e.statement_latency-IFNULL(s.statement_latency, 0)) DESC',
+                                                       '(e.statements - IFNULL(s.statements, 0)) > 0', NULL, 'user'),
+               ('user_summary_by_file_io'            , '%{TABLE}.io_latency DESC',
+                                                       '(e.io_latency-IFNULL(s.io_latency, 0)) DESC',
+                                                       '(e.ios - IFNULL(s.ios, 0)) > 0', NULL, 'user'),
+               ('user_summary_by_file_io_type'       , '%{TABLE}.user, %{TABLE}.latency DESC',
+                                                       'e.user, (e.latency-IFNULL(s.latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'),
+               ('user_summary_by_stages'             , '%{TABLE}.user, %{TABLE}.total_latency DESC',
+                                                       'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event_name'),
+               ('user_summary_by_statement_latency'  , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user'),
+               ('user_summary_by_statement_type'     , '%{TABLE}.user, %{TABLE}.total_latency DESC',
+                                                       'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,statement'),
+               ('wait_classes_global_by_avg_latency' , 'IFNULL(%{TABLE}.total_latency / NULLIF(%{TABLE}.total, 0), 0) DESC',
+                                                       'IFNULL((e.total_latency-IFNULL(s.total_latency, 0)) / NULLIF((e.total - IFNULL(s.total, 0)), 0), 0) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'),
+               ('wait_classes_global_by_latency'     , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'event_class'),
+               ('waits_by_host_by_latency'           , '%{TABLE}.host, %{TABLE}.total_latency DESC',
+                                                       'e.host, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'host,event'),
+               ('waits_by_user_by_latency'           , '%{TABLE}.user, %{TABLE}.total_latency DESC',
+                                                       'e.user, (e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'user,event'),
+               ('waits_global_by_latency'            , '%{TABLE}.total_latency DESC',
+                                                       '(e.total_latency-IFNULL(s.total_latency, 0)) DESC',
+                                                       '(e.total - IFNULL(s.total, 0)) > 0', NULL, 'events')
+        ;
+    END IF;
+
+
+    SELECT '
+
+=======================
+
+     Configuration
+
+=======================
+
+' AS '';
+    -- Get the configuration.
+    SELECT 'GLOBAL VARIABLES' AS 'The following output is:';
+    IF (v_has_ps_vars = 'YES') THEN
+        SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM performance_schema.global_variables ORDER BY VARIABLE_NAME;
+    ELSE
+        SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value FROM information_schema.GLOBAL_VARIABLES ORDER BY VARIABLE_NAME;
+    END IF;
+
+    IF (v_has_ps = 'YES') THEN
+        -- Overview of the Performance Schema dynamic settings used for this report.
+        SELECT 'Performance Schema Setup - Actors' AS 'The following output is:';
+        SELECT * FROM performance_schema.setup_actors;
+
+        SELECT 'Performance Schema Setup - Consumers' AS 'The following output is:';
+        SELECT NAME AS Consumer, ENABLED, sys.ps_is_consumer_enabled(NAME) AS COLLECTS
+          FROM performance_schema.setup_consumers;
+
+        SELECT 'Performance Schema Setup - Instruments' AS 'The following output is:';
+        SELECT SUBSTRING_INDEX(NAME, '/', 2) AS 'InstrumentClass',
+               ROUND(100*SUM(IF(ENABLED = 'YES', 1, 0))/COUNT(*), 2) AS 'EnabledPct',
+               ROUND(100*SUM(IF(TIMED = 'YES', 1, 0))/COUNT(*), 2) AS 'TimedPct'
+          FROM performance_schema.setup_instruments
+         GROUP BY SUBSTRING_INDEX(NAME, '/', 2)
+         ORDER BY SUBSTRING_INDEX(NAME, '/', 2);
+
+        SELECT 'Performance Schema Setup - Objects' AS 'The following output is:';
+        SELECT * FROM performance_schema.setup_objects;
+
+        SELECT 'Performance Schema Setup - Threads' AS 'The following output is:';
+        SELECT `TYPE` AS ThreadType, COUNT(*) AS 'Total', ROUND(100*SUM(IF(INSTRUMENTED = 'YES', 1, 0))/COUNT(*), 2) AS 'InstrumentedPct'
+          FROM performance_schema.threads
+        GROUP BY TYPE;
+    END IF;
+
+
+    IF (v_has_replication = 'NO') THEN
+        SELECT 'No Replication Configured' AS 'Replication Status';
+    ELSE
+        -- No guarantee that replication is actually configured, but we can't really know
+        SELECT CONCAT('Replication Configured: ', v_has_replication, ' - Performance Schema Replication Tables: ', v_has_ps_replication) AS 'Replication Status';
+
+        IF (v_has_ps_replication = 'YES') THEN
+            SELECT 'Replication - Connection Configuration' AS 'The following output is:';
+            SELECT * FROM performance_schema.replication_connection_configuration/*!50706 ORDER BY CHANNEL_NAME*/;
+        END IF;
+
+        IF (v_has_ps_replication = 'YES') THEN
+            SELECT 'Replication - Applier Configuration' AS 'The following output is:';
+            SELECT * FROM performance_schema.replication_applier_configuration ORDER BY CHANNEL_NAME;
+        END IF;
+
+        IF (@@master_info_repository = 'TABLE') THEN
+            SELECT 'Replication - Master Info Repository Configuration' AS 'The following output is:';
+            -- Can't just do SELECT *  as the password may be present in plain text
+            -- Don't include binary log file and position as that will be determined in each iteration as well
+            SELECT /*!50706 Channel_name, */Host, User_name, Port, Connect_retry,
+                   Enabled_ssl, Ssl_ca, Ssl_capath, Ssl_cert, Ssl_cipher, Ssl_key, Ssl_verify_server_cert,
+                   Heartbeat, Bind, Ignored_server_ids, Uuid, Retry_count, Ssl_crl, Ssl_crlpath,
+                   Tls_version, Enabled_auto_position
+              FROM mysql.slave_master_info/*!50706 ORDER BY Channel_name*/;
+        END IF;
+
+        IF (@@relay_log_info_repository = 'TABLE') THEN
+            SELECT 'Replication - Relay Log Repository Configuration' AS 'The following output is:';
+            SELECT /*!50706 Channel_name, */Sql_delay, Number_of_workers, Id
+              FROM mysql.slave_relay_log_info/*!50706 ORDER BY Channel_name*/;
+        END IF;
+    END IF;
+
+
+    IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN
+       SELECT 'Cluster Thread Blocks' AS 'The following output is:';
+       SELECT * FROM ndbinfo.threadblocks;
+    END IF;
+
+    -- For a number of sys views as well as events_statements_summary_by_digest,
+    -- just get the start data and then at the end output the overall and delta values
+    IF (v_has_ps = 'YES') THEN
+        IF (@sys.diagnostics.include_raw = 'ON') THEN
+            SELECT '
+
+========================
+
+     Initial Status
+
+========================
+
+' AS '';
+        END IF;
+
+        DROP TEMPORARY TABLE IF EXISTS tmp_digests_start;
+        CALL sys.statement_performance_analyzer('create_tmp', 'tmp_digests_start', NULL);
+        CALL sys.statement_performance_analyzer('snapshot', NULL, NULL);
+        CALL sys.statement_performance_analyzer('save', 'tmp_digests_start', NULL);
+
+        -- Loop over the sys views where deltas should be calculated.
+        IF (@sys.diagnostics.include_raw = 'ON') THEN
+            SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'start');
+            IF (@sys.debug = 'ON') THEN
+                SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug';
+                SELECT @sys.diagnostics.sql AS 'Debug';
+            END IF;
+            PREPARE stmt_gen_query FROM @sys.diagnostics.sql;
+        END IF;
+        SET v_done = FALSE;
+        OPEN c_sysviews_w_delta;
+        c_sysviews_w_delta_loop: LOOP
+            FETCH c_sysviews_w_delta INTO v_table_name;
+            IF v_done THEN
+                LEAVE c_sysviews_w_delta_loop;
+            END IF;
+
+            IF (@sys.debug = 'ON') THEN
+                SELECT CONCAT('The following queries are for storing the initial content of ', v_table_name) AS 'Debug';
+            END IF;
+
+            CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_start`'));
+            CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_start` SELECT * FROM `sys`.`x$', v_table_name, '`'));
+
+            IF (@sys.diagnostics.include_raw = 'ON') THEN
+                SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name);
+                EXECUTE stmt_gen_query USING @sys.diagnostics.table_name;
+                -- If necessary add ORDER BY and LIMIT
+                SELECT CONCAT(@sys.diagnostics.sql_select,
+                              IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_start'))), ''),
+                              IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '')
+                       )
+                  INTO @sys.diagnostics.sql_select
+                  FROM tmp_sys_views_delta
+                 WHERE TABLE_NAME = v_table_name;
+                SELECT CONCAT('Initial ', v_table_name) AS 'The following output is:';
+                CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select);
+            END IF;
+        END LOOP;
+        CLOSE c_sysviews_w_delta;
+
+        IF (@sys.diagnostics.include_raw = 'ON') THEN
+            DEALLOCATE PREPARE stmt_gen_query;
+        END IF;
+    END IF;
+
+    -- If in_include_status_summary is TRUE then a temporary table is required to store the data
+    SET v_sql_status_summary_select = 'SELECT Variable_name',
+        v_sql_status_summary_delta  = '',
+        v_sql_status_summary_from   = '';
+
+    -- Start the loop
+    REPEAT
+        SET v_output_count = v_output_count + 1;
+        IF (v_output_count > 1) THEN
+            -- Don't sleep on the first execution
+            SET v_sleep = in_interval-(UNIX_TIMESTAMP(NOW(2))-v_iter_start);
+            SELECT NOW() AS 'Time', CONCAT('Going to sleep for ', v_sleep, ' seconds. Please do not interrupt') AS 'The following output is:';
+            DO SLEEP(in_interval);
+        END IF;
+        SET v_iter_start = UNIX_TIMESTAMP(NOW(2));
+
+        SELECT NOW(), CONCAT('Iteration Number ', IFNULL(v_output_count, 'NULL')) AS 'The following output is:';
+
+        -- Even in 5.7 there is no way to get all the info from SHOW MASTER|SLAVE STATUS using the Performance Schema or
+        -- other tables, so include them even though they are no longer optimal solutions and if present get the additional
+        -- information from the other tables available.
+        IF (@@log_bin = 1) THEN
+            SELECT 'SHOW MASTER STATUS' AS 'The following output is:';
+            SHOW MASTER STATUS;
+        END IF;
+
+        IF (v_has_replication <> 'NO') THEN
+            SELECT 'SHOW SLAVE STATUS' AS 'The following output is:';
+            SHOW SLAVE STATUS;
+
+            IF (v_has_ps_replication = 'YES') THEN
+                SELECT 'Replication Connection Status' AS 'The following output is:';
+                SELECT * FROM performance_schema.replication_connection_status;
+
+                SELECT 'Replication Applier Status' AS 'The following output is:';
+                SELECT * FROM performance_schema.replication_applier_status ORDER BY CHANNEL_NAME;
+
+                SELECT 'Replication Applier Status - Coordinator' AS 'The following output is:';
+                SELECT * FROM performance_schema.replication_applier_status_by_coordinator ORDER BY CHANNEL_NAME;
+
+                SELECT 'Replication Applier Status - Worker' AS 'The following output is:';
+                SELECT * FROM performance_schema.replication_applier_status_by_worker ORDER BY CHANNEL_NAME, WORKER_ID;
+            END IF;
+
+            IF (@@master_info_repository = 'TABLE') THEN
+                SELECT 'Replication - Master Log Status' AS 'The following output is:';
+                SELECT Master_log_name, Master_log_pos FROM mysql.slave_master_info;
+            END IF;
+
+            IF (@@relay_log_info_repository = 'TABLE') THEN
+                SELECT 'Replication - Relay Log Status' AS 'The following output is:';
+                SELECT sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos FROM mysql.slave_relay_log_info;
+
+                SELECT 'Replication - Worker Status' AS 'The following output is:';
+                SELECT Id, sys.format_path(Relay_log_name) AS Relay_log_name, Relay_log_pos, Master_log_name, Master_log_pos,
+                       sys.format_path(Checkpoint_relay_log_name) AS Checkpoint_relay_log_name, Checkpoint_relay_log_pos,
+                       Checkpoint_master_log_name, Checkpoint_master_log_pos, Checkpoint_seqno, Checkpoint_group_size,
+                       HEX(Checkpoint_group_bitmap) AS Checkpoint_group_bitmap/*!50706 , Channel_name*/
+                  FROM mysql.slave_worker_info
+              ORDER BY /*!50706 Channel_name, */Id;
+            END IF;
+        END IF;
+
+        -- We need one table per output as a temporary table cannot be opened twice in the same query, and we need to
+        -- join the outputs in the summary at the end.
+        SET v_table_name = CONCAT('tmp_metrics_', v_output_count);
+        CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name));
+
+        -- Currently information_schema.GLOBAL_STATUS has VARIABLE_VALUE as varchar(1024)
+        CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE ', v_table_name, ' (
+  Variable_name VARCHAR(193) NOT NULL,
+  Variable_value VARCHAR(1024),
+  Type VARCHAR(225) NOT NULL,
+  Enabled ENUM(''YES'', ''NO'', ''PARTIAL'') NOT NULL,
+  PRIMARY KEY (Type, Variable_name)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8'));
+
+        IF (v_has_metrics) THEN
+            SET @sys.diagnostics.sql = CONCAT(
+                'INSERT INTO ', v_table_name,
+                ' SELECT Variable_name, REPLACE(Variable_value, ''\n'', ''\\\\n'') AS Variable_value, Type, Enabled FROM sys.metrics'
+            );
+        ELSE
+            -- 5.7+ and the Performance Schema disabled. Use information_schema.GLOBAL_STATUS instead like in 5.6.
+            SET @sys.diagnostics.sql = CONCAT(
+                'INSERT INTO ', v_table_name,
+                '(SELECT LOWER(VARIABLE_NAME) AS Variable_name, REPLACE(VARIABLE_VALUE, ''\n'', ''\\\\n'') AS Variable_value,
+                         ''Global Status'' AS Type, ''YES'' AS Enabled
+  FROM performance_schema.global_status
+) UNION ALL (
+SELECT NAME AS Variable_name, COUNT AS Variable_value,
+       CONCAT(''InnoDB Metrics - '', SUBSYSTEM) AS Type,
+       IF(STATUS = ''enabled'', ''YES'', ''NO'') AS Enabled
+  FROM information_schema.INNODB_METRICS
+  -- Deduplication - some variables exists both in GLOBAL_STATUS and INNODB_METRICS
+  -- Keep the one from GLOBAL_STATUS as it is always enabled and it''s more likely to be used for existing tools.
+ WHERE NAME NOT IN (
+     ''lock_row_lock_time'', ''lock_row_lock_time_avg'', ''lock_row_lock_time_max'', ''lock_row_lock_waits'',
+     ''buffer_pool_reads'', ''buffer_pool_read_requests'', ''buffer_pool_write_requests'', ''buffer_pool_wait_free'',
+     ''buffer_pool_read_ahead'', ''buffer_pool_read_ahead_evicted'', ''buffer_pool_pages_total'', ''buffer_pool_pages_misc'',
+     ''buffer_pool_pages_data'', ''buffer_pool_bytes_data'', ''buffer_pool_pages_dirty'', ''buffer_pool_bytes_dirty'',
+     ''buffer_pool_pages_free'', ''buffer_pages_created'', ''buffer_pages_written'', ''buffer_pages_read'',
+     ''buffer_data_reads'', ''buffer_data_written'', ''file_num_open_files'',
+     ''os_log_bytes_written'', ''os_log_fsyncs'', ''os_log_pending_fsyncs'', ''os_log_pending_writes'',
+     ''log_waits'', ''log_write_requests'', ''log_writes'', ''innodb_dblwr_writes'', ''innodb_dblwr_pages_written'', ''innodb_page_size'')
+) UNION ALL (
+SELECT ''NOW()'' AS Variable_name, NOW(3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled
+) UNION ALL (
+SELECT ''UNIX_TIMESTAMP()'' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, ''System Time'' AS Type, ''YES'' AS Enabled
+)
+ ORDER BY Type, Variable_name;'
+            );
+        END IF;
+        CALL sys.execute_prepared_stmt(@sys.diagnostics.sql);
+
+        -- Prepare the query to retrieve the summary
+        CALL sys.execute_prepared_stmt(
+            CONCAT('(SELECT Variable_value INTO @sys.diagnostics.output_time FROM ', v_table_name, ' WHERE Type = ''System Time'' AND Variable_name = ''UNIX_TIMESTAMP()'')')
+        );
+        SET v_output_time = @sys.diagnostics.output_time;
+
+        -- Limit each value to v_status_summary_width chars (when v_has_ndb = TRUE the values can be very wide - refer to the output here for the full values)
+        -- v_sql_status_summary_select, v_sql_status_summary_delta, v_sql_status_summary_from
+        SET v_sql_status_summary_select = CONCAT(v_sql_status_summary_select, ',
+       CONCAT(
+           LEFT(s', v_output_count, '.Variable_value, ', v_status_summary_width, '),
+           IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'', CONCAT('' ('', ROUND(s', v_output_count, '.Variable_value/', v_output_time, ', 2), ''/sec)''), '''')
+       ) AS ''Output ', v_output_count, ''''),
+            v_sql_status_summary_from   = CONCAT(v_sql_status_summary_from, '
+',
+                                                    IF(v_output_count = 1, '  FROM ', '       INNER JOIN '),
+                                                    v_table_name, ' s', v_output_count,
+                                                    IF (v_output_count = 1, '', ' USING (Type, Variable_name)'));
+        IF (v_output_count > 1) THEN
+            SET v_sql_status_summary_delta  = CONCAT(v_sql_status_summary_delta, ',
+       IF(', REPLACE(v_no_delta_names, '%{COUNT}', v_output_count), ' AND s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'' AND s', v_output_count, '.Variable_value REGEXP ''^[0-9]+(\\\\.[0-9]+)?$'',
+          CONCAT(IF(s', (v_output_count-1), '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'' OR s', v_output_count, '.Variable_value REGEXP ''^[0-9]+\\\\.[0-9]+$'',
+                    ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value), 2),
+                    (s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value)
+                   ),
+                 '' ('', ROUND((s', v_output_count, '.Variable_value-s', (v_output_count-1), '.Variable_value)/(', v_output_time, '-', v_output_time_prev, '), 2), ''/sec)''
+          ),
+          ''''
+       ) AS ''Delta (', (v_output_count-1), ' -> ', v_output_count, ')''');
+        END IF;
+
+        SET v_output_time_prev = v_output_time;
+
+        IF (@sys.diagnostics.include_raw = 'ON') THEN
+            IF (v_has_metrics) THEN
+                SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:';
+            ELSE
+                SELECT 'sys.metrics equivalent' AS 'The following output is:';
+            END IF;
+            -- Ensures that the output here is the same as the one used in the status summary at the end
+            CALL sys.execute_prepared_stmt(CONCAT('SELECT Type, Variable_name, Enabled, Variable_value FROM ', v_table_name, ' ORDER BY Type, Variable_name'));
+        END IF;
+
+        -- InnoDB
+        IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN
+            SELECT 'SHOW ENGINE INNODB STATUS' AS 'The following output is:';
+            EXECUTE stmt_innodb_status;
+            SELECT 'InnoDB - Transactions' AS 'The following output is:';
+            SELECT * FROM information_schema.INNODB_TRX;
+        END IF;
+
+        -- NDBCluster
+        IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN
+            SELECT 'SHOW ENGINE NDBCLUSTER STATUS' AS 'The following output is:';
+            EXECUTE stmt_ndbcluster_status;
+
+            SELECT 'ndbinfo.memoryusage' AS 'The following output is:';
+            SELECT node_id, memory_type, sys.format_bytes(used) AS used, used_pages, sys.format_bytes(total) AS total, total_pages,
+                   ROUND(100*(used/total), 2) AS 'Used %'
+            FROM ndbinfo.memoryusage;
+
+            -- Loop over the ndbinfo tables (except memoryusage which was handled separately above).
+            -- The exact tables available are version dependent, so get the list from the Information Schema.
+            SET v_done = FALSE;
+            OPEN c_ndbinfo;
+            c_ndbinfo_loop: LOOP
+                FETCH c_ndbinfo INTO v_table_name;
+                IF v_done THEN
+                LEAVE c_ndbinfo_loop;
+                END IF;
+
+                SELECT CONCAT('SELECT * FROM ndbinfo.', v_table_name) AS 'The following output is:';
+                CALL sys.execute_prepared_stmt(CONCAT('SELECT * FROM `ndbinfo`.`', v_table_name, '`'));
+            END LOOP;
+            CLOSE c_ndbinfo;
+
+            SELECT * FROM information_schema.FILES;
+        END IF;
+
+        SELECT 'SELECT * FROM sys.processlist' AS 'The following output is:';
+        SELECT processlist.* FROM sys.processlist;
+
+        IF (v_has_ps = 'YES') THEN
+            -- latest_file_io
+            IF (sys.ps_is_consumer_enabled('events_waits_history_long') = 'YES') THEN
+                SELECT 'SELECT * FROM sys.latest_file_io' AS 'The following output is:';
+                SELECT * FROM sys.latest_file_io;
+            END IF;
+
+            -- current memory usage
+            IF (EXISTS(SELECT 1 FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES')) THEN
+                SELECT 'SELECT * FROM sys.memory_by_host_by_current_bytes' AS 'The following output is:';
+                SELECT * FROM sys.memory_by_host_by_current_bytes;
+
+                SELECT 'SELECT * FROM sys.memory_by_thread_by_current_bytes' AS 'The following output is:';
+                SELECT * FROM sys.memory_by_thread_by_current_bytes;
+
+                SELECT 'SELECT * FROM sys.memory_by_user_by_current_bytes' AS 'The following output is:';
+                SELECT * FROM sys.memory_by_user_by_current_bytes;
+
+                SELECT 'SELECT * FROM sys.memory_global_by_current_bytes' AS 'The following output is:';
+                SELECT * FROM sys.memory_global_by_current_bytes;
+            END IF;
+        END IF;
+
+        SET v_runtime = (UNIX_TIMESTAMP(NOW(2)) - v_start);
+    UNTIL (v_runtime + in_interval >= in_max_runtime) END REPEAT;
+
+    -- Get Performance Schema status
+    IF (v_has_ps = 'YES') THEN
+        SELECT 'SHOW ENGINE PERFORMANCE_SCHEMA STATUS' AS 'The following output is:';
+        EXECUTE stmt_ps_status;
+    END IF;
+
+    -- Deallocate prepared statements
+    IF (v_has_innodb IN ('DEFAULT', 'YES')) THEN
+        DEALLOCATE PREPARE stmt_innodb_status;
+    END IF;
+    IF (v_has_ps = 'YES') THEN
+        DEALLOCATE PREPARE stmt_ps_status;
+    END IF;
+    IF (v_has_ndb IN ('DEFAULT', 'YES')) THEN
+        DEALLOCATE PREPARE stmt_ndbcluster_status;
+    END IF;
+
+
+    SELECT '
+
+============================
+
+     Schema Information
+
+============================
+
+' AS '';
+
+    SELECT COUNT(*) AS 'Total Number of Tables' FROM information_schema.TABLES;
+
+    -- The cost of information_schema.TABLES.DATA_LENGTH depends mostly on the number of tables
+    IF (@sys.diagnostics.allow_i_s_tables = 'ON') THEN
+        SELECT 'Storage Engine Usage' AS 'The following output is:';
+        SELECT ENGINE, COUNT(*) AS NUM_TABLES,
+                sys.format_bytes(SUM(DATA_LENGTH)) AS DATA_LENGTH,
+                sys.format_bytes(SUM(INDEX_LENGTH)) AS INDEX_LENGTH,
+                sys.format_bytes(SUM(DATA_LENGTH+INDEX_LENGTH)) AS TOTAL
+            FROM information_schema.TABLES
+            GROUP BY ENGINE;
+
+        SELECT 'Schema Object Overview' AS 'The following output is:';
+        SELECT * FROM sys.schema_object_overview;
+
+        SELECT 'Tables without a PRIMARY KEY' AS 'The following output is:';
+        SELECT TABLES.TABLE_SCHEMA, ENGINE, COUNT(*) AS NumTables
+          FROM information_schema.TABLES
+               LEFT OUTER JOIN information_schema.STATISTICS ON STATISTICS.TABLE_SCHEMA = TABLES.TABLE_SCHEMA
+                                                                AND STATISTICS.TABLE_NAME = TABLES.TABLE_NAME
+                                                                AND STATISTICS.INDEX_NAME = 'PRIMARY'
+         WHERE STATISTICS.TABLE_NAME IS NULL
+               AND TABLES.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys')
+               AND TABLES.TABLE_TYPE = 'BASE TABLE'
+         GROUP BY TABLES.TABLE_SCHEMA, ENGINE;
+    END IF;
+
+    IF (v_has_ps = 'YES') THEN
+        SELECT 'Unused Indexes' AS 'The following output is:';
+        SELECT object_schema, COUNT(*) AS NumUnusedIndexes
+          FROM performance_schema.table_io_waits_summary_by_index_usage
+         WHERE index_name IS NOT NULL
+               AND count_star = 0
+               AND object_schema NOT IN ('mysql', 'sys')
+               AND index_name != 'PRIMARY'
+         GROUP BY object_schema;
+    END IF;
+
+    IF (v_has_ps = 'YES') THEN
+        SELECT '
+
+=========================
+
+     Overall Status
+
+=========================
+
+' AS '';
+
+        SELECT 'CALL sys.ps_statement_avg_latency_histogram()' AS 'The following output is:';
+        CALL sys.ps_statement_avg_latency_histogram();
+
+        CALL sys.statement_performance_analyzer('snapshot', NULL, NULL);
+        CALL sys.statement_performance_analyzer('overall', NULL, 'with_runtimes_in_95th_percentile');
+
+        SET @sys.diagnostics.sql = REPLACE(@sys.diagnostics.sql_gen_query_template, '%{OUTPUT}', 'end');
+        IF (@sys.debug = 'ON') THEN
+            SELECT 'The following query will be used to generate the query for each sys view' AS 'Debug';
+            SELECT @sys.diagnostics.sql AS 'Debug';
+        END IF;
+        PREPARE stmt_gen_query FROM @sys.diagnostics.sql;
+
+        SET v_done = FALSE;
+        OPEN c_sysviews_w_delta;
+        c_sysviews_w_delta_loop: LOOP
+            FETCH c_sysviews_w_delta INTO v_table_name;
+            IF v_done THEN
+                LEAVE c_sysviews_w_delta_loop;
+            END IF;
+
+            IF (@sys.debug = 'ON') THEN
+                SELECT CONCAT('The following queries are for storing the final content of ', v_table_name) AS 'Debug';
+            END IF;
+
+            CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS `tmp_', v_table_name, '_end`'));
+            CALL sys.execute_prepared_stmt(CONCAT('CREATE TEMPORARY TABLE `tmp_', v_table_name, '_end` SELECT * FROM `sys`.`x$', v_table_name, '`'));
+
+            SET @sys.diagnostics.table_name = CONCAT('x$', v_table_name);
+            EXECUTE stmt_gen_query USING @sys.diagnostics.table_name;
+            -- If necessary add ORDER BY and LIMIT
+            SELECT CONCAT(@sys.diagnostics.sql_select,
+                            IF(order_by IS NOT NULL, CONCAT('\n ORDER BY ', REPLACE(order_by, '%{TABLE}', CONCAT('tmp_', v_table_name, '_end'))), ''),
+                            IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '')
+                    )
+                INTO @sys.diagnostics.sql_select
+                FROM tmp_sys_views_delta
+                WHERE TABLE_NAME = v_table_name;
+            SELECT CONCAT('Overall ', v_table_name) AS 'The following output is:';
+            CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select);
+        END LOOP;
+        CLOSE c_sysviews_w_delta;
+
+        DEALLOCATE PREPARE stmt_gen_query;
+
+
+        SELECT '
+
+======================
+
+     Delta Status
+
+======================
+
+' AS '';
+
+        CALL sys.statement_performance_analyzer('delta', 'tmp_digests_start', 'with_runtimes_in_95th_percentile');
+        CALL sys.statement_performance_analyzer('cleanup', NULL, NULL);
+
+        DROP TEMPORARY TABLE tmp_digests_start;
+
+        -- @sys.diagnostics.sql_gen_query_delta is defined near the to together with @sys.diagnostics.sql_gen_query_template
+        IF (@sys.debug = 'ON') THEN
+            SELECT 'The following query will be used to generate the query for each sys view delta' AS 'Debug';
+            SELECT @sys.diagnostics.sql_gen_query_delta AS 'Debug';
+        END IF;
+        PREPARE stmt_gen_query_delta FROM @sys.diagnostics.sql_gen_query_delta;
+
+        SET v_old_group_concat_max_len = @@session.group_concat_max_len;
+        SET @@session.group_concat_max_len = 2048;
+        SET v_done = FALSE;
+        OPEN c_sysviews_w_delta;
+        c_sysviews_w_delta_loop: LOOP
+            FETCH c_sysviews_w_delta INTO v_table_name;
+            IF v_done THEN
+                LEAVE c_sysviews_w_delta_loop;
+            END IF;
+
+            SET @sys.diagnostics.table_name = v_table_name;
+            EXECUTE stmt_gen_query_delta USING @sys.diagnostics.table_name;
+            -- If necessary add WHERE, ORDER BY, and LIMIT
+            SELECT CONCAT(@sys.diagnostics.sql_select,
+                            IF(where_delta IS NOT NULL, CONCAT('\n WHERE ', where_delta), ''),
+                            IF(order_by_delta IS NOT NULL, CONCAT('\n ORDER BY ', order_by_delta), ''),
+                            IF(limit_rows IS NOT NULL, CONCAT('\n LIMIT ', limit_rows), '')
+                    )
+                INTO @sys.diagnostics.sql_select
+                FROM tmp_sys_views_delta
+                WHERE TABLE_NAME = v_table_name;
+
+            SELECT CONCAT('Delta ', v_table_name) AS 'The following output is:';
+            CALL sys.execute_prepared_stmt(@sys.diagnostics.sql_select);
+
+            CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_end`'));
+            CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE `tmp_', v_table_name, '_start`'));
+        END LOOP;
+        CLOSE c_sysviews_w_delta;
+        SET @@session.group_concat_max_len = v_old_group_concat_max_len;
+
+        DEALLOCATE PREPARE stmt_gen_query_delta;
+        DROP TEMPORARY TABLE tmp_sys_views_delta;
+    END IF;
+
+    IF (v_has_metrics) THEN
+        SELECT 'SELECT * FROM sys.metrics' AS 'The following output is:';
+    ELSE
+        SELECT 'sys.metrics equivalent' AS 'The following output is:';
+    END IF;
+    CALL sys.execute_prepared_stmt(
+        CONCAT(v_sql_status_summary_select, v_sql_status_summary_delta, ', Type, s1.Enabled', v_sql_status_summary_from,
+               '
+ ORDER BY Type, Variable_name'
+        )
+    );
+
+    -- Remove all the metrics temporary tables again
+    SET v_count = 0;
+    WHILE (v_count < v_output_count) DO
+        SET v_count = v_count + 1;
+        SET v_table_name = CONCAT('tmp_metrics_', v_count);
+        CALL sys.execute_prepared_stmt(CONCAT('DROP TEMPORARY TABLE IF EXISTS ', v_table_name));
+    END WHILE;
+
+    IF (in_auto_config <> 'current') THEN
+        CALL sys.ps_setup_reload_saved();
+        SET sql_log_bin = @log_bin;
+    END IF;
+
+    -- Reset the @sys.diagnostics.% user variables internal to this procedure
+    SET @sys.diagnostics.output_time            = NULL,
+        @sys.diagnostics.sql                    = NULL,
+        @sys.diagnostics.sql_gen_query_delta    = NULL,
+        @sys.diagnostics.sql_gen_query_template = NULL,
+        @sys.diagnostics.sql_select             = NULL,
+        @sys.diagnostics.table_name             = NULL;
+
+    -- Restore INSTRUMENTED for this thread
+    IF (v_this_thread_enabled = 'YES') THEN
+        CALL sys.ps_setup_enable_thread(CONNECTION_ID());
+    END IF;
+
+    IF (@log_bin = 1) THEN
+        SET sql_log_bin = @log_bin;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/execute_prepared_stmt.sql b/scripts/sys_schema/procedures/execute_prepared_stmt.sql
new file mode 100644
index 000000000000..702d82ee75c9
--- /dev/null
+++ b/scripts/sys_schema/procedures/execute_prepared_stmt.sql
@@ -0,0 +1,96 @@
+--  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License, version 2.0,
+--  as published by the Free Software Foundation.
+--
+--  This program is also distributed with certain software (including
+--  but not limited to OpenSSL) that is licensed under separate terms,
+--  as designated in a particular file or component or in included license
+--  documentation.  The authors of MySQL hereby grant you an additional
+--  permission to link the program and your derivative works with the
+--  separately licensed software that they have included with MySQL.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License, version 2.0, for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program; if not, write to the Free Software
+--  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS execute_prepared_stmt;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE execute_prepared_stmt (
+        IN in_query longtext CHARACTER SET UTF8
+    )
+    COMMENT '
+Description
+-----------
+
+Takes the query in the argument and executes it using a prepared statement. The prepared statement is deallocated,
+so the procedure is mainly useful for executing one off dynamically created queries.
+
+The sys_execute_prepared_stmt prepared statement name is used for the query and is required not to exist.
+
+
+Parameters
+-----------
+
+in_query (longtext CHARACTER SET UTF8):
+  The query to execute.
+
+
+Configuration Options
+----------------------
+
+sys.debug
+  Whether to provide debugging output.
+  Default is ''OFF''. Set to ''ON'' to include.
+
+
+Example
+--------
+
+mysql> CALL sys.execute_prepared_stmt(''SELECT * FROM sys.sys_config'');
++------------------------+-------+---------------------+--------+
+| variable               | value | set_time            | set_by |
++------------------------+-------+---------------------+--------+
+| statement_truncate_len | 64    | 2015-06-30 13:06:00 | NULL   |
++------------------------+-------+---------------------+--------+
+1 row in set (0.00 sec)
+
+Query OK, 0 rows affected (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    -- Set configuration options
+    IF (@sys.debug IS NULL) THEN
+        SET @sys.debug = sys.sys_get_config('debug', 'OFF');
+    END IF;
+
+    -- Verify the query exists
+    -- The shortest possible query is "DO 1"
+    IF (in_query IS NULL OR LENGTH(in_query) < 4) THEN
+       SIGNAL SQLSTATE '45000'
+          SET MESSAGE_TEXT = "The @sys.execute_prepared_stmt.sql must contain a query";
+    END IF;
+
+    SET @sys.execute_prepared_stmt.sql = in_query;
+
+    IF (@sys.debug = 'ON') THEN
+        SELECT @sys.execute_prepared_stmt.sql AS 'Debug';
+    END IF;
+    PREPARE sys_execute_prepared_stmt FROM @sys.execute_prepared_stmt.sql;
+    EXECUTE sys_execute_prepared_stmt;
+    DEALLOCATE PREPARE sys_execute_prepared_stmt;
+
+    SET @sys.execute_prepared_stmt.sql = NULL;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_disable_background_threads.sql b/scripts/sys_schema/procedures/ps_setup_disable_background_threads.sql
new file mode 100644
index 000000000000..fbd0b81dc320
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_disable_background_threads.sql
@@ -0,0 +1,61 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_disable_background_threads;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_disable_background_threads ()
+    COMMENT '
+Description
+-----------
+
+Disable all background thread instrumentation within Performance Schema.
+
+Parameters
+-----------
+
+None.
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_disable_background_threads();
++--------------------------------+
+| summary                        |
++--------------------------------+
+| Disabled 18 background threads |
++--------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.threads
+       SET instrumented = 'NO'
+     WHERE type = 'BACKGROUND';
+
+    SELECT CONCAT('Disabled ', @rows := ROW_COUNT(), ' background thread', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_disable_consumer.sql b/scripts/sys_schema/procedures/ps_setup_disable_consumer.sql
new file mode 100644
index 000000000000..7221feae47bd
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_disable_consumer.sql
@@ -0,0 +1,77 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_disable_consumer;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_disable_consumer (
+        IN consumer VARCHAR(128)
+    )
+    COMMENT '
+Description
+-----------
+
+Disables consumers within Performance Schema 
+matching the input pattern.
+
+Parameters
+-----------
+
+consumer (VARCHAR(128)):
+  A LIKE pattern match (using "%consumer%") of consumers to disable
+
+Example
+-----------
+
+To disable all consumers:
+
+mysql> CALL sys.ps_setup_disable_consumer(\'\');
++--------------------------+
+| summary                  |
++--------------------------+
+| Disabled 15 consumers    |
++--------------------------+
+1 row in set (0.02 sec)
+
+To disable just the event_stage consumers:
+
+mysql> CALL sys.ps_setup_disable_comsumers(\'stage\');
++------------------------+
+| summary                |
++------------------------+
+| Disabled 3 consumers   |
++------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.setup_consumers
+       SET enabled = 'NO'
+     WHERE name LIKE CONCAT('%', consumer, '%');
+
+    SELECT CONCAT('Disabled ', @rows := ROW_COUNT(), ' consumer', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_disable_instrument.sql b/scripts/sys_schema/procedures/ps_setup_disable_instrument.sql
new file mode 100644
index 000000000000..3d3a669dc284
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_disable_instrument.sql
@@ -0,0 +1,87 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_disable_instrument;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_disable_instrument (
+        IN in_pattern VARCHAR(128)
+    )
+    COMMENT '
+Description
+-----------
+
+Disables instruments within Performance Schema 
+matching the input pattern.
+
+Parameters
+-----------
+
+in_pattern (VARCHAR(128)):
+  A LIKE pattern match (using "%in_pattern%") of events to disable
+
+Example
+-----------
+
+To disable all mutex instruments:
+
+mysql> CALL sys.ps_setup_disable_instrument(\'wait/synch/mutex\');
++--------------------------+
+| summary                  |
++--------------------------+
+| Disabled 155 instruments |
++--------------------------+
+1 row in set (0.02 sec)
+
+To disable just a specific TCP/IP based network IO instrument:
+
+mysql> CALL sys.ps_setup_disable_instrument(\'wait/io/socket/sql/server_tcpip_socket\');
++------------------------+
+| summary                |
++------------------------+
+| Disabled 1 instruments |
++------------------------+
+1 row in set (0.00 sec)
+
+To disable all instruments:
+
+mysql> CALL sys.ps_setup_disable_instrument(\'\');
++--------------------------+
+| summary                  |
++--------------------------+
+| Disabled 547 instruments |
++--------------------------+
+1 row in set (0.01 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.setup_instruments
+       SET enabled = 'NO', timed = 'NO'
+     WHERE name LIKE CONCAT('%', in_pattern, '%');
+
+    SELECT CONCAT('Disabled ', @rows := ROW_COUNT(), ' instrument', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_disable_thread.sql b/scripts/sys_schema/procedures/ps_setup_disable_thread.sql
new file mode 100644
index 000000000000..21dca9118cdc
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_disable_thread.sql
@@ -0,0 +1,75 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_disable_thread;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_disable_thread (
+        IN in_connection_id BIGINT
+    )
+    COMMENT '
+Description
+-----------
+
+Disable the given connection/thread in Performance Schema.
+
+Parameters
+-----------
+
+in_connection_id (BIGINT):
+  The connection ID (PROCESSLIST_ID from performance_schema.threads
+  or the ID shown within SHOW PROCESSLIST)
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_disable_thread(3);
++-------------------+
+| summary           |
++-------------------+
+| Disabled 1 thread |
++-------------------+
+1 row in set (0.01 sec)
+
+To disable the current connection:
+
+mysql> CALL sys.ps_setup_disable_thread(CONNECTION_ID());
++-------------------+
+| summary           |
++-------------------+
+| Disabled 1 thread |
++-------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.threads
+       SET instrumented = 'NO'
+     WHERE processlist_id = in_connection_id;
+
+    SELECT CONCAT('Disabled ', @rows := ROW_COUNT(), ' thread', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_enable_background_threads.sql b/scripts/sys_schema/procedures/ps_setup_enable_background_threads.sql
new file mode 100644
index 000000000000..c592f31814f8
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_enable_background_threads.sql
@@ -0,0 +1,61 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_enable_background_threads;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_enable_background_threads ()
+    COMMENT '
+Description
+-----------
+
+Enable all background thread instrumentation within Performance Schema.
+
+Parameters
+-----------
+
+None.
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_enable_background_threads();
++-------------------------------+
+| summary                       |
++-------------------------------+
+| Enabled 18 background threads |
++-------------------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.threads
+       SET instrumented = 'YES'
+     WHERE type = 'BACKGROUND';
+
+    SELECT CONCAT('Enabled ', @rows := ROW_COUNT(), ' background thread', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_enable_consumer.sql b/scripts/sys_schema/procedures/ps_setup_enable_consumer.sql
new file mode 100644
index 000000000000..c9ed65af1bb6
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_enable_consumer.sql
@@ -0,0 +1,81 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_enable_consumer;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_enable_consumer (
+        IN consumer VARCHAR(128)
+    )
+    COMMENT '
+Description
+-----------
+
+Enables consumers within Performance Schema 
+matching the input pattern.
+
+Parameters
+-----------
+
+consumer (VARCHAR(128)):
+  A LIKE pattern match (using "%consumer%") of consumers to enable
+
+Example
+-----------
+
+To enable all consumers:
+
+mysql> CALL sys.ps_setup_enable_consumer(\'\');
++-------------------------+
+| summary                 |
++-------------------------+
+| Enabled 10 consumers    |
++-------------------------+
+1 row in set (0.02 sec)
+
+Query OK, 0 rows affected (0.02 sec)
+
+To enable just "waits" consumers:
+
+mysql> CALL sys.ps_setup_enable_consumer(\'waits\');
++-----------------------+
+| summary               |
++-----------------------+
+| Enabled 3 consumers   |
++-----------------------+
+1 row in set (0.00 sec)
+
+Query OK, 0 rows affected (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.setup_consumers
+       SET enabled = 'YES'
+     WHERE name LIKE CONCAT('%', consumer, '%');
+
+    SELECT CONCAT('Enabled ', @rows := ROW_COUNT(), ' consumer', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_enable_instrument.sql b/scripts/sys_schema/procedures/ps_setup_enable_instrument.sql
new file mode 100644
index 000000000000..33c57983dd04
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_enable_instrument.sql
@@ -0,0 +1,93 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_enable_instrument;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_enable_instrument (
+        IN in_pattern VARCHAR(128)
+    )
+    COMMENT '
+Description
+-----------
+
+Enables instruments within Performance Schema 
+matching the input pattern.
+
+Parameters
+-----------
+
+in_pattern (VARCHAR(128)):
+  A LIKE pattern match (using "%in_pattern%") of events to enable
+
+Example
+-----------
+
+To enable all mutex instruments:
+
+mysql> CALL sys.ps_setup_enable_instrument(\'wait/synch/mutex\');
++-------------------------+
+| summary                 |
++-------------------------+
+| Enabled 155 instruments |
++-------------------------+
+1 row in set (0.02 sec)
+
+Query OK, 0 rows affected (0.02 sec)
+
+To enable just a specific TCP/IP based network IO instrument:
+
+mysql> CALL sys.ps_setup_enable_instrument(\'wait/io/socket/sql/server_tcpip_socket\');
++-----------------------+
+| summary               |
++-----------------------+
+| Enabled 1 instruments |
++-----------------------+
+1 row in set (0.00 sec)
+
+Query OK, 0 rows affected (0.00 sec)
+
+To enable all instruments:
+
+mysql> CALL sys.ps_setup_enable_instrument(\'\');
++-------------------------+
+| summary                 |
++-------------------------+
+| Enabled 547 instruments |
++-------------------------+
+1 row in set (0.01 sec)
+
+Query OK, 0 rows affected (0.01 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.setup_instruments
+       SET enabled = 'YES', timed = 'YES'
+     WHERE name LIKE CONCAT('%', in_pattern, '%');
+
+    SELECT CONCAT('Enabled ', @rows := ROW_COUNT(), ' instrument', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_enable_thread.sql b/scripts/sys_schema/procedures/ps_setup_enable_thread.sql
new file mode 100644
index 000000000000..599083197613
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_enable_thread.sql
@@ -0,0 +1,75 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_enable_thread;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_enable_thread (
+        IN in_connection_id BIGINT
+    )
+    COMMENT '
+Description
+-----------
+
+Enable the given connection/thread in Performance Schema.
+
+Parameters
+-----------
+
+in_connection_id (BIGINT):
+  The connection ID (PROCESSLIST_ID from performance_schema.threads
+  or the ID shown within SHOW PROCESSLIST)
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_enable_thread(3);
++------------------+
+| summary          |
++------------------+
+| Enabled 1 thread |
++------------------+
+1 row in set (0.01 sec)
+
+To enable the current connection:
+
+mysql> CALL sys.ps_setup_enable_thread(CONNECTION_ID());
++------------------+
+| summary          |
++------------------+
+| Enabled 1 thread |
++------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    UPDATE performance_schema.threads
+       SET instrumented = 'YES'
+     WHERE processlist_id = in_connection_id;
+
+    SELECT CONCAT('Enabled ', @rows := ROW_COUNT(), ' thread', IF(@rows != 1, 's', '')) AS summary;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_reload_saved.sql b/scripts/sys_schema/procedures/ps_setup_reload_saved.sql
new file mode 100644
index 000000000000..e0272fdd773c
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_reload_saved.sql
@@ -0,0 +1,153 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_reload_saved;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_reload_saved ()
+    COMMENT '
+Description
+-----------
+
+Reloads a saved Performance Schema configuration,
+so that you can alter the setup for debugging purposes, 
+but restore it to a previous state.
+
+Use the companion procedure - ps_setup_save(), to 
+save a configuration.
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Parameters
+-----------
+
+None.
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_save();
+Query OK, 0 rows affected (0.08 sec)
+
+mysql> UPDATE performance_schema.setup_instruments SET enabled = \'YES\', timed = \'YES\';
+Query OK, 547 rows affected (0.40 sec)
+Rows matched: 784  Changed: 547  Warnings: 0
+
+/* Run some tests that need more detailed instrumentation here */
+
+mysql> CALL sys.ps_setup_reload_saved();
+Query OK, 0 rows affected (0.32 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    DECLARE v_done bool DEFAULT FALSE;
+    DECLARE v_lock_result INT;
+    DECLARE v_lock_used_by BIGINT;
+    DECLARE v_signal_message TEXT;
+    DECLARE EXIT HANDLER FOR SQLEXCEPTION
+    BEGIN
+        SIGNAL SQLSTATE VALUE '90001'
+           SET MESSAGE_TEXT = 'An error occurred, was sys.ps_setup_save() run before this procedure?';
+    END;
+
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
+    SELECT IS_USED_LOCK('sys.ps_setup_save') INTO v_lock_used_by;
+
+    IF (v_lock_used_by != CONNECTION_ID()) THEN
+        SET v_signal_message = CONCAT('The sys.ps_setup_save lock is currently owned by ', v_lock_used_by);
+        SIGNAL SQLSTATE VALUE '90002'
+           SET MESSAGE_TEXT = v_signal_message;
+    END IF;
+
+    DELETE FROM performance_schema.setup_actors;
+    INSERT INTO performance_schema.setup_actors SELECT * FROM tmp_setup_actors;
+
+    BEGIN
+        -- Workaround for http://bugs.mysql.com/bug.php?id=70025
+        DECLARE v_name varchar(64);
+        DECLARE v_enabled enum('YES', 'NO');
+        DECLARE c_consumers CURSOR FOR SELECT NAME, ENABLED FROM tmp_setup_consumers;
+        DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+        SET v_done = FALSE;
+        OPEN c_consumers;
+        c_consumers_loop: LOOP
+            FETCH c_consumers INTO v_name, v_enabled;
+            IF v_done THEN
+               LEAVE c_consumers_loop;
+            END IF;
+
+            UPDATE performance_schema.setup_consumers
+               SET ENABLED = v_enabled
+             WHERE NAME = v_name;
+         END LOOP;
+         CLOSE c_consumers;
+    END;
+
+    UPDATE performance_schema.setup_instruments
+     INNER JOIN tmp_setup_instruments USING (NAME)
+       SET performance_schema.setup_instruments.ENABLED = tmp_setup_instruments.ENABLED,
+           performance_schema.setup_instruments.TIMED   = tmp_setup_instruments.TIMED;
+    BEGIN
+        -- Workaround for http://bugs.mysql.com/bug.php?id=70025
+        DECLARE v_thread_id bigint unsigned;
+        DECLARE v_instrumented enum('YES', 'NO');
+        DECLARE c_threads CURSOR FOR SELECT THREAD_ID, INSTRUMENTED FROM tmp_threads;
+        DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+        SET v_done = FALSE;
+        OPEN c_threads;
+        c_threads_loop: LOOP
+            FETCH c_threads INTO v_thread_id, v_instrumented;
+            IF v_done THEN
+               LEAVE c_threads_loop;
+            END IF;
+
+            UPDATE performance_schema.threads
+               SET INSTRUMENTED = v_instrumented
+             WHERE THREAD_ID = v_thread_id;
+        END LOOP;
+        CLOSE c_threads;
+    END;
+
+    UPDATE performance_schema.threads
+       SET INSTRUMENTED = IF(PROCESSLIST_USER IS NOT NULL,
+                             sys.ps_is_account_enabled(PROCESSLIST_HOST, PROCESSLIST_USER),
+                             'YES')
+     WHERE THREAD_ID NOT IN (SELECT THREAD_ID FROM tmp_threads);
+
+    DROP TEMPORARY TABLE tmp_setup_actors;
+    DROP TEMPORARY TABLE tmp_setup_consumers;
+    DROP TEMPORARY TABLE tmp_setup_instruments;
+    DROP TEMPORARY TABLE tmp_threads;
+
+    SELECT RELEASE_LOCK('sys.ps_setup_save') INTO v_lock_result;
+
+    SET sql_log_bin = @log_bin; 
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_reset_to_default.sql b/scripts/sys_schema/procedures/ps_setup_reset_to_default.sql
new file mode 100644
index 000000000000..1bd2db864bb1
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_reset_to_default.sql
@@ -0,0 +1,172 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_reset_to_default;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_reset_to_default (
+       IN in_verbose BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Resets the Performance Schema setup to the default settings.
+
+Parameters
+-----------
+
+in_verbose (BOOLEAN):
+  Whether to print each setup stage (including the SQL) whilst running.
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_reset_to_default(true)\\G
+*************************** 1. row ***************************
+status: Resetting: setup_actors
+DELETE
+FROM performance_schema.setup_actors
+ WHERE NOT (HOST = \'%\' AND USER = \'%\' AND `ROLE` = \'%\')
+1 row in set (0.00 sec)
+
+*************************** 1. row ***************************
+status: Resetting: setup_actors
+INSERT IGNORE INTO performance_schema.setup_actors
+VALUES (\'%\', \'%\', \'%\')
+1 row in set (0.00 sec)
+...
+
+mysql> CALL sys.ps_setup_reset_to_default(false)\\G
+Query OK, 0 rows affected (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    SET @query = 'DELETE
+                    FROM performance_schema.setup_actors
+                   WHERE NOT (HOST = ''%'' AND USER = ''%'' AND `ROLE` = ''%'')';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'INSERT IGNORE INTO performance_schema.setup_actors
+                  VALUES (''%'', ''%'', ''%'', ''YES'', ''YES'')';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_actors\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'UPDATE performance_schema.setup_instruments
+                     SET ENABLED = sys.ps_is_instrument_default_enabled(NAME),
+                         TIMED   = sys.ps_is_instrument_default_timed(NAME)';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_instruments\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'UPDATE performance_schema.setup_consumers
+                     SET ENABLED = IF(NAME IN (''events_statements_current'', ''events_transactions_current'', ''global_instrumentation'', ''thread_instrumentation'', ''statements_digest''), ''YES'', ''NO'')';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_consumers\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'DELETE
+                    FROM performance_schema.setup_objects
+                   WHERE NOT (OBJECT_TYPE IN (''EVENT'', ''FUNCTION'', ''PROCEDURE'', ''TABLE'', ''TRIGGER'') AND OBJECT_NAME = ''%'' 
+                     AND (OBJECT_SCHEMA = ''mysql''              AND ENABLED = ''NO''  AND TIMED = ''NO'' )
+                      OR (OBJECT_SCHEMA = ''performance_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' )
+                      OR (OBJECT_SCHEMA = ''information_schema'' AND ENABLED = ''NO''  AND TIMED = ''NO'' )
+                      OR (OBJECT_SCHEMA = ''%''                  AND ENABLED = ''YES'' AND TIMED = ''YES''))';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'INSERT IGNORE INTO performance_schema.setup_objects
+                  VALUES (''EVENT''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ),
+                         (''EVENT''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''EVENT''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''EVENT''    , ''%''                 , ''%'', ''YES'', ''YES''),
+                         (''FUNCTION'' , ''mysql''             , ''%'', ''NO'' , ''NO'' ),
+                         (''FUNCTION'' , ''performance_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''FUNCTION'' , ''information_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''FUNCTION'' , ''%''                 , ''%'', ''YES'', ''YES''),
+                         (''PROCEDURE'', ''mysql''             , ''%'', ''NO'' , ''NO'' ),
+                         (''PROCEDURE'', ''performance_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''PROCEDURE'', ''information_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''PROCEDURE'', ''%''                 , ''%'', ''YES'', ''YES''),
+                         (''TABLE''    , ''mysql''             , ''%'', ''NO'' , ''NO'' ),
+                         (''TABLE''    , ''performance_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''TABLE''    , ''information_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''TABLE''    , ''%''                 , ''%'', ''YES'', ''YES''),
+                         (''TRIGGER''  , ''mysql''             , ''%'', ''NO'' , ''NO'' ),
+                         (''TRIGGER''  , ''performance_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''TRIGGER''  , ''information_schema'', ''%'', ''NO'' , ''NO'' ),
+                         (''TRIGGER''  , ''%''                 , ''%'', ''YES'', ''YES'')';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: setup_objects\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+
+    SET @query = 'UPDATE performance_schema.threads
+                     SET INSTRUMENTED = ''YES''';
+
+    IF (in_verbose) THEN
+        SELECT CONCAT('Resetting: threads\n', REPLACE(@query, '  ', '')) AS status;
+    END IF;
+
+    PREPARE reset_stmt FROM @query;
+    EXECUTE reset_stmt;
+    DEALLOCATE PREPARE reset_stmt;
+END$$
+
+DELIMITER ;
+
diff --git a/scripts/sys_schema/procedures/ps_setup_reset_to_default_after.sql b/scripts/sys_schema/procedures/ps_setup_reset_to_default_after.sql
new file mode 100644
index 000000000000..f7020cd73eb4
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_reset_to_default_after.sql
@@ -0,0 +1,23 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+SET @@session.sql_mode = @old_sql_mode;
diff --git a/scripts/sys_schema/procedures/ps_setup_reset_to_default_before.sql b/scripts/sys_schema/procedures/ps_setup_reset_to_default_before.sql
new file mode 100644
index 000000000000..3661a4f4a202
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_reset_to_default_before.sql
@@ -0,0 +1,24 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+-- Because of bug 11750980/bug 41686, set the sql_mode to ''
+SET @old_sql_mode = @@session.sql_mode, @@session.sql_mode = '';
diff --git a/scripts/sys_schema/procedures/ps_setup_save.sql b/scripts/sys_schema/procedures/ps_setup_save.sql
new file mode 100644
index 000000000000..5de570cf226a
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_save.sql
@@ -0,0 +1,107 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_save;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_save (
+        IN in_timeout INT
+    )
+    COMMENT '
+Description
+-----------
+
+Saves the current configuration of Performance Schema, 
+so that you can alter the setup for debugging purposes, 
+but restore it to a previous state.
+
+Use the companion procedure - ps_setup_reload_saved(), to 
+restore the saved config.
+
+The named lock "sys.ps_setup_save" is taken before the
+current configuration is saved. If the attempt to get the named
+lock times out, an error occurs.
+
+The lock is released after the settings have been restored by
+calling ps_setup_reload_saved().
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Parameters
+-----------
+
+in_timeout INT
+  The timeout in seconds used when trying to obtain the lock.
+  A negative timeout means infinite timeout.
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_save(-1);
+Query OK, 0 rows affected (0.08 sec)
+
+mysql> UPDATE performance_schema.setup_instruments 
+    ->    SET enabled = \'YES\', timed = \'YES\';
+Query OK, 547 rows affected (0.40 sec)
+Rows matched: 784  Changed: 547  Warnings: 0
+
+/* Run some tests that need more detailed instrumentation here */
+
+mysql> CALL sys.ps_setup_reload_saved();
+Query OK, 0 rows affected (0.32 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    DECLARE v_lock_result INT;
+
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
+    SELECT GET_LOCK('sys.ps_setup_save', in_timeout) INTO v_lock_result;
+
+    IF v_lock_result THEN
+        DROP TEMPORARY TABLE IF EXISTS tmp_setup_actors;
+        DROP TEMPORARY TABLE IF EXISTS tmp_setup_consumers;
+        DROP TEMPORARY TABLE IF EXISTS tmp_setup_instruments;
+        DROP TEMPORARY TABLE IF EXISTS tmp_threads;
+
+        CREATE TEMPORARY TABLE tmp_setup_actors SELECT * FROM performance_schema.setup_actors LIMIT 0;
+        CREATE TEMPORARY TABLE tmp_setup_consumers LIKE performance_schema.setup_consumers;
+        CREATE TEMPORARY TABLE tmp_setup_instruments LIKE performance_schema.setup_instruments;
+        CREATE TEMPORARY TABLE tmp_threads (THREAD_ID bigint unsigned NOT NULL PRIMARY KEY, INSTRUMENTED enum('YES','NO') NOT NULL);
+
+        INSERT INTO tmp_setup_actors SELECT * FROM performance_schema.setup_actors;
+        INSERT INTO tmp_setup_consumers SELECT * FROM performance_schema.setup_consumers;
+        INSERT INTO tmp_setup_instruments SELECT * FROM performance_schema.setup_instruments;
+        INSERT INTO tmp_threads SELECT THREAD_ID, INSTRUMENTED FROM performance_schema.threads;
+    ELSE
+        SIGNAL SQLSTATE VALUE '90000'
+           SET MESSAGE_TEXT = 'Could not lock the sys.ps_setup_save user lock, another thread has a saved configuration';
+    END IF;
+
+    SET sql_log_bin = @log_bin;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_disabled.sql b/scripts/sys_schema/procedures/ps_setup_show_disabled.sql
new file mode 100644
index 000000000000..a7eaf5406af3
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_disabled.sql
@@ -0,0 +1,170 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_disabled;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_disabled (
+        IN in_show_instruments BOOLEAN,
+        IN in_show_threads BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Shows all currently disable Performance Schema configuration.
+
+Disabled users is only available for MySQL 5.7.6 and later.
+In earlier versions it was only possible to enable users.
+
+Parameters
+-----------
+
+in_show_instruments (BOOLEAN):
+  Whether to print disabled instruments (can print many items)
+
+in_show_threads (BOOLEAN):
+  Whether to print disabled threads
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_disabled(TRUE, TRUE);
++----------------------------+
+| performance_schema_enabled |
++----------------------------+
+|                          1 |
++----------------------------+
+1 row in set (0.00 sec)
+
++--------------------+
+| disabled_users     |
++--------------------+
+| \'mark\'@\'localhost\' |
++--------------------+
+1 row in set (0.00 sec)
+
++-------------+----------------------+---------+-------+
+| object_type | objects              | enabled | timed |
++-------------+----------------------+---------+-------+
+| EVENT       | mysql.%              | NO      | NO    |
+| EVENT       | performance_schema.% | NO      | NO    |
+| EVENT       | information_schema.% | NO      | NO    |
+| FUNCTION    | mysql.%              | NO      | NO    |
+| FUNCTION    | performance_schema.% | NO      | NO    |
+| FUNCTION    | information_schema.% | NO      | NO    |
+| PROCEDURE   | mysql.%              | NO      | NO    |
+| PROCEDURE   | performance_schema.% | NO      | NO    |
+| PROCEDURE   | information_schema.% | NO      | NO    |
+| TABLE       | mysql.%              | NO      | NO    |
+| TABLE       | performance_schema.% | NO      | NO    |
+| TABLE       | information_schema.% | NO      | NO    |
+| TRIGGER     | mysql.%              | NO      | NO    |
+| TRIGGER     | performance_schema.% | NO      | NO    |
+| TRIGGER     | information_schema.% | NO      | NO    |
++-------------+----------------------+---------+-------+
+15 rows in set (0.00 sec)
+
++----------------------------------+
+| disabled_consumers               |
++----------------------------------+
+| events_stages_current            |
+| events_stages_history            |
+| events_stages_history_long       |
+| events_statements_history        |
+| events_statements_history_long   |
+| events_transactions_history      |
+| events_transactions_history_long |
+| events_waits_current             |
+| events_waits_history             |
+| events_waits_history_long        |
++----------------------------------+
+10 rows in set (0.00 sec)
+
+Empty set (0.00 sec)
+
++---------------------------------------------------------------------------------------+-------+
+| disabled_instruments                                                                  | timed |
++---------------------------------------------------------------------------------------+-------+
+| wait/synch/mutex/sql/TC_LOG_MMAP::LOCK_tc                                             | NO    |
+| wait/synch/mutex/sql/LOCK_des_key_file                                                | NO    |
+| wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit                                       | NO    |
+...
+| memory/sql/servers_cache                                                              | NO    |
+| memory/sql/udf_mem                                                                    | NO    |
+| wait/lock/metadata/sql/mdl                                                            | NO    |
++---------------------------------------------------------------------------------------+-------+
+547 rows in set (0.00 sec)
+
+Query OK, 0 rows affected (0.01 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT @@performance_schema AS performance_schema_enabled;
+
+    -- In 5.7.6 and later the setup_actors table has an ENABLED column to
+    -- specify whether the actor is enabled. Before that all actors matched
+    -- in the setup_actors table were enabled.
+    -- So only execute the query in 5.7.6+
+    /*!50706
+    SELECT CONCAT('\'', user, '\'@\'', host, '\'') AS disabled_users
+      FROM performance_schema.setup_actors
+     WHERE enabled = 'NO'
+     ORDER BY disabled_users;
+    */
+
+    SELECT object_type,
+           CONCAT(object_schema, '.', object_name) AS objects,
+           enabled,
+           timed
+      FROM performance_schema.setup_objects
+     WHERE enabled = 'NO'
+     ORDER BY object_type, objects;
+
+    SELECT name AS disabled_consumers
+      FROM performance_schema.setup_consumers
+     WHERE enabled = 'NO'
+     ORDER BY disabled_consumers;
+
+    IF (in_show_threads) THEN
+        SELECT IF(name = 'thread/sql/one_connection', 
+                  CONCAT(processlist_user, '@', processlist_host), 
+                  REPLACE(name, 'thread/', '')) AS disabled_threads,
+        TYPE AS thread_type
+          FROM performance_schema.threads
+         WHERE INSTRUMENTED = 'NO'
+         ORDER BY disabled_threads;
+    END IF;
+
+    IF (in_show_instruments) THEN
+        SELECT name AS disabled_instruments,
+               timed
+          FROM performance_schema.setup_instruments
+         WHERE enabled = 'NO'
+         ORDER BY disabled_instruments;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_disabled_consumers.sql b/scripts/sys_schema/procedures/ps_setup_show_disabled_consumers.sql
new file mode 100644
index 000000000000..860eef2c9131
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_disabled_consumers.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_disabled_consumers;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_disabled_consumers ()
+    COMMENT '
+Description
+-----------
+
+Shows all currently disabled consumers.
+
+Parameters
+-----------
+
+None
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_disabled_consumers();
+
++---------------------------+
+| disabled_consumers        |
++---------------------------+
+| events_statements_current |
+| global_instrumentation    |
+| thread_instrumentation    |
+| statements_digest         |
++---------------------------+
+4 rows in set (0.05 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT name AS disabled_consumers
+      FROM performance_schema.setup_consumers
+     WHERE enabled = 'NO'
+     ORDER BY disabled_consumers;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_disabled_instruments.sql b/scripts/sys_schema/procedures/ps_setup_show_disabled_instruments.sql
new file mode 100644
index 000000000000..30ed087110c6
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_disabled_instruments.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_disabled_instruments;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_disabled_instruments ()
+    COMMENT '
+Description
+-----------
+
+Shows all currently disabled instruments.
+
+Parameters
+-----------
+
+None
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_disabled_instruments();
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT name AS disabled_instruments, timed
+      FROM performance_schema.setup_instruments
+     WHERE enabled = 'NO'
+     ORDER BY disabled_instruments;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_enabled.sql b/scripts/sys_schema/procedures/ps_setup_show_enabled.sql
new file mode 100644
index 000000000000..d792853d059d
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_enabled.sql
@@ -0,0 +1,173 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_enabled;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_enabled (
+        IN in_show_instruments BOOLEAN,
+        IN in_show_threads BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Shows all currently enabled Performance Schema configuration.
+
+Parameters
+-----------
+
+in_show_instruments (BOOLEAN):
+  Whether to print enabled instruments (can print many items)
+
+in_show_threads (BOOLEAN):
+  Whether to print enabled threads
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_enabled(TRUE, TRUE);
++----------------------------+
+| performance_schema_enabled |
++----------------------------+
+|                          1 |
++----------------------------+
+1 row in set (0.00 sec)
+
++---------------+
+| enabled_users |
++---------------+
+| \'%\'@\'%\'       |
++---------------+
+1 row in set (0.01 sec)
+
++-------------+---------+---------+-------+
+| object_type | objects | enabled | timed |
++-------------+---------+---------+-------+
+| EVENT       | %.%     | YES     | YES   |
+| FUNCTION    | %.%     | YES     | YES   |
+| PROCEDURE   | %.%     | YES     | YES   |
+| TABLE       | %.%     | YES     | YES   |
+| TRIGGER     | %.%     | YES     | YES   |
++-------------+---------+---------+-------+
+5 rows in set (0.01 sec)
+
++---------------------------+
+| enabled_consumers         |
++---------------------------+
+| events_statements_current |
+| global_instrumentation    |
+| thread_instrumentation    |
+| statements_digest         |
++---------------------------+
+4 rows in set (0.05 sec)
+
++---------------------------------+-------------+
+| enabled_threads                 | thread_type |
++---------------------------------+-------------+
+| sql/main                        | BACKGROUND  |
+| sql/thread_timer_notifier       | BACKGROUND  |
+| innodb/io_ibuf_thread           | BACKGROUND  |
+| innodb/io_log_thread            | BACKGROUND  |
+| innodb/io_read_thread           | BACKGROUND  |
+| innodb/io_read_thread           | BACKGROUND  |
+| innodb/io_write_thread          | BACKGROUND  |
+| innodb/io_write_thread          | BACKGROUND  |
+| innodb/page_cleaner_thread      | BACKGROUND  |
+| innodb/srv_lock_timeout_thread  | BACKGROUND  |
+| innodb/srv_error_monitor_thread | BACKGROUND  |
+| innodb/srv_monitor_thread       | BACKGROUND  |
+| innodb/srv_master_thread        | BACKGROUND  |
+| innodb/srv_purge_thread         | BACKGROUND  |
+| innodb/srv_worker_thread        | BACKGROUND  |
+| innodb/srv_worker_thread        | BACKGROUND  |
+| innodb/srv_worker_thread        | BACKGROUND  |
+| innodb/buf_dump_thread          | BACKGROUND  |
+| innodb/dict_stats_thread        | BACKGROUND  |
+| sql/signal_handler              | BACKGROUND  |
+| sql/compress_gtid_table         | FOREGROUND  |
+| root@localhost                  | FOREGROUND  |
++---------------------------------+-------------+
+22 rows in set (0.01 sec)
+
++-------------------------------------+-------+
+| enabled_instruments                 | timed |
++-------------------------------------+-------+
+| wait/io/file/sql/map                | YES   |
+| wait/io/file/sql/binlog             | YES   |
+...
+| statement/com/Error                 | YES   |
+| statement/com/                      | YES   |
+| idle                                | YES   |
++-------------------------------------+-------+
+210 rows in set (0.08 sec)
+
+Query OK, 0 rows affected (0.89 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT @@performance_schema AS performance_schema_enabled;
+
+    -- In 5.7.6 and later the setup_actors table has an ENABLED column to
+    -- specify whether the actor is enabled. Before that all actors matched
+    -- in the setup_actors table were enabled.
+    SELECT CONCAT('\'', user, '\'@\'', host, '\'') AS enabled_users
+      FROM performance_schema.setup_actors
+     /*!50706 WHERE enabled = 'YES' */
+     ORDER BY enabled_users;
+
+    SELECT object_type,
+           CONCAT(object_schema, '.', object_name) AS objects,
+           enabled,
+           timed
+      FROM performance_schema.setup_objects
+     WHERE enabled = 'YES'
+     ORDER BY object_type, objects;
+
+    SELECT name AS enabled_consumers
+      FROM performance_schema.setup_consumers
+     WHERE enabled = 'YES'
+     ORDER BY enabled_consumers;
+
+    IF (in_show_threads) THEN
+        SELECT IF(name = 'thread/sql/one_connection', 
+                  CONCAT(processlist_user, '@', processlist_host), 
+                  REPLACE(name, 'thread/', '')) AS enabled_threads,
+        TYPE AS thread_type
+          FROM performance_schema.threads
+         WHERE INSTRUMENTED = 'YES'
+         ORDER BY enabled_threads;
+    END IF;
+
+    IF (in_show_instruments) THEN
+        SELECT name AS enabled_instruments,
+               timed
+          FROM performance_schema.setup_instruments
+         WHERE enabled = 'YES'
+         ORDER BY enabled_instruments;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_enabled_consumers.sql b/scripts/sys_schema/procedures/ps_setup_show_enabled_consumers.sql
new file mode 100644
index 000000000000..4a1f025d2108
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_enabled_consumers.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_enabled_consumers;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_enabled_consumers ()
+    COMMENT '
+Description
+-----------
+
+Shows all currently enabled consumers.
+
+Parameters
+-----------
+
+None
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_enabled_consumers();
+
++---------------------------+
+| enabled_consumers         |
++---------------------------+
+| events_statements_current |
+| global_instrumentation    |
+| thread_instrumentation    |
+| statements_digest         |
++---------------------------+
+4 rows in set (0.05 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT name AS enabled_consumers
+      FROM performance_schema.setup_consumers
+     WHERE enabled = 'YES'
+     ORDER BY enabled_consumers;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_setup_show_enabled_instruments.sql b/scripts/sys_schema/procedures/ps_setup_show_enabled_instruments.sql
new file mode 100644
index 000000000000..eefbe0c2d693
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_setup_show_enabled_instruments.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_setup_show_enabled_instruments;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_setup_show_enabled_instruments ()
+    COMMENT '
+Description
+-----------
+
+Shows all currently enabled instruments.
+
+Parameters
+-----------
+
+None
+
+Example
+-----------
+
+mysql> CALL sys.ps_setup_show_enabled_instruments();
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+    SELECT name AS enabled_instruments, timed
+      FROM performance_schema.setup_instruments
+     WHERE enabled = 'YES'
+     ORDER BY enabled_instruments;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_statement_avg_latency_histogram.sql b/scripts/sys_schema/procedures/ps_statement_avg_latency_histogram.sql
new file mode 100644
index 000000000000..fad13afd04ad
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_statement_avg_latency_histogram.sql
@@ -0,0 +1,237 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_statement_avg_latency_histogram;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_statement_avg_latency_histogram ()
+    COMMENT '
+Description
+-----------
+
+Outputs a textual histogram graph of the average latency values
+across all normalized queries tracked within the Performance Schema
+events_statements_summary_by_digest table.
+
+Can be used to show a very high level picture of what kind of 
+latency distribution statements running within this instance have.
+
+Parameters
+-----------
+
+None.
+
+Example
+-----------
+
+mysql> CALL sys.ps_statement_avg_latency_histogram()\\G
+*************************** 1. row ***************************
+Performance Schema Statement Digest Average Latency Histogram:
+
+  . = 1 unit
+  * = 2 units
+  # = 3 units
+
+(0 - 38ms)     240 | ################################################################################
+(38 - 77ms)    38  | ......................................
+(77 - 115ms)   3   | ...
+(115 - 154ms)  62  | *******************************
+(154 - 192ms)  3   | ...
+(192 - 231ms)  0   |
+(231 - 269ms)  0   |
+(269 - 307ms)  0   |
+(307 - 346ms)  0   |
+(346 - 384ms)  1   | .
+(384 - 423ms)  1   | .
+(423 - 461ms)  0   |
+(461 - 499ms)  0   |
+(499 - 538ms)  0   |
+(538 - 576ms)  0   |
+(576 - 615ms)  1   | .
+
+  Total Statements: 350; Buckets: 16; Bucket Size: 38 ms;
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    READS SQL DATA
+BEGIN
+SELECT CONCAT('\n',
+       '\n  . = 1 unit',
+       '\n  * = 2 units',
+       '\n  # = 3 units\n',
+       @label := CONCAT(@label_inner := CONCAT('\n(0 - ',
+                                               ROUND((@bucket_size := (SELECT ROUND((MAX(avg_us) - MIN(avg_us)) / (@buckets := 16)) AS size
+                                                                         FROM sys.x$ps_digest_avg_latency_distribution)) / (@unit_div := 1000)),
+                                                (@unit := 'ms'), ')'),
+                        REPEAT(' ', (@max_label_size := ((1 + LENGTH(ROUND((@bucket_size * 15) / @unit_div)) + 3 + LENGTH(ROUND(@bucket_size * 16) / @unit_div)) + 1)) - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us <= @bucket_size), 0)),
+       REPEAT(' ', (@max_label_len := (@max_label_size + LENGTH((@total_queries := (SELECT SUM(cnt) FROM sys.x$ps_digest_avg_latency_distribution)))) + 1) - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < (@one_unit := 40), '.', IF(@count_in_bucket < (@two_unit := 80), '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND(@bucket_size / @unit_div), ' - ', ROUND((@bucket_size * 2) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size AND b1.avg_us <= @bucket_size * 2), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 2) / @unit_div), ' - ', ROUND((@bucket_size * 3) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 2 AND b1.avg_us <= @bucket_size * 3), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 3) / @unit_div), ' - ', ROUND((@bucket_size * 4) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 3 AND b1.avg_us <= @bucket_size * 4), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 4) / @unit_div), ' - ', ROUND((@bucket_size * 5) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 4 AND b1.avg_us <= @bucket_size * 5), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 5) / @unit_div), ' - ', ROUND((@bucket_size * 6) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 5 AND b1.avg_us <= @bucket_size * 6), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 6) / @unit_div), ' - ', ROUND((@bucket_size * 7) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 6 AND b1.avg_us <= @bucket_size * 7), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 7) / @unit_div), ' - ', ROUND((@bucket_size * 8) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 7 AND b1.avg_us <= @bucket_size * 8), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 8) / @unit_div), ' - ', ROUND((@bucket_size * 9) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 8 AND b1.avg_us <= @bucket_size * 9), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 9) / @unit_div), ' - ', ROUND((@bucket_size * 10) / @unit_div), @unit, ')'),
+                         REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                         @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                       FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                      WHERE b1.avg_us > @bucket_size * 9 AND b1.avg_us <= @bucket_size * 10), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 10) / @unit_div), ' - ', ROUND((@bucket_size * 11) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 10 AND b1.avg_us <= @bucket_size * 11), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 11) / @unit_div), ' - ', ROUND((@bucket_size * 12) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 11 AND b1.avg_us <= @bucket_size * 12), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 12) / @unit_div), ' - ', ROUND((@bucket_size * 13) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 12 AND b1.avg_us <= @bucket_size * 13), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 13) / @unit_div), ' - ', ROUND((@bucket_size * 14) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 13 AND b1.avg_us <= @bucket_size * 14), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 14) / @unit_div), ' - ', ROUND((@bucket_size * 15) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 14 AND b1.avg_us <= @bucket_size * 15), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+       @label := CONCAT(@label_inner := CONCAT('\n(', ROUND((@bucket_size * 15) / @unit_div), ' - ', ROUND((@bucket_size * 16) / @unit_div), @unit, ')'),
+                        REPEAT(' ', @max_label_size - LENGTH(@label_inner)),
+                        @count_in_bucket := IFNULL((SELECT SUM(cnt)
+                                                      FROM sys.x$ps_digest_avg_latency_distribution AS b1 
+                                                     WHERE b1.avg_us > @bucket_size * 15 AND b1.avg_us <= @bucket_size * 16), 0)),
+       REPEAT(' ', @max_label_len - LENGTH(@label)), '| ',
+       IFNULL(REPEAT(IF(@count_in_bucket < @one_unit, '.', IF(@count_in_bucket < @two_unit, '*', '#')), 
+       	             IF(@count_in_bucket < @one_unit, @count_in_bucket,
+       	             	IF(@count_in_bucket < @two_unit, @count_in_bucket / 2, @count_in_bucket / 3))), ''),
+
+       '\n\n  Total Statements: ', @total_queries, '; Buckets: ', @buckets , '; Bucket Size: ', ROUND(@bucket_size / @unit_div) , ' ', @unit, ';\n'
+
+      ) AS `Performance Schema Statement Digest Average Latency Histogram`;
+
+END $$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_trace_statement_digest.sql b/scripts/sys_schema/procedures/ps_trace_statement_digest.sql
new file mode 100644
index 000000000000..3cfb7282d6ae
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_trace_statement_digest.sql
@@ -0,0 +1,331 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_trace_statement_digest;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_trace_statement_digest (
+        IN in_digest VARCHAR(32),
+        IN in_runtime INT,
+        IN in_interval DECIMAL(2,2),
+        IN in_start_fresh BOOLEAN,
+        IN in_auto_enable BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Traces all instrumentation within Performance Schema for a specific
+Statement Digest.
+
+When finding a statement of interest within the
+performance_schema.events_statements_summary_by_digest table, feed
+the DIGEST MD5 value in to this procedure, set how long to poll for,
+and at what interval to poll, and it will generate a report of all
+statistics tracked within Performance Schema for that digest for the
+interval.
+
+It will also attempt to generate an EXPLAIN for the longest running
+example of the digest during the interval. Note this may fail, as:
+
+   * Performance Schema truncates long SQL_TEXT values (and hence the
+     EXPLAIN will fail due to parse errors)
+   * the default schema is sys (so tables that are not fully qualified
+     in the query may not be found)
+   * some queries such as SHOW are not supported in EXPLAIN.
+
+When the EXPLAIN fails, the error will be ignored and no EXPLAIN
+output generated.
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Parameters
+-----------
+
+in_digest (VARCHAR(32)):
+  The statement digest identifier you would like to analyze
+in_runtime (INT):
+  The number of seconds to run analysis for
+in_interval (DECIMAL(2,2)):
+  The interval (in seconds, may be fractional) at which to try
+  and take snapshots
+in_start_fresh (BOOLEAN):
+  Whether to TRUNCATE the events_statements_history_long and
+  events_stages_history_long tables before starting
+in_auto_enable (BOOLEAN):
+  Whether to automatically turn on required consumers
+
+Example
+-----------
+
+mysql> call ps_trace_statement_digest(\'891ec6860f98ba46d89dd20b0c03652c\', 10, 0.1, true, true);
++--------------------+
+| SUMMARY STATISTICS |
++--------------------+
+| SUMMARY STATISTICS |
++--------------------+
+1 row in set (9.11 sec)
+
++------------+-----------+-----------+-----------+---------------+------------+------------+
+| executions | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scans |
++------------+-----------+-----------+-----------+---------------+------------+------------+
+|         21 | 4.11 ms   | 2.00 ms   |         0 |            21 |          0 |          0 |
++------------+-----------+-----------+-----------+---------------+------------+------------+
+1 row in set (9.11 sec)
+
++------------------------------------------+-------+-----------+
+| event_name                               | count | latency   |
++------------------------------------------+-------+-----------+
+| stage/sql/checking query cache for query |    16 | 724.37 us |
+| stage/sql/statistics                     |    16 | 546.92 us |
+| stage/sql/freeing items                  |    18 | 520.11 us |
+| stage/sql/init                           |    51 | 466.80 us |
+...
+| stage/sql/cleaning up                    |    18 | 11.92 us  |
+| stage/sql/executing                      |    16 | 6.95 us   |
++------------------------------------------+-------+-----------+
+17 rows in set (9.12 sec)
+
++---------------------------+
+| LONGEST RUNNING STATEMENT |
++---------------------------+
+| LONGEST RUNNING STATEMENT |
++---------------------------+
+1 row in set (9.16 sec)
+
++-----------+-----------+-----------+-----------+---------------+------------+-----------+
+| thread_id | exec_time | lock_time | rows_sent | rows_examined | tmp_tables | full_scan |
++-----------+-----------+-----------+-----------+---------------+------------+-----------+
+|    166646 | 618.43 us | 1.00 ms   |         0 |             1 |          0 |         0 |
++-----------+-----------+-----------+-----------+---------------+------------+-----------+
+1 row in set (9.16 sec)
+
+// Truncated for clarity...
++-----------------------------------------------------------------+
+| sql_text                                                        |
++-----------------------------------------------------------------+
+| select hibeventhe0_.id as id1382_, hibeventhe0_.createdTime ... |
++-----------------------------------------------------------------+
+1 row in set (9.17 sec)
+
++------------------------------------------+-----------+
+| event_name                               | latency   |
++------------------------------------------+-----------+
+| stage/sql/init                           | 8.61 us   |
+| stage/sql/Waiting for query cache lock   | 453.23 us |
+| stage/sql/init                           | 331.07 ns |
+| stage/sql/checking query cache for query | 43.04 us  |
+...
+| stage/sql/freeing items                  | 30.46 us  |
+| stage/sql/cleaning up                    | 662.13 ns |
++------------------------------------------+-----------+
+18 rows in set (9.23 sec)
+
++----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+
+| id | select_type | table        | type  | possible_keys | key       | key_len | ref         | rows | Extra |
++----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+
+|  1 | SIMPLE      | hibeventhe0_ | const | fixedTime     | fixedTime | 775     | const,const |    1 | NULL  |
++----+-------------+--------------+-------+---------------+-----------+---------+-------------+------+-------+
+1 row in set (9.27 sec)
+
+Query OK, 0 rows affected (9.28 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+
+    DECLARE v_start_fresh BOOLEAN DEFAULT false;
+    DECLARE v_auto_enable BOOLEAN DEFAULT false;
+    DECLARE v_explain     BOOLEAN DEFAULT true;
+    DECLARE v_this_thread_enabed ENUM('YES', 'NO');
+    DECLARE v_runtime INT DEFAULT 0;
+    DECLARE v_start INT DEFAULT 0;
+    DECLARE v_found_stmts INT;
+
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
+    -- Do not track the current thread, it will kill the stack
+    SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
+    CALL sys.ps_setup_disable_thread(CONNECTION_ID());
+
+    DROP TEMPORARY TABLE IF EXISTS stmt_trace;
+    CREATE TEMPORARY TABLE stmt_trace (
+        thread_id BIGINT UNSIGNED,
+        timer_start BIGINT UNSIGNED,
+        event_id BIGINT UNSIGNED,
+        sql_text longtext,
+        timer_wait BIGINT UNSIGNED,
+        lock_time BIGINT UNSIGNED,
+        errors BIGINT UNSIGNED,
+        mysql_errno INT,
+        rows_sent BIGINT UNSIGNED,
+        rows_affected BIGINT UNSIGNED,
+        rows_examined BIGINT UNSIGNED,
+        created_tmp_tables BIGINT UNSIGNED,
+        created_tmp_disk_tables BIGINT UNSIGNED,
+        no_index_used BIGINT UNSIGNED,
+        PRIMARY KEY (thread_id, timer_start)
+    );
+
+    DROP TEMPORARY TABLE IF EXISTS stmt_stages;
+    CREATE TEMPORARY TABLE stmt_stages (
+       event_id BIGINT UNSIGNED,
+       stmt_id BIGINT UNSIGNED,
+       event_name VARCHAR(128),
+       timer_wait BIGINT UNSIGNED,
+       PRIMARY KEY (event_id)
+    );
+
+    SET v_start_fresh = in_start_fresh;
+    IF v_start_fresh THEN
+        TRUNCATE TABLE performance_schema.events_statements_history_long;
+        TRUNCATE TABLE performance_schema.events_stages_history_long;
+    END IF;
+
+    SET v_auto_enable = in_auto_enable;
+    IF v_auto_enable THEN
+        CALL sys.ps_setup_save(0);
+
+        UPDATE performance_schema.threads
+           SET INSTRUMENTED = IF(PROCESSLIST_ID IS NOT NULL, 'YES', 'NO');
+
+        -- Only the events_statements_history_long and events_stages_history_long tables and their ancestors are needed
+        UPDATE performance_schema.setup_consumers
+           SET ENABLED = 'YES'
+         WHERE NAME NOT LIKE '%\_history'
+               AND NAME NOT LIKE 'events_wait%'
+               AND NAME NOT LIKE 'events_transactions%'
+               AND NAME <> 'statements_digest';
+
+        UPDATE performance_schema.setup_instruments
+           SET ENABLED = 'YES',
+               TIMED   = 'YES'
+         WHERE NAME LIKE 'statement/%' OR NAME LIKE 'stage/%';
+    END IF;
+
+    WHILE v_runtime < in_runtime DO
+        SELECT UNIX_TIMESTAMP() INTO v_start;
+
+        INSERT IGNORE INTO stmt_trace
+        SELECT thread_id, timer_start, event_id, sql_text, timer_wait, lock_time, errors, mysql_errno, 
+               rows_sent, rows_affected, rows_examined, created_tmp_tables, created_tmp_disk_tables, no_index_used
+          FROM performance_schema.events_statements_history_long
+        WHERE digest = in_digest;
+
+        INSERT IGNORE INTO stmt_stages
+        SELECT stages.event_id, stmt_trace.event_id,
+               stages.event_name, stages.timer_wait
+          FROM performance_schema.events_stages_history_long AS stages
+          JOIN stmt_trace ON stages.nesting_event_id = stmt_trace.event_id;
+
+        SELECT SLEEP(in_interval) INTO @sleep;
+        SET v_runtime = v_runtime + (UNIX_TIMESTAMP() - v_start);
+    END WHILE;
+
+    SELECT "SUMMARY STATISTICS";
+
+    SELECT COUNT(*) executions,
+           sys.format_time(SUM(timer_wait)) AS exec_time,
+           sys.format_time(SUM(lock_time)) AS lock_time,
+           SUM(rows_sent) AS rows_sent,
+           SUM(rows_affected) AS rows_affected,
+           SUM(rows_examined) AS rows_examined,
+           SUM(created_tmp_tables) AS tmp_tables,
+           SUM(no_index_used) AS full_scans
+      FROM stmt_trace;
+
+    SELECT event_name,
+           COUNT(*) as count,
+           sys.format_time(SUM(timer_wait)) as latency
+      FROM stmt_stages
+     GROUP BY event_name
+     ORDER BY SUM(timer_wait) DESC;
+
+    SELECT "LONGEST RUNNING STATEMENT";
+
+    SELECT thread_id,
+           sys.format_time(timer_wait) AS exec_time,
+           sys.format_time(lock_time) AS lock_time,
+           rows_sent,
+           rows_affected,
+           rows_examined,
+           created_tmp_tables AS tmp_tables,
+           no_index_used AS full_scan
+      FROM stmt_trace
+     ORDER BY timer_wait DESC LIMIT 1;
+
+    SELECT sql_text
+      FROM stmt_trace
+     ORDER BY timer_wait DESC LIMIT 1;
+
+    SELECT sql_text, event_id INTO @sql, @sql_id
+      FROM stmt_trace
+    ORDER BY timer_wait DESC LIMIT 1;
+
+    IF (@sql_id IS NOT NULL) THEN
+        SELECT event_name,
+               sys.format_time(timer_wait) as latency
+          FROM stmt_stages
+         WHERE stmt_id = @sql_id
+         ORDER BY event_id;
+    END IF;
+
+    DROP TEMPORARY TABLE stmt_trace;
+    DROP TEMPORARY TABLE stmt_stages;
+
+    IF (@sql IS NOT NULL) THEN
+        SET @stmt := CONCAT("EXPLAIN FORMAT=JSON ", @sql);
+        BEGIN
+            -- Not all queries support EXPLAIN, so catch the cases that are
+            -- not supported. Currently that includes cases where the table
+            -- is not fully qualified and is not in the default schema for this
+            -- procedure as it's not possible to change the default schema inside
+            -- a procedure.
+            --
+            -- Errno = 1064: You have an error in your SQL syntax
+            -- Errno = 1146: Table '...' doesn't exist
+            DECLARE CONTINUE HANDLER FOR 1064, 1146 SET v_explain = false;
+
+            PREPARE explain_stmt FROM @stmt;
+        END;
+
+        IF (v_explain) THEN
+            EXECUTE explain_stmt;
+            DEALLOCATE PREPARE explain_stmt;
+        END IF;
+    END IF;
+
+    IF v_auto_enable THEN
+        CALL sys.ps_setup_reload_saved();
+    END IF;
+    -- Restore INSTRUMENTED for this thread
+    IF (v_this_thread_enabed = 'YES') THEN
+        CALL sys.ps_setup_enable_thread(CONNECTION_ID());
+    END IF;
+
+    SET sql_log_bin = @log_bin;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_trace_thread.sql b/scripts/sys_schema/procedures/ps_trace_thread.sql
new file mode 100644
index 000000000000..618d62bbe814
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_trace_thread.sql
@@ -0,0 +1,347 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_trace_thread;
+
+DELIMITER $$
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_trace_thread (
+        IN in_thread_id BIGINT UNSIGNED,
+        IN in_outfile VARCHAR(255),
+        IN in_max_runtime DECIMAL(20,2),
+        IN in_interval DECIMAL(20,2),
+        IN in_start_fresh BOOLEAN,
+        IN in_auto_setup BOOLEAN,
+        IN in_debug BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Dumps all data within Performance Schema for an instrumented thread,
+to create a DOT formatted graph file. 
+
+Each resultset returned from the procedure should be used for a complete graph
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Parameters
+-----------
+
+in_thread_id (BIGINT UNSIGNED):
+  The thread that you would like a stack trace for
+in_outfile  (VARCHAR(255)):
+  The filename the dot file will be written to
+in_max_runtime (DECIMAL(20,2)):
+  The maximum time to keep collecting data.
+  Use NULL to get the default which is 60 seconds.
+in_interval (DECIMAL(20,2)): 
+  How long to sleep between data collections. 
+  Use NULL to get the default which is 1 second.
+in_start_fresh (BOOLEAN):
+  Whether to reset all Performance Schema data before tracing.
+in_auto_setup (BOOLEAN):
+  Whether to disable all other threads and enable all consumers/instruments. 
+  This will also reset the settings at the end of the run.
+in_debug (BOOLEAN):
+  Whether you would like to include file:lineno in the graph
+
+Example
+-----------
+
+mysql> CALL sys.ps_trace_thread(25, CONCAT(\'/tmp/stack-\', REPLACE(NOW(), \' \', \'-\'), \'.dot\'), NULL, NULL, TRUE, TRUE, TRUE);
++-------------------+
+| summary           |
++-------------------+
+| Disabled 1 thread |
++-------------------+
+1 row in set (0.00 sec)
+
++---------------------------------------------+
+| Info                                        |
++---------------------------------------------+
+| Data collection starting for THREAD_ID = 25 |
++---------------------------------------------+
+1 row in set (0.03 sec)
+
++-----------------------------------------------------------+
+| Info                                                      |
++-----------------------------------------------------------+
+| Stack trace written to /tmp/stack-2014-02-16-21:18:41.dot |
++-----------------------------------------------------------+
+1 row in set (60.07 sec)
+
++-------------------------------------------------------------------+
+| Convert to PDF                                                    |
++-------------------------------------------------------------------+
+| dot -Tpdf -o /tmp/stack_25.pdf /tmp/stack-2014-02-16-21:18:41.dot |
++-------------------------------------------------------------------+
+1 row in set (60.07 sec)
+
++-------------------------------------------------------------------+
+| Convert to PNG                                                    |
++-------------------------------------------------------------------+
+| dot -Tpng -o /tmp/stack_25.png /tmp/stack-2014-02-16-21:18:41.dot |
++-------------------------------------------------------------------+
+1 row in set (60.07 sec)
+
++------------------+
+| summary          |
++------------------+
+| Enabled 1 thread |
++------------------+
+1 row in set (60.32 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    DECLARE v_done bool DEFAULT FALSE;
+    DECLARE v_start, v_runtime DECIMAL(20,2) DEFAULT 0.0;
+    DECLARE v_min_event_id bigint unsigned DEFAULT 0;
+    DECLARE v_this_thread_enabed ENUM('YES', 'NO');
+    DECLARE v_event longtext;
+    DECLARE c_stack CURSOR FOR
+        SELECT CONCAT(IF(nesting_event_id IS NOT NULL, CONCAT(nesting_event_id, ' -> '), ''), 
+                    event_id, '; ', event_id, ' [label="',
+                    -- Convert from picoseconds to microseconds
+                    '(', sys.format_time(timer_wait), ') ',
+                    IF (event_name NOT LIKE 'wait/io%', 
+                        SUBSTRING_INDEX(event_name, '/', -2), 
+                        IF (event_name NOT LIKE 'wait/io/file%' OR event_name NOT LIKE 'wait/io/socket%',
+                            SUBSTRING_INDEX(event_name, '/', -4),
+                            event_name)
+                        ),
+                    -- Always dump the extra wait information gathered for transactions and statements
+                    IF (event_name LIKE 'transaction', IFNULL(CONCAT('\\n', wait_info), ''), ''),
+                    IF (event_name LIKE 'statement/%', IFNULL(CONCAT('\\n', wait_info), ''), ''),
+                    -- If debug is enabled, add the file:lineno information for waits
+                    IF (in_debug AND event_name LIKE 'wait%', wait_info, ''),
+                    '", ', 
+                    -- Depending on the type of event, style appropriately
+                    CASE WHEN event_name LIKE 'wait/io/file%' THEN 
+                           'shape=box, style=filled, color=red'
+                         WHEN event_name LIKE 'wait/io/table%' THEN 
+                           'shape=box, style=filled, color=green'
+                         WHEN event_name LIKE 'wait/io/socket%' THEN
+                           'shape=box, style=filled, color=yellow'
+                         WHEN event_name LIKE 'wait/synch/mutex%' THEN
+                           'style=filled, color=lightskyblue'
+                         WHEN event_name LIKE 'wait/synch/cond%' THEN
+                           'style=filled, color=darkseagreen3'
+                         WHEN event_name LIKE 'wait/synch/rwlock%' THEN
+                           'style=filled, color=orchid'
+                         WHEN event_name LIKE 'wait/synch/sxlock%' THEN
+                           'style=filled, color=palevioletred' 
+                         WHEN event_name LIKE 'wait/lock%' THEN
+                           'shape=box, style=filled, color=tan'
+                         WHEN event_name LIKE 'statement/%' THEN
+                           CONCAT('shape=box, style=bold',
+                                  -- Style statements depending on COM vs SQL
+                                  CASE WHEN event_name LIKE 'statement/com/%' THEN
+                                         ' style=filled, color=darkseagreen'
+                                       ELSE
+                                         -- Use long query time from the server to
+                                         -- flag long running statements in red
+                                         IF((timer_wait/1000000000000) > @@long_query_time, 
+                                            ' style=filled, color=red', 
+                                            ' style=filled, color=lightblue')
+                                  END
+                           )
+                         WHEN event_name LIKE 'transaction' THEN
+                           'shape=box, style=filled, color=lightblue3'
+                         WHEN event_name LIKE 'stage/%' THEN
+                           'style=filled, color=slategray3'
+                         -- IDLE events are on their own, call attention to them
+                         WHEN event_name LIKE '%idle%' THEN
+                           'shape=box, style=filled, color=firebrick3'
+                         ELSE '' END,
+                     '];\n'
+                   ) event, event_id
+        FROM (
+             -- Select all transactions
+             (SELECT thread_id, event_id, event_name, timer_wait, timer_start, nesting_event_id,
+                     CONCAT('trx_id: ',  IFNULL(trx_id, ''), '\\n',
+                            'gtid: ', IFNULL(gtid, ''), '\\n',
+                            'state: ', state, '\\n',
+                            'mode: ', access_mode, '\\n',
+                            'isolation: ', isolation_level, '\\n',
+                            'autocommit: ', autocommit, '\\n',
+                            'savepoints: ', number_of_savepoints, '\\n'
+                     ) AS wait_info
+                FROM performance_schema.events_transactions_history_long
+               WHERE thread_id = in_thread_id AND event_id > v_min_event_id)
+             UNION
+             -- Select all statements, with the extra tracing information available
+             (SELECT thread_id, event_id, event_name, timer_wait, timer_start, nesting_event_id, 
+                     CONCAT('statement: ', sql_text, '\\n',
+                            'errors: ', errors, '\\n',
+                            'warnings: ', warnings, '\\n',
+                            'lock time: ', sys.format_time(lock_time),'\\n',
+                            'rows affected: ', rows_affected, '\\n',
+                            'rows sent: ', rows_sent, '\\n',
+                            'rows examined: ', rows_examined, '\\n',
+                            'tmp tables: ', created_tmp_tables, '\\n',
+                            'tmp disk tables: ', created_tmp_disk_tables, '\\n'
+                            'select scan: ', select_scan, '\\n',
+                            'select full join: ', select_full_join, '\\n',
+                            'select full range join: ', select_full_range_join, '\\n',
+                            'select range: ', select_range, '\\n',
+                            'select range check: ', select_range_check, '\\n', 
+                            'sort merge passes: ', sort_merge_passes, '\\n',
+                            'sort rows: ', sort_rows, '\\n',
+                            'sort range: ', sort_range, '\\n',
+                            'sort scan: ', sort_scan, '\\n',
+                            'no index used: ', IF(no_index_used, 'TRUE', 'FALSE'), '\\n',
+                            'no good index used: ', IF(no_good_index_used, 'TRUE', 'FALSE'), '\\n'
+                     ) AS wait_info
+                FROM performance_schema.events_statements_history_long
+               WHERE thread_id = in_thread_id AND event_id > v_min_event_id)
+             UNION
+             -- Select all stages
+             (SELECT thread_id, event_id, event_name, timer_wait, timer_start, nesting_event_id, null AS wait_info
+                FROM performance_schema.events_stages_history_long 
+               WHERE thread_id = in_thread_id AND event_id > v_min_event_id)
+             UNION 
+             -- Select all events, adding information appropriate to the event
+             (SELECT thread_id, event_id, 
+                     CONCAT(event_name, 
+                            IF(event_name NOT LIKE 'wait/synch/mutex%', IFNULL(CONCAT(' - ', operation), ''), ''), 
+                            IF(number_of_bytes IS NOT NULL, CONCAT(' ', number_of_bytes, ' bytes'), ''),
+                            IF(event_name LIKE 'wait/io/file%', '\\n', ''),
+                            IF(object_schema IS NOT NULL, CONCAT('\\nObject: ', object_schema, '.'), ''), 
+                            IF(object_name IS NOT NULL, 
+                               IF (event_name LIKE 'wait/io/socket%',
+                                   -- Print the socket if used, else the IP:port as reported
+                                   CONCAT('\\n', IF (object_name LIKE ':0%', @@socket, object_name)),
+                                   object_name),
+                               ''
+                            ),
+                            IF(index_name IS NOT NULL, CONCAT(' Index: ', index_name), ''), '\\n'
+                     ) AS event_name,
+                     timer_wait, timer_start, nesting_event_id, source AS wait_info
+                FROM performance_schema.events_waits_history_long
+               WHERE thread_id = in_thread_id AND event_id > v_min_event_id)
+           ) events 
+       ORDER BY event_id;
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
+    -- Do not track the current thread, it will kill the stack
+    SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
+    CALL sys.ps_setup_disable_thread(CONNECTION_ID());
+
+    IF (in_auto_setup) THEN
+        CALL sys.ps_setup_save(0);
+        
+        -- Ensure only the thread to create the stack trace for is instrumented and that we instrument everything.
+        DELETE FROM performance_schema.setup_actors;
+
+        UPDATE performance_schema.threads
+           SET INSTRUMENTED = IF(THREAD_ID = in_thread_id, 'YES', 'NO');
+
+        -- only the %_history_long tables and it ancestors are needed
+        UPDATE performance_schema.setup_consumers
+           SET ENABLED = 'YES'
+         WHERE NAME NOT LIKE '%\_history';
+
+        UPDATE performance_schema.setup_instruments
+           SET ENABLED = 'YES',
+               TIMED   = 'YES';
+    END IF;
+
+    IF (in_start_fresh) THEN
+        TRUNCATE performance_schema.events_transactions_history_long;
+        TRUNCATE performance_schema.events_statements_history_long;
+        TRUNCATE performance_schema.events_stages_history_long;
+        TRUNCATE performance_schema.events_waits_history_long;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_events;
+    CREATE TEMPORARY TABLE tmp_events (
+      event_id bigint unsigned NOT NULL,
+      event longblob,
+      PRIMARY KEY (event_id)
+    );
+
+    -- Print headers for a .dot file
+    INSERT INTO tmp_events VALUES (0, CONCAT('digraph events { rankdir=LR; nodesep=0.10;\n',
+                                             '// Stack created .....: ', NOW(), '\n',
+                                             '// MySQL version .....: ', VERSION(), '\n',
+                                             '// MySQL hostname ....: ', @@hostname, '\n',
+                                             '// MySQL port ........: ', @@port, '\n',
+                                             '// MySQL socket ......: ', @@socket, '\n',
+                                             '// MySQL user ........: ', CURRENT_USER(), '\n'));
+
+    SELECT CONCAT('Data collection starting for THREAD_ID = ', in_thread_id) AS 'Info';
+
+    SET v_min_event_id = 0,
+        v_start        = UNIX_TIMESTAMP(),
+        in_interval    = IFNULL(in_interval, 1.00),
+        in_max_runtime = IFNULL(in_max_runtime, 60.00);
+
+    WHILE (v_runtime < in_max_runtime
+           AND (SELECT INSTRUMENTED FROM performance_schema.threads WHERE THREAD_ID = in_thread_id) = 'YES') DO
+        SET v_done = FALSE;
+        OPEN c_stack;
+        c_stack_loop: LOOP
+            FETCH c_stack INTO v_event, v_min_event_id;
+            IF v_done THEN
+                LEAVE c_stack_loop;
+            END IF;
+
+            IF (LENGTH(v_event) > 0) THEN
+                INSERT INTO tmp_events VALUES (v_min_event_id, v_event);
+            END IF;
+        END LOOP;
+        CLOSE c_stack;
+
+        SELECT SLEEP(in_interval) INTO @sleep;
+        SET v_runtime = (UNIX_TIMESTAMP() - v_start);
+    END WHILE;
+
+    INSERT INTO tmp_events VALUES (v_min_event_id+1, '}');
+   
+    SET @query = CONCAT('SELECT event FROM tmp_events ORDER BY event_id INTO OUTFILE ''', in_outfile, ''' FIELDS ESCAPED BY '''' LINES TERMINATED BY ''''');
+    PREPARE stmt_output FROM @query;
+    EXECUTE stmt_output;
+    DEALLOCATE PREPARE stmt_output;
+   
+    SELECT CONCAT('Stack trace written to ', in_outfile) AS 'Info';
+    SELECT CONCAT('dot -Tpdf -o /tmp/stack_', in_thread_id, '.pdf ', in_outfile) AS 'Convert to PDF';
+    SELECT CONCAT('dot -Tpng -o /tmp/stack_', in_thread_id, '.png ', in_outfile) AS 'Convert to PNG';
+    DROP TEMPORARY TABLE tmp_events;
+
+    -- Reset the settings for the performance schema
+    IF (in_auto_setup) THEN
+        CALL sys.ps_setup_reload_saved();
+    END IF;
+    -- Restore INSTRUMENTED for this thread
+    IF (v_this_thread_enabed = 'YES') THEN
+        CALL sys.ps_setup_enable_thread(CONNECTION_ID());
+    END IF;
+
+    SET sql_log_bin = @log_bin;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/ps_truncate_all_tables.sql b/scripts/sys_schema/procedures/ps_truncate_all_tables.sql
new file mode 100644
index 000000000000..52a0e84b0361
--- /dev/null
+++ b/scripts/sys_schema/procedures/ps_truncate_all_tables.sql
@@ -0,0 +1,97 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS ps_truncate_all_tables;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE ps_truncate_all_tables (
+        IN in_verbose BOOLEAN
+    )
+    COMMENT '
+Description
+-----------
+
+Truncates all summary tables within Performance Schema, 
+resetting all aggregated instrumentation as a snapshot.
+
+Parameters
+-----------
+
+in_verbose (BOOLEAN):
+  Whether to print each TRUNCATE statement before running
+
+Example
+-----------
+
+mysql> CALL sys.ps_truncate_all_tables(false);
++---------------------+
+| summary             |
++---------------------+
+| Truncated 44 tables |
++---------------------+
+1 row in set (0.10 sec)
+
+Query OK, 0 rows affected (0.10 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    MODIFIES SQL DATA
+BEGIN
+    DECLARE v_done INT DEFAULT FALSE;
+    DECLARE v_total_tables INT DEFAULT 0;
+    DECLARE v_ps_table VARCHAR(64);
+    DECLARE ps_tables CURSOR FOR
+        SELECT table_name 
+          FROM INFORMATION_SCHEMA.TABLES 
+         WHERE table_schema = 'performance_schema' 
+           AND (table_name LIKE '%summary%' 
+            OR table_name LIKE '%history%');
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
+
+    OPEN ps_tables;
+
+    ps_tables_loop: LOOP
+        FETCH ps_tables INTO v_ps_table;
+        IF v_done THEN
+          LEAVE ps_tables_loop;
+        END IF;
+
+        SET @truncate_stmt := CONCAT('TRUNCATE TABLE performance_schema.', v_ps_table);
+        IF in_verbose THEN
+            SELECT CONCAT('Running: ', @truncate_stmt) AS status;
+        END IF;
+
+        PREPARE truncate_stmt FROM @truncate_stmt;
+        EXECUTE truncate_stmt;
+        DEALLOCATE PREPARE truncate_stmt;
+
+        SET v_total_tables = v_total_tables + 1;
+    END LOOP;
+
+    CLOSE ps_tables;
+
+    SELECT CONCAT('Truncated ', v_total_tables, ' tables') AS summary;
+
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/statement_performance_analyzer.sql b/scripts/sys_schema/procedures/statement_performance_analyzer.sql
new file mode 100644
index 000000000000..5a042548599c
--- /dev/null
+++ b/scripts/sys_schema/procedures/statement_performance_analyzer.sql
@@ -0,0 +1,730 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+-- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS statement_performance_analyzer;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE statement_performance_analyzer (
+        IN in_action ENUM('snapshot', 'overall', 'delta', 'create_table', 'create_tmp', 'save', 'cleanup'),
+        IN in_table VARCHAR(129),
+        IN in_views SET ('with_runtimes_in_95th_percentile', 'analysis', 'with_errors_or_warnings', 'with_full_table_scans', 'with_sorting', 'with_temp_tables', 'custom')
+    )
+    COMMENT '
+Description
+-----------
+
+Create a report of the statements running on the server.
+
+The views are calculated based on the overall and/or delta activity.
+
+Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
+Parameters
+-----------
+
+in_action (ENUM(''snapshot'', ''overall'', ''delta'', ''create_tmp'', ''create_table'', ''save'', ''cleanup'')):
+  The action to take. Supported actions are:
+    * snapshot      Store a snapshot. The default is to make a snapshot of the current content of
+                    performance_schema.events_statements_summary_by_digest, but by setting in_table
+                    this can be overwritten to copy the content of the specified table.
+                    The snapshot is stored in the sys.tmp_digests temporary table.
+    * overall       Generate analyzis based on the content specified by in_table. For the overall analyzis,
+                    in_table can be NOW() to use a fresh snapshot. This will overwrite an existing snapshot.
+                    Use NULL for in_table to use the existing snapshot. If in_table IS NULL and no snapshot
+                    exists, a new will be created.
+                    See also in_views and @sys.statement_performance_analyzer.limit.
+    * delta         Generate a delta analysis. The delta will be calculated between the reference table in
+                    in_table and the snapshot. An existing snapshot must exist.
+                    The action uses the sys.tmp_digests_delta temporary table.
+                    See also in_views and @sys.statement_performance_analyzer.limit.
+    * create_table  Create a regular table suitable for storing the snapshot for later use, e.g. for
+                    calculating deltas.
+    * create_tmp    Create a temporary table suitable for storing the snapshot for later use, e.g. for
+                    calculating deltas.
+    * save          Save the snapshot in the table specified by in_table. The table must exists and have
+                    the correct structure.
+                    If no snapshot exists, a new is created.
+    * cleanup       Remove the temporary tables used for the snapshot and delta.
+
+in_table (VARCHAR(129)):
+  The table argument used for some actions. Use the format ''db1.t1'' or ''t1'' without using any backticks (`)
+  for quoting. Periods (.) are not supported in the database and table names.
+
+  The meaning of the table for each action supporting the argument is:
+
+    * snapshot      The snapshot is created based on the specified table. Set to NULL or NOW() to use
+                    the current content of performance_schema.events_statements_summary_by_digest.
+    * overall       The table with the content to create the overall analyzis for. The following values
+                    can be used:
+                      - A table name - use the content of that table.
+                      - NOW()        - create a fresh snapshot and overwrite the existing snapshot.
+                      - NULL         - use the last stored snapshot.
+    * delta         The table name is mandatory and specified the reference view to compare the currently
+                    stored snapshot against. If no snapshot exists, a new will be created.
+    * create_table  The name of the regular table to create.
+    * create_tmp    The name of the temporary table to create.
+    * save          The name of the table to save the currently stored snapshot into.
+
+in_views (SET (''with_runtimes_in_95th_percentile'', ''analysis'', ''with_errors_or_warnings'',
+               ''with_full_table_scans'', ''with_sorting'', ''with_temp_tables'', ''custom''))
+  Which views to include:
+
+    * with_runtimes_in_95th_percentile  Based on the sys.statements_with_runtimes_in_95th_percentile view
+    * analysis                          Based on the sys.statement_analysis view
+    * with_errors_or_warnings           Based on the sys.statements_with_errors_or_warnings view
+    * with_full_table_scans             Based on the sys.statements_with_full_table_scans view
+    * with_sorting                      Based on the sys.statements_with_sorting view
+    * with_temp_tables                  Based on the sys.statements_with_temp_tables view
+    * custom                            Use a custom view. This view must be specified in @sys.statement_performance_analyzer.view to an existing view or a query
+
+Default is to include all except ''custom''.
+
+
+Configuration Options
+----------------------
+
+sys.statement_performance_analyzer.limit
+  The maximum number of rows to include for the views that does not have a built-in limit (e.g. the 95th percentile view).
+  If not set the limit is 100.
+
+sys.statement_performance_analyzer.view
+  Used together with the ''custom'' view. If the value contains a space, it is considered a query, otherwise it must be
+  an existing view querying the performance_schema.events_statements_summary_by_digest table. There cannot be any limit
+  clause including in the query or view definition if @sys.statement_performance_analyzer.limit > 0.
+  If specifying a view, use the same format as for in_table.
+
+sys.debug
+  Whether to provide debugging output.
+  Default is ''OFF''. Set to ''ON'' to include.
+
+
+Example
+--------
+
+To create a report with the queries in the 95th percentile since last truncate of performance_schema.events_statements_summary_by_digest
+and the delta for a 1 minute period:
+
+   1. Create a temporary table to store the initial snapshot.
+   2. Create the initial snapshot.
+   3. Save the initial snapshot in the temporary table.
+   4. Wait one minute.
+   5. Create a new snapshot.
+   6. Perform analyzis based on the new snapshot.
+   7. Perform analyzis based on the delta between the initial and new snapshots.
+
+mysql> CALL sys.statement_performance_analyzer(''create_tmp'', ''mydb.tmp_digests_ini'', NULL);
+Query OK, 0 rows affected (0.08 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL);
+Query OK, 0 rows affected (0.02 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''save'', ''mydb.tmp_digests_ini'', NULL);
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> DO SLEEP(60);
+Query OK, 0 rows affected (1 min 0.00 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL);
+Query OK, 0 rows affected (0.02 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile'');
++-----------------------------------------+
+| Next Output                             |
++-----------------------------------------+
+| Queries with Runtime in 95th Percentile |
++-----------------------------------------+
+1 row in set (0.05 sec)
+
+...
+
+mysql> CALL sys.statement_performance_analyzer(''delta'', ''mydb.tmp_digests_ini'', ''with_runtimes_in_95th_percentile'');
++-----------------------------------------+
+| Next Output                             |
++-----------------------------------------+
+| Queries with Runtime in 95th Percentile |
++-----------------------------------------+
+1 row in set (0.03 sec)
+
+...
+
+
+To create an overall report of the 95th percentile queries and the top 10 queries with full table scans:
+
+mysql> CALL sys.statement_performance_analyzer(''snapshot'', NULL, NULL);
+Query OK, 0 rows affected (0.01 sec)
+
+mysql> SET @sys.statement_performance_analyzer.limit = 10;
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''overall'', NULL, ''with_runtimes_in_95th_percentile,with_full_table_scans'');
++-----------------------------------------+
+| Next Output                             |
++-----------------------------------------+
+| Queries with Runtime in 95th Percentile |
++-----------------------------------------+
+1 row in set (0.01 sec)
+
+...
+
++-------------------------------------+
+| Next Output                         |
++-------------------------------------+
+| Top 10 Queries with Full Table Scan |
++-------------------------------------+
+1 row in set (0.09 sec)
+
+...
+
+
+Use a custom view showing the top 10 query sorted by total execution time refreshing the view every minute using
+the watch command in Linux.
+
+mysql> CREATE OR REPLACE VIEW mydb.my_statements AS
+    -> SELECT sys.format_statement(DIGEST_TEXT) AS query,
+    ->        SCHEMA_NAME AS db,
+    ->        COUNT_STAR AS exec_count,
+    ->        sys.format_time(SUM_TIMER_WAIT) AS total_latency,
+    ->        sys.format_time(AVG_TIMER_WAIT) AS avg_latency,
+    ->        ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
+    ->        ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg,
+    ->        ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0)) AS rows_affected_avg,
+    ->        DIGEST AS digest
+    ->   FROM performance_schema.events_statements_summary_by_digest
+    -> ORDER BY SUM_TIMER_WAIT DESC;
+Query OK, 0 rows affected (0.01 sec)
+
+mysql> CALL sys.statement_performance_analyzer(''create_table'', ''mydb.digests_prev'', NULL);
+Query OK, 0 rows affected (0.10 sec)
+
+shell$ watch -n 60 "mysql sys --table -e \"
+> SET @sys.statement_performance_analyzer.view = ''mydb.my_statements'';
+> SET @sys.statement_performance_analyzer.limit = 10;
+> CALL statement_performance_analyzer(''snapshot'', NULL, NULL);
+> CALL statement_performance_analyzer(''delta'', ''mydb.digests_prev'', ''custom'');
+> CALL statement_performance_analyzer(''save'', ''mydb.digests_prev'', NULL);
+> \""
+
+Every 60.0s: mysql sys --table -e "                                                                                                   ...  Mon Dec 22 10:58:51 2014
+
++----------------------------------+
+| Next Output                      |
++----------------------------------+
+| Top 10 Queries Using Custom View |
++----------------------------------+
++-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+
+| query             | db    | exec_count | total_latency | avg_latency | rows_sent_avg | rows_examined_avg | rows_affected_avg | digest                           |
++-------------------+-------+------------+---------------+-------------+---------------+-------------------+-------------------+----------------------------------+
+...
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    CONTAINS SQL
+BEGIN
+    DECLARE v_table_exists, v_tmp_digests_table_exists, v_custom_view_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY') DEFAULT '';
+    DECLARE v_this_thread_enabled ENUM('YES', 'NO');
+    DECLARE v_force_new_snapshot BOOLEAN DEFAULT FALSE;
+    DECLARE v_digests_table VARCHAR(133);
+    DECLARE v_quoted_table, v_quoted_custom_view VARCHAR(133) DEFAULT '';
+    DECLARE v_table_db, v_table_name, v_custom_db, v_custom_name VARCHAR(64);
+    DECLARE v_digest_table_template, v_checksum_ref, v_checksum_table text;
+    DECLARE v_sql longtext;
+    -- Maximum supported length for MESSAGE_TEXT with the SIGNAL command is 128 chars.
+    DECLARE v_error_msg VARCHAR(128);
+
+
+    -- Don't instrument this thread
+    SELECT INSTRUMENTED INTO v_this_thread_enabled FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
+    IF (v_this_thread_enabled = 'YES') THEN
+        CALL sys.ps_setup_disable_thread(CONNECTION_ID());
+    END IF;
+
+    -- Temporary table are used - disable sql_log_bin if necessary to prevent them replicating
+    SET @log_bin := @@sql_log_bin;
+    IF (@log_bin = 1) THEN
+        SET sql_log_bin = 0;
+    END IF;
+
+
+    -- Set configuration options
+    IF (@sys.statement_performance_analyzer.limit IS NULL) THEN
+        SET @sys.statement_performance_analyzer.limit = sys.sys_get_config('statement_performance_analyzer.limit', '100');
+    END IF;
+    IF (@sys.debug IS NULL) THEN
+        SET @sys.debug                                = sys.sys_get_config('debug'                               , 'OFF');
+    END IF;
+
+
+    -- If in_table is set, break in_table into a db and table component and check whether it exists
+    -- in_table = NOW() is considered like it's not set.
+    IF (in_table = 'NOW()') THEN
+        SET v_force_new_snapshot = TRUE,
+            in_table             = NULL;
+    ELSEIF (in_table IS NOT NULL) THEN
+        IF (NOT INSTR(in_table, '.')) THEN
+            -- No . in the table name - use current database
+            -- DATABASE() will be the database of the procedure
+            SET v_table_db   = DATABASE(),
+                v_table_name = in_table;
+        ELSE
+            SET v_table_db   = SUBSTRING_INDEX(in_table, '.', 1);
+            SET v_table_name = SUBSTRING(in_table, CHAR_LENGTH(v_table_db)+2);
+        END IF;
+
+        SET v_quoted_table = CONCAT('`', v_table_db, '`.`', v_table_name, '`');
+
+        IF (@sys.debug = 'ON') THEN
+            SELECT CONCAT('in_table is: db = ''', v_table_db, ''', table = ''', v_table_name, '''') AS 'Debug';
+        END IF;
+
+        IF (v_table_db = DATABASE() AND (v_table_name = 'tmp_digests' OR v_table_name = 'tmp_digests_delta')) THEN
+            SET v_error_msg = CONCAT('Invalid value for in_table: ', v_quoted_table, ' is reserved table name.');
+            SIGNAL SQLSTATE '45000'
+               SET MESSAGE_TEXT = v_error_msg;
+        END IF;
+
+        CALL sys.table_exists(v_table_db, v_table_name, v_table_exists);
+        IF (@sys.debug = 'ON') THEN
+            SELECT CONCAT('v_table_exists = ', v_table_exists) AS 'Debug';
+        END IF;
+
+        IF (v_table_exists = 'BASE TABLE') THEN
+            -- Verify that the table has the correct table definition
+            -- This can only be done for base tables as temporary aren't in information_schema.COLUMNS.
+            -- This also minimises the risk of using a production table.
+            SET v_checksum_ref = (
+                 SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum
+                   FROM information_schema.COLUMNS
+                  WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'events_statements_summary_by_digest'
+                ),
+                v_checksum_table = (
+                 SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, COLUMN_TYPE) ORDER BY ORDINAL_POSITION) AS Checksum
+                   FROM information_schema.COLUMNS
+                  WHERE TABLE_SCHEMA = v_table_db AND TABLE_NAME = v_table_name
+                );
+
+            IF (v_checksum_ref <> v_checksum_table) THEN
+                -- The table does not have the correct definition, so abandon
+                SET v_error_msg = CONCAT('The table ',
+                                         IF(CHAR_LENGTH(v_quoted_table) > 93, CONCAT('...', SUBSTRING(v_quoted_table, -90)), v_quoted_table),
+                                         ' has the wrong definition.');
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = v_error_msg;
+            END IF;
+        END IF;
+    END IF;
+
+
+    IF (in_views IS NULL OR in_views = '') THEN
+        -- Set to default
+        SET in_views = 'with_runtimes_in_95th_percentile,analysis,with_errors_or_warnings,with_full_table_scans,with_sorting,with_temp_tables';
+    END IF;
+
+
+    -- Validate settings
+    CALL sys.table_exists(DATABASE(), 'tmp_digests', v_tmp_digests_table_exists);
+    IF (@sys.debug = 'ON') THEN
+        SELECT CONCAT('v_tmp_digests_table_exists = ', v_tmp_digests_table_exists) AS 'Debug';
+    END IF;
+
+    CASE
+        WHEN in_action IN ('snapshot', 'overall') THEN
+            -- in_table must be NULL, NOW(), or an existing table
+            IF (in_table IS NOT NULL) THEN
+                IF (NOT v_table_exists IN ('TEMPORARY', 'BASE TABLE')) THEN
+                    SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be NULL, NOW() or specify an existing table.',
+                                             ' The table ',
+                                             IF(CHAR_LENGTH(v_quoted_table) > 16, CONCAT('...', SUBSTRING(v_quoted_table, -13)), v_quoted_table),
+                                             ' does not exist.');
+                    SIGNAL SQLSTATE '45000'
+                       SET MESSAGE_TEXT = v_error_msg;
+                END IF;
+            END IF;
+
+        WHEN in_action IN ('delta', 'save') THEN
+            -- in_table must be an existing table
+            IF (v_table_exists NOT IN ('TEMPORARY', 'BASE TABLE')) THEN
+                SET v_error_msg = CONCAT('The ', in_action, ' action requires in_table to be an existing table.',
+                                         IF(in_table IS NOT NULL, CONCAT(' The table ',
+                                             IF(CHAR_LENGTH(v_quoted_table) > 39, CONCAT('...', SUBSTRING(v_quoted_table, -36)), v_quoted_table),
+                                             ' does not exist.'), ''));
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = v_error_msg;
+            END IF;
+
+            IF (in_action = 'delta' AND v_tmp_digests_table_exists <> 'TEMPORARY') THEN
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = 'An existing snapshot generated with the statement_performance_analyzer() must exist.';
+            END IF;
+        WHEN in_action = 'create_tmp' THEN
+            -- in_table must not exists as a temporary table
+            IF (v_table_exists = 'TEMPORARY') THEN
+                SET v_error_msg = CONCAT('Cannot create the table ',
+                                         IF(CHAR_LENGTH(v_quoted_table) > 72, CONCAT('...', SUBSTRING(v_quoted_table, -69)), v_quoted_table),
+                                         ' as it already exists.');
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = v_error_msg;
+            END IF;
+
+        WHEN in_action = 'create_table' THEN
+            -- in_table must not exists at all
+            IF (v_table_exists <> '') THEN
+                SET v_error_msg = CONCAT('Cannot create the table ',
+                                         IF(CHAR_LENGTH(v_quoted_table) > 52, CONCAT('...', SUBSTRING(v_quoted_table, -49)), v_quoted_table),
+                                         ' as it already exists',
+                                         IF(v_table_exists = 'TEMPORARY', ' as a temporary table.', '.'));
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = v_error_msg;
+            END IF;
+
+        WHEN in_action = 'cleanup' THEN
+            -- doesn't use any of the arguments
+            DO (SELECT 1);
+        ELSE
+            SIGNAL SQLSTATE '45000'
+               SET MESSAGE_TEXT = 'Unknown action. Supported actions are: cleanup, create_table, create_tmp, delta, overall, save, snapshot';
+    END CASE;
+
+    SET v_digest_table_template = 'CREATE %{TEMPORARY}TABLE %{TABLE_NAME} (
+  `SCHEMA_NAME` varchar(64) DEFAULT NULL,
+  `DIGEST` varchar(32) DEFAULT NULL,
+  `DIGEST_TEXT` longtext,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `FIRST_SEEN` timestamp NULL DEFAULT NULL,
+  `LAST_SEEN` timestamp NULL DEFAULT NULL,
+  INDEX (SCHEMA_NAME, DIGEST)
+) DEFAULT CHARSET=utf8';
+
+    -- Do the action
+    -- The actions snapshot, ... requires a fresh snapshot - create it now
+    IF (v_force_new_snapshot
+           OR in_action = 'snapshot'
+           OR (in_action = 'overall' AND in_table IS NULL)
+           OR (in_action = 'save' AND v_tmp_digests_table_exists <> 'TEMPORARY')
+       ) THEN
+        IF (v_tmp_digests_table_exists = 'TEMPORARY') THEN
+            IF (@sys.debug = 'ON') THEN
+                SELECT 'DROP TEMPORARY TABLE IF EXISTS tmp_digests' AS 'Debug';
+            END IF;
+            DROP TEMPORARY TABLE IF EXISTS tmp_digests;
+        END IF;
+        CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', 'tmp_digests'));
+
+        SET v_sql = CONCAT('INSERT INTO tmp_digests SELECT * FROM ',
+                           IF(in_table IS NULL OR in_action = 'save', 'performance_schema.events_statements_summary_by_digest', v_quoted_table));
+        CALL sys.execute_prepared_stmt(v_sql);
+    END IF;
+
+    -- Go through the remaining actions
+    IF (in_action IN ('create_table', 'create_tmp')) THEN
+        IF (in_action = 'create_table') THEN
+            CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', ''), '%{TABLE_NAME}', v_quoted_table));
+        ELSE
+            CALL sys.execute_prepared_stmt(REPLACE(REPLACE(v_digest_table_template, '%{TEMPORARY}', 'TEMPORARY '), '%{TABLE_NAME}', v_quoted_table));
+        END IF;
+    ELSEIF (in_action = 'save') THEN
+        CALL sys.execute_prepared_stmt(CONCAT('DELETE FROM ', v_quoted_table));
+        CALL sys.execute_prepared_stmt(CONCAT('INSERT INTO ', v_quoted_table, ' SELECT * FROM tmp_digests'));
+    ELSEIF (in_action = 'cleanup') THEN
+        DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests;
+        DROP TEMPORARY TABLE IF EXISTS sys.tmp_digests_delta;
+    ELSEIF (in_action IN ('overall', 'delta')) THEN
+        -- These are almost the same - for delta calculate the delta in tmp_digests_delta and use that instead of tmp_digests.
+        -- And overall allows overriding the table to use.
+        IF (in_action = 'overall') THEN
+            IF (in_table IS NULL) THEN
+                SET v_digests_table = 'tmp_digests';
+            ELSE
+                SET v_digests_table = v_quoted_table;
+            END IF;
+        ELSE
+            SET v_digests_table = 'tmp_digests_delta';
+            DROP TEMPORARY TABLE IF EXISTS tmp_digests_delta;
+            CREATE TEMPORARY TABLE tmp_digests_delta LIKE tmp_digests;
+            SET v_sql = CONCAT('INSERT INTO tmp_digests_delta
+SELECT `d_end`.`SCHEMA_NAME`,
+       `d_end`.`DIGEST`,
+       `d_end`.`DIGEST_TEXT`,
+       `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) AS ''COUNT_STAR'',
+       `d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0) AS ''SUM_TIMER_WAIT'',
+       `d_end`.`MIN_TIMER_WAIT` AS ''MIN_TIMER_WAIT'',
+       IFNULL((`d_end`.`SUM_TIMER_WAIT`-IFNULL(`d_start`.`SUM_TIMER_WAIT`, 0))/NULLIF(`d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0), 0), 0) AS ''AVG_TIMER_WAIT'',
+       `d_end`.`MAX_TIMER_WAIT` AS ''MAX_TIMER_WAIT'',
+       `d_end`.`SUM_LOCK_TIME`-IFNULL(`d_start`.`SUM_LOCK_TIME`, 0) AS ''SUM_LOCK_TIME'',
+       `d_end`.`SUM_ERRORS`-IFNULL(`d_start`.`SUM_ERRORS`, 0) AS ''SUM_ERRORS'',
+       `d_end`.`SUM_WARNINGS`-IFNULL(`d_start`.`SUM_WARNINGS`, 0) AS ''SUM_WARNINGS'',
+       `d_end`.`SUM_ROWS_AFFECTED`-IFNULL(`d_start`.`SUM_ROWS_AFFECTED`, 0) AS ''SUM_ROWS_AFFECTED'',
+       `d_end`.`SUM_ROWS_SENT`-IFNULL(`d_start`.`SUM_ROWS_SENT`, 0) AS ''SUM_ROWS_SENT'',
+       `d_end`.`SUM_ROWS_EXAMINED`-IFNULL(`d_start`.`SUM_ROWS_EXAMINED`, 0) AS ''SUM_ROWS_EXAMINED'',
+       `d_end`.`SUM_CREATED_TMP_DISK_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_DISK_TABLES`, 0) AS ''SUM_CREATED_TMP_DISK_TABLES'',
+       `d_end`.`SUM_CREATED_TMP_TABLES`-IFNULL(`d_start`.`SUM_CREATED_TMP_TABLES`, 0) AS ''SUM_CREATED_TMP_TABLES'',
+       `d_end`.`SUM_SELECT_FULL_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_JOIN`, 0) AS ''SUM_SELECT_FULL_JOIN'',
+       `d_end`.`SUM_SELECT_FULL_RANGE_JOIN`-IFNULL(`d_start`.`SUM_SELECT_FULL_RANGE_JOIN`, 0) AS ''SUM_SELECT_FULL_RANGE_JOIN'',
+       `d_end`.`SUM_SELECT_RANGE`-IFNULL(`d_start`.`SUM_SELECT_RANGE`, 0) AS ''SUM_SELECT_RANGE'',
+       `d_end`.`SUM_SELECT_RANGE_CHECK`-IFNULL(`d_start`.`SUM_SELECT_RANGE_CHECK`, 0) AS ''SUM_SELECT_RANGE_CHECK'',
+       `d_end`.`SUM_SELECT_SCAN`-IFNULL(`d_start`.`SUM_SELECT_SCAN`, 0) AS ''SUM_SELECT_SCAN'',
+       `d_end`.`SUM_SORT_MERGE_PASSES`-IFNULL(`d_start`.`SUM_SORT_MERGE_PASSES`, 0) AS ''SUM_SORT_MERGE_PASSES'',
+       `d_end`.`SUM_SORT_RANGE`-IFNULL(`d_start`.`SUM_SORT_RANGE`, 0) AS ''SUM_SORT_RANGE'',
+       `d_end`.`SUM_SORT_ROWS`-IFNULL(`d_start`.`SUM_SORT_ROWS`, 0) AS ''SUM_SORT_ROWS'',
+       `d_end`.`SUM_SORT_SCAN`-IFNULL(`d_start`.`SUM_SORT_SCAN`, 0) AS ''SUM_SORT_SCAN'',
+       `d_end`.`SUM_NO_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_INDEX_USED`, 0) AS ''SUM_NO_INDEX_USED'',
+       `d_end`.`SUM_NO_GOOD_INDEX_USED`-IFNULL(`d_start`.`SUM_NO_GOOD_INDEX_USED`, 0) AS ''SUM_NO_GOOD_INDEX_USED'',
+       `d_end`.`FIRST_SEEN`,
+       `d_end`.`LAST_SEEN`
+  FROM tmp_digests d_end
+       LEFT OUTER JOIN ', v_quoted_table, ' d_start ON `d_start`.`DIGEST` = `d_end`.`DIGEST`
+                                                    AND (`d_start`.`SCHEMA_NAME` = `d_end`.`SCHEMA_NAME`
+                                                          OR (`d_start`.`SCHEMA_NAME` IS NULL AND `d_end`.`SCHEMA_NAME` IS NULL)
+                                                        )
+ WHERE `d_end`.`COUNT_STAR`-IFNULL(`d_start`.`COUNT_STAR`, 0) > 0');
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('with_runtimes_in_95th_percentile', in_views)) THEN
+            SELECT 'Queries with Runtime in 95th Percentile' AS 'Next Output';
+
+            DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution1;
+            DROP TEMPORARY TABLE IF EXISTS tmp_digest_avg_latency_distribution2;
+            DROP TEMPORARY TABLE IF EXISTS tmp_digest_95th_percentile_by_avg_us;
+
+            CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution1 (
+              cnt bigint unsigned NOT NULL,
+              avg_us decimal(21,0) NOT NULL,
+              PRIMARY KEY (avg_us)
+            ) ENGINE=InnoDB;
+
+            SET v_sql = CONCAT('INSERT INTO tmp_digest_avg_latency_distribution1
+SELECT COUNT(*) cnt,
+       ROUND(avg_timer_wait/1000000) AS avg_us
+  FROM ', v_digests_table, '
+ GROUP BY avg_us');
+            CALL sys.execute_prepared_stmt(v_sql);
+
+            CREATE TEMPORARY TABLE tmp_digest_avg_latency_distribution2 LIKE tmp_digest_avg_latency_distribution1;
+            INSERT INTO tmp_digest_avg_latency_distribution2 SELECT * FROM tmp_digest_avg_latency_distribution1;
+
+            CREATE TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us (
+              avg_us decimal(21,0) NOT NULL,
+              percentile decimal(46,4) NOT NULL,
+              PRIMARY KEY (avg_us)
+            ) ENGINE=InnoDB;
+
+            SET v_sql = CONCAT('INSERT INTO tmp_digest_95th_percentile_by_avg_us
+SELECT s2.avg_us avg_us,
+       IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM ', v_digests_table, '), 0), 0) percentile
+  FROM tmp_digest_avg_latency_distribution1 AS s1
+       JOIN tmp_digest_avg_latency_distribution2 AS s2 ON s1.avg_us <= s2.avg_us
+ GROUP BY s2.avg_us
+HAVING percentile > 0.95
+ ORDER BY percentile
+ LIMIT 1');
+            CALL sys.execute_prepared_stmt(v_sql);
+
+            SET v_sql =
+                REPLACE(
+                    REPLACE(
+                        (SELECT VIEW_DEFINITION
+                           FROM information_schema.VIEWS
+                          WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_runtimes_in_95th_percentile'
+                        ),
+                        '`performance_schema`.`events_statements_summary_by_digest`',
+                        v_digests_table
+                    ),
+                    'sys.x$ps_digest_95th_percentile_by_avg_us',
+                    '`sys`.`x$ps_digest_95th_percentile_by_avg_us`'
+              );
+            CALL sys.execute_prepared_stmt(v_sql);
+
+            DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution1;
+            DROP TEMPORARY TABLE tmp_digest_avg_latency_distribution2;
+            DROP TEMPORARY TABLE tmp_digest_95th_percentile_by_avg_us;
+        END IF;
+
+        IF (FIND_IN_SET('analysis', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Ordered by Total Latency') AS 'Next Output';
+            SET v_sql =
+                REPLACE(
+                    (SELECT VIEW_DEFINITION
+                       FROM information_schema.VIEWS
+                      WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statement_analysis'
+                    ),
+                    '`performance_schema`.`events_statements_summary_by_digest`',
+                    v_digests_table
+                );
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('with_errors_or_warnings', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Errors') AS 'Next Output';
+            SET v_sql =
+                REPLACE(
+                    (SELECT VIEW_DEFINITION
+                       FROM information_schema.VIEWS
+                      WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_errors_or_warnings'
+                    ),
+                    '`performance_schema`.`events_statements_summary_by_digest`',
+                    v_digests_table
+                );
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('with_full_table_scans', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Full Table Scan') AS 'Next Output';
+            SET v_sql =
+                REPLACE(
+                    (SELECT VIEW_DEFINITION
+                       FROM information_schema.VIEWS
+                      WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_full_table_scans'
+                    ),
+                    '`performance_schema`.`events_statements_summary_by_digest`',
+                    v_digests_table
+                );
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('with_sorting', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Sorting') AS 'Next Output';
+            SET v_sql =
+                REPLACE(
+                    (SELECT VIEW_DEFINITION
+                       FROM information_schema.VIEWS
+                      WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_sorting'
+                    ),
+                    '`performance_schema`.`events_statements_summary_by_digest`',
+                    v_digests_table
+                );
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('with_temp_tables', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries with Internal Temporary Tables') AS 'Next Output';
+            SET v_sql =
+                REPLACE(
+                    (SELECT VIEW_DEFINITION
+                       FROM information_schema.VIEWS
+                      WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'statements_with_temp_tables'
+                    ),
+                    '`performance_schema`.`events_statements_summary_by_digest`',
+                    v_digests_table
+                );
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+
+        IF (FIND_IN_SET('custom', in_views)) THEN
+            SELECT CONCAT('Top ', @sys.statement_performance_analyzer.limit, ' Queries Using Custom View') AS 'Next Output';
+
+            IF (@sys.statement_performance_analyzer.view IS NULL) THEN
+                SET @sys.statement_performance_analyzer.view = sys.sys_get_config('statement_performance_analyzer.view', NULL);
+            END IF;
+            IF (@sys.statement_performance_analyzer.view IS NULL) THEN
+                SIGNAL SQLSTATE '45000'
+                   SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable must be set with the view or query to use.';
+            END IF;
+
+            IF (NOT INSTR(@sys.statement_performance_analyzer.view, ' ')) THEN
+                -- No spaces, so can't be a query
+                IF (NOT INSTR(@sys.statement_performance_analyzer.view, '.')) THEN
+                    -- No . in the table name - use current database
+                    -- DATABASE() will be the database of the procedure
+                    SET v_custom_db   = DATABASE(),
+                        v_custom_name = @sys.statement_performance_analyzer.view;
+                ELSE
+                    SET v_custom_db   = SUBSTRING_INDEX(@sys.statement_performance_analyzer.view, '.', 1);
+                    SET v_custom_name = SUBSTRING(@sys.statement_performance_analyzer.view, CHAR_LENGTH(v_custom_db)+2);
+                END IF;
+
+                CALL sys.table_exists(v_custom_db, v_custom_name, v_custom_view_exists);
+                IF (v_custom_view_exists <> 'VIEW') THEN
+                    SIGNAL SQLSTATE '45000'
+                       SET MESSAGE_TEXT = 'The @sys.statement_performance_analyzer.view user variable is set but specified neither an existing view nor a query.';
+                END IF;
+
+                SET v_sql =
+                    REPLACE(
+                        (SELECT VIEW_DEFINITION
+                           FROM information_schema.VIEWS
+                          WHERE TABLE_SCHEMA = v_custom_db AND TABLE_NAME = v_custom_name
+                        ),
+                        '`performance_schema`.`events_statements_summary_by_digest`',
+                        v_digests_table
+                    );
+            ELSE
+                SET v_sql = REPLACE(@sys.statement_performance_analyzer.view, '`performance_schema`.`events_statements_summary_by_digest`', v_digests_table);
+            END IF;
+
+            IF (@sys.statement_performance_analyzer.limit > 0) THEN
+                SET v_sql = CONCAT(v_sql, ' LIMIT ', @sys.statement_performance_analyzer.limit);
+            END IF;
+
+            CALL sys.execute_prepared_stmt(v_sql);
+        END IF;
+    END IF;
+
+    -- Restore INSTRUMENTED for this thread
+    IF (v_this_thread_enabled = 'YES') THEN
+        CALL sys.ps_setup_enable_thread(CONNECTION_ID());
+    END IF;
+
+    IF (@log_bin = 1) THEN
+        SET sql_log_bin = @log_bin;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/procedures/table_exists.sql b/scripts/sys_schema/procedures/table_exists.sql
new file mode 100644
index 000000000000..692ad22035b3
--- /dev/null
+++ b/scripts/sys_schema/procedures/table_exists.sql
@@ -0,0 +1,157 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+-- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DROP PROCEDURE IF EXISTS table_exists;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' PROCEDURE table_exists (
+        IN in_db VARCHAR(64), IN in_table VARCHAR(64),
+        OUT out_exists ENUM('', 'BASE TABLE', 'VIEW', 'TEMPORARY')
+    )
+    COMMENT '
+Description
+-----------
+
+Tests whether the table specified in in_db and in_table exists either as a regular
+table, or as a temporary table. The returned value corresponds to the table that
+will be used, so if there''s both a temporary and a permanent table with the given
+name, then ''TEMPORARY'' will be returned.
+
+Parameters
+-----------
+
+in_db (VARCHAR(64)):
+  The database name to check for the existance of the table in.
+
+in_table (VARCHAR(64)):
+  The name of the table to check the existance of.
+
+out_exists ENUM('''', ''BASE TABLE'', ''VIEW'', ''TEMPORARY''):
+  The return value: whether the table exists. The value is one of:
+    * ''''           - the table does not exist neither as a base table, view, nor temporary table.
+    * ''BASE TABLE'' - the table name exists as a permanent base table table.
+    * ''VIEW''       - the table name exists as a view.
+    * ''TEMPORARY''  - the table name exists as a temporary table.
+
+Example
+--------
+
+mysql> CREATE DATABASE db1;
+Query OK, 1 row affected (0.07 sec)
+
+mysql> use db1;
+Database changed
+mysql> CREATE TABLE t1 (id INT PRIMARY KEY);
+Query OK, 0 rows affected (0.08 sec)
+
+mysql> CREATE TABLE t2 (id INT PRIMARY KEY);
+Query OK, 0 rows affected (0.08 sec)
+
+mysql> CREATE view v_t1 AS SELECT * FROM t1;
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> CREATE TEMPORARY TABLE t1 (id INT PRIMARY KEY);
+Query OK, 0 rows affected (0.00 sec)
+
+mysql> CALL sys.table_exists(''db1'', ''t1'', @exists); SELECT @exists;
+Query OK, 0 rows affected (0.00 sec)
+
++------------+
+| @exists    |
++------------+
+| TEMPORARY  |
++------------+
+1 row in set (0.00 sec)
+
+mysql> CALL sys.table_exists(''db1'', ''t2'', @exists); SELECT @exists;
+Query OK, 0 rows affected (0.00 sec)
+
++------------+
+| @exists    |
++------------+
+| BASE TABLE |
++------------+
+1 row in set (0.01 sec)
+
+mysql> CALL sys.table_exists(''db1'', ''v_t1'', @exists); SELECT @exists;
+Query OK, 0 rows affected (0.00 sec)
+
++---------+
+| @exists |
++---------+
+| VIEW    |
++---------+
+1 row in set (0.00 sec)
+
+mysql> CALL sys.table_exists(''db1'', ''t3'', @exists); SELECT @exists;
+Query OK, 0 rows affected (0.01 sec)
+
++---------+
+| @exists |
++---------+
+|         |
++---------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    NOT DETERMINISTIC
+    CONTAINS SQL
+BEGIN
+    DECLARE v_error BOOLEAN DEFAULT FALSE;
+    DECLARE CONTINUE HANDLER FOR 1050 SET v_error = TRUE;
+    DECLARE CONTINUE HANDLER FOR 1146 SET v_error = TRUE;
+
+    SET out_exists = '';
+
+    -- Verify whether the table name exists as a normal table
+    IF (EXISTS(SELECT 1 FROM information_schema.TABLES WHERE TABLE_SCHEMA = in_db AND TABLE_NAME = in_table)) THEN
+        -- Unfortunately the only way to determine whether there is also a temporary table is to try to create
+        -- a temporary table with the same name. If it succeeds the table didn't exist as a temporary table.
+        SET @sys.tmp.table_exists.SQL = CONCAT('CREATE TEMPORARY TABLE `', in_db, '`.`', in_table, '` (id INT PRIMARY KEY)');
+        PREPARE stmt_create_table FROM @sys.tmp.table_exists.SQL;
+        EXECUTE stmt_create_table;
+        DEALLOCATE PREPARE stmt_create_table;
+        IF (v_error) THEN
+            SET out_exists = 'TEMPORARY';
+        ELSE
+            -- The temporary table was created, i.e. it didn't exist. Remove it again so we don't leave garbage around.
+            SET @sys.tmp.table_exists.SQL = CONCAT('DROP TEMPORARY TABLE `', in_db, '`.`', in_table, '`');
+            PREPARE stmt_drop_table FROM @sys.tmp.table_exists.SQL;
+            EXECUTE stmt_drop_table;
+            DEALLOCATE PREPARE stmt_drop_table;
+            SET out_exists = (SELECT TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = in_db AND TABLE_NAME = in_table);
+        END IF;
+    ELSE
+        -- Check whether a temporary table exists with the same name.
+        -- If it does it's possible to SELECT from the table without causing an error.
+        -- If it does not exist even a PREPARE using the table will fail.
+        SET @sys.tmp.table_exists.SQL = CONCAT('SELECT COUNT(*) FROM `', in_db, '`.`', in_table, '`');
+        PREPARE stmt_select FROM @sys.tmp.table_exists.SQL;
+        IF (NOT v_error) THEN
+            DEALLOCATE PREPARE stmt_select;
+            SET out_exists = 'TEMPORARY';
+        END IF;
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/sys_57.sql b/scripts/sys_schema/sys_57.sql
new file mode 100644
index 000000000000..f9524a384b0d
--- /dev/null
+++ b/scripts/sys_schema/sys_57.sql
@@ -0,0 +1,202 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+SOURCE ./before_setup.sql
+
+SOURCE ./views/version.sql
+
+SOURCE ./tables/sys_config.sql
+SOURCE ./tables/sys_config_data.sql
+
+SOURCE ./triggers/sys_config_insert_set_user.sql
+SOURCE ./triggers/sys_config_update_set_user.sql
+
+SOURCE ./functions/extract_schema_from_file_name.sql
+SOURCE ./functions/extract_table_from_file_name.sql
+SOURCE ./functions/format_bytes.sql
+SOURCE ./functions/format_path.sql
+SOURCE ./functions/format_statement.sql
+SOURCE ./functions/format_time.sql
+SOURCE ./functions/list_add.sql
+SOURCE ./functions/list_drop.sql
+SOURCE ./functions/ps_is_account_enabled.sql
+SOURCE ./functions/ps_is_consumer_enabled.sql
+SOURCE ./functions/ps_is_instrument_default_enabled.sql
+SOURCE ./functions/ps_is_instrument_default_timed.sql
+SOURCE ./functions/ps_is_thread_instrumented.sql
+SOURCE ./functions/ps_thread_id.sql
+SOURCE ./functions/ps_thread_account.sql
+SOURCE ./functions/ps_thread_stack.sql
+SOURCE ./functions/ps_thread_trx_info.sql
+SOURCE ./functions/quote_identifier.sql
+SOURCE ./functions/sys_get_config.sql
+SOURCE ./functions/version_major.sql
+SOURCE ./functions/version_minor.sql
+SOURCE ./functions/version_patch.sql
+
+SOURCE ./views/i_s/innodb_buffer_stats_by_schema.sql
+SOURCE ./views/i_s/x_innodb_buffer_stats_by_schema.sql
+SOURCE ./views/i_s/innodb_buffer_stats_by_table.sql
+SOURCE ./views/i_s/x_innodb_buffer_stats_by_table.sql
+SOURCE ./views/i_s/innodb_lock_waits.sql
+SOURCE ./views/i_s/x_innodb_lock_waits.sql
+SOURCE ./views/i_s/schema_object_overview.sql
+SOURCE ./views/i_s/schema_auto_increment_columns.sql
+SOURCE ./views/i_s/x_schema_flattened_keys.sql
+SOURCE ./views/i_s/schema_redundant_indexes.sql
+
+SOURCE ./views/p_s/ps_check_lost_instrumentation.sql
+
+SOURCE ./views/p_s/latest_file_io.sql
+SOURCE ./views/p_s/x_latest_file_io.sql
+SOURCE ./views/p_s/io_by_thread_by_latency.sql
+SOURCE ./views/p_s/x_io_by_thread_by_latency.sql
+SOURCE ./views/p_s/io_global_by_file_by_bytes.sql
+SOURCE ./views/p_s/x_io_global_by_file_by_bytes.sql
+SOURCE ./views/p_s/io_global_by_file_by_latency.sql
+SOURCE ./views/p_s/x_io_global_by_file_by_latency.sql
+SOURCE ./views/p_s/io_global_by_wait_by_bytes.sql
+SOURCE ./views/p_s/x_io_global_by_wait_by_bytes.sql
+SOURCE ./views/p_s/io_global_by_wait_by_latency.sql
+SOURCE ./views/p_s/x_io_global_by_wait_by_latency.sql
+
+SOURCE ./views/p_s/memory_by_user_by_current_bytes.sql
+SOURCE ./views/p_s/x_memory_by_user_by_current_bytes.sql
+SOURCE ./views/p_s/memory_by_host_by_current_bytes.sql
+SOURCE ./views/p_s/x_memory_by_host_by_current_bytes.sql
+SOURCE ./views/p_s/memory_by_thread_by_current_bytes.sql
+SOURCE ./views/p_s/x_memory_by_thread_by_current_bytes.sql
+SOURCE ./views/p_s/memory_global_by_current_bytes.sql
+SOURCE ./views/p_s/x_memory_global_by_current_bytes.sql
+SOURCE ./views/p_s/memory_global_total.sql
+SOURCE ./views/p_s/x_memory_global_total.sql
+
+SOURCE ./views/p_s/schema_index_statistics.sql
+SOURCE ./views/p_s/x_schema_index_statistics.sql
+SOURCE ./views/p_s/x_ps_schema_table_statistics_io.sql
+SOURCE ./views/p_s/schema_table_statistics.sql
+SOURCE ./views/p_s/x_schema_table_statistics.sql
+SOURCE ./views/p_s/schema_table_statistics_with_buffer.sql
+SOURCE ./views/p_s/x_schema_table_statistics_with_buffer.sql
+SOURCE ./views/p_s/schema_tables_with_full_table_scans.sql
+SOURCE ./views/p_s/x_schema_tables_with_full_table_scans.sql
+SOURCE ./views/p_s/schema_unused_indexes.sql
+SOURCE ./views/p_s/schema_table_lock_waits.sql
+SOURCE ./views/p_s/x_schema_table_lock_waits.sql
+
+SOURCE ./views/p_s/statement_analysis.sql
+SOURCE ./views/p_s/x_statement_analysis.sql
+SOURCE ./views/p_s/statements_with_errors_or_warnings.sql
+SOURCE ./views/p_s/x_statements_with_errors_or_warnings.sql
+SOURCE ./views/p_s/statements_with_full_table_scans.sql
+SOURCE ./views/p_s/x_statements_with_full_table_scans.sql
+SOURCE ./views/p_s/x_ps_digest_avg_latency_distribution.sql
+SOURCE ./views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql
+SOURCE ./views/p_s/statements_with_runtimes_in_95th_percentile.sql
+SOURCE ./views/p_s/x_statements_with_runtimes_in_95th_percentile.sql
+SOURCE ./views/p_s/statements_with_sorting.sql
+SOURCE ./views/p_s/x_statements_with_sorting.sql
+SOURCE ./views/p_s/statements_with_temp_tables.sql
+SOURCE ./views/p_s/x_statements_with_temp_tables.sql
+
+SOURCE ./views/p_s/user_summary_by_file_io_type.sql
+SOURCE ./views/p_s/x_user_summary_by_file_io_type.sql
+SOURCE ./views/p_s/user_summary_by_file_io.sql
+SOURCE ./views/p_s/x_user_summary_by_file_io.sql
+SOURCE ./views/p_s/user_summary_by_statement_type.sql
+SOURCE ./views/p_s/x_user_summary_by_statement_type.sql
+SOURCE ./views/p_s/user_summary_by_statement_latency.sql
+SOURCE ./views/p_s/x_user_summary_by_statement_latency.sql
+SOURCE ./views/p_s/user_summary_by_stages.sql
+SOURCE ./views/p_s/x_user_summary_by_stages.sql
+SOURCE ./views/p_s/user_summary.sql
+SOURCE ./views/p_s/x_user_summary.sql
+
+SOURCE ./views/p_s/host_summary_by_file_io_type.sql
+SOURCE ./views/p_s/x_host_summary_by_file_io_type.sql
+SOURCE ./views/p_s/host_summary_by_file_io.sql
+SOURCE ./views/p_s/x_host_summary_by_file_io.sql
+SOURCE ./views/p_s/host_summary_by_statement_type.sql
+SOURCE ./views/p_s/x_host_summary_by_statement_type.sql
+SOURCE ./views/p_s/host_summary_by_statement_latency.sql
+SOURCE ./views/p_s/x_host_summary_by_statement_latency.sql
+SOURCE ./views/p_s/host_summary_by_stages.sql
+SOURCE ./views/p_s/x_host_summary_by_stages.sql
+SOURCE ./views/p_s/host_summary.sql
+SOURCE ./views/p_s/x_host_summary.sql
+
+SOURCE ./views/p_s/wait_classes_global_by_avg_latency.sql
+SOURCE ./views/p_s/x_wait_classes_global_by_avg_latency.sql
+SOURCE ./views/p_s/wait_classes_global_by_latency.sql
+SOURCE ./views/p_s/x_wait_classes_global_by_latency.sql
+SOURCE ./views/p_s/waits_by_user_by_latency.sql
+SOURCE ./views/p_s/x_waits_by_user_by_latency.sql
+SOURCE ./views/p_s/waits_by_host_by_latency.sql
+SOURCE ./views/p_s/x_waits_by_host_by_latency.sql
+SOURCE ./views/p_s/waits_global_by_latency.sql
+SOURCE ./views/p_s/x_waits_global_by_latency.sql
+
+SOURCE ./views/p_s/metrics.sql
+
+SOURCE ./views/p_s/processlist.sql
+SOURCE ./views/p_s/x_processlist.sql
+
+SOURCE ./views/p_s/sessions.sql
+SOURCE ./views/p_s/x_sessions.sql
+SOURCE ./views/p_s/session_ssl_status.sql
+
+SOURCE ./procedures/create_synonym_db.sql
+SOURCE ./procedures/execute_prepared_stmt.sql
+
+SOURCE ./procedures/diagnostics.sql
+
+SOURCE ./procedures/ps_statement_avg_latency_histogram.sql
+SOURCE ./procedures/ps_trace_statement_digest.sql
+SOURCE ./procedures/ps_trace_thread.sql
+
+SOURCE ./procedures/ps_setup_disable_background_threads.sql
+SOURCE ./procedures/ps_setup_disable_consumer.sql
+SOURCE ./procedures/ps_setup_disable_instrument.sql
+SOURCE ./procedures/ps_setup_disable_thread.sql
+
+SOURCE ./procedures/ps_setup_enable_background_threads.sql
+SOURCE ./procedures/ps_setup_enable_consumer.sql
+SOURCE ./procedures/ps_setup_enable_instrument.sql
+SOURCE ./procedures/ps_setup_enable_thread.sql
+
+SOURCE ./procedures/ps_setup_reload_saved.sql
+SOURCE ./procedures/ps_setup_reset_to_default_before.sql
+SOURCE ./procedures/ps_setup_reset_to_default.sql
+SOURCE ./procedures/ps_setup_reset_to_default_after.sql
+SOURCE ./procedures/ps_setup_save.sql
+SOURCE ./procedures/ps_setup_show_disabled.sql
+SOURCE ./procedures/ps_setup_show_disabled_consumers.sql
+SOURCE ./procedures/ps_setup_show_disabled_instruments.sql
+SOURCE ./procedures/ps_setup_show_enabled.sql
+SOURCE ./procedures/ps_setup_show_enabled_consumers.sql
+SOURCE ./procedures/ps_setup_show_enabled_instruments.sql
+SOURCE ./procedures/ps_truncate_all_tables.sql
+
+SOURCE ./procedures/statement_performance_analyzer.sql
+SOURCE ./procedures/table_exists.sql
+
+SOURCE ./after_setup.sql
diff --git a/scripts/sys_schema/sys_57.txt b/scripts/sys_schema/sys_57.txt
new file mode 100644
index 000000000000..a29ee3885d18
--- /dev/null
+++ b/scripts/sys_schema/sys_57.txt
@@ -0,0 +1,179 @@
+#  Copyright (c) 2019, 2023, Oracle and/or its affiliates.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License, version 2.0,
+#  as published by the Free Software Foundation.
+#
+#  This program is also distributed with certain software (including
+#  but not limited to OpenSSL) that is licensed under separate terms,
+#  as designated in a particular file or component or in included license
+#  documentation.  The authors of MySQL hereby grant you an additional
+#  permission to link the program and your derivative works with the
+#  separately licensed software that they have included with MySQL.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License, version 2.0, for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+./init_priv.sql
+./before_setup.sql
+./views/version.sql
+./tables/sys_config.sql
+./tables/sys_config_data.sql
+./triggers/sys_config_insert_set_user.sql
+./triggers/sys_config_update_set_user.sql
+./functions/extract_schema_from_file_name.sql
+./functions/extract_table_from_file_name.sql
+./functions/format_bytes.sql
+./functions/format_path.sql
+./functions/format_statement.sql
+./functions/format_time.sql
+./functions/list_add.sql
+./functions/list_drop.sql
+./functions/ps_is_account_enabled.sql
+./functions/ps_is_consumer_enabled.sql
+./functions/ps_is_instrument_default_enabled.sql
+./functions/ps_is_instrument_default_timed.sql
+./functions/ps_is_thread_instrumented.sql
+./functions/ps_thread_id.sql
+./functions/ps_thread_account.sql
+./functions/ps_thread_stack.sql
+./functions/ps_thread_trx_info.sql
+./functions/quote_identifier.sql
+./functions/sys_get_config.sql
+./functions/version_major.sql
+./functions/version_minor.sql
+./functions/version_patch.sql
+./views/i_s/innodb_buffer_stats_by_schema.sql
+./views/i_s/x_innodb_buffer_stats_by_schema.sql
+./views/i_s/innodb_buffer_stats_by_table.sql
+./views/i_s/x_innodb_buffer_stats_by_table.sql
+./views/i_s/innodb_lock_waits.sql
+./views/i_s/x_innodb_lock_waits.sql
+./views/i_s/schema_object_overview.sql
+./views/i_s/schema_auto_increment_columns.sql
+./views/i_s/x_schema_flattened_keys.sql
+./views/i_s/schema_redundant_indexes.sql
+./views/p_s/ps_check_lost_instrumentation.sql
+./views/p_s/latest_file_io.sql
+./views/p_s/x_latest_file_io.sql
+./views/p_s/io_by_thread_by_latency.sql
+./views/p_s/x_io_by_thread_by_latency.sql
+./views/p_s/io_global_by_file_by_bytes.sql
+./views/p_s/x_io_global_by_file_by_bytes.sql
+./views/p_s/io_global_by_file_by_latency.sql
+./views/p_s/x_io_global_by_file_by_latency.sql
+./views/p_s/io_global_by_wait_by_bytes.sql
+./views/p_s/x_io_global_by_wait_by_bytes.sql
+./views/p_s/io_global_by_wait_by_latency.sql
+./views/p_s/x_io_global_by_wait_by_latency.sql
+./views/p_s/memory_by_user_by_current_bytes.sql
+./views/p_s/x_memory_by_user_by_current_bytes.sql
+./views/p_s/memory_by_host_by_current_bytes.sql
+./views/p_s/x_memory_by_host_by_current_bytes.sql
+./views/p_s/memory_by_thread_by_current_bytes.sql
+./views/p_s/x_memory_by_thread_by_current_bytes.sql
+./views/p_s/memory_global_by_current_bytes.sql
+./views/p_s/x_memory_global_by_current_bytes.sql
+./views/p_s/memory_global_total.sql
+./views/p_s/x_memory_global_total.sql
+./views/p_s/schema_index_statistics.sql
+./views/p_s/x_schema_index_statistics.sql
+./views/p_s/x_ps_schema_table_statistics_io.sql
+./views/p_s/schema_table_statistics.sql
+./views/p_s/x_schema_table_statistics.sql
+./views/p_s/schema_table_statistics_with_buffer.sql
+./views/p_s/x_schema_table_statistics_with_buffer.sql
+./views/p_s/schema_tables_with_full_table_scans.sql
+./views/p_s/x_schema_tables_with_full_table_scans.sql
+./views/p_s/schema_unused_indexes.sql
+./views/p_s/schema_table_lock_waits.sql
+./views/p_s/x_schema_table_lock_waits.sql
+./views/p_s/statement_analysis.sql
+./views/p_s/x_statement_analysis.sql
+./views/p_s/statements_with_errors_or_warnings.sql
+./views/p_s/x_statements_with_errors_or_warnings.sql
+./views/p_s/statements_with_full_table_scans.sql
+./views/p_s/x_statements_with_full_table_scans.sql
+./views/p_s/x_ps_digest_avg_latency_distribution.sql
+./views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql
+./views/p_s/statements_with_runtimes_in_95th_percentile.sql
+./views/p_s/x_statements_with_runtimes_in_95th_percentile.sql
+./views/p_s/statements_with_sorting.sql
+./views/p_s/x_statements_with_sorting.sql
+./views/p_s/statements_with_temp_tables.sql
+./views/p_s/x_statements_with_temp_tables.sql
+./views/p_s/user_summary_by_file_io_type.sql
+./views/p_s/x_user_summary_by_file_io_type.sql
+./views/p_s/user_summary_by_file_io.sql
+./views/p_s/x_user_summary_by_file_io.sql
+./views/p_s/user_summary_by_statement_type.sql
+./views/p_s/x_user_summary_by_statement_type.sql
+./views/p_s/user_summary_by_statement_latency.sql
+./views/p_s/x_user_summary_by_statement_latency.sql
+./views/p_s/user_summary_by_stages.sql
+./views/p_s/x_user_summary_by_stages.sql
+./views/p_s/user_summary.sql
+./views/p_s/x_user_summary.sql
+./views/p_s/host_summary_by_file_io_type.sql
+./views/p_s/x_host_summary_by_file_io_type.sql
+./views/p_s/host_summary_by_file_io.sql
+./views/p_s/x_host_summary_by_file_io.sql
+./views/p_s/host_summary_by_statement_type.sql
+./views/p_s/x_host_summary_by_statement_type.sql
+./views/p_s/host_summary_by_statement_latency.sql
+./views/p_s/x_host_summary_by_statement_latency.sql
+./views/p_s/host_summary_by_stages.sql
+./views/p_s/x_host_summary_by_stages.sql
+./views/p_s/host_summary.sql
+./views/p_s/x_host_summary.sql
+./views/p_s/wait_classes_global_by_avg_latency.sql
+./views/p_s/x_wait_classes_global_by_avg_latency.sql
+./views/p_s/wait_classes_global_by_latency.sql
+./views/p_s/x_wait_classes_global_by_latency.sql
+./views/p_s/waits_by_user_by_latency.sql
+./views/p_s/x_waits_by_user_by_latency.sql
+./views/p_s/waits_by_host_by_latency.sql
+./views/p_s/x_waits_by_host_by_latency.sql
+./views/p_s/waits_global_by_latency.sql
+./views/p_s/x_waits_global_by_latency.sql
+./views/p_s/metrics.sql
+./views/p_s/processlist.sql
+./views/p_s/x_processlist.sql
+./views/p_s/sessions.sql
+./views/p_s/x_sessions.sql
+./views/p_s/session_ssl_status.sql
+./procedures/create_synonym_db.sql
+./procedures/execute_prepared_stmt.sql
+./procedures/diagnostics.sql
+./procedures/ps_statement_avg_latency_histogram.sql
+./procedures/ps_trace_statement_digest.sql
+./procedures/ps_trace_thread.sql
+./procedures/ps_setup_disable_background_threads.sql
+./procedures/ps_setup_disable_consumer.sql
+./procedures/ps_setup_disable_instrument.sql
+./procedures/ps_setup_disable_thread.sql
+./procedures/ps_setup_enable_background_threads.sql
+./procedures/ps_setup_enable_consumer.sql
+./procedures/ps_setup_enable_instrument.sql
+./procedures/ps_setup_enable_thread.sql
+./procedures/ps_setup_reload_saved.sql
+./procedures/ps_setup_reset_to_default_before.sql
+./procedures/ps_setup_reset_to_default.sql
+./procedures/ps_setup_reset_to_default_after.sql
+./procedures/ps_setup_save.sql
+./procedures/ps_setup_show_disabled.sql
+./procedures/ps_setup_show_disabled_consumers.sql
+./procedures/ps_setup_show_disabled_instruments.sql
+./procedures/ps_setup_show_enabled.sql
+./procedures/ps_setup_show_enabled_consumers.sql
+./procedures/ps_setup_show_enabled_instruments.sql
+./procedures/ps_truncate_all_tables.sql
+./procedures/statement_performance_analyzer.sql
+./procedures/table_exists.sql
+./after_setup.sql
diff --git a/scripts/sys_schema/tables/sys_config.sql b/scripts/sys_schema/tables/sys_config.sql
new file mode 100644
index 000000000000..255f23e53250
--- /dev/null
+++ b/scripts/sys_schema/tables/sys_config.sql
@@ -0,0 +1,34 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- Table: sys_config
+--
+-- Stores configuration options for sys objects
+--
+
+CREATE TABLE IF NOT EXISTS sys_config (
+    variable VARCHAR(128) PRIMARY KEY,
+    value VARCHAR(128),
+    set_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    set_by VARCHAR(128)
+) ENGINE = InnoDB;
diff --git a/scripts/sys_schema/tables/sys_config_alter.sql b/scripts/sys_schema/tables/sys_config_alter.sql
new file mode 100644
index 000000000000..af26e8949d3d
--- /dev/null
+++ b/scripts/sys_schema/tables/sys_config_alter.sql
@@ -0,0 +1,27 @@
+-- Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- Alters the sys_config table for upgrades
+--
+
+ALTER TABLE sys_config CHARACTER SET utf8mb4;
diff --git a/scripts/sys_schema/tables/sys_config_data.sql b/scripts/sys_schema/tables/sys_config_data.sql
new file mode 100644
index 000000000000..96f6e5e6f393
--- /dev/null
+++ b/scripts/sys_schema/tables/sys_config_data.sql
@@ -0,0 +1,31 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+-- NOTE: This needs to be replicated within the sys_config_clean.inc file
+
+INSERT IGNORE INTO sys.sys_config (variable, value) VALUES
+    ('statement_truncate_len', 64),
+    ('statement_performance_analyzer.limit', 100),
+    ('statement_performance_analyzer.view', NULL),
+    ('diagnostics.allow_i_s_tables', 'OFF'),
+    ('diagnostics.include_raw', 'OFF'),
+    ('ps_thread_trx_info.max_length', 65535);
diff --git a/scripts/sys_schema/triggers/sys_config_insert_set_user.sql b/scripts/sys_schema/triggers/sys_config_insert_set_user.sql
new file mode 100644
index 000000000000..3102f3acf637
--- /dev/null
+++ b/scripts/sys_schema/triggers/sys_config_insert_set_user.sql
@@ -0,0 +1,42 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- Trigger: sys_config_insert_set_user
+--
+-- Sets the user that inserts configuration
+--
+--
+
+DROP TRIGGER IF EXISTS sys_config_insert_set_user;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' TRIGGER sys_config_insert_set_user BEFORE INSERT on sys_config
+    FOR EACH ROW
+BEGIN
+    IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
+        SET NEW.set_by = USER();
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/triggers/sys_config_update_set_user.sql b/scripts/sys_schema/triggers/sys_config_update_set_user.sql
new file mode 100644
index 000000000000..11daa3b27764
--- /dev/null
+++ b/scripts/sys_schema/triggers/sys_config_update_set_user.sql
@@ -0,0 +1,43 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- Trigger: sys_config_update_set_user
+--
+-- Sets the user that updates configuration
+--
+--
+
+
+DROP TRIGGER IF EXISTS sys_config_update_set_user;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' TRIGGER sys_config_update_set_user BEFORE UPDATE on sys_config
+    FOR EACH ROW
+BEGIN
+    IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
+        SET NEW.set_by = USER();
+    END IF;
+END$$
+
+DELIMITER ;
diff --git a/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_schema.sql b/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_schema.sql
new file mode 100644
index 000000000000..81d16a8db951
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_schema.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: innodb_buffer_stats_by_schema
+-- 
+-- Summarizes the output of the INFORMATION_SCHEMA.INNODB_BUFFER_PAGE 
+-- table, aggregating by schema
+--
+-- 
+-- mysql> select * from innodb_buffer_stats_by_schema;
+-- +--------------------------+------------+------------+-------+--------------+-----------+-------------+
+-- | object_schema            | allocated  | data       | pages | pages_hashed | pages_old | rows_cached |
+-- +--------------------------+------------+------------+-------+--------------+-----------+-------------+
+-- | mem30_trunk__instruments | 1.69 MiB   | 510.03 KiB |   108 |          108 |       108 |        3885 |
+-- | InnoDB System            | 688.00 KiB | 351.62 KiB |    43 |           43 |        43 |         862 |
+-- | mem30_trunk__events      | 80.00 KiB  | 21.61 KiB  |     5 |            5 |         5 |         229 |
+-- +--------------------------+------------+------------+-------+--------------+-----------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW innodb_buffer_stats_by_schema (
+  object_schema,
+  allocated,
+  data,
+  pages,
+  pages_hashed,
+  pages_old,
+  rows_cached
+) AS
+SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', 1), '`', '')) AS object_schema,
+       sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,
+       sys.format_bytes(SUM(ibp.data_size)) AS data,
+       COUNT(ibp.page_number) AS pages,
+       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
+  FROM information_schema.innodb_buffer_page ibp 
+ WHERE table_name IS NOT NULL
+ GROUP BY object_schema
+ ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
diff --git a/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_table.sql b/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_table.sql
new file mode 100644
index 000000000000..a01ef34fbdb3
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/innodb_buffer_stats_by_table.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: innodb_buffer_stats_by_table
+-- 
+-- Summarizes the output of the INFORMATION_SCHEMA.INNODB_BUFFER_PAGE 
+-- table, aggregating by schema and table name
+--
+-- mysql> select * from innodb_buffer_stats_by_table;
+-- +--------------------------+------------------------------------+------------+-----------+-------+--------------+-----------+-------------+
+-- | object_schema            | object_name                        | allocated  | data      | pages | pages_hashed | pages_old | rows_cached |
+-- +--------------------------+------------------------------------+------------+-----------+-------+--------------+-----------+-------------+
+-- | InnoDB System            | SYS_COLUMNS                        | 128.00 KiB | 98.97 KiB |     8 |            8 |         8 |        1532 |
+-- | InnoDB System            | SYS_FOREIGN                        | 128.00 KiB | 55.48 KiB |     8 |            8 |         8 |         172 |
+-- | InnoDB System            | SYS_TABLES                         | 128.00 KiB | 56.18 KiB |     8 |            8 |         8 |         365 |
+-- | InnoDB System            | SYS_INDEXES                        | 112.00 KiB | 76.16 KiB |     7 |            7 |         7 |        1046 |
+-- | mem30_trunk__instruments | agentlatencytime                   | 96.00 KiB  | 28.83 KiB |     6 |            6 |         6 |         252 |
+-- | mem30_trunk__instruments | binlogspaceusagedata               | 96.00 KiB  | 22.54 KiB |     6 |            6 |         6 |         196 |
+-- | mem30_trunk__instruments | connectionsdata                    | 96.00 KiB  | 36.68 KiB |     6 |            6 |         6 |         276 |
+-- ...
+-- +--------------------------+------------------------------------+------------+-----------+-------+--------------+-----------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW innodb_buffer_stats_by_table (
+  object_schema,
+  object_name,
+  allocated,
+  data,
+  pages,
+  pages_hashed,
+  pages_old,
+  rows_cached
+) AS
+SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', 1), '`', '')) AS object_schema,
+       REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', -1), '`', '') AS object_name,
+       sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,
+       sys.format_bytes(SUM(ibp.data_size)) AS data,
+       COUNT(ibp.page_number) AS pages,
+       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
+  FROM information_schema.innodb_buffer_page ibp 
+ WHERE table_name IS NOT NULL
+ GROUP BY object_schema, object_name
+ ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
diff --git a/scripts/sys_schema/views/i_s/innodb_lock_waits.sql b/scripts/sys_schema/views/i_s/innodb_lock_waits.sql
new file mode 100644
index 000000000000..c6a6bc29b6a8
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/innodb_lock_waits.sql
@@ -0,0 +1,125 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: innodb_lock_waits
+--
+-- Give a snapshot of which InnoDB locks transactions are waiting for.
+-- The lock waits are ordered by the age of the lock descending.
+--
+-- Versions: 5.1+ (5.1 requires InnoDB Plugin with I_S tables)
+--
+-- mysql> SELECT * FROM x$innodb_lock_waits\G
+-- *************************** 1. row ***************************
+--                 wait_started: 2014-11-11 13:39:20
+--                     wait_age: 00:00:07
+--                wait_age_secs: 7
+--                 locked_table: `db1`.`t1`
+--                 locked_index: PRIMARY
+--                  locked_type: RECORD
+--               waiting_trx_id: 867158
+--          waiting_trx_started: 2014-11-11 13:39:15
+--              waiting_trx_age: 00:00:12
+--      waiting_trx_rows_locked: 0
+--    waiting_trx_rows_modified: 0
+--                  waiting_pid: 3
+--                waiting_query: UPDATE t1 SET val = val + 1 WHERE id = 2
+--              waiting_lock_id: 867158:2363:3:3
+--            waiting_lock_mode: X
+--              blocking_trx_id: 867157
+--                 blocking_pid: 4
+--               blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
+--             blocking_lock_id: 867157:2363:3:3
+--           blocking_lock_mode: X
+--         blocking_trx_started: 2014-11-11 13:39:11
+--             blocking_trx_age: 00:00:16
+--     blocking_trx_rows_locked: 1
+--   blocking_trx_rows_modified: 1
+--      sql_kill_blocking_query: KILL QUERY 4
+-- sql_kill_blocking_connection: KILL 4
+-- 1 row in set (0.01 sec)
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW innodb_lock_waits (
+  wait_started,
+  wait_age,
+  wait_age_secs,
+  locked_table,
+  locked_index,
+  locked_type,
+  waiting_trx_id,
+  waiting_trx_started,
+  waiting_trx_age,
+  waiting_trx_rows_locked,
+  waiting_trx_rows_modified,
+  waiting_pid,
+  waiting_query,
+  waiting_lock_id,
+  waiting_lock_mode,
+  blocking_trx_id,
+  blocking_pid,
+  blocking_query,
+  blocking_lock_id,
+  blocking_lock_mode,
+  blocking_trx_started,
+  blocking_trx_age,
+  blocking_trx_rows_locked,
+  blocking_trx_rows_modified,
+  sql_kill_blocking_query,
+  sql_kill_blocking_connection
+) AS
+SELECT r.trx_wait_started AS wait_started,
+       TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,
+       TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS wait_age_secs,
+       rl.lock_table AS locked_table,
+       rl.lock_index AS locked_index,
+       rl.lock_type AS locked_type,
+       r.trx_id AS waiting_trx_id,
+       r.trx_started as waiting_trx_started,
+       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,
+       r.trx_rows_locked AS waiting_trx_rows_locked,
+       r.trx_rows_modified AS waiting_trx_rows_modified,
+       r.trx_mysql_thread_id AS waiting_pid,
+       sys.format_statement(r.trx_query) AS waiting_query,
+       rl.lock_id AS waiting_lock_id,
+       rl.lock_mode AS waiting_lock_mode,
+       b.trx_id AS blocking_trx_id,
+       b.trx_mysql_thread_id AS blocking_pid,
+       sys.format_statement(b.trx_query) AS blocking_query,
+       bl.lock_id AS blocking_lock_id,
+       bl.lock_mode AS blocking_lock_mode,
+       b.trx_started AS blocking_trx_started,
+       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,
+       b.trx_rows_locked AS blocking_trx_rows_locked,
+       b.trx_rows_modified AS blocking_trx_rows_modified,
+       CONCAT('KILL QUERY ', b.trx_mysql_thread_id) AS sql_kill_blocking_query,
+       CONCAT('KILL ', b.trx_mysql_thread_id) AS sql_kill_blocking_connection
+  FROM information_schema.innodb_lock_waits w
+       INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id
+       INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id
+       INNER JOIN information_schema.innodb_locks bl ON bl.lock_id = w.blocking_lock_id
+       INNER JOIN information_schema.innodb_locks rl ON rl.lock_id = w.requested_lock_id
+ ORDER BY r.trx_wait_started;
diff --git a/scripts/sys_schema/views/i_s/schema_auto_increment_columns.sql b/scripts/sys_schema/views/i_s/schema_auto_increment_columns.sql
new file mode 100644
index 000000000000..e13f63284e21
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/schema_auto_increment_columns.sql
@@ -0,0 +1,87 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: schema_auto_increment_columns
+--
+-- Present current auto_increment usage/capacity in all tables.
+--
+-- mysql> select * from schema_auto_increment_columns limit 5;
+-- +-------------------+-------------------+-------------+-----------+-------------+-----------+-------------+---------------------+----------------+----------------------+
+-- | table_schema      | table_name        | column_name | data_type | column_type | is_signed | is_unsigned | max_value           | auto_increment | auto_increment_ratio |
+-- +-------------------+-------------------+-------------+-----------+-------------+-----------+-------------+---------------------+----------------+----------------------+
+-- | test              | t1                | i           | tinyint   | tinyint(4)  |         1 |           0 |                 127 |             34 |               0.2677 |
+-- | mem__advisor_text | template_meta     | hib_id      | int       | int(11)     |         1 |           0 |          2147483647 |            516 |               0.0000 |
+-- | mem__advisors     | advisor_schedules | schedule_id | int       | int(11)     |         1 |           0 |          2147483647 |            249 |               0.0000 |
+-- | mem__advisors     | app_identity_path | hib_id      | int       | int(11)     |         1 |           0 |          2147483647 |            251 |               0.0000 |
+-- | mem__bean_config  | plists            | id          | bigint    | bigint(20)  |         1 |           0 | 9223372036854775807 |              1 |               0.0000 |
+-- +-------------------+-------------------+-------------+-----------+-------------+-----------+-------------+---------------------+----------------+----------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW schema_auto_increment_columns (
+  table_schema,
+  table_name,
+  column_name,
+  data_type,
+  column_type,
+  is_signed,
+  is_unsigned,
+  max_value,
+  auto_increment,
+  auto_increment_ratio
+) AS
+SELECT TABLE_SCHEMA,
+       TABLE_NAME,
+       COLUMN_NAME,
+       DATA_TYPE,
+       COLUMN_TYPE,
+       (LOCATE('unsigned', COLUMN_TYPE) = 0) AS is_signed,
+       (LOCATE('unsigned', COLUMN_TYPE) > 0) AS is_unsigned,
+       (
+          CASE DATA_TYPE
+            WHEN 'tinyint' THEN 255
+            WHEN 'smallint' THEN 65535
+            WHEN 'mediumint' THEN 16777215
+            WHEN 'int' THEN 4294967295
+            WHEN 'bigint' THEN 18446744073709551615
+          END >> IF(LOCATE('unsigned', COLUMN_TYPE) > 0, 0, 1)
+       ) AS max_value,
+       AUTO_INCREMENT,
+       AUTO_INCREMENT / (
+         CASE DATA_TYPE
+           WHEN 'tinyint' THEN 255
+           WHEN 'smallint' THEN 65535
+           WHEN 'mediumint' THEN 16777215
+           WHEN 'int' THEN 4294967295
+           WHEN 'bigint' THEN 18446744073709551615
+         END >> IF(LOCATE('unsigned', COLUMN_TYPE) > 0, 0, 1)
+       ) AS auto_increment_ratio
+  FROM INFORMATION_SCHEMA.COLUMNS
+ INNER JOIN INFORMATION_SCHEMA.TABLES USING (TABLE_SCHEMA, TABLE_NAME)
+ WHERE TABLE_SCHEMA NOT IN ('mysql', 'sys', 'INFORMATION_SCHEMA', 'performance_schema')
+   AND TABLE_TYPE='BASE TABLE'
+   AND EXTRA='auto_increment'
+ ORDER BY auto_increment_ratio DESC, max_value;
diff --git a/scripts/sys_schema/views/i_s/schema_object_overview.sql b/scripts/sys_schema/views/i_s/schema_object_overview.sql
new file mode 100644
index 000000000000..e2d385d60f35
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/schema_object_overview.sql
@@ -0,0 +1,65 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: schema_object_overview
+-- 
+-- Shows an overview of the types of objects within each schema
+--
+-- Note: On instances with a large number of objects, this could take
+--       some time to execute, and is not recommended.
+--
+-- mysql> select * from schema_object_overview;
+-- +---------------------------------+---------------+-------+
+-- | db                              | object_type   | count |
+-- +---------------------------------+---------------+-------+
+-- | information_schema              | SYSTEM VIEW   |    59 |
+-- | mem30_test__instruments         | BASE TABLE    |     1 |
+-- | mem30_test__instruments         | INDEX (BTREE) |     2 |
+-- | mem30_test__test                | BASE TABLE    |     9 |
+-- | mem30_test__test                | INDEX (BTREE) |    19 |
+-- ...
+-- | sys                             | FUNCTION      |     8 |
+-- | sys                             | PROCEDURE     |    16 |
+-- | sys                             | VIEW          |    59 |
+-- +---------------------------------+---------------+-------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_object_overview (
+  db,
+  object_type,
+  count
+) AS
+SELECT ROUTINE_SCHEMA AS db, ROUTINE_TYPE AS object_type, COUNT(*) AS count FROM information_schema.routines GROUP BY ROUTINE_SCHEMA, ROUTINE_TYPE
+ UNION 
+SELECT TABLE_SCHEMA, TABLE_TYPE, COUNT(*) FROM information_schema.tables GROUP BY TABLE_SCHEMA, TABLE_TYPE
+ UNION
+SELECT TABLE_SCHEMA, CONCAT('INDEX (', INDEX_TYPE, ')'), COUNT(*) FROM information_schema.statistics GROUP BY TABLE_SCHEMA, INDEX_TYPE
+ UNION
+SELECT TRIGGER_SCHEMA, 'TRIGGER', COUNT(*) FROM information_schema.triggers GROUP BY TRIGGER_SCHEMA
+ UNION
+SELECT EVENT_SCHEMA, 'EVENT', COUNT(*) FROM information_schema.events GROUP BY EVENT_SCHEMA
+ORDER BY DB, OBJECT_TYPE;
diff --git a/scripts/sys_schema/views/i_s/schema_redundant_indexes.sql b/scripts/sys_schema/views/i_s/schema_redundant_indexes.sql
new file mode 100644
index 000000000000..903c54d895d9
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/schema_redundant_indexes.sql
@@ -0,0 +1,114 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: schema_redundant_keys
+--
+-- Shows indexes which are made redundant (or duplicate) by other (dominant) keys.
+--
+-- mysql> select * from sys.schema_redundant_indexes\G
+-- *************************** 1. row ***************************
+--               table_schema: test
+--                 table_name: rkey
+--       redundant_index_name: j
+--    redundant_index_columns: j
+-- redundant_index_non_unique: 1
+--        dominant_index_name: j_2
+--     dominant_index_columns: j,k
+--  dominant_index_non_unique: 1
+--             subpart_exists: 0
+--             sql_drop_index: ALTER TABLE `test`.`rkey` DROP INDEX `j`
+-- 1 row in set (0.20 sec)
+-- 
+-- mysql> SHOW CREATE TABLE test.rkey\G
+-- *************************** 1. row ***************************
+--        Table: rkey
+-- Create Table: CREATE TABLE `rkey` (
+--   `i` int(11) NOT NULL,
+--   `j` int(11) DEFAULT NULL,
+--   `k` int(11) DEFAULT NULL,
+--   PRIMARY KEY (`i`),
+--   KEY `j` (`j`),
+--   KEY `j_2` (`j`,`k`)
+-- ) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-- 1 row in set (0.06 sec)
+-- 
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW schema_redundant_indexes (
+  table_schema,
+  table_name,
+  redundant_index_name,
+  redundant_index_columns,
+  redundant_index_non_unique,
+  dominant_index_name,
+  dominant_index_columns,
+  dominant_index_non_unique,
+  subpart_exists,
+  sql_drop_index
+) AS
+  SELECT
+    redundant_keys.table_schema,
+    redundant_keys.table_name,
+    redundant_keys.index_name AS redundant_index_name,
+    redundant_keys.index_columns AS redundant_index_columns,
+    redundant_keys.non_unique AS redundant_index_non_unique,
+    dominant_keys.index_name AS dominant_index_name,
+    dominant_keys.index_columns AS dominant_index_columns,
+    dominant_keys.non_unique AS dominant_index_non_unique,
+    IF(redundant_keys.subpart_exists OR dominant_keys.subpart_exists, 1 ,0) AS subpart_exists,
+    CONCAT(
+      'ALTER TABLE `', redundant_keys.table_schema, '`.`', redundant_keys.table_name, '` DROP INDEX `', redundant_keys.index_name, '`'
+      ) AS sql_drop_index
+  FROM
+    x$schema_flattened_keys AS redundant_keys
+    INNER JOIN x$schema_flattened_keys AS dominant_keys
+    USING (TABLE_SCHEMA, TABLE_NAME)
+  WHERE
+    redundant_keys.index_name != dominant_keys.index_name
+    AND (
+      ( 
+        /* Identical columns */
+        (redundant_keys.index_columns = dominant_keys.index_columns)
+        AND (
+          (redundant_keys.non_unique > dominant_keys.non_unique)
+          OR (redundant_keys.non_unique = dominant_keys.non_unique 
+          	AND IF(redundant_keys.index_name='PRIMARY', '', redundant_keys.index_name) > IF(dominant_keys.index_name='PRIMARY', '', dominant_keys.index_name)
+          )
+        )
+      )
+      OR
+      ( 
+        /* Non-unique prefix columns */
+        LOCATE(CONCAT(redundant_keys.index_columns, ','), dominant_keys.index_columns) = 1
+        AND redundant_keys.non_unique = 1
+      )
+      OR
+      ( 
+        /* Unique prefix columns */
+        LOCATE(CONCAT(dominant_keys.index_columns, ','), redundant_keys.index_columns) = 1
+        AND dominant_keys.non_unique = 0
+      )
+    );
diff --git a/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_schema.sql b/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_schema.sql
new file mode 100644
index 000000000000..0355119bd99c
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_schema.sql
@@ -0,0 +1,62 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$innodb_buffer_stats_by_schema
+-- 
+-- Summarizes the output of the INFORMATION_SCHEMA.INNODB_BUFFER_PAGE 
+-- table, aggregating by schema
+--
+-- mysql> select * from x$innodb_buffer_stats_by_schema;
+-- +--------------------------+-----------+--------+-------+--------------+-----------+-------------+
+-- | object_schema            | allocated | data   | pages | pages_hashed | pages_old | rows_cached |
+-- +--------------------------+-----------+--------+-------+--------------+-----------+-------------+
+-- | mem30_trunk__instruments |   1769472 | 522272 |   108 |          108 |       108 |        3885 |
+-- | InnoDB System            |    704512 | 360054 |    43 |           43 |        43 |         862 |
+-- | mem30_trunk__events      |     81920 |  22125 |     5 |            5 |         5 |         229 |
+-- +--------------------------+-----------+--------+-------+--------------+-----------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$innodb_buffer_stats_by_schema (
+  object_schema,
+  allocated,
+  data,
+  pages,
+  pages_hashed,
+  pages_old,
+  rows_cached
+) AS
+SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', 1), '`', '')) AS object_schema,
+       SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) AS allocated,
+       SUM(ibp.data_size) AS data,
+       COUNT(ibp.page_number) AS pages,
+       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached 
+  FROM information_schema.innodb_buffer_page ibp 
+ WHERE table_name IS NOT NULL
+ GROUP BY object_schema
+ ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
diff --git a/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_table.sql b/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_table.sql
new file mode 100644
index 000000000000..8c0fdbbebfd0
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_table.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$innodb_buffer_stats_by_table
+-- 
+-- Summarizes the output of the INFORMATION_SCHEMA.INNODB_BUFFER_PAGE 
+-- table, aggregating by schema and table name
+--
+-- mysql> select * from x$innodb_buffer_stats_by_table;
+-- +--------------------------+------------------------------------+-----------+--------+-------+--------------+-----------+-------------+
+-- | object_schema            | object_name                        | allocated | data   | pages | pages_hashed | pages_old | rows_cached |
+-- +--------------------------+------------------------------------+-----------+--------+-------+--------------+-----------+-------------+
+-- | InnoDB System            | SYS_COLUMNS                        |    131072 | 101350 |     8 |            8 |         8 |        1532 |
+-- | InnoDB System            | SYS_FOREIGN                        |    131072 |  56808 |     8 |            8 |         8 |         172 |
+-- | InnoDB System            | SYS_TABLES                         |    131072 |  57529 |     8 |            8 |         8 |         365 |
+-- | InnoDB System            | SYS_INDEXES                        |    114688 |  77984 |     7 |            7 |         7 |        1046 |
+-- | mem30_trunk__instruments | agentlatencytime                   |     98304 |  29517 |     6 |            6 |         6 |         252 |
+-- | mem30_trunk__instruments | binlogspaceusagedata               |     98304 |  23076 |     6 |            6 |         6 |         196 |
+-- | mem30_trunk__instruments | connectionsdata                    |     98304 |  37563 |     6 |            6 |         6 |         276 |
+-- ...
+-- +--------------------------+------------------------------------+-----------+--------+-------+--------------+-----------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$innodb_buffer_stats_by_table (
+  object_schema,
+  object_name,
+  allocated,
+  data,
+  pages,
+  pages_hashed,
+  pages_old,
+  rows_cached
+) AS
+SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', 1), '`', '')) AS object_schema,
+       REPLACE(SUBSTRING_INDEX(ibp.table_name, '.', -1), '`', '') AS object_name,
+       SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) AS allocated,
+       SUM(ibp.data_size) AS data,
+       COUNT(ibp.page_number) AS pages,
+       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached 
+  FROM information_schema.innodb_buffer_page ibp 
+ WHERE table_name IS NOT NULL
+ GROUP BY object_schema, object_name
+ ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
diff --git a/scripts/sys_schema/views/i_s/x_innodb_lock_waits.sql b/scripts/sys_schema/views/i_s/x_innodb_lock_waits.sql
new file mode 100644
index 000000000000..4259474ab4a1
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/x_innodb_lock_waits.sql
@@ -0,0 +1,125 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$innodb_lock_waits
+--
+-- Give a snapshot of which InnoDB locks transactions are waiting for.
+-- The lock waits are ordered by the age of the lock descending.
+--
+-- Versions: 5.1+ (5.1 requires InnoDB Plugin with I_S tables)
+--
+-- mysql> SELECT * FROM x$innodb_lock_waits\G
+-- *************************** 1. row ***************************
+--                 wait_started: 2014-11-11 13:39:20
+--                     wait_age: 00:00:07
+--                wait_age_secs: 7
+--                 locked_table: `db1`.`t1`
+--                 locked_index: PRIMARY
+--                  locked_type: RECORD
+--               waiting_trx_id: 867158
+--          waiting_trx_started: 2014-11-11 13:39:15
+--              waiting_trx_age: 00:00:12
+--      waiting_trx_rows_locked: 0
+--    waiting_trx_rows_modified: 0
+--                  waiting_pid: 3
+--                waiting_query: UPDATE t1 SET val = val + 1 WHERE id = 2
+--              waiting_lock_id: 867158:2363:3:3
+--            waiting_lock_mode: X
+--              blocking_trx_id: 867157
+--                 blocking_pid: 4
+--               blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
+--             blocking_lock_id: 867157:2363:3:3
+--           blocking_lock_mode: X
+--         blocking_trx_started: 2014-11-11 13:39:11
+--             blocking_trx_age: 00:00:16
+--     blocking_trx_rows_locked: 1
+--   blocking_trx_rows_modified: 1
+--      sql_kill_blocking_query: KILL QUERY 4
+-- sql_kill_blocking_connection: KILL 4
+-- 1 row in set (0.01 sec)
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$innodb_lock_waits (
+  wait_started,
+  wait_age,
+  wait_age_secs,
+  locked_table,
+  locked_index,
+  locked_type,
+  waiting_trx_id,
+  waiting_trx_started,
+  waiting_trx_age,
+  waiting_trx_rows_locked,
+  waiting_trx_rows_modified,
+  waiting_pid,
+  waiting_query,
+  waiting_lock_id,
+  waiting_lock_mode,
+  blocking_trx_id,
+  blocking_pid,
+  blocking_query,
+  blocking_lock_id,
+  blocking_lock_mode,
+  blocking_trx_started,
+  blocking_trx_age,
+  blocking_trx_rows_locked,
+  blocking_trx_rows_modified,
+  sql_kill_blocking_query,
+  sql_kill_blocking_connection
+) AS
+SELECT r.trx_wait_started AS wait_started,
+       TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,
+       TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS wait_age_secs,
+       rl.lock_table AS locked_table,
+       rl.lock_index AS locked_index,
+       rl.lock_type AS locked_type,
+       r.trx_id AS waiting_trx_id,
+       r.trx_started as waiting_trx_started,
+       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,
+       r.trx_rows_locked AS waiting_trx_rows_locked,
+       r.trx_rows_modified AS waiting_trx_rows_modified,
+       r.trx_mysql_thread_id AS waiting_pid,
+       r.trx_query AS waiting_query,
+       rl.lock_id AS waiting_lock_id,
+       rl.lock_mode AS waiting_lock_mode,
+       b.trx_id AS blocking_trx_id,
+       b.trx_mysql_thread_id AS blocking_pid,
+       b.trx_query AS blocking_query,
+       bl.lock_id AS blocking_lock_id,
+       bl.lock_mode AS blocking_lock_mode,
+       b.trx_started AS blocking_trx_started,
+       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,
+       b.trx_rows_locked AS blocking_trx_rows_locked,
+       b.trx_rows_modified AS blocking_trx_rows_modified,
+       CONCAT('KILL QUERY ', b.trx_mysql_thread_id) AS sql_kill_blocking_query,
+       CONCAT('KILL ', b.trx_mysql_thread_id) AS sql_kill_blocking_connection
+  FROM information_schema.innodb_lock_waits w
+       INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id
+       INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id
+       INNER JOIN information_schema.innodb_locks bl ON bl.lock_id = w.blocking_lock_id
+       INNER JOIN information_schema.innodb_locks rl ON rl.lock_id = w.requested_lock_id
+ ORDER BY r.trx_wait_started;
diff --git a/scripts/sys_schema/views/i_s/x_schema_flattened_keys.sql b/scripts/sys_schema/views/i_s/x_schema_flattened_keys.sql
new file mode 100644
index 000000000000..69717ec271cb
--- /dev/null
+++ b/scripts/sys_schema/views/i_s/x_schema_flattened_keys.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$schema_flattened_keys
+--
+-- Helper view for the schema_redundant_keys view.
+--
+-- mysql> select * from sys.x$schema_flattened_keys;
+-- +---------------+---------------------+------------------------------+------------+----------------+-----------------+
+-- | table_schema  | table_name          | index_name                   | non_unique | subpart_exists | index_columns   |
+-- +---------------+---------------------+------------------------------+------------+----------------+-----------------+
+-- | mem__advisors | advisor_initialized | PRIMARY                      |          0 |              0 | advisorClassId  |
+-- | mem__advisors | advisor_schedules   | advisorClassIdIdx            |          1 |              0 | advisorClassId  |
+-- | mem__advisors | advisor_schedules   | PRIMARY                      |          0 |              0 | schedule_id     |
+-- | mem__advisors | app_identity_path   | FK_7xbq2i81hgo0xlvnb6rr77s21 |          1 |              0 | for_schedule_id |
+-- | mem__advisors | app_identity_path   | PRIMARY                      |          0 |              0 | hib_id          |
+-- ...
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW x$schema_flattened_keys (
+  table_schema,
+  table_name,
+  index_name,
+  non_unique,
+  subpart_exists,
+  index_columns
+) AS
+  SELECT
+    TABLE_SCHEMA,
+    TABLE_NAME,
+    INDEX_NAME,
+    MAX(NON_UNIQUE) AS non_unique,
+    MAX(IF(SUB_PART IS NULL, 0, 1)) AS subpart_exists,
+    GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) AS index_columns
+  FROM INFORMATION_SCHEMA.STATISTICS
+  WHERE
+    INDEX_TYPE='BTREE'
+    AND TABLE_SCHEMA NOT IN ('mysql', 'sys', 'INFORMATION_SCHEMA', 'PERFORMANCE_SCHEMA')
+  GROUP BY
+    TABLE_SCHEMA, TABLE_NAME, INDEX_NAME;
diff --git a/scripts/sys_schema/views/p_s/host_summary.sql b/scripts/sys_schema/views/p_s/host_summary.sql
new file mode 100644
index 000000000000..45dcd8811d0c
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary
+--
+-- Summarizes statement activity and connections by host
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from host_summary;
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | host | statements | total_latency | avg_latency | current_connections | total_connections | unique_users | current_memory | total_memory_allocated |
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | hal1 |       5663 | 00:01:47.14   | 18.92 ms    |                   1 |                 1 |            1 | 1.41 MiB       | 543.55 MiB             |
+-- | hal2 |        225 | 14.49 s       | 64.40 ms    |                   1 |                 1 |            1 | 707.60 KiB     | 81.02 MiB              |
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary (
+  host,
+  statements,
+  statement_latency,
+  statement_avg_latency,
+  table_scans,
+  file_ios,
+  file_io_latency,
+  current_connections,
+  total_connections,
+  unique_users,
+  current_memory,
+  total_memory_allocated
+) AS
+SELECT IF(accounts.host IS NULL, 'background', accounts.host) AS host,
+       SUM(stmt.total) AS statements,
+       sys.format_time(SUM(stmt.total_latency)) AS statement_latency,
+       sys.format_time(IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0)) AS statement_avg_latency,
+       SUM(stmt.full_scans) AS table_scans,
+       SUM(io.ios) AS file_ios,
+       sys.format_time(SUM(io.io_latency)) AS file_io_latency,
+       SUM(accounts.current_connections) AS current_connections,
+       SUM(accounts.total_connections) AS total_connections,
+       COUNT(DISTINCT user) AS unique_users,
+       sys.format_bytes(SUM(mem.current_allocated)) AS current_memory,
+       sys.format_bytes(SUM(mem.total_allocated)) AS total_memory_allocated
+  FROM performance_schema.accounts
+  JOIN sys.x$host_summary_by_statement_latency AS stmt ON accounts.host = stmt.host
+  JOIN sys.x$host_summary_by_file_io AS io ON accounts.host = io.host
+  JOIN sys.x$memory_by_host_by_current_bytes mem ON accounts.host = mem.host
+ GROUP BY IF(accounts.host IS NULL, 'background', accounts.host);
diff --git a/scripts/sys_schema/views/p_s/host_summary_by_file_io.sql b/scripts/sys_schema/views/p_s/host_summary_by_file_io.sql
new file mode 100644
index 000000000000..b12c054b9ec9
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary_by_file_io.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary_by_file_io
+--
+-- Summarizes file IO totals per host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from host_summary_by_file_io;
+-- +------------+-------+------------+
+-- | host       | ios   | io_latency |
+-- +------------+-------+------------+
+-- | hal1       | 26457 | 21.58 s    |
+-- | hal2       |  1189 | 394.21 ms  |
+-- +------------+-------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary_by_file_io (
+  host,
+  ios,
+  io_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(count_star) AS ios,
+       sys.format_time(SUM(sum_timer_wait)) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%'
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/host_summary_by_file_io_type.sql b/scripts/sys_schema/views/p_s/host_summary_by_file_io_type.sql
new file mode 100644
index 000000000000..9a612b0475ba
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary_by_file_io_type.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary_by_file_io_type
+--
+-- Summarizes file IO by event type per host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from host_summary_by_file_io_type;
+-- +------------+--------------------------------------+-------+---------------+-------------+
+-- | host       | event_name                           | total | total_latency | max_latency |
+-- +------------+--------------------------------------+-------+---------------+-------------+
+-- | hal1       | wait/io/file/sql/FRM                 |   871 | 168.15 ms     | 18.48 ms    |
+-- | hal1       | wait/io/file/innodb/innodb_data_file |   173 | 129.56 ms     | 34.09 ms    |
+-- | hal1       | wait/io/file/innodb/innodb_log_file  |    20 | 77.53 ms      | 60.66 ms    |
+-- | hal1       | wait/io/file/myisam/dfile            |    40 | 6.54 ms       | 4.58 ms     |
+-- | hal1       | wait/io/file/mysys/charset           |     3 | 4.79 ms       | 4.71 ms     |
+-- | hal1       | wait/io/file/myisam/kfile            |    67 | 4.38 ms       | 300.04 us   |
+-- | hal1       | wait/io/file/sql/ERRMSG              |     5 | 2.72 ms       | 1.69 ms     |
+-- | hal1       | wait/io/file/sql/pid                 |     3 | 266.30 us     | 185.47 us   |
+-- | hal1       | wait/io/file/sql/casetest            |     5 | 246.81 us     | 150.19 us   |
+-- | hal1       | wait/io/file/sql/global_ddl_log      |     2 | 21.24 us      | 18.59 us    |
+-- | hal2       | wait/io/file/sql/file_parser         |  1422 | 4.80 s        | 135.14 ms   |
+-- | hal2       | wait/io/file/sql/FRM                 |   865 | 85.82 ms      | 9.81 ms     |
+-- | hal2       | wait/io/file/myisam/kfile            |  1073 | 37.14 ms      | 15.79 ms    |
+-- | hal2       | wait/io/file/myisam/dfile            |  2991 | 25.53 ms      | 5.25 ms     |
+-- | hal2       | wait/io/file/sql/dbopt               |    20 | 1.07 ms       | 153.07 us   |
+-- | hal2       | wait/io/file/sql/misc                |     4 | 59.71 us      | 33.75 us    |
+-- | hal2       | wait/io/file/archive/data            |     1 | 13.91 us      | 13.91 us    |
+-- +------------+--------------------------------------+-------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary_by_file_io_type (
+  host,
+  event_name,
+  total,
+  total_latency,
+  max_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name LIKE 'wait/io/file%'
+   AND count_star > 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/host_summary_by_stages.sql b/scripts/sys_schema/views/p_s/host_summary_by_stages.sql
new file mode 100644
index 000000000000..28ac216ae8e9
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary_by_stages.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary_by_stages
+--
+-- Summarizes stages by host, ordered by host and total latency per stage.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from host_summary_by_stages;
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | host | event_name                     | total | total_latency | avg_latency |
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | hal  | stage/sql/Opening tables       |   889 | 1.97 ms       | 2.22 us     |
+-- | hal  | stage/sql/Creating sort index  |     4 | 1.79 ms       | 446.30 us   |
+-- | hal  | stage/sql/init                 |    10 | 312.27 us     | 31.23 us    |
+-- | hal  | stage/sql/checking permissions |    10 | 300.62 us     | 30.06 us    |
+-- | hal  | stage/sql/freeing items        |     5 | 85.89 us      | 17.18 us    |
+-- | hal  | stage/sql/statistics           |     5 | 79.15 us      | 15.83 us    |
+-- | hal  | stage/sql/preparing            |     5 | 69.12 us      | 13.82 us    |
+-- | hal  | stage/sql/optimizing           |     5 | 53.11 us      | 10.62 us    |
+-- | hal  | stage/sql/Sending data         |     5 | 44.66 us      | 8.93 us     |
+-- | hal  | stage/sql/closing tables       |     5 | 37.54 us      | 7.51 us     |
+-- | hal  | stage/sql/System lock          |     5 | 34.28 us      | 6.86 us     |
+-- | hal  | stage/sql/query end            |     5 | 24.37 us      | 4.87 us     |
+-- | hal  | stage/sql/end                  |     5 | 8.60 us       | 1.72 us     |
+-- | hal  | stage/sql/Sorting result       |     5 | 8.33 us       | 1.67 us     |
+-- | hal  | stage/sql/executing            |     5 | 5.37 us       | 1.07 us     |
+-- | hal  | stage/sql/cleaning up          |     5 | 4.60 us       | 919.00 ns   |
+-- +------+--------------------------------+-------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary_by_stages (
+  host,
+  event_name,
+  total,
+  total_latency,
+  avg_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency, 
+       sys.format_time(avg_timer_wait) AS avg_latency 
+  FROM performance_schema.events_stages_summary_by_host_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/host_summary_by_statement_latency.sql b/scripts/sys_schema/views/p_s/host_summary_by_statement_latency.sql
new file mode 100644
index 000000000000..be5eb16fa562
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary_by_statement_latency.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary_by_statement_latency
+--
+-- Summarizes overall statement statistics by host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select-- from host_summary_by_statement_latency;
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | host | total | total_latency | max_latency | lock_latency | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | hal  |  3381 | 00:02:09.13   | 1.48 s      | 1.07 s       |      1151 |         93947 |           150 |         91 |
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary_by_statement_latency (
+  host,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(count_star) AS total,
+       sys.format_time(SUM(sum_timer_wait)) AS total_latency,
+       sys.format_time(MAX(max_timer_wait)) AS max_latency,
+       sys.format_time(SUM(sum_lock_time)) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_host_by_event_name
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/host_summary_by_statement_type.sql b/scripts/sys_schema/views/p_s/host_summary_by_statement_type.sql
new file mode 100644
index 000000000000..5866a055947c
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/host_summary_by_statement_type.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: host_summary_by_statement_type
+--
+-- Summarizes the types of statements executed by each host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from host_summary_by_statement_type;
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | host | statement            | total  | total_latency | max_latency | lock_latency | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | hal  | create_view          |   2063 | 00:05:04.20   | 463.58 ms   | 1.42 s       |         0 |             0 |             0 |          0 |
+-- | hal  | select               |    174 | 40.87 s       | 28.83 s     | 858.13 ms    |      5212 |        157022 |             0 |         82 |
+-- | hal  | stmt                 |   6645 | 15.31 s       | 491.78 ms   | 0 ps         |         0 |             0 |          7951 |          0 |
+-- | hal  | call_procedure       |     17 | 4.78 s        | 1.02 s      | 37.94 ms     |         0 |             0 |            19 |          0 |
+-- | hal  | create_table         |     19 | 3.04 s        | 431.71 ms   | 0 ps         |         0 |             0 |             0 |          0 |
+-- ...
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW host_summary_by_statement_type (
+  host,
+  statement,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUBSTRING_INDEX(event_name, '/', -1) AS statement,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(max_timer_wait) AS max_latency,
+       sys.format_time(sum_lock_time) AS lock_latency,
+       sum_rows_sent AS rows_sent,
+       sum_rows_examined AS rows_examined,
+       sum_rows_affected AS rows_affected,
+       sum_no_index_used + sum_no_good_index_used AS full_scans
+  FROM performance_schema.events_statements_summary_by_host_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/io_by_thread_by_latency.sql b/scripts/sys_schema/views/p_s/io_by_thread_by_latency.sql
new file mode 100644
index 000000000000..76e2eedc1951
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/io_by_thread_by_latency.sql
@@ -0,0 +1,77 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: io_by_thread_by_latency
+--
+-- Show the top IO consumers by thread, ordered by total latency
+--
+-- mysql> select * from io_by_thread_by_latency;
+-- +---------------------+-------+---------------+-------------+-------------+-------------+-----------+----------------+
+-- | user                | total | total_latency | min_latency | avg_latency | max_latency | thread_id | processlist_id |
+-- +---------------------+-------+---------------+-------------+-------------+-------------+-----------+----------------+
+-- | root@localhost      | 11580 | 18.01 s       | 429.78 ns   | 1.12 ms     | 181.07 ms   |        25 |              6 |
+-- | main                |  1358 | 1.31 s        | 475.02 ns   | 2.27 ms     | 350.70 ms   |         1 |           NULL |
+-- | page_cleaner_thread |   654 | 147.44 ms     | 588.12 ns   | 225.44 us   | 46.41 ms    |        18 |           NULL |
+-- | io_write_thread     |   131 | 107.75 ms     | 8.60 us     | 822.55 us   | 27.69 ms    |         8 |           NULL |
+-- | io_write_thread     |    46 | 47.07 ms      | 10.64 us    | 1.02 ms     | 16.90 ms    |         9 |           NULL |
+-- | io_write_thread     |    71 | 46.99 ms      | 9.11 us     | 661.81 us   | 17.04 ms    |        11 |           NULL |
+-- | io_log_thread       |    20 | 21.01 ms      | 14.25 us    | 1.05 ms     | 7.08 ms     |         3 |           NULL |
+-- | srv_master_thread   |    13 | 17.60 ms      | 8.49 us     | 1.35 ms     | 9.99 ms     |        16 |           NULL |
+-- | srv_purge_thread    |     4 | 1.81 ms       | 34.31 us    | 452.45 us   | 1.02 ms     |        17 |           NULL |
+-- | io_write_thread     |    19 | 951.39 us     | 9.75 us     | 50.07 us    | 297.47 us   |        10 |           NULL |
+-- | signal_handler      |     3 | 218.03 us     | 21.64 us    | 72.68 us    | 154.84 us   |        19 |           NULL |
+-- +---------------------+-------+---------------+-------------+-------------+-------------+-----------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW io_by_thread_by_latency (
+  user,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency,
+  thread_id,
+  processlist_id
+)
+AS
+SELECT IF(processlist_id IS NULL, 
+             SUBSTRING_INDEX(name, '/', -1), 
+             CONCAT(processlist_user, '@', processlist_host)
+          ) user, 
+       SUM(count_star) total,
+       sys.format_time(SUM(sum_timer_wait)) total_latency,
+       sys.format_time(MIN(min_timer_wait)) min_latency,
+       sys.format_time(AVG(avg_timer_wait)) avg_latency,
+       sys.format_time(MAX(max_timer_wait)) max_latency,
+       thread_id,
+       processlist_id
+  FROM performance_schema.events_waits_summary_by_thread_by_event_name 
+  LEFT JOIN performance_schema.threads USING (thread_id)
+ WHERE event_name LIKE 'wait/io/file/%'
+   AND sum_timer_wait > 0
+ GROUP BY thread_id, processlist_id, user
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/io_global_by_file_by_bytes.sql b/scripts/sys_schema/views/p_s/io_global_by_file_by_bytes.sql
new file mode 100644
index 000000000000..abb0ad5b3b5c
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/io_global_by_file_by_bytes.sql
@@ -0,0 +1,65 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: io_global_by_file_by_bytes
+--
+-- Shows the top global IO consumers by bytes usage by file.
+--
+-- mysql> SELECT * FROM io_global_by_file_by_bytes LIMIT 5;
+-- +--------------------------------------------+------------+------------+-----------+-------------+---------------+-----------+------------+-----------+
+-- | file                                       | count_read | total_read | avg_read  | count_write | total_written | avg_write | total      | write_pct |
+-- +--------------------------------------------+------------+------------+-----------+-------------+---------------+-----------+------------+-----------+
+-- | @@datadir/ibdata1                          |        147 | 4.27 MiB   | 29.71 KiB |           3 | 48.00 KiB     | 16.00 KiB | 4.31 MiB   |      1.09 |
+-- | @@datadir/mysql/proc.MYD                   |        347 | 85.35 KiB  | 252 bytes |         111 | 19.08 KiB     | 176 bytes | 104.43 KiB |     18.27 |
+-- | @@datadir/ib_logfile0                      |          6 | 68.00 KiB  | 11.33 KiB |           8 | 4.00 KiB      | 512 bytes | 72.00 KiB  |      5.56 |
+-- | /opt/mysql/5.5.33/share/english/errmsg.sys |          3 | 43.68 KiB  | 14.56 KiB |           0 | 0 bytes       | 0 bytes   | 43.68 KiB  |      0.00 |
+-- | /opt/mysql/5.5.33/share/charsets/Index.xml |          1 | 17.89 KiB  | 17.89 KiB |           0 | 0 bytes       | 0 bytes   | 17.89 KiB  |      0.00 |
+-- +--------------------------------------------+------------+------------+-----------+-------------+---------------+-----------+------------+-----------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW io_global_by_file_by_bytes (
+  file,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_write,
+  total,
+  write_pct
+) AS
+SELECT sys.format_path(file_name) AS file, 
+       count_read, 
+       sys.format_bytes(sum_number_of_bytes_read) AS total_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
+       count_write, 
+       sys.format_bytes(sum_number_of_bytes_write) AS total_written,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00)) AS avg_write,
+       sys.format_bytes(sum_number_of_bytes_read + sum_number_of_bytes_write) AS total, 
+       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct 
+  FROM performance_schema.file_summary_by_instance
+ ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;
diff --git a/scripts/sys_schema/views/p_s/io_global_by_file_by_latency.sql b/scripts/sys_schema/views/p_s/io_global_by_file_by_latency.sql
new file mode 100644
index 000000000000..395b59b832ae
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/io_global_by_file_by_latency.sql
@@ -0,0 +1,65 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: io_global_by_file_by_latency
+--
+-- Shows the top global IO consumers by latency by file.
+--
+-- mysql> select * from io_global_by_file_by_latency limit 5;
+-- +-----------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+-- | file                                                      | total | total_latency | count_read | read_latency | count_write | write_latency | count_misc | misc_latency |
+-- +-----------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+-- | @@datadir/sys/wait_classes_global_by_avg_latency_raw.frm~ |    24 | 451.99 ms     |          0 | 0 ps         |           4 | 108.07 us     |         20 | 451.88 ms    |
+-- | @@datadir/sys/innodb_buffer_stats_by_schema_raw.frm~      |    24 | 379.84 ms     |          0 | 0 ps         |           4 | 108.88 us     |         20 | 379.73 ms    |
+-- | @@datadir/sys/io_by_thread_by_latency_raw.frm~            |    24 | 379.46 ms     |          0 | 0 ps         |           4 | 101.37 us     |         20 | 379.36 ms    |
+-- | @@datadir/ibtmp1                                          |    53 | 373.45 ms     |          0 | 0 ps         |          48 | 246.08 ms     |          5 | 127.37 ms    |
+-- | @@datadir/sys/statement_analysis_raw.frm~                 |    24 | 353.14 ms     |          0 | 0 ps         |           4 | 94.96 us      |         20 | 353.04 ms    |
+-- +-----------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW io_global_by_file_by_latency (
+  file,
+  total,
+  total_latency,
+  count_read,
+  read_latency,
+  count_write,
+  write_latency,
+  count_misc,
+  misc_latency
+) AS
+SELECT sys.format_path(file_name) AS file, 
+       count_star AS total, 
+       sys.format_time(sum_timer_wait) AS total_latency,
+       count_read,
+       sys.format_time(sum_timer_read) AS read_latency,
+       count_write,
+       sys.format_time(sum_timer_write) AS write_latency,
+       count_misc,
+       sys.format_time(sum_timer_misc) AS misc_latency
+  FROM performance_schema.file_summary_by_instance
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/io_global_by_wait_by_bytes.sql b/scripts/sys_schema/views/p_s/io_global_by_wait_by_bytes.sql
new file mode 100644
index 000000000000..7a71514b2a4a
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/io_global_by_wait_by_bytes.sql
@@ -0,0 +1,86 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: io_global_by_wait_by_bytes
+--
+-- Shows the top global IO consumer classes by bytes usage.
+--
+-- mysql> select * from io_global_by_wait_by_bytes;
+-- +--------------------+--------+---------------+-------------+-------------+-------------+------------+------------+-----------+-------------+---------------+-------------+-----------------+
+-- | event_name         | total  | total_latency | min_latency | avg_latency | max_latency | count_read | total_read | avg_read  | count_write | total_written | avg_written | total_requested |
+-- +--------------------+--------+---------------+-------------+-------------+-------------+------------+------------+-----------+-------------+---------------+-------------+-----------------+
+-- | myisam/dfile       | 163681 | 983.13 ms     | 379.08 ns   | 6.01 us     | 22.06 ms    |      68737 | 127.31 MiB | 1.90 KiB  |     1012221 | 121.52 MiB    | 126 bytes   | 248.83 MiB      |
+-- | myisam/kfile       |   1775 | 375.13 ms     | 1.02 us     | 211.34 us   | 35.15 ms    |      54066 | 9.97 MiB   | 193 bytes |      428257 | 12.40 MiB     | 30 bytes    | 22.37 MiB       |
+-- | sql/FRM            |  57889 | 8.40 s        | 19.44 ns    | 145.05 us   | 336.71 ms   |       8009 | 2.60 MiB   | 341 bytes |       14675 | 2.91 MiB      | 208 bytes   | 5.51 MiB        |
+-- | sql/global_ddl_log |    164 | 75.96 ms      | 5.72 us     | 463.19 us   | 7.43 ms     |         20 | 80.00 KiB  | 4.00 KiB  |          76 | 304.00 KiB    | 4.00 KiB    | 384.00 KiB      |
+-- | sql/file_parser    |    419 | 601.37 ms     | 1.96 us     | 1.44 ms     | 37.14 ms    |         66 | 42.01 KiB  | 652 bytes |          64 | 226.98 KiB    | 3.55 KiB    | 268.99 KiB      |
+-- | sql/binlog         |    190 | 6.79 s        | 1.56 us     | 35.76 ms    | 4.21 s      |         52 | 60.54 KiB  | 1.16 KiB  |           0 | 0 bytes       | 0 bytes     | 60.54 KiB       |
+-- | sql/ERRMSG         |      5 | 2.03 s        | 8.61 us     | 405.40 ms   | 2.03 s      |          3 | 51.82 KiB  | 17.27 KiB |           0 | 0 bytes       | 0 bytes     | 51.82 KiB       |
+-- | mysys/charset      |      3 | 196.52 us     | 17.61 us    | 65.51 us    | 137.33 us   |          1 | 17.83 KiB  | 17.83 KiB |           0 | 0 bytes       | 0 bytes     | 17.83 KiB       |
+-- | sql/partition      |     81 | 18.87 ms      | 888.08 ns   | 232.92 us   | 4.67 ms     |         66 | 2.75 KiB   | 43 bytes  |           8 | 288 bytes     | 36 bytes    | 3.04 KiB        |
+-- | sql/dbopt          | 329166 | 26.95 s       | 2.06 us     | 81.89 us    | 178.71 ms   |          0 | 0 bytes    | 0 bytes   |           9 | 585 bytes     | 65 bytes    | 585 bytes       |
+-- | sql/relaylog       |      7 | 1.18 ms       | 838.84 ns   | 168.30 us   | 892.70 us   |          0 | 0 bytes    | 0 bytes   |           1 | 120 bytes     | 120 bytes   | 120 bytes       |
+-- | mysys/cnf          |      5 | 171.61 us     | 303.26 ns   | 34.32 us    | 115.21 us   |          3 | 56 bytes   | 19 bytes  |           0 | 0 bytes       | 0 bytes     | 56 bytes        |
+-- | sql/pid            |      3 | 220.55 us     | 29.29 us    | 73.52 us    | 143.11 us   |          0 | 0 bytes    | 0 bytes   |           1 | 5 bytes       | 5 bytes     | 5 bytes         |
+-- | sql/casetest       |      1 | 121.19 us     | 121.19 us   | 121.19 us   | 121.19 us   |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     | 0 bytes         |
+-- | sql/binlog_index   |      5 | 593.47 us     | 1.07 us     | 118.69 us   | 535.90 us   |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     | 0 bytes         |
+-- | sql/misc           |     23 | 2.73 ms       | 65.14 us    | 118.50 us   | 255.31 us   |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     | 0 bytes         |
+-- +--------------------+--------+---------------+-------------+-------------+-------------+------------+------------+-----------+-------------+---------------+-------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW io_global_by_wait_by_bytes (
+  event_name,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_written,
+  total_requested
+) AS
+SELECT SUBSTRING_INDEX(event_name, '/', -2) event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(min_timer_wait) AS min_latency,
+       sys.format_time(avg_timer_wait) AS avg_latency,
+       sys.format_time(max_timer_wait) AS max_latency,
+       count_read,
+       sys.format_bytes(sum_number_of_bytes_read) AS total_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
+       count_write,
+       sys.format_bytes(sum_number_of_bytes_write) AS total_written,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written,
+       sys.format_bytes(sum_number_of_bytes_write + sum_number_of_bytes_read) AS total_requested
+  FROM performance_schema.file_summary_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%' 
+   AND count_star > 0
+ ORDER BY sum_number_of_bytes_write + sum_number_of_bytes_read DESC;
diff --git a/scripts/sys_schema/views/p_s/io_global_by_wait_by_latency.sql b/scripts/sys_schema/views/p_s/io_global_by_wait_by_latency.sql
new file mode 100644
index 000000000000..c6b0df479752
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/io_global_by_wait_by_latency.sql
@@ -0,0 +1,88 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: io_global_by_wait_by_latency
+--
+-- Shows the top global IO consumers by latency.
+--
+-- mysql> SELECT * FROM io_global_by_wait_by_latency;
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+---------------+--------------+------------+------------+-----------+-------------+---------------+-------------+
+-- | event_name              | total | total_latency | avg_latency | max_latency | read_latency | write_latency | misc_latency | count_read | total_read | avg_read  | count_write | total_written | avg_written |
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+---------------+--------------+------------+------------+-----------+-------------+---------------+-------------+
+-- | sql/file_parser         |  5433 | 30.20 s       | 5.56 ms     | 203.65 ms   | 22.08 ms     | 24.89 ms      | 30.16 s      |         24 | 6.18 KiB   | 264 bytes |         737 | 2.15 MiB      | 2.99 KiB    |
+-- | innodb/innodb_data_file |  1344 | 1.52 s        | 1.13 ms     | 350.70 ms   | 203.82 ms    | 450.96 ms     | 868.21 ms    |        147 | 2.30 MiB   | 16.00 KiB |        1001 | 53.61 MiB     | 54.84 KiB   |
+-- | innodb/innodb_log_file  |   828 | 893.48 ms     | 1.08 ms     | 30.11 ms    | 16.32 ms     | 705.89 ms     | 171.27 ms    |          6 | 68.00 KiB  | 11.33 KiB |         413 | 2.19 MiB      | 5.42 KiB    |
+-- | myisam/kfile            |  7642 | 242.34 ms     | 31.71 us    | 19.27 ms    | 73.60 ms     | 23.48 ms      | 145.26 ms    |        758 | 135.63 KiB | 183 bytes |        4386 | 232.52 KiB    | 54 bytes    |
+-- | myisam/dfile            | 12540 | 223.47 ms     | 17.82 us    | 32.50 ms    | 87.76 ms     | 16.97 ms      | 118.74 ms    |       5390 | 4.49 MiB   | 873 bytes |        1448 | 2.65 MiB      | 1.88 KiB    |
+-- | csv/metadata            |     8 | 28.98 ms      | 3.62 ms     | 20.15 ms    | 399.27 us    | 0 ps          | 28.58 ms     |          2 | 70 bytes   | 35 bytes  |           0 | 0 bytes       | 0 bytes     |
+-- | mysys/charset           |     3 | 24.24 ms      | 8.08 ms     | 24.15 ms    | 24.15 ms     | 0 ps          | 93.18 us     |          1 | 17.31 KiB  | 17.31 KiB |           0 | 0 bytes       | 0 bytes     |
+-- | sql/ERRMSG              |     5 | 20.43 ms      | 4.09 ms     | 19.31 ms    | 20.32 ms     | 0 ps          | 103.20 us    |          3 | 58.97 KiB  | 19.66 KiB |           0 | 0 bytes       | 0 bytes     |
+-- | mysys/cnf               |     5 | 11.37 ms      | 2.27 ms     | 11.28 ms    | 11.29 ms     | 0 ps          | 78.22 us     |          3 | 56 bytes   | 19 bytes  |           0 | 0 bytes       | 0 bytes     |
+-- | sql/dbopt               |    57 | 4.04 ms       | 70.92 us    | 843.70 us   | 0 ps         | 186.43 us     | 3.86 ms      |          0 | 0 bytes    | 0 bytes   |           7 | 431 bytes     | 62 bytes    |
+-- | csv/data                |     4 | 411.55 us     | 102.89 us   | 234.89 us   | 0 ps         | 0 ps          | 411.55 us    |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     |
+-- | sql/misc                |    22 | 340.38 us     | 15.47 us    | 33.77 us    | 0 ps         | 0 ps          | 340.38 us    |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     |
+-- | archive/data            |    39 | 277.86 us     | 7.12 us     | 16.18 us    | 0 ps         | 0 ps          | 277.86 us    |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     |
+-- | sql/pid                 |     3 | 218.03 us     | 72.68 us    | 154.84 us   | 0 ps         | 21.64 us      | 196.39 us    |          0 | 0 bytes    | 0 bytes   |           1 | 6 bytes       | 6 bytes     |
+-- | sql/casetest            |     5 | 197.15 us     | 39.43 us    | 126.31 us   | 0 ps         | 0 ps          | 197.15 us    |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     |
+-- | sql/global_ddl_log      |     2 | 14.60 us      | 7.30 us     | 12.12 us    | 0 ps         | 0 ps          | 14.60 us     |          0 | 0 bytes    | 0 bytes   |           0 | 0 bytes       | 0 bytes     |
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+---------------+--------------+------------+------------+-----------+-------------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW io_global_by_wait_by_latency (
+  event_name,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency,
+  read_latency,
+  write_latency,
+  misc_latency,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_written
+) AS
+SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(avg_timer_wait) AS avg_latency,
+       sys.format_time(max_timer_wait) AS max_latency,
+       sys.format_time(sum_timer_read) AS read_latency,
+       sys.format_time(sum_timer_write) AS write_latency,
+       sys.format_time(sum_timer_misc) AS misc_latency,
+       count_read,
+       sys.format_bytes(sum_number_of_bytes_read) AS total_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
+       count_write,
+       sys.format_bytes(sum_number_of_bytes_write) AS total_written,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written
+  FROM performance_schema.file_summary_by_event_name 
+ WHERE event_name LIKE 'wait/io/file/%'
+   AND count_star > 0
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/latest_file_io.sql b/scripts/sys_schema/views/p_s/latest_file_io.sql
new file mode 100644
index 000000000000..a89afc491ced
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/latest_file_io.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: latest_file_io
+--
+-- Shows the latest file IO, by file / thread.
+--
+-- mysql> select * from latest_file_io limit 5;
+-- +----------------------+----------------------------------------+------------+-----------+-----------+
+-- | thread               | file                                   | latency    | operation | requested |
+-- +----------------------+----------------------------------------+------------+-----------+-----------+
+-- | msandbox@localhost:1 | @@tmpdir/#sqlcf28_1_4e.MYI             | 9.26 us    | write     | 124 bytes |
+-- | msandbox@localhost:1 | @@tmpdir/#sqlcf28_1_4e.MYI             | 4.00 us    | write     | 2 bytes   |
+-- | msandbox@localhost:1 | @@tmpdir/#sqlcf28_1_4e.MYI             | 56.34 us   | close     | NULL      |
+-- | msandbox@localhost:1 | @@tmpdir/#sqlcf28_1_4e.MYD             | 53.93 us   | close     | NULL      |
+-- | msandbox@localhost:1 | @@tmpdir/#sqlcf28_1_4e.MYI             | 104.05 ms  | delete    | NULL      |
+-- +----------------------+----------------------------------------+------------+-----------+-----------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW latest_file_io (
+  thread,
+  file,
+  latency,
+  operation,
+  requested
+) AS
+SELECT IF(id IS NULL, 
+             CONCAT(SUBSTRING_INDEX(name, '/', -1), ':', thread_id), 
+             CONCAT(user, '@', host, ':', id)
+          ) thread, 
+       sys.format_path(object_name) file, 
+       sys.format_time(timer_wait) AS latency, 
+       operation, 
+       sys.format_bytes(number_of_bytes) AS requested
+  FROM performance_schema.events_waits_history_long 
+  JOIN performance_schema.threads USING (thread_id)
+  LEFT JOIN information_schema.processlist ON processlist_id = id
+ WHERE object_name IS NOT NULL
+   AND event_name LIKE 'wait/io/file/%'
+ ORDER BY timer_start;
diff --git a/scripts/sys_schema/views/p_s/memory_by_host_by_current_bytes.sql b/scripts/sys_schema/views/p_s/memory_by_host_by_current_bytes.sql
new file mode 100644
index 000000000000..604a67339ab0
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/memory_by_host_by_current_bytes.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: memory_by_host_by_current_bytes
+--
+-- Summarizes memory use by host using the 5.7 Performance Schema instrumentation.
+-- 
+-- When the host found is NULL, it is assumed to be a local "background" thread.  
+--
+-- mysql> select * from memory_by_host_by_current_bytes;
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | host       | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | background |               2773 | 10.84 MiB         | 4.00 KiB          | 8.00 MiB          | 30.69 MiB       |
+-- | localhost  |               1509 | 809.30 KiB        | 549 bytes         | 176.38 KiB        | 83.59 MiB       |
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW memory_by_host_by_current_bytes (
+  host,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(current_count_used) AS current_count_used,
+       sys.format_bytes(SUM(current_number_of_bytes_used)) AS current_allocated,
+       sys.format_bytes(IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,
+       sys.format_bytes(MAX(current_number_of_bytes_used)) AS current_max_alloc,
+       sys.format_bytes(SUM(sum_number_of_bytes_alloc)) AS total_allocated
+  FROM performance_schema.memory_summary_by_host_by_event_name
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/memory_by_thread_by_current_bytes.sql b/scripts/sys_schema/views/p_s/memory_by_thread_by_current_bytes.sql
new file mode 100644
index 000000000000..0428b41c36c8
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/memory_by_thread_by_current_bytes.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: memory_by_thread_by_current_bytes
+--
+-- Summarizes memory use by user using the 5.7 Performance Schema instrumentation.
+-- 
+-- User shows either the background or foreground user name appropriately.
+--
+-- mysql> select * from sys.memory_by_thread_by_current_bytes limit 5;
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | thread_id | user           | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- |         1 | sql/main       |              29333 | 166.02 MiB        | 5.80 KiB          | 131.13 MiB        | 196.00 MiB      |
+-- |        55 | root@localhost |                175 | 1.04 MiB          | 6.09 KiB          | 350.86 KiB        | 67.37 MiB       |
+-- |        58 | root@localhost |                236 | 368.13 KiB        | 1.56 KiB          | 312.05 KiB        | 130.34 MiB      |
+-- |       904 | root@localhost |                 32 | 18.00 KiB         | 576 bytes         | 16.00 KiB         | 6.68 MiB        |
+-- |       970 | root@localhost |                 12 | 16.80 KiB         | 1.40 KiB          | 16.00 KiB         | 1.20 MiB        |
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW memory_by_thread_by_current_bytes (
+  thread_id,
+  user,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT thread_id,
+       IF(t.name = 'thread/sql/one_connection', 
+          CONCAT(t.processlist_user, '@', t.processlist_host), 
+          REPLACE(t.name, 'thread/', '')) user,
+       SUM(mt.current_count_used) AS current_count_used,
+       sys.format_bytes(SUM(mt.current_number_of_bytes_used)) AS current_allocated,
+       sys.format_bytes(IFNULL(SUM(mt.current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,
+       sys.format_bytes(MAX(mt.current_number_of_bytes_used)) AS current_max_alloc,
+       sys.format_bytes(SUM(mt.sum_number_of_bytes_alloc)) AS total_allocated
+  FROM performance_schema.memory_summary_by_thread_by_event_name AS mt
+  JOIN performance_schema.threads AS t USING (thread_id)
+ GROUP BY thread_id, IF(t.name = 'thread/sql/one_connection', 
+          CONCAT(t.processlist_user, '@', t.processlist_host), 
+          REPLACE(t.name, 'thread/', ''))
+ ORDER BY SUM(current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/memory_by_user_by_current_bytes.sql b/scripts/sys_schema/views/p_s/memory_by_user_by_current_bytes.sql
new file mode 100644
index 000000000000..e629f0fdf8ca
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/memory_by_user_by_current_bytes.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: memory_by_user_by_current_bytes
+--
+-- Summarizes memory use by user using the 5.7 Performance Schema instrumentation.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+--
+-- mysql> select * from memory_by_user_by_current_bytes;
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | user | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | root |               1401 | 1.09 MiB          | 815 bytes         | 334.97 KiB        | 42.73 MiB       |
+-- | mark |                201 | 496.08 KiB        | 2.47 KiB          | 334.97 KiB        | 5.50 MiB        |
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW memory_by_user_by_current_bytes (
+  user,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(current_count_used) AS current_count_used,
+       sys.format_bytes(SUM(current_number_of_bytes_used)) AS current_allocated,
+       sys.format_bytes(IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,
+       sys.format_bytes(MAX(current_number_of_bytes_used)) AS current_max_alloc,
+       sys.format_bytes(SUM(sum_number_of_bytes_alloc)) AS total_allocated
+  FROM performance_schema.memory_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/memory_global_by_current_bytes.sql b/scripts/sys_schema/views/p_s/memory_global_by_current_bytes.sql
new file mode 100644
index 000000000000..b0365bd6b385
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/memory_global_by_current_bytes.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: memory_global_by_current_bytes
+-- 
+-- Shows the current memory usage within the server globally broken down by allocation type.
+--
+-- mysql> select * from memory_global_by_current_bytes;
+-- +-------------------------------------------------+---------------+---------------+-------------------+------------+-------------+----------------+
+-- | event_name                                      | current_count | current_alloc | current_avg_alloc | high_count | high_alloc  | high_avg_alloc |
+-- +-------------------------------------------------+---------------+---------------+-------------------+------------+-------------+----------------+
+-- | memory/performance_schema/internal_buffers      |            62 | 293.80 MiB    | 4.74 MiB          |         62 | 293.80 MiB  | 4.74 MiB       |
+-- | memory/innodb/buf_buf_pool                      |             1 | 131.06 MiB    | 131.06 MiB        |          1 | 131.06 MiB  | 131.06 MiB     |
+-- | memory/innodb/log0log                           |             9 | 8.01 MiB      | 911.15 KiB        |          9 | 8.01 MiB    | 911.15 KiB     |
+-- | memory/mysys/KEY_CACHE                          |             3 | 8.00 MiB      | 2.67 MiB          |          3 | 8.00 MiB    | 2.67 MiB       |
+-- | memory/innodb/hash0hash                         |            27 | 4.73 MiB      | 179.51 KiB        |         27 | 6.84 MiB    | 259.47 KiB     |
+-- | memory/innodb/os0event                          |         24998 | 4.01 MiB      | 168 bytes         |      24998 | 4.01 MiB    | 168 bytes      |
+-- ...
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW memory_global_by_current_bytes (
+  event_name,
+  current_count,
+  current_alloc,
+  current_avg_alloc,
+  high_count,
+  high_alloc,
+  high_avg_alloc
+) AS
+SELECT event_name,
+       current_count_used AS current_count,
+       sys.format_bytes(current_number_of_bytes_used) AS current_alloc,
+       sys.format_bytes(IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0)) AS current_avg_alloc,
+       high_count_used AS high_count,
+       sys.format_bytes(high_number_of_bytes_used) AS high_alloc,
+       sys.format_bytes(IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0)) AS high_avg_alloc
+  FROM performance_schema.memory_summary_global_by_event_name
+ WHERE current_number_of_bytes_used > 0
+ ORDER BY current_number_of_bytes_used DESC;
diff --git a/scripts/sys_schema/views/p_s/memory_global_total.sql b/scripts/sys_schema/views/p_s/memory_global_total.sql
new file mode 100644
index 000000000000..290b34047bfc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/memory_global_total.sql
@@ -0,0 +1,44 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: memory_global_total
+-- 
+-- Shows the total memory usage within the server globally.
+--
+-- mysql> select * from memory_global_total;
+-- +-----------------+
+-- | total_allocated |
+-- +-----------------+
+-- | 123.35 MiB      |
+-- +-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW memory_global_total (
+  total_allocated
+) AS
+SELECT sys.format_bytes(SUM(CURRENT_NUMBER_OF_BYTES_USED)) total_allocated
+  FROM performance_schema.memory_summary_global_by_event_name;
diff --git a/scripts/sys_schema/views/p_s/metrics.sql b/scripts/sys_schema/views/p_s/metrics.sql
new file mode 100644
index 000000000000..85e7e033a881
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/metrics.sql
@@ -0,0 +1,128 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+--   This program is free software; you can redistribute it and/or modify
+--   it under the terms of the GNU General Public License, version 2.0,
+--   as published by the Free Software Foundation.
+--
+--   This program is also distributed with certain software (including
+--   but not limited to OpenSSL) that is licensed under separate terms,
+--   as designated in a particular file or component or in included license
+--   documentation.  The authors of MySQL hereby grant you an additional
+--   permission to link the program and your derivative works with the
+--   separately licensed software that they have included with MySQL.
+--
+--   This program is distributed in the hope that it will be useful,
+--   but WITHOUT ANY WARRANTY; without even the implied warranty of
+--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--   GNU General Public License, version 2.0, for more details.
+--
+--   You should have received a copy of the GNU General Public License
+--   along with this program; if not, write to the Free Software
+--   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 
+
+-- IMPORTANT
+-- If you update this view, also update the "5.7+ and the Performance Schema disabled"
+-- query in procedures/diagnostics.sql
+
+-- View: metrics
+-- 
+-- Creates a union of the following information:
+--
+--    *  performance_schema.global_status
+--    *  information_schema.INNODB_METRICS
+--    *  Performance Schema global memory usage information
+--    *  Current time
+--
+-- This is the same as the metrics_56 view with the exception that the global status is taken from performance_schema.global_status instead of
+-- from the Information Schema. Use this view if the MySQL version is 5.7.6 or later and show_compatibility_56 = OFF.
+-- See also https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_show_compatibility_56
+-- 
+-- For view has the following columns:
+-- 
+--    * Variable_name: The name of the variable
+--    * Variable_value: The value of the variable
+--    * Type: The type of the variable. This will depend on the source, e.g. Global Status, InnoDB Metrics - ..., etc.
+--    * Enabled: Whether the variable is enabled or not. Possible values are 'YES', 'NO', 'PARTIAL'.
+--      PARTIAL is currently only supported for the memory usage variables and means some but not all of the memory/% instruments
+--      are enabled.
+--
+-- mysql> SELECT * FROM metrics;
+-- +-----------------------------------------------+-------------------------...+--------------------------------------+---------+
+-- | Variable_name                                 | Variable_value          ...| Type                                 | Enabled |
+-- +-----------------------------------------------+-------------------------...+--------------------------------------+---------+
+-- | aborted_clients                               | 0                       ...| Global Status                        | YES     |
+-- | aborted_connects                              | 0                       ...| Global Status                        | YES     |
+-- | binlog_cache_disk_use                         | 0                       ...| Global Status                        | YES     |
+-- | binlog_cache_use                              | 0                       ...| Global Status                        | YES     |
+-- | binlog_stmt_cache_disk_use                    | 0                       ...| Global Status                        | YES     |
+-- | binlog_stmt_cache_use                         | 0                       ...| Global Status                        | YES     |
+-- | bytes_received                                | 217081                  ...| Global Status                        | YES     |
+-- | bytes_sent                                    | 27257                   ...| Global Status                        | YES     |
+-- ...
+-- | innodb_rwlock_x_os_waits                      | 0                       ...| InnoDB Metrics - server              | YES     |
+-- | innodb_rwlock_x_spin_rounds                   | 2723                    ...| InnoDB Metrics - server              | YES     |
+-- | innodb_rwlock_x_spin_waits                    | 1                       ...| InnoDB Metrics - server              | YES     |
+-- | trx_active_transactions                       | 0                       ...| InnoDB Metrics - transaction         | NO      |
+-- ...
+-- | trx_rseg_current_size                         | 0                       ...| InnoDB Metrics - transaction         | NO      |
+-- | trx_rseg_history_len                          | 4                       ...| InnoDB Metrics - transaction         | YES     |
+-- | trx_rw_commits                                | 0                       ...| InnoDB Metrics - transaction         | NO      |
+-- | trx_undo_slots_cached                         | 0                       ...| InnoDB Metrics - transaction         | NO      |
+-- | trx_undo_slots_used                           | 0                       ...| InnoDB Metrics - transaction         | NO      |
+-- | memory_current_allocated                      | 138244216               ...| Performance Schema                   | PARTIAL |
+-- | memory_total_allocated                        | 138244216               ...| Performance Schema                   | PARTIAL |
+-- | NOW()                                         | 2015-05-31 13:27:50.382 ...| System Time                          | YES     |
+-- | UNIX_TIMESTAMP()                              | 1433042870.382          ...| System Time                          | YES     |
+-- +-----------------------------------------------+-------------------------...+--------------------------------------+---------+
+-- 412 rows in set (0.02 sec)
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW metrics (
+  Variable_name,
+  Variable_value,
+  Type,
+  Enabled
+) AS
+(
+SELECT LOWER(VARIABLE_NAME) AS Variable_name, VARIABLE_VALUE AS Variable_value, 'Global Status' AS Type, 'YES' AS Enabled
+  FROM performance_schema.global_status
+) UNION ALL (
+SELECT NAME AS Variable_name, COUNT AS Variable_value,
+       CONCAT('InnoDB Metrics - ', SUBSYSTEM) AS Type,
+       IF(STATUS = 'enabled', 'YES', 'NO') AS Enabled
+  FROM information_schema.INNODB_METRICS
+  -- Deduplication - some variables exists both in GLOBAL_STATUS and INNODB_METRICS
+  -- Keep the one from GLOBAL_STATUS as it is always enabled and it's more likely to be used for existing tools.
+ WHERE NAME NOT IN (
+     'lock_row_lock_time', 'lock_row_lock_time_avg', 'lock_row_lock_time_max', 'lock_row_lock_waits',
+     'buffer_pool_reads', 'buffer_pool_read_requests', 'buffer_pool_write_requests', 'buffer_pool_wait_free',
+     'buffer_pool_read_ahead', 'buffer_pool_read_ahead_evicted', 'buffer_pool_pages_total', 'buffer_pool_pages_misc',
+     'buffer_pool_pages_data', 'buffer_pool_bytes_data', 'buffer_pool_pages_dirty', 'buffer_pool_bytes_dirty',
+     'buffer_pool_pages_free', 'buffer_pages_created', 'buffer_pages_written', 'buffer_pages_read',
+     'buffer_data_reads', 'buffer_data_written', 'file_num_open_files',
+     'os_log_bytes_written', 'os_log_fsyncs', 'os_log_pending_fsyncs', 'os_log_pending_writes',
+     'log_waits', 'log_write_requests', 'log_writes', 'innodb_dblwr_writes', 'innodb_dblwr_pages_written', 'innodb_page_size')
+) /*!50702
+  -- memory instrumentation available in 5.7.2 and later
+  UNION ALL (
+SELECT 'memory_current_allocated' AS Variable_name, SUM(CURRENT_NUMBER_OF_BYTES_USED) AS Variable_value, 'Performance Schema' AS Type,
+        IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = 0, 'NO',
+        IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = (SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%'), 'YES',
+            'PARTIAL')) AS Enabled
+  FROM performance_schema.memory_summary_global_by_event_name
+) UNION ALL (
+SELECT 'memory_total_allocated' AS Variable_name, SUM(SUM_NUMBER_OF_BYTES_ALLOC) AS Variable_value, 'Performance Schema' AS Type,
+        IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = 0, 'NO',
+        IF((SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%' AND ENABLED = 'YES') = (SELECT COUNT(*) FROM performance_schema.setup_instruments WHERE NAME LIKE 'memory/%'), 'YES',
+            'PARTIAL')) AS Enabled
+  FROM performance_schema.memory_summary_global_by_event_name
+) */
+  UNION ALL (
+SELECT 'NOW()' AS Variable_name, NOW(3) AS Variable_value, 'System Time' AS Type, 'YES' AS Enabled
+) UNION ALL (
+SELECT 'UNIX_TIMESTAMP()' AS Variable_name, ROUND(UNIX_TIMESTAMP(NOW(3)), 3) AS Variable_value, 'System Time' AS Type, 'YES' AS Enabled
+)
+ ORDER BY Type, Variable_name;
diff --git a/scripts/sys_schema/views/p_s/processlist.sql b/scripts/sys_schema/views/p_s/processlist.sql
new file mode 100644
index 000000000000..6bc844286c2d
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/processlist.sql
@@ -0,0 +1,147 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: processlist
+--
+-- A detailed non-blocking processlist view to replace 
+-- [INFORMATION_SCHEMA. | SHOW FULL] PROCESSLIST
+-- 
+-- Performs less locking than the legacy sources, whilst giving extra information.
+--
+-- mysql> select * from sys.processlist where conn_id is not null and command != 'daemon' and conn_id != connection_id()\G
+-- *************************** 1. row ***************************
+--                 thd_id: 44524
+--                conn_id: 44502
+--                   user: msandbox@localhost
+--                     db: test
+--                command: Query
+--                  state: alter table (flush)
+--                   time: 18
+--      current_statement: alter table t1 add column g int
+--      statement_latency: 18.45 s
+--               progress: 98.84
+--           lock_latency: 265.43 ms
+--          rows_examined: 0
+--              rows_sent: 0
+--          rows_affected: 0
+--             tmp_tables: 0
+--        tmp_disk_tables: 0
+--              full_scan: NO
+--         last_statement: NULL
+-- last_statement_latency: NULL
+--         current_memory: 664.06 KiB
+--              last_wait: wait/io/file/innodb/innodb_data_file
+--      last_wait_latency: 1.07 us
+--                 source: fil0fil.cc:5146
+--            trx_latency: NULL
+--              trx_state: NULL
+--         trx_autocommit: NULL
+--                    pid: 4212
+--           program_name: mysql
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW processlist (
+  thd_id,
+  conn_id,
+  user,
+  db,
+  command,
+  state,
+  time,
+  current_statement,
+  statement_latency,
+  progress,
+  lock_latency,
+  rows_examined,
+  rows_sent,
+  rows_affected,
+  tmp_tables,
+  tmp_disk_tables,
+  full_scan,
+  last_statement,
+  last_statement_latency,
+  current_memory,
+  last_wait,
+  last_wait_latency,
+  source,
+  trx_latency,
+  trx_state,
+  trx_autocommit,
+  pid,
+  program_name
+) AS
+SELECT pps.thread_id AS thd_id,
+       pps.processlist_id AS conn_id,
+       IF(pps.name IN ('thread/sql/one_connection', 'thread/thread_pool/tp_one_connection'),
+          CONCAT(pps.processlist_user, '@', pps.processlist_host),
+          REPLACE(pps.name, 'thread/', '')) user,
+       pps.processlist_db AS db,
+       pps.processlist_command AS command,
+       pps.processlist_state AS state,
+       pps.processlist_time AS time,
+       sys.format_statement(pps.processlist_info) AS current_statement,
+       IF(esc.end_event_id IS NULL,
+          sys.format_time(esc.timer_wait),
+          NULL) AS statement_latency,
+       IF(esc.end_event_id IS NULL,
+          ROUND(100 * (estc.work_completed / estc.work_estimated), 2),
+          NULL) AS progress,
+       sys.format_time(esc.lock_time) AS lock_latency,
+       esc.rows_examined AS rows_examined,
+       esc.rows_sent AS rows_sent,
+       esc.rows_affected AS rows_affected,
+       esc.created_tmp_tables AS tmp_tables,
+       esc.created_tmp_disk_tables AS tmp_disk_tables,
+       IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan,
+       IF(esc.end_event_id IS NOT NULL,
+          sys.format_statement(esc.sql_text),
+          NULL) AS last_statement,
+       IF(esc.end_event_id IS NOT NULL,
+          sys.format_time(esc.timer_wait),
+          NULL) AS last_statement_latency,
+       sys.format_bytes(mem.current_allocated) AS current_memory,
+       ewc.event_name AS last_wait,
+       IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL,
+          'Still Waiting',
+          sys.format_time(ewc.timer_wait)) last_wait_latency,
+       ewc.source,
+       sys.format_time(etc.timer_wait) AS trx_latency,
+       etc.state AS trx_state,
+       etc.autocommit AS trx_autocommit,
+       conattr_pid.attr_value as pid,
+       conattr_progname.attr_value as program_name
+  FROM performance_schema.threads AS pps
+  LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id)
+  LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id)
+  LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id)
+  LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id)
+  LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id)
+  LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid
+    ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid'
+  LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname
+    ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name'
+ ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
diff --git a/scripts/sys_schema/views/p_s/ps_check_lost_instrumentation.sql b/scripts/sys_schema/views/p_s/ps_check_lost_instrumentation.sql
new file mode 100644
index 000000000000..4442cab34718
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/ps_check_lost_instrumentation.sql
@@ -0,0 +1,50 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: ps_check_lost_instrumentation
+-- 
+-- Used to check whether Performance Schema is not able to monitor
+-- all runtime data - only returns variables that have lost instruments
+--
+-- mysql> select * from ps_check_lost_instrumentation;
+-- +----------------------------------------+----------------+
+-- | variable_name                          | variable_value |
+-- +----------------------------------------+----------------+
+-- | Performance_schema_file_handles_lost   | 101223         |
+-- | Performance_schema_file_instances_lost | 1231           |
+-- +----------------------------------------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW ps_check_lost_instrumentation (
+  variable_name,
+  variable_value
+)
+AS
+SELECT variable_name, variable_value
+  FROM performance_schema.global_status
+ WHERE variable_name LIKE 'perf%lost'
+   AND variable_value > 0;
diff --git a/scripts/sys_schema/views/p_s/schema_index_statistics.sql b/scripts/sys_schema/views/p_s/schema_index_statistics.sql
new file mode 100644
index 000000000000..aa0b0ca4b3ec
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_index_statistics.sql
@@ -0,0 +1,72 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: schema_index_statistics
+--
+-- Statistics around indexes.
+--
+-- Ordered by the total wait time descending - top indexes are most contended.
+--
+-- mysql> select * from schema_index_statistics limit 5;
+-- +------------------+-------------+------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+-- | table_schema     | table_name  | index_name | rows_selected | select_latency | rows_inserted | insert_latency | rows_updated | update_latency | rows_deleted | delete_latency |
+-- +------------------+-------------+------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+-- | mem              | mysqlserver | PRIMARY    |          6208 | 108.27 ms      |             0 | 0 ps           |         5470 | 1.47 s         |            0 | 0 ps           |
+-- | mem              | innodb      | PRIMARY    |          4666 | 76.27 ms       |             0 | 0 ps           |         4454 | 571.47 ms      |            0 | 0 ps           |
+-- | mem              | connection  | PRIMARY    |          1064 | 20.98 ms       |             0 | 0 ps           |         1064 | 457.30 ms      |            0 | 0 ps           |
+-- | mem              | environment | PRIMARY    |          5566 | 151.17 ms      |             0 | 0 ps           |          694 | 252.57 ms      |            0 | 0 ps           |
+-- | mem              | querycache  | PRIMARY    |          1698 | 27.99 ms       |             0 | 0 ps           |         1698 | 371.72 ms      |            0 | 0 ps           |
+-- +------------------+-------------+------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_index_statistics (
+  table_schema,
+  table_name,
+  index_name,
+  rows_selected,
+  select_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency
+) AS
+SELECT OBJECT_SCHEMA AS table_schema,
+       OBJECT_NAME AS table_name,
+       INDEX_NAME as index_name,
+       COUNT_FETCH AS rows_selected,
+       sys.format_time(SUM_TIMER_FETCH) AS select_latency,
+       COUNT_INSERT AS rows_inserted,
+       sys.format_time(SUM_TIMER_INSERT) AS insert_latency,
+       COUNT_UPDATE AS rows_updated,
+       sys.format_time(SUM_TIMER_UPDATE) AS update_latency,
+       COUNT_DELETE AS rows_deleted,
+       sys.format_time(SUM_TIMER_DELETE) AS delete_latency
+  FROM performance_schema.table_io_waits_summary_by_index_usage
+ WHERE index_name IS NOT NULL
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/schema_table_lock_waits.sql b/scripts/sys_schema/views/p_s/schema_table_lock_waits.sql
new file mode 100644
index 000000000000..a68c3b16a3eb
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_table_lock_waits.sql
@@ -0,0 +1,104 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: schema_table_lock_waits
+--
+-- Shows sessions that are blocked waiting on table metadata locks, and 
+-- who is blocking them.
+--
+-- mysql> select * from sys.schema_table_lock_waits\G
+-- *************************** 1. row ***************************
+--                object_schema: test
+--                  object_name: t
+--            waiting_thread_id: 43
+--                  waiting_pid: 21
+--              waiting_account: msandbox@localhost
+--            waiting_lock_type: SHARED_UPGRADABLE
+--        waiting_lock_duration: TRANSACTION
+--                waiting_query: alter table test.t add foo int
+--           waiting_query_secs: 988
+--  waiting_query_rows_affected: 0
+--  waiting_query_rows_examined: 0
+--           blocking_thread_id: 42
+--                 blocking_pid: 20
+--             blocking_account: msandbox@localhost
+--           blocking_lock_type: SHARED_NO_READ_WRITE
+--       blocking_lock_duration: TRANSACTION
+--      sql_kill_blocking_query: KILL QUERY 20
+-- sql_kill_blocking_connection: KILL 20
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_table_lock_waits (
+  object_schema,
+  object_name,
+  waiting_thread_id,
+  waiting_pid,
+  waiting_account,
+  waiting_lock_type,
+  waiting_lock_duration,
+  waiting_query,
+  waiting_query_secs,
+  waiting_query_rows_affected,
+  waiting_query_rows_examined,
+  blocking_thread_id,
+  blocking_pid,
+  blocking_account,
+  blocking_lock_type,
+  blocking_lock_duration,
+  sql_kill_blocking_query,
+  sql_kill_blocking_connection
+) AS
+SELECT g.object_schema AS object_schema,
+       g.object_name AS object_name,
+       pt.thread_id AS waiting_thread_id,
+       pt.processlist_id AS waiting_pid,
+       sys.ps_thread_account(p.owner_thread_id) AS waiting_account,
+       p.lock_type AS waiting_lock_type,
+       p.lock_duration AS waiting_lock_duration,
+       sys.format_statement(pt.processlist_info) AS waiting_query,
+       pt.processlist_time AS waiting_query_secs,
+       ps.rows_affected AS waiting_query_rows_affected,
+       ps.rows_examined AS waiting_query_rows_examined,
+       gt.thread_id AS blocking_thread_id,
+       gt.processlist_id AS blocking_pid,
+       sys.ps_thread_account(g.owner_thread_id) AS blocking_account,
+       g.lock_type AS blocking_lock_type,
+       g.lock_duration AS blocking_lock_duration,
+       CONCAT('KILL QUERY ', gt.processlist_id) AS sql_kill_blocking_query,
+       CONCAT('KILL ', gt.processlist_id) AS sql_kill_blocking_connection
+  FROM performance_schema.metadata_locks g
+ INNER JOIN performance_schema.metadata_locks p 
+    ON g.object_type = p.object_type
+   AND g.object_schema = p.object_schema
+   AND g.object_name = p.object_name
+   AND g.lock_status = 'GRANTED'
+   AND p.lock_status = 'PENDING'
+ INNER JOIN performance_schema.threads gt ON g.owner_thread_id = gt.thread_id
+ INNER JOIN performance_schema.threads pt ON p.owner_thread_id = pt.thread_id
+  LEFT JOIN performance_schema.events_statements_current gs ON g.owner_thread_id = gs.thread_id
+  LEFT JOIN performance_schema.events_statements_current ps ON p.owner_thread_id = ps.thread_id
+ WHERE g.object_type = 'TABLE';
diff --git a/scripts/sys_schema/views/p_s/schema_table_statistics.sql b/scripts/sys_schema/views/p_s/schema_table_statistics.sql
new file mode 100644
index 000000000000..7c8a1107da1a
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_table_statistics.sql
@@ -0,0 +1,101 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: schema_table_statistics
+--
+-- Statistics around tables.
+--
+-- Ordered by the total wait time descending - top tables are most contended.
+-- 
+-- mysql> SELECT * FROM schema_table_statistics\G
+-- *************************** 1. row ***************************
+--      table_schema: sys
+--        table_name: sys_config
+--     total_latency: 0 ps
+--      rows_fetched: 0
+--     fetch_latency: 0 ps
+--     rows_inserted: 0
+--    insert_latency: 0 ps
+--      rows_updated: 0
+--    update_latency: 0 ps
+--      rows_deleted: 0
+--    delete_latency: 0 ps
+--  io_read_requests: 8
+--           io_read: 2.28 KiB
+--   io_read_latency: 727.32 us
+-- io_write_requests: 0
+--          io_write: 0 bytes
+--  io_write_latency: 0 ps
+--  io_misc_requests: 10
+--   io_misc_latency: 126.88 us
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_table_statistics (
+  table_schema,
+  table_name,
+  total_latency,
+  rows_fetched,
+  fetch_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency,
+  io_read_requests,
+  io_read,
+  io_read_latency,
+  io_write_requests,
+  io_write,
+  io_write_latency,
+  io_misc_requests,
+  io_misc_latency
+) AS
+SELECT pst.object_schema AS table_schema,
+       pst.object_name AS table_name,
+       sys.format_time(pst.sum_timer_wait) AS total_latency,
+       pst.count_fetch AS rows_fetched,
+       sys.format_time(pst.sum_timer_fetch) AS fetch_latency,
+       pst.count_insert AS rows_inserted,
+       sys.format_time(pst.sum_timer_insert) AS insert_latency,
+       pst.count_update AS rows_updated,
+       sys.format_time(pst.sum_timer_update) AS update_latency,
+       pst.count_delete AS rows_deleted,
+       sys.format_time(pst.sum_timer_delete) AS delete_latency,
+       fsbi.count_read AS io_read_requests,
+       sys.format_bytes(fsbi.sum_number_of_bytes_read) AS io_read,
+       sys.format_time(fsbi.sum_timer_read) AS io_read_latency,
+       fsbi.count_write AS io_write_requests,
+       sys.format_bytes(fsbi.sum_number_of_bytes_write) AS io_write,
+       sys.format_time(fsbi.sum_timer_write) AS io_write_latency,
+       fsbi.count_misc AS io_misc_requests,
+       sys.format_time(fsbi.sum_timer_misc) AS io_misc_latency
+  FROM performance_schema.table_io_waits_summary_by_table AS pst
+  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi
+    ON pst.object_schema = fsbi.table_schema
+   AND pst.object_name = fsbi.table_name
+ ORDER BY pst.sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/schema_table_statistics_with_buffer.sql b/scripts/sys_schema/views/p_s/schema_table_statistics_with_buffer.sql
new file mode 100644
index 000000000000..a1dc76afd701
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_table_statistics_with_buffer.sql
@@ -0,0 +1,123 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: schema_table_statistics_with_buffer
+--
+-- Statistics around tables.
+--
+-- Ordered by the total wait time descending - top tables are most contended.
+--
+-- More statistics such as caching stats for the InnoDB buffer pool with InnoDB tables
+--
+-- mysql> select * from schema_table_statistics_with_buffer limit 1\G
+-- *************************** 1. row ***************************
+--                  table_schema: mem
+--                    table_name: mysqlserver
+--                  rows_fetched: 27087
+--                 fetch_latency: 442.72 ms
+--                 rows_inserted: 2
+--                insert_latency: 185.04 us 
+--                  rows_updated: 5096
+--                update_latency: 1.39 s
+--                  rows_deleted: 0
+--                delete_latency: 0 ps
+--              io_read_requests: 2565
+--                 io_read_bytes: 1121627
+--               io_read_latency: 10.07 ms
+--             io_write_requests: 1691
+--                io_write_bytes: 128383
+--              io_write_latency: 14.17 ms
+--              io_misc_requests: 2698
+--               io_misc_latency: 433.66 ms
+--           innodb_buffer_pages: 19
+--    innodb_buffer_pages_hashed: 19
+--       innodb_buffer_pages_old: 19
+-- innodb_buffer_bytes_allocated: 311296
+--      innodb_buffer_bytes_data: 1924
+--     innodb_buffer_rows_cached: 2
+--
+ 
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_table_statistics_with_buffer (
+  table_schema,
+  table_name,
+  rows_fetched,
+  fetch_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency,
+  io_read_requests,
+  io_read,
+  io_read_latency,
+  io_write_requests,
+  io_write,
+  io_write_latency,
+  io_misc_requests,
+  io_misc_latency,
+  innodb_buffer_allocated,
+  innodb_buffer_data,
+  innodb_buffer_free,
+  innodb_buffer_pages,
+  innodb_buffer_pages_hashed,
+  innodb_buffer_pages_old,
+  innodb_buffer_rows_cached
+) AS
+SELECT pst.object_schema AS table_schema,
+       pst.object_name AS table_name,
+       pst.count_fetch AS rows_fetched,
+       sys.format_time(pst.sum_timer_fetch) AS fetch_latency,
+       pst.count_insert AS rows_inserted,
+       sys.format_time(pst.sum_timer_insert) AS insert_latency,
+       pst.count_update AS rows_updated,
+       sys.format_time(pst.sum_timer_update) AS update_latency,
+       pst.count_delete AS rows_deleted,
+       sys.format_time(pst.sum_timer_delete) AS delete_latency,
+       fsbi.count_read AS io_read_requests,
+       sys.format_bytes(fsbi.sum_number_of_bytes_read) AS io_read,
+       sys.format_time(fsbi.sum_timer_read) AS io_read_latency,
+       fsbi.count_write AS io_write_requests,
+       sys.format_bytes(fsbi.sum_number_of_bytes_write) AS io_write,
+       sys.format_time(fsbi.sum_timer_write) AS io_write_latency,
+       fsbi.count_misc AS io_misc_requests,
+       sys.format_time(fsbi.sum_timer_misc) AS io_misc_latency,
+       sys.format_bytes(ibp.allocated) AS innodb_buffer_allocated,
+       sys.format_bytes(ibp.data) AS innodb_buffer_data,
+       sys.format_bytes(ibp.allocated - ibp.data) AS innodb_buffer_free,
+       ibp.pages AS innodb_buffer_pages,
+       ibp.pages_hashed AS innodb_buffer_pages_hashed,
+       ibp.pages_old AS innodb_buffer_pages_old,
+       ibp.rows_cached AS innodb_buffer_rows_cached
+  FROM performance_schema.table_io_waits_summary_by_table AS pst
+  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi
+    ON pst.object_schema = fsbi.table_schema
+   AND pst.object_name = fsbi.table_name
+  LEFT JOIN sys.x$innodb_buffer_stats_by_table AS ibp
+    ON pst.object_schema = ibp.object_schema
+   AND pst.object_name = ibp.object_name
+ ORDER BY pst.sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/schema_tables_with_full_table_scans.sql b/scripts/sys_schema/views/p_s/schema_tables_with_full_table_scans.sql
new file mode 100644
index 000000000000..08824dde96b7
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_tables_with_full_table_scans.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: schema_tables_with_full_table_scans
+--
+-- Find tables that are being accessed by full table scans
+-- ordering by the number of rows scanned descending.
+--
+-- mysql> select * from schema_tables_with_full_table_scans limit 5;
+-- +--------------------+--------------------------------+-------------------+-----------+
+-- | object_schema      | object_name                    | rows_full_scanned | latency   |
+-- +--------------------+--------------------------------+-------------------+-----------+
+-- | mem30__instruments | fsstatistics                   |          10207042 | 13.10 s   |
+-- | mem30__instruments | preparedstatementapidata       |            436428 | 973.27 ms |
+-- | mem30__instruments | mysqlprocessactivity           |            411702 | 282.07 ms |
+-- | mem30__instruments | querycachequeriesincachedata   |            374011 | 767.15 ms |
+-- | mem30__instruments | rowaccessesdata                |            322321 | 1.55 s    |
+-- +--------------------+--------------------------------+-------------------+-----------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_tables_with_full_table_scans (
+  object_schema,
+  object_name,
+  rows_full_scanned,
+  latency
+) AS
+SELECT object_schema, 
+       object_name,
+       count_read AS rows_full_scanned,
+       sys.format_time(sum_timer_wait) AS latency
+  FROM performance_schema.table_io_waits_summary_by_index_usage 
+ WHERE index_name IS NULL
+   AND count_read > 0
+ ORDER BY count_read DESC;
diff --git a/scripts/sys_schema/views/p_s/schema_unused_indexes.sql b/scripts/sys_schema/views/p_s/schema_unused_indexes.sql
new file mode 100644
index 000000000000..8559dcac3e63
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/schema_unused_indexes.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: schema_unused_indexes
+-- 
+-- Finds indexes that have had no events against them (and hence, no usage).
+--
+-- To trust whether the data from this view is representative of your workload,
+-- you should ensure that the server has been up for a representative amount of
+-- time before using it.
+--
+-- PRIMARY (key) indexes are ignored.
+--
+-- mysql> select * from schema_unused_indexes limit 5;
+-- +--------------------+---------------------+--------------------+
+-- | object_schema      | object_name         | index_name         |
+-- +--------------------+---------------------+--------------------+
+-- | mem30__bean_config | plists              | path               |
+-- | mem30__config      | group_selections    | name               |
+-- | mem30__config      | notification_groups | name               |
+-- | mem30__config      | user_form_defaults  | FKC1AEF1F9E7EE2CFB |
+-- | mem30__enterprise  | whats_new_entries   | entryId            |
+-- +--------------------+---------------------+--------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW schema_unused_indexes (
+  object_schema,
+  object_name,
+  index_name
+) AS
+SELECT t.object_schema,
+       t.object_name,
+       t.index_name
+  FROM performance_schema.table_io_waits_summary_by_index_usage t
+ INNER JOIN information_schema.statistics s
+    ON t.object_schema = s.table_schema
+   AND t.object_name = s.table_name
+   AND t.index_name = s.index_name
+ WHERE t.index_name IS NOT NULL
+   AND t.count_star = 0
+   AND t.object_schema != 'mysql'
+   AND t.index_name != 'PRIMARY'
+   AND s.NON_UNIQUE = 1
+   AND s.SEQ_IN_INDEX = 1
+ ORDER BY object_schema, object_name;
diff --git a/scripts/sys_schema/views/p_s/session_ssl_status.sql b/scripts/sys_schema/views/p_s/session_ssl_status.sql
new file mode 100644
index 000000000000..e1f372724344
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/session_ssl_status.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: session_ssl_status
+--
+-- Shows SSL version, cipher and the count of re-used SSL sessions per connection
+--
+-- mysql> select * from session_ssl_status;
+-- +-----------+-------------+--------------------+---------------------+
+-- | thread_id | ssl_version | ssl_cipher         | ssl_sessions_reused |
+-- +-----------+-------------+--------------------+---------------------+
+-- |        26 | TLSv1       | DHE-RSA-AES256-SHA | 0                   |
+-- |        27 | TLSv1       | DHE-RSA-AES256-SHA | 0                   |
+-- |        28 | TLSv1       | DHE-RSA-AES256-SHA | 0                   |
+-- +-----------+-------------+--------------------+---------------------+
+-- 3 rows in set (0.00 sec)
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW session_ssl_status (
+  thread_id,
+  ssl_version,
+  ssl_cipher,
+  ssl_sessions_reused
+) AS
+SELECT sslver.thread_id, 
+       sslver.variable_value ssl_version, 
+       sslcip.variable_value ssl_cipher,
+       sslreuse.variable_value ssl_sessions_reused
+  FROM performance_schema.status_by_thread sslver 
+  LEFT JOIN performance_schema.status_by_thread sslcip 
+    ON (sslcip.thread_id=sslver.thread_id and sslcip.variable_name='Ssl_cipher')
+  LEFT JOIN performance_schema.status_by_thread sslreuse 
+    ON (sslreuse.thread_id=sslver.thread_id and sslreuse.variable_name='Ssl_sessions_reused') 
+ WHERE sslver.variable_name='Ssl_version';
diff --git a/scripts/sys_schema/views/p_s/sessions.sql b/scripts/sys_schema/views/p_s/sessions.sql
new file mode 100644
index 000000000000..f1c676e954fa
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/sessions.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: session
+--
+-- Filter sys.processlist to only show user sessions and not background threads.
+-- This is a non-blocking closer replacement to
+-- [INFORMATION_SCHEMA. | SHOW FULL] PROCESSLIST
+-- 
+-- Performs less locking than the legacy sources, whilst giving extra information.
+--
+-- mysql> select * from sys.session\G
+-- *************************** 1. row ***************************
+--                 thd_id: 24
+--                conn_id: 2
+--                   user: root@localhost
+--                     db: sys
+--                command: Query
+--                  state: Sending data
+--                   time: 0
+--      current_statement: select * from sys.session
+--      statement_latency: 137.22 ms
+--               progress: NULL
+--           lock_latency: 33.75 ms
+--          rows_examined: 0
+--              rows_sent: 0
+--          rows_affected: 0
+--             tmp_tables: 4
+--        tmp_disk_tables: 1
+--              full_scan: YES
+--         last_statement: NULL
+-- last_statement_latency: NULL
+--         current_memory: 3.26 MiB
+--              last_wait: wait/synch/mutex/innodb/file_format_max_mutex
+--      last_wait_latency: 64.09 ns
+--                 source: trx0sys.cc:778
+--            trx_latency: 7.88 s
+--              trx_state: ACTIVE
+--         trx_autocommit: NO
+--                    pid: 4212
+--           program_name: mysql
+--
+
+CREATE OR REPLACE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW session
+ AS
+SELECT * FROM sys.processlist
+WHERE conn_id IS NOT NULL AND command != 'Daemon';
+
diff --git a/scripts/sys_schema/views/p_s/statement_analysis.sql b/scripts/sys_schema/views/p_s/statement_analysis.sql
new file mode 100644
index 000000000000..ed9ab4e93e15
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statement_analysis.sql
@@ -0,0 +1,110 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: statement_analysis
+--
+-- Lists a normalized statement view with aggregated statistics,
+-- mimics the MySQL Enterprise Monitor Query Analysis view,
+-- ordered by the total execution time per normalized statement
+-- 
+-- mysql> select- * from statement_analysis limit 1\G
+-- *************************** 1. row--**************************
+--             query: SELECT * FROM `schema_object_o ... MA` , `information_schema` ...
+--                db: sys
+--         full_scan: *
+--        exec_count: 2
+--         err_count: 0
+--        warn_count: 0
+--     total_latency: 16.75 s
+--       max_latency: 16.57 s
+--       avg_latency: 8.38 s
+--      lock_latency: 16.69 s
+--         rows_sent: 84
+--     rows_sent_avg: 42
+--     rows_examined: 20012
+--     rows_affected: 0
+-- rows_affected_avg: 0
+-- rows_examined_avg: 10006
+--        tmp_tables: 378
+--   tmp_disk_tables: 66
+--       rows_sorted: 168
+-- sort_merge_passes: 0
+--            digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--        first_seen: 2014-03-07 13:13:41
+--         last_seen: 2014-03-07 13:13:48
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statement_analysis (
+  query,
+  db,
+  full_scan,
+  exec_count,
+  err_count,
+  warn_count,
+  total_latency,
+  max_latency,
+  avg_latency,
+  lock_latency,
+  rows_sent,
+  rows_sent_avg,
+  rows_examined,
+  rows_examined_avg,
+  rows_affected,
+  rows_affected_avg,
+  tmp_tables,
+  tmp_disk_tables,
+  rows_sorted,
+  sort_merge_passes,
+  digest,
+  first_seen,
+  last_seen
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME AS db,
+       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, '*', '') AS full_scan,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS err_count,
+       SUM_WARNINGS AS warn_count,
+       sys.format_time(SUM_TIMER_WAIT) AS total_latency,
+       sys.format_time(MAX_TIMER_WAIT) AS max_latency,
+       sys.format_time(AVG_TIMER_WAIT) AS avg_latency,
+       sys.format_time(SUM_LOCK_TIME) AS lock_latency,
+       SUM_ROWS_SENT AS rows_sent,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,
+       SUM_ROWS_AFFECTED AS rows_affected,
+       ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0))  AS rows_affected_avg,
+       SUM_CREATED_TMP_TABLES AS tmp_tables,
+       SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,
+       SUM_SORT_ROWS AS rows_sorted,
+       SUM_SORT_MERGE_PASSES AS sort_merge_passes,
+       DIGEST AS digest,
+       FIRST_SEEN AS first_seen,
+       LAST_SEEN as last_seen
+  FROM performance_schema.events_statements_summary_by_digest
+ORDER BY SUM_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/statements_with_errors_or_warnings.sql b/scripts/sys_schema/views/p_s/statements_with_errors_or_warnings.sql
new file mode 100644
index 000000000000..13e4c5c102b2
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statements_with_errors_or_warnings.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: statements_with_errors_or_warnings
+--
+-- Lists all normalized statements that have raised errors or warnings.
+--
+-- mysql> select * from statements_with_errors_or_warnings LIMIT 1\G
+-- *************************** 1. row ***************************
+--       query: CREATE OR REPLACE ALGORITHM =  ... _delete` AS `rows_deleted` ...
+--          db: sys
+--  exec_count: 2
+--      errors: 1
+--   error_pct: 50.0000
+--    warnings: 0
+-- warning_pct: 0.0000
+--  first_seen: 2014-03-07 12:56:54
+--   last_seen: 2014-03-07 13:01:01
+--      digest: 943a788859e623d5f7798ba0ae0fd8a9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statements_with_errors_or_warnings (
+  query,
+  db,
+  exec_count,
+  errors,
+  error_pct,
+  warnings,
+  warning_pct,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS errors,
+       IFNULL(SUM_ERRORS / NULLIF(COUNT_STAR, 0), 0) * 100 as error_pct,
+       SUM_WARNINGS AS warnings,
+       IFNULL(SUM_WARNINGS / NULLIF(COUNT_STAR, 0), 0) * 100 as warning_pct,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_ERRORS > 0
+    OR SUM_WARNINGS > 0
+ORDER BY SUM_ERRORS DESC, SUM_WARNINGS DESC;
diff --git a/scripts/sys_schema/views/p_s/statements_with_full_table_scans.sql b/scripts/sys_schema/views/p_s/statements_with_full_table_scans.sql
new file mode 100644
index 000000000000..2b75ac284bab
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statements_with_full_table_scans.sql
@@ -0,0 +1,89 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: statements_with_full_table_scans
+--
+-- Lists all normalized statements that use have done a full table scan
+-- ordered by number the percentage of times a full scan was done,
+-- then by the statement latency.
+--
+-- This view ignores SHOW statements, as these always cause a full table scan,
+-- and there is nothing that can be done about this.
+--
+-- mysql> select * from statements_with_full_table_scans limit 1\G
+-- *************************** 1. row ***************************
+--                    query: SELECT * FROM `schema_tables_w ... ex_usage` . `COUNT_READ` DESC
+--                       db: sys
+--               exec_count: 1
+--            total_latency: 88.20 ms
+--      no_index_used_count: 1
+-- no_good_index_used_count: 0
+--        no_index_used_pct: 100
+--                rows_sent: 0
+--            rows_examined: 1501
+--            rows_sent_avg: 0
+--        rows_examined_avg: 1501
+--               first_seen: 2014-03-07 13:58:20
+--                last_seen: 2014-03-07 13:58:20
+--                   digest: 64baecd5c1e1e1651a6b92e55442a288
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statements_with_full_table_scans (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  no_index_used_count,
+  no_good_index_used_count,
+  no_index_used_pct,
+  rows_sent,
+  rows_examined,
+  rows_sent_avg,
+  rows_examined_avg,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       sys.format_time(SUM_TIMER_WAIT) AS total_latency,
+       SUM_NO_INDEX_USED AS no_index_used_count,
+       SUM_NO_GOOD_INDEX_USED AS no_good_index_used_count,
+       ROUND(IFNULL(SUM_NO_INDEX_USED / NULLIF(COUNT_STAR, 0), 0) * 100) AS no_index_used_pct,
+       SUM_ROWS_SENT AS rows_sent,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(SUM_ROWS_SENT/COUNT_STAR) AS rows_sent_avg,
+       ROUND(SUM_ROWS_EXAMINED/COUNT_STAR) AS rows_examined_avg,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE (SUM_NO_INDEX_USED > 0
+    OR SUM_NO_GOOD_INDEX_USED > 0)
+   AND DIGEST_TEXT NOT LIKE 'SHOW%'
+ ORDER BY no_index_used_pct DESC, total_latency DESC;
diff --git a/scripts/sys_schema/views/p_s/statements_with_runtimes_in_95th_percentile.sql b/scripts/sys_schema/views/p_s/statements_with_runtimes_in_95th_percentile.sql
new file mode 100644
index 000000000000..c3fe1821dc65
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statements_with_runtimes_in_95th_percentile.sql
@@ -0,0 +1,81 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: statements_with_runtimes_in_95th_percentile
+--
+-- List all statements whose average runtime, in microseconds, is in the top 95th percentile.
+-- 
+-- mysql> select * from statements_with_runtimes_in_95th_percentile limit 5;
+-- +-------------------------------------------------------------------+------+-----------+------------+-----------+------------+---------------+-------------+-------------+-----------+---------------+---------------+-------------------+---------------------+---------------------+----------------------------------+
+-- | query                                                             | db   | full_scan | exec_count | err_count | warn_count | total_latency | max_latency | avg_latency | rows_sent | rows_sent_avg | rows_examined | rows_examined_avg | FIRST_SEEN          | LAST_SEEN           | digest                           |
+-- +-------------------------------------------------------------------+------+-----------+------------+-----------+------------+---------------+-------------+-------------+-----------+---------------+---------------+-------------------+---------------------+---------------------+----------------------------------+
+-- | SELECT `e` . `round_robin_bin` ...  `timestamp` = `maxes` . `ts`  | mem  | *         |         14 |         0 |          0 | 43.96 s       | 6.69 s      | 3.14 s      |        11 |             1 |        253170 |             18084 | 2013-12-04 20:05:01 | 2013-12-04 20:06:34 | 29ba002bf039bb6439357a10134407de |
+-- | SELECT `e` . `round_robin_bin` ...  `timestamp` = `maxes` . `ts`  | mem  | *         |          8 |         0 |          0 | 17.89 s       | 4.12 s      | 2.24 s      |         7 |             1 |        169534 |             21192 | 2013-12-04 20:04:54 | 2013-12-04 20:05:05 | 0b1c1f91e7e9e0ff91aa49d15f540793 |
+-- | SELECT `e` . `round_robin_bin` ...  `timestamp` = `maxes` . `ts`  | mem  | *         |          1 |         0 |          0 | 2.22 s        | 2.22 s      | 2.22 s      |         1 |             1 |         40322 |             40322 | 2013-12-04 20:05:39 | 2013-12-04 20:05:39 | 07b27145c8f8a3779737df5032374833 |
+-- | SELECT `e` . `round_robin_bin` ...  `timestamp` = `maxes` . `ts`  | mem  | *         |          1 |         0 |          0 | 1.97 s        | 1.97 s      | 1.97 s      |         1 |             1 |         40322 |             40322 | 2013-12-04 20:05:39 | 2013-12-04 20:05:39 | a07488137ea5c1bccf3e291c50bfd21f |
+-- | SELECT `e` . `round_robin_bin` ...  `timestamp` = `maxes` . `ts`  | mem  | *         |          2 |         0 |          0 | 3.91 s        | 3.91 s      | 1.96 s      |         1 |             1 |         13126 |              6563 | 2013-12-04 20:05:04 | 2013-12-04 20:06:34 | b8bddc6566366dafc7e474f67096a93b |
+-- +-------------------------------------------------------------------+------+-----------+------------+-----------+------------+---------------+-------------+-------------+-----------+---------------+---------------+-------------------+---------------------+---------------------+----------------------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statements_with_runtimes_in_95th_percentile (
+  query,
+  db,
+  full_scan,
+  exec_count,
+  err_count,
+  warn_count,
+  total_latency,
+  max_latency,
+  avg_latency,
+  rows_sent,
+  rows_sent_avg,
+  rows_examined,
+  rows_examined_avg,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME as db,
+       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, '*', '') AS full_scan,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS err_count,
+       SUM_WARNINGS AS warn_count,
+       sys.format_time(SUM_TIMER_WAIT) AS total_latency,
+       sys.format_time(MAX_TIMER_WAIT) AS max_latency,
+       sys.format_time(AVG_TIMER_WAIT) AS avg_latency,
+       SUM_ROWS_SENT AS rows_sent,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg,
+       FIRST_SEEN AS first_seen,
+       LAST_SEEN AS last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest stmts
+  JOIN sys.x$ps_digest_95th_percentile_by_avg_us AS top_percentile
+    ON ROUND(stmts.avg_timer_wait/1000000) >= top_percentile.avg_us
+ ORDER BY AVG_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/statements_with_sorting.sql b/scripts/sys_schema/views/p_s/statements_with_sorting.sql
new file mode 100644
index 000000000000..305ebb1af51e
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statements_with_sorting.sql
@@ -0,0 +1,80 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: statements_with_sorting
+--
+-- Lists all normalized statements that have done sorts,
+-- ordered by total_latency descending.
+--
+-- mysql> select * from statements_with_sorting limit 1\G
+-- *************************** 1. row ***************************
+--             query: SELECT * FROM `schema_object_o ... MA` , `information_schema` ...
+--                db: sys
+--        exec_count: 2
+--     total_latency: 16.75 s
+-- sort_merge_passes: 0
+--   avg_sort_merges: 0
+-- sorts_using_scans: 12
+--  sort_using_range: 0
+--       rows_sorted: 168
+--   avg_rows_sorted: 84
+--        first_seen: 2014-03-07 13:13:41
+--         last_seen: 2014-03-07 13:13:48
+--            digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statements_with_sorting (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  sort_merge_passes,
+  avg_sort_merges,
+  sorts_using_scans,
+  sort_using_range,
+  rows_sorted,
+  avg_rows_sorted,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME db,
+       COUNT_STAR AS exec_count,
+       sys.format_time(SUM_TIMER_WAIT) AS total_latency,
+       SUM_SORT_MERGE_PASSES AS sort_merge_passes,
+       ROUND(IFNULL(SUM_SORT_MERGE_PASSES / NULLIF(COUNT_STAR, 0), 0)) AS avg_sort_merges,
+       SUM_SORT_SCAN AS sorts_using_scans,
+       SUM_SORT_RANGE AS sort_using_range,
+       SUM_SORT_ROWS AS rows_sorted,
+       ROUND(IFNULL(SUM_SORT_ROWS / NULLIF(COUNT_STAR, 0), 0)) AS avg_rows_sorted,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_SORT_ROWS > 0
+ ORDER BY SUM_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/statements_with_temp_tables.sql b/scripts/sys_schema/views/p_s/statements_with_temp_tables.sql
new file mode 100644
index 000000000000..74c196476423
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/statements_with_temp_tables.sql
@@ -0,0 +1,75 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: statements_with_temp_tables
+--
+-- Lists all normalized statements that use temporary tables
+-- ordered by number of on disk temporary tables descending first, 
+-- then by the number of memory tables.
+--
+-- mysql> select * from statements_with_temp_tables limit 1\G
+-- *************************** 1. row ***************************
+--                    query: SELECT * FROM `schema_object_o ... MA` , `information_schema` ...
+--                       db: sys
+--               exec_count: 2
+--            total_latency: 16.75 s
+--        memory_tmp_tables: 378
+--          disk_tmp_tables: 66
+-- avg_tmp_tables_per_query: 189
+--   tmp_tables_to_disk_pct: 17
+--               first_seen: 2014-03-07 13:13:41
+--                last_seen: 2014-03-07 13:13:48
+--                   digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW statements_with_temp_tables (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  memory_tmp_tables,
+  disk_tmp_tables,
+  avg_tmp_tables_per_query,
+  tmp_tables_to_disk_pct,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT sys.format_statement(DIGEST_TEXT) AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       sys.format_time(SUM_TIMER_WAIT) as total_latency,
+       SUM_CREATED_TMP_TABLES AS memory_tmp_tables,
+       SUM_CREATED_TMP_DISK_TABLES AS disk_tmp_tables,
+       ROUND(IFNULL(SUM_CREATED_TMP_TABLES / NULLIF(COUNT_STAR, 0), 0)) AS avg_tmp_tables_per_query,
+       ROUND(IFNULL(SUM_CREATED_TMP_DISK_TABLES / NULLIF(SUM_CREATED_TMP_TABLES, 0), 0) * 100) AS tmp_tables_to_disk_pct,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_CREATED_TMP_TABLES > 0
+ORDER BY SUM_CREATED_TMP_DISK_TABLES DESC, SUM_CREATED_TMP_TABLES DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary.sql b/scripts/sys_schema/views/p_s/user_summary.sql
new file mode 100644
index 000000000000..3812d5598f6a
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary.sql
@@ -0,0 +1,74 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary
+--
+-- Summarizes statement activity and connections by user
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+--
+-- mysql> select * from user_summary;
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | user | statements | total_latency | avg_latency | current_connections | total_connections | unique_hosts | current_memory | total_memory_allocated |
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | root |       5663 | 00:01:47.14   | 18.92 ms    |                   1 |                 1 |            1 | 1.41 MiB       | 543.55 MiB             |
+-- | mark |        225 | 14.49 s       | 64.40 ms    |                   1 |                 1 |            1 | 707.60 KiB     | 81.02 MiB              |
+-- +------+------------+---------------+-------------+---------------------+-------------------+--------------+----------------+------------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary (
+  user,
+  statements,
+  statement_latency,
+  statement_avg_latency,
+  table_scans,
+  file_ios,
+  file_io_latency,
+  current_connections,
+  total_connections,
+  unique_hosts,
+  current_memory,
+  total_memory_allocated
+) AS
+SELECT IF(accounts.user IS NULL, 'background', accounts.user) AS user,
+       SUM(stmt.total) AS statements,
+       sys.format_time(SUM(stmt.total_latency)) AS statement_latency,
+       sys.format_time(IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0)) AS statement_avg_latency,
+       SUM(stmt.full_scans) AS table_scans,
+       SUM(io.ios) AS file_ios,
+       sys.format_time(SUM(io.io_latency)) AS file_io_latency,
+       SUM(accounts.current_connections) AS current_connections,
+       SUM(accounts.total_connections) AS total_connections,
+       COUNT(DISTINCT host) AS unique_hosts,
+       sys.format_bytes(SUM(mem.current_allocated)) AS current_memory,
+       sys.format_bytes(SUM(mem.total_allocated)) AS total_memory_allocated
+  FROM performance_schema.accounts
+  LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, 'background', accounts.user) = stmt.user
+  LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, 'background', accounts.user) = io.user
+  LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, 'background', accounts.user) = mem.user
+ GROUP BY IF(accounts.user IS NULL, 'background', accounts.user)
+ ORDER BY SUM(stmt.total_latency) DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary_by_file_io.sql b/scripts/sys_schema/views/p_s/user_summary_by_file_io.sql
new file mode 100644
index 000000000000..58bad7dc68bc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary_by_file_io.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary_by_file_io
+--
+-- Summarizes file IO totals per user.
+--
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from user_summary_by_file_io;
+-- +------------+-------+------------+
+-- | user       | ios   | io_latency |
+-- +------------+-------+------------+
+-- | root       | 26457 | 21.58 s    |
+-- | background |  1189 | 394.21 ms  |
+-- +------------+-------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary_by_file_io (
+  user,
+  ios,
+  io_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS ios,
+       sys.format_time(SUM(sum_timer_wait)) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%'
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary_by_file_io_type.sql b/scripts/sys_schema/views/p_s/user_summary_by_file_io_type.sql
new file mode 100644
index 000000000000..0573ea794594
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary_by_file_io_type.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary_by_file_io_type
+--
+-- Summarizes file IO by event type per user.
+--
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from user_summary_by_file_io_type;
+-- +------------+--------------------------------------+-------+-----------+-------------+
+-- | user       | event_name                           | total | latency   | max_latency |
+-- +------------+--------------------------------------+-------+-----------+-------------+
+-- | background | wait/io/file/sql/FRM                 |   871 | 168.15 ms | 18.48 ms    |
+-- | background | wait/io/file/innodb/innodb_data_file |   173 | 129.56 ms | 34.09 ms    |
+-- | background | wait/io/file/innodb/innodb_log_file  |    20 | 77.53 ms  | 60.66 ms    |
+-- | background | wait/io/file/myisam/dfile            |    40 | 6.54 ms   | 4.58 ms     |
+-- | background | wait/io/file/mysys/charset           |     3 | 4.79 ms   | 4.71 ms     |
+-- | background | wait/io/file/myisam/kfile            |    67 | 4.38 ms   | 300.04 us   |
+-- | background | wait/io/file/sql/ERRMSG              |     5 | 2.72 ms   | 1.69 ms     |
+-- | background | wait/io/file/sql/pid                 |     3 | 266.30 us | 185.47 us   |
+-- | background | wait/io/file/sql/casetest            |     5 | 246.81 us | 150.19 us   |
+-- | background | wait/io/file/sql/global_ddl_log      |     2 | 21.24 us  | 18.59 us    |
+-- | root       | wait/io/file/sql/file_parser         |  1422 | 4.80 s    | 135.14 ms   |
+-- | root       | wait/io/file/sql/FRM                 |   865 | 85.82 ms  | 9.81 ms     |
+-- | root       | wait/io/file/myisam/kfile            |  1073 | 37.14 ms  | 15.79 ms    |
+-- | root       | wait/io/file/myisam/dfile            |  2991 | 25.53 ms  | 5.25 ms     |
+-- | root       | wait/io/file/sql/dbopt               |    20 | 1.07 ms   | 153.07 us   |
+-- | root       | wait/io/file/sql/misc                |     4 | 59.71 us  | 33.75 us    |
+-- | root       | wait/io/file/archive/data            |     1 | 13.91 us  | 13.91 us    |
+-- +------------+--------------------------------------+-------+-----------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary_by_file_io_type (
+  user,
+  event_name,
+  total,
+  latency,
+  max_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS latency,
+       sys.format_time(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name LIKE 'wait/io/file%'
+   AND count_star > 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary_by_stages.sql b/scripts/sys_schema/views/p_s/user_summary_by_stages.sql
new file mode 100644
index 000000000000..a4cfe4e58096
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary_by_stages.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary_by_stages
+--
+-- Summarizes stages by user, ordered by user and total latency per stage.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+-- 
+-- mysql> select * from user_summary_by_stages;
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | user | event_name                     | total | total_latency | avg_latency |
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | root | stage/sql/Opening tables       |   889 | 1.97 ms       | 2.22 us     |
+-- | root | stage/sql/Creating sort index  |     4 | 1.79 ms       | 446.30 us   |
+-- | root | stage/sql/init                 |    10 | 312.27 us     | 31.23 us    |
+-- | root | stage/sql/checking permissions |    10 | 300.62 us     | 30.06 us    |
+-- | root | stage/sql/freeing items        |     5 | 85.89 us      | 17.18 us    |
+-- | root | stage/sql/statistics           |     5 | 79.15 us      | 15.83 us    |
+-- | root | stage/sql/preparing            |     5 | 69.12 us      | 13.82 us    |
+-- | root | stage/sql/optimizing           |     5 | 53.11 us      | 10.62 us    |
+-- | root | stage/sql/Sending data         |     5 | 44.66 us      | 8.93 us     |
+-- | root | stage/sql/closing tables       |     5 | 37.54 us      | 7.51 us     |
+-- | root | stage/sql/System lock          |     5 | 34.28 us      | 6.86 us     |
+-- | root | stage/sql/query end            |     5 | 24.37 us      | 4.87 us     |
+-- | root | stage/sql/end                  |     5 | 8.60 us       | 1.72 us     |
+-- | root | stage/sql/Sorting result       |     5 | 8.33 us       | 1.67 us     |
+-- | root | stage/sql/executing            |     5 | 5.37 us       | 1.07 us     |
+-- | root | stage/sql/cleaning up          |     5 | 4.60 us       | 919.00 ns   |
+-- +------+--------------------------------+-------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary_by_stages (
+  user,
+  event_name,
+  total,
+  total_latency,
+  avg_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency, 
+       sys.format_time(avg_timer_wait) AS avg_latency 
+  FROM performance_schema.events_stages_summary_by_user_by_event_name
+ WHERE sum_timer_wait != 0 
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary_by_statement_latency.sql b/scripts/sys_schema/views/p_s/user_summary_by_statement_latency.sql
new file mode 100644
index 000000000000..3e7a382d3c7d
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary_by_statement_latency.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary_by_statement_latency
+--
+-- Summarizes overall statement statistics by user.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from user_summary_by_statement_latency;
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | user | total | total_latency | max_latency | lock_latency | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | root |  3381 | 00:02:09.13   | 1.48 s      | 1.07 s       |      1151 |         93947 |           150 |         91 |
+-- +------+-------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary_by_statement_latency (
+  user,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS total,
+       sys.format_time(SUM(sum_timer_wait)) AS total_latency,
+       sys.format_time(SUM(max_timer_wait)) AS max_latency,
+       sys.format_time(SUM(sum_lock_time)) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/user_summary_by_statement_type.sql b/scripts/sys_schema/views/p_s/user_summary_by_statement_type.sql
new file mode 100644
index 000000000000..d497ccff9602
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/user_summary_by_statement_type.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: user_summary_by_statement_type
+--
+-- Summarizes the types of statements executed by each user.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from user_summary_by_statement_type;
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | user | statement            | total  | total_latency | max_latency | lock_latency | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+-- | root | create_view          |   2063 | 00:05:04.20   | 463.58 ms   | 1.42 s       |         0 |             0 |             0 |          0 |
+-- | root | select               |    174 | 40.87 s       | 28.83 s     | 858.13 ms    |      5212 |        157022 |             0 |         82 |
+-- | root | stmt                 |   6645 | 15.31 s       | 491.78 ms   | 0 ps         |         0 |             0 |          7951 |          0 |
+-- | root | call_procedure       |     17 | 4.78 s        | 1.02 s      | 37.94 ms     |         0 |             0 |            19 |          0 |
+-- | root | create_table         |     19 | 3.04 s        | 431.71 ms   | 0 ps         |         0 |             0 |             0 |          0 |
+-- ...
+-- +------+----------------------+--------+---------------+-------------+--------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW user_summary_by_statement_type (
+  user,
+  statement,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUBSTRING_INDEX(event_name, '/', -1) AS statement,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(max_timer_wait) AS max_latency,
+       sys.format_time(sum_lock_time) AS lock_latency,
+       sum_rows_sent AS rows_sent,
+       sum_rows_examined AS rows_examined,
+       sum_rows_affected AS rows_affected,
+       sum_no_index_used + sum_no_good_index_used AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/wait_classes_global_by_avg_latency.sql b/scripts/sys_schema/views/p_s/wait_classes_global_by_avg_latency.sql
new file mode 100644
index 000000000000..a67cb9293212
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/wait_classes_global_by_avg_latency.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: wait_classes_global_by_avg_latency
+-- 
+-- Lists the top wait classes by average latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from wait_classes_global_by_avg_latency where event_class != 'idle';
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+-- | event_class       | total  | total_latency | min_latency | avg_latency | max_latency |
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+-- | wait/io/file      | 543123 | 44.60 s       | 19.44 ns    | 82.11 us    | 4.21 s      |
+-- | wait/io/table     |  22002 | 766.60 ms     | 148.72 ns   | 34.84 us    | 44.97 ms    |
+-- | wait/io/socket    |  79613 | 967.17 ms     | 0 ps        | 12.15 us    | 27.10 ms    |
+-- | wait/lock/table   |  35409 | 18.68 ms      | 65.45 ns    | 527.51 ns   | 969.88 us   |
+-- | wait/synch/rwlock |  37935 | 4.61 ms       | 21.38 ns    | 121.61 ns   | 34.65 us    |
+-- | wait/synch/mutex  | 390622 | 18.60 ms      | 19.44 ns    | 47.61 ns    | 10.32 us    |
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW wait_classes_global_by_avg_latency (
+  event_class,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT SUBSTRING_INDEX(event_name,'/', 3) AS event_class,
+       SUM(COUNT_STAR) AS total,
+       sys.format_time(CAST(SUM(sum_timer_wait) AS UNSIGNED)) AS total_latency,
+       sys.format_time(MIN(min_timer_wait)) AS min_latency,
+       sys.format_time(IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0)) AS avg_latency,
+       sys.format_time(CAST(MAX(max_timer_wait) AS UNSIGNED)) AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE sum_timer_wait > 0
+   AND event_name != 'idle'
+ GROUP BY event_class
+ ORDER BY IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) DESC;
diff --git a/scripts/sys_schema/views/p_s/wait_classes_global_by_latency.sql b/scripts/sys_schema/views/p_s/wait_classes_global_by_latency.sql
new file mode 100644
index 000000000000..51c174333369
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/wait_classes_global_by_latency.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: wait_classes_global_by_latency
+-- 
+-- Lists the top wait classes by total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from wait_classes_global_by_latency;
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+-- | event_class       | total  | total_latency | min_latency | avg_latency | max_latency |
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+-- | wait/io/file      | 550470 | 46.01 s       | 19.44 ns    | 83.58 us    | 4.21 s      |
+-- | wait/io/socket    | 228833 | 2.71 s        | 0 ps        | 11.86 us    | 29.93 ms    |
+-- | wait/io/table     |  64063 | 1.89 s        | 99.79 ns    | 29.43 us    | 68.07 ms    |
+-- | wait/lock/table   |  76029 | 47.19 ms      | 65.45 ns    | 620.74 ns   | 969.88 us   |
+-- | wait/synch/mutex  | 635925 | 34.93 ms      | 19.44 ns    | 54.93 ns    | 107.70 us   |
+-- | wait/synch/rwlock |  61287 | 7.62 ms       | 21.38 ns    | 124.37 ns   | 34.65 us    |
+-- +-------------------+--------+---------------+-------------+-------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW wait_classes_global_by_latency (
+  event_class,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT SUBSTRING_INDEX(event_name,'/', 3) AS event_class, 
+       SUM(COUNT_STAR) AS total,
+       sys.format_time(SUM(sum_timer_wait)) AS total_latency,
+       sys.format_time(MIN(min_timer_wait)) min_latency,
+       sys.format_time(IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0)) AS avg_latency,
+       sys.format_time(MAX(max_timer_wait)) AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE sum_timer_wait > 0
+   AND event_name != 'idle'
+ GROUP BY SUBSTRING_INDEX(event_name,'/', 3) 
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/waits_by_host_by_latency.sql b/scripts/sys_schema/views/p_s/waits_by_host_by_latency.sql
new file mode 100644
index 000000000000..6bdea96c2bbc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/waits_by_host_by_latency.sql
@@ -0,0 +1,61 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: waits_by_host_by_latency
+--
+-- Lists the top wait events per host by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from sys.waits_by_host_by_latency where host != 'background' limit 5;
+-- +-----------+------------------------------+-------+---------------+-------------+-------------+
+-- | host      | event                        | total | total_latency | avg_latency | max_latency |
+-- +-----------+------------------------------+-------+---------------+-------------+-------------+
+-- | localhost | wait/io/file/sql/file_parser |  1386 | 14.50 s       | 10.46 ms    | 357.36 ms   |
+-- | localhost | wait/io/file/sql/FRM         |   162 | 356.08 ms     | 2.20 ms     | 75.33 ms    |
+-- | localhost | wait/io/file/myisam/kfile    |   410 | 322.29 ms     | 786.08 us   | 65.98 ms    |
+-- | localhost | wait/io/file/myisam/dfile    |  1327 | 307.44 ms     | 231.68 us   | 37.16 ms    |
+-- | localhost | wait/io/file/sql/dbopt       |    89 | 180.34 ms     | 2.03 ms     | 63.41 ms    |
+-- +-----------+------------------------------+-------+---------------+-------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW waits_by_host_by_latency (
+  host,
+  event,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name AS event,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(avg_timer_wait) AS avg_latency,
+       sys.format_time(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name != 'idle'
+   AND sum_timer_wait > 0
+ ORDER BY host, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/waits_by_user_by_latency.sql b/scripts/sys_schema/views/p_s/waits_by_user_by_latency.sql
new file mode 100644
index 000000000000..a6b2ec46c0c0
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/waits_by_user_by_latency.sql
@@ -0,0 +1,72 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: waits_by_user_by_latency
+--
+-- Lists the top wait events per user by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from waits_by_user_by_latency;
+-- +------+-----------------------------------------------------+--------+---------------+-------------+-------------+
+-- | user | event                                               | total  | total_latency | avg_latency | max_latency |
+-- +------+-----------------------------------------------------+--------+---------------+-------------+-------------+
+-- | root | wait/io/file/sql/file_parser                        |  13743 | 00:01:00.46   | 4.40 ms     | 231.88 ms   |
+-- | root | wait/io/file/innodb/innodb_data_file                |   4699 | 3.02 s        | 643.38 us   | 46.93 ms    |
+-- | root | wait/io/file/sql/FRM                                |  11462 | 2.60 s        | 226.83 us   | 61.72 ms    |
+-- | root | wait/io/file/myisam/dfile                           |  26776 | 746.70 ms     | 27.89 us    | 308.79 ms   |
+-- | root | wait/io/file/myisam/kfile                           |   7126 | 462.66 ms     | 64.93 us    | 88.76 ms    |
+-- | root | wait/io/file/sql/dbopt                              |    179 | 137.58 ms     | 768.59 us   | 15.46 ms    |
+-- | root | wait/io/file/csv/metadata                           |      8 | 86.60 ms      | 10.82 ms    | 50.32 ms    |
+-- | root | wait/synch/mutex/mysys/IO_CACHE::append_buffer_lock | 798080 | 66.46 ms      | 82.94 ns    | 161.03 us   |
+-- | root | wait/io/file/sql/binlog                             |     19 | 49.11 ms      | 2.58 ms     | 9.40 ms     |
+-- | root | wait/io/file/sql/misc                               |     26 | 22.38 ms      | 860.80 us   | 15.30 ms    |
+-- | root | wait/io/file/csv/data                               |      4 | 297.46 us     | 74.37 us    | 111.93 us   |
+-- | root | wait/synch/rwlock/sql/MDL_lock::rwlock              |    944 | 287.86 us     | 304.62 ns   | 874.64 ns   |
+-- | root | wait/io/file/archive/data                           |      4 | 82.71 us      | 20.68 us    | 40.74 us    |
+-- | root | wait/synch/mutex/myisam/MYISAM_SHARE::intern_lock   |     60 | 12.21 us      | 203.20 ns   | 512.72 ns   |
+-- | root | wait/synch/mutex/innodb/trx_mutex                   |     81 | 5.93 us       | 73.14 ns    | 252.59 ns   |
+-- +------+-----------------------------------------------------+--------+---------------+-------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW waits_by_user_by_latency (
+  user,
+  event,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name AS event,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(avg_timer_wait) AS avg_latency,
+       sys.format_time(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name != 'idle'
+   AND user IS NOT NULL
+   AND sum_timer_wait > 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/waits_global_by_latency.sql b/scripts/sys_schema/views/p_s/waits_global_by_latency.sql
new file mode 100644
index 000000000000..df17ae171d0e
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/waits_global_by_latency.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: waits_global_by_latency
+--
+-- Lists the top wait events by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from waits_global_by_latency limit 5;
+-- +--------------------------------------+------------+---------------+-------------+-------------+
+-- | event                                | total      | total_latency | avg_latency | max_latency |
+-- +--------------------------------------+------------+---------------+-------------+-------------+
+-- | wait/io/file/myisam/dfile            | 3623719744 | 00:47:49.09   | 791.70 ns   | 312.96 ms   |
+-- | wait/io/table/sql/handler            |   69114944 | 00:44:30.74   | 38.64 us    | 879.49 ms   |
+-- | wait/io/file/innodb/innodb_log_file  |   28100261 | 00:37:42.12   | 80.50 us    | 476.00 ms   |
+-- | wait/io/socket/sql/client_connection |  200704863 | 00:18:37.81   | 5.57 us     | 1.27 s      |
+-- | wait/io/file/innodb/innodb_data_file |    2829403 | 00:08:12.89   | 174.20 us   | 455.22 ms   |
+-- +--------------------------------------+------------+---------------+-------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW waits_global_by_latency (
+  events,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT event_name AS event,
+       count_star AS total,
+       sys.format_time(sum_timer_wait) AS total_latency,
+       sys.format_time(avg_timer_wait) AS avg_latency,
+       sys.format_time(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE event_name != 'idle'
+   AND sum_timer_wait > 0
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_host_summary.sql b/scripts/sys_schema/views/p_s/x_host_summary.sql
new file mode 100644
index 000000000000..3f1881d5d291
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary
+--
+-- Summarizes statement activity and connections by host
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary;
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | host | statements | total_latency   | avg_latency      | current_connections | total_connections | unique_users | current_memory | total_memory_allocated |
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | hal1 |       5685 | 107175100271000 | 18852260381.8821 |                   1 |                 1 |            1 |        1459022 |              572855680 |
+-- | hal2 |        225 |  14489223428000 | 64396548568.8889 |                   1 |                 1 |            1 |         724578 |               84958286 |
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary (
+  host,
+  statements,
+  statement_latency,
+  statement_avg_latency,
+  table_scans,
+  file_ios,
+  file_io_latency,
+  current_connections,
+  total_connections,
+  unique_users,
+  current_memory,
+  total_memory_allocated
+) AS
+SELECT IF(accounts.host IS NULL, 'background', accounts.host) AS host,
+       SUM(stmt.total) AS statements,
+       SUM(stmt.total_latency) AS statement_latency,
+       SUM(stmt.total_latency) / SUM(stmt.total) AS statement_avg_latency,
+       SUM(stmt.full_scans) AS table_scans,
+       SUM(io.ios) AS file_ios,
+       SUM(io.io_latency) AS file_io_latency,
+       SUM(accounts.current_connections) AS current_connections,
+       SUM(accounts.total_connections) AS total_connections,
+       COUNT(DISTINCT accounts.user) AS unique_users,
+       SUM(mem.current_allocated) AS current_memory,
+       SUM(mem.total_allocated) AS total_memory_allocated
+  FROM performance_schema.accounts
+  JOIN sys.x$host_summary_by_statement_latency AS stmt ON accounts.host = stmt.host
+  JOIN sys.x$host_summary_by_file_io AS io ON accounts.host = io.host
+  JOIN sys.x$memory_by_host_by_current_bytes mem ON accounts.host = mem.host
+ GROUP BY IF(accounts.host IS NULL, 'background', accounts.host);
diff --git a/scripts/sys_schema/views/p_s/x_host_summary_by_file_io.sql b/scripts/sys_schema/views/p_s/x_host_summary_by_file_io.sql
new file mode 100644
index 000000000000..020d6f61b940
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary_by_file_io.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary_by_file_io
+--
+-- Summarizes file IO totals per host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary_by_file_io;
+-- +------------+-------+----------------+
+-- | host       | ios   | io_latency     |
+-- +------------+-------+----------------+
+-- | hal1       | 26457 | 21579585586390 |
+-- | hal2       |  1189 |   394212617370 |
+-- +------------+-------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary_by_file_io (
+  host,
+  ios,
+  io_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(count_star) AS ios,
+       SUM(sum_timer_wait) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%'
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_host_summary_by_file_io_type.sql b/scripts/sys_schema/views/p_s/x_host_summary_by_file_io_type.sql
new file mode 100644
index 000000000000..9ba111ccdb03
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary_by_file_io_type.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary_by_file_io_type
+--
+-- Summarizes file IO by event type per host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary_by_file_io_type;
+-- +------------+--------------------------------------+-------+---------------+--------------+
+-- | host       | event_name                           | total | total_latency | max_latency  |
+-- +------------+--------------------------------------+-------+---------------+--------------+
+-- | hal1       | wait/io/file/sql/FRM                 |   871 |  168148450470 |  18482624810 |
+-- | hal1       | wait/io/file/innodb/innodb_data_file |   173 |  129564287450 |  34087423890 |
+-- | hal1       | wait/io/file/innodb/innodb_log_file  |    20 |   77525706960 |  60657475320 |
+-- | hal1       | wait/io/file/myisam/dfile            |    40 |    6544493800 |   4580546230 |
+-- | hal1       | wait/io/file/mysys/charset           |     3 |    4793558770 |   4713476430 |
+-- | hal1       | wait/io/file/myisam/kfile            |    67 |    4384332810 |    300035450 |
+-- | hal1       | wait/io/file/sql/ERRMSG              |     5 |    2717434850 |   1687316280 |
+-- | hal1       | wait/io/file/sql/pid                 |     3 |     266301490 |    185468920 |
+-- | hal1       | wait/io/file/sql/casetest            |     5 |     246814360 |    150193030 |
+-- | hal1       | wait/io/file/sql/global_ddl_log      |     2 |      21236410 |     18593640 |
+-- | hal2       | wait/io/file/sql/file_parser         |  1422 | 4801104756760 | 135138518970 |
+-- | hal2       | wait/io/file/sql/FRM                 |   865 |   85818594810 |   9812303410 |
+-- | hal2       | wait/io/file/myisam/kfile            |  1073 |   37143664870 |  15793838190 |
+-- | hal2       | wait/io/file/myisam/dfile            |  2991 |   25528215700 |   5252232050 |
+-- | hal2       | wait/io/file/sql/dbopt               |    20 |    1067339780 |    153073310 |
+-- | hal2       | wait/io/file/sql/misc                |     4 |      59713030 |     33752810 |
+-- | hal2       | wait/io/file/archive/data            |     1 |      13907530 |     13907530 |
+-- +------------+--------------------------------------+-------+---------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary_by_file_io_type (
+  host,
+  event_name,
+  total,
+  total_latency,
+  max_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       max_timer_wait AS max_latency
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name LIKE 'wait/io/file%'
+   AND count_star > 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_host_summary_by_stages.sql b/scripts/sys_schema/views/p_s/x_host_summary_by_stages.sql
new file mode 100644
index 000000000000..55c66ee9e3e3
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary_by_stages.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary_by_stages
+--
+-- Summarizes stages by host, ordered by host and total latency per stage.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary_by_stages;
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | host | event_name                     | total | total_latency | avg_latency |
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | hal  | stage/sql/Opening tables       |  1114 |   71919037000 |    64559000 |
+-- | hal  | stage/sql/Creating sort index  |     5 |    2245762000 |   449152000 |
+-- | hal  | stage/sql/init                 |    13 |     428798000 |    32984000 |
+-- | hal  | stage/sql/checking permissions |    13 |     363231000 |    27940000 |
+-- | hal  | stage/sql/freeing items        |     7 |     137728000 |    19675000 |
+-- | hal  | stage/sql/statistics           |     6 |      93955000 |    15659000 |
+-- | hal  | stage/sql/preparing            |     6 |      82571000 |    13761000 |
+-- | hal  | stage/sql/optimizing           |     6 |      63338000 |    10556000 |
+-- | hal  | stage/sql/Sending data         |     6 |      53400000 |     8900000 |
+-- | hal  | stage/sql/closing tables       |     7 |      46922000 |     6703000 |
+-- | hal  | stage/sql/System lock          |     6 |      40175000 |     6695000 |
+-- | hal  | stage/sql/query end            |     7 |      31723000 |     4531000 |
+-- | hal  | stage/sql/Sorting result       |     6 |       9855000 |     1642000 |
+-- | hal  | stage/sql/end                  |     6 |       9556000 |     1592000 |
+-- | hal  | stage/sql/cleaning up          |     7 |       7312000 |     1044000 |
+-- | hal  | stage/sql/executing            |     6 |       6487000 |     1081000 |
+-- +------+--------------------------------+-------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary_by_stages (
+  host,
+  event_name,
+  total,
+  total_latency,
+  avg_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name,
+       count_star AS total,
+       sum_timer_wait AS total_latency, 
+       avg_timer_wait AS avg_latency 
+  FROM performance_schema.events_stages_summary_by_host_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_host_summary_by_statement_latency.sql b/scripts/sys_schema/views/p_s/x_host_summary_by_statement_latency.sql
new file mode 100644
index 000000000000..e64bf066350b
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary_by_statement_latency.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary_by_statement_latency
+--
+-- Summarizes overall statement statistics by host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary_by_statement_latency;
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+-- | host | total | total_latency   | max_latency   | lock_latency  | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+-- | hal  |  3382 | 129134039432000 | 1483246743000 | 1069831000000 |      1152 |         94286 |           150 |         92 |
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary_by_statement_latency (
+  host,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(count_star) AS total,
+       SUM(sum_timer_wait) AS total_latency,
+       MAX(max_timer_wait) AS max_latency,
+       SUM(sum_lock_time) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_host_by_event_name
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_host_summary_by_statement_type.sql b/scripts/sys_schema/views/p_s/x_host_summary_by_statement_type.sql
new file mode 100644
index 000000000000..3cec400531ad
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_host_summary_by_statement_type.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$host_summary_by_statement_type
+--
+-- Summarizes the types of statements executed by each host.
+--
+-- When the host found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$host_summary_by_statement_type;
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+-- | host | statement            | total  | total_latency   | max_latency    | lock_latency   | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+-- | hal  | create_view          |   2110 | 312717366332000 |   463578029000 |  1432355000000 |         0 |             0 |             0 |          0 |
+-- | hal  | select               |    177 |  41115690428000 | 28827579292000 |   858709000000 |      5254 |        157437 |             0 |         83 |
+-- | hal  | stmt                 |   6645 |  15305389969000 |   491780297000 |              0 |         0 |             0 |          7951 |          0 |
+-- | hal  | call_procedure       |     17 |   4783806053000 |  1016083397000 |    37936000000 |         0 |             0 |            19 |          0 |
+-- | hal  | create_table         |     19 |   3035120946000 |   431706815000 |              0 |         0 |             0 |             0 |          0 |
+-- ...
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$host_summary_by_statement_type (
+  host,
+  statement,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUBSTRING_INDEX(event_name, '/', -1) AS statement,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       max_timer_wait AS max_latency,
+       sum_lock_time AS lock_latency,
+       sum_rows_sent AS rows_sent,
+       sum_rows_examined AS rows_examined,
+       sum_rows_affected AS rows_affected,
+       sum_no_index_used + sum_no_good_index_used AS full_scans
+  FROM performance_schema.events_statements_summary_by_host_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY IF(host IS NULL, 'background', host), sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_io_by_thread_by_latency.sql b/scripts/sys_schema/views/p_s/x_io_by_thread_by_latency.sql
new file mode 100644
index 000000000000..6aa19d3d9a48
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_io_by_thread_by_latency.sql
@@ -0,0 +1,77 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$io_by_thread_by_latency
+--
+-- Show the top IO consumers by thread, ordered by total latency
+--
+-- mysql> select * from x$io_by_thread_by_latency;
+-- +---------------------+-------+----------------+-------------+-----------------+--------------+-----------+----------------+
+-- | user                | total | total_latency  | min_latency | avg_latency     | max_latency  | thread_id | processlist_id |
+-- +---------------------+-------+----------------+-------------+-----------------+--------------+-----------+----------------+
+-- | root@localhost      | 11587 | 18007539905680 |      429780 | 1120831681.6667 | 181065665560 |        25 |              6 |
+-- | main                |  1358 |  1309001741320 |      475020 | 2269581997.8000 | 350700491310 |         1 |           NULL |
+-- | page_cleaner_thread |   654 |   147435455960 |      588120 |  225436198.0000 |  46412043990 |        18 |           NULL |
+-- | io_write_thread     |   131 |   107754483070 |     8603140 |  822553303.0000 |  27691592500 |         8 |           NULL |
+-- | io_write_thread     |    46 |    47074926860 |    10642710 | 1023367631.0000 |  16899745070 |         9 |           NULL |
+-- | io_write_thread     |    71 |    46988801210 |     9108320 |  661814075.0000 |  17042760020 |        11 |           NULL |
+-- | io_log_thread       |    20 |    21007710490 |    14250600 | 1050385336.0000 |   7081255090 |         3 |           NULL |
+-- | srv_master_thread   |    13 |    17601511720 |     8486270 | 1353962324.0000 |   9990100380 |        16 |           NULL |
+-- | srv_purge_thread    |     4 |     1809792270 |    34307000 |  452447879.0000 |   1018887740 |        17 |           NULL |
+-- | io_write_thread     |    19 |      951385890 |     9745450 |   50072763.0000 |    297468080 |        10 |           NULL |
+-- | signal_handler      |     3 |      218026640 |    21639800 |   72675421.0000 |    154841440 |        19 |           NULL |
+-- +---------------------+-------+----------------+-------------+-----------------+--------------+-----------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$io_by_thread_by_latency (
+  user,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency,
+  thread_id,
+  processlist_id
+)
+AS
+SELECT IF(processlist_id IS NULL, 
+             SUBSTRING_INDEX(name, '/', -1), 
+             CONCAT(processlist_user, '@', processlist_host)
+          ) user, 
+       SUM(count_star) total,
+       SUM(sum_timer_wait) total_latency,
+       MIN(min_timer_wait) min_latency,
+       AVG(avg_timer_wait) avg_latency,
+       MAX(max_timer_wait) max_latency,
+       thread_id,
+       processlist_id
+  FROM performance_schema.events_waits_summary_by_thread_by_event_name 
+  LEFT JOIN performance_schema.threads USING (thread_id)
+ WHERE event_name LIKE 'wait/io/file/%'
+   AND sum_timer_wait > 0
+ GROUP BY thread_id, processlist_id, user
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_io_global_by_file_by_bytes.sql b/scripts/sys_schema/views/p_s/x_io_global_by_file_by_bytes.sql
new file mode 100644
index 000000000000..77c43d8c3781
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_io_global_by_file_by_bytes.sql
@@ -0,0 +1,65 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$io_global_by_file_by_bytes
+--
+-- Shows the top global IO consumers by bytes usage by file.
+--
+-- mysql> SELECT * FROM x$io_global_by_file_by_bytes LIMIT 5;
+-- +------------------------------------------------------+------------+------------+------------+-------------+---------------+------------+---------+-----------+
+-- | file                                                 | count_read | total_read | avg_read   | count_write | total_written | avg_write  | total   | write_pct |
+-- +------------------------------------------------------+------------+------------+------------+-------------+---------------+------------+---------+-----------+
+-- | /Users/mark/sandboxes/msb_5_5_33/data/ibdata1        |        147 |    4472832 | 30427.4286 |           3 |         49152 | 16384.0000 | 4521984 |      1.09 |
+-- | /Users/mark/sandboxes/msb_5_5_33/data/mysql/proc.MYD |        347 |      87397 |   251.8646 |         111 |         19536 |   176.0000 |  106933 |     18.27 |
+-- | /Users/mark/sandboxes/msb_5_5_33/data/ib_logfile0    |          6 |      69632 | 11605.3333 |           8 |          4096 |   512.0000 |   73728 |      5.56 |
+-- | /opt/mysql/5.5.33/share/english/errmsg.sys           |          3 |      44724 | 14908.0000 |           0 |             0 |     0.0000 |   44724 |      0.00 |
+-- | /opt/mysql/5.5.33/share/charsets/Index.xml           |          1 |      18317 | 18317.0000 |           0 |             0 |     0.0000 |   18317 |      0.00 |
+-- +------------------------------------------------------+------------+------------+------------+-------------+---------------+------------+---------+-----------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$io_global_by_file_by_bytes (
+  file,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_write,
+  total,
+  write_pct
+) AS
+SELECT file_name AS file, 
+       count_read, 
+       sum_number_of_bytes_read AS total_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
+       count_write, 
+       sum_number_of_bytes_write AS total_written,
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00) AS avg_write,
+       sum_number_of_bytes_read + sum_number_of_bytes_write AS total, 
+       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct 
+  FROM performance_schema.file_summary_by_instance
+ ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;
diff --git a/scripts/sys_schema/views/p_s/x_io_global_by_file_by_latency.sql b/scripts/sys_schema/views/p_s/x_io_global_by_file_by_latency.sql
new file mode 100644
index 000000000000..c6ef5073476a
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_io_global_by_file_by_latency.sql
@@ -0,0 +1,65 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$io_global_by_file_by_latency
+--
+-- Shows the top global IO consumers by latency by file.
+--
+-- mysql> select * from x$io_global_by_file_by_latency limit 5;
+-- +--------------------------------------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+-- | file                                                                                 | total | total_latency | count_read | read_latency | count_write | write_latency | count_misc | misc_latency |
+-- +--------------------------------------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+-- | /Users/mark/sandboxes/msb_5_7_2/data/sys/wait_classes_global_by_avg_latency_raw.frm~ |    30 |  513959738110 |          0 |            0 |           5 |     132130960 |         25 | 513827607150 |
+-- | /Users/mark/sandboxes/msb_5_7_2/data/sys/innodb_buffer_stats_by_schema_raw.frm~      |    30 |  490149888410 |          0 |            0 |           5 |     483887040 |         25 | 489666001370 |
+-- | /Users/mark/sandboxes/msb_5_7_2/data/sys/io_by_thread_by_latency_raw.frm~            |    30 |  427724241620 |          0 |            0 |           5 |     131399580 |         25 | 427592842040 |
+-- | /Users/mark/sandboxes/msb_5_7_2/data/sys/innodb_buffer_stats_by_schema.frm~          |    30 |  406392559950 |          0 |            0 |           5 |     104082160 |         25 | 406288477790 |
+-- | /Users/mark/sandboxes/msb_5_7_2/data/sys/statement_analysis_raw.frm~                 |    30 |  395527510430 |          0 |            0 |           5 |     118724840 |         25 | 395408785590 |
+-- +--------------------------------------------------------------------------------------+-------+---------------+------------+--------------+-------------+---------------+------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$io_global_by_file_by_latency (
+  file,
+  total,
+  total_latency,
+  count_read,
+  read_latency,
+  count_write,
+  write_latency,
+  count_misc,
+  misc_latency
+) AS
+SELECT file_name AS file, 
+       count_star AS total, 
+       sum_timer_wait AS total_latency,
+       count_read,
+       sum_timer_read AS read_latency,
+       count_write,
+       sum_timer_write AS write_latency,
+       count_misc,
+       sum_timer_misc AS misc_latency
+  FROM performance_schema.file_summary_by_instance
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_bytes.sql b/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_bytes.sql
new file mode 100644
index 000000000000..4de24c1b394c
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_bytes.sql
@@ -0,0 +1,81 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$io_global_by_wait_by_bytes
+--
+-- Shows the top global IO consumer classes by bytes usage.
+--
+-- mysql> select * from x$io_global_by_wait_by_bytes;
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+------------+------------+------------+-------------+---------------+-------------+-----------------+
+-- | event_name              | total | total_latency | min_latency | avg_latency | max_latency  | count_read | total_read | avg_read   | count_write | total_written | avg_written | total_requested |
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+------------+------------+------------+-------------+---------------+-------------+-----------------+
+-- | innodb/innodb_data_file |   151 |  334405721910 |     8399560 |  2214607429 | 107444600380 |        147 |    4472832 | 30427.4286 |           0 |             0 |      0.0000 |         4472832 |
+-- | sql/FRM                 |   555 |  147752034170 |      674830 |   266219881 |  57705900850 |        270 |     112174 |   415.4593 |           0 |             0 |      0.0000 |          112174 |
+-- | innodb/innodb_log_file  |    22 |   56776429970 |     2476890 |  2580746816 |  18883021430 |          6 |      69632 | 11605.3333 |           5 |          2560 |    512.0000 |           72192 |
+-- | sql/ERRMSG              |     5 |   11862056180 |    14883960 |  2372411236 |  11109473700 |          3 |      44724 | 14908.0000 |           0 |             0 |      0.0000 |           44724 |
+-- | mysys/charset           |     3 |    7256869230 |    19796270 |  2418956410 |   7198498320 |          1 |      18317 | 18317.0000 |           0 |             0 |      0.0000 |           18317 |
+-- | myisam/kfile            |   135 |   10194698280 |      784160 |    75516283 |   2593514950 |         40 |       9216 |   230.4000 |          33 |          1017 |     30.8182 |           10233 |
+-- | myisam/dfile            |    68 |   10527909730 |      772850 |   154822201 |   7600014630 |          9 |       6667 |   740.7778 |           0 |             0 |      0.0000 |            6667 |
+-- | sql/pid                 |     3 |     216507330 |    41296580 |    72169110 |    100617530 |          0 |          0 |     0.0000 |           1 |             6 |      6.0000 |               6 |
+-- | sql/casetest            |     5 |     185261570 |     4105530 |    37052314 |    113488310 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |               0 |
+-- | sql/global_ddl_log      |     2 |      21538010 |     3121560 |    10769005 |     18416450 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |               0 |
+-- | sql/dbopt               |    10 |    1004267680 |     1164930 |   100426768 |    939894930 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |               0 |
+-- +-------------------------+-------+---------------+-------------+-------------+--------------+------------+------------+------------+-------------+---------------+-------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$io_global_by_wait_by_bytes (
+  event_name,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_written,
+  total_requested
+) AS
+SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       min_timer_wait AS min_latency,
+       avg_timer_wait AS avg_latency,
+       max_timer_wait AS max_latency,
+       count_read,
+       sum_number_of_bytes_read AS total_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
+       count_write,
+       sum_number_of_bytes_write AS total_written,
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written,
+       sum_number_of_bytes_write + sum_number_of_bytes_read AS total_requested
+  FROM performance_schema.file_summary_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%' 
+   AND count_star > 0
+ ORDER BY sum_number_of_bytes_write + sum_number_of_bytes_read DESC;
diff --git a/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_latency.sql b/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_latency.sql
new file mode 100644
index 000000000000..be922473e590
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_io_global_by_wait_by_latency.sql
@@ -0,0 +1,89 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$io_global_by_wait_by_latency
+--
+-- Shows the top global IO consumers by latency.
+--
+-- mysql> select * from x$io_global_by_wait_by_latency;
+-- +-------------------------+-------+----------------+-------------+--------------+--------------+---------------+----------------+------------+------------+------------+-------------+---------------+-------------+
+-- | event_name              | total | total_latency  | avg_latency | max_latency  | read_latency | write_latency | misc_latency   | count_read | total_read | avg_read   | count_write | total_written | avg_written |
+-- +-------------------------+-------+----------------+-------------+--------------+--------------+---------------+----------------+------------+------------+------------+-------------+---------------+-------------+
+-- | sql/file_parser         |  5945 | 33615441247050 |  5654405471 | 203652881640 |  22093704230 |   27389668280 | 33565957874540 |         26 |       7008 |   269.5385 |         808 |       2479209 |   3068.3280 |
+-- | sql/FRM                 |  6332 |  1755386796800 |   277224688 | 145624702340 | 519139578620 |    1677016640 |  1234570201540 |       2040 |     865905 |   424.4632 |         439 |        103445 |    235.6378 |
+-- | innodb/innodb_data_file |  1344 |  1522989889460 |  1133176798 | 350700491310 | 203817502460 |  450959403830 |   868212983170 |        147 |    2408448 | 16384.0000 |        1001 |      56213504 |  56157.3467 |
+-- | innodb/innodb_log_file  |   828 |   893475794640 |  1079076921 |  30108124800 |  16315236730 |  705886928240 |   171273629670 |          6 |      69632 | 11605.3333 |         413 |       2294272 |   5555.1380 |
+-- | myisam/kfile            |  7826 |   246001992860 |    31433883 |  19265276810 |  74419162870 |   23923730090 |   147659099900 |        770 |     141058 |   183.1922 |        4516 |        249602 |     55.2706 |
+-- | myisam/dfile            | 13431 |   228191713620 |    16989882 |  32500163410 |  89162969350 |   17341973610 |   121686770660 |       5819 |    4873176 |   837.4594 |        1577 |       2853444 |   1809.4128 |
+-- | csv/metadata            |     8 |    28975194560 |  3621899320 |  20148109020 |    399265620 |             0 |    28575928940 |          2 |         70 |    35.0000 |           0 |             0 |      0.0000 |
+-- | mysys/charset           |     3 |    24244722970 |  8081574072 |  24151547420 |  24151547420 |             0 |       93175550 |          1 |      17722 | 17722.0000 |           0 |             0 |      0.0000 |
+-- | sql/ERRMSG              |     5 |    20427386850 |  4085477370 |  19312386730 |  20324183100 |             0 |      103203750 |          3 |      60390 | 20130.0000 |           0 |             0 |      0.0000 |
+-- | mysys/cnf               |     5 |    11366169230 |  2273233846 |  11283602460 |  11287953040 |             0 |       78216190 |          3 |         56 |    18.6667 |           0 |             0 |      0.0000 |
+-- | sql/dbopt               |    57 |     4042348570 |    70918224 |    843703380 |            0 |     186430270 |     3855918300 |          0 |          0 |     0.0000 |           7 |           431 |     61.5714 |
+-- | csv/data                |     4 |      411548280 |   102887070 |    234886080 |            0 |             0 |      411548280 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |
+-- | sql/misc                |    24 |      369128240 |    15380092 |     33771660 |            0 |             0 |      369128240 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |
+-- | archive/data            |    39 |      277856540 |     7124169 |     16180840 |            0 |             0 |      277856540 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |
+-- | sql/pid                 |     3 |      218026640 |    72675421 |    154841440 |            0 |      21639800 |      196386840 |          0 |          0 |     0.0000 |           1 |             6 |      6.0000 |
+-- | sql/casetest            |     5 |      197152150 |    39430430 |    126310080 |            0 |             0 |      197152150 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |
+-- | sql/global_ddl_log      |     2 |       14604980 |     7302490 |     12120550 |            0 |             0 |       14604980 |          0 |          0 |     0.0000 |           0 |             0 |      0.0000 |
+-- +-------------------------+-------+----------------+-------------+--------------+--------------+---------------+----------------+------------+------------+------------+-------------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$io_global_by_wait_by_latency (
+  event_name,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency,
+  read_latency,
+  write_latency,
+  misc_latency,
+  count_read,
+  total_read,
+  avg_read,
+  count_write,
+  total_written,
+  avg_written
+) AS
+SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       avg_timer_wait AS avg_latency,
+       max_timer_wait AS max_latency,
+       sum_timer_read AS read_latency,
+       sum_timer_write AS write_latency,
+       sum_timer_misc AS misc_latency,
+       count_read,
+       sum_number_of_bytes_read AS total_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
+       count_write,
+       sum_number_of_bytes_write AS total_written,
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written
+  FROM performance_schema.file_summary_by_event_name 
+ WHERE event_name LIKE 'wait/io/file/%'
+   AND count_star > 0
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_latest_file_io.sql b/scripts/sys_schema/views/p_s/x_latest_file_io.sql
new file mode 100644
index 000000000000..7686b867f570
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_latest_file_io.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$latest_file_io
+--
+-- Shows the latest file IO, by file / thread.
+--
+-- mysql> SELECT * FROM x$latest_file_io LIMIT 5;
+-- +------------------+------------------------------------------------------------------------------------+-------------+-----------+-----------+
+-- | thread           | file                                                                               | latency     | operation | requested |
+-- +------------------+------------------------------------------------------------------------------------+-------------+-----------+-----------+
+-- | root@localhost:6 | /Users/mark/sandboxes/msb_5_7_2/data/ps_helper/user_summary_by_statement_type.frm~ |    26152490 | write     |      4210 |
+-- | root@localhost:6 | /Users/mark/sandboxes/msb_5_7_2/data/ps_helper/user_summary_by_statement_type.frm~ | 30062722690 | sync      |      NULL |
+-- | root@localhost:6 | /Users/mark/sandboxes/msb_5_7_2/data/ps_helper/user_summary_by_statement_type.frm~ |    34144890 | close     |      NULL |
+-- | root@localhost:6 | /Users/mark/sandboxes/msb_5_7_2/data/ps_helper/check_lost_instrumentation.frm      |   113001980 | open      |      NULL |
+-- | root@localhost:6 | /Users/mark/sandboxes/msb_5_7_2/data/ps_helper/check_lost_instrumentation.frm      |     9553180 | read      |        10 |
+-- +------------------+------------------------------------------------------------------------------------+-------------+-----------+-----------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$latest_file_io (
+  thread,
+  file,
+  latency,
+  operation,
+  requested
+) AS
+SELECT IF(id IS NULL, 
+             CONCAT(SUBSTRING_INDEX(name, '/', -1), ':', thread_id), 
+             CONCAT(user, '@', host, ':', id)
+          ) thread, 
+       object_name file, 
+       timer_wait AS latency, 
+       operation, 
+       number_of_bytes AS requested
+  FROM performance_schema.events_waits_history_long 
+  JOIN performance_schema.threads USING (thread_id)
+  LEFT JOIN information_schema.processlist ON processlist_id = id
+ WHERE object_name IS NOT NULL
+   AND event_name LIKE 'wait/io/file/%'
+ ORDER BY timer_start;
diff --git a/scripts/sys_schema/views/p_s/x_memory_by_host_by_current_bytes.sql b/scripts/sys_schema/views/p_s/x_memory_by_host_by_current_bytes.sql
new file mode 100644
index 000000000000..8ed079429aa7
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_memory_by_host_by_current_bytes.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$memory_by_host_by_current_bytes
+--
+-- Summarizes memory use by host
+-- 
+-- When the host found is NULL, it is assumed to be a local "background" thread.  
+--
+-- mysql> select * from x$memory_by_host_by_current_bytes;
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | host       | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | background |               2773 |          11362444 |         4097.5276 |           8390792 |        32184183 |
+-- | localhost  |               1508 |            813040 |          539.1512 |            180616 |        88168182 |
+-- +------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$memory_by_host_by_current_bytes (
+  host,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       SUM(current_count_used) AS current_count_used,
+       SUM(current_number_of_bytes_used) AS current_allocated,
+       IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,
+       MAX(current_number_of_bytes_used) AS current_max_alloc,
+       SUM(sum_number_of_bytes_alloc) AS total_allocated
+  FROM performance_schema.memory_summary_by_host_by_event_name
+ GROUP BY IF(host IS NULL, 'background', host)
+ ORDER BY SUM(current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_memory_by_thread_by_current_bytes.sql b/scripts/sys_schema/views/p_s/x_memory_by_thread_by_current_bytes.sql
new file mode 100644
index 000000000000..02e10f2f7522
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_memory_by_thread_by_current_bytes.sql
@@ -0,0 +1,69 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$memory_by_thread_by_current_bytes
+--
+-- Summarizes memory use by user
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+--
+-- mysql> select * from sys.x$memory_by_thread_by_current_bytes limit 5;
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | thread_id | user           | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- |         1 | sql/main       |              29333 |         174089450 |         5934.9351 |         137494528 |       205523135 |
+-- |        55 | root@localhost |                173 |           1074664 |         6211.9306 |            359280 |        72248413 |
+-- |        58 | root@localhost |                240 |            377099 |         1571.2458 |            319536 |       169483870 |
+-- |      1152 | root@localhost |                 30 |             56949 |         1898.3000 |             16391 |         1010024 |
+-- |      1154 | root@localhost |                 34 |             56369 |         1657.9118 |             16391 |         1958771 |
+-- +-----------+----------------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$memory_by_thread_by_current_bytes (
+  thread_id,
+  user,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT t.thread_id,
+       IF(t.name = 'thread/sql/one_connection', 
+          CONCAT(t.processlist_user, '@', t.processlist_host), 
+          REPLACE(t.name, 'thread/', '')) user,
+       SUM(mt.current_count_used) AS current_count_used,
+       SUM(mt.current_number_of_bytes_used) AS current_allocated,
+       IFNULL(SUM(mt.current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,
+       MAX(mt.current_number_of_bytes_used) AS current_max_alloc,
+       SUM(mt.sum_number_of_bytes_alloc) AS total_allocated
+  FROM performance_schema.memory_summary_by_thread_by_event_name AS mt
+  JOIN performance_schema.threads AS t USING (thread_id)
+ GROUP BY thread_id, IF(t.name = 'thread/sql/one_connection', 
+          CONCAT(t.processlist_user, '@', t.processlist_host), 
+          REPLACE(t.name, 'thread/', ''))
+ ORDER BY SUM(mt.current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_memory_by_user_by_current_bytes.sql b/scripts/sys_schema/views/p_s/x_memory_by_user_by_current_bytes.sql
new file mode 100644
index 000000000000..ec4024d251ff
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_memory_by_user_by_current_bytes.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$memory_by_user_by_current_bytes
+--
+-- Summarizes memory use by user
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+--
+-- mysql> select * from x$memory_by_user_by_current_bytes;
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | user | current_count_used | current_allocated | current_avg_alloc | current_max_alloc | total_allocated |
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+-- | root |               1399 |           1124553 |          803.8263 |            343008 |        45426133 |
+-- | mark |                201 |            507990 |         2527.3134 |            343008 |         5769804 |
+-- +------+--------------------+-------------------+-------------------+-------------------+-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$memory_by_user_by_current_bytes (
+  user,
+  current_count_used,
+  current_allocated,
+  current_avg_alloc,
+  current_max_alloc,
+  total_allocated
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(current_count_used) AS current_count_used,
+       SUM(current_number_of_bytes_used) AS current_allocated,
+       IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,
+       MAX(current_number_of_bytes_used) AS current_max_alloc,
+       SUM(sum_number_of_bytes_alloc) AS total_allocated
+  FROM performance_schema.memory_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(current_number_of_bytes_used) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_memory_global_by_current_bytes.sql b/scripts/sys_schema/views/p_s/x_memory_global_by_current_bytes.sql
new file mode 100644
index 000000000000..eb3068ddf687
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_memory_global_by_current_bytes.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$memory_global_by_current_bytes
+-- 
+-- Shows the current memory usage within the server globally broken down by allocation type.
+--
+-- mysql> select * from x$memory_global_by_current_bytes;
+-- +-------------------------------------------------+---------------+---------------+-------------------+------------+------------+----------------+
+-- | event_name                                      | current_count | current_alloc | current_avg_alloc | high_count | high_alloc | high_avg_alloc |
+-- +-------------------------------------------------+---------------+---------------+-------------------+------------+------------+----------------+
+-- | memory/performance_schema/internal_buffers      |            62 |     308073712 |      4968930.8387 |         62 |  308073712 |   4968930.8387 |
+-- | memory/innodb/buf_buf_pool                      |             1 |     137428992 |    137428992.0000 |          1 |  137428992 | 137428992.0000 |
+-- | memory/innodb/log0log                           |             9 |       8397152 |       933016.8889 |          9 |    8397152 |    933016.8889 |
+-- | memory/mysys/KEY_CACHE                          |             3 |       8390792 |      2796930.6667 |          3 |    8390792 |   2796930.6667 |
+-- | memory/innodb/hash0hash                         |            27 |       4962992 |       183814.5185 |         27 |    7173904 |    265700.1481 |
+-- | memory/innodb/os0event                          |         24998 |       4199664 |          168.0000 |      24998 |    4199664 |       168.0000 |
+-- ...
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$memory_global_by_current_bytes (
+  event_name,
+  current_count,
+  current_alloc,
+  current_avg_alloc,
+  high_count,
+  high_alloc,
+  high_avg_alloc
+) AS
+SELECT event_name,
+       current_count_used AS current_count,
+       current_number_of_bytes_used AS current_alloc,
+       IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0) AS current_avg_alloc,
+       high_count_used AS high_count,
+       high_number_of_bytes_used AS high_alloc,
+       IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0) AS high_avg_alloc
+  FROM performance_schema.memory_summary_global_by_event_name
+ WHERE current_number_of_bytes_used > 0
+ ORDER BY current_number_of_bytes_used DESC;
diff --git a/scripts/sys_schema/views/p_s/x_memory_global_total.sql b/scripts/sys_schema/views/p_s/x_memory_global_total.sql
new file mode 100644
index 000000000000..c88ff18655c4
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_memory_global_total.sql
@@ -0,0 +1,44 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$memory_global_total
+-- 
+-- Shows the total memory usage within the server globally
+--
+-- mysql> select * from x$memory_global_total;
+-- +-----------------+
+-- | total_allocated |
+-- +-----------------+
+-- |         1420023 |
+-- +-----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$memory_global_total (
+  total_allocated
+) AS
+SELECT SUM(CURRENT_NUMBER_OF_BYTES_USED) total_allocated
+  FROM performance_schema.memory_summary_global_by_event_name;
diff --git a/scripts/sys_schema/views/p_s/x_processlist.sql b/scripts/sys_schema/views/p_s/x_processlist.sql
new file mode 100644
index 000000000000..3e31e7d88694
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_processlist.sql
@@ -0,0 +1,148 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$processlist
+--
+-- A detailed non-blocking processlist view to replace 
+-- [INFORMATION_SCHEMA. | SHOW FULL] PROCESSLIST
+-- 
+-- Performs less locking than the legacy sources, whilst giving extra information.
+--
+-- mysql> select * from sys.x$processlist where conn_id is not null and command != 'daemon' and conn_id != connection_id()\G
+-- ...
+-- *************************** 2. row ***************************
+--                 thd_id: 720
+--                conn_id: 698
+--                   user: msandbox@localhost
+--                     db: test
+--                command: Query
+--                  state: alter table (read PK and internal sort)
+--                   time: 2
+--      current_statement: alter table t1 add column l int
+--      statement_latency: 2349834276374
+--               progress: 60.00
+--           lock_latency: 339707000000
+--          rows_examined: 0
+--              rows_sent: 0
+--          rows_affected: 0
+--             tmp_tables: 0
+--        tmp_disk_tables: 0
+--              full_scan: NO
+--         last_statement: NULL
+-- last_statement_latency: NULL
+--         current_memory: 10186821
+--              last_wait: wait/io/file/innodb/innodb_data_file
+--      last_wait_latency: Still Waiting
+--                 source: fil0fil.cc:5351
+--            trx_latency: NULL
+--              trx_state: NULL
+--         trx_autocommit: NULL
+--                    pid: 5559
+--           program_name: mysql
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER
+VIEW x$processlist (
+  thd_id,
+  conn_id,
+  user,
+  db,
+  command,
+  state,
+  time,
+  current_statement,
+  statement_latency,
+  progress,
+  lock_latency,
+  rows_examined,
+  rows_sent,
+  rows_affected,
+  tmp_tables,
+  tmp_disk_tables,
+  full_scan,
+  last_statement,
+  last_statement_latency,
+  current_memory,
+  last_wait,
+  last_wait_latency,
+  source,
+  trx_latency,
+  trx_state,
+  trx_autocommit,
+  pid,
+  program_name
+) AS
+SELECT pps.thread_id AS thd_id,
+       pps.processlist_id AS conn_id,
+       IF(pps.name IN ('thread/sql/one_connection', 'thread/thread_pool/tp_one_connection'),
+          CONCAT(pps.processlist_user, '@', pps.processlist_host),
+          REPLACE(pps.name, 'thread/', '')) user,
+       pps.processlist_db AS db,
+       pps.processlist_command AS command,
+       pps.processlist_state AS state,
+       pps.processlist_time AS time,
+       pps.processlist_info AS current_statement,
+       IF(esc.end_event_id IS NULL,
+          esc.timer_wait,
+          NULL) AS statement_latency,
+       IF(esc.end_event_id IS NULL,
+          ROUND(100 * (estc.work_completed / estc.work_estimated), 2),
+          NULL) AS progress,
+       esc.lock_time AS lock_latency,
+       esc.rows_examined AS rows_examined,
+       esc.rows_sent AS rows_sent,
+       esc.rows_affected AS rows_affected,
+       esc.created_tmp_tables AS tmp_tables,
+       esc.created_tmp_disk_tables AS tmp_disk_tables,
+       IF(esc.no_good_index_used > 0 OR esc.no_index_used > 0, 'YES', 'NO') AS full_scan,
+       IF(esc.end_event_id IS NOT NULL,
+          esc.sql_text,
+          NULL) AS last_statement,
+       IF(esc.end_event_id IS NOT NULL,
+          esc.timer_wait,
+          NULL) AS last_statement_latency,
+       mem.current_allocated AS current_memory,
+       ewc.event_name AS last_wait,
+       IF(ewc.end_event_id IS NULL AND ewc.event_name IS NOT NULL,
+          'Still Waiting', 
+          ewc.timer_wait) last_wait_latency,
+       ewc.source,
+       etc.timer_wait AS trx_latency,
+       etc.state AS trx_state,
+       etc.autocommit AS trx_autocommit,
+       conattr_pid.attr_value as pid,
+       conattr_progname.attr_value as program_name
+  FROM performance_schema.threads AS pps
+  LEFT JOIN performance_schema.events_waits_current AS ewc USING (thread_id)
+  LEFT JOIN performance_schema.events_stages_current AS estc USING (thread_id)
+  LEFT JOIN performance_schema.events_statements_current AS esc USING (thread_id)
+  LEFT JOIN performance_schema.events_transactions_current AS etc USING (thread_id)
+  LEFT JOIN sys.x$memory_by_thread_by_current_bytes AS mem USING (thread_id)
+  LEFT JOIN performance_schema.session_connect_attrs AS conattr_pid
+    ON conattr_pid.processlist_id=pps.processlist_id and conattr_pid.attr_name='_pid'
+  LEFT JOIN performance_schema.session_connect_attrs AS conattr_progname
+    ON conattr_progname.processlist_id=pps.processlist_id and conattr_progname.attr_name='program_name'
+ ORDER BY pps.processlist_time DESC, last_wait_latency DESC;
diff --git a/scripts/sys_schema/views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql b/scripts/sys_schema/views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql
new file mode 100644
index 000000000000..97aa338e52cd
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql
@@ -0,0 +1,53 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$ps_digest_95th_percentile_by_avg_us
+--
+-- Helper view for statements_with_runtimes_in_95th_percentile.
+-- Lists the 95th percentile runtime, for all statements
+--
+-- mysql> select * from x$ps_digest_95th_percentile_by_avg_us;
+-- +--------+------------+
+-- | avg_us | percentile |
+-- +--------+------------+
+-- |    964 |     0.9525 |
+-- +--------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$ps_digest_95th_percentile_by_avg_us (
+  avg_us,
+  percentile
+) AS
+SELECT s2.avg_us avg_us,
+       IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest), 0), 0) percentile
+  FROM sys.x$ps_digest_avg_latency_distribution AS s1
+  JOIN sys.x$ps_digest_avg_latency_distribution AS s2
+    ON s1.avg_us <= s2.avg_us
+ GROUP BY s2.avg_us
+HAVING IFNULL(SUM(s1.cnt)/NULLIF((SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest), 0), 0) > 0.95
+ ORDER BY percentile
+ LIMIT 1;
diff --git a/scripts/sys_schema/views/p_s/x_ps_digest_avg_latency_distribution.sql b/scripts/sys_schema/views/p_s/x_ps_digest_avg_latency_distribution.sql
new file mode 100644
index 000000000000..a21b93e4257d
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_ps_digest_avg_latency_distribution.sql
@@ -0,0 +1,40 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$ps_digest_avg_latency_distribution
+--
+-- Helper view for x$ps_digest_95th_percentile_by_avg_us
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$ps_digest_avg_latency_distribution (
+  cnt,
+  avg_us
+) AS
+SELECT COUNT(*) cnt, 
+       ROUND(avg_timer_wait/1000000) AS avg_us
+  FROM performance_schema.events_statements_summary_by_digest
+ GROUP BY avg_us;
diff --git a/scripts/sys_schema/views/p_s/x_ps_schema_table_statistics_io.sql b/scripts/sys_schema/views/p_s/x_ps_schema_table_statistics_io.sql
new file mode 100644
index 000000000000..3750e16653bc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_ps_schema_table_statistics_io.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$ps_schema_table_statistics_io
+--
+-- Helper view for schema_table_statistics
+-- Having this view with ALGORITHM = TEMPTABLE means MySQL can use the optimizations for
+-- materialized views to improve the overall performance.
+--
+-- mysql> SELECT * FROM x$ps_schema_table_statistics_io LIMIT 1\G
+-- *************************** 1. row ***************************
+--              table_schema: charsets
+--                table_name: Index
+--                count_read: 1
+--  sum_number_of_bytes_read: 18710
+--            sum_timer_read: 20229409070
+--               count_write: 0
+-- sum_number_of_bytes_write: 0
+--           sum_timer_write: 0
+--                count_misc: 2
+--            sum_timer_misc: 80768480
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$ps_schema_table_statistics_io (
+  table_schema,
+  table_name,
+  count_read,
+  sum_number_of_bytes_read,
+  sum_timer_read,
+  count_write,
+  sum_number_of_bytes_write,
+  sum_timer_write,
+  count_misc,
+  sum_timer_misc
+) AS
+SELECT extract_schema_from_file_name(file_name) AS table_schema,
+       extract_table_from_file_name(file_name) AS table_name,
+       SUM(count_read) AS count_read,
+       SUM(sum_number_of_bytes_read) AS sum_number_of_bytes_read,
+       SUM(sum_timer_read) AS sum_timer_read,
+       SUM(count_write) AS count_write,
+       SUM(sum_number_of_bytes_write) AS sum_number_of_bytes_write,
+       SUM(sum_timer_write) AS sum_timer_write,
+       SUM(count_misc) AS count_misc,
+       SUM(sum_timer_misc) AS sum_timer_misc
+  FROM performance_schema.file_summary_by_instance
+ GROUP BY table_schema, table_name;
diff --git a/scripts/sys_schema/views/p_s/x_schema_index_statistics.sql b/scripts/sys_schema/views/p_s/x_schema_index_statistics.sql
new file mode 100644
index 000000000000..673e3470934e
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_schema_index_statistics.sql
@@ -0,0 +1,72 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$schema_index_statistics
+--
+-- Statistics around indexes.
+--
+-- Ordered by the total wait time descending - top indexes are most contended.
+--
+-- mysql> SELECT * FROM x$schema_index_statistics LIMIT 5;
+-- +---------------+----------------------+-------------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+-- | table_schema  | table_name           | index_name        | rows_selected | select_latency | rows_inserted | insert_latency | rows_updated | update_latency | rows_deleted | delete_latency |
+-- +---------------+----------------------+-------------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+-- | common_schema | _global_sql_tokens   | PRIMARY           |          1886 |     1129676730 |             0 |              0 |            0 |              0 |         1878 |              0 |
+-- | common_schema | _script_statements   | PRIMARY           |          4606 |     4212160680 |             0 |              0 |            0 |              0 |            0 |              0 |
+-- | common_schema | _global_qs_variables | declaration_depth |           256 |     1650193090 |             0 |              0 |           32 |     1372148050 |            0 |              0 |
+-- | common_schema | _global_qs_variables | PRIMARY           |             0 |              0 |             0 |              0 |            0 |              0 |           16 |              0 |
+-- | common_schema | metadata             | PRIMARY           |             5 |       76730810 |             0 |              0 |            4 |      114310170 |            0 |              0 |
+-- +---------------+----------------------+-------------------+---------------+----------------+---------------+----------------+--------------+----------------+--------------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$schema_index_statistics (
+  table_schema,
+  table_name,
+  index_name,
+  rows_selected,
+  select_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency
+) AS
+SELECT OBJECT_SCHEMA AS table_schema,
+       OBJECT_NAME AS table_name,
+       INDEX_NAME as index_name,
+       COUNT_FETCH AS rows_selected,
+       SUM_TIMER_FETCH AS select_latency,
+       COUNT_INSERT AS rows_inserted,
+       SUM_TIMER_INSERT AS insert_latency,
+       COUNT_UPDATE AS rows_updated,
+       SUM_TIMER_UPDATE AS update_latency,
+       COUNT_DELETE AS rows_deleted,
+       SUM_TIMER_DELETE AS delete_latency
+  FROM performance_schema.table_io_waits_summary_by_index_usage
+ WHERE index_name IS NOT NULL
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_schema_table_lock_waits.sql b/scripts/sys_schema/views/p_s/x_schema_table_lock_waits.sql
new file mode 100644
index 000000000000..c4d136979697
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_schema_table_lock_waits.sql
@@ -0,0 +1,104 @@
+-- Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: schema_table_lock_waits
+--
+-- Shows sessions that are blocked waiting on table metadata locks, and 
+-- who is blocking them.
+--
+-- mysql> select * from sys.x$schema_table_lock_waits\G
+-- *************************** 1. row ***************************
+--                object_schema: test
+--                  object_name: t
+--            waiting_thread_id: 43
+--                  waiting_pid: 21
+--              waiting_account: msandbox@localhost
+--            waiting_lock_type: SHARED_UPGRADABLE
+--        waiting_lock_duration: TRANSACTION
+--                waiting_query: alter table test.t add foo int
+--           waiting_query_secs: 990
+--  waiting_query_rows_affected: 0
+--  waiting_query_rows_examined: 0
+--           blocking_thread_id: 42
+--                 blocking_pid: 20
+--             blocking_account: msandbox@localhost
+--           blocking_lock_type: SHARED_NO_READ_WRITE
+--       blocking_lock_duration: TRANSACTION
+--      sql_kill_blocking_query: KILL QUERY 20
+-- sql_kill_blocking_connection: KILL 20
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$schema_table_lock_waits (
+  object_schema,
+  object_name,
+  waiting_thread_id,
+  waiting_pid,
+  waiting_account,
+  waiting_lock_type,
+  waiting_lock_duration,
+  waiting_query,
+  waiting_query_secs,
+  waiting_query_rows_affected,
+  waiting_query_rows_examined,
+  blocking_thread_id,
+  blocking_pid,
+  blocking_account,
+  blocking_lock_type,
+  blocking_lock_duration,
+  sql_kill_blocking_query,
+  sql_kill_blocking_connection
+) AS
+SELECT g.object_schema AS object_schema,
+       g.object_name AS object_name,
+       pt.thread_id AS waiting_thread_id,
+       pt.processlist_id AS waiting_pid,
+       sys.ps_thread_account(p.owner_thread_id) AS waiting_account,
+       p.lock_type AS waiting_lock_type,
+       p.lock_duration AS waiting_lock_duration,
+       pt.processlist_info AS waiting_query,
+       pt.processlist_time AS waiting_query_secs,
+       ps.rows_affected AS waiting_query_rows_affected,
+       ps.rows_examined AS waiting_query_rows_examined,
+       gt.thread_id AS blocking_thread_id,
+       gt.processlist_id AS blocking_pid,
+       sys.ps_thread_account(g.owner_thread_id) AS blocking_account,
+       g.lock_type AS blocking_lock_type,
+       g.lock_duration AS blocking_lock_duration,
+       CONCAT('KILL QUERY ', gt.processlist_id) AS sql_kill_blocking_query,
+       CONCAT('KILL ', gt.processlist_id) AS sql_kill_blocking_connection
+  FROM performance_schema.metadata_locks g
+ INNER JOIN performance_schema.metadata_locks p 
+    ON g.object_type = p.object_type
+   AND g.object_schema = p.object_schema
+   AND g.object_name = p.object_name
+   AND g.lock_status = 'GRANTED'
+   AND p.lock_status = 'PENDING'
+ INNER JOIN performance_schema.threads gt ON g.owner_thread_id = gt.thread_id
+ INNER JOIN performance_schema.threads pt ON p.owner_thread_id = pt.thread_id
+  LEFT JOIN performance_schema.events_statements_current gs ON g.owner_thread_id = gs.thread_id
+  LEFT JOIN performance_schema.events_statements_current ps ON p.owner_thread_id = ps.thread_id
+ WHERE g.object_type = 'TABLE';
diff --git a/scripts/sys_schema/views/p_s/x_schema_table_statistics.sql b/scripts/sys_schema/views/p_s/x_schema_table_statistics.sql
new file mode 100644
index 000000000000..f55e39c15893
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_schema_table_statistics.sql
@@ -0,0 +1,101 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$schema_table_statistics
+--
+-- Statistics around tables.
+--
+-- Ordered by the total wait time descending - top tables are most contended.
+-- 
+-- mysql> select * from x$schema_table_statistics\G
+-- *************************** 1. row ***************************
+--      table_schema: sys
+--        table_name: sys_config
+--     total_latency: 0
+--      rows_fetched: 0
+--     fetch_latency: 0
+--     rows_inserted: 0
+--    insert_latency: 0
+--      rows_updated: 0
+--    update_latency: 0
+--      rows_deleted: 0
+--    delete_latency: 0
+--  io_read_requests: 8
+--           io_read: 2336
+--   io_read_latency: 727319710
+-- io_write_requests: 0
+--          io_write: 0
+--  io_write_latency: 0
+--  io_misc_requests: 10
+--   io_misc_latency: 126879350
+--
+ 
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$schema_table_statistics (
+  table_schema,
+  table_name,
+  total_latency,
+  rows_fetched,
+  fetch_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency,
+  io_read_requests,
+  io_read,
+  io_read_latency,
+  io_write_requests,
+  io_write,
+  io_write_latency,
+  io_misc_requests,
+  io_misc_latency
+) AS
+SELECT pst.object_schema AS table_schema,
+       pst.object_name AS table_name,
+       pst.sum_timer_wait AS total_latency,
+       pst.count_fetch AS rows_fetched,
+       pst.sum_timer_fetch AS fetch_latency,
+       pst.count_insert AS rows_inserted,
+       pst.sum_timer_insert AS insert_latency,
+       pst.count_update AS rows_updated,
+       pst.sum_timer_update AS update_latency,
+       pst.count_delete AS rows_deleted,
+       pst.sum_timer_delete AS delete_latency,
+       fsbi.count_read AS io_read_requests,
+       fsbi.sum_number_of_bytes_read AS io_read,
+       fsbi.sum_timer_read AS io_read_latency,
+       fsbi.count_write AS io_write_requests,
+       fsbi.sum_number_of_bytes_write AS io_write,
+       fsbi.sum_timer_write AS io_write_latency,
+       fsbi.count_misc AS io_misc_requests,
+       fsbi.sum_timer_misc AS io_misc_latency
+  FROM performance_schema.table_io_waits_summary_by_table AS pst
+  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi
+    ON pst.object_schema = fsbi.table_schema
+   AND pst.object_name = fsbi.table_name
+ ORDER BY pst.sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_schema_table_statistics_with_buffer.sql b/scripts/sys_schema/views/p_s/x_schema_table_statistics_with_buffer.sql
new file mode 100644
index 000000000000..92cb61bd5438
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_schema_table_statistics_with_buffer.sql
@@ -0,0 +1,123 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$schema_table_statistics_with_buffer
+--
+-- Statistics around tables.
+--
+-- Ordered by the total wait time descending - top tables are most contended.
+--
+-- More statistics such as caching stats for the InnoDB buffer pool with InnoDB tables
+--
+-- mysql> SELECT * FROM x$schema_table_statistics_with_buffer LIMIT 1\G
+-- *************************** 1. row ***************************
+--               table_schema: common_schema
+--                 table_name: help_content
+--               rows_fetched: 0
+--              fetch_latency: 0
+--              rows_inserted: 169
+--             insert_latency: 409815527680
+--               rows_updated: 0
+--             update_latency: 0
+--               rows_deleted: 0
+--             delete_latency: 0
+--           io_read_requests: 14
+--                    io_read: 1180
+--            io_read_latency: 52406770
+--          io_write_requests: 131
+--                   io_write: 11719246
+--           io_write_latency: 133726902790
+--           io_misc_requests: 61
+--            io_misc_latency: 209081089750
+--    innodb_buffer_allocated: 688128
+--         innodb_buffer_data: 423667
+--        innodb_buffer_pages: 42
+-- innodb_buffer_pages_hashed: 42
+--    innodb_buffer_pages_old: 42
+--  innodb_buffer_rows_cached: 210
+--
+ 
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$schema_table_statistics_with_buffer (
+  table_schema,
+  table_name,
+  rows_fetched,
+  fetch_latency,
+  rows_inserted,
+  insert_latency,
+  rows_updated,
+  update_latency,
+  rows_deleted,
+  delete_latency,
+  io_read_requests,
+  io_read,
+  io_read_latency,
+  io_write_requests,
+  io_write,
+  io_write_latency,
+  io_misc_requests,
+  io_misc_latency,
+  innodb_buffer_allocated,
+  innodb_buffer_data,
+  innodb_buffer_free,
+  innodb_buffer_pages,
+  innodb_buffer_pages_hashed,
+  innodb_buffer_pages_old,
+  innodb_buffer_rows_cached
+) AS
+SELECT pst.object_schema AS table_schema,
+       pst.object_name AS table_name,
+       pst.count_fetch AS rows_fetched,
+       pst.sum_timer_fetch AS fetch_latency,
+       pst.count_insert AS rows_inserted,
+       pst.sum_timer_insert AS insert_latency,
+       pst.count_update AS rows_updated,
+       pst.sum_timer_update AS update_latency,
+       pst.count_delete AS rows_deleted,
+       pst.sum_timer_delete AS delete_latency,
+       fsbi.count_read AS io_read_requests,
+       fsbi.sum_number_of_bytes_read AS io_read,
+       fsbi.sum_timer_read AS io_read_latency,
+       fsbi.count_write AS io_write_requests,
+       fsbi.sum_number_of_bytes_write AS io_write,
+       fsbi.sum_timer_write AS io_write_latency,
+       fsbi.count_misc AS io_misc_requests,
+       fsbi.sum_timer_misc AS io_misc_latency,
+       ibp.allocated AS innodb_buffer_allocated,
+       ibp.data AS innodb_buffer_data,
+       (ibp.allocated - ibp.data) AS innodb_buffer_free,
+       ibp.pages AS innodb_buffer_pages,
+       ibp.pages_hashed AS innodb_buffer_pages_hashed,
+       ibp.pages_old AS innodb_buffer_pages_old,
+       ibp.rows_cached AS innodb_buffer_rows_cached
+  FROM performance_schema.table_io_waits_summary_by_table AS pst
+  LEFT JOIN x$ps_schema_table_statistics_io AS fsbi
+    ON pst.object_schema = fsbi.table_schema
+   AND pst.object_name = fsbi.table_name
+  LEFT JOIN sys.x$innodb_buffer_stats_by_table AS ibp
+    ON pst.object_schema = ibp.object_schema
+   AND pst.object_name = ibp.object_name
+ ORDER BY pst.sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_schema_tables_with_full_table_scans.sql b/scripts/sys_schema/views/p_s/x_schema_tables_with_full_table_scans.sql
new file mode 100644
index 000000000000..a5db53e29fbc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_schema_tables_with_full_table_scans.sql
@@ -0,0 +1,58 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$schema_tables_with_full_table_scans
+--
+-- Find tables that are being accessed by full table scans
+-- ordering by the number of rows scanned descending.
+--
+-- mysql> select * from x$schema_tables_with_full_table_scans limit 5;
+-- +--------------------+------------------------------+-------------------+----------------+
+-- | object_schema      | object_name                  | rows_full_scanned | latency        |
+-- +--------------------+------------------------------+-------------------+----------------+
+-- | mem30__instruments | fsstatistics                 |          10207042 | 13098927688488 |
+-- | mem30__instruments | preparedstatementapidata     |            436428 |   973274338980 |
+-- | mem30__instruments | mysqlprocessactivity         |            411702 |   282072434940 |
+-- | mem30__instruments | querycachequeriesincachedata |            374011 |   767152380564 |
+-- | mem30__instruments | rowaccessesdata              |            322321 |  1547594778456 |
+-- +--------------------+------------------------------+-------------------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$schema_tables_with_full_table_scans (
+  object_schema,
+  object_name,
+  rows_full_scanned,
+  latency
+) AS
+SELECT object_schema, 
+       object_name,
+       count_read AS rows_full_scanned,
+       sum_timer_wait AS latency
+  FROM performance_schema.table_io_waits_summary_by_index_usage 
+ WHERE index_name IS NULL
+   AND count_read > 0
+ ORDER BY count_read DESC;
diff --git a/scripts/sys_schema/views/p_s/x_sessions.sql b/scripts/sys_schema/views/p_s/x_sessions.sql
new file mode 100644
index 000000000000..8bd30e7f3384
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_sessions.sql
@@ -0,0 +1,70 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$session
+--
+-- Filter sys.processlist to only show user sessions and not background threads.
+-- This is a non-blocking closer replacement to
+-- [INFORMATION_SCHEMA. | SHOW FULL] PROCESSLIST
+-- 
+-- Performs less locking than the legacy sources, whilst giving extra information.
+--
+-- mysql> select * from sys.x$session\G
+-- *************************** 1. row ***************************
+--                 thd_id: 24
+--                conn_id: 2
+--                   user: root@localhost
+--                     db: sys
+--                command: Query
+--                  state: Sending data
+--                   time: 0
+--      current_statement: select * from sys.x$session
+--      statement_latency: 16285980000
+--               progress: NULL
+--           lock_latency: 15450000000
+--          rows_examined: 0
+--              rows_sent: 0
+--          rows_affected: 0
+--             tmp_tables: 4
+--        tmp_disk_tables: 1
+--              full_scan: YES
+--         last_statement: NULL
+-- last_statement_latency: NULL
+--         current_memory: 3383772
+--              last_wait: wait/synch/mutex/innodb/trx_mutex
+--      last_wait_latency: 56550
+--                 source: trx0trx.h:1520
+--            trx_latency: 17893350207000
+--              trx_state: ACTIVE
+--         trx_autocommit: NO
+--                    pid: 5559
+--           program_name: mysql
+--
+
+CREATE OR REPLACE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$session
+ AS
+SELECT * FROM sys.x$processlist
+WHERE conn_id IS NOT NULL AND command != 'Daemon';
diff --git a/scripts/sys_schema/views/p_s/x_statement_analysis.sql b/scripts/sys_schema/views/p_s/x_statement_analysis.sql
new file mode 100644
index 000000000000..f808eed56e1b
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statement_analysis.sql
@@ -0,0 +1,110 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+--
+-- View: x$statement_analysis
+--
+-- Lists a normalized statement view with aggregated statistics,
+-- mimics the MySQL Enterprise Monitor Query Analysis view,
+-- ordered by the total execution time per normalized statement
+-- 
+-- mysql> select * from x$statement_analysis limit 1\G
+-- *************************** 1. row ***************************
+--             query: SELECT * FROM `schema_object_overview` SELECT `information_schema` . `routines`  -- truncated
+--                db: sys
+--         full_scan: *
+--        exec_count: 2
+--         err_count: 0
+--        warn_count: 0
+--     total_latency: 16751388791000
+--       max_latency: 16566171163000
+--       avg_latency: 8375694395000
+--      lock_latency: 16686483000000
+--         rows_sent: 84
+--     rows_sent_avg: 42
+--     rows_examined: 20012
+-- rows_examined_avg: 10006
+--     rows_affected: 0
+-- rows_affected_avg: 0
+--        tmp_tables: 378
+--   tmp_disk_tables: 66
+--       rows_sorted: 168
+-- sort_merge_passes: 0
+--            digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--        first_seen: 2014-03-07 13:13:41
+--         last_seen: 2014-03-07 13:13:48
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statement_analysis (
+  query,
+  db,
+  full_scan,
+  exec_count,
+  err_count,
+  warn_count,
+  total_latency,
+  max_latency,
+  avg_latency,
+  lock_latency,
+  rows_sent,
+  rows_sent_avg,
+  rows_examined,
+  rows_examined_avg,
+  rows_affected,
+  rows_affected_avg,
+  tmp_tables,
+  tmp_disk_tables,
+  rows_sorted,
+  sort_merge_passes,
+  digest,
+  first_seen,
+  last_seen
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME AS db,
+       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, '*', '') AS full_scan,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS err_count,
+       SUM_WARNINGS AS warn_count,
+       SUM_TIMER_WAIT AS total_latency,
+       MAX_TIMER_WAIT AS max_latency,
+       AVG_TIMER_WAIT AS avg_latency,
+       SUM_LOCK_TIME AS lock_latency,
+       SUM_ROWS_SENT AS rows_sent,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,
+       SUM_ROWS_AFFECTED AS rows_affected,
+       ROUND(IFNULL(SUM_ROWS_AFFECTED / NULLIF(COUNT_STAR, 0), 0))  AS rows_affected_avg,
+       SUM_CREATED_TMP_TABLES AS tmp_tables,
+       SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,
+       SUM_SORT_ROWS AS rows_sorted,
+       SUM_SORT_MERGE_PASSES AS sort_merge_passes,
+       DIGEST AS digest,
+       FIRST_SEEN AS first_seen,
+       LAST_SEEN as last_seen
+  FROM performance_schema.events_statements_summary_by_digest
+ORDER BY SUM_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/x_statements_with_errors_or_warnings.sql b/scripts/sys_schema/views/p_s/x_statements_with_errors_or_warnings.sql
new file mode 100644
index 000000000000..593d38753fb1
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statements_with_errors_or_warnings.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$statements_with_errors_or_warnings
+--
+-- Lists all normalized statements that have raised errors or warnings.
+--
+-- mysql> select * from x$statements_with_errors_or_warnings LIMIT 1\G
+-- *************************** 1. row ***************************
+--       query: CREATE OR REPLACE ALGORITHM = TEMPTABLE DEFINER = ? @ ? SQL SECURITY INVOKER VIEW ... truncated
+--          db: sys
+--  exec_count: 2
+--      errors: 1
+--   error_pct: 50.0000
+--    warnings: 0
+-- warning_pct: 0.0000
+--  first_seen: 2014-03-07 12:56:54
+--   last_seen: 2014-03-07 13:01:01
+--      digest: 943a788859e623d5f7798ba0ae0fd8a9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statements_with_errors_or_warnings (
+  query,
+  db,
+  exec_count,
+  errors,
+  error_pct,
+  warnings,
+  warning_pct,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS errors,
+       IFNULL(SUM_ERRORS / NULLIF(COUNT_STAR, 0), 0) * 100 as error_pct,
+       SUM_WARNINGS AS warnings,
+       IFNULL(SUM_WARNINGS / NULLIF(COUNT_STAR, 0), 0) * 100 as warning_pct,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_ERRORS > 0
+    OR SUM_WARNINGS > 0
+ORDER BY SUM_ERRORS DESC, SUM_WARNINGS DESC;
diff --git a/scripts/sys_schema/views/p_s/x_statements_with_full_table_scans.sql b/scripts/sys_schema/views/p_s/x_statements_with_full_table_scans.sql
new file mode 100644
index 000000000000..f00f725b46a9
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statements_with_full_table_scans.sql
@@ -0,0 +1,89 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$statements_with_full_table_scans
+--
+-- Lists all normalized statements that use have done a full table scan
+-- ordered by number the percentage of times a full scan was done,
+-- then by the statement latency.
+--
+-- This view ignores SHOW statements, as these always cause a full table scan,
+-- and there is nothing that can be done about this.
+--
+-- mysql> select * from x$statements_with_full_table_scans limit 1\G
+-- *************************** 1. row ***************************
+--                    query: SELECT * FROM `schema_object_overview` SELECT `information_schema` . `routines` . `ROUTINE_SCHEMA` // truncated
+--                       db: sys
+--               exec_count: 2
+--            total_latency: 16751388791000
+--      no_index_used_count: 2
+-- no_good_index_used_count: 0
+--        no_index_used_pct: 100
+--                rows_sent: 84
+--            rows_examined: 20012
+--            rows_sent_avg: 42
+--        rows_examined_avg: 10006
+--               first_seen: 2014-03-07 13:13:41
+--                last_seen: 2014-03-07 13:13:48
+--                   digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statements_with_full_table_scans (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  no_index_used_count,
+  no_good_index_used_count,
+  no_index_used_pct,
+  rows_sent,
+  rows_examined,
+  rows_sent_avg,
+  rows_examined_avg,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       SUM_TIMER_WAIT AS total_latency,
+       SUM_NO_INDEX_USED AS no_index_used_count,
+       SUM_NO_GOOD_INDEX_USED AS no_good_index_used_count,
+       ROUND(IFNULL(SUM_NO_INDEX_USED / NULLIF(COUNT_STAR, 0), 0) * 100) AS no_index_used_pct,
+       SUM_ROWS_SENT AS rows_sent,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(SUM_ROWS_SENT/COUNT_STAR) AS rows_sent_avg,
+       ROUND(SUM_ROWS_EXAMINED/COUNT_STAR) AS rows_examined_avg,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE (SUM_NO_INDEX_USED > 0
+    OR SUM_NO_GOOD_INDEX_USED > 0)
+   AND DIGEST_TEXT NOT LIKE 'SHOW%'
+ ORDER BY no_index_used_pct DESC, total_latency DESC;
diff --git a/scripts/sys_schema/views/p_s/x_statements_with_runtimes_in_95th_percentile.sql b/scripts/sys_schema/views/p_s/x_statements_with_runtimes_in_95th_percentile.sql
new file mode 100644
index 000000000000..a87e145009ca
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statements_with_runtimes_in_95th_percentile.sql
@@ -0,0 +1,89 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$statements_with_runtimes_in_95th_percentile
+--
+-- List all statements whose average runtime, in microseconds, is in the top 95th percentile.
+-- 
+-- mysql> SELECT * FROM x$statements_with_runtimes_in_95th_percentile LIMIT 1\G
+-- *************************** 1. row ***************************
+--             query: SELECT `e` . `round_robin_bin` AS `round1_1706_0_` , `e` . `id` AS `id1706_0_` , `e` . `timestamp` AS `timestamp1706_0_` , ... truncated
+--                db: mem
+--         full_scan: *
+--        exec_count: 14
+--         err_count: 0
+--        warn_count: 0
+--     total_latency: 43961670267000
+--       max_latency: 6686877140000
+--       avg_latency: 3140119304000
+--         rows_sent: 11
+--     rows_sent_avg: 1
+--     rows_examined: 253170
+-- rows_examined_avg: 18084
+--        first_seen: 2013-12-04 20:05:01
+--         last_seen: 2013-12-04 20:06:34
+--            digest: 29ba002bf039bb6439357a10134407de
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statements_with_runtimes_in_95th_percentile (
+  query,
+  db,
+  full_scan,
+  exec_count,
+  err_count,
+  warn_count,
+  total_latency,
+  max_latency,
+  avg_latency,
+  rows_sent,
+  rows_sent_avg,
+  rows_examined,
+  rows_examined_avg,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME AS db,
+       IF(SUM_NO_GOOD_INDEX_USED > 0 OR SUM_NO_INDEX_USED > 0, '*', '') AS full_scan,
+       COUNT_STAR AS exec_count,
+       SUM_ERRORS AS err_count,
+       SUM_WARNINGS AS warn_count,
+       SUM_TIMER_WAIT AS total_latency,
+       MAX_TIMER_WAIT AS max_latency,
+       AVG_TIMER_WAIT AS avg_latency,
+       SUM_ROWS_SENT AS rows_sent,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
+       SUM_ROWS_EXAMINED AS rows_examined,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0)) AS rows_examined_avg,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest stmts
+  JOIN sys.x$ps_digest_95th_percentile_by_avg_us AS top_percentile
+    ON ROUND(stmts.avg_timer_wait/1000000) >= top_percentile.avg_us
+ ORDER BY AVG_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/x_statements_with_sorting.sql b/scripts/sys_schema/views/p_s/x_statements_with_sorting.sql
new file mode 100644
index 000000000000..fdee76ba99f7
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statements_with_sorting.sql
@@ -0,0 +1,80 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$statements_with_sorting
+--
+-- Lists all normalized statements that have done sorts,
+-- ordered by total_latency descending.
+--
+-- mysql> select * from x$statements_with_sorting\G
+-- *************************** 1. row ***************************
+--             query: SELECT * FROM `schema_object_overview` SELECT `information_schema` . `routines` . `ROUTINE_SCHEMA` AS ... truncated
+--                db: sys
+--        exec_count: 2
+--     total_latency: 16751388791000
+-- sort_merge_passes: 0
+--   avg_sort_merges: 0
+-- sorts_using_scans: 12
+--  sort_using_range: 0
+--       rows_sorted: 168
+--   avg_rows_sorted: 84
+--        first_seen: 2014-03-07 13:13:41
+--         last_seen: 2014-03-07 13:13:48
+--            digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statements_with_sorting (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  sort_merge_passes,
+  avg_sort_merges,
+  sorts_using_scans,
+  sort_using_range,
+  rows_sorted,
+  avg_rows_sorted,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME db,
+       COUNT_STAR AS exec_count,
+       SUM_TIMER_WAIT AS total_latency,
+       SUM_SORT_MERGE_PASSES AS sort_merge_passes,
+       ROUND(IFNULL(SUM_SORT_MERGE_PASSES / NULLIF(COUNT_STAR, 0), 0)) AS avg_sort_merges,
+       SUM_SORT_SCAN AS sorts_using_scans,
+       SUM_SORT_RANGE AS sort_using_range,
+       SUM_SORT_ROWS AS rows_sorted,
+       ROUND(IFNULL(SUM_SORT_ROWS / NULLIF(COUNT_STAR, 0), 0)) AS avg_rows_sorted,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_SORT_ROWS > 0
+ ORDER BY SUM_TIMER_WAIT DESC;
diff --git a/scripts/sys_schema/views/p_s/x_statements_with_temp_tables.sql b/scripts/sys_schema/views/p_s/x_statements_with_temp_tables.sql
new file mode 100644
index 000000000000..13d9ca2d5746
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_statements_with_temp_tables.sql
@@ -0,0 +1,75 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$statements_with_temp_tables
+--
+-- Lists all normalized statements that use temporary tables
+-- ordered by number of on disk temporary tables descending first, 
+-- then by the number of memory tables.
+--
+-- mysql> select * from x$statements_with_temp_tables limit 1\G
+-- *************************** 1. row ***************************
+--                    query: SELECT * FROM `schema_object_overview` SELECT `information_schema` . `routines` . `ROUTINE_SCHEMA` AS `db` , ... truncated
+--                       db: sys
+--               exec_count: 2
+--            total_latency: 16751388791000
+--        memory_tmp_tables: 378
+--          disk_tmp_tables: 66
+-- avg_tmp_tables_per_query: 189
+--   tmp_tables_to_disk_pct: 17
+--               first_seen: 2014-03-07 13:13:41
+--                last_seen: 2014-03-07 13:13:48
+--                   digest: 54f9bd520f0bbf15db0c2ed93386bec9
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$statements_with_temp_tables (
+  query,
+  db,
+  exec_count,
+  total_latency,
+  memory_tmp_tables,
+  disk_tmp_tables,
+  avg_tmp_tables_per_query,
+  tmp_tables_to_disk_pct,
+  first_seen,
+  last_seen,
+  digest
+) AS
+SELECT DIGEST_TEXT AS query,
+       SCHEMA_NAME as db,
+       COUNT_STAR AS exec_count,
+       SUM_TIMER_WAIT as total_latency,
+       SUM_CREATED_TMP_TABLES AS memory_tmp_tables,
+       SUM_CREATED_TMP_DISK_TABLES AS disk_tmp_tables,
+       ROUND(IFNULL(SUM_CREATED_TMP_TABLES / NULLIF(COUNT_STAR, 0), 0)) AS avg_tmp_tables_per_query,
+       ROUND(IFNULL(SUM_CREATED_TMP_DISK_TABLES / NULLIF(SUM_CREATED_TMP_TABLES, 0), 0) * 100) AS tmp_tables_to_disk_pct,
+       FIRST_SEEN as first_seen,
+       LAST_SEEN as last_seen,
+       DIGEST AS digest
+  FROM performance_schema.events_statements_summary_by_digest
+ WHERE SUM_CREATED_TMP_TABLES > 0
+ORDER BY SUM_CREATED_TMP_DISK_TABLES DESC, SUM_CREATED_TMP_TABLES DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary.sql b/scripts/sys_schema/views/p_s/x_user_summary.sql
new file mode 100644
index 000000000000..f1c59708aa79
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary.sql
@@ -0,0 +1,74 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary
+--
+-- Summarizes statement activity and connections by user
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+--
+-- mysql> select * from x$user_summary;
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | user | statements | total_latency   | avg_latency      | current_connections | total_connections | unique_hosts | current_memory | total_memory_allocated |
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+-- | root |       5685 | 107175100271000 | 18852260381.8821 |                   1 |                 1 |            1 |        1459022 |              572855680 |
+-- | mark |        225 |  14489223428000 | 64396548568.8889 |                   1 |                 1 |            1 |         724578 |               84958286 |
+-- +------+------------+-----------------+------------------+---------------------+-------------------+--------------+----------------+------------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary (
+  user,
+  statements,
+  statement_latency,
+  statement_avg_latency,
+  table_scans,
+  file_ios,
+  file_io_latency,
+  current_connections,
+  total_connections,
+  unique_hosts,
+  current_memory,
+  total_memory_allocated
+) AS
+SELECT IF(accounts.user IS NULL, 'background', accounts.user) AS user,
+       SUM(stmt.total) AS statements,
+       SUM(stmt.total_latency) AS statement_latency,
+       IFNULL(SUM(stmt.total_latency) / NULLIF(SUM(stmt.total), 0), 0) AS statement_avg_latency,
+       SUM(stmt.full_scans) AS table_scans,
+       SUM(io.ios) AS file_ios,
+       SUM(io.io_latency) AS file_io_latency,
+       SUM(accounts.current_connections) AS current_connections,
+       SUM(accounts.total_connections) AS total_connections,
+       COUNT(DISTINCT host) AS unique_hosts,
+       SUM(mem.current_allocated) AS current_memory,
+       SUM(mem.total_allocated) AS total_memory_allocated
+  FROM performance_schema.accounts
+  LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, 'background', accounts.user) = stmt.user
+  LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, 'background', accounts.user) = io.user
+  LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, 'background', accounts.user) = mem.user
+ GROUP BY IF(accounts.user IS NULL, 'background', accounts.user)
+ ORDER BY SUM(stmt.total_latency) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary_by_file_io.sql b/scripts/sys_schema/views/p_s/x_user_summary_by_file_io.sql
new file mode 100644
index 000000000000..63b5c57e602f
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary_by_file_io.sql
@@ -0,0 +1,54 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary_by_file_io
+--
+-- Summarizes file IO totals per user.
+--
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$user_summary_by_file_io;
+-- +------------+-------+----------------+
+-- | user       | ios   | io_latency     |
+-- +------------+-------+----------------+
+-- | root       | 26457 | 21579585586390 |
+-- | background |  1189 |   394212617370 |
+-- +------------+-------+----------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary_by_file_io (
+  user,
+  ios,
+  io_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS ios,
+       SUM(sum_timer_wait) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name LIKE 'wait/io/file/%'
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary_by_file_io_type.sql b/scripts/sys_schema/views/p_s/x_user_summary_by_file_io_type.sql
new file mode 100644
index 000000000000..0ccc0bc04546
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary_by_file_io_type.sql
@@ -0,0 +1,73 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary_by_file_io_type
+--
+-- Summarizes file IO by event type per user.
+--
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$user_summary_by_file_io_type;
+-- +------------+--------------------------------------+-------+---------------+--------------+
+-- | user       | event_name                           | total | latency       | max_latency  |
+-- +------------+--------------------------------------+-------+---------------+--------------+
+-- | background | wait/io/file/sql/FRM                 |   871 |  168148450470 |  18482624810 |
+-- | background | wait/io/file/innodb/innodb_data_file |   173 |  129564287450 |  34087423890 |
+-- | background | wait/io/file/innodb/innodb_log_file  |    20 |   77525706960 |  60657475320 |
+-- | background | wait/io/file/myisam/dfile            |    40 |    6544493800 |   4580546230 |
+-- | background | wait/io/file/mysys/charset           |     3 |    4793558770 |   4713476430 |
+-- | background | wait/io/file/myisam/kfile            |    67 |    4384332810 |    300035450 |
+-- | background | wait/io/file/sql/ERRMSG              |     5 |    2717434850 |   1687316280 |
+-- | background | wait/io/file/sql/pid                 |     3 |     266301490 |    185468920 |
+-- | background | wait/io/file/sql/casetest            |     5 |     246814360 |    150193030 |
+-- | background | wait/io/file/sql/global_ddl_log      |     2 |      21236410 |     18593640 |
+-- | root       | wait/io/file/sql/file_parser         |  1422 | 4801104756760 | 135138518970 |
+-- | root       | wait/io/file/sql/FRM                 |   865 |   85818594810 |   9812303410 |
+-- | root       | wait/io/file/myisam/kfile            |  1073 |   37143664870 |  15793838190 |
+-- | root       | wait/io/file/myisam/dfile            |  2991 |   25528215700 |   5252232050 |
+-- | root       | wait/io/file/sql/dbopt               |    20 |    1067339780 |    153073310 |
+-- | root       | wait/io/file/sql/misc                |     4 |      59713030 |     33752810 |
+-- | root       | wait/io/file/archive/data            |     1 |      13907530 |     13907530 |
+-- +------------+--------------------------------------+-------+---------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary_by_file_io_type (
+  user,
+  event_name,
+  total,
+  latency,
+  max_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name,
+       count_star AS total,
+       sum_timer_wait AS latency,
+       max_timer_wait AS max_latency
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name LIKE 'wait/io/file%'
+   AND count_star > 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary_by_stages.sql b/scripts/sys_schema/views/p_s/x_user_summary_by_stages.sql
new file mode 100644
index 000000000000..3d6dd7c9c755
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary_by_stages.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary_by_stages
+--
+-- Summarizes stages by user, ordered by user and total latency per stage.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.  
+-- 
+-- mysql> select * from x$user_summary_by_stages;
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | user | event_name                     | total | total_latency | avg_latency |
+-- +------+--------------------------------+-------+---------------+-------------+
+-- | root | stage/sql/Opening tables       |  1114 |   71919037000 |    64559000 |
+-- | root | stage/sql/Creating sort index  |     5 |    2245762000 |   449152000 |
+-- | root | stage/sql/init                 |    13 |     428798000 |    32984000 |
+-- | root | stage/sql/checking permissions |    13 |     363231000 |    27940000 |
+-- | root | stage/sql/freeing items        |     7 |     137728000 |    19675000 |
+-- | root | stage/sql/statistics           |     6 |      93955000 |    15659000 |
+-- | root | stage/sql/preparing            |     6 |      82571000 |    13761000 |
+-- | root | stage/sql/optimizing           |     6 |      63338000 |    10556000 |
+-- | root | stage/sql/Sending data         |     6 |      53400000 |     8900000 |
+-- | root | stage/sql/closing tables       |     7 |      46922000 |     6703000 |
+-- | root | stage/sql/System lock          |     6 |      40175000 |     6695000 |
+-- | root | stage/sql/query end            |     7 |      31723000 |     4531000 |
+-- | root | stage/sql/Sorting result       |     6 |       9855000 |     1642000 |
+-- | root | stage/sql/end                  |     6 |       9556000 |     1592000 |
+-- | root | stage/sql/cleaning up          |     7 |       7312000 |     1044000 |
+-- | root | stage/sql/executing            |     6 |       6487000 |     1081000 |
+-- +------+--------------------------------+-------+---------------+-------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary_by_stages (
+  user,
+  event_name,
+  total,
+  total_latency,
+  avg_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name,
+       count_star AS total,
+       sum_timer_wait AS total_latency, 
+       avg_timer_wait AS avg_latency 
+  FROM performance_schema.events_stages_summary_by_user_by_event_name
+ WHERE sum_timer_wait != 0 
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary_by_statement_latency.sql b/scripts/sys_schema/views/p_s/x_user_summary_by_statement_latency.sql
new file mode 100644
index 000000000000..142928b2d01a
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary_by_statement_latency.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary_by_statement_latency
+--
+-- Summarizes overall statement statistics by user.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$user_summary_by_statement_latency;
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+-- | user | total | total_latency   | max_latency   | lock_latency  | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+-- | root |  3382 | 129134039432000 | 1483246743000 | 1069831000000 |      1152 |         94286 |           150 |         92 |
+-- +------+-------+-----------------+---------------+---------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary_by_statement_latency (
+  user,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS total,
+       SUM(sum_timer_wait) AS total_latency,
+       SUM(max_timer_wait) AS max_latency,
+       SUM(sum_lock_time) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_user_summary_by_statement_type.sql b/scripts/sys_schema/views/p_s/x_user_summary_by_statement_type.sql
new file mode 100644
index 000000000000..ecddef21ecc0
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_user_summary_by_statement_type.sql
@@ -0,0 +1,71 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$user_summary_by_statement_type
+--
+-- Summarizes the types of statements executed by each user.
+-- 
+-- When the user found is NULL, it is assumed to be a "background" thread.
+--
+-- mysql> select * from x$user_summary_by_statement_type;
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+-- | user | statement            | total  | total_latency   | max_latency    | lock_latency   | rows_sent | rows_examined | rows_affected | full_scans |
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+-- | root | create_view          |   2110 | 312717366332000 |   463578029000 |  1432355000000 |         0 |             0 |             0 |          0 |
+-- | root | select               |    177 |  41115690428000 | 28827579292000 |   858709000000 |      5254 |        157437 |             0 |         83 |
+-- | root | stmt                 |   6645 |  15305389969000 |   491780297000 |              0 |         0 |             0 |          7951 |          0 |
+-- | root | call_procedure       |     17 |   4783806053000 |  1016083397000 |    37936000000 |         0 |             0 |            19 |          0 |
+-- | root | create_table         |     19 |   3035120946000 |   431706815000 |              0 |         0 |             0 |             0 |          0 |
+-- ...
+-- +------+----------------------+--------+-----------------+----------------+----------------+-----------+---------------+---------------+------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$user_summary_by_statement_type (
+  user,
+  statement,
+  total,
+  total_latency,
+  max_latency,
+  lock_latency,
+  rows_sent,
+  rows_examined,
+  rows_affected,
+  full_scans
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUBSTRING_INDEX(event_name, '/', -1) AS statement,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       max_timer_wait AS max_latency,
+       sum_lock_time AS lock_latency,
+       sum_rows_sent AS rows_sent,
+       sum_rows_examined AS rows_examined,
+       sum_rows_affected AS rows_affected,
+       sum_no_index_used + sum_no_good_index_used AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ WHERE sum_timer_wait != 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_wait_classes_global_by_avg_latency.sql b/scripts/sys_schema/views/p_s/x_wait_classes_global_by_avg_latency.sql
new file mode 100644
index 000000000000..6dbda92cd23b
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_wait_classes_global_by_avg_latency.sql
@@ -0,0 +1,64 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$wait_classes_global_by_avg_latency
+-- 
+-- Lists the top wait classes by average latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from x$wait_classes_global_by_avg_latency;
+-- +-------------------+---------+-------------------+-------------+--------------------+------------------+
+-- | event_class       | total   | total_latency     | min_latency | avg_latency        | max_latency      |
+-- +-------------------+---------+-------------------+-------------+--------------------+------------------+
+-- | idle              |    4331 | 16044682716000000 |     2000000 | 3704613880397.1369 | 1593550454000000 |
+-- | wait/io/file      |   23037 |    20856702551880 |           0 |     905356711.0249 |     350700491310 |
+-- | wait/io/table     |  224924 |      719670285750 |      116870 |       3199615.3623 |     208579012460 |
+-- | wait/lock/table   |    6972 |        3674766030 |      109330 |        527074.8752 |          8855730 |
+-- | wait/synch/rwlock |   11916 |        1273279800 |       37700 |        106854.6324 |          6838780 |
+-- | wait/synch/mutex  | 1031881 |       80464286240 |       56550 |         77978.2613 |       2590408470 |
+-- +-------------------+---------+-------------------+-------------+--------------------+------------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$wait_classes_global_by_avg_latency (
+  event_class,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT SUBSTRING_INDEX(event_name,'/', 3) AS event_class,
+       SUM(COUNT_STAR) AS total,
+       SUM(sum_timer_wait) AS total_latency,
+       MIN(min_timer_wait) AS min_latency,
+       IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) AS avg_latency,
+       MAX(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE sum_timer_wait > 0
+   AND event_name != 'idle'
+ GROUP BY event_class
+ ORDER BY IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) DESC;
+
diff --git a/scripts/sys_schema/views/p_s/x_wait_classes_global_by_latency.sql b/scripts/sys_schema/views/p_s/x_wait_classes_global_by_latency.sql
new file mode 100644
index 000000000000..f77e1a003371
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_wait_classes_global_by_latency.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$wait_classes_global_by_latency
+-- 
+-- Lists the top wait classes by total latency, ignoring idle (this may be very large).
+--
+-- mysql> SELECT * FROM x$wait_classes_global_by_latency;
+-- +-------------------+---------+----------------+-------------+----------------+--------------+
+-- | event_class       | total   | total_latency  | min_latency | avg_latency    | max_latency  |
+-- +-------------------+---------+----------------+-------------+----------------+--------------+
+-- | wait/io/file      |   29468 | 27100905420290 |           0 | 919672370.7170 | 350700491310 |
+-- | wait/io/table     |  224924 |   719670285750 |      116870 |   3199615.3623 | 208579012460 |
+-- | wait/synch/mutex  | 1532036 |   118515948070 |       56550 |     77358.4616 |   2590408470 |
+-- | wait/io/socket    |    1193 |    10677541030 |           0 |   8950160.1257 |    287760330 |
+-- | wait/lock/table   |    6972 |     3674766030 |      109330 |    527074.8752 |      8855730 |
+-- | wait/synch/rwlock |   13646 |     1579833580 |       37700 |    115772.6499 |     28293850 |
+-- +-------------------+---------+----------------+-------------+----------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = TEMPTABLE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$wait_classes_global_by_latency (
+  event_class,
+  total,
+  total_latency,
+  min_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT SUBSTRING_INDEX(event_name,'/', 3) AS event_class, 
+       SUM(COUNT_STAR) AS total,
+       SUM(sum_timer_wait) AS total_latency,
+       MIN(min_timer_wait) AS min_latency,
+       IFNULL(SUM(sum_timer_wait) / NULLIF(SUM(COUNT_STAR), 0), 0) AS avg_latency,
+       MAX(max_timer_wait) AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE sum_timer_wait > 0
+   AND event_name != 'idle'
+ GROUP BY SUBSTRING_INDEX(event_name,'/', 3) 
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/scripts/sys_schema/views/p_s/x_waits_by_host_by_latency.sql b/scripts/sys_schema/views/p_s/x_waits_by_host_by_latency.sql
new file mode 100644
index 000000000000..803378793cfe
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_waits_by_host_by_latency.sql
@@ -0,0 +1,61 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: waits_by_host_by_latency
+--
+-- Lists the top wait events per host by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from sys.x$waits_by_host_by_latency where host != 'background' limit 5;
+-- +-----------+------------------------------+-------+----------------+-------------+--------------+
+-- | host      | event                        | total | total_latency  | avg_latency | max_latency  |
+-- +-----------+------------------------------+-------+----------------+-------------+--------------+
+-- | localhost | wait/io/file/sql/file_parser |  1388 | 14502657551590 | 10448600240 | 357364034170 |
+-- | localhost | wait/io/file/sql/FRM         |   167 |   361060236420 |  2162037319 |  75331088170 |
+-- | localhost | wait/io/file/myisam/kfile    |   410 |   322294755250 |   786084585 |  65978227120 |
+-- | localhost | wait/io/file/myisam/dfile    |  1327 |   307435262550 |   231676679 |  37162925800 |
+-- | localhost | wait/io/file/sql/dbopt       |    89 |   180341976360 |  2026314303 |  63405386850 |
+-- +-----------+------------------------------+-------+----------------+-------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$waits_by_host_by_latency (
+  host,
+  event,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT IF(host IS NULL, 'background', host) AS host,
+       event_name AS event,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       avg_timer_wait AS avg_latency,
+       max_timer_wait AS max_latency
+  FROM performance_schema.events_waits_summary_by_host_by_event_name
+ WHERE event_name != 'idle'
+   AND sum_timer_wait > 0
+ ORDER BY host, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_waits_by_user_by_latency.sql b/scripts/sys_schema/views/p_s/x_waits_by_user_by_latency.sql
new file mode 100644
index 000000000000..d6103c9fcddc
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_waits_by_user_by_latency.sql
@@ -0,0 +1,72 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$waits_by_user_by_latency
+--
+-- Lists the top wait events per user by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from x$waits_by_user_by_latency;
+-- +------+-----------------------------------------------------+--------+----------------+-------------+--------------+
+-- | user | event                                               | total  | total_latency  | avg_latency | max_latency  |
+-- +------+-----------------------------------------------------+--------+----------------+-------------+--------------+
+-- | root | wait/io/file/sql/file_parser                        |  13745 | 60462025415480 |  4398837508 | 231881092170 |
+-- | root | wait/io/file/innodb/innodb_data_file                |   4699 |  3023248450820 |   643381037 |  46928334180 |
+-- | root | wait/io/file/sql/FRM                                |  11467 |  2600067790580 |   226743257 |  61718277920 |
+-- | root | wait/io/file/myisam/dfile                           |  26776 |   746701506200 |    27886690 | 308785046960 |
+-- | root | wait/io/file/myisam/kfile                           |   7126 |   462661061590 |    64925432 |  88756408780 |
+-- | root | wait/io/file/sql/dbopt                              |    179 |   137577467690 |   768589146 |  15457199810 |
+-- | root | wait/io/file/csv/metadata                           |      8 |    86599791590 | 10824973666 |  50322529270 |
+-- | root | wait/synch/mutex/mysys/IO_CACHE::append_buffer_lock | 798080 |    66461175430 |       82940 |    161028010 |
+-- | root | wait/io/file/sql/binlog                             |     19 |    49110632610 |  2584770058 |   9400449760 |
+-- | root | wait/io/file/sql/misc                               |     26 |    22380676630 |   860795052 |  15298475270 |
+-- | root | wait/io/file/csv/data                               |      4 |      297460540 |    74365135 |    111931300 |
+-- | root | wait/synch/rwlock/sql/MDL_lock::rwlock              |    944 |      287862120 |      304616 |       874640 |
+-- | root | wait/io/file/archive/data                           |      4 |       82713800 |    20678450 |     40738620 |
+-- | root | wait/synch/mutex/myisam/MYISAM_SHARE::intern_lock   |     60 |       12211030 |      203203 |       512720 |
+-- | root | wait/synch/mutex/innodb/trx_mutex                   |     81 |        5926440 |       73138 |       252590 |
+-- +------+-----------------------------------------------------+--------+----------------+-------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$waits_by_user_by_latency (
+  user,
+  event,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT IF(user IS NULL, 'background', user) AS user,
+       event_name AS event,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       avg_timer_wait AS avg_latency,
+       max_timer_wait AS max_latency
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ WHERE event_name != 'idle'
+   AND user IS NOT NULL
+   AND sum_timer_wait > 0
+ ORDER BY user, sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/p_s/x_waits_global_by_latency.sql b/scripts/sys_schema/views/p_s/x_waits_global_by_latency.sql
new file mode 100644
index 000000000000..ed62f7406c64
--- /dev/null
+++ b/scripts/sys_schema/views/p_s/x_waits_global_by_latency.sql
@@ -0,0 +1,59 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: x$waits_global_by_latency
+--
+-- Lists the top wait events by their total latency, ignoring idle (this may be very large).
+--
+-- mysql> select * from x$waits_global_by_latency limit 5;
+-- +--------------------------------------+-------+---------------+-------------+--------------+
+-- | event                                | total | total_latency | avg_latency | max_latency  |
+-- +--------------------------------------+-------+---------------+-------------+--------------+
+-- | wait/io/file/sql/file_parser         |   679 | 3536136351540 |  5207858773 | 129860439800 |
+-- | wait/io/file/innodb/innodb_data_file |   195 |  848170566100 |  4349592637 | 350700491310 |
+-- | wait/io/file/sql/FRM                 |  1355 |  400428476500 |   295518990 |  44823120940 |
+-- | wait/io/file/innodb/innodb_log_file  |    20 |   54298899070 |  2714944765 |  30108124800 |
+-- | wait/io/file/mysys/charset           |     3 |   24244722970 |  8081574072 |  24151547420 |
+-- +--------------------------------------+-------+---------------+-------------+--------------+
+--
+
+CREATE OR REPLACE
+  ALGORITHM = MERGE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW x$waits_global_by_latency (
+  events,
+  total,
+  total_latency,
+  avg_latency,
+  max_latency
+) AS
+SELECT event_name AS event,
+       count_star AS total,
+       sum_timer_wait AS total_latency,
+       avg_timer_wait AS avg_latency,
+       max_timer_wait AS max_latency
+  FROM performance_schema.events_waits_summary_global_by_event_name
+ WHERE event_name != 'idle'
+   AND sum_timer_wait > 0
+ ORDER BY sum_timer_wait DESC;
diff --git a/scripts/sys_schema/views/version.sql b/scripts/sys_schema/views/version.sql
new file mode 100644
index 000000000000..b852a1ddaa16
--- /dev/null
+++ b/scripts/sys_schema/views/version.sql
@@ -0,0 +1,42 @@
+-- Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+--
+-- View: version
+--
+-- mysql> select * from sys.version;
+-- +-------------+---------------+
+-- | sys_version | mysql_version |
+-- +-------------+---------------+
+-- | 1.5.2       | 5.7.28        |
+-- +-------------+---------------+
+-- 
+
+CREATE OR REPLACE
+  DEFINER = 'mysql.sys'@'localhost'
+  SQL SECURITY INVOKER 
+VIEW version (
+  sys_version,
+  mysql_version
+) AS 
+SELECT '1.5.2' AS sys_version,
+        version() AS mysql_version;
diff --git a/scripts/systemd/mysqld.service.in b/scripts/systemd/mysqld.service.in
index 1b2c203a4676..61e0e33ebc4a 100644
--- a/scripts/systemd/mysqld.service.in
+++ b/scripts/systemd/mysqld.service.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/scripts/systemd/mysqld.tmpfiles.d.in b/scripts/systemd/mysqld.tmpfiles.d.in
index da1551f6ea05..7fc49197da3b 100644
--- a/scripts/systemd/mysqld.tmpfiles.d.in
+++ b/scripts/systemd/mysqld.tmpfiles.d.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS  FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 51
diff --git a/scripts/systemd/mysqld@.service.in b/scripts/systemd/mysqld@.service.in
index 970e96b2093f..d8f47b88b6c9 100644
--- a/scripts/systemd/mysqld@.service.in
+++ b/scripts/systemd/mysqld@.service.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/scripts/systemd/mysqld_pre_systemd.in b/scripts/systemd/mysqld_pre_systemd.in
index 62b2b997b2b2..56f9debff0db 100644
--- a/scripts/systemd/mysqld_pre_systemd.in
+++ b/scripts/systemd/mysqld_pre_systemd.in
@@ -1,15 +1,22 @@
 #! /bin/bash
 
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/sql-common/client.c b/sql-common/client.c
index 4a95e0288fae..fb5cd1e81ccb 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -29,12 +41,12 @@
 
   In all other cases, the code should be idential for the client and
   server.
-*/ 
+*/
 
-#include <my_global.h>
-#include "mysql.h"
 #include "hash.h"
+#include "mysql.h"
 #include "mysql/client_authentication.h"
+#include <my_global.h>
 
 #ifdef EMBEDDED_LIBRARY
 
@@ -47,40 +59,40 @@
 #define CLI_MYSQL_REAL_CONNECT STDCALL cli_mysql_real_connect
 
 #undef net_flush
-my_bool	net_flush(NET *net);
+my_bool net_flush(NET *net);
 
-#else  /*EMBEDDED_LIBRARY*/
+#else /*EMBEDDED_LIBRARY*/
 #define CLI_MYSQL_REAL_CONNECT STDCALL mysql_real_connect
 #endif /*EMBEDDED_LIBRARY*/
 
-#include <my_sys.h>
+#include "errmsg.h"
 #include "my_default.h"
-#include <mysys_err.h>
-#include <m_string.h>
-#include <m_ctype.h>
 #include "mysql_version.h"
 #include "mysqld_error.h"
-#include "errmsg.h"
+#include <m_ctype.h>
+#include <m_string.h>
+#include <my_sys.h>
+#include <mysys_err.h>
 #include <violite.h>
 
 #if !defined(_WIN32)
-#include <my_thread.h>				/* because of signal()	*/
-#endif /* !defined(_WIN32) */
+#include <my_thread.h> /* because of signal()	*/
+#endif                 /* !defined(_WIN32) */
 
-#include <sys/stat.h>
 #include <signal.h>
+#include <sys/stat.h>
 #include <time.h>
 
-#ifdef	 HAVE_PWD_H
+#ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
 
 #ifdef HAVE_SYS_SELECT_H
-#  include <sys/select.h>
+#include <sys/select.h>
 #endif
 
 #ifdef HAVE_SYS_UN_H
-#  include <sys/un.h>
+#include <sys/un.h>
 #endif
 
 #ifndef _WIN32
@@ -88,22 +100,27 @@ my_bool	net_flush(NET *net);
 #define SOCKET_ERROR -1
 #endif
 
+#ifdef HAVE_OPENSSL
+#include <openssl/x509v3.h>
+#endif
+
+#include "../libmysql/mysql_trace.h" /* MYSQL_TRACE() instrumentation */
 #include "client_settings.h"
-#include <sql_common.h>
 #include <mysql/client_plugin.h>
-#include "../libmysql/mysql_trace.h"  /* MYSQL_TRACE() instrumentation */
+#include <sql_common.h>
 
-#define STATE_DATA(M) \
+#define STATE_DATA(M)                                                          \
   (NULL != (M) ? &(MYSQL_EXTENSION_PTR(M)->state_change) : NULL)
 
 #define ADD_INFO(M, element, type)                                             \
-{                                                                              \
-  M= STATE_DATA(mysql);                                                       \
-  M->info_list[type].head_node= list_add(M->info_list[type].head_node,         \
-                                         element);                             \
-}
+  {                                                                            \
+    M = STATE_DATA(mysql);                                                     \
+    M->info_list[type].head_node =                                             \
+        list_add(M->info_list[type].head_node, element);                       \
+  }
 
 #define native_password_plugin_name "mysql_native_password"
+#define caching_sha2_password_plugin_name "caching_sha2_password"
 
 PSI_memory_key key_memory_mysql_options;
 PSI_memory_key key_memory_MYSQL_DATA;
@@ -113,7 +130,7 @@ PSI_memory_key key_memory_MYSQL_ROW;
 PSI_memory_key key_memory_MYSQL_state_change_info;
 PSI_memory_key key_memory_MYSQL_HANDSHAKE;
 
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
 PSI_memory_key key_memory_create_shared_memory;
 #endif /* _WIN32 && ! EMBEDDED_LIBRARY */
 
@@ -125,44 +142,41 @@ PSI_memory_key key_memory_create_shared_memory;
   Therefore, the code is also instrumented.
 */
 
-static PSI_memory_info all_client_memory[]=
-{
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
-  { &key_memory_create_shared_memory, "create_shared_memory", 0},
+static PSI_memory_info all_client_memory[] = {
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+    {&key_memory_create_shared_memory, "create_shared_memory", 0},
 #endif /* _WIN32 && ! EMBEDDED_LIBRARY */
 
-  { &key_memory_mysql_options, "mysql_options", 0},
-  { &key_memory_MYSQL_DATA, "MYSQL_DATA", 0},
-  { &key_memory_MYSQL, "MYSQL", 0},
-  { &key_memory_MYSQL_RES, "MYSQL_RES", 0},
-  { &key_memory_MYSQL_ROW, "MYSQL_ROW", 0},
-  { &key_memory_MYSQL_state_change_info, "MYSQL_STATE_CHANGE_INFO", 0},
-  { &key_memory_MYSQL_HANDSHAKE, "MYSQL_HANDSHAKE", 0}
-};
+    {&key_memory_mysql_options, "mysql_options", 0},
+    {&key_memory_MYSQL_DATA, "MYSQL_DATA", 0},
+    {&key_memory_MYSQL, "MYSQL", 0},
+    {&key_memory_MYSQL_RES, "MYSQL_RES", 0},
+    {&key_memory_MYSQL_ROW, "MYSQL_ROW", 0},
+    {&key_memory_MYSQL_state_change_info, "MYSQL_STATE_CHANGE_INFO", 0},
+    {&key_memory_MYSQL_HANDSHAKE, "MYSQL_HANDSHAKE", 0}};
 
-void init_client_psi_keys(void)
-{
-  const char *category= "client";
+void init_client_psi_keys(void) {
+  const char *category = "client";
   int count;
 
-  count= array_elements(all_client_memory);
+  count = array_elements(all_client_memory);
   mysql_memory_register(category, all_client_memory, count);
 }
 
 #endif /* HAVE_PSI_INTERFACE */
 
-uint		mysql_port=0;
-char		*mysql_unix_port= 0;
-const char	*unknown_sqlstate= "HY000";
-const char	*not_error_sqlstate= "00000";
-const char	*cant_connect_sqlstate= "08001";
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
-char		 *shared_memory_base_name= 0;
-const char 	*def_shared_memory_base_name= default_shared_memory_base_name;
+uint mysql_port = 0;
+char *mysql_unix_port = 0;
+const char *unknown_sqlstate = "HY000";
+const char *not_error_sqlstate = "00000";
+const char *cant_connect_sqlstate = "08001";
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+char *shared_memory_base_name = 0;
+const char *def_shared_memory_base_name = default_shared_memory_base_name;
 #endif
 
-ulong g_net_buffer_length= 8192;
-ulong g_max_allowed_packet= 1024L*1024L*1024L;
+ulong g_net_buffer_length = 8192;
+ulong g_max_allowed_packet = 1024L * 1024L * 1024L;
 
 void mysql_close_free_options(MYSQL *mysql);
 void mysql_close_free(MYSQL *mysql);
@@ -174,7 +188,8 @@ CHARSET_INFO *default_client_charset_info = &my_charset_latin1;
 unsigned int mysql_server_last_errno;
 char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
 /* forward declaration */
-static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths);
+static int read_one_row(MYSQL *mysql, uint fields, MYSQL_ROW row,
+                        ulong *lengths);
 /**
   Convert the connect timeout option to a timeout value for VIO
   functions (vio_socket_connect() and vio_io_wait()).
@@ -184,8 +199,7 @@ static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths);
   @return The timeout value in milliseconds, or -1 if no timeout.
 */
 
-static int get_vio_connect_timeout(MYSQL *mysql)
-{
+static int get_vio_connect_timeout(MYSQL *mysql) {
   int timeout_ms;
   uint timeout_sec;
 
@@ -195,17 +209,16 @@ static int get_vio_connect_timeout(MYSQL *mysql)
     in milliseconds. Hence, check for a possible overflow. In
     case of overflow, set to no timeout.
   */
-  timeout_sec= mysql->options.connect_timeout;
+  timeout_sec = mysql->options.connect_timeout;
 
-  if (!timeout_sec || (timeout_sec > INT_MAX/1000))
-    timeout_ms= -1;
+  if (!timeout_sec || (timeout_sec > INT_MAX / 1000))
+    timeout_ms = -1;
   else
-    timeout_ms= (int) (timeout_sec * 1000);
+    timeout_ms = (int)(timeout_sec * 1000);
 
   return timeout_ms;
 }
 
-
 #ifdef _WIN32
 
 /**
@@ -220,8 +233,7 @@ static int get_vio_connect_timeout(MYSQL *mysql)
   @return The timeout value in milliseconds, or INFINITE if no timeout.
 */
 
-static DWORD get_win32_connect_timeout(MYSQL *mysql)
-{
+static DWORD get_win32_connect_timeout(MYSQL *mysql) {
   DWORD timeout_ms;
   uint timeout_sec;
 
@@ -231,19 +243,18 @@ static DWORD get_win32_connect_timeout(MYSQL *mysql)
     milliseconds. Hence, check for a possible overflow. In case
     of overflow, set to no timeout.
   */
-  timeout_sec= mysql->options.connect_timeout;
+  timeout_sec = mysql->options.connect_timeout;
 
-  if (!timeout_sec || (timeout_sec > INT_MAX/1000))
-    timeout_ms= INFINITE;
+  if (!timeout_sec || (timeout_sec > INT_MAX / 1000))
+    timeout_ms = INFINITE;
   else
-    timeout_ms= (DWORD) (timeout_sec * 1000);
+    timeout_ms = (DWORD)(timeout_sec * 1000);
 
   return timeout_ms;
 }
 
 #endif
 
-
 /**
   Set the internal error message to mysql handler
 
@@ -253,24 +264,20 @@ static DWORD get_win32_connect_timeout(MYSQL *mysql)
   @parma sqlstate SQL standard sqlstate
 */
 
-void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate)
-{
+void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate) {
   NET *net;
   DBUG_ENTER("set_mysql_error");
   DBUG_PRINT("enter", ("error :%d '%s'", errcode, ER(errcode)));
-  DBUG_ASSERT(mysql != 0);
+  assert(mysql != 0);
 
-  if (mysql)
-  {
-    net= &mysql->net;
-    net->last_errno= errcode;
+  if (mysql) {
+    net = &mysql->net;
+    net->last_errno = errcode;
     my_stpcpy(net->last_error, ER(errcode));
     my_stpcpy(net->sqlstate, sqlstate);
     MYSQL_TRACE(ERROR, mysql, ());
-  }
-  else
-  {
-    mysql_server_last_errno= errcode;
+  } else {
+    mysql_server_last_errno = errcode;
     my_stpcpy(mysql_server_last_error, ER(errcode));
   }
   DBUG_VOID_RETURN;
@@ -281,10 +288,7 @@ void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate)
   @c my_net_init() and net_end()
  */
 
-my_bool my_net_is_inited(NET *net)
-{
-  return net->buff != NULL;
-}
+my_bool my_net_is_inited(NET *net) { return net->buff != NULL; }
 
 /**
   Clear possible error state of struct NET
@@ -292,10 +296,9 @@ my_bool my_net_is_inited(NET *net)
   @param net  clear the state of the argument
 */
 
-void net_clear_error(NET *net)
-{
-  net->last_errno= 0;
-  net->last_error[0]= '\0';
+void net_clear_error(NET *net) {
+  net->last_errno = 0;
+  net->last_error[0] = '\0';
   my_stpcpy(net->sqlstate, not_error_sqlstate);
 }
 
@@ -310,21 +313,18 @@ void net_clear_error(NET *net)
   @param ...       variable number of arguments
 */
 
-void set_mysql_extended_error(MYSQL *mysql, int errcode,
-                                     const char *sqlstate,
-                                     const char *format, ...)
-{
+void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate,
+                              const char *format, ...) {
   NET *net;
   va_list args;
   DBUG_ENTER("set_mysql_extended_error");
   DBUG_PRINT("enter", ("error :%d '%s'", errcode, format));
-  DBUG_ASSERT(mysql != 0);
+  assert(mysql != 0);
 
-  net= &mysql->net;
-  net->last_errno= errcode;
+  net = &mysql->net;
+  net->last_errno = errcode;
   va_start(args, format);
-  my_vsnprintf(net->last_error, sizeof(net->last_error)-1,
-               format, args);
+  my_vsnprintf(net->last_error, sizeof(net->last_error) - 1, format, args);
   va_end(args);
   my_stpcpy(net->sqlstate, sqlstate);
 
@@ -333,98 +333,89 @@ void set_mysql_extended_error(MYSQL *mysql, int errcode,
   DBUG_VOID_RETURN;
 }
 
-
-
-/*
-  Create a named pipe connection
-*/
+  /*
+    Create a named pipe connection
+  */
 
 #ifdef _WIN32
 
 static HANDLE create_named_pipe(MYSQL *mysql, DWORD connect_timeout,
                                 const char **arg_host,
-                                const char **arg_unix_socket)
-{
-  HANDLE hPipe=INVALID_HANDLE_VALUE;
+                                const char **arg_unix_socket) {
+  HANDLE hPipe = INVALID_HANDLE_VALUE;
   char pipe_name[1024];
   DWORD dwMode;
   int i;
-  my_bool testing_named_pipes=0;
-  const char *host= *arg_host, *unix_socket= *arg_unix_socket;
+  my_bool testing_named_pipes = 0;
+  const char *host = *arg_host, *unix_socket = *arg_unix_socket;
 
-  if ( ! unix_socket || (unix_socket)[0] == 0x00)
+  if (!unix_socket || (unix_socket)[0] == 0x00)
     unix_socket = mysql_unix_port;
-  if (!host || !strcmp(host,LOCAL_HOST))
-    host=LOCAL_HOST_NAMEDPIPE;
+  if (!host || !strcmp(host, LOCAL_HOST))
+    host = LOCAL_HOST_NAMEDPIPE;
 
-  
-  pipe_name[sizeof(pipe_name)-1]= 0;		/* Safety if too long string */
-  strxnmov(pipe_name, sizeof(pipe_name)-1, "\\\\", host, "\\pipe\\",
-	   unix_socket, NullS);
-  DBUG_PRINT("info",("Server name: '%s'.  Named Pipe: %s", host, unix_socket));
+  pipe_name[sizeof(pipe_name) - 1] = 0; /* Safety if too long string */
+  strxnmov(pipe_name, sizeof(pipe_name) - 1, "\\\\", host, "\\pipe\\",
+           unix_socket, NullS);
+  DBUG_PRINT("info", ("Server name: '%s'.  Named Pipe: %s", host, unix_socket));
 
-  for (i=0 ; i < 100 ; i++)			/* Don't retry forever */
+  for (i = 0; i < 100; i++) /* Don't retry forever */
   {
     if ((hPipe = CreateFile(pipe_name,
-			    GENERIC_READ | GENERIC_WRITE,
-			    0,
-			    NULL,
-			    OPEN_EXISTING,
-			    FILE_FLAG_OVERLAPPED,
-			    NULL )) != INVALID_HANDLE_VALUE)
+                            FILE_READ_ATTRIBUTES | FILE_READ_DATA |
+                                FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA,
+                            0, NULL, OPEN_EXISTING,
+                            FILE_FLAG_OVERLAPPED | SECURITY_SQOS_PRESENT |
+                                SECURITY_IDENTIFICATION,
+                            NULL)) != INVALID_HANDLE_VALUE)
       break;
-    if (GetLastError() != ERROR_PIPE_BUSY)
-    {
-      set_mysql_extended_error(mysql, CR_NAMEDPIPEOPEN_ERROR,
-                               unknown_sqlstate, ER(CR_NAMEDPIPEOPEN_ERROR),
-                               host, unix_socket, (ulong) GetLastError());
+    if (GetLastError() != ERROR_PIPE_BUSY) {
+      set_mysql_extended_error(mysql, CR_NAMEDPIPEOPEN_ERROR, unknown_sqlstate,
+                               ER(CR_NAMEDPIPEOPEN_ERROR), host, unix_socket,
+                               (ulong)GetLastError());
       return INVALID_HANDLE_VALUE;
     }
     /* wait for for an other instance */
-    if (!WaitNamedPipe(pipe_name, connect_timeout))
-    {
+    if (!WaitNamedPipe(pipe_name, connect_timeout)) {
       set_mysql_extended_error(mysql, CR_NAMEDPIPEWAIT_ERROR, unknown_sqlstate,
-                               ER(CR_NAMEDPIPEWAIT_ERROR),
-                               host, unix_socket, (ulong) GetLastError());
+                               ER(CR_NAMEDPIPEWAIT_ERROR), host, unix_socket,
+                               (ulong)GetLastError());
       return INVALID_HANDLE_VALUE;
     }
   }
-  if (hPipe == INVALID_HANDLE_VALUE)
-  {
+  if (hPipe == INVALID_HANDLE_VALUE) {
     set_mysql_extended_error(mysql, CR_NAMEDPIPEOPEN_ERROR, unknown_sqlstate,
                              ER(CR_NAMEDPIPEOPEN_ERROR), host, unix_socket,
-                             (ulong) GetLastError());
+                             (ulong)GetLastError());
     return INVALID_HANDLE_VALUE;
   }
   dwMode = PIPE_READMODE_BYTE | PIPE_WAIT;
-  if ( !SetNamedPipeHandleState(hPipe, &dwMode, NULL, NULL) )
-  {
-    CloseHandle( hPipe );
+  if (!SetNamedPipeHandleState(hPipe, &dwMode, NULL, NULL)) {
+    CloseHandle(hPipe);
     set_mysql_extended_error(mysql, CR_NAMEDPIPESETSTATE_ERROR,
                              unknown_sqlstate, ER(CR_NAMEDPIPESETSTATE_ERROR),
-                             host, unix_socket, (ulong) GetLastError());
+                             host, unix_socket, (ulong)GetLastError());
     return INVALID_HANDLE_VALUE;
   }
-  *arg_host=host ; *arg_unix_socket=unix_socket;	/* connect arg */
+  *arg_host = host;
+  *arg_unix_socket = unix_socket; /* connect arg */
   return (hPipe);
 }
 #endif
 
+  /*
+    Create new shared memory connection, return handler of connection
 
-/*
-  Create new shared memory connection, return handler of connection
-
-  @param mysql  Pointer of mysql structure
-  @param net    Pointer of net structure
-  @param connect_timeout  Timeout of connection (in milliseconds)
+    @param mysql  Pointer of mysql structure
+    @param net    Pointer of net structure
+    @param connect_timeout  Timeout of connection (in milliseconds)
 
-  @return HANDLE to the shared memory area.
-*/
+    @return HANDLE to the shared memory area.
+  */
 
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
 static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
-                                   DWORD connect_timeout)
-{
+                                   DWORD connect_timeout) {
   ulong smem_buffer_length = shared_memory_buffer_length + 4;
   /*
     event_connect_request is event object for start connection actions
@@ -454,13 +445,13 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
   HANDLE connect_named_mutex = NULL;
   ulong connect_number;
   char connect_number_char[22], *p;
-  char *tmp= NULL;
+  char *tmp = NULL;
   char *suffix_pos;
   DWORD error_allow = 0;
   DWORD error_code = 0;
-  DWORD event_access_rights= SYNCHRONIZE | EVENT_MODIFY_STATE;
+  DWORD event_access_rights = SYNCHRONIZE | EVENT_MODIFY_STATE;
   char *shared_memory_base_name = mysql->options.shared_memory_base_name;
-  static const char *name_prefixes[] = {"","Global\\"};
+  static const char *name_prefixes[] = {"", "Global\\"};
   const char *prefix;
   int i;
 
@@ -471,13 +462,14 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
     behavior if the user passed in a different name on the command-line or
     in a my.cnf.
   */
-  DBUG_ASSERT(shared_memory_base_name != NULL);
+  assert(shared_memory_base_name != NULL);
 
   /*
      get enough space base-name + '_' + longest suffix we might ever send
    */
-  if (!(tmp= (char *)my_malloc(key_memory_create_shared_memory,
-                               strlen(shared_memory_base_name) + 32L, MYF(MY_FAE))))
+  if (!(tmp = (char *)my_malloc(key_memory_create_shared_memory,
+                                strlen(shared_memory_base_name) + 32L,
+                                MYF(MY_FAE))))
     goto err;
 
   /*
@@ -487,60 +479,58 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
     shared_memory_base_name is unique value for each server
     unique_part is uniquel value for each object (events and file-mapping)
   */
-  for (i = 0; i< array_elements(name_prefixes); i++)
-  {
-    prefix= name_prefixes[i];
-    suffix_pos = strxmov(tmp, prefix , shared_memory_base_name, "_", NullS);
+  for (i = 0; i < array_elements(name_prefixes); i++) {
+    prefix = name_prefixes[i];
+    suffix_pos = strxmov(tmp, prefix, shared_memory_base_name, "_", NullS);
     my_stpcpy(suffix_pos, "CONNECT_REQUEST");
-    event_connect_request= OpenEvent(event_access_rights, FALSE, tmp);
-    if (event_connect_request)
-    {
+    event_connect_request = OpenEvent(event_access_rights, FALSE, tmp);
+    if (event_connect_request) {
       break;
     }
   }
-  if (!event_connect_request)
-  {
+  if (!event_connect_request) {
     error_allow = CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR;
     goto err;
   }
   my_stpcpy(suffix_pos, "CONNECT_ANSWER");
-  if (!(event_connect_answer= OpenEvent(event_access_rights,FALSE,tmp)))
-  {
+  if (!(event_connect_answer = OpenEvent(event_access_rights, FALSE, tmp))) {
     error_allow = CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR;
     goto err;
   }
   my_stpcpy(suffix_pos, "CONNECT_DATA");
-  if (!(handle_connect_file_map= OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)))
-  {
+  if (!(handle_connect_file_map =
+            OpenFileMapping(FILE_MAP_WRITE, FALSE, tmp))) {
     error_allow = CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR;
     goto err;
   }
-  if (!(handle_connect_map= MapViewOfFile(handle_connect_file_map,
-					  FILE_MAP_WRITE,0,0,sizeof(DWORD))))
-  {
+  if (!(handle_connect_map = MapViewOfFile(
+            handle_connect_file_map, FILE_MAP_WRITE, 0, 0, sizeof(DWORD)))) {
     error_allow = CR_SHARED_MEMORY_CONNECT_MAP_ERROR;
     goto err;
   }
 
   my_stpcpy(suffix_pos, "CONNECT_NAMED_MUTEX");
-  connect_named_mutex= CreateMutex(NULL, TRUE, tmp);
-  if (connect_named_mutex == NULL)
-  {
-    error_allow= CR_SHARED_MEMORY_CONNECT_SET_ERROR;
+  connect_named_mutex = OpenMutex(SYNCHRONIZE, FALSE, tmp);
+  if (connect_named_mutex == NULL) {
+    error_allow = CR_SHARED_MEMORY_CONNECT_SET_ERROR;
+    goto err;
+  }
+
+  if (WaitForSingleObject(connect_named_mutex, connect_timeout) !=
+    WAIT_OBJECT_0) {
+    error_allow = CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR;
     goto err;
   }
 
   /* Send to server request of connection */
-  if (!SetEvent(event_connect_request))
-  {
+  if (!SetEvent(event_connect_request)) {
     error_allow = CR_SHARED_MEMORY_CONNECT_SET_ERROR;
     goto err;
   }
 
   /* Wait of answer from server */
   if (WaitForSingleObject(event_connect_answer, connect_timeout) !=
-      WAIT_OBJECT_0)
-  {
+      WAIT_OBJECT_0) {
     error_allow = CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR;
     goto err;
   }
@@ -550,8 +540,8 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
   connect_named_mutex = NULL;
 
   /* Get number of connection */
-  connect_number = uint4korr(handle_connect_map);/*WAX2*/
-  p= int10_to_str(connect_number, connect_number_char, 10);
+  connect_number = uint4korr(handle_connect_map); /*WAX2*/
+  p = int10_to_str(connect_number, connect_number_char, 10);
 
   /*
     The name of event and file-mapping events create agree next rule:
@@ -562,52 +552,50 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
     unique_part is uniquel value for each object (events and file-mapping)
     number_of_connection is number of connection between server and client
   */
-  suffix_pos = strxmov(tmp, prefix , shared_memory_base_name, "_", connect_number_char,
-		       "_", NullS);
+  suffix_pos = strxmov(tmp, prefix, shared_memory_base_name, "_",
+                       connect_number_char, "_", NullS);
   my_stpcpy(suffix_pos, "DATA");
-  if ((handle_file_map = OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)) == NULL)
-  {
+  if ((handle_file_map = OpenFileMapping(FILE_MAP_WRITE, FALSE, tmp)) == NULL) {
     error_allow = CR_SHARED_MEMORY_FILE_MAP_ERROR;
     goto err2;
   }
-  if ((handle_map = MapViewOfFile(handle_file_map,FILE_MAP_WRITE,0,0,
-				  smem_buffer_length)) == NULL)
-  {
+  if ((handle_map = MapViewOfFile(handle_file_map, FILE_MAP_WRITE, 0, 0,
+                                  smem_buffer_length)) == NULL) {
     error_allow = CR_SHARED_MEMORY_MAP_ERROR;
     goto err2;
   }
 
   my_stpcpy(suffix_pos, "SERVER_WROTE");
-  if ((event_server_wrote = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
-  {
+  if ((event_server_wrote = OpenEvent(event_access_rights, FALSE, tmp)) ==
+      NULL) {
     error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
     goto err2;
   }
 
   my_stpcpy(suffix_pos, "SERVER_READ");
-  if ((event_server_read = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
-  {
+  if ((event_server_read = OpenEvent(event_access_rights, FALSE, tmp)) ==
+      NULL) {
     error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
     goto err2;
   }
 
   my_stpcpy(suffix_pos, "CLIENT_WROTE");
-  if ((event_client_wrote = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
-  {
+  if ((event_client_wrote = OpenEvent(event_access_rights, FALSE, tmp)) ==
+      NULL) {
     error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
     goto err2;
   }
 
   my_stpcpy(suffix_pos, "CLIENT_READ");
-  if ((event_client_read = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
-  {
+  if ((event_client_read = OpenEvent(event_access_rights, FALSE, tmp)) ==
+      NULL) {
     error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
     goto err2;
   }
 
   my_stpcpy(suffix_pos, "CONNECTION_CLOSED");
-  if ((event_conn_closed = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
-  {
+  if ((event_conn_closed = OpenEvent(event_access_rights, FALSE, tmp)) ==
+      NULL) {
     error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
     goto err2;
   }
@@ -617,15 +605,11 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
   SetEvent(event_server_read);
 
 err2:
-  if (error_allow == 0)
-  {
-    net->vio= vio_new_win32shared_memory(handle_file_map,handle_map,
-                                         event_server_wrote,
-                                         event_server_read,event_client_wrote,
-                                         event_client_read,event_conn_closed);
-  }
-  else
-  {
+  if (error_allow == 0) {
+    net->vio = vio_new_win32shared_memory(
+        handle_file_map, handle_map, event_server_wrote, event_server_read,
+        event_client_wrote, event_client_read, event_conn_closed);
+  } else {
     error_code = GetLastError();
     if (event_server_read)
       CloseHandle(event_server_read);
@@ -654,10 +638,8 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
     UnmapViewOfFile(handle_connect_map);
   if (handle_connect_file_map)
     CloseHandle(handle_connect_file_map);
-  if (error_allow)
-  {
-    if (connect_named_mutex)
-    {
+  if (error_allow) {
+    if (connect_named_mutex) {
       ReleaseMutex(connect_named_mutex);
       CloseHandle(connect_named_mutex);
     }
@@ -668,71 +650,118 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
     else
       set_mysql_extended_error(mysql, error_allow, unknown_sqlstate,
                                ER(error_allow), error_code);
-    return(INVALID_HANDLE_VALUE);
+    return (INVALID_HANDLE_VALUE);
   }
-  return(handle_map);
+  return (handle_map);
 }
 #endif
 
 /*
   Free all memory acquired to store state change information.
 */
-void free_state_change_info(MYSQL_EXTENSION *ext)
-{
+void free_state_change_info(MYSQL_EXTENSION *ext) {
   STATE_INFO *info;
   int i;
 
   if (ext)
-    info= &ext->state_change;
+    info = &ext->state_change;
   else
     return;
 
-  for (i= SESSION_TRACK_SYSTEM_VARIABLES; i <= SESSION_TRACK_END; i++)
-  {
-    if (list_length(info->info_list[i].head_node) != 0)
-    {
-      /*
-        Since nodes were multi-alloced, we don't need to free the data
-        separately. But the str member in data needs to be freed.
-      */
-      LIST *tmp_list= info->info_list[i].head_node;
-      while (tmp_list)
-      {
-	LEX_STRING *tmp= (LEX_STRING *)(tmp_list)->data;
-	if (tmp->str)
-	  my_free(tmp->str);
-	tmp_list= tmp_list->next;
-      }
-      list_free(info->info_list[i].head_node, (uint) 0);
+  for (i = SESSION_TRACK_SYSTEM_VARIABLES; i <= SESSION_TRACK_END; i++) {
+    if (list_length(info->info_list[i].head_node) != 0) {
+      list_free(info->info_list[i].head_node, (uint)0);
     }
   }
   memset(info, 0, sizeof(STATE_INFO));
 }
 
+/**
+  Helper function to check if the buffer has at least bytes remaining
+
+  If the buffer is too small it raises CR_MALFORMED_PACKET_ERROR.
+
+  @param mysql the handle that has the buffer
+  @param packet the current position in the buffer
+  @param packet_length the size of the packet
+  @param bytes the bytes that we want available
+  @retval TRUE the buffer has that many bytes
+  @retval FALSE the buffer has less bytes remaining
+*/
+static inline my_bool buffer_check_remaining(MYSQL *mysql, uchar *packet,
+                                   ulong packet_length, size_t bytes) {
+  size_t remaining_bytes;
+  /* Check to avoid underflow */
+  if (packet_length < (ulong)(packet - mysql->net.read_pos)) {
+    set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+    return FALSE;
+  }
+  remaining_bytes = packet_length - (packet - mysql->net.read_pos);
+  if (remaining_bytes < bytes) {
+    set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+    return FALSE;
+  }
+  return TRUE;
+}
+
+/*
+  Helper function to safely read a variable size from a buffer.
+  If the buffer is too small it raises CR_MALFORMED_PACKET_ERROR
+  and sets is_error to TRUE.
+  Otherwise it sets is_error to FALSE and calls @ref inet_field_length_ll.
+
+  @sa @ref net_field_length_ll
+
+  @param mysql the handle to return an error in
+  @param [in,out] packet pointer to the buffer to read the length from
+  @param packet_length  remining bytes in packet
+  @param [out] is_error set to TRUE if the buffer contains no room for a
+  full length, FALSE otherwise.
+  @return the size read.
+*/
+static inline my_ulonglong net_field_length_ll_safe(MYSQL *mysql, uchar **packet,
+                                             ulong packet_length,
+                                             my_bool *is_error) {
+  size_t sizeof_len = net_field_length_size(*packet);
+  DBUG_EXECUTE_IF("simulate_bad_packet", {
+    *packet = *packet + packet_length + 1000000L;
+  });
+  if (!buffer_check_remaining(mysql, *packet, packet_length, sizeof_len)) {
+    *is_error = TRUE;
+    return 0;
+  }
+
+  *is_error = FALSE;
+  return net_field_length_ll(packet);
+}
 
 /**
   Read Ok packet along with the server state change information.
 */
-void read_ok_ex(MYSQL *mysql, ulong length)
-{
+void read_ok_ex(MYSQL *mysql, ulong length) {
   size_t total_len, len;
   uchar *pos, *saved_pos;
   my_ulonglong affected_rows, insert_id;
   char *db;
+  char *data_str;
 
   struct charset_info_st *saved_cs;
-  char charset_name[64];
   my_bool is_charset;
 
-  STATE_INFO *info= NULL;
+  STATE_INFO *info = NULL;
   enum enum_session_state_type type;
-  LIST *element= NULL;
-  LEX_STRING *data=NULL;
+  LIST *element = NULL;
+  LEX_STRING *data = NULL;
+  my_bool is_error;
 
-  pos= mysql->net.read_pos + 1;
+  pos = mysql->net.read_pos + 1;
 
-  affected_rows = net_field_length_ll(&pos); /* affected rows */
-  insert_id = net_field_length_ll(&pos); /* insert id */
+  affected_rows = net_field_length_ll_safe(mysql, &pos, length,
+                                           &is_error); /* affected rows */
+  if (is_error) return;
+  insert_id = net_field_length_ll_safe(mysql, &pos, length,
+                                       &is_error);     /* insert id */
+  if (is_error) return;
 
   /*
    The following check ensures that we skip the assignment for the
@@ -745,82 +774,80 @@ void read_ok_ex(MYSQL *mysql, ulong length)
    with a packet header of 0x00.
   */
   if (!((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
-        mysql->net.read_pos[0] == 254))
-  {
-    mysql->affected_rows= affected_rows;
-    mysql->insert_id= insert_id;
+        mysql->net.read_pos[0] == 254)) {
+    mysql->affected_rows = affected_rows;
+    mysql->insert_id = insert_id;
 
-    DBUG_PRINT("info",("affected_rows: %lu  insert_id: %lu",
-                       (ulong) mysql->affected_rows,
-                       (ulong) mysql->insert_id));
+    DBUG_PRINT("info", ("affected_rows: %lu  insert_id: %lu",
+                        (ulong)mysql->affected_rows, (ulong)mysql->insert_id));
   }
+  if (!buffer_check_remaining(mysql, pos, length, 2)) return;
   /* server status */
-  mysql->server_status= uint2korr(pos);
+  mysql->server_status = uint2korr(pos);
   pos += 2;
 
-  if (protocol_41(mysql))
-  {
-    mysql->warning_count=uint2korr(pos);
+  if (protocol_41(mysql)) {
+    if (!buffer_check_remaining(mysql, pos, length, 2)) return;
+    mysql->warning_count = uint2korr(pos);
     pos += 2;
   } else
-    mysql->warning_count= 0;                    /* MySQL 4.0 protocol */
+    mysql->warning_count = 0; /* MySQL 4.0 protocol */
 
-  DBUG_PRINT("info",("status: %u  warning_count: %u",
-                     mysql->server_status, mysql->warning_count));
-  if (mysql->server_capabilities & CLIENT_SESSION_TRACK)
-  {
+  DBUG_PRINT("info", ("status: %u  warning_count: %u", mysql->server_status,
+                      mysql->warning_count));
+  if (mysql->server_capabilities & CLIENT_SESSION_TRACK) {
     free_state_change_info(mysql->extension);
 
-    if (pos < mysql->net.read_pos + length)
-    {
+    if (pos < mysql->net.read_pos + length) {
       /* get the info field */
-      size_t length_msg_member= (size_t)net_field_length(&pos);
-      mysql->info= (length_msg_member ? (char *)pos : NULL);
+      size_t length_msg_member =
+          (size_t)net_field_length_ll_safe(mysql, &pos, length, &is_error);
+      if (is_error) return;
+      if (!buffer_check_remaining(mysql, pos, length, length_msg_member))
+         return;
+      mysql->info = (length_msg_member ? (char *)pos : NULL);
       pos += (length_msg_member);
 
       /* read session state changes info */
-      if (mysql->server_status & SERVER_SESSION_STATE_CHANGED)
-      {
-        saved_pos= pos;
-        total_len= (size_t)net_field_length(&pos);
+      if (mysql->server_status & SERVER_SESSION_STATE_CHANGED) {
+        saved_pos = pos;
+        total_len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                     &is_error);
+        if (is_error) return;
         /* ensure that mysql->info is zero-terminated */
         if (mysql->info)
-          *saved_pos= 0;
-
-        while (total_len > 0)
-        {
-          saved_pos= pos;
-          type= (enum enum_session_state_type) net_field_length(&pos);
-
-          switch (type)
-          {
+          *saved_pos = 0;
+
+        while (total_len > 0) {
+          saved_pos = pos;
+          type = (enum enum_session_state_type)net_field_length_ll_safe(
+                  mysql, &pos, length, &is_error);
+          if (is_error) return;
+          switch (type) {
           case SESSION_TRACK_SYSTEM_VARIABLES:
             /* Move past the total length of the changed entity. */
-            (void) net_field_length(&pos);
+            (void)net_field_length_ll_safe(mysql, &pos, length, &is_error);
+            if (is_error) return;
 
             /* Name of the system variable. */
-            len= (size_t) net_field_length(&pos);
-
-            if (!my_multi_malloc(key_memory_MYSQL_state_change_info,
-              MYF(0),
-              &element, sizeof(LIST),
-              &data, sizeof(LEX_STRING),
-              NullS))
-            {
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
+
+            if (!my_multi_malloc(key_memory_MYSQL_state_change_info, MYF(0),
+                                 &element, sizeof(LIST), &data,
+                                 sizeof(LEX_STRING), &data_str, len, NullS)) {
               set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
               return;
             }
 
-            if(!(data->str= (char *)my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))))
-            {
-              set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-              return;
-            }
-            memcpy(data->str, (char *) pos, len);
-            data->length= len;
+            data->str = data_str;
+            memcpy(data->str, (char *)pos, len);
+            data->length = len;
             pos += len;
 
-            element->data= data;
+            element->data = data;
             ADD_INFO(info, element, SESSION_TRACK_SYSTEM_VARIABLES);
 
             /*
@@ -828,48 +855,47 @@ void read_ok_ex(MYSQL *mysql, ulong length)
               update mysql->charset.
               */
             if (!strncmp(data->str, "character_set_client", data->length))
-              is_charset= 1;
+              is_charset = 1;
             else
-              is_charset= 0;
-
-            if (!my_multi_malloc(key_memory_MYSQL_state_change_info,
-              MYF(0),
-              &element, sizeof(LIST),
-              &data, sizeof(LEX_STRING),
-              NullS))
-            {
-              set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-              return;
-            }
+              is_charset = 0;
 
             /* Value of the system variable. */
-            len= (size_t) net_field_length(&pos);
-            if(!(data->str= (char *)my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))))
-            {
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
+
+            if (!my_multi_malloc(key_memory_MYSQL_state_change_info, MYF(0),
+                                 &element, sizeof(LIST), &data,
+                                 sizeof(LEX_STRING), &data_str, len, NullS)) {
               set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
               return;
             }
-            memcpy(data->str, (char *) pos, len);
-            data->length= len;
+
+            data->str = data_str;
+            memcpy(data->str, (char *)pos, len);
+            data->length = len;
             pos += len;
 
-            element->data= data;
+            element->data = data;
             ADD_INFO(info, element, SESSION_TRACK_SYSTEM_VARIABLES);
 
-            if (is_charset == 1)
-            {
-              saved_cs= mysql->charset;
-
-              memcpy(charset_name, data->str, data->length);
-              charset_name[data->length]= 0;
-
-              if (!(mysql->charset= get_charset_by_csname(charset_name,
-                MY_CS_PRIMARY,
-                MYF(MY_WME))))
-              {
-                /* Ideally, the control should never reach her. */
-                DBUG_ASSERT(0);
-                mysql->charset= saved_cs;
+            if (is_charset == 1) {
+              char charset_name[MY_CS_NAME_SIZE * 8]; // MY_CS_BUFFER_SIZE
+              size_t length = MY_MIN(data->length, (sizeof(charset_name) - 1));
+              saved_cs = mysql->charset;
+
+              memcpy(charset_name, data->str, length);
+              charset_name[length] = 0;
+
+              if (!(mysql->charset = get_charset_by_csname(
+                        charset_name, MY_CS_PRIMARY, MYF(MY_WME)))) {
+                DBUG_PRINT(
+                    "warning",
+                    ("session tracker supplied %s is not a valid charset."
+                     " Keeping the old one.",
+                     charset_name));
+                mysql->charset = saved_cs;
               }
             }
             break;
@@ -877,37 +903,32 @@ void read_ok_ex(MYSQL *mysql, ulong length)
           case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
           case SESSION_TRACK_SCHEMA:
 
-            if (!my_multi_malloc(key_memory_MYSQL_state_change_info,
-              MYF(0),
-              &element, sizeof(LIST),
-              &data, sizeof(LEX_STRING),
-              NullS))
-            {
-              set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-              return;
-            }
-
             /* Move past the total length of the changed entity. */
-            (void) net_field_length(&pos);
-
-            len= (size_t) net_field_length(&pos);
-            if(!(data->str= (char *)my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))))
-            {
+            (void)net_field_length_ll_safe(mysql, &pos, length, &is_error);
+            if (is_error) return;
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
+
+            if (!my_multi_malloc(key_memory_MYSQL_state_change_info, MYF(0),
+                                 &element, sizeof(LIST), &data,
+                                 sizeof(LEX_STRING), &data_str, len, NullS)) {
               set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
               return;
             }
-            memcpy(data->str, (char *) pos, len);
-            data->length= len;
+
+            data->str = data_str;
+            memcpy(data->str, (char *)pos, len);
+            data->length = len;
             pos += len;
 
-            element->data= data;
+            element->data = data;
             ADD_INFO(info, element, type);
 
-            if (type == SESSION_TRACK_SCHEMA)
-            {
-              if (!(db= (char *) my_malloc(key_memory_MYSQL_state_change_info,
-                                           data->length + 1, MYF(MY_WME))))
-              {
+            if (type == SESSION_TRACK_SCHEMA) {
+              if (!(db = (char *)my_malloc(key_memory_MYSQL_state_change_info,
+                                           data->length + 1, MYF(MY_WME)))) {
                 set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
                 return;
               }
@@ -916,28 +937,20 @@ void read_ok_ex(MYSQL *mysql, ulong length)
                 my_free(mysql->db);
 
               memcpy(db, data->str, data->length);
-              db[data->length]= '\0';
-              mysql->db= db;
+              db[data->length] = '\0';
+              mysql->db = db;
             }
 
             break;
           case SESSION_TRACK_GTIDS:
-            if (!my_multi_malloc(key_memory_MYSQL_state_change_info,
-              MYF(0),
-              &element, sizeof(LIST),
-              &data, sizeof(LEX_STRING),
-              NullS))
-            {
-              set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-              return;
-            }
-
             /* Move past the total length of the changed entity. */
-            (void) net_field_length(&pos);
-
-            /* read (and ignore for now) the GTIDS encoding specification code */
-            (void) net_field_length(&pos);
+            (void)net_field_length_ll_safe(mysql, &pos, length, &is_error);
+            if (is_error) return;
 
+            /* read (and ignore for now) the GTIDS encoding specification code
+             */
+            (void)net_field_length_ll_safe(mysql, &pos, length, &is_error);
+            if (is_error) return;
             /*
                For now we ignore the encoding specification, since only one
                is supported. In the future the decoding of what comes next
@@ -945,83 +958,83 @@ void read_ok_ex(MYSQL *mysql, ulong length)
                */
 
             /* read the length of the encoded string. */
-            len= (size_t) net_field_length(&pos);
-            if(!(data->str= (char *)my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))))
-            {
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
+            if (!my_multi_malloc(key_memory_MYSQL_state_change_info, MYF(0),
+                                 &element, sizeof(LIST), &data,
+                                 sizeof(LEX_STRING), &data_str, len, NullS)) {
               set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
               return;
             }
 
-            memcpy(data->str, (char *) pos, len);
-            data->length= len;
+            data->str = data_str;
+            memcpy(data->str, (char *)pos, len);
+            data->length = len;
             pos += len;
 
-            element->data= data;
+            element->data = data;
             ADD_INFO(info, element, SESSION_TRACK_GTIDS);
             break;
           case SESSION_TRACK_STATE_CHANGE:
-            if (!my_multi_malloc(key_memory_MYSQL_state_change_info,
-              MYF(0),
-              &element, sizeof(LIST),
-              &data, sizeof(LEX_STRING),
-              NullS))
-            {
-              set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-              return;
-            }
-
             /* Get the length of the boolean tracker */
-            len= (size_t) net_field_length(&pos);
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+
             /* length for boolean tracker is always 1 */
-            DBUG_ASSERT(len == 1);
-            if(!(data->str= (char *)my_malloc(PSI_NOT_INSTRUMENTED, len, MYF(MY_WME))))
-            {
+            assert(len == 1);
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
+            if (!my_multi_malloc(key_memory_MYSQL_state_change_info, MYF(0),
+                                 &element, sizeof(LIST), &data,
+                                 sizeof(LEX_STRING), &data_str, len,  NullS)) {
               set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
               return;
             }
-            memcpy(data->str, (char *) pos, len);
-            data->length= len;
+
+            data->str = data_str;
+            memcpy(data->str, (char *)pos, len);
+            data->length = len;
             pos += len;
 
-            element->data= data;
+            element->data = data;
             ADD_INFO(info, element, SESSION_TRACK_STATE_CHANGE);
 
             break;
           default:
-            DBUG_ASSERT(type <= SESSION_TRACK_END);
+            assert(type <= SESSION_TRACK_END);
             /*
               Unknown/unsupported type received, get the total length and move
               past it.
               */
-            len= (size_t) net_field_length(&pos);
+            len = (size_t)net_field_length_ll_safe(mysql, &pos, length,
+                                                   &is_error);
+            if (is_error) return;
+            if (!buffer_check_remaining(mysql, pos, length, len)) return;
             pos += len;
             break;
           }
           total_len -= (pos - saved_pos);
         }
-        if (info)
-        {
-          for (type= SESSION_TRACK_BEGIN; type < SESSION_TRACK_END; type++)
-          {
-            if (info->info_list[type].head_node)
-            {
-              info->info_list[type].current_node=
-                info->info_list[type].head_node=
-                  list_reverse(info->info_list[type].head_node);
+        if (info) {
+          for (type = SESSION_TRACK_BEGIN; type < SESSION_TRACK_END; type++) {
+            if (info->info_list[type].head_node) {
+              info->info_list[type].current_node =
+                  info->info_list[type].head_node =
+                      list_reverse(info->info_list[type].head_node);
             }
           }
         }
       }
     }
-  }
-  else if (pos < mysql->net.read_pos + length && net_field_length(&pos))
-    mysql->info=(char*) pos;
+  } else if (pos < mysql->net.read_pos + length && net_field_length(&pos))
+    mysql->info = (char *)pos;
   else
-    mysql->info=NULL;
+    mysql->info = NULL;
   return;
 }
 
-
 /**
   Read a packet from server. Give error message if socket was down
   or packet is an error message
@@ -1039,59 +1052,54 @@ void read_ok_ex(MYSQL *mysql, ulong length)
             in mysql handle.
 */
 
-ulong
-cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
-                      my_bool *is_data_packet)
-{
-  NET *net= &mysql->net;
-  ulong len=0;
+ulong cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
+                            my_bool *is_data_packet) {
+  NET *net = &mysql->net;
+  ulong len = 0;
 
   MYSQL_TRACE(READ_PACKET, mysql, ());
 
   if (is_data_packet)
-    *is_data_packet= FALSE;
+    *is_data_packet = FALSE;
 
   if (net->vio != 0)
-    len=my_net_read(net);
+    len = my_net_read(net);
 
-  if (len == packet_error || len == 0)
-  {
-    DBUG_PRINT("error",("Wrong connection or packet. fd: %s  len: %lu",
-			vio_description(net->vio),len));
+  if (len == packet_error || len == 0) {
+    DBUG_PRINT("error", ("Wrong connection or packet. fd: %s  len: %lu",
+                         vio_description(net->vio), len));
 #ifdef MYSQL_SERVER
     if (net->vio && (net->last_errno == ER_NET_READ_INTERRUPTED))
       return (packet_error);
 #endif /*MYSQL_SERVER*/
     end_server(mysql);
-    set_mysql_error(mysql, net->last_errno == ER_NET_PACKET_TOO_LARGE ?
-                    CR_NET_PACKET_TOO_LARGE: CR_SERVER_LOST, unknown_sqlstate);
+    set_mysql_error(mysql,
+                    net->last_errno == ER_NET_PACKET_TOO_LARGE
+                        ? CR_NET_PACKET_TOO_LARGE
+                        : CR_SERVER_LOST,
+                    unknown_sqlstate);
     return (packet_error);
   }
 
   MYSQL_TRACE(PACKET_RECEIVED, mysql, (len, net->read_pos));
-  
-  if (net->read_pos[0] == 255)
-  {
+
+  if (net->read_pos[0] == 255) {
     /*
-      After server reprts an error, usually it is ready to accept new commands and
-      we set stage to READY_FOR_COMMAND. This can be modified by the caller of 
-      cli_safe_read().
+      After server reprts an error, usually it is ready to accept new commands
+      and we set stage to READY_FOR_COMMAND. This can be modified by the caller
+      of cli_safe_read().
     */
     MYSQL_TRACE_STAGE(mysql, READY_FOR_COMMAND);
 
-    if (len > 3)
-    {
-      uchar *pos= net->read_pos+1;
-      net->last_errno=uint2korr(pos);
-      pos+=2;
-      len-=2;
-      if (protocol_41(mysql) && pos[0] == '#')
-      {
-	strmake(net->sqlstate, (char*)pos+1, SQLSTATE_LENGTH);
-	pos+= SQLSTATE_LENGTH+1;
-      }
-      else
-      {
+    if (len > 3) {
+      uchar *pos = net->read_pos + 1;
+      net->last_errno = uint2korr(pos);
+      pos += 2;
+      len -= 2;
+      if (protocol_41(mysql) && pos[0] == '#') {
+        strmake(net->sqlstate, (char *)pos + 1, SQLSTATE_LENGTH);
+        pos += SQLSTATE_LENGTH + 1;
+      } else {
         /*
           The SQL state hasn't been received -- it should be reset to HY000
           (unknown error sql state).
@@ -1100,10 +1108,9 @@ cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
         my_stpcpy(net->sqlstate, unknown_sqlstate);
       }
 
-      (void) strmake(net->last_error,(char*) pos,
-		     MY_MIN((uint) len,(uint) sizeof(net->last_error)-1));
-    }
-    else
+      (void)strmake(net->last_error, (char *)pos,
+                    MY_MIN((uint)len, (uint)sizeof(net->last_error) - 1));
+    } else
       set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
     /*
       Cover a protocol design error: error packet does not
@@ -1114,21 +1121,15 @@ cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
       a multi-statement or a stored procedure, so it should be
       safe to unconditionally turn off the flag here.
     */
-    mysql->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
+    mysql->server_status &= ~SERVER_MORE_RESULTS_EXISTS;
 
-    DBUG_PRINT("error",("Got error: %d/%s (%s)",
-                        net->last_errno,
-                        net->sqlstate,
-                        net->last_error));
-    return(packet_error);
-  }
-  else
-  {
+    DBUG_PRINT("error", ("Got error: %d/%s (%s)", net->last_errno,
+                         net->sqlstate, net->last_error));
+    return (packet_error);
+  } else {
     /* if it is OK packet irrespective of new/old server */
-    if (net->read_pos[0] == 0)
-    {
-      if (parse_ok)
-      {
+    if (net->read_pos[0] == 0) {
+      if (parse_ok) {
         read_ok_ex(mysql, len);
         return len;
       }
@@ -1138,21 +1139,20 @@ cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
       0xFE - we detect that case below.
     */
     if (is_data_packet)
-      *is_data_packet= TRUE;
+      *is_data_packet = TRUE;
     /*
        For a packet starting with 0xFE detect if it is OK packet or a
        huge data packet. Note that old servers do not send OK packets
        starting with 0xFE.
     */
     if ((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
-        (net->read_pos[0] == 254))
-    {
+        (net->read_pos[0] == 254)) {
       /* detect huge data packet */
       if (len > MAX_PACKET_LENGTH)
         return len;
       /* otherwise we have OK packet starting with 0xFE */
       if (is_data_packet)
-        *is_data_packet= FALSE;
+        *is_data_packet = FALSE;
       /* parse it if requested */
       if (parse_ok)
         read_ok_ex(mysql, len);
@@ -1160,16 +1160,14 @@ cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
     }
     /* for old client detect EOF packet */
     if (!(mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
-        (net->read_pos[0] == 254) && (len < 8))
-    {
+        (net->read_pos[0] == 254) && (len < 8)) {
       if (is_data_packet)
-        *is_data_packet= FALSE;
+        *is_data_packet = FALSE;
     }
   }
   return len;
 }
 
-
 /**
   Read a packet from server. Give error message if connection was broken or
   ERR packet was received. Detect if the packet received was an OK, ERR or
@@ -1183,48 +1181,40 @@ cli_safe_read_with_ok(MYSQL *mysql, my_bool parse_ok,
   @retval The length of the packet that was read or packet_error in case of
           error. In case of error its description is stored in mysql handle.
 */
-ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet)
-{
+ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet) {
   return cli_safe_read_with_ok(mysql, 0, is_data_packet);
 }
 
-
-void free_rows(MYSQL_DATA *cur)
-{
-  if (cur)
-  {
-    free_root(&cur->alloc,MYF(0));
+void free_rows(MYSQL_DATA *cur) {
+  if (cur) {
+    free_root(&cur->alloc, MYF(0));
     my_free(cur);
   }
 }
 
-my_bool
-cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
-		     const uchar *header, size_t header_length,
-		     const uchar *arg, size_t arg_length, my_bool skip_check,
-                     MYSQL_STMT *stmt)
-{
-  NET *net= &mysql->net;
-  my_bool result= 1;
-  my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE;
+my_bool cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
+                             const uchar *header, size_t header_length,
+                             const uchar *arg, size_t arg_length,
+                             my_bool skip_check, MYSQL_STMT *stmt) {
+  NET *net = &mysql->net;
+  my_bool result = 1;
+  my_bool stmt_skip = stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE;
   DBUG_ENTER("cli_advanced_command");
 
-  if (mysql->net.vio == 0)
-  {						/* Do reconnect if possible */
+  if (mysql->net.vio == 0) { /* Do reconnect if possible */
     if (mysql_reconnect(mysql) || stmt_skip)
       DBUG_RETURN(1);
   }
   if (mysql->status != MYSQL_STATUS_READY ||
-      mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
-  {
-    DBUG_PRINT("error",("state: %d", mysql->status));
+      mysql->server_status & SERVER_MORE_RESULTS_EXISTS) {
+    DBUG_PRINT("error", ("state: %d", mysql->status));
     set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
     DBUG_RETURN(1);
   }
 
   net_clear_error(net);
-  mysql->info=0;
-  mysql->affected_rows= ~(my_ulonglong) 0;
+  mysql->info = 0;
+  mysql->affected_rows = ~(my_ulonglong)0;
   /*
     Do not check the socket/protocol buffer on COM_QUIT as the
     result of a previous command might not have been read. This
@@ -1234,7 +1224,8 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
   net_clear(&mysql->net, (command != COM_QUIT));
 
   MYSQL_TRACE_STAGE(mysql, READY_FOR_COMMAND);
-  MYSQL_TRACE(SEND_COMMAND, mysql, (command, header_length, arg_length, header, arg));
+  MYSQL_TRACE(SEND_COMMAND, mysql,
+              (command, header_length, arg_length, header, arg));
 
 #if !defined(EMBEDDED_LIBRARY)
   /*
@@ -1247,37 +1238,34 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
     server. But this should be rare.
   */
   if ((command != COM_QUIT) && mysql->reconnect && !vio_is_connected(net->vio))
-    net->error= 2;
+    net->error = 2;
 #endif
 
-  if (net_write_command(net,(uchar) command, header, header_length,
-			arg, arg_length))
-  {
-    DBUG_PRINT("error",("Can't send command to server. Error: %d",
-			socket_errno));
-    if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
-    {
+  if (net_write_command(net, (uchar)command, header, header_length, arg,
+                        arg_length)) {
+    DBUG_PRINT("error",
+               ("Can't send command to server. Error: %d", socket_errno));
+    if (net->last_errno == ER_NET_PACKET_TOO_LARGE) {
       set_mysql_error(mysql, CR_NET_PACKET_TOO_LARGE, unknown_sqlstate);
       goto end;
     }
     end_server(mysql);
     if (mysql_reconnect(mysql) || stmt_skip)
       goto end;
-    
-    MYSQL_TRACE(SEND_COMMAND, mysql, (command, header_length, arg_length, header, arg));
-    if (net_write_command(net,(uchar) command, header, header_length,
-			  arg, arg_length))
-    {
+
+    MYSQL_TRACE(SEND_COMMAND, mysql,
+                (command, header_length, arg_length, header, arg));
+    if (net_write_command(net, (uchar)command, header, header_length, arg,
+                          arg_length)) {
       set_mysql_error(mysql, CR_SERVER_GONE_ERROR, unknown_sqlstate);
       goto end;
     }
   }
 
-  MYSQL_TRACE(PACKET_SENT, mysql, (header_length + arg_length)); 
+  MYSQL_TRACE(PACKET_SENT, mysql, (header_length + arg_length));
 
 #if defined(CLIENT_PROTOCOL_TRACING)
-  switch (command)
-  {
+  switch (command) {
   case COM_STMT_PREPARE:
     MYSQL_TRACE_STAGE(mysql, WAIT_FOR_PS_DESCRIPTION);
     break;
@@ -1286,11 +1274,11 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
     MYSQL_TRACE_STAGE(mysql, WAIT_FOR_ROW);
     break;
 
-  /* 
+  /*
     No server reply is expected after these commands so we reamin ready
     for the next command.
  */
-  case COM_STMT_SEND_LONG_DATA: 
+  case COM_STMT_SEND_LONG_DATA:
   case COM_STMT_CLOSE:
   case COM_REGISTER_SLAVE:
   case COM_QUIT:
@@ -1315,7 +1303,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
     break;
 
   /*
-    Server replies to COM_STATISTICS with a single packet 
+    Server replies to COM_STATISTICS with a single packet
     containing a string with statistics information.
   */
   case COM_STATISTICS:
@@ -1326,19 +1314,22 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
     For all other commands we expect server to send regular reply which
     is either OK, ERR or a result-set header.
   */
-  default: MYSQL_TRACE_STAGE(mysql, WAIT_FOR_RESULT); break;
+  default:
+    MYSQL_TRACE_STAGE(mysql, WAIT_FOR_RESULT);
+    break;
   }
 #endif
 
-  result=0;
-  if (!skip_check)
-  {
-    result= ((mysql->packet_length= cli_safe_read_with_ok(mysql, 1, NULL)) ==
-             packet_error ? 1 : 0);
+  result = 0;
+  if (!skip_check) {
+    result = ((mysql->packet_length = cli_safe_read_with_ok(mysql, 1, NULL)) ==
+                      packet_error
+                  ? 1
+                  : 0);
 
 #if defined(CLIENT_PROTOCOL_TRACING)
     /*
-      Return to READY_FOR_COMMAND protocol stage in case server reports error 
+      Return to READY_FOR_COMMAND protocol stage in case server reports error
       or sends OK packet.
     */
     if (result || mysql->net.read_pos[0] == 0x00)
@@ -1347,25 +1338,23 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
   }
 
 end:
-  DBUG_PRINT("exit",("result: %d", result));
+  DBUG_PRINT("exit", ("result: %d", result));
   DBUG_RETURN(result);
 }
 
-void free_old_query(MYSQL *mysql)
-{
+void free_old_query(MYSQL *mysql) {
   DBUG_ENTER("free_old_query");
   if (mysql->fields)
-    free_root(&mysql->field_alloc,MYF(0));
-  init_alloc_root(PSI_NOT_INSTRUMENTED,
-                  &mysql->field_alloc, 8192, 0); /* Assume rowlength < 8192 */
-  mysql->fields= 0;
-  mysql->field_count= 0;			/* For API */
-  mysql->warning_count= 0;
-  mysql->info= 0;
+    free_root(&mysql->field_alloc, MYF(0));
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &mysql->field_alloc, 8192,
+                  0); /* Assume rowlength < 8192 */
+  mysql->fields = 0;
+  mysql->field_count = 0; /* For API */
+  mysql->warning_count = 0;
+  mysql->info = 0;
   DBUG_VOID_RETURN;
 }
 
-
 /**
   Finish reading of a partial result set from the server.
   Get the EOF packet, and update mysql->status
@@ -1375,16 +1364,14 @@ void free_old_query(MYSQL *mysql)
            is set in this case, FALSE otherwise.
 */
 
-my_bool flush_one_result(MYSQL *mysql)
-{
+my_bool flush_one_result(MYSQL *mysql) {
   ulong packet_length;
   my_bool is_data_packet;
 
-  DBUG_ASSERT(mysql->status != MYSQL_STATUS_READY);
+  assert(mysql->status != MYSQL_STATUS_READY);
 
-  do
-  {
-    packet_length= cli_safe_read(mysql, &is_data_packet);
+  do {
+    packet_length = cli_safe_read(mysql, &is_data_packet);
     /*
       There is an error reading from the connection,
       or (sic!) there were no error and no
@@ -1396,24 +1383,20 @@ my_bool flush_one_result(MYSQL *mysql)
     */
     if (packet_length == packet_error)
       return TRUE;
-  }
-  while (mysql->net.read_pos[0] == 0 || is_data_packet);
+  } while (mysql->net.read_pos[0] == 0 || is_data_packet);
 
   /* Analyse final OK packet (EOF packet if it is old client) */
 
-  if (protocol_41(mysql))
-  {
-    uchar *pos= mysql->net.read_pos + 1;
-    if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF &&
-        !is_data_packet)
+  if (protocol_41(mysql)) {
+    uchar *pos = mysql->net.read_pos + 1;
+    if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF && !is_data_packet)
       read_ok_ex(mysql, packet_length);
-    else
-    {
-      mysql->warning_count= uint2korr(pos);
-      pos+=2;
-      mysql->server_status=uint2korr(pos);
+    else {
+      mysql->warning_count = uint2korr(pos);
+      pos += 2;
+      mysql->server_status = uint2korr(pos);
     }
-    pos+=2;
+    pos += 2;
   }
 #if defined(CLIENT_PROTOCOL_TRACING)
   if (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
@@ -1424,32 +1407,29 @@ my_bool flush_one_result(MYSQL *mysql)
   return FALSE;
 }
 
-
 /**
   Read a packet from network. If it's an OK packet, flush it.
 
-  @return  TRUE if error, FALSE otherwise. In case of 
+  @return  TRUE if error, FALSE otherwise. In case of
            success, is_ok_packet is set to TRUE or FALSE,
            based on what we got from network.
 */
 
-my_bool opt_flush_ok_packet(MYSQL *mysql, my_bool *is_ok_packet)
-{
+my_bool opt_flush_ok_packet(MYSQL *mysql, my_bool *is_ok_packet) {
   my_bool is_data_packet;
-  ulong packet_length= cli_safe_read(mysql, &is_data_packet);
+  ulong packet_length = cli_safe_read(mysql, &is_data_packet);
 
   if (packet_length == packet_error)
     return TRUE;
 
   /* cli_safe_read always reads a non-empty packet. */
-  DBUG_ASSERT(packet_length);
+  assert(packet_length);
 
-  *is_ok_packet= ((mysql->net.read_pos[0] == 0) ||
-                  ((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
-                   mysql->net.read_pos[0] == 254 &&
-                   packet_length < MAX_PACKET_LENGTH));
-  if (*is_ok_packet)
-  {
+  *is_ok_packet =
+      ((mysql->net.read_pos[0] == 0) ||
+       ((mysql->server_capabilities & CLIENT_DEPRECATE_EOF) &&
+        mysql->net.read_pos[0] == 254 && packet_length < MAX_PACKET_LENGTH));
+  if (*is_ok_packet) {
     read_ok_ex(mysql, packet_length);
 #if defined(CLIENT_PROTOCOL_TRACING)
     if (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
@@ -1462,30 +1442,26 @@ my_bool opt_flush_ok_packet(MYSQL *mysql, my_bool *is_ok_packet)
   return FALSE;
 }
 
-
 /*
   Flush result set sent from server
 */
 
-static void cli_flush_use_result(MYSQL *mysql, my_bool flush_all_results)
-{
+static void cli_flush_use_result(MYSQL *mysql, my_bool flush_all_results) {
   /* Clear the current execution status */
   DBUG_ENTER("cli_flush_use_result");
-  DBUG_PRINT("warning",("Not all packets read, clearing them"));
+  DBUG_PRINT("warning", ("Not all packets read, clearing them"));
 
   if (flush_one_result(mysql))
-    DBUG_VOID_RETURN;                           /* An error occurred */
+    DBUG_VOID_RETURN; /* An error occurred */
 
-  if (! flush_all_results)
+  if (!flush_all_results)
     DBUG_VOID_RETURN;
 
-  while (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
-  {
+  while (mysql->server_status & SERVER_MORE_RESULTS_EXISTS) {
     my_bool is_ok_packet;
     if (opt_flush_ok_packet(mysql, &is_ok_packet))
-      DBUG_VOID_RETURN;                         /* An error occurred. */
-    if (is_ok_packet)
-    {
+      DBUG_VOID_RETURN; /* An error occurred. */
+    if (is_ok_packet) {
       /*
         Indeed what we got from network was an OK packet, and we
         know that OK is the last one in a multi-result-set, so
@@ -1501,16 +1477,13 @@ static void cli_flush_use_result(MYSQL *mysql, my_bool flush_all_results)
       EOF packet. Read and flush them.
     */
     MYSQL_TRACE_STAGE(mysql, WAIT_FOR_FIELD_DEF);
-    if (!(mysql->server_capabilities & CLIENT_DEPRECATE_EOF))
-    {
+    if (!(mysql->server_capabilities & CLIENT_DEPRECATE_EOF)) {
       if (flush_one_result(mysql))
-        DBUG_VOID_RETURN;                         /* An error occurred. */
-    }
-    else
-    {
-      if ((mysql->fields= cli_read_metadata(mysql,
-                       mysql->net.read_pos[0], protocol_41(mysql) ? 7:5)))
-        free_root(&mysql->field_alloc,MYF(0));
+        DBUG_VOID_RETURN; /* An error occurred. */
+    } else {
+      if ((mysql->fields = cli_read_metadata(mysql, mysql->net.read_pos[0],
+                                             protocol_41(mysql) ? 7 : 5)))
+        free_root(&mysql->field_alloc, MYF(0));
       else
         DBUG_VOID_RETURN;
     }
@@ -1521,16 +1494,13 @@ static void cli_flush_use_result(MYSQL *mysql, my_bool flush_all_results)
   DBUG_VOID_RETURN;
 }
 
-
 #ifdef _WIN32
-static my_bool is_NT(void)
-{
-  char *os=getenv("OS");
+static my_bool is_NT(void) {
+  char *os = getenv("OS");
   return (os && !strcmp(os, "Windows_NT")) ? 1 : 0;
 }
 #endif
 
-
 #ifdef CHECK_LICENSE
 /**
   Check server side variable 'license'.
@@ -1543,35 +1513,31 @@ static my_bool is_NT(void)
                Error code is saved in mysql->net.last_errno.
 */
 
-static int check_license(MYSQL *mysql)
-{
+static int check_license(MYSQL *mysql) {
   MYSQL_ROW row;
   MYSQL_RES *res;
-  NET *net= &mysql->net;
-  static const char query[]= "SELECT @@license";
-  static const char required_license[]= STRINGIFY_ARG(LICENSE);
+  NET *net = &mysql->net;
+  static const char query[] = "SELECT @@license";
+  static const char required_license[] = STRINGIFY_ARG(LICENSE);
 
-  if (mysql_real_query(mysql, query, (ulong)(sizeof(query)-1)))
-  {
-    if (net->last_errno == ER_UNKNOWN_SYSTEM_VARIABLE)
-    {
+  if (mysql_real_query(mysql, query, (ulong)(sizeof(query) - 1))) {
+    if (net->last_errno == ER_UNKNOWN_SYSTEM_VARIABLE) {
       set_mysql_extended_error(mysql, CR_WRONG_LICENSE, unknown_sqlstate,
                                ER(CR_WRONG_LICENSE), required_license);
     }
     return 1;
   }
-  if (!(res= mysql_use_result(mysql)))
+  if (!(res = mysql_use_result(mysql)))
     return 1;
-  row= mysql_fetch_row(res);
-  /* 
+  row = mysql_fetch_row(res);
+  /*
     If no rows in result set, or column value is NULL (none of these
     two is ever true for server variables now), or column value
     mismatch, set wrong license error.
   */
   if (!net->last_errno &&
       (!row || !row[0] ||
-       strncmp(row[0], required_license, sizeof(required_license))))
-  {
+       strncmp(row[0], required_license, sizeof(required_license)))) {
     set_mysql_extended_error(mysql, CR_WRONG_LICENSE, unknown_sqlstate,
                              ER(CR_WRONG_LICENSE), required_license);
   }
@@ -1580,56 +1546,47 @@ static int check_license(MYSQL *mysql)
 }
 #endif /* CHECK_LICENSE */
 
-
 /**************************************************************************
   Shut down connection
 **************************************************************************/
 
-void end_server(MYSQL *mysql)
-{
-  int save_errno= errno;
+void end_server(MYSQL *mysql) {
+  int save_errno = errno;
   DBUG_ENTER("end_server");
-  if (mysql->net.vio != 0)
-  {
-    DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio)));
+  if (mysql->net.vio != 0) {
+    DBUG_PRINT("info", ("Net: %s", vio_description(mysql->net.vio)));
 #ifdef MYSQL_SERVER
     slave_io_thread_detach_vio();
 #endif
     vio_delete(mysql->net.vio);
-    mysql->net.vio= 0;          /* Marker */
+    mysql->net.vio = 0; /* Marker */
     mysql_prune_stmt_list(mysql);
   }
   net_end(&mysql->net);
   free_old_query(mysql);
-  errno= save_errno;
+  errno = save_errno;
   MYSQL_TRACE(DISCONNECTED, mysql, ());
   DBUG_VOID_RETURN;
 }
 
-
-void STDCALL
-mysql_free_result(MYSQL_RES *result)
-{
+void STDCALL mysql_free_result(MYSQL_RES *result) {
   DBUG_ENTER("mysql_free_result");
-  DBUG_PRINT("enter",("mysql_res: 0x%lx", (long) result));
-  if (result)
-  {
-    MYSQL *mysql= result->handle;
-    if (mysql)
-    {
+  DBUG_PRINT("enter", ("mysql_res: 0x%lx", (long)result));
+  if (result) {
+    MYSQL *mysql = result->handle;
+    if (mysql) {
       if (mysql->unbuffered_fetch_owner == &result->unbuffered_fetch_cancelled)
-        mysql->unbuffered_fetch_owner= 0;
-      if (mysql->status == MYSQL_STATUS_USE_RESULT)
-      {
+        mysql->unbuffered_fetch_owner = 0;
+      if (mysql->status == MYSQL_STATUS_USE_RESULT) {
         (*mysql->methods->flush_use_result)(mysql, FALSE);
-        mysql->status=MYSQL_STATUS_READY;
+        mysql->status = MYSQL_STATUS_READY;
         if (mysql->unbuffered_fetch_owner)
-          *mysql->unbuffered_fetch_owner= TRUE;
+          *mysql->unbuffered_fetch_owner = TRUE;
       }
     }
     free_rows(result->data);
     if (result->fields)
-      free_root(&result->field_alloc,MYF(0));
+      free_root(&result->field_alloc, MYF(0));
     my_free(result->row);
     my_free(result);
   }
@@ -1640,58 +1597,108 @@ mysql_free_result(MYSQL_RES *result)
   Get options from my.cnf
 ****************************************************************************/
 
-static const char *default_options[]=
-{
-  "port","socket","compress","password","pipe", "timeout", "user",
-  "init-command", "host", "database", "debug", "return-found-rows",
-  "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath",
-  "character-sets-dir", "default-character-set", "interactive-timeout",
-  "connect-timeout", "local-infile", "disable-local-infile",
-  "ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name",
-  "multi-results", "multi-statements", "multi-queries", "secure-auth",
-  "report-data-truncation", "plugin-dir", "default-auth",
-  "bind-address", "ssl-crl", "ssl-crlpath", "enable-cleartext-plugin", "tls-version",
-  "ssl_mode",
-  NullS
-};
+static const char *default_options[] = {"port",
+                                        "socket",
+                                        "compress",
+                                        "password",
+                                        "pipe",
+                                        "timeout",
+                                        "user",
+                                        "init-command",
+                                        "host",
+                                        "database",
+                                        "debug",
+                                        "return-found-rows",
+                                        "ssl-key",
+                                        "ssl-cert",
+                                        "ssl-ca",
+                                        "ssl-capath",
+                                        "character-sets-dir",
+                                        "default-character-set",
+                                        "interactive-timeout",
+                                        "connect-timeout",
+                                        "local-infile",
+                                        "disable-local-infile",
+                                        "ssl-cipher",
+                                        "max-allowed-packet",
+                                        "protocol",
+                                        "shared-memory-base-name",
+                                        "multi-results",
+                                        "multi-statements",
+                                        "multi-queries",
+                                        "secure-auth",
+                                        "report-data-truncation",
+                                        "plugin-dir",
+                                        "default-auth",
+                                        "bind-address",
+                                        "ssl-crl",
+                                        "ssl-crlpath",
+                                        "enable-cleartext-plugin",
+                                        "tls-version",
+                                        "ssl_mode",
+                                        NullS};
 enum option_id {
-  OPT_port=1, OPT_socket, OPT_compress, OPT_password, OPT_pipe, OPT_timeout, OPT_user, 
-  OPT_init_command, OPT_host, OPT_database, OPT_debug, OPT_return_found_rows, 
-  OPT_ssl_key, OPT_ssl_cert, OPT_ssl_ca, OPT_ssl_capath, 
-  OPT_character_sets_dir, OPT_default_character_set, OPT_interactive_timeout, 
-  OPT_connect_timeout, OPT_local_infile, OPT_disable_local_infile, 
-  OPT_ssl_cipher, OPT_max_allowed_packet, OPT_protocol, OPT_shared_memory_base_name, 
-  OPT_multi_results, OPT_multi_statements, OPT_multi_queries, OPT_secure_auth, 
-  OPT_report_data_truncation, OPT_plugin_dir, OPT_default_auth,
-  OPT_bind_address, OPT_ssl_crl, OPT_ssl_crlpath, OPT_enable_cleartext_plugin,
-  OPT_tls_version, OPT_ssl_mode,
+  OPT_port = 1,
+  OPT_socket,
+  OPT_compress,
+  OPT_password,
+  OPT_pipe,
+  OPT_timeout,
+  OPT_user,
+  OPT_init_command,
+  OPT_host,
+  OPT_database,
+  OPT_debug,
+  OPT_return_found_rows,
+  OPT_ssl_key,
+  OPT_ssl_cert,
+  OPT_ssl_ca,
+  OPT_ssl_capath,
+  OPT_character_sets_dir,
+  OPT_default_character_set,
+  OPT_interactive_timeout,
+  OPT_connect_timeout,
+  OPT_local_infile,
+  OPT_disable_local_infile,
+  OPT_ssl_cipher,
+  OPT_max_allowed_packet,
+  OPT_protocol,
+  OPT_shared_memory_base_name,
+  OPT_multi_results,
+  OPT_multi_statements,
+  OPT_multi_queries,
+  OPT_secure_auth,
+  OPT_report_data_truncation,
+  OPT_plugin_dir,
+  OPT_default_auth,
+  OPT_bind_address,
+  OPT_ssl_crl,
+  OPT_ssl_crlpath,
+  OPT_enable_cleartext_plugin,
+  OPT_tls_version,
+  OPT_ssl_mode,
   OPT_keep_this_one_last
 };
 
-static TYPELIB option_types={array_elements(default_options)-1,
-			     "options",default_options, NULL};
+static TYPELIB option_types = {array_elements(default_options) - 1, "options",
+                               default_options, NULL};
 
-const char *sql_protocol_names_lib[] =
-{ "TCP", "SOCKET", "PIPE", "MEMORY", NullS };
-TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"",
-				sql_protocol_names_lib, NULL};
+const char *sql_protocol_names_lib[] = {"TCP", "SOCKET", "PIPE", "MEMORY",
+                                        NullS};
+TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib) - 1, "",
+                                sql_protocol_names_lib, NULL};
 
-static int add_init_command(struct st_mysql_options *options, const char *cmd)
-{
+static int add_init_command(struct st_mysql_options *options, const char *cmd) {
   char *tmp;
 
-  if (!options->init_commands)
-  {
-    options->init_commands= (DYNAMIC_ARRAY*)my_malloc(key_memory_mysql_options,
-                                                      sizeof(DYNAMIC_ARRAY),
-						      MYF(MY_WME));
-    init_dynamic_array(options->init_commands,sizeof(char*),0,5);
+  if (!options->init_commands) {
+    options->init_commands = (DYNAMIC_ARRAY *)my_malloc(
+        key_memory_mysql_options, sizeof(DYNAMIC_ARRAY), MYF(MY_WME));
+    init_dynamic_array(options->init_commands, sizeof(char *), 0, 5);
   }
 
-  if (!(tmp= my_strdup(key_memory_mysql_options,
-                       cmd,MYF(MY_WME))) ||
-      insert_dynamic(options->init_commands, &tmp))
-  {
+  if (!(tmp = my_strdup(key_memory_mysql_options, cmd, MYF(MY_WME))) ||
+      insert_dynamic(options->init_commands, &tmp)) {
     my_free(tmp);
     return 1;
   }
@@ -1699,305 +1706,300 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
   return 0;
 }
 
-#define ALLOCATE_EXTENSIONS(OPTS)                                \
-      (OPTS)->extension= (struct st_mysql_options_extention *)   \
-        my_malloc(key_memory_mysql_options,                      \
-                  sizeof(struct st_mysql_options_extention),     \
-                  MYF(MY_WME | MY_ZEROFILL))                     \
-
-#define ENSURE_EXTENSIONS_PRESENT(OPTS)                          \
-    do {                                                         \
-      if (!(OPTS)->extension)                                    \
-        ALLOCATE_EXTENSIONS(OPTS);                               \
-    } while (0)
-
-
-#define EXTENSION_SET_STRING(OPTS, X, STR)                       \
-    do {                                                         \
-      if ((OPTS)->extension)                                     \
-        my_free((OPTS)->extension->X);                           \
-      else                                                       \
-        ALLOCATE_EXTENSIONS(OPTS);                               \
-      (OPTS)->extension->X= ((STR) != NULL) ?                    \
-        my_strdup(key_memory_mysql_options,                      \
-                  (STR), MYF(MY_WME)) : NULL;                    \
-    } while (0)
-
-#define SET_OPTION(opt_var,arg) \
-  do { \
-    if (mysql->options.opt_var) \
-      my_free(mysql->options.opt_var); \
-    mysql->options.opt_var = arg ? my_strdup(key_memory_mysql_options, arg, MYF(MY_WME)) : NULL; \
+#define ALLOCATE_EXTENSIONS(OPTS)                                              \
+  (OPTS)->extension = (struct st_mysql_options_extention *)my_malloc(          \
+      key_memory_mysql_options, sizeof(struct st_mysql_options_extention),     \
+      MYF(MY_WME | MY_ZEROFILL))
+
+#define ENSURE_EXTENSIONS_PRESENT(OPTS)                                        \
+  do {                                                                         \
+    if (!(OPTS)->extension)                                                    \
+      ALLOCATE_EXTENSIONS(OPTS);                                               \
   } while (0)
 
+#define EXTENSION_SET_STRING(OPTS, X, STR)                                     \
+  do {                                                                         \
+    if ((OPTS)->extension)                                                     \
+      my_free((OPTS)->extension->X);                                           \
+    else                                                                       \
+      ALLOCATE_EXTENSIONS(OPTS);                                               \
+    (OPTS)->extension->X =                                                     \
+        ((STR) != NULL)                                                        \
+            ? my_strdup(key_memory_mysql_options, (STR), MYF(MY_WME))          \
+            : NULL;                                                            \
+  } while (0)
+
+#define SET_OPTION(opt_var, arg)                                               \
+  do {                                                                         \
+    if (mysql->options.opt_var)                                                \
+      my_free(mysql->options.opt_var);                                         \
+    mysql->options.opt_var =                                                   \
+        arg ? my_strdup(key_memory_mysql_options, arg, MYF(MY_WME)) : NULL;    \
+  } while (0)
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-#define EXTENSION_SET_SSL_STRING(OPTS, X, STR, mode) \
-  do { \
-    EXTENSION_SET_STRING(OPTS, X, STR); \
-    if ((OPTS)->extension->X) \
-      (OPTS)->extension->ssl_mode= mode; \
+#define EXTENSION_SET_SSL_STRING(OPTS, X, STR, mode)                           \
+  do {                                                                         \
+    EXTENSION_SET_STRING(OPTS, X, STR);                                        \
+    if ((OPTS)->extension->X)                                                  \
+      (OPTS)->extension->ssl_mode = mode;                                      \
   } while (0)
 #else
-#define EXTENSION_SET_SSL_STRING(OPTS, X, STR, mode) \
-    do { \
-      ; \
-    } while(0)
+#define EXTENSION_SET_SSL_STRING(OPTS, X, STR, mode)                           \
+  do {                                                                         \
+    ;                                                                          \
+  } while (0)
 #endif
 
-static char *set_ssl_option_unpack_path(const char *arg)
-{
-  char *opt_var= NULL;
-  if (arg)
-  {
-    char *buff= (char *)my_malloc(key_memory_mysql_options, FN_REFLEN + 1,
-                                  MYF(MY_WME));
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+static char *set_ssl_option_unpack_path(const char *arg) {
+  char *opt_var = NULL;
+  if (arg) {
+    char *buff =
+        (char *)my_malloc(key_memory_mysql_options, FN_REFLEN + 1, MYF(MY_WME));
     unpack_filename(buff, (char *)arg);
-    opt_var= my_strdup(key_memory_mysql_options, buff, MYF(MY_WME));
+    opt_var = my_strdup(key_memory_mysql_options, buff, MYF(MY_WME));
     my_free(buff);
   }
   return opt_var;
 }
-
+#endif
 
 void mysql_read_default_options(struct st_mysql_options *options,
-				const char *filename,const char *group)
-{
+                                const char *filename, const char *group) {
   int argc;
-  char *argv_buff[1],**argv;
+  char *argv_buff[1], **argv;
   const char *groups[3];
   DBUG_ENTER("mysql_read_default_options");
-  DBUG_PRINT("enter",("file: %s  group: %s",filename,group ? group :"NULL"));
+  DBUG_PRINT("enter",
+             ("file: %s  group: %s", filename, group ? group : "NULL"));
 
   compile_time_assert(OPT_keep_this_one_last ==
                       array_elements(default_options));
 
-  argc=1; argv=argv_buff; argv_buff[0]= (char*) "client";
-  groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0;
+  argc = 1;
+  argv = argv_buff;
+  argv_buff[0] = (char *)"client";
+  groups[0] = (char *)"client";
+  groups[1] = (char *)group;
+  groups[2] = 0;
 
   my_load_defaults(filename, groups, &argc, &argv, NULL);
-  if (argc != 1)				/* If some default option */
+  if (argc != 1) /* If some default option */
   {
-    char **option=argv;
-    while (*++option)
-    {
-      if (my_getopt_is_args_separator(option[0]))          /* skip arguments separator */
+    char **option = argv;
+    while (*++option) {
+      if (my_getopt_is_args_separator(option[0])) /* skip arguments separator */
         continue;
       /* DBUG_PRINT("info",("option: %s",option[0])); */
-      if (option[0][0] == '-' && option[0][1] == '-')
-      {
-	char *end=strcend(*option,'=');
-	char *opt_arg=0;
-	if (*end)
-	{
-	  opt_arg=end+1;
-	  *end=0;				/* Remove '=' */
-	}
-	/* Change all '_' in variable name to '-' */
-	for (end= *option ; *(end= strcend(end,'_')) ; )
-	  *end= '-';
-	switch (find_type(*option + 2, &option_types, FIND_TYPE_BASIC)) {
-	case OPT_port:
-	  if (opt_arg)
-	    options->port=atoi(opt_arg);
-	  break;
-	case OPT_socket:
-	  if (opt_arg)
-	  {
-	    my_free(options->unix_socket);
-	    options->unix_socket=my_strdup(key_memory_mysql_options,
-                                           opt_arg,MYF(MY_WME));
-	  }
-	  break;
-	case OPT_compress:
-	  options->compress=1;
-	  options->client_flag|= CLIENT_COMPRESS;
-	  break;
+      if (option[0][0] == '-' && option[0][1] == '-') {
+        char *end = strcend(*option, '=');
+        char *opt_arg = 0;
+        if (*end) {
+          opt_arg = end + 1;
+          *end = 0; /* Remove '=' */
+        }
+        /* Change all '_' in variable name to '-' */
+        for (end = *option; *(end = strcend(end, '_'));)
+          *end = '-';
+        switch (find_type(*option + 2, &option_types, FIND_TYPE_BASIC)) {
+        case OPT_port:
+          if (opt_arg)
+            options->port = atoi(opt_arg);
+          break;
+        case OPT_socket:
+          if (opt_arg) {
+            my_free(options->unix_socket);
+            options->unix_socket =
+                my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          }
+          break;
+        case OPT_compress:
+          options->compress = 1;
+          options->client_flag |= CLIENT_COMPRESS;
+          break;
         case OPT_password:
-	  if (opt_arg)
-	  {
-	    my_free(options->password);
-	    options->password=my_strdup(key_memory_mysql_options,
-                                        opt_arg,MYF(MY_WME));
-	  }
-	  break;
+          if (opt_arg) {
+            my_free(options->password);
+            options->password =
+                my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          }
+          break;
         case OPT_pipe:
           options->protocol = MYSQL_PROTOCOL_PIPE;
           break;
-	case OPT_connect_timeout:
-	case OPT_timeout:
-	  if (opt_arg)
-	    options->connect_timeout=atoi(opt_arg);
-	  break;
-	case OPT_user:
-	  if (opt_arg)
-	  {
-	    my_free(options->user);
-	    options->user=my_strdup(key_memory_mysql_options,
-                                    opt_arg,MYF(MY_WME));
-	  }
-	  break;
-	case OPT_init_command:
-	  add_init_command(options,opt_arg);
-	  break;
-	case OPT_host:
-	  if (opt_arg)
-	  {
-	    my_free(options->host);
-	    options->host=my_strdup(key_memory_mysql_options,
-                                    opt_arg,MYF(MY_WME));
-	  }
-	  break;
-	case OPT_database:
-	  if (opt_arg)
-	  {
-	    my_free(options->db);
-	    options->db=my_strdup(key_memory_mysql_options,
-                                  opt_arg,MYF(MY_WME));
-	  }
-	  break;
-	case OPT_debug:
+        case OPT_connect_timeout:
+        case OPT_timeout:
+          if (opt_arg)
+            options->connect_timeout = atoi(opt_arg);
+          break;
+        case OPT_user:
+          if (opt_arg) {
+            my_free(options->user);
+            options->user =
+                my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          }
+          break;
+        case OPT_init_command:
+          add_init_command(options, opt_arg);
+          break;
+        case OPT_host:
+          if (opt_arg) {
+            my_free(options->host);
+            options->host =
+                my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          }
+          break;
+        case OPT_database:
+          if (opt_arg) {
+            my_free(options->db);
+            options->db =
+                my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          }
+          break;
+        case OPT_debug:
 #ifdef MYSQL_CLIENT
-	  mysql_debug(opt_arg ? opt_arg : "d:t:o,/tmp/client.trace");
-	  break;
+          mysql_debug(opt_arg ? opt_arg : "d:t:o,/tmp/client.trace");
+          break;
 #endif
-	case OPT_return_found_rows:
-	  options->client_flag|=CLIENT_FOUND_ROWS;
-	  break;
+        case OPT_return_found_rows:
+          options->client_flag |= CLIENT_FOUND_ROWS;
+          break;
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-	case OPT_ssl_key:
-	  my_free(options->ssl_key);
-          options->ssl_key = my_strdup(key_memory_mysql_options,
-                                       opt_arg, MYF(MY_WME));
+        case OPT_ssl_key:
+          my_free(options->ssl_key);
+          options->ssl_key =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
-	case OPT_ssl_cert:
-	  my_free(options->ssl_cert);
-          options->ssl_cert = my_strdup(key_memory_mysql_options,
-                                        opt_arg, MYF(MY_WME));
+        case OPT_ssl_cert:
+          my_free(options->ssl_cert);
+          options->ssl_cert =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
-	case OPT_ssl_ca:
-	  my_free(options->ssl_ca);
-          options->ssl_ca = my_strdup(key_memory_mysql_options,
-                                      opt_arg, MYF(MY_WME));
+        case OPT_ssl_ca:
+          my_free(options->ssl_ca);
+          options->ssl_ca =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
-	case OPT_ssl_capath:
-	  my_free(options->ssl_capath);
-          options->ssl_capath = my_strdup(key_memory_mysql_options,
-                                          opt_arg, MYF(MY_WME));
+        case OPT_ssl_capath:
+          my_free(options->ssl_capath);
+          options->ssl_capath =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
         case OPT_ssl_cipher:
           my_free(options->ssl_cipher);
-          options->ssl_cipher= my_strdup(key_memory_mysql_options,
-                                         opt_arg, MYF(MY_WME));
+          options->ssl_cipher =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
         case OPT_tls_version:
-          EXTENSION_SET_SSL_STRING(options, tls_version, opt_arg, SSL_MODE_PREFERRED);
+          EXTENSION_SET_SSL_STRING(options, tls_version, opt_arg,
+                                   SSL_MODE_PREFERRED);
           break;
-	case OPT_ssl_crl:
-          EXTENSION_SET_SSL_STRING(options, ssl_crl, opt_arg, SSL_MODE_PREFERRED);
+        case OPT_ssl_crl:
+          EXTENSION_SET_SSL_STRING(options, ssl_crl, opt_arg,
+                                   SSL_MODE_PREFERRED);
           break;
-	case OPT_ssl_crlpath:
-          EXTENSION_SET_SSL_STRING(options, ssl_crlpath, opt_arg, SSL_MODE_PREFERRED);
+        case OPT_ssl_crlpath:
+          EXTENSION_SET_SSL_STRING(options, ssl_crlpath, opt_arg,
+                                   SSL_MODE_PREFERRED);
           break;
 #else
-	case OPT_ssl_key:
-	case OPT_ssl_cert:
-	case OPT_ssl_ca:
-	case OPT_ssl_capath:
+        case OPT_ssl_key:
+        case OPT_ssl_cert:
+        case OPT_ssl_ca:
+        case OPT_ssl_capath:
         case OPT_ssl_cipher:
         case OPT_ssl_crl:
         case OPT_ssl_crlpath:
-        case OPT_tls_version :
-	  break;
+        case OPT_tls_version:
+          break;
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
-	case OPT_character_sets_dir:
-	  my_free(options->charset_dir);
-          options->charset_dir = my_strdup(key_memory_mysql_options,
-                                           opt_arg, MYF(MY_WME));
-	  break;
-	case OPT_default_character_set:
-	  my_free(options->charset_name);
-          options->charset_name = my_strdup(key_memory_mysql_options,
-                                            opt_arg, MYF(MY_WME));
-	  break;
-	case OPT_interactive_timeout:
-	  options->client_flag|= CLIENT_INTERACTIVE;
-	  break;
-	case OPT_local_infile:
-	  if (!opt_arg || atoi(opt_arg) != 0)
-	    options->client_flag|= CLIENT_LOCAL_FILES;
-	  else
-	    options->client_flag&= ~CLIENT_LOCAL_FILES;
-	  break;
-	case OPT_disable_local_infile:
-	  options->client_flag&= ~CLIENT_LOCAL_FILES;
+        case OPT_character_sets_dir:
+          my_free(options->charset_dir);
+          options->charset_dir =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
+          break;
+        case OPT_default_character_set:
+          my_free(options->charset_name);
+          options->charset_name =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
-	case OPT_max_allowed_packet:
+        case OPT_interactive_timeout:
+          options->client_flag |= CLIENT_INTERACTIVE;
+          break;
+        case OPT_local_infile:
+          if (!opt_arg || atoi(opt_arg) != 0)
+            options->client_flag |= CLIENT_LOCAL_FILES;
+          else
+            options->client_flag &= ~CLIENT_LOCAL_FILES;
+          break;
+        case OPT_disable_local_infile:
+          options->client_flag &= ~CLIENT_LOCAL_FILES;
+          break;
+        case OPT_max_allowed_packet:
           if (opt_arg)
-	    options->max_allowed_packet= atoi(opt_arg);
-	  break;
+            options->max_allowed_packet = atoi(opt_arg);
+          break;
         case OPT_protocol:
-          if ((options->protocol= find_type(opt_arg, &sql_protocol_typelib,
-                                            FIND_TYPE_BASIC)) <= 0)
-          {
-            my_message_local(ERROR_LEVEL,
-                             "Unknown option to protocol: %s", opt_arg);
+          if ((options->protocol = find_type(opt_arg, &sql_protocol_typelib,
+                                             FIND_TYPE_BASIC)) <= 0) {
+            my_message_local(ERROR_LEVEL, "Unknown option to protocol: %s",
+                             opt_arg);
             exit(1);
           }
           break;
         case OPT_shared_memory_base_name:
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
           if (options->shared_memory_base_name != def_shared_memory_base_name)
             my_free(options->shared_memory_base_name);
-          options->shared_memory_base_name=my_strdup(key_memory_mysql_options,
-                                                     opt_arg,MYF(MY_WME));
+          options->shared_memory_base_name =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
 #endif
           break;
-	case OPT_multi_results:
-	  options->client_flag|= CLIENT_MULTI_RESULTS;
-	  break;
-	case OPT_multi_statements:
-	case OPT_multi_queries:
-	  options->client_flag|= CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS;
-	  break;
+        case OPT_multi_results:
+          options->client_flag |= CLIENT_MULTI_RESULTS;
+          break;
+        case OPT_multi_statements:
+        case OPT_multi_queries:
+          options->client_flag |=
+              CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS;
+          break;
         case OPT_secure_auth:
           /* this is a no-op */
           break;
         case OPT_report_data_truncation:
-          options->report_data_truncation= opt_arg ? MY_TEST(atoi(opt_arg)) : 1;
+          options->report_data_truncation =
+              opt_arg ? MY_TEST(atoi(opt_arg)) : 1;
           break;
-        case OPT_plugin_dir:
-          {
-            char buff[FN_REFLEN], buff2[FN_REFLEN];
-            if (strlen(opt_arg) >= FN_REFLEN)
-              opt_arg[FN_REFLEN]= '\0';
-            if (my_realpath(buff, opt_arg, 0))
-            {
-              DBUG_PRINT("warning",("failed to normalize the plugin path: %s",
-                                    opt_arg));
-              break;
-            }
-            convert_dirname(buff2, buff, NULL);
-            EXTENSION_SET_STRING(options, plugin_dir, buff2);
+        case OPT_plugin_dir: {
+          char buff[FN_REFLEN], buff2[FN_REFLEN];
+          if (strlen(opt_arg) >= FN_REFLEN)
+            opt_arg[FN_REFLEN] = '\0';
+          if (my_realpath(buff, opt_arg, 0)) {
+            DBUG_PRINT("warning",
+                       ("failed to normalize the plugin path: %s", opt_arg));
+            break;
           }
-          break;
+          convert_dirname(buff2, buff, NULL);
+          EXTENSION_SET_STRING(options, plugin_dir, buff2);
+        } break;
         case OPT_default_auth:
           EXTENSION_SET_STRING(options, default_auth, opt_arg);
           break;
-	case OPT_bind_address:
+        case OPT_bind_address:
           my_free(options->ci.bind_address);
-          options->ci.bind_address= my_strdup(key_memory_mysql_options,
-                                              opt_arg, MYF(MY_WME));
+          options->ci.bind_address =
+              my_strdup(key_memory_mysql_options, opt_arg, MYF(MY_WME));
           break;
         case OPT_enable_cleartext_plugin:
           ENSURE_EXTENSIONS_PRESENT(options);
-          options->extension->enable_cleartext_plugin= 
-            (!opt_arg || atoi(opt_arg) != 0) ? TRUE : FALSE;
+          options->extension->enable_cleartext_plugin =
+              (!opt_arg || atoi(opt_arg) != 0) ? TRUE : FALSE;
           break;
 
-	default:
-	  DBUG_PRINT("warning",("unknown option: %s",option[0]));
-	}
+        default:
+          DBUG_PRINT("warning", ("unknown option: %s", option[0]));
+        }
       }
     }
   }
@@ -2005,7 +2007,6 @@ void mysql_read_default_options(struct st_mysql_options *options,
   DBUG_VOID_RETURN;
 }
 
-
 /**************************************************************************
   Get column lengths of the current row
   If one uses mysql_use_result, res->lengths contains the length information,
@@ -2013,139 +2014,137 @@ void mysql_read_default_options(struct st_mysql_options *options,
 **************************************************************************/
 
 static void cli_fetch_lengths(ulong *to, MYSQL_ROW column,
-			      unsigned int field_count)
-{ 
+                              unsigned int field_count) {
   ulong *prev_length;
-  char *start=0;
+  char *start = 0;
   MYSQL_ROW end;
 
-  prev_length=0;				/* Keep gcc happy */
-  for (end=column + field_count + 1 ; column != end ; column++, to++)
-  {
-    if (!*column)
-    {
-      *to= 0;					/* Null */
+  prev_length = 0; /* Keep gcc happy */
+  for (end = column + field_count + 1; column != end; column++, to++) {
+    if (!*column) {
+      *to = 0; /* Null */
       continue;
     }
-    if (start)					/* Found end of prev string */
-      *prev_length= (ulong) (*column-start-1);
-    start= *column;
-    prev_length= to;
+    if (start) /* Found end of prev string */
+      *prev_length = (ulong)(*column - start - 1);
+    start = *column;
+    prev_length = to;
   }
 }
 
 /**
-  Read field metadata from field descriptor and store it in MYSQL_FIELD structure.
-  String values in MYSQL_FIELD are allocated in a given allocator root.
+  Read field metadata from field descriptor and store it in MYSQL_FIELD
+  structure. String values in MYSQL_FIELD are allocated in a given allocator
+  root.
 
   @param mysql          connection handle
   @param alloc          memory allocator root
   @param default_value  flag telling if default values should be read from
                         descriptor
-  @param server_capabilities  protocol capability flags which determine format of
-                              the descriptor
+  @param server_capabilities  protocol capability flags which determine format
+  of the descriptor
   @param row            field descriptor
   @param field          address of MYSQL_FIELD structure to store metadata in.
 
   @returns 0 on success.
 */
 
-int
-unpack_field(MYSQL *mysql, MEM_ROOT *alloc, my_bool default_value,
-             uint server_capabilities, MYSQL_ROWS *row, MYSQL_FIELD *field)
-{
-  ulong lengths[9];                      /* Max length of each field */
+int unpack_field(MYSQL *mysql, MEM_ROOT *alloc, my_bool default_value,
+                 uint server_capabilities, MYSQL_ROWS *row,
+                 MYSQL_FIELD *field) {
+  ulong lengths[9]; /* Max length of each field */
   DBUG_ENTER("unpack_field");
 
-  if (!field)
-  {
+  if (!field) {
     set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
     DBUG_RETURN(1);
   }
 
   memset(field, 0, sizeof(MYSQL_FIELD));
 
-  if (server_capabilities & CLIENT_PROTOCOL_41)
-  {
+  if (server_capabilities & CLIENT_PROTOCOL_41) {
     uchar *pos;
     /* fields count may be wrong */
     cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7);
-    field->catalog=   strmake_root(alloc,(char*) row->data[0], lengths[0]);
-    field->db=        strmake_root(alloc,(char*) row->data[1], lengths[1]);
-    field->table=     strmake_root(alloc,(char*) row->data[2], lengths[2]);
-    field->org_table= strmake_root(alloc,(char*) row->data[3], lengths[3]);
-    field->name=      strmake_root(alloc,(char*) row->data[4], lengths[4]);
-    field->org_name=  strmake_root(alloc,(char*) row->data[5], lengths[5]);
-
-    field->catalog_length=	lengths[0];
-    field->db_length=		lengths[1];
-    field->table_length=	lengths[2];
-    field->org_table_length=	lengths[3];
-    field->name_length=	lengths[4];
-    field->org_name_length=	lengths[5];
+    field->catalog = strmake_root(alloc, (char *)row->data[0], lengths[0]);
+    field->db = strmake_root(alloc, (char *)row->data[1], lengths[1]);
+    field->table = strmake_root(alloc, (char *)row->data[2], lengths[2]);
+    field->org_table = strmake_root(alloc, (char *)row->data[3], lengths[3]);
+    field->name = strmake_root(alloc, (char *)row->data[4], lengths[4]);
+    field->org_name = strmake_root(alloc, (char *)row->data[5], lengths[5]);
+
+    field->catalog_length = lengths[0];
+    field->db_length = lengths[1];
+    field->table_length = lengths[2];
+    field->org_table_length = lengths[3];
+    field->name_length = lengths[4];
+    field->org_name_length = lengths[5];
 
     /* Unpack fixed length parts */
-    if (lengths[6] != 12)
-    {
+    if (lengths[6] != 12) {
       /* malformed packet. signal an error. */
       set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
       DBUG_RETURN(1);
     }
 
-    pos= (uchar*) row->data[6];
-    field->charsetnr= uint2korr(pos);
-    field->length=	(uint) uint4korr(pos+2);
-    field->type=	(enum enum_field_types) pos[6];
-    field->flags=	uint2korr(pos+7);
-    field->decimals=  (uint) pos[9];
+    pos = (uchar *)row->data[6];
+    field->charsetnr = uint2korr(pos);
+    field->length = (uint)uint4korr(pos + 2);
+    field->type = (enum enum_field_types)pos[6];
+    field->flags = uint2korr(pos + 7);
+    field->decimals = (uint)pos[9];
 
     if (IS_NUM(field->type))
-      field->flags|= NUM_FLAG;
-    if (default_value && row->data[7])
-    {
-      field->def=strmake_root(alloc,(char*) row->data[7], lengths[7]);
-      field->def_length= lengths[7];
-    }
-    else
-      field->def=0;
-    field->max_length= 0;
+      field->flags |= NUM_FLAG;
+    if (default_value && row->data[7]) {
+      field->def = strmake_root(alloc, (char *)row->data[7], lengths[7]);
+      field->def_length = lengths[7];
+    } else
+      field->def = 0;
+    field->max_length = 0;
   }
 #ifndef DELETE_SUPPORT_OF_4_0_PROTOCOL
-  else
-  {
-    cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5);
-    field->org_table= field->table=  strdup_root(alloc,(char*) row->data[0]);
-    field->name=   strdup_root(alloc,(char*) row->data[1]);
-    field->length= (uint) uint3korr((uchar*) row->data[2]);
-    field->type=   (enum enum_field_types) (uchar) row->data[3][0];
-
-    field->catalog=(char*)  "";
-    field->db=     (char*)  "";
-    field->catalog_length= 0;
-    field->db_length= 0;
-    field->org_table_length=	field->table_length=	lengths[0];
-    field->name_length=	lengths[1];
-
-    if (server_capabilities & CLIENT_LONG_FLAG)
-    {
-      field->flags=   uint2korr((uchar*) row->data[4]);
-      field->decimals=(uint) (uchar) row->data[4][2];
+  else {
+    /*
+      If any of the row->data[] below is NULL, it can result in a
+      crash. Error out early as it indicates a malformed packet.
+      For data[0], data[1] and data[5], strmake_root will handle
+      NULL values.
+    */
+    if (!row->data[2] || !row->data[3] || !row->data[4]) {
+      set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+      DBUG_RETURN(1);
     }
-    else
-    {
-      field->flags=   (uint) (uchar) row->data[4][0];
-      field->decimals=(uint) (uchar) row->data[4][1];
+
+    cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5);
+    field->org_table = field->table = strmake_root(alloc, (char *)row->data[0], lengths[0]);
+    field->name = strmake_root(alloc, (char *)row->data[1], lengths[1]);
+
+    field->length = (uint)uint3korr((uchar *)row->data[2]);
+    field->type = (enum enum_field_types)(uchar)row->data[3][0];
+
+    field->catalog = (char *)"";
+    field->db = (char *)"";
+    field->catalog_length = 0;
+    field->db_length = 0;
+    field->org_table_length = field->table_length = lengths[0];
+    field->name_length = lengths[1];
+
+    if (server_capabilities & CLIENT_LONG_FLAG) {
+      field->flags = uint2korr((uchar *)row->data[4]);
+      field->decimals = (uint)(uchar)row->data[4][2];
+    } else {
+      field->flags = (uint)(uchar)row->data[4][0];
+      field->decimals = (uint)(uchar)row->data[4][1];
     }
     if (IS_NUM(field->type))
-      field->flags|= NUM_FLAG;
-    if (default_value && row->data[5])
-    {
-      field->def=strdup_root(alloc,(char*) row->data[5]);
-      field->def_length= lengths[5];
-    }
-    else
-      field->def=0;
-    field->max_length= 0;
+      field->flags |= NUM_FLAG;
+    if (default_value && row->data[5]) {
+      field->def = strmake_root(alloc, (char *)row->data[5], lengths[5]);
+      field->def_length = lengths[5];
+    } else
+      field->def = 0;
+    field->max_length = 0;
   }
 #endif /* DELETE_SUPPORT_OF_4_0_PROTOCOL */
   DBUG_RETURN(0);
@@ -2155,36 +2154,32 @@ unpack_field(MYSQL *mysql, MEM_ROOT *alloc, my_bool default_value,
   Change field rows to field structs
 ***************************************************************************/
 
-MYSQL_FIELD *
-unpack_fields(MYSQL *mysql, MYSQL_ROWS *data,MEM_ROOT *alloc,uint fields,
-	      my_bool default_value, uint server_capabilities)
-{
-  MYSQL_ROWS	*row;
-  MYSQL_FIELD	*field,*result;
+MYSQL_FIELD *unpack_fields(MYSQL *mysql, MYSQL_ROWS *data, MEM_ROOT *alloc,
+                           uint fields, my_bool default_value,
+                           uint server_capabilities) {
+  MYSQL_ROWS *row;
+  MYSQL_FIELD *field, *result;
   DBUG_ENTER("unpack_fields");
 
-  field= result= (MYSQL_FIELD*) alloc_root(alloc,
-			   (uint) sizeof(*field)*fields);
-  if (!result)
-  {
+  field = result =
+      (MYSQL_FIELD *)alloc_root(alloc, (uint)sizeof(*field) * fields);
+  if (!result) {
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  memset(field, 0, sizeof(MYSQL_FIELD)*fields);
-  for (row=data; row ; row = row->next,field++)
-  {
+  memset(field, 0, sizeof(MYSQL_FIELD) * fields);
+  for (row = data; row; row = row->next, field++) {
     /* fields count may be wrong */
-    DBUG_ASSERT((uint) (field - result) < fields);
-    if (unpack_field(mysql, alloc, default_value, server_capabilities,
-                     row, field))
-    {
+    if (field < result || (uint)(field - result) >= fields)
+      DBUG_RETURN(NULL);
+    if (unpack_field(mysql, alloc, default_value, server_capabilities, row,
+                     field)) {
       DBUG_RETURN(NULL);
     }
   }
   DBUG_RETURN(result);
 }
 
-
 /**
   Read metadata resultset from server
   Memory allocated in a given allocator root.
@@ -2198,59 +2193,59 @@ unpack_fields(MYSQL *mysql, MYSQL_ROWS *data,MEM_ROOT *alloc,uint fields,
 
 */
 MYSQL_FIELD *cli_read_metadata_ex(MYSQL *mysql, MEM_ROOT *alloc,
-                                  ulong field_count, unsigned int field)
-{
+                                  ulong field_count, unsigned int field) {
   ulong *len;
-  uint  f;
+  uint f;
   uchar *pos;
   MYSQL_FIELD *fields, *result;
   MYSQL_ROWS data;
   NET *net = &mysql->net;
+  size_t size;
 
   DBUG_ENTER("cli_read_metadata");
 
-  len= (ulong*) alloc_root(alloc, sizeof(ulong)*field);
+  len = (ulong *)alloc_root(alloc, sizeof(ulong) * field);
+  size = sizeof(MYSQL_FIELD) * field_count;
 
-  fields= result= (MYSQL_FIELD*) alloc_root(alloc,
-                          (uint) sizeof(MYSQL_FIELD)*field_count);
-  if (!result)
-  {
+  if (field_count != (size / sizeof(MYSQL_FIELD))) {
+    set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+    DBUG_RETURN(0);
+  }
+
+  fields = result = (MYSQL_FIELD *)alloc_root(alloc, size);
+  if (!result) {
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  memset(fields, 0, sizeof(MYSQL_FIELD)*field_count);
+  memset(fields, 0, sizeof(MYSQL_FIELD) * field_count);
 
-  data.data= (MYSQL_ROW) alloc_root(alloc, sizeof(char *)*(field+1));
-  memset(data.data, 0, sizeof(char *)*(field+1));
+  data.data = (MYSQL_ROW)alloc_root(alloc, sizeof(char *) * (field + 1));
+  memset(data.data, 0, sizeof(char *) * (field + 1));
 
   /*
     In this below loop we read each column info as 1 single row
     and save it in mysql->fields array
   */
-  for (f=0 ; f < field_count ; ++f)
-  {
-    if(read_one_row(mysql, field, data.data, len) == -1)
+  for (f = 0; f < field_count; ++f) {
+    if (read_one_row(mysql, field, data.data, len) == -1)
       DBUG_RETURN(NULL);
-    if(unpack_field(mysql, alloc, 0, mysql->server_capabilities, &data,
-                    fields++))
+    if (unpack_field(mysql, alloc, 0, mysql->server_capabilities, &data,
+                     fields++))
       DBUG_RETURN(NULL);
   }
   /* Read EOF packet in case of old client */
-  if (!(mysql->server_capabilities & CLIENT_DEPRECATE_EOF))
-  {
+  if (!(mysql->server_capabilities & CLIENT_DEPRECATE_EOF)) {
     if (packet_error == cli_safe_read(mysql, NULL))
       DBUG_RETURN(0);
-    pos= net->read_pos;
-    if (*pos == 254)
-    {
-      mysql->warning_count= uint2korr(pos + 1);
-      mysql->server_status= uint2korr(pos + 3);
+    pos = net->read_pos;
+    if (*pos == 254) {
+      mysql->warning_count = uint2korr(pos + 1);
+      mysql->server_status = uint2korr(pos + 3);
     }
   }
   DBUG_RETURN(result);
 }
 
-
 /**
   Read metadata resultset from server
 
@@ -2262,113 +2257,103 @@ MYSQL_FIELD *cli_read_metadata_ex(MYSQL *mysql, MEM_ROOT *alloc,
 
 */
 MYSQL_FIELD *cli_read_metadata(MYSQL *mysql, ulong field_count,
-                               unsigned int field)
-{
+                               unsigned int field) {
   return cli_read_metadata_ex(mysql, &mysql->field_alloc, field_count, field);
 }
 
-
 /* Read all rows (data) from server */
 
-MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-			  unsigned int fields)
-{
-  uint	field;
+MYSQL_DATA *cli_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields,
+                          unsigned int fields) {
+  uint field;
   ulong pkt_len;
   ulong len;
   uchar *cp;
-  char	*to, *end_to;
+  char *to, *end_to;
   MYSQL_DATA *result;
-  MYSQL_ROWS **prev_ptr,*cur;
+  MYSQL_ROWS **prev_ptr, *cur;
   NET *net = &mysql->net;
   my_bool is_data_packet;
   DBUG_ENTER("cli_read_rows");
 
-  if ((pkt_len= cli_safe_read(mysql, &is_data_packet)) == packet_error)
+  if ((pkt_len = cli_safe_read(mysql, &is_data_packet)) == packet_error)
     DBUG_RETURN(0);
-  if (!(result=(MYSQL_DATA*) my_malloc(key_memory_MYSQL_DATA,
-                                       sizeof(MYSQL_DATA),
-				       MYF(MY_WME | MY_ZEROFILL))))
-  {
+  if (pkt_len == 0)
+    DBUG_RETURN(0);
+  if (!(result =
+            (MYSQL_DATA *)my_malloc(key_memory_MYSQL_DATA, sizeof(MYSQL_DATA),
+                                    MYF(MY_WME | MY_ZEROFILL)))) {
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  init_alloc_root(PSI_NOT_INSTRUMENTED,
-                  &result->alloc, 8192, 0); /* Assume rowlength < 8192 */
-  result->alloc.min_malloc=sizeof(MYSQL_ROWS);
-  prev_ptr= &result->data;
-  result->rows=0;
-  result->fields=fields;
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &result->alloc, 8192,
+                  0); /* Assume rowlength < 8192 */
+  result->alloc.min_malloc = sizeof(MYSQL_ROWS);
+  prev_ptr = &result->data;
+  result->rows = 0;
+  result->fields = fields;
 
   /*
     The last EOF packet is either a single 254 character or (in MySQL 4.1)
     254 followed by 1-7 status bytes or an OK packet starting with 0xFE
   */
 
-  while (*(cp=net->read_pos) == 0 || is_data_packet)
-  {
+  while (*(cp = net->read_pos) == 0 || is_data_packet) {
     result->rows++;
-    if (!(cur= (MYSQL_ROWS*) alloc_root(&result->alloc,
-					sizeof(MYSQL_ROWS))) ||
-	!(cur->data= ((MYSQL_ROW)
-		      alloc_root(&result->alloc,
-				 (fields+1)*sizeof(char *)+pkt_len))))
-    {
+    if (!(cur = (MYSQL_ROWS *)alloc_root(&result->alloc, sizeof(MYSQL_ROWS))) ||
+        !(cur->data = ((MYSQL_ROW)alloc_root(
+              &result->alloc, (fields + 1) * sizeof(char *) + pkt_len)))) {
       free_rows(result);
       set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
       DBUG_RETURN(0);
     }
-    *prev_ptr=cur;
-    prev_ptr= &cur->next;
-    to= (char*) (cur->data+fields+1);
-    end_to=to+pkt_len-1;
-    for (field=0 ; field < fields ; field++)
-    {
-      if ((len=(ulong) net_field_length(&cp)) == NULL_LENGTH)
-      {						/* null field */
-	cur->data[field] = 0;
-      }
-      else
-      {
-	cur->data[field] = to;
-        if (len > (ulong) (end_to - to))
-        {
+    *prev_ptr = cur;
+    prev_ptr = &cur->next;
+    to = (char *)(cur->data + fields + 1);
+    end_to = to + pkt_len - 1;
+    for (field = 0; field < fields; field++) {
+      if ((len = (ulong)net_field_length(&cp)) ==
+          NULL_LENGTH) { /* null field */
+        cur->data[field] = 0;
+      } else {
+        cur->data[field] = to;
+        DBUG_EXECUTE_IF("simulate_invalid_packet_data", {
+          to = end_to + 1;
+          len = ULONG_MAX - 1;
+        });
+        if (to > end_to || len > (ulong)(end_to - to)) {
           free_rows(result);
           set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
           DBUG_RETURN(0);
         }
-	memcpy(to,(char*) cp,len); to[len]=0;
-	to+=len+1;
-	cp+=len;
-	if (mysql_fields)
-	{
-	  if (mysql_fields[field].max_length < len)
-	    mysql_fields[field].max_length=len;
-	}
+        memcpy(to, (char *)cp, len);
+        to[len] = 0;
+        to += len + 1;
+        cp += len;
+        if (mysql_fields) {
+          if (mysql_fields[field].max_length < len)
+            mysql_fields[field].max_length = len;
+        }
       }
     }
-    cur->data[field]=to;			/* End of last field */
-    if ((pkt_len= cli_safe_read(mysql, &is_data_packet)) == packet_error)
-    {
+    cur->data[field] = to; /* End of last field */
+    if ((pkt_len = cli_safe_read(mysql, &is_data_packet)) == packet_error) {
       free_rows(result);
       DBUG_RETURN(0);
     }
   }
-  *prev_ptr=0;					/* last pointer is null */
+  *prev_ptr = 0; /* last pointer is null */
   /* read EOF packet or OK packet if it is new client */
-  if (pkt_len > 1)
-  {
-    if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF &&
-        !is_data_packet)
+  if (pkt_len > 1) {
+    if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF && !is_data_packet)
       read_ok_ex(mysql, pkt_len);
-    else
-    {
-      mysql->warning_count= uint2korr(cp + 1);
-      mysql->server_status= uint2korr(cp + 3);
+    else {
+      mysql->warning_count = uint2korr(cp + 1);
+      mysql->server_status = uint2korr(cp + 3);
     }
 
-    DBUG_PRINT("info",("status: %u  warning_count:  %u",
-                       mysql->server_status, mysql->warning_count));
+    DBUG_PRINT("info", ("status: %u  warning_count:  %u", mysql->server_status,
+                        mysql->warning_count));
   }
 
 #if defined(CLIENT_PROTOCOL_TRACING)
@@ -2377,7 +2362,7 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
   else
     MYSQL_TRACE_STAGE(mysql, READY_FOR_COMMAND);
 #endif
-  DBUG_PRINT("exit", ("Got %lu rows", (ulong) result->rows));
+  DBUG_PRINT("exit", ("Got %lu rows", (ulong)result->rows));
   DBUG_RETURN(result);
 }
 
@@ -2386,28 +2371,24 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
   When next packet is read, the previous field values are destroyed
 */
 
-
-static int
-read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths)
-{
+static int read_one_row(MYSQL *mysql, uint fields, MYSQL_ROW row,
+                        ulong *lengths) {
   uint field;
-  ulong pkt_len,len;
+  ulong pkt_len, len;
   my_bool is_data_packet;
   uchar *pos, *prev_pos, *end_pos;
-  NET *net= &mysql->net;
+  NET *net = &mysql->net;
 
-  if ((pkt_len= cli_safe_read(mysql, &is_data_packet)) == packet_error)
+  if ((pkt_len = cli_safe_read(mysql, &is_data_packet)) == packet_error)
     return -1;
-  if (net->read_pos[0] != 0x00 && !is_data_packet)
-  {
-    if (pkt_len > 1)				/* MySQL 4.1 protocol */
+  if (net->read_pos[0] != 0x00 && !is_data_packet) {
+    if (pkt_len > 1) /* MySQL 4.1 protocol */
     {
       if (mysql->server_capabilities & CLIENT_DEPRECATE_EOF)
         read_ok_ex(mysql, pkt_len);
-      else
-      {
-        mysql->warning_count= uint2korr(net->read_pos + 1);
-        mysql->server_status= uint2korr(net->read_pos+3);
+      else {
+        mysql->warning_count = uint2korr(net->read_pos + 1);
+        mysql->server_status = uint2korr(net->read_pos + 3);
       }
     }
 #if defined(CLIENT_PROTOCOL_TRACING)
@@ -2416,62 +2397,67 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths)
     else
       MYSQL_TRACE_STAGE(mysql, READY_FOR_COMMAND);
 #endif
-    return 1;				/* End of data */
+    return 1; /* End of data */
   }
-  prev_pos= 0;				/* allowed to write at packet[-1] */
-  pos=net->read_pos;
-  end_pos=pos+pkt_len;
-  for (field=0 ; field < fields ; field++)
-  {
-    if ((len=(ulong) net_field_length(&pos)) == NULL_LENGTH)
-    {						/* null field */
-      row[field] = 0;
-      *lengths++=0;
+  prev_pos = 0; /* allowed to write at packet[-1] */
+  pos = net->read_pos;
+  end_pos = pos + pkt_len;
+  for (field = 0; field < fields; field++) {
+    if (pos >= end_pos) {
+      set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
+      return -1;
     }
-    else
-    {
-      if (len > (ulong) (end_pos - pos))
-      {
-        set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
-        return -1;
-      }
-      row[field] = (char*) pos;
-      pos+=len;
-      *lengths++=len;
+    len = (ulong)net_field_length_checked(&pos, (ulong)(end_pos - pos));
+    DBUG_EXECUTE_IF("simulate_bad_field_length_1", {
+      len = 1000000L;
+    });
+    DBUG_EXECUTE_IF("simulate_bad_field_length_2", {
+      len = pkt_len - 1;
+    });
+    if (pos > end_pos) {
+      set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
+      return -1;
     }
+
+    if (len == NULL_LENGTH) { /* null field */
+      row[field] = 0;
+      *lengths++ = 0;
+    } else {
+      row[field] = (char *)pos;
+      pos += len;
+      *lengths++ = len;
+    }
+    /*
+     It's safe to write to prev_pos here because we already check
+     for a valid pos in the beginning of this loop.
+    */
     if (prev_pos)
-      *prev_pos=0;				/* Terminate prev field */
-    prev_pos=pos;
+      *prev_pos = 0; /* Terminate prev field */
+    prev_pos = pos;
   }
-  row[field]=(char*) prev_pos+1;		/* End of last field */
-  *prev_pos=0;					/* Terminate last field */
+  row[field] = (char *)prev_pos + 1; /* End of last field */
+  if (prev_pos < end_pos)
+    *prev_pos = 0;                     /* Terminate last field */
   return 0;
 }
 
-
 /****************************************************************************
   Init MySQL structure or allocate one
 ****************************************************************************/
 
-
-MYSQL * STDCALL
-mysql_init(MYSQL *mysql)
-{
+MYSQL *STDCALL mysql_init(MYSQL *mysql) {
   if (mysql_server_init(0, NULL, NULL))
     return 0;
-  if (!mysql)
-  {
-    if (!(mysql=(MYSQL*) my_malloc(key_memory_MYSQL,
-                                   sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL))))
-    {
+  if (!mysql) {
+    if (!(mysql = (MYSQL *)my_malloc(key_memory_MYSQL, sizeof(*mysql),
+                                     MYF(MY_WME | MY_ZEROFILL)))) {
       set_mysql_error(NULL, CR_OUT_OF_MEMORY, unknown_sqlstate);
       return 0;
     }
-    mysql->free_me=1;
-  }
-  else
+    mysql->free_me = 1;
+  } else
     memset(mysql, 0, sizeof(*(mysql)));
-  mysql->charset=default_client_charset_info;
+  mysql->charset = default_client_charset_info;
   my_stpcpy(mysql->net.sqlstate, not_error_sqlstate);
 
   /*
@@ -2480,19 +2466,18 @@ mysql_init(MYSQL *mysql)
   */
 
 #if defined(ENABLED_LOCAL_INFILE) && !defined(MYSQL_SERVER)
-  mysql->options.client_flag|= CLIENT_LOCAL_FILES;
+  mysql->options.client_flag |= CLIENT_LOCAL_FILES;
 #endif
 
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
-  mysql->options.shared_memory_base_name= (char*) def_shared_memory_base_name;
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+  mysql->options.shared_memory_base_name = (char *)def_shared_memory_base_name;
 #endif
 
-  mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-  mysql->options.report_data_truncation= TRUE;  /* default */
+  mysql->options.methods_to_use = MYSQL_OPT_GUESS_CONNECTION;
+  mysql->options.report_data_truncation = TRUE; /* default */
 
   /* Initialize extensions. */
-  if (!(mysql->extension= mysql_extension_init(mysql)))
-  {
+  if (!(mysql->extension = mysql_extension_init(mysql))) {
     set_mysql_error(NULL, CR_OUT_OF_MEMORY, unknown_sqlstate);
     return 0;
   }
@@ -2512,33 +2497,30 @@ mysql_init(MYSQL *mysql)
     - existing apps which explicitely asked for no reconnection
     (mysql.reconnect=0) will not see a behaviour change.
   */
-  mysql->reconnect= 0;
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) && !defined(MYSQL_SERVER)
+  mysql->reconnect = 0;
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) &&                     \
+    !defined(MYSQL_SERVER)
   ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-  mysql->options.extension->ssl_mode= SSL_MODE_PREFERRED;
+  mysql->options.extension->ssl_mode = SSL_MODE_PREFERRED;
 #endif
 
   return mysql;
 }
 
-
 /*
   MYSQL::extension handling (see sql_common.h for declaration
-  of st_mysql_extension structure). 
+  of st_mysql_extension structure).
 */
 
-MYSQL_EXTENSION* mysql_extension_init(MYSQL *mysql MY_ATTRIBUTE((unused)))
-{
+MYSQL_EXTENSION *mysql_extension_init(MYSQL *mysql MY_ATTRIBUTE((unused))) {
   MYSQL_EXTENSION *ext;
 
-  ext= my_malloc(PSI_NOT_INSTRUMENTED,
-                 sizeof(MYSQL_EXTENSION), MYF(MY_WME | MY_ZEROFILL));
+  ext = my_malloc(PSI_NOT_INSTRUMENTED, sizeof(MYSQL_EXTENSION),
+                  MYF(MY_WME | MY_ZEROFILL));
   return ext;
 }
 
-
-void mysql_extension_free(struct st_mysql_extension* ext)
-{
+void mysql_extension_free(struct st_mysql_extension *ext) {
   if (!ext)
     return;
   if (ext->trace_data)
@@ -2550,46 +2532,40 @@ void mysql_extension_free(struct st_mysql_extension* ext)
   my_free(ext);
 }
 
-
 /*
   Fill in SSL part of MYSQL structure and set 'use_ssl' flag.
   NB! Errors are not reported until you do mysql_real_connect.
 */
 
-my_bool STDCALL
-mysql_ssl_set(MYSQL *mysql MY_ATTRIBUTE((unused)) ,
-	      const char *key MY_ATTRIBUTE((unused)),
-	      const char *cert MY_ATTRIBUTE((unused)),
-	      const char *ca MY_ATTRIBUTE((unused)),
-	      const char *capath MY_ATTRIBUTE((unused)),
-	      const char *cipher MY_ATTRIBUTE((unused)))
-{
-  my_bool result= 0;
+my_bool STDCALL mysql_ssl_set(MYSQL *mysql MY_ATTRIBUTE((unused)),
+                              const char *key MY_ATTRIBUTE((unused)),
+                              const char *cert MY_ATTRIBUTE((unused)),
+                              const char *ca MY_ATTRIBUTE((unused)),
+                              const char *capath MY_ATTRIBUTE((unused)),
+                              const char *cipher MY_ATTRIBUTE((unused))) {
+  my_bool result = 0;
   DBUG_ENTER("mysql_ssl_set");
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-  result=
-    mysql_options(mysql, MYSQL_OPT_SSL_KEY,    key)    +
-    mysql_options(mysql, MYSQL_OPT_SSL_CERT,   cert)   +
-    mysql_options(mysql, MYSQL_OPT_SSL_CA,     ca)     +
-    mysql_options(mysql, MYSQL_OPT_SSL_CAPATH, capath) +
-    mysql_options(mysql, MYSQL_OPT_SSL_CIPHER, cipher)
-    ? 1 : 0;
+  result = mysql_options(mysql, MYSQL_OPT_SSL_KEY, key) +
+                   mysql_options(mysql, MYSQL_OPT_SSL_CERT, cert) +
+                   mysql_options(mysql, MYSQL_OPT_SSL_CA, ca) +
+                   mysql_options(mysql, MYSQL_OPT_SSL_CAPATH, capath) +
+                   mysql_options(mysql, MYSQL_OPT_SSL_CIPHER, cipher)
+               ? 1
+               : 0;
 #endif
-    DBUG_RETURN(result);
+  DBUG_RETURN(result);
 }
 
-
-/*
-  Free strings in the SSL structure and clear 'use_ssl' flag.
-  NB! Errors are not reported until you do mysql_real_connect.
-*/
+  /*
+    Free strings in the SSL structure and clear 'use_ssl' flag.
+    NB! Errors are not reported until you do mysql_real_connect.
+  */
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
 
-static void
-mysql_ssl_free(MYSQL *mysql MY_ATTRIBUTE((unused)))
-{
-  struct st_VioSSLFd *ssl_fd= (struct st_VioSSLFd*) mysql->connector_fd;
+static void mysql_ssl_free(MYSQL *mysql MY_ATTRIBUTE((unused))) {
+  struct st_VioSSLFd *ssl_fd = (struct st_VioSSLFd *)mysql->connector_fd;
   DBUG_ENTER("mysql_ssl_free");
 
   my_free(mysql->options.ssl_key);
@@ -2597,8 +2573,7 @@ mysql_ssl_free(MYSQL *mysql MY_ATTRIBUTE((unused)))
   my_free(mysql->options.ssl_ca);
   my_free(mysql->options.ssl_capath);
   my_free(mysql->options.ssl_cipher);
-  if (mysql->options.extension)
-  {
+  if (mysql->options.extension) {
     my_free(mysql->options.extension->tls_version);
     my_free(mysql->options.extension->ssl_crl);
     my_free(mysql->options.extension->ssl_crlpath);
@@ -2610,14 +2585,13 @@ mysql_ssl_free(MYSQL *mysql MY_ATTRIBUTE((unused)))
   mysql->options.ssl_cert = 0;
   mysql->options.ssl_ca = 0;
   mysql->options.ssl_capath = 0;
-  mysql->options.ssl_cipher= 0;
-  if (mysql->options.extension)
-  {
+  mysql->options.ssl_cipher = 0;
+  if (mysql->options.extension) {
     mysql->options.extension->ssl_crl = 0;
     mysql->options.extension->ssl_crlpath = 0;
-    mysql->options.extension->ssl_ctx_flags= 0;
-    mysql->options.extension->tls_version= 0;
-    mysql->options.extension->ssl_mode= SSL_MODE_DISABLED;
+    mysql->options.extension->ssl_ctx_flags = 0;
+    mysql->options.extension->tls_version = 0;
+    mysql->options.extension->ssl_mode = SSL_MODE_DISABLED;
   }
   mysql->connector_fd = 0;
   DBUG_VOID_RETURN;
@@ -2635,140 +2609,148 @@ mysql_ssl_free(MYSQL *mysql MY_ATTRIBUTE((unused)))
 
 */
 
-const char * STDCALL
-mysql_get_ssl_cipher(MYSQL *mysql MY_ATTRIBUTE((unused)))
-{
+const char *STDCALL mysql_get_ssl_cipher(MYSQL *mysql MY_ATTRIBUTE((unused))) {
   DBUG_ENTER("mysql_get_ssl_cipher");
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   if (mysql->net.vio && mysql->net.vio->ssl_arg)
-    DBUG_RETURN(SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg));
+    DBUG_RETURN(SSL_get_cipher_name((SSL *)mysql->net.vio->ssl_arg));
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
   DBUG_RETURN(NULL);
 }
 
+  /*
+    Check the server's (subject) Common Name against the
+    hostname we connected to
 
-/*
-  Check the server's (subject) Common Name against the
-  hostname we connected to
-
-  SYNOPSIS
-  ssl_verify_server_cert()
-    vio              pointer to a SSL connected vio
-    server_hostname  name of the server that we connected to
-    errptr           if we fail, we'll return (a pointer to a string
-                     describing) the reason here
+    SYNOPSIS
+    ssl_verify_server_cert()
+      vio              pointer to a SSL connected vio
+      server_hostname  name of the server that we connected to
+      errptr           if we fail, we'll return (a pointer to a string
+                       describing) the reason here
 
-  RETURN VALUES
-   0 Success
-   1 Failed to validate server
+    RETURN VALUES
+     0 Success
+     1 Failed to validate server
 
- */
+   */
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
 
-static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const char **errptr)
-{
+static int ssl_verify_server_cert(Vio *vio, const char *server_hostname,
+                                  const char **errptr) {
   SSL *ssl;
-  X509 *server_cert= NULL;
-  char *cn= NULL;
-  int cn_loc= -1;
-  ASN1_STRING *cn_asn1= NULL;
-  X509_NAME_ENTRY *cn_entry= NULL;
-  X509_NAME *subject= NULL;
-  int ret_validation= 1;
+  X509 *server_cert = NULL;
+  int ret_validation = 1;
+
+#if !(OPENSSL_VERSION_NUMBER >= 0x10002000L)
+  char *cn = NULL;
+  int cn_loc = -1;
+  ASN1_STRING *cn_asn1 = NULL;
+  X509_NAME_ENTRY *cn_entry = NULL;
+  X509_NAME *subject = NULL;
+#endif
 
   DBUG_ENTER("ssl_verify_server_cert");
   DBUG_PRINT("enter", ("server_hostname: %s", server_hostname));
 
-  if (!(ssl= (SSL*)vio->ssl_arg))
-  {
-    *errptr= "No SSL pointer found";
+  if (!(ssl = (SSL *)vio->ssl_arg)) {
+    *errptr = "No SSL pointer found";
     goto error;
   }
 
-  if (!server_hostname)
-  {
-    *errptr= "No server hostname supplied";
+  if (!server_hostname) {
+    *errptr = "No server hostname supplied";
     goto error;
   }
 
-  if (!(server_cert= SSL_get_peer_certificate(ssl)))
-  {
-    *errptr= "Could not get server certificate";
+  if (!(server_cert = SSL_get_peer_certificate(ssl))) {
+    *errptr = "Could not get server certificate";
     goto error;
   }
 
-  if (X509_V_OK != SSL_get_verify_result(ssl))
-  {
-    *errptr= "Failed to verify the server certificate";
+  if (X509_V_OK != SSL_get_verify_result(ssl)) {
+    *errptr = "Failed to verify the server certificate";
     goto error;
   }
-  /*
-    We already know that the certificate exchanged was valid; the SSL library
-    handled that. Now we need to verify that the contents of the certificate
-    are what we expect.
-  */
+    /*
+      We already know that the certificate exchanged was valid; the SSL library
+      handled that. Now we need to verify that the contents of the certificate
+      are what we expect.
+    */
 
+    /*
+       Use OpenSSL certificate matching functions instead of our own if we
+       have OpenSSL. The X509_check_* functions return 1 on success.
+    */
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L || defined(HAVE_WOLFSSL)
+  if ((X509_check_host(server_cert, server_hostname, strlen(server_hostname), 0,
+                       0) != 1) &&
+      (X509_check_ip_asc(server_cert, server_hostname, 0) != 1)) {
+    *errptr = "Failed to verify the server certificate via X509 certificate "
+              "matching functions";
+    goto error;
+
+  } else {
+    /* Success */
+    ret_validation = 0;
+  }
+#else /* OPENSSL_VERSION_NUMBER < 0x10002000L */
   /*
-   Some notes for future development
-   We should check host name in alternative name first and then if needed check in common name.
-   Currently yssl doesn't support alternative name.
-   openssl 1.0.2 support X509_check_host method for host name validation, we may need to start using
-   X509_check_host in the future.
+     OpenSSL prior to 1.0.2 do not support X509_check_host() function.
+     Use deprecated X509_get_subject_name() instead.
   */
 
-  subject= X509_get_subject_name((X509 *) server_cert);
+  subject = X509_get_subject_name((X509 *)server_cert);
   // Find the CN location in the subject
-  cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
-  if (cn_loc < 0)
-  {
-    *errptr= "Failed to get CN location in the certificate subject";
+  cn_loc = X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
+  if (cn_loc < 0) {
+    *errptr = "Failed to get CN location in the certificate subject";
     goto error;
   }
 
   // Get the CN entry for given location
-  cn_entry= X509_NAME_get_entry(subject, cn_loc);
-  if (cn_entry == NULL)
-  {
-    *errptr= "Failed to get CN entry using CN location";
+  cn_entry = X509_NAME_get_entry(subject, cn_loc);
+  if (cn_entry == NULL) {
+    *errptr = "Failed to get CN entry using CN location";
     goto error;
   }
 
   // Get CN from common name entry
   cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
-  if (cn_asn1 == NULL)
-  {
-    *errptr= "Failed to get CN from CN entry";
+  if (cn_asn1 == NULL) {
+    *errptr = "Failed to get CN from CN entry";
     goto error;
   }
 
-  cn= (char *) ASN1_STRING_data(cn_asn1);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  cn = (char *)ASN1_STRING_data(cn_asn1);
+#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  cn = (char *)ASN1_STRING_get0_data(cn_asn1);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
   // There should not be any NULL embedded in the CN
-  if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
-  {
-    *errptr= "NULL embedded in the certificate CN";
+  if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
+    *errptr = "NULL embedded in the certificate CN";
     goto error;
   }
 
   DBUG_PRINT("info", ("Server hostname in cert: %s", cn));
-  if (!strcmp(cn, server_hostname))
-  {
+  if (!strcmp(cn, server_hostname)) {
     /* Success */
-    ret_validation= 0;
+    ret_validation = 0;
   }
-
-  *errptr= "SSL certificate validation failure";
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
+  *errptr = "SSL certificate validation failure";
 
 error:
   if (server_cert != NULL)
-    X509_free (server_cert);
+    X509_free(server_cert);
   DBUG_RETURN(ret_validation);
 }
 
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
 
-
 /*
   Note that the mysql argument must be initialized with mysql_init()
   before calling mysql_real_connect !
@@ -2777,38 +2759,34 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
 static my_bool cli_read_query_result(MYSQL *mysql);
 static MYSQL_RES *cli_use_result(MYSQL *mysql);
 
-int cli_read_change_user_result(MYSQL *mysql)
-{
+int cli_read_change_user_result(MYSQL *mysql) {
   return cli_safe_read(mysql, NULL);
 }
 
-static MYSQL_METHODS client_methods=
-{
-  cli_read_query_result,                       /* read_query_result */
-  cli_advanced_command,                        /* advanced_command */
-  cli_read_rows,                               /* read_rows */
-  cli_use_result,                              /* use_result */
-  cli_fetch_lengths,                           /* fetch_lengths */
-  cli_flush_use_result,                        /* flush_use_result */
-  cli_read_change_user_result                  /* read_change_user_result */
+static MYSQL_METHODS client_methods = {
+    cli_read_query_result,      /* read_query_result */
+    cli_advanced_command,       /* advanced_command */
+    cli_read_rows,              /* read_rows */
+    cli_use_result,             /* use_result */
+    cli_fetch_lengths,          /* fetch_lengths */
+    cli_flush_use_result,       /* flush_use_result */
+    cli_read_change_user_result /* read_change_user_result */
 #ifndef MYSQL_SERVER
-  ,cli_list_fields,                            /* list_fields */
-  cli_read_prepare_result,                     /* read_prepare_result */
-  cli_stmt_execute,                            /* stmt_execute */
-  cli_read_binary_rows,                        /* read_binary_rows */
-  cli_unbuffered_fetch,                        /* unbuffered_fetch */
-  NULL,                                        /* free_embedded_thd */
-  cli_read_statistics,                         /* read_statistics */
-  cli_read_query_result,                       /* next_result */
-  cli_read_binary_rows,                        /* read_rows_from_cursor */
-  free_rows
+    ,
+    cli_list_fields,         /* list_fields */
+    cli_read_prepare_result, /* read_prepare_result */
+    cli_stmt_execute,        /* stmt_execute */
+    cli_read_binary_rows,    /* read_binary_rows */
+    cli_unbuffered_fetch,    /* unbuffered_fetch */
+    NULL,                    /* free_embedded_thd */
+    cli_read_statistics,     /* read_statistics */
+    cli_read_query_result,   /* next_result */
+    cli_read_binary_rows,    /* read_rows_from_cursor */
+    free_rows
 #endif
 };
 
-
-
-typedef enum my_cs_match_type_enum
-{
+typedef enum my_cs_match_type_enum {
   /* MySQL and OS charsets are fully compatible */
   my_cs_exact,
   /* MySQL charset is very close to OS charset  */
@@ -2819,165 +2797,155 @@ typedef enum my_cs_match_type_enum
   my_cs_unsupp
 } my_cs_match_type;
 
-
-typedef struct str2str_st
-{
+typedef struct str2str_st {
   const char *os_name;
   const char *my_name;
   my_cs_match_type param;
 } MY_CSET_OS_NAME;
 
-const MY_CSET_OS_NAME charsets[]=
-{
+const MY_CSET_OS_NAME charsets[] = {
 #ifdef _WIN32
-  {"cp437",          "cp850",    my_cs_approx},
-  {"cp850",          "cp850",    my_cs_exact},
-  {"cp852",          "cp852",    my_cs_exact},
-  {"cp858",          "cp850",    my_cs_approx},
-  {"cp866",          "cp866",    my_cs_exact},
-  {"cp874",          "tis620",   my_cs_approx},
-  {"cp932",          "cp932",    my_cs_exact},
-  {"cp936",          "gbk",      my_cs_approx},
-  {"cp949",          "euckr",    my_cs_approx},
-  {"cp950",          "big5",     my_cs_exact},
-  {"cp1200",         "utf16le",  my_cs_unsupp},
-  {"cp1201",         "utf16",    my_cs_unsupp},
-  {"cp1250",         "cp1250",   my_cs_exact},
-  {"cp1251",         "cp1251",   my_cs_exact},
-  {"cp1252",         "latin1",   my_cs_exact},
-  {"cp1253",         "greek",    my_cs_exact},
-  {"cp1254",         "latin5",   my_cs_exact},
-  {"cp1255",         "hebrew",   my_cs_approx},
-  {"cp1256",         "cp1256",   my_cs_exact},
-  {"cp1257",         "cp1257",   my_cs_exact},
-  {"cp10000",        "macroman", my_cs_exact},
-  {"cp10001",        "sjis",     my_cs_approx},
-  {"cp10002",        "big5",     my_cs_approx},
-  {"cp10008",        "gb2312",   my_cs_approx},
-  {"cp10021",        "tis620",   my_cs_approx},
-  {"cp10029",        "macce",    my_cs_exact},
-  {"cp12001",        "utf32",    my_cs_unsupp},
-  {"cp20107",        "swe7",     my_cs_exact},
-  {"cp20127",        "latin1",   my_cs_approx},
-  {"cp20866",        "koi8r",    my_cs_exact},
-  {"cp20932",        "ujis",     my_cs_exact},
-  {"cp20936",        "gb2312",   my_cs_approx},
-  {"cp20949",        "euckr",    my_cs_approx},
-  {"cp21866",        "koi8u",    my_cs_exact},
-  {"cp28591",        "latin1",   my_cs_approx},
-  {"cp28592",        "latin2",   my_cs_exact},
-  {"cp28597",        "greek",    my_cs_exact},
-  {"cp28598",        "hebrew",   my_cs_exact},
-  {"cp28599",        "latin5",   my_cs_exact},
-  {"cp28603",        "latin7",   my_cs_exact},
+    {"cp437", "cp850", my_cs_approx},
+    {"cp850", "cp850", my_cs_exact},
+    {"cp852", "cp852", my_cs_exact},
+    {"cp858", "cp850", my_cs_approx},
+    {"cp866", "cp866", my_cs_exact},
+    {"cp874", "tis620", my_cs_approx},
+    {"cp932", "cp932", my_cs_exact},
+    {"cp936", "gbk", my_cs_approx},
+    {"cp949", "euckr", my_cs_approx},
+    {"cp950", "big5", my_cs_exact},
+    {"cp1200", "utf16le", my_cs_unsupp},
+    {"cp1201", "utf16", my_cs_unsupp},
+    {"cp1250", "cp1250", my_cs_exact},
+    {"cp1251", "cp1251", my_cs_exact},
+    {"cp1252", "latin1", my_cs_exact},
+    {"cp1253", "greek", my_cs_exact},
+    {"cp1254", "latin5", my_cs_exact},
+    {"cp1255", "hebrew", my_cs_approx},
+    {"cp1256", "cp1256", my_cs_exact},
+    {"cp1257", "cp1257", my_cs_exact},
+    {"cp10000", "macroman", my_cs_exact},
+    {"cp10001", "sjis", my_cs_approx},
+    {"cp10002", "big5", my_cs_approx},
+    {"cp10008", "gb2312", my_cs_approx},
+    {"cp10021", "tis620", my_cs_approx},
+    {"cp10029", "macce", my_cs_exact},
+    {"cp12001", "utf32", my_cs_unsupp},
+    {"cp20107", "swe7", my_cs_exact},
+    {"cp20127", "latin1", my_cs_approx},
+    {"cp20866", "koi8r", my_cs_exact},
+    {"cp20932", "ujis", my_cs_exact},
+    {"cp20936", "gb2312", my_cs_approx},
+    {"cp20949", "euckr", my_cs_approx},
+    {"cp21866", "koi8u", my_cs_exact},
+    {"cp28591", "latin1", my_cs_approx},
+    {"cp28592", "latin2", my_cs_exact},
+    {"cp28597", "greek", my_cs_exact},
+    {"cp28598", "hebrew", my_cs_exact},
+    {"cp28599", "latin5", my_cs_exact},
+    {"cp28603", "latin7", my_cs_exact},
 #ifdef UNCOMMENT_THIS_WHEN_WL_4579_IS_DONE
-  {"cp28605",        "latin9",   my_cs_exact},
+    {"cp28605", "latin9", my_cs_exact},
 #endif
-  {"cp38598",        "hebrew",   my_cs_exact},
-  {"cp51932",        "ujis",     my_cs_exact},
-  {"cp51936",        "gb2312",   my_cs_exact},
-  {"cp51949",        "euckr",    my_cs_exact},
-  {"cp51950",        "big5",     my_cs_exact},
-  {"cp54936",        "gb18030",  my_cs_exact},
-  {"cp65001",        "utf8",     my_cs_exact},
+    {"cp38598", "hebrew", my_cs_exact},
+    {"cp51932", "ujis", my_cs_exact},
+    {"cp51936", "gb2312", my_cs_exact},
+    {"cp51949", "euckr", my_cs_exact},
+    {"cp51950", "big5", my_cs_exact},
+    {"cp54936", "gb18030", my_cs_exact},
+    {"cp65001", "utf8", my_cs_exact},
 
 #else /* not Windows */
 
-  {"646",            "latin1",   my_cs_approx}, /* Default on Solaris */
-  {"ANSI_X3.4-1968", "latin1",   my_cs_approx},
-  {"ansi1251",       "cp1251",   my_cs_exact},
-  {"armscii8",       "armscii8", my_cs_exact},
-  {"armscii-8",      "armscii8", my_cs_exact},
-  {"ASCII",          "latin1",   my_cs_approx},
-  {"Big5",           "big5",     my_cs_exact},
-  {"cp1251",         "cp1251",   my_cs_exact},
-  {"cp1255",         "hebrew",   my_cs_approx},
-  {"CP866",          "cp866",    my_cs_exact},
-  {"eucCN",          "gb2312",   my_cs_exact},
-  {"euc-CN",         "gb2312",   my_cs_exact},
-  {"eucJP",          "ujis",     my_cs_exact},
-  {"euc-JP",         "ujis",     my_cs_exact},
-  {"eucKR",          "euckr",    my_cs_exact},
-  {"euc-KR",         "euckr",    my_cs_exact},
-  {"gb18030",        "gb18030",  my_cs_exact},
-  {"gb2312",         "gb2312",   my_cs_exact},
-  {"gbk",            "gbk",      my_cs_exact},
-  {"georgianps",     "geostd8",  my_cs_exact},
-  {"georgian-ps",    "geostd8",  my_cs_exact},
-  {"IBM-1252",       "cp1252",   my_cs_exact},
-
-  {"iso88591",       "latin1",   my_cs_approx},
-  {"ISO_8859-1",     "latin1",   my_cs_approx},
-  {"ISO8859-1",      "latin1",   my_cs_approx},
-  {"ISO-8859-1",     "latin1",   my_cs_approx},
-
-  {"iso885913",      "latin7",   my_cs_exact},
-  {"ISO_8859-13",    "latin7",   my_cs_exact},
-  {"ISO8859-13",     "latin7",   my_cs_exact},
-  {"ISO-8859-13",    "latin7",   my_cs_exact},
+    {"646", "latin1", my_cs_approx}, /* Default on Solaris */
+    {"ANSI_X3.4-1968", "latin1", my_cs_approx},
+    {"ansi1251", "cp1251", my_cs_exact},
+    {"armscii8", "armscii8", my_cs_exact},
+    {"armscii-8", "armscii8", my_cs_exact},
+    {"ASCII", "latin1", my_cs_approx},
+    {"Big5", "big5", my_cs_exact},
+    {"cp1251", "cp1251", my_cs_exact},
+    {"cp1255", "hebrew", my_cs_approx},
+    {"CP866", "cp866", my_cs_exact},
+    {"eucCN", "gb2312", my_cs_exact},
+    {"euc-CN", "gb2312", my_cs_exact},
+    {"eucJP", "ujis", my_cs_exact},
+    {"euc-JP", "ujis", my_cs_exact},
+    {"eucKR", "euckr", my_cs_exact},
+    {"euc-KR", "euckr", my_cs_exact},
+    {"gb18030", "gb18030", my_cs_exact},
+    {"gb2312", "gb2312", my_cs_exact},
+    {"gbk", "gbk", my_cs_exact},
+    {"georgianps", "geostd8", my_cs_exact},
+    {"georgian-ps", "geostd8", my_cs_exact},
+    {"IBM-1252", "cp1252", my_cs_exact},
+
+    {"iso88591", "latin1", my_cs_approx},
+    {"ISO_8859-1", "latin1", my_cs_approx},
+    {"ISO8859-1", "latin1", my_cs_approx},
+    {"ISO-8859-1", "latin1", my_cs_approx},
+
+    {"iso885913", "latin7", my_cs_exact},
+    {"ISO_8859-13", "latin7", my_cs_exact},
+    {"ISO8859-13", "latin7", my_cs_exact},
+    {"ISO-8859-13", "latin7", my_cs_exact},
 
 #ifdef UNCOMMENT_THIS_WHEN_WL_4579_IS_DONE
-  {"iso885915",      "latin9",   my_cs_exact},
-  {"ISO_8859-15",    "latin9",   my_cs_exact},
-  {"ISO8859-15",     "latin9",   my_cs_exact},
-  {"ISO-8859-15",    "latin9",   my_cs_exact},
+    {"iso885915", "latin9", my_cs_exact},
+    {"ISO_8859-15", "latin9", my_cs_exact},
+    {"ISO8859-15", "latin9", my_cs_exact},
+    {"ISO-8859-15", "latin9", my_cs_exact},
 #endif
 
-  {"iso88592",       "latin2",   my_cs_exact},
-  {"ISO_8859-2",     "latin2",   my_cs_exact},
-  {"ISO8859-2",      "latin2",   my_cs_exact},
-  {"ISO-8859-2",     "latin2",   my_cs_exact},
+    {"iso88592", "latin2", my_cs_exact},
+    {"ISO_8859-2", "latin2", my_cs_exact},
+    {"ISO8859-2", "latin2", my_cs_exact},
+    {"ISO-8859-2", "latin2", my_cs_exact},
 
-  {"iso88597",       "greek",    my_cs_exact},
-  {"ISO_8859-7",     "greek",    my_cs_exact},
-  {"ISO8859-7",      "greek",    my_cs_exact},
-  {"ISO-8859-7",     "greek",    my_cs_exact},
+    {"iso88597", "greek", my_cs_exact},
+    {"ISO_8859-7", "greek", my_cs_exact},
+    {"ISO8859-7", "greek", my_cs_exact},
+    {"ISO-8859-7", "greek", my_cs_exact},
 
-  {"iso88598",       "hebrew",   my_cs_exact},
-  {"ISO_8859-8",     "hebrew",   my_cs_exact},
-  {"ISO8859-8",      "hebrew",   my_cs_exact},
-  {"ISO-8859-8",     "hebrew",   my_cs_exact},
+    {"iso88598", "hebrew", my_cs_exact},
+    {"ISO_8859-8", "hebrew", my_cs_exact},
+    {"ISO8859-8", "hebrew", my_cs_exact},
+    {"ISO-8859-8", "hebrew", my_cs_exact},
 
-  {"iso88599",       "latin5",   my_cs_exact},
-  {"ISO_8859-9",     "latin5",   my_cs_exact},
-  {"ISO8859-9",      "latin5",   my_cs_exact},
-  {"ISO-8859-9",     "latin5",   my_cs_exact},
+    {"iso88599", "latin5", my_cs_exact},
+    {"ISO_8859-9", "latin5", my_cs_exact},
+    {"ISO8859-9", "latin5", my_cs_exact},
+    {"ISO-8859-9", "latin5", my_cs_exact},
 
-  {"koi8r",          "koi8r",    my_cs_exact},
-  {"KOI8-R",         "koi8r",    my_cs_exact},
-  {"koi8u",          "koi8u",    my_cs_exact},
-  {"KOI8-U",         "koi8u",    my_cs_exact},
+    {"koi8r", "koi8r", my_cs_exact},
+    {"KOI8-R", "koi8r", my_cs_exact},
+    {"koi8u", "koi8u", my_cs_exact},
+    {"KOI8-U", "koi8u", my_cs_exact},
 
-  {"roman8",         "hp8",      my_cs_exact}, /* Default on HP UX */
+    {"roman8", "hp8", my_cs_exact}, /* Default on HP UX */
 
-  {"Shift_JIS",      "sjis",     my_cs_exact},
-  {"SJIS",           "sjis",     my_cs_exact},
-  {"shiftjisx0213",  "sjis",     my_cs_exact},
-  
-  {"tis620",         "tis620",   my_cs_exact},
-  {"tis-620",        "tis620",   my_cs_exact},
+    {"Shift_JIS", "sjis", my_cs_exact},
+    {"SJIS", "sjis", my_cs_exact},
+    {"shiftjisx0213", "sjis", my_cs_exact},
 
-  {"ujis",           "ujis",     my_cs_exact},
+    {"tis620", "tis620", my_cs_exact},
+    {"tis-620", "tis620", my_cs_exact},
 
-  {"US-ASCII",       "latin1",   my_cs_approx},
+    {"ujis", "ujis", my_cs_exact},
 
-  {"utf8",           "utf8",     my_cs_exact},
-  {"utf-8",          "utf8",     my_cs_exact},
-#endif
-  {NULL,             NULL,       0}
-};
+    {"US-ASCII", "latin1", my_cs_approx},
 
+    {"utf8", "utf8", my_cs_exact},
+    {"utf-8", "utf8", my_cs_exact},
+#endif
+    {NULL, NULL, 0}};
 
-static const char *
-my_os_charset_to_mysql_charset(const char *csname)
-{
+static const char *my_os_charset_to_mysql_charset(const char *csname) {
   const MY_CSET_OS_NAME *csp;
-  for (csp= charsets; csp->os_name; csp++)
-  {
-    if (!my_strcasecmp(&my_charset_latin1, csp->os_name, csname))
-    {
-      switch (csp->param)
-      {
+  for (csp = charsets; csp->os_name; csp++) {
+    if (!my_strcasecmp(&my_charset_latin1, csp->os_name, csname)) {
+      switch (csp->param) {
       case my_cs_exact:
         return csp->my_name;
 
@@ -2992,25 +2960,23 @@ my_os_charset_to_mysql_charset(const char *csname)
         my_printf_error(ER_UNKNOWN_ERROR,
                         "OS character set '%s'"
                         " is not supported by MySQL client",
-                         MYF(0), csp->my_name);
+                        MYF(0), csp->my_name);
         goto def;
       }
     }
   }
 
-  my_printf_error(ER_UNKNOWN_ERROR,
-                  "Unknown OS character set '%s'.",
-                  MYF(0), csname);
+  my_printf_error(ER_UNKNOWN_ERROR, "Unknown OS character set '%s'.", MYF(0),
+                  csname);
 
 def:
-  csname= MYSQL_DEFAULT_CHARSET_NAME;
+  csname = MYSQL_DEFAULT_CHARSET_NAME;
   my_printf_error(ER_UNKNOWN_ERROR,
-                  "Switching to the default character set '%s'.",
-                  MYF(0), csname);
+                  "Switching to the default character set '%s'.", MYF(0),
+                  csname);
   return csname;
 }
 
-
 #ifndef _WIN32
 #include <stdlib.h> /* for getenv() */
 #ifdef HAVE_LANGINFO_H
@@ -3019,54 +2985,44 @@ my_os_charset_to_mysql_charset(const char *csname)
 #include <locale.h>
 #endif /* _WIN32 */
 
-
-static int
-mysql_autodetect_character_set(MYSQL *mysql)
-{
-  const char *csname= MYSQL_DEFAULT_CHARSET_NAME;
+static int mysql_autodetect_character_set(MYSQL *mysql) {
+  const char *csname = MYSQL_DEFAULT_CHARSET_NAME;
 
 #ifdef _WIN32
   char cpbuf[64];
   {
-    my_snprintf(cpbuf, sizeof(cpbuf), "cp%d", (int) GetConsoleCP());
-    csname= my_os_charset_to_mysql_charset(cpbuf);
+    my_snprintf(cpbuf, sizeof(cpbuf), "cp%d", (int)GetConsoleCP());
+    csname = my_os_charset_to_mysql_charset(cpbuf);
   }
 #elif defined(HAVE_NL_LANGINFO)
   {
-    if (setlocale(LC_CTYPE, "") && (csname= nl_langinfo(CODESET)))
-      csname= my_os_charset_to_mysql_charset(csname);
+    if (setlocale(LC_CTYPE, "") && (csname = nl_langinfo(CODESET)))
+      csname = my_os_charset_to_mysql_charset(csname);
   }
 #endif
 
   if (mysql->options.charset_name)
     my_free(mysql->options.charset_name);
-  if (!(mysql->options.charset_name= my_strdup(key_memory_mysql_options,
-                                               csname, MYF(MY_WME))))
+  if (!(mysql->options.charset_name =
+            my_strdup(key_memory_mysql_options, csname, MYF(MY_WME))))
     return 1;
   return 0;
 }
 
-
-static void
-mysql_set_character_set_with_default_collation(MYSQL *mysql)
-{
-  const char *save= charsets_dir;
+static void mysql_set_character_set_with_default_collation(MYSQL *mysql) {
+  const char *save = charsets_dir;
   if (mysql->options.charset_dir)
-    charsets_dir=mysql->options.charset_dir;
+    charsets_dir = mysql->options.charset_dir;
 
-  if ((mysql->charset= get_charset_by_csname(mysql->options.charset_name,
-                                             MY_CS_PRIMARY, MYF(MY_WME))))
-  {
+  if ((mysql->charset = get_charset_by_csname(mysql->options.charset_name,
+                                              MY_CS_PRIMARY, MYF(MY_WME)))) {
     /* Try to set compiled default collation when it's possible. */
     CHARSET_INFO *collation;
-    if ((collation= 
-         get_charset_by_name(MYSQL_DEFAULT_COLLATION_NAME, MYF(MY_WME))) &&
-                             my_charset_same(mysql->charset, collation))
-    {
-      mysql->charset= collation;
-    }
-    else
-    {
+    if ((collation =
+             get_charset_by_name(MYSQL_DEFAULT_COLLATION_NAME, MYF(MY_WME))) &&
+        my_charset_same(mysql->charset, collation)) {
+      mysql->charset = collation;
+    } else {
       /*
         Default compiled collation not found, or is not applicable
         to the requested character set.
@@ -3074,43 +3030,36 @@ mysql_set_character_set_with_default_collation(MYSQL *mysql)
       */
     }
   }
-  charsets_dir= save;
+  charsets_dir = save;
 }
 
-
 C_MODE_START
-int mysql_init_character_set(MYSQL *mysql)
-{
+int mysql_init_character_set(MYSQL *mysql) {
   /* Set character set */
-  if (!mysql->options.charset_name)
-  {
-    if (!(mysql->options.charset_name= 
-       my_strdup(key_memory_mysql_options,
-                 MYSQL_DEFAULT_CHARSET_NAME,MYF(MY_WME))))
+  if (!mysql->options.charset_name) {
+    if (!(mysql->options.charset_name =
+              my_strdup(key_memory_mysql_options, MYSQL_DEFAULT_CHARSET_NAME,
+                        MYF(MY_WME))))
       return 1;
-  }
-  else if (!strcmp(mysql->options.charset_name,
-                   MYSQL_AUTODETECT_CHARSET_NAME) &&
-            mysql_autodetect_character_set(mysql))
+  } else if (!strcmp(mysql->options.charset_name,
+                     MYSQL_AUTODETECT_CHARSET_NAME) &&
+             mysql_autodetect_character_set(mysql))
     return 1;
 
   mysql_set_character_set_with_default_collation(mysql);
 
-  if (!mysql->charset)
-  {
+  if (!mysql->charset) {
     if (mysql->options.charset_dir)
       set_mysql_extended_error(mysql, CR_CANT_READ_CHARSET, unknown_sqlstate,
                                ER(CR_CANT_READ_CHARSET),
                                mysql->options.charset_name,
                                mysql->options.charset_dir);
-    else
-    {
+    else {
       char cs_dir_name[FN_REFLEN];
       get_charsets_dir(cs_dir_name);
       set_mysql_extended_error(mysql, CR_CANT_READ_CHARSET, unknown_sqlstate,
                                ER(CR_CANT_READ_CHARSET),
-                               mysql->options.charset_name,
-                               cs_dir_name);
+                               mysql->options.charset_name, cs_dir_name);
     }
     return 1;
   }
@@ -3121,58 +3070,67 @@ C_MODE_END
 /*********** client side authentication support **************************/
 
 typedef struct st_mysql_client_plugin_AUTHENTICATION auth_plugin_t;
-static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, int);
+static int client_mpvio_write_packet(struct st_plugin_vio *, const uchar *,
+                                     int);
 static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
 static int clear_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
 
-static auth_plugin_t native_password_client_plugin=
-{
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
-  native_password_plugin_name,
-  "R.J.Silk, Sergei Golubchik",
-  "Native MySQL authentication",
-  {1, 0, 0},
-  "GPL",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  native_password_auth_client
-};
-
-static auth_plugin_t clear_password_client_plugin=
-{
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
-  "mysql_clear_password",
-  "Georgi Kodinov",
-  "Clear password authentication plugin",
-  {0,1,0},
-  "GPL",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  clear_password_auth_client
-};
+static auth_plugin_t native_password_client_plugin = {
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+    native_password_plugin_name,
+    "R.J.Silk, Sergei Golubchik",
+    "Native MySQL authentication",
+    {1, 0, 0},
+    "GPL",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    native_password_auth_client};
+
+static auth_plugin_t clear_password_client_plugin = {
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+    "mysql_clear_password",
+    "Georgi Kodinov",
+    "Clear password authentication plugin",
+    {0, 1, 0},
+    "GPL",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    clear_password_auth_client};
 
 #if defined(HAVE_OPENSSL)
-static auth_plugin_t sha256_password_client_plugin=
-{
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
-  MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
-  "sha256_password",
-  "Oracle Inc",
-  "SHA256 based authentication with salt",
-  {1, 0, 0},
-  "GPL",
-  NULL,
-  sha256_password_init,
-  sha256_password_deinit,
-  NULL,
-  sha256_password_auth_client
-};
+static auth_plugin_t sha256_password_client_plugin = {
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+    "sha256_password",
+    "Oracle Inc",
+    "SHA256 based authentication with salt",
+    {1, 0, 0},
+    "GPL",
+    NULL,
+    sha256_password_init,
+    sha256_password_deinit,
+    NULL,
+    sha256_password_auth_client};
+
+static auth_plugin_t caching_sha2_password_client_plugin = {
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN,
+    MYSQL_CLIENT_AUTHENTICATION_PLUGIN_INTERFACE_VERSION,
+    caching_sha2_password_plugin_name,
+    "Oracle Inc",
+    "SHA2 based authentication with salt",
+    {1, 0, 0},
+    "GPL",
+    NULL,
+    caching_sha2_password_init,
+    caching_sha2_password_deinit,
+    NULL,
+    caching_sha2_password_auth_client};
 #endif
 #ifdef AUTHENTICATION_WIN
 extern auth_plugin_t win_auth_client_plugin;
@@ -3180,94 +3138,81 @@ extern auth_plugin_t win_auth_client_plugin;
 
 /*
   Test trace plugin can be used only in debug builds. In non-debug ones
-  it is ignored, even if it was enabled by build options (TEST_TRACE_PLUGIN macro).
+  it is ignored, even if it was enabled by build options (TEST_TRACE_PLUGIN
+  macro).
 */
 
-#if defined(CLIENT_PROTOCOL_TRACING) \
-    && defined(TEST_TRACE_PLUGIN) \
-    && !defined(DBUG_OFF)
+#if defined(CLIENT_PROTOCOL_TRACING) && defined(TEST_TRACE_PLUGIN) &&          \
+    !defined(NDEBUG)
 extern auth_plugin_t test_trace_plugin;
 #endif
 
-struct st_mysql_client_plugin *mysql_client_builtins[]=
-{
-  (struct st_mysql_client_plugin *)&native_password_client_plugin,
-  (struct st_mysql_client_plugin *)&clear_password_client_plugin,
+struct st_mysql_client_plugin *mysql_client_builtins[] = {
+    (struct st_mysql_client_plugin *)&native_password_client_plugin,
+    (struct st_mysql_client_plugin *)&clear_password_client_plugin,
 #if defined(HAVE_OPENSSL)
-  (struct st_mysql_client_plugin *) &sha256_password_client_plugin,
+    (struct st_mysql_client_plugin *)&sha256_password_client_plugin,
+    (struct st_mysql_client_plugin *)&caching_sha2_password_client_plugin,
 #endif
 #ifdef AUTHENTICATION_WIN
-  (struct st_mysql_client_plugin *)&win_auth_client_plugin,
+    (struct st_mysql_client_plugin *)&win_auth_client_plugin,
 #endif
-#if defined(CLIENT_PROTOCOL_TRACING) \
-    && defined(TEST_TRACE_PLUGIN) \
-    && !defined(DBUG_OFF)
-  (struct st_mysql_client_plugin *)&test_trace_plugin,
+#if defined(CLIENT_PROTOCOL_TRACING) && defined(TEST_TRACE_PLUGIN) &&          \
+    !defined(NDEBUG)
+    (struct st_mysql_client_plugin *)&test_trace_plugin,
 #endif
-  0
-};
+    0};
 
-
-static uchar *
-write_length_encoded_string3(uchar *buf, char *string, size_t length)
-{
-  buf= net_store_length(buf, length);
+static uchar *write_length_encoded_string3(uchar *buf, char *string,
+                                           size_t length) {
+  buf = net_store_length(buf, length);
   memcpy(buf, string, length);
-  buf+= length;
+  buf += length;
   return buf;
 }
 
-
-uchar *
-send_client_connect_attrs(MYSQL *mysql, uchar *buf)
-{
+uchar *send_client_connect_attrs(MYSQL *mysql, uchar *buf) {
   /* check if the server supports connection attributes */
-  if (mysql->server_capabilities & CLIENT_CONNECT_ATTRS)
-  {
+  if (mysql->server_capabilities & CLIENT_CONNECT_ATTRS) {
 
     /* Always store the length if the client supports it */
-    buf= net_store_length(buf,
-                          mysql->options.extension ?
-                          mysql->options.extension->connection_attributes_length :
-                          0);
+    buf = net_store_length(
+        buf, mysql->options.extension
+                 ? mysql->options.extension->connection_attributes_length
+                 : 0);
 
     /* check if we have connection attributes */
     if (mysql->options.extension &&
-        my_hash_inited(&mysql->options.extension->connection_attributes))
-    {
-      HASH *attrs= &mysql->options.extension->connection_attributes;
+        my_hash_inited(&mysql->options.extension->connection_attributes)) {
+      HASH *attrs = &mysql->options.extension->connection_attributes;
       ulong idx;
 
       /* loop over and dump the connection attributes */
-      for (idx= 0; idx < attrs->records; idx++)
-      {
-        LEX_STRING *attr= (LEX_STRING *) my_hash_element(attrs, idx);
-        LEX_STRING *key= attr, *value= attr + 1;
+      for (idx = 0; idx < attrs->records; idx++) {
+        LEX_STRING *attr = (LEX_STRING *)my_hash_element(attrs, idx);
+        LEX_STRING *key = attr, *value = attr + 1;
 
         /* we can't have zero length keys */
-        DBUG_ASSERT(key->length);
+        assert(key->length);
 
-        buf= write_length_encoded_string3(buf, key->str, key->length);
-        buf= write_length_encoded_string3(buf, value->str, value->length);
+        buf = write_length_encoded_string3(buf, key->str, key->length);
+        buf = write_length_encoded_string3(buf, value->str, value->length);
       }
     }
   }
   return buf;
 }
 
-
-static size_t get_length_store_length(size_t length)
-{
-  /* as defined in net_store_length */
-  #define MAX_VARIABLE_STRING_LENGTH 9
+static size_t get_length_store_length(size_t length) {
+/* as defined in net_store_length */
+#define MAX_VARIABLE_STRING_LENGTH 9
   uchar length_buffer[MAX_VARIABLE_STRING_LENGTH], *ptr;
 
-  ptr= net_store_length(length_buffer, length);
+  ptr = net_store_length(length_buffer, length);
 
   return ptr - &length_buffer[0];
 }
 
-
 /* this is a "superset" of MYSQL_PLUGIN_VIO, in C++ I use inheritance */
 typedef struct {
   int (*read_packet)(struct st_plugin_vio *vio, uchar **buf);
@@ -3275,64 +3220,60 @@ typedef struct {
   void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
   /* -= end of MYSQL_PLUGIN_VIO =- */
   MYSQL *mysql;
-  auth_plugin_t *plugin;            /**< what plugin we're under */
+  auth_plugin_t *plugin; /**< what plugin we're under */
   const char *db;
   struct {
-    uchar *pkt;                     /**< pointer into NET::buff */
+    uchar *pkt; /**< pointer into NET::buff */
     uint pkt_len;
   } cached_server_reply;
   int packets_read, packets_written; /**< counters for send/received packets */
-  int mysql_change_user;            /**< if it's mysql_change_user() */
-  int last_read_packet_len;         /**< the length of the last *read* packet */
+  int mysql_change_user;             /**< if it's mysql_change_user() */
+  int last_read_packet_len; /**< the length of the last *read* packet */
 } MCPVIO_EXT;
 
-
 /*
   Write 1-8 bytes of string length header infromation to dest depending on
   value of src_len, then copy src_len bytes from src to dest.
- 
+
  @param dest Destination buffer of size src_len+8
  @param dest_end One byte past the end of the dest buffer
  @param src Source buff of size src_len
  @param src_end One byte past the end of the src buffer
- 
- @return pointer dest+src_len+header size or NULL if 
+
+ @return pointer dest+src_len+header size or NULL if
 */
 
 char *write_length_encoded_string4(char *dest, char *dest_end, char *src,
-                                  char *src_end)
-{
-  size_t src_len= (size_t)(src_end - src);
-  uchar *to= net_store_length((uchar*) dest, src_len);
-  if ((char*)(to + src_len) >= dest_end)
+                                   char *src_end) {
+  size_t src_len = (size_t)(src_end - src);
+  uchar *to = net_store_length((uchar *)dest, src_len);
+  if ((char *)(to + src_len) >= dest_end)
     return NULL;
   memcpy(to, src, src_len);
-  return (char*)(to + src_len);
+  return (char *)(to + src_len);
 }
 
-
 /*
   Write 1 byte of string length header information to dest and
   copy src_len bytes from src to dest.
 */
-char *write_string(char *dest, char *dest_end, char *src, char *src_end)
-{
-  size_t src_len= (size_t)(src_end - src);
-  uchar *to= NULL;
+char *write_string(char *dest, char *dest_end, char *src, char *src_end) {
+  size_t src_len = (size_t)(src_end - src);
+  uchar *to = NULL;
   if (src_len >= 251)
     return NULL;
-  *dest=(uchar) src_len;
-  to= (uchar*) dest+1;
-  if ((char*)(to + src_len) >= dest_end)
+  *dest = (uchar)src_len;
+  to = (uchar *)dest + 1;
+  if ((char *)(to + src_len) >= dest_end)
     return NULL;
   memcpy(to, src, src_len);
-  return (char*)(to + src_len);
+  return (char *)(to + src_len);
 }
 /**
   sends a COM_CHANGE_USER command with a caller provided payload
 
   Packet format:
-   
+
     Bytes       Content
     -----       ----
     n           user name - \0-terminated string
@@ -3347,51 +3288,48 @@ char *write_string(char *dest, char *dest_end, char *src, char *src_end)
   @retval 0 ok
   @retval 1 error
 */
-static int send_change_user_packet(MCPVIO_EXT *mpvio,
-                                   const uchar *data, int data_len)
-{
-  MYSQL *mysql= mpvio->mysql;
+static int send_change_user_packet(MCPVIO_EXT *mpvio, const uchar *data,
+                                   int data_len) {
+  MYSQL *mysql = mpvio->mysql;
   char *buff, *end;
-  int res= 1;
-  size_t connect_attrs_len=
-    (mysql->server_capabilities & CLIENT_CONNECT_ATTRS &&
-     mysql->options.extension) ?
-    mysql->options.extension->connection_attributes_length : 0;
+  int res = 1;
+  size_t connect_attrs_len =
+      (mysql->server_capabilities & CLIENT_CONNECT_ATTRS &&
+       mysql->options.extension)
+          ? mysql->options.extension->connection_attributes_length
+          : 0;
 
-  buff= my_alloca(USERNAME_LENGTH + data_len + 1 + NAME_LEN + 2 + NAME_LEN +
-                  connect_attrs_len + 9 /* for the length of the attrs */);
+  buff = my_alloca(USERNAME_LENGTH + data_len + 1 + NAME_LEN + 2 + NAME_LEN +
+                   connect_attrs_len + 9 /* for the length of the attrs */);
 
-  end= strmake(buff, mysql->user, USERNAME_LENGTH) + 1;
+  end = strmake(buff, mysql->user, USERNAME_LENGTH) + 1;
 
   if (!data_len)
-    *end++= 0;
-  else
-  {
-    DBUG_ASSERT(data_len <= 255);
-    if (data_len > 255)
-    {
+    *end++ = 0;
+  else {
+    assert(data_len <= 255);
+    if (data_len > 255) {
       set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
       goto error;
     }
-    *end++= data_len;
+    *end++ = data_len;
     memcpy(end, data, data_len);
-    end+= data_len;
+    end += data_len;
   }
-  end= strmake(end, mpvio->db ? mpvio->db : "", NAME_LEN) + 1;
+  end = strmake(end, mpvio->db ? mpvio->db : "", NAME_LEN) + 1;
 
-  if (mysql->server_capabilities & CLIENT_PROTOCOL_41)
-  {
-    int2store((uchar*) end, (ushort) mysql->charset->number);
-    end+= 2;
+  if (mysql->server_capabilities & CLIENT_PROTOCOL_41) {
+    int2store((uchar *)end, (ushort)mysql->charset->number);
+    end += 2;
   }
 
   if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH)
-    end= strmake(end, mpvio->plugin->name, NAME_LEN) + 1;
+    end = strmake(end, mpvio->plugin->name, NAME_LEN) + 1;
 
-  end= (char *) send_client_connect_attrs(mysql, (uchar *) end);
+  end = (char *)send_client_connect_attrs(mysql, (uchar *)end);
 
-  res= simple_command(mysql, COM_CHANGE_USER,
-                      (uchar*)buff, (ulong)(end-buff), 1);
+  res = simple_command(mysql, COM_CHANGE_USER, (uchar *)buff,
+                       (ulong)(end - buff), 1);
 
 error:
   return res;
@@ -3409,42 +3347,36 @@ static int send_change_user_packet(MCPVIO_EXT *mpvio,
   @return                one past to where the buffer is filled
 
 */
-static char *
-mysql_fill_packet_header(MYSQL *mysql, char *buff,
-                         size_t buff_size  MY_ATTRIBUTE((unused)))
-{
-  NET *net= &mysql->net;
+static char *mysql_fill_packet_header(MYSQL *mysql, char *buff,
+                                      size_t buff_size MY_ATTRIBUTE((unused))) {
+  NET *net = &mysql->net;
   char *end;
-  uchar *buff_p= (uchar*) buff;
+  uchar *buff_p = (uchar *)buff;
   (void)buff_size; /* avoid warnings */
 
-  if (mysql->client_flag & CLIENT_PROTOCOL_41)
-  {
+  if (mysql->client_flag & CLIENT_PROTOCOL_41) {
     /* 4.1 server and 4.1 client has a 32 byte option flag */
-    DBUG_ASSERT(buff_size >= 32);
+    assert(buff_size >= 32);
 
     int4store(buff_p, mysql->client_flag);
     int4store(buff_p + 4, net->max_packet_size);
-    buff[8]= (char) mysql->charset->number;
+    buff[8] = (char)mysql->charset->number;
     memset(buff + 9, 0, 32 - 9);
-    end= buff + 32;
-  }
-  else
-  {
-    DBUG_ASSERT(buff_size >= 5);
-    DBUG_ASSERT(mysql->client_flag <= UINT_MAX16);
+    end = buff + 32;
+  } else {
+    assert(buff_size >= 5);
+    assert(mysql->client_flag <= UINT_MAX16);
 
-    int2store(buff_p, (uint16) mysql->client_flag);
+    int2store(buff_p, (uint16)mysql->client_flag);
     int3store(buff_p + 2, net->max_packet_size);
-    end= buff + 5;
+    end = buff + 5;
   }
   return end;
 }
 
-
 /**
   Calcualtes client capabilities in effect (mysql->client_flag)
-  
+
   Needs to be called immediately after receiving the server handshake packet.
 
   @param  mysql   the connection context
@@ -3452,15 +3384,14 @@ mysql_fill_packet_header(MYSQL *mysql, char *buff,
   @param  db      The client flag as specified by the client app
   */
 
-static void
-cli_calculate_client_flag(MYSQL *mysql, const char *db, ulong client_flag)
-{
-  mysql->client_flag= client_flag;
-  mysql->client_flag|= mysql->options.client_flag;
-  mysql->client_flag|= CLIENT_CAPABILITIES;
+static void cli_calculate_client_flag(MYSQL *mysql, const char *db,
+                                      ulong client_flag) {
+  mysql->client_flag = client_flag;
+  mysql->client_flag |= mysql->options.client_flag;
+  mysql->client_flag |= CLIENT_CAPABILITIES;
 
   if (mysql->client_flag & CLIENT_MULTI_STATEMENTS)
-    mysql->client_flag|= CLIENT_MULTI_RESULTS;
+    mysql->client_flag |= CLIENT_MULTI_RESULTS;
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   if (mysql->options.extension &&
@@ -3469,27 +3400,55 @@ cli_calculate_client_flag(MYSQL *mysql, const char *db, ulong client_flag)
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY*/
 
   if (db)
-    mysql->client_flag|= CLIENT_CONNECT_WITH_DB;
+    mysql->client_flag |= CLIENT_CONNECT_WITH_DB;
   else
-    mysql->client_flag&= ~CLIENT_CONNECT_WITH_DB;
+    mysql->client_flag &= ~CLIENT_CONNECT_WITH_DB;
 
   /* Remove options that server doesn't support */
-  mysql->client_flag= mysql->client_flag &
-    (~(CLIENT_COMPRESS | CLIENT_SSL | CLIENT_PROTOCOL_41)
-    | mysql->server_capabilities);
+  mysql->client_flag = mysql->client_flag &
+                       (~(CLIENT_COMPRESS | CLIENT_SSL | CLIENT_PROTOCOL_41) |
+                        mysql->server_capabilities);
 
-  if(mysql->options.protocol == MYSQL_PROTOCOL_SOCKET &&
-     mysql->options.extension &&
-     mysql->options.extension->ssl_mode <= SSL_MODE_PREFERRED)
-  {
-    mysql->client_flag&= ~CLIENT_SSL;
-    mysql->options.extension->ssl_mode= SSL_MODE_DISABLED;
+  if (mysql->options.protocol == MYSQL_PROTOCOL_SOCKET &&
+      mysql->options.extension &&
+      mysql->options.extension->ssl_mode <= SSL_MODE_PREFERRED) {
+    mysql->client_flag &= ~CLIENT_SSL;
+    mysql->options.extension->ssl_mode = SSL_MODE_DISABLED;
   }
 #ifndef HAVE_COMPRESS
-  mysql->client_flag&= ~CLIENT_COMPRESS;
+  mysql->client_flag &= ~CLIENT_COMPRESS;
 #endif
 }
 
+/**
+  Checks if any SSL option is set for libmysqld embedded server.
+
+  @param  mysql   the connection handle
+  @retval 0       success
+  @retval 1       failure
+*/
+#ifdef EMBEDDED_LIBRARY
+int embedded_ssl_check(MYSQL *mysql) {
+  if (mysql->options.ssl_key || mysql->options.ssl_cert ||
+      mysql->options.ssl_ca || mysql->options.ssl_capath ||
+      mysql->options.ssl_cipher ||
+      mysql->options.client_flag & CLIENT_SSL_VERIFY_SERVER_CERT ||
+      (mysql->options.extension &&
+       (mysql->options.extension->ssl_crl ||
+        mysql->options.extension->ssl_crlpath ||
+        mysql->options.extension->tls_version ||
+        mysql->options.extension->ssl_ctx_flags ||
+        mysql->options.extension->ssl_mode >= SSL_MODE_REQUIRED))) {
+    set_mysql_extended_error(
+        mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
+        ER(CR_SSL_CONNECTION_ERROR),
+        "Embedded server libmysqld library doesn't support "
+        "SSL connections");
+    return 1;
+  }
+  return 0;
+}
+#endif
 
 /**
 Establishes SSL if requested and supported.
@@ -3498,17 +3457,18 @@ Establishes SSL if requested and supported.
 @retval 0       success
 @retval 1       failure
 */
-static int
-cli_establish_ssl(MYSQL *mysql)
-{
+static int cli_establish_ssl(MYSQL *mysql) {
+#ifdef EMBEDDED_LIBRARY
+  if (embedded_ssl_check(mysql))
+    return 1;
+#endif
 #ifdef HAVE_OPENSSL
-  NET *net= &mysql->net;
+  NET *net = &mysql->net;
 
   /* Don't fallback on unencrypted connection if SSL required. */
   if (mysql->options.extension &&
       mysql->options.extension->ssl_mode >= SSL_MODE_REQUIRED &&
-      !(mysql->server_capabilities & CLIENT_SSL))
-  {
+      !(mysql->server_capabilities & CLIENT_SSL)) {
     set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
                              ER(CR_SSL_CONNECTION_ERROR),
                              "SSL is required but the server doesn't "
@@ -3522,8 +3482,7 @@ cli_establish_ssl(MYSQL *mysql)
   */
   if (mysql->options.extension &&
       mysql->options.extension->ssl_mode > SSL_MODE_REQUIRED &&
-      !(mysql->options.ssl_ca || mysql->options.ssl_capath))
-  {
+      !(mysql->options.ssl_ca || mysql->options.ssl_capath)) {
     set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
                              ER(CR_SSL_CONNECTION_ERROR),
                              "CA certificate is required if ssl-mode "
@@ -3537,74 +3496,64 @@ cli_establish_ssl(MYSQL *mysql)
   */
   if (mysql->options.extension &&
       mysql->options.extension->ssl_mode != SSL_MODE_DISABLED &&
-      (mysql->server_capabilities & CLIENT_SSL))
-  {
+      (mysql->server_capabilities & CLIENT_SSL)) {
     /* Do the SSL layering. */
-    struct st_mysql_options *options= &mysql->options;
+    struct st_mysql_options *options = &mysql->options;
     struct st_VioSSLFd *ssl_fd;
     enum enum_ssl_init_error ssl_init_error;
     const char *cert_error;
     unsigned long ssl_error;
     char buff[33], *end;
 
-    end= mysql_fill_packet_header(mysql, buff, sizeof(buff));
+    end = mysql_fill_packet_header(mysql, buff, sizeof(buff));
 
     /*
     Send mysql->client_flag, max_packet_size - unencrypted otherwise
     the server does not know we want to do SSL
     */
-    MYSQL_TRACE(SEND_SSL_REQUEST, mysql, (end - buff, (const unsigned char*) buff));
-    if (my_net_write(net, (uchar*) buff, (size_t) (end - buff)) || net_flush(net))
-    {
-      set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
-                               ER(CR_SERVER_LOST_EXTENDED),
-                               "sending connection information to server",
-                               errno);
+    MYSQL_TRACE(SEND_SSL_REQUEST, mysql,
+                (end - buff, (const unsigned char *)buff));
+    if (my_net_write(net, (uchar *)buff, (size_t)(end - buff)) ||
+        net_flush(net)) {
+      set_mysql_extended_error(
+          mysql, CR_SERVER_LOST, unknown_sqlstate, ER(CR_SERVER_LOST_EXTENDED),
+          "sending connection information to server", errno);
       goto error;
     }
 
     MYSQL_TRACE_STAGE(mysql, SSL_NEGOTIATION);
 
     /* Create the VioSSLConnectorFd - init SSL and load certs */
-    if (!(ssl_fd= new_VioSSLConnectorFd(options->ssl_key,
-      options->ssl_cert,
-      options->ssl_ca,
-      options->ssl_capath,
-      options->ssl_cipher,
-      &ssl_init_error,
-      options->extension ?
-      options->extension->ssl_crl : NULL,
-      options->extension ?
-      options->extension->ssl_crlpath : NULL,
-      options->extension ?
-      options->extension->ssl_ctx_flags : 0)))
-    {
+    if (!(ssl_fd = new_VioSSLConnectorFd(
+              options->ssl_key, options->ssl_cert, options->ssl_ca,
+              options->ssl_capath, options->ssl_cipher, &ssl_init_error,
+              options->extension ? options->extension->ssl_crl : NULL,
+              options->extension ? options->extension->ssl_crlpath : NULL,
+              options->extension ? options->extension->ssl_ctx_flags : 0))) {
       set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
-                               ER(CR_SSL_CONNECTION_ERROR), sslGetErrString(ssl_init_error));
+                               ER(CR_SSL_CONNECTION_ERROR),
+                               sslGetErrString(ssl_init_error));
       goto error;
     }
-    mysql->connector_fd= (unsigned char *) ssl_fd;
+    mysql->connector_fd = (unsigned char *)ssl_fd;
 
     /* Connect to the server */
     DBUG_PRINT("info", ("IO layer change in progress..."));
     MYSQL_TRACE(SSL_CONNECT, mysql, ());
-    if (sslconnect(ssl_fd, net->vio,
-      (long) (mysql->options.connect_timeout), &ssl_error))
-    {
+    if (sslconnect(ssl_fd, net->vio, (long)(mysql->options.connect_timeout),
+                   &ssl_error)) {
       char buf[512];
       ERR_error_string_n(ssl_error, buf, 512);
-      buf[511]= 0;
+      buf[511] = 0;
       set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
-                               ER(CR_SSL_CONNECTION_ERROR),
-                               buf);
+                               ER(CR_SSL_CONNECTION_ERROR), buf);
       goto error;
     }
     DBUG_PRINT("info", ("IO layer change done!"));
 
     /* Verify server cert */
     if ((mysql->client_flag & CLIENT_SSL_VERIFY_SERVER_CERT) &&
-        ssl_verify_server_cert(net->vio, mysql->host, &cert_error))
-    {
+        ssl_verify_server_cert(net->vio, mysql->host, &cert_error)) {
       set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
                                ER(CR_SSL_CONNECTION_ERROR), cert_error);
       goto error;
@@ -3626,7 +3575,6 @@ cli_establish_ssl(MYSQL *mysql)
   return 0;
 }
 
-
 #define MAX_CONNECTION_ATTR_STORAGE_LENGTH 65536
 
 /**
@@ -3659,34 +3607,36 @@ cli_establish_ssl(MYSQL *mysql)
   @retval 0 ok
   @retval 1 error
 */
-static int send_client_reply_packet(MCPVIO_EXT *mpvio,
-                                    const uchar *data, int data_len)
-{
-  MYSQL *mysql= mpvio->mysql;
-  NET *net= &mysql->net;
+static int send_client_reply_packet(MCPVIO_EXT *mpvio, const uchar *data,
+                                    int data_len) {
+  MYSQL *mysql = mpvio->mysql;
+  NET *net = &mysql->net;
   char *buff, *end;
   size_t buff_size;
-  size_t connect_attrs_len=
-    (mysql->server_capabilities & CLIENT_CONNECT_ATTRS &&
-     mysql->options.extension) ?
-    mysql->options.extension->connection_attributes_length : 0;
-
-  DBUG_ASSERT(connect_attrs_len < MAX_CONNECTION_ATTR_STORAGE_LENGTH);
+  size_t connect_attrs_len =
+      (mysql->server_capabilities & CLIENT_CONNECT_ATTRS &&
+       mysql->options.extension)
+          ? mysql->options.extension->connection_attributes_length
+          : 0;
 
+  assert(connect_attrs_len < MAX_CONNECTION_ATTR_STORAGE_LENGTH);
 
   /*
     Fixed size of the packet is 32 bytes. See mysql_fill_packet_header.
     +9 because data is a length encoded binary where meta data size is max 9.
   */
-  buff_size= 33 + USERNAME_LENGTH + data_len + 9 + NAME_LEN + NAME_LEN + connect_attrs_len + 9;
-  buff= my_alloca(buff_size);
+  buff_size = 33 + USERNAME_LENGTH + data_len + 9 + NAME_LEN + NAME_LEN +
+              connect_attrs_len + 9;
+  buff = my_alloca(buff_size);
 
   /* The client_flags is already calculated. Just fill in the packet header */
-  end= mysql_fill_packet_header(mysql, buff, buff_size);
+  end = mysql_fill_packet_header(mysql, buff, buff_size);
 
-  DBUG_PRINT("info",("Server version = '%s'  capabilites: %lu  status: %u  client_flag: %lu",
-		     mysql->server_version, mysql->server_capabilities,
-		     mysql->server_status, mysql->client_flag));
+  DBUG_PRINT(
+      "info",
+      ("Server version = '%s'  capabilites: %lu  status: %u  client_flag: %lu",
+       mysql->server_version, mysql->server_capabilities, mysql->server_status,
+       mysql->client_flag));
 
   compile_time_assert(MYSQL_USERNAME_LENGTH == USERNAME_LENGTH);
 
@@ -3697,10 +3647,9 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
     read_user_name(end);
 
   /* We have to handle different version of handshake here */
-  DBUG_PRINT("info",("user: %s",end));
-  end= strend(end) + 1;
-  if (data_len)
-  {
+  DBUG_PRINT("info", ("user: %s", end));
+  end = strend(end) + 1;
+  if (data_len) {
     /*
       Since the older versions of server do not have
       CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA capability,
@@ -3710,43 +3659,39 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
       the string followed by the actual string.
       */
     if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA)
-      end= write_length_encoded_string4(end, (char *) (buff + buff_size),
-                                       (char *) data,
-                                       (char *) (data + data_len));
+      end =
+          write_length_encoded_string4(end, (char *)(buff + buff_size),
+                                       (char *)data, (char *)(data + data_len));
     else
-      end= write_string(end, (char *) (buff + buff_size),
-                       (char *) data,
-                       (char *) (data + data_len));
+      end = write_string(end, (char *)(buff + buff_size), (char *)data,
+                         (char *)(data + data_len));
     if (end == NULL)
       goto error;
-  }
-  else
-    *end++= 0;
+  } else
+    *end++ = 0;
 
   /* Add database if needed */
-  if (mpvio->db && (mysql->server_capabilities & CLIENT_CONNECT_WITH_DB))
-  {
-    end= strmake(end, mpvio->db, NAME_LEN) + 1;
-    mysql->db= my_strdup(key_memory_MYSQL,
-                         mpvio->db, MYF(MY_WME));
+  if (mpvio->db && (mysql->server_capabilities & CLIENT_CONNECT_WITH_DB)) {
+    end = strmake(end, mpvio->db, NAME_LEN) + 1;
+    mysql->db = my_strdup(key_memory_MYSQL, mpvio->db, MYF(MY_WME));
   }
 
   if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH)
-    end= strmake(end, mpvio->plugin->name, NAME_LEN) + 1;
+    end = strmake(end, mpvio->plugin->name, NAME_LEN) + 1;
 
-  end= (char *) send_client_connect_attrs(mysql, (uchar *) end);
+  end = (char *)send_client_connect_attrs(mysql, (uchar *)end);
 
   /* Write authentication package */
-  MYSQL_TRACE(SEND_AUTH_RESPONSE, mysql, (end-buff, (const unsigned char*)buff));
-  if (my_net_write(net, (uchar*) buff, (size_t) (end-buff)) || net_flush(net))
-  {
+  MYSQL_TRACE(SEND_AUTH_RESPONSE, mysql,
+              (end - buff, (const unsigned char *)buff));
+  if (my_net_write(net, (uchar *)buff, (size_t)(end - buff)) ||
+      net_flush(net)) {
     set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
                              ER(CR_SERVER_LOST_EXTENDED),
-                             "sending authentication information",
-                             errno);
+                             "sending authentication information", errno);
     goto error;
   }
-  MYSQL_TRACE(PACKET_SENT, mysql, (end-buff));
+  MYSQL_TRACE(PACKET_SENT, mysql, (end - buff));
   return 0;
 
 error:
@@ -3759,23 +3704,20 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
   This function is called by a client authentication plugin, when it wants
   to read data from the server.
 */
-static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
-{
-  MCPVIO_EXT *mpvio= (MCPVIO_EXT*)mpv;
-  MYSQL *mysql= mpvio->mysql;
-  ulong  pkt_len;
+static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf) {
+  MCPVIO_EXT *mpvio = (MCPVIO_EXT *)mpv;
+  MYSQL *mysql = mpvio->mysql;
+  ulong pkt_len;
 
   /* there are cached data left, feed it to a plugin */
-  if (mpvio->cached_server_reply.pkt)
-  {
-    *buf= mpvio->cached_server_reply.pkt;
-    mpvio->cached_server_reply.pkt= 0;
+  if (mpvio->cached_server_reply.pkt) {
+    *buf = mpvio->cached_server_reply.pkt;
+    mpvio->cached_server_reply.pkt = 0;
     mpvio->packets_read++;
     return mpvio->cached_server_reply.pkt_len;
   }
 
-  if (mpvio->packets_read == 0)
-  {
+  if (mpvio->packets_read == 0) {
     /*
       the server handshake packet came from the wrong plugin,
       or it's mysql_change_user(). Either way, there is no data
@@ -3787,9 +3729,14 @@ static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
   }
 
   /* otherwise read the data */
-  pkt_len= (*mysql->methods->read_change_user_result)(mysql);
-  mpvio->last_read_packet_len= pkt_len;
-  *buf= mysql->net.read_pos;
+  pkt_len = (*mysql->methods->read_change_user_result)(mysql);
+
+  /* error while reading the change user request */
+  if (pkt_len == packet_error)
+    return (int)packet_error;
+
+  mpvio->last_read_packet_len = pkt_len;
+  *buf = mysql->net.read_pos;
 
   /* was it a request to change plugins ? */
   if (**buf == 254)
@@ -3802,8 +3749,7 @@ static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
 
     See also server_mpvio_write_packet() where the escaping is done.
   */
-  if (pkt_len && **buf == 1)
-  {
+  if (pkt_len && **buf == 1) {
     (*buf)++;
     pkt_len--;
   }
@@ -3821,38 +3767,31 @@ static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
   handshake packet, if neccessary.
 */
 static int client_mpvio_write_packet(struct st_plugin_vio *mpv,
-                                     const uchar *pkt, int pkt_len)
-{
+                                     const uchar *pkt, int pkt_len) {
   int res;
-  MCPVIO_EXT *mpvio= (MCPVIO_EXT*)mpv;
+  MCPVIO_EXT *mpvio = (MCPVIO_EXT *)mpv;
 
-  if (mpvio->packets_written == 0)
-  {
+  if (mpvio->packets_written == 0) {
     if (mpvio->mysql_change_user)
-      res= send_change_user_packet(mpvio, pkt, pkt_len);
+      res = send_change_user_packet(mpvio, pkt, pkt_len);
     else
-      res= send_client_reply_packet(mpvio, pkt, pkt_len);
-  }
-  else
-  {
-    NET *net= &mpvio->mysql->net;
+      res = send_client_reply_packet(mpvio, pkt, pkt_len);
+  } else {
+    NET *net = &mpvio->mysql->net;
 
     MYSQL_TRACE(SEND_AUTH_DATA, mpvio->mysql, (pkt_len, pkt));
 
     if (mpvio->mysql->thd)
-      res= 1; /* no chit-chat in embedded */
+      res = 1; /* no chit-chat in embedded */
     else
-      res= my_net_write(net, pkt, pkt_len) || net_flush(net);
+      res = my_net_write(net, pkt, pkt_len) || net_flush(net);
 
-    if (!res)
-    {
+    if (!res) {
       MYSQL_TRACE(PACKET_SENT, mpvio->mysql, (pkt_len));
-    }
-    else
+    } else
       set_mysql_extended_error(mpvio->mysql, CR_SERVER_LOST, unknown_sqlstate,
                                ER(CR_SERVER_LOST_EXTENDED),
-                               "sending authentication information",
-                               errno);
+                               "sending authentication information", errno);
   }
   mpvio->packets_written++;
   return res;
@@ -3862,65 +3801,59 @@ static int client_mpvio_write_packet(struct st_plugin_vio *mpv,
   fills MYSQL_PLUGIN_VIO_INFO structure with the information about the
   connection
 */
-void mpvio_info(Vio *vio, MYSQL_PLUGIN_VIO_INFO *info)
-{
+void mpvio_info(Vio *vio, MYSQL_PLUGIN_VIO_INFO *info) {
   memset(info, 0, sizeof(*info));
   switch (vio->type) {
   case VIO_TYPE_TCPIP:
-    info->protocol= MYSQL_VIO_TCP;
-    info->socket= (int)vio_fd(vio);
+    info->protocol = MYSQL_VIO_TCP;
+    info->socket = (int)vio_fd(vio);
     return;
   case VIO_TYPE_SOCKET:
-    info->protocol= MYSQL_VIO_SOCKET;
-    info->socket= (int)vio_fd(vio);
+    info->protocol = MYSQL_VIO_SOCKET;
+    info->socket = (int)vio_fd(vio);
     return;
-  case VIO_TYPE_SSL:
-    {
-      struct sockaddr addr;
-      socklen_t addrlen= sizeof(addr);
-      if (getsockname(vio_fd(vio), &addr, &addrlen))
-        return;
-      info->protocol= addr.sa_family == AF_UNIX ?
-        MYSQL_VIO_SOCKET : MYSQL_VIO_TCP;
-      info->socket= (int)vio_fd(vio);
+  case VIO_TYPE_SSL: {
+    struct sockaddr addr;
+    socklen_t addrlen = sizeof(addr);
+    if (getsockname(vio_fd(vio), &addr, &addrlen))
       return;
-    }
+    info->protocol =
+        addr.sa_family == AF_UNIX ? MYSQL_VIO_SOCKET : MYSQL_VIO_TCP;
+    info->socket = (int)vio_fd(vio);
+    return;
+  }
 #ifdef _WIN32
   case VIO_TYPE_NAMEDPIPE:
-    info->protocol= MYSQL_VIO_PIPE;
-    info->handle= vio->hPipe;
+    info->protocol = MYSQL_VIO_PIPE;
+    info->handle = vio->hPipe;
     return;
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
   case VIO_TYPE_SHARED_MEMORY:
-    info->protocol= MYSQL_VIO_MEMORY;
-    info->handle= vio->handle_file_map; /* or what ? */
+    info->protocol = MYSQL_VIO_MEMORY;
+    info->handle = vio->handle_file_map; /* or what ? */
     return;
 #endif
 #endif
-  default: DBUG_ASSERT(0);
+  default:
+    assert(0);
   }
 }
 
 static void client_mpvio_info(MYSQL_PLUGIN_VIO *vio,
-                              MYSQL_PLUGIN_VIO_INFO *info)
-{
-  MCPVIO_EXT *mpvio= (MCPVIO_EXT*)vio;
+                              MYSQL_PLUGIN_VIO_INFO *info) {
+  MCPVIO_EXT *mpvio = (MCPVIO_EXT *)vio;
   mpvio_info(mpvio->mysql->net.vio, info);
 }
 
+my_bool libmysql_cleartext_plugin_enabled = 0;
 
-my_bool libmysql_cleartext_plugin_enabled= 0;
-
-static my_bool check_plugin_enabled(MYSQL *mysql, auth_plugin_t *plugin)
-{
+static my_bool check_plugin_enabled(MYSQL *mysql, auth_plugin_t *plugin) {
   if (plugin == &clear_password_client_plugin &&
       (!libmysql_cleartext_plugin_enabled &&
        (!mysql->options.extension ||
-       !mysql->options.extension->enable_cleartext_plugin)))
-  {
+        !mysql->options.extension->enable_cleartext_plugin))) {
     set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD,
-                             unknown_sqlstate,
-                             ER(CR_AUTH_PLUGIN_CANNOT_LOAD),
+                             unknown_sqlstate, ER(CR_AUTH_PLUGIN_CANNOT_LOAD),
                              clear_password_client_plugin.name,
                              "plugin not enabled");
     return TRUE;
@@ -3928,7 +3861,6 @@ static my_bool check_plugin_enabled(MYSQL *mysql, auth_plugin_t *plugin)
   return FALSE;
 }
 
-
 /**
   Client side of the plugin driver authentication.
 
@@ -3946,163 +3878,156 @@ static my_bool check_plugin_enabled(MYSQL *mysql, auth_plugin_t *plugin)
   @retval 1 error
 */
 int run_plugin_auth(MYSQL *mysql, char *data, uint data_len,
-                    const char *data_plugin, const char *db)
-{
-  const char    *auth_plugin_name;
+                    const char *data_plugin, const char *db) {
+  const char *auth_plugin_name;
   auth_plugin_t *auth_plugin;
-  MCPVIO_EXT    mpvio;
-  ulong		pkt_length;
-  int           res;
+  MCPVIO_EXT mpvio;
+  ulong pkt_length;
+  int res;
 
-  DBUG_ENTER ("run_plugin_auth");
+  DBUG_ENTER("run_plugin_auth");
   /* determine the default/initial plugin to use */
   if (mysql->options.extension && mysql->options.extension->default_auth &&
-      mysql->server_capabilities & CLIENT_PLUGIN_AUTH)
-  {
-    auth_plugin_name= mysql->options.extension->default_auth;
-    if (!(auth_plugin= (auth_plugin_t*) mysql_client_find_plugin(mysql,
-                       auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
-      DBUG_RETURN (1); /* oops, not found */
-  }
-  else
-  {
-    auth_plugin= &native_password_client_plugin;
-    auth_plugin_name= auth_plugin->name;
+      mysql->server_capabilities & CLIENT_PLUGIN_AUTH) {
+    auth_plugin_name = mysql->options.extension->default_auth;
+    if (!(auth_plugin = (auth_plugin_t *)mysql_client_find_plugin(
+              mysql, auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
+      DBUG_RETURN(1); /* oops, not found */
+  } else {
+    auth_plugin = &native_password_client_plugin;
+    auth_plugin_name = auth_plugin->name;
   }
 
   if (check_plugin_enabled(mysql, auth_plugin))
     DBUG_RETURN(1);
 
-  DBUG_PRINT ("info", ("using plugin %s", auth_plugin_name));
+  DBUG_PRINT("info", ("using plugin %s", auth_plugin_name));
 
-  mysql->net.last_errno= 0; /* just in case */
+  mysql->net.last_errno = 0; /* just in case */
 
-  if (data_plugin && strcmp(data_plugin, auth_plugin_name))
-  {
+  if (data_plugin && strcmp(data_plugin, auth_plugin_name)) {
     /* data was prepared for a different plugin, don't show it to this one */
-    data= 0;
-    data_len= 0;
+    data = 0;
+    data_len = 0;
   }
 
-  mpvio.mysql_change_user= data_plugin == 0;
-  mpvio.cached_server_reply.pkt= (uchar*)data;
-  mpvio.cached_server_reply.pkt_len= data_len;
-  mpvio.read_packet= client_mpvio_read_packet;
-  mpvio.write_packet= client_mpvio_write_packet;
-  mpvio.info= client_mpvio_info;
-  mpvio.mysql= mysql;
-  mpvio.packets_read= mpvio.packets_written= 0;
-  mpvio.db= db;
-  mpvio.plugin= auth_plugin;
+  mpvio.mysql_change_user = data_plugin == 0;
+  mpvio.cached_server_reply.pkt = (uchar *)data;
+  mpvio.cached_server_reply.pkt_len = data_len;
+  mpvio.read_packet = client_mpvio_read_packet;
+  mpvio.write_packet = client_mpvio_write_packet;
+  mpvio.info = client_mpvio_info;
+  mpvio.mysql = mysql;
+  mpvio.packets_read = mpvio.packets_written = 0;
+  mpvio.db = db;
+  mpvio.plugin = auth_plugin;
 
   MYSQL_TRACE(AUTH_PLUGIN, mysql, (auth_plugin->name));
 
-  res= auth_plugin->authenticate_user((struct st_plugin_vio *)&mpvio, mysql);
-  DBUG_PRINT ("info", ("authenticate_user returned %s", 
-                       res == CR_OK ? "CR_OK" : 
-                       res == CR_ERROR ? "CR_ERROR" :
-                       res == CR_OK_HANDSHAKE_COMPLETE ? 
-                         "CR_OK_HANDSHAKE_COMPLETE" : "error"));
+  res = auth_plugin->authenticate_user((struct st_plugin_vio *)&mpvio, mysql);
+  DBUG_PRINT("info",
+             ("authenticate_user returned %s",
+              res == CR_OK ? "CR_OK"
+                           : res == CR_ERROR ? "CR_ERROR"
+                                             : res == CR_OK_HANDSHAKE_COMPLETE
+                                                   ? "CR_OK_HANDSHAKE_COMPLETE"
+                                                   : "error"));
 
   compile_time_assert(CR_OK == -1);
   compile_time_assert(CR_ERROR == 0);
 
   /*
     The connection may be closed. If so: do not try to read from the buffer.
+    If server sends OK packet without sending auth-switch first, client side
+    auth plugin may not be able to process it correctly.
+    However, if server sends OK, it means server side authentication plugin
+    already performed required checks. Further, server side plugin did not
+    really care about plugin used by client in this case.
   */
-  if (res > CR_OK && 
-      (!my_net_is_inited(&mysql->net) || mysql->net.read_pos[0] != 254))
-  {
+  if (res > CR_OK &&
+      (!my_net_is_inited(&mysql->net) ||
+       (mysql->net.read_pos[0] != 0 && mysql->net.read_pos[0] != 254))) {
     /*
       the plugin returned an error. write it down in mysql,
       unless the error code is CR_ERROR and mysql->net.last_errno
       is already set (the plugin has done it)
     */
-    DBUG_PRINT ("info", ("res=%d", res));
+    DBUG_PRINT("info", ("res=%d", res));
     if (res > CR_ERROR)
-      set_mysql_error(mysql, res, unknown_sqlstate);
-    else
-      if (!mysql->net.last_errno)
-        set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
-    DBUG_RETURN (1);
+      set_mysql_error(mysql, res, unknown_sqlstate);
+    else if (!mysql->net.last_errno)
+      set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
+    DBUG_RETURN(1);
   }
 
   /* read the OK packet (or use the cached value in mysql->net.read_pos */
   if (res == CR_OK)
-    pkt_length= (*mysql->methods->read_change_user_result)(mysql);
+    pkt_length = (*mysql->methods->read_change_user_result)(mysql);
   else /* res == CR_OK_HANDSHAKE_COMPLETE */
-    pkt_length= mpvio.last_read_packet_len;
+    pkt_length = mpvio.last_read_packet_len;
 
-  DBUG_PRINT ("info", ("OK packet length=%lu", pkt_length));
-  if (pkt_length == packet_error)
-  {
+  DBUG_PRINT("info", ("OK packet length=%lu", pkt_length));
+  if (pkt_length == packet_error) {
     if (mysql->net.last_errno == CR_SERVER_LOST)
       set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
                                ER(CR_SERVER_LOST_EXTENDED),
-                               "reading authorization packet",
-                               errno);
-    DBUG_RETURN (1);
+                               "reading authorization packet", errno);
+    DBUG_RETURN(1);
   }
 
-  if (mysql->net.read_pos[0] == 254)
-  {
+  if (mysql->net.read_pos[0] == 254) {
     /* The server asked to use a different authentication plugin */
-    if (pkt_length < 2)
-    {
+    if (pkt_length < 2) {
       set_mysql_error(mysql, CR_MALFORMED_PACKET,
-                      unknown_sqlstate);        /* purecov: inspected */
+                      unknown_sqlstate); /* purecov: inspected */
       DBUG_RETURN(1);
-    }
-    else
-    { 
+    } else {
       /* "use different plugin" packet */
       uint len;
-      auth_plugin_name= (char*)mysql->net.read_pos + 1;
-      len= (uint)strlen(auth_plugin_name); /* safe as my_net_read always appends \0 */
-      mpvio.cached_server_reply.pkt_len= pkt_length - len - 2;
-      mpvio.cached_server_reply.pkt= mysql->net.read_pos + len + 2;
-      DBUG_PRINT ("info", ("change plugin packet from server for plugin %s",
-                           auth_plugin_name));
+      auth_plugin_name = (char *)mysql->net.read_pos + 1;
+      len = (uint)strlen(
+          auth_plugin_name); /* safe as my_net_read always appends \0 */
+      mpvio.cached_server_reply.pkt_len = pkt_length - len - 2;
+      mpvio.cached_server_reply.pkt = mysql->net.read_pos + len + 2;
+      DBUG_PRINT("info", ("change plugin packet from server for plugin %s",
+                          auth_plugin_name));
     }
 
-    if (!(auth_plugin= (auth_plugin_t *) mysql_client_find_plugin(mysql,
-                         auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
-      DBUG_RETURN (1);
+    if (!(auth_plugin = (auth_plugin_t *)mysql_client_find_plugin(
+              mysql, auth_plugin_name, MYSQL_CLIENT_AUTHENTICATION_PLUGIN)))
+      DBUG_RETURN(1);
 
     if (check_plugin_enabled(mysql, auth_plugin))
       DBUG_RETURN(1);
 
     MYSQL_TRACE(AUTH_PLUGIN, mysql, (auth_plugin->name));
 
-    mpvio.plugin= auth_plugin;
-    res= auth_plugin->authenticate_user((struct st_plugin_vio *)&mpvio, mysql);
-
-    DBUG_PRINT ("info", ("second authenticate_user returned %s", 
-                         res == CR_OK ? "CR_OK" : 
-                         res == CR_ERROR ? "CR_ERROR" :
-                         res == CR_OK_HANDSHAKE_COMPLETE ? 
-                         "CR_OK_HANDSHAKE_COMPLETE" : "error"));
-    if (res > CR_OK)
-    {
+    mpvio.plugin = auth_plugin;
+    res = auth_plugin->authenticate_user((struct st_plugin_vio *)&mpvio, mysql);
+
+    DBUG_PRINT("info", ("second authenticate_user returned %s",
+                        res == CR_OK
+                            ? "CR_OK"
+                            : res == CR_ERROR ? "CR_ERROR"
+                                              : res == CR_OK_HANDSHAKE_COMPLETE
+                                                    ? "CR_OK_HANDSHAKE_COMPLETE"
+                                                    : "error"));
+    if (res > CR_OK) {
       if (res > CR_ERROR)
         set_mysql_error(mysql, res, unknown_sqlstate);
-      else
-        if (!mysql->net.last_errno)
-          set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
-      DBUG_RETURN (1);
+      else if (!mysql->net.last_errno)
+        set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
+      DBUG_RETURN(1);
     }
 
-    if (res != CR_OK_HANDSHAKE_COMPLETE)
-    {
+    if (res != CR_OK_HANDSHAKE_COMPLETE) {
       /* Read what server thinks about out new auth message report */
-      if (cli_safe_read(mysql, NULL) == packet_error)
-      {
+      if (cli_safe_read(mysql, NULL) == packet_error) {
         if (mysql->net.last_errno == CR_SERVER_LOST)
           set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
                                    ER(CR_SERVER_LOST_EXTENDED),
-                                   "reading final connect information",
-                                   errno);
-        DBUG_RETURN (1);
+                                   "reading final connect information", errno);
+        DBUG_RETURN(1);
       }
     }
   }
@@ -4110,87 +4035,80 @@ int run_plugin_auth(MYSQL *mysql, char *data, uint data_len,
     net->read_pos[0] should always be 0 here if the server implements
     the protocol correctly
   */
-  res= (mysql->net.read_pos[0] != 0);
+  res = (mysql->net.read_pos[0] != 0);
 
   MYSQL_TRACE(AUTHENTICATED, mysql, ());
   DBUG_RETURN(res);
 }
 
-
 /** set some default attributes */
-static int
-set_connect_attributes(MYSQL *mysql, char *buff, size_t buf_len)
-{
-  int rc= 0;
+static int set_connect_attributes(MYSQL *mysql, char *buff, size_t buf_len) {
+  int rc = 0;
 
   /*
     Clean up any values set by the client code. We want these options as
     consistent as possible
   */
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_name");
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_os");
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_platform");
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_pid");
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_thread");
-  rc+= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_version");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_name");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_os");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_platform");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_pid");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_thread");
+  rc += mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_version");
 
   /*
    Now let's set up some values
   */
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
-                     "_client_name", "libmysql");
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
-                      "_client_version", PACKAGE_VERSION);
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
-                      "_os", SYSTEM_TYPE);
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
-                      "_platform", MACHINE_TYPE);
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_name",
+                       "libmysql");
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_version",
+                       PACKAGE_VERSION);
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_os", SYSTEM_TYPE);
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_platform",
+                       MACHINE_TYPE);
 #ifdef _WIN32
-  my_snprintf(buff, buf_len, "%lu", (ulong) GetCurrentProcessId());
+  my_snprintf(buff, buf_len, "%lu", (ulong)GetCurrentProcessId());
 #else
-  my_snprintf(buff, buf_len, "%lu", (ulong) getpid());
+  my_snprintf(buff, buf_len, "%lu", (ulong)getpid());
 #endif
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_pid", buff);
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_pid", buff);
 
 #ifdef _WIN32
-  my_snprintf(buff, buf_len, "%lu", (ulong) GetCurrentThreadId());
-  rc+= mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_thread", buff);
+  my_snprintf(buff, buf_len, "%lu", (ulong)GetCurrentThreadId());
+  rc += mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_thread", buff);
 #endif
 
   return rc > 0 ? 1 : 0;
 }
 
-
-MYSQL * STDCALL 
-CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
-		       const char *passwd, const char *db,
-		       uint port, const char *unix_socket,ulong client_flag)
-{
-  char		buff[NAME_LEN+USERNAME_LENGTH+100];
-  int           scramble_data_len, pkt_scramble_len= 0;
-  char          *end,*host_info= 0, *server_version_end, *pkt_end;
-  char          *scramble_data;
-  char          *scramble_buffer= NULL;
-  const char    *scramble_plugin;
-  ulong		pkt_length;
-  NET		*net= &mysql->net;
-  my_bool       scramble_buffer_allocated= FALSE;
+MYSQL *STDCALL CLI_MYSQL_REAL_CONNECT(MYSQL *mysql, const char *host,
+                                      const char *user, const char *passwd,
+                                      const char *db, uint port,
+                                      const char *unix_socket,
+                                      ulong client_flag) {
+  char buff[NAME_LEN + USERNAME_LENGTH + 100];
+  int scramble_data_len, pkt_scramble_len = 0;
+  char *end, *host_info = 0, *server_version_end, *pkt_end;
+  char *scramble_data;
+  char *scramble_buffer = NULL;
+  const char *scramble_plugin;
+  ulong pkt_length;
+  NET *net = &mysql->net;
+  my_bool scramble_buffer_allocated = FALSE;
 #ifdef _WIN32
-  HANDLE	hPipe=INVALID_HANDLE_VALUE;
+  HANDLE hPipe = INVALID_HANDLE_VALUE;
 #endif
 #ifdef HAVE_SYS_UN_H
-  struct	sockaddr_un UNIXaddr;
+  struct sockaddr_un UNIXaddr;
 #endif
   DBUG_ENTER("mysql_real_connect");
 
-  DBUG_PRINT("enter",("host: %s  db: %s  user: %s (client)",
-		      host ? host : "(Null)",
-		      db ? db : "(Null)",
-		      user ? user : "(Null)"));
+  DBUG_PRINT("enter",
+             ("host: %s  db: %s  user: %s (client)", host ? host : "(Null)",
+              db ? db : "(Null)", user ? user : "(Null)"));
 
   /* Test whether we're already connected */
-  if (net->vio)
-  {
+  if (net->vio) {
     set_mysql_error(mysql, CR_ALREADY_CONNECTED, unknown_sqlstate);
     DBUG_RETURN(0);
   }
@@ -4198,49 +4116,46 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
   if (set_connect_attributes(mysql, buff, sizeof(buff)))
     DBUG_RETURN(0);
 
-  mysql->methods= &client_methods;
-  net->vio = 0;				/* If something goes wrong */
-  mysql->client_flag=0;			/* For handshake */
+  mysql->methods = &client_methods;
+  net->vio = 0;           /* If something goes wrong */
+  mysql->client_flag = 0; /* For handshake */
 
   /* use default options */
-  if (mysql->options.my_cnf_file || mysql->options.my_cnf_group)
-  {
-    mysql_read_default_options(&mysql->options,
-			       (mysql->options.my_cnf_file ?
-				mysql->options.my_cnf_file : "my"),
-			       mysql->options.my_cnf_group);
+  if (mysql->options.my_cnf_file || mysql->options.my_cnf_group) {
+    mysql_read_default_options(
+        &mysql->options,
+        (mysql->options.my_cnf_file ? mysql->options.my_cnf_file : "my"),
+        mysql->options.my_cnf_group);
     my_free(mysql->options.my_cnf_file);
     my_free(mysql->options.my_cnf_group);
-    mysql->options.my_cnf_file=mysql->options.my_cnf_group=0;
+    mysql->options.my_cnf_file = mysql->options.my_cnf_group = 0;
   }
 
   /* Some empty-string-tests are done because of ODBC */
   if (!host || !host[0])
-    host=mysql->options.host;
-  if (!user || !user[0])
-  {
-    user=mysql->options.user;
+    host = mysql->options.host;
+  if (!user || !user[0]) {
+    user = mysql->options.user;
     if (!user)
-      user= "";
+      user = "";
   }
-  if (!passwd)
-  {
-    passwd=mysql->options.password;
+  if (!passwd) {
+    passwd = mysql->options.password;
 #if !defined(MYSQL_SERVER)
     if (!passwd)
-      passwd=getenv("MYSQL_PWD");		/* get it from environment */
+      passwd = getenv("MYSQL_PWD"); /* get it from environment */
 #endif
     if (!passwd)
-      passwd= "";
+      passwd = "";
   }
   if (!db || !db[0])
-    db=mysql->options.db;
+    db = mysql->options.db;
   if (!port)
-    port=mysql->options.port;
+    port = mysql->options.port;
   if (!unix_socket)
-    unix_socket=mysql->options.unix_socket;
+    unix_socket = mysql->options.unix_socket;
 
-  mysql->server_status=SERVER_STATUS_AUTOCOMMIT;
+  mysql->server_status = SERVER_STATUS_AUTOCOMMIT;
   DBUG_PRINT("info", ("Connecting"));
 
   MYSQL_TRACE_STAGE(mysql, CONNECTING);
@@ -4249,27 +4164,24 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
   /*
     Part 0: Grab a socket and connect it to the server
   */
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
   if ((!mysql->options.protocol ||
        mysql->options.protocol == MYSQL_PROTOCOL_MEMORY) &&
-      (!host || !strcmp(host,LOCAL_HOST)))
-  {
+      (!host || !strcmp(host, LOCAL_HOST))) {
     HANDLE handle_map;
     DBUG_PRINT("info", ("Using shared memory"));
 
-    handle_map= create_shared_memory(mysql, net,
-                                     get_win32_connect_timeout(mysql));
+    handle_map =
+        create_shared_memory(mysql, net, get_win32_connect_timeout(mysql));
 
-    if (handle_map == INVALID_HANDLE_VALUE)
-    {
+    if (handle_map == INVALID_HANDLE_VALUE) {
       DBUG_PRINT("error",
-		 ("host: '%s'  socket: '%s'  shared memory: %s  have_tcpip: %d",
-		  host ? host : "<null>",
-		  unix_socket ? unix_socket : "<null>",
-		  (int) mysql->options.shared_memory_base_name,
-		  (int) have_tcpip));
+                 ("host: '%s'  socket: '%s'  shared memory: %s  have_tcpip: %d",
+                  host ? host : "<null>", unix_socket ? unix_socket : "<null>",
+                  (int)mysql->options.shared_memory_base_name,
+                  (int)have_tcpip));
       if (mysql->options.protocol == MYSQL_PROTOCOL_MEMORY)
-	goto error;
+        goto error;
 
       /*
         Try also with PIPE or TCP/IP. Clear the error from
@@ -4277,13 +4189,11 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       */
 
       net_clear_error(net);
-    }
-    else
-    {
-      mysql->options.protocol=MYSQL_PROTOCOL_MEMORY;
+    } else {
+      mysql->options.protocol = MYSQL_PROTOCOL_MEMORY;
       unix_socket = 0;
-      host=mysql->options.shared_memory_base_name;
-      my_snprintf(host_info=buff, sizeof(buff)-1,
+      host = mysql->options.shared_memory_base_name;
+      my_snprintf(host_info = buff, sizeof(buff) - 1,
                   ER(CR_SHARED_MEMORY_CONNECTION), host);
     }
   }
@@ -4293,123 +4203,108 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       (!mysql->options.protocol ||
        mysql->options.protocol == MYSQL_PROTOCOL_SOCKET) &&
       (unix_socket || mysql_unix_port) &&
-      (!host || !strcmp(host,LOCAL_HOST)))
-  {
-    my_socket sock= socket(AF_UNIX, SOCK_STREAM, 0);
+      (!host || !strcmp(host, LOCAL_HOST))) {
+    my_socket sock = socket(AF_UNIX, SOCK_STREAM, 0);
     DBUG_PRINT("info", ("Using socket"));
-    if (sock == SOCKET_ERROR)
-    {
-      set_mysql_extended_error(mysql, CR_SOCKET_CREATE_ERROR,
-                               unknown_sqlstate,
-                               ER(CR_SOCKET_CREATE_ERROR),
-                               socket_errno);
+    if (sock == SOCKET_ERROR) {
+      set_mysql_extended_error(mysql, CR_SOCKET_CREATE_ERROR, unknown_sqlstate,
+                               ER(CR_SOCKET_CREATE_ERROR), socket_errno);
       goto error;
     }
 
-    net->vio= vio_new(sock, VIO_TYPE_SOCKET,
-                      VIO_LOCALHOST | VIO_BUFFERED_READ);
-    if (!net->vio)
-    {
-      DBUG_PRINT("error",("Unknow protocol %d ", mysql->options.protocol));
+    net->vio =
+        vio_new(sock, VIO_TYPE_SOCKET, VIO_LOCALHOST | VIO_BUFFERED_READ);
+    if (!net->vio) {
+      DBUG_PRINT("error", ("Unknow protocol %d ", mysql->options.protocol));
       set_mysql_error(mysql, CR_CONN_UNKNOW_PROTOCOL, unknown_sqlstate);
       closesocket(sock);
       goto error;
     }
 
-    host= LOCAL_HOST;
+    host = LOCAL_HOST;
     if (!unix_socket)
-      unix_socket= mysql_unix_port;
-    host_info= (char*) ER(CR_LOCALHOST_CONNECTION);
+      unix_socket = mysql_unix_port;
+    host_info = (char *)ER(CR_LOCALHOST_CONNECTION);
     DBUG_PRINT("info", ("Using UNIX sock '%s'", unix_socket));
 
     memset(&UNIXaddr, 0, sizeof(UNIXaddr));
-    UNIXaddr.sun_family= AF_UNIX;
-    strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path)-1);
+    UNIXaddr.sun_family = AF_UNIX;
+    strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path) - 1);
 
-    if (vio_socket_connect(net->vio, (struct sockaddr *) &UNIXaddr,
-                           sizeof(UNIXaddr), get_vio_connect_timeout(mysql)))
-    {
-      DBUG_PRINT("error",("Got error %d on connect to local server",
-			  socket_errno));
-      set_mysql_extended_error(mysql, CR_CONNECTION_ERROR,
-                               unknown_sqlstate,
-                               ER(CR_CONNECTION_ERROR),
-                               unix_socket, socket_errno);
+    if (vio_socket_connect(net->vio, (struct sockaddr *)&UNIXaddr,
+                           sizeof(UNIXaddr), get_vio_connect_timeout(mysql))) {
+      DBUG_PRINT("error",
+                 ("Got error %d on connect to local server", socket_errno));
+      set_mysql_extended_error(mysql, CR_CONNECTION_ERROR, unknown_sqlstate,
+                               ER(CR_CONNECTION_ERROR), unix_socket,
+                               socket_errno);
       vio_delete(net->vio);
-      net->vio= 0;
+      net->vio = 0;
       goto error;
     }
-    mysql->options.protocol=MYSQL_PROTOCOL_SOCKET;
+    mysql->options.protocol = MYSQL_PROTOCOL_SOCKET;
   }
 #elif defined(_WIN32)
-  if (!net->vio &&
-      (mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
-       (host && !strcmp(host,LOCAL_HOST_NAMEDPIPE)) ||
-       (! have_tcpip && (unix_socket || !host && is_NT()))))
-  {
-    hPipe= create_named_pipe(mysql, get_win32_connect_timeout(mysql),
-                             &host, &unix_socket);
+  if (!net->vio && (mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
+                    (host && !strcmp(host, LOCAL_HOST_NAMEDPIPE)) ||
+                    (!have_tcpip && (unix_socket || !host && is_NT())))) {
+    hPipe = create_named_pipe(mysql, get_win32_connect_timeout(mysql), &host,
+                              &unix_socket);
 
-    if (hPipe == INVALID_HANDLE_VALUE)
-    {
+    if (hPipe == INVALID_HANDLE_VALUE) {
       DBUG_PRINT("error",
-		 ("host: '%s'  socket: '%s'  have_tcpip: %d",
-		  host ? host : "<null>",
-		  unix_socket ? unix_socket : "<null>",
-		  (int) have_tcpip));
+                 ("host: '%s'  socket: '%s'  have_tcpip: %d",
+                  host ? host : "<null>", unix_socket ? unix_socket : "<null>",
+                  (int)have_tcpip));
       if (mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
-	  (host && !strcmp(host,LOCAL_HOST_NAMEDPIPE)) ||
-	  (unix_socket && !strcmp(unix_socket,MYSQL_NAMEDPIPE)))
-	goto error;
+          (host && !strcmp(host, LOCAL_HOST_NAMEDPIPE)) ||
+          (unix_socket && !strcmp(unix_socket, MYSQL_NAMEDPIPE)))
+        goto error;
       /* Try also with TCP/IP */
-    }
-    else
-    {
-      net->vio= vio_new_win32pipe(hPipe);
-      my_snprintf(host_info=buff, sizeof(buff)-1,
+    } else {
+      net->vio = vio_new_win32pipe(hPipe);
+      my_snprintf(host_info = buff, sizeof(buff) - 1,
                   ER(CR_NAMEDPIPE_CONNECTION), unix_socket);
     }
   }
 #endif
-  DBUG_PRINT("info", ("net->vio: %p  protocol: %d",
-                      net->vio, mysql->options.protocol));
-  if (!net->vio &&
-      (!mysql->options.protocol ||
-       mysql->options.protocol == MYSQL_PROTOCOL_TCP))
-  {
-    struct addrinfo *res_lst, *client_bind_ai_lst= NULL, hints, *t_res;
+  DBUG_PRINT("info",
+             ("net->vio: %p  protocol: %d", net->vio, mysql->options.protocol));
+  if (!net->vio && (!mysql->options.protocol ||
+                    mysql->options.protocol == MYSQL_PROTOCOL_TCP)) {
+    struct addrinfo *res_lst, *client_bind_ai_lst = NULL, hints, *t_res;
     char port_buf[NI_MAXSERV];
-    my_socket sock= SOCKET_ERROR;
-    int gai_errno, saved_error= 0, status= -1, bind_result= 0;
-    uint flags= VIO_BUFFERED_READ;
+    my_socket sock = SOCKET_ERROR;
+    int gai_errno, saved_error = 0, status = -1, bind_result = 0;
+    uint flags = VIO_BUFFERED_READ;
 
-    unix_socket=0;				/* This is not used */
+    unix_socket = 0; /* This is not used */
 
     if (!port)
-      port= mysql_port;
+      port = mysql_port;
 
     if (!host)
-      host= LOCAL_HOST;
+      host = LOCAL_HOST;
 
-    my_snprintf(host_info=buff, sizeof(buff)-1, ER(CR_TCP_CONNECTION), host);
-    DBUG_PRINT("info",("Server name: '%s'.  TCP sock: %d", host, port));
+    my_snprintf(host_info = buff, sizeof(buff) - 1, ER(CR_TCP_CONNECTION),
+                host);
+    DBUG_PRINT("info", ("Server name: '%s'.  TCP sock: %d", host, port));
 
     memset(&hints, 0, sizeof(hints));
-    hints.ai_socktype= SOCK_STREAM;
-    hints.ai_protocol= IPPROTO_TCP;
-    hints.ai_family= AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_family = AF_UNSPEC;
 
-    DBUG_PRINT("info",("IPV6 getaddrinfo %s", host));
+    DBUG_PRINT("info", ("IPV6 getaddrinfo %s", host));
     my_snprintf(port_buf, NI_MAXSERV, "%d", port);
-    gai_errno= getaddrinfo(host, port_buf, &hints, &res_lst);
+    gai_errno = getaddrinfo(host, port_buf, &hints, &res_lst);
 
-    if (gai_errno != 0) 
-    { 
-      /* 
+    if (gai_errno != 0) {
+      /*
         For DBUG we are keeping the right message but for client we default to
         historical error message.
       */
-      DBUG_PRINT("info",("IPV6 getaddrinfo error %d", gai_errno));
+      DBUG_PRINT("info", ("IPV6 getaddrinfo error %d", gai_errno));
       set_mysql_extended_error(mysql, CR_UNKNOWN_HOST, unknown_sqlstate,
                                ER(CR_UNKNOWN_HOST), host, errno);
 
@@ -4417,22 +4312,20 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     }
 
     /* Get address info for client bind name if it is provided */
-    if (mysql->options.ci.bind_address)
-    {
-      int bind_gai_errno= 0;
+    if (mysql->options.ci.bind_address) {
+      int bind_gai_errno = 0;
 
-      DBUG_PRINT("info",("Resolving addresses for client bind: '%s'",
-                         mysql->options.ci.bind_address));
+      DBUG_PRINT("info", ("Resolving addresses for client bind: '%s'",
+                          mysql->options.ci.bind_address));
       /* Lookup address info for name */
-      bind_gai_errno= getaddrinfo(mysql->options.ci.bind_address, 0,
-                                  &hints, &client_bind_ai_lst);
-      if (bind_gai_errno)
-      {
-        DBUG_PRINT("info",("client bind getaddrinfo error %d", bind_gai_errno));
-        set_mysql_extended_error(mysql, CR_UNKNOWN_HOST, unknown_sqlstate,
-                                 ER(CR_UNKNOWN_HOST),
-                                 mysql->options.ci.bind_address,
-                                 bind_gai_errno);
+      bind_gai_errno = getaddrinfo(mysql->options.ci.bind_address, 0, &hints,
+                                   &client_bind_ai_lst);
+      if (bind_gai_errno) {
+        DBUG_PRINT("info",
+                   ("client bind getaddrinfo error %d", bind_gai_errno));
+        set_mysql_extended_error(
+            mysql, CR_UNKNOWN_HOST, unknown_sqlstate, ER(CR_UNKNOWN_HOST),
+            mysql->options.ci.bind_address, bind_gai_errno);
 
         freeaddrinfo(res_lst);
         goto error;
@@ -4447,24 +4340,21 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       for the client-side bind hostname until the bind is successful.
     */
     DBUG_PRINT("info", ("Try connect on all addresses for host."));
-    for (t_res= res_lst; t_res; t_res= t_res->ai_next)
-    {
-      DBUG_PRINT("info", ("Create socket, family: %d  type: %d  proto: %d",
-                          t_res->ai_family, t_res->ai_socktype,
-                          t_res->ai_protocol));
+    for (t_res = res_lst; t_res; t_res = t_res->ai_next) {
+      DBUG_PRINT("info",
+                 ("Create socket, family: %d  type: %d  proto: %d",
+                  t_res->ai_family, t_res->ai_socktype, t_res->ai_protocol));
 
-      sock= socket(t_res->ai_family, t_res->ai_socktype, t_res->ai_protocol);
-      if (sock == SOCKET_ERROR)
-      {
+      sock = socket(t_res->ai_family, t_res->ai_socktype, t_res->ai_protocol);
+      if (sock == SOCKET_ERROR) {
         DBUG_PRINT("info", ("Socket created was invalid"));
         /* Try next address if there is one */
-        saved_error= socket_errno;
+        saved_error = socket_errno;
         continue;
       }
 
-      if (client_bind_ai_lst)
-      {
-        struct addrinfo* curr_bind_ai= NULL;
+      if (client_bind_ai_lst) {
+        struct addrinfo *curr_bind_ai = NULL;
         DBUG_PRINT("info", ("Attempting to bind socket to bind address(es)"));
 
         /*
@@ -4473,30 +4363,27 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
            If none works, we'll try the next destination host address
            (if any)
         */
-        curr_bind_ai= client_bind_ai_lst;
+        curr_bind_ai = client_bind_ai_lst;
 
-        while (curr_bind_ai != NULL)
-        {
+        while (curr_bind_ai != NULL) {
           /* Attempt to bind the socket to the given address */
-          bind_result= bind(sock,
-                            curr_bind_ai->ai_addr,
-                            curr_bind_ai->ai_addrlen);
+          bind_result =
+              bind(sock, curr_bind_ai->ai_addr, curr_bind_ai->ai_addrlen);
           if (!bind_result)
-            break;   /* Success */
+            break; /* Success */
 
           DBUG_PRINT("info", ("bind failed, attempting another bind address"));
           /* Problem with the bind, move to next address if present */
-          curr_bind_ai= curr_bind_ai->ai_next;
+          curr_bind_ai = curr_bind_ai->ai_next;
         }
 
-        if (bind_result)
-        {
+        if (bind_result) {
           /*
             Could not bind to any client-side address with this destination
              Try the next destination address (if any)
           */
           DBUG_PRINT("info", ("All bind attempts with this address failed"));
-          saved_error= socket_errno;
+          saved_error = socket_errno;
           closesocket(sock);
           continue;
         }
@@ -4504,10 +4391,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       }
 
       /* Create a new Vio object to abstract the socket. */
-      if (!net->vio)
-      {
-        if (!(net->vio= vio_new(sock, VIO_TYPE_TCPIP, flags)))
-        {
+      if (!net->vio) {
+        if (!(net->vio = vio_new(sock, VIO_TYPE_TCPIP, flags))) {
           set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
           closesocket(sock);
           freeaddrinfo(res_lst);
@@ -4517,8 +4402,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
         }
       }
       /* Just reinitialize if one is already allocated. */
-      else if (vio_reset(net->vio, VIO_TYPE_TCPIP, sock, NULL, flags))
-      {
+      else if (vio_reset(net->vio, VIO_TYPE_TCPIP, sock, NULL, flags)) {
         set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
         closesocket(sock);
         freeaddrinfo(res_lst);
@@ -4528,9 +4412,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       }
 
       DBUG_PRINT("info", ("Connect socket"));
-      status= vio_socket_connect(net->vio, t_res->ai_addr,
-                                 (socklen_t)t_res->ai_addrlen,
-                                 get_vio_connect_timeout(mysql));
+      status = vio_socket_connect(net->vio, t_res->ai_addr,
+                                  (socklen_t)t_res->ai_addrlen,
+                                  get_vio_connect_timeout(mysql));
       /*
         Here we rely on vio_socket_connect() to return success only if
         the connect attempt was really successful. Otherwise we would
@@ -4544,7 +4428,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
         the failed vio_connection operation. It is necessary to
         avoid having it overwritten by later operations.
       */
-      saved_error= socket_errno;
+      saved_error = socket_errno;
 
       DBUG_PRINT("info", ("No success, try next address."));
     }
@@ -4556,38 +4440,35 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     if (client_bind_ai_lst)
       freeaddrinfo(client_bind_ai_lst);
 
-    if (sock == SOCKET_ERROR)
-    {
+    if (sock == SOCKET_ERROR) {
       set_mysql_extended_error(mysql, CR_IPSOCK_ERROR, unknown_sqlstate,
-                                ER(CR_IPSOCK_ERROR), saved_error);
+                               ER(CR_IPSOCK_ERROR), saved_error);
       goto error;
     }
 
-    if (status)
-    {
-      DBUG_PRINT("error",("Got error %d on connect to '%s'", saved_error, host));
+    if (status) {
+      DBUG_PRINT("error",
+                 ("Got error %d on connect to '%s'", saved_error, host));
       set_mysql_extended_error(mysql, CR_CONN_HOST_ERROR, unknown_sqlstate,
-                                ER(CR_CONN_HOST_ERROR), host, saved_error);
+                               ER(CR_CONN_HOST_ERROR), host, saved_error);
       goto error;
     }
   }
 
   DBUG_PRINT("info", ("net->vio: %p", net->vio));
-  if (!net->vio)
-  {
-    DBUG_PRINT("error",("Unknow protocol %d ",mysql->options.protocol));
+  if (!net->vio) {
+    DBUG_PRINT("error", ("Unknow protocol %d ", mysql->options.protocol));
     set_mysql_error(mysql, CR_CONN_UNKNOW_PROTOCOL, unknown_sqlstate);
     goto error;
   }
 
-  if (my_net_init(net, net->vio))
-  {
+  if (my_net_init(net, net->vio)) {
     vio_delete(net->vio);
     net->vio = 0;
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     goto error;
   }
-  vio_keepalive(net->vio,TRUE);
+  vio_keepalive(net->vio, TRUE);
 
   /* If user set read_timeout, let it override the default */
   if (mysql->options.read_timeout)
@@ -4598,21 +4479,19 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     my_net_set_write_timeout(net, mysql->options.write_timeout);
 
   if (mysql->options.max_allowed_packet)
-    net->max_packet_size= mysql->options.max_allowed_packet;
+    net->max_packet_size = mysql->options.max_allowed_packet;
 
   MYSQL_TRACE(CONNECTED, mysql, ());
   MYSQL_TRACE_STAGE(mysql, WAIT_FOR_INIT_PACKET);
 
   /* Get version info */
-  mysql->protocol_version= PROTOCOL_VERSION;	/* Assume this */
+  mysql->protocol_version = PROTOCOL_VERSION; /* Assume this */
   if (mysql->options.connect_timeout &&
       (vio_io_wait(net->vio, VIO_IO_EVENT_READ,
-                   get_vio_connect_timeout(mysql)) < 1))
-  {
-    set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
-                             ER(CR_SERVER_LOST_EXTENDED),
-                             "waiting for initial communication packet",
-                             socket_errno);
+                   get_vio_connect_timeout(mysql)) < 1)) {
+    set_mysql_extended_error(
+        mysql, CR_SERVER_LOST, unknown_sqlstate, ER(CR_SERVER_LOST_EXTENDED),
+        "waiting for initial communication packet", socket_errno);
     goto error;
   }
 
@@ -4621,87 +4500,77 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
   */
   DBUG_PRINT("info", ("Read first packet."));
 
-  if ((pkt_length=cli_safe_read(mysql, NULL)) == packet_error)
-  {
+  if ((pkt_length = cli_safe_read(mysql, NULL)) == packet_error) {
     if (mysql->net.last_errno == CR_SERVER_LOST)
-      set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
-                               ER(CR_SERVER_LOST_EXTENDED),
-                               "reading initial communication packet",
-                               socket_errno);
+      set_mysql_extended_error(
+          mysql, CR_SERVER_LOST, unknown_sqlstate, ER(CR_SERVER_LOST_EXTENDED),
+          "reading initial communication packet", socket_errno);
     goto error;
   }
-  pkt_end= (char*)net->read_pos + pkt_length;
+  pkt_end = (char *)net->read_pos + pkt_length;
   /* Check if version of protocol matches current one */
-  mysql->protocol_version= net->read_pos[0];
-  DBUG_DUMP("packet",(uchar*) net->read_pos,10);
-  DBUG_PRINT("info",("mysql protocol version %d, server=%d",
-		     PROTOCOL_VERSION, mysql->protocol_version));
-  if (mysql->protocol_version != PROTOCOL_VERSION)
-  {
+  mysql->protocol_version = net->read_pos[0];
+  DBUG_DUMP("packet", (uchar *)net->read_pos, 10);
+  DBUG_PRINT("info", ("mysql protocol version %d, server=%d", PROTOCOL_VERSION,
+                      mysql->protocol_version));
+  if (mysql->protocol_version != PROTOCOL_VERSION) {
     set_mysql_extended_error(mysql, CR_VERSION_ERROR, unknown_sqlstate,
                              ER(CR_VERSION_ERROR), mysql->protocol_version,
                              PROTOCOL_VERSION);
     goto error;
   }
-  server_version_end= end= strend((char*) net->read_pos+1);
-  mysql->thread_id=uint4korr((uchar*) end + 1);
-  end+=5;
-  /* 
+  server_version_end = end = strend((char *)net->read_pos + 1);
+  mysql->thread_id = uint4korr((uchar *)end + 1);
+  end += 5;
+  /*
     Scramble is split into two parts because old clients do not understand
     long scrambles; here goes the first part.
   */
-  scramble_data= end;
-  scramble_data_len= AUTH_PLUGIN_DATA_PART_1_LENGTH + 1;
-  scramble_plugin= NULL;
-  end+= scramble_data_len;
+  scramble_data = end;
+  scramble_data_len = AUTH_PLUGIN_DATA_PART_1_LENGTH + 1;
+  scramble_plugin = NULL;
+  end += scramble_data_len;
 
   if (pkt_end >= end + 1)
-    mysql->server_capabilities=uint2korr((uchar*) end);
-  if (pkt_end >= end + 18)
-  {
+    mysql->server_capabilities = uint2korr((uchar *)end);
+  if (pkt_end >= end + 18) {
     /* New protocol with 16 bytes to describe server characteristics */
-    mysql->server_language=end[2];
-    mysql->server_status=uint2korr((uchar*) end + 3);
-    mysql->server_capabilities|= uint2korr((uchar*) end + 5) << 16;
-    pkt_scramble_len= end[7];
-    if (pkt_scramble_len < 0)
-    {
+    mysql->server_language = end[2];
+    mysql->server_status = uint2korr((uchar *)end + 3);
+    mysql->server_capabilities |= uint2korr((uchar *)end + 5) << 16;
+    pkt_scramble_len = end[7];
+    if (pkt_scramble_len < 0) {
       set_mysql_error(mysql, CR_MALFORMED_PACKET,
-                      unknown_sqlstate);        /* purecov: inspected */
+                      unknown_sqlstate); /* purecov: inspected */
       goto error;
     }
   }
-  end+= 18;
+  end += 18;
 
   if (mysql_init_character_set(mysql))
     goto error;
 
   /* Save connection information */
-  if (!my_multi_malloc(key_memory_MYSQL,
-                       MYF(0),
-		       &mysql->host_info, (uint) strlen(host_info)+1,
-		       &mysql->host,      (uint) strlen(host)+1,
-		       &mysql->unix_socket,unix_socket ?
-		       (uint) strlen(unix_socket)+1 : (uint) 1,
-		       &mysql->server_version,
-		       (uint) (server_version_end - (char*) net->read_pos + 1),
-		       NullS) ||
-      !(mysql->user=my_strdup(key_memory_MYSQL,
-                              user,MYF(0))) ||
-      !(mysql->passwd=my_strdup(key_memory_MYSQL,
-                                passwd,MYF(0))))
-  {
+  if (!my_multi_malloc(key_memory_MYSQL, MYF(0), &mysql->host_info,
+                       (uint)strlen(host_info) + 1, &mysql->host,
+                       (uint)strlen(host) + 1, &mysql->unix_socket,
+                       unix_socket ? (uint)strlen(unix_socket) + 1 : (uint)1,
+                       &mysql->server_version,
+                       (uint)(server_version_end - (char *)net->read_pos + 1),
+                       NullS) ||
+      !(mysql->user = my_strdup(key_memory_MYSQL, user, MYF(0))) ||
+      !(mysql->passwd = my_strdup(key_memory_MYSQL, passwd, MYF(0)))) {
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     goto error;
   }
-  my_stpcpy(mysql->host_info,host_info);
-  my_stpcpy(mysql->host,host);
+  my_stpcpy(mysql->host_info, host_info);
+  my_stpcpy(mysql->host, host);
   if (unix_socket)
-    my_stpcpy(mysql->unix_socket,unix_socket);
+    my_stpcpy(mysql->unix_socket, unix_socket);
   else
-    mysql->unix_socket=0;
-  my_stpcpy(mysql->server_version,(char*) net->read_pos+1);
-  mysql->port=port;
+    mysql->unix_socket = 0;
+  my_stpcpy(mysql->server_version, (char *)net->read_pos + 1);
+  mysql->port = port;
 
   if (pkt_end >= end + SCRAMBLE_LENGTH - AUTH_PLUGIN_DATA_PART_1_LENGTH + 1)
 
@@ -4713,22 +4582,29 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     */
     memmove(end - AUTH_PLUGIN_DATA_PART_1_LENGTH, scramble_data,
             AUTH_PLUGIN_DATA_PART_1_LENGTH);
-    scramble_data= end - AUTH_PLUGIN_DATA_PART_1_LENGTH;
-    if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH)
-    {
-      scramble_data_len= pkt_scramble_len;
-      scramble_plugin= scramble_data + scramble_data_len;
-      if (scramble_data + scramble_data_len > pkt_end)
-        scramble_data_len= (int)(pkt_end - scramble_data);
-    }
-    else
-    {
-      scramble_data_len= (int)(pkt_end - scramble_data);
-      scramble_plugin= native_password_plugin_name;
+    scramble_data = end - AUTH_PLUGIN_DATA_PART_1_LENGTH;
+    if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH) {
+      scramble_data_len = pkt_scramble_len;
+      scramble_plugin = scramble_data + scramble_data_len;
+      /*
+       There is a possibility that we did not get a correct plugin name
+       for some reason. For example, the packet was malformed and some
+       of the fields had incorrect values. In such cases, we keep the
+       plugin name empty so that the default authentication plugin
+       gets used later on. Since we don't really know the plugin for which
+       the scramble_data was prepared, we can discard it and set it's length
+       to 0.
+      */
+      if (scramble_data + scramble_data_len > pkt_end) {
+        scramble_plugin = (char*)"";
+        scramble_data = 0;
+        scramble_data_len = 0;
+      }
+    } else {
+      scramble_data_len = (int)(pkt_end - scramble_data);
+      scramble_plugin = native_password_plugin_name;
     }
-  }
-  else
-  {
+  } else {
     set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
     goto error;
   }
@@ -4736,13 +4612,12 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
   MYSQL_TRACE(INIT_PACKET_RECEIVED, mysql, (pkt_length, net->read_pos));
   MYSQL_TRACE_STAGE(mysql, AUTHENTICATE);
 
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
   if ((mysql->options.extension &&
        mysql->options.extension->ssl_mode <= SSL_MODE_PREFERRED) &&
       (mysql->options.protocol == MYSQL_PROTOCOL_MEMORY ||
-       mysql->options.protocol == MYSQL_PROTOCOL_PIPE))
-  {
-    mysql->options.extension->ssl_mode= SSL_MODE_DISABLED;
+       mysql->options.protocol == MYSQL_PROTOCOL_PIPE)) {
+    mysql->options.extension->ssl_mode = SSL_MODE_DISABLED;
   }
 #endif
   /* try and bring up SSL if possible */
@@ -4753,22 +4628,17 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     to attempt TLS connection. This would prevent a possible
     overwrite through my_net_write.
   */
-  if (scramble_data_len &&
-      mysql->options.extension &&
-      mysql->options.extension->ssl_mode != SSL_MODE_DISABLED)
-  {
-    if (!(scramble_buffer= (char *) my_malloc(key_memory_MYSQL_HANDSHAKE,
-                                              scramble_data_len, MYF(MY_WME))))
-    {
+  if (scramble_data_len && mysql->options.extension &&
+      mysql->options.extension->ssl_mode != SSL_MODE_DISABLED) {
+    if (!(scramble_buffer = (char *)my_malloc(
+              key_memory_MYSQL_HANDSHAKE, scramble_data_len, MYF(MY_WME)))) {
       set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
       goto error;
     }
-    scramble_buffer_allocated= TRUE;
+    scramble_buffer_allocated = TRUE;
     memcpy(scramble_buffer, scramble_data, scramble_data_len);
-  }
-  else
-  {
-    scramble_buffer= scramble_data;
+  } else {
+    scramble_buffer = scramble_data;
   }
 
   if (cli_establish_ssl(mysql))
@@ -4782,9 +4652,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
                       scramble_plugin, db))
     goto error;
 
-  if (scramble_buffer_allocated == TRUE)
-  {
-    scramble_buffer_allocated= FALSE;
+  if (scramble_buffer_allocated == TRUE) {
+    scramble_buffer_allocated = FALSE;
     my_free(scramble_buffer);
   }
 
@@ -4794,69 +4663,62 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     Part 3: authenticated, finish the initialization of the connection
   */
 
-  if (mysql->client_flag & CLIENT_COMPRESS)      /* We will use compression */
-    net->compress=1;
+  if (mysql->client_flag & CLIENT_COMPRESS) /* We will use compression */
+    net->compress = 1;
 
-#ifdef CHECK_LICENSE 
+#ifdef CHECK_LICENSE
   if (check_license(mysql))
     goto error;
 #endif
 
-  if (db && !mysql->db && mysql_select_db(mysql, db))
-  {
+  if (db && !mysql->db && mysql_select_db(mysql, db)) {
     if (mysql->net.last_errno == CR_SERVER_LOST)
-        set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
-                                 ER(CR_SERVER_LOST_EXTENDED),
-                                 "Setting intital database",
-                                 errno);
+      set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
+                               ER(CR_SERVER_LOST_EXTENDED),
+                               "Setting intital database", errno);
     goto error;
   }
 
-  /*
-     Using init_commands is not supported when connecting from within the
-     server.
-  */
+    /*
+       Using init_commands is not supported when connecting from within the
+       server.
+    */
 #ifndef MYSQL_SERVER
-  if (mysql->options.init_commands)
-  {
-    DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
-    char **ptr= (char**)init_commands->buffer;
-    char **end_command= ptr + init_commands->elements;
+  if (mysql->options.init_commands) {
+    DYNAMIC_ARRAY *init_commands = mysql->options.init_commands;
+    char **ptr = (char **)init_commands->buffer;
+    char **end_command = ptr + init_commands->elements;
 
-    my_bool reconnect=mysql->reconnect;
-    mysql->reconnect=0;
+    my_bool reconnect = mysql->reconnect;
+    mysql->reconnect = 0;
 
-    for (; ptr < end_command; ptr++)
-    {
+    for (; ptr < end_command; ptr++) {
       int status;
 
-      if (mysql_real_query(mysql,*ptr, (ulong) strlen(*ptr)))
-	goto error;
+      if (mysql_real_query(mysql, *ptr, (ulong)strlen(*ptr)))
+        goto error;
 
       do {
-        if (mysql->fields)
-        {
+        if (mysql->fields) {
           MYSQL_RES *res;
-          if (!(res= cli_use_result(mysql)))
+          if (!(res = cli_use_result(mysql)))
             goto error;
           mysql_free_result(res);
         }
-        if ((status= mysql_next_result(mysql)) > 0)
+        if ((status = mysql_next_result(mysql)) > 0)
           goto error;
       } while (status == 0);
     }
-    mysql->reconnect=reconnect;
+    mysql->reconnect = reconnect;
   }
 #endif
 
-  DBUG_PRINT("exit", ("Mysql handler: 0x%lx", (long) mysql));
+  DBUG_PRINT("exit", ("Mysql handler: 0x%lx", (long)mysql));
   DBUG_RETURN(mysql);
 
 error:
-  DBUG_PRINT("error",("message: %u/%s (%s)",
-                      net->last_errno,
-                      net->sqlstate,
-                      net->last_error));
+  DBUG_PRINT("error", ("message: %u/%s (%s)", net->last_errno, net->sqlstate,
+                       net->last_error));
   {
     /* Free alloced memory */
     end_server(mysql);
@@ -4869,96 +4731,85 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
   DBUG_RETURN(0);
 }
 
-
-my_bool mysql_reconnect(MYSQL *mysql)
-{
+my_bool mysql_reconnect(MYSQL *mysql) {
   MYSQL tmp_mysql;
   DBUG_ENTER("mysql_reconnect");
-  DBUG_ASSERT(mysql);
+  assert(mysql);
   DBUG_PRINT("enter", ("mysql->reconnect: %d", mysql->reconnect));
 
-  if (!mysql->reconnect ||
-      (mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info)
-  {
+  if (!mysql->reconnect || (mysql->server_status & SERVER_STATUS_IN_TRANS) ||
+      !mysql->host_info) {
     /* Allow reconnect next time */
-    mysql->server_status&= ~SERVER_STATUS_IN_TRANS;
+    mysql->server_status &= ~SERVER_STATUS_IN_TRANS;
     set_mysql_error(mysql, CR_SERVER_GONE_ERROR, unknown_sqlstate);
     DBUG_RETURN(1);
   }
   mysql_init(&tmp_mysql);
   mysql_close_free_options(&tmp_mysql);
-  tmp_mysql.options= mysql->options;
-  tmp_mysql.options.my_cnf_file= tmp_mysql.options.my_cnf_group= 0;
+  tmp_mysql.options = mysql->options;
+  tmp_mysql.options.my_cnf_file = tmp_mysql.options.my_cnf_group = 0;
 
-  if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
-			  mysql->db, mysql->port, mysql->unix_socket,
-			  mysql->client_flag | CLIENT_REMEMBER_OPTIONS))
-  {
+  if (!mysql_real_connect(&tmp_mysql, mysql->host, mysql->user, mysql->passwd,
+                          mysql->db, mysql->port, mysql->unix_socket,
+                          mysql->client_flag | CLIENT_REMEMBER_OPTIONS)) {
     memset(&tmp_mysql.options, 0, sizeof(tmp_mysql.options));
     mysql_close(&tmp_mysql);
-    mysql->net.last_errno= tmp_mysql.net.last_errno;
+    mysql->net.last_errno = tmp_mysql.net.last_errno;
     my_stpcpy(mysql->net.last_error, tmp_mysql.net.last_error);
     my_stpcpy(mysql->net.sqlstate, tmp_mysql.net.sqlstate);
     DBUG_RETURN(1);
   }
-  if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname))
-  {
+  if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname)) {
     DBUG_PRINT("error", ("mysql_set_character_set() failed"));
     memset(&tmp_mysql.options, 0, sizeof(tmp_mysql.options));
     mysql_close(&tmp_mysql);
-    mysql->net.last_errno= tmp_mysql.net.last_errno;
+    mysql->net.last_errno = tmp_mysql.net.last_errno;
     my_stpcpy(mysql->net.last_error, tmp_mysql.net.last_error);
     my_stpcpy(mysql->net.sqlstate, tmp_mysql.net.sqlstate);
     DBUG_RETURN(1);
   }
 
   DBUG_PRINT("info", ("reconnect succeded"));
-  tmp_mysql.reconnect= 1;
-  tmp_mysql.free_me= mysql->free_me;
+  tmp_mysql.reconnect = 1;
+  tmp_mysql.free_me = mysql->free_me;
 
   /* Move prepared statements (if any) over to the new mysql object */
-  tmp_mysql.stmts= mysql->stmts;
-  mysql->stmts= 0;
+  tmp_mysql.stmts = mysql->stmts;
+  mysql->stmts = 0;
 
   /* Don't free options as these are now used in tmp_mysql */
   memset(&mysql->options, 0, sizeof(mysql->options));
-  mysql->free_me=0;
+  mysql->free_me = 0;
   mysql_close(mysql);
-  *mysql=tmp_mysql;
+  *mysql = tmp_mysql;
   net_clear(&mysql->net, 1);
-  mysql->affected_rows= ~(my_ulonglong) 0;
+  mysql->affected_rows = ~(my_ulonglong)0;
   DBUG_RETURN(0);
 }
 
-
 /**************************************************************************
   Set current database
 **************************************************************************/
 
-int STDCALL
-mysql_select_db(MYSQL *mysql, const char *db)
-{
+int STDCALL mysql_select_db(MYSQL *mysql, const char *db) {
   int error;
   DBUG_ENTER("mysql_select_db");
-  DBUG_PRINT("enter",("db: '%s'",db));
+  DBUG_PRINT("enter", ("db: '%s'", db));
 
-  if ((error=simple_command(mysql,COM_INIT_DB, (const uchar*) db,
-                            (ulong) strlen(db),0)))
+  if ((error = simple_command(mysql, COM_INIT_DB, (const uchar *)db,
+                              (ulong)strlen(db), 0)))
     DBUG_RETURN(error);
   my_free(mysql->db);
-  mysql->db=my_strdup(key_memory_MYSQL,
-                      db,MYF(MY_WME));
+  mysql->db = my_strdup(key_memory_MYSQL, db, MYF(MY_WME));
   DBUG_RETURN(0);
 }
 
-
 /*************************************************************************
   Send a QUIT to the server and close the connection
   If handle is alloced by mysql connect free it.
 *************************************************************************/
 
-void mysql_close_free_options(MYSQL *mysql)
-{
+void mysql_close_free_options(MYSQL *mysql) {
   DBUG_ENTER("mysql_close_free_options");
 
   my_free(mysql->options.user);
@@ -4972,12 +4823,11 @@ void mysql_close_free_options(MYSQL *mysql)
   my_free(mysql->options.charset_name);
   my_free(mysql->options.ci.client_ip);
   /* ci.bind_adress is union with client_ip, already freed above */
-  if (mysql->options.init_commands)
-  {
-    DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
-    char **ptr= (char**)init_commands->buffer;
-    char **end= ptr + init_commands->elements;
-    for (; ptr<end; ptr++)
+  if (mysql->options.init_commands) {
+    DYNAMIC_ARRAY *init_commands = mysql->options.init_commands;
+    char **ptr = (char **)init_commands->buffer;
+    char **end = ptr + init_commands->elements;
+    for (; ptr < end; ptr++)
       my_free(*ptr);
     delete_dynamic(init_commands);
     my_free(init_commands);
@@ -4985,12 +4835,11 @@ void mysql_close_free_options(MYSQL *mysql)
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   mysql_ssl_free(mysql);
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
   if (mysql->options.shared_memory_base_name != def_shared_memory_base_name)
     my_free(mysql->options.shared_memory_base_name);
 #endif /* _WIN32 && !EMBEDDED_LIBRARY */
-  if (mysql->options.extension)
-  {
+  if (mysql->options.extension) {
     my_free(mysql->options.extension->plugin_dir);
     my_free(mysql->options.extension->default_auth);
     my_free(mysql->options.extension->server_public_key_path);
@@ -5001,14 +4850,12 @@ void mysql_close_free_options(MYSQL *mysql)
   DBUG_VOID_RETURN;
 }
 
-
 /*
   Free all memory allocated in a MYSQL handle but preserve
   current options if any.
 */
 
-void mysql_close_free(MYSQL *mysql)
-{
+void mysql_close_free(MYSQL *mysql) {
   my_free(mysql->host_info);
   my_free(mysql->user);
   my_free(mysql->passwd);
@@ -5019,19 +4866,18 @@ void mysql_close_free(MYSQL *mysql)
     mysql_extension_free(mysql->extension);
 
   my_free(mysql->info_buffer);
-  mysql->info_buffer= 0;
+  mysql->info_buffer = 0;
 
   /* Clear pointers for better safety */
-  mysql->host_info= NULL;
-  mysql->user= NULL;
-  mysql->passwd= NULL;
-  mysql->db= NULL;
-  mysql->extension= NULL;
+  mysql->host_info = NULL;
+  mysql->user = NULL;
+  mysql->passwd = NULL;
+  mysql->db = NULL;
+  mysql->extension = NULL;
 }
 
-
 /**
-  For use when the connection to the server has been lost (in which case 
+  For use when the connection to the server has been lost (in which case
   the server has discarded all information about prepared statements
   associated with the connection).
 
@@ -5045,34 +4891,28 @@ void mysql_close_free(MYSQL *mysql)
 
   @return none
 */
-static void mysql_prune_stmt_list(MYSQL *mysql)
-{
-  LIST *pruned_list= NULL;
+static void mysql_prune_stmt_list(MYSQL *mysql) {
+  LIST *pruned_list = NULL;
 
-  while(mysql->stmts)
-  {
-    LIST *element= mysql->stmts;
+  while (mysql->stmts) {
+    LIST *element = mysql->stmts;
     MYSQL_STMT *stmt;
 
-    mysql->stmts= list_delete(element, element);
-    stmt= (MYSQL_STMT *) element->data;
-    if (stmt->state != MYSQL_STMT_INIT_DONE)
-    {
-      stmt->mysql= 0;
-      stmt->last_errno= CR_SERVER_LOST;
+    mysql->stmts = list_delete(element, element);
+    stmt = (MYSQL_STMT *)element->data;
+    if (stmt->state != MYSQL_STMT_INIT_DONE) {
+      stmt->mysql = 0;
+      stmt->last_errno = CR_SERVER_LOST;
       my_stpcpy(stmt->last_error, ER(CR_SERVER_LOST));
       my_stpcpy(stmt->sqlstate, unknown_sqlstate);
-    }
-    else
-    {
-      pruned_list= list_add(pruned_list, element);
+    } else {
+      pruned_list = list_add(pruned_list, element);
     }
   }
 
-  mysql->stmts= pruned_list;
+  mysql->stmts = pruned_list;
 }
 
-
 /*
   Clear connection pointer of every statement: this is necessary
   to give error on attempt to use a prepared statement of closed
@@ -5089,41 +4929,36 @@ static void mysql_prune_stmt_list(MYSQL *mysql)
 */
 
 void mysql_detach_stmt_list(LIST **stmt_list MY_ATTRIBUTE((unused)),
-                            const char *func_name MY_ATTRIBUTE((unused)))
-{
+                            const char *func_name MY_ATTRIBUTE((unused))) {
 #ifdef MYSQL_CLIENT
   /* Reset connection handle in all prepared statements. */
-  LIST *element= *stmt_list;
+  LIST *element = *stmt_list;
   char buff[MYSQL_ERRMSG_SIZE];
   DBUG_ENTER("mysql_detach_stmt_list");
 
-  my_snprintf(buff, sizeof(buff)-1, ER(CR_STMT_CLOSED), func_name);
-  for (; element; element= element->next)
-  {
-    MYSQL_STMT *stmt= (MYSQL_STMT *) element->data;
+  my_snprintf(buff, sizeof(buff) - 1, ER(CR_STMT_CLOSED), func_name);
+  for (; element; element = element->next) {
+    MYSQL_STMT *stmt = (MYSQL_STMT *)element->data;
     set_stmt_error(stmt, CR_STMT_CLOSED, unknown_sqlstate, buff);
-    stmt->mysql= 0;
+    stmt->mysql = 0;
     /* No need to call list_delete for statement here */
   }
-  *stmt_list= 0;
+  *stmt_list = 0;
   DBUG_VOID_RETURN;
 #endif /* MYSQL_CLIENT */
 }
 
-
-void STDCALL mysql_close(MYSQL *mysql)
-{
+void STDCALL mysql_close(MYSQL *mysql) {
   DBUG_ENTER("mysql_close");
-  if (mysql)					/* Some simple safety */
+  if (mysql) /* Some simple safety */
   {
     /* If connection is still up, send a QUIT message */
-    if (mysql->net.vio != 0)
-    {
+    if (mysql->net.vio != 0) {
       free_old_query(mysql);
-      mysql->status=MYSQL_STATUS_READY; /* Force command */
-      simple_command(mysql,COM_QUIT,(uchar*) 0,0,1);
-      mysql->reconnect=0;
-      end_server(mysql);			/* Sets mysql->net.vio= 0 */
+      mysql->status = MYSQL_STATUS_READY; /* Force command */
+      simple_command(mysql, COM_QUIT, (uchar *)0, 0, 1);
+      mysql->reconnect = 0;
+      end_server(mysql); /* Sets mysql->net.vio= 0 */
     }
     mysql_close_free_options(mysql);
     mysql_close_free(mysql);
@@ -5138,9 +4973,7 @@ void STDCALL mysql_close(MYSQL *mysql)
   DBUG_VOID_RETURN;
 }
 
-
-static my_bool cli_read_query_result(MYSQL *mysql)
-{
+static my_bool cli_read_query_result(MYSQL *mysql) {
   uchar *pos;
   ulong field_count;
   ulong length;
@@ -5148,13 +4981,12 @@ static my_bool cli_read_query_result(MYSQL *mysql)
 
   if ((length = cli_safe_read(mysql, NULL)) == packet_error)
     DBUG_RETURN(1);
-  free_old_query(mysql);		/* Free old result */
-#ifdef MYSQL_CLIENT			/* Avoid warn of unused labels*/
+  free_old_query(mysql); /* Free old result */
+#ifdef MYSQL_CLIENT      /* Avoid warn of unused labels*/
 get_info:
 #endif
-  pos=(uchar*) mysql->net.read_pos;
-  if ((field_count= net_field_length(&pos)) == 0)
-  {
+  pos = (uchar *)mysql->net.read_pos;
+  if ((field_count = net_field_length(&pos)) == 0) {
     read_ok_ex(mysql, length);
 #if defined(CLIENT_PROTOCOL_TRACING)
     if (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
@@ -5165,138 +4997,123 @@ static my_bool cli_read_query_result(MYSQL *mysql)
     DBUG_RETURN(0);
   }
 #ifdef MYSQL_CLIENT
-  if (field_count == NULL_LENGTH)		/* LOAD DATA LOCAL INFILE */
+  if (field_count == NULL_LENGTH) /* LOAD DATA LOCAL INFILE */
   {
     int error;
 
     MYSQL_TRACE_STAGE(mysql, FILE_REQUEST);
 
-    if (!(mysql->options.client_flag & CLIENT_LOCAL_FILES))
-    {
+    if (!(mysql->options.client_flag & CLIENT_LOCAL_FILES)) {
       set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
       DBUG_RETURN(1);
-    }   
+    }
 
-    error= handle_local_infile(mysql,(char*) pos);
+    error = handle_local_infile(mysql, (char *)pos);
 
     MYSQL_TRACE_STAGE(mysql, WAIT_FOR_RESULT);
 
-    if ((length= cli_safe_read(mysql, NULL)) == packet_error || error)
+    if ((length = cli_safe_read(mysql, NULL)) == packet_error || error)
       DBUG_RETURN(1);
-    goto get_info;				/* Get info packet */
+    goto get_info; /* Get info packet */
   }
 #endif
   if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
-    mysql->server_status|= SERVER_STATUS_IN_TRANS;
+    mysql->server_status |= SERVER_STATUS_IN_TRANS;
 
   MYSQL_TRACE_STAGE(mysql, WAIT_FOR_FIELD_DEF);
 
-  if (!(mysql->fields=cli_read_metadata(mysql, field_count, protocol_41(mysql) ? 7:5)))
-  {
-    free_root(&mysql->field_alloc,MYF(0));
+  if (!(mysql->fields = cli_read_metadata(mysql, field_count,
+                                          protocol_41(mysql) ? 7 : 5))) {
+    free_root(&mysql->field_alloc, MYF(0));
     DBUG_RETURN(1);
   }
-  mysql->status= MYSQL_STATUS_GET_RESULT;
-  mysql->field_count= (uint) field_count;
+  mysql->status = MYSQL_STATUS_GET_RESULT;
+  mysql->field_count = (uint)field_count;
 
   MYSQL_TRACE_STAGE(mysql, WAIT_FOR_ROW);
 
-  DBUG_PRINT("exit",("ok"));
+  DBUG_PRINT("exit", ("ok"));
   DBUG_RETURN(0);
 }
 
-
 /*
   Send the query and return so we can do something else.
   Needs to be followed by mysql_read_query_result() when we want to
   finish processing it.
 */
 
-int STDCALL
-mysql_send_query(MYSQL* mysql, const char* query, ulong length)
-{
+int STDCALL mysql_send_query(MYSQL *mysql, const char *query, ulong length) {
   STATE_INFO *info;
 
   DBUG_ENTER("mysql_send_query");
 
-  if ((info= STATE_DATA(mysql)))
+  if ((info = STATE_DATA(mysql)))
     free_state_change_info(mysql->extension);
 
-  DBUG_RETURN(simple_command(mysql, COM_QUERY, (uchar*) query, length, 1));
+  DBUG_RETURN(simple_command(mysql, COM_QUERY, (uchar *)query, length, 1));
 }
 
-
-int STDCALL
-mysql_real_query(MYSQL *mysql, const char *query, ulong length)
-{
+int STDCALL mysql_real_query(MYSQL *mysql, const char *query, ulong length) {
   int retval;
   DBUG_ENTER("mysql_real_query");
-  DBUG_PRINT("enter",("handle: %p", mysql));
-  DBUG_PRINT("query",("Query = '%-.*s'", (int) length, query));
-  DBUG_EXECUTE_IF("inject_ER_NET_READ_INTERRUPTED",
-                  {
-                    mysql->net.last_errno= ER_NET_READ_INTERRUPTED;
-                    DBUG_SET("-d,inject_ER_NET_READ_INTERRUPTED");
-                    DBUG_RETURN(1);
-                  });
-
-  if (mysql_send_query(mysql,query,length))
+  DBUG_PRINT("enter", ("handle: %p", mysql));
+  DBUG_PRINT("query", ("Query = '%-.*s'", (int)length, query));
+  DBUG_EXECUTE_IF("inject_ER_NET_READ_INTERRUPTED", {
+    mysql->net.last_errno = ER_NET_READ_INTERRUPTED;
+    DBUG_SET("-d,inject_ER_NET_READ_INTERRUPTED");
+    DBUG_RETURN(1);
+  });
+
+  if (mysql_send_query(mysql, query, length))
     DBUG_RETURN(1);
-  retval= (int) (*mysql->methods->read_query_result)(mysql);
+  retval = (int)(*mysql->methods->read_query_result)(mysql);
   DBUG_RETURN(retval);
 }
 
-
 /**************************************************************************
   Alloc result struct for buffered results. All rows are read to buffer.
   mysql_data_seek may be used.
 **************************************************************************/
 
-MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
-{
+MYSQL_RES *STDCALL mysql_store_result(MYSQL *mysql) {
   MYSQL_RES *result;
   DBUG_ENTER("mysql_store_result");
 
   if (!mysql->fields)
     DBUG_RETURN(0);
-  if (mysql->status != MYSQL_STATUS_GET_RESULT)
-  {
+  if (mysql->status != MYSQL_STATUS_GET_RESULT) {
     set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  mysql->status=MYSQL_STATUS_READY;		/* server is ready */
-  if (!(result=(MYSQL_RES*) my_malloc(key_memory_MYSQL_RES,
-                                      (uint) (sizeof(MYSQL_RES)+
-					      sizeof(ulong) *
-					      mysql->field_count),
-				      MYF(MY_WME | MY_ZEROFILL))))
-  {
+  mysql->status = MYSQL_STATUS_READY; /* server is ready */
+  if (!(result = (MYSQL_RES *)my_malloc(
+            key_memory_MYSQL_RES,
+            (uint)(sizeof(MYSQL_RES) + sizeof(ulong) * mysql->field_count),
+            MYF(MY_WME | MY_ZEROFILL)))) {
     set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  result->methods= mysql->methods;
-  result->eof=1;				/* Marker for buffered */
-  result->lengths=(ulong*) (result+1);
-  if (!(result->data=
-	(*mysql->methods->read_rows)(mysql,mysql->fields,mysql->field_count)))
-  {
+  result->methods = mysql->methods;
+  result->eof = 1; /* Marker for buffered */
+  result->lengths = (ulong *)(result + 1);
+  if (!(result->data = (*mysql->methods->read_rows)(mysql, mysql->fields,
+                                                    mysql->field_count))) {
     my_free(result);
     DBUG_RETURN(0);
   }
-  mysql->affected_rows= result->row_count= result->data->rows;
-  result->data_cursor=	result->data->data;
-  result->fields=	mysql->fields;
-  result->field_alloc= mysql->field_alloc;
-  result->field_count=	mysql->field_count;
+  mysql->affected_rows = result->row_count = result->data->rows;
+  result->data_cursor = result->data->data;
+  result->fields = mysql->fields;
+  result->field_alloc = mysql->field_alloc;
+  result->field_count = mysql->field_count;
   /* The rest of result members is zerofilled in my_malloc */
-  mysql->fields=0;				/* fields is now in result */
+  mysql->fields = 0; /* fields is now in result */
   clear_alloc_root(&mysql->field_alloc);
   /* just in case this was mistakenly called after mysql_stmt_execute() */
-  mysql->unbuffered_fetch_owner= 0;
-  DBUG_RETURN(result);				/* Data fetched */
+  mysql->unbuffered_fetch_owner = 0;
+  DBUG_RETURN(result); /* Data fetched */
 }
 
-
 /**************************************************************************
   Alloc struct for use with unbuffered reads. Data is fetched by domand
   when calling to mysql_fetch_row.
@@ -5307,209 +5124,200 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
   have to wait for the client (and will not wait more than 30 sec/packet).
 **************************************************************************/
 
-static MYSQL_RES * cli_use_result(MYSQL *mysql)
-{
+static MYSQL_RES *cli_use_result(MYSQL *mysql) {
   MYSQL_RES *result;
   DBUG_ENTER("cli_use_result");
 
   if (!mysql->fields)
     DBUG_RETURN(0);
-  if (mysql->status != MYSQL_STATUS_GET_RESULT)
-  {
+  if (mysql->status != MYSQL_STATUS_GET_RESULT) {
     set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
     DBUG_RETURN(0);
   }
-  if (!(result=(MYSQL_RES*) my_malloc(key_memory_MYSQL_RES,
-                                      sizeof(*result)+
-				      sizeof(ulong)*mysql->field_count,
-				      MYF(MY_WME | MY_ZEROFILL))))
+  if (!(result = (MYSQL_RES *)my_malloc(key_memory_MYSQL_RES,
+                                        sizeof(*result) +
+                                            sizeof(ulong) * mysql->field_count,
+                                        MYF(MY_WME | MY_ZEROFILL))))
     DBUG_RETURN(0);
-  result->lengths=(ulong*) (result+1);
-  result->methods= mysql->methods;
-  if (!(result->row=(MYSQL_ROW)
-	my_malloc(key_memory_MYSQL_ROW,
-                  sizeof(result->row[0])*(mysql->field_count+1), MYF(MY_WME))))
-  {					/* Ptrs: to one row */
+  result->lengths = (ulong *)(result + 1);
+  result->methods = mysql->methods;
+  if (!(result->row = (MYSQL_ROW)my_malloc(
+            key_memory_MYSQL_ROW,
+            sizeof(result->row[0]) * (mysql->field_count + 1),
+            MYF(MY_WME)))) { /* Ptrs: to one row */
     my_free(result);
     DBUG_RETURN(0);
   }
-  result->fields=	mysql->fields;
-  result->field_alloc= mysql->field_alloc;
-  result->field_count=	mysql->field_count;
-  result->current_field=0;
-  result->handle=	mysql;
-  result->current_row=	0;
-  mysql->fields=0;			/* fields is now in result */
+  result->fields = mysql->fields;
+  result->field_alloc = mysql->field_alloc;
+  result->field_count = mysql->field_count;
+  result->current_field = 0;
+  result->handle = mysql;
+  result->current_row = 0;
+  mysql->fields = 0; /* fields is now in result */
   clear_alloc_root(&mysql->field_alloc);
-  mysql->status=MYSQL_STATUS_USE_RESULT;
-  mysql->unbuffered_fetch_owner= &result->unbuffered_fetch_cancelled;
-  DBUG_RETURN(result);			/* Data is read to be fetched */
+  mysql->status = MYSQL_STATUS_USE_RESULT;
+  mysql->unbuffered_fetch_owner = &result->unbuffered_fetch_cancelled;
+  DBUG_RETURN(result); /* Data is read to be fetched */
 }
 
-
 /**************************************************************************
   Return next row of the query results
 **************************************************************************/
 
-MYSQL_ROW STDCALL
-mysql_fetch_row(MYSQL_RES *res)
-{
+MYSQL_ROW STDCALL mysql_fetch_row(MYSQL_RES *res) {
   DBUG_ENTER("mysql_fetch_row");
-  if (!res->data)
-  {						/* Unbufferred fetch */
-    if (!res->eof)
-    {
-      MYSQL *mysql= res->handle;
-      if (mysql->status != MYSQL_STATUS_USE_RESULT)
-      {
+  if (!res->data) { /* Unbufferred fetch */
+    if (!res->eof) {
+      MYSQL *mysql = res->handle;
+      if (mysql->status != MYSQL_STATUS_USE_RESULT) {
         set_mysql_error(mysql,
-                        res->unbuffered_fetch_cancelled ? 
-                        CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC,
+                        res->unbuffered_fetch_cancelled
+                            ? CR_FETCH_CANCELED
+                            : CR_COMMANDS_OUT_OF_SYNC,
                         unknown_sqlstate);
+      } else if (!(read_one_row(mysql, res->field_count, res->row,
+                                res->lengths))) {
+        res->row_count++;
+        DBUG_RETURN(res->current_row = res->row);
       }
-      else if (!(read_one_row(mysql, res->field_count, res->row, res->lengths)))
-      {
-	res->row_count++;
-	DBUG_RETURN(res->current_row=res->row);
-      }
-      DBUG_PRINT("info",("end of data"));
-      res->eof=1;
-      mysql->status=MYSQL_STATUS_READY;
+      DBUG_PRINT("info", ("end of data"));
+      res->eof = 1;
+      mysql->status = MYSQL_STATUS_READY;
       /*
         Reset only if owner points to us: there is a chance that somebody
         started new query after mysql_stmt_close():
       */
       if (mysql->unbuffered_fetch_owner == &res->unbuffered_fetch_cancelled)
-        mysql->unbuffered_fetch_owner= 0;
+        mysql->unbuffered_fetch_owner = 0;
       /* Don't clear handle in mysql_free_result */
-      res->handle=0;
+      res->handle = 0;
     }
-    DBUG_RETURN((MYSQL_ROW) NULL);
+    DBUG_RETURN((MYSQL_ROW)NULL);
   }
   {
     MYSQL_ROW tmp;
-    if (!res->data_cursor)
-    {
-      DBUG_PRINT("info",("end of data"));
-      DBUG_RETURN(res->current_row=(MYSQL_ROW) NULL);
+    if (!res->data_cursor) {
+      DBUG_PRINT("info", ("end of data"));
+      DBUG_RETURN(res->current_row = (MYSQL_ROW)NULL);
     }
     tmp = res->data_cursor->data;
     res->data_cursor = res->data_cursor->next;
-    DBUG_RETURN(res->current_row=tmp);
+    DBUG_RETURN(res->current_row = tmp);
   }
 }
 
-
 /**************************************************************************
   Get column lengths of the current row
   If one uses mysql_use_result, res->lengths contains the length information,
   else the lengths are calculated from the offset between pointers.
 **************************************************************************/
 
-ulong * STDCALL
-mysql_fetch_lengths(MYSQL_RES *res)
-{
+ulong *STDCALL mysql_fetch_lengths(MYSQL_RES *res) {
   MYSQL_ROW column;
 
-  if (!(column=res->current_row))
-    return 0;					/* Something is wrong */
+  if (!(column = res->current_row))
+    return 0; /* Something is wrong */
   if (res->data)
     (*res->methods->fetch_lengths)(res->lengths, column, res->field_count);
   return res->lengths;
 }
 
-int STDCALL
-mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
-{
+int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
+                          const void *arg) {
   DBUG_ENTER("mysql_option");
-  DBUG_PRINT("enter",("option: %d",(int) option));
+  DBUG_PRINT("enter", ("option: %d", (int)option));
   switch (option) {
   case MYSQL_OPT_CONNECT_TIMEOUT:
-    mysql->options.connect_timeout= *(uint*) arg;
+    mysql->options.connect_timeout = *(uint *)arg;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
-    mysql->options.read_timeout= *(uint*) arg;
+    mysql->options.read_timeout = *(uint *)arg;
     break;
   case MYSQL_OPT_WRITE_TIMEOUT:
-    mysql->options.write_timeout= *(uint*) arg;
+    mysql->options.write_timeout = *(uint *)arg;
     break;
   case MYSQL_OPT_COMPRESS:
-    mysql->options.compress= 1;			/* Remember for connect */
-    mysql->options.client_flag|= CLIENT_COMPRESS;
+    mysql->options.compress = 1; /* Remember for connect */
+    mysql->options.client_flag |= CLIENT_COMPRESS;
     break;
-  case MYSQL_OPT_NAMED_PIPE:			/* This option is depricated */
-    mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
+  case MYSQL_OPT_NAMED_PIPE: /* This option is depricated */
+    mysql->options.protocol = MYSQL_PROTOCOL_PIPE; /* Force named pipe */
     break;
-  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
-    if (!arg || MY_TEST(*(uint*) arg))
-      mysql->options.client_flag|= CLIENT_LOCAL_FILES;
+  case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
+    if (!arg || MY_TEST(*(uint *)arg))
+      mysql->options.client_flag |= CLIENT_LOCAL_FILES;
     else
-      mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
+      mysql->options.client_flag &= ~CLIENT_LOCAL_FILES;
     break;
   case MYSQL_INIT_COMMAND:
-    add_init_command(&mysql->options,arg);
+    add_init_command(&mysql->options, arg);
     break;
   case MYSQL_READ_DEFAULT_FILE:
     my_free(mysql->options.my_cnf_file);
-    mysql->options.my_cnf_file=my_strdup(key_memory_mysql_options,
-                                         arg,MYF(MY_WME));
+    mysql->options.my_cnf_file =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_READ_DEFAULT_GROUP:
     my_free(mysql->options.my_cnf_group);
-    mysql->options.my_cnf_group=my_strdup(key_memory_mysql_options,
-                                          arg,MYF(MY_WME));
+    mysql->options.my_cnf_group =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_SET_CHARSET_DIR:
     my_free(mysql->options.charset_dir);
-    mysql->options.charset_dir=my_strdup(key_memory_mysql_options,
-                                         arg,MYF(MY_WME));
+    mysql->options.charset_dir =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_SET_CHARSET_NAME:
     my_free(mysql->options.charset_name);
-    mysql->options.charset_name=my_strdup(key_memory_mysql_options,
-                                          arg,MYF(MY_WME));
+    mysql->options.charset_name =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_OPT_PROTOCOL:
-    mysql->options.protocol= *(uint*) arg;
+    mysql->options.protocol = *(uint *)arg;
     break;
   case MYSQL_SHARED_MEMORY_BASE_NAME:
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.shared_memory_base_name != def_shared_memory_base_name)
       my_free(mysql->options.shared_memory_base_name);
-    mysql->options.shared_memory_base_name=my_strdup(key_memory_mysql_options,
-                                                     arg,MYF(MY_WME));
+    mysql->options.shared_memory_base_name =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
 #endif
     break;
   case MYSQL_OPT_USE_REMOTE_CONNECTION:
   case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
   case MYSQL_OPT_GUESS_CONNECTION:
-    mysql->options.methods_to_use= option;
+    mysql->options.methods_to_use = option;
     break;
   case MYSQL_SET_CLIENT_IP:
     my_free(mysql->options.ci.client_ip);
-    mysql->options.ci.client_ip= my_strdup(key_memory_mysql_options,
-                                           arg, MYF(MY_WME));
+    mysql->options.ci.client_ip =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_SECURE_AUTH:
-    if (!*(my_bool *) arg)
+    if (!*(my_bool *)arg)
       DBUG_RETURN(1);
     break;
   case MYSQL_REPORT_DATA_TRUNCATION:
-    mysql->options.report_data_truncation= MY_TEST(*(my_bool *) arg);
+    mysql->options.report_data_truncation = MY_TEST(*(my_bool *)arg);
     break;
   case MYSQL_OPT_RECONNECT:
-    mysql->reconnect= *(my_bool *) arg;
+    mysql->reconnect = *(my_bool *)arg;
     break;
   case MYSQL_OPT_BIND:
     my_free(mysql->options.ci.bind_address);
-    mysql->options.ci.bind_address= my_strdup(key_memory_mysql_options,
-                                              arg, MYF(MY_WME));
+    mysql->options.ci.bind_address =
+        my_strdup(key_memory_mysql_options, arg, MYF(MY_WME));
     break;
   case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
-    if (*(my_bool*) arg)
-      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+    if (*(my_bool *)arg)
+      mysql->options.client_flag |= CLIENT_SSL_VERIFY_SERVER_CERT;
     else
-      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
+      mysql->options.client_flag &= ~CLIENT_SSL_VERIFY_SERVER_CERT;
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_PLUGIN_DIR:
     EXTENSION_SET_STRING(&mysql->options, plugin_dir, arg);
@@ -5518,130 +5326,162 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
     EXTENSION_SET_STRING(&mysql->options, default_auth, arg);
     break;
   case MYSQL_OPT_SSL_KEY:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.ssl_key)
       my_free(mysql->options.ssl_key);
-    mysql->options.ssl_key= set_ssl_option_unpack_path(arg);
+    mysql->options.ssl_key = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CERT:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.ssl_cert)
       my_free(mysql->options.ssl_cert);
-    mysql->options.ssl_cert= set_ssl_option_unpack_path(arg);
+    mysql->options.ssl_cert = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CA:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.ssl_ca)
       my_free(mysql->options.ssl_ca);
-    mysql->options.ssl_ca= set_ssl_option_unpack_path(arg);
+    mysql->options.ssl_ca = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CAPATH:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.ssl_capath)
       my_free(mysql->options.ssl_capath);
-    mysql->options.ssl_capath= set_ssl_option_unpack_path(arg);
+    mysql->options.ssl_capath = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CIPHER:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     SET_OPTION(ssl_cipher, arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CRL:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.extension)
       my_free(mysql->options.extension->ssl_crl);
     else
       ALLOCATE_EXTENSIONS(&mysql->options);
-    mysql->options.extension->ssl_crl=
-                   set_ssl_option_unpack_path(arg);
+    mysql->options.extension->ssl_crl = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_SSL_CRLPATH:
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     if (mysql->options.extension)
       my_free(mysql->options.extension->ssl_crlpath);
     else
       ALLOCATE_EXTENSIONS(&mysql->options);
-    mysql->options.extension->ssl_crlpath=
-                   set_ssl_option_unpack_path(arg);
+    mysql->options.extension->ssl_crlpath = set_ssl_option_unpack_path(arg);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
+#endif
     break;
   case MYSQL_OPT_TLS_VERSION:
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     EXTENSION_SET_STRING(&mysql->options, tls_version, arg);
-    if ((mysql->options.extension->ssl_ctx_flags=
-           process_tls_version(mysql->options.extension->tls_version)) == -1)
+    if ((mysql->options.extension->ssl_ctx_flags =
+             process_tls_version(mysql->options.extension->tls_version)) == -1)
       DBUG_RETURN(1);
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
 #endif
     break;
   case MYSQL_OPT_SSL_ENFORCE:
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-    mysql->options.extension->ssl_mode= SSL_MODE_REQUIRED;
+    mysql->options.extension->ssl_mode = SSL_MODE_REQUIRED;
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
 #endif
     break;
   case MYSQL_OPT_SSL_MODE:
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-    mysql->options.extension->ssl_mode= *(uint *) arg;
+    mysql->options.extension->ssl_mode = *(uint *)arg;
     if (mysql->options.extension->ssl_mode == SSL_MODE_VERIFY_IDENTITY)
-      mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
+      mysql->options.client_flag |= CLIENT_SSL_VERIFY_SERVER_CERT;
     else
-      mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
+      mysql->options.client_flag &= ~CLIENT_SSL_VERIFY_SERVER_CERT;
+#elif defined(EMBEDDED_LIBRARY)
+    DBUG_RETURN(1);
 #endif
     break;
   case MYSQL_SERVER_PUBLIC_KEY:
     EXTENSION_SET_STRING(&mysql->options, server_public_key_path, arg);
     break;
 
+  case MYSQL_OPT_GET_SERVER_PUBLIC_KEY:
+    ENSURE_EXTENSIONS_PRESENT(&mysql->options);
+    mysql->options.extension->get_server_public_key =
+        (*(my_bool *)arg) ? TRUE : FALSE;
+    break;
+
   case MYSQL_OPT_CONNECT_ATTR_RESET:
     ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-    if (my_hash_inited(&mysql->options.extension->connection_attributes))
-    {
+    if (my_hash_inited(&mysql->options.extension->connection_attributes)) {
       my_hash_free(&mysql->options.extension->connection_attributes);
-      mysql->options.extension->connection_attributes_length= 0;
+      mysql->options.extension->connection_attributes_length = 0;
     }
     break;
   case MYSQL_OPT_CONNECT_ATTR_DELETE:
     ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-    if (my_hash_inited(&mysql->options.extension->connection_attributes))
-    {
+    if (my_hash_inited(&mysql->options.extension->connection_attributes)) {
       size_t len;
       uchar *elt;
 
-      len= arg ? strlen(arg) : 0;
-
-      if (len)
-      {
-        elt= my_hash_search(&mysql->options.extension->connection_attributes,
-                            arg, len);
-        if (elt)
-        {
-          LEX_STRING *attr= (LEX_STRING *) elt;
-          LEX_STRING *key= attr, *value= attr + 1;
+      len = arg ? strlen(arg) : 0;
 
-          mysql->options.extension->connection_attributes_length-=
-            get_length_store_length(key->length) + key->length +
-            get_length_store_length(value->length) + value->length;
+      if (len) {
+        elt = my_hash_search(&mysql->options.extension->connection_attributes,
+                             arg, len);
+        if (elt) {
+          LEX_STRING *attr = (LEX_STRING *)elt;
+          LEX_STRING *key = attr, *value = attr + 1;
 
-          my_hash_delete(&mysql->options.extension->connection_attributes,
-                         elt);
+          mysql->options.extension->connection_attributes_length -=
+              get_length_store_length(key->length) + key->length +
+              get_length_store_length(value->length) + value->length;
 
+          my_hash_delete(&mysql->options.extension->connection_attributes, elt);
         }
       }
     }
     break;
   case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
     ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-    mysql->options.extension->enable_cleartext_plugin= 
-      (*(my_bool*) arg) ? TRUE : FALSE;
+    mysql->options.extension->enable_cleartext_plugin =
+        (*(my_bool *)arg) ? TRUE : FALSE;
     break;
   case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
-    if (*(my_bool*) arg)
-      mysql->options.client_flag|= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
+    if (*(my_bool *)arg)
+      mysql->options.client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
     else
-      mysql->options.client_flag&= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
+      mysql->options.client_flag &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;
     break;
 
   case MYSQL_OPT_MAX_ALLOWED_PACKET:
     if (mysql)
-      mysql->options.max_allowed_packet= (*(ulong *) arg);
+      mysql->options.max_allowed_packet = (*(ulong *)arg);
     else
-      g_max_allowed_packet= (*(ulong *) arg);
+      g_max_allowed_packet = (*(ulong *)arg);
     break;
 
   case MYSQL_OPT_NET_BUFFER_LENGTH:
-    g_net_buffer_length= (*(ulong *) arg);
+    g_net_buffer_length = (*(ulong *)arg);
     break;
 
   default:
@@ -5650,7 +5490,6 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
   DBUG_RETURN(0);
 }
 
-
 /**
   Return the current values for the options settable through mysql_options()
 
@@ -5673,10 +5512,11 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
 
   const char *
     MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
-    MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_SHARED_MEMORY_BASE_NAME,
-    MYSQL_SET_CLIENT_IP, MYSQL_OPT_BIND, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
-    MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH,
-    MYSQL_OPT_SSL_CIPHER, MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, MYSQL_OPT_TLS_VERSION,
+    MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME,
+  MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_SET_CLIENT_IP, MYSQL_OPT_BIND,
+  MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT,
+  MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER,
+  MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, MYSQL_OPT_TLS_VERSION,
     MYSQL_SERVER_PUBLIC_KEY
 
   <none, error returned>
@@ -5690,9 +5530,8 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
   @retval 0 SUCCESS
 */
 
-int STDCALL
-mysql_get_option(MYSQL *mysql, enum mysql_option option, const void *arg)
-{
+int STDCALL mysql_get_option(MYSQL *mysql, enum mysql_option option,
+                             const void *arg) {
   DBUG_ENTER("mysql_option");
   DBUG_PRINT("enter", ("option: %d", (int)option));
 
@@ -5704,251 +5543,251 @@ mysql_get_option(MYSQL *mysql, enum mysql_option option, const void *arg)
     *((uint *)arg) = mysql->options.connect_timeout;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
-    *((uint *)arg)= mysql->options.read_timeout;
+    *((uint *)arg) = mysql->options.read_timeout;
     break;
   case MYSQL_OPT_WRITE_TIMEOUT:
-    *((uint *)arg)= mysql->options.write_timeout;
+    *((uint *)arg) = mysql->options.write_timeout;
     break;
   case MYSQL_OPT_COMPRESS:
     *((my_bool *)arg) = mysql->options.compress ? TRUE : FALSE;
     break;
-  case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
-    *((uint *)arg)= (mysql->options.client_flag & CLIENT_LOCAL_FILES) ?
-                    TRUE : FALSE;
+  case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
+    *((uint *)arg) =
+        (mysql->options.client_flag & CLIENT_LOCAL_FILES) ? TRUE : FALSE;
     break;
   case MYSQL_READ_DEFAULT_FILE:
-    *((char **)arg)= mysql->options.my_cnf_file;
+    *((char **)arg) = mysql->options.my_cnf_file;
     break;
   case MYSQL_READ_DEFAULT_GROUP:
-    *((char **)arg)= mysql->options.my_cnf_group;
+    *((char **)arg) = mysql->options.my_cnf_group;
     break;
   case MYSQL_SET_CHARSET_DIR:
-    *((char **)arg)= mysql->options.charset_dir;
+    *((char **)arg) = mysql->options.charset_dir;
     break;
   case MYSQL_SET_CHARSET_NAME:
-    *((char **)arg)= mysql->options.charset_name;
+    *((char **)arg) = mysql->options.charset_name;
     break;
   case MYSQL_OPT_PROTOCOL:
-    *((uint *)arg)= mysql->options.protocol;
+    *((uint *)arg) = mysql->options.protocol;
     break;
   case MYSQL_SHARED_MEMORY_BASE_NAME:
-#if defined (_WIN32) && !defined (EMBEDDED_LIBRARY)
-    *((char **)arg)= mysql->options.shared_memory_base_name;
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+    *((char **)arg) = mysql->options.shared_memory_base_name;
 #else
-    *((const char **)arg)= "";
+    *((const char **)arg) = "";
 #endif
     break;
   case MYSQL_OPT_USE_REMOTE_CONNECTION:
-    *((my_bool *)arg)=
-      (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION) ?
-                                        TRUE : FALSE;
+    *((my_bool *)arg) =
+        (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION)
+            ? TRUE
+            : FALSE;
     break;
   case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
     *((my_bool *)arg) =
-      (mysql->options.methods_to_use == MYSQL_OPT_USE_EMBEDDED_CONNECTION) ?
-    TRUE : FALSE;
+        (mysql->options.methods_to_use == MYSQL_OPT_USE_EMBEDDED_CONNECTION)
+            ? TRUE
+            : FALSE;
     break;
   case MYSQL_OPT_GUESS_CONNECTION:
     *((my_bool *)arg) =
-      (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION) ?
-    TRUE : FALSE;
+        (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION) ? TRUE
+                                                                      : FALSE;
     break;
   case MYSQL_SET_CLIENT_IP:
     *((char **)arg) = mysql->options.ci.client_ip;
     break;
   case MYSQL_SECURE_AUTH:
-    *((my_bool *)arg)= TRUE;
+    *((my_bool *)arg) = TRUE;
     break;
   case MYSQL_REPORT_DATA_TRUNCATION:
-    *((my_bool *)arg)= mysql->options.report_data_truncation;
+    *((my_bool *)arg) = mysql->options.report_data_truncation;
     break;
   case MYSQL_OPT_RECONNECT:
-    *((my_bool *)arg)= mysql->reconnect;
+    *((my_bool *)arg) = mysql->reconnect;
     break;
   case MYSQL_OPT_BIND:
-    *((char **)arg)= mysql->options.ci.bind_address;
+    *((char **)arg) = mysql->options.ci.bind_address;
     break;
-  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:               /* Deprecated. */
-    *((my_bool *)arg) = (mysql->options.client_flag &
-                         CLIENT_SSL_VERIFY_SERVER_CERT) ? TRUE : FALSE;
+  case MYSQL_OPT_SSL_VERIFY_SERVER_CERT: /* Deprecated. */
+    *((my_bool *)arg) =
+        (mysql->options.client_flag & CLIENT_SSL_VERIFY_SERVER_CERT) ? TRUE
+                                                                     : FALSE;
     break;
-  case MYSQL_OPT_SSL_ENFORCE:                          /* Deprecated. */
-    *((my_bool *) arg)= (mysql->options.extension &&
-                         mysql->options.extension->ssl_mode >= SSL_MODE_REQUIRED) ?
-                        TRUE : FALSE;
+  case MYSQL_OPT_SSL_ENFORCE: /* Deprecated. */
+    *((my_bool *)arg) =
+        (mysql->options.extension &&
+         mysql->options.extension->ssl_mode >= SSL_MODE_REQUIRED)
+            ? TRUE
+            : FALSE;
     break;
   case MYSQL_OPT_SSL_MODE:
-    *((uint *) arg)= mysql->options.extension ?
-                     mysql->options.extension->ssl_mode : 0;
+    *((uint *)arg) =
+        mysql->options.extension ? mysql->options.extension->ssl_mode : 0;
     break;
   case MYSQL_PLUGIN_DIR:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->plugin_dir : NULL;
+    *((char **)arg) =
+        mysql->options.extension ? mysql->options.extension->plugin_dir : NULL;
     break;
   case MYSQL_DEFAULT_AUTH:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->default_auth : NULL;
+    *((char **)arg) = mysql->options.extension
+                          ? mysql->options.extension->default_auth
+                          : NULL;
     break;
   case MYSQL_OPT_SSL_KEY:
-    *((char **)arg)= mysql->options.ssl_key;
+    *((char **)arg) = mysql->options.ssl_key;
     break;
   case MYSQL_OPT_SSL_CERT:
-    *((char **)arg)= mysql->options.ssl_cert;
+    *((char **)arg) = mysql->options.ssl_cert;
     break;
   case MYSQL_OPT_SSL_CA:
-    *((char **)arg)= mysql->options.ssl_ca;
+    *((char **)arg) = mysql->options.ssl_ca;
     break;
   case MYSQL_OPT_SSL_CAPATH:
-    *((char **)arg)= mysql->options.ssl_capath;
+    *((char **)arg) = mysql->options.ssl_capath;
     break;
   case MYSQL_OPT_SSL_CIPHER:
-    *((char **)arg)= mysql->options.ssl_cipher;
+    *((char **)arg) = mysql->options.ssl_cipher;
     break;
   case MYSQL_OPT_TLS_VERSION:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->tls_version : NULL;
+    *((char **)arg) =
+        mysql->options.extension ? mysql->options.extension->tls_version : NULL;
     break;
   case MYSQL_OPT_SSL_CRL:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->ssl_crl : NULL;
+    *((char **)arg) =
+        mysql->options.extension ? mysql->options.extension->ssl_crl : NULL;
     break;
   case MYSQL_OPT_SSL_CRLPATH:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->ssl_crlpath : NULL;
+    *((char **)arg) =
+        mysql->options.extension ? mysql->options.extension->ssl_crlpath : NULL;
     break;
   case MYSQL_SERVER_PUBLIC_KEY:
-    *((char **)arg)= mysql->options.extension ?
-                     mysql->options.extension->server_public_key_path : NULL;
+    *((char **)arg) = mysql->options.extension
+                          ? mysql->options.extension->server_public_key_path
+                          : NULL;
+    break;
+  case MYSQL_OPT_GET_SERVER_PUBLIC_KEY:
+    *((my_bool *)arg) = (mysql->options.extension &&
+                         mysql->options.extension->get_server_public_key)
+                            ? TRUE
+                            : FALSE;
     break;
   case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
-    *((my_bool *)arg)= (mysql->options.extension &&
-                        mysql->options.extension->enable_cleartext_plugin) ?
-			TRUE : FALSE;
+    *((my_bool *)arg) = (mysql->options.extension &&
+                         mysql->options.extension->enable_cleartext_plugin)
+                            ? TRUE
+                            : FALSE;
     break;
   case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
-    *((my_bool*)arg)= (mysql->options.client_flag &
-                       CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS) ? TRUE : FALSE;
+    *((my_bool *)arg) =
+        (mysql->options.client_flag & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)
+            ? TRUE
+            : FALSE;
     break;
 
   case MYSQL_OPT_MAX_ALLOWED_PACKET:
     if (mysql)
-      *((ulong*)arg)= mysql->options.max_allowed_packet;
+      *((ulong *)arg) = mysql->options.max_allowed_packet;
     else
-      *((ulong*)arg)= g_max_allowed_packet;
+      *((ulong *)arg) = g_max_allowed_packet;
     break;
 
   case MYSQL_OPT_NET_BUFFER_LENGTH:
-    *((ulong*)arg)= g_net_buffer_length;
+    *((ulong *)arg) = g_net_buffer_length;
     break;
 
-  case MYSQL_OPT_NAMED_PIPE:			/* This option is depricated */
-  case MYSQL_INIT_COMMAND:                      /* Cumulative */
-  case MYSQL_OPT_CONNECT_ATTR_RESET:            /* Cumulative */
-  case MYSQL_OPT_CONNECT_ATTR_DELETE:           /* Cumulative */
+  case MYSQL_OPT_NAMED_PIPE:          /* This option is depricated */
+  case MYSQL_INIT_COMMAND:            /* Cumulative */
+  case MYSQL_OPT_CONNECT_ATTR_RESET:  /* Cumulative */
+  case MYSQL_OPT_CONNECT_ATTR_DELETE: /* Cumulative */
   default:
     DBUG_RETURN(1);
   }
   DBUG_RETURN(0);
 }
 
-
 /**
   A function to return the key from a connection attribute
 */
-uchar *
-get_attr_key(LEX_STRING *part, size_t *length,
-             my_bool not_used MY_ATTRIBUTE((unused)))
-{
-  *length= part[0].length;
-  return (uchar *) part[0].str;
+uchar *get_attr_key(LEX_STRING *part, size_t *length,
+                    my_bool not_used MY_ATTRIBUTE((unused))) {
+  *length = part[0].length;
+  return (uchar *)part[0].str;
 }
 
-int STDCALL
-mysql_options4(MYSQL *mysql,enum mysql_option option,
-               const void *arg1, const void *arg2)
-{
+int STDCALL mysql_options4(MYSQL *mysql, enum mysql_option option,
+                           const void *arg1, const void *arg2) {
   DBUG_ENTER("mysql_option");
-  DBUG_PRINT("enter",("option: %d",(int) option));
+  DBUG_PRINT("enter", ("option: %d", (int)option));
 
-  switch (option)
-  {
-  case MYSQL_OPT_CONNECT_ATTR_ADD:
-    {
-      LEX_STRING *elt;
-      char *key, *value;
-      size_t key_len= arg1 ? strlen(arg1) : 0,
-             value_len= arg2 ? strlen(arg2) : 0;
-      size_t attr_storage_length= key_len + value_len;
-
-      /* we can't have a zero length key */
-      if (!key_len)
-      {
-        set_mysql_error(mysql, CR_INVALID_PARAMETER_NO, unknown_sqlstate);
-        DBUG_RETURN(1);
-      }
+  switch (option) {
+  case MYSQL_OPT_CONNECT_ATTR_ADD: {
+    LEX_STRING *elt;
+    char *key, *value;
+    size_t key_len = arg1 ? strlen(arg1) : 0,
+           value_len = arg2 ? strlen(arg2) : 0;
+    size_t attr_storage_length = key_len + value_len;
+
+    /* we can't have a zero length key */
+    if (!key_len) {
+      set_mysql_error(mysql, CR_INVALID_PARAMETER_NO, unknown_sqlstate);
+      DBUG_RETURN(1);
+    }
 
-      /* calculate the total storage length of the attribute */
-      attr_storage_length+= get_length_store_length(key_len);
-      attr_storage_length+= get_length_store_length(value_len);
+    /* calculate the total storage length of the attribute */
+    attr_storage_length += get_length_store_length(key_len);
+    attr_storage_length += get_length_store_length(value_len);
 
-      ENSURE_EXTENSIONS_PRESENT(&mysql->options);
+    ENSURE_EXTENSIONS_PRESENT(&mysql->options);
 
-      /*
-        Throw and error if the maximum combined length of the attribute value
-        will be greater than the maximum that we can safely transmit.
-      */
-      if (attr_storage_length +
-          mysql->options.extension->connection_attributes_length >
-          MAX_CONNECTION_ATTR_STORAGE_LENGTH)
-      {
-        set_mysql_error(mysql, CR_INVALID_PARAMETER_NO, unknown_sqlstate);
-        DBUG_RETURN(1);
-      }
+    /*
+      Throw and error if the maximum combined length of the attribute value
+      will be greater than the maximum that we can safely transmit.
+    */
+    if (attr_storage_length +
+            mysql->options.extension->connection_attributes_length >
+        MAX_CONNECTION_ATTR_STORAGE_LENGTH) {
+      set_mysql_error(mysql, CR_INVALID_PARAMETER_NO, unknown_sqlstate);
+      DBUG_RETURN(1);
+    }
 
-      if (!my_hash_inited(&mysql->options.extension->connection_attributes))
-      {
-        if (my_hash_init(&mysql->options.extension->connection_attributes,
-                     &my_charset_bin, 0, 0, 0, (my_hash_get_key) get_attr_key,
-                     my_free, HASH_UNIQUE,
-                     key_memory_mysql_options))
-        {
-          set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
-          DBUG_RETURN(1);
-        }
-      }
-      if (!my_multi_malloc(key_memory_mysql_options,
-                           MY_WME,
-                           &elt, 2 * sizeof(LEX_STRING),
-                           &key, key_len + 1,
-                           &value, value_len + 1,
-                           NULL))
-      {
+    if (!my_hash_inited(&mysql->options.extension->connection_attributes)) {
+      if (my_hash_init(&mysql->options.extension->connection_attributes,
+                       &my_charset_bin, 0, 0, 0, (my_hash_get_key)get_attr_key,
+                       my_free, HASH_UNIQUE, key_memory_mysql_options)) {
         set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
         DBUG_RETURN(1);
       }
-      elt[0].str= key; elt[0].length= key_len;
-      elt[1].str= value; elt[1].length= value_len;
-      if (key_len)
-        memcpy(key, arg1, key_len);
-      key[key_len]= 0;
-      if (value_len)
-        memcpy(value, arg2, value_len);
-      value[value_len]= 0;
-      if (my_hash_insert(&mysql->options.extension->connection_attributes,
-                     (uchar *) elt))
-      {
-        /* can't insert the value */
-        my_free(elt);
-        set_mysql_error(mysql, CR_DUPLICATE_CONNECTION_ATTR,
-                        unknown_sqlstate);
-        DBUG_RETURN(1);
-      }
+    }
+    if (!my_multi_malloc(key_memory_mysql_options, MY_WME, &elt,
+                         2 * sizeof(LEX_STRING), &key, key_len + 1, &value,
+                         value_len + 1, NULL)) {
+      set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
+      DBUG_RETURN(1);
+    }
+    elt[0].str = key;
+    elt[0].length = key_len;
+    elt[1].str = value;
+    elt[1].length = value_len;
+    if (key_len)
+      memcpy(key, arg1, key_len);
+    key[key_len] = 0;
+    if (value_len)
+      memcpy(value, arg2, value_len);
+    value[value_len] = 0;
+    if (my_hash_insert(&mysql->options.extension->connection_attributes,
+                       (uchar *)elt)) {
+      /* can't insert the value */
+      my_free(elt);
+      set_mysql_error(mysql, CR_DUPLICATE_CONNECTION_ATTR, unknown_sqlstate);
+      DBUG_RETURN(1);
+    }
 
-      mysql->options.extension->connection_attributes_length+=
+    mysql->options.extension->connection_attributes_length +=
         attr_storage_length;
 
-      break;
-    }
+    break;
+  }
 
   default:
     DBUG_RETURN(1);
@@ -5956,35 +5795,26 @@ mysql_options4(MYSQL *mysql,enum mysql_option option,
   DBUG_RETURN(0);
 }
 
-
 /****************************************************************************
   Functions to get information from the MySQL structure
   These are functions to make shared libraries more usable.
 ****************************************************************************/
 
 /* MYSQL_RES */
-my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res)
-{
-  return res->row_count;
-}
+my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res) { return res->row_count; }
 
-unsigned int STDCALL mysql_num_fields(MYSQL_RES *res)
-{
+unsigned int STDCALL mysql_num_fields(MYSQL_RES *res) {
   return res->field_count;
 }
 
-uint STDCALL mysql_errno(MYSQL *mysql)
-{
+uint STDCALL mysql_errno(MYSQL *mysql) {
   return mysql ? mysql->net.last_errno : mysql_server_last_errno;
 }
 
-
-const char * STDCALL mysql_error(MYSQL *mysql)
-{
+const char *STDCALL mysql_error(MYSQL *mysql) {
   return mysql ? mysql->net.last_error : mysql_server_last_error;
 }
 
-
 /**
   Read data and its length from a LIST node.
 
@@ -5997,18 +5827,16 @@ const char * STDCALL mysql_error(MYSQL *mysql)
   function returns 1.
 */
 
-static int get_data_and_length(LIST *node, const char **data, size_t *length)
-{
-  DBUG_ASSERT(!node || node->data);
+static int get_data_and_length(LIST *node, const char **data, size_t *length) {
+  assert(!node || node->data);
   if (data)
-    *data= node ? ((LEX_STRING*)(node->data))->str : NULL;
+    *data = node ? ((LEX_STRING *)(node->data))->str : NULL;
   if (length)
-    *length= node ? ((LEX_STRING*)(node->data))->length : 0;
+    *length = node ? ((LEX_STRING *)(node->data))->length : 0;
 
   return node ? 0 : 1;
 }
 
-
 /**
   Get the first state change information received from the server.
 
@@ -6024,21 +5852,18 @@ static int get_data_and_length(LIST *node, const char **data, size_t *length)
 
 int STDCALL mysql_session_track_get_first(MYSQL *mysql,
                                           enum enum_session_state_type type,
-                                          const char **data,
-                                          size_t *length)
-{
-  STATE_INFO *info= STATE_DATA(mysql);
+                                          const char **data, size_t *length) {
+  STATE_INFO *info = STATE_DATA(mysql);
 
-  if (!info || !IS_SESSION_STATE_TYPE(type)
-            || !(info->info_list[type].head_node))
+  if (!info || !IS_SESSION_STATE_TYPE(type) ||
+      !(info->info_list[type].head_node))
     return get_data_and_length(NULL, data, length);
 
-  info->info_list[type].current_node= info->info_list[type].head_node;
+  info->info_list[type].current_node = info->info_list[type].head_node;
 
   return mysql_session_track_get_next(mysql, type, data, length);
 }
 
-
 /**
   Get the subsequent state change information received from the server.
 
@@ -6054,25 +5879,22 @@ int STDCALL mysql_session_track_get_first(MYSQL *mysql,
 
 int STDCALL mysql_session_track_get_next(MYSQL *mysql,
                                          enum enum_session_state_type type,
-                                         const char **data,
-                                         size_t *length)
-{
-  STATE_INFO *info= STATE_DATA(mysql);
+                                         const char **data, size_t *length) {
+  STATE_INFO *info = STATE_DATA(mysql);
   int ret;
 
-  if (!info || !IS_SESSION_STATE_TYPE(type)
-            || !(info->info_list[type].current_node))
+  if (!info || !IS_SESSION_STATE_TYPE(type) ||
+      !(info->info_list[type].current_node))
     return get_data_and_length(NULL, data, length);
 
-  ret= get_data_and_length(info->info_list[type].current_node,
-                           data, length);
+  ret = get_data_and_length(info->info_list[type].current_node, data, length);
 
-  info->info_list[type].current_node= list_rest(info->info_list[type].current_node);
+  info->info_list[type].current_node =
+      list_rest(info->info_list[type].current_node);
 
   return ret;
 }
 
-
 /*
   Get version number for server in a form easy to test on
 
@@ -6082,7 +5904,7 @@ int STDCALL mysql_session_track_get_next(MYSQL *mysql,
 
   EXAMPLE
     4.1.0-alfa ->  40100
-  
+
   NOTES
     We will ensure that a newer server always has a bigger number.
 
@@ -6091,83 +5913,88 @@ int STDCALL mysql_session_track_get_next(MYSQL *mysql,
    Zero if there is no connection
 */
 
-ulong STDCALL
-mysql_get_server_version(MYSQL *mysql)
-{
-  ulong major= 0, minor= 0, version= 0;
-
-  if (mysql->server_version)
-  {
-    char *pos= mysql->server_version, *end_pos;
-    major=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-    minor=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-    version= strtoul(pos, &end_pos, 10);
-  }
-  else
-  {
+ulong STDCALL mysql_get_server_version(MYSQL *mysql) {
+  ulong major = 0, minor = 0, version = 0;
+
+  if (mysql->server_version) {
+    char *pos = mysql->server_version, *end_pos;
+    major = strtoul(pos, &end_pos, 10);
+    pos = end_pos + 1;
+    minor = strtoul(pos, &end_pos, 10);
+    pos = end_pos + 1;
+    version = strtoul(pos, &end_pos, 10);
+  } else {
     set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
   }
 
-  return major*10000 + minor*100 + version;
+  return major * 10000 + minor * 100 + version;
 }
 
-
-/* 
+#ifndef MYSQL_SERVER
+static my_bool is_supported_parser_charset(const CHARSET_INFO *cs) {
+  return (cs->mbminlen == 1);
+}
+#endif
+/*
    mysql_set_character_set function sends SET NAMES cs_name to
    the server (which changes character_set_client, character_set_result
    and character_set_connection) and updates mysql->charset so other
    functions like mysql_real_escape will work correctly.
 */
-int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
-{
+int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name) {
   struct charset_info_st *cs;
-  const char *save_csdir= charsets_dir;
+  const char *save_csdir = charsets_dir;
 
   if (mysql->options.charset_dir)
-    charsets_dir= mysql->options.charset_dir;
+    charsets_dir = mysql->options.charset_dir;
 
-  if (!mysql->net.vio)
-  {
+  if (!mysql->net.vio) {
     /* Initialize with automatic OS character set detection. */
     mysql_options(mysql, MYSQL_SET_CHARSET_NAME, cs_name);
     mysql_init_character_set(mysql);
-    /* 
+    /*
       In case of automatic OS character set detection
       mysql_init_character_set changes mysql->options.charset_name
       from "auto" to the real character set name.
       Reset cs_name to the detected character set name, accordingly.
     */
-    cs_name= mysql->options.charset_name;
+    cs_name = mysql->options.charset_name;
   }
 
+#ifndef MYSQL_SERVER
+  if (mysql->charset != NULL) {
+    if (!is_supported_parser_charset(mysql->charset)) {
+      set_mysql_extended_error(mysql, CR_INVALID_CLIENT_CHARSET,
+                               unknown_sqlstate,
+                               ER(CR_INVALID_CLIENT_CHARSET), cs_name);
+      return 1;
+    }
+  }
+#endif
+
   if (strlen(cs_name) < MY_CS_NAME_SIZE &&
-     (cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0))))
-  {
+      (cs = get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0)))) {
     char buff[MY_CS_NAME_SIZE + 10];
-    charsets_dir= save_csdir;
-    if (!mysql->net.vio)
-    {
+    charsets_dir = save_csdir;
+    if (!mysql->net.vio) {
       /* If there is no connection yet we don't send "SET NAMES" query */
-      mysql->charset= cs;
+      mysql->charset = cs;
       return 0;
     }
     /* Skip execution of "SET NAMES" for pre-4.1 servers */
     if (mysql_get_server_version(mysql) < 40100)
       return 0;
     sprintf(buff, "SET NAMES %s", cs_name);
-    if (!mysql_real_query(mysql, buff, (ulong) strlen(buff)))
-    {
-      mysql->charset= cs;
+    if (!mysql_real_query(mysql, buff, (ulong)strlen(buff))) {
+      mysql->charset = cs;
     }
-  }
-  else
-  {
+  } else {
     char cs_dir_name[FN_REFLEN];
     get_charsets_dir(cs_dir_name);
     set_mysql_extended_error(mysql, CR_CANT_READ_CHARSET, unknown_sqlstate,
                              ER(CR_CANT_READ_CHARSET), cs_name, cs_dir_name);
   }
-  charsets_dir= save_csdir;
+  charsets_dir = save_csdir;
   return mysql->net.last_errno;
 }
 
@@ -6175,27 +6002,22 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
   client authentication plugin that does native MySQL authentication
   using a 20-byte (4.1+) scramble
 */
-static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
-{
+static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) {
   int pkt_len;
   uchar *pkt;
 
   DBUG_ENTER("native_password_auth_client");
 
-
-  if (((MCPVIO_EXT *)vio)->mysql_change_user)
-  {
+  if (((MCPVIO_EXT *)vio)->mysql_change_user) {
     /*
       in mysql_change_user() the client sends the first packet.
       we use the old scramble.
     */
-    pkt= (uchar*)mysql->scramble;
-    pkt_len= SCRAMBLE_LENGTH + 1;
-  }
-  else
-  {
+    pkt = (uchar *)mysql->scramble;
+    pkt_len = SCRAMBLE_LENGTH + 1;
+  } else {
     /* read the scramble */
-    if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
+    if ((pkt_len = vio->read_packet(vio, &pkt)) < 0)
       DBUG_RETURN(CR_ERROR);
 
     if (pkt_len != SCRAMBLE_LENGTH + 1)
@@ -6206,16 +6028,13 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     mysql->scramble[SCRAMBLE_LENGTH] = 0;
   }
 
-  if (mysql->passwd[0])
-  {
+  if (mysql->passwd[0]) {
     char scrambled[SCRAMBLE_LENGTH + 1];
     DBUG_PRINT("info", ("sending scramble"));
-    scramble(scrambled, (char*)pkt, mysql->passwd);
-    if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH))
+    scramble(scrambled, (char *)pkt, mysql->passwd);
+    if (vio->write_packet(vio, (uchar *)scrambled, SCRAMBLE_LENGTH))
       DBUG_RETURN(CR_ERROR);
-  }
-  else
-  {
+  } else {
     DBUG_PRINT("info", ("no password"));
     if (vio->write_packet(vio, 0, 0)) /* no password */
       DBUG_RETURN(CR_ERROR);
@@ -6228,15 +6047,12 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   The main function of the mysql_clear_password authentication plugin.
 */
 
-static int clear_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
-{
+static int clear_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) {
   int res;
 
   /* send password in clear text */
-  res= vio->write_packet(vio, (const unsigned char *) mysql->passwd, 
-						 (int)strlen(mysql->passwd) + 1);
+  res = vio->write_packet(vio, (const unsigned char *)mysql->passwd,
+                          (int)strlen(mysql->passwd) + 1);
 
   return res ? CR_ERROR : CR_OK;
 }
-
-
diff --git a/sql-common/client_authentication.cc b/sql-common/client_authentication.cc
index 5d960d913fd4..2aec026f18da 100644
--- a/sql-common/client_authentication.cc
+++ b/sql-common/client_authentication.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,40 +38,34 @@
 
 #include <string.h>
 #include <stdarg.h>
-#if !defined(HAVE_YASSL)
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
+#include <openssl/sha.h>
 #if defined(_WIN32) && !defined(_OPENSSL_Applink) && defined(HAVE_OPENSSL_APPLINK_C)
 #include <openssl/applink.c>
 #endif
-#endif
 #include "mysql/plugin.h"
 
 #define MAX_CIPHER_LENGTH 1024
 
-#if !defined(HAVE_YASSL)
+#define SHA2_SCRAMBLE_LENGTH SHA256_DIGEST_LENGTH
+
 mysql_mutex_t g_public_key_mutex;
-#endif
 
 int sha256_password_init(char *a, size_t b, int c, va_list d)
 {
-#if !defined(HAVE_YASSL)
   mysql_mutex_init(0,&g_public_key_mutex, MY_MUTEX_INIT_SLOW);
-#endif
   return 0;
 }
 
 int sha256_password_deinit(void)
 {
-#if !defined(HAVE_YASSL)
   mysql_mutex_destroy(&g_public_key_mutex);
-#endif
   return 0;
 }
 
 
-#if !defined(HAVE_YASSL)
 /**
   Reads and parse RSA public key data from a file.
 
@@ -119,7 +125,6 @@ RSA *rsa_init(MYSQL *mysql)
 
   return key;
 }
-#endif // !defined(HAVE_YASSL)
 
 /**
   Authenticate the client using the RSA or TLS and a SHA256 salted password.
@@ -136,12 +141,10 @@ extern "C"
 int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 {
   bool uses_password= mysql->passwd[0] != 0;
-#if !defined(HAVE_YASSL)
   unsigned char encrypted_password[MAX_CIPHER_LENGTH];
   static char request_public_key= '\1';
   RSA *public_key= NULL;
   bool got_public_key_from_server= false;
-#endif
   bool connection_is_secure= false;
   unsigned char scramble_pkt[20];
   unsigned char *pkt;
@@ -175,9 +178,7 @@ int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   /* If connection isn't secure attempt to get the RSA public key file */
   if (!connection_is_secure)
   {
- #if !defined(HAVE_YASSL)
     public_key= rsa_init(mysql);
-#endif
   }
 
   if (!uses_password)
@@ -193,7 +194,6 @@ int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
     unsigned int passwd_len= static_cast<unsigned int>(strlen(mysql->passwd) + 1);
     if (!connection_is_secure)
     {
-#if !defined(HAVE_YASSL)
       /*
         If no public key; request one from the server.
       */
@@ -261,12 +261,6 @@ int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 
       if (vio->write_packet(vio, (uchar*) encrypted_password, cipher_length))
         DBUG_RETURN(CR_ERROR);
-#else
-      set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_ERR, unknown_sqlstate,
-                                ER(CR_AUTH_PLUGIN_ERR), "sha256_password",
-                                "Authentication requires SSL encryption");
-      DBUG_RETURN(CR_ERROR); // If no openssl support
-#endif
     }
     else
     {
@@ -279,4 +273,229 @@ int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   DBUG_RETURN(CR_OK);
 }
 
-#endif
+/* caching_sha2_password */
+
+int caching_sha2_password_init(char *, size_t, int, va_list)
+{
+  return 0;
+}
+
+int caching_sha2_password_deinit(void)
+{
+  return 0;
+}
+
+static bool is_secure_transport(MYSQL *mysql)
+{
+  if (!mysql || !mysql->net.vio)
+    return false;
+  switch (mysql->net.vio->type)
+  {
+    case VIO_TYPE_SSL:
+    {
+      if (mysql_get_ssl_cipher(mysql) == NULL)
+        return false;
+    }
+   // Fall through
+   case VIO_TYPE_SHARED_MEMORY:
+   // Fall through
+   case VIO_TYPE_SOCKET:
+     return true;
+   default:
+     return false;
+  }
+  return false;
+}
+
+/**
+  Authenticate the client using the RSA or TLS and a SHA2 salted password.
+
+  @param vio Provides plugin access to communication channel
+  @param mysql Client connection handler
+
+  @return Error status
+    @retval CR_ERROR An error occurred.
+    @retval CR_OK Authentication succeeded.
+*/
+
+static char request_public_key= '\2';
+static char fast_auth_success= '\3';
+static char perform_full_authentication= '\4';
+
+int caching_sha2_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
+{
+  bool uses_password= mysql->passwd[0] != 0;
+  unsigned char encrypted_password[MAX_CIPHER_LENGTH];
+  RSA *public_key= NULL;
+  bool got_public_key_from_server= false;
+  bool connection_is_secure= false;
+  unsigned char scramble_pkt[20];
+  unsigned char *pkt;
+
+  DBUG_ENTER("caching_sha2_password_auth_client");
+
+  /*
+    Get the scramble from the server because we need it when sending encrypted
+    password.
+  */
+  if (vio->read_packet(vio, &pkt) != SCRAMBLE_LENGTH + 1)
+  {
+    DBUG_PRINT("info", ("Scramble is not of correct length."));
+    DBUG_RETURN(CR_ERROR);
+  }
+
+  if (pkt[SCRAMBLE_LENGTH] != '\0')
+  {
+    DBUG_PRINT("info", ("Missing protocol token in scramble data."));
+    DBUG_RETURN(CR_ERROR);
+  }
+
+  /*
+    Copy the scramble to the stack or it will be lost on the next use of the
+    net buffer.
+  */
+  memcpy(scramble_pkt, pkt, SCRAMBLE_LENGTH);
+
+  connection_is_secure= is_secure_transport(mysql);
+
+  if (!uses_password)
+  {
+    /* We're not using a password */
+    static const unsigned char zero_byte= '\0';
+    if (vio->write_packet(vio, &zero_byte, 1))
+      DBUG_RETURN(CR_ERROR);
+    DBUG_RETURN(CR_OK);
+  }
+  else
+  {
+    /* Password is a 0-terminated byte array ('\0' character included) */
+    unsigned int passwd_len=
+      static_cast<unsigned int>(strlen(mysql->passwd) + 1);
+    int pkt_len= 0;
+    {
+      /* First try with SHA2 scramble */
+      unsigned char sha2_scramble[SHA2_SCRAMBLE_LENGTH];
+      if (generate_sha256_scramble(sha2_scramble, SHA2_SCRAMBLE_LENGTH,
+                                   mysql->passwd, passwd_len - 1,
+                                   (char *)scramble_pkt, SCRAMBLE_LENGTH))
+      {
+        set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_ERR, unknown_sqlstate,
+                                 ER(CR_AUTH_PLUGIN_ERR),
+                                 "caching_sha2_password",
+                                 "Failed to generate scramble");
+        DBUG_RETURN(CR_ERROR);
+      }
+
+      if (vio->write_packet(vio, sha2_scramble, SHA2_SCRAMBLE_LENGTH))
+        DBUG_RETURN(CR_ERROR);
+
+      if ((pkt_len= vio->read_packet(vio, &pkt)) == -1)
+        DBUG_RETURN(CR_ERROR);
+
+      if (pkt_len == 1 && *pkt == fast_auth_success)
+        DBUG_RETURN(CR_OK);
+
+      /* An OK packet would follow */
+    }
+
+    if (pkt_len != 1 || *pkt != perform_full_authentication)
+    {
+      DBUG_PRINT("info", ("Unexpected reply from server."));
+      DBUG_RETURN(CR_ERROR);
+    }
+
+    if (!connection_is_secure)
+    {
+      /* If connection isn't secure attempt to get the RSA public key file */
+      public_key= rsa_init(mysql);
+
+      if (public_key == NULL && mysql->options.extension &&
+          mysql->options.extension->get_server_public_key)
+      {
+        // If no public key; request one from the server.
+        if (vio->write_packet(vio, (const unsigned char *)&request_public_key,
+                              1))
+          DBUG_RETURN(CR_ERROR);
+
+        if ((pkt_len= vio->read_packet(vio, &pkt)) <= 0)
+          DBUG_RETURN(CR_ERROR);
+        BIO *bio= BIO_new_mem_buf(pkt, pkt_len);
+        public_key= PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL);
+        BIO_free(bio);
+        if (public_key == 0)
+        {
+          ERR_clear_error();
+          DBUG_PRINT("info", ("Failed to parse public key"));
+          DBUG_RETURN(CR_ERROR);
+        }
+        got_public_key_from_server= true;
+      }
+
+      if (public_key)
+      {
+        /*
+          An arbitrary limitation based on the assumption that passwords
+          larger than e.g. 15 symbols don't contribute to security.
+          Note also that it's further restricted to RSA_size() - 11 down
+          below, so this leaves 471 bytes of possible RSA key sizes which
+          should be reasonably future-proof.
+          We avoid heap allocation for speed reasons.
+        */
+        char passwd_scramble[512];
+
+        if (passwd_len > sizeof(passwd_scramble))
+        {
+          /* password too long for the buffer */
+          if (got_public_key_from_server) RSA_free(public_key);
+          DBUG_PRINT("info", ("Password is too long."));
+          DBUG_RETURN(CR_ERROR);
+        }
+        memmove(passwd_scramble, mysql->passwd, passwd_len);
+
+        /* Obfuscate the plain text password with the session scramble */
+        xor_string(passwd_scramble, passwd_len - 1, (char *)scramble_pkt,
+                   SCRAMBLE_LENGTH);
+        /* Encrypt the password and send it to the server */
+        int cipher_length= RSA_size(public_key);
+        /*
+          When using RSA_PKCS1_OAEP_PADDING the password length must be less
+          than RSA_size(rsa) - 41.
+        */
+        if (passwd_len + 41 >= (unsigned)cipher_length)
+        {
+          /* password message is to long */
+          if (got_public_key_from_server)
+            RSA_free(public_key);
+          DBUG_PRINT("info", ("Password is too long to be encrypted using "
+                              "given public key."));
+          DBUG_RETURN(CR_ERROR);
+        }
+        RSA_public_encrypt(passwd_len, (unsigned char *)passwd_scramble,
+                           encrypted_password, public_key,
+                           RSA_PKCS1_OAEP_PADDING);
+        if (got_public_key_from_server)
+          RSA_free(public_key);
+
+        if (vio->write_packet(vio, (uchar *)encrypted_password, cipher_length))
+          DBUG_RETURN(CR_ERROR);
+      }
+      else
+      {
+        set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_ERR, unknown_sqlstate,
+                                 ER(CR_AUTH_PLUGIN_ERR),
+                                 "caching_sha2_password",
+                                 "Authentication requires secure connection.");
+        DBUG_RETURN(CR_ERROR);
+      }
+    }
+    else
+    {
+      /* The vio is encrypted already; just send the plain text passwd */
+      if (vio->write_packet(vio, (uchar *)mysql->passwd, passwd_len))
+        DBUG_RETURN(CR_ERROR);
+    }
+  }
+  DBUG_RETURN(CR_OK);
+}
+
+#endif /* HAVE_OPENSSL */
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index c7dfda96d760..7cd462b588e1 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -130,8 +142,8 @@ find_plugin(const char *name, int type)
 {
   struct st_client_plugin_int *p;
 
-  DBUG_ASSERT(initialized);
-  DBUG_ASSERT(type >= 0 && type < MYSQL_CLIENT_MAX_PLUGINS);
+  assert(initialized);
+  assert(type >= 0 && type < MYSQL_CLIENT_MAX_PLUGINS);
   if (type < 0 || type >= MYSQL_CLIENT_MAX_PLUGINS)
     return 0;
 
@@ -164,7 +176,7 @@ do_add_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin,
   struct st_client_plugin_int plugin_int, *p;
   char errbuf[1024];
 
-  DBUG_ASSERT(initialized);
+  assert(initialized);
 
   plugin_int.plugin= plugin;
   plugin_int.dlhandle= dlhandle;
@@ -425,6 +437,10 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
   void *sym, *dlhandle;
   struct st_mysql_client_plugin *plugin;
   const char *plugindir;
+  const CHARSET_INFO *cs = NULL;
+  size_t len = (name ? strlen(name) : 0);
+  int well_formed_error;
+  size_t res = 0;
 #ifdef _WIN32
   char win_errormsg[2048];
 #endif
@@ -458,6 +474,31 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
       plugindir= PLUGINDIR;
     }
   }
+  if (mysql && mysql->charset)
+    cs = mysql->charset;
+  else
+    cs = &my_charset_latin1;
+  /* check if plugin name does not have any directory separator character */
+  if ((my_strcspn(cs, name, name + len, FN_DIRSEP, strlen(FN_DIRSEP))) < len) {
+    errmsg = "No paths allowed for shared library";
+    goto err;
+  }
+  /* check if plugin name does not exceed its maximum length */
+  res = cs->cset->well_formed_len(cs, name, name + len, NAME_CHAR_LEN,
+                                  &well_formed_error);
+
+  if (well_formed_error || len != res) {
+    errmsg = "Invalid plugin name";
+    goto err;
+  }
+  /*
+   check if length of(plugin_dir + plugin name) does not exceed its maximum
+   length
+  */
+  if ((strlen(plugindir) + len + 1) >= FN_REFLEN) {
+    errmsg = "Invalid path";
+    goto err;
+  }
 
   /* Compile dll path */
   strxnmov(dlpath, sizeof(dlpath) - 1,
diff --git a/sql-common/get_password.c b/sql-common/get_password.c
index ed0d6e8dace2..cedad18f25e3 100644
--- a/sql-common/get_password.c
+++ b/sql-common/get_password.c
@@ -1,16 +1,25 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql-common/my_path_permissions.cc b/sql-common/my_path_permissions.cc
new file mode 100644
index 000000000000..807271912fac
--- /dev/null
+++ b/sql-common/my_path_permissions.cc
@@ -0,0 +1,61 @@
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA */
+
+#include "my_dir.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/**
+  Check if a file/dir is world-writable (only on non-Windows platforms)
+
+  @param [in] Path of the file/dir to be checked
+
+  @returns Status of the file/dir check
+    @retval -2 Permission denied to check attributes of file/dir
+    @retval -1 Error in reading file/dir
+    @retval  0 File/dir is not world-writable
+    @retval  1 File/dir is world-writable
+ */
+
+int is_file_or_dir_world_writable(const char *path)
+{
+  MY_STAT stat_info;
+  (void)path; // avoid unused param warning when built on Windows
+#ifndef _WIN32
+  if (!my_stat(path, &stat_info, MYF(0)))
+  {
+      return (errno == EACCES) ? -2 : -1;
+  }
+  if ((stat_info.st_mode & S_IWOTH) &&
+      ((stat_info.st_mode & S_IFMT) == S_IFREG ||   /* file   */
+       (stat_info.st_mode & S_IFMT) == S_IFDIR))    /* or dir */
+    return 1;
+#endif
+  return 0;
+}
+
+#ifdef  __cplusplus
+}
+#endif
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 35ca499df53f..8b8711b96f95 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ Without limiting anything contained in the foregoing, this file,
+ which is part of C Driver for MySQL (Connector/C), is also subject to the
+ Universal FOSS Exception, version 1.0, a copy of which can be found at
+ http://oss.oracle.com/licenses/universal-foss-exception.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -176,7 +188,7 @@ my_bool check_time_range_quick(const MYSQL_TIME *ltime)
 {
   longlong hour= (longlong) ltime->hour + 24LL * ltime->day;
   /* The input value should not be fatally bad */
-  DBUG_ASSERT(!check_time_mmssff_range(ltime));
+  assert(!check_time_mmssff_range(ltime));
   if (hour <= TIME_MAX_HOUR &&
       (hour != TIME_MAX_HOUR || ltime->minute != TIME_MAX_MINUTE ||
        ltime->second != TIME_MAX_SECOND || !ltime->second_part))
@@ -892,7 +904,7 @@ number_to_time(longlong nr, MYSQL_TIME *ltime, int *warnings)
 */
 void adjust_time_range(struct st_mysql_time *my_time, int *warning) 
 {
-  DBUG_ASSERT(!check_time_mmssff_range(my_time));
+  assert(!check_time_mmssff_range(my_time));
   if (check_time_range_quick(my_time))
   {
     my_time->day= my_time->second_part= 0;
@@ -984,7 +996,7 @@ long calc_daynr(uint year,uint month,uint day)
   temp=(int) ((y/100+1)*3)/4;
   DBUG_PRINT("exit",("year: %d  month: %d  day: %d -> daynr: %ld",
 		     y+(month <= 2),month,day,delsum+y/4-temp));
-  DBUG_ASSERT(delsum+(int) y/4-temp >= 0);
+  assert(delsum+(int) y/4-temp >= 0);
   DBUG_RETURN(delsum+(int) y/4-temp);
 } /* calc_daynr */
 
@@ -1183,7 +1195,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,
 static inline int
 my_useconds_to_str(char *to, ulong useconds, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   return sprintf(to, ".%0*lu", (int) dec,
                  useconds / (ulong) log_10_int[DATETIME_MAX_DECIMALS - dec]);
 }
@@ -1321,7 +1333,7 @@ int my_TIME_to_str(const MYSQL_TIME *l_time, char *to, uint dec)
     to[0]='\0';
     return 0;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 }
@@ -1563,7 +1575,7 @@ ulonglong TIME_to_ulonglong(const MYSQL_TIME *my_time)
   case MYSQL_TIMESTAMP_ERROR:
     return 0ULL;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0;
 }
@@ -1641,10 +1653,10 @@ void TIME_from_longlong_time_packed(MYSQL_TIME *ltime, longlong tmp)
 */
 void my_time_packed_to_binary(longlong nr, uchar *ptr, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   /* Make sure the stored value was previously properly rounded or truncated */
-  DBUG_ASSERT((MY_PACKED_TIME_GET_FRAC_PART(nr) % 
-              (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
+  assert((MY_PACKED_TIME_GET_FRAC_PART(nr) % 
+          (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
 
   switch (dec)
   {
@@ -1683,7 +1695,7 @@ void my_time_packed_to_binary(longlong nr, uchar *ptr, uint dec)
 */
 longlong my_time_packed_from_binary(const uchar *ptr, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
 
   switch (dec)
   {
@@ -1773,7 +1785,7 @@ longlong TIME_to_longlong_datetime_packed(const MYSQL_TIME *ltime)
   longlong ymd= ((ltime->year * 13 + ltime->month) << 5) | ltime->day;
   longlong hms= (ltime->hour << 12) | (ltime->minute << 6) | ltime->second;
   longlong tmp= MY_PACKED_TIME_MAKE(((ymd << 17) | hms), ltime->second_part);
-  DBUG_ASSERT(!check_datetime_range(ltime)); /* Make sure no overflow */
+  assert(!check_datetime_range(ltime)); /* Make sure no overflow */
   return ltime->neg ? -tmp : tmp;
 }
 
@@ -1866,7 +1878,7 @@ longlong my_datetime_packed_from_binary(const uchar *ptr, uint dec)
 {
   longlong intpart= mi_uint5korr(ptr) - DATETIMEF_INT_OFS;
   int frac;
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   switch (dec)
   {
   case 0:
@@ -1898,10 +1910,10 @@ longlong my_datetime_packed_from_binary(const uchar *ptr, uint dec)
 */
 void my_datetime_packed_to_binary(longlong nr, uchar *ptr, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   /* The value being stored must have been properly rounded or truncated */
-  DBUG_ASSERT((MY_PACKED_TIME_GET_FRAC_PART(nr) %
-              (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
+  assert((MY_PACKED_TIME_GET_FRAC_PART(nr) %
+          (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
 
   mi_int5store(ptr, MY_PACKED_TIME_GET_INT_PART(nr) + DATETIMEF_INT_OFS);
   switch (dec)
@@ -1935,7 +1947,7 @@ void my_datetime_packed_to_binary(longlong nr, uchar *ptr, uint dec)
 */
 void my_timestamp_from_binary(struct timeval *tm, const uchar *ptr, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   tm->tv_sec= mi_uint4korr(ptr);
   switch (dec)
   {
@@ -1967,10 +1979,10 @@ void my_timestamp_from_binary(struct timeval *tm, const uchar *ptr, uint dec)
 */
 void my_timestamp_to_binary(const struct timeval *tm, uchar *ptr, uint dec)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   /* Stored value must have been previously properly rounded or truncated */
-  DBUG_ASSERT((tm->tv_usec %
-               (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
+  assert((tm->tv_usec %
+          (int) log_10_int[DATETIME_MAX_DECIMALS - dec]) == 0);
   mi_int4store(ptr, tm->tv_sec);
   switch (dec)
   {
@@ -2015,7 +2027,7 @@ longlong TIME_to_longlong_packed(const MYSQL_TIME *ltime)
   case MYSQL_TIMESTAMP_ERROR:
     return 0;
   }
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
diff --git a/sql-common/my_user.c b/sql-common/my_user.c
index 8d717ea7131e..734003e3be41 100644
--- a/sql-common/my_user.c
+++ b/sql-common/my_user.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/sql-common/pack.c b/sql-common/pack.c
index 971fa6670135..9535a88420d8 100644
--- a/sql-common/pack.c
+++ b/sql-common/pack.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,6 +57,40 @@ ulong STDCALL net_field_length(uchar **packet)
   return (ulong) uint4korr(pos+1);
 }
 
+/* The same as above but with max length check */
+ulong STDCALL net_field_length_checked(uchar **packet, ulong max_length)
+{
+  ulong len;
+  uchar *pos= (uchar *)*packet;
+
+  if (*pos < 251)
+  {
+    (*packet)++;
+    len= (ulong) *pos;
+    return (len > max_length) ? max_length : len;
+  }
+  if (*pos == 251)
+  {
+    (*packet)++;
+    return NULL_LENGTH;
+  }
+  if (*pos == 252)
+  {
+    (*packet)+=3;
+    len= (ulong) uint2korr(pos+1);
+    return (len > max_length) ? max_length : len;
+  }
+  if (*pos == 253)
+  {
+    (*packet)+=4;
+    len= (ulong) uint3korr(pos+1);
+    return (len > max_length) ? max_length : len;
+  }
+  (*packet)+=9;                                 /* Must be 254 when here */
+  len= (ulong) uint4korr(pos+1);
+  return (len > max_length) ? max_length : len;
+}
+
 /* The same as above but returns longlong */
 my_ulonglong net_field_length_ll(uchar **packet)
 {
@@ -138,3 +184,19 @@ uint net_length_size(ulonglong num)
   return 9;
 }
 
+/**
+  length of buffer required to represent a length-encoded string
+  give the length part of length encoded string. This function can
+  be used before calling net_field_lenth/net_field_length_ll.
+
+  @param [in] pos  Length information of length-encoded string
+
+  @return length of buffer needed to store this number [1, 3, 4, 9].
+*/
+
+uint net_field_length_size(const uchar *pos) {
+  if (*pos <= 251) return 1;
+  if (*pos == 252) return 3;
+  if (*pos == 253) return 4;
+  return 9;
+}
diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc
index cc55fdae5104..05bd2104fcdd 100644
--- a/sql-common/sql_string.cc
+++ b/sql-common/sql_string.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,6 +31,7 @@
 #include "sql_string.h"
 
 #include <algorithm>
+#include <limits>
 
 using std::min;
 using std::max;
@@ -39,7 +47,7 @@ PSI_memory_key key_memory_String_value;
 bool String::real_alloc(size_t length)
 {
   size_t arg_length= ALIGN_SIZE(length + 1);
-  DBUG_ASSERT(arg_length > length);
+  assert(arg_length > length);
   if (arg_length <= length)
     return true;                                 /* Overflow */
   m_length= 0;
@@ -88,12 +96,13 @@ bool String::real_alloc(size_t length)
    new buffer is smaller than the currently allocated buffer (if one exists),
    no allocation occured.
 
-   @retval true An error occured when attempting to allocate memory.
+   @retval true An error occured when attempting to allocate memory or memory
+   allocation length exceeded allowed limit (4GB) for String Class.
 */
 bool String::mem_realloc(size_t alloc_length, bool force_on_heap)
 {
   size_t len= ALIGN_SIZE(alloc_length + 1);
-  DBUG_ASSERT(len > alloc_length);
+  assert(len > alloc_length);
   if (len <= alloc_length)
     return true;                                 /* Overflow */
 
@@ -106,9 +115,13 @@ bool String::mem_realloc(size_t alloc_length, bool force_on_heap)
     m_alloced_length= 0;
   }
 
-  if (m_alloced_length < len)
+  if (m_alloced_length < len)     // Available bytes are not enough
   {
-    // Available bytes are not enough.
+    // Signal an error if len exceeds uint32 max on 64-bit word platform.
+#if defined(__WORDSIZE) && (__WORDSIZE == 64)
+    if (len > std::numeric_limits<uint32>::max())
+      return true;
+#endif
     char *new_ptr;
     if (m_is_alloced)
     {
@@ -370,7 +383,7 @@ bool String::copy_aligned(const char *str, size_t arg_length, size_t offset,
 {
   /* How many bytes are in incomplete character */
   offset= cs->mbminlen - offset; /* How many zeros we should prepend */
-  DBUG_ASSERT(offset && offset != cs->mbminlen);
+  assert(offset && offset != cs->mbminlen);
 
   size_t aligned_length= arg_length + offset;
   if (alloc(aligned_length))
@@ -421,7 +434,7 @@ bool String::copy(const char *str, size_t arg_length,
 {
   size_t offset;
 
-  DBUG_ASSERT(!str || str != m_ptr);
+  assert(!str || str != m_ptr);
 
   if (!needs_conversion(arg_length, from_cs, to_cs, &offset))
   {
@@ -500,8 +513,8 @@ bool String::append(const String &s)
 {
   if (s.length())
   {
-    DBUG_ASSERT(!this->uses_buffer_owned_by(&s));
-    DBUG_ASSERT(!s.uses_buffer_owned_by(this));
+    assert(!this->uses_buffer_owned_by(&s));
+    assert(!s.uses_buffer_owned_by(this));
 
     if (mem_realloc_exp((m_length + s.length())))
       return true;
@@ -575,7 +588,7 @@ bool String::append_ulonglong(ulonglong val)
 */
 bool String::append_longlong(longlong val)
 {
-  if (mem_realloc(m_length + MAX_BIGINT_WIDTH + 2))
+  if (mem_realloc_exp(m_length + MAX_BIGINT_WIDTH + 2))
     return true;                              /* purecov: inspected */
   char *end= longlong10_to_str(val, m_ptr + m_length, -10);
   m_length= end - m_ptr;
@@ -597,7 +610,7 @@ bool String::append(const char *s, size_t arg_length, const CHARSET_INFO *cs)
     size_t add_length;
     if ((cs == &my_charset_bin) && offset)
     {
-      DBUG_ASSERT(m_charset->mbminlen > offset);
+      assert(m_charset->mbminlen > offset);
       offset= m_charset->mbminlen - offset; // How many characters to pad
       add_length= arg_length + offset;
       if (mem_realloc_exp(m_length + add_length))
@@ -929,8 +942,8 @@ String *copy_if_not_alloced(String *to,String *from, size_t from_length)
     return from;				// Actually an error
 
   // from and to should not be overlapping
-  DBUG_ASSERT(!to->uses_buffer_owned_by(from));
-  DBUG_ASSERT(!from->uses_buffer_owned_by(to));
+  assert(!to->uses_buffer_owned_by(from));
+  assert(!from->uses_buffer_owned_by(to));
 
   if ((to->m_length= min(from->m_length, from_length)))
     memcpy(to->m_ptr, from->m_ptr, to->m_length);
@@ -1196,7 +1209,7 @@ size_t convert_to_printable(char *to, size_t to_len,
                             const CHARSET_INFO *from_cs, size_t nbytes /*= 0*/)
 {
   /* needs at least 8 bytes for '\xXX...' and zero byte */
-  DBUG_ASSERT(to_len >= 8);
+  assert(to_len >= 8);
 
   char *t= to;
   char *t_end= to + to_len - 1; // '- 1' is for the '\0' at the end
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 49d502ae277d..9a5c08f7333a 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -21,10 +28,8 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/sql 
   ${CMAKE_SOURCE_DIR}/sql/auth
   ${CMAKE_SOURCE_DIR}/regex 
-  ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/sql
-  ${LZ4_INCLUDE_DIR}
 )
 
 SET(CONF_SOURCES
@@ -117,6 +122,7 @@ SET(SQL_SHARED_SOURCES
   keycaches.cc
   lock.cc
   locking_service.cc
+  locks/shared_spin_lock.cc
   log.cc
   mdl.cc
   migrate_keyring.cc
@@ -151,6 +157,7 @@ SET(SQL_SHARED_SOURCES
   rpl_handler.cc
   rpl_transaction_ctx.cc
   rpl_transaction_write_set_ctx.cc
+  rpl_trx_tracking.cc
   rpl_write_set_handler.cc
   rules_table_service.cc
   session_tracker.cc
@@ -183,6 +190,7 @@ SET(SQL_SHARED_SOURCES
   sql_digest.cc
   sql_do.cc 
   sql_error.cc
+  sql_exception_handler.cc
   sql_executor.cc
   sql_get_diagnostics.cc
   sql_handler.cc
@@ -211,8 +219,10 @@ SET(SQL_SHARED_SOURCES
   sql_rewrite.cc
   sql_select.cc
   sql_servers.cc
+  sql_cmd_show.cc
   sql_show.cc
   sql_show_status.cc
+  sql_show_processlist.cc
   sql_signal.cc
   sql_state.c
   sql_table.cc
@@ -255,11 +265,12 @@ SET(SQL_SOURCE
   ${GEN_DIGEST_SOURCES}
   ${CONF_SOURCES}
   ${SQL_SHARED_SOURCES}
-  ../extra/lz4/xxhash.c
+  ${BUNDLED_LZ4_PATH}/xxhash.c
   ../libmysql/errmsg.c
   ../sql-common/client.c
   ../sql-common/client_plugin.c
   ../sql-common/get_password.c
+  ../sql-common/my_path_permissions.cc
   ../sql-common/my_time.c
   ../sql-common/my_user.c 
   ../sql-common/pack.c
@@ -270,6 +281,7 @@ SET(SQL_SOURCE
   conn_handler/connection_handler_per_thread.cc
   conn_handler/connection_handler_one_thread.cc
   conn_handler/socket_connection.cc
+  conn_handler/init_net_server_extension.cc
   des_key_file.cc
   event_data_objects.cc
   event_db_repository.cc 
@@ -287,8 +299,17 @@ SET(SQL_SOURCE
   srv_session.cc
   srv_session_info_service.cc
   srv_session_service.cc
+  auth/sha2_password_common.cc
   )
 
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+  ${CMAKE_SOURCE_DIR}/sql-common/client_authentication.cc
+  ${CMAKE_SOURCE_DIR}/sql/auth/auth_common.h
+  ${CMAKE_SOURCE_DIR}/sql/auth/sql_authentication.cc
+  ${CMAKE_SOURCE_DIR}/sql/auth/sql_authentication.h
+  ${CMAKE_SOURCE_DIR}/sql/des_key_file.cc
+  ${CMAKE_SOURCE_DIR}/sql/item_strfunc.cc)
+
 IF(NOT WIN32)
   LIST(APPEND SQL_SOURCE mysqld_daemon.cc)
 ENDIF()
@@ -302,25 +323,20 @@ IF(WIN32)
 ENDIF()
 
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+INCLUDE_DIRECTORIES(SYSTEM
+  ${BOOST_PATCHES_DIR}
+  ${BOOST_INCLUDE_DIR}
+  )
+
 ADD_COMPILE_FLAGS(
-  debug_sync.cc
-  handler.cc
-  geometry_rtree.cc
-  item_geofunc.cc
-  item_geofunc_buffer.cc
-  item_geofunc_internal.cc
-  item_geofunc_relchecks.cc
-  item_geofunc_relchecks_bgwrap.cc
-  item_geofunc_setops.cc
-  item_json_func.cc
-  spatial.cc
-  COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
+  ${BUNDLED_LZ4_PATH}/xxhash.c
+  COMPILE_FLAGS -DXXH_NAMESPACE=MY_ -I${BUNDLED_LZ4_PATH}
 )
 
 ADD_COMPILE_FLAGS(
-  ../extra/lz4/xxhash.c
-  COMPILE_FLAGS -DXXH_NAMESPACE=MY_
-)
+  rpl_write_set_handler.cc
+  COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH}
+  )
 
 # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
 IF(WIN32 AND CMAKE_SIZEOF_VOID_P MATCHES 8)
@@ -349,11 +365,19 @@ ENDIF()
 # Segfault in boost::geometry code at high optimization levels
 IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
   STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
-  IF(CMAKEBT MATCHES "^REL")
+  IF(CMAKEBT MATCHES "REL")
     ADD_COMPILE_FLAGS(item_geofunc_buffer.cc COMPILE_FLAGS "-xO2")
   ENDIF()
 ENDIF()
 
+# MD5_Init() MD5_Update() MD5_Final() are all deprecated
+IF(SOLARIS AND CMAKE_COMPILER_IS_GNUCXX)
+  ADD_COMPILE_FLAGS(
+    des_key_file.cc
+    item_strfunc.cc
+    COMPILE_FLAGS "-Wno-deprecated-declarations")
+ENDIF()
+
 # Boost source has misleading indentation
 MY_CHECK_CXX_COMPILER_FLAG("-Wmisleading-indentation"
                            HAVE_MISLEADING_INDENTATION)
@@ -379,6 +403,14 @@ IF(HAVE_MAYBE_UNINITIALIZED)
     COMPILE_FLAGS "-Wno-maybe-uninitialized")
 ENDIF()
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753
+IF(MY_COMPILER_IS_GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  ADD_COMPILE_FLAGS(
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_hints.yy.cc
+    COMPILE_FLAGS "-Wno-free-nonheap-object -Wno-unused-label")
+ENDIF()
+
 MY_CHECK_CXX_COMPILER_FLAG("-fno-builtin-memcmp" HAVE_NO_BUILTIN_MEMCMP)
 # See comments in filesort_compare-t.cc about __builtin_memcmp
 IF(HAVE_NO_BUILTIN_MEMCMP)
@@ -420,7 +452,7 @@ SET (BINLOG_SOURCE rpl_gtid_misc.cc
                    rpl_gtid_state.cc rpl_gtid_owned.cc rpl_gtid_execution.cc
                    rpl_gtid_mutex_cond_array.cc rpl_gtid_persist.cc
                    log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
-                   rpl_filter.cc rpl_record.cc rpl_record_old.cc
+                   rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_trx_tracking.cc
                    rpl_utility.cc rpl_injector.cc rpl_table_access.cc)
 ADD_CONVENIENCE_LIBRARY(binlog ${BINLOG_SOURCE})
 TARGET_LINK_LIBRARIES(binlog binlogevents_static)
@@ -450,12 +482,9 @@ SET(SQL_GUNIT_LIB_SOURCE
   sql_list.cc 
   ../sql-common/sql_string.cc
   thr_malloc.cc
+  locks/shared_spin_lock.cc
   )
 
-IF(WIN32)
-  LIST(APPEND SQL_GUNIT_LIB_SOURCE named_pipe.cc)
-ENDIF()
-
 ADD_CONVENIENCE_LIBRARY(sqlgunitlib ${SQL_GUNIT_LIB_SOURCE})
 ADD_DEPENDENCIES(sqlgunitlib GenError)
 
@@ -528,6 +557,29 @@ ENDIF()
 SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) 
 TARGET_LINK_LIBRARIES(mysqld sql binlog rpl master slave sql mysys mysys_ssl binlogevents_static)
 
+# Plugins may need more symbols than the server does.
+IF(UNIX AND STATIC_SSL_LIBRARY)
+  IF(APPLE)
+    TARGET_LINK_LIBRARIES(mysqld
+      -Wl,-force_load ${CRYPTO_LIBRARY}
+      -Wl,-force_load ${OPENSSL_LIBRARY}
+      )
+  ELSE()
+    # OpenSSL 3.0.8 has an issue with duplicate symbols between static crypto
+    # and ssl libraries. See https://github.com/openssl/openssl/issues/20238
+    IF("${OPENSSL_VERSION}" VERSION_EQUAL "3.0.8")
+      TARGET_LINK_LIBRARIES(mysqld
+        -Wl,--whole-archive,--allow-multiple-definition ${SSL_LIBRARIES}
+        -Wl,--no-whole-archive
+        )
+    ELSE()
+      TARGET_LINK_LIBRARIES(mysqld
+        -Wl,--whole-archive ${SSL_LIBRARIES} -Wl,--no-whole-archive
+        )
+    ENDIF()
+  ENDIF()
+ENDIF()
+
 # Provide plugins with minimal set of libraries
 SET(INTERFACE_LIBS ${LIBRT})
 IF(INTERFACE_LIBS)
@@ -552,18 +604,16 @@ IF(WITH_MYSQLD_LDFLAGS)
      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
 ENDIF()
 
-IF(DEBUG_EXTNAME)
-  INSTALL_DEBUG_TARGET(mysqld 
-    DESTINATION ${INSTALL_SBINDIR} 
-    PDB_DESTINATION ${INSTALL_SBINDIR}
-    SUFFIX "-debug")
-ELSE()
-  INSTALL_DEBUG_TARGET(mysqld 
-    DESTINATION ${INSTALL_SBINDIR} 
-    PDB_DESTINATION ${INSTALL_SBINDIR}/debug
-    RENAME mysqld-debug)
-ENDIF()
+# Help INSTALL_DEBUG_TARGET to locate it
+SET_TARGET_PROPERTIES(mysqld PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
+# See DEBUG_EXTNAME above: mysqld may already have name mysqld-debug,
+# and the rename is a no-op. If it is called 'mysqld' we rename it.
+INSTALL_DEBUG_TARGET(mysqld
+  DESTINATION ${INSTALL_SBINDIR}
+  RENAME mysqld-debug${CMAKE_EXECUTABLE_SUFFIX}
+)
 
 # Handle out-of-source build from source package with possibly broken 
 # bison. Copy bison output to from source to build directory, if not already 
@@ -627,21 +677,13 @@ ADD_CUSTOM_TARGET(
 )
 
 
-IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
-  ADD_LIBRARY(udf_example MODULE udf_example.cc)
-  SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "")
-  # udf_example depends on strings 
+MYSQL_ADD_PLUGIN(udf_example udf_example.cc
+                 MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
+IF(NOT DISABLE_SHARED)
   IF(WIN32)
-    IF(MSVC)
-     SET_TARGET_PROPERTIES(udf_example
-       PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
-    ENDIF()
-    TARGET_LINK_LIBRARIES(udf_example strings)
-  ELSE()
-    # udf_example is using safemutex exported by mysqld
-    TARGET_LINK_LIBRARIES(udf_example mysqld)
     SET_TARGET_PROPERTIES(udf_example
-      PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+      PROPERTIES LINK_FLAGS
+      "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
   ENDIF()
 ENDIF()
 
@@ -658,11 +700,10 @@ IF(NOT DISABLE_SHARED)
   ENDIF()
 ENDIF()
 
-FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar 
- tar git)
- STRING(TOUPPER ${tool}  TOOL)
- FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
- MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
+FOREACH(tool gtar tar git)
+  STRING(TOUPPER ${tool}  TOOL)
+  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
+  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()
 
 CONFIGURE_FILE(
diff --git a/sql/abstract_query_plan.cc b/sql/abstract_query_plan.cc
index 4958035197f9..a94bdecaae8f 100644
--- a/sql/abstract_query_plan.cc
+++ b/sql/abstract_query_plan.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -35,9 +42,9 @@ namespace AQP
       This combination is assumed not to appear. If it does, code must
       be written to handle it.
     */
-    DBUG_ASSERT(!m_qep_tabs[0].dynamic_range()
-                || (m_qep_tabs[0].type() == JT_ALL)
-                || (m_qep_tabs[0].quick() == NULL));
+    assert(!m_qep_tabs[0].dynamic_range()
+           || (m_qep_tabs[0].type() == JT_ALL)
+           || (m_qep_tabs[0].quick() == NULL));
 
     m_table_accesses= new Table_access[m_access_count];
     for(uint i= 0; i < m_access_count; i++)
@@ -56,7 +63,7 @@ namespace AQP
   /** Get the QEP_TAB of the n'th table access operation.*/
   const QEP_TAB* Join_plan::get_qep_tab(uint qep_tab_no) const
   {
-    DBUG_ASSERT(qep_tab_no < m_access_count);
+    assert(qep_tab_no < m_access_count);
     return m_qep_tabs + qep_tab_no;
   }
 
@@ -68,7 +75,7 @@ namespace AQP
   Table_access::get_join_type(const Table_access* predecessor) const
   {
     DBUG_ENTER("get_join_type");
-    DBUG_ASSERT(get_access_no() > predecessor->get_access_no());
+    assert(get_access_no() > predecessor->get_access_no());
 
     const QEP_TAB* const me= get_qep_tab();
     const plan_idx first_inner= me->first_inner();
@@ -110,11 +117,11 @@ namespace AQP
   */
   uint Table_access::get_no_of_key_fields() const
   {
-    DBUG_ASSERT(m_access_type == AT_PRIMARY_KEY ||
-                m_access_type == AT_UNIQUE_KEY ||
-                m_access_type == AT_MULTI_PRIMARY_KEY ||
-                m_access_type == AT_MULTI_UNIQUE_KEY ||
-                m_access_type == AT_ORDERED_INDEX_SCAN); // Used as 'range scan'
+    assert(m_access_type == AT_PRIMARY_KEY ||
+           m_access_type == AT_UNIQUE_KEY ||
+           m_access_type == AT_MULTI_PRIMARY_KEY ||
+           m_access_type == AT_MULTI_UNIQUE_KEY ||
+           m_access_type == AT_ORDERED_INDEX_SCAN); // Used as 'range scan'
     return get_qep_tab()->ref().key_parts;
   }
 
@@ -125,7 +132,7 @@ namespace AQP
   */
   const Item* Table_access::get_key_field(uint field_no) const
   {
-    DBUG_ASSERT(field_no < get_no_of_key_fields());
+    assert(field_no < get_no_of_key_fields());
     return get_qep_tab()->ref().items[field_no];
   }
 
@@ -136,7 +143,7 @@ namespace AQP
   */
   const KEY_PART_INFO* Table_access::get_key_part_info(uint field_no) const
   {
-    DBUG_ASSERT(field_no < get_no_of_key_fields());
+    assert(field_no < get_no_of_key_fields());
     const KEY* key= &get_qep_tab()->table()->key_info[get_qep_tab()->ref().key];
     return &key->key_part[field_no];
   }
@@ -158,19 +165,19 @@ namespace AQP
         return 1.0;
 
       case AT_ORDERED_INDEX_SCAN:
-        DBUG_ASSERT(get_qep_tab()->position());
-        DBUG_ASSERT(get_qep_tab()->position()->rows_fetched > 0.0);
+        assert(get_qep_tab()->position());
+        assert(get_qep_tab()->position()->rows_fetched > 0.0);
         return get_qep_tab()->position()->rows_fetched;
 
       case AT_MULTI_PRIMARY_KEY:
       case AT_MULTI_UNIQUE_KEY:
       case AT_MULTI_MIXED:
-        DBUG_ASSERT(get_qep_tab()->position());
-        DBUG_ASSERT(get_qep_tab()->position()->rows_fetched > 0.0);
+        assert(get_qep_tab()->position());
+        assert(get_qep_tab()->position()->rows_fetched > 0.0);
         return get_qep_tab()->position()->rows_fetched;
 
       case AT_TABLE_SCAN:
-        DBUG_ASSERT(get_qep_tab()->table()->file->stats.records > 0.0);
+        assert(get_qep_tab()->table()->file->stats.records > 0.0);
         return static_cast<double>(get_qep_tab()->table()->file->stats.records);
 
       default:
@@ -188,7 +195,7 @@ namespace AQP
   Item_equal*
   Table_access::get_item_equal(const Item_field* field_item) const
   {
-    DBUG_ASSERT(field_item->type() == Item::FIELD_ITEM);
+    assert(field_item->type() == Item::FIELD_ITEM);
 
     COND_EQUAL* const cond_equal = get_qep_tab()->join()->cond_equal;
     if (cond_equal!=NULL)
@@ -292,8 +299,8 @@ namespace AQP
 
     case JT_REF:
     {
-      DBUG_ASSERT(qep_tab->ref().key >= 0);
-      DBUG_ASSERT((uint)qep_tab->ref().key < MAX_KEY);
+      assert(qep_tab->ref().key >= 0);
+      assert((uint)qep_tab->ref().key < MAX_KEY);
       m_index_no= qep_tab->ref().key;
 
       /*
@@ -312,16 +319,16 @@ namespace AQP
       }
       else
       {
-        DBUG_ASSERT(qep_tab->ref().key_parts > 0);
-        DBUG_ASSERT(qep_tab->ref().key_parts <=
-                    key_info[m_index_no].user_defined_key_parts);
+        assert(qep_tab->ref().key_parts > 0);
+        assert(qep_tab->ref().key_parts <=
+               key_info[m_index_no].user_defined_key_parts);
         m_access_type= AT_ORDERED_INDEX_SCAN;
         DBUG_PRINT("info", ("Operation %d is an ordered index scan.", m_tab_no));
       }
       break;
     }
     case JT_INDEX_SCAN:
-      DBUG_ASSERT(qep_tab->index() < MAX_KEY);
+      assert(qep_tab->index() < MAX_KEY);
       m_index_no=    qep_tab->index();
       m_access_type= AT_ORDERED_INDEX_SCAN;
       DBUG_PRINT("info", ("Operation %d is an ordered index scan.", m_tab_no));
@@ -363,10 +370,10 @@ namespace AQP
 
           // Temporary assert as we are still investigation the relation between 
           // 'quick->index == MAX_KEY' and the different quick_types
-          DBUG_ASSERT ((quick->index == MAX_KEY)  ==
-                        ((quick->get_type() == QUICK_SELECT_I::QS_TYPE_INDEX_MERGE) ||
-                         (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT) ||
-                         (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_UNION)));
+          assert ((quick->index == MAX_KEY)  ==
+                  ((quick->get_type() == QUICK_SELECT_I::QS_TYPE_INDEX_MERGE) ||
+                   (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_INTERSECT) ||
+                   (quick->get_type() == QUICK_SELECT_I::QS_TYPE_ROR_UNION)));
 
           // JT_INDEX_MERGE: We have a set of qualifying PKs as root of pushed joins
           if (quick->index == MAX_KEY) 
@@ -451,7 +458,7 @@ namespace AQP
     const QEP_TAB* const qep_tab= get_qep_tab();
     if (qep_tab->do_firstmatch())
     {
-      DBUG_ASSERT(qep_tab->firstmatch_return < qep_tab->idx());
+      assert(qep_tab->firstmatch_return < qep_tab->idx());
       const uint firstmatch_last_skipped= 
         qep_tab->firstmatch_return + 1;
 
diff --git a/sql/abstract_query_plan.h b/sql/abstract_query_plan.h
index 269ed6dc6c6f..f4f68dfd8e4c 100644
--- a/sql/abstract_query_plan.h
+++ b/sql/abstract_query_plan.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -250,7 +257,7 @@ namespace AQP
   */
   inline const Table_access* Join_plan::get_table_access(uint access_no) const
   {
-    DBUG_ASSERT(access_no < m_access_count);
+    assert(access_no < m_access_count);
     return m_table_accesses + access_no;
   }
 
diff --git a/sql/add_errmsg b/sql/add_errmsg
index 6b10fcc3af7b..ca534e158378 100755
--- a/sql/add_errmsg
+++ b/sql/add_errmsg
@@ -1,15 +1,22 @@
 #!/bin/sh
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/sql/aggregate_check.cc b/sql/aggregate_check.cc
index b988aadfa63b..338065213c62 100644
--- a/sql/aggregate_check.cc
+++ b/sql/aggregate_check.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -82,7 +89,7 @@ bool Distinct_check::check_query(THD *thd)
   {
     if (order->in_field_list) // is in SELECT list
       continue;
-    DBUG_ASSERT((*order->item)->fixed);
+    assert((*order->item)->fixed);
     uint counter;
     enum_resolution_type resolution;
     /*
@@ -163,7 +170,7 @@ bool Group_check::check_query(THD *thd)
   }
 
   // aggregate without GROUP BY has no ORDER BY at this stage.
-  DBUG_ASSERT(!(select->is_implicitly_grouped() && select->is_ordered()));
+  assert(!(select->is_implicitly_grouped() && select->is_ordered()));
   // Validate ORDER BY list
   if (order)
   {
@@ -225,7 +232,7 @@ bool Group_check::check_query(THD *thd)
 bool Group_check::check_expression(THD *thd, Item *expr,
                                    bool in_select_list)
 {
-  DBUG_ASSERT(!is_child());
+  assert(!is_child());
   if (!in_select_list)
   {
     uint counter;
@@ -246,6 +253,9 @@ bool Group_check::check_expression(THD *thd, Item *expr,
 
   for (ORDER *grp= select->group_list.first; grp; grp= grp->next)
   {
+    if ((*grp->item)->type() == Item::INT_ITEM &&
+        (*grp->item)->basic_const_item()) /* group by position */
+      return false;
     if ((*grp->item)->eq(expr, false))
       return false;          // Expression is in GROUP BY so is ok
   }
@@ -429,7 +439,7 @@ bool Group_check::is_fd_on_source(Item *item)
 
     if (map_of_new_fds != 0)     // something new, check again
     {
-      DBUG_ASSERT((map_of_new_fds & PSEUDO_TABLE_BITS) == 0);
+      assert((map_of_new_fds & PSEUDO_TABLE_BITS) == 0);
       if (is_in_fd(item))
         return true;
        // Recheck keys only in tables with something new:
@@ -572,7 +582,7 @@ Item *Group_check::select_expression(uint idx)
   Item *expr_under;
   for (uint k= 0; k <= idx ; k++)
     expr_under= it_select_list_of_subq++;
-  DBUG_ASSERT(expr_under);
+  assert(expr_under);
   return expr_under;
 }
 
@@ -671,7 +681,7 @@ bool Group_check::is_in_fd(Item *item)
     return group_in_fd == ~0ULL;
   }
 
-  DBUG_ASSERT(local_column(item));
+  assert(local_column(item));
   Used_tables ut(select);
   (void) item->walk(&Item::used_tables_for_level, Item::WALK_POSTFIX,
                     pointer_cast<uchar *>(&ut));
@@ -738,8 +748,8 @@ bool Group_check::is_in_fd_of_underlying(Item_ident *item)
       we have this->fd={v1.a}, and we search if v1.b is FD on v1.a. We'll look
       if t1.a*2 is FD on t1.a.
     */
-    DBUG_ASSERT(static_cast<const Item_ref *>(item)->ref_type() ==
-                Item_ref::VIEW_REF);
+    assert(static_cast<const Item_ref *>(item)->ref_type() ==
+           Item_ref::VIEW_REF);
     /*
       Refuse RAND_TABLE_BIT because:
       - FDs in a view are those of the underlying query expression.
@@ -759,7 +769,7 @@ bool Group_check::is_in_fd_of_underlying(Item_ident *item)
       derived_table_ref field to Item_direct_view_ref objects and use it here.
     */
     TABLE_LIST *const tl= item->cached_table;
-    DBUG_ASSERT(tl->is_view_or_derived());
+    assert(tl->is_view_or_derived());
     /*
       We might find expression-based FDs in the result of the view's query
       expression; but if this view is on the weak side of an outer join,
@@ -795,9 +805,9 @@ bool Group_check::is_in_fd_of_underlying(Item_ident *item)
     TABLE_LIST *const tl= item_field->field->table->pos_in_table_list;
     if (item_field->field->is_gcol())         // Generated column
     {
-      DBUG_ASSERT(!tl->uses_materialization());
+      assert(!tl->uses_materialization());
       Item *const expr= item_field->field->gcol_info->expr_item;
-      DBUG_ASSERT(expr->fixed);
+      assert(expr->fixed);
       Used_tables ut(select);
       item_field->used_tables_for_level(pointer_cast<uchar *>(&ut));
       const bool weak_side_upwards= tl->is_inner_table_of_outer_join();
@@ -972,7 +982,7 @@ void Group_check::analyze_scalar_eq(Item *cond,
         This may be constant=right_item and thus not be an NFFD, but WHERE is
         exterior to join nests so propagation is not needed.
       */
-      DBUG_ASSERT(!weak_side_upwards);          // cannot be inner join
+      assert(!weak_side_upwards);          // cannot be inner join
       add_to_fd(right_item, true);
     }
     else
@@ -1087,7 +1097,7 @@ void Group_check::find_fd_in_joined_table(List<TABLE_LIST> *join_list)
         outer join nest or to WHERE. So this assertion should hold.
         Thus, used_tables are weak tables.
       */
-      DBUG_ASSERT(table->outer_join);
+      assert(table->outer_join);
       /*
         We might find equality-based FDs in the result of this outer join; but
         if this outer join is itself on the weak side of a parent outer join,
diff --git a/sql/aggregate_check.h b/sql/aggregate_check.h
index 1d1964df2877..290a09d797eb 100644
--- a/sql/aggregate_check.h
+++ b/sql/aggregate_check.h
@@ -1,16 +1,23 @@
 #ifndef AGGREGATE_CHECK_INCLUDED
 #define AGGREGATE_CHECK_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -484,11 +491,11 @@ class Item_tree_walker
 {
 protected:
   Item_tree_walker() : stopped_at_item(NULL) {}
-  ~Item_tree_walker() { DBUG_ASSERT(!stopped_at_item); }
+  ~Item_tree_walker() { assert(!stopped_at_item); }
 
   /// Stops walking children of this item
   void stop_at(const Item *i)
-  { DBUG_ASSERT(!stopped_at_item); stopped_at_item= i; }
+  { assert(!stopped_at_item); stopped_at_item= i; }
 
   /**
      @returns if we are stopped. If item 'i' is where we stopped, restarts the
@@ -654,7 +661,7 @@ class Group_check: public Item_tree_walker, public Sql_alloc
     group_in_fd(0ULL), m_root(root), fd(root), whole_tables_fd(0),
     mat_tables(root)
     {
-      DBUG_ASSERT(table);
+      assert(table);
     }
   bool check_expression(THD *thd, Item *expr, bool in_select_list);
   /// Shortcut for common use of Item::local_column()
diff --git a/sql/atomic_class.h b/sql/atomic_class.h
index 04d3492b19fb..b4772e88b2f6 100644
--- a/sql/atomic_class.h
+++ b/sql/atomic_class.h
@@ -1,14 +1,25 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -98,7 +109,7 @@ public:                                                                 \
         guess= &_guess;                                                 \
       }                                                                 \
       else                                                              \
-        DBUG_ASSERT(*guess < n);                                        \
+        assert(*guess < n);                                             \
       bool ret;                                                         \
       do {                                                              \
         ret= atomic_compare_and_swap(guess, n);                         \
diff --git a/sql/auth/auth_acls.h b/sql/auth/auth_acls.h
index 21e302416b2a..988db7a039e8 100644
--- a/sql/auth/auth_acls.h
+++ b/sql/auth/auth_acls.h
@@ -1,16 +1,23 @@
 #ifndef AUTH_ACLS_INCLUDED
 #define AUTH_ACLS_INCLUDED
 
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -59,42 +66,80 @@
 */
 
 #define NO_ACCESS       (1L << 30)
-#define DB_ACLS \
-(UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
- GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \
- LOCK_TABLES_ACL | EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | \
- CREATE_PROC_ACL | ALTER_PROC_ACL | EVENT_ACL | TRIGGER_ACL)
 
-#define TABLE_ACLS \
-(SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
- GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_VIEW_ACL | \
- SHOW_VIEW_ACL | TRIGGER_ACL)
+/**
+  Privileges to perform database related operations.
+  Use this macro over DB_ACLS unless there is real need to use
+  additional privileges present in the DB_ACLS
+*/
+#define DB_OP_ACLS                                                             \
+  (UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
+   REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | LOCK_TABLES_ACL | \
+   EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | CREATE_PROC_ACL |           \
+   ALTER_PROC_ACL | EVENT_ACL | TRIGGER_ACL)
 
-#define COL_ACLS \
-(SELECT_ACL | INSERT_ACL | UPDATE_ACL | REFERENCES_ACL)
+/**
+  Privileges to perform table related operations.
+  Use this macro over TABLE_ACLS unless there is real need to use
+  additional privileges present in the TABLE_ACLS
+*/
+#define TABLE_OP_ACLS                                                          \
+  (SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
+   REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL |  \
+   TRIGGER_ACL)
 
-#define PROC_ACLS \
-(ALTER_PROC_ACL | EXECUTE_ACL | GRANT_ACL)
+/**
+  Privileges to modify or execute stored procedures.
+  Use this macro over PROC_ACLS unless there is real need to use
+  additional privileges present in the PROC_ACLS
+*/
+#define PROC_OP_ACLS (ALTER_PROC_ACL | EXECUTE_ACL)
 
-#define SHOW_PROC_ACLS \
-(ALTER_PROC_ACL | EXECUTE_ACL | CREATE_PROC_ACL)
+/**
+  Represents all privileges which could be granted to users at DB-level. It
+  essentially represents all the privileges present in the mysql.db table.
+*/
+#define DB_ACLS (DB_OP_ACLS | GRANT_ACL)
 
-#define GLOBAL_ACLS \
-(SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
- RELOAD_ACL | SHUTDOWN_ACL | PROCESS_ACL | FILE_ACL | GRANT_ACL | \
- REFERENCES_ACL | INDEX_ACL | ALTER_ACL | SHOW_DB_ACL | SUPER_ACL | \
- CREATE_TMP_ACL | LOCK_TABLES_ACL | REPL_SLAVE_ACL | REPL_CLIENT_ACL | \
- EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | CREATE_PROC_ACL | \
- ALTER_PROC_ACL | CREATE_USER_ACL | EVENT_ACL | TRIGGER_ACL | \
- CREATE_TABLESPACE_ACL)
-
-#define DEFAULT_CREATE_PROC_ACLS \
-(ALTER_PROC_ACL | EXECUTE_ACL)
-
-#define SHOW_CREATE_TABLE_ACLS \
-(SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | \
- CREATE_ACL | DROP_ACL | ALTER_ACL | INDEX_ACL | \
- TRIGGER_ACL | REFERENCES_ACL | GRANT_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL)
+/**
+  Represents all privileges which could be granted to users at table-level. It
+  essentially represents all the privileges present in the mysql.tables_priv
+  table.
+*/
+#define TABLE_ACLS (TABLE_OP_ACLS | GRANT_ACL)
+
+/**
+  Represents all privileges which could be granted to users at column-level. It
+  essentially represents all the privileges present in the columns_priv table.
+*/
+#define COL_ACLS (SELECT_ACL | INSERT_ACL | UPDATE_ACL | REFERENCES_ACL)
+
+/**
+  Represents all privileges which could be granted to users for stored
+  procedures. It essentially represents all the privileges present in the
+  mysql.procs_priv table.
+*/
+#define PROC_ACLS (PROC_OP_ACLS | GRANT_ACL)
+
+/**
+  Represents all privileges which are required to show the stored procedure.
+*/
+#define SHOW_PROC_ACLS (ALTER_PROC_ACL | EXECUTE_ACL | CREATE_PROC_ACL)
+
+/**
+  Represents all privileges which could be granted to users globally.
+  It essentially represents all the privileges present in the mysql.user table
+*/
+#define GLOBAL_ACLS                                                            \
+  (SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
+   RELOAD_ACL | SHUTDOWN_ACL | PROCESS_ACL | FILE_ACL | GRANT_ACL |            \
+   REFERENCES_ACL | INDEX_ACL | ALTER_ACL | SHOW_DB_ACL | SUPER_ACL |          \
+   CREATE_TMP_ACL | LOCK_TABLES_ACL | REPL_SLAVE_ACL | REPL_CLIENT_ACL |       \
+   EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL | CREATE_PROC_ACL |           \
+   ALTER_PROC_ACL | CREATE_USER_ACL | EVENT_ACL | TRIGGER_ACL |                \
+   CREATE_TABLESPACE_ACL)
+
+#define DEFAULT_CREATE_PROC_ACLS (ALTER_PROC_ACL | EXECUTE_ACL)
 
 /**
   Table-level privileges which are automatically "granted" to everyone on
diff --git a/sql/auth/auth_common.h b/sql/auth/auth_common.h
index fecc5c286d97..b202636007d2 100644
--- a/sql/auth/auth_common.h
+++ b/sql/auth/auth_common.h
@@ -1,16 +1,23 @@
 #ifndef AUTH_COMMON_INCLUDED
 #define AUTH_COMMON_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -357,7 +364,7 @@ class Acl_load_user_table_current_schema : public Acl_load_user_table_schema
   uint host_idx() { return MYSQL_USER_FIELD_HOST; }
   uint user_idx() { return MYSQL_USER_FIELD_USER; }
   //not available
-  uint password_idx() { DBUG_ASSERT(0); return MYSQL_USER_FIELD_COUNT; }
+  uint password_idx() { assert(0); return MYSQL_USER_FIELD_COUNT; }
   uint select_priv_idx() { return MYSQL_USER_FIELD_SELECT_PRIV; }
   uint insert_priv_idx() { return MYSQL_USER_FIELD_INSERT_PRIV; }
   uint update_priv_idx() { return MYSQL_USER_FIELD_UPDATE_PRIV; }
@@ -560,6 +567,13 @@ class Acl_load_user_table_schema_factory
       table->field[Acl_load_user_table_old_schema::MYSQL_USER_FIELD_PASSWORD_56];
     return strncmp(password_field->field_name, "Password", 8) == 0;
   }
+
+  virtual bool user_table_schema_check(TABLE* table)
+  {
+    return table->s->fields >
+           Acl_load_user_table_old_schema::MYSQL_USER_FIELD_PASSWORD_56;
+  }
+
   virtual ~Acl_load_user_table_schema_factory() {}
 };
 
@@ -601,13 +615,15 @@ bool acl_check_host(const char *host, const char *ip);
 
 /* rewrite CREATE/ALTER/GRANT user */
 void mysql_rewrite_create_alter_user(THD *thd, String *rlb,
-                                     std::set<LEX_USER *> *extra_users= NULL);
+                                     std::set<LEX_USER *> *extra_users= NULL,
+                                     bool hide_password_hash= false);
 void mysql_rewrite_grant(THD *thd, String *rlb);
 
 /* sql_user */
 void append_user(THD *thd, String *str, LEX_USER *user,
                  bool comma, bool ident);
-void append_user_new(THD *thd, String *str, LEX_USER *user, bool comma);
+void append_user_new(THD *thd, String *str, LEX_USER *user, bool comma= true,
+                     bool hide_password_hash= false);
 int check_change_password(THD *thd, const char *host, const char *user,
                           const char *password, size_t password_len);
 bool change_password(THD *thd, const char *host, const char *user,
@@ -662,7 +678,8 @@ bool check_grant_routine(THD *thd, ulong want_access,
                          TABLE_LIST *procs, bool is_proc, bool no_error);
 bool check_routine_level_acl(THD *thd, const char *db, const char *name,
                              bool is_proc);
-bool check_grant_db(THD *thd,const char *db);
+bool check_grant_db(THD *thd, const char *db,
+                    const bool check_table_grant = false);
 bool acl_check_proxy_grant_access(THD *thd, const char *host, const char *user,
                                   bool with_grant);
 void get_privilege_desc(char *to, uint max_length, ulong access);
@@ -672,7 +689,7 @@ ulong get_column_grant(THD *thd, GRANT_INFO *grant,
                        const char *db_name, const char *table_name,
                        const char *field_name);
 bool mysql_show_grants(THD *thd, LEX_USER *user);
-bool mysql_show_create_user(THD *thd, LEX_USER *user);
+bool mysql_show_create_user(THD *thd, LEX_USER *user, bool are_both_users_same);
 bool mysql_revoke_all(THD *thd, List <LEX_USER> &list);
 bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
                           bool is_proc);
@@ -699,6 +716,8 @@ bool check_fk_parent_table_access(THD *thd,
                                   const char *child_table_db,
                                   HA_CREATE_INFO *create_info,
                                   Alter_info *alter_info);
+bool check_lock_view_underlying_table_access(THD *thd, TABLE_LIST *tbl,
+                                             bool *fake_lock_tables_acl);
 bool check_readonly(THD *thd, bool err_if_readonly);
 void err_readonly(THD *thd);
 
@@ -775,8 +794,8 @@ typedef enum ssl_artifacts_status
 
 #endif /* EMBEDDED_LIBRARY */
 
-#if defined(HAVE_OPENSSL) && !defined(HAVE_YASSL)
+#if defined(HAVE_OPENSSL)
 extern my_bool opt_auto_generate_certs;
 bool do_auto_cert_generation(ssl_artifacts_status auto_detection_status);
-#endif /* HAVE_OPENSSL && !HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 #endif /* AUTH_COMMON_INCLUDED */
diff --git a/sql/auth/auth_internal.h b/sql/auth/auth_internal.h
index 73e099ad59c4..330907efba2d 100644
--- a/sql/auth/auth_internal.h
+++ b/sql/auth/auth_internal.h
@@ -1,16 +1,23 @@
 #ifndef AUTH_INTERNAL_INCLUDED
 #define AUTH_INTERNAL_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/auth/i_sha2_password_common.h b/sql/auth/i_sha2_password_common.h
new file mode 100644
index 000000000000..09d13e584314
--- /dev/null
+++ b/sql/auth/i_sha2_password_common.h
@@ -0,0 +1,140 @@
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef I_SHA2_PASSWORD_COMMON_INCLUDED
+#define I_SHA2_PASSWORD_COMMON_INCLUDED
+
+#include <openssl/evp.h>
+#include <openssl/ossl_typ.h>
+#include <openssl/sha.h>
+
+#include <string>
+
+/**
+  @file sql/auth/i_sha2_password_common.h
+  Classes for caching_sha2_authentication plugin
+*/
+
+/**
+  @defgroup auth_caching_sha2_auth caching_sha2_authentication information
+  @{
+*/
+namespace sha2_password {
+/* Digest length for caching_sha2_authentication plugin */
+const unsigned int CACHING_SHA2_DIGEST_LENGTH= SHA256_DIGEST_LENGTH;
+
+/**
+  Supported digest information
+*/
+
+typedef enum Digest_info
+{
+  SHA256_DIGEST= 0,
+  DIGEST_LAST
+} Digest_info;
+
+/**
+  Interface for cryptographic digest generation
+*/
+
+class Generate_digest
+{
+ public:
+  virtual bool update_digest(const void *src, unsigned int length)= 0;
+  virtual bool retrieve_digest(unsigned char *digest, unsigned int length)= 0;
+  virtual void scrub()= 0;
+  virtual ~Generate_digest() {}
+};
+
+#define DIGEST_CTX EVP_MD_CTX
+
+/**
+  SHA256 digest generator
+  @sa Generate_digest
+  @sa Digest_info
+*/
+
+class SHA256_digest : public Generate_digest
+{
+ public:
+  SHA256_digest();
+  ~SHA256_digest();
+
+  bool update_digest(const void *src, unsigned int length);
+  bool retrieve_digest(unsigned char *digest, unsigned int length);
+  void scrub();
+  bool all_ok() { return m_ok; }
+
+ private:
+  void init();
+  void deinit();
+
+ private:
+  /** Digest output buffer */
+  unsigned char m_digest[CACHING_SHA2_DIGEST_LENGTH];
+  /** Digest context */
+  DIGEST_CTX *md_context;
+  /** Status */
+  bool m_ok;
+};
+
+/**
+  Scramble generator
+  Responsible for generating scramble of following format:
+  XOR(SHA2(m_src), SHA2(SHA2(SHA2(m_src)), m_rnd))
+  @sa SHA256_digest
+  @sa Digest_info
+*/
+
+class Generate_scramble
+{
+public:
+  Generate_scramble(const std::string source, const std::string rnd,
+                    Digest_info digest_type= SHA256_DIGEST);
+
+  ~Generate_scramble();
+
+  bool scramble(unsigned char *scramble, unsigned int scramble_length);
+
+ private:
+  /** plaintext source string */
+  std::string m_src;
+  /** random string */
+  std::string m_rnd;
+  /** Type of digest */
+  Digest_info m_digest_type;
+  /** Digest generator class */
+  Generate_digest *m_digest_generator;
+  /** length of the digest */
+  unsigned int m_digest_length;
+};
+
+}  // namespace sha2_password
+
+/** @} (end of auth_caching_sha2_auth) */
+
+#endif  // !I_SHA2_PASSWORD_INCLUDED
diff --git a/sql/auth/partitioned_rwlock.h b/sql/auth/partitioned_rwlock.h
index 0f082b46ff45..0d7bf2f2c5c1 100644
--- a/sql/auth/partitioned_rwlock.h
+++ b/sql/auth/partitioned_rwlock.h
@@ -1,16 +1,23 @@
 #ifndef PARTITIONED_RWLOCK_INCLUDED
 #define PARTITIONED_RWLOCK_INCLUDED
 
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/auth/password.c b/sql/auth/password.c
index 1f9335006604..8908919ab61f 100644
--- a/sql/auth/password.c
+++ b/sql/auth/password.c
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/auth/password_policy_service.cc b/sql/auth/password_policy_service.cc
index aae5725552bd..59c866eedf6f 100644
--- a/sql/auth/password_policy_service.cc
+++ b/sql/auth/password_policy_service.cc
@@ -1,21 +1,27 @@
-/*  Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
 
 #include "m_ctype.h"  /* my_charset_utf8_bin */
-#include "my_dbug.h"   /* DBUG_ASSERT */
+#include "my_dbug.h"   /* assert */
 #include <mysqld_error.h> /* To get ER_NOT_VALID_PASSWORD */
 #include <mysql/plugin_validate_password.h> /* validate_password plugin */
 
@@ -72,7 +78,7 @@ int my_validate_password_policy(const char *password, unsigned int password_len)
 int my_calculate_password_strength(const char *password, unsigned int password_len)
 {
   int res= 0;
-  DBUG_ASSERT(password != NULL);
+  assert(password != NULL);
 
   String password_str;
   if (password)
diff --git a/sql/auth/service_security_context.cc b/sql/auth/service_security_context.cc
index fa978573a563..1dbec72668d4 100644
--- a/sql/auth/service_security_context.cc
+++ b/sql/auth/service_security_context.cc
@@ -1,12 +1,19 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/auth/sha2_password_common.cc b/sql/auth/sha2_password_common.cc
new file mode 100644
index 000000000000..3b1d56ea5d37
--- /dev/null
+++ b/sql/auth/sha2_password_common.cc
@@ -0,0 +1,354 @@
+/*
+   Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+
+#include "my_config.h"
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <openssl/evp.h>
+#include <string.h>
+#include <sys/types.h>
+#include <string>
+
+#include "my_compiler.h"
+#include "my_dbug.h"      /* DBUG instrumentation */
+#include "my_global.h"
+#include "i_sha2_password_common.h"
+
+namespace sha2_password {
+/**
+  SHA256 digest generator constructor
+
+  Initializes digest context and sets
+  status of initialization.
+
+  If m_ok is set to false at the end,
+  it indicates a problem in initialization.
+*/
+
+SHA256_digest::SHA256_digest()
+  : m_ok(false)
+{
+  init();
+}
+
+/**
+  Release acquired memory
+*/
+
+SHA256_digest::~SHA256_digest()
+{
+  deinit();
+}
+
+/**
+  Update digest with plaintext
+
+  @param [in] src    Plaintext to be added
+  @param [in] length Length of the plaintext
+
+  @returns digest update status
+    @retval true Problem updating digest
+    @retval false Success
+*/
+
+bool SHA256_digest::update_digest(const void *src, unsigned int length)
+{
+  DBUG_ENTER("SHA256_digest::update_digest");
+  if (!m_ok || !src)
+  {
+    DBUG_PRINT("info", ("Either digest context is not ok or "
+                        "source is emptry string"));
+    DBUG_RETURN(true);
+  }
+  m_ok= EVP_DigestUpdate(md_context, src, length);
+  DBUG_RETURN(!m_ok);
+}
+
+/**
+  Retrive generated digest
+
+  @param [out] digest Digest text
+  @param [in]  length Length of the digest buffer
+
+  Assumption : memory for digest has been allocated
+
+  @returns digest retrieval status
+    @retval true Error
+    @retval false Success
+*/
+
+bool SHA256_digest::retrieve_digest(unsigned char *digest,
+                                    unsigned int length)
+{
+  DBUG_ENTER("SHA256_digest::retrieve_digest");
+  if (!m_ok || !digest || length != CACHING_SHA2_DIGEST_LENGTH)
+  {
+    DBUG_PRINT("info", ("Either digest context is not ok or "
+                        "digest length is not as expected."));
+    DBUG_RETURN(true);
+  }
+  m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
+  EVP_MD_CTX_cleanup(md_context);
+#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  EVP_MD_CTX_reset(md_context);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  memcpy(digest, m_digest, length);
+  DBUG_RETURN(!m_ok);
+}
+
+/**
+  Cleanup and reinit
+*/
+
+void SHA256_digest::scrub()
+{
+  deinit();
+  init();
+}
+
+/**
+  Initialize digest context
+
+  1. Allocate memory for digest context
+  2. Call initialization function(s)
+*/
+
+void SHA256_digest::init()
+{
+  DBUG_ENTER("SHA256_digest::init");
+  m_ok= false;
+  md_context= EVP_MD_CTX_create();
+  if (!md_context)
+  {
+    DBUG_PRINT("info", ("Failed to create digest context"));
+    DBUG_VOID_RETURN;
+  }
+
+  m_ok= (bool)EVP_DigestInit_ex(md_context, EVP_sha256(), NULL);
+
+  if (!m_ok)
+  {
+    EVP_MD_CTX_destroy(md_context);
+    md_context= NULL;
+    DBUG_PRINT("info", ("Failed to initialize digest context"));
+  }
+  DBUG_VOID_RETURN;
+}
+
+/**
+  Release allocated memory for digest context
+*/
+
+void SHA256_digest::deinit()
+{
+  if (md_context)
+  {
+    EVP_MD_CTX_destroy(md_context);
+    md_context= NULL;
+  }
+  m_ok= false;
+}
+
+/**
+  Generate_scramble constructor
+
+  @param [in] source Plaintext source
+  @param [in] rnd    Salt
+  @param [in] digest_type Digest type
+*/
+Generate_scramble::Generate_scramble(const std::string source,
+                                     const std::string rnd,
+                                     Digest_info digest_type) /*= Digest_info::SHA256_DIGEST */
+  : m_src(source),
+    m_rnd(rnd),
+    m_digest_type(digest_type)
+{
+  switch (m_digest_type)
+  {
+    case SHA256_DIGEST:
+    {
+      m_digest_generator= new SHA256_digest();
+      m_digest_length= CACHING_SHA2_DIGEST_LENGTH;
+      break;
+    }
+    default:
+      assert(false);
+  };
+}
+
+/**
+  Generate_scramble destructor
+*/
+
+Generate_scramble::~Generate_scramble()
+{
+  if (m_digest_generator)
+  {
+    delete m_digest_generator;
+    m_digest_generator= 0;
+  }
+}
+
+/**
+  Scramble generation
+
+  @param [out] scramble        Output buffer for generated scramble
+  @param [in]  scramble_length Size of scramble buffer
+
+  @note
+    SHA2(src) => digest_stage1
+    SHA2(digest_stage1) => digest_stage2
+    SHA2(digest_stage2, m_rnd) => scramble_stage1
+    XOR(digest_stage1, scramble_stage1) => scramble
+
+  @returns Status of scramble generation
+    @retval true  Error generating scramble
+    @retval false Success
+*/
+
+bool Generate_scramble::scramble(unsigned char *scramble,
+                                 unsigned int scramble_length)
+{
+  DBUG_ENTER("Generate_scramble::scramble");
+  unsigned char *digest_stage1;
+  unsigned char *digest_stage2;
+  unsigned char *scramble_stage1;
+
+  if (!scramble || scramble_length != m_digest_length)
+  {
+    DBUG_PRINT("info", ("Unexpected scrable length"
+                        "Expected: %d, Actual: %d",
+                        m_digest_length, !scramble ? 0 : scramble_length));
+    DBUG_RETURN(true);
+  }
+
+  switch (m_digest_type)
+  {
+    case SHA256_DIGEST:
+    {
+      /*
+        We are using alloca only for a small amount of
+        memory - 48 bytes. And we do not make recursive calls
+        to ::scramble function. So it is relatively safe.
+      */
+      digest_stage1= (unsigned char *)alloca(m_digest_length);
+      digest_stage2= (unsigned char *)alloca(m_digest_length);
+      scramble_stage1= (unsigned char *)alloca(m_digest_length);
+      break;
+    }
+    default:
+    {
+      assert(false);
+      DBUG_RETURN(true);
+    }
+  }
+
+  /* SHA2(src) => digest_stage1 */
+  if (m_digest_generator->update_digest(m_src.c_str(), m_src.length()) ||
+      m_digest_generator->retrieve_digest(digest_stage1, m_digest_length))
+  {
+    DBUG_PRINT("info", ("Failed to generate digest_stage1: SHA2(src)"));
+    DBUG_RETURN(true);
+  }
+
+  /* SHA2(digest_stage1) => digest_stage2 */
+  m_digest_generator->scrub();
+  if (m_digest_generator->update_digest(digest_stage1, m_digest_length) ||
+      m_digest_generator->retrieve_digest(digest_stage2, m_digest_length))
+  {
+    DBUG_PRINT("info",
+               ("Failed to generate digest_stage2: SHA2(digest_stage1)"));
+    DBUG_RETURN(true);
+  }
+
+  /* SHA2(digest_stage2, m_rnd) => scramble_stage1 */
+  m_digest_generator->scrub();
+  if (m_digest_generator->update_digest(digest_stage2, m_digest_length) ||
+      m_digest_generator->update_digest(m_rnd.c_str(), m_rnd.length()) ||
+      m_digest_generator->retrieve_digest(scramble_stage1, m_digest_length))
+  {
+    DBUG_PRINT("info", ("Failed to generate scramble_stage1: "
+                        "SHA2(digest_stage2, m_rnd)"));
+    DBUG_RETURN(true);
+  }
+
+  /* XOR(digest_stage1, scramble_stage1) => scramble */
+  for (uint i= 0; i < m_digest_length; ++i)
+  {
+    scramble[i]= (digest_stage1[i] ^ scramble_stage1[i]);
+  }
+
+  DBUG_RETURN(false);
+}
+}  // namespace sha2_password
+
+C_MODE_START
+/*
+  Generate scramble from password and random number.
+
+  @param [out] scramble     Buffer to put generated scramble
+  @param [in] scramble_size Size of the output buffer
+  @param [in] src           Source text buffer
+  @param [in] src_size      Source text buffer size
+  @param [in] rnd           Random text buffer
+  @param [in] rnd_size      Random text buffer size
+
+  @note
+    SHA2(src) => X
+    SHA2(X) => Y
+    SHA2(XOR(rnd, Y) => Z
+    XOR(X, Z) => scramble
+
+  @returns Status of scramble generation
+    @retval true  Error
+    @retval false Generation successful
+
+*/
+
+my_bool generate_sha256_scramble(unsigned char *scramble, size_t scramble_size,
+                                 const char *src, size_t src_size, const char *rnd,
+                                 size_t rnd_size)
+{
+  DBUG_ENTER("generate_scramble");
+  std::string source(src, src_size);
+  std::string random(rnd, rnd_size);
+
+  sha2_password::Generate_scramble scramble_generator(source, random);
+  if (scramble_generator.scramble(scramble, scramble_size))
+  {
+    DBUG_PRINT("info", ("Failed to generate SHA256 based scramble"));
+    DBUG_RETURN(TRUE);
+  }
+
+  DBUG_RETURN(FALSE);
+}
+C_MODE_END
diff --git a/sql/auth/sql_acl.h b/sql/auth/sql_acl.h
index 0e9b7d270f1a..541f6e8dc77f 100644
--- a/sql/auth/sql_acl.h
+++ b/sql/auth/sql_acl.h
@@ -1,16 +1,23 @@
 #ifndef SQL_ACL_INCLUDED
 #define SQL_ACL_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/auth/sql_auth_cache.cc b/sql/auth/sql_auth_cache.cc
index e953fff6669b..70c2a3c04864 100644
--- a/sql/auth/sql_auth_cache.cc
+++ b/sql/auth/sql_auth_cache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,7 +98,7 @@ Partitioned_rwlock LOCK_grant;
 void ACL_internal_schema_registry::register_schema
   (const LEX_STRING &name, const ACL_internal_schema_access *access)
 {
-  DBUG_ASSERT(m_registry_array_size < array_elements(registry_array));
+  assert(m_registry_array_size < array_elements(registry_array));
 
   /* Not thread safe, and does not need to be. */
   registry_array[m_registry_array_size].m_name= &name;
@@ -108,7 +115,7 @@ void ACL_internal_schema_registry::register_schema
 const ACL_internal_schema_access *
 ACL_internal_schema_registry::lookup(const char *name)
 {
-  DBUG_ASSERT(name != NULL);
+  assert(name != NULL);
 
   uint i;
 
@@ -214,7 +221,7 @@ ACL_USER::copy(MEM_ROOT *root)
     dst->plugin.length= plugin.length;
   }
   dst->auth_string.str= safe_strdup_root(root, auth_string.str);
-  dst->host.update_hostname(safe_strdup_root(root, host.get_host()));
+  dst->host.update_hostname(host.is_null() ? NULL : strdup_root(root, host.get_host()));
   return dst;
 }
 
@@ -258,21 +265,20 @@ ACL_PROXY_USER::init(TABLE *table, MEM_ROOT *mem)
                   table->field[MYSQL_PROXIES_PRIV_WITH_GRANT]->val_int() != 0);
 }
 
-bool
+void
 ACL_PROXY_USER::check_validity(bool check_no_resolve)
 {
-  if (check_no_resolve && 
+  if (check_no_resolve &&
       (hostname_requires_resolving(host.get_host()) ||
-       hostname_requires_resolving(proxied_host.get_host())))
-  {
+       hostname_requires_resolving(proxied_host.get_host())) &&
+      strcmp(host.get_host(), "localhost") != 0) {
     sql_print_warning("'proxies_priv' entry '%s@%s %s@%s' "
                       "ignored in --skip-name-resolve mode.",
                       proxied_user ? proxied_user : "",
-                      proxied_host.get_host() ? proxied_host.get_host() : "",
+                      proxied_host.get_host(),
                       user ? user : "",
-                      host.get_host() ? host.get_host() : "");
+                      host.get_host());
   }
-  return FALSE;
 }
 
 bool
@@ -285,10 +291,10 @@ ACL_PROXY_USER::matches(const char *host_arg, const char *user_arg,
              "compare_hostname(%s,%s,%s) &&"
              "wild_compare (%s,%s) &&"
              "wild_compare (%s,%s)",
-             host.get_host() ? host.get_host() : "<NULL>",
+             host.get_host(),
              host_arg ? host_arg : "<NULL>",
              ip_arg ? ip_arg : "<NULL>",
-             proxied_host.get_host() ? proxied_host.get_host() : "<NULL>",
+             proxied_host.get_host(),
              host_arg ? host_arg : "<NULL>",
              ip_arg ? ip_arg : "<NULL>",
              user_arg ? user_arg : "<NULL>",
@@ -316,11 +322,10 @@ ACL_PROXY_USER::pk_equals(ACL_PROXY_USER *grant)
              grant->user ? grant->user : "<NULL>",
              proxied_user ? proxied_user : "<NULL>",
              grant->proxied_user ? grant->proxied_user : "<NULL>",
-             host.get_host() ? host.get_host() : "<NULL>",
-             grant->host.get_host() ? grant->host.get_host() : "<NULL>",
-             proxied_host.get_host() ? proxied_host.get_host() : "<NULL>",
-             grant->proxied_host.get_host() ? 
-             grant->proxied_host.get_host() : "<NULL>"));
+             host.get_host(),
+             grant->host.get_host(),
+             proxied_host.get_host(),
+             grant->proxied_host.get_host()));
 
   DBUG_RETURN(auth_element_equals(user, grant->user) &&
               auth_element_equals(proxied_user, grant->proxied_user) &&
@@ -330,21 +335,22 @@ ACL_PROXY_USER::pk_equals(ACL_PROXY_USER *grant)
 }
 
 void
-ACL_PROXY_USER::print_grant(String *str)
+ACL_PROXY_USER::print_grant(THD *thd, String *str)
 {
-  str->append(STRING_WITH_LEN("GRANT PROXY ON '"));
-  if (proxied_user)
-    str->append(proxied_user, strlen(proxied_user));
-  str->append(STRING_WITH_LEN("'@'"));
-  if (proxied_host.get_host())
-    str->append(proxied_host.get_host(), strlen(proxied_host.get_host()));
-  str->append(STRING_WITH_LEN("' TO '"));
-  if (user)
-    str->append(user, strlen(user));
-  str->append(STRING_WITH_LEN("'@'"));
-  if (host.get_host())
-    str->append(host.get_host(), strlen(host.get_host()));
-  str->append(STRING_WITH_LEN("'"));
+  str->append(STRING_WITH_LEN("GRANT PROXY ON "));
+  String proxied_user_str(proxied_user, get_proxied_user_length(),
+                          system_charset_info);
+  append_query_string(thd, system_charset_info, &proxied_user_str, str);
+  str->append(STRING_WITH_LEN("@"));
+  String proxied_host_str(proxied_host.get_host(), proxied_host.get_host_len(),
+                          system_charset_info);
+  append_query_string(thd, system_charset_info, &proxied_host_str, str);
+  str->append(STRING_WITH_LEN(" TO "));
+  String user_str(user, get_user_length(), system_charset_info);
+  append_query_string(thd, system_charset_info, &user_str, str);
+  str->append(STRING_WITH_LEN("@"));
+  String host_str(host.get_host(), host.get_host_len(), system_charset_info);
+  append_query_string(thd, system_charset_info, &host_str, str);
   if (with_grant)
     str->append(STRING_WITH_LEN(" WITH GRANT OPTION"));
 }
@@ -477,7 +483,7 @@ ulong get_sort(uint count,...)
   ulong sort=0;
 
   /* Should not use this function with more than 4 arguments for compare. */
-  DBUG_ASSERT(count <= 4);
+  assert(count <= 4);
 
   while (count--)
   {
@@ -547,7 +553,7 @@ bool hostname_requires_resolving(const char *hostname)
 {
 
   /* called only for --skip-name-resolve */
-  DBUG_ASSERT(specialflag & SPECIAL_NO_RESOLVE);
+  assert(specialflag & SPECIAL_NO_RESOLVE);
 
   if (!hostname)
     return FALSE;
@@ -730,14 +736,14 @@ bool GRANT_TABLE::init(TABLE *col_privs)
 
     if (!col_privs->key_info)
     {
-      my_error(ER_TABLE_CORRUPT, MYF(0), col_privs->s->db.str,
+      my_error(ER_MISSING_KEY, MYF(0), col_privs->s->db.str,
                col_privs->s->table_name.str);
       return true;
     }
 
     KEY_PART_INFO *key_part= col_privs->key_info->key_part;
     col_privs->field[0]->store(host.get_host(),
-                               host.get_host() ? host.get_host_len() : 0,
+                               host.get_host_len(),
                                system_charset_info);
     col_privs->field[1]->store(db, strlen(db), system_charset_info);
     col_privs->field[2]->store(user, strlen(user), system_charset_info);
@@ -828,14 +834,12 @@ find_acl_user(const char *host, const char *user, my_bool exact)
       DBUG_PRINT("info",("strcmp('%s','%s'), compare_hostname('%s','%s'),",
                          user, acl_user->user ? acl_user->user : "",
                          host,
-                         acl_user->host.get_host() ? acl_user->host.get_host() :
-                         ""));
+                         acl_user->host.get_host()));
       if ((!acl_user->user && !user[0]) ||
           (acl_user->user && !strcmp(user,acl_user->user)))
       {
         if (exact ? !my_strcasecmp(system_charset_info, host,
-                                   acl_user->host.get_host() ?
-                                   acl_user->host.get_host() : "") :
+                                   acl_user->host.get_host()) :
             acl_user->host.compare_hostname(host,host))
         {
           DBUG_RETURN(acl_user);
@@ -1029,7 +1033,7 @@ ulong acl_get(const char *host, const char *ip,
         if (!acl_db->db || !wild_compare(db,acl_db->db,db_is_pattern))
         {
           db_access=acl_db->access;
-          if (acl_db->host.get_host())
+          if (!acl_db->host.is_null())
             goto exit;                          // Fully specified. Take it
           break; /* purecov: tested */
         }
@@ -1114,7 +1118,7 @@ static void init_check_host(void)
       }
       else if (!my_hash_search(&acl_check_hosts,(uchar*)
                                acl_user->host.get_host(),
-                               strlen(acl_user->host.get_host())))
+                               acl_user->host.get_host_len()))
       {
         if (my_hash_insert(&acl_check_hosts,(uchar*) acl_user))
         {                                       // End of memory
@@ -1236,8 +1240,7 @@ bool acl_getroot(Security_context *sctx, char *user, char *host,
     sctx->assign_priv_user(user, user ? strlen(user) : 0);
 
     sctx->assign_priv_host(acl_user->host.get_host(),
-                           acl_user->host.get_host() ?
-                           strlen(acl_user->host.get_host()) : 0);
+                           acl_user->host.get_host_len());
 
     sctx->set_password_expired(acl_user->password_expired);
   }
@@ -1341,11 +1344,7 @@ validate_user_plugin_records()
       {
           sql_print_warning("The plugin '%s' is used to authenticate "
                             "user '%s'@'%.*s', "
-#if !defined(HAVE_YASSL)
                             "but neither SSL nor RSA keys are "
-#else
-                            "but no SSL is "
-#endif
                             "configured. "
                             "Nobody can currently login using this account.",
                             sha256_password_plugin_name.str,
@@ -1495,8 +1494,18 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
    We need to check whether we are working with old database layout. This
    might be the case for instance when we are running mysql_upgrade.
   */
-  table_schema= user_table_schema_factory.get_user_table_schema(table);
-  is_old_db_layout= user_table_schema_factory.is_old_user_table_schema(table);
+  if (user_table_schema_factory.user_table_schema_check(table))
+  {
+    table_schema= user_table_schema_factory.get_user_table_schema(table);
+    is_old_db_layout= user_table_schema_factory.is_old_user_table_schema(table);
+  }
+  else
+  {
+    sql_print_error("[FATAL] mysql.user table is damaged. "
+                    "Please run mysql_upgrade.");
+    end_read_record(&read_record_info);
+    goto end;
+  }
 
   allow_all_hosts=0;
   int read_rec_errcode;
@@ -1525,12 +1534,12 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
                                       table->field[table_schema->host_idx()]));
     user.user= get_field(&global_acl_memory,
                          table->field[table_schema->user_idx()]);
-    if (check_no_resolve && hostname_requires_resolving(user.host.get_host()))
-    {
+  if (check_no_resolve && hostname_requires_resolving(user.host.get_host()) &&
+      strcmp(user.host.get_host(), "localhost") != 0) {
       sql_print_warning("'user' entry '%s@%s' "
                         "ignored in --skip-name-resolve mode.",
                         user.user ? user.user : "",
-                        user.host.get_host() ? user.host.get_host() : "");
+                        user.host.get_host());
     }
 
     /* Read password from authentication_string field */
@@ -1689,7 +1698,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
                 "pre-4.1 password. The user will be ignored and no one can "
                 "login with this user anymore.",
                 user.user ? user.user : "",
-                user.host.get_host() ? user.host.get_host() : "");
+                user.host.get_host());
                 plugin_unlock(0, native_plugin);
                 continue;
               }
@@ -1709,7 +1718,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
       			"value. The user will be ignored and no one can login "
       			"with this user anymore.",
       			user.user ? user.user : "",
-      			user.host.get_host() ? user.host.get_host() : "");
+                        user.host.get_host());
             continue;
           }
           /*
@@ -1744,7 +1753,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
           {
             sql_print_warning("Found invalid password for user: '%s@%s'; "
                               "Ignoring user", user.user ? user.user : "",
-                              user.host.get_host() ? user.host.get_host() : "");
+                              user.host.get_host());
             plugin_unlock(0, plugin);
             continue;
           }
@@ -1766,7 +1775,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
                                 "doesn't support password expiration. "
                                 "The user id will be ignored.",
                                 user.user ? user.user : "",
-                                user.host.get_host() ? user.host.get_host() : "");
+                                user.host.get_host());
               continue;
             }
             password_expired= true;
@@ -1847,8 +1856,15 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
   } // END while reading records from the mysql.user table
 
   end_read_record(&read_record_info);
+
+  DBUG_EXECUTE_IF("simulate_acl_init_failure",
+                  read_rec_errcode= HA_ERR_WRONG_IN_RECORD;);
+
   if (read_rec_errcode > 0)
+  {
+    table->file->print_error(read_rec_errcode, MYF(ME_ERRORLOG));
     goto end;
+  }
 
   std::sort(acl_users->begin(), acl_users->end(), ACL_compare());
   acl_users->shrink_to_fit();
@@ -1893,13 +1909,13 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
       continue;
     }
     db.user=get_field(&global_acl_memory, table->field[MYSQL_DB_FIELD_USER]);
-    if (check_no_resolve && hostname_requires_resolving(db.host.get_host()))
-    {
+    if (check_no_resolve && hostname_requires_resolving(db.host.get_host()) &&
+        strcmp(db.host.get_host(), "localhost") != 0) {
       sql_print_warning("'db' entry '%s %s@%s' "
                         "ignored in --skip-name-resolve mode.",
                         db.db,
                         db.user ? db.user : "",
-                        db.host.get_host() ? db.host.get_host() : "");
+                        db.host.get_host());
     }
     db.access=get_access(table,3,0);
     db.access=fix_rights_for_db(db.access);
@@ -1919,7 +1935,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
                           "possible to remove this privilege using REVOKE.",
                           db.db,
                           db.user ? db.user : "",
-                          db.host.get_host() ? db.host.get_host() : "");
+                          db.host.get_host());
       }
     }
     db.sort=get_sort(3,db.host.get_host(),db.db,db.user);
@@ -1933,7 +1949,10 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
 
   end_read_record(&read_record_info);
   if (read_rec_errcode > 0)
+  {
+    table->file->print_error(read_rec_errcode, MYF(ME_ERRORLOG));
     goto end;
+  }
 
   std::sort(acl_dbs->begin(), acl_dbs->end(), ACL_compare());
   acl_dbs->shrink_to_fit();
@@ -1952,8 +1971,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
       /* Reading record in mysql.proxies_priv */
       ACL_PROXY_USER proxy;
       proxy.init(table, &global_acl_memory);
-      if (proxy.check_validity(check_no_resolve))
-        continue;
+      proxy.check_validity(check_no_resolve);
       if (acl_proxy_users->push_back(proxy))
       {
         end_read_record(&read_record_info);
@@ -1963,7 +1981,10 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
 
     end_read_record(&read_record_info);
     if (read_rec_errcode > 0)
+    {
+      table->file->print_error(read_rec_errcode, MYF(ME_ERRORLOG));
       goto end;
+    }
 
     std::sort(acl_proxy_users->begin(), acl_proxy_users->end(), ACL_compare());
   }
@@ -2167,7 +2188,7 @@ GRANT_NAME *name_hash_search(HASH *name_hash,
   {
     if (exact)
     {
-      if (!grant_name->host.get_host() ||
+      if (grant_name->host.is_null() ||
           (host &&
            !my_strcasecmp(system_charset_info, host,
                           grant_name->host.get_host())) ||
@@ -2304,8 +2325,7 @@ static my_bool grant_load_procs_priv(TABLE *p_table)
           sql_print_warning("'procs_priv' entry '%s %s@%s' "
                             "ignored in --skip-name-resolve mode.",
                             mem_check->tname, mem_check->user,
-                            mem_check->host.get_host() ?
-                            mem_check->host.get_host() : "");
+                            mem_check->host.get_host());
         }
       }
       if (p_table->field[4]->val_int() == SP_TYPE_PROCEDURE)
@@ -2432,14 +2452,13 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables)
 
       if (check_no_resolve)
       {
-        if (hostname_requires_resolving(mem_check->host.get_host()))
-        {
+        if (hostname_requires_resolving(mem_check->host.get_host()) &&
+            strcmp(mem_check->host.get_host(), "localhost") != 0) {
           sql_print_warning("'tables_priv' entry '%s %s@%s' "
                             "ignored in --skip-name-resolve mode.",
                             mem_check->tname,
                             mem_check->user ? mem_check->user : "",
-                            mem_check->host.get_host() ?
-                            mem_check->host.get_host() : "");
+                            mem_check->host.get_host());
         }
       }
 
@@ -2665,9 +2684,9 @@ void acl_update_user(const char *user, const char *host,
     if ((!acl_user->user && !user[0]) ||
         (acl_user->user && !strcmp(user,acl_user->user)))
     {
-      if ((!acl_user->host.get_host() && !host[0]) ||
-          (acl_user->host.get_host() &&
-          !my_strcasecmp(system_charset_info, host, acl_user->host.get_host())))
+      if ((acl_user->host.is_null() && !host[0]) ||
+          (!acl_user->host.is_null() &&
+           !my_strcasecmp(system_charset_info, host, acl_user->host.get_host())))
       {
         if (plugin.length > 0)
         {
@@ -2858,8 +2877,8 @@ void acl_update_db(const char *user, const char *host, const char *db,
         (acl_db->user &&
         !strcmp(user,acl_db->user)))
     {
-      if ((!acl_db->host.get_host() && !host[0]) ||
-          (acl_db->host.get_host() &&
+      if ((acl_db->host.is_null() && !host[0]) ||
+          (acl_db->host.get_host_len() &&
           !strcmp(host, acl_db->host.get_host())))
       {
         if ((!acl_db->db && !db[0]) ||
@@ -2955,8 +2974,6 @@ update_sctx_cache(Security_context *sctx, ACL_USER *acl_user_ptr, bool expired)
     sctx_user = sctx->user().str;
   }
 
-  if (!acl_host)
-    acl_host= "";
   if(!acl_user)
     acl_user= "";
   if (!sctx_host)
diff --git a/sql/auth/sql_auth_cache.h b/sql/auth/sql_auth_cache.h
index 6f2bea619ac9..8c0091f775b5 100644
--- a/sql/auth/sql_auth_cache.h
+++ b/sql/auth/sql_auth_cache.h
@@ -1,16 +1,23 @@
 #ifndef SQL_USER_CACHE_INCLUDED
 #define SQL_USER_CACHE_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -26,6 +33,7 @@
 #include "partitioned_rwlock.h"         // Partitioned_rwlock
 
 #include "prealloced_array.h"
+#include "log_event.h"
 
 /* Forward Declarations */
 class String;
@@ -41,8 +49,8 @@ class ACL_HOST_AND_IP
   const char *calc_ip(const char *ip_arg, long *val, char end);
 
 public:
-  const char *get_host() const { return hostname; }
-  size_t get_host_len() { return hostname_length; }
+  const char *get_host() const { return hostname ? hostname : ""; }
+  size_t get_host_len() const { return hostname_length; }
 
   bool has_wildcard()
   {
@@ -57,9 +65,8 @@ class ACL_HOST_AND_IP
   }
 
   void update_hostname(const char *host_arg);
-
   bool compare_hostname(const char *host_arg, const char *ip_arg);
-
+  bool is_null() const { return hostname == NULL; }
 };
 
 class ACL_ACCESS {
@@ -152,7 +159,7 @@ class ACL_PROXY_USER :public ACL_ACCESS
     user= user_arg && *user_arg ? strdup_root(mem, user_arg) : NULL;
   }
 
-  bool check_validity(bool check_no_resolve);
+  void check_validity(bool check_no_resolve);
 
   bool matches(const char *host_arg, const char *user_arg, const char *ip_arg,
                 const char *proxied_user_arg, bool any_proxy_user);
@@ -169,12 +176,12 @@ class ACL_PROXY_USER :public ACL_ACCESS
   {
     return (((!user && (!user_arg || !user_arg[0])) ||
              (user && user_arg && !strcmp(user, user_arg))) &&
-            ((!host.get_host() && (!host_arg || !host_arg[0])) ||
-             (host.get_host() && host_arg && !strcmp(host.get_host(), host_arg))));
+            ((host.is_null() && (!host_arg || !host_arg[0])) ||
+             (!host.is_null() && host_arg && !strcmp(host.get_host(), host_arg))));
   }
 
 
-  void print_grant(String *str);
+  void print_grant(THD *thd, String *str);
 
   void set_data(ACL_PROXY_USER *grant)
   {
@@ -197,6 +204,12 @@ class ACL_PROXY_USER :public ACL_ACCESS
                                const LEX_CSTRING &proxied_user,
                                bool with_grant,
                                const char *grantor);
+
+  size_t get_user_length() const { return user ? strlen(user) : 0; }
+
+  size_t get_proxied_user_length() const {
+    return proxied_user ? strlen(proxied_user) : 0;
+  }
 };
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
diff --git a/sql/auth/sql_authentication.cc b/sql/auth/sql_authentication.cc
index 4f7b51d6d471..a41a87f5f345 100644
--- a/sql/auth/sql_authentication.cc
+++ b/sql/auth/sql_authentication.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -29,6 +36,7 @@
 #include <mysql/plugin_validate_password.h> /* validate_password plugin */
 #include <mysql/service_my_plugin_log.h>
 #include "sys_vars.h"
+#include "debug_sync.h"
 #include <fstream>                      /* std::fstream */
 #include <string>                       /* std::string */
 #include <algorithm>                    /* for_each */
@@ -36,12 +44,12 @@
 #include <vector>                       /* std::vector */
 #include <stdint.h>
 
-#if defined(HAVE_OPENSSL) && !defined(HAVE_YASSL)
+#if defined(HAVE_OPENSSL)
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
-#endif /* HAVE OPENSSL && !HAVE_YASSL */
+#endif /* HAVE OPENSSL */
 
 #include "auth_internal.h"
 #include "sql_auth_cache.h"
@@ -82,7 +90,6 @@ my_bool disconnect_on_expired_password= TRUE;
 #if defined(HAVE_OPENSSL)
 #define MAX_CIPHER_LENGTH 1024
 #define SHA256_PASSWORD_MAX_PASSWORD_LENGTH MAX_PLAINTEXT_LENGTH
-#if !defined(HAVE_YASSL)
 #define AUTH_DEFAULT_RSA_PRIVATE_KEY "private_key.pem"
 #define AUTH_DEFAULT_RSA_PUBLIC_KEY "public_key.pem"
 
@@ -100,7 +107,6 @@ my_bool auth_rsa_auto_generate_rsa_keys= TRUE;
 static bool do_auto_rsa_keys_generation();
 static Rsa_authentication_keys g_rsa_keys;
 
-#endif /* HAVE_YASSL */
 #endif /* HAVE_OPENSSL */
 
 bool
@@ -120,7 +126,6 @@ Thd_charset_adapter::charset()
 }
 
 #if defined(HAVE_OPENSSL)
-#ifndef HAVE_YASSL
 
 /**
   @brief Set key file path
@@ -189,9 +194,9 @@ Rsa_authentication_keys::read_key_file(RSA **key_ptr,
   */
   if ((key_file= fopen(key_file_path.c_ptr(), "r")) == NULL)
   {
-    sql_print_information("RSA %s key file not found: %s."
-                          " Some authentication plugins will not work.",
-                          key_type, key_file_path.c_ptr());
+    sql_print_warning("RSA %s key file not found: %s."
+                      " Some authentication plugins will not work.",
+                      key_type, key_file_path.c_ptr());
   }
   else
   {
@@ -356,7 +361,6 @@ Rsa_authentication_keys::read_rsa_keys()
   return false;
 }
 
-#endif /* HAVE_YASSL */
 #endif /* HAVE_OPENSSL */
 
 /**
@@ -460,7 +464,11 @@ bool auth_plugin_supports_expiration(const char *plugin_name)
 static void login_failed_error(MPVIO_EXT *mpvio, int passwd_used)
 {
   THD *thd= current_thd;
-  if (passwd_used == 2)
+
+  if (thd->is_error())
+    sql_print_information("%s", thd->get_stmt_da()->message_text());
+
+  else if (passwd_used == 2)
   {
     my_error(ER_ACCESS_DENIED_NO_PASSWORD_ERROR, MYF(0),
              mpvio->auth_info.user_name,
@@ -529,8 +537,8 @@ static void login_failed_error(MPVIO_EXT *mpvio, int passwd_used)
 static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
                                          const char *data, uint data_len)
 {
-  DBUG_ASSERT(mpvio->status == MPVIO_EXT::FAILURE);
-  DBUG_ASSERT(data_len <= 255);
+  assert(mpvio->status == MPVIO_EXT::FAILURE);
+  assert(data_len <= 255);
   Protocol_classic *protocol= mpvio->protocol;
 
   char *buff= (char *) my_alloca(1 + SERVER_VERSION_LENGTH + data_len + 64);
@@ -591,7 +599,7 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
 
   end= my_stpnmov(end, server_version, SERVER_VERSION_LENGTH) + 1;
 
-  DBUG_ASSERT(sizeof(my_thread_id) == 4);
+  assert(sizeof(my_thread_id) == 4);
   int4store((uchar*) end, mpvio->thread_id);
   end+= 4;
 
@@ -611,6 +619,7 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
   int2store(end + 5, protocol->get_client_capabilities() >> 16);
   end[7]= data_len;
   DBUG_EXECUTE_IF("poison_srv_handshake_scramble_len", end[7]= -100;);
+  DBUG_EXECUTE_IF("increase_srv_handshake_scramble_len", end[7]= 50;);
   memset(end + 8, 0, 10);
   end+= 18;
   /* write scramble tail */
@@ -644,18 +653,25 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
 static bool send_plugin_request_packet(MPVIO_EXT *mpvio,
                                        const uchar *data, uint data_len)
 {
-  DBUG_ASSERT(mpvio->packets_written == 1);
-  DBUG_ASSERT(mpvio->packets_read == 1);
+  assert(mpvio->packets_written == 1);
+  assert(mpvio->packets_read == 1);
   static uchar switch_plugin_request_buf[]= { 254 };
 
   DBUG_ENTER("send_plugin_request_packet");
   mpvio->status= MPVIO_EXT::FAILURE; // the status is no longer RESTART
 
-  const char *client_auth_plugin=
-    ((st_mysql_auth *) (plugin_decl(mpvio->plugin)->info))->client_auth_plugin;
+  std::string client_auth_plugin(
+      ((st_mysql_auth *)(plugin_decl(mpvio->plugin)->info))
+          ->client_auth_plugin);
 
-  DBUG_ASSERT(client_auth_plugin);
+  assert(client_auth_plugin.c_str());
 
+  DBUG_EXECUTE_IF("invalidate_client_auth_plugin", {
+    client_auth_plugin.clear();
+    client_auth_plugin = std::string("..") + std::string(FN_DIRSEP) +
+                         std::string("..") + std::string(FN_DIRSEP) +
+                         std::string("mysql_native_password");
+  });
   /*
     If we're dealing with an older client we can't just send a change plugin
     packet to re-initiate the authentication handshake, because the client 
@@ -668,18 +684,18 @@ static bool send_plugin_request_packet(MPVIO_EXT *mpvio,
   if (!(mpvio->protocol->has_client_capability(CLIENT_PLUGIN_AUTH)))
   {
     DBUG_PRINT("info", ("old client sent a COM_CHANGE_USER"));
-    DBUG_ASSERT(mpvio->cached_client_reply.pkt);
+    assert(mpvio->cached_client_reply.pkt);
     /* get the status back so the read can process the cached result */
     mpvio->status= MPVIO_EXT::RESTART; 
     DBUG_RETURN(0);
   }
 
   DBUG_PRINT("info", ("requesting client to use the %s plugin", 
-                      client_auth_plugin));
+                      client_auth_plugin.c_str()));
   DBUG_RETURN(net_write_command(mpvio->protocol->get_net(),
                                 switch_plugin_request_buf[0],
-                                (uchar*) client_auth_plugin,
-                                strlen(client_auth_plugin) + 1,
+                                (uchar*) client_auth_plugin.c_str(),
+                                client_auth_plugin.size() + 1,
                                 (uchar*) data, data_len));
 }
 
@@ -776,7 +792,7 @@ static bool find_mpvio_user(MPVIO_EXT *mpvio)
 {
   DBUG_ENTER("find_mpvio_user");
   DBUG_PRINT("info", ("entry: %s", mpvio->auth_info.user_name));
-  DBUG_ASSERT(mpvio->acl_user == 0);
+  assert(mpvio->acl_user == 0);
   mysql_mutex_lock(&acl_cache->lock);
   for (ACL_USER *acl_user_tmp= acl_users->begin();
        acl_user_tmp != acl_users->end(); ++acl_user_tmp)
@@ -820,8 +836,8 @@ static bool find_mpvio_user(MPVIO_EXT *mpvio)
       !(mpvio->protocol->has_client_capability(CLIENT_PLUGIN_AUTH)))
   {
     /* user account requires non-default plugin and the client is too old */
-    DBUG_ASSERT(my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
-                              native_password_plugin_name.str));
+    assert(my_strcasecmp(system_charset_info, mpvio->acl_user->plugin.str,
+                         native_password_plugin_name.str));
     my_error(ER_NOT_SUPPORTED_AUTH_MODE, MYF(0));
     query_logger.general_log_print(current_thd, COM_CONNECT,
                                    ER(ER_NOT_SUPPORTED_AUTH_MODE));
@@ -883,7 +899,7 @@ static bool acl_check_ssl(THD *thd, const ACL_USER *acl_user)
 {
 #if defined(HAVE_OPENSSL)
   Vio *vio= thd->get_protocol_classic()->get_vio();
-  SSL *ssl= thd->get_protocol()->get_ssl();
+  SSL *ssl= (SSL*) vio->ssl_arg;
   X509 *cert;
 #endif /* HAVE_OPENSSL */
 
@@ -993,11 +1009,11 @@ static bool acl_check_ssl(THD *thd, const ACL_USER *acl_user)
 */
 bool rsa_auth_status()
 {
-#if !defined(HAVE_OPENSSL) || defined(HAVE_YASSL)
+#if !defined(HAVE_OPENSSL)
   return false;
 #else
   return (!g_rsa_keys.get_private_key() || !g_rsa_keys.get_public_key());
-#endif /* !HAVE_OPENSSL || HAVE_YASSL */
+#endif /* !HAVE_OPENSSL */
 }
 
 
@@ -1052,6 +1068,8 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, size_t packet_length)
   {
     if (mpvio->charset_adapter->init_client_charset(uint2korr(ptr)))
       DBUG_RETURN(1);
+    // skip over the charset's 2 bytes
+    ptr += 2;
   }
 
   /* Convert database and user names to utf8 */
@@ -1095,16 +1113,24 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, size_t packet_length)
   const char *client_plugin;
   if (protocol->has_client_capability(CLIENT_PLUGIN_AUTH))
   {
-    client_plugin= ptr + 2;
+    client_plugin= ptr;
     if (client_plugin >= end)
     {
       my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
       DBUG_RETURN(1);
     }
+    // Skip over the client plugin
+    ptr += strlen(client_plugin) + 1;
+
   }
   else
     client_plugin= native_password_plugin_name.str;
 
+  if (ptr > end)
+  {
+    my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
+    DBUG_RETURN (1);
+  }
   size_t bytes_remaining_in_packet= end - ptr;
 
   if (protocol->has_client_capability(CLIENT_CONNECT_ATTRS) &&
@@ -1296,8 +1322,8 @@ char *get_56_lenc_string(char **buffer,
 
   size_t len_len= (size_t)(*buffer - begin);
 
-  DBUG_ASSERT((*max_bytes_available >= len_len) &&
-              (len_len == required_length));
+  assert((*max_bytes_available >= len_len) &&
+         (len_len == required_length));
   
   if (*string_length > *max_bytes_available - len_len)
     return NULL;
@@ -1371,7 +1397,7 @@ static size_t parse_client_handshake_packet(MPVIO_EXT *mpvio,
   Protocol_classic *protocol = mpvio->protocol;
   char *end;
   bool packet_has_required_size= false;
-  DBUG_ASSERT(mpvio->status == MPVIO_EXT::FAILURE);
+  assert(mpvio->status == MPVIO_EXT::FAILURE);
 
   uint charset_code= 0;
   end= (char *)protocol->get_net()->read_pos;
@@ -1451,7 +1477,7 @@ static size_t parse_client_handshake_packet(MPVIO_EXT *mpvio,
   if (protocol->has_client_capability(CLIENT_SSL))
   {
     unsigned long errptr;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     uint ssl_charset_code= 0;
 #endif
 
@@ -1494,7 +1520,7 @@ static size_t parse_client_handshake_packet(MPVIO_EXT *mpvio,
     {
       packet_has_required_size= bytes_remaining_in_packet >= 
         AUTH_PACKET_HEADER_SIZE_PROTO_41;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
       ssl_charset_code=
         (uint)(uchar)*((char *)protocol->get_net()->read_pos + 8);
       DBUG_PRINT("info", ("client_character_set: %u", ssl_charset_code));
@@ -1510,7 +1536,7 @@ static size_t parse_client_handshake_packet(MPVIO_EXT *mpvio,
       end= (char *)protocol->get_net()->read_pos
         + AUTH_PACKET_HEADER_SIZE_PROTO_40;
       bytes_remaining_in_packet -= AUTH_PACKET_HEADER_SIZE_PROTO_40;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
       /**
         Old clients didn't have their own charset. Instead the assumption
         was that they used what ever the server used.
@@ -1518,7 +1544,7 @@ static size_t parse_client_handshake_packet(MPVIO_EXT *mpvio,
       ssl_charset_code= global_system_variables.character_set_client->number;
 #endif
     }
-    DBUG_ASSERT(charset_code == ssl_charset_code);
+    assert(charset_code == ssl_charset_code);
     if (!packet_has_required_size)
       return packet_error;
   }
@@ -1827,8 +1853,8 @@ static int server_mpvio_read_packet(MYSQL_PLUGIN_VIO *param, uchar **buf)
   }
   else if (mpvio->cached_client_reply.pkt)
   {
-    DBUG_ASSERT(mpvio->status == MPVIO_EXT::RESTART);
-    DBUG_ASSERT(mpvio->packets_read > 0);
+    assert(mpvio->status == MPVIO_EXT::RESTART);
+    assert(mpvio->packets_read > 0);
     /*
       if the have the data cached from the last server_mpvio_read_packet
       (which can be the case if it's a restarted authentication)
@@ -1874,7 +1900,7 @@ static int server_mpvio_read_packet(MYSQL_PLUGIN_VIO *param, uchar **buf)
     protocol->read_packet();
     pkt_len= protocol->get_packet_length();
   }
-
+  DBUG_EXECUTE_IF("simulate_packet_error", pkt_len = packet_error;);
   if (pkt_len == packet_error)
     goto err;
 
@@ -1988,7 +2014,8 @@ server_mpvio_initialize(THD *thd, MPVIO_EXT *mpvio,
   mpvio->auth_info.host_or_ip_length= sctx_host_or_ip.length;
 
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-  if (thd->get_protocol()->get_ssl())
+  Vio *vio= thd->get_protocol_classic()->get_vio();
+  if (vio->ssl_arg)
     mpvio->vio_is_encrypted= 1;
   else
 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
@@ -2069,7 +2096,7 @@ check_password_lifetime(THD *thd, const ACL_USER *acl_user)
                                                &cur_time) >=0 ? false: true;
       else
       {
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
         /* Make the compiler happy. */
       }
     }
@@ -2167,7 +2194,12 @@ acl_authenticate(THD *thd, enum_server_command command)
 
   DBUG_ENTER("acl_authenticate");
   compile_time_assert(MYSQL_USERNAME_LENGTH == USERNAME_LENGTH);
-  DBUG_ASSERT(command == COM_CONNECT || command == COM_CHANGE_USER);
+  assert(command == COM_CONNECT || command == COM_CHANGE_USER);
+
+  DBUG_EXECUTE_IF("acl_authenticate_begin", {
+    const char act[] = "now SIGNAL conn2_in_acl_auth WAIT_FOR conn1_reached_kill";
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+  });
 
   server_mpvio_initialize(thd, &mpvio, &charset_adapter);
   /*
@@ -2181,7 +2213,7 @@ acl_authenticate(THD *thd, enum_server_command command)
   /* acl_authenticate() takes the data from net->read_pos */
   thd->get_protocol_classic()->get_net()->read_pos=
     thd->get_protocol_classic()->get_raw_packet();
-  DBUG_PRINT("info", ("com_change_user_pkt_len=%u",
+  DBUG_PRINT("info", ("com_change_user_pkt_len=%lu",
     mpvio.protocol->get_packet_length()));
 
   if (command == COM_CHANGE_USER)
@@ -2195,14 +2227,13 @@ acl_authenticate(THD *thd, enum_server_command command)
     if (parse_com_change_user_packet(&mpvio,
                                      mpvio.protocol->get_packet_length()))
     {
-      if (!thd->is_error())
-        login_failed_error(&mpvio, mpvio.auth_info.password_used);
+      login_failed_error(&mpvio, mpvio.auth_info.password_used);
       server_mpvio_update_thd(thd, &mpvio);
       DBUG_RETURN(1);
     }
 
-    DBUG_ASSERT(mpvio.status == MPVIO_EXT::RESTART ||
-                mpvio.status == MPVIO_EXT::SUCCESS);
+    assert(mpvio.status == MPVIO_EXT::RESTART ||
+           mpvio.status == MPVIO_EXT::SUCCESS);
   }
   else
   {
@@ -2225,10 +2256,10 @@ acl_authenticate(THD *thd, enum_server_command command)
   */
   if (mpvio.status == MPVIO_EXT::RESTART)
   {
-    DBUG_ASSERT(mpvio.acl_user);
-    DBUG_ASSERT(command == COM_CHANGE_USER ||
-                my_strcasecmp(system_charset_info, auth_plugin_name.str,
-                              mpvio.acl_user->plugin.str));
+    assert(mpvio.acl_user);
+    assert(command == COM_CHANGE_USER ||
+           my_strcasecmp(system_charset_info, auth_plugin_name.str,
+                         mpvio.acl_user->plugin.str));
     auth_plugin_name= mpvio.acl_user->plugin;
     res= do_auth_once(thd, auth_plugin_name, &mpvio);
     if (res <= CR_OK)
@@ -2290,7 +2321,7 @@ acl_authenticate(THD *thd, enum_server_command command)
   if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS)
   {
     Host_errors errors;
-    DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE);
+    assert(mpvio.status == MPVIO_EXT::FAILURE);
     switch (res)
     {
     case CR_AUTH_PLUGIN_ERROR:
@@ -2314,8 +2345,7 @@ acl_authenticate(THD *thd, enum_server_command command)
       acl_log_connect(mpvio.auth_info.user_name, mpvio.auth_info.host_or_ip,
         mpvio.auth_info.authenticated_as, mpvio.db.str, thd, command);
     }
-    if (!thd->is_error())
-      login_failed_error(&mpvio, mpvio.auth_info.password_used);
+    login_failed_error(&mpvio, mpvio.auth_info.password_used);
     DBUG_RETURN (1);
   }
 
@@ -2354,28 +2384,24 @@ acl_authenticate(THD *thd, enum_server_command command)
         Host_errors errors;
         errors.m_proxy_user= 1;
         inc_host_errors(mpvio.ip, &errors);
-        if (!thd->is_error())
-          login_failed_error(&mpvio, mpvio.auth_info.password_used);
+        login_failed_error(&mpvio, mpvio.auth_info.password_used);
         DBUG_RETURN(1);
       }
 
       my_snprintf(proxy_user_buf, sizeof(proxy_user_buf) - 1,
-                  "'%s'@'%s'", auth_user,
-                  acl_user->host.get_host() ? acl_user->host.get_host() : "");
+                  "'%s'@'%s'", auth_user, acl_user->host.get_host());
       sctx->assign_proxy_user(proxy_user_buf, strlen(proxy_user_buf));
 
       /* we're proxying : find the proxy user definition */
       mysql_mutex_lock(&acl_cache->lock);
-      acl_proxy_user= find_acl_user(proxy_user->get_proxied_host() ? 
-                                    proxy_user->get_proxied_host() : "",
+      acl_proxy_user= find_acl_user(proxy_user->get_proxied_host(),
                                     mpvio.auth_info.authenticated_as, TRUE);
       if (!acl_proxy_user)
       {
         Host_errors errors;
         errors.m_proxy_user_acl= 1;
         inc_host_errors(mpvio.ip, &errors);
-        if (!thd->is_error())
-          login_failed_error(&mpvio, mpvio.auth_info.password_used);
+        login_failed_error(&mpvio, mpvio.auth_info.password_used);
         mysql_mutex_unlock(&acl_cache->lock);
         DBUG_RETURN(1);
       }
@@ -2413,8 +2439,7 @@ acl_authenticate(THD *thd, enum_server_command command)
       Host_errors errors;
       errors.m_ssl= 1;
       inc_host_errors(mpvio.ip, &errors);
-      if (!thd->is_error())
-        login_failed_error(&mpvio, thd->password);
+      login_failed_error(&mpvio, thd->password);
       DBUG_RETURN(1);
     }
 
@@ -2432,14 +2457,23 @@ acl_authenticate(THD *thd, enum_server_command command)
       DBUG_RETURN(1);
     }
 
-    if (opt_require_secure_transport &&
-        !is_secure_transport(thd->active_vio->type))
-    {
+    DBUG_EXECUTE_IF("before_secure_transport_check", {
+      const char act[] = "now SIGNAL kill_now WAIT_FOR killed";
+      assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+    });
+
+    /*
+      The assumption here is that thd->active_vio and thd->net.vio are both
+      the same at this point. We should not use thd->active_vio at any cost,
+      as a KILL command can shutdown the active_vio i.e., making it a nullptr
+      which would cause issues. Instead we check the net.vio type.
+    */
+    if (opt_require_secure_transport && thd->get_net()->vio != NULL &&
+        !is_secure_transport(thd->get_net()->vio->type)) {
       my_error(ER_SECURE_TRANSPORT_REQUIRED, MYF(0));
       DBUG_RETURN(1);
     }
 
-
     /* checking password_time_expire for connecting user */
     password_time_expired= check_password_lifetime(thd, mpvio.acl_user);
 
@@ -2540,6 +2574,7 @@ acl_authenticate(THD *thd, enum_server_command command)
       Host_errors errors;
       errors.m_default_database= 1;
       inc_host_errors(mpvio.ip, &errors);
+      login_failed_error(&mpvio, mpvio.auth_info.password_used);
       DBUG_RETURN(1);
     }
   }
@@ -2804,7 +2839,6 @@ int my_vio_is_encrypted(MYSQL_PLUGIN_VIO *vio)
 }
 
 #if defined(HAVE_OPENSSL)
-#ifndef HAVE_YASSL
 
 int show_rsa_public_key(THD *thd, SHOW_VAR *var, char *buff)
 { 
@@ -2847,7 +2881,6 @@ bool init_rsa_keys(void)
   return ((do_auto_rsa_keys_generation() == false) ||
           g_rsa_keys.read_rsa_keys());
 }
-#endif /* HAVE_YASSL */
 
 static MYSQL_PLUGIN plugin_info_ptr;
 
@@ -2903,15 +2936,19 @@ static int sha256_password_authenticate(MYSQL_PLUGIN_VIO *vio,
   char scramble[SCRAMBLE_LENGTH + 1];
   char stage2[CRYPT_MAX_PASSWORD_SIZE + 1];
   String scramble_response_packet;
-#if !defined(HAVE_YASSL)
   int cipher_length= 0;
   unsigned char plain_text[MAX_CIPHER_LENGTH + 1];
   RSA *private_key= NULL;
   RSA *public_key= NULL;
-#endif /* HAVE_YASSL */
 
   DBUG_ENTER("sha256_password_authenticate");
 
+  DBUG_EXECUTE_IF("in_sha256_password_authenticate", {
+    DBUG_SET("+d,wait_until_thread_kill");
+    const char act[] = "now SIGNAL acl_auth_reached";
+    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+  });
+
   generate_user_salt(scramble, SCRAMBLE_LENGTH + 1);
 
   /*
@@ -2970,7 +3007,6 @@ static int sha256_password_authenticate(MYSQL_PLUGIN_VIO *vio,
 
   if (!my_vio_is_encrypted(vio))
   {
- #if !defined(HAVE_YASSL)
     /*
       Since a password is being used it must be encrypted by RSA since no
       other encryption is being active.
@@ -3037,9 +3073,6 @@ static int sha256_password_authenticate(MYSQL_PLUGIN_VIO *vio,
 
     if (pkt_len == 1)
       DBUG_RETURN(CR_ERROR);
-#else
-    DBUG_RETURN(CR_ERROR);
-#endif /* HAVE_YASSL */
   } // if(!my_vio_is_encrypter())
 
   /* Don't process the password if it is longer than maximum limit */
@@ -3091,7 +3124,6 @@ static int sha256_password_authenticate(MYSQL_PLUGIN_VIO *vio,
   DBUG_RETURN(CR_ERROR);
 }
 
-#if !defined(HAVE_YASSL)
 static MYSQL_SYSVAR_STR(private_key_path, auth_rsa_private_key_path,
         PLUGIN_VAR_READONLY,
         "A fully qualified path to the private RSA key used for authentication",
@@ -3258,7 +3290,7 @@ class File_IO
 File_IO &
 File_IO::operator>>(Sql_string_t &s)
 {
-  DBUG_ASSERT(read_mode() && m_file.is_open());
+  assert(read_mode() && m_file.is_open());
 
   m_file.seekg(0, std::ios::end);
   if (resize_no_exception(s, m_file.tellg()) == false)
@@ -3286,7 +3318,7 @@ File_IO::operator>>(Sql_string_t &s)
 File_IO &
 File_IO::operator<<(const Sql_string_t &output_string)
 {
-  DBUG_ASSERT(!read_mode() && m_file.is_open());
+  assert(!read_mode() && m_file.is_open());
 
   if (!output_string.size())
     set_error();
@@ -3358,7 +3390,24 @@ class RSA_gen
   RSA *operator()(void)
   {
     /* generate RSA keys */
-    RSA *rsa= RSA_generate_key(m_key_size, m_exponent, NULL, NULL);
+    RSA *rsa= RSA_new();
+    if (!rsa)
+      return NULL;
+    BIGNUM *e= BN_new();
+    if (!e)
+    {
+      RSA_free(rsa);
+      return NULL;
+    }
+    if (!BN_set_word(e, m_exponent) ||
+        !RSA_generate_key_ex(rsa, m_key_size, e, NULL))
+    {
+      RSA_free(rsa);
+      BN_free(e);
+      return NULL;
+    }
+    BN_free(e);
+
     return rsa; // pass ownership
   }
 
@@ -3391,7 +3440,7 @@ EVP_PKEY *evp_pkey_generate(RSA *rsa)
 static
 Sql_string_t rsa_priv_key_write(RSA *rsa)
 {
-  DBUG_ASSERT(rsa);
+  assert(rsa);
   BIO *buf= BIO_new(BIO_s_mem());
   Sql_string_t read_buffer;
   if (PEM_write_bio_RSAPrivateKey(buf, rsa, NULL, NULL,
@@ -3419,7 +3468,7 @@ Sql_string_t rsa_priv_key_write(RSA *rsa)
 static
 Sql_string_t rsa_pub_key_write(RSA *rsa)
 {
-  DBUG_ASSERT(rsa);
+  assert(rsa);
   BIO *buf= BIO_new(BIO_s_mem());
   Sql_string_t read_buffer;
   if (PEM_write_bio_RSA_PUBKEY(buf, rsa))
@@ -3462,9 +3511,9 @@ class X509_gen
     X509V3_CTX v3ctx;
     X509_NAME *name= 0;
 
-    DBUG_ASSERT(cn.length() <= MAX_CN_NAME_LENGTH);
-    DBUG_ASSERT(serial != 0);
-    DBUG_ASSERT(self_sign || (ca_x509 != NULL && ca_pkey != NULL));
+    assert(cn.length() <= MAX_CN_NAME_LENGTH);
+    assert(serial != 0);
+    assert(self_sign || (ca_x509 != NULL && ca_pkey != NULL));
     if (!x509)
       goto err;
 
@@ -3559,7 +3608,7 @@ X509 * x509_cert_read(const Sql_string_t &input_string)
 static
 Sql_string_t x509_cert_write(X509 *cert)
 {
-  DBUG_ASSERT(cert);
+  assert(cert);
   BIO *buf= BIO_new(BIO_s_mem());
   Sql_string_t read_buffer;
   if (PEM_write_bio_X509(buf, cert))
@@ -3613,7 +3662,7 @@ EVP_PKEY * x509_key_read(const Sql_string_t &input_string)
 static
 Sql_string_t x509_key_write(EVP_PKEY *pkey)
 {
-  DBUG_ASSERT(pkey);
+  assert(pkey);
   BIO *buf= BIO_new(BIO_s_mem());
   RSA *rsa= EVP_PKEY_get1_RSA(pkey);
   Sql_string_t read_buffer;
@@ -3848,7 +3897,7 @@ bool create_RSA_key_pair(RSA_generator_func &rsa_gen,
   MY_MODE file_creation_mode= get_file_perm(USER_READ | USER_WRITE);
   MY_MODE saved_umask= umask(~(file_creation_mode));
 
-  DBUG_ASSERT(priv_key_filename.size() && pub_key_filename.size());
+  assert(priv_key_filename.size() && pub_key_filename.size());
 
   RSA *rsa= rsa_gen();
   DBUG_EXECUTE_IF("null_rsa_error",
@@ -3986,7 +4035,7 @@ bool do_auto_cert_generation(ssl_artifacts_status auto_detection_status)
     }
     else
     {
-      DBUG_ASSERT(auto_detection_status == SSL_ARTIFACTS_NOT_FOUND);
+      assert(auto_detection_status == SSL_ARTIFACTS_NOT_FOUND);
       /* Initialize the key pair generator. It can also be used stand alone */
       RSA_gen rsa_gen;
       /*
@@ -4112,7 +4161,6 @@ static bool do_auto_rsa_keys_generation()
     return true;
   }
 }
-#endif /* HAVE_YASSL */
 #endif /* HAVE_OPENSSL */
 
 bool MPVIO_EXT::can_authenticate()
@@ -4174,11 +4222,7 @@ mysql_declare_plugin(mysql_password)
   NULL,                                         /* Deinit function  */
   0x0101,                                       /* Version (1.0)    */
   NULL,                                         /* status variables */
-#if !defined(HAVE_YASSL)
   sha256_password_sysvars,                      /* system variables */
-#else
-  NULL,
-#endif /* HAVE_YASSL */
   NULL,                                         /* config options   */
   0                                             /* flags            */
 }
diff --git a/sql/auth/sql_authentication.h b/sql/auth/sql_authentication.h
index 593f24dca583..ccb6ea5427f3 100644
--- a/sql/auth/sql_authentication.h
+++ b/sql/auth/sql_authentication.h
@@ -1,16 +1,23 @@
 #ifndef SQL_AUTHENTICATION_INCLUDED
 #define SQL_AUTHENTICATION_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -82,7 +89,6 @@ struct MPVIO_EXT : public MYSQL_PLUGIN_VIO
 };
 
 #if defined(HAVE_OPENSSL)
-#ifndef HAVE_YASSL
 typedef struct rsa_st RSA;
 class Rsa_authentication_keys
 {
@@ -122,7 +128,6 @@ class Rsa_authentication_keys
   
 };
 
-#endif /* HAVE_YASSL */
 #endif /* HAVE_OPENSSL */
 
 /* Data Structures */
diff --git a/sql/auth/sql_authorization.cc b/sql/auth/sql_authorization.cc
index 910216d91770..fc2509875065 100644
--- a/sql/auth/sql_authorization.cc
+++ b/sql/auth/sql_authorization.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -88,7 +95,7 @@ get_cached_table_access(GRANT_INTERNAL_INFO *grant_internal_info,
                         const char *schema_name,
                         const char *table_name)
 {
-  DBUG_ASSERT(grant_internal_info);
+  assert(grant_internal_info);
   if (! grant_internal_info->m_table_lookup_done)
   {
     const ACL_internal_schema_access *schema_access;
@@ -228,13 +235,12 @@ bool Sql_cmd_update::multi_update_precheck(THD *thd, TABLE_LIST *tables)
 
 bool multi_delete_precheck(THD *thd, TABLE_LIST *tables)
 {
-  SELECT_LEX *select_lex= thd->lex->select_lex;
   TABLE_LIST *aux_tables= thd->lex->auxiliary_table_list.first;
   TABLE_LIST **save_query_tables_own_last= thd->lex->query_tables_own_last;
   DBUG_ENTER("multi_delete_precheck");
 
   /* sql_yacc guarantees that tables and aux_tables are not zero */
-  DBUG_ASSERT(aux_tables != 0);
+  assert(aux_tables != 0);
   if (check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE))
     DBUG_RETURN(TRUE);
 
@@ -251,13 +257,6 @@ bool multi_delete_precheck(THD *thd, TABLE_LIST *tables)
   }
   thd->lex->query_tables_own_last= save_query_tables_own_last;
 
-  if ((thd->variables.option_bits & OPTION_SAFE_UPDATES) &&
-      !select_lex->where_cond())
-  {
-    my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
-               ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
-    DBUG_RETURN(TRUE);
-  }
   DBUG_RETURN(FALSE);
 }
 
@@ -609,6 +608,11 @@ bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *all_tables)
 bool check_single_table_access(THD *thd, ulong privilege, 
                                TABLE_LIST *all_tables, bool no_errors)
 {
+  if (all_tables->is_derived()) {
+    all_tables->set_privileges(privilege);
+    return false;
+  }
+
   Security_context *backup_ctx= thd->security_context();
 
   /* we need to switch to the saved context (if any) */
@@ -665,7 +669,7 @@ check_routine_access(THD *thd, ulong want_access, const char *db, char *name,
     as long as this code path is not abused to create routines.
     The assert enforce that.
   */
-  DBUG_ASSERT((want_access & CREATE_PROC_ACL) == 0);
+  assert((want_access & CREATE_PROC_ACL) == 0);
   if (thd->security_context()->check_access(want_access))
     tables->grant.privilege= want_access;
   else if (check_access(thd, want_access, db,
@@ -1036,8 +1040,8 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
       (see check_show_access()). This check is carried out by caller,
       but only for the first table list element from the main select.
     */
-    DBUG_ASSERT(!table_ref->schema_table_reformed ||
-                table_ref == thd->lex->select_lex->table_list.first);
+    assert(!table_ref->schema_table_reformed ||
+           table_ref == thd->lex->select_lex->table_list.first);
 
     DBUG_PRINT("info", ("derived: %d  view: %d", table_ref->is_derived(),
                         table_ref->is_view()));
@@ -1209,7 +1213,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
         }
       }
       ulong missing_privilege= rights & ~table_list->grant.privilege;
-      DBUG_ASSERT(missing_privilege == table_list->grant.want_privilege);
+      assert(missing_privilege == table_list->grant.want_privilege);
       if (missing_privilege)
       {
         char command[128];
@@ -1260,7 +1264,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
     if (!(thd->sp_runtime_ctx || rpl_filter->tables_ok(0, tables)))
     {
       /* Restore the state of binlog format */
-      DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+      assert(!thd->is_current_stmt_binlog_format_row());
       if (save_binlog_row_based)
         thd->set_current_stmt_binlog_format_row();
       DBUG_RETURN(FALSE);
@@ -1283,7 +1287,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
   if (open_and_lock_tables(thd, tables, MYSQL_LOCK_IGNORE_TIMEOUT))
   {                                             // Should never happen
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     thd->lex->restore_backup_query_tables_list(&backup);
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
@@ -1328,10 +1332,21 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
       continue;
     }
 
+    ACL_USER *acl_user= find_acl_user(Str->host.str, Str->user.str, TRUE);
+
     /* Create user if needed */
     error= replace_user_table(thd, tables[0].table, Str,
                               0, revoke_grant, create_new_users,
                               what_to_set);
+    /*
+      If the user did not exist and replace_user_table() succeeded and if this
+      is a GRANT statement, then it means that a new user is created.
+
+      So, set the is_partial_execution flag to true.
+    */
+    if (!error)
+      is_partial_execution= (!acl_user && !revoke_grant) || is_partial_execution;
+
     if (error > 0)
     {
       result= TRUE;                             // Remember error
@@ -1471,17 +1486,21 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
   }
   else
   {
-    if (!revoke_grant)
-    {
-      String *rlb= &thd->rewritten_query;
-      rlb->mem_free();
-      mysql_rewrite_grant(thd, rlb);
+    /*
+      Rewrite (table) GRANT statements to use password hashes
+      instead of <secret> style obfuscation so it can be used
+      in binlog.
+    */
+    if (!revoke_grant) {
+      String rlb;
+      mysql_rewrite_grant(thd, &rlb);
+      thd->swap_rewritten_query(rlb);
     }
-    if (thd->rewritten_query.length())
+
+    if (thd->rewritten_query().length() > 0)
       result= result |
-          write_bin_log(thd, FALSE,
-                        thd->rewritten_query.c_ptr_safe(),
-                        thd->rewritten_query.length(),
+          write_bin_log(thd, FALSE, thd->rewritten_query().ptr(),
+                        thd->rewritten_query().length(),
                         transactional_tables);
     else
       result= result |
@@ -1504,7 +1523,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
 
   thd->lex->restore_backup_query_tables_list(&backup);
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(result);
@@ -1592,7 +1611,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
     if (!(thd->sp_runtime_ctx || rpl_filter->tables_ok(0, tables)))
     {
       /* Restore the state of binlog format */
-      DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+      assert(!thd->is_current_stmt_binlog_format_row());
       if (save_binlog_row_based)
         thd->set_current_stmt_binlog_format_row();
       DBUG_RETURN(FALSE);
@@ -1603,7 +1622,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
   if (open_and_lock_tables(thd, tables, MYSQL_LOCK_IGNORE_TIMEOUT))
   {                                             // Should never happen
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(TRUE);
@@ -1644,10 +1663,21 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
       continue;
     }
 
+    ACL_USER *acl_user= find_acl_user(Str->host.str, Str->user.str, TRUE);
+
     /* Create user if needed */
     error= replace_user_table(thd, tables[0].table, Str,
                               0, revoke_grant, create_new_users,
                               what_to_set);
+    /*
+      If the user did not exist and replace_user_table() succeeded and if this
+      is a GRANT statement, then it means that a new user is created.
+
+      So, set the is_partial_execution flag to true.
+    */
+    if (!error)
+      is_partial_execution= (!acl_user && !revoke_grant) || is_partial_execution;
+
     if (error > 0)
     {
       result= TRUE;                             // Remember error
@@ -1728,17 +1758,22 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
     }
     else
     {
-      if (!revoke_grant)
-      {
-        String *rlb= &thd->rewritten_query;
-        rlb->mem_free();
-        mysql_rewrite_grant(thd, rlb);
+      /*
+        Rewrite (routine) GRANT statements to use password hashes
+        instead of <secret> style obfuscation so it can be used
+        in binlog.
+      */
+      if (!revoke_grant) {
+        String rlb;
+        mysql_rewrite_grant(thd, &rlb);
+        thd->swap_rewritten_query(rlb);
       }
+
       /*
         For performance reasons, we don't rewrite the query if we don't have to.
         If that was the case, write the original query.
       */
-      if (!thd->rewritten_query.length())
+      if (thd->rewritten_query().length() == 0)
       {
         if (write_bin_log(thd, false, thd->query().str, thd->query().length,
                           transactional_tables))
@@ -1746,9 +1781,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
       }
       else
       {
-        if (write_bin_log(thd, false,
-                          thd->rewritten_query.c_ptr_safe(),
-                          thd->rewritten_query.length(),
+        if (write_bin_log(thd, false, thd->rewritten_query().ptr(),
+                          thd->rewritten_query().length(),
                           transactional_tables))
           result= TRUE;
       }
@@ -1766,7 +1800,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
     acl_notify_htons(thd, thd->query().str, thd->query().length);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
  
@@ -1805,7 +1839,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
 
   if (is_proxy)
   {
-    DBUG_ASSERT(!db);
+    assert(!db);
     proxied_user= str_list++;
   }
 
@@ -1848,7 +1882,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
     if (!(thd->sp_runtime_ctx || rpl_filter->tables_ok(0, tables)))
     {
       /* Restore the state of binlog format */
-      DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+      assert(!thd->is_current_stmt_binlog_format_row());
       if (save_binlog_row_based)
         thd->set_current_stmt_binlog_format_row();
       DBUG_RETURN(FALSE);
@@ -1859,7 +1893,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
   if (open_and_lock_tables(thd, tables, MYSQL_LOCK_IGNORE_TIMEOUT))
   {                                     // This should never happen
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(TRUE);                  /* purecov: deadcode */
@@ -1896,10 +1930,22 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
       continue;
     }
 
+    ACL_USER *acl_user= find_acl_user(Str->host.str, Str->user.str, TRUE);
     int ret= replace_user_table(thd, tables[0].table, Str,
                                 (!db ? rights : 0), revoke_grant,
                                 create_new_users,
                                 (what_to_set | ACCESS_RIGHTS_ATTR));
+    /*
+      If the user did not exist and replace_user_table() succeeded and if
+      this is a GRANT statement, then it means that a new user is created.
+      So, set the is_partial_execution flag to true.
+    */
+    if (!ret)
+    {
+      /* In case of GRANT, user creation is partial execution */
+      is_partial_execution= (!acl_user && !revoke_grant) || is_partial_execution;
+    }
+
     if (ret)
     {
       result= -1;
@@ -1994,18 +2040,22 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
   }
   else
   {
-    if (!revoke_grant)
-    {
-      String *rlb= &thd->rewritten_query;
-      rlb->mem_free();
-      mysql_rewrite_grant(thd, rlb);
+    /*
+      Rewrite GRANT statements to use password hashes instead of
+      <secret> style obfuscation so it can be used in binlog.
+    */
+    if (!revoke_grant) {
+      String rlb;
+      mysql_rewrite_grant(thd, &rlb);
+      thd->swap_rewritten_query(rlb);
     }
-    if (thd->rewritten_query.length())
+
+    if (thd->rewritten_query().length() > 0) {
       result= result |
-          write_bin_log(thd, FALSE,
-                        thd->rewritten_query.c_ptr_safe(),
-                        thd->rewritten_query.length(),
+          write_bin_log(thd, FALSE, thd->rewritten_query().ptr(),
+                        thd->rewritten_query().length(),
                         transactional_tables);
+    }
     else
       result= result |
         write_bin_log(thd, FALSE, thd->query().str, thd->query().length,
@@ -2026,7 +2076,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
   }
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
@@ -2083,7 +2133,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
   Security_context *sctx= thd->security_context();
   ulong orig_want_access= want_access;
   DBUG_ENTER("check_grant");
-  DBUG_ASSERT(number > 0);
+  assert(number > 0);
 
   LOCK_grant_read_guard lock(thd);
   for (tl= tables;
@@ -2110,7 +2160,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
            Depend on the controls in the P_S table itself.
         */
         t_ref->grant.privilege|= TMP_TABLE_ACLS;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         t_ref->grant.want_privilege= 0;
 #endif
         continue;
@@ -2140,7 +2190,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
           clause, or an INFORMATION_SCHEMA table, drop the request for
           a privilege.
         */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         t_ref->grant.want_privilege= 0;
 #endif
       }
@@ -2156,7 +2206,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
         if user has CREATE_TMP_ACL.
       */
       t_ref->grant.privilege|= TMP_TABLE_ACLS;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       t_ref->grant.want_privilege= 0;
 #endif
       continue;
@@ -2248,7 +2298,7 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant,
     Make sure that the privilege request is aligned with the overall privileges
     granted to and requested for the table.
   */
-  DBUG_ASSERT(!(want_privilege & ~(grant->want_privilege | grant->privilege)));
+  assert(!(want_privilege & ~(grant->want_privilege | grant->privilege)));
   // Adjust wanted privileges based on privileges granted to table:
   want_privilege&= ~grant->privilege;
   if (!want_privilege)
@@ -2327,7 +2377,7 @@ bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
   Security_context *sctx= MY_TEST(table_ref->security_ctx) ?
                           table_ref->security_ctx : thd->security_context();
 
-  DBUG_ASSERT(want_privilege);
+  assert(want_privilege);
 
   if (table_ref->is_view() || table_ref->field_translation)
   {
@@ -2432,7 +2482,7 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg,
         }
 
         grant_table= grant->grant_table;
-        DBUG_ASSERT (grant_table);
+        assert (grant_table);
       }
     }
 
@@ -2494,13 +2544,16 @@ static bool check_grant_db_routine(THD *thd, const char *db, HASH *hash)
 
 
 /*
-  Check if a user has the right to access a database
-  Access is accepted if he has a grant for any table/routine in the database
-  Return 1 if access is denied
+  Check if a user has the right to access a database.
+  Access is accepted if the user has a database operations related grant
+  (i.e. not including the GRANT_ACL) for any table/column/routine in the
+  database. Return 1 if access is denied
+  check_table_grant is false by default, Access is granted for "show databases"
+  and "show tables in database" when user has table level grant.
 */
 
-bool check_grant_db(THD *thd,const char *db)
-{
+bool check_grant_db(THD *thd, const char *db,
+                    const bool check_table_grant /* = false */) {
   Security_context *sctx= thd->security_context();
   LEX_CSTRING priv_user= sctx->priv_user();
   char helping [NAME_LEN+USERNAME_LENGTH+2];
@@ -2529,11 +2582,11 @@ bool check_grant_db(THD *thd,const char *db)
       my_hash_element(&column_priv_hash,
                       idx);
     if (len < grant_table->key_length &&
-        !memcmp(grant_table->hash_key,helping,len) &&
-        grant_table->host.compare_hostname(sctx->host().str,
-                                           sctx->ip().str))
-    {
-      error= FALSE; /* Found match. */
+        !memcmp(grant_table->hash_key, helping, len) &&
+        grant_table->host.compare_hostname(sctx->host().str, sctx->ip().str) &&
+        ((grant_table->privs | grant_table->cols) &
+         (check_table_grant ? TABLE_OP_ACLS : TABLE_ACLS))) {
+      error = FALSE; /* Found match. */
       break;
     }
   }
@@ -2545,7 +2598,6 @@ bool check_grant_db(THD *thd,const char *db)
   return error;
 }
 
-
 /****************************************************************************
   Check routine level grants
 
@@ -2744,8 +2796,7 @@ static int show_routine_grants(THD* thd, LEX_USER *lex_user, HASH *hash,
 
     if (!(user=grant_proc->user))
       user= "";
-    if (!(host= grant_proc->host.get_host()))
-      host= "";
+    host= grant_proc->host.get_host();
 
     /*
       We do not make SHOW GRANTS case-sensitive here (like REVOKE),
@@ -2793,13 +2844,14 @@ static int show_routine_grants(THD* thd, LEX_USER *lex_user, HASH *hash,
         global.append('.');
         append_identifier(thd, &global, grant_proc->tname,
                           strlen(grant_proc->tname));
-        global.append(STRING_WITH_LEN(" TO '"));
-        global.append(lex_user->user.str, lex_user->user.length,
-                      system_charset_info);
-        global.append(STRING_WITH_LEN("'@'"));
+        global.append(STRING_WITH_LEN(" TO "));
+        String user_str(lex_user->user.str, lex_user->user.length,
+                        system_charset_info);
+        append_query_string(thd, system_charset_info, &user_str, &global);
+        global.append(STRING_WITH_LEN("@"));
         // host and lex_user->host are equal except for case
-        global.append(host, strlen(host), system_charset_info);
-        global.append('\'');
+        String host_str(host, strlen(host), system_charset_info);
+        append_query_string(thd, system_charset_info, &host_str, &global);
         if (proc_access & GRANT_ACL)
           global.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
         protocol->start_row();
@@ -2829,7 +2881,7 @@ show_proxy_grants(THD *thd, LEX_USER *user, char *buff, size_t buffsize)
     {
       String global(buff, buffsize, system_charset_info);
       global.length(0);
-      proxy->print_grant(&global);
+      proxy->print_grant(thd, &global);
       protocol->start_row();
       protocol->store(global.ptr(), global.length(), global.charset());
       if (protocol->end_row())
@@ -2851,7 +2903,7 @@ void get_privilege_desc(char *to, uint max_length, ulong access)
 {
   uint pos;
   char *start=to;
-  DBUG_ASSERT(max_length >= 30);                // For end ', ' removal
+  assert(max_length >= 30);                // For end ', ' removal
 
   if (access)
   {
@@ -2952,13 +3004,14 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         }
       }
     }
-    global.append (STRING_WITH_LEN(" ON *.* TO '"));
-    global.append(lex_user->user.str, lex_user->user.length,
-                  system_charset_info);
-    global.append (STRING_WITH_LEN("'@'"));
-    global.append(lex_user->host.str,lex_user->host.length,
-                  system_charset_info);
-    global.append ('\'');
+    global.append (STRING_WITH_LEN(" ON *.* TO "));
+    String user_str(lex_user->user.str, lex_user->user.length,
+                    system_charset_info);
+    append_query_string(thd, system_charset_info, &user_str, &global);
+    global.append(STRING_WITH_LEN("@"));
+    String host_str(lex_user->host.str, lex_user->host.length,
+                    system_charset_info);
+    append_query_string(thd, system_charset_info, &host_str, &global);
     if (want_access & GRANT_ACL)
       global.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
     protocol->start_row();
@@ -2977,8 +3030,7 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
 
     if (!(user=acl_db->user))
       user= "";
-    if (!(host=acl_db->host.get_host()))
-      host= "";
+    host= acl_db->host.get_host();
 
     /*
       We do not make SHOW GRANTS case-sensitive here (like REVOKE),
@@ -2997,7 +3049,7 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         db.length(0);
         db.append(STRING_WITH_LEN("GRANT "));
 
-        if (test_all_bits(want_access,(DB_ACLS & ~GRANT_ACL)))
+        if (test_all_bits(want_access, (DB_OP_ACLS)))
           db.append(STRING_WITH_LEN("ALL PRIVILEGES"));
         else if (!(want_access & ~GRANT_ACL))
           db.append(STRING_WITH_LEN("USAGE"));
@@ -3005,8 +3057,7 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         {
           int found=0, cnt;
           ulong j,test_access= want_access & ~GRANT_ACL;
-          for (cnt=0, j = SELECT_ACL; j <= DB_ACLS; cnt++,j <<= 1)
-          {
+          for (cnt = 0, j = SELECT_ACL; j <= DB_OP_ACLS; cnt++, j <<= 1) {
             if (test_access & j)
             {
               if (found)
@@ -3018,13 +3069,14 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         }
         db.append (STRING_WITH_LEN(" ON "));
         append_identifier(thd, &db, acl_db->db, strlen(acl_db->db));
-        db.append (STRING_WITH_LEN(".* TO '"));
-        db.append(lex_user->user.str, lex_user->user.length,
-                  system_charset_info);
-        db.append (STRING_WITH_LEN("'@'"));
+        db.append (STRING_WITH_LEN(".* TO "));
+        String user_str(lex_user->user.str, lex_user->user.length,
+                        system_charset_info);
+        append_query_string(thd, system_charset_info, &user_str, &db);
+        db.append(STRING_WITH_LEN("@"));
         // host and lex_user->host are equal except for case
-        db.append(host, strlen(host), system_charset_info);
-        db.append ('\'');
+        String host_str(host, strlen(host), system_charset_info);
+        append_query_string(thd, system_charset_info, &host_str, &db);
         if (want_access & GRANT_ACL)
           db.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
         protocol->start_row();
@@ -3047,8 +3099,7 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
 
     if (!(user=grant_table->user))
       user= "";
-    if (!(host= grant_table->host.get_host()))
-      host= "";
+    host= grant_table->host.get_host();
 
     /*
       We do not make SHOW GRANTS case-sensitive here (like REVOKE),
@@ -3069,7 +3120,7 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         global.length(0);
         global.append(STRING_WITH_LEN("GRANT "));
 
-        if (test_all_bits(table_access, (TABLE_ACLS & ~GRANT_ACL)))
+        if (test_all_bits(table_access, (TABLE_OP_ACLS)))
           global.append(STRING_WITH_LEN("ALL PRIVILEGES"));
         else if (!test_access)
           global.append(STRING_WITH_LEN("USAGE"));
@@ -3079,8 +3130,8 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
           int found= 0;
           ulong j;
 
-          for (counter= 0, j= SELECT_ACL; j <= TABLE_ACLS; counter++, j<<= 1)
-          {
+          for (counter = 0, j = SELECT_ACL; j <= TABLE_OP_ACLS;
+               counter++, j <<= 1) {
             if (test_access & j)
             {
               if (found)
@@ -3133,13 +3184,14 @@ bool mysql_show_grants(THD *thd,LEX_USER *lex_user)
         global.append('.');
         append_identifier(thd, &global, grant_table->tname,
                           strlen(grant_table->tname));
-        global.append(STRING_WITH_LEN(" TO '"));
-        global.append(lex_user->user.str, lex_user->user.length,
-                      system_charset_info);
-        global.append(STRING_WITH_LEN("'@'"));
+        global.append(STRING_WITH_LEN(" TO "));
+        String user_str(lex_user->user.str, lex_user->user.length,
+                        system_charset_info);
+        append_query_string(thd, system_charset_info, &user_str, &global);
+        global.append(STRING_WITH_LEN("@"));
         // host and lex_user->host are equal except for case
-        global.append(host, strlen(host), system_charset_info);
-        global.append('\'');
+        String host_str(host, strlen(host), system_charset_info);
+        append_query_string(thd, system_charset_info, &host_str, &global);
         if (table_access & GRANT_ACL)
           global.append(STRING_WITH_LEN(" WITH GRANT OPTION"));
         protocol->start_row();
@@ -3217,7 +3269,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
   if ((result= open_grant_tables(thd, tables, &transactional_tables)))
   {
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(result != 1);
@@ -3278,8 +3330,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
 
         if (!(user=acl_db->user))
           user= "";
-        if (!(host=acl_db->host.get_host()))
-          host= "";
+        host= acl_db->host.get_host();
 
         if (!strcmp(lex_user->user.str,user) &&
             !strcmp(lex_user->host.str, host))
@@ -3320,8 +3371,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
           (GRANT_TABLE*) my_hash_element(&column_priv_hash, counter);
         if (!(user=grant_table->user))
           user= "";
-        if (!(host=grant_table->host.get_host()))
-          host= "";
+        host= grant_table->host.get_host();
 
         if (!strcmp(lex_user->user.str,user) &&
             !strcmp(lex_user->host.str, host))
@@ -3384,8 +3434,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
         GRANT_NAME *grant_proc= (GRANT_NAME*) my_hash_element(hash, counter);
         if (!(user=grant_proc->user))
           user= "";
-        if (!(host=grant_proc->host.get_host()))
-          host= "";
+        host= grant_proc->host.get_host();
 
         if (!strcmp(lex_user->user.str,user) &&
             !strcmp(lex_user->host.str, host))
@@ -3467,7 +3516,7 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
     acl_notify_htons(thd, thd->query().str, thd->query().length);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
@@ -3577,10 +3626,8 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
         LEX_USER lex_user;
         lex_user.user.str= grant_proc->user;
         lex_user.user.length= strlen(grant_proc->user);
-        lex_user.host.str= (char*) (grant_proc->host.get_host() ?
-          grant_proc->host.get_host() : "");
-        lex_user.host.length= grant_proc->host.get_host() ?
-          strlen(grant_proc->host.get_host()) : 0;
+        lex_user.host.str= (char *) (grant_proc->host.get_host());
+        lex_user.host.length= grant_proc->host.get_host_len();
 
         int ret=
           replace_routine_table(thd,grant_proc,tables[4].table,lex_user,
@@ -3613,7 +3660,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
   thd->pop_internal_handler();
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
@@ -3649,21 +3696,13 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name,
   if (!(combo=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
     DBUG_RETURN(TRUE);
 
-  combo->user.str= (char *) sctx->user().str;
+  combo->user.str= (char *) sctx->priv_user().str;
 
   mysql_mutex_lock(&acl_cache->lock);
 
-  if ((au= find_acl_user(combo->host.str= (char *) sctx->host_or_ip().str,
-                         combo->user.str, false)))
-    goto found_acl;
-  if ((au= find_acl_user(combo->host.str= (char *) sctx->host().str,
-                         combo->user.str, false)))
-    goto found_acl;
-  if ((au= find_acl_user(combo->host.str= (char*) sctx->ip().str,
+  if ((au= find_acl_user(combo->host.str= (char *) sctx->priv_host().str,
                          combo->user.str, false)))
     goto found_acl;
-  if((au= find_acl_user(combo->host.str=(char*)"%", combo->user.str, FALSE)))
-    goto found_acl;
 
   mysql_mutex_unlock(&acl_cache->lock);
   DBUG_RETURN(TRUE);
@@ -3765,7 +3804,7 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant,
     This function is not intended for derived tables which doesn't have a 
     name. If this happens something is wrong.
   */
-  DBUG_ASSERT(table != 0);
+  assert(table != 0);
   /* --skip-grants */
   if (!initialized)
   {
@@ -3910,8 +3949,7 @@ int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, Item *cond)
     const char *user,*host, *is_grantable="YES";
     if (!(user=acl_user->user))
       user= "";
-    if (!(host=acl_user->host.get_host()))
-      host= "";
+    host= acl_user->host.get_host();
 
     if (no_global_access &&
         (strcmp(thd->security_context()->priv_user().str, user) ||
@@ -3984,8 +4022,7 @@ int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, Item *cond)
 
     if (!(user=acl_db->user))
       user= "";
-    if (!(host=acl_db->host.get_host()))
-      host= "";
+    host= acl_db->host.get_host();
 
     if (no_global_access &&
         (strcmp(thd->security_context()->priv_user().str, user) ||
@@ -4058,8 +4095,7 @@ int fill_schema_table_privileges(THD *thd, TABLE_LIST *tables, Item *cond)
                                                           index);
     if (!(user=grant_table->user))
       user= "";
-    if (!(host= grant_table->host.get_host()))
-      host= "";
+    host= grant_table->host.get_host();
 
     if (no_global_access &&
         (strcmp(thd->security_context()->priv_user().str, user) ||
@@ -4141,8 +4177,7 @@ int fill_schema_column_privileges(THD *thd, TABLE_LIST *tables, Item *cond)
                                                           index);
     if (!(user=grant_table->user))
       user= "";
-    if (!(host= grant_table->host.get_host()))
-      host= "";
+    host= grant_table->host.get_host();
 
     if (no_global_access &&
         (strcmp(thd->security_context()->priv_user().str, user) ||
@@ -4240,14 +4275,13 @@ static bool check_show_access(THD *thd, TABLE_LIST *table)
   {
     const char *dst_db_name= table->schema_select_lex->db;
 
-    DBUG_ASSERT(dst_db_name);
+    assert(dst_db_name);
 
     if (check_access(thd, SELECT_ACL, dst_db_name,
                      &thd->col_access, NULL, FALSE, FALSE))
       return TRUE;
 
-    if (!thd->col_access && check_grant_db(thd, dst_db_name))
-    {
+    if (!(thd->col_access & DB_OP_ACLS) && check_grant_db(thd, dst_db_name)) {
       my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                thd->security_context()->priv_user().str,
                thd->security_context()->priv_host().str,
@@ -4264,7 +4298,7 @@ static bool check_show_access(THD *thd, TABLE_LIST *table)
     TABLE_LIST *dst_table;
     dst_table= table->schema_select_lex->table_list.first;
 
-    DBUG_ASSERT(dst_table);
+    assert(dst_table);
 
     /*
       Open temporary tables to be able to detect them during privilege check.
@@ -4374,7 +4408,7 @@ bool check_fk_parent_table_access(THD *thd,
                                fk_key->ref_table.length };
 
       // Check if tablename is valid or not.
-      DBUG_ASSERT(table_name.str != NULL);
+      assert(table_name.str != NULL);
       if (check_table_name(table_name.str, table_name.length, false))
       {
         my_error(ER_WRONG_TABLE_NAME, MYF(0), table_name.str);
@@ -4453,3 +4487,107 @@ bool check_fk_parent_table_access(THD *thd,
 
   return false;
 }
+
+
+/**
+  For LOCK TABLES on a view checks if user in which context view is executed
+  or user that has initiated this operation has SELECT and LOCK TABLES
+  privileges on one of its underlying tables.
+
+  @param [in]   thd                   Thread context.
+  @param [in]   tbl                   Table list element for underlying table
+                                      on which we check privilege.
+  @param [out]  fake_lock_tables_acl  Set to true if table in question is one
+                                      of special I_S or P_S tables on which
+                                      nobody can get LOCK TABLES privilege.
+                                      So to preserve compatibility with dump
+                                      tools we need to fake this privilege.
+                                      Set to false otherwise.
+
+  @retval false   Success.
+  @retval true    Access denied. Error has been reported.
+*/
+bool check_lock_view_underlying_table_access(THD *thd, TABLE_LIST *tbl,
+                                             bool *fake_lock_tables_acl)
+{
+  ulong want_access= SELECT_ACL | LOCK_TABLES_ACL;
+  *fake_lock_tables_acl= false;
+
+  /*
+    I_S and P_S tables require special handling of LOCK TABLES privilege
+    in this case.
+    On the one hand we don't grant this privileges on I_S and read-only/
+    truncatable-only P_S tables to anyone. So normally you can't lock
+    them directly using LOCK TABLES.
+    On the other hand we allow creation of views which reference these
+    tables. And mysqldump/pump tools routinely lock views using LOCK
+    TABLES just to dump their definition in default mode. So refusing
+    locking of such views will break mysqldump/pump. It will also break
+    user scenarios in when views on top of I_S/P_S tables are locked along
+    with other tables by LOCK TABLES, so they are accessible under LOCK
+    TABLES mode. So we simply skip LOCK TABLES privilege check for I_S and
+    read-only/ truncatable-only P_S tables. However, we report the fact to
+    the caller, so it won't acquire strong metadata locks in this case,
+    which can be considered privilege escalation.
+  */
+  const ACL_internal_schema_access *schema_access=
+      get_cached_schema_access(&tbl->grant.m_internal, tbl->db);
+  if (schema_access)
+  {
+    ulong dummy= 0;
+    switch (schema_access->check(LOCK_TABLES_ACL, &dummy))
+    {
+    case ACL_INTERNAL_ACCESS_DENIED:
+      *fake_lock_tables_acl= true;
+      // Fall through.
+    case ACL_INTERNAL_ACCESS_GRANTED:
+      want_access&= ~LOCK_TABLES_ACL;
+      break;
+    case ACL_INTERNAL_ACCESS_CHECK_GRANT:
+      const ACL_internal_table_access *table_access= get_cached_table_access(
+          &tbl->grant.m_internal, tbl->db, tbl->table_name);
+      if (table_access)
+      {
+        switch (table_access->check(LOCK_TABLES_ACL, &dummy))
+        {
+        case ACL_INTERNAL_ACCESS_DENIED:
+          *fake_lock_tables_acl= true;
+          // Fall through.
+        case ACL_INTERNAL_ACCESS_GRANTED:
+          want_access&= ~LOCK_TABLES_ACL;
+          break;
+        case ACL_INTERNAL_ACCESS_CHECK_GRANT:
+          break;
+        }
+      }
+      break;
+    }
+  }
+
+  if (!check_single_table_access(thd, want_access, tbl, true))
+    return false;
+
+  /*
+    As it was mentioned earlier mysqldump/pump tools routinely lock
+    views just to dump their definition. This is supposed to work even
+    for views with (temporarily) invalid definer. To avoid breaking
+    this scenario we allow locking of view not only when user which
+    security context will be used for its execution has LOCK TABLES
+    and SELECT privileges on its underlying tbales, but also when
+    the user which originally requested LOCK TABLES has the similar
+    privileges on its underlying tables (which is likely to be the
+    case for users invoking mysqldump/pump).
+  */
+  Security_context *save_security_ctx= tbl->security_ctx;
+  tbl->security_ctx= NULL;
+  bool top_user_has_privs=
+      !check_single_table_access(thd, want_access, tbl, true);
+  tbl->security_ctx= save_security_ctx;
+
+  if (top_user_has_privs)
+    return false;
+
+  my_error(ER_VIEW_INVALID, MYF(0), tbl->belong_to_view->get_db_name(),
+           tbl->belong_to_view->get_table_name());
+  return true;
+}
diff --git a/sql/auth/sql_authorization.h b/sql/auth/sql_authorization.h
index b91daa9ff04a..2168eafaa447 100644
--- a/sql/auth/sql_authorization.h
+++ b/sql/auth/sql_authorization.h
@@ -1,16 +1,23 @@
 #ifndef SQL_AUTHORIZATION_INCLUDED
 #define SQL_AUTHORIZATION_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/auth/sql_security_ctx.cc b/sql/auth/sql_security_ctx.cc
index 8adb16783b26..7f7954c18794 100644
--- a/sql/auth/sql_security_ctx.cc
+++ b/sql/auth/sql_security_ctx.cc
@@ -1,12 +1,19 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -172,7 +179,7 @@ change_security_context(THD *thd,
 
   DBUG_ENTER("Security_context::change_security_context");
 
-  DBUG_ASSERT(definer_user.str && definer_host.str);
+  assert(definer_user.str && definer_host.str);
 
   *backup= NULL;
   needs_change= (strcmp(definer_user.str,
diff --git a/sql/auth/sql_security_ctx.h b/sql/auth/sql_security_ctx.h
index 68ef7a1fea0f..0ab90081aa09 100644
--- a/sql/auth/sql_security_ctx.h
+++ b/sql/auth/sql_security_ctx.h
@@ -1,16 +1,23 @@
 #ifndef SQL_SECURITY_CTX_INCLUDED
 #define SQL_SECURITY_CTX_INCLUDED
 
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/auth/sql_user.cc b/sql/auth/sql_user.cc
index 2ad005e12cdb..337069fa2f6f 100644
--- a/sql/auth/sql_user.cc
+++ b/sql/auth/sql_user.cc
@@ -1,12 +1,19 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -31,7 +38,7 @@
 #include "sql_user_table.h"
 #include <set>
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #define HASH_STRING_WITH_QUOTE \
         "$5$BVZy9O>'a+2MH]_?$fpWyabcdiHjfCVqId/quykZzjaA7adpkcen/uiQrtmOK4p4"
 #endif
@@ -115,7 +122,7 @@ void append_user(THD *thd, String *str, LEX_USER *user, bool comma= true,
           /*
             With old_passwords == 2 the scrambled password will be binary.
           */
-          DBUG_ASSERT(thd->variables.old_passwords = 2);
+          assert(thd->variables.old_passwords == 2);
           str->append("<secret>");
         }
         str->append("'");
@@ -124,7 +131,8 @@ void append_user(THD *thd, String *str, LEX_USER *user, bool comma= true,
   }
 }
 
-void append_user_new(THD *thd, String *str, LEX_USER *user, bool comma= true)
+void append_user_new(THD *thd, String *str, LEX_USER *user, bool comma,
+                     bool hide_password_hash)
 {
   String from_user(user->user.str, user->user.length, system_charset_info);
   String from_plugin(user->plugin.str, user->plugin.length, system_charset_info);
@@ -174,7 +182,8 @@ void append_user_new(THD *thd, String *str, LEX_USER *user, bool comma= true)
       if (user->auth.length > 0)
       {
         str->append(STRING_WITH_LEN(" AS "));
-        if (thd->lex->contains_plaintext_password)
+        if (thd->lex->contains_plaintext_password ||
+            hide_password_hash)
         {
           str->append("'");
           str->append(STRING_WITH_LEN("<secret>"));
@@ -267,15 +276,17 @@ int check_change_password(THD *thd, const char *host, const char *user,
 /**
   Auxiliary function for constructing CREATE USER sql for a given user.
 
-  @param thd          Thread context
-  @param user_name    user for which the sql should be constructed.
+  @param thd                    Thread context
+  @param user_name              user for which the sql should be constructed.
+  @param are_both_users_same    If the command is issued for self or not.
 
   @retval
     0         OK.
     1         Error.
  */
 
-bool mysql_show_create_user(THD *thd, LEX_USER *user_name)
+bool mysql_show_create_user(THD *thd, LEX_USER *user_name,
+                            bool are_both_users_same)
 {
   int error= 0;
   ACL_USER *acl_user;
@@ -289,8 +300,17 @@ bool mysql_show_create_user(THD *thd, LEX_USER *user_name)
   List<Item> field_list;
   String sql_text(buff,sizeof(buff),system_charset_info);
   LEX_ALTER alter_info;
+  bool hide_password_hash= false;
 
   DBUG_ENTER("mysql_show_create_user");
+  if (are_both_users_same)
+  {
+    TABLE_LIST t1;
+    t1.init_one_table(C_STRING_WITH_LEN("mysql"), C_STRING_WITH_LEN("user"),
+                      "user", TL_READ);
+    hide_password_hash= check_table_access(thd, SELECT_ACL, &t1, false,
+                                           UINT_MAX, true);
+  }
 
   mysql_mutex_lock(&acl_cache->lock);
   if (!(acl_user= find_acl_user(user_name->host.str, user_name->user.str, TRUE)))
@@ -359,7 +379,7 @@ bool mysql_show_create_user(THD *thd, LEX_USER *user_name)
   }
   sql_text.length(0);
   lex->users_list.push_back(user_name);
-  mysql_rewrite_create_alter_user(thd, &sql_text);
+  mysql_rewrite_create_alter_user(thd, &sql_text, NULL, hide_password_hash);
   /* send the result row to client */
   protocol->start_row();
   protocol->store(sql_text.ptr(),sql_text.length(),sql_text.charset());
@@ -609,24 +629,12 @@ bool set_and_validate_user_attributes(THD *thd,
      Str->uses_authentication_string_clause)
   {
     st_mysql_auth *auth= (st_mysql_auth *) plugin_decl(plugin)->info;
-    /*
-      Validate hash string in following cases:
-        1. IDENTIFIED BY PASSWORD.
-        2. IDENTIFIED WITH .. AS 'auth_str' for ALTER USER statement
-           and its a replication slave thread
-    */
-    if (Str->uses_identified_by_password_clause ||
-        (Str->uses_authentication_string_clause &&
-        thd->lex->sql_command == SQLCOM_ALTER_USER &&
-        thd->slave_thread))
+    if (auth->validate_authentication_string((char*)Str->auth.str,
+                                             Str->auth.length))
     {
-      if (auth->validate_authentication_string((char*)Str->auth.str,
-                                               Str->auth.length))
-      {
-        my_error(ER_PASSWORD_FORMAT, MYF(0));
-        plugin_unlock(0, plugin);
-        return(1);
-      }
+      my_error(ER_PASSWORD_FORMAT, MYF(0));
+      plugin_unlock(0, plugin);
+      return(1);
     }
   }
   plugin_unlock(0, plugin);
@@ -672,12 +680,13 @@ bool change_password(THD *thd, const char *host, const char *user,
   size_t new_password_len= strlen(new_password);
   size_t escaped_hash_str_len= 0;
   bool result= true, rollback_whole_statement= false;
+  sql_mode_t old_sql_mode= thd->variables.sql_mode;
   int ret;
 
   DBUG_ENTER("change_password");
   DBUG_PRINT("enter",("host: '%s'  user: '%s'  new_password: '%s'",
                       host,user,new_password));
-  DBUG_ASSERT(host != 0);                        // Ensured by parent
+  assert(host != 0);                        // Ensured by parent
 
   if (check_change_password(thd, host, user, new_password, new_password_len))
     DBUG_RETURN(1);
@@ -707,13 +716,6 @@ bool change_password(THD *thd, const char *host, const char *user,
   if (table_intact.check(table, &mysql_user_table_def))
     DBUG_RETURN(1);
 
-  if (!table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
-             table->s->table_name.str);
-    DBUG_RETURN(1);
-  }
-
   /*
     This statement will be replicated as a statement, even when using
     row-based replication.  The flag will be reset at the end of the
@@ -731,7 +733,7 @@ bool change_password(THD *thd, const char *host, const char *user,
     goto end;
   }
 
-  DBUG_ASSERT(acl_user->plugin.length != 0);
+  assert(acl_user->plugin.length != 0);
   
   if (!(combo=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
     DBUG_RETURN(1);
@@ -763,15 +765,19 @@ bool change_password(THD *thd, const char *host, const char *user,
   thd->lex->alter_password.account_locked= false;
   thd->lex->alter_password.update_password_expired_fields= false;
 
+
   /*
-    When @@log-backward-compatible-user-definitions variable is ON
-    and its a slave thread, then the password is already hashed. So
-    do not generate another hash.
-  */
-  if (opt_log_builtin_as_identified_by_password &&
-      thd->slave_thread)
+    In case its a slave thread or a binlog applier thread, the password
+    is already hashed. Do not generate another hash!
+   */
+  if (thd->slave_thread || thd->is_binlog_applier())
+  {
+    /* Password is in hash form */
+    combo->uses_authentication_string_clause= true;
+    /* Password is not plain text */
     combo->uses_identified_by_clause= false;
-    
+  }
+
   if (set_and_validate_user_attributes(thd, combo, what_to_set,
                                        true, "SET PASSWORD"))
   {
@@ -780,7 +786,10 @@ bool change_password(THD *thd, const char *host, const char *user,
     goto end;
   }
 
-  ret= replace_user_table(thd, table, combo, 0, false, true, what_to_set);
+  thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
+  ret= replace_user_table(thd, table, combo, 0, false, false, what_to_set);
+  thd->variables.sql_mode= old_sql_mode;
+
   if (ret)
   {
     mysql_mutex_unlock(&acl_cache->lock);
@@ -831,7 +840,7 @@ bool change_password(THD *thd, const char *host, const char *user,
 
     query_length= sprintf(buff, "SET PASSWORD FOR '%-.120s'@'%-.120s'='%s'",
                           acl_user->user ? acl_user->user : "",
-                          acl_user->host.get_host() ? acl_user->host.get_host() : "",
+                          acl_user->host.get_host(),
                           hash_str_escaped);
   }
   else
@@ -845,7 +854,7 @@ bool change_password(THD *thd, const char *host, const char *user,
 
     query_length= sprintf(buff, "ALTER USER '%-.120s'@'%-.120s' IDENTIFIED WITH '%-.120s' AS '%s'",
                           acl_user->user ? acl_user->user : "",
-                          acl_user->host.get_host() ? acl_user->host.get_host() : "",
+                          acl_user->host.get_host(),
                           acl_user->plugin.str,
                           hash_str_escaped);
   }
@@ -860,7 +869,7 @@ bool change_password(THD *thd, const char *host, const char *user,
     acl_notify_htons(thd, buff, query_length);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
@@ -987,8 +996,6 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
     }
     if (! user)
       user= "";
-    if (! host)
-      host= "";
 
 #ifdef EXTRA_DEBUG
     DBUG_PRINT("loop",("scan struct: %u  index: %zu  user: '%s'  host: '%s'",
@@ -1382,7 +1389,7 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool if_not_exists)
   if ((result= open_grant_tables(thd, tables, &transactional_tables)))
   {
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(result != 1);
@@ -1470,24 +1477,34 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool if_not_exists)
       my_error(ER_CANNOT_USER, MYF(0), "CREATE USER", wrong_users.c_ptr_safe());
   }
 
-  if (some_users_created || if_not_exists)
+  if (some_users_created || (if_not_exists && !thd->is_error()))
   {
-    String *rlb= &thd->rewritten_query;
-    rlb->mem_free();
-    mysql_rewrite_create_alter_user(thd, rlb, &extra_users);
+    /*
+      Rewrite CREATE USER statements to use password hashes instead
+      of <secret> style obfuscation so it can be used in binlog. We
+      are rewriting to a private string rather than the public one on
+      the THD (thd->m_rewritten_query). This will save us from having
+      to acquire the lock to update the string on the THD. As
+      slow-logging (if enabled) will happen later and use the string
+      on the THD, the slow log will not contain the local rewrite
+      we're doing here, but the original one.
+    */
+    String rlb;
+
+    mysql_rewrite_create_alter_user(thd, &rlb, &extra_users);
 
     int ret= commit_owned_gtid_by_partial_command(thd);
 
     if (ret == 1)
     {
-      if (!thd->rewritten_query.length())
+      if (!rlb.length())
         result|= write_bin_log(thd, false, thd->query().str, thd->query().length,
                                transactional_tables);
-      else
-        result|= write_bin_log(thd, false,
-                               thd->rewritten_query.c_ptr_safe(),
-                               thd->rewritten_query.length(),
+      else {
+        result|= write_bin_log(thd, false, rlb.c_ptr_safe(), rlb.length(),
                                transactional_tables);
+        thd->swap_rewritten_query(rlb); // must come last!
+      }
     }
     else if (ret == -1)
       result|= -1;
@@ -1503,7 +1520,7 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool if_not_exists)
     acl_notify_htons(thd, thd->query().str, thd->query().length);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(result);
@@ -1549,7 +1566,7 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list, bool if_exists)
   if ((result= open_grant_tables(thd, tables, &transactional_tables)))
   {
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(result != 1);
@@ -1625,7 +1642,7 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list, bool if_exists)
 
   thd->variables.sql_mode= old_sql_mode;
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(result);
@@ -1671,7 +1688,7 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
   if ((result= open_grant_tables(thd, tables, &transactional_tables)))
   {
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(result != 1);
@@ -1693,7 +1710,7 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
       result= TRUE;
       continue;
     }  
-    DBUG_ASSERT(user_to != 0); /* Syntax enforces pairs of users. */
+    assert(user_to != 0); /* Syntax enforces pairs of users. */
 
     /*
       Search all in-memory structures and grant tables
@@ -1763,7 +1780,7 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
     acl_notify_htons(thd, thd->query().str, thd->query().length);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(result);
@@ -1797,6 +1814,7 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
   bool is_privileged_user= false;
   bool rollback_whole_statement= false;
   std::set<LEX_USER *> extra_users;
+  std::set<LEX_USER *> reset_users;
   Acl_table_intact table_intact;
 
   DBUG_ENTER("mysql_alter_user");
@@ -1831,13 +1849,6 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
   if (table_intact.check(table, &mysql_user_table_def))
     DBUG_RETURN(true);
 
-  if (!table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
-             table->s->table_name.str);
-    DBUG_RETURN(true);
-  }
-
   /*
     This statement will be replicated as a statement, even when using
     row-based replication.  The flag will be reset at the end of the
@@ -1931,7 +1942,7 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
     }
 
     /* update the mysql.user table */
-    int ret= replace_user_table(thd, table, user_from, 0, false, true,
+    int ret= replace_user_table(thd, table, user_from, 0, false, false,
                                 what_to_alter);
     if (ret)
     {
@@ -1945,6 +1956,8 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
                   false);
       continue;
     }
+    if (what_to_alter & RESOURCE_ATTR)
+      reset_users.insert(tmp_user_from);
     some_user_altered= true;
     update_sctx_cache(thd->security_context(), acl_user,
                       user_from->alter_status.update_password_expired_column);
@@ -1961,22 +1974,31 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
       my_error(ER_CANNOT_USER, MYF(0), "ALTER USER", wrong_users.c_ptr_safe());
   }
 
-  if (some_user_altered || if_exists)
+  if (some_user_altered || (if_exists && !thd->is_error()))
   {
-    /* do query rewrite for ALTER USER */
-    String *rlb= &thd->rewritten_query;
-    rlb->mem_free();
-    mysql_rewrite_create_alter_user(thd, rlb, &extra_users);
+    /*
+      Rewrite ALTER USER statements to use password hashes instead
+      of <secret> style obfuscation so it can be used in binlog. We
+      are rewriting to a private string rather than the public one on
+      the THD (thd->m_rewritten_query). This will save us from having
+      to acquire the lock to update the string on the THD. As
+      slow-logging (if enabled) will happen later and use the string
+      on the THD, the slow log will not contain the local rewrite
+      we're doing here, but the original one.
+    */
+    String rlb;
+
+    mysql_rewrite_create_alter_user(thd, &rlb, &extra_users);
 
     int ret= commit_owned_gtid_by_partial_command(thd);
     if (ret == 1)
-      result|= (write_bin_log(thd, false,
-                              thd->rewritten_query.c_ptr_safe(),
-                              thd->rewritten_query.length(),
+      result|= (write_bin_log(thd, false, rlb.c_ptr_safe(), rlb.length(),
                               table->file->has_transactions()) != 0);
 
     else if (ret == -1)
       result|= -1;
+
+    thd->swap_rewritten_query(rlb); // must come last!
   }
 
   lock.unlock();
@@ -1987,10 +2009,20 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
                                    rollback_whole_statement);
 
   if (some_user_altered && !result)
+  {
+    std::set<LEX_USER *>::iterator one_user;
+    LEX_USER *ext_user;
+    for (one_user= reset_users.begin(); one_user != reset_users.end(); one_user++)
+    {
+      LEX_USER *user= *one_user;
+      if ((ext_user= get_current_user(thd, user)))
+        reset_mqh(ext_user, false);
+    }
     acl_notify_htons(thd, thd->query().str, thd->query().length);
+  }
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(result);
@@ -1998,5 +2030,3 @@ bool mysql_alter_user(THD *thd, List <LEX_USER> &list, bool if_exists)
 
 
 #endif
-
-
diff --git a/sql/auth/sql_user.h b/sql/auth/sql_user.h
index 4242d4337d54..46b56127ce9c 100644
--- a/sql/auth/sql_user.h
+++ b/sql/auth/sql_user.h
@@ -1,16 +1,23 @@
 #ifndef SQL_USER_INCLUDED
 #define SQL_USER_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/auth/sql_user_table.cc b/sql/auth/sql_user_table.cc
index 128f47498cd3..a0c8d350ae66 100644
--- a/sql/auth/sql_user_table.cc
+++ b/sql/auth/sql_user_table.cc
@@ -1,12 +1,19 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -42,7 +49,7 @@
 #define DEBUG_SE_WRITE_ERROR_POST(debug_flag)    \
   DBUG_EXECUTE_IF(debug_flag,  \
                   {  \
-                    DBUG_ASSERT(error == HA_ERR_INTERNAL_ERROR);  \
+                    assert(error == HA_ERR_INTERNAL_ERROR);    \
                     DBUG_SET("-d, inject_error_ha_write_row"); \
                     error= HA_ERR_LOCK_WAIT_TIMEOUT;  \
                   });
@@ -54,7 +61,7 @@
 #define DEBUG_SE_UPDATE_ERROR_POST(debug_flag)    \
   DBUG_EXECUTE_IF(debug_flag,  \
                   {  \
-                    DBUG_ASSERT(error == HA_ERR_INTERNAL_ERROR);  \
+                    assert(error == HA_ERR_INTERNAL_ERROR);     \
                     DBUG_SET("-d, inject_error_ha_update_row"); \
                     error= HA_ERR_LOCK_WAIT_TIMEOUT;  \
                   });
@@ -66,7 +73,7 @@
 #define DEBUG_SE_DELETE_ERROR_POST(debug_flag)    \
   DBUG_EXECUTE_IF(debug_flag,  \
                   {  \
-                    DBUG_ASSERT(error == HA_ERR_INTERNAL_ERROR);  \
+                    assert(error == HA_ERR_INTERNAL_ERROR);     \
                     DBUG_SET("-d, inject_error_ha_delete_row"); \
                     error= HA_ERR_LOCK_WAIT_TIMEOUT;  \
                   });
@@ -671,11 +678,11 @@ void close_acl_tables(THD *thd)
   }
   else
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     bool res=
 #endif
       trans_commit_stmt(thd);
-    DBUG_ASSERT(res == false);
+    assert(res == false);
   }
 
   close_mysql_tables(thd);
@@ -712,7 +719,7 @@ bool acl_end_trans_and_close_tables(THD *thd, bool rollback_transaction)
     It is safe to do so since ACL statement always do implicit commit at the
     end of statement.
   */
-  DBUG_ASSERT(stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_END));
+  assert(stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_END));
 
   if (rollback_transaction)
   {
@@ -899,15 +906,8 @@ int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
   if (table_intact.check(table, &mysql_user_table_def))
     goto end;
   
-  if (!table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
-             table->s->table_name.str);
-    goto end;
-  }
-
   table->use_all_columns();
-  DBUG_ASSERT(combo->host.str != NULL);
+  assert(combo->host.str != NULL);
   table->field[MYSQL_USER_FIELD_HOST]->store(combo->host.str,combo->host.length,
                                              system_charset_info);
   table->field[MYSQL_USER_FIELD_USER]->store(combo->user.str,combo->user.length,
@@ -946,9 +946,19 @@ int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
     optimize_plugin_compare_by_pointer(&combo->plugin);
     builtin_plugin= auth_plugin_is_built_in(combo->plugin.str);
 
+    /* The user record was neither present nor the intention was to create it */
     if (!can_create_user)
     {
-      my_error(ER_CANT_CREATE_USER_WITH_GRANT, MYF(0));
+      if(thd->lex->sql_command == SQLCOM_GRANT)
+      {
+        /* Have come here to GRANT privilege to the non-existing user */
+        my_error(ER_CANT_CREATE_USER_WITH_GRANT, MYF(0));
+      }
+      else if (update_password)
+      {
+        /* Have come here to update the password of the non-existing user */
+        my_error(ER_PASSWORD_NO_MATCH, MYF(0), combo->user.str, combo->host.str);
+      }
       error= 1;
       goto end;
     }
@@ -973,7 +983,7 @@ int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
     }
     old_row_exists = 0;
     restore_record(table,s->default_values);
-    DBUG_ASSERT(combo->host.str != NULL);
+    assert(combo->host.str != NULL);
     table->field[MYSQL_USER_FIELD_HOST]->store(combo->host.str,combo->host.length,
                                                system_charset_info);
     table->field[MYSQL_USER_FIELD_USER]->store(combo->user.str,combo->user.length,
@@ -1545,13 +1555,6 @@ int replace_column_table(GRANT_TABLE *g_t,
   if (table_intact.check(table, &mysql_columns_priv_table_def))
     DBUG_RETURN(-1);
 
-  if (!table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
-             table->s->table_name.str);
-    DBUG_RETURN(-1);
-  }
-  
   key_part= table->key_info->key_part;
 
   table->use_all_columns();
@@ -2307,13 +2310,6 @@ int handle_grant_table(TABLE_LIST *tables, uint table_no, bool drop,
                       user_from->user.length,
                       system_charset_info);
     
-    if (!table->key_info)
-    {
-      my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
-               table->s->table_name.str);
-      DBUG_RETURN(-1);
-    }
-
     key_prefix_length= (table->key_info->key_part[0].store_length +
                         table->key_info->key_part[1].store_length);
     key_copy(user_key, table->record[0], table->key_info, key_prefix_length);
diff --git a/sql/auth/sql_user_table.h b/sql/auth/sql_user_table.h
index 1aeadd482aa0..c6bf8d0223ae 100644
--- a/sql/auth/sql_user_table.h
+++ b/sql/auth/sql_user_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -50,6 +57,8 @@ class Acl_table_intact : public Table_check_intact
 
     va_end(args);
   }
+public:
+  Acl_table_intact() { has_keys= TRUE; }
 };
 
 #endif /* SQL_USER_TABLE_INCLUDED */
diff --git a/sql/binlog.cc b/sql/binlog.cc
index a40d8d14aa9b..18c31a1d4949 100644
--- a/sql/binlog.cc
+++ b/sql/binlog.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -26,6 +33,7 @@
 #include "rpl_rli_pdb.h"                    // Slave_worker
 #include "rpl_slave_commit_order_manager.h" // Commit_order_manager
 #include "rpl_trx_boundary_parser.h"        // Transaction_boundary_parser
+#include "rpl_context.h"
 #include "sql_class.h"                      // THD
 #include "sql_parse.h"                      // sqlcom_can_generate_row_events
 #include "sql_show.h"                       // append_identifier
@@ -39,6 +47,7 @@
 
 #include <list>
 #include <string>
+#include <sstream>
 
 using std::max;
 using std::min;
@@ -91,42 +100,6 @@ static int binlog_xa_commit(handlerton *hton,  XID *xid);
 static int binlog_xa_rollback(handlerton *hton,  XID *xid);
 static void exec_binlog_error_action_abort(const char* err_string);
 
-/**
-  Helper class to hold a mutex for the duration of the
-  block.
-
-  Eliminates the need for explicit unlocking of mutexes on, e.g.,
-  error returns.  On passing a null pointer, the sentry will not do
-  anything.
- */
-class Mutex_sentry
-{
-public:
-  Mutex_sentry(mysql_mutex_t *mutex)
-    : m_mutex(mutex)
-  {
-    if (m_mutex)
-      mysql_mutex_lock(mutex);
-  }
-
-  ~Mutex_sentry()
-  {
-    if (m_mutex)
-      mysql_mutex_unlock(m_mutex);
-#ifndef DBUG_OFF
-    m_mutex= 0;
-#endif
-  }
-
-private:
-  mysql_mutex_t *m_mutex;
-
-  // It's not allowed to copy this object in any way
-  Mutex_sentry(Mutex_sentry const&);
-  void operator=(Mutex_sentry const&);
-};
-
-
 /**
   Helper class to switch to a new thread and then go back to the previous one,
   when the object is destroyed using RAII.
@@ -182,7 +155,7 @@ class Thd_backup_and_restore
     : m_backup_thd(backup_thd), m_new_thd(new_thd),
       m_new_thd_old_real_id(new_thd->real_id)
   {
-    DBUG_ASSERT(m_backup_thd != NULL && m_new_thd != NULL);
+    assert(m_backup_thd != NULL && m_new_thd != NULL);
     // Reset the state of the current thd.
     m_backup_thd->restore_globals();
     int i= 0;
@@ -239,7 +212,7 @@ class Thd_backup_and_restore
 
     // Reset the global variables to the original state.
     if (unlikely(m_backup_thd->store_globals()))
-      DBUG_ASSERT(0);                           // Out of memory?!
+      assert(0);                           // Out of memory?!
   }
 
 private:
@@ -284,8 +257,11 @@ class binlog_cache_data
   binlog_cache_data(bool trx_cache_arg,
                     my_off_t max_binlog_cache_size_arg,
                     ulong *ptr_binlog_cache_use_arg,
-                    ulong *ptr_binlog_cache_disk_use_arg)
-  : m_pending(0), saved_max_binlog_cache_size(max_binlog_cache_size_arg),
+                    ulong *ptr_binlog_cache_disk_use_arg,
+                    const IO_CACHE &cache_log_arg)
+  : cache_log(cache_log_arg),
+    m_pending(0),
+    saved_max_binlog_cache_size(max_binlog_cache_size_arg),
     ptr_binlog_cache_use(ptr_binlog_cache_use_arg),
     ptr_binlog_cache_disk_use(ptr_binlog_cache_disk_use_arg)
   {
@@ -301,7 +277,7 @@ class binlog_cache_data
 
   virtual ~binlog_cache_data()
   {
-    DBUG_ASSERT(is_binlog_empty());
+    assert(is_binlog_empty());
     close_cached_file(&cache_log);
   }
 
@@ -338,9 +314,39 @@ class binlog_cache_data
     return flags.incident;
   }
 
+  /**
+    Sets the binlog_cache_data::Flags::flush_error flag if there
+    is an error while flushing cache to the file.
+
+    @param thd  The client thread that is executing the transaction.
+  */
+  void set_flush_error(THD *thd)
+  {
+    flags.flush_error= true;
+    if(is_trx_cache())
+    {
+      /*
+         If the cache is a transactional cache and if the write
+         has failed due to ENOSPC, then my_write() would have
+         set EE_WRITE error, so clear the error and create an
+         equivalent server error.
+      */
+      if (thd->is_error())
+        thd->clear_error();
+      char errbuf[MYSYS_STRERROR_SIZE];
+      my_error(ER_ERROR_ON_WRITE, MYF(MY_WME), my_filename(cache_log.file),
+          errno, my_strerror(errbuf, sizeof(errbuf), errno));
+    }
+  }
+
+  bool get_flush_error(void) const
+  {
+    return flags.flush_error;
+  }
+
   bool has_xid() const {
     // There should only be an XID event if we are transactional
-    DBUG_ASSERT((flags.transactional && flags.with_xid) || !flags.with_xid);
+    assert((flags.transactional && flags.with_xid) || !flags.with_xid);
     return flags.with_xid;
   }
 
@@ -364,15 +370,21 @@ class binlog_cache_data
       {
         flags.with_rbr= it->second.with_rbr;
         flags.with_sbr= it->second.with_sbr;
+        flags.with_start= it->second.with_start;
+        flags.with_end= it->second.with_end;
+        flags.with_content= it->second.with_content;
       }
       else
-        DBUG_ASSERT(it == cache_state_map.end());
+        assert(it == cache_state_map.end());
     }
     // Rolling back to pos == 0 means cleaning up the cache.
     else
     {
       flags.with_rbr= false;
       flags.with_sbr= false;
+      flags.with_start= false;
+      flags.with_end= false;
+      flags.with_content= false;
     }
   }
 
@@ -384,6 +396,9 @@ class binlog_cache_data
       cache_state state;
       state.with_rbr= flags.with_rbr;
       state.with_sbr= flags.with_sbr;
+      state.with_start= flags.with_start;
+      state.with_end= flags.with_end;
+      state.with_content= flags.with_content;
       cache_state_map[pos_to_checkpoint]= state;
     }
   }
@@ -419,6 +434,11 @@ class binlog_cache_data
     flags.finalized= false;
     flags.with_sbr= false;
     flags.with_rbr= false;
+    flags.with_start= false;
+    flags.with_end= false;
+    flags.with_content= false;
+    flags.flush_error= false;
+
     /*
       The truncate function calls reinit_io_cache that calls my_b_flush_io_cache
       which may increase disk_writes. This breaks the disk_writes use by the
@@ -428,7 +448,7 @@ class binlog_cache_data
     */
     cache_log.disk_writes= 0;
     cache_state_map.clear();
-    DBUG_ASSERT(is_binlog_empty());
+    assert(is_binlog_empty());
   }
 
   /*
@@ -450,7 +470,7 @@ class binlog_cache_data
   my_off_t reset_write_pos(my_off_t pos, bool use_reinit)
   {
     DBUG_ENTER("reset_write_pos");
-    DBUG_ASSERT(cache_log.type == WRITE_CACHE);
+    assert(cache_log.type == WRITE_CACHE);
 
     my_off_t oldpos= get_byte_position();
 
@@ -492,6 +512,52 @@ class binlog_cache_data
     return flags.with_sbr || !flags.with_rbr;
   }
 
+  /**
+    Check if the binlog cache contains an empty transaction, which has
+    two binlog events "BEGIN" and "COMMIT".
+
+    @return true  The binlog cache contains an empty transaction.
+    @return false Otherwise.
+  */
+  bool has_empty_transaction()
+  {
+    /*
+      The empty transaction has two events in trx/stmt binlog cache
+      and no changes (no SBR changing content and no RBR events).
+      Other transaction should not have two events. So we can identify
+      if this is an empty transaction by the event counter and the
+      cache flags.
+    */
+    if (flags.with_start &&     // Has transaction start statement
+            flags.with_end &&   // Has transaction end statement
+            !flags.with_sbr &&  // No statements changing content
+            !flags.with_rbr &&  // No rows changing content
+            !flags.immediate && // Not a DDL
+            !flags.with_xid &&  // Not a XID transaction and not an atomic DDL Query
+            !flags.with_content)// Does not have any content
+    {
+      assert(!flags.with_sbr); // No statements changing content
+      assert(!flags.with_rbr); // No rows changing content
+      assert(!flags.immediate);// Not a DDL
+      assert(!flags.with_xid); // Not a XID trx and not an atomic DDL Query
+
+      return true;
+    }
+    return false;
+  }
+
+  /**
+    Check if the binlog cache is empty or contains an empty transaction,
+    which has two binlog events "BEGIN" and "COMMIT".
+
+    @return true  The binlog cache is empty or contains an empty transaction.
+    @return false Otherwise.
+  */
+  bool is_empty_or_has_empty_transaction()
+  {
+    return is_binlog_empty() || has_empty_transaction();
+  }
+
 protected:
   /*
     This structure should have all cache variables/flags that should be restored
@@ -501,6 +567,9 @@ class binlog_cache_data
   {
     bool with_sbr;
     bool with_rbr;
+    bool with_start;
+    bool with_end;
+    bool with_content;
   };
   /*
     For every SAVEPOINT used, we will store a cache_state for the current
@@ -517,7 +586,13 @@ class binlog_cache_data
   {
     DBUG_PRINT("info", ("truncating to position %lu", (ulong) pos));
     remove_pending_event();
-    reinit_io_cache(&cache_log, WRITE_CACHE, pos, 0, 0);
+    /*
+      Whenever there is an error while flushing cache to file,
+      the local cache will not be in a normal state and the same
+      cache cannot be used without facing an assert.
+      So, clear the cache if there is a flush error.
+    */
+    reinit_io_cache(&cache_log, WRITE_CACHE, pos, 0, get_flush_error());
     cache_log.end_of_file= saved_max_binlog_cache_size;
   }
 
@@ -581,6 +656,27 @@ class binlog_cache_data
       This indicates that the cache contain RBR event changing content.
     */
     bool with_rbr:1;
+
+    /*
+      This indicates that the cache contain s transaction start statement.
+    */
+    bool with_start:1;
+
+    /*
+      This indicates that the cache contain a transaction end event.
+    */
+    bool with_end:1;
+
+    /*
+      This indicates that the cache contain content other than START/END.
+    */
+    bool with_content:1;
+
+    /*
+      This flag is set to 'true' when there is an error while flushing the
+      I/O cache to file.
+    */
+    bool flush_error:1;
   } flags;
 
 private:
@@ -636,11 +732,13 @@ class binlog_stmt_cache_data
   binlog_stmt_cache_data(bool trx_cache_arg,
                         my_off_t max_binlog_cache_size_arg,
                         ulong *ptr_binlog_cache_use_arg,
-                        ulong *ptr_binlog_cache_disk_use_arg)
+                        ulong *ptr_binlog_cache_disk_use_arg,
+                        const IO_CACHE &cache_log)
     : binlog_cache_data(trx_cache_arg,
                         max_binlog_cache_size_arg,
                         ptr_binlog_cache_use_arg,
-                        ptr_binlog_cache_disk_use_arg)
+                        ptr_binlog_cache_disk_use_arg,
+                        cache_log)
   {
   }
 
@@ -675,11 +773,13 @@ class binlog_trx_cache_data : public binlog_cache_data
   binlog_trx_cache_data(bool trx_cache_arg,
                         my_off_t max_binlog_cache_size_arg,
                         ulong *ptr_binlog_cache_use_arg,
-                        ulong *ptr_binlog_cache_disk_use_arg)
+                        ulong *ptr_binlog_cache_disk_use_arg,
+                        const IO_CACHE &cache_log)
   : binlog_cache_data(trx_cache_arg,
                       max_binlog_cache_size_arg,
                       ptr_binlog_cache_use_arg,
-                      ptr_binlog_cache_disk_use_arg),
+                      ptr_binlog_cache_disk_use_arg,
+                      cache_log),
     m_cannot_rollback(FALSE), before_stmt_pos(MY_OFF_T_UNDEF)
   {   }
 
@@ -769,13 +869,17 @@ class binlog_cache_mngr {
                     ulong *ptr_binlog_stmt_cache_disk_use_arg,
                     my_off_t max_binlog_cache_size_arg,
                     ulong *ptr_binlog_cache_use_arg,
-                    ulong *ptr_binlog_cache_disk_use_arg)
+                    ulong *ptr_binlog_cache_disk_use_arg,
+                    const IO_CACHE &stmt_cache_log,
+                    const IO_CACHE &trx_cache_log)
   : stmt_cache(FALSE, max_binlog_stmt_cache_size_arg,
                ptr_binlog_stmt_cache_use_arg,
-               ptr_binlog_stmt_cache_disk_use_arg),
+               ptr_binlog_stmt_cache_disk_use_arg,
+               stmt_cache_log),
     trx_cache(TRUE, max_binlog_cache_size_arg,
               ptr_binlog_cache_use_arg,
-              ptr_binlog_cache_disk_use_arg),
+              ptr_binlog_cache_disk_use_arg,
+              trx_cache_log),
     has_logged_xid(NULL)
   {  }
 
@@ -810,7 +914,7 @@ class binlog_cache_mngr {
       trx_cache.reset();
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool dbug_any_finalized() const {
     return stmt_cache.is_finalized() || trx_cache.is_finalized();
   }
@@ -831,7 +935,7 @@ class binlog_cache_mngr {
   {
     my_off_t stmt_bytes= 0;
     my_off_t trx_bytes= 0;
-    DBUG_ASSERT(stmt_cache.has_xid() == 0);
+    assert(stmt_cache.has_xid() == 0);
     int error= stmt_cache.flush(thd, &stmt_bytes, wrote_xid);
     if (error)
       return error;
@@ -842,6 +946,23 @@ class binlog_cache_mngr {
     return 0;
   }
 
+  /**
+    Check if at least one of transacaction and statement binlog caches
+    contains an empty transaction, other one is empty or contains an
+    empty transaction.
+
+    @return true  At least one of transacaction and statement binlog
+                  caches an empty transaction, other one is emptry
+                  or contains an empty transaction.
+    @return false Otherwise.
+  */
+  bool has_empty_transaction()
+  {
+    return (trx_cache.is_empty_or_has_empty_transaction() &&
+            stmt_cache.is_empty_or_has_empty_transaction() &&
+            !is_binlog_empty());
+  }
+
   binlog_stmt_cache_data stmt_cache;
   binlog_trx_cache_data trx_cache;
   /*
@@ -862,7 +983,7 @@ static binlog_cache_mngr *thd_get_cache_mngr(const THD *thd)
     If opt_bin_log is not set, binlog_hton->slot == -1 and hence
     thd_get_ha_data(thd, hton) segfaults.
   */
-  DBUG_ASSERT(opt_bin_log);
+  assert(opt_bin_log);
   return (binlog_cache_mngr *)thd_get_ha_data(thd, binlog_hton);
 }
 
@@ -946,9 +1067,9 @@ static void
 binlog_trans_log_savepos(THD *thd, my_off_t *pos)
 {
   DBUG_ENTER("binlog_trans_log_savepos");
-  DBUG_ASSERT(pos != NULL);
+  assert(pos != NULL);
   binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
-  DBUG_ASSERT(mysql_bin_log.is_open());
+  assert(mysql_bin_log.is_open());
   *pos= cache_mngr->trx_cache.get_byte_position();
   DBUG_PRINT("return", ("position: %lu", (ulong) *pos));
   cache_mngr->trx_cache.cache_state_checkpoint(*pos);
@@ -1045,7 +1166,7 @@ class Binlog_event_writer
     {
       // Caller must ensure that the first part of the event contains
       // a full event header.
-      DBUG_ASSERT(*buf_len_p >= LOG_EVENT_HEADER_LEN);
+      assert(*buf_len_p >= LOG_EVENT_HEADER_LEN);
 
       // Read event length
       *event_len_p= uint4korr(*buf_p + EVENT_LEN_OFFSET);
@@ -1068,7 +1189,7 @@ class Binlog_event_writer
 
     // write the buffer
     uint32 write_bytes= std::min<uint32>(*buf_len_p, *event_len_p);
-    DBUG_ASSERT(write_bytes > 0);
+    assert(write_bytes > 0);
     if (my_b_write(output_cache, *buf_p, write_bytes))
       DBUG_RETURN(true);
 
@@ -1113,8 +1234,8 @@ class Binlog_event_writer
   {
     uint32 event_len_unused= 0;
     bool ret= write_event_part(&buf, &buf_len, &event_len_unused);
-    DBUG_ASSERT(buf_len == 0);
-    DBUG_ASSERT(event_len_unused == 0);
+    assert(buf_len == 0);
+    assert(event_len_unused == 0);
     return ret;
   }
 
@@ -1163,7 +1284,7 @@ static int binlog_close_connection(handlerton *hton, THD *thd)
 {
   DBUG_ENTER("binlog_close_connection");
   binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
-  DBUG_ASSERT(cache_mngr->is_binlog_empty());
+  assert(cache_mngr->is_binlog_empty());
   DBUG_PRINT("debug", ("Set ha_data slot %d to 0x%llx", binlog_hton->slot, (ulonglong) NULL));
   thd_set_ha_data(thd, binlog_hton, NULL);
   cache_mngr->~binlog_cache_mngr();
@@ -1179,6 +1300,15 @@ int binlog_cache_data::write_event(THD *thd, Log_event *ev)
   {
     DBUG_EXECUTE_IF("simulate_disk_full_at_flush_pending",
                   {DBUG_SET("+d,simulate_file_write_error");});
+
+    DBUG_EXECUTE_IF("simulate_tmpdir_partition_full",
+                  {
+                  static int count= -1;
+                  count++;
+                  if(count %4 == 3 && ev->get_type_code() ==
+                      binary_log::WRITE_ROWS_EVENT)
+                    DBUG_SET("+d,simulate_temp_file_write_error");
+                  });
     if (ev->write(&cache_log) != 0)
     {
       DBUG_EXECUTE_IF("simulate_disk_full_at_flush_pending",
@@ -1194,6 +1324,19 @@ int binlog_cache_data::write_event(THD *thd, Log_event *ev)
                         */
                         DBUG_SET("+d,simulate_do_write_cache_failure");
                       });
+
+      DBUG_EXECUTE_IF("simulate_temp_file_write_error",
+                      {
+                        DBUG_SET("-d,simulate_temp_file_write_error");
+                      });
+      /*
+        If the flush has failed due to ENOSPC error, set the
+        flush_error flag.
+      */
+      if (thd->is_error() && my_errno() == ENOSPC)
+      {
+        set_flush_error(thd);
+      }
       DBUG_RETURN(1);
     }
     if (ev->get_type_code() == binary_log::XID_EVENT)
@@ -1205,6 +1348,16 @@ int binlog_cache_data::write_event(THD *thd, Log_event *ev)
       flags.with_sbr= true;
     if (ev->is_rbr_logging_format())
       flags.with_rbr= true;
+#ifndef EMBEDDED_LIBRARY
+    /* With respect to empty transactions */
+    if (ev->starts_group())
+      flags.with_start= true;
+    if (ev->ends_group())
+      flags.with_end= true;
+    if ((!ev->starts_group() && !ev->ends_group())
+        ||ev->get_type_code() == binary_log::VIEW_CHANGE_EVENT)
+      flags.with_content= true;
+#endif
   }
   DBUG_RETURN(0);
 }
@@ -1218,7 +1371,7 @@ bool MYSQL_BIN_LOG::assign_automatic_gtids_to_flush_group(THD *first_seen)
 
   for (THD *head= first_seen ; head ; head = head->next_to_commit)
   {
-    DBUG_ASSERT(head->variables.gtid_next.type != UNDEFINED_GROUP);
+    assert(head->variables.gtid_next.type != UNDEFINED_GROUP);
 
     /* Generate GTID */
     if (head->variables.gtid_next.type == AUTOMATIC_GROUP)
@@ -1234,7 +1387,7 @@ bool MYSQL_BIN_LOG::assign_automatic_gtids_to_flush_group(THD *first_seen)
               &locked_sidno)
               != RETURN_STATUS_OK)
       {
-        head->commit_error= THD::CE_FLUSH_ERROR;
+        head->commit_error= THD::CE_FLUSH_GNO_EXHAUSTED_ERROR;
         error= true;
       }
     }
@@ -1245,11 +1398,11 @@ bool MYSQL_BIN_LOG::assign_automatic_gtids_to_flush_group(THD *first_seen)
                           head->variables.gtid_next.type,
                           head->owned_gtid.sidno));
       if (head->variables.gtid_next.type == GTID_GROUP)
-        DBUG_ASSERT(head->owned_gtid.sidno > 0);
+        assert(head->owned_gtid.sidno > 0);
       else
       {
-        DBUG_ASSERT(head->variables.gtid_next.type == ANONYMOUS_GROUP);
-        DBUG_ASSERT(head->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
+        assert(head->variables.gtid_next.type == ANONYMOUS_GROUP);
+        assert(head->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
       }
     }
   }
@@ -1284,32 +1437,13 @@ bool MYSQL_BIN_LOG::write_gtid(THD *thd, binlog_cache_data *cache_data,
     The GTID for the THD was assigned at
     assign_automatic_gtids_to_flush_group()
   */
-  DBUG_ASSERT(thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS ||
-              thd->owned_gtid.sidno > 0);
+  assert(thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS ||
+         thd->owned_gtid.sidno > 0);
 
+  int64 sequence_number, last_committed;
   /* Generate logical timestamps for MTS */
+  m_dependency_tracker.get_dependency(thd, sequence_number, last_committed);
 
-  /*
-    Prepare sequence_number and last_committed relative to the current
-    binlog.  This is done by subtracting the binlog's clock offset
-    from the values.
-
-    A transaction that commits after the binlog is rotated, can have a
-    commit parent in the previous binlog. In this case, subtracting
-    the offset from the sequence number results in a negative
-    number. The commit parent dependency gets lost in such
-    case. Therefore, we log the value SEQ_UNINIT in this case.
-  */
-
-  Transaction_ctx *trn_ctx= thd->get_transaction();
-  Logical_clock& clock= mysql_bin_log.max_committed_transaction;
-
-  DBUG_ASSERT(trn_ctx->sequence_number > clock.get_offset());
-
-  int64 relative_sequence_number= trn_ctx->sequence_number - clock.get_offset();
-  int64 relative_last_committed=
-    trn_ctx->last_committed <= clock.get_offset() ?
-    SEQ_UNINIT : trn_ctx->last_committed - clock.get_offset();
   /*
     In case both the transaction cache and the statement cache are
     non-empty, both will be flushed in sequence and logged as
@@ -1321,13 +1455,14 @@ bool MYSQL_BIN_LOG::write_gtid(THD *thd, binlog_cache_data *cache_data,
     condition trn_ctx->last_committed==SEQ_UNINIT to detect this
     situation, hence the need to set it here.
   */
-  trn_ctx->last_committed= SEQ_UNINIT;
+  thd->get_transaction()->last_committed= SEQ_UNINIT;
+
 
   /*
     Generate and write the Gtid_log_event.
   */
   Gtid_log_event gtid_event(thd, cache_data->is_trx_cache(),
-                            relative_last_committed, relative_sequence_number,
+                            last_committed, sequence_number,
                             cache_data->may_have_sbr_stmts());
   uchar buf[Gtid_log_event::MAX_EVENT_LENGTH];
   uint32 buf_len= gtid_event.write_to_memory(buf);
@@ -1345,7 +1480,7 @@ int MYSQL_BIN_LOG::gtid_end_transaction(THD *thd)
 
   if (thd->owned_gtid.sidno > 0)
   {
-    DBUG_ASSERT(thd->variables.gtid_next.type == GTID_GROUP);
+    assert(thd->variables.gtid_next.type == GTID_GROUP);
 
     if (!opt_bin_log || (thd->slave_thread && !opt_log_slave_updates))
     {
@@ -1386,7 +1521,7 @@ int MYSQL_BIN_LOG::gtid_end_transaction(THD *thd)
       // Generate BEGIN event
       Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE,
                             FALSE, TRUE, 0, TRUE);
-      DBUG_ASSERT(!qinfo.is_using_immediate_logging());
+      assert(!qinfo.is_using_immediate_logging());
 
       /*
         Write BEGIN event and then commit (which will generate commit
@@ -1414,7 +1549,7 @@ int MYSQL_BIN_LOG::gtid_end_transaction(THD *thd)
   else if (thd->variables.gtid_next.type == GTID_GROUP &&
            thd->owned_gtid.is_empty())
   {
-    DBUG_ASSERT(thd->has_gtid_consistency_violation == false);
+    assert(thd->has_gtid_consistency_violation == false);
     gtid_state->update_on_commit(thd);
   }
 
@@ -1443,7 +1578,7 @@ binlog_cache_data::finalize(THD *thd, Log_event *end_event)
   DBUG_ENTER("binlog_cache_data::finalize");
   if (!is_binlog_empty())
   {
-    DBUG_ASSERT(!flags.finalized);
+    assert(!flags.finalized);
     if (int error= flush_pending_event(thd))
       DBUG_RETURN(error);
     if (int error= write_event(thd, end_event))
@@ -1518,7 +1653,7 @@ binlog_cache_data::flush(THD *thd, my_off_t *bytes_written, bool *wrote_xid)
 
     DBUG_PRINT("debug", ("bytes_in_cache: %llu", bytes_in_cache));
 
-    trn_ctx->sequence_number= mysql_bin_log.transaction_counter.step();
+    trn_ctx->sequence_number= mysql_bin_log.m_dependency_tracker.step();
     /*
       In case of two caches the transaction is split into two groups.
       The 2nd group is considered to be a successor of the 1st rather
@@ -1546,7 +1681,8 @@ binlog_cache_data::flush(THD *thd, my_off_t *bytes_written, bool *wrote_xid)
     Binlog_event_writer writer(mysql_bin_log.get_log_file());
 
     /* The GTID ownership process might set the commit_error */
-    error= (thd->commit_error == THD::CE_FLUSH_ERROR);
+    error= (thd->commit_error == THD::CE_FLUSH_ERROR ||
+           thd->commit_error == THD::CE_FLUSH_GNO_EXHAUSTED_ERROR);
 
     DBUG_EXECUTE_IF("simulate_binlog_flush_error",
                     {
@@ -1573,7 +1709,7 @@ binlog_cache_data::flush(THD *thd, my_off_t *bytes_written, bool *wrote_xid)
     if (bytes_written)
       *bytes_written= bytes_in_cache;
   }
-  DBUG_ASSERT(!flags.finalized);
+  assert(!flags.finalized);
   DBUG_RETURN(error);
 }
 
@@ -1668,9 +1804,9 @@ inline bool is_loggable_xa_prepare(THD *thd)
   DBUG_EXECUTE_IF("simulate_commit_failure",
                   {
                     XID_STATE *xs= thd->get_transaction()->xid_state();
-                    DBUG_ASSERT((thd->is_error() &&
-                                 xs->get_state() == XID_STATE::XA_IDLE) ||
-                                xs->get_state() == XID_STATE::XA_NOTR);
+                    assert((thd->is_error() &&
+                            xs->get_state() == XID_STATE::XA_IDLE) ||
+                           xs->get_state() == XID_STATE::XA_NOTR);
                   });
 
   return DBUG_EVALUATE_IF("simulate_commit_failure",
@@ -1684,9 +1820,9 @@ static int binlog_prepare(handlerton *hton, THD *thd, bool all)
   DBUG_ENTER("binlog_prepare");
   if (!all)
   {
-    Logical_clock& clock= mysql_bin_log.max_committed_transaction;
-    thd->get_transaction()->
-      store_commit_parent(clock.get_timestamp());
+    thd->get_transaction()->store_commit_parent(mysql_bin_log.
+      m_dependency_tracker.get_max_committed_timestamp());
+
   }
 
   DBUG_RETURN(all && is_loggable_xa_prepare(thd) ?
@@ -1721,8 +1857,8 @@ static int binlog_prepare(handlerton *hton, THD *thd, bool all)
 
 inline int do_binlog_xa_commit_rollback(THD *thd, XID *xid, bool commit)
 {
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_XA_COMMIT ||
-              thd->lex->sql_command == SQLCOM_XA_ROLLBACK);
+  assert(thd->lex->sql_command == SQLCOM_XA_COMMIT ||
+         thd->lex->sql_command == SQLCOM_XA_ROLLBACK);
 
   XID_STATE *xid_state= thd->get_transaction()->xid_state();
   binlog_cache_mngr *cache_mngr= thd_get_cache_mngr(thd);
@@ -1737,8 +1873,8 @@ inline int do_binlog_xa_commit_rollback(THD *thd, XID *xid, bool commit)
   if (thd->is_error() && DBUG_EVALUATE_IF("simulate_xa_rm_error", 0, 1))
     return 0; // don't binlog if there are some errors.
 
-  DBUG_ASSERT(!xid->is_null() ||
-              !(thd->variables.option_bits & OPTION_BIN_LOG));
+  assert(!xid->is_null() ||
+         !(thd->variables.option_bits & OPTION_BIN_LOG));
 
   char buf[XID::ser_buf_size];
   char query[(sizeof("XA ROLLBACK")) + 1 + sizeof(buf)];
@@ -1764,9 +1900,9 @@ inline int binlog_xa_commit_or_rollback(THD *thd, XID *xid, bool commit)
 {
   int error= 0;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   binlog_cache_mngr *cache_mngr= thd_get_cache_mngr(thd);
-  DBUG_ASSERT(!cache_mngr || !cache_mngr->has_logged_xid);
+  assert(!cache_mngr || !cache_mngr->has_logged_xid);
 #endif
   if (!(error= do_binlog_xa_commit_rollback(thd, xid, commit)))
   {
@@ -1946,7 +2082,7 @@ Stage_manager::Mutex_queue::append(THD *first)
   DBUG_PRINT("info", ("m_first: 0x%llx, &m_first: 0x%llx, m_last: 0x%llx",
                         (ulonglong) m_first, (ulonglong) &m_first,
                         (ulonglong) m_last));
-  DBUG_ASSERT(m_first || m_last == &m_first);
+  assert(m_first || m_last == &m_first);
   DBUG_PRINT("return", ("empty: %s", YESNO(empty)));
   unlock();
   DBUG_RETURN(empty);
@@ -1973,9 +2109,9 @@ Stage_manager::Mutex_queue::pop_front()
     more= false;
     m_last = &m_first;
   }
-  DBUG_ASSERT(my_atomic_load32(&m_size) > 0);
+  assert(my_atomic_load32(&m_size) > 0);
   my_atomic_add32(&m_size, -1);
-  DBUG_ASSERT(m_first || m_last == &m_first);
+  assert(m_first || m_last == &m_first);
   unlock();
   DBUG_PRINT("return", ("result: 0x%llx, more: %s",
                         (ulonglong) result, YESNO(more)));
@@ -2017,7 +2153,7 @@ Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex)
   if (stage_mutex && need_unlock_stage_mutex)
     mysql_mutex_unlock(stage_mutex);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("info", ("This is a leader thread: %d (0=n 1=y)", leader));
 
   DEBUG_SYNC(thd, "after_enrolling_for_stage");
@@ -2035,11 +2171,11 @@ Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex)
     break;
   default:
     // not reached
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
-  DBUG_EXECUTE_IF("assert_leader", DBUG_ASSERT(leader););
-  DBUG_EXECUTE_IF("assert_follower", DBUG_ASSERT(!leader););
+  DBUG_EXECUTE_IF("assert_leader", assert(leader););
+  DBUG_EXECUTE_IF("assert_follower", assert(!leader););
 #endif
 
   /*
@@ -2050,7 +2186,7 @@ Stage_manager::enroll_for(StageID stage, THD *thd, mysql_mutex_t *stage_mutex)
   if (!leader)
   {
     mysql_mutex_lock(&m_lock_done);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     /*
       Leader can be awaiting all-clear to preempt follower's execution.
       With setting the status the follower ensures it won't execute anything
@@ -2083,15 +2219,15 @@ THD *Stage_manager::Mutex_queue::fetch_and_empty()
                        (ulonglong) m_last));
   DBUG_PRINT("info", ("fetched queue of %d transactions", my_atomic_load32(&m_size)));
   DBUG_PRINT("return", ("result: 0x%llx", (ulonglong) result));
-  DBUG_ASSERT(my_atomic_load32(&m_size) >= 0);
+  assert(my_atomic_load32(&m_size) >= 0);
   my_atomic_store32(&m_size, 0);
   unlock();
   DBUG_RETURN(result);
 }
 
-void Stage_manager::wait_count_or_timeout(ulong count, ulong usec, StageID stage)
+void Stage_manager::wait_count_or_timeout(ulong count, long usec, StageID stage)
 {
-  ulong to_wait=
+  long to_wait=
     DBUG_EVALUATE_IF("bgc_set_infinite_delay", LONG_MAX, usec);
   /*
     For testing purposes while waiting for inifinity
@@ -2099,13 +2235,13 @@ void Stage_manager::wait_count_or_timeout(ulong count, ulong usec, StageID stage
     small intervals. Otherwise, waiting 0.1 * infinite
     is too long.
    */
-  ulong delta=
+  long delta=
     DBUG_EVALUATE_IF("bgc_set_infinite_delay", 100000,
-                     max<ulong>(1, (to_wait * 0.1)));
+                     max<long>(1, (to_wait * 0.1)));
 
   while (to_wait > 0 && (count == 0 || static_cast<ulong>(m_queue[stage].get_size()) < count))
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (current_thd)
       DEBUG_SYNC(current_thd, "bgc_wait_count_or_timeout");
 #endif
@@ -2123,10 +2259,10 @@ void Stage_manager::signal_done(THD *queue)
   mysql_cond_broadcast(&m_cond_done);
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void Stage_manager::clear_preempt_status(THD *head)
 {
-  DBUG_ASSERT(head);
+  assert(head);
 
   mysql_mutex_lock(&m_lock_done);
   while(!head->get_transaction()->m_flags.ready_preempt)
@@ -2194,16 +2330,16 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
   {
     XID_STATE *xs= thd->get_transaction()->xid_state();
 
-    DBUG_ASSERT(all || !xs->is_binlogged() ||
-                (!xs->is_in_recovery() && thd->is_error()));
+    assert(all || !xs->is_binlogged() ||
+           (!xs->is_in_recovery() && thd->is_error()));
     /*
       Whenever cache_mngr is not initialized, the xa prepared
       transaction's binary logging status must not be set, unless the
       transaction is rolled back through an external connection which
       has binlogging switched off.
     */
-    DBUG_ASSERT(cache_mngr || !xs->is_binlogged()
-                || !(is_open() && thd->variables.option_bits & OPTION_BIN_LOG));
+    assert(cache_mngr || !xs->is_binlogged()
+           || !(is_open() && thd->variables.option_bits & OPTION_BIN_LOG));
 
     if ((error= do_binlog_xa_commit_rollback(thd, xs->get_xid(), false)))
       goto end;
@@ -2283,9 +2419,9 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
       if (thd->lex->sql_command == SQLCOM_XA_ROLLBACK)
       {
         /* this block is relevant only for not prepared yet and "local" xa trx */
-        DBUG_ASSERT(thd->get_transaction()->xid_state()->
-                    has_state(XID_STATE::XA_IDLE));
-        DBUG_ASSERT(!cache_mngr->has_logged_xid);
+        assert(thd->get_transaction()->xid_state()->
+               has_state(XID_STATE::XA_IDLE));
+        assert(!cache_mngr->has_logged_xid);
 
         sprintf(query, "%s ", xa_rollback_str);
         xs->get_xid()->serialize(query + sizeof(xa_rollback_str));
@@ -2360,7 +2496,7 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
   if (stuff_logged)
   {
     Transaction_ctx *trn_ctx= thd->get_transaction();
-    trn_ctx->store_commit_parent(max_committed_transaction.get_timestamp());
+    trn_ctx->store_commit_parent(m_dependency_tracker.get_max_committed_timestamp());
   }
 
   DBUG_PRINT("debug", ("error: %d", error));
@@ -2380,12 +2516,12 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
       my_error(ER_RUN_HOOK_ERROR, MYF(0), "before_commit");
       DBUG_RETURN(RESULT_ABORTED);
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     /*
       XA rollback is always accepted.
     */
     if (thd->get_transaction()->get_rpl_transaction_ctx()->is_transaction_rollback())
-      DBUG_ASSERT(0);
+      assert(0);
 #endif
 
     error= ordered_commit(thd, all, /* skip_commit */ true);
@@ -2393,13 +2529,6 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
 
   if (check_write_error(thd))
   {
-    /*
-      "all == true" means that a "rollback statement" triggered the error and
-      this function was called. However, this must not happen as a rollback
-      is written directly to the binary log. And in auto-commit mode, a single
-      statement that is rolled back has the flag all == false.
-    */
-    DBUG_ASSERT(!all);
     /*
       We reach this point if the effect of a statement did not properly get into
       a cache and need to be rolled back.
@@ -2413,7 +2542,8 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bool all)
   {
     error= ha_rollback_low(thd, all);
     /* Successful XA-rollback commits the new gtid_state */
-    gtid_state->update_on_commit(thd);
+    if (!error && !thd->is_error())
+      gtid_state->update_on_commit(thd);
   }
   /*
     When a statement errors out on auto-commit mode it is rollback
@@ -2493,7 +2623,7 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
   DBUG_ENTER("binlog_savepoint_rollback");
   binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
   my_off_t pos= *(my_off_t*) sv;
-  DBUG_ASSERT(pos != ~(my_off_t) 0);
+  assert(pos != ~(my_off_t) 0);
 
   /*
     Write ROLLBACK TO SAVEPOINT to the binlog cache if we have updated some
@@ -2503,11 +2633,19 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
   if (trans_cannot_safely_rollback(thd))
   {
     String log_query;
-    if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")) ||
-        log_query.append("`") ||
-        log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
-        log_query.append("`"))
+    if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")))
       DBUG_RETURN(1);
+    else
+    {
+      /*
+        Before writing identifier to the binlog, make sure to
+        quote the identifier properly so as to prevent any SQL
+        injection on the slave.
+      */
+      append_identifier(thd, &log_query, thd->lex->ident.str,
+                        thd->lex->ident.length);
+    }
+
     int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
     Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
                           TRUE, FALSE, TRUE, errcode);
@@ -2657,7 +2795,7 @@ class Log_in_use : public Do_THD_Impl
     mysql_mutex_lock(&thd->LOCK_thd_data);
     if ((linfo = thd->current_linfo))
     {
-      if(!memcmp(m_log_name, linfo->log_file_name, m_log_name_len))
+      if(!strncmp(m_log_name, linfo->log_file_name, m_log_name_len))
       {
         sql_print_warning("file %s was not purged because it was being read"
                           "by thread number %u", m_log_name, thd->thread_id());
@@ -2676,7 +2814,7 @@ class Log_in_use : public Do_THD_Impl
 static int log_in_use(const char* log_name)
 {
   Log_in_use log_in_use(log_name);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (current_thd)
     DEBUG_SYNC(current_thd,"purge_logs_after_lock_index_before_thread_count");
 #endif
@@ -2702,7 +2840,7 @@ static bool purge_error_message(THD* thd, int res)
 int check_binlog_magic(IO_CACHE* log, const char** errmsg)
 {
   char magic[4];
-  DBUG_ASSERT(my_b_tell(log) == 0);
+  assert(my_b_tell(log) == 0);
 
   if (my_b_read(log, (uchar*) magic, sizeof(magic)))
   {
@@ -2755,6 +2893,43 @@ File open_binlog_file(IO_CACHE *log, const char *log_file_name, const char **err
   DBUG_RETURN(-1);
 }
 
+bool is_transaction_empty(THD *thd)
+{
+  DBUG_ENTER("is_transaction_empty");
+  int rw_ha_count= check_trx_rw_engines(thd, Transaction_ctx::SESSION);
+  rw_ha_count+= check_trx_rw_engines(thd, Transaction_ctx::STMT);
+  DBUG_RETURN(rw_ha_count == 0);
+}
+
+int check_trx_rw_engines(THD *thd, Transaction_ctx::enum_trx_scope trx_scope)
+{
+  DBUG_ENTER("check_trx_rw_engines");
+
+  int rw_ha_count= 0;
+  Ha_trx_info *ha_list=
+      (Ha_trx_info *)thd->get_transaction()->ha_trx_info(trx_scope);
+
+  for (Ha_trx_info *ha_info= ha_list; ha_info; ha_info= ha_info->next()) {
+    if (ha_info->is_trx_read_write())
+      ++rw_ha_count;
+  }
+  DBUG_RETURN(rw_ha_count);
+}
+
+bool is_empty_transaction_in_binlog_cache(const THD* thd)
+{
+  DBUG_ENTER("is_empty_transaction_in_binlog_cache");
+
+  binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
+  if (cache_mngr != NULL && cache_mngr->has_empty_transaction())
+  {
+    DBUG_RETURN(true);
+  }
+
+  DBUG_RETURN(false);
+}
+
+
 /** 
   This function checks if a transactional table was updated by the
   current transaction.
@@ -2791,6 +2966,18 @@ stmt_has_updated_trans_table(Ha_trx_info* ha_list)
   return (FALSE);
 }
 
+bool
+trans_has_noop_dml(Ha_trx_info* ha_list)
+{
+  const Ha_trx_info *ha_info;
+  for (ha_info= ha_list; ha_info; ha_info= ha_info->next())
+  {
+    if (ha_info->is_trx_noop_read_write())
+      return (TRUE);
+  }
+  return (FALSE);
+}
+
 /**
   This function checks if a transaction, either a multi-statement
   or a single statement transaction is about to commit or not.
@@ -3040,8 +3227,8 @@ bool show_binlog_events(THD *thd, MYSQL_BIN_LOG *binary_log)
 
   DBUG_ENTER("show_binlog_events");
 
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS ||
-              thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
+  assert(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS ||
+         thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
 
   Format_description_log_event *description_event= new
     Format_description_log_event(3); /* MySQL 4.0 by default */
@@ -3214,7 +3401,7 @@ bool mysql_show_binlog_events(THD* thd)
   List<Item> field_list;
   DBUG_ENTER("mysql_show_binlog_events");
 
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS);
+  assert(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS);
 
   Log_event::init_show_field_list(&field_list);
   if (thd->send_result_metadata(&field_list,
@@ -3290,7 +3477,7 @@ void MYSQL_BIN_LOG::cleanup()
 
 void MYSQL_BIN_LOG::init_pthread_objects()
 {
-  DBUG_ASSERT(inited == 0);
+  assert(inited == 0);
   inited= 1;
   mysql_mutex_init(m_key_LOCK_log, &LOCK_log, MY_MUTEX_INIT_SLOW);
   mysql_mutex_init(m_key_LOCK_index, &LOCK_index, MY_MUTEX_INIT_SLOW);
@@ -3747,9 +3934,9 @@ read_gtids_and_update_trx_parser_from_relaylog(
   DBUG_ENTER("read_gtids_and_update_trx_parser_from_relaylog");
   DBUG_PRINT("info", ("Opening file %s", filename));
 
-  DBUG_ASSERT(retrieved_gtids != NULL);
-  DBUG_ASSERT(trx_parser != NULL);
-#ifndef DBUG_OFF
+  assert(retrieved_gtids != NULL);
+  assert(trx_parser != NULL);
+#ifndef NDEBUG
   unsigned long event_counter= 0;
 #endif
 
@@ -3791,7 +3978,7 @@ read_gtids_and_update_trx_parser_from_relaylog(
          NULL)
   {
     DBUG_PRINT("info", ("Read event of type %s", ev->get_type_str()));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     event_counter++;
 #endif
 
@@ -3893,7 +4080,7 @@ read_gtids_and_update_trx_parser_from_relaylog(
         error= true;
         break;
       }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       char* prev_buffer= prev_gtids_ev->get_str(NULL, NULL);
       DBUG_PRINT("info", ("Got Previous_gtids from file '%s': Gtid_set='%s'.",
                           filename, prev_buffer));
@@ -3987,7 +4174,7 @@ read_gtids_and_update_trx_parser_from_relaylog(
   mysql_file_close(file, MYF(MY_WME));
   end_io_cache(&log);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   sql_print_information("%lu events read in relaylog file '%s' for updating "
                         "Retrieved_Gtid_Set and/or IO thread transaction "
                         "parser state.",
@@ -4051,7 +4238,7 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
   File file;
   IO_CACHE log;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   unsigned long event_counter= 0;
   /*
     We assert here that both all_gtids and prev_gtids, if specified,
@@ -4061,9 +4248,9 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
     dealing with.
   */
   if (all_gtids)
-    DBUG_ASSERT(all_gtids->get_sid_map() == sid_map);
+    assert(all_gtids->get_sid_map() == sid_map);
   if (prev_gtids)
-    DBUG_ASSERT(prev_gtids->get_sid_map() == sid_map);
+    assert(prev_gtids->get_sid_map() == sid_map);
 #endif
 
   const char *errmsg= NULL;
@@ -4091,7 +4278,7 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
          (ev= Log_event::read_log_event(&log, 0, fd_ev_p, verify_checksum)) !=
          NULL)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     event_counter++;
 #endif
     DBUG_PRINT("info", ("Read event of type %s", ev->get_type_str()));
@@ -4115,7 +4302,7 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
         ret= ERROR, done= true;
       else if (prev_gtids != NULL && prev_gtids_ev->add_to_set(prev_gtids) != 0)
         ret= ERROR, done= true;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       char* prev_buffer= prev_gtids_ev->get_str(NULL, NULL);
       DBUG_PRINT("info", ("Got Previous_gtids from file '%s': Gtid_set='%s'.",
                           filename, prev_buffer));
@@ -4223,8 +4410,8 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
         done= true;
         break;
       }
-      DBUG_ASSERT(prev_gtids == NULL ? true : all_gtids != NULL ||
-                                              first_gtid != NULL);
+      assert(prev_gtids == NULL ? true : all_gtids != NULL ||
+             first_gtid != NULL);
     }
     // Fall through.
     default:
@@ -4284,7 +4471,7 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
     first_gtid->dbug_print(sid_map, "first_gtid");
 
   DBUG_PRINT("info", ("returning %d", ret));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (!is_relay_log && prev_gtids != NULL &&
       all_gtids == NULL && first_gtid == NULL)
     sql_print_information("Read %lu events from binary log file '%s' to "
@@ -4297,7 +4484,7 @@ read_gtids_from_binlog(const char *filename, Gtid_set *all_gtids,
 bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
                                                    const Gtid_set *gtid_set,
                                                    Gtid *first_gtid,
-                                                   const char **errmsg)
+                                                   std::string &errmsg)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::gtid_read_start_binlog");
   /*
@@ -4320,18 +4507,20 @@ bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
   mysql_mutex_unlock(&LOCK_index);
   if (error != LOG_INFO_EOF)
   {
-    *errmsg= "Failed to read the binary log index file while "
-      "looking for the oldest binary log that contains any GTID "
-      "that is not in the given gtid set";
+    errmsg.assign(
+        "Failed to read the binary log index file while "
+        "looking for the oldest binary log that contains any GTID "
+        "that is not in the given gtid set");
     error= -1;
     goto end;
   }
 
   if (filename_list.empty())
   {
-    *errmsg= "Could not find first log file name in binary log index file "
-      "while looking for the oldest binary log that contains any GTID "
-      "that is not in the given gtid set";
+    errmsg.assign(
+        "Could not find first log file name in binary log index file "
+        "while looking for the oldest binary log that contains any GTID "
+        "that is not in the given gtid set");
     error= -2;
     goto end;
   }
@@ -4352,6 +4541,7 @@ bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
   error= 0;
   while (rit != filename_list.rend())
   {
+    binlog_previous_gtid_set.clear();
     const char *filename= rit->c_str();
     DBUG_PRINT("info", ("Read Previous_gtids_log_event from filename='%s'",
                         filename));
@@ -4361,15 +4551,17 @@ bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
                                    opt_master_verify_checksum, is_relay_log))
     {
     case ERROR:
-      *errmsg= "Error reading header of binary log while looking for "
-        "the oldest binary log that contains any GTID that is not in "
-        "the given gtid set";
+      errmsg.assign(
+          "Error reading header of binary log while looking for "
+          "the oldest binary log that contains any GTID that is not in "
+          "the given gtid set");
       error= -3;
       goto end;
     case NO_GTIDS:
-      *errmsg= "Found old binary log without GTIDs while looking for "
-        "the oldest binary log that contains any GTID that is not in "
-        "the given gtid set";
+      errmsg.assign(
+          "Found old binary log without GTIDs while looking for "
+          "the oldest binary log that contains any GTID that is not in "
+          "the given gtid set");
       error= -4;
       goto end;
     case GOT_GTIDS:
@@ -4381,27 +4573,26 @@ bool MYSQL_BIN_LOG::find_first_log_not_in_gtid_set(char *binlog_file_name,
           Verify that the selected binlog is not the first binlog,
         */
         DBUG_EXECUTE_IF("slave_reconnect_with_gtid_set_executed",
-                        DBUG_ASSERT(strcmp(filename_list.begin()->c_str(),
-                                           binlog_file_name) != 0););
+                        assert(strcmp(filename_list.begin()->c_str(),
+                                      binlog_file_name) != 0););
         goto end;
       }
     case TRUNCATED:
       break;
     }
-    binlog_previous_gtid_set.clear();
 
     rit++;
   }
 
   if (rit == filename_list.rend())
   {
-    *errmsg= ER(ER_MASTER_HAS_PURGED_REQUIRED_GTIDS);
+    report_missing_gtids(&binlog_previous_gtid_set, gtid_set, errmsg);
     error= -5;
   }
 
 end:
   if (error)
-    DBUG_PRINT("error", ("'%s'", *errmsg));
+    DBUG_PRINT("error", ("'%s'", errmsg.c_str()));
   filename_list.clear();
   DBUG_PRINT("info", ("returning %d", error));
   DBUG_RETURN(error != 0 ? true : false);
@@ -4422,11 +4613,11 @@ bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
     If this is a relay log, we must have the IO thread Master_info trx_parser
     in order to correctly feed it with relay log events.
   */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (is_relay_log)
   {
-    DBUG_ASSERT(trx_parser != NULL);
-    DBUG_ASSERT(lost_gtids == NULL);
+    assert(trx_parser != NULL);
+    assert(lost_gtids == NULL);
   }
 #endif
 
@@ -4509,7 +4700,7 @@ bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
     while (!can_stop_reading && !reached_first_file)
     {
       const char *filename= rit->c_str();
-      DBUG_ASSERT(rit != filename_list.rend());
+      assert(rit != filename_list.rend());
       rit++;
       reached_first_file= (rit == filename_list.rend());
       DBUG_PRINT("info", ("filename='%s' can_stop_reading=%d "
@@ -4557,8 +4748,8 @@ bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
           if (binlog_gtid_simple_recovery && is_server_starting &&
               !is_relay_log)
           {
-            DBUG_ASSERT(all_gtids->is_empty());
-            DBUG_ASSERT(lost_gtids->is_empty());
+            assert(all_gtids->is_empty());
+            assert(lost_gtids->is_empty());
             goto end;
           }
           /*FALLTHROUGH*/
@@ -4619,9 +4810,9 @@ bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
         need to start parsing, as it was incremented after generating
         the relay log file name.
       */
-      DBUG_ASSERT(rit != filename_list.rbegin());
+      assert(rit != filename_list.rbegin());
       rit--;
-      DBUG_ASSERT(rit != filename_list.rend());
+      assert(rit != filename_list.rend());
       /* Reset the transaction parser before feeding it with events */
       trx_parser->reset();
       gtid_partial_trx->clear();
@@ -4671,7 +4862,7 @@ bool MYSQL_BIN_LOG::init_gtid_sets(Gtid_set *all_gtids, Gtid_set *lost_gtids,
     DBUG_PRINT("info", ("Iterating forwards through binary logs, looking for "
                         "the first binary log that contains both a "
                         "Previous_gtids_log_event and a Gtid_log_event."));
-    DBUG_ASSERT(!is_relay_log);
+    assert(!is_relay_log);
     for (it= filename_list.begin(); it != filename_list.end(); it++)
     {
       /*
@@ -4765,7 +4956,7 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
                                 Format_description_log_event *extra_description_event)
 {
   // lock_index must be acquired *before* sid_lock.
-  DBUG_ASSERT(need_sid_lock || !need_lock_index);
+  assert(need_sid_lock || !need_lock_index);
   DBUG_ENTER("MYSQL_BIN_LOG::open_binlog(const char *, ...)");
   DBUG_PRINT("enter",("base filename: %s", log_name));
 
@@ -4832,7 +5023,7 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
   bool write_file_name_to_index_file=0;
 
   /* This must be before goto err. */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   binary_log_debug::debug_pretend_version_50034_in_binlog=
     DBUG_EVALUATE_IF("pretend_version_50034_in_binlog", true, false);
 #endif
@@ -4882,8 +5073,8 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
     s.common_footer->checksum_alg= static_cast<enum_binlog_checksum_alg>
                                      (binlog_checksum_options);
 
-  DBUG_ASSERT((s.common_footer)->checksum_alg !=
-               binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert((s.common_footer)->checksum_alg !=
+         binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
   if (!s.is_valid())
     goto err;
   s.dont_set_created= null_created_arg;
@@ -5024,7 +5215,7 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
     DBUG_EXECUTE_IF("crash_create_critical_before_update_index", DBUG_SUICIDE(););
 #endif
 
-    DBUG_ASSERT(my_b_inited(&index_file) != 0);
+    assert(my_b_inited(&index_file) != 0);
 
     /*
       The new log file name is appended into crash safe index file after
@@ -5056,8 +5247,10 @@ bool MYSQL_BIN_LOG::open_binlog(const char *log_name,
     At every rotate memorize the last transaction counter state to use it as
     offset at logging the transaction logical timestamps.
   */
-  max_committed_transaction.update_offset(transaction_counter.get_timestamp());
-  transaction_counter.update_offset(transaction_counter.get_timestamp());
+  mysql_mutex_lock(&LOCK_slave_trans_dep_tracker);
+  m_dependency_tracker.rotate();
+  mysql_mutex_unlock(&LOCK_slave_trans_dep_tracker);
+
 #ifdef HAVE_REPLICATION
   close_purge_index_file();
 #endif
@@ -5104,6 +5297,9 @@ int MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file(bool need_lock_index
   int error= 0;
   File fd= -1;
   DBUG_ENTER("MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file");
+  int failure_trials= MYSQL_BIN_LOG::MAX_RETRIES_FOR_DELETE_RENAME_FAILURE;
+  bool file_rename_status= false, file_delete_status= false;
+  THD *thd= current_thd;
 
   if (need_lock_index)
     mysql_mutex_lock(&LOCK_index);
@@ -5127,8 +5323,41 @@ int MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file(bool need_lock_index
 
       goto recoverable_err;
     }
-    if (DBUG_EVALUATE_IF("force_index_file_delete_failure", 1, 0) ||
-        mysql_file_delete(key_file_binlog_index, index_file_name, MYF(MY_WME)))
+
+    /*
+      Sometimes an outsider can lock index files for temporary viewing
+      purpose. For eg: MEB locks binlog.index/relaylog.index to view
+      the content of the file. During that small period of time, deletion
+      of the file is not possible on some platforms(Eg: Windows)
+      Server should retry the delete operation for few times instead of panicking
+      immediately.
+    */
+    while ((file_delete_status == false) && (failure_trials > 0))
+    {
+      if (DBUG_EVALUATE_IF("force_index_file_delete_failure", 1, 0)) break;
+
+      DBUG_EXECUTE_IF("simulate_index_file_delete_failure",
+                  {
+                    /* This simulation causes the delete to fail */
+                    static char first_char= index_file_name[0];
+                    index_file_name[0]= 0;
+                    sql_print_information("Retrying delete");
+                    if (failure_trials == 1)
+                      index_file_name[0]= first_char;
+                  };);
+      file_delete_status = !(mysql_file_delete(key_file_binlog_index,
+                                               index_file_name, MYF(MY_WME)));
+      --failure_trials;
+      if (!file_delete_status)
+      {
+        my_sleep(1000);
+        /* Clear the error before retrying. */
+        if (failure_trials > 0)
+          thd->clear_error();
+      }
+    }
+
+    if (!file_delete_status)
     {
       error= -1;
       sql_print_error("While rebuilding index file %s: "
@@ -5147,7 +5376,38 @@ int MYSQL_BIN_LOG::move_crash_safe_index_file_to_index_file(bool need_lock_index
   }
 
   DBUG_EXECUTE_IF("crash_create_before_rename_index_file", DBUG_SUICIDE(););
-  if (my_rename(crash_safe_index_file_name, index_file_name, MYF(MY_WME)))
+  /*
+    Sometimes an outsider can lock index files for temporary viewing
+    purpose. For eg: MEB locks binlog.index/relaylog.index to view
+    the content of the file. During that small period of time, rename
+    of the file is not possible on some platforms(Eg: Windows)
+    Server should retry the rename operation for few times instead of panicking
+    immediately.
+  */
+  failure_trials = MYSQL_BIN_LOG::MAX_RETRIES_FOR_DELETE_RENAME_FAILURE;
+  while ((file_rename_status == false) && (failure_trials > 0))
+  {
+    DBUG_EXECUTE_IF("simulate_crash_safe_index_file_rename_failure",
+                {
+                  /* This simulation causes the rename to fail */
+                  static char first_char= index_file_name[0];
+                  index_file_name[0]= 0;
+                  sql_print_information("Retrying rename");
+                  if (failure_trials == 1)
+                    index_file_name[0]= first_char;
+                };);
+    file_rename_status =
+        !(my_rename(crash_safe_index_file_name, index_file_name, MYF(MY_WME)));
+    --failure_trials;
+    if (!file_rename_status)
+    {
+      my_sleep(1000);
+      /* Clear the error before retrying. */
+      if (failure_trials > 0)
+        thd->clear_error();
+    }
+  }
+  if (!file_rename_status)
   {
     error= -1;
     sql_print_error("While rebuilding index file %s: "
@@ -5329,6 +5589,14 @@ void MYSQL_BIN_LOG::set_write_error(THD *thd, bool is_transactional)
   DBUG_VOID_RETURN;
 }
 
+static int compare_log_name(const char* log_1, const char* log_2)
+{
+  const char * log_1_basename= log_1 + dirname_length(log_1);
+  const char * log_2_basename= log_2 + dirname_length(log_2);
+
+  return strcmp(log_1_basename,log_2_basename);
+}
+
 /**
   Find the position in the log-index-file for the given log name.
 
@@ -5357,7 +5625,6 @@ int MYSQL_BIN_LOG::find_log_pos(LOG_INFO *linfo, const char *log_name,
   int error= 0;
   char *full_fname= linfo->log_file_name;
   char full_log_name[FN_REFLEN], fname[FN_REFLEN];
-  size_t log_name_len= 0, fname_len= 0;
   DBUG_ENTER("find_log_pos");
   full_log_name[0]= full_fname[0]= 0;
 
@@ -5386,7 +5653,6 @@ int MYSQL_BIN_LOG::find_log_pos(LOG_INFO *linfo, const char *log_name,
     }
   }
 
-  log_name_len= log_name ? strlen(full_log_name) : 0;
   DBUG_PRINT("enter", ("log_name: %s, full_log_name: %s", 
                        log_name ? log_name : "NULL", full_log_name));
 
@@ -5414,12 +5680,9 @@ int MYSQL_BIN_LOG::find_log_pos(LOG_INFO *linfo, const char *log_name,
       error= LOG_INFO_EOF;
       break;
     }
-    fname_len= strlen(full_fname);
-
     // if the log entry matches, null string matching anything
     if (!log_name ||
-       (log_name_len == fname_len &&
-       !memcmp(full_fname, full_log_name, log_name_len)))
+        !compare_log_name(full_fname,full_log_name))
     {
       DBUG_PRINT("info", ("Found log file entry"));
       linfo->index_file_start_offset= offset;
@@ -5836,11 +6099,11 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
   char *to_purge_if_included= NULL;
   DBUG_ENTER("purge_first_log");
 
-  DBUG_ASSERT(current_thd->system_thread == SYSTEM_THREAD_SLAVE_SQL);
-  DBUG_ASSERT(is_relay_log);
-  DBUG_ASSERT(is_open());
-  DBUG_ASSERT(rli->slave_running == 1);
-  DBUG_ASSERT(!strcmp(rli->linfo.log_file_name,rli->get_event_relay_log_name()));
+  assert(current_thd->system_thread == SYSTEM_THREAD_SLAVE_SQL);
+  assert(is_relay_log);
+  assert(is_open());
+  assert(rli->slave_running == 1);
+  assert(!strcmp(rli->linfo.log_file_name,rli->get_event_relay_log_name()));
 
   mysql_mutex_assert_owner(&rli->data_lock);
 
@@ -5929,7 +6192,7 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
   }
 
   /* If included was passed, rli->linfo should be the first entry. */
-  DBUG_ASSERT(!included || rli->linfo.index_file_start_offset == 0);
+  assert(!included || rli->linfo.index_file_start_offset == 0);
 
 err:
   my_free(to_purge_if_included);
@@ -6066,7 +6329,7 @@ int MYSQL_BIN_LOG::purge_logs(const char *to_log,
   if ((error=find_log_pos(&log_info, NullS, false/*need_lock_index=false*/)))
     goto err;
 
-  while ((strcmp(to_log,log_info.log_file_name) || (exit_loop=included)))
+  while ((compare_log_name(to_log,log_info.log_file_name) || (exit_loop=included)))
   {
     if(is_active(log_info.log_file_name))
     {
@@ -6263,7 +6526,7 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *decrease_log_space,
 
   DBUG_ENTER("MYSQL_BIN_LOG:purge_index_entry");
 
-  DBUG_ASSERT(my_b_inited(&purge_index_file));
+  assert(my_b_inited(&purge_index_file));
 
   if ((error=reinit_io_cache(&purge_index_file, READ_CACHE, 0, 0, 0)))
   {
@@ -6378,6 +6641,13 @@ int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *decrease_log_space,
         DBUG_PRINT("info",("purging %s",log_info.log_file_name));
         if (!mysql_file_delete(key_file_binlog, log_info.log_file_name, MYF(0)))
         {
+          DBUG_EXECUTE_IF("wait_in_purge_index_entry",
+                          {
+                              const char action[] = "now SIGNAL in_purge_index_entry WAIT_FOR go_ahead_sql";
+                              assert(!debug_sync_set_action(thd, STRING_WITH_LEN(action)));
+                              DBUG_SET("-d,wait_in_purge_index_entry");
+                          };);
+
           if (decrease_log_space)
             *decrease_log_space-= s.st_size;
         }
@@ -6608,14 +6878,14 @@ void MYSQL_BIN_LOG::make_log_name(char* buf, const char* log_ident)
 
 bool MYSQL_BIN_LOG::is_active(const char *log_file_name_arg)
 {
-  return !strcmp(log_file_name, log_file_name_arg);
+  return !compare_log_name(log_file_name, log_file_name_arg);
 }
 
 
 void MYSQL_BIN_LOG::inc_prep_xids(THD *thd)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::inc_prep_xids");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   int result= m_prep_xids.atomic_add(1);
   DBUG_PRINT("debug", ("m_prep_xids: %d", result + 1));
 #else
@@ -6749,7 +7019,11 @@ int MYSQL_BIN_LOG::new_file_impl(bool need_lock_log, Format_description_log_even
     close_on_error= TRUE;
     goto end;
   }
-  else
+  /*
+    Make sure that the log_file is initialized before writing
+    Rotate_log_event into it.
+  */
+  if (log_file.alloced_buffer)
   {
     /*
       We log the whole file name for log file as the user may decide
@@ -6763,8 +7037,8 @@ int MYSQL_BIN_LOG::new_file_impl(bool need_lock_log, Format_description_log_even
     */
     if (is_relay_log)
       (r.common_footer)->checksum_alg= relay_log_checksum_alg;
-    DBUG_ASSERT(!is_relay_log || relay_log_checksum_alg !=
-                binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+    assert(!is_relay_log || relay_log_checksum_alg !=
+           binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
     if(DBUG_EVALUATE_IF("fault_injection_new_file_rotate_event",
                         (error=1), FALSE) ||
        (error= r.write(&log_file)))
@@ -6796,8 +7070,8 @@ int MYSQL_BIN_LOG::new_file_impl(bool need_lock_log, Format_description_log_even
 
   if (checksum_alg_reset != binary_log::BINLOG_CHECKSUM_ALG_UNDEF)
   {
-    DBUG_ASSERT(!is_relay_log);
-    DBUG_ASSERT(binlog_checksum_options != checksum_alg_reset);
+    assert(!is_relay_log);
+    assert(binlog_checksum_options != checksum_alg_reset);
     binlog_checksum_options= checksum_alg_reset;
   }
   /*
@@ -6905,8 +7179,8 @@ bool MYSQL_BIN_LOG::after_append_to_relay_log(Master_info *mi)
   // Check pre-conditions
   mysql_mutex_assert_owner(&LOCK_log);
   mysql_mutex_assert_owner(&mi->data_lock);
-  DBUG_ASSERT(is_relay_log);
-  DBUG_ASSERT(current_thd->system_thread == SYSTEM_THREAD_SLAVE_IO);
+  assert(is_relay_log);
+  assert(current_thd->system_thread == SYSTEM_THREAD_SLAVE_IO);
 
   /*
     We allow the relay log rotation by relay log size
@@ -6914,7 +7188,7 @@ bool MYSQL_BIN_LOG::after_append_to_relay_log(Master_info *mi)
   */
   bool can_rotate= mi->transaction_parser.is_not_inside_transaction();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if ((uint) my_b_append_tell(&log_file) >
       DBUG_EVALUATE_IF("rotate_slave_debug_group", 500, max_size) &&
       !can_rotate)
@@ -6970,8 +7244,8 @@ bool MYSQL_BIN_LOG::append_event(Log_event* ev, Master_info *mi)
   DBUG_ENTER("MYSQL_BIN_LOG::append");
 
   // check preconditions
-  DBUG_ASSERT(log_file.type == SEQ_READ_APPEND);
-  DBUG_ASSERT(is_relay_log);
+  assert(log_file.type == SEQ_READ_APPEND);
+  assert(is_relay_log);
 
   // acquire locks
   mysql_mutex_lock(&LOCK_log);
@@ -6996,8 +7270,8 @@ bool MYSQL_BIN_LOG::append_buffer(const char* buf, uint len, Master_info *mi)
   DBUG_ENTER("MYSQL_BIN_LOG::append_buffer");
 
   // check preconditions
-  DBUG_ASSERT(log_file.type == SEQ_READ_APPEND);
-  DBUG_ASSERT(is_relay_log);
+  assert(log_file.type == SEQ_READ_APPEND);
+  assert(is_relay_log);
   mysql_mutex_assert_owner(&LOCK_log);
 
   // write data
@@ -7028,7 +7302,7 @@ bool MYSQL_BIN_LOG::flush_and_sync(const bool force)
 
 void MYSQL_BIN_LOG::start_union_events(THD *thd, query_id_t query_id_param)
 {
-  DBUG_ASSERT(!thd->binlog_evt_union.do_union);
+  assert(!thd->binlog_evt_union.do_union);
   thd->binlog_evt_union.do_union= TRUE;
   thd->binlog_evt_union.unioned_events= FALSE;
   thd->binlog_evt_union.unioned_events_trans= FALSE;
@@ -7037,7 +7311,7 @@ void MYSQL_BIN_LOG::start_union_events(THD *thd, query_id_t query_id_param)
 
 void MYSQL_BIN_LOG::stop_union_events(THD *thd)
 {
-  DBUG_ASSERT(thd->binlog_evt_union.do_union);
+  assert(thd->binlog_evt_union.do_union);
   thd->binlog_evt_union.do_union= FALSE;
 }
 
@@ -7076,13 +7350,13 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd,
                                                 bool is_transactional)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::flush_and_set_pending_rows_event(event)");
-  DBUG_ASSERT(mysql_bin_log.is_open());
+  assert(mysql_bin_log.is_open());
   DBUG_PRINT("enter", ("event: 0x%lx", (long) event));
 
   int error= 0;
   binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
 
-  DBUG_ASSERT(cache_mngr);
+  assert(cache_mngr);
 
   binlog_cache_data *cache_data=
     cache_mngr->get_binlog_cache_data(is_transactional);
@@ -7175,7 +7449,7 @@ bool MYSQL_BIN_LOG::write_event(Log_event *event_info)
       DBUG_RETURN(0);
 #endif /* HAVE_REPLICATION */
 
-    DBUG_ASSERT(event_info->is_using_trans_cache() || event_info->is_using_stmt_cache());
+    assert(event_info->is_using_trans_cache() || event_info->is_using_stmt_cache());
     
     if (binlog_start_trans_and_stmt(thd, event_info))
       DBUG_RETURN(error);
@@ -7307,9 +7581,11 @@ int MYSQL_BIN_LOG::rotate(bool force_rotate, bool* check_purge)
   int error= 0;
   DBUG_ENTER("MYSQL_BIN_LOG::rotate");
 
-  DBUG_ASSERT(!is_relay_log);
+  assert(!is_relay_log);
   mysql_mutex_assert_owner(&LOCK_log);
 
+  DEBUG_SYNC(current_thd,"stop_binlog_rotation_after_acquiring_lock_log");
+
   *check_purge= false;
 
   if (DBUG_EVALUATE_IF("force_rotate", 1, 0) || force_rotate ||
@@ -7379,7 +7655,7 @@ int MYSQL_BIN_LOG::rotate_and_purge(THD* thd, bool force_rotate)
   */
   ha_binlog_wait(thd);
 
-  DBUG_ASSERT(!is_relay_log);
+  assert(!is_relay_log);
   mysql_mutex_lock(&LOCK_log);
   error= rotate(force_rotate, &check_purge);
   /*
@@ -7445,7 +7721,7 @@ int MYSQL_BIN_LOG::get_gtid_executed(Sid_map *sid_map, Gtid_set *gtid_set)
 */
 static bool read_cache_page(IO_CACHE *cache, uchar **buf_p, uint32 *buf_len_p)
 {
-  DBUG_ASSERT(*buf_len_p == 0);
+  assert(*buf_len_p == 0);
   cache->read_pos= cache->read_end;
   *buf_len_p= my_b_fill(cache);
   *buf_p= cache->read_pos;
@@ -7484,12 +7760,23 @@ bool MYSQL_BIN_LOG::do_write_cache(IO_CACHE *cache, Binlog_event_writer *writer)
                     DBUG_RETURN(true);
                   });
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uint64 expected_total_len= my_b_tell(cache);
 #endif
 
+  DBUG_EXECUTE_IF("simulate_tmpdir_partition_full",
+                  {
+                    DBUG_SET("+d,simulate_file_write_error");
+                  });
+
   if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
+  {
+    DBUG_EXECUTE_IF("simulate_tmpdir_partition_full",
+                    {
+                      DBUG_SET("-d,simulate_file_write_error");
+                    });
     DBUG_RETURN(true);
+  }
 
   uchar *buf= cache->read_pos;
   uint32 buf_len= my_b_bytes_in_cache(cache);
@@ -7519,7 +7806,7 @@ bool MYSQL_BIN_LOG::do_write_cache(IO_CACHE *cache, Binlog_event_writer *writer)
           event) to the binlog.  We should rollback the transaction
           and truncate the binlog.  /Sven
         */
-        DBUG_ASSERT(0);
+        assert(0);
       }
       if (buf_len == 0)
       {
@@ -7529,7 +7816,7 @@ bool MYSQL_BIN_LOG::do_write_cache(IO_CACHE *cache, Binlog_event_writer *writer)
           event) to the binlog.  We should rollback the transaction
           and truncate the binlog.  /Sven
         */
-        DBUG_ASSERT(my_b_tell(cache) == expected_total_len);
+        assert(my_b_tell(cache) == expected_total_len);
         /* Arrive the end of the cache */
         DBUG_RETURN(false);
       }
@@ -7553,7 +7840,7 @@ bool MYSQL_BIN_LOG::do_write_cache(IO_CACHE *cache, Binlog_event_writer *writer)
         uchar *header_p= header;
         if (writer->write_event_part(&header_p, &header_len, &event_len))
           DBUG_RETURN(true);
-        DBUG_ASSERT(header_len == 0);
+        assert(header_len == 0);
       }
     }
     else
@@ -7585,15 +7872,44 @@ bool MYSQL_BIN_LOG::write_incident(Incident_log_event *ev, THD *thd,
 {
   uint error= 0;
   DBUG_ENTER("MYSQL_BIN_LOG::write_incident");
-  DBUG_ASSERT(err_msg);
+  assert(err_msg);
 
   if (!is_open())
     DBUG_RETURN(error);
 
   // @todo make this work with the group log. /sven
-  binlog_cache_mngr *const cache_mngr= thd_get_cache_mngr(thd);
+  binlog_cache_mngr *cache_mngr= thd_get_cache_mngr(thd);
 
-#ifndef DBUG_OFF
+  /*
+    thd->cache_mngr may be uninitialized when first transaction resulted in an
+    incident. If there is no cache manager exists for the session, then we
+    create one, so that a GTID is generated and is written prior to flushing
+    the stmt_cache.
+  */
+  if (cache_mngr == NULL)
+  {
+    if (thd->binlog_setup_trx_data() ||
+        DBUG_EVALUATE_IF("simulate_cache_creation_failure", 1, 0))
+    {
+      enum_gtid_mode gtid_mode= get_gtid_mode(GTID_MODE_LOCK_NONE);
+      if (gtid_mode == GTID_MODE_ON || gtid_mode == GTID_MODE_ON_PERMISSIVE)
+      {
+        const char *mode= gtid_mode == GTID_MODE_ON ? "ON" : "ON_PERMISSIVE";
+        std::ostringstream message;
+
+        message << "Could not create IO cache while writing an incident event "
+                   "to the binary log for query: '"<< thd->query().str <<
+                   "'. Since GTID_MODE= " << mode <<", server is unable "
+                   "to proceed with logging.";
+        handle_binlog_flush_or_sync_error(thd, true, message.str().c_str());
+        DBUG_RETURN(true);
+      }
+    }
+    else
+      cache_mngr= thd_get_cache_mngr(thd);
+  }
+
+#ifndef NDEBUG
   if (DBUG_EVALUATE_IF("simulate_write_incident_event_into_binlog_directly",
                        1, 0) && !cache_mngr->stmt_cache.is_binlog_empty())
   {
@@ -7683,14 +7999,13 @@ bool MYSQL_BIN_LOG::write_incident(Incident_log_event *ev, THD *thd,
   DBUG_RETURN(error);
 }
 
-bool MYSQL_BIN_LOG::write_dml_directly(THD* thd, const char *stmt, size_t stmt_len)
+bool MYSQL_BIN_LOG::write_stmt_directly(THD* thd, const char *stmt, size_t stmt_len,
+                                       enum_sql_command sql_command)
 {
   bool ret= false;
   /* backup the original command */
   enum_sql_command save_sql_command= thd->lex->sql_command;
-
-  /* Fake it as a DELETE statement, so it can be binlogged correctly */
-  thd->lex->sql_command= SQLCOM_DELETE;
+  thd->lex->sql_command= sql_command;
 
   if (thd->binlog_query(THD::STMT_QUERY_TYPE, stmt, stmt_len,
                         FALSE, FALSE, FALSE, 0) ||
@@ -7775,7 +8090,7 @@ bool MYSQL_BIN_LOG::write_cache(THD *thd, binlog_cache_data *cache_data,
 
   mysql_mutex_assert_owner(&LOCK_log);
 
-  DBUG_ASSERT(is_open());
+  assert(is_open());
   if (likely(is_open()))                       // Should always be true
   {
     /*
@@ -7830,6 +8145,14 @@ bool MYSQL_BIN_LOG::write_cache(THD *thd, binlog_cache_data *cache_data,
     sql_print_error(ER(ER_ERROR_ON_WRITE), name,
                     errno, my_strerror(errbuf, sizeof(errbuf), errno));
   }
+
+  /*
+    If the flush has failed due to ENOSPC, set the flush_error flag.
+  */
+  if (cache->error && thd->is_error() && my_errno() == ENOSPC)
+  {
+    cache_data->set_flush_error(thd);
+  }
   thd->commit_error= THD::CE_FLUSH_ERROR;
 
   DBUG_RETURN(true);
@@ -7946,8 +8269,8 @@ void MYSQL_BIN_LOG::close(uint exiting, bool need_lock_log,
         s.common_footer->checksum_alg= is_relay_log ? relay_log_checksum_alg :
                                        static_cast<enum_binlog_checksum_alg>
                                        (binlog_checksum_options);
-      DBUG_ASSERT(!is_relay_log ||
-                  relay_log_checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+        assert(!is_relay_log ||
+               relay_log_checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
       s.write(&log_file);
       bytes_written+= s.common_header->data_written;
       flush_io_cache(&log_file);
@@ -8033,6 +8356,24 @@ void MYSQL_BIN_LOG::close(uint exiting, bool need_lock_log,
   DBUG_VOID_RETURN;
 }
 
+void MYSQL_BIN_LOG::harvest_bytes_written(Relay_log_info* rli, bool need_log_space_lock)
+{
+#ifndef NDEBUG
+  char buf1[22],buf2[22];
+#endif
+  DBUG_ENTER("harvest_bytes_written");
+  if (need_log_space_lock)
+    mysql_mutex_lock(&rli->log_space_lock);
+  else
+    mysql_mutex_assert_owner(&rli->log_space_lock);
+  rli->log_space_total+= bytes_written;
+  DBUG_PRINT("info",("relay_log_space: %s  bytes_written: %s",
+        llstr(rli->log_space_total,buf1), llstr(bytes_written,buf2)));
+  bytes_written=0;
+  if (need_log_space_lock)
+    mysql_mutex_unlock(&rli->log_space_lock);
+  DBUG_VOID_RETURN;
+}
 
 void MYSQL_BIN_LOG::set_max_size(ulong max_size_arg)
 {
@@ -8070,9 +8411,9 @@ int MYSQL_BIN_LOG::open_binlog(const char *opt_name)
     This function is used for 2pc transaction coordination.  Hence, it
     is never used for relay logs.
   */
-  DBUG_ASSERT(!is_relay_log);
-  DBUG_ASSERT(total_ha_2pc > 1 || (1 == total_ha_2pc && opt_bin_log));
-  DBUG_ASSERT(opt_name && opt_name[0]);
+  assert(!is_relay_log);
+  assert(total_ha_2pc > 1 || (1 == total_ha_2pc && opt_bin_log));
+  assert(opt_name && opt_name[0]);
 
   if (!my_b_inited(&index_file))
   {
@@ -8239,13 +8580,13 @@ int MYSQL_BIN_LOG::prepare(THD *thd, bool all)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::prepare");
 
-  DBUG_ASSERT(opt_bin_log);
+  assert(opt_bin_log);
   /*
     The applier thread explicitly overrides the value of sql_log_bin
     with the value of log_slave_updates.
   */
-  DBUG_ASSERT(thd->slave_thread ?
-              opt_log_slave_updates : thd->variables.sql_log_bin);
+  assert(thd->slave_thread ?
+         opt_log_slave_updates : thd->variables.sql_log_bin);
 
   /*
     Set HA_IGNORE_DURABILITY to not flush the prepared record of the
@@ -8356,8 +8697,8 @@ TC_LOG::enum_result MYSQL_BIN_LOG::commit(THD *thd, bool all)
     /* The Commit phase of the XA two phase logging. */
 
     bool one_phase= get_xa_opt(thd) == XA_ONE_PHASE;
-    DBUG_ASSERT(all);
-    DBUG_ASSERT(!skip_commit || one_phase);
+    assert(all);
+    assert(!skip_commit || one_phase);
 
     int err= 0;
     XID_STATE *xs= thd->get_transaction()->xid_state();
@@ -8407,7 +8748,7 @@ TC_LOG::enum_result MYSQL_BIN_LOG::commit(THD *thd, bool all)
       Commit parent identification of non-transactional query has
       been deferred until now, except for the mixed transaction case.
     */
-    trn_ctx->store_commit_parent(max_committed_transaction.get_timestamp());
+    trn_ctx->store_commit_parent(m_dependency_tracker.get_max_committed_timestamp());
     if (cache_mngr->stmt_cache.finalize(thd))
       DBUG_RETURN(RESULT_ABORTED);
     stmt_stuff_logged= true;
@@ -8442,12 +8783,12 @@ TC_LOG::enum_result MYSQL_BIN_LOG::commit(THD *thd, bool all)
       int err= 0;
       bool one_phase= get_xa_opt(thd) == XA_ONE_PHASE;
 
-      DBUG_ASSERT(thd->lex->sql_command != SQLCOM_XA_COMMIT || one_phase);
+      assert(thd->lex->sql_command != SQLCOM_XA_COMMIT || one_phase);
 
       XID_STATE *xs= thd->get_transaction()->xid_state();
       XA_prepare_log_event end_evt(thd, xs->get_xid(), one_phase);
 
-      DBUG_ASSERT(skip_commit);
+      assert(skip_commit);
 
       err= cache_mngr->trx_cache.finalize(thd, &end_evt, xs);
       if (err ||
@@ -8604,11 +8945,11 @@ MYSQL_BIN_LOG::process_flush_stage_queue(my_off_t *total_bytes_var,
                                          THD **out_queue_var)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::process_flush_stage_queue");
-  #ifndef DBUG_OFF
+  #ifndef NDEBUG
   // number of flushes per group.
   int no_flushes= 0;
   #endif
-  DBUG_ASSERT(total_bytes_var && rotate_var && out_queue_var);
+  assert(total_bytes_var && rotate_var && out_queue_var);
   my_off_t total_bytes= 0;
   int flush_error= 1;
   mysql_mutex_assert_owner(&LOCK_log);
@@ -8620,7 +8961,7 @@ MYSQL_BIN_LOG::process_flush_stage_queue(my_off_t *total_bytes_var,
     flushing them to binary log, which is required by crash recovery.
   */
   THD *first_seen= stage_manager.fetch_queue_for(Stage_manager::FLUSH_STAGE);
-  DBUG_ASSERT(first_seen != NULL);
+  assert(first_seen != NULL);
   /*
     We flush prepared records of transactions to the log of storage
     engine (for example, InnoDB redo log) in a group right before
@@ -8636,7 +8977,7 @@ MYSQL_BIN_LOG::process_flush_stage_queue(my_off_t *total_bytes_var,
     total_bytes+= result.second;
     if (flush_error == 1)
       flush_error= result.first;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     no_flushes++;
 #endif
   }
@@ -8645,37 +8986,13 @@ MYSQL_BIN_LOG::process_flush_stage_queue(my_off_t *total_bytes_var,
   *total_bytes_var= total_bytes;
   if (total_bytes > 0 && my_b_tell(&log_file) >= (my_off_t) max_size)
     *rotate_var= true;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("info",("no_flushes:= %d", no_flushes));
   no_flushes= 0;
 #endif
   DBUG_RETURN(flush_error);
 }
 
-/**
-  The method is to be executed right before committing time.
-  It must be invoked even if the transaction does not commit
-  to engine being merely logged into the binary log.
-  max_committed_transaction is updated with a greater timestamp
-  value.
-  As a side effect, the transaction context's sequence_number
-  is reset.
-
-  @param THD a pointer to THD instance
-*/
-void MYSQL_BIN_LOG::update_max_committed(THD *thd)
-{
-  Transaction_ctx *trn_ctx= thd->get_transaction();
-  max_committed_transaction.set_if_greater(trn_ctx->sequence_number);
-  /*
-    sequence_number timestamp is unneeded anymore, so it's cleared off.
-  */
-  trn_ctx->sequence_number= SEQ_UNINIT;
-
-  DBUG_ASSERT(trn_ctx->last_committed == SEQ_UNINIT ||
-              thd->commit_error == THD::CE_FLUSH_ERROR);
-}
-
 /**
   Commit a sequence of sessions.
 
@@ -8696,7 +9013,7 @@ void
 MYSQL_BIN_LOG::process_commit_stage_queue(THD *thd, THD *first)
 {
   mysql_mutex_assert_owner(&LOCK_commit);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   thd->get_transaction()->m_flags.ready_preempt= 1; // formality by the leader
 #endif
   for (THD *head= first ; head ; head = head->next_to_commit)
@@ -8712,17 +9029,21 @@ MYSQL_BIN_LOG::process_commit_stage_queue(THD *thd, THD *first)
       If flush succeeded, attach to the session and commit it in the
       engines.
     */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     stage_manager.clear_preempt_status(head);
 #endif
     if (head->get_transaction()->sequence_number != SEQ_UNINIT)
-      update_max_committed(head);
+    {
+      mysql_mutex_lock(&LOCK_slave_trans_dep_tracker);
+      m_dependency_tracker.update_max_committed(head);
+      mysql_mutex_unlock(&LOCK_slave_trans_dep_tracker);
+    }
     /*
       Flush/Sync error should be ignored and continue
       to commit phase. And thd->commit_error cannot be
       COMMIT_ERROR at this moment.
     */
-    DBUG_ASSERT(head->commit_error != THD::CE_COMMIT_ERROR);
+    assert(head->commit_error != THD::CE_COMMIT_ERROR);
 #ifndef EMBEDDED_LIBRARY
     Thd_backup_and_restore switch_thd(thd, head);
 #endif /* !EMBEDDED_LIBRARY */
@@ -8730,7 +9051,7 @@ MYSQL_BIN_LOG::process_commit_stage_queue(THD *thd, THD *first)
     if (head->get_transaction()->m_flags.commit_low)
     {
       /* head is parked to have exited append() */
-      DBUG_ASSERT(head->get_transaction()->m_flags.ready_preempt);
+      assert(head->get_transaction()->m_flags.ready_preempt);
       /*
         storage engine commit
        */
@@ -8797,7 +9118,7 @@ MYSQL_BIN_LOG::process_after_commit_stage_queue(THD *thd, THD *first)
   }
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /** Names for the stages. */
 static const char* g_stage_name[] = {
   "FLUSH",
@@ -8844,16 +9165,16 @@ MYSQL_BIN_LOG::change_stage(THD *thd,
   DBUG_ENTER("MYSQL_BIN_LOG::change_stage");
   DBUG_PRINT("enter", ("thd: 0x%llx, stage: %s, queue: 0x%llx",
                        (ulonglong) thd, g_stage_name[stage], (ulonglong) queue));
-  DBUG_ASSERT(0 <= stage && stage < Stage_manager::STAGE_COUNTER);
-  DBUG_ASSERT(enter_mutex);
-  DBUG_ASSERT(queue);
+  assert(0 <= stage && stage < Stage_manager::STAGE_COUNTER);
+  assert(enter_mutex);
+  assert(queue);
   /*
     enroll_for will release the leave_mutex once the sessions are
     queued.
   */
   if (!stage_manager.enroll_for(stage, queue, leave_mutex))
   {
-    DBUG_ASSERT(!thd_get_cache_mngr(thd)->dbug_any_finalized());
+    assert(!thd_get_cache_mngr(thd)->dbug_any_finalized());
     DBUG_RETURN(true);
   }
 
@@ -8973,42 +9294,28 @@ MYSQL_BIN_LOG::finish_commit(THD *thd)
       cache_mngr->reset();
   }
   if (thd->get_transaction()->sequence_number != SEQ_UNINIT)
-    update_max_committed(thd);
-  if (thd->get_transaction()->m_flags.commit_low)
   {
-    const bool all= thd->get_transaction()->m_flags.real_commit;
+    mysql_mutex_lock(&LOCK_slave_trans_dep_tracker);
+    m_dependency_tracker.update_max_committed(thd);
+    mysql_mutex_unlock(&LOCK_slave_trans_dep_tracker);
+  }
+
+  bool all = thd->get_transaction()->m_flags.real_commit;
+  bool committed_low = thd->get_transaction()->m_flags.commit_low;
+
+  if (committed_low)
+  {
     /*
       Now flush error and sync erros are ignored and we are continuing and
       committing. And at this time, commit_error cannot be COMMIT_ERROR.
     */
-    DBUG_ASSERT(thd->commit_error != THD::CE_COMMIT_ERROR);
+    assert(thd->commit_error != THD::CE_COMMIT_ERROR);
     /*
       storage engine commit
     */
     if (ha_commit_low(thd, all, false))
       thd->commit_error= THD::CE_COMMIT_ERROR;
-    /*
-      Decrement the prepared XID counter after storage engine commit
-    */
-    if (thd->get_transaction()->m_flags.xid_written)
-      dec_prep_xids(thd);
-    /*
-      If commit succeeded, we call the after_commit hook
-
-      TODO: This hook here should probably move outside/below this
-            if and be the only after_commit invocation left in the
-            code.
-    */
-    if ((thd->commit_error != THD::CE_COMMIT_ERROR) &&
-        thd->get_transaction()->m_flags.run_hooks)
-    {
-      (void) RUN_HOOK(transaction, after_commit, (thd, all));
-      thd->get_transaction()->m_flags.run_hooks= false;
-    }
   }
-  else if (thd->get_transaction()->m_flags.xid_written)
-    dec_prep_xids(thd);
-
   /*
     If the ordered commit didn't updated the GTIDs for this thd yet
     at process_commit_stage_queue (i.e. --binlog-order-commits=0)
@@ -9027,17 +9334,33 @@ MYSQL_BIN_LOG::finish_commit(THD *thd)
     else
       gtid_state->update_on_rollback(thd);
   }
+  /*
+    Decrement the prepared XID counter after commit
+  */
+  if (thd->get_transaction()->m_flags.xid_written)
+    dec_prep_xids(thd);
+
+  DEBUG_SYNC(thd, "after_dec_prep_xids");
+  /*
+    If the transaction was committed successfully, run the after_commit
+  */
+  if (committed_low && (thd->commit_error != THD::CE_COMMIT_ERROR) &&
+      thd->get_transaction()->m_flags.run_hooks)
+  {
+    (void) RUN_HOOK(transaction, after_commit, (thd, all));
+    thd->get_transaction()->m_flags.run_hooks = false;
+  }
 
   DBUG_EXECUTE_IF("leaving_finish_commit",
                   {
                     const char act[]=
                       "now SIGNAL signal_leaving_finish_commit";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
-  DBUG_ASSERT(thd->commit_error || !thd->get_transaction()->m_flags.run_hooks);
-  DBUG_ASSERT(!thd_get_cache_mngr(thd)->dbug_any_finalized());
+  assert(thd->commit_error || !thd->get_transaction()->m_flags.run_hooks);
+  assert(!thd_get_cache_mngr(thd)->dbug_any_finalized());
   DBUG_PRINT("return", ("Thread ID: %u, commit_error: %d",
                         thd->thread_id(), thd->commit_error));
   /*
@@ -9058,7 +9381,7 @@ static inline int call_after_sync_hook(THD *queue_head)
   if (NO_HOOK(binlog_storage))
     return 0;
 
-  DBUG_ASSERT(queue_head != NULL);
+  assert(queue_head != NULL);
   for (THD *thd= queue_head; thd != NULL; thd= thd->next_to_commit)
     if (likely(thd->commit_error == THD::CE_NONE))
       thd->get_trans_fixed_pos(&log_file, &pos);
@@ -9087,21 +9410,26 @@ static inline int call_after_sync_hook(THD *queue_head)
                        > Indicates false if LOCK_log is already acquired
                          by the thread (happens when we are handling flush
                          error)
+  @param message Message stating the reason of the failure
 
   @return void
 */
 void MYSQL_BIN_LOG::handle_binlog_flush_or_sync_error(THD *thd,
-                                                      bool need_lock_log)
-{
-  char errmsg[MYSQL_ERRMSG_SIZE];
-  sprintf(errmsg, "An error occurred during %s stage of the commit. "
-          "'binlog_error_action' is set to '%s'.",
-          thd->commit_error== THD::CE_FLUSH_ERROR ? "flush" : "sync",
-          binlog_error_action == ABORT_SERVER ? "ABORT_SERVER" : "IGNORE_ERROR");
+                                                      bool need_lock_log,
+                                                      const char* message)
+{
+  char errmsg[MYSQL_ERRMSG_SIZE]= {0};
+  if (!message)
+    sprintf(errmsg, "An error occurred during %s stage of the commit. "
+            "'binlog_error_action' is set to '%s'.",
+            thd->commit_error== THD::CE_FLUSH_ERROR ? "flush" : "sync",
+            binlog_error_action == ABORT_SERVER ? "ABORT_SERVER" : "IGNORE_ERROR");
+  else
+    strncpy(errmsg, message, MYSQL_ERRMSG_SIZE-1);
   if (binlog_error_action == ABORT_SERVER)
   {
-    char err_buff[MYSQL_ERRMSG_SIZE];
-    sprintf(err_buff, "%s Hence aborting the server.", errmsg);
+    char err_buff[MYSQL_ERRMSG_SIZE + 25];
+    sprintf(err_buff, "%s Server is being stopped.", errmsg);
     exec_binlog_error_action_abort(err_buff);
   }
   else
@@ -9127,6 +9455,14 @@ void MYSQL_BIN_LOG::handle_binlog_flush_or_sync_error(THD *thd,
     }
     close(LOG_CLOSE_INDEX|LOG_CLOSE_STOP_EVENT, false/*need_lock_log=false*/,
           true/*need_lock_index=true*/);
+    /*
+      If there is a write error (flush/sync stage) and if
+      binlog_error_action=IGNORE_ERROR, clear the error
+      and allow the commit to happen in storage engine.
+    */
+    if (check_write_error(thd))
+      thd->clear_error();
+
     if (need_lock_log)
       mysql_mutex_unlock(&LOCK_log);
     DEBUG_SYNC(thd, "after_binlog_closed_due_to_error");
@@ -9209,11 +9545,11 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   thd->get_transaction()->m_flags.xid_written= false;
   thd->get_transaction()->m_flags.commit_low= !skip_commit;
   thd->get_transaction()->m_flags.run_hooks= !skip_commit;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
      The group commit Leader may have to wait for follower whose transaction
      is not ready to be preempted. Initially the status is pessimistic.
-     Preemption guarding logics is necessary only when !DBUG_OFF is set.
+     Preemption guarding logics is necessary only when !NDEBUG is set.
      It won't be required for the dbug-off case as long as the follower won't
      execute any thread-specific write access code in this method, which is
      the case as of current.
@@ -9295,7 +9631,7 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   if (flush_error == 0)
   {
     const char *file_name_ptr= log_file_name + dirname_length(log_file_name);
-    DBUG_ASSERT(flush_end_pos != 0);
+    assert(flush_end_pos != 0);
     if (RUN_HOOK(binlog_storage, after_flush,
                  (thd, file_name_ptr, flush_end_pos)))
     {
@@ -9313,7 +9649,9 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
     /*
       Handle flush error (if any) after leader finishes it's flush stage.
     */
-    handle_binlog_flush_or_sync_error(thd, false /* need_lock_log */);
+    handle_binlog_flush_or_sync_error(thd, false /* need_lock_log */,
+              (thd->commit_error == THD::CE_FLUSH_GNO_EXHAUSTED_ERROR)
+              ? ER(ER_GNO_EXHAUSTED) : NULL);
   }
 
   DEBUG_SYNC(thd, "bgc_after_flush_stage_before_sync_stage");
@@ -9354,11 +9692,15 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
   if (update_binlog_end_pos_after_sync)
   {
     THD *tmp_thd= final_queue;
-
+    const char *binlog_file= NULL;
+    my_off_t pos= 0;
     while (tmp_thd->next_to_commit != NULL)
       tmp_thd= tmp_thd->next_to_commit;
     if (flush_error == 0 && sync_error == 0)
-      update_binlog_end_pos(tmp_thd->get_trans_pos());
+    {
+      tmp_thd->get_trans_fixed_pos(&binlog_file, &pos);
+      update_binlog_end_pos(binlog_file, pos);
+    }
   }
 
   DEBUG_SYNC(thd, "bgc_after_sync_stage_before_commit_stage");
@@ -9436,7 +9778,7 @@ int MYSQL_BIN_LOG::ordered_commit(THD *thd, bool all, bool skip_commit)
     Handle sync error after we release all locks in order to avoid deadlocks
   */
   if (sync_error)
-    handle_binlog_flush_or_sync_error(thd, true /* need_lock_log */);
+    handle_binlog_flush_or_sync_error(thd, true /* need_lock_log */, NULL);
 
   /* Commit done so signal all waiting threads */
   stage_manager.signal_done(final_queue);
@@ -9532,12 +9874,12 @@ int MYSQL_BIN_LOG::recover(IO_CACHE *log, Format_description_log_event *fdle,
     if (ev->get_type_code() == binary_log::QUERY_EVENT &&
         !strcmp(((Query_log_event*)ev)->query, "COMMIT"))
     {
-      DBUG_ASSERT(in_transaction == TRUE);
+      assert(in_transaction == TRUE);
       in_transaction= FALSE;
     }
     else if (ev->get_type_code() == binary_log::XID_EVENT)
     {
-      DBUG_ASSERT(in_transaction == TRUE);
+      assert(in_transaction == TRUE);
       in_transaction= FALSE;
       Xid_log_event *xev=(Xid_log_event *)ev;
       uchar *x= (uchar *) memdup_root(&mem_root, (uchar*) &xev->xid,
@@ -9612,22 +9954,182 @@ int MYSQL_BIN_LOG::recover(IO_CACHE *log, Format_description_log_event *fdle,
   return 1;
 }
 
+void MYSQL_BIN_LOG::report_missing_purged_gtids(
+    const Gtid_set *slave_executed_gtid_set, std::string &errmsg)
+{
+  DBUG_ENTER("MYSQL_BIN_LOG::report_missing_purged_gtids");
+  THD *thd= current_thd;
+  Gtid_set gtid_missing(gtid_state->get_lost_gtids()->get_sid_map());
+  gtid_missing.add_gtid_set(gtid_state->get_lost_gtids());
+  gtid_missing.remove_gtid_set(slave_executed_gtid_set);
+
+  String tmp_uuid;
+  uchar name[]= "slave_uuid";
+
+  /* Protects thd->user_vars. */
+  mysql_mutex_lock(&thd->LOCK_thd_data);
+  user_var_entry *entry=
+    (user_var_entry*) my_hash_search(&thd->user_vars, name, sizeof(name)-1);
+  if (entry && entry->length() > 0)
+    tmp_uuid.copy(entry->ptr(), entry->length(), NULL);
+  mysql_mutex_unlock(&thd->LOCK_thd_data);
+
+
+  char* missing_gtids= NULL;
+  char* slave_executed_gtids= NULL;
+  gtid_missing.to_string(&missing_gtids);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids);
+
+  /*
+     Log the information about the missing purged GTIDs to the error log
+     if the message is less than MAX_LOG_BUFFER_SIZE.
+  */
+  std::ostringstream log_info;
+  log_info << "The missing transactions are '"<< missing_gtids <<"'";
+  const char* log_msg= ER(ER_FOUND_MISSING_GTIDS);
+
+  /* Don't consider the "%s" in the format string. Subtract 2 from the
+     total length */
+  uint total_length= (strlen(log_msg) - 2 + log_info.str().length());
+
+  DBUG_EXECUTE_IF("simulate_long_missing_gtids",
+                  { total_length= MAX_LOG_BUFFER_SIZE + 1;});
+
+  if (total_length > MAX_LOG_BUFFER_SIZE)
+    log_info.str("To find the missing purged transactions, run \"SELECT"
+                 " @@GLOBAL.GTID_PURGED\" on the master, then run \"SELECT"
+                 " CONCAT(RECEIVED_TRANSACTION_SET, ',', @@GLOBAL.GTID_EXECUTED)"
+                 " FROM PERFORMANCE_SCHEMA.replication_connection_status\" on"
+                 " the slave, and then run \"SELECT GTID_SUBTRACT(<master_set>,"
+                 " <slave_set>)\" on any server");
+
+  sql_print_warning(ER_THD(thd, ER_FOUND_MISSING_GTIDS), tmp_uuid.ptr(),
+                    log_info.str().c_str());
+
+  /*
+     Send the information about the slave executed GTIDs and missing
+     purged GTIDs to slave if the message is less than MYSQL_ERRMSG_SIZE.
+  */
+  std::ostringstream gtid_info;
+  gtid_info << "The GTID set sent by the slave is '" << slave_executed_gtids
+            << "', and the missing transactions are '"<< missing_gtids <<"'";
+  errmsg.assign(ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS));
+
+  /* Don't consider the "%s" in the format string. Subtract 2 from the
+     total length */
+  total_length= (errmsg.length() - 2 + gtid_info.str().length());
+
+  DBUG_EXECUTE_IF("simulate_long_missing_gtids",
+                  { total_length= MYSQL_ERRMSG_SIZE + 1;});
+
+  if (total_length > MYSQL_ERRMSG_SIZE)
+    gtid_info.str("The GTID sets and the missing purged transactions are too"
+                  " long to print in this message. For more information,"
+                  " please see the master's error log or the manual for"
+                  " GTID_SUBTRACT");
+
+  /* Buffer for formatting the message about the missing GTIDs. */
+  char buff[MYSQL_ERRMSG_SIZE];
+  my_snprintf(buff, MYSQL_ERRMSG_SIZE, errmsg.c_str(), gtid_info.str().c_str());
+  errmsg.assign(const_cast<const char*>(buff));
+
+  my_free(missing_gtids);
+  my_free(slave_executed_gtids);
+  DBUG_VOID_RETURN;
+}
+
+void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_set* previous_gtid_set,
+                                         const Gtid_set* slave_executed_gtid_set,
+                                         std::string& errmsg)
+{
+  DBUG_ENTER("MYSQL_BIN_LOG::report_missing_gtids");
+  THD *thd=current_thd;
+  char* missing_gtids= NULL;
+  char* slave_executed_gtids= NULL;
+  Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
+  gtid_missing.add_gtid_set(slave_executed_gtid_set);
+  gtid_missing.remove_gtid_set(previous_gtid_set);
+  gtid_missing.to_string(&missing_gtids);
+  slave_executed_gtid_set->to_string(&slave_executed_gtids);
+
+  String tmp_uuid;
+  uchar name[]= "slave_uuid";
+
+  /* Protects thd->user_vars. */
+  mysql_mutex_lock(&thd->LOCK_thd_data);
+
+  user_var_entry *entry=
+    (user_var_entry*) my_hash_search(&thd->user_vars, name, sizeof(name)-1);
+  if (entry && entry->length() > 0)
+    tmp_uuid.copy(entry->ptr(), entry->length(), NULL);
+  mysql_mutex_unlock(&thd->LOCK_thd_data);
+
+  /*
+     Log the information about the missing purged GTIDs to the error log
+     if the message is less than MAX_LOG_BUFFER_SIZE.
+  */
+  std::ostringstream log_info;
+  log_info << "If the binary log files have been deleted from disk,"
+      " check the consistency of 'GTID_PURGED' variable."
+      " The missing transactions are '"<< missing_gtids <<"'";
+  const char* log_msg= ER(ER_FOUND_MISSING_GTIDS);
+
+  /* Don't consider the "%s" in the format string. Subtract 2 from the
+     total length */
+  if ((strlen(log_msg) - 2 + log_info.str().length()) > MAX_LOG_BUFFER_SIZE)
+    log_info.str("To find the missing purged transactions, run \"SELECT"
+                 " @@GLOBAL.GTID_PURGED\" on the master, then run \"SELECT"
+                 " CONCAT(RECEIVED_TRANSACTION_SET, ',', @@GLOBAL.GTID_EXECUTED)"
+                 " FROM PERFORMANCE_SCHEMA.replication_connection_status\" on"
+                 " the slave, and then run \"SELECT GTID_SUBTRACT(<master_set>,"
+                 " <slave_set>)\" on any server");
+
+  sql_print_warning(ER_THD(thd, ER_FOUND_MISSING_GTIDS), tmp_uuid.ptr(),
+                    log_info.str().c_str());
+
+  /*
+     Send the information about the slave executed GTIDs and missing
+     purged GTIDs to slave if the message is less than MYSQL_ERRMSG_SIZE.
+  */
+  std::ostringstream gtid_info;
+  gtid_info << "The GTID set sent by the slave is '" << slave_executed_gtids
+            << "', and the missing transactions are '"<< missing_gtids <<"'";
+  errmsg.assign(ER_THD(thd, ER_MASTER_HAS_PURGED_REQUIRED_GTIDS));
+
+  /* Don't consider the "%s" in the format string. Subtract 2 from the
+     total length */
+  if ((errmsg.length() - 2 + gtid_info.str().length()) > MYSQL_ERRMSG_SIZE)
+    gtid_info.str("The GTID sets and the missing purged transactions are too"
+                  " long to print in this message. For more information,"
+                  " please see the master's error log or the manual for"
+                  " GTID_SUBTRACT");
+  /* Buffer for formatting the message about the missing GTIDs. */
+  char buff[MYSQL_ERRMSG_SIZE];
+  my_snprintf(buff, MYSQL_ERRMSG_SIZE, errmsg.c_str(), gtid_info.str().c_str());
+  errmsg.assign(const_cast<const char*>(buff));
+
+  my_free(missing_gtids);
+  my_free(slave_executed_gtids);
+
+  DBUG_VOID_RETURN;
+}
+
 bool THD::is_binlog_cache_empty(bool is_transactional)
 {
   DBUG_ENTER("THD::is_binlog_cache_empty(bool)");
 
   // If opt_bin_log==0, it is not safe to call thd_get_cache_mngr
   // because binlog_hton has not been completely set up.
-  DBUG_ASSERT(opt_bin_log);
+  assert(opt_bin_log);
   binlog_cache_mngr *cache_mngr= thd_get_cache_mngr(this);
 
   // cache_mngr is NULL until we call thd->binlog_setup_trx_data, so
   // we assert that this has been done.
-  DBUG_ASSERT(cache_mngr != NULL);
+  assert(cache_mngr != NULL);
 
   binlog_cache_data *cache_data=
     cache_mngr->get_binlog_cache_data(is_transactional);
-  DBUG_ASSERT(cache_data != NULL);
+  assert(cache_data != NULL);
 
   DBUG_RETURN(cache_data->is_binlog_empty());
 }
@@ -9645,17 +10147,29 @@ int THD::binlog_setup_trx_data()
   if (cache_mngr)
     DBUG_RETURN(0);                             // Already set up
 
+  IO_CACHE stmt_cache_log, trx_cache_log;
+  memset(&stmt_cache_log, 0, sizeof(stmt_cache_log));
+  memset(&trx_cache_log, 0, sizeof(trx_cache_log));
+
   cache_mngr= (binlog_cache_mngr*) my_malloc(key_memory_binlog_cache_mngr,
                                              sizeof(binlog_cache_mngr), MYF(MY_ZEROFILL));
-  if (!cache_mngr ||
-      open_cached_file(&cache_mngr->stmt_cache.cache_log, mysql_tmpdir,
-                       LOG_PREFIX, binlog_stmt_cache_size, MYF(MY_WME)) ||
-      open_cached_file(&cache_mngr->trx_cache.cache_log, mysql_tmpdir,
-                       LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
+  if (!cache_mngr)
+  {
+    DBUG_RETURN(1);
+  }
+  if (open_cached_file(&stmt_cache_log, mysql_tmpdir,
+                       LOG_PREFIX, binlog_stmt_cache_size, MYF(MY_WME)))
   {
     my_free(cache_mngr);
     DBUG_RETURN(1);                      // Didn't manage to set it up
   }
+  if (open_cached_file(&trx_cache_log, mysql_tmpdir,
+                       LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
+  {
+    close_cached_file(&stmt_cache_log);
+    my_free(cache_mngr);
+    DBUG_RETURN(1);
+  }
   DBUG_PRINT("debug", ("Set ha_data slot %d to 0x%llx", binlog_hton->slot, (ulonglong) cache_mngr));
   thd_set_ha_data(this, binlog_hton, cache_mngr);
 
@@ -9665,7 +10179,9 @@ int THD::binlog_setup_trx_data()
                                 &binlog_stmt_cache_disk_use,
                                 max_binlog_cache_size,
                                 &binlog_cache_use,
-                                &binlog_cache_disk_use);
+                                &binlog_cache_disk_use,
+                                stmt_cache_log,
+                                trx_cache_log);
   DBUG_RETURN(0);
 }
 
@@ -9835,8 +10351,8 @@ int THD::binlog_write_table_map(TABLE *table, bool is_transactional,
                        table->s->table_map_id.id()));
 
   /* Pre-conditions */
-  DBUG_ASSERT(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
-  DBUG_ASSERT(table->s->table_map_id.is_valid());
+  assert(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
+  assert(table->s->table_map_id.is_valid());
 
   Table_map_log_event
     the_event(this, table, table->s->table_map_id, is_transactional);
@@ -9989,7 +10505,7 @@ THD::add_to_binlog_accessed_dbs(const char *db_param)
       char **ref_cur_db= it.ref();
       int cmp= strcmp(after_db, *ref_cur_db);
 
-      DBUG_ASSERT(!swap || cmp < 0);
+      assert(!swap || cmp < 0);
       
       if (cmp == 0)
       {
@@ -10115,7 +10631,7 @@ static bool inline fulltext_unsafe_set(TABLE_SHARE *s)
   }
   return FALSE;
 }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 const char * get_locked_tables_mode_name(enum_locked_tables_mode locked_tables_mode)
 {
    switch (locked_tables_mode)
@@ -10330,7 +10846,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
       on modifying gtid_executed table.
     */
     int warned_gtid_executed_table= 0;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       DBUG_PRINT("debug", ("prelocked_mode: %s",
                            get_locked_tables_mode_name(locked_tables_mode)));
@@ -10505,9 +11021,9 @@ int THD::decide_logging_format(TABLE_LIST *tables)
 
       prev_access_table= table->table;
     }
-    DBUG_ASSERT(!is_write ||
-                write_to_some_transactional_table ||
-                write_to_some_non_transactional_table);
+    assert(!is_write ||
+           write_to_some_transactional_table ||
+           write_to_some_non_transactional_table);
     /*
       write_all_non_transactional_are_tmp_tables may be true if any
       non-transactional table was not updated, so we fix its value here.
@@ -10554,6 +11070,11 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         !get_transaction()->xid_state()->has_state(XID_STATE::XA_NOTR))
       lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_XA);
 
+    DBUG_EXECUTE_IF("make_stmt_only_engines",
+                    {
+                      flags_write_all_set= HA_BINLOG_STMT_CAPABLE;
+                    };);
+
     /* both statement-only and row-only engines involved */
     if ((flags_write_all_set & (HA_BINLOG_STMT_CAPABLE | HA_BINLOG_ROW_CAPABLE)) == 0)
     {
@@ -10583,7 +11104,8 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         */
         my_error((error= ER_BINLOG_ROW_MODE_AND_STMT_ENGINE), MYF(0));
       }
-      else if ((unsafe_flags= lex->get_stmt_unsafe_flags()) != 0)
+      else if (variables.binlog_format == BINLOG_FORMAT_MIXED &&
+          ((unsafe_flags= lex->get_stmt_unsafe_flags()) != 0))
       {
         /*
           3. Error: Cannot execute statement: binlogging of unsafe
@@ -10597,6 +11119,19 @@ int THD::decide_logging_format(TABLE_LIST *tables)
             my_error((error= ER_BINLOG_UNSAFE_AND_STMT_ENGINE), MYF(0),
                      ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));
       }
+      else if (is_write && ((unsafe_flags= lex->get_stmt_unsafe_flags()) != 0))
+      {
+        /*
+          7. Warning: Unsafe statement logged as statement due to
+             binlog_format = STATEMENT
+        */
+        binlog_unsafe_warning_flags|= unsafe_flags;
+        DBUG_PRINT("info", ("Scheduling warning to be issued by "
+                            "binlog_query: '%s'",
+                            ER(ER_BINLOG_UNSAFE_STATEMENT)));
+        DBUG_PRINT("info", ("binlog_unsafe_warning_flags: 0x%x",
+                            binlog_unsafe_warning_flags));
+      }
       /* log in statement format! */
     }
     /* no statement-only engines */
@@ -10644,7 +11179,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         if (lex->is_stmt_unsafe() || lex->is_stmt_row_injection()
             || (flags_write_all_set & HA_BINLOG_STMT_CAPABLE) == 0)
         {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           int flags= lex->get_stmt_unsafe_flags();
           DBUG_PRINT("info", ("setting row format for unsafe statement"));
           for (int i= 0; i < Query_tables_list::BINLOG_STMT_UNSAFE_COUNT; i++)
@@ -10713,7 +11248,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         if (table->is_placeholder())
           continue;
 
-        DBUG_ASSERT(table->table);
+        assert(table->table);
 
         if (table->table->file->referenced_by_foreign_key())
         {
@@ -10868,7 +11403,7 @@ static bool handle_gtid_consistency_violation(THD *thd, int error_code)
         gtid_state->begin_automatic_gtid_violating_transaction();
       else
       {
-        DBUG_ASSERT(gtid_next_type == ANONYMOUS_GROUP);
+        assert(gtid_next_type == ANONYMOUS_GROUP);
         gtid_state->begin_anonymous_gtid_violating_transaction();
       }
 
@@ -11130,7 +11665,7 @@ namespace {
     Row_data_memory(TABLE *table, size_t const len1)
       : m_memory(0)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       m_alloc_checked= FALSE;
 #endif
       allocate_memory(table, len1);
@@ -11141,7 +11676,7 @@ namespace {
     Row_data_memory(TABLE *table, size_t const len1, size_t const len2)
       : m_memory(0)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       m_alloc_checked= FALSE;
 #endif
       allocate_memory(table, len1 + len2);
@@ -11162,7 +11697,7 @@ namespace {
        @retval false Memory allocation failed
      */
     bool has_memory() const {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       m_alloc_checked= TRUE;
 #endif
       return m_memory != 0;
@@ -11170,9 +11705,9 @@ namespace {
 
     uchar *slot(uint s)
     {
-      DBUG_ASSERT(s < sizeof(m_ptr)/sizeof(*m_ptr));
-      DBUG_ASSERT(m_ptr[s] != 0);
-      DBUG_ASSERT(m_alloc_checked == TRUE);
+      assert(s < sizeof(m_ptr)/sizeof(*m_ptr));
+      assert(m_ptr[s] != 0);
+      assert(m_alloc_checked == TRUE);
       return m_ptr[s];
     }
 
@@ -11212,7 +11747,7 @@ namespace {
       }
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     mutable bool m_alloc_checked;
 #endif
     bool m_release_memory_on_destruction;
@@ -11226,7 +11761,7 @@ int THD::binlog_write_row(TABLE* table, bool is_trans,
                           uchar const *record,
                           const uchar* extra_row_info)
 { 
-  DBUG_ASSERT(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
+  assert(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
 
   /*
     Pack records into format for transfer. We are allocating more
@@ -11256,7 +11791,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
                            const uchar *after_record,
                            const uchar* extra_row_info)
 { 
-  DBUG_ASSERT(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
+  assert(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
   int error= 0;
 
   /**
@@ -11318,7 +11853,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
                            uchar const *record,
                            const uchar* extra_row_info)
 { 
-  DBUG_ASSERT(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
+  assert(is_current_stmt_binlog_format_row() && mysql_bin_log.is_open());
   int error= 0;
 
   /**
@@ -11390,9 +11925,9 @@ void THD::binlog_prepare_row_images(TABLE *table)
       Just to be sure that tmp_set is currently not in use as
       the read_set already.
     */
-    DBUG_ASSERT(table->read_set != &table->tmp_set);
+    assert(table->read_set != &table->tmp_set);
     // Verify it's not used
-    DBUG_ASSERT(bitmap_is_clear_all(&table->tmp_set));
+    assert(bitmap_is_clear_all(&table->tmp_set));
 
     switch(thd->variables.binlog_row_image)
     {
@@ -11416,7 +11951,7 @@ void THD::binlog_prepare_row_images(TABLE *table)
         }
         break;
       default:
-        DBUG_ASSERT(0); // impossible.
+        assert(0); // impossible.
     }
 
     /* set the temporary read_set */
@@ -11493,7 +12028,7 @@ THD::binlog_row_event_extra_data_eq(const uchar* a,
                    a[EXTRA_ROW_INFO_LEN_OFFSET]) == 0)));
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 static const char *
 show_query_type(THD::enum_binlog_query_type qtype)
 {
@@ -11504,7 +12039,7 @@ show_query_type(THD::enum_binlog_query_type qtype)
     return "STMT";
   case THD::QUERY_TYPE_COUNT:
   default:
-    DBUG_ASSERT(0 <= qtype && qtype < THD::QUERY_TYPE_COUNT);
+    assert(0 <= qtype && qtype < THD::QUERY_TYPE_COUNT);
   }
   static char buf[64];
   sprintf(buf, "UNKNOWN#%d", qtype);
@@ -11554,7 +12089,7 @@ static void do_unsafe_limit_checkout(char* buf, int unsafe_type, const char* que
 {
   ulonglong now;
   DBUG_ENTER("do_unsafe_limit_checkout");
-  DBUG_ASSERT(unsafe_type == LEX::BINLOG_STMT_UNSAFE_LIMIT);
+  assert(unsafe_type == LEX::BINLOG_STMT_UNSAFE_LIMIT);
   limit_unsafe_warning_count++;
   /*
     INITIALIZING:
@@ -11643,8 +12178,8 @@ void THD::issue_unsafe_warnings()
     Ensure that binlog_unsafe_warning_flags is big enough to hold all
     bits.  This is actually a constant expression.
   */
-  DBUG_ASSERT(LEX::BINLOG_STMT_UNSAFE_COUNT <=
-              sizeof(binlog_unsafe_warning_flags) * CHAR_BIT);
+  assert(LEX::BINLOG_STMT_UNSAFE_COUNT <=
+         sizeof(binlog_unsafe_warning_flags) * CHAR_BIT);
 
   uint32 unsafe_type_flags= binlog_unsafe_warning_flags;
 
@@ -11674,83 +12209,6 @@ void THD::issue_unsafe_warnings()
   DBUG_VOID_RETURN;
 }
 
-Logical_clock::Logical_clock()
-  : state(SEQ_UNINIT), offset(0)
-{}
-
-/**
-  Atomically fetch the current state.
-  @parms: None
-  @return  not subtracted "absolute" value.
- */
-inline int64 Logical_clock::get_timestamp()
-{
-  int64 retval= 0;
-  DBUG_ENTER("Logical_clock::get_timestamp");
-  retval= my_atomic_load64(&state);
-  DBUG_RETURN(retval);
-}
-
-/**
-  Steps the absolute value of the clock (state) to return
-  an updated value.
-  The caller must be sure to call the method in no concurrent
-  execution context so either offset and state can't change.
-
-  @return  incremented "absolute" value
- */
-inline int64 Logical_clock::step()
-{
-  compile_time_assert(SEQ_UNINIT == 0);
-  DBUG_EXECUTE_IF("logical_clock_step_2", ++state;);
-  return ++state;
-}
-
-/**
-  To try setting the clock *forward*.
-  The clock does not change when the new value is in the past
-  which is reflected by the new value and by offset.
-  In other words the function main effects is described as
-    state= max(state, new_value).
-  Offset that exceeds the new value indicates the binary log rotation
-  to render such new value useless.
-
-  @param  new_val  a new value (offset included)
-  @return a (new) value of state member regardless whether it's changed or not.
- */
-inline int64 Logical_clock::set_if_greater(int64 new_val)
-{
-  longlong old_val= new_val - 1;
-  bool cas_rc;
-
-  DBUG_ENTER("Logical_clock::set_if_greater");
-
-  DBUG_ASSERT(new_val > 0);
-
-  if (new_val <= offset)
-  {
-    /*
-      This function's invocation can be separated from the
-      transaction's flushing by few rotations. A late to log
-      transaction does not change the clock, similarly to how
-      its timestamps are handled at flushing.
-    */
-    DBUG_RETURN(SEQ_UNINIT);
-  }
-
-  DBUG_ASSERT(new_val > 0);
-
-  while (!(cas_rc= my_atomic_cas64(&state, &old_val, new_val)) &&
-         old_val < new_val)
-  {}
-
-  DBUG_ASSERT(state >= new_val); // setting can't be done to past
-
-  DBUG_ASSERT(cas_rc || old_val >= new_val);
-
-  DBUG_RETURN(cas_rc ? new_val : old_val);
-}
-
 /**
   Log the current query.
 
@@ -11783,7 +12241,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, const char *query_arg,
   DBUG_ENTER("THD::binlog_query");
   DBUG_PRINT("enter", ("qtype: %s  query: '%s'",
                        show_query_type(qtype), query_arg));
-  DBUG_ASSERT(query_arg && mysql_bin_log.is_open());
+  assert(query_arg && mysql_bin_log.is_open());
 
   if (get_binlog_local_stmt_filter() == BINLOG_FILTER_SET)
   {
@@ -11881,7 +12339,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, const char *query_arg,
 
   case THD::QUERY_TYPE_COUNT:
   default:
-    DBUG_ASSERT(0 <= qtype && qtype < QUERY_TYPE_COUNT);
+    assert(0 <= qtype && qtype < QUERY_TYPE_COUNT);
   }
   DBUG_RETURN(0);
 }
diff --git a/sql/binlog.h b/sql/binlog.h
index 01236b2dd42c..58f93fc457bd 100644
--- a/sql/binlog.h
+++ b/sql/binlog.h
@@ -1,14 +1,21 @@
 #ifndef BINLOG_H_INCLUDED
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -24,6 +31,8 @@
 #include "tc_log.h"                    // TC_LOG
 #include "atomic_class.h"
 #include "rpl_gtid.h"                  // Gtid_set, Sid_map
+#include "rpl_trx_tracking.h"
+
 
 class Relay_log_info;
 class Master_info;
@@ -39,45 +48,6 @@ struct Gtid;
 
 typedef int64 query_id_t;
 
-/**
-  Logical timestamp generator for logical timestamping binlog transactions.
-  A transaction is associated with two sequence numbers see
-  @c Transaction_ctx::last_committed and @c Transaction_ctx::sequence_number.
-  The class provides necessary interfaces including that of
-  generating a next consecutive value for the latter.
-*/
-class  Logical_clock
-{
-private:
-  int64 state;
-  /*
-    Offset is subtracted from the actual "absolute time" value at
-    logging a replication event. That is the event holds logical
-    timestamps in the "relative" format. They are meaningful only in
-    the context of the current binlog.
-    The member is updated (incremented) per binary log rotation.
-  */
-  int64 offset;
-public:
-  Logical_clock();
-  int64 step();
-  int64 set_if_greater(int64 new_val);
-  int64 get_timestamp();
-  int64 get_offset() { return offset; }
-  /*
-    Updates the offset.
-    This operation is invoked when binlog rotates and at that time
-    there can't any concurrent step() callers so no need to guard
-    the assignement.
-  */
-  void update_offset(int64 new_offset)
-  {
-    DBUG_ASSERT(offset <= new_offset);
-
-    offset= new_offset;
-  }
-  ~Logical_clock() { }
-};
 
 /**
   Class for maintaining the commit stages for binary log group commit.
@@ -190,8 +160,8 @@ class Stage_manager {
   {
     mysql_mutex_init(key_LOCK_done, &m_lock_done, MY_MUTEX_INIT_FAST);
     mysql_cond_init(key_COND_done, &m_cond_done);
-#ifndef DBUG_OFF
-    /* reuse key_COND_done 'cos a new PSI object would be wasteful in !DBUG_OFF */
+#ifndef NDEBUG
+    /* reuse key_COND_done 'cos a new PSI object would be wasteful in !NDEBUG */
     mysql_cond_init(key_COND_done, &m_cond_preempt);
 #endif
     m_queue[FLUSH_STAGE].init(
@@ -248,7 +218,7 @@ class Stage_manager {
     return m_queue[stage].pop_front();
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      The method ensures the follower's execution path can be preempted
      by the leader's thread.
@@ -283,7 +253,7 @@ class Stage_manager {
                     session is waiting on
     @param stage    which stage queue size to compare count against.
    */
-  void wait_count_or_timeout(ulong count, ulong usec, StageID stage);
+  void wait_count_or_timeout(ulong count, long usec, StageID stage);
 
   void signal_done(THD *queue);
 
@@ -302,7 +272,7 @@ class Stage_manager {
 
   /** Mutex used for the condition variable above */
   mysql_mutex_t m_lock_done;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /** Flag is set by Leader when it starts waiting for follower's all-clear */
   bool leader_await_preempt_status;
 
@@ -591,11 +561,8 @@ class MYSQL_BIN_LOG: public TC_LOG
 #endif
 
 public:
-  /* Committed transactions timestamp */
-   Logical_clock max_committed_transaction;
-  /* "Prepared" transactions timestamp */
-   Logical_clock transaction_counter;
-  void update_max_committed(THD *thd);
+  /** Manage the MTS dependency tracking */
+  Transaction_dependency_tracker m_dependency_tracker;
 
   /**
     Find the oldest binary log that contains any GTID that
@@ -611,8 +578,7 @@ class MYSQL_BIN_LOG: public TC_LOG
   */
   bool find_first_log_not_in_gtid_set(char *binlog_file_name,
                                       const Gtid_set *gtid_set,
-                                      Gtid *first_gtid,
-                                      const char **errmsg);
+                                      Gtid *first_gtid, std::string &errmsg);
 
   /**
     Reads the set of all GTIDs in the binary/relay log, and the set
@@ -647,7 +613,7 @@ class MYSQL_BIN_LOG: public TC_LOG
 
   void set_previous_gtid_set_relaylog(Gtid_set *previous_gtid_set_param)
   {
-    DBUG_ASSERT(is_relay_log);
+    assert(is_relay_log);
     previous_gtid_set_relaylog= previous_gtid_set_param;
   }
   /**
@@ -705,7 +671,8 @@ class MYSQL_BIN_LOG: public TC_LOG
   int process_flush_stage_queue(my_off_t *total_bytes_var, bool *rotate_var,
                                 THD **out_queue_var);
   int ordered_commit(THD *thd, bool all, bool skip_commit = false);
-  void handle_binlog_flush_or_sync_error(THD *thd, bool need_lock_log);
+  void handle_binlog_flush_or_sync_error(THD *thd, bool need_lock_log,
+                                         const char *message);
 public:
   int open_binlog(const char *opt_name);
   void close();
@@ -730,18 +697,7 @@ class MYSQL_BIN_LOG: public TC_LOG
   {
     bytes_written = 0;
   }
-  void harvest_bytes_written(ulonglong* counter)
-  {
-#ifndef DBUG_OFF
-    char buf1[22],buf2[22];
-#endif
-    DBUG_ENTER("harvest_bytes_written");
-    (*counter)+=bytes_written;
-    DBUG_PRINT("info",("counter: %s  bytes_written: %s", llstr(*counter,buf1),
-		       llstr(bytes_written,buf2)));
-    bytes_written=0;
-    DBUG_VOID_RETURN;
-  }
+  void harvest_bytes_written(Relay_log_info *rli, bool need_log_space_lock);
   void set_max_size(ulong max_size_arg);
   void signal_update()
   {
@@ -768,10 +724,10 @@ class MYSQL_BIN_LOG: public TC_LOG
     }
   }
 
-  void update_binlog_end_pos(my_off_t pos)
+  void update_binlog_end_pos(const char *file, my_off_t pos)
   {
     lock_binlog_end_pos();
-    if (pos > binlog_end_pos)
+    if (is_active(file) && pos > binlog_end_pos)
       binlog_end_pos= pos;
     signal_update();
     unlock_binlog_end_pos();
@@ -829,16 +785,18 @@ class MYSQL_BIN_LOG: public TC_LOG
      Gtid_log_event and BEGIN, COMMIT automatically.
 
      It is aimed to handle cases of "background" logging where a statement is
-     logged indirectly, like "DELETE FROM a_memory_table". So don't use it on any
+     logged indirectly, like "TRUNCATE TABLE a_memory_table". So don't use it on any
      normal statement.
 
      @param[IN] thd  the THD object of current thread.
-     @param[IN] stmt the DELETE statement.
-     @param[IN] stmt_len the length of DELETE statement.
+     @param[IN] stmt the DML statement.
+     @param[IN] stmt_len the length of the DML statement.
+     @param[IN] sql_command the type of SQL command.
 
      @return Returns false if succeeds, otherwise true is returned.
   */
-  bool write_dml_directly(THD* thd, const char *stmt, size_t stmt_len);
+  bool write_stmt_directly(THD* thd, const char *stmt, size_t stmt_len,
+                          enum enum_sql_command sql_command);
 
   void set_write_error(THD *thd, bool is_transactional);
   bool check_write_error(THD *thd);
@@ -927,6 +885,55 @@ class MYSQL_BIN_LOG: public TC_LOG
   inline IO_CACHE *get_index_file() { return &index_file;}
   inline uint32 get_open_count() { return open_count; }
 
+  /**
+    Function to report the missing GTIDs.
+
+    This function logs the missing transactions on master to its error log
+    as a warning. If the missing GTIDs are too long to print in a message,
+    it suggests the steps to extract the missing transactions.
+
+    This function also informs slave about the GTID set sent by the slave,
+    transactions missing on the master and few suggestions to recover from
+    the error. This message shall be wrapped by
+    ER_MASTER_FATAL_ERROR_READING_BINLOG on slave and will be logged as an
+    error.
+
+    This function will be called from mysql_binlog_send() function.
+
+    @param slave_executed_gtid_set     GTID set executed by slave
+    @param errmsg                      Pointer to the error message
+
+    @return void
+  */
+  void report_missing_purged_gtids(const Gtid_set *slave_executed_gtid_set,
+                                   std::string &errmsg);
+
+  /**
+    Function to report the missing GTIDs.
+
+    This function logs the missing transactions on master to its error log
+    as a warning. If the missing GTIDs are too long to print in a message,
+    it suggests the steps to extract the missing transactions.
+
+    This function also informs slave about the GTID set sent by the slave,
+    transactions missing on the master and few suggestions to recover from
+    the error. This message shall be wrapped by
+    ER_MASTER_FATAL_ERROR_READING_BINLOG on slave and will be logged as an
+    error.
+
+    This function will be called from find_first_log_not_in_gtid_set()
+    function.
+
+    @param previous_gtid_set           Previous GTID set found
+    @param slave_executed_gtid_set     GTID set executed by slave
+    @param errmsg                      Pointer to the error message
+
+    @return void
+  */
+  void report_missing_gtids(const Gtid_set *previous_gtid_set,
+                            const Gtid_set *slave_executed_gtid_set,
+                            std::string &errmsg);
+  static const int MAX_RETRIES_FOR_DELETE_RENAME_FAILURE= 5;
   /*
     It is called by the threads(e.g. dump thread) which want to read
     hot log without LOCK_log protection.
@@ -973,8 +980,49 @@ typedef struct st_load_file_info
 
 extern MYSQL_PLUGIN_IMPORT MYSQL_BIN_LOG mysql_bin_log;
 
+/**
+  Check if the the transaction is empty.
+
+  @param thd The client thread that executed the current statement.
+
+  @retval true No changes found in any storage engine
+  @retval false Otherwise.
+
+**/
+bool is_transaction_empty(THD* thd);
+/**
+  Check if the transaction has no rw flag set for any of the storage engines.
+
+  @param thd The client thread that executed the current statement.
+  @param trx_scope The transaction scope to look into.
+
+  @retval the number of engines which have actual changes.
+ */
+int check_trx_rw_engines(THD *thd, Transaction_ctx::enum_trx_scope trx_scope);
+
+/**
+  Check if at least one of transacaction and statement binlog caches contains
+  an empty transaction, other one is empty or contains an empty transaction,
+  which has two binlog events "BEGIN" and "COMMIT".
+
+  @param thd The client thread that executed the current statement.
+
+  @retval true  At least one of transacaction and statement binlog caches
+                contains an empty transaction, other one is empty or
+                contains an empty transaction.
+  @retval false Otherwise.
+*/
+bool is_empty_transaction_in_binlog_cache(const THD* thd);
 bool trans_has_updated_trans_table(const THD* thd);
 bool stmt_has_updated_trans_table(Ha_trx_info* ha_list);
+/**
+  This function checks if the transaction has no operation dml.
+
+  @param ha_list Registered storage engine handler list.
+  @return true  if the transaction has no operation dml.
+          false otherwise.
+*/
+bool trans_has_noop_dml(Ha_trx_info* ha_list);
 bool ending_trans(THD* thd, const bool all);
 bool ending_single_stmt_trans(THD* thd, const bool all);
 bool trans_cannot_safely_rollback(const THD* thd);
@@ -1026,7 +1074,7 @@ inline bool normalize_binlog_name(char *to, const char *from, bool is_relay_log)
   char *ptr= (char*) from;
   char *opt_name= is_relay_log ? opt_relay_logname : opt_bin_logname;
 
-  DBUG_ASSERT(from);
+  assert(from);
 
   /* opt_name is not null and not empty and from is a relative path */
   if (opt_name && opt_name[0] && from && !test_if_hard_path(from))
@@ -1054,7 +1102,7 @@ inline bool normalize_binlog_name(char *to, const char *from, bool is_relay_log)
     }
   }
 
-  DBUG_ASSERT(ptr);
+  assert(ptr);
   if (ptr)
   {
     size_t length= strlen(ptr);
diff --git a/sql/bootstrap.cc b/sql/bootstrap.cc
index 24fb64954f69..f8212c3cac69 100644
--- a/sql/bootstrap.cc
+++ b/sql/bootstrap.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -179,7 +186,7 @@ static void handle_bootstrap_impl(THD *thd)
         thd->variables.option_bits|= OPTION_BIN_LOG;
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
     }
@@ -217,7 +224,7 @@ static void handle_bootstrap_impl(THD *thd)
         break;
 
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
 
@@ -264,7 +271,6 @@ static void handle_bootstrap_impl(THD *thd)
       break;
 
     free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
-    thd->get_transaction()->free_memory(MYF(MY_KEEP_PREALLOC));
 
     /*
       If the last statement has enabled the session binary logging while
diff --git a/sql/bootstrap.h b/sql/bootstrap.h
index 22b89f0557d7..54437c20f724 100644
--- a/sql/bootstrap.h
+++ b/sql/bootstrap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/bootstrap_impl.h b/sql/bootstrap_impl.h
index 4a828eb15080..c5f3233d50e8 100644
--- a/sql/bootstrap_impl.h
+++ b/sql/bootstrap_impl.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/bounded_queue.h b/sql/bounded_queue.h
index 0c0f534702ac..bd3caa545563 100644
--- a/sql/bounded_queue.h
+++ b/sql/bounded_queue.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/client_settings.h b/sql/client_settings.h
index 43774a1c1de7..7d71c8f6109b 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -1,14 +1,26 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
diff --git a/sql/command_service.cc b/sql/command_service.cc
index 7e691ae7da0c..b0ce5e4945a4 100644
--- a/sql/command_service.cc
+++ b/sql/command_service.cc
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/channel_info.cc b/sql/conn_handler/channel_info.cc
index 063ebd36c853..6238ad3adae0 100644
--- a/sql/conn_handler/channel_info.cc
+++ b/sql/conn_handler/channel_info.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -46,7 +53,7 @@ void Channel_info::send_error_and_close_channel(uint errorcode,
                                                 int error,
                                                 bool senderror)
 {
-  DBUG_ASSERT(errorcode != 0);
+  assert(errorcode != 0);
   if (!errorcode)
     return;
 
diff --git a/sql/conn_handler/channel_info.h b/sql/conn_handler/channel_info.h
index a5d2bcc33448..21cacf45b4be 100644
--- a/sql/conn_handler/channel_info.h
+++ b/sql/conn_handler/channel_info.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/connection_acceptor.h b/sql/conn_handler/connection_acceptor.h
index 2199172b966e..083a1bd89c3f 100644
--- a/sql/conn_handler/connection_acceptor.h
+++ b/sql/conn_handler/connection_acceptor.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/connection_handler.h b/sql/conn_handler/connection_handler.h
index 5d7b6bf1e23b..f644848fecdc 100644
--- a/sql/conn_handler/connection_handler.h
+++ b/sql/conn_handler/connection_handler.h
@@ -1,16 +1,23 @@
 #ifndef CONNECTION_HANDLER_INCLUDED
 #define CONNECTION_HANDLER_INCLUDED
 
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/conn_handler/connection_handler_impl.h b/sql/conn_handler/connection_handler_impl.h
index a337cb170f3e..abd6291f38de 100644
--- a/sql/conn_handler/connection_handler_impl.h
+++ b/sql/conn_handler/connection_handler_impl.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/connection_handler_manager.cc b/sql/conn_handler/connection_handler_manager.cc
index 41ff79d35806..a633b6396418 100644
--- a/sql/conn_handler/connection_handler_manager.cc
+++ b/sql/conn_handler/connection_handler_manager.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -153,7 +160,7 @@ bool Connection_handler_manager::init()
     connection_handler= new (std::nothrow) One_thread_connection_handler();
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
   if (connection_handler == NULL)
@@ -230,8 +237,8 @@ void Connection_handler_manager::load_connection_handler(
                                 Connection_handler* conn_handler)
 {
   // We don't support loading more than one dynamic connection handler
-  DBUG_ASSERT(Connection_handler_manager::thread_handling !=
-              SCHEDULER_TYPES_COUNT);
+  assert(Connection_handler_manager::thread_handling !=
+         SCHEDULER_TYPES_COUNT);
   m_saved_connection_handler= m_connection_handler;
   m_saved_thread_handling= Connection_handler_manager::thread_handling;
   m_connection_handler= conn_handler;
@@ -242,7 +249,7 @@ void Connection_handler_manager::load_connection_handler(
 
 bool Connection_handler_manager::unload_connection_handler()
 {
-  DBUG_ASSERT(m_saved_connection_handler != NULL);
+  assert(m_saved_connection_handler != NULL);
   if (m_saved_connection_handler == NULL)
     return true;
   delete m_connection_handler;
@@ -293,6 +300,11 @@ void dec_connection_count()
 {
   Connection_handler_manager::dec_connection_count();
 }
+
+void increment_aborted_connects()
+{
+  Connection_handler_manager::get_instance()->inc_aborted_connects();
+}
 #endif // !EMBEDDED_LIBRARY
 
 
@@ -301,7 +313,7 @@ extern "C"
 int my_connection_handler_set(Connection_handler_functions *chf,
                               THD_event_functions *tef)
 {
-  DBUG_ASSERT(chf != NULL && tef != NULL);
+  assert(chf != NULL && tef != NULL);
   if (chf == NULL || tef == NULL)
     return 1;
 
diff --git a/sql/conn_handler/connection_handler_manager.h b/sql/conn_handler/connection_handler_manager.h
index 36904d8ecd16..2cc55ceebd0d 100644
--- a/sql/conn_handler/connection_handler_manager.h
+++ b/sql/conn_handler/connection_handler_manager.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -131,7 +138,7 @@ class Connection_handler_manager
   */
   static Connection_handler_manager* get_instance()
   {
-    DBUG_ASSERT(m_instance != NULL);
+    assert(m_instance != NULL);
     return m_instance;
   }
 
diff --git a/sql/conn_handler/connection_handler_one_thread.cc b/sql/conn_handler/connection_handler_one_thread.cc
index aa1111c8f7e7..56fd5156a935 100644
--- a/sql/conn_handler/connection_handler_one_thread.cc
+++ b/sql/conn_handler/connection_handler_one_thread.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/connection_handler_per_thread.cc b/sql/conn_handler/connection_handler_per_thread.cc
index 532873a34c58..3d8c86f9bea5 100644
--- a/sql/conn_handler/connection_handler_per_thread.cc
+++ b/sql/conn_handler/connection_handler_per_thread.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -96,7 +103,7 @@ void Per_thread_connection_handler::init()
   mysql_cond_init(key_COND_thread_cache, &COND_thread_cache);
   mysql_cond_init(key_COND_flush_thread_cache, &COND_flush_thread_cache);
   waiting_channel_info_list= new (std::nothrow) std::list<Channel_info*>;
-  DBUG_ASSERT(waiting_channel_info_list != NULL);
+  assert(waiting_channel_info_list != NULL);
 }
 
 
@@ -137,7 +144,7 @@ Channel_info* Per_thread_connection_handler::block_until_new_connection()
       before picking another session in the thread cache.
     */
     DBUG_POP();
-    DBUG_ASSERT( ! _db_is_pushed_());
+    assert( ! _db_is_pushed_());
 
     // Block pthread
     blocked_pthread_count++;
@@ -147,13 +154,19 @@ Channel_info* Per_thread_connection_handler::block_until_new_connection()
 
     if (kill_blocked_pthreads_flag)
       mysql_cond_signal(&COND_flush_thread_cache);
-    else if (!abort_loop && wake_pthread)
+    else if (wake_pthread)
     {
       wake_pthread--;
-      DBUG_ASSERT(!waiting_channel_info_list->empty());
-      new_conn= waiting_channel_info_list->front();
-      waiting_channel_info_list->pop_front();
-      DBUG_PRINT("info", ("waiting_channel_info_list->pop %p", new_conn));
+      if (!waiting_channel_info_list->empty())
+      {
+        new_conn = waiting_channel_info_list->front();
+        waiting_channel_info_list->pop_front();
+        DBUG_PRINT("info", ("waiting_channel_info_list->pop %p", new_conn));
+      }
+      else
+      {
+        assert(0);
+      }
     }
   }
   mysql_mutex_unlock(&LOCK_thread_cache);
@@ -308,7 +321,9 @@ extern "C" void *handle_connection(void *arg)
     thd->release_resources();
 
     // Clean up errors now, before possibly waiting for a new connection.
-    ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
     thd_manager->remove_thd(thd);
     Connection_handler_manager::dec_connection_count();
@@ -330,6 +345,15 @@ extern "C" void *handle_connection(void *arg)
     if (channel_info == NULL)
       break;
     pthread_reused= true;
+    if (abort_loop)
+    {
+      // Close the channel and exit as server is undergoing shutdown.
+      channel_info->send_error_and_close_channel(ER_SERVER_SHUTDOWN, 0, false);
+      delete channel_info;
+      channel_info = NULL;
+      Connection_handler_manager::dec_connection_count();
+      break;
+    }
   }
 
   my_thread_end();
@@ -348,16 +372,6 @@ void Per_thread_connection_handler::kill_blocked_pthreads()
     mysql_cond_wait(&COND_flush_thread_cache, &LOCK_thread_cache);
   }
   kill_blocked_pthreads_flag--;
-
-  // Drain off the channel info list.
-  while (!waiting_channel_info_list->empty())
-  {
-    Channel_info* channel_info= waiting_channel_info_list->front();
-    waiting_channel_info_list->pop_front();
-    // close the channel.
-    channel_info->send_error_and_close_channel(ER_SERVER_SHUTDOWN, 0, false);
-    delete channel_info;
-  }
   mysql_mutex_unlock(&LOCK_thread_cache);
 }
 
@@ -404,9 +418,9 @@ bool Per_thread_connection_handler::add_connection(Channel_info* channel_info)
                              &connection_attrib,
                              handle_connection,
                              (void*) channel_info);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 handle_error:
-#endif // !DBUG_OFF
+#endif // !NDEBUG
 
   if (error)
   {
diff --git a/sql/conn_handler/init_net_server_extension.cc b/sql/conn_handler/init_net_server_extension.cc
new file mode 100644
index 000000000000..03c1bef020e2
--- /dev/null
+++ b/sql/conn_handler/init_net_server_extension.cc
@@ -0,0 +1,117 @@
+/*
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "init_net_server_extension.h"
+
+#include "violite.h"                    // Vio
+#include "channel_info.h"               // Channel_info
+#include "connection_handler_manager.h" // Connection_handler_manager
+#include "mysqld.h"                     // key_socket_tcpip
+#include "log.h"                        // sql_print_error
+#include "sql_class.h"                  // THD
+
+#include <pfs_idle_provider.h>
+#include <mysql/psi/mysql_idle.h>
+
+#ifdef HAVE_PSI_STATEMENT_INTERFACE
+extern PSI_statement_info stmt_info_new_packet;
+#endif
+
+static void net_before_header_psi(struct st_net *net, void *user_data,
+                                  size_t /* unused: count */) {
+  THD *thd;
+  thd = static_cast<THD *>(user_data);
+  assert(thd != NULL);
+
+  if (thd->m_server_idle) {
+    /*
+      The server is IDLE, waiting for the next command.
+      Technically, it is a wait on a socket, which may take a long time,
+      because the call is blocking.
+      Disable the socket instrumentation, to avoid recording a SOCKET event.
+      Instead, start explicitly an IDLE event.
+    */
+    MYSQL_SOCKET_SET_STATE(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
+    MYSQL_START_IDLE_WAIT(thd->m_idle_psi, &thd->m_idle_state);
+  }
+}
+
+static void net_after_header_psi(struct st_net *net, void *user_data,
+                                 size_t /* unused: count */, my_bool rc) {
+  THD *thd;
+  thd = static_cast<THD *>(user_data);
+  assert(thd != NULL);
+
+  if (thd->m_server_idle) {
+    /*
+      The server just got data for a network packet header,
+      from the network layer.
+      The IDLE event is now complete, since we now have a message to process.
+      We need to:
+      - start a new STATEMENT event
+      - start a new STAGE event, within this statement,
+      - start recording SOCKET WAITS events, within this stage.
+      The proper order is critical to get events numbered correctly,
+      and nested in the proper parent.
+    */
+    MYSQL_END_IDLE_WAIT(thd->m_idle_psi);
+
+    if (!rc) {
+      assert(thd->m_statement_psi == NULL);
+      thd->m_statement_psi = MYSQL_START_STATEMENT(
+          &thd->m_statement_state, stmt_info_new_packet.m_key, thd->db().str,
+          thd->db().length, thd->charset(), NULL);
+
+      /*
+        Starts a new stage in performance schema, if compiled in and enabled.
+        Also sets THD::proc_info (used by SHOW PROCESSLIST, column STATE)
+      */
+      THD_STAGE_INFO(thd, stage_starting);
+    }
+
+    /*
+      TODO: consider recording a SOCKET event for the bytes just read,
+      by also passing count here.
+    */
+    MYSQL_SOCKET_SET_STATE(net->vio->mysql_socket, PSI_SOCKET_STATE_ACTIVE);
+    thd->m_server_idle = false;
+  }
+}
+
+void init_net_server_extension(THD *thd) {
+  /* Start with a clean state for connection events. */
+  thd->m_idle_psi = NULL;
+  thd->m_statement_psi = NULL;
+  thd->m_server_idle = false;
+
+  /* Hook up the NET_SERVER callback in the net layer. */
+  thd->m_net_server_extension.m_user_data = thd;
+  thd->m_net_server_extension.m_before_header = net_before_header_psi;
+  thd->m_net_server_extension.m_after_header = net_after_header_psi;
+  thd->m_net_server_extension.timeout_on_full_packet = FALSE;
+
+  /* Activate this private extension for the mysqld server. */
+  thd->get_protocol_classic()->get_net()->extension =
+      &thd->m_net_server_extension;
+}
diff --git a/sql/conn_handler/init_net_server_extension.h b/sql/conn_handler/init_net_server_extension.h
new file mode 100644
index 000000000000..32f19682bb81
--- /dev/null
+++ b/sql/conn_handler/init_net_server_extension.h
@@ -0,0 +1,32 @@
+/*
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef INIT_NET_SERVER_EXTENSION_INCLUDED
+#define INIT_NET_SERVER_EXTENSION_INCLUDED
+
+class THD;
+
+void init_net_server_extension(THD *thd);
+
+#endif
diff --git a/sql/conn_handler/named_pipe_connection.cc b/sql/conn_handler/named_pipe_connection.cc
index 6900a51f6fdd..dca9b16b736c 100644
--- a/sql/conn_handler/named_pipe_connection.cc
+++ b/sql/conn_handler/named_pipe_connection.cc
@@ -1,22 +1,31 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "init_net_server_extension.h"
 #include "named_pipe_connection.h"
 
+#include <AclAPI.h>                     // Windows access control API
 #include "violite.h"                    // Vio
 #include "channel_info.h"               // Channel_info
 #include "connection_handler_manager.h" // Connection_handler_manager
@@ -58,8 +67,10 @@ class Channel_info_named_pipe : public Channel_info
   {
     THD* thd= Channel_info::create_thd();
 
-    if (thd != NULL)
-      thd->security_context()->set_host_ptr(my_localhost, strlen(my_localhost));
+    if (thd != NULL) {
+        init_net_server_extension(thd);
+        thd->security_context()->set_host_ptr(my_localhost, strlen(my_localhost));
+    }
     return thd;
   }
 
@@ -88,10 +99,10 @@ bool Named_pipe_listener::setup_listener()
     return true;
   }
 
-  m_pipe_handle= create_server_named_pipe(&m_sa_pipe_security, &m_sd_pipe_descriptor,
-                                          global_system_variables.net_buffer_length,
-                                          m_pipe_name.c_str(),m_pipe_path_name,
-                                          sizeof(m_pipe_path_name));
+  m_pipe_handle= create_server_named_pipe(
+    &mp_sa_pipe_security, global_system_variables.net_buffer_length,
+    m_pipe_name.c_str(), m_pipe_path_name, sizeof(m_pipe_path_name),
+    named_pipe_full_access_group);
   if (m_pipe_handle == INVALID_HANDLE_VALUE)
     return true;
 
@@ -101,6 +112,8 @@ bool Named_pipe_listener::setup_listener()
 
 Channel_info* Named_pipe_listener::listen_for_connection_event()
 {
+  TCHAR last_error_msg[256];
+
   /* wait for named pipe connection */
   BOOL fConnected= ConnectNamedPipe(m_pipe_handle, &m_connect_overlapped);
   if (!fConnected && (GetLastError() == ERROR_IO_PENDING))
@@ -116,46 +129,58 @@ Channel_info* Named_pipe_listener::listen_for_connection_event()
   if (abort_loop)
     return NULL;
   if (!fConnected)
-    fConnected = GetLastError() == ERROR_PIPE_CONNECTED;
+    fConnected= GetLastError() == ERROR_PIPE_CONNECTED;
   if (!fConnected)
   {
     CloseHandle(m_pipe_handle);
-    if ((m_pipe_handle=
-         CreateNamedPipe(m_pipe_path_name,
-                         PIPE_ACCESS_DUPLEX |
-                         FILE_FLAG_OVERLAPPED,
-                         PIPE_TYPE_BYTE |
-                         PIPE_READMODE_BYTE |
-                         PIPE_WAIT,
-                         PIPE_UNLIMITED_INSTANCES,
-                         (int) global_system_variables.
-                         net_buffer_length,
-                         (int) global_system_variables.
-                         net_buffer_length,
-                         NMPWAIT_USE_DEFAULT_WAIT,
-                         &m_sa_pipe_security)) == INVALID_HANDLE_VALUE)
+    mysql_rwlock_rdlock(&LOCK_named_pipe_full_access_group);
+    m_pipe_handle= CreateNamedPipe(
+      m_pipe_path_name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED | WRITE_DAC,
+      PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT,
+      PIPE_UNLIMITED_INSTANCES,
+      (int)global_system_variables.net_buffer_length,
+      (int)global_system_variables.net_buffer_length,
+      NMPWAIT_USE_DEFAULT_WAIT, mp_sa_pipe_security);
+    mysql_rwlock_unlock(&LOCK_named_pipe_full_access_group);
+    if (m_pipe_handle == INVALID_HANDLE_VALUE)
     {
-      sql_print_error("Can't create new named pipe!: %s", strerror(errno));
+      DWORD last_error_num= GetLastError();
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+        FORMAT_MESSAGE_MAX_WIDTH_MASK,
+        NULL, last_error_num,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+        sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      sql_print_error("Can't create new named pipe: %s", last_error_msg);
+      return NULL;
+    }
+    else
+    {
+      /* A new pipe has been successfully created, it's not connected yet so
+      return NULL to spin around and wait for connection on it.
+      */
       return NULL;
     }
   }
-  HANDLE hConnectedPipe = m_pipe_handle;
+  HANDLE hConnectedPipe= m_pipe_handle;
   /* create new pipe for new connection */
-  if ((m_pipe_handle =
-       CreateNamedPipe(m_pipe_path_name,
-                       PIPE_ACCESS_DUPLEX |
-                       FILE_FLAG_OVERLAPPED,
-                       PIPE_TYPE_BYTE |
-                       PIPE_READMODE_BYTE |
-                       PIPE_WAIT,
-                       PIPE_UNLIMITED_INSTANCES,
-                       (int) global_system_variables.net_buffer_length,
-                       (int) global_system_variables.net_buffer_length,
-                       NMPWAIT_USE_DEFAULT_WAIT,
-                       &m_sa_pipe_security)) == INVALID_HANDLE_VALUE)
+  mysql_rwlock_rdlock(&LOCK_named_pipe_full_access_group);
+  m_pipe_handle= CreateNamedPipe(
+    m_pipe_path_name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED | WRITE_DAC,
+    PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES,
+    (int)global_system_variables.net_buffer_length,
+    (int)global_system_variables.net_buffer_length, NMPWAIT_USE_DEFAULT_WAIT,
+    mp_sa_pipe_security);
+  mysql_rwlock_unlock(&LOCK_named_pipe_full_access_group);
+  if (m_pipe_handle == INVALID_HANDLE_VALUE)
   {
-    sql_print_error("Can't create new named pipe!: %s", strerror(errno));
-    m_pipe_handle=hConnectedPipe;
+    DWORD last_error_num= GetLastError();
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+      FORMAT_MESSAGE_MAX_WIDTH_MASK,
+      NULL, last_error_num,
+      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+      sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+    sql_print_error("Can't create new named pipe: %s", last_error_msg);
+    m_pipe_handle= hConnectedPipe;
     return NULL;         // We have to try again
   }
 
@@ -170,6 +195,66 @@ Channel_info* Named_pipe_listener::listen_for_connection_event()
   return channel_info;
 }
 
+bool Named_pipe_listener::update_named_pipe_full_access_group(
+  const char *new_group_name)
+{
+  SECURITY_ATTRIBUTES *p_new_sa= nullptr;
+  const char *perror= nullptr;
+  TCHAR last_error_msg[256];
+
+  // Set up security attributes to provide full access to the owner
+  // and minimal read/write access to others.
+  if (my_security_attr_create(&p_new_sa, &perror, NAMED_PIPE_OWNER_PERMISSIONS,
+    NAMED_PIPE_EVERYONE_PERMISSIONS) != 0)
+  {
+    sql_print_error("my_security_attr_create: %s", perror);
+    return true;
+  }
+  if (new_group_name && new_group_name[0] != '\0')
+  {
+    if (my_security_attr_add_rights_to_group(
+      p_new_sa, new_group_name,
+      NAMED_PIPE_FULL_ACCESS_GROUP_PERMISSIONS))
+    {
+      sql_print_error("my_security_attr_add_rights_to_group failed for group: %s",
+        new_group_name);
+      return false;
+    }
+  }
+
+  mp_sa_pipe_security= p_new_sa;
+
+  // Set the DACL for the existing "listener" named pipe instance...
+  if (m_pipe_handle != INVALID_HANDLE_VALUE) {
+    PACL pdacl= NULL;
+    BOOL dacl_present_in_descriptor= FALSE;
+    BOOL dacl_defaulted= FALSE;
+    if (!GetSecurityDescriptorDacl(p_new_sa->lpSecurityDescriptor,
+      &dacl_present_in_descriptor, &pdacl,
+      &dacl_defaulted) ||
+      !dacl_present_in_descriptor)
+    {
+      DWORD last_error_num= GetLastError();
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL, last_error_num,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+        sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      sql_print_error("GetSecurityDescriptorDacl failed: %s", last_error_msg);
+      return true;
+    }
+    DWORD res =
+      SetSecurityInfo(m_pipe_handle, SE_KERNEL_OBJECT,
+      DACL_SECURITY_INFORMATION, NULL, NULL, pdacl, NULL);
+    if (res != ERROR_SUCCESS)
+    {
+      char num_buff[20];
+      int10_to_str(res, num_buff, 10);
+      sql_print_error("SetSecurityInfo failed to update DACL on named pipe: %s", num_buff);
+      return true;
+    }
+  }
+  return false;
+}
 
 void Named_pipe_listener::close_listener()
 {
@@ -180,20 +265,18 @@ void Named_pipe_listener::close_listener()
 
   /* Create connection to the handle named pipe handler to break the loop */
   HANDLE temp;
-  if ((temp = CreateFile(m_pipe_path_name,
-                         GENERIC_READ | GENERIC_WRITE,
-                         0,
-                         NULL,
-                         OPEN_EXISTING,
-                         0,
-                         NULL )) != INVALID_HANDLE_VALUE)
+  if ((temp= CreateFile(m_pipe_path_name, NAMED_PIPE_EVERYONE_PERMISSIONS, 0,
+                         NULL, OPEN_EXISTING, 0, NULL)) !=
+      INVALID_HANDLE_VALUE)
   {
     WaitNamedPipe(m_pipe_path_name, 1000);
-    DWORD dwMode = PIPE_READMODE_BYTE | PIPE_WAIT;
+    DWORD dwMode= PIPE_READMODE_BYTE | PIPE_WAIT;
     SetNamedPipeHandleState(temp, &dwMode, NULL, NULL);
     CancelIo(temp);
     DisconnectNamedPipe(temp);
     CloseHandle(temp);
   }
   CloseHandle(m_connect_overlapped.hEvent);
+  my_security_attr_free(mp_sa_pipe_security);
+  mp_sa_pipe_security= nullptr;
 }
diff --git a/sql/conn_handler/named_pipe_connection.h b/sql/conn_handler/named_pipe_connection.h
index eb944f6082b8..83c67ea6020b 100644
--- a/sql/conn_handler/named_pipe_connection.h
+++ b/sql/conn_handler/named_pipe_connection.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,8 +41,7 @@ class THD;
 class Named_pipe_listener
 {
   std::string m_pipe_name;
-  SECURITY_ATTRIBUTES m_sa_pipe_security;
-  SECURITY_DESCRIPTOR m_sd_pipe_descriptor;
+  SECURITY_ATTRIBUTES *mp_sa_pipe_security;
   HANDLE m_pipe_handle;
   char m_pipe_path_name[512];
   HANDLE h_connected_pipe;
@@ -49,7 +55,8 @@ class Named_pipe_listener
   */
   Named_pipe_listener(const std::string *pipe_name)
   : m_pipe_name(*pipe_name),
-    m_pipe_handle(INVALID_HANDLE_VALUE)
+    m_pipe_handle(INVALID_HANDLE_VALUE),
+    mp_sa_pipe_security(nullptr)
   { }
 
 
@@ -70,6 +77,15 @@ class Named_pipe_listener
   */
   Channel_info* listen_for_connection_event();
 
+  /**
+  Set the Windows group name whose users have full access to new instances of
+  the named pipe
+
+  @retval false access set successfully.
+  true failed to change access.
+  */
+  bool update_named_pipe_full_access_group(const char *new_group_name);
+
   /**
     Close the listener
   */
diff --git a/sql/conn_handler/plugin_connection_handler.h b/sql/conn_handler/plugin_connection_handler.h
index 18a72361ef4b..c71b67b12ddf 100644
--- a/sql/conn_handler/plugin_connection_handler.h
+++ b/sql/conn_handler/plugin_connection_handler.h
@@ -2,16 +2,23 @@
 #define PLUGIN_CONNECTION_HANDLER_INCLUDED
 
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/conn_handler/shared_memory_connection.cc b/sql/conn_handler/shared_memory_connection.cc
index 061dc61ae5d5..1969efa2536f 100644
--- a/sql/conn_handler/shared_memory_connection.cc
+++ b/sql/conn_handler/shared_memory_connection.cc
@@ -1,20 +1,28 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "init_net_server_extension.h"
 #include "shared_memory_connection.h"
 
 #include "violite.h"                    // Vio
@@ -86,8 +94,10 @@ class Channel_info_shared_mem : public Channel_info
   {
     THD* thd= Channel_info::create_thd();
 
-    if (thd != NULL)
-      thd->security_context()->set_host_ptr(my_localhost, strlen(my_localhost));
+    if (thd != NULL) {
+        init_net_server_extension(thd);
+        thd->security_context()->set_host_ptr(my_localhost, strlen(my_localhost));
+    }
     return thd;
   }
 
@@ -97,20 +107,25 @@ class Channel_info_shared_mem : public Channel_info
   {
     Channel_info::send_error_and_close_channel(errorcode, error, senderror);
 
-    if (m_handle_client_file_map)
-      CloseHandle(m_handle_client_file_map);
-    if (m_handle_client_map)
-      CloseHandle(m_handle_client_map);
-    if (m_event_server_wrote)
-      CloseHandle(m_event_server_wrote);
-    if (m_event_server_read)
-      CloseHandle(m_event_server_read);
-    if (m_event_client_wrote)
-      CloseHandle(m_event_client_wrote);
-    if (m_event_client_read)
-      CloseHandle(m_event_client_read);
-    if (m_event_conn_closed)
-      CloseHandle(m_event_conn_closed);
+    // Channel_info::send_error_and_close_channel will have closed
+    // handles on senderror
+    if (!senderror)
+    {
+      if (m_handle_client_file_map)
+        CloseHandle(m_handle_client_file_map);
+      if (m_handle_client_map)
+        UnmapViewOfFile(m_handle_client_map);
+      if (m_event_server_wrote)
+        CloseHandle(m_event_server_wrote);
+      if (m_event_server_read)
+        CloseHandle(m_event_server_read);
+      if (m_event_client_wrote)
+        CloseHandle(m_event_client_wrote);
+      if (m_event_client_read)
+        CloseHandle(m_event_client_read);
+      if (m_event_conn_closed)
+        CloseHandle(m_event_conn_closed);
+    }
   }
 };
 
@@ -126,6 +141,7 @@ void Shared_mem_listener::close_shared_mem()
 
   my_security_attr_free(m_sa_event);
   my_security_attr_free(m_sa_mapping);
+  my_security_attr_free(m_sa_mutex);
   if (m_connect_map)
     UnmapViewOfFile(m_connect_map);
   if (m_connect_named_mutex)
@@ -158,6 +174,9 @@ bool Shared_mem_listener::setup_listener()
                               GENERIC_ALL, FILE_MAP_READ | FILE_MAP_WRITE))
     goto error;
 
+  if (my_security_attr_create(&m_sa_mutex, &errmsg, GENERIC_ALL, SYNCHRONIZE))
+    goto error;
+
   /*
     The name of event and file-mapping events create agree next rule:
       shared_memory_base_name+unique_part
@@ -182,7 +201,7 @@ bool Shared_mem_listener::setup_listener()
   }
 
   my_stpcpy(m_suffix_pos, "CONNECT_NAMED_MUTEX");
-  m_connect_named_mutex= CreateMutex(NULL, FALSE, m_temp_buffer);
+  m_connect_named_mutex= CreateMutex(m_sa_mutex, FALSE, m_temp_buffer);
   if (m_connect_named_mutex == NULL)
   {
     errmsg="Unable to create connect named mutex.";
diff --git a/sql/conn_handler/shared_memory_connection.h b/sql/conn_handler/shared_memory_connection.h
index ad7806639207..6836dac5540d 100644
--- a/sql/conn_handler/shared_memory_connection.h
+++ b/sql/conn_handler/shared_memory_connection.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -41,6 +48,7 @@ class Shared_mem_listener
   HANDLE m_event_connect_answer;
   SECURITY_ATTRIBUTES *m_sa_event;
   SECURITY_ATTRIBUTES *m_sa_mapping;
+  SECURITY_ATTRIBUTES *m_sa_mutex;
   int m_connect_number;
   char *m_suffix_pos;
   char *m_temp_buffer;
@@ -70,6 +78,7 @@ class Shared_mem_listener
     m_event_connect_answer(0),
     m_sa_event(0),
     m_sa_mapping(0),
+    m_sa_mutex(0),
     m_temp_buffer(0),
     m_connect_number(1),
     m_handle_client_file_map(0),
diff --git a/sql/conn_handler/socket_connection.cc b/sql/conn_handler/socket_connection.cc
index 8a82c19e8390..29b8aaab18b3 100644
--- a/sql/conn_handler/socket_connection.cc
+++ b/sql/conn_handler/socket_connection.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,6 +27,7 @@
 #include "violite.h"                    // Vio
 #include "channel_info.h"               // Channel_info
 #include "connection_handler_manager.h" // Connection_handler_manager
+#include "init_net_server_extension.h"
 #include "mysqld.h"                     // key_socket_tcpip
 #include "log.h"                        // sql_print_error
 #include "sql_class.h"                  // THD
@@ -49,92 +57,6 @@ ulong Mysqld_socket_listener::connection_errors_select= 0;
 ulong Mysqld_socket_listener::connection_errors_accept= 0;
 ulong Mysqld_socket_listener::connection_errors_tcpwrap= 0;
 
-
-void net_before_header_psi(struct st_net *net, void *user_data, size_t /* unused: count */)
-{
-  THD *thd;
-  thd= static_cast<THD*> (user_data);
-  DBUG_ASSERT(thd != NULL);
-
-  if (thd->m_server_idle)
-  {
-    /*
-      The server is IDLE, waiting for the next command.
-      Technically, it is a wait on a socket, which may take a long time,
-      because the call is blocking.
-      Disable the socket instrumentation, to avoid recording a SOCKET event.
-      Instead, start explicitly an IDLE event.
-    */
-    MYSQL_SOCKET_SET_STATE(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
-    MYSQL_START_IDLE_WAIT(thd->m_idle_psi, &thd->m_idle_state);
-  }
-}
-
-void net_after_header_psi(struct st_net *net, void *user_data, size_t /* unused: count */, my_bool rc)
-{
-  THD *thd;
-  thd= static_cast<THD*> (user_data);
-  DBUG_ASSERT(thd != NULL);
-
-  if (thd->m_server_idle)
-  {
-    /*
-      The server just got data for a network packet header,
-      from the network layer.
-      The IDLE event is now complete, since we now have a message to process.
-      We need to:
-      - start a new STATEMENT event
-      - start a new STAGE event, within this statement,
-      - start recording SOCKET WAITS events, within this stage.
-      The proper order is critical to get events numbered correctly,
-      and nested in the proper parent.
-    */
-    MYSQL_END_IDLE_WAIT(thd->m_idle_psi);
-
-    if (! rc)
-    {
-      DBUG_ASSERT(thd->m_statement_psi == NULL);
-      thd->m_statement_psi= MYSQL_START_STATEMENT(&thd->m_statement_state,
-                                                  stmt_info_new_packet.m_key,
-                                                  thd->db().str,
-                                                  thd->db().length,
-                                                  thd->charset(), NULL);
-
-      /*
-        Starts a new stage in performance schema, if compiled in and enabled.
-        Also sets THD::proc_info (used by SHOW PROCESSLIST, column STATE)
-      */
-      THD_STAGE_INFO(thd, stage_starting);
-    }
-
-    /*
-      TODO: consider recording a SOCKET event for the bytes just read,
-      by also passing count here.
-    */
-    MYSQL_SOCKET_SET_STATE(net->vio->mysql_socket, PSI_SOCKET_STATE_ACTIVE);
-    thd->m_server_idle= false;
-  }
-}
-
-
-static void init_net_server_extension(THD *thd)
-{
-  /* Start with a clean state for connection events. */
-  thd->m_idle_psi= NULL;
-  thd->m_statement_psi= NULL;
-  thd->m_server_idle= false;
-
-  /* Hook up the NET_SERVER callback in the net layer. */
-  thd->m_net_server_extension.m_user_data= thd;
-  thd->m_net_server_extension.m_before_header= net_before_header_psi;
-  thd->m_net_server_extension.m_after_header= net_after_header_psi;
-
-  /* Activate this private extension for the mysqld server. */
-  thd->get_protocol_classic()->get_net()->extension=
-    &thd->m_net_server_extension;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////
 // Channel_info_local_socket implementation
 ///////////////////////////////////////////////////////////////////////////
diff --git a/sql/conn_handler/socket_connection.h b/sql/conn_handler/socket_connection.h
index b46b60e8e8da..5a959faa7176 100644
--- a/sql/conn_handler/socket_connection.h
+++ b/sql/conn_handler/socket_connection.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/datadict.cc b/sql/datadict.cc
index 6164e495910b..85c1c6df5dbd 100644
--- a/sql/datadict.cc
+++ b/sql/datadict.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -88,9 +95,9 @@ bool dd_frm_storage_engine(THD *thd, const char *db, const char *table_name,
   LEX_STRING db_name = {(char *) db, strlen(db)};
 
   /* There should be at least some lock on the table.  */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                                           db, table_name,
-                                                           MDL_SHARED));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      db, table_name,
+                                                      MDL_SHARED));
 
   if (check_and_convert_db_name(&db_name, FALSE) != IDENT_NAME_OK)
     return TRUE;
@@ -178,11 +185,9 @@ bool dd_recreate_table(THD *thd, const char *db, const char *table_name)
   DBUG_ENTER("dd_recreate_table");
 
   /* There should be a exclusive metadata lock on the table. */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                                           db, table_name,
-                                                           MDL_EXCLUSIVE));
-
-  memset(&create_info, 0, sizeof(create_info));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      db, table_name,
+                                                      MDL_EXCLUSIVE));
 
   /* Create a path to the table, but without a extension. */
   build_table_filename(path, sizeof(path) - 1, db, table_name, "", 0);
diff --git a/sql/datadict.h b/sql/datadict.h
index 65e40998929e..f71fcb74a79a 100644
--- a/sql/datadict.h
+++ b/sql/datadict.h
@@ -1,15 +1,22 @@
 #ifndef DATADICT_INCLUDED
 #define DATADICT_INCLUDED
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index 3015c31815b9..24c55c03b895 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -633,7 +640,7 @@ static void debug_sync_emergency_disable(void)
 void debug_sync_init_thread(THD *thd)
 {
   DBUG_ENTER("debug_sync_init_thread");
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   if (opt_debug_sync_timeout)
   {
@@ -656,7 +663,7 @@ void debug_sync_init_thread(THD *thd)
 void debug_sync_claim_memory_ownership(THD *thd)
 {
   DBUG_ENTER("debug_sync_claim_memory_ownership");
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   st_debug_sync_control *ds_control= thd->debug_sync_control;
 
@@ -691,7 +698,7 @@ void debug_sync_claim_memory_ownership(THD *thd)
 void debug_sync_end_thread(THD *thd)
 {
   DBUG_ENTER("debug_sync_end_thread");
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   if (thd->debug_sync_control)
   {
@@ -746,16 +753,16 @@ void debug_sync_end_thread(THD *thd)
 static char *debug_sync_bmove_len(char *to, char *to_end,
                                   const char *from, size_t length)
 {
-  DBUG_ASSERT(to);
-  DBUG_ASSERT(to_end);
-  DBUG_ASSERT(!length || from);
+  assert(to);
+  assert(to_end);
+  assert(!length || from);
   set_if_smaller(length, (size_t) (to_end - to));
   memcpy(to, from, length);
   return (to + length);
 }
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 
 /**
   Create a string that describes an action.
@@ -770,12 +777,12 @@ static void debug_sync_action_string(char *result, uint size,
 {
   char  *wtxt= result;
   char  *wend= wtxt + size - 1; /* Allow emergency '\0'. */
-  DBUG_ASSERT(result);
-  DBUG_ASSERT(action);
+  assert(result);
+  assert(action);
 
   /* If an execute count is present, signal or wait_for are needed too. */
-  DBUG_ASSERT(!action->execute ||
-              action->signal.length() || action->wait_for.length());
+  assert(!action->execute ||
+         action->signal.length() || action->wait_for.length());
 
   if (action->execute)
   {
@@ -828,7 +835,7 @@ static void debug_sync_print_actions(THD *thd)
   st_debug_sync_control *ds_control= thd->debug_sync_control;
   uint                  idx;
   DBUG_ENTER("debug_sync_print_actions");
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   if (!ds_control)
     DBUG_VOID_RETURN;
@@ -846,7 +853,7 @@ static void debug_sync_print_actions(THD *thd)
   DBUG_VOID_RETURN;
 }
 
-#endif /* !defined(DBUG_OFF) */
+#endif /* !defined(NDEBUG) */
 
 
 /**
@@ -866,8 +873,8 @@ static int debug_sync_qsort_cmp(const void* arg1, const void* arg2)
   st_debug_sync_action *action1= (st_debug_sync_action*) arg1;
   st_debug_sync_action *action2= (st_debug_sync_action*) arg2;
   int diff;
-  DBUG_ASSERT(action1);
-  DBUG_ASSERT(action2);
+  assert(action1);
+  assert(action2);
 
   if (!(diff= static_cast<int>(action1->sync_point.length() - action2->sync_point.length())))
     diff= memcmp(action1->sync_point.ptr(), action2->sync_point.ptr(),
@@ -903,9 +910,9 @@ static st_debug_sync_action *debug_sync_find(st_debug_sync_action *actionarr,
   int                   high ;
   int                   mid ;
   int                   diff ;
-  DBUG_ASSERT(actionarr);
-  DBUG_ASSERT(dsp_name);
-  DBUG_ASSERT(name_len);
+  assert(actionarr);
+  assert(dsp_name);
+  assert(name_len);
 
   low= 0;
   high= quantity;
@@ -949,8 +956,8 @@ static void debug_sync_reset(THD *thd)
 {
   st_debug_sync_control *ds_control= thd->debug_sync_control;
   DBUG_ENTER("debug_sync_reset");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(ds_control);
+  assert(thd);
+  assert(ds_control);
 
   /* Remove all actions of this thread. */
   ds_control->ds_active= 0;
@@ -982,10 +989,10 @@ static void debug_sync_remove_action(st_debug_sync_control *ds_control,
 {
   uint dsp_idx= static_cast<uint>(action - ds_control->ds_action);
   DBUG_ENTER("debug_sync_remove_action");
-  DBUG_ASSERT(ds_control);
-  DBUG_ASSERT(ds_control == current_thd->debug_sync_control);
-  DBUG_ASSERT(action);
-  DBUG_ASSERT(dsp_idx < ds_control->ds_active);
+  assert(ds_control);
+  assert(ds_control == current_thd->debug_sync_control);
+  assert(action);
+  assert(dsp_idx < ds_control->ds_active);
 
   /* Decrement the number of currently active actions. */
   ds_control->ds_active--;
@@ -1015,8 +1022,9 @@ static void debug_sync_remove_action(st_debug_sync_control *ds_control,
     memmove(save_action, action, sizeof(st_debug_sync_action));
 
     /* Move actions down. */
-    memmove(ds_control->ds_action + dsp_idx,
-            ds_control->ds_action + dsp_idx + 1,
+    void *dest= ds_control->ds_action + dsp_idx;
+    const void *src= ds_control->ds_action + dsp_idx + 1;
+    memmove(dest, src,
             (ds_control->ds_active - dsp_idx) *
             sizeof(st_debug_sync_action));
 
@@ -1026,7 +1034,8 @@ static void debug_sync_remove_action(st_debug_sync_control *ds_control,
       produced by the shift. Again do not use an assignment operator to
       avoid string allocation/copy.
     */
-    memmove(ds_control->ds_action + ds_control->ds_active, save_action,
+    dest= ds_control->ds_action + ds_control->ds_active;
+    memmove(dest, save_action,
             sizeof(st_debug_sync_action));
   }
 
@@ -1056,18 +1065,18 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
   st_debug_sync_control *ds_control= thd->debug_sync_control;
   st_debug_sync_action  *action;
   DBUG_ENTER("debug_sync_get_action");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(dsp_name);
-  DBUG_ASSERT(name_len);
-  DBUG_ASSERT(ds_control);
+  assert(thd);
+  assert(dsp_name);
+  assert(name_len);
+  assert(ds_control);
   DBUG_PRINT("debug_sync", ("sync_point: '%.*s'", (int) name_len, dsp_name));
   DBUG_PRINT("debug_sync", ("active: %u  allocated: %u",
                             ds_control->ds_active, ds_control->ds_allocated));
 
   /* There cannot be more active actions than allocated. */
-  DBUG_ASSERT(ds_control->ds_active <= ds_control->ds_allocated);
+  assert(ds_control->ds_active <= ds_control->ds_allocated);
   /* If there are active actions, the action array must be present. */
-  DBUG_ASSERT(!ds_control->ds_active || ds_control->ds_action);
+  assert(!ds_control->ds_active || ds_control->ds_action);
 
   /* Try to reuse existing action if there is one for this sync point. */
   if (ds_control->ds_active &&
@@ -1075,7 +1084,7 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
                                dsp_name, name_len)))
   {
     /* Reuse an already active sync point action. */
-    DBUG_ASSERT((uint)(action - ds_control->ds_action) < ds_control->ds_active);
+    assert((uint)(action - ds_control->ds_action) < ds_control->ds_active);
     DBUG_PRINT("debug_sync", ("reuse action idx: %ld",
                               (long) (action - ds_control->ds_action)));
   }
@@ -1099,7 +1108,8 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
       ds_control->ds_action= (st_debug_sync_action*) new_action;
       ds_control->ds_allocated= new_alloc;
       /* Clear memory as we do not run string constructors here. */
-      memset((ds_control->ds_action + dsp_idx), 0,
+      void *dest= (ds_control->ds_action + dsp_idx);
+      memset(dest, 0,
             (new_alloc - dsp_idx) * sizeof(st_debug_sync_action));
     }
     DBUG_PRINT("debug_sync", ("added action idx: %u", dsp_idx));
@@ -1111,8 +1121,8 @@ static st_debug_sync_action *debug_sync_get_action(THD *thd,
     }
     action->need_sort= TRUE;
   }
-  DBUG_ASSERT(action >= ds_control->ds_action);
-  DBUG_ASSERT(action < ds_control->ds_action + ds_control->ds_active);
+  assert(action >= ds_control->ds_action);
+  assert(action < ds_control->ds_action + ds_control->ds_active);
   DBUG_PRINT("debug_sync", ("action: 0x%lx  array: 0x%lx  count: %u",
                             (long) action, (long) ds_control->ds_action,
                             ds_control->ds_active));
@@ -1165,9 +1175,9 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
   st_debug_sync_control *ds_control= thd->debug_sync_control;
   bool is_dsp_now= FALSE;
   DBUG_ENTER("debug_sync_set_action");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(action);
-  DBUG_ASSERT(ds_control);
+  assert(thd);
+  assert(action);
+  assert(ds_control);
 
   action->activation_count= max(action->hit_limit, action->execute);
   if (!action->activation_count)
@@ -1333,9 +1343,9 @@ static inline const char *get_token_end_ptr(const char *ptr)
 
 static char *debug_sync_token(char **token_p, size_t *token_length_p, char *ptr)
 {
-  DBUG_ASSERT(token_p);
-  DBUG_ASSERT(token_length_p);
-  DBUG_ASSERT(ptr);
+  assert(token_p);
+  assert(token_length_p);
+  assert(ptr);
 
 
   /* Skip leading space */
@@ -1404,8 +1414,8 @@ static char *debug_sync_number(ulong *number_p, char *actstrptr)
   char                  *ept;
   char                  *token;
   size_t                token_length;
-  DBUG_ASSERT(number_p);
-  DBUG_ASSERT(actstrptr);
+  assert(number_p);
+  assert(actstrptr);
 
   /* Get token from string. */
   if (!(ptr= debug_sync_token(&token, &token_length, actstrptr)))
@@ -1460,8 +1470,8 @@ static bool debug_sync_eval_action(THD *thd, char *action_str)
   char                  *token;
   size_t                token_length= 0;
   DBUG_ENTER("debug_sync_eval_action");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(action_str);
+  assert(thd);
+  assert(action_str);
 
   /*
     Get debug sync point name. Or a special command.
@@ -1512,7 +1522,7 @@ static bool debug_sync_eval_action(THD *thd, char *action_str)
     Check for pseudo actions first. Start with actions that work on
     an existing action.
   */
-  DBUG_ASSERT(action);
+  assert(action);
 
   /*
     Try TEST.
@@ -1879,21 +1889,21 @@ static inline void clear_signal_event(const std::string *signal_name)
 
 static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const char *dsp_name= action->sync_point.c_ptr();
   const char *sig_emit= action->signal.c_ptr();
   const char *sig_wait= action->wait_for.c_ptr();
 #endif
   DBUG_ENTER("debug_sync_execute");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(action);
+  assert(thd);
+  assert(action);
   DBUG_PRINT("debug_sync",
              ("sync_point: '%s'  activation_count: %lu  hit_limit: %lu  "
               "execute: %lu  timeout: %lu  signal: '%s'  wait_for: '%s'",
               dsp_name, action->activation_count, action->hit_limit,
               action->execute, action->timeout, sig_emit, sig_wait));
 
-  DBUG_ASSERT(action->activation_count);
+  assert(action->activation_count);
   action->activation_count--;
 
   if (action->execute)
@@ -2073,10 +2083,10 @@ void debug_sync(THD *thd, const char *sync_point_name, size_t name_len)
   st_debug_sync_control *ds_control= thd->debug_sync_control;
   st_debug_sync_action  *action;
   DBUG_ENTER("debug_sync");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(sync_point_name);
-  DBUG_ASSERT(name_len);
-  DBUG_ASSERT(ds_control);
+  assert(thd);
+  assert(sync_point_name);
+  assert(name_len);
+  assert(ds_control);
   DBUG_PRINT("debug_sync_point", ("hit: '%s'", sync_point_name));
 
   /* Statistics. */
@@ -2130,8 +2140,8 @@ bool debug_sync_set_action(THD *thd, const char *action_str, size_t len)
   bool                  rc;
   char *value;
   DBUG_ENTER("debug_sync_set_action");
-  DBUG_ASSERT(thd);
-  DBUG_ASSERT(action_str);
+  assert(thd);
+  assert(action_str);
 
   value= strmake_root(thd->mem_root, action_str, len);
   rc= debug_sync_eval_action(thd, value);
diff --git a/sql/debug_sync.h b/sql/debug_sync.h
index 2b740f9bcf8c..9b975f3f4f6b 100644
--- a/sql/debug_sync.h
+++ b/sql/debug_sync.h
@@ -1,16 +1,23 @@
 #ifndef DEBUG_SYNC_INCLUDED
 #define DEBUG_SYNC_INCLUDED
 
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/derror.cc b/sql/derror.cc
index 9960855e070b..2158f099549e 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -38,7 +45,8 @@ const char* MY_LOCALE_ERRMSGS::lookup(int mysql_errno)
   int offset= 0; // Position where the current section starts in the array.
   for (int i= 0; i < NUM_SECTIONS; i++)
   {
-    if (mysql_errno < (errmsg_section_start[i] + errmsg_section_size[i]))
+    if (mysql_errno >= errmsg_section_start[i] &&
+        mysql_errno < (errmsg_section_start[i] + errmsg_section_size[i]))
       return errmsgs[mysql_errno - errmsg_section_start[i] + offset];
     offset+= errmsg_section_size[i];
   }
diff --git a/sql/derror.h b/sql/derror.h
index a52041be3df2..6e9405a207f1 100644
--- a/sql/derror.h
+++ b/sql/derror.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc
index e83e278c56ba..4a594206855a 100644
--- a/sql/des_key_file.cc
+++ b/sql/des_key_file.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/des_key_file.h b/sql/des_key_file.h
index 024a1715d47a..93078110d917 100644
--- a/sql/des_key_file.h
+++ b/sql/des_key_file.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/discover.cc b/sql/discover.cc
index 876467a9ce0d..1195202f8c3d 100644
--- a/sql/discover.cc
+++ b/sql/discover.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/discover.h b/sql/discover.h
index a663e44128dd..e5a26049d29d 100644
--- a/sql/discover.h
+++ b/sql/discover.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/discrete_interval.h b/sql/discrete_interval.h
index 77047f5947b6..fd69e865b795 100644
--- a/sql/discrete_interval.h
+++ b/sql/discrete_interval.h
@@ -1,16 +1,23 @@
 #ifndef DISCRETE_INTERVAL_INCLUDED
 #define DISCRETE_INTERVAL_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -144,7 +151,7 @@ class Discrete_intervals_list {
       for (Discrete_interval *i= head->next; i;)
       {
 #ifdef DISCRETE_INTERVAL_LIST_HAS_MAX_ONE_ELEMENT
-        DBUG_ASSERT(0);
+        assert(0);
 #endif
         Discrete_interval *next= i->next;
         delete i;
diff --git a/sql/dynamic_ids.cc b/sql/dynamic_ids.cc
index 1a6a65cb6fed..d0c206e942ee 100644
--- a/sql/dynamic_ids.cc
+++ b/sql/dynamic_ids.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/dynamic_ids.h b/sql/dynamic_ids.h
index 0a76b1ff9c96..386f8f32f07d 100644
--- a/sql/dynamic_ids.h
+++ b/sql/dynamic_ids.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 64baa802db49..390a9888af2f 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -520,7 +527,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
     Hence, if ET_FIELD_EXECUTE_AT is empty there is an error.
   */
   execute_at_null= table->field[ET_FIELD_EXECUTE_AT]->is_null();
-  DBUG_ASSERT(!(starts_null && ends_null && !expression && execute_at_null));
+  assert(!(starts_null && ends_null && !expression && execute_at_null));
   if (!expression && !execute_at_null)
   {
     if (table->field[ET_FIELD_EXECUTE_AT]->get_date(&time,
@@ -715,7 +722,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
   DBUG_ENTER("get_next_time");
   DBUG_PRINT("enter", ("start: %lu  now: %lu", (long) start, (long) time_now));
 
-  DBUG_ASSERT(start <= time_now);
+  assert(start <= time_now);
 
   longlong months=0, seconds=0;
 
@@ -761,7 +768,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
     DBUG_RETURN(1);
     break;
   case INTERVAL_LAST:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   DBUG_PRINT("info", ("seconds: %ld  months: %ld", (long) seconds, (long) months));
 
@@ -805,7 +812,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
         then next_time was set, but perhaps to the value that is less
         then time_now.  See below for elaboration.
       */
-      DBUG_ASSERT(negative || next_time > 0);
+      assert(negative || next_time > 0);
 
       /*
         If local_now < local_start, i.e. STARTS time is in the future
@@ -903,7 +910,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
     }
   }
 
-  DBUG_ASSERT(time_now < next_time);
+  assert(time_now < next_time);
 
   *next= next_time;
 
@@ -1424,7 +1431,7 @@ Event_job_data::execute(THD *thd, bool drop)
   {
     sp_head *sphead= thd->lex->sphead;
 
-    DBUG_ASSERT(sphead);
+    assert(sphead);
 
     if (thd->enable_slow_log)
       sphead->m_flags|= sp_head::LOG_SLOW_STATEMENTS;
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index 13d904a4dff4..2e8b0c3e7c64 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -1,15 +1,22 @@
 #ifndef _EVENT_DATA_OBJECTS_H_
 #define _EVENT_DATA_OBJECTS_H_
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index 18d5070547e5..308cb96725af 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -171,7 +178,7 @@ class Event_db_intact : public Table_check_intact
 private:
   bool silence_error;
 public:
-  Event_db_intact() : silence_error(FALSE) {}
+  Event_db_intact() : silence_error(FALSE) { has_keys= TRUE; }
   my_bool check_event_table(TABLE *table);
 
 protected:
@@ -244,7 +251,7 @@ mysql_event_fill_row(THD *thd,
   DBUG_PRINT("info", ("dbname=[%s]", et->dbname.str));
   DBUG_PRINT("info", ("name  =[%s]", et->name.str));
 
-  DBUG_ASSERT(et->on_completion != Event_parse_data::ON_COMPLETION_DEFAULT);
+  assert(et->on_completion != Event_parse_data::ON_COMPLETION_DEFAULT);
 
   if (table->s->fields < ET_FIELD_COUNT)
   {
@@ -296,7 +303,7 @@ mysql_event_fill_row(THD *thd,
   */
   if (et->body_changed)
   {
-    DBUG_ASSERT(sp->m_body.str);
+    assert(sp->m_body.str);
 
     rs|= fields[ET_FIELD_SQL_MODE]->store((longlong)sql_mode, TRUE);
 
@@ -368,7 +375,7 @@ mysql_event_fill_row(THD *thd,
   }
   else
   {
-    DBUG_ASSERT(is_update);
+    assert(is_update);
     /*
       it is normal to be here when the action is update
       this is an error if the action is create. something is borked
@@ -592,14 +599,6 @@ Event_db_repository::fill_schema_events(THD *thd, TABLE_LIST *i_s_table,
     DBUG_RETURN(TRUE);
   }
 
-  if (!event_table.table->key_info)
-  {
-    close_nontrans_system_tables(thd, &open_tables_backup);
-    my_error(ER_TABLE_CORRUPT, MYF(0), event_table.table->s->db.str,
-             event_table.table->s->table_name.str);
-    DBUG_RETURN(TRUE);
-  }
- 
   if (table_intact.check_event_table(event_table.table))
   {
     close_nontrans_system_tables(thd, &open_tables_backup);
@@ -716,7 +715,7 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data,
   DBUG_ENTER("Event_db_repository::create_event");
 
   DBUG_PRINT("info", ("open mysql.event for update"));
-  DBUG_ASSERT(sp);
+  assert(sp);
 
   /* Reset sql_mode during data dictionary operations. */
   thd->variables.sql_mode= 0;
@@ -836,7 +835,7 @@ Event_db_repository::update_event(THD *thd, Event_parse_data *parse_data,
   DBUG_ENTER("Event_db_repository::update_event");
 
   /* None or both must be set */
-  DBUG_ASSERT((new_dbname && new_name) || new_dbname == new_name);
+  assert((new_dbname && new_name) || new_dbname == new_name);
 
   /* Reset sql_mode during data dictionary operations. */
   thd->variables.sql_mode= 0;
@@ -978,7 +977,7 @@ Event_db_repository::drop_event(THD *thd, LEX_STRING db, LEX_STRING name,
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
@@ -1020,13 +1019,6 @@ Event_db_repository::find_named_event(LEX_STRING db, LEX_STRING name,
       name.length > table->field[ET_FIELD_NAME]->field_length)
     DBUG_RETURN(TRUE);
   
-  if (!table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str, 
-             table->s->table_name.str);
-    DBUG_RETURN(TRUE);
-  }
-
   table->field[ET_FIELD_DB]->store(db.str, db.length, &my_charset_bin);
   table->field[ET_FIELD_NAME]->store(name.str, name.length, &my_charset_bin);
 
@@ -1189,7 +1181,7 @@ update_timing_fields_for_event(THD *thd,
   if ((save_binlog_row_based= thd->is_current_stmt_binlog_format_row()))
     thd->clear_current_stmt_binlog_format_row();
 
-  DBUG_ASSERT(thd->security_context()->check_access(SUPER_ACL));
+  assert(thd->security_context()->check_access(SUPER_ACL));
 
   if (open_event_table(thd, TL_WRITE, &table))
     goto end;
@@ -1221,7 +1213,7 @@ update_timing_fields_for_event(THD *thd,
     close_mysql_tables(thd);
 
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
 
diff --git a/sql/event_db_repository.h b/sql/event_db_repository.h
index 5fc8450786e3..3bfdd39e032f 100644
--- a/sql/event_db_repository.h
+++ b/sql/event_db_repository.h
@@ -2,16 +2,23 @@
 #define _EVENT_DB_REPOSITORY_H_
 
 /*
-   Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc
index 1b499e9259f3..60b9db1369bf 100644
--- a/sql/event_parse_data.cc
+++ b/sql/event_parse_data.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -133,7 +140,7 @@ Event_parse_data::check_if_in_the_past(THD *thd, my_time_t ltime_utc)
       my_error(ER_EVENT_CANNOT_ALTER_IN_THE_PAST, MYF(0));
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
 
     do_not_create= TRUE;
@@ -215,7 +222,7 @@ Event_parse_data::init_execute_at(THD *thd)
   /* no starts and/or ends in case of execute_at */
   DBUG_PRINT("info", ("starts_null && ends_null should be 1 is %d",
                       (starts_null && ends_null)));
-  DBUG_ASSERT(starts_null && ends_null);
+  assert(starts_null && ends_null);
 
   if ((not_used= item_execute_at->get_date(&ltime, TIME_NO_ZERO_DATE)))
     goto wrong_value;
@@ -328,7 +335,7 @@ Event_parse_data::init_interval(THD *thd)
     expression= interval_tmp.minute * 60 + interval_tmp.second;
     break;
   case INTERVAL_LAST:
-    DBUG_ASSERT(0);
+    assert(0);
   default:
     ;/* these are the microsec stuff */
   }
@@ -525,7 +532,7 @@ Event_parse_data::init_definer(THD *thd)
 {
   DBUG_ENTER("Event_parse_data::init_definer");
 
-  DBUG_ASSERT(thd->lex->definer);
+  assert(thd->lex->definer);
 
   const char *definer_user= thd->lex->definer->user.str;
   const char *definer_host= thd->lex->definer->host.str;
diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h
index a9f6e9eda8bb..a8be738364d4 100644
--- a/sql/event_parse_data.h
+++ b/sql/event_parse_data.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index 1735b7f90ff5..dd56efeaa68c 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -508,7 +515,7 @@ Event_queue::empty_queue()
 void
 Event_queue::dbug_dump_queue(time_t now)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_ENTER("Event_queue::dbug_dump_queue");
   DBUG_PRINT("info", ("Dumping queue . Elements=%u",
                       static_cast<unsigned>(queue.size())));
diff --git a/sql/event_queue.h b/sql/event_queue.h
index 73f1203e6765..fe7cb87d9723 100644
--- a/sql/event_queue.h
+++ b/sql/event_queue.h
@@ -1,15 +1,22 @@
 #ifndef _EVENT_QUEUE_H_
 #define _EVENT_QUEUE_H_
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index 9fd9e28b90db..4157ceb847bf 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -109,7 +116,7 @@ Event_worker_thread::print_warnings(THD *thd, Event_job_data *et)
       sql_print_information("%*s", static_cast<int>(err_msg.length()), err_msg.c_ptr());
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
     }
   }
   DBUG_VOID_RETURN;
@@ -233,6 +240,17 @@ extern "C" void *event_scheduler_thread(void *arg)
 
   mysql_thread_set_psi_id(thd->thread_id());
 
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  /* Update the thread instrumentation. */
+  PSI_THREAD_CALL(set_thread_account)
+    (thd->security_context()->user().str,
+     thd->security_context()->user().length,
+     thd->security_context()->host_or_ip().str,
+     thd->security_context()->host_or_ip().length);
+  PSI_THREAD_CALL(set_thread_command)(thd->get_command());
+  PSI_THREAD_CALL(set_thread_start_time)(thd->query_start());
+#endif /* HAVE_PSI_THREAD_INTERFACE */
+
   res= post_init_event_thread(thd);
 
   DBUG_ENTER("event_scheduler_thread");
@@ -279,6 +297,17 @@ extern "C" void *event_worker_thread(void *arg)
 
   mysql_thread_set_psi_id(thd->thread_id());
 
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  /* Update the thread instrumentation. */
+  PSI_THREAD_CALL(set_thread_account)
+    (thd->security_context()->user().str,
+     thd->security_context()->user().length,
+     thd->security_context()->host_or_ip().str,
+     thd->security_context()->host_or_ip().length);
+  PSI_THREAD_CALL(set_thread_command)(thd->get_command());
+  PSI_THREAD_CALL(set_thread_start_time)(thd->query_start());
+#endif /* HAVE_PSI_THREAD_INTERFACE */
+
   Event_worker_thread worker_thread;
   worker_thread.run(thd, event);
 
@@ -305,11 +334,11 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event)
   Event_job_data job_data;
   bool res;
 
-  DBUG_ASSERT(thd->m_digest == NULL);
+  assert(thd->m_digest == NULL);
 
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_statement_locker_state state;
-  DBUG_ASSERT(thd->m_statement_psi == NULL);
+  assert(thd->m_statement_psi == NULL);
   thd->m_statement_psi= MYSQL_START_STATEMENT(& state,
                                               event->get_psi_info()->m_key,
                                               event->dbname.str,
@@ -350,7 +379,7 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event)
   thd->m_statement_psi= NULL;
 #endif
 
-  DBUG_ASSERT(thd->m_digest == NULL);
+  assert(thd->m_digest == NULL);
 
   DBUG_PRINT("info", ("Done with Event %s.%s", event->dbname.str,
              event->name.str));
@@ -533,10 +562,11 @@ Event_scheduler::run(THD *thd)
     }
     else
     {
-      DBUG_ASSERT(thd->killed);
+      assert(thd->killed);
       DBUG_PRINT("info", ("job_data is NULL, the thread was killed"));
     }
     DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str));
+    free_root(thd->mem_root, MYF(0));
   }
 
   LOCK_DATA();
diff --git a/sql/event_scheduler.h b/sql/event_scheduler.h
index c7a862d977eb..d292a0f4d763 100644
--- a/sql/event_scheduler.h
+++ b/sql/event_scheduler.h
@@ -1,15 +1,22 @@
 #ifndef _EVENT_SCHEDULER_H_
 #define _EVENT_SCHEDULER_H_
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/events.cc b/sql/events.cc
index ec1b61d002f4..ffd9dc5f6889 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -326,7 +333,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data,
     DBUG_RETURN(TRUE);
 
   /* At create, one of them must be set */
-  DBUG_ASSERT(parse_data->expression || parse_data->execute_at);
+  assert(parse_data->expression || parse_data->execute_at);
 
   if (check_access(thd, EVENT_ACL, parse_data->dbname.str, NULL, NULL, 0, 0))
     DBUG_RETURN(TRUE);
@@ -385,7 +392,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data,
     if (!dropped)
     {
       /* Binlog the create event. */
-      DBUG_ASSERT(thd->query().str && thd->query().length);
+      assert(thd->query().str && thd->query().length);
       String log_query;
       if (create_query_string(thd, &log_query))
       {
@@ -405,7 +412,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data,
     }
   }
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   thd->variables.binlog_format= save_binlog_format;
@@ -538,7 +545,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data,
     }
 
     /* Binlog the alter event. */
-    DBUG_ASSERT(thd->query().str && thd->query().length);
+    assert(thd->query().str && thd->query().length);
 
     thd->add_to_binlog_accessed_dbs(parse_data->dbname.str);
     if (new_dbname)
@@ -547,7 +554,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data,
     ret|= write_bin_log(thd, true, thd->query().str, thd->query().length);
   }
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   thd->variables.binlog_format= save_binlog_format;
@@ -601,7 +608,7 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists)
     if (event_queue)
       event_queue->drop_event(thd, dbname, name);
     /* Binlog the drop event. */
-    DBUG_ASSERT(thd->query().str && thd->query().length);
+    assert(thd->query().str && thd->query().length);
 
     thd->add_to_binlog_accessed_dbs(dbname.str);
     ret= write_bin_log(thd, TRUE, thd->query().str, thd->query().length);
@@ -797,7 +804,7 @@ Events::fill_schema_events(THD *thd, TABLE_LIST *tables, Item * /* cond */)
   if (thd->lex->sql_command == SQLCOM_SHOW_EVENTS)
   {
     db= thd->lex->select_lex->db;
-    DBUG_ASSERT(db != NULL);
+    assert(db != NULL);
     /*
       Nobody has EVENT_ACL for I_S and P_S,
       even with a GRANT ALL to *.*,
@@ -916,8 +923,8 @@ Events::init(my_bool opt_noacl_or_bootstrap)
     goto end;
 
 
-  DBUG_ASSERT(opt_event_scheduler == Events::EVENTS_ON ||
-              opt_event_scheduler == Events::EVENTS_OFF);
+  assert(opt_event_scheduler == Events::EVENTS_ON ||
+         opt_event_scheduler == Events::EVENTS_OFF);
 
   if (!(event_queue= new Event_queue) ||
       !(scheduler= new Event_scheduler(event_queue)))
diff --git a/sql/events.h b/sql/events.h
index 99f7fedd3001..a308b4ac80e7 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -1,15 +1,22 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/examples/CMakeLists.txt b/sql/examples/CMakeLists.txt
index abe4de402bfd..3d44cf021928 100644
--- a/sql/examples/CMakeLists.txt
+++ b/sql/examples/CMakeLists.txt
@@ -1,26 +1,29 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFE_MUTEX")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFE_MUTEX")
-
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${CMAKE_SOURCE_DIR}/regex)
 
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
-ADD_LIBRARY(example ha_example.cc)
-ADD_DEPENDENCIES(example GenError)
+  ADD_LIBRARY(example ha_example.cc)
+  ADD_DEPENDENCIES(example GenError)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
diff --git a/sql/field.cc b/sql/field.cc
index 4427bb92cae7..1983d426dff3 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -80,8 +87,8 @@ const char field_separator=',';
 inline int field_type2index (enum_field_types field_type)
 {
   field_type= real_type_to_type(field_type);
-  DBUG_ASSERT(field_type < FIELDTYPE_TEAR_FROM ||
-              field_type > FIELDTYPE_TEAR_TO);
+  assert(field_type < FIELDTYPE_TEAR_FROM ||
+         field_type > FIELDTYPE_TEAR_TO);
   return (field_type < FIELDTYPE_TEAR_FROM ?
           field_type :
           ((int)FIELDTYPE_TEAR_FROM) + (field_type - FIELDTYPE_TEAR_TO) - 1);
@@ -1111,7 +1118,7 @@ static Geometry::wkbType geometry_type_to_wkb_type(Field::geometry_type t)
   case Field::GEOM_GEOMETRYCOLLECTION:
     return Geometry::wkb_geometrycollection;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return Geometry::wkb_invalid_type;
   }
 }
@@ -1591,7 +1598,7 @@ type_conversion_status Field::check_constraints(int mysql_errno)
     nullability is disabled.
   */
 
-  DBUG_ASSERT(!is_tmp_nullable());
+  assert(!is_tmp_nullable());
 
   if (real_maybe_null())
     return TYPE_OK; // If the field is nullable, we're Ok.
@@ -1613,9 +1620,9 @@ type_conversion_status Field::check_constraints(int mysql_errno)
     If the field is of TIMESTAMP its default value is CURRENT_TIMESTAMP
     and was set before calling this method. Therefore m_is_tmp_null == false
     for such field and we leave check_constraints() before this
-    DBUG_ASSERT is fired.
+    assert is fired.
   */
-  DBUG_ASSERT (type() != MYSQL_TYPE_TIMESTAMP);
+  assert (type() != MYSQL_TYPE_TIMESTAMP);
 
   switch (m_count_cuted_fields_saved) {
   case CHECK_FIELD_WARN:
@@ -1629,7 +1636,7 @@ type_conversion_status Field::check_constraints(int mysql_errno)
     return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
   }
 
-  DBUG_ASSERT(0); // impossible
+  assert(0); // impossible
   return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
 }
 
@@ -1688,7 +1695,7 @@ void Field::hash(ulong *nr, ulong *nr2)
 
 size_t Field::do_last_null_byte() const
 {
-  DBUG_ASSERT(!real_maybe_null() || m_null_ptr >= table->record[0]);
+  assert(!real_maybe_null() || m_null_ptr >= table->record[0]);
   return real_maybe_null() ? null_offset() + 1 : (size_t) LAST_NULL_BYTE_UNDEF;
 }
 
@@ -1713,14 +1720,14 @@ bool Field::send_text(Protocol *protocol)
     return protocol->store_null();
   char buff[MAX_FIELD_WIDTH];
   String str(buff, sizeof(buff), &my_charset_bin);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   my_bitmap_map *old_map= 0;
   if (table->file)
     old_map= dbug_tmp_use_all_columns(table, table->read_set);
 #endif
 
   String *res= val_str(&str);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (old_map)
     dbug_tmp_restore_column_map(table->read_set, old_map);
 #endif
@@ -2032,7 +2039,7 @@ type_conversion_status Field_num::store_decimal(const my_decimal *val)
 my_decimal* Field_num::val_decimal(my_decimal *decimal_value)
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(result_type() == INT_RESULT);
+  assert(result_type() == INT_RESULT);
   longlong nr= val_int();
   int2my_decimal(E_DEC_FATAL_ERROR, nr, unsigned_flag, decimal_value);
   return decimal_value;
@@ -2041,14 +2048,14 @@ my_decimal* Field_num::val_decimal(my_decimal *decimal_value)
 
 bool Field_num::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(result_type() == INT_RESULT);
+  assert(result_type() == INT_RESULT);
   return my_longlong_to_datetime_with_warn(val_int(), ltime, fuzzydate);
 }
 
 
 bool Field_num::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(result_type() == INT_RESULT);
+  assert(result_type() == INT_RESULT);
   return my_longlong_to_time_with_warn(val_int(), ltime);
 }
 
@@ -2160,7 +2167,7 @@ bool Field::get_time(MYSQL_TIME *ltime)
 bool Field::get_timestamp(struct timeval *tm, int *warnings)
 {
   MYSQL_TIME ltime;
-  DBUG_ASSERT(!is_null());
+  assert(!is_null());
   return get_date(&ltime, TIME_FUZZY_DATE) ||
          datetime_to_timeval(current_thd, &ltime, tm, warnings);
 }
@@ -2871,8 +2878,8 @@ Field_new_decimal::Field_new_decimal(uchar *ptr_arg,
 {
   precision= my_decimal_length_to_precision(len_arg, dec_arg, unsigned_arg);
   set_if_smaller(precision, DECIMAL_MAX_PRECISION);
-  DBUG_ASSERT((precision <= DECIMAL_MAX_PRECISION) &&
-              (dec <= DECIMAL_MAX_SCALE));
+  assert((precision <= DECIMAL_MAX_PRECISION) &&
+         (dec <= DECIMAL_MAX_SCALE));
   bin_size= my_decimal_get_binary_size(precision, dec);
 }
 
@@ -2888,8 +2895,8 @@ Field_new_decimal::Field_new_decimal(uint32 len_arg,
 {
   precision= my_decimal_length_to_precision(len_arg, dec_arg, unsigned_arg);
   set_if_smaller(precision, DECIMAL_MAX_PRECISION);
-  DBUG_ASSERT((precision <= DECIMAL_MAX_PRECISION) &&
-              (dec <= DECIMAL_MAX_SCALE));
+  assert((precision <= DECIMAL_MAX_PRECISION) &&
+         (dec <= DECIMAL_MAX_SCALE));
   bin_size= my_decimal_get_binary_size(precision, dec);
 }
 
@@ -2900,7 +2907,7 @@ Field *Field_new_decimal::create_from_item (Item *item)
   uint8 intg= item->decimal_precision() - dec;
   uint32 len= item->max_char_length();
 
-  DBUG_ASSERT (item->result_type() == DECIMAL_RESULT);
+  assert (item->result_type() == DECIMAL_RESULT);
 
   /*
     Trying to put too many digits overall in a DECIMAL(prec,dec)
@@ -2988,7 +2995,7 @@ Field_new_decimal::store_value(const my_decimal *decimal_value)
   ASSERT_COLUMN_MARKED_FOR_WRITE;
   type_conversion_status error= TYPE_OK;
   DBUG_ENTER("Field_new_decimal::store_value");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
     DBUG_PRINT("enter", ("value: %s", dbug_decimal_as_string(dbug_buff, decimal_value)));
@@ -3003,7 +3010,7 @@ Field_new_decimal::store_value(const my_decimal *decimal_value)
     error= TYPE_WARN_OUT_OF_RANGE;
     decimal_value= &decimal_zero;
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
     DBUG_PRINT("info", ("saving with precision %d  scale: %d  value %s",
@@ -3057,7 +3064,7 @@ Field_new_decimal::store(const char *from, size_t length,
   if (err != 0)
     set_decimal_warning(this, err, &decimal_value, from, length, charset_arg);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
   DBUG_PRINT("enter", ("value: %s",
                        dbug_decimal_as_string(dbug_buff, &decimal_value)));
@@ -3539,7 +3546,7 @@ int Field_tiny::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_tiny::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 1);
+  assert(length >= 1);
   if (unsigned_flag)
     *to= *ptr;
   else
@@ -3776,7 +3783,7 @@ int Field_short::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_short::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 2);
+  assert(length >= 2);
 #ifdef WORDS_BIGENDIAN
   if (!table->s->db_low_byte_first)
   {
@@ -3983,7 +3990,7 @@ int Field_medium::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_medium::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 3);
+  assert(length >= 3);
   if (unsigned_flag)
     to[0] = ptr[2];
   else
@@ -4162,7 +4169,7 @@ longlong Field_long::val_int(void)
   ASSERT_COLUMN_MARKED_FOR_READ;
   int32 j;
   /* See the comment in Field_long::store(long long) */
-  DBUG_ASSERT(table->in_use == current_thd);
+  assert(table->in_use == current_thd);
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
     j=sint4korr(ptr);
@@ -4231,7 +4238,7 @@ int Field_long::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_long::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 4);  
+  assert(length >= 4);  
 #ifdef WORDS_BIGENDIAN
   if (!table->s->db_low_byte_first)
   {
@@ -4511,7 +4518,7 @@ Field_real::pack(uchar *to, const uchar *from,
                  uint max_length, bool low_byte_first)
 {
   DBUG_ENTER("Field_real::pack");
-  DBUG_ASSERT(max_length >= pack_length());
+  assert(max_length >= pack_length());
 #ifdef WORDS_BIGENDIAN
   if (low_byte_first != table->s->db_low_byte_first)
   {
@@ -4639,7 +4646,7 @@ String *Field_float::val_str(String *val_buffer,
 			     String *val_ptr MY_ATTRIBUTE((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
+  assert(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
   float nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
@@ -4701,7 +4708,7 @@ int Field_float::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_float::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 4);
+  assert(length >= 4);
   float nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
@@ -4977,7 +4984,7 @@ String *Field_double::val_str(String *val_buffer,
 			      String *val_ptr MY_ATTRIBUTE((unused)))
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
+  assert(!zerofill || field_length <= MAX_FIELD_CHARLENGTH);
   double nr;
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)
@@ -5110,7 +5117,7 @@ uint Field_temporal::is_equal(Create_field *new_field)
 my_decimal *Field_temporal::val_decimal(my_decimal *decimal_value)
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(decimals() == 0);
+  assert(decimals() == 0);
   int2my_decimal(E_DEC_FATAL_ERROR, val_int(), 0, decimal_value);
   return decimal_value;
 }
@@ -5170,7 +5177,7 @@ type_conversion_status Field_temporal::store(longlong nr, bool unsigned_val)
     error= store_internal(&ltime, &warnings);
   else
   {
-    DBUG_ASSERT(warnings != 0); // Must be set by convert_number_to_TIME
+    assert(warnings != 0); // Must be set by convert_number_to_TIME
 
     if (warnings & (MYSQL_TIME_WARN_ZERO_DATE |
                     MYSQL_TIME_WARN_ZERO_IN_DATE) &&
@@ -5195,7 +5202,7 @@ Field_temporal::store_lldiv_t(const lldiv_t *lld, int *warnings)
     error= store_internal_with_round(&ltime, warnings);
   else if (!*warnings)
   {
-    DBUG_ASSERT(warnings != 0); // Must be set by convert_number_to_TIME
+    assert(warnings != 0); // Must be set by convert_number_to_TIME
     if (((*warnings & MYSQL_TIME_WARN_ZERO_DATE) != 0 ||
          (*warnings & MYSQL_TIME_WARN_ZERO_IN_DATE) != 0) &&
         !current_thd->is_strict_mode())
@@ -5312,7 +5319,7 @@ Field_temporal_with_date::get_internal_check_zero(MYSQL_TIME *ltime,
 {
   if (get_date_internal(ltime)) /* '0000-00-00' */
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     if (fuzzydate & TIME_NO_ZERO_DATE)
       return true;   
     set_zero_time(ltime, MYSQL_TIMESTAMP_DATETIME);
@@ -5455,10 +5462,10 @@ Field_temporal_with_date::store_time(MYSQL_TIME *ltime,
   case MYSQL_TIMESTAMP_DATE:
     if (check_date(ltime, non_zero_date(ltime), date_flags(), &warnings))
     {
-      DBUG_ASSERT(warnings &
-                  (MYSQL_TIME_WARN_OUT_OF_RANGE |
-                   MYSQL_TIME_WARN_ZERO_DATE |
-                   MYSQL_TIME_WARN_ZERO_IN_DATE));
+      assert(warnings &
+             (MYSQL_TIME_WARN_OUT_OF_RANGE |
+              MYSQL_TIME_WARN_ZERO_DATE |
+              MYSQL_TIME_WARN_ZERO_IN_DATE));
 
       error= time_warning_to_type_conversion_status(warnings);
       reset();
@@ -5507,7 +5514,7 @@ bool Field_temporal_with_date::send_binary(Protocol *protocol)
   if (get_date_internal(&ltime))
   {
     // Only MYSQL_TYPE_TIMESTAMP can return an error in get_date_internal()
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_DATETIME);
   }
   return protocol->store(&ltime, 0);
@@ -5639,7 +5646,7 @@ my_decimal *Field_temporal_with_date_and_timef::val_decimal(my_decimal *dec_arg)
   if (get_date_internal(&ltime))
   {
     // Only MYSQL_TYPE_TIMESTAMP can return an error in get_date_internal()
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_DATETIME);
   }
   return date2my_decimal(&ltime, dec_arg);
@@ -5797,8 +5804,8 @@ void Field_timestamp::store_timestamp_internal(const struct timeval *tm)
 type_conversion_status Field_timestamp::store_packed(longlong nr)
 {
   /* Make sure the stored value was previously properly rounded or truncated */
-  DBUG_ASSERT((MY_PACKED_TIME_GET_FRAC_PART(nr) % 
-              (int) log_10_int[DATETIME_MAX_DECIMALS - decimals()]) == 0);
+  assert((MY_PACKED_TIME_GET_FRAC_PART(nr) % 
+          (int) log_10_int[DATETIME_MAX_DECIMALS - decimals()]) == 0);
   MYSQL_TIME ltime;
   TIME_from_longlong_datetime_packed(&ltime, nr);
   return Field_timestamp::store_time(&ltime, 0);
@@ -5992,7 +5999,7 @@ bool Field_timestampf::get_timestamp(struct timeval *tm, int *warnings)
 {
   THD *thd= table ? table->in_use : current_thd;
   thd->time_zone_used= 1;
-  DBUG_ASSERT(!is_null());
+  assert(!is_null());
   my_timestamp_from_binary(tm, ptr, dec);
   return false;
 }
@@ -6095,7 +6102,7 @@ String *Field_time_common::val_str(String *val_buffer,
   val_buffer->set_charset(&my_charset_numeric);
   if (get_time(&ltime))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_TIME);
   }
   make_time((Date_time_format *) 0, &ltime, val_buffer, dec);
@@ -6115,7 +6122,7 @@ bool Field_time_common::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   MYSQL_TIME tm;
   if (get_time(&tm))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(ltime, MYSQL_TIMESTAMP_TIME);
   }
   time_to_datetime(table ? table->in_use : current_thd, &tm, ltime);
@@ -6129,7 +6136,7 @@ longlong Field_time_common::val_date_temporal()
   MYSQL_TIME time, datetime;
   if (get_time(&time))
   {
-    DBUG_ASSERT(0); // Field_time*::get_time should not fail
+    assert(0); // Field_time*::get_time should not fail
     return 0;
   }
   time_to_datetime(table ? table->in_use : current_thd, &time, &datetime);
@@ -6144,7 +6151,7 @@ bool Field_time_common::send_binary(Protocol *protocol)
     return protocol->store_null();
   if (get_time(&ltime))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_TIME);
   }
   ltime.day= ltime.hour / 24;         // Move hours to days
@@ -6219,7 +6226,7 @@ int Field_time::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_time::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 3);
+  assert(length >= 3);
   to[0] = (uchar) (ptr[2] ^ 128);
   to[1] = ptr[1];
   to[2] = ptr[0];
@@ -6245,7 +6252,7 @@ longlong Field_timef::val_int()
   MYSQL_TIME ltime;
   if (get_time(&ltime))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_TIME);
   }
   longlong tmp= (longlong) TIME_to_ulonglong_time_round(&ltime);
@@ -6259,7 +6266,7 @@ my_decimal *Field_timef::val_decimal(my_decimal *decimal_value)
   MYSQL_TIME ltime;
   if (get_time(&ltime))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(&ltime, MYSQL_TIMESTAMP_TIME);
   }
   return time2my_decimal(&ltime, decimal_value);
@@ -6272,7 +6279,7 @@ double Field_timef::val_real()
   MYSQL_TIME ltime;
   if (get_time(&ltime))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   double tmp= TIME_to_double_time(&ltime);
@@ -6392,7 +6399,7 @@ Field_year::store(const char *from, size_t len,const CHARSET_INFO *cs)
 
 type_conversion_status Field_year::store(double nr)
 {
-  if (nr < 0.0 || nr >= 2155.0)
+  if (nr < 0.0 || nr > 2155.0)
   {
     (void) Field_year::store((longlong) -1, FALSE);
     return TYPE_WARN_OUT_OF_RANGE;
@@ -6458,7 +6465,7 @@ double Field_year::val_real(void)
 longlong Field_year::val_int(void)
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(field_length == 2 || field_length == 4);
+  assert(field_length == 2 || field_length == 4);
   int tmp= (int) ptr[0];
   if (field_length != 4)
     tmp%=100;					// Return last 2 char
@@ -6471,7 +6478,7 @@ longlong Field_year::val_int(void)
 String *Field_year::val_str(String *val_buffer,
 			    String *val_ptr MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(field_length < 5);
+  assert(field_length < 5);
   val_buffer->alloc(5);
   val_buffer->length(field_length);
   char *to=(char*) val_buffer->ptr();
@@ -6625,7 +6632,7 @@ int Field_newdate::cmp(const uchar *a_ptr, const uchar *b_ptr)
 
 void Field_newdate::make_sort_key(uchar *to, size_t length)
 {
-  DBUG_ASSERT(length >= 3);
+  assert(length >= 3);
   to[0] = ptr[2];
   to[1] = ptr[1];
   to[2] = ptr[0];
@@ -7053,7 +7060,7 @@ Field_string::store(const char *from, size_t length,const CHARSET_INFO *cs)
   const char *from_end_pos;
 
   /* See the comment for Field_long::store(long long) */
-  DBUG_ASSERT(table->in_use == current_thd);
+  assert(table->in_use == current_thd);
 
   copy_length= field_well_formed_copy_nchars(field_charset,
                                        (char*) ptr, field_length,
@@ -7116,7 +7123,7 @@ type_conversion_status Field_str::store(double nr)
 
 bool Field::gcol_expr_is_equal(const Field *field) const
 {
-  DBUG_ASSERT(is_gcol() && field->is_gcol());
+  assert(is_gcol() && field->is_gcol());
 
   return gcol_info->expr_item->eq(field->gcol_info->expr_item, true);
 }
@@ -7132,7 +7139,7 @@ bool Field::gcol_expr_is_equal(const Field *field) const
 
 bool Field::gcol_expr_is_equal(const Create_field *field) const
 {
-  DBUG_ASSERT(is_gcol() && field->is_gcol());
+  assert(is_gcol() && field->is_gcol());
 
   return ::is_equal(&gcol_info->expr_str, &field->gcol_info->expr_str);
 }
@@ -7230,7 +7237,7 @@ String *Field_string::val_str(String *val_buffer MY_ATTRIBUTE((unused)),
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
   /* See the comment for Field_long::store(long long) */
-  DBUG_ASSERT(table->in_use == current_thd);
+  assert(table->in_use == current_thd);
   size_t length;
   if (table->in_use->variables.sql_mode &
       MODE_PAD_CHAR_TO_FULL_LENGTH)
@@ -7271,7 +7278,7 @@ static bool
 check_field_for_37426(const void *param_arg)
 {
   Check_field_param *param= (Check_field_param*) param_arg;
-  DBUG_ASSERT(param->field->real_type() == MYSQL_TYPE_STRING);
+  assert(param->field->real_type() == MYSQL_TYPE_STRING);
   DBUG_PRINT("debug", ("Field %s - type: %d, size: %d",
                        param->field->field_name,
                        param->field->real_type(),
@@ -7327,7 +7334,7 @@ void Field_string::make_sort_key(uchar *to, size_t length)
                                   ptr, field_length,
                                   MY_STRXFRM_PAD_WITH_SPACE |
                                   MY_STRXFRM_PAD_TO_MAXLEN);
-  DBUG_ASSERT(tmp == length);
+  assert(tmp == length);
 }
 
 
@@ -7479,8 +7486,8 @@ Field_string::unpack(uchar *to,
 */
 int Field_string::do_save_field_metadata(uchar *metadata_ptr)
 {
-  DBUG_ASSERT(field_length < 1024);
-  DBUG_ASSERT((real_type() & 0xF0) == 0xF0);
+  assert(field_length < 1024);
+  assert((real_type() & 0xF0) == 0xF0);
   DBUG_PRINT("debug", ("field_length: %u, real_type: %u",
                        field_length, real_type()));
   *metadata_ptr= (real_type() ^ ((field_length & 0x300) >> 4));
@@ -7575,7 +7582,7 @@ const uint Field_varstring::MAX_SIZE= UINT_MAX16;
 */
 int Field_varstring::do_save_field_metadata(uchar *metadata_ptr)
 {
-  DBUG_ASSERT(field_length <= 65535);
+  assert(field_length <= 65535);
   int2store((char*)metadata_ptr, field_length);
   return 2;
 }
@@ -7785,7 +7792,7 @@ void Field_varstring::make_sort_key(uchar *to, size_t length)
                                             ptr + length_bytes, tot_length,
                                             MY_STRXFRM_PAD_WITH_SPACE |
                                             MY_STRXFRM_PAD_TO_MAXLEN);
-  DBUG_ASSERT(tot_length == length);
+  assert(tot_length == length);
 }
 
 
@@ -7996,8 +8003,8 @@ uint Field_varstring::is_equal(Create_field *new_field)
   {
     if (new_field->length == max_display_length())
       return IS_EQUAL_YES;
-    DBUG_ASSERT(0 == (new_field->length % field_charset->mbmaxlen));
-    DBUG_ASSERT(0 == (max_display_length() % field_charset->mbmaxlen));
+    assert(0 == (new_field->length % field_charset->mbmaxlen));
+    assert(0 == (max_display_length() % field_charset->mbmaxlen));
     if (new_field->length > max_display_length() &&
 	((new_field->length <= 255 && max_display_length() <= 255) ||
 	 (new_field->length > 255 && max_display_length() > 255)))
@@ -8037,7 +8044,7 @@ Field_blob::Field_blob(uchar *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
                  cs),
    packlength(blob_pack_length), m_keep_old_value(false)
 {
-  DBUG_ASSERT(blob_pack_length <= 4); // Only pack lengths 1-4 supported currently
+  assert(blob_pack_length <= 4); // Only pack lengths 1-4 supported currently
   flags|= BLOB_FLAG;
   share->blob_fields++;
   /* TODO: why do not fill table->s->blob_field array here? */
@@ -8164,8 +8171,8 @@ Field_blob::store_to_mem(const char *from, size_t length,
     queries having GROUP_CONCAT with ORDER BY or DISTINCT,
     hence some assersions:
   */
-  DBUG_ASSERT(field_charset == cs);
-  DBUG_ASSERT(length <= max_data_length());
+  assert(field_charset == cs);
+  assert(length <= max_data_length());
 
   if (length > max_length)
   {
@@ -8537,7 +8544,7 @@ void Field_blob::make_sort_key(uchar *to, size_t length)
                                                blob, blob_length,
                                                MY_STRXFRM_PAD_WITH_SPACE |
                                                MY_STRXFRM_PAD_TO_MAXLEN);
-    DBUG_ASSERT(blob_length == length);
+    assert(blob_length == length);
   }
 }
 
@@ -8621,7 +8628,7 @@ const uchar *Field_blob::unpack(uchar *to,
   bitmap_set_bit(table->write_set, field_index);
   Field_blob::store(pointer_cast<const char*>(from) + master_packlength,
                     length, field_charset);
-#ifndef DBUG_OFF  
+#ifndef NDEBUG
   uchar *vptr;
   get_ptr(&vptr);
   DBUG_DUMP("field", ptr, pack_length() /* len bytes + ptr bytes */);
@@ -8641,7 +8648,7 @@ uint Field_blob::packed_col_length(const uchar *data_ptr, uint length)
 uint Field_blob::max_packed_col_length()
 {
   // We do not use addon fields for blobs.
-  DBUG_ASSERT(false);
+  assert(false);
   const uint max_length= pack_length();
   return (max_length > 255 ? 2 : 1) + max_length;
 }
@@ -8729,17 +8736,17 @@ type_conversion_status
 Field_geom::store_internal(const char *from, size_t length,
                            const CHARSET_INFO *cs)
 {
-  DBUG_ASSERT(length > 0);
-
   // Check that the given WKB
-  // 1. isn't marked as bad geometry data
-  // 2. isn't shorter than empty geometrycollection
-  // 3. is a valid geometry type
-  // 4. is well formed
-  if (from == Geometry::bad_geometry_data.ptr() ||                    // 1
-      length < SRID_SIZE + WKB_HEADER_SIZE + sizeof(uint32) ||        // 2
-      !Geometry::is_valid_geotype(uint4korr(from + SRID_SIZE + 1)) || // 3
-      !Geometry::is_well_formed(from, length,                         // 4
+  // 1. is at least 13 bytes long (length of GEOMETRYCOLLECTION EMPTY)
+  // 2. isn't marked as bad geometry data
+  // 3. isn't shorter than empty geometrycollection
+  // 4. is a valid geometry type
+  // 5. is well formed
+  if (length < 13 ||                                                  // 1
+      from == Geometry::bad_geometry_data.ptr() ||                    // 2
+      length < SRID_SIZE + WKB_HEADER_SIZE + sizeof(uint32) ||        // 3
+      !Geometry::is_valid_geotype(uint4korr(from + SRID_SIZE + 1)) || // 4
+      !Geometry::is_well_formed(from, length,                         // 5
                                 geometry_type_to_wkb_type(geom_type),
                                 Geometry::wkb_ndr))
   {
@@ -8782,7 +8789,7 @@ void Field_json::sql_type(String &str) const
 /// Create a shallow clone of this field in the specified MEM_ROOT.
 Field_json *Field_json::clone(MEM_ROOT *mem_root) const
 {
-  DBUG_ASSERT(type() == MYSQL_TYPE_JSON);
+  assert(type() == MYSQL_TYPE_JSON);
   return new (mem_root) Field_json(*this);
 }
 
@@ -8790,7 +8797,7 @@ Field_json *Field_json::clone(MEM_ROOT *mem_root) const
 /// Create a shallow clone of this field.
 Field_json *Field_json::clone() const
 {
-  DBUG_ASSERT(type() == MYSQL_TYPE_JSON);
+  assert(type() == MYSQL_TYPE_JSON);
   return new Field_json(*this);
 }
 
@@ -8914,7 +8921,7 @@ type_conversion_status Field_json::store_binary(const char *ptr, size_t length)
     be converted to the JSON null literal when they are read with
     Field_json::val_json().
   */
-  DBUG_ASSERT(length == 0 || json_binary::parse_binary(ptr, length).is_valid());
+  assert(length == 0 || json_binary::parse_binary(ptr, length).is_valid());
 
   if (value.length() > UINT_MAX32)
   {
@@ -8966,9 +8973,7 @@ type_conversion_status Field_json::store_json(Json_wrapper *json)
 {
   ASSERT_COLUMN_MARKED_FOR_WRITE;
 
-  json_binary::Value json_val= json->to_value();
-  if (json_val.type() == json_binary::Value::ERROR ||
-      json_val.raw_binary(&value))
+  if (json->to_binary(&value))
     return TYPE_ERR_BAD_VALUE;
 
   return store_binary(value.ptr(), value.length());
@@ -8988,7 +8993,7 @@ type_conversion_status Field_json::store(Field_json *field)
     don't need to handle it here for now. Assert that field is not
     null.
   */
-  DBUG_ASSERT(!field->is_null());
+  assert(!field->is_null());
 
   String tmp;
   String *s= field->Field_blob::val_str(&tmp, &tmp);
@@ -8999,7 +9004,7 @@ type_conversion_status Field_json::store(Field_json *field)
 bool Field_json::val_json(Json_wrapper *wr)
 {
   ASSERT_COLUMN_MARKED_FOR_READ;
-  DBUG_ASSERT(!is_null());
+  assert(!is_null());
 
   String tmp;
   String *s= Field_blob::val_str(&tmp, &tmp);
@@ -9164,37 +9169,52 @@ enum ha_base_keytype Field_enum::key_type() const
 void Field_enum::store_type(ulonglong value)
 {
   switch (packlength) {
-  case 1: ptr[0]= (uchar) value;  break;
+  case 1: ptr[0]= (uchar) value;
+    break;
   case 2:
 #ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
-  {
-    int2store(ptr,(unsigned short) value);
-  }
-  else
-#endif
+    if (table->s->db_low_byte_first)
+    {
+      int2store(ptr,(unsigned short) value);
+    }
+    else
+    {
+      shortstore(ptr,(unsigned short) value);
+    }
+#else
     shortstore(ptr,(unsigned short) value);
-  break;
-  case 3: int3store(ptr,(long) value); break;
+#endif
+    break;
+  case 3: int3store(ptr,(long) value);
+    break;
   case 4:
 #ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
-  {
-    int4store(ptr,value);
-  }
-  else
-#endif
+    if (table->s->db_low_byte_first)
+    {
+      int4store(ptr,value);
+    }
+    else
+    {
+      longstore(ptr,(long) value);
+    }
+#else
     longstore(ptr,(long) value);
-  break;
+#endif
+    break;
   case 8:
 #ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
-  {
-    int8store(ptr,value);
-  }
-  else
+    if (table->s->db_low_byte_first)
+    {
+      int8store(ptr,value);
+    }
+    else
+    {
+      longlongstore(ptr,value);
+    }
+#else
+    longlongstore(ptr,value);
 #endif
-    longlongstore(ptr,value); break;
+    break;
   }
 }
 
@@ -9662,14 +9682,14 @@ uchar *Field_enum::pack(uchar *to, const uchar *from,
   switch (packlength)
   {
   case 1:
-    *to = *from;
+    if (max_length > 0) *to = *from;
     DBUG_RETURN(to + 1);
   case 2: DBUG_RETURN(pack_int16(to, from, low_byte_first));
   case 3: DBUG_RETURN(pack_int24(to, from, low_byte_first));
   case 4: DBUG_RETURN(pack_int32(to, from, low_byte_first));
   case 8: DBUG_RETURN(pack_int64(to, from, low_byte_first));
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   MY_ASSERT_UNREACHABLE();
   DBUG_RETURN(NULL);
@@ -9693,7 +9713,7 @@ const uchar *Field_enum::unpack(uchar *to, const uchar *from,
   case 4: DBUG_RETURN(unpack_int32(to, from, low_byte_first));
   case 8: DBUG_RETURN(unpack_int64(to, from, low_byte_first));
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   MY_ASSERT_UNREACHABLE();
   DBUG_RETURN(NULL);
@@ -10128,7 +10148,7 @@ Field_bit::compatible_field_size(uint field_metadata,
                                  int *order_var)
 {
   DBUG_ENTER("Field_bit::compatible_field_size");
-  DBUG_ASSERT((field_metadata >> 16) == 0);
+  assert((field_metadata >> 16) == 0);
   uint from_bit_len= 8 * (field_metadata >> 8) + (field_metadata & 0xff);
   uint to_bit_len= max_display_length();
   DBUG_PRINT("debug", ("from_bit_len: %u, to_bit_len: %u",
@@ -10165,7 +10185,7 @@ uchar *
 Field_bit::pack(uchar *to, const uchar *from, uint max_length,
                 bool low_byte_first MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(max_length > 0);
+  assert(max_length > 0);
   uint length;
   if (bit_len > 0)
   {
@@ -10440,7 +10460,7 @@ void Create_field::init_for_tmp_table(enum_field_types sql_type_arg,
     break;
 
   case MYSQL_TYPE_NEWDECIMAL:
-    DBUG_ASSERT(decimals_arg <= DECIMAL_MAX_SCALE);
+    assert(decimals_arg <= DECIMAL_MAX_SCALE);
   case MYSQL_TYPE_DECIMAL:
   case MYSQL_TYPE_FLOAT:
   case MYSQL_TYPE_DOUBLE:
@@ -10484,7 +10504,7 @@ void Create_field::init_for_tmp_table(enum_field_types sql_type_arg,
       If you are going to use the above types, you have to pass a
       pack_length as parameter. Assert that is really done.
     */
-    DBUG_ASSERT(pack_length_arg != ~0U);
+    assert(pack_length_arg != ~0U);
     pack_flag|= pack_length_to_packflag(pack_length_arg);
     break;
   default:
@@ -10617,7 +10637,7 @@ bool Create_field::init(THD *thd, const char *fld_name,
   /* Initialize data for a virtual field */
   if (gcol_info)
   {
-    DBUG_ASSERT(gcol_info->expr_item);
+    assert(gcol_info->expr_item);
     stored_in_db= gcol_info->get_field_stored();
     /*
       Perform per item-type checks to determine if the expression is 
@@ -10865,7 +10885,7 @@ bool Create_field::init(THD *thd, const char *fld_name,
         and 19 as length of 4.1 compatible representation.  Silently 
         shrink it to MAX_DATETIME_COMPRESSED_WIDTH.
       */
-      DBUG_ASSERT(MAX_DATETIME_COMPRESSED_WIDTH < UINT_MAX);
+      assert(MAX_DATETIME_COMPRESSED_WIDTH < UINT_MAX);
       if (length != UINT_MAX)  /* avoid overflow; is safe because of min() */
         length= ((length+1)/2)*2;
       length= min<size_t>(length, MAX_DATETIME_COMPRESSED_WIDTH);
@@ -10922,7 +10942,7 @@ bool Create_field::init(THD *thd, const char *fld_name,
       break;
    }
   case MYSQL_TYPE_VAR_STRING:
-    DBUG_ASSERT(0);  /* Impossible. */
+    assert(0);  /* Impossible. */
     break;
   case MYSQL_TYPE_BIT:
     {
@@ -10941,7 +10961,7 @@ bool Create_field::init(THD *thd, const char *fld_name,
       break;
     }
   case MYSQL_TYPE_DECIMAL:
-    DBUG_ASSERT(0); /* Was obsolete */
+    assert(0); /* Was obsolete */
  }
   /* Remember the value of length */
   char_length= length;
@@ -11398,7 +11418,7 @@ uint32 Field_blob::char_length()
   case 4:
     return (uint32) 4294967295U;
   default:
-    DBUG_ASSERT(0); // we should never go here
+    assert(0); // we should never go here
     return 0;
   }
 }
@@ -11463,7 +11483,7 @@ uint32 Field_blob::max_display_length()
   case 4:
     return (uint32) 4294967295U;
   default:
-    DBUG_ASSERT(0); // we should never go here
+    assert(0); // we should never go here
     return 0;
   }
 }
diff --git a/sql/field.h b/sql/field.h
index 9a788aab0b91..68dabbe44cd9 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1,16 +1,23 @@
 #ifndef FIELD_INCLUDED
 #define FIELD_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -212,7 +219,7 @@ decimal_err_to_type_conv_status(int dec_error)
     return TYPE_OK;
 
   // impossible
-  DBUG_ASSERT(false);
+  assert(false);
   return TYPE_ERR_BAD_VALUE;
 }
 
@@ -239,16 +246,16 @@ time_warning_to_type_conversion_status(const int warn)
     // date was fine but pointed to daylight saving time switch gap
     return TYPE_OK;
 
-  DBUG_ASSERT(!warn);
+  assert(!warn);
   return TYPE_OK;
 }
 
 #define ASSERT_COLUMN_MARKED_FOR_READ \
-DBUG_ASSERT(!table || (!table->read_set || \
-                       bitmap_is_set(table->read_set, field_index)))
+  assert(!table || (!table->read_set ||                                 \
+                    bitmap_is_set(table->read_set, field_index)))
 #define ASSERT_COLUMN_MARKED_FOR_WRITE \
-DBUG_ASSERT(!table || (!table->write_set || \
-                       bitmap_is_set(table->write_set, field_index)))
+  assert(!table || (!table->write_set ||                                \
+                    bitmap_is_set(table->write_set, field_index)))
 
 
 /**
@@ -591,7 +598,7 @@ class Field: public Proto_field
     return alloc_root(mem_root, size);
   }
   static void operator delete(void *ptr, MEM_ROOT *mem_root)
-  { DBUG_ASSERT(false); /* never called */ }
+  { assert(false); /* never called */ }
 
   static void operator delete(void *ptr_arg, size_t size) throw()
   { TRASH(ptr_arg, size); }
@@ -835,7 +842,7 @@ class Field: public Proto_field
   */
   virtual longlong val_time_temporal()
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   /**
@@ -845,7 +852,7 @@ class Field: public Proto_field
   */
   virtual longlong val_date_temporal()
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   /**
@@ -857,7 +864,7 @@ class Field: public Proto_field
     // Return longlong TIME or DATETIME representation, depending on field type
     if (type() == MYSQL_TYPE_TIME)
       return val_time_temporal();
-    DBUG_ASSERT(is_temporal_with_date());
+    assert(is_temporal_with_date());
     return val_date_temporal();
   }
   virtual my_decimal *val_decimal(my_decimal *)= 0;
@@ -995,7 +1002,7 @@ class Field: public Proto_field
    Since this interface relies on the caller to truncate the value according to this
    Field's scale, it will work with all constructs that we currently allow.
   */
-  virtual void store_timestamp(const timeval *tm) { DBUG_ASSERT(false); }
+  virtual void store_timestamp(const timeval *tm) { assert(false); }
 
   /**
      Interface for legacy code. Newer code uses the store_timestamp(const
@@ -1222,7 +1229,7 @@ class Field: public Proto_field
   size_t last_null_byte() const {
     size_t bytes= do_last_null_byte();
     DBUG_PRINT("debug", ("last_null_byte() ==> %ld", (long) bytes));
-    DBUG_ASSERT(bytes <= table->s->null_bytes);
+    assert(bytes <= table->s->null_bytes);
     return bytes;
   }
 
@@ -1501,10 +1508,10 @@ class Field: public Proto_field
   virtual geometry_type get_geometry_type() const
   {
     /* shouldn't get here. */
-    DBUG_ASSERT(0);
+    assert(0);
     return GEOM_GEOMETRY;
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* Print field value into debug trace, in NULL-aware way. */
   void dbug_print()
   {
@@ -1530,7 +1537,7 @@ class Field: public Proto_field
 
   void set_storage_type(ha_storage_media storage_type_arg)
   {
-    DBUG_ASSERT(field_storage_type() == HA_SM_DEFAULT);
+    assert(field_storage_type() == HA_SM_DEFAULT);
     flags |= (storage_type_arg << FIELD_FLAGS_STORAGE_MEDIA);
   }
 
@@ -1542,7 +1549,7 @@ class Field: public Proto_field
 
   void set_column_format(column_format_type column_format_arg)
   {
-    DBUG_ASSERT(column_format() == COLUMN_FORMAT_TYPE_DEFAULT);
+    assert(column_format() == COLUMN_FORMAT_TYPE_DEFAULT);
     flags |= (column_format_arg << FIELD_FLAGS_COLUMN_FORMAT);
   }
 
@@ -1560,7 +1567,7 @@ class Field: public Proto_field
   */
   virtual ulonglong get_max_int_value() const
   {
-    DBUG_ASSERT(false);
+    assert(false);
     return 0ULL;
   }
 
@@ -1883,7 +1890,7 @@ class Field_longstr :public Field_str
   uint32 max_data_length() const;
   bool is_updatable() const
   {
-    DBUG_ASSERT(table && table->write_set);
+    assert(table && table->write_set);
     return bitmap_is_set(table->write_set, field_index);
   }
 };
@@ -1942,11 +1949,11 @@ class Field_decimal :public Field_real {
   bool zero_pack() const { return 0; }
   void sql_type(String &str) const;
   Field_decimal *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DECIMAL);
+    assert(type() == MYSQL_TYPE_DECIMAL);
     return new (mem_root) Field_decimal(*this);
   }
   Field_decimal *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DECIMAL);
+    assert(type() == MYSQL_TYPE_DECIMAL);
     return new Field_decimal(*this);
   }
   virtual const uchar *unpack(uchar* to, const uchar *from,
@@ -2014,11 +2021,11 @@ class Field_new_decimal :public Field_num {
                              uint16 mflags, int *order_var);
   uint is_equal(Create_field *new_field);
   Field_new_decimal *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_NEWDECIMAL);
+    assert(type() == MYSQL_TYPE_NEWDECIMAL);
     return new (mem_root) Field_new_decimal(*this);
   }
   Field_new_decimal *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_NEWDECIMAL);
+    assert(type() == MYSQL_TYPE_NEWDECIMAL);
     return new Field_new_decimal(*this);
   }
   virtual const uchar *unpack(uchar* to, const uchar *from,
@@ -2057,17 +2064,17 @@ class Field_tiny :public Field_num {
   void sql_type(String &str) const;
   uint32 max_display_length() { return 4; }
   Field_tiny *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_TINY);
+    assert(type() == MYSQL_TYPE_TINY);
     return new (mem_root) Field_tiny(*this);
   }
   Field_tiny *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TINY);
+    assert(type() == MYSQL_TYPE_TINY);
     return new Field_tiny(*this);
   }
   virtual uchar *pack(uchar* to, const uchar *from,
                       uint max_length, bool low_byte_first)
   {
-    *to= *from;
+    if (max_length > 0) *to= *from;
     return to + 1;
   }
 
@@ -2119,11 +2126,11 @@ class Field_short :public Field_num {
   void sql_type(String &str) const;
   uint32 max_display_length() { return 6; }
   Field_short *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_SHORT);
+    assert(type() == MYSQL_TYPE_SHORT);
     return new (mem_root) Field_short(*this);
   }
   Field_short *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_SHORT);
+    assert(type() == MYSQL_TYPE_SHORT);
     return new Field_short(*this);
   }
   virtual uchar *pack(uchar* to, const uchar *from,
@@ -2177,11 +2184,11 @@ class Field_medium :public Field_num {
   void sql_type(String &str) const;
   uint32 max_display_length() { return 8; }
   Field_medium *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_INT24);
+    assert(type() == MYSQL_TYPE_INT24);
     return new (mem_root) Field_medium(*this);
   }
   Field_medium *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_INT24);
+    assert(type() == MYSQL_TYPE_INT24);
     return new Field_medium(*this);
   }
   virtual uchar *pack(uchar* to, const uchar *from,
@@ -2244,11 +2251,11 @@ class Field_long :public Field_num {
   void sql_type(String &str) const;
   uint32 max_display_length() { return MY_INT32_NUM_DECIMAL_DIGITS; }
   Field_long *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_LONG);
+    assert(type() == MYSQL_TYPE_LONG);
     return new (mem_root) Field_long(*this);
   }
   Field_long *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_LONG);
+    assert(type() == MYSQL_TYPE_LONG);
     return new Field_long(*this);
   }
   virtual uchar *pack(uchar* to, const uchar *from,
@@ -2313,11 +2320,11 @@ class Field_longlong :public Field_num {
   bool can_be_compared_as_longlong() const { return true; }
   uint32 max_display_length() { return 20; }
   Field_longlong *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_LONGLONG);
+    assert(type() == MYSQL_TYPE_LONGLONG);
     return new (mem_root) Field_longlong(*this);
   }
   Field_longlong *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_LONGLONG);
+    assert(type() == MYSQL_TYPE_LONGLONG);
     return new Field_longlong(*this);
   }
   virtual uchar *pack(uchar* to, const uchar *from,
@@ -2376,11 +2383,11 @@ class Field_float :public Field_real {
   uint row_pack_length() const { return pack_length(); }
   void sql_type(String &str) const;
   Field_float *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_FLOAT);
+    assert(type() == MYSQL_TYPE_FLOAT);
     return new (mem_root) Field_float(*this);
   }
   Field_float *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_FLOAT);
+    assert(type() == MYSQL_TYPE_FLOAT);
     return new Field_float(*this);
   }
 
@@ -2438,11 +2445,11 @@ class Field_double :public Field_real {
   uint row_pack_length() const { return pack_length(); }
   void sql_type(String &str) const;
   Field_double *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DOUBLE);
+    assert(type() == MYSQL_TYPE_DOUBLE);
     return new (mem_root) Field_double(*this);
   }
   Field_double *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DOUBLE);
+    assert(type() == MYSQL_TYPE_DOUBLE);
     return new Field_double(*this);
   }
 
@@ -2500,11 +2507,11 @@ class Field_null :public Field_str {
   void sql_type(String &str) const;
   uint32 max_display_length() { return 4; }
   Field_null *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_NULL);
+    assert(type() == MYSQL_TYPE_NULL);
     return new (mem_root) Field_null(*this);
   }
   Field_null *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_NULL);
+    assert(type() == MYSQL_TYPE_NULL);
     return new Field_null(*this);
   }
 };
@@ -2940,12 +2947,12 @@ class Field_timestamp :public Field_temporal_with_date_and_time {
   bool get_timestamp(struct timeval *tm, int *warnings);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate);
   Field_timestamp *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     return new (mem_root) Field_timestamp(*this);
   }
   Field_timestamp *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     return new Field_timestamp(*this);
   }
   uchar *pack(uchar *to, const uchar *from,
@@ -2998,12 +3005,12 @@ class Field_timestampf :public Field_temporal_with_date_and_timef {
                    uint8 dec_arg);
   Field_timestampf *clone(MEM_ROOT *mem_root) const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     return new (mem_root) Field_timestampf(*this);
   }
   Field_timestampf *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIMESTAMP);
+    assert(type() == MYSQL_TYPE_TIMESTAMP);
     return new Field_timestampf(*this);
   }
 
@@ -3055,11 +3062,11 @@ class Field_year :public Field_tiny {
   void sql_type(String &str) const;
   bool can_be_compared_as_longlong() const { return true; }
   Field_year *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_YEAR);
+    assert(type() == MYSQL_TYPE_YEAR);
     return new (mem_root) Field_year(*this);
   }
   Field_year *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_YEAR);
+    assert(type() == MYSQL_TYPE_YEAR);
     return new Field_year(*this);
   }
 };
@@ -3105,14 +3112,14 @@ class Field_newdate :public Field_temporal_with_date {
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate);
   Field_newdate *clone(MEM_ROOT *mem_root) const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATE);
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_NEWDATE);
+    assert(type() == MYSQL_TYPE_DATE);
+    assert(real_type() == MYSQL_TYPE_NEWDATE);
     return new (mem_root) Field_newdate(*this);
   }
   Field_newdate *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATE);
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_NEWDATE);
+    assert(type() == MYSQL_TYPE_DATE);
+    assert(real_type() == MYSQL_TYPE_NEWDATE);
     return new Field_newdate(*this);
   }
 };
@@ -3216,11 +3223,11 @@ class Field_time :public Field_time_common {
   void sql_type(String &str) const;
   bool zero_pack() const { return 1; }
   Field_time *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIME);
+    assert(type() == MYSQL_TYPE_TIME);
     return new (mem_root) Field_time(*this);
   }
   Field_time *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIME);
+    assert(type() == MYSQL_TYPE_TIME);
     return new Field_time(*this);
   }
 };
@@ -3266,12 +3273,12 @@ class Field_timef :public Field_time_common {
   { }
   Field_timef *clone(MEM_ROOT *mem_root) const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIME);
+    assert(type() == MYSQL_TYPE_TIME);
     return new (mem_root) Field_timef(*this);
   }
   Field_timef *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_TIME);
+    assert(type() == MYSQL_TYPE_TIME);
     return new Field_timef(*this);
   }
   uint decimals() const { return dec; }
@@ -3376,12 +3383,12 @@ class Field_datetime :public Field_temporal_with_date_and_time {
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate);
   Field_datetime *clone(MEM_ROOT *mem_root) const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATETIME);
+    assert(type() == MYSQL_TYPE_DATETIME);
     return new (mem_root) Field_datetime(*this);
   }
   Field_datetime *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATETIME);
+    assert(type() == MYSQL_TYPE_DATETIME);
     return new Field_datetime(*this);
   }
   uchar *pack(uchar* to, const uchar *from,
@@ -3440,12 +3447,12 @@ class Field_datetimef :public Field_temporal_with_date_and_timef {
     {}
   Field_datetimef *clone(MEM_ROOT *mem_root) const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATETIME);
+    assert(type() == MYSQL_TYPE_DATETIME);
     return new (mem_root) Field_datetimef(*this);
   }
   Field_datetimef *clone() const
   {
-    DBUG_ASSERT(type() == MYSQL_TYPE_DATETIME);
+    assert(type() == MYSQL_TYPE_DATETIME);
     return new Field_datetimef(*this);
   }
 
@@ -3542,11 +3549,11 @@ class Field_string :public Field_longstr {
   { return charset() == &my_charset_bin ? FALSE : TRUE; }
   Field *new_field(MEM_ROOT *root, TABLE *new_table, bool keep_type);
   Field_string *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_STRING);
+    assert(real_type() == MYSQL_TYPE_STRING);
     return new (mem_root) Field_string(*this);
   }
   Field_string *clone() const {
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_STRING);
+    assert(real_type() == MYSQL_TYPE_STRING);
     return new Field_string(*this);
   }
   virtual size_t get_key_image(uchar *buff, size_t length, imagetype type);
@@ -3639,13 +3646,13 @@ class Field_varstring :public Field_longstr {
                        uchar *new_ptr, uchar *new_null_ptr,
                        uint new_null_bit);
   Field_varstring *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_VARCHAR);
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_VARCHAR);
+    assert(type() == MYSQL_TYPE_VARCHAR);
+    assert(real_type() == MYSQL_TYPE_VARCHAR);
     return new (mem_root) Field_varstring(*this);
   }
   Field_varstring *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_VARCHAR);
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_VARCHAR);
+    assert(type() == MYSQL_TYPE_VARCHAR);
+    assert(real_type() == MYSQL_TYPE_VARCHAR);
     return new Field_varstring(*this);
   }
   uint is_equal(Create_field *new_field);
@@ -3797,8 +3804,8 @@ class Field_blob :public Field_longstr {
   }
   void reset_fields()
   { 
-    memset(&value, 0, sizeof(value)); 
-    memset(&old_value, 0, sizeof(old_value));
+    value= String();
+    old_value= String();
   }
   size_t get_field_buffer_size() { return value.alloced_length(); }
 #ifndef WORDS_BIGENDIAN
@@ -3861,11 +3868,11 @@ class Field_blob :public Field_longstr {
     return 0;
   }
   Field_blob *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_BLOB);
+    assert(type() == MYSQL_TYPE_BLOB);
     return new (mem_root) Field_blob(*this);
   }
   Field_blob *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_BLOB);
+    assert(type() == MYSQL_TYPE_BLOB);
     return new Field_blob(*this);
   }
   virtual uchar *pack(uchar *to, const uchar *from,
@@ -3880,7 +3887,7 @@ class Field_blob :public Field_longstr {
     value.mem_free();
     old_value.mem_free();
   }
-  inline void clear_temporary() { memset(&value, 0, sizeof(value)); }
+  inline void clear_temporary() { value= String(); }
   friend type_conversion_status field_conv(Field *to,Field *from);
   bool has_charset(void) const
   { return charset() == &my_charset_bin ? FALSE : TRUE; }
@@ -3909,7 +3916,7 @@ class Field_blob :public Field_longstr {
       We should only need to keep a copy of the blob 'value' in the case
       where this is a virtual genarated column (that is indexed).
     */
-    DBUG_ASSERT(is_virtual_gcol());
+    assert(is_virtual_gcol());
 
     /*
       If set to true, ensure that 'value' is copied to 'old_value' when
@@ -3956,7 +3963,7 @@ class Field_blob :public Field_longstr {
       We should only need to keep a copy of the blob value in the case
       where this is a virtual genarated column (that is indexed).
     */
-    DBUG_ASSERT(is_virtual_gcol());
+    assert(is_virtual_gcol());
 
     // Transfer ownership of the current BLOB value to old_value
     if (m_keep_old_value)
@@ -4021,11 +4028,11 @@ class Field_geom :public Field_blob {
 
   geometry_type get_geometry_type() const { return geom_type; };
   Field_geom *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_GEOMETRY);
+    assert(type() == MYSQL_TYPE_GEOMETRY);
     return new (mem_root) Field_geom(*this);
   }
   Field_geom *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_GEOMETRY);
+    assert(type() == MYSQL_TYPE_GEOMETRY);
     return new Field_geom(*this);
   }
   uint is_equal(Create_field *new_field);
@@ -4191,11 +4198,11 @@ class Field_enum :public Field_str {
   /* enum and set are sorted as integers */
   CHARSET_INFO *sort_charset(void) const { return &my_charset_bin; }
   Field_enum *clone(MEM_ROOT *mem_root) const {
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_ENUM);
+    assert(real_type() == MYSQL_TYPE_ENUM);
     return new (mem_root) Field_enum(*this);
   }
   Field_enum *clone() const { 
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_ENUM);
+    assert(real_type() == MYSQL_TYPE_ENUM);
     return new Field_enum(*this);
   }
   virtual uchar *pack(uchar *to, const uchar *from,
@@ -4237,11 +4244,11 @@ class Field_set :public Field_enum {
   enum_field_types real_type() const { return MYSQL_TYPE_SET; }
   bool has_charset(void) const { return TRUE; }
   Field_set *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_SET);
+    assert(real_type() == MYSQL_TYPE_SET);
     return new (mem_root) Field_set(*this);
   }
   Field_set *clone() const {
-    DBUG_ASSERT(real_type() == MYSQL_TYPE_SET);
+    assert(real_type() == MYSQL_TYPE_SET);
     return new Field_set(*this);
   }
 private:
@@ -4297,7 +4304,7 @@ class Field_bit :public Field {
   my_decimal *val_decimal(my_decimal *);
   int cmp(const uchar *a, const uchar *b)
   {
-    DBUG_ASSERT(ptr == a || ptr == b);
+    assert(ptr == a || ptr == b);
     if (ptr == a)
       return Field_bit::key_cmp(b, bytes_in_rec+MY_TEST(bit_len));
     else
@@ -4355,11 +4362,11 @@ class Field_bit :public Field {
   }
   void hash(ulong *nr, ulong *nr2);
   Field_bit *clone(MEM_ROOT *mem_root) const { 
-    DBUG_ASSERT(type() == MYSQL_TYPE_BIT);
+    assert(type() == MYSQL_TYPE_BIT);
     return new (mem_root) Field_bit(*this);
   }
   Field_bit *clone() const {
-    DBUG_ASSERT(type() == MYSQL_TYPE_BIT);
+    assert(type() == MYSQL_TYPE_BIT);
     return new Field_bit(*this);
   }
 private:
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 8ec25a09dbdc..6b6a0faea5e6 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -159,7 +166,7 @@ type_conversion_status set_field_to_null(Field *field)
       my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
     return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
   }
-  DBUG_ASSERT(false); // impossible
+  assert(false); // impossible
 
   return TYPE_ERR_NULL_CONSTRAINT_VIOLATION; // to avoid compiler's warning
 }
@@ -210,8 +217,22 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions)
   if (field->type() == MYSQL_TYPE_TIMESTAMP &&
       !field->table->in_use->variables.explicit_defaults_for_timestamp)
   {
-    Item_func_now_local::store_in(field);
-    return TYPE_OK;			// Ok to set time to NULL
+   /*
+     With explicit_defaults_for_timestamp disabled, if a NULL value is inserted
+     into a timestamp column with NOT NULL attribute, would attempt to convert
+     the column value to CURRENT_TIMESTAMP. However, this is inconsistent with
+     the source of the generated value, so the insertion is rejected.
+   */
+   if (field->is_gcol())
+   {
+     my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
+     return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
+   }
+   else
+   {
+     Item_func_now_local::store_in(field);
+     return TYPE_OK;  // Ok to set time to NULL
+   }
   }
 
   // Note: we ignore any potential failure of reset() here.
@@ -232,6 +253,13 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions)
 
   switch (field->table->in_use->count_cuted_fields) {
   case CHECK_FIELD_WARN:
+    // There's no valid conversion for geometry values.
+    if (field->type() == MYSQL_TYPE_GEOMETRY)
+    {
+      my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
+      return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
+    }
+
     field->set_warning(Sql_condition::SL_WARNING, ER_BAD_NULL_ERROR, 1);
     /* fall through */
   case CHECK_FIELD_IGNORE:
@@ -241,7 +269,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions)
       my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name);
     return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
   }
-  DBUG_ASSERT(false); // impossible
+  assert(false); // impossible
   return TYPE_ERR_NULL_CONSTRAINT_VIOLATION;
 }
 
@@ -318,9 +346,23 @@ static void do_copy_next_number(Copy_field *copy)
 
 static void do_copy_blob(Copy_field *copy)
 {
-  ulong length=((Field_blob*) copy->from_field())->get_length();
-  ((Field_blob*) copy->to_field())->store_length(length);
+  ulong from_length=((Field_blob*) copy->from_field())->get_length();
+  ((Field_blob*) copy->to_field())->store_length(from_length);
   memcpy(copy->to_ptr, copy->from_ptr, sizeof(char*));
+  ulong to_length=((Field_blob*) copy->to_field())->get_length();
+  if (to_length < from_length)
+  {
+    if (copy->to_field()->table->in_use->is_strict_mode())
+    {
+      copy->to_field()->set_warning(Sql_condition::SL_WARNING,
+                                    ER_DATA_TOO_LONG, 1);
+    }
+    else
+    {
+      copy->to_field()->set_warning(Sql_condition::SL_WARNING,
+                                    WARN_DATA_TRUNCATED, 1);
+    }
+  }
 }
 
 static void do_conv_blob(Copy_field *copy)
@@ -579,8 +621,8 @@ static void copy_field_varstring(Field_varstring * const to,
                                  const Field_varstring * const from)
 {
   const uint length_bytes= from->length_bytes;
-  DBUG_ASSERT(length_bytes == to->length_bytes);
-  DBUG_ASSERT(length_bytes == 1 || length_bytes == 2);
+  assert(length_bytes == to->length_bytes);
+  assert(length_bytes == 1 || length_bytes == 2);
 
   const size_t bytes_to_copy= get_varstring_copy_length(to, from);
   if (length_bytes == 1)
@@ -589,7 +631,7 @@ static void copy_field_varstring(Field_varstring * const to,
     int2store(to->ptr, bytes_to_copy);
 
   // memcpy should not be used for overlaping memory blocks
-  DBUG_ASSERT(to->ptr != from->ptr);
+  assert(to->ptr != from->ptr);
   memcpy(to->ptr + length_bytes, from->ptr + length_bytes, bytes_to_copy);
 }
 
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 680d8e06db5c..ab4726c62973 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -104,7 +111,7 @@ void Sort_param::init_for_filesort(Filesort *file_sort,
                                    ulong max_length_for_sort_data,
                                    ha_rows maxrows, bool sort_positions)
 {
-  DBUG_ASSERT(max_rows == 0);   // function should not be called twice
+  assert(max_rows == 0);   // function should not be called twice
   sort_length= sortlen;
   ref_length= table->file->ref_length;
   if (!(table->file->ha_table_flags() & HA_FAST_KEY_READ) &&
@@ -271,8 +278,8 @@ bool filesort(THD *thd, Filesort *filesort, bool sort_positions,
   Opt_trace_object trace_wrapper(trace);
   trace_filesort_information(trace, filesort->sortorder, s_length);
 
-  DBUG_ASSERT(!table->reginfo.join_tab);
-  DBUG_ASSERT(tab == table->reginfo.qep_tab);
+  assert(!table->reginfo.join_tab);
+  assert(tab == table->reginfo.qep_tab);
   Item_subselect *const subselect= tab && tab->join() ?
     tab->join()->select_lex->master_unit()->item : NULL;
 
@@ -293,7 +300,7 @@ bool filesort(THD *thd, Filesort *filesort, bool sort_positions,
   */
   Filesort_info table_sort= table->sort;
   table->sort.io_cache= NULL;
-  DBUG_ASSERT(table_sort.sorted_result == NULL);
+  assert(table_sort.sorted_result == NULL);
   table_sort.sorted_result_in_fsbuf= false;
 
   outfile= table_sort.io_cache;
@@ -346,7 +353,7 @@ bool filesort(THD *thd, Filesort *filesort, bool sort_positions,
       */
       DBUG_PRINT("info", ("failed to allocate PQ"));
       table_sort.free_sort_buffer();
-      DBUG_ASSERT(thd->is_error());
+      assert(thd->is_error());
       goto err;
     }
     filesort->using_pq= true;
@@ -524,7 +531,7 @@ bool filesort(THD *thd, Filesort *filesort, bool sort_positions,
   {
     int kill_errno= thd->killed_errno();
 
-    DBUG_ASSERT(thd->is_error() || kill_errno);
+    assert(thd->is_error() || kill_errno);
 
     /*
       We replace the table->sort at the end.
@@ -566,7 +573,7 @@ bool filesort(THD *thd, Filesort *filesort, bool sort_positions,
   *returned_rows= num_rows;
 
   /* table->sort.io_cache should be free by this time */
-  DBUG_ASSERT(NULL == table->sort.io_cache);
+  assert(NULL == table->sort.io_cache);
 
   // Assign the copy back!
   table->sort= table_sort;
@@ -626,7 +633,7 @@ uint Filesort::make_sortorder()
         Could be a field, or Item_direct_view_ref/Item_ref wrapping a field
         If it is an Item_outer_ref, only_full_group_by has been switched off.
       */
-      DBUG_ASSERT
+      assert
         (item->type() == Item::FIELD_ITEM ||
          (item->type() == Item::REF_ITEM &&
           (down_cast<Item_ref*>(item)->ref_type() == Item_ref::VIEW_REF
@@ -639,10 +646,10 @@ uint Filesort::make_sortorder()
              !real_item->const_item())
     {
       // Aggregate, or Item_aggregate_ref
-      DBUG_ASSERT(item->type() == Item::SUM_FUNC_ITEM ||
-                  (item->type() == Item::REF_ITEM &&
-                   static_cast<Item_ref*>(item)->ref_type() ==
-                   Item_ref::AGGREGATE_REF));
+      assert(item->type() == Item::SUM_FUNC_ITEM ||
+             (item->type() == Item::REF_ITEM &&
+              static_cast<Item_ref*>(item)->ref_type() ==
+              Item_ref::AGGREGATE_REF));
       pos->field= item->get_tmp_table_field();
     }
     else if (real_item->type() == Item::COPY_STR_ITEM)
@@ -652,7 +659,7 @@ uint Filesort::make_sortorder()
     else
       pos->item= item;
     pos->reverse= (ord->direction == ORDER::ORDER_DESC);
-    DBUG_ASSERT(pos->field != NULL || pos->item != NULL);
+    assert(pos->field != NULL || pos->item != NULL);
   }
   DBUG_RETURN(count);
 }
@@ -691,7 +698,7 @@ void Filesort_info::read_chunk_descriptors(IO_CACHE *chunk_file, uint count)
   DBUG_VOID_RETURN;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /*
   Print a text, SQL-like record representation into dbug trace.
 
@@ -937,8 +944,8 @@ static ha_rows find_all_keys(Sort_param *param, QEP_TAB *qep_tab,
     Set up temporary column read map for columns used by sort and verify
     it's not used
   */
-  DBUG_ASSERT(sort_form->tmp_set.n_bits == 0 ||
-              bitmap_is_clear_all(&sort_form->tmp_set));
+  assert(sort_form->tmp_set.n_bits == 0 ||
+         bitmap_is_clear_all(&sort_form->tmp_set));
 
   // Temporary set for register_used_fields and mark_field_in_map()
   sort_form->read_set= &sort_form->tmp_set;
@@ -1226,7 +1233,7 @@ void copy_native_longlong(uchar *to, size_t to_length,
 static void MY_ATTRIBUTE((noinline))
 make_json_sort_key(Item *item, uchar *to, size_t length, ulonglong *hash)
 {
-  DBUG_ASSERT(!item->maybe_null || to[-1] == 1);
+  assert(!item->maybe_null || to[-1] == 1);
 
   Json_wrapper wr;
   if (item->val_json(&wr))
@@ -1279,7 +1286,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
     if (sort_field->field)
     {
       Field *field= sort_field->field;
-      DBUG_ASSERT(sort_field->field_type == field->type());
+      assert(sort_field->field_type == field->type());
       if (field->maybe_null())
       {
 	if (field->is_null())
@@ -1297,7 +1304,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
       field->make_sort_key(to, sort_field->length);
       if (sort_field->field_type == MYSQL_TYPE_JSON)
       {
-        DBUG_ASSERT(use_hash);
+        assert(use_hash);
         unique_hash(field, &hash);
       }
     }
@@ -1305,7 +1312,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
     {						// Item
       Item *item=sort_field->item;
       maybe_null= item->maybe_null;
-      DBUG_ASSERT(sort_field->field_type == item->field_type());
+      assert(sort_field->field_type == item->field_type());
       switch (sort_field->result_type) {
       case STRING_RESULT:
       {
@@ -1314,7 +1321,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
 
         if (sort_field->field_type == MYSQL_TYPE_JSON)
         {
-          DBUG_ASSERT(use_hash);
+          assert(use_hash);
           /*
             We don't want the code for creating JSON sort keys to be
             inlined here, as increasing the size of the surrounding
@@ -1344,7 +1351,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
               of memory or have an item marked not null when it can be null.
               This code is here mainly to avoid a hard crash in this case.
             */
-            DBUG_ASSERT(0);
+            assert(0);
             DBUG_PRINT("warning",
                        ("Got null on something that shouldn't be null"));
             memset(to, 0, sort_field->length);	// Avoid crash
@@ -1359,7 +1366,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
           size_t tmp_length MY_ATTRIBUTE((unused));
           if ((uchar*) from == to)
           {
-            DBUG_ASSERT(sort_field->length >= length);
+            assert(sort_field->length >= length);
             set_if_smaller(length,sort_field->length);
             memcpy(tmp_buffer, from, length);
             from= tmp_buffer;
@@ -1370,7 +1377,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
                                (uchar*) from, length,
                                MY_STRXFRM_PAD_WITH_SPACE |
                                MY_STRXFRM_PAD_TO_MAXLEN);
-          DBUG_ASSERT(tmp_length == sort_field->length);
+          assert(tmp_length == sort_field->length);
         }
         else
         {
@@ -1480,7 +1487,7 @@ uint Sort_param::make_sortkey(uchar *to, const uchar *ref_pos)
       case ROW_RESULT:
       default: 
 	// This case should never be choosen
-	DBUG_ASSERT(0);
+	assert(0);
 	break;
       }
     }
@@ -1640,7 +1647,7 @@ static bool save_index(Sort_param *param, uint count, Filesort_info *table_sort)
   table_sort->sorted_result_in_fsbuf= false;
   const size_t buf_size= param->res_length * count;
 
-  DBUG_ASSERT(table_sort->sorted_result == NULL);
+  assert(table_sort->sorted_result == NULL);
   if (!(to= table_sort->sorted_result=
         static_cast<uchar*>(my_malloc(key_memory_Filesort_info_record_pointers,
                                       buf_size, MYF(MY_WME)))))
@@ -1962,11 +1969,11 @@ uint read_to_buffer(IO_CACHE *fromfile,
         uint res_length= Addon_fields::read_addon_length(plen);
         if (plen + res_length >= merge_chunk->buffer_end())
           break;                                // Incomplete record.
-        DBUG_ASSERT(res_length > 0);
+        assert(res_length > 0);
         record+= param->sort_length;
         record+= res_length;
       }
-      DBUG_ASSERT(ix > 0);
+      assert(ix > 0);
       count= ix;
       num_bytes_read= record - merge_chunk->buffer_start();
       DBUG_PRINT("info", ("read %llu bytes of complete records",
@@ -2084,7 +2091,7 @@ int merge_buffers(Sort_param *param, IO_CACHE *from_file,
   org_max_rows=max_rows= param->max_rows;
 
   /* The following will fire if there is not enough space in sort_buffer */
-  DBUG_ASSERT(maxcount!=0);
+  assert(maxcount!=0);
 
   const bool doing_unique= (param->unique_buff != NULL);
   if (doing_unique)
@@ -2129,7 +2136,7 @@ int merge_buffers(Sort_param *param, IO_CACHE *from_file,
 
   if (doing_unique)
   {
-    DBUG_ASSERT(!param->using_packed_addons());
+    assert(!param->using_packed_addons());
     /* 
        Called by Unique::get()
        Copy the first argument to param->unique_buff for unique removal.
@@ -2173,7 +2180,7 @@ int merge_buffers(Sort_param *param, IO_CACHE *from_file,
       merge_chunk= queue.top();
       if (doing_unique)                         // Remove duplicates
       {
-        DBUG_ASSERT(!param->using_packed_addons());
+        assert(!param->using_packed_addons());
         uchar *current_key= merge_chunk->current_key();
         if (!(*cmp)(first_cmp_arg, param->unique_buff, current_key))
           goto skip_duplicate;
@@ -2406,7 +2413,7 @@ sortlength(THD *thd, st_sort_field *sortorder, uint s_length,
       case ROW_RESULT:
       default: 
 	// This case should never be choosen
-	DBUG_ASSERT(0);
+	assert(0);
 	break;
       }
       if (sortorder->item->maybe_null)
@@ -2498,7 +2505,7 @@ Filesort::get_addon_fields(ulong max_length_for_sort_data,
     // part_of_key is empty for a BLOB, so apply this check before the next.
     if (field->flags & BLOB_FLAG)
     {
-      DBUG_ASSERT(addon_fields == NULL);
+      assert(addon_fields == NULL);
       return NULL;
     }
     if (filter_covering && !field->part_of_key.is_set(index))
@@ -2526,7 +2533,7 @@ Filesort::get_addon_fields(ulong max_length_for_sort_data,
 
   if (total_length + sortlength > max_length_for_sort_data)
   {
-    DBUG_ASSERT(addon_fields == NULL);
+    assert(addon_fields == NULL);
     return NULL;
   }
 
@@ -2546,7 +2553,7 @@ Filesort::get_addon_fields(ulong max_length_for_sort_data,
       Allocate memory only once, reuse descriptor array and buffer.
       Set using_packed_addons here, and size/offset details below.
      */
-    DBUG_ASSERT(num_fields == addon_fields->num_field_descriptors());
+    assert(num_fields == addon_fields->num_field_descriptors());
     addon_fields->set_using_packed_addons(false);
   }
 
@@ -2561,7 +2568,7 @@ Filesort::get_addon_fields(ulong max_length_for_sort_data,
       continue;
     if (filter_covering && !field->part_of_key.is_set(index))
       continue;
-    DBUG_ASSERT(addonf != addon_fields->end());
+    assert(addonf != addon_fields->end());
 
     addonf->field= field;
     addonf->offset= length;
diff --git a/sql/filesort.h b/sql/filesort.h
index 0395d41e59d8..8d94e8e32852 100644
--- a/sql/filesort.h
+++ b/sql/filesort.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -56,7 +63,7 @@ class Filesort: public Sql_alloc
     using_pq(false),
     addon_fields(NULL)
   {
-    DBUG_ASSERT(order);
+    assert(order);
   };
 
   /* Prepare ORDER BY list for sorting. */
diff --git a/sql/filesort_utils.cc b/sql/filesort_utils.cc
index 71bae5d4020d..b2e97bb5c071 100644
--- a/sql/filesort_utils.cc
+++ b/sql/filesort_utils.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -145,9 +152,9 @@ namespace {
  */
 inline bool my_mem_compare(const uchar *s1, const uchar *s2, size_t len)
 {
-  DBUG_ASSERT(len > 0);
-  DBUG_ASSERT(s1 != NULL);
-  DBUG_ASSERT(s2 != NULL);
+  assert(len > 0);
+  assert(s1 != NULL);
+  assert(s2 != NULL);
   do {
     if (*s1++ != *s2++)
       return *--s1 < *--s2;
diff --git a/sql/filesort_utils.h b/sql/filesort_utils.h
index 1ae027199c4c..e9ad43f5b15f 100644
--- a/sql/filesort_utils.h
+++ b/sql/filesort_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -84,6 +91,7 @@ class Filesort_buffer
     m_next_rec_ptr(NULL), m_rawmem(NULL), m_record_pointers(NULL),
     m_sort_keys(NULL),
     m_num_records(0), m_record_length(0),
+    m_sort_length(0),
     m_size_in_bytes(0), m_idx(0)
   {}
 
@@ -138,7 +146,7 @@ class Filesort_buffer
   */
   size_t spaceleft() const
   {
-    DBUG_ASSERT(m_next_rec_ptr >= m_rawmem);
+    assert(m_next_rec_ptr >= m_rawmem);
     const size_t spaceused=
       (m_next_rec_ptr - m_rawmem) +
       (static_cast<size_t>(m_idx) * sizeof(uchar*));
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index ddf0bc4b66eb..08f4fe1e07f3 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index bdd9c4048fe0..a297415a494f 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/geometry_rtree.cc b/sql/geometry_rtree.cc
index 1eb0d59ffd80..6071396a1b20 100644
--- a/sql/geometry_rtree.cc
+++ b/sql/geometry_rtree.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/gis_bg_traits.h b/sql/gis_bg_traits.h
index ccfdf24e181d..bbd69795b8e5 100644
--- a/sql/gis_bg_traits.h
+++ b/sql/gis_bg_traits.h
@@ -1,16 +1,23 @@
 #ifndef GIS_BG_TRAITS_INCLUDED
 #define GIS_BG_TRAITS_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/gstream.cc b/sql/gstream.cc
index d9a6532b7b81..03d0c9bf49af 100644
--- a/sql/gstream.cc
+++ b/sql/gstream.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/gstream.h b/sql/gstream.h
index 3da8e16b3a29..cad27914a1e0 100644
--- a/sql/gstream.h
+++ b/sql/gstream.h
@@ -1,16 +1,23 @@
 #ifndef GSTREAM_INCLUDED
 #define GSTREAM_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndb_ddl_fk.cc b/sql/ha_ndb_ddl_fk.cc
index c3fd814753bb..bf07a48faa75 100644
--- a/sql/ha_ndb_ddl_fk.cc
+++ b/sql/ha_ndb_ddl_fk.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -264,10 +271,10 @@ isnull(const char * str)
 static void
 ndb_fk_casedn(char *name)
 {
-  DBUG_ASSERT(name != 0);
+  assert(name != 0);
   uint length = (uint)strlen(name);
-  DBUG_ASSERT(files_charset_info != 0 &&
-              files_charset_info->casedn_multiply == 1);
+  assert(files_charset_info != 0 &&
+         files_charset_info->casedn_multiply == 1);
   files_charset_info->cset->casedn(files_charset_info,
                                    name, length, name, length);
 }
@@ -477,14 +484,14 @@ class Fk_util
   {
     DBUG_ENTER("resolve_mock");
     DBUG_PRINT("enter", ("mock_name '%s'", mock_name));
-    DBUG_ASSERT(is_mock_name(mock_name));
+    assert(is_mock_name(mock_name));
 
     // Load up the mock table
     Ndb_table_guard mock_tab(dict, mock_name);
     if (!mock_tab.get_table())
     {
       error(dict, "Failed to load the listed mock table '%s'", mock_name);
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_VOID_RETURN;
     }
 
@@ -586,7 +593,7 @@ class Fk_util
       if (dict->getForeignKey(fk, element.name) != 0)
       {
         // Could not find the listed fk
-        DBUG_ASSERT(false);
+        assert(false);
         continue;
       }
 
@@ -663,7 +670,7 @@ class Fk_util
                   col_names, col_types))
       {
         error(dict, "Failed to create mock parent table '%s", mock_name);
-        DBUG_ASSERT(false);
+        assert(false);
         DBUG_RETURN(false);
       }
 
@@ -795,7 +802,7 @@ class Fk_util
 
     DBUG_ENTER("mock_table::create");
     DBUG_PRINT("enter", ("mock_name: %s", mock_name));
-    DBUG_ASSERT(is_mock_name(mock_name));
+    assert(is_mock_name(mock_name));
 
     if (mock_tab.setName(mock_name))
     {
@@ -812,7 +819,7 @@ class Fk_util
       DBUG_PRINT("info", ("name: %s", col_name));
       if (mock_col.setName(col_name))
       {
-        DBUG_ASSERT(false);
+        assert(false);
         DBUG_RETURN(false);
       }
 
@@ -820,7 +827,7 @@ class Fk_util
       if (!col)
       {
         // Internal error, the two lists should be same size
-        DBUG_ASSERT(col);
+        assert(col);
         DBUG_RETURN(false);
       }
 
@@ -875,7 +882,7 @@ class Fk_util
       if (dict->getForeignKey(fk, element.name) != 0)
       {
         // Could not find the listed fk
-        DBUG_ASSERT(false);
+        assert(false);
         continue;
       }
 
@@ -908,7 +915,7 @@ class Fk_util
       {
        // Could not open the mock table
        DBUG_PRINT("error", ("Could not open the listed mock table, ignore it"));
-       DBUG_ASSERT(false);
+       assert(false);
        continue;
       }
 
@@ -916,7 +923,7 @@ class Fk_util
       {
         DBUG_PRINT("error", ("Failed to drop the mock table '%s'",
                               mocktab_g.get_table()->getName()));
-        DBUG_ASSERT(false);
+        assert(false);
         continue;
       }
       info("Dropped mock table '%s' - referencing table dropped", table_name);
@@ -984,7 +991,7 @@ class Fk_util
     if (dict->getForeignKey(fk, fk_name) != 0)
     {
       error(dict, "Could not find fk '%s'", fk_name);
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_RETURN(false);
     }
 
@@ -1003,7 +1010,7 @@ class Fk_util
         if (dict->dropTableGlobal(*mocktab_g.get_table(), drop_flags) != 0)
         {
           error(dict, "Failed to drop fk mock table '%s'", parent_name);
-          DBUG_ASSERT(false);
+          assert(false);
           DBUG_RETURN(false);
         }
         // table and fk dropped
@@ -1013,7 +1020,7 @@ class Fk_util
       {
         warn("Could not open the fk mock table '%s', ignoring it...",
              parent_name);
-        DBUG_ASSERT(false);
+        assert(false);
         // fallthrough and try to drop only the fk,
       }
     }
@@ -1021,7 +1028,7 @@ class Fk_util
     if (dict->dropForeignKey(fk) != 0)
     {
       error(dict, "Failed to drop fk '%s'", fk_name);
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_RETURN(false);
     }
     DBUG_RETURN(true);
@@ -1044,7 +1051,7 @@ class Fk_util
     NdbDictionary::Dictionary::List table_list;
     if (dict->listObjects(table_list, NdbDictionary::Object::UserTable, true) != 0)
     {
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_VOID_RETURN;
     }
 
@@ -1052,7 +1059,7 @@ class Fk_util
     {
       const NdbDictionary::Dictionary::List::Element& el = table_list.elements[i];
 
-      DBUG_ASSERT(el.type == NdbDictionary::Object::UserTable);
+      assert(el.type == NdbDictionary::Object::UserTable);
 
       // Check if table is in same database as the potential new parent
       if (strcmp(new_parent_db, el.database) != 0)
@@ -1104,7 +1111,7 @@ class Fk_util
       if (dict->getForeignKey(fk, element.name) != 0)
       {
         error(dict, "Could not find the listed fk '%s'", element.name);
-        DBUG_ASSERT(false);
+        assert(false);
         continue;
       }
 
@@ -1350,7 +1357,7 @@ ha_ndbcluster::create_fks(THD *thd, Ndb *ndb)
                              "INTERNAL ERROR: Could not find created mock table '%s'",
                              mock_name);
          // Internal error, should be able to load the just created mock table
-         DBUG_ASSERT(parent_tab.get_table());
+         assert(parent_tab.get_table());
          DBUG_RETURN(err_default);
        }       
     }
@@ -1529,7 +1536,7 @@ ha_ndbcluster::referenced_by_foreign_key()
   Ndb_fk_data *data= m_fk_data;
   if (data == 0)
   {
-    DBUG_ASSERT(false);
+    assert(false);
     DBUG_RETURN(0);
   }
 
@@ -1546,7 +1553,7 @@ ha_ndbcluster::is_child_or_parent_of_fk()
   Ndb_fk_data *data= m_fk_data;
   if (data == 0)
   {
-    DBUG_ASSERT(false);
+    assert(false);
     DBUG_RETURN(0);
   }
   
@@ -1635,7 +1642,7 @@ fk_split_name(char dst[], const char * src, bool index)
 struct Ndb_mem_root_guard {
   Ndb_mem_root_guard(MEM_ROOT *new_root) {
     root_ptr= my_thread_get_THR_MALLOC();
-    DBUG_ASSERT(root_ptr != 0);
+    assert(root_ptr != 0);
     old_root= *root_ptr;
     *root_ptr= new_root;
   }
@@ -1728,7 +1735,7 @@ ha_ndbcluster::get_fk_data(THD *thd, Ndb *ndb)
       Ndb_table_guard child_tab(dict, child_name);
       if (child_tab.get_table() == 0)
       {
-        DBUG_ASSERT(false);
+        assert(false);
         ERR_RETURN(dict->getNdbError());
       }
 
@@ -1766,7 +1773,7 @@ ha_ndbcluster::get_fk_data(THD *thd, Ndb *ndb)
       Ndb_table_guard parent_tab(dict, parent_name);
       if (parent_tab.get_table() == 0)
       {
-        DBUG_ASSERT(false);
+        assert(false);
         ERR_RETURN(dict->getNdbError());
       }
 
@@ -1906,7 +1913,7 @@ ha_ndbcluster::get_child_or_parent_fk_list(THD *thd,
   Ndb_fk_data *data= m_fk_data;
   if (data == 0)
   {
-    DBUG_ASSERT(false);
+    assert(false);
     DBUG_RETURN(0);
   }
 
@@ -2495,7 +2502,7 @@ ha_ndbcluster::drop_fk_for_online_alter(THD * thd, Ndb* ndb, NDBDICT * dict,
   Ndb_table_guard srctab(dict, tab->getName());
   if (srctab.get_table() == 0)
   {
-    DBUG_ASSERT(false); // Why ??
+    assert(false); // Why ??
     DBUG_RETURN(0);
   }
 
@@ -2635,7 +2642,7 @@ ha_ndbcluster::recreate_fk_for_truncate(THD* thd, Ndb* ndb, const char* tab_name
                         "INTERNAL ERROR: Could not find created child table '%s'",
                         tab_name);
     // Internal error, should be able to load the just created child table
-    DBUG_ASSERT(child_tab.get_table());
+    assert(child_tab.get_table());
     DBUG_RETURN(err_default);
   }
 
@@ -2659,7 +2666,7 @@ ha_ndbcluster::recreate_fk_for_truncate(THD* thd, Ndb* ndb, const char* tab_name
                               ER_CANNOT_ADD_FOREIGN,
                               "Child table %s has no column referred by the FK %s",
                               tab->getName(), fk->getName());
-          DBUG_ASSERT(ndbcol);
+          assert(ndbcol);
           DBUG_RETURN(err_default);
         }
         child_cols[pos++]= ndbcol;
diff --git a/sql/ha_ndb_index_stat.cc b/sql/ha_ndb_index_stat.cc
index f4fce9c5faa2..458b8067f464 100644
--- a/sql/ha_ndb_index_stat.cc
+++ b/sql/ha_ndb_index_stat.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -90,7 +97,7 @@ struct Ndb_index_stat {
   NdbIndexStat* is;
   int index_id;
   int index_version;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char id[32];
 #endif
   time_t access_time;   /* by any table handler */
@@ -287,7 +294,7 @@ ndb_index_stat_opt2str(const Ndb_index_stat_opt& opt, char* str)
     switch (v.unit) {
     case Ndb_index_stat_opt::Ubool:
       {
-        DBUG_ASSERT(v.val == 0 || v.val == 1);
+        assert(v.val == 0 || v.val == 1);
         if (v.val == 0)
           my_snprintf(ptr, sz, "%s%s=0", sep, v.name);
         else
@@ -337,7 +344,7 @@ ndb_index_stat_opt2str(const Ndb_index_stat_opt& opt, char* str)
       break;
 
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -453,7 +460,7 @@ ndb_index_stat_option_parse(char* p, Ndb_index_stat_opt& opt)
       break;
 
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -730,7 +737,7 @@ Ndb_index_stat::Ndb_index_stat()
   is= 0;
   index_id= 0;
   index_version= 0;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   memset(id, 0, sizeof(id));
 #endif
   access_time= 0;
@@ -977,7 +984,7 @@ ndb_index_stat_alloc(const NDBINDEX *index,
     st->is= is;
     st->index_id= index->getObjectId();
     st->index_version= index->getObjectVersion();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     my_snprintf(st->id, sizeof(st->id), "%d.%d", st->index_id, st->index_version);
 #endif
     if (is->set_index(*index, *table) == 0)
@@ -1337,7 +1344,7 @@ struct Ndb_index_stat_proc {
   int lt;
   bool busy;
   bool end;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uint cache_query_bytes;
   uint cache_clean_bytes;
 #endif
@@ -1830,7 +1837,7 @@ ndb_index_stat_proc_evict(Ndb_index_stat_proc &pr, int lt)
     }
   }
  
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (uint i=0; i < st_lru_cnt; i++)
   {
     Ndb_index_stat* st1= st_lru_arr[i];
@@ -2038,7 +2045,7 @@ ndb_index_stat_proc_event(Ndb_index_stat_proc &pr)
   if (ret == -1)
   {
     // wl4124_todo report error
-    DBUG_ASSERT(false);
+    assert(false);
     return;
   }
   if (ret == 0)
@@ -2051,7 +2058,7 @@ ndb_index_stat_proc_event(Ndb_index_stat_proc &pr)
     if (ret == -1)
     {
       // wl4124_todo report error
-      DBUG_ASSERT(false);
+      assert(false);
       return;
     }
     if (ret == 0)
@@ -2111,7 +2118,7 @@ ndb_index_stat_proc_control(Ndb_index_stat_proc &pr)
   }
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static void
 ndb_index_stat_entry_verify(Ndb_index_stat_proc &pr, const Ndb_index_stat *st)
 {
@@ -2239,7 +2246,7 @@ ndb_index_stat_proc(Ndb_index_stat_proc &pr)
 
   ndb_index_stat_proc_control(pr);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ndb_index_stat_list_verify(pr);
   Ndb_index_stat_glob old_glob= ndb_index_stat_glob;
 #endif
@@ -2256,7 +2263,7 @@ ndb_index_stat_proc(Ndb_index_stat_proc &pr)
   ndb_index_stat_proc_error(pr);
   ndb_index_stat_proc_event(pr);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ndb_index_stat_list_verify(pr);
   ndb_index_stat_report(old_glob);
 #endif
@@ -2699,7 +2706,7 @@ ndb_index_stat_wait_query(Ndb_index_stat *st,
     if (st->load_time != snap.load_time ||
         st->sample_version != snap.sample_version)
     {
-      DBUG_ASSERT(false);
+      assert(false);
       err= NdbIndexStat::NoIndexStats;
       break;
     }
@@ -2759,7 +2766,7 @@ ndb_index_stat_wait_analyze(Ndb_index_stat *st,
     if (st->error_count != snap.error_count)
     {
       /* A new error has occured */
-      DBUG_ASSERT(st->error_count > snap.error_count);
+      assert(st->error_count > snap.error_count);
       err= st->error.code;
       glob.analyze_error++;
       break;
@@ -2771,7 +2778,7 @@ ndb_index_stat_wait_analyze(Ndb_index_stat *st,
     if (st->load_time != snap.load_time ||
         st->sample_version != snap.sample_version)
     {
-      DBUG_ASSERT(false);
+      assert(false);
       err= NdbIndexStat::AlienUpdate;
       break;
     }
@@ -2896,7 +2903,7 @@ ha_ndbcluster::ndb_index_stat_get_rir(uint inx,
     if (rows == 0)
       rows= 1;
     *rows_out= rows;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char rule[NdbIndexStat::RuleBufferBytes];
     NdbIndexStat::get_rule(stat, rule);
 #endif
@@ -2927,7 +2934,7 @@ ha_ndbcluster::ndb_index_stat_set_rpk(uint inx)
       double rpk= -1.0;
       NdbIndexStat::get_rpk(stat, k, &rpk);
       key_info->set_records_per_key(k, static_cast<rec_per_key_t>(rpk));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       char rule[NdbIndexStat::RuleBufferBytes];
       NdbIndexStat::get_rule(stat, rule);
 #endif
diff --git a/sql/ha_ndb_index_stat.h b/sql/ha_ndb_index_stat.h
index 2c37709dc82b..5c09b6ce9d49 100644
--- a/sql/ha_ndb_index_stat.h
+++ b/sql/ha_ndb_index_stat.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 61c345f5e75b..a7c95931cb01 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -904,7 +911,7 @@ check_completed_operations_pre_commit(Thd_ndb *thd_ndb, NdbTransaction *trans,
     const bool op_has_conflict_detection = (first->getCustomData() != NULL);
     if (!op_has_conflict_detection)
     {
-      DBUG_ASSERT(err.code != (int) error_op_after_refresh_op);
+      assert(err.code != (int) error_op_after_refresh_op);
 
       /* 'Normal path' - ignore key (not) present, others are errors */
       if (err.classification != NdbError::NoError &&
@@ -1039,8 +1046,8 @@ check_completed_operations(Thd_ndb *thd_ndb, NdbTransaction *trans,
     {
 #ifdef HAVE_NDB_BINLOG
       /* All conflict detection etc should be done before commit */
-      DBUG_ASSERT((err.code != (int) error_conflict_fn_violation) &&
-                  (err.code != (int) error_op_after_refresh_op));
+      assert((err.code != (int) error_conflict_fn_violation) &&
+             (err.code != (int) error_op_after_refresh_op));
 #endif
       DBUG_RETURN(err.code);
     }
@@ -1354,7 +1361,7 @@ void ha_ndbcluster::set_rec_per_key()
       break;
     }
     default:
-      DBUG_ASSERT(false);
+      assert(false);
     }
     // set rows per key to 1 for complete key given for unique/primary index
     if (is_unique_index)
@@ -1631,7 +1638,7 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg)
     ha->m_blobs_row_total_size+= (len64 + 7) & ~((Uint64)7);
     if (ha->m_blobs_row_total_size > 0xffffffff)
     {
-      DBUG_ASSERT(FALSE);
+      assert(FALSE);
       DBUG_RETURN(-1);
     }
     DBUG_PRINT("info", ("Blob number %d needs size %llu, total buffer reqt. now %llu",
@@ -1704,7 +1711,7 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg)
       Uint64 len64= 0;
       if (ndb_blob->getLength(len64) != 0)
         ERR_RETURN(ndb_blob->getNdbError());
-      DBUG_ASSERT(len64 < 0xffffffff);
+      assert(len64 < 0xffffffff);
       uchar *buf= ha->m_blobs_buffer + offset;
 	  uint32 len= (uint32)(ha->m_blobs_buffer_size - offset);
       if (ndb_blob->readData(buf, len) != 0)
@@ -1723,7 +1730,7 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg)
       }   
       DBUG_PRINT("info", ("[%u] offset: %u  buf: 0x%lx  len=%u",
                           i, offset, (long) buf, len));
-      DBUG_ASSERT(len == len64);
+      assert(len == len64);
       if (ha->m_blob_destination_record)
       {
         my_ptrdiff_t ptrdiff=
@@ -1891,7 +1898,7 @@ ha_ndbcluster::set_blob_values(const NdbOperation *ndb_op,
 
       // Looks like NULL ptr signals length 0 blob
       if (blob_ptr == NULL) {
-        DBUG_ASSERT(blob_len == 0);
+        assert(blob_len == 0);
         blob_ptr= (uchar*)"";
       }
 
@@ -2097,8 +2104,8 @@ int ha_ndbcluster::get_metadata(THD *thd, const char *path)
   DBUG_ENTER("get_metadata");
   DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path));
 
-  DBUG_ASSERT(m_table == NULL);
-  DBUG_ASSERT(m_table_info == NULL);
+  assert(m_table == NULL);
+  assert(m_table_info == NULL);
 
   uchar *data= NULL, *pack_data= NULL;
   size_t length, pack_length;
@@ -2137,7 +2144,7 @@ int ha_ndbcluster::get_metadata(THD *thd, const char *path)
   /* Now check that any Ndb native defaults are aligned 
      with MySQLD defaults
   */
-  DBUG_ASSERT(check_default_values(tab) == 0);
+  assert(check_default_values(tab) == 0);
 
   if (error)
     goto err;
@@ -2229,11 +2236,11 @@ static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
 
   KEY_PART_INFO* key_part= key_info->key_part;
   KEY_PART_INFO* end= key_part+key_info->user_defined_key_parts;
-  DBUG_ASSERT(key_info->user_defined_key_parts == sz);
+  assert(key_info->user_defined_key_parts == sz);
   for (unsigned i= 0; key_part != end; key_part++, i++) 
   {
     const char *field_name= key_part->field->field_name;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
    data.unique_index_attrid_map[i]= 255;
 #endif
     for (unsigned j= 0; j < sz; j++)
@@ -2245,7 +2252,7 @@ static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
         break;
       }
     }
-    DBUG_ASSERT(data.unique_index_attrid_map[i] != 255);
+    assert(data.unique_index_attrid_map[i] != 255);
   }
   DBUG_RETURN(0);
 }
@@ -2363,8 +2370,8 @@ int ha_ndbcluster::add_index_handle(THD *thd, NDBDICT *dict, KEY *key_info,
                           index->getObjectVersion() & 0xFFFFFF,
                           index->getObjectVersion() >> 24,
                           index->getObjectStatus()));
-      DBUG_ASSERT(index->getObjectStatus() ==
-                  NdbDictionary::Object::Retrieved);
+      assert(index->getObjectStatus() ==
+             NdbDictionary::Object::Retrieved);
       break;
     } while (1);
     m_index[index_no].index= index;
@@ -2388,8 +2395,8 @@ int ha_ndbcluster::add_index_handle(THD *thd, NDBDICT *dict, KEY *key_info,
                           index->getObjectVersion() & 0xFFFFFF,
                           index->getObjectVersion() >> 24,
                           index->getObjectStatus()));
-      DBUG_ASSERT(index->getObjectStatus() ==
-                  NdbDictionary::Object::Retrieved);
+      assert(index->getObjectStatus() ==
+             NdbDictionary::Object::Retrieved);
       break;
     } while (1);
     m_index[index_no].unique_index= index;
@@ -2423,7 +2430,7 @@ null_bit_mask_to_bit_number(uchar bit_mask)
     case 0x40: return 6;
     case 0x80: return 7;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       return 0;
   }
 }
@@ -2680,7 +2687,7 @@ int ha_ndbcluster::open_indexes(THD *thd, Ndb *ndb, TABLE *tab,
     }
   }
 
-  DBUG_ASSERT(error == 0 || error == 4243);
+  assert(error == 0 || error == 4243);
 
   DBUG_RETURN(error);
 }
@@ -2855,7 +2862,7 @@ void ha_ndbcluster::release_metadata(THD *thd, Ndb *ndb)
     dict->removeTableGlobal(*m_table, invalidate_indexes);
   }
   // TODO investigate
-  DBUG_ASSERT(m_table_info == NULL);
+  assert(m_table_info == NULL);
   m_table_info= NULL;
 
   // Release index list 
@@ -2863,12 +2870,12 @@ void ha_ndbcluster::release_metadata(THD *thd, Ndb *ndb)
   {
     if (m_index[i].unique_index)
     {
-      DBUG_ASSERT(m_table != NULL);
+      assert(m_table != NULL);
       dict->removeIndexGlobal(*m_index[i].unique_index, invalidate_indexes);
     }
     if (m_index[i].index)
     {
-      DBUG_ASSERT(m_table != NULL);
+      assert(m_table != NULL);
       dict->removeIndexGlobal(*m_index[i].index, invalidate_indexes);
     }
     ndb_clear_index(dict, m_index[i]);
@@ -2936,13 +2943,13 @@ static const int index_flags_size= sizeof(index_type_flags)/sizeof(ulong);
 
 inline NDB_INDEX_TYPE ha_ndbcluster::get_index_type(uint idx_no) const
 {
-  DBUG_ASSERT(idx_no < MAX_KEY);
+  assert(idx_no < MAX_KEY);
   return m_index[idx_no].type;
 }
 
 inline bool ha_ndbcluster::has_null_in_unique_index(uint idx_no) const
 {
-  DBUG_ASSERT(idx_no < MAX_KEY);
+  assert(idx_no < MAX_KEY);
   return m_index[idx_no].null_in_unique_index;
 }
 
@@ -2959,7 +2966,7 @@ inline ulong ha_ndbcluster::index_flags(uint idx_no, uint part,
 { 
   DBUG_ENTER("ha_ndbcluster::index_flags");
   DBUG_PRINT("enter", ("idx_no: %u", idx_no));
-  DBUG_ASSERT(get_index_type_from_table(idx_no) < index_flags_size);
+  assert(get_index_type_from_table(idx_no) < index_flags_size);
   DBUG_RETURN(index_type_flags[get_index_type_from_table(idx_no)] | 
               HA_KEY_SCAN_NOT_ROR);
 }
@@ -3021,7 +3028,7 @@ int ha_ndbcluster::pk_read(const uchar *key, uint key_len, uchar *buf,
   DBUG_PRINT("enter", ("key_len: %u read_set=%x",
                        key_len, table->read_set->bitmap[0]));
   DBUG_DUMP("key", key, key_len);
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   NdbOperation::LockMode lm= get_ndb_lock_mode(m_lock.type);
 
@@ -3029,14 +3036,14 @@ int ha_ndbcluster::pk_read(const uchar *key, uint key_len, uchar *buf,
                         table->s->primary_key))
   {
     // Is parent of pushed join
-    DBUG_ASSERT(lm == NdbOperation::LM_CommittedRead);
+    assert(lm == NdbOperation::LM_CommittedRead);
     const int error= pk_unique_index_read_key_pushed(table->s->primary_key, key,
                                                      (m_user_defined_partitioning ?
                                                      part_id : NULL));
     if (unlikely(error))
       DBUG_RETURN(error);
 
-    DBUG_ASSERT(m_active_query!=NULL);
+    assert(m_active_query!=NULL);
     if ((res = execute_no_commit_ie(m_thd_ndb, trans)) != 0 ||
         m_active_query->getNdbError().code) 
     {
@@ -3093,24 +3100,24 @@ int ha_ndbcluster::ndb_pk_update_row(THD *thd,
   NdbTransaction *trans= m_thd_ndb->trans;
   int error;
   DBUG_ENTER("ndb_pk_update_row");
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   DBUG_PRINT("info", ("primary key update or partition change, "
                       "doing delete+insert"));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
    * 'old_data' contain colums as specified in 'read_set'.
    * All PK columns must be included for ::ndb_delete_row()
    */
-  DBUG_ASSERT(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
+  assert(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
   /*
    * As a complete 'new_data' row is reinserted after the delete,
    * all columns must be contained in the read+write union.
    */
   bitmap_copy(&m_bitmap, table->read_set);
   bitmap_union(&m_bitmap, table->write_set);
-  DBUG_ASSERT(bitmap_is_set_all(&m_bitmap));
+  assert(bitmap_is_set_all(&m_bitmap));
 #endif
 
   // Delete old row
@@ -3225,7 +3232,7 @@ bool ha_ndbcluster::check_all_operations_for_error(NdbTransaction *trans,
       else
       {
         // Must have been primary key access
-        DBUG_ASSERT(op->getType() == NdbOperation::PrimaryKeyAccess);
+        assert(op->getType() == NdbOperation::PrimaryKeyAccess);
         if (errcode == HA_ERR_KEY_NOT_FOUND)
           m_dupkey= table->s->primary_key;
       }
@@ -3400,19 +3407,19 @@ int ha_ndbcluster::unique_index_read(const uchar *key,
   DBUG_ENTER("ha_ndbcluster::unique_index_read");
   DBUG_PRINT("enter", ("key_len: %u, index: %u", key_len, active_index));
   DBUG_DUMP("key", key, key_len);
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   NdbOperation::LockMode lm= get_ndb_lock_mode(m_lock.type);
 
   if (check_if_pushable(NdbQueryOperationDef::UniqueIndexAccess,
                         active_index))
   {
-    DBUG_ASSERT(lm == NdbOperation::LM_CommittedRead);
+    assert(lm == NdbOperation::LM_CommittedRead);
     const int error= pk_unique_index_read_key_pushed(active_index, key, NULL);
     if (unlikely(error))
       DBUG_RETURN(error);
 
-    DBUG_ASSERT(m_active_query!=NULL);
+    assert(m_active_query!=NULL);
     if (execute_no_commit_ie(m_thd_ndb, trans) != 0 ||
         m_active_query->getNdbError().code) 
     {
@@ -3515,7 +3522,7 @@ inline int ha_ndbcluster::fetch_next(NdbScanOperation* cursor)
   int error;
   NdbTransaction *trans= m_thd_ndb->trans;
   
-  DBUG_ASSERT(trans);
+  assert(trans);
   if ((error= scan_handle_lock_tuple(cursor, trans)) != 0)
     DBUG_RETURN(error);
   
@@ -3583,7 +3590,7 @@ int ha_ndbcluster::fetch_next_pushed()
 {
   DBUG_ENTER("fetch_next_pushed (from pushed operation)");
 
-  DBUG_ASSERT(m_pushed_operation);
+  assert(m_pushed_operation);
   NdbQuery::NextResultOutcome result= m_pushed_operation->nextResult(true, m_thd_ndb->m_force_send);
 
   /**
@@ -3593,7 +3600,7 @@ int ha_ndbcluster::fetch_next_pushed()
    */
   if (result == NdbQuery::NextResult_gotRow)
   {
-    DBUG_ASSERT(m_next_row!=NULL);
+    assert(m_next_row!=NULL);
     DBUG_PRINT("info", ("One more record found"));    
     table->status= 0;
     unpack_record(table->record[0], m_next_row);
@@ -3602,7 +3609,7 @@ int ha_ndbcluster::fetch_next_pushed()
   }
   else if (result == NdbQuery::NextResult_scanComplete)
   {
-    DBUG_ASSERT(m_next_row==NULL);
+    assert(m_next_row==NULL);
     DBUG_PRINT("info", ("No more records"));
     table->status= STATUS_NOT_FOUND;
 //  m_thd_ndb->m_pushed_reads++;
@@ -3612,7 +3619,7 @@ int ha_ndbcluster::fetch_next_pushed()
   {
     DBUG_PRINT("info", ("Error from 'nextResult()'"));
     table->status= STATUS_GARBAGE;
-//  DBUG_ASSERT(false);
+//  assert(false);
     DBUG_RETURN(ndb_err(m_thd_ndb->trans));
   }
   DBUG_RETURN(result);
@@ -3647,14 +3654,14 @@ ha_ndbcluster::index_read_pushed(uchar *buf, const uchar *key,
   // Result from pushed operation will be referred by 'm_next_row' if non-NULL
   if (result == NdbQuery::NextResult_gotRow)
   {
-    DBUG_ASSERT(m_next_row!=NULL);
+    assert(m_next_row!=NULL);
     unpack_record(buf, m_next_row);
     table->status= 0;
     m_thd_ndb->m_pushed_reads++;
   }
   else
   {
-    DBUG_ASSERT(result!=NdbQuery::NextResult_gotRow);
+    assert(result!=NdbQuery::NextResult_gotRow);
     table->status= STATUS_NOT_FOUND;
     DBUG_PRINT("info", ("No record found"));
 //  m_thd_ndb->m_pushed_reads++;
@@ -3684,8 +3691,8 @@ int ha_ndbcluster::index_next_pushed(uchar *buf)
     DBUG_RETURN(res);
   }
 
-  DBUG_ASSERT(m_pushed_join_operation>PUSHED_ROOT);  // Child of a pushed join
-  DBUG_ASSERT(m_active_query==NULL);
+  assert(m_pushed_join_operation>PUSHED_ROOT);  // Child of a pushed join
+  assert(m_active_query==NULL);
 
   int res = fetch_next_pushed();
   if (res == NdbQuery::NextResult_gotRow)
@@ -3873,7 +3880,7 @@ ha_ndbcluster::pk_unique_index_read_key(uint idx, const uchar *key, uchar *buf,
     get_index_type(idx)
     : UNDEFINED_INDEX;
 
-  DBUG_ASSERT(m_thd_ndb->trans);
+  assert(m_thd_ndb->trans);
 
   DBUG_PRINT("info", ("pk_unique_index_read_key of table %s", table->s->table_name.str));
 
@@ -3963,8 +3970,8 @@ ha_ndbcluster::pk_unique_index_read_key_pushed(uint idx,
   options.optionsPresent= 0;
   NdbOperation::GetValueSpec gets[2];
 
-  DBUG_ASSERT(m_thd_ndb->trans);
-  DBUG_ASSERT(idx < MAX_KEY);
+  assert(m_thd_ndb->trans);
+  assert(idx < MAX_KEY);
 
   if (m_active_query)
   {
@@ -3993,7 +4000,7 @@ ha_ndbcluster::pk_unique_index_read_key_pushed(uint idx,
   uint i;
   Uint32 offset= 0;
   NdbQueryParamValue paramValues[ndb_pushed_join::MAX_KEY_PART];
-  DBUG_ASSERT(key_def->user_defined_key_parts <= ndb_pushed_join::MAX_KEY_PART);
+  assert(key_def->user_defined_key_parts <= ndb_pushed_join::MAX_KEY_PART);
 
   uint map[ndb_pushed_join::MAX_KEY_PART];
   ndbcluster_build_key_map(m_table, m_index[idx], &table->key_info[idx], map);
@@ -4005,8 +4012,8 @@ ha_ndbcluster::pk_unique_index_read_key_pushed(uint idx,
 
     if (key_part->null_bit)                         // Column is nullable
     {
-      DBUG_ASSERT(idx != table_share->primary_key); // PK can't be nullable
-      DBUG_ASSERT(*(key+offset)==0);                // Null values not allowed in key
+      assert(idx != table_share->primary_key); // PK can't be nullable
+      assert(*(key+offset)==0);                // Null values not allowed in key
                                                     // Value is imm. after NULL indicator
       paramValues[map[i]]= NdbQueryParamValue(key+offset+1,shrinkVarChar);
     }
@@ -4050,7 +4057,7 @@ compute_index_bounds(NdbIndexScanOperation::IndexBound & bound,
   DBUG_ENTER("ha_ndbcluster::compute_index_bounds");
   DBUG_PRINT("info", ("from: %d", from));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("info", ("key parts: %u length: %u",
                       key_info->user_defined_key_parts, key_info->key_length));
   {
@@ -4148,7 +4155,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
   DBUG_PRINT("enter", ("Starting new ordered scan on %s", m_tabname));
 
   // Check that sorted seems to be initialised
-  DBUG_ASSERT(sorted == 0 || sorted == 1);
+  assert(sorted == 0 || sorted == 1);
 
   if (unlikely(!(trans= get_transaction(error))))
   {
@@ -4208,7 +4215,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
       m_thd_ndb->m_pruned_scan_count++;
 
     // Can't have BLOB in pushed joins (yet)
-    DBUG_ASSERT(!uses_blob_value(table->read_set));
+    assert(!uses_blob_value(table->read_set));
   }
   else
   {
@@ -4321,7 +4328,7 @@ int ha_ndbcluster::full_table_scan(const KEY* key_info,
 
   if (m_use_partition_pruning && m_user_defined_partitioning)
   {
-    DBUG_ASSERT(m_pushed_join_operation != PUSHED_ROOT);
+    assert(m_pushed_join_operation != PUSHED_ROOT);
     part_spec.start_part= 0;
     part_spec.end_part= m_part_info->get_tot_partitions() - 1;
     prune_partition_set(table, &part_spec);
@@ -4387,7 +4394,7 @@ int ha_ndbcluster::full_table_scan(const KEY* key_info,
 
     m_thd_ndb->m_scan_count++;
     // Can't have BLOB in pushed joins (yet)
-    DBUG_ASSERT(!uses_blob_value(table->read_set));
+    assert(!uses_blob_value(table->read_set));
   }
   else
   {
@@ -4429,7 +4436,7 @@ int ha_ndbcluster::full_table_scan(const KEY* key_info,
     m_thd_ndb->m_scan_count++;
     m_thd_ndb->m_pruned_scan_count += (op->getPruned()? 1 : 0);
 
-    DBUG_ASSERT(m_active_cursor==NULL);
+    assert(m_active_cursor==NULL);
     m_active_cursor= op;
 
     if (uses_blob_value(table->read_set) &&
@@ -4502,9 +4509,9 @@ ha_ndbcluster::get_read_set(bool use_cursor, uint idx)
     table->in_use->lex->sql_command == SQLCOM_UPDATE ||
     table->in_use->lex->sql_command == SQLCOM_UPDATE_MULTI;
 
-  DBUG_ASSERT(use_cursor ||
-              idx == table_share->primary_key ||
-              table->key_info[idx].flags & HA_NOSAME);
+  assert(use_cursor ||
+         idx == table_share->primary_key ||
+         table->key_info[idx].flags & HA_NOSAME);
 
   if (!is_delete && !is_update)
   {
@@ -4539,7 +4546,7 @@ ha_ndbcluster::get_read_set(bool use_cursor, uint idx)
    */
   if (bitmap_is_overlapping(table->write_set, m_pk_bitmap_p))
   {
-    DBUG_ASSERT(table_share->primary_key != MAX_KEY);
+    assert(table_share->primary_key != MAX_KEY);
     bitmap_set_all(&m_bitmap);
     bitmap_subtract(&m_bitmap, table->write_set);
     bitmap_union(table->read_set, &m_bitmap);
@@ -4582,8 +4589,8 @@ ha_ndbcluster::get_read_set(bool use_cursor, uint idx)
    */
   else if (m_use_partition_pruning)  // && m_user_defined_partitioning)
   {
-    DBUG_ASSERT(bitmap_is_subset(&m_part_info->full_part_field_set,
-                                 m_pk_bitmap_p));
+    assert(bitmap_is_subset(&m_part_info->full_part_field_set,
+                            m_pk_bitmap_p));
     bitmap_union(table->read_set, &m_part_info->full_part_field_set);
   }
       
@@ -4687,7 +4694,7 @@ ha_ndbcluster::eventSetAnyValue(THD *thd,
       ndbcluster_anyvalue_set_nologging(options->anyValue);
     }
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("ndb_set_reflect_anyvalue",
                   {
                     fprintf(stderr, "Ndb forcing reflect AnyValue\n");
@@ -5190,7 +5197,7 @@ handle_conflict_op_error(NdbTransaction* trans,
     const NdbRecord* data_rec= ex_data.data_rec;
     const uchar* old_row= ex_data.old_row;
     const uchar* new_row= ex_data.new_row;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     const uchar* row=
       (ex_data.op_type == DELETE_ROW)?
       ex_data.old_row : ex_data.new_row;
@@ -5280,7 +5287,7 @@ handle_conflict_op_error(NdbTransaction* trans,
       }
     }
 
-    DBUG_ASSERT(share != NULL && row != NULL);
+    assert(share != NULL && row != NULL);
     bool table_has_trans_conflict_detection =
       cfn_share &&
       cfn_share->m_conflict_fn &&
@@ -5499,7 +5506,7 @@ int ha_ndbcluster::ndb_write_row(uchar *record,
   trans= thd_ndb->trans;
   if (m_user_defined_partitioning)
   {
-    DBUG_ASSERT(m_use_partition_pruning);
+    assert(m_use_partition_pruning);
     longlong func_value= 0;
     my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
     error= m_part_info->get_partition_id(m_part_info, &part_id, &func_value);
@@ -5530,7 +5537,7 @@ int ha_ndbcluster::ndb_write_row(uchar *record,
     if (unlikely(!(trans= start_transaction_row(key_rec, key_row, error))))
       DBUG_RETURN(error);
   }
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   ha_statistic_increment(&SSV::ha_write_count);
 
@@ -5767,7 +5774,7 @@ int ha_ndbcluster::primary_key_cmp(const uchar * old_row, const uchar * new_row)
       continue;
 
     /* The primary key does not allow NULLs. */
-    DBUG_ASSERT(!key_part->null_bit);
+    assert(!key_part->null_bit);
 
     if (key_part->key_part_flag & (HA_BLOB_PART | HA_VAR_LENGTH_PART))
     {
@@ -6158,9 +6165,9 @@ ha_ndbcluster::setup_key_ref_for_ndb_record(const NdbRecord **key_rec,
   {
     /* Use unique key to access table */
     DBUG_PRINT("info", ("Using unique index (%u)", active_index));
-    DBUG_ASSERT((table->key_info[active_index].flags & HA_NOSAME));
+    assert((table->key_info[active_index].flags & HA_NOSAME));
     /* Can't use key if we didn't read it first */
-    DBUG_ASSERT(bitmap_is_subset(m_key_fields[active_index], table->read_set));
+    assert(bitmap_is_subset(m_key_fields[active_index], table->read_set));
     *key_rec= m_index[active_index].ndb_unique_record_row;
     *key_row= record;
   }
@@ -6169,7 +6176,7 @@ ha_ndbcluster::setup_key_ref_for_ndb_record(const NdbRecord **key_rec,
     /* Use primary key to access table */
     DBUG_PRINT("info", ("Using primary key"));
     /* Can't use pk if we didn't read it first */
-    DBUG_ASSERT(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
+    assert(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
     *key_rec= m_index[table_share->primary_key].ndb_unique_record_row;
     *key_row= record;
   }
@@ -6178,8 +6185,8 @@ ha_ndbcluster::setup_key_ref_for_ndb_record(const NdbRecord **key_rec,
     /* Use hidden primary key previously read into m_ref. */
     DBUG_PRINT("info", ("Using hidden primary key (%llu)", m_ref));
     /* Can't use hidden pk if we didn't read it first */
-    DBUG_ASSERT(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
-    DBUG_ASSERT(m_read_before_write_removal_used == false);
+    assert(bitmap_is_subset(m_pk_bitmap_p, table->read_set));
+    assert(m_read_before_write_removal_used == false);
     *key_rec= m_ndb_hidden_key_record;
     *key_row= (const uchar *)(&m_ref);
   }
@@ -6225,7 +6232,7 @@ int ha_ndbcluster::ndb_update_row(const uchar *old_data, uchar *new_data,
   }
 
   NdbTransaction *trans= m_thd_ndb->trans;
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   error = check_slave_state(thd);
   if (unlikely(error))
@@ -6309,7 +6316,7 @@ int ha_ndbcluster::ndb_update_row(const uchar *old_data, uchar *new_data,
   bitmap_copy(&m_bitmap, table->write_set);
   bitmap_subtract(&m_bitmap, m_pk_bitmap_p);
   uchar *mask= (uchar *)(m_bitmap.bitmap);
-  DBUG_ASSERT(!pk_update);
+  assert(!pk_update);
 
   NdbOperation::OperationOptions *poptions = NULL;
   NdbOperation::OperationOptions options;
@@ -6631,7 +6638,7 @@ int ha_ndbcluster::ndb_delete_row(const uchar *record,
   }
     
   NdbTransaction *trans= m_thd_ndb->trans;
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   error = check_slave_state(thd);
   if (unlikely(error))
@@ -6846,7 +6853,7 @@ int ha_ndbcluster::ndb_delete_row(const uchar *record,
 void ha_ndbcluster::unpack_record(uchar *dst_row, const uchar *src_row)
 {
   int res;
-  DBUG_ASSERT(src_row != NULL);
+  assert(src_row != NULL);
 
   my_ptrdiff_t dst_offset= dst_row - table->record[0];
   my_ptrdiff_t src_offset= src_row - table->record[0];
@@ -6888,17 +6895,17 @@ void ha_ndbcluster::unpack_record(uchar *dst_row, const uchar *src_row)
          * Verify Blob state to be certain.
          * Accessing PK/UK op Blobs after execute() is unsafe
          */
-        DBUG_ASSERT(ndb_blob != 0);
-        DBUG_ASSERT(ndb_blob->getState() == NdbBlob::Active);
+        assert(ndb_blob != 0);
+        assert(ndb_blob->getState() == NdbBlob::Active);
         int isNull;
         res= ndb_blob->getNull(isNull);
-        DBUG_ASSERT(res == 0);                  // Already succeeded once
+        assert(res == 0);                  // Already succeeded once
         Uint64 len64= 0;
         field_blob->move_field_offset(dst_offset);
         if (!isNull)
         {
           res= ndb_blob->getLength(len64);
-          DBUG_ASSERT(res == 0 && len64 <= (Uint64)0xffffffff);
+          assert(res == 0 && len64 <= (Uint64)0xffffffff);
 
           if(len64 > field_blob->max_data_length())
           {
@@ -6946,7 +6953,7 @@ void ha_ndbcluster::unpack_record(uchar *dst_row, const uchar *src_row)
 */
 static void get_default_value(void *def_val, Field *field)
 {
-  DBUG_ASSERT(field != NULL);
+  assert(field != NULL);
 
   my_ptrdiff_t src_offset= field->table->default_values_offset();
 
@@ -7005,7 +7012,7 @@ void ha_ndbcluster::print_results()
 {
   DBUG_ENTER("print_results");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
   char buf_type[MAX_FIELD_WIDTH], buf_val[MAX_FIELD_WIDTH];
   String type(buf_type, sizeof(buf_type), &my_charset_bin);
@@ -7218,7 +7225,7 @@ int ha_ndbcluster::read_range_first_to_buf(const key_range *start_key,
 
   if (m_use_partition_pruning)
   {
-    DBUG_ASSERT(m_pushed_join_operation != PUSHED_ROOT);
+    assert(m_pushed_join_operation != PUSHED_ROOT);
     get_partition_set(table, buf, active_index, start_key, &part_spec);
     DBUG_PRINT("info", ("part_spec.start_part: %u  part_spec.end_part: %u",
                         part_spec.start_part, part_spec.end_part));
@@ -7430,7 +7437,7 @@ int ha_ndbcluster::rnd_pos(uchar *buf, uchar *pos)
         key_spec.flag= HA_READ_KEY_EXACT;
         get_full_part_id_from_key(table, buf, key_info, 
                                   &key_spec, &part_spec);
-        DBUG_ASSERT(part_spec.start_part == part_spec.end_part);
+        assert(part_spec.start_part == part_spec.end_part);
       }
       DBUG_PRINT("info", ("partition id %u", part_spec.start_part));
     }
@@ -7511,13 +7518,13 @@ void ha_ndbcluster::position(const uchar *record)
           buff[0] = ptr[0];
           buff[1] = 0;
           var_length = ptr[0];
-          DBUG_ASSERT(var_length <= len);
+          assert(var_length <= len);
           memcpy(buff+2, ptr + 1, var_length);
         }
         else
         {
           var_length = ptr[0] + (ptr[1]*256);
-          DBUG_ASSERT(var_length <= len);
+          assert(var_length <= len);
           memcpy(buff, ptr, var_length + 2);
         }
         /**
@@ -7550,17 +7557,17 @@ void ha_ndbcluster::position(const uchar *record)
     }
     else
       key_length= ref_length;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int hidden_no= table->s->fields;
     const NDBTAB *tab= m_table;  
     const NDBCOL *hidden_col= tab->getColumn(hidden_no);
-    DBUG_ASSERT(hidden_col->getPrimaryKey() && 
-                hidden_col->getAutoIncrement() &&
-                key_length == NDB_HIDDEN_PRIMARY_KEY_LENGTH);
+    assert(hidden_col->getPrimaryKey() && 
+           hidden_col->getAutoIncrement() &&
+           key_length == NDB_HIDDEN_PRIMARY_KEY_LENGTH);
 #endif
     memcpy(ref, &m_ref, key_length);
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (table_share->primary_key == MAX_KEY && m_user_defined_partitioning) 
     DBUG_DUMP("key+part", ref, key_length+sizeof(m_part_id));
 #endif
@@ -7665,7 +7672,7 @@ int ha_ndbcluster::info(uint flag)
     /* Read from local statistics, fast and fuzzy, wo/ locks */
     else
     {
-      DBUG_ASSERT(m_table_info->records != ~(ha_rows)0);
+      assert(m_table_info->records != ~(ha_rows)0);
       stats.records= m_table_info->records +
                      m_table_info->no_uncommitted_rows_count;
     }
@@ -7884,7 +7891,7 @@ bool ha_ndbcluster::start_read_removal()
 ha_rows ha_ndbcluster::end_read_removal(void)
 {
   DBUG_ENTER("end_read_removal");
-  DBUG_ASSERT(m_read_before_write_removal_possible);
+  assert(m_read_before_write_removal_possible);
   DBUG_PRINT("info", ("updated: %llu, deleted: %llu",
                       m_rows_updated, m_rows_deleted));
   DBUG_RETURN(m_rows_updated + m_rows_deleted);
@@ -7898,7 +7905,7 @@ int ha_ndbcluster::reset()
   {
     m_cond->cond_clear();
   }
-  DBUG_ASSERT(m_active_query == NULL);
+  assert(m_active_query == NULL);
   if (m_pushed_join_operation==PUSHED_ROOT)  // Root of pushed query
   {
     delete m_pushed_join_member;             // Also delete QueryDef
@@ -7953,7 +7960,7 @@ ha_ndbcluster::flush_bulk_insert(bool allow_batch)
   DBUG_ENTER("ha_ndbcluster::flush_bulk_insert");
   DBUG_PRINT("info", ("Sending inserts to NDB, rows_inserted: %d", 
                       (int)m_rows_inserted));
-  DBUG_ASSERT(trans);
+  assert(trans);
 
   
   if (! (m_thd_ndb->trans_options & TNTO_TRANSACTIONS_OFF))
@@ -7982,7 +7989,7 @@ ha_ndbcluster::flush_bulk_insert(bool allow_batch)
     }
     if (trans->restart() != 0)
     {
-      DBUG_ASSERT(0);
+      assert(0);
       DBUG_RETURN(-1);
     }
   }
@@ -8176,20 +8183,20 @@ static int ndbcluster_update_apply_status(THD *thd, int do_update)
   NdbOperation *op= 0;
   int r= 0;
   r|= (op= trans->getNdbOperation(ndbtab)) == 0;
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   if (do_update)
     r|= op->updateTuple();
   else
     r|= op->writeTuple();
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   // server_id
   r|= op->equal(0u, (Uint32)thd->server_id);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   if (!do_update)
   {
     // epoch
     r|= op->setValue(1u, (Uint64)0);
-    DBUG_ASSERT(r == 0);
+    assert(r == 0);
   }
   const char* group_master_log_name =
     ndb_mi_get_group_master_log_name();
@@ -8205,14 +8212,14 @@ static int ndbcluster_update_apply_status(THD *thd, int do_update)
   ndb_pack_varchar(ndbtab->getColumn(2u), tmp_buf,
                    group_master_log_name, (int)strlen(group_master_log_name));
   r|= op->setValue(2u, tmp_buf);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   // start_pos
   r|= op->setValue(3u, group_master_log_pos);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   // end_pos
   r|= op->setValue(4u, group_master_log_pos +
                    (future_event_relay_log_pos - group_relay_log_pos));
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   return 0;
 }
 #endif /* HAVE_NDB_BINLOG */
@@ -8293,7 +8300,7 @@ int ha_ndbcluster::start_statement(THD *thd,
   }
   if (!trans && table_count == 0)
   {
-    DBUG_ASSERT(thd_ndb->changed_tables.is_empty() == TRUE);
+    assert(thd_ndb->changed_tables.is_empty() == TRUE);
     thd_ndb->trans_options= 0;
 
     DBUG_PRINT("trans",("Possibly starting transaction"));
@@ -8329,7 +8336,7 @@ ha_ndbcluster::add_handler_to_open_tables(THD *thd,
   /**
    * thd_ndb->open_tables is only used iff thd_ndb->m_handler is not
    */
-  DBUG_ASSERT(thd_ndb->m_handler == NULL);
+  assert(thd_ndb->m_handler == NULL);
   const void *key= handler->m_share;
   HASH_SEARCH_STATE state;
   THD_NDB_SHARE *thd_ndb_share=
@@ -8385,7 +8392,7 @@ int ha_ndbcluster::init_handler_for_statement(THD *thd)
 
   DBUG_ENTER("ha_ndbcluster::init_handler_for_statement");
   Thd_ndb *thd_ndb= m_thd_ndb;
-  DBUG_ASSERT(thd_ndb);
+  assert(thd_ndb);
 
   // store thread specific data first to set the right context
   m_autoincrement_prefetch= THDVAR(thd, autoincrement_prefetch_sz);
@@ -8405,7 +8412,7 @@ int ha_ndbcluster::init_handler_for_statement(THD *thd)
   int ret = 0;
   if (thd_ndb->m_handler == 0)
   {
-    DBUG_ASSERT(m_share);
+    assert(m_share);
     ret = add_handler_to_open_tables(thd, thd_ndb, this);
   }
   else
@@ -8455,7 +8462,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
   else
   {
     Thd_ndb *thd_ndb= m_thd_ndb;
-    DBUG_ASSERT(thd_ndb);
+    assert(thd_ndb);
 
     DBUG_PRINT("enter", ("lock_type == F_UNLCK "
                          "this: 0x%lx  thd: 0x%lx  thd_ndb: %lx  "
@@ -8519,7 +8526,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
     */
     m_thd_ndb= NULL;    
 
-    DBUG_ASSERT(m_active_query == NULL);
+    assert(m_active_query == NULL);
     if (m_active_query)
       DBUG_PRINT("warning", ("m_active_query != NULL"));
     m_active_query= NULL;
@@ -8585,7 +8592,7 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
   int error=0;
   Thd_ndb *thd_ndb;
   DBUG_ENTER("start_stmt");
-  DBUG_ASSERT(thd == table->in_use);
+  assert(thd == table->in_use);
 
   thd_ndb= get_thd_ndb(thd);
   if ((error= start_statement(thd, thd_ndb, thd_ndb->start_stmt_count++)))
@@ -8605,8 +8612,8 @@ ha_ndbcluster::start_transaction_row(const NdbRecord *ndb_record,
 {
   NdbTransaction *trans;
   DBUG_ENTER("ha_ndbcluster::start_transaction_row");
-  DBUG_ASSERT(m_thd_ndb);
-  DBUG_ASSERT(m_thd_ndb->trans == NULL);
+  assert(m_thd_ndb);
+  assert(m_thd_ndb->trans == NULL);
 
   m_thd_ndb->transaction_checks();
 
@@ -8636,8 +8643,8 @@ ha_ndbcluster::start_transaction_key(uint inx_no,
 {
   NdbTransaction *trans;
   DBUG_ENTER("ha_ndbcluster::start_transaction_key");
-  DBUG_ASSERT(m_thd_ndb);
-  DBUG_ASSERT(m_thd_ndb->trans == NULL);
+  assert(m_thd_ndb);
+  assert(m_thd_ndb->trans == NULL);
 
   m_thd_ndb->transaction_checks();
 
@@ -8667,8 +8674,8 @@ ha_ndbcluster::start_transaction(int &error)
   NdbTransaction *trans;
   DBUG_ENTER("ha_ndbcluster::start_transaction");
 
-  DBUG_ASSERT(m_thd_ndb);
-  DBUG_ASSERT(m_thd_ndb->trans == NULL);
+  assert(m_thd_ndb);
+  assert(m_thd_ndb->trans == NULL);
 
   m_thd_ndb->transaction_checks();
 
@@ -8691,8 +8698,8 @@ ha_ndbcluster::start_transaction_part_id(Uint32 part_id, int &error)
   NdbTransaction *trans;
   DBUG_ENTER("ha_ndbcluster::start_transaction_part_id");
 
-  DBUG_ASSERT(m_thd_ndb);
-  DBUG_ASSERT(m_thd_ndb->trans == NULL);
+  assert(m_thd_ndb);
+  assert(m_thd_ndb->trans == NULL);
 
   m_thd_ndb->transaction_checks();
 
@@ -8719,7 +8726,7 @@ ndbcluster_print_error(int error, const NdbOperation *error_op)
   const char *tab_name= (error_op) ? error_op->getTableName() : "";
   if (tab_name == NULL)
   {
-    DBUG_ASSERT(tab_name != NULL);
+    assert(tab_name != NULL);
     tab_name= "";
   }
   share.db.str= (char*) "";
@@ -8746,7 +8753,7 @@ int ndbcluster_commit(handlerton *hton, THD *thd, bool all)
   (void) retry_slave_trans;
 
   DBUG_ENTER("ndbcluster_commit");
-  DBUG_ASSERT(ndb);
+  assert(ndb);
   DBUG_PRINT("enter", ("Commit %s", (all ? "all" : "stmt")));
   thd_ndb->start_stmt_count= 0;
   if (trans == NULL)
@@ -8821,12 +8828,12 @@ int ndbcluster_commit(handlerton *hton, THD *thd, bool all)
       if(commitStatus == NdbTransaction::Committed)
       {
         /* Already committed transaction to save roundtrip */
-        DBUG_ASSERT(get_thd_ndb(current_thd)->m_error == FALSE);
+        assert(get_thd_ndb(current_thd)->m_error == FALSE);
       }
       else if(commitStatus == NdbTransaction::Aborted)
       {
         /* Commit failed before transaction was started */ 
-        DBUG_ASSERT(get_thd_ndb(current_thd)->m_error == TRUE);
+        assert(get_thd_ndb(current_thd)->m_error == TRUE);
       }
       else if(commitStatus == NdbTransaction::NeedAbort)
       {
@@ -8837,7 +8844,7 @@ int ndbcluster_commit(handlerton *hton, THD *thd, bool all)
       else
       {
         /* Commit was never attempted - this should not be possible */
-        DBUG_ASSERT(commitStatus == NdbTransaction::Started || commitStatus == NdbTransaction::NotStarted);
+        assert(commitStatus == NdbTransaction::Started || commitStatus == NdbTransaction::NotStarted);
         sql_print_error("found uncommitted autocommit+rbwr transaction, "
                         "commit status: %d", commitStatus);
         abort();
@@ -8956,7 +8963,7 @@ static int ndbcluster_rollback(handlerton *hton, THD *thd, bool all)
   DBUG_ENTER("ndbcluster_rollback");
   DBUG_PRINT("enter", ("all: %d  thd_ndb->save_point_count: %d",
                        all, thd_ndb->save_point_count));
-  DBUG_ASSERT(ndb);
+  assert(ndb);
   thd_ndb->start_stmt_count= 0;
   if (trans == NULL)
   {
@@ -9302,7 +9309,7 @@ NDB_Modifiers::get(const char * name) const
 static bool
 ndb_blob_striping()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const char* p= getenv("NDB_BLOB_STRIPING");
   if (p != 0 && *p != 0 && *p != '0' && *p != 'n' && *p != 'N')
     return true;
@@ -10017,7 +10024,7 @@ int ha_ndbcluster::create(const char *name,
     DBUG_RETURN(my_errno());
   }
 
-  DBUG_ASSERT(*fn_rext((char*)name) == 0);
+  assert(*fn_rext((char*)name) == 0);
   set_dbname(name);
   set_tabname(name);
   
@@ -10433,8 +10440,8 @@ int ha_ndbcluster::create(const char *name,
 
   // Assume that table_share->max/min_rows equals create_info->min/max
   // although this is create so create_info should be used
-  DBUG_ASSERT(create_info->max_rows == table_share->max_rows);
-  DBUG_ASSERT(create_info->min_rows == table_share->min_rows);
+  assert(create_info->max_rows == table_share->max_rows);
+  assert(create_info->min_rows == table_share->min_rows);
 
   // Check partition info
   set_my_errno(create_table_set_up_partition_info(create_info,
@@ -10776,7 +10783,7 @@ int ha_ndbcluster::create_index(THD *thd, const char *name, KEY *key_info,
     error= create_ordered_index(thd, name, key_info);
     break;
   default:
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     break;
   }
   
@@ -10905,7 +10912,7 @@ int ha_ndbcluster::add_index_impl(THD *thd, TABLE *table_arg,
   uint idx;
   DBUG_ENTER("ha_ndbcluster::add_index");
   DBUG_PRINT("enter", ("table %s", table_arg->s->table_name.str));
-  DBUG_ASSERT(m_share->state == NSS_ALTERED);
+  assert(m_share->state == NSS_ALTERED);
 
   for (idx= 0; idx < num_of_keys; idx++)
   {
@@ -10933,7 +10940,7 @@ int ha_ndbcluster::prepare_drop_index(TABLE *table_arg,
                                       uint *key_num, uint num_of_keys)
 {
   DBUG_ENTER("ha_ndbcluster::prepare_drop_index");
-  DBUG_ASSERT(m_share->state == NSS_ALTERED);
+  assert(m_share->state == NSS_ALTERED);
   // Mark indexes for deletion
   uint idx;
   for (idx= 0; idx < num_of_keys; idx++)
@@ -11008,10 +11015,10 @@ ha_ndbcluster::rename_table_impl(THD* thd, Ndb* ndb,
   DBUG_PRINT("info", ("real_rename_log_on_participant: %d",
                       real_rename_log_on_participant));
   // Verify default values of real_rename related parameters
-  DBUG_ASSERT(real_rename ||
-              (real_rename_db == NULL &&
-               real_rename_name == NULL &&
-               real_rename_log_on_participant == false));
+  assert(real_rename ||
+         (real_rename_db == NULL &&
+          real_rename_name == NULL &&
+          real_rename_log_on_participant == false));
 
   DBUG_PRINT("info", ("drop_events: %d", drop_events));
   DBUG_PRINT("info", ("create_events: %d", create_events));
@@ -11302,8 +11309,8 @@ int ha_ndbcluster::rename_table(const char *from, const char *to)
     }
 
     // Make sure that inplace was not requested
-    DBUG_ASSERT(thd->lex->alter_info.requested_algorithm !=
-                  Alter_info::ALTER_TABLE_ALGORITHM_INPLACE);
+    assert(thd->lex->alter_info.requested_algorithm !=
+           Alter_info::ALTER_TABLE_ALGORITHM_INPLACE);
 
     /*
       This is a copying alter table which is implemented as
@@ -11899,7 +11906,7 @@ ha_ndbcluster::~ha_ndbcluster()
   release_blobs_buffer();
 
   // Check for open cursor/transaction
-  DBUG_ASSERT(m_thd_ndb == NULL);
+  assert(m_thd_ndb == NULL);
 
   // Discard any generated condition
   DBUG_PRINT("info", ("Deleting generated condition"));
@@ -11909,8 +11916,8 @@ ha_ndbcluster::~ha_ndbcluster()
     m_cond= NULL;
   }
   DBUG_PRINT("info", ("Deleting pushed joins"));
-  DBUG_ASSERT(m_active_query == NULL);
-  DBUG_ASSERT(m_active_cursor == NULL);
+  assert(m_active_query == NULL);
+  assert(m_active_cursor == NULL);
   if (m_pushed_join_operation==PUSHED_ROOT)
   {
     delete m_pushed_join_member;             // Also delete QueryDef
@@ -12615,7 +12622,7 @@ ndbcluster_drop_database_leftovers(const char* path)
   {
     // The database directory didn't exist, crash in debug since
     // something is obviously wrong
-    DBUG_ASSERT(false);
+    assert(false);
     DBUG_VOID_RETURN;
   }
 
@@ -12841,7 +12848,7 @@ ndbcluster_find_files(handlerton *hton, THD *thd,
  	uchar *record= my_hash_search(&ndb_tables,
                                       (const uchar*) file_name->str,
                                       file_name->length);
-	DBUG_ASSERT(record);
+	assert(record);
 	my_hash_delete(&ndb_tables, record);
         push_warning_printf(thd, Sql_condition::SL_WARNING,
 			    ER_TABLE_EXISTS_ERROR,
@@ -12952,7 +12959,7 @@ ndbcluster_find_files(handlerton *hton, THD *thd,
       // Flush the table from table def. cache.
       ndb_tdc_close_cached_table(thd, db, file_name_str);
 
-      DBUG_ASSERT(!thd->is_error());
+      assert(!thd->is_error());
     }
   }
 
@@ -13176,7 +13183,7 @@ int ndbcluster_init(void* p)
 {
   DBUG_ENTER("ndbcluster_init");
 
-  DBUG_ASSERT(!ndbcluster_inited);
+  assert(!ndbcluster_inited);
 
 #ifdef HAVE_NDB_BINLOG
   /* Check const alignment */
@@ -13300,7 +13307,7 @@ int ndbcluster_init(void* p)
   DBUG_RETURN(0); // OK
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static
 const char*
 get_share_state_string(NDB_SHARE_STATE s)
@@ -13341,7 +13348,7 @@ static int ndbcluster_end(handlerton *hton, ha_panic_function type)
     {
       NDB_SHARE *share=
         (NDB_SHARE*) my_hash_element(&ndbcluster_open_tables, 0);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       fprintf(stderr,
               "NDB: table share %s with use_count %d state: %s(%u) not freed\n",
               share->key_string(), share->use_count,
@@ -13351,7 +13358,7 @@ static int ndbcluster_end(handlerton *hton, ha_panic_function type)
       ndbcluster_real_free_share(&share);
     }
     native_mutex_unlock(&ndbcluster_mutex);
-    DBUG_ASSERT(save == 0);
+    assert(save == 0);
   }
   my_hash_free(&ndbcluster_open_tables);
 
@@ -13362,7 +13369,7 @@ static int ndbcluster_end(handlerton *hton, ha_panic_function type)
     {
       NDB_SHARE *share=
         (NDB_SHARE*) my_hash_element(&ndbcluster_dropped_tables, 0);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       fprintf(stderr,
               "NDB: table share %s with use_count %d state: %s(%u) not freed\n",
               share->key_string(), share->use_count,
@@ -13381,7 +13388,7 @@ static int ndbcluster_end(handlerton *hton, ha_panic_function type)
       ndbcluster_real_free_share(&share);
     }
     native_mutex_unlock(&ndbcluster_mutex);
-    DBUG_ASSERT(save == 0);
+    assert(save == 0);
   }
   my_hash_free(&ndbcluster_dropped_tables);
 
@@ -13442,7 +13449,7 @@ void ha_ndbcluster::print_error(int error, myf errflag)
       {
         DBUG_VOID_RETURN;
       }
-      DBUG_ASSERT(false);
+      assert(false);
     }
 
     handler::print_error(error, errflag);
@@ -13768,7 +13775,8 @@ uint ha_ndbcluster::max_supported_key_length() const
 {
   return NDB_MAX_KEY_SIZE;
 }
-uint ha_ndbcluster::max_supported_key_part_length() const
+uint ha_ndbcluster::max_supported_key_part_length(HA_CREATE_INFO
+                                 *create_info MY_ATTRIBUTE((unused))) const
 {
   return NDB_MAX_KEY_SIZE;
 }
@@ -14040,7 +14048,7 @@ ha_ndbcluster::register_query_cache_table(THD *thd,
     Thd_ndb *thd_ndb= get_thd_ndb(thd);
     if (!thd_ndb->changed_tables.is_empty())
     {
-      DBUG_ASSERT(m_share);
+      assert(m_share);
       NDB_SHARE* share;
       List_iterator_fast<NDB_SHARE> it(thd_ndb->changed_tables);
       while ((share= it++))
@@ -14075,7 +14083,7 @@ static uchar *ndbcluster_get_key(NDB_SHARE *share, size_t *length,
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static void print_ndbcluster_open_tables()
 {
@@ -14187,7 +14195,7 @@ int handle_trailing_share(THD *thd, NDB_SHARE *share)
     Ndb share has not been released as it should
   */
 #ifdef NOT_YET
-  DBUG_ASSERT(FALSE);
+  assert(FALSE);
 #endif
 
   /*
@@ -14250,7 +14258,7 @@ ndbcluster_rename_share(THD *thd, NDB_SHARE *share, NDB_SHARE_KEY* new_key)
   {
     DBUG_PRINT("error", ("Failed to insert %s", share->key_string()));
     // Catch this unlikely error in debug
-    DBUG_ASSERT(false);
+    assert(false);
     share->key= old_key;
     if (my_hash_insert(&ndbcluster_open_tables, (uchar*) share))
     {
@@ -14359,7 +14367,7 @@ NDB_SHARE::create(const char* key, TABLE* table)
   if (ndbcluster_binlog_init_share(current_thd, share, table))
   {
     DBUG_PRINT("error", ("get_share: %s could not init share", key));
-    DBUG_ASSERT(share->event_data == NULL);
+    assert(share->event_data == NULL);
     NDB_SHARE::destroy(share);
     return NULL;
   }
@@ -14538,7 +14546,7 @@ int ha_ndbcluster::update_stats(THD *thd,
       stat= m_share->stat;
       native_mutex_unlock(&m_share->mutex);
 
-      DBUG_ASSERT(stat.row_count != ~(ha_rows)0); // should never be invalid
+      assert(stat.row_count != ~(ha_rows)0); // should never be invalid
 
       /* Accept shared cached statistics if row_count is valid. */
       if (stat.row_count != ~(ha_rows)0)
@@ -14609,7 +14617,7 @@ void modify_shared_stats(NDB_SHARE *share,
   if (local_stat->no_uncommitted_rows_count)
   {
     native_mutex_lock(&share->mutex);
-    DBUG_ASSERT(share->stat.row_count != ~(ha_rows)0);// should never be invalid
+    assert(share->stat.row_count != ~(ha_rows)0);// should never be invalid
     if (share->stat.row_count != ~(ha_rows)0)
     {
       DBUG_PRINT("info", ("Update row_count for %s, row_count: %lu, with:%d",
@@ -14650,7 +14658,7 @@ ndb_get_table_statistics(THD *thd, ha_ndbcluster* file, bool report_error, Ndb*
 
   DBUG_ENTER("ndb_get_table_statistics");
 
-  DBUG_ASSERT(record != 0);
+  assert(record != 0);
   
   /* We use the passed in NdbRecord just to get access to the
      table, we mask out any/all columns it may have and add
@@ -14920,7 +14928,7 @@ static inline
 ulong multi_range_buffer_size(const HANDLER_BUFFER* buffer)
 {
   const size_t buf_size = buffer->buffer_end - buffer->buffer;
-  DBUG_ASSERT(buf_size < ULONG_MAX);
+  assert(buf_size < ULONG_MAX);
   return (ulong)buf_size;
 }
 
@@ -14986,7 +14994,7 @@ multi_range_next_entry(uchar *p, ulong reclength)
 static uchar *
 multi_range_row(uchar *p)
 {
-  DBUG_ASSERT(multi_range_entry_type(p) == enum_unique_range);
+  assert(multi_range_entry_type(p) == enum_unique_range);
   return p + 1;
 }
 
@@ -14994,7 +15002,7 @@ multi_range_row(uchar *p)
 static char *
 multi_range_get_custom(HANDLER_BUFFER *buffer, int range_no)
 {
-  DBUG_ASSERT(range_no < MRR_MAX_RANGES);
+  assert(range_no < MRR_MAX_RANGES);
   char* res;
   memcpy(&res, buffer->buffer + range_no*sizeof(char*), sizeof(char*));
   return res;
@@ -15003,7 +15011,7 @@ multi_range_get_custom(HANDLER_BUFFER *buffer, int range_no)
 static void
 multi_range_put_custom(HANDLER_BUFFER *buffer, int range_no, char *custom)
 {
-  DBUG_ASSERT(range_no < MRR_MAX_RANGES);
+  assert(range_no < MRR_MAX_RANGES);
   // memcpy() required for unaligned access.
   memcpy(buffer->buffer + range_no*sizeof(char*), &custom, sizeof(char*));
 }
@@ -15020,11 +15028,16 @@ read_multi_needs_scan(NDB_INDEX_TYPE cur_index_type, const KEY *key_info,
 {
   if (cur_index_type == ORDERED_INDEX || is_pushed)
     return TRUE;
-  if (cur_index_type == PRIMARY_KEY_INDEX ||
-      cur_index_type == UNIQUE_INDEX)
+  if (cur_index_type == PRIMARY_KEY_INDEX)
     return FALSE;
-  DBUG_ASSERT(cur_index_type == PRIMARY_KEY_ORDERED_INDEX ||
-              cur_index_type == UNIQUE_ORDERED_INDEX);
+  if (cur_index_type == UNIQUE_INDEX) {  // a 'UNIQUE ... USING HASH' index
+    // UNIQUE_INDEX is used iff optimizer set HA_MRR_NO_NULL_ENDPOINTS.
+    // Assert that there are no NULL values in key as promissed.
+    assert(!check_null_in_key(key_info, r->start_key.key, r->start_key.length));
+    return FALSE;
+  }
+  assert(cur_index_type == PRIMARY_KEY_ORDERED_INDEX ||
+         cur_index_type == UNIQUE_ORDERED_INDEX);
   if (r->start_key.length != key_info->key_length ||
       r->start_key.flag != HA_READ_KEY_EXACT)
     return TRUE;                                // Not exact match, need scan
@@ -15082,13 +15095,13 @@ ha_ndbcluster::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
     DBUG_PRINT("info", ("Default MRR implementation choosen"));
     *flags= def_flags;
     *bufsz= def_bufsz;
-    DBUG_ASSERT(*flags & HA_MRR_USE_DEFAULT_IMPL);
+    assert(*flags & HA_MRR_USE_DEFAULT_IMPL);
   }
   else
   {
     /* *flags and *bufsz were set by choose_mrr_impl */
     DBUG_PRINT("info", ("NDB-MRR implementation choosen"));
-    DBUG_ASSERT(!(*flags & HA_MRR_USE_DEFAULT_IMPL));
+    assert(!(*flags & HA_MRR_USE_DEFAULT_IMPL));
   }
   DBUG_RETURN(rows);
 }
@@ -15121,7 +15134,7 @@ ha_ndbcluster::multi_range_read_info(uint keyno, uint n_ranges, uint n_rows,
     /* Default implementation can't perform MRR scan => we can't either */
     DBUG_RETURN(res);
   }
-  DBUG_ASSERT(!res);
+  assert(!res);
 
   if ((*flags & HA_MRR_USE_DEFAULT_IMPL) || 
       choose_mrr_impl(keyno, n_ranges, n_rows, bufsz, flags, cost))
@@ -15130,13 +15143,13 @@ ha_ndbcluster::multi_range_read_info(uint keyno, uint n_ranges, uint n_rows,
     DBUG_PRINT("info", ("Default MRR implementation choosen"));
     *flags= def_flags;
     *bufsz= def_bufsz;
-    DBUG_ASSERT(*flags & HA_MRR_USE_DEFAULT_IMPL);
+    assert(*flags & HA_MRR_USE_DEFAULT_IMPL);
   }
   else
   {
     /* *flags and *bufsz were set by choose_mrr_impl */
     DBUG_PRINT("info", ("NDB-MRR implementation choosen"));
-    DBUG_ASSERT(!(*flags & HA_MRR_USE_DEFAULT_IMPL));
+    assert(!(*flags & HA_MRR_USE_DEFAULT_IMPL));
   }
   DBUG_RETURN(res);
 }
@@ -15336,9 +15349,9 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
     part of the multi read at once.
   */
 
-  DBUG_ASSERT(cur_index_type != UNDEFINED_INDEX);
-  DBUG_ASSERT(m_multi_cursor==NULL);
-  DBUG_ASSERT(m_active_query==NULL);
+  assert(cur_index_type != UNDEFINED_INDEX);
+  assert(m_multi_cursor==NULL);
+  assert(m_active_query==NULL);
 
   const NdbOperation::LockMode lm = get_ndb_lock_mode(m_lock.type);
   const uchar *end_of_buffer= multi_range_buffer->buffer_end;
@@ -15358,7 +15371,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
   const ulong bufsize= multi_range_buffer_size(multi_range_buffer);
   int max_range= multi_range_max_ranges(ranges_in_seq,
                                         bufsize - min_entry_size);
-  DBUG_ASSERT(max_range > 0);
+  assert(max_range > 0);
   uchar *row_buf= multi_range_buffer->buffer + multi_range_fixed_size(max_range);
   m_multi_range_result_ptr= row_buf;
 
@@ -15456,7 +15469,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
       if (check_if_pushable(NdbQueryOperationDef::OrderedIndexScan, 
                             active_index))
       {
-        DBUG_ASSERT(!m_read_before_write_removal_used);
+        assert(!m_read_before_write_removal_used);
         if (!m_active_query)
         {
           const int error= create_pushed_join();
@@ -15514,7 +15527,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
         m_multi_cursor= scanOp;
 
         /* Can't have blobs in multi range read */
-        DBUG_ASSERT(!uses_blob_value(table->read_set));
+        assert(!uses_blob_value(table->read_set));
 
         /* We set m_next_row=0 to m that no row was fetched from the scan yet. */
         m_next_row= 0;
@@ -15574,7 +15587,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
 
       if (!trans)
       {
-        DBUG_ASSERT(active_index != MAX_KEY);
+        assert(active_index != MAX_KEY);
         if (unlikely(!(trans= start_transaction_key(active_index,
                                                     mrr_cur_range.start_key.key,
                                                     error))))
@@ -15621,8 +15634,8 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
             !m_pushed_join_member->get_query_def().isScanQuery())
         {
           op= NULL;            // Avoid compiler warning
-          DBUG_ASSERT(false);  // FIXME: Incomplete code, should not be executed
-          DBUG_ASSERT(lm == NdbOperation::LM_CommittedRead);
+          assert(false);  // FIXME: Incomplete code, should not be executed
+          assert(lm == NdbOperation::LM_CommittedRead);
           const int error= pk_unique_index_read_key_pushed(active_index,
                                                            mrr_cur_range.start_key.key,
                                                            ppartitionId);
@@ -15664,7 +15677,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
       m_thd_ndb->m_pruned_scan_count++;
 
     DBUG_PRINT("info", ("Is MRR scan-query pruned to 1 partition? :%u", prunable));
-    DBUG_ASSERT(!m_multi_cursor);
+    assert(!m_multi_cursor);
   }
   if (m_multi_cursor)
   {
@@ -15721,7 +15734,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
     if (type_loc >= enum_ordered_range)
       continue;
 
-    DBUG_ASSERT(op_idx < MRR_MAX_RANGES);
+    assert(op_idx < MRR_MAX_RANGES);
     if ((op= oplist[op_idx++]) == NULL)
       continue;  // read_before_write_removal
 
@@ -15741,7 +15754,7 @@ int ha_ndbcluster::multi_range_start_retrievals(uint starting_range)
 
           (But we can still safely return an error code in non-debug builds).
         */
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
         ERR_RETURN(error);      /* purecov: deadcode */
       }
     }
@@ -15867,13 +15880,13 @@ int ha_ndbcluster::multi_range_read_next(char **range_info)
                 Should not happen. Ranges should be returned from NDB API in
                 the order we requested them.
               */
-              DBUG_ASSERT(0);
+              assert(0);
               break;                              // Attempt to carry on
             }
           }
 
         default:
-          DBUG_ASSERT(0);
+          assert(0);
       }
       /* At this point the current range is done, proceed to next. */
       first_running_range++;
@@ -16051,7 +16064,7 @@ ha_ndbcluster::assign_pushed_join(const ndb_pushed_join* pushed_join)
   for (uint i = 0; i < pushed_join->get_operation_count(); i++)
   {
     const TABLE* const tab= pushed_join->get_table(i);
-    DBUG_ASSERT(tab->file->ht == ht);
+    assert(tab->file->ht == ht);
     ha_ndbcluster* child= static_cast<ha_ndbcluster*>(tab->file);
     child->m_pushed_join_member= pushed_join;
     child->m_pushed_join_operation= i;
@@ -16141,7 +16154,7 @@ int
 ha_ndbcluster::create_pushed_join(const NdbQueryParamValue* keyFieldParams, uint paramCnt)
 {
   DBUG_ENTER("create_pushed_join");
-  DBUG_ASSERT(m_pushed_join_member && m_pushed_join_operation == PUSHED_ROOT);
+  assert(m_pushed_join_member && m_pushed_join_operation == PUSHED_ROOT);
 
   NdbQuery* const query= 
     m_pushed_join_member->make_query_instance(m_thd_ndb->trans, keyFieldParams, paramCnt);
@@ -16155,7 +16168,7 @@ ha_ndbcluster::create_pushed_join(const NdbQueryParamValue* keyFieldParams, uint
     const TABLE* const tab= m_pushed_join_member->get_table(i);
     ha_ndbcluster* handler= static_cast<ha_ndbcluster*>(tab->file);
 
-    DBUG_ASSERT(handler->m_pushed_join_operation==(int)i);
+    assert(handler->m_pushed_join_operation==(int)i);
     NdbQueryOperation* const op= query->getQueryOperation(i);
     handler->m_pushed_operation= op;
 
@@ -16172,7 +16185,7 @@ ha_ndbcluster::create_pushed_join(const NdbQueryParamValue* keyFieldParams, uint
     handler->_m_next_row= 0;
   }
 
-  DBUG_ASSERT(m_active_query==NULL);
+  assert(m_active_query==NULL);
   m_active_query= query;
   m_thd_ndb->m_pushed_queries_executed++;
 
@@ -16217,7 +16230,7 @@ ha_ndbcluster::parent_of_pushed_join() const
 {
   if (m_pushed_join_operation > PUSHED_ROOT)
   {
-    DBUG_ASSERT(m_pushed_join_member!=NULL);
+    assert(m_pushed_join_member!=NULL);
     uint parent_ix= m_pushed_join_member
                     ->get_query_def().getQueryOperation(m_pushed_join_operation)
                     ->getParentOperation(0)
@@ -16585,7 +16598,7 @@ ha_ndbcluster::cond_push(const Item *cond)
     or other instances of this table.
     (This was a legacy bug in optimizer)
   */
-  DBUG_ASSERT(!(cond->used_tables() & ~table->pos_in_table_list->map()));
+  assert(!(cond->used_tables() & ~table->pos_in_table_list->map()));
 #endif
   if (!m_cond) 
     m_cond= new ha_ndbcluster_cond;
@@ -16747,7 +16760,7 @@ uint32 ha_ndbcluster::calculate_key_hash_value(Field **field_array)
   {
     Field *field= *field_array;
     uint len= field->data_length();
-    DBUG_ASSERT(!field->is_real_null());
+    assert(!field->is_real_null());
     if (field->real_type() == MYSQL_TYPE_VARCHAR)
       len+= ((Field_varstring*)field)->length_bytes;
     key_data[i].ptr= field->ptr;
@@ -16758,7 +16771,7 @@ uint32 ha_ndbcluster::calculate_key_hash_value(Field **field_array)
                                  key_data_ptr, buf, sizeof(tmp))))
   {
     DBUG_PRINT("info", ("ret_val = %d", ret_val));
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     abort();
   }
   DBUG_RETURN(hash_value);
@@ -16820,7 +16833,7 @@ void ha_ndbcluster::set_auto_partitions(partition_info *part_info)
     part_info->linear_hash_ind= TRUE;
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   DBUG_VOID_RETURN;
@@ -17029,7 +17042,7 @@ create_table_set_up_partition_info(HA_CREATE_INFO* create_info,
     }
 
     // Double check number of partitions vs. fragments
-    DBUG_ASSERT(part_info->get_tot_partitions() == fd_index);
+    assert(part_info->get_tot_partitions() == fd_index);
 
     ndbtab.setFragmentCount(fd_index);
     ndbtab.setFragmentData(frag_data, fd_index);
@@ -17635,11 +17648,11 @@ ha_ndbcluster::prepare_inplace_alter_table(TABLE *altered_table,
       uint reported_frags= no_fragments;
       if (adjusted_frag_count(ndb, no_fragments, reported_frags))
       {
-        DBUG_ASSERT(false); /* Checked above */
+        assert(false); /* Checked above */
       }
       if (reported_frags < old_tab->getFragmentCount())
       {
-        DBUG_ASSERT(false);
+        assert(false);
         DBUG_RETURN(false);
       }
       /* Note we don't set the ndb table's max_rows param, as that 
@@ -17710,9 +17723,9 @@ int ha_ndbcluster::alter_frm(const char *file,
   NDBDICT *dict= alter_data->dictionary;
 
   // TODO handle this
-  DBUG_ASSERT(m_table != 0);
+  assert(m_table != 0);
 
-  DBUG_ASSERT(get_ndb_share_state(m_share) == NSS_ALTERED);
+  assert(get_ndb_share_state(m_share) == NSS_ALTERED);
   if (readfrm(file, &data, &length) ||
       packfrm(data, length, &pack_data, &pack_length))
   {
@@ -17858,7 +17871,7 @@ ha_ndbcluster::commit_inplace_alter_table(TABLE *altered_table,
   const char *db= table->s->db.str;
   const char *name= table->s->table_name.str;
   uint32 table_id= 0, table_version= 0;
-  DBUG_ASSERT(alter_data != 0);
+  assert(alter_data != 0);
   if (alter_data)
   {
     table_id= alter_data->table_id;
@@ -17923,13 +17936,13 @@ void ha_ndbcluster::notify_table_changed()
   */
   {
     Ndb* ndb= get_ndb(thd);
-    DBUG_ASSERT(ndb != 0);
+    assert(ndb != 0);
     if (ndb)
     {
       ndb->setDatabaseName(db);
       Ndb_table_guard ndbtab(ndb->getDictionary(), name);
       const NDBTAB *new_tab= ndbtab.get_table();
-      DBUG_ASSERT(new_tab != 0);
+      assert(new_tab != 0);
       if (new_tab)
       {
         table_id= new_tab->getObjectId();
@@ -18038,7 +18051,7 @@ int ndbcluster_get_tablespace(THD* thd,
   DBUG_ENTER("ndbcluster_get_tablespace");
   DBUG_PRINT("enter", ("db_name: %s, table_name: %s", db_name.str,
              table_name.str));
-  DBUG_ASSERT(tablespace_name != NULL);
+  assert(tablespace_name != NULL);
 
   Ndb* ndb= check_ndb_in_thd(thd);
   if (ndb == NULL)
@@ -18060,7 +18073,7 @@ int ndbcluster_get_tablespace(THD* thd,
     if (ndberr.classification == NdbError::NoError)
     {
       const char *tablespace= ts.getName();
-      DBUG_ASSERT(tablespace);
+      assert(tablespace);
       const size_t tablespace_len= strlen(tablespace);
       DBUG_PRINT("info", ("Found tablespace '%s'", tablespace));
       thd->make_lex_string(tablespace_name, tablespace, tablespace_len, false);
@@ -19328,7 +19341,7 @@ static MYSQL_SYSVAR_ENUM(
   &slave_conflict_role_typelib       /* typelib */
 );
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static
 void
@@ -19343,7 +19356,7 @@ dbg_check_shares_update(THD*, st_mysql_sys_var*, void*, const void*)
                           get_share_state_string(share->state),
                           (unsigned)share->state,
                           share->use_count);
-    DBUG_ASSERT(share->state != NSS_DROPPED);
+    assert(share->state != NSS_DROPPED);
   }
 
   sql_print_information("dbug_check_shares dropped:");
@@ -19355,7 +19368,7 @@ dbg_check_shares_update(THD*, st_mysql_sys_var*, void*, const void*)
                           get_share_state_string(share->state),
                           (unsigned)share->state,
                           share->use_count);
-    DBUG_ASSERT(share->state == NSS_DROPPED);
+    assert(share->state == NSS_DROPPED);
   }
 
   /**
@@ -19364,7 +19377,7 @@ dbg_check_shares_update(THD*, st_mysql_sys_var*, void*, const void*)
   for (uint i= 0; i < ndbcluster_open_tables.records; i++)
   {
     NDB_SHARE *share= (NDB_SHARE*)my_hash_element(&ndbcluster_open_tables, i);
-    DBUG_ASSERT(strcmp(share->db, "mysql") == 0);
+    assert(strcmp(share->db, "mysql") == 0);
   }
 
   /**
@@ -19373,7 +19386,7 @@ dbg_check_shares_update(THD*, st_mysql_sys_var*, void*, const void*)
   for (uint i= 0; i < ndbcluster_dropped_tables.records; i++)
   {
     NDB_SHARE *share= (NDB_SHARE*)my_hash_element(&ndbcluster_dropped_tables,i);
-    DBUG_ASSERT(strcmp(share->db, "mysql") == 0);
+    assert(strcmp(share->db, "mysql") == 0);
   }
 }
 
@@ -19434,7 +19447,7 @@ static struct st_mysql_sys_var* system_variables[]= {
   MYSQL_SYSVAR(deferred_constraints),
   MYSQL_SYSVAR(join_pushdown),
   MYSQL_SYSVAR(log_exclusive_reads),
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   MYSQL_SYSVAR(dbg_check_shares),
 #endif
   MYSQL_SYSVAR(version),
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 9d1c75575a1d..277a527fa4ea 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -238,7 +245,7 @@ class ha_ndbcluster: public handler, public Partition_handler
   uint max_supported_keys() const;
   uint max_supported_key_parts() const;
   uint max_supported_key_length() const;
-  uint max_supported_key_part_length() const;
+  uint max_supported_key_part_length(HA_CREATE_INFO *create_info) const;
 
   virtual bool is_fk_defined_on_table_or_index(uint index);
   int get_child_or_parent_fk_list(THD *thd,
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 883b875b7cdc..3338bfb27925 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -169,7 +176,7 @@ static my_bool g_ndb_log_slave_updates;
 
 static bool g_injector_v1_warning_emitted = false;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static void print_records(TABLE *table, const uchar *record)
 {
   for (uint j= 0; j < table->s->fields; j++)
@@ -194,7 +201,7 @@ static void print_records(TABLE *table, const uchar *record)
 #endif
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static void dbug_print_table(const char *info, TABLE *table)
 {
   if (table == 0)
@@ -296,7 +303,7 @@ static int
 ndb_binlog_open_shadow_table(THD *thd, NDB_SHARE *share)
 {
   int error;
-  DBUG_ASSERT(share->event_data == 0);
+  assert(share->event_data == 0);
   Ndb_event_data *event_data= share->event_data= new Ndb_event_data(share);
   DBUG_ENTER("ndb_binlog_open_shadow_table");
 
@@ -359,7 +366,7 @@ ndb_binlog_open_shadow_table(THD *thd, NDB_SHARE *share)
 
   event_data->init_pk_bitmap();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   dbug_print_table("table", shadow_table);
 #endif
   *root_ptr= old_root;
@@ -437,7 +444,7 @@ get_ndb_blobs_value(TABLE* table, NdbValue* value_array,
             DBUG_RETURN(-1);
           DBUG_PRINT("info", ("[%u] offset: %u  buf: 0x%lx  len=%u  [ptrdiff=%d]",
                               i, offset, (long) buf, len, (int)ptrdiff));
-          DBUG_ASSERT(len == len64);
+          assert(len == len64);
           // Ugly hack assumes only ptr needs to be changed
           field_blob->set_ptr_offset(ptrdiff, len, buf);
         }
@@ -489,10 +496,10 @@ static void ndbcluster_binlog_wait(THD *thd)
   if (ndb_binlog_running)
   {
     DBUG_ENTER("ndbcluster_binlog_wait");
-    DBUG_ASSERT(thd);
-    DBUG_ASSERT(thd_sql_command(thd) == SQLCOM_SHOW_BINLOG_EVENTS ||
-                thd_sql_command(thd) == SQLCOM_FLUSH ||
-                thd_sql_command(thd) == SQLCOM_RESET);
+    assert(thd);
+    assert(thd_sql_command(thd) == SQLCOM_SHOW_BINLOG_EVENTS ||
+           thd_sql_command(thd) == SQLCOM_FLUSH ||
+           thd_sql_command(thd) == SQLCOM_RESET);
     /*
       Binlog Injector should not wait for itself
     */
@@ -553,7 +560,7 @@ static void ndbcluster_binlog_wait(THD *thd)
                         Uint32(ndb_latest_handled_binlog_epoch & 0xffffffff));
 
       // Fail on wait/deadlock timeout in debug compile
-      DBUG_ASSERT(false);
+      assert(false);
     }
     
     thd->proc_info= save_info;
@@ -1675,9 +1682,9 @@ int ndbcluster_log_schema_op(THD *thd,
   if(strlen(db) > NDB_MAX_DDL_NAME_BYTESIZE)
   {
     // Catch unexpected commands with too long db length
-    DBUG_ASSERT(type == SOT_CREATE_DB ||
-                type == SOT_ALTER_DB ||
-                type == SOT_DROP_DB);
+    assert(type == SOT_CREATE_DB ||
+           type == SOT_ALTER_DB ||
+           type == SOT_DROP_DB);
     push_warning_printf(thd, Sql_condition::SL_WARNING,
                         ER_TOO_LONG_IDENT,
                         "Ndb has an internal limit of %u bytes on the size of schema identifiers",
@@ -1853,7 +1860,7 @@ int ndbcluster_log_schema_op(THD *thd,
       if (i != SCHEMA_QUERY_I)
       {
         sz[i]= col[i]->getLength();
-        DBUG_ASSERT(sz[i] <= sizeof(tmp_buf));
+        assert(sz[i] <= sizeof(tmp_buf));
       }
     }
   }
@@ -1870,48 +1877,48 @@ int ndbcluster_log_schema_op(THD *thd,
       NdbOperation *op= 0;
       int r= 0;
       r|= (op= trans->getNdbOperation(ndbtab)) == 0;
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       r|= op->writeTuple();
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       
       /* db */
       ndb_pack_varchar(col[SCHEMA_DB_I], tmp_buf, log_db, (int)strlen(log_db));
       r|= op->equal(SCHEMA_DB_I, tmp_buf);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* name */
       ndb_pack_varchar(col[SCHEMA_NAME_I], tmp_buf, log_tab,
                        (int)strlen(log_tab));
       r|= op->equal(SCHEMA_NAME_I, tmp_buf);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* slock */
-      DBUG_ASSERT(sz[SCHEMA_SLOCK_I] ==
-                  no_bytes_in_map(&ndb_schema_object->slock_bitmap));
+      assert(sz[SCHEMA_SLOCK_I] ==
+             no_bytes_in_map(&ndb_schema_object->slock_bitmap));
       r|= op->setValue(SCHEMA_SLOCK_I, log_subscribers);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* query */
       {
         NdbBlob *ndb_blob= op->getBlobHandle(SCHEMA_QUERY_I);
-        DBUG_ASSERT(ndb_blob != 0);
+        assert(ndb_blob != 0);
         uint blob_len= query_length;
         const char* blob_ptr= query;
         r|= ndb_blob->setValue(blob_ptr, blob_len);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
       }
       /* node_id */
       r|= op->setValue(SCHEMA_NODE_ID_I, node_id);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* epoch */
       r|= op->setValue(SCHEMA_EPOCH_I, epoch);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* id */
       r|= op->setValue(SCHEMA_ID_I, ndb_table_id);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* version */
       r|= op->setValue(SCHEMA_VERSION_I, ndb_table_version);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* type */
       r|= op->setValue(SCHEMA_TYPE_I, log_type);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       /* any value */
       Uint32 anyValue = 0;
       if (! thd->slave_thread)
@@ -1953,7 +1960,7 @@ int ndbcluster_log_schema_op(THD *thd,
         anyValue = thd_unmasked_server_id(thd);
       }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       /*
         MySQLD will set the user-portion of AnyValue (if any) to all 1s
         This tests code filtering ServerIds on the value of server-id-bits.
@@ -1965,7 +1972,7 @@ int ndbcluster_log_schema_op(THD *thd,
       }
 #endif  
       r|= op->setAnyValue(anyValue);
-      DBUG_ASSERT(r == 0);
+      assert(r == 0);
       break;
     }
     if (trans->execute(NdbTransaction::Commit, NdbOperation::DefaultAbortOption,
@@ -2063,7 +2070,7 @@ int ndbcluster_log_schema_op(THD *thd,
         {
           sql_print_error("NDB %s: distributing %s timed out. Ignoring...",
                           type_str, ndb_schema_object->key);
-          DBUG_ASSERT(false);
+          assert(false);
           break;
         }
         if (opt_ndb_extra_logging)
@@ -2117,10 +2124,10 @@ ndb_handle_schema_change(THD *thd, Ndb *is_ndb, NdbEventOperation *pOp,
   DBUG_PRINT("enter", ("pOp: %p", pOp));
 
   // Only called for TE_DROP and TE_CLUSTER_FAILURE event
-  DBUG_ASSERT(pOp->getEventType() == NDBEVENT::TE_DROP ||
-              pOp->getEventType() == NDBEVENT::TE_CLUSTER_FAILURE);
+  assert(pOp->getEventType() == NDBEVENT::TE_DROP ||
+         pOp->getEventType() == NDBEVENT::TE_CLUSTER_FAILURE);
 
-  DBUG_ASSERT(event_data);
+  assert(event_data);
 
   NDB_SHARE *share= event_data->share;
   dbug_print_share("changed share: ", share);
@@ -2143,8 +2150,8 @@ ndb_handle_schema_change(THD *thd, Ndb *is_ndb, NdbEventOperation *pOp,
   }
 
   native_mutex_lock(&share->mutex);
-  DBUG_ASSERT(share->state == NSS_DROPPED || 
-              share->op == pOp || share->new_op == pOp);
+  assert(share->state == NSS_DROPPED || 
+         share->op == pOp || share->new_op == pOp);
   if (share->new_op)
   {
     share->new_op= 0;
@@ -2315,11 +2322,11 @@ class Ndb_schema_dist_data {
   // Map from nodeid to position in subscriber bitmaps array
   uint8 map2subscriber_bitmap_index(uint data_node_id) const
   {
-    DBUG_ASSERT(data_node_id <
-                (sizeof(m_data_node_id_list)/sizeof(m_data_node_id_list[0])));
+    assert(data_node_id <
+           (sizeof(m_data_node_id_list)/sizeof(m_data_node_id_list[0])));
     const uint8 bitmap_index = m_data_node_id_list[data_node_id];
-    DBUG_ASSERT(bitmap_index != 0xFF);
-    DBUG_ASSERT(bitmap_index < m_num_bitmaps);
+    assert(bitmap_index != 0xFF);
+    assert(bitmap_index < m_num_bitmaps);
     return bitmap_index;
   }
 
@@ -2341,7 +2348,7 @@ class Ndb_schema_dist_data {
   void report_subscribe(unsigned data_node_id, unsigned subscriber_node_id)
   {
     uint8 idx= map2subscriber_bitmap_index(data_node_id);
-    DBUG_ASSERT(subscriber_node_id != 0);
+    assert(subscriber_node_id != 0);
     bitmap_set_bit(&subscriber_bitmap[idx], subscriber_node_id);
     DBUG_PRINT("info",("Data node %u reported node %u subscribed ",
                        data_node_id, subscriber_node_id));
@@ -2359,7 +2366,7 @@ class Ndb_schema_dist_data {
   void report_unsubscribe(unsigned data_node_id, unsigned subscriber_node_id)
   {
     uint8 idx= map2subscriber_bitmap_index(data_node_id);
-    DBUG_ASSERT(subscriber_node_id != 0);
+    assert(subscriber_node_id != 0);
     bitmap_clear_bit(&subscriber_bitmap[idx], subscriber_node_id);
     DBUG_PRINT("info",("Data node %u reported node %u unsubscribed ",
                        data_node_id, subscriber_node_id));
@@ -2418,27 +2425,27 @@ class Ndb_schema_event_handler {
         {
           my_free(blobs_buffer, MYF(MY_ALLOW_ZERO_PTR));
           DBUG_PRINT("info", ("blob read error"));
-          DBUG_ASSERT(FALSE);
+          assert(FALSE);
         }
       }
       /* db varchar 1 length uchar */
       field= table->field;
       db_length= *(uint8*)(*field)->ptr;
-      DBUG_ASSERT(db_length <= (*field)->field_length);
-      DBUG_ASSERT((*field)->field_length + 1 == sizeof(db));
+      assert(db_length <= (*field)->field_length);
+      assert((*field)->field_length + 1 == sizeof(db));
       memcpy(db, (*field)->ptr + 1, db_length);
       db[db_length]= 0;
       /* name varchar 1 length uchar */
       field++;
       name_length= *(uint8*)(*field)->ptr;
-      DBUG_ASSERT(name_length <= (*field)->field_length);
-      DBUG_ASSERT((*field)->field_length + 1 == sizeof(name));
+      assert(name_length <= (*field)->field_length);
+      assert((*field)->field_length + 1 == sizeof(name));
       memcpy(name, (*field)->ptr + 1, name_length);
       name[name_length]= 0;
       /* slock fixed length */
       field++;
       slock_length= (*field)->field_length;
-      DBUG_ASSERT((*field)->field_length == sizeof(slock_buf));
+      assert((*field)->field_length == sizeof(slock_buf));
       memcpy(slock_buf, (*field)->ptr, slock_length);
       /* query blob */
       field++;
@@ -2447,7 +2454,7 @@ class Ndb_schema_event_handler {
         uint blob_len= field_blob->get_length((*field)->ptr);
         uchar *blob_ptr= 0;
         field_blob->get_ptr(&blob_ptr);
-        DBUG_ASSERT(blob_len == 0 || blob_ptr != 0);
+        assert(blob_len == 0 || blob_ptr != 0);
         query_length= blob_len;
         query= sql_strmake((char*) blob_ptr, blob_len);
       }
@@ -2581,7 +2588,7 @@ class Ndb_schema_event_handler {
       to the server_id where the query originated.
     */
     const uint32 thd_server_id_save= thd->server_id;
-    DBUG_ASSERT(sizeof(thd_server_id_save) == sizeof(thd->server_id));
+    assert(sizeof(thd_server_id_save) == sizeof(thd->server_id));
     thd->server_id = loggedServerId;
 
     LEX_CSTRING thd_db_save= thd->db();
@@ -2654,7 +2661,7 @@ class Ndb_schema_event_handler {
         col[i]= ndbtab->getColumn(i);
         if (i != SCHEMA_QUERY_I)
         {
-          DBUG_ASSERT(col[i]->getLength() <= (int)sizeof(tmp_buf));
+          assert(col[i]->getLength() <= (int)sizeof(tmp_buf));
         }
       }
     }
@@ -2669,22 +2676,22 @@ class Ndb_schema_event_handler {
 
         /* read the bitmap exlusive */
         r|= (op= trans->getNdbOperation(ndbtab)) == 0;
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         r|= op->readTupleExclusive();
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
 
         /* db */
         ndb_pack_varchar(col[SCHEMA_DB_I], tmp_buf, db, (int)strlen(db));
         r|= op->equal(SCHEMA_DB_I, tmp_buf);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* name */
         ndb_pack_varchar(col[SCHEMA_NAME_I], tmp_buf, table_name,
                          (int)strlen(table_name));
         r|= op->equal(SCHEMA_NAME_I, tmp_buf);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* slock */
         r|= op->getValue(SCHEMA_SLOCK_I, (char*)slock.bitmap) == 0;
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
       }
       if (trans->execute(NdbTransaction::NoCommit))
         goto err;
@@ -2712,28 +2719,28 @@ class Ndb_schema_event_handler {
 
         /* now update the tuple */
         r|= (op= trans->getNdbOperation(ndbtab)) == 0;
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         r|= op->updateTuple();
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
 
         /* db */
         ndb_pack_varchar(col[SCHEMA_DB_I], tmp_buf, db, (int)strlen(db));
         r|= op->equal(SCHEMA_DB_I, tmp_buf);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* name */
         ndb_pack_varchar(col[SCHEMA_NAME_I], tmp_buf, table_name,
                          (int)strlen(table_name));
         r|= op->equal(SCHEMA_NAME_I, tmp_buf);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* slock */
         r|= op->setValue(SCHEMA_SLOCK_I, (char*)slock.bitmap);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* node_id */
         r|= op->setValue(SCHEMA_NODE_ID_I, own_nodeid());
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
         /* type */
         r|= op->setValue(SCHEMA_TYPE_I, (uint32)SOT_CLEAR_SLOCK);
-        DBUG_ASSERT(r == 0);
+        assert(r == 0);
       }
       if (trans->execute(NdbTransaction::Commit,
                          NdbOperation::DefaultAbortOption, 1 /*force send*/) == 0)
@@ -2889,7 +2896,7 @@ class Ndb_schema_event_handler {
       */
       sql_print_error("NDB schema: Could not find table '%s.%s' in NDB",
                       db_name, table_name);
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_VOID_RETURN;
     }
 
@@ -3100,11 +3107,11 @@ class Ndb_schema_event_handler {
         }
         share->op= 0;
         free_share(&share);   // Free binlog ref, 2)
-        DBUG_ASSERT(share);   // Still ref'ed by 1) & 3)
+        assert(share);   // Still ref'ed by 1) & 3)
       }
       native_mutex_unlock(&share->mutex);
       free_share(&share);   // Free temporary ref, 3)
-      DBUG_ASSERT(share);   // Still ref'ed by dict, 1)
+      assert(share);   // Still ref'ed by dict, 1)
 
       /**
        * Finaly unref. from dictionary, 1). 
@@ -3226,7 +3233,7 @@ class Ndb_schema_event_handler {
         share->op= share->new_op;
         share->new_op= 0;
         free_share(&share);
-        DBUG_ASSERT(share);   // Should still be ref'ed
+        assert(share);   // Should still be ref'ed
       }
       native_mutex_unlock(&share->mutex);
 
@@ -3274,7 +3281,7 @@ class Ndb_schema_event_handler {
     if (share)
     {
       free_share(&share); // temporary ref.
-      DBUG_ASSERT(share); // Should still be ref'ed
+      assert(share); // Should still be ref'ed
       free_share(&share); // server ref.
     }
 
@@ -3359,7 +3366,7 @@ class Ndb_schema_event_handler {
     if (!share)
     {
       // The RENAME need to find share so it can be renamed
-      DBUG_ASSERT(share);
+      assert(share);
       DBUG_VOID_RETURN;
     }
 
@@ -3369,14 +3376,14 @@ class Ndb_schema_event_handler {
     {
       // The rename need to have new_key set
       // by a previous RENAME_PREPARE
-      DBUG_ASSERT(prepared_key);
+      assert(prepared_key);
       DBUG_VOID_RETURN;
     }
 
     // Rename on participant is always from real to
     // real name(i.e neiher old or new name should be a temporary name)
-    DBUG_ASSERT(!IS_TMP_PREFIX(schema->name));
-    DBUG_ASSERT(!IS_TMP_PREFIX(NDB_SHARE::key_get_table_name(prepared_key)));
+    assert(!IS_TMP_PREFIX(schema->name));
+    assert(!IS_TMP_PREFIX(NDB_SHARE::key_get_table_name(prepared_key)));
 
     // Rename the local table
     from.rename_table(NDB_SHARE::key_get_db_name(prepared_key),
@@ -3675,7 +3682,7 @@ class Ndb_schema_event_handler {
         sql_print_error("NDB schema: Skipping old schema operation"
                         "(RENAME_TABLE_NEW) on %s.%s",
                         schema->db, schema->name);
-        DBUG_ASSERT(false);
+        assert(false);
         break;
 
       }
@@ -3743,7 +3750,7 @@ class Ndb_schema_event_handler {
         break;
 
       default:
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
       }
     }
 
@@ -3777,8 +3784,8 @@ class Ndb_schema_event_handler {
   ~Ndb_schema_event_handler()
   {
     // There should be no work left todo...
-    DBUG_ASSERT(m_post_epoch_handle_list.elements == 0);
-    DBUG_ASSERT(m_post_epoch_ack_list.elements == 0);
+    assert(m_post_epoch_handle_list.elements == 0);
+    assert(m_post_epoch_ack_list.elements == 0);
   }
 
 
@@ -3903,8 +3910,8 @@ class Ndb_schema_event_handler {
       }
     }
     // There should be no work left todo...
-    DBUG_ASSERT(m_post_epoch_handle_list.elements == 0);
-    DBUG_ASSERT(m_post_epoch_ack_list.elements == 0);
+    assert(m_post_epoch_handle_list.elements == 0);
+    assert(m_post_epoch_ack_list.elements == 0);
   }
 };
 
@@ -4154,7 +4161,7 @@ ndb_binlog_index_table__write_rows(THD *thd,
     There should be no need for rolling back transaction due to deadlock
     (since ndb_binlog_index is non transactional).
   */
-  DBUG_ASSERT(! thd->transaction_rollback_request);
+  assert(! thd->transaction_rollback_request);
 
   // Release MDL locks on the opened table
   thd->mdl_context.release_transactional_locks();
@@ -4581,8 +4588,8 @@ int ndbcluster_create_binlog_setup(THD *thd, Ndb *ndb, const char *key,
   DBUG_ENTER("ndbcluster_create_binlog_setup");
   DBUG_PRINT("enter",("key: %s  key_len: %d  %s.%s",
                       key, key_len, db, table_name));
-  DBUG_ASSERT(! IS_NDB_BLOB_PREFIX(table_name));
-  DBUG_ASSERT(strlen(key) == key_len);
+  assert(! IS_NDB_BLOB_PREFIX(table_name));
+  assert(strlen(key) == key_len);
 
   NDB_SHARE* share= get_share(key, table, true, false);
   if (share == 0)
@@ -4718,10 +4725,10 @@ ndbcluster_create_event(THD *thd, Ndb *ndb, const NDBTAB *ndbtab,
                        event_name, share->key_string()));
 
   // Never create event on table with temporary name
-  DBUG_ASSERT(! IS_TMP_PREFIX(ndbtab->getName()));
+  assert(! IS_TMP_PREFIX(ndbtab->getName()));
   // Never create event on the blob table(s)
-  DBUG_ASSERT(! IS_NDB_BLOB_PREFIX(ndbtab->getName()));
-  DBUG_ASSERT(share);
+  assert(! IS_NDB_BLOB_PREFIX(ndbtab->getName()));
+  assert(share);
 
   if (get_binlog_nologging(share))
   {
@@ -4900,10 +4907,10 @@ ndbcluster_create_event_ops(THD *thd, NDB_SHARE *share,
                        ndbtab->getName(), event_name, share->key_string()));
 
   // Never create event on table with temporary name
-  DBUG_ASSERT(! IS_TMP_PREFIX(ndbtab->getName()));
+  assert(! IS_TMP_PREFIX(ndbtab->getName()));
   // Never create event on the blob table(s)
-  DBUG_ASSERT(! IS_NDB_BLOB_PREFIX(ndbtab->getName()));
-  DBUG_ASSERT(share);
+  assert(! IS_NDB_BLOB_PREFIX(ndbtab->getName()));
+  assert(share);
 
   if (get_binlog_nologging(share))
   {
@@ -4936,7 +4943,7 @@ ndbcluster_create_event_ops(THD *thd, NDB_SHARE *share,
   }
 
   // Check that the share agrees
-  DBUG_ASSERT(share->need_events(ndb_binlog_running));
+  assert(share->need_events(ndb_binlog_running));
 
   Ndb_event_data *event_data= share->event_data;
   if (share->op)
@@ -4945,7 +4952,7 @@ ndbcluster_create_event_ops(THD *thd, NDB_SHARE *share,
     assert(event_data->share == share);
     assert(share->event_data == 0);
 
-    DBUG_ASSERT(share->use_count > 1);
+    assert(share->use_count > 1);
     sql_print_error("NDB Binlog: discover reusing old ev op");
     /* ndb_share reference ToDo free */
     DBUG_PRINT("NDB_SHARE", ("%s ToDo free  use_count: %u",
@@ -4954,7 +4961,7 @@ ndbcluster_create_event_ops(THD *thd, NDB_SHARE *share,
     DBUG_RETURN(0);
   }
 
-  DBUG_ASSERT(event_data != 0);
+  assert(event_data != 0);
   TABLE *table= event_data->shadow_table;
 
   int retries= 100;
@@ -5043,7 +5050,7 @@ ndbcluster_create_event_ops(THD *thd, NDB_SHARE *share,
         else
         {
           DBUG_PRINT("info", ("%s blob", col_name));
-          DBUG_ASSERT(share->flags & NSF_BLOB_FLAG);
+          assert(share->flags & NSF_BLOB_FLAG);
           attr0.blob= op->getBlobHandle(col_name);
           attr1.blob= op->getPreBlobHandle(col_name);
           if (attr0.blob == NULL || attr1.blob == NULL)
@@ -5188,7 +5195,7 @@ ndbcluster_drop_event(THD *thd, Ndb *ndb, NDB_SHARE *share,
           share->op->getState() == NdbEventOperation::EO_EXECUTING &&
           dict->getNdbError().mysql_code != HA_ERR_NO_CONNECTION)
       {
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
         DBUG_RETURN(-1);
       }
     }
@@ -5264,7 +5271,7 @@ ndbcluster_handle_drop_table(THD *thd, Ndb *ndb, NDB_SHARE *share,
       {
         sql_print_error("NDB %s: %s timed out. Ignoring...",
                         type_str, share->key_string());
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
       if (opt_ndb_extra_logging)
@@ -5415,7 +5422,7 @@ static void ndb_unpack_record(TABLE *table, NdbValue *value,
         }
         else
         {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           // pointer vas set in get_ndb_blobs_value
           Field_blob *field_blob= (Field_blob*)field;
           uchar* ptr;
@@ -5818,8 +5825,8 @@ handle_data_event(THD* thd, Ndb *ndb, NdbEventOperation *pOp,
     }
   }
 
-  DBUG_ASSERT(trans.good());
-  DBUG_ASSERT(table != 0);
+  assert(trans.good());
+  assert(table != 0);
 
   dbug_print_table("table", table);
 
@@ -6027,16 +6034,16 @@ remove_event_operations(Ndb* ndb)
   NdbEventOperation *op;
   while ((op= ndb->getEventOperation()))
   {
-    DBUG_ASSERT(!IS_NDB_BLOB_PREFIX(op->getEvent()->getTable()->getName()));
+    assert(!IS_NDB_BLOB_PREFIX(op->getEvent()->getTable()->getName()));
     DBUG_PRINT("info", ("removing event operation on %s",
                         op->getEvent()->getName()));
 
     Ndb_event_data *event_data= (Ndb_event_data *) op->getCustomData();
-    DBUG_ASSERT(event_data);
+    assert(event_data);
 
     NDB_SHARE *share= event_data->share;
-    DBUG_ASSERT(share != NULL);
-    DBUG_ASSERT(share->op == op || share->new_op == op);
+    assert(share != NULL);
+    assert(share->op == op || share->new_op == op);
 
     delete event_data;
     op->setCustomData(NULL);
@@ -6093,13 +6100,13 @@ injectApplyStatusWriteRow(injector::transaction& trans,
   if (ndb_apply_status_share == NULL)
   {
     sql_print_error("NDB: Could not get apply status share");
-    DBUG_ASSERT(ndb_apply_status_share != NULL);
+    assert(ndb_apply_status_share != NULL);
     DBUG_RETURN(false);
   }
 
   longlong gci_to_store = (longlong) gci;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("ndb_binlog_injector_cycle_gcis",
                   {
                     ulonglong gciHi = ((gci_to_store >> 32) 
@@ -6127,12 +6134,12 @@ injectApplyStatusWriteRow(injector::transaction& trans,
      WRITE_ROW event
      First get the relevant table structure.
   */
-  DBUG_ASSERT(!ndb_apply_status_share->event_data);
-  DBUG_ASSERT(ndb_apply_status_share->op);
+  assert(!ndb_apply_status_share->event_data);
+  assert(ndb_apply_status_share->op);
   Ndb_event_data* event_data=
     (Ndb_event_data *) ndb_apply_status_share->op->getCustomData();
-  DBUG_ASSERT(event_data);
-  DBUG_ASSERT(event_data->shadow_table);
+  assert(event_data);
+  assert(event_data->shadow_table);
   TABLE* apply_status_table= event_data->shadow_table;
 
   /*
@@ -6145,7 +6152,7 @@ injectApplyStatusWriteRow(injector::transaction& trans,
   */
   static const ulong sav_max= 512; // current is 284
   const ulong sav_len= apply_status_table->s->reclength;
-  DBUG_ASSERT(sav_len <= sav_max);
+  assert(sav_len <= sav_max);
   uchar sav_buf[sav_max];
   memcpy(sav_buf, apply_status_table->record[0], sav_len);
   empty_record(apply_status_table);
@@ -6155,7 +6162,7 @@ injectApplyStatusWriteRow(injector::transaction& trans,
   apply_status_table->field[2]->store("", 0, &my_charset_bin);
   apply_status_table->field[3]->store((longlong)0, true);
   apply_status_table->field[4]->store((longlong)0, true);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const LEX_STRING &name= apply_status_table->s->table_name;
   DBUG_PRINT("info", ("use_table: %.*s",
                       (int) name.length, name.str));
@@ -6454,7 +6461,7 @@ Ndb_binlog_thread::do_run()
     }
     native_mutex_unlock(&injector_mutex);
 
-    DBUG_ASSERT(ndbcluster_hton->slot != ~(uint)0);
+    assert(ndbcluster_hton->slot != ~(uint)0);
     thd_set_thd_ndb(thd, thd_ndb);
     thd_ndb->options|= TNO_NO_LOG_SCHEMA_OP;
     thd->query_id= 0; // to keep valgrind quiet
@@ -6562,7 +6569,7 @@ Ndb_binlog_thread::do_run()
             ndb_latest_handled_binlog_epoch >= ndb_get_latest_trans_gci()) &&
           binlog_thread_state != BCCC_restart; )
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (binlog_thread_state)
     {
       DBUG_PRINT("info", ("binlog_thread_state: %d, "
@@ -6762,12 +6769,12 @@ Ndb_binlog_thread::do_run()
                             (uint)(gci >> 32),
                             (uint)(gci)));
         // sometimes get TE_ALTER with invalid table
-        DBUG_ASSERT(pOp->getEventType() == NdbDictionary::Event::TE_ALTER ||
-                    ! IS_NDB_BLOB_PREFIX(pOp->getEvent()->getTable()->getName()));
-        DBUG_ASSERT(gci <= ndb_latest_received_binlog_epoch);
+        assert(pOp->getEventType() == NdbDictionary::Event::TE_ALTER ||
+               ! IS_NDB_BLOB_PREFIX(pOp->getEvent()->getTable()->getName()));
+        assert(gci <= ndb_latest_received_binlog_epoch);
 
         /* Update our thread-local debug settings based on the global */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         /* Get value of global...*/
         {
           char buf[256];
@@ -6842,7 +6849,7 @@ Ndb_binlog_thread::do_run()
               continue;
             }
             TABLE *table= event_data->shadow_table;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
             const LEX_STRING &name= table->s->table_name;
 #endif
             if ((event_types & (NdbDictionary::Event::TE_INSERT |
@@ -6883,7 +6890,7 @@ Ndb_binlog_thread::do_run()
               handle_error(pOp) < 0)
             goto err;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           {
             Ndb_event_data *event_data=
               (Ndb_event_data *) pOp->getCustomData();
@@ -6898,7 +6905,7 @@ Ndb_binlog_thread::do_run()
                         (long) share,
                         share ? share->db :  "'NULL'",
                         share ? share->table_name : "'NULL'"));
-            DBUG_ASSERT(share != 0);
+            assert(share != 0);
           }
           // assert that there is consistancy between gci op list
           // and event list
@@ -6912,8 +6919,8 @@ Ndb_binlog_thread::do_run()
               if (gci_op == pOp)
                 break;
             }
-            DBUG_ASSERT(gci_op == pOp);
-            DBUG_ASSERT((event_types & pOp->getEventType()) != 0);
+            assert(gci_op == pOp);
+            assert((event_types & pOp->getEventType()) != 0);
           }
 #endif
 
diff --git a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h
index 30aa23a80ace..2f26090f5f7d 100644
--- a/sql/ha_ndbcluster_binlog.h
+++ b/sql/ha_ndbcluster_binlog.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndbcluster_cond.cc b/sql/ha_ndbcluster_cond.cc
index a767019d21ff..19c53df8bbd8 100644
--- a/sql/ha_ndbcluster_cond.cc
+++ b/sql/ha_ndbcluster_cond.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -299,7 +306,7 @@ ndb_serialize_cond(const Item *item, void *arg)
                 type != MYSQL_TYPE_GEOMETRY)
             {
               const NDBCOL *col= tab->getColumn(field->field_name);
-              DBUG_ASSERT(col);
+              assert(col);
               curr_cond->ndb_item= new Ndb_item(field, col->getColumnNo());
               context->dont_expect(Item::FIELD_ITEM);
               context->expect_no_field_result();
@@ -771,7 +778,7 @@ ndb_serialize_cond(const Item *item, void *arg)
           if (context->expecting(Item::STRING_ITEM) &&
               context->expecting_length(item->max_length)) 
           {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
             char buff[256];
             String str(buff, 0, system_charset_info);
             const_cast<Item*>(item)->print(&str, QT_ORDINARY);
@@ -1032,7 +1039,7 @@ ndb_serialize_cond(const Item *item, void *arg)
             if (context->expecting(Item::STRING_ITEM) &&
                 context->expecting_length(item->max_length)) 
             {
-  #ifndef DBUG_OFF
+  #ifndef NDEBUG
               char buff[256];
               String str(buff, 0, system_charset_info);
               const_cast<Item*>(item)->print(&str, QT_ORDINARY);
@@ -1222,7 +1229,7 @@ ha_ndbcluster_cond::build_scan_filter_predicate(Ndb_cond * &cond,
       break;
     default:
       field= NULL; //Keep compiler happy
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
     switch ((negated) ? 
@@ -1647,7 +1654,7 @@ int ha_ndbcluster_cond::generate_scan_filter_from_key(NdbInterpretedCode* code,
 {
   DBUG_ENTER("generate_scan_filter_from_key");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     DBUG_PRINT("info", ("key parts:%u length:%u",
                         key_info->user_defined_key_parts, key_info->key_length));
@@ -1679,7 +1686,7 @@ int ha_ndbcluster_cond::generate_scan_filter_from_key(NdbInterpretedCode* code,
               key_range has no count of parts so must test byte length.
               But this is not the place for following assert.
             */
-            // DBUG_ASSERT(ptr - key->key == key->length);
+            // assert(ptr - key->key == key->length);
             break;
           }
           key_part++;
@@ -1783,7 +1790,7 @@ int ha_ndbcluster_cond::generate_scan_filter_from_key(NdbInterpretedCode* code,
 
     DBUG_PRINT("info", ("Unknown hash index scan"));
     // enable to catch new cases when optimizer changes
-    // DBUG_ASSERT(false);
+    // assert(false);
   }
   while (0);
 
diff --git a/sql/ha_ndbcluster_cond.h b/sql/ha_ndbcluster_cond.h
index 505de3bedf7e..ed56b093e0f6 100644
--- a/sql/ha_ndbcluster_cond.h
+++ b/sql/ha_ndbcluster_cond.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -287,7 +294,7 @@ class Ndb_item : public Sql_alloc
   static NDB_FUNC_TYPE negate(NDB_FUNC_TYPE fun)
   {
     uint i= (uint) fun;
-    DBUG_ASSERT(fun == neg_map[i].pos_fun);
+    assert(fun == neg_map[i].pos_fun);
     return  neg_map[i].neg_fun;
   }
 
diff --git a/sql/ha_ndbcluster_connection.cc b/sql/ha_ndbcluster_connection.cc
index f1927b396559..1f22a9e4f884 100644
--- a/sql/ha_ndbcluster_connection.cc
+++ b/sql/ha_ndbcluster_connection.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -198,7 +205,7 @@ ndbcluster_connect(int (*connect_callback)(void),
         DBUG_RETURN(-1);
       }
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       char buf[1024];
       DBUG_PRINT("info",
@@ -211,7 +218,7 @@ ndbcluster_connect(int (*connect_callback)(void),
   }
   else
   {
-    DBUG_ASSERT(res == -1);
+    assert(res == -1);
     DBUG_PRINT("error", ("permanent error"));
     sql_print_error("NDB: error (%u) %s",
                     g_ndb_cluster_connection->get_latest_error(),
diff --git a/sql/ha_ndbcluster_connection.h b/sql/ha_ndbcluster_connection.h
index 0568aba43c40..7e6b6a585b00 100644
--- a/sql/ha_ndbcluster_connection.h
+++ b/sql/ha_ndbcluster_connection.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndbcluster_glue.h b/sql/ha_ndbcluster_glue.h
index 50410c62e0d0..d789cff3e58e 100644
--- a/sql/ha_ndbcluster_glue.h
+++ b/sql/ha_ndbcluster_glue.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndbcluster_push.cc b/sql/ha_ndbcluster_push.cc
index 750ce72ffc21..932b27c37716 100644
--- a/sql/ha_ndbcluster_push.cc
+++ b/sql/ha_ndbcluster_push.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,13 +64,13 @@ while(0)
 
 static inline const char* get_referred_field_name(const Item_field* field_item)
 {
-  DBUG_ASSERT(field_item->type() == Item::FIELD_ITEM);
+  assert(field_item->type() == Item::FIELD_ITEM);
   return field_item->field->field_name;
 }
 
 static const char* get_referred_table_access_name(const Item_field* field_item)
 {
-  DBUG_ASSERT(field_item->type() == Item::FIELD_ITEM);
+  assert(field_item->type() == Item::FIELD_ITEM);
   return field_item->field->table->alias;
 }
 
@@ -107,15 +114,15 @@ ndb_pushed_join::ndb_pushed_join(
   m_operation_count(0),
   m_field_count(builder.m_fld_refs)
 {
-  DBUG_ASSERT(query_def != NULL);
-  DBUG_ASSERT(builder.m_fld_refs <= MAX_REFERRED_FIELDS);
+  assert(query_def != NULL);
+  assert(builder.m_fld_refs <= MAX_REFERRED_FIELDS);
   ndb_table_access_map searched;
   for (uint tab_no= 0; !(searched==builder.m_join_scope); tab_no++)
   {
     const AQP::Table_access* const join_tab= builder.m_plan.get_table_access(tab_no);
     if (builder.m_join_scope.contain(tab_no))
     {
-      DBUG_ASSERT(m_operation_count < MAX_PUSHED_OPERATIONS);
+      assert(m_operation_count < MAX_PUSHED_OPERATIONS);
       m_tables[m_operation_count++] = join_tab->get_table();
       searched.add(tab_no);
     }
@@ -156,13 +163,13 @@ bool ndb_pushed_join::match_definition(
   switch (def_type)
   {
   case NdbQueryOperationDef::PrimaryKeyAccess:
-    DBUG_ASSERT(idx!=NULL);
-    DBUG_ASSERT(idx->unique_index == expected_index);
+    assert(idx!=NULL);
+    assert(idx->unique_index == expected_index);
     break;
 
   case NdbQueryOperationDef::UniqueIndexAccess:
-    DBUG_ASSERT(idx!=NULL);
-    // DBUG_ASSERT(idx->unique_index == expected_index);
+    assert(idx!=NULL);
+    // assert(idx->unique_index == expected_index);
     if (idx->unique_index != expected_index)
     {
       DBUG_PRINT("info", ("Actual index %s differs from expected index %s."
@@ -174,12 +181,12 @@ bool ndb_pushed_join::match_definition(
     break;
 
   case NdbQueryOperationDef::TableScan:
-    DBUG_ASSERT (idx==NULL && expected_index==NULL);
+    assert (idx==NULL && expected_index==NULL);
     break;
 
   case NdbQueryOperationDef::OrderedIndexScan:
-    DBUG_ASSERT(idx!=NULL);
-    // DBUG_ASSERT(idx->index == expected_index);
+    assert(idx!=NULL);
+    // assert(idx->index == expected_index);
     if (idx->index != expected_index)
     {
       DBUG_PRINT("info", ("Actual index %s differs from expected index %s. "
@@ -191,7 +198,7 @@ bool ndb_pushed_join::match_definition(
     break;
 
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -253,7 +260,7 @@ NdbQuery* ndb_pushed_join::make_query_instance(
     for (uint i= 0; i < outer_fields; i++)
     {
       Field* field= m_referred_fields[i];
-      DBUG_ASSERT(!field->is_real_null());  // Checked by ::check_if_pushable()
+      assert(!field->is_real_null());  // Checked by ::check_if_pushable()
       new (extendedParams + paramCnt + i) NdbQueryParamValue(field->ptr, false);
     }
     paramValues= extendedParams;
@@ -286,7 +293,7 @@ ndb_pushed_builder_ctx::ndb_pushed_builder_ctx(const AQP::Join_plan& plan)
   const uint count= m_plan.get_access_count();
   (void)ha_ndb_ext; // Prevents compiler warning.
 
-  DBUG_ASSERT(count <= MAX_TABLES);
+  assert(count <= MAX_TABLES);
   if (count > 1)
   {
     for (uint i= 0; i < count; i++)
@@ -304,7 +311,7 @@ ndb_pushed_builder_ctx::ndb_pushed_builder_ctx(const AQP::Join_plan& plan)
       switch (table->get_access_type())
       {
       case AQP::AT_VOID:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
 
       case AQP::AT_FIXED:
@@ -352,7 +359,7 @@ ndb_pushed_builder_ctx::ndb_pushed_builder_ctx(const AQP::Join_plan& plan)
       if (firstmatch_last_skipped)
       {
         const uint last_skipped_tab= firstmatch_last_skipped->get_access_no();
-        DBUG_ASSERT(last_skipped_tab <= i);
+        assert(last_skipped_tab <= i);
         for (uint skip_tab= last_skipped_tab; skip_tab <= i; skip_tab++)
         {
           m_firstmatch_skipped.add(skip_tab); 
@@ -368,7 +375,7 @@ ndb_pushed_builder_ctx::ndb_pushed_builder_ctx(const AQP::Join_plan& plan)
     {
       const AQP::Table_access* const table = m_plan.get_table_access(i);
       uint external= table->get_table()->pos_in_table_list->tableno();
-      DBUG_ASSERT(external <= MAX_TABLES);
+      assert(external <= MAX_TABLES);
 
       m_remap[i].to_external= external;
       m_remap[external].to_internal= i;
@@ -386,7 +393,7 @@ ndb_pushed_builder_ctx::~ndb_pushed_builder_ctx()
 
 const NdbError& ndb_pushed_builder_ctx::getNdbError() const
 {
-  DBUG_ASSERT(m_builder);
+  assert(m_builder);
   return m_builder->getNdbError();
 }
 
@@ -396,14 +403,14 @@ const NdbError& ndb_pushed_builder_ctx::getNdbError() const
 uint
 ndb_pushed_builder_ctx::get_table_no(const Item* key_item) const
 {
-  DBUG_ASSERT(key_item->type() == Item::FIELD_ITEM);
+  assert(key_item->type() == Item::FIELD_ITEM);
   table_map bitmap= key_item->used_tables();
 
   for (uint i= 0; i<MAX_TABLES && bitmap!=0; i++, bitmap>>=1)
   {
     if (bitmap & 1)
     {
-      DBUG_ASSERT(bitmap == 0x01);  // Only a single table in 'bitmap'
+      assert(bitmap == 0x01);  // Only a single table in 'bitmap'
       return m_remap[i].to_internal;
     }
   }
@@ -488,7 +495,7 @@ uint internal_operation_count(AQP::enum_access_type accessType)
 
   default:
     // Other access types are not pushable, so seeing them here is an error.
-    DBUG_ASSERT(false);
+    assert(false);
     return 2;
   }
 }
@@ -511,7 +518,7 @@ ndb_pushed_builder_ctx::is_pushable_with_root(const AQP::Table_access* root)
   }
 
   const AQP::enum_access_type access_type= root->get_access_type();
-  DBUG_ASSERT(access_type != AQP::AT_VOID);
+  assert(access_type != AQP::AT_VOID);
 
   if (access_type == AQP::AT_MULTI_UNIQUE_KEY)
   {
@@ -582,7 +589,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
   const uint root_no= m_join_root->get_access_no();
   const uint tab_no= table->get_access_no();
 
-  DBUG_ASSERT(tab_no > root_no);
+  assert(tab_no > root_no);
   
   if ((m_tables[tab_no].m_maybe_pushable & PUSHABLE_AS_CHILD) != PUSHABLE_AS_CHILD)
   {
@@ -706,8 +713,8 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
        * Calculate 'current_parents' as the set of tables
        * currently being referred by some 'key_item'.
        */
-      DBUG_ASSERT(key_item == table->get_key_field(key_part_no));
-      DBUG_ASSERT(key_item->type() == Item::FIELD_ITEM);
+      assert(key_item == table->get_key_field(key_part_no));
+      assert(key_item->type() == Item::FIELD_ITEM);
       current_parents.add(get_table_no(key_item));
 
       /**
@@ -857,8 +864,8 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
    *    to be in an inner join relation with our common ancestor.
    */
 
-  DBUG_ASSERT(!depend_parents.is_clear_all());
-  DBUG_ASSERT(!depend_parents.contain(tab_no)); // Circular dependency!
+  assert(!depend_parents.is_clear_all());
+  assert(!depend_parents.contain(tab_no)); // Circular dependency!
 
   ndb_table_access_map dependencies(depend_parents);
 
@@ -921,7 +928,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
          * which may now be joined with this outer joined ancestor.
          * These are removed below.
          */
-        DBUG_ASSERT(extend_parents.contain(common_parents));
+        assert(extend_parents.contain(common_parents));
         for (uint parent_no= extend_parents.last_table(tab_no-1);
              parent_no > ancestor_no;
              parent_no= extend_parents.last_table(parent_no-1))
@@ -932,7 +939,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
             extend_parents.clear_bit(parent_no);
           }
         }
-        DBUG_ASSERT(!extend_parents.is_clear_all());
+        assert(!extend_parents.is_clear_all());
       }
       else if (!child_dependencies.contain(ancestor_no))
       {
@@ -957,10 +964,10 @@ ndb_pushed_builder_ctx::is_pushable_as_child(
     dependencies.add(m_tables[ancestor_no].m_depend_parents);
   } //for
 
-  DBUG_ASSERT(m_join_scope.contain(common_parents));
-  DBUG_ASSERT(m_join_scope.contain(extend_parents));
-  DBUG_ASSERT(extend_parents.is_clear_all() ||
-              extend_parents.contain(common_parents));
+  assert(m_join_scope.contain(common_parents));
+  assert(m_join_scope.contain(extend_parents));
+  assert(extend_parents.is_clear_all() ||
+         extend_parents.contain(common_parents));
   /**
    * Register calculated parent sets - ::optimize() choose from these.
    */
@@ -998,7 +1005,7 @@ bool ndb_pushed_builder_ctx::is_field_item_pushable(
 {
   DBUG_ENTER("is_field_item_pushable()");
   const uint tab_no = table->get_access_no();
-  DBUG_ASSERT(key_item->type() == Item::FIELD_ITEM);
+  assert(key_item->type() == Item::FIELD_ITEM);
 
   const Item_field* const key_item_field 
     = static_cast<const Item_field*>(key_item);
@@ -1085,7 +1092,7 @@ bool ndb_pushed_builder_ctx::is_field_item_pushable(
   {
     // This key item is const. and did not cause the set of possible parents
     // to be recalculated. Reuse what we had before this key item.
-    DBUG_ASSERT(field_parents.is_clear_all());
+    assert(field_parents.is_clear_all());
 
     /**
      * Field referrence is a 'paramValue' to a column value evaluated
@@ -1133,7 +1140,7 @@ bool ndb_pushed_builder_ctx::is_field_item_pushable(
                           get_referred_field_name(key_item_field));
           DBUG_RETURN(false);
         }
-        DBUG_ASSERT(access_no > 0);
+        assert(access_no > 0);
         access_no--;
       } while (m_plan.get_table_access(access_no)->get_table() 
                != referred_tab);
@@ -1159,7 +1166,7 @@ bool ndb_pushed_builder_ctx::is_const_item_pushable(
                      const KEY_PART_INFO* key_part)
 {
   DBUG_ENTER("is_const_item_pushable()");
-  DBUG_ASSERT(key_item->const_item());
+  assert(key_item->const_item());
 
   /** 
    * Propagate Items constant value to Field containing the value of this 
@@ -1216,7 +1223,7 @@ ndb_pushed_builder_ctx::optimize_query_plan()
     if (!table.m_depend_parents.is_clear_all())
     {
       ndb_table_access_map const &dependency= table.m_depend_parents;
-      DBUG_ASSERT(!dependency.contain(tab_no)); // Circular dependency!
+      assert(!dependency.contain(tab_no)); // Circular dependency!
 
       uint depends_on_parent= dependency.last_table(tab_no-1);
       ndb_table_access_map dependency_mask;
@@ -1250,8 +1257,8 @@ ndb_pushed_builder_ctx::optimize_query_plan()
        ? table.m_extend_parents
        : table.m_common_parents;
 
-    DBUG_ASSERT(!parents.is_clear_all());
-    DBUG_ASSERT(!parents.contain(tab_no)); // No circular dependency!
+    assert(!parents.is_clear_all());
+    assert(!parents.contain(tab_no)); // No circular dependency!
 
     /**
      * In order to take advantage of the parallelism in the SPJ block;
@@ -1282,7 +1289,7 @@ ndb_pushed_builder_ctx::optimize_query_plan()
       }
     }
 
-    DBUG_ASSERT(parent_no < tab_no);
+    assert(parent_no < tab_no);
     table.m_parent= parent_no;
     m_tables[parent_no].m_child_fanout*= table.m_fanout*table.m_child_fanout;
 
@@ -1307,7 +1314,7 @@ ndb_pushed_builder_ctx::optimize_query_plan()
       const uint parent_no= table.m_parent;
       table.m_ancestors= m_tables[parent_no].m_ancestors;
       table.m_ancestors.add(parent_no);
-      DBUG_ASSERT(table.m_ancestors.contain(table.m_depend_parents));
+      assert(table.m_ancestors.contain(table.m_depend_parents));
     }
   }
   DBUG_RETURN(0);
@@ -1325,8 +1332,8 @@ ndb_pushed_builder_ctx::collect_key_refs(
   const uint parent_no= m_tables[tab_no].m_parent;
   const ndb_table_access_map& ancestors= m_tables[tab_no].m_ancestors;
 
-  DBUG_ASSERT(m_join_scope.contain(ancestors));
-  DBUG_ASSERT(ancestors.contain(parent_no));
+  assert(m_join_scope.contain(ancestors));
+  assert(ancestors.contain(parent_no));
 
   /**
    * If there are any key_fields with 'current_parents' different from
@@ -1340,7 +1347,7 @@ ndb_pushed_builder_ctx::collect_key_refs(
     const Item* const key_item= table->get_key_field(key_part_no);
     key_refs[key_part_no]= key_item;
 
-    DBUG_ASSERT(key_item->const_item() || key_item->type()==Item::FIELD_ITEM);
+    assert(key_item->const_item() || key_item->type()==Item::FIELD_ITEM);
 
     if (key_item->type() == Item::FIELD_ITEM)
     {
@@ -1375,7 +1382,7 @@ ndb_pushed_builder_ctx::collect_key_refs(
           }
           else if (ancestors.contain(substitute_table_no))
           {
-            DBUG_ASSERT(substitute_table_no <= parent_no);
+            assert(substitute_table_no <= parent_no);
 
             //////////////////////////////////////////////////////////////////////
             // Second best is to replace join_item with closest grandparent ref.
@@ -1401,9 +1408,9 @@ ndb_pushed_builder_ctx::collect_key_refs(
           }
         } // while (substitute...
 
-        DBUG_ASSERT (referred_table_no == parent_no ||
-                     !m_join_scope.contain(referred_table_no)  || // Is a 'const' paramValue
-                     !m_tables[tab_no].m_common_parents.contain(parent_no));
+        assert (referred_table_no == parent_no ||
+                !m_join_scope.contain(referred_table_no)  || // Is a 'const' paramValue
+                !m_tables[tab_no].m_common_parents.contain(parent_no));
       }
     } // Item::FIELD_ITEM
   }
@@ -1418,7 +1425,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
                                   const NdbQueryOperand *op_key[])
 {
   DBUG_ENTER("build_key");
-  DBUG_ASSERT(m_join_scope.contain(table->get_access_no()));
+  assert(m_join_scope.contain(table->get_access_no()));
 
   const KEY* const key= &table->get_table()->key_info[table->get_index_no()];
   op_key[0]= NULL;
@@ -1441,7 +1448,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
   else
   {
     const uint key_fields= table->get_no_of_key_fields();
-    DBUG_ASSERT(key_fields > 0 && key_fields <= key->user_defined_key_parts);
+    assert(key_fields > 0 && key_fields <= key->user_defined_key_parts);
     uint map[ndb_pushed_join::MAX_LINKED_KEYS+1];
 
     if (ndbcluster_is_lookup_operation(table->get_access_type()))
@@ -1469,7 +1476,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
       const Item* const item= join_items[i];
       op_key[map[i]]= NULL;
 
-      DBUG_ASSERT(item->const_item() == item->const_during_execution());
+      assert(item->const_item() == item->const_during_execution());
       if (item->const_item())
       {
         /** 
@@ -1477,7 +1484,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
          * key_part:
          */
         Field* const field= key_part->field;
-        DBUG_ASSERT(!field->is_real_null());
+        assert(!field->is_real_null());
         const uchar* const ptr= (field->real_type() == MYSQL_TYPE_VARCHAR)
                 ? field->ptr + ((Field_varstring*)field)->length_bytes
                 : field->ptr;
@@ -1486,7 +1493,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
       }
       else
       {
-        DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
+        assert(item->type() == Item::FIELD_ITEM);
         const Item_field* const field_item= static_cast<const Item_field*>(item);
         const uint referred_table_no= get_table_no(field_item);
 
@@ -1495,7 +1502,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
           // Locate the parent operation for this 'join_items[]'.
           // May refer any of the preceding parent tables
           const NdbQueryOperationDef* const parent_op= m_tables[referred_table_no].m_op;
-          DBUG_ASSERT(parent_op != NULL);
+          assert(parent_op != NULL);
 
           // TODO use field_index ??
           op_key[map[i]]= m_builder->linkedValue(parent_op, 
@@ -1503,7 +1510,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
         }
         else
         {
-          DBUG_ASSERT(m_const_scope.contain(referred_table_no));
+          assert(m_const_scope.contain(referred_table_no));
           // Outside scope of join plan, Handle as parameter as its value
           // will be known when we are ready to execute this query.
           if (unlikely(m_fld_refs >= ndb_pushed_join::MAX_REFERRED_FIELDS))
@@ -1537,7 +1544,7 @@ ndb_pushed_builder_ctx::build_query()
   DBUG_EXECUTE("info", m_join_root->dbug_print(););
 
   uint root_no= m_join_root->get_access_no();
-  DBUG_ASSERT(m_join_scope.contain(root_no));
+  assert(m_join_scope.contain(root_no));
 
   if (m_builder == NULL)
   {
@@ -1578,13 +1585,13 @@ ndb_pushed_builder_ctx::build_query()
     } 
     if (table != m_join_root)
     {
-      DBUG_ASSERT(m_tables[tab_no].m_parent!=MAX_TABLES);
+      assert(m_tables[tab_no].m_parent!=MAX_TABLES);
       const uint parent_no= m_tables[tab_no].m_parent;
       const AQP::Table_access* parent= m_plan.get_table_access(parent_no);
 
       if (!m_tables[tab_no].m_common_parents.contain(parent_no))
       {
-        DBUG_ASSERT(m_tables[parent_no].m_op != NULL);
+        assert(m_tables[parent_no].m_op != NULL);
         options.setParent(m_tables[parent_no].m_op);
       }
       if (table->get_join_type(parent) == AQP::JT_INNER_JOIN)
@@ -1605,11 +1612,11 @@ ndb_pushed_builder_ctx::build_query()
       }
       else
       {
-        DBUG_ASSERT(access_type == AQP::AT_UNIQUE_KEY);
+        assert(access_type == AQP::AT_UNIQUE_KEY);
         DBUG_PRINT("info", ("Operation is 'unique-index-lookup'"));
         const NdbDictionary::Index* const index 
           = handler->m_index[table->get_index_no()].unique_index;
-        DBUG_ASSERT(index);
+        assert(index);
         query_op= m_builder->readTuple(index, handler->m_table, op_key, &options);
       }
     } // ndbcluster_is_lookup_operation()
@@ -1623,8 +1630,8 @@ ndb_pushed_builder_ctx::build_query()
     else if (access_type == AQP::AT_ORDERED_INDEX_SCAN  ||
              access_type == AQP::AT_MULTI_MIXED)
     {
-      DBUG_ASSERT(table->get_index_no() >= 0);
-      DBUG_ASSERT(handler->m_index[table->get_index_no()].index != NULL);
+      assert(table->get_index_no() >= 0);
+      assert(handler->m_index[table->get_index_no()].index != NULL);
 
       DBUG_PRINT("info", ("Operation is 'equal-range-lookup'"));
       DBUG_PRINT("info", ("Creating scanIndex on index id:%d, name:%s",
@@ -1643,7 +1650,7 @@ ndb_pushed_builder_ctx::build_query()
     }
     else
     {
-      DBUG_ASSERT(false);
+      assert(false);
     }
 
     if (unlikely(!query_op))
diff --git a/sql/ha_ndbcluster_push.h b/sql/ha_ndbcluster_push.h
index 4d0bd8134c4f..a67df15bc094 100644
--- a/sql/ha_ndbcluster_push.h
+++ b/sql/ha_ndbcluster_push.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -124,7 +131,7 @@ class ndb_pushed_join
   /** Get the table that is accessed by the i'th table access operation.*/
   TABLE* get_table(uint i) const
   { 
-    DBUG_ASSERT(i < m_operation_count);
+    assert(i < m_operation_count);
     return m_tables[i];
   }
 
diff --git a/sql/ha_ndbcluster_tables.h b/sql/ha_ndbcluster_tables.h
index d8d436d3c920..6824b7d6d847 100644
--- a/sql/ha_ndbcluster_tables.h
+++ b/sql/ha_ndbcluster_tables.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ha_ndbinfo.cc b/sql/ha_ndbinfo.cc
index 492b977a6c62..cbc52f6ce31f 100644
--- a/sql/ha_ndbinfo.cc
+++ b/sql/ha_ndbinfo.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -298,7 +305,7 @@ warn_incompatible(const NdbInfo::Table* ndb_tab, bool fatal,
   BaseString msg;
   DBUG_ENTER("warn_incompatible");
   DBUG_PRINT("enter",("table_name: %s, fatal: %d", ndb_tab->getName(), fatal));
-  DBUG_ASSERT(format != NULL);
+  assert(format != NULL);
 
   va_list args;
   char explanation[128];
@@ -353,7 +360,7 @@ int ha_ndbinfo::open(const char *name, int mode, uint test_if_locked)
       DBUG_RETURN(EROFS); // Read only fs
     }
     // Find any commands that does not allow open readonly
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
   if (opt_ndbinfo_offline ||
@@ -761,7 +768,7 @@ ndbinfo_find_files(handlerton *hton, THD *thd,
     DBUG_RETURN(0);
   }
 
-  DBUG_ASSERT(db);
+  assert(db);
   if (strcmp(db, opt_ndbinfo_dbname))
     DBUG_RETURN(0); // Only hide files in "our" db
 
diff --git a/sql/ha_ndbinfo.h b/sql/ha_ndbinfo.h
index 640a4e9cdc3d..73c5d10cd46a 100644
--- a/sql/ha_ndbinfo.h
+++ b/sql/ha_ndbinfo.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/handler.cc b/sql/handler.cc
index 4c57bf54298b..f3aca4197d71 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -112,8 +119,8 @@
           case PSI_BATCH_MODE_STARTED:                        \
           default:                                            \
           {                                                   \
-            DBUG_ASSERT(m_psi_batch_mode                      \
-                        == PSI_BATCH_MODE_STARTED);           \
+            assert(m_psi_batch_mode                           \
+                   == PSI_BATCH_MODE_STARTED);                \
             PAYLOAD                                           \
             if (!RESULT)                                      \
               m_psi_numrows++;                                \
@@ -232,7 +239,7 @@ const char *tx_isolation_names[] =
 TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
 			       tx_isolation_names, NULL};
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 const char *ha_legacy_type_name(legacy_db_type legacy_type)
 {
@@ -332,6 +339,8 @@ st_handler_tablename mysqld_system_tables[]= {
   {mysqld_system_database, "help_keyword"},
   {mysqld_system_database, "help_relation"},
   {mysqld_system_database, "help_topic"},
+  {mysqld_system_database, "innodb_table_stats"},
+  {mysqld_system_database, "innodb_index_stats"},
   {(const char *)NULL, (const char *)NULL} /* This must be at the end */
 };
 
@@ -362,20 +371,20 @@ struct st_sys_tbl_chk_params
   bool is_sql_layer_system_table;             // IN param
   legacy_db_type db_type;                     // IN param
 
-  enum enum_sys_tbl_chk_status
+  enum enum_status
   {
-    // db.table_name is not a supported system table.
-    NOT_KNOWN_SYSTEM_TABLE,
+    // db.table_name is user table.
+    USER_TABLE,
     /*
       db.table_name is a system table,
       but may not be supported by SE.
     */
-    KNOWN_SYSTEM_TABLE,
+    SYSTEM_TABLE,
     /*
       db.table_name is a system table,
       and is supported by SE.
     */
-    SUPPORTED_SYSTEM_TABLE
+    SE_SUPPORTED_SYSTEM_TABLE
   } status;                                    // OUT param
 };
 
@@ -402,9 +411,9 @@ static plugin_ref ha_default_plugin(THD *thd)
 handlerton *ha_default_handlerton(THD *thd)
 {
   plugin_ref plugin= ha_default_plugin(thd);
-  DBUG_ASSERT(plugin);
+  assert(plugin);
   handlerton *hton= plugin_data<handlerton*>(plugin);
-  DBUG_ASSERT(hton);
+  assert(hton);
   return hton;
 }
 
@@ -431,9 +440,9 @@ static plugin_ref ha_default_temp_plugin(THD *thd)
 handlerton *ha_default_temp_handlerton(THD *thd)
 {
   plugin_ref plugin= ha_default_temp_plugin(thd);
-  DBUG_ASSERT(plugin);
+  assert(plugin);
   handlerton *hton= plugin_data<handlerton*>(plugin);
-  DBUG_ASSERT(hton);
+  assert(hton);
   return hton;
 }
 
@@ -562,7 +571,7 @@ plugin_ref ha_lock_engine(THD *thd, const handlerton *hton)
   {
     st_plugin_int **plugin= hton2plugin + hton->slot;
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
     /*
       Take a shortcut for builtin engines -- return pointer to plugin
       without acquiring LOCK_plugin mutex. This is safe safe since such
@@ -583,7 +592,7 @@ plugin_ref ha_lock_engine(THD *thd, const handlerton *hton)
       We can't take shortcut in debug builds.
       At least assert that builtin_htons[slot] is set correctly.
     */
-    DBUG_ASSERT(builtin_htons[hton->slot] == (plugin[0]->plugin_dl == NULL));
+    assert(builtin_htons[hton->slot] == (plugin[0]->plugin_dl == NULL));
     return my_plugin_lock(thd, &plugin);
 #endif
   }
@@ -752,6 +761,7 @@ int ha_init_errors(void)
   SETMSG(HA_ERR_WRONG_FILE_NAME,		ER_DEFAULT(ER_WRONG_FILE_NAME));
   SETMSG(HA_ERR_NOT_ALLOWED_COMMAND,		ER_DEFAULT(ER_NOT_ALLOWED_COMMAND));
   SETMSG(HA_ERR_COMPUTE_FAILED,		"Compute virtual column value failed");
+  SETMSG(HA_ERR_FTS_TOO_MANY_NESTED_EXP,  "Too many nested sub-expressions in a full-text search");
   /* Register the error messages for use with my_error(). */
   return my_error_register(get_handler_errmsg, HA_ERR_FIRST, HA_ERR_LAST);
 }
@@ -802,8 +812,8 @@ int ha_finalize_handlerton(st_plugin_int *plugin)
   if (hton->slot != HA_SLOT_UNDEF)
   {
     /* Make sure we are not unpluging another plugin */
-    DBUG_ASSERT(hton2plugin[hton->slot] == plugin);
-    DBUG_ASSERT(hton->slot < MAX_HA);
+    assert(hton2plugin[hton->slot] == plugin);
+    assert(hton->slot < MAX_HA);
     hton2plugin[hton->slot]= NULL;
     builtin_htons[hton->slot]= false; /* Extra correctness. */
   }
@@ -961,7 +971,7 @@ int ha_init()
   int error= 0;
   DBUG_ENTER("ha_init");
 
-  DBUG_ASSERT(total_ha < MAX_HA);
+  assert(total_ha < MAX_HA);
   /*
     Check if there is a transaction-capable storage engine besides the
     binary log (which is considered a transaction-capable storage engine in
@@ -1375,11 +1385,11 @@ void trans_register_ha(THD *thd, bool all, handlerton *ht_arg,
       Ensure no active backup engine data exists, unless the current transaction
       is from replication and in active xa state.
     */
-    DBUG_ASSERT(thd->ha_data[ht_arg->slot].ha_ptr_backup == NULL ||
-                (thd->get_transaction()->xid_state()->
-                 has_state(XID_STATE::XA_ACTIVE)));
-    DBUG_ASSERT(thd->ha_data[ht_arg->slot].ha_ptr_backup == NULL ||
-                (thd->is_binlog_applier() || thd->slave_thread));
+    assert(thd->ha_data[ht_arg->slot].ha_ptr_backup == NULL ||
+           (thd->get_transaction()->xid_state()->
+            has_state(XID_STATE::XA_ACTIVE)));
+    assert(thd->ha_data[ht_arg->slot].ha_ptr_backup == NULL ||
+           (thd->is_binlog_applier() || thd->slave_thread));
 
     thd->server_status|= SERVER_STATUS_IN_TRANS;
     if (thd->tx_read_only)
@@ -1447,7 +1457,7 @@ int ha_prepare(THD *thd)
     if ((gtid_error=
          MY_TEST(commit_owned_gtids(thd, true, &need_clear_owned_gtid))))
     {
-      DBUG_ASSERT(need_clear_owned_gtid);
+      assert(need_clear_owned_gtid);
 
       ha_rollback_trans(thd, true);
       error= 1;
@@ -1457,6 +1467,7 @@ int ha_prepare(THD *thd)
     while (ha_info)
     {
       handlerton *ht= ha_info->ht();
+      assert(!thd->status_var_aggregated);
       thd->status_var.ha_prepare_count++;
       if (ht->prepare)
       {
@@ -1480,8 +1491,8 @@ int ha_prepare(THD *thd)
       ha_info= ha_info->next();
     }
 
-    DBUG_ASSERT(thd->get_transaction()->xid_state()->
-                has_state(XID_STATE::XA_IDLE));
+    assert(thd->get_transaction()->xid_state()->
+           has_state(XID_STATE::XA_IDLE));
 
 err:
     gtid_state_commit_or_rollback(thd, need_clear_owned_gtid, !gtid_error);
@@ -1526,7 +1537,7 @@ ha_check_and_coalesce_trx_read_only(THD *thd, Ha_trx_info *ha_list,
     if (! all)
     {
       Ha_trx_info *ha_info_all= &thd->ha_data[ha_info->ht()->slot].ha_info[1];
-      DBUG_ASSERT(ha_info != ha_info_all);
+      assert(ha_info != ha_info_all);
       /*
         Merge read-only/read-write information about statement
         transaction to its enclosing normal transaction. Do this
@@ -1699,12 +1710,12 @@ int ha_commit_trans(THD *thd, bool all, bool ignore_global_read_lock)
     flags will not get propagated to its normal transaction's
     counterpart.
   */
-  DBUG_ASSERT(!trn_ctx->is_active(Transaction_ctx::STMT) ||
-              !all);
+  assert(!trn_ctx->is_active(Transaction_ctx::STMT) ||
+         !all);
 
   if (thd->in_sub_stmt)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     /*
       Since we don't support nested statement transactions in 5.0,
       we can't commit or rollback stmt transactions while we are inside
@@ -1740,8 +1751,8 @@ int ha_commit_trans(THD *thd, bool all, bool ignore_global_read_lock)
     DBUG_EXECUTE_IF("dbug.enabled_commit",
                     {
                       const char act[]= "now signal Reached wait_for signal.commit_continue";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     };);
     if (rw_trans && !ignore_global_read_lock)
     {
@@ -1769,8 +1780,8 @@ int ha_commit_trans(THD *thd, bool all, bool ignore_global_read_lock)
       DEBUG_SYNC(thd, "ha_commit_trans_after_acquire_commit_lock");
     }
 
-    if (rw_trans && stmt_has_updated_trans_table(ha_info)
-        && check_readonly(thd, true))
+    if (rw_trans && (stmt_has_updated_trans_table(ha_info)
+        || trans_has_noop_dml(ha_info)) && check_readonly(thd, true))
     {
       ha_rollback_trans(thd, all);
       error= 1;
@@ -1787,9 +1798,9 @@ int ha_commit_trans(THD *thd, bool all, bool ignore_global_read_lock)
   */
   if (!error && all && xid_state->has_state(XID_STATE::XA_IDLE))
   {
-    DBUG_ASSERT(thd->lex->sql_command == SQLCOM_XA_COMMIT &&
-                static_cast<Sql_cmd_xa_commit*>(thd->lex->m_sql_cmd)->
-                get_xa_opt() == XA_ONE_PHASE);
+    assert(thd->lex->sql_command == SQLCOM_XA_COMMIT &&
+           static_cast<Sql_cmd_xa_commit*>(thd->lex->m_sql_cmd)->
+           get_xa_opt() == XA_ONE_PHASE);
 
     xid_state->set_state(XID_STATE::XA_PREPARED);
   }
@@ -1887,9 +1898,9 @@ int ha_commit_low(THD *thd, bool all, bool run_after_commit)
     */
     if (all && thd->rpl_unflag_detached_engine_ha_data())
     {
-      DBUG_ASSERT(thd->lex->sql_command == SQLCOM_XA_COMMIT);
-      DBUG_ASSERT(static_cast<Sql_cmd_xa_commit*>(thd->lex->m_sql_cmd)->
-                  get_xa_opt() == XA_ONE_PHASE);
+      assert(thd->lex->sql_command == SQLCOM_XA_COMMIT);
+      assert(static_cast<Sql_cmd_xa_commit*>(thd->lex->m_sql_cmd)->
+             get_xa_opt() == XA_ONE_PHASE);
       restore_backup_ha_data= true;
     }
 
@@ -1902,6 +1913,7 @@ int ha_commit_low(THD *thd, bool all, bool run_after_commit)
         my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
         error=1;
       }
+      assert(!thd->status_var_aggregated);
       thd->status_var.ha_commit_count++;
       ha_info_next= ha_info->next();
       if (restore_backup_ha_data)
@@ -1959,8 +1971,8 @@ int ha_rollback_low(THD *thd, bool all)
     */
     if (all && thd->rpl_unflag_detached_engine_ha_data())
     {
-      DBUG_ASSERT(trn_ctx->xid_state()->get_state() != XID_STATE::XA_NOTR ||
-                  thd->killed == THD::KILL_CONNECTION);
+      assert(trn_ctx->xid_state()->get_state() != XID_STATE::XA_NOTR ||
+             thd->killed == THD::KILL_CONNECTION);
 
       restore_backup_ha_data= true;
     }
@@ -1974,6 +1986,7 @@ int ha_rollback_low(THD *thd, bool all)
         my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
         error= 1;
       }
+      assert(!thd->status_var_aggregated);
       thd->status_var.ha_rollback_count++;
       ha_info_next= ha_info->next();
       if (restore_backup_ha_data)
@@ -1993,7 +2006,7 @@ int ha_rollback_low(THD *thd, bool all)
     Diagnostics_area is set before calling the method XID_STATE::set_error().
 
     If it wasn't done it would lead to failure of the assertion
-      DBUG_ASSERT(m_status == DA_ERROR)
+    assert(m_status == DA_ERROR)
     in the method Diagnostics_area::mysql_errno().
 
     In case ha_prepare is failed and an error wasn't set in Diagnostics_area
@@ -2037,12 +2050,12 @@ int ha_rollback_trans(THD *thd, bool all)
     We must not rollback the normal transaction if a statement
     transaction is pending.
   */
-  DBUG_ASSERT(!trn_ctx->is_active(Transaction_ctx::STMT) ||
-              !all);
+  assert(!trn_ctx->is_active(Transaction_ctx::STMT) ||
+         !all);
 
   if (thd->in_sub_stmt)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     /*
       If we are inside stored function or trigger we should not commit or
       rollback current statement transaction. See comment in ha_commit_trans()
@@ -2128,19 +2141,19 @@ int ha_commit_attachable(THD *thd)
   Ha_trx_info *ha_info_next;
 
   /* This function only handles attachable transactions. */
-  DBUG_ASSERT(thd->is_attachable_ro_transaction_active());
+  assert(thd->is_attachable_ro_transaction_active());
   /*
     Since the attachable transaction is AUTOCOMMIT we only need
     to care about statement transaction.
   */
-  DBUG_ASSERT(! trn_ctx->is_active(Transaction_ctx::SESSION));
+  assert(! trn_ctx->is_active(Transaction_ctx::SESSION));
 
   if (ha_info)
   {
     for (; ha_info; ha_info= ha_info_next)
     {
       /* Attachable transaction is not supposed to modify anything. */
-      DBUG_ASSERT(! ha_info->is_trx_read_write());
+      assert(! ha_info->is_trx_read_write());
 
       handlerton *ht= ha_info->ht();
       if (ht->commit(ht, thd, false))
@@ -2151,9 +2164,10 @@ int ha_commit_attachable(THD *thd)
           resources/cleanup state. Even if this happens we will simply
           continue committing attachable transaction in other SEs.
         */
-        DBUG_ASSERT(false);
+        assert(false);
         error= 1;
       }
+      assert(!thd->status_var_aggregated);
       thd->status_var.ha_commit_count++;
       ha_info_next= ha_info->next();
 
@@ -2247,7 +2261,7 @@ bool ha_rollback_to_savepoint_can_release_mdl(THD *thd)
        ha_info; ha_info= ha_info->next())
   {
     handlerton *ht= ha_info->ht();
-    DBUG_ASSERT(ht);
+    assert(ht);
 
     if (ht->savepoint_rollback_can_release_mdl == 0 ||
         ht->savepoint_rollback_can_release_mdl(ht, thd) == false)
@@ -2278,14 +2292,15 @@ int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)
   {
     int err;
     handlerton *ht= ha_info->ht();
-    DBUG_ASSERT(ht);
-    DBUG_ASSERT(ht->savepoint_set != 0);
+    assert(ht);
+    assert(ht->savepoint_set != 0);
     if ((err= ht->savepoint_rollback(ht, thd,
                                      (uchar *)(sv+1)+ht->savepoint_offset)))
     { // cannot happen
       my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
       error=1;
     }
+    assert(!thd->status_var_aggregated);
     thd->status_var.ha_savepoint_rollback_count++;
     if (ht->prepare == 0)
       trn_ctx->set_no_2pc(trx_scope, true);
@@ -2305,6 +2320,7 @@ int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)
       my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
       error=1;
     }
+    assert(!thd->status_var_aggregated);
     thd->status_var.ha_rollback_count++;
     ha_info_next= ha_info->next();
     ha_info->reset(); /* keep it conveniently zero-filled */
@@ -2346,6 +2362,7 @@ int ha_prepare_low(THD *thd, bool all)
         my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
         error= 1;
       }
+      assert(!thd->status_var_aggregated);
       thd->status_var.ha_prepare_count++;
     }
     DBUG_EXECUTE_IF("crash_commit_after_prepare", DBUG_SUICIDE(););
@@ -2374,7 +2391,7 @@ int ha_savepoint(THD *thd, SAVEPOINT *sv)
   {
     int err;
     handlerton *ht= ha_info->ht();
-    DBUG_ASSERT(ht);
+    assert(ht);
     if (! ht->savepoint_set)
     {
       my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), "SAVEPOINT");
@@ -2386,6 +2403,7 @@ int ha_savepoint(THD *thd, SAVEPOINT *sv)
       my_error(ER_GET_ERRNO, MYF(0), err);
       error=1;
     }
+    assert(!thd->status_var_aggregated);
     thd->status_var.ha_savepoint_count++;
   }
   /*
@@ -2413,7 +2431,7 @@ int ha_release_savepoint(THD *thd, SAVEPOINT *sv)
     int err;
     handlerton *ht= ha_info->ht();
     /* Savepoint life time is enclosed into transaction life time. */
-    DBUG_ASSERT(ht);
+    assert(ht);
     if (!ht->savepoint_release)
       continue;
     if ((err= ht->savepoint_release(ht, thd,
@@ -2573,8 +2591,6 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path,
   TABLE_SHARE dummy_share;
   DBUG_ENTER("ha_delete_table");
 
-  memset(&dummy_table, 0, sizeof(dummy_table));
-  memset(&dummy_share, 0, sizeof(dummy_share));
   dummy_table.s= &dummy_share;
 
   /* DB_TYPE_UNKNOWN is used in ALTER TABLE when renaming only .frm files */
@@ -2667,21 +2683,21 @@ handler *handler::clone(const char *name, MEM_ROOT *mem_root)
 
 void handler::ha_statistic_increment(ulonglong SSV::*offset) const
 {
-  (table->in_use->status_var.*offset)++;
+  if (table && table->in_use) (table->in_use->status_var.*offset)++;
 }
 
 
 THD *handler::ha_thd(void) const
 {
-  DBUG_ASSERT(!table || !table->in_use || table->in_use == current_thd);
+  assert(!table || !table->in_use || table->in_use == current_thd);
   return (table && table->in_use) ? table->in_use : current_thd;
 }
 
 void handler::unbind_psi()
 {
 #ifdef HAVE_PSI_TABLE_INTERFACE
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
-  DBUG_ASSERT(inited == NONE);
+  assert(m_lock_type == F_UNLCK);
+  assert(inited == NONE);
   /*
     Notify the instrumentation that this table is not owned
     by this thread any more.
@@ -2693,8 +2709,8 @@ void handler::unbind_psi()
 void handler::rebind_psi()
 {
 #ifdef HAVE_PSI_TABLE_INTERFACE
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
-  DBUG_ASSERT(inited == NONE);
+  assert(m_lock_type == F_UNLCK);
+  assert(inited == NONE);
   /*
     Notify the instrumentation that this table is now owned
     by this thread.
@@ -2707,8 +2723,8 @@ void handler::rebind_psi()
 void handler::start_psi_batch_mode()
 {
 #ifdef HAVE_PSI_TABLE_INTERFACE
-  DBUG_ASSERT(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
-  DBUG_ASSERT(m_psi_locker == NULL);
+  assert(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
+  assert(m_psi_locker == NULL);
   m_psi_batch_mode= PSI_BATCH_MODE_STARTING;
   m_psi_numrows= 0;
 #endif
@@ -2717,10 +2733,10 @@ void handler::start_psi_batch_mode()
 void handler::end_psi_batch_mode()
 {
 #ifdef HAVE_PSI_TABLE_INTERFACE
-  DBUG_ASSERT(m_psi_batch_mode != PSI_BATCH_MODE_NONE);
+  assert(m_psi_batch_mode != PSI_BATCH_MODE_NONE);
   if (m_psi_locker != NULL)
   {
-    DBUG_ASSERT(m_psi_batch_mode == PSI_BATCH_MODE_STARTED);
+    assert(m_psi_batch_mode == PSI_BATCH_MODE_STARTED);
     PSI_TABLE_CALL(end_table_io_wait)(m_psi_locker, m_psi_numrows);
     m_psi_locker= NULL;
   }
@@ -2751,10 +2767,10 @@ int handler::ha_open(TABLE *table_arg, const char *name, int mode,
               test_if_locked));
 
   table= table_arg;
-  DBUG_ASSERT(table->s == table_share);
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(table->s == table_share);
+  assert(m_lock_type == F_UNLCK);
   DBUG_PRINT("info", ("old m_lock_type: %d F_UNLCK %d", m_lock_type, F_UNLCK));
-  DBUG_ASSERT(alloc_root_inited(&table->mem_root));
+  assert(alloc_root_inited(&table->mem_root));
 
   if ((error=open(name,mode,test_if_locked)))
   {
@@ -2772,8 +2788,8 @@ int handler::ha_open(TABLE *table_arg, const char *name, int mode,
   }
   else
   {
-    DBUG_ASSERT(m_psi == NULL);
-    DBUG_ASSERT(table_share != NULL);
+    assert(m_psi == NULL);
+    assert(table_share != NULL);
 #ifdef HAVE_PSI_TABLE_INTERFACE
     /*
       Do not call this for partitions handlers, since it may take too much
@@ -2816,13 +2832,13 @@ int handler::ha_close(void)
 #ifdef HAVE_PSI_TABLE_INTERFACE
   PSI_TABLE_CALL(close_table)(table_share, m_psi);
   m_psi= NULL; /* instrumentation handle, invalid after close_table() */
-  DBUG_ASSERT(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
-  DBUG_ASSERT(m_psi_locker == NULL);
+  assert(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
+  assert(m_psi_locker == NULL);
 #endif
   // TODO: set table= NULL to mark the handler as closed?
-  DBUG_ASSERT(m_psi == NULL);
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
-  DBUG_ASSERT(inited == NONE);
+  assert(m_psi == NULL);
+  assert(m_lock_type == F_UNLCK);
+  assert(inited == NONE);
   DBUG_RETURN(close());
 }
 
@@ -2843,9 +2859,9 @@ int handler::ha_index_init(uint idx, bool sorted)
   DBUG_EXECUTE_IF("ha_index_init_fail", return HA_ERR_TABLE_DEF_CHANGED;);
   int result;
   DBUG_ENTER("ha_index_init");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == NONE);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == NONE);
   if (!(result= index_init(idx, sorted)))
     inited= INDEX;
   end_range= NULL;
@@ -2865,10 +2881,10 @@ int handler::ha_index_end()
 {
   DBUG_ENTER("ha_index_end");
   /* SQL HANDLER function can call this without having it locked. */
-  DBUG_ASSERT(table->open_by_handler ||
-              table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
+  assert(table->open_by_handler ||
+         table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
   inited= NONE;
   end_range= NULL;
   DBUG_RETURN(index_end());
@@ -2891,9 +2907,9 @@ int handler::ha_rnd_init(bool scan)
   DBUG_EXECUTE_IF("ha_rnd_init_fail", return HA_ERR_TABLE_DEF_CHANGED;);
   int result;
   DBUG_ENTER("ha_rnd_init");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == NONE || (inited == RND && scan));
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == NONE || (inited == RND && scan));
   inited= (result= rnd_init(scan)) ? NONE : RND;
   end_range= NULL;
   DBUG_RETURN(result);
@@ -2912,10 +2928,10 @@ int handler::ha_rnd_end()
 {
   DBUG_ENTER("ha_rnd_end");
   /* SQL HANDLER function can call this without having it locked. */
-  DBUG_ASSERT(table->open_by_handler ||
-              table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == RND);
+  assert(table->open_by_handler ||
+         table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == RND);
   inited= NONE;
   end_range= NULL;
   DBUG_RETURN(rnd_end());
@@ -2937,9 +2953,9 @@ int handler::ha_rnd_next(uchar *buf)
   int result;
   DBUG_EXECUTE_IF("ha_rnd_next_deadlock", return HA_ERR_LOCK_DEADLOCK;);
   DBUG_ENTER("handler::ha_rnd_next");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == RND);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == RND);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -2970,10 +2986,10 @@ int handler::ha_rnd_pos(uchar *buf, uchar *pos)
 {
   int result;
   DBUG_ENTER("handler::ha_rnd_pos");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   /* TODO: Find out how to solve ha_rnd_pos when finding duplicate update. */
-  /* DBUG_ASSERT(inited == RND); */
+  /* assert(inited == RND); */
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3020,10 +3036,10 @@ int handler::ha_index_read_map(uchar *buf, const uchar *key,
 {
   int result;
   DBUG_ENTER("handler::ha_index_read_map");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3043,10 +3059,10 @@ int handler::ha_index_read_last_map(uchar *buf, const uchar *key,
 {
   int result;
   DBUG_ENTER("handler::ha_index_read_last_map");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3072,10 +3088,10 @@ int handler::ha_index_read_idx_map(uchar *buf, uint index, const uchar *key,
                                    enum ha_rkey_function find_flag)
 {
   int result;
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(end_range == NULL);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(end_range == NULL);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3106,10 +3122,10 @@ int handler::ha_index_next(uchar * buf)
 {
   int result;
   DBUG_ENTER("handler::ha_index_next");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3140,10 +3156,10 @@ int handler::ha_index_prev(uchar * buf)
 {
   int result;
   DBUG_ENTER("handler::ha_index_prev");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3174,10 +3190,10 @@ int handler::ha_index_first(uchar * buf)
 {
   int result;
   DBUG_ENTER("handler::ha_index_first");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3208,10 +3224,10 @@ int handler::ha_index_last(uchar * buf)
 {
   int result;
   DBUG_ENTER("handler::ha_index_last");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3244,10 +3260,10 @@ int handler::ha_index_next_same(uchar *buf, const uchar *key, uint keylen)
 {
   int result;
   DBUG_ENTER("handler::ha_index_next_same");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
-  DBUG_ASSERT(inited == INDEX);
-  DBUG_ASSERT(!pushed_idx_cond || buf == table->record[0]);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
+  assert(inited == INDEX);
+  assert(!pushed_idx_cond || buf == table->record[0]);
 
   // Set status for the need to update generated fields
   m_update_generated_read_fields= table->has_gcol();
@@ -3478,15 +3494,15 @@ int handler::update_auto_increment()
   bool append= FALSE;
   THD *thd= table->in_use;
   struct system_variables *variables= &thd->variables;
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   DBUG_ENTER("handler::update_auto_increment");
 
   /*
     next_insert_id is a "cursor" into the reserved interval, it may go greater
     than the interval, but not smaller.
   */
-  DBUG_ASSERT(next_insert_id >= auto_inc_interval_for_cur_row.minimum());
+  assert(next_insert_id >= auto_inc_interval_for_cur_row.minimum());
 
   if ((nr= table->next_number_field->val_int()) != 0 ||
       (table->auto_increment_field_not_null &&
@@ -3728,7 +3744,7 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
   if (ha_index_init(table->s->next_number_index, 1))
   {
     /* This should never happen, assert in debug, and fail in release build */
-    DBUG_ASSERT(0);
+    assert(0);
     *first_value= ULLONG_MAX;
     DBUG_VOID_RETURN;
   }
@@ -3770,7 +3786,7 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
     }
     else
     {
-      DBUG_ASSERT(0);
+      assert(0);
       nr= ULLONG_MAX;
     }
   }
@@ -3786,9 +3802,9 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
 
 void handler::ha_release_auto_increment()
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK ||
-              (!next_insert_id && !insert_id_for_cur_row));
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK ||
+         (!next_insert_id && !insert_id_for_cur_row));
   DEBUG_SYNC(ha_thd(), "release_auto_increment");
   release_auto_increment();
   insert_id_for_cur_row= 0;
@@ -3975,8 +3991,8 @@ void handler::print_error(int error, myf errflag)
   }
   case HA_ERR_FOREIGN_DUPLICATE_KEY:
   {
-    DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-                m_lock_type != F_UNLCK);
+    assert(table_share->tmp_table != NO_TMP_TABLE ||
+           m_lock_type != F_UNLCK);
 
     char rec_buf[MAX_KEY_LENGTH];
     String rec(rec_buf, sizeof(rec_buf), system_charset_info);
@@ -4400,8 +4416,8 @@ static bool update_frm_version(TABLE *table)
 */
 uint handler::get_dup_key(int error)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   DBUG_ENTER("handler::get_dup_key");
   table->file->errkey  = (uint) -1;
   if (error == HA_ERR_FOUND_DUPP_KEY ||
@@ -4433,7 +4449,7 @@ int handler::delete_table(const char *name)
   int error= 0;
   int enoent_or_zero= ENOENT;                   // Error if no file was deleted
   char buff[FN_REFLEN];
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(m_lock_type == F_UNLCK);
 
   for (const char **ext=bas_ext(); *ext ; ext++)
   {
@@ -4512,8 +4528,8 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
   bool skip_version_update = false;
   bool is_upgrade = check_opt->sql_flags & TT_FOR_UPGRADE;
 
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
 
   if ((table->s->mysql_version >= MYSQL_VERSION_ID) &&
       (check_opt->sql_flags & TT_FOR_UPGRADE))
@@ -4550,6 +4566,30 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
   return update_frm_version(table);
 }
 
+void
+handler::mark_trx_noop_dml()
+{
+  Ha_trx_info *ha_info= &ha_thd()->ha_data[ht->slot].ha_info[0];
+  /*
+    When a storage engine method is called, the transaction must
+    have been started, unless it's a DDL call, for which the
+    storage engine starts the transaction internally, and commits
+    it internally, without registering in the ha_list.
+    Unfortunately here we can't know for sure if the engine
+    has registered the transaction or not, so we must check.
+  */
+  if (ha_info->is_started())
+  {
+    assert(has_transactions());
+    /*
+      table_share can be NULL in ha_delete_table(). See implementation
+      of standalone function ha_delete_table() in sql_base.cc.
+    */
+    if (table_share == NULL || table_share->tmp_table == NO_TMP_TABLE)
+      ha_info->set_trx_noop_read_write();
+  }
+}
+
 /**
   A helper function to mark a transaction read-write,
   if it is started.
@@ -4564,12 +4604,12 @@ handler::mark_trx_read_write()
     have been started, unless it's a DDL call, for which the
     storage engine starts the transaction internally, and commits
     it internally, without registering in the ha_list.
-    Unfortunately here we can't know know for sure if the engine
+    Unfortunately here we can't know for sure if the engine
     has registered the transaction or not, so we must check.
   */
   if (ha_info->is_started())
   {
-    DBUG_ASSERT(has_transactions());
+    assert(has_transactions());
     /*
       table_share can be NULL in ha_delete_table(). See implementation
       of standalone function ha_delete_table() in sql_base.cc.
@@ -4592,8 +4632,8 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
   mark_trx_read_write();
 
   result= repair(thd, check_opt);
-  DBUG_ASSERT(result == HA_ADMIN_NOT_IMPLEMENTED ||
-              ha_table_flags() & HA_CAN_REPAIR);
+  assert(result == HA_ADMIN_NOT_IMPLEMENTED ||
+         ha_table_flags() & HA_CAN_REPAIR);
 
   int old_types_error= check_old_types();
 
@@ -4614,8 +4654,8 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
 void handler::ha_start_bulk_insert(ha_rows rows)
 {
   DBUG_ENTER("handler::ha_start_bulk_insert");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   estimation_rows_to_insert= rows;
   start_bulk_insert(rows);
   DBUG_VOID_RETURN;
@@ -4633,8 +4673,8 @@ void handler::ha_start_bulk_insert(ha_rows rows)
 int handler::ha_end_bulk_insert()
 {
   DBUG_ENTER("handler::ha_end_bulk_insert");
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   estimation_rows_to_insert= 0;
   DBUG_RETURN(end_bulk_insert());
 }
@@ -4650,8 +4690,8 @@ int
 handler::ha_bulk_update_row(const uchar *old_data, uchar *new_data,
                             uint *dup_key_found)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   mark_trx_read_write();
 
   return bulk_update_row(old_data, new_data, dup_key_found);
@@ -4667,8 +4707,8 @@ handler::ha_bulk_update_row(const uchar *old_data, uchar *new_data,
 int
 handler::ha_delete_all_rows()
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   mark_trx_read_write();
 
   return delete_all_rows();
@@ -4684,8 +4724,8 @@ handler::ha_delete_all_rows()
 int
 handler::ha_truncate()
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   mark_trx_read_write();
 
   return truncate();
@@ -4701,8 +4741,8 @@ handler::ha_truncate()
 int
 handler::ha_optimize(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   mark_trx_read_write();
 
   return optimize(thd, check_opt);
@@ -4718,8 +4758,8 @@ handler::ha_optimize(THD* thd, HA_CHECK_OPT* check_opt)
 int
 handler::ha_analyze(THD* thd, HA_CHECK_OPT* check_opt)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   mark_trx_read_write();
 
   return analyze(thd, check_opt);
@@ -4735,8 +4775,8 @@ handler::ha_analyze(THD* thd, HA_CHECK_OPT* check_opt)
 bool
 handler::ha_check_and_repair(THD *thd)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_UNLCK);
   mark_trx_read_write();
 
   return check_and_repair(thd);
@@ -4752,8 +4792,8 @@ handler::ha_check_and_repair(THD *thd)
 int
 handler::ha_disable_indexes(uint mode)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   mark_trx_read_write();
 
   return disable_indexes(mode);
@@ -4769,8 +4809,8 @@ handler::ha_disable_indexes(uint mode)
 int
 handler::ha_enable_indexes(uint mode)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   mark_trx_read_write();
 
   return enable_indexes(mode);
@@ -4786,8 +4826,8 @@ handler::ha_enable_indexes(uint mode)
 int
 handler::ha_discard_or_import_tablespace(my_bool discard)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   mark_trx_read_write();
 
   return discard_or_import_tablespace(discard);
@@ -4797,8 +4837,8 @@ handler::ha_discard_or_import_tablespace(my_bool discard)
 bool handler::ha_prepare_inplace_alter_table(TABLE *altered_table,
                                              Alter_inplace_info *ha_alter_info)
 {
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type != F_UNLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type != F_UNLCK);
   mark_trx_read_write();
 
   return prepare_inplace_alter_table(altered_table, ha_alter_info);
@@ -4815,11 +4855,11 @@ bool handler::ha_commit_inplace_alter_table(TABLE *altered_table,
      In this case, we might be rolling back after a failed lock upgrade,
      so we could be holding the same lock level as for inplace_alter_table().
    */
-   DBUG_ASSERT(ha_thd()->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                       table->s->db.str,
-                                       table->s->table_name.str,
-                                       MDL_EXCLUSIVE) ||
-               !commit);
+  assert(ha_thd()->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                           table->s->db.str,
+                                                           table->s->table_name.str,
+                                                           MDL_EXCLUSIVE) ||
+         !commit);
 
    return commit_inplace_alter_table(altered_table, ha_alter_info, commit);
 }
@@ -4845,7 +4885,8 @@ handler::check_if_supported_inplace_alter(TABLE *altered_table,
     Alter_inplace_info::CHANGE_CREATE_OPTION |
     Alter_inplace_info::ALTER_RENAME |
     Alter_inplace_info::RENAME_INDEX |
-    Alter_inplace_info::ALTER_INDEX_COMMENT;
+    Alter_inplace_info::ALTER_INDEX_COMMENT |
+    Alter_inplace_info::ALTER_COLUMN_INDEX_LENGTH;
 
   /* Is there at least one operation that requires copy algorithm? */
   if (ha_alter_info->handler_flags & ~inplace_offline_operations)
@@ -4910,7 +4951,7 @@ void Alter_inplace_info::report_unsupported_error(const char *not_supported,
 int
 handler::ha_rename_table(const char *from, const char *to)
 {
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(m_lock_type == F_UNLCK);
   mark_trx_read_write();
 
   return rename_table(from, to);
@@ -4926,7 +4967,7 @@ handler::ha_rename_table(const char *from, const char *to)
 int
 handler::ha_delete_table(const char *name)
 {
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(m_lock_type == F_UNLCK);
   mark_trx_read_write();
 
   return delete_table(name);
@@ -4942,7 +4983,7 @@ handler::ha_delete_table(const char *name)
 void
 handler::ha_drop_table(const char *name)
 {
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(m_lock_type == F_UNLCK);
   mark_trx_read_write();
 
   return drop_table(name);
@@ -4958,7 +4999,7 @@ handler::ha_drop_table(const char *name)
 int
 handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info)
 {
-  DBUG_ASSERT(m_lock_type == F_UNLCK);
+  assert(m_lock_type == F_UNLCK);
   mark_trx_read_write();
 
   return create(name, form, info);
@@ -4980,8 +5021,8 @@ handler::ha_create_handler_files(const char *name, const char *old_name,
     it is done on an already locked handler when preparing to alter/rename
     partitions.
   */
-  DBUG_ASSERT(m_lock_type == F_UNLCK ||
-              (!old_name && strcmp(name, table_share->path.str)));
+  assert(m_lock_type == F_UNLCK ||
+         (!old_name && strcmp(name, table_share->path.str)));
   mark_trx_read_write();
 
   return create_handler_files(name, old_name, action_flag, info);
@@ -5045,7 +5086,7 @@ int handler::index_next_same(uchar *buf, const uchar *key, uint keylen)
       key_part_end= key_part + key_info->user_defined_key_parts;
       for (; key_part < key_part_end; key_part++)
       {
-        DBUG_ASSERT(key_part->field);
+        assert(key_part->field);
         key_part->field->move_field_offset(ptrdiff);
       }
     }
@@ -5160,7 +5201,6 @@ int ha_create_table_from_engine(THD* thd, const char *db, const char *name)
   DBUG_ENTER("ha_create_table_from_engine");
   DBUG_PRINT("enter", ("name '%s'.'%s'", db, name));
 
-  memset(&create_info, 0, sizeof(create_info));
   if ((error= ha_discover(thd, db, name, &frmblob, &frmlen)))
   {
     /* Table could not be discovered and thus not created */
@@ -5236,42 +5276,30 @@ ha_check_if_table_exists(THD* thd, const char *db, const char *name,
   DBUG_RETURN(FALSE);
 }
 
-/**
-  @brief Check if a given table is a system table.
 
-  @details The primary purpose of introducing this function is to stop system
-  tables to be created or being moved to undesired storage engines.
-
-  @todo There is another function called is_system_table_name() used by
-        get_table_category(), which is used to set TABLE_SHARE table_category.
-        It checks only a subset of table name like proc, event and time*.
-        We cannot use below function in get_table_category(),
-        as that affects locking mechanism. If we need to
-        unify these functions, we need to fix locking issues generated.
+/**
+  @brief Check if a given table is a user table or a valid system table or
+         a valid system table that a SE supports.
 
   @param   hton                  Handlerton of new engine.
   @param   db                    Database name.
   @param   table_name            Table name to be checked.
 
-  @return Operation status
-    @retval  true                If the table name is a valid system table
-                                 or if its a valid user table.
-
-    @retval  false               If the table name is a system table name
-                                 and does not belong to engine specified
-                                 in the command.
+  @retval  st_sys_tbl_chk_params::enum_status
 */
-bool ha_check_if_supported_system_table(handlerton *hton, const char *db,
-                                        const char *table_name)
+static st_sys_tbl_chk_params::enum_status
+ha_get_system_table_check_status(handlerton *hton, const char *db,
+                                   const char *table_name)
 {
-  DBUG_ENTER("ha_check_if_supported_system_table");
+  DBUG_ENTER("ha_get_system_table_check_status");
   st_sys_tbl_chk_params check_params;
+  check_params.status= st_sys_tbl_chk_params::USER_TABLE;
   bool is_system_database= false;
   const char **names;
   st_handler_tablename *systab;
 
   // Check if we have a system database name in the command.
-  DBUG_ASSERT(known_system_databases != NULL);
+  assert(known_system_databases != NULL);
   names= known_system_databases;
   while (names && *names)
   {
@@ -5285,7 +5313,7 @@ bool ha_check_if_supported_system_table(handlerton *hton, const char *db,
     names++;
   }
   if (!is_system_database)
-    DBUG_RETURN(true); // It's a user table name.
+    DBUG_RETURN(st_sys_tbl_chk_params::USER_TABLE);
 
   // Check if this is SQL layer system tables.
   systab= mysqld_system_tables;
@@ -5303,21 +5331,89 @@ bool ha_check_if_supported_system_table(handlerton *hton, const char *db,
 
   // Check if this is a system table and if some engine supports it.
   check_params.status= check_params.is_sql_layer_system_table ?
-    st_sys_tbl_chk_params::KNOWN_SYSTEM_TABLE :
-    st_sys_tbl_chk_params::NOT_KNOWN_SYSTEM_TABLE;
+    st_sys_tbl_chk_params::SYSTEM_TABLE :
+    st_sys_tbl_chk_params::USER_TABLE;
   check_params.db_type= hton->db_type;
   check_params.table_name= table_name;
   plugin_foreach(NULL, check_engine_system_table_handlerton,
                  MYSQL_STORAGE_ENGINE_PLUGIN, &check_params);
 
-  // SE does not support this system table.
-  if (check_params.status == st_sys_tbl_chk_params::KNOWN_SYSTEM_TABLE)
-    DBUG_RETURN(false);
+  DBUG_RETURN(check_params.status);
+}
 
-  // It's a system table or a valid user table.
-  DBUG_RETURN(true);
+
+/**
+  @brief Check if a given table is a system table supported by a SE.
+
+  @todo There is another function called is_system_table_name() used by
+        get_table_category(), which is used to set TABLE_SHARE table_category.
+        It checks only a subset of table name like proc, event and time*.
+        We cannot use below function in get_table_category(),
+        as that affects locking mechanism. If we need to
+        unify these functions, we need to fix locking issues generated.
+
+  @param   hton                  Handlerton of new engine.
+  @param   db                    Database name.
+  @param   table_name            Table name to be checked.
+
+  @return Operation status
+    @retval  true                If the table name is a valid system table
+                                 that is supported by a SE.
+
+    @retval  false               Not a system table.
+*/
+bool ha_is_supported_system_table(handlerton *hton, const char *db,
+                                  const char *table_name)
+{
+  DBUG_ENTER("ha_is_supported_system_table");
+  st_sys_tbl_chk_params::enum_status status=
+    ha_get_system_table_check_status(hton, db, table_name);
+
+  // It's a valid SE supported system table.
+  DBUG_RETURN(status == st_sys_tbl_chk_params::SE_SUPPORTED_SYSTEM_TABLE);
+}
+
+
+/**
+  @brief Check if a given table is a system table that belongs
+  to some SE or a user table.
+
+  @details The primary purpose of introducing this function is to stop system
+  tables to be created or being moved to undesired storage engines.
+
+  @todo There is another function called is_system_table_name() used by
+        get_table_category(), which is used to set TABLE_SHARE table_category.
+        It checks only a subset of table name like proc, event and time*.
+        We cannot use below function in get_table_category(),
+        as that affects locking mechanism. If we need to
+        unify these functions, we need to fix locking issues generated.
+
+  @param   hton                  Handlerton of new engine.
+  @param   db                    Database name.
+  @param   table_name            Table name to be checked.
+
+  @return Operation status
+    @retval  true                If the table name is a valid system table
+                                 or if its a valid user table.
+
+    @retval  false               If the table name is a system table name
+                                 and does not belong to engine specified
+                                 in the command.
+*/
+bool ha_is_valid_system_or_user_table(handlerton *hton, const char *db,
+                                      const char *table_name)
+{
+  DBUG_ENTER("ha_is_valid_system_or_user_table");
+
+  st_sys_tbl_chk_params::enum_status status=
+    ha_get_system_table_check_status(hton, db, table_name);
+
+  // It's a user table or a valid SE supported system table.
+  DBUG_RETURN(status == st_sys_tbl_chk_params::USER_TABLE ||
+              status == st_sys_tbl_chk_params::SE_SUPPORTED_SYSTEM_TABLE);
 }
 
+
 /**
   @brief Called for each SE to check if given db, tablename is a system table.
 
@@ -5347,7 +5443,7 @@ static my_bool check_engine_system_table_handlerton(THD *unused,
   handlerton *hton= plugin_data<handlerton*>(plugin);
 
   // Do we already know that the table is a system table?
-  if (check_params->status == st_sys_tbl_chk_params::KNOWN_SYSTEM_TABLE)
+  if (check_params->status == st_sys_tbl_chk_params::SYSTEM_TABLE)
   {
     /*
       If this is the same SE specified in the command, we can
@@ -5359,7 +5455,8 @@ static my_bool check_engine_system_table_handlerton(THD *unused,
           hton->is_supported_system_table(check_params->db,
                                        check_params->table_name,
                                        check_params->is_sql_layer_system_table))
-        check_params->status= st_sys_tbl_chk_params::SUPPORTED_SYSTEM_TABLE;
+        check_params->status=
+          st_sys_tbl_chk_params::SE_SUPPORTED_SYSTEM_TABLE;
       return TRUE;
     }
     /*
@@ -5385,11 +5482,11 @@ static my_bool check_engine_system_table_handlerton(THD *unused,
     */
     if (hton->db_type == check_params->db_type)
     {
-      check_params->status= st_sys_tbl_chk_params::SUPPORTED_SYSTEM_TABLE;
+      check_params->status= st_sys_tbl_chk_params::SE_SUPPORTED_SYSTEM_TABLE;
       return TRUE;
     }
     else
-      check_params->status= st_sys_tbl_chk_params::KNOWN_SYSTEM_TABLE;
+      check_params->status= st_sys_tbl_chk_params::SYSTEM_TABLE;
   }
 
   return FALSE;
@@ -5417,7 +5514,7 @@ const char** ha_known_system_databases(void)
   databases= (const char **) my_once_alloc(sizeof(char *)*
                                      (found_databases.size()+1),
                                      MYF(MY_WME | MY_FAE));
-  DBUG_ASSERT(databases != NULL);
+  assert(databases != NULL);
 
   list<const char*>::iterator it;
   database= databases;
@@ -5576,7 +5673,10 @@ int ha_discover(THD *thd, const char *db, const char *name,
     error= 0;
 
   if (!error)
+  {
+    assert(!thd->status_var_aggregated);
     thd->status_var.ha_discover_count++;
+  }
   DBUG_RETURN(error);
 }
 
@@ -5878,9 +5978,9 @@ double handler::index_only_read_time(uint keynr, double records)
 
 double handler::table_in_memory_estimate() const
 {
-  DBUG_ASSERT(stats.table_in_mem_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
-              (stats.table_in_mem_estimate >= 0.0 &&
-               stats.table_in_mem_estimate <= 1.0));
+  assert(stats.table_in_mem_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
+         (stats.table_in_mem_estimate >= 0.0 &&
+          stats.table_in_mem_estimate <= 1.0));
 
   /*
     If the storage engine has supplied information about how much of the
@@ -5983,7 +6083,7 @@ double handler::estimate_in_memory_buffer(ulonglong table_index_size) const
     in_mem_est= 1.0 - (percent_of_mem - table_index_in_memory_limit) /
       (1.0 - table_index_in_memory_limit);
   }
-  DBUG_ASSERT(in_mem_est >= 0.0 && in_mem_est <= 1.0);
+  assert(in_mem_est >= 0.0 && in_mem_est <= 1.0);
 
   return in_mem_est;
 }
@@ -6014,8 +6114,8 @@ Cost_estimate handler::index_scan_cost(uint index, double ranges, double rows)
     and use of the copy constructor.
   */
 
-  DBUG_ASSERT(ranges >= 0.0);
-  DBUG_ASSERT(rows >= 0.0);
+  assert(ranges >= 0.0);
+  assert(rows >= 0.0);
 
   const double io_cost= index_only_read_time(index, rows) *
     table->cost_model()->page_read_cost_index(index, 1.0);
@@ -6034,8 +6134,8 @@ Cost_estimate handler::read_cost(uint index, double ranges, double rows)
     and use of the copy constructor.
   */
 
-  DBUG_ASSERT(ranges >= 0.0);
-  DBUG_ASSERT(rows >= 0.0);
+  assert(ranges >= 0.0);
+  assert(rows >= 0.0);
 
   const double io_cost= read_time(index, static_cast<uint>(ranges),
                                   static_cast<ha_rows>(rows)) *
@@ -6183,7 +6283,7 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
     else
     {
       DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
-      DBUG_ASSERT(min_endp || max_endp);
+      assert(min_endp || max_endp);
       if (HA_POS_ERROR == (rows= this->records_in_range(keyno, min_endp, 
                                                         max_endp)))
       {
@@ -6203,7 +6303,7 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
     *flags|= HA_MRR_USE_DEFAULT_IMPL;
     *flags|= HA_MRR_SUPPORT_SORTED;
 
-    DBUG_ASSERT(cost->is_zero());
+    assert(cost->is_zero());
     if (*flags & HA_MRR_INDEX_ONLY)
       *cost= index_scan_cost(keyno, static_cast<double>(n_ranges),
                              static_cast<double>(total_rows));
@@ -6260,7 +6360,7 @@ ha_rows handler::multi_range_read_info(uint keyno, uint n_ranges, uint n_rows,
   *flags|= HA_MRR_USE_DEFAULT_IMPL;
   *flags|= HA_MRR_SUPPORT_SORTED;
 
-  DBUG_ASSERT(cost->is_zero());
+  assert(cost->is_zero());
 
   /* Produce the same cost as non-MRR code does */
   if (*flags & HA_MRR_INDEX_ONLY)
@@ -6478,17 +6578,20 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
       4. We have pushed an index condition and this has been transferred to 
          the clone (h2) of the handler object.
   */
-  DBUG_ASSERT(!h->pushed_idx_cond ||
-              h->pushed_idx_cond_keyno == h->active_index ||
-              h->pushed_idx_cond_keyno != table->s->primary_key ||
-              (h2 && h->pushed_idx_cond_keyno == h2->active_index));
+  assert(!h->pushed_idx_cond ||
+         h->pushed_idx_cond_keyno == h->active_index ||
+         h->pushed_idx_cond_keyno != table->s->primary_key ||
+         (h2 && h->pushed_idx_cond_keyno == h2->active_index));
 
   rowids_buf= buf->buffer;
 
   is_mrr_assoc= !MY_TEST(mode & HA_MRR_NO_ASSOCIATION);
 
   if (is_mrr_assoc)
+  {
+    assert(!thd->status_var_aggregated);
     table->in_use->status_var.ha_multi_range_read_init_count++;
+  }
  
   rowids_buf_end= buf->buffer_end;
   elem_size= h->ref_length + (int)is_mrr_assoc * sizeof(void*);
@@ -6526,7 +6629,7 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
   */
   if (h2->active_index == MAX_KEY)
   {
-    DBUG_ASSERT(h->active_index != MAX_KEY);
+    assert(h->active_index != MAX_KEY);
     const uint mrr_keyno= h->active_index;
 
     if ((retval= h2->ha_external_lock(thd, h->m_lock_type)))
@@ -6562,9 +6665,9 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
       must not be opened for doing a new range scan. In this case
       the active_index must either not be set or be the primary key.
     */
-    DBUG_ASSERT(h->inited == handler::RND);
-    DBUG_ASSERT(h->active_index == MAX_KEY || 
-                h->active_index == table->s->primary_key);
+    assert(h->inited == handler::RND);
+    assert(h->active_index == MAX_KEY || 
+           h->active_index == table->s->primary_key);
   }
 
   /*
@@ -6589,12 +6692,12 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
   /*
     Verify consistency between h and h2.
   */
-  DBUG_ASSERT(h->inited != handler::INDEX);
-  DBUG_ASSERT(h->active_index == MAX_KEY || 
-              h->active_index == table->s->primary_key);
-  DBUG_ASSERT(h2->inited == handler::INDEX);
-  DBUG_ASSERT(h2->active_index != MAX_KEY);
-  DBUG_ASSERT(h->m_lock_type == h2->m_lock_type);
+  assert(h->inited != handler::INDEX);
+  assert(h->active_index == MAX_KEY || 
+         h->active_index == table->s->primary_key);
+  assert(h2->inited == handler::INDEX);
+  assert(h2->active_index != MAX_KEY);
+  assert(h->m_lock_type == h2->m_lock_type);
 
   if ((retval= h2->handler::multi_range_read_init(seq_funcs, seq_init_param, 
                                                   n_ranges, mode, buf)))
@@ -6632,7 +6735,7 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
   h2->ha_close();
   delete h2;
   h2= NULL;
-  DBUG_ASSERT(retval != 0);
+  assert(retval != 0);
   DBUG_RETURN(retval);
 }
 
@@ -6698,7 +6801,7 @@ int DsMrr_impl::dsmrr_fill_buffer()
   char *range_info;
   int res= 0;
   DBUG_ENTER("DsMrr_impl::dsmrr_fill_buffer");
-  DBUG_ASSERT(rowids_buf < rowids_buf_end);
+  assert(rowids_buf < rowids_buf_end);
 
   /*
     Set key_read to TRUE since we only read fields from the index.
@@ -6709,7 +6812,7 @@ int DsMrr_impl::dsmrr_fill_buffer()
     property of the wrong handler. MRR sets the handlers' keyread properties
     when initializing the MRR operation, independent of this call).
   */
-  DBUG_ASSERT(table->key_read == FALSE);
+  assert(table->key_read == FALSE);
   table->key_read= TRUE;
 
   rowids_buf_cur= rowids_buf;
@@ -6822,7 +6925,7 @@ ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
   res=
     h->handler::multi_range_read_info(keyno, n_ranges, rows, &def_bufsz,
                                       &def_flags, cost);
-  DBUG_ASSERT(!res);
+  assert(!res);
 
   if ((*flags & HA_MRR_USE_DEFAULT_IMPL) || 
       choose_mrr_impl(keyno, rows, flags, bufsz, cost))
@@ -6831,7 +6934,7 @@ ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
     DBUG_PRINT("info", ("Default MRR implementation choosen"));
     *flags= def_flags;
     *bufsz= def_bufsz;
-    DBUG_ASSERT(*flags & HA_MRR_USE_DEFAULT_IMPL);
+    assert(*flags & HA_MRR_USE_DEFAULT_IMPL);
   }
   else
   {
@@ -6875,7 +6978,7 @@ ha_rows DsMrr_impl::dsmrr_info_const(uint keyno, RANGE_SEQ_IF *seq,
     DBUG_PRINT("info", ("Default MRR implementation choosen"));
     *flags= def_flags;
     *bufsz= def_bufsz;
-    DBUG_ASSERT(*flags & HA_MRR_USE_DEFAULT_IMPL);
+    assert(*flags & HA_MRR_USE_DEFAULT_IMPL);
   }
   else
   {
@@ -7038,7 +7141,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags,
   */
   rows_in_last_step= rows % max_buff_entries;
   
-  DBUG_ASSERT(cost->is_zero());
+  assert(cost->is_zero());
 
   if (n_full_steps)
   {
@@ -7103,7 +7206,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags,
 static 
 void get_sort_and_sweep_cost(TABLE *table, ha_rows nrows, Cost_estimate *cost)
 {
-  DBUG_ASSERT(cost->is_zero());
+  assert(cost->is_zero());
   if (nrows)
   {
     get_sweep_read_cost(table, nrows, FALSE, cost);
@@ -7196,7 +7299,7 @@ void get_sweep_read_cost(TABLE *table, ha_rows nrows, bool interrupted,
 {
   DBUG_ENTER("get_sweep_read_cost");
 
-  DBUG_ASSERT(cost->is_zero());
+  assert(cost->is_zero());
   if(nrows > 0)
   {
     const Cost_model_table *const cost_model= table->cost_model();
@@ -7238,7 +7341,7 @@ void get_sweep_read_cost(TABLE *table, ha_rows nrows, bool interrupted,
       const double busy_blocks_mem=
         busy_blocks * table->file->table_in_memory_estimate();
       const double busy_blocks_disk= busy_blocks - busy_blocks_mem;
-      DBUG_ASSERT(busy_blocks_disk >= 0.0);
+      assert(busy_blocks_disk >= 0.0);
 
       // Cost of accessing blocks in main memory buffer
       sweep_cost.add_io(cost_model->buffer_block_read_cost(busy_blocks_mem));
@@ -7375,6 +7478,18 @@ int handler::read_range_next()
   }
 }
 
+/**
+  Check if one of the columns in a key is a virtual generated column.
+  @param part    the first part of the key to check
+  @param length  the length of the key
+  @retval true   if the key contains a virtual generated column
+  @retval false  if the key does not contain a virtual generated column
+*/
+static bool key_has_vcol(const KEY_PART_INFO *part, uint length) {
+  for (uint len = 0; len < length; len += part->store_length, ++part)
+    if (part->field->is_virtual_gcol()) return true;
+  return false;
+}
 
 void handler::set_end_range(const key_range* range,
                             enum_range_scan_direction direction)
@@ -7386,6 +7501,7 @@ void handler::set_end_range(const key_range* range,
     range_key_part= table->key_info[active_index].key_part;
     key_compare_result_on_equal= ((range->flag == HA_READ_BEFORE_KEY) ? 1 :
                                   (range->flag == HA_READ_AFTER_KEY) ? -1 : 0);
+    m_virt_gcol_in_end_range = key_has_vcol(range_key_part, range->length);
   }
   else
     end_range= NULL;
@@ -7483,13 +7599,13 @@ move_key_field_offsets(const key_range *range, const KEY_PART_INFO *key_part,
 */
 int handler::compare_key_in_buffer(const uchar *buf) const
 {
-  DBUG_ASSERT(end_range != NULL);
+  assert(end_range != NULL);
 
   /*
     End range on descending scans is only checked with ICP for now, and then we
     check it with compare_key_icp() instead of this function.
   */
-  DBUG_ASSERT(range_scan_direction == RANGE_SCAN_ASC);
+  assert(range_scan_direction == RANGE_SCAN_ASC);
 
   // Make the fields in the key point into the buffer instead of record[0].
   const my_ptrdiff_t diff= buf - table->record[0];
@@ -7527,7 +7643,7 @@ uint calculate_key_len(TABLE *table, uint key,
                        key_part_map keypart_map)
 {
   /* works only with key prefixes */
-  DBUG_ASSERT(((keypart_map + 1) & keypart_map) == 0);
+  assert(((keypart_map + 1) & keypart_map) == 0);
 
   KEY *key_info= table->key_info + key;
   KEY_PART_INFO *key_part= key_info->key_part;
@@ -7601,7 +7717,7 @@ TYPELIB* ha_known_exts()
   size_t arr_length= sizeof(char *)* (found_exts.elements+1);
   ext= (const char **) sql_alloc(arr_length);
 
-  DBUG_ASSERT(NULL != ext);
+  assert(NULL != ext);
   known_extensions->count= found_exts.elements;
   known_extensions->type_names= ext;
 
@@ -7704,8 +7820,8 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
     table->s->cached_row_logging_check= check;
   }
 
-  DBUG_ASSERT(table->s->cached_row_logging_check == 0 ||
-              table->s->cached_row_logging_check == 1);
+  assert(table->s->cached_row_logging_check == 0 ||
+         table->s->cached_row_logging_check == 1);
 
   return (thd->is_current_stmt_binlog_format_row() &&
           table->s->cached_row_logging_check &&
@@ -7799,10 +7915,57 @@ static int write_locked_table_maps(THD *thd)
   DBUG_RETURN(0);
 }
 
-
 typedef bool Log_func(THD*, TABLE*, bool,
                       const uchar*, const uchar*);
 
+/**
+
+  The purpose of an instance of this class is to :
+
+  1) Given a TABLE instance, backup the given TABLE::read_set, TABLE::write_set
+     and restore those members upon this instance disposal.
+
+  2) Store a reference to a dynamically allocated buffer and dispose of it upon
+     this instance disposal.
+ */
+
+class Binlog_log_row_cleanup
+{
+ public:
+  /**
+    This constructor aims to create temporary copies of readset and writeset.
+    @param table                 A pointer to TABLE object
+    @param temp_read_bitmap      Temporary BITMAP to store read_set.
+    @param temp_write_bitmap     Temporary BITMAP to store write_set.
+  */
+  Binlog_log_row_cleanup(TABLE &table, MY_BITMAP &temp_read_bitmap,
+                         MY_BITMAP &temp_write_bitmap)
+      : m_cleanup_table(table),
+        m_cleanup_read_bitmap(temp_read_bitmap),
+        m_cleanup_write_bitmap(temp_write_bitmap)
+  {
+    bitmap_copy(&this->m_cleanup_read_bitmap, this->m_cleanup_table.read_set);
+    bitmap_copy(&this->m_cleanup_write_bitmap, this->m_cleanup_table.write_set);
+  }
+
+  /**
+    This destructor aims to restore the original readset and writeset and
+    delete the temporary copies.
+  */
+  virtual ~Binlog_log_row_cleanup()
+  {
+    bitmap_copy(this->m_cleanup_table.read_set, &this->m_cleanup_read_bitmap);
+    bitmap_copy(this->m_cleanup_table.write_set, &this->m_cleanup_write_bitmap);
+    bitmap_free(&this->m_cleanup_read_bitmap);
+    bitmap_free(&this->m_cleanup_write_bitmap);
+  }
+
+ private:
+  TABLE &m_cleanup_table;  // Creating a TABLE to get access to its members.
+  MY_BITMAP &m_cleanup_read_bitmap;   // Temporary bitmap to store read_set.
+  MY_BITMAP &m_cleanup_write_bitmap;  // Temporary bitmap to store write_set.
+};
+
 int binlog_log_row(TABLE* table,
                           const uchar *before_record,
                           const uchar *after_record,
@@ -7815,32 +7978,50 @@ int binlog_log_row(TABLE* table,
   {
     if (thd->variables.transaction_write_set_extraction != HASH_ALGORITHM_OFF)
     {
-      bitmap_set_all(table->read_set);
-      if (before_record && after_record)
+      try
       {
-        size_t length= table->s->reclength;
-        uchar* temp_image=(uchar*) my_malloc(PSI_NOT_INSTRUMENTED,
-                                             length,
-                                             MYF(MY_WME));
-        if (!temp_image)
+        MY_BITMAP save_read_set;
+        MY_BITMAP save_write_set;
+        if (bitmap_init(&save_read_set, NULL, table->s->fields, false) ||
+            bitmap_init(&save_write_set, NULL, table->s->fields, false))
         {
-          sql_print_error("Out of memory on transaction write set extraction");
-          return 1;
+          my_error(ER_OUT_OF_RESOURCES, MYF(0));
+          return HA_ERR_RBR_LOGGING_FAILED;
         }
-        add_pke(table, thd);
-
-        memcpy(temp_image, table->record[0],(size_t) table->s->reclength);
-        memcpy(table->record[0],table->record[1],(size_t) table->s->reclength);
 
-        add_pke(table, thd);
-
-        memcpy(table->record[0], temp_image, (size_t) table->s->reclength);
+        Binlog_log_row_cleanup cleanup_sentry(*table, save_read_set,
+                                              save_write_set);
+        if (thd->variables.binlog_row_image == 0)
+        {
+          for (uint key_number= 0; key_number < table->s->keys; ++key_number)
+          {
+            if (((table->key_info[key_number].flags & (HA_NOSAME)) ==
+                 HA_NOSAME))
+            {
+              table->mark_columns_used_by_index_no_reset(key_number,
+                                                         table->read_set);
+              table->mark_columns_used_by_index_no_reset(key_number,
+                                                         table->write_set);
+            }
+          }
+        }
+        const uchar *records[]= {after_record, before_record};
 
-        my_free(temp_image);
+        for (int record= 0; record < 2; ++record)
+        {
+          if (records[record] != NULL)
+          {
+            assert(records[record] == table->record[0] ||
+                   records[record] == table->record[1]);
+            bool res= add_pke(table, thd, records[record]);
+            if (res) return HA_ERR_RBR_LOGGING_FAILED;
+          }
+        }
       }
-      else
+      catch (const std::bad_alloc &)
       {
-        add_pke(table, thd);
+        my_error(ER_OUT_OF_RESOURCES, MYF(0));
+        return HA_ERR_RBR_LOGGING_FAILED;
       }
     }
     DBUG_DUMP("read_set 10", (uchar*) table->read_set->bitmap,
@@ -7879,13 +8060,13 @@ int handler::ha_external_lock(THD *thd, int lock_type)
     if get_auto_increment() was called (thus may have reserved intervals or
     taken a table lock), ha_release_auto_increment() was too.
   */
-  DBUG_ASSERT(next_insert_id == 0);
+  assert(next_insert_id == 0);
   /* Consecutive calls for lock without unlocking in between is not allowed */
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              ((lock_type != F_UNLCK && m_lock_type == F_UNLCK) ||
-               lock_type == F_UNLCK));
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         ((lock_type != F_UNLCK && m_lock_type == F_UNLCK) ||
+          lock_type == F_UNLCK));
   /* SQL HANDLER call locks/unlock while scanning (RND/INDEX). */
-  DBUG_ASSERT(inited == NONE || table->open_by_handler);
+  assert(inited == NONE || table->open_by_handler);
 
   if (MYSQL_HANDLER_RDLOCK_START_ENABLED() && lock_type == F_RDLCK)
   {
@@ -7948,13 +8129,13 @@ int handler::ha_reset()
 {
   DBUG_ENTER("handler::ha_reset");
   /* Check that we have called all proper deallocation functions */
-  DBUG_ASSERT((uchar*) table->def_read_set.bitmap +
-              table->s->column_bitmap_size ==
-              (uchar*) table->def_write_set.bitmap);
-  DBUG_ASSERT(bitmap_is_set_all(&table->s->all_set));
-  DBUG_ASSERT(table->key_read == 0);
+  assert((uchar*) table->def_read_set.bitmap +
+         table->s->column_bitmap_size ==
+         (uchar*) table->def_write_set.bitmap);
+  assert(bitmap_is_set_all(&table->s->all_set));
+  assert(table->key_read == 0);
   /* ensure that ha_index_end / ha_rnd_end has been called */
-  DBUG_ASSERT(inited == NONE);
+  assert(inited == NONE);
   /* Free cache used by filesort */
   free_io_cache(table);
   /* reset the bitmaps to point to defaults */
@@ -7973,8 +8154,8 @@ int handler::ha_write_row(uchar *buf)
 {
   int error;
   Log_func *log_func= Write_rows_log_event::binlog_row_logging_function;
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
 
   DBUG_ENTER("handler::ha_write_row");
   DBUG_EXECUTE_IF("inject_error_ha_write_row",
@@ -8007,16 +8188,16 @@ int handler::ha_write_row(uchar *buf)
 int handler::ha_update_row(const uchar *old_data, uchar *new_data)
 {
   int error;
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   Log_func *log_func= Update_rows_log_event::binlog_row_logging_function;
 
   /*
     Some storage engines require that the new record is in record[0]
     (and the old record is in record[1]).
    */
-  DBUG_ASSERT(new_data == table->record[0]);
-  DBUG_ASSERT(old_data == table->record[1]);
+  assert(new_data == table->record[0]);
+  assert(old_data == table->record[1]);
 
   DBUG_ENTER("hanlder::ha_update_row");
   DBUG_EXECUTE_IF("inject_error_ha_update_row",
@@ -8044,14 +8225,14 @@ int handler::ha_update_row(const uchar *old_data, uchar *new_data)
 int handler::ha_delete_row(const uchar *buf)
 {
   int error;
-  DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
-              m_lock_type == F_WRLCK);
+  assert(table_share->tmp_table != NO_TMP_TABLE ||
+         m_lock_type == F_WRLCK);
   Log_func *log_func= Delete_rows_log_event::binlog_row_logging_function;
   /*
     Normally table->record[0] is used, but sometimes table->record[1] is used.
   */
-  DBUG_ASSERT(buf == table->record[0] ||
-              buf == table->record[1]);
+  assert(buf == table->record[0] ||
+         buf == table->record[1]);
   DBUG_EXECUTE_IF("inject_error_ha_delete_row",
                   return HA_ERR_INTERNAL_ERROR; );
 
@@ -8102,9 +8283,9 @@ void handler::use_hidden_primary_key()
 Handler_share *handler::get_ha_share_ptr()
 {
   DBUG_ENTER("handler::get_ha_share_ptr");
-  DBUG_ASSERT(ha_share && table_share);
+  assert(ha_share && table_share);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (table_share->tmp_table == NO_TMP_TABLE)
     mysql_mutex_assert_owner(&table_share->LOCK_ha_data);
 #endif
@@ -8125,8 +8306,8 @@ Handler_share *handler::get_ha_share_ptr()
 void handler::set_ha_share_ptr(Handler_share *arg_ha_share)
 {
   DBUG_ENTER("handler::set_ha_share_ptr");
-  DBUG_ASSERT(ha_share);
-#ifndef DBUG_OFF
+  assert(ha_share);
+#ifndef NDEBUG
   if (table_share->tmp_table == NO_TMP_TABLE)
     mysql_mutex_assert_owner(&table_share->LOCK_ha_data);
 #endif
@@ -8142,7 +8323,7 @@ void handler::set_ha_share_ptr(Handler_share *arg_ha_share)
 
 void handler::lock_shared_ha_data()
 {
-  DBUG_ASSERT(table_share);
+  assert(table_share);
   if (table_share->tmp_table == NO_TMP_TABLE)
     mysql_mutex_lock(&table_share->LOCK_ha_data);
 }
@@ -8154,7 +8335,7 @@ void handler::lock_shared_ha_data()
 
 void handler::unlock_shared_ha_data()
 {
-  DBUG_ASSERT(table_share);
+  assert(table_share);
   if (table_share->tmp_table == NO_TMP_TABLE)
     mysql_mutex_unlock(&table_share->LOCK_ha_data);
 }
@@ -8203,9 +8384,9 @@ static void extract_blob_space_and_length_from_record_buff(const TABLE *table,
     {
       blob_len_ptr_array[num].length= (*vfield)->data_length();
       // TODO: The following check is only for Innodb.
-      DBUG_ASSERT(blob_len_ptr_array[num].length == 255 ||
-                  blob_len_ptr_array[num].length == 768 ||
-                  blob_len_ptr_array[num].length == 3073);
+      assert(blob_len_ptr_array[num].length == 255 ||
+             blob_len_ptr_array[num].length == 768 ||
+             blob_len_ptr_array[num].length == 3073);
 
       uchar *ptr;
       (*vfield)->get_ptr(&ptr);
@@ -8215,7 +8396,7 @@ static void extract_blob_space_and_length_from_record_buff(const TABLE *table,
       (*vfield)->reset();
 
       num++;
-      DBUG_ASSERT(num <= MAX_FIELDS);
+      assert(num <= MAX_FIELDS);
     }
   }
 }
@@ -8246,8 +8427,8 @@ static void copy_blob_data(const TABLE *table,
     if (bitmap_is_set(fields, (*vfield)->field_index) &&
         (*vfield)->is_virtual_gcol() && (*vfield)->type() == MYSQL_TYPE_BLOB)
     {
-      DBUG_ASSERT(blob_len_ptr_array[num].length > 0);
-      DBUG_ASSERT(blob_len_ptr_array[num].ptr != NULL);
+      assert(blob_len_ptr_array[num].length > 0);
+      assert(blob_len_ptr_array[num].ptr != NULL);
 
       /*
         Only copy as much of the blob as the storage engine has
@@ -8266,7 +8447,7 @@ static void copy_blob_data(const TABLE *table,
                             pointer_cast<char *>(blob_len_ptr_array[num].ptr),
                             length);
       num++;
-      DBUG_ASSERT(num <= MAX_FIELDS);
+      assert(num <= MAX_FIELDS);
     }
   }
 }
@@ -8294,8 +8475,8 @@ static bool my_eval_gcolumn_expr_helper(THD *thd, TABLE *table,
                                         bool in_purge)
 {
   DBUG_ENTER("my_eval_gcolumn_expr_helper");
-  DBUG_ASSERT(table && table->vfield);
-  DBUG_ASSERT(!thd->is_error());
+  assert(table && table->vfield);
+  assert(!thd->is_error());
 
   uchar *old_buf= table->record[0];
   repoint_field_to_record(table, old_buf, record);
@@ -8328,7 +8509,7 @@ static bool my_eval_gcolumn_expr_helper(THD *thd, TABLE *table,
   {
     Field *field= *vfield_ptr;
     // Validate that the field number is less than the bit map size
-    DBUG_ASSERT(field->field_index < fields->n_bits);
+    assert(field->field_index < fields->n_bits);
 
     if (bitmap_is_set(fields, field->field_index))
       bitmap_union(&fields_to_evaluate, &field->gcol_info->base_columns_map);
@@ -8359,11 +8540,11 @@ static bool my_eval_gcolumn_expr_helper(THD *thd, TABLE *table,
     if (bitmap_is_set(&fields_to_evaluate, field->field_index) &&
         field->is_virtual_gcol())
     {
-      DBUG_ASSERT(field->gcol_info && field->gcol_info->expr_item->fixed);
+      assert(field->gcol_info && field->gcol_info->expr_item->fixed);
 
       const type_conversion_status save_in_field_status=
         field->gcol_info->expr_item->save_in_field(field, 0);
-      DBUG_ASSERT(!thd->is_error() || save_in_field_status != TYPE_OK);
+      assert(!thd->is_error() || save_in_field_status != TYPE_OK);
 
       /*
         save_in_field() may return non-zero even if there was no
@@ -8420,7 +8601,7 @@ bool handler::my_prepare_gcolumn_template(THD *thd,
   bool was_truncated;
   build_table_filename(path, sizeof(path) - 1 - reg_ext_length,
                        db_name, table_name, "", 0, &was_truncated);
-  DBUG_ASSERT(!was_truncated);
+  assert(!was_truncated);
   lex_start(thd);
   bool rc= true;
 
@@ -8474,7 +8655,7 @@ bool handler::my_eval_gcolumn_expr_with_open(THD *thd,
   bool was_truncated;
   build_table_filename(path, sizeof(path) - 1 - reg_ext_length,
                        db_name, table_name, "", 0, &was_truncated);
-  DBUG_ASSERT(!was_truncated);
+  assert(!was_truncated);
 
   TABLE *table= open_table_uncached(thd, path, db_name, table_name,
                                     false, false);
@@ -8700,8 +8881,8 @@ bool set_tx_isolation(THD *thd,
 
   if (one_shot)
   {
-    DBUG_ASSERT(!thd->in_active_multi_stmt_transaction());
-    DBUG_ASSERT(!thd->in_sub_stmt);
+    assert(!thd->in_active_multi_stmt_transaction());
+    assert(!thd->in_sub_stmt);
     enum enum_tx_isol_level l;
     switch (thd->tx_isolation) {
     case ISO_READ_UNCOMMITTED:
@@ -8717,7 +8898,7 @@ bool set_tx_isolation(THD *thd,
       l= TX_ISOL_SERIALIZABLE;
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       return true;
     }
     if (tst)
@@ -8729,3 +8910,39 @@ bool set_tx_isolation(THD *thd,
   }
   return false;
 }
+
+
+/**
+  Checks if the file name is reserved word used by SE by invoking
+  the handlerton method.
+
+  @param  unused1       thread handler which is unused.
+  @param  plugin        SE plugin.
+  @param  name          Database name.
+
+  @retval true          If the name is reserved word.
+  @retval false         If the name is not reserved word.
+*/
+static my_bool is_reserved_db_name_handlerton(THD *unused1, plugin_ref plugin,
+                                              void *name)
+{
+  handlerton *hton= plugin_data<handlerton*>(plugin);
+  if (hton->state == SHOW_OPTION_YES && hton->is_reserved_db_name)
+    return (hton->is_reserved_db_name(hton, (const char *)name));
+  return false;
+}
+
+
+/**
+   Check if the file name is reserved word used by SE.
+
+   @param  name    Database name.
+
+   @retval true    If the name is a reserved word.
+   @retval false   If the name is not a reserved word.
+*/
+bool ha_check_reserved_db_name(const char* name)
+{
+  return (plugin_foreach(NULL, is_reserved_db_name_handlerton,
+                         MYSQL_STORAGE_ENGINE_PLUGIN, (char *)name));
+}
diff --git a/sql/handler.h b/sql/handler.h
index e787d4c3ebd0..490211e4a052 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -2,17 +2,23 @@
 #define HANDLER_INCLUDED
 
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -984,6 +990,16 @@ struct handlerton
              true on failure
   */
   bool (*rotate_encryption_master_key)(void);
+  /**
+    Check if the given database name is reserved.
+
+    @param  hton          Handlerton for SE.
+    @param  name          Database name.
+
+    @retval true          Database name is reserved by SE.
+    @retval false         Database name is not reserved.
+  */
+  bool (*is_reserved_db_name)(handlerton *hton, const char *name);
 
    uint32 license; /* Flag for Engine License */
    void *data; /* Location for engines to keep personal structures */
@@ -1030,6 +1046,12 @@ struct handlerton
 
 #define HTON_SUPPORTS_FOREIGN_KEYS   (1 << 11)
 
+// Engine supports packed keys.
+#define HTON_SUPPORTS_PACKED_KEYS    (1 << 12)
+
+// Engine supports table or tablespace encryption.
+#define HTON_SUPPORTS_TABLE_ENCRYPTION (1 << 13)
+
 enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
 			 ISO_REPEATABLE_READ, ISO_SERIALIZABLE};
 
@@ -1058,6 +1080,8 @@ enum enum_stats_auto_recalc { HA_STATS_AUTO_RECALC_DEFAULT= 0,
 
 typedef struct st_ha_create_information
 {
+  st_ha_create_information() { memset(this, 0, sizeof(*this)); }
+
   const CHARSET_INFO *table_charset, *default_table_charset;
   LEX_STRING connect_string;
   const char *password, *tablespace;
@@ -1153,6 +1177,7 @@ class inplace_alter_handler_ctx : public Sql_alloc
   inplace_alter_handler_ctx() {}
 
   virtual ~inplace_alter_handler_ctx() {}
+  virtual void set_shared_data(const inplace_alter_handler_ctx *ctx) {};
 };
 
 
@@ -1323,6 +1348,14 @@ class Alter_inplace_info
   // New/changed virtual generated column require validation
   static const HA_ALTER_FLAGS VALIDATE_VIRTUAL_COLUMN    = 1ULL << 41;
 
+  /**
+    Change in index length such that it does not require index rebuild.
+    For example, change in index length due to column expansion like
+    varchar(X) changed to varchar(X + N).
+  */
+  static const HA_ALTER_FLAGS ALTER_COLUMN_INDEX_LENGTH = 1ULL << 42;
+
+
   /**
     Create options (like MAX_ROWS) for the new version of table.
 
@@ -1748,7 +1781,7 @@ class Cost_estimate
   /// Multiply io, cpu and import costs by parameter
   void multiply(double m)
   {
-    DBUG_ASSERT(!is_max_cost());
+    assert(!is_max_cost());
 
     io_cost *= m;
     cpu_cost *= m;
@@ -1758,7 +1791,7 @@ class Cost_estimate
 
   Cost_estimate& operator+= (const Cost_estimate &other)
   {
-    DBUG_ASSERT(!is_max_cost() && !other.is_max_cost());
+    assert(!is_max_cost() && !other.is_max_cost());
 
     io_cost+= other.io_cost;
     cpu_cost+= other.cpu_cost;
@@ -1780,7 +1813,7 @@ class Cost_estimate
   {
     Cost_estimate result;
 
-    DBUG_ASSERT(!other.is_max_cost());
+    assert(!other.is_max_cost());
 
     result.io_cost= io_cost - other.io_cost;
     result.cpu_cost= cpu_cost - other.cpu_cost;
@@ -1802,28 +1835,28 @@ class Cost_estimate
   /// Add to IO cost
   void add_io(double add_io_cost)
   {
-    DBUG_ASSERT(!is_max_cost());
+    assert(!is_max_cost());
     io_cost+= add_io_cost;
   }
 
   /// Add to CPU cost
   void add_cpu(double add_cpu_cost)
   {
-    DBUG_ASSERT(!is_max_cost());
+    assert(!is_max_cost());
     cpu_cost+= add_cpu_cost;
   }
 
   /// Add to import cost
   void add_import(double add_import_cost)
   {
-    DBUG_ASSERT(!is_max_cost());
+    assert(!is_max_cost());
     import_cost+= add_import_cost;
   }
 
   /// Add to memory cost
   void add_mem(double add_mem_cost)
   {
-    DBUG_ASSERT(!is_max_cost());
+    assert(!is_max_cost());
     mem_cost+= add_mem_cost;
   }
 };
@@ -2187,6 +2220,11 @@ class handler :public Sql_alloc
     index conditions.
   */
   key_range *end_range;
+  /**
+    Flag which tells if #end_range contains a virtual generated column.
+    The content is invalid when #end_range is NULL.
+  */
+  bool m_virt_gcol_in_end_range;
   uint errkey;				/* Last dup key */
   uint key_used_on_scan;
   uint active_index;
@@ -2323,6 +2361,7 @@ class handler :public Sql_alloc
     estimation_rows_to_insert(0), ht(ht_arg),
     ref(0), range_scan_direction(RANGE_SCAN_ASC),
     in_range_check_pushed_down(false), end_range(NULL),
+    m_virt_gcol_in_end_range(false),
     key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
     ref_length(sizeof(my_off_t)),
     ft_handler(0), inited(NONE),
@@ -2342,11 +2381,11 @@ class handler :public Sql_alloc
     }
   virtual ~handler(void)
   {
-    DBUG_ASSERT(m_psi == NULL);
-    DBUG_ASSERT(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
-    DBUG_ASSERT(m_psi_locker == NULL);
-    DBUG_ASSERT(m_lock_type == F_UNLCK);
-    DBUG_ASSERT(inited == NONE);
+    assert(m_psi == NULL);
+    assert(m_psi_batch_mode == PSI_BATCH_MODE_NONE);
+    assert(m_psi_locker == NULL);
+    assert(m_lock_type == F_UNLCK);
+    assert(inited == NONE);
   }
   /* TODO: reorganize the methods and have proper public/protected/private qualifiers!!! */
   virtual handler *clone(const char *name, MEM_ROOT *mem_root);
@@ -2453,7 +2492,7 @@ class handler :public Sql_alloc
                                    uint child_table_name_len,
                                    char *child_key_name,
                                    uint child_key_name_len)
-  { DBUG_ASSERT(false); return(false); }
+  { assert(false); return(false); }
   virtual void change_table_ptr(TABLE *table_arg, TABLE_SHARE *share)
   {
     table= table_arg;
@@ -2673,9 +2712,9 @@ class handler :public Sql_alloc
     int error= records(num_rows);
     // A return value of HA_POS_ERROR was previously used to indicate error.
     if (error != 0)
-      DBUG_ASSERT(*num_rows == HA_POS_ERROR);
+      assert(*num_rows == HA_POS_ERROR);
     if (*num_rows == HA_POS_ERROR)
-      DBUG_ASSERT(error != 0);
+      assert(error != 0);
     if (error != 0)
     {
       /*
@@ -2712,7 +2751,7 @@ class handler :public Sql_alloc
   */
   virtual enum row_type get_row_type() const { return ROW_TYPE_NOT_USED; }
 
-  virtual const char *index_type(uint key_number) { DBUG_ASSERT(0); return "";}
+  virtual const char *index_type(uint key_number) { assert(0); return "";}
 
 
   /**
@@ -2748,7 +2787,7 @@ class handler :public Sql_alloc
   */
   virtual int exec_bulk_update(uint *dup_key_found)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return HA_ERR_WRONG_COMMAND;
   }
   /**
@@ -2764,7 +2803,7 @@ class handler :public Sql_alloc
   */
   virtual int end_bulk_delete()
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return HA_ERR_WRONG_COMMAND;
   }
 protected:
@@ -2863,7 +2902,7 @@ class handler :public Sql_alloc
   virtual int rnd_pos_by_record(uchar *record)
     {
       int error;
-      DBUG_ASSERT(table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
+      assert(table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
 
       error = ha_rnd_init(FALSE);
       if (error != 0)
@@ -2887,7 +2926,7 @@ class handler :public Sql_alloc
   virtual void position(const uchar *record)=0;
   virtual int info(uint)=0; // see my_base.h for full description
   virtual uint32 calculate_key_hash_value(Field **field_array)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
   virtual int extra(enum ha_extra_function operation)
   { return 0; }
   virtual int extra_opt(enum ha_extra_function operation, ulong cache_size)
@@ -2898,7 +2937,7 @@ class handler :public Sql_alloc
     @see HA_READ_BEFORE_WRITE_REMOVAL
   */
   virtual bool start_read_removal(void)
-  { DBUG_ASSERT(0); return false; }
+  { assert(0); return false; }
 
   /**
     End read (before write) removal and return the number of rows
@@ -2906,7 +2945,7 @@ class handler :public Sql_alloc
     @see HA_READ_BEFORE_WRITE_REMOVAL
   */
   virtual ha_rows end_read_removal(void)
-  { DBUG_ASSERT(0); return (ha_rows) 0; }
+  { assert(0); return (ha_rows) 0; }
 
   /**
     In an UPDATE or DELETE, if the row under the cursor was locked by another
@@ -3072,16 +3111,18 @@ class handler :public Sql_alloc
   {
     return std::min(MAX_KEY_LENGTH, max_supported_key_length());
   }
-  uint max_key_part_length() const
+  uint max_key_part_length(HA_CREATE_INFO *create_info) const
   {
-    return std::min(MAX_KEY_LENGTH, max_supported_key_part_length());
+    return std::min(MAX_KEY_LENGTH, max_supported_key_part_length(create_info));
   }
 
   virtual uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
   virtual uint max_supported_keys() const { return 0; }
   virtual uint max_supported_key_parts() const { return MAX_REF_PARTS; }
   virtual uint max_supported_key_length() const { return MAX_KEY_LENGTH; }
-  virtual uint max_supported_key_part_length() const { return 255; }
+  virtual uint max_supported_key_part_length(HA_CREATE_INFO
+                            *create_info MY_ATTRIBUTE((unused))) const
+  { return 255; }
   virtual uint min_record_length(uint options) const { return 1; }
 
   virtual bool low_byte_first() const { return 1; }
@@ -3548,6 +3589,11 @@ class handler :public Sql_alloc
   */
   virtual void use_hidden_primary_key();
 
+/**
+  A helper function to mark a transaction as noop_read_write if it is started.
+*/
+  void mark_trx_noop_dml();
+
 protected:
   /* Service methods for use by storage engines. */
   void ha_statistic_increment(ulonglong SSV::*offset) const;
@@ -3687,7 +3733,7 @@ class handler :public Sql_alloc
   */
   virtual int repair(THD* thd, HA_CHECK_OPT* check_opt)
   {
-    DBUG_ASSERT(!(ha_table_flags() & HA_CAN_REPAIR));
+    assert(!(ha_table_flags() & HA_CAN_REPAIR));
     return HA_ADMIN_NOT_IMPLEMENTED;
   }
   virtual void start_bulk_insert(ha_rows rows) {}
@@ -3721,7 +3767,7 @@ class handler :public Sql_alloc
   virtual int bulk_update_row(const uchar *old_data, uchar *new_data,
                               uint *dup_key_found)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return HA_ERR_WRONG_COMMAND;
   }
   /**
@@ -3776,8 +3822,8 @@ class handler :public Sql_alloc
 
   virtual bool set_ha_share_ref(Handler_share **arg_ha_share)
   {
-    DBUG_ASSERT(!ha_share);
-    DBUG_ASSERT(arg_ha_share);
+    assert(!ha_share);
+    assert(arg_ha_share);
     if (ha_share || !arg_ha_share)
       return true;
     ha_share= arg_ha_share;
@@ -3865,7 +3911,7 @@ class DsMrr_impl
     */
     if (h2)
       reset();
-    DBUG_ASSERT(h2 == NULL);
+    assert(h2 == NULL);
   }
   
   /*
@@ -3904,8 +3950,8 @@ class DsMrr_impl
 
   void init(handler *h_arg, TABLE *table_arg)
   {
-    DBUG_ASSERT(h_arg != NULL);
-    DBUG_ASSERT(table_arg != NULL);
+    assert(h_arg != NULL);
+    assert(table_arg != NULL);
     h= h_arg; 
     table= table_arg;
   }
@@ -4038,8 +4084,10 @@ int ha_discover(THD* thd, const char* dbname, const char* name,
 int ha_find_files(THD *thd,const char *db,const char *path,
                   const char *wild, bool dir, List<LEX_STRING>* files);
 int ha_table_exists_in_engine(THD* thd, const char* db, const char* name);
-bool ha_check_if_supported_system_table(handlerton *hton, const char* db, 
-                                        const char* table_name);
+bool ha_is_supported_system_table(handlerton *hton, const char *db,
+                                  const char *table_name);
+bool ha_is_valid_system_or_user_table(handlerton *hton, const char *db,
+                                      const char *table_name);
 
 /* key cache */
 extern "C" int ha_init_key_cache(const char *name, KEY_CACHE *key_cache);
@@ -4146,5 +4194,6 @@ int commit_owned_gtid_by_partial_command(THD *thd);
 bool set_tx_isolation(THD *thd,
                       enum_tx_isolation tx_isolation,
                       bool one_shot);
+bool ha_check_reserved_db_name(const char *name);
 
 #endif /* HANDLER_INCLUDED */
diff --git a/sql/hash_filo.h b/sql/hash_filo.h
index a899eed5f2ea..50d6931158e9 100644
--- a/sql/hash_filo.h
+++ b/sql/hash_filo.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -111,8 +118,8 @@ class hash_filo
       my_hash_search(&cache, key, length);
     if (entry)
     {						// Found; link it first
-      DBUG_ASSERT(first_link != NULL);
-      DBUG_ASSERT(last_link != NULL);
+      assert(first_link != NULL);
+      assert(last_link != NULL);
       if (entry != first_link)
       {						// Relink used-chain
 	if (entry == last_link)
@@ -122,13 +129,13 @@ class hash_filo
             The list must have at least 2 elements,
             otherwise entry would be equal to first_link.
           */
-          DBUG_ASSERT(last_link != NULL);
+          assert(last_link != NULL);
           last_link->next_used= NULL;
         }
 	else
 	{
-          DBUG_ASSERT(entry->next_used != NULL);
-          DBUG_ASSERT(entry->prev_used != NULL);
+          assert(entry->next_used != NULL);
+          assert(entry->prev_used != NULL);
 	  entry->next_used->prev_used = entry->prev_used;
 	  entry->prev_used->next_used = entry->next_used;
 	}
diff --git a/sql/hostname.cc b/sql/hostname.cc
index b6cf38d4c3ff..9fe430df6bf3 100644
--- a/sql/hostname.cc
+++ b/sql/hostname.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -174,7 +181,7 @@ static void prepare_hostname_cache_key(const char *ip_string,
                                        char *ip_key)
 {
   size_t ip_string_length= strlen(ip_string);
-  DBUG_ASSERT(ip_string_length < HOST_ENTRY_KEY_SIZE);
+  assert(ip_string_length < HOST_ENTRY_KEY_SIZE);
 
   memset(ip_key, 0, HOST_ENTRY_KEY_SIZE);
   memcpy(ip_key, ip_string, ip_string_length);
@@ -953,7 +960,7 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
       err_status=
         vio_get_normalized_ip_string(addr_info->ai_addr, addr_info->ai_addrlen,
                                      ip_buffer, sizeof (ip_buffer));
-      DBUG_ASSERT(!err_status);
+      assert(!err_status);
     }
 
     DBUG_PRINT("info", ("  - '%s'", ip_buffer));
@@ -995,12 +1002,12 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
     {
       char ip_buffer[HOST_ENTRY_KEY_SIZE];
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       bool err_status=
 #endif
         vio_get_normalized_ip_string(addr_info->ai_addr, addr_info->ai_addrlen,
                                      ip_buffer, sizeof (ip_buffer));
-      DBUG_ASSERT(!err_status);
+      assert(!err_status);
 
       sql_print_information(" - %s", ip_buffer);
     }
diff --git a/sql/hostname.h b/sql/hostname.h
index 159feb9408e3..f37a11b23b44 100644
--- a/sql/hostname.h
+++ b/sql/hostname.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/init.cc b/sql/init.cc
index efd8cf875e10..e49602e257af 100644
--- a/sql/init.cc
+++ b/sql/init.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/init.h b/sql/init.h
index ce1aceddb684..82bda3f9f1aa 100644
--- a/sql/init.h
+++ b/sql/init.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/inplace_vector.h b/sql/inplace_vector.h
index b5fdbed9c736..6813f54531d9 100644
--- a/sql/inplace_vector.h
+++ b/sql/inplace_vector.h
@@ -1,16 +1,23 @@
 #ifndef INPLACE_VECTOR_INCLUDED
 #define INPLACE_VECTOR_INCLUDED
 
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -70,17 +77,17 @@ class Inplace_vector
    */
   objtype *get_space(size_t index)
   {
-    DBUG_ASSERT(index <= m_obj_count);
+    assert(index <= m_obj_count);
     size_t arr_id= index / array_size;
     size_t slot_id= index % array_size;
     objtype *ptr= NULL;
 
-    DBUG_ASSERT(arr_id <= m_obj_arrays.size());
+    assert(arr_id <= m_obj_arrays.size());
 
     // Appending a new slot causes appending a new array.
     if (arr_id == m_obj_arrays.size())
     {
-      DBUG_ASSERT(slot_id == 0);
+      assert(slot_id == 0);
       if (m_outof_mem)
         return NULL;
       append_new_array();
@@ -138,7 +145,7 @@ class Inplace_vector
    */
   objtype *get_object(size_t index)
   {
-    DBUG_ASSERT(index < m_obj_count);
+    assert(index < m_obj_count);
     return get_space(index);
   }
 
@@ -256,7 +263,7 @@ class Inplace_vector
     */
   const objtype &back() const
   {
-    DBUG_ASSERT(size() > 0);
+    assert(size() > 0);
     objtype *p= get_object(size() - 1);
     return *p;
   }
@@ -267,7 +274,7 @@ class Inplace_vector
     */
   objtype &back()
   {
-    DBUG_ASSERT(size() > 0);
+    assert(size() > 0);
     objtype *p= get_object(size() - 1);
     return *p;
   }
@@ -280,7 +287,7 @@ class Inplace_vector
     */
   const objtype &operator[](size_t i) const
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     objtype *p= get_object(i);
     return *p;
   }
@@ -293,7 +300,7 @@ class Inplace_vector
     */
   objtype &operator[](size_t i)
   {
-    DBUG_ASSERT(i < size());
+    assert(i < size());
     objtype *p= get_object(i);
     return *p;
   }
diff --git a/sql/item.cc b/sql/item.cc
index 243d82920459..99a4c8293d5f 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -222,7 +229,7 @@ bool Item::val_bool()
     return val_real() != 0.0;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;                                   // Wrong (but safe)
   }
 }
@@ -238,7 +245,7 @@ bool Item::val_bool()
 */
 String *Item::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(str != &str_value);
+  assert(str != &str_value);
   
   uint errors;
   String *res= val_str(&str_value);
@@ -290,7 +297,7 @@ String *Item::val_string_from_decimal(String *str)
 
 String *Item::val_string_from_datetime(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_date(&ltime, TIME_FUZZY_DATE) ||
       (null_value= str->alloc(MAX_DATE_STRING_REP_LENGTH)))
@@ -302,7 +309,7 @@ String *Item::val_string_from_datetime(String *str)
 
 String *Item::val_string_from_date(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_date(&ltime, TIME_FUZZY_DATE) ||
       (null_value= str->alloc(MAX_DATE_STRING_REP_LENGTH)))
@@ -314,7 +321,7 @@ String *Item::val_string_from_date(String *str)
 
 String *Item::val_string_from_time(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_time(&ltime) || (null_value= str->alloc(MAX_DATE_STRING_REP_LENGTH)))
     return (String *) 0;
@@ -366,7 +373,7 @@ my_decimal *Item::val_decimal_from_string(my_decimal *decimal_value)
 
 my_decimal *Item::val_decimal_from_date(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_date(&ltime, TIME_FUZZY_DATE))
   {
@@ -384,7 +391,7 @@ my_decimal *Item::val_decimal_from_date(my_decimal *decimal_value)
 
 my_decimal *Item::val_decimal_from_time(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_time(&ltime))
   {
@@ -449,7 +456,7 @@ longlong Item::val_temporal_with_round(enum_field_types type, uint8 dec)
         return nr;
       }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
@@ -485,7 +492,7 @@ longlong Item::val_int_from_decimal()
 
 longlong Item::val_int_from_time()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_time(&ltime) ?
          0LL : (ltime.neg ? -1 : 1) * TIME_to_ulonglong_time_round(&ltime);
@@ -494,7 +501,7 @@ longlong Item::val_int_from_time()
 
 longlong Item::val_int_from_date()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_date(&ltime, TIME_FUZZY_DATE) ?
          0LL : (longlong) TIME_to_ulonglong_date(&ltime);
@@ -503,7 +510,7 @@ longlong Item::val_int_from_date()
 
 longlong Item::val_int_from_datetime()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_date(&ltime, TIME_FUZZY_DATE) ?
          0LL: (longlong) TIME_to_ulonglong_datetime_round(&ltime);
@@ -570,9 +577,9 @@ Item::Item():
   with_stored_program(false), tables_locked_cache(false),
   is_parser_item(false)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   contextualized= true;
-#endif//DBUG_OFF
+#endif//NDEBUG
 
   maybe_null=null_value=with_sum_func=unsigned_flag=0;
   decimals= 0; max_length= 0;
@@ -653,10 +660,10 @@ Item::Item(THD *thd, Item *item):
   tables_locked_cache(item->tables_locked_cache),
   is_parser_item(false)
 {
-#ifndef DBUG_OFF
-  DBUG_ASSERT(item->contextualized);
+#ifndef NDEBUG
+  assert(item->contextualized);
   contextualized= true;
-#endif//DBUG_OFF
+#endif//NDEBUG
 
   next= thd->free_list;				// Put in free list
   thd->free_list= this;
@@ -697,7 +704,7 @@ uint Item::time_precision()
     MYSQL_TIME ltime;
     String buf, *tmp;
     MYSQL_TIME_STATUS status;
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     // Nanosecond rounding is not needed, for performance purposes
     if ((tmp= val_str(&buf)) &&
         str_to_time(tmp, &ltime, TIME_NO_NSEC_ROUNDING, &status) == 0)
@@ -714,7 +721,7 @@ uint Item::datetime_precision()
     MYSQL_TIME ltime;
     String buf, *tmp;
     MYSQL_TIME_STATUS status;
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     // Nanosecond rounding is not needed, for performance purposes
     if ((tmp= val_str(&buf)) &&
         !str_to_datetime(tmp, &ltime, TIME_NO_NSEC_ROUNDING | TIME_FUZZY_DATE,
@@ -766,7 +773,7 @@ void Item::print_for_order(String *str,
     str->append("?");
   else if (used_alias)
   {
-    DBUG_ASSERT(item_name.is_set());
+    assert(item_name.is_set());
     // In the clause, user has referenced expression using an alias; we use it
     append_identifier(current_thd, str, item_name);
   }
@@ -867,7 +874,7 @@ void Item::rename(char *new_name)
 
 Item* Item::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   return (this->*transformer)(arg);
 }
@@ -1038,7 +1045,7 @@ bool Item_field::check_gcol_func_processor(uchar *int_arg)
 {
   int *args= reinterpret_cast<int *>(int_arg);
   int fld_idx= args[0];
-  DBUG_ASSERT(field);
+  assert(field);
   // Don't allow GC to refer itself or another GC that is defined after it.
   if (field->gcol_info && field->field_index >= fld_idx)
   {
@@ -1450,7 +1457,7 @@ bool Item::get_date_from_time(MYSQL_TIME *ltime)
    MYSQL_TIME tm;
    if (get_time(&tm))
    {
-     DBUG_ASSERT(null_value);
+     assert(null_value);
      return true;
    }
    time_to_datetime(current_thd, &tm, ltime);
@@ -1470,7 +1477,7 @@ bool Item::get_date_from_numeric(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
     return get_date_from_int(ltime, fuzzydate);
   case STRING_RESULT:
   case ROW_RESULT:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return (null_value= true);  // Impossible result_type
 }
@@ -1484,7 +1491,7 @@ bool Item::get_date_from_numeric(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 bool Item::get_date_from_non_temporal(MYSQL_TIME *ltime,
                                       my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(!is_temporal());
+  assert(!is_temporal());
   switch (result_type())
   {
   case STRING_RESULT:
@@ -1496,7 +1503,7 @@ bool Item::get_date_from_non_temporal(MYSQL_TIME *ltime,
   case INT_RESULT:
     return get_date_from_int(ltime, fuzzydate);
   case ROW_RESULT:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return (null_value= true);  // Impossible result_type
 }
@@ -1541,7 +1548,7 @@ bool Item::get_time_from_decimal(MYSQL_TIME *ltime)
 
 bool Item::get_time_from_int(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(!is_temporal());
+  assert(!is_temporal());
   longlong value= val_int();
   if (null_value)
   {
@@ -1554,7 +1561,7 @@ bool Item::get_time_from_int(MYSQL_TIME *ltime)
 
 bool Item::get_time_from_date(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (get_date(ltime, TIME_FUZZY_DATE)) // Need this check if NULL value
     return true;
   set_zero_time(ltime, MYSQL_TIMESTAMP_TIME);
@@ -1564,7 +1571,7 @@ bool Item::get_time_from_date(MYSQL_TIME *ltime)
 
 bool Item::get_time_from_datetime(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (get_date(ltime, TIME_FUZZY_DATE))
     return true;
   datetime_to_time(ltime);
@@ -1574,7 +1581,7 @@ bool Item::get_time_from_datetime(MYSQL_TIME *ltime)
 
 bool Item::get_time_from_numeric(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(!is_temporal());
+  assert(!is_temporal());
   switch (result_type())
   {
   case REAL_RESULT:
@@ -1585,7 +1592,7 @@ bool Item::get_time_from_numeric(MYSQL_TIME *ltime)
     return get_time_from_int(ltime);
   case STRING_RESULT:
   case ROW_RESULT:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return (null_value= true); // Impossible result type
 }
@@ -1601,7 +1608,7 @@ bool Item::get_time_from_numeric(MYSQL_TIME *ltime)
 
 bool Item::get_time_from_non_temporal(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(!is_temporal());
+  assert(!is_temporal());
   switch (result_type())
   {
   case STRING_RESULT:
@@ -1613,7 +1620,7 @@ bool Item::get_time_from_non_temporal(MYSQL_TIME *ltime)
   case INT_RESULT:
     return get_time_from_int(ltime);
   case ROW_RESULT:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return (null_value= true); // Impossible result type
 }
@@ -1688,7 +1695,7 @@ Item::save_in_field_no_warnings(Field *field, bool no_conversions)
 
 bool Item::is_blob_field() const
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
 
   enum_field_types type= field_type();
   return (type == MYSQL_TYPE_BLOB || type == MYSQL_TYPE_GEOMETRY ||
@@ -1703,7 +1710,7 @@ bool Item::is_blob_field() const
 
 Item_sp_variable::Item_sp_variable(const Name_string sp_var_name)
   :m_thd(0), m_name(sp_var_name)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
    , m_sp(0)
 #endif
 {
@@ -1717,7 +1724,7 @@ bool Item_sp_variable::fix_fields(THD *thd, Item **)
   m_thd= thd; /* NOTE: this must be set before any this_xxx() */
   it= this_item();
 
-  DBUG_ASSERT(it->fixed);
+  assert(it->fixed);
 
   max_length= it->max_length;
   decimals= it->decimals;
@@ -1731,7 +1738,7 @@ bool Item_sp_variable::fix_fields(THD *thd, Item **)
 
 double Item_sp_variable::val_real()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   double ret= it->val_real();
   null_value= it->null_value;
@@ -1741,7 +1748,7 @@ double Item_sp_variable::val_real()
 
 longlong Item_sp_variable::val_int()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   longlong ret= it->val_int();
   null_value= it->null_value;
@@ -1751,7 +1758,7 @@ longlong Item_sp_variable::val_int()
 
 String *Item_sp_variable::val_str(String *sp)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   String *res= it->val_str(sp);
 
@@ -1787,7 +1794,7 @@ String *Item_sp_variable::val_str(String *sp)
 
 my_decimal *Item_sp_variable::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   my_decimal *val= it->val_decimal(decimal_value);
   null_value= it->null_value;
@@ -1797,7 +1804,7 @@ my_decimal *Item_sp_variable::val_decimal(my_decimal *decimal_value)
 
 bool Item_sp_variable::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   return (null_value= it->get_date(ltime, fuzzydate));
 }
@@ -1805,7 +1812,7 @@ bool Item_sp_variable::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_sp_variable::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Item *it= this_item();
   return (null_value= it->get_time(ltime));
 }
@@ -1842,7 +1849,7 @@ Item_splocal::Item_splocal(const Name_string sp_var_name,
 Item *
 Item_splocal::this_item()
 {
-  DBUG_ASSERT(m_sp == m_thd->sp_runtime_ctx->sp);
+  assert(m_sp == m_thd->sp_runtime_ctx->sp);
 
   return m_thd->sp_runtime_ctx->get_item(m_var_idx);
 }
@@ -1850,7 +1857,7 @@ Item_splocal::this_item()
 const Item *
 Item_splocal::this_item() const
 {
-  DBUG_ASSERT(m_sp == m_thd->sp_runtime_ctx->sp);
+  assert(m_sp == m_thd->sp_runtime_ctx->sp);
 
   return m_thd->sp_runtime_ctx->get_item(m_var_idx);
 }
@@ -1859,7 +1866,7 @@ Item_splocal::this_item() const
 Item **
 Item_splocal::this_item_addr(THD *thd, Item **)
 {
-  DBUG_ASSERT(m_sp == thd->sp_runtime_ctx->sp);
+  assert(m_sp == thd->sp_runtime_ctx->sp);
 
   return thd->sp_runtime_ctx->get_item_addr(m_var_idx);
 }
@@ -1867,7 +1874,10 @@ Item_splocal::this_item_addr(THD *thd, Item **)
 
 bool Item_splocal::val_json(Json_wrapper *result)
 {
-  return this_item()->val_json(result);
+  Item *it= this_item();
+  bool ret= it->val_json(result);
+  null_value= it->null_value;
+  return ret;
 }
 
 
@@ -1900,7 +1910,7 @@ Item_case_expr::Item_case_expr(uint case_expr_id)
 Item *
 Item_case_expr::this_item()
 {
-  DBUG_ASSERT(m_sp == m_thd->sp_runtime_ctx->sp);
+  assert(m_sp == m_thd->sp_runtime_ctx->sp);
 
   return m_thd->sp_runtime_ctx->get_case_expr(m_case_expr_id);
 }
@@ -1910,7 +1920,7 @@ Item_case_expr::this_item()
 const Item *
 Item_case_expr::this_item() const
 {
-  DBUG_ASSERT(m_sp == m_thd->sp_runtime_ctx->sp);
+  assert(m_sp == m_thd->sp_runtime_ctx->sp);
 
   return m_thd->sp_runtime_ctx->get_case_expr(m_case_expr_id);
 }
@@ -1919,7 +1929,7 @@ Item_case_expr::this_item() const
 Item **
 Item_case_expr::this_item_addr(THD *thd, Item **)
 {
-  DBUG_ASSERT(m_sp == thd->sp_runtime_ctx->sp);
+  assert(m_sp == thd->sp_runtime_ctx->sp);
 
   return thd->sp_runtime_ctx->get_case_expr_addr(m_case_expr_id);
 }
@@ -1940,7 +1950,7 @@ void Item_case_expr::print(String *str, enum_query_type)
 
 double Item_name_const::val_real()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   double ret= value_item->val_real();
   null_value= value_item->null_value;
   return ret;
@@ -1949,7 +1959,7 @@ double Item_name_const::val_real()
 
 longlong Item_name_const::val_int()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   longlong ret= value_item->val_int();
   null_value= value_item->null_value;
   return ret;
@@ -1958,7 +1968,7 @@ longlong Item_name_const::val_int()
 
 String *Item_name_const::val_str(String *sp)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   String *ret= value_item->val_str(sp);
   null_value= value_item->null_value;
   return ret;
@@ -1967,7 +1977,7 @@ String *Item_name_const::val_str(String *sp)
 
 my_decimal *Item_name_const::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   my_decimal *val= value_item->val_decimal(decimal_value);
   null_value= value_item->null_value;
   return val;
@@ -1976,14 +1986,14 @@ my_decimal *Item_name_const::val_decimal(my_decimal *decimal_value)
 
 bool Item_name_const::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   return (null_value= value_item->get_date(ltime, fuzzydate));
 }
 
 
 bool Item_name_const::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   return (null_value= value_item->get_time(ltime));
 }
 
@@ -2084,8 +2094,8 @@ Item::Type Item_name_const::type() const
       a simple constant item or a NEG_FUNC/COLLATE_FUNC.
     */
     Item_func *func= down_cast<Item_func *>(value_item);
-    DBUG_ASSERT(func->functype() == Item_func::NEG_FUNC ||
-                func->functype() == Item_func::COLLATE_FUNC);
+    assert(func->functype() == Item_func::NEG_FUNC ||
+           func->functype() == Item_func::COLLATE_FUNC);
     return func->key_item()->type();
   }
   return value_type;
@@ -2112,7 +2122,8 @@ bool Item_name_const::fix_fields(THD *thd, Item **ref)
   {
     item_name.copy(tmp->ptr(), (uint) tmp->length(), system_charset_info);
   }
-  collation.set(value_item->collation.collation, DERIVATION_IMPLICIT,
+  collation.set(value_item->collation.collation,
+                value_item->collation.derivation,
                 value_item->collation.repertoire);
   max_length= value_item->max_length;
   decimals= value_item->decimals;
@@ -2247,6 +2258,12 @@ left_is_superset(DTCollation *left, DTCollation *right)
           left->collation->mbmaxlen > right->collation->mbmaxlen &&
           left->collation->mbminlen == right->collation->mbminlen)))))
     return TRUE;
+  /* Allow convert from any Unicode to utf32 or utf8mb4 */
+  if (test_all_bits(left->collation->state,
+                    MY_CS_UNICODE | MY_CS_UNICODE_SUPPLEMENT) &&
+      right->collation->state & MY_CS_UNICODE &&
+      left->derivation == right->derivation)
+    return true;
   /* Allow convert from ASCII */
   if (right->repertoire == MY_REPERTOIRE_ASCII &&
       (left->derivation < right->derivation ||
@@ -2734,9 +2751,6 @@ bool Item_field::itemize(Parse_context *pc, Item **res)
   if (select->parsing_place != CTX_HAVING)
     select->select_n_where_fields++;
 
-  if (select->parsing_place == CTX_SELECT_LIST &&
-      field_name && field_name[0] == '*' && field_name[1] == 0)
-    select->with_wild++;
   return false;
 }
 
@@ -2816,7 +2830,7 @@ adjust_max_effective_column_length(Field *field_par, uint32 max_length)
 void Item_field::set_field(Field *field_par)
 {
   table_ref= field_par->table->pos_in_table_list;
-  DBUG_ASSERT(!table_ref || table_ref->table == field_par->table);
+  assert(!table_ref || table_ref->table == field_par->table);
 
   field=result_field=field_par;			// for easy coding with fields
   maybe_null= field->maybe_null() || field->is_tmp_nullable();
@@ -2933,7 +2947,7 @@ void Item_ident::print(String *str, enum_query_type query_type,
 /* ARGSUSED */
 String *Item_field::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((null_value=field->is_null()))
     return 0;
   str->set_charset(str_value.charset());
@@ -2943,8 +2957,8 @@ String *Item_field::val_str(String *str)
 
 bool Item_field::val_json(Json_wrapper *result)
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT(field_type() == MYSQL_TYPE_JSON);
+  assert(fixed);
+  assert(field_type() == MYSQL_TYPE_JSON);
   null_value= field->is_null();
   if (null_value)
     return false;
@@ -2954,7 +2968,7 @@ bool Item_field::val_json(Json_wrapper *result)
 
 double Item_field::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((null_value=field->is_null()))
     return 0.0;
   return field->val_real();
@@ -2963,7 +2977,7 @@ double Item_field::val_real()
 
 longlong Item_field::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((null_value=field->is_null()))
     return 0;
   return field->val_int();
@@ -2972,7 +2986,7 @@ longlong Item_field::val_int()
 
 longlong Item_field::val_time_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((null_value= field->is_null()))
     return 0;
   return field->val_time_temporal();
@@ -2981,7 +2995,7 @@ longlong Item_field::val_time_temporal()
 
 longlong Item_field::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((null_value= field->is_null()))
     return 0;
   return field->val_date_temporal();
@@ -3100,7 +3114,7 @@ bool Item_field::val_bool_result()
     return result_field->val_real() != 0.0;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;                                   // Shut up compiler
   }
 }
@@ -3155,7 +3169,7 @@ bool Item_field::used_tables_for_level(uchar *arg)
 {
   TABLE_LIST *tr= field->table->pos_in_table_list;
   // Used by resolver only, so can never reach a "const" table.
-  DBUG_ASSERT(!tr->table->const_table);
+  assert(!tr->table->const_table);
   Used_tables *const ut= pointer_cast<Used_tables *>(arg);
   /*
     When the qualifying query for the field (table_ref->select_lex) is the same
@@ -3185,12 +3199,12 @@ void Item_ident::fix_after_pullout(st_select_lex *parent_select,
   */
   if (context == NULL)
   {
-    DBUG_ASSERT(type() == FIELD_ITEM);
+    assert(type() == FIELD_ITEM);
     return;
   }
 
   // context->select_lex should already have been updated.
-  DBUG_ASSERT(context->select_lex != removed_select);
+  assert(context->select_lex != removed_select);
 
   if (context->select_lex == parent_select)
   {
@@ -3287,7 +3301,7 @@ my_decimal *Item_int::val_decimal(my_decimal *decimal_value)
 String *Item_int::val_str(String *str)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   str->set_int(value, unsigned_flag, collation.collation);
   return str;
 }
@@ -3320,7 +3334,7 @@ void Item_int::print(String *str, enum_query_type query_type)
 String *Item_uint::val_str(String *str)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   str->set((ulonglong) value, collation.collation);
   return str;
 }
@@ -3478,7 +3492,7 @@ void Item_decimal::set_decimal_value(my_decimal *value_par)
 String *Item_float::val_str(String *str)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   str->set_real(value,decimals,&my_charset_bin);
   return str;
 }
@@ -3487,7 +3501,7 @@ String *Item_float::val_str(String *str)
 my_decimal *Item_float::val_decimal(my_decimal *decimal_value)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double2my_decimal(E_DEC_FATAL_ERROR, value, decimal_value);
   return (decimal_value);
 }
@@ -3589,7 +3603,7 @@ double_from_string_with_check (const CHARSET_INFO *cs,
 
 double Item_string::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return double_from_string_with_check (str_value.charset(), str_value.ptr(), 
                                         (char *) str_value.ptr() + str_value.length());
 }
@@ -3628,7 +3642,7 @@ longlong_from_string_with_check (const CHARSET_INFO *cs,
 */
 longlong Item_string::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return longlong_from_string_with_check(str_value.charset(), str_value.ptr(),
                              (char *) str_value.ptr()+ str_value.length());
 }
@@ -3658,14 +3672,14 @@ bool Item_null::eq(const Item *item, bool binary_cmp) const
 double Item_null::val_real()
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=1;
   return 0.0;
 }
 longlong Item_null::val_int()
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=1;
   return 0;
 }
@@ -3673,7 +3687,7 @@ longlong Item_null::val_int()
 String *Item_null::val_str(String *str)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=1;
   return 0;
 }
@@ -3744,7 +3758,7 @@ bool Item_param::itemize(Parse_context *pc, Item **res)
   /*
     see commentaries in PTI_limit_option_param_marker::itemize()
   */
-  DBUG_ASSERT(*res == this);
+  assert(*res == this);
 
   LEX *lex= pc->thd->lex;
   if (! lex->parsing_options.allows_variable)
@@ -3752,7 +3766,7 @@ bool Item_param::itemize(Parse_context *pc, Item **res)
     my_error(ER_VIEW_SELECT_VARIABLE, MYF(0));
     return true;
   }
-  return lex->param_list.push_back(this);
+  return false;
 }
 
 
@@ -3998,7 +4012,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
       break;
     }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       set_null();
     }
   }
@@ -4040,7 +4054,7 @@ void Item_param::reset()
     contain a literal of some kind.
     In all other cases when this object is accessed its value is
     set (this assumption is guarded by 'state' and
-    DBUG_ASSERTS(state != NO_VALUE) in all Item_param::get_*
+    assertS(state != NO_VALUE) in all Item_param::get_*
     methods).
   */
   DBUG_VOID_RETURN;
@@ -4070,7 +4084,7 @@ Item_param::save_in_field_inner(Field *field, bool no_conversions)
     return set_field_to_null_with_conversions(field, no_conversions);
   case NO_VALUE:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return TYPE_ERR_BAD_VALUE;
 }
@@ -4134,7 +4148,7 @@ double Item_param::val_real()
   case NULL_VALUE:
     return 0.0;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0.0;
 } 
@@ -4165,7 +4179,7 @@ longlong Item_param::val_int()
   case NULL_VALUE:
     return 0; 
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0;
 }
@@ -4191,7 +4205,7 @@ my_decimal *Item_param::val_decimal(my_decimal *dec)
   case NULL_VALUE:
     return 0; 
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0;
 }
@@ -4226,7 +4240,7 @@ String *Item_param::val_str(String* str)
   case NULL_VALUE:
     return NULL; 
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return str;
 }
@@ -4288,7 +4302,7 @@ const String *Item_param::query_val_str(THD *thd, String* str) const
   case NULL_VALUE:
     return &my_null_string;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return str;
 }
@@ -4370,7 +4384,7 @@ Item_param::clone_item()
     break;
   case NO_VALUE:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   };
   return 0;
 }
@@ -4543,7 +4557,7 @@ Item_param::set_value(THD *thd, sp_rcontext *ctx, Item **it)
   default:
     /* That can not happen. */
 
-    DBUG_ASSERT(TRUE);  // Abort in debug mode.
+    assert(TRUE);  // Abort in debug mode.
 
     set_null();         // Set to NULL in release mode.
     item_type= Item::NULL_ITEM;
@@ -4642,7 +4656,7 @@ Item_copy *Item_copy::create (Item *item)
     case DECIMAL_RESULT:
       return new Item_copy_decimal (item);
     default:
-      DBUG_ASSERT (0);
+      assert (0);
   }
   /* should not happen */
   return NULL;
@@ -5023,17 +5037,17 @@ bool Item_copy_decimal::copy(const THD *thd)
 /* ARGSUSED */
 bool Item::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(is_contextualized());
+  assert(is_contextualized());
 
   // We do not check fields which are fixed during construction
-  DBUG_ASSERT(fixed == 0 || basic_const_item());
+  assert(fixed == 0 || basic_const_item());
   fixed= 1;
   return FALSE;
 }
 
 double Item_ref_null_helper::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double tmp= (*ref)->val_result();
   owner->was_null|= null_value= (*ref)->null_value;
   return tmp;
@@ -5042,7 +5056,7 @@ double Item_ref_null_helper::val_real()
 
 longlong Item_ref_null_helper::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong tmp= (*ref)->val_int_result();
   owner->was_null|= null_value= (*ref)->null_value;
   return tmp;
@@ -5051,8 +5065,8 @@ longlong Item_ref_null_helper::val_int()
 
 longlong Item_ref_null_helper::val_time_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert(fixed == 1);
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_time_temporal_result();
   owner->was_null|= null_value= (*ref)->null_value;
   return tmp;
@@ -5061,8 +5075,8 @@ longlong Item_ref_null_helper::val_time_temporal()
 
 longlong Item_ref_null_helper::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert(fixed == 1);
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_date_temporal_result();
   owner->was_null|= null_value= (*ref)->null_value;
   return tmp;
@@ -5071,7 +5085,7 @@ longlong Item_ref_null_helper::val_date_temporal()
 
 my_decimal *Item_ref_null_helper::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   my_decimal *val= (*ref)->val_decimal_result(decimal_value);
   owner->was_null|= null_value= (*ref)->null_value;
   return val;
@@ -5080,7 +5094,7 @@ my_decimal *Item_ref_null_helper::val_decimal(my_decimal *decimal_value)
 
 bool Item_ref_null_helper::val_bool()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   bool val= (*ref)->val_bool_result();
   owner->was_null|= null_value= (*ref)->null_value;
   return val;
@@ -5089,7 +5103,7 @@ bool Item_ref_null_helper::val_bool()
 
 String* Item_ref_null_helper::val_str(String* s)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String* tmp= (*ref)->str_result(s);
   owner->was_null|= null_value= (*ref)->null_value;
   return tmp;
@@ -5132,7 +5146,7 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
     we set depended_from for it.
   */
   resolved_item->depended_from= last;
-  DBUG_ASSERT(resolved_item->context->select_lex == current);
+  assert(resolved_item->context->select_lex == current);
 
   current->mark_as_dependent(last);
   if (thd->lex->describe)
@@ -5266,7 +5280,7 @@ static Item** find_field_in_group_list(Item *find_item, ORDER *group_list)
     db_name= name_buff;
   }
 
-  DBUG_ASSERT(field_name != 0);
+  assert(field_name != 0);
 
   for (ORDER *cur_group= group_list ; cur_group ; cur_group= cur_group->next)
   {
@@ -5275,7 +5289,7 @@ static Item** find_field_in_group_list(Item *find_item, ORDER *group_list)
       cur_field= (Item_ident*) *cur_group->item;
       cur_match_degree= 0;
       
-      DBUG_ASSERT(cur_field->field_name != 0);
+      assert(cur_field->field_name != 0);
 
       if (!my_strcasecmp(system_charset_info,
                          cur_field->field_name, field_name))
@@ -5335,10 +5349,10 @@ static Item** find_field_in_group_list(Item *find_item, ORDER *group_list)
 
   @return Whether or not the item is a fixed item or an Item_outer_ref
 
-  @note Currently, this function is only used in DBUG_ASSERT
+  @note Currently, this function is only used in assert
   statements and therefore not included in optimized builds.
 */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 bool is_fixed_or_outer_ref(const Item *ref)
 {
   /*
@@ -5431,7 +5445,7 @@ resolve_ref_in_select_and_group(THD *thd, Item_ident *ref, SELECT_LEX *select)
   {
     if (select_ref != not_found_item && !ambiguous_fields)
     {
-      DBUG_ASSERT(*select_ref != 0);
+      assert(*select_ref != 0);
       if (!select->ref_pointer_array[counter])
       {
         my_error(ER_ILLEGAL_REFERENCE, MYF(0),
@@ -5442,13 +5456,13 @@ resolve_ref_in_select_and_group(THD *thd, Item_ident *ref, SELECT_LEX *select)
        Assert if its an incorrect reference . We do not assert if its a outer
        reference, as they get fixed later in fix_innner_refs function.
       */
-      DBUG_ASSERT(is_fixed_or_outer_ref(*select_ref));
+      assert(is_fixed_or_outer_ref(*select_ref));
 
       return &select->ref_pointer_array[counter];
     }
     if (group_by_ref)
       return group_by_ref;
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return NULL; /* So there is no compiler warning. */
   }
 
@@ -5669,7 +5683,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
           Either the item we found is already fixed, or it is an outer
           reference that will be fixed later in fix_inner_refs().
         */
-        DBUG_ASSERT(is_fixed_or_outer_ref(*ref));
+        assert(is_fixed_or_outer_ref(*ref));
         prev_subselect_item->used_tables_cache|= (*ref)->used_tables();
         prev_subselect_item->const_item_cache&= (*ref)->const_item();
         break;
@@ -5685,7 +5699,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
     prev_subselect_item->const_item_cache= 0;
   }
 
-  DBUG_ASSERT(ref != 0);
+  assert(ref != 0);
   if (!*from_field)
     return -1;
   if (ref == not_found_item && *from_field == not_found_field)
@@ -5713,7 +5727,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
     Item_ref *rf;
 
     /* Should have been checked in resolve_ref_in_select_and_group(). */
-    DBUG_ASSERT(is_fixed_or_outer_ref(*ref));
+    assert(is_fixed_or_outer_ref(*ref));
     /*
       Here, a subset of actions performed by Item_ref::set_properties
       is not enough. So we pass ptr to NULL into Item_[direct]_ref
@@ -5747,7 +5761,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
       rf is Item_ref => never substitute other items (in this case)
       during fix_fields() => we can use rf after fix_fields()
     */
-    DBUG_ASSERT(!rf->fixed);                // Assured by Item_ref()
+    assert(!rf->fixed);                // Assured by Item_ref()
     if (rf->fix_fields(thd, reference) || rf->check_cols(1))
       return -1;
 
@@ -5774,7 +5788,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
         rf is Item_ref => never substitute other items (in this case)
         during fix_fields() => we can use rf after fix_fields()
       */
-      DBUG_ASSERT(!rf->fixed);                // Assured by Item_ref()
+      assert(!rf->fixed);                // Assured by Item_ref()
       if (rf->fix_fields(thd, reference) || rf->check_cols(1))
         return -1;
       return 0;
@@ -5831,7 +5845,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
 
 bool Item_field::fix_fields(THD *thd, Item **reference)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   Field *from_field= not_found_field;
   bool outer_fixed= false;
 
@@ -5974,9 +5988,9 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
       Even if a view reference is found, the level is still the query block
       associated with the context of the current item:
     */
-    DBUG_ASSERT(from_field != view_ref_found ||
-                context->select_lex ==
-                dynamic_cast<Item_ident *>(*reference)->context->select_lex);
+    assert(from_field != view_ref_found ||
+           context->select_lex ==
+           dynamic_cast<Item_ident *>(*reference)->context->select_lex);
     if (thd->lex->in_sum_func &&
         thd->lex->in_sum_func->nest_level == context->select_lex->nest_level)
       set_if_bigger(thd->lex->in_sum_func->max_arg_level,
@@ -6005,7 +6019,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
       other_bitmap=   table->read_set;
     }
     if (!bitmap_fast_test_and_set(current_bitmap, field->field_index))
-      DBUG_ASSERT(bitmap_is_set(other_bitmap, field->field_index));
+      assert(bitmap_is_set(other_bitmap, field->field_index));
   }
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (any_privileges)
@@ -6173,16 +6187,15 @@ static void convert_zerofill_number_to_string(Item **item, Field_num *field)
 
 
 /**
-  Set a pointer to the multiple equality the field reference belongs to
-  (if any).
+  If field matches a multiple equality, set a pointer to that object in the
+  field. Also return a pointer to a constant value that can be substituted for
+  a field (if any).
 
-  The function looks for a multiple equality containing the field item
-  among those referenced by arg.
-  In the case such equality exists the function does the following.
-  If the found multiple equality contains a constant, then the field
-  reference is substituted for this constant, otherwise it sets a pointer
-  to the multiple equality in the field item.
+  A constant value is returned only if certain conditions are met (see
+  implementation).
 
+  In addition, a numeric field with a zerofill attribute can be substituted
+  with a zerofilled value if it is to be used in a character string context.
 
   @param arg    reference to list of multiple equalities where
                 the field (this object) is to be looked for
@@ -6196,36 +6209,35 @@ static void convert_zerofill_number_to_string(Item **item, Field_num *field)
     - pointer to the field item, otherwise.
 */
 
-Item *Item_field::equal_fields_propagator(uchar *arg)
-{
-  if (no_const_subst)
-    return this;
+Item *Item_field::equal_fields_propagator(uchar *arg) {
+  if (no_const_subst) return this;
   item_equal= find_item_equal((COND_EQUAL *) arg);
   Item *item= 0;
-  if (item_equal)
-    item= item_equal->get_const();
+  if (item_equal) item = item_equal->get_const();
   /*
-    Disable const propagation for items used in different comparison contexts.
-    This must be done because, for example, Item_hex_string->val_int() is not
-    the same as (Item_hex_string->val_str() in BINARY column)->val_int().
-    We cannot simply disable the replacement in a particular context (
-    e.g. <bin_col> = <int_col> AND <bin_col> = <hex_string>) since
-    Items don't know the context they are in and there are functions like 
-    IF (<hex_string>, 'yes', 'no').
+    Disable const propagation if the constant is nullable and this item is not.
+    If propagation was allowed in this case, it would also be necessary to
+    propagate the new nullability up to the parents of this item.
   */
-  if (!item || !has_compatible_context(item))
-    item= this;
-  else if (field && (field->flags & ZEROFILL_FLAG) && IS_NUM(field->type()))
-  {
+  if (!item || (item->maybe_null && !maybe_null)) {
+    return this;
+  }
+  if ((field->flags & ZEROFILL_FLAG) && cmp_context == STRING_RESULT &&
+      IS_NUM(field->type())) {
     /*
-      We don't need to zero-fill timestamp columns here because they will be 
-      first converted to a string (in date/time format) and compared as such if
-      compared with another string.
+      Convert numeric constant to a zero-filled string if the field has
+      the zerofill property and is wanted in a string context.
     */
-    if (item && field->type() != FIELD_TYPE_TIMESTAMP && cmp_context != INT_RESULT)
-      convert_zerofill_number_to_string(&item, (Field_num *)field);
-    else
-      item= this;
+    convert_zerofill_number_to_string(&item, down_cast<Field_num *>(field));
+    return item;
+  }
+  if (!has_compatible_context(item)) {
+    /*
+      If the field does not have the zerofill property, the items must have
+      compatible comparison contexts, otherwise the resolved metadata for
+      the items and the referencing objects might become invalid.
+    */
+    return this;
   }
   return item;
 }
@@ -6282,9 +6294,9 @@ Item *Item_field::replace_equal_field(uchar *arg)
       return const_item;
     }
     Item_field *subst= item_equal->get_subst_item(this);
-    DBUG_ASSERT(subst);
-    DBUG_ASSERT(table_ref == subst->table_ref ||
-                table_ref->table != subst->table_ref->table);
+    assert(subst);
+    assert(table_ref == subst->table_ref ||
+           table_ref->table != subst->table_ref->table);
     if (table_ref != subst->table_ref && !field->eq(subst->field))
       return subst;
   }
@@ -6345,7 +6357,7 @@ enum_field_types Item::field_type() const
   case REAL_RESULT:    return MYSQL_TYPE_DOUBLE;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return MYSQL_TYPE_VARCHAR;
   }
 }
@@ -6496,7 +6508,7 @@ bool Item::can_be_evaluated_now() const
 Field *Item::make_string_field(TABLE *table)
 {
   Field *field;
-  DBUG_ASSERT(collation.collation);
+  assert(collation.collation);
   if (field_type() == MYSQL_TYPE_JSON)
     field= new Field_json(max_length, maybe_null, item_name.ptr());
   else if (max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB)
@@ -6603,7 +6615,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length)
     break;
   default:
     /* This case should never be chosen */
-    DBUG_ASSERT(0);
+    assert(0);
     /* If something goes awfully wrong, it's better to get a string than die */
   case MYSQL_TYPE_STRING:
   case MYSQL_TYPE_NULL:
@@ -6647,7 +6659,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length)
 void Item_field::make_field(Send_field *tmp_field)
 {
   field->make_field(tmp_field);
-  DBUG_ASSERT(tmp_field->table_name != 0);
+  assert(tmp_field->table_name != 0);
   if (item_name.is_set())
     tmp_field->col_name= item_name.ptr();  // Use user supplied name
   if (table_name)
@@ -6991,7 +7003,7 @@ bool Item_int::eq(const Item *arg, bool binary_cmp) const
 
 Item *Item_int_with_ref::clone_item()
 {
-  DBUG_ASSERT(ref->const_item());
+  assert(ref->const_item());
   /*
     We need to evaluate the constant to make sure it works with
     parameter markers.
@@ -7004,7 +7016,7 @@ Item *Item_int_with_ref::clone_item()
 
 Item *Item_time_with_ref::clone_item()
 {
-  DBUG_ASSERT(ref->const_item());
+  assert(ref->const_item());
   /*
     We need to evaluate the constant to make sure it works with
     parameter markers.
@@ -7016,7 +7028,7 @@ Item *Item_time_with_ref::clone_item()
 
 Item *Item_datetime_with_ref::clone_item()
 {
-  DBUG_ASSERT(ref->const_item());
+  assert(ref->const_item());
   /*
     We need to evaluate the constant to make sure it works with
     parameter markers.
@@ -7227,7 +7239,7 @@ void Item_hex_string::hex_string_init(const char *str, uint str_length)
 longlong Item_hex_string::val_int()
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   const char *end= str_value.ptr() + str_value.length();
   const char *ptr;
 
@@ -7274,7 +7286,7 @@ longlong Item_hex_string::val_int()
 my_decimal *Item_hex_string::val_decimal(my_decimal *decimal_value)
 {
   // following assert is redundant, because fixed=1 assigned in constructor
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong value= (ulonglong)val_int();
   int2my_decimal(E_DEC_FATAL_ERROR, value, TRUE, decimal_value);
   return (decimal_value);
@@ -7527,7 +7539,7 @@ bool Item::send(Protocol *protocol, String *buffer)
       result= protocol->store(res->ptr(),res->length(),res->charset());
     else
     {
-      DBUG_ASSERT(null_value);
+      assert(null_value);
     }
     break;
   }
@@ -7754,7 +7766,7 @@ Item* Item::cache_const_expr_transformer(uchar *arg)
   Item **item= (Item **)arg;
   if (*item)            // Item is to be cached, note that it is used as a flag
   {
-    DBUG_ASSERT(*item == this);
+    assert(*item == this);
     /*
       Flag applies to present item, must reset it so it does not affect
       the parent item.
@@ -7842,7 +7854,7 @@ void Item_field::update_null_value()
 Item *Item_field::update_value_transformer(uchar *select_arg)
 {
   SELECT_LEX *select= (SELECT_LEX*)select_arg;
-  DBUG_ASSERT(fixed);
+  assert(fixed);
 
   if (field->table != select->context.table_list->table &&
       type() != Item::TRIGGER_FIELD_ITEM)
@@ -7901,7 +7913,7 @@ float
 Item_field::get_cond_filter_default_probability(double max_distinct_values,
                                                 float default_filter) const
 {
-  DBUG_ASSERT(max_distinct_values >= 1.0);
+  assert(max_distinct_values >= 1.0);
 
   // Some field types have a limited number of possible values
   const enum_field_types fld_type= field->real_type();
@@ -8012,7 +8024,7 @@ Item_ref::Item_ref(Name_resolution_context *context_arg,
 bool Item_ref::fix_fields(THD *thd, Item **reference)
 {
   enum_parsing_context place= CTX_NONE;
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   SELECT_LEX *current_sel= thd->lex->current_select();
 
   Internal_error_handler_holder<View_error_handler, TABLE_LIST>
@@ -8067,7 +8079,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
             goto error; /* Some error occurred (e.g. ambiguous names). */
           if (ref != not_found_item)
           {
-            DBUG_ASSERT(is_fixed_or_outer_ref(*ref));
+            assert(is_fixed_or_outer_ref(*ref));
             prev_subselect_item->used_tables_cache|= (*ref)->used_tables();
             prev_subselect_item->const_item_cache&= (*ref)->const_item();
             break;
@@ -8116,7 +8128,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
               (*reference)->used_tables();
             prev_subselect_item->const_item_cache&=
               (*reference)->const_item();
-            DBUG_ASSERT((*reference)->type() == REF_ITEM);
+            assert((*reference)->type() == REF_ITEM);
             mark_as_dependent(thd, last_checked_context->select_lex,
                               context->select_lex, this,
                               ((refer_type == REF_ITEM ||
@@ -8156,7 +8168,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
             break;
           }
         }
-        DBUG_ASSERT(from_field == not_found_field);
+        assert(from_field == not_found_field);
 
         /* Reference is not found => depend on outer (or just error). */
         prev_subselect_item->used_tables_cache|= OUTER_REF_TABLE_BIT;
@@ -8165,7 +8177,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
         outer_context= outer_context->outer_context;
       } while (outer_context);
 
-      DBUG_ASSERT(from_field != 0 && from_field != view_ref_found);
+      assert(from_field != 0 && from_field != view_ref_found);
       if (from_field != not_found_field)
       {
         Item_field* fld;
@@ -8200,7 +8212,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
         goto error;
       }
       /* Should be checked in resolve_ref_in_select_and_group(). */
-      DBUG_ASSERT(is_fixed_or_outer_ref(*ref));
+      assert(is_fixed_or_outer_ref(*ref));
       mark_as_dependent(thd, last_checked_context->select_lex,
                         context->select_lex, this, this);
       /*
@@ -8216,7 +8228,7 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
     }
   }
 
-  DBUG_ASSERT(*ref);
+  assert(*ref);
   /*
     Check if this is an incorrect reference in a group function or forward
     reference. Do not issue an error if this is:
@@ -8298,8 +8310,8 @@ void Item_ref::cleanup()
 
 Item* Item_ref::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
-  DBUG_ASSERT((*ref) != NULL);
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
+  assert((*ref) != NULL);
 
   /* Transform the object we are referencing. */
   Item *new_item= (*ref)->transform(transformer, arg);
@@ -8315,7 +8327,7 @@ Item* Item_ref::transform(Item_transformer transformer, uchar *arg)
 
   /* Transform the item ref object. */
   Item *transformed_item= (this->*transformer)(arg);
-  DBUG_ASSERT(transformed_item == this);
+  assert(transformed_item == this);
   return transformed_item;
 }
 
@@ -8347,7 +8359,7 @@ Item* Item_ref::compile(Item_analyzer analyzer, uchar **arg_p,
   if (!(this->*analyzer)(arg_p))
     return this;
 
-  DBUG_ASSERT((*ref) != NULL);
+  assert((*ref) != NULL);
   Item *new_item= (*ref)->compile(analyzer, arg_p, transformer, arg_t);
   if (new_item == NULL)
     return NULL;
@@ -8467,7 +8479,7 @@ bool Item_ref::val_bool_result()
       return result_field->val_real() != 0.0;
     case ROW_RESULT:
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
   return val_bool();
@@ -8476,7 +8488,7 @@ bool Item_ref::val_bool_result()
 
 double Item_ref::val_real()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   double tmp=(*ref)->val_result();
   null_value=(*ref)->null_value;
   return tmp;
@@ -8485,7 +8497,7 @@ double Item_ref::val_real()
 
 longlong Item_ref::val_int()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   longlong tmp=(*ref)->val_int_result();
   null_value=(*ref)->null_value;
   return tmp;
@@ -8494,8 +8506,8 @@ longlong Item_ref::val_int()
 
 longlong Item_ref::val_time_temporal()
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert(fixed);
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_time_temporal_result();
   null_value= (*ref)->null_value;
   return tmp;
@@ -8504,8 +8516,8 @@ longlong Item_ref::val_time_temporal()
 
 longlong Item_ref::val_date_temporal()
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert(fixed);
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_date_temporal_result();
   null_value= (*ref)->null_value;
   return tmp;
@@ -8514,7 +8526,7 @@ longlong Item_ref::val_date_temporal()
 
 bool Item_ref::val_bool()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   bool tmp= (*ref)->val_bool_result();
   null_value= (*ref)->null_value;
   return tmp;
@@ -8523,7 +8535,7 @@ bool Item_ref::val_bool()
 
 String *Item_ref::val_str(String* tmp)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   tmp=(*ref)->str_result(tmp);
   null_value=(*ref)->null_value;
   return tmp;
@@ -8532,7 +8544,7 @@ String *Item_ref::val_str(String* tmp)
 
 bool Item_ref::val_json(Json_wrapper *result)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   bool ok= (*ref)->val_json(result);
   null_value= (*ref)->null_value;
   return ok;
@@ -8541,7 +8553,7 @@ bool Item_ref::val_json(Json_wrapper *result)
 
 bool Item_ref::is_null()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   bool tmp=(*ref)->is_null_result();
   null_value=(*ref)->null_value;
   return tmp;
@@ -8651,7 +8663,7 @@ longlong Item_direct_ref::val_int()
 
 longlong Item_direct_ref::val_time_temporal()
 {
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_time_temporal();
   null_value= (*ref)->null_value;
   return tmp;
@@ -8660,7 +8672,7 @@ longlong Item_direct_ref::val_time_temporal()
 
 longlong Item_direct_ref::val_date_temporal()
 {
-  DBUG_ASSERT((*ref)->is_temporal());
+  assert((*ref)->is_temporal());
   longlong tmp= (*ref)->val_date_temporal();
   null_value= (*ref)->null_value;
   return tmp;
@@ -8719,7 +8731,7 @@ bool Item_direct_ref::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_direct_view_ref::fix_fields(THD *thd, Item **reference)
 {
-  DBUG_ASSERT(*ref);  // view field reference must be defined
+  assert(*ref);  // view field reference must be defined
 
   // (*ref)->check_cols() will be made in Item_direct_ref::fix_fields
   if ((*ref)->fixed)
@@ -8783,7 +8795,7 @@ void Item_outer_ref::fix_after_pullout(st_select_lex *parent_select,
     If this assertion holds, we need not call fix_after_pullout() on both
     *ref and outer_ref, and Item_ref::fix_after_pullout() is sufficient.
   */
-  DBUG_ASSERT(*ref == outer_ref);
+  assert(*ref == outer_ref);
 
   Item_ref::fix_after_pullout(parent_select, removed_select);
 }
@@ -8956,7 +8968,7 @@ bool Item_default_value::fix_fields(THD *thd, Item **items)
   Item *real_arg;
   Item_field *field_arg;
   Field *def_field;
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   Internal_error_handler_holder<View_error_handler, TABLE_LIST>
     view_handler(thd, context->view_error_handler,
@@ -9063,7 +9075,7 @@ Item_default_value::save_in_field_inner(Field *field_arg, bool no_conversions)
 
 Item *Item_default_value::transform(Item_transformer transformer, uchar *args)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   /*
     If the value of arg is NULL, then this object represents a constant,
@@ -9097,7 +9109,7 @@ bool Item_insert_value::eq(const Item *item, bool binary_cmp) const
 
 bool Item_insert_value::fix_fields(THD *thd, Item **reference)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   /* We should only check that arg is in first table */
   if (!arg->fixed)
   {
@@ -9269,7 +9281,7 @@ bool Item_trigger_field::fix_fields(THD *thd, Item **items)
     parsing! So we have little to do in fix_fields. :)
   */
 
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   /* Set field. */
 
@@ -9283,7 +9295,7 @@ bool Item_trigger_field::fix_fields(THD *thd, Item **items)
 
     if (table_grants)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       table_grants->want_privilege= want_privilege;
 #endif
       if (check_grant_column(thd, table_grants,
@@ -9357,7 +9369,7 @@ Item_result item_cmp_type(Item_result a,Item_result b)
 bool resolve_const_item(THD *thd, Item **ref, Item *comp_item)
 {
   Item *item= *ref;
-  DBUG_ASSERT(item->const_item());
+  assert(item->const_item());
 
   Item *new_item= NULL;
   if (item->basic_const_item())
@@ -9371,7 +9383,7 @@ bool resolve_const_item(THD *thd, Item **ref, Item *comp_item)
     {
       Json_wrapper wr;
       if (item->val_json(&wr))
-        break;
+        return true;
       if (item->null_value)
         new_item= new Item_null(item->item_name);
       else
@@ -9430,8 +9442,8 @@ bool resolve_const_item(THD *thd, Item **ref, Item *comp_item)
       We can't ignore NULL values here as this item may be used with <=>, in
       which case NULL's are significant.
     */
-    DBUG_ASSERT(item->result_type() == comp_item->result_type());
-    DBUG_ASSERT(item_row->cols() == comp_item_row->cols());
+    assert(item->result_type() == comp_item->result_type());
+    assert(item_row->cols() == comp_item_row->cols());
     uint col= item_row->cols();
     while (col-- > 0)
       if (resolve_const_item(thd, item_row->addr(col),
@@ -9465,7 +9477,7 @@ bool resolve_const_item(THD *thd, Item **ref, Item *comp_item)
     break;
   }
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   if (new_item == NULL)
     return true;
@@ -9611,7 +9623,7 @@ Item_cache* Item_cache::get_cache(const Item *item, const Item_result type)
     return new Item_cache_row();
   default:
     // should never be in real life
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 }
@@ -9621,7 +9633,7 @@ void Item_cache::store(Item *item)
   example= item;
   if (!item)
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     null_value= TRUE;
   }
   value_cached= FALSE;
@@ -9653,7 +9665,7 @@ bool Item_cache::has_value()
       Only expect NULL if the cache is nullable, or if an error was
       raised when reading the value into the cache.
     */
-    DBUG_ASSERT(!null_value || maybe_null || current_thd->is_error());
+    assert(!null_value || maybe_null || current_thd->is_error());
     return !null_value;
   }
   return false;
@@ -9684,7 +9696,7 @@ void Item_cache_int::store(Item *item, longlong val_arg)
 
 String *Item_cache_int::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return NULL;
   str->set_int(value, unsigned_flag, default_charset());
@@ -9694,7 +9706,7 @@ String *Item_cache_int::val_str(String *str)
 
 my_decimal *Item_cache_int::val_decimal(my_decimal *decimal_val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return NULL;
   int2my_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_val);
@@ -9703,7 +9715,7 @@ my_decimal *Item_cache_int::val_decimal(my_decimal *decimal_val)
 
 double Item_cache_int::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return 0.0;
   return (double) value;
@@ -9711,7 +9723,7 @@ double Item_cache_int::val_real()
 
 longlong Item_cache_int::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return 0;
   return value;
@@ -9726,7 +9738,7 @@ bool  Item_cache_datetime::cache_value_int()
   // Mark cached string value obsolete
   str_value_cached= false;
 
-  DBUG_ASSERT(field_type() == example->field_type());
+  assert(field_type() == example->field_type());
   int_value= example->val_temporal_by_field_type();
   null_value= example->null_value;
   unsigned_flag= example->unsigned_flag;
@@ -9774,7 +9786,7 @@ void Item_cache_datetime::store(Item *item)
 
 String *Item_cache_datetime::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if ((value_cached || str_value_cached) && null_value)
     return NULL;
@@ -9807,7 +9819,7 @@ String *Item_cache_datetime::val_str(String *str)
 
 my_decimal *Item_cache_datetime::val_decimal(my_decimal *decimal_val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (str_value_cached)
   {
@@ -9820,7 +9832,7 @@ my_decimal *Item_cache_datetime::val_decimal(my_decimal *decimal_val)
     case MYSQL_TYPE_DATE:
       return val_decimal_from_date(decimal_val);
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       return NULL;
     }
   }
@@ -9866,7 +9878,7 @@ bool Item_cache_datetime::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
       return check_date(ltime, non_zero_date(ltime), fuzzydate, &warnings);
     }
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return true;
 }
@@ -9897,7 +9909,7 @@ bool Item_cache_datetime::get_time(MYSQL_TIME *ltime)
     datetime_to_time(ltime);
     return false;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return true;
 }
@@ -9910,7 +9922,7 @@ double Item_cache_datetime::val_real()
 
 longlong Item_cache_datetime::val_time_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((!value_cached && !cache_value_int()) || null_value)
     return 0;
   if (is_temporal_with_date())
@@ -9925,7 +9937,7 @@ longlong Item_cache_datetime::val_time_temporal()
 
 longlong Item_cache_datetime::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if ((!value_cached && !cache_value_int()) || null_value)
     return 0;
   if (cached_field_type == MYSQL_TYPE_TIME)
@@ -9965,18 +9977,15 @@ bool Item_cache_json::cache_value()
   if (!example || !m_value)
     return false;
 
-  if (json_value(&example, 0, m_value))
-    return false;
-
+  value_cached= !json_value(&example, 0, m_value);
   null_value= example->null_value;
-  value_cached= true;
 
-  if (!null_value)
+  if (value_cached && !null_value)
   {
     m_value->to_dom(); // the row buffer might change, so need own copy
   }
 
-  return true;
+  return value_cached;
 }
 
 
@@ -10094,7 +10103,7 @@ bool Item_cache_real::cache_value()
 
 double Item_cache_real::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return 0.0;
   return value;
@@ -10102,7 +10111,7 @@ double Item_cache_real::val_real()
 
 longlong Item_cache_real::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return 0;
   return (longlong) rint(value);
@@ -10111,7 +10120,7 @@ longlong Item_cache_real::val_int()
 
 String* Item_cache_real::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return NULL;
   str->set_real(value, decimals, default_charset());
@@ -10121,7 +10130,7 @@ String* Item_cache_real::val_str(String *str)
 
 my_decimal *Item_cache_real::val_decimal(my_decimal *decimal_val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return NULL;
   double2my_decimal(E_DEC_FATAL_ERROR, value, decimal_val);
@@ -10142,7 +10151,7 @@ bool Item_cache_decimal::cache_value()
 
 double Item_cache_decimal::val_real()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   double res;
   if (!has_value())
     return 0.0;
@@ -10152,7 +10161,7 @@ double Item_cache_decimal::val_real()
 
 longlong Item_cache_decimal::val_int()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   longlong res;
   if (!has_value())
     return 0;
@@ -10162,7 +10171,7 @@ longlong Item_cache_decimal::val_int()
 
 String* Item_cache_decimal::val_str(String *str)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   if (!has_value())
     return NULL;
   my_decimal_round(E_DEC_FATAL_ERROR, &decimal_value, decimals, FALSE,
@@ -10173,7 +10182,7 @@ String* Item_cache_decimal::val_str(String *str)
 
 my_decimal *Item_cache_decimal::val_decimal(my_decimal *val)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   if (!has_value())
     return NULL;
   return &decimal_value;
@@ -10207,7 +10216,7 @@ bool Item_cache_str::cache_value()
 
 double Item_cache_str::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int err_not_used;
   char *end_not_used;
   if (!has_value())
@@ -10221,7 +10230,7 @@ double Item_cache_str::val_real()
 
 longlong Item_cache_str::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int err;
   if (!has_value())
     return 0;
@@ -10235,7 +10244,7 @@ longlong Item_cache_str::val_int()
 
 String* Item_cache_str::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return 0;
   return value;
@@ -10244,7 +10253,7 @@ String* Item_cache_str::val_str(String *str)
 
 my_decimal *Item_cache_str::val_decimal(my_decimal *decimal_val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!has_value())
     return NULL;
   if (value)
@@ -10305,7 +10314,7 @@ void Item_cache_row::store(Item * item)
   example= item;
   if (!item)
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     null_value= TRUE;
     return;
   }
@@ -10348,7 +10357,7 @@ void Item_cache_row::illegal_method_call(const char *method)
 {
   DBUG_ENTER("Item_cache_row::illegal_method_call");
   DBUG_PRINT("error", ("!!! %s method was called for row item", method));
-  DBUG_ASSERT(0);
+  assert(0);
   my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
   DBUG_VOID_RETURN;
 }
@@ -10399,7 +10408,7 @@ void Item_cache_row::bring_value()
 Item_type_holder::Item_type_holder(THD *thd, Item *item)
   :Item(thd, item), enum_set_typelib(0), fld_type(get_real_type(item))
 {
-  DBUG_ASSERT(item->fixed);
+  assert(item->fixed);
   maybe_null= item->maybe_null;
   collation.set(item->collation);
   get_full_info(item);
@@ -10486,7 +10495,7 @@ enum_field_types Item_type_holder::get_real_type(Item *item)
         return MYSQL_TYPE_NEWDECIMAL;
       case ROW_RESULT:
       default:
-        DBUG_ASSERT(0);
+        assert(0);
         return MYSQL_TYPE_VAR_STRING;
       }
     }
@@ -10521,7 +10530,8 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
   DBUG_PRINT("info:", ("in type %d len %d, dec %d",
                        get_real_type(item),
                        item->max_length, item->decimals));
-  fld_type= Field::field_type_merge(fld_type, get_real_type(item));
+  fld_type= real_type_to_type(Field::field_type_merge(fld_type,
+                                                      get_real_type(item)));
   {
     int item_decimals= item->decimals;
     /* fix variable decimals which always is NOT_FIXED_DEC */
@@ -10531,6 +10541,7 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
   }
   if (Field::result_merge_type(fld_type) == DECIMAL_RESULT)
   {
+    collation.set_numeric();
     decimals= min<int>(max(decimals, item->decimals), DECIMAL_MAX_SCALE);
     int item_int_part= item->decimal_int_part();
     int item_prec = max(prev_decimal_int_part, item_int_part) + decimals;
@@ -10582,7 +10593,8 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
       subtypes are different, use GEOMETRY.
     */
     if (fld_type == MYSQL_TYPE_GEOMETRY &&
-        geometry_type != item->get_geometry_type())
+        (get_real_type(item) != MYSQL_TYPE_GEOMETRY ||
+         geometry_type != item->get_geometry_type()))
     {
       geometry_type= Field::GEOM_GEOMETRY;
     }
@@ -10686,7 +10698,7 @@ uint32 Item_type_holder::display_length(Item *item)
   case MYSQL_TYPE_INT24:
     return 8;
   default:
-    DBUG_ASSERT(0); // we should never go there
+    assert(0); // we should never go there
     return 0;
   }
 }
@@ -10697,12 +10709,13 @@ uint32 Item_type_holder::display_length(Item *item)
   of UNION result.
 
   @param table  temporary table for which we create fields
+  @param strict If strict mode is on
 
   @return
     created field
 */
 
-Field *Item_type_holder::make_field_by_type(TABLE *table)
+Field *Item_type_holder::make_field_by_type(TABLE *table, bool strict)
 {
   /*
     The field functions defines a field to be not null if null_ptr is not 0
@@ -10712,29 +10725,42 @@ Field *Item_type_holder::make_field_by_type(TABLE *table)
 
   switch (fld_type) {
   case MYSQL_TYPE_ENUM:
-    DBUG_ASSERT(enum_set_typelib);
+    assert(enum_set_typelib);
     field= new Field_enum((uchar *) 0, max_length, null_ptr, 0,
                           Field::NONE, item_name.ptr(),
                           get_enum_pack_length(enum_set_typelib->count),
                           enum_set_typelib, collation.collation);
     if (field)
       field->init(table);
-    return field;
+    break;
   case MYSQL_TYPE_SET:
-    DBUG_ASSERT(enum_set_typelib);
+    assert(enum_set_typelib);
     field= new Field_set((uchar *) 0, max_length, null_ptr, 0,
                          Field::NONE, item_name.ptr(),
                          get_set_pack_length(enum_set_typelib->count),
                          enum_set_typelib, collation.collation);
     if (field)
       field->init(table);
-    return field;
+    break;
   case MYSQL_TYPE_NULL:
-    return make_string_field(table);
+    field= make_string_field(table);
+    break;
   default:
+    field= tmp_table_field_from_field_type(table, 0);
     break;
   }
-  return tmp_table_field_from_field_type(table, 0);
+  if (strict &&
+      field && field->is_temporal_with_date() && !field->real_maybe_null())
+  {
+    /*
+      This function is used for CREATE SELECT UNION [ALL] ... , and, if
+      expression is non-nullable, the resulting column is declared
+      non-nullable with a default of 0. However, in strict mode, for dates,
+      0000-00-00 is invalid; in that case, don't give any default.
+    */
+    field->flags|= NO_DEFAULT_VALUE_FLAG;
+  }
+  return field;
 }
 
 
@@ -10759,16 +10785,16 @@ void Item_type_holder::get_full_info(Item *item)
     */
     if (enum_set_typelib)
     {
-      DBUG_ASSERT(get_real_type(item) == MYSQL_TYPE_NULL);
+      assert(get_real_type(item) == MYSQL_TYPE_NULL);
     }
     else
     {
       Item *real_item= item->real_item();
       Item_field *item_field= down_cast<Item_field*>(real_item);
       Field_enum *field_enum= down_cast<Field_enum*>(item_field->field);
-      DBUG_ASSERT((get_real_type(item) == MYSQL_TYPE_ENUM ||
-                   get_real_type(item) == MYSQL_TYPE_SET) &&
-                  field_enum->typelib);
+      assert((get_real_type(item) == MYSQL_TYPE_ENUM ||
+              get_real_type(item) == MYSQL_TYPE_SET) &&
+             field_enum->typelib);
       enum_set_typelib= field_enum->typelib;
     }
   }
@@ -10777,26 +10803,26 @@ void Item_type_holder::get_full_info(Item *item)
 
 double Item_type_holder::val_real()
 {
-  DBUG_ASSERT(0); // should never be called
+  assert(0); // should never be called
   return 0.0;
 }
 
 
 longlong Item_type_holder::val_int()
 {
-  DBUG_ASSERT(0); // should never be called
+  assert(0); // should never be called
   return 0;
 }
 
 my_decimal *Item_type_holder::val_decimal(my_decimal *)
 {
-  DBUG_ASSERT(0); // should never be called
+  assert(0); // should never be called
   return 0;
 }
 
 String *Item_type_holder::val_str(String*)
 {
-  DBUG_ASSERT(0); // should never be called
+  assert(0); // should never be called
   return 0;
 }
 
@@ -10863,7 +10889,7 @@ void convert_and_print(String *from_str, String *to_str,
 Bool3 Item_ident::local_column(const SELECT_LEX *sl) const
 
 {
-  DBUG_ASSERT(is_fixed_or_outer_ref(this));
+  assert(is_fixed_or_outer_ref(this));
   if (m_alias_of_expr)
     return Bool3::false3();
   const Type t= type();
@@ -10991,3 +11017,26 @@ bool Item_field::repoint_const_outer_ref(uchar *arg)
   *is_outer_ref= false;
   return false;
 }
+
+
+Item_asterisk::Item_asterisk(Name_resolution_context *context_arg,
+                             const char *opt_schema_name,
+                             const char *opt_table_name)
+    : super(context_arg, opt_schema_name, opt_table_name, "*")
+{
+  context_arg->select_lex->with_wild++;
+}
+
+
+bool Item_asterisk::itemize(Parse_context *pc, Item **res)
+{
+  assert(pc->select->parsing_place == CTX_SELECT_LIST);
+
+  if (skip_itemize(res))
+    return false;
+  if (super::itemize(pc, res))
+    return true;
+
+  pc->select->with_wild++;
+  return false;
+}
diff --git a/sql/item.h b/sql/item.h
index 0c9fcc0355a3..1f01301a17c7 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_INCLUDED
 #define ITEM_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -289,7 +296,7 @@ class Name_string: public Simple_cstring
   */
   bool eq(const char *str) const
   {
-    DBUG_ASSERT(str && ptr());
+    assert(str && ptr());
     return my_strcasecmp(system_charset_info, ptr(), str) == 0;
   }
   bool eq_safe(const char *str) const
@@ -945,8 +952,8 @@ class Item : public Parse_tree_node
     Note: contextualize_() is an intermediate function. Remove it together
     with Parse_tree_node::contextualize_().
   */
-  virtual bool contextualize(Parse_context *pc) { DBUG_ASSERT(0); return true; }
-  virtual bool contextualize_(Parse_context *pc) { DBUG_ASSERT(0); return true; }
+  virtual bool contextualize(Parse_context *pc) { assert(0); return true; }
+  virtual bool contextualize_(Parse_context *pc) { assert(0); return true; }
 
 protected:
   /**
@@ -1129,7 +1136,7 @@ class Item : public Parse_tree_node
           smallest possible value of LLONG_MIN 
   */
   virtual longlong val_int_endpoint(bool left_endp, bool *incl_endp)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
 
 
   /* valXXX methods must return NULL or 0 or 0.0 if null_value is set. */
@@ -1171,7 +1178,7 @@ class Item : public Parse_tree_node
   {
     if (field_type() == MYSQL_TYPE_TIME)
       return val_time_temporal();
-    DBUG_ASSERT(is_temporal_with_date());
+    assert(is_temporal_with_date());
     return val_date_temporal();
   }
   /**
@@ -1368,7 +1375,7 @@ class Item : public Parse_tree_node
                                      double rows_in_table)
   {
     // Filtering effect cannot be calculated for a table already read.
-    DBUG_ASSERT((read_tables & filter_for_table) == 0);
+    assert((read_tables & filter_for_table) == 0);
     return COND_FILTER_ALLPASS;
   }
 
@@ -1656,9 +1663,16 @@ class Item : public Parse_tree_node
     Returns true if this is constant but its value may be not known yet.
     (Can be used for parameters of prep. stmts or of stored procedures.)
   */
-  virtual bool const_during_execution() const 
+  virtual bool const_during_execution() const
   { return (used_tables() & ~PARAM_TABLE_BIT) == 0; }
 
+  /**
+    @returns true if this item is non-deterministic, which means that a
+             has a component that must be evaluated once per row in
+             execution of a JOIN query.
+  */
+  bool is_non_deterministic() const { return used_tables() & RAND_TABLE_BIT; }
+
   /**
     This method is used for to:
       - to generate a view definition query (SELECT-statement);
@@ -2167,18 +2181,24 @@ class Item : public Parse_tree_node
             compared as DATETIME values by the Arg_comparator.
       FALSE otherwise.
   */
-  inline bool has_compatible_context(Item *item) const
-  {
-    /* Same context. */
-    if (cmp_context == (Item_result)-1 || item->cmp_context == cmp_context)
+  inline bool has_compatible_context(Item *item) const {
+    // If no explicit context has been set, assume the same type as the item
+    const Item_result this_context =
+        cmp_context == (Item_result)-1 ? result_type() : cmp_context;
+    const Item_result other_context = item->cmp_context == (Item_result)-1
+                                          ? item->result_type()
+                                          : item->cmp_context;
+
+    // Check if both items have the same context
+    if (this_context == other_context) {
       return TRUE;
+    }
     /* DATETIME comparison context. */
     if (is_temporal_with_date())
-      return item->is_temporal_with_date() ||
-             item->cmp_context == STRING_RESULT;
+      return item->is_temporal_with_date() || other_context == STRING_RESULT;
     if (item->is_temporal_with_date())
-      return is_temporal_with_date() || cmp_context == STRING_RESULT;
-    return FALSE;
+      return is_temporal_with_date() || this_context == STRING_RESULT;
+    return false;
   }
   virtual Field::geometry_type get_geometry_type() const
     { return Field::GEOM_GEOMETRY; };
@@ -2246,7 +2266,7 @@ class Item : public Parse_tree_node
   /*
     Return TRUE if the item points to a column of an outer-joined table.
   */
-  virtual bool is_outer_field() const { DBUG_ASSERT(fixed); return FALSE; }
+  virtual bool is_outer_field() const { assert(fixed); return FALSE; }
 
   /**
      Check if an item either is a blob field, or will be represented as a BLOB
@@ -2355,7 +2375,7 @@ class Item_sp_variable :public Item
   Name_string m_name;
 
 public:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Routine to which this Item_splocal belongs. Used for checking if correct
     runtime context is used for variable handling.
@@ -2958,18 +2978,18 @@ class Item_field :public Item_ident
   virtual void print(String *str, enum_query_type query_type);
   bool is_outer_field() const
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return table_ref->outer_join || table_ref->outer_join_nest();
   }
   Field::geometry_type get_geometry_type() const
   {
-    DBUG_ASSERT(field_type() == MYSQL_TYPE_GEOMETRY);
+    assert(field_type() == MYSQL_TYPE_GEOMETRY);
     return field->get_geometry_type();
   }
   const CHARSET_INFO *charset_for_protocol(void) const
   { return field->charset_for_protocol(); }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_print()
   {
     fprintf(DBUG_FILE, "<field ");
@@ -3035,6 +3055,61 @@ class Item_field :public Item_ident
   }
 
   bool repoint_const_outer_ref(uchar *arg);
+
+
+  /**
+    Checks if the current object represents an asterisk select list item
+
+    @returns false if a regular column reference, true if an asterisk
+             select list item.
+  */
+  virtual bool is_asterisk() const { return false; }
+};
+
+/**
+  Represents [schema.][table.]* in a select list
+
+  Item_asterisk is used to insert placeholder objects for the special
+  select list item * (asterisk) into AST.
+  Those placeholder objects are to be substituted later with e.g. a list of real
+  table columns by a resolver (@see setup_wild).
+
+  @todo The parent class Item_field is redundant. Refactor setup_wild() to
+        replace Item_field with a simpler one.
+*/
+class Item_asterisk : public Item_field
+{
+  typedef Item_field super;
+
+public:
+  /**
+    Constructor
+
+    @param context_arg          Name resolution context.
+    @param opt_schema_name      Schema name or NULL.
+    @param opt_table_name       Table name or NULL.
+  */
+
+  Item_asterisk(Name_resolution_context *context_arg,
+                const char *opt_schema_name, const char *opt_table_name);
+
+  /**
+    Constructor
+
+    @param pos                  Location of the * (asterisk) lexeme.
+    @param opt_schema_name      Schema name or NULL.
+    @param opt_table_name       Table name or NULL.
+  */
+  Item_asterisk(const POS &pos, const char *opt_schema_name,
+                const char *opt_table_name)
+      : super(pos, opt_schema_name, opt_table_name, "*") {}
+
+  virtual bool itemize(Parse_context *pc, Item **res);
+  virtual bool fix_fields(THD *, Item **) {
+    assert(false);  // should never happen: see setup_wild()
+    return true;
+  }
+  virtual bool is_asterisk() const { return true; }
 };
 
 class Item_null :public Item_basic_constant
@@ -3256,7 +3331,7 @@ class Item_param :public Item,
   { return state != NO_VALUE ? (table_map)0 : PARAM_TABLE_BIT; }
   virtual void print(String *str, enum_query_type query_type);
   bool is_null()
-  { DBUG_ASSERT(state != NO_VALUE); return state == NULL_VALUE; }
+  { assert(state != NO_VALUE); return state == NULL_VALUE; }
   bool basic_const_item() const;
   /*
     This method is used to make a copy of a basic constant item when
@@ -3356,8 +3431,8 @@ class Item_int :public Item_num
   enum Type type() const { return INT_ITEM; }
   enum Item_result result_type () const { return INT_RESULT; }
   enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
-  longlong val_int() { DBUG_ASSERT(fixed == 1); return value; }
-  double val_real() { DBUG_ASSERT(fixed == 1); return (double) value; }
+  longlong val_int() { assert(fixed == 1); return value; }
+  double val_real() { assert(fixed == 1); return (double) value; }
   my_decimal *val_decimal(my_decimal *);
   String *val_str(String*);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
@@ -3413,13 +3488,13 @@ class Item_temporal :public Item_int
   Item_temporal(enum_field_types field_type_arg, longlong i): Item_int(i),
     cached_field_type(field_type_arg)
   {
-    DBUG_ASSERT(is_temporal_type(field_type_arg));
+    assert(is_temporal_type(field_type_arg));
   }
   Item_temporal(enum_field_types field_type_arg, const Name_string &name_arg,
                 longlong i, uint length): Item_int(i),
     cached_field_type(field_type_arg)
   {
-    DBUG_ASSERT(is_temporal_type(field_type_arg));
+    assert(is_temporal_type(field_type_arg));
     max_length= length;
     item_name= name_arg;
     fixed= 1;
@@ -3429,12 +3504,12 @@ class Item_temporal :public Item_int
   longlong val_date_temporal() { return val_int(); }
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return false;
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return false;
   }
   enum_field_types field_type() const
@@ -3458,7 +3533,7 @@ class Item_uint :public Item_int
   Item_uint(const Name_string &name_arg, longlong i, uint length)
     :Item_int(name_arg, i, length) { unsigned_flag= 1; }
   double val_real()
-    { DBUG_ASSERT(fixed == 1); return ulonglong2double((ulonglong)value); }
+  { assert(fixed == 1); return ulonglong2double((ulonglong)value); }
   String *val_str(String*);
 
   Item *clone_item() { return new Item_uint(item_name, value, max_length); }
@@ -3568,10 +3643,10 @@ class Item_float :public Item_num
 public:
   enum Type type() const { return REAL_ITEM; }
   enum_field_types field_type() const { return MYSQL_TYPE_DOUBLE; }
-  double val_real() { DBUG_ASSERT(fixed == 1); return value; }
+  double val_real() { assert(fixed == 1); return value; }
   longlong val_int()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     if (value <= (double) LLONG_MIN)
     {
        return LLONG_MIN;
@@ -3743,7 +3818,7 @@ class Item_string :public Item_basic_constant
   longlong val_int();
   String *val_str(String*)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return &str_value;
   }
   my_decimal *val_decimal(my_decimal *);
@@ -3932,7 +4007,7 @@ class Item_hex_string: public Item_basic_constant
   enum Type type() const { return VARBIN_ITEM; }
   double val_real()
   { 
-    DBUG_ASSERT(fixed == 1); 
+    assert(fixed == 1); 
     return (double) (ulonglong) Item_hex_string::val_int();
   }
   longlong val_int();
@@ -3941,7 +4016,7 @@ class Item_hex_string: public Item_basic_constant
   {
     return new Item_hex_string(str_value.ptr(), max_length);
   }
-  String *val_str(String*) { DBUG_ASSERT(fixed == 1); return &str_value; }
+  String *val_str(String*) { assert(fixed == 1); return &str_value; }
   my_decimal *val_decimal(my_decimal *);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
@@ -4203,14 +4278,14 @@ class Item_ref :public Item_ident
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return (*ref)->get_time(ltime);
   }
   virtual bool basic_const_item() const { return ref && (*ref)->basic_const_item(); }
   bool is_outer_field() const
   {
-    DBUG_ASSERT(fixed);
-    DBUG_ASSERT(ref);
+    assert(fixed);
+    assert(ref);
     return (*ref)->is_outer_field();
   }
 
@@ -4219,7 +4294,7 @@ class Item_ref :public Item_ident
   */
   virtual bool has_subquery() const 
   { 
-    DBUG_ASSERT(ref);
+    assert(ref);
     return (*ref)->has_subquery();
   }
 
@@ -4228,7 +4303,7 @@ class Item_ref :public Item_ident
   */
   virtual bool has_stored_program() const 
   { 
-    DBUG_ASSERT(ref);
+    assert(ref);
     return (*ref)->has_stored_program();
   }
 
@@ -4544,12 +4619,12 @@ class Item_temporal_with_ref :public Item_int_with_ref
   void print(String *str, enum_query_type query_type);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
 
@@ -4581,7 +4656,7 @@ class Item_datetime_with_ref :public Item_temporal_with_ref
   longlong val_date_temporal() { return val_int(); }
   longlong val_time_temporal()
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return val_int();
   }
 };
@@ -4610,7 +4685,7 @@ class Item_time_with_ref :public Item_temporal_with_ref
   longlong val_time_temporal() { return val_int(); }
   longlong val_date_temporal()
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return val_int();
   }
 };
@@ -4955,7 +5030,7 @@ class Cached_item_field :public Cached_item
   uint length;
 
 public:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_print()
   {
     uchar *org_ptr;
@@ -5278,7 +5353,7 @@ class Item_cache: public Item_basic_constant
   */
   void store_null()
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     value_cached= true;
     null_value= true;
   }
@@ -5585,16 +5660,16 @@ class Item_type_holder: public Item
   String *val_str(String*);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
   bool join_types(THD *thd, Item *);
-  Field *make_field_by_type(TABLE *table);
+  Field *make_field_by_type(TABLE *table, bool strict);
   static uint32 display_length(Item *item);
   static enum_field_types get_real_type(Item *);
   Field::geometry_type get_geometry_type() const { return geometry_type; };
@@ -5623,7 +5698,7 @@ extern int stored_field_cmp_to_item(THD *thd, Field *field, Item *item);
 extern const String my_null_string;
 void convert_and_print(String *from_str, String *to_str,
                        const CHARSET_INFO *to_cs);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 bool is_fixed_or_outer_ref(const Item *ref);
 #endif
 
diff --git a/sql/item_buff.cc b/sql/item_buff.cc
index 849ba647d6f9..99a5f30c1220 100644
--- a/sql/item_buff.cc
+++ b/sql/item_buff.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -57,7 +64,7 @@ Cached_item *new_Cached_item(THD *thd, Item *item, bool use_result_field)
     return new Cached_item_decimal(item);
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 }
@@ -83,8 +90,8 @@ bool Cached_item_str::cmp(void)
   bool tmp;
 
   DBUG_ENTER("Cached_item_str::cmp");
-  DBUG_ASSERT(!item->is_temporal());
-  DBUG_ASSERT(item->field_type() != MYSQL_TYPE_JSON);
+  assert(!item->is_temporal());
+  assert(item->field_type() != MYSQL_TYPE_JSON);
   if ((res=item->val_str(&tmp_value)))
     res->length(min(res->length(), static_cast<size_t>(value_max_length)));
   DBUG_PRINT("info", ("old: %s, new: %s",
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 405126765f7c..2691e850c0fb 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -39,7 +46,7 @@ using std::max;
 static bool convert_constant_item(THD *, Item_field *, Item **);
 static longlong
 get_year_value(THD *thd, Item ***item_arg, Item **cache_arg,
-               Item *warn_item, bool *is_null);
+               const Item *warn_item, bool *is_null);
 
 static Item_result item_store_type(Item_result a, Item *item,
                                    my_bool unsigned_flag)
@@ -219,7 +226,7 @@ static uint collect_cmp_types(Item **items, uint nitems, bool skip_nulls= FALSE)
   uint i;
   uint found_types;
   Item_result left_result= items[0]->result_type();
-  DBUG_ASSERT(nitems > 1);
+  assert(nitems > 1);
   found_types= 0;
   for (i= 1; i < nitems ; i++)
   {
@@ -277,7 +284,7 @@ Item_bool_func *Linear_comp_creator::create(Item *a, Item *b) const
       my_error(ER_OPERAND_COLUMNS, MYF(0), a->cols());
       return NULL;
     }
-    DBUG_ASSERT(a->cols() > 1);
+    assert(a->cols() > 1);
     List<Item> list;
     for (uint i= 0; i < a->cols(); ++i)
       list.push_back(create(a->element_index(i), b->element_index(i)));
@@ -289,7 +296,7 @@ Item_bool_func *Linear_comp_creator::create(Item *a, Item *b) const
 
 Item_bool_func *Eq_creator::create_scalar_predicate(Item *a, Item *b) const
 {
-  DBUG_ASSERT(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
+  assert(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
   return new Item_func_eq(a, b);
 }
 
@@ -303,7 +310,7 @@ Item_bool_func *Eq_creator::combine(List<Item> list) const
 Item_bool_func *Equal_creator::create_scalar_predicate(Item *a, Item *b)
   const
 {
-  DBUG_ASSERT(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
+  assert(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
   return new Item_func_equal(a, b);
 }
 
@@ -316,7 +323,7 @@ Item_bool_func *Equal_creator::combine(List<Item> list) const
 
 Item_bool_func* Ne_creator::create_scalar_predicate(Item *a, Item *b) const
 {
-  DBUG_ASSERT(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
+  assert(a->type() != Item::ROW_ITEM || b->type() != Item::ROW_ITEM);
   return new Item_func_ne(a, b);
 }
 
@@ -382,7 +389,7 @@ float Item_func_not::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_not::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   bool value= args[0]->val_bool();
   null_value=args[0]->null_value;
   return ((!null_value && value == 0) ? 1 : 0);
@@ -411,7 +418,7 @@ void Item_func_not::print(String *str, enum_query_type query_type)
 
 longlong Item_func_not_all::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   bool value= args[0]->val_bool();
 
   /*
@@ -428,7 +435,7 @@ longlong Item_func_not_all::val_int()
 
 bool Item_func_not_all::empty_underlying_subquery()
 {
-  DBUG_ASSERT(subselect || !(test_sum_item || test_sub_item));
+  assert(subselect || !(test_sum_item || test_sub_item));
   /*
    When outer argument is NULL the subquery has not yet been evaluated, we
    need to evaluate it to get to know whether it returns any rows to return
@@ -466,7 +473,7 @@ void Item_func_not_all::print(String *str, enum_query_type query_type)
 
 longlong Item_func_nop_all::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong value= args[0]->val_int();
 
   /*
@@ -610,7 +617,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
     {
       result= field->store(orig_field_val, TRUE);
       /* orig_field_val must be a valid value that can be restored back. */
-      DBUG_ASSERT(!result);
+      assert(!result);
     }
     thd->variables.sql_mode= orig_sql_mode;
     thd->count_cuted_fields= orig_count_cuted_fields;
@@ -758,7 +765,7 @@ int Arg_comparator::set_compare_func(Item_result_field *item, Item_result type)
       We must set cmp_charset here as we may be called from for an automatic
       generated item, like in natural join
     */
-    if (cmp_collation.set((*a)->collation, (*b)->collation) || 
+    if (cmp_collation.set((*a)->collation, (*b)->collation, MY_COLL_CMP_CONV) ||
 	cmp_collation.derivation == DERIVATION_NONE)
     {
       my_coll_agg_error((*a)->collation, (*b)->collation,
@@ -828,7 +835,7 @@ int Arg_comparator::set_compare_func(Item_result_field *item, Item_result type)
     break;
   }
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0;
 }
@@ -961,7 +968,7 @@ bool Arg_comparator::get_date_from_const(Item *date_arg,
     else
     {
       // Convert from string to DATETIME
-      DBUG_ASSERT(str_arg->result_type() == STRING_RESULT);
+      assert(str_arg->result_type() == STRING_RESULT);
       bool error;
       String tmp, *str_val= 0;
       timestamp_type t_type= (date_arg->field_type() == MYSQL_TYPE_DATE ?
@@ -1068,7 +1075,7 @@ Arg_comparator::can_compare_as_dates(Item *a, Item *b, ulonglong *const_value)
 
 longlong
 get_time_value(THD *thd, Item ***item_arg, Item **cache_arg,
-               Item *warn_item, bool *is_null)
+               const Item *warn_item, bool *is_null)
 {
   longlong value;
   Item *item= **item_arg;
@@ -1077,8 +1084,8 @@ get_time_value(THD *thd, Item ***item_arg, Item **cache_arg,
     Note, it's wrong to assume that we always get
     a TIME expression or NULL here:
 
-  DBUG_ASSERT(item->field_type() == MYSQL_TYPE_TIME || 
-              item->field_type() == MYSQL_TYPE_NULL);
+    assert(item->field_type() == MYSQL_TYPE_TIME || 
+    item->field_type() == MYSQL_TYPE_NULL);
 
     because when this condition is optimized:
 
@@ -1207,10 +1214,12 @@ int Arg_comparator::set_cmp_func(Item_result_field *owner_arg,
            (*b)->result_type() == STRING_RESULT)
   {
     DTCollation coll;
-    coll.set((*a)->collation.collation);
-    if (agg_item_set_converter(coll, owner->func_name(),
-                               b, 1, MY_COLL_CMP_CONV, 1))
-      return 1;
+    coll.set((*a)->collation, (*b)->collation, MY_COLL_CMP_CONV);
+    if (agg_item_set_converter(coll, owner->func_name(), a, 1,
+                               MY_COLL_CMP_CONV, 1) ||
+        agg_item_set_converter(coll, owner->func_name(), b, 1,
+                               MY_COLL_CMP_CONV, 1))
+      return true;
   }
   else if (try_year_cmp_func(type))
   {
@@ -1371,7 +1380,7 @@ void Arg_comparator::set_datetime_cmp_func(Item_result_field *owner_arg,
 
 longlong
 get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
-                   Item *warn_item, bool *is_null)
+                   const Item *warn_item, bool *is_null)
 {
   longlong value= 0;
   String buf, *str= 0;
@@ -1452,7 +1461,7 @@ get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
 
 static longlong
 get_year_value(THD *thd, Item ***item_arg, Item **cache_arg,
-               Item *warn_item, bool *is_null)
+               const Item *warn_item, bool *is_null)
 {
   longlong value= 0;
   Item *item= **item_arg;
@@ -1867,8 +1876,8 @@ int Arg_comparator::compare_time_packed()
 {
   /*
     Note, we cannot do this:
-    DBUG_ASSERT((*a)->field_type() == MYSQL_TYPE_TIME);
-    DBUG_ASSERT((*b)->field_type() == MYSQL_TYPE_TIME);
+    assert((*a)->field_type() == MYSQL_TYPE_TIME);
+    assert((*b)->field_type() == MYSQL_TYPE_TIME);
     
     SELECT col_time_key FROM t1
     WHERE
@@ -2174,7 +2183,7 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref)
 
 bool Item_in_optimizer::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   if (fix_left(thd, ref))
     return TRUE;
   if (args[0]->maybe_null)
@@ -2308,7 +2317,7 @@ void Item_in_optimizer::fix_after_pullout(st_select_lex *parent_select,
 longlong Item_in_optimizer::val_int()
 {
   bool tmp;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   cache->store(args[0]);
   cache->cache_value();
   
@@ -2445,8 +2454,8 @@ Item *Item_in_optimizer::transform(Item_transformer transformer, uchar *argument
 {
   Item *new_item;
 
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
-  DBUG_ASSERT(arg_count == 2);
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(arg_count == 2);
 
   /* Transform the left IN operand. */
   new_item= args[0]->transform(transformer, argument);
@@ -2468,13 +2477,13 @@ Item *Item_in_optimizer::transform(Item_transformer transformer, uchar *argument
     transformation, we only make both operands the same.
     TODO: is it the way it should be?
   */
-  DBUG_ASSERT((args[1])->type() == Item::SUBSELECT_ITEM &&
-              (((Item_subselect*)(args[1]))->substype() ==
-               Item_subselect::IN_SUBS ||
-               ((Item_subselect*)(args[1]))->substype() ==
-               Item_subselect::ALL_SUBS ||
-               ((Item_subselect*)(args[1]))->substype() ==
-               Item_subselect::ANY_SUBS));
+  assert((args[1])->type() == Item::SUBSELECT_ITEM &&
+         (((Item_subselect*)(args[1]))->substype() ==
+          Item_subselect::IN_SUBS ||
+          ((Item_subselect*)(args[1]))->substype() ==
+          Item_subselect::ALL_SUBS ||
+          ((Item_subselect*)(args[1]))->substype() ==
+          Item_subselect::ANY_SUBS));
 
   Item_in_subselect *in_arg= (Item_in_subselect*)args[1];
 
@@ -2503,7 +2512,7 @@ void Item_in_optimizer::replace_argument(THD *thd, Item **oldpp, Item *newp)
 
 longlong Item_func_eq::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value == 0 ? 1 : 0;
 }
@@ -2519,7 +2528,7 @@ void Item_func_equal::fix_length_and_dec()
 
 longlong Item_func_equal::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return cmp.compare();
 }
 
@@ -2539,7 +2548,7 @@ float Item_func_ne::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_ne::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value != 0 && !null_value ? 1 : 0;
 }
@@ -2616,21 +2625,21 @@ float Item_func_gt::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_ge::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value >= 0 ? 1 : 0;
 }
 
 longlong Item_func_gt::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value > 0 ? 1 : 0;
 }
 
 longlong Item_func_le::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value <= 0 && !null_value ? 1 : 0;
 }
@@ -2638,7 +2647,7 @@ longlong Item_func_le::val_int()
 
 longlong Item_func_lt::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int value= cmp.compare();
   return value < 0 && !null_value ? 1 : 0;
 }
@@ -2646,7 +2655,7 @@ longlong Item_func_lt::val_int()
 
 longlong Item_func_strcmp::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *a=args[0]->val_str(&cmp.value1);
   String *b=args[1]->val_str(&cmp.value2);
   if (!a || !b)
@@ -2687,7 +2696,7 @@ bool Item_func_interval::itemize(Parse_context *pc, Item **res)
   if (row == NULL || // OOM in constructor
       super::itemize(pc, res))
     return true;
-  DBUG_ASSERT(row == args[0]); // row->itemize() is not needed
+  assert(row == args[0]); // row->itemize() is not needed
   return false;
 }
 
@@ -2728,7 +2737,7 @@ void Item_func_interval::fix_length_and_dec()
     for (uint i= 1; not_null_consts && i < rows; i++)
     {
       Item *el= row->element_index(i);
-      not_null_consts&= el->const_item() & !el->is_null();
+      not_null_consts= el->const_item() && !el->is_null();
     }
 
     if (not_null_consts &&
@@ -2813,7 +2822,7 @@ void Item_func_interval::print(String *str, enum_query_type query_type)
 
 longlong Item_func_interval::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value;
   my_decimal dec_buf, *dec= NULL;
   uint i;
@@ -3156,8 +3165,19 @@ longlong compare_between_int_result(bool compare_as_temporal_dates,
         rewritten to
         value BETWEEN 0 AND <some number>
       */
-      if (!args[1]->unsigned_flag && (longlong) a < 0)
+      if (!args[1]->unsigned_flag && static_cast<longlong>(a) < 0)
         a = 0;
+      /*
+        Comparing as unsigned.
+        value BETWEEN <some number> AND <some negative number>
+        rewritten to
+        1 BETWEEN <some number> AND 0
+      */
+      if (!args[2]->unsigned_flag && static_cast<longlong>(b) < 0)
+      {
+        b= 0;
+        value= 1;
+      }
     }
     else
     {
@@ -3185,7 +3205,7 @@ longlong compare_between_int_result(bool compare_as_temporal_dates,
 
 longlong Item_func_between::val_int()
 {                                               // ANSI BETWEEN
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (compare_as_dates_with_strings)
   {
     int ge_res, le_res;
@@ -3341,7 +3361,7 @@ Item_func_ifnull::fix_length_and_dec()
     break;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   fix_char_length(char_length);
 }
@@ -3365,7 +3385,7 @@ Field *Item_func_ifnull::tmp_table_field(TABLE *table)
 double
 Item_func_ifnull::real_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if (!args[0]->null_value)
   {
@@ -3381,7 +3401,7 @@ Item_func_ifnull::real_op()
 longlong
 Item_func_ifnull::int_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong value=args[0]->val_int();
   if (!args[0]->null_value)
   {
@@ -3397,7 +3417,7 @@ Item_func_ifnull::int_op()
 
 my_decimal *Item_func_ifnull::decimal_op(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   my_decimal *value= args[0]->val_decimal(decimal_value);
   if (!args[0]->null_value)
   {
@@ -3430,7 +3450,7 @@ bool Item_func_ifnull::val_json(Json_wrapper *result)
 
 bool Item_func_ifnull::date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!args[0]->get_date(ltime, fuzzydate))
     return (null_value= false);
   return (null_value= args[1]->get_date(ltime, fuzzydate));
@@ -3439,7 +3459,7 @@ bool Item_func_ifnull::date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_ifnull::time_op(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!args[0]->get_time(ltime))
     return (null_value= false);
   return (null_value= args[1]->get_time(ltime));
@@ -3449,7 +3469,7 @@ bool Item_func_ifnull::time_op(MYSQL_TIME *ltime)
 String *
 Item_func_ifnull::str_op(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res  =args[0]->val_str(str);
   if (!args[0]->null_value)
   {
@@ -3494,7 +3514,7 @@ Item_func_ifnull::str_op(String *str)
 bool
 Item_func_if::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   args[0]->top_level_item();
 
   if (Item_func::fix_fields(thd, ref))
@@ -3594,7 +3614,7 @@ uint Item_func_if::decimal_precision() const
 double
 Item_func_if::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   double value= arg->val_real();
   null_value=arg->null_value;
@@ -3604,7 +3624,7 @@ Item_func_if::val_real()
 longlong
 Item_func_if::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   longlong value=arg->val_int();
   null_value=arg->null_value;
@@ -3614,7 +3634,7 @@ Item_func_if::val_int()
 String *
 Item_func_if::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   switch (field_type())
   {
@@ -3645,7 +3665,7 @@ Item_func_if::val_str(String *str)
 my_decimal *
 Item_func_if::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   my_decimal *value= arg->val_decimal(decimal_value);
   null_value= arg->null_value;
@@ -3655,7 +3675,7 @@ Item_func_if::val_decimal(my_decimal *decimal_value)
 
 bool Item_func_if::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   Item *args[]= {arg};
   bool ok= json_value(args, 0, wr);
@@ -3666,7 +3686,7 @@ bool Item_func_if::val_json(Json_wrapper *wr)
 
 bool Item_func_if::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   return (null_value= arg->get_date(ltime, fuzzydate));
 }
@@ -3674,7 +3694,7 @@ bool Item_func_if::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_if::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
   return (null_value= arg->get_time(ltime));
 }
@@ -3711,7 +3731,7 @@ Item_func_nullif::fix_length_and_dec()
 double
 Item_func_nullif::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value;
   if (!cmp.compare())
   {
@@ -3726,7 +3746,7 @@ Item_func_nullif::val_real()
 longlong
 Item_func_nullif::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong value;
   if (!cmp.compare())
   {
@@ -3741,7 +3761,7 @@ Item_func_nullif::val_int()
 String *
 Item_func_nullif::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res;
   if (!cmp.compare())
   {
@@ -3757,7 +3777,7 @@ Item_func_nullif::val_str(String *str)
 my_decimal *
 Item_func_nullif::val_decimal(my_decimal * decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   my_decimal *res;
   if (!cmp.compare())
   {
@@ -3820,8 +3840,8 @@ Item *Item_func_case::find_item(String *str)
       if (args[i]->real_item()->type() == NULL_ITEM)
         continue;
       cmp_type= item_cmp_type(left_result_type, args[i]->result_type());
-      DBUG_ASSERT(cmp_type != ROW_RESULT);
-      DBUG_ASSERT(cmp_items[(uint)cmp_type]);
+      assert(cmp_type != ROW_RESULT);
+      assert(cmp_items[(uint)cmp_type]);
       if (!(value_added_map & (1U << (uint)cmp_type)))
       {
         cmp_items[(uint)cmp_type]->store_value(args[first_expr_num]);
@@ -3840,7 +3860,7 @@ Item *Item_func_case::find_item(String *str)
 
 String *Item_func_case::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (field_type()) {
   case MYSQL_TYPE_DATETIME:
   case MYSQL_TYPE_TIMESTAMP:
@@ -3871,7 +3891,7 @@ String *Item_func_case::val_str(String *str)
 
 longlong Item_func_case::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff,sizeof(buff),default_charset());
   Item *item=find_item(&dummy_str);
@@ -3889,7 +3909,7 @@ longlong Item_func_case::val_int()
 
 double Item_func_case::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff,sizeof(buff),default_charset());
   Item *item=find_item(&dummy_str);
@@ -3908,7 +3928,7 @@ double Item_func_case::val_real()
 
 my_decimal *Item_func_case::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff, sizeof(buff), default_charset());
   Item *item= find_item(&dummy_str);
@@ -3928,7 +3948,7 @@ my_decimal *Item_func_case::val_decimal(my_decimal *decimal_value)
 
 bool Item_func_case::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff, sizeof(buff), default_charset());
   Item *item= find_item(&dummy_str);
@@ -3946,7 +3966,7 @@ bool Item_func_case::val_json(Json_wrapper *wr)
 
 bool Item_func_case::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff, sizeof(buff), default_charset());
   Item *item= find_item(&dummy_str);
@@ -3958,7 +3978,7 @@ bool Item_func_case::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_case::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String dummy_str(buff, sizeof(buff), default_charset());
   Item *item= find_item(&dummy_str);
@@ -4030,7 +4050,7 @@ static void fix_num_length_and_dec_shared_for_case(Item_func *item_func,
     break;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 }
 
@@ -4150,9 +4170,9 @@ void Item_func_case::fix_length_and_dec()
     {
       if (found_types & (1U << i) && !cmp_items[i])
       {
-        DBUG_ASSERT((Item_result)i != ROW_RESULT);
+        assert((Item_result)i != ROW_RESULT);
         if (!(cmp_items[i]=
-            cmp_item::get_comparator((Item_result)i,
+            cmp_item::get_comparator((Item_result)i, args[first_expr_num],
                                      cmp_collation.collation)))
           return;
       }
@@ -4238,7 +4258,7 @@ Item_func_coalesce::Item_func_coalesce(const POS &pos, PT_item_list *list)
 
 String *Item_func_coalesce::str_op(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=0;
   for (uint i=0 ; i < arg_count ; i++)
   {
@@ -4253,7 +4273,7 @@ String *Item_func_coalesce::str_op(String *str)
 
 bool Item_func_coalesce::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value= false;
   for (uint i= 0; i < arg_count; i++)
   {
@@ -4271,7 +4291,7 @@ bool Item_func_coalesce::val_json(Json_wrapper *wr)
 
 longlong Item_func_coalesce::int_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=0;
   for (uint i=0 ; i < arg_count ; i++)
   {
@@ -4285,7 +4305,7 @@ longlong Item_func_coalesce::int_op()
 
 double Item_func_coalesce::real_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value=0;
   for (uint i=0 ; i < arg_count ; i++)
   {
@@ -4300,7 +4320,7 @@ double Item_func_coalesce::real_op()
 
 my_decimal *Item_func_coalesce::decimal_op(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value= 0;
   for (uint i= 0; i < arg_count; i++)
   {
@@ -4316,7 +4336,7 @@ my_decimal *Item_func_coalesce::decimal_op(my_decimal *decimal_value)
 
 bool Item_func_coalesce::date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   for (uint i= 0; i < arg_count; i++)
   {
     if (!args[i]->get_date(ltime, fuzzydate))
@@ -4328,7 +4348,7 @@ bool Item_func_coalesce::date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_coalesce::time_op(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   for (uint i= 0; i < arg_count; i++)
   {
     if (!args[i]->get_time(ltime))
@@ -4813,12 +4833,19 @@ bool in_decimal::compare_elems(uint pos1, uint pos2) const
 }
 
 
-cmp_item* cmp_item::get_comparator(Item_result type,
+cmp_item* cmp_item::get_comparator(Item_result result_type, const Item *item,
                                    const CHARSET_INFO *cs)
 {
-  switch (type) {
+  switch (result_type) {
   case STRING_RESULT:
-    return new cmp_item_string(cs);
+    /*
+      Temporal types shouldn't be compared as strings. Since date/time formats
+      may be different, e.g. '20000102' == '2000-01-02'."
+    */
+    if (item->is_temporal())
+      return new cmp_item_datetime(item);
+    else
+      return new cmp_item_string(cs);
   case INT_RESULT:
     return new cmp_item_int;
   case REAL_RESULT:
@@ -4828,7 +4855,7 @@ cmp_item* cmp_item::get_comparator(Item_result type,
   case DECIMAL_RESULT:
     return new cmp_item_decimal;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   return 0; // to satisfy compiler :)
@@ -4875,17 +4902,17 @@ cmp_item_row::~cmp_item_row()
 void cmp_item_row::alloc_comparators(Item *item)
 {
   n= item->cols();
-  DBUG_ASSERT(comparators == NULL);
+  assert(comparators == NULL);
   if (!comparators)
     comparators= (cmp_item **) current_thd->mem_calloc(sizeof(cmp_item *)*n);
   if (comparators)
   {
     for (uint i= 0; i < n; i++)
     {
-      DBUG_ASSERT(comparators[i] == NULL);
+      assert(comparators[i] == NULL);
       Item *item_i= item->element_index(i);
       if (!(comparators[i]=
-            cmp_item::get_comparator(item_i->result_type(),
+            cmp_item::get_comparator(item_i->result_type(), item_i,
                                      item_i->collation.collation)))
         break;                                  // new failed
       if (item_i->result_type() == ROW_RESULT)
@@ -4898,7 +4925,7 @@ void cmp_item_row::alloc_comparators(Item *item)
 void cmp_item_row::store_value(Item *item)
 {
   DBUG_ENTER("cmp_item_row::store_value");
-  DBUG_ASSERT(comparators);
+  assert(comparators);
   if (comparators)
   {
     item->bring_value();
@@ -5011,11 +5038,21 @@ cmp_item* cmp_item_decimal::make_same()
 }
 
 
+cmp_item_datetime::cmp_item_datetime(const Item *warn_item_arg)
+  :warn_item(warn_item_arg), lval_cache(0),
+  has_date(warn_item_arg->is_temporal_with_date())
+{}
+
 void cmp_item_datetime::store_value(Item *item)
 {
   bool is_null;
   Item **tmp_item= lval_cache ? &lval_cache : &item;
-  value= get_datetime_value(current_thd, &tmp_item, &lval_cache, warn_item, &is_null);
+  if (has_date)
+    value= get_datetime_value(current_thd, &tmp_item, &lval_cache, warn_item,
+                              &is_null);
+  else
+    value= get_time_value(current_thd, &tmp_item, &lval_cache, warn_item,
+                          &is_null);
   set_null_value(item->null_value);
 }
 
@@ -5024,8 +5061,13 @@ int cmp_item_datetime::cmp(Item *arg)
 {
   bool is_null;
   Item **tmp_item= &arg;
-  const bool rc= value !=
-    get_datetime_value(current_thd, &tmp_item, 0, warn_item, &is_null);
+  longlong value2= 0;
+  if (has_date)
+    value2= get_datetime_value(current_thd, &tmp_item, 0, warn_item, &is_null);
+  else
+    value2= get_time_value(current_thd, &tmp_item, 0, warn_item, &is_null);
+
+  const bool rc= (value != value2);
   return (m_null_value || arg->null_value) ? UNKNOWN : rc;
 }
 
@@ -5074,7 +5116,7 @@ float Item_func_in::get_filtering_effect(table_map filter_for_table,
                                          double rows_in_table)
 {
 
-  DBUG_ASSERT((read_tables & filter_for_table) == 0);
+  assert((read_tables & filter_for_table) == 0);
   /*
     To contribute to filtering effect, the condition must refer to
     exactly one unread table: the table filtering is currently
@@ -5160,7 +5202,7 @@ float Item_func_in::get_filtering_effect(table_map filter_for_table,
       As for row values, it is assumed that no values on the right
       hand side are identical.
     */
-    DBUG_ASSERT(args[0]->type() == FIELD_ITEM || args[0]->type() == REF_ITEM);
+    assert(args[0]->type() == FIELD_ITEM || args[0]->type() == REF_ITEM);
     Item_ident *fieldref= static_cast<Item_ident*>(args[0]);
 
     const float tmp_filt= get_single_col_filtering_effect(fieldref,
@@ -5182,7 +5224,7 @@ float Item_func_in::get_filtering_effect(table_map filter_for_table,
   if (negated && filter != COND_FILTER_ALLPASS)
     filter= 1.0f - filter;
 
-  DBUG_ASSERT(filter >= 0.0f && filter <= 1.0f);
+  assert(filter >= 0.0f && filter <= 1.0f);
   return filter;
 }
 
@@ -5490,7 +5532,7 @@ void Item_func_in::fix_length_and_dec()
         array= new in_decimal(thd, arg_count - 1);
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
         return;
       }
     }
@@ -5512,7 +5554,7 @@ void Item_func_in::fix_length_and_dec()
       }
     }
     array->used_count= j;
-    DBUG_ASSERT(array->used_count <= array->count);
+    assert(array->used_count <= array->count);
     if (array->used_count < array->count)
       array->shrink_array(j);
 
@@ -5533,7 +5575,7 @@ void Item_func_in::fix_length_and_dec()
               agg_arg_charsets_for_comparison(cmp_collation, args, arg_count))
             return;
           if (!cmp_items[i] && !(cmp_items[i]=
-              cmp_item::get_comparator((Item_result)i,
+              cmp_item::get_comparator((Item_result)i, args[0],
                                        cmp_collation.collation)))
             return;
         }
@@ -5596,7 +5638,7 @@ void Item_func_in::print(String *str, enum_query_type query_type)
 longlong Item_func_in::val_int()
 {
   cmp_item *in_item;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint value_added_map= 0;
   if (array)
   {
@@ -5625,7 +5667,7 @@ longlong Item_func_in::val_int()
     }
     Item_result cmp_type= item_cmp_type(left_result_type, args[i]->result_type());
     in_item= cmp_items[(uint)cmp_type];
-    DBUG_ASSERT(in_item);
+    assert(in_item);
     if (!(value_added_map & (1U << (uint)cmp_type)))
     {
       in_item->store_value(args[0]);
@@ -5674,7 +5716,7 @@ void Item::check_deprecated_bin_op(const Item *a, const Item *b)
 
 longlong Item_func_bit_or::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong arg1= (ulonglong) args[0]->val_int();
   if (args[0]->null_value)
   {
@@ -5694,7 +5736,7 @@ longlong Item_func_bit_or::val_int()
 
 longlong Item_func_bit_and::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong arg1= (ulonglong) args[0]->val_int();
   if (args[0]->null_value)
   {
@@ -5753,7 +5795,7 @@ void Item_cond::copy_andor_arguments(THD *thd, Item_cond *item)
   List_iterator_fast<Item> li(item->list);
   while (Item *it= li++)
   {
-    DBUG_ASSERT(it->real_item()); // Sanity check (no dangling 'ref')
+    assert(it->real_item()); // Sanity check (no dangling 'ref')
     list.push_back(it->copy_andor_structure(thd));
   }
 }
@@ -5762,7 +5804,7 @@ void Item_cond::copy_andor_arguments(THD *thd, Item_cond *item)
 bool
 Item_cond::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   List_iterator<Item> li(list);
   Item *item;
 
@@ -5875,7 +5917,7 @@ bool Item_cond::eq(const Item *item, bool binary_cmp) const
       func_name() != item_cond->func_name())
     return false;
   // Item_cond never uses "args". Inspect "list" instead.
-  DBUG_ASSERT(arg_count == 0 && item_cond->arg_count == 0);
+  assert(arg_count == 0 && item_cond->arg_count == 0);
   List_iterator_fast<Item> it1(const_cast<Item_cond *>(this)->list);
   List_iterator_fast<Item> it2(const_cast<Item_cond *>(item_cond)->list);
   Item *i;
@@ -5922,7 +5964,7 @@ bool Item_cond::walk(Item_processor processor, enum_walk walk, uchar *arg)
 
 Item *Item_cond::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   List_iterator<Item> li(list);
   Item *item;
@@ -6148,7 +6190,7 @@ float Item_cond_and::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_cond_and::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   List_iterator_fast<Item> li(list);
   Item *item;
   null_value= 0;
@@ -6198,7 +6240,7 @@ float Item_cond_or::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_cond_or::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   List_iterator_fast<Item> li(list);
   Item *item;
   null_value=0;
@@ -6273,7 +6315,7 @@ float Item_func_isnull::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_isnull::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   /*
     Handle optimization if the argument can't be null
     This has to be here because of the test in update_used_tables().
@@ -6285,7 +6327,7 @@ longlong Item_func_isnull::val_int()
 
 longlong Item_is_not_null_test::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_is_not_null_test::val_int");
   if (!used_tables_cache && !with_subselect && !with_stored_program)
   {
@@ -6347,7 +6389,7 @@ Item_func_isnotnull::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_isnotnull::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return args[0]->is_null() ? 0 : 1;
 }
 
@@ -6412,7 +6454,7 @@ bool Item_func_like::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_like::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (!escape_evaluated && eval_escape_clause(current_thd))
     return error_int();
@@ -6455,7 +6497,7 @@ Item_func::optimize_type Item_func_like::select_optimize() const
   if (!res2->length()) // Can optimize empty wildcard: column LIKE ''
     return OPTIMIZE_OP;
 
-  DBUG_ASSERT(res2->ptr());
+  assert(res2->ptr());
   char first= res2->ptr()[0];
   return (first == wild_many || first == wild_one) ?
     OPTIMIZE_NONE : OPTIMIZE_OP;
@@ -6464,7 +6506,7 @@ Item_func::optimize_type Item_func_like::select_optimize() const
 
 bool Item_func_like::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   Disable_semijoin_flattening DSF(thd->lex->current_select(), true);
 
@@ -6555,7 +6597,7 @@ void Item_func_like::cleanup()
  */
 bool Item_func_like::eval_escape_clause(THD *thd)
 {
-  DBUG_ASSERT(!escape_evaluated);
+  assert(!escape_evaluated);
 
   String buf;
   String *escape_str= escape_item->val_str(&buf);
@@ -6672,7 +6714,7 @@ int Item_func_regex::regcomp(bool send_error)
 bool
 Item_func_regex::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   Disable_semijoin_flattening DSF(thd->lex->current_select(), true);
 
@@ -6730,7 +6772,7 @@ Item_func_regex::fix_fields(THD *thd, Item **ref)
 
 longlong Item_func_regex::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String tmp(buff,sizeof(buff),&my_charset_bin);
   String *res= args[0]->val_str(&tmp);
@@ -6965,7 +7007,7 @@ float Item_func_xor::get_filtering_effect(table_map filter_for_table,
                                           const MY_BITMAP *fields_to_ignore,
                                           double rows_in_table)
 {
-  DBUG_ASSERT(arg_count == 2);
+  assert(arg_count == 2);
 
   const float filter0=
     args[0]->get_filtering_effect(filter_for_table, read_tables,
@@ -7005,7 +7047,7 @@ float Item_func_xor::get_filtering_effect(table_map filter_for_table,
 
 longlong Item_func_xor::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int result= 0;
   null_value= false;
   for (uint i= 0; i < arg_count; i++)
@@ -7186,7 +7228,7 @@ Item *Item_func_le::negated_item()		/* a <= b  ->  a > b */
 */
 Item *Item_bool_rowready_func2::negated_item()
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -7256,7 +7298,7 @@ bool Item_equal::add(THD *thd, Item *c, Item_field *f)
     return false;
   if (!const_item)
   {
-    DBUG_ASSERT(f);
+    assert(f);
     const_item= c;
     compare_as_dates= f->is_temporal_with_date();
     return false;
@@ -7584,7 +7626,7 @@ longlong Item_equal::val_int()
 void Item_equal::fix_length_and_dec()
 {
   Item *item= get_first();
-  eval_item= cmp_item::get_comparator(item->result_type(),
+  eval_item= cmp_item::get_comparator(item->result_type(), item,
                                       item->collation.collation);
 }
 
@@ -7606,7 +7648,7 @@ bool Item_equal::walk(Item_processor processor, enum_walk walk, uchar *arg)
 
 Item *Item_equal::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   List_iterator<Item_field> it(fields);
   Item *item;
@@ -7655,7 +7697,7 @@ longlong Item_func_trig_cond::val_int()
 {
   if (trig_var == NULL)
   {
-    DBUG_ASSERT(m_join != NULL && m_idx >= 0);
+    assert(m_join != NULL && m_idx >= 0);
     switch(trig_type)
     {
     case IS_NOT_NULL_COMPL:
@@ -7665,7 +7707,7 @@ longlong Item_func_trig_cond::val_int()
       trig_var= &m_join->qep_tab[m_idx].found;
       break;
     default:
-      DBUG_ASSERT(false); /* purecov: inspected */
+      assert(false); /* purecov: inspected */
       return 0;
     }
   }
@@ -7695,7 +7737,7 @@ void Item_func_trig_cond::print(String *str, enum_query_type query_type)
     str->append("outer_field_is_not_null");
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   if (m_join != NULL)
   {
@@ -7758,7 +7800,7 @@ void Item_func_trig_cond::print(String *str, enum_query_type query_type)
 
 Item_field* Item_equal::get_subst_item(const Item_field *field)
 {
-  DBUG_ASSERT(field != NULL);
+  assert(field != NULL);
 
   const JOIN_TAB *field_tab= field->field->table->reginfo.join_tab;
 
@@ -7831,7 +7873,7 @@ Item_field* Item_equal::get_subst_item(const Item_field *field)
     */
     return fields.head();
   }
-  DBUG_ASSERT(FALSE);                          // Should never get here.
+  assert(FALSE);                          // Should never get here.
   return NULL;
 }
 
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index a0958a8d6d3e..7a1ccb4936a8 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_CMPFUNC_INCLUDED
 #define ITEM_CMPFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,9 +55,9 @@ class Arg_comparator: public Sql_alloc
   bool set_null;                   // TRUE <=> set owner->null_value
                                    //   when one of arguments is NULL.
   longlong (*get_value_a_func)(THD *thd, Item ***item_arg, Item **cache_arg,
-                               Item *warn_item, bool *is_null);
+                               const Item *warn_item, bool *is_null);
   longlong (*get_value_b_func)(THD *thd, Item ***item_arg, Item **cache_arg,
-                               Item *warn_item, bool *is_null);
+                               const Item *warn_item, bool *is_null);
   bool try_year_cmp_func(Item_result type);
   static bool get_date_from_const(Item *date_arg, Item *str_arg,
                                   ulonglong *value);
@@ -131,7 +138,7 @@ class Arg_comparator: public Sql_alloc
   */
   inline void set_cmp_context_for_datetime()
   {
-    DBUG_ASSERT(func == &Arg_comparator::compare_datetime);
+    assert(func == &Arg_comparator::compare_datetime);
     if ((*a)->is_temporal())
       (*a)->cmp_context= INT_RESULT;
     if ((*b)->is_temporal())
@@ -371,7 +378,7 @@ class Equal_creator :public Linear_comp_creator
   virtual const char* symbol(bool invert) const
   {
     // This will never be called with true.
-    DBUG_ASSERT(!invert);
+    assert(!invert);
     return "<=>";
   }
 
@@ -1393,7 +1400,19 @@ class cmp_item :public Sql_alloc
   virtual int cmp(Item *item)= 0;
   // for optimized IN with row
   virtual int compare(const cmp_item *item) const= 0;
-  static cmp_item* get_comparator(Item_result type, const CHARSET_INFO *cs);
+
+  /**
+    Find the appropriate comparator for the given type.
+
+    @param result_type  Used to find the appropriate comparator.
+    @param item         Item object used to distinguish temporal types.
+    @param cs           Charset
+
+    @return
+      New cmp_item_xxx object.
+  */
+  static cmp_item* get_comparator(Item_result result_type, const Item *item,
+                                  const CHARSET_INFO *cs);
   virtual cmp_item *make_same()= 0;
   virtual void store_value_by_template(cmp_item *tmpl, Item *item)
   {
@@ -1481,8 +1500,9 @@ class cmp_item_int : public cmp_item_scalar
 };
 
 /*
-  Compare items in the DATETIME context.
-  Values are obtained with help of the get_datetime_value() function.
+  Compare items of temporal type.
+  Values are obtained with: get_datetime_value() (DATE/DATETIME/TIMESTAMP) and
+                            get_time_value() (TIME).
   If the left item is a constant one then its value is cached in the
   lval_cache variable.
 */
@@ -1491,12 +1511,13 @@ class cmp_item_datetime : public cmp_item_scalar
   longlong value;
 public:
   /* Item used for issuing warnings. */
-  Item *warn_item;
+  const Item *warn_item;
   /* Cache for the left item. */
   Item *lval_cache;
+  /// Distinguish between DATE/DATETIME/TIMESTAMP and TIME
+  bool has_date;
 
-  cmp_item_datetime(Item *warn_item_arg)
-    :warn_item(warn_item_arg), lval_cache(0) {}
+  cmp_item_datetime(const Item *warn_item_arg);
   void store_value(Item *item);
   int cmp(Item *arg);
   int compare(const cmp_item *ci) const;
@@ -2014,17 +2035,17 @@ class Item_cond :public Item_bool_func
     :Item_bool_func(), list(nlist), abort_on_null(0) {}
   bool add(Item *item)
   {
-    DBUG_ASSERT(item);
+    assert(item);
     return list.push_back(item);
   }
   bool add_at_head(Item *item)
   {
-    DBUG_ASSERT(item);
+    assert(item);
     return list.push_front(item);
   }
   void add_at_head(List<Item> *nlist)
   {
-    DBUG_ASSERT(nlist->elements);
+    assert(nlist->elements);
     list.prepand(nlist);
   }
 
@@ -2301,7 +2322,7 @@ inline Item *and_conds(Item *a, Item *b)
 Item *and_expressions(Item *a, Item *b, Item **org_item);
 
 longlong get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
-                            Item *warn_item, bool *is_null);
+                            const Item *warn_item, bool *is_null);
 
 
 bool get_mysql_time_from_str(THD *thd, String *str, timestamp_type warn_type,
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 653715f590d3..15a1b9c0c466 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -247,7 +254,7 @@ class Create_func_aes_base : public Create_native_func
   virtual Item *create_native(THD *thd, LEX_STRING name,
                               PT_item_list *item_list)
   {
-    Item *func= NULL, *p1, *p2, *p3;
+    Item *func= NULL, *p1= NULL, *p2= NULL, *p3= NULL, *p4= NULL, *p5= NULL, *p6= NULL;
     int arg_count= 0;
 
     if (item_list != NULL)
@@ -270,6 +277,36 @@ class Create_func_aes_base : public Create_native_func
         func= create_aes(thd, p1, p2, p3);
         break;
       }
+    case 4:
+      {
+        p1= item_list->pop_front();
+        p2= item_list->pop_front();
+        p3= item_list->pop_front();
+        p4= item_list->pop_front();
+        func= create_aes(thd, p1, p2, p3, p4);
+        break;
+      }
+    case 5:
+      {
+        p1= item_list->pop_front();
+        p2= item_list->pop_front();
+        p3= item_list->pop_front();
+        p4= item_list->pop_front();
+        p5= item_list->pop_front();
+        func= create_aes(thd, p1, p2, p3, p4, p5);
+        break;
+      }
+    case 6:
+      {
+        p1= item_list->pop_front();
+        p2= item_list->pop_front();
+        p3= item_list->pop_front();
+        p4= item_list->pop_front();
+        p5= item_list->pop_front();
+        p6= item_list->pop_front();
+        func= create_aes(thd, p1, p2, p3, p4, p5, p6);
+        break;
+      }
     default:
       {
         my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str);
@@ -281,6 +318,9 @@ class Create_func_aes_base : public Create_native_func
   }
   virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2)= 0;
   virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3)= 0;
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4)= 0;
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5)= 0;
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5, Item *arg6)= 0;
 protected:
   Create_func_aes_base()
   {}
@@ -301,6 +341,18 @@ class Create_func_aes_encrypt : public Create_func_aes_base
   {
     return new (thd->mem_root) Item_func_aes_encrypt(POS(), arg1, arg2, arg3);
   }
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4)
+  {
+    return new (thd->mem_root) Item_func_aes_encrypt(POS(), arg1, arg2, arg3, arg4);
+  }
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5)
+  {
+    return new (thd->mem_root) Item_func_aes_encrypt(POS(), arg1, arg2, arg3, arg4, arg5);
+  }
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5, Item *arg6)
+  {
+    return new (thd->mem_root) Item_func_aes_encrypt(POS(), arg1, arg2, arg3, arg4, arg5, arg6 );
+  }
 
   static Create_func_aes_encrypt s_singleton;
 
@@ -321,7 +373,18 @@ class Create_func_aes_decrypt : public Create_func_aes_base
   {
     return new (thd->mem_root) Item_func_aes_decrypt(POS(), arg1, arg2, arg3);
   }
-
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4)
+  {
+    return new (thd->mem_root) Item_func_aes_decrypt(POS(), arg1, arg2, arg3, arg4);
+  }
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5)
+  {
+    return new (thd->mem_root) Item_func_aes_decrypt(POS(), arg1, arg2, arg3, arg4, arg5);
+  }
+  virtual Item *create_aes(THD *thd, Item *arg1, Item *arg2, Item *arg3, Item *arg4, Item *arg5, Item *arg6)
+  {
+    return new (thd->mem_root) Item_func_aes_decrypt(POS(), arg1, arg2, arg3, arg4, arg5, arg6 );
+  }
   static Create_func_aes_decrypt s_singleton;
 
 protected:
@@ -2483,6 +2546,17 @@ class Create_func_json_depth : public Create_native_func
   virtual ~Create_func_json_depth() {}
 };
 
+class Create_func_json_pretty : public Create_func_arg1
+{
+public:
+  static Create_func_json_pretty s_singleton;
+  virtual Item *create(THD *thd, Item *arg1)
+  {
+    return new (thd->mem_root) Item_func_json_pretty(POS(), arg1);
+  }
+};
+Create_func_json_pretty Create_func_json_pretty::s_singleton;
+
 class Create_func_json_type : public Create_func_arg1
 {
 public:
@@ -2682,19 +2756,52 @@ class Create_func_issimple_deprecated : public Create_func_issimple
 };
 Create_func_issimple_deprecated Create_func_issimple_deprecated::s_singleton;
 
+class Create_func_json_merge_patch : public Create_native_func
+{
+public:
+  virtual Item *create_native(THD *thd, LEX_STRING name,
+                              PT_item_list *item_list);
+
+  static Create_func_json_merge_patch s_singleton;
+};
+Create_func_json_merge_patch Create_func_json_merge_patch::s_singleton;
 
-class Create_func_json_merge : public Create_native_func
+class Create_func_json_merge_preserve : public Create_native_func
 {
 public:
   virtual Item *create_native(THD *thd, LEX_STRING name,
                               PT_item_list *item_list);
 
-  static Create_func_json_merge s_singleton;
+  static Create_func_json_merge_preserve s_singleton;
 
 protected:
-  Create_func_json_merge() {}
-  virtual ~Create_func_json_merge() {}
+  Create_func_json_merge_preserve() {}
+  virtual ~Create_func_json_merge_preserve() {}
 };
+Create_func_json_merge_preserve Create_func_json_merge_preserve::s_singleton;
+
+class Create_func_json_merge : public Create_func_json_merge_preserve
+{
+public:
+  static Create_func_json_merge s_singleton;
+  virtual Item *create_native(THD *thd, LEX_STRING name,
+                              PT_item_list *item_list)
+  {
+    Item *func= Create_func_json_merge_preserve::create_native(thd, name,
+                                                               item_list);
+    /*
+      JSON_MERGE is a deprecated alias for JSON_MERGE_PRESERVE. Warn
+      the users and recommend that they specify explicitly what kind
+      of merge operation they want.
+    */
+    if (func != NULL)
+      push_deprecated_warn(thd, "JSON_MERGE",
+                           "JSON_MERGE_PRESERVE/JSON_MERGE_PATCH");
+
+    return func;
+  }
+};
+Create_func_json_merge Create_func_json_merge::s_singleton;
 
 class Create_func_json_quote : public Create_native_func
 {
@@ -2709,6 +2816,17 @@ class Create_func_json_quote : public Create_native_func
   virtual ~Create_func_json_quote() {}
 };
 
+class Create_func_json_storage_size : public Create_func_arg1
+{
+public:
+  static Create_func_json_storage_size s_singleton;
+  virtual Item *create(THD *thd, Item *arg1)
+  {
+    return new (thd->mem_root) Item_func_json_storage_size(POS(), arg1);
+  }
+};
+Create_func_json_storage_size Create_func_json_storage_size::s_singleton;
+
 class Create_func_json_unquote : public Create_native_func
 {
 public:
@@ -2815,7 +2933,7 @@ class Create_func_length : public Create_func_arg1
 };
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 class Create_func_like_range_min : public Create_func_arg2
 {
 public:
@@ -4104,7 +4222,11 @@ class Create_func_year_week : public Create_native_func
 Item*
 Create_qfunc::create_func(THD *thd, LEX_STRING name, PT_item_list *item_list)
 {
-  return create(thd, NULL_STR, name, false, item_list);
+  LEX_STRING db= NULL_STR;
+  if (thd->lex->copy_db_to(&db.str, &db.length))
+    return NULL;
+
+  return create(thd, db, name, false, item_list);
 }
 
 
@@ -4115,7 +4237,7 @@ Item*
 Create_udf_func::create_func(THD *thd, LEX_STRING name, PT_item_list *item_list)
 {
   udf_func *udf= find_udf(name.str, name.length);
-  DBUG_ASSERT(udf);
+  assert(udf);
   return create(thd, udf, item_list);
 }
 
@@ -4125,8 +4247,8 @@ Create_udf_func::create(THD *thd, udf_func *udf, PT_item_list *item_list)
 {
   DBUG_ENTER("Create_udf_func::create");
 
-  DBUG_ASSERT(   (udf->type == UDFTYPE_FUNCTION)
-              || (udf->type == UDFTYPE_AGGREGATE));
+  assert(   (udf->type == UDFTYPE_FUNCTION)
+            || (udf->type == UDFTYPE_AGGREGATE));
 
   Item *func= NULL;
   POS pos;
@@ -6128,12 +6250,19 @@ Create_func_validate::create(THD *thd, Item *arg1)
   return new (thd->mem_root) Item_func_validate(POS(), arg1);
 }
 
-
-Create_func_json_merge Create_func_json_merge::s_singleton;
+Item*
+Create_func_json_merge_patch::create_native(THD *thd, LEX_STRING name,
+                                            PT_item_list *item_list)
+{
+  int arg_count= item_list ? item_list->elements() : 0;
+  if (arg_count < 2)
+    my_error(ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT, MYF(0), name.str);
+  return new (thd->mem_root) Item_func_json_merge_patch(thd, POS(), item_list);
+}
 
 Item*
-Create_func_json_merge::create_native(THD *thd, LEX_STRING name,
-                                     PT_item_list *item_list)
+Create_func_json_merge_preserve::create_native(THD *thd, LEX_STRING name,
+                                               PT_item_list *item_list)
 {
   Item* func= NULL;
   int arg_count= 0;
@@ -6149,7 +6278,8 @@ Create_func_json_merge::create_native(THD *thd, LEX_STRING name,
   }
   else
   {
-    func= new (thd->mem_root) Item_func_json_merge(thd, POS(), item_list);
+    func= new (thd->mem_root) Item_func_json_merge_preserve(thd, POS(),
+                                                            item_list);
   }
 
   return func;
@@ -6300,7 +6430,7 @@ Create_func_length::create(THD *thd, Item *arg1)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 Create_func_like_range_min Create_func_like_range_min::s_singleton;
 
 Item*
@@ -7526,6 +7656,7 @@ static Native_func_registry func_array[] =
   { { C_STRING_WITH_LEN("JSON_CONTAINS_PATH") }, BUILDER(Create_func_json_contains_path)},
   { { C_STRING_WITH_LEN("JSON_LENGTH") }, BUILDER(Create_func_json_length)},
   { { C_STRING_WITH_LEN("JSON_DEPTH") }, BUILDER(Create_func_json_depth)},
+  { { C_STRING_WITH_LEN("JSON_PRETTY") }, BUILDER(Create_func_json_pretty)},
   { { C_STRING_WITH_LEN("JSON_TYPE") }, BUILDER(Create_func_json_type)},
   { { C_STRING_WITH_LEN("JSON_KEYS") }, BUILDER(Create_func_json_keys)},
   { { C_STRING_WITH_LEN("JSON_EXTRACT") }, BUILDER(Create_func_json_extract)},
@@ -7539,7 +7670,10 @@ static Native_func_registry func_array[] =
   { { C_STRING_WITH_LEN("JSON_ARRAY") }, BUILDER(Create_func_json_array)},
   { { C_STRING_WITH_LEN("JSON_REMOVE") }, BUILDER(Create_func_json_remove)},
   { { C_STRING_WITH_LEN("JSON_MERGE") }, BUILDER(Create_func_json_merge)},
+  { { C_STRING_WITH_LEN("JSON_MERGE_PATCH") }, BUILDER(Create_func_json_merge_patch)},
+  { { C_STRING_WITH_LEN("JSON_MERGE_PRESERVE") }, BUILDER(Create_func_json_merge_preserve)},
   { { C_STRING_WITH_LEN("JSON_QUOTE") }, BUILDER(Create_func_json_quote)},
+  { { C_STRING_WITH_LEN("JSON_STORAGE_SIZE") }, BUILDER(Create_func_json_storage_size)},
   { { C_STRING_WITH_LEN("JSON_UNQUOTE") }, BUILDER(Create_func_json_unquote)},
   { { C_STRING_WITH_LEN("IS_FREE_LOCK") }, BUILDER(Create_func_is_free_lock)},
   { { C_STRING_WITH_LEN("IS_USED_LOCK") }, BUILDER(Create_func_is_used_lock)},
@@ -7548,7 +7682,7 @@ static Native_func_registry func_array[] =
   { { C_STRING_WITH_LEN("LCASE") }, BUILDER(Create_func_lower)},
   { { C_STRING_WITH_LEN("LEAST") }, BUILDER(Create_func_least)},
   { { C_STRING_WITH_LEN("LENGTH") }, BUILDER(Create_func_length)},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   { { C_STRING_WITH_LEN("LIKE_RANGE_MIN") }, BUILDER(Create_func_like_range_min)},
   { { C_STRING_WITH_LEN("LIKE_RANGE_MAX") }, BUILDER(Create_func_like_range_max)},
 #endif
@@ -7795,7 +7929,7 @@ int item_create_init()
       DBUG_RETURN(1);
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (uint i=0 ; i < native_functions_hash.records ; i++)
   {
     func= (Native_func_registry*) my_hash_element(& native_functions_hash, i);
@@ -7990,7 +8124,7 @@ create_func_cast(THD *thd, const POS &pos, Item *a, const Cast_type *type)
   }
   default:
   {
-    DBUG_ASSERT(0);
+    assert(0);
     res= 0;
     break;
   }
@@ -8047,7 +8181,7 @@ Item *create_temporal_literal(THD *thd,
                                                   status.fractional_digits);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   if (item)
diff --git a/sql/item_create.h b/sql/item_create.h
index d168ad76281c..8a87ce3769af 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 38cb61d866c5..d759e8ddba8e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -71,7 +78,7 @@ bool check_reserved_words(LEX_STRING *name)
 
 bool eval_const_cond(THD *thd, Item *cond, bool *value)
 {
-  DBUG_ASSERT(cond->const_item());
+  assert(cond->const_item());
   *value= cond->val_int();
   return thd->is_error();
 }
@@ -210,7 +217,7 @@ bool Item_func::itemize(Parse_context *pc, Item **res)
 bool
 Item_func::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0 || basic_const_item());
+  assert(fixed == 0 || basic_const_item());
 
   Item **arg,**arg_end;
   uchar buff[STACK_BUFF_ALLOC];			// Max argument in function
@@ -265,9 +272,9 @@ bool Item_func::fix_func_arg(THD *thd, Item **arg)
   else
   {
     /*  we have to fetch allowed_arg_cols from first argument */
-    DBUG_ASSERT(arg == args); // it is first argument
+    assert(arg == args); // it is first argument
     allowed_arg_cols= item->cols();
-    DBUG_ASSERT(allowed_arg_cols); // Can't be 0 any more
+    assert(allowed_arg_cols); // Can't be 0 any more
   }
 
   maybe_null|=            item->maybe_null;
@@ -375,7 +382,7 @@ void Item_func::traverse_cond(Cond_traverser traverser,
 
 Item *Item_func::transform(Item_transformer transformer, uchar *argument)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   if (arg_count)
   {
@@ -591,7 +598,7 @@ Field *Item_func::tmp_table_field(TABLE *table)
   case ROW_RESULT:
   default:
     // This case should never be chosen
-    DBUG_ASSERT(0);
+    assert(0);
     field= 0;
     break;
   }
@@ -603,7 +610,7 @@ Field *Item_func::tmp_table_field(TABLE *table)
 
 my_decimal *Item_func::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   longlong nr= val_int();
   if (null_value)
     return 0; /* purecov: inspected */
@@ -637,7 +644,7 @@ type_conversion_status Item_func::save_possibly_as_json(Field *field,
 
 String *Item_real_func::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double nr= val_real();
   if (null_value)
     return 0; /* purecov: inspected */
@@ -648,7 +655,7 @@ String *Item_real_func::val_str(String *str)
 
 my_decimal *Item_real_func::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   double nr= val_real();
   if (null_value)
     return 0; /* purecov: inspected */
@@ -715,7 +722,7 @@ void Item_func::count_datetime_length(Item **item, uint nitems)
       len+= MAX_TIME_WIDTH;
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
   fix_char_length(len);
 }
@@ -852,12 +859,12 @@ Item_func::contributes_to_filter(table_map read_tables,
                                  table_map filter_for_table,
                                  const MY_BITMAP *fields_to_ignore) const
 {
-  DBUG_ASSERT((read_tables & filter_for_table) == 0);
+  assert((read_tables & filter_for_table) == 0);
   /*
     Multiple equality (Item_equal) should not call this function
     because it would reject valid comparisons.
   */
-  DBUG_ASSERT(functype() != MULT_EQUAL_FUNC);
+  assert(functype() != MULT_EQUAL_FUNC);
 
    /*
      To contribute to filering effect, the condition must refer to
@@ -943,7 +950,7 @@ Item_func::contributes_to_filter(table_map read_tables,
         Already checked that this predicate does not refer to tables
         later in the join sequence. Verify it:
       */
-      DBUG_ASSERT(!(used_tabs & (~read_tables & ~filter_for_table)));
+      assert(!(used_tabs & (~read_tables & ~filter_for_table)));
       found_comparable= true;
     }
   }
@@ -997,7 +1004,7 @@ Item_field *get_gc_for_expr(Item_func **func, Field *fld, Item_result type)
       return NULL;
     expr= down_cast<Item_func*>(expr->arguments()[0]);
   }
-  DBUG_ASSERT(expr->can_be_substituted_for_gc());
+  assert(expr->can_be_substituted_for_gc());
 
   if (type == fld->result_type() && (*func)->eq(expr, false))
   {
@@ -1139,7 +1146,7 @@ void Item_func::replace_argument(THD *thd, Item **oldpp, Item *newp)
 
 double Item_int_func::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   return unsigned_flag ? (double) ((ulonglong) val_int()) : (double) val_int();
 }
@@ -1147,7 +1154,7 @@ double Item_int_func::val_real()
 
 String *Item_int_func::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong nr=val_int();
   if (null_value)
     return 0;
@@ -1193,11 +1200,11 @@ void Item_num_op::find_num_type(void)
 {
   DBUG_ENTER("Item_num_op::find_num_type");
   DBUG_PRINT("info", ("name %s", func_name()));
-  DBUG_ASSERT(arg_count == 2);
+  assert(arg_count == 2);
   Item_result r0= args[0]->numeric_context_result_type();
   Item_result r1= args[1]->numeric_context_result_type();
   
-  DBUG_ASSERT(r0 != STRING_RESULT && r1 != STRING_RESULT);
+  assert(r0 != STRING_RESULT && r1 != STRING_RESULT);
 
   if (r0 == REAL_RESULT || r1 == REAL_RESULT)
   {
@@ -1205,7 +1212,7 @@ void Item_num_op::find_num_type(void)
       Since DATE/TIME/DATETIME data types return INT_RESULT/DECIMAL_RESULT
       type codes, we should never get to here when both fields are temporal.
     */
-    DBUG_ASSERT(!args[0]->is_temporal() || !args[1]->is_temporal());
+    assert(!args[0]->is_temporal() || !args[1]->is_temporal());
     count_real_length(args, arg_count);
     max_length= float_length(decimals);
     hybrid_type= REAL_RESULT;
@@ -1217,7 +1224,7 @@ void Item_num_op::find_num_type(void)
   }
   else
   {
-    DBUG_ASSERT(r0 == INT_RESULT && r1 == INT_RESULT);
+    assert(r0 == INT_RESULT && r1 == INT_RESULT);
     decimals= 0;
     hybrid_type=INT_RESULT;
     result_precision();
@@ -1253,7 +1260,7 @@ void Item_func_num1::find_num_type()
   case DECIMAL_RESULT:
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   DBUG_PRINT("info", ("Type: %s",
                       (hybrid_type == REAL_RESULT ? "REAL_RESULT" :
@@ -1340,7 +1347,7 @@ void Item_func_numhybrid::fix_length_and_dec()
 
 String *Item_func_numhybrid::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (hybrid_type) {
   case DECIMAL_RESULT:
   {
@@ -1382,7 +1389,7 @@ String *Item_func_numhybrid::val_str(String *str)
     }
     return str_op(&str_value);
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return str;
 }
@@ -1390,7 +1397,7 @@ String *Item_func_numhybrid::val_str(String *str)
 
 double Item_func_numhybrid::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (hybrid_type) {
   case DECIMAL_RESULT:
   {
@@ -1427,7 +1434,7 @@ double Item_func_numhybrid::val_real()
 			     &end_not_used, &err_not_used) : 0.0);
   }
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0.0;
 }
@@ -1435,7 +1442,7 @@ double Item_func_numhybrid::val_real()
 
 longlong Item_func_numhybrid::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (hybrid_type) {
   case DECIMAL_RESULT:
   {
@@ -1474,7 +1481,7 @@ longlong Item_func_numhybrid::val_int()
     return (*(cs->cset->strtoll10))(cs, res->ptr(), &end, &err_not_used);
   }
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return 0;
 }
@@ -1483,7 +1490,7 @@ longlong Item_func_numhybrid::val_int()
 my_decimal *Item_func_numhybrid::val_decimal(my_decimal *decimal_value)
 {
   my_decimal *val= decimal_value;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (hybrid_type) {
   case DECIMAL_RESULT:
     val= decimal_op(decimal_value);
@@ -1523,7 +1530,7 @@ my_decimal *Item_func_numhybrid::val_decimal(my_decimal *decimal_value)
   }  
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return val;
 }
@@ -1531,7 +1538,7 @@ my_decimal *Item_func_numhybrid::val_decimal(my_decimal *decimal_value)
 
 bool Item_func_numhybrid::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (field_type())
   {
   case MYSQL_TYPE_DATE:
@@ -1548,7 +1555,7 @@ bool Item_func_numhybrid::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_numhybrid::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   switch (field_type())
   {
   case MYSQL_TYPE_TIME:
@@ -2006,7 +2013,7 @@ my_decimal *Item_func_minus::decimal_op(my_decimal *decimal_value)
 
 double Item_func_mul::real_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real() * args[1]->val_real();
   if ((null_value=args[0]->null_value || args[1]->null_value))
     return 0.0;
@@ -2016,7 +2023,7 @@ double Item_func_mul::real_op()
 
 longlong Item_func_mul::int_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong a= args[0]->val_int();
   longlong b= args[1]->val_int();
   longlong res;
@@ -2130,7 +2137,7 @@ void Item_func_mul::result_precision()
 
 double Item_func_div::real_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   double val2= args[1]->val_real();
   if ((null_value= args[0]->null_value || args[1]->null_value))
@@ -2179,7 +2186,7 @@ void Item_func_div::result_precision()
                             DECIMAL_MAX_PRECISION);
 
   if (result_type() == DECIMAL_RESULT)
-    DBUG_ASSERT(precision > 0);
+    assert(precision > 0);
 
   /* Integer operations keep unsigned_flag if one of arguments is unsigned */
   if (result_type() == INT_RESULT)
@@ -2221,7 +2228,7 @@ void Item_func_div::fix_length_and_dec()
     result_precision();
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   maybe_null= 1; // devision by zero
   DBUG_VOID_RETURN;
@@ -2231,7 +2238,7 @@ void Item_func_div::fix_length_and_dec()
 /* Integer division */
 longlong Item_func_int_div::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   /*
     Perform division using DECIMAL math if either of the operands has a
@@ -2263,7 +2270,7 @@ longlong Item_func_int_div::val_int()
     my_decimal truncated;
     const bool do_truncate= true;
     if (my_decimal_round(E_DEC_FATAL_ERROR, &tmp, 0, do_truncate, &truncated))
-      DBUG_ASSERT(false);
+      assert(false);
 
     longlong res;
     if (my_decimal2int(E_DEC_FATAL_ERROR, &truncated, unsigned_flag, &res) &
@@ -2317,7 +2324,7 @@ void Item_func_int_div::fix_length_and_dec()
 
 longlong Item_func_mod::int_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong val0= args[0]->val_int();
   longlong val1= args[1]->val_int();
   bool val0_negative, val1_negative;
@@ -2348,7 +2355,7 @@ longlong Item_func_mod::int_op()
 
 double Item_func_mod::real_op()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   double val2=  args[1]->val_real();
   if ((null_value= args[0]->null_value || args[1]->null_value))
@@ -2665,7 +2672,7 @@ Item_func_latlongfromgeohash::decode_geohash(String *geohash,
       return true;
     }
 
-    DBUG_ASSERT(converted_character >= 0 && converted_character <= 31);
+    assert(converted_character >= 0 && converted_character <= 31);
 
     /*
      This loop decodes 5 bits of data. Every even bit (counting from 0) is 
@@ -2694,10 +2701,10 @@ Item_func_latlongfromgeohash::decode_geohash(String *geohash,
 
       number_of_bits_used++;
 
-      DBUG_ASSERT(latitude_value >= lower_latitude &&
-                  latitude_value <= upper_latitude &&
-                  longitude_value >= lower_longitude &&
-                  longitude_value <= upper_longitude);
+      assert(latitude_value >= lower_latitude &&
+             latitude_value <= upper_latitude &&
+             longitude_value >= lower_longitude &&
+             longitude_value <= upper_longitude);
     }
   }
 
@@ -2717,11 +2724,11 @@ Item_func_latlongfromgeohash::decode_geohash(String *geohash,
       Final rounding should be done carefully in a way that
                 min <= round(value) <= max
   */
-  DBUG_ASSERT(latitude_value - latitude_accuracy <= *result_latitude);
-  DBUG_ASSERT(*result_latitude <= latitude_value + latitude_accuracy);
+  assert(latitude_value - latitude_accuracy <= *result_latitude);
+  assert(*result_latitude <= latitude_value + latitude_accuracy);
 
-  DBUG_ASSERT(longitude_value - longitude_accuracy <= *result_longitude);
-  DBUG_ASSERT(*result_longitude <= longitude_value + longitude_accuracy);
+  assert(longitude_value - longitude_accuracy <= *result_longitude);
+  assert(*result_longitude <= longitude_value + longitude_accuracy);
 
   return false;
 }
@@ -2750,8 +2757,8 @@ double Item_func_latlongfromgeohash::round_latlongitude(double latlongitude,
                                                         double upper_limit)
 {
   // Ensure that we don't start with an impossible case to solve.
-  DBUG_ASSERT(lower_limit <= latlongitude);
-  DBUG_ASSERT(upper_limit >= latlongitude);
+  assert(lower_limit <= latlongitude);
+  assert(upper_limit >= latlongitude);
 
   if (error_range == 0.0)
   {
@@ -2796,7 +2803,7 @@ double Item_func_latlongfromgeohash::round_latlongitude(double latlongitude,
 */
 double Item_func_latlongfromgeohash::val_real()
 {
-  DBUG_ASSERT(fixed == TRUE);
+  assert(fixed == TRUE);
 
   String buf;
   String *input_value= args[0]->val_str_ascii(&buf);
@@ -2840,7 +2847,7 @@ void Item_dec_func::fix_length_and_dec()
 /** Gateway to natural LOG function. */
 double Item_func_ln::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value= args[0]->null_value))
     return 0.0;
@@ -2861,7 +2868,7 @@ double Item_func_ln::val_real()
 */ 
 double Item_func_log::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value= args[0]->null_value))
     return 0.0;
@@ -2887,7 +2894,7 @@ double Item_func_log::val_real()
 
 double Item_func_log2::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
 
   if ((null_value=args[0]->null_value))
@@ -2902,7 +2909,7 @@ double Item_func_log2::val_real()
 
 double Item_func_log10::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value= args[0]->null_value))
     return 0.0;
@@ -2916,7 +2923,7 @@ double Item_func_log10::val_real()
 
 double Item_func_exp::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0; /* purecov: inspected */
@@ -2925,7 +2932,7 @@ double Item_func_exp::val_real()
 
 double Item_func_sqrt::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=(args[0]->null_value || value < 0)))
     return 0.0; /* purecov: inspected */
@@ -2934,7 +2941,7 @@ double Item_func_sqrt::val_real()
 
 double Item_func_pow::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   double val2= args[1]->val_real();
   if ((null_value=(args[0]->null_value || args[1]->null_value)))
@@ -2946,7 +2953,7 @@ double Item_func_pow::val_real()
 
 double Item_func_acos::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   /* One can use this to defer SELECT processing. */
   DEBUG_SYNC(current_thd, "before_acos_function");
   // the volatile's for BUG #2338 to calm optimizer down (because of gcc's bug)
@@ -2958,7 +2965,7 @@ double Item_func_acos::val_real()
 
 double Item_func_asin::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   // the volatile's for BUG #2338 to calm optimizer down (because of gcc's bug)
   volatile double value= args[0]->val_real();
   if ((null_value=(args[0]->null_value || (value < -1.0 || value > 1.0))))
@@ -2968,7 +2975,7 @@ double Item_func_asin::val_real()
 
 double Item_func_atan::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0;
@@ -2984,7 +2991,7 @@ double Item_func_atan::val_real()
 
 double Item_func_cos::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0;
@@ -2993,7 +3000,7 @@ double Item_func_cos::val_real()
 
 double Item_func_sin::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0;
@@ -3002,7 +3009,7 @@ double Item_func_sin::val_real()
 
 double Item_func_tan::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0;
@@ -3012,7 +3019,7 @@ double Item_func_tan::val_real()
 
 double Item_func_cot::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0.0;
@@ -3025,7 +3032,7 @@ double Item_func_cot::val_real()
 
 longlong Item_func_shift_left::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint shift;
   ulonglong res= ((ulonglong) args[0]->val_int() <<
 		  (shift=(uint) args[1]->val_int()));
@@ -3040,7 +3047,7 @@ longlong Item_func_shift_left::val_int()
 
 longlong Item_func_shift_right::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint shift;
   ulonglong res= (ulonglong) args[0]->val_int() >>
     (shift=(uint) args[1]->val_int());
@@ -3056,7 +3063,7 @@ longlong Item_func_shift_right::val_int()
 
 longlong Item_func_bit_neg::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong res= (ulonglong) args[0]->val_int();
   if ((null_value=args[0]->null_value))
     return 0;
@@ -3116,7 +3123,7 @@ void Item_func_int_val::find_num_type()
     }
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   DBUG_PRINT("info", ("Type: %s",
                       (hybrid_type == REAL_RESULT ? "REAL_RESULT" :
@@ -3297,7 +3304,7 @@ void Item_func_round::fix_length_and_dec()
     break;
   }
   default:
-    DBUG_ASSERT(0); /* This result type isn't handled */
+    assert(0); /* This result type isn't handled */
   }
 }
 
@@ -3491,7 +3498,7 @@ bool Item_func_rand::fix_fields(THD *thd,Item **ref)
 
 double Item_func_rand::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (arg_count)
   {
     if (!args[0]->const_item())
@@ -3520,7 +3527,7 @@ void Item_func_sign::fix_length_and_dec()
 
 longlong Item_func_sign::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   null_value=args[0]->null_value;
   return value < 0.0 ? -1 : (value > 0 ? 1 : 0);
@@ -3537,7 +3544,7 @@ void Item_func_units::fix_length_and_dec()
 
 double Item_func_units::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value= args[0]->val_real();
   if ((null_value=args[0]->null_value))
     return 0;
@@ -3693,7 +3700,7 @@ uint Item_func_min_max::cmp_times(longlong *value)
 
 String *Item_func_min_max::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (compare_as_dates)
   {
     if (is_temporal())
@@ -3789,7 +3796,7 @@ String *Item_func_min_max::val_str(String *str)
   case ROW_RESULT:
   default:
     // This case should never be chosen
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   return 0;					// Keep compiler happy
@@ -3798,7 +3805,7 @@ String *Item_func_min_max::val_str(String *str)
 
 bool Item_func_min_max::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (compare_as_dates)
   {
     longlong result;
@@ -3817,7 +3824,7 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   case MYSQL_TYPE_DATETIME:
   case MYSQL_TYPE_TIMESTAMP:
   case MYSQL_TYPE_DATE:
-    DBUG_ASSERT(0); // Should have been processed in "compare_as_dates" block.
+    assert(0); // Should have been processed in "compare_as_dates" block.
   default:
     return get_date_from_non_temporal(ltime, fuzzydate);
   }
@@ -3826,7 +3833,7 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_func_min_max::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (compare_as_dates)
   {
     longlong result;
@@ -3853,7 +3860,7 @@ bool Item_func_min_max::get_time(MYSQL_TIME *ltime)
   case MYSQL_TYPE_DATE:
   case MYSQL_TYPE_TIMESTAMP:
   case MYSQL_TYPE_DATETIME:
-    DBUG_ASSERT(0); // Should have been processed in "compare_as_dates" block.
+    assert(0); // Should have been processed in "compare_as_dates" block.
   default:
     return get_time_from_non_temporal(ltime);
     break;
@@ -3863,7 +3870,7 @@ bool Item_func_min_max::get_time(MYSQL_TIME *ltime)
 
 double Item_func_min_max::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double value=0.0;
   if (compare_as_dates)
   {
@@ -3890,7 +3897,7 @@ double Item_func_min_max::val_real()
 
 longlong Item_func_min_max::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong value=0;
   if (compare_as_dates)
   {
@@ -3934,7 +3941,7 @@ mysql> select least('11', '2'), least('11', '2')+0, concat(least(11,2));
 
 my_decimal *Item_func_min_max::val_decimal(my_decimal *dec)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   my_decimal tmp_buf, *tmp, *res= NULL;
 
   if (compare_as_dates)
@@ -3983,7 +3990,7 @@ my_decimal *Item_func_min_max::val_decimal(my_decimal *dec)
 
 double Item_func_rollup_const::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double res= args[0]->val_real();
   if ((null_value= args[0]->null_value))
     return 0.0;
@@ -3992,7 +3999,7 @@ double Item_func_rollup_const::val_real()
 
 longlong Item_func_rollup_const::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong res= args[0]->val_int();
   if ((null_value= args[0]->null_value))
     return 0;
@@ -4001,7 +4008,7 @@ longlong Item_func_rollup_const::val_int()
 
 String *Item_func_rollup_const::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(str);
   if ((null_value= args[0]->null_value))
     return 0;
@@ -4010,7 +4017,7 @@ String *Item_func_rollup_const::val_str(String *str)
 
 my_decimal *Item_func_rollup_const::val_decimal(my_decimal *dec)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   my_decimal *res= args[0]->val_decimal(dec);
   if ((null_value= args[0]->null_value))
     return 0;
@@ -4020,7 +4027,7 @@ my_decimal *Item_func_rollup_const::val_decimal(my_decimal *dec)
 
 bool Item_func_rollup_const::val_json(Json_wrapper *result)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   bool res= args[0]->val_json(result);
   null_value= args[0]->null_value;
   return res;
@@ -4029,7 +4036,7 @@ bool Item_func_rollup_const::val_json(Json_wrapper *result)
 
 longlong Item_func_length::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=args[0]->val_str(&value);
   if (!res)
   {
@@ -4043,7 +4050,7 @@ longlong Item_func_length::val_int()
 
 longlong Item_func_char_length::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=args[0]->val_str(&value);
   if (!res)
   {
@@ -4057,7 +4064,7 @@ longlong Item_func_char_length::val_int()
 
 longlong Item_func_coercibility::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   null_value= 0;
   return (longlong) args[0]->collation.derivation;
 }
@@ -4072,7 +4079,7 @@ void Item_func_locate::fix_length_and_dec()
 
 longlong Item_func_locate::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *a=args[0]->val_str(&value1);
   String *b=args[1]->val_str(&value2);
   if (!a || !b)
@@ -4141,7 +4148,7 @@ longlong Item_func_validate_password_strength::val_int()
 
 longlong Item_func_field::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (cmp_type == STRING_RESULT)
   {
@@ -4207,7 +4214,7 @@ void Item_func_field::fix_length_and_dec()
 
 longlong Item_func_ascii::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=args[0]->val_str(&value);
   if (!res)
   {
@@ -4220,7 +4227,7 @@ longlong Item_func_ascii::val_int()
 
 longlong Item_func_ord::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=args[0]->val_str(&value);
   if (!res)
   {
@@ -4259,7 +4266,7 @@ void Item_func_find_in_set::fix_length_and_dec()
       if (find)
       {
         // find is not NULL pointer so args[0] is not a null-value
-        DBUG_ASSERT(!args[0]->null_value);
+        assert(!args[0]->null_value);
 	enum_value= find_type(((Field_enum*) field)->typelib,find->ptr(),
 			      find->length(), 0);
 	enum_bit=0;
@@ -4275,17 +4282,17 @@ static const char separator=',';
 
 longlong Item_func_find_in_set::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (enum_value)
   {
     // enum_value is set iff args[0]->const_item() in fix_length_and_dec().
-    DBUG_ASSERT(args[0]->const_item());
+    assert(args[0]->const_item());
 
     ulonglong tmp= (ulonglong) args[1]->val_int();
     null_value= args[1]->null_value;
     /* 
       No need to check args[0]->null_value since enum_value is set iff
-      args[0] is a non-null const item. Note: no DBUG_ASSERT on
+      args[0] is a non-null const item. Note: no assert on
       args[0]->null_value here because args[0] may have been replaced
       by an Item_cache on which val_int() has not been called. See
       BUG#11766317
@@ -4353,7 +4360,7 @@ longlong Item_func_find_in_set::val_int()
 
 longlong Item_func_bit_count::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong value= (ulonglong) args[0]->val_int();
   if ((null_value= args[0]->null_value))
     return 0; /* purecov: inspected */
@@ -4527,7 +4534,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func,
         case ROW_RESULT:
         default:
           // This case should never be chosen
-          DBUG_ASSERT(0);
+          assert(0);
           break;
         }
       }
@@ -4606,7 +4613,7 @@ bool udf_handler::get_arguments()
     case ROW_RESULT:
     default:
       // This case should never be chosen
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
@@ -4722,7 +4729,7 @@ void Item_udf_func::print(String *str, enum_query_type query_type)
 
 double Item_func_udf_float::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_udf_float::val");
   DBUG_PRINT("info",("result_type: %d  arg_count: %d",
 		     args[0]->result_type(), arg_count));
@@ -4732,7 +4739,7 @@ double Item_func_udf_float::val_real()
 
 String *Item_func_udf_float::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double nr= val_real();
   if (null_value)
     return 0;					/* purecov: inspected */
@@ -4743,7 +4750,7 @@ String *Item_func_udf_float::val_str(String *str)
 
 longlong Item_func_udf_int::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_udf_int::val_int");
   DBUG_RETURN(udf.val_int(&null_value));
 }
@@ -4751,7 +4758,7 @@ longlong Item_func_udf_int::val_int()
 
 String *Item_func_udf_int::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong nr=val_int();
   if (null_value)
     return 0;
@@ -4784,7 +4791,7 @@ double Item_func_udf_decimal::val_real()
 
 my_decimal *Item_func_udf_decimal::val_decimal(my_decimal *dec_buf)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_udf_decimal::val_decimal");
   DBUG_PRINT("info",("result_type: %d  arg_count: %d",
                      args[0]->result_type(), arg_count));
@@ -4825,7 +4832,7 @@ void Item_func_udf_str::fix_length_and_dec()
 
 String *Item_func_udf_str::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=udf.val_str(str,&str_value);
   null_value = !res;
   return res;
@@ -4834,7 +4841,7 @@ String *Item_func_udf_str::val_str(String *str)
 udf_handler::~udf_handler()
 {
   /* Everything should be properly cleaned up by this moment. */
-  DBUG_ASSERT(not_original || !(initialized || buffers));
+  assert(not_original || !(initialized || buffers));
 }
 
 #else
@@ -4861,7 +4868,7 @@ bool Item_master_pos_wait::itemize(Parse_context *pc, Item **res)
 
 longlong Item_master_pos_wait::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   THD* thd = current_thd;
   String *log_name = args[0]->val_str(&value);
   int event_count= 0;
@@ -4959,7 +4966,7 @@ bool Item_wait_for_executed_gtid_set::itemize(Parse_context *pc, Item **res)
 longlong Item_wait_for_executed_gtid_set::val_int()
 {
   DBUG_ENTER("Item_wait_for_executed_gtid_set::val_int");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   THD* thd= current_thd;
   String *gtid_text= args[0]->val_str(&value);
 
@@ -5054,7 +5061,7 @@ bool Item_master_gtid_set_wait::itemize(Parse_context *pc, Item **res)
 
 longlong Item_master_gtid_set_wait::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_master_gtid_set_wait::val_int");
   int event_count= 0;
 
@@ -5502,7 +5509,7 @@ bool Item_func_get_lock::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_get_lock::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(&value);
   ulonglong timeout= args[1]->val_int();
   char name[NAME_LEN + 1];
@@ -5634,7 +5641,7 @@ bool Item_func_release_lock::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_release_lock::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(&value);
   char name[NAME_LEN + 1];
   THD *thd= current_thd;
@@ -5700,7 +5707,7 @@ bool Item_func_release_all_locks::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_release_all_locks::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   THD *thd= current_thd;
   uint result= 0;
   User_level_lock *ull;
@@ -5753,7 +5760,7 @@ bool Item_func_is_free_lock::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_is_free_lock::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(&value);
   char name[NAME_LEN + 1];
   THD *thd= current_thd;
@@ -5803,7 +5810,7 @@ bool Item_func_is_used_lock::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_is_used_lock::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(&value);
   char name[NAME_LEN + 1];
   THD *thd= current_thd;
@@ -5845,7 +5852,7 @@ bool Item_func_last_insert_id::itemize(Parse_context *pc, Item **res)
 longlong Item_func_last_insert_id::val_int()
 {
   THD *thd= current_thd;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (arg_count)
   {
     longlong value= args[0]->val_int();
@@ -5881,7 +5888,7 @@ bool Item_func_benchmark::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_benchmark::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String tmp(buff,sizeof(buff), &my_charset_bin);
   my_decimal tmp_decimal;
@@ -5925,7 +5932,7 @@ longlong Item_func_benchmark::val_int()
     case ROW_RESULT:
     default:
       // This case should never be chosen
-      DBUG_ASSERT(0);
+      assert(0);
       return 0;
     }
   }
@@ -6016,7 +6023,7 @@ longlong Item_func_sleep::val_int()
   double timeout;
   int error;
 
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   timeout= args[0]->val_real();
  
@@ -6155,7 +6162,7 @@ bool Item_func_set_user_var::set_entry(THD *thd, bool create_if_not_exists)
 
 bool Item_func_set_user_var::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   /* fix_fields will call Item_func_set_user_var::fix_length_and_dec */
   if (Item_func::fix_fields(thd, ref) || set_entry(thd, TRUE))
     return TRUE;
@@ -6241,7 +6248,7 @@ bool user_var_entry::store(const void *from, size_t length, Item_result type)
   // Avoid memcpy of a my_decimal object, use copy CTOR instead.
   if (type == DECIMAL_RESULT)
   {
-    DBUG_ASSERT(length == sizeof(my_decimal));
+    assert(length == sizeof(my_decimal));
     const my_decimal* dec= static_cast<const my_decimal*>(from);
     dec->sanity_check();
     new (m_ptr) my_decimal(*dec);
@@ -6288,13 +6295,13 @@ bool user_var_entry::store(const void *ptr, size_t length, Item_result type,
 
 void user_var_entry::lock()
 {
-  DBUG_ASSERT(m_owner != NULL);
+  assert(m_owner != NULL);
   mysql_mutex_lock(&m_owner->LOCK_thd_data);
 }
 
 void user_var_entry::unlock()
 {
-  DBUG_ASSERT(m_owner != NULL);
+  assert(m_owner != NULL);
   mysql_mutex_unlock(&m_owner->LOCK_thd_data);
 }
 
@@ -6318,7 +6325,7 @@ Item_func_set_user_var::update_hash(const void *ptr, uint length,
 
   if (ptr == NULL)
   {
-    DBUG_ASSERT(length == 0);
+    assert(length == 0);
     null_value= true;
   }
 
@@ -6359,7 +6366,7 @@ double user_var_entry::val_real(my_bool *null_value) const
   case STRING_RESULT:
     return my_atof(m_ptr);                    // This is null terminated
   case ROW_RESULT:
-    DBUG_ASSERT(1);				// Impossible
+    assert(1);				// Impossible
     break;
   }
   return 0.0;					// Impossible
@@ -6390,7 +6397,7 @@ longlong user_var_entry::val_int(my_bool *null_value) const
     return my_strtoll10(m_ptr, (char**) 0, &error);// String is null terminated
   }
   case ROW_RESULT:
-    DBUG_ASSERT(1);				// Impossible
+    assert(1);				// Impossible
     break;
   }
   return 0LL;					// Impossible
@@ -6423,7 +6430,7 @@ String *user_var_entry::val_str(my_bool *null_value, String *str,
       str= 0;					// EOM error
     break;
   case ROW_RESULT:
-    DBUG_ASSERT(1);				// Impossible
+    assert(1);				// Impossible
     break;
   }
   return(str);
@@ -6451,7 +6458,7 @@ my_decimal *user_var_entry::val_decimal(my_bool *null_value, my_decimal *val) co
                    collation.collation, val);
     break;
   case ROW_RESULT:
-    DBUG_ASSERT(1);				// Impossible
+    assert(1);				// Impossible
     break;
   }
   return(val);
@@ -6509,7 +6516,7 @@ Item_func_set_user_var::check(bool use_result_field)
   case ROW_RESULT:
   default:
     // This case should never be chosen
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   DBUG_RETURN(FALSE);
@@ -6544,7 +6551,7 @@ void Item_func_set_user_var::save_item_result(Item *item)
   case ROW_RESULT:
   default:
     // Should never happen
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   /*
@@ -6619,7 +6626,7 @@ Item_func_set_user_var::update()
   case ROW_RESULT:
   default:
     // This case should never be chosen
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   DBUG_RETURN(res);
@@ -6628,7 +6635,7 @@ Item_func_set_user_var::update()
 
 double Item_func_set_user_var::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(0);
   update();					// Store expression
   return entry->val_real(&null_value);
@@ -6636,7 +6643,7 @@ double Item_func_set_user_var::val_real()
 
 longlong Item_func_set_user_var::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(0);
   update();					// Store expression
   return entry->val_int(&null_value);
@@ -6644,7 +6651,7 @@ longlong Item_func_set_user_var::val_int()
 
 String *Item_func_set_user_var::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(0);
   update();					// Store expression
   return entry->val_str(&null_value, str, decimals);
@@ -6653,7 +6660,7 @@ String *Item_func_set_user_var::val_str(String *str)
 
 my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(0);
   update();					// Store expression
   return entry->val_decimal(&null_value, val);
@@ -6662,7 +6669,7 @@ my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
 
 double Item_func_set_user_var::val_result()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return entry->val_real(&null_value);
@@ -6670,7 +6677,7 @@ double Item_func_set_user_var::val_result()
 
 longlong Item_func_set_user_var::val_int_result()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return entry->val_int(&null_value);
@@ -6678,7 +6685,7 @@ longlong Item_func_set_user_var::val_int_result()
 
 bool Item_func_set_user_var::val_bool_result()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return entry->val_int(&null_value) != 0;
@@ -6686,7 +6693,7 @@ bool Item_func_set_user_var::val_bool_result()
 
 String *Item_func_set_user_var::str_result(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return entry->val_str(&null_value, str, decimals);
@@ -6695,7 +6702,7 @@ String *Item_func_set_user_var::str_result(String *str)
 
 my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return entry->val_decimal(&null_value, val);
@@ -6704,7 +6711,7 @@ my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
 
 bool Item_func_set_user_var::is_null_result()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   check(TRUE);
   update();					// Store expression
   return is_null();
@@ -6751,7 +6758,7 @@ void Item_func_set_user_var::make_field(Send_field *tmp_field)
   if (result_field)
   {
     result_field->make_field(tmp_field);
-    DBUG_ASSERT(tmp_field->table_name != 0);
+    assert(tmp_field->table_name != 0);
     if (Item::item_name.is_set())
       tmp_field->col_name=Item::item_name.ptr();    // Use user supplied name
   }
@@ -6864,7 +6871,7 @@ Item_func_set_user_var::save_in_field(Field *field, bool no_conversions,
 String *
 Item_func_get_user_var::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_get_user_var::val_str");
   if (!var_entry)
     DBUG_RETURN((String*) 0);			// No such variable
@@ -6875,7 +6882,7 @@ Item_func_get_user_var::val_str(String *str)
 
 double Item_func_get_user_var::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!var_entry)
     return 0.0;					// No such variable
   return (var_entry->val_real(&null_value));
@@ -6884,7 +6891,7 @@ double Item_func_get_user_var::val_real()
 
 my_decimal *Item_func_get_user_var::val_decimal(my_decimal *dec)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!var_entry)
     return 0;
   return var_entry->val_decimal(&null_value, dec);
@@ -6893,7 +6900,7 @@ my_decimal *Item_func_get_user_var::val_decimal(my_decimal *dec)
 
 longlong Item_func_get_user_var::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!var_entry)
     return 0LL;				// No such variable
   return (var_entry->val_int(&null_value));
@@ -7034,7 +7041,7 @@ get_var_with_binlog(THD *thd, enum_sql_command sql_command,
     user_var_event->length= var_entry->length();
     if (user_var_event->type == DECIMAL_RESULT)
     {
-      DBUG_ASSERT(var_entry->length() == sizeof(my_decimal));
+      assert(var_entry->length() == sizeof(my_decimal));
       const my_decimal* dec=
         static_cast<const my_decimal*>
         (static_cast<const void*>(var_entry->ptr()));
@@ -7097,7 +7104,7 @@ void Item_func_get_user_var::fix_length_and_dec()
       break;
     case ROW_RESULT:                            // Keep compiler happy
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
@@ -7159,8 +7166,8 @@ bool Item_func_get_user_var::set_value(THD *thd,
 
 bool Item_user_var_as_out_param::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
-  DBUG_ASSERT(thd->lex->exchange);
+  assert(fixed == 0);
+  assert(thd->lex->exchange);
   /*
     Let us set the same collation which is used for loading
     of fields in LOAD DATA INFILE.
@@ -7209,28 +7216,28 @@ void Item_user_var_as_out_param::set_value(const char *str, size_t length,
 
 double Item_user_var_as_out_param::val_real()
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0.0;
 }
 
 
 longlong Item_user_var_as_out_param::val_int()
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
 
 String* Item_user_var_as_out_param::val_str(String *str)
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
 
 my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer)
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -7246,20 +7253,15 @@ Item_func_get_system_var::
 Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg,
                        LEX_STRING *component_arg, const char *name_arg,
                        size_t name_len_arg)
-  :var(var_arg), var_type(var_type_arg), orig_var_type(var_type_arg),
-  component(*component_arg), cache_present(0)
+  :var(NULL), var_type(var_type_arg), orig_var_type(var_type_arg),
+  component(*component_arg), cache_present(0),
+  var_tracker(var_arg)
 {
   /* copy() will allocate the name */
   item_name.copy(name_arg, (uint) name_len_arg);
 }
 
 
-bool Item_func_get_system_var::is_written_to_binlog()
-{
-  return var->is_written_to_binlog(var_type);
-}
-
-
 void Item_func_get_system_var::update_null_value()
 {
   THD *thd= current_thd;
@@ -7276,6 +7278,15 @@ void Item_func_get_system_var::fix_length_and_dec()
   maybe_null= TRUE;
   max_length= 0;
 
+  THD *const thd= current_thd;
+
+  DEBUG_SYNC(current_thd, "after_error_checking");
+
+  assert(var == NULL);
+  var= var_tracker.bind_system_variable(thd);
+  if (var == NULL)
+    return;
+
   if (!var->check_scope(var_type))
   {
     if (var_type != OPT_DEFAULT)
@@ -7309,8 +7320,8 @@ void Item_func_get_system_var::fix_length_and_dec()
     case SHOW_CHAR_PTR:
       mysql_mutex_lock(&LOCK_global_system_variables);
       cptr= var->show_type() == SHOW_CHAR ? 
-        (char*) var->value_ptr(current_thd, var_type, &component) :
-        *(char**) var->value_ptr(current_thd, var_type, &component);
+        (char*) var->value_ptr(thd, var_type, &component) :
+        *(char**) var->value_ptr(thd, var_type, &component);
       if (cptr)
         max_length= system_charset_info->cset->numchars(system_charset_info,
                                                         cptr,
@@ -7323,7 +7334,7 @@ void Item_func_get_system_var::fix_length_and_dec()
     case SHOW_LEX_STRING:
       {
         mysql_mutex_lock(&LOCK_global_system_variables);
-        LEX_STRING *ls= ((LEX_STRING*)var->value_ptr(current_thd, var_type, &component));
+        LEX_STRING *ls= ((LEX_STRING*)var->value_ptr(thd, var_type, &component));
         max_length= system_charset_info->cset->numchars(system_charset_info,
                                                         ls->str,
                                                         ls->str + ls->length);
@@ -7431,6 +7442,8 @@ longlong Item_func_get_system_var::val_int()
 {
   THD *thd= current_thd;
 
+  assert(var != NULL);
+
   if (cache_present && thd->query_id == used_query_id)
   {
     if (cache_present & GET_SYS_VAR_CACHE_LONG)
@@ -7510,6 +7523,8 @@ String* Item_func_get_system_var::val_str(String* str)
 {
   THD *thd= current_thd;
 
+  assert(var != NULL);
+
   if (cache_present && thd->query_id == used_query_id)
   {
     if (cache_present & GET_SYS_VAR_CACHE_STRING)
@@ -7597,6 +7612,8 @@ double Item_func_get_system_var::val_real()
 {
   THD *thd= current_thd;
 
+  assert(var != NULL);
+
   if (cache_present && thd->query_id == used_query_id)
   {
     if (cache_present & GET_SYS_VAR_CACHE_DOUBLE)
@@ -7690,7 +7707,7 @@ bool Item_func_get_system_var::eq(const Item *item, bool binary_cmp) const
       ((Item_func*) item)->functype() != functype())
     return 0;
   Item_func_get_system_var *other=(Item_func_get_system_var*) item;
-  return (var == other->var && var_type == other->var_type);
+  return (var_tracker == other->var_tracker && var_type == other->var_type);
 }
 
 
@@ -7700,6 +7717,7 @@ void Item_func_get_system_var::cleanup()
   cache_present= 0;
   var_type= orig_var_type;
   cached_strval.mem_free();
+  var= NULL;
 }
 
 
@@ -7813,7 +7831,7 @@ bool Item_func_match::init_search(THD *thd)
      DBUG_RETURN(true);
   }
 
-  DBUG_ASSERT(master == NULL);
+  assert(master == NULL);
   ft_handler= table->file->ft_init_ext_with_hints(key, ft_tmp, get_hints());
   if (thd->is_error())
     DBUG_RETURN(true);
@@ -7860,8 +7878,8 @@ static void update_table_read_set(Field *field)
 
 bool Item_func_match::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
-  DBUG_ASSERT(arg_count > 0);
+  assert(fixed == 0);
+  assert(arg_count > 0);
   Item *item= NULL;                        // Safe as arg_count is > 1
 
   maybe_null=1;
@@ -8108,7 +8126,7 @@ bool Item_func_match::eq(const Item *item, bool binary_cmp) const
 
 double Item_func_match::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_match::val");
   if (ft_handler == NULL)
     DBUG_RETURN(-1.0);
@@ -8163,7 +8181,7 @@ void Item_func_match::print(String *str, enum_query_type query_type)
 void Item_func_match::set_hints(JOIN *join, uint ft_flag,
                                 ha_rows ft_limit, bool no_cond)
 {
-  DBUG_ASSERT(!master);
+  assert(!master);
 
   if (!join)  // used for count() optimization
   {
@@ -8195,7 +8213,7 @@ void Item_func_match::set_hints(JOIN *join, uint ft_flag,
 
 longlong Item_func_bit_xor::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong arg1= (ulonglong) args[0]->val_int();
   ulonglong arg2= (ulonglong) args[1]->val_int();
   if ((null_value= (args[0]->null_value || args[1]->null_value)))
@@ -8234,6 +8252,9 @@ class Silence_deprecation_warnings : public Internal_error_handler
   @param name                   Name of base or system variable
   @param component              Component.
 
+  @param unsafe                 If true and if the variable is written to a
+                                binlog then mark the statement as unsafe.
+
   @note
     If component.str = 0 then the variable name is in 'name'
 
@@ -8245,7 +8266,7 @@ class Silence_deprecation_warnings : public Internal_error_handler
 
 Item *get_system_var(Parse_context *pc,
                      enum_var_type var_type, LEX_STRING name,
-                     LEX_STRING component)
+                     LEX_STRING component, bool unsafe)
 {
   THD *thd= pc->thd;
   sys_var *var;
@@ -8281,6 +8302,12 @@ Item *get_system_var(Parse_context *pc,
   Item_func_get_system_var *item= new Item_func_get_system_var(var, var_type,
                                                                component_name,
                                                                NULL, 0);
+  if (item == NULL)
+    return NULL;  // OOM
+
+  if (unsafe && !var->is_written_to_binlog(var_type))
+    thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
+
 #ifndef EMBEDDED_LIBRARY
   if (var_type == OPT_GLOBAL && var->check_scope(OPT_GLOBAL))
   {
@@ -8297,6 +8324,8 @@ Item *get_system_var(Parse_context *pc,
     Silence_deprecation_warnings silencer;
     thd->push_internal_handler(&silencer);
 
+    if (si)
+      (void) si->fix_length_and_dec();
     outStr= si ? si->val_str(&str) : &str;
 
     thd->pop_internal_handler();
@@ -8330,7 +8359,7 @@ bool Item_func_row_count::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_row_count::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   THD *thd= current_thd;
 
   return thd->get_row_count_func();
@@ -8367,16 +8396,11 @@ bool Item_func_sp::itemize(Parse_context *pc, Item **res)
   context= lex->current_context();
   lex->safe_to_cache_query= false;
 
-  if (m_name->m_db.str == NULL) // use the default database name
+  if (m_name->m_db.str == NULL)
   {
     /* Cannot match the function since no database is selected */
-    if (thd->db().str == NULL)
-    {
-      my_error(ER_NO_DB_ERROR, MYF(0));
-      return true;
-    }
-    m_name->m_db= thd->db();
-    m_name->m_db.str= thd->strmake(m_name->m_db.str, m_name->m_db.length);
+    my_error(ER_NO_DB_ERROR, MYF(0));
+    return true;
   }
 
   m_name->init_qname(thd);
@@ -8473,8 +8497,8 @@ Item_func_sp::init_result_field(THD *thd)
   TABLE_SHARE *share;
   DBUG_ENTER("Item_func_sp::init_result_field");
 
-  DBUG_ASSERT(m_sp == NULL);
-  DBUG_ASSERT(sp_result_field == NULL);
+  assert(m_sp == NULL);
+  assert(sp_result_field == NULL);
 
   Internal_error_handler_holder<View_error_handler, TABLE_LIST>
     view_handler(thd, context->view_error_handler,
@@ -8532,7 +8556,7 @@ void Item_func_sp::fix_length_and_dec()
 {
   DBUG_ENTER("Item_func_sp::fix_length_and_dec");
 
-  DBUG_ASSERT(sp_result_field);
+  assert(sp_result_field);
   decimals= sp_result_field->decimals();
   max_length= sp_result_field->field_length;
   collation.set(sp_result_field->charset());
@@ -8695,7 +8719,7 @@ void
 Item_func_sp::make_field(Send_field *tmp_field)
 {
   DBUG_ENTER("Item_func_sp::make_field");
-  DBUG_ASSERT(sp_result_field);
+  assert(sp_result_field);
   sp_result_field->make_field(tmp_field);
   if (item_name.is_set())
     tmp_field->col_name= item_name.ptr();
@@ -8707,7 +8731,7 @@ enum enum_field_types
 Item_func_sp::field_type() const
 {
   DBUG_ENTER("Item_func_sp::field_type");
-  DBUG_ASSERT(sp_result_field);
+  assert(sp_result_field);
   DBUG_RETURN(sp_result_field->type());
 }
 
@@ -8716,7 +8740,7 @@ Item_func_sp::result_type() const
 {
   DBUG_ENTER("Item_func_sp::result_type");
   DBUG_PRINT("info", ("m_sp = %p", (void *) m_sp));
-  DBUG_ASSERT(sp_result_field);
+  assert(sp_result_field);
   DBUG_RETURN(sp_result_field->result_type());
 }
 
@@ -8735,7 +8759,7 @@ bool Item_func_found_rows::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_found_rows::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return current_thd->found_rows();
 }
 
@@ -8745,7 +8769,7 @@ Item_func_sp::tmp_table_field(TABLE *t_arg)
 {
   DBUG_ENTER("Item_func_sp::tmp_table_field");
 
-  DBUG_ASSERT(sp_result_field);
+  assert(sp_result_field);
   DBUG_RETURN(sp_result_field);
 }
 
@@ -8768,7 +8792,7 @@ bool
 Item_func_sp::sp_check_access(THD *thd)
 {
   DBUG_ENTER("Item_func_sp::sp_check_access");
-  DBUG_ASSERT(m_sp);
+  assert(m_sp);
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (check_routine_access(thd, EXECUTE_ACL,
 			   m_sp->m_db.str, m_sp->m_name.str, 0, FALSE))
@@ -8788,7 +8812,7 @@ Item_func_sp::fix_fields(THD *thd, Item **ref)
 #endif
 
   DBUG_ENTER("Item_func_sp::fix_fields");
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   /*
diff --git a/sql/item_func.h b/sql/item_func.h
index cbb639b564df..9c09f68817bb 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_FUNC_INCLUDED
 #define ITEM_FUNC_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -182,7 +189,28 @@ class Item_func :public Item_result_field
     else
       arg_count= 0; // OOM
   }
-
+  Item_func(Item *a,Item *b,Item *c,Item *d,Item* e,Item* f):
+    allowed_arg_cols(1), arg_count(6)
+  {
+    if ((args= (Item**) sql_alloc(sizeof(Item*)*6)))
+    {
+      args[0]= a; args[1]= b; args[2]= c; args[3]= d; args[4]= e; args[5]= f;
+      with_sum_func= a->with_sum_func || b->with_sum_func ||
+      c->with_sum_func || d->with_sum_func || e->with_sum_func || f->with_sum_func;
+    }
+    else
+      arg_count= 0; // OOM
+  }
+  Item_func(const POS &pos, Item *a, Item *b, Item *c, Item *d, Item* e, Item* f)
+    : super(pos), allowed_arg_cols(1), arg_count(6)
+  {
+    if ((args= (Item**) sql_alloc(sizeof(Item*)*6)))
+    {
+      args[0]= a; args[1]= b; args[2]= c; args[3]= d; args[4]= e;args[5]= f;
+    }
+    else
+      arg_count= 0; // OOM
+  }
   Item_func(List<Item> &list);
   Item_func(const POS &pos, PT_item_list *opt_list);
 
@@ -212,7 +240,7 @@ class Item_func :public Item_result_field
   virtual Item *key_item() const { return args[0]; }
   virtual bool const_item() const { return const_item_cache; }
   inline Item **arguments() const
-  { DBUG_ASSERT(argument_count() > 0); return args; }
+  { assert(argument_count() > 0); return args; }
   /**
     Copy arguments from list to args array
 
@@ -386,7 +414,7 @@ class Item_func :public Item_result_field
 
   bool has_timestamp_args()
   {
-    DBUG_ASSERT(fixed == TRUE);
+    assert(fixed == TRUE);
     for (uint i= 0; i < arg_count; i++)
     {
       if (args[i]->type() == Item::FIELD_ITEM &&
@@ -398,7 +426,7 @@ class Item_func :public Item_result_field
 
   bool has_date_args()
   {
-    DBUG_ASSERT(fixed == TRUE);
+    assert(fixed == TRUE);
     for (uint i= 0; i < arg_count; i++)
     {
       if (args[i]->type() == Item::FIELD_ITEM &&
@@ -411,7 +439,7 @@ class Item_func :public Item_result_field
 
   bool has_time_args()
   {
-    DBUG_ASSERT(fixed == TRUE);
+    assert(fixed == TRUE);
     for (uint i= 0; i < arg_count; i++)
     {
       if (args[i]->type() == Item::FIELD_ITEM &&
@@ -424,7 +452,7 @@ class Item_func :public Item_result_field
 
   bool has_datetime_args()
   {
-    DBUG_ASSERT(fixed == TRUE);
+    assert(fixed == TRUE);
     for (uint i= 0; i < arg_count; i++)
     {
       if (args[i]->type() == Item::FIELD_ITEM &&
@@ -549,7 +577,7 @@ class Item_real_func :public Item_func
   String *val_str(String*str);
   my_decimal *val_decimal(my_decimal *decimal_value);
   longlong val_int()
-    { DBUG_ASSERT(fixed == 1); return (longlong) rint(val_real()); }
+  { assert(fixed == 1); return (longlong) rint(val_real()); }
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
     return get_date_from_real(ltime, fuzzydate);
@@ -660,11 +688,11 @@ class Item_func_num1: public Item_func_numhybrid
 
   void fix_num_length_and_dec();
   void find_num_type();
-  String *str_op(String *str) { DBUG_ASSERT(0); return 0; }
+  String *str_op(String *str) { assert(0); return 0; }
   bool date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
   bool time_op(MYSQL_TIME *ltime)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
 };
 
 
@@ -684,11 +712,11 @@ class Item_num_op :public Item_func_numhybrid
   }
 
   void find_num_type();
-  String *str_op(String *str) { DBUG_ASSERT(0); return 0; }
+  String *str_op(String *str) { assert(0); return 0; }
   bool date_op(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
   bool time_op(MYSQL_TIME *ltime)
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
 };
 
 
@@ -757,7 +785,7 @@ class Item_func_connection_id :public Item_int_func
   const char *func_name() const { return "connection_id"; }
   void fix_length_and_dec();
   bool fix_fields(THD *thd, Item **ref);
-  longlong val_int() { DBUG_ASSERT(fixed == 1); return value; }
+  longlong val_int() { assert(fixed == 1); return value; }
   bool check_gcol_func_processor(uchar *int_arg) { return true;}
 };
 
@@ -890,7 +918,7 @@ class Item_func_div :public Item_num_op
 public:
   uint prec_increment;
   Item_func_div(const POS &pos, Item *a,Item *b) :Item_num_op(pos, a,b) {}
-  longlong int_op() { DBUG_ASSERT(0); return 0; }
+  longlong int_op() { assert(0); return 0; }
   double real_op();
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "/"; }
@@ -1440,7 +1468,7 @@ class Item_func_bit_length :public Item_func_length
 public:
   Item_func_bit_length(const POS &pos, Item *a) :Item_func_length(pos, a) {}
   longlong val_int()
-    { DBUG_ASSERT(fixed == 1); return Item_func_length::val_int()*8; }
+  { assert(fixed == 1); return Item_func_length::val_int()*8; }
   const char *func_name() const { return "bit_length"; }
 };
 
@@ -1734,7 +1762,7 @@ class Item_udf_func :public Item_func
   enum Functype functype() const   { return UDF_FUNC; }
   bool fix_fields(THD *thd, Item **ref)
   {
-    DBUG_ASSERT(fixed == 0);
+    assert(fixed == 0);
     bool res= udf.fix_fields(thd, this, arg_count, args);
     used_tables_cache= udf.used_tables_cache;
     const_item_cache= udf.const_item_cache;
@@ -1811,7 +1839,7 @@ class Item_func_udf_float :public Item_udf_func
   {}
   longlong val_int()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return (longlong) rint(Item_func_udf_float::val_real());
   }
   my_decimal *val_decimal(my_decimal *dec_buf)
@@ -2260,12 +2288,12 @@ class Item_user_var_as_out_param :public Item
   my_decimal *val_decimal(my_decimal *decimal_buffer);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return true;
   }
 
@@ -2294,6 +2322,7 @@ class Item_func_get_system_var :public Item_var_func
   my_bool cached_null_value;
   query_id_t used_query_id;
   uchar cache_present;
+  Sys_var_tracker var_tracker;
 
 public:
   Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg,
@@ -2314,15 +2343,6 @@ class Item_func_get_system_var :public Item_var_func
   { return val_decimal_from_real(dec_buf); }
   /* TODO: fix to support views */
   const char *func_name() const { return "get_system_var"; }
-  /**
-    Indicates whether this system variable is written to the binlog or not.
-
-    Variables are written to the binlog as part of "status_vars" in
-    Query_log_event, as an Intvar_log_event, or a Rand_log_event.
-
-    @return true if the variable is written to the binlog, false otherwise.
-  */
-  bool is_written_to_binlog();
   bool eq(const Item *item, bool binary_cmp) const;
 
   void cleanup();
@@ -2392,7 +2412,7 @@ class Item_func_match :public Item_real_func
   bool fix_fields(THD *thd, Item **ref);
   bool eq(const Item *, bool binary_cmp) const;
   /* The following should be safe, even if we compare doubles */
-  longlong val_int() { DBUG_ASSERT(fixed == 1); return val_real() != 0.0; }
+  longlong val_int() { assert(fixed == 1); return val_real() != 0.0; }
   double val_real();
   virtual void print(String *str, enum_query_type query_type);
 
@@ -2411,8 +2431,8 @@ class Item_func_match :public Item_real_func
    */
   ulonglong get_count()
   {
-    DBUG_ASSERT(ft_handler);
-    DBUG_ASSERT(table_ref->table->file->ha_table_flags() & HA_CAN_FULLTEXT_EXT);
+    assert(ft_handler);
+    assert(table_ref->table->file->ha_table_flags() & HA_CAN_FULLTEXT_EXT);
 
     return ((FT_INFO_EXT *)ft_handler)->could_you->
       count_matches((FT_INFO_EXT *)ft_handler);
@@ -2426,14 +2446,14 @@ class Item_func_match :public Item_real_func
    */
   bool ordered_result()
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     if (hints->get_flags() & FT_SORTED)
       return true;
 
     if ((table_ref->table->file->ha_table_flags() & HA_CAN_FULLTEXT_EXT) == 0)
       return false;
 
-    DBUG_ASSERT(ft_handler);
+    assert(ft_handler);
     return ((FT_INFO_EXT *)ft_handler)->could_you->get_flags() & 
       FTS_ORDERED_RESULT;
   }
@@ -2446,7 +2466,7 @@ class Item_func_match :public Item_real_func
    */
   bool docid_in_result()
   {
-    DBUG_ASSERT(ft_handler);
+    assert(ft_handler);
 
     if ((table_ref->table->file->ha_table_flags() & HA_CAN_FULLTEXT_EXT) == 0)
       return false;
@@ -2490,7 +2510,7 @@ class Item_func_match :public Item_real_func
   */
   Ft_hints *get_hints()
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     return hints;
   }
 
@@ -2502,7 +2522,7 @@ class Item_func_match :public Item_real_func
   */
   void set_hints_op(enum ft_operation type, double value_arg)
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     hints->set_hint_op(type, value_arg);
   }
   
@@ -2519,7 +2539,7 @@ class Item_func_match :public Item_real_func
   */
   bool can_skip_ranking()
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     return (!(hints->get_flags() & FT_SORTED) && // FT_SORTED is no set
             used_in_where_only &&                // MATCH result is not used
                                                  // in expression
@@ -2533,7 +2553,7 @@ class Item_func_match :public Item_real_func
   */
   void set_simple_expression(bool val)
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     simple_expression= val;
   }
 
@@ -2545,7 +2565,7 @@ class Item_func_match :public Item_real_func
   */
   bool is_simple_expression()
   {
-    DBUG_ASSERT(!master);
+    assert(!master);
     return simple_expression;
   }
 
@@ -2591,7 +2611,7 @@ class Item_func_match :public Item_real_func
     if (!(flags & FT_BOOL))
       return false;
 
-    DBUG_ASSERT(tr && tr->file);
+    assert(tr && tr->file);
 
     // Assume that if extended fulltext API is not supported,
     // non-indexed columns are allowed.  This will be true for MyISAM.
@@ -2878,7 +2898,7 @@ class Item_func_version : public Item_static_string_func
 
 
 Item *get_system_var(Parse_context *pc, enum_var_type var_type, LEX_STRING name,
-                     LEX_STRING component);
+                     LEX_STRING component, bool unsafe);
 extern bool check_reserved_words(LEX_STRING *name);
 extern enum_field_types agg_field_type(Item **items, uint nitems);
 double my_double_round(double value, longlong dec, bool dec_unsigned,
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 6d244abce74e..bb825ab7baaf 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -98,7 +105,7 @@ bool Item_func_geometry_from_text::itemize(Parse_context *pc, Item **res)
     return false;
   if (super::itemize(pc, res))
     return true;
-  DBUG_ASSERT(arg_count == 1 || arg_count == 2);
+  assert(arg_count == 1 || arg_count == 2);
   if (arg_count == 1)
     pc->thd->lex->set_uncacheable(pc->select, UNCACHEABLE_RAND);
   return false;
@@ -114,7 +121,7 @@ bool Item_func_geometry_from_text::itemize(Parse_context *pc, Item **res)
  */
 String *Item_func_geometry_from_text::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Geometry_buffer buffer;
   String arg_val;
   String *wkt= args[0]->val_str_ascii(&arg_val);
@@ -129,7 +136,7 @@ String *Item_func_geometry_from_text::val_str(String *str)
   {
     if ((null_value= args[1]->null_value))
     {
-      DBUG_ASSERT(maybe_null);
+      assert(maybe_null);
       return NULL;
     }
     else
@@ -156,7 +163,7 @@ bool Item_func_geometry_from_wkb::itemize(Parse_context *pc, Item **res)
     return false;
   if (super::itemize(pc, res))
     return true;
-  DBUG_ASSERT(arg_count == 1 || arg_count == 2);
+  assert(arg_count == 1 || arg_count == 2);
   if (arg_count == 1)
     pc->thd->lex->set_uncacheable(pc->select, UNCACHEABLE_RAND);
   return false;
@@ -172,7 +179,7 @@ bool Item_func_geometry_from_wkb::itemize(Parse_context *pc, Item **res)
  */
 String *Item_func_geometry_from_wkb::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *wkb= NULL;
   uint32 srid= 0;
 
@@ -401,7 +408,7 @@ String *Item_func_geomfromgeojson::val_str(String *buf)
   null_value= (args[0]->null_value || wr.type() == Json_dom::J_NULL);
   if (null_value)
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     return NULL;
   }
 
@@ -454,7 +461,7 @@ String *Item_func_geomfromgeojson::val_str(String *buf)
 
     if (rollback)
     {
-      DBUG_ASSERT(maybe_null);
+      assert(maybe_null);
       null_value= true;
       return NULL;
     }
@@ -648,7 +655,7 @@ parse_object(const Json_object *object, bool *rollback, String *buffer,
 
   // Defensive code. This should never be reached.
   /* purecov: begin inspected */
-  DBUG_ASSERT(false);
+  assert(false);
   return true;
   /* purecov: end inspected */
 }
@@ -707,11 +714,11 @@ get_positions(const Json_array *coordinates, Gis_point *point)
   case Item_func_geomfromgeojson::strip_now_strip_future:
   case Item_func_geomfromgeojson::strip_now_accept_future:
     if (GEOM_DIM > 2)
-      DBUG_ASSERT(false);
+      assert(false);
     break;
   default:
     // Unspecified behaviour.
-    DBUG_ASSERT(false);
+    assert(false);
     return true;
   }
 
@@ -944,7 +951,7 @@ parse_object_array(const Json_array *data_array, Geometry::wkbType type,
     }
   default:
     {
-      DBUG_ASSERT(false);
+      assert(false);
       return false;
     }
   }
@@ -1283,7 +1290,7 @@ is_member_valid(const Json_dom *member, const char *member_name,
 
   if (allow_null)
   {
-    DBUG_ASSERT(was_null != NULL);
+    assert(was_null != NULL);
     *was_null= member->json_type() == Json_dom::J_NULL;
     if (*was_null)
       return true;
@@ -1305,7 +1312,7 @@ is_member_valid(const Json_dom *member, const char *member_name,
       break;
     default:
       /* purecov: begin deadcode */
-      DBUG_ASSERT(false);
+      assert(false);
       return false;
       /* purecov: end */
     }
@@ -1664,7 +1671,7 @@ bool append_polygon(Geometry::wkb_parser *parser,
 */
 bool append_bounding_box(MBR *mbr, Json_object *geometry)
 {
-  DBUG_ASSERT(GEOM_DIM == 2);
+  assert(GEOM_DIM == 2);
 
   Json_array *bbox_array= new (std::nothrow) Json_array();
   if (bbox_array == NULL ||
@@ -1706,8 +1713,8 @@ bool append_crs(Json_object *geometry,
                 bool add_long_crs_urn,
                 uint32 geometry_srid)
 {
-  DBUG_ASSERT(add_long_crs_urn || add_short_crs_urn);
-  DBUG_ASSERT(geometry_srid > 0);
+  assert(add_long_crs_urn || add_short_crs_urn);
+  assert(geometry_srid > 0);
 
   Json_object *crs_object= new (std::nothrow) Json_object();
   if (crs_object == NULL || geometry->add_alias("crs", crs_object) ||
@@ -1867,7 +1874,7 @@ append_geometry(Geometry::wkb_parser *parser, Json_object *geometry,
         }
         else
         {
-          bool result;
+          bool result= false;
           Json_array *points= new (std::nothrow) Json_array();
           if (points == NULL || collection->append_alias(points))
             return true;
@@ -1894,7 +1901,7 @@ append_geometry(Geometry::wkb_parser *parser, Json_object *geometry,
                                       add_long_crs_urn,
                                       geometry_srid);
           else
-            DBUG_ASSERT(false);
+            assert(false);
 
           if (result)
             return true;
@@ -1942,7 +1949,7 @@ append_geometry(Geometry::wkb_parser *parser, Json_object *geometry,
     {
       // This should not happen, since we did a check on wkb_type earlier.
       /* purecov: begin inspected */
-      DBUG_ASSERT(false);
+      assert(false);
       return true;
       /* purecov: end inspected */
     }
@@ -2017,7 +2024,7 @@ bool geometry_to_json(Json_wrapper *wr, Item *geometry_arg, const char *calling_
 */
 bool Item_func_as_geojson::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == TRUE);
+  assert(fixed == TRUE);
 
   if ((arg_count > 1 && parse_maxdecimaldigits_argument()) ||
       (arg_count > 2 && parse_options_argument()))
@@ -2074,7 +2081,7 @@ bool Item_func_as_geojson::val_json(Json_wrapper *wr)
 */
 bool Item_func_as_geojson::parse_options_argument()
 {
-  DBUG_ASSERT(arg_count > 2);
+  assert(arg_count > 2);
   longlong options_argument= args[2]->val_int();
   if ((null_value= args[2]->null_value))
     return true;
@@ -2114,7 +2121,7 @@ bool Item_func_as_geojson::parse_options_argument()
 */
 bool Item_func_as_geojson::parse_maxdecimaldigits_argument()
 {
-  DBUG_ASSERT(arg_count > 1);
+  assert(arg_count > 1);
   longlong max_decimal_digits_argument = args[1]->val_int();
   if ((null_value= args[1]->null_value))
     return true;
@@ -2198,7 +2205,7 @@ bool Item_func_as_geojson::fix_fields(THD *thd, Item **ref)
 
 String *Item_func_as_wkt::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
@@ -2231,7 +2238,7 @@ void Item_func_as_wkt::fix_length_and_dec()
 
 String *Item_func_as_wkb::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
@@ -2253,7 +2260,7 @@ String *Item_func_as_wkb::val_str(String *str)
 
 String *Item_func_geometry_type::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *swkb= args[0]->val_str(str);
   Geometry_buffer buffer;
   Geometry *geom= NULL;
@@ -2276,7 +2283,7 @@ String *Item_func_geometry_type::val_str_ascii(String *str)
 
 String *Item_func_validate::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
   Geometry *geom= NULL;
@@ -2315,7 +2322,7 @@ Field::geometry_type Item_func_make_envelope::get_geometry_type() const
 
 String *Item_func_make_envelope::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val1, arg_val2;
   String *pt1= args[0]->val_str(&arg_val1);
   String *pt2= args[1]->val_str(&arg_val2);
@@ -2386,7 +2393,7 @@ String *Item_func_make_envelope::val_str(String *str)
   }
 
   int dim= mbr.dimension();
-  DBUG_ASSERT(dim >= 0);
+  assert(dim >= 0);
 
   /*
     Use default invalid SRID because we are computing the envelope on an
@@ -2424,7 +2431,7 @@ String *Item_func_make_envelope::val_str(String *str)
   }
   else
   {
-    DBUG_ASSERT(dim == 2);
+    assert(dim == 2);
     str->q_append(static_cast<uint32>(Geometry::wkb_polygon));
     str->q_append(static_cast<uint32>(1));
     str->q_append(static_cast<uint32>(5));
@@ -2452,7 +2459,7 @@ Field::geometry_type Item_func_envelope::get_geometry_type() const
 
 String *Item_func_envelope::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
@@ -2461,7 +2468,7 @@ String *Item_func_envelope::val_str(String *str)
 
   if ((null_value= (!swkb || args[0]->null_value)))
   {
-    DBUG_ASSERT(!swkb && args[0]->null_value);
+    assert(!swkb && args[0]->null_value);
     return NULL;
   }
 
@@ -2495,7 +2502,7 @@ Field::geometry_type Item_func_centroid::get_geometry_type() const
 
 String *Item_func_centroid::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
@@ -2559,7 +2566,7 @@ class Point_accumulator : public WKB_scanner_event_handler
   virtual void on_wkb_end(const void *wkb)
   {
     if (pt_start)
-      DBUG_ASSERT(static_cast<const char *>(pt_start) + POINT_DATA_SIZE == wkb);
+      assert(static_cast<const char *>(pt_start) + POINT_DATA_SIZE == wkb);
 
     pt_start= NULL;
   }
@@ -2601,7 +2608,7 @@ class Geometry_grouper : public WKB_scanner_event_handler
       m_target_type= Geometry::wkb_polygon;
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -2613,7 +2620,7 @@ class Geometry_grouper : public WKB_scanner_event_handler
     :m_group(NULL), m_collection(out), m_gcbuf(gcbuf)
   {
     m_target_type= Geometry::wkb_polygon;
-    DBUG_ASSERT(out != NULL && gcbuf != NULL);
+    assert(out != NULL && gcbuf != NULL);
   }
 
 
@@ -2625,7 +2632,7 @@ class Geometry_grouper : public WKB_scanner_event_handler
     m_ptrs.push_back(wkb);
 
     if (m_types.size() == 1)
-      DBUG_ASSERT(geotype == Geometry::wkb_geometrycollection);
+      assert(geotype == Geometry::wkb_geometrycollection);
   }
 
 
@@ -2661,13 +2668,13 @@ class Geometry_grouper : public WKB_scanner_event_handler
     {
       Base_type g(wkb_start, len, Geometry::Flags_t(m_target_type, 0), 0);
       m_group->push_back(g);
-      DBUG_ASSERT(m_collection == NULL && m_gcbuf == NULL);
+      assert(m_collection == NULL && m_gcbuf == NULL);
     }
 
     if (m_collection != NULL && (geotype == Geometry::wkb_polygon ||
                                  geotype == Geometry::wkb_multipolygon))
     {
-      DBUG_ASSERT(m_group == NULL && m_gcbuf != NULL);
+      assert(m_group == NULL && m_gcbuf != NULL);
       String str(static_cast<const char *>(wkb_start), len, &my_charset_bin);
       m_collection->append_geometry(m_collection->get_srid(), geotype,
                                     &str, m_gcbuf);
@@ -2810,7 +2817,7 @@ bool Item_func_centroid::bg_centroid(const Geometry *geom, String *ptwkb)
       }
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
 
@@ -2850,7 +2857,7 @@ String *Item_func_convex_hull::val_str(String *str)
     return error_str();
   }
 
-  DBUG_ASSERT(geom->get_coordsys() == Geometry::cartesian);
+  assert(geom->get_coordsys() == Geometry::cartesian);
   str->set_charset(&my_charset_bin);
   str->length(0);
 
@@ -2971,8 +2978,8 @@ bool Item_func_convex_hull::bg_convex_hull(const Geometry *geom,
           A point's convex hull is the point itself, directly use the point's
           WKB buffer, set its header info correctly.
         */
-        DBUG_ASSERT(geom->get_ownmem() == false &&
-                    geom->has_geom_header_space());
+        assert(geom->get_ownmem() == false &&
+               geom->has_geom_header_space());
         char *p= geom->get_cptr() - GEOM_HEADER_SIZE;
         write_geometry_header(p, geom->get_srid(), geom->get_geotype());
         return false;
@@ -3020,7 +3027,7 @@ bool Item_func_convex_hull::bg_convex_hull(const Geometry *geom,
       break;
     case Geometry::wkb_geometrycollection:
       // Handled above.
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     default:
       break;
@@ -3043,7 +3050,7 @@ bool Item_func_convex_hull::bg_convex_hull(const Geometry *geom,
 
 String *Item_func_simplify::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *swkb= args[0]->val_str(&arg_val);
   double max_dist= args[1]->val_real();
   Geometry_buffer buffer;
@@ -3109,7 +3116,7 @@ int Item_func_simplify::
 simplify_basic(Geometry *geom, double max_dist, String *str,
                Gis_geometry_collection *gc, String *gcbuf)
 {
-  DBUG_ASSERT((gc == NULL && gcbuf == NULL) || (gc != NULL && gcbuf != NULL));
+  assert((gc == NULL && gcbuf == NULL) || (gc != NULL && gcbuf != NULL));
   Geometry::wkbType geotype= geom->get_type();
 
   switch (geotype)
@@ -3188,7 +3195,7 @@ simplify_basic(Geometry *geom, double max_dist, String *str,
     break;
   case Geometry::wkb_geometrycollection:
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -3202,7 +3209,7 @@ simplify_basic(Geometry *geom, double max_dist, String *str,
 
 String *Item_func_spatial_decomp::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   Geometry_buffer buffer;
@@ -3252,7 +3259,7 @@ String *Item_func_spatial_decomp::val_str(String *str)
 
 String *Item_func_spatial_decomp_n::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_val;
   String *swkb= args[0]->val_str(&arg_val);
   long n= (long) args[1]->val_int();
@@ -3320,7 +3327,7 @@ Field::geometry_type Item_func_point::get_geometry_type() const
 
 String *Item_func_point::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   /*
     The coordinates of a point can't be another geometry, but other types
@@ -3408,7 +3415,7 @@ bool Item_func_pointfromgeohash::fix_fields(THD *thd, Item **ref)
 
 String *Item_func_pointfromgeohash::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == TRUE);
+  assert(fixed == TRUE);
 
   String argument_value;
   String *geohash= args[0]->val_str_ascii(&argument_value);
@@ -3485,7 +3492,7 @@ const char *Item_func_spatial_collection::func_name() const
     str= "geometrycollection";
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -3505,7 +3512,7 @@ const char *Item_func_spatial_collection::func_name() const
 
 String *Item_func_spatial_collection::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String arg_value;
   uint i;
   uint32 srid= 0;
@@ -3738,7 +3745,7 @@ bool BG_geometry_collection::store_geometry(const Geometry *geo,
       if (geo2 == NULL)
       {
         // The geometry data already pass such checks, it's always valid here.
-        DBUG_ASSERT(false);
+        assert(false);
         return true;
       }
       else if (geo2->get_type() == Geometry::wkb_geometrycollection)
@@ -3780,7 +3787,7 @@ Geometry *BG_geometry_collection::store(const Geometry *geo)
   Geometry_buffer *pgeobuf= NULL;
   size_t geosize= geo->get_data_size();
 
-  DBUG_ASSERT(geo->get_type() != Geometry::wkb_geometrycollection);
+  assert(geo->get_type() != Geometry::wkb_geometrycollection);
   pres= m_geosdata.append_object();
   if (pres == NULL || pres->reserve(GEOM_HEADER_SIZE + geosize, 256))
     return NULL;
@@ -3792,7 +3799,7 @@ Geometry *BG_geometry_collection::store(const Geometry *geo)
     return NULL;
   geo2= Geometry::construct(pgeobuf, pres->ptr(), pres->length());
   // The geometry data already pass such checks, it's always valid here.
-  DBUG_ASSERT(geo2 != NULL);
+  assert(geo2 != NULL);
 
   if (geo2 != NULL && geo2->get_type() != Geometry::wkb_geometrycollection)
     m_geos.push_back(geo2);
@@ -3803,7 +3810,7 @@ Geometry *BG_geometry_collection::store(const Geometry *geo)
 
 longlong Item_func_isempty::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String tmp;
   String *swkb= args[0]->val_str(&tmp);
   Geometry_buffer buffer;
@@ -3824,13 +3831,13 @@ longlong Item_func_isempty::val_int()
 longlong Item_func_issimple::val_int()
 {
   DBUG_ENTER("Item_func_issimple::val_int");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   tmp.length(0);
   String *arg_wkb= args[0]->val_str(&tmp);
   if ((null_value= args[0]->null_value))
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     DBUG_RETURN(0);
   }
   if (arg_wkb == NULL)
@@ -3948,7 +3955,7 @@ bool Item_func_issimple::issimple(Geometry *g)
       }
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
@@ -3964,7 +3971,7 @@ bool Item_func_issimple::issimple(Geometry *g)
 
 longlong Item_func_isclosed::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String tmp;
   String *swkb= args[0]->val_str(&tmp);
   Geometry_buffer buffer;
@@ -4013,7 +4020,7 @@ class Geomcoll_validity_checker: public WKB_scanner_event_handler
     if (types.size() > 0)
       top= types.top();
     else
-      DBUG_ASSERT(geotype == Geometry::wkb_geometrycollection);
+      assert(geotype == Geometry::wkb_geometrycollection);
 
     types.push(geotype);
     // A geometry collection's vaidity is determined by that of its components.
@@ -4024,8 +4031,8 @@ class Geomcoll_validity_checker: public WKB_scanner_event_handler
     if (top != Geometry::wkb_geometrycollection)
       return;
 
-    DBUG_ASSERT(top != Geometry::wkb_invalid_type && has_hdr);
-    DBUG_ASSERT(len > WKB_HEADER_SIZE);
+    assert(top != Geometry::wkb_invalid_type && has_hdr);
+    assert(len > WKB_HEADER_SIZE);
 
     Geometry_buffer geobuf;
     Geometry *geo= NULL;
@@ -4148,7 +4155,7 @@ static int check_geometry_valid(Geometry *geom)
     break;
   }
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -4158,7 +4165,7 @@ static int check_geometry_valid(Geometry *geom)
 
 longlong Item_func_isvalid::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String tmp;
   String *swkb= args[0]->val_str(&tmp);
   Geometry_buffer buffer;
@@ -4198,7 +4205,7 @@ longlong Item_func_isvalid::val_int()
 
 longlong Item_func_dimension::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint32 dim= 0;				// In case of error
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4218,7 +4225,7 @@ longlong Item_func_dimension::val_int()
 
 longlong Item_func_numinteriorring::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint32 num= 0;				// In case of error
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4238,7 +4245,7 @@ longlong Item_func_numinteriorring::val_int()
 
 longlong Item_func_numgeometries::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint32 num= 0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4258,7 +4265,7 @@ longlong Item_func_numgeometries::val_int()
 
 longlong Item_func_numpoints::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint32 num= 0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4278,7 +4285,7 @@ longlong Item_func_numpoints::val_int()
 
 double Item_func_x::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double res= 0.0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4298,7 +4305,7 @@ double Item_func_x::val_real()
 
 double Item_func_y::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double res= 0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4375,7 +4382,7 @@ double Item_func_area::bg_area(const Geometry *geom)
       }
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -4401,7 +4408,7 @@ double Item_func_area::bg_area(const Geometry *geom)
 
 double Item_func_area::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double res= 0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4414,7 +4421,7 @@ double Item_func_area::val_real()
     my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
     return error_real();
   }
-  DBUG_ASSERT(geom->get_coordsys() == Geometry::cartesian);
+  assert(geom->get_coordsys() == Geometry::cartesian);
 
   if (geom->get_geotype() != Geometry::wkb_geometrycollection &&
       geom->normalize_ring_order() == NULL)
@@ -4439,7 +4446,7 @@ double Item_func_area::val_real()
 
 double Item_func_glength::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double res= 0;				// In case of errors
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
@@ -4464,7 +4471,7 @@ double Item_func_glength::val_real()
 
 longlong Item_func_srid::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *swkb= args[0]->val_str(&value);
   Geometry_buffer buffer;
   longlong res= 0L;
@@ -4691,7 +4698,7 @@ double Item_func_distance::val_real()
   double distance= 0;
 
   DBUG_ENTER("Item_func_distance::val_real");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   String *res1= args[0]->val_str(&tmp_value1);
   String *res2= args[1]->val_str(&tmp_value2);
@@ -4852,7 +4859,7 @@ geometry_collection_distance(const Geometry *g1, const Geometry *g2)
       {
         // For now this is never reached because we only support
         // distance([multi]point, [multi]point) for spherical.
-        DBUG_ASSERT(false);
+        assert(false);
       }
       else
         dist= BG_distance<bgcs::cartesian>::apply(this, *i, *j);
@@ -4918,7 +4925,7 @@ distance_point_geometry_spherical(const Geometry *g1, const Geometry *g2)
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return res;
@@ -4956,7 +4963,7 @@ distance_multipoint_geometry_spherical(const Geometry *g1, const Geometry *g2)
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -4980,7 +4987,7 @@ bg_distance_spherical(const Geometry *g1, const Geometry *g2)
       res= distance_multipoint_geometry_spherical(g1, g2);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -5050,7 +5057,7 @@ distance_dispatch_second_geometry(const BG_geometry& bg1, const Geometry* g2)
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return res;
@@ -5122,7 +5129,7 @@ double Item_func_distance::bg_distance(const Geometry *g1, const Geometry *g2)
       }
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 638b4c977c2e..de3f7b169c44 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_GEOFUNC_INCLUDED
 #define ITEM_GEOFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -576,7 +583,7 @@ class Item_func_spatial_decomp: public Item_geometry_func
       case SP_EXTERIORRING:
         return "st_exteriorring";
       default:
-	DBUG_ASSERT(0);  // Should never happened
+	assert(0);  // Should never happened
         return "spatial_decomp_unknown";
     }
   }
@@ -601,7 +608,7 @@ class Item_func_spatial_decomp_n: public Item_geometry_func
       case SP_INTERIORRINGN:
         return "st_interiorringn";
       default:
-	DBUG_ASSERT(0);  // Should never happened
+	assert(0);  // Should never happened
         return "spatial_decomp_n_unknown";
     }
   }
diff --git a/sql/item_geofunc_buffer.cc b/sql/item_geofunc_buffer.cc
index 766bb6015eb3..a5d94651f0d9 100644
--- a/sql/item_geofunc_buffer.cc
+++ b/sql/item_geofunc_buffer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -155,7 +162,7 @@ String *Item_func_buffer_strategy::val_str(String * /* str_arg */)
   String *strat_name= args[0]->val_str_ascii(&str);
   if ((null_value= args[0]->null_value))
   {
-    DBUG_ASSERT(maybe_null);
+    assert(maybe_null);
     return NULL;
   }
 
@@ -203,7 +210,7 @@ String *Item_func_buffer_strategy::val_str(String * /* str_arg */)
       double val= args[1]->val_real();
       if ((null_value= args[1]->null_value))
       {
-        DBUG_ASSERT(maybe_null);
+        assert(maybe_null);
         return NULL;
       }
       if (val <= 0)
@@ -323,7 +330,7 @@ String *Item_func_buffer_strategy::val_str(String * /* str_arg */)
     break;\
   }\
   default:\
-    DBUG_ASSERT(false);\
+    assert(false);                              \
     break;\
   }\
 } while(0)
@@ -343,7 +350,7 @@ namespace bgst= boost::geometry::strategy::buffer;
 String *Item_func_buffer::val_str(String *str_value_arg)
 {
   DBUG_ENTER("Item_func_buffer::val_str");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String strat_bufs[side_strategy + 1];
   String *obj= args[0]->val_str(&tmp_value);
   double dist= args[1]->val_real();
@@ -556,7 +563,7 @@ String *Item_func_buffer::val_str(String *str_value_arg)
                        bgst_join_miter, bgst_end_flat, bgst_point_square);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
 
@@ -635,7 +642,7 @@ String *Item_func_buffer::val_str(String *str_value_arg)
                          bgst_join_miter, bgst_end_flat, bgst_point_square);
           break;
         default:
-          DBUG_ASSERT(false);
+          assert(false);
           break;
         }
 
diff --git a/sql/item_geofunc_internal.cc b/sql/item_geofunc_internal.cc
index 282d7a35aa2e..5c895e2d7a5c 100644
--- a/sql/item_geofunc_internal.cc
+++ b/sql/item_geofunc_internal.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -117,7 +124,7 @@ merge_components(my_bool *pnull_value)
   if (is_comp_no_overlapped())
     return;
 
-  POS pos;
+  POS pos = {{NULL, NULL}, {NULL, NULL}};
   Item_func_spatial_operation ifso(pos, NULL, NULL,
                                    Item_func_spatial_operation::op_union);
   bool do_again= true;
@@ -229,7 +236,7 @@ bool linear_areal_intersect_infinite(Geometry *g1, Geometry *g2,
       res= bg::is_valid(mplgn);
     }
     else
-      DBUG_ASSERT(false);
+      assert(false);
 
     return res;
   }
@@ -388,7 +395,7 @@ bool BG_geometry_collection::merge_one_run(Item_func_spatial_operation *ifso,
       min corner point have greater coordinates than the max corner point,
       the box isn't valid and the rtree can be empty.
      */
-    DBUG_ASSERT(rtree_result.size() != 0);
+    assert(rtree_result.size() != 0);
 
     // Sort rtree_result by Rtree_entry::second in order to make
     // components in fixed order.
@@ -576,7 +583,7 @@ template <typename BG_geotype>
 bool post_fix_result(BG_result_buf_mgr *resbuf_mgr,
                      BG_geotype &geout, String *res)
 {
-  DBUG_ASSERT(geout.has_geom_header_space());
+  assert(geout.has_geom_header_space());
   reassemble_geometry(&geout);
 
   // Such objects returned by BG never have overlapped components.
diff --git a/sql/item_geofunc_internal.h b/sql/item_geofunc_internal.h
index af8c1b8f6a11..bdf219a37eac 100644
--- a/sql/item_geofunc_internal.h
+++ b/sql/item_geofunc_internal.h
@@ -1,16 +1,23 @@
 #ifndef GEOFUNC_INTERNAL_INCLUDED
 #define GEOFUNC_INTERNAL_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/item_geofunc_relchecks.cc b/sql/item_geofunc_relchecks.cc
index ddb072d6e808..1fda07a799c6 100644
--- a/sql/item_geofunc_relchecks.cc
+++ b/sql/item_geofunc_relchecks.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -54,7 +61,7 @@ const char *Item_func_spatial_mbr_rel::func_name() const
     case SP_COVEREDBY_FUNC:
       return "mbrcoveredby";
     default:
-      DBUG_ASSERT(0);  // Should never happened
+      assert(0);  // Should never happened
       return "mbrsp_unknown";
   }
 }
@@ -62,7 +69,7 @@ const char *Item_func_spatial_mbr_rel::func_name() const
 
 longlong Item_func_spatial_mbr_rel::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res1= args[0]->val_str(&cmp.value1);
   String *res2= args[1]->val_str(&cmp.value2);
   Geometry_buffer buffer1, buffer2;
@@ -115,7 +122,7 @@ longlong Item_func_spatial_mbr_rel::val_int()
       ret= mbr1.overlaps(&mbr2);
       break;
     case SP_CROSSES_FUNC:
-      DBUG_ASSERT(false);
+      assert(false);
       ret= 0;
       null_value= true;
       break;
@@ -172,7 +179,7 @@ const char *Item_func_spatial_rel::func_name() const
     case SP_OVERLAPS_FUNC:
       return "st_overlaps";
     default:
-      DBUG_ASSERT(0);  // Should never happened
+      assert(0);  // Should never happened
       return "sp_unknown";
   }
 }
@@ -181,7 +188,7 @@ const char *Item_func_spatial_rel::func_name() const
 longlong Item_func_spatial_rel::val_int()
 {
   DBUG_ENTER("Item_func_spatial_rel::val_int");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res1= NULL;
   String *res2= NULL;
   Geometry_buffer buffer1, buffer2;
@@ -340,12 +347,12 @@ int Item_func_spatial_rel::geocol_relation_check(Geometry *g1, Geometry *g2)
   else if (spatial_rel == SP_EQUALS_FUNC)
     tres= geocol_equals_check<Coordsys>(gv1, gv2);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   /* If doing contains check, need to switch back the two operands. */
   if (tmpg)
   {
-    DBUG_ASSERT(spatial_rel == SP_WITHIN_FUNC);
+    assert(spatial_rel == SP_WITHIN_FUNC);
     tmpg= g2;
     g2= g1;
     g1= tmpg;
@@ -374,8 +381,8 @@ geocol_relcheck_intersect_disjoint(const typename BG_geometry_collection::
 {
   int tres= 0;
 
-  DBUG_ASSERT(spatial_rel == SP_DISJOINT_FUNC ||
-              spatial_rel == SP_INTERSECTS_FUNC);
+  assert(spatial_rel == SP_DISJOINT_FUNC ||
+         spatial_rel == SP_INTERSECTS_FUNC);
   const typename BG_geometry_collection::Geometry_list *gv= NULL, *gvr= NULL;
 
   if (gv1->size() > gv2->size())
@@ -449,8 +456,8 @@ geocol_relcheck_intersect_disjoint(const typename BG_geometry_collection::
     tres can be either true or false for DISJOINT check because the inner
     loop may never executed and tres woule be false.
    */
-  DBUG_ASSERT(spatial_rel == SP_DISJOINT_FUNC ||
-              (!tres && spatial_rel == SP_INTERSECTS_FUNC));
+  assert(spatial_rel == SP_DISJOINT_FUNC ||
+         (!tres && spatial_rel == SP_INTERSECTS_FUNC));
   return tres;
 }
 
@@ -586,7 +593,7 @@ geocol_relcheck_within(const typename BG_geometry_collection::
     component of gv1 is within gv2, so in this function we always assume
     with check and and use SP_WITHIN_FUNC.
   */
-  DBUG_ASSERT(spatial_rel == SP_WITHIN_FUNC || spatial_rel == SP_EQUALS_FUNC);
+  assert(spatial_rel == SP_WITHIN_FUNC || spatial_rel == SP_EQUALS_FUNC);
 
   // Within isn't symetric so we have to always build rtree tndex on gv2.
   Rtree_index rtree;
@@ -713,7 +720,7 @@ geocol_relcheck_within(const typename BG_geometry_collection::
      */
     if (!innerOK)
     {
-      DBUG_ASSERT(tres == 0);
+      assert(tres == 0);
       return tres;
     }
   }
@@ -725,7 +732,7 @@ geocol_relcheck_within(const typename BG_geometry_collection::
     within and equals are true only when any(and every) combination of
     geometries from the two collections are true for the relation check.
    */
-  DBUG_ASSERT(tres);
+  assert(tres);
 
   return tres;
 }
@@ -745,7 +752,7 @@ geocol_equals_check(const typename BG_geometry_collection::Geometry_list *gv1,
                     const typename BG_geometry_collection::Geometry_list *gv2)
 {
   int tres= 0, num_try= 0;
-  DBUG_ASSERT(spatial_rel == SP_EQUALS_FUNC);
+  assert(spatial_rel == SP_EQUALS_FUNC);
 
   do
   {
@@ -803,7 +810,7 @@ int Item_func_spatial_rel::within_check(Geometry *g1, Geometry *g2,
     result= BG_wrap<Geom_types>::
       multipolygon_within_geometry(g1, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
   return result;
 }
 
@@ -940,7 +947,7 @@ int Item_func_spatial_rel::disjoint_check(Geometry *g1, Geometry *g2,
       multipolygon_disjoint_geometry(g1, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1003,7 +1010,7 @@ int Item_func_spatial_rel::intersects_check(Geometry *g1, Geometry *g2,
       multipolygon_intersects_geometry(g1, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   /*
@@ -1074,7 +1081,7 @@ int Item_func_spatial_rel::overlaps_check(Geometry *g1, Geometry *g2,
       BGCALL(result, overlaps, Linestring, g1, Multilinestring, g2, pnull_value);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
     break;
@@ -1090,7 +1097,7 @@ int Item_func_spatial_rel::overlaps_check(Geometry *g1, Geometry *g2,
       BGCALL(result, overlaps, Multilinestring, g1, Multilinestring, g2, pnull_value);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
     break;
@@ -1106,7 +1113,7 @@ int Item_func_spatial_rel::overlaps_check(Geometry *g1, Geometry *g2,
       BGCALL(result, overlaps, Polygon, g1, Multipolygon, g2, pnull_value);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
     break;
@@ -1122,13 +1129,13 @@ int Item_func_spatial_rel::overlaps_check(Geometry *g1, Geometry *g2,
       BGCALL(result, overlaps, Multipolygon, g1, Multipolygon, g2, pnull_value);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
     break;
   }
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1200,7 +1207,7 @@ int Item_func_spatial_rel::touches_check(Geometry *g1, Geometry *g2,
       multipolygon_touches_geometry(g1, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1258,7 +1265,7 @@ int Item_func_spatial_rel::crosses_check(Geometry *g1, Geometry *g2,
       multilinestring_crosses_geometry(g1, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1327,7 +1334,7 @@ int Item_func_spatial_rel::bg_geo_relation_check(Geometry *g1, Geometry *g2,
     result= crosses_check<Geom_types>(g1, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     break;
   }
 
diff --git a/sql/item_geofunc_relchecks_bgwrap.cc b/sql/item_geofunc_relchecks_bgwrap.cc
index 2a841ffe00ee..5df8c5d02cb6 100644
--- a/sql/item_geofunc_relchecks_bgwrap.cc
+++ b/sql/item_geofunc_relchecks_bgwrap.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,7 +55,7 @@ int BG_wrap<Geom_types>::point_within_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multilinestring)
     BGCALL(result, within, Point, g1, Multilinestring, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -164,7 +171,7 @@ int BG_wrap<Geom_types>::multipoint_within_geometry(Geometry *g1, Geometry *g2,
     result= multipoint_within_geometry_internal(mpts, mls);
   }
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -291,7 +298,7 @@ linestring_within_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multilinestring)
     BGCALL(result, within, Linestring, g1, Multilinestring, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -318,7 +325,7 @@ multilinestring_within_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, within, Multilinestring, g1,
            Multilinestring, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -341,7 +348,7 @@ polygon_within_geometry(Geometry *g1, Geometry *g2,
            gt2 == Geometry::wkb_multilinestring)
     return 0;
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -365,7 +372,7 @@ multipolygon_within_geometry(Geometry *g1, Geometry *g2,
            gt2 == Geometry::wkb_multilinestring)
     return 0;
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -503,7 +510,7 @@ multipoint_disjoint_geometry(Geometry *g1, Geometry *g2,
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -627,7 +634,7 @@ linestring_disjoint_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multipolygon)
     BGCALL(result, disjoint, Linestring, g1, Multipolygon, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
   return result;
 }
 
@@ -664,7 +671,7 @@ multilinestring_disjoint_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multipolygon)
     BGCALL(result, disjoint, Multilinestring, g1, Multipolygon, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -717,7 +724,7 @@ point_disjoint_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, disjoint, Point, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -763,7 +770,7 @@ polygon_disjoint_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, disjoint, Polygon, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -809,7 +816,7 @@ multipolygon_disjoint_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, disjoint, Multipolygon, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -852,7 +859,7 @@ point_intersects_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, intersects, Point, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -909,7 +916,7 @@ linestring_intersects_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multipolygon)
     BGCALL(result, intersects, Linestring, g1, Multipolygon, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -946,7 +953,7 @@ multilinestring_intersects_geometry(Geometry *g1, Geometry *g2,
   else if (gt2 == Geometry::wkb_multipolygon)
     BGCALL(result, intersects, Multilinestring, g1, Multipolygon, g2, pnull_value);
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   return result;
 }
@@ -991,7 +998,7 @@ polygon_intersects_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, intersects, Polygon, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1038,7 +1045,7 @@ multipolygon_intersects_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, intersects, Multipolygon, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1079,7 +1086,7 @@ linestring_crosses_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, crosses, Linestring, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1121,7 +1128,7 @@ multilinestring_crosses_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, crosses, Multilinestring, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1193,7 +1200,7 @@ multipoint_crosses_geometry(Geometry *g1, Geometry *g2,
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1319,7 +1326,7 @@ point_touches_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, touches, Point, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1400,7 +1407,7 @@ linestring_touches_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, touches, Linestring, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1447,7 +1454,7 @@ multilinestring_touches_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, touches, Multilinestring, g1, Multipolygon, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1494,7 +1501,7 @@ polygon_touches_geometry(Geometry *g1, Geometry *g2,
       multilinestring_touches_polygon(g2, g1, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -1540,7 +1547,7 @@ multipolygon_touches_geometry(Geometry *g1, Geometry *g2,
     BGCALL(result, touches, Multipolygon, g1, Multilinestring, g2, pnull_value);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
diff --git a/sql/item_geofunc_relchecks_bgwrap.h b/sql/item_geofunc_relchecks_bgwrap.h
index 1d4344245936..217fa3474723 100644
--- a/sql/item_geofunc_relchecks_bgwrap.h
+++ b/sql/item_geofunc_relchecks_bgwrap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/item_geofunc_setops.cc b/sql/item_geofunc_setops.cc
index fd31aacf5d23..e7cdc969aac5 100644
--- a/sql/item_geofunc_setops.cc
+++ b/sql/item_geofunc_setops.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -201,7 +208,7 @@ class BG_setop_wrapper
   Geometry *point_intersection_geometry(Geometry *g1, Geometry *g2,
                                         String *result)
   {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     Geometry::wkbType gt2= g2->get_type();
 #endif
     Geometry *retgeo= NULL;
@@ -209,10 +216,10 @@ class BG_setop_wrapper
     bool is_out= !Ifsr::bg_geo_relation_check<Coordsys>
       (g1, g2, Ifsr::SP_DISJOINT_FUNC, &null_value);
 
-    DBUG_ASSERT(gt2 == Geometry::wkb_linestring ||
-                gt2 == Geometry::wkb_polygon ||
-                gt2 == Geometry::wkb_multilinestring ||
-                gt2 == Geometry::wkb_multipolygon);
+    assert(gt2 == Geometry::wkb_linestring ||
+           gt2 == Geometry::wkb_polygon ||
+           gt2 == Geometry::wkb_multilinestring ||
+           gt2 == Geometry::wkb_multipolygon);
     if (!null_value)
     {
       if (is_out)
@@ -277,7 +284,7 @@ class BG_setop_wrapper
                                              String *result)
   {
     Geometry *retgeo= NULL;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     Geometry::wkbType gt2= g2->get_type();
 #endif
     Point_set ptset;
@@ -288,10 +295,10 @@ class BG_setop_wrapper
 
     mpts2->set_srid(g1->get_srid());
 
-    DBUG_ASSERT(gt2 == Geometry::wkb_linestring ||
-                gt2 == Geometry::wkb_polygon ||
-                gt2 == Geometry::wkb_multilinestring ||
-                gt2 == Geometry::wkb_multipolygon);
+    assert(gt2 == Geometry::wkb_linestring ||
+           gt2 == Geometry::wkb_polygon ||
+           gt2 == Geometry::wkb_multilinestring ||
+           gt2 == Geometry::wkb_multipolygon);
     ptset.insert(mpts.begin(), mpts.end());
 
     for (TYPENAME Point_set::iterator i= ptset.begin(); i != ptset.end(); ++i)
@@ -533,7 +540,7 @@ class BG_setop_wrapper
                                       String *result)
   {
     Geometry *geom= NULL, *retgeo= NULL;
-    DBUG_ASSERT(mls != NULL);
+    assert(mls != NULL);
 
     if (mls->size() > 0)
       geom= m_ifso->simplify_multilinestring(mls, result);
@@ -543,7 +550,7 @@ class BG_setop_wrapper
       if (mls->size() == 0)
       {
         // The multipolygon is the only result.
-        DBUG_ASSERT(result->length() == 0);
+        assert(result->length() == 0);
         null_value= post_fix_result(&(m_ifso->bg_resbuf_mgr),
                                     *mplgn_result, result);
         if (null_value)
@@ -751,13 +758,13 @@ class BG_setop_wrapper
   Geometry *point_union_geometry(Geometry *g1, Geometry *g2, String *result)
   {
     Geometry *retgeo= NULL;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     Geometry::wkbType gt2= g2->get_type();
 #endif
-    DBUG_ASSERT(gt2 == Geometry::wkb_linestring ||
-                gt2 == Geometry::wkb_polygon ||
-                gt2 == Geometry::wkb_multilinestring ||
-                gt2 == Geometry::wkb_multipolygon);
+    assert(gt2 == Geometry::wkb_linestring ||
+           gt2 == Geometry::wkb_polygon ||
+           gt2 == Geometry::wkb_multilinestring ||
+           gt2 == Geometry::wkb_multipolygon);
     if (Ifsr::bg_geo_relation_check<Coordsys>
         (g1, g2, Ifsr::SP_DISJOINT_FUNC, &null_value) && !null_value)
     {
@@ -791,8 +798,8 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::union_(ls1, ls2, *res);
-    DBUG_ASSERT(res.get() != 0);
-    DBUG_ASSERT(res->size() != 0);
+    assert(res.get() != 0);
+    assert(res->size() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result))
     {
       my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
@@ -828,7 +835,7 @@ class BG_setop_wrapper
     // equivalent to GeometryCollection(Polygon, Difference(LineString,
     // Polygon)).
     boost::geometry::difference(ls1, py2, *linestrings);
-    DBUG_ASSERT(linestrings.get() != 0);
+    assert(linestrings.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *linestrings, NULL) &&
         linestrings->size() > 0)
     {
@@ -878,8 +885,8 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::union_(ls1, mls2, *res);
-    DBUG_ASSERT(res.get() != 0);
-    DBUG_ASSERT(res->size() != 0);
+    assert(res.get() != 0);
+    assert(res->size() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result))
     {
       my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
@@ -915,7 +922,7 @@ class BG_setop_wrapper
     // equivalent to GeometryCollection(MultiPolygon,
     // Difference(LineString, MultiPolygon)).
     boost::geometry::difference(ls1, mpy2, *linestrings);
-    DBUG_ASSERT(linestrings.get() != 0);
+    assert(linestrings.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *linestrings, NULL) &&
         linestrings->size() > 0)
     {
@@ -988,7 +995,7 @@ class BG_setop_wrapper
     // equivalent to GeometryCollection(Polygon,
     // Difference(MultiLineString, Polygon)).
     boost::geometry::difference(mls2, py1, *linestrings);
-    DBUG_ASSERT(linestrings.get() != 0);
+    assert(linestrings.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *linestrings, NULL) &&
         linestrings->size() > 0)
     {
@@ -1067,17 +1074,17 @@ class BG_setop_wrapper
                                       String *result)
   {
     Geometry *retgeo= NULL;
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     Geometry::wkbType gt2= g2->get_type();
 #endif
     Point_set ptset;
     Multipoint mpts(g1->get_data_ptr(),
                     g1->get_data_size(), g1->get_flags(), g1->get_srid());
 
-    DBUG_ASSERT(gt2 == Geometry::wkb_linestring ||
-                gt2 == Geometry::wkb_polygon ||
-                gt2 == Geometry::wkb_multilinestring ||
-                gt2 == Geometry::wkb_multipolygon);
+    assert(gt2 == Geometry::wkb_linestring ||
+           gt2 == Geometry::wkb_polygon ||
+           gt2 == Geometry::wkb_multilinestring ||
+           gt2 == Geometry::wkb_multipolygon);
     ptset.insert(mpts.begin(), mpts.end());
 
     Gis_geometry_collection *geocol= new Gis_geometry_collection(g2, result);
@@ -1126,8 +1133,8 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::union_(mls1, mls2, *res);
-    DBUG_ASSERT(res.get() != 0);
-    DBUG_ASSERT(res->size() != 0);
+    assert(res.get() != 0);
+    assert(res->size() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result))
     {
       my_error(ER_GIS_UNKNOWN_ERROR, MYF(0), m_ifso->func_name());
@@ -1163,7 +1170,7 @@ class BG_setop_wrapper
     // it's equivalent to GeometryCollection(MultiPolygon,
     // Difference(MultiLineString, MultiPolygon)).
     boost::geometry::difference(mls1, mpy2, *linestrings);
-    DBUG_ASSERT(linestrings.get() != 0);
+    assert(linestrings.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *linestrings, NULL) &&
         linestrings->size() > 0)
     {
@@ -1360,7 +1367,7 @@ class BG_setop_wrapper
     // The call to ls->set_ptr() below assumes that result->length()
     // is the length of the LineString, which is only true if result
     // is empty to begin with.
-    DBUG_ASSERT(result->length() == 0);
+    assert(result->length() == 0);
 
     if (res->size() == 0)
     {
@@ -1431,7 +1438,7 @@ class BG_setop_wrapper
     // The call to ls->set_ptr() below assumes that result->length()
     // is the length of the LineString, which is only true if result
     // is empty to begin with.
-    DBUG_ASSERT(result->length() == 0);
+    assert(result->length() == 0);
 
     if (res->size() == 0)
     {
@@ -1535,7 +1542,7 @@ class BG_setop_wrapper
     // The call to ls->set_ptr() below assumes that result->length()
     // is the length of the LineString, which is only true if result
     // is empty to begin with.
-    DBUG_ASSERT(result->length() == 0);
+    assert(result->length() == 0);
 
     if (res->size() == 0)
     {
@@ -1606,7 +1613,7 @@ class BG_setop_wrapper
     // The call to ls->set_ptr() below assumes that result->length()
     // is the length of the LineString, which is only true if result
     // is empty to begin with.
-    DBUG_ASSERT(result->length() == 0);
+    assert(result->length() == 0);
 
     if (res->size() == 0)
     {
@@ -1706,7 +1713,7 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::sym_difference(ls1, ls2, *res);
-    DBUG_ASSERT(res.get() != 0);
+    assert(res.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result) &&
         res->size() > 0)
     {
@@ -1740,7 +1747,7 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::sym_difference(ls1, mls2, *res);
-    DBUG_ASSERT(res.get() != 0);
+    assert(res.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result) &&
         res->size() > 0)
     {
@@ -1809,7 +1816,7 @@ class BG_setop_wrapper
     res->set_srid(g1->get_srid());
 
     boost::geometry::sym_difference(mls1, mls2, *res);
-    DBUG_ASSERT(res.get() != 0);
+    assert(res.get() != 0);
     if (post_fix_result(&m_ifso->bg_resbuf_mgr, *res, result) &&
         res->size() > 0)
     {
@@ -2517,7 +2524,7 @@ bg_geo_set_op(Geometry *g1, Geometry *g2, String *result)
     break;
   default:
     // Other operations are not set operations.
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -2527,7 +2534,7 @@ bg_geo_set_op(Geometry *g1, Geometry *g2, String *result)
   if (null_value)
   {
     error_str();
-    DBUG_ASSERT(retgeo == NULL);
+    assert(retgeo == NULL);
   }
 
   // If we got effective result, the wkb encoding is written to 'result', and
@@ -2602,9 +2609,9 @@ combine_sub_results(Geometry *geo1, Geometry *geo2, String *result)
     return retgeo;
   }
 
-  DBUG_ASSERT((geo1->get_type() == Geometry::wkb_multilinestring ||
-               geo1->get_type() == Geometry::wkb_multipolygon) &&
-              geo2->get_type() == Geometry::wkb_multipoint);
+  assert((geo1->get_type() == Geometry::wkb_multilinestring ||
+          geo1->get_type() == Geometry::wkb_multipolygon) &&
+         geo2->get_type() == Geometry::wkb_multipoint);
   Multipoint mpts(geo2->get_data_ptr(), geo2->get_data_size(),
                   geo2->get_flags(), geo2->get_srid());
   geocol= new Gis_geometry_collection(geo1, result);
@@ -2668,7 +2675,7 @@ Geometry *Item_func_spatial_operation::
 simplify_multilinestring(Gis_multi_line_string *mls, String *result)
 {
   // Null values are handled by caller.
-  DBUG_ASSERT(mls != NULL);
+  assert(mls != NULL);
   Geometry *retgeo;
 
   // Loop through the multilinestring and separate true linestrings
@@ -2690,7 +2697,7 @@ simplify_multilinestring(Gis_multi_line_string *mls, String *result)
   {
     if (i->size() != 2)
     {
-      DBUG_ASSERT(i->size() > 2);
+      assert(i->size() > 2);
       linestrings->push_back(*i);
       continue;
     }
@@ -2928,14 +2935,14 @@ class Singleton_extractor : public WKB_scanner_event_handler
   virtual void on_wkb_end(const void *wkb)
   {
     depth--;
-    DBUG_ASSERT(depth >= 0);
+    assert(depth >= 0);
 
     if (levels > 0)
     {
       levels--;
       if (levels == 0)
       {
-        DBUG_ASSERT(depth == gc_depth);
+        assert(depth == gc_depth);
         ntrees++;
         end= static_cast<const char *>(wkb);
         mg_depth= 0;
@@ -3008,7 +3015,7 @@ bool simplify_multi_geometry(String *str, String *result_buffer)
         p= const_cast<char *>(result_buffer->ptr());
         str= result_buffer;
       }
-      DBUG_ASSERT((str->length() - GEOM_HEADER_SIZE - 4 - WKB_HEADER_SIZE) > 0);
+      assert((str->length() - GEOM_HEADER_SIZE - 4 - WKB_HEADER_SIZE) > 0);
       int4store(p + 5, static_cast<uint32>(base_type(gtype)));
       memmove(p + GEOM_HEADER_SIZE, p + GEOM_HEADER_SIZE + 4 + WKB_HEADER_SIZE,
               str->length() - GEOM_HEADER_SIZE - 4 - WKB_HEADER_SIZE);
@@ -3033,7 +3040,7 @@ bool simplify_multi_geometry(String *str, String *result_buffer)
       }
       p= write_wkb_header(p + 4, ex.get_type());
       ptrdiff_t len= ex.get_end() - ex.get_start();
-      DBUG_ASSERT(len > 0);
+      assert(len > 0);
       memmove(p, ex.get_start(), len);
       str->length(GEOM_HEADER_SIZE + len);
       ret= true;
@@ -3051,7 +3058,7 @@ bool simplify_multi_geometry(String *str, String *result_buffer)
 String *Item_func_spatial_operation::val_str(String *str_value_arg)
 {
   DBUG_ENTER("Item_func_spatial_operation::val_str");
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   tmp_value1.length(0);
   tmp_value2.length(0);
@@ -3151,7 +3158,7 @@ String *Item_func_spatial_operation::val_str(String *str_value_arg)
     DBUG_RETURN(error_str());
   }
 
-  DBUG_ASSERT(gres != NULL && !null_value && str_value_arg->length() > 0);
+  assert(gres != NULL && !null_value && str_value_arg->length() > 0);
 
   /*
     There are 4 ways to create the result geometry object and allocate
@@ -3179,11 +3186,11 @@ String *Item_func_spatial_operation::val_str(String *str_value_arg)
    */
   if (!str_value_arg->is_alloced() && gres != g1 && gres != g2)
   {
-    DBUG_ASSERT(gres->has_geom_header_space() || gres->is_bg_adapter());
+    assert(gres->has_geom_header_space() || gres->is_bg_adapter());
   }
   else
   {
-    DBUG_ASSERT(gres->has_geom_header_space() || (gres == g1 || gres == g2));
+    assert(gres->has_geom_header_space() || (gres == g1 || gres == g2));
     if (gres == g1)
     {
       str_value_arg= res1;
@@ -3371,7 +3378,7 @@ geometry_collection_set_operation(Geometry *g1, Geometry *g2,
         gres2= new Gis_multi_polygon;
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
 
       gres2->set_data_ptr(data_start, tmpres.length() - GEOM_HEADER_SIZE);
@@ -3401,7 +3408,7 @@ geometry_collection_set_operation(Geometry *g1, Geometry *g2,
     break;
   default:
     /* Only above four supported. */
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -3697,12 +3704,12 @@ geocol_symdifference(const BG_geometry_collection &bggc1,
   diff12.reset(geocol_difference<Coordsys>(bggc1, bggc2, &diff12_wkb));
   if (null_value)
     return NULL;
-  DBUG_ASSERT(diff12.get() != NULL);
+  assert(diff12.get() != NULL);
 
   diff21.reset(geocol_difference<Coordsys>(bggc2, bggc1, &diff21_wkb));
   if (null_value)
     return NULL;
-  DBUG_ASSERT(diff21.get() != NULL);
+  assert(diff21.get() != NULL);
 
   spatial_op= op_union;
   res= geometry_collection_set_operation<Coordsys>(diff12.get(), diff21.get(),
@@ -3731,7 +3738,7 @@ geocol_symdifference(const BG_geometry_collection &bggc1,
 
 bool Item_func_spatial_operation::assign_result(Geometry *geo, String *result)
 {
-  DBUG_ASSERT(geo->has_geom_header_space());
+  assert(geo->has_geom_header_space());
   char *p= geo->get_cptr() - GEOM_HEADER_SIZE;
   write_geometry_header(p, geo->get_srid(), geo->get_geotype());
   result->set(p, GEOM_HEADER_SIZE + geo->get_nbytes(), &my_charset_bin);
@@ -3754,7 +3761,7 @@ const char *Item_func_spatial_operation::func_name() const
     case op_symdifference:
       return "st_symdifference";
     default:
-      DBUG_ASSERT(0);  // Should never happen
+      assert(0);  // Should never happen
       return "sp_unknown";
   }
 }
diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc
index 50fc11498e96..2db55c8ab686 100644
--- a/sql/item_inetfunc.cc
+++ b/sql/item_inetfunc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -32,8 +39,8 @@ static const char HEX_DIGITS[]= "0123456789abcdef";
 
 longlong Item_func_inet_aton::val_int()
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT(arg_count == 1);
+  assert(fixed);
+  assert(arg_count == 1);
   null_value= true;
 
   uint byte_result= 0;
@@ -108,8 +115,8 @@ longlong Item_func_inet_aton::val_int()
 
 String* Item_func_inet_ntoa::val_str(String* str)
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT(arg_count == 1);
+  assert(fixed);
+  assert(arg_count == 1);
   null_value= true;
   ulonglong n= (ulonglong) args[0]->val_int();
 
@@ -176,7 +183,7 @@ String* Item_func_inet_ntoa::val_str(String* str)
 
 longlong Item_func_inet_bool_base::val_int()
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
 
   if (args[0]->result_type() != STRING_RESULT) // String argument expected
     return 0;
@@ -202,8 +209,8 @@ longlong Item_func_inet_bool_base::val_int()
 
 String *Item_func_inet_str_base::val_str_ascii(String *buffer)
 {
-  DBUG_ASSERT(fixed);
-  DBUG_ASSERT(arg_count == 1);
+  assert(fixed);
+  assert(arg_count == 1);
   null_value= true;
   String *arg_str;
 
@@ -510,7 +517,7 @@ static bool str_to_ipv6(const char *str, int str_length, in6_addr *ipv6_address)
       group_value <<= 4;
       group_value |= hdp - HEX_DIGITS;
 
-      DBUG_ASSERT(group_value <= 0xffff);
+      assert(group_value <= 0xffff);
 
       ++chars_in_group;
     }
diff --git a/sql/item_inetfunc.h b/sql/item_inetfunc.h
index 5a5abba26fdc..d279d5c64186 100644
--- a/sql/item_inetfunc.h
+++ b/sql/item_inetfunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_INETFUNC_INCLUDED
 #define ITEM_INETFUNC_INCLUDED
 
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/item_json_func.cc b/sql/item_json_func.cc
index 49de04d65e35..eea0a3e9668c 100644
--- a/sql/item_json_func.cc
+++ b/sql/item_json_func.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -17,9 +24,13 @@
 /* JSON Function items used by mysql */
 
 #include "item_json_func.h"
+
+#include <memory>               // std::auto_ptr
+
 #include "derror.h"             // ER_THD
 #include "mysqld.h"             // key_memory_JSON, current_thd
 #include "sql_class.h"          // THD
+#include "sql_exception_handler.h"              // handle_std_exception
 #include "item_cmpfunc.h"       // Item_func_like
 #include "json_dom.h"
 #include "json_path.h"
@@ -124,7 +135,7 @@ static bool parse_json(String *res,
 
   if (!dom)
   {
-    DBUG_ASSERT(!require_str_or_json);
+    assert(!require_str_or_json);
     return !is_valid_json_syntax(safep, safe_length);
   }
 
@@ -204,25 +215,12 @@ static enum_field_types get_normalized_field_type(Item *arg)
 }
 
 
-/**
-  Helper method for Item_func_json_* methods. Check whether an argument
-  can be converted to a utf8mb4 string.
-
-  @param[in]  arg_item    An argument Item
-  @param[out] value       Where to materialize the arg_item's string value
-  @param[out] utf8_res    Buffer for use by ensure_utf8mb4.
-  @param[in]  func_name   Name of the user-invoked JSON_ function
-  @param[out] safep       String pointer after any relevant conversion
-  @param[out] safe_length Corresponding string length
-
-  @returns true if the Item is not a utf8mb4 string
-*/
-static bool get_json_string(Item *arg_item,
-                            String *value,
-                            String *utf8_res,
-                            const char *func_name,
-                            const char **safep,
-                            size_t *safe_length)
+bool get_json_string(Item *arg_item,
+                     String *value,
+                     String *utf8_res,
+                     const char *func_name,
+                     const char **safep,
+                     size_t *safe_length)
 {
   String *const res= arg_item->val_str(value);
 
@@ -279,7 +277,7 @@ static bool json_is_valid(Item **args,
   {
   case MYSQL_TYPE_NULL:
     arg_item->update_null_value();
-    DBUG_ASSERT(arg_item->null_value);
+    assert(arg_item->null_value);
     *valid= true;
     return false;
   case MYSQL_TYPE_JSON:
@@ -336,69 +334,6 @@ static bool json_is_valid(Item **args,
 }
 
 
-
-#define CATCH_ALL(funcname, expr) \
-  catch (const std::bad_alloc &e)\
-  {\
-    my_error(ER_STD_BAD_ALLOC_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::domain_error &e)\
-  {\
-    my_error(ER_STD_DOMAIN_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::length_error &e)\
-  {\
-    my_error(ER_STD_LENGTH_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::invalid_argument &e)\
-  {\
-    my_error(ER_STD_INVALID_ARGUMENT, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::out_of_range &e)\
-   {\
-    my_error(ER_STD_OUT_OF_RANGE_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::overflow_error &e)\
-  {\
-    my_error(ER_STD_OVERFLOW_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::range_error &e)\
-  {\
-    my_error(ER_STD_RANGE_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::underflow_error &e)\
-  {\
-    my_error(ER_STD_UNDERFLOW_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::logic_error &e)\
-  {\
-    my_error(ER_STD_LOGIC_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::runtime_error &e)\
-  {\
-    my_error(ER_STD_RUNTIME_ERROR, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (const std::exception &e)\
-  {\
-    my_error(ER_STD_UNKNOWN_EXCEPTION, MYF(0), e.what(), (funcname));\
-    expr;\
-  }\
-  catch (...)\
-  {\
-    my_error(ER_STD_UNKNOWN_EXCEPTION, MYF(0), (funcname));\
-    expr;\
-  }
-
 /**
   Helper method for Item_func_json_* methods. Assumes that the caller
   has already verified that the path expression is not null. Raises an
@@ -553,7 +488,7 @@ bool Json_path_cache::parse_and_cache_path(Item ** args, uint arg_idx,
     }
   }
 
-  DBUG_ASSERT((vector_idx == JPC_UNINITIALIZED) || (vector_idx >= 0));
+  assert((vector_idx == JPC_UNINITIALIZED) || (vector_idx >= 0));
 
   if (vector_idx == JPC_UNINITIALIZED)
   {
@@ -629,10 +564,7 @@ Item_json_func::save_in_field_inner(Field *field, bool no_conversions)
 
 longlong Item_func_json_valid::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
-  bool result= 1;
-  null_value= false;
-
+  assert(fixed == 1);
   try
   {
     bool ok;
@@ -641,21 +573,20 @@ longlong Item_func_json_valid::val_int()
       return error_int();
     }
 
-    if (!ok)
-    {
-      null_value= false;
-      return 0;
-    }
+    null_value= args[0]->null_value;
 
-    if (args[0]->null_value)
-    {
-      null_value= true;
+    if (null_value || !ok)
       return 0;
-    }
-
-  } CATCH_ALL("json_valid", result= 0)        /* purecov: inspected */
 
-  return result;
+    return 1;
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_int();
+    /* purecov: end */
+  }
 }
 
 
@@ -889,7 +820,7 @@ void Item_func_json_contains::cleanup()
 
 longlong Item_func_json_contains::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -947,7 +878,14 @@ longlong Item_func_json_contains::val_int()
       null_value= false;
       return ret;
     }
-  } CATCH_ALL("json_contains", return error_int()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_int();
+    /* purecov: end */
+  }
 }
 
 
@@ -961,7 +899,7 @@ void Item_func_json_contains_path::cleanup()
 
 longlong Item_func_json_contains_path::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong result= 0;
   null_value= false;
 
@@ -1035,7 +973,14 @@ longlong Item_func_json_contains_path::val_int()
       }
     }
 
-  } CATCH_ALL("json_contains_path", return error_int()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_int();
+    /* purecov: end */
+  }
 
   return result;
 }
@@ -1048,7 +993,7 @@ bool json_value(Item **args, uint arg_idx, Json_wrapper *result)
   if (arg->field_type() == MYSQL_TYPE_NULL)
   {
     arg->update_null_value();
-    DBUG_ASSERT(arg->null_value);
+    assert(arg->null_value);
     return false;
   }
 
@@ -1109,7 +1054,7 @@ bool get_json_wrapper(Item **args,
     return false;
   }
 
-  DBUG_ASSERT(dom);
+  assert(dom);
 
   *wrapper= Json_wrapper(dom);
   return false;
@@ -1175,9 +1120,9 @@ static uint opaque_index(enum_field_types field_type)
   return 1 + static_cast<uint>(Json_dom::J_ERROR) + offset;
 }
 
-String *Item_func_json_type::val_str(String *str)
+String *Item_func_json_type::val_str(String*)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -1200,7 +1145,14 @@ String *Item_func_json_type::val_str(String *str)
     if (m_value.append(Json_dom::json_type_string_map[typename_idx]))
       return error_str();                     /* purecov: inspected */
 
-  } CATCH_ALL("json_type", return error_str()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_str();
+    /* purecov: end */
+  }
 
   null_value= false;
   return &m_value;
@@ -1209,7 +1161,7 @@ String *Item_func_json_type::val_str(String *str)
 
 String *Item_json_func::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   Json_wrapper wr;
   if (val_json(&wr))
     return error_str();
@@ -1268,8 +1220,6 @@ longlong Item_json_func::val_int()
 
 double Item_json_func::val_real()
 {
-  char buff[MAX_FIELD_WIDTH];
-  String str(buff, sizeof(buff), &my_charset_utf8mb4_bin);
   Json_wrapper wr;
   if (val_json(&wr))
     return 0.0;
@@ -1282,10 +1232,7 @@ double Item_json_func::val_real()
 
 my_decimal *Item_json_func::val_decimal(my_decimal *decimal_value)
 {
-  char buff[MAX_FIELD_WIDTH];
-  String str(buff, sizeof(buff), &my_charset_utf8mb4_bin);
   Json_wrapper wr;
-
   if (val_json(&wr))
   {
     my_decimal_set_zero(decimal_value);
@@ -1592,7 +1539,7 @@ bool val_json_func_field_subselect(Item* arg,
     */
     /* purecov: begin inspected */
     arg->update_null_value();
-    DBUG_ASSERT(arg->null_value);
+    assert(arg->null_value);
     return false;
     /* purecov: end */
 
@@ -1605,9 +1552,9 @@ bool val_json_func_field_subselect(Item* arg,
   }
 
   // Exactly one of scalar and dom should be used.
-  DBUG_ASSERT((scalar == NULL) != (dom == NULL));
-  DBUG_ASSERT((scalar == NULL) ||
-              (get_json_scalar_from_holder(scalar) != NULL));
+  assert((scalar == NULL) != (dom == NULL));
+  assert((scalar == NULL) ||
+         (get_json_scalar_from_holder(scalar) != NULL));
 
   Json_wrapper w(scalar ? get_json_scalar_from_holder(scalar) : dom);
   if (scalar)
@@ -1741,30 +1688,19 @@ bool get_json_atom_wrapper(Item **args,
     result= val_json_func_field_subselect(arg, calling_function, value, tmp, wr,
                                           scalar, accept_string);
 
-  } CATCH_ALL("CAST(... AS JSON)", result= true) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(calling_function);
+    return true;
+    /* purecov: end */
+  }
 
   return result;
 }
 
 
-/**
-  Convert JSON values or MySQL values to JSON. Converts SQL NULL
-  to the JSON null literal.
-
-  @param[in]     args       arguments to function
-  @param[in]     arg_idx    the index of the argument to process
-  @param[in]     calling_function    name of the calling function
-  @param[in,out] value      working area (if the returned Json_wrapper points
-                            to a binary value rather than a DOM, this string
-                            will end up holding the binary representation, and
-                            it must stay alive until the wrapper is destroyed
-                            or converted from binary to DOM)
-  @param[in,out] tmp        temporary scratch space for converting strings to
-                            the correct charset; only used if accept_string is
-                            true and conversion is needed
-  @param[in,out] wr         the result wrapper
-  @returns false if we found a value or NULL, true otherwise
-*/
 bool get_atom_null_as_null(Item **args, uint arg_idx,
                            const char *calling_function, String *value,
                            String *tmp, Json_wrapper *wr)
@@ -1785,7 +1721,7 @@ bool get_atom_null_as_null(Item **args, uint arg_idx,
 
 bool Item_json_typecast::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_dom *dom= NULL;       //@< if non-null we want a DOM from parse
 
@@ -1817,7 +1753,7 @@ bool Item_json_typecast::val_json(Json_wrapper *wr)
       return false;
     }
     // We were able to parse a JSON value from a string.
-    DBUG_ASSERT(dom);
+    assert(dom);
     // Pass on the DOM wrapped
     Json_wrapper w(dom);
     wr->steal(&w);
@@ -1857,7 +1793,7 @@ void Item_func_json_length::cleanup()
 
 longlong Item_func_json_length::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong result= 0;
 
   Json_wrapper wrapper;
@@ -1870,7 +1806,14 @@ longlong Item_func_json_length::val_int()
       null_value= true;
       return 0;
     }
-  } CATCH_ALL("json_length", return 0)        /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_int();
+    /* purecov: end */
+  }
 
   if (arg_count > 1)
   {
@@ -1893,7 +1836,7 @@ longlong Item_func_json_length::val_int()
     }
 
     // there should only be one hit because wildcards were forbidden
-    DBUG_ASSERT(hits.size() == 1);
+    assert(hits.size() == 1);
 
     wrapper.steal(&hits[0]);
   }
@@ -1907,7 +1850,7 @@ longlong Item_func_json_length::val_int()
 
 longlong Item_func_json_depth::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong result= 0;
 
   Json_wrapper wrapper;
@@ -1920,7 +1863,14 @@ longlong Item_func_json_depth::val_int()
       null_value= true;
       return 0;
     }
-  } CATCH_ALL("json_depth", return error_int()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_int();
+    /* purecov: end */
+  }
 
   result= wrapper.depth();
 
@@ -1931,7 +1881,7 @@ longlong Item_func_json_depth::val_int()
 
 bool Item_func_json_keys::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_wrapper wrapper;
 
@@ -1990,7 +1940,14 @@ bool Item_func_json_keys::val_json(Json_wrapper *wr)
     Json_wrapper resw(res);
     wr->steal(&resw);
 
-  } CATCH_ALL("json_keys", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -1999,7 +1956,7 @@ bool Item_func_json_keys::val_json(Json_wrapper *wr)
 
 bool Item_func_json_extract::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2062,11 +2019,17 @@ bool Item_func_json_extract::val_json(Json_wrapper *wr)
     else // one path, no ellipsis or wildcard
     {
       // there should only be one match
-      DBUG_ASSERT(v.size() == 1);
+      assert(v.size() == 1);
       wr->steal(&v[0]);
     }
-
-  } CATCH_ALL("json_extract", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2088,11 +2051,11 @@ static inline bool wrapped_top_level_item(Json_path *path, Json_dom *v)
   if (v->parent())
     return false;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (size_t i= 0; i < path->leg_count(); i++)
   {
-    DBUG_ASSERT(path->get_leg_at(i)->get_type() == jpl_array_cell);
-    DBUG_ASSERT(path->get_leg_at(i)->get_array_cell_index() == 0);
+    assert(path->get_leg_at(i)->get_type() == jpl_array_cell);
+    assert(path->get_leg_at(i)->get_array_cell_index() == 0);
   }
 #endif
 
@@ -2102,7 +2065,7 @@ static inline bool wrapped_top_level_item(Json_path *path, Json_dom *v)
 
 bool Item_func_json_array_append::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2198,8 +2161,14 @@ bool Item_func_json_array_append::val_json(Json_wrapper *wr)
 
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
-
-  } CATCH_ALL("json_array_append", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2208,7 +2177,7 @@ bool Item_func_json_array_append::val_json(Json_wrapper *wr)
 
 bool Item_func_json_insert::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2303,7 +2272,7 @@ bool Item_func_json_insert::val_json(Json_wrapper *wr)
           if ((*it)->json_type() == Json_dom::J_ARRAY)
           {
             Json_array *arr= down_cast<Json_array *>(*it);
-            DBUG_ASSERT(leg->get_type() == jpl_array_cell);
+            assert(leg->get_type() == jpl_array_cell);
             if (arr->insert_clone(leg->get_array_cell_index(), valuew.to_dom()))
               return error_json();        /* purecov: inspected */
           }
@@ -2337,7 +2306,7 @@ bool Item_func_json_insert::val_json(Json_wrapper *wr)
             } else
             {
               Json_dom *parent= a->parent();
-              DBUG_ASSERT(parent);
+              assert(parent);
 
               parent->replace_dom_in_container(a, newarr);
             }
@@ -2358,7 +2327,14 @@ bool Item_func_json_insert::val_json(Json_wrapper *wr)
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
 
-  } CATCH_ALL("json_insert", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2366,7 +2342,7 @@ bool Item_func_json_insert::val_json(Json_wrapper *wr)
 
 bool Item_func_json_array_insert::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2455,7 +2431,7 @@ bool Item_func_json_array_insert::val_json(Json_wrapper *wr)
         {
           // Excellent. Insert the value at that location.
           Json_array *arr= down_cast<Json_array *>(*it);
-          DBUG_ASSERT(leg->get_type() == jpl_array_cell);
+          assert(leg->get_type() == jpl_array_cell);
           if (arr->insert_clone(leg->get_array_cell_index(), valuew.to_dom()))
             return error_json();        /* purecov: inspected */
         }
@@ -2465,7 +2441,14 @@ bool Item_func_json_array_insert::val_json(Json_wrapper *wr)
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
 
-  } CATCH_ALL("json_array_insert", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2623,7 +2606,7 @@ bool Item_func_json_set_replace::val_json(Json_wrapper *wr)
                 continue;
 
               Json_array *arr= down_cast<Json_array *>(*it);
-              DBUG_ASSERT(leg->get_type() == jpl_array_cell);
+              assert(leg->get_type() == jpl_array_cell);
               if (arr->insert_clone(leg->get_array_cell_index(),
                                     valuew.to_dom()))
                 return error_json();            /* purecov: inspected */
@@ -2675,7 +2658,7 @@ bool Item_func_json_set_replace::val_json(Json_wrapper *wr)
               } else
               {
                 Json_dom *parent= a->parent();
-                DBUG_ASSERT(parent);
+                assert(parent);
 
                 parent->replace_dom_in_container(a, res);
               }
@@ -2726,7 +2709,14 @@ bool Item_func_json_set_replace::val_json(Json_wrapper *wr)
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
 
-  } CATCH_ALL(func_name(), return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2735,7 +2725,7 @@ bool Item_func_json_set_replace::val_json(Json_wrapper *wr)
 
 bool Item_func_json_array::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2762,7 +2752,14 @@ bool Item_func_json_array::val_json(Json_wrapper *wr)
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
 
-  } CATCH_ALL("json_array", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -2770,7 +2767,7 @@ bool Item_func_json_array::val_json(Json_wrapper *wr)
 
 bool Item_func_json_row_object::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   try
   {
@@ -2820,7 +2817,14 @@ bool Item_func_json_row_object::val_json(Json_wrapper *wr)
     // docw still owns the augmented doc, so hand it over to result
     wr->steal(&docw);
 
-  } CATCH_ALL("json_object", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   null_value= false;
   return false;
@@ -3022,7 +3026,7 @@ static bool find_matches(const Json_wrapper &wrapper, Json_path *path,
 
 bool Item_func_json_search::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_dom_vector matches(key_memory_JSON);
 
@@ -3161,7 +3165,14 @@ bool Item_func_json_search::val_json(Json_wrapper *wr)
       }   // end of loop through user-supplied path expressions
     }     // end if there are user-supplied path expressions
 
-  } CATCH_ALL("json_search", return error_json()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
 
   if (matches.size() == 0)
   {
@@ -3205,11 +3216,10 @@ Item_func_json_remove::Item_func_json_remove(THD *thd, const POS &pos,
 
 bool Item_func_json_remove::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_wrapper wrapper;
   uint32  path_count= arg_count - 1;
-  bool  had_error= false;
   null_value= false;
 
   try
@@ -3227,15 +3237,17 @@ bool Item_func_json_remove::val_json(Json_wrapper *wr)
       if (m_path_cache.parse_and_cache_path(args, path_idx + 1, true))
       {
         null_value= true;
-        break;
+        return false;
       }
     }
 
-  } CATCH_ALL("json_remove", (had_error= true)) /* purecov: inspected */
-
-  if (had_error || null_value)
+  }
+  catch (...)
   {
-    return had_error ? error_json() : false;
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
   }
 
   for (uint path_idx= 0; path_idx < path_count; ++path_idx)
@@ -3277,7 +3289,7 @@ bool Item_func_json_remove::val_json(Json_wrapper *wr)
       }
 
       Json_dom::enum_json_type type= parent->json_type();
-      DBUG_ASSERT((type == Json_dom::J_OBJECT) || (type == Json_dom::J_ARRAY));
+      assert((type == Json_dom::J_OBJECT) || (type == Json_dom::J_ARRAY));
 
       if (type == Json_dom::J_OBJECT)
       {
@@ -3299,9 +3311,9 @@ bool Item_func_json_remove::val_json(Json_wrapper *wr)
 }
 
 
-bool Item_func_json_merge::val_json(Json_wrapper *wr)
+bool Item_func_json_merge_preserve::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_dom *result_dom= NULL;
   bool had_error= false;
@@ -3337,7 +3349,14 @@ bool Item_func_json_merge::val_json(Json_wrapper *wr)
       next_wrapper.set_alias();
       result_dom= (idx == 0) ? next_dom : merge_doms(result_dom, next_dom);
     }
-  } CATCH_ALL("json_merge", (had_error= true)) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    had_error= true;
+    /* purecov: end */
+  }
 
   if (had_error || null_value)
   {
@@ -3360,7 +3379,7 @@ bool Item_func_json_merge::val_json(Json_wrapper *wr)
 
 String *Item_func_json_quote::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   String *res= args[0]->val_str(str);
   if (!res)
@@ -3407,7 +3426,14 @@ String *Item_func_json_quote::val_str(String *str)
     res->set_charset(&my_charset_utf8mb4_bin);
     if (double_quote(safep, safep_size, res))
       return error_str();                 /* purecov: inspected */
-  } CATCH_ALL("json_quote", return error_str()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_str();
+    /* purecov: end */
+  }
 
   null_value= false;
   return res;
@@ -3416,7 +3442,7 @@ String *Item_func_json_quote::val_str(String *str)
 
 String *Item_func_json_unquote::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   Json_dom *dom= NULL;
 
@@ -3491,11 +3517,18 @@ String *Item_func_json_unquote::val_str(String *str)
     /*
       Extract the internal string representation as a MySQL string
     */
-    DBUG_ASSERT(dom->json_type() == Json_dom::J_STRING);
+    assert(dom->json_type() == Json_dom::J_STRING);
     Json_wrapper wr(dom);
     if (str->copy(wr.get_data(), wr.get_data_length(), collation.collation))
       return error_str();                     /* purecov: inspected */
-  } CATCH_ALL("json_unquote", return error_str()) /* purecov: inspected */
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_str();
+    /* purecov: end */
+  }
 
 
   null_value= false;
@@ -3519,3 +3552,171 @@ Json_scalar *get_json_scalar_from_holder(Json_scalar_holder *holder)
 {
   return boost::polymorphic_get<Json_scalar>(&holder->m_val);
 }
+
+
+String *Item_func_json_pretty::val_str(String *str)
+{
+  assert(fixed);
+  try
+  {
+    Json_wrapper wr;
+    if (get_json_wrapper(args, 0, str, func_name(), &wr))
+      return error_str();
+
+    null_value= args[0]->null_value;
+    if (null_value)
+      return NULL;
+
+    str->length(0);
+    if (wr.to_pretty_string(str, func_name()))
+      return error_str();                       /* purecov: inspected */
+
+    return str;
+  }
+  /* purecov: begin inspected */
+  catch (...)
+  {
+    handle_std_exception(func_name());
+    return error_str();
+  }
+  /* purecov: end */
+}
+
+
+longlong Item_func_json_storage_size::val_int()
+{
+  assert(fixed);
+
+  /*
+    If the input is a reference to a JSON column, return the actual storage
+    size of the value in the table.
+  */
+  if (args[0]->type() == FIELD_ITEM && args[0]->field_type() == MYSQL_TYPE_JSON)
+  {
+    null_value= args[0]->is_null();
+    if (null_value)
+      return 0;
+    return down_cast<Item_field*>(args[0])->field->data_length();
+  }
+
+  /*
+    Otherwise, return the size required to store the argument if it were
+    serialized to the binary JSON format.
+  */
+  Json_wrapper wrapper;
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> buffer;
+  try
+  {
+    if (get_json_wrapper(args, 0, &buffer, func_name(), &wrapper))
+      return error_int();
+  }
+  /* purecov: begin inspected */
+  catch (...)
+  {
+    handle_std_exception(func_name());
+    return error_int();
+  }
+  /* purecov: end */
+
+  null_value= args[0]->null_value;
+  if (null_value)
+    return 0;
+
+  if (wrapper.to_binary(&buffer))
+    return error_int();                         /* purecov: inspected */
+  return buffer.length();
+}
+
+
+bool Item_func_json_merge_patch::val_json(Json_wrapper *wr)
+{
+  assert(fixed);
+
+  try
+  {
+    if (get_json_wrapper(args, 0, &m_value, func_name(), wr))
+      return error_json();
+
+    null_value= args[0]->null_value;
+
+    Json_wrapper patch_wr;
+    for (uint i= 1; i < arg_count; ++i)
+    {
+      if (get_json_wrapper(args, i, &m_value, func_name(), &patch_wr))
+        return error_json();
+
+      if (args[i]->null_value)
+      {
+        /*
+          The patch is unknown, so the result so far is unknown. We
+          cannot return NULL immediately, since a later patch can give
+          a known result. This is because the result of a merge
+          operation is the patch itself if the patch is not an object,
+          regardless of what the target document is.
+        */
+        null_value= true;
+        continue;
+      }
+
+      /*
+        If a patch is not an object, the result of the merge operation
+        is the patch itself. So just set the result to this patch and
+        go on to the next patch.
+      */
+      if (patch_wr.type() != Json_dom::J_OBJECT)
+      {
+        wr->steal(&patch_wr);
+        null_value= false;
+        continue;
+      }
+
+      /*
+        The target document is unknown, and we cannot tell the result
+        from the patch alone when the patch is an object, so go on to
+        the next patch.
+      */
+      if (null_value)
+        continue;
+
+      /*
+        Get the DOM representation of the target document. It should
+        be an object, and we will use an empty object if it is not.
+      */
+      std::auto_ptr<Json_object> target_dom;
+      if (wr->type() == Json_dom::J_OBJECT)
+      {
+        target_dom.reset(down_cast<Json_object*>(wr->to_dom()));
+        wr->set_alias();
+      }
+      else
+      {
+        target_dom.reset(new (std::nothrow) Json_object());
+      }
+
+      if (target_dom.get() == NULL)
+        return error_json();                  /* purecov: inspected */
+
+      // Get the DOM representation of the patch object.
+      Json_object *patch_dom= down_cast<Json_object*>(patch_wr.to_dom());
+      patch_wr.set_alias();    // target_dom will take over the ownership
+
+      // Apply the patch on the target document.
+      if (patch_dom == NULL || target_dom->merge_patch(patch_dom))
+        return error_json();                  /* purecov: inspected */
+
+      // Move the result of the merge operation into the result wrapper.
+      Json_wrapper res(target_dom.release());
+      wr->steal(&res);
+      null_value= false;
+    }
+
+    return false;
+  }
+  /* purecov: begin inspected */
+  catch (...)
+  {
+    handle_std_exception(func_name());
+    return error_json();
+  }
+  /* purecov: end */
+}
diff --git a/sql/item_json_func.h b/sql/item_json_func.h
index 9204ba54e045..432c89a0e678 100644
--- a/sql/item_json_func.h
+++ b/sql/item_json_func.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_JSON_FUNC_INCLUDED
 #define ITEM_JSON_FUNC_INCLUDED
 
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -22,6 +29,7 @@
 #include "item_strfunc.h"       // Item_str_func
 #include "mem_root_array.h"     // Mem_root_array
 #include "prealloced_array.h"   // Prealloced_array
+#include "sql_exception_handler.h"  // handle_std_exception
 
 class Item_func_like;
 struct Json_scalar_holder;
@@ -722,19 +730,31 @@ class Item_func_json_remove :public Item_json_func
 };
 
 /**
-  Represents the JSON function JSON_MERGE()
+  Represents the JSON function JSON_MERGE_PRESERVE.
 */
-class Item_func_json_merge :public Item_json_func
+class Item_func_json_merge_preserve :public Item_json_func
 {
 public:
-  Item_func_json_merge(THD *thd, const POS &pos, PT_item_list *a)
+  Item_func_json_merge_preserve(THD *thd, const POS &pos, PT_item_list *a)
     : Item_json_func(thd, pos, a)
   {}
 
-  const char *func_name() const
-  {
-    return "json_merge";
-  }
+  const char *func_name() const { return "json_merge_preserve"; }
+
+  bool val_json(Json_wrapper *wr);
+};
+
+/**
+  Represents the JSON function JSON_MERGE_PATCH.
+*/
+class Item_func_json_merge_patch :public Item_json_func
+{
+public:
+  Item_func_json_merge_patch(THD *thd, const POS &pos, PT_item_list *a)
+    : Item_json_func(thd, pos, a)
+  {}
+
+  const char *func_name() const { return "json_merge_patch"; }
 
   bool val_json(Json_wrapper *wr);
 };
@@ -799,6 +819,38 @@ class Item_func_json_unquote :public Item_str_func
   String *val_str(String *str);
 };
 
+/**
+  Represents the JSON_PRETTY function.
+*/
+class Item_func_json_pretty :public Item_str_func
+{
+public:
+  Item_func_json_pretty(const POS &pos, Item *a) : Item_str_func(pos, a)
+  {}
+
+  const char *func_name() const { return "json_pretty"; }
+
+  void fix_length_and_dec()
+  {
+    fix_length_and_charset(MAX_BLOB_WIDTH, &my_charset_utf8mb4_bin);
+  }
+
+  String *val_str(String *str);
+};
+
+/**
+  Class that represents the function JSON_STORAGE_SIZE.
+*/
+class Item_func_json_storage_size : public Item_int_func
+{
+public:
+  Item_func_json_storage_size(const POS &pos, Item *a)
+    : Item_int_func(pos, a)
+  {}
+  const char *func_name() const { return "json_storage_size"; }
+  longlong val_int();
+};
+
 /**
   Turn a GEOMETRY value into a JSON value per the GeoJSON specification revison 1.0.
   This method is implemented in item_geofunc.cc.
@@ -822,4 +874,48 @@ bool geometry_to_json(Json_wrapper *wr, Item *geometry_arg,
                       bool add_long_crs_urn,
                       uint32 *geometry_srid);
 
+
+/**
+  Convert JSON values or MySQL values to JSON. Converts SQL NULL
+  to the JSON null literal.
+
+  @param[in]     args       arguments to function
+  @param[in]     arg_idx    the index of the argument to process
+  @param[in]     calling_function    name of the calling function
+  @param[in,out] value      working area (if the returned Json_wrapper points
+                            to a binary value rather than a DOM, this string
+                            will end up holding the binary representation, and
+                            it must stay alive until the wrapper is destroyed
+                            or converted from binary to DOM)
+  @param[in,out] tmp        temporary scratch space for converting strings to
+                            the correct charset; only used if accept_string is
+                            true and conversion is needed
+  @param[in,out] wr         the result wrapper
+  @returns false if we found a value or NULL, true otherwise
+*/
+bool get_atom_null_as_null(Item **args, uint arg_idx,
+                           const char *calling_function, String *value,
+                           String *tmp, Json_wrapper *wr);
+
+/**
+  Helper method for Item_func_json_* methods. Check whether an argument
+  can be converted to a utf8mb4 string.
+
+  @param[in]  arg_item    An argument Item
+  @param[out] value       Where to materialize the arg_item's string value
+  @param[out] utf8_res    Buffer for use by ensure_utf8mb4.
+  @param[in]  func_name   Name of the user-invoked JSON_ function
+  @param[out] safep       String pointer after any relevant conversion
+  @param[out] safe_length Corresponding string length
+
+  @returns true if the Item is not a utf8mb4 string
+*/
+bool get_json_string(Item *arg_item,
+                     String *value,
+                     String *utf8_res,
+                     const char *func_name,
+                     const char **safep,
+                     size_t *safe_length);
+
+
 #endif /* ITEM_JSON_FUNC_INCLUDED */
diff --git a/sql/item_row.cc b/sql/item_row.cc
index bf22e1ad1c42..773d983a73a8 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -84,14 +91,14 @@ void Item_row::illegal_method_call(const char *method)
 {
   DBUG_ENTER("Item_row::illegal_method_call");
   DBUG_PRINT("error", ("!!! %s method was called for row item", method));
-  DBUG_ASSERT(0);
+  assert(0);
   my_error(ER_OPERAND_COLUMNS, MYF(0), 1);
   DBUG_VOID_RETURN;
 }
 
 bool Item_row::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   null_value= 0;
   maybe_null= 0;
   Item **arg, **arg_end;
@@ -217,7 +224,7 @@ bool Item_row::walk(Item_processor processor, enum_walk walk, uchar *arg)
 
 Item *Item_row::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   for (uint i= 0; i < arg_count; i++)
   {
diff --git a/sql/item_row.h b/sql/item_row.h
index d0362ace99af..f0a3eaaea28b 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_ROW_INCLUDED
 #define ITEM_ROW_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 1c3f960e3d01..2e020f0778b7 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,10 +35,17 @@
 */
 
 /* May include caustic 3rd-party defs. Use early, so it can override nothing. */
-#include "sha2.h"
+#include <openssl/sha.h>
 
 #include "item_strfunc.h"
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
 #include "base64.h"                  // base64_encode_max_arg_length
 #include "my_aes.h"                  // MY_AES_IV_SIZE
 #include "my_md5.h"                  // MD5_HASH_SIZE
@@ -53,9 +67,12 @@ C_MODE_END
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
 
+extern uint *my_aes_opmode_key_sizes;
+
 using std::min;
 using std::max;
-
+using std::string;
+using std::vector;
 
 /*
   For the Items which have only val_str_ascii() method
@@ -68,7 +85,7 @@ using std::max;
 */
 String *Item_str_func::val_str_from_val_str_ascii(String *str, String *str2)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (!(collation.collation->state & MY_CS_NONASCII))
   {
@@ -78,7 +95,7 @@ String *Item_str_func::val_str_from_val_str_ascii(String *str, String *str2)
     return res;
   }
   
-  DBUG_ASSERT(str != str2);
+  assert(str != str2);
   
   uint errors;
   String *res= val_str_ascii(str);
@@ -107,7 +124,7 @@ bool Item_str_func::fix_fields(THD *thd, Item **ref)
 
 my_decimal *Item_str_func::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[64];
   String *res, tmp(buff,sizeof(buff), &my_charset_bin);
   res= val_str(&tmp);
@@ -121,7 +138,7 @@ my_decimal *Item_str_func::val_decimal(my_decimal *decimal_value)
 
 double Item_str_func::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int err_not_used;
   char *end_not_used, buff[64];
   String *res, tmp(buff,sizeof(buff), &my_charset_bin);
@@ -133,7 +150,7 @@ double Item_str_func::val_real()
 
 longlong Item_str_func::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   int err;
   char buff[22];
   String *res, tmp(buff,sizeof(buff), &my_charset_bin);
@@ -147,7 +164,7 @@ longlong Item_str_func::val_int()
 
 String *Item_func_md5::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String * sptr= args[0]->val_str(str);
   str->set_charset(&my_charset_bin);
   if (sptr)
@@ -197,7 +214,7 @@ void Item_func_md5::fix_length_and_dec()
 
 String *Item_func_sha::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String * sptr= args[0]->val_str(str);
   str->set_charset(&my_charset_bin);
   if (sptr)  /* If we got value different from NULL */
@@ -234,7 +251,7 @@ void Item_func_sha::fix_length_and_dec()
 */
 String *Item_func_sha2::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   unsigned char digest_buf[SHA512_DIGEST_LENGTH];
   uint digest_length= 0;
@@ -381,6 +398,130 @@ void Item_func_sha2::fix_length_and_dec()
 
 /* Implementation of AES encryption routines */
 
+/** Helper class to retrieve KDF options for aes_encrypt/aes_decrypt. */
+
+const int max_kdf_option_size = 256;
+const int max_kdf_iterations_size = 65535;
+const int min_kdf_iterations_size =1000;
+
+class kdf_argument {
+  char tmp_option_buff[max_kdf_option_size];
+  String tmp_option_value;
+
+ public:
+  kdf_argument()
+      : tmp_option_value(tmp_option_buff, sizeof(tmp_option_buff),
+        system_charset_info) {
+    memset(tmp_option_buff, '\0', max_kdf_option_size);
+  }
+
+  bool parse_kdf_option(String *kdf_option_value, string &kdf_option,
+                        my_bool *error_generated, const size_t max_size_allowed) {
+    /*
+      For large KDF option value, KDF option value will be set as NULL by
+      function callers.
+      It gives warning: Warning | 1301 | Result of repeat() was
+      larger than max_allowed_packet (16777216) - truncated Here arg_count >
+
+      KDF option value as NULL will be treated as invalid KDF option value.
+    */
+    if (!kdf_option_value) {
+      my_error(ER_AES_INVALID_KDF_OPTION_SIZE, MYF(0), max_size_allowed);
+      *error_generated = TRUE;
+      return FALSE;
+    }
+    if (kdf_option_value->length() > (max_size_allowed - 1)) {
+      my_error(ER_AES_INVALID_KDF_OPTION_SIZE, MYF(0), max_size_allowed);
+      *error_generated = TRUE;
+      return FALSE;
+    }
+    kdf_option = kdf_option_value->ptr();
+    return TRUE;
+  }
+
+  /**
+     Validate the options and retrieve the KDF options value.
+
+     @param arg_count   number of parameters passed to the function
+     @param args        array of arguments passed to the function
+     @param func_name   the name of the function (for errors)
+     @param [out] error_generated  set to true if error was generated.
+
+     @return retrieved KDF option values
+  */
+  vector<string> retrieve_kdf_options(uint arg_count, Item **args,
+                                      const char *func_name,
+                                      my_bool *error_generated) {
+    vector<string> kdf_options;
+    String *kdf_option_value = NULL;
+    string kdf_option;
+
+    *error_generated = FALSE;
+
+    if (arg_count > 3) {
+      kdf_option_value = args[3]->val_str(&tmp_option_value);
+    } else {
+      return kdf_options;
+    }
+    // KDF funtion name
+    if (!parse_kdf_option(kdf_option_value, kdf_option, error_generated,
+                          max_kdf_option_size))
+      return kdf_options;
+
+      // KDF function name should be valid
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    if (kdf_option == "pbkdf2_hmac") {
+#else
+    if (kdf_option == "hkdf" || kdf_option == "pbkdf2_hmac") {
+#endif
+      kdf_options.push_back(kdf_option);
+    } else {
+      my_error(ER_AES_INVALID_KDF_NAME, MYF(0), func_name);
+      *error_generated = TRUE;
+      return kdf_options;
+    }
+
+    kdf_option_value = NULL;
+    if (arg_count > 4) {
+      kdf_option_value = args[4]->val_str(&tmp_option_value);
+    } else {
+      return kdf_options;
+    }
+    // For hkdf and pbkdf2_hmac option 1 is salt
+    if (!parse_kdf_option(kdf_option_value, kdf_option, error_generated,
+                          max_kdf_option_size))
+      return kdf_options;
+    kdf_options.push_back(kdf_option);
+
+    kdf_option_value = NULL;
+    if (arg_count > 5) {
+      kdf_option_value = args[5]->val_str(&tmp_option_value);
+    } else {
+      return kdf_options;
+    }
+    // For hkdf option 2 is info
+    // For pbkdf2_hmac option 2 is iterations
+    size_t max_size_allowed = max_kdf_option_size;
+    if (kdf_options[0] == "pbkdf2_hmac") {
+      // 4 bytes for integer (65535).
+      max_size_allowed = 6;
+    }
+    if (!parse_kdf_option(kdf_option_value, kdf_option, error_generated,
+                          max_size_allowed))
+      return kdf_options;
+    kdf_options.push_back(kdf_option);
+
+    if ((kdf_options[0] == "pbkdf2_hmac") && (kdf_options.size() > 2)) {
+      int iter = atoi(kdf_options[2].c_str());
+      if (iter < min_kdf_iterations_size || iter > max_kdf_iterations_size) {
+        *error_generated = true;
+        my_error(ER_AES_INVALID_KDF_ITERATIONS, MYF(0), func_name);
+      }
+    }
+    return kdf_options;
+  }
+};
+
 /** helper class to process an IV argument to aes_encrypt/aes_decrypt */
 class iv_argument
 {
@@ -420,7 +561,7 @@ class iv_argument
     if (my_aes_needs_iv(aes_opmode))
     {
       /* we only enforce the need for IV */
-      if (arg_count == 3)
+      if (arg_count > 2)
       {
         String *iv= args[2]->val_str(&tmp_iv_value);
         if (!iv || iv->length() < MY_AES_IV_SIZE)
@@ -468,8 +609,8 @@ bool Item_func_aes_encrypt::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_aes_encrypt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
-  char key_buff[80];
+  assert(fixed == 1);
+  char key_buff[80] = {'\0'};
   String tmp_key_value(key_buff, sizeof(key_buff), system_charset_info);
   String *sptr, *key;
   int aes_length;
@@ -482,29 +623,44 @@ String *Item_func_aes_encrypt::val_str(String *str)
   key=  args[1]->val_str(&tmp_key_value);	// key
   aes_opmode= thd->variables.my_aes_mode;
 
-  DBUG_ASSERT(aes_opmode <= MY_AES_END);
+  assert(aes_opmode <= MY_AES_END);
 
   if (sptr && key) // we need both arguments to be not NULL
   {
-    const unsigned char *iv_str= 
+    const unsigned char *iv_str=
       iv_arg.retrieve_iv_ptr((enum my_aes_opmode) aes_opmode, arg_count, args,
                              func_name(), thd, &null_value);
     if (null_value)
       DBUG_RETURN(NULL);
 
+    vector<string> kdf_options;
+    kdf_argument kdf_arg;
+    kdf_options =
+      kdf_arg.retrieve_kdf_options(arg_count, args, func_name(), &null_value);
+    if (null_value) {
+      DBUG_RETURN(NULL);
+    }
+
     // Calculate result length
     aes_length= my_aes_get_size(sptr->length(),
                                 (enum my_aes_opmode) aes_opmode);
 
     str_value.set_charset(&my_charset_bin);
+    const uint rkey_size = my_aes_opmode_key_sizes[aes_opmode] / 8;
+    uint key_size = key->length();
+    if ((key_size > rkey_size) && (kdf_options.size() == 0)) {
+      push_warning_printf(thd, Sql_condition::SL_WARNING, WARN_AES_KEY_SIZE,
+                          ER_THD(thd, WARN_AES_KEY_SIZE), rkey_size);
+    }
     if (!str_value.alloc(aes_length))		// Ensure that memory is free
     {
       // finally encrypt directly to allocated buffer.
-      if (my_aes_encrypt((unsigned char *) sptr->ptr(), sptr->length(),
-                         (unsigned char *) str_value.ptr(),
-                         (unsigned char *) key->ptr(), key->length(),
-                         (enum my_aes_opmode) aes_opmode,
-                         iv_str) == aes_length)
+      if (my_aes_encrypt((unsigned char *)sptr->ptr(), sptr->length(),
+                         (unsigned char *)str_value.ptr(),
+                         (unsigned char *)key->ptr(), key->length(),
+                         (enum my_aes_opmode)aes_opmode, iv_str, true,
+                         (kdf_options.size() > 0) ? &kdf_options : NULL) ==
+          aes_length)
       {
 	// We got the expected result length
 	str_value.length((uint) aes_length);
@@ -520,7 +676,7 @@ String *Item_func_aes_encrypt::val_str(String *str)
 void Item_func_aes_encrypt::fix_length_and_dec()
 {
   ulong aes_opmode= current_thd->variables.my_aes_mode;
-  DBUG_ASSERT(aes_opmode <= MY_AES_END);
+  assert(aes_opmode <= MY_AES_END);
 
   max_length=my_aes_get_size(args[0]->max_length,
                              (enum my_aes_opmode) aes_opmode);
@@ -543,7 +699,7 @@ bool Item_func_aes_decrypt::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_aes_decrypt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char key_buff[80];
   String tmp_key_value(key_buff, sizeof(key_buff), system_charset_info);
   String *sptr, *key;
@@ -555,7 +711,7 @@ String *Item_func_aes_decrypt::val_str(String *str)
   sptr= args[0]->val_str(str);			// String to decrypt
   key=  args[1]->val_str(&tmp_key_value);	// Key
   aes_opmode= thd->variables.my_aes_mode;
-  DBUG_ASSERT(aes_opmode <= MY_AES_END);
+  assert(aes_opmode <= MY_AES_END);
 
   if (sptr && key)  			// Need to have both arguments not NULL
   {
@@ -567,12 +723,20 @@ String *Item_func_aes_decrypt::val_str(String *str)
     str_value.set_charset(&my_charset_bin);
     if (!str_value.alloc(sptr->length()))  // Ensure that memory is free
     {
+      vector<string> kdf_options;
+      kdf_argument kdf_arg;
+      kdf_options = kdf_arg.retrieve_kdf_options(arg_count, args, func_name(),
+                                                 &null_value);
+      if (null_value) {
+        DBUG_RETURN(NULL);
+      }
       // finally decrypt directly to allocated buffer.
       int length;
-      length= my_aes_decrypt((unsigned char *) sptr->ptr(), sptr->length(),
-                             (unsigned char *) str_value.ptr(),
-                             (unsigned char *) key->ptr(), key->length(),
-                             (enum my_aes_opmode) aes_opmode, iv_str);
+      length = my_aes_decrypt(
+          (unsigned char *)sptr->ptr(), sptr->length(),
+          (unsigned char *)str_value.ptr(), (unsigned char *)key->ptr(),
+          key->length(), (enum my_aes_opmode)aes_opmode, iv_str, true,
+          (kdf_options.size() > 0) ? &kdf_options : NULL);
       if (length >= 0)  // if we got correct data data
       {
         str_value.length((uint) length);
@@ -624,7 +788,7 @@ void Item_func_random_bytes::fix_length_and_dec()
 
 String *Item_func_random_bytes::val_str(String *a)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong n_bytes= args[0]->val_int();
   null_value= args[0]->null_value;
 
@@ -674,7 +838,7 @@ void Item_func_to_base64::fix_length_and_dec()
   else
   {
     uint64 length= base64_needed_encoded_length((uint64) args[0]->max_length);
-    DBUG_ASSERT(length > 0);
+    assert(length > 0);
     fix_char_length_ulonglong((ulonglong) length - 1);
   }
 }
@@ -703,7 +867,7 @@ String *Item_func_to_base64::val_str_ascii(String *str)
     return 0;
   }
   base64_encode(res->ptr(), (int) res->length(), (char*) tmp_value.ptr());
-  DBUG_ASSERT(length > 0);
+  assert(length > 0);
   tmp_value.length((uint) length - 1); // Without trailing '\0'
   null_value= 0;
   return &tmp_value;
@@ -764,145 +928,35 @@ String *Item_func_from_base64::val_str(String *str)
   Don't reallocate val_str() if not absolute necessary.
 */
 
-String *Item_func_concat::val_str(String *str)
-{
-  DBUG_ASSERT(fixed == 1);
-  String *res,*res2,*use_as_buff;
-  uint i;
-  bool is_const= 0;
+String *Item_func_concat::val_str(String *str) {
+  assert(fixed == 1);
+  String *res;
 
-  null_value=0;
-  if (!(res=args[0]->val_str(str)))
-    goto null;
-  use_as_buff= &tmp_value;
-  /* Item_subselect in --ps-protocol mode will state it as a non-const */
-  is_const= args[0]->const_item() || !args[0]->used_tables();
-  for (i=1 ; i < arg_count ; i++)
-  {
-    if (res->length() == 0)
-    {
-      if (!(res=args[i]->val_str(str)))
-	goto null;
-      /*
-       CONCAT accumulates its result in the result of its the first
-       non-empty argument. Because of this we need is_const to be 
-       evaluated only for it.
-      */
-      is_const= args[i]->const_item() || !args[i]->used_tables();
+  THD *thd = current_thd;
+  null_value = false;
+  tmp_value.length(0);
+  for (uint i = 0; i < arg_count; ++i) {
+    if (!(res = args[i]->val_str(str))) {
+      null_value = 1;
+      return 0;
     }
-    else
-    {
-      if (!(res2=args[i]->val_str(use_as_buff)))
-	goto null;
-      if (res2->length() == 0)
-	continue;
-      if (res->length()+res2->length() >
-	  current_thd->variables.max_allowed_packet)
-      {
-	push_warning_printf(current_thd, Sql_condition::SL_WARNING,
-			    ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
-			    current_thd->variables.max_allowed_packet);
-	goto null;
-      }
-      if (!is_const && res->alloced_length() >= res->length()+res2->length())
-      {						// Use old buffer
-	res->append(*res2);
-      }
-      else if (str->alloced_length() >= res->length()+res2->length())
-      {
-	if (str->ptr() == res2->ptr())
-	  str->replace(0,0,*res);
-	else
-	{
-          // If res2 is a substring of str, then clone it first.
-          char buff[STRING_BUFFER_USUAL_SIZE];
-          String res2_clone(buff, sizeof(buff), system_charset_info);
-          if (res2->uses_buffer_owned_by(str))
-          {
-            if (res2_clone.copy(*res2))
-              goto null;
-            res2= &res2_clone;
-          }
- 	  str->copy(*res);
-	  str->append(*res2);
-	}
-        res= str;
-        use_as_buff= &tmp_value;
-      }
-      else if (res == &tmp_value)
-      {
-	if (res->append(*res2))			// Must be a blob
-	  goto null;
-      }
-      else if (res2 == &tmp_value)
-      {						// This can happend only 1 time
-	if (tmp_value.replace(0,0,*res))
-	  goto null;
-	res= &tmp_value;
-	use_as_buff=str;			// Put next arg here
-      }
-      else if (tmp_value.is_alloced() && res2->ptr() >= tmp_value.ptr() &&
-	       res2->ptr() <= tmp_value.ptr() + tmp_value.alloced_length())
-      {
-	/*
-	  This happens really seldom:
-	  In this case res2 is sub string of tmp_value.  We will
-	  now work in place in tmp_value to set it to res | res2
-	*/
-	/* Chop the last characters in tmp_value that isn't in res2 */
-	tmp_value.length((uint32) (res2->ptr() - tmp_value.ptr()) +
-			 res2->length());
-	/* Place res2 at start of tmp_value, remove chars before res2 */
-	if (tmp_value.replace(0,(uint32) (res2->ptr() - tmp_value.ptr()),
-			      *res))
-	  goto null;
-	res= &tmp_value;
-	use_as_buff=str;			// Put next arg here
-      }
-      else
-      {						// Two big const strings
-        /*
-          NOTE: We should be prudent in the initial allocation unit -- the
-          size of the arguments is a function of data distribution, which
-          can be any. Instead of overcommitting at the first row, we grow
-          the allocated amount by the factor of 2. This ensures that no
-          more than 25% of memory will be overcommitted on average.
-        */
-
-        size_t concat_len= res->length() + res2->length();
-
-        if (tmp_value.alloced_length() < concat_len)
-        {
-          if (tmp_value.alloced_length() == 0)
-          {
-            if (tmp_value.alloc(concat_len))
-              goto null;
-          }
-          else
-          {
-            size_t new_len = max(tmp_value.alloced_length() * 2, concat_len);
-
-            if (tmp_value.mem_realloc(new_len))
-              goto null;
-          }
-        }
-
-	if (tmp_value.copy(*res) || tmp_value.append(*res2))
-	  goto null;
-
-	res= &tmp_value;
-	use_as_buff=str;
-      }
-      is_const= 0;
+    if (res->length() + tmp_value.length() >
+        thd->variables.max_allowed_packet) {
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+                          ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
+                          thd->variables.max_allowed_packet);
+      null_value = 1;
+      return 0;
+    }
+    if (tmp_value.append(*res)) {
+      null_value = 1;
+      return 0;
     }
   }
+  res = &tmp_value;
   res->set_charset(collation.collation);
   return res;
-
-null:
-  null_value=1;
-  return 0;
 }
 
 
@@ -913,9 +967,10 @@ void Item_func_concat::fix_length_and_dec()
   if (agg_arg_charsets_for_string_result(collation, args, arg_count))
     return;
 
-  for (uint i=0 ; i < arg_count ; i++)
+  for (uint i=0 ; i < arg_count ; i++) {
+    args[i]->cmp_context = STRING_RESULT;
     char_length+= args[i]->max_char_length();
-
+  }
   fix_char_length_ulonglong(char_length);
 }
 
@@ -932,7 +987,7 @@ void Item_func_concat::fix_length_and_dec()
 
 String *Item_func_des_encrypt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   uint code= ER_WRONG_PARAMETERS_TO_PROCEDURE;
   DES_cblock ivec;
@@ -1029,7 +1084,7 @@ String *Item_func_des_encrypt::val_str(String *str)
 
 String *Item_func_des_decrypt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
   uint code= ER_WRONG_PARAMETERS_TO_PROCEDURE;
   DES_cblock ivec;
@@ -1112,155 +1167,57 @@ String *Item_func_des_decrypt::val_str(String *str)
   concat_ws takes at least two arguments.
 */
 
-String *Item_func_concat_ws::val_str(String *str)
-{
-  DBUG_ASSERT(fixed == 1);
+String *Item_func_concat_ws::val_str(String *str) {
+  assert(fixed == 1);
   char tmp_str_buff[10];
-  String tmp_sep_str(tmp_str_buff, sizeof(tmp_str_buff),default_charset_info),
-         *sep_str, *res, *res2,*use_as_buff;
+  String tmp_sep_str(tmp_str_buff, sizeof(tmp_str_buff), default_charset_info);
+  String *sep_str, *res = NULL, *res2;
   uint i;
-  bool is_const= 0;
-
-  null_value=0;
-  if (!(sep_str= args[0]->val_str(&tmp_sep_str)))
-    goto null;
 
-  use_as_buff= &tmp_value;
-  str->length(0);				// QQ; Should be removed
-  res=str;
+  THD *thd = current_thd;
+  null_value = false;
+  if (!(sep_str = args[0]->val_str(&tmp_sep_str))) {
+    null_value = 1;
+    return 0;
+  }
+  tmp_value.length(0);
 
   // Skip until non-null argument is found.
   // If not, return the empty string
-  for (i=1; i < arg_count; i++)
-    if ((res= args[i]->val_str(str)))
-    {
-      is_const= args[i]->const_item() || !args[i]->used_tables();
+  for (i = 1; i < arg_count; i++)
+    if ((res = args[i]->val_str(str))) {
       break;
     }
 
-  if (i ==  arg_count)
+  if (i == arg_count)
     return make_empty_result();
 
-  for (i++; i < arg_count ; i++)
-  {
-    if (!(res2= args[i]->val_str(use_as_buff)))
-      continue;					// Skip NULL
-
-    if (res->length() + sep_str->length() + res2->length() >
-	current_thd->variables.max_allowed_packet)
-    {
-      push_warning_printf(current_thd, Sql_condition::SL_WARNING,
-			  ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			  ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
-			  current_thd->variables.max_allowed_packet);
-      goto null;
-    }
-    if (!is_const && res->alloced_length() >=
-	res->length() + sep_str->length() + res2->length())
-    {						// Use old buffer
-      res->append(*sep_str);			// res->length() > 0 always
-      res->append(*res2);
-    }
-    else if (str->alloced_length() >=
-	     res->length() + sep_str->length() + res2->length())
-    {
-      /* We have room in str;  We can't get any errors here */
-      if (str->ptr() == res2->ptr())
-      {						// This is quite uncommon!
-	str->replace(0,0,*sep_str);
-	str->replace(0,0,*res);
-      }
-      else
-      {
-        // If res2 is a substring of str, then clone it first.
-        char buff[STRING_BUFFER_USUAL_SIZE];
-        String res2_clone(buff, sizeof(buff), system_charset_info);
-        if (res2->uses_buffer_owned_by(str))
-        {
-          if (res2_clone.copy(*res2))
-            goto null;
-          res2= &res2_clone;
-        }
-	str->copy(*res);
-	str->append(*sep_str);
-	str->append(*res2);
-      }
-      res=str;
-      use_as_buff= &tmp_value;
-    }
-    else if (res == &tmp_value)
-    {
-      if (res->append(*sep_str) || res->append(*res2))
-	goto null; // Must be a blob
-    }
-    else if (res2 == &tmp_value)
-    {						// This can happend only 1 time
-      if (tmp_value.replace(0,0,*sep_str) || tmp_value.replace(0,0,*res))
-	goto null;
-      res= &tmp_value;
-      use_as_buff=str;				// Put next arg here
-    }
-    else if (tmp_value.is_alloced() && res2->ptr() >= tmp_value.ptr() &&
-	     res2->ptr() < tmp_value.ptr() + tmp_value.alloced_length())
-    {
-      /*
-	This happens really seldom:
-	In this case res2 is sub string of tmp_value.  We will
-	now work in place in tmp_value to set it to res | sep_str | res2
-      */
-      /* Chop the last characters in tmp_value that isn't in res2 */
-      tmp_value.length((uint32) (res2->ptr() - tmp_value.ptr()) +
-		       res2->length());
-      /* Place res2 at start of tmp_value, remove chars before res2 */
-      if (tmp_value.replace(0,(uint32) (res2->ptr() - tmp_value.ptr()),
-			    *res) ||
-	  tmp_value.replace(res->length(),0, *sep_str))
-	goto null;
-      res= &tmp_value;
-      use_as_buff=str;			// Put next arg here
-    }
-    else
-    {						// Two big const strings
-      /*
-        NOTE: We should be prudent in the initial allocation unit -- the
-        size of the arguments is a function of data distribution, which can
-        be any. Instead of overcommitting at the first row, we grow the
-        allocated amount by the factor of 2. This ensures that no more than
-        25% of memory will be overcommitted on average.
-      */
-
-      size_t concat_len= res->length() + sep_str->length() + res2->length();
-
-      if (tmp_value.alloced_length() < concat_len)
-      {
-        if (tmp_value.alloced_length() == 0)
-        {
-          if (tmp_value.alloc(concat_len))
-            goto null;
-        }
-        else
-        {
-          size_t new_len = max(tmp_value.alloced_length() * 2, concat_len);
+  if (tmp_value.append(*res)) {
+    null_value = 1;
+    return 0;
+  }
 
-          if (tmp_value.mem_realloc(new_len))
-            goto null;
-        }
-      }
+  for (i++; i < arg_count; i++) {
+    if (!(res2 = args[i]->val_str(str)))
+      continue; // Skip NULL
 
-      if (tmp_value.copy(*res) ||
-	  tmp_value.append(*sep_str) ||
-	  tmp_value.append(*res2))
-	goto null;
-      res= &tmp_value;
-      use_as_buff=str;
+    if (tmp_value.length() + sep_str->length() + res2->length() >
+        thd->variables.max_allowed_packet) {
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+                          ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
+                          thd->variables.max_allowed_packet);
+      null_value = 1;
+      return 0;
+    }
+    if (tmp_value.append(*sep_str) || tmp_value.append(*res2)) {
+      null_value = 1;
+      return 0;
     }
   }
+  res = &tmp_value;
   res->set_charset(collation.collation);
   return res;
-
-null:
-  null_value=1;
-  return 0;
 }
 
 
@@ -1277,8 +1234,10 @@ void Item_func_concat_ws::fix_length_and_dec()
      so, (arg_count - 2) is safe here.
   */
   char_length= (ulonglong) args[0]->max_char_length() * (arg_count - 2);
-  for (uint i=1 ; i < arg_count ; i++)
+  for (uint i=1 ; i < arg_count ; i++) {
+    args[i]->cmp_context = STRING_RESULT;
     char_length+= args[i]->max_char_length();
+  }
 
   fix_char_length_ulonglong(char_length);
 }
@@ -1286,7 +1245,7 @@ void Item_func_concat_ws::fix_length_and_dec()
 
 String *Item_func_reverse::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res = args[0]->val_str(str);
   char *ptr, *end, *tmp;
 
@@ -1314,7 +1273,7 @@ String *Item_func_reverse::val_str(String *str)
       if ((l= my_ismbchar(res->charset(),ptr,end)))
       {
         tmp-= l;
-        DBUG_ASSERT(tmp >= tmp_value.ptr());
+        assert(tmp >= tmp_value.ptr());
         memcpy(tmp,ptr,l);
         ptr+= l;
       }
@@ -1334,7 +1293,7 @@ String *Item_func_reverse::val_str(String *str)
 void Item_func_reverse::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   fix_char_length(args[0]->max_char_length());
 }
 
@@ -1349,7 +1308,7 @@ void Item_func_reverse::fix_length_and_dec()
 
 String *Item_func_replace::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res,*res2,*res3;
   int offset;
   size_t from_length, to_length;
@@ -1385,7 +1344,7 @@ String *Item_func_replace::val_str(String *str)
     search=res2->ptr();
     search_end=search+from_length;
 redo:
-    DBUG_ASSERT(res->ptr() || !offset);
+    assert(res->ptr() || !offset);
     ptr=res->ptr()+offset;
     strend=res->ptr()+res->length();
     /*
@@ -1493,7 +1452,7 @@ void Item_func_replace::fix_length_and_dec()
 
 String *Item_func_insert::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res,*res2;
   longlong start, length, orig_len;  /* must be longlong to avoid truncation */
 
@@ -1583,7 +1542,7 @@ void Item_func_insert::fix_length_and_dec()
 
 String *Item_str_conv::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res;
   if (!(res=args[0]->val_str(str)))
   {
@@ -1605,7 +1564,7 @@ String *Item_str_conv::val_str(String *str)
 
     len= converter(collation.collation, (char*) res->ptr(), res->length(),
                                         (char*) res->ptr(), res->length());
-    DBUG_ASSERT(len <= res->length());
+    assert(len <= res->length());
     res->length(len);
   }
   else
@@ -1625,7 +1584,7 @@ String *Item_str_conv::val_str(String *str)
 void Item_func_lower::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   multiply= collation.collation->casedn_multiply;
   converter= collation.collation->cset->casedn;
   fix_char_length_ulonglong((ulonglong) args[0]->max_char_length() * multiply);
@@ -1634,7 +1593,7 @@ void Item_func_lower::fix_length_and_dec()
 void Item_func_upper::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   multiply= collation.collation->caseup_multiply;
   converter= collation.collation->cset->caseup;
   fix_char_length_ulonglong((ulonglong) args[0]->max_char_length() * multiply);
@@ -1643,7 +1602,7 @@ void Item_func_upper::fix_length_and_dec()
 
 String *Item_func_left::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(str);
 
   /* must be longlong to avoid truncation */
@@ -1688,14 +1647,14 @@ void Item_str_func::left_right_max_length()
 void Item_func_left::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   left_right_max_length();
 }
 
 
 String *Item_func_right::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(str);
   /* must be longlong to avoid truncation */
   longlong length= args[1]->val_int();
@@ -1722,14 +1681,14 @@ String *Item_func_right::val_str(String *str)
 void Item_func_right::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   left_right_max_length();
 }
 
 
 String *Item_func_substr::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res  = args[0]->val_str(str);
   /* must be longlong to avoid truncation */
   longlong start= args[1]->val_int();
@@ -1779,7 +1738,7 @@ void Item_func_substr::fix_length_and_dec()
   max_length=args[0]->max_length;
 
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   if (args[1]->const_item())
   {
     int32 start= (int32) args[1]->val_int();
@@ -1816,7 +1775,7 @@ void Item_func_substr_index::fix_length_and_dec()
 
 String *Item_func_substr_index::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String tmp(buff,sizeof(buff),system_charset_info);
   String *res= args[0]->val_str(str);
@@ -1941,7 +1900,7 @@ String *Item_func_substr_index::val_str(String *str)
 
 String *Item_func_trim::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   String *res= args[0]->val_str(str);
   if ((null_value = args[0]->null_value))
@@ -2063,7 +2022,7 @@ void Item_func_trim::fix_length_and_dec()
   if (arg_count == 1)
   {
     agg_arg_charsets_for_string_result(collation, args, 1);
-    DBUG_ASSERT(collation.collation != NULL);
+    assert(collation.collation != NULL);
     remove.set_charset(collation.collation);
     remove.set_ascii(" ",1);
   }
@@ -2145,7 +2104,7 @@ void Item_func_trim::print(String *str, enum_query_type query_type)
 
 static size_t calculate_password(String *str, char *buffer)
 {
-  DBUG_ASSERT(str);
+  assert(str);
   if (str->length() == 0) // PASSWORD('') returns ''
     return 0;
 
@@ -2205,7 +2164,7 @@ void Item_func_password::fix_length_and_dec()
 
 String *Item_func_password::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   String *res= args[0]->val_str(str);
 
@@ -2238,7 +2197,7 @@ bool Item_func_encrypt::itemize(Parse_context *pc, Item **res)
     return false;
   if (super::itemize(pc, res))
     return true;
-  DBUG_ASSERT(arg_count == 1 || arg_count == 2);
+  assert(arg_count == 1 || arg_count == 2);
   if (arg_count == 1)
     pc->thd->lex->set_uncacheable(pc->select, UNCACHEABLE_RAND);
   return false;
@@ -2249,7 +2208,7 @@ bool Item_func_encrypt::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_encrypt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 #ifdef HAVE_CRYPT
   String *res = args[0]->val_str(str);
   char salt[3],*salt_ptr;
@@ -2318,7 +2277,7 @@ void Item_func_encode::fix_length_and_dec()
 String *Item_func_encode::val_str(String *str)
 {
   String *res;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (!(res=args[0]->val_str(str)))
   {
@@ -2402,7 +2361,7 @@ bool Item_func_database::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_database::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   THD *thd= current_thd;
   if (thd->db().str == NULL)
   {
@@ -2422,7 +2381,7 @@ String *Item_func_database::val_str(String *str)
 */
 bool Item_func_user::init(const char *user, const char *host)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   // For system threads (e.g. replication SQL thread) user may be empty
   if (user)
@@ -2498,7 +2457,7 @@ void Item_func_soundex::fix_length_and_dec()
 {
   uint32 char_length= args[0]->max_char_length();
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   set_if_bigger(char_length, 4);
   fix_char_length(char_length);
   tmp_value.set_charset(collation.collation);
@@ -2545,7 +2504,7 @@ static bool my_uni_isalpha(int wc)
 
 String *Item_func_soundex::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res  =args[0]->val_str(str);
   char last_ch,ch;
   const CHARSET_INFO *cs= collation.collation;
@@ -2589,7 +2548,7 @@ String *Item_func_soundex::val_str(String *str)
         if ((rc= cs->cset->wc_mb(cs, wc, (uchar*) to, (uchar*) to_end)) <= 0)
         {
           /* Extra safety - should not really happen */
-          DBUG_ASSERT(false);
+          assert(false);
           return make_empty_result();
         }
         to+= rc;
@@ -2627,7 +2586,7 @@ String *Item_func_soundex::val_str(String *str)
                                (uchar*) to, (uchar*) to_end)) <= 0)
       {
         // Extra safety - should not really happen
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
       to+= rc;
@@ -2713,7 +2672,7 @@ bool Item_func_geohash::fix_fields(THD *thd, Item **ref)
       This should never happen, since function
       only supports two or three arguments.
     */
-    DBUG_ASSERT(false);
+    assert(false);
     return true;
   }
 
@@ -2952,7 +2911,7 @@ bool Item_func_geohash::fill_and_check_fields()
 */
 String *Item_func_geohash::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == TRUE);
+  assert(fixed == TRUE);
 
   if (fill_and_check_fields())
   {
@@ -3041,7 +3000,7 @@ void Item_func_geohash::encode_bit(double *upper_value, double *lower_value,
                                    double target_value, char *char_value,
                                    int bit_number)
 {
-  DBUG_ASSERT(bit_number >= 0 && bit_number <= 4);
+  assert(bit_number >= 0 && bit_number <= 4);
 
   double middle_value= (*upper_value + *lower_value) / 2.0;
   if (target_value < middle_value)
@@ -3068,7 +3027,7 @@ void Item_func_geohash::encode_bit(double *upper_value, double *lower_value,
 */
 char Item_func_geohash::char_to_base32(char char_input)
 {
-  DBUG_ASSERT(char_input <= 31);
+  assert(char_input <= 31);
 
   if (char_input < 10)
     return char_input + '0';
@@ -3094,7 +3053,7 @@ const int FORMAT_MAX_DECIMALS= 30;
 
 MY_LOCALE *Item_func_format::get_locale(Item *item)
 {
-  DBUG_ASSERT(arg_count == 3);
+  assert(arg_count == 3);
   String tmp, *locale_name= args[2]->val_str_ascii(&tmp);
   MY_LOCALE *lc;
   if (!locale_name ||
@@ -3137,7 +3096,7 @@ String *Item_func_format::val_str_ascii(String *str)
   /* Number of characters used to represent the decimals, including '.' */
   uint32 dec_length;
   MY_LOCALE *lc;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   dec= (int) args[1]->val_int();
   if (args[1]->null_value)
@@ -3179,14 +3138,15 @@ String *Item_func_format::val_str_ascii(String *str)
       str_length >= dec_length + 1 + lc->grouping[0])
   {
     /* We need space for ',' between each group of digits as well. */
-    char buf[2 * FLOATING_POINT_BUFFER];
+    char buf[2 * FLOATING_POINT_BUFFER + 2] = {0};
     int count;
     const char *grouping= lc->grouping;
     char sign_length= *str->ptr() == '-' ? 1 : 0;
     const char *src= str->ptr() + str_length - dec_length - 1;
     const char *src_begin= str->ptr() + sign_length;
-    char *dst= buf + sizeof(buf);
-    
+    char *dst= buf + 2 * FLOATING_POINT_BUFFER;
+    char *start_dst = dst;
+
     /* Put the fractional part */
     if (dec)
     {
@@ -3210,7 +3170,7 @@ String *Item_func_format::val_str_ascii(String *str)
           grouping++;
         count= *grouping;
       }
-      DBUG_ASSERT(dst > buf);
+      assert(dst > buf);
       *--dst= *src--;
     }
     
@@ -3218,7 +3178,8 @@ String *Item_func_format::val_str_ascii(String *str)
       *--dst= *str->ptr();
     
     /* Put the rest of the integer part without grouping */
-    str->copy(dst, buf + sizeof(buf) - dst, &my_charset_latin1);
+    size_t result_length = start_dst - dst;
+    str->copy(dst, result_length, &my_charset_latin1);
   }
   else if (dec_length && lc->decimal_point != '.')
   {
@@ -3226,7 +3187,7 @@ String *Item_func_format::val_str_ascii(String *str)
       For short values without thousands (<1000)
       replace decimal point to localized value.
     */
-    DBUG_ASSERT(dec_length <= str_length);
+    assert(dec_length <= str_length);
     ((char*) str->ptr())[str_length - dec_length]= lc->decimal_point;
   }
   return str;
@@ -3267,7 +3228,7 @@ void Item_func_elt::fix_length_and_dec()
 
 double Item_func_elt::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint tmp;
   null_value=1;
   if ((tmp= (uint) args[0]->val_int()) == 0 || args[0]->null_value
@@ -3281,7 +3242,7 @@ double Item_func_elt::val_real()
 
 longlong Item_func_elt::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint tmp;
   null_value=1;
   if ((tmp= (uint) args[0]->val_int()) == 0 || args[0]->null_value
@@ -3296,7 +3257,7 @@ longlong Item_func_elt::val_int()
 
 String *Item_func_elt::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint tmp;
   null_value=1;
   if ((tmp= (uint) args[0]->val_int()) == 0 || args[0]->null_value
@@ -3363,7 +3324,7 @@ void Item_func_make_set::update_used_tables()
 
 String *Item_func_make_set::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulonglong bits;
   bool first_found=0;
   Item **ptr=args;
@@ -3420,7 +3381,7 @@ String *Item_func_make_set::val_str(String *str)
 
 Item *Item_func_make_set::transform(Item_transformer transformer, uchar *arg)
 {
-  DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare());
+  assert(!current_thd->stmt_arena->is_stmt_prepare());
 
   Item *new_item= item->transform(transformer, arg);
   if (!new_item)
@@ -3453,7 +3414,7 @@ void Item_func_make_set::print(String *str, enum_query_type query_type)
 
 String *Item_func_char::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   str->length(0);
   str->set_charset(collation.collation);
   for (uint i=0 ; i < arg_count ; i++)
@@ -3516,7 +3477,7 @@ inline String* alloc_buffer(String *res,String *str,String *tmp_value,
 void Item_func_repeat::fix_length_and_dec()
 {
   agg_arg_charsets_for_string_result(collation, args, 1);
-  DBUG_ASSERT(collation.collation != NULL);
+  assert(collation.collation != NULL);
   if (args[1]->const_item())
   {
     /* must be longlong to avoid truncation */
@@ -3546,7 +3507,7 @@ void Item_func_repeat::fix_length_and_dec()
 
 String *Item_func_repeat::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   size_t length, tot_length;
   char *to;
   /* must be longlong to avoid truncation */
@@ -3678,7 +3639,7 @@ void Item_func_rpad::fix_length_and_dec()
     ulonglong char_length= (ulonglong) args[1]->val_int();
     if (args[1]->null_value)
       goto end;
-    DBUG_ASSERT(collation.collation->mbmaxlen > 0);
+    assert(collation.collation->mbmaxlen > 0);
     /* Assumes that the maximum length of a String is < INT_MAX32. */
     /* Set here so that rest of code sees out-of-bound value as such. */
     if (char_length > INT_MAX32)
@@ -3695,10 +3656,11 @@ void Item_func_rpad::fix_length_and_dec()
 
 String *Item_func_rpad::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char *to;
   /* must be longlong to avoid truncation */
   longlong count= args[1]->val_int();
+  /* Avoid modifying this string as it may affect args[0] */
   String *res= args[0]->val_str(str);
   String *rpad= args[2]->val_str(&rpad_str);
 
@@ -3742,10 +3704,15 @@ String *Item_func_rpad::val_str(String *str)
 
   const size_t res_char_length= res->numchars();
 
+  // String to pad is big enough
   if (count <= static_cast<longlong>(res_char_length))
-  {						// String to pad is big enough
-    res->length(res->charpos((int) count));	// Shorten result if longer
-    return (res);
+  {
+    int res_charpos= res->charpos((int)count);
+    if (tmp_value.alloc(res_charpos))
+      return NULL;
+    (void)tmp_value.copy(*res);
+    tmp_value.length(res_charpos); // Shorten result if longer
+    return &tmp_value;
   }
   const size_t pad_char_length= rpad->numchars();
 
@@ -3767,6 +3734,10 @@ String *Item_func_rpad::val_str(String *str)
   }
   /* Must be done before alloc_buffer */
   const size_t res_byte_length= res->length();
+  /*
+    alloc_buffer() doesn't modify 'res' because 'res' is guaranteed too short
+    at this stage.
+  */
   if (!(res= alloc_buffer(res, str, &tmp_value,
                           static_cast<size_t>(byte_count))))
   {
@@ -3805,7 +3776,7 @@ void Item_func_lpad::fix_length_and_dec()
     ulonglong char_length= (ulonglong) args[1]->val_int();
     if (args[1]->null_value)
       goto end;
-    DBUG_ASSERT(collation.collation->mbmaxlen > 0);
+    assert(collation.collation->mbmaxlen > 0);
     /* Assumes that the maximum length of a String is < INT_MAX32. */
     /* Set here so that rest of code sees out-of-bound value as such. */
     if (char_length > INT_MAX32)
@@ -3822,11 +3793,12 @@ void Item_func_lpad::fix_length_and_dec()
 
 String *Item_func_lpad::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   size_t res_char_length, pad_char_length;
   /* must be longlong to avoid truncation */
   longlong count= args[1]->val_int();
   size_t byte_count;
+  /* Avoid modifying this string as it may affect args[0] */
   String *res= args[0]->val_str(&tmp_value);
   String *pad= args[2]->val_str(&lpad_str);
 
@@ -3867,8 +3839,12 @@ String *Item_func_lpad::val_str(String *str)
 
   if (count <= static_cast<longlong>(res_char_length))
   {
-    res->length(res->charpos((int) count));
-    return res;
+    int res_charpos= res->charpos((int)count);
+   if (tmp_value.alloc(res_charpos))
+     return NULL;
+   (void)tmp_value.copy(*res);
+   tmp_value.length(res_charpos); // Shorten result if longer
+   return &tmp_value;
   }
   
   pad_char_length= pad->numchars();
@@ -3919,7 +3895,7 @@ void Item_func_conv::fix_length_and_dec()
 
 String *Item_func_conv::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(str);
   char *endptr,ans[65],*ptr;
   longlong dec;
@@ -3970,7 +3946,7 @@ String *Item_func_conv::val_str(String *str)
 
 String *Item_func_conv_charset::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (use_cached_value)
     return null_value ? 0 : &str_value;
   String *arg= args[0]->val_str(str);
@@ -4018,7 +3994,7 @@ bool Item_func_set_collation::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_set_collation::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   str=args[0]->val_str(str);
   if ((null_value=args[0]->null_value))
     return 0;
@@ -4081,15 +4057,15 @@ void Item_func_set_collation::print(String *str, enum_query_type query_type)
   str->append('(');
   args[0]->print(str, query_type);
   str->append(STRING_WITH_LEN(" collate "));
-  DBUG_ASSERT(args[1]->basic_const_item() &&
-              args[1]->type() == Item::STRING_ITEM);
+  assert(args[1]->basic_const_item() &&
+         args[1]->type() == Item::STRING_ITEM);
   args[1]->str_value.print(str);
   str->append(')');
 }
 
 String *Item_func_charset::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint dummy_errors;
 
   const CHARSET_INFO *cs= args[0]->charset_for_protocol(); 
@@ -4101,7 +4077,7 @@ String *Item_func_charset::val_str(String *str)
 
 String *Item_func_collation::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint dummy_errors;
   const CHARSET_INFO *cs= args[0]->charset_for_protocol(); 
 
@@ -4215,7 +4191,7 @@ String *Item_func_weight_string::val_str(String *str)
   String *res;
   const CHARSET_INFO *cs= args[0]->collation.collation;
   size_t tmp_length, frm_length;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (args[0]->result_type() != STRING_RESULT ||
       !(res= args[0]->val_str(str)))
@@ -4254,7 +4230,7 @@ String *Item_func_weight_string::val_str(String *str)
                                    nweights ? nweights : tmp_length,
                                    (const uchar *) res->ptr(), res->length(),
                                    flags);
-  DBUG_ASSERT(frm_length <= tmp_length);
+  assert(frm_length <= tmp_length);
 
   tmp_value.length(frm_length);
   null_value= 0;
@@ -4269,7 +4245,7 @@ String *Item_func_weight_string::val_str(String *str)
 String *Item_func_hex::val_str_ascii(String *str)
 {
   String *res;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (args[0]->result_type() != STRING_RESULT)
   {
     ulonglong dec;
@@ -4322,7 +4298,7 @@ String *Item_func_unhex::val_str(String *str)
   String *res;
   size_t length;
   null_value= true;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   res= args[0]->val_str(str);
   // For a NULL input value return NULL without any warning
@@ -4369,10 +4345,10 @@ String *Item_func_unhex::val_str(String *str)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 String *Item_func_like_range::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong nbytes= args[1]->val_int();
   String *res= args[0]->val_str(str);
   size_t min_len, max_len;
@@ -4442,7 +4418,7 @@ void Item_char_typecast::print(String *str, enum_query_type query_type)
 
 String *Item_char_typecast::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res;
   uint32 length;
 
@@ -4584,7 +4560,7 @@ bool Item_load_file::itemize(Parse_context *pc, Item **res)
 
 String *Item_load_file::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *file_name;
   File file;
   MY_STAT stat_info;
@@ -4645,7 +4621,7 @@ String *Item_load_file::val_str(String *str)
 
 String* Item_func_export_set::val_str(String* str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String yes_buf, no_buf, sep_buf;
   const ulonglong the_set = (ulonglong) args[0]->val_int();
   const String *yes= args[1]->val_str(&yes_buf);
@@ -4694,7 +4670,7 @@ String* Item_func_export_set::val_str(String* str)
     }
     break;
   default:
-    DBUG_ASSERT(0); // cannot happen
+    assert(0); // cannot happen
   }
   null_value= false;
 
@@ -4767,7 +4743,7 @@ void Item_func_export_set::fix_length_and_dec()
 
 String *Item_func_quote::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   /*
     Bit mask that has 1 for set for the position of the following characters:
     0, \, ' and ^Z
@@ -4922,7 +4898,7 @@ String *Item_func_quote::val_str(String *str)
  */
 longlong Item_func_uncompressed_length::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(&value);
 
   if ((null_value= args[0]->null_value))
@@ -4955,7 +4931,7 @@ longlong Item_func_uncompressed_length::val_int()
 
 longlong Item_func_crc32::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res=args[0]->val_str(&value);
   if (!res)
   {
@@ -4976,7 +4952,7 @@ String *Item_func_compress::val_str(String *str)
   String *res;
   Byte *body;
   char *last_char;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (!(res= args[0]->val_str(str)))
   {
@@ -5034,7 +5010,7 @@ String *Item_func_compress::val_str(String *str)
 
 String *Item_func_uncompress::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   String *res= args[0]->val_str(str);
   ulong new_size;
   int err;
@@ -5142,7 +5118,7 @@ bool Item_func_uuid::itemize(Parse_context *pc, Item **res)
 
 String *Item_func_uuid::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   char *s;
   THD *thd= current_thd;
 
@@ -5188,7 +5164,7 @@ String *Item_func_uuid::val_str(String *str)
     */
     if (nanoseq)
     {
-      DBUG_ASSERT((tv > uuid_time) && (nanoseq > 0));
+      assert((tv > uuid_time) && (nanoseq > 0));
       /*
         -1 so we won't make tv= uuid_time for nanoseq >= (tv - uuid_time)
       */
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index e86d9a73f440..5cd0c9eaa34a 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_STRFUNC_INCLUDED
 #define ITEM_STRFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +64,9 @@ class Item_str_func :public Item_func
   Item_str_func(const POS &pos, Item *a, Item *b, Item *c, Item *d, Item* e)
     :Item_func(pos, a, b, c, d, e)
   {decimals=NOT_FIXED_DEC; }
-
+  Item_str_func(const POS &pos, Item *a, Item *b, Item *c, Item *d, Item* e, Item* f)
+    :Item_func(pos, a, b, c, d, e, f)
+  {decimals=NOT_FIXED_DEC; }
   Item_str_func(List<Item> &list) :Item_func(list) {decimals=NOT_FIXED_DEC; }
   Item_str_func(const POS &pos, PT_item_list *opt_list)
     :Item_func(pos, opt_list)
@@ -178,7 +187,15 @@ class Item_func_aes_encrypt :public Item_str_func
   Item_func_aes_encrypt(const POS &pos, Item *a, Item *b, Item *c)
     :Item_str_func(pos, a, b, c)
   {}
-
+  Item_func_aes_encrypt(const POS &pos, Item *a, Item *b, Item *c, Item *d)
+    :Item_str_func(pos, a, b, c, d)
+  {}
+  Item_func_aes_encrypt(const POS &pos, Item *a, Item *b, Item *c, Item *d, Item *e)
+    :Item_str_func(pos, a, b, c, d, e)
+  {}
+  Item_func_aes_encrypt(const POS& pos, Item* a, Item* b, Item* c, Item* d, Item* e, Item* f)
+    :Item_str_func(pos, a, b, c, d, e, f)
+  {}
   virtual bool itemize(Parse_context *pc, Item **res);
   String *val_str(String *);
   void fix_length_and_dec();
@@ -195,7 +212,15 @@ class Item_func_aes_decrypt :public Item_str_func
   Item_func_aes_decrypt(const POS &pos, Item *a, Item *b, Item *c)
     :Item_str_func(pos, a, b, c)
   {}
-
+  Item_func_aes_decrypt(const POS &pos, Item *a, Item *b, Item *c, Item *d)
+    :Item_str_func(pos, a, b, c, d)
+  {}
+  Item_func_aes_decrypt(const POS &pos, Item *a, Item *b, Item *c, Item *d, Item *e)
+    :Item_str_func(pos, a, b, c, d, e)
+  {}
+  Item_func_aes_decrypt(const POS& pos, Item* a, Item* b, Item* c, Item* d, Item* e, Item* f)
+    :Item_str_func(pos, a, b, c, d, e, f)
+  {}
   virtual bool itemize(Parse_context *pc, Item **res);
   String *val_str(String *);
   void fix_length_and_dec();
@@ -229,11 +254,11 @@ class Item_func_concat :public Item_str_func
   String tmp_value;
 public:
   Item_func_concat(const POS &pos, PT_item_list *opt_list)
-    :Item_str_func(pos, opt_list)
-  {}
-
-  Item_func_concat(Item *a,Item *b) :Item_str_func(a,b) {}
-  Item_func_concat(const POS &pos, Item *a,Item *b) :Item_str_func(pos, a,b) {}
+      : Item_str_func(pos, opt_list), tmp_value("", 0, collation.collation) {}
+  Item_func_concat(Item *a, Item *b)
+      : Item_str_func(a, b), tmp_value("", 0, collation.collation) {}
+  Item_func_concat(const POS &pos, Item *a, Item *b)
+      : Item_str_func(pos, a, b), tmp_value("", 0, collation.collation) {}
 
   String *val_str(String *);
   void fix_length_and_dec();
@@ -244,10 +269,11 @@ class Item_func_concat_ws :public Item_str_func
 {
   String tmp_value;
 public:
-  Item_func_concat_ws(List<Item> &list) :Item_str_func(list) {}
+  Item_func_concat_ws(List<Item> &list)
+      : Item_str_func(list), tmp_value("", 0, collation.collation) {}
   Item_func_concat_ws(const POS &pos, PT_item_list *opt_list)
-    :Item_str_func(pos, opt_list)
-  {}
+      : Item_str_func(pos, opt_list), tmp_value("", 0, collation.collation) {}
+
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "concat_ws"; }
@@ -662,7 +688,7 @@ class Item_func_user :public Item_func_sysconst
 
   String *val_str(String *)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return (null_value ? 0 : &str_value);
   }
   bool fix_fields(THD *thd, Item **ref);
@@ -810,7 +836,7 @@ class Item_func_make_set :public Item_str_func
   String *val_str(String *str);
   bool fix_fields(THD *thd, Item **ref)
   {
-    DBUG_ASSERT(fixed == 0);
+    assert(fixed == 0);
     bool res= ((!item->fixed && item->fix_fields(thd, &item)) ||
                item->check_cols(1) ||
                Item_func::fix_fields(thd, ref));
@@ -975,7 +1001,7 @@ class Item_func_unhex :public Item_str_func
 };
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 class Item_func_like_range :public Item_str_func
 {
 protected:
@@ -1045,7 +1071,7 @@ class Item_func_binary :public Item_str_func
   Item_func_binary(const POS &pos, Item *a) :Item_str_func(pos, a) {}
   String *val_str(String *a)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     String *tmp=args[0]->val_str(a);
     null_value=args[0]->null_value;
     if (tmp)
@@ -1132,7 +1158,7 @@ class Item_func_conv_charset :public Item_str_func
   Item_func_conv_charset(Item *a, const CHARSET_INFO *cs,
                          bool cache_if_const) :Item_str_func(a)
   {
-    DBUG_ASSERT(is_fixed_or_outer_ref(args[0]));
+    assert(is_fixed_or_outer_ref(args[0]));
 
     conv_charset= cs;
     if (cache_if_const && args[0]->const_item())
@@ -1317,6 +1343,10 @@ class Item_func_uuid: public Item_str_func
   String *val_str(String *);
   bool check_gcol_func_processor(uchar *int_arg)
   { return true; }
+  // set RAND_TABLE_BIT in the used_tables_cache
+  table_map get_initial_pseudo_tables() const { return RAND_TABLE_BIT; }
+  // uuid is not constant and so non-cacheable
+  bool const_item() const { return (used_tables() == 0); }
 };
 
 class Item_func_gtid_subtract: public Item_str_ascii_func
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index b4bbf1159976..5569cabb9008 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -189,8 +196,8 @@ bool Item_in_subselect::mark_as_outer(Item *left_row, size_t col)
 
 bool Item_in_subselect::finalize_exists_transform(SELECT_LEX *select_lex)
 {
-  DBUG_ASSERT(exec_method == EXEC_EXISTS_OR_MAT ||
-              exec_method == EXEC_EXISTS);
+  assert(exec_method == EXEC_EXISTS_OR_MAT ||
+         exec_method == EXEC_EXISTS);
   /*
     Change
       SELECT expr1, expr2
@@ -288,17 +295,17 @@ Item *Item_in_subselect::remove_in2exists_conds(Item* conds)
 
 bool Item_in_subselect::finalize_materialization_transform(JOIN *join)
 {
-  DBUG_ASSERT(exec_method == EXEC_EXISTS_OR_MAT);
-  DBUG_ASSERT(engine->engine_type() == subselect_engine::SINGLE_SELECT_ENGINE);
+  assert(exec_method == EXEC_EXISTS_OR_MAT);
+  assert(engine->engine_type() == subselect_engine::SINGLE_SELECT_ENGINE);
   THD * const thd= unit->thd;
   subselect_single_select_engine *old_engine_derived=
     static_cast<subselect_single_select_engine*>(engine);
 
-  DBUG_ASSERT(join == old_engine_derived->select_lex->join);
+  assert(join == old_engine_derived->select_lex->join);
   // No UNION in materialized subquery so this holds:
-  DBUG_ASSERT(join->select_lex == unit->first_select());
-  DBUG_ASSERT(join->unit == unit);
-  DBUG_ASSERT(unit->global_parameters()->select_limit == NULL);
+  assert(join->select_lex == unit->first_select());
+  assert(join->unit == unit);
+  assert(unit->global_parameters()->select_limit == NULL);
 
   exec_method= EXEC_MATERIALIZATION;
 
@@ -318,7 +325,7 @@ bool Item_in_subselect::finalize_materialization_transform(JOIN *join)
     join->where_cond= remove_in2exists_conds(join->where_cond);
   if (join->having_cond)
     join->having_cond= remove_in2exists_conds(join->having_cond);
-  DBUG_ASSERT(!in2exists_info->dependent_before);
+  assert(!in2exists_info->dependent_before);
   join->select_lex->uncacheable&= ~UNCACHEABLE_DEPENDENT;
   unit->uncacheable&= ~UNCACHEABLE_DEPENDENT;
 
@@ -398,7 +405,7 @@ bool Item_subselect::fix_fields(THD *thd, Item **ref)
   uint8 uncacheable;
   bool res;
 
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
   /*
     Pointers to THD must match. unit::thd may vary over the lifetime of the
     item (for example triggers, and thus their Item-s, are in a cache shared
@@ -406,10 +413,10 @@ bool Item_subselect::fix_fields(THD *thd, Item **ref)
     which we check here. subselect_union_engine functions also do sanity
     checks.
   */
-  DBUG_ASSERT(thd == unit->thd);
-#ifndef DBUG_OFF
+  assert(thd == unit->thd);
+#ifndef NDEBUG
   // Engine accesses THD via its 'item' pointer, check it:
-  DBUG_ASSERT(engine->get_item() == this);
+  assert(engine->get_item() == this);
 #endif
 
   engine->set_thd_for_result();
@@ -589,7 +596,7 @@ bool Item_subselect::exec()
   if (thd->is_error() || thd->killed)
     DBUG_RETURN(true);
 
-  DBUG_ASSERT(!thd->lex->context_analysis_only);
+  assert(!thd->lex->context_analysis_only);
   /*
     Simulate a failure in sub-query execution. Used to test e.g.
     out of memory or query being killed conditions.
@@ -699,9 +706,9 @@ bool Item_in_subselect::walk(Item_processor processor, enum_walk walk,
 bool Item_in_subselect::exec()
 {
   DBUG_ENTER("Item_in_subselect::exec");
-  DBUG_ASSERT(exec_method != EXEC_MATERIALIZATION ||
-              (exec_method == EXEC_MATERIALIZATION &&
-               engine->engine_type() == subselect_engine::HASH_SJ_ENGINE));
+  assert(exec_method != EXEC_MATERIALIZATION ||
+         (exec_method == EXEC_MATERIALIZATION &&
+          engine->engine_type() == subselect_engine::HASH_SJ_ENGINE));
   /*
     Initialize the cache of the left predicate operand. This has to be done as
     late as now, because Cached_item directly contains a resolved field (not
@@ -854,7 +861,7 @@ Item_singlerow_subselect::invalidate_and_restore_select_lex()
   DBUG_ENTER("Item_singlerow_subselect::invalidate_and_restore_select_lex");
   st_select_lex *result= unit->first_select();
 
-  DBUG_ASSERT(result);
+  assert(result);
 
   /*
     This code restore the parse tree in it's state before the execution of
@@ -938,7 +945,7 @@ bool Query_result_max_min_subquery::send_data(List<Item> &items)
         break;
       case ROW_RESULT:
         // This case should never be choosen
-	DBUG_ASSERT(0);
+	assert(0);
 	op= 0;
       }
     }
@@ -1249,7 +1256,7 @@ void Item_singlerow_subselect::bring_value()
 
 double Item_singlerow_subselect::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!no_rows && !exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1264,7 +1271,7 @@ double Item_singlerow_subselect::val_real()
 
 longlong Item_singlerow_subselect::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (!no_rows && !exec() && !value->null_value)
   {
     null_value= FALSE;
@@ -1317,7 +1324,7 @@ bool Item_singlerow_subselect::val_json(Json_wrapper *result)
   else
   {
     reset();
-    return false;
+    return current_thd->is_error();
   }
 }
 
@@ -1517,7 +1524,7 @@ void Item_exists_subselect::fix_length_and_dec()
 
 double Item_exists_subselect::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1528,7 +1535,7 @@ double Item_exists_subselect::val_real()
 
 longlong Item_exists_subselect::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1553,7 +1560,7 @@ longlong Item_exists_subselect::val_int()
 
 String *Item_exists_subselect::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
     reset();
   str->set((ulonglong)value,&my_charset_bin);
@@ -1576,7 +1583,7 @@ String *Item_exists_subselect::val_str(String *str)
 
 my_decimal *Item_exists_subselect::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
     reset();
   int2my_decimal(E_DEC_FATAL_ERROR, value, 0, decimal_value);
@@ -1586,7 +1593,7 @@ my_decimal *Item_exists_subselect::val_decimal(my_decimal *decimal_value)
 
 bool Item_exists_subselect::val_bool()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1602,8 +1609,8 @@ double Item_in_subselect::val_real()
     As far as Item_in_subselect called only from Item_in_optimizer this
     method should not be used
   */
-  DBUG_ASSERT(0);
-  DBUG_ASSERT(fixed == 1);
+  assert(0);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1621,8 +1628,8 @@ longlong Item_in_subselect::val_int()
     As far as Item_in_subselect called only from Item_in_optimizer this
     method should not be used
   */
-  DBUG_ASSERT(0);
-  DBUG_ASSERT(fixed == 1);
+  assert(0);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1640,8 +1647,8 @@ String *Item_in_subselect::val_str(String *str)
     As far as Item_in_subselect called only from Item_in_optimizer this
     method should not be used
   */
-  DBUG_ASSERT(0);
-  DBUG_ASSERT(fixed == 1);
+  assert(0);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1659,7 +1666,7 @@ String *Item_in_subselect::val_str(String *str)
 
 bool Item_in_subselect::val_bool()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1676,8 +1683,8 @@ my_decimal *Item_in_subselect::val_decimal(my_decimal *decimal_value)
     As far as Item_in_subselect called only from Item_in_optimizer this
     method should not be used
   */
-  DBUG_ASSERT(0);
-  DBUG_ASSERT(fixed == 1);
+  assert(0);
+  assert(fixed == 1);
   if (exec())
   {
     reset();
@@ -1922,7 +1929,7 @@ Item_in_subselect::single_value_transformer(SELECT_LEX *select,
 
     m_injected_left_expr= left;
 
-    DBUG_ASSERT(in2exists_info == NULL);
+    assert(in2exists_info == NULL);
     in2exists_info= new In2exists_info;
     in2exists_info->dependent_before= unit->uncacheable & UNCACHEABLE_DEPENDENT;
     if (!left_expr->const_item())
@@ -2252,7 +2259,7 @@ Item_in_subselect::row_value_transformer(SELECT_LEX *select)
     optimizer->keep_top_level_cache();
 
     thd->lex->set_current_select(select);
-    DBUG_ASSERT(in2exists_info == NULL);
+    assert(in2exists_info == NULL);
     in2exists_info= new In2exists_info;
     in2exists_info->dependent_before= unit->uncacheable & UNCACHEABLE_DEPENDENT;
     if (!left_expr->const_item())
@@ -2334,9 +2341,9 @@ Item_in_subselect::row_value_in_to_exists_transformer(SELECT_LEX *select)
     {
       Item *item_i= select->ref_ptrs[i];
       Item **pitem_i= &select->ref_ptrs[i];
-      DBUG_ASSERT((left_expr->fixed && item_i->fixed) ||
-                  (item_i->type() == REF_ITEM &&
-                   ((Item_ref*)(item_i))->ref_type() == Item_ref::OUTER_REF));
+      assert((left_expr->fixed && item_i->fixed) ||
+             (item_i->type() == REF_ITEM &&
+              ((Item_ref*)(item_i))->ref_type() == Item_ref::OUTER_REF));
       if (item_i-> check_cols(left_expr->element_index(i)->cols()))
         DBUG_RETURN(RES_ERROR);
       Item_ref *const left=
@@ -2425,9 +2432,9 @@ Item_in_subselect::row_value_in_to_exists_transformer(SELECT_LEX *select)
     {
       Item *item_i= select->ref_ptrs[i];
       Item **pitem_i= &select->ref_ptrs[i];
-      DBUG_ASSERT((left_expr->fixed && item_i->fixed) ||
-                  (item_i->type() == REF_ITEM &&
-                   ((Item_ref*)(item_i))->ref_type() == Item_ref::OUTER_REF));
+      assert((left_expr->fixed && item_i->fixed) ||
+             (item_i->type() == REF_ITEM &&
+              ((Item_ref*)(item_i))->ref_type() == Item_ref::OUTER_REF));
       if (item_i->check_cols(left_expr->element_index(i)->cols()))
         DBUG_RETURN(RES_ERROR);
       Item_ref *const left=
@@ -2573,14 +2580,14 @@ Item_in_subselect::select_in_like_transformer(SELECT_LEX *select,
 
   DBUG_ENTER("Item_in_subselect::select_in_like_transformer");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     IN/SOME/ALL/ANY subqueries don't support LIMIT clause. Without
     it, ORDER BY becomes meaningless and should already have been
     removed in resolve_subquery()
   */
   for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select())
-    DBUG_ASSERT(!sl->order_list.first);
+    assert(!sl->order_list.first);
 #endif
 
   if (changed)
@@ -2814,6 +2821,12 @@ bool Item_subselect::subq_opt_away_processor(uchar *arg)
  */
 bool Item_subselect::clean_up_after_removal(uchar *arg)
 {
+  /*
+    Do not remove if this is being referenced. There is possibility
+    that this subquery is in a order by clause and also used in an
+    outer query block.
+  */
+  if (is_derived_used()) return false;
   /*
     Some commands still execute subqueries during resolving.
     Make sure they are cleaned up properly.
@@ -2821,13 +2834,23 @@ bool Item_subselect::clean_up_after_removal(uchar *arg)
   */
   if (unit->is_executed())
   {
-    DBUG_ASSERT(unit->first_select()->parent_lex->sql_command ==
-                SQLCOM_SET_OPTION);
+    assert(unit->first_select()->parent_lex->sql_command ==
+           SQLCOM_SET_OPTION);
     unit->cleanup(true);
   } 
 
   st_select_lex *root=
     static_cast<st_select_lex*>(static_cast<void*>(arg));
+
+  /*
+    Do not remove this subquery if it is a part of the select
+    list.
+  */
+  if (root != NULL &&
+      (root->resolve_place != SELECT_LEX::RESOLVE_SELECT_LIST) &&
+      root->is_in_select_list(this))
+    return false;
+
   st_select_lex *sl= unit->outer_select();
 
   /*
@@ -2847,8 +2870,6 @@ bool Item_subselect::clean_up_after_removal(uchar *arg)
   return false;
 }
 
-
-
 Item_subselect::trans_res
 Item_allany_subselect::select_transformer(SELECT_LEX *select)
 {
@@ -2948,7 +2969,7 @@ bool subselect_single_select_engine::prepare()
     return false;
   THD * const thd= item->unit->thd;
 
-  DBUG_ASSERT(result);
+  assert(result);
 
   select_lex->set_query_result(result);
   select_lex->make_active_options(SELECT_NO_UNLOCK, 0);
@@ -2967,7 +2988,7 @@ bool subselect_union_engine::prepare()
   if (!unit->is_prepared())
     return unit->prepare(unit->thd, result, SELECT_NO_UNLOCK, 0);
 
-  DBUG_ASSERT(result == unit->query_result());
+  assert(result == unit->query_result());
 
   return false;
 }
@@ -2976,7 +2997,7 @@ bool subselect_union_engine::prepare()
 bool subselect_indexsubquery_engine::prepare()
 {
   /* Should never be called. */
-  DBUG_ASSERT(FALSE);
+  assert(FALSE);
   return 1;
 }
 
@@ -2994,8 +3015,8 @@ bool subselect_indexsubquery_engine::prepare()
 void subselect_engine::set_row(List<Item> &item_list, Item_cache **row,
                                bool possibly_empty)
 {
-  DBUG_ASSERT(engine_type() == SINGLE_SELECT_ENGINE ||
-              engine_type() == UNION_ENGINE);
+  assert(engine_type() == SINGLE_SELECT_ENGINE ||
+         engine_type() == UNION_ENGINE);
 
   /*
     Empty scalar or row subqueries evaluate to NULL, so if it is
@@ -3047,14 +3068,14 @@ static bool guaranteed_one_row(const SELECT_LEX *select_lex)
 
 void subselect_single_select_engine::fix_length_and_dec(Item_cache **row)
 {
-  DBUG_ASSERT(row || select_lex->item_list.elements==1);
+  assert(row || select_lex->item_list.elements==1);
   set_row(select_lex->item_list, row, !guaranteed_one_row(select_lex));
   item->collation.set(row[0]->collation);
 }
 
 void subselect_union_engine::fix_length_and_dec(Item_cache **row)
 {
-  DBUG_ASSERT(row || unit->first_select()->item_list.elements==1);
+  assert(row || unit->first_select()->item_list.elements==1);
 
   // A UNION is possibly empty only if all of its SELECTs are possibly empty.
   bool possibly_empty= true;
@@ -3075,7 +3096,7 @@ void subselect_union_engine::fix_length_and_dec(Item_cache **row)
 void subselect_indexsubquery_engine::fix_length_and_dec(Item_cache **row)
 {
   //this never should be called
-  DBUG_ASSERT(0);
+  assert(0);
 }
 
 int read_first_record_seq(QEP_TAB *tab);
@@ -3094,7 +3115,7 @@ bool subselect_single_select_engine::exec()
 
   JOIN *const join= select_lex->join;
 
-  DBUG_ASSERT(join->is_optimized());
+  assert(join->is_optimized());
 
   if (select_lex->uncacheable && unit->is_executed())
   {
@@ -3135,8 +3156,8 @@ bool subselect_single_select_engine::exec()
                 @see push_index_cond()
                 @see setup_join_buffering()
               */
-              DBUG_ASSERT(!(tab->op && tab->op->type() == QEP_operation::OT_CACHE &&
-                            static_cast<JOIN_CACHE*>(tab->op)->is_key_access()));
+              assert(!(tab->op && tab->op->type() == QEP_operation::OT_CACHE &&
+                       static_cast<JOIN_CACHE*>(tab->op)->is_key_access()));
 
               TABLE *table= tab->table();
               /* Change the access method to full table scan */
@@ -3181,8 +3202,8 @@ bool subselect_single_select_engine::exec()
 bool subselect_union_engine::exec()
 {
   THD * const thd= unit->thd;
-  DBUG_ASSERT(thd == item->unit->thd);
-  DBUG_ASSERT(unit->is_optimized());
+  assert(thd == item->unit->thd);
+  assert(unit->is_optimized());
   char const *save_where= thd->where;
   const bool res= unit->execute(thd);
   thd->where= save_where;
@@ -3206,7 +3227,7 @@ bool subselect_indexsubquery_engine::scan_table()
   DBUG_ENTER("subselect_indexsubquery_engine::scan_table");
 
   // We never need to do a table scan of the materialized table.
-  DBUG_ASSERT(engine_type() != HASH_SJ_ENGINE);
+  assert(engine_type() != HASH_SJ_ENGINE);
 
   if ((table->file->inited &&
        (error= table->file->ha_index_end())) ||
@@ -3315,7 +3336,16 @@ void subselect_indexsubquery_engine::copy_ref_key(bool *require_scan,
         - neither can it be outer, because this case is
         separately managed in subselect_hash_sj_engine::exec().
       */
-      DBUG_ASSERT(engine_type() != HASH_SJ_ENGINE);
+      if (engine_type() == HASH_SJ_ENGINE)
+      {
+        // See Bug#86975 . In 8.0 there is no problem.
+        my_printf_error(ER_UNKNOWN_ERROR,
+                        "Error when materializing subquery; "
+                        "please use \"SET OPTIMIZER_SWITCH="
+                        "'MATERIALIZATION=OFF'\".", MYF(0));
+        *convert_error= true;
+        DBUG_VOID_RETURN;
+      }
 
       const bool *cond_guard= tab->ref().cond_guards[part_no];
 
@@ -3327,8 +3357,8 @@ void subselect_indexsubquery_engine::copy_ref_key(bool *require_scan,
       */
       if (cond_guard && !*cond_guard)
       {
-        DBUG_ASSERT(!(static_cast <Item_in_subselect*>(item)
-                      ->is_top_level_item()));
+        assert(!(static_cast <Item_in_subselect*>(item)
+                 ->is_top_level_item()));
 
         *require_scan= true;
         DBUG_VOID_RETURN;
@@ -3511,7 +3541,7 @@ bool subselect_indexsubquery_engine::exec()
               transformed with IN-to-EXISTS and thus their artificial HAVING
               rejects NULL values...
             */
-            DBUG_ASSERT(false);
+            assert(false);
             item_in->was_null= true;
           }
           break;
@@ -3557,7 +3587,7 @@ uint subselect_single_select_engine::cols() const
 
 uint subselect_union_engine::cols() const
 {
-  DBUG_ASSERT(unit->is_prepared());  // should be called after fix_fields()
+  assert(unit->is_prepared());  // should be called after fix_fields()
   return unit->types.elements;
 }
 
@@ -3588,7 +3618,7 @@ void subselect_union_engine::exclude()
 void subselect_indexsubquery_engine::exclude()
 {
   //this never should be called
-  DBUG_ASSERT(0);
+  assert(0);
 }
 
 
@@ -3757,7 +3787,7 @@ bool subselect_union_engine::change_query_result(Item_subselect *si,
 bool subselect_indexsubquery_engine::change_query_result(Item_subselect *si,
                                                    Query_result_subquery *res)
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return TRUE;
 }
 
@@ -3842,10 +3872,10 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
   /*
     Make sure there is only one index on the temp table.
   */
-  DBUG_ASSERT(tmp_columns->elements == tmp_table->s->fields ||
-              // Unique constraint is used and a hash field was added
-              (tmp_table->hash_field &&
-               tmp_columns->elements == (tmp_table->s->fields - 1)));
+  assert(tmp_columns->elements == tmp_table->s->fields ||
+         // Unique constraint is used and a hash field was added
+         (tmp_table->hash_field &&
+          tmp_columns->elements == (tmp_table->s->fields - 1)));
   /* 2. Create/initialize execution related objects. */
 
   /*
@@ -3889,7 +3919,7 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
     table for the subquery, so that all column references to the materialized
     subquery table can be resolved correctly.
   */
-  DBUG_ASSERT(cond == NULL);
+  assert(cond == NULL);
   if (!(cond= new Item_cond_and))
     DBUG_RETURN(TRUE);
   /*
@@ -3958,7 +3988,7 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
         !item_in->is_top_level_item())
     {
       // It must be the single column, or we wouldn't be here
-      DBUG_ASSERT(tmp_key_parts == 1);
+      assert(tmp_key_parts == 1);
       // Be ready to search for NULL into inner column:
       tab->ref().null_ref_key= cur_ref_buff;
       mat_table_has_nulls= NEX_UNKNOWN;
@@ -3995,7 +4025,7 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
 subselect_hash_sj_engine::~subselect_hash_sj_engine()
 {
   /* Assure that cleanup has been called for this engine. */
-  DBUG_ASSERT(!tab);
+  assert(!tab);
 
   delete result;
 }
@@ -4054,7 +4084,7 @@ bool subselect_hash_sj_engine::exec()
     THD * const thd= item->unit->thd;
     SELECT_LEX *save_select= thd->lex->current_select();
     thd->lex->set_current_select(materialize_engine->select_lex);
-    DBUG_ASSERT(materialize_engine->select_lex->master_unit()->is_optimized());
+    assert(materialize_engine->select_lex->master_unit()->is_optimized());
 
     JOIN *join= materialize_engine->select_lex->join;
 
@@ -4121,8 +4151,8 @@ bool subselect_hash_sj_engine::exec()
       is UNKNOWN. Do as if searching with all triggered conditions disabled:
       this would surely find a row. The caller will translate this to UNKNOWN.
     */
-    DBUG_ASSERT(item_in->left_expr->element_index(0)->maybe_null);
-    DBUG_ASSERT(item_in->left_expr->cols() == 1);
+    assert(item_in->left_expr->element_index(0)->maybe_null);
+    assert(item_in->left_expr->cols() == 1);
     item_in->value= true;
     DBUG_RETURN(false);
   }
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index d4d8cda42646..c1f2b22f8f36 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_SUBSELECT_INCLUDED
 #define ITEM_SUBSELECT_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -175,7 +182,7 @@ class Item_subselect :public Item_result_field
   bool inform_item_in_cond_of_tab(uchar *arg);
   virtual bool clean_up_after_removal(uchar *arg);
 
-  const char *func_name() const { DBUG_ASSERT(0); return "subselect"; }
+  const char *func_name() const { assert(0); return "subselect"; }
 
   friend class Query_result_interceptor;
   friend class Item_in_optimizer;
@@ -632,7 +639,7 @@ class subselect_engine: public Sql_alloc
   virtual bool change_query_result(Item_subselect *si,
                                    Query_result_subquery *result)= 0;
   virtual enum_engine_type engine_type() const { return ABSTRACT_ENGINE; }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      @returns the internal Item. Defined only in debug builds, because should
      be used only for debug asserts.
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index ae98c8b1c22f..15c5e2e63b3e 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,9 @@
   Sum functions (COUNT, MIN...)
 */
 
+#include "item_json_func.h"                // get_atom_null_as_null ..
+#include "json_dom.h"
+#include "sql_exception_handler.h"         // handle_std_exception
 #include "sql_select.h"
 #include "sql_tmp_table.h"                 // create_tmp_table
 #include "sql_resolver.h"                  // setup_order, fix_inner_refs
@@ -241,6 +251,8 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref)
   }
 
   aggr_sel->set_agg_func_used(true);
+  if (sum_func() == JSON_AGG_FUNC)
+    aggr_sel->set_json_agg_func_used(true);
   update_used_tables();
   thd->lex->in_sum_func= in_sum_func;
   return FALSE;
@@ -520,7 +532,7 @@ bool Item_sum::eq(const Item *item, bool binary_cmp) const
 
 bool Item_sum::aggregate_check_distinct(uchar *arg)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Distinct_check *dc= reinterpret_cast<Distinct_check *>(arg);
 
   if (dc->is_stopped(this))
@@ -548,7 +560,7 @@ bool Item_sum::aggregate_check_distinct(uchar *arg)
 
 bool Item_sum::aggregate_check_group(uchar *arg)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   Group_check *gc= reinterpret_cast<Group_check *>(arg);
 
   if (gc->is_stopped(this))
@@ -593,7 +605,7 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table)
   case ROW_RESULT:
   default:
     // This case should never be choosen
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   if (field)
@@ -761,7 +773,7 @@ calc_tmp_field_type(enum enum_field_types table_field_type,
     break;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return table_field_type;
 }
@@ -808,7 +820,7 @@ bool Aggregator_distinct::setup(THD *thd)
   endup_done= FALSE;
   /*
     Setup can be called twice for ROLLUP items. This is a bug.
-    Please add DBUG_ASSERT(tree == 0) here when it's fixed.
+    Please add assert(tree == 0) here when it's fixed.
   */
   if (tree || table || tmp_table_param)
     return FALSE;
@@ -835,7 +847,7 @@ bool Aggregator_distinct::setup(THD *thd)
      */
     uint const_items= 0;
     uint num_args= item_sum->get_arg_count();
-    DBUG_ASSERT(num_args);
+    assert(num_args);
     for (uint i=0; i < num_args; i++)
     {
       Item *item=item_sum->get_arg(i);
@@ -859,7 +871,7 @@ bool Aggregator_distinct::setup(THD *thd)
     }
     count_field_types(select_lex, tmp_table_param, list, false, false);
     tmp_table_param->force_copy_fields= item_sum->has_force_copy_fields();
-    DBUG_ASSERT(table == 0);
+    assert(table == 0);
     /*
       Make create_tmp_table() convert BIT columns to BIGINT.
       This is needed because BIT fields store parts of their data in table's
@@ -943,7 +955,7 @@ bool Aggregator_distinct::setup(THD *thd)
           }
         }
       }
-      DBUG_ASSERT(tree == 0);
+      assert(tree == 0);
       tree= new Unique(compare_key, cmp_arg, tree_key_length,
                        item_sum->ram_limitation(thd));
       /*
@@ -978,7 +990,7 @@ bool Aggregator_distinct::setup(THD *thd)
     item_sum->null_value= item_sum->maybe_null= 1;
     item_sum->quick_group= 0;
 
-    DBUG_ASSERT(item_sum->get_arg(0)->fixed);
+    assert(item_sum->get_arg(0)->fixed);
 
     arg= item_sum->get_arg(0);
     if (arg->const_item())
@@ -1084,7 +1096,7 @@ bool Aggregator_distinct::add()
 
     if (const_distinct == CONST_NOT_NULL)
     {
-      DBUG_ASSERT(item_sum->fixed == 1);
+      assert(item_sum->fixed == 1);
       Item_sum_count *sum= (Item_sum_count *)item_sum;
       sum->count= 1;
       return 0;
@@ -1121,7 +1133,7 @@ bool Aggregator_distinct::add()
     item_sum->get_arg(0)->save_in_field(table->field[0], false);
     if (table->field[0]->is_null())
       return 0;
-    DBUG_ASSERT(tree);
+    assert(tree);
     item_sum->null_value= 0;
     /*
       '0' values are also stored in the tree. This doesn't matter
@@ -1165,7 +1177,7 @@ void Aggregator_distinct::endup()
   if (item_sum->sum_func() == Item_sum::COUNT_FUNC || 
       item_sum->sum_func() == Item_sum::COUNT_DISTINCT_FUNC)
   {
-    DBUG_ASSERT(item_sum->fixed == 1);
+    assert(item_sum->fixed == 1);
     Item_sum_count *sum= (Item_sum_count *)item_sum;
 
     if (tree && tree->elements == 0)
@@ -1247,7 +1259,7 @@ my_decimal *Item_sum_int::val_decimal(my_decimal *decimal_value)
 bool
 Item_sum_num::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   if (init_sum_func_check(thd))
     return TRUE;
@@ -1280,7 +1292,7 @@ Item_sum_num::fix_fields(THD *thd, Item **ref)
 bool
 Item_sum_hybrid::fix_fields(THD *thd, Item **ref)
 {
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   Item *item= args[0];
 
@@ -1306,7 +1318,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref)
     break;
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   };
   setup_hybrid(args[0], NULL);
   /* MIN/MAX can return NULL for empty set indepedent of the used column */
@@ -1463,7 +1475,7 @@ void Item_sum_sum::fix_length_and_dec()
   case STRING_RESULT:
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   reject_geometry_args(arg_count, args, this);
@@ -1506,7 +1518,7 @@ bool Item_sum_sum::add()
 
 longlong Item_sum_sum::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (aggr)
     aggr->endup();
   if (hybrid_type == DECIMAL_RESULT)
@@ -1522,7 +1534,7 @@ longlong Item_sum_sum::val_int()
 
 double Item_sum_sum::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (aggr)
     aggr->endup();
   if (hybrid_type == DECIMAL_RESULT)
@@ -1652,7 +1664,7 @@ bool Aggregator_distinct::arg_is_null(bool use_null_value)
   if (use_distinct_values)
   {
     const bool rc= table->field[0]->is_null();
-    DBUG_ASSERT(!rc); // NULLs are never stored in 'tree'
+    assert(!rc); // NULLs are never stored in 'tree'
     return rc;
   }
   return use_null_value ?
@@ -1683,7 +1695,7 @@ bool Item_sum_count::add()
 
 longlong Item_sum_count::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (aggr)
     aggr->endup();
   return count;
@@ -1773,7 +1785,7 @@ bool Item_sum_avg::add()
 
 double Item_sum_avg::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (aggr)
     aggr->endup();
   if (!count)
@@ -1789,7 +1801,7 @@ my_decimal *Item_sum_avg::val_decimal(my_decimal *val)
 {
   my_decimal sum_buff, cnt;
   const my_decimal *sum_dec;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (aggr)
     aggr->endup();
   if (!count)
@@ -1828,9 +1840,9 @@ String *Item_sum_avg::val_str(String *str)
 
 double Item_sum_std::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   double nr= Item_sum_variance::val_real();
-  DBUG_ASSERT(nr >= 0.0);
+  assert(nr >= 0.0);
   return sqrt(nr);
 }
 
@@ -1972,7 +1984,7 @@ bool Item_sum_variance::add()
 
 double Item_sum_variance::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   /*
     'sample' is a 1/0 boolean value.  If it is 1/true, id est this is a sample
@@ -1983,7 +1995,7 @@ double Item_sum_variance::val_real()
     Another way to read it is that 'sample' is the numerical threshhold, at and
     below which a 'count' number of items is called NULL.
   */
-  DBUG_ASSERT((sample == 0) || (sample == 1));
+  assert((sample == 0) || (sample == 1));
   if (count <= sample)
   {
     null_value=1;
@@ -1997,7 +2009,7 @@ double Item_sum_variance::val_real()
 
 my_decimal *Item_sum_variance::val_decimal(my_decimal *dec_buf)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return val_decimal_from_real(dec_buf);
 }
 
@@ -2060,66 +2072,66 @@ void Item_sum_hybrid::clear()
 
 double Item_sum_hybrid::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0.0;
   double retval= value->val_real();
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == 0.0);
+    assert(retval == 0.0);
   return retval;
 }
 
 longlong Item_sum_hybrid::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
   longlong retval= value->val_int();
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == 0);
+    assert(retval == 0);
   return retval;
 }
 
 
 longlong Item_sum_hybrid::val_time_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
   longlong retval= value->val_time_temporal();
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == 0);
+    assert(retval == 0);
   return retval;
 }
 
 
 longlong Item_sum_hybrid::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
   longlong retval= value->val_date_temporal();
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == 0);
+    assert(retval == 0);
   return retval;
 }
 
 
 my_decimal *Item_sum_hybrid::val_decimal(my_decimal *val)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
   my_decimal *retval= value->val_decimal(val);
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == NULL || my_decimal_is_zero(retval));
+    assert(retval == NULL || my_decimal_is_zero(retval));
   return retval;
 }
 
 
 bool Item_sum_hybrid::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return true;
   return (null_value= value->get_date(ltime, fuzzydate));
@@ -2128,7 +2140,7 @@ bool Item_sum_hybrid::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
 
 bool Item_sum_hybrid::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return true;
   return (null_value= value->get_time(ltime));
@@ -2138,19 +2150,19 @@ bool Item_sum_hybrid::get_time(MYSQL_TIME *ltime)
 String *
 Item_sum_hybrid::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
   String *retval= value->val_str(str);
   if ((null_value= value->null_value))
-    DBUG_ASSERT(retval == NULL);
+    assert(retval == NULL);
   return retval;
 }
 
 
 bool Item_sum_hybrid::val_json(Json_wrapper *wr)
 {
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   if (null_value)
     return false;
   bool ok= value->val_json(wr);
@@ -2235,7 +2247,7 @@ bool Item_sum_max::add()
 
 longlong Item_sum_bit::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   return (longlong) bits;
 }
 
@@ -2404,14 +2416,14 @@ void Item_sum_hybrid::reset_field()
   }
   case ROW_RESULT:
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 }
 
 
 void Item_sum_sum::reset_field()
 {
-  DBUG_ASSERT (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
+  assert (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
   if (hybrid_type == DECIMAL_RESULT)
   {
     my_decimal value, *arg_val= args[0]->val_decimal(&value);
@@ -2421,7 +2433,7 @@ void Item_sum_sum::reset_field()
   }
   else
   {
-    DBUG_ASSERT(hybrid_type == REAL_RESULT);
+    assert(hybrid_type == REAL_RESULT);
     double nr= args[0]->val_real();			// Nulls also return 0
     float8store(result_field->ptr, nr);
   }
@@ -2436,7 +2448,7 @@ void Item_sum_count::reset_field()
 {
   uchar *res=result_field->ptr;
   longlong nr=0;
-  DBUG_ASSERT (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
+  assert (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
 
   if (!args[0]->maybe_null || !args[0]->is_null())
     nr=1;
@@ -2447,7 +2459,7 @@ void Item_sum_count::reset_field()
 void Item_sum_avg::reset_field()
 {
   uchar *res=result_field->ptr;
-  DBUG_ASSERT (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
+  assert (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
   if (hybrid_type == DECIMAL_RESULT)
   {
     longlong tmp;
@@ -2501,7 +2513,7 @@ void Item_sum_bit::update_field()
 
 void Item_sum_sum::update_field()
 {
-  DBUG_ASSERT (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
+  assert (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
   if (hybrid_type == DECIMAL_RESULT)
   {
     my_decimal value, *arg_val= args[0]->val_decimal(&value);
@@ -2555,7 +2567,7 @@ void Item_sum_avg::update_field()
   longlong field_count;
   uchar *res=result_field->ptr;
 
-  DBUG_ASSERT (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
+  assert (aggr->Aggrtype() != Aggregator::DISTINCT_AGGREGATOR);
 
   if (hybrid_type == DECIMAL_RESULT)
   {
@@ -2640,7 +2652,7 @@ void Item_sum_hybrid::min_max_update_temporal_field()
 
 void Item_sum_hybrid::min_max_update_str_field()
 {
-  DBUG_ASSERT(cmp);
+  assert(cmp);
   String *res_str=args[0]->val_str(&cmp->value1);
 
   if (!args[0]->null_value)
@@ -2808,7 +2820,7 @@ double Item_std_field::val_real()
   double nr;
   // fix_fields() never calls for this Item
   nr= Item_variance_field::val_real();
-  DBUG_ASSERT(nr >= 0.0);
+  assert(nr >= 0.0);
   return sqrt(nr);
 }
 
@@ -2828,7 +2840,7 @@ my_decimal *Item_std_field::val_decimal(my_decimal *dec_buf)
   if (!dec)
     return 0;
   my_decimal2double(E_DEC_FATAL_ERROR, dec, &nr);
-  DBUG_ASSERT(nr >= 0.0);
+  assert(nr >= 0.0);
   nr= sqrt(nr);
   double2my_decimal(E_DEC_FATAL_ERROR, nr, &tmp_dec);
   my_decimal_round(E_DEC_FATAL_ERROR, &tmp_dec, decimals, FALSE, dec_buf);
@@ -2943,7 +2955,7 @@ Item *Item_sum_udf_float::copy_or_same(THD* thd)
 
 double Item_sum_udf_float::val_real()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_sum_udf_float::val");
   DBUG_PRINT("info",("result_type: %d  arg_count: %d",
 		     args[0]->result_type(), arg_count));
@@ -2983,7 +2995,7 @@ longlong Item_sum_udf_decimal::val_int()
 
 my_decimal *Item_sum_udf_decimal::val_decimal(my_decimal *dec_buf)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_func_udf_decimal::val_decimal");
   DBUG_PRINT("info",("result_type: %d  arg_count: %d",
                      args[0]->result_type(), arg_count));
@@ -3005,7 +3017,7 @@ Item *Item_sum_udf_int::copy_or_same(THD* thd)
 
 longlong Item_sum_udf_int::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_sum_udf_int::val_int");
   DBUG_PRINT("info",("result_type: %d  arg_count: %d",
 		     args[0]->result_type(), arg_count));
@@ -3049,7 +3061,7 @@ my_decimal *Item_sum_udf_str::val_decimal(my_decimal *dec)
 
 String *Item_sum_udf_str::val_str(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   DBUG_ENTER("Item_sum_udf_str::str");
   String *res=udf.val_str(str,&str_value);
   null_value = !res;
@@ -3216,7 +3228,7 @@ int dump_leaf_key(void* key_arg, element_count count MY_ATTRIBUTE((unused)),
       {
         uint offset= (field->offset(field->table->record[0]) -
                       table->s->null_bytes);
-        DBUG_ASSERT(offset < table->s->reclength);
+        assert(offset < table->s->reclength);
         res= field->val_str(&tmp, key + offset);
       }
       else
@@ -3412,7 +3424,7 @@ void Item_func_group_concat::cleanup()
         unique_filter= NULL;
       }
     }
-    DBUG_ASSERT(tree == 0);
+    assert(tree == 0);
   }
   /*
    As the ORDER structures pointed to by the elements of the
@@ -3433,7 +3445,7 @@ void Item_func_group_concat::cleanup()
 Field *Item_func_group_concat::make_string_field(TABLE *table_arg)
 {
   Field *field;
-  DBUG_ASSERT(collation.collation);
+  assert(collation.collation);
   /*
     max_characters is maximum number of characters
     what can fit into max_length size. It's necessary
@@ -3539,7 +3551,7 @@ bool
 Item_func_group_concat::fix_fields(THD *thd, Item **ref)
 {
   uint i;                       /* for loop variable */
-  DBUG_ASSERT(fixed == 0);
+  assert(fixed == 0);
 
   if (init_sum_func_check(thd))
     return TRUE;
@@ -3648,7 +3660,7 @@ bool Item_func_group_concat::setup(THD *thd)
 
   count_field_types(select_lex, tmp_table_param, all_fields, false, true);
   tmp_table_param->force_copy_fields= force_copy_fields;
-  DBUG_ASSERT(table == 0);
+  assert(table == 0);
   if (order_or_distinct)
   {
     /*
@@ -3735,7 +3747,7 @@ void Item_func_group_concat::make_unique()
 
 String* Item_func_group_concat::val_str(String* str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (null_value)
     return 0;
 
@@ -3746,7 +3758,7 @@ String* Item_func_group_concat::val_str(String* str)
     else if (distinct) // distinct (and no order by).
       unique_filter->walk(&dump_leaf_key, this);
     else
-      DBUG_ASSERT(false); // Can't happen
+      assert(false); // Can't happen
   }
 
   if (table && table->blob_storage && 
@@ -3815,3 +3827,297 @@ Item_func_group_concat::~Item_func_group_concat()
   if (!original && unique_filter)
     delete unique_filter;    
 }
+
+
+bool Item_sum_json::fix_fields(THD *thd, Item **ref)
+{
+  assert(!fixed);
+  result_field= NULL;
+
+  if (init_sum_func_check(thd))
+    return true;
+
+  Disable_semijoin_flattening DSF(thd->lex->current_select(), true);
+
+  for (uint i= 0; i < arg_count; i++)
+  {
+    if ((!args[i]->fixed && args[i]->fix_fields(thd, args + i)) ||
+        args[i]->check_cols(1))
+      return true;
+  }
+  fix_length_and_dec();
+
+  if (check_sum_func(thd, ref))
+    return true;
+
+  max_length= MAX_BLOB_WIDTH;
+  maybe_null= true;
+  null_value= true;
+  fixed= true;
+  return false;
+}
+
+String *Item_sum_json::val_str(String *str)
+{
+  assert(fixed == 1);
+  if (null_value || m_wrapper.empty())
+    return NULL;
+  str->length(0);
+  if (m_wrapper.to_string(str, true, func_name()))
+    return error_str();
+
+  return str;
+}
+
+
+bool Item_sum_json::val_json(Json_wrapper *wr)
+{
+  if (null_value || m_wrapper.empty())
+    return true;
+
+  /*
+    val_* functions are called more than once in aggregates and
+    by passing the dom some function will destroy it so a clone is needed.
+  */
+  Json_dom *dom= m_wrapper.clone_dom();
+  Json_wrapper tmp(dom);
+  wr->steal(&tmp);
+
+  return false;
+}
+
+
+double Item_sum_json::val_real()
+{
+  if (null_value || m_wrapper.empty())
+    return 0.0;
+
+  return m_wrapper.coerce_real(func_name());
+}
+
+
+longlong Item_sum_json::val_int()
+{
+  if (null_value || m_wrapper.empty())
+    return 0;
+
+  return m_wrapper.coerce_int(func_name());
+}
+
+
+my_decimal *Item_sum_json::val_decimal(my_decimal *decimal_value)
+{
+  if (null_value || m_wrapper.empty())
+  {
+    my_decimal_set_zero(decimal_value);
+    return decimal_value;
+  }
+
+  return m_wrapper.coerce_decimal(decimal_value, func_name());
+}
+
+
+bool Item_sum_json::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
+{
+  if (null_value || m_wrapper.empty())
+    return true;
+
+  return m_wrapper.coerce_date(ltime, fuzzydate, func_name());
+}
+
+
+bool Item_sum_json::get_time(MYSQL_TIME *ltime)
+{
+  if (null_value || m_wrapper.empty())
+    return true;
+
+  return m_wrapper.coerce_time(ltime, func_name());
+}
+
+
+void Item_sum_json::reset_field()
+{
+  /* purecov: begin inspected */
+  assert(0); // Check JOIN::with_json_agg for more details.
+  // Create the container
+  clear();
+  // Append element to the container.
+  add();
+
+  /*
+    field_type is MYSQL_TYPE_JSON so Item::make_string_field will always
+    create a Field_json(in Item_sum::create_tmp_field).
+    The cast is need since Field does not expose store_json function.
+  */
+  Field_json *json_result_field= down_cast<Field_json *>(result_field);
+  json_result_field->set_notnull();
+  // Store the container inside the field.
+  json_result_field->store_json(&m_wrapper);
+  /* purecov: end */
+}
+
+
+void Item_sum_json::update_field()
+{
+  /* purecov: begin inspected */
+  assert(0); // Check JOIN::with_json_agg for more details.
+  /*
+    field_type is MYSQL_TYPE_JSON so Item::make_string_field will always
+    create a Field_json(in Item_sum::create_tmp_field).
+    The cast is need since Field does not expose store_json function.
+  */
+  Field_json *json_result_field= down_cast<Field_json *>(result_field);
+  // Restore the container(m_wrapper) from the field
+  json_result_field->val_json(&m_wrapper);
+
+  // Append elements to the container.
+  add();
+  // Store the container inside the field.
+  json_result_field->store_json(&m_wrapper);
+  json_result_field->set_notnull();
+  /* purecov: end */
+}
+
+
+void Item_sum_json_array::clear()
+{
+  null_value= true;
+  m_json_array.clear();
+
+  Json_wrapper tmp(&m_json_array);
+  // Set the array to the m_wrapper.
+  m_wrapper.steal(&tmp);
+  // But let Item_sum_json_array keep the ownership.
+  m_wrapper.set_alias();
+}
+
+
+void Item_sum_json_object::clear()
+{
+  null_value= true;
+  m_json_object.clear();
+
+  Json_wrapper tmp(&m_json_object);
+  // Set the object to the m_wrapper.
+  m_wrapper.steal(&tmp);
+  // But let Item_sum_json_object keep the ownership.
+  m_wrapper.set_alias();
+}
+
+
+bool Item_sum_json_array::add()
+{
+  assert(fixed == 1);
+  assert(arg_count == 1);
+
+  const THD *thd= current_thd;
+  /*
+     Checking if an error happened inside one of the functions that have no
+     way of returning an error status. (reset_field(), update_field() or
+     clear())
+   */
+  if (thd->is_error())
+    return error_json();
+
+  try
+  {
+    Json_wrapper value_wrapper;
+    // Get the value.
+    if (get_atom_null_as_null(args, 0, func_name(), &m_value,
+                              &m_conversion_buffer,
+                              &value_wrapper))
+      return error_json();
+
+    /*
+      The m_wrapper always points to m_json_array or the result of
+      deserializing the result_field in reset/update_field.
+    */
+    Json_array *arr= down_cast<Json_array *>(m_wrapper.to_dom());
+    if (arr->append_alias(value_wrapper.to_dom()))
+      return error_json();              /* purecov: inspected */
+
+    null_value= false;
+    value_wrapper.set_alias(); // release the DOM
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
+
+  return false;
+}
+
+
+Item *Item_sum_json_array::copy_or_same(THD *thd)
+{
+  return new (thd->mem_root) Item_sum_json_array(thd, this);
+}
+
+
+bool Item_sum_json_object::add()
+{
+  assert(fixed == 1);
+  assert(arg_count == 2);
+
+  const THD *thd= current_thd;
+  /*
+     Checking if an error happened inside one of the functions that have no
+     way of returning an error status. (reset_field(), update_field() or
+     clear())
+   */
+  if (thd->is_error())
+    return error_json();
+
+  try
+  {
+    // key
+    Item *key_item= args[0];
+    const char *safep;         // contents of key_item, possibly converted
+    size_t safe_length;        // length of safep
+
+    if (get_json_string(key_item, &m_tmp_key_value, &m_conversion_buffer,
+                        func_name(), &safep, &safe_length))
+    {
+      my_error(ER_JSON_DOCUMENT_NULL_KEY, MYF(0));
+      return error_json();
+    }
+
+    std::string key(safep, safe_length);
+
+    // value
+    Json_wrapper value_wrapper;
+    if (get_atom_null_as_null(args, 1, func_name(), &m_value,
+                              &m_conversion_buffer, &value_wrapper))
+      return error_json();
+
+    /*
+      The m_wrapper always points to m_json_object or the result of
+      deserializing the result_field in reset/update_field.
+    */
+    Json_object *object= down_cast<Json_object *>(m_wrapper.to_dom());
+    if (object->add_alias(key, value_wrapper.to_dom()))
+      return error_json();              /* purecov: inspected */
+
+    null_value= false;
+    // object will take ownership of the value
+    value_wrapper.set_alias();
+  }
+  catch (...)
+  {
+    /* purecov: begin inspected */
+    handle_std_exception(func_name());
+    return error_json();
+    /* purecov: end */
+  }
+
+  return false;
+}
+
+
+Item *Item_sum_json_object::copy_or_same(THD *thd)
+{
+  return new (thd->mem_root) Item_sum_json_object(thd, this);
+}
diff --git a/sql/item_sum.h b/sql/item_sum.h
index b2d266748b61..18ed3a22e3d1 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_SUM_INCLUDED
 #define ITEM_SUM_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,7 @@
 
 #include "my_tree.h"        // TREE
 #include "item.h"           // Item_result_field
+#include "json_dom.h"       // Json_wrapper
 #include "sql_alloc.h"      // Sql_alloc
 #include "sql_udf.h"        // udf_handler
 #include "mem_root_array.h"
@@ -342,9 +350,21 @@ class Item_sum :public Item_result_field
   bool has_with_distinct()     const { return with_distinct; }
 
   enum Sumfunctype
-  { COUNT_FUNC, COUNT_DISTINCT_FUNC, SUM_FUNC, SUM_DISTINCT_FUNC, AVG_FUNC,
-    AVG_DISTINCT_FUNC, MIN_FUNC, MAX_FUNC, STD_FUNC,
-    VARIANCE_FUNC, SUM_BIT_FUNC, UDF_SUM_FUNC, GROUP_CONCAT_FUNC
+  {
+    COUNT_FUNC,          // COUNT
+    COUNT_DISTINCT_FUNC, // COUNT (DISTINCT)
+    SUM_FUNC,            // SUM
+    SUM_DISTINCT_FUNC,   // SUM (DISTINCT)
+    AVG_FUNC,            // AVG
+    AVG_DISTINCT_FUNC,   // AVG (DISTINCT)
+    MIN_FUNC,            // MIN
+    MAX_FUNC,            // MAX
+    STD_FUNC,            // STD/STDDEV/STDDEV_POP
+    VARIANCE_FUNC,       // VARIANCE/VAR_POP and VAR_SAMP
+    SUM_BIT_FUNC,        // BIT_AND, BIT_OR and BIT_XOR
+    UDF_SUM_FUNC,        // user defined functions
+    GROUP_CONCAT_FUNC,   // GROUP_CONCAT
+    JSON_AGG_FUNC,       // JSON_ARRAYAGG and JSON_OBJECTAGG
   };
 
   Item **ref_by; /* pointer to a ref to the object used to register it */
@@ -391,6 +411,15 @@ class Item_sum :public Item_result_field
     init_aggregator();
   }
 
+  Item_sum(const POS &pos, Item *a, Item *b)
+    :super(pos), next(NULL), quick_group(true), arg_count(2), args(tmp_args),
+     forced_const(false)
+  {
+    args[0]= a;
+    args[1]= b;
+    init_aggregator();
+  }
+
   Item_sum(const POS &pos, PT_item_list *opt_list);
 
   //Copy constructor, need to perform subselects with temporary tables
@@ -689,7 +718,7 @@ class Item_sum_num :public Item_sum
   bool fix_fields(THD *, Item **);
   longlong val_int()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return (longlong) rint(val_real());             /* Real as default */
   }
   String *val_str(String*str);
@@ -713,7 +742,7 @@ class Item_sum_int :public Item_sum_num
 
   Item_sum_int(const POS &pos, PT_item_list *list) :Item_sum_num(pos, list) {}
   Item_sum_int(THD *thd, Item_sum_int *item) :Item_sum_num(thd, item) {}
-  double val_real() { DBUG_ASSERT(fixed == 1); return (double) val_int(); }
+  double val_real() { assert(fixed == 1); return (double) val_int(); }
   String *val_str(String*str);
   my_decimal *val_decimal(my_decimal *);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
@@ -878,7 +907,83 @@ class Item_avg_field :public Item_sum_num_field
   my_decimal *val_decimal(my_decimal *);
   String *val_str(String*);
   void fix_length_and_dec() {}
-  const char *func_name() const { DBUG_ASSERT(0); return "avg_field"; }
+  const char *func_name() const { assert(0); return "avg_field"; }
+};
+
+
+/// Common abstraction for Item_sum_json_array and Item_sum_json_object
+class Item_sum_json : public Item_sum
+{
+protected:
+  /// String used when reading JSON binary values or JSON text values.
+  String m_value;
+  /// String used for converting JSON text values to utf8mb4 charset.
+  String m_conversion_buffer;
+  /// Wrapper around the container (object/array) which accumulates the value.
+  Json_wrapper m_wrapper;
+
+public:
+  Item_sum_json(THD *thd, Item_sum *item)
+    : Item_sum(thd, item)
+  {}
+  Item_sum_json(const POS &pos, Item *a)
+    : Item_sum(pos, a)
+  {}
+  Item_sum_json(const POS &pos, Item *a, Item *b)
+    : Item_sum(pos, a, b)
+  {}
+
+  virtual bool fix_fields(THD *thd, Item **pItem);
+  enum_field_types field_type() const { return MYSQL_TYPE_JSON; }
+  virtual enum Sumfunctype sum_func() const { return JSON_AGG_FUNC; }
+  virtual Item_result result_type() const { return STRING_RESULT; }
+
+  virtual double val_real();
+  virtual longlong val_int();
+  virtual String *val_str(String *str);
+  virtual bool val_json(Json_wrapper *wr);
+  virtual my_decimal *val_decimal(my_decimal *decimal_buffer);
+  virtual bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate);
+  virtual bool get_time(MYSQL_TIME *ltime);
+
+  virtual void reset_field();
+  virtual void update_field();
+};
+
+
+/// Implements aggregation of values into an array.
+class Item_sum_json_array : public Item_sum_json
+{
+  /// Accumulates the final value.
+  Json_array m_json_array;
+public:
+  Item_sum_json_array(THD *thd, Item_sum *item)
+    : Item_sum_json(thd, item) { }
+  Item_sum_json_array(const POS &pos, Item *a)
+    : Item_sum_json(pos, a) { }
+  virtual const char *func_name() const { return "json_arrayagg("; }
+  virtual void clear();
+  virtual bool add();
+  virtual Item *copy_or_same(THD* thd);
+};
+
+
+/// Implements aggregation of values into an object.
+class Item_sum_json_object : public Item_sum_json
+{
+  /// Accumulates the final value.
+  Json_object m_json_object;
+  /// Buffer used to get the value of the key.
+  String m_tmp_key_value;
+public:
+  Item_sum_json_object(THD *thd, Item_sum *item)
+    : Item_sum_json(thd, item) { }
+  Item_sum_json_object(const POS &pos, Item *a, Item *b)
+    : Item_sum_json(pos, a, b) { }
+  virtual const char *func_name() const { return "json_objectagg("; }
+  virtual void clear();
+  virtual bool add();
+  virtual Item *copy_or_same(THD* thd);
 };
 
 
@@ -946,7 +1051,7 @@ class Item_variance_field :public Item_sum_num_field
   my_decimal *val_decimal(my_decimal *dec_buf)
   { return val_decimal_from_real(dec_buf); }
   void fix_length_and_dec() {}
-  const char *func_name() const { DBUG_ASSERT(0); return "variance_field"; }
+  const char *func_name() const { assert(0); return "variance_field"; }
 };
 
 
@@ -1024,7 +1129,7 @@ class Item_std_field :public Item_variance_field
   my_decimal *val_decimal(my_decimal *);
   enum Item_result result_type () const { return REAL_RESULT; }
   enum_field_types field_type() const { return MYSQL_TYPE_DOUBLE;}
-  const char *func_name() const { DBUG_ASSERT(0); return "std_field"; }
+  const char *func_name() const { assert(0); return "std_field"; }
 };
 
 /*
@@ -1238,7 +1343,7 @@ class Item_udf_sum : public Item_sum
   const char *func_name() const { return udf.name(); }
   bool fix_fields(THD *thd, Item **ref)
   {
-    DBUG_ASSERT(fixed == 0);
+    assert(fixed == 0);
 
     if (init_sum_func_check(thd))
       return TRUE;
@@ -1274,7 +1379,7 @@ class Item_sum_udf_float :public Item_udf_sum
     :Item_udf_sum(thd, item) {}
   longlong val_int()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return (longlong) rint(Item_sum_udf_float::val_real());
   }
   double val_real();
@@ -1303,7 +1408,7 @@ class Item_sum_udf_int :public Item_udf_sum
     :Item_udf_sum(thd, item) {}
   longlong val_int();
   double val_real()
-    { DBUG_ASSERT(fixed == 1); return (double) Item_sum_udf_int::val_int(); }
+  { assert(fixed == 1); return (double) Item_sum_udf_int::val_int(); }
   String *val_str(String*str);
   my_decimal *val_decimal(my_decimal *);
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzydate)
@@ -1476,8 +1581,8 @@ class Item_func_group_concat : public Item_sum
   }
   void clear();
   bool add();
-  void reset_field() { DBUG_ASSERT(0); }        // not used
-  void update_field() { DBUG_ASSERT(0); }       // not used
+  void reset_field() { assert(0); }        // not used
+  void update_field() { assert(0); }       // not used
   bool fix_fields(THD *,Item **);
   bool setup(THD *thd);
   void make_unique();
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index b46b25595a70..1cbf0136b640 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -141,6 +148,8 @@ static Date_time_format time_24hrs_format= {{0}, '\0', 0,
                             %r) and this parameter is pointer to place where
                             pointer to end of string matching this specifier
                             should be stored.
+  @param data_type  Type of data
+  @param flags      flags used by check_date()
 
   @note
     Possibility to parse strings matching to patterns equivalent to compound
@@ -163,7 +172,9 @@ static bool extract_date_time(Date_time_format *format,
                               const char *val, size_t length, MYSQL_TIME *l_time,
                               timestamp_type cached_timestamp_type,
                               const char **sub_pattern_end,
-                              const char *date_time_type)
+                              const char *date_time_type,
+                              enum_field_types data_type,
+                              my_time_flags_t flags)
 {
   int weekday= 0, yearday= 0, daypart= 0;
   int week_number= -1;
@@ -357,7 +368,8 @@ static bool extract_date_time(Date_time_format *format,
         */
         if (extract_date_time(&time_ampm_format, val,
                               (uint)(val_end - val), l_time,
-                              cached_timestamp_type, &val, "time"))
+                              cached_timestamp_type, &val, "time",
+                              data_type, flags))
           DBUG_RETURN(1);
         break;
 
@@ -365,7 +377,8 @@ static bool extract_date_time(Date_time_format *format,
       case 'T':
         if (extract_date_time(&time_24hrs_format, val,
                               (uint)(val_end - val), l_time,
-                              cached_timestamp_type, &val, "time"))
+                              cached_timestamp_type, &val, "time",
+                              data_type, flags))
           DBUG_RETURN(1);
         break;
 
@@ -467,8 +480,12 @@ static bool extract_date_time(Date_time_format *format,
     get_date_from_daynr(days,&l_time->year,&l_time->month,&l_time->day);
   }
 
-  if (l_time->month > 12 || l_time->day > 31 || l_time->hour > 23 || 
-      l_time->minute > 59 || l_time->second > 59)
+  assert(l_time->year <= 9999);
+  if (data_type == MYSQL_TYPE_TIME) flags &= ~TIME_NO_ZERO_DATE;
+  int warnings;
+  if (l_time->month > 12 || l_time->hour > 23 || l_time->minute > 59 ||
+      l_time->second > 59 ||
+      check_date(l_time, non_zero_date(l_time), flags, &warnings))
     goto err;
 
   if (val != val_end)
@@ -867,7 +884,7 @@ Item_temporal_hybrid_func::save_in_field_inner(Field *field,
 
 my_decimal *Item_temporal_hybrid_func::val_decimal(my_decimal *decimal_value)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (cached_field_type == MYSQL_TYPE_TIME)
     return val_decimal_from_time(decimal_value);
   else if (cached_field_type == MYSQL_TYPE_DATETIME)
@@ -898,7 +915,7 @@ bool Item_temporal_hybrid_func::get_date(MYSQL_TIME *ltime,
   MYSQL_TIME tm;
   if (val_datetime(&tm, fuzzy_date))
   {
-    DBUG_ASSERT(null_value == true);
+    assert(null_value == true);
     return true;
   }
   if (cached_field_type == MYSQL_TYPE_TIME ||
@@ -914,7 +931,7 @@ bool Item_temporal_hybrid_func::get_time(MYSQL_TIME *ltime)
 {
   if (val_datetime(ltime, TIME_FUZZY_DATE))
   {
-    DBUG_ASSERT(null_value == true);
+    assert(null_value == true);
     return true;
   }
   if (cached_field_type == MYSQL_TYPE_TIME &&
@@ -926,7 +943,7 @@ bool Item_temporal_hybrid_func::get_time(MYSQL_TIME *ltime)
 
 String *Item_temporal_hybrid_func::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
 
   if (val_datetime(&ltime, TIME_FUZZY_DATE) ||
@@ -938,21 +955,21 @@ String *Item_temporal_hybrid_func::val_str_ascii(String *str)
     return (String *) 0;
 
   /* Check that the returned timestamp type matches to the function type */
-  DBUG_ASSERT((cached_field_type == MYSQL_TYPE_TIME &&
-               ltime.time_type == MYSQL_TIMESTAMP_TIME) ||
-              (cached_field_type == MYSQL_TYPE_DATE &&
-               ltime.time_type == MYSQL_TIMESTAMP_DATE) ||
-              (cached_field_type == MYSQL_TYPE_DATETIME &&
-               ltime.time_type == MYSQL_TIMESTAMP_DATETIME) ||
-               cached_field_type == MYSQL_TYPE_STRING ||
-               ltime.time_type == MYSQL_TIMESTAMP_NONE);
+  assert((cached_field_type == MYSQL_TYPE_TIME &&
+          ltime.time_type == MYSQL_TIMESTAMP_TIME) ||
+         (cached_field_type == MYSQL_TYPE_DATE &&
+          ltime.time_type == MYSQL_TIMESTAMP_DATE) ||
+         (cached_field_type == MYSQL_TYPE_DATETIME &&
+          ltime.time_type == MYSQL_TIMESTAMP_DATETIME) ||
+         cached_field_type == MYSQL_TYPE_STRING ||
+         ltime.time_type == MYSQL_TIMESTAMP_NONE);
   return str;
 }
 
 
 longlong Item_time_func::val_time_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_time(&ltime) ? 0LL : TIME_to_longlong_time_packed(&ltime);
 }
@@ -960,7 +977,7 @@ longlong Item_time_func::val_time_temporal()
 
 longlong Item_date_func::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_date(&ltime, TIME_FUZZY_DATE) ?
          0LL : TIME_to_longlong_date_packed(&ltime);
@@ -969,7 +986,7 @@ longlong Item_date_func::val_date_temporal()
 
 longlong Item_datetime_func::val_date_temporal()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_date(&ltime, TIME_FUZZY_DATE) ?
          0LL : TIME_to_longlong_datetime_packed(&ltime);
@@ -1029,7 +1046,7 @@ void Item_time_literal::print(String *str, enum_query_type query_type)
 
 longlong Item_func_period_add::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulong period=(ulong) args[0]->val_int();
   int months=(int) args[1]->val_int();
 
@@ -1044,7 +1061,7 @@ longlong Item_func_period_add::val_int()
 
 longlong Item_func_period_diff::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   ulong period1=(ulong) args[0]->val_int();
   ulong period2=(ulong) args[1]->val_int();
 
@@ -1058,7 +1075,7 @@ longlong Item_func_period_diff::val_int()
 
 longlong Item_func_to_days::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
     return 0;
@@ -1069,7 +1086,7 @@ longlong Item_func_to_days::val_int()
 longlong Item_func_to_seconds::val_int_endpoint(bool left_endp,
                                                 bool *incl_endp)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   longlong seconds;
   longlong days;
@@ -1095,7 +1112,7 @@ longlong Item_func_to_seconds::val_int_endpoint(bool left_endp,
 
 longlong Item_func_to_seconds::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   longlong seconds;
   longlong days;
@@ -1147,7 +1164,7 @@ enum_monotonicity_info Item_func_to_seconds::get_monotonicity_info() const
 
 longlong Item_func_to_days::val_int_endpoint(bool left_endp, bool *incl_endp)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   longlong res;
   int dummy;                                /* unused */
@@ -1203,7 +1220,7 @@ longlong Item_func_to_days::val_int_endpoint(bool left_endp, bool *incl_endp)
 
 longlong Item_func_dayofyear::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
     return 0;
@@ -1213,14 +1230,14 @@ longlong Item_func_dayofyear::val_int()
 
 longlong Item_func_dayofmonth::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.day;
 }
 
 longlong Item_func_month::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.month;
 }
@@ -1241,7 +1258,7 @@ void Item_func_monthname::fix_length_and_dec()
 
 String* Item_func_monthname::val_str(String* str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   const char *month_name;
   uint err;
   MYSQL_TIME ltime;
@@ -1262,7 +1279,7 @@ String* Item_func_monthname::val_str(String* str)
 
 longlong Item_func_quarter::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_FUZZY_DATE))
     return 0;
@@ -1271,14 +1288,14 @@ longlong Item_func_quarter::val_int()
 
 longlong Item_func_hour::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_time(&ltime) ? 0 : ltime.hour;
 }
 
 longlong Item_func_minute::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_time(&ltime) ? 0 : ltime.minute;
 }
@@ -1288,7 +1305,7 @@ longlong Item_func_minute::val_int()
 */
 longlong Item_func_second::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_time(&ltime) ? 0 : ltime.second;
 }
@@ -1352,7 +1369,7 @@ bool Item_func_week::itemize(Parse_context *pc, Item **res)
 
 longlong Item_func_week::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint year;
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
@@ -1365,7 +1382,7 @@ longlong Item_func_week::val_int()
 
 longlong Item_func_yearweek::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint year,week;
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
@@ -1379,7 +1396,7 @@ longlong Item_func_yearweek::val_int()
 
 longlong Item_func_weekday::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   
   if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE))
@@ -1405,7 +1422,7 @@ void Item_func_dayname::fix_length_and_dec()
 
 String* Item_func_dayname::val_str(String* str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   uint weekday=(uint) val_int();		// Always Item_func_daynr()
   const char *day_name;
   uint err;
@@ -1422,7 +1439,7 @@ String* Item_func_dayname::val_str(String* str)
 
 longlong Item_func_year::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.year;
 }
@@ -1454,7 +1471,7 @@ enum_monotonicity_info Item_func_year::get_monotonicity_info() const
 
 longlong Item_func_year::val_int_endpoint(bool left_endp, bool *incl_endp)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   if (get_arg0_date(&ltime, TIME_FUZZY_DATE))
   {
@@ -1552,7 +1569,7 @@ bool Item_func_unix_timestamp::itemize(Parse_context *pc, Item **res)
 */
 bool Item_func_unix_timestamp::val_timeval(struct timeval *tm)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   if (arg_count == 0)
   {
     tm->tv_sec= current_thd->query_start();
@@ -1575,10 +1592,10 @@ enum_monotonicity_info Item_func_unix_timestamp::get_monotonicity_info() const
 
 longlong Item_func_unix_timestamp::val_int_endpoint(bool left_endp, bool *incl_endp)
 {
-  DBUG_ASSERT(fixed == 1);
-  DBUG_ASSERT(arg_count == 1 &&
-              args[0]->type() == Item::FIELD_ITEM &&
-              args[0]->field_type() == MYSQL_TYPE_TIMESTAMP);
+  assert(fixed == 1);
+  assert(arg_count == 1 &&
+         args[0]->type() == Item::FIELD_ITEM &&
+         args[0]->field_type() == MYSQL_TYPE_TIMESTAMP);
   /* Leave the incl_endp intact */
   struct timeval tm;
   return val_timeval(&tm) ?  0 : tm.tv_sec;
@@ -1587,7 +1604,7 @@ longlong Item_func_unix_timestamp::val_int_endpoint(bool left_endp, bool *incl_e
 
 longlong Item_func_time_to_sec::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   longlong seconds;
   if (get_arg0_time(&ltime))
@@ -1749,7 +1766,7 @@ bool get_interval_value(Item *args, interval_type int_type,
     interval->second_part= array[1];
     break;
   case INTERVAL_LAST: /* purecov: begin deadcode */
-    DBUG_ASSERT(0); 
+    assert(0); 
     break;            /* purecov: end */
   }
   return false;
@@ -1776,7 +1793,7 @@ bool Item_func_from_days::get_date(MYSQL_TIME *ltime,
 
 void MYSQL_TIME_cache::set_time(MYSQL_TIME *ltime, uint8 dec_arg)
 {
-  DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_TIME);
+  assert(ltime->time_type == MYSQL_TIMESTAMP_TIME);
   time= *ltime;
   time_packed= TIME_to_longlong_time_packed(&time);
   dec= dec_arg;
@@ -1786,7 +1803,7 @@ void MYSQL_TIME_cache::set_time(MYSQL_TIME *ltime, uint8 dec_arg)
 
 void MYSQL_TIME_cache::set_date(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATE);
+  assert(ltime->time_type == MYSQL_TIMESTAMP_DATE);
   time= *ltime;
   time_packed= TIME_to_longlong_date_packed(&time);
   dec= 0;
@@ -1796,7 +1813,7 @@ void MYSQL_TIME_cache::set_date(MYSQL_TIME *ltime)
 
 void MYSQL_TIME_cache::set_datetime(MYSQL_TIME *ltime, uint8 dec_arg)
 {
-  DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATETIME);
+  assert(ltime->time_type == MYSQL_TIMESTAMP_DATETIME);
   time= *ltime;
   time_packed= TIME_to_longlong_datetime_packed(&time);
   dec= dec_arg;
@@ -1839,7 +1856,7 @@ void MYSQL_TIME_cache::set_time(struct timeval tv, uint8 dec_arg,
 
 void MYSQL_TIME_cache::cache_string()
 {
-  DBUG_ASSERT(time.time_type != MYSQL_TIMESTAMP_NONE);
+  assert(time.time_type != MYSQL_TIMESTAMP_NONE);
   if (string_length == 0)
     string_length= my_TIME_to_str(&time, string_buff, decimals());
 }
@@ -2179,7 +2196,7 @@ String *Item_func_date_format::val_str(String *str)
   String *format;
   MYSQL_TIME l_time;
   uint size;
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
 
   if (!is_time_format)
   {
@@ -2431,7 +2448,7 @@ bool Item_date_add_interval::get_time_internal(MYSQL_TIME *ltime)
   if (date_sub_interval)
     interval.neg= !interval.neg;
 
-  DBUG_ASSERT(!check_time_range_quick(ltime));
+  assert(!check_time_range_quick(ltime));
 
   longlong usec1= ((((ltime->day * 24 + ltime->hour) * 60 +
                       ltime->minute) * 60 + ltime->second) * 1000000LL +
@@ -2536,14 +2553,14 @@ void Item_extract::fix_length_and_dec()
   case INTERVAL_HOUR_MICROSECOND: max_length=13; date_value=0; break;
   case INTERVAL_MINUTE_MICROSECOND: max_length=11; date_value=0; break;
   case INTERVAL_SECOND_MICROSECOND: max_length=9; date_value=0; break;
-  case INTERVAL_LAST: DBUG_ASSERT(0); break; /* purecov: deadcode */
+  case INTERVAL_LAST: assert(0); break; /* purecov: deadcode */
   }
 }
 
 
 longlong Item_extract::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   uint year;
   ulong week_format;
@@ -2601,7 +2618,7 @@ longlong Item_extract::val_int()
 					    ltime.second_part)*neg;
   case INTERVAL_SECOND_MICROSECOND: return ((longlong)ltime.second*1000000L+
 					    ltime.second_part)*neg;
-  case INTERVAL_LAST: DBUG_ASSERT(0); break;  /* purecov: deadcode */
+  case INTERVAL_LAST: assert(0); break;  /* purecov: deadcode */
   }
   return 0;					// Impossible
 }
@@ -2641,7 +2658,7 @@ bool Item_datetime_typecast::get_date(MYSQL_TIME *ltime,
 {
   if ((null_value= args[0]->get_date(ltime, fuzzy_date | TIME_NO_DATE_FRAC_WARN)))
     return true;
-  DBUG_ASSERT(ltime->time_type != MYSQL_TIMESTAMP_TIME);
+  assert(ltime->time_type != MYSQL_TIMESTAMP_TIME);
   ltime->time_type= MYSQL_TIMESTAMP_DATETIME; // In case it was DATE
   int warnings= 0;
   return (null_value= my_datetime_round(ltime, decimals, &warnings));
@@ -2706,7 +2723,7 @@ bool Item_date_typecast::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzy_date)
 
 bool Item_func_makedate::get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzy_date)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   long daynr=  (long) args[1]->val_int();
   long year= (long) args[0]->val_int();
   long days;
@@ -2785,7 +2802,7 @@ void Item_func_add_time::fix_length_and_dec()
 bool Item_func_add_time::val_datetime(MYSQL_TIME *time,
                                       my_time_flags_t fuzzy_date)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME l_time1, l_time2;
   bool is_time= 0;
   long days, microseconds;
@@ -2865,7 +2882,7 @@ void Item_func_add_time::print(String *str, enum_query_type query_type)
 {
   if (is_date)
   {
-    DBUG_ASSERT(sign > 0);
+    assert(sign > 0);
     str->append(STRING_WITH_LEN("timestamp("));
   }
   else
@@ -2897,7 +2914,7 @@ void Item_func_add_time::print(String *str, enum_query_type query_type)
 
 bool Item_func_timediff::get_time(MYSQL_TIME *l_time3)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   longlong seconds;
   long microseconds;
   int l_sign= 1;
@@ -2961,7 +2978,7 @@ bool Item_func_timediff::get_time(MYSQL_TIME *l_time3)
 
 bool Item_func_maketime::get_time(MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   bool overflow= 0;
   longlong hour=   args[0]->val_int();
   longlong minute= args[1]->val_int();
@@ -3018,7 +3035,7 @@ bool Item_func_maketime::get_time(MYSQL_TIME *ltime)
     len+= sprintf(buf + len, ".%0*lld", dec,
                   second.rem / (ulong) log_10_int[9 - dec]);
   }
-  DBUG_ASSERT(strlen(buf) < sizeof(buf));
+  assert(strlen(buf) < sizeof(buf));
   make_truncated_value_warning(ErrConvString(buf, len), MYSQL_TIMESTAMP_TIME);
   return false;
 }
@@ -3034,7 +3051,7 @@ bool Item_func_maketime::get_time(MYSQL_TIME *ltime)
 
 longlong Item_func_microsecond::val_int()
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   MYSQL_TIME ltime;
   return get_arg0_time(&ltime) ? 0 : ltime.second_part;
 }
@@ -3193,7 +3210,7 @@ void Item_func_timestamp_diff::print(String *str, enum_query_type query_type)
 
 String *Item_func_get_format::val_str_ascii(String *str)
 {
-  DBUG_ASSERT(fixed == 1);
+  assert(fixed == 1);
   const char *format_name;
   Known_date_time_format *format;
   String *val= args[0]->val_str_ascii(str);
@@ -3241,7 +3258,7 @@ void Item_func_get_format::print(String *str, enum_query_type query_type)
     str->append(STRING_WITH_LEN("TIME, "));
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   args[0]->print(str, query_type);
   str->append(')');
@@ -3349,6 +3366,22 @@ void Item_func_str_to_date::fix_length_and_dec()
   }
 }
 
+/**
+  Determines whether this date should be NULL (and a warning raised) under the
+  given sql_mode. Zeroes are allowed in the date if the data type is TIME.
+
+  @param target_type The data type of the time/date.
+  @param time Date and time data
+  @param fuzzy_date What sql_mode dictates.
+  @return Whether the result is valid or NULL.
+*/
+static bool date_should_be_null(enum_field_types target_type,
+                                const MYSQL_TIME &time,
+                                my_time_flags_t fuzzy_date) {
+  return (fuzzy_date & TIME_NO_ZERO_DATE) != 0 &&
+         (target_type != MYSQL_TYPE_TIME) &&
+         (time.year == 0 || time.month == 0 || time.day == 0);
+}
 
 bool Item_func_str_to_date::val_datetime(MYSQL_TIME *ltime,
                                          my_time_flags_t fuzzy_date)
@@ -3374,11 +3407,19 @@ bool Item_func_str_to_date::val_datetime(MYSQL_TIME *ltime,
   memset(ltime, 0, sizeof(*ltime));
   date_time_format.format.str=    (char*) format->ptr();
   date_time_format.format.length= format->length();
-  if (extract_date_time(&date_time_format, val->ptr(), val->length(),
-			ltime, cached_timestamp_type, 0, "datetime") ||
-      ((fuzzy_date & TIME_NO_ZERO_DATE) &&
-       (ltime->year == 0 || ltime->month == 0 || ltime->day == 0)))
+  if (extract_date_time(&date_time_format, val->ptr(), val->length(), ltime,
+			cached_timestamp_type, 0, "datetime", field_type(),
+			fuzzy_date))
+    goto null_date;
+  if (date_should_be_null(field_type(), *ltime, fuzzy_date)) {
+    char buff[128];
+    strmake(buff, val->ptr(), min<size_t>(val->length(), sizeof(buff) - 1));
+    push_warning_printf(current_thd, Sql_condition::SL_WARNING,
+                        ER_WRONG_VALUE_FOR_TYPE,
+                        ER_THD(current_thd, ER_WRONG_VALUE_FOR_TYPE),
+                        "datetime", buff, "str_to_date");
     goto null_date;
+  }
   ltime->time_type= cached_timestamp_type;
   if (cached_timestamp_type == MYSQL_TIMESTAMP_TIME && ltime->day)
   {
@@ -3393,14 +3434,6 @@ bool Item_func_str_to_date::val_datetime(MYSQL_TIME *ltime,
   return 0;
 
 null_date:
-  if (val && (fuzzy_date & TIME_NO_ZERO_DATE) /*warnings*/)
-  {
-    char buff[128];
-    strmake(buff, val->ptr(), min<size_t>(val->length(), sizeof(buff)-1));
-    push_warning_printf(current_thd, Sql_condition::SL_WARNING,
-                        ER_WRONG_VALUE_FOR_TYPE, ER(ER_WRONG_VALUE_FOR_TYPE),
-                        "datetime", buff, "str_to_date");
-  }
   return (null_value= 1);
 }
 
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 0cfecb24fa4a..a1ada8213393 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_TIMEFUNC_INCLUDED
 #define ITEM_TIMEFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -144,7 +151,7 @@ class Item_func_month :public Item_func
   { collation.set_numeric(); }
   longlong val_int();
   double val_real()
-  { DBUG_ASSERT(fixed == 1); return (double) Item_func_month::val_int(); }
+  { assert(fixed == 1); return (double) Item_func_month::val_int(); }
   String *val_str(String *str) 
   {
     longlong nr= val_int();
@@ -358,10 +365,10 @@ class Item_func_weekday :public Item_func
     :Item_func(pos, a), odbc_type(type_arg)
   { collation.set_numeric(); }
   longlong val_int();
-  double val_real() { DBUG_ASSERT(fixed == 1); return (double) val_int(); }
+  double val_real() { assert(fixed == 1); return (double) val_int(); }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     str->set(val_int(), &my_charset_bin);
     return null_value ? 0 : str;
   }
@@ -550,12 +557,12 @@ class Item_temporal_func :public Item_func
   }
   uint time_precision()
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return decimals;
   }
   uint datetime_precision()
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return decimals;
   }
   virtual void print(String *str, enum_query_type query_type);
@@ -600,7 +607,7 @@ class Item_temporal_hybrid_func :public Item_str_func
       or using collation.collation when VARCHAR
       (which is fixed from @collation_connection in fix_length_and_dec).
     */
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_field_type == MYSQL_TYPE_STRING ?
                                 collation.collation : &my_charset_bin;
   }
@@ -677,7 +684,7 @@ class Item_date_func :public Item_temporal_func
   }
   my_decimal *val_decimal(my_decimal *decimal_value)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return  val_decimal_from_date(decimal_value);
   }
   // All date functions must implement get_date()
@@ -731,7 +738,7 @@ class Item_datetime_func :public Item_temporal_func
   longlong val_date_temporal();
   my_decimal *val_decimal(my_decimal *decimal_value)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return  val_decimal_from_date(decimal_value);
   }
   bool get_time(MYSQL_TIME *ltime)
@@ -772,7 +779,7 @@ class Item_time_func :public Item_temporal_func
   double val_real() { return val_real_from_decimal(); }
   my_decimal *val_decimal(my_decimal *decimal_value)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return  val_decimal_from_time(decimal_value);
   }
   longlong val_int()
@@ -838,7 +845,7 @@ class MYSQL_TIME_cache
   */
   void get_TIME(MYSQL_TIME *ltime) const
   {
-    DBUG_ASSERT(time.time_type != MYSQL_TIMESTAMP_NONE);
+    assert(time.time_type != MYSQL_TIMESTAMP_NONE);
     *ltime= time;
   }
 public:
@@ -887,7 +894,7 @@ class MYSQL_TIME_cache
   */
   uint8 decimals() const
   {
-    DBUG_ASSERT(time.time_type != MYSQL_TIMESTAMP_NONE);
+    assert(time.time_type != MYSQL_TIMESTAMP_NONE);
     return dec;
   }
 
@@ -896,7 +903,7 @@ class MYSQL_TIME_cache
   */
   longlong val_packed() const
   {
-    DBUG_ASSERT(time.time_type != MYSQL_TIMESTAMP_NONE);
+    assert(time.time_type != MYSQL_TIMESTAMP_NONE);
     return time_packed;
   }
   /**
@@ -917,7 +924,7 @@ class MYSQL_TIME_cache
   */
   MYSQL_TIME *get_TIME_ptr()
   {
-    DBUG_ASSERT(time.time_type != MYSQL_TIMESTAMP_NONE);
+    assert(time.time_type != MYSQL_TIMESTAMP_NONE);
     return &time;
   }
   /**
@@ -952,17 +959,17 @@ class Item_date_literal :public Item_date_func
   void print(String *str, enum_query_type query_type);
   longlong val_date_temporal()
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_packed();
   }
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzy_date)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.get_date(ltime, fuzzy_date);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_str(str);
   }
   void fix_length_and_dec()
@@ -1007,17 +1014,17 @@ class Item_time_literal :public Item_time_func
   void print(String *str, enum_query_type query_type);
   longlong val_time_temporal()
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_packed();
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.get_time(ltime);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_str(str);
   }
   void fix_length_and_dec()
@@ -1062,17 +1069,17 @@ class Item_datetime_literal :public Item_datetime_func
   void print(String *str, enum_query_type query_type);
   longlong val_date_temporal()
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_packed();
   }
   bool get_date(MYSQL_TIME *ltime, my_time_flags_t fuzzy_date)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.get_date(ltime, fuzzy_date);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed);
+    assert(fixed);
     return cached_time.val_str(str);
   }
   void fix_length_and_dec()
@@ -1117,17 +1124,17 @@ class Item_func_curtime :public Item_time_func
   void fix_length_and_dec();
   longlong val_time_temporal()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_packed();
   }
   bool get_time(MYSQL_TIME *ltime)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.get_time(ltime);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_str(&str_value);
   }
   bool check_gcol_func_processor(uchar *int_arg)
@@ -1176,17 +1183,17 @@ class Item_func_curdate :public Item_date_func
   void fix_length_and_dec();
   longlong val_date_temporal()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_packed();
   }
   bool get_date(MYSQL_TIME *res, my_time_flags_t fuzzy_date)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.get_time(res);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_str(&str_value);
   }
   bool check_gcol_func_processor(uchar *int_arg)
@@ -1235,17 +1242,17 @@ class Item_func_now :public Item_datetime_func
   void fix_length_and_dec();
   longlong val_date_temporal()
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_packed();
   }
   bool get_date(MYSQL_TIME *res, my_time_flags_t fuzzy_date)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.get_time(res);
   }
   String *val_str(String *str)
   {
-    DBUG_ASSERT(fixed == 1);
+    assert(fixed == 1);
     return cached_time.val_str(&str_value);
   }
   bool check_gcol_func_processor(uchar *int_arg)
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 3362311e54e6..7bf3fbdab021 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -976,10 +983,10 @@ static Item *create_comparator(MY_XPATH *xpath,
 static Item* nametestfunc(MY_XPATH *xpath,
                           int type, Item *arg, const char *beg, size_t len)
 {
-  DBUG_ASSERT(arg != 0);
-  DBUG_ASSERT(arg->type() == Item::XPATH_NODESET);
-  DBUG_ASSERT(beg != 0);
-  DBUG_ASSERT(len > 0);
+  assert(arg != 0);
+  assert(arg->type() == Item::XPATH_NODESET);
+  assert(beg != 0);
+  assert(len > 0);
 
   Item *res;
   switch (type)
@@ -2533,7 +2540,7 @@ my_xpath_parse_VariableReference(MY_XPATH *xpath)
     {
       Item_splocal *splocal= new Item_splocal(Name_string(name, false),
                                               spv->offset, spv->type, 0);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (splocal)
         splocal->m_sp= lex->sphead;
 #endif
@@ -2542,7 +2549,7 @@ my_xpath_parse_VariableReference(MY_XPATH *xpath)
     else
     {
       xpath->item= NULL;
-      DBUG_ASSERT(xpath->query.end > dollar_pos);
+      assert(xpath->query.end > dollar_pos);
       size_t len= xpath->query.end - dollar_pos;
       set_if_smaller(len, 32);
       my_printf_error(ER_UNKNOWN_ERROR, "Unknown XPATH variable at: '%.*s'",
@@ -2570,7 +2577,7 @@ my_xpath_parse_NodeTest_QName(MY_XPATH *xpath)
 {
   if (!my_xpath_parse_QName(xpath))
     return 0;
-  DBUG_ASSERT(xpath->context);
+  assert(xpath->context);
   size_t len= xpath->prevtok.end - xpath->prevtok.beg;
   xpath->context= nametestfunc(xpath, xpath->axis, xpath->context,
                                xpath->prevtok.beg, len);
@@ -2581,7 +2588,7 @@ my_xpath_parse_NodeTest_asterisk(MY_XPATH *xpath)
 {
   if (!my_xpath_parse_term(xpath, MY_XPATH_LEX_ASTERISK))
     return 0;
-  DBUG_ASSERT(xpath->context);
+  assert(xpath->context);
   xpath->context= nametestfunc(xpath, xpath->axis, xpath->context, "*", 1);
   return 1;
 }
@@ -2650,10 +2657,10 @@ void Item_xml_str_func::fix_length_and_dec()
 
 void Item_xml_str_func::parse_xpath(Item* xpath_expr)
 {
-  String *xp, tmp;
+  String *xp;
   MY_XPATH xpath;
 
-  if (!(xp= xpath_expr->val_str(&tmp)))
+  if (!(xp= xpath_expr->val_str(&xpath_tmp_value)))
     return;
 
   my_xpath_init(&xpath);
@@ -2732,7 +2739,7 @@ int xml_enter(MY_XML_PARSER *st,const char *attr, size_t len)
 
   node.parent= data->parent; // Set parent for the new node to old parent
   data->parent= numnodes;    // Remember current node as new parent
-  DBUG_ASSERT(data->level < MAX_LEVEL);
+  assert(data->level < MAX_LEVEL);
   data->pos[data->level]= numnodes;
   if (data->level < MAX_LEVEL - 1)
     node.level= data->level++;
@@ -2790,7 +2797,7 @@ extern "C" int xml_leave(MY_XML_PARSER *st,const char *attr, size_t len);
 int xml_leave(MY_XML_PARSER *st,const char *attr, size_t len)
 {
   MY_XML_USER_DATA *data= (MY_XML_USER_DATA*)st->user_data;
-  DBUG_ASSERT(data->level > 0);
+  assert(data->level > 0);
   data->level--;
 
   MY_XML_NODE *nodes= (MY_XML_NODE*) data->pxml->ptr();
diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h
index 0e2c57791e3e..37029619cd27 100644
--- a/sql/item_xmlfunc.h
+++ b/sql/item_xmlfunc.h
@@ -1,16 +1,23 @@
 #ifndef ITEM_XMLFUNC_INCLUDED
 #define ITEM_XMLFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -25,6 +32,7 @@ class Item_xml_str_func: public Item_str_func
 protected:
   String tmp_value, pxml;
   Item *nodeset_func;
+  String xpath_tmp_value;
 public:
   Item_xml_str_func(const POS &pos, Item *a, Item *b): 
     Item_str_func(pos, a,b) 
diff --git a/sql/json_binary.cc b/sql/json_binary.cc
index 71a1fbeb617c..665291552b99 100644
--- a/sql/json_binary.cc
+++ b/sql/json_binary.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -175,12 +182,12 @@ static void insert_offset_or_size(String *dest, size_t pos,
   char *to= const_cast<char*>(dest->ptr()) + pos;
   if (large)
   {
-    DBUG_ASSERT(pos + LARGE_OFFSET_SIZE <= dest->alloced_length());
+    assert(pos + LARGE_OFFSET_SIZE <= dest->alloced_length());
     int4store(to, static_cast<uint32>(offset_or_size));
   }
   else
   {
-    DBUG_ASSERT(pos + SMALL_OFFSET_SIZE <= dest->alloced_length());
+    assert(pos + SMALL_OFFSET_SIZE <= dest->alloced_length());
     int2store(to, static_cast<uint16>(offset_or_size));
   }
 }
@@ -493,7 +500,7 @@ serialize_json_object(const Json_object *object, String *dest, bool large,
   size_t offset= dest->length() +
     size * (key_entry_size + value_entry_size) - start_pos;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const std::string *prev_key= NULL;
 #endif
 
@@ -504,13 +511,13 @@ serialize_json_object(const Json_object *object, String *dest, bool large,
     const std::string *key= &it->first;
     size_t len= key->length();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     // Check that the DOM returns the keys in the correct order.
     if (prev_key)
     {
-      DBUG_ASSERT(prev_key->length() <= len);
+      assert(prev_key->length() <= len);
       if (len == prev_key->length())
-        DBUG_ASSERT(memcmp(prev_key->data(), key->data(), len) < 0);
+        assert(memcmp(prev_key->data(), key->data(), len) < 0);
     }
     prev_key= key;
 #endif
@@ -590,7 +597,7 @@ serialize_json_value(const Json_dom *dom, size_t type_pos, String *dest,
                      size_t depth, bool small_parent)
 {
   const size_t start_pos= dest->length();
-  DBUG_ASSERT(type_pos < start_pos);
+  assert(type_pos < start_pos);
 
   enum_serialization_result result;
 
@@ -797,8 +804,8 @@ Value::Value(enum_type t)
   : m_type(t), m_field_type(), m_data(), m_element_count(), m_length(),
     m_int_value(), m_double_value(), m_large()
 {
-  DBUG_ASSERT(t == LITERAL_NULL || t == LITERAL_TRUE || t == LITERAL_FALSE ||
-              t == ERROR);
+  assert(t == LITERAL_NULL || t == LITERAL_TRUE || t == LITERAL_FALSE ||
+         t == ERROR);
 }
 
 
@@ -807,7 +814,7 @@ Value::Value(enum_type t, int64 val)
   : m_type(t), m_field_type(), m_data(), m_element_count(), m_length(),
     m_int_value(val), m_double_value(), m_large()
 {
-  DBUG_ASSERT(t == INT || t == UINT);
+  assert(t == INT || t == UINT);
 }
 
 
@@ -831,7 +838,7 @@ Value::Value(enum_type t, const char *data, size_t bytes,
   : m_type(t), m_field_type(), m_data(data), m_element_count(element_count),
     m_length(bytes), m_int_value(), m_double_value(), m_large(large)
 {
-  DBUG_ASSERT(t == ARRAY || t == OBJECT);
+  assert(t == ARRAY || t == OBJECT);
 }
 
 
@@ -895,7 +902,7 @@ bool Value::is_valid() const
 */
 const char *Value::get_data() const
 {
-  DBUG_ASSERT(m_type == STRING || m_type == OPAQUE);
+  assert(m_type == STRING || m_type == OPAQUE);
   return m_data;
 }
 
@@ -906,7 +913,7 @@ const char *Value::get_data() const
 */
 size_t Value::get_data_length() const
 {
-  DBUG_ASSERT(m_type == STRING || m_type == OPAQUE);
+  assert(m_type == STRING || m_type == OPAQUE);
   return m_length;
 }
 
@@ -916,7 +923,7 @@ size_t Value::get_data_length() const
 */
 int64 Value::get_int64() const
 {
-  DBUG_ASSERT(m_type == INT);
+  assert(m_type == INT);
   return m_int_value;
 }
 
@@ -926,7 +933,7 @@ int64 Value::get_int64() const
 */
 uint64 Value::get_uint64() const
 {
-  DBUG_ASSERT(m_type == UINT);
+  assert(m_type == UINT);
   return static_cast<uint64>(m_int_value);
 }
 
@@ -936,7 +943,7 @@ uint64 Value::get_uint64() const
 */
 double Value::get_double() const
 {
-  DBUG_ASSERT(m_type == DOUBLE);
+  assert(m_type == DOUBLE);
   return m_double_value;
 }
 
@@ -947,7 +954,7 @@ double Value::get_double() const
 */
 size_t Value::element_count() const
 {
-  DBUG_ASSERT(m_type == ARRAY || m_type == OBJECT);
+  assert(m_type == ARRAY || m_type == OBJECT);
   return m_element_count;
 }
 
@@ -958,7 +965,7 @@ size_t Value::element_count() const
 */
 enum_field_types Value::field_type() const
 {
-  DBUG_ASSERT(m_type == OPAQUE);
+  assert(m_type == OPAQUE);
   return m_field_type;
 }
 
@@ -1097,7 +1104,7 @@ static size_t read_offset_or_size(const char *data, bool large)
 static Value parse_array_or_object(Value::enum_type t, const char *data,
                                    size_t len, bool large)
 {
-  DBUG_ASSERT(t == Value::ARRAY || t == Value::OBJECT);
+  assert(t == Value::ARRAY || t == Value::OBJECT);
 
   /*
     Make sure the document is long enough to contain the two length fields
@@ -1182,7 +1189,7 @@ Value parse_binary(const char *data, size_t len)
 */
 Value Value::element(size_t pos) const
 {
-  DBUG_ASSERT(m_type == ARRAY || m_type == OBJECT);
+  assert(m_type == ARRAY || m_type == OBJECT);
 
   if (pos >= m_element_count)
     return err();
@@ -1236,7 +1243,7 @@ Value Value::element(size_t pos) const
 */
 Value Value::key(size_t pos) const
 {
-  DBUG_ASSERT(m_type == OBJECT);
+  assert(m_type == OBJECT);
 
   if (pos >= m_element_count)
     return err();
@@ -1280,7 +1287,7 @@ Value Value::key(size_t pos) const
 */
 Value Value::lookup(const char *key, size_t len) const
 {
-  DBUG_ASSERT(m_type == OBJECT);
+  assert(m_type == OBJECT);
 
   const size_t offset_size=
     (m_large ? LARGE_OFFSET_SIZE : SMALL_OFFSET_SIZE);
diff --git a/sql/json_binary.h b/sql/json_binary.h
index 8db839274e8d..e99eb8e31a5c 100644
--- a/sql/json_binary.h
+++ b/sql/json_binary.h
@@ -1,16 +1,23 @@
 #ifndef JSON_BINARY_INCLUDED
 #define JSON_BINARY_INCLUDED
 
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/json_dom.cc b/sql/json_dom.cc
index 29507891a09c..f06c8c7d0096 100644
--- a/sql/json_dom.cc
+++ b/sql/json_dom.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -582,8 +589,8 @@ class Rapid_json_handler : public BaseReaderHandler<UTF8<> >
       return false;
       /* purecov: end */
     case expect_object_value:
-      DBUG_ASSERT(!m_stack.back().m_elements.empty());
-      DBUG_ASSERT(m_stack.back().m_elements.back().m_value == NULL);
+      assert(!m_stack.back().m_elements.empty());
+      assert(m_stack.back().m_elements.back().m_value == NULL);
       m_stack.back().m_elements.back().m_value= scalar;
       m_state= expect_object_key;
       break;
@@ -641,7 +648,7 @@ class Rapid_json_handler : public BaseReaderHandler<UTF8<> >
         The is_int flag is true only if -0 was seen. Handle it as an
         integer.
       */
-      DBUG_ASSERT(d == 0.0);
+      assert(d == 0.0);
       return Int64(static_cast<int64_t>(d));
     }
     else
@@ -690,8 +697,8 @@ class Rapid_json_handler : public BaseReaderHandler<UTF8<> >
       return false;
       /* purecov: end */
     case expect_object_value:
-      DBUG_ASSERT(!m_stack.back().m_elements.empty());
-      DBUG_ASSERT(m_stack.back().m_elements.back().m_value == NULL);
+      assert(!m_stack.back().m_elements.empty());
+      assert(m_stack.back().m_elements.back().m_value == NULL);
       m_stack.back().m_elements.back().m_value=
         new (std::nothrow) Json_string(std::string(str, length));
       m_state= expect_object_key;
@@ -930,6 +937,7 @@ class Syntax_check_handler
   bool Double(double, bool is_int= false) { return seeing_scalar(); }
   bool String(const char*, SizeType, bool) { return seeing_scalar(); }
   bool Key(const char*, SizeType, bool) { return seeing_scalar(); }
+  bool RawNumber(const char*, SizeType, bool) { return seeing_scalar(); }
 };
 
 
@@ -1225,6 +1233,7 @@ bool Json_object::consume(Json_object *other)
       this_iter->second= merge_doms(this_iter->second, value);
       if (this_iter->second == NULL)
         return true;                          /* purecov: inspected */
+      this_iter->second->set_parent(this);
     }
   }
 
@@ -1236,7 +1245,10 @@ Json_dom *Json_object::get(const std::string &key) const
   const Json_object_map::const_iterator iter= m_map.find(key);
 
   if (iter != m_map.end())
+  {
+    assert(iter->second->parent() == this);
     return iter->second;
+  }
 
   return NULL;
 }
@@ -1261,6 +1273,18 @@ bool Json_object::remove(const Json_dom *child)
 }
 
 
+bool Json_object::remove(const std::string &key)
+{
+  Json_object_map::iterator it= m_map.find(key);
+  if (it == m_map.end())
+    return false;
+
+  delete it->second;
+  m_map.erase(it);
+  return true;
+}
+
+
 size_t Json_object::cardinality() const
 {
   return m_map.size();
@@ -1310,6 +1334,68 @@ void Json_object::clear()
 }
 
 
+bool Json_object::merge_patch(Json_object *patch)
+{
+  std::auto_ptr<Json_object> aptr(patch); // We own it, and must make sure
+                                          // to delete it.
+
+  for (Json_object_map::iterator it= patch->m_map.begin();
+       it != patch->m_map.end(); ++it)
+  {
+    const std::string &patch_key= it->first;
+    std::auto_ptr<Json_dom> patch_value(it->second);
+    it->second= NULL;
+
+    // Remove the member if the value in the patch is the null literal.
+    if (patch_value->json_type() == Json_dom::J_NULL)
+    {
+      remove(patch_key);
+      continue;
+    }
+
+    // See if the target has this member, add it if not.
+    std::pair<Json_object_map::iterator, bool>
+      target_pair= m_map.insert(std::make_pair(patch_key,
+                                               static_cast<Json_dom*>(NULL)));
+
+    std::auto_ptr<Json_dom> target_value(target_pair.first->second);
+    target_pair.first->second= NULL;
+
+    /*
+      If the value in the patch is not an object and not the null
+      literal, the new value is the patch.
+    */
+    if (patch_value->json_type() != Json_dom::J_OBJECT)
+    {
+      patch_value->set_parent(this);
+      target_pair.first->second= patch_value.release();
+      continue;
+    }
+
+    /*
+      If there is no target value, or if the target value is not an
+      object, use an empty object as the target value.
+    */
+    if (target_value.get() == NULL ||
+        target_value->json_type() != Json_dom::J_OBJECT)
+    {
+      target_value.reset(new (std::nothrow) Json_object());
+    }
+
+    // Recursively merge the target value with the patch.
+    Json_object *target_obj= down_cast<Json_object*>(target_value.get());
+    if (target_obj == NULL ||
+        target_obj->merge_patch(down_cast<Json_object*>(patch_value.release())))
+      return true;                            /* purecov: inspected */
+
+    target_value->set_parent(this);
+    target_pair.first->second= target_value.release();
+  }
+
+  return false;
+}
+
+
 /**
   Compare two keys from a JSON object and determine whether or not the
   first key is less than the second key. key1 is considered less than
@@ -1484,22 +1570,18 @@ void Json_array::clear()
   delete_container_pointers(m_v);
 }
 
-
 /**
-  Reserve space in a buffer. In order to avoid frequent reallocations,
-  allocate a new buffer at least as twice as large as the current
-  buffer if there is not enough space.
-
-  @param[in, out] buffer  the buffer in which to reserve space
-  @param[in]      needed  the number of bytes to reserve
-  @return false if successful, true if memory could not be allocated
+  Reserve space in a string buffer. If reallocation is needed,
+  increase the size of the buffer exponentially.
+  @param buffer the string buffer
+  @param needed the number of bytes needed
+  @return true on error, false on success
 */
 static bool reserve(String *buffer, size_t needed)
 {
-  return buffer->reserve(needed, buffer->alloced_length());
+  return buffer->reserve(needed, buffer->length());
 }
 
-
 /**
   Perform quoting on a JSON string to make an external representation
   of it. it wraps double quotes (text quotes) around the string (cptr)
@@ -1534,8 +1616,8 @@ static bool reserve(String *buffer, size_t needed)
 */
 bool double_quote(const char *cptr, size_t length, String *buf)
 {
-  if (reserve(buf, 2 + length) || buf->append('"'))
-    return true;                              /* purecov: inspected */
+  if (reserve(buf, length + 2) || buf->append('"'))
+    return true; /* purecov: inspected */
 
   for (size_t i= 0; i < length; i++)
   {
@@ -1567,7 +1649,7 @@ bool double_quote(const char *cptr, size_t length, String *buf)
 
     if (done)
     {
-      if (reserve(buf, 2) || buf->append(esc[0]) || buf->append(esc[1]))
+      if (buf->append(esc[0]) || buf->append(esc[1]))
         return true;                          /* purecov: inspected */
     }
     else if (((cptr[i] & ~0x7f) == 0) && // bit 8 not set
@@ -1577,17 +1659,17 @@ bool double_quote(const char *cptr, size_t length, String *buf)
         Unprintable control character, use hex a hexadecimal number.
         The meaning of such a number determined by ISO/IEC 10646.
       */
-      if (reserve(buf, 5) || buf->append("\\u00") ||
+      if (buf->append("\\u00") ||
           buf->append(_dig_vec_lower[(cptr[i] & 0xf0) >> 4]) ||
           buf->append(_dig_vec_lower[(cptr[i] & 0x0f)]))
         return true;                          /* purecov: inspected */
     }
-    else if (reserve(buf, 1) || buf->append(cptr[i]))
+    else if (buf->append(cptr[i]))
     {
       return true;                            /* purecov: inspected */
     }
   }
-  return reserve(buf, 1) || buf->append('"');
+  return buf->append('"');
 }
 
 
@@ -1608,7 +1690,7 @@ int Json_decimal::binary_size() const
 
 bool Json_decimal::get_binary(char* dest) const
 {
-  DBUG_ASSERT(binary_size() <= MAX_BINARY_SIZE);
+  assert(binary_size() <= MAX_BINARY_SIZE);
   /*
     my_decimal2binary() loses the precision and the scale, so store them
     in the first two bytes.
@@ -1754,9 +1836,8 @@ Json_wrapper_object_iterator::elt() const
 }
 
 
-Json_wrapper::Json_wrapper(Json_dom *dom_value) :
-  m_is_dom(true), m_dom_alias(false), m_value(),
-  m_id(NULL), m_dom_value(dom_value)
+Json_wrapper::Json_wrapper(Json_dom *dom_value)
+  : m_is_dom(true), m_dom_alias(false), m_value(), m_dom_value(dom_value)
 {
   if (!dom_value)
   {
@@ -1782,15 +1863,8 @@ void Json_wrapper::steal(Json_wrapper *old)
   }
 }
 
-Json_wrapper::Json_wrapper(const json_binary::Value &value) :
-  m_is_dom(false), m_dom_alias(false), m_value(value),
-  m_id(NULL), m_dom_value(NULL)
-{}
-
-
-Json_wrapper::Json_wrapper(const json_binary::Value &value, const char *id) :
-  m_is_dom(false), m_dom_alias(false), m_value(value),
-  m_id(id), m_dom_value(NULL)
+Json_wrapper::Json_wrapper(const json_binary::Value &value)
+  : m_is_dom(false), m_dom_alias(false), m_value(value), m_dom_value(NULL)
 {}
 
 
@@ -1798,11 +1872,9 @@ Json_wrapper::Json_wrapper(const Json_wrapper &old) :
   m_is_dom(old.m_is_dom),
   m_dom_alias(old.m_dom_alias),
   m_value(old.m_value),
-  m_id(old.m_id),
   m_dom_value(old.m_is_dom ?
               (m_dom_alias? old.m_dom_value : old.m_dom_value->clone()) :
-              NULL),
-  m_tmp(old.m_tmp)
+              NULL)
 {}
 
 
@@ -1848,10 +1920,8 @@ Json_wrapper &Json_wrapper::operator=(const Json_wrapper& from)
   {
     m_dom_value= NULL;
     m_value= from.m_value;
-    m_id= from.m_id;
   }
 
-  m_tmp= from.m_tmp;
   return *this;
 }
 
@@ -1882,22 +1952,20 @@ Json_dom *Json_wrapper::clone_dom()
 }
 
 
-json_binary::Value Json_wrapper::to_value()
+bool Json_wrapper::to_binary(String *str) const
 {
   if (empty())
   {
-    return json_binary::Value();
+    /* purecov: begin inspected */
+    my_error(ER_INVALID_JSON_BINARY_DATA, MYF(0));
+    return true;
+    /* purecov: end */
   }
 
   if (m_is_dom)
-  {
-    if (json_binary::serialize(m_dom_value, &m_tmp))
-      return json_binary::Value(json_binary::Value::ERROR);
-
-    return json_binary::parse_binary(m_tmp.ptr(), m_tmp.length());
-  }
+    return json_binary::serialize(m_dom_value, str);
 
-  return m_value;
+  return m_value.raw_binary(str);
 }
 
 
@@ -1927,20 +1995,60 @@ static int print_string(String *buffer, bool json_quoted,
 {
   return json_quoted ?
     double_quote(data, length, buffer) :
-    (reserve(buffer, length) || buffer->append(data, length));
+    buffer->append(data, length);
 }
 
 
+/**
+  Helper function for wrapper_to_string() which adds a newline and indentation
+  up to the specified level.
+
+  @param[in,out] buffer  the buffer to write to
+  @param[in]     level   how many nesting levels to add indentation for
+  @retval false on success
+  @retval true on error
+*/
+static bool newline_and_indent(String *buffer, size_t level)
+{
+  // Append newline and two spaces per indentation level.
+  return buffer->append('\n') ||
+    buffer->fill(buffer->length() + level * 2, ' ');
+}
+
+/**
+  Append a comma to separate elements in JSON arrays and objects.
+  @param buffer the string buffer
+  @param pretty true if pretty printing is enabled
+  @return true on error, false on success
+*/
+static bool append_comma(String *buffer, bool pretty)
+{
+  // Append a comma followed by a blank space. If pretty printing is
+  // enabled, a newline will be added in front of the next element, so
+  // the blank space can be omitted.
+  return buffer->append(',') || (!pretty && buffer->append(' '));
+}
+
 /**
   Helper function which does all the heavy lifting for
   Json_wrapper::to_string(). It processes the Json_wrapper
   recursively. The depth parameter keeps track of the current nesting
   level. When it reaches JSON_DOCUMENT_MAX_DEPTH, it gives up in order
   to avoid running out of stack space.
+
+  @param[in]     wr          the value to convert to a string
+  @param[in,out] buffer      the buffer to write to
+  @param[in]     json_quoted quote strings if true
+  @param[in]     pretty      add newlines and indentation if true
+  @param[in]     func_name   the name of the calling function
+  @param[in]     depth       the nesting level of @a wr
+
+  @retval false on success
+  @retval true on error
 */
 static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
-                              bool json_quoted, const char *func_name,
-                              size_t depth)
+                              bool json_quoted, bool pretty,
+                              const char *func_name, size_t depth)
 {
   if (check_json_depth(++depth))
     return true;
@@ -1968,40 +2076,39 @@ static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
     }
   case Json_dom::J_ARRAY:
     {
-      /*
-        Reserve some space up front. We know we need at least 3 bytes
-        per array element (at least one byte for the element, one byte
-        for the comma, and one byte for the space).
-      */
-      size_t array_len= wr.length();
-      if (reserve(buffer, 3 * array_len) || buffer->append('['))
+      if (buffer->append('['))
         return true;                           /* purecov: inspected */
 
+      size_t array_len= wr.length();
       for (uint32 i= 0; i < array_len; ++i)
       {
-        if (i > 0 && (reserve(buffer, 2) || buffer->append(", ")))
+        if (i > 0 && append_comma(buffer, pretty))
+          return true;                         /* purecov: inspected */
+
+        if (pretty && newline_and_indent(buffer, depth))
           return true;                         /* purecov: inspected */
 
-        if (wrapper_to_string(wr[i], buffer, true, func_name, depth))
+        if (wrapper_to_string(wr[i], buffer, true, pretty, func_name, depth))
           return true;                         /* purecov: inspected */
       }
-      if (reserve(buffer, 1) || buffer->append(']'))
+
+      if (pretty && array_len > 0 && newline_and_indent(buffer, depth - 1))
+        return true;                           /* purecov: inspected */
+
+      if (buffer->append(']'))
         return true;                           /* purecov: inspected */
+
       break;
     }
   case Json_dom::J_BOOLEAN:
-    {
-      const char *str= wr.get_boolean() ? "true" : "false";
-      size_t str_len= std::strlen(str);
-      if (reserve(buffer, str_len) || buffer->append(str, str_len))
-        return true;                          /* purecov: inspected */
-      break;
-    }
+    if (wr.get_boolean() ? buffer->append(STRING_WITH_LEN("true"))
+                         : buffer->append(STRING_WITH_LEN("false")))
+      return true;                             /* purecov: inspected */
+    break;
   case Json_dom::J_DECIMAL:
     {
       int length= DECIMAL_MAX_STR_LENGTH + 1;
-      if (reserve(buffer, length))
-        return true;                           /* purecov: inspected */
+      if (reserve(buffer, length)) return true;
       char *ptr= const_cast<char *>(buffer->ptr()) + buffer->length();
       my_decimal m;
       if (wr.get_decimal_data(&m) ||
@@ -2023,48 +2130,47 @@ static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
     }
   case Json_dom::J_INT:
     {
-      if (reserve(buffer, MAX_BIGINT_WIDTH + 1) ||
-          buffer->append_longlong(wr.get_int()))
+      if (buffer->append_longlong(wr.get_int()))
         return true;                           /* purecov: inspected */
       break;
     }
   case Json_dom::J_NULL:
-    if (reserve(buffer, 4) || buffer->append("null"))
+    if (buffer->append(STRING_WITH_LEN("null")))
       return true;                             /* purecov: inspected */
     break;
   case Json_dom::J_OBJECT:
     {
-      /*
-        Reserve some space up front to reduce the number of
-        reallocations needed. We know we need at least seven bytes per
-        member in the object. Two bytes for the quotes around the key
-        name, two bytes for the colon and space between the key and
-        the value, one byte for the value, and two bytes for the comma
-        and space between members. We're generous and assume at least
-        one byte in the key name as well, so we reserve eight bytes per
-        member.
-      */
-      if (reserve(buffer, 2 + 8 * wr.length()) || buffer->append('{'))
+      if (buffer->append('{'))
         return true;                           /* purecov: inspected */
-      uint32 i= 0;
+
+      bool first= true;
       for (Json_wrapper_object_iterator iter= wr.object_iterator();
            !iter.empty(); iter.next())
       {
-        if (i++ > 0 && (reserve(buffer, 2) || buffer->append(", ")))
+        if (!first && append_comma(buffer, pretty))
+          return true;                         /* purecov: inspected */
+
+        first= false;
+
+        if (pretty && newline_and_indent(buffer, depth))
           return true;                         /* purecov: inspected */
 
         const std::string &key= iter.elt().first;
         const char *key_data= key.c_str();
         size_t key_length= key.length();
-        if (reserve(buffer, key_length + 4) ||
-            print_string(buffer, true, key_data, key_length) ||
-            reserve(buffer, 2) || buffer->append(": ") ||
-            wrapper_to_string(iter.elt().second, buffer, true, func_name,
-                              depth))
+        if (print_string(buffer, true, key_data, key_length) ||
+            buffer->append(':') || buffer->append(' ') ||
+            wrapper_to_string(iter.elt().second, buffer, true, pretty,
+                              func_name, depth))
           return true;                         /* purecov: inspected */
       }
-      if (reserve(buffer, 1) || buffer->append('}'))
+
+      if (pretty && wr.length() > 0 && newline_and_indent(buffer, depth - 1))
         return true;                           /* purecov: inspected */
+
+      if (buffer->append('}'))
+        return true;                           /* purecov: inspected */
+
       break;
     }
   case Json_dom::J_OPAQUE:
@@ -2072,7 +2178,6 @@ static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
       if (wr.get_data_length() > base64_encode_max_arg_length())
       {
         /* purecov: begin inspected */
-        buffer->append("\"<data too long to decode - unexpected error>\"");
         my_error(ER_INTERNAL_ERROR, MYF(0),
                  "JSON: could not decode opaque data");
         return true;
@@ -2082,11 +2187,8 @@ static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
       const size_t needed=
         static_cast<size_t>(base64_needed_encoded_length(wr.get_data_length()));
 
-      const char *prefix= "base64:type";
-      const size_t prefix_len= std::strlen(prefix);
-      if (reserve(buffer, prefix_len + MAX_INT_WIDTH + 3 + needed) ||
-          single_quote(buffer, json_quoted) ||
-          buffer->append(prefix, prefix_len) ||
+      if (single_quote(buffer, json_quoted) ||
+          buffer->append(STRING_WITH_LEN("base64:type")) ||
           buffer->append_ulonglong(wr.field_type()) ||
           buffer->append(':'))
         return true;                           /* purecov: inspected */
@@ -2113,8 +2215,7 @@ static bool wrapper_to_string(const Json_wrapper &wr, String *buffer,
     }
   case Json_dom::J_UINT:
     {
-      if (reserve(buffer, MAX_BIGINT_WIDTH) ||
-          buffer->append_ulonglong(wr.get_uint()))
+      if (buffer->append_ulonglong(wr.get_uint()))
         return true;                           /* purecov: inspected */
       break;
     }
@@ -2143,9 +2244,17 @@ bool Json_wrapper::to_string(String *buffer, bool json_quoted,
                              const char *func_name) const
 {
   buffer->set_charset(&my_charset_utf8mb4_bin);
-  return wrapper_to_string(*this, buffer, json_quoted, func_name, 0);
+  return wrapper_to_string(*this, buffer, json_quoted, false, func_name, 0);
 }
 
+
+bool Json_wrapper::to_pretty_string(String *buffer, const char *func_name) const
+{
+  buffer->set_charset(&my_charset_utf8mb4_bin);
+  return wrapper_to_string(*this, buffer, true, true, func_name, 0);
+}
+
+
 Json_dom::enum_json_type Json_wrapper::type() const
 {
   if (empty())
@@ -2198,7 +2307,7 @@ enum_field_types Json_wrapper::field_type() const
 
 Json_wrapper_object_iterator Json_wrapper::object_iterator() const
 {
-  DBUG_ASSERT(type() == Json_dom::J_OBJECT);
+  assert(type() == Json_dom::J_OBJECT);
 
   if (m_is_dom)
   {
@@ -2212,7 +2321,7 @@ Json_wrapper_object_iterator Json_wrapper::object_iterator() const
 
 Json_wrapper Json_wrapper::lookup(const char *key, size_t len) const
 {
-  DBUG_ASSERT(type() == Json_dom::J_OBJECT);
+  assert(type() == Json_dom::J_OBJECT);
   if (m_is_dom)
   {
     const Json_object *object= down_cast<const Json_object *>(m_dom_value);
@@ -2227,7 +2336,7 @@ Json_wrapper Json_wrapper::lookup(const char *key, size_t len) const
 
 Json_wrapper Json_wrapper::operator[](size_t index) const
 {
-  DBUG_ASSERT(type() == Json_dom::J_ARRAY);
+  assert(type() == Json_dom::J_ARRAY);
   if (m_is_dom)
   {
     const Json_array *o= down_cast<const Json_array *>(m_dom_value);
@@ -2352,7 +2461,7 @@ const char *Json_wrapper::get_datetime_packed(char *buffer) const
     return buffer;
   }
 
-  DBUG_ASSERT(m_value.get_data_length() == Json_datetime::PACKED_SIZE);
+  assert(m_value.get_data_length() == Json_datetime::PACKED_SIZE);
   return m_value.get_data();
 }
 
@@ -2394,7 +2503,7 @@ Json_path Json_dom::get_location()
   }
   else
   {
-    DBUG_ASSERT(m_parent->json_type() == Json_dom::J_ARRAY);
+    assert(m_parent->json_type() == Json_dom::J_ARRAY);
     Json_array *array= down_cast<Json_array *>(m_parent);
 
     for (size_t idx= 0; idx < array->size(); idx++)
@@ -2960,8 +3069,8 @@ int Json_wrapper::compare(const Json_wrapper &other) const
   const Json_dom::enum_json_type this_type= type();
   const Json_dom::enum_json_type other_type= other.type();
 
-  DBUG_ASSERT(this_type != Json_dom::J_ERROR);
-  DBUG_ASSERT(other_type != Json_dom::J_ERROR);
+  assert(this_type != Json_dom::J_ERROR);
+  assert(other_type != Json_dom::J_ERROR);
 
   // Check if the type tells us which value is bigger.
   int cmp= type_comparison[this_type][other_type];
@@ -3039,8 +3148,8 @@ int Json_wrapper::compare(const Json_wrapper &other) const
         it2.next();
       }
 
-      DBUG_ASSERT(it1.empty());
-      DBUG_ASSERT(it2.empty());
+      assert(it1.empty());
+      assert(it2.empty());
 
       // No differences found. The two objects must be equal.
       return 0;
@@ -3157,7 +3266,7 @@ int Json_wrapper::compare(const Json_wrapper &other) const
   case Json_dom::J_DATE:
     // Dates and times can only be equal to values of the same type.
     {
-      DBUG_ASSERT(this_type == other_type);
+      assert(this_type == other_type);
       MYSQL_TIME val_a;
       get_datetime(&val_a);
       MYSQL_TIME val_b;
@@ -3177,7 +3286,7 @@ int Json_wrapper::compare(const Json_wrapper &other) const
     return cmp;
   case Json_dom::J_NULL:
     // Null is always equal to other nulls.
-    DBUG_ASSERT(this_type == other_type);
+    assert(this_type == other_type);
     return 0;
   case Json_dom::J_ERROR:
     break;
diff --git a/sql/json_dom.h b/sql/json_dom.h
index af5d4c6be863..14d120fe838e 100644
--- a/sql/json_dom.h
+++ b/sql/json_dom.h
@@ -1,16 +1,23 @@
 #ifndef JSON_DOM_INCLUDED
 #define JSON_DOM_INCLUDED
 
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -441,6 +448,15 @@ class Json_object : public Json_dom
   */
   bool remove(const Json_dom *child);
 
+  /**
+    Remove the child element addressed by key. The removed child is deleted.
+
+    @param key the key of the element to remove
+    @retval true if an element was removed
+    @retval false if there was no element with that key
+  */
+  bool remove(const std::string &key);
+
   /**
     @return The number of elements in the JSON object.
   */
@@ -473,6 +489,30 @@ class Json_object : public Json_dom
 
   /// Returns a const_iterator that refers past the last element.
   const_iterator end() const { return m_map.end(); }
+
+  /**
+    Implementation of the MergePatch function specified in RFC 7396:
+
+        define MergePatch(Target, Patch):
+          if Patch is an Object:
+            if Target is not an Object:
+              Target = {} # Ignore the contents and set it to an empty Object
+            for each Key/Value pair in Patch:
+              if Value is null:
+                if Key exists in Target:
+                  remove the Key/Value pair from Target
+              else:
+                Target[Key] = MergePatch(Target[Key], Value)
+            return Target
+          else:
+            return Patch
+
+    @param patch  The object that describes the patch. The ownership of the
+                  patch object is transferred to the target object.
+    @retval false on success
+    @retval true on memory allocation error
+  */
+  bool merge_patch(Json_object *patch);
 };
 
 
@@ -592,6 +632,7 @@ class Json_array : public Json_dom
   */
   Json_dom *operator[](size_t index) const
   {
+    assert(m_v[index]->parent() == this);
     return m_v[index];
   }
 
@@ -1106,9 +1147,7 @@ class Json_wrapper : Sql_alloc
   bool m_is_dom;      //!< Wraps a DOM iff true
   bool m_dom_alias;   //!< If true, don't deallocate in destructor
   json_binary::Value m_value;
-  const char *m_id;   //!< Unused for now
   Json_dom *m_dom_value;
-  String m_tmp;       //!< Area for building binary value from DOM
 
   /**
     Get the wrapped datetime value in the packed format.
@@ -1124,8 +1163,8 @@ class Json_wrapper : Sql_alloc
   /**
     Create an empty wrapper. Cf ::empty().
   */
-  Json_wrapper() : m_is_dom(true), m_dom_alias(true), m_value(),
-                   m_id(NULL), m_dom_value(NULL)
+  Json_wrapper()
+    : m_is_dom(true), m_dom_alias(true), m_value(), m_dom_value(NULL)
   {}
 
   using Sql_alloc::operator new;
@@ -1185,13 +1224,6 @@ class Json_wrapper : Sql_alloc
   */
   Json_wrapper &operator=(const Json_wrapper &old);
 
-  /**
-    @param[in] value  the binary JSON value to wrap
-    @param[in] id     the pointer into the original field containing the
-                      binary JSON value.  This allows caching any DOMs
-                      built for the query, to avoid rebuilding it.
-  */
-  Json_wrapper(const json_binary::Value &value, const char *id);
   ~Json_wrapper();
 
   /**
@@ -1221,13 +1253,12 @@ class Json_wrapper : Sql_alloc
 
   /**
     Get the wrapped contents in binary value form.
-    The lifetime is same as that of the wrapped value iff the wrapper
-    wraps a binary value. If it is a DOM, the lifetime is the
-    same as that of the wrapper.
 
-    @return the binary value.
+    @param[in,out] str  a string that will be filled with the binary value
+    @retval false on success
+    @retval true  on error
   */
-  json_binary::Value to_value();
+  bool to_binary(String *str) const;
 
   /**
     Format the JSON value to an external JSON string in buffer in
@@ -1244,6 +1275,20 @@ class Json_wrapper : Sql_alloc
   */
   bool to_string(String *buffer, bool json_quoted, const char *func_name) const;
 
+  /**
+    Format the JSON value to an external JSON string in buffer in the format of
+    ISO/IEC 10646. Add newlines and indentation for readability.
+
+    @param[in,out] buffer     the buffer that receives the formatted string
+                              (the string is appended, so make sure the length
+                              is set correctly before calling)
+    @param[in]     func_name  the name of the calling function
+
+    @retval false on success
+    @retval true on error
+  */
+  bool to_pretty_string(String *buffer, const char *func_name) const;
+
   // Accessors
 
   /**
diff --git a/sql/json_path.cc b/sql/json_path.cc
index 9b430dc5d0db..dac1c045a29d 100644
--- a/sql/json_path.cc
+++ b/sql/json_path.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -153,7 +160,7 @@ bool Json_path_clone::set(Json_seekable_path *source)
 
 const Json_path_leg *Json_path_clone::pop()
 {
-  DBUG_ASSERT(m_path_legs.size() > 0);
+  assert(m_path_legs.size() > 0);
   const Json_path_leg *p= m_path_legs.back();
   m_path_legs.pop_back();
   return p;
@@ -214,7 +221,7 @@ bool Json_path::append(const Json_path_leg &leg)
 
 Json_path_leg Json_path::pop()
 {
-  DBUG_ASSERT(m_path_legs.size() > 0);
+  assert(m_path_legs.size() > 0);
   Json_path_leg p= m_path_legs.back();
   m_path_legs.pop_back();
   return p;
diff --git a/sql/json_path.h b/sql/json_path.h
index d176dfabb955..c02beb22ed40 100644
--- a/sql/json_path.h
+++ b/sql/json_path.h
@@ -1,16 +1,23 @@
 #ifndef SQL_JSON_PATH_INCLUDED
 #define SQL_JSON_PATH_INCLUDED
 
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/key.cc b/sql/key.cc
index a1f1b85f924f..b195e8aac87f 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -559,8 +566,8 @@ int key_cmp2(KEY_PART_INFO *key_part,
                  const uchar *key1, uint key1_length,
                  const uchar *key2, uint key2_length)
 {
-  DBUG_ASSERT(key_part && key1 && key2);
-  DBUG_ASSERT((key1_length == key2_length) && key1_length != 0 );
+  assert(key_part && key1 && key2);
+  assert((key1_length == key2_length) && key1_length != 0 );
   uint store_length;
 
   /* Compare all the subkeys (if it is a composite key) */
@@ -659,8 +666,8 @@ int key_rec_cmp(KEY **key, uchar *first_rec, uchar *second_rec)
   DBUG_ENTER("key_rec_cmp");
 
   /* Assert that at least the first key part is read. */
-  DBUG_ASSERT(bitmap_is_set(key_info->table->read_set,
-                            key_info->key_part->field->field_index));
+  assert(bitmap_is_set(key_info->table->read_set,
+                       key_info->key_part->field->field_index));
   /* loop over all given keys */
   do
   {
diff --git a/sql/key.h b/sql/key.h
index 8654679f17a9..165f8b6c3705 100644
--- a/sql/key.h
+++ b/sql/key.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -149,7 +156,7 @@ typedef struct st_key {
 
   bool has_records_per_key(uint key_part_no) const
   {
-    DBUG_ASSERT(key_part_no < actual_key_parts);
+    assert(key_part_no < actual_key_parts);
 
     return ((rec_per_key_float && rec_per_key_float[key_part_no] !=
              REC_PER_KEY_UNKNOWN) || 
@@ -172,7 +179,7 @@ typedef struct st_key {
 
   rec_per_key_t records_per_key(uint key_part_no) const
   {
-    DBUG_ASSERT(key_part_no < actual_key_parts);
+    assert(key_part_no < actual_key_parts);
 
     /*
       If the storage engine has provided rec per key estimates as float
@@ -199,10 +206,10 @@ typedef struct st_key {
 
   void set_records_per_key(uint key_part_no, rec_per_key_t rec_per_key_est)
   {
-    DBUG_ASSERT(key_part_no < actual_key_parts);
-    DBUG_ASSERT(rec_per_key_est == REC_PER_KEY_UNKNOWN ||
-                rec_per_key_est >= 1.0);
-    DBUG_ASSERT(rec_per_key_float != NULL);
+    assert(key_part_no < actual_key_parts);
+    assert(rec_per_key_est == REC_PER_KEY_UNKNOWN ||
+           rec_per_key_est >= 1.0);
+    assert(rec_per_key_float != NULL);
 
     rec_per_key_float[key_part_no]= rec_per_key_est;
   }
@@ -256,8 +263,8 @@ typedef struct st_key {
 
   double in_memory_estimate() const
   {
-    DBUG_ASSERT(m_in_memory_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
-                (m_in_memory_estimate >= 0.0 && m_in_memory_estimate <= 1.0));
+    assert(m_in_memory_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
+           (m_in_memory_estimate >= 0.0 && m_in_memory_estimate <= 1.0));
 
     return m_in_memory_estimate;
   }
@@ -272,8 +279,8 @@ typedef struct st_key {
 
   void set_in_memory_estimate(double in_memory_estimate)
   {
-    DBUG_ASSERT(in_memory_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
-                (in_memory_estimate >= 0.0 && in_memory_estimate <= 1.0));
+    assert(in_memory_estimate == IN_MEMORY_ESTIMATE_UNKNOWN ||
+           (in_memory_estimate >= 0.0 && in_memory_estimate <= 1.0));
 
     m_in_memory_estimate= in_memory_estimate;
   }
diff --git a/sql/keycaches.cc b/sql/keycaches.cc
index 9888950a798e..47ca714536e5 100644
--- a/sql/keycaches.cc
+++ b/sql/keycaches.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/keycaches.h b/sql/keycaches.h
index aabea3d24b1b..49ed25d5b1a2 100644
--- a/sql/keycaches.h
+++ b/sql/keycaches.h
@@ -1,16 +1,23 @@
 #ifndef KEYCACHES_INCLUDED
 #define KEYCACHES_INCLUDED
 
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/keyring_service.cc b/sql/keyring_service.cc
index c145565934db..d9fe9e9e972e 100644
--- a/sql/keyring_service.cc
+++ b/sql/keyring_service.cc
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/sql/lex.h b/sql/lex.h
index 652188e823d3..a2917dfc4ccc 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -1,16 +1,23 @@
 #ifndef LEX_INCLUDED
 #define LEX_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -704,6 +711,8 @@ static const SYMBOL symbols[] = {
   { SYM_FN("DATE_SUB",              DATE_SUB_INTERVAL)},
   { SYM_FN("EXTRACT",               EXTRACT_SYM)},
   { SYM_FN("GROUP_CONCAT",          GROUP_CONCAT_SYM)},
+  { SYM_FN("JSON_OBJECTAGG",        JSON_OBJECTAGG)},
+  { SYM_FN("JSON_ARRAYAGG",         JSON_ARRAYAGG)},
   { SYM_FN("MAX",                   MAX_SYM)},
   { SYM_FN("MID",                   SUBSTRING)}, /* unireg function */
   { SYM_FN("MIN",                   MIN_SYM)},
diff --git a/sql/lex_symbol.h b/sql/lex_symbol.h
index cbad0a6b8123..d81b52ca7a19 100644
--- a/sql/lex_symbol.h
+++ b/sql/lex_symbol.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/lock.cc b/sql/lock.cc
index a4b64894c487..42625ef1cf89 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -131,7 +138,7 @@ lock_tables_check(THD *thd, TABLE **tables, size_t count, uint flags)
     TABLE *t= tables[i];
 
     /* Protect against 'fake' partially initialized TABLE_SHARE */
-    DBUG_ASSERT(t->s->table_category != TABLE_UNKNOWN_CATEGORY);
+    assert(t->s->table_category != TABLE_UNKNOWN_CATEGORY);
 
     /*
       Table I/O to performance schema tables is performed
@@ -175,11 +182,11 @@ lock_tables_check(THD *thd, TABLE **tables, size_t count, uint flags)
       type. For table to be locked for read we must own metadata lock
       of MDL_SHARED_READ or stronger type).
     */
-    DBUG_ASSERT(t->s->tmp_table ||
-                thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                   t->s->db.str, t->s->table_name.str,
-                                   t->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE ?
-                                   MDL_SHARED_WRITE : MDL_SHARED_READ));
+    assert(t->s->tmp_table ||
+           thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                        t->s->db.str, t->s->table_name.str,
+                                                        t->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE ?
+                                                        MDL_SHARED_WRITE : MDL_SHARED_READ));
 
     /*
       Prevent modifications to base tables if READ_ONLY is activated.
@@ -379,7 +386,7 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
   DBUG_PRINT("info", ("count %d", count));
   for (i=1 ; i <= count ; i++, tables++)
   {
-    DBUG_ASSERT((*tables)->reginfo.lock_type >= TL_READ);
+    assert((*tables)->reginfo.lock_type >= TL_READ);
     lock_type=F_WRLCK;				/* Lock exclusive */
     if ((*tables)->db_stat & HA_READ_ONLY ||
 	((*tables)->reginfo.lock_type >= TL_READ &&
@@ -464,7 +471,7 @@ void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock)
   TABLE **table=sql_lock->table;
   for (i=found=0 ; i < sql_lock->table_count ; i++)
   {
-    DBUG_ASSERT(sql_lock->table[i]->lock_position == i);
+    assert(sql_lock->table[i]->lock_position == i);
     if ((uint) sql_lock->table[i]->reginfo.lock_type > TL_WRITE_ALLOW_WRITE)
     {
       swap_variables(TABLE *, *table, sql_lock->table[i]);
@@ -516,7 +523,7 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
         TABLE *tbl;
         uint lock_data_end;
 
-        DBUG_ASSERT(table->lock_position == i);
+        assert(table->lock_position == i);
 
         /* Unlock the table. */
         mysql_unlock_some_tables(thd, &table, /* table count */ 1);
@@ -551,7 +558,7 @@ void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table)
         {
           tbl= locked->table[j];
           tbl->lock_position--;
-          DBUG_ASSERT(tbl->lock_position == j);
+          assert(tbl->lock_position == j);
           tbl->lock_data_start-= removed_locks;
         }
 
@@ -695,7 +702,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, size_t count,
   TABLE **to, **table_buf;
   DBUG_ENTER("get_lock_data");
 
-  DBUG_ASSERT((flags == GET_LOCK_UNLOCK) || (flags == GET_LOCK_STORE_LOCKS));
+  assert((flags == GET_LOCK_UNLOCK) || (flags == GET_LOCK_STORE_LOCKS));
   DBUG_PRINT("info", ("count %zu", count));
 
   for (i=tables=lock_count=0 ; i < count ; i++)
@@ -735,8 +742,8 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, size_t count,
     if ((table=table_ptr[i])->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
       continue;
     lock_type= table->reginfo.lock_type;
-    DBUG_ASSERT(lock_type != TL_WRITE_DEFAULT && lock_type != TL_READ_DEFAULT &&
-                lock_type != TL_WRITE_CONCURRENT_DEFAULT);
+    assert(lock_type != TL_WRITE_DEFAULT && lock_type != TL_READ_DEFAULT &&
+           lock_type != TL_WRITE_CONCURRENT_DEFAULT);
     locks_start= locks;
     locks= table->file->store_lock(thd, locks,
                                    (flags & GET_LOCK_UNLOCK) ? TL_IGNORE :
@@ -822,6 +829,13 @@ bool lock_schema_name(THD *thd, const char *db)
                                      thd->variables.lock_wait_timeout))
     return TRUE;
 
+  /*
+    Now when we have protection against concurrent change of read_only
+    option we can safely re-check its value.
+  */
+  if (check_readonly(thd, true))
+    return TRUE;
+
   DEBUG_SYNC(thd, "after_wait_locked_schema_name");
   return FALSE;
 }
@@ -874,6 +888,13 @@ bool lock_tablespace_name(THD *thd, const char *tablespace)
                                      thd->variables.lock_wait_timeout))
     return true;
 
+  /*
+    Now when we have protection against concurrent change of read_only
+    option we can safely re-check its value.
+  */
+  if (check_readonly(thd, true))
+    return TRUE;
+
   DEBUG_SYNC(thd, "after_wait_locked_tablespace_name");
   return false;
 }
@@ -913,7 +934,7 @@ bool lock_tablespace_names(
   char *tablespace= NULL;
   while ((tablespace= it++))
   {
-    DBUG_ASSERT(strlen(tablespace));
+    assert(strlen(tablespace));
 
     MDL_request *tablespace_request= new (thd->mem_root) MDL_request;
     if (tablespace_request == NULL)
@@ -969,7 +990,7 @@ bool lock_object_name(THD *thd, MDL_key::enum_mdl_namespace mdl_type,
     return TRUE;
   }
 
-  DBUG_ASSERT(name);
+  assert(name);
   DEBUG_SYNC(thd, "before_wait_locked_pname");
 
   if (thd->global_read_lock.can_acquire_protection())
@@ -991,6 +1012,13 @@ bool lock_object_name(THD *thd, MDL_key::enum_mdl_namespace mdl_type,
                                      thd->variables.lock_wait_timeout))
     return TRUE;
 
+  /*
+    Now when we have protection against concurrent change of read_only
+    option we can safely re-check its value.
+  */
+  if (check_readonly(thd, true))
+    return TRUE;
+
   DEBUG_SYNC(thd, "after_wait_locked_pname");
   return FALSE;
 }
@@ -1103,9 +1131,9 @@ bool Global_read_lock::lock_global_read_lock(THD *thd)
   {
     MDL_request mdl_request;
 
-    DBUG_ASSERT(! thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
-                                                               "", "",
-                                                               MDL_SHARED));
+    assert(! thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
+                                                          "", "",
+                                                          MDL_SHARED));
     MDL_REQUEST_INIT(&mdl_request,
                      MDL_key::GLOBAL, "", "", MDL_SHARED, MDL_EXPLICIT);
 
@@ -1148,7 +1176,7 @@ void Global_read_lock::unlock_global_read_lock(THD *thd)
 {
   DBUG_ENTER("unlock_global_read_lock");
 
-  DBUG_ASSERT(m_mdl_global_shared_lock && m_state);
+  assert(m_mdl_global_shared_lock && m_state);
 
   if (m_mdl_blocks_commits_lock)
   {
diff --git a/sql/lock.h b/sql/lock.h
index 72a9b955f56f..3039ca5ff1d7 100644
--- a/sql/lock.h
+++ b/sql/lock.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/locking_service.cc b/sql/locking_service.cc
index 32f08ed69d88..ccb6b6313993 100644
--- a/sql/locking_service.cc
+++ b/sql/locking_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/locking_service.def b/sql/locking_service.def
index 760a33b905dc..66c62ab6be15 100644
--- a/sql/locking_service.def
+++ b/sql/locking_service.def
@@ -1,13 +1,20 @@
-; Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+; Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 ;
 ; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; version 2 of the License.
+; it under the terms of the GNU General Public License, version 2.0,
+; as published by the Free Software Foundation.
+;
+; This program is also distributed with certain software (including
+; but not limited to OpenSSL) that is licensed under separate terms,
+; as designated in a particular file or component or in included license
+; documentation.  The authors of MySQL hereby grant you an additional
+; permission to link the program and your derivative works with the
+; separately licensed software that they have included with MySQL.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
+; GNU General Public License, version 2.0, for more details.
 ;
 ; You should have received a copy of the GNU General Public License
 ; along with this program; if not, write to the Free Software
diff --git a/sql/locking_service.h b/sql/locking_service.h
index 4b3259a49c0a..10f6155d9a89 100644
--- a/sql/locking_service.h
+++ b/sql/locking_service.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/locking_service_udf.cc b/sql/locking_service_udf.cc
index 6643275c7e96..4a069f436122 100644
--- a/sql/locking_service_udf.cc
+++ b/sql/locking_service_udf.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/locks/shared_spin_lock.cc b/sql/locks/shared_spin_lock.cc
new file mode 100644
index 000000000000..88e8676c8370
--- /dev/null
+++ b/sql/locks/shared_spin_lock.cc
@@ -0,0 +1,325 @@
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <iostream>
+#include <map>
+#include <memory>
+
+#include "locks/shared_spin_lock.h"
+
+lock::Shared_spin_lock::Guard::Guard(
+    lock::Shared_spin_lock &target,
+    lock::Shared_spin_lock::enum_lock_acquisition acquisition,
+    bool try_and_fail)
+    : m_target(target), m_acquisition(Shared_spin_lock::SL_NO_ACQUISITION)
+{
+  if (acquisition != Shared_spin_lock::SL_NO_ACQUISITION)
+  {
+    this->acquire(acquisition, try_and_fail);
+  }
+}
+
+lock::Shared_spin_lock::Guard::~Guard() { this->release(); }
+
+lock::Shared_spin_lock *lock::Shared_spin_lock::Guard::operator->()
+{
+  return &this->m_target;
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::Guard::operator*()
+{
+  return this->m_target;
+}
+
+lock::Shared_spin_lock::Guard &lock::Shared_spin_lock::Guard::acquire(
+    enum_lock_acquisition acquisition, bool try_and_fail)
+{
+  assert(this->m_acquisition == Shared_spin_lock::SL_NO_ACQUISITION);
+  assert(acquisition == Shared_spin_lock::SL_SHARED ||
+         acquisition == Shared_spin_lock::SL_EXCLUSIVE);
+
+  this->m_acquisition= acquisition;
+
+  switch (this->m_acquisition)
+  {
+    case Shared_spin_lock::SL_SHARED:
+    {
+      if (try_and_fail)
+      {
+        this->m_target.try_shared();
+        if (!this->m_target.is_shared_acquisition())
+        {
+          this->m_acquisition= Shared_spin_lock::SL_NO_ACQUISITION;
+        }
+      }
+      else
+      {
+        this->m_target.acquire_shared();
+      }
+      break;
+    }
+    case Shared_spin_lock::SL_EXCLUSIVE:
+    {
+      if (try_and_fail)
+      {
+        this->m_target.try_exclusive();
+        if (!this->m_target.is_exclusive_acquisition())
+        {
+          this->m_acquisition= Shared_spin_lock::SL_NO_ACQUISITION;
+        }
+      }
+      else
+      {
+        this->m_target.acquire_exclusive();
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return (*this);
+}
+
+lock::Shared_spin_lock::Guard &lock::Shared_spin_lock::Guard::release()
+{
+  if (this->m_acquisition == Shared_spin_lock::SL_NO_ACQUISITION)
+  {
+    return (*this);
+  }
+  switch (this->m_acquisition)
+  {
+    case Shared_spin_lock::SL_SHARED:
+    {
+      this->m_target.release_shared();
+      this->m_acquisition= Shared_spin_lock::SL_NO_ACQUISITION;
+      break;
+    }
+    case Shared_spin_lock::SL_EXCLUSIVE:
+    {
+      this->m_target.release_exclusive();
+      this->m_acquisition= Shared_spin_lock::SL_NO_ACQUISITION;
+      break;
+    }
+    default:
+      break;
+  }
+  return (*this);
+}
+
+lock::Shared_spin_lock::Guard::Guard(const Shared_spin_lock::Guard &rhs)
+    : m_target(rhs.m_target)
+{
+}
+
+lock::Shared_spin_lock::Guard &lock::Shared_spin_lock::Guard::operator=(
+    Shared_spin_lock::Guard const &)
+{
+  return (*this);
+}
+
+lock::Shared_spin_lock::Shared_spin_lock()
+    : m_shared_access(0), m_exclusive_access(0), m_exclusive_owner(0)
+{
+}
+
+lock::Shared_spin_lock::~Shared_spin_lock() {}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::acquire_shared()
+{
+  return this->try_or_spin_shared_lock(false);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::acquire_exclusive()
+{
+  return this->try_or_spin_exclusive_lock(false);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::try_shared()
+{
+  return this->try_or_spin_shared_lock(true);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::try_exclusive()
+{
+  return this->try_or_spin_exclusive_lock(true);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::release_shared()
+{
+  assert(my_atomic_load32(&this->m_shared_access) > 0);
+  my_atomic_add32(&this->m_shared_access, -1);
+  return (*this);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::release_exclusive()
+{
+  my_thread_t self= my_thread_self();
+  my_thread_t owner= (my_thread_t)(my_atomic_load64(&this->m_exclusive_owner));
+  assert(self != 0);
+  assert(my_thread_equal(owner, self));
+  if (!my_thread_equal(owner, self)) return (*this);
+
+  if (my_atomic_load32(&this->m_exclusive_access) == 1)
+    my_atomic_store64(&this->m_exclusive_owner, 0);
+
+  assert(my_atomic_load32(&this->m_exclusive_access) > 0);
+  my_atomic_add32(&this->m_exclusive_access, -1);
+  return (*this);
+}
+
+bool lock::Shared_spin_lock::is_shared_acquisition()
+{
+  return my_atomic_load32(&this->m_shared_access) != 0;
+}
+
+bool lock::Shared_spin_lock::is_exclusive_acquisition()
+{
+  if (my_atomic_load32(&this->m_exclusive_access) != 0)
+  {
+    my_thread_t self= my_thread_self();
+    my_thread_t owner=
+        (my_thread_t)(my_atomic_load64(&this->m_exclusive_owner));
+    return my_thread_equal(owner, self);
+  }
+  return false;
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::try_or_spin_shared_lock(
+    bool try_and_fail)
+{
+  if (try_and_fail)
+  {
+    this->try_shared_lock();
+  }
+  else
+  {
+    this->spin_shared_lock();
+  }
+  return (*this);
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::try_or_spin_exclusive_lock(
+    bool try_and_fail)
+{
+  my_thread_t self= my_thread_self();
+  my_thread_t owner= (my_thread_t)(my_atomic_load64(&this->m_exclusive_owner));
+  if (owner != 0 && my_thread_equal(owner, self))
+  {
+    my_atomic_add32(&this->m_exclusive_access, 1);
+    return (*this);
+  }
+
+  if (try_and_fail)
+  {
+    if (!this->try_exclusive_lock())
+    {
+      return (*this);
+    }
+  }
+  else
+  {
+    this->spin_exclusive_lock();
+  }
+#if defined(__APPLE__)
+  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
+#else
+  my_atomic_store64(&this->m_exclusive_owner, self);
+#endif
+  return (*this);
+}
+
+bool lock::Shared_spin_lock::try_shared_lock()
+{
+  if (my_atomic_load32(&this->m_exclusive_access) != 0)
+  {
+    return false;
+  }
+
+  my_atomic_add32(&this->m_shared_access, 1);
+
+  if (my_atomic_load32(&this->m_exclusive_access) != 0)
+  {
+    my_atomic_add32(&this->m_shared_access, -1);
+    return false;
+  }
+  return true;
+}
+
+bool lock::Shared_spin_lock::try_exclusive_lock()
+{
+  int32 expected= 0;
+  if (!my_atomic_cas32(&this->m_exclusive_access, &expected, 1))
+  {
+    return false;
+  }
+  if (my_atomic_load32(&this->m_shared_access) != 0)
+  {
+    my_atomic_store32(&this->m_exclusive_access, 0);
+    return false;
+  }
+  return true;
+}
+
+void lock::Shared_spin_lock::spin_shared_lock()
+{
+  do
+  {
+    if (my_atomic_load32(&this->m_exclusive_access) != 0)
+    {
+      this->yield();
+      continue;
+    }
+
+    my_atomic_add32(&this->m_shared_access, 1);
+
+    if (my_atomic_load32(&this->m_exclusive_access) != 0)
+    {
+      my_atomic_add32(&this->m_shared_access, -1);
+      this->yield();
+      continue;
+    }
+
+    break;
+  } while (true);
+}
+
+void lock::Shared_spin_lock::spin_exclusive_lock()
+{
+  bool success= false;
+  do
+  {
+    int32 expected= 0;
+    success= my_atomic_cas32(&this->m_exclusive_access, &expected, 1);
+    if (!success) this->yield();
+  } while (!success);
+
+  while (my_atomic_load32(&this->m_shared_access) != 0)
+  {
+    this->yield();
+  }
+}
+
+lock::Shared_spin_lock &lock::Shared_spin_lock::yield()
+{
+  my_thread_yield();
+  return (*this);
+}
diff --git a/sql/locks/shared_spin_lock.h b/sql/locks/shared_spin_lock.h
new file mode 100644
index 000000000000..ba89d83c0414
--- /dev/null
+++ b/sql/locks/shared_spin_lock.h
@@ -0,0 +1,286 @@
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef LOCK_SHARED_SPIN_LOCK_INCLUDED
+#define LOCK_SHARED_SPIN_LOCK_INCLUDED
+
+#include "my_thread.h"
+#include "my_thread_local.h"
+#include "my_atomic.h"
+
+/**
+  Provides atomic access in shared-exclusive modes. Shared mode allows for
+  several threads to share lock acquisition. Exclusive mode will allow for
+  a single thread to acquire the lock.
+
+  The implementation also provides re-entrance, meaning that a thread is
+  allowed to acquire the lock in the same mode several times without
+  blocking. Reentrance is symetric, meaning, in the case the lock is
+  acquired several times by the same thread, it should be released the same
+  amount of times.
+
+  Acquisition request priority management is implemented to avoid
+  starvation, meaning:
+
+  1) When no thread is holding the lock, acquisition is granted to the
+     first thread to request it.
+
+  2) If the lock is being held in shared mode and an exclusive acquisition
+     request is made, no more shared or exclusive acquisition requests are
+     granted until the exclusivity request is granted and released.
+
+  The acquisition relation given to concurrent requests is as follows:
+
+                   -------------------------------------------------------------
+                   |              S2             |              E2             |
+                   +-----------------------------+-----------------------------+
+                   |   REQUEST    |   ACQUIRED   |   REQUEST    |   ACQUIRED   |
+  -----------------+--------------+--------------------------------------------+
+  |      | REQUEST |   S1 & S2    |   S1 & S2    |   S1 | E2    |      E2      |
+  |  S1  |---------+--------------+--------------+--------------+--------------+
+  |      | ACQUIRED|   S1 & S2    |   S1 & S2    |      S1      |      -       |
+  -------+---------+--------------+--------------+--------------+--------------+
+  |      | REQUEST |      E1      |      S2      |   E1 | E2    |      E2      |
+  |  E1  |---------+--------------+--------------+--------------+--------------+
+  |      | ACQUIRED|      E1      |      -       |      E1      |      -       |
+  ------------------------------------------------------------------------------
+
+  Legend:
+  - S1: Thread that is requesting or has acquired in shared mode
+  - S2: Thread that is requesting or has acquired in shared mode
+  - E1: Thread that is requesting or has acquired in exclusive mode
+  - E2: Thread that is requesting or has acquired in exclusive mode
+
+
+ */
+namespace lock
+{
+class Shared_spin_lock
+{
+ public:
+  enum enum_lock_acquisition
+  {
+    SL_EXCLUSIVE= 0,
+    SL_SHARED= 1,
+    SL_NO_ACQUISITION= 2
+  };
+
+  /**
+    Sentry class for `Shared_spin_lock` to deliver RAII pattern usability.
+   */
+  class Guard
+  {
+   public:
+    friend class Shared_spin_lock;
+
+    /**
+      Class constructor that receives the target spin-lock, whether or not
+      it can be a shared acquisition and whether or not it should be a
+      try-and-fail lock attempt, instead of a blocking attempt.
+
+      @param target The target spin-lock.
+      @param acquisition the acquisition type, SHARED, EXCLUSIVE or
+             NO_ACQUISITION
+      @param try_and_fail whether or not the lock attempt should be
+                          blocking (only used if acquisition type is SHARED
+                          or EXCLUSIVE).
+     */
+    Guard(Shared_spin_lock &target,
+          enum_lock_acquisition acquisition= lock::Shared_spin_lock::SL_SHARED,
+          bool try_and_fail= false);
+    /**
+      Destructor for the sentry. It will release any acquisition, shared or
+      exclusive.
+     */
+    virtual ~Guard();
+
+    /**
+      Arrow operator to access the underlying lock.
+
+      @return A pointer to the underlying lock.
+     */
+    Shared_spin_lock *operator->();
+    /**
+      Star operator to access the underlying lock.
+
+      @return A refernce to the underlying lock.
+     */
+    Shared_spin_lock &operator*();
+    /**
+      If this instance was initialized without acquiring the lock
+      (`NO_ACQUISITION ` passed to constructor) or the acquisition request
+      wasn't granted (passing `try_and_fail = true` to the constructor),
+      invoking this method will try to acquire the lock in the provided
+      mode.
+
+      @param acquisition the acquisition type, SHARED or EXCLUSIVE
+      @param try_and_fail whether or not the lock attempt should be
+                          blocking
+
+      @return A reference to `this` object, for chaining purposes.
+     */
+    Shared_spin_lock::Guard &acquire(enum_lock_acquisition acquisition,
+                                     bool try_and_fail= false);
+    /**
+      Releases the underlying lock acquisition, if any.
+
+      @return A reference to `this` object, for chaining purposes.
+     */
+    Shared_spin_lock::Guard &release();
+
+   private:
+    /** The underlying lock */
+    Shared_spin_lock &m_target;
+    /** The type of lock acquisition to be requested */
+    enum_lock_acquisition m_acquisition;
+
+    // Delete copy and move constructors
+    Guard(Shared_spin_lock::Guard const &);
+    //
+    // Delete copy and move operators
+    Shared_spin_lock::Guard &operator=(Shared_spin_lock::Guard const &);
+    //
+  };
+  friend class Shared_spin_lock::Guard;
+
+  /**
+    Default class constructor.
+   */
+  Shared_spin_lock();
+  /**
+    Default class destructor.
+   */
+  virtual ~Shared_spin_lock();
+
+  /**
+    Blocks until the lock is acquired in shared mode.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &acquire_shared();
+  /**
+    Blocks until the lock is acquired in exclusive mode.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &acquire_exclusive();
+  /**
+    Tries to acquire the lock in shared mode.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &try_shared();
+  /**
+    Tries to acquire the lock in exclusive mode.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &try_exclusive();
+  /**
+    Releases the previously granted shared acquisition request.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &release_shared();
+  /**
+    Releases the previously granted exclusive acquisition request.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &release_exclusive();
+  /**
+    Returns whether the lock is acquired for shared access by the invoking
+    thread.
+
+    @return true if the lock was acquired in shared mode by the invoking
+            thread
+   */
+  bool is_shared_acquisition();
+  /**
+    Returns whether the lock is acquired for exclusive access by the
+    invoking thread.
+
+    @return true if the lock was acquired in exclusive mode by the invoking
+            thread
+   */
+  bool is_exclusive_acquisition();
+
+ private:
+  /** The total amount of threads accessing in shared mode  */
+  int32 m_shared_access;
+  /** Whether or not any thread is accessing in or waiting for exclusive mode */
+  int32 m_exclusive_access;
+  /** The identifier of the thread holding exclusive mode */
+  int64 m_exclusive_owner;
+
+  /**
+    Tries to lock or waits for locking in shared mode and increases the
+    thread-local lock acquisition shared counter.
+
+    @param try_and_fail Whether or not to try to lock of wait for acquiring.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &try_or_spin_shared_lock(bool try_and_fail);
+  /**
+    Tries to lock or waits for locking in shared mode and increases the
+    thread-local lock acquisition shared counter.
+
+    @param try_and_fail Whether or not to try to lock of wait for acquiring.
+
+    @return A reference to `this` object, for chaining purposes.
+   */
+  Shared_spin_lock &try_or_spin_exclusive_lock(bool try_and_fail);
+  /**
+    Tries to acquire in shared mode.
+
+    @return `true` if the attempt to acquire the lock in shared mode was
+            successful.
+   */
+  bool try_shared_lock();
+  /**
+    Tries to acquire in exclusive mode.
+
+    @return `true` if the attempt to acquire the lock in exclusive mode was
+            successful.
+   */
+  bool try_exclusive_lock();
+  /**
+    Blocks until the lock is acquired in shared mode.
+   */
+  void spin_shared_lock();
+  /**
+    Blocks until the lock is acquired in exclusive mode.
+   */
+  void spin_exclusive_lock();
+  /**
+    Controls the thread spinning while waiting for resources. It performs a
+    scheduled yield, notifying that the thread available for being scheduled
+    out.
+
+    @return a reference to this object, for chaining purposes.
+  */
+  Shared_spin_lock &yield();
+};
+}  // namespace lock
+
+#endif  // LOCK_SHARED_SPIN_LOCK_INCLUDED
diff --git a/sql/log.cc b/sql/log.cc
index e9b43a66a252..1d452d591f98 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -47,20 +54,12 @@
 using std::min;
 using std::max;
 
-/* max size of log messages (error log, plugins' logging, general log) */
-static const uint MAX_LOG_BUFFER_SIZE= 1024;
-
-
 #ifndef _WIN32
 static int   log_syslog_facility= 0;
 #endif
 static char *log_syslog_ident   = NULL;
 static bool  log_syslog_enabled = false;
 
-
-/* 26 for regular timestamp, plus 7 (".123456") when using micro-seconds */
-static const int iso8601_size= 33;
-
 enum enum_slow_query_log_table_field
 {
   SQLT_FIELD_START_TIME = 0,
@@ -315,7 +314,7 @@ bool log_syslog_update_settings()
 
     SYSLOG_FACILITY rsf = { LOG_DAEMON, "daemon" };
 
-    DBUG_ASSERT(opt_log_syslog_facility != NULL);
+    assert(opt_log_syslog_facility != NULL);
 
     if (log_syslog_find_facility(opt_log_syslog_facility, &rsf))
     {
@@ -446,8 +445,8 @@ bool log_syslog_init(void)
 
 static void ull2timeval(ulonglong utime, struct timeval *tv)
 {
-  DBUG_ASSERT(tv != NULL);
-  DBUG_ASSERT(utime > 0);      /* should hold true in this context */
+  assert(tv != NULL);
+  assert(utime > 0);      /* should hold true in this context */
   tv->tv_sec= static_cast<long>(utime / 1000000);
   tv->tv_usec=utime % 1000000;
 }
@@ -464,7 +463,7 @@ static void ull2timeval(ulonglong utime, struct timeval *tv)
   @return          length of timestamp (excluding \0)
 */
 
-static int make_iso8601_timestamp(char *buf, ulonglong utime= 0)
+int make_iso8601_timestamp(char *buf, ulonglong utime)
 {
   struct tm  my_tm;
   char       tzinfo[7]="Z";  // max 6 chars plus \0
@@ -483,16 +482,24 @@ static int make_iso8601_timestamp(char *buf, ulonglong utime= 0)
   {
     localtime_r(&seconds, &my_tm);
 
-#ifdef __FreeBSD__
+#ifdef HAVE_TM_GMTOFF
     /*
       The field tm_gmtoff is the offset (in seconds) of the time represented
       from UTC, with positive values indicating east of the Prime Meridian.
+      Originally a BSDism, this is also supported in glibc, so this should
+      cover the majority of our platforms.
     */
     long tim= -my_tm.tm_gmtoff;
-#elif _WIN32
-    long tim = _timezone;
 #else
-    long tim= timezone; // seconds West of UTC.
+    /*
+       Work this out "manually".
+    */
+    struct tm my_gm;
+    long tim, gm;
+    gmtime_r(&seconds, &my_gm);
+    gm = (my_gm.tm_sec + 60 * (my_gm.tm_min + 60 * my_gm.tm_hour));
+    tim = (my_tm.tm_sec + 60 * (my_tm.tm_min + 60 * my_tm.tm_hour));
+    tim = gm - tim;
 #endif
     char dir= '-';
 
@@ -566,9 +573,9 @@ static File mysql_file_real_name_reopen(File file,
                                         const char *opened_file_name,
                                         char *real_file_name)
 {
-  DBUG_ASSERT(file);
-  DBUG_ASSERT(opened_file_name);
-  DBUG_ASSERT(real_file_name);
+  assert(file);
+  assert(opened_file_name);
+  assert(real_file_name);
 
 #ifdef _WIN32
   /* On Windows, O_NOFOLLOW is not supported. Verify real path from fd. */
@@ -627,8 +634,8 @@ bool File_query_log::open()
   else if (m_log_type == QUERY_LOG_GENERAL)
     log_name= opt_general_logname;
   else
-    DBUG_ASSERT(false);
-  DBUG_ASSERT(log_name && log_name[0]);
+    assert(false);
+  assert(log_name && log_name[0]);
 
   write_error= false;
 
@@ -790,7 +797,7 @@ bool File_query_log::write_general(ulonglong event_utime,
   size_t length= 0;
 
   mysql_mutex_lock(&LOCK_log);
-  DBUG_ASSERT(is_open());
+  assert(is_open());
 
   /* Note that my_b_write() assumes it knows the length for this */
   char local_time_buff[iso8601_size];
@@ -844,7 +851,7 @@ bool File_query_log::write_slow(THD *thd, ulonglong current_utime,
   end= buff;
 
   mysql_mutex_lock(&LOCK_log);
-  DBUG_ASSERT(is_open());
+  assert(is_open());
 
   if (!(specialflag & SPECIAL_SHORT_LOG_FORMAT))
   {
@@ -1014,7 +1021,7 @@ bool Log_to_csv_event_handler::log_general(THD *thd, ulonglong event_utime,
     default value (which is CURRENT_TIMESTAMP).
   */
 
-  DBUG_ASSERT(table->field[GLT_FIELD_EVENT_TIME]->type() == MYSQL_TYPE_TIMESTAMP);
+  assert(table->field[GLT_FIELD_EVENT_TIME]->type() == MYSQL_TYPE_TIMESTAMP);
   ull2timeval(event_utime, &tv);
   table->field[GLT_FIELD_EVENT_TIME]->store_timestamp(&tv);
 
@@ -1132,7 +1139,7 @@ bool Log_to_csv_event_handler::log_slow(THD *thd, ulonglong current_utime,
   restore_record(table, s->default_values);    // Get empty record
 
   /* store the time and user values */
-  DBUG_ASSERT(table->field[SQLT_FIELD_START_TIME]->type() == MYSQL_TYPE_TIMESTAMP);
+  assert(table->field[SQLT_FIELD_START_TIME]->type() == MYSQL_TYPE_TIMESTAMP);
   ull2timeval(current_utime, &tv);
   table->field[SQLT_FIELD_START_TIME]->store_timestamp(&tv);
 
@@ -1277,7 +1284,7 @@ bool Log_to_csv_event_handler::activate_log(THD *thd,
                               SLOW_LOG_NAME.str, TL_WRITE_CONCURRENT_INSERT);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
   Open_tables_backup open_tables_backup;
@@ -1342,7 +1349,7 @@ void Query_logger::cleanup()
 {
   mysql_rwlock_destroy(&LOCK_logger);
 
-  DBUG_ASSERT(file_log_handler);
+  assert(file_log_handler);
   file_log_handler->cleanup();
   delete file_log_handler;
   file_log_handler= NULL;
@@ -1352,7 +1359,7 @@ void Query_logger::cleanup()
 bool Query_logger::slow_log_write(THD *thd, const char *query,
                                   size_t query_length)
 {
-  DBUG_ASSERT(thd->enable_slow_log && opt_slow_log);
+  assert(thd->enable_slow_log && opt_slow_log);
 
   if (!(*slow_log_handler_list))
     return false;
@@ -1574,7 +1581,7 @@ void Query_logger::init_query_log(enum_log_table_type log_type,
     }
   }
   else
-    DBUG_ASSERT(false);
+    assert(false);
 }
 
 
@@ -1663,7 +1670,7 @@ char *make_query_log_name(char *buff, enum_log_table_type log_type)
   else if (log_type == QUERY_LOG_SLOW)
     log_ext= "-slow.log";
   else
-    DBUG_ASSERT(false);
+    assert(false);
 
   strmake(buff, default_logfile_name, FN_REFLEN-5);
   return fn_format(buff, buff, mysql_real_data_home, log_ext,
@@ -1683,6 +1690,10 @@ bool log_slow_applicable(THD *thd)
   if (unlikely(thd->in_sub_stmt))
     DBUG_RETURN(false);                         // Don't set time for sub stmt
 
+  if (unlikely(thd->is_error()) &&
+      (unlikely(thd->get_stmt_da()->mysql_errno() == ER_PARSE_ERROR)))
+    DBUG_RETURN(false);
+
   /*
     Do not log administrative statements unless the appropriate option is
     set.
@@ -1713,10 +1724,10 @@ void log_slow_do(THD *thd)
   THD_STAGE_INFO(thd, stage_logging_slow_query);
   thd->status_var.long_query_count++;
 
-  if (thd->rewritten_query.length())
+  if (thd->rewritten_query().length())
     query_logger.slow_log_write(thd,
-                                thd->rewritten_query.c_ptr_safe(),
-                                thd->rewritten_query.length());
+                                thd->rewritten_query().ptr(),
+                                thd->rewritten_query().length());
   else
     query_logger.slow_log_write(thd, thd->query().str, thd->query().length);
 }
@@ -1973,15 +1984,15 @@ void flush_error_log_messages()
 
 void init_error_log()
 {
-  DBUG_ASSERT(!error_log_initialized);
+  assert(!error_log_initialized);
   mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, MY_MUTEX_INIT_FAST);
   error_log_initialized= true;
 }
 
 
-bool open_error_log(const char *filename)
+bool open_error_log(const char *filename, bool get_lock)
 {
-  DBUG_ASSERT(filename);
+  assert(filename);
   int retries= 2, errors= 0;
 
   do
@@ -1999,9 +2010,13 @@ bool open_error_log(const char *filename)
   if (errors)
   {
     char errbuf[MYSYS_STRERROR_SIZE];
-    sql_print_error("Could not open file '%s' for error logging: %s",
-                    filename,  my_strerror(errbuf, sizeof(errbuf), errno));
+    if (get_lock)
+      mysql_mutex_unlock(&LOCK_error_log);
+    sql_print_error(ER_DEFAULT(ER_CANT_OPEN_ERROR_LOG), filename,
+                    ": ", my_strerror(errbuf, sizeof(errbuf), errno));
     flush_error_log_messages();
+    if (get_lock)
+      mysql_mutex_lock(&LOCK_error_log);
     return true;
   }
 
@@ -2019,7 +2034,7 @@ bool open_error_log(const char *filename)
 void destroy_error_log()
 {
   // We should have flushed before this...
-  DBUG_ASSERT(!error_log_buffering);
+  assert(!error_log_buffering);
   // ... but play it safe on release builds
   flush_error_log_messages();
   if (error_log_initialized)
@@ -2036,10 +2051,10 @@ bool reopen_error_log()
   if (!error_log_file)
     return false;
   mysql_mutex_lock(&LOCK_error_log);
-  bool result= open_error_log(error_log_file);
+  bool result= open_error_log(error_log_file, true);
   mysql_mutex_unlock(&LOCK_error_log);
   if (result)
-    my_error(ER_UNKNOWN_ERROR, MYF(0));
+    my_error(ER_CANT_OPEN_ERROR_LOG, MYF(0), error_log_file, ".", "");
   return result;
 }
 
@@ -2180,7 +2195,7 @@ int my_plugin_log_message(MYSQL_PLUGIN *plugin_ptr, plugin_log_level level,
   struct st_plugin_int *plugin = static_cast<st_plugin_int *> (*plugin_ptr);
   va_list args;
 
-  DBUG_ASSERT(level >= MY_ERROR_LEVEL || level <= MY_INFORMATION_LEVEL);
+  assert(level >= MY_ERROR_LEVEL || level <= MY_INFORMATION_LEVEL);
 
   switch (level)
   {
diff --git a/sql/log.h b/sql/log.h
index c4fe9c5c0803..67c0943160c3 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -19,6 +26,9 @@
 #include "my_global.h"
 #include "auth/sql_security_ctx.h"  // Security_context
 
+/* max size of log messages (error log, plugins' logging, general log) */
+static const uint MAX_LOG_BUFFER_SIZE= 1024;
+
 struct TABLE_LIST;
 
 ////////////////////////////////////////////////////////////
@@ -102,7 +112,7 @@ class File_query_log
 
   ~File_query_log()
   {
-    DBUG_ASSERT(!is_open());
+    assert(!is_open());
     mysql_mutex_destroy(&LOCK_log);
   }
 
@@ -363,7 +373,7 @@ class Log_to_file_event_handler: public Log_event_handler
   {
     if (log_type == QUERY_LOG_SLOW)
       return &mysql_slow_log;
-    DBUG_ASSERT(log_type == QUERY_LOG_GENERAL);
+    assert(log_type == QUERY_LOG_GENERAL);
     return &mysql_general_log;
   }
 
@@ -428,7 +438,7 @@ class Query_logger
       return (opt_slow_log && (log_output_options & LOG_TABLE));
     else if (log_type == QUERY_LOG_GENERAL)
       return (opt_general_log && (log_output_options & LOG_TABLE));
-    DBUG_ASSERT(false);
+    assert(false);
     return false;                             /* make compiler happy */
   }
 
@@ -902,8 +912,9 @@ void init_error_log();
   have been buffered by calling flush_error_log_messages().
 
   @param filename        Name of error log file
+  @param get_lock        Should we acquire LOCK_error_log?
 */
-bool open_error_log(const char *filename);
+bool open_error_log(const char *filename, bool get_lock);
 
 /**
   Free any error log resources.
@@ -958,4 +969,18 @@ bool log_syslog_find_facility(char *f, SYSLOG_FACILITY *rsf);
 bool log_syslog_init();
 void log_syslog_exit();
 
+/* 26 for regular timestamp, plus 7 (".123456") when using micro-seconds */
+static const int iso8601_size = 33;
+
+/**
+  Make and return an ISO 8601 / RFC 3339 compliant timestamp.
+  Heeds log_timestamps.
+
+  @param buf       A buffer of at least 26 bytes to store the timestamp in
+                   (19 + tzinfo tail + \0)
+  @param seconds   Seconds since the epoch, or 0 for "now"
+
+  @return          length of timestamp (excluding \0)
+*/
+int make_iso8601_timestamp(char *buf, ulonglong utime = 0);
 #endif /* LOG_H */
diff --git a/sql/log_event.cc b/sql/log_event.cc
index df315a9af0c5..d0b6285848d8 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -116,7 +123,7 @@ static const char *HA_ERR(int i)
     This function should only be called in case of an error
     was detected 
    */
-  DBUG_ASSERT(i != 0);
+  assert(i != 0);
   switch (i) {
   case HA_ERR_KEY_NOT_FOUND: return "HA_ERR_KEY_NOT_FOUND";
   case HA_ERR_FOUND_DUPP_KEY: return "HA_ERR_FOUND_DUPP_KEY";
@@ -171,6 +178,7 @@ static const char *HA_ERR(int i)
   case HA_ERR_FK_DEPTH_EXCEEDED : return "HA_ERR_FK_DEPTH_EXCEEDED";
   case HA_ERR_INNODB_READ_ONLY: return "HA_ERR_INNODB_READ_ONLY";
   case HA_ERR_COMPUTE_FAILED: return "HA_ERR_COMPUTE_FAILED";
+  case HA_ERR_FTS_TOO_MANY_NESTED_EXP: return "HA_ERR_FTS_TOO_MANY_NESTED_EXP";
   }
   return "No Error!";
 }
@@ -194,6 +202,8 @@ static void inline slave_rows_error_report(enum loglevel level, int ha_error,
                                            const char *log_name, ulong pos)
 {
   const char *handler_error= (ha_error ? HA_ERR(ha_error) : NULL);
+  bool is_group_replication_applier_channel=
+    channel_map.is_group_replication_channel_name((const_cast<Relay_log_info *>(rli))->get_channel(), true);
   char buff[MAX_SLAVE_ERRMSG], *slider;
   const char *buff_end= buff + sizeof(buff);
   size_t len;
@@ -209,21 +219,45 @@ static void inline slave_rows_error_report(enum loglevel level, int ha_error,
                      " %s, Error_code: %d;", err->message_text(),
                      err->mysql_errno());
   }
-
-  if (ha_error != 0)
-    rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
-                ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
-                "%s handler error %s; "
-                "the event's master log %s, end_log_pos %lu",
-                type, table->s->db.str, table->s->table_name.str,
-                buff, handler_error == NULL ? "<unknown>" : handler_error,
-                log_name, pos);
+  if (is_group_replication_applier_channel)
+  {
+    if (ha_error != 0)
+    {
+      rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
+                  ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
+                  "%s handler error %s",
+                  type, table->s->db.str, table->s->table_name.str,
+                  buff, handler_error == NULL ? "<unknown>" : handler_error);
+    }
+    else
+    {
+      rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
+                  ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
+                  "%s", type, table->s->db.str, table->s->table_name.str,
+                  buff);
+    }
+  }
   else
-    rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
-                ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
-                "%s the event's master log %s, end_log_pos %lu",
-                type, table->s->db.str, table->s->table_name.str,
-                buff, log_name, pos);
+  {
+    if (ha_error != 0)
+    {
+      rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
+                  ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
+                  "%s handler error %s; "
+                  "the event's master log %s, end_log_pos %lu",
+                  type, table->s->db.str, table->s->table_name.str,
+                  buff, handler_error == NULL ? "<unknown>" : handler_error,
+                  log_name, pos);
+    }
+    else
+    {
+      rli->report(level, thd->is_error() ? thd->get_stmt_da()->mysql_errno() :
+                  ER_UNKNOWN_ERROR, "Could not execute %s event on table %s.%s;"
+                  "%s the event's master log %s, end_log_pos %lu",
+                  type, table->s->db.str, table->s->table_name.str,
+                  buff, log_name, pos);
+    }
+  }
 }
 
 static void set_thd_db(THD *thd, const char *db, size_t db_len)
@@ -761,7 +795,7 @@ inline int Log_event::do_apply_event_worker(Slave_worker *w)
 int Log_event::do_update_pos(Relay_log_info *rli)
 {
   int error= 0;
-  DBUG_ASSERT(!rli->belongs_to_client());
+  assert(!rli->belongs_to_client());
   /*
     rli is null when (as far as I (Guilhem) know) the caller is
     Load_log_event::do_apply_event *and* that one is called from
@@ -775,7 +809,7 @@ int Log_event::do_update_pos(Relay_log_info *rli)
     Matz: I don't think we will need this check with this refactoring.
   */
 
-  DBUG_ASSERT(!is_mts_worker(rli->info_thd));
+  assert(!is_mts_worker(rli->info_thd));
 
   if (rli)
     error= rli->stmt_done(common_header->log_pos);
@@ -929,54 +963,63 @@ my_bool Log_event::need_checksum()
     TRUE. It may not be null because FD is always checksummed.
   */
 
-  DBUG_ASSERT(get_type_code() != binary_log::FORMAT_DESCRIPTION_EVENT || ret ||
-              common_header->data_written == 0);
+  assert(get_type_code() != binary_log::FORMAT_DESCRIPTION_EVENT || ret ||
+         common_header->data_written == 0);
 
   if (common_footer->checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF)
     common_footer->checksum_alg= ret ? // calculated value stored
       static_cast<enum_binlog_checksum_alg>(binlog_checksum_options) :
       binary_log::BINLOG_CHECKSUM_ALG_OFF;
 
-  DBUG_ASSERT(!ret ||
-              ((common_footer->checksum_alg ==
-                static_cast<enum_binlog_checksum_alg>(binlog_checksum_options) ||
-               /*
-                  Stop event closes the relay-log and its checksum alg
-                  preference is set by the caller can be different
-                  from the server's binlog_checksum_options.
-               */
-               get_type_code() == binary_log::STOP_EVENT ||
-               /*
-                  Rotate:s can be checksummed regardless of the server's
-                  binlog_checksum_options. That applies to both
-                  the local RL's Rotate and the master's Rotate
-                  which IO thread instantiates via queue_binlog_ver_3_event.
-               */
-               get_type_code() == binary_log::ROTATE_EVENT ||
-               /*
-                  The previous event has its checksum option defined
-                  according to the format description event.
-               */
-               get_type_code() == binary_log::PREVIOUS_GTIDS_LOG_EVENT ||
-               /* FD is always checksummed */
-               get_type_code() == binary_log::FORMAT_DESCRIPTION_EVENT) &&
-               common_footer->checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_OFF));
-
-  DBUG_ASSERT(common_footer->checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
-  DBUG_ASSERT(((get_type_code() != binary_log::ROTATE_EVENT &&
-                get_type_code() != binary_log::STOP_EVENT) ||
-                get_type_code() != binary_log::FORMAT_DESCRIPTION_EVENT) ||
-              event_cache_type == Log_event::EVENT_NO_CACHE);
+  assert(!ret ||
+         ((common_footer->checksum_alg ==
+           static_cast<enum_binlog_checksum_alg>(binlog_checksum_options) ||
+           /*
+             Stop event closes the relay-log and its checksum alg
+             preference is set by the caller can be different
+             from the server's binlog_checksum_options.
+           */
+           get_type_code() == binary_log::STOP_EVENT ||
+           /*
+             Rotate:s can be checksummed regardless of the server's
+             binlog_checksum_options. That applies to both
+             the local RL's Rotate and the master's Rotate
+             which IO thread instantiates via queue_binlog_ver_3_event.
+           */
+           get_type_code() == binary_log::ROTATE_EVENT ||
+           /*
+             The previous event has its checksum option defined
+             according to the format description event.
+           */
+           get_type_code() == binary_log::PREVIOUS_GTIDS_LOG_EVENT ||
+           /* FD is always checksummed */
+           get_type_code() == binary_log::FORMAT_DESCRIPTION_EVENT) &&
+          common_footer->checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_OFF));
+
+  assert(common_footer->checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(((get_type_code() != binary_log::ROTATE_EVENT &&
+           get_type_code() != binary_log::STOP_EVENT) ||
+          get_type_code() != binary_log::FORMAT_DESCRIPTION_EVENT) ||
+         event_cache_type == Log_event::EVENT_NO_CACHE);
 
   DBUG_RETURN(ret);
 }
 
 bool Log_event::wrapper_my_b_safe_write(IO_CACHE* file, const uchar* buf, size_t size)
 {
+  DBUG_EXECUTE_IF("simulate_temp_file_write_error",
+                  {
+                    file->write_pos=file->write_end;
+                    DBUG_SET("+d,simulate_file_write_error");
+                  });
   if (need_checksum() && size != 0)
     crc= checksum_crc32(crc, buf, size);
-
-  return my_b_safe_write(file, buf, size);
+  bool ret = my_b_safe_write(file, buf, size);
+  DBUG_EXECUTE_IF("simulate_temp_file_write_error",
+                  {
+                    DBUG_SET("-d,simulate_file_write_error");
+                  });
+  return ret;
 }
 
 bool Log_event::write_footer(IO_CACHE* file) 
@@ -1000,7 +1043,7 @@ uint32 Log_event::write_header_to_memory(uchar *buf)
   // Query start time
   ulong timestamp= (ulong) get_time();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (DBUG_EVALUATE_IF("inc_event_time_by_1_hour",1,0)  &&
       DBUG_EVALUATE_IF("dec_event_time_by_1_hour",1,0))
   {
@@ -1008,7 +1051,7 @@ uint32 Log_event::write_header_to_memory(uchar *buf)
       This assertion guarantees that these debug flags are not
       used at the same time (they would cancel each other).
     */
-    DBUG_ASSERT(0);
+    assert(0);
   }
   else
   {
@@ -1082,7 +1125,7 @@ bool Log_event::write_header(IO_CACHE* file, size_t event_data_length)
       relay log, we use the (new) my_b_safe_tell().
 
       Note that this raises a question on the correctness of all these
-      DBUG_ASSERT(my_b_tell()=rli->event_relay_log_pos).
+      assert(my_b_tell()=rli->event_relay_log_pos).
 
       If in a transaction, the log_pos which we calculate below is not
       very good (because then my_b_safe_tell() returns start position
@@ -1318,7 +1361,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file,
 #endif
 {
   DBUG_ENTER("Log_event::read_log_event(IO_CACHE *[, mysql_mutex_t *], Format_description_log_event *, my_bool)");
-  DBUG_ASSERT(description_event != 0);
+  assert(description_event != 0);
   char head[LOG_EVENT_MINIMAL_HEADER_LEN];
   /*
     First we only want to read at most LOG_EVENT_MINIMAL_HEADER_LEN, just to
@@ -1350,7 +1393,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file,
   const char *error= 0;
   Log_event *res=  0;
 #if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
-  ulong log_max_allowed_packet;
+  ulong log_max_allowed_packet = 0;
   mysql_get_option(NULL, MYSQL_OPT_MAX_ALLOWED_PACKET,
                    &log_max_allowed_packet);
 #else
@@ -1402,7 +1445,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file,
   UNLOCK_MUTEX;
   if (!res)
   {
-    DBUG_ASSERT(error != 0);
+    assert(error != 0);
     sql_print_error("Error in Log_event::read_log_event(): "
                     "'%s', data_len: %lu, event_type: %d",
 		    error,data_len,head[EVENT_TYPE_OFFSET]);
@@ -1436,7 +1479,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len,
   Log_event* ev= NULL;
   enum_binlog_checksum_alg  alg;
   DBUG_ENTER("Log_event::read_log_event(char *, uint, char **, Format_description_log_event *, my_bool)");
-  DBUG_ASSERT(description_event != 0);
+  assert(description_event != 0);
   DBUG_PRINT("info", ("binlog_version: %d", description_event->binlog_version));
   DBUG_DUMP("data", (unsigned char*) buf, event_len);
 
@@ -1509,7 +1552,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len,
     }
   );
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   binary_log_debug::debug_checksum_test=
     DBUG_EVALUATE_IF("simulate_checksum_test_failure", true, false);
 #endif
@@ -1581,7 +1624,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len,
 
     switch(event_type) {
     case binary_log::QUERY_EVENT:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       binary_log_debug::debug_query_mts_corrupt_db_names=
         DBUG_EVALUATE_IF("query_log_event_mts_corrupt_db_names", true, false);
 #endif
@@ -1590,7 +1633,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len,
       break;
     case binary_log::LOAD_EVENT:
     case binary_log::NEW_LOAD_EVENT:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       binary_log_debug::debug_simulate_invalid_address=
         DBUG_EVALUATE_IF("simulate_invalid_address", true, false);
 #endif
@@ -1600,7 +1643,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len,
       ev = new Rotate_log_event(buf, event_len, description_event);
       break;
     case binary_log::CREATE_FILE_EVENT:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       binary_log_debug::debug_simulate_invalid_address=
         DBUG_EVALUATE_IF("simulate_invalid_address", true, false);
 #endif
@@ -1824,7 +1867,7 @@ void Log_event::print_header(IO_CACHE* file,
                     ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6],
                     ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13],
                     ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
-      DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
+      assert(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
       my_b_write(file, (uchar*) emit_buf, bytes_written);
       ptr += LOG_EVENT_MINIMAL_HEADER_LEN;
       hexdump_from += LOG_EVENT_MINIMAL_HEADER_LEN;
@@ -1854,7 +1897,7 @@ void Log_event::print_header(IO_CACHE* file,
                       "# %8.8lx %-48.48s |%16s|\n",
                       (unsigned long) (hexdump_from + (i & 0xfffffff0)),
                       hex_string, char_string);
-        DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
+        assert(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
 	my_b_write(file, (uchar*) emit_buf, bytes_written);
 	hex_string[0]= 0;
 	char_string[0]= 0;
@@ -1863,7 +1906,7 @@ void Log_event::print_header(IO_CACHE* file,
       }
     }
     *c= '\0';
-    DBUG_ASSERT(hex_string[48] == 0);
+    assert(hex_string[48] == 0);
     
     if (hex_string[0])
     {
@@ -1875,7 +1918,7 @@ void Log_event::print_header(IO_CACHE* file,
                     "# %8.8lx %-48.48s |%s|\n",
                     (unsigned long) (hexdump_from + (i & 0xfffffff0)),
                     hex_string, char_string);
-      DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
+      assert(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
       my_b_write(file, (uchar*) emit_buf, bytes_written);
     }
     /*
@@ -2504,7 +2547,7 @@ void Rows_log_event::print_verbose(IO_CACHE *file,
     break;
   default:
     sql_command= sql_clause1= sql_clause2= NULL;
-    DBUG_ASSERT(0); /* Not possible */
+    assert(0); /* Not possible */
   }
   
   if (!(map= print_event_info->m_table_map.get_table(m_table_id)) ||
@@ -2593,7 +2636,7 @@ void Log_event::print_base64(IO_CACHE* file,
 
   if (base64_encode(ptr, (size_t) size, tmp_str))
   {
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   if (print_event_info->base64_output_mode != BASE64_OUTPUT_DECODE_ROWS)
@@ -2880,12 +2923,12 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
       DBUG_PRINT("info",("gaq_idx= %ld  gaq->size=%ld",
                          gaq->assigned_group_index,
                          gaq->size));
-      DBUG_ASSERT(gaq->assigned_group_index != MTS_WORKER_UNDEF);
-      DBUG_ASSERT(gaq->assigned_group_index < gaq->size);
-      DBUG_ASSERT(gaq->get_job_group(rli->gaq->assigned_group_index)->
-                  group_relay_log_name == NULL);
-      DBUG_ASSERT(rli->last_assigned_worker == NULL ||
-                  !is_mts_db_partitioned(rli));
+      assert(gaq->assigned_group_index != MTS_WORKER_UNDEF);
+      assert(gaq->assigned_group_index < gaq->size);
+      assert(gaq->get_job_group(rli->gaq->assigned_group_index)->
+             group_relay_log_name == NULL);
+      assert(rli->last_assigned_worker == NULL ||
+             !is_mts_db_partitioned(rli));
 
       if (is_s_event || is_gtid_event(this))
       {
@@ -2894,7 +2937,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
         // B-event is appended to the Deferred Array associated with GCAP
         rli->curr_group_da.push_back(job_item);
 
-        DBUG_ASSERT(rli->curr_group_da.size() == 1);
+        assert(rli->curr_group_da.size() == 1);
 
         if (starts_group())
         {
@@ -2934,8 +2977,8 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
         DBUG_RETURN(NULL);
       }
 
-      DBUG_ASSERT(rli->curr_group_da.size() == 2);
-      DBUG_ASSERT(starts_group());
+      assert(rli->curr_group_da.size() == 2);
+      assert(starts_group());
       DBUG_RETURN (ret_worker);
     }
     if (schedule_next_event(this, rli))
@@ -2959,7 +3002,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
                                 rli->get_event_start_pos()};
       rli->curr_group_da.push_back(job_item);
 
-      DBUG_ASSERT(thd->killed);
+      assert(thd->killed);
       DBUG_RETURN(NULL);
     }
     ptr_group->worker_id= ret_worker->id;
@@ -2977,7 +3020,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
       The following assert proves there's the only reason
       for such group.
     */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       bool empty_group_with_gtids= rli->curr_group_seen_begin &&
                                    rli->curr_group_seen_gtid &&
@@ -2995,13 +3038,13 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
         (rli->curr_group_da.back().data->
          get_type_code() == binary_log::DELETE_FILE_EVENT);
 
-      DBUG_ASSERT((!ends_group() ||
-                   (get_type_code() == binary_log::QUERY_EVENT &&
-                    static_cast<Query_log_event*>(this)->
-                    is_query_prefix_match(STRING_WITH_LEN("XA ROLLBACK")))) ||
-                  empty_group_with_gtids ||
-                  (rli->mts_end_group_sets_max_dbs &&
-                   (begin_load_query_event || delete_file_event)));
+      assert((!ends_group() ||
+              (get_type_code() == binary_log::QUERY_EVENT &&
+               static_cast<Query_log_event*>(this)->
+               is_query_prefix_match(STRING_WITH_LEN("XA ROLLBACK")))) ||
+             empty_group_with_gtids ||
+             (rli->mts_end_group_sets_max_dbs &&
+              (begin_load_query_event || delete_file_event)));
     }
 #endif
 
@@ -3051,12 +3094,12 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
         DBUG_RETURN(ret_worker);
       }
       // all temporary tables are transferred from Coordinator in over-max case
-      DBUG_ASSERT(mts_dbs.num != OVER_MAX_DBS_IN_EVENT_MTS || !thd->temporary_tables);
-      DBUG_ASSERT(!strcmp(mts_assigned_partitions[i]->db,
-                          mts_dbs.num != OVER_MAX_DBS_IN_EVENT_MTS ?
-                          mts_dbs.name[i] : all_db));
-      DBUG_ASSERT(ret_worker == mts_assigned_partitions[i]->worker);
-      DBUG_ASSERT(mts_assigned_partitions[i]->usage >= 0);
+      assert(mts_dbs.num != OVER_MAX_DBS_IN_EVENT_MTS || !thd->temporary_tables);
+      assert(!strcmp(mts_assigned_partitions[i]->db,
+                     mts_dbs.num != OVER_MAX_DBS_IN_EVENT_MTS ?
+                     mts_dbs.name[i] : all_db));
+      assert(ret_worker == mts_assigned_partitions[i]->worker);
+      assert(mts_assigned_partitions[i]->usage >= 0);
     }
 
     if ((ptr_group= gaq->get_job_group(rli->gaq->assigned_group_index))->
@@ -3064,10 +3107,10 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
     {
       ptr_group->worker_id= ret_worker->id;
 
-      DBUG_ASSERT(ptr_group->group_relay_log_name == NULL);
+      assert(ptr_group->group_relay_log_name == NULL);
     }
 
-    DBUG_ASSERT(i == mts_dbs.num || mts_dbs.num == OVER_MAX_DBS_IN_EVENT_MTS);
+    assert(i == mts_dbs.num || mts_dbs.num == OVER_MAX_DBS_IN_EVENT_MTS);
   }
   else
   {
@@ -3076,8 +3119,8 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
     {
       ret_worker= rli->last_assigned_worker;
 
-      DBUG_ASSERT(rli->curr_group_assigned_parts.size() > 0 ||
-                  ret_worker->id == 0);
+      assert(rli->curr_group_assigned_parts.size() > 0 ||
+             ret_worker->id == 0);
     }
     else // int_, rand_, user_ var:s, load-data events
     {
@@ -3090,7 +3133,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
             get_type_code() == binary_log::DELETE_FILE_EVENT ||
             is_ignorable_event()))
       {
-        DBUG_ASSERT(!ret_worker);
+        assert(!ret_worker);
 
         llstr(rli->get_event_relay_log_pos(), llbuff);
         my_error(ER_MTS_CANT_PARALLEL, MYF(0),
@@ -3110,12 +3153,12 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
                                 rli->get_event_start_pos()};
       rli->curr_group_da.push_back(job_item);
 
-      DBUG_ASSERT(!ret_worker);
+      assert(!ret_worker);
       DBUG_RETURN (ret_worker);
     }
   }
 
-  DBUG_ASSERT(ret_worker);
+  assert(ret_worker);
   // T-event: Commit, Xid, a DDL query or dml query of B-less group.4
 
   /*
@@ -3131,8 +3174,8 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
       my_strdup(key_memory_log_event, rli->get_group_master_log_name(), MYF(MY_WME));
     ret_worker->master_log_change_notified= true;
 
-    DBUG_ASSERT(!ptr_group->notified);
-#ifndef DBUG_OFF
+    assert(!ptr_group->notified);
+#ifndef NDEBUG
     ptr_group->notified= true;
 #endif
   }
@@ -3173,7 +3216,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
     if (!ptr_group)
       ptr_group= gaq->get_job_group(rli->gaq->assigned_group_index);
 
-    DBUG_ASSERT(ret_worker != NULL);
+    assert(ret_worker != NULL);
 
     /*
       The following two blocks are executed if the worker has not been
@@ -3191,7 +3234,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
         the new relay-log (where the current event is from) name
         delivery to Worker that will receive it in commit_positions().
       */
-      DBUG_ASSERT(ptr_group->group_relay_log_name == NULL);
+      assert(ptr_group->group_relay_log_name == NULL);
 
       ptr_group->group_relay_log_name= (char *)
         my_malloc(key_memory_log_event,
@@ -3200,7 +3243,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
       strcpy(ptr_group->group_relay_log_name,
              rli->get_event_relay_log_name());
 
-      DBUG_ASSERT(ptr_group->group_relay_log_name != NULL);
+      assert(ptr_group->group_relay_log_name != NULL);
 
       ret_worker->relay_log_change_notified= TRUE;
     }
@@ -3232,7 +3275,7 @@ Slave_worker *Log_event::get_slave_worker(Relay_log_info *rli)
     */
     free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     w_rr++;
 #endif
 
@@ -3251,9 +3294,9 @@ int Log_event::apply_gtid_event(Relay_log_info *rli)
     DBUG_RETURN(1);
 
   Log_event* ev= rli->curr_group_da[0].data;
-  DBUG_ASSERT(ev->get_type_code() == binary_log::GTID_LOG_EVENT ||
-              ev->get_type_code() ==
-              binary_log::ANONYMOUS_GTID_LOG_EVENT);
+  assert(ev->get_type_code() == binary_log::GTID_LOG_EVENT ||
+         ev->get_type_code() ==
+         binary_log::ANONYMOUS_GTID_LOG_EVENT);
 
   error= ev->do_apply_event(rli);
   /* Clean up */
@@ -3264,7 +3307,7 @@ int Log_event::apply_gtid_event(Relay_log_info *rli)
     Removes the job from the (G)lobal (A)ssigned (Q)ueue after
     applying it.
   */
-  DBUG_ASSERT(rli->gaq->len > 0);
+  assert(rli->gaq->len > 0);
   Slave_job_group g= Slave_job_group();
   rli->gaq->de_tail(&g);
   /*
@@ -3372,12 +3415,12 @@ int Log_event::apply_event(Relay_log_info *rli)
             rli->current_mts_submode->get_type() ==
             MTS_PARALLEL_TYPE_LOGICAL_CLOCK)
         {
-#ifndef DBUG_OFF
-          DBUG_ASSERT(rli->curr_group_da.size() == 1);
+#ifndef NDEBUG
+          assert(rli->curr_group_da.size() == 1);
           Log_event* ev= rli->curr_group_da[0].data;
-          DBUG_ASSERT(ev->get_type_code() == binary_log::GTID_LOG_EVENT ||
-                      ev->get_type_code() ==
-                      binary_log::ANONYMOUS_GTID_LOG_EVENT);
+          assert(ev->get_type_code() == binary_log::GTID_LOG_EVENT ||
+                 ev->get_type_code() ==
+                 binary_log::ANONYMOUS_GTID_LOG_EVENT);
 #endif
           /*
             With MTS logical clock mode, when coordinator is applying an
@@ -3404,13 +3447,13 @@ int Log_event::apply_event(Relay_log_info *rli)
           Given not in-group mark the event handler can invoke checkpoint
           update routine in the following course.
         */
-        DBUG_ASSERT(rli->mts_group_status == Relay_log_info::MTS_NOT_IN_GROUP
-                    || !is_mts_db_partitioned(rli));
+        assert(rli->mts_group_status == Relay_log_info::MTS_NOT_IN_GROUP
+               || !is_mts_db_partitioned(rli));
 
         if (get_type_code() == binary_log::INCIDENT_EVENT &&
             rli->curr_group_da.size() > 0)
         {
-          DBUG_ASSERT(rli->curr_group_da.size() == 1);
+          assert(rli->curr_group_da.size() == 1);
           /*
             When MTS is enabled, the incident event must be applied by the
             coordinator. So the coordinator applies its GTID right before
@@ -3421,45 +3464,45 @@ int Log_event::apply_event(Relay_log_info *rli)
             DBUG_RETURN(-1);
         }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         /* all Workers are idle as done through wait_for_workers_to_finish */
         for (uint k= 0; k < rli->curr_group_da.size(); k++)
         {
-          DBUG_ASSERT(!(rli->workers[k]->usage_partition));
-          DBUG_ASSERT(!(rli->workers[k]->jobs.len));
+          assert(!(rli->workers[k]->usage_partition));
+          assert(!(rli->workers[k]->jobs.len));
         }
 #endif
       }
       else
       {
-        DBUG_ASSERT(actual_exec_mode == EVENT_EXEC_ASYNC);
+        assert(actual_exec_mode == EVENT_EXEC_ASYNC);
       }
     }
     DBUG_RETURN(do_apply_event(rli));
   }
 
-  DBUG_ASSERT(actual_exec_mode == EVENT_EXEC_PARALLEL);
-  DBUG_ASSERT(!(rli->curr_group_seen_begin && ends_group()) ||
-              /*
-                This is an empty group being processed due to gtids.
-              */
-              (rli->curr_group_seen_begin && rli->curr_group_seen_gtid
-              && ends_group()) || is_mts_db_partitioned(rli) ||
-              rli->last_assigned_worker ||
-              /*
-                Begin_load_query can be logged w/o db info and within
-                Begin/Commit. That's a pattern forcing sequential
-                applying of LOAD-DATA.
-              */
-              (rli->curr_group_da.back().data->
-               get_type_code() == binary_log::BEGIN_LOAD_QUERY_EVENT) ||
-              /*
-                Delete_file can also be logged w/o db info and within
-                Begin/Commit. That's a pattern forcing sequential
-                applying of LOAD-DATA.
-              */
-              (rli->curr_group_da.back().data->
-               get_type_code() == binary_log::DELETE_FILE_EVENT));
+  assert(actual_exec_mode == EVENT_EXEC_PARALLEL);
+  assert(!(rli->curr_group_seen_begin && ends_group()) ||
+         /*
+           This is an empty group being processed due to gtids.
+         */
+         (rli->curr_group_seen_begin && rli->curr_group_seen_gtid
+          && ends_group()) || is_mts_db_partitioned(rli) ||
+         rli->last_assigned_worker ||
+         /*
+           Begin_load_query can be logged w/o db info and within
+           Begin/Commit. That's a pattern forcing sequential
+           applying of LOAD-DATA.
+         */
+         (rli->curr_group_da.back().data->
+          get_type_code() == binary_log::BEGIN_LOAD_QUERY_EVENT) ||
+         /*
+           Delete_file can also be logged w/o db info and within
+           Begin/Commit. That's a pattern forcing sequential
+           applying of LOAD-DATA.
+         */
+         (rli->curr_group_da.back().data->
+          get_type_code() == binary_log::DELETE_FILE_EVENT));
 
   worker= NULL;
   rli->mts_group_status= Relay_log_info::MTS_IN_GROUP;
@@ -3467,7 +3510,7 @@ int Log_event::apply_event(Relay_log_info *rli)
   worker= (Relay_log_info*)
     (rli->last_assigned_worker= get_slave_worker(rli));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (rli->last_assigned_worker)
     DBUG_PRINT("mts", ("Assigning job to worker %lu",
                rli->last_assigned_worker->id));
@@ -3476,7 +3519,7 @@ int Log_event::apply_event(Relay_log_info *rli)
 err:
   if (rli_thd->is_error() || (!worker && rli->abort_slave))
   {
-    DBUG_ASSERT(!worker);
+    assert(!worker);
 
     /*
       Destroy all deferred buffered events but the current prior to exit.
@@ -3493,7 +3536,7 @@ int Log_event::apply_event(Relay_log_info *rli)
   }
   else
   {
-    DBUG_ASSERT(worker || rli->curr_group_assigned_parts.size() == 0);
+    assert(worker || rli->curr_group_assigned_parts.size() == 0);
   }
 
   DBUG_RETURN((!(rli_thd->is_error() || (!worker && rli->abort_slave)) ||
@@ -3551,8 +3594,8 @@ static void write_str_with_code_and_len(uchar **dst, const char *src,
     only 1 byte to store the length of catalog, so it should not
     surpass 255
   */
-  DBUG_ASSERT(len <= 255);
-  DBUG_ASSERT(src);
+  assert(len <= 255);
+  assert(src);
   *((*dst)++)= code;
   *((*dst)++)= (uchar) len;
   memmove(*dst, src, len);
@@ -3677,20 +3720,20 @@ bool Query_log_event::write(IO_CACHE* file)
   if (time_zone_len)
   {
     /* In the TZ sys table, column Name is of length 64 so this should be ok */
-    DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
+    assert(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
     write_str_with_code_and_len(&start,
                                 time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
   }
   if (lc_time_names_number)
   {
-    DBUG_ASSERT(lc_time_names_number <= 0xFF);
+    assert(lc_time_names_number <= 0xFF);
     *start++= Q_LC_TIME_NAMES_CODE;
     int2store(start, lc_time_names_number);
     start+= 2;
   }
   if (charset_database_number)
   {
-    DBUG_ASSERT(charset_database_number <= 0xFF);
+    assert(charset_database_number <= 0xFF);
     *start++= Q_CHARSET_DATABASE_CODE;
     int2store(start, charset_database_number);
     start+= 2;
@@ -3775,7 +3818,7 @@ bool Query_log_event::write(IO_CACHE* file)
       (thd->get_binlog_accessed_db_names()->elements <= MAX_DBS_IN_EVENT_MTS) ?
       thd->get_binlog_accessed_db_names()->elements : OVER_MAX_DBS_IN_EVENT_MTS;
 
-    DBUG_ASSERT(dbs != 0);
+    assert(dbs != 0);
 
     if (dbs <= MAX_DBS_IN_EVENT_MTS)
     {
@@ -3829,7 +3872,7 @@ bool Query_log_event::write(IO_CACHE* file)
 
   /* Store length of status variables */
   status_vars_len= (uint) (start-start_of_status);
-  DBUG_ASSERT(status_vars_len <= MAX_SIZE_LOG_EVENT_STATUS);
+  assert(status_vars_len <= MAX_SIZE_LOG_EVENT_STATUS);
   int2store(buf + Q_STATUS_VARS_LEN_OFFSET, status_vars_len);
 
   /*
@@ -3955,10 +3998,10 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
   */
   flags2= (uint32) (thd_arg->variables.option_bits &
                     (OPTIONS_WRITTEN_TO_BIN_LOG & ~OPTION_NOT_AUTOCOMMIT));
-  DBUG_ASSERT(thd_arg->variables.character_set_client->number < 256*256);
-  DBUG_ASSERT(thd_arg->variables.collation_connection->number < 256*256);
-  DBUG_ASSERT(thd_arg->variables.collation_server->number < 256*256);
-  DBUG_ASSERT(thd_arg->variables.character_set_client->mbminlen == 1);
+  assert(thd_arg->variables.character_set_client->number < 256*256);
+  assert(thd_arg->variables.collation_connection->number < 256*256);
+  assert(thd_arg->variables.collation_server->number < 256*256);
+  assert(thd_arg->variables.character_set_client->mbminlen == 1);
   int2store(charset, thd_arg->variables.character_set_client->number);
   int2store(charset+2, thd_arg->variables.collation_connection->number);
   int2store(charset+4, thd_arg->variables.collation_server->number);
@@ -4117,8 +4160,8 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
     event_cache_type= Log_event::EVENT_STMT_CACHE;
   }
 
-  DBUG_ASSERT(event_cache_type != Log_event::EVENT_INVALID_CACHE);
-  DBUG_ASSERT(event_logging_type != Log_event::EVENT_INVALID_LOGGING);
+  assert(event_cache_type != Log_event::EVENT_INVALID_CACHE);
+  assert(event_logging_type != Log_event::EVENT_INVALID_LOGGING);
   DBUG_PRINT("info",("Query_log_event has flags2: %lu  sql_mode: %llu",
                      (ulong) flags2, (ulonglong) sql_mode));
 }
@@ -4160,7 +4203,7 @@ Query_log_event::Query_log_event(const char* buf, uint event_len,
   if (!(fill_data_buf(data_buf, buf_len)))
     DBUG_VOID_RETURN;
 
-  if(query != 0)
+  if (query != 0 && q_len > 0)
     is_valid_param= true;
 
   /**
@@ -4240,7 +4283,7 @@ void Query_log_event::print_query_header(IO_CACHE* file,
     end+= sprintf(end, ".%06d", (int) common_header->when.tv_usec);
   end= my_stpcpy(end, print_event_info->delimiter);
   *end++='\n';
-  DBUG_ASSERT(end < buff + sizeof(buff));
+  assert(end < buff + sizeof(buff));
   my_b_write(file, (uchar*) buff, (uint) (end-buff));
   if ((!print_event_info->thread_id_printed ||
        ((common_header->flags & LOG_EVENT_THREAD_SPECIFIC_F) &&
@@ -4485,7 +4528,8 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
   int expected_error,actual_error= 0;
   HA_CREATE_INFO db_options;
 
-  DBUG_PRINT("info", ("query=%s", query));
+  DBUG_PRINT("info", ("query=%s, q_len_arg=%lu",
+                      query, static_cast<unsigned long>(q_len_arg)));
 
   /*
     Colleagues: please never free(thd->catalog) in MySQL. This would
@@ -4503,6 +4547,25 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
   else
     thd->set_catalog(EMPTY_CSTR);
 
+  size_t valid_len;
+  bool len_error;
+  bool is_invalid_db_name= validate_string(system_charset_info, db, db_len,
+                                           &valid_len, &len_error);
+
+  DBUG_PRINT("debug",("is_invalid_db_name= %s, valid_len=%zu, len_error=%s",
+                      is_invalid_db_name ? "true" : "false",
+                      valid_len,
+                      len_error ? "true" : "false"));
+
+  if (is_invalid_db_name || len_error)
+  {
+    rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                "Invalid database name in Query event.");
+    thd->is_slave_error= true;
+    goto end;
+  }
+
   set_thd_db(thd, db, db_len);
 
   /*
@@ -4557,6 +4620,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
   {
     thd->set_time(&(common_header->when));
     thd->set_query(query_arg, q_len_arg);
+    thd->set_query_for_display(query_arg, q_len_arg);
     thd->set_query_id(next_query_id());
     thd->variables.pseudo_thread_id= thread_id;		// for temp tables
     attach_temp_tables_worker(thd, rli);
@@ -4611,6 +4675,18 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
             goto compare_errors;
           }
           thd->update_charset(); // for the charset change to take effect
+          /*
+            We cannot ask for parsing a statement using a character set
+            without state_maps (parser internal data).
+          */
+          if (!thd->variables.character_set_client->state_maps)
+          {
+            rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                        ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                        "character_set cannot be parsed");
+            thd->is_slave_error= true;
+            goto end;
+          }
           /*
             Reset thd->query_string.cs to the newly set value.
             Note, there is a small flaw here. For a very short time frame
@@ -4623,6 +4699,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
             to fix this if any refactoring happens here sometime.
           */
           thd->set_query(query_arg, q_len_arg);
+          thd->reset_query_for_display();
         }
       }
       if (time_zone_len)
@@ -4695,9 +4772,10 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
       Parser_state parser_state;
       if (!parser_state.init(thd, thd->query().str, thd->query().length))
       {
-        DBUG_ASSERT(thd->m_digest == NULL);
+        parser_state.m_input.m_has_digest = true;
+        assert(thd->m_digest == NULL);
         thd->m_digest= & thd->m_digest_state;
-        DBUG_ASSERT(thd->m_statement_psi == NULL);
+        assert(thd->m_statement_psi == NULL);
         thd->m_statement_psi= MYSQL_START_STATEMENT(&thd->m_statement_state,
                                                     stmt_info_rpl.m_key,
                                                     thd->db().str,
@@ -4783,23 +4861,31 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
     if (!thd->is_error() ||
         thd->get_stmt_da()->mysql_errno() != ER_SLAVE_IGNORED_TABLE)
     {
-      /* log the rewritten query if the query was rewritten 
-         and the option to log raw was not set.
-        
-         There is an assumption here. We assume that query log
-         events can never have multi-statement queries, thus the
-         parsed statement is the same as the raw one.
-       */
-      if (opt_general_log_raw || thd->rewritten_query.length() == 0)
+      /*
+        Log the rewritten query if the query was rewritten
+        and the option to log raw was not set.
+
+        There is an assumption here. We assume that query log
+        events can never have multi-statement queries, thus the
+        parsed statement is the same as the raw one.
+      */
+      if (opt_general_log_raw || thd->rewritten_query().length() == 0)
         query_logger.general_log_write(thd, COM_QUERY, thd->query().str,
                                        thd->query().length);
       else
         query_logger.general_log_write(thd, COM_QUERY,
-                                       thd->rewritten_query.c_ptr_safe(),
-                                       thd->rewritten_query.length());
+                                       thd->rewritten_query().ptr(),
+                                       thd->rewritten_query().length());
     }
 
 compare_errors:
+    /* Parser errors shall be ignored when (GTID) skipping statements */
+    if (thd->is_error() &&
+        thd->get_stmt_da()->mysql_errno() == ER_PARSE_ERROR &&
+        gtid_pre_statement_checks(thd) == GTID_STATEMENT_SKIP)
+    {
+      thd->get_stmt_da()->reset_diagnostics_area();
+    }
     /*
       In the slave thread, we may sometimes execute some DROP / * 40005
       TEMPORARY * / TABLE that come from parts of binlogs (likely if we
@@ -4968,6 +5054,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
 
   /* Mark the statement completed. */
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
+  thd->reset_rewritten_query();
   thd->m_statement_psi= NULL;
   thd->m_digest= NULL;
 
@@ -5008,7 +5095,7 @@ Query_log_event::do_shall_skip(Relay_log_info *rli)
 {
   DBUG_ENTER("Query_log_event::do_shall_skip");
   DBUG_PRINT("debug", ("query: %s; q_len: %d", query, static_cast<int>(q_len)));
-  DBUG_ASSERT(query && q_len > 0);
+  assert(query && q_len > 0);
 
   if (rli->slave_skip_counter > 0)
   {
@@ -5047,8 +5134,8 @@ size_t Query_log_event::get_query(const char *buf, size_t length,
                                   const Format_description_log_event *fd_event,
                                   char** query)
 {
-  DBUG_ASSERT((Log_event_type)buf[EVENT_TYPE_OFFSET] ==
-              binary_log::QUERY_EVENT);
+  assert((Log_event_type)buf[EVENT_TYPE_OFFSET] ==
+         binary_log::QUERY_EVENT);
 
   char db_len;                                  /* size of db name */
   uint status_vars_len= 0;                      /* size of status_vars */
@@ -5328,7 +5415,13 @@ int Start_log_event_v3::do_apply_event(Relay_log_info const *rli)
     */
     break;
   default:
-    /* this case is impossible */
+    /*
+      This case is not expected. It can be either an event corruption or an
+      unsupported binary log version.
+    */
+    rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                "Binlog version not supported");
     DBUG_RETURN(1);
   }
   DBUG_RETURN(error);
@@ -5442,8 +5535,35 @@ bool Format_description_log_event::write(IO_CACHE* file)
     created= get_time();
   int4store(buff + ST_CREATED_OFFSET, static_cast<uint32>(created));
   buff[ST_COMMON_HEADER_LEN_OFFSET]= LOG_EVENT_HEADER_LEN;
-  memcpy((char*) buff+ST_COMMON_HEADER_LEN_OFFSET + 1,  &post_header_len.front(),
-         Binary_log_event::LOG_EVENT_TYPES);
+
+  size_t number_of_events;
+  int post_header_len_size = static_cast<int>(post_header_len.size());
+
+  if (post_header_len_size == Binary_log_event::LOG_EVENT_TYPES)
+    // Replicating between master and slave with same version.
+    // number_of_events will be same as Binary_log_event::LOG_EVENT_TYPES
+    number_of_events = Binary_log_event::LOG_EVENT_TYPES;
+  else if (post_header_len_size > Binary_log_event::LOG_EVENT_TYPES)
+    /*
+      Replicating between new master and old slave.
+      In that case there won't be any memory issues, as there won't be
+      any out of memory read.
+    */
+    number_of_events = Binary_log_event::LOG_EVENT_TYPES;
+  else
+    /*
+      Replicating between old master and new slave.
+      In that case it might lead to different number_of_events on master and
+      slave. When the relay log is rotated, the FDE from master is used to
+      create the FDE event on slave, which is being written here. In that case
+      we might end up reading more bytes as
+      post_header_len.size() < Binary_log_event::LOG_EVENT_TYPES;
+      casuing memory issues.
+    */
+    number_of_events = post_header_len_size;
+
+  memcpy((char*) buff + ST_COMMON_HEADER_LEN_OFFSET + 1,  &post_header_len.front(),
+          number_of_events);
   /*
     if checksum is requested
     record the checksum-algorithm descriptor next to
@@ -5453,7 +5573,7 @@ bool Format_description_log_event::write(IO_CACHE* file)
     FD_queue checksum_alg value.
   */
   compile_time_assert(sizeof(BINLOG_CHECKSUM_ALG_DESC_LEN == 1));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   common_header->data_written= 0; // to prepare for need_checksum assert
 #endif
   buff[Binary_log_event::FORMAT_DESCRIPTION_HEADER_LEN]= need_checksum() ?
@@ -6114,14 +6234,14 @@ void Load_log_event::set_fields(const char* affected_db,
 int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli,
                                    bool use_rli_only_for_errors)
 {
-  DBUG_ASSERT(thd->query().str == NULL);
+  assert(thd->query().str == NULL);
   thd->reset_query();                    // Should not be needed
   set_thd_db(thd, db, db_len);
   thd->is_slave_error= 0;
   clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
 
   /* see Query_log_event::do_apply_event() and BUG#13360 */
-  DBUG_ASSERT(!rli->m_table_map.count());
+  assert(!rli->m_table_map.count());
   /*
     Usually lex_start() is called by mysql_parse(), but we need it here
     as the present method does not call mysql_parse().
@@ -6154,7 +6274,7 @@ int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli,
   {
     thd->set_time(&(common_header->when));
     thd->set_query_id(next_query_id());
-    DBUG_ASSERT(!thd->get_stmt_da()->is_set());
+    assert(!thd->get_stmt_da()->is_set());
 
     TABLE_LIST tables;
     char table_buf[NAME_LEN + 1];
@@ -6451,7 +6571,7 @@ Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg,
   Log_event(header(), footer(),
             Log_event::EVENT_NO_CACHE, Log_event::EVENT_IMMEDIATE_LOGGING)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_ENTER("Rotate_log_event::Rotate_log_event(...,flags)");
 #endif
   new_log_ident= new_log_ident_arg;
@@ -6460,7 +6580,7 @@ Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg,
              ident_len_arg : (uint) strlen(new_log_ident_arg);
   flags= flags_arg;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buff[22];
   DBUG_PRINT("enter",("new_log_ident: %s  pos: %s  flags: %lu", new_log_ident_arg,
                       llstr(pos_arg, buff), (ulong) flags));
@@ -6531,7 +6651,7 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli)
 {
   int error= 0;
   DBUG_ENTER("Rotate_log_event::do_update_pos");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[32];
 #endif
 
@@ -6569,7 +6689,7 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli)
       !is_relay_log_event() &&
       !in_group)
   {
-    if (!is_mts_db_partitioned(rli) && server_id != ::server_id)
+    if (!is_mts_db_partitioned(rli) && (server_id != ::server_id || rli->replicate_same_server_id))
     {
       // force the coordinator to start a new binlog segment.
       static_cast<Mts_submode_logical_clock*>
@@ -6615,7 +6735,8 @@ int Rotate_log_event::do_update_pos(Relay_log_info *rli)
                                      real_event ?
                                      common_header->when.tv_sec +
                                      (time_t) exec_time : 0,
-                                     true/*need_data_lock=true*/);
+                                     true/*need_data_lock=true*/,
+                                     real_event? true : false);
     }
 
     /*
@@ -6677,7 +6798,7 @@ Rotate_log_event::do_shall_skip(Relay_log_info *rli)
   case Log_event::EVENT_SKIP_IGNORE:
     return Log_event::EVENT_SKIP_IGNORE;
   }
-  DBUG_ASSERT(0);
+  assert(0);
   return Log_event::EVENT_SKIP_NOT;             // To keep compiler happy
 }
 
@@ -6932,7 +7053,7 @@ bool slave_execute_deferred_events(THD *thd)
   bool res= false;
   Relay_log_info *rli= thd->rli_slave;
 
-  DBUG_ASSERT(rli && (!rli->deferred_events_collecting || rli->deferred_events));
+  assert(rli && (!rli->deferred_events_collecting || rli->deferred_events));
 
   if (!rli->deferred_events_collecting || rli->deferred_events->is_empty())
     return res;
@@ -7344,7 +7465,7 @@ bool XA_prepare_log_event::write(IO_CACHE* file)
   int4store(buf_g, static_cast<XID*>(xid)->get_gtrid_length());
   int4store(buf_b, static_cast<XID*>(xid)->get_bqual_length());
 
-  DBUG_ASSERT(xid_bufs_size == sizeof(buf_f) + sizeof(buf_g) + sizeof(buf_b));
+  assert(xid_bufs_size == sizeof(buf_f) + sizeof(buf_g) + sizeof(buf_b));
 
   return write_header(file, sizeof(one_byte) + xid_bufs_size +
                       static_cast<XID*>(xid)->get_gtrid_length() +
@@ -7404,7 +7525,7 @@ bool XA_prepare_log_event::do_commit(THD *thd)
   if (state == GTID_STATEMENT_CANCEL)
   {
     uint error= thd->get_stmt_da()->mysql_errno();
-    DBUG_ASSERT(error != 0);
+    assert(error != 0);
     thd->rli_slave->report(ERROR_LEVEL, error,
                            "Error executing XA PREPARE event: '%s'",
                            thd->get_stmt_da()->message_text());
@@ -7432,7 +7553,9 @@ bool XA_prepare_log_event::do_commit(THD *thd)
     thd->lex->m_sql_cmd= new Sql_cmd_xa_commit(&xid, XA_ONE_PHASE);
     error= thd->lex->m_sql_cmd->execute(thd);
   }
-  error|= mysql_bin_log.gtid_end_transaction(thd);
+
+  if (!error)
+    error = mysql_bin_log.gtid_end_transaction(thd);
 
   return error;
 }
@@ -7464,7 +7587,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
   else
   {
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       double real_val;
       float8get(&real_val, val);
       if (!(buf= (char*) my_malloc(key_memory_log_event,
@@ -7474,7 +7597,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
       event_len+= my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, MY_GCVT_MAX_FIELD_WIDTH,
                           buf + val_offset, NULL);
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       if (!(buf= (char*) my_malloc(key_memory_log_event,
                                    val_offset + 22, MYF(MY_WME))))
         return 1;
@@ -7482,7 +7605,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
                                    ((flags & User_var_log_event::UNSIGNED_F) ? 
                                     10 : -10))-buf;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       if (!(buf= (char*) my_malloc(key_memory_log_event,
                                    val_offset + DECIMAL_MAX_STR_LENGTH + 1,
@@ -7496,7 +7619,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
       event_len= str.length() + val_offset;
       break;
     } 
-    case STRING_RESULT:
+    case STRING_TYPE:
       /* 15 is for 'COLLATE' and other chars */
       buf= (char*) my_malloc(key_memory_log_event,
                              event_len+val_len*2+1+2*MY_CS_NAME_SIZE+15,
@@ -7517,9 +7640,9 @@ int User_var_log_event::pack_info(Protocol* protocol)
         event_len= p-buf;
       }
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
-      DBUG_ASSERT(1);
+      assert(1);
       return 1;
     }
   }
@@ -7571,14 +7694,14 @@ bool User_var_log_event::write(IO_CACHE* file)
     int4store(buf1 + 2, charset_number);
 
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       float8store(buf2, *(double*) val);
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       int8store(buf2, *(longlong*) val);
       unsigned_len= 1;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       my_decimal *dec= (my_decimal *)val;
       dec->sanity_check();
@@ -7588,12 +7711,12 @@ bool User_var_log_event::write(IO_CACHE* file)
       val_len= decimal_bin_size(buf2[0], buf2[1]) + 2;
       break;
     }
-    case STRING_RESULT:
+    case STRING_TYPE:
       pos= (uchar*) val;
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
-      DBUG_ASSERT(1);
+      assert(1);
       return 0;
     }
     int4store(buf1 + 2 + UV_CHARSET_NUMBER_SIZE, val_len);
@@ -7646,20 +7769,20 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
   else
   {
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       double real_val;
       char real_buf[FMT_G_BUFSIZE(14)];
       float8get(&real_val, val);
       sprintf(real_buf, "%.14g", real_val);
       my_b_printf(head, ":=%s%s\n", real_buf, print_event_info->delimiter);
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       char int_buf[22];
       longlong10_to_str(uint8korr(val), int_buf, 
                         ((flags & User_var_log_event::UNSIGNED_F) ? 10 : -10));
       my_b_printf(head, ":=%s%s\n", int_buf, print_event_info->delimiter);
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       char str_buf[200];
       int str_len= sizeof(str_buf) - 1;
@@ -7676,7 +7799,7 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
       my_b_printf(head, ":=%s%s\n", str_buf, print_event_info->delimiter);
       break;
     }
-    case STRING_RESULT:
+    case STRING_TYPE:
     {
       /*
         Let's express the string in hex. That's the most robust way. If we
@@ -7719,9 +7842,9 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
       my_free(hex_str);
     }
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
-      DBUG_ASSERT(1);
+      assert(1);
       return;
     }
   }
@@ -7754,7 +7877,12 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
   }
 
   if (!(charset= get_charset(charset_number, MYF(MY_WME))))
+  {
+    rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                "Invalid character set for User var event");
     DBUG_RETURN(1);
+  }
   double real_val;
   longlong int_val;
 
@@ -7771,32 +7899,53 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
   else
   {
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
+      if (val_len != 8)
+      {
+        rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                    ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                    "Invalid variable length at User var event");
+        DBUG_RETURN(1);
+      }
       float8get(&real_val, val);
       it= new Item_float(real_val, 0);
       val= (char*) &real_val;		// Pointer to value in native format
       val_len= 8;
       break;
-    case INT_RESULT:
+    case INT_TYPE:
+      if (val_len != 8)
+      {
+        rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                    ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                    "Invalid variable length at User var event");
+        DBUG_RETURN(1);
+      }
       int_val= (longlong) uint8korr(val);
       it= new Item_int(int_val);
       val= (char*) &int_val;		// Pointer to value in native format
       val_len= 8;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
+      if (val_len < 3)
+      {
+        rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+                    ER_THD(thd, ER_SLAVE_FATAL_ERROR),
+                    "Invalid variable length at User var event");
+        DBUG_RETURN(1);
+      }
       Item_decimal *dec= new Item_decimal((uchar*) val+2, val[0], val[1]);
       it= dec;
       val= (char *)dec->val_decimal(NULL);
       val_len= sizeof(my_decimal);
       break;
     }
-    case STRING_RESULT:
+    case STRING_TYPE:
       it= new Item_string(val, val_len, charset);
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
-      DBUG_ASSERT(1);
+      assert(1);
       DBUG_RETURN(0);
     }
   }
@@ -9000,7 +9149,7 @@ const char *sql_ex_info::init(const char *buf, const char *buf_end,
 {
   return data_info.init(buf, buf_end, use_new_format);
 }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #ifndef MYSQL_CLIENT
 static uchar dbug_extra_row_data_val= 0;
 
@@ -9052,7 +9201,7 @@ void check_extra_data(uchar* extra_row_data)
   }
 }
 
-#endif  // #ifndef DBUG_OFF
+#endif  // #ifndef NDEBUG
 
 /**************************************************************************
 	Rows_log_event member functions
@@ -9081,13 +9230,13 @@ Rows_log_event::Rows_log_event(THD *thd_arg, TABLE *tbl_arg, const Table_id& tid
   m_rows_buf= 0; m_rows_cur= 0; m_rows_end= 0; m_flags= 0;
   m_type= event_type; m_extra_row_data=0;
 
-  DBUG_ASSERT(tbl_arg && tbl_arg->s && tid.is_valid());
+  assert(tbl_arg && tbl_arg->s && tid.is_valid());
 
   if (thd_arg->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS)
       set_flags(NO_FOREIGN_KEY_CHECKS_F);
   if (thd_arg->variables.option_bits & OPTION_RELAXED_UNIQUE_CHECKS)
       set_flags(RELAXED_UNIQUE_CHECKS_F);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uchar extra_data[255];
   DBUG_EXECUTE_IF("extra_row_data_set",
                   /* Set extra row data to a known value */
@@ -9155,7 +9304,7 @@ Rows_log_event::Rows_log_event(const char *buf, uint event_len,
 {
   DBUG_ENTER("Rows_log_event::Rows_log_event(const char*,...)");
 
-  DBUG_ASSERT(header()->type_code == m_type);
+  assert(header()->type_code == m_type);
 
 
   if (m_extra_row_data)
@@ -9327,9 +9476,9 @@ int Rows_log_event::do_add_row_data(uchar *row_data, size_t length)
 
   DBUG_DUMP("row_data", row_data, min<size_t>(length, 32));
 
-  DBUG_ASSERT(m_rows_buf <= m_rows_cur);
-  DBUG_ASSERT(!m_rows_buf || (m_rows_end && m_rows_buf < m_rows_end));
-  DBUG_ASSERT(m_rows_cur <= m_rows_end);
+  assert(m_rows_buf <= m_rows_cur);
+  assert(!m_rows_buf || (m_rows_end && m_rows_buf < m_rows_end));
+  assert(m_rows_cur <= m_rows_end);
 
   /* The cast will always work since m_rows_cur <= m_rows_end */
   if (static_cast<size_t>(m_rows_end - m_rows_cur) <= length)
@@ -9380,7 +9529,7 @@ int Rows_log_event::do_add_row_data(uchar *row_data, size_t length)
     m_rows_end= m_rows_buf + new_alloc;
   }
 
-  DBUG_ASSERT(m_rows_cur + length <= m_rows_end);
+  assert(m_rows_cur + length <= m_rows_end);
   memcpy(m_rows_cur, row_data, length);
   m_rows_cur+= length;
   m_row_count++;
@@ -9542,9 +9691,7 @@ search_key_in_table(TABLE *table, MY_BITMAP *bi_cols, uint key_type)
       DBUG_RETURN(table->s->primary_key);
   }
 
-  DBUG_PRINT("debug", ("Unique keys count: %u", table->s->uniques));
-
-  if (key_type & UNIQUE_KEY_FLAG && table->s->uniques)
+  if (key_type & UNIQUE_KEY_FLAG)
   {
     DBUG_PRINT("debug", ("Searching for UK"));
     for (key=0,keyinfo= table->key_info ;
@@ -9689,9 +9836,9 @@ Rows_log_event::decide_row_lookup_algorithm_and_key()
     m_key_info will influence key comparison code in HASH_SCAN mode,
     so the m_distinct_keys set should still be empty.
   */
-  DBUG_ASSERT(m_distinct_keys.empty());
+  assert(m_distinct_keys.empty());
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const char* s= ((m_rows_lookup_algorithm == Rows_log_event::ROW_LOOKUP_TABLE_SCAN) ? "TABLE_SCAN" :
                   ((m_rows_lookup_algorithm == Rows_log_event::ROW_LOOKUP_HASH_SCAN) ? "HASH_SCAN" :
                    "INDEX_SCAN"));
@@ -9737,10 +9884,10 @@ Rows_log_event::row_operations_scan_and_key_setup()
     }
   case ROW_LOOKUP_INDEX_SCAN:
     {
-      DBUG_ASSERT (m_key_index < MAX_KEY);
+      assert (m_key_index < MAX_KEY);
       // Allocate buffer for key searches
       m_key= (uchar*)my_malloc(key_memory_log_event,
-                               MAX_KEY_LENGTH, MYF(MY_WME));
+                               m_key_info->key_length, MYF(MY_WME));
       if (!m_key)
         error= HA_ERR_OUT_OF_MEM;
       goto err;
@@ -9765,7 +9912,7 @@ Rows_log_event::row_operations_scan_and_key_teardown(int error)
 {
   DBUG_ENTER("Rows_log_event::row_operations_scan_and_key_teardown");
 
-  DBUG_ASSERT(!m_table->file->inited);
+  assert(!m_table->file->inited);
   switch (m_rows_lookup_algorithm)
   {
   case ROW_LOOKUP_HASH_SCAN:
@@ -9933,13 +10080,19 @@ void Rows_log_event::do_post_row_operations(Relay_log_info const *rli, int error
 
   if (!m_curr_row_end && !error)
   {
+    const uchar *previous_m_curr_row= m_curr_row;
     error= unpack_current_row(rli, &m_cols);
+
+    if (!error && previous_m_curr_row == m_curr_row)
+    {
+      error= 1;
+    }
   }
 
   // at this moment m_curr_row_end should be set
-  DBUG_ASSERT(error || m_curr_row_end != NULL);
-  DBUG_ASSERT(error || m_curr_row <= m_curr_row_end);
-  DBUG_ASSERT(error || m_curr_row_end <= m_rows_end);
+  assert(error || m_curr_row_end != NULL);
+  assert(error || m_curr_row <= m_curr_row_end);
+  assert(error || m_curr_row_end <= m_rows_end);
 
   m_curr_row= m_curr_row_end;
 
@@ -10001,7 +10154,7 @@ int Rows_log_event::do_apply_row(Relay_log_info const *rli)
   if(error)
   {
     DBUG_PRINT("info", ("error: %s", HA_ERR(error)));
-    DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
+    assert(error != HA_ERR_RECORD_DELETED);
   }
 
   m_table->in_use = old_thd;
@@ -10048,7 +10201,7 @@ int
 Rows_log_event::next_record_scan(bool first_read)
 {
   DBUG_ENTER("Rows_log_event::next_record_scan");
-  DBUG_ASSERT(m_table->file->inited);
+  assert(m_table->file->inited);
   TABLE *table= m_table;
   int error= 0;
 
@@ -10136,7 +10289,7 @@ Rows_log_event::open_record_scan()
     }
     else {
       /* this is an INDEX_SCAN we need to store the key in m_key */
-      DBUG_ASSERT((m_rows_lookup_algorithm == ROW_LOOKUP_INDEX_SCAN) && m_key);
+      assert((m_rows_lookup_algorithm == ROW_LOOKUP_INDEX_SCAN) && m_key);
       key_copy(m_key, m_table->record[0], m_key_info, 0);
     }
 
@@ -10182,7 +10335,7 @@ Rows_log_event::add_key_to_distinct_keyset()
 {
   int error= 0;
   DBUG_ENTER("Rows_log_event::add_key_to_distinct_keyset");
-  DBUG_ASSERT(m_key_index < MAX_KEY);
+  assert(m_key_index < MAX_KEY);
   key_copy(m_distinct_key_spare_buf, m_table->record[0], m_key_info, 0);
   std::pair<std::set<uchar *, Key_compare>::iterator,bool> ret=
     m_distinct_keys.insert(m_distinct_key_spare_buf);
@@ -10205,7 +10358,7 @@ Rows_log_event::add_key_to_distinct_keyset()
 int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
 {
   DBUG_ENTER("Rows_log_event::do_index_scan_and_update");
-  DBUG_ASSERT(m_table && m_table->in_use != NULL);
+  assert(m_table && m_table->in_use != NULL);
 
   int error= 0;
   const uchar *saved_m_curr_row= m_curr_row;
@@ -10235,7 +10388,7 @@ int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
     goto end;
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("info",("looking for the following record"));
   DBUG_DUMP("record[0]", m_table->record[0], m_table->s->reclength);
 #endif
@@ -10251,7 +10404,7 @@ int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
       previous read using full primary key
     */
     DBUG_PRINT("info", ("using read before write removal"));
-    DBUG_ASSERT(m_key_index == m_table->s->primary_key);
+    assert(m_key_index == m_table->s->primary_key);
 
     /*
       Tell the handler to ignore if key exists or not, since it's
@@ -10278,8 +10431,8 @@ int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
 
       ADD>>>  store_record(table,record[1]);
               int error= table->file->rnd_pos(table->record[0], table->file->ref);
-      ADD>>>  DBUG_ASSERT(memcmp(table->record[1], table->record[0],
-                                 table->s->reclength) == 0);
+              ADD>>>  assert(memcmp(table->record[1], table->record[0],
+              table->s->reclength) == 0);
 
     */
 
@@ -10380,7 +10533,7 @@ int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
 
 end:
 
-  DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
+  assert(error != HA_ERR_RECORD_DELETED);
 
   if (error && error != HA_ERR_RECORD_DELETED)
     m_table->file->print_error(error, MYF(0));
@@ -10396,22 +10549,75 @@ int Rows_log_event::do_index_scan_and_update(Relay_log_info const *rli)
     */
     (void) close_record_scan(); 
 
-  if ((get_general_type_code() == binary_log::UPDATE_ROWS_EVENT) &&
-      (saved_m_curr_row == m_curr_row))
-  {
-    /* we need to unpack the AI so that positions get updated */
-    m_curr_row= m_curr_row_end;
-    unpack_current_row(rli, &m_cols_ai);
-  }
+  int unpack_error = skip_after_image_for_update_event(rli, saved_m_curr_row);
+  if (!error) error = unpack_error;
+
   m_table->default_column_bitmaps();
   DBUG_RETURN(error);
 
 }
 
+int Update_rows_log_event::skip_after_image_for_update_event(
+    const Relay_log_info *rli, const uchar *curr_bi_start) {
+  if (m_curr_row == curr_bi_start && m_curr_row_end != NULL) {
+    /*
+      This handles the case that the BI was read successfully, but an
+      error happened while looking up the row.  In this case, the AI
+      has not been read, so the read position is between the two
+      images.  In case the error is idempotent, we need to move the
+      position to the end of the row, and therefore we skip past the
+      AI.
+
+      The normal behavior is:
+
+      When unpack_row reads a row image, and there is no error,
+      unpack_row sets m_curr_row_end to point to the end of the image,
+      and leaves m_curr_row to point at the beginning.
+
+      The AI is read from Update_rows_log_event::do_exec_row. Before
+      calling unpack_row, do_exec_row sets m_curr_row=m_curr_row_end,
+      so that it actually reads the AI. And again, if there is no
+      error, unpack_row sets m_curr_row_end to point to the end of the
+      AI.
+
+      Thus, the positions are moved as follows:
+
+                          +--------------+--------------+
+                          | BI           | AI           |  NULL
+                          +--------------+--------------+
+      0. Initial values   ^m_curr_row                      ^m_curr_row_end
+      1. Read BI, no error
+                          ^m_curr_row    ^m_curr_row_end
+      2. Lookup BI
+      3. Set m_curr_row
+                                         ^m_curr_row
+                                         ^m_curr_row_end
+      4. Read AI, no error
+                                        ^m_curr_row    ^m_curr_row_end
+
+      If an error happened while reading the BI (e.g. corruption),
+      then we should not try to read the AI here.  Therefore we do not
+      read the AI if m_curr_row_end==NULL.
+
+      If an error happened while looking up BI, then we should try to
+      read AI here. Then we know m_curr_row_end points to beginning of
+      AI, so we come here, set m_curr_row=m_curr_row_end, and read the
+      AI.
+
+      If an error happened while reading the AI, then we should not
+      try to read the AI again.  Therefore we do not read the AI if
+      m_curr_row==curr_bi_start.
+    */
+    m_curr_row = m_curr_row_end;
+    return unpack_current_row(rli, &m_cols_ai);
+  }
+  return 0;
+}
+
 int Rows_log_event::do_hash_row(Relay_log_info const *rli)
 {
   DBUG_ENTER("Rows_log_event::do_hash_row");
-  DBUG_ASSERT(m_table && m_table->in_use != NULL);
+  assert(m_table && m_table->in_use != NULL);
   int error= 0;
 
   /* create an empty entry to add to the hash table */
@@ -10482,8 +10688,8 @@ int Rows_log_event::do_hash_row(Relay_log_info const *rli)
 int Rows_log_event::do_scan_and_update(Relay_log_info const *rli)
 {
   DBUG_ENTER("Rows_log_event::do_scan_and_update");
-  DBUG_ASSERT(m_table && m_table->in_use != NULL);
-  DBUG_ASSERT(m_hash.is_empty() == false);
+  assert(m_table && m_table->in_use != NULL);
+  assert(m_hash.is_empty() == false);
   TABLE *table= m_table;
   int error= 0;
   const uchar *saved_last_m_curr_row= NULL;
@@ -10623,9 +10829,9 @@ int Rows_log_event::do_scan_and_update(Relay_log_info const *rli)
   else
     error= close_record_scan();
 
-  DBUG_ASSERT((m_hash.is_empty() && !error) ||
-              (!m_hash.is_empty() &&
-               ((error) || (idempotent_errors >= m_hash.size()))));
+  assert((m_hash.is_empty() && !error) ||
+         (!m_hash.is_empty() &&
+          ((error) || (idempotent_errors >= m_hash.size()))));
 
 err:
 
@@ -10645,7 +10851,7 @@ int Rows_log_event::do_scan_and_update(Relay_log_info const *rli)
 int Rows_log_event::do_hash_scan_and_update(Relay_log_info const *rli)
 {
   DBUG_ENTER("Rows_log_event::do_hash_scan_and_update");
-  DBUG_ASSERT(m_table && m_table->in_use != NULL);
+  assert(m_table && m_table->in_use != NULL);
 
   // HASHING PART
 
@@ -10658,7 +10864,7 @@ int Rows_log_event::do_hash_scan_and_update(Relay_log_info const *rli)
     DBUG_RETURN (0);
 
   DBUG_PRINT("info",("Hash was populated with %d records!", m_hash.size()));
-  DBUG_ASSERT(m_curr_row_end == m_rows_end);
+  assert(m_curr_row_end == m_rows_end);
 
   // SCANNING & UPDATE PART
 
@@ -10672,7 +10878,7 @@ int Rows_log_event::do_table_scan_and_update(Relay_log_info const *rli)
   TABLE* table= m_table;
 
   DBUG_ENTER("Rows_log_event::do_table_scan_and_update");
-  DBUG_ASSERT(m_curr_row != m_rows_end);
+  assert(m_curr_row != m_rows_end);
   DBUG_PRINT("info",("locating record using table scan (ha_rnd_next)"));
 
   saved_m_curr_row= m_curr_row;
@@ -10728,7 +10934,7 @@ int Rows_log_event::do_table_scan_and_update(Relay_log_info const *rli)
 
 end:
 
-  DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
+  assert(error != HA_ERR_RECORD_DELETED);
 
   /* either we report error or apply the changes */
   if (error && error != HA_ERR_RECORD_DELETED)
@@ -10772,7 +10978,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
     do_apply_event(). We still check here to prevent future coding
     errors.
   */
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
 
   /*
     If there is no locks taken, this is the first binrow event seen
@@ -10804,7 +11010,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
     if (state == GTID_STATEMENT_CANCEL)
     {
       uint error= thd->get_stmt_da()->mysql_errno();
-      DBUG_ASSERT(error != 0);
+      assert(error != 0);
       rli->report(ERROR_LEVEL, error,
                   "Error executing row event: '%s'",
                   thd->get_stmt_da()->message_text());
@@ -10846,20 +11052,23 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
     thd->binlog_row_event_extra_data = m_extra_row_data;
 
     /* A small test to verify that objects have consistent types */
-    DBUG_ASSERT(sizeof(thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
-
+    assert(sizeof(thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
+    DBUG_EXECUTE_IF("rows_log_event_before_open_table",
+                    {
+                      const char action[] = "now SIGNAL before_open_table WAIT_FOR go_ahead_sql";
+                      assert(!debug_sync_set_action(thd, STRING_WITH_LEN(action)));
+                    };);
     if (open_and_lock_tables(thd, rli->tables_to_lock, 0))
     {
-      uint actual_error= thd->get_stmt_da()->mysql_errno();
-      if (thd->is_slave_error || thd->is_fatal_error)
+      if (thd->is_error())
       {
+        uint actual_error= thd->get_stmt_da()->mysql_errno();
         if (ignored_error_code(actual_error))
         {
           if (log_warnings > 1)
             rli->report(WARNING_LEVEL, actual_error,
                         "Error executing row event: '%s'",
-                        (actual_error ? thd->get_stmt_da()->message_text() :
-                         "unexpected success or fatal error"));
+                        thd->get_stmt_da()->message_text());
           thd->get_stmt_da()->reset_condition_info(thd);
           clear_all_errors(thd, const_cast<Relay_log_info*>(rli));
           error= 0;
@@ -10869,13 +11078,11 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
         {
           rli->report(ERROR_LEVEL, actual_error,
                       "Error executing row event: '%s'",
-                      (actual_error ? thd->get_stmt_da()->message_text() :
-                       "unexpected success or fatal error"));
+                      thd->get_stmt_da()->message_text());
           thd->is_slave_error= 1;
-          const_cast<Relay_log_info*>(rli)->slave_close_thread_tables(thd);
-          DBUG_RETURN(actual_error);
         }
       }
+      DBUG_RETURN(1);
     }
 
     /*
@@ -10930,7 +11137,7 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
           skipped above).
         */
         RPL_TABLE_LIST *ptr= static_cast<RPL_TABLE_LIST*>(table_list_ptr);
-        DBUG_ASSERT(ptr->m_tabledef_valid);
+        assert(ptr->m_tabledef_valid);
         TABLE *conv_table;
         if (!ptr->m_tabledef.compatible_with(thd, const_cast<Relay_log_info*>(rli),
                                              ptr->table, &conv_table))
@@ -11048,11 +11255,6 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
 
     DBUG_PRINT_BITSET("debug", "Setting table's read_set from: %s", &m_cols);
 
-    bitmap_set_all(table->read_set);
-    if (get_general_type_code() == binary_log::DELETE_ROWS_EVENT ||
-        get_general_type_code() == binary_log::UPDATE_ROWS_EVENT)
-        bitmap_intersect(table->read_set,&m_cols);
-
     /*
       Call mark_generated_columns() to set read_set/write_set bits of the
       virtual generated columns as required in order to get these computed.
@@ -11070,15 +11272,31 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
       into the binlog).
     */
 
-    if (m_table->vfield)
-      m_table->mark_generated_columns(get_general_type_code() == binary_log::UPDATE_ROWS_EVENT);
-
+    bitmap_set_all(table->read_set);
     bitmap_set_all(table->write_set);
 
-    /* WRITE ROWS EVENTS store the bitmap in m_cols instead of m_cols_ai */
-    MY_BITMAP *after_image= ((get_general_type_code() == binary_log::UPDATE_ROWS_EVENT) ?
-                             &m_cols_ai : &m_cols);
-    bitmap_intersect(table->write_set, after_image);
+    switch (get_general_type_code()) {
+      case binary_log::DELETE_ROWS_EVENT:
+        bitmap_intersect(table->read_set, &m_cols);
+        bitmap_intersect(table->write_set, &m_cols);
+        if (m_table->vfield)
+          m_table->mark_generated_columns(false);
+        break;
+      case binary_log::UPDATE_ROWS_EVENT:
+        bitmap_intersect(table->read_set, &m_cols);
+        bitmap_intersect(table->write_set, &m_cols_ai);
+        if (m_table->vfield)
+          m_table->mark_generated_columns(true);
+        break;
+      case binary_log::WRITE_ROWS_EVENT:
+        /* WRITE ROWS EVENTS store the bitmap in m_cols instead of m_cols_ai */
+        bitmap_intersect(table->write_set, &m_cols);
+        if (m_table->vfield)
+          m_table->mark_generated_columns(false);
+        break;
+      default:
+        assert(false);
+    }
 
     if (thd->slave_thread) // set the mode for slave
       this->rbr_exec_mode= slave_exec_mode_options;
@@ -11148,14 +11366,14 @@ int Rows_log_event::do_apply_event(Relay_log_info const *rli)
         break;
 
       case ROW_LOOKUP_NOT_NEEDED:
-        DBUG_ASSERT(get_general_type_code() == binary_log::WRITE_ROWS_EVENT);
+        assert(get_general_type_code() == binary_log::WRITE_ROWS_EVENT);
 
         /* No need to scan for rows, just apply it */
         do_apply_row_ptr= &Rows_log_event::do_apply_row;
         break;
 
       default:
-        DBUG_ASSERT(0);
+        assert(0);
         error= 1;
         goto AFTER_MAIN_EXEC_ROW_LOOP;
         break;
@@ -11345,7 +11563,7 @@ static int rows_event_stmt_cleanup(Relay_log_info const *rli, THD * thd)
       If there was a deadlock the transaction should have been rolled back
       already. So there should be no need to rollback the transaction.
     */
-    DBUG_ASSERT(! thd->transaction_rollback_request);
+    assert(! thd->transaction_rollback_request);
     error|= (error ? trans_rollback_stmt(thd) : trans_commit_stmt(thd));
 
     /*
@@ -11401,7 +11619,7 @@ Rows_log_event::do_update_pos(Relay_log_info *rli)
                       get_flags(STMT_END_F) ? "STMT_END_F " : ""));
 
   /* Worker does not execute binlog update position logics */
-  DBUG_ASSERT(!is_mts_worker(rli->info_thd));
+  assert(!is_mts_worker(rli->info_thd));
 
   if (get_flags(STMT_END_F))
   {
@@ -11417,6 +11635,16 @@ Rows_log_event::do_update_pos(Relay_log_info *rli)
     rli->inc_event_relay_log_pos();
   }
 
+  DBUG_EXECUTE_IF( "wait_after_do_update_pos",
+   {
+     const char act[] =
+         "now signal "
+         "signal.after_do_update_pos_waiting "
+         "wait_for "
+         "signal.after_do_update_pos_continue";
+     assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+   };);
+
   DBUG_RETURN(error);
 }
 
@@ -11426,7 +11654,7 @@ Rows_log_event::do_update_pos(Relay_log_info *rli)
 bool Rows_log_event::write_data_header(IO_CACHE *file)
 {
   uchar buf[Binary_log_event::ROWS_HEADER_LEN_V2];	// No need to init the buffer
-  DBUG_ASSERT(m_table_id.is_valid());
+  assert(m_table_id.is_valid());
   DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
                   {
                     int4store(buf + 0, (ulong) m_table_id.id());
@@ -11484,7 +11712,7 @@ bool Rows_log_event::write_data_body(IO_CACHE*file)
   my_ptrdiff_t const data_size= m_rows_cur - m_rows_buf;
   bool res= false;
   uchar *const sbuf_end= net_store_length(sbuf, (size_t) m_width);
-  DBUG_ASSERT(static_cast<size_t>(sbuf_end - sbuf) <= sizeof(sbuf));
+  assert(static_cast<size_t>(sbuf_end - sbuf) <= sizeof(sbuf));
 
   DBUG_DUMP("m_width", sbuf, (size_t) (sbuf_end - sbuf));
   res= res || wrapper_my_b_safe_write(file, sbuf, (size_t) (sbuf_end - sbuf));
@@ -11641,16 +11869,16 @@ Table_map_log_event::Table_map_log_event(THD *thd_arg, TABLE *tbl,
 
   uchar cbuf[sizeof(m_colcnt) + 1];
   uchar *cbuf_end;
-  DBUG_ASSERT(m_table_id.is_valid());
+  assert(m_table_id.is_valid());
   /*
     In TABLE_SHARE, "db" and "table_name" are 0-terminated (see this comment in
     table.cc / alloc_table_share():
       Use the fact the key is db/0/table_name/0
     As we rely on this let's assert it.
   */
-  DBUG_ASSERT((tbl->s->db.str == 0) ||
-              (tbl->s->db.str[tbl->s->db.length] == 0));
-  DBUG_ASSERT(tbl->s->table_name.str[tbl->s->table_name.length] == 0);
+  assert((tbl->s->db.str == 0) ||
+         (tbl->s->db.str[tbl->s->db.length] == 0));
+  assert(tbl->s->table_name.str[tbl->s->table_name.length] == 0);
 
 
   m_data_size=  Binary_log_event::TABLE_MAP_HEADER_LEN;
@@ -11658,13 +11886,13 @@ Table_map_log_event::Table_map_log_event(THD *thd_arg, TABLE *tbl,
   m_data_size+= m_dblen + 2;	// Include length and terminating \0
   m_data_size+= m_tbllen + 2;	// Include length and terminating \0
   cbuf_end= net_store_length(cbuf, (size_t) m_colcnt);
-  DBUG_ASSERT(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
+  assert(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
   m_data_size+= (cbuf_end - cbuf) + m_colcnt;	// COLCNT and column types
 
   m_coltype= (uchar *)my_malloc(key_memory_log_event,
                                 m_colcnt, MYF(MY_WME));
 
-  DBUG_ASSERT(m_colcnt == m_table->s->fields);
+  assert(m_colcnt == m_table->s->fields);
   for (unsigned int i= 0; i < m_table->s->fields; ++i)
     m_coltype[i]= m_table->field[i]->binlog_type();
 
@@ -11694,7 +11922,7 @@ Table_map_log_event::Table_map_log_event(THD *thd_arg, TABLE *tbl,
     Create an array for the field metadata and store it.
   */
   m_field_metadata_size= save_field_metadata();
-  DBUG_ASSERT(m_field_metadata_size <= (m_colcnt * 2));
+  assert(m_field_metadata_size <= (m_colcnt * 2));
 
   /*
     Now set the size of the data to the size of the field metadata array
@@ -11744,7 +11972,7 @@ Table_map_log_event::Table_map_log_event(const char *buf, uint event_len,
   DBUG_ENTER("Table_map_log_event::Table_map_log_event(const char*,uint,...)");
   if (m_null_bits != NULL && m_field_metadata != NULL && m_coltype != NULL)
     is_valid_param= true;
-  DBUG_ASSERT(header()->type_code == binary_log::TABLE_MAP_EVENT);
+  assert(header()->type_code == binary_log::TABLE_MAP_EVENT);
   DBUG_VOID_RETURN;
 }
 #endif
@@ -11788,7 +12016,14 @@ enum enum_tbl_map_status
   SAME_ID_MAPPING_DIFFERENT_TABLE= 2,
   
   /* a duplicate identifier was found mapping the same table */
-  SAME_ID_MAPPING_SAME_TABLE= 3
+  SAME_ID_MAPPING_SAME_TABLE= 3,
+
+  /*
+    this table must be filtered out but found an active XA transaction. XA
+    transactions shouldn't be used with replication filters, until disabling
+    the XA read only optimization is a supported feature.
+  */
+  FILTERED_WITH_XA_ACTIVE = 4
 };
 
 /*
@@ -11839,7 +12074,11 @@ check_table_map(Relay_log_info const *rli, RPL_TABLE_LIST *table_list)
   if (rli->info_thd->slave_thread /* filtering is for slave only */ &&
       (!rpl_filter->db_ok(table_list->db) ||
        (rpl_filter->is_on() && !rpl_filter->tables_ok("", table_list))))
-    res= FILTERED_OUT;
+    if (rli->info_thd->get_transaction()->xid_state()->has_state(
+            XID_STATE::XA_ACTIVE))
+      res = FILTERED_WITH_XA_ACTIVE;
+    else
+      res = FILTERED_OUT;
   else
   {
     RPL_TABLE_LIST *ptr= static_cast<RPL_TABLE_LIST*>(rli->tables_to_lock);
@@ -11873,7 +12112,7 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
   size_t dummy_len;
   void *memory;
   DBUG_ENTER("Table_map_log_event::do_apply_event(Relay_log_info*)");
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
 
   /* Step the query id to mark what columns that are actually used. */
   thd->set_query_id(next_query_id());
@@ -11913,7 +12152,7 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
   enum_tbl_map_status tblmap_status= check_table_map(rli, table_list);
   if (tblmap_status == OK_TO_PROCESS)
   {
-    DBUG_ASSERT(thd->lex->query_tables != table_list);
+    assert(thd->lex->query_tables != table_list);
 
     /*
       Use placement new to construct the table_def instance in the
@@ -11944,6 +12183,19 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
   }
   else  // FILTERED_OUT, SAME_ID_MAPPING_*
   {
+    if (tblmap_status == FILTERED_WITH_XA_ACTIVE)
+    {
+      if (thd->slave_thread)
+        rli->report(ERROR_LEVEL, ER_XA_REPLICATION_FILTERS,
+                    "%s", ER_THD(thd, ER_XA_REPLICATION_FILTERS));
+      else
+        /*
+          For the cases in which a 'BINLOG' statement is set to
+          execute in a user session
+         */
+        my_printf_error(ER_XA_REPLICATION_FILTERS,
+                        "%s", MYF(0), ER_THD(thd, ER_XA_REPLICATION_FILTERS));
+    }
     /*
       If mapped already but with different properties, we raise an
       error.
@@ -11953,7 +12205,7 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli)
       In all three cases, we need to free the memory previously 
       allocated.
      */
-    if (tblmap_status == SAME_ID_MAPPING_DIFFERENT_TABLE)
+    else if (tblmap_status == SAME_ID_MAPPING_DIFFERENT_TABLE)
     {
       /*
         Something bad has happened. We need to stop the slave as strange things
@@ -12007,7 +12259,7 @@ int Table_map_log_event::do_update_pos(Relay_log_info *rli)
 #ifndef MYSQL_CLIENT
 bool Table_map_log_event::write_data_header(IO_CACHE *file)
 {
-  DBUG_ASSERT(m_table_id.is_valid());
+  assert(m_table_id.is_valid());
   uchar buf[Binary_log_event::TABLE_MAP_HEADER_LEN];
   DBUG_EXECUTE_IF("old_row_based_repl_4_byte_map_id_master",
                   {
@@ -12022,18 +12274,18 @@ bool Table_map_log_event::write_data_header(IO_CACHE *file)
 
 bool Table_map_log_event::write_data_body(IO_CACHE *file)
 {
-  DBUG_ASSERT(!m_dbnam.empty());
-  DBUG_ASSERT(!m_tblnam.empty());
+  assert(!m_dbnam.empty());
+  assert(!m_tblnam.empty());
   /* We use only one byte per length for storage in event: */
-  DBUG_ASSERT(m_dblen <= 128);
-  DBUG_ASSERT(m_tbllen <= 128);
+  assert(m_dblen <= 128);
+  assert(m_tbllen <= 128);
 
   uchar const dbuf[]= { (uchar) m_dblen };
   uchar const tbuf[]= { (uchar) m_tbllen };
 
   uchar cbuf[sizeof(m_colcnt) + 1];
   uchar *const cbuf_end= net_store_length(cbuf, (size_t) m_colcnt);
-  DBUG_ASSERT(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
+  assert(static_cast<size_t>(cbuf_end - cbuf) <= sizeof(cbuf));
 
   /*
     Store the size of the field metadata.
@@ -12129,7 +12381,7 @@ Write_rows_log_event::Write_rows_log_event(const char *buf, uint event_len,
   Rows_log_event(buf, event_len, description_event),
   binary_log::Write_rows_event(buf, event_len, description_event)
 {
-  DBUG_ASSERT(header()->type_code == m_type);
+  assert(header()->type_code == m_type);
 }
 #endif
 
@@ -12235,7 +12487,7 @@ Write_rows_log_event::do_before_row_operations(const Slave_reporting_capability
      Sets it to ROW_LOOKUP_NOT_NEEDED.
    */
   decide_row_lookup_algorithm_and_key();
-  DBUG_ASSERT(m_rows_lookup_algorithm==ROW_LOOKUP_NOT_NEEDED);
+  assert(m_rows_lookup_algorithm==ROW_LOOKUP_NOT_NEEDED);
 
   return error;
 }
@@ -12362,7 +12614,7 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
                                 const bool overwrite)
 {
   DBUG_ENTER("write_row");
-  DBUG_ASSERT(m_table != NULL && thd != NULL);
+  assert(m_table != NULL && thd != NULL);
 
   TABLE *table= m_table;  // pointer to event's table
   int error;
@@ -12376,12 +12628,28 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
   if ((error= unpack_current_row(rli, &m_cols)))
     DBUG_RETURN(error);
 
+  /*
+    When m_curr_row == m_curr_row_end, it means a row that contains nothing,
+    so all the pointers shall be pointing to the same address, or else
+    we have corrupt data and shall throw the error.
+  */
+  DBUG_PRINT("debug",("m_rows_buf= %p, m_rows_cur= %p, m_rows_end= %p",
+                      m_rows_buf, m_rows_cur, m_rows_end));
+  DBUG_PRINT("debug",("m_curr_row= %p, m_curr_row_end= %p",
+                      m_curr_row, m_curr_row_end));
+  if (m_curr_row == m_curr_row_end &&
+      !((m_rows_buf == m_rows_cur) && (m_rows_cur == m_rows_end)))
+  {
+    my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0));
+    DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT);
+  }
+
   if (m_curr_row == m_rows_buf)
   {
     /* this is the first row to be inserted, we estimate the rows with
        the size of the first row and use that value to initialize
        storage engine for bulk insertion */
-    DBUG_ASSERT(!(m_curr_row > m_curr_row_end));
+    assert(!(m_curr_row > m_curr_row_end));
     ulong estimated_rows= 0;
     if (m_curr_row < m_curr_row_end)
       estimated_rows= (m_rows_end - m_curr_row) / (m_curr_row_end - m_curr_row);
@@ -12398,7 +12666,7 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
   if (is_auto_inc_in_extra_columns())
     m_table->next_number_field->set_null();
   
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
   DBUG_PRINT_BITSET("debug", "write_set = %s", table->write_set);
   DBUG_PRINT_BITSET("debug", "read_set = %s", table->read_set);
@@ -12437,14 +12705,14 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
       has value MAX_KEY as a marker for the case when no information
       about key can be found. In the last case we have to require
       that storage engine has the flag HA_DUPLICATE_POS turned on.
-      If this invariant is false then DBUG_ASSERT will crash
+      If this invariant is false then assert will crash
       the server built in debug mode. For the server that was built
       without DEBUG we have additional check for the value of key index
       in the code below in order to report about error in any case.
     */
-    DBUG_ASSERT(keynum != MAX_KEY ||
-                (keynum == MAX_KEY &&
-                 (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
+    assert(keynum != MAX_KEY ||
+           (keynum == MAX_KEY &&
+            (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
     /*
        We need to retrieve the old row into record[1] to be able to
        either update or delete the offending record.  We either:
@@ -12546,7 +12814,7 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
       error= unpack_current_row(rli, &m_cols);
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_PRINT("debug",("preparing for update: before and after image"));
     DBUG_DUMP("record[1] (before)", table->record[1], table->s->reclength);
     DBUG_DUMP("record[0] (after)", table->record[0], table->s->reclength);
@@ -12613,12 +12881,12 @@ Write_rows_log_event::write_row(const Relay_log_info *const rli,
 int
 Write_rows_log_event::do_exec_row(const Relay_log_info *const rli)
 {
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
   int error= write_row(rli, rbr_exec_mode == RBR_EXEC_MODE_IDEMPOTENT);
 
   if (error && !thd->is_error())
   {
-    DBUG_ASSERT(0);
+    assert(0);
     my_error(ER_UNKNOWN_ERROR, MYF(0));
   }
 
@@ -12672,7 +12940,7 @@ Delete_rows_log_event::Delete_rows_log_event(const char *buf, uint event_len,
   Rows_log_event(buf, event_len, description_event),
   binary_log::Delete_rows_event(buf, event_len, description_event)
 {
-  DBUG_ASSERT(header()->type_code == m_type);
+  assert(header()->type_code == m_type);
 }
 #endif
 
@@ -12716,7 +12984,7 @@ Delete_rows_log_event::do_after_row_operations(const Slave_reporting_capability
 int Delete_rows_log_event::do_exec_row(const Relay_log_info *const rli)
 {
   int error;
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
   /* m_table->record[0] contains the BI */
   m_table->mark_columns_per_binlog_row_image();
   error= m_table->file->ha_delete_row(m_table->record[0]);
@@ -12802,7 +13070,7 @@ Update_rows_log_event::Update_rows_log_event(const char *buf, uint event_len,
 {
   if (Rows_log_event::is_valid() && m_cols_ai.bitmap)
     is_valid_param= true;
-  DBUG_ASSERT(header()->type_code== m_type);
+  assert(header()->type_code== m_type);
 }
 #endif
 
@@ -12846,7 +13114,7 @@ Update_rows_log_event::do_after_row_operations(const Slave_reporting_capability
 int
 Update_rows_log_event::do_exec_row(const Relay_log_info *const rli)
 {
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
   int error= 0;
 
   /*
@@ -12988,7 +13256,7 @@ Incident_log_event::do_apply_event(Relay_log_info const *rli)
   if (state == GTID_STATEMENT_CANCEL)
   {
     uint error= thd->get_stmt_da()->mysql_errno();
-    DBUG_ASSERT(error != 0);
+    assert(error != 0);
     rli->report(ERROR_LEVEL, error,
                 "Error executing incident event: '%s'",
                 thd->get_stmt_da()->message_text());
@@ -13093,6 +13361,7 @@ Rows_query_log_event::Rows_query_log_event(const char *buf, uint event_len,
     Ignorable_log_event(buf, descr_event),
     binary_log::Rows_query_event(buf, event_len, descr_event)
 {
+  is_valid_param= (m_rows_query != NULL);
 }
 
 #ifndef MYSQL_CLIENT
@@ -13158,15 +13427,17 @@ Rows_query_log_event::write_data_body(IO_CACHE *file)
 int Rows_query_log_event::do_apply_event(Relay_log_info const *rli)
 {
   DBUG_ENTER("Rows_query_log_event::do_apply_event");
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
   /* Set query for writing Rows_query log event into binlog later.*/
   thd->set_query(m_rows_query, strlen(m_rows_query));
+  thd->set_query_for_display(m_rows_query, strlen(m_rows_query));
 
-  DBUG_ASSERT(rli->rows_query_ev == NULL);
+  assert(rli->rows_query_ev == NULL);
 
   const_cast<Relay_log_info*>(rli)->rows_query_ev= this;
   /* Tell worker not to free the event */
   worker= NULL;
+  DBUG_EXECUTE_IF("error_on_rows_query_event_apply", { DBUG_RETURN(1); };);
   DBUG_RETURN(0);
 }
 #endif
@@ -13183,7 +13454,7 @@ Gtid_log_event::Gtid_log_event(const char *buffer, uint event_len,
   DBUG_ENTER("Gtid_log_event::Gtid_log_event(const char *,"
              " uint, const Format_description_log_event *");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uint8_t const common_header_len= description_event->common_header_len;
   uint8 const post_header_len=
     buffer[EVENT_TYPE_OFFSET] == binary_log::ANONYMOUS_GTID_LOG_EVENT ?
@@ -13199,7 +13470,20 @@ Gtid_log_event::Gtid_log_event(const char *buffer, uint event_len,
              ANONYMOUS_GROUP : GTID_GROUP;
   sid.copy_from((uchar *)Uuid_parent_struct.bytes);
   spec.gtid.sidno= gtid_info_struct.rpl_gtid_sidno;
+  //GNO sanity check
+  if (spec.type == GTID_GROUP) {
+    if (gtid_info_struct.rpl_gtid_gno <= 0 || gtid_info_struct.rpl_gtid_gno >= GNO_END)
+      goto err;
+  } else { //ANONYMOUS_GTID_LOG_EVENT
+    if (gtid_info_struct.rpl_gtid_gno != 0)
+      goto err;
+  }
   spec.gtid.gno= gtid_info_struct.rpl_gtid_gno;
+
+  DBUG_VOID_RETURN;
+
+err:
+  is_valid_param= false;
   DBUG_VOID_RETURN;
 }
 
@@ -13224,7 +13508,7 @@ Gtid_log_event::Gtid_log_event(THD* thd_arg, bool using_trans,
   }
   else
   {
-    DBUG_ASSERT(thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
+    assert(thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
     spec.set_anonymous();
     spec.gtid.clear();
     sid.clear();
@@ -13235,7 +13519,7 @@ Gtid_log_event::Gtid_log_event(THD* thd_arg, bool using_trans,
                               binary_log::GTID_LOG_EVENT);
   common_header->type_code= event_type;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[MAX_SET_STRING_LENGTH + 1];
   to_string(buf);
   DBUG_PRINT("info", ("%s", buf));
@@ -13258,10 +13542,15 @@ Gtid_log_event::Gtid_log_event(uint32 server_id_arg, bool using_trans,
   DBUG_ENTER("Gtid_log_event::Gtid_log_event(uint32, bool, int64, int64, const Gtid_specification)");
   server_id= server_id_arg;
   common_header->unmasked_server_id= server_id_arg;
+  is_valid_param= true;
 
   if (spec_arg.type == GTID_GROUP)
   {
-    DBUG_ASSERT(spec_arg.gtid.sidno > 0 && spec_arg.gtid.gno > 0);
+    assert(spec_arg.gtid.sidno > 0);
+    assert(spec_arg.gtid.gno > 0);
+    assert(spec_arg.gtid.gno < GNO_END);
+    if (spec_arg.gtid.gno <= 0 || spec_arg.gtid.gno >= GNO_END)
+      is_valid_param= false;
     spec.set(spec_arg.gtid);
     global_sid_lock->rdlock();
     sid= global_sid_map->sidno_to_sid(spec_arg.gtid.sidno);
@@ -13269,7 +13558,7 @@ Gtid_log_event::Gtid_log_event(uint32 server_id_arg, bool using_trans,
   }
   else
   {
-    DBUG_ASSERT(spec_arg.type == ANONYMOUS_GROUP);
+    assert(spec_arg.type == ANONYMOUS_GROUP);
     spec.set_anonymous();
     spec.gtid.clear();
     sid.clear();
@@ -13281,12 +13570,11 @@ Gtid_log_event::Gtid_log_event(uint32 server_id_arg, bool using_trans,
                               binary_log::GTID_LOG_EVENT);
   common_header->type_code= event_type;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[MAX_SET_STRING_LENGTH + 1];
   to_string(buf);
   DBUG_PRINT("info", ("%s", buf));
 #endif
-  is_valid_param= true;
   DBUG_VOID_RETURN;
 }
 #endif
@@ -13304,7 +13592,7 @@ int Gtid_log_event::pack_info(Protocol *protocol)
 size_t Gtid_log_event::to_string(char *buf) const
 {
   char *p= buf;
-  DBUG_ASSERT(strlen(SET_STRING_PREFIX) == SET_STRING_PREFIX_LENGTH);
+  assert(strlen(SET_STRING_PREFIX) == SET_STRING_PREFIX_LENGTH);
   strcpy(p, SET_STRING_PREFIX);
   p+= SET_STRING_PREFIX_LENGTH;
   p+= spec.to_string(&sid, p);
@@ -13364,7 +13652,7 @@ uint32 Gtid_log_event::write_data_header_to_memory(uchar *buffer)
   *ptr_buffer= gtid_flags;
   ptr_buffer+= ENCODED_FLAG_LENGTH;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[binary_log::Uuid::TEXT_LENGTH + 1];
   sid.to_string(buf);
   DBUG_PRINT("info", ("sid=%s sidno=%d gno=%lld",
@@ -13374,14 +13662,19 @@ uint32 Gtid_log_event::write_data_header_to_memory(uchar *buffer)
   sid.copy_to(ptr_buffer);
   ptr_buffer+= ENCODED_SID_LENGTH;
 
+#ifndef NDEBUG
+  if (DBUG_EVALUATE_IF("send_invalid_gno_to_replica", true, false))
+    int8store(ptr_buffer, GNO_END);
+  else
+#endif
   int8store(ptr_buffer, spec.gtid.gno);
   ptr_buffer+= ENCODED_GNO_LENGTH;
 
   *ptr_buffer= LOGICAL_TIMESTAMP_TYPECODE;
   ptr_buffer+= LOGICAL_TIMESTAMP_TYPECODE_LENGTH;
 
-  DBUG_ASSERT((sequence_number == 0 && last_committed == 0) ||
-              (sequence_number > last_committed));
+  assert((sequence_number == 0 && last_committed == 0) ||
+         (sequence_number > last_committed));
   DBUG_EXECUTE_IF("set_commit_parent_100",
                   { last_committed= max<int64>(sequence_number > 1 ? 1 : 0,
                                                sequence_number - 100); });
@@ -13393,7 +13686,7 @@ uint32 Gtid_log_event::write_data_header_to_memory(uchar *buffer)
   int8store(ptr_buffer + 8, sequence_number);
   ptr_buffer+= LOGICAL_TIMESTAMP_LENGTH;
 
-  DBUG_ASSERT(ptr_buffer == (buffer + POST_HEADER_LENGTH));
+  assert(ptr_buffer == (buffer + POST_HEADER_LENGTH));
 
   DBUG_RETURN(POST_HEADER_LENGTH);
 }
@@ -13413,7 +13706,7 @@ bool Gtid_log_event::write_data_header(IO_CACHE *file)
 int Gtid_log_event::do_apply_event(Relay_log_info const *rli)
 {
   DBUG_ENTER("Gtid_log_event::do_apply_event");
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
 
   /*
     In rare cases it is possible that we already own a GTID (either
@@ -13501,9 +13794,9 @@ int Gtid_log_event::do_apply_event(Relay_log_info const *rli)
                        thd->tx_isolation > ISO_READ_COMMITTED &&
                        gtid_pre_statement_checks(thd) != GTID_STATEMENT_SKIP))
   {
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::SESSION));
-    DBUG_ASSERT(!thd->lock);
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::SESSION));
+    assert(!thd->lock);
     DBUG_PRINT("info", ("setting tx_isolation to READ COMMITTED"));
     set_tx_isolation(thd, ISO_READ_COMMITTED, true/*one_shot*/);
   }
@@ -13611,7 +13904,7 @@ int Previous_gtids_log_event::add_to_set(Gtid_set *target) const
   PROPAGATE_REPORTED_ERROR_INT(target->add_gtid_encoding(buf,
                                                          buf_size + add_size,
                                                          &end_pos));
-  DBUG_ASSERT(end_pos <= buf_size);
+  assert(end_pos <= buf_size);
   DBUG_RETURN(0);
 }
 
@@ -13704,9 +13997,9 @@ Transaction_context_log_event(const char *server_uuid_arg,
                     const char act[]=
                         "now wait_for "
                         "signal.resume_after_set_snapshot_version_on_transaction_context_log_event";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   is_valid_param= true;
@@ -13744,9 +14037,11 @@ Transaction_context_log_event(const char *buffer, uint event_len,
 Transaction_context_log_event::~Transaction_context_log_event()
 {
   DBUG_ENTER("Transaction_context_log_event::~Transaction_context_log_event");
-  my_free((void*)server_uuid);
+  if (server_uuid)
+    my_free((void*)server_uuid);
   server_uuid= NULL;
-  my_free((void*) encoded_snapshot_version);
+  if (encoded_snapshot_version)
+    my_free((void*) encoded_snapshot_version);
   encoded_snapshot_version= NULL;
   delete snapshot_version;
   delete sid_map;
@@ -13889,7 +14184,7 @@ bool Transaction_context_log_event::write_data_set(IO_CACHE* file,
 bool Transaction_context_log_event::read_snapshot_version()
 {
   DBUG_ENTER("Transaction_context_log_event::read_snapshot_version");
-  DBUG_ASSERT(snapshot_version->is_empty());
+  assert(snapshot_version->is_empty());
 
   global_sid_lock->wrlock();
   enum_return_status return_status= global_sid_map->copy(sid_map);
@@ -14057,7 +14352,7 @@ int View_change_log_event::do_apply_event(Relay_log_info const *rli)
           gtid_pre_statement_post_implicit_commit_checks(thd)))
   {
     uint error= thd->get_stmt_da()->mysql_errno();
-    DBUG_ASSERT(error != 0);
+    assert(error != 0);
     rli->report(ERROR_LEVEL, error,
                 "Error executing View Change event: '%s'",
                 thd->get_stmt_da()->message_text());
@@ -14145,19 +14440,23 @@ bool View_change_log_event::write_data_map(IO_CACHE* file,
 /*
   Updates the certification info map.
 */
-void
-View_change_log_event::set_certification_info(std::map<std::string, std::string> *info)
-{
+void View_change_log_event::set_certification_info(
+    std::map<std::string, std::string> *info, size_t *event_size) {
   DBUG_ENTER("View_change_log_event::set_certification_database_snapshot");
   certification_info.clear();
 
+  *event_size = Binary_log_event::VIEW_CHANGE_HEADER_LEN;
   std::map<std::string, std::string>::iterator it;
   for(it= info->begin(); it != info->end(); ++it)
   {
     std::string key= it->first;
     std::string value= it->second;
     certification_info[key]= value;
+    *event_size += it->first.length() + it->second.length();
   }
+  *event_size +=
+      (ENCODED_CERT_INFO_KEY_SIZE_LEN + ENCODED_CERT_INFO_VALUE_LEN) *
+      certification_info.size();
 
   DBUG_VOID_RETURN;
 }
diff --git a/sql/log_event.h b/sql/log_event.h
index 3b832649ccd9..82357d98d606 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -99,12 +106,12 @@ int ignored_error_code(int err_code);
    @param COND   Condition to check
    @param ERRNO  Error number to return in non-debug builds
 */
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 #define ASSERT_OR_RETURN_ERROR(COND, ERRNO) \
   do { if (!(COND)) return ERRNO; } while (0)
 #else
 #define ASSERT_OR_RETURN_ERROR(COND, ERRNO) \
-  DBUG_ASSERT(COND)
+  assert(COND)
 #endif
 
 #define LOG_READ_EOF    -1
@@ -1105,10 +1112,10 @@ class Log_event
   */
   virtual void set_mts_isolate_group()
   {
-    DBUG_ASSERT(ends_group() ||
-                get_type_code() == binary_log::QUERY_EVENT ||
-                get_type_code() == binary_log::EXEC_LOAD_EVENT ||
-                get_type_code() == binary_log::EXECUTE_LOAD_QUERY_EVENT);
+    assert(ends_group() ||
+           get_type_code() == binary_log::QUERY_EVENT ||
+           get_type_code() == binary_log::EXEC_LOAD_EVENT ||
+           get_type_code() == binary_log::EXECUTE_LOAD_QUERY_EVENT);
     common_header->flags |= LOG_EVENT_MTS_ISOLATE_F;
   }
 
@@ -2071,7 +2078,9 @@ class XA_prepare_log_event
     : binary_log::XA_prepare_event(buf, description_event),
       Xid_apply_log_event(buf, description_event, header(), footer())
   {
-    is_valid_param= true;
+    is_valid_param= !(my_xid.formatID == -1 &&
+                      my_xid.gtrid_length == 0 &&
+                      my_xid.bqual_length == 0);
     xid= NULL;
   }
   Log_event_type get_type_code() { return binary_log::XA_PREPARE_LOG_EVENT; }
@@ -2796,7 +2805,7 @@ class Table_map_log_event : public binary_log::Table_map_event, public Log_event
 #ifdef MYSQL_CLIENT
   table_def *create_table_def()
   {
-    DBUG_ASSERT(m_colcnt > 0);
+    assert(m_colcnt > 0);
     return new table_def(m_coltype, m_colcnt, m_field_metadata,
                          m_field_metadata_size, m_null_bits, m_flags);
   }
@@ -3018,7 +3027,7 @@ class Rows_log_event : public virtual binary_log::Rows_event, public Log_event
           We should just compare bitmaps for Delete, Write
           or Update rows events.
         */
-        DBUG_ASSERT(0);
+        assert(0);
     }
     return res;
   }
@@ -3141,7 +3150,7 @@ class Rows_log_event : public virtual binary_log::Rows_event, public Log_event
   int unpack_current_row(const Relay_log_info *const rli,
                          MY_BITMAP const *cols)
   {
-    DBUG_ASSERT(m_table);
+    assert(m_table);
 
     ASSERT_OR_RETURN_ERROR(m_curr_row <= m_rows_end, HA_ERR_CORRUPT_EVENT);
     return ::unpack_row(rli, m_table, m_width, m_curr_row, cols,
@@ -3178,7 +3187,7 @@ class Rows_log_event : public virtual binary_log::Rows_event, public Log_event
    */
   inline bool is_auto_inc_in_extra_columns()
   {
-    DBUG_ASSERT(m_table);
+    assert(m_table);
     return (m_table->next_number_field &&
             m_table->next_number_field->field_index >= m_width);
   }
@@ -3295,6 +3304,31 @@ class Rows_log_event : public virtual binary_log::Rows_event, public Log_event
    */
   int do_table_scan_and_update(Relay_log_info const *rli);
 
+  /**
+    Seek past the after-image of an update event, in case a row was processed
+    without reading the after-image.
+
+    An update event may process a row without reading the after-image,
+    e.g. in case of ignored or idempotent errors.  To ensure that the
+    read position for the next row is correct, we need to seek past
+    the after-image.
+
+    @param rli The applier context
+
+    @param curr_bi_start The read position of the beginning of the
+    before-image. (The function compares this with m_curr_row to know
+    if the after-image has been read or not.)
+
+    @retval 0 Success
+    @retval ER_* Error code returned by unpack_current_row
+  */
+  virtual int skip_after_image_for_update_event(const Relay_log_info *rli
+                                                MY_ATTRIBUTE((unused)),
+                                                const uchar *curr_bi_start
+                                                MY_ATTRIBUTE((unused))) {
+    return 0;
+  }
+
   /**
     Initializes scanning of rows. Opens an index and initailizes an iterator
     over a list of distinct keys (m_distinct_keys) if it is a HASH_SCAN
@@ -3543,6 +3577,10 @@ class Update_rows_log_event : public Rows_log_event,
   virtual int do_before_row_operations(const Slave_reporting_capability *const);
   virtual int do_after_row_operations(const Slave_reporting_capability *const,int);
   virtual int do_exec_row(const Relay_log_info *const);
+
+  int skip_after_image_for_update_event(const Relay_log_info *rli,
+                                        const uchar *curr_bi_start);
+
 #endif /* defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) */
 };
 
@@ -3687,7 +3725,7 @@ class Incident_log_event : public binary_log::Incident_event , public Log_event
     DBUG_PRINT("enter", ("incident: %d", incident));
     if (incident > INCIDENT_NONE && incident < INCIDENT_COUNT)
       is_valid_param= true;
-    DBUG_ASSERT(message == NULL && message_length == 0);
+    assert(message == NULL && message_length == 0);
     DBUG_VOID_RETURN;
   }
 
@@ -3702,7 +3740,7 @@ class Incident_log_event : public binary_log::Incident_event , public Log_event
     DBUG_PRINT("enter", ("incident: %d", incident));
     if (incident > INCIDENT_NONE && incident < INCIDENT_COUNT)
       is_valid_param= true;
-    DBUG_ASSERT(message == NULL && message_length == 0);
+    assert(message == NULL && message_length == 0);
     if (!(message= (char*) my_malloc(key_memory_Incident_log_event_message,
                                            msg.length+1, MYF(MY_WME))))
     {
@@ -4438,11 +4476,17 @@ class View_change_log_event: public binary_log::View_change_event,
   char* get_view_id() { return view_id; }
 
   /**
-    Sets the certification info
+     Sets the certification info in the event
 
-    @param db the database
-  */
-  void set_certification_info(std::map<std::string, std::string> *info);
+     @note size is calculated on this method as the size of the data
+     might render the log even invalid. Also due to its size doing it
+     here avoid looping over the data multiple times.
+
+     @param[in] info    certification info to be written
+     @param[out] event_size  the event size after this operation
+   */
+  void set_certification_info(std::map<std::string, std::string> *info,
+                              size_t *event_size);
 
   /**
     Returns the certification info
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc
index 801a1bd72baa..f16f7d605b6e 100644
--- a/sql/log_event_old.cc
+++ b/sql/log_event_old.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -60,7 +67,7 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
        This one is supposed to be set: just an extra check so that
        nothing strange has happened.
      */
-    DBUG_ASSERT(ev->get_flags(Old_rows_log_event::STMT_END_F));
+    assert(ev->get_flags(Old_rows_log_event::STMT_END_F));
 
     const_cast<Relay_log_info*>(rli)->slave_close_thread_tables(ev_thd);
     ev_thd->clear_error();
@@ -72,7 +79,7 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
     do_apply_event(). We still check here to prevent future coding
     errors.
   */
-  DBUG_ASSERT(rli->info_thd == ev_thd);
+  assert(rli->info_thd == ev_thd);
 
   /*
     If there is no locks taken, this is the first binrow event seen
@@ -104,21 +111,18 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
 
     if (open_and_lock_tables(ev_thd, rli->tables_to_lock, 0))
     {
-      uint actual_error= ev_thd->get_stmt_da()->mysql_errno();
-      if (ev_thd->is_slave_error || ev_thd->is_fatal_error)
+      if (ev_thd->is_error())
       {
         /*
           Error reporting borrowed from Query_log_event with many excessive
           simplifications (we don't honour --slave-skip-errors)
         */
-        rli->report(ERROR_LEVEL, actual_error,
+        rli->report(ERROR_LEVEL, ev_thd->get_stmt_da()->mysql_errno(),
                     "Error '%s' on opening tables",
-                    (actual_error ? ev_thd->get_stmt_da()->message_text() :
-                     "unexpected success or fatal error"));
+                    ev_thd->get_stmt_da()->message_text());
         ev_thd->is_slave_error= 1;
       }
-      const_cast<Relay_log_info*>(rli)->slave_close_thread_tables(thd);
-      DBUG_RETURN(actual_error);
+      DBUG_RETURN(1);
     }
 
     /*
@@ -143,7 +147,7 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
           skipped above).
         */
         RPL_TABLE_LIST *ptr=static_cast<RPL_TABLE_LIST*>(table_list_ptr);
-        DBUG_ASSERT(ptr->m_tabledef_valid);
+        assert(ptr->m_tabledef_valid);
         TABLE *conv_table;
         if (!ptr->m_tabledef.compatible_with(thd, const_cast<Relay_log_info*>(rli),
                                              ptr->table, &conv_table))
@@ -222,7 +226,7 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
     else
         ev_thd->variables.option_bits&= ~OPTION_RELAXED_UNIQUE_CHECKS;
     /* A small test to verify that objects have consistent types */
-    DBUG_ASSERT(sizeof(ev_thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
+    assert(sizeof(ev_thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
 
     /*
       Now we are in a statement and will stay in a statement until we
@@ -243,8 +247,8 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info
         break; // We should perform the after-row operation even in
                // the case of error
 
-      DBUG_ASSERT(row_end != NULL); // cannot happen
-      DBUG_ASSERT(row_end <= ev->m_rows_end);
+      assert(row_end != NULL); // cannot happen
+      assert(row_end <= ev->m_rows_end);
 
       /* in_use can have been set to NULL in close_tables_for_reopen */
       THD* old_thd= table->in_use;
@@ -453,7 +457,7 @@ copy_extra_record_fields(TABLE *table,
   if (table->s->fields < (uint) master_fields)
     DBUG_RETURN(0);
 
- DBUG_ASSERT(master_reclength <= table->s->reclength);
+  assert(master_reclength <= table->s->reclength);
   if (master_reclength < table->s->reclength)
     memcpy(table->record[0] + master_reclength,
                 table->record[1] + master_reclength,
@@ -540,13 +544,13 @@ replace_record(THD *thd, TABLE *table,
                uint const master_fields)
 {
   DBUG_ENTER("replace_record");
-  DBUG_ASSERT(table != NULL && thd != NULL);
+  assert(table != NULL && thd != NULL);
 
   int error;
   int keynum;
   char *key= NULL;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
   DBUG_PRINT_BITSET("debug", "write_set = %s", table->write_set);
   DBUG_PRINT_BITSET("debug", "read_set = %s", table->read_set);
@@ -575,14 +579,14 @@ replace_record(THD *thd, TABLE *table,
       has value MAX_KEY as a marker for the case when no information
       about key can be found. In the last case we have to require
       that storage engine has the flag HA_DUPLICATE_POS turned on.
-      If this invariant is false then DBUG_ASSERT will crash
+      If this invariant is false then assert will crash
       the server built in debug mode. For the server that was built
       without DEBUG we have additional check for the value of key index
       in the code below in order to report about error in any case.
     */
-    DBUG_ASSERT(keynum != MAX_KEY ||
-                (keynum == MAX_KEY &&
-                 (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
+    assert(keynum != MAX_KEY ||
+           (keynum == MAX_KEY &&
+            (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
 
     /*
        We need to retrieve the old row into record[1] to be able to
@@ -727,7 +731,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key)
   DBUG_PRINT("enter", ("table: 0x%lx, key: 0x%lx  record: 0x%lx",
            (long) table, (long) key, (long) table->record[1]));
 
-  DBUG_ASSERT(table->in_use != NULL);
+  assert(table->in_use != NULL);
 
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
 
@@ -748,8 +752,8 @@ static int find_and_fetch_row(TABLE *table, uchar *key)
 
       ADD>>>  store_record(table,record[1]);
               int error= table->file->rnd_pos(table->record[0], table->file->ref);
-      ADD>>>  DBUG_ASSERT(memcmp(table->record[1], table->record[0],
-                                 table->s->reclength) == 0);
+              ADD>>>  assert(memcmp(table->record[1], table->record[0],
+              table->s->reclength) == 0);
 
     */
     table->file->position(table->record[0]);
@@ -911,7 +915,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key)
     DBUG_PRINT("info", ("Record %sfound", restart_count == 2 ? "not " : ""));
     table->file->ha_rnd_end();
 
-    DBUG_ASSERT(error == HA_ERR_END_OF_FILE || error == 0);
+    assert(error == HA_ERR_END_OF_FILE || error == 0);
     DBUG_RETURN(error);
   }
 
@@ -995,8 +999,8 @@ Write_rows_log_event_old::do_prepare_row(THD *thd_arg,
                                          uchar const *row_start,
                                          uchar const **row_end)
 {
-  DBUG_ASSERT(table != NULL);
-  DBUG_ASSERT(row_start && row_end);
+  assert(table != NULL);
+  assert(row_start && row_end);
 
   int error;
   error= unpack_row_old(const_cast<Relay_log_info*>(rli),
@@ -1010,7 +1014,7 @@ Write_rows_log_event_old::do_prepare_row(THD *thd_arg,
 
 int Write_rows_log_event_old::do_exec_row(TABLE *table)
 {
-  DBUG_ASSERT(table != NULL);
+  assert(table != NULL);
   int error= replace_record(thd, table, m_master_reclength, m_width);
   return error;
 }
@@ -1022,7 +1026,7 @@ int Write_rows_log_event_old::do_exec_row(TABLE *table)
 
 int Delete_rows_log_event_old::do_before_row_operations(TABLE *table)
 {
-  DBUG_ASSERT(m_memory == NULL);
+  assert(m_memory == NULL);
 
   if ((table->file->ha_table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION) &&
       table->s->primary_key < MAX_KEY)
@@ -1081,12 +1085,12 @@ Delete_rows_log_event_old::do_prepare_row(THD *thd_arg,
                                           uchar const **row_end)
 {
   int error;
-  DBUG_ASSERT(row_start && row_end);
+  assert(row_start && row_end);
   /*
     This assertion actually checks that there is at least as many
     columns on the slave as on the master.
   */
-  DBUG_ASSERT(table->s->fields >= m_width);
+  assert(table->s->fields >= m_width);
 
   error= unpack_row_old(const_cast<Relay_log_info*>(rli),
                         table, m_width, table->record[0],
@@ -1110,7 +1114,7 @@ Delete_rows_log_event_old::do_prepare_row(THD *thd_arg,
 int Delete_rows_log_event_old::do_exec_row(TABLE *table)
 {
   int error;
-  DBUG_ASSERT(table != NULL);
+  assert(table != NULL);
 
   if (!(error= ::find_and_fetch_row(table, m_key)))
   { 
@@ -1131,7 +1135,7 @@ int Delete_rows_log_event_old::do_exec_row(TABLE *table)
 
 int Update_rows_log_event_old::do_before_row_operations(TABLE *table)
 {
-  DBUG_ASSERT(m_memory == NULL);
+  assert(m_memory == NULL);
 
   int error= 0;
 
@@ -1179,12 +1183,12 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd_arg,
                                               uchar const **row_end)
 {
   int error;
-  DBUG_ASSERT(row_start && row_end);
+  assert(row_start && row_end);
   /*
     This assertion actually checks that there is at least as many
     columns on the slave as on the master.
   */
-  DBUG_ASSERT(table->s->fields >= m_width);
+  assert(table->s->fields >= m_width);
 
   /* record[0] is the before image for the update */
   error= unpack_row_old(const_cast<Relay_log_info*>(rli),
@@ -1218,7 +1222,7 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd_arg,
 
 int Update_rows_log_event_old::do_exec_row(TABLE *table)
 {
-  DBUG_ASSERT(table != NULL);
+  assert(table != NULL);
 
   int error= ::find_and_fetch_row(table, m_key);
   if (error)
@@ -1301,8 +1305,8 @@ Old_rows_log_event::Old_rows_log_event(THD *thd_arg, TABLE *tbl_arg, ulong tid,
     solution, to be able to terminate a started statement in the
     binary log: the extraneous events will be removed in the future.
    */
-  DBUG_ASSERT((tbl_arg && tbl_arg->s && tid != ~0UL) ||
-              (!tbl_arg && !cols && tid == ~0UL));
+  assert((tbl_arg && tbl_arg->s && tid != ~0UL) ||
+         (!tbl_arg && !cols && tid == ~0UL));
 
   if (thd_arg->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS)
       set_flags(NO_FOREIGN_KEY_CHECKS_F);
@@ -1377,6 +1381,13 @@ Old_rows_log_event(const char *buf, uint event_len, Log_event_type event_type,
   DBUG_PRINT("debug", ("Reading from %p", ptr_after_width));
   m_width = net_field_length(&ptr_after_width);
   DBUG_PRINT("debug", ("m_width=%lu", m_width));
+  /* Avoid reading out of buffer */
+  if (m_width + (ptr_after_width - (const uchar *)buf) > event_len)
+  {
+    m_cols.bitmap= NULL;
+    DBUG_VOID_RETURN;
+  }
+
   /* if bitmap_init fails, catched in is_valid() */
   if (likely(!bitmap_init(&m_cols,
                           m_width <= sizeof(m_bitbuf)*8 ? m_bitbuf : NULL,
@@ -1459,9 +1470,9 @@ int Old_rows_log_event::do_add_row_data(uchar *row_data, size_t length)
                        (ulong) length));
   DBUG_DUMP("row_data", row_data, min<size_t>(length, 32));
 
-  DBUG_ASSERT(m_rows_buf <= m_rows_cur);
-  DBUG_ASSERT(!m_rows_buf || (m_rows_end && m_rows_buf < m_rows_end));
-  DBUG_ASSERT(m_rows_cur <= m_rows_end);
+  assert(m_rows_buf <= m_rows_cur);
+  assert(!m_rows_buf || (m_rows_end && m_rows_buf < m_rows_end));
+  assert(m_rows_cur <= m_rows_end);
 
   /* The cast will always work since m_rows_cur <= m_rows_end */
   if (static_cast<size_t>(m_rows_end - m_rows_cur) <= length)
@@ -1491,7 +1502,7 @@ int Old_rows_log_event::do_add_row_data(uchar *row_data, size_t length)
     m_rows_end= m_rows_buf + new_alloc;
   }
 
-  DBUG_ASSERT(m_rows_cur + length <= m_rows_end);
+  assert(m_rows_cur + length <= m_rows_end);
   memcpy(m_rows_cur, row_data, length);
   m_rows_cur+= length;
   m_row_count++;
@@ -1519,7 +1530,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
        This one is supposed to be set: just an extra check so that
        nothing strange has happened.
      */
-    DBUG_ASSERT(get_flags(STMT_END_F));
+    assert(get_flags(STMT_END_F));
 
     const_cast<Relay_log_info*>(rli)->slave_close_thread_tables(thd);
     thd->clear_error();
@@ -1531,7 +1542,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
     do_apply_event(). We still check here to prevent future coding
     errors.
   */
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
 
   /*
     If there is no locks taken, this is the first binrow event seen
@@ -1669,7 +1680,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
     else
         thd->variables.option_bits&= ~OPTION_RELAXED_UNIQUE_CHECKS;
     /* A small test to verify that objects have consistent types */
-    DBUG_ASSERT(sizeof(thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
+    assert(sizeof(thd->variables.option_bits) == sizeof(OPTION_RELAXED_UNIQUE_CHECKS));
 
     /*
       Now we are in a statement and will stay in a statement until we
@@ -1718,7 +1729,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
       error= do_exec_row(rli);
 
       DBUG_PRINT("info", ("error: %d", error));
-      DBUG_ASSERT(error != HA_ERR_RECORD_DELETED);
+      assert(error != HA_ERR_RECORD_DELETED);
 
       table->in_use = old_thd;
       switch (error)
@@ -1757,9 +1768,9 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
         unpack_current_row(rli);
   
       // at this moment m_curr_row_end should be set
-      DBUG_ASSERT(error || m_curr_row_end != NULL); 
-      DBUG_ASSERT(error || m_curr_row < m_curr_row_end);
-      DBUG_ASSERT(error || m_curr_row_end <= m_rows_end);
+      assert(error || m_curr_row_end != NULL); 
+      assert(error || m_curr_row < m_curr_row_end);
+      assert(error || m_curr_row_end <= m_rows_end);
   
       m_curr_row= m_curr_row_end;
  
@@ -1853,7 +1864,7 @@ int Old_rows_log_event::do_apply_event(Relay_log_info const *rli)
       If there was a deadlock the transaction should have been rolled back
       already. So there should be no need to rollback the transaction.
     */
-    DBUG_ASSERT(! thd->transaction_rollback_request);
+    assert(! thd->transaction_rollback_request);
     if ((error= (binlog_error ? trans_rollback_stmt(thd) : trans_commit_stmt(thd))))
       rli->report(ERROR_LEVEL, error,
                   "Error in %s event: commit of row events failed, "
@@ -1953,7 +1964,7 @@ bool Old_rows_log_event::write_data_body(IO_CACHE*file)
 
   bool res= false;
   uchar *const sbuf_end= net_store_length(sbuf, (size_t) m_width);
-  DBUG_ASSERT(static_cast<size_t>(sbuf_end - sbuf) <= sizeof(sbuf));
+  assert(static_cast<size_t>(sbuf_end - sbuf) <= sizeof(sbuf));
 
   DBUG_DUMP("m_width", sbuf, (size_t) (sbuf_end - sbuf));
   res= res || my_b_safe_write(file, sbuf, (size_t) (sbuf_end - sbuf));
@@ -2045,7 +2056,7 @@ Old_rows_log_event::write_row(const Relay_log_info *const rli,
                               const bool overwrite)
 {
   DBUG_ENTER("write_row");
-  DBUG_ASSERT(m_table != NULL && thd != NULL);
+  assert(m_table != NULL && thd != NULL);
 
   TABLE *table= m_table;  // pointer to event's table
   int error;
@@ -2061,7 +2072,7 @@ Old_rows_log_event::write_row(const Relay_log_info *const rli,
   /* unpack row into table->record[0] */
   error= unpack_current_row(rli); // TODO: how to handle errors?
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
   DBUG_PRINT_BITSET("debug", "write_set = %s", table->write_set);
   DBUG_PRINT_BITSET("debug", "read_set = %s", table->read_set);
@@ -2098,14 +2109,14 @@ Old_rows_log_event::write_row(const Relay_log_info *const rli,
       has value MAX_KEY as a marker for the case when no information
       about key can be found. In the last case we have to require
       that storage engine has the flag HA_DUPLICATE_POS turned on.
-      If this invariant is false then DBUG_ASSERT will crash
+      If this invariant is false then assert will crash
       the server built in debug mode. For the server that was built
       without DEBUG we have additional check for the value of key index
       in the code below in order to report about error in any case.
     */
-    DBUG_ASSERT(keynum != MAX_KEY ||
-                (keynum == MAX_KEY &&
-                 (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
+    assert(keynum != MAX_KEY ||
+           (keynum == MAX_KEY &&
+            (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
     /*
        We need to retrieve the old row into record[1] to be able to
        either update or delete the offending record.  We either:
@@ -2191,7 +2202,7 @@ Old_rows_log_event::write_row(const Relay_log_info *const rli,
       error= unpack_current_row(rli);
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_PRINT("debug",("preparing for update: before and after image"));
     DBUG_DUMP("record[1] (before)", table->record[1], table->s->reclength);
     DBUG_DUMP("record[0] (after)", table->record[0], table->s->reclength);
@@ -2283,7 +2294,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
 {
   DBUG_ENTER("find_row");
 
-  DBUG_ASSERT(m_table && m_table->in_use != NULL);
+  assert(m_table && m_table->in_use != NULL);
 
   TABLE *table= m_table;
   int error;
@@ -2294,7 +2305,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
   prepare_record(table, table->read_set, FALSE /* don't check errors */); 
   error= unpack_current_row(rli); 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("info",("looking for the following record"));
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
 #endif
@@ -2316,8 +2327,8 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
 
       ADD>>>  store_record(table,record[1]);
               int error= table->file->rnd_pos(table->record[0], table->file->ref);
-      ADD>>>  DBUG_ASSERT(memcmp(table->record[1], table->record[0],
-                                 table->s->reclength) == 0);
+              ADD>>>  assert(memcmp(table->record[1], table->record[0],
+              table->s->reclength) == 0);
 
     */
     DBUG_PRINT("info",("locating record using primary key (position)"));
@@ -2360,7 +2371,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
 
     /* Fill key data for the row */
 
-    DBUG_ASSERT(m_key);
+    assert(m_key);
     key_copy(m_key, table->record[0], table->key_info, 0);
 
     DBUG_DUMP("key data", m_key, table->key_info->key_length);
@@ -2542,7 +2553,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
       DBUG_DUMP("record found", table->record[0], table->s->reclength);
     table->file->ha_rnd_end();
 
-    DBUG_ASSERT(error == HA_ERR_END_OF_FILE || error == 0);
+    assert(error == HA_ERR_END_OF_FILE || error == 0);
     DBUG_RETURN(error);
   }
 
@@ -2661,7 +2672,7 @@ Write_rows_log_event_old::do_after_row_operations(const Slave_reporting_capabili
 int 
 Write_rows_log_event_old::do_exec_row(const Relay_log_info *const rli)
 {
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
   int error= write_row(rli, TRUE /* overwrite */);
   
   if (error && !thd->get_protocol_classic()->get_last_errno())
@@ -2764,7 +2775,7 @@ Delete_rows_log_event_old::do_after_row_operations(const Slave_reporting_capabil
 int Delete_rows_log_event_old::do_exec_row(const Relay_log_info *const rli)
 {
   int error;
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
 
   if (!(error= find_row(rli))) 
   { 
@@ -2861,7 +2872,7 @@ Update_rows_log_event_old::do_after_row_operations(const Slave_reporting_capabil
 int 
 Update_rows_log_event_old::do_exec_row(const Relay_log_info *const rli)
 {
-  DBUG_ASSERT(m_table != NULL);
+  assert(m_table != NULL);
 
   int error= find_row(rli); 
   if (error)
diff --git a/sql/log_event_old.h b/sql/log_event_old.h
index 411d00def819..0564b65347d2 100644
--- a/sql/log_event_old.h
+++ b/sql/log_event_old.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -203,7 +210,7 @@ class Old_rows_log_event : public Binary_log_event, public Log_event
   // Unpack the current row into m_table->record[0]
   int unpack_current_row(const Relay_log_info *const rli)
   { 
-    DBUG_ASSERT(m_table);
+    assert(m_table);
     ASSERT_OR_RETURN_ERROR(m_curr_row < m_rows_end, HA_ERR_CORRUPT_EVENT);
     return ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols,
                                    &m_curr_row_end, &m_master_reclength, m_rows_end);
diff --git a/sql/main.cc b/sql/main.cc
index 4da4d6c2775b..b20ea49f003c 100644
--- a/sql/main.cc
+++ b/sql/main.cc
@@ -1,14 +1,21 @@
-/* Copyright (c) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/malloc_allocator.h b/sql/malloc_allocator.h
index 0cbb824021d7..3d466bd91f81 100644
--- a/sql/malloc_allocator.h
+++ b/sql/malloc_allocator.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -73,7 +80,7 @@ template <class T> class Malloc_allocator
   template <class U> Malloc_allocator & operator=
     (const Malloc_allocator<U> &other)
   {
-    DBUG_ASSERT(m_key == other.psi_key()); // Don't swap key.
+    assert(m_key == other.psi_key()); // Don't swap key.
   }
 
   ~Malloc_allocator()
@@ -97,21 +104,21 @@ template <class T> class Malloc_allocator
 
   void construct(pointer p, const T& val)
   {
-    DBUG_ASSERT(p != NULL);
+    assert(p != NULL);
     try {
       new(p) T(val);
     } catch (...) {
-      DBUG_ASSERT(false); // Constructor should not throw an exception.
+      assert(false); // Constructor should not throw an exception.
     }
   }
 
   void destroy(pointer p)
   {
-    DBUG_ASSERT(p != NULL);
+    assert(p != NULL);
     try {
       p->~T();
     } catch (...) {
-      DBUG_ASSERT(false); // Destructor should not throw an exception
+      assert(false); // Destructor should not throw an exception
     }
   }
 
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 8fcb568b5e87..abef991e6805 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -339,7 +346,7 @@ bool Deadlock_detection_visitor::enter_node(MDL_context *node)
   m_found_deadlock= ++m_current_search_depth >= MAX_SEARCH_DEPTH;
   if (m_found_deadlock)
   {
-    DBUG_ASSERT(! m_victim);
+    assert(! m_victim);
     opt_change_victim_to(node);
   }
   return m_found_deadlock;
@@ -914,7 +921,7 @@ class MDL_lock
       If HAS_SLOW_PATH flag is set all changes to m_fast_path_state
       should happen under protection of MDL_lock::m_rwlock ([INV1]).
     */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     if (((*old_state & (IS_DESTROYED | HAS_OBTRUSIVE | HAS_SLOW_PATH)) !=
          (new_state & (IS_DESTROYED | HAS_OBTRUSIVE | HAS_SLOW_PATH))) ||
         *old_state & HAS_OBTRUSIVE)
@@ -926,7 +933,7 @@ class MDL_lock
       We should not change state of destroyed object
       (fast_path_state_reset() being exception).
     */
-    DBUG_ASSERT(! (*old_state & IS_DESTROYED));
+    assert(! (*old_state & IS_DESTROYED));
 
     return my_atomic_cas64(&m_fast_path_state, old_state, new_state);
   }
@@ -951,7 +958,7 @@ class MDL_lock
       We should not change state of destroyed object
       (fast_path_state_reset() being exception).
     */
-    DBUG_ASSERT(! (old_state & IS_DESTROYED));
+    assert(! (old_state & IS_DESTROYED));
     return old_state;
   }
 
@@ -1075,7 +1082,7 @@ mdl_locks_key(const uchar *record, size_t *length,
 
 void mdl_init()
 {
-  DBUG_ASSERT(! mdl_initialized);
+  assert(! mdl_initialized);
   mdl_initialized= TRUE;
 
 #ifdef HAVE_PSI_INTERFACE
@@ -1209,7 +1216,7 @@ MDL_lock* MDL_map::find(LF_PINS *pins, const MDL_key *mdl_key, bool *pinned)
       It works since these namespaces contain only one element so keys
       for them look like '<namespace-id>\0\0'.
     */
-    DBUG_ASSERT(mdl_key->length() == 3);
+    assert(mdl_key->length() == 3);
 
     lock= (mdl_key->mdl_namespace() == MDL_key::GLOBAL) ? m_global_lock :
                                                           m_commit_lock;
@@ -1407,7 +1414,7 @@ void MDL_map::remove_random_unused(MDL_context *ctx, LF_PINS *pins,
     int rc= lf_hash_delete(&m_locks, pins, lock->key.ptr(), lock->key.length());
 
     /* The MDL_lock object must be present in the hash. */
-    DBUG_ASSERT(rc != 1);
+    assert(rc != 1);
 
     if (rc == -1)
     {
@@ -1441,7 +1448,7 @@ void MDL_map::remove_random_unused(MDL_context *ctx, LF_PINS *pins,
       Assert that compare-and-swap operation is of strong kind and can't
       fail spuriously.
     */
-    DBUG_ASSERT(old_state != 0);
+    assert(old_state != 0);
     mysql_prlock_unlock(&lock->m_rwlock);
     *unused_locks= m_unused_lock_objects;
   }
@@ -1481,9 +1488,9 @@ MDL_context::MDL_context()
 
 void MDL_context::destroy()
 {
-  DBUG_ASSERT(m_tickets[MDL_STATEMENT].is_empty());
-  DBUG_ASSERT(m_tickets[MDL_TRANSACTION].is_empty());
-  DBUG_ASSERT(m_tickets[MDL_EXPLICIT].is_empty());
+  assert(m_tickets[MDL_STATEMENT].is_empty());
+  assert(m_tickets[MDL_TRANSACTION].is_empty());
+  assert(m_tickets[MDL_EXPLICIT].is_empty());
 
   mysql_prlock_destroy(&m_LOCK_waiting_for);
   if (m_pins)
@@ -1622,9 +1629,9 @@ inline void MDL_lock::reinit(const MDL_key *mdl_key)
     Check that we have clean "m_granted" and "m_waiting" sets/lists in both
     cases when we have fresh and re-used object.
   */
-  DBUG_ASSERT(m_granted.is_empty() && m_waiting.is_empty());
+  assert(m_granted.is_empty() && m_waiting.is_empty());
   /* The same should be true for "m_obtrusive_locks_granted_waiting_count". */
-  DBUG_ASSERT(m_obtrusive_locks_granted_waiting_count == 0);
+  assert(m_obtrusive_locks_granted_waiting_count == 0);
 }
 
 
@@ -1684,14 +1691,14 @@ MDL_lock::needs_hton_notification(MDL_key::enum_mdl_namespace mdl_namespace)
 */
 
 MDL_ticket *MDL_ticket::create(MDL_context *ctx_arg, enum_mdl_type type_arg
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                                , enum_mdl_duration duration_arg
 #endif
                                )
 {
   return new (std::nothrow)
              MDL_ticket(ctx_arg, type_arg
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                         , duration_arg
 #endif
                         );
@@ -1922,7 +1929,7 @@ void MDL_lock::Ticket_list::add_ticket(MDL_ticket *ticket)
     since for such tickets methods accessing this member might be
     called by other threads.
   */
-  DBUG_ASSERT(ticket->get_lock());
+  assert(ticket->get_lock());
   /*
     Add ticket to the *back* of the queue to ensure fairness
     among requests with the same priority.
@@ -2964,7 +2971,7 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
   bool force_slow;
   bool pinned;
 
-  DBUG_ASSERT(mdl_request->ticket == NULL);
+  assert(mdl_request->ticket == NULL);
 
   /* Don't take chances in production. */
   mdl_request->ticket= NULL;
@@ -2976,8 +2983,8 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
   */
   if ((ticket= find_ticket(mdl_request, &found_duration)))
   {
-    DBUG_ASSERT(ticket->m_lock);
-    DBUG_ASSERT(ticket->has_stronger_or_equal_type(mdl_request->type));
+    assert(ticket->m_lock);
+    assert(ticket->has_stronger_or_equal_type(mdl_request->type));
     /*
       If the request is for a transactional lock, and we found
       a transactional lock, just reuse the found ticket.
@@ -3017,7 +3024,7 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
     return TRUE;
 
   if (!(ticket= MDL_ticket::create(this, mdl_request->type
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                                    , mdl_request->duration
 #endif
                                    )))
@@ -3046,7 +3053,7 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
   if (! unobtrusive_lock_increment)
     materialize_fast_path_locks();
 
-  DBUG_ASSERT(ticket->m_psi == NULL);
+  assert(ticket->m_psi == NULL);
   ticket->m_psi= mysql_mdl_create(ticket, key,
                                   mdl_request->type,
                                   mdl_request->duration,
@@ -3099,7 +3106,7 @@ MDL_context::try_acquire_lock_impl(MDL_request *mdl_request,
     Code counting unused MDL_lock objects below assumes that object is not
     pinned iff it is a singleton.
   */
-  DBUG_ASSERT(mdl_locks.is_lock_object_singleton(key) == !pinned);
+  assert(mdl_locks.is_lock_object_singleton(key) == !pinned);
 
   if (! force_slow)
   {
@@ -3371,13 +3378,13 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
     the request.
   */
   if (!(ticket= MDL_ticket::create(this, mdl_request->type
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                                    , mdl_request->duration
 #endif
                                    )))
     return TRUE;
 
-  DBUG_ASSERT(ticket->m_psi == NULL);
+  assert(ticket->m_psi == NULL);
   ticket->m_psi= mysql_mdl_create(ticket,
                                   &mdl_request->key,
                                   mdl_request->type,
@@ -3387,7 +3394,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
                                   mdl_request->m_src_line);
 
   /* clone() is not supposed to be used to get a stronger lock. */
-  DBUG_ASSERT(mdl_request->ticket->has_stronger_or_equal_type(ticket->m_type));
+  assert(mdl_request->ticket->has_stronger_or_equal_type(ticket->m_type));
 
 
   /*
@@ -3398,7 +3405,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
   if (mdl_request->type == MDL_EXCLUSIVE &&
       MDL_lock::needs_hton_notification(mdl_request->key.mdl_namespace()))
   {
-    DBUG_ASSERT(mdl_request->ticket->m_hton_notified);
+    assert(mdl_request->ticket->m_hton_notified);
 
     mysql_mdl_set_status(ticket->m_psi, MDL_ticket::PRE_ACQUIRE_NOTIFY);
 
@@ -3429,7 +3436,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
       "Obtrusive" type of lock can't be cloned from weaker, "unobtrusive"
       type of lock.
     */
-    DBUG_ASSERT(unobtrusive_lock_increment != 0);
+    assert(unobtrusive_lock_increment != 0);
 
     /*
       Increment of counter in MDL_lock::m_fast_path_state needs to happen here
@@ -3459,7 +3466,7 @@ MDL_context::clone_ticket(MDL_request *mdl_request)
         here as it is already set since the ticket being cloned already
         represents "obtrusive" lock for this MDL_lock object.
       */
-      DBUG_ASSERT(ticket->m_lock->m_obtrusive_locks_granted_waiting_count != 0);
+      assert(ticket->m_lock->m_obtrusive_locks_granted_waiting_count != 0);
       ++ticket->m_lock->m_obtrusive_locks_granted_waiting_count;
     }
     mysql_prlock_unlock(&ticket->m_lock->m_rwlock);
@@ -3554,6 +3561,32 @@ void MDL_lock::object_lock_notify_conflicting_locks(MDL_context *ctx, MDL_lock *
 bool
 MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
 {
+  if (lock_wait_timeout == 0)
+  {
+    /*
+      Resort to try_acquire_lock() in case of zero timeout.
+
+      This allows to avoid unnecessary deadlock detection attempt and "fake"
+      deadlocks which might result from it.
+      In case of failure to acquire lock, try_acquire_lock() preserves
+      invariants by updating MDL_lock::fast_path_state and obtrusive locks
+      count. It also performs SE notification if needed.
+    */
+    if (try_acquire_lock(mdl_request))
+      return true;
+
+    if (!mdl_request->ticket)
+    {
+      /* We have failed to acquire lock instantly. */
+      DEBUG_SYNC(get_thd(), "mdl_acquire_lock_wait");
+      my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
+      return true;
+    }
+    return false;
+  }
+
+  /* Normal, non-zero timeout case. */
+
   MDL_lock *lock;
   MDL_ticket *ticket;
   struct timespec abs_timeout;
@@ -3574,34 +3607,6 @@ MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
     return FALSE;
   }
 
-  /*
-    Return early if we did not get the lock and are not willing to wait.
-    This way we avoid reporting "fake" deadlock for lock_wait_timeout == 0.
-  */
-  if (lock_wait_timeout == 0)
-  {
-    /*
-      Lock acquired inside try_acquire_lock_impl(). Release before
-      leaving scope.
-    */
-    mysql_prlock_unlock(&ticket->m_lock->m_rwlock);
-
-    /*
-      If SEs were notified about impending lock acquisition, the failure
-      to acquire it requires the same notification as lock release.
-    */
-    if (ticket->m_hton_notified)
-    {
-      mysql_mdl_set_status(ticket->m_psi, MDL_ticket::POST_RELEASE_NOTIFY);
-      m_owner->notify_hton_post_release_exclusive(&mdl_request->key);
-    }
-    DEBUG_SYNC(get_thd(), "mdl_acquire_lock_wait");
-
-    MDL_ticket::destroy(ticket);
-    my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
-    return true;
-  }
-
   /*
     Our attempt to acquire lock without waiting has failed.
     As a result of this attempt we got MDL_ticket with m_lock
@@ -3734,7 +3739,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
         my_error(ER_QUERY_INTERRUPTED, MYF(0));
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
     return TRUE;
@@ -3746,7 +3751,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
     concurrent thread (@sa MDL_lock:reschedule_waiters()).
     So all we need to do is to update MDL_context and MDL_request objects.
   */
-  DBUG_ASSERT(wait_status == MDL_wait::GRANTED);
+  assert(wait_status == MDL_wait::GRANTED);
 
   m_tickets[mdl_request->duration].push_front(ticket);
 
@@ -3926,7 +3931,7 @@ MDL_context::upgrade_shared_lock(MDL_ticket *mdl_ticket,
   lock= mdl_ticket->m_lock;
 
   /* Code below assumes that we were upgrading to "obtrusive" type of lock. */
-  DBUG_ASSERT(lock->is_obtrusive_lock(new_type));
+  assert(lock->is_obtrusive_lock(new_type));
 
   /* Merge the acquired and the original lock. @todo: move to a method. */
   mysql_prlock_wrlock(&lock->m_rwlock);
@@ -3987,7 +3992,7 @@ MDL_context::upgrade_shared_lock(MDL_ticket *mdl_ticket,
     HAS_OBTRUSIVE flag has been already set by acquire_lock()
     and should not have been cleared since then.
   */
-  DBUG_ASSERT(lock->m_fast_path_state & MDL_lock::HAS_OBTRUSIVE);
+  assert(lock->m_fast_path_state & MDL_lock::HAS_OBTRUSIVE);
   ++lock->m_obtrusive_locks_granted_waiting_count;
 
   mysql_prlock_unlock(&lock->m_rwlock);
@@ -3997,7 +4002,7 @@ MDL_context::upgrade_shared_lock(MDL_ticket *mdl_ticket,
     SE notification and it turns out that we already have lock of this type
     associated with different ticket.
   */
-  DBUG_ASSERT(is_new_ticket || ! mdl_new_lock_request.ticket->m_hton_notified);
+  assert(is_new_ticket || ! mdl_new_lock_request.ticket->m_hton_notified);
 
   mdl_ticket->m_hton_notified= mdl_new_lock_request.ticket->m_hton_notified;
 
@@ -4284,7 +4289,7 @@ void MDL_context::release_lock(enum_mdl_duration duration, MDL_ticket *ticket)
   DBUG_PRINT("enter", ("db=%s name=%s", lock->key.db_name(),
                                         lock->key.name()));
 
-  DBUG_ASSERT(this == ticket->get_ctx());
+  assert(this == ticket->get_ctx());
   mysql_mutex_assert_not_owner(&LOCK_open);
 
 
@@ -4309,7 +4314,7 @@ void MDL_context::release_lock(enum_mdl_duration duration, MDL_ticket *ticket)
     bool is_singleton= mdl_locks.is_lock_object_singleton(&lock->key);
 
     /* We should not have "fast path" tickets for "obtrusive" lock types. */
-    DBUG_ASSERT(unobtrusive_lock_increment != 0);
+    assert(unobtrusive_lock_increment != 0);
 
     /*
       We need decrement part of m_fast_path_state which holds number of
@@ -4409,7 +4414,7 @@ void MDL_context::release_lock(enum_mdl_duration duration, MDL_ticket *ticket)
 
 void MDL_context::release_lock(MDL_ticket *ticket)
 {
-  DBUG_ASSERT(ticket->m_duration == MDL_EXPLICIT);
+  assert(ticket->m_duration == MDL_EXPLICIT);
 
   release_lock(MDL_EXPLICIT, ticket);
 }
@@ -4467,7 +4472,7 @@ void MDL_context::release_all_locks_for_name(MDL_ticket *name)
 
   while ((ticket= it_ticket++))
   {
-    DBUG_ASSERT(ticket->m_lock);
+    assert(ticket->m_lock);
     if (ticket->m_lock == lock)
       release_lock(MDL_EXPLICIT, ticket);
   }
@@ -4489,7 +4494,7 @@ void MDL_context::release_locks(MDL_release_locks_visitor *visitor)
 
   while ((ticket= it_ticket++))
   {
-    DBUG_ASSERT(ticket->m_lock);
+    assert(ticket->m_lock);
     if (visitor->release(ticket))
       release_lock(MDL_EXPLICIT, ticket);
   }
@@ -4518,11 +4523,11 @@ void MDL_ticket::downgrade_lock(enum_mdl_type new_type)
     return;
 
   /* Only allow downgrade from EXCLUSIVE and SHARED_NO_WRITE. */
-  DBUG_ASSERT(m_type == MDL_EXCLUSIVE ||
-              m_type == MDL_SHARED_NO_WRITE);
+  assert(m_type == MDL_EXCLUSIVE ||
+         m_type == MDL_SHARED_NO_WRITE);
 
   /* Below we assume that we always downgrade "obtrusive" locks. */
-  DBUG_ASSERT(m_lock->is_obtrusive_lock(m_type));
+  assert(m_lock->is_obtrusive_lock(m_type));
 
   new_type_is_unobtrusive= ! m_lock->is_obtrusive_lock(new_type);
 
@@ -4603,7 +4608,7 @@ MDL_context::owns_equal_or_stronger_lock(
                    mdl_namespace, db, name, mdl_type, MDL_TRANSACTION);
   MDL_ticket *ticket= find_ticket(&mdl_request, &not_unused);
 
-  DBUG_ASSERT(ticket == NULL || ticket->m_lock);
+  assert(ticket == NULL || ticket->m_lock);
 
   return ticket;
 }
@@ -4835,12 +4840,12 @@ bool MDL_context::has_locks_waited_for() const
 void MDL_context::set_lock_duration(MDL_ticket *mdl_ticket,
                                     enum_mdl_duration duration)
 {
-  DBUG_ASSERT(mdl_ticket->m_duration == MDL_TRANSACTION &&
-              duration != MDL_TRANSACTION);
+  assert(mdl_ticket->m_duration == MDL_TRANSACTION &&
+         duration != MDL_TRANSACTION);
 
   m_tickets[MDL_TRANSACTION].remove(mdl_ticket);
   m_tickets[duration].push_front(mdl_ticket);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mdl_ticket->m_duration= duration;
 #endif
 }
@@ -4877,7 +4882,7 @@ void MDL_context::set_explicit_duration_for_all_locks()
     }
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   Ticket_iterator exp_it(m_tickets[MDL_EXPLICIT]);
 
   while ((ticket= exp_it++))
@@ -4903,7 +4908,7 @@ void MDL_context::set_transaction_duration_for_all_locks()
     locks with transactional duration.
   */
 
-  DBUG_ASSERT(m_tickets[MDL_STATEMENT].is_empty());
+  assert(m_tickets[MDL_STATEMENT].is_empty());
 
   m_tickets[MDL_TRANSACTION].swap(m_tickets[MDL_EXPLICIT]);
 
@@ -4915,7 +4920,7 @@ void MDL_context::set_transaction_duration_for_all_locks()
     m_tickets[MDL_TRANSACTION].push_front(ticket);
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   Ticket_iterator trans_it(m_tickets[MDL_TRANSACTION]);
 
   while ((ticket= trans_it++))
diff --git a/sql/mdl.h b/sql/mdl.h
index 0ef49fb00959..50818bfa5ffa 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -1,15 +1,22 @@
 #ifndef MDL_H
 #define MDL_H
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -390,7 +397,7 @@ struct MDL_key
       are not longer than NAME_LEN. Still we play safe and try to avoid
       buffer overruns.
     */
-    DBUG_ASSERT(strlen(db) <= NAME_LEN && strlen(name) <= NAME_LEN);
+    assert(strlen(db) <= NAME_LEN && strlen(name) <= NAME_LEN);
     m_db_name_length= static_cast<uint16>(strmake(m_ptr + 1, db, NAME_LEN) -
                                           m_ptr - 1);
     m_length= static_cast<uint16>(strmake(m_ptr + m_db_name_length + 2, name,
@@ -511,7 +518,7 @@ class MDL_request
   /** Set type of lock request. Can be only applied to pending locks. */
   inline void set_type(enum_mdl_type type_arg)
   {
-    DBUG_ASSERT(ticket == NULL);
+    assert(ticket == NULL);
     type= type_arg;
   }
 
@@ -693,12 +700,12 @@ class MDL_ticket : public MDL_wait_for_subgraph
   friend class MDL_context;
 
   MDL_ticket(MDL_context *ctx_arg, enum_mdl_type type_arg
-#ifndef DBUG_OFF
+#ifndef NDEBUG
              , enum_mdl_duration duration_arg
 #endif
             )
    : m_type(type_arg),
-#ifndef DBUG_OFF
+#ifndef NDEBUG
      m_duration(duration_arg),
 #endif
      m_ctx(ctx_arg),
@@ -710,11 +717,11 @@ class MDL_ticket : public MDL_wait_for_subgraph
 
   virtual ~MDL_ticket()
   {
-    DBUG_ASSERT(m_psi == NULL);
+    assert(m_psi == NULL);
   }
 
   static MDL_ticket *create(MDL_context *ctx_arg, enum_mdl_type type_arg
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                             , enum_mdl_duration duration_arg
 #endif
                             );
@@ -722,7 +729,7 @@ class MDL_ticket : public MDL_wait_for_subgraph
 private:
   /** Type of metadata lock. Externally accessible. */
   enum enum_mdl_type m_type;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     Duration of lock represented by this ticket.
     Context private. Debug-only.
@@ -1174,7 +1181,7 @@ void mdl_init();
 void mdl_destroy();
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern mysql_mutex_t LOCK_open;
 #endif
 
diff --git a/sql/mem_root_array.h b/sql/mem_root_array.h
index 9e33d3623894..78e1d7814e7c 100644
--- a/sql/mem_root_array.h
+++ b/sql/mem_root_array.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -52,7 +59,7 @@ class Mem_root_array_YY
 
   void init(MEM_ROOT *root)
   {
-    DBUG_ASSERT(root != NULL);
+    assert(root != NULL);
 
     m_root= root;
     m_array= NULL;
@@ -67,18 +74,18 @@ class Mem_root_array_YY
   void set_mem_root(MEM_ROOT *new_root)
   {
     m_root= new_root;
-    DBUG_ASSERT(m_root != NULL);
+    assert(m_root != NULL);
   }
 
   Element_type &at(size_t n)
   {
-    DBUG_ASSERT(n < size());
+    assert(n < size());
     return m_array[n];
   }
 
   const Element_type &at(size_t n) const
   {
-    DBUG_ASSERT(n < size());
+    assert(n < size());
     return m_array[n];
   }
 
@@ -113,7 +120,7 @@ class Mem_root_array_YY
   */
   void chop(const size_t pos)
   {
-    DBUG_ASSERT(pos < m_size);
+    assert(pos < m_size);
     if (!has_trivial_destructor)
     {
       for (size_t ix= pos; ix < m_size; ++ix)
@@ -185,7 +192,7 @@ class Mem_root_array_YY
    */
   void pop_back()
   {
-    DBUG_ASSERT(!empty());
+    assert(!empty());
     if (!has_trivial_destructor)
       back().~Element_type();
     m_size-= 1;
diff --git a/sql/memroot_allocator.h b/sql/memroot_allocator.h
index 82d23ccca87e..24118a67968f 100644
--- a/sql/memroot_allocator.h
+++ b/sql/memroot_allocator.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -84,7 +91,7 @@ template <class T> class Memroot_allocator
   template <class U> Memroot_allocator & operator=
     (const Memroot_allocator<U> &other)
   {
-    DBUG_ASSERT(m_memroot == other.memroot()); // Don't swap memroot.
+    assert(m_memroot == other.memroot()); // Don't swap memroot.
   }
 
   ~Memroot_allocator()
@@ -107,21 +114,21 @@ template <class T> class Memroot_allocator
 
   void construct(pointer p, const T& val)
   {
-    DBUG_ASSERT(p != NULL);
+    assert(p != NULL);
     try {
       new(p) T(val);
     } catch (...) {
-      DBUG_ASSERT(false); // Constructor should not throw an exception.
+      assert(false); // Constructor should not throw an exception.
     }
   }
 
   void destroy(pointer p)
   {
-    DBUG_ASSERT(p != NULL);
+    assert(p != NULL);
     try {
       p->~T();
     } catch (...) {
-      DBUG_ASSERT(false); // Destructor should not throw an exception
+      assert(false); // Destructor should not throw an exception
     }
   }
 
diff --git a/sql/merge_sort.h b/sql/merge_sort.h
index 7f06ae222e78..bcfcd73cf11a 100644
--- a/sql/merge_sort.h
+++ b/sql/merge_sort.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -122,7 +129,7 @@ void merge_sort(Element_type **first, Element_type **last, Comp_func comp)
 
   for (uint i= 0; i < elements; i++)
   {
-    DBUG_ASSERT (cur1 < middle || cur2 < last);
+    assert (cur1 < middle || cur2 < last);
 
     if (cur1 == middle)
       merged.push(*cur2++);
diff --git a/sql/message.h b/sql/message.h
index 8ef0032e4233..c7e9e151941e 100644
--- a/sql/message.h
+++ b/sql/message.h
@@ -1,17 +1,24 @@
 #ifndef MESSAGE_INCLUDED
 #define MESSAGE_INCLUDED
-/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
diff --git a/sql/message.rc b/sql/message.rc
index 116522b7d48e..98c5c1d7d1ac 100644
--- a/sql/message.rc
+++ b/sql/message.rc
@@ -1,2 +1,24 @@
+// Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 LANGUAGE 0x9,0x1
 1 11 MSG00001.bin
diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc
index 4ce0eeaf9fee..b87883b4ce6c 100644
--- a/sql/mf_iocache.cc
+++ b/sql/mf_iocache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/migrate_keyring.cc b/sql/migrate_keyring.cc
index 7b7cd68e557b..66e154297068 100644
--- a/sql/migrate_keyring.cc
+++ b/sql/migrate_keyring.cc
@@ -1,19 +1,27 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "log.h"
+#include "my_default.h"                 // my_getopt_use_args_separator
 #include "migrate_keyring.h"
 #include "mysqld.h"
 #include "mysqld_error.h"
@@ -29,6 +37,8 @@ Migrate_keyring::Migrate_keyring()
   m_source_plugin_handle= NULL;
   m_destination_plugin_handle= NULL;
   mysql= NULL;
+  m_argc = 0;
+  m_argv = NULL;
 }
 
 /**
@@ -66,9 +76,6 @@ bool Migrate_keyring::init(int  argc,
   string so(".so");
   string dll(".dll");
 
-  m_argc= argc;
-  m_argv= argv;
-
   if (!source_plugin)
   {
     my_error(ER_KEYRING_MIGRATION_FAILURE, MYF(0),
@@ -112,10 +119,6 @@ bool Migrate_keyring::init(int  argc,
     DBUG_RETURN(true);
   }
 
-  /* Restore program name */
-  m_argc++;
-  m_argv--;
-
   /* if connect options are provided then initiate connection */
   if (migrate_connect_options)
   {
@@ -140,6 +143,17 @@ bool Migrate_keyring::init(int  argc,
       DBUG_RETURN(true);
     }
   }
+
+  m_argc= argc;
+  m_argv= new char *[m_argc + 2];  // 1st for extra option and 2nd for NULL
+  for (int cnt= 0; cnt < m_argc; ++cnt) {
+    m_argv[cnt]= argv[cnt];
+  }
+  /* add --loose_<plugin_name>_open_mode=1 option */
+  m_internal_option= "--loose_" + m_source_plugin_name + "_open_mode=1";
+  m_argv[m_argc]= const_cast<char *>(m_internal_option.c_str());
+  /* update m_argc, m_argv */
+  m_argv[++m_argc]= NULL;
   DBUG_RETURN(false);
 }
 
@@ -164,12 +178,18 @@ bool Migrate_keyring::execute()
 {
   DBUG_ENTER("Migrate_keyring::execute");
 
+  char **tmp_m_argv;
+
+  /* Disable access to keyring service APIs */
+  if (migrate_connect_options && disable_keyring_operations())
+      goto error;
+
   /* Load source plugin. */
   if (load_plugin(SOURCE_PLUGIN))
   {
     my_error(ER_KEYRING_MIGRATION_FAILURE, MYF(0),
              "Failed to initialize source keyring");
-    DBUG_RETURN(true);
+    goto error;
   }
 
   /* Load destination source plugin. */
@@ -177,12 +197,35 @@ bool Migrate_keyring::execute()
   {
     my_error(ER_KEYRING_MIGRATION_FAILURE, MYF(0),
              "Failed to initialize destination keyring");
-    DBUG_RETURN(true);
+    goto error;
   }
 
-  /* Disable access to keyring service APIs */
-  if (migrate_connect_options && disable_keyring_operations())
-    goto error;
+  /* skip program name */
+  m_argc--;
+  /* We use a tmp ptr instead of m_argv since if the latter gets changed, we
+   * lose access to the alloced mem and hence there would be leak */
+  tmp_m_argv= m_argv + 1;
+  /* check for invalid options */
+  if (m_argc > 1)
+  {
+    struct my_option no_opts[]=
+    {
+      {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+    };
+    my_getopt_skip_unknown= 0;
+    my_getopt_use_args_separator= true;
+    if (handle_options(&m_argc, &tmp_m_argv, no_opts, NULL))
+      unireg_abort(MYSQLD_ABORT_EXIT);
+
+    if (m_argc > 1)
+    {
+      sql_print_error("Please specify options specific to keyring migration. Any "
+                      "additional options can be ignored. NOTE: Although some options "
+                      "are valid, migration tool can still report error example: plugin "
+                      "variables for which plugin is not loaded yet.");
+      unireg_abort(MYSQLD_ABORT_EXIT);
+    }
+  }
 
   /* Fetch all keys from source plugin and store into destination plugin. */
   if (fetch_and_store_keys())
@@ -371,6 +414,12 @@ bool Migrate_keyring::disable_keyring_operations()
 {
   DBUG_ENTER("Migrate_keyring::disable_keyring_operations");
   const char query[]= "SET GLOBAL KEYRING_OPERATIONS=0";
+
+#ifdef HAVE_OPENSSL
+  /* clear the SSL error stack first as the connection could be encrypted */
+  ERR_clear_error();
+#endif
+
   if (mysql && mysql_real_query(mysql, query, strlen(query)))
   {
     my_error(ER_KEYRING_MIGRATION_FAILURE, MYF(0),
@@ -406,6 +455,8 @@ Migrate_keyring::~Migrate_keyring()
 {
   if (mysql)
   {
+    delete[] m_argv;
+    m_argv= NULL;
     mysql_close(mysql);
     mysql= NULL;
     if (migrate_connect_options)
diff --git a/sql/migrate_keyring.h b/sql/migrate_keyring.h
index e7f3c2521c98..7795f1159a81 100644
--- a/sql/migrate_keyring.h
+++ b/sql/migrate_keyring.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -115,6 +122,7 @@ class Migrate_keyring
   string m_destination_plugin_option;
   string m_source_plugin_name;
   string m_destination_plugin_name;
+  string m_internal_option;
   st_mysql_keyring *m_source_plugin_handle;
   st_mysql_keyring *m_destination_plugin_handle;
   std::vector<Key_info> m_source_keys;
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc
index c600d7044450..47776050fa8b 100644
--- a/sql/my_decimal.cc
+++ b/sql/my_decimal.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -69,7 +76,7 @@ int my_decimal::check_result(uint mask, int result) const
       my_error(ER_OUT_OF_RESOURCES, MYF(0));
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
   return result;
@@ -349,7 +356,7 @@ void my_decimal_trim(ulong *precision, uint *scale)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /* routines for debugging print */
 
 #define DIG_PER_DEC1 9
@@ -395,7 +402,7 @@ const char *dbug_decimal_as_string(char *buff, const my_decimal *val)
   return buff;
 }
 
-#endif /*DBUG_OFF*/
+#endif /*NDEBUG*/
 
 
 #endif /*MYSQL_CLIENT*/
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index d964484b7233..178cb6a2c7c1 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -104,13 +116,13 @@ class my_decimal :public decimal_t
     To catch them, we allocate dummy fields around the buffer,
     and test that their values do not change.
    */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   int foo1;
 #endif
 
   decimal_digit_t buffer[DECIMAL_BUFF_LENGTH];
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   int foo2;
   static const int test_value= 123;
 #endif
@@ -120,7 +132,7 @@ class my_decimal :public decimal_t
   my_decimal(const my_decimal &rhs) : decimal_t(rhs)
   {
     rhs.sanity_check();
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     foo1= test_value;
     foo2= test_value;
 #endif
@@ -144,7 +156,7 @@ class my_decimal :public decimal_t
 
   void init()
   {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     foo1= test_value;
     foo2= test_value;
 #endif
@@ -167,9 +179,9 @@ class my_decimal :public decimal_t
 
   void sanity_check() const
   {
-    DBUG_ASSERT(foo1 == test_value);
-    DBUG_ASSERT(foo2 == test_value);
-    DBUG_ASSERT(buf  == buffer);
+    assert(foo1 == test_value);
+    assert(foo2 == test_value);
+    assert(buf  == buffer);
   }
 
   bool sign() const { return decimal_t::sign; }
@@ -193,7 +205,7 @@ class my_decimal :public decimal_t
 };
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void print_decimal(const my_decimal *dec);
 void print_decimal_buff(const my_decimal *dec, const uchar* ptr, int length);
 const char *dbug_decimal_as_string(char *buff, const my_decimal *val);
@@ -211,8 +223,8 @@ extern my_decimal decimal_zero;
 inline
 void max_my_decimal(my_decimal *to, int precision, int frac)
 {
-  DBUG_ASSERT((precision <= DECIMAL_MAX_PRECISION)&&
-              (frac <= DECIMAL_MAX_SCALE));
+  assert((precision <= DECIMAL_MAX_PRECISION)&&
+         (frac <= DECIMAL_MAX_SCALE));
   max_decimal(precision, frac, to);
 }
 
@@ -243,7 +255,7 @@ inline uint my_decimal_length_to_precision(uint length, uint scale,
                                            bool unsigned_flag)
 {
   /* Precision can't be negative thus ignore unsigned_flag when length is 0. */
-  DBUG_ASSERT(length || !scale);
+  assert(length || !scale);
   uint retval= (uint) (length - (scale>0 ? 1:0) -
                  (unsigned_flag || !length ? 0:1));
   return retval;
@@ -257,7 +269,7 @@ inline uint32 my_decimal_precision_to_length_no_truncation(uint precision,
     When precision is 0 it means that original length was also 0. Thus
     unsigned_flag is ignored in this case.
   */
-  DBUG_ASSERT(precision || !scale);
+  assert(precision || !scale);
   uint32 retval= (uint32)(precision + (scale > 0 ? 1 : 0) +
                   (unsigned_flag || !precision ? 0 : 1));
   return retval;
@@ -270,7 +282,7 @@ inline uint32 my_decimal_precision_to_length(uint precision, uint8 scale,
     When precision is 0 it means that original length was also 0. Thus
     unsigned_flag is ignored in this case.
   */
-  DBUG_ASSERT(precision || !scale);
+  assert(precision || !scale);
   set_if_smaller(precision, DECIMAL_MAX_PRECISION);
   return my_decimal_precision_to_length_no_truncation(precision, scale,
                                                       unsigned_flag);
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c70468b61be8..cb6f9c583f5e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -41,6 +48,11 @@
 #include <crtdbg.h>
 #endif
 
+#include <sys/types.h>
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
 #include "sql_parse.h"    // test_if_data_home_dir
 #include "sql_cache.h"    // query_cache, query_cache_*
 #include "sql_locale.h"   // MY_LOCALES, my_locales, my_locale_by_name
@@ -159,11 +171,6 @@ using std::vector;
 
 #define mysqld_charset &my_charset_latin1
 
-#if defined(HAVE_SOLARIS_LARGE_PAGES) && defined(__GNUC__)
-extern "C" int getpagesizes(size_t *, int);
-extern "C" int memcntl(caddr_t, size_t, int, caddr_t, int, int);
-#endif
-
 #ifdef HAVE_FPU_CONTROL_H
 # include <fpu_control.h>
 #elif defined(__i386__)
@@ -256,6 +263,7 @@ static PSI_thread_key key_thread_handle_con_sockets;
 static PSI_mutex_key key_LOCK_handler_count;
 static PSI_cond_key key_COND_handler_count;
 static PSI_thread_key key_thread_handle_shutdown;
+static PSI_rwlock_key key_rwlock_LOCK_named_pipe_full_access_group;
 #else
 static PSI_mutex_key key_LOCK_socket_listener_active;
 static PSI_cond_key key_COND_socket_listener_active;
@@ -464,7 +472,7 @@ ulonglong slave_rows_search_algorithms_options;
 my_bool opt_slave_preserve_commit_order;
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 uint slave_rows_last_search_algorithm_used;
 #endif
 ulong mts_parallel_option;
@@ -473,7 +481,7 @@ ulonglong  max_binlog_cache_size=0;
 ulong slave_max_allowed_packet= 0;
 ulong binlog_stmt_cache_size=0;
 int32 opt_binlog_max_flush_queue_time= 0;
-ulong opt_binlog_group_commit_sync_delay= 0;
+long opt_binlog_group_commit_sync_delay= 0;
 ulong opt_binlog_group_commit_sync_no_delay_count= 0;
 ulonglong  max_binlog_stmt_cache_size=0;
 ulong query_cache_size=0;
@@ -672,6 +680,7 @@ mysql_mutex_t LOCK_prepared_stmt_count;
 */
 mysql_mutex_t LOCK_sql_slave_skip_counter;
 mysql_mutex_t LOCK_slave_net_timeout;
+mysql_mutex_t LOCK_slave_trans_dep_tracker;
 mysql_mutex_t LOCK_log_throttle_qni;
 mysql_mutex_t LOCK_offline_mode;
 #ifdef HAVE_OPENSSL
@@ -686,7 +695,6 @@ mysql_cond_t COND_server_started;
 mysql_mutex_t LOCK_reset_gtid_table;
 mysql_mutex_t LOCK_compress_gtid_table;
 mysql_cond_t COND_compress_gtid_table;
-mysql_mutex_t LOCK_group_replication_handler;
 #if !defined (EMBEDDED_LIBRARY) && !defined(_WIN32)
 mysql_mutex_t LOCK_socket_listener_active;
 mysql_cond_t COND_socket_listener_active;
@@ -716,7 +724,6 @@ char *opt_general_logname, *opt_slow_logname, *opt_bin_logname;
 
 static volatile sig_atomic_t kill_in_progress;
 
-
 static my_bool opt_myisam_log;
 static int cleanup_done;
 static ulong opt_specialflag;
@@ -743,7 +750,7 @@ static char **remaining_argv;
 int orig_argc;
 char **orig_argv;
 
-#if defined(HAVE_OPENSSL) && !defined(HAVE_YASSL)
+#if defined(HAVE_OPENSSL)
 bool init_rsa_keys(void);
 void deinit_rsa_keys(void);
 int show_rsa_public_key(THD *thd, SHOW_VAR *var, char *buff);
@@ -751,8 +758,11 @@ int show_rsa_public_key(THD *thd, SHOW_VAR *var, char *buff);
 
 Connection_acceptor<Mysqld_socket_listener> *mysqld_socket_acceptor= NULL;
 #ifdef _WIN32
+static Named_pipe_listener *named_pipe_listener= NULL;
 Connection_acceptor<Named_pipe_listener> *named_pipe_acceptor= NULL;
 Connection_acceptor<Shared_mem_listener> *shared_mem_acceptor= NULL;
+mysql_rwlock_t LOCK_named_pipe_full_access_group;
+char *named_pipe_full_access_group;
 #endif
 
 Checkable_rwlock *global_sid_lock= NULL;
@@ -856,7 +866,7 @@ bool mysqld_embedded=1;
 
 static my_bool plugins_are_initialized= FALSE;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static const char* default_dbug_option;
 #endif
 ulong query_cache_min_res_unit= QUERY_CACHE_MIN_RESULT_DATA_SIZE;
@@ -952,8 +962,8 @@ class Set_kill_conn : public Do_THD_Impl
       }
       DBUG_EXECUTE_IF("Check_dump_thread_is_alive",
                       {
-                        DBUG_ASSERT(killing_thd->get_command() != COM_BINLOG_DUMP &&
-                                    killing_thd->get_command() != COM_BINLOG_DUMP_GTID);
+                        assert(killing_thd->get_command() != COM_BINLOG_DUMP &&
+                               killing_thd->get_command() != COM_BINLOG_DUMP_GTID);
                       };);
     }
     mysql_mutex_lock(&killing_thd->LOCK_thd_data);
@@ -1163,8 +1173,8 @@ extern "C" void unireg_abort(int exit_code)
 
 static void mysqld_exit(int exit_code)
 {
-  DBUG_ASSERT(exit_code >= MYSQLD_SUCCESS_EXIT
-              && exit_code <= MYSQLD_FAILURE_EXIT);
+  assert(exit_code >= MYSQLD_SUCCESS_EXIT
+         && exit_code <= MYSQLD_FAILURE_EXIT);
   mysql_audit_finalize();
 #ifndef EMBEDDED_LIBRARY
   Srv_session::module_deinit();
@@ -1319,6 +1329,7 @@ void clean_up(bool print_message)
 #endif
   }
   table_def_start_shutdown();
+  delegates_shutdown();
   plugin_shutdown();
   delete_optimizer_cost_module();
   ha_end();
@@ -1434,6 +1445,7 @@ static void clean_up_mutexes()
   mysql_mutex_destroy(&LOCK_prepared_stmt_count);
   mysql_mutex_destroy(&LOCK_sql_slave_skip_counter);
   mysql_mutex_destroy(&LOCK_slave_net_timeout);
+  mysql_mutex_destroy(&LOCK_slave_trans_dep_tracker);
   mysql_mutex_destroy(&LOCK_error_messages);
   mysql_mutex_destroy(&LOCK_offline_mode);
   mysql_mutex_destroy(&LOCK_default_password_lifetime);
@@ -1441,6 +1453,7 @@ static void clean_up_mutexes()
 #ifdef _WIN32
   mysql_cond_destroy(&COND_handler_count);
   mysql_mutex_destroy(&LOCK_handler_count);
+  mysql_rwlock_destroy(&LOCK_named_pipe_full_access_group);
 #endif
 #ifndef _WIN32
   mysql_cond_destroy(&COND_socket_listener_active);
@@ -1559,7 +1572,7 @@ static struct passwd *check_user(const char *user)
 static void set_user(const char *user, struct passwd *user_info_arg)
 {
   /* purecov: begin tested */
-  DBUG_ASSERT(user_info_arg != 0);
+  assert(user_info_arg != 0);
 #ifdef HAVE_INITGROUPS
   /*
     We can get a SIGSEGV when calling initgroups() on some systems when NSS
@@ -1587,7 +1600,7 @@ static void set_user(const char *user, struct passwd *user_info_arg)
 
 static void set_effective_user(struct passwd *user_info_arg)
 {
-  DBUG_ASSERT(user_info_arg != 0);
+  assert(user_info_arg != 0);
   if (setregid((gid_t)-1, user_info_arg->pw_gid) == -1)
   {
     sql_print_error("setregid: %s", strerror(errno));
@@ -1655,7 +1668,7 @@ static bool network_init(void)
       report_port= mysqld_port;
 
     if (!opt_disable_networking)
-      DBUG_ASSERT(report_port != 0);
+      assert(report_port != 0);
   }
 #ifdef _WIN32
   // Create named pipe
@@ -1663,8 +1676,7 @@ static bool network_init(void)
   {
     std::string pipe_name= mysqld_unix_port ? mysqld_unix_port : "";
 
-    Named_pipe_listener *named_pipe_listener=
-      new (std::nothrow) Named_pipe_listener(&pipe_name);
+    named_pipe_listener= new (std::nothrow) Named_pipe_listener(&pipe_name);
     if (named_pipe_listener == NULL)
       return true;
 
@@ -2150,7 +2162,7 @@ extern "C" void *signal_hand(void *arg MY_ATTRIBUTE((unused)))
           DBUG_PRINT("info",("Killing socket listener"));
           if (pthread_kill(main_thread_id, SIGUSR1))
           {
-            DBUG_ASSERT(false);
+            assert(false);
             break;
           }
           mysql_cond_wait(&COND_socket_listener_active,
@@ -2222,7 +2234,7 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
   DBUG_ENTER("my_message_sql");
   DBUG_PRINT("error", ("error: %u  message: '%s'", error, str));
 
-  DBUG_ASSERT(str != NULL);
+  assert(str != NULL);
   /*
     An error should have a valid error number (!= 0), so it can be caught
     in stored procedures by SQL exception handlers.
@@ -2230,13 +2242,13 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
     Remaining known places to fix:
     - storage/myisam/mi_create.c, my_printf_error()
     TODO:
-    DBUG_ASSERT(error != 0);
+    assert(error != 0);
   */
 
   if (error == 0)
   {
     /* At least, prevent new abuse ... */
-    DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0);
+    assert(strncmp(str, "MyISAM table", 12) == 0);
     error= ER_UNKNOWN_ERROR;
   }
 
@@ -2549,7 +2561,7 @@ static void init_sql_statement_names()
     if ((first_com <= ptr) && (ptr <= last_com))
     {
       com_index= ((int)(ptr - first_com))/record_size;
-      DBUG_ASSERT(com_index < (uint) SQLCOM_END);
+      assert(com_index < (uint) SQLCOM_END);
       sql_statement_names[com_index].str= var->name;
       /* TODO: Change SHOW_VAR::name to a LEX_STRING, to avoid strlen() */
       sql_statement_names[com_index].length= strlen(var->name);
@@ -2557,8 +2569,8 @@ static void init_sql_statement_names()
     var++;
   }
 
-  DBUG_ASSERT(strcmp(sql_statement_names[(uint) SQLCOM_SELECT].str, "select") == 0);
-  DBUG_ASSERT(strcmp(sql_statement_names[(uint) SQLCOM_SIGNAL].str, "signal") == 0);
+  assert(strcmp(sql_statement_names[(uint) SQLCOM_SELECT].str, "select") == 0);
+  assert(strcmp(sql_statement_names[(uint) SQLCOM_SIGNAL].str, "signal") == 0);
 
   sql_statement_names[(uint) SQLCOM_END].str= "error";
 }
@@ -2735,7 +2747,7 @@ int init_common_variables()
   /* TODO: remove this when my_time_t is 64 bit compatible */
   if (!IS_TIME_T_VALID_FOR_TIMESTAMP(server_start_time))
   {
-    sql_print_error("This MySQL server doesn't support dates later then 2038");
+    sql_print_error("This MySQL server doesn't support dates later than 2038");
     return 1;
   }
 
@@ -2783,7 +2795,7 @@ int init_common_variables()
   if (add_status_vars(status_vars))
     return 1; // an error was already reported
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     We have few debug-only commands in com_status_vars, only visible in debug
     builds. for simplicity we enable the assert only in debug builds
@@ -3080,6 +3092,26 @@ int init_common_variables()
     return 1;
   }
 
+  /* We set the atomic field m_opt_tracking_mode to the value of the sysvar
+     variable m_opt_tracking_mode_value here, as it now has the user given
+     value
+  */
+  set_mysqld_opt_tracking_mode();
+  if (global_system_variables.transaction_write_set_extraction == HASH_ALGORITHM_OFF
+      && mysql_bin_log.m_dependency_tracker.m_opt_tracking_mode != DEPENDENCY_TRACKING_COMMIT_ORDER)
+  {
+    sql_print_error("The transaction_write_set_extraction must be set to XXHASH64 or MURMUR32"
+                    " when binlog_transaction_dependency_tracking is WRITESET or WRITESET_SESSION.");
+    return 1;
+  }
+  else
+    mysql_bin_log.m_dependency_tracker.tracking_mode_changed();
+
+  my_atomic_store64(&mysql_bin_log.m_dependency_tracker.get_writeset()->m_opt_max_history_size,
+                    static_cast<int64>(mysql_bin_log.m_dependency_tracker.
+                        get_writeset()->m_opt_max_history_size_base_var));
+
+
 #define FIX_LOG_VAR(VAR, ALT)                                   \
   if (!VAR || !*VAR)                                            \
     VAR= ALT;
@@ -3197,6 +3229,8 @@ static int init_thread_environment()
                    &LOCK_sql_slave_skip_counter, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_slave_net_timeout,
                    &LOCK_slave_net_timeout, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_slave_trans_dep_tracker,
+                   &LOCK_slave_trans_dep_tracker, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_error_messages,
                    &LOCK_error_messages, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_uuid_generator,
@@ -3227,14 +3261,14 @@ static int init_thread_environment()
                    &LOCK_compress_gtid_table, MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_COND_compress_gtid_table,
                   &COND_compress_gtid_table);
-  mysql_mutex_init(key_LOCK_group_replication_handler,
-                   &LOCK_group_replication_handler, MY_MUTEX_INIT_FAST);
 #ifndef EMBEDDED_LIBRARY
   Events::init_mutexes();
 #if defined(_WIN32)
   mysql_mutex_init(key_LOCK_handler_count,
                    &LOCK_handler_count, MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_COND_handler_count, &COND_handler_count);
+  mysql_rwlock_init(key_rwlock_LOCK_named_pipe_full_access_group,
+                    &LOCK_named_pipe_full_access_group);
 #else
   mysql_mutex_init(key_LOCK_socket_listener_active,
                    &LOCK_socket_listener_active, MY_MUTEX_INIT_FAST);
@@ -3253,8 +3287,8 @@ static int init_thread_environment()
   pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM);
 #endif
 
-  DBUG_ASSERT(! THR_THD_initialized);
-  DBUG_ASSERT(! THR_MALLOC_initialized);
+  assert(! THR_THD_initialized);
+  assert(! THR_MALLOC_initialized);
   if (my_create_thread_local_key(&THR_THD,NULL) ||
       my_create_thread_local_key(&THR_MALLOC,NULL))
   {
@@ -3350,7 +3384,6 @@ int warn_self_signed_ca()
     if (warn_one(opt_ssl_ca))
       return 1;
   }
-#ifndef HAVE_YASSL
   if (opt_ssl_capath && opt_ssl_capath[0])
   {
     /* We have ssl-capath. So search all files in the dir */
@@ -3388,18 +3421,23 @@ int warn_self_signed_ca()
     ca_dir= 0;
     memset(&file_path, 0, sizeof(file_path));
   }
-#endif /* HAVE_YASSL */
   return ret_val;
 }
 
+static void push_deprecated_tls_option_no_replacement(const char *tls_version) {
+  sql_print_warning(ER_DEFAULT(ER_WARN_DEPRECATED_TLS_VERSION), tls_version);
+}
+
 #endif /* EMBEDDED_LIBRARY */
 
 static int init_ssl()
 {
 #ifdef HAVE_OPENSSL
-#ifndef HAVE_YASSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   CRYPTO_malloc_init();
-#endif
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+  OPENSSL_malloc_init();
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   ssl_start();
 #ifndef EMBEDDED_LIBRARY
 
@@ -3411,46 +3449,36 @@ static int init_ssl()
                             "Trying to enable SSL support using them.",
                             DEFAULT_SSL_CA_CERT, DEFAULT_SSL_SERVER_CERT,
                             DEFAULT_SSL_SERVER_KEY);
-#ifndef HAVE_YASSL
     if (do_auto_cert_generation(auto_detection_status) == false)
       return 1;
-#endif
 
     enum enum_ssl_init_error error= SSL_INITERR_NOERROR;
     long ssl_ctx_flags= process_tls_version(opt_tls_version);
+
+    if (!(ssl_ctx_flags & SSL_OP_NO_TLSv1))
+      push_deprecated_tls_option_no_replacement("TLSv1");
+    if (!(ssl_ctx_flags & SSL_OP_NO_TLSv1_1))
+      push_deprecated_tls_option_no_replacement("TLSv1.1");
+
     /* having ssl_acceptor_fd != 0 signals the use of SSL */
     ssl_acceptor_fd= new_VioSSLAcceptorFd(opt_ssl_key, opt_ssl_cert,
 					  opt_ssl_ca, opt_ssl_capath,
 					  opt_ssl_cipher, &error,
                                           opt_ssl_crl, opt_ssl_crlpath, ssl_ctx_flags);
     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
-    ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
     if (!ssl_acceptor_fd)
     {
       /*
         No real need for opt_use_ssl to be enabled in bootstrap mode,
         but we want the SSL materal generation and/or validation (if supplied).
         So we keep it on.
-
-        For yaSSL (since it can't auto-generate the certs from inside the
-        server) we need to hush the warning if in bootstrap mode, as in
-        that mode the server won't be listening for connections and thus
-        the lack of SSL material makes no real difference.
-        However if the user specified any of the --ssl options we keep the
-        warning as it's showing problems with the values supplied.
-
-        For openssl, we don't hush the option since it would indicate a failure
-        in auto-generation, bad key material explicitly specified or
-        auto-generation disabled explcitly while SSL is still on.
       */
-#ifdef HAVE_YASSL
-      if (!opt_bootstrap || SSL_ARTIFACTS_NOT_FOUND != auto_detection_status)
-#endif
-      {
-        sql_print_warning("Failed to set up SSL because of the"
-                          " following SSL library error: %s",
-                          sslGetErrString(error));
-      }
+      sql_print_warning("Failed to set up SSL because of the"
+                        " following SSL library error: %s",
+                        sslGetErrString(error));
       opt_use_ssl = 0;
       have_ssl= SHOW_OPTION_DISABLED;
     }
@@ -3473,10 +3501,8 @@ static int init_ssl()
 #endif /* ! EMBEDDED_LIBRARY */
   if (des_key_file)
     load_des_key_file(des_key_file);
-#ifndef HAVE_YASSL
   if (init_rsa_keys())
     return 1;
-#endif
 #endif /* HAVE_OPENSSL */
   return 0;
 }
@@ -3494,9 +3520,7 @@ static void end_ssl()
     ssl_acceptor_fd= 0;
   }
 #endif /* ! EMBEDDED_LIBRARY */
-#ifndef HAVE_YASSL
   deinit_rsa_keys();
-#endif
 #endif /* HAVE_OPENSSL */
 }
 
@@ -3555,7 +3579,8 @@ static int generate_server_uuid()
 
   strncpy(server_uuid, uuid.c_ptr(), UUID_LENGTH);
   DBUG_EXECUTE_IF("server_uuid_deterministic",
-                  strncpy(server_uuid, "00000000-1111-0000-1111-000000000000", UUID_LENGTH););
+                  memcpy(server_uuid, "00000000-1111-0000-1111-000000000000",
+                         UUID_LENGTH););
   server_uuid[UUID_LENGTH]= '\0';
   return 0;
 }
@@ -3737,7 +3762,7 @@ initialize_storage_engine(char *se_name, const char *se_kind,
                       se_kind, se_name);
       return true;
     }
-    DBUG_ASSERT(*dest_plugin);
+    assert(*dest_plugin);
   }
   else
   {
@@ -3745,8 +3770,9 @@ initialize_storage_engine(char *se_name, const char *se_kind,
       Need to unlock as global_system_variables.table_plugin
       was acquired during plugin_init()
     */
-    plugin_unlock(0, *dest_plugin);
-    *dest_plugin= plugin;
+    plugin_ref old_dest_plugin = *dest_plugin;
+    *dest_plugin = plugin;
+    plugin_unlock(0, old_dest_plugin);
   }
   return false;
 }
@@ -3835,11 +3861,9 @@ static int init_server_components()
     */
     log_error_dest= errorlog_filename_buff;
 
-    if (open_error_log(errorlog_filename_buff))
+    if (open_error_log(errorlog_filename_buff, false))
       unireg_abort(MYSQLD_ABORT_EXIT);
-#ifdef _WIN32
-    FreeConsole();        // Remove window
-#endif
+
   }
   else
   {
@@ -3877,8 +3901,8 @@ static int init_server_components()
                       "--binlog-format work.");
 
   /* Check that we have not let the format to unspecified at this point */
-  DBUG_ASSERT((uint)global_system_variables.binlog_format <=
-              array_elements(binlog_format_names)-1);
+  assert((uint)global_system_variables.binlog_format <=
+         array_elements(binlog_format_names)-1);
 
 #ifdef HAVE_REPLICATION
   if (opt_log_slave_updates && replicate_same_server_id)
@@ -4250,7 +4274,7 @@ a file name for --log-bin-index option", opt_binlog_index_name);
       gtid(s). This is necessary in the MYSQL_BIN_LOG::MYSQL_BIN_LOG to
       corretly compute the set of previous gtids.
     */
-    DBUG_ASSERT(!mysql_bin_log.is_relay_log);
+    assert(!mysql_bin_log.is_relay_log);
     mysql_mutex_t *log_lock= mysql_bin_log.get_log_lock();
     mysql_mutex_lock(log_lock);
 
@@ -4266,15 +4290,6 @@ a file name for --log-bin-index option", opt_binlog_index_name);
     mysql_mutex_unlock(log_lock);
   }
 
-#ifdef HAVE_REPLICATION
-  if (opt_bin_log && expire_logs_days)
-  {
-    time_t purge_time= server_start_time - expire_logs_days*24*60*60;
-    if (purge_time >= 0)
-      mysql_bin_log.purge_logs_before_date(purge_time, true);
-  }
-#endif
-
   if (opt_myisam_log)
     (void) mi_log(1);
 
@@ -4348,7 +4363,7 @@ static void create_shutdown_thread()
 }
 #endif /* _WIN32 */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /*
   Debugging helper function to keep the locale database
   (see sql_locale.cc) and max_month_name_length and
@@ -4378,12 +4393,12 @@ static void test_lc_time_sz()
     {
       DBUG_PRINT("Wrong max day name(or month name) length for locale:",
                  ("%s", (*loc)->name));
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
   DBUG_VOID_RETURN;
 }
-#endif//DBUG_OFF
+#endif//NDEBUG
 
 /*
   @brief : Set opt_super_readonly to user supplied value before
@@ -4598,7 +4613,7 @@ int mysqld_main(int argc, char **argv)
   size_t guardize= 0;
 #ifndef _WIN32
   int retval= pthread_attr_getguardsize(&connection_attrib, &guardize);
-  DBUG_ASSERT(retval == 0);
+  assert(retval == 0);
   if (retval != 0)
     guardize= my_thread_stack_size;
 #endif
@@ -4632,7 +4647,7 @@ int mysqld_main(int argc, char **argv)
     }
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   test_lc_time_sz();
   srand(static_cast<uint>(time(NULL)));
 #endif
@@ -4689,37 +4704,43 @@ int mysqld_main(int argc, char **argv)
       opt_keyring_migration_destination ||
       migrate_connect_options)
   {
-    Migrate_keyring mk;
-    if (mk.init(remaining_argc, remaining_argv,
-                opt_keyring_migration_source,
-                opt_keyring_migration_destination,
-                opt_keyring_migration_user,
-                opt_keyring_migration_host,
-                opt_keyring_migration_password,
-                opt_keyring_migration_socket,
-                opt_keyring_migration_port))
+    int exit_state = MYSQLD_ABORT_EXIT;
+    while (true)
     {
-      sql_print_error(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
-                      "failed");
-      log_error_dest= "stderr";
-      flush_error_log_messages();
-      unireg_abort(MYSQLD_ABORT_EXIT);
-    }
+      Migrate_keyring mk;
+      if (mk.init(remaining_argc, remaining_argv,
+                  opt_keyring_migration_source,
+                  opt_keyring_migration_destination,
+                  opt_keyring_migration_user,
+                  opt_keyring_migration_host,
+                  opt_keyring_migration_password,
+                  opt_keyring_migration_socket,
+                  opt_keyring_migration_port))
+      {
+        sql_print_error(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
+                        "failed");
+        log_error_dest= "stderr";
+        flush_error_log_messages();
+        break;
+      }
 
-    if (mk.execute())
-    {
-      sql_print_error(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
-                      "failed");
+      if (mk.execute())
+      {
+        sql_print_error(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
+                        "failed");
+        log_error_dest= "stderr";
+        flush_error_log_messages();
+        break;
+      }
+
+      sql_print_information(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
+                            "successful");
       log_error_dest= "stderr";
       flush_error_log_messages();
-      unireg_abort(MYSQLD_ABORT_EXIT);
+      exit_state = MYSQLD_SUCCESS_EXIT;
+      break;
     }
-
-    sql_print_information(ER_DEFAULT(ER_KEYRING_MIGRATION_STATUS),
-                          "successfull");
-    log_error_dest= "stderr";
-    flush_error_log_messages();
-    unireg_abort(MYSQLD_SUCCESS_EXIT);
+    unireg_abort(exit_state);
   }
 
   /*
@@ -4863,7 +4884,7 @@ int mysqld_main(int argc, char **argv)
                    (gtids_in_binlog - purged_gtids_from_binlog)
                  = gtids_only_in_table + purged_gtids_from_binlog;
     */
-    DBUG_ASSERT(lost_gtids->is_empty());
+    assert(lost_gtids->is_empty());
     if (lost_gtids->add_gtid_set(gtids_only_in_table) != RETURN_STATUS_OK ||
         lost_gtids->add_gtid_set(&purged_gtids_from_binlog) !=
         RETURN_STATUS_OK)
@@ -4905,6 +4926,17 @@ int mysqld_main(int argc, char **argv)
       unireg_abort(MYSQLD_ABORT_EXIT);
     mysql_bin_log.update_binlog_end_pos();
 
+#ifdef HAVE_REPLICATION
+    if (opt_bin_log && expire_logs_days)
+    {
+      time_t purge_time= server_start_time - expire_logs_days * 24 * 60 * 60;
+      DBUG_EXECUTE_IF("expire_logs_always_at_start",
+                      { purge_time= my_time(0); });
+      if (purge_time >= 0)
+        mysql_bin_log.purge_logs_before_date(purge_time, true);
+    }
+#endif
+
     (void) RUN_HOOK(server_state, after_engine_recovery, (NULL));
   }
 
@@ -4952,6 +4984,8 @@ int mysqld_main(int argc, char **argv)
       grant_init(opt_noacl))
   {
     abort_loop= true;
+    sql_print_error("Fatal error: Failed to initialize ACL/grant/time zones "
+                    "structures or failed to remove temporary table files.");
 
     delete_pid_file(MYF(MY_WME));
 
@@ -5590,7 +5624,7 @@ void adjust_table_def_size()
 
   default_value= min<ulong> (400 + table_cache_size / 2, 2000);
   var= intern_find_sys_var(STRING_WITH_LEN("table_definition_cache"));
-  DBUG_ASSERT(var != NULL);
+  assert(var != NULL);
   var->update_default(default_value);
 
   if (! table_definition_cache_specified)
@@ -6309,7 +6343,7 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
   return 0;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static int show_slave_rows_last_search_algorithm_used(THD *thd, SHOW_VAR *var, char *buff)
 {
   uint res= slave_rows_last_search_algorithm_used;
@@ -6555,10 +6589,11 @@ static int show_ssl_ctx_get_session_cache_mode(THD *thd, SHOW_VAR *var, char *bu
  */
 static int show_ssl_get_version(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_CHAR;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     var->value=
-      const_cast<char*>(SSL_get_version(thd->get_protocol()->get_ssl()));
+      const_cast<char*>(SSL_get_version(ssl));
   else
     var->value= (char *)"";
   return 0;
@@ -6566,11 +6601,12 @@ static int show_ssl_get_version(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_session_reused(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_LONG;
   var->value= buff;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     *((long *)buff)=
-        (long)SSL_session_reused(thd->get_protocol()->get_ssl());
+        (long)SSL_session_reused(ssl);
   else
     *((long *)buff)= 0;
   return 0;
@@ -6578,11 +6614,12 @@ static int show_ssl_session_reused(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_get_default_timeout(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_LONG;
   var->value= buff;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     *((long *)buff)=
-      (long)SSL_get_default_timeout(thd->get_protocol()->get_ssl());
+      (long)SSL_get_default_timeout(ssl);
   else
     *((long *)buff)= 0;
   return 0;
@@ -6590,11 +6627,12 @@ static int show_ssl_get_default_timeout(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_get_verify_mode(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_LONG;
   var->value= buff;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     *((long *)buff)=
-      (long)SSL_get_verify_mode(thd->get_protocol()->get_ssl());
+      (long)SSL_get_verify_mode(ssl);
   else
     *((long *)buff)= 0;
   return 0;
@@ -6602,11 +6640,12 @@ static int show_ssl_get_verify_mode(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_get_verify_depth(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_LONG;
   var->value= buff;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     *((long *)buff)=
-        (long)SSL_get_verify_depth(thd->get_protocol()->get_ssl());
+        (long)SSL_get_verify_depth(ssl);
   else
     *((long *)buff)= 0;
   return 0;
@@ -6614,10 +6653,11 @@ static int show_ssl_get_verify_depth(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_get_cipher(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_CHAR;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
     var->value=
-      const_cast<char*>(SSL_get_cipher(thd->get_protocol()->get_ssl()));
+      const_cast<char*>(SSL_get_cipher(ssl));
   else
     var->value= (char *)"";
   return 0;
@@ -6625,14 +6665,15 @@ static int show_ssl_get_cipher(THD *thd, SHOW_VAR *var, char *buff)
 
 static int show_ssl_get_cipher_list(THD *thd, SHOW_VAR *var, char *buff)
 {
+  SSL_handle ssl = thd->get_ssl();
   var->type= SHOW_CHAR;
   var->value= buff;
-  if (thd->get_protocol()->get_ssl())
+  if (ssl)
   {
     int i;
     const char *p;
     char *end= buff + SHOW_VAR_FUNC_BUFF_SIZE;
-    for (i=0; (p= SSL_get_cipher_list(thd->get_protocol()->get_ssl(),i)) &&
+    for (i=0; (p= SSL_get_cipher_list(ssl,i)) &&
                buff < end; i++)
     {
       buff= my_stpnmov(buff, p, end-buff-1);
@@ -6646,16 +6687,6 @@ static int show_ssl_get_cipher_list(THD *thd, SHOW_VAR *var, char *buff)
 }
 
 
-#ifdef HAVE_YASSL
-
-static char *
-my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
-{
-  return yaSSL_ASN1_TIME_to_string(time, buf, len);
-}
-
-#else /* openssl */
-
 static char *
 my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
 {
@@ -6682,8 +6713,6 @@ my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
   return res;
 }
 
-#endif
-
 
 /**
   Handler function for the 'ssl_get_server_not_before' variable
@@ -6784,13 +6813,13 @@ SHOW_VAR status_vars[]= {
   {"Aborted_connects",         (char*) &show_aborted_connects,                        SHOW_FUNC,               SHOW_SCOPE_GLOBAL},
 #endif
 #ifdef HAVE_REPLICATION
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"Ongoing_anonymous_gtid_violating_transaction_count",(char*) &show_ongoing_anonymous_gtid_violating_transaction_count, SHOW_FUNC, SHOW_SCOPE_GLOBAL},
-#endif//!DBUG_OFF
+#endif//!NDEBUG
   {"Ongoing_anonymous_transaction_count",(char*) &show_ongoing_anonymous_transaction_count, SHOW_FUNC, SHOW_SCOPE_GLOBAL},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"Ongoing_automatic_gtid_violating_transaction_count",(char*) &show_ongoing_automatic_gtid_violating_transaction_count, SHOW_FUNC, SHOW_SCOPE_GLOBAL},
-#endif//!DBUG_OFF
+#endif//!NDEBUG
 #endif//HAVE_REPLICATION
   {"Binlog_cache_disk_use",    (char*) &binlog_cache_disk_use,                        SHOW_LONG,               SHOW_SCOPE_GLOBAL},
   {"Binlog_cache_use",         (char*) &binlog_cache_use,                             SHOW_LONG,               SHOW_SCOPE_GLOBAL},
@@ -6882,7 +6911,7 @@ SHOW_VAR status_vars[]= {
   {"Slave_heartbeat_period",   (char*) &show_heartbeat_period,                         SHOW_FUNC,              SHOW_SCOPE_GLOBAL},
   {"Slave_received_heartbeats",(char*) &show_slave_received_heartbeats,                SHOW_FUNC,              SHOW_SCOPE_GLOBAL},
   {"Slave_last_heartbeat",     (char*) &show_slave_last_heartbeat,                     SHOW_FUNC,              SHOW_SCOPE_GLOBAL},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"Slave_rows_last_search_algorithm_used",(char*) &show_slave_rows_last_search_algorithm_used, SHOW_FUNC,     SHOW_SCOPE_GLOBAL},
 #endif
   {"Slave_running",            (char*) &show_slave_running,                            SHOW_FUNC,              SHOW_SCOPE_GLOBAL},
@@ -6922,10 +6951,8 @@ SHOW_VAR status_vars[]= {
   {"Ssl_version",              (char*) &show_ssl_get_version,                          SHOW_FUNC,              SHOW_SCOPE_ALL},
   {"Ssl_server_not_before",    (char*) &show_ssl_get_server_not_before,                SHOW_FUNC,              SHOW_SCOPE_ALL},
   {"Ssl_server_not_after",     (char*) &show_ssl_get_server_not_after,                 SHOW_FUNC,              SHOW_SCOPE_ALL},
-#ifndef HAVE_YASSL
   {"Rsa_public_key",           (char*) &show_rsa_public_key,                           SHOW_FUNC,              SHOW_SCOPE_GLOBAL},
 #endif
-#endif
 #endif /* HAVE_OPENSSL */
   {"Table_locks_immediate",    (char*) &locks_immediate,                               SHOW_LONG,              SHOW_SCOPE_GLOBAL},
   {"Table_locks_waited",       (char*) &locks_waited,                                  SHOW_LONG,              SHOW_SCOPE_GLOBAL},
@@ -6986,7 +7013,7 @@ static bool operator<(const my_option &a, const my_option &b)
         return false;
     }
   }
-  DBUG_ASSERT(a.name == b.name);
+  assert(a.name == b.name);
   return false;
 }
 
@@ -7170,9 +7197,11 @@ static int mysql_init_variables(void)
   character_set_filesystem_name= (char*) "binary";
   lc_messages= (char*) "en_US";
   lc_time_names_name= (char*) "en_US";
+  opt_replication_optimize_for_static_plugin_config= 0;
+  opt_replication_sender_observe_commit_only= 0;
 
   /* Variables that depends on compile options */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   default_dbug_option=IF_WIN("d:t:i:O,\\mysqld.trace",
            "d:t:i:o,/tmp/mysqld.trace");
 #endif
@@ -7256,7 +7285,7 @@ mysqld_get_one_option(int optid,
 {
   switch(optid) {
   case '#':
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_SET_INITIAL(argument ? argument : default_dbug_option);
 #endif
     opt_endinfo=1;        /* unireg: memory allocation */
@@ -7312,11 +7341,6 @@ mysqld_get_one_option(int optid,
       One can disable SSL later by using --skip-ssl or --ssl=0.
     */
     opt_use_ssl= true;
-#ifdef HAVE_YASSL
-    /* crl has no effect in yaSSL. */
-    opt_ssl_crl= NULL;
-    opt_ssl_crlpath= NULL;
-#endif /* HAVE_YASSL */   
     break;
 #endif /* HAVE_OPENSSL */
 #ifndef EMBEDDED_LIBRARY
@@ -7702,6 +7726,15 @@ mysqld_get_one_option(int optid,
     global_system_variables.transaction_isolation=
                             global_system_variables.tx_isolation;
     break;
+  case OPT_NAMED_PIPE_FULL_ACCESS_GROUP:
+#if defined(_WIN32)  && !defined(EMBEDDED_LIBRARY)
+    if (!is_valid_named_pipe_full_access_group(argument))
+    {
+      sql_print_error("Invalid value for named_pipe_full_access_group.");
+      return 1;
+    }
+#endif /* _WIN32 && !EMBEDDED_LIBRARY */
+    break;
   }
   return 0;
 }
@@ -7994,7 +8027,7 @@ static void set_server_version(void)
 #ifdef EMBEDDED_LIBRARY
   end= my_stpcpy(end, "-embedded");
 #endif
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
     end= my_stpcpy(end, "-debug");
 #endif
@@ -8448,6 +8481,41 @@ static int test_if_case_insensitive(const char *dir_name)
 static void create_pid_file()
 {
   File file;
+  bool check_parent_path= 1, is_path_accessible= 1;
+  char pid_filepath[FN_REFLEN], *pos= NULL;
+  /* Copy pid file name to get pid file path */
+  strcpy(pid_filepath, pidfile_name);
+
+  /* Iterate through the entire path to check if even one of the sub-dirs
+     is world-writable */
+  while (check_parent_path && (pos= strrchr(pid_filepath, FN_LIBCHAR))
+         && (pos != pid_filepath)) /* shouldn't check root */
+  {
+    *pos= '\0';  /* Trim the inner-most dir */
+    switch (is_file_or_dir_world_writable(pid_filepath))
+    {
+      case -2:
+        is_path_accessible= 0;
+        break;
+      case -1:
+        sql_print_error("Can't start server: can't check PID filepath: %s",
+                        strerror(errno));
+        exit(MYSQLD_ABORT_EXIT);
+      case 1:
+        sql_print_warning("Insecure configuration for --pid-file: Location "
+                          "'%s' in the path is accessible to all OS users. "
+                          "Consider choosing a different directory.",
+                          pid_filepath);
+        check_parent_path= 0;
+        break;
+      case 0:
+        continue; /* Keep checking the parent dir */
+    }
+  }
+  if (!is_path_accessible)
+  {
+    sql_print_warning("Few location(s) are inaccessible while checking PID filepath.");
+  }
   if ((file= mysql_file_create(key_file_pid, pidfile_name, 0664,
                                O_WRONLY | O_TRUNC, MYF(MY_WME))) >= 0)
   {
@@ -8616,6 +8684,7 @@ PSI_mutex_key
   key_LOCK_server_started, key_LOCK_status,
   key_LOCK_sql_slave_skip_counter,
   key_LOCK_slave_net_timeout,
+  key_LOCK_slave_trans_dep_tracker,
   key_LOCK_system_variables_hash, key_LOCK_table_share, key_LOCK_thd_data,
   key_LOCK_thd_sysvar,
   key_LOCK_user_conn, key_LOCK_uuid_generator, key_LOG_LOCK_log,
@@ -8650,7 +8719,6 @@ PSI_mutex_key key_mts_gaq_LOCK;
 PSI_mutex_key key_thd_timer_mutex;
 PSI_mutex_key key_LOCK_offline_mode;
 PSI_mutex_key key_LOCK_default_password_lifetime;
-PSI_mutex_key key_LOCK_group_replication_handler;
 
 #ifdef HAVE_REPLICATION
 PSI_mutex_key key_commit_order_manager_mutex;
@@ -8697,6 +8765,7 @@ static PSI_mutex_info all_server_mutexes[]=
   { &key_LOCK_prepared_stmt_count, "LOCK_prepared_stmt_count", PSI_FLAG_GLOBAL},
   { &key_LOCK_sql_slave_skip_counter, "LOCK_sql_slave_skip_counter", PSI_FLAG_GLOBAL},
   { &key_LOCK_slave_net_timeout, "LOCK_slave_net_timeout", PSI_FLAG_GLOBAL},
+  { &key_LOCK_slave_trans_dep_tracker, "LOCK_slave_trans_dep_tracker", PSI_FLAG_GLOBAL},
   { &key_LOCK_server_started, "LOCK_server_started", PSI_FLAG_GLOBAL},
   { &key_LOCK_keyring_operations, "LOCK_keyring_operations", PSI_FLAG_GLOBAL},
 #if !defined(EMBEDDED_LIBRARY) && !defined(_WIN32)
@@ -8734,7 +8803,7 @@ static PSI_mutex_info all_server_mutexes[]=
   { &key_gtid_ensure_index_mutex, "Gtid_state", PSI_FLAG_GLOBAL},
   { &key_LOCK_query_plan, "THD::LOCK_query_plan", PSI_FLAG_VOLATILITY_SESSION},
   { &key_LOCK_cost_const, "Cost_constant_cache::LOCK_cost_const",
-    PSI_FLAG_GLOBAL},  
+    PSI_FLAG_GLOBAL},
   { &key_LOCK_current_cond, "THD::LOCK_current_cond", PSI_FLAG_VOLATILITY_SESSION},
   { &key_mts_temp_table_LOCK, "key_mts_temp_table_LOCK", 0},
   { &key_LOCK_reset_gtid_table, "LOCK_reset_gtid_table", PSI_FLAG_GLOBAL},
@@ -8746,8 +8815,7 @@ static PSI_mutex_info all_server_mutexes[]=
   { &key_mutex_slave_worker_hash, "Relay_log_info::slave_worker_hash_lock", 0},
 #endif
   { &key_LOCK_offline_mode, "LOCK_offline_mode", PSI_FLAG_GLOBAL},
-  { &key_LOCK_default_password_lifetime, "LOCK_default_password_lifetime", PSI_FLAG_GLOBAL},
-  { &key_LOCK_group_replication_handler, "LOCK_group_replication_handler", PSI_FLAG_GLOBAL}
+  { &key_LOCK_default_password_lifetime, "LOCK_default_password_lifetime", PSI_FLAG_GLOBAL}
 };
 
 PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
@@ -8782,7 +8850,10 @@ static PSI_rwlock_info all_server_rwlocks[]=
   { &key_rwlock_channel_lock, "channel_lock", 0},
   { &key_rwlock_Trans_delegate_lock, "Trans_delegate::lock", PSI_FLAG_GLOBAL},
   { &key_rwlock_Server_state_delegate_lock, "Server_state_delegate::lock", PSI_FLAG_GLOBAL},
-  { &key_rwlock_Binlog_storage_delegate_lock, "Binlog_storage_delegate::lock", PSI_FLAG_GLOBAL}
+  { &key_rwlock_Binlog_storage_delegate_lock, "Binlog_storage_delegate::lock", PSI_FLAG_GLOBAL},
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+  { &key_rwlock_LOCK_named_pipe_full_access_group, "LOCK_named_pipe_full_access_group", PSI_FLAG_GLOBAL},
+#endif /* _WIN32 && !EMBEDDED_LIBRARY */
 };
 
 PSI_cond_key key_PAGE_cond, key_COND_active, key_COND_pool;
@@ -9533,3 +9604,22 @@ void init_server_psi_keys(void)
 
 #endif /* HAVE_PSI_INTERFACE */
 
+#if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
+// update_named_pipe_full_access_group returns false on success, true on failure
+bool update_named_pipe_full_access_group(const char *new_group_name)
+{
+  if (named_pipe_acceptor) {
+    return named_pipe_listener->update_named_pipe_full_access_group(
+      new_group_name);
+  }
+  return true;
+}
+
+#endif  /* _WIN32 && !EMBEDDED_LIBRARY */
+
+
+void set_mysqld_opt_tracking_mode()
+{
+  my_atomic_store64(&mysql_bin_log.m_dependency_tracker.m_opt_tracking_mode,
+          static_cast<int64>(mysql_bin_log.m_dependency_tracker.m_opt_tracking_mode_value));
+}
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 360f61eacfdf..b6d7f7bae18d 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -152,11 +164,15 @@ extern my_bool opt_require_secure_transport;
 extern my_bool opt_slave_preserve_commit_order;
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern uint slave_rows_last_search_algorithm_used;
 #endif
 extern ulong mts_parallel_option;
 extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
+#ifdef _WIN32
+extern mysql_rwlock_t LOCK_named_pipe_full_access_group;
+extern char *named_pipe_full_access_group;
+#endif
 extern my_bool opt_secure_auth;
 extern char* opt_secure_file_priv;
 extern char* opt_secure_backup_file_priv;
@@ -246,7 +262,7 @@ extern ulong open_files_limit;
 extern ulong binlog_cache_size, binlog_stmt_cache_size;
 extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size;
 extern int32 opt_binlog_max_flush_queue_time;
-extern ulong opt_binlog_group_commit_sync_delay;
+extern long opt_binlog_group_commit_sync_delay;
 extern ulong opt_binlog_group_commit_sync_no_delay_count;
 extern ulong max_binlog_size, max_relay_log_size;
 extern ulong slave_max_allowed_packet;
@@ -356,13 +372,13 @@ extern bool THR_MALLOC_initialized;
 
 static inline MEM_ROOT ** my_thread_get_THR_MALLOC()
 {
-  DBUG_ASSERT(THR_MALLOC_initialized);
+  assert(THR_MALLOC_initialized);
   return (MEM_ROOT**) my_get_thread_local(THR_MALLOC);
 }
 
 static inline int my_thread_set_THR_MALLOC(MEM_ROOT ** hdl)
 {
-  DBUG_ASSERT(THR_MALLOC_initialized);
+  assert(THR_MALLOC_initialized);
   return my_set_thread_local(THR_MALLOC, hdl);
 }
 
@@ -375,16 +391,21 @@ extern bool THR_THD_initialized;
 
 static inline THD * my_thread_get_THR_THD()
 {
-  DBUG_ASSERT(THR_THD_initialized);
+  if (!THR_THD_initialized) return NULL;
   return (THD*)my_get_thread_local(THR_THD);
 }
 
 static inline int my_thread_set_THR_THD(THD *thd)
 {
-  DBUG_ASSERT(THR_THD_initialized);
+  assert(THR_THD_initialized);
   return my_set_thread_local(THR_THD, thd);
 }
 
+/**
+  Set m_opt_tracking_mode with a user given value associated with sysvar.
+*/
+void set_mysqld_opt_tracking_mode();
+
 #ifdef HAVE_PSI_INTERFACE
 
 C_MODE_START
@@ -414,6 +435,7 @@ extern PSI_mutex_key
   key_LOCK_server_started, key_LOCK_status,
   key_LOCK_sql_slave_skip_counter,
   key_LOCK_slave_net_timeout,
+  key_LOCK_slave_trans_dep_tracker,
   key_LOCK_table_share, key_LOCK_thd_data, key_LOCK_thd_sysvar,
   key_LOCK_user_conn, key_LOCK_uuid_generator, key_LOG_LOCK_log,
   key_master_info_data_lock, key_master_info_run_lock,
@@ -447,7 +469,6 @@ extern PSI_mutex_key key_mts_gaq_LOCK;
 extern PSI_mutex_key key_thd_timer_mutex;
 extern PSI_mutex_key key_LOCK_offline_mode;
 extern PSI_mutex_key key_LOCK_default_password_lifetime;
-extern PSI_mutex_key key_LOCK_group_replication_handler;
 
 #ifdef HAVE_REPLICATION
 extern PSI_mutex_key key_commit_order_manager_mutex;
@@ -824,6 +845,7 @@ extern mysql_mutex_t
        LOCK_global_system_variables, LOCK_user_conn, LOCK_log_throttle_qni,
        LOCK_prepared_stmt_count, LOCK_error_messages,
        LOCK_sql_slave_skip_counter, LOCK_slave_net_timeout,
+       LOCK_slave_trans_dep_tracker,
        LOCK_offline_mode, LOCK_default_password_lifetime;
 #ifdef HAVE_OPENSSL
 extern char* des_key_file;
@@ -838,7 +860,6 @@ extern mysql_rwlock_t LOCK_sys_init_connect, LOCK_sys_init_slave;
 extern mysql_rwlock_t LOCK_system_variables_hash;
 extern mysql_cond_t COND_manager;
 extern int32 thread_running;
-extern mysql_mutex_t LOCK_group_replication_handler;
 extern mysql_mutex_t LOCK_keyring_operations;
 
 extern char *opt_ssl_ca, *opt_ssl_capath, *opt_ssl_cert, *opt_ssl_cipher,
@@ -925,7 +946,8 @@ enum options_mysqld
   OPT_KEYRING_MIGRATION_HOST,
   OPT_KEYRING_MIGRATION_PASSWORD,
   OPT_KEYRING_MIGRATION_SOCKET,
-  OPT_KEYRING_MIGRATION_PORT
+  OPT_KEYRING_MIGRATION_PORT,
+  OPT_NAMED_PIPE_FULL_ACCESS_GROUP
 };
 
 
@@ -999,4 +1021,8 @@ static inline THD *_current_thd(void)
 
 #define ER(X)         ER_THD(current_thd,X)
 
+#ifdef _WIN32
+bool update_named_pipe_full_access_group(const char *new_group_name);
+#endif
+
 #endif /* MYSQLD_INCLUDED */
diff --git a/sql/mysqld_daemon.cc b/sql/mysqld_daemon.cc
index d445950ba6d2..dd4866bb6715 100644
--- a/sql/mysqld_daemon.cc
+++ b/sql/mysqld_daemon.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/mysqld_daemon.h b/sql/mysqld_daemon.h
index 46c9df1e77b3..516a4c5854fd 100644
--- a/sql/mysqld_daemon.h
+++ b/sql/mysqld_daemon.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/mysqld_suffix.h b/sql/mysqld_suffix.h
index 522b6d78536a..090d44510877 100644
--- a/sql/mysqld_suffix.h
+++ b/sql/mysqld_suffix.h
@@ -1,17 +1,24 @@
 #ifndef MYSQLD_SUFFIX_INCLUDED
 #define MYSQLD_SUFFIX_INCLUDED
 
-/* Copyright (c) 2000, 2004, 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/mysqld_thd_manager.cc b/sql/mysqld_thd_manager.cc
index 46800dee65bc..b0e9d1df8a9b 100644
--- a/sql/mysqld_thd_manager.cc
+++ b/sql/mysqld_thd_manager.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -125,8 +132,8 @@ Global_THD_manager::Global_THD_manager()
 Global_THD_manager::~Global_THD_manager()
 {
   thread_ids.erase_unique(reserved_thread_id);
-  DBUG_ASSERT(thd_list.empty());
-  DBUG_ASSERT(thread_ids.empty());
+  assert(thd_list.empty());
+  assert(thread_ids.empty());
   mysql_mutex_destroy(&LOCK_thd_list);
   mysql_mutex_destroy(&LOCK_thd_remove);
   mysql_mutex_destroy(&LOCK_thread_ids);
@@ -157,7 +164,7 @@ void Global_THD_manager::add_thd(THD *thd)
 {
   DBUG_PRINT("info", ("Global_THD_manager::add_thd %p", thd));
   // Should have an assigned ID before adding to the list.
-  DBUG_ASSERT(thd->thread_id() != reserved_thread_id);
+  assert(thd->thread_id() != reserved_thread_id);
   mysql_mutex_lock(&LOCK_thd_list);
   // Technically it is not supported to compare pointers, but it works.
   std::pair<THD_array::iterator, bool> insert_result=
@@ -167,7 +174,7 @@ void Global_THD_manager::add_thd(THD *thd)
     ++global_thd_count;
   }
   // Adding the same THD twice is an error.
-  DBUG_ASSERT(insert_result.second);
+  assert(insert_result.second);
   mysql_mutex_unlock(&LOCK_thd_list);
 }
 
@@ -179,7 +186,7 @@ void Global_THD_manager::remove_thd(THD *thd)
   mysql_mutex_lock(&LOCK_thd_list);
 
   if (!unit_test)
-    DBUG_ASSERT(thd->release_resources_done());
+    assert(thd->release_resources_done());
 
   /*
     Used by binlog_reset_master.  It would be cleaner to use
@@ -192,7 +199,7 @@ void Global_THD_manager::remove_thd(THD *thd)
   if (num_erased == 1)
     --global_thd_count;
   // Removing a THD that was never added is an error.
-  DBUG_ASSERT(1 == num_erased);
+  assert(1 == num_erased);
   mysql_mutex_unlock(&LOCK_thd_remove);
   mysql_cond_broadcast(&COND_thd_list);
   mysql_mutex_unlock(&LOCK_thd_list);
@@ -218,13 +225,13 @@ void Global_THD_manager::release_thread_id(my_thread_id thread_id)
   const size_t num_erased MY_ATTRIBUTE((unused))=
     thread_ids.erase_unique(thread_id);
   // Assert if the ID was not found in the list.
-  DBUG_ASSERT(1 == num_erased);
+  assert(1 == num_erased);
 }
 
 
 void Global_THD_manager::set_thread_id_counter(my_thread_id new_id)
 {
-  DBUG_ASSERT(unit_test == true);
+  assert(unit_test == true);
   Mutex_lock lock(&LOCK_thread_ids);
   thread_id_counter= new_id;
 }
diff --git a/sql/mysqld_thd_manager.h b/sql/mysqld_thd_manager.h
index aa977de45012..a2c592935c8e 100644
--- a/sql/mysqld_thd_manager.h
+++ b/sql/mysqld_thd_manager.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -95,7 +102,7 @@ class Global_THD_manager
   */
   static Global_THD_manager* get_instance()
   {
-    DBUG_ASSERT(thd_manager != NULL);
+    assert(thd_manager != NULL);
     return thd_manager;
   }
 
diff --git a/sql/named_pipe.cc b/sql/named_pipe.cc
index b8c82391da9b..91f3815c75c5 100644
--- a/sql/named_pipe.cc
+++ b/sql/named_pipe.cc
@@ -1,98 +1,342 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+
+#include "sql_class.h"
+#include <AclAPI.h>
+#include <accctrl.h>
+#include <errno.h>
 
 #include "my_config.h"
+#include "my_sys.h"
+#include "mysqld_error.h"
+#include "m_string.h"
 #include "log.h"
 #include "named_pipe.h"
 
+bool is_existing_windows_group_name(const char *group_name)
+{
+  // First, let's get a SID for the given group name...
+  BYTE soughtSID[SECURITY_MAX_SID_SIZE]= { 0 };
+  DWORD size_sid= SECURITY_MAX_SID_SIZE;
+  char referencedDomainName[MAX_PATH];
+  DWORD size_referencedDomainName= MAX_PATH;
+  SID_NAME_USE sid_name_use;
+
+  if (!LookupAccountName(nullptr, group_name, soughtSID, &size_sid,
+    referencedDomainName, &size_referencedDomainName,
+    &sid_name_use))
+  {
+    return false;
+  }
+
+  // sid_name_use is SidTypeAlias when group_name is a local group
+  if (sid_name_use != SidTypeAlias && sid_name_use != SidTypeWellKnownGroup)
+  {
+    return false;
+  }
+  return true;
+}
+
+/*
+return false on successfully checking group, true on error.
+*/
+static bool check_windows_group_for_everyone(const char *group_name,
+                                             bool *is_everyone_group)
+{
+  *is_everyone_group= false;
+  if (!group_name || group_name[0] == '\0')
+  {
+    return false;
+  }
+
+  if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)
+  {
+    *is_everyone_group= true;
+    return false;
+  }
+  else
+  {
+    TCHAR last_error_msg[256];
+    // First, let's get a SID for the given group name...
+    BYTE soughtSID[SECURITY_MAX_SID_SIZE]= {0};
+    DWORD size_sought_sid= SECURITY_MAX_SID_SIZE;
+    BYTE worldSID[SECURITY_MAX_SID_SIZE]= {0};
+    DWORD size_world_sid= SECURITY_MAX_SID_SIZE;
+    char referencedDomainName[MAX_PATH];
+    DWORD size_referencedDomainName= MAX_PATH;
+    SID_NAME_USE sid_name_use;
+
+    if (!LookupAccountName(NULL, group_name, soughtSID, &size_sought_sid,
+                         referencedDomainName, &size_referencedDomainName,
+                         &sid_name_use))
+    {
+      return false;
+    }
+
+    if (!CreateWellKnownSid(WinWorldSid, NULL, worldSID, &size_world_sid))
+    {
+      DWORD last_error_num= GetLastError();
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                    NULL, last_error_num,
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+                    sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      my_printf_error(ER_UNKNOWN_ERROR,
+                      "check_windows_group_for_everyone, CreateWellKnownSid failed: %s",
+                      MYF(0), last_error_msg);
+      return true;
+    }
+
+    *is_everyone_group= EqualSid(soughtSID, worldSID);
+    return false;
+  }
+}
+
+bool is_valid_named_pipe_full_access_group(const char *group_name)
+{
+  if (!group_name || group_name[0] == '\0'){
+    return true;
+  }
+
+  bool is_everyone_group= false;
+
+  if(check_windows_group_for_everyone(group_name, &is_everyone_group)){
+    return false;
+  }
+
+  if (is_everyone_group || is_existing_windows_group_name(group_name))
+  {
+    return true;
+  }
+  return false;
+}
+
+// return false on success, true on failure.
+bool my_security_attr_add_rights_to_group(SECURITY_ATTRIBUTES *psa,
+  const char *group_name,
+  DWORD group_rights)
+{
+  TCHAR last_error_msg[256];
+  // First, let's get a SID for the given group name...
+  BYTE soughtSID[SECURITY_MAX_SID_SIZE]= { 0 };
+  DWORD size_sid= SECURITY_MAX_SID_SIZE;
+  char referencedDomainName[MAX_PATH];
+  DWORD size_referencedDomainName= MAX_PATH;
+  SID_NAME_USE sid_name_use;
+
+  bool is_everyone_group= false;
+
+  if(check_windows_group_for_everyone(group_name, &is_everyone_group)){
+    return true;
+  }
+
+  if (is_everyone_group)
+  {
+    sql_print_warning(ER_DEFAULT(WARN_NAMED_PIPE_ACCESS_EVERYONE), group_name);
+    if (current_thd)
+    {
+      push_warning_printf(current_thd, Sql_condition::SL_WARNING,
+        WARN_NAMED_PIPE_ACCESS_EVERYONE,
+        ER(WARN_NAMED_PIPE_ACCESS_EVERYONE), group_name);
+    }
+  }
+
+  // Treat the NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE value
+  // as a special case: we  convert it to the "world" SID
+  if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)
+  {
+    if (!CreateWellKnownSid(WinWorldSid, NULL, soughtSID, &size_sid))
+    {
+      DWORD last_error_num= GetLastError();
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                    NULL, last_error_num,
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+                    sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      my_printf_error(ER_UNKNOWN_ERROR,
+                      "my_security_attr_add_rights_to_group, CreateWellKnownSid failed: %s",
+                      MYF(0), last_error_msg);
+      return true;
+    }
+  }
+  else
+  {
+    if (!LookupAccountName(NULL, group_name, soughtSID, &size_sid,
+                           referencedDomainName, &size_referencedDomainName,
+                           &sid_name_use))
+    {
+      DWORD last_error_num= GetLastError();
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                    NULL, last_error_num,
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+                    sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      sql_print_error("my_security_attr_add_rights_to_group, LookupAccountName failed: %s",
+                      last_error_msg);
+      return true;
+    }
+
+    // sid_name_use is SidTypeAlias when group_name is a local group
+    if (sid_name_use != SidTypeAlias && sid_name_use != SidTypeWellKnownGroup)
+    {
+      sql_print_error("LookupAccountName failed: unexpected sid_name_use");
+      return true;
+    }
+  }
+
+  PACL pNewDACL= nullptr;
+  PACL pOldDACL= nullptr;
+  BOOL dacl_present_in_descriptor= FALSE;
+  BOOL dacl_defaulted= FALSE;
+  if (!GetSecurityDescriptorDacl(psa->lpSecurityDescriptor,
+    &dacl_present_in_descriptor, &pOldDACL,
+    &dacl_defaulted) ||
+    !dacl_present_in_descriptor)
+  {
+    DWORD last_error_num= GetLastError();
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+      NULL, last_error_num,
+      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+      sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+    sql_print_error("GetSecurityDescriptorDacl failed: %s", last_error_msg);
+    return true;
+  }
+
+  // Just because GetSecurityDescriptorDacl succeeded doesn't mean we're out of
+  // the woods: a NULL value for pOldDACL is a bad/unexpected thing, as is
+  // dacl_defaulted == TRUE
+  if (pOldDACL == nullptr || dacl_defaulted)
+  {
+    sql_print_error("Invalid DACL on named pipe: %s",
+      (pOldDACL == nullptr) ? "NULL DACL" : "Defaulted DACL");
+    return true;
+  }
+
+  EXPLICIT_ACCESS ea;
+  // Initialize an EXPLICIT_ACCESS structure for the new ACE.
+
+  ZeroMemory(&ea, sizeof(EXPLICIT_ACCESS));
+  ea.grfAccessPermissions= group_rights;
+  ea.grfAccessMode= SET_ACCESS;
+  ea.grfInheritance= NO_INHERITANCE;
+  ea.Trustee.TrusteeForm= TRUSTEE_IS_SID;
+  ea.Trustee.ptstrName= (LPSTR)soughtSID;
+
+  // Create a new ACL that merges the new ACE
+  // into the existing DACL.
+  DWORD dwRes= SetEntriesInAcl(1, &ea, pOldDACL, &pNewDACL);
+  if (ERROR_SUCCESS != dwRes)
+  {
+    char num_buff[20];
+    int10_to_str(dwRes, num_buff, 10);
+    sql_print_error("SetEntriesInAcl to add group permissions failed: %s", num_buff);
+    return true;
+  }
+
+  // Apply the new DACL to the existing security descriptor...
+  if (!SetSecurityDescriptorDacl(psa->lpSecurityDescriptor, TRUE, pNewDACL,
+    FALSE))
+  {
+    DWORD last_error_num= GetLastError();
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+      NULL, last_error_num,
+      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+      sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+    sql_print_error("SetSecurityDescriptorDacl failed: %s", last_error_msg);
+    return true;
+  }
+
+  return false;
+}
+
 /**
-  Creates an instance of a named pipe and returns a handle.
-
-  @param sec_attr    Security attributes for the pipe.
-  @param sec_descr   Security descriptor for the pipe.
-  @param buffer_size Number of bytes to reserve for input and output buffers.
-  @param name        The name of the pipe.
-  @param name_buff   Output argument: null-terminated concatenation of
-                     "\\.\pipe\" and name.
-  @param buflen      The size of name_buff.
-
-  @returns           Pipe handle, or INVALID_HANDLE_VALUE in case of error.
-
-  @note  The entire pipe name string can be up to 256 characters long.
-         Pipe names are not case sensitive.
- */
-HANDLE create_server_named_pipe(SECURITY_ATTRIBUTES *sec_attr,
-                                SECURITY_DESCRIPTOR *sec_descr,
-                                DWORD buffer_size,
-                                const char *name,
-                                char *name_buf,
-                                size_t buflen)
+Creates an instance of a named pipe and returns a handle.
+
+@param sec_attr    Security attributes for the pipe.
+@param buffer_size Number of bytes to reserve for input and output buffers.
+@param name        The name of the pipe.
+@param name_buf    Output argument: null-terminated concatenation of
+"\\.\pipe\" and name.
+@param buflen      The size of name_buff.
+
+@returns           Pipe handle, or INVALID_HANDLE_VALUE in case of error.
+
+@note  The entire pipe name string can be up to 256 characters long.
+Pipe names are not case sensitive.
+*/
+HANDLE create_server_named_pipe(SECURITY_ATTRIBUTES **ppsec_attr,
+  DWORD buffer_size, const char *name,
+  char *name_buf, size_t buflen,
+  const char *full_access_group_name)
 {
   HANDLE ret_handle= INVALID_HANDLE_VALUE;
+  TCHAR last_error_msg[256];
+
+  strxnmov(name_buf, buflen - 1, "\\\\.\\pipe\\", name, NullS);
+  const char *perror= nullptr;
+  // Set up security for the named pipe to provide full access to the owner
+  // and minimal read/write access to others.
+  if (my_security_attr_create(ppsec_attr, &perror, NAMED_PIPE_OWNER_PERMISSIONS,
+    NAMED_PIPE_EVERYONE_PERMISSIONS) != 0)
+  {
+    sql_print_error("my_security_attr_create failed: %s", perror);
+    return ret_handle;
+  }
+
+  if (full_access_group_name && full_access_group_name[0] != '\0')
+  {
+    if (my_security_attr_add_rights_to_group(
+      *ppsec_attr, full_access_group_name,
+      NAMED_PIPE_FULL_ACCESS_GROUP_PERMISSIONS))
+    {
+      return ret_handle;
+    }
+  }
+
+  ret_handle= CreateNamedPipe(
+    name_buf,
+    PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED |
+    FILE_FLAG_FIRST_PIPE_INSTANCE | WRITE_DAC,
+    PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES,
+    buffer_size, buffer_size, NMPWAIT_USE_DEFAULT_WAIT, *ppsec_attr);
 
-  strxnmov(name_buf, buflen - 1,
-           "\\\\.\\pipe\\", name, NullS);
-  memset(sec_attr, 0, sizeof(SECURITY_ATTRIBUTES));
-  memset(sec_descr, 0, sizeof(SECURITY_DESCRIPTOR));
-  if (!InitializeSecurityDescriptor(sec_descr, SECURITY_DESCRIPTOR_REVISION))
-  {
-    sql_print_error("Can't start server : Initialize security descriptor: %s",
-                    strerror(errno));
-    return INVALID_HANDLE_VALUE;
-  }
-  if (!SetSecurityDescriptorDacl(sec_descr, TRUE, NULL, FALSE))
-  {
-    sql_print_error("Can't start server : Set security descriptor: %s",
-                    strerror(errno));
-    return INVALID_HANDLE_VALUE;
-  }
-  sec_attr->nLength= sizeof(SECURITY_ATTRIBUTES);
-  sec_attr->lpSecurityDescriptor= sec_descr;
-  sec_attr->bInheritHandle= FALSE;
-  ret_handle= CreateNamedPipe(name_buf,
-                              PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED |
-                              FILE_FLAG_FIRST_PIPE_INSTANCE,
-                              PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT,
-                              PIPE_UNLIMITED_INSTANCES,
-                              buffer_size,
-                              buffer_size,
-                              NMPWAIT_USE_DEFAULT_WAIT,
-                              sec_attr);
-  
   if (ret_handle == INVALID_HANDLE_VALUE)
   {
-    int error= GetLastError();
+    DWORD last_error_num= GetLastError();
 
-    if (error == ERROR_ACCESS_DENIED)
+    if (last_error_num == ERROR_ACCESS_DENIED)
     {
-      sql_print_error("Can't start server : Named Pipe \"%s\" already in use.",
-                      name);
+      my_printf_error(ER_CANT_START_SERVER_NAMED_PIPE,
+        ER_DEFAULT(ER_CANT_START_SERVER_NAMED_PIPE),
+        MYF(ME_FATALERROR), name);
     }
     else
     {
-      LPVOID msg_buff= NULL;
-
-      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                    NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                    (LPTSTR) &msg_buff, 0, NULL );
-      
-      if (msg_buff != NULL)
-      {
-        sql_print_error("%s: %s", (char*)msg_buff, strerror(errno));
-        LocalFree(msg_buff);
-      }
+      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+        FORMAT_MESSAGE_MAX_WIDTH_MASK,
+        NULL, last_error_num,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), last_error_msg,
+        sizeof(last_error_msg) / sizeof(TCHAR), NULL);
+      char num_buff[20];
+      int10_to_str(last_error_num, num_buff, 10);
+      sql_print_error("Can't start server : %s %s", last_error_msg, num_buff);
     }
   }
 
diff --git a/sql/named_pipe.h b/sql/named_pipe.h
index d0a9325cf98b..4e4a566180a4 100644
--- a/sql/named_pipe.h
+++ b/sql/named_pipe.h
@@ -1,30 +1,47 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
-#ifndef NAMED_PIPE_INCLUDED
-#define NAMED_PIPE_INCLUDED
-
-C_MODE_START
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-HANDLE create_server_named_pipe(SECURITY_ATTRIBUTES *sec_attr,
-                                SECURITY_DESCRIPTOR *sec_descr,
-                                DWORD buffer_size,
-                                const char *name,
-                                char *name_buf,
-                                size_t buflen);
 
-C_MODE_END
+#ifndef NAMED_PIPE_INCLUDED
+#define NAMED_PIPE_INCLUDED
 
+#include <windows.h>
+
+const DWORD NAMED_PIPE_OWNER_PERMISSIONS= GENERIC_READ | GENERIC_WRITE;
+const DWORD NAMED_PIPE_EVERYONE_PERMISSIONS=
+FILE_READ_ATTRIBUTES | FILE_READ_DATA | FILE_WRITE_ATTRIBUTES |
+FILE_WRITE_DATA | SYNCHRONIZE | READ_CONTROL;
+const DWORD NAMED_PIPE_FULL_ACCESS_GROUP_PERMISSIONS =
+GENERIC_READ | GENERIC_WRITE;
+
+HANDLE create_server_named_pipe(SECURITY_ATTRIBUTES **ppsec_attr,
+  DWORD buffer_size, const char *name,
+  char *name_buf, size_t buflen,
+  const char *full_access_group_name= NULL);
+
+bool is_valid_named_pipe_full_access_group(const char *group_name);
+bool my_security_attr_add_rights_to_group(SECURITY_ATTRIBUTES *psa,
+  const char *group_name,
+  DWORD group_rights);
+#define DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP ""
+#define NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE "*everyone*"
 #endif /* NAMED_PIPE_INCLUDED */
diff --git a/sql/ndb_anyvalue.cc b/sql/ndb_anyvalue.cc
index 428e1db7986a..0b8b0544e1fa 100644
--- a/sql/ndb_anyvalue.cc
+++ b/sql/ndb_anyvalue.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,7 +98,7 @@ extern ulong opt_server_id_mask;
 /* Next reserved code : 0x8000007c */
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void dbug_ndbcluster_anyvalue_set_userbits(Uint32& anyValue)
 {
   /*
diff --git a/sql/ndb_anyvalue.h b/sql/ndb_anyvalue.h
index 45c9bebaaf49..31f18ec2d230 100644
--- a/sql/ndb_anyvalue.h
+++ b/sql/ndb_anyvalue.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -39,7 +46,7 @@ void ndbcluster_anyvalue_set_normal(Uint32& anyValue);
 Uint32 ndbcluster_anyvalue_get_serverid(Uint32 anyValue);
 void ndbcluster_anyvalue_set_serverid(Uint32& anyValue, Uint32 serverId);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void dbug_ndbcluster_anyvalue_set_userbits(Uint32& anyValue);
 #endif
 
diff --git a/sql/ndb_binlog_extra_row_info.cc b/sql/ndb_binlog_extra_row_info.cc
index 7a1779581dcc..ecaba63d9310 100644
--- a/sql/ndb_binlog_extra_row_info.cc
+++ b/sql/ndb_binlog_extra_row_info.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_binlog_extra_row_info.h b/sql/ndb_binlog_extra_row_info.h
index 30e7f0aae22d..a9801a0abfd2 100644
--- a/sql/ndb_binlog_extra_row_info.h
+++ b/sql/ndb_binlog_extra_row_info.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_binlog_thread.cc b/sql/ndb_binlog_thread.cc
index df690ef3b532..2cbf9c345b94 100644
--- a/sql/ndb_binlog_thread.cc
+++ b/sql/ndb_binlog_thread.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_binlog_thread.h b/sql/ndb_binlog_thread.h
index 8846d3f6618b..527d428a0723 100644
--- a/sql/ndb_binlog_thread.h
+++ b/sql/ndb_binlog_thread.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_component.cc b/sql/ndb_component.cc
index 9be514434afa..e2d12dff92b7 100644
--- a/sql/ndb_component.cc
+++ b/sql/ndb_component.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_component.h b/sql/ndb_component.h
index dbc653df750b..6f461a6e24e7 100644
--- a/sql/ndb_component.h
+++ b/sql/ndb_component.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_conflict.cc b/sql/ndb_conflict.cc
index d9dc2889cca0..e89a1282e69e 100644
--- a/sql/ndb_conflict.cc
+++ b/sql/ndb_conflict.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -641,7 +648,7 @@ ExceptionsTableWriter::writeRow(NdbTransaction* trans,
                       op_type, m_op_type_pos,
                       conflict_cause, m_conflict_cause_pos,
                       orig_transid, m_orig_transid_pos));
-  DBUG_ASSERT(write_set != NULL);
+  assert(write_set != NULL);
   assert(err.code == 0);
   const uchar* rowPtr= (op_type == DELETE_ROW)? oldRowPtr : newRowPtr;
 
@@ -759,7 +766,7 @@ ExceptionsTableWriter::writeRow(NdbTransaction* trans,
       int k;
       for (k= 0; k < nkey; k++)
       {
-        DBUG_ASSERT(rowPtr != NULL);
+        assert(rowPtr != NULL);
         if (m_key_data_pos[k] != -1)
         {
           const uchar* data=
@@ -785,7 +792,7 @@ ExceptionsTableWriter::writeRow(NdbTransaction* trans,
         const uchar* default_value=  (const uchar*) col->getDefaultValue();
         DBUG_PRINT("info", ("Checking column %s(%i)%s", col->getName(), i,
                             (default_value)?", has default value":""));
-        DBUG_ASSERT(rowPtr != NULL);
+        assert(rowPtr != NULL);
         if (m_data_pos[i] != -1)
         {
           const uchar* row_vPtr= NULL;
@@ -1941,23 +1948,23 @@ row_conflict_fn_old(NDB_CONFLICT_FN_SHARE* cfn_share,
     r= code->load_const_u32(RegOldValue, old_value_32);
   else
     r= code->load_const_u64(RegOldValue, old_value_64);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->read_attr(RegCurrentValue, resolve_column);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   /*
    * if RegOldValue == RegCurrentValue goto label_0
    * else raise error for this row
    */
   r= code->branch_eq(RegOldValue, RegCurrentValue, label_0);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->interpret_exit_nok(error_conflict_fn_violation);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->def_label(label_0);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->interpret_exit_ok();
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->finalise();
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   DBUG_RETURN(r);
 }
 
@@ -2023,23 +2030,23 @@ row_conflict_fn_max_update_only(NDB_CONFLICT_FN_SHARE* cfn_share,
     r= code->load_const_u32(RegNewValue, new_value_32);
   else
     r= code->load_const_u64(RegNewValue, new_value_64);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->read_attr(RegCurrentValue, resolve_column);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   /*
    * if RegNewValue > RegCurrentValue goto label_0
    * else raise error for this row
    */
   r= code->branch_gt(RegNewValue, RegCurrentValue, label_0);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->interpret_exit_nok(error_conflict_fn_violation);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->def_label(label_0);
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->interpret_exit_ok();
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   r= code->finalise();
-  DBUG_ASSERT(r == 0);
+  assert(r == 0);
   DBUG_RETURN(r);
 }
 
diff --git a/sql/ndb_conflict.h b/sql/ndb_conflict.h
index b821b7683877..4b6aa4e82403 100644
--- a/sql/ndb_conflict.h
+++ b/sql/ndb_conflict.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_conflict_trans.cc b/sql/ndb_conflict_trans.cc
index f5884b1e3011..82384122bb26 100644
--- a/sql/ndb_conflict_trans.cc
+++ b/sql/ndb_conflict_trans.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_conflict_trans.h b/sql/ndb_conflict_trans.h
index 8ca63ff4f671..8310410d45ee 100644
--- a/sql/ndb_conflict_trans.h
+++ b/sql/ndb_conflict_trans.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_dist_priv_util.h b/sql/ndb_dist_priv_util.h
index dfae8bf492fb..f380c954906f 100644
--- a/sql/ndb_dist_priv_util.h
+++ b/sql/ndb_dist_priv_util.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_event_data.cc b/sql/ndb_event_data.cc
index 52ae1d12e4e7..fe41d6391415 100644
--- a/sql/ndb_event_data.cc
+++ b/sql/ndb_event_data.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_event_data.h b/sql/ndb_event_data.h
index 638a0e80bad3..03d8bc7bf3ec 100644
--- a/sql/ndb_event_data.h
+++ b/sql/ndb_event_data.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_find_files_list.cc b/sql/ndb_find_files_list.cc
index dd254ae0b017..c3caffc63eed 100644
--- a/sql/ndb_find_files_list.cc
+++ b/sql/ndb_find_files_list.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_find_files_list.h b/sql/ndb_find_files_list.h
index 82a76b0b92a4..f977cc37d557 100644
--- a/sql/ndb_find_files_list.h
+++ b/sql/ndb_find_files_list.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_global_schema_lock.cc b/sql/ndb_global_schema_lock.cc
index 23eab168fe22..c717d231b374 100644
--- a/sql/ndb_global_schema_lock.cc
+++ b/sql/ndb_global_schema_lock.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -201,13 +208,13 @@ ndbcluster_global_schema_lock(THD *thd, bool no_lock_queue,
     if (thd_ndb->global_schema_lock_trans)
       thd_ndb->global_schema_lock_trans->refresh();
     else
-      DBUG_ASSERT(thd_ndb->global_schema_lock_error != 0);
+      assert(thd_ndb->global_schema_lock_error != 0);
     thd_ndb->global_schema_lock_count++;
     DBUG_PRINT("exit", ("global_schema_lock_count: %d",
                         thd_ndb->global_schema_lock_count));
     DBUG_RETURN(0);
   }
-  DBUG_ASSERT(thd_ndb->global_schema_lock_count == 0);
+  assert(thd_ndb->global_schema_lock_count == 0);
   thd_ndb->global_schema_lock_count= 1;
   thd_ndb->global_schema_lock_error= 0;
   DBUG_PRINT("exit", ("global_schema_lock_count: %d",
@@ -307,7 +314,7 @@ ndbcluster_global_schema_unlock(THD *thd)
     return 0;
 
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
-  DBUG_ASSERT(thd_ndb != 0);
+  assert(thd_ndb != 0);
   if (thd_ndb == 0 || (thd_ndb->options & TNO_NO_LOCK_SCHEMA_OP))
     return 0;
   Ndb *ndb= thd_ndb->ndb;
@@ -316,12 +323,12 @@ ndbcluster_global_schema_unlock(THD *thd)
   thd_ndb->global_schema_lock_count--;
   DBUG_PRINT("exit", ("global_schema_lock_count: %d",
                       thd_ndb->global_schema_lock_count));
-  DBUG_ASSERT(ndb != NULL);
+  assert(ndb != NULL);
   if (ndb == NULL)
   {
     DBUG_RETURN(0);
   }
-  DBUG_ASSERT(trans != NULL || thd_ndb->global_schema_lock_error != 0);
+  assert(trans != NULL || thd_ndb->global_schema_lock_error != 0);
   if (thd_ndb->global_schema_lock_count != 0)
   {
     DBUG_RETURN(0);
diff --git a/sql/ndb_global_schema_lock.h b/sql/ndb_global_schema_lock.h
index 9a127f8a1490..ec65be9dc396 100644
--- a/sql/ndb_global_schema_lock.h
+++ b/sql/ndb_global_schema_lock.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_global_schema_lock_guard.h b/sql/ndb_global_schema_lock_guard.h
index 414747cb2fa9..1cf8efeabca6 100644
--- a/sql/ndb_global_schema_lock_guard.h
+++ b/sql/ndb_global_schema_lock_guard.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_local_connection.cc b/sql/ndb_local_connection.cc
index f0dc6c8a9d7d..c5ba8b8704a5 100644
--- a/sql/ndb_local_connection.cc
+++ b/sql/ndb_local_connection.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_local_connection.h b/sql/ndb_local_connection.h
index 49f47275eaed..b0b62b8579db 100644
--- a/sql/ndb_local_connection.h
+++ b/sql/ndb_local_connection.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_local_schema.cc b/sql/ndb_local_schema.cc
index c4bb78d7393d..306538d1f9ef 100644
--- a/sql/ndb_local_schema.cc
+++ b/sql/ndb_local_schema.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -27,6 +34,7 @@
 #include "log.h"
 #include "table_trigger_dispatcher.h"
 #include "sql_trigger.h"
+#include "auth_common.h"              // check_readonly()
 
 static const char *ndb_ext=".ndb";
 
@@ -64,6 +72,14 @@ bool Ndb_local_schema::Base::mdl_try_lock(void) const
 
     return false;
   }
+
+  /*
+    Now when we have protection against concurrent change of read_only
+    option we can safely re-check its value.
+  */
+  if (check_readonly(m_thd, true))
+    return false;
+
   DBUG_PRINT("info", ("acquired metadata lock"));
   return true;
 }
diff --git a/sql/ndb_local_schema.h b/sql/ndb_local_schema.h
index 6d80a153da55..041f19b352be 100644
--- a/sql/ndb_local_schema.h
+++ b/sql/ndb_local_schema.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_log.cc b/sql/ndb_log.cc
index 39b4b39a21a0..aa082612869c 100644
--- a/sql/ndb_log.cc
+++ b/sql/ndb_log.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,7 +47,7 @@ void
 ndb_log_print(enum ndb_log_loglevel loglevel,
               const char* prefix, const char* fmt, va_list args)
 {
-  DBUG_ASSERT(fmt);
+  assert(fmt);
 
   // Assemble the message
   char msg_buf[512];
@@ -74,7 +81,7 @@ ndb_log_print(enum ndb_log_loglevel loglevel,
 void
 ndb_log_info(const char* fmt, ...)
 {
-  DBUG_ASSERT(fmt);
+  assert(fmt);
 
   va_list args;
   va_start(args, fmt);
@@ -86,7 +93,7 @@ ndb_log_info(const char* fmt, ...)
 void
 ndb_log_warning(const char* fmt, ...)
 {
-  DBUG_ASSERT(fmt);
+  assert(fmt);
 
   va_list args;
   va_start(args, fmt);
@@ -98,7 +105,7 @@ ndb_log_warning(const char* fmt, ...)
 void
 ndb_log_error(const char* fmt, ...)
 {
-  DBUG_ASSERT(fmt);
+  assert(fmt);
 
   va_list args;
   va_start(args, fmt);
@@ -120,7 +127,7 @@ ndb_log_get_verbose_level(void)
 void
 ndb_log_verbose(unsigned verbose_level, const char* fmt, ...)
 {
-  DBUG_ASSERT(fmt);
+  assert(fmt);
 
   // Print message only if verbose level is set high enough
   if (ndb_log_get_verbose_level() < verbose_level)
diff --git a/sql/ndb_log.h b/sql/ndb_log.h
index 335dd4eb34ec..1fbaf42dd9cc 100644
--- a/sql/ndb_log.h
+++ b/sql/ndb_log.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_mi.cc b/sql/ndb_mi.cc
index 0a2e7d089d0e..3734b09a600d 100644
--- a/sql/ndb_mi.cc
+++ b/sql/ndb_mi.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,7 +55,7 @@ class Multisource_info_guard {
   {
     Master_info* default_mi = channel_map.get_default_channel_mi();
     // There should always be a default Master_info at this point
-    DBUG_ASSERT(default_mi);
+    assert(default_mi);
     return default_mi;
   }
 
diff --git a/sql/ndb_mi.h b/sql/ndb_mi.h
index ec9f56e50e92..c5207349174a 100644
--- a/sql/ndb_mi.h
+++ b/sql/ndb_mi.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_name_util.cc b/sql/ndb_name_util.cc
index 6f1a26a5fb94..2b0dc80232ce 100644
--- a/sql/ndb_name_util.cc
+++ b/sql/ndb_name_util.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_name_util.h b/sql/ndb_name_util.h
index 9177b74190c8..86cb1bf3f9fe 100644
--- a/sql/ndb_name_util.h
+++ b/sql/ndb_name_util.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_ndbapi_util.cc b/sql/ndb_ndbapi_util.cc
index 83df32bcf164..261b6a87ae0f 100644
--- a/sql/ndb_ndbapi_util.cc
+++ b/sql/ndb_ndbapi_util.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_ndbapi_util.h b/sql/ndb_ndbapi_util.h
index ce513cf9435d..7c07bc64c304 100644
--- a/sql/ndb_ndbapi_util.h
+++ b/sql/ndb_ndbapi_util.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_repl_tab.cc b/sql/ndb_repl_tab.cc
index 4474e9655375..acb6b598525b 100644
--- a/sql/ndb_repl_tab.cc
+++ b/sql/ndb_repl_tab.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -300,7 +307,7 @@ Ndb_rep_tab_reader::scan_candidates(Ndb* ndb,
       /* Compare row to searchkey to get quality of match */
       int match_quality= Ndb_rep_tab_key::get_match_quality(&searchkey,
                                                             &row.key);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       {
         row.null_terminate_strings();
 
diff --git a/sql/ndb_repl_tab.h b/sql/ndb_repl_tab.h
index 899b21907f5c..0a4180c04636 100644
--- a/sql/ndb_repl_tab.h
+++ b/sql/ndb_repl_tab.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_schema_dist.cc b/sql/ndb_schema_dist.cc
index 8a3ca3f9a520..5047c6ad9324 100644
--- a/sql/ndb_schema_dist.cc
+++ b/sql/ndb_schema_dist.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_schema_dist.h b/sql/ndb_schema_dist.h
index e6633a19a470..8d4ec4089cf5 100644
--- a/sql/ndb_schema_dist.h
+++ b/sql/ndb_schema_dist.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_schema_object.cc b/sql/ndb_schema_object.cc
index 986a665da4de..05b1f4d3954c 100644
--- a/sql/ndb_schema_object.cc
+++ b/sql/ndb_schema_object.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_schema_object.h b/sql/ndb_schema_object.h
index df284fe7cdb6..d31d983c6b2f 100644
--- a/sql/ndb_schema_object.h
+++ b/sql/ndb_schema_object.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_share.cc b/sql/ndb_share.cc
index 1cad6e7c575a..34bf5bba1b1b 100644
--- a/sql/ndb_share.cc
+++ b/sql/ndb_share.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_share.h b/sql/ndb_share.h
index 361ae0c92b07..4de12bdf9abf 100644
--- a/sql/ndb_share.h
+++ b/sql/ndb_share.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_table_guard.h b/sql/ndb_table_guard.h
index 72bef75a76ac..ff9d118005d2 100644
--- a/sql/ndb_table_guard.h
+++ b/sql/ndb_table_guard.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -43,7 +50,7 @@ class Ndb_table_guard
   {
     DBUG_ENTER("Ndb_table_guard::init");
     /* must call reinit() if already initialized */
-    DBUG_ASSERT(m_ndbtab == NULL);
+    assert(m_ndbtab == NULL);
     m_ndbtab= m_dict->getTableGlobal(tabname);
     m_invalidate= 0;
     DBUG_PRINT("info", ("m_ndbtab: %p", m_ndbtab));
diff --git a/sql/ndb_tdc.cc b/sql/ndb_tdc.cc
index b512024be775..d17e3a2f2f2c 100644
--- a/sql/ndb_tdc.cc
+++ b/sql/ndb_tdc.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_tdc.h b/sql/ndb_tdc.h
index c98df0f53172..663d4ac85e2f 100644
--- a/sql/ndb_tdc.h
+++ b/sql/ndb_tdc.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_thd.cc b/sql/ndb_thd.cc
index 20f2c123e5e0..e703891dd9b7 100644
--- a/sql/ndb_thd.cc
+++ b/sql/ndb_thd.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -46,7 +53,7 @@ Ndb* check_ndb_in_thd(THD* thd, bool validate_ndb)
       return NULL;
   }
 
-  DBUG_ASSERT(thd_ndb->is_slave_thread() == thd->slave_thread);
+  assert(thd_ndb->is_slave_thread() == thd->slave_thread);
 
   return thd_ndb->ndb;
 }
diff --git a/sql/ndb_thd.h b/sql/ndb_thd.h
index c0b0feba4926..83c682aa1723 100644
--- a/sql/ndb_thd.h
+++ b/sql/ndb_thd.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_thd_ndb.cc b/sql/ndb_thd_ndb.cc
index 10b200e10760..3c4f4182d468 100644
--- a/sql/ndb_thd_ndb.cc
+++ b/sql/ndb_thd_ndb.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -67,8 +74,8 @@ Thd_ndb::recycle_ndb(void)
   DBUG_ENTER("recycle_ndb");
   DBUG_PRINT("enter", ("ndb: 0x%lx", (long)ndb));
 
-  DBUG_ASSERT(global_schema_lock_trans == NULL);
-  DBUG_ASSERT(trans == NULL);
+  assert(global_schema_lock_trans == NULL);
+  assert(trans == NULL);
 
   delete ndb;
   if ((ndb= new Ndb(connection, "")) == NULL)
diff --git a/sql/ndb_thd_ndb.h b/sql/ndb_thd_ndb.h
index 90eae7ca995d..e2c5b05bcc28 100644
--- a/sql/ndb_thd_ndb.h
+++ b/sql/ndb_thd_ndb.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/ndb_util_thread.h b/sql/ndb_util_thread.h
index 5a67e87ea8b2..a8add1003177 100644
--- a/sql/ndb_util_thread.h
+++ b/sql/ndb_util_thread.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index a6bc8570f2e9..34c349e58de7 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -60,6 +72,16 @@ PSI_memory_key key_memory_NET_compress_packet;
 #define MYSQL_CLIENT
 #endif /*EMBEDDED_LIBRARY */
 
+// Workaround for compiler bug
+// ld.so.1: mysqld: fatal: relocation error: file sql/mysqld:
+//          symbol OPENSSL_sk_new_null: referenced symbol not found
+// openssl/safestack.h has lots of pragma weak <function>
+// Taking the address of the function solves the problem.
+// (note, do not make it static, it may be optimized away)
+#if defined(HAVE_TLSv13) && defined(__SUNPRO_CC)
+#include <openssl/ssl.h>
+void *address_of_sk_new_null = &OPENSSL_sk_new_null;
+#endif
 
 /*
   The following handles the differences when this is linked between the
@@ -197,9 +219,19 @@ void net_clear(NET *net,
 {
   DBUG_ENTER("net_clear");
 
+  DBUG_EXECUTE_IF("simulate_bad_field_length_1", {
+    net->pkt_nr= net->compress_pkt_nr= 0;
+    net->write_pos= net->buff;
+    DBUG_VOID_RETURN;
+  });
+  DBUG_EXECUTE_IF("simulate_bad_field_length_2", {
+    net->pkt_nr= net->compress_pkt_nr= 0;
+    net->write_pos= net->buff;
+    DBUG_VOID_RETURN;
+  });
 #if !defined(EMBEDDED_LIBRARY)
   /* Ensure the socket buffer is empty, except for an EOF (at least 1). */
-  DBUG_ASSERT(!check_buffer || (vio_pending(net->vio) <= 1));
+  assert(!check_buffer || (vio_pending(net->vio) <= 1));
 #endif
 
   /* Ready for new command */
@@ -666,6 +698,16 @@ static my_bool net_read_raw_loop(NET *net, size_t count)
   bool eof= false;
   unsigned int retry_count= 0;
   uchar *buf= net->buff + net->where_b;
+  my_bool timeout_on_full_packet = FALSE;
+  my_bool is_packet_timeout = FALSE;
+
+#ifdef MYSQL_SERVER
+  NET_SERVER* server_ext = static_cast<NET_SERVER*>(net->extension);
+  if (server_ext) timeout_on_full_packet = server_ext->timeout_on_full_packet;
+#endif
+
+  time_t start_time = 0;
+  if (timeout_on_full_packet) start_time = time(&start_time);
 
   while (count)
   {
@@ -692,6 +734,15 @@ static my_bool net_read_raw_loop(NET *net, size_t count)
 #ifdef MYSQL_SERVER
     thd_increment_bytes_received(recvcnt);
 #endif
+
+    if (timeout_on_full_packet) {
+        time_t current_time = time(&current_time);
+        if (static_cast<unsigned int>(current_time - start_time) >
+            net->read_timeout) {
+            is_packet_timeout = TRUE;
+            break;
+        }
+    }
   }
 
   /* On failure, propagate the error code. */
@@ -701,7 +752,7 @@ static my_bool net_read_raw_loop(NET *net, size_t count)
     net->error= 2;
 
     /* Interrupted by a timeout? */
-    if (!eof && vio_was_timeout(net->vio))
+    if (!eof && (vio_was_timeout(net->vio) || is_packet_timeout))
       net->last_errno= ER_NET_READ_INTERRUPTED;
     else
       net->last_errno= ER_NET_READ_ERROR;
@@ -749,8 +800,8 @@ static my_bool net_read_packet_header(NET *net)
   if (server_extension != NULL)
   {
     void *user_data= server_extension->m_user_data;
-    DBUG_ASSERT(server_extension->m_before_header != NULL);
-    DBUG_ASSERT(server_extension->m_after_header != NULL);
+    assert(server_extension->m_before_header != NULL);
+    assert(server_extension->m_after_header != NULL);
 
     server_extension->m_before_header(net, user_data, count);
     rc= net_read_raw_loop(net, count);
@@ -788,7 +839,7 @@ static my_bool net_read_packet_header(NET *net)
     my_message_local(ERROR_LEVEL,
                      "packets out of order (found %u, expected %u)",
                      (uint) pkt_nr, net->pkt_nr);
-    DBUG_ASSERT(pkt_nr == net->pkt_nr);
+    assert(pkt_nr == net->pkt_nr);
 #endif
     return TRUE;
   }
@@ -831,8 +882,8 @@ static size_t net_read_packet(NET *net, size_t *complen)
       The right-hand expression
       must match the size of the buffer allocated in net_realloc().
     */
-    DBUG_ASSERT(net->where_b + NET_HEADER_SIZE + sizeof(uint32) <=
-                net->max_packet + NET_HEADER_SIZE + COMP_HEADER_SIZE);
+    assert(net->where_b + NET_HEADER_SIZE + sizeof(uint32) <=
+           net->max_packet + NET_HEADER_SIZE + COMP_HEADER_SIZE);
 
     /*
       If the packet is compressed then complen > 0 and contains the
@@ -963,7 +1014,7 @@ my_net_read(NET *net)
               multi_byte_packet on.
               Thus there shall never be a non-zero first_packet_offset here.
             */
-            DBUG_ASSERT(first_packet_offset == 0);
+            assert(first_packet_offset == 0);
             /* Remove packet header for second packet */
             memmove(net->buff + start_of_packet,
               net->buff + start_of_packet + NET_HEADER_SIZE,
diff --git a/sql/opt_costconstantcache.cc b/sql/opt_costconstantcache.cc
index a55c8a0be3c0..08275b86530b 100644
--- a/sql/opt_costconstantcache.cc
+++ b/sql/opt_costconstantcache.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -21,7 +28,7 @@
 #include "field.h"                              // Field
 #include "log.h"                                // sql_print_warning
 #include "m_string.h"                           // LEX_CSTRING
-#include "my_dbug.h"                            // DBUG_ASSERT
+#include "my_dbug.h"                            // assert
 #include "opt_costconstants.h"
 #include "opt_costconstantcache.h"
 #include "template_utils.h"                     // pointer_cast
@@ -55,8 +62,8 @@ Cost_constant_cache::Cost_constant_cache()
 Cost_constant_cache::~Cost_constant_cache()
 {
   // Verify that close has been called
-  DBUG_ASSERT(current_cost_constants == NULL);
-  DBUG_ASSERT(m_inited == false);
+  assert(current_cost_constants == NULL);
+  assert(m_inited == false);
 }
 
 
@@ -64,7 +71,7 @@ void Cost_constant_cache::init()
 {
   DBUG_ENTER("Cost_constant_cache::init");
 
-  DBUG_ASSERT(m_inited == false);
+  assert(m_inited == false);
 
   // Initialize the mutex that is used for protecting the cost constants
   mysql_mutex_init(key_LOCK_cost_const, &LOCK_cost_const,
@@ -86,7 +93,7 @@ void Cost_constant_cache::close()
 {
   DBUG_ENTER("Cost_constant_cache::close");
 
-  DBUG_ASSERT(m_inited);
+  assert(m_inited);
 
   if (m_inited == false)
     DBUG_VOID_RETURN;                           /* purecov: inspected */
@@ -113,7 +120,7 @@ void Cost_constant_cache::close()
 void Cost_constant_cache::reload()
 {
   DBUG_ENTER("Cost_constant_cache::reload");
-  DBUG_ASSERT(m_inited= true);
+  assert(m_inited= true);
 
   // Create cost constants from the constants defined in the source code
   Cost_model_constants *cost_constants= create_defaults();
@@ -197,7 +204,7 @@ static void report_server_cost_warnings(const LEX_CSTRING &cost_name,
                       cost_name.str, value);
     break;
   default:
-    DBUG_ASSERT(false);                         /* purecov: inspected */
+    assert(false);                         /* purecov: inspected */
   }
 }
 
@@ -239,7 +246,7 @@ static void report_engine_cost_warnings(const LEX_CSTRING &se_name,
                       cost_name.str, se_name.str, storage_category, value);
     break;
   default:
-    DBUG_ASSERT(false);                         /* purecov: inspected */
+    assert(false);                         /* purecov: inspected */
   }
 }
 
@@ -432,7 +439,7 @@ static void read_cost_constants(Cost_model_constants* cost_constants)
 
   // Create and initialize a new THD.
   THD *thd= new THD;
-  DBUG_ASSERT(thd);
+  assert(thd);
   thd->thread_stack= pointer_cast<char*>(&thd);
   thd->store_globals();
   lex_start(thd);
@@ -449,8 +456,8 @@ static void read_cost_constants(Cost_model_constants* cost_constants)
 
   if (!open_and_lock_tables(thd, tables, MYSQL_LOCK_IGNORE_TIMEOUT))
   {
-    DBUG_ASSERT(tables[0].table != NULL);
-    DBUG_ASSERT(tables[1].table != NULL);
+    assert(tables[0].table != NULL);
+    assert(tables[1].table != NULL);
 
     // Read the server constants table
     read_server_cost_constants(thd, tables[0].table, cost_constants);
@@ -479,7 +486,7 @@ static void read_cost_constants(Cost_model_constants* cost_constants)
 
 void init_optimizer_cost_module(bool enable_plugins)
 {
-  DBUG_ASSERT(cost_constant_cache == NULL);
+  assert(cost_constant_cache == NULL);
   cost_constant_cache= new Cost_constant_cache();
   cost_constant_cache->init();
   /*
diff --git a/sql/opt_costconstantcache.h b/sql/opt_costconstantcache.h
index d58fb162de19..3c9c36d75271 100644
--- a/sql/opt_costconstantcache.h
+++ b/sql/opt_costconstantcache.h
@@ -2,16 +2,23 @@
 #define OPT_COSTCONSTANTCACHE_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -129,7 +136,7 @@ class Cost_constant_cache
 
   void release_cost_constants(const Cost_model_constants *cost_constants)
   {
-    DBUG_ASSERT(cost_constants != NULL);
+    assert(cost_constants != NULL);
 
     /*
       The reason for using a const cast here is to be able to keep
diff --git a/sql/opt_costconstants.cc b/sql/opt_costconstants.cc
index 4ba6fd234cca..0feb1066c0cd 100644
--- a/sql/opt_costconstants.cc
+++ b/sql/opt_costconstants.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -74,8 +81,8 @@ const double Server_cost_constants::DISK_TEMPTABLE_ROW_COST= 1.0;
 cost_constant_error Server_cost_constants::set(const LEX_CSTRING &name,
                                                double value)
 {
-  DBUG_ASSERT(name.str != NULL);
-  DBUG_ASSERT(name.length > 0);
+  assert(name.str != NULL);
+  assert(name.length > 0);
 
   if (name.str == NULL || name.length == 0)
     return UNKNOWN_COST_NAME;                   /* purecov: inspected */
@@ -152,8 +159,8 @@ cost_constant_error SE_cost_constants::set(const LEX_CSTRING &name,
                                            const double value,
                                            bool default_value)
 {
-  DBUG_ASSERT(name.str != NULL);
-  DBUG_ASSERT(name.length > 0);
+  assert(name.str != NULL);
+  assert(name.length > 0);
 
   if (name.str == NULL || name.length == 0)
     return UNKNOWN_COST_NAME;                   /* purecov: inspected */
@@ -283,19 +290,19 @@ Cost_model_constants::Cost_model_constants()
 
 Cost_model_constants::~Cost_model_constants()
 {
-  DBUG_ASSERT(m_ref_counter == 0);
+  assert(m_ref_counter == 0);
 }
 
 
 const SE_cost_constants
 *Cost_model_constants::get_se_cost_constants(const TABLE *table) const
 {
-  DBUG_ASSERT(table->file != NULL);
-  DBUG_ASSERT(table->file->ht != NULL);
+  assert(table->file != NULL);
+  assert(table->file->ht != NULL);
 
   const SE_cost_constants *se_cc=
     m_engines[table->file->ht->slot].get_cost_constants(DEFAULT_STORAGE_CLASS);
-  DBUG_ASSERT(se_cc != NULL);
+  assert(se_cc != NULL);
 
   return se_cc;
 }
@@ -336,7 +343,7 @@ Cost_model_constants::update_engine_cost_constant(THD *thd,
 
     SE_cost_constants *se_cc=
       m_engines[ht_slot_id].get_cost_constants(storage_category);
-    DBUG_ASSERT(se_cc != NULL);
+    assert(se_cc != NULL);
 
     retval= se_cc->update(name, value);
   }
@@ -360,10 +367,10 @@ uint Cost_model_constants::find_handler_slot_from_name(THD *thd,
 
   // Find the handlerton for this storage engine
   handlerton *ht= plugin_data<handlerton*>(plugin);
-  DBUG_ASSERT(ht != NULL);
+  assert(ht != NULL);
   if (!ht)
   {
-    DBUG_ASSERT(false);                         /* purecov: inspected */
+    assert(false);                         /* purecov: inspected */
     return HA_SLOT_UNDEF;
   }
 
@@ -376,7 +383,7 @@ Cost_model_constants::update_engine_default_cost(const LEX_CSTRING &name,
                                                  uint storage_category,
                                                  double value)
 {
-  DBUG_ASSERT(storage_category < MAX_STORAGE_CLASSES);
+  assert(storage_category < MAX_STORAGE_CLASSES);
 
   /*
     Return value: if at least one of the storage engines recognizes the
diff --git a/sql/opt_costconstants.h b/sql/opt_costconstants.h
index f16f991554f7..813dc2ace18d 100644
--- a/sql/opt_costconstants.h
+++ b/sql/opt_costconstants.h
@@ -2,22 +2,29 @@
 #define OPT_COSTCONSTANTS_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#include "my_dbug.h"                            // DBUG_ASSERT
+#include "my_dbug.h"                            // assert
 #include "handler.h"                            // MAX_HA
 #include "m_string.h"                           // LEX_CSTRING
 
@@ -362,9 +369,9 @@ class Cost_model_se_info
   void set_cost_constants(SE_cost_constants *cost_constants,
                           unsigned int storage_class)
   {
-    DBUG_ASSERT(cost_constants != NULL);
-    DBUG_ASSERT(storage_class < MAX_STORAGE_CLASSES);
-    DBUG_ASSERT(m_se_cost_constants[storage_class] == NULL);
+    assert(cost_constants != NULL);
+    assert(storage_class < MAX_STORAGE_CLASSES);
+    assert(m_se_cost_constants[storage_class] == NULL);
 
     m_se_cost_constants[storage_class]= cost_constants;
   }
@@ -380,8 +387,8 @@ class Cost_model_se_info
 
   const SE_cost_constants *get_cost_constants(unsigned int storage_class) const
   {
-    DBUG_ASSERT(storage_class < MAX_STORAGE_CLASSES);
-    DBUG_ASSERT(m_se_cost_constants[storage_class] != NULL);
+    assert(storage_class < MAX_STORAGE_CLASSES);
+    assert(m_se_cost_constants[storage_class] != NULL);
 
     return m_se_cost_constants[storage_class];
   }
@@ -396,8 +403,8 @@ class Cost_model_se_info
 
   SE_cost_constants *get_cost_constants(unsigned int storage_class)
   {
-    DBUG_ASSERT(storage_class < MAX_STORAGE_CLASSES);
-    DBUG_ASSERT(m_se_cost_constants[storage_class] != NULL);
+    assert(storage_class < MAX_STORAGE_CLASSES);
+    assert(m_se_cost_constants[storage_class] != NULL);
 
     return m_se_cost_constants[storage_class];
   }
@@ -509,7 +516,7 @@ class Cost_model_constants
 
   unsigned int dec_ref_count()
   {
-    DBUG_ASSERT(m_ref_counter > 0);
+    assert(m_ref_counter > 0);
 
     m_ref_counter--;
     return m_ref_counter;
@@ -556,7 +563,7 @@ class Cost_model_constants
   /// Reference counter for this set of cost constants.
   unsigned int m_ref_counter;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /// Version number for this cost constant set. Not used. Will likely remove
   unsigned int version_no;
 #endif
diff --git a/sql/opt_costmodel.cc b/sql/opt_costmodel.cc
index b61bed7bc714..d4ba835bfffa 100644
--- a/sql/opt_costmodel.cc
+++ b/sql/opt_costmodel.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -40,13 +47,13 @@ void Cost_model_server::init()
   {
     // Get the current set of cost constants
     m_cost_constants= cost_constant_cache->get_cost_constants();
-    DBUG_ASSERT(m_cost_constants != NULL);
+    assert(m_cost_constants != NULL);
 
     // Get the cost constants for server operations
     m_server_cost_constants= m_cost_constants->get_server_cost_constants();
-    DBUG_ASSERT(m_server_cost_constants != NULL);
+    assert(m_server_cost_constants != NULL);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     m_initialized= true;
 #endif
   }
@@ -56,8 +63,8 @@ void Cost_model_server::init()
 void Cost_model_table::init(const Cost_model_server *cost_model_server,
                             const TABLE *table)
 {
-  DBUG_ASSERT(cost_model_server != NULL);
-  DBUG_ASSERT(table != NULL);
+  assert(cost_model_server != NULL);
+  assert(table != NULL);
 
   m_cost_model_server= cost_model_server;
   m_table= table;
@@ -65,9 +72,9 @@ void Cost_model_table::init(const Cost_model_server *cost_model_server,
   // Find the cost constant object to be used for this table
   m_se_cost_constants=
     m_cost_model_server->get_cost_constants()->get_se_cost_constants(table);
-  DBUG_ASSERT(m_se_cost_constants != NULL);
+  assert(m_se_cost_constants != NULL);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   m_initialized= true;
 #endif
 }
@@ -75,14 +82,14 @@ void Cost_model_table::init(const Cost_model_server *cost_model_server,
 
 double Cost_model_table::page_read_cost(double pages) const
 {
-  DBUG_ASSERT(m_initialized);
-  DBUG_ASSERT(pages >= 0.0);
+  assert(m_initialized);
+  assert(pages >= 0.0);
 
   const double in_mem= m_table->file->table_in_memory_estimate();
 
   const double pages_in_mem= pages * in_mem;
   const double pages_on_disk= pages - pages_in_mem;
-  DBUG_ASSERT(pages_on_disk >= 0.0);
+  assert(pages_on_disk >= 0.0);
 
   const double cost= buffer_block_read_cost(pages_in_mem) +
     io_block_read_cost(pages_on_disk);
@@ -93,8 +100,8 @@ double Cost_model_table::page_read_cost(double pages) const
 
 double Cost_model_table::page_read_cost_index(uint index, double pages) const
 {
-  DBUG_ASSERT(m_initialized);
-  DBUG_ASSERT(pages >= 0.0);
+  assert(m_initialized);
+  assert(pages >= 0.0);
 
   double in_mem= m_table->file->index_in_memory_estimate(index);
 
diff --git a/sql/opt_costmodel.h b/sql/opt_costmodel.h
index ccc201f3bd79..e131ae6bc5eb 100644
--- a/sql/opt_costmodel.h
+++ b/sql/opt_costmodel.h
@@ -2,22 +2,29 @@
 #define OPT_COSTMODEL_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#include "my_dbug.h"                            // DBUG_ASSERT
+#include "my_dbug.h"                            // assert
 #include "sql_const.h"                          // defines for cost constants
 #include "opt_costconstants.h"
 
@@ -39,7 +46,7 @@ class Cost_model_server
 
   Cost_model_server() : m_cost_constants(NULL), m_server_cost_constants(NULL)
   {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     m_initialized= false;
 #endif
   }
@@ -75,8 +82,8 @@ class Cost_model_server
 
   double row_evaluate_cost(double rows) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(rows >= 0.0);
+    assert(m_initialized);
+    assert(rows >= 0.0);
 
     return rows * m_server_cost_constants->row_evaluate_cost();
   }
@@ -91,8 +98,8 @@ class Cost_model_server
 
   double key_compare_cost(double keys) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(keys >= 0.0);
+    assert(m_initialized);
+    assert(keys >= 0.0);
 
     return keys * m_server_cost_constants->key_compare_cost();
   }
@@ -160,7 +167,7 @@ class Cost_model_server
 
   double tmptable_create_cost(enum_tmptable_type tmptable_type) const
   {
-    DBUG_ASSERT(m_initialized);
+    assert(m_initialized);
 
     if (tmptable_type == MEMORY_TMPTABLE)
       return memory_tmptable_create_cost();
@@ -181,9 +188,9 @@ class Cost_model_server
   double tmptable_readwrite_cost(enum_tmptable_type tmptable_type, 
                                  double write_rows, double read_rows) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(write_rows >= 0.0);
-    DBUG_ASSERT(read_rows >= 0.0);
+    assert(m_initialized);
+    assert(write_rows >= 0.0);
+    assert(read_rows >= 0.0);
 
     return (write_rows + read_rows) * tmptable_row_cost(tmptable_type);
   }
@@ -198,7 +205,7 @@ class Cost_model_server
 
   const Cost_model_constants *get_cost_constants() const
   {
-    DBUG_ASSERT(m_initialized);
+    assert(m_initialized);
 
     return m_cost_constants;
   }
@@ -215,7 +222,7 @@ class Cost_model_server
   */
   const Server_cost_constants *m_server_cost_constants;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /**
     Used for detecting if this object is used without having been initialized.
   */
@@ -237,7 +244,7 @@ class Cost_model_table
   Cost_model_table() : m_cost_model_server(NULL), m_se_cost_constants(NULL),
     m_table(NULL)
   {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     m_initialized= false;
 #endif
   }
@@ -267,8 +274,8 @@ class Cost_model_table
 
   double row_evaluate_cost(double rows) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(rows >= 0.0);
+    assert(m_initialized);
+    assert(rows >= 0.0);
 
     return m_cost_model_server->row_evaluate_cost(rows);
   }
@@ -283,8 +290,8 @@ class Cost_model_table
 
   double key_compare_cost(double keys) const
    {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(keys >= 0.0);
+     assert(m_initialized);
+     assert(keys >= 0.0);
 
     return m_cost_model_server->key_compare_cost(keys);
   }
@@ -299,8 +306,8 @@ class Cost_model_table
 
   double io_block_read_cost(double blocks) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(blocks >= 0.0);
+    assert(m_initialized);
+    assert(blocks >= 0.0);
 
     return blocks * m_se_cost_constants->io_block_read_cost();
   }
@@ -316,8 +323,8 @@ class Cost_model_table
 
   double buffer_block_read_cost(double blocks) const
   {
-    DBUG_ASSERT(m_initialized);
-    DBUG_ASSERT(blocks >= 0.0);
+    assert(m_initialized);
+    assert(blocks >= 0.0);
 
     return blocks * m_se_cost_constants->memory_block_read_cost();
   }
@@ -352,7 +359,7 @@ class Cost_model_table
 
   double disk_seek_base_cost() const
   {
-    DBUG_ASSERT(m_initialized);
+    assert(m_initialized);
 
     return DISK_SEEK_BASE_COST * io_block_read_cost(1.0);
   }
@@ -387,8 +394,8 @@ class Cost_model_table
 
   double disk_seek_cost(double seek_blocks) const
   {
-    DBUG_ASSERT(seek_blocks >= 0.0);
-    DBUG_ASSERT(m_initialized);
+    assert(seek_blocks >= 0.0);
+    assert(m_initialized);
 
     const double cost= disk_seek_base_cost() +
                        disk_seek_prop_cost() * seek_blocks;
@@ -407,7 +414,7 @@ class Cost_model_table
   */
   const SE_cost_constants *m_se_cost_constants;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   /**
     Used for detecting if this object is used without having been initialized.
   */
diff --git a/sql/opt_explain.cc b/sql/opt_explain.cc
index e40d42b41339..088bedef1e46 100644
--- a/sql/opt_explain.cc
+++ b/sql/opt_explain.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -279,12 +286,12 @@ class Explain_union_result : public Explain
   : Explain(CTX_UNION_RESULT, thd_arg, select_lex_arg)
   {
     /* it's a UNION: */
-    DBUG_ASSERT(select_lex_arg ==
-                select_lex_arg->master_unit()->fake_select_lex);
+    assert(select_lex_arg ==
+           select_lex_arg->master_unit()->fake_select_lex);
     // Use optimized values from fake_select_lex's join
     order_list= MY_TEST(select_lex_arg->join->order);
     // A plan exists so the reads above are safe:
-    DBUG_ASSERT(select_lex_arg->join->get_plan_state() != JOIN::NO_PLAN);
+    assert(select_lex_arg->join->get_plan_state() != JOIN::NO_PLAN);
   }
 
 protected:
@@ -295,7 +302,7 @@ class Explain_union_result : public Explain
   /* purecov: begin deadcode */
   virtual bool can_walk_clauses()
   {
-    DBUG_ASSERT(0);   // UNION result can't have conditions
+    assert(0);   // UNION result can't have conditions
     return true;                        // Because we know that we have a plan
   }
   /* purecov: end */
@@ -365,10 +372,10 @@ class Explain_join : public Explain_table_base
     need_order(need_order_arg), distinct(distinct_arg),
     join(select_lex_arg->join), used_tables(0)
   {
-    DBUG_ASSERT(select_lex->join->thd == select_lex->master_unit()->thd);
-    DBUG_ASSERT(join->get_plan_state() == JOIN::PLAN_READY);
+    assert(select_lex->join->thd == select_lex->master_unit()->thd);
+    assert(join->get_plan_state() == JOIN::PLAN_READY);
     /* it is not UNION: */
-    DBUG_ASSERT(join->select_lex != join->unit->fake_select_lex);
+    assert(join->select_lex != join->unit->fake_select_lex);
     order_list= MY_TEST(join->order);
   }
 
@@ -554,7 +561,7 @@ bool Explain::explain_subqueries()
        unit;
        unit= unit->next_unit())
   {
-    DBUG_ASSERT(explain_other || unit->is_optimized());
+    assert(explain_other || unit->is_optimized());
     SELECT_LEX *sl= unit->first_select();
     enum_parsing_context context= get_subquery_context(unit);
     if (context == CTX_NONE)
@@ -881,7 +888,7 @@ bool Explain_table_base::explain_key_and_len_quick(QUICK_SELECT_I *quick)
 
 bool Explain_table_base::explain_key_and_len_index(int key)
 {
-  DBUG_ASSERT(key != MAX_KEY);
+  assert(key != MAX_KEY);
   return explain_key_and_len_index(key, table->key_info[key].key_length,
                                    table->key_info[key].user_defined_key_parts);
 }
@@ -890,7 +897,7 @@ bool Explain_table_base::explain_key_and_len_index(int key)
 bool Explain_table_base::explain_key_and_len_index(int key, uint key_length,
                                                    uint key_parts)
 {
-  DBUG_ASSERT(key != MAX_KEY);
+  assert(key != MAX_KEY);
 
   char buff_key_len[24];
   const KEY *key_info= table->key_info + key;
@@ -974,7 +981,7 @@ bool Explain_table_base::explain_extra_common(int quick_type,
           We are replacing existing col_key value with a quickselect info,
           but not the reverse:
         */
-        DBUG_ASSERT(fmt->entry()->col_key.length);
+        assert(fmt->entry()->col_key.length);
         if (fmt->entry()->col_key.set(buff)) // keep col_key_len intact
           return true;
       }
@@ -1088,7 +1095,7 @@ bool Explain_table_base::explain_extra_common(int quick_type,
                            "rank >= %g", ft_hints->get_op_value());
           break;
         default:
-          DBUG_ASSERT(0);
+          assert(0);
       }
 
       buff.append(buf, len, cs);
@@ -1252,7 +1259,7 @@ bool Explain_join::shallow_explain()
       Due to begin_sort_context() calls above, fmt->entry() returns another
       context than stored in join_entry.
     */
-    DBUG_ASSERT(fmt->entry() != join_entry || !fmt->is_hierarchical());
+    assert(fmt->entry() != join_entry || !fmt->is_hierarchical());
     fmt->entry()->col_read_cost.set(join->sort_cost);
   }
 
@@ -1291,7 +1298,7 @@ bool Explain_join::explain_qep_tab(size_t tabnum)
 
   if (tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE)
   {
-    DBUG_ASSERT(tab->quick_optim());
+    assert(tab->quick_optim());
     quick_type= tab->quick_optim()->get_type();
   }
 
@@ -1671,7 +1678,7 @@ bool Explain_join::explain_extra()
       else if (t == JOIN_CACHE::ALG_BKA_UNIQUE)
         buff.append("Batched Key Access (unique)");
       else
-        DBUG_ASSERT(0); /* purecov: inspected */
+        assert(0); /* purecov: inspected */
       if (push_extra(ET_USING_JOIN_BUFFER, buff))
         return true;
     }
@@ -1716,7 +1723,7 @@ bool Explain_table::explain_tmptable_and_filesort(bool need_tmp_table_arg,
     */
     if (need_tmp_table_arg)
     {
-      DBUG_ASSERT(used_key_is_modified || order_list);
+      assert(used_key_is_modified || order_list);
       if (used_key_is_modified && push_extra(ET_USING_TEMPORARY, "for update"))
         return true;
     }
@@ -2093,10 +2100,10 @@ explain_query_specification(THD *ethd, SELECT_LEX *select_lex,
       break;
     }
     default:
-      DBUG_ASSERT(0); /* purecov: inspected */
+      assert(0); /* purecov: inspected */
       ret= true;
   }
-  DBUG_ASSERT(ret || !ethd->is_error());
+  assert(ret || !ethd->is_error());
   ret|= ethd->is_error();
   return ret;
 }
@@ -2160,7 +2167,7 @@ bool explain_query(THD *ethd, SELECT_LEX_UNIT *unit)
   }
   else
   {
-    DBUG_ASSERT(unit->is_optimized());
+    assert(unit->is_optimized());
     if (explain_result->need_explain_interceptor())
       explain_result= &explain_wrapper;
   }
@@ -2225,7 +2232,7 @@ bool mysql_explain_unit(THD *ethd, SELECT_LEX_UNIT *unit)
     res= unit->explain(ethd);
   else
     res= explain_query_specification(ethd, unit->first_select(), CTX_JOIN);
-  DBUG_ASSERT(res || !ethd->is_error());
+  assert(res || !ethd->is_error());
   res|= ethd->is_error();
   DBUG_RETURN(res);
 }
@@ -2337,7 +2344,7 @@ void mysql_explain_other(THD *thd)
         qp->get_lex()->sphead == NULL)                               // (3)
     {
       Security_context *tmp_sctx= query_thd->security_context();
-      DBUG_ASSERT(tmp_sctx->user().str);
+      assert(tmp_sctx->user().str);
       if (user && strcmp(tmp_sctx->user().str, user))
       {
         my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
@@ -2381,7 +2388,7 @@ void mysql_explain_other(THD *thd)
                                              qp->get_lex()->unit->first_select());
       break;
     default:
-      DBUG_ASSERT(0); /* purecov: inspected */
+      assert(0); /* purecov: inspected */
       send_ok= true; /* purecov: inspected */
       break;
   }
@@ -2399,7 +2406,7 @@ void mysql_explain_other(THD *thd)
 void Modification_plan::register_in_thd()
 {
   thd->lock_query_plan();
-  DBUG_ASSERT(thd->query_plan.get_modification_plan() == NULL);
+  assert(thd->query_plan.get_modification_plan() == NULL);
   thd->query_plan.set_modification_plan(this);
   thd->unlock_query_plan();
 }
@@ -2442,7 +2449,7 @@ Modification_plan::Modification_plan(THD *thd_arg,
   used_key_is_modified(used_key_is_modified_arg), message(NULL),
   zero_result(false), examined_rows(rows)
 {
-  DBUG_ASSERT(current_thd == thd);
+  assert(current_thd == thd);
   if (!thd->in_sub_stmt)
     register_in_thd();
 }
@@ -2476,7 +2483,7 @@ Modification_plan::Modification_plan(THD *thd_arg,
   need_sort(false), used_key_is_modified(false), message(message_arg),
   zero_result(zero_result_arg), examined_rows(rows)
 {
-  DBUG_ASSERT(current_thd == thd);
+  assert(current_thd == thd);
   if (!thd->in_sub_stmt)
     register_in_thd();
 };
@@ -2487,8 +2494,8 @@ Modification_plan::~Modification_plan()
   if (!thd->in_sub_stmt)
   {
     thd->lock_query_plan();
-    DBUG_ASSERT(current_thd == thd &&
-                thd->query_plan.get_modification_plan() == this);
+    assert(current_thd == thd &&
+           thd->query_plan.get_modification_plan() == this);
     thd->query_plan.set_modification_plan(NULL);
     thd->unlock_query_plan();
   }
diff --git a/sql/opt_explain.h b/sql/opt_explain.h
index 0c1586028949..607a73d12191 100644
--- a/sql/opt_explain.h
+++ b/sql/opt_explain.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/opt_explain_format.h b/sql/opt_explain_format.h
index ba17ebcf1ff2..6a0e0a8359b3 100644
--- a/sql/opt_explain_format.h
+++ b/sql/opt_explain_format.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -153,7 +160,7 @@ class qep_row : public Sql_alloc
     bool is_empty() const { return nil; }
     void cleanup() { nil= true; }
     void set(T value_arg) { value= value_arg; nil= false; }
-    T get() const { DBUG_ASSERT(!nil); return value; }
+    T get() const { assert(!nil); return value; }
   };
 
   /**
@@ -188,7 +195,7 @@ class qep_row : public Sql_alloc
         StringBuffer<128> buff(system_charset_info);
         if (deferred->eval(&buff) || set(buff))
         {
-          DBUG_ASSERT(!"OOM!");
+          assert(!"OOM!");
           return true; // ignore OOM
         }
         deferred= NULL; // prevent double evaluation, if any
diff --git a/sql/opt_explain_json.cc b/sql/opt_explain_json.cc
index f8c34c1332f6..5dbafaebe307 100644
--- a/sql/opt_explain_json.cc
+++ b/sql/opt_explain_json.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -217,10 +224,10 @@ class context : public Explain_context
   */
   virtual size_t id(bool hide= false)= 0;
 
-  virtual bool cacheable() { DBUG_ASSERT(0); return true; }
-  virtual bool dependent() { DBUG_ASSERT(0); return false; }
+  virtual bool cacheable() { assert(0); return true; }
+  virtual bool dependent() { assert(0); return false; }
 
-  virtual class qep_row *entry() { DBUG_ASSERT(0); return NULL; }
+  virtual class qep_row *entry() { assert(0); return NULL; }
   virtual enum_mod_type get_mod_type() { return MT_NONE; }
 
   /**
@@ -231,7 +238,7 @@ class context : public Explain_context
   virtual void set_child(context *child) {}
 
   /// associate CTX_UNION_RESULT node with CTX_UNION node
-  virtual void set_union_result(union_result_ctx *ctx) { DBUG_ASSERT(0); }
+  virtual void set_union_result(union_result_ctx *ctx) { assert(0); }
 
   /**
     Append a subquery node to the specified list of the unit node
@@ -243,7 +250,7 @@ class context : public Explain_context
     @retval true            Error
   */
   virtual bool add_subquery(subquery_list_enum subquery_type,
-                            subquery_ctx *ctx) { DBUG_ASSERT(0);return true; }
+                            subquery_ctx *ctx) { assert(0);return true; }
   /**
     Format nested loop join subtree (if any) to JSON formatter
 
@@ -253,7 +260,7 @@ class context : public Explain_context
     @retval true                Error
   */
   virtual bool format_nested_loop(Opt_trace_context *json)
-  { DBUG_ASSERT(0); return true; }
+  { assert(0); return true; }
 
   /**
     Add a CTX_QEP_TAB node to a CTX_JOIN node
@@ -263,7 +270,7 @@ class context : public Explain_context
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_join_tab(joinable_ctx *ctx) { DBUG_ASSERT(0);return true; }
+  virtual bool add_join_tab(joinable_ctx *ctx) { assert(0);return true; }
 
   /**
     Set nested ORDER BY/GROUP BY/DISTINCT node to @c ctx
@@ -273,7 +280,7 @@ class context : public Explain_context
     @retval false               Ok
     @retval true                Error
   */
-  virtual void set_sort(sort_ctx *ctx) { DBUG_ASSERT(0); }
+  virtual void set_sort(sort_ctx *ctx) { assert(0); }
 
   /**
     Add a query specification node to the CTX_UNION node
@@ -283,7 +290,7 @@ class context : public Explain_context
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_query_spec(context *ctx) { DBUG_ASSERT(0); return true; }
+  virtual bool add_query_spec(context *ctx) { assert(0); return true; }
 
   /**
     Try to associate a derived subquery node with this or underlying node
@@ -296,7 +303,7 @@ class context : public Explain_context
   */
   virtual bool find_and_set_derived(context *subquery)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return false;
   }
 
@@ -314,7 +321,7 @@ class context : public Explain_context
   virtual int add_where_subquery(subquery_ctx *ctx,
                                   SELECT_LEX_UNIT *subquery)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return false;
   }
 
@@ -450,8 +457,8 @@ class subquery_ctx : virtual public context, public qep_row
 public:
   virtual void set_child(context *child)
   {
-    DBUG_ASSERT(subquery == NULL);
-    DBUG_ASSERT(child->type == CTX_JOIN || child->type == CTX_UNION);
+    assert(subquery == NULL);
+    assert(child->type == CTX_JOIN || child->type == CTX_UNION);
     subquery= child;
   }
 
@@ -641,7 +648,7 @@ bool table_base_ctx::format_body(Opt_trace_context *json, Opt_trace_object *obj)
     qep_row::extra *e;
     while ((e= it++))
     {
-      DBUG_ASSERT(json_extra_tags[e->tag] != NULL);
+      assert(json_extra_tags[e->tag] != NULL);
       if (e->data)
         obj->add_utf8(json_extra_tags[e->tag], e->data);
       else
@@ -676,7 +683,7 @@ bool table_base_ctx::format_body(Opt_trace_context *json, Opt_trace_object *obj)
 
   if (!col_message.is_empty() && type != CTX_MESSAGE)
   {
-    DBUG_ASSERT(col_extra.is_empty());
+    assert(col_extra.is_empty());
     obj->add_alnum(K_MESSAGE, col_message.str);
   }
 
@@ -728,14 +735,14 @@ class union_result_ctx : public table_base_ctx, public unit_ctx
     case SQ_OPTIMIZED_AWAY:
       return optimized_away_subqueries.push_back(ctx);
     default:
-      DBUG_ASSERT(!"Unknown query type!");
+      assert(!"Unknown query type!");
       return false; // ignore in production
     }
   }
 
   virtual bool add_join_tab(joinable_ctx *ctx)
   {
-    DBUG_ASSERT(!message);
+    assert(!message);
     message= ctx;
     return false;
   }
@@ -1073,7 +1080,7 @@ class join_ctx : public unit_ctx, virtual public qep_row
 
   virtual void set_sort(sort_ctx *ctx)
   {
-    DBUG_ASSERT(!sort);
+    assert(!sort);
     sort= ctx;
   }
   virtual qep_row *entry() { return this; }
@@ -1156,7 +1163,7 @@ class sort_ctx : public join_ctx
 protected:
   virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
   {
-    DBUG_ASSERT(!sort || join_tabs.is_empty());
+    assert(!sort || join_tabs.is_empty());
 
     if (using_tmptable)
       obj->add(K_USING_TMP_TABLE, true);
@@ -1206,7 +1213,7 @@ class sort_with_subqueries_ctx : public sort_ctx
 
 bool join_ctx::find_and_set_derived(context *subquery)
 {
-  DBUG_ASSERT(subquery->id() != 0);
+  assert(subquery->id() != 0);
 
   if (sort)
     return sort->find_and_set_derived(subquery);
@@ -1242,11 +1249,11 @@ bool join_ctx::add_subquery(subquery_list_enum subquery_type,
       case CTX_SIMPLE_GROUP_BY:
         return j->add_subquery(subquery_type, ctx);
       case CTX_MESSAGE: // The 'no plan' case
-        DBUG_ASSERT(subquery_type == SQ_ORDER_BY ||
-                    subquery_type == SQ_GROUP_BY);
+        assert(subquery_type == SQ_ORDER_BY ||
+               subquery_type == SQ_GROUP_BY);
         return unit_ctx::add_subquery(subquery_type, ctx);
       default:
-        DBUG_ASSERT(0); /* purecov: inspected */
+        assert(0); /* purecov: inspected */
       }
     }
   }
@@ -1297,7 +1304,7 @@ bool join_ctx::format_body_inner(Opt_trace_context *json, Opt_trace_object *obj)
   else if (join_tabs.elements && join_tabs.head()->type == CTX_MESSAGE)
   {
     // Could be only 1 message per join
-    DBUG_ASSERT(join_tabs.elements == 1);
+    assert(join_tabs.elements == 1);
     message_ctx *msg= (message_ctx*)join_tabs.head();
     obj->add_alnum(K_MESSAGE, msg->entry()->col_message.str);
     if (msg->derived_from.elements)
@@ -1315,7 +1322,7 @@ bool join_ctx::format_nested_loop(Opt_trace_context *json)
 {
   List_iterator<joinable_ctx> it(join_tabs);
   uint join_tab_num= join_tabs.elements;
-  DBUG_ASSERT(join_tabs.elements > 0);
+  assert(join_tabs.elements > 0);
 
   if (join_tabs.head()->get_mod_type() == MT_INSERT ||
       join_tabs.head()->get_mod_type() == MT_REPLACE)
@@ -1483,7 +1490,7 @@ class materialize_ctx : public joinable_ctx, public join_ctx,
 private:
   virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
   {
-    DBUG_ASSERT(!col_join_type.is_empty());
+    assert(!col_join_type.is_empty());
 
     if (!col_table_name.is_empty())
       obj->add_utf8(K_TABLE_NAME, col_table_name.str);
@@ -1613,7 +1620,7 @@ class union_ctx : public unit_ctx
 
   virtual void set_union_result(union_result_ctx *ctx)
   {
-    DBUG_ASSERT(union_result == NULL);
+    assert(union_result == NULL);
     union_result= ctx;
     union_result->push_down_query_specs(&query_specs);
   }
@@ -1663,24 +1670,24 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
   context *prev_context= current_context;
   switch(ctx) {
   case CTX_JOIN:
-    DBUG_ASSERT(current_context == NULL ||
-                // subqueries:
-                current_context->type == CTX_SELECT_LIST ||
-                current_context->type == CTX_UPDATE_VALUE_LIST ||
-                current_context->type == CTX_DERIVED ||
-                current_context->type == CTX_OPTIMIZED_AWAY_SUBQUERY ||
-                current_context->type == CTX_WHERE ||
-                current_context->type == CTX_HAVING ||
-                current_context->type == CTX_ORDER_BY_SQ ||
-                current_context->type == CTX_GROUP_BY_SQ ||
-                current_context->type == CTX_QUERY_SPEC);
+    assert(current_context == NULL ||
+           // subqueries:
+           current_context->type == CTX_SELECT_LIST ||
+           current_context->type == CTX_UPDATE_VALUE_LIST ||
+           current_context->type == CTX_DERIVED ||
+           current_context->type == CTX_OPTIMIZED_AWAY_SUBQUERY ||
+           current_context->type == CTX_WHERE ||
+           current_context->type == CTX_HAVING ||
+           current_context->type == CTX_ORDER_BY_SQ ||
+           current_context->type == CTX_GROUP_BY_SQ ||
+           current_context->type == CTX_QUERY_SPEC);
     if ((current_context=
          new join_ctx(CTX_JOIN, K_QUERY_BLOCK, current_context)) == NULL)
       return true;
     break;
   case CTX_ORDER_BY:
     { 
-      DBUG_ASSERT(current_context->type == CTX_JOIN);
+      assert(current_context->type == CTX_JOIN);
       sort_ctx *ctx= new sort_with_subqueries_ctx(CTX_ORDER_BY,
                                                   K_ORDERING_OPERATION,
                                                   current_context,
@@ -1694,9 +1701,9 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_GROUP_BY:
     { 
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT);
       sort_ctx *ctx= new sort_with_subqueries_ctx(CTX_GROUP_BY,
                                                   K_GROUPING_OPERATION,
                                                   current_context,
@@ -1710,8 +1717,8 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_DISTINCT:
     { 
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_ORDER_BY);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_ORDER_BY);
       sort_ctx *ctx= new sort_ctx(CTX_DISTINCT, K_DUPLICATES_REMOVAL,
                                   current_context, flags, ESC_DISTINCT);
       if (ctx == NULL)
@@ -1722,10 +1729,10 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_BUFFER_RESULT:
     { 
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_GROUP_BY);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_GROUP_BY);
       sort_ctx *ctx= new sort_ctx(CTX_BUFFER_RESULT, K_BUFFER_RESULT,
                                   current_context, flags, ESC_BUFFER_RESULT);
       if (ctx == NULL)
@@ -1736,16 +1743,16 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_QEP_TAB:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_MATERIALIZATION ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_SIMPLE_GROUP_BY ||
-                  current_context->type == CTX_SIMPLE_ORDER_BY ||
-                  current_context->type == CTX_SIMPLE_DISTINCT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_MATERIALIZATION ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_SIMPLE_GROUP_BY ||
+             current_context->type == CTX_SIMPLE_ORDER_BY ||
+             current_context->type == CTX_SIMPLE_DISTINCT);
       join_tab_ctx *ctx= new join_tab_ctx(CTX_QEP_TAB, current_context);
       if (ctx == NULL || current_context->add_join_tab(ctx))
         return true;
@@ -1754,13 +1761,13 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_SIMPLE_ORDER_BY:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_MATERIALIZATION ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_DISTINCT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_MATERIALIZATION ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_DISTINCT);
       simple_sort_ctx *ctx=
         new simple_sort_with_subqueries_ctx(CTX_SIMPLE_ORDER_BY,
                                             K_ORDERING_OPERATION,
@@ -1774,15 +1781,15 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_SIMPLE_GROUP_BY:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_MATERIALIZATION ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_SIMPLE_ORDER_BY ||
-                  current_context->type == CTX_SIMPLE_DISTINCT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_MATERIALIZATION ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_SIMPLE_ORDER_BY ||
+             current_context->type == CTX_SIMPLE_DISTINCT);
       simple_sort_ctx *ctx=
         new simple_sort_with_subqueries_ctx(CTX_SIMPLE_GROUP_BY,
                                             K_GROUPING_OPERATION,
@@ -1795,14 +1802,14 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_SIMPLE_DISTINCT:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_MATERIALIZATION ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_SIMPLE_ORDER_BY);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_MATERIALIZATION ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_SIMPLE_ORDER_BY);
       simple_sort_ctx *ctx=
         new simple_sort_ctx(CTX_SIMPLE_DISTINCT, K_DUPLICATES_REMOVAL,
                             current_context, flags, ESC_DISTINCT);
@@ -1813,12 +1820,12 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_MATERIALIZATION:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT);
       materialize_ctx *ctx= new materialize_ctx(current_context);
       if (ctx == NULL || current_context->add_join_tab(ctx))
         return true;
@@ -1827,12 +1834,12 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_DUPLICATES_WEEDOUT:
     {
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_MATERIALIZATION);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_MATERIALIZATION);
       duplication_weedout_ctx *ctx=
         new duplication_weedout_ctx(current_context);
       if (ctx == NULL || current_context->add_join_tab(ctx))
@@ -1881,7 +1888,7 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_WHERE:
     {
-      DBUG_ASSERT(subquery != NULL);
+      assert(subquery != NULL);
       subquery_ctx *ctx= new subquery_ctx(CTX_WHERE, NULL, current_context);
       if (ctx == NULL ||
           current_context->add_where_subquery(ctx, subquery))
@@ -1916,24 +1923,24 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
       break;
     }
   case CTX_UNION:
-    DBUG_ASSERT(current_context == NULL ||
-                // subqueries:
-                current_context->type == CTX_SELECT_LIST ||
-                current_context->type == CTX_UPDATE_VALUE_LIST ||
-                current_context->type == CTX_DERIVED ||
-                current_context->type == CTX_OPTIMIZED_AWAY_SUBQUERY ||
-                current_context->type == CTX_WHERE ||
-                current_context->type == CTX_HAVING ||
-                current_context->type == CTX_ORDER_BY_SQ ||
-                current_context->type == CTX_GROUP_BY_SQ ||
-                current_context->type == CTX_QUERY_SPEC);
+    assert(current_context == NULL ||
+           // subqueries:
+           current_context->type == CTX_SELECT_LIST ||
+           current_context->type == CTX_UPDATE_VALUE_LIST ||
+           current_context->type == CTX_DERIVED ||
+           current_context->type == CTX_OPTIMIZED_AWAY_SUBQUERY ||
+           current_context->type == CTX_WHERE ||
+           current_context->type == CTX_HAVING ||
+           current_context->type == CTX_ORDER_BY_SQ ||
+           current_context->type == CTX_GROUP_BY_SQ ||
+           current_context->type == CTX_QUERY_SPEC);
     current_context= new union_ctx(current_context);
     if (current_context == NULL)
       return true;
     break;
   case CTX_UNION_RESULT:
     {
-      DBUG_ASSERT(current_context->type == CTX_UNION);
+      assert(current_context->type == CTX_UNION);
       union_result_ctx *ctx= new union_result_ctx(current_context);
       if (ctx == NULL)
         return true;
@@ -1943,7 +1950,7 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
     }
   case CTX_QUERY_SPEC:
     {
-      DBUG_ASSERT(current_context->type == CTX_UNION);
+      assert(current_context->type == CTX_UNION);
       subquery_ctx *ctx= new subquery_ctx(CTX_QUERY_SPEC, NULL,
                                           current_context);
       if (ctx == NULL || current_context->add_query_spec(ctx))
@@ -1956,17 +1963,17 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
       /*
         Like CTX_QEP_TAB:
       */
-      DBUG_ASSERT(current_context->type == CTX_JOIN ||
-                  current_context->type == CTX_MATERIALIZATION ||
-                  current_context->type == CTX_DUPLICATES_WEEDOUT ||
-                  current_context->type == CTX_GROUP_BY ||
-                  current_context->type == CTX_ORDER_BY ||
-                  current_context->type == CTX_DISTINCT ||
-                  current_context->type == CTX_BUFFER_RESULT ||
-                  current_context->type == CTX_SIMPLE_GROUP_BY ||
-                  current_context->type == CTX_SIMPLE_ORDER_BY ||
-                  current_context->type == CTX_SIMPLE_DISTINCT ||
-                  current_context->type == CTX_UNION_RESULT);
+      assert(current_context->type == CTX_JOIN ||
+             current_context->type == CTX_MATERIALIZATION ||
+             current_context->type == CTX_DUPLICATES_WEEDOUT ||
+             current_context->type == CTX_GROUP_BY ||
+             current_context->type == CTX_ORDER_BY ||
+             current_context->type == CTX_DISTINCT ||
+             current_context->type == CTX_BUFFER_RESULT ||
+             current_context->type == CTX_SIMPLE_GROUP_BY ||
+             current_context->type == CTX_SIMPLE_ORDER_BY ||
+             current_context->type == CTX_SIMPLE_DISTINCT ||
+             current_context->type == CTX_UNION_RESULT);
       joinable_ctx *ctx= new message_ctx(current_context);
       if (ctx == NULL || current_context->add_join_tab(ctx))
         return true;
@@ -1974,7 +1981,7 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
       break;
     }
   default:
-    DBUG_ASSERT(!"Unknown EXPLAIN context!");
+    assert(!"Unknown EXPLAIN context!");
     return true;
   }
 
@@ -1987,7 +1994,7 @@ bool Explain_format_JSON::begin_context(enum_parsing_context ctx,
 
 bool Explain_format_JSON::end_context(enum_parsing_context ctx)
 {
-  DBUG_ASSERT(current_context->type == ctx);
+  assert(current_context->type == ctx);
 
   bool ret= false;
   if (current_context->parent == NULL)
@@ -2036,7 +2043,7 @@ bool Explain_format_JSON::end_context(enum_parsing_context ctx)
   {
     if (!current_context->parent->find_and_set_derived(current_context))
     {
-      DBUG_ASSERT(!"No derived table found!");
+      assert(!"No derived table found!");
       return true;
     }
   }
diff --git a/sql/opt_explain_json.h b/sql/opt_explain_json.h
index 03ad67245486..44aa5bf71196 100644
--- a/sql/opt_explain_json.h
+++ b/sql/opt_explain_json.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/opt_explain_traditional.cc b/sql/opt_explain_traditional.cc
index 95056aa34323..120f119e55bf 100644
--- a/sql/opt_explain_traditional.cc
+++ b/sql/opt_explain_traditional.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -137,7 +144,7 @@ static bool push(List<Item> *items, const qep_row::column<float> &c,
 
 bool Explain_format_traditional::push_select_type(List<Item> *items)
 {
-  DBUG_ASSERT(!column_buffer.col_select_type.is_empty());
+  assert(!column_buffer.col_select_type.is_empty());
   StringBuffer<32> buff;
   if (column_buffer.is_dependent)
   {
@@ -208,7 +215,7 @@ bool Explain_format_traditional::flush_entry()
     qep_row::extra *e;
     while ((e= it++))
     {
-      DBUG_ASSERT(traditional_extra_tags[e->tag] != NULL);
+      assert(traditional_extra_tags[e->tag] != NULL);
       if (buff.append(traditional_extra_tags[e->tag]))
         return true;
       if (e->data)
diff --git a/sql/opt_explain_traditional.h b/sql/opt_explain_traditional.h
index 58fa6413ec1b..575d1d26d086 100644
--- a/sql/opt_explain_traditional.h
+++ b/sql/opt_explain_traditional.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/opt_hints.cc b/sql/opt_hints.cc
index f2240915b77b..3f0f12f8aec5 100644
--- a/sql/opt_hints.cc
+++ b/sql/opt_hints.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -175,7 +182,7 @@ PT_hint *Opt_hints_global::get_complex_hints(opt_hints_enum type)
   if (type == MAX_EXEC_TIME_HINT_ENUM)
     return max_exec_time;
 
-  DBUG_ASSERT(0);
+  assert(0);
   return NULL;
 }
 
@@ -200,7 +207,7 @@ PT_hint *Opt_hints_qb::get_complex_hints(opt_hints_enum type)
   if (type == SUBQUERY_HINT_ENUM)
     return subquery_hint;
 
-  DBUG_ASSERT(0);
+  assert(0);
   return NULL;
 }
 
@@ -337,7 +344,7 @@ static bool get_hint_state(Opt_hints *hint,
                            opt_hints_enum type_arg,
                            bool *ret_val)
 {
-  DBUG_ASSERT(parent_hint);
+  assert(parent_hint);
 
   if (opt_hint_info[type_arg].switch_hint)
   {
@@ -356,7 +363,7 @@ static bool get_hint_state(Opt_hints *hint,
   else
   {
     /* Complex hint, not implemented atm */
-    DBUG_ASSERT(0);
+    assert(0);
   }
   return false;
 }
diff --git a/sql/opt_hints.h b/sql/opt_hints.h
index 8e165f343258..c7d798d3b812 100644
--- a/sql/opt_hints.h
+++ b/sql/opt_hints.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -236,7 +243,7 @@ class Opt_hints : public Sql_alloc
   */
   virtual PT_hint *get_complex_hints(opt_hints_enum type)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return NULL; /* error C4716: must return a value */
   };
 
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 628817ec0163..4eaf49fad382 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -490,7 +497,8 @@ class SEL_ARG :public Sql_alloc
   SEL_ARG(SEL_ARG &);
   SEL_ARG(Field *,const uchar *, const uchar *);
   SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value,
-	  uint8 min_flag, uint8 max_flag, uint8 maybe_flag);
+	  uint8 min_flag, uint8 max_flag, uint8 maybe_flag,
+	  enum ha_rkey_function gis_func_flag);
   /*
     Used to construct MAYBE_KEY and IMPOSSIBLE SEL_ARGs. left and
     right is NULL, so this ctor must not be used to create other
@@ -501,7 +509,7 @@ class SEL_ARG :public Sql_alloc
     use_count(1), left(NULL), right(NULL),
     next_key_part(0), color(BLACK), type(type_arg)
   {
-    DBUG_ASSERT(type_arg == MAYBE_KEY || type_arg == IMPOSSIBLE);
+    assert(type_arg == MAYBE_KEY || type_arg == IMPOSSIBLE);
   }
   /**
     returns true if a range predicate is equal. Use all_same()
@@ -575,18 +583,21 @@ class SEL_ARG :public Sql_alloc
       new_max=arg->max_value; flag_max=arg->max_flag;
     }
     return new (mem_root) SEL_ARG(field, part, new_min, new_max, flag_min, flag_max,
-		       MY_TEST(maybe_flag && arg->maybe_flag));
+		       MY_TEST(maybe_flag && arg->maybe_flag),
+		       flag_min & GEOM_FLAG ? rkey_func_flag : HA_READ_INVALID);
   }
   SEL_ARG *clone_first(SEL_ARG *arg, MEM_ROOT *mem_root)
   {						// min <= X < arg->min
     return new (mem_root) SEL_ARG(field,part, min_value, arg->min_value,
 		       min_flag, arg->min_flag & NEAR_MIN ? 0 : NEAR_MAX,
-		       maybe_flag | arg->maybe_flag);
+		       maybe_flag | arg->maybe_flag,
+		       min_flag & GEOM_FLAG ? rkey_func_flag : HA_READ_INVALID);
   }
   SEL_ARG *clone_last(SEL_ARG *arg, MEM_ROOT *mem_root)
   {						// min <= X <= key_max
     return new (mem_root) SEL_ARG(field, part, min_value, arg->max_value,
-		       min_flag, arg->max_flag, maybe_flag | arg->maybe_flag);
+		       min_flag, arg->max_flag, maybe_flag | arg->maybe_flag,
+		       min_flag & GEOM_FLAG ? rkey_func_flag : HA_READ_INVALID);
   }
   SEL_ARG *clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent, SEL_ARG **next);
 
@@ -637,8 +648,8 @@ class SEL_ARG :public Sql_alloc
    */
   void set_gis_index_read_function(const enum ha_rkey_function rkey_func)
   {
-    DBUG_ASSERT(rkey_func >= HA_READ_MBR_CONTAIN &&
-                rkey_func <= HA_READ_MBR_EQUAL);
+    assert(rkey_func >= HA_READ_MBR_CONTAIN &&
+           rkey_func <= HA_READ_MBR_EQUAL);
     min_flag= GEOM_FLAG;
     rkey_func_flag= rkey_func;
     max_flag= NO_MAX_RANGE;
@@ -741,7 +752,7 @@ class SEL_ARG :public Sql_alloc
   SEL_ARG *find_range(SEL_ARG *key);
   SEL_ARG *rb_insert(SEL_ARG *leaf);
   friend SEL_ARG *rb_delete_fixup(SEL_ARG *root,SEL_ARG *key, SEL_ARG *par);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   friend int test_rb_tree(SEL_ARG *element,SEL_ARG *parent);
 #endif
   bool test_use_count(SEL_ARG *root);
@@ -1114,7 +1125,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge,
 static
 TRP_GROUP_MIN_MAX *get_best_group_min_max(PARAM *param, SEL_TREE *tree,
                                           const Cost_estimate *cost_est);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static void print_sel_tree(PARAM *param, SEL_TREE *tree, key_map *tree_map,
                            const char *msg);
 static void print_ror_scans_arr(TABLE *table, const char *msg,
@@ -1360,7 +1371,7 @@ SEL_TREE::SEL_TREE(SEL_TREE *arg, RANGE_OPT_PARAM *param):
     get_mm_tree() has constructed all ranges. In other words, there
     should not be any ROR scans to copy when this ctor is called.
   */
-  DBUG_ASSERT(n_ror_scans == 0);
+  assert(n_ror_scans == 0);
 }
 
 
@@ -1482,7 +1493,7 @@ static bool imerge_list_or_tree(RANGE_OPT_PARAM *param,
     else if (result_or == -1)
       DBUG_RETURN(true);
   }
-  DBUG_ASSERT(remaining_trees == 0);
+  assert(remaining_trees == 0);
   DBUG_RETURN(im1->is_empty());
 }
 
@@ -1604,7 +1615,7 @@ QUICK_INDEX_MERGE_SELECT::QUICK_INDEX_MERGE_SELECT(THD *thd_param,
   DBUG_ENTER("QUICK_INDEX_MERGE_SELECT::QUICK_INDEX_MERGE_SELECT");
   index= MAX_KEY;
   head= table;
-  memset(&read_record, 0, sizeof(read_record));
+
   init_sql_alloc(key_memory_quick_index_merge_root,
                  &alloc, thd->variables.range_alloc_block_size, 0);
   DBUG_VOID_RETURN;
@@ -1828,7 +1839,7 @@ int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler)
   DBUG_ENTER("QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan");
 
   /* Initialize all merged "children" quick selects */
-  DBUG_ASSERT(!need_to_fetch_row || reuse_handler);
+  assert(!need_to_fetch_row || reuse_handler);
   if (!need_to_fetch_row && reuse_handler)
   {
     quick= quick_it++;
@@ -1843,7 +1854,7 @@ int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler)
   }
   while ((quick= quick_it++))
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     const MY_BITMAP * const save_read_set= quick->head->read_set;
     const MY_BITMAP * const save_write_set= quick->head->write_set;
 #endif
@@ -1851,8 +1862,8 @@ int QUICK_ROR_INTERSECT_SELECT::init_ror_merged_scan(bool reuse_handler)
       DBUG_RETURN(error);
     quick->file->extra(HA_EXTRA_KEYREAD_PRESERVE_FIELDS);
     // Sets are shared by all members of "quick_selects" so must not change
-    DBUG_ASSERT(quick->head->read_set == save_read_set);
-    DBUG_ASSERT(quick->head->write_set == save_write_set);
+    assert(quick->head->read_set == save_read_set);
+    assert(quick->head->write_set == save_write_set);
     /* All merged scans share the same record buffer in intersection. */
     quick->record= head->record[0];
   }
@@ -1985,7 +1996,18 @@ int QUICK_ROR_UNION_SELECT::reset()
     List_iterator_fast<QUICK_SELECT_I> it(quick_selects);
     while ((quick= it++))
     {
-      if (quick->init_ror_merged_scan(FALSE))
+      /*
+        Use mem_root of this "QUICK" as using the statement mem_root
+        might result in too many allocations when combined with
+        dynamic range access where range optimizer is invoked many times
+        for a single statement.
+      */
+      THD *thd= quick->head->in_use;
+      MEM_ROOT *saved_root= thd->mem_root;
+      thd->mem_root= &alloc;
+      error= quick->init_ror_merged_scan(false);
+      thd->mem_root= saved_root;
+      if (error)
         DBUG_RETURN(1);
     }
     scans_inited= TRUE;
@@ -2066,8 +2088,8 @@ QUICK_RANGE::QUICK_RANGE(const uchar *min_key_arg, uint min_length_arg,
   min_key= static_cast<uchar*>(sql_memdup(min_key_arg, min_length_arg + 1));
   max_key= static_cast<uchar*>(sql_memdup(max_key_arg, max_length_arg + 1));
   // If we get is_null_string as argument, the memdup is undefined behavior.
-  DBUG_ASSERT(min_key_arg != is_null_string);
-  DBUG_ASSERT(max_key_arg != is_null_string);
+  assert(min_key_arg != is_null_string);
+  assert(max_key_arg != is_null_string);
 }
 
 SEL_ARG::SEL_ARG(SEL_ARG &arg)
@@ -2090,7 +2112,7 @@ SEL_ARG::SEL_ARG(SEL_ARG &arg)
   next_key_part(arg.next_key_part),
   type(arg.type)
 {
-  DBUG_ASSERT(arg.type != MAYBE_KEY);  // Would need left=right=NULL
+  assert(arg.type != MAYBE_KEY);  // Would need left=right=NULL
 }
 
 
@@ -2116,10 +2138,11 @@ SEL_ARG::SEL_ARG(Field *f,const uchar *min_value_arg,
 
 SEL_ARG::SEL_ARG(Field *field_,uint8 part_,
                  uchar *min_value_, uchar *max_value_,
-		 uint8 min_flag_,uint8 max_flag_,uint8 maybe_flag_)
+		 uint8 min_flag_,uint8 max_flag_,uint8 maybe_flag_,
+		 enum ha_rkey_function gis_func_flag)
   :min_flag(min_flag_),max_flag(max_flag_),maybe_flag(maybe_flag_), part(part_),
   maybe_null(field_->real_maybe_null()),
-  rkey_func_flag(HA_READ_INVALID), elements(1),use_count(1),
+  rkey_func_flag(gis_func_flag), elements(1),use_count(1),
   field(field_), min_value(min_value_), max_value(max_value_),
   left(&null_element), right(&null_element),
   next(NULL), prev(NULL), next_key_part(0), color(BLACK), type(KEY_RANGE)
@@ -2145,7 +2168,9 @@ SEL_ARG *SEL_ARG::clone(RANGE_OPT_PARAM *param, SEL_ARG *new_parent,
   else
   {
     if (!(tmp= new (param->mem_root) SEL_ARG(field,part, min_value,max_value,
-                                             min_flag, max_flag, maybe_flag)))
+                                             min_flag, max_flag, maybe_flag,
+                                             min_flag & GEOM_FLAG ?
+                                             rkey_func_flag : HA_READ_INVALID)))
       return 0;					// OOM
     tmp->parent=new_parent;
     tmp->next_key_part=next_key_part;
@@ -2367,7 +2392,7 @@ void TRP_RANGE::trace_basic_info(const PARAM *param,
                                  Opt_trace_object *trace_object) const
 {
 #ifdef OPTIMIZER_TRACE
-  DBUG_ASSERT(param->using_real_indexes);
+  assert(param->using_real_indexes);
   const uint keynr_in_table= param->real_keynr[key_idx];
 
   const KEY &cur_key= param->table->key_info[keynr_in_table];
@@ -2379,7 +2404,7 @@ void TRP_RANGE::trace_basic_info(const PARAM *param,
   Opt_trace_array trace_range(&param->thd->opt_trace, "ranges");
 
   // TRP_RANGE should not be created if there are no range intervals
-  DBUG_ASSERT(key);
+  assert(key);
 
   String range_info;
   range_info.set_charset(system_charset_info);
@@ -2725,6 +2750,8 @@ static int fill_used_fields_bitmap(PARAM *param)
                         to provide. Three-value logic: asc/desc/don't care
       needed_reg        this info is used in make_join_select() even if there is no quick!
       quick[out]        Calculated QUICK, or NULL
+      ignore_table_scan Disregard table scan while looking for range.
+
   NOTES
     Updates the following:
       needed_reg - Bits for keys with may be used if all prev regs are read
@@ -2785,9 +2812,8 @@ int test_quick_select(THD *thd, key_map keys_to_use,
                       ha_rows limit, bool force_quick_range,
                       const ORDER::enum_order interesting_order,
                       const QEP_shared_owner *tab,
-                      Item *cond,
-                      key_map *needed_reg,
-                      QUICK_SELECT_I **quick)
+                      Item *cond, key_map *needed_reg, QUICK_SELECT_I **quick,
+                      bool ignore_table_scan)
 {
   DBUG_ENTER("test_quick_select");
 
@@ -2823,7 +2849,7 @@ int test_quick_select(THD *thd, key_map keys_to_use,
   Cost_estimate cost_est= head->file->table_scan_cost();
   cost_est.add_io(1.1);
   cost_est.add_cpu(scan_time);
-  if (head->force_index)
+  if (ignore_table_scan)
   {
     scan_time= DBL_MAX;
     cost_est.set_max_cost();
@@ -3358,7 +3384,7 @@ static int find_used_partitions_imerge_list(PART_PRUNE_PARAM *ppar,
                                             List<SEL_IMERGE> &merges);
 static void mark_all_partitions_as_used(partition_info *part_info);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end);
 static void dbug_print_segment_range(SEL_ARG *arg, KEY_PART *part);
 static void dbug_print_singlepoint_range(SEL_ARG **start, uint num);
@@ -4081,7 +4107,7 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
            The only case where we can get "no satisfying subpartitions"
            returned from the above call is when an error has occurred.
         */
-        DBUG_ASSERT(range_par->thd->is_error());
+        assert(range_par->thd->is_error());
         return 0;
       }
 
@@ -4413,7 +4439,7 @@ static bool create_partition_index_description(PART_PRUNE_PARAM *ppar)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static void print_partitioning_index(KEY_PART *parts, KEY_PART *parts_end)
 {
@@ -4592,7 +4618,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge,
   DBUG_ENTER("get_best_disjunct_quick");
   DBUG_PRINT("info", ("Full table scan cost: %g", cost_est->total_cost()));
 
-  DBUG_ASSERT(param->table->file->stats.records);
+  assert(param->table->file->stats.records);
 
   Opt_trace_context * const trace= &param->thd->opt_trace;
   Opt_trace_object trace_best_disjunct(trace);
@@ -5319,7 +5345,7 @@ static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
            has_records_per_key(tuple_arg->part))       // (3)
       {
         DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
-        DBUG_ASSERT(min_range.length > 0);
+        assert(min_range.length > 0);
         records=
           table->file->records_in_range(scan->keynr, &min_range, &max_range);
       }
@@ -5354,7 +5380,7 @@ static double ror_scan_selectivity(const ROR_INTERSECT_INFO *info,
     selectivity_mult *= tmp;
   }
   // Todo: This assert fires in PB sysqa RQG tests.
-  // DBUG_ASSERT(selectivity_mult <= 1.0);
+  // assert(selectivity_mult <= 1.0);
   DBUG_PRINT("info", ("Returning multiplier: %g", selectivity_mult));
   DBUG_RETURN(selectivity_mult);
 }
@@ -6022,21 +6048,21 @@ QUICK_SELECT_I *TRP_ROR_UNION::make_quick(PARAM *param,
 
 
 /**
-   If EXPLAIN, add a warning that the index cannot be
-   used for range access due to either type conversion or different
-   collations on the field used for comparison
+   If EXPLAIN or if the --safe-updates option is enabled, add a warning that
+   the index cannot be used for range access due to either type conversion or
+   different collations on the field used for comparison
 
    @param param              PARAM from test_quick_select
    @param key_num            Key number
    @param field              Field in the predicate
- */
-static void 
-if_explain_warn_index_not_applicable(const RANGE_OPT_PARAM *param,
-                                              const uint key_num,
-                                              const Field *field)
+*/
+static void warn_index_not_applicable(const RANGE_OPT_PARAM *param,
+                                      const uint key_num, const Field *field)
 {
+  THD *thd= param->thd;
   if (param->using_real_indexes &&
-      param->thd->lex->describe)
+      (param->thd->lex->describe ||
+       thd->variables.option_bits & OPTION_SAFE_UPDATES))
     push_warning_printf(
             param->thd,
             Sql_condition::SL_WARNING,
@@ -6354,7 +6380,7 @@ static SEL_TREE *get_func_mm_tree_from_in_predicate(RANGE_OPT_PARAM *param,
         if (and_tree == NULL)
           return NULL;
       }
-      or_tree= tree_or(param, and_tree, or_tree);
+      or_tree= tree_or(param, or_tree, and_tree);
     }
     return or_tree;
   }
@@ -6841,7 +6867,7 @@ static SEL_TREE *get_mm_tree(RANGE_OPT_PARAM *param,Item *cond)
   {
     Item *const arg_left= cond_func->arguments()[0];
 
-    DBUG_ASSERT (!ftree);
+    assert (!ftree);
     if (!(arg_left->used_tables() & OUTER_REF_TABLE_BIT) &&
         arg_left->real_item()->type() == Item::FIELD_ITEM)
     {
@@ -7069,7 +7095,7 @@ get_mm_parts(RANGE_OPT_PARAM *param, Item_func *cond_func, Field *field,
                                  key_part->image_type,
                                  type, value))
         {
-          if_explain_warn_index_not_applicable(param, key_part->key, field);
+          warn_index_not_applicable(param, key_part->key, field);
           DBUG_RETURN(NULL);
         }
 
@@ -7118,7 +7144,7 @@ static bool save_value_and_handle_conversion(SEL_ARG **tree,
                                              MEM_ROOT *memroot)
 {
   // A SEL_ARG should not have been created for this predicate yet.
-  DBUG_ASSERT(*tree == NULL);
+  assert(*tree == NULL);
 
   if (!value->can_be_evaluated_now())
   {
@@ -7307,7 +7333,7 @@ static bool save_value_and_handle_conversion(SEL_ARG **tree,
     */
   }
 
-  DBUG_ASSERT(FALSE); // Should never get here.
+  assert(FALSE); // Should never get here.
 
 impossible_cond:
   *tree= new (memroot) SEL_ARG(field, 0, 0);
@@ -7380,7 +7406,7 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item *conf_func, Field *field,
   if (!comparable_in_index(conf_func, field, key_part->image_type,
                            type, value))
   {
-    if_explain_warn_index_not_applicable(param, key_part->key, field);
+    warn_index_not_applicable(param, key_part->key, field);
     goto end;
   }
 
@@ -7772,7 +7798,7 @@ tree_and(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
           DBUG_RETURN(tree1);
         }
         result_keys.set_bit(idx);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         /*
           Do not test use_count if there is a large range tree created.
           It takes too much time to traverse the tree.
@@ -7972,7 +7998,7 @@ tree_or(RANGE_OPT_PARAM *param,SEL_TREE *tree1,SEL_TREE *tree2)
       {
         result=tree1;				// Added to tree1
         result_keys.set_bit(idx);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         /*
           Do not test use count if there is a large range tree created.
           It takes too much time to traverse the tree.
@@ -8056,8 +8082,8 @@ and_all_keys(RANGE_OPT_PARAM *param, SEL_ARG *key1, SEL_ARG *key2,
   if (key1->type == SEL_ARG::MAYBE_KEY)
   {
     // See todo for left/right pointers
-    DBUG_ASSERT(!key1->left);
-    DBUG_ASSERT(!key1->right);
+    assert(!key1->left);
+    assert(!key1->right);
     key1->next= key1->prev= 0;
   }
   for (next=key1->first(); next ; next=next->next)
@@ -8118,7 +8144,14 @@ key_and(RANGE_OPT_PARAM *param, SEL_ARG *key1, SEL_ARG *key2, uint clone_flag)
     }
     // key1->part < key2->part
     key1->use_count--;
-    if (key1->use_count > 0)
+
+   /*
+     Clone key1 if the use_count is greater than 0 otherwise use the
+     "clone_flag" to determine if a key needs to be cloned.
+     "clone_flag" is set to true if the conditions which need to be
+     ANDed (in tree_and) are not simple (has many OR conditions within).
+   */
+    if (key1->use_count > 0 || (clone_flag & CLONE_KEY2_MAYBE))
       if (!(key1= key1->clone_tree(param)))
 	return 0;				// OOM
     return and_all_keys(param, key1, key2, clone_flag);
@@ -9101,7 +9134,7 @@ SEL_ARG::tree_delete(SEL_ARG *key)
     DBUG_RETURN(0);				// Maybe root later
   if (remove_color == BLACK)
     root=rb_delete_fixup(root,nod,fix_par);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   test_rb_tree(root,root->parent);
 #endif
   root->use_count=this->use_count;		// Fix root counters
@@ -9199,7 +9232,7 @@ SEL_ARG::rb_insert(SEL_ARG *leaf)
     }
   }
   root->color=BLACK;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   test_rb_tree(root,root->parent);
 #endif
   return root;
@@ -9285,7 +9318,7 @@ SEL_ARG *rb_delete_fixup(SEL_ARG *root,SEL_ARG *key,SEL_ARG *par)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	/* Test that the properties for a red-black tree hold */
 
 int test_rb_tree(SEL_ARG *element,SEL_ARG *parent)
@@ -9408,7 +9441,7 @@ bool SEL_ARG::test_use_count(SEL_ARG *root)
   if (this == root && use_count != 1)
   {
     sql_print_information("Use_count: Wrong count %lu for root",use_count);
-    // DBUG_ASSERT(false); // Todo - enable and clean up mess
+    // assert(false); // Todo - enable and clean up mess
     return true;
   }
   if (this->type != SEL_ARG::KEY_RANGE)
@@ -9424,7 +9457,7 @@ bool SEL_ARG::test_use_count(SEL_ARG *root)
         sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu "
                               "should be %lu", (long unsigned int)pos,
                               pos->next_key_part->use_count, count);
-        // DBUG_ASSERT(false); // Todo - enable and clean up mess
+        // assert(false); // Todo - enable and clean up mess
 	return true;
       }
       pos->next_key_part->test_use_count(root);
@@ -9434,7 +9467,7 @@ bool SEL_ARG::test_use_count(SEL_ARG *root)
   {
     sql_print_warning("Wrong use count: %u (should be %u) for tree at 0x%lx",
                       e_count, elements, (long unsigned int) this);
-    // DBUG_ASSERT(false); // Todo - enable and clean up mess
+    // assert(false); // Todo - enable and clean up mess
     return true;
   }
   return false;
@@ -9556,7 +9589,7 @@ class Sel_arg_range_sequence
 
   void stack_pop_range()
   {
-    DBUG_ASSERT(!stack_empty());
+    assert(!stack_empty());
     if (curr_kp == 0)
       reset();
     else 
@@ -9597,7 +9630,7 @@ range_seq_t sel_arg_range_seq_init(void *init_param, uint n_ranges, uint flags)
 void Sel_arg_range_sequence::stack_push_range(SEL_ARG *key_tree)
 {
 
-  DBUG_ASSERT((uint)curr_kp+1 < MAX_REF_PARTS);
+  assert((uint)curr_kp+1 < MAX_REF_PARTS);
 
   RANGE_SEQ_ENTRY *push_position= &stack[curr_kp + 1];
   RANGE_SEQ_ENTRY *last_added_kp= stack_top();
@@ -9722,7 +9755,7 @@ uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range)
       if (key_tree->next)
       {
         /* This keypart has more ranges */
-        DBUG_ASSERT(key_tree->next != &null_element);
+        assert(key_tree->next != &null_element);
         key_tree= key_tree->next;
 
         /*
@@ -9747,7 +9780,7 @@ uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range)
     }
   }
 
-  DBUG_ASSERT(!seq->stack_empty());
+  assert(!seq->stack_empty());
 
   /*
     Add range info for the next keypart if
@@ -9861,7 +9894,7 @@ uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range)
     seq->stack_push_range(key_tree);
   }
 
-  DBUG_ASSERT(!seq->stack_empty() && (seq->stack_top() != NULL));
+  assert(!seq->stack_empty() && (seq->stack_top() != NULL));
 
   // We now have a full range predicate in seq->stack_top()
   RANGE_SEQ_ENTRY *cur= seq->stack_top();
@@ -9881,7 +9914,7 @@ uint sel_arg_range_seq_next(range_seq_t rseq, KEY_MULTI_RANGE *range)
       Spatial operators are only allowed on spatial indexes, and no
       spatial index can at the moment return rows in ROWID order
     */
-    DBUG_ASSERT(!param->is_ror_scan);
+    assert(!param->is_ror_scan);
   }
   else
   {
@@ -10554,8 +10587,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
     goto err;
   quick->records= records;
 
-  if ((cp_buffer_from_ref(thd, table, ref) && thd->is_fatal_error) ||
-      !(range= new (alloc) QUICK_RANGE()))
+  if (!(range= new (alloc) QUICK_RANGE()))
     goto err;                                   // out of memory
 
   range->min_key= range->max_key= ref->key_buff;
@@ -10657,7 +10689,7 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge()
 
   cur_quick_it.rewind();
   cur_quick= cur_quick_it++;
-  DBUG_ASSERT(cur_quick != 0);
+  assert(cur_quick != 0);
   
   DBUG_EXECUTE_IF("simulate_bug13919180",
                   {
@@ -10687,8 +10719,8 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge()
     filesort_free_buffers(head, false);
   }
 
-  DBUG_ASSERT(file->ref_length == unique->get_size());
-  DBUG_ASSERT(thd->variables.sortbuff_size == unique->get_max_in_memory_size());
+  assert(file->ref_length == unique->get_size());
+  assert(thd->variables.sortbuff_size == unique->get_max_in_memory_size());
 
   if (!unique)
     DBUG_RETURN(1);
@@ -11269,7 +11301,7 @@ int QUICK_RANGE_SELECT::get_next_prefix(uint prefix_length,
     if (last_range)
     {
       /* Read the next record in the same range with prefix after cur_prefix. */
-      DBUG_ASSERT(cur_prefix != NULL);
+      assert(cur_prefix != NULL);
       result= file->ha_index_read_map(record, cur_prefix, keypart_map,
                                       HA_READ_AFTER_KEY);
       if (result || last_range->max_keypart_map == 0)
@@ -11534,11 +11566,11 @@ int QUICK_SELECT_DESC::get_next()
     }
     else
     {
-      DBUG_ASSERT(last_range->flag & NEAR_MAX ||
-                  (last_range->flag & EQ_RANGE && 
-                   used_key_parts >
-                   head->key_info[index].user_defined_key_parts) ||
-                  range_reads_after_key(last_range));
+      assert(last_range->flag & NEAR_MAX ||
+             (last_range->flag & EQ_RANGE && 
+              used_key_parts >
+              head->key_info[index].user_defined_key_parts) ||
+             range_reads_after_key(last_range));
       result= file->ha_index_read_map(record, last_range->max_key,
                                       last_range->max_keypart_map,
                                       ((last_range->flag & NEAR_MAX) ?
@@ -12271,7 +12303,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, const Cost_estimate *cost_e
           first Item? If so, then why? What is the array for?
         */
         /* Above we already checked that all group items are fields. */
-        DBUG_ASSERT((*tmp_group->item)->real_item()->type() == Item::FIELD_ITEM);
+        assert((*tmp_group->item)->real_item()->type() == Item::FIELD_ITEM);
         Item_field *group_field= (Item_field *) (*tmp_group->item)->real_item();
         if (group_field->field->eq(cur_part->field))
         {
@@ -12311,7 +12343,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, const Cost_estimate *cost_e
       {
         /* (SA5) already checked above. */
         item_field= (Item_field*) item->real_item(); 
-        DBUG_ASSERT(item->real_item()->type() == Item::FIELD_ITEM);
+        assert(item->real_item()->type() == Item::FIELD_ITEM);
 
         /* not doing loose index scan for derived tables */
         if (!item_field->field)
@@ -12638,7 +12670,7 @@ check_group_min_max_predicates(Item *cond, Item_field *min_max_arg_item,
                                Field::imagetype image_type)
 {
   DBUG_ENTER("check_group_min_max_predicates");
-  DBUG_ASSERT(cond && min_max_arg_item);
+  assert(cond && min_max_arg_item);
 
   cond= cond->real_item();
   Item::Type cond_type= cond->type();
@@ -12713,7 +12745,7 @@ check_group_min_max_predicates(Item *cond, Item_field *min_max_arg_item,
    additional oddball cases which might benefit from this
    optimization.
   */
-  DBUG_ASSERT(cond_type == Item::FUNC_ITEM);
+  assert(cond_type == Item::FUNC_ITEM);
   if (cond_type != Item::FUNC_ITEM)
   {
     DBUG_RETURN(FALSE);
@@ -12852,7 +12884,7 @@ min_max_inspect_cond_for_fields(Item *cond, Item_field *min_max_arg_item,
                                 bool *non_min_max_arg_present)
 {
   DBUG_ENTER("inspect_cond_for_fields");
-  DBUG_ASSERT(cond && min_max_arg_item);
+  assert(cond && min_max_arg_item);
 
   cond= cond->real_item();
   Item::Type cond_type= cond->type();
@@ -12902,7 +12934,7 @@ min_max_inspect_cond_for_fields(Item *cond, Item_field *min_max_arg_item,
           DBUG_RETURN(true);
       }
 
-      if (((Item_cond*) cond)->functype() == Item_func::MULT_EQUAL_FUNC)
+      if (pred->functype() == Item_func::MULT_EQUAL_FUNC)
       {
         /*
           Analyze participating fields in a multiequal condition.
@@ -13110,7 +13142,7 @@ get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
         to a "null value" (a copy of is_null_string) that we do not
         memcmp(), or memcpy to a field.
       */
-      DBUG_ASSERT (field_length > 0);
+      assert (field_length > 0);
       *key_ptr= 1;
       key_ptr+= field_length;
       *key_infix_len+= field_length;
@@ -13274,7 +13306,7 @@ void cost_group_min_max(TABLE* table, uint key, uint used_key_parts,
   double quick_prefix_selectivity;
   double io_blocks;       // Number of blocks to read from table
   DBUG_ENTER("cost_group_min_max");
-  DBUG_ASSERT(cost_est->is_zero());
+  assert(cost_est->is_zero());
 
   const KEY *const index_info= &table->key_info[key];
   table_records= table->file->stats.records;
@@ -13421,7 +13453,7 @@ TRP_GROUP_MIN_MAX::make_quick(PARAM *param, bool retrieve_full_rows,
 
   if (range_tree)
   {
-    DBUG_ASSERT(quick_prefix_records > 0);
+    assert(quick_prefix_records > 0);
     if (quick_prefix_records == HA_POS_ERROR)
       quick->quick_prefix_select= NULL; /* Can't construct a quick select. */
     else
@@ -13541,7 +13573,7 @@ QUICK_GROUP_MIN_MAX_SELECT(TABLE *table, JOIN *join_arg, bool have_min_arg,
     We can't have parent_alloc set as the init function can't handle this case
     yet.
   */
-  DBUG_ASSERT(!parent_alloc);
+  assert(!parent_alloc);
   if (!parent_alloc)
   {
     init_sql_alloc(key_memory_quick_group_min_max_select_root,
@@ -13914,7 +13946,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next()
     {
       is_last_prefix= key_cmp(index_info->key_part, last_prefix,
                               group_prefix_len);
-      DBUG_ASSERT(is_last_prefix <= 0);
+      assert(is_last_prefix <= 0);
     }
     else 
     {
@@ -13937,8 +13969,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::get_next()
       if (max_res == 0)
         update_max_result();
       /* If a MIN was found, a MAX must have been found as well. */
-      DBUG_ASSERT((have_max && !have_min) ||
-                  (have_max && have_min && (max_res == 0)));
+      assert((have_max && !have_min) ||
+             (have_max && have_min && (max_res == 0)));
     }
     /*
       If this is just a GROUP BY or DISTINCT without MIN or MAX and there
@@ -14228,7 +14260,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
   bool found_null= FALSE;
   int result= HA_ERR_KEY_NOT_FOUND;
 
-  DBUG_ASSERT(min_max_ranges.size() > 0);
+  assert(min_max_ranges.size() > 0);
 
   /* Search from the left-most range to the right. */
   for (Quick_ranges::const_iterator it= min_max_ranges.begin();
@@ -14323,7 +14355,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
       }
     }
     /* If we got to this point, the current key qualifies as MIN. */
-    DBUG_ASSERT(result == 0);
+    assert(result == 0);
     break;
   }
   /*
@@ -14367,7 +14399,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
   key_part_map keypart_map;
   int result;
 
-  DBUG_ASSERT(min_max_ranges.size() > 0);
+  assert(min_max_ranges.size() > 0);
 
   /* Search from the right-most range to the left. */
   for (Quick_ranges::const_iterator it= min_max_ranges.end();
@@ -14607,7 +14639,7 @@ static bool eq_ranges_exceeds_limit(SEL_ARG *keypart_root, uint* count, uint lim
   return false;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static void print_sel_tree(PARAM *param, SEL_TREE *tree, key_map *tree_map,
                            const char *msg)
@@ -14659,7 +14691,7 @@ static void print_ror_scans_arr(TABLE *table, const char *msg,
 }
 
 
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 /**
   Print a key to a string
@@ -14820,12 +14852,12 @@ static void append_range_all_keyparts(Opt_trace_array *range_trace,
                                       const KEY_PART_INFO *key_parts,
                                       const bool print_full)
 {
-  DBUG_ASSERT(keypart_root && keypart_root != &null_element);
+  assert(keypart_root && keypart_root != &null_element);
 
   const bool append_to_trace= (range_trace != NULL);
 
   // Either add info to range_string or to range_trace
-  DBUG_ASSERT(append_to_trace ? !range_string : (range_string != NULL));
+  assert(append_to_trace ? !range_string : (range_string != NULL));
 
   // Navigate to first interval in red-black tree
   const KEY_PART_INFO *cur_key_part= key_parts + keypart_root->part;
@@ -14840,7 +14872,7 @@ static void append_range_all_keyparts(Opt_trace_array *range_trace,
       range_string and the string becomes too long. Printing very long
       range conditions normally doesn't make sense either.
      */
-    if (!append_to_trace && range_string->length() > 500)
+    if (range_string != NULL && range_string->length() > 500)
     {
       range_string->append(STRING_WITH_LEN("..."));
       break;
@@ -14878,7 +14910,7 @@ static void append_range_all_keyparts(Opt_trace_array *range_trace,
       if (append_to_trace)
         range_trace->add_utf8(range_so_far->ptr(),
                               range_so_far->length());
-      else
+      else if (range_string != NULL)
       {
         if (range_string->length() == 0)
           range_string->append(STRING_WITH_LEN("("));
@@ -14910,7 +14942,7 @@ static inline void dbug_print_tree(const char *tree_name,
                                    SEL_TREE *tree,
                                    const RANGE_OPT_PARAM *param)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   print_tree(NULL, tree_name, tree, param, true);
 #endif
 }
@@ -15073,7 +15105,7 @@ static inline void print_tree(String *out,
 ** of locking the DEBUG stream !
 *****************************************************************************/
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static void
 print_multiple_key_values(KEY_PART *key_part, const uchar *key,
@@ -15266,5 +15298,5 @@ void QUICK_GROUP_MIN_MAX_SELECT::dbug_dump(int indent, bool verbose)
 }
 
 
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 #endif /* OPT_RANGE_CC_INCLUDED */
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 111e296d4640..8055805e8839 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -323,7 +330,7 @@ class QUICK_SELECT_I
       other Error
   */
   virtual int init_ror_merged_scan(bool reuse_handler)
-  { DBUG_ASSERT(0); return 1; }
+  { assert(0); return 1; }
 
   /*
     Save ROWID of last retrieved row in file->ref. This used in ROR-merging.
@@ -368,7 +375,7 @@ class QUICK_SELECT_I
     Table record buffer used by this quick select.
   */
   uchar    *record;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Print quick select information to DBUG_FILE. Caller is responsible
     for locking DBUG_FILE before this call and unlocking it afterwards.
@@ -500,7 +507,7 @@ class QUICK_RANGE_SELECT : public QUICK_SELECT_I
   virtual bool is_agg_loose_index_scan() const { return false; }
   void add_keys_and_lengths(String *key_names, String *used_lengths);
   void add_info_string(String *str);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_dump(int indent, bool verbose);
 #endif
   QUICK_SELECT_I *make_reverse(uint used_key_parts_arg);
@@ -597,7 +604,7 @@ class QUICK_INDEX_MERGE_SELECT : public QUICK_SELECT_I
   ~QUICK_INDEX_MERGE_SELECT();
 
   int  init();
-  void need_sorted_output() { DBUG_ASSERT(false); /* Can't do it */ }
+  void need_sorted_output() { assert(false); /* Can't do it */ }
   int  reset(void);
   int  get_next();
   bool reverse_sorted() const { return false; }
@@ -609,7 +616,7 @@ class QUICK_INDEX_MERGE_SELECT : public QUICK_SELECT_I
   void add_keys_and_lengths(String *key_names, String *used_lengths);
   void add_info_string(String *str);
   bool is_keys_used(const MY_BITMAP *fields);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_dump(int indent, bool verbose);
 #endif
 
@@ -689,7 +696,7 @@ class QUICK_ROR_INTERSECT_SELECT : public QUICK_SELECT_I
   ~QUICK_ROR_INTERSECT_SELECT();
 
   int  init();
-  void need_sorted_output() { DBUG_ASSERT(false); /* Can't do it */ }
+  void need_sorted_output() { assert(false); /* Can't do it */ }
   int  reset(void);
   int  get_next();
   bool reverse_sorted() const { return false; }
@@ -701,7 +708,7 @@ class QUICK_ROR_INTERSECT_SELECT : public QUICK_SELECT_I
   void add_keys_and_lengths(String *key_names, String *used_lengths);
   void add_info_string(String *str);
   bool is_keys_used(const MY_BITMAP *fields);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_dump(int indent, bool verbose);
 #endif
   int init_ror_merged_scan(bool reuse_handler);
@@ -788,7 +795,7 @@ class QUICK_ROR_UNION_SELECT : public QUICK_SELECT_I
   ~QUICK_ROR_UNION_SELECT();
 
   int  init();
-  void need_sorted_output() { DBUG_ASSERT(false); /* Can't do it */ }
+  void need_sorted_output() { assert(false); /* Can't do it */ }
   int  reset(void);
   int  get_next();
   bool reverse_sorted() const { return false; }
@@ -800,7 +807,7 @@ class QUICK_ROR_UNION_SELECT : public QUICK_SELECT_I
   void add_keys_and_lengths(String *key_names, String *used_lengths);
   void add_info_string(String *str);
   bool is_keys_used(const MY_BITMAP *fields);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_dump(int indent, bool verbose);
 #endif
 
@@ -956,7 +963,7 @@ class QUICK_GROUP_MIN_MAX_SELECT : public QUICK_SELECT_I
   virtual bool is_loose_index_scan() const { return true; }
   virtual bool is_agg_loose_index_scan() const { return is_agg_distinct(); }
   void add_keys_and_lengths(String *key_names, String *used_lengths);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void dbug_dump(int indent, bool verbose);
 #endif
   bool is_agg_distinct() const { return have_agg_distinct; }
@@ -1005,9 +1012,8 @@ int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
                       ha_rows limit, bool force_quick_range,
                       const ORDER::enum_order interesting_order,
                       const QEP_shared_owner *tab,
-                      Item *cond,
-                      key_map *needed_reg,
-                      QUICK_SELECT_I **quick);
+                      Item *cond, key_map *needed_reg,
+                      QUICK_SELECT_I **quick, bool ignore_table_scan);
 
 class FT_SELECT: public QUICK_RANGE_SELECT 
 {
diff --git a/sql/opt_statistics.cc b/sql/opt_statistics.cc
index 0b328568df68..40581f5c404c 100644
--- a/sql/opt_statistics.cc
+++ b/sql/opt_statistics.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -47,9 +54,9 @@ using std::max;
 rec_per_key_t guess_rec_per_key(const TABLE *const table, const KEY *const key,
                                 uint used_keyparts)
 {
-  DBUG_ASSERT(used_keyparts >= 1);
-  DBUG_ASSERT(used_keyparts <= key->user_defined_key_parts);
-  DBUG_ASSERT(!key->has_records_per_key(used_keyparts - 1));
+  assert(used_keyparts >= 1);
+  assert(used_keyparts <= key->user_defined_key_parts);
+  assert(!key->has_records_per_key(used_keyparts - 1));
 
   const ha_rows table_rows= table->file->stats.records;
   
@@ -107,7 +114,7 @@ rec_per_key_t guess_rec_per_key(const TABLE *const table, const KEY *const key,
         rec_per_key= rec_per_key_first;         // Non-unique index
     }
       
-    DBUG_ASSERT(rec_per_key >= rec_per_key_all);
+    assert(rec_per_key >= rec_per_key_all);
   }
 
   return rec_per_key;
diff --git a/sql/opt_statistics.h b/sql/opt_statistics.h
index 1622c3c39683..2c0652b8b4e4 100644
--- a/sql/opt_statistics.h
+++ b/sql/opt_statistics.h
@@ -2,16 +2,23 @@
 #define OPT_STATISTICS_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 7e14568af46d..42dc479e405d 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -147,7 +154,7 @@ static int get_index_min_value(TABLE *table, TABLE_REF *ref,
         Open interval is not used if the search key involves the last keypart,
         and it would not work.
       */
-      DBUG_ASSERT(prefix_len < ref->key_length);
+      assert(prefix_len < ref->key_length);
       error= table->file->ha_index_read_map(table->record[0],
                                             ref->key_buff,
                                             make_prev_keypart_map(ref->key_parts),
@@ -173,7 +180,7 @@ static int get_index_min_value(TABLE *table, TABLE_REF *ref,
           (error == HA_ERR_KEY_NOT_FOUND ||
            key_cmp_if_same(table, ref->key_buff, ref->key, prefix_len)))
       {
-        DBUG_ASSERT(item_field->field->real_maybe_null());
+        assert(item_field->field->real_maybe_null());
         error= table->file->ha_index_read_map(table->record[0],
                                              ref->key_buff,
                                              make_prev_keypart_map(ref->key_parts),
@@ -438,8 +445,8 @@ int opt_sum_query(THD *thd,
             We may not need all columns of read_set, neither all columns of
             the index.
           */
-          DBUG_ASSERT(table->read_set == &table->def_read_set);
-          DBUG_ASSERT(bitmap_is_clear_all(&table->tmp_set));
+          assert(table->read_set == &table->def_read_set);
+          assert(bitmap_is_clear_all(&table->tmp_set));
           table->read_set= &table->tmp_set;
           table->mark_columns_used_by_index_no_reset(ref.key, table->read_set,
                                                      ref.key_parts);
@@ -1006,7 +1013,7 @@ static bool find_key_for_maxmin(bool max_fl, TABLE_REF *ref,
             ref->key_buff[ref->key_length]= 1;
             ref->key_length+= part->store_length;
             ref->key_parts++;
-            DBUG_ASSERT(ref->key_parts == jdx+1);
+            assert(ref->key_parts == jdx+1);
             *range_fl&= ~NO_MIN_RANGE;
             *range_fl|= NEAR_MIN; // Open interval
           }
@@ -1112,7 +1119,7 @@ static int maxmin_in_range(bool max_fl, Item_field *item_field, Item *cond)
   case Item_func::EQUAL_FUNC:
     break;
   default:                                        // Keep compiler happy
-    DBUG_ASSERT(1);                               // Impossible
+    assert(1);                               // Impossible
     break;
   }
   return 0;
diff --git a/sql/opt_trace.cc b/sql/opt_trace.cc
index 975fd8a2f2e6..b99b6171b8d3 100644
--- a/sql/opt_trace.cc
+++ b/sql/opt_trace.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -174,7 +181,7 @@ class Opt_trace_stmt
   { return trace_buffer.alloced_length() + query_buffer.alloced_length(); }
 
   void assert_current_struct(const Opt_trace_struct *s) const
-  { DBUG_ASSERT(current_struct == s); }
+  { assert(current_struct == s); }
 
   /// @see Opt_trace_context::missing_privilege()
   void missing_privilege();
@@ -263,7 +270,7 @@ void Opt_trace_struct::do_construct(Opt_trace_context *ctx,
 
   DBUG_PRINT("opt", ("%s: starting struct", key));
   stmt= ctx->get_current_stmt_in_gen();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   previous_key[0]= 0;
 #endif
   has_disabled_I_S= !ctx->feature_enabled(feature);
@@ -277,7 +284,7 @@ void Opt_trace_struct::do_construct(Opt_trace_context *ctx,
 void Opt_trace_struct::do_destruct()
 {
   DBUG_PRINT("opt", ("%s: ending struct", saved_key));
-  DBUG_ASSERT(started);
+  assert(started);
   stmt->close_struct(saved_key, has_disabled_I_S,
                      closing_bracket(requires_key));
   started= false;
@@ -295,7 +302,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, const char *val,
                                            size_t val_length,
                                            bool escape)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   DBUG_PRINT("opt", ("%s: \"%.*s\"", key, (int)val_length, val));
   stmt->add(key, val, val_length, true, escape);
   return *this;
@@ -309,7 +316,7 @@ LEX_CSTRING bool_as_text[]= { { STRING_WITH_LEN("false") },
 
 Opt_trace_struct& Opt_trace_struct::do_add(const char *key, bool val)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   DBUG_PRINT("opt", ("%s: %d", key, (int)val));
   const LEX_CSTRING *text= &bool_as_text[val];
   stmt->add(key, text->str, text->length, false, false);
@@ -319,7 +326,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, bool val)
 
 Opt_trace_struct& Opt_trace_struct::do_add(const char *key, longlong val)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   char buf[22];                     // 22 is enough for digits of a 64-bit int
   llstr(val, buf);
   DBUG_PRINT("opt", ("%s: %s", key, buf));
@@ -330,7 +337,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, longlong val)
 
 Opt_trace_struct& Opt_trace_struct::do_add(const char *key, ulonglong val)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   char buf[22];
   ullstr(val, buf);
   DBUG_PRINT("opt", ("%s: %s", key, buf));
@@ -341,7 +348,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, ulonglong val)
 
 Opt_trace_struct& Opt_trace_struct::do_add(const char *key, double val)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   char buf[32];                         // 32 is enough for digits of a double
   my_snprintf(buf, sizeof(buf), "%g", val);
   DBUG_PRINT("opt", ("%s: %s", key, buf));
@@ -352,7 +359,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, double val)
 
 Opt_trace_struct& Opt_trace_struct::do_add_null(const char *key)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   DBUG_PRINT("opt", ("%s: null", key));
   stmt->add(key, STRING_WITH_LEN("null"), false, false);
   return *this;
@@ -390,7 +397,7 @@ Opt_trace_struct& Opt_trace_struct::do_add(const char *key, const Cost_estimate
 
 Opt_trace_struct& Opt_trace_struct::do_add_hex(const char *key, uint64 val)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   char buf[2 + 16], *p_end= buf + sizeof(buf) - 1, *p= p_end;
   for ( ; ; )
   {
@@ -427,7 +434,7 @@ Opt_trace_struct& Opt_trace_struct::do_add_utf8_table(const TABLE_LIST *tl)
 
 const char *Opt_trace_struct::check_key(const char *key)
 {
-  DBUG_ASSERT(started);
+  assert(started);
   //  User should always add to the innermost open object, not outside.
   stmt->assert_current_struct(this);
   bool has_key= key != NULL;
@@ -439,12 +446,12 @@ const char *Opt_trace_struct::check_key(const char *key)
   }
   if (has_key)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     /*
       Check that we're not having two identical consecutive keys in one
       object; though the real restriction should not have 'consecutive'.
     */
-    DBUG_ASSERT(strncmp(previous_key, key, sizeof(previous_key) - 1) != 0);
+    assert(strncmp(previous_key, key, sizeof(previous_key) - 1) != 0);
     strncpy(previous_key, key, sizeof(previous_key) - 1);
     previous_key[sizeof(previous_key) - 1]= 0;
 #endif
@@ -463,14 +470,14 @@ Opt_trace_stmt::Opt_trace_stmt(Opt_trace_context *ctx_arg) :
 {
   // Trace is always in UTF8. This is the only charset which JSON accepts.
   trace_buffer.set_charset(system_charset_info);
-  DBUG_ASSERT(system_charset_info == &my_charset_utf8_general_ci);
+  assert(system_charset_info == &my_charset_utf8_general_ci);
 }
 
 
 void Opt_trace_stmt::end()
 {
-  DBUG_ASSERT(stack_of_current_structs.size() == 0);
-  DBUG_ASSERT(I_S_disabled >= 0);
+  assert(stack_of_current_structs.size() == 0);
+  assert(I_S_disabled >= 0);
   ended= true;
   /*
     Because allocation is done in big chunks, buffer->Ptr[str_length]
@@ -508,7 +515,7 @@ void Opt_trace_stmt::set_query(const char *query, size_t length,
                                const CHARSET_INFO *charset)
 {
   // Should be called only once per statement.
-  DBUG_ASSERT(query_buffer.ptr() == NULL);
+  assert(query_buffer.ptr() == NULL);
   query_buffer.set_charset(charset);
   if (!support_I_S())
   {
@@ -614,7 +621,7 @@ void Opt_trace_stmt::close_struct(const char *saved_key,
 
 void Opt_trace_stmt::separator()
 {
-  DBUG_ASSERT(support_I_S());
+  assert(support_I_S());
   // Put a comma first, if we have already written an object at this level.
   if (current_struct != NULL)
   {
@@ -923,9 +930,9 @@ Opt_trace_context::~Opt_trace_context()
     /* There may well be some few ended traces left: */
     purge_stmts(true);
     /* All should have moved to 'del' list: */
-    DBUG_ASSERT(pimpl->all_stmts_for_I_S.size() == 0);
+    assert(pimpl->all_stmts_for_I_S.size() == 0);
     /* All of 'del' list should have been deleted: */
-    DBUG_ASSERT(pimpl->all_stmts_to_del.size() == 0);
+    assert(pimpl->all_stmts_to_del.size() == 0);
     delete pimpl;
   }
 }
@@ -996,7 +1003,7 @@ bool Opt_trace_context::start(bool support_I_S_arg,
     */
   }
 
-  DBUG_EXECUTE_IF("no_new_opt_trace_stmt", DBUG_ASSERT(0););
+  DBUG_EXECUTE_IF("no_new_opt_trace_stmt", assert(0););
 
   if (pimpl == NULL &&
       ((pimpl= new_nothrow_w_my_error<Opt_trace_context_impl>()) == NULL))
@@ -1082,7 +1089,7 @@ bool Opt_trace_context::start(bool support_I_S_arg,
     DBUG_RETURN(false);
 err:
     delete stmt;
-    DBUG_ASSERT(0);
+    assert(0);
     DBUG_RETURN(true);
   }
 }
@@ -1090,7 +1097,7 @@ bool Opt_trace_context::start(bool support_I_S_arg,
 
 void Opt_trace_context::end()
 {
-  DBUG_ASSERT(I_S_disabled >= 0);
+  assert(I_S_disabled >= 0);
   if (likely(pimpl == NULL))
     return;
   if (pimpl->current_stmt_in_gen != NULL)
@@ -1132,7 +1139,7 @@ void Opt_trace_context::end()
     purge_stmts(false);
   }
   else
-    DBUG_ASSERT(pimpl->stack_of_current_stmts.size() == 0);
+    assert(pimpl->stack_of_current_stmts.size() == 0);
 }
 
 
@@ -1198,7 +1205,7 @@ void Opt_trace_context::purge_stmts(bool purge_all)
   for (idx= (pimpl->all_stmts_to_del.size() - 1) ; idx >= 0 ; idx--)
   {
     Opt_trace_stmt *stmt= pimpl->all_stmts_to_del.at(idx);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     bool skip_del= false;
     DBUG_EXECUTE_IF("opt_trace_oom_in_purge", skip_del= true;);
 #else
@@ -1325,7 +1332,7 @@ const Opt_trace_stmt
   else
   {
     p= pimpl->all_stmts_for_I_S.at(*got_so_far);
-    DBUG_ASSERT(p != NULL);
+    assert(p != NULL);
     (*got_so_far)++;
   }
   return p;
diff --git a/sql/opt_trace.h b/sql/opt_trace.h
index dfd3a55a8cad..1987dcb6ba86 100644
--- a/sql/opt_trace.h
+++ b/sql/opt_trace.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -844,7 +851,7 @@ class Opt_trace_struct
   Opt_trace_stmt *stmt;                        ///< Trace owning the structure
   /// Key if the structure is the value of a key/value pair, NULL otherwise
   const char *saved_key;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      Fixed-length prefix of previous key in this structure, if this structure
      is an object. Serves to detect when adding two same consecutive keys to
@@ -1255,7 +1262,7 @@ class Opt_trace_start
   A debug binary without optimizer trace compiled in, will miss some
   debugging info, be less useful, so:
 */
-#if !defined(DBUG_OFF) && !defined(OPTIMIZER_TRACE)
+#if !defined(NDEBUG) && !defined(OPTIMIZER_TRACE)
 #error debug binaries must support optimizer trace
 #endif
 
diff --git a/sql/opt_trace2server.cc b/sql/opt_trace2server.cc
index 634949beaaa3..0353eae952aa 100644
--- a/sql/opt_trace2server.cc
+++ b/sql/opt_trace2server.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -320,7 +327,7 @@ void opt_trace_disable_if_no_security_context_access(THD *thd)
       this command. The command itself is not traced though
       (SQLCOM_SHOW_FIELDS does not have CF_OPTIMIZER_TRACE).
     */
-    DBUG_ASSERT(false);
+    assert(false);
     trace->disable_I_S_for_this_and_children();
     DBUG_VOID_RETURN;
   }
@@ -351,7 +358,7 @@ void opt_trace_disable_if_no_stored_proc_func_access(THD *thd, sp_head *sp)
   Opt_trace_context * const trace= &thd->opt_trace;
   if (!trace->is_started())
   {
-    DBUG_ASSERT(false);
+    assert(false);
     trace->disable_I_S_for_this_and_children();
     DBUG_VOID_RETURN;
   }
@@ -380,7 +387,7 @@ void opt_trace_disable_if_no_view_access(THD *thd, TABLE_LIST *view,
   Opt_trace_context * const trace= &thd->opt_trace;
   if (!trace->is_started())
   {
-    DBUG_ASSERT(false);
+    assert(false);
     trace->disable_I_S_for_this_and_children();
     DBUG_VOID_RETURN;
   }
@@ -442,7 +449,7 @@ void opt_trace_disable_if_no_tables_access(THD *thd, TABLE_LIST *tbl)
   Opt_trace_context * const trace= &thd->opt_trace;
   if (!trace->is_started())
   {
-    DBUG_ASSERT(false);
+    assert(false);
     trace->disable_I_S_for_this_and_children();
     DBUG_VOID_RETURN;
   }
diff --git a/sql/opt_trace_Doxyfile b/sql/opt_trace_Doxyfile
index 82a973c3e5b6..b866996b04a7 100644
--- a/sql/opt_trace_Doxyfile
+++ b/sql/opt_trace_Doxyfile
@@ -1,15 +1,22 @@
 # Doxyfile 1.6.1
 
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 #
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  it under the terms of the GNU General Public License, version 2.0,
+#  as published by the Free Software Foundation.
+#
+#  This program is also distributed with certain software (including
+#  but not limited to OpenSSL) that is licensed under separate terms,
+#  as designated in a particular file or component or in included license
+#  documentation.  The authors of MySQL hereby grant you an additional
+#  permission to link the program and your derivative works with the
+#  separately licensed software that they have included with MySQL.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU General Public License, version 2.0, for more details.
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
diff --git a/sql/opt_trace_context.h b/sql/opt_trace_context.h
index c77050e07bba..b773bf2e3a57 100644
--- a/sql/opt_trace_context.h
+++ b/sql/opt_trace_context.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -266,7 +273,7 @@ class Opt_trace_context
   void restore_I_S()
   {
     --I_S_disabled;
-    DBUG_ASSERT(I_S_disabled >= 0);
+    assert(I_S_disabled >= 0);
     if (unlikely(pimpl != NULL))
       pimpl->restore_I_S();
   }
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index e144b09a05bc..38f046bc83e5 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -189,7 +196,7 @@ write_parameter(IO_CACHE *file, uchar* base, File_option *parameter)
     break;
   }
   default:
-    DBUG_ASSERT(0); // never should happened
+    assert(0); // never should happened
   }
   DBUG_RETURN(FALSE);
 }
@@ -850,7 +857,7 @@ File_parser::parse(uchar* base, MEM_ROOT *mem_root,
             DBUG_RETURN(TRUE);
           break;
 	default:
-	  DBUG_ASSERT(0); // never should happened
+	  assert(0); // never should happened
 	}
       }
       else
diff --git a/sql/parse_file.h b/sql/parse_file.h
index ae142ba555fc..e6edcb3cab4b 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -1,14 +1,21 @@
 /* -*- C++ -*- */
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/parse_location.h b/sql/parse_location.h
index db971c660c08..5e8273ab0e13 100644
--- a/sql/parse_location.h
+++ b/sql/parse_location.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/parse_tree_helpers.cc b/sql/parse_tree_helpers.cc
index f2153a97af7a..7a7610e9ac05 100644
--- a/sql/parse_tree_helpers.cc
+++ b/sql/parse_tree_helpers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -60,7 +67,7 @@ Item_splocal* create_item_for_sp_var(THD *thd,
     return NULL;
   }
 
-  DBUG_ASSERT(pctx && spv);
+  assert(pctx && spv);
 
   if (query_start_ptr)
   {
@@ -73,7 +80,7 @@ Item_splocal* create_item_for_sp_var(THD *thd,
     new (thd->mem_root) Item_splocal(
       name, spv->offset, spv->type, spv_pos_in_query, spv_len_in_query);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (item)
     item->m_sp= lex->sphead;
 #endif
@@ -90,7 +97,7 @@ Item_splocal* create_item_for_sp_var(THD *thd,
  */
 bool setup_select_in_parentheses(SELECT_LEX *sel)
 {
-  DBUG_ASSERT(sel->braces);
+  assert(sel->braces);
   if (sel->linkage == UNION_TYPE &&
       !sel->master_unit()->first_select()->braces &&
       sel->master_unit()->first_select()->linkage ==
@@ -251,10 +258,10 @@ bool set_trigger_new_row(Parse_context *pc,
   LEX *lex= thd->lex;
   sp_head *sp= lex->sphead;
 
-  DBUG_ASSERT(expr_item);
-  DBUG_ASSERT(sp->m_trg_chistics.action_time == TRG_ACTION_BEFORE &&
-              (sp->m_trg_chistics.event == TRG_EVENT_INSERT ||
-               sp->m_trg_chistics.event == TRG_EVENT_UPDATE));
+  assert(expr_item);
+  assert(sp->m_trg_chistics.action_time == TRG_ACTION_BEFORE &&
+         (sp->m_trg_chistics.event == TRG_EVENT_INSERT ||
+          sp->m_trg_chistics.event == TRG_EVENT_UPDATE));
 
   Item_trigger_field *trg_fld=
     new (pc->mem_root) Item_trigger_field(POS(),
@@ -264,7 +271,7 @@ bool set_trigger_new_row(Parse_context *pc,
 
   if (trg_fld == NULL || trg_fld->itemize(pc, (Item **) &trg_fld))
     return true;
-  DBUG_ASSERT(trg_fld->type() == Item::TRIGGER_FIELD_ITEM);
+  assert(trg_fld->type() == Item::TRIGGER_FIELD_ITEM);
 
   sp_instr_set_trigger_field *i=
     new (pc->mem_root)
diff --git a/sql/parse_tree_helpers.h b/sql/parse_tree_helpers.h
index 2b464c678980..73101ea90d28 100644
--- a/sql/parse_tree_helpers.h
+++ b/sql/parse_tree_helpers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -39,12 +46,12 @@ class Parse_tree_item : public Item
   explicit Parse_tree_item(const POS &pos) : Item(pos) {}
 
   virtual enum Type type() const { return INVALID_ITEM; }
-  virtual double val_real() { DBUG_ASSERT(0); return 0; }
-  virtual longlong val_int() { DBUG_ASSERT(0); return 0; }
-  virtual String *val_str(String *) { DBUG_ASSERT(0); return NULL; }
-  virtual my_decimal *val_decimal(my_decimal *) { DBUG_ASSERT(0); return NULL; }
-  virtual bool get_date(MYSQL_TIME *, uint) { DBUG_ASSERT(0); return false; }
-  virtual bool get_time(MYSQL_TIME *) { DBUG_ASSERT(0); return false; }
+  virtual double val_real() { assert(0); return 0; }
+  virtual longlong val_int() { assert(0); return 0; }
+  virtual String *val_str(String *) { assert(0); return NULL; }
+  virtual my_decimal *val_decimal(my_decimal *) { assert(0); return NULL; }
+  virtual bool get_date(MYSQL_TIME *, uint) { assert(0); return false; }
+  virtual bool get_time(MYSQL_TIME *) { assert(0); return false; }
 };
 
 
@@ -98,7 +105,7 @@ class PT_item_list : public Parse_tree_node
 
   Item *pop_front()
   {
-    DBUG_ASSERT(!is_empty());
+    assert(!is_empty());
     return value.pop();
   }
 };
diff --git a/sql/parse_tree_hints.cc b/sql/parse_tree_hints.cc
index a15bbf7b555b..6e697c4ecd59 100644
--- a/sql/parse_tree_hints.cc
+++ b/sql/parse_tree_hints.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -222,7 +229,7 @@ bool PT_qb_level_hint::contextualize(Parse_context *pc)
       qb->subquery_hint= this;
     break;
   default:
-      DBUG_ASSERT(0);
+    assert(0);
   }
 
   if (conflict ||
@@ -273,11 +280,11 @@ void PT_qb_level_hint::append_args(THD *thd, String *str) const
       str->append(STRING_WITH_LEN(" INTOEXISTS"));
       break;
     default:      // Exactly one of above strategies should always be specified
-      DBUG_ASSERT(false);
+      assert(false);
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -396,7 +403,7 @@ bool PT_hint_qb_name::contextualize(Parse_context *pc)
 
   Opt_hints_qb *qb= pc->select->opt_hints_qb;
 
-  DBUG_ASSERT(qb);
+  assert(qb);
 
   if (qb->get_name() ||                         // QB name is already set
       qb->get_parent()->find_by_name(&qb_name,  // Name is already used
diff --git a/sql/parse_tree_hints.h b/sql/parse_tree_hints.h
index 883fed009e54..0f5138a06d6a 100644
--- a/sql/parse_tree_hints.h
+++ b/sql/parse_tree_hints.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/parse_tree_items.cc b/sql/parse_tree_items.cc
index 38e7deedd9ee..1aae89785d56 100644
--- a/sql/parse_tree_items.cc
+++ b/sql/parse_tree_items.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -94,21 +101,6 @@ static Item* handle_sql2003_note184_exception(Parse_context *pc, Item* left,
 }
 
 
-bool PTI_table_wild::itemize(Parse_context *pc, Item **item)
-{
-  if (super::itemize(pc, item))
-    return true;
-
-  schema=
-    pc->thd->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA) ? NullS : schema;
-  *item= new (pc->mem_root) Item_field(POS(), schema, table, "*");
-  if (*item == NULL || (*item)->itemize(pc, item))
-    return true;
-  pc->select->with_wild++;
-  return false;
-}
-
-
 bool PTI_comp_op::itemize(Parse_context *pc, Item **res)
 {
   if (super::itemize(pc, res) ||
@@ -228,7 +220,7 @@ bool PTI_simple_ident_ident::itemize(Parse_context *pc, Item **res)
   {
     sp_head *sp= lex->sphead;
 
-    DBUG_ASSERT(sp);
+    assert(sp);
 
     /* We're compiling a stored procedure and found a variable */
     if (! lex->parsing_options.allows_variable)
@@ -297,9 +289,9 @@ bool PTI_simple_ident_q_2d::itemize(Parse_context *pc, Item **res)
       return true;
     }
 
-    DBUG_ASSERT(!new_row ||
-                (sp->m_trg_chistics.event == TRG_EVENT_INSERT ||
-                 sp->m_trg_chistics.event == TRG_EVENT_UPDATE));
+    assert(!new_row ||
+           (sp->m_trg_chistics.event == TRG_EVENT_INSERT ||
+            sp->m_trg_chistics.event == TRG_EVENT_UPDATE));
     const bool read_only=
       !(new_row && sp->m_trg_chistics.action_time == TRG_ACTION_BEFORE);
     Item_trigger_field *trg_fld= new (pc->mem_root)
@@ -310,7 +302,7 @@ bool PTI_simple_ident_q_2d::itemize(Parse_context *pc, Item **res)
                                   read_only);
     if (trg_fld == NULL || trg_fld->itemize(pc, (Item **) &trg_fld))
       return true;
-    DBUG_ASSERT(trg_fld->type() == TRIGGER_FIELD_ITEM);
+    assert(trg_fld->type() == TRIGGER_FIELD_ITEM);
 
     /*
       Let us add this item to list of all Item_trigger_field objects
diff --git a/sql/parse_tree_items.h b/sql/parse_tree_items.h
index 92cc12390422..2609ffbfb458 100644
--- a/sql/parse_tree_items.h
+++ b/sql/parse_tree_items.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -25,23 +32,6 @@
 #include "sp_head.h"            // sp_head
 #include "sql_parse.h"          // negate_expression
 
-class PTI_table_wild : public Parse_tree_item
-{
-  typedef Parse_tree_item super;
-
-  const char *schema;
-  const char *table;
-
-public:
-  explicit PTI_table_wild(const POS &pos,
-                          const char *schema_arg, const char *table_arg)
-  : super(pos), schema(schema_arg), table(table_arg)
-  {}
-
-  virtual bool itemize(Parse_context *pc, Item **item);
-};
-
-
 class PTI_negate_expression : public Parse_tree_item
 {
   typedef Parse_tree_item super;
@@ -356,7 +346,7 @@ class PTI_function_call_generic_ident_sys : public Parse_tree_item
 #endif
       {
         builder= find_qualified_function_builder(thd);
-        DBUG_ASSERT(builder);
+        assert(builder);
         *res= builder->create_func(thd, ident, opt_udf_expr_list);
       }
     }
@@ -410,7 +400,7 @@ class PTI_function_call_generic_2d : public Parse_tree_item
       return true;
 
     Create_qfunc *builder= find_qualified_function_builder(pc->thd);
-    DBUG_ASSERT(builder);
+    assert(builder);
     *res= builder->create(pc->thd, db, func, true, opt_expr_list);
     return *res == NULL || (*res)->itemize(pc, res);
   }
@@ -510,7 +500,7 @@ class PTI_text_literal_nchar_string : public PTI_text_literal
       return true;
 
     uint repertoire= is_7bit ? MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
-    DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info));
+    assert(my_charset_is_ascii_based(national_charset_info));
     init(literal.str, literal.length, national_charset_info,
          DERIVATION_COERCIBLE, repertoire);
     return false;
@@ -564,7 +554,7 @@ class PTI_text_literal_concat : public PTI_text_literal
     if (super::itemize(pc, res) || head->itemize(pc, &tmp_head))
       return true;
 
-    DBUG_ASSERT(tmp_head->type() == STRING_ITEM);
+    assert(tmp_head->type() == STRING_ITEM);
     Item_string *head_str= static_cast<Item_string *>(tmp_head);
 
     head_str->append(literal.str, literal.length);
@@ -767,7 +757,7 @@ class PTI_variable_aux_3d : public Parse_tree_item
       error(pc, var_pos);
       return true;
     }
-    if (!(*res= get_system_var(pc, var_type, var, component)))
+    if (!(*res= get_system_var(pc, var_type, var, component, true)))
       return true;
     if (!my_strcasecmp(system_charset_info, var.str, "warning_count") ||
         !my_strcasecmp(system_charset_info, var.str, "error_count"))
@@ -780,9 +770,6 @@ class PTI_variable_aux_3d : public Parse_tree_item
       */
       lex->keep_diagnostics= DA_KEEP_COUNTS;
     }
-    if (!((Item_func_get_system_var*) *res)->is_written_to_binlog())
-      lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
-
     return false;
   }
 };
@@ -1028,7 +1015,7 @@ class PTI_limit_option_param_marker : public Parse_tree_item
       parameter with "this" pointer of Item_param object, so we can skip
       the check and the assignment.
     */
-    DBUG_ASSERT(tmp_param == param_marker);
+    assert(tmp_param == param_marker);
 
     param_marker->limit_clause_param= true;
     *res= param_marker;
@@ -1058,9 +1045,9 @@ class PTI_context : public Parse_tree_item
       return true;
 
     // Ensure we're resetting parsing place of the right select
-    DBUG_ASSERT(pc->select->parsing_place == Context);
+    assert(pc->select->parsing_place == Context);
     pc->select->parsing_place= CTX_NONE;
-    DBUG_ASSERT(expr != NULL);
+    assert(expr != NULL);
     expr->top_level_item();
 
     *res= expr;
diff --git a/sql/parse_tree_node_base.cc b/sql/parse_tree_node_base.cc
index 5107048ae888..48f79407ef95 100644
--- a/sql/parse_tree_node_base.cc
+++ b/sql/parse_tree_node_base.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/parse_tree_node_base.h b/sql/parse_tree_node_base.h
index 8f9415acc02a..fdddd047dbb7 100644
--- a/sql/parse_tree_node_base.h
+++ b/sql/parse_tree_node_base.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -104,11 +111,11 @@ class Parse_tree_node
   Parse_tree_node(const Parse_tree_node &); // undefined
   void operator=(const Parse_tree_node &); // undefined
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 private:
   bool contextualized; // true if the node object is contextualized
   bool transitional; // TODO: remove that after parser refactoring
-#endif//DBUG_OFF
+#endif//NDEBUG
 
 public:
   static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
@@ -119,18 +126,18 @@ class Parse_tree_node
 protected:
   Parse_tree_node()
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     contextualized= false;
     transitional= false;
-#endif//DBUG_OFF
+#endif//NDEBUG
   }
 
 public:
   virtual ~Parse_tree_node() {}
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool is_contextualized() const { return contextualized; }
-#endif//DBUG_OFF
+#endif//NDEBUG
 
   /**
     Do all context-sensitive things and mark the node as contextualized
@@ -142,22 +149,22 @@ class Parse_tree_node
   */
   virtual bool contextualize(Parse_context *pc)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (transitional)
     {
-      DBUG_ASSERT(contextualized);
+      assert(contextualized);
       return false;
     }
-#endif//DBUG_OFF
+#endif//NDEBUG
 
     uchar dummy;
     if (check_stack_overrun(pc->thd, STACK_MIN_SIZE, &dummy))
       return true;
 
-#ifndef DBUG_OFF
-    DBUG_ASSERT(!contextualized);
+#ifndef NDEBUG
+    assert(!contextualized);
     contextualized= true;
-#endif//DBUG_OFF
+#endif//NDEBUG
 
     return false;
   }
@@ -191,11 +198,11 @@ class Parse_tree_node
   */
   virtual bool contextualize_(Parse_context *pc)
   {
-#ifndef DBUG_OFF
-    DBUG_ASSERT(!contextualized && !transitional);
+#ifndef NDEBUG
+    assert(!contextualized && !transitional);
     transitional= true;
     contextualized= true;
-#endif//DBUG_OFF
+#endif//NDEBUG
     return false;
   }
 
diff --git a/sql/parse_tree_nodes.cc b/sql/parse_tree_nodes.cc
index 74f705b76360..171fcdd5aa2c 100644
--- a/sql/parse_tree_nodes.cc
+++ b/sql/parse_tree_nodes.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,7 +25,7 @@
 #include "sp_instr.h"       // sp_instr_set
 #include "sql_delete.h"     // Sql_cmd_delete_multi, Sql_cmd_delete
 #include "sql_insert.h"     // Sql_cmd_insert...
-
+#include "sql_show_processlist.h" // pfs_processlist_enabled
 
 bool PT_group::contextualize(Parse_context *pc)
 {
@@ -30,12 +37,12 @@ bool PT_group::contextualize(Parse_context *pc)
 
   if (group_list->contextualize(pc))
     return true;
-  DBUG_ASSERT(select == pc->select);
+  assert(select == pc->select);
 
   select->group_list= group_list->value;
 
   // Ensure we're resetting parsing place of the right select
-  DBUG_ASSERT(select->parsing_place == CTX_GROUP_BY);
+  assert(select->parsing_place == CTX_GROUP_BY);
   select->parsing_place= CTX_NONE;
 
   switch (olap) {
@@ -67,7 +74,7 @@ bool PT_group::contextualize(Parse_context *pc)
     select->olap= ROLLUP_TYPE;
     break;
   default:
-    DBUG_ASSERT(!"unexpected OLAP type!");
+    assert(!"unexpected OLAP type!");
   }
   return false;
 }
@@ -201,10 +208,10 @@ bool PT_table_factor_select_sym::contextualize(Parse_context *pc)
 
   if (select_item_list->contextualize(pc))
     return true;
-  DBUG_ASSERT(child == pc->select);
+  assert(child == pc->select);
 
   // Ensure we're resetting parsing place of the right select
-  DBUG_ASSERT(child->parsing_place == CTX_SELECT_LIST);
+  assert(child->parsing_place == CTX_SELECT_LIST);
   child->parsing_place= CTX_NONE;
 
   if (table_expression->contextualize(pc))
@@ -373,8 +380,8 @@ bool PT_option_value_no_option_type_internal::contextualize(Parse_context *pc)
 
   if (name->value.var == trg_new_row_fake_var)
   {
-    DBUG_ASSERT(sp);
-    DBUG_ASSERT(expr_start_ptr);
+    assert(sp);
+    assert(expr_start_ptr);
 
     /* We are parsing trigger and this is a trigger NEW-field. */
 
@@ -408,8 +415,8 @@ bool PT_option_value_no_option_type_internal::contextualize(Parse_context *pc)
   }
   else
   {
-    DBUG_ASSERT(sp);
-    DBUG_ASSERT(expr_start_ptr);
+    assert(sp);
+    assert(expr_start_ptr);
 
     /* We're parsing SP and this is an SP-variable. */
 
@@ -486,7 +493,7 @@ bool PT_option_value_no_option_type_password::contextualize(Parse_context *pc)
   user->user.length= sctx_user.length;
 
   LEX_CSTRING sctx_priv_host= thd->security_context()->priv_host();
-  DBUG_ASSERT(sctx_priv_host.str);
+  assert(sctx_priv_host.str);
   user->host.str= (char *) sctx_priv_host.str;
   user->host.length= sctx_priv_host.length;
 
@@ -598,7 +605,7 @@ static bool multi_delete_set_locks_and_link_aux_tables(Parse_context *pc)
     walk->updating= target_tbl->updating;
     walk->lock_type= target_tbl->lock_type;
     /* We can assume that tables to be deleted from are locked for write. */
-    DBUG_ASSERT(walk->lock_type >= TL_WRITE_ALLOW_WRITE);
+    assert(walk->lock_type >= TL_WRITE_ALLOW_WRITE);
     walk->mdl_request.set_type(mdl_type_for_dml(walk->lock_type));
     target_tbl->correspondent_table= walk;	// Remember corresponding table
   }
@@ -665,7 +672,7 @@ bool PT_delete::contextualize(Parse_context *pc)
   if (opt_order_clause != NULL && opt_order_clause->contextualize(pc))
     return true;
 
-  DBUG_ASSERT(pc->select->select_limit == NULL);
+  assert(pc->select->select_limit == NULL);
   if (opt_delete_limit_clause != NULL)
   {
     if (opt_delete_limit_clause->itemize(pc, &opt_delete_limit_clause))
@@ -719,7 +726,7 @@ bool PT_update::contextualize(Parse_context *pc)
   pc->select->item_list= column_list->value;
 
   // Ensure we're resetting parsing context of the right select
-  DBUG_ASSERT(pc->select->parsing_place == CTX_UPDATE_VALUE_LIST);
+  assert(pc->select->parsing_place == CTX_UPDATE_VALUE_LIST);
   pc->select->parsing_place= CTX_NONE;
   if (lex->select_lex->table_list.elements > 1)
     lex->sql_command= SQLCOM_UPDATE_MULTI;
@@ -748,7 +755,7 @@ bool PT_update::contextualize(Parse_context *pc)
   if (opt_order_clause != NULL && opt_order_clause->contextualize(pc))
     return true;
 
-  DBUG_ASSERT(pc->select->select_limit == NULL);
+  assert(pc->select->select_limit == NULL);
   if (opt_limit_clause != NULL)
   {
     if (opt_limit_clause->itemize(pc, &opt_limit_clause))
@@ -791,7 +798,7 @@ bool PT_create_select::contextualize(Parse_context *pc)
     The following work only with the local list, the global list
     is created correctly in this case
   */
-  DBUG_ASSERT(pc->select == lex->current_select());
+  assert(pc->select == lex->current_select());
   SQL_I_List<TABLE_LIST> save_list;
   pc->select->table_list.save_and_clear(&save_list);
   pc->select->parsing_place= CTX_SELECT_LIST;
@@ -809,7 +816,7 @@ bool PT_create_select::contextualize(Parse_context *pc)
     return true;
 
   // Ensure we're resetting parsing context of the right select
-  DBUG_ASSERT(pc->select->parsing_place == CTX_SELECT_LIST);
+  assert(pc->select->parsing_place == CTX_SELECT_LIST);
   pc->select->parsing_place= CTX_NONE;
 
   if (table_expression->contextualize(pc))
@@ -893,7 +900,7 @@ bool PT_insert::contextualize(Parse_context *pc)
   }
   pc->select->set_lock_for_tables(lock_option);
 
-  DBUG_ASSERT(lex->current_select() == lex->select_lex);
+  assert(lex->current_select() == lex->select_lex);
 
   if (column_list->contextualize(pc))
     return true;
@@ -914,10 +921,10 @@ bool PT_insert::contextualize(Parse_context *pc)
 
   if (opt_on_duplicate_column_list != NULL)
   {
-    DBUG_ASSERT(!is_replace);
-    DBUG_ASSERT(opt_on_duplicate_value_list != NULL &&
-                opt_on_duplicate_value_list->elements() ==
-                  opt_on_duplicate_column_list->elements());
+    assert(!is_replace);
+    assert(opt_on_duplicate_value_list != NULL &&
+           opt_on_duplicate_value_list->elements() ==
+           opt_on_duplicate_column_list->elements());
 
     lex->duplicates= DUP_UPDATE;
     TABLE_LIST *first_table= lex->select_lex->table_list.first;
@@ -932,7 +939,7 @@ bool PT_insert::contextualize(Parse_context *pc)
       return true;
 
     // Ensure we're resetting parsing context of the right select
-    DBUG_ASSERT(pc->select->parsing_place == CTX_UPDATE_VALUE_LIST);
+    assert(pc->select->parsing_place == CTX_UPDATE_VALUE_LIST);
     pc->select->parsing_place= CTX_NONE;
   }
 
@@ -964,7 +971,7 @@ Sql_cmd *PT_insert::make_cmd(THD *thd)
   sql_cmd->insert_field_list= column_list->value;
   if (opt_on_duplicate_column_list != NULL)
   {
-    DBUG_ASSERT(!is_replace);
+    assert(!is_replace);
     sql_cmd->insert_update_list= opt_on_duplicate_column_list->value;
     sql_cmd->insert_value_list= opt_on_duplicate_value_list->value;
   }
@@ -1013,3 +1020,19 @@ bool PT_alter_instance::contextualize(Parse_context *pc)
   lex->no_write_to_binlog= false;
   return false;
 }
+
+Sql_cmd *PT_show_processlist::make_cmd(THD *thd) {
+  LEX *lex = thd->lex;
+  lex->sql_command = m_sql_command;
+
+  // Read once, to avoid race conditions.
+  bool use_pfs = pfs_processlist_enabled;
+
+  m_sql_cmd.set_use_pfs(use_pfs);
+  if (use_pfs) {
+    if (build_processlist_query(m_pos, thd, m_sql_cmd.verbose()))
+      return NULL;
+  }
+
+  return &m_sql_cmd;
+}
diff --git a/sql/parse_tree_nodes.h b/sql/parse_tree_nodes.h
index 431cfc26d6b2..049202b5e026 100644
--- a/sql/parse_tree_nodes.h
+++ b/sql/parse_tree_nodes.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -25,6 +32,7 @@
 #include "sql_parse.h"               // add_join_natural
 #include "sql_update.h"              // Sql_cmd_update
 #include "sql_admin.h"               // Sql_cmd_shutdown etc.
+#include "sql_cmd_show.h"            // Sql_cmd_show_processlist
 
 
 template<enum_parsing_context Context> class PTI_context;
@@ -87,11 +95,15 @@ class PT_subselect : public PT_select_lex
     lex->pop_context();
     pc->select->n_child_sum_items += child->n_sum_items;
     /*
-      A subselect can add fields to an outer select. Reserve space for
-      them.
+      A subquery (and all the subsequent query blocks in a UNION) can add
+      columns to an outer query block. Reserve space for them.
     */
-    pc->select->select_n_where_fields+= child->select_n_where_fields;
-    pc->select->select_n_having_items+= child->select_n_having_items;
+    for (SELECT_LEX *temp = child; temp != NULL;
+         temp = temp->next_select())
+    {
+      pc->select->select_n_where_fields+= temp->select_n_where_fields;
+      pc->select->select_n_having_items+= temp->select_n_having_items;
+    }
     value= query_expression_body->value;
     return false;
   }
@@ -204,7 +216,7 @@ class PT_limit_clause : public Parse_tree_node
     if (pc->select->master_unit()->is_union() && !pc->select->braces)
     {
       pc->select= pc->select->master_unit()->fake_select_lex;
-      DBUG_ASSERT(pc->select != NULL);
+      assert(pc->select != NULL);
     }
 
     if (limit_options.is_offset_first && limit_options.opt_offset != NULL &&
@@ -309,11 +321,11 @@ class PT_join_table : public Parse_tree_node
   : tab1_node(tab1_node_arg), join_pos(join_pos_arg), tab2_node(tab2_node_arg),
     tr1(NULL), tr2(NULL)
   {
-    DBUG_ASSERT(dbug_exclusive_flags(JTT_NORMAL | JTT_STRAIGHT | JTT_NATURAL));
-    DBUG_ASSERT(dbug_exclusive_flags(JTT_LEFT | JTT_RIGHT));
+    assert(dbug_exclusive_flags(JTT_NORMAL | JTT_STRAIGHT | JTT_NATURAL));
+    assert(dbug_exclusive_flags(JTT_LEFT | JTT_RIGHT));
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool dbug_exclusive_flags(unsigned int mask)
   {
 #ifdef __GNUC__
@@ -337,7 +349,7 @@ class PT_join_table : public Parse_tree_node
       {
         TABLE_LIST *inner_table= pc->select->convert_right_join();
         /* swap tr1 and tr2 */
-        DBUG_ASSERT(inner_table == tr1);
+        assert(inner_table == tr1);
         tr1= tr2;
         tr2= inner_table;
       }
@@ -403,11 +415,11 @@ class PT_join_table_on : public PT_join_table<Type>
 
     if (super::contextualize(pc) || on->itemize(pc, &on))
       return true;
-    DBUG_ASSERT(sel == pc->select);
+    assert(sel == pc->select);
 
     add_join_on(this->tr2, on);
     pc->thd->lex->pop_context();
-    DBUG_ASSERT(sel->parsing_place == CTX_ON);
+    assert(sel->parsing_place == CTX_ON);
     sel->parsing_place= CTX_NONE;
     return false;
   }
@@ -498,10 +510,10 @@ class PT_select_part2_derived : public Parse_tree_node
 
     if (select_item_list->contextualize(pc))
       return true;
-    DBUG_ASSERT(select == pc->select);
+    assert(select == pc->select);
 
     // Ensure we're resetting parsing place of the right select
-    DBUG_ASSERT(select->parsing_place == CTX_SELECT_LIST);
+    assert(select->parsing_place == CTX_SELECT_LIST);
     select->parsing_place= CTX_NONE;
     return false;
   }
@@ -614,7 +626,7 @@ class PT_union_order_or_limit : public Parse_tree_node
     if (super::contextualize(pc))
       return true;
 
-    DBUG_ASSERT(pc->select->linkage != GLOBAL_OPTIONS_TYPE);
+    assert(pc->select->linkage != GLOBAL_OPTIONS_TYPE);
     SELECT_LEX *fake= pc->select->master_unit()->fake_select_lex;
     if (fake)
     {
@@ -1180,7 +1192,9 @@ class PT_internal_variable_name_2d : public PT_internal_variable_name
 {
   typedef PT_internal_variable_name super;
 
-  POS pos;
+public:
+  const POS pos;
+private:
   LEX_STRING ident1;
   LEX_STRING ident2;
 
@@ -1349,6 +1363,11 @@ class PT_option_value_no_option_type_sys_var :
 
     THD *thd= pc->thd;
     struct sys_var_with_base tmp= name->value;
+    if (tmp.var == trg_new_row_fake_var)
+    {
+      error(pc, down_cast<PT_internal_variable_name_2d *>(name)->pos);
+      return true;
+    }
     /* Lookup if necessary: must be a system variable. */
     if (tmp.var == NULL)
     {
@@ -1529,14 +1548,14 @@ class PT_option_value_no_option_type_password_for :
     if (!user->user.str)
     {
       LEX_CSTRING sctx_priv_user= thd->security_context()->priv_user();
-      DBUG_ASSERT(sctx_priv_user.str);
+      assert(sctx_priv_user.str);
       user->user.str= sctx_priv_user.str;
       user->user.length= sctx_priv_user.length;
     }
     if (!user->host.str)
     {
       LEX_CSTRING sctx_priv_host= thd->security_context()->priv_host();
-      DBUG_ASSERT(sctx_priv_host.str);
+      assert(sctx_priv_host.str);
       user->host.str= (char *) sctx_priv_host.str;
       user->host.length= sctx_priv_host.length;
     }
@@ -1598,12 +1617,12 @@ class PT_option_value_list_head : public Parse_tree_node
       return true;
 
     THD *thd= pc->thd;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     LEX *old_lex= thd->lex;
-#endif//DBUG_OFF
+#endif//NDEBUG
 
     sp_create_assignment_lex(thd, delimiter_pos.raw.end);
-    DBUG_ASSERT(thd->lex->select_lex == thd->lex->current_select());
+    assert(thd->lex->select_lex == thd->lex->current_select());
     Parse_context inner_pc(pc->thd, thd->lex->select_lex);
 
     if (value->contextualize(&inner_pc))
@@ -1611,8 +1630,8 @@ class PT_option_value_list_head : public Parse_tree_node
 
     if (sp_create_assignment_instr(pc->thd, value_pos.raw.end))
       return true;
-    DBUG_ASSERT(thd->lex == old_lex &&
-                thd->lex->current_select() == pc->select);
+    assert(thd->lex == old_lex &&
+           thd->lex->current_select() == pc->select);
 
     return false;
   }
@@ -1634,6 +1653,8 @@ class PT_option_value_list : public PT_option_value_list_head
 
   virtual bool contextualize(Parse_context *pc)
   {
+    uchar dummy;
+    if (check_stack_overrun(pc->thd, STACK_MIN_SIZE, &dummy)) return true;
     return head->contextualize(pc) || super::contextualize(pc);
   }
 };
@@ -1661,7 +1682,7 @@ class PT_start_option_value_list_no_type : public PT_start_option_value_list
 
     if (sp_create_assignment_instr(pc->thd, head_pos.raw.end))
       return true;
-    DBUG_ASSERT(pc->thd->lex->select_lex == pc->thd->lex->current_select());
+    assert(pc->thd->lex->select_lex == pc->thd->lex->current_select());
     pc->select= pc->thd->lex->select_lex;
 
     if (tail != NULL && tail->contextualize(pc))
@@ -1777,7 +1798,7 @@ class PT_start_option_value_list_transaction :
 
     if (sp_create_assignment_instr(thd, end_pos.raw.end))
       return true;
-    DBUG_ASSERT(pc->thd->lex->select_lex == pc->thd->lex->current_select());
+    assert(pc->thd->lex->select_lex == pc->thd->lex->current_select());
     pc->select= pc->thd->lex->select_lex;
 
     return false;
@@ -1814,7 +1835,7 @@ class PT_start_option_value_list_following_option_type_eq :
 
     if (sp_create_assignment_instr(pc->thd, head_pos.raw.end))
       return true; 
-    DBUG_ASSERT(pc->thd->lex->select_lex == pc->thd->lex->current_select());
+    assert(pc->thd->lex->select_lex == pc->thd->lex->current_select());
     pc->select= pc->thd->lex->select_lex;
 
     if (opt_tail != NULL && opt_tail->contextualize(pc))
@@ -1848,7 +1869,7 @@ class PT_start_option_value_list_following_option_type_transaction :
 
     if (sp_create_assignment_instr(pc->thd, characteristics_pos.raw.end))
       return true; 
-    DBUG_ASSERT(pc->thd->lex->select_lex == pc->thd->lex->current_select());
+    assert(pc->thd->lex->select_lex == pc->thd->lex->current_select());
     pc->select= pc->thd->lex->select_lex;
 
     return false;
@@ -1903,7 +1924,7 @@ class PT_set : public Parse_tree_node
     lex->autocommit= false;
 
     sp_create_assignment_lex(thd, set_pos.raw.end);
-    DBUG_ASSERT(pc->thd->lex->select_lex == pc->thd->lex->current_select());
+    assert(pc->thd->lex->select_lex == pc->thd->lex->current_select());
     pc->select= pc->thd->lex->select_lex;
 
     return list->contextualize(pc);
@@ -2044,7 +2065,7 @@ class PT_select_var : public Parse_tree_node
   explicit PT_select_var(const LEX_STRING &name_arg) : name(name_arg) {}
 
   virtual bool is_local() const { return false; }
-  virtual uint get_offset() const { DBUG_ASSERT(0); return 0; }
+  virtual uint get_offset() const { assert(0); return 0; }
 };
 
 
@@ -2054,7 +2075,7 @@ class PT_select_sp_var : public PT_select_var
 
   uint offset;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Routine to which this Item_splocal belongs. Used for checking if correct
     runtime context is used for variable handling.
@@ -2074,7 +2095,7 @@ class PT_select_sp_var : public PT_select_var
       return true;
 
     LEX *lex= pc->thd->lex;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     sp= lex->sphead;
 #endif
     sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
@@ -2165,7 +2186,7 @@ class PT_select_options_and_item_list : public Parse_tree_node
       return true;
 
     // Ensure we're resetting parsing place of the right select
-    DBUG_ASSERT(pc->select->parsing_place == CTX_SELECT_LIST);
+    assert(pc->select->parsing_place == CTX_SELECT_LIST);
     pc->select->parsing_place= CTX_NONE;
     return false;
   }
@@ -2257,9 +2278,9 @@ class PT_select_part2 : public Parse_tree_node
          opt_into2->contextualize(pc)))
       return true;
 
-    DBUG_ASSERT(opt_into1 == NULL || opt_into2 == NULL);
-    DBUG_ASSERT(opt_procedure_analyse_clause == NULL ||
-                (opt_into1 == NULL && opt_into2 == NULL));
+    assert(opt_into1 == NULL || opt_into2 == NULL);
+    assert(opt_procedure_analyse_clause == NULL ||
+           (opt_into1 == NULL && opt_into2 == NULL));
 
     /*
       @todo: explain should not affect how we construct the query data
@@ -2460,7 +2481,7 @@ class PT_delete : public PT_statement
 
   bool is_multitable() const
   {
-    DBUG_ASSERT((table_ident != NULL) ^ (table_list.size() > 0));
+    assert((table_ident != NULL) ^ (table_list.size() > 0));
     return table_ident == NULL;
   }
 
@@ -2549,7 +2570,7 @@ class PT_insert_values_list : public Parse_tree_node
 
   virtual List<List_item> &get_many_values()
   {
-    DBUG_ASSERT(is_contextualized());
+    assert(is_contextualized());
     return many_values;
   }
 };
@@ -2617,16 +2638,16 @@ class PT_insert : public PT_statement
     opt_on_duplicate_value_list(opt_on_duplicate_value_list_arg)
   {
     // REPLACE statement can't have IGNORE flag:
-    DBUG_ASSERT(!is_replace || !ignore);
+    assert(!is_replace || !ignore);
     // REPLACE statement can't have ON DUPLICATE KEY UPDATE clause:
-    DBUG_ASSERT(!is_replace || opt_on_duplicate_column_list == NULL);
+    assert(!is_replace || opt_on_duplicate_column_list == NULL);
     // INSERT/REPLACE ... SELECT can't have VALUES clause:
-    DBUG_ASSERT((row_value_list != NULL) ^ (insert_query_expression != NULL));
+    assert((row_value_list != NULL) ^ (insert_query_expression != NULL));
     // ON DUPLICATE KEY UPDATE: column and value arrays must have same sizes:
-    DBUG_ASSERT((opt_on_duplicate_column_list == NULL &&
-                 opt_on_duplicate_value_list == NULL) ||
-                (opt_on_duplicate_column_list->elements() ==
-                 opt_on_duplicate_value_list->elements()));
+    assert((opt_on_duplicate_column_list == NULL &&
+            opt_on_duplicate_value_list == NULL) ||
+           (opt_on_duplicate_column_list->elements() ==
+            opt_on_duplicate_value_list->elements()));
   }
 
   virtual bool contextualize(Parse_context *pc);
@@ -2662,4 +2683,30 @@ class PT_alter_instance : public PT_statement
   virtual bool contextualize(Parse_context *pc);
 };
 
+/// Base class for Parse tree nodes of SHOW statements
+
+class PT_show_base : public PT_statement {
+ protected:
+  PT_show_base(const POS &pos, enum_sql_command sql_command)
+      : m_pos(pos), m_sql_command(sql_command) {}
+
+  /// Textual location of a token just parsed.
+  POS m_pos;
+  /// SQL command
+  enum_sql_command m_sql_command;
+};
+
+/// Parse tree node for SHOW PROCESSLIST statement
+
+class PT_show_processlist : public PT_show_base {
+ public:
+  PT_show_processlist(const POS &pos, bool verbose)
+      : PT_show_base(pos, SQLCOM_SHOW_PROCESSLIST), m_sql_cmd(verbose) {}
+
+  virtual Sql_cmd *make_cmd(THD *thd);
+
+ private:
+  Sql_cmd_show_processlist m_sql_cmd;
+};
+
 #endif /* PARSE_TREE_NODES_INCLUDED */
diff --git a/sql/parser_service.cc b/sql/parser_service.cc
index 9c323a85496f..699618c1c07c 100644
--- a/sql/parser_service.cc
+++ b/sql/parser_service.cc
@@ -1,13 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; version 2 of the License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -268,6 +275,7 @@ int mysql_parser_parse(MYSQL_THD thd, const MYSQL_LEX_STRING query,
   if (parser_state.init(thd, query.str, query.length))
     return 1;
 
+  parser_state.m_input.m_has_digest = true;
   parser_state.m_input.m_compute_digest= true;
   thd->m_digest= &thd->m_digest_state;
   thd->m_digest->reset(thd->m_token_array, max_digest_length);
diff --git a/sql/partition_element.h b/sql/partition_element.h
index 6880592bf63f..c68951f1aaeb 100644
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@@ -1,16 +1,23 @@
 #ifndef PARTITION_ELEMENT_INCLUDED
 #define PARTITION_ELEMENT_INCLUDED
 
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 81d6c1f3a119..77ec552463fd 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,13 +41,12 @@ partition_info *partition_info::get_clone(bool reset /* = false */)
   DBUG_ENTER("partition_info::get_clone");
   List_iterator<partition_element> part_it(partitions);
   partition_element *part;
-  partition_info *clone= new partition_info();
+  partition_info *clone= new partition_info(*this);
   if (!clone)
   {
     mem_alloc_error(sizeof(partition_info));
     DBUG_RETURN(NULL);
   }
-  memcpy(clone, this, sizeof(partition_info));
   memset(&(clone->read_partitions), 0, sizeof(clone->read_partitions));
   memset(&(clone->lock_partitions), 0, sizeof(clone->lock_partitions));
   clone->bitmaps_are_initialized= FALSE;
@@ -51,13 +57,12 @@ partition_info *partition_info::get_clone(bool reset /* = false */)
   {
     List_iterator<partition_element> subpart_it(part->subpartitions);
     partition_element *subpart;
-    partition_element *part_clone= new partition_element();
+    partition_element *part_clone= new partition_element(*part);
     if (!part_clone)
     {
       mem_alloc_error(sizeof(partition_element));
       DBUG_RETURN(NULL);
     }
-    memcpy(part_clone, part, sizeof(partition_element));
 
     /*
       Mark that RANGE and LIST values needs to be fixed so that we don't
@@ -81,13 +86,12 @@ partition_info *partition_info::get_clone(bool reset /* = false */)
     part_clone->subpartitions.empty();
     while ((subpart= (subpart_it++)))
     {
-      partition_element *subpart_clone= new partition_element();
+      partition_element *subpart_clone= new partition_element(*subpart);
       if (!subpart_clone)
       {
         mem_alloc_error(sizeof(partition_element));
         DBUG_RETURN(NULL);
       }
-      memcpy(subpart_clone, subpart, sizeof(partition_element));
       part_clone->subpartitions.push_back(subpart_clone);
     }
     clone->partitions.push_back(part_clone);
@@ -126,11 +130,11 @@ bool partition_info::add_named_partition(const char *part_name,
   PART_NAME_DEF *part_def;
   Partition_share *part_share;
   DBUG_ENTER("partition_info::add_named_partition");
-  DBUG_ASSERT(table && table->s && table->s->ha_share);
+  assert(table && table->s && table->s->ha_share);
   part_share= static_cast<Partition_share*>((table->s->ha_share));
-  DBUG_ASSERT(part_share->partition_name_hash_initialized);
+  assert(part_share->partition_name_hash_initialized);
   part_name_hash= &part_share->partition_name_hash;
-  DBUG_ASSERT(part_name_hash->records);
+  assert(part_name_hash->records);
 
   part_def= (PART_NAME_DEF*) my_hash_search(part_name_hash,
                                             (const uchar*) part_name,
@@ -243,8 +247,8 @@ bool partition_info::set_partition_bitmaps(TABLE_LIST *table_list)
 {
   DBUG_ENTER("partition_info::set_partition_bitmaps");
 
-  DBUG_ASSERT(bitmaps_are_initialized);
-  DBUG_ASSERT(table);
+  assert(bitmaps_are_initialized);
+  assert(table);
   is_pruning_completed= false;
   if (!bitmaps_are_initialized)
     DBUG_RETURN(TRUE);
@@ -272,7 +276,7 @@ bool partition_info::set_partition_bitmaps(TABLE_LIST *table_list)
     DBUG_PRINT("info", ("Set all partitions"));
   }
   bitmap_copy(&lock_partitions, &read_partitions);
-  DBUG_ASSERT(bitmap_get_first_set(&lock_partitions) != MY_BIT_NONE);
+  assert(bitmap_get_first_set(&lock_partitions) != MY_BIT_NONE);
   DBUG_RETURN(FALSE);
 }
 
@@ -311,7 +315,7 @@ bool partition_info::can_prune_insert(THD* thd,
   uint bitmap_bytes;
   uint num_partitions= 0;
   *can_prune_partitions= PRUNE_NO;
-  DBUG_ASSERT(bitmaps_are_initialized);
+  assert(bitmaps_are_initialized);
   DBUG_ENTER("partition_info::can_prune_insert");
 
   if (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION)
@@ -485,7 +489,7 @@ bool partition_info::set_used_partition(List<Item> &fields,
   Dummy_error_handler error_handler;
   bool ret= true;
   DBUG_ENTER("set_partition");
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   /* Only allow checking of constant values */
   List_iterator_fast<Item> v(values);
@@ -511,7 +515,7 @@ bool partition_info::set_used_partition(List<Item> &fields,
                     NULL))
       goto err;
   }
-  DBUG_ASSERT(!table->auto_increment_field_not_null);
+  assert(!table->auto_increment_field_not_null);
 
   /*
     Evaluate DEFAULT functions like CURRENT_TIMESTAMP.
@@ -937,7 +941,7 @@ partition_element *partition_info::get_part_elem(const char *partition_name,
   List_iterator<partition_element> part_it(partitions);
   uint i= 0;
   DBUG_ENTER("partition_info::get_part_elem");
-  DBUG_ASSERT(part_id);
+  assert(part_id);
   *part_id= NOT_A_PARTITION_ID;
   do
   {
@@ -1031,7 +1035,7 @@ char *partition_info::find_duplicate_name()
                    (my_hash_get_key) get_part_name_from_elem, 0, HASH_UNIQUE,
                    PSI_INSTRUMENT_ME))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     curr_name= (const uchar*) "Internal failure";
     goto error;
   }
@@ -1213,7 +1217,7 @@ bool partition_info::check_engine_mix(handlerton *engine_type,
   }
   DBUG_PRINT("info", ("out: engine_type = %s",
                        ha_resolve_storage_engine_name(engine_type)));
-  DBUG_ASSERT(!is_ha_partition_handlerton(engine_type));
+  assert(!is_ha_partition_handlerton(engine_type));
   DBUG_RETURN(FALSE);
 error:
   /*
@@ -1278,7 +1282,7 @@ bool partition_info::check_range_constants(THD *thd)
         List_iterator<part_elem_value> list_val_it(part_def->list_val_list);
         part_elem_value *range_val= list_val_it++;
         part_column_list_val *col_val= range_val->col_val_array;
-        DBUG_ASSERT(part_def->list_val_list.elements == 1);
+        assert(part_def->list_val_list.elements == 1);
 
         if (fix_column_value_functions(thd, range_val, i))
           goto end;
@@ -1569,7 +1573,7 @@ bool partition_info::check_list_constants(THD *thd)
       }
     } while (++i < num_parts);
   }
-  DBUG_ASSERT(fixed);
+  assert(fixed);
   if (num_list_values)
   {
     bool first= TRUE;
@@ -1583,7 +1587,7 @@ bool partition_info::check_list_constants(THD *thd)
     i= 0;
     do
     {
-      DBUG_ASSERT(i < num_list_values);
+      assert(i < num_list_values);
       curr_value= column_list ? (void*)&list_col_array[num_column_values * i] :
                                 (void*)&list_array[i];
       if (likely(first || compare_func(curr_value, prev_value)))
@@ -1658,7 +1662,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
   bool result= TRUE, table_engine_set;
   char *same_name;
   DBUG_ENTER("partition_info::check_partition_info");
-  DBUG_ASSERT(!is_ha_partition_handlerton(table_engine));
+  assert(!is_ha_partition_handlerton(table_engine));
 
   DBUG_PRINT("info", ("default table_engine = %s",
                       ha_resolve_storage_engine_name(table_engine)));
@@ -1669,7 +1673,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
     /* Check for partition expression. */
     if (!list_of_part_fields)
     {
-      DBUG_ASSERT(part_expr);
+      assert(part_expr);
       err= part_expr->walk(&Item::check_partition_func_processor,
                            Item::WALK_POSTFIX, NULL);
     }
@@ -1677,7 +1681,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
     /* Check for sub partition expression. */
     if (!err && is_sub_partitioned() && !list_of_subpart_fields)
     {
-      DBUG_ASSERT(subpart_expr);
+      assert(subpart_expr);
       err= subpart_expr->walk(&Item::check_partition_func_processor,
                               Item::WALK_POSTFIX, NULL);
     }
@@ -1740,7 +1744,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
     {
       table_engine= thd->lex->create_info.db_type;
     }
-    DBUG_ASSERT(!is_ha_partition_handlerton(table_engine));
+    assert(!is_ha_partition_handlerton(table_engine));
     DBUG_PRINT("info", ("Using table_engine = %s",
                         ha_resolve_storage_engine_name(table_engine)));
   }
@@ -1752,8 +1756,8 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
       table_engine_set= TRUE;
       DBUG_PRINT("info", ("No create, table_engine = %s",
                           ha_resolve_storage_engine_name(table_engine)));
-      DBUG_ASSERT(table_engine &&
-                  !is_ha_partition_handlerton(table_engine));
+      assert(table_engine &&
+             !is_ha_partition_handlerton(table_engine));
     }
   }
 
@@ -1879,8 +1883,8 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
     goto end;
   }
 
-  DBUG_ASSERT(table_engine == default_engine_type &&
-              !is_ha_partition_handlerton(table_engine));
+  assert(table_engine == default_engine_type &&
+         !is_ha_partition_handlerton(table_engine));
   if (eng_type)
     *eng_type= table_engine;
 
@@ -1921,7 +1925,6 @@ void partition_info::print_no_partition_found(TABLE *table_arg)
   char *buf_ptr= (char*)&buf;
   TABLE_LIST table_list;
 
-  memset(&table_list, 0, sizeof(table_list));
   table_list.db= table_arg->s->db.str;
   table_list.table_name= table_arg->s->table_name.str;
 
@@ -2255,7 +2258,7 @@ bool partition_info::is_fields_in_part_expr(List<Item> &fields)
   while ((item= it++))
   {
     field= item->field_for_view_update();
-    DBUG_ASSERT(field->field->table == table);
+    assert(field->field->table == table);
     if (bitmap_is_set(&full_part_field_set, field->field->field_index))
       DBUG_RETURN(true);
   }
@@ -2270,7 +2273,7 @@ bool partition_info::is_fields_in_part_expr(List<Item> &fields)
 bool partition_info::is_full_part_expr_in_fields(List<Item> &fields)
 {
   Field **part_field= full_part_field_array;
-  DBUG_ASSERT(*part_field);
+  assert(*part_field);
   DBUG_ENTER("is_full_part_expr_in_fields");
   /*
     It is very seldom many fields in full_part_field_array, so it is OK
@@ -2287,7 +2290,7 @@ bool partition_info::is_full_part_expr_in_fields(List<Item> &fields)
     while ((item= it++))
     {
       field= item->field_for_view_update();
-      DBUG_ASSERT(field->field->table == table);
+      assert(field->field->table == table);
       if (*part_field == field->field)
       {
         found= true;
@@ -2554,8 +2557,8 @@ bool partition_info::reorganize_into_single_field_col_val()
   uint num_values= num_columns;
   uint i;
   DBUG_ENTER("partition_info::reorganize_into_single_field_col_val");
-  DBUG_ASSERT(part_type == LIST_PARTITION);
-  DBUG_ASSERT(!num_columns || num_columns == val->added_items);
+  assert(part_type == LIST_PARTITION);
+  assert(!num_columns || num_columns == val->added_items);
 
   if (!num_values)
     num_values= val->added_items;
@@ -2619,7 +2622,7 @@ bool partition_info::fix_partition_values(THD *thd,
   if (col_val->max_value)
   {
     /* The parser ensures we're not LIST partitioned here */
-    DBUG_ASSERT(part_type == RANGE_PARTITION);
+    assert(part_type == RANGE_PARTITION);
     if (defined_max_value)
     {
       my_error(ER_PARTITION_MAXVALUE_ERROR, MYF(0));
@@ -2867,8 +2870,8 @@ bool partition_info::fix_parser_data(THD *thd)
     part_elem= it++;
     List_iterator<part_elem_value> list_val_it(part_elem->list_val_list);
     num_elements= part_elem->list_val_list.elements;
-    DBUG_ASSERT(part_type == RANGE_PARTITION ?
-                num_elements == 1U : TRUE);
+    assert(part_type == RANGE_PARTITION ?
+           num_elements == 1U : TRUE);
     for (j= 0; j < num_elements; j++)
     {
       part_elem_value *val= list_val_it++;
@@ -2953,7 +2956,7 @@ bool partition_info::has_same_partitioning(partition_info *new_part_info)
 {
   DBUG_ENTER("partition_info::has_same_partitioning");
 
-  DBUG_ASSERT(part_field_array && part_field_array[0]);
+  assert(part_field_array && part_field_array[0]);
 
   /*
     Only consider pre 5.5.3 .frm's to have same partitioning as
@@ -3092,7 +3095,7 @@ bool partition_info::has_same_partitioning(partition_info *new_part_info)
         }
         else
         {
-          DBUG_ASSERT(part_type == RANGE_PARTITION);
+          assert(part_type == RANGE_PARTITION);
           if (new_part_elem->range_value != part_elem->range_value)
             DBUG_RETURN(false);
         }
diff --git a/sql/partition_info.h b/sql/partition_info.h
index b611d000942e..6e87ee925e48 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -1,16 +1,23 @@
 #ifndef PARTITION_INFO_INCLUDED
 #define PARTITION_INFO_INCLUDED
 
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/partitioning/partition_handler.cc b/sql/partitioning/partition_handler.cc
index cb00dc301582..6fa898117722 100644
--- a/sql/partitioning/partition_handler.cc
+++ b/sql/partitioning/partition_handler.cc
@@ -1,15 +1,21 @@
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -97,13 +103,13 @@ Partition_share::~Partition_share()
 bool Partition_share::init_auto_inc_mutex(TABLE_SHARE *table_share)
 {
   DBUG_ENTER("Partition_share::init_auto_inc_mutex");
-  DBUG_ASSERT(!auto_inc_mutex);
-#ifndef DBUG_OFF
+  assert(!auto_inc_mutex);
+#ifndef NDEBUG
   if (table_share->tmp_table == NO_TMP_TABLE)
   {
     mysql_mutex_assert_owner(&table_share->LOCK_ha_data);
   }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
   auto_inc_mutex= static_cast<mysql_mutex_t*>(my_malloc(
                                               key_memory_Partition_share,
                                               sizeof(*auto_inc_mutex),
@@ -131,14 +137,14 @@ Partition_share::release_auto_inc_if_possible(THD *thd, TABLE_SHARE *table_share
                                               const ulonglong next_insert_id,
                                               const ulonglong max_reserved)
 {
-  DBUG_ASSERT(auto_inc_mutex);
+  assert(auto_inc_mutex);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (table_share->tmp_table == NO_TMP_TABLE)
   {
     mysql_mutex_assert_owner(auto_inc_mutex);
   }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
   /*
     If the current auto_increment values is lower than the reserved value (1)
@@ -182,7 +188,7 @@ bool Partition_share::populate_partition_name_hash(partition_info *part_info)
   uint tot_names;
   uint num_subparts= part_info->num_subparts;
   DBUG_ENTER("Partition_share::populate_partition_name_hash");
-  DBUG_ASSERT(!part_info->is_sub_partitioned() || num_subparts);
+  assert(!part_info->is_sub_partitioned() || num_subparts);
 
   if (num_subparts == 0)
   {
@@ -194,7 +200,7 @@ bool Partition_share::populate_partition_name_hash(partition_info *part_info)
     This ensures only one thread/table instance will execute this.
   */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (part_info->table->s->tmp_table == NO_TMP_TABLE)
   {
     mysql_mutex_assert_owner(&part_info->table->s->LOCK_ha_data);
@@ -234,7 +240,7 @@ bool Partition_share::populate_partition_name_hash(partition_info *part_info)
   do
   {
     partition_element *part_elem= part_it++;
-    DBUG_ASSERT(part_elem->part_state == PART_NORMAL);
+    assert(part_elem->part_state == PART_NORMAL);
     if (part_elem->part_state == PART_NORMAL)
     {
       if (insert_partition_name_in_hash(part_elem->partition_name,
@@ -361,8 +367,8 @@ Partition_helper::Partition_helper(handler *main_handler)
 
 Partition_helper::~Partition_helper()
 {
-  DBUG_ASSERT(m_ordered_rec_buffer == NULL);
-  DBUG_ASSERT(m_key_not_found_partitions.bitmap == NULL);
+  assert(m_ordered_rec_buffer == NULL);
+  assert(m_key_not_found_partitions.bitmap == NULL);
 }
 
 
@@ -405,7 +411,7 @@ void Partition_helper::set_part_info_low(partition_info *part_info,
 bool Partition_helper::open_partitioning(Partition_share *part_share)
 {
   m_table= get_table();
-  DBUG_ASSERT(m_part_info == m_table->part_info);
+  assert(m_part_info == m_table->part_info);
   m_part_share= part_share;
   m_tot_parts= m_part_info->get_tot_partitions();
   if (bitmap_init(&m_key_not_found_partitions, NULL, m_tot_parts, false))
@@ -437,7 +443,7 @@ bool Partition_helper::open_partitioning(Partition_share *part_share)
   } else {
     m_rec_length= m_table->s->reclength;
   }
-  DBUG_ASSERT(db_type !=  DB_TYPE_UNKNOWN);
+  assert(db_type !=  DB_TYPE_UNKNOWN);
   return false;
 }
 
@@ -445,7 +451,7 @@ bool Partition_helper::open_partitioning(Partition_share *part_share)
 void Partition_helper::close_partitioning()
 {
   bitmap_free(&m_key_not_found_partitions);
-  DBUG_ASSERT(!m_ordered_rec_buffer);
+  assert(!m_ordered_rec_buffer);
   destroy_record_priority_queue();
 }
 
@@ -473,11 +479,11 @@ int Partition_helper::ph_write_row(uchar *buf)
   THD *thd= get_thd();
   sql_mode_t saved_sql_mode= thd->variables.sql_mode;
   bool saved_auto_inc_field_not_null= m_table->auto_increment_field_not_null;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   my_bitmap_map *old_map;
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
   DBUG_ENTER("Partition_helper::ph_write_row");
-  DBUG_ASSERT(buf == m_table->record[0]);
+  assert(buf == m_table->record[0]);
 
   /*
     If we have an auto_increment column and we are writing a changed row
@@ -512,16 +518,16 @@ int Partition_helper::ph_write_row(uchar *buf)
     }
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* Temporary mark the partitioning fields as readable. */
   old_map= dbug_tmp_use_all_columns(m_table, m_table->read_set);
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
   error= m_part_info->get_partition_id(m_part_info, &part_id, &func_value);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   dbug_tmp_restore_column_map(m_table->read_set, old_map);
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
   if (unlikely(error))
   {
@@ -583,8 +589,8 @@ int Partition_helper::ph_update_row(const uchar *old_data, uchar *new_data)
   m_err_rec= NULL;
 
   // Need to read partition-related columns, to locate the row's partition:
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->full_part_field_set,
-                               m_table->read_set));
+  assert(bitmap_is_subset(&m_part_info->full_part_field_set,
+                          m_table->read_set));
   if ((error= get_parts_for_update(old_data, new_data, m_table->record[0],
                                    m_part_info, &old_part_id, &new_part_id,
                                    &func_value)))
@@ -698,8 +704,8 @@ int Partition_helper::ph_delete_row(const uchar *buf)
   DBUG_ENTER("Partition_helper::ph_delete_row");
   m_err_rec= NULL;
 
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->full_part_field_set,
-                               m_table->read_set));
+  assert(bitmap_is_subset(&m_part_info->full_part_field_set,
+                          m_table->read_set));
   if ((error= get_part_for_delete(buf,
                                   m_table->record[0],
                                   m_part_info,
@@ -738,7 +744,7 @@ int Partition_helper::ph_delete_row(const uchar *buf)
     DBUG_RETURN(HA_ERR_ROW_IN_WRONG_PARTITION);
   }
   /* Should never call delete_row on a partition which is not read */
-  DBUG_ASSERT(m_part_info->is_partition_used(part_id));
+  assert(m_part_info->is_partition_used(part_id));
 
   m_last_part= part_id;
   error= delete_row_in_part(part_id, buf);
@@ -777,12 +783,12 @@ ::get_auto_increment_first_field(ulonglong increment,
                       (ulong) increment,
                       (ulong) nb_desired_values,
                       (ulong) *first_value));
-  DBUG_ASSERT(increment && nb_desired_values);
+  assert(increment && nb_desired_values);
   /*
     next_number_keypart is != 0 if the auto_increment column is a secondary
     column in the index (it is allowed in MyISAM)
   */
-  DBUG_ASSERT(m_table->s->next_number_keypart == 0);
+  assert(m_table->s->next_number_keypart == 0);
   *first_value= 0;
 
   /*
@@ -978,7 +984,7 @@ uint32 Partition_helper::ph_calculate_key_hash_value(Field **field_array)
       case MYSQL_TYPE_GEOMETRY:
         /* fall through. */
       default:
-        DBUG_ASSERT(0);                    // New type?
+        assert(0);                    // New type?
         /* Fall through for default hashing (5.5). */
       }
       /* fall through, use collation based hashing. */
@@ -1011,19 +1017,19 @@ bool Partition_helper::print_partition_error(int error, myf errflag)
       Or in ALTER TABLE REBUILD/REORGANIZE where there are a misplaced
       row that needed to move to an old partition (not in the given set).
     */
-    DBUG_ASSERT(thd_sql_command(thd) == SQLCOM_DELETE ||
-                thd_sql_command(thd) == SQLCOM_DELETE_MULTI ||
-                thd_sql_command(thd) == SQLCOM_UPDATE ||
-                thd_sql_command(thd) == SQLCOM_UPDATE_MULTI ||
-                thd_sql_command(thd) == SQLCOM_ALTER_TABLE);
-    DBUG_ASSERT(m_err_rec);
+    assert(thd_sql_command(thd) == SQLCOM_DELETE ||
+           thd_sql_command(thd) == SQLCOM_DELETE_MULTI ||
+           thd_sql_command(thd) == SQLCOM_UPDATE ||
+           thd_sql_command(thd) == SQLCOM_UPDATE_MULTI ||
+           thd_sql_command(thd) == SQLCOM_ALTER_TABLE);
+    assert(m_err_rec);
     if (m_err_rec)
     {
       size_t max_length;
       char buf[MAX_KEY_LENGTH];
       String str(buf,sizeof(buf),system_charset_info);
       uint32 part_id;
-      DBUG_ASSERT(m_last_part < m_tot_parts);
+      assert(m_last_part < m_tot_parts);
       str.length(0);
       if (thd_sql_command(thd) == SQLCOM_ALTER_TABLE)
       {
@@ -1125,8 +1131,8 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
   /*
     Assert that it works without HA_FILE_BASED and lower_case_table_name = 2.
   */
-  DBUG_ASSERT(!strcmp(path, get_canonical_filename(m_handler, path,
-                                                   part_name_buff)));
+  assert(!strcmp(path, get_canonical_filename(m_handler, path,
+                                              part_name_buff)));
   num_reorged_parts= 0;
   if (!m_part_info->is_sub_partitioned())
     num_subparts= 1;
@@ -1196,7 +1202,7 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
         {
           bitmap_set_bit(&m_part_info->read_partitions, i * num_subparts + sp);
         }
-        DBUG_ASSERT(first);
+        assert(first);
       }
       else if (first && temp_partitions &&
                part_elem->part_state == PART_TO_BE_ADDED)
@@ -1211,7 +1217,7 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
           ones used to be.
         */
         first= false;
-        DBUG_ASSERT(((i*num_subparts) + num_reorged_parts) <= m_tot_parts);
+        assert(((i*num_subparts) + num_reorged_parts) <= m_tot_parts);
         for (uint sp = 0; sp < num_reorged_parts; sp++)
         {
           bitmap_set_bit(&m_part_info->read_partitions, i * num_subparts + sp);
@@ -1238,8 +1244,8 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
   do
   {
     partition_element *part_elem= part_it++;
-    DBUG_ASSERT(part_elem->part_state >= PART_NORMAL &&
-                part_elem->part_state <= PART_CHANGED);
+    assert(part_elem->part_state >= PART_NORMAL &&
+           part_elem->part_state <= PART_CHANGED);
     if (part_elem->part_state == PART_TO_BE_ADDED ||
         part_elem->part_state == PART_CHANGED)
     {
@@ -1355,7 +1361,7 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
   for (i= 0; i < temp_partitions; i++)
   {
     partition_element *part_elem= t_it++;
-    DBUG_ASSERT(part_elem->part_state == PART_TO_BE_REORGED);
+    assert(part_elem->part_state == PART_TO_BE_REORGED);
     part_elem->part_state= PART_TO_BE_DROPPED;
   }
   error= copy_partitions(copied, deleted);
@@ -1954,7 +1960,7 @@ int Partition_helper::ph_rnd_end()
   DBUG_ENTER("Partition_helper::ph_rnd_end");
   switch (m_scan_value) {
   case 3:                                       // Error
-    DBUG_ASSERT(0);
+    assert(0);
     /* fall through. */
   case 2:                                       // Error
     break;
@@ -2014,7 +2020,7 @@ int Partition_helper::ph_rnd_next(uchar *buf)
     goto end;
   }
 
-  DBUG_ASSERT(m_scan_value == 1);
+  assert(m_scan_value == 1);
 
   while (TRUE)
   {
@@ -2080,7 +2086,7 @@ int Partition_helper::ph_rnd_next(uchar *buf)
 
 void Partition_helper::ph_position(const uchar *record)
 {
-  DBUG_ASSERT(m_part_info->is_partition_used(m_last_part));
+  assert(m_part_info->is_partition_used(m_last_part));
   DBUG_ENTER("Partition_helper::ph_position");
   DBUG_PRINT("info", ("record: %p", record));
   DBUG_DUMP("record", record, m_rec_length);
@@ -2091,10 +2097,10 @@ void Partition_helper::ph_position(const uchar *record)
   */
   if (m_ref_usage != REF_NOT_USED && m_ordered_scan_ongoing)
   {
-    DBUG_ASSERT(!m_queue->empty());
-    DBUG_ASSERT(m_ordered_rec_buffer);
-    DBUG_ASSERT(!m_curr_key_info[1]);
-    DBUG_ASSERT(uint2korr(m_queue->top()) == m_last_part);
+    assert(!m_queue->empty());
+    assert(m_ordered_rec_buffer);
+    assert(!m_curr_key_info[1]);
+    assert(uint2korr(m_queue->top()) == m_last_part);
     /* We already have the ref and part id. */
     memcpy(m_handler->ref, m_queue->top(), m_handler->ref_length);
   }
@@ -2133,8 +2139,8 @@ int Partition_helper::ph_rnd_pos(uchar *buf, uchar *pos)
   DBUG_ENTER("Partition_helper::ph_rnd_pos");
 
   part_id= uint2korr(pos);
-  DBUG_ASSERT(part_id < m_tot_parts);
-  DBUG_ASSERT(m_part_info->is_partition_used(part_id));
+  assert(part_id < m_tot_parts);
+  assert(m_part_info->is_partition_used(part_id));
   m_last_part= part_id;
   DBUG_RETURN(rnd_pos_in_part(part_id, buf, (pos + PARTITION_BYTES_IN_POS)));
 }
@@ -2171,8 +2177,8 @@ int Partition_helper::init_record_priority_queue()
 {
   uint used_parts= m_part_info->num_partitions_used();
   DBUG_ENTER("Partition_helper::init_record_priority_queue");
-  DBUG_ASSERT(!m_ordered_rec_buffer);
-  DBUG_ASSERT(!m_queue);
+  assert(!m_ordered_rec_buffer);
+  assert(!m_queue);
   /* Initialize the priority queue. */
   // TODO: Create test to see the cost of allocating when needed vs
   // allocate once and keep between statements. Also test on NUMA
@@ -2305,7 +2311,7 @@ int Partition_helper::ph_index_init_setup(uint inx, bool sorted)
 {
   DBUG_ENTER("Partition_helper:ph_:index_init_setup");
 
-  DBUG_ASSERT(inx != MAX_KEY);
+  assert(inx != MAX_KEY);
   DBUG_PRINT("info", ("inx %u sorted %u", inx, sorted));
   m_part_spec.start_part= NO_CURRENT_PART_ID;
   m_start_key.length= 0;
@@ -2527,7 +2533,7 @@ int Partition_helper::common_index_read(uchar *buf, bool have_start_key)
     DBUG_PRINT("info", ("have_start_key map %lu find_flag %u len %u",
                         m_start_key.keypart_map, m_start_key.flag,
                         m_start_key.length));
-    DBUG_ASSERT(m_start_key.length);
+    assert(m_start_key.length);
   }
   if ((error= partition_scan_set_up(buf, have_start_key)))
   {
@@ -2730,10 +2736,10 @@ int Partition_helper::ph_index_read_idx_map(uchar *buf,
       (in which case start_part == end_part)
       or no matching partitions (start_part > end_part)
     */
-    DBUG_ASSERT(m_part_spec.start_part >= m_part_spec.end_part);
+    assert(m_part_spec.start_part >= m_part_spec.end_part);
     /* The start part is must be marked as used. */
-    DBUG_ASSERT(m_part_spec.start_part > m_part_spec.end_part ||
-                m_part_info->is_partition_used(m_part_spec.start_part));
+    assert(m_part_spec.start_part > m_part_spec.end_part ||
+           m_part_info->is_partition_used(m_part_spec.start_part));
 
     for (part= m_part_spec.start_part;
          part <= m_part_spec.end_part;
@@ -2762,7 +2768,7 @@ int Partition_helper::ph_index_read_idx_map(uchar *buf,
       If not only used with HA_READ_KEY_EXACT, we should investigate if
       possible to optimize for other find_flag's as well.
     */
-    DBUG_ASSERT(0);
+    assert(0);
     error= HA_ERR_INTERNAL_ERROR;
   }
   DBUG_RETURN(error);
@@ -2792,8 +2798,8 @@ int Partition_helper::ph_index_next(uchar *buf)
     and if direction changes, we must step back those partitions in
     the record queue so we don't return a value from the wrong direction.
   */
-  DBUG_ASSERT(m_index_scan_type != PARTITION_INDEX_LAST ||
-              m_table->open_by_handler);
+  assert(m_index_scan_type != PARTITION_INDEX_LAST ||
+         m_table->open_by_handler);
   if (!m_ordered_scan_ongoing)
   {
     DBUG_RETURN(handle_unordered_next(buf, false));
@@ -2821,8 +2827,8 @@ int Partition_helper::ph_index_next_same(uchar *buf, const uchar *key, uint keyl
 {
   DBUG_ENTER("Partition_helper::ph_index_next_same");
 
-  DBUG_ASSERT(keylen == m_start_key.length);
-  DBUG_ASSERT(m_index_scan_type != PARTITION_INDEX_LAST);
+  assert(keylen == m_start_key.length);
+  assert(m_index_scan_type != PARTITION_INDEX_LAST);
   if (!m_ordered_scan_ongoing)
     DBUG_RETURN(handle_unordered_next(buf, true));
   DBUG_RETURN(handle_ordered_next(buf, true));
@@ -2846,8 +2852,8 @@ int Partition_helper::ph_index_prev(uchar *buf)
   DBUG_ENTER("Partition_helper::ph_index_prev");
 
   /* TODO: read comment in index_next */
-  DBUG_ASSERT(m_index_scan_type != PARTITION_INDEX_FIRST ||
-              m_table->open_by_handler);
+  assert(m_index_scan_type != PARTITION_INDEX_FIRST ||
+         m_table->open_by_handler);
   DBUG_RETURN(handle_ordered_prev(buf));
 }
 
@@ -3001,8 +3007,8 @@ int Partition_helper::partition_scan_set_up(uchar * buf, bool idx_read_flag)
       m_part_spec.start_part= start_part;
     m_ordered_scan_ongoing= m_ordered;
   }
-  DBUG_ASSERT(m_part_spec.start_part < m_tot_parts);
-  DBUG_ASSERT(m_part_spec.end_part < m_tot_parts);
+  assert(m_part_spec.start_part < m_tot_parts);
+  assert(m_part_spec.end_part < m_tot_parts);
   DBUG_RETURN(0);
 }
 
@@ -3035,7 +3041,7 @@ int Partition_helper::handle_unordered_next(uchar *buf, bool is_next_same)
   if (m_part_spec.start_part >= m_tot_parts)
   {
     /* Should only happen with SQL HANDLER! */
-    DBUG_ASSERT(m_table->open_by_handler);
+    assert(m_table->open_by_handler);
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
 
@@ -3051,9 +3057,9 @@ int Partition_helper::handle_unordered_next(uchar *buf, bool is_next_same)
                                    m_start_key.key,
                                    m_start_key.length);
   }
-  else if ((m_index_scan_type == PARTITION_READ_RANGE))
+  else if (m_index_scan_type == PARTITION_READ_RANGE)
   {
-    DBUG_ASSERT(buf == m_table->record[0]);
+    assert(buf == m_table->record[0]);
     error= read_range_next_in_part(m_part_spec.start_part, NULL);
   }
   else
@@ -3107,7 +3113,7 @@ int Partition_helper::handle_unordered_scan_next_partition(uchar * buf)
     m_part_spec.start_part= i;
     switch (m_index_scan_type) {
     case PARTITION_READ_RANGE:
-      DBUG_ASSERT(buf == m_table->record[0]);
+      assert(buf == m_table->record[0]);
       DBUG_PRINT("info", ("read_range_first on partition %d", i));
       error= read_range_first_in_part(i,
                                       NULL,
@@ -3130,7 +3136,7 @@ int Partition_helper::handle_unordered_scan_next_partition(uchar * buf)
       break;
     case PARTITION_INDEX_FIRST_UNORDERED:
       /* When is this ever used? */
-      DBUG_ASSERT(0);
+      assert(0);
       /*
         We perform a scan without sorting and this means that we
         should not use the index_first since not all handlers
@@ -3138,7 +3144,7 @@ int Partition_helper::handle_unordered_scan_next_partition(uchar * buf)
         order.
       */
       DBUG_PRINT("info", ("read_range_first on partition %d", i));
-      DBUG_ASSERT(buf == m_table->record[0]);
+      assert(buf == m_table->record[0]);
       error= read_range_first_in_part(i,
                                       NULL,
                                       0,
@@ -3147,7 +3153,7 @@ int Partition_helper::handle_unordered_scan_next_partition(uchar * buf)
                                       0);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
     }
     if (!error)
@@ -3207,7 +3213,7 @@ int Partition_helper::handle_ordered_index_scan(uchar *buf)
   uchar *part_rec_buf_ptr= m_ordered_rec_buffer;
   int saved_error= HA_ERR_END_OF_FILE;
   DBUG_ENTER("Partition_helper::handle_ordered_index_scan");
-  DBUG_ASSERT(part_rec_buf_ptr);
+  assert(part_rec_buf_ptr);
 
   if (m_key_not_found)
   {
@@ -3218,7 +3224,7 @@ int Partition_helper::handle_ordered_index_scan(uchar *buf)
   m_top_entry= NO_CURRENT_PART_ID;
   m_queue->clear();
   parts.reserve(m_queue->capacity());
-  DBUG_ASSERT(m_part_info->is_partition_used(m_part_spec.start_part));
+  assert(m_part_info->is_partition_used(m_part_spec.start_part));
 
   /*
     Position part_rec_buf_ptr to point to the first used partition >=
@@ -3240,7 +3246,7 @@ int Partition_helper::handle_ordered_index_scan(uchar *buf)
   {
     DBUG_PRINT("info", ("reading from part %u (scan_type: %u inx: %u)",
                         i, m_index_scan_type, m_handler->active_index));
-    DBUG_ASSERT(i == uint2korr(part_rec_buf_ptr));
+    assert(i == uint2korr(part_rec_buf_ptr));
     uchar *rec_buf_ptr= part_rec_buf_ptr + m_rec_offset;
     uchar *read_buf;
     int error;
@@ -3289,7 +3295,7 @@ int Partition_helper::handle_ordered_index_scan(uchar *buf)
       break;
     }
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       DBUG_RETURN(HA_ERR_END_OF_FILE);
     }
     DBUG_PRINT("info", ("error %d from partition %u", error, i));
@@ -3333,12 +3339,12 @@ int Partition_helper::handle_ordered_index_scan(uchar *buf)
     */
     m_queue->m_max_at_top= m_reverse_order;
     m_queue->m_keys= m_curr_key_info;
-    DBUG_ASSERT(m_queue->empty());
+    assert(m_queue->empty());
     /*
       If PK, we should not sort by rowid, since that is already done
       through the KEY setup.
     */
-    DBUG_ASSERT(!m_curr_key_info[1] || m_ref_usage == REF_NOT_USED);
+    assert(!m_curr_key_info[1] || m_ref_usage == REF_NOT_USED);
     m_queue->assign(parts);
     return_top_record(buf);
     m_table->status= 0;
@@ -3386,8 +3392,8 @@ int Partition_helper::handle_ordered_index_scan_key_not_found()
   uchar *part_buf= m_ordered_rec_buffer;
   uchar *curr_rec_buf= NULL;
   DBUG_ENTER("Partition_helper::handle_ordered_index_scan_key_not_found");
-  DBUG_ASSERT(m_key_not_found);
-  DBUG_ASSERT(part_buf);
+  assert(m_key_not_found);
+  assert(part_buf);
   /*
     Loop over all used partitions to get the correct offset
     into m_ordered_rec_buffer.
@@ -3415,7 +3421,7 @@ int Partition_helper::handle_ordered_index_scan_key_not_found()
       else
         error= index_next_in_part(i, read_buf);
       /* HA_ERR_KEY_NOT_FOUND is not allowed from index_next! */
-      DBUG_ASSERT(error != HA_ERR_KEY_NOT_FOUND);
+      assert(error != HA_ERR_KEY_NOT_FOUND);
       DBUG_PRINT("info", ("Filling from partition %u reverse %u error %d",
                          i, m_reverse_order, error));
       if (!error)
@@ -3437,7 +3443,7 @@ int Partition_helper::handle_ordered_index_scan_key_not_found()
     }
     part_buf+= m_rec_offset + m_rec_length;
   }
-  DBUG_ASSERT(curr_rec_buf);
+  assert(curr_rec_buf);
   bitmap_clear_all(&m_key_not_found_partitions);
   m_key_not_found= false;
 
@@ -3482,7 +3488,7 @@ int Partition_helper::handle_ordered_next(uchar *buf, bool is_next_same)
         call index_next and skip that row.
       - empty the priority queue and initialize it again with reverse ordering.
     */
-    DBUG_ASSERT(m_table->open_by_handler);
+    assert(m_table->open_by_handler);
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
 
@@ -3522,7 +3528,7 @@ int Partition_helper::handle_ordered_next(uchar *buf, bool is_next_same)
                       part_id, m_handler->active_index));
 
   /* Assert that buffer for fetch is not NULL */
-  DBUG_ASSERT(rec_buf);
+  assert(rec_buf);
 
   /* ICP relies on Item evaluation, which expects the row in record[0]. */
   if (m_handler->pushed_idx_cond)
@@ -3530,20 +3536,20 @@ int Partition_helper::handle_ordered_next(uchar *buf, bool is_next_same)
   else
     read_buf= rec_buf;
 
-
-  if (m_index_scan_type == PARTITION_READ_RANGE)
-  {
-    error= read_range_next_in_part(part_id,
-                                   read_buf == m_table->record[0]
-                                     ? NULL : read_buf);
-  }
-  else if (!is_next_same)
-    error= index_next_in_part(part_id, read_buf);
-  else
-    error= index_next_same_in_part(part_id,
+  if (is_next_same) {
+    error = index_next_same_in_part(part_id,
                                    read_buf,
                                    m_start_key.key,
                                    m_start_key.length);
+  } else if (m_index_scan_type == PARTITION_READ_RANGE) {
+    error = read_range_next_in_part(part_id,
+                                   read_buf == m_table->record[0]
+                                     ? NULL : read_buf);
+  }
+  else {
+    error = index_next_in_part(part_id, read_buf);
+  }
+
   if (error)
   {
     if (error == HA_ERR_END_OF_FILE)
@@ -3611,7 +3617,7 @@ int Partition_helper::handle_ordered_prev(uchar *buf)
   if (!m_reverse_order)
   {
     /* TODO: See comment in handle_ordered_next(). */
-    DBUG_ASSERT(m_table->open_by_handler);
+    assert(m_table->open_by_handler);
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
 
@@ -3628,7 +3634,7 @@ int Partition_helper::handle_ordered_prev(uchar *buf)
         which is not supported to have a subsequent call for PREV.
         I.e. HA_READ_KEY_EXACT is considered to not have reverse order!
       */
-      DBUG_ASSERT(0);
+      assert(0);
       /*
         If the queue top changed, i.e. one of the partitions that gave
         HA_ERR_KEY_NOT_FOUND in index_read_map found the next record,
@@ -3643,12 +3649,12 @@ int Partition_helper::handle_ordered_prev(uchar *buf)
   if (part_id >= m_tot_parts)
   {
     /* This should never happen, except for SQL HANDLER calls! */
-    DBUG_ASSERT(m_table->open_by_handler);
+    assert(m_table->open_by_handler);
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
 
   /* Assert that buffer for fetch is not NULL */
-  DBUG_ASSERT(rec_buf);
+  assert(rec_buf);
 
   /* ICP relies on Item evaluation, which expects the row in record[0]. */
   if (m_handler->pushed_idx_cond)
@@ -3712,11 +3718,11 @@ Partition_helper::get_dynamic_partition_info_low(ha_statistics *stat_info,
                                                  uint part_id)
 {
   ha_statistics *part_stat= &m_handler->stats;
-  DBUG_ASSERT(bitmap_is_set(&m_part_info->read_partitions, part_id));
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->read_partitions,
-                               &m_part_info->lock_partitions));
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->lock_partitions,
-                               &m_part_info->read_partitions));
+  assert(bitmap_is_set(&m_part_info->read_partitions, part_id));
+  assert(bitmap_is_subset(&m_part_info->read_partitions,
+                          &m_part_info->lock_partitions));
+  assert(bitmap_is_subset(&m_part_info->lock_partitions,
+                          &m_part_info->read_partitions));
   bitmap_clear_all(&m_part_info->read_partitions);
   bitmap_set_bit(&m_part_info->read_partitions, part_id);
   m_handler->info(HA_STATUS_TIME |
diff --git a/sql/partitioning/partition_handler.h b/sql/partitioning/partition_handler.h
index 781a257e076e..3ae907672fae 100644
--- a/sql/partitioning/partition_handler.h
+++ b/sql/partitioning/partition_handler.h
@@ -2,17 +2,23 @@
 #define PARTITION_HANDLER_INCLUDED
 
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -131,13 +137,13 @@ class Partition_share : public Handler_share
   /** lock mutex protecting auto increment value next_auto_inc_val. */
   inline void lock_auto_inc()
   {
-    DBUG_ASSERT(auto_inc_mutex);
+    assert(auto_inc_mutex);
     mysql_mutex_lock(auto_inc_mutex);
   }
   /** unlock mutex protecting auto increment value next_auto_inc_val. */
   inline void unlock_auto_inc()
   {
-    DBUG_ASSERT(auto_inc_mutex);
+    assert(auto_inc_mutex);
     mysql_mutex_unlock(auto_inc_mutex);
   }
   /**
@@ -272,8 +278,8 @@ class Partition_handler :public Sql_alloc
     {
       return HA_ERR_WRONG_COMMAND;
     }
-    DBUG_ASSERT(file->table_share->tmp_table != NO_TMP_TABLE ||
-                file->m_lock_type == F_WRLCK);
+    assert(file->table_share->tmp_table != NO_TMP_TABLE ||
+           file->m_lock_type == F_WRLCK);
     file->mark_trx_read_write();
     return truncate_partition_low();
   }
@@ -305,8 +311,8 @@ class Partition_handler :public Sql_alloc
       my_error(ER_ILLEGAL_HA, MYF(0), create_info->alias);
       return HA_ERR_WRONG_COMMAND;
     }
-    DBUG_ASSERT(file->table_share->tmp_table != NO_TMP_TABLE ||
-                file->m_lock_type != F_UNLCK);
+    assert(file->table_share->tmp_table != NO_TMP_TABLE ||
+           file->m_lock_type != F_UNLCK);
     file->mark_trx_read_write();
     return change_partitions_low(create_info, path, copied, deleted);
   }
@@ -322,6 +328,15 @@ class Partition_handler :public Sql_alloc
   virtual uint alter_flags(uint flags) const
   { return 0; }
 
+  /**
+    Get partition row type from SE
+    @param       part_id    Id of partition for which row type to be retrieved
+    @return      Partition row type.
+  */
+  virtual enum row_type get_partition_row_type(uint part_id) {
+    return ROW_TYPE_NOT_USED;
+  }
+
 private:
   /**
     Truncate partition.
@@ -440,7 +455,7 @@ class Partition_helper : public Sql_alloc
   */
   inline bool init_partitioning(MEM_ROOT *mem_root)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     m_key_not_found_partitions.bitmap= NULL;
 #endif
     return false;
@@ -701,7 +716,7 @@ class Partition_helper : public Sql_alloc
     /* lock already taken */
     if (m_auto_increment_safe_stmt_log_lock)
       return;
-    DBUG_ASSERT(!m_auto_increment_lock);
+    assert(!m_auto_increment_lock);
     if(m_table->s->tmp_table == NO_TMP_TABLE)
     {
       m_auto_increment_lock= true;
@@ -899,11 +914,11 @@ class Partition_helper : public Sql_alloc
   virtual void position_in_last_part(uchar *ref, const uchar *row) = 0;
   /* If ph_rnd_pos is used then this needs to be implemented! */
   virtual int rnd_pos_in_part(uint part_id, uchar *buf, uchar *pos)
-  { DBUG_ASSERT(0); return HA_ERR_WRONG_COMMAND; }
+  { assert(0); return HA_ERR_WRONG_COMMAND; }
   virtual int index_init_in_part(uint part, uint keynr, bool sorted)
-  { DBUG_ASSERT(0); return HA_ERR_WRONG_COMMAND; }
+  { assert(0); return HA_ERR_WRONG_COMMAND; }
   virtual int index_end_in_part(uint part)
-  { DBUG_ASSERT(0); return HA_ERR_WRONG_COMMAND; }
+  { assert(0); return HA_ERR_WRONG_COMMAND; }
   virtual int index_first_in_part(uint part, uchar *buf) = 0;
   virtual int index_last_in_part(uint part, uchar *buf) = 0;
   virtual int index_prev_in_part(uint part, uchar *buf) = 0;
@@ -968,7 +983,7 @@ class Partition_helper : public Sql_alloc
     @param part_id  Partition to checksum.
   */
   virtual ha_checksum checksum_in_part(uint part_id) const
-  { DBUG_ASSERT(0); return 0; }
+  { assert(0); return 0; }
   /**
     Copy a cached row.
 
diff --git a/sql/plistsort.c b/sql/plistsort.c
index c333aff857d5..67d460f92fd6 100644
--- a/sql/plistsort.c
+++ b/sql/plistsort.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/procedure.cc b/sql/procedure.cc
index df3f06b8bced..94e90f82f63c 100644
--- a/sql/procedure.cc
+++ b/sql/procedure.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/procedure.h b/sql/procedure.h
index bdf74c3426f4..527c40c0806f 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -1,16 +1,23 @@
 #ifndef PROCEDURE_INCLUDED
 #define PROCEDURE_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/protocol.h b/sql/protocol.h
index 33a29d9b46ea..6f39c1e4106c 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -1,16 +1,23 @@
 #ifndef PROTOCOL_INCLUDED
 #define PROTOCOL_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,11 +27,6 @@
 #include "my_decimal.h"                         /* my_decimal */
 
 #include "violite.h"                            /* SSL && enum_vio_type */
-#ifdef HAVE_OPENSSL
-#define SSL_handle SSL*
-#else
-#define SSL_handle void*
-#endif
 
 #ifdef __cplusplus
 class THD;
@@ -202,14 +204,6 @@ class Protocol {
   */
   virtual int shutdown(bool server_shutdown= false)= 0;
 
-  /**
-    Returns pointer to the SSL object/struct
-
-    @return
-      @retval SSL*    The SSL struct/object
-      @retval NULL    If HAVE_OPENSSL is not defined
-  */
-  virtual SSL_handle get_ssl()= 0;
   /**
     Returns the read/writing status
 
diff --git a/sql/protocol_callback.cc b/sql/protocol_callback.cc
index b19a167ebdd9..d591183f7d34 100644
--- a/sql/protocol_callback.cc
+++ b/sql/protocol_callback.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -410,15 +417,6 @@ bool Protocol_callback::connection_alive()
   return true;
 }
 
-/**
-  Returns SSL info. In case of Protocol_callback returns NULL, meaning
-  no SSL connection.
-*/
-SSL_handle Protocol_callback::get_ssl()
-{
-  return NULL;
-}
-
 /**
   Should return protocol's reading/writing status. Returns 0 (idle) as it this
   is the best guess that can be made as there is no callback for
diff --git a/sql/protocol_callback.h b/sql/protocol_callback.h
index 223a9bfa60fb..42763df67d4e 100644
--- a/sql/protocol_callback.h
+++ b/sql/protocol_callback.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -286,11 +293,6 @@ class Protocol_callback : public Protocol
   */
   virtual bool connection_alive();
 
-  /**
-    Returns SSL info
-  */
-  virtual SSL_handle get_ssl();
-
   /**
     Should return protocol's reading/writing status. Returns 0 (idle) as it
     this is the best guess that can be made as there is no callback for
diff --git a/sql/protocol_classic.cc b/sql/protocol_classic.cc
index 1f7985f21830..ca93ae7c7f73 100644
--- a/sql/protocol_classic.cc
+++ b/sql/protocol_classic.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -142,9 +149,9 @@ bool net_send_error(THD *thd, uint sql_errno, const char *err)
   bool error;
   DBUG_ENTER("net_send_error");
 
-  DBUG_ASSERT(!thd->sp_runtime_ctx);
-  DBUG_ASSERT(sql_errno);
-  DBUG_ASSERT(err);
+  assert(!thd->sp_runtime_ctx);
+  assert(sql_errno);
+  assert(err);
 
   DBUG_PRINT("enter",("sql_errno: %d  err: %s", sql_errno, err));
 
@@ -184,7 +191,7 @@ bool net_send_error(NET *net, uint sql_errno, const char *err)
 {
   DBUG_ENTER("net_send_error");
 
-  DBUG_ASSERT(sql_errno && err);
+  assert(sql_errno && err);
 
   DBUG_PRINT("enter",("sql_errno: %d  err: %s", sql_errno, err));
 
@@ -617,7 +624,7 @@ void Protocol_classic::init(THD *thd_arg)
   m_thd= thd_arg;
   packet= &m_thd->packet;
   convert= &m_thd->convert_buffer;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   field_types= 0;
 #endif
 }
@@ -688,9 +695,13 @@ bool Protocol_classic::send_error(uint sql_errno, const char *err_msg,
 }
 
 
-void Protocol_classic::set_read_timeout(ulong read_timeout)
+void Protocol_classic::set_read_timeout(ulong read_timeout,
+                                        my_bool on_full_packet)
 {
   my_net_set_read_timeout(&m_thd->net, read_timeout);
+  NET_SERVER* ext = static_cast<NET_SERVER*>(m_thd->net.extension);
+  assert(ext);
+  ext->timeout_on_full_packet = on_full_packet;
 }
 
 
@@ -713,7 +724,7 @@ void Protocol_classic::claim_memory_ownership()
 
 void Protocol_classic::end_net()
 {
-  DBUG_ASSERT(m_thd->net.buff);
+  assert(m_thd->net.buff);
   net_end(&m_thd->net);
   m_thd->net.vio= NULL;
 }
@@ -808,7 +819,7 @@ int Protocol_classic::read_packet()
   if ((packet_length= my_net_read(&m_thd->net)) &&
       packet_length != packet_error)
   {
-    DBUG_ASSERT(!m_thd->net.error);
+    assert(!m_thd->net.error);
     bad_packet= false;
     raw_packet= m_thd->net.read_pos;
     return 0;
@@ -987,7 +998,7 @@ int Protocol_classic::get_command(COM_DATA *com_data, enum_server_command *cmd)
   if (*cmd >= COM_END)
     *cmd= COM_END;				// Wrong command
 
-  DBUG_ASSERT(packet_length);
+  assert(packet_length);
   // Skip 'command'
   packet_length--;
   raw_packet++;
@@ -1050,7 +1061,7 @@ Protocol_classic::start_result_metadata(uint num_cols, uint flags,
     uchar *pos = net_store_length((uchar *) &tmp, num_cols);
     my_net_write(&m_thd->net, (uchar *) &tmp, (size_t) (pos - ((uchar *) &tmp)));
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   field_types= (enum_field_types*) m_thd->alloc(sizeof(field_types) * num_cols);
   count= 0;
 #endif
@@ -1180,7 +1191,7 @@ bool Protocol_classic::send_field_metadata(Send_field *field,
   }
   packet->length((uint) (pos - packet->ptr()));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // TODO: this should be protocol-dependent, as it records incorrect type
   // for binary protocol
   // Text protocol sends fields as varchar
@@ -1241,7 +1252,7 @@ bool Protocol_classic::connection_alive()
 
 void Protocol_text::start_row()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   field_pos= 0;
 #endif
   packet->length(0);
@@ -1250,7 +1261,7 @@ void Protocol_text::start_row()
 
 bool Protocol_text::store_null()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   field_pos++;
 #endif
   char buff[1];
@@ -1282,16 +1293,6 @@ bool Protocol_classic::store_string_aux(const char *from, size_t length,
 }
 
 
-SSL_handle Protocol_classic::get_ssl()
-{
-  return
-#ifdef HAVE_OPENSSL
-    m_thd->net.vio ? (SSL *) m_thd->net.vio->ssl_arg :
-#endif
-      NULL;
-}
-
-
 int Protocol_classic::shutdown(bool server_shutdown)
 {
   return m_thd->net.vio ? vio_shutdown(m_thd->net.vio) : 0;
@@ -1302,16 +1303,16 @@ bool Protocol_text::store(const char *from, size_t length,
                           const CHARSET_INFO *fromcs,
                           const CHARSET_INFO *tocs)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
-      field_types[field_pos] == MYSQL_TYPE_BIT ||
-      field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
-      field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
-      field_types[field_pos] == MYSQL_TYPE_JSON ||
-      (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
-           field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
+         field_types[field_pos] == MYSQL_TYPE_BIT ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
+         field_types[field_pos] == MYSQL_TYPE_JSON ||
+         (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
+          field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
   if(!send_metadata) field_pos++;
 #endif
   return store_string_aux(from, length, fromcs, tocs);
@@ -1320,10 +1321,10 @@ bool Protocol_text::store(const char *from, size_t length,
 
 bool Protocol_text::store_tiny(longlong from)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-              field_types[field_pos] == MYSQL_TYPE_TINY);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_TINY);
   field_pos++;
 #endif
   char buff[20];
@@ -1334,11 +1335,11 @@ bool Protocol_text::store_tiny(longlong from)
 
 bool Protocol_text::store_short(longlong from)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_YEAR ||
-    field_types[field_pos] == MYSQL_TYPE_SHORT);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_YEAR ||
+         field_types[field_pos] == MYSQL_TYPE_SHORT);
   field_pos++;
 #endif
   char buff[20];
@@ -1349,11 +1350,11 @@ bool Protocol_text::store_short(longlong from)
 
 bool Protocol_text::store_long(longlong from)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_INT24 ||
-    field_types[field_pos] == MYSQL_TYPE_LONG);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_INT24 ||
+         field_types[field_pos] == MYSQL_TYPE_LONG);
   field_pos++;
 #endif
   char buff[20];
@@ -1365,10 +1366,10 @@ bool Protocol_text::store_long(longlong from)
 
 bool Protocol_text::store_longlong(longlong from, bool unsigned_flag)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_LONGLONG);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_LONGLONG);
   field_pos++;
 #endif
   char buff[22];
@@ -1381,10 +1382,10 @@ bool Protocol_text::store_longlong(longlong from, bool unsigned_flag)
 
 bool Protocol_text::store_decimal(const my_decimal *d, uint prec, uint dec)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL);
   field_pos++;
 #endif
   char buff[DECIMAL_MAX_STR_LENGTH + 1];
@@ -1396,10 +1397,10 @@ bool Protocol_text::store_decimal(const my_decimal *d, uint prec, uint dec)
 
 bool Protocol_text::store(float from, uint32 decimals, String *buffer)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_FLOAT);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_FLOAT);
   field_pos++;
 #endif
   buffer->set_real((double) from, decimals, m_thd->charset());
@@ -1409,10 +1410,10 @@ bool Protocol_text::store(float from, uint32 decimals, String *buffer)
 
 bool Protocol_text::store(double from, uint32 decimals, String *buffer)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_DOUBLE);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DOUBLE);
   field_pos++;
 #endif
   buffer->set_real(from, decimals, m_thd->charset());
@@ -1434,10 +1435,10 @@ bool Protocol_text::store(Proto_field *field)
 
 bool Protocol_text::store(MYSQL_TIME *tm, uint decimals)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    is_temporal_type_with_date_and_time(field_types[field_pos]));
+  assert(send_metadata || field_types == 0 ||
+         is_temporal_type_with_date_and_time(field_types[field_pos]));
   field_pos++;
 #endif
   char buff[MAX_DATE_STRING_REP_LENGTH];
@@ -1448,10 +1449,10 @@ bool Protocol_text::store(MYSQL_TIME *tm, uint decimals)
 
 bool Protocol_text::store_date(MYSQL_TIME *tm)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_DATE);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DATE);
   field_pos++;
 #endif
   char buff[MAX_DATE_STRING_REP_LENGTH];
@@ -1462,10 +1463,10 @@ bool Protocol_text::store_date(MYSQL_TIME *tm)
 
 bool Protocol_text::store_time(MYSQL_TIME *tm, uint decimals)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(send_metadata || field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_TIME);
+  assert(send_metadata || field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_TIME);
   field_pos++;
 #endif
   char buff[MAX_DATE_STRING_REP_LENGTH];
@@ -1486,7 +1487,7 @@ bool Protocol_text::store_time(MYSQL_TIME *tm, uint decimals)
 
 bool Protocol_text::send_out_parameters(List<Item_param> *sp_params)
 {
-  DBUG_ASSERT(sp_params->elements == m_thd->lex->prepared_stmt_params.elements);
+  assert(sp_params->elements == m_thd->lex->prepared_stmt_params.elements);
 
   List_iterator_fast<Item_param> item_param_it(*sp_params);
   List_iterator_fast<LEX_STRING> user_var_name_it(
@@ -1568,16 +1569,16 @@ bool Protocol_binary::store(const char *from, size_t length,
 {
   if(send_metadata)
     return Protocol_text::store(from, length, fromcs, tocs);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
-    field_types[field_pos] == MYSQL_TYPE_BIT ||
-    field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
-    field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
-    field_types[field_pos] == MYSQL_TYPE_JSON ||
-    (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
-      field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
+         field_types[field_pos] == MYSQL_TYPE_BIT ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
+         field_types[field_pos] == MYSQL_TYPE_JSON ||
+         (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
+          field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
 #endif
   field_pos++;
   return store_string_aux(from, length, fromcs, tocs);
@@ -1602,11 +1603,11 @@ bool Protocol_binary::store_tiny(longlong from)
   if(send_metadata)
     return Protocol_text::store_tiny(from);
   char buff[1];
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_TINY ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_TINY ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   buff[0]= (uchar) from;
@@ -1618,12 +1619,12 @@ bool Protocol_binary::store_short(longlong from)
 {
   if(send_metadata)
     return Protocol_text::store_short(from);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_YEAR ||
-    field_types[field_pos] == MYSQL_TYPE_SHORT ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_YEAR ||
+         field_types[field_pos] == MYSQL_TYPE_SHORT ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   char *to= packet->prep_append(2, PACKET_BUFFER_EXTRA_ALLOC);
@@ -1638,12 +1639,12 @@ bool Protocol_binary::store_long(longlong from)
 {
   if(send_metadata)
     return Protocol_text::store_long(from);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_INT24 ||
-    field_types[field_pos] == MYSQL_TYPE_LONG ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_INT24 ||
+         field_types[field_pos] == MYSQL_TYPE_LONG ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   char *to= packet->prep_append(4, PACKET_BUFFER_EXTRA_ALLOC);
@@ -1658,11 +1659,11 @@ bool Protocol_binary::store_longlong(longlong from, bool unsigned_flag)
 {
   if(send_metadata)
     return Protocol_text::store_longlong(from, unsigned_flag);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_LONGLONG ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_LONGLONG ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   char *to= packet->prep_append(8, PACKET_BUFFER_EXTRA_ALLOC);
@@ -1677,11 +1678,11 @@ bool Protocol_binary::store_decimal(const my_decimal *d, uint prec, uint dec)
 {
   if(send_metadata)
     return Protocol_text::store_decimal(d, prec, dec);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
   // store() will increment the field_pos counter
 #endif
   char buff[DECIMAL_MAX_STR_LENGTH + 1];
@@ -1695,11 +1696,11 @@ bool Protocol_binary::store(float from, uint32 decimals, String *buffer)
 {
   if(send_metadata)
     return Protocol_text::store(from, decimals, buffer);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_FLOAT ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_FLOAT ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   char *to= packet->prep_append(4, PACKET_BUFFER_EXTRA_ALLOC);
@@ -1714,11 +1715,11 @@ bool Protocol_binary::store(double from, uint32 decimals, String *buffer)
 {
   if(send_metadata)
     return Protocol_text::store(from, decimals, buffer);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0
-    || field_types[field_pos] == MYSQL_TYPE_DOUBLE ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0
+         || field_types[field_pos] == MYSQL_TYPE_DOUBLE ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   char *to= packet->prep_append(8, PACKET_BUFFER_EXTRA_ALLOC);
@@ -1742,12 +1743,12 @@ bool Protocol_binary::store(MYSQL_TIME *tm, uint precision)
   if(send_metadata)
     return Protocol_text::store(tm, precision);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_DATE ||
-    is_temporal_type_with_date_and_time(field_types[field_pos]) ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DATE ||
+         is_temporal_type_with_date_and_time(field_types[field_pos]) ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   char buff[12],*pos;
   size_t length;
@@ -1778,11 +1779,11 @@ bool Protocol_binary::store_date(MYSQL_TIME *tm)
 {
   if(send_metadata)
     return Protocol_text::store_date(tm);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_DATE ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_DATE ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   tm->hour= tm->minute= tm->second=0;
   tm->second_part= 0;
@@ -1796,11 +1797,11 @@ bool Protocol_binary::store_time(MYSQL_TIME *tm, uint precision)
     return Protocol_text::store_time(tm, precision);
   char buff[13], *pos;
   size_t length;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // field_types check is needed because of the embedded protocol
-  DBUG_ASSERT(field_types == 0 ||
-    field_types[field_pos] == MYSQL_TYPE_TIME ||
-    field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
+  assert(field_types == 0 ||
+         field_types[field_pos] == MYSQL_TYPE_TIME ||
+         field_types[field_pos] == MYSQL_TYPE_VAR_STRING);
 #endif
   field_pos++;
   pos= buff+1;
diff --git a/sql/protocol_classic.h b/sql/protocol_classic.h
index c20b3815c1ff..90a188401ff5 100644
--- a/sql/protocol_classic.h
+++ b/sql/protocol_classic.h
@@ -1,16 +1,23 @@
 #ifndef PROTOCOL_CLASSIC_INCLUDED
 #define PROTOCOL_CLASSIC_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,7 +41,7 @@ class Protocol_classic : public Protocol
   String *convert;
   uint field_pos;
   bool send_metadata;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   enum enum_field_types *field_types;
   uint count;
 #endif
@@ -152,8 +159,6 @@ class Protocol_classic : public Protocol
   char *get_last_error();
   /* Set max allowed packet size */
   void set_max_packet_size(ulong max_packet_size);
-  /* Return SSL descriptor, if any */
-  SSL_handle get_ssl();
   /* Deinitialize VIO */
   virtual int shutdown(bool server_shutdown= false);
   /* Wipe NET with zeros */
@@ -197,11 +202,12 @@ class Protocol_classic : public Protocol
   /* Return packet string */
   String *get_packet();
   /* return packet length */
-  uint get_packet_length() { return packet_length; }
+  ulong get_packet_length() { return packet_length; }
   /* Return raw packet buffer */
   uchar *get_raw_packet() { return raw_packet; }
   /* Set read timeout */
-  virtual void set_read_timeout(ulong read_timeout);
+  virtual void set_read_timeout(ulong read_timeout,
+                                my_bool on_full_packet = FALSE);
   /* Set write timeout */
   virtual void set_write_timeout(ulong write_timeout);
 };
diff --git a/sql/query_options.h b/sql/query_options.h
index 5032a26ebf58..1896eab96aa7 100644
--- a/sql/query_options.h
+++ b/sql/query_options.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -70,6 +77,7 @@
 
 /* The following is used to detect a conflict with DISTINCT */
 #define SELECT_ALL              (1ULL << 24)    // SELECT, user, parser
+#define SELECT_NO_SEMI_JOIN     (1ULL << 25)    // SELECT, intern
 /** The following can be set when importing tables in a 'wrong order'
    to suppress foreign key checks */
 #define OPTION_NO_FOREIGN_KEY_CHECKS    (1ULL << 26) // THD, user, binlog
diff --git a/sql/records.cc b/sql/records.cc
index 34e499808d8a..213dfd5b9c21 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -66,7 +73,7 @@ bool init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
 {
   int error;
   empty_record(table);
-  memset(info, 0, sizeof(*info));
+  new (info) READ_RECORD;
   info->thd= thd;
   info->table= table;
   info->record= table->record[0];
@@ -187,11 +194,11 @@ bool init_read_record(READ_RECORD *info,THD *thd,
   DBUG_ENTER("init_read_record");
 
   // If only 'table' is given, assume no quick, no condition.
-  DBUG_ASSERT(!(table && qep_tab));
+  assert(!(table && qep_tab));
   if (!table)
     table= qep_tab->table();
 
-  memset(info, 0, sizeof(*info));
+  new (info) READ_RECORD;
   info->thd=thd;
   info->table=table;
   info->forms= &info->table;		/* Only one table */
@@ -291,7 +298,7 @@ bool init_read_record(READ_RECORD *info,THD *thd,
     if (table->sort.using_addon_fields())
     {
       DBUG_PRINT("info",("using rr_unpack_from_buffer"));
-      DBUG_ASSERT(table->sort.sorted_result_in_fsbuf);
+      assert(table->sort.sorted_result_in_fsbuf);
       info->unpack_counter= 0;
       if (table->sort.addon_fields->using_packed_addons())
         info->read_record= rr_unpack_from_buffer<true>;
@@ -587,7 +594,7 @@ template<bool Packed_addon_fields>
 static int rr_unpack_from_tempfile(READ_RECORD *info)
 {
   uchar *destination= info->rec_buf;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   my_off_t where= my_b_tell(info->io_cache);
 #endif
   if (Packed_addon_fields)
@@ -601,8 +608,8 @@ static int rr_unpack_from_tempfile(READ_RECORD *info)
     DBUG_PRINT("info", ("rr_unpack from %llu to %p sz %u",
                         static_cast<ulonglong>(where),
                         destination, res_length));
-    DBUG_ASSERT(res_length > len_sz);
-    DBUG_ASSERT(info->table->sort.using_addon_fields());
+    assert(res_length > len_sz);
+    assert(info->table->sort.using_addon_fields());
 
     // Then read the rest of the record.
     if (my_b_read(info->io_cache, destination + len_sz, res_length - len_sz))
@@ -718,7 +725,7 @@ static int init_rr_cache(THD *thd, READ_RECORD *info)
 static int rr_cmp(const void *p_ref_length, const void *a, const void *b)
 {
   size_t ref_length= *(static_cast<size_t*>(const_cast<void*>(p_ref_length)));
-  DBUG_ASSERT(ref_length <= MAX_REFLENGTH);
+  assert(ref_length <= MAX_REFLENGTH);
   return memcmp(a, b, ref_length);
 }
 
diff --git a/sql/records.h b/sql/records.h
index b4612539b822..08ec0384acb9 100644
--- a/sql/records.h
+++ b/sql/records.h
@@ -1,15 +1,22 @@
 #ifndef SQL_RECORDS_H
 #define SQL_RECORDS_H 
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -71,7 +78,7 @@ struct READ_RECORD
   bool print_error, ignore_not_found_rows;
 
 public:
-  READ_RECORD() {}
+  READ_RECORD() { memset(this, 0, sizeof(*this)); }
 };
 
 bool init_read_record(READ_RECORD *info, THD *thd,
diff --git a/sql/replication.h b/sql/replication.h
index ff1c0b0ee594..04b1928447f1 100644
--- a/sql/replication.h
+++ b/sql/replication.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -19,7 +26,8 @@
 #include "my_global.h"
 #include "my_thread_local.h"          // my_thread_id
 #include "mysql/psi/mysql_thread.h"   // mysql_mutex_t
-#include "handler.h"                  // enum_tx_isolation
+#include "handler.h"  // enum_tx_isolation
+#include "rpl_context.h"  // enum_rpl_channel_type
 
 typedef struct st_mysql MYSQL;
 typedef struct st_io_cache IO_CACHE;
@@ -100,6 +108,7 @@ typedef struct Trans_context_info {
   ulong parallel_applier_workers;
   bool parallel_applier_preserve_commit_order;
   enum_tx_isolation tx_isolation;  // enum values in enum_tx_isolation
+  uint lower_case_table_names;
 } Trans_context_info;
 
 /**
@@ -154,6 +163,8 @@ typedef struct Trans_param {
    */
   Trans_context_info trans_ctx_info;
 
+  /** Replication channel info associated to this transaction/THD */
+  enum_rpl_channel_type rpl_channel_type;
 } Trans_param;
 
 /**
diff --git a/sql/rpl_binlog_sender.cc b/sql/rpl_binlog_sender.cc
index 3b469a159ffa..e61f7f824150 100644
--- a/sql/rpl_binlog_sender.cc
+++ b/sql/rpl_binlog_sender.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -28,7 +35,7 @@
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   static uint binlog_dump_count= 0;
 #endif
 using binary_log::checksum_crc32;
@@ -39,6 +46,132 @@ const ushort Binlog_sender::PACKET_SHRINK_COUNTER_THRESHOLD= 100;
 const float Binlog_sender::PACKET_GROW_FACTOR= 2.0;
 const float Binlog_sender::PACKET_SHRINK_FACTOR= 0.5;
 
+/**
+  @class Observe_transmission_guard
+
+  Sentry class to guard the transitions for `Delegate::m_observe_transmission`
+  flag within given contexts.
+
+ */
+class Observe_transmission_guard
+{
+ public:
+  /**
+    Constructor for the class. It will change the value of the `flag` parameter
+    according with the `event_type` and `event_ptr` content. The `flag` will be
+    set to `true` as follows:
+
+    - The event is an `XID_EVENT`
+    - The event is an `XA_PREPARE_LOG_EVENT`.
+    - The event is a `QUERY_EVENT` with query equal to "XA COMMIT" or "XA ABORT"
+      or "COMMIT".
+    - The event is the first `QUERY_EVENT` after a `GTID_EVENT` and the query is
+      not "BEGIN" --the statement is a DDL, for instance.
+
+    @param flag            The flag variable to guard
+    @param event_type      The type of the event being processed
+    @param event_ptr       The raw content of the event being processed
+    @param event_len       The size of the raw content of the event being
+                           processed
+    @param checksum_alg    The checksum algorithm being used currently
+    @param prev_event_type The type of the event processed just before the
+                           current one
+   */
+  Observe_transmission_guard(bool &flag, binary_log::Log_event_type event_type,
+                             const char *event_ptr, uint32 event_len,
+                             binary_log::enum_binlog_checksum_alg checksum_alg,
+                             binary_log::Log_event_type prev_event_type)
+      : m_saved(flag), m_to_set(flag)
+  {
+    if (my_atomic_load32(&opt_atomic_replication_sender_observe_commit_only))
+    {
+      switch (event_type)
+      {
+        case binary_log::XID_EVENT:
+        case binary_log::XA_PREPARE_LOG_EVENT:
+        {
+          m_to_set= true;
+          break;
+        }
+        case binary_log::QUERY_EVENT:
+        {
+          bool first_event_after_gtid=
+              prev_event_type == binary_log::ANONYMOUS_GTID_LOG_EVENT ||
+              prev_event_type == binary_log::GTID_LOG_EVENT;
+
+          Format_description_log_event fd_ev(BINLOG_VERSION);
+          fd_ev.common_footer->checksum_alg= checksum_alg;
+          Query_log_event ev(event_ptr, event_len, &fd_ev,
+                             binary_log::QUERY_EVENT);
+          if (first_event_after_gtid)
+            m_to_set= (strcmp("BEGIN", ev.query) != 0);
+          else
+            m_to_set= (strncmp("XA COMMIT", ev.query, 9) == 0) ||
+                      (strncmp("XA ABORT", ev.query, 8) == 0) ||
+                      (strncmp("COMMIT", ev.query, 6) == 0);
+          break;
+        }
+        default:
+        {
+          m_to_set= false;
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+    Destructor for the sentry class. It will instantiate the guarded flag with
+    the value prior to the creation of this object.
+  */
+  ~Observe_transmission_guard() { m_to_set= m_saved; }
+
+ private:
+  /** The value of the guarded flag upon this object creation */
+  bool m_saved;
+  /** The flag variable to guard */
+  bool &m_to_set;
+};
+
+/**
+  @class Sender_context_guard
+
+  Sentry class that guards the Binlog_sender context and, at destruction, will
+  prepare it for the next event to be processed.
+ */
+class Sender_context_guard
+{
+ public:
+  /**
+    Class constructor that simply stores, internally, the reference for the
+    `Binlog_sender` to be guarded and the values to be set upon destruction.
+
+    @param target     The `Binlog_sender` object to be guarded.
+    @param event_type The currently processed event type, to be used for context
+                      of the next event processing round.
+   */
+  Sender_context_guard(Binlog_sender &target,
+                       binary_log::Log_event_type event_type)
+      : m_target(target), m_event_type(event_type)
+  {
+  }
+
+  /**
+    Class destructor that will set the proper context of the guarded
+    `Binlog_sender` object.
+   */
+  virtual ~Sender_context_guard()
+  {
+    m_target.set_prev_event_type(m_event_type);
+  }
+
+ private:
+  /** The object to be guarded */
+  Binlog_sender &m_target;
+  /** The currently being processed event type */
+  binary_log::Log_event_type m_event_type;
+};
+
 Binlog_sender::Binlog_sender(THD *thd, const char *start_file,
                              my_off_t start_pos,
                              Gtid_set *exclude_gtids, uint32 flag)
@@ -52,7 +185,8 @@ Binlog_sender::Binlog_sender(THD *thd, const char *start_file,
     m_diag_area(false),
     m_errmsg(NULL), m_errno(0), m_last_file(NULL), m_last_pos(0),
     m_half_buffer_size_req_counter(0), m_new_shrink_size(PACKET_MIN_SIZE),
-    m_flag(flag), m_observe_transmission(false), m_transmit_started(false)
+    m_flag(flag), m_observe_transmission(false), m_transmit_started(false),
+    m_prev_event_type(binary_log::UNKNOWN_EVENT)
   {}
 
 void Binlog_sender::init()
@@ -156,7 +290,7 @@ void Binlog_sender::init()
   /* Binary event can be vary large. So set it to max allowed packet. */
   thd->variables.max_allowed_packet= MAX_MAX_ALLOWED_PACKET;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (opt_sporadic_binlog_dump_fail && (binlog_dump_count++ % 2))
     set_unknow_error("Master fails in COM_BINLOG_DUMP because of "
                      "--sporadic-binlog-dump-fail");
@@ -235,8 +369,8 @@ void Binlog_sender::run()
 		    const char act[]= "now "
 		    "signal dump_thread_reached_wait_point "
 		    "wait_for continue_dump_thread no_clear_event";
-		    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-						       STRING_WITH_LEN(act)));
+		    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
 		    };);
     mysql_bin_log.lock_index();
     if (!mysql_bin_log.is_open())
@@ -258,8 +392,8 @@ void Binlog_sender::run()
       DBUG_EXECUTE_IF("waiting_for_disable_binlog",
 		      {
 		      const char act[]= "now signal consumed_binlog";
-		      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-							 STRING_WITH_LEN(act)));
+		      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
 		      };);
       if (is_index_file_reopened_on_binlog_disable)
         mysql_bin_log.close(LOG_CLOSE_INDEX, true/*need_lock_log=true*/,
@@ -354,8 +488,8 @@ my_off_t Binlog_sender::send_binlog(IO_CACHE *log_cache, my_off_t start_pos)
     DBUG_EXECUTE_IF("wait_after_binlog_EOF",
                     {
                       const char act[]= "now wait_for signal.rotate_finished no_clear_event";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     };);
   }
   return 1;
@@ -426,6 +560,13 @@ int Binlog_sender::send_events(IO_CACHE *log_cache, my_off_t end_pos)
     if (unlikely(check_event_type(event_type, log_file, log_pos)))
       DBUG_RETURN(1);
 
+    Sender_context_guard ctx_guard(*this, event_type);
+    Observe_transmission_guard obs_guard(m_observe_transmission, event_type,
+                                         const_cast<const char*>(
+                                            reinterpret_cast<char*>(event_ptr)),
+                                         event_len, m_event_checksum_alg,
+                                         m_prev_event_type);
+
     DBUG_EXECUTE_IF("dump_thread_wait_before_send_xid",
                     {
                       if (event_type == binary_log::XID_EVENT)
@@ -434,8 +575,8 @@ int Binlog_sender::send_events(IO_CACHE *log_cache, my_off_t end_pos)
                         const char act[]=
                           "now "
                           "wait_for signal.continue";
-                        DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                        DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
+                        assert(opt_debug_sync_timeout > 0);
+                        assert(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
                       }
                     });
 
@@ -460,7 +601,7 @@ int Binlog_sender::send_events(IO_CACHE *log_cache, my_off_t end_pos)
                       my_sleep(2000000);
                       });
       time_t now= time(0);
-      DBUG_ASSERT(now >= m_last_event_sent_ts);
+      assert(now >= m_last_event_sent_ts);
       bool time_for_hb_event= ((ulonglong)(now - m_last_event_sent_ts)
                           >= (ulonglong)(m_heartbeat_period/1000000000UL));
       if (time_for_hb_event)
@@ -639,7 +780,7 @@ int Binlog_sender::wait_new_events(my_off_t log_pos)
 
 inline int Binlog_sender::wait_with_heartbeat(my_off_t log_pos)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ulong hb_info_counter= 0;
 #endif
   struct timespec ts;
@@ -652,7 +793,7 @@ inline int Binlog_sender::wait_with_heartbeat(my_off_t log_pos)
     if (ret != ETIMEDOUT && ret != ETIME)
       break;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (hb_info_counter < 3)
       {
         sql_print_information("master sends heartbeat message");
@@ -695,7 +836,7 @@ int Binlog_sender::check_start_file()
   char *name_ptr= NULL;
   File file;
   IO_CACHE cache;
-  const char *errmsg;
+  std::string errmsg;
   my_off_t size;
 
   if (m_start_file[0] != '\0')
@@ -720,7 +861,7 @@ int Binlog_sender::check_start_file()
       and Slave.
     */
     Sid_map* slave_sid_map= m_exclude_gtid->get_sid_map();
-    DBUG_ASSERT(slave_sid_map);
+    assert(slave_sid_map);
     global_sid_lock->wrlock();
     const rpl_sid &server_sid= gtid_state->get_server_sid();
     rpl_sidno subset_sidno= slave_sid_map->sid_to_sidno(server_sid);
@@ -731,7 +872,7 @@ int Binlog_sender::check_start_file()
     if (gtid_executed_and_owned.add_gtid_set(gtid_state->get_executed_gtids())
         != RETURN_STATUS_OK)
     {
-      DBUG_ASSERT(0);
+      assert(0);
     }
     gtid_state->get_owned_gtids()->get_gtids(gtid_executed_and_owned);
 
@@ -739,9 +880,8 @@ int Binlog_sender::check_start_file()
                                            gtid_state->get_server_sidno(),
                                            subset_sidno))
     {
-      errmsg= ER(ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER);
       global_sid_lock->unlock();
-      set_fatal_error(errmsg);
+      set_fatal_error(ER(ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER));
       return 1;
     }
     /*
@@ -772,9 +912,9 @@ int Binlog_sender::check_start_file()
     */
     if (!gtid_state->get_lost_gtids()->is_subset(m_exclude_gtid))
     {
-      errmsg= ER(ER_MASTER_HAS_PURGED_REQUIRED_GTIDS);
+      mysql_bin_log.report_missing_purged_gtids(m_exclude_gtid, errmsg);
       global_sid_lock->unlock();
-      set_fatal_error(errmsg);
+      set_fatal_error(errmsg.c_str());
       return 1;
     }
     global_sid_lock->unlock();
@@ -782,9 +922,9 @@ int Binlog_sender::check_start_file()
     if (mysql_bin_log.find_first_log_not_in_gtid_set(index_entry_name,
                                                      m_exclude_gtid,
                                                      &first_gtid,
-                                                     &errmsg))
+                                                     errmsg))
     {
-      set_fatal_error(errmsg);
+      set_fatal_error(errmsg.c_str());
       return 1;
     }
     name_ptr= index_entry_name;
@@ -824,9 +964,10 @@ int Binlog_sender::check_start_file()
     return 1;
   }
 
-  if ((file= open_binlog_file(&cache, m_linfo.log_file_name, &errmsg)) < 0)
+  const char *bl_errmsg= NULL;
+  if ((file= open_binlog_file(&cache, m_linfo.log_file_name, &bl_errmsg)) < 0)
   {
-    set_fatal_error(errmsg);
+    set_fatal_error(bl_errmsg);
     return 1;
   }
 
@@ -859,11 +1000,11 @@ void Binlog_sender::init_checksum_alg()
 
   entry= (user_var_entry*) my_hash_search(&m_thd->user_vars,
                                           (uchar*) name.str, name.length);
-  if (entry)
+  if (entry && entry->ptr())
   {
     m_slave_checksum_alg=
       static_cast<enum_binlog_checksum_alg>(find_type((char*) entry->ptr(), &binlog_checksum_typelib, 1) - 1);
-    DBUG_ASSERT(m_slave_checksum_alg < binary_log::BINLOG_CHECKSUM_ALG_ENUM_END);
+    assert(m_slave_checksum_alg < binary_log::BINLOG_CHECKSUM_ALG_ENUM_END);
   }
 
   mysql_mutex_unlock(&m_thd->LOCK_thd_data);
@@ -927,7 +1068,7 @@ inline int Binlog_sender::reset_transmit_packet(ushort flags, size_t event_len)
   DBUG_ENTER("Binlog_sender::reset_transmit_packet");
   DBUG_PRINT("info", ("event_len: %zu, m_packet->alloced_length: %zu",
                       event_len, m_packet.alloced_length()));
-  DBUG_ASSERT(m_packet.alloced_length() >= PACKET_MIN_SIZE);
+  assert(m_packet.alloced_length() >= PACKET_MIN_SIZE);
 
   m_packet.length(0);  // size of the content
   m_packet.qs_append('\0'); // Set this as an OK packet
@@ -971,12 +1112,12 @@ int Binlog_sender::send_format_description_event(IO_CACHE *log_cache,
     DBUG_RETURN(1);
   }
 
-  DBUG_ASSERT(event_ptr[LOG_POS_OFFSET] > 0);
+  assert(event_ptr[LOG_POS_OFFSET] > 0);
   m_event_checksum_alg=
     Log_event_footer::get_checksum_alg((const char *)event_ptr, event_len);
 
-  DBUG_ASSERT(m_event_checksum_alg < binary_log::BINLOG_CHECKSUM_ALG_ENUM_END ||
-              m_event_checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(m_event_checksum_alg < binary_log::BINLOG_CHECKSUM_ALG_ENUM_END ||
+         m_event_checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
 
   /* Slave does not support checksum, but binary events include checksum */
   if (m_slave_checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF &&
@@ -1081,7 +1222,7 @@ inline int Binlog_sender::read_event(IO_CACHE *log_cache, enum_binlog_checksum_a
   size_t event_offset;
   char header[LOG_EVENT_MINIMAL_HEADER_LEN];
   int error= 0;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const char *packet_buffer= NULL;
 #endif
 
@@ -1092,15 +1233,15 @@ inline int Binlog_sender::read_event(IO_CACHE *log_cache, enum_binlog_checksum_a
     DBUG_RETURN(1);
 
   event_offset= m_packet.length();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   packet_buffer= m_packet.ptr();
 #endif
 
   DBUG_EXECUTE_IF("dump_thread_before_read_event",
                   {
                     const char act[]= "now wait_for signal.continue no_clear_event";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   /*
@@ -1119,14 +1260,14 @@ inline int Binlog_sender::read_event(IO_CACHE *log_cache, enum_binlog_checksum_a
     that it might call functions to replace the buffer by one with the size to
     fit the event.
   */
-  DBUG_ASSERT(packet_buffer == m_packet.ptr());
+  assert(packet_buffer == m_packet.ptr());
   *event_ptr= (uchar *)m_packet.ptr() + event_offset;
 
   DBUG_PRINT("info",
              ("Read event %s",
               Log_event::get_type_str(Log_event_type
                                       ((*event_ptr)[EVENT_TYPE_OFFSET]))));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (check_event_count())
     DBUG_RETURN(1);
 #endif
@@ -1249,7 +1390,7 @@ inline int Binlog_sender::after_send_hook(const char *log_file,
   return 0;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern int max_binlog_dump_events;
 
 inline int Binlog_sender::check_event_count()
@@ -1308,7 +1449,7 @@ inline bool Binlog_sender::shrink_packet()
   size_t cur_buffer_size= m_packet.alloced_length();
   size_t buffer_used= m_packet.length();
 
-  DBUG_ASSERT(!(cur_buffer_size < PACKET_MIN_SIZE));
+  assert(!(cur_buffer_size < PACKET_MIN_SIZE));
 
   /*
      If the packet is already at the minimum size, just
@@ -1344,11 +1485,11 @@ inline bool Binlog_sender::shrink_packet()
     else
       m_half_buffer_size_req_counter= 0;
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (res == false)
   {
-    DBUG_ASSERT(m_new_shrink_size <= cur_buffer_size);
-    DBUG_ASSERT(m_packet.alloced_length() >= PACKET_MIN_SIZE);
+    assert(m_new_shrink_size <= cur_buffer_size);
+    assert(m_packet.alloced_length() >= PACKET_MIN_SIZE);
   }
 #endif
   DBUG_RETURN(res);
@@ -1358,7 +1499,7 @@ inline size_t Binlog_sender::calc_grow_buffer_size(size_t current_size,
                                                    size_t min_size)
 {
   /* Check that a sane minimum buffer size was requested.  */
-  DBUG_ASSERT(min_size > PACKET_MIN_SIZE);
+  assert(min_size > PACKET_MIN_SIZE);
   if (min_size > PACKET_MAX_SIZE)
     return 0;
 
diff --git a/sql/rpl_binlog_sender.h b/sql/rpl_binlog_sender.h
index 23ace68bbf41..61ed69c47d96 100644
--- a/sql/rpl_binlog_sender.h
+++ b/sql/rpl_binlog_sender.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -20,6 +27,7 @@
 #include "my_global.h"
 #include "binlog.h"           // LOG_INFO
 #include "binlog_event.h"     // enum_binlog_checksum_alg, Log_event_type
+#include "m_string.h"
 #include "mysqld_error.h"     // ER_*
 #include "sql_error.h"        // Diagnostics_area
 
@@ -41,6 +49,17 @@ class Binlog_sender
     all events(for mysqlbinlog) or encounters an error.
   */
   void run();
+
+  /**
+    Sets the value of the previously processed event.
+
+    @param type The last processed event type.
+   */
+  inline void set_prev_event_type(binary_log::Log_event_type type)
+  {
+    m_prev_event_type= type;
+  }
+
 private:
   THD *m_thd;
   String& m_packet;
@@ -153,6 +172,10 @@ class Binlog_sender
    * it will be false.
    */
   bool m_transmit_started;
+  /**
+    Type of the previously processed event.
+   */
+  binary_log::Log_event_type m_prev_event_type;
   /*
     It initializes the context, checks if the dump request is valid and
     if binlog status is correct.
@@ -275,9 +298,9 @@ class Binlog_sender
 
      @return It returns 0 if succeeds, otherwise 1 is returned.
   */
-  inline int read_event(IO_CACHE *log_cache,
-                        binary_log::enum_binlog_checksum_alg checksum_alg,
-                        uchar **event_ptr, uint32 *event_len);
+  int read_event(IO_CACHE *log_cache,
+                 binary_log::enum_binlog_checksum_alg checksum_alg,
+                 uchar **event_ptr, uint32 *event_len);
   /**
     Check if it is allowed to send this event type.
 
@@ -316,15 +339,15 @@ class Binlog_sender
 
     @return It returns true if it should be skipped, otherwise false is turned.
   */
-  inline bool skip_event(const uchar *event_ptr, uint32 event_len,
-                         bool in_exclude_group);
-
-  inline void calc_event_checksum(uchar *event_ptr, size_t event_len);
-  inline int flush_net();
-  inline int send_packet();
-  inline int send_packet_and_flush();
-  inline int before_send_hook(const char *log_file, my_off_t log_pos);
-  inline int after_send_hook(const char *log_file, my_off_t log_pos);
+  bool skip_event(const uchar *event_ptr, uint32 event_len,
+                  bool in_exclude_group);
+
+  void calc_event_checksum(uchar *event_ptr, size_t event_len);
+  int flush_net();
+  int send_packet();
+  int send_packet_and_flush();
+  int before_send_hook(const char *log_file, my_off_t log_pos);
+  int after_send_hook(const char *log_file, my_off_t log_pos);
   /*
     Reset the thread transmit packet buffer for event sending.
 
@@ -338,7 +361,7 @@ class Binlog_sender
                           if event_len is 0, then the caller needs to extend
                           the buffer itself.
   */
-  inline int reset_transmit_packet(ushort flags, size_t event_len= 0);
+  int reset_transmit_packet(ushort flags, size_t event_len= 0);
 
   /**
     It waits until receiving an update_cond signal. It will send heartbeat
@@ -349,58 +372,57 @@ class Binlog_sender
 
     @return It returns 0 if succeeds, otherwise 1 is returned.
   */
-  inline int wait_new_events(my_off_t log_pos);
-  inline int wait_with_heartbeat(my_off_t log_pos);
-  inline int wait_without_heartbeat();
+  int wait_new_events(my_off_t log_pos);
+  int wait_with_heartbeat(my_off_t log_pos);
+  int wait_without_heartbeat();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* It is used to count the events that have been sent. */
   int m_event_count;
   /*
     It aborts dump thread with an error if m_event_count exceeds
     max_binlog_dump_events.
   */
-  inline int check_event_count();
+  int check_event_count();
 #endif
 
   bool has_error() { return m_errno != 0; }
-  void set_error(int errorno, const char *errmsg)
+  inline void set_error(int errorno, const char *errmsg)
   {
-    // Need to set the final '\0' since strncpy does not do that.
-    strncpy(m_errmsg_buf, errmsg, sizeof(m_errmsg_buf) - 1);
-    m_errmsg_buf[sizeof(m_errmsg_buf) - 1]= '\0';
+    my_snprintf(m_errmsg_buf, sizeof(m_errmsg_buf), "%.*s",
+                MYSQL_ERRMSG_SIZE - 1, errmsg);
     m_errmsg= m_errmsg_buf;
     m_errno= errorno;
   }
 
-  void set_unknow_error(const char *errmsg)
+  inline void set_unknow_error(const char *errmsg)
   {
     set_error(ER_UNKNOWN_ERROR, errmsg);
   }
 
-  void set_fatal_error(const char *errmsg)
+  inline void set_fatal_error(const char *errmsg)
   {
     set_error(ER_MASTER_FATAL_ERROR_READING_BINLOG, errmsg);
   }
 
-  bool is_fatal_error()
+  inline bool is_fatal_error()
   {
     return m_errno == ER_MASTER_FATAL_ERROR_READING_BINLOG;
   }
 
-  bool event_checksum_on()
+  inline bool event_checksum_on()
   {
     return m_event_checksum_alg > binary_log::BINLOG_CHECKSUM_ALG_OFF &&
       m_event_checksum_alg < binary_log::BINLOG_CHECKSUM_ALG_ENUM_END;
   }
 
-  void set_last_pos(my_off_t log_pos)
+  inline void set_last_pos(my_off_t log_pos)
   {
     m_last_file= m_linfo.log_file_name;
     m_last_pos= log_pos;
   }
 
-  void set_last_file(const char *log_file)
+  inline void set_last_file(const char *log_file)
   {
     strcpy(m_last_file_buf, log_file);
     m_last_file= m_last_file_buf;
@@ -420,7 +442,7 @@ class Binlog_sender
    * @param extra_size  The size in bytes that the caller wants to add to the buffer.
    * @return true if an error occurred, false otherwise.
    */
-  inline bool grow_packet(size_t extra_size);
+  bool grow_packet(size_t extra_size);
 
   /**
    * This function SHALL shrink the size of the buffer used.
@@ -434,7 +456,7 @@ class Binlog_sender
    *
    * @param packet  The buffer to shrink.
    */
-  inline bool shrink_packet();
+  bool shrink_packet();
 
   /**
    Helper function to recalculate a new size for the growing buffer.
@@ -444,7 +466,7 @@ class Binlog_sender
                    as this parameter states.
    @return The new buffer size, or 0 in the case of an error.
   */
-  inline size_t calc_grow_buffer_size(size_t current_size, size_t min_size);
+  size_t calc_grow_buffer_size(size_t current_size, size_t min_size);
 
   /**
    Helper function to recalculate the new size for the m_new_shrink_size.
diff --git a/sql/rpl_channel_service_interface.cc b/sql/rpl_channel_service_interface.cc
index 7142ad717612..0310162bc907 100644
--- a/sql/rpl_channel_service_interface.cc
+++ b/sql/rpl_channel_service_interface.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -77,6 +84,10 @@ void set_mi_settings(Master_info *mi, Channel_creation_info* channel_info)
 
   mi->rli->set_thd_tx_priority(channel_info->thd_tx_priority);
 
+  mi->rli->set_ignore_write_set_memory_limit(
+      channel_info->m_ignore_write_set_memory_limit);
+  mi->rli->set_allow_drop_write_set(channel_info->m_allow_drop_write_set);
+
   mi->rli->replicate_same_server_id=
     (channel_info->replicate_same_server_id == RPL_SERVICE_SERVER_DEFAULT) ?
      replicate_same_server_id : channel_info->replicate_same_server_id;
@@ -156,6 +167,8 @@ initialize_channel_creation_info(Channel_creation_info* channel_info)
   channel_info->preserve_relay_logs= false;
   channel_info->retry_count= 0;
   channel_info->connect_retry= 0;
+  channel_info->m_ignore_write_set_memory_limit = false;
+  channel_info->m_allow_drop_write_set = false;
 }
 
 void initialize_channel_ssl_info(Channel_ssl_info* channel_ssl_info)
@@ -405,11 +418,11 @@ int channel_start(const char* channel,
         lex_mi.until_after_gaps= true;
         break;
       case CHANNEL_UNTIL_VIEW_ID:
-        DBUG_ASSERT((thread_mask & SLAVE_SQL) && connection_info->view_id);
+        assert((thread_mask & SLAVE_SQL) && connection_info->view_id);
         lex_mi.view_id= connection_info->view_id;
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
     }
   }
 
@@ -474,12 +487,12 @@ int channel_stop(Master_info *mi,
     DBUG_RETURN(RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
   }
 
-  mi->channel_rdlock();
-
   int thread_mask= 0;
   int server_thd_mask= 0;
   int error= 0;
   bool thd_init= false;
+
+  mi->channel_wrlock();
   lock_slave_threads(mi);
 
   init_thread_mask(&server_thd_mask, mi, 0 /* not inverse*/);
@@ -617,11 +630,8 @@ bool channel_is_active(const char* channel, enum_channel_thread_types thd_type)
     DBUG_RETURN(false);
   }
 
-  mi->channel_rdlock();
-
   init_thread_mask(&thread_mask, mi, 0 /* not inverse*/);
 
-  mi->channel_unlock();
   channel_map.unlock();
 
   switch(thd_type)
@@ -633,7 +643,7 @@ bool channel_is_active(const char* channel, enum_channel_thread_types thd_type)
     case CHANNEL_APPLIER_THREAD:
       DBUG_RETURN(thread_mask & SLAVE_SQL);
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
   DBUG_RETURN(false);
 }
@@ -656,8 +666,6 @@ int channel_get_thread_id(const char* channel,
     DBUG_RETURN(RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
   }
 
-  mi->channel_rdlock();
-
   switch(thd_type)
   {
     case CHANNEL_RECEIVER_THREAD:
@@ -741,10 +749,9 @@ int channel_get_thread_id(const char* channel,
       }
       break;
     default:
-      DBUG_RETURN(number_threads);
+      break;
   }
 
-  mi->channel_unlock();
   channel_map.unlock();
 
   DBUG_RETURN(number_threads);
@@ -764,14 +771,13 @@ long long channel_get_last_delivered_gno(const char* channel, int sidno)
     DBUG_RETURN(RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
   }
 
-  mi->channel_rdlock();
   rpl_gno last_gno= 0;
 
   global_sid_lock->rdlock();
   last_gno= mi->rli->get_gtid_set()->get_last_gno(sidno);
   global_sid_lock->unlock();
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   const Gtid_set *retrieved_gtid_set= mi->rli->get_gtid_set();
   char *retrieved_gtid_set_string= NULL;
   global_sid_lock->wrlock();
@@ -782,7 +788,6 @@ long long channel_get_last_delivered_gno(const char* channel, int sidno)
   my_free(retrieved_gtid_set_string);
 #endif
 
-  mi->channel_unlock();
   channel_map.unlock();
 
   DBUG_RETURN(last_gno);
@@ -800,15 +805,13 @@ int channel_add_executed_gtids_to_received_gtids(const char* channel)
     DBUG_RETURN(RPL_CHANNEL_SERVICE_CHANNEL_DOES_NOT_EXISTS_ERROR);
   }
 
-  mi->channel_rdlock();
-  channel_map.unlock();
   global_sid_lock->wrlock();
 
   enum_return_status return_status=
       mi->rli->add_gtid_set(gtid_state->get_executed_gtids());
 
   global_sid_lock->unlock();
-  mi->channel_unlock();
+  channel_map.unlock();
 
   DBUG_RETURN(return_status != RETURN_STATUS_OK);
 }
@@ -1012,8 +1015,6 @@ bool channel_is_stopping(const char* channel,
     DBUG_RETURN(false);
   }
 
-  mi->channel_rdlock();
-
   switch(thd_type)
   {
     case CHANNEL_NO_THD:
@@ -1025,10 +1026,9 @@ bool channel_is_stopping(const char* channel,
       is_stopping= likely(mi->rli->is_stopping.atomic_get());
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
 
-  mi->channel_unlock();
   channel_map.unlock();
 
   DBUG_RETURN(is_stopping);
@@ -1044,9 +1044,7 @@ bool is_partial_transaction_on_channel_relay_log(const char *channel)
     channel_map.unlock();
     DBUG_RETURN(false);
   }
-  mi->channel_rdlock();
   bool ret= mi->transaction_parser.is_inside_transaction();
-  mi->channel_unlock();
   channel_map.unlock();
   DBUG_RETURN(ret);
 }
diff --git a/sql/rpl_channel_service_interface.h b/sql/rpl_channel_service_interface.h
index 669f0361f2c3..9eba39ad663e 100644
--- a/sql/rpl_channel_service_interface.h
+++ b/sql/rpl_channel_service_interface.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -94,6 +101,8 @@ struct st_channel_info
   int connect_retry;             //How many seconds to wait between retries.
   int retry_count;               //Limits the number of reconnection attempts
   bool preserve_relay_logs;      //If the logs should be preserved on creation
+  bool m_ignore_write_set_memory_limit; //Shall ignore write set mem limits
+  bool m_allow_drop_write_set; //Shall not require write set to be preserved
 };
 typedef struct st_channel_info Channel_creation_info;
 
diff --git a/sql/rpl_constants.h b/sql/rpl_constants.h
index 206b926c59e5..df17a88f1fdd 100644
--- a/sql/rpl_constants.h
+++ b/sql/rpl_constants.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_context.cc b/sql/rpl_context.cc
index cbb24733b9b8..c29aa45aa9d3 100644
--- a/sql/rpl_context.cc
+++ b/sql/rpl_context.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +63,7 @@ inline bool Session_consistency_gtids_ctx::shall_collect(const THD* thd)
 bool Session_consistency_gtids_ctx::notify_after_transaction_commit(const THD* thd)
 {
   DBUG_ENTER("Rpl_consistency_ctx::notify_after_transaction_commit");
-  DBUG_ASSERT(thd);
+  assert(thd);
   bool res= false;
 
   if (!shall_collect(thd))
@@ -85,7 +91,7 @@ bool Session_consistency_gtids_ctx::notify_after_transaction_commit(const THD* t
 bool Session_consistency_gtids_ctx::notify_after_gtid_executed_update(const THD *thd)
 {
   DBUG_ENTER("Rpl_consistency_ctx::notify_after_gtid_executed_update");
-  DBUG_ASSERT(thd);
+  assert(thd);
   bool res= false;
 
   if (!shall_collect(thd))
@@ -93,17 +99,17 @@ bool Session_consistency_gtids_ctx::notify_after_gtid_executed_update(const THD
 
   if (m_curr_session_track_gtids == OWN_GTID)
   {
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_OFF);
-    DBUG_ASSERT(thd->owned_gtid.sidno > 0);
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_OFF);
+    assert(thd->owned_gtid.sidno > 0);
     const Gtid& gtid= thd->owned_gtid;
     if (gtid.sidno == -1) // we need to add thd->owned_gtid_set
     {
       /* Caller must only call this function if the set was not empty. */
 #ifdef HAVE_GTID_NEXT_LIST
-      DBUG_ASSERT(!thd->owned_gtid_set.is_empty());
+      assert(!thd->owned_gtid_set.is_empty());
       res= m_gtid_set->add_gtid_set(&thd->owned_gtid_set) != RETURN_STATUS_OK;
 #else
-      DBUG_ASSERT(0);
+      assert(0);
 #endif
     }
     else if (gtid.sidno > 0) // only one gtid
@@ -118,7 +124,7 @@ bool Session_consistency_gtids_ctx::notify_after_gtid_executed_update(const THD
       */
       rpl_sidno local_set_sidno= m_sid_map->add_sid(thd->owned_sid);
 
-      DBUG_ASSERT(!m_gtid_set->contains_gtid(local_set_sidno, gtid.gno));
+      assert(!m_gtid_set->contains_gtid(local_set_sidno, gtid.gno));
       res= m_gtid_set->ensure_sidno(local_set_sidno) != RETURN_STATUS_OK;
       if (!res)
         m_gtid_set->_add_gtid(local_set_sidno, gtid.gno);
@@ -130,6 +136,12 @@ bool Session_consistency_gtids_ctx::notify_after_gtid_executed_update(const THD
   DBUG_RETURN(res);
 }
 
+void Session_consistency_gtids_ctx::
+    update_tracking_activeness_from_session_variable(const THD* thd)
+{
+  m_curr_session_track_gtids= thd->variables.session_track_gtids;
+}
+
 bool Session_consistency_gtids_ctx::notify_after_response_packet(const THD *thd)
 {
   int res= false;
@@ -143,7 +155,7 @@ bool Session_consistency_gtids_ctx::notify_after_response_packet(const THD *thd)
    this value. It may have changed (the previous command may have been
    a SET SESSION session_track_gtids=...;).
    */
-  m_curr_session_track_gtids= thd->variables.session_track_gtids;
+  update_tracking_activeness_from_session_variable(thd);
   DBUG_RETURN(res);
 }
 
@@ -152,10 +164,10 @@ Session_consistency_gtids_ctx::register_ctx_change_listener(
               Session_consistency_gtids_ctx::Ctx_change_listener* listener,
               THD* thd)
 {
-  DBUG_ASSERT(m_listener == NULL || m_listener == listener);
+  assert(m_listener == NULL || m_listener == listener);
   if (m_listener == NULL)
   {
-    DBUG_ASSERT(m_sid_map == NULL && m_gtid_set == NULL);
+    assert(m_sid_map == NULL && m_gtid_set == NULL);
     m_listener= listener;
     m_sid_map= new Sid_map(NULL);
     m_gtid_set= new Gtid_set(m_sid_map);
@@ -165,14 +177,14 @@ Session_consistency_gtids_ctx::register_ctx_change_listener(
      if the session_track_gtids value is set at startup time to anything 
      different than OFF.
      */
-    m_curr_session_track_gtids= thd->variables.session_track_gtids;
+    update_tracking_activeness_from_session_variable(thd);
   }
 }
 
 void Session_consistency_gtids_ctx::unregister_ctx_change_listener(
              Session_consistency_gtids_ctx::Ctx_change_listener* listener)
 {
-  DBUG_ASSERT(m_listener == listener || m_listener == NULL);
+  assert(m_listener == listener || m_listener == NULL);
 
   if (m_gtid_set)
     delete m_gtid_set;
diff --git a/sql/rpl_context.h b/sql/rpl_context.h
index cc13907baaca..4ade7fa6a2b4 100644
--- a/sql/rpl_context.h
+++ b/sql/rpl_context.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,6 +30,13 @@ class Gtid_set;
 class Sid_map;
 class THD;
 
+/** Type of replication channel thread/transaction might be associated to*/
+enum enum_rpl_channel_type {
+  NO_CHANNEL_INFO = 0,       // No information exists about the channel
+  RPL_STANDARD_CHANNEL = 1,  // It is a standard replication channel
+  GR_APPLIER_CHANNEL = 2,    // It is a GR applier channel
+  GR_RECOVERY_CHANNEL = 3    // It is a GR recovery channel
+};
 
 /**
    This class is an interface for session consistency instrumentation
@@ -90,7 +103,7 @@ class Session_consistency_gtids_ctx
    The last statement should return a set of GTIDs.
   */
   ulong m_curr_session_track_gtids;
-  
+
 protected:
 
   /*
@@ -189,6 +202,10 @@ class Session_consistency_gtids_ctx
     return notify_after_transaction_commit(thd);
   }
 
+  /**
+    Update session tracker (m_curr_session_track_gtids) from thd.
+  */
+  void update_tracking_activeness_from_session_variable(const THD* thd);
 
 private:
   // not implemented
@@ -196,6 +213,29 @@ class Session_consistency_gtids_ctx
   Session_consistency_gtids_ctx& operator=(const Session_consistency_gtids_ctx& rsc);
 };
 
+/*
+  This object encapsulates the state kept between transactions of the same client in
+  order to compute logical timestamps based on WRITESET_SESSION.
+*/
+class Dependency_tracker_ctx
+{
+public:
+  Dependency_tracker_ctx(): m_last_session_sequence_number(0) { }
+
+  void set_last_session_sequence_number(int64 sequence_number)
+  {
+    m_last_session_sequence_number= sequence_number;
+  }
+
+  int64 get_last_session_sequence_number()
+  {
+    return m_last_session_sequence_number;
+  }
+
+private:
+  int64 m_last_session_sequence_number;
+};
+
 /*
   This class SHALL encapsulate the replication context associated with the THD
   object.
@@ -204,18 +244,31 @@ class Rpl_thd_context
 {
 private:
   Session_consistency_gtids_ctx m_session_gtids_ctx;
+  Dependency_tracker_ctx m_dependency_tracker_ctx;
+  /** If this thread is a channel, what is its type*/
+  enum_rpl_channel_type rpl_channel_type;
 
-  // make these private
   Rpl_thd_context(const Rpl_thd_context& rsc);
   Rpl_thd_context& operator=(const Rpl_thd_context& rsc);
 public:
 
-  Rpl_thd_context() { }
+  Rpl_thd_context() : rpl_channel_type(NO_CHANNEL_INFO) {}
 
   inline Session_consistency_gtids_ctx& session_gtids_ctx()
   {
     return m_session_gtids_ctx;
   }
+
+  inline Dependency_tracker_ctx& dependency_tracker_ctx()
+  {
+    return m_dependency_tracker_ctx;
+  }
+
+  enum_rpl_channel_type get_rpl_channel_type() { return rpl_channel_type; }
+
+  void set_rpl_channel_type(enum_rpl_channel_type rpl_channel_type_arg) {
+    rpl_channel_type = rpl_channel_type_arg;
+  }
 };
 
 #endif	/* RPL_SESSION_H */
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
index f0505d820d9f..4e5bb311e0ac 100644
--- a/sql/rpl_filter.cc
+++ b/sql/rpl_filter.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -992,7 +999,7 @@ void Sql_cmd_change_repl_filter::set_filter_value(List<Item>* item_list,
     break;
   default:
     /* purecov: begin deadcode */
-    DBUG_ASSERT(0);
+    assert(0);
     break;
     /* purecov: end */
   }
diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h
index 1a230c47b547..87d26e46022c 100644
--- a/sql/rpl_filter.h
+++ b/sql/rpl_filter.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_group_replication.cc b/sql/rpl_group_replication.cc
index 088033ec07a1..fd896b21311d 100644
--- a/sql/rpl_group_replication.cc
+++ b/sql/rpl_group_replication.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -22,177 +29,50 @@
 #include "log.h"
 
 
-/*
-  Group Replication plugin handler.
-*/
-Group_replication_handler::
-Group_replication_handler(const char* plugin_name_arg)
-  :plugin(NULL), plugin_handle(NULL)
-{
-  plugin_name.assign(plugin_name_arg);
-}
-
-Group_replication_handler::~Group_replication_handler()
-{
-  if (plugin_handle)
-    plugin_handle->stop();
-}
-
-int Group_replication_handler::init()
-{
-  int error= 0;
-  if (!plugin_handle)
-    if ((error = plugin_init()))
-      return error;
-  return 0;
-}
-
-int Group_replication_handler::start()
-{
-  if (plugin_handle)
-    return plugin_handle->start();
-  return 1;
-}
 
-int Group_replication_handler::stop()
-{
-  if (plugin_handle)
-    return plugin_handle->stop();
-  return 1;
-}
-
-bool Group_replication_handler::is_running()
-{
-  if (plugin_handle)
-    return plugin_handle->is_running();
-  return false;
-}
-
-int
-Group_replication_handler::
-set_retrieved_certification_info(View_change_log_event* view_change_event)
-{
-  if (plugin_handle)
-    return plugin_handle->set_retrieved_certification_info(view_change_event);
-  return 1;
-}
-
-bool
-Group_replication_handler::
-get_connection_status_info(
-    const GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS& callbacks)
-{
-  if (plugin_handle)
-    return plugin_handle->get_connection_status_info(callbacks);
-  return true;
-}
-
-bool
-Group_replication_handler::
-get_group_members_info(
-    unsigned int index,
-    const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS& callbacks)
-{
-  if (plugin_handle)
-    return plugin_handle->get_group_members_info(index, callbacks);
-  return true;
-}
-
-bool
-Group_replication_handler::
-get_group_member_stats_info(
-    const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS& callbacks)
-{
-  if (plugin_handle)
-    return plugin_handle->get_group_member_stats_info(callbacks);
-  return true;
-}
-
-unsigned int Group_replication_handler::get_members_number_info()
-{
-  if (plugin_handle)
-    return plugin_handle->get_members_number_info();
-  return 0;
-}
-
-int Group_replication_handler::plugin_init()
-{
-  plugin= my_plugin_lock_by_name(0, to_lex_cstring(plugin_name.c_str()),
-                                 MYSQL_GROUP_REPLICATION_PLUGIN);
-  if (plugin)
-  {
-    plugin_handle= (st_mysql_group_replication*) plugin_decl(plugin)->info;
-    plugin_unlock(0, plugin);
-  }
-  else
-  {
-    plugin_handle= NULL;
-    return 1;
-  }
-  return 0;
-}
-
-Group_replication_handler* group_replication_handler= NULL;
+/**
+  Static name of Group Replication plugin.
+*/
+LEX_CSTRING group_replication_plugin_name_str= {
+  C_STRING_WITH_LEN("group_replication")
+};
 
 
 /*
   Group Replication plugin handler function accessors.
 */
 #ifdef HAVE_REPLICATION
-int group_replication_init(const char* plugin_name)
+int group_replication_init()
 {
-  if (initialize_channel_service_interface())
-  {
-    return 1;
-  }
-
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (group_replication_handler == NULL)
-  {
-    group_replication_handler= new Group_replication_handler(plugin_name);
-
-    if (group_replication_handler)
-    {
-      int ret= group_replication_handler->init();
-      mysql_mutex_unlock(&LOCK_group_replication_handler);
-      return ret;
-    }
-  }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
-
-  return 1;
+  return initialize_channel_service_interface();
 }
 #endif
 
-int group_replication_cleanup()
+
+bool is_group_replication_plugin_loaded()
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (group_replication_handler != NULL)
-  {
-    delete group_replication_handler;
-    group_replication_handler= NULL;
-  }
-  else
+  bool result= false;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return 1;
+    plugin_unlock(0, plugin);
+    result= true;
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return 0;
-}
-
-bool is_group_replication_plugin_loaded()
-{
-  if (group_replication_handler)
-    return true;
-  return false;
+  return result;
 }
 
 int group_replication_start()
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  int result= 1;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
     /*
       We need to take global_sid_lock because
@@ -208,111 +88,160 @@ int group_replication_start()
       gtid_mode_lock.
     */
     gtid_mode_lock->rdlock();
-    int ret= group_replication_handler->start();
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->start();
     gtid_mode_lock->unlock();
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
-  sql_print_error("Group Replication plugin is not installed.");
-  return 1;
+  else
+  {
+    sql_print_error("Group Replication plugin is not installed.");
+  }
+
+  return result;
 }
 
 int group_replication_stop()
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  int result= 1;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    int ret= group_replication_handler->stop();
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->stop();
+
+    plugin_unlock(0, plugin);
+  }
+  else
+  {
+    sql_print_error("Group Replication plugin is not installed.");
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  sql_print_error("Group Replication plugin is not installed.");
-  return 1;
+  return result;
 }
 
 bool is_group_replication_running()
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  bool result= false;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    bool ret= group_replication_handler->is_running();
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->is_running();
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return false;
+  return result;
 }
 
 int set_group_replication_retrieved_certification_info(View_change_log_event *view_change_event)
 {
-  if (is_group_replication_plugin_loaded())
-    return group_replication_handler->set_retrieved_certification_info(view_change_event);
-  return 1;
+  int result= 1;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
+  {
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->set_retrieved_certification_info(view_change_event);
+
+    plugin_unlock(0, plugin);
+  }
+
+  return result;
 }
 
 bool get_group_replication_connection_status_info(
     const GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS& callbacks)
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  bool result= true;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    int ret= group_replication_handler->get_connection_status_info(callbacks);
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->get_connection_status_info(callbacks);
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return true;
+  return result;
 }
 
 bool get_group_replication_group_members_info(
     unsigned int index,
     const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS& callbacks)
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  bool result= true;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    bool ret=
-      group_replication_handler->get_group_members_info(index, callbacks);
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->get_group_members_info(index, callbacks);
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return true;
+  return result;
 }
 
 bool get_group_replication_group_member_stats_info(
     const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS& callbacks)
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  bool result= true;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    bool ret= group_replication_handler->get_group_member_stats_info(callbacks);
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->get_group_member_stats_info(callbacks);
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return true;
+  return result;
 }
 
 unsigned int get_group_replication_members_number_info()
 {
-  mysql_mutex_lock(&LOCK_group_replication_handler);
-  if (is_group_replication_plugin_loaded())
+  unsigned int result= 0;
+
+  plugin_ref plugin= my_plugin_lock_by_name(0,
+                                            group_replication_plugin_name_str,
+                                            MYSQL_GROUP_REPLICATION_PLUGIN);
+  if (plugin != NULL)
   {
-    unsigned int ret= group_replication_handler->get_members_number_info();
-    mysql_mutex_unlock(&LOCK_group_replication_handler);
-    return ret;
+    st_mysql_group_replication *plugin_handle=
+        (st_mysql_group_replication*) plugin_decl(plugin)->info;
+    result= plugin_handle->get_members_number_info();
+
+    plugin_unlock(0, plugin);
   }
-  mysql_mutex_unlock(&LOCK_group_replication_handler);
 
-  return 0;
+  return result;
 }
 
 
@@ -425,6 +354,7 @@ get_server_startup_prerequirements(Trans_context_info& requirements,
   requirements.parallel_applier_type= mts_parallel_option;
   requirements.parallel_applier_workers= opt_mts_slave_parallel_workers;
   requirements.parallel_applier_preserve_commit_order= opt_slave_preserve_commit_order;
+  requirements.lower_case_table_names = lower_case_table_names;
 }
 #endif //HAVE_REPLICATION
 
@@ -433,7 +363,7 @@ bool get_server_encoded_gtid_executed(uchar **encoded_gtid_executed,
 {
   global_sid_lock->wrlock();
 
-  DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) > 0);
+  assert(get_gtid_mode(GTID_MODE_LOCK_SID) > 0);
 
   const Gtid_set *executed_gtids= gtid_state->get_executed_gtids();
   *length= executed_gtids->get_encoded_length();
@@ -450,7 +380,7 @@ bool get_server_encoded_gtid_executed(uchar **encoded_gtid_executed,
   return false;
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 char* encoded_gtid_set_to_string(uchar *encoded_gtid_set,
                                  size_t length)
 {
@@ -479,3 +409,7 @@ void global_thd_manager_remove_thd(THD *thd)
 {
   Global_THD_manager::get_instance()->remove_thd(thd);
 }
+
+unsigned long get_slave_max_allowed_packet() {
+  return slave_max_allowed_packet;
+}
diff --git a/sql/rpl_group_replication.h b/sql/rpl_group_replication.h
index 9988982be85f..4bff3d1e39d3 100644
--- a/sql/rpl_group_replication.h
+++ b/sql/rpl_group_replication.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -23,41 +30,14 @@
 #include "replication.h"
 #include "log_event.h"
 
+#include "mysql/plugin_group_replication.h"
 
-/*
-  Group Replication plugin handler.
-*/
-class Group_replication_handler
-{
-public:
-  Group_replication_handler(const char *plugin_name_arg);
-  ~Group_replication_handler();
-  int init();
-  int start();
-  int stop();
-  bool is_running();
-  int set_retrieved_certification_info(View_change_log_event *view_change_event);
-  bool get_connection_status_info(
-      const GROUP_REPLICATION_CONNECTION_STATUS_CALLBACKS& callbacks);
-  bool get_group_members_info(
-      unsigned int index,
-      const GROUP_REPLICATION_GROUP_MEMBERS_CALLBACKS& callbacks);
-  bool get_group_member_stats_info(
-      const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS& callbacks);
-  unsigned int get_members_number_info();
+class View_change_log_event;
 
-private:
-  std::string plugin_name;
-  plugin_ref plugin;
-  st_mysql_group_replication *plugin_handle;
-  int plugin_init();
-};
 
 /*
   Group Replication plugin handler function accessors.
 */
-int group_replication_init(const char* plugin_name);
-int group_replication_cleanup();
 bool is_group_replication_plugin_loaded();
 
 int group_replication_start();
diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h
index 0d29c737d06f..78bdd37a4e50 100644
--- a/sql/rpl_gtid.h
+++ b/sql/rpl_gtid.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,6 +36,10 @@
 #include "table.h"
 #endif
 
+#ifndef INT64_MAX
+#define INT64_MAX   0x7fffffffffffffffLL
+#endif
+
 #include <list>
 #include "atomic_class.h"
 
@@ -123,7 +133,7 @@ enum enum_return_status
   Lowest level macro used in the PROPAGATE_* and RETURN_* macros
   below.
 
-  If DBUG_OFF is defined, does nothing. Otherwise, if STATUS is
+  If NDEBUG is defined, does nothing. Otherwise, if STATUS is
   RETURN_STATUS_OK, does nothing; otherwise, make a dbug printout and
   (if ALLOW_UNREPORTED==0) assert that STATUS !=
   RETURN_STATUS_UNREPORTED.
@@ -136,7 +146,7 @@ enum enum_return_status
   @param ALLOW_UNREPORTED If false, the macro asserts that STATUS is
   not RETURN_STATUS_UNREPORTED_ERROR.
 */
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 #define __CHECK_RETURN_STATUS(STATUS, ACTION, STATUS_NAME, ALLOW_UNREPORTED)
 #else
 extern void check_return_status(enum_return_status status,
@@ -339,7 +349,7 @@ enum enum_gtid_mode_lock
 */
 enum_gtid_mode get_gtid_mode(enum_gtid_mode_lock have_lock);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Return the current GTID_MODE as a string. Used only for debugging.
 
@@ -349,7 +359,7 @@ inline const char *get_gtid_mode_string(enum_gtid_mode_lock have_lock)
 {
   return get_gtid_mode_string(get_gtid_mode(have_lock));
 }
-#endif // ifndef DBUG_OFF
+#endif // ifndef NDEBUG
 
 
 /**
@@ -395,7 +405,7 @@ inline const char *get_gtid_consistency_mode_string()
 
 
 /// The maximum value of GNO
-const rpl_gno MAX_GNO= LLONG_MAX;
+const rpl_gno GNO_END= INT64_MAX;
 /// The length of MAX_GNO when printed in decimal.
 const int MAX_GNO_TEXT_LENGTH= 19;
 /// The maximal possible length of thread_id when printed in decimal.
@@ -447,7 +457,7 @@ class Checkable_rwlock
 #endif
                    )
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     my_atomic_store32(&lock_state, 0);
     dbug_trace= true;
 #else
@@ -470,7 +480,7 @@ class Checkable_rwlock
   {
     mysql_rwlock_rdlock(&rwlock);
     assert_no_wrlock();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (dbug_trace)
       DBUG_PRINT("info", ("%p.rdlock()", this));
     my_atomic_add32(&lock_state, 1);
@@ -481,7 +491,7 @@ class Checkable_rwlock
   {
     mysql_rwlock_wrlock(&rwlock);
     assert_no_lock();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (dbug_trace)
       DBUG_PRINT("info", ("%p.wrlock()", this));
     my_atomic_store32(&lock_state, -1);
@@ -493,7 +503,7 @@ class Checkable_rwlock
   inline void unlock()
   {
     assert_some_lock();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (dbug_trace)
       DBUG_PRINT("info", ("%p.unlock()", this));
     int val= my_atomic_load32(&lock_state);
@@ -502,7 +512,7 @@ class Checkable_rwlock
     else if (val == -1)
       my_atomic_store32(&lock_state, 0);
     else
-      DBUG_ASSERT(0);
+      assert(0);
 #else
     is_write_lock= false;
 #endif
@@ -515,7 +525,7 @@ class Checkable_rwlock
   inline bool is_wrlock()
   {
     assert_some_lock();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     return get_state() == -1;
 #else
     return is_write_lock;
@@ -524,24 +534,24 @@ class Checkable_rwlock
 
   /// Assert that some thread holds either the read or the write lock.
   inline void assert_some_lock() const
-  { DBUG_ASSERT(get_state() != 0); }
+  { assert(get_state() != 0); }
   /// Assert that some thread holds the read lock.
   inline void assert_some_rdlock() const
-  { DBUG_ASSERT(get_state() > 0); }
+  { assert(get_state() > 0); }
   /// Assert that some thread holds the write lock.
   inline void assert_some_wrlock() const
-  { DBUG_ASSERT(get_state() == -1); }
+  { assert(get_state() == -1); }
   /// Assert that no thread holds the write lock.
   inline void assert_no_wrlock() const
-  { DBUG_ASSERT(get_state() >= 0); }
+  { assert(get_state() >= 0); }
   /// Assert that no thread holds the read lock.
   inline void assert_no_rdlock() const
-  { DBUG_ASSERT(get_state() <= 0); }
+  { assert(get_state() <= 0); }
   /// Assert that no thread holds read or write lock.
   inline void assert_no_lock() const
-  { DBUG_ASSERT(get_state() == 0); }
+  { assert(get_state() == 0); }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
   /// If enabled, print any lock/unlock operations to the DBUG trace.
   bool dbug_trace;
@@ -677,7 +687,7 @@ class Sid_map
       else
         sid_lock->assert_some_lock();
     }
-    DBUG_ASSERT(sidno >= 1 && sidno <= get_max_sidno());
+    assert(sidno >= 1 && sidno <= get_max_sidno());
     const rpl_sid &ret= (_sidno_to_sid[sidno - 1])->sid;
     if (sid_lock != NULL && need_lock)
       sid_lock->unlock();
@@ -825,21 +835,21 @@ class Mutex_cond_array
   }
   /**
     Assert that this thread owns the n'th mutex.
-    This is a no-op if DBUG_OFF is on.
+    This is a no-op if NDEBUG is on.
   */
   inline void assert_owner(int n) const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     mysql_mutex_assert_owner(&get_mutex_cond(n)->mutex);
 #endif
   }
   /**
     Assert that this thread does not own the n'th mutex.
-    This is a no-op if DBUG_OFF is on.
+    This is a no-op if NDEBUG is on.
   */
   inline void assert_not_owner(int n) const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     mysql_mutex_assert_not_owner(&get_mutex_cond(n)->mutex);
 #endif
   }
@@ -920,9 +930,9 @@ class Mutex_cond_array
   inline Mutex_cond *get_mutex_cond(int n) const
   {
     global_lock->assert_some_lock();
-    DBUG_ASSERT(n <= get_max_index());
+    assert(n <= get_max_index());
     Mutex_cond *ret= m_array[n];
-    DBUG_ASSERT(ret);
+    assert(ret);
     return ret;
   }
   /// Read-write lock that protects updates to the number of elements.
@@ -973,8 +983,9 @@ struct Gtid
   /// Set both components to the given, positive values.
   void set(rpl_sidno sidno_arg, rpl_gno gno_arg)
   {
-    DBUG_ASSERT(sidno_arg > 0);
-    DBUG_ASSERT(gno_arg > 0);
+    assert(sidno_arg > 0);
+    assert(gno_arg > 0);
+    assert(gno_arg < GNO_END);
     sidno= sidno_arg;
     gno= gno_arg;
   }
@@ -986,9 +997,9 @@ struct Gtid
   {
     // check that gno is not set inconsistently
     if (sidno <= 0)
-      DBUG_ASSERT(gno == 0);
+      assert(gno == 0);
     else
-      DBUG_ASSERT(gno > 0);
+      assert(gno > 0);
     return sidno == 0;
   }
   /**
@@ -1029,7 +1040,7 @@ struct Gtid
   */
   enum_return_status parse(Sid_map *sid_map, const char *text);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /// Debug only: print this Gtid to stdout.
   void print(const Sid_map *sid_map) const
   {
@@ -1042,7 +1053,7 @@ struct Gtid
   void dbug_print(const Sid_map *sid_map, const char *text= "",
                   bool need_lock= false) const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char buf[MAX_TEXT_LENGTH + 1];
     to_string(sid_map, buf, need_lock);
     DBUG_PRINT("info", ("%s%s%s", text, *text ? ": " : "", buf));
@@ -1134,6 +1145,9 @@ class Gtid_set
   void _add_gtid(rpl_sidno sidno, rpl_gno gno)
   {
     DBUG_ENTER("Gtid_set::_add_gtid(sidno, gno)");
+    assert(sidno > 0);
+    assert(gno > 0);
+    assert(gno < GNO_END);
     Interval_iterator ivit(this, sidno);
     Free_intervals_lock lock(this);
     add_gno_interval(&ivit, gno, gno + 1, &lock);
@@ -1330,7 +1344,7 @@ class Gtid_set
   */
   bool contains_sidno(rpl_sidno sidno) const
   {
-    DBUG_ASSERT(sidno >= 1);
+    assert(sidno >= 1);
     if (sidno > get_max_sidno())
       return false;
     Const_interval_iterator ivit(this, sidno);
@@ -1411,7 +1425,7 @@ class Gtid_set
   */
   long to_string(char **buf, bool need_lock= false,
                  const String_format *string_format= NULL) const;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /// Debug only: Print this Gtid_set to stdout.
   void print(bool need_lock= false,
              const Gtid_set::String_format *sf= NULL) const
@@ -1429,7 +1443,7 @@ class Gtid_set
   void dbug_print(const char *text= "", bool need_lock= false,
                   const Gtid_set::String_format *sf= NULL) const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char *str;
     to_string(&str, need_lock, sf);
     DBUG_PRINT("info", ("%s%s'%s'",
@@ -1524,7 +1538,7 @@ class Gtid_set
     */
     Interval_iterator_base(Gtid_set_p gtid_set, rpl_sidno sidno)
     {
-      DBUG_ASSERT(sidno >= 1 && sidno <= gtid_set->get_max_sidno());
+      assert(sidno >= 1 && sidno <= gtid_set->get_max_sidno());
       init(gtid_set, sidno);
     }
     /// Construct a new iterator over the free intervals of a Gtid_set.
@@ -1536,7 +1550,7 @@ class Gtid_set
     /// Advance current_elem one step.
     inline void next()
     {
-      DBUG_ASSERT(*p != NULL);
+      assert(*p != NULL);
       p= const_cast<Interval_p *>(&(*p)->next);
     }
     /// Return current_elem.
@@ -1590,7 +1604,7 @@ class Gtid_set
     /// Remove current_elem.
     inline void remove(Gtid_set *gtid_set)
     {
-      DBUG_ASSERT(get() != NULL);
+      assert(get() != NULL);
       Interval *next= (*p)->next;
       gtid_set->put_free_interval(*p);
       set(next);
@@ -1623,7 +1637,7 @@ class Gtid_set
     /// Advance to next group.
     inline void next()
     {
-      DBUG_ASSERT(gno > 0 && sidno > 0);
+      assert(gno > 0 && sidno > 0);
       // go to next group in current interval
       gno++;
       // end of interval? then go to next interval for this sidno
@@ -1943,7 +1957,7 @@ class Gtid_set
   mutable size_t cached_string_length;
   /// The String_format that was used when cached_string_length was computed.
   mutable const String_format *cached_string_format;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     The number of chunks.  Used only to check some invariants when
     DBUG is on.
@@ -1989,7 +2003,7 @@ struct Gtid_set_or_null
   /// Return NULL if this is NULL, otherwise return the Gtid_set.
   inline Gtid_set *get_gtid_set() const
   {
-    DBUG_ASSERT(!(is_non_null && gtid_set == NULL));
+    assert(!(is_non_null && gtid_set == NULL));
     return is_non_null ? gtid_set : NULL;
   }
   /**
@@ -2118,7 +2132,7 @@ class Owned_gtids
       for (uint i= 0; i < hash->records; i++)
       {
         Node *node= (Node *)my_hash_element(hash, i);
-        DBUG_ASSERT(node != NULL);
+        assert(node != NULL);
         if (!printed_sid)
         {
           p+= global_sid_map->sidno_to_sid(sidno).to_string(p);
@@ -2168,7 +2182,7 @@ class Owned_gtids
     return false;
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     Debug only: return a newly allocated string representation of
     this Owned_gtids.
@@ -2177,7 +2191,7 @@ class Owned_gtids
   {
     char *str= (char *)my_malloc(key_memory_Owned_gtids_to_string,
                                  get_max_string_length(), MYF(MY_WME));
-    DBUG_ASSERT(str != NULL);
+    assert(str != NULL);
     to_string(str);
     return str;
   }
@@ -2195,7 +2209,7 @@ class Owned_gtids
   */
   void dbug_print(const char *text= "") const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char *str= to_string();
     DBUG_PRINT("info", ("%s%s%s", text, *text ? ": " : "", str));
     my_free(str);
@@ -2222,7 +2236,7 @@ class Owned_gtids
   /// Returns the HASH for the given SIDNO.
   HASH *get_hash(rpl_sidno sidno) const
   {
-    DBUG_ASSERT(sidno >= 1 && sidno <= get_max_sidno());
+    assert(sidno >= 1 && sidno <= get_max_sidno());
     sid_lock->assert_some_lock();
     return sidno_to_hash[sidno - 1];
   }
@@ -2251,18 +2265,18 @@ class Owned_gtids
     /// Advance to next group.
     inline void next()
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (owned_gtids->sid_lock)
         owned_gtids->sid_lock->assert_some_wrlock();
 #endif
 
       while (sidno <= max_sidno)
       {
-        DBUG_ASSERT(hash != NULL);
+        assert(hash != NULL);
         if (node_index < hash->records)
         {
           node= (Node *)my_hash_element(hash, node_index);
-          DBUG_ASSERT(node != NULL);
+          assert(node != NULL);
           // Jump to next node on next iteration.
           node_index++;
           return;
@@ -2477,13 +2491,13 @@ class Gtid_state
   {
     DBUG_ENTER("Gtid_state::acquire_anonymous_ownership");
     sid_lock->assert_some_lock();
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       anonymous_gtid_count.atomic_add(1);
     DBUG_PRINT("info", ("anonymous_gtid_count increased to %d", old_value + 1));
-    DBUG_ASSERT(old_value >= 0);
+    assert(old_value >= 0);
     DBUG_VOID_RETURN;
   }
 
@@ -2492,13 +2506,13 @@ class Gtid_state
   {
     DBUG_ENTER("Gtid_state::release_anonymous_ownership");
     sid_lock->assert_some_lock();
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       anonymous_gtid_count.atomic_add(-1);
     DBUG_PRINT("info", ("anonymous_gtid_count decreased to %d", old_value - 1));
-    DBUG_ASSERT(old_value >= 1);
+    assert(old_value >= 1);
     DBUG_VOID_RETURN;
   }
 
@@ -2515,14 +2529,14 @@ class Gtid_state
   void begin_automatic_gtid_violating_transaction()
   {
     DBUG_ENTER("Gtid_state::begin_automatic_gtid_violating_transaction");
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) <= GTID_MODE_OFF_PERMISSIVE);
-    DBUG_ASSERT(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) <= GTID_MODE_OFF_PERMISSIVE);
+    assert(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       automatic_gtid_violation_count.atomic_add(1);
     DBUG_PRINT("info", ("ongoing_automatic_gtid_violating_transaction_count increased to %d", old_value + 1));
-    DBUG_ASSERT(old_value >= 0);
+    assert(old_value >= 0);
     DBUG_VOID_RETURN;
   }
 
@@ -2533,16 +2547,16 @@ class Gtid_state
   void end_automatic_gtid_violating_transaction()
   {
     DBUG_ENTER("Gtid_state::end_automatic_gtid_violating_transaction");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     global_sid_lock->rdlock();
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) <= GTID_MODE_OFF_PERMISSIVE);
-    DBUG_ASSERT(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) <= GTID_MODE_OFF_PERMISSIVE);
+    assert(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
     global_sid_lock->unlock();
     int32 old_value=
 #endif
       automatic_gtid_violation_count.atomic_add(-1);
     DBUG_PRINT("info", ("ongoing_automatic_gtid_violating_transaction_count decreased to %d", old_value - 1));
-    DBUG_ASSERT(old_value >= 1);
+    assert(old_value >= 1);
     DBUG_VOID_RETURN;
   }
 
@@ -2562,14 +2576,14 @@ class Gtid_state
   void begin_anonymous_gtid_violating_transaction()
   {
     DBUG_ENTER("Gtid_state::begin_anonymous_gtid_violating_transaction");
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
-    DBUG_ASSERT(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
+    assert(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       anonymous_gtid_violation_count.atomic_add(1);
     DBUG_PRINT("info", ("ongoing_anonymous_gtid_violating_transaction_count increased to %d", old_value + 1));
-    DBUG_ASSERT(old_value >= 0);
+    assert(old_value >= 0);
     DBUG_VOID_RETURN;
   }
 
@@ -2580,16 +2594,16 @@ class Gtid_state
   void end_anonymous_gtid_violating_transaction()
   {
     DBUG_ENTER("Gtid_state::end_anonymous_gtid_violating_transaction");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     global_sid_lock->rdlock();
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
-    DBUG_ASSERT(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
+    assert(get_gtid_mode(GTID_MODE_LOCK_SID) != GTID_MODE_ON);
+    assert(get_gtid_consistency_mode() != GTID_CONSISTENCY_MODE_ON);
     global_sid_lock->unlock();
     int32 old_value=
 #endif
       anonymous_gtid_violation_count.atomic_add(-1);
     DBUG_PRINT("info", ("ongoing_anonymous_gtid_violating_transaction_count decreased to %d", old_value - 1));
-    DBUG_ASSERT(old_value >= 1);
+    assert(old_value >= 1);
     DBUG_VOID_RETURN;
   }
 
@@ -2611,15 +2625,15 @@ class Gtid_state
   void begin_gtid_wait(enum_gtid_mode_lock gtid_mode_lock)
   {
     DBUG_ENTER("Gtid_state::begin_gtid_wait");
-    DBUG_ASSERT(get_gtid_mode(gtid_mode_lock) != GTID_MODE_OFF);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(gtid_mode_lock) != GTID_MODE_OFF);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       gtid_wait_count.atomic_add(1);
     DBUG_PRINT("info",
                ("gtid_wait_count changed from %d to %d",
                 old_value, old_value + 1));
-    DBUG_ASSERT(old_value >= 0);
+    assert(old_value >= 0);
     DBUG_VOID_RETURN;
   }
 
@@ -2630,15 +2644,15 @@ class Gtid_state
   void end_gtid_wait()
   {
     DBUG_ENTER("Gtid_state::end_gtid_wait");
-    DBUG_ASSERT(get_gtid_mode(GTID_MODE_LOCK_NONE) != GTID_MODE_OFF);
-#ifndef DBUG_OFF
+    assert(get_gtid_mode(GTID_MODE_LOCK_NONE) != GTID_MODE_OFF);
+#ifndef NDEBUG
     int32 old_value=
 #endif
       gtid_wait_count.atomic_add(-1);
     DBUG_PRINT("info",
                ("gtid_wait_count changed from %d to %d",
                 old_value, old_value - 1));
-    DBUG_ASSERT(old_value >= 1);
+    assert(old_value >= 1);
     DBUG_VOID_RETURN;
   }
 
@@ -2844,7 +2858,7 @@ class Gtid_state
   {
     return global_sid_map->sidno_to_sid(server_sidno);
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     Debug only: Returns an upper bound on the length of the string
     generated by to_string(), not counting '\0'.  The actual length
@@ -2895,7 +2909,7 @@ class Gtid_state
   */
   void dbug_print(const char *text= "") const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     sid_lock->assert_some_wrlock();
     char *str= to_string();
     DBUG_PRINT("info", ("%s%s%s", text, *text ? ": " : "", str));
@@ -3452,7 +3466,7 @@ struct Gtid_specification
   /// Set to undefined. Must only be called if the type is GTID_GROUP.
   void set_undefined()
   {
-    DBUG_ASSERT(type == GTID_GROUP);
+    assert(type == GTID_GROUP);
     type= UNDEFINED_GROUP;
   }
   /// Return true if this Gtid_specification is equal to 'other'.
@@ -3502,7 +3516,7 @@ struct Gtid_specification
     @buf[out]
   */
   int to_string(const rpl_sid *sid, char *buf) const;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /// Debug only: print this Gtid_specification to stdout.
   void print() const
   {
@@ -3517,7 +3531,7 @@ struct Gtid_specification
   */
   void dbug_print(const char *text= "", bool need_lock= false) const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     char buf[MAX_TEXT_LENGTH + 1];
     to_string(global_sid_map, buf, need_lock);
     DBUG_PRINT("info", ("%s%s%s", text, *text ? ": " : "", buf));
diff --git a/sql/rpl_gtid_execution.cc b/sql/rpl_gtid_execution.cc
index 1fd9720805d6..ec1c4a261a62 100644
--- a/sql/rpl_gtid_execution.cc
+++ b/sql/rpl_gtid_execution.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,17 +51,17 @@ bool set_gtid_next(THD *thd, const Gtid_specification &spec)
     char buf[Gtid::MAX_TEXT_LENGTH + 1];
     if (thd->owned_gtid.sidno > 0)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       global_sid_lock->unlock();
       global_sid_lock->wrlock();
-      DBUG_ASSERT(gtid_state->get_owned_gtids()->
-                  thread_owns_anything(thd->thread_id()));
+      assert(gtid_state->get_owned_gtids()->
+             thread_owns_anything(thd->thread_id()));
 #endif
       thd->owned_gtid.to_string(thd->owned_sid, buf);
     }
     else
     {
-      DBUG_ASSERT(gtid_state->get_anonymous_ownership_count() > 0);
+      assert(gtid_state->get_anonymous_ownership_count() > 0);
       strcpy(buf, "ANONYMOUS");
     }
     my_error(ER_CANT_SET_GTID_NEXT_WHEN_OWNING_GTID, MYF(0), buf);
@@ -63,7 +69,7 @@ bool set_gtid_next(THD *thd, const Gtid_specification &spec)
   }
 
   // At this point we should not own any GTID.
-  DBUG_ASSERT(thd->owned_gtid.is_empty());
+  assert(thd->owned_gtid.is_empty());
 
   if (spec.type == AUTOMATIC_GROUP)
   {
@@ -84,13 +90,14 @@ bool set_gtid_next(THD *thd, const Gtid_specification &spec)
   }
   else
   {
-    DBUG_ASSERT(spec.type == GTID_GROUP);
-    DBUG_ASSERT(spec.gtid.sidno >= 1);
-    DBUG_ASSERT(spec.gtid.gno >= 1);
+    assert(spec.type == GTID_GROUP);
+    assert(spec.gtid.sidno >= 1);
+    assert(spec.gtid.gno >= 1);
+    assert(spec.gtid.gno < GNO_END);
     while (true)
     {
       // loop invariant: we should always hold global_sid_lock.rdlock
-      DBUG_ASSERT(lock_count == 1);
+      assert(lock_count == 1);
       global_sid_lock->assert_some_lock();
 
       if (get_gtid_mode(GTID_MODE_LOCK_SID) == GTID_MODE_OFF)
@@ -120,8 +127,9 @@ bool set_gtid_next(THD *thd, const Gtid_specification &spec)
         // acquire_ownership can't fail
         gtid_state->acquire_ownership(thd, spec.gtid);
         thd->variables.gtid_next= spec;
-        DBUG_ASSERT(thd->owned_gtid.sidno >= 1);
-        DBUG_ASSERT(thd->owned_gtid.gno >= 1);
+        assert(thd->owned_gtid.sidno >= 1);
+        assert(thd->owned_gtid.gno >= 1);
+        assert(thd->owned_gtid.gno < GNO_END);
         break;
       }
       // GTID owned by someone (other thread)
@@ -147,7 +155,7 @@ bool set_gtid_next(THD *thd, const Gtid_specification &spec)
              (SYSTEM_THREAD_SLAVE_SQL | SYSTEM_THREAD_SLAVE_WORKER)) != 0)
         {
           // TODO: error is *not* reported on cancel
-          DBUG_ASSERT(thd->rli_slave!= NULL);
+          assert(thd->rli_slave!= NULL);
           Relay_log_info *c_rli= thd->rli_slave->get_c_rli();
           if (c_rli->abort_slave)
           {
@@ -207,7 +215,7 @@ int gtid_acquire_ownership_multiple(THD *thd)
         // break the do-loop and wait for the sid to be updated
         if (owner != 0)
         {
-          DBUG_ASSERT(owner != thd->id);
+          assert(owner != thd->id);
           break;
         }
       }
@@ -245,7 +253,7 @@ int gtid_acquire_ownership_multiple(THD *thd)
     if ((thd->system_thread &
          (SYSTEM_THREAD_SLAVE_SQL | SYSTEM_THREAD_SLAVE_WORKER)) != 0)
     {
-      DBUG_ASSERT(thd->rli_slave != NULL);
+      assert(thd->rli_slave != NULL);
       Relay_log_info *c_rli= thd->rli_slave->get_c_rli();
       if (c_rli->abort_slave)
         DBUG_RETURN(1);
@@ -323,23 +331,23 @@ static inline bool is_already_logged_transaction(const THD *thd)
       if (thd->owned_gtid.sidno == 0)
         DBUG_RETURN(true);
       else
-        DBUG_ASSERT(thd->owned_gtid.equals(gtid_next->gtid));
+        assert(thd->owned_gtid.equals(gtid_next->gtid));
     }
     else
-      DBUG_ASSERT(thd->owned_gtid.sidno == 0 ||
-                  thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
+      assert(thd->owned_gtid.sidno == 0 ||
+             thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS);
   }
   else
   {
 #ifdef HAVE_GTID_NEXT_LIST
     if (gtid_next->type == GTID_GROUP)
     {
-      DBUG_ASSERT(gtid_next_list->contains_gtid(gtid_next->gtid));
+      assert(gtid_next_list->contains_gtid(gtid_next->gtid));
       if (!thd->owned_gtid_set.contains_gtid(gtid_next->gtid))
         DBUG_RETURN(true);
     }
 #else
-    DBUG_ASSERT(0);/*NOTREACHED*/
+    assert(0);/*NOTREACHED*/
 #endif
   }
 
@@ -364,11 +372,11 @@ static inline void skip_statement(const THD *thd)
                       thd->lex->sql_command,
                       thd->thread_id()));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const Gtid_set* executed_gtids= gtid_state->get_executed_gtids();
   global_sid_lock->rdlock();
   gtid_state->lock_sidno(thd->variables.gtid_next.gtid.sidno);
-  DBUG_ASSERT(executed_gtids->contains_gtid(thd->variables.gtid_next.gtid));
+  assert(executed_gtids->contains_gtid(thd->variables.gtid_next.gtid));
   gtid_state->unlock_sidno(thd->variables.gtid_next.gtid.sidno);
   global_sid_lock->unlock();
 #endif
@@ -454,8 +462,8 @@ enum_gtid_statement_status gtid_pre_statement_checks(THD *thd)
                       "owned_gtid.{sidno,gno}={%d,%lld}",
                       gtid_next->type,
                       thd->owned_gtid.sidno, thd->owned_gtid.gno));
-  DBUG_ASSERT(gtid_next->type != AUTOMATIC_GROUP ||
-              thd->owned_gtid.is_empty());
+  assert(gtid_next->type != AUTOMATIC_GROUP ||
+         thd->owned_gtid.is_empty());
 
   if ((stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_BEGIN) ||
        thd->lex->sql_command == SQLCOM_BEGIN) &&
@@ -554,13 +562,13 @@ enum_gtid_statement_status gtid_pre_statement_checks(THD *thd)
     case ANONYMOUS_GROUP:
       DBUG_RETURN(GTID_STATEMENT_EXECUTE);
     case INVALID_GROUP:
-      DBUG_ASSERT(0);/*NOTREACHED*/
+      assert(0);/*NOTREACHED*/
     }
 #else
-    DBUG_ASSERT(0);/*NOTREACHED*/
+    assert(0);/*NOTREACHED*/
 #endif
   }
-  DBUG_ASSERT(0);/*NOTREACHED*/
+  assert(0);/*NOTREACHED*/
   DBUG_RETURN(GTID_STATEMENT_CANCEL);
 }
 
@@ -622,7 +630,7 @@ void gtid_set_performance_schema_values(const THD *thd)
     // Thread does not own anything.
     else
     {
-      DBUG_ASSERT(thd->owned_gtid.sidno == 0);
+      assert(thd->owned_gtid.sidno == 0);
       spec.type= AUTOMATIC_GROUP;
     }
     MYSQL_SET_TRANSACTION_GTID(thd->m_transaction_psi, &thd->owned_sid, &spec);
diff --git a/sql/rpl_gtid_misc.cc b/sql/rpl_gtid_misc.cc
index 1a98bffa495a..0cf78a60ad76 100644
--- a/sql/rpl_gtid_misc.cc
+++ b/sql/rpl_gtid_misc.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -180,7 +186,7 @@ int Gtid::to_string(const Sid_map *sid_map, char *buf, bool need_lock) const
   }
   else
   {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
     /*
       NULL is only allowed in debug mode, since the sidno does not
       make sense for users but is useful to include in debug
@@ -235,16 +241,16 @@ bool Gtid::is_valid(const char *text)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void check_return_status(enum_return_status status, const char *action,
                          const char *status_name, int allow_unreported)
 {
   if (status != RETURN_STATUS_OK)
   {
-    DBUG_ASSERT(allow_unreported || status == RETURN_STATUS_REPORTED_ERROR);
+    assert(allow_unreported || status == RETURN_STATUS_REPORTED_ERROR);
     if (status == RETURN_STATUS_REPORTED_ERROR)
     {
-#if !defined(MYSQL_CLIENT) && !defined(DBUG_OFF)
+#if !defined(MYSQL_CLIENT) && !defined(NDEBUG)
       THD *thd= current_thd;
       /*
         We create a new system THD with 'SYSTEM_THREAD_COMPRESS_GTID_TABLE'
@@ -253,16 +259,16 @@ void check_return_status(enum_return_status status, const char *action,
         assert in this case. We assert that diagnostic area logged the error
         outside server startup since the assert is realy useful.
      */
-      DBUG_ASSERT(thd == NULL ||
-                  thd->get_stmt_da()->status() == Diagnostics_area::DA_ERROR ||
-                  (thd->get_stmt_da()->status() == Diagnostics_area::DA_EMPTY &&
-                   thd->system_thread == SYSTEM_THREAD_COMPRESS_GTID_TABLE));
+      assert(thd == NULL ||
+             thd->get_stmt_da()->status() == Diagnostics_area::DA_ERROR ||
+             (thd->get_stmt_da()->status() == Diagnostics_area::DA_EMPTY &&
+              thd->system_thread == SYSTEM_THREAD_COMPRESS_GTID_TABLE));
 #endif
     }
     DBUG_PRINT("info", ("%s error %d (%s)", action, status, status_name));
   }
 }
-#endif // ! DBUG_OFF
+#endif // ! NDEBUG
 
 
 #ifndef MYSQL_CLIENT
diff --git a/sql/rpl_gtid_mutex_cond_array.cc b/sql/rpl_gtid_mutex_cond_array.cc
index a05e0db20bda..c53cd5b260b1 100644
--- a/sql/rpl_gtid_mutex_cond_array.cc
+++ b/sql/rpl_gtid_mutex_cond_array.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -80,7 +86,7 @@ enum_return_status Mutex_cond_array::ensure_index(int n)
       mysql_mutex_init(key_gtid_ensure_index_mutex, &mutex_cond->mutex, NULL);
       mysql_cond_init(key_gtid_ensure_index_cond, &mutex_cond->cond);
       m_array.push_back(mutex_cond);
-      DBUG_ASSERT(&get_mutex_cond(i)->mutex == &mutex_cond->mutex);
+      assert(&get_mutex_cond(i)->mutex == &mutex_cond->mutex);
     }
   }
   RETURN_OK;
diff --git a/sql/rpl_gtid_owned.cc b/sql/rpl_gtid_owned.cc
index 2ae9f72198b9..187625220490 100644
--- a/sql/rpl_gtid_owned.cc
+++ b/sql/rpl_gtid_owned.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -80,7 +86,9 @@ enum_return_status Owned_gtids::add_gtid_owner(const Gtid &gtid,
                                                my_thread_id owner)
 {
   DBUG_ENTER("Owned_gtids::add_gtid_owner(Gtid, my_thread_id)");
-  DBUG_ASSERT(gtid.sidno <= get_max_sidno());
+  assert(gtid.sidno <= get_max_sidno());
+  assert(gtid.gno > 0);
+  assert(gtid.gno < GNO_END);
   Node *n= (Node *)my_malloc(key_memory_Sid_map_Node,
                              sizeof(Node), MYF(MY_WME));
   if (n == NULL)
@@ -105,10 +113,10 @@ void Owned_gtids::remove_gtid(const Gtid &gtid, const my_thread_id owner)
 {
   DBUG_ENTER("Owned_gtids::remove_gtid(Gtid)");
   //printf("Owned_gtids::remove(sidno=%d gno=%lld)\n", sidno, gno);
-  //DBUG_ASSERT(contains_gtid(sidno, gno)); // allow group not owned
+  //assert(contains_gtid(sidno, gno)); // allow group not owned
   HASH_SEARCH_STATE state;
   HASH *hash= get_hash(gtid.sidno);
-  DBUG_ASSERT(hash != NULL);
+  assert(hash != NULL);
 
   for (Node *node= (Node *)my_hash_search(hash, (const uchar *)&gtid.gno, sizeof(rpl_gno));
        node != NULL;
@@ -116,11 +124,11 @@ void Owned_gtids::remove_gtid(const Gtid &gtid, const my_thread_id owner)
   {
     if (node->owner == owner)
     {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
       my_hash_delete(hash, (uchar *)node);
 #else
       // my_hash_delete returns nonzero if the element does not exist
-      DBUG_ASSERT(my_hash_delete(hash, (uchar *)node) == 0);
+      assert(my_hash_delete(hash, (uchar *)node) == 0);
 #endif
       break;
     }
@@ -167,7 +175,7 @@ void Owned_gtids::get_gtids(Gtid_set &gtid_set) const
 bool Owned_gtids::contains_gtid(const Gtid &gtid) const
 {
   HASH *hash= get_hash(gtid.sidno);
-  DBUG_ASSERT(hash != NULL);
+  assert(hash != NULL);
   sid_lock->assert_some_lock();
 
   return my_hash_search(hash, (const uchar *)&gtid.gno, sizeof(rpl_gno)) != NULL;
@@ -177,7 +185,7 @@ bool Owned_gtids::is_owned_by(const Gtid &gtid, const my_thread_id thd_id) const
 {
   HASH_SEARCH_STATE state;
   HASH *hash= get_hash(gtid.sidno);
-  DBUG_ASSERT(hash != NULL);
+  assert(hash != NULL);
   Node *node= (Node*) my_hash_first(hash, (const uchar *)&gtid.gno,
                                     sizeof(rpl_gno), &state);
   if (thd_id == 0)
diff --git a/sql/rpl_gtid_persist.cc b/sql/rpl_gtid_persist.cc
index df5457ebb72b..3fb07a887962 100644
--- a/sql/rpl_gtid_persist.cc
+++ b/sql/rpl_gtid_persist.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -58,8 +64,8 @@ class THD::Attachable_trx_rw : public THD::Attachable_trx
   ~Attachable_trx_rw()
   {
     /* The attachable transaction has been already committed */
-    DBUG_ASSERT(!m_thd->get_transaction()->is_active(Transaction_ctx::STMT)
-                && !m_thd->get_transaction()->is_active(Transaction_ctx::SESSION));
+    assert(!m_thd->get_transaction()->is_active(Transaction_ctx::STMT)
+           && !m_thd->get_transaction()->is_active(Transaction_ctx::SESSION));
 
     m_thd->get_transaction()->xid_state()->set_state(m_xa_state_saved);
     m_thd->tx_read_only= true;
@@ -80,7 +86,7 @@ bool THD::is_attachable_rw_transaction_active() const
 
 void THD::begin_attachable_rw_transaction()
 {
-  DBUG_ASSERT(!m_attachable_trx);
+  assert(!m_attachable_trx);
 
   m_attachable_trx= new Attachable_trx_rw(this);
 }
@@ -132,10 +138,15 @@ THD *Gtid_table_access_context::create_thd()
   */
   lex_start(thd);
   mysql_reset_thd_for_next_command(thd);
-
+  thd->set_skip_readonly_check();
   return(thd);
 }
 
+void Gtid_table_access_context::drop_thd(THD *thd)
+{
+  thd->reset_skip_readonly_check();
+  System_table_access::drop_thd(thd);
+}
 
 void Gtid_table_access_context::before_open(THD* thd)
 {
@@ -174,10 +185,10 @@ bool Gtid_table_access_context::init(THD **thd, TABLE **table, bool is_write)
       the main transaction thanks to rejection to update
       'mysql.gtid_executed' by XA main transaction.
     */
-    DBUG_ASSERT((*thd)->get_transaction()->xid_state()->
-                has_state(XID_STATE::XA_IDLE) ||
-                (*thd)->get_transaction()->xid_state()->
-                has_state(XID_STATE::XA_PREPARED));
+    assert((*thd)->get_transaction()->xid_state()->
+           has_state(XID_STATE::XA_IDLE) ||
+           (*thd)->get_transaction()->xid_state()->
+           has_state(XID_STATE::XA_PREPARED));
 
     (*thd)->begin_attachable_rw_transaction();
   }
@@ -513,7 +524,7 @@ int Gtid_table_persistor::save(TABLE *table, const Gtid_set *gtid_set)
     @retval 0    OK.
     @retval -1   Error.
 */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static int dbug_test_on_compress(THD *thd)
 {
   DBUG_ENTER("dbug_test_on_compress");
@@ -525,9 +536,9 @@ static int dbug_test_on_compress(THD *thd)
   DBUG_EXECUTE_IF("fetch_compression_thread_stage_info",
                   {
                     const char act[]= "now signal fetch_thread_stage";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
   /* Sleep a little, so that we can always fetch the correct stage info. */
   DBUG_EXECUTE_IF("fetch_compression_thread_stage_info", sleep(1););
@@ -539,9 +550,9 @@ static int dbug_test_on_compress(THD *thd)
   DBUG_EXECUTE_IF("simulate_crash_on_compress_gtid_table",
                   {
                     const char act[]= "now wait_for notified_thread_complete";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
   DBUG_EXECUTE_IF("simulate_crash_on_compress_gtid_table", DBUG_SUICIDE(););
 
@@ -564,9 +575,9 @@ int Gtid_table_persistor::compress(THD *thd)
   DBUG_EXECUTE_IF("compress_gtid_table",
                   {
                     const char act[]= "now signal complete_compression";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   DBUG_RETURN(error);
@@ -597,7 +608,7 @@ int Gtid_table_persistor::compress_in_single_transaction(THD *thd,
   if ((error= compress_first_consecutive_range(table, is_complete)))
     goto end;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   error= dbug_test_on_compress(thd);
 #endif
 
@@ -888,9 +899,9 @@ extern "C" void *compress_gtid_table(void *p_thd)
       DBUG_EXECUTE_IF("simulate_error_on_compress_gtid_table",
                       {
                         const char act[]= "now signal compression_failed";
-                        DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                        DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                           STRING_WITH_LEN(act)));
+                        assert(opt_debug_sync_timeout > 0);
+                        assert(!debug_sync_set_action(current_thd,
+                                                      STRING_WITH_LEN(act)));
                       };);
     }
   }
diff --git a/sql/rpl_gtid_persist.h b/sql/rpl_gtid_persist.h
index c12c75c2cf1d..154ec7789cf4 100644
--- a/sql/rpl_gtid_persist.h
+++ b/sql/rpl_gtid_persist.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -82,6 +88,7 @@ class Gtid_table_access_context : public System_table_access
       @retval THD* Pointer to thread structure
   */
   THD *create_thd();
+  void drop_thd(THD* thd);
 private:
   /* Pointer to new created THD. */
   THD *m_drop_thd_object;
diff --git a/sql/rpl_gtid_set.cc b/sql/rpl_gtid_set.cc
index 39bd5fadda70..36dc6a67d870 100644
--- a/sql/rpl_gtid_set.cc
+++ b/sql/rpl_gtid_set.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -68,7 +74,7 @@ Gtid_set::Gtid_set(Sid_map *_sid_map, const char *text,
   : sid_lock(_sid_lock), sid_map(_sid_map),
     m_intervals(key_memory_Gtid_set_Interval_chunk)
 {
-  DBUG_ASSERT(_sid_map != NULL);
+  assert(_sid_map != NULL);
   init();
   *status= add_gtid_text(text);
 }
@@ -85,7 +91,7 @@ void Gtid_set::init()
   if (sid_lock)
     mysql_mutex_init(key_gtid_executed_free_intervals_mutex,
                      &free_intervals_mutex, NULL);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   n_chunks= 0;
 #endif
   DBUG_VOID_RETURN;
@@ -101,11 +107,11 @@ Gtid_set::~Gtid_set()
     Interval_chunk *next_chunk= chunk->next;
     my_free(chunk);
     chunk= next_chunk;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     n_chunks--;
 #endif
   }
-  DBUG_ASSERT(n_chunks == 0);
+  assert(n_chunks == 0);
   if (sid_lock)
     mysql_mutex_destroy(&free_intervals_mutex);
   DBUG_VOID_RETURN;
@@ -121,8 +127,8 @@ enum_return_status Gtid_set::ensure_sidno(rpl_sidno sidno)
                       "sid_map->get_max_sidno()=%d",
                       sidno, get_max_sidno(), sid_map,
                       sid_map != NULL ? sid_map->get_max_sidno() : 0));
-  DBUG_ASSERT(sid_map == NULL || sidno <= sid_map->get_max_sidno());
-  DBUG_ASSERT(sid_map == NULL || get_max_sidno() <= sid_map->get_max_sidno());
+  assert(sid_map == NULL || sidno <= sid_map->get_max_sidno());
+  assert(sid_map == NULL || get_max_sidno() <= sid_map->get_max_sidno());
   rpl_sidno max_sidno= get_max_sidno();
   if (sidno > max_sidno)
   {
@@ -235,7 +241,7 @@ void Gtid_set::create_new_chunk(int size)
   // store the chunk in the list of chunks
   new_chunk->next= chunks;
   chunks= new_chunk;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   n_chunks++;
 #endif
   // add the intervals in the chunk to the list of free intervals
@@ -311,8 +317,8 @@ Gtid_set::add_gno_interval(Interval_iterator *ivitp,
                            Free_intervals_lock *lock)
 {
   DBUG_ENTER("Gtid_set::add_gno_interval(Interval_iterator*, rpl_gno, rpl_gno)");
-  DBUG_ASSERT(start > 0);
-  DBUG_ASSERT(start < end);
+  assert(start > 0);
+  assert(start < end);
   DBUG_PRINT("info", ("start=%lld end=%lld", start, end));
   Interval *iv;
   Interval_iterator ivit= *ivitp;
@@ -369,7 +375,7 @@ void Gtid_set::remove_gno_interval(Interval_iterator *ivitp,
                                    Free_intervals_lock *lock)
 {
   DBUG_ENTER("Gtid_set::remove_gno_interval(Interval_iterator *ivitp, rpl_gno start, rpl_gno end)");
-  DBUG_ASSERT(start < end);
+  assert(start < end);
   Interval_iterator ivit= *ivitp;
   Interval *iv;
   has_cached_string_length= false;
@@ -387,7 +393,7 @@ void Gtid_set::remove_gno_interval(Interval_iterator *ivitp,
   }
 
   // Now iv ends after the beginning of the removed interval.
-  DBUG_ASSERT(iv != NULL && iv->end > start);
+  assert(iv != NULL && iv->end > start);
   if (iv->start < start)
   {
     if (iv->end > end)
@@ -413,7 +419,7 @@ void Gtid_set::remove_gno_interval(Interval_iterator *ivitp,
   }
 
   // Now iv starts after the beginning of the removed interval.
-  DBUG_ASSERT(iv != NULL && iv->start >= start);
+  assert(iv != NULL && iv->start >= start);
   while (iv->end <= end)
   {
     // iv ends before the end of the removed interval, so it is
@@ -426,7 +432,7 @@ void Gtid_set::remove_gno_interval(Interval_iterator *ivitp,
   }
 
   // Now iv ends after the removed interval.
-  DBUG_ASSERT(iv != NULL && iv->end > end);
+  assert(iv != NULL && iv->end > end);
   if (iv->start < end)
   {
     // iv begins before the end of the removed interval: truncate iv
@@ -443,7 +449,7 @@ rpl_gno parse_gno(const char **s)
 {
   char *endp;
   rpl_gno ret= my_strtoll(*s, &endp, 0);
-  if (ret < 0 || ret == LLONG_MAX)
+  if (ret < 0 || ret >= GNO_END)
     return -1;
   *s= endp;
   return ret;
@@ -459,7 +465,7 @@ int format_gno(char *s, rpl_gno gno)
 enum_return_status Gtid_set::add_gtid_text(const char *text, bool *anonymous)
 {
   DBUG_ENTER("Gtid_set::add_gtid_text(const char *, bool *)");
-  DBUG_ASSERT(sid_map != NULL);
+  assert(sid_map != NULL);
   if (sid_lock != NULL)
     sid_lock->assert_some_wrlock();
   const char *s= text;
@@ -593,7 +599,7 @@ enum_return_status Gtid_set::add_gtid_text(const char *text, bool *anonymous)
       goto parse_error;
     }
   }
-  DBUG_ASSERT(0);
+  assert(0);
 
 parse_error:
   BINLOG_ERROR(("Malformed Gtid_set specification '%.200s'.", text),
@@ -659,7 +665,7 @@ Gtid_set::add_gno_intervals(rpl_sidno sidno,
                             Free_intervals_lock *lock)
 {
   DBUG_ENTER("Gtid_set::add_gno_intervals(rpl_sidno, Const_interval_iterator, bool *)");
-  DBUG_ASSERT(sidno >= 1 && sidno <= get_max_sidno());
+  assert(sidno >= 1 && sidno <= get_max_sidno());
   const Interval *other_iv;
   Interval_iterator ivit(this, sidno);
   while ((other_iv= other_ivit.get()) != NULL)
@@ -678,7 +684,7 @@ Gtid_set::remove_gno_intervals(rpl_sidno sidno,
                                Free_intervals_lock *lock)
 {
   DBUG_ENTER("Gtid_set::remove_gno_intervals(rpl_sidno, Interval_iterator, Free_intervals_lock *)");
-  DBUG_ASSERT(sidno >= 1 && sidno <= get_max_sidno());
+  assert(sidno >= 1 && sidno <= get_max_sidno());
   const Interval *other_iv;
   Interval_iterator ivit(this, sidno);
   while ((other_iv= other_ivit.get()) != NULL)
@@ -695,8 +701,8 @@ Gtid_set::remove_gno_intervals(rpl_sidno sidno,
 void Gtid_set::remove_intervals_for_sidno(Gtid_set *other, rpl_sidno sidno)
 {
   // Currently only works if this and other use the same Sid_map.
-  DBUG_ASSERT(other->sid_map == sid_map || other->sid_map == NULL ||
-              sid_map == NULL);
+  assert(other->sid_map == sid_map || other->sid_map == NULL ||
+         sid_map == NULL);
   Const_interval_iterator other_ivit(other, sidno);
   Free_intervals_lock lock(this);
   remove_gno_intervals(sidno, other_ivit, &lock);
@@ -784,11 +790,12 @@ void Gtid_set::remove_gtid_set(const Gtid_set *other)
 bool Gtid_set::contains_gtid(rpl_sidno sidno, rpl_gno gno) const
 {
   DBUG_ENTER("Gtid_set::contains_gtid");
-  DBUG_ASSERT(sidno >= 1 && gno >= 1);
   if (sid_lock != NULL)
     sid_lock->assert_some_lock();
   if (sidno > get_max_sidno())
     DBUG_RETURN(false);
+  assert(sidno >= 1);
+  assert(gno >= 1);
   Const_interval_iterator ivit(this, sidno);
   const Interval *iv;
   while ((iv= ivit.get()) != NULL)
@@ -851,7 +858,7 @@ size_t Gtid_set::to_string(char *buf, bool need_lock,
                         const Gtid_set::String_format *sf) const
 {
   DBUG_ENTER("Gtid_set::to_string");
-  DBUG_ASSERT(sid_map != NULL);
+  assert(sid_map != NULL);
   if (sid_lock != NULL)
   {
     if (need_lock)
@@ -870,7 +877,7 @@ size_t Gtid_set::to_string(char *buf, bool need_lock,
     DBUG_RETURN(sf->empty_set_string_length);
   } 
   rpl_sidno map_max_sidno= sid_map->get_max_sidno();
-  DBUG_ASSERT(get_max_sidno() <= map_max_sidno);
+  assert(get_max_sidno() <= map_max_sidno);
   memcpy(buf, sf->begin, sf->begin_length);
   char *s= buf + sf->begin_length;
   bool first_sidno= true;
@@ -921,7 +928,7 @@ size_t Gtid_set::to_string(char *buf, bool need_lock,
   DBUG_PRINT("info", ("ret='%s' strlen(s)=%zu s-buf=%lu get_string_length=%llu", buf,
              strlen(buf), (ulong) (s - buf),
              static_cast<unsigned long long>(get_string_length(sf))));
-  DBUG_ASSERT((ulong) (s - buf) == get_string_length(sf));
+  assert((ulong) (s - buf) == get_string_length(sf));
   if (sid_lock != NULL && need_lock)
     sid_lock->unlock();
   DBUG_RETURN((int)(s - buf));
@@ -931,11 +938,11 @@ size_t Gtid_set::to_string(char *buf, bool need_lock,
 void Gtid_set::get_gtid_intervals(list<Gtid_interval> *gtid_intervals) const
 {
   DBUG_ENTER("Gtid_set::get_gtid_intervals");
-  DBUG_ASSERT(sid_map != NULL);
+  assert(sid_map != NULL);
   if (sid_lock != NULL)
     sid_lock->assert_some_wrlock();
   rpl_sidno map_max_sidno= sid_map->get_max_sidno();
-  DBUG_ASSERT(get_max_sidno() <= map_max_sidno);
+  assert(get_max_sidno() <= map_max_sidno);
   for (int sid_i= 0; sid_i < map_max_sidno; sid_i++)
   {
     rpl_sidno sidno= sid_map->get_sorted_sidno(sid_i);
@@ -964,7 +971,8 @@ void Gtid_set::get_gtid_intervals(list<Gtid_interval> *gtid_intervals) const
 */
 static size_t get_string_length(rpl_gno gno)
 {
-  DBUG_ASSERT(gno >= 1 && gno < MAX_GNO);
+  assert(gno >= 1);
+  assert(gno < GNO_END);
   rpl_gno tmp_gno= gno;
   size_t len= 0;
   do
@@ -972,9 +980,9 @@ static size_t get_string_length(rpl_gno gno)
     tmp_gno /= 10;
     len++;
   } while (tmp_gno != 0);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[22];
-  DBUG_ASSERT(my_snprintf(buf, 22, "%lld", gno) == len);
+  assert(my_snprintf(buf, 22, "%lld", gno) == len);
 #endif
   return len;
 }
@@ -982,7 +990,7 @@ static size_t get_string_length(rpl_gno gno)
 
 size_t Gtid_set::get_string_length(const Gtid_set::String_format *sf) const
 {
-  DBUG_ASSERT(sid_map != NULL);
+  assert(sid_map != NULL);
   if (sid_lock != NULL)
     sid_lock->assert_some_wrlock();
   if (sf == NULL)
@@ -1120,7 +1128,7 @@ bool Gtid_set::equals(const Gtid_set *other) const
     sid_i++;
     other_sid_i++;
   }
-  DBUG_ASSERT(0); // not reached
+  assert(0); // not reached
   DBUG_RETURN(true);
 }
 
@@ -1273,7 +1281,7 @@ bool Gtid_set::is_interval_intersection_nonempty(Const_interval_iterator *ivit1,
   DBUG_ENTER("is_interval_intersection_nonempty");
   const Interval *iv1= ivit1->get();
   const Interval *iv2= ivit2->get();
-  DBUG_ASSERT(iv1 != NULL);
+  assert(iv1 != NULL);
   if (iv2 == NULL)
     DBUG_RETURN(false);
 
@@ -1381,11 +1389,11 @@ Gtid_set::intersection(const Gtid_set *other, Gtid_set *result)
   DBUG_ENTER("Gtid_set::intersection(Gtid_set *, Gtid_set *)");
   if (sid_lock != NULL)
     sid_lock->assert_some_wrlock();
-  DBUG_ASSERT(result != NULL);
-  DBUG_ASSERT(other != NULL);
-  DBUG_ASSERT(result != this);
-  DBUG_ASSERT(result != other);
-  DBUG_ASSERT(other != this);
+  assert(result != NULL);
+  assert(other != NULL);
+  assert(result != this);
+  assert(result != other);
+  assert(other != this);
   /**
     @todo: This algorithm is simple, a little bit slower than
     necessary.  It would be more efficient to iterate over intervals
@@ -1455,7 +1463,7 @@ void Gtid_set::encode(uchar *buf) const
   }
   // store number of sids
   int8store(n_sids_p, n_sids);
-  DBUG_ASSERT(buf - n_sids_p == (int)get_encoded_length());
+  assert(buf - n_sids_p == (int)get_encoded_length());
   DBUG_VOID_RETURN;
 }
 
@@ -1534,7 +1542,7 @@ enum_return_status Gtid_set::add_gtid_encoding(const uchar *encoded,
       add_gno_interval(&ivit, start, end, &lock);
     }
   }
-  DBUG_ASSERT(pos <= length);
+  assert(pos <= length);
   if (actual_length == NULL)
   {
     if (pos != length)
diff --git a/sql/rpl_gtid_sid_map.cc b/sql/rpl_gtid_sid_map.cc
index 944902bfce88..f6c0bd2a35b3 100644
--- a/sql/rpl_gtid_sid_map.cc
+++ b/sql/rpl_gtid_sid_map.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -66,7 +72,7 @@ enum_return_status Sid_map::clear()
 rpl_sidno Sid_map::add_sid(const rpl_sid &sid)
 {
   DBUG_ENTER("Sid_map::add_sid(const rpl_sid *)");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[binary_log::Uuid::TEXT_LENGTH + 1];
   sid.to_string(buf);
   DBUG_PRINT("info", ("SID=%s", buf));
diff --git a/sql/rpl_gtid_specification.cc b/sql/rpl_gtid_specification.cc
index 8e37774a6d3b..354336e46010 100644
--- a/sql/rpl_gtid_specification.cc
+++ b/sql/rpl_gtid_specification.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -25,7 +31,7 @@
 enum_return_status Gtid_specification::parse(Sid_map *sid_map, const char *text)
 {
   DBUG_ENTER("Gtid_specification::parse");
-  DBUG_ASSERT(text != NULL);
+  assert(text != NULL);
   if (my_strcasecmp(&my_charset_latin1, text, "AUTOMATIC") == 0)
   {
     type= AUTOMATIC_GROUP;
@@ -50,7 +56,7 @@ enum_return_status Gtid_specification::parse(Sid_map *sid_map, const char *text)
 bool Gtid_specification::is_valid(const char *text)
 {
   DBUG_ENTER("Gtid_specification::is_valid");
-  DBUG_ASSERT(text != NULL);
+  assert(text != NULL);
   if (my_strcasecmp(&my_charset_latin1, text, "AUTOMATIC") == 0)
     DBUG_RETURN(true);
   else if (my_strcasecmp(&my_charset_latin1, text, "ANONYMOUS") == 0)
@@ -89,7 +95,7 @@ int Gtid_specification::to_string(const rpl_sid *sid, char *buf) const
   case GTID_GROUP:
     DBUG_RETURN(gtid.to_string(*sid, buf));
   }
-  DBUG_ASSERT(0);
+  assert(0);
   DBUG_RETURN(0);
 }
 
diff --git a/sql/rpl_gtid_state.cc b/sql/rpl_gtid_state.cc
index 79aad1746f37..f4c19c391d09 100644
--- a/sql/rpl_gtid_state.cc
+++ b/sql/rpl_gtid_state.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -55,9 +61,9 @@ enum_return_status Gtid_state::acquire_ownership(THD *thd, const Gtid &gtid)
   // caller must take both global_sid_lock and lock on the SIDNO.
   global_sid_lock->assert_some_lock();
   gtid_state->assert_sidno_lock_owner(gtid.sidno);
-  DBUG_ASSERT(!executed_gtids.contains_gtid(gtid));
+  assert(!executed_gtids.contains_gtid(gtid));
   DBUG_PRINT("info", ("gtid=%d:%lld", gtid.sidno, gtid.gno));
-  DBUG_ASSERT(thd->owned_gtid.sidno == 0);
+  assert(thd->owned_gtid.sidno == 0);
   if (owned_gtids.add_gtid_owner(gtid, thd->thread_id()) != RETURN_STATUS_OK)
     goto err;
   if (thd->get_gtid_next_list() != NULL)
@@ -67,7 +73,7 @@ enum_return_status Gtid_state::acquire_ownership(THD *thd, const Gtid &gtid)
     thd->owned_gtid.sidno= THD::OWNED_SIDNO_GTID_SET;
     thd->owned_sid.clear();
 #else
-    DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
   else
@@ -89,7 +95,7 @@ enum_return_status Gtid_state::acquire_ownership(THD *thd, const Gtid &gtid)
       g= git.get();
     }
 #else
-    DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
   thd->clear_owned_gtids();
@@ -116,7 +122,7 @@ void Gtid_state::unlock_owned_sidnos(const THD *thd)
 #ifdef HAVE_GTID_NEXT_LIST
     unlock_sidnos(&thd->owned_gtid_set);
 #else
-    DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
   else if (thd->owned_gtid.sidno > 0)
@@ -133,7 +139,7 @@ void Gtid_state::broadcast_owned_sidnos(const THD *thd)
 #ifdef HAVE_GTID_NEXT_LIST
     broadcast_sidnos(&thd->owned_gtid_set);
 #else
-    DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
   else if (thd->owned_gtid.sidno > 0)
@@ -270,7 +276,7 @@ void Gtid_state::end_gtid_violating_transaction(THD *thd)
       end_automatic_gtid_violating_transaction();
     else
     {
-      DBUG_ASSERT(thd->variables.gtid_next.type == ANONYMOUS_GROUP);
+      assert(thd->variables.gtid_next.type == ANONYMOUS_GROUP);
       end_anonymous_gtid_violating_transaction();
     }
     thd->has_gtid_consistency_violation= false;
@@ -289,8 +295,7 @@ bool Gtid_state::wait_for_sidno(THD *thd, rpl_sidno sidno,
   sid_locks.enter_cond(thd, sidno,
                        &stage_waiting_for_gtid_to_be_committed,
                        &old_stage);
-  bool ret= (thd->killed != THD::NOT_KILLED ||
-             sid_locks.wait(thd, sidno, abstime));
+  bool ret= sid_locks.wait(thd, sidno, abstime);
   // Can't call sid_locks.unlock() as that requires global_sid_lock.
   mysql_mutex_unlock(thd->current_mutex);
   thd->EXIT_COND(&old_stage);
@@ -305,8 +310,8 @@ bool Gtid_state::wait_for_gtid(THD *thd, const Gtid &gtid,
   DBUG_PRINT("info", ("SIDNO=%d GNO=%lld thread_id=%u",
                       gtid.sidno, gtid.gno,
                       thd->thread_id()));
-  DBUG_ASSERT(!owned_gtids.is_owned_by(gtid, thd->thread_id()));
-  DBUG_ASSERT(!owned_gtids.is_owned_by(gtid, 0));
+  assert(!owned_gtids.is_owned_by(gtid, thd->thread_id()));
+  assert(!owned_gtids.is_owned_by(gtid, 0));
 
   bool ret= wait_for_sidno(thd, gtid.sidno, abstime);
   DBUG_RETURN(ret);
@@ -324,10 +329,12 @@ bool Gtid_state::wait_for_gtid_set(THD *thd, Gtid_set* wait_for,
 
   global_sid_lock->assert_some_rdlock();
 
-  DBUG_ASSERT(wait_for->get_sid_map() == global_sid_map);
+  assert(wait_for->get_sid_map() == global_sid_map);
 
-  if (timeout > 0)
-    set_timespec_nsec(&abstime, (ulonglong) timeout * 1000000000ULL);
+  if (timeout > 0) {
+    set_timespec_nsec(&abstime,
+                      static_cast<ulonglong>(timeout * 1000000000ULL));
+  }
 
   /*
     Algorithm:
@@ -464,7 +471,7 @@ rpl_gno Gtid_state::get_automatic_gno(rpl_sidno sidno) const
   while (true)
   {
     const Gtid_set::Interval *iv= ivit.get();
-    rpl_gno next_interval_start= iv != NULL ? iv->start : MAX_GNO;
+    rpl_gno next_interval_start= iv != NULL ? iv->start : GNO_END;
     while (next_candidate.gno < next_interval_start &&
            DBUG_EVALUATE_IF("simulate_gno_exhausted", false, true))
     {
@@ -479,7 +486,7 @@ rpl_gno Gtid_state::get_automatic_gno(rpl_sidno sidno) const
       my_error(ER_GNO_EXHAUSTED, MYF(0));
       DBUG_RETURN(-1);
     }
-    if (next_candidate.gno <= iv->end)
+    if (next_candidate.gno < iv->end)
       next_candidate.gno= iv->end;
     ivit.next();
   }
@@ -507,10 +514,10 @@ enum_return_status Gtid_state::generate_automatic_gtid(THD *thd,
   DBUG_ENTER("Gtid_state::generate_automatic_gtid");
   enum_return_status ret= RETURN_STATUS_OK;
 
-  DBUG_ASSERT(thd->variables.gtid_next.type == AUTOMATIC_GROUP);
-  DBUG_ASSERT(specified_sidno >= 0);
-  DBUG_ASSERT(specified_gno >= 0);
-  DBUG_ASSERT(thd->owned_gtid.is_empty());
+  assert(thd->variables.gtid_next.type == AUTOMATIC_GROUP);
+  assert(specified_sidno >= 0);
+  assert(specified_gno >= 0);
+  assert(thd->owned_gtid.is_empty());
 
   bool locked_sidno_was_passed_null = (locked_sidno == NULL);
 
@@ -591,7 +598,7 @@ enum_return_status Gtid_state::generate_automatic_gtid(THD *thd,
 
 void Gtid_state::lock_sidnos(const Gtid_set *gs)
 {
-  DBUG_ASSERT(gs);
+  assert(gs);
   rpl_sidno max_sidno= gs->get_max_sidno();
   for (rpl_sidno sidno= 1; sidno <= max_sidno; sidno++)
     if (gs->contains_sidno(sidno))
@@ -601,7 +608,7 @@ void Gtid_state::lock_sidnos(const Gtid_set *gs)
 
 void Gtid_state::unlock_sidnos(const Gtid_set *gs)
 {
-  DBUG_ASSERT(gs);
+  assert(gs);
   rpl_sidno max_sidno= gs->get_max_sidno();
   for (rpl_sidno sidno= 1; sidno <= max_sidno; sidno++)
     if (gs->contains_sidno(sidno))
@@ -611,7 +618,7 @@ void Gtid_state::unlock_sidnos(const Gtid_set *gs)
 
 void Gtid_state::broadcast_sidnos(const Gtid_set *gs)
 {
-  DBUG_ASSERT(gs);
+  assert(gs);
   rpl_sidno max_sidno= gs->get_max_sidno();
   for (rpl_sidno sidno= 1; sidno <= max_sidno; sidno++)
     if (gs->contains_sidno(sidno))
@@ -637,13 +644,13 @@ enum_return_status Gtid_state::ensure_sidno()
     PROPAGATE_REPORTED_ERROR(sid_locks.ensure_index(sidno));
     PROPAGATE_REPORTED_ERROR(ensure_commit_group_sidnos(sidno));
     sidno= sid_map->get_max_sidno();
-    DBUG_ASSERT(executed_gtids.get_max_sidno() >= sidno);
-    DBUG_ASSERT(gtids_only_in_table.get_max_sidno() >= sidno);
-    DBUG_ASSERT(previous_gtids_logged.get_max_sidno() >= sidno);
-    DBUG_ASSERT(lost_gtids.get_max_sidno() >= sidno);
-    DBUG_ASSERT(owned_gtids.get_max_sidno() >= sidno);
-    DBUG_ASSERT(sid_locks.get_max_index() >= sidno);
-    DBUG_ASSERT(commit_group_sidnos.size() >= (unsigned int)sidno);
+    assert(executed_gtids.get_max_sidno() >= sidno);
+    assert(gtids_only_in_table.get_max_sidno() >= sidno);
+    assert(previous_gtids_logged.get_max_sidno() >= sidno);
+    assert(lost_gtids.get_max_sidno() >= sidno);
+    assert(owned_gtids.get_max_sidno() >= sidno);
+    assert(sid_locks.get_max_index() >= sidno);
+    assert(commit_group_sidnos.size() >= (unsigned int)sidno);
   }
   RETURN_OK;
 }
@@ -670,7 +677,7 @@ enum_return_status Gtid_state::add_lost_gtids(const Gtid_set *gtid_set)
                  MYF(0)));
     RETURN_REPORTED_ERROR;
   }
-  DBUG_ASSERT(lost_gtids.is_empty());
+  assert(lost_gtids.is_empty());
 
   if (save(gtid_set))
     RETURN_REPORTED_ERROR;
@@ -706,8 +713,8 @@ int Gtid_state::init()
 int Gtid_state::save(THD *thd)
 {
   DBUG_ENTER("Gtid_state::save(THD *thd)");
-  DBUG_ASSERT(gtid_table_persistor != NULL);
-  DBUG_ASSERT(thd->owned_gtid.sidno > 0);
+  assert(gtid_table_persistor != NULL);
+  assert(thd->owned_gtid.sidno > 0);
   int error= 0;
 
   int ret= gtid_table_persistor->save(thd, &thd->owned_gtid);
@@ -833,7 +840,7 @@ bool Gtid_state::update_gtids_impl_do_nothing(THD *thd)
 
 bool Gtid_state::update_gtids_impl_begin(THD *thd)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (current_thd != thd)
     mysql_mutex_lock(&thd->LOCK_thd_query);
   DBUG_PRINT("info", ("query='%s' thd->is_commit_in_middle_of_statement=%d",
@@ -872,13 +879,13 @@ void Gtid_state::update_gtids_impl_own_gtid_set(THD *thd, bool is_commit)
                              "in update_gtids_impl");
   thd->clear_owned_gtids();
 #else
-  DBUG_ASSERT(0);
+  assert(0);
 #endif
 }
 
 void Gtid_state::update_gtids_impl_lock_sidno(rpl_sidno sidno)
 {
-  DBUG_ASSERT(sidno > 0);
+  assert(sidno > 0);
   DBUG_PRINT("info",("Locking sidno %d", sidno));
   lock_sidno(sidno);
 }
@@ -900,7 +907,7 @@ void Gtid_state::update_gtids_impl_lock_sidnos(THD *first_thd)
         if (owned_gtid_set.contains_sidno(i))
           commit_group_sidnos[i]= true;
 #else
-      DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
 
@@ -917,12 +924,12 @@ void Gtid_state::update_gtids_impl_own_gtid(THD *thd, bool is_commit)
     In Group Replication the GTID may additionally be owned by another
     thread, and we won't remove that ownership (it will be rolled back later)
   */
-  DBUG_ASSERT(owned_gtids.is_owned_by(thd->owned_gtid, thd->thread_id()));
+  assert(owned_gtids.is_owned_by(thd->owned_gtid, thd->thread_id()));
   owned_gtids.remove_gtid(thd->owned_gtid, thd->thread_id());
 
   if (is_commit)
   {
-    DBUG_ASSERT(!executed_gtids.contains_gtid(thd->owned_gtid));
+    assert(!executed_gtids.contains_gtid(thd->owned_gtid));
     DBUG_EXECUTE_IF(
       "rpl_gtid_update_on_commit_simulate_out_of_memory",
       DBUG_SET("+d,rpl_gtid_get_free_interval_simulate_out_of_memory"););
@@ -957,7 +964,7 @@ void Gtid_state::update_gtids_impl_own_gtid(THD *thd, bool is_commit)
   thd->clear_owned_gtids();
   if (thd->variables.gtid_next.type == GTID_GROUP)
   {
-    DBUG_ASSERT(!thd->is_commit_in_middle_of_statement);
+    assert(!thd->is_commit_in_middle_of_statement);
     thd->variables.gtid_next.set_undefined();
   }
   else
@@ -967,8 +974,8 @@ void Gtid_state::update_gtids_impl_own_gtid(THD *thd, bool is_commit)
       gtid_pre_statement_checks skips the test for undefined,
       e.g. ROLLBACK.
     */
-    DBUG_ASSERT(thd->variables.gtid_next.type == AUTOMATIC_GROUP ||
-                thd->variables.gtid_next.type == UNDEFINED_GROUP);
+    assert(thd->variables.gtid_next.type == AUTOMATIC_GROUP ||
+           thd->variables.gtid_next.type == UNDEFINED_GROUP);
   }
 }
 
@@ -992,8 +999,8 @@ void Gtid_state::update_gtids_impl_broadcast_and_unlock_sidnos()
 void Gtid_state::update_gtids_impl_own_anonymous(THD* thd,
                                                  bool *more_trx)
 {
-  DBUG_ASSERT(thd->variables.gtid_next.type == ANONYMOUS_GROUP ||
-              thd->variables.gtid_next.type == AUTOMATIC_GROUP);
+  assert(thd->variables.gtid_next.type == ANONYMOUS_GROUP ||
+         thd->variables.gtid_next.type == AUTOMATIC_GROUP);
   /*
     If there is more in the transaction cache, set more_trx to indicate this.
 
@@ -1021,9 +1028,9 @@ void Gtid_state::update_gtids_impl_own_anonymous(THD* thd,
 
 void Gtid_state::update_gtids_impl_own_nothing(THD *thd)
 {
-  DBUG_ASSERT(thd->commit_error != THD::CE_COMMIT_ERROR ||
-              thd->has_gtid_consistency_violation);
-  DBUG_ASSERT(thd->variables.gtid_next.type == AUTOMATIC_GROUP);
+  assert(thd->commit_error != THD::CE_COMMIT_ERROR ||
+         thd->has_gtid_consistency_violation);
+  assert(thd->variables.gtid_next.type == AUTOMATIC_GROUP);
 }
 
 void Gtid_state::update_gtids_impl_end(THD *thd, bool more_trx)
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc
index c9a8e3af5c1c..63aca7a2f10d 100644
--- a/sql/rpl_handler.cc
+++ b/sql/rpl_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -34,12 +41,253 @@ Binlog_transmit_delegate *binlog_transmit_delegate;
 Binlog_relay_IO_delegate *binlog_relay_io_delegate;
 #endif /* HAVE_REPLICATION */
 
+bool opt_replication_optimize_for_static_plugin_config= 0;
+bool opt_replication_sender_observe_commit_only= 0;
+int32 opt_atomic_replication_sender_observe_commit_only= 0;
+
 Observer_info::Observer_info(void *ob, st_plugin_int *p)
   : observer(ob), plugin_int(p)
 {
   plugin= plugin_int_to_ref(plugin_int);
 }
 
+Delegate::Delegate(
+#ifdef HAVE_PSI_INTERFACE
+    PSI_rwlock_key key
+#endif
+)
+{
+  inited= FALSE;
+  my_atomic_fas32(&m_configured_lock_type,
+                  opt_replication_optimize_for_static_plugin_config
+                      ? DELEGATE_SPIN_LOCK
+                      : DELEGATE_OS_LOCK);
+  my_atomic_store32(&m_acquired_locks, 0);
+#ifdef HAVE_PSI_INTERFACE
+  if (mysql_rwlock_init(key, &lock)) return;
+#else
+  if (mysql_rwlock_init(0, &lock)) return;
+#endif
+  init_sql_alloc(key_memory_delegate, &memroot, 1024, 0);
+  inited= TRUE;
+}
+
+Delegate::~Delegate()
+{
+  inited= FALSE;
+  mysql_rwlock_destroy(&lock);
+  free_root(&memroot, MYF(0));
+}
+
+int Delegate::add_observer(void *observer, st_plugin_int *plugin)
+{
+  int ret= FALSE;
+  if (!inited) return TRUE;
+  write_lock();
+  Observer_info_iterator iter(observer_info_list);
+  Observer_info *info= iter++;
+  while (info && info->observer != observer) info= iter++;
+  if (!info)
+  {
+    info= new Observer_info(observer, plugin);
+    if (!info || observer_info_list.push_back(info, &memroot))
+      ret= TRUE;
+    else if (this->use_spin_lock_type())
+      acquire_plugin_ref_count(info);
+  }
+  else
+    ret= TRUE;
+  unlock();
+  return ret;
+}
+
+int Delegate::remove_observer(void *observer, st_plugin_int *plugin)
+{
+  int ret= FALSE;
+  if (!inited) return TRUE;
+  write_lock();
+  Observer_info_iterator iter(observer_info_list);
+  Observer_info *info= iter++;
+  while (info && info->observer != observer) info= iter++;
+  if (info)
+  {
+    iter.remove();
+    delete info;
+  }
+  else
+    ret= TRUE;
+  unlock();
+  return ret;
+}
+
+Delegate::Observer_info_iterator Delegate::observer_info_iter()
+{
+  return Observer_info_iterator(observer_info_list);
+}
+
+bool Delegate::is_empty()
+{
+  DBUG_PRINT("debug", ("is_empty: %d", observer_info_list.is_empty()));
+  return observer_info_list.is_empty();
+}
+
+int Delegate::read_lock()
+{
+  if (!inited) return 1;
+  this->lock_it(DELEGATE_LOCK_MODE_SHARED);
+  return 0;
+}
+
+int Delegate::write_lock()
+{
+  if (!inited) return 1;
+  this->lock_it(DELEGATE_LOCK_MODE_EXCLUSIVE);
+  return 0;
+}
+
+int Delegate::unlock()
+{
+  if (!inited) return 1;
+
+  int result= 0;
+
+  if (my_atomic_load32(&m_acquired_locks) > 0)
+  {
+    my_atomic_add32(&m_acquired_locks, -DELEGATE_SPIN_LOCK);
+    if (m_spin_lock.is_exclusive_acquisition())
+      m_spin_lock.release_exclusive();
+    else
+    {
+      assert(m_spin_lock.is_shared_acquisition());
+      m_spin_lock.release_shared();
+    }
+  }
+  else
+  {
+    assert(my_atomic_load32(&m_acquired_locks) < 0);
+    my_atomic_add32(&m_acquired_locks, -DELEGATE_OS_LOCK);
+    result= mysql_rwlock_unlock(&lock);
+  }
+
+  return result;
+}
+
+bool Delegate::is_inited() { return inited; }
+
+void Delegate::update_lock_type()
+{
+  if (!inited) return;
+
+  int32 opt_value= opt_replication_optimize_for_static_plugin_config
+                       ? DELEGATE_SPIN_LOCK
+                       : DELEGATE_OS_LOCK;
+  my_atomic_fas32(&m_configured_lock_type, opt_value);
+}
+
+void Delegate::update_plugin_ref_count()
+{
+  if (!inited) return;
+  int32 opt_value= opt_replication_optimize_for_static_plugin_config
+                       ? DELEGATE_SPIN_LOCK
+                       : DELEGATE_OS_LOCK;
+  int32 intern_value= my_atomic_load32(&m_configured_lock_type);
+
+  if (intern_value == DELEGATE_SPIN_LOCK && opt_value == DELEGATE_OS_LOCK)
+  {
+    for (std::map<plugin_ref, size_t>::iterator ref=
+             m_acquired_references.begin();
+         ref != m_acquired_references.end(); ++ref)
+    {
+      for (size_t count= ref->second; count != 0; --count)
+        plugin_unlock(NULL, ref->first);
+    }
+    m_acquired_references.clear();
+  }
+  else if (intern_value == DELEGATE_OS_LOCK && opt_value == DELEGATE_SPIN_LOCK)
+  {
+    Observer_info_iterator iter= observer_info_iter();
+    for (Observer_info *info= iter++; info; info= iter++)
+    {
+      acquire_plugin_ref_count(info);
+    }
+  }
+}
+
+bool Delegate::use_rw_lock_type()
+{
+  return my_atomic_load32(&m_acquired_locks) <
+             0 ||  // If there are acquisitions using the read-write lock
+         (my_atomic_load32(&m_configured_lock_type) ==
+              DELEGATE_OS_LOCK &&  // or the lock type has been set to use the
+                                   // read-write lock
+          my_atomic_load32(&m_acquired_locks) ==
+              0);  // and there are no outstanding acquisitions using shared
+                   // spin-lock, use the read-write lock
+}
+
+bool Delegate::use_spin_lock_type()
+{
+  return my_atomic_load32(&m_acquired_locks) >
+             0 ||  // If there are acquisitions using the shared spin-lock
+         (my_atomic_load32(&m_configured_lock_type) ==
+              DELEGATE_SPIN_LOCK &&  // or the lock type has been set to use the
+                                     // shared spin-lock
+          my_atomic_load32(&m_acquired_locks) ==
+              0);  // and there are no outstanding acquisitions using read-write
+                   // lock, use the shared spin-lock
+}
+
+void Delegate::acquire_plugin_ref_count(Observer_info *info)
+{
+  plugin_ref internal_ref= plugin_lock(NULL, &info->plugin);
+  ++(m_acquired_references[internal_ref]);
+}
+
+void Delegate::lock_it(enum_delegate_lock_mode mode)
+{
+  do
+  {
+    if (this->use_spin_lock_type())
+    {
+      if (mode == DELEGATE_LOCK_MODE_SHARED)
+        m_spin_lock.acquire_shared();
+      else
+        m_spin_lock.acquire_exclusive();
+
+      if (my_atomic_load32(&m_configured_lock_type) !=
+          DELEGATE_SPIN_LOCK)  // Lock type changed in the meanwhile, lets
+                               // revert the acquisition and try again
+      {
+        if (mode == DELEGATE_LOCK_MODE_SHARED)
+          m_spin_lock.release_shared();
+        else
+          m_spin_lock.release_exclusive();
+      }
+      else
+      {
+        my_atomic_add32(&m_acquired_locks, DELEGATE_SPIN_LOCK);
+        break;
+      }
+    }
+    if (this->use_rw_lock_type())
+    {
+      if (mode == DELEGATE_LOCK_MODE_SHARED)
+        mysql_rwlock_rdlock(&lock);
+      else
+        mysql_rwlock_wrlock(&lock);
+
+      if (my_atomic_load32(&m_configured_lock_type) !=
+          DELEGATE_OS_LOCK)  // Lock type changed in the meanwhile, lets revert
+                             // the acquisition and try again
+        mysql_rwlock_unlock(&lock);
+      else
+      {
+        my_atomic_add32(&m_acquired_locks, DELEGATE_OS_LOCK);
+        break;
+      }
+    }
+  } while (true);
+}
 
 /*
   structure to save transaction log filename and position
@@ -188,6 +436,17 @@ int delegates_init()
   return 0;
 }
 
+void delegates_shutdown()
+{
+  if (opt_replication_optimize_for_static_plugin_config)
+  {
+    opt_replication_optimize_for_static_plugin_config= false;
+    delegates_acquire_locks();
+    delegates_update_lock_type();
+    delegates_release_locks();
+  }
+}
+
 void delegates_destroy()
 {
   if (transaction_delegate)
@@ -204,6 +463,72 @@ void delegates_destroy()
 #endif /* HAVE_REPLICATION */
 }
 
+static void delegates_update_plugin_ref_count()
+{
+  if (transaction_delegate)
+    transaction_delegate->update_plugin_ref_count();
+  if (binlog_storage_delegate)
+    binlog_storage_delegate->update_plugin_ref_count();
+  if (server_state_delegate)
+    server_state_delegate->update_plugin_ref_count();
+#ifdef HAVE_REPLICATION
+  if (binlog_transmit_delegate)
+    binlog_transmit_delegate->update_plugin_ref_count();
+  if (binlog_relay_io_delegate)
+    binlog_relay_io_delegate->update_plugin_ref_count();
+#endif /* HAVE_REPLICATION */
+}
+
+void delegates_acquire_locks()
+{
+  if (transaction_delegate)
+    transaction_delegate->write_lock();
+  if (binlog_storage_delegate)
+    binlog_storage_delegate->write_lock();
+  if (server_state_delegate)
+    server_state_delegate->write_lock();
+#ifdef HAVE_REPLICATION
+  if (binlog_transmit_delegate)
+    binlog_transmit_delegate->write_lock();
+  if (binlog_relay_io_delegate)
+    binlog_relay_io_delegate->write_lock();
+#endif /* HAVE_REPLICATION */
+}
+
+void delegates_release_locks()
+{
+  if (transaction_delegate)
+    transaction_delegate->unlock();
+  if (binlog_storage_delegate)
+    binlog_storage_delegate->unlock();
+  if (server_state_delegate)
+    server_state_delegate->unlock();
+#ifdef HAVE_REPLICATION
+  if (binlog_transmit_delegate)
+    binlog_transmit_delegate->unlock();
+  if (binlog_relay_io_delegate)
+    binlog_relay_io_delegate->unlock();
+#endif /* HAVE_REPLICATION */
+}
+
+void delegates_update_lock_type()
+{
+  delegates_update_plugin_ref_count();
+
+  if (transaction_delegate)
+    transaction_delegate->update_lock_type();
+  if (binlog_storage_delegate)
+    binlog_storage_delegate->update_lock_type();
+  if (server_state_delegate)
+    server_state_delegate->update_lock_type();
+#ifdef HAVE_REPLICATION
+  if (binlog_transmit_delegate)
+    binlog_transmit_delegate->update_lock_type();
+  if (binlog_relay_io_delegate)
+    binlog_relay_io_delegate->update_lock_type();
+#endif /* HAVE_REPLICATION */
+}
+
 /*
   This macro is used by almost all the Delegate methods to iterate
   over all the observers running given callback function of the
@@ -212,91 +537,97 @@ void delegates_destroy()
   Add observer plugins to the thd->lex list, after each statement, all
   plugins add to thd->lex will be automatically unlocked.
  */
-#define FOREACH_OBSERVER(r, f, thd, args)                               \
-  /*
-     Use a struct to make sure that they are allocated adjacent, check
-     delete_dynamic().
-  */                                                                    \
-  Prealloced_array<plugin_ref, 8> plugins(PSI_NOT_INSTRUMENTED);        \
-  read_lock();                                                          \
-  Observer_info_iterator iter= observer_info_iter();                    \
-  Observer_info *info= iter++;                                          \
-  for (; info; info= iter++)                                            \
-  {                                                                     \
-    plugin_ref plugin=                                                  \
-      my_plugin_lock(0, &info->plugin);                                 \
-    if (!plugin)                                                        \
-    {                                                                   \
-      /* plugin is not intialized or deleted, this is not an error */   \
-      r= 0;                                                             \
-      break;                                                            \
-    }                                                                   \
-    plugins.push_back(plugin);                                          \
-    if (((Observer *)info->observer)->f                                 \
-        && ((Observer *)info->observer)->f args)                        \
-    {                                                                   \
-      r= 1;                                                             \
-      sql_print_error("Run function '" #f "' in plugin '%s' failed",    \
-                      info->plugin_int->name.str);                      \
-      break;                                                            \
-    }                                                                   \
-  }                                                                     \
-  unlock();                                                             \
-  /*
-     Unlock plugins should be done after we released the Delegate lock
-     to avoid possible deadlock when this is the last user of the
-     plugin, and when we unlock the plugin, it will try to
-     deinitialize the plugin, which will try to lock the Delegate in
-     order to remove the observers.
-  */                                                                    \
-  if (!plugins.empty())                                                 \
-    plugin_unlock_list(0, &plugins[0], plugins.size());
-
-#define FOREACH_OBSERVER_ERROR_OUT(r, f, thd, args, out)                \
-  /*
-     Use a struct to make sure that they are allocated adjacent, check
-     delete_dynamic().
-  */                                                                    \
-  Prealloced_array<plugin_ref, 8> plugins(PSI_NOT_INSTRUMENTED);        \
-  read_lock();                                                          \
-  Observer_info_iterator iter= observer_info_iter();                    \
-  Observer_info *info= iter++;                                          \
-                                                                        \
-  int error_out= 0;                                                     \
-  for (; info; info= iter++)                                            \
-  {                                                                     \
-    plugin_ref plugin=                                                  \
-      my_plugin_lock(0, &info->plugin);                                 \
-    if (!plugin)                                                        \
-    {                                                                   \
-      /* plugin is not intialized or deleted, this is not an error */   \
-      r= 0;                                                             \
-      break;                                                            \
-    }                                                                   \
-    plugins.push_back(plugin);                                          \
-                                                                        \
-    bool hook_error= false;                                             \
-    hook_error= ((Observer *)info->observer)->f (args, error_out);      \
-                                                                        \
-    out += error_out;                                                   \
-    if (hook_error)                                                     \
-    {                                                                   \
-      r= 1;                                                             \
-      sql_print_error("Run function '" #f "' in plugin '%s' failed",    \
-                      info->plugin_int->name.str);                      \
-      break;                                                            \
-    }                                                                   \
-  }                                                                     \
-  unlock();                                                             \
-  /*
-     Unlock plugins should be done after we released the Delegate lock
-     to avoid possible deadlock when this is the last user of the
-     plugin, and when we unlock the plugin, it will try to
-     deinitialize the plugin, which will try to lock the Delegate in
-     order to remove the observers.
-  */                                                                    \
-  if (!plugins.empty())                                                 \
-    plugin_unlock_list(0, &plugins[0], plugins.size());
+#define FOREACH_OBSERVER(r, f, thd, args)                              \
+  /*                                                                   \
+     Use a struct to make sure that they are allocated adjacent, check \
+     delete_dynamic().                                                 \
+  */                                                                   \
+  Prealloced_array<plugin_ref, 8> plugins(PSI_NOT_INSTRUMENTED);       \
+  read_lock();                                                         \
+  Observer_info_iterator iter= observer_info_iter();                   \
+  Observer_info *info= iter++;                                         \
+  for (; info; info= iter++)                                           \
+  {                                                                    \
+    bool replication_optimize_for_static_plugin_config=                \
+        this->use_spin_lock_type();                                    \
+    plugin_ref plugin= (replication_optimize_for_static_plugin_config  \
+                            ? info->plugin                             \
+                            : my_plugin_lock(0, &info->plugin));       \
+    if (!plugin)                                                       \
+    {                                                                  \
+      /* plugin is not intialized or deleted, this is not an error */  \
+      r= 0;                                                            \
+      break;                                                           \
+    }                                                                  \
+    if (!replication_optimize_for_static_plugin_config)                \
+      plugins.push_back(plugin);                                       \
+    if (((Observer *)info->observer)->f &&                             \
+        ((Observer *)info->observer)->f args)                          \
+    {                                                                  \
+      r= 1;                                                            \
+      sql_print_error("Run function '" #f "' in plugin '%s' failed",   \
+                      info->plugin_int->name.str);                     \
+      break;                                                           \
+    }                                                                  \
+  }                                                                    \
+  unlock();                                                            \
+  /*                                                                   \
+     Unlock plugins should be done after we released the Delegate lock \
+     to avoid possible deadlock when this is the last user of the      \
+     plugin, and when we unlock the plugin, it will try to             \
+     deinitialize the plugin, which will try to lock the Delegate in   \
+     order to remove the observers.                                    \
+  */                                                                   \
+  if (!plugins.empty()) plugin_unlock_list(0, &plugins[0], plugins.size());
+
+#define FOREACH_OBSERVER_ERROR_OUT(r, f, thd, args, out)               \
+  /*                                                                   \
+     Use a struct to make sure that they are allocated adjacent, check \
+     delete_dynamic().                                                 \
+  */                                                                   \
+  Prealloced_array<plugin_ref, 8> plugins(PSI_NOT_INSTRUMENTED);       \
+  read_lock();                                                         \
+  Observer_info_iterator iter= observer_info_iter();                   \
+  Observer_info *info= iter++;                                         \
+                                                                       \
+  int error_out= 0;                                                    \
+  for (; info; info= iter++)                                           \
+  {                                                                    \
+    bool replication_optimize_for_static_plugin_config=                \
+        this->use_spin_lock_type();                                    \
+    plugin_ref plugin= (replication_optimize_for_static_plugin_config  \
+                            ? info->plugin                             \
+                            : my_plugin_lock(0, &info->plugin));       \
+    if (!plugin)                                                       \
+    {                                                                  \
+      /* plugin is not intialized or deleted, this is not an error */  \
+      r= 0;                                                            \
+      break;                                                           \
+    }                                                                  \
+    if (!replication_optimize_for_static_plugin_config)                \
+      plugins.push_back(plugin);                                       \
+                                                                       \
+    bool hook_error= false;                                            \
+    hook_error= ((Observer *)info->observer)->f(args, error_out);      \
+                                                                       \
+    out+= error_out;                                                   \
+    if (hook_error)                                                    \
+    {                                                                  \
+      r= 1;                                                            \
+      sql_print_error("Run function '" #f "' in plugin '%s' failed",   \
+                      info->plugin_int->name.str);                     \
+      break;                                                           \
+    }                                                                  \
+  }                                                                    \
+  unlock();                                                            \
+  /*                                                                   \
+     Unlock plugins should be done after we released the Delegate lock \
+     to avoid possible deadlock when this is the last user of the      \
+     plugin, and when we unlock the plugin, it will try to             \
+     deinitialize the plugin, which will try to lock the Delegate in   \
+     order to remove the observers.                                    \
+  */                                                                   \
+  if (!plugins.empty()) plugin_unlock_list(0, &plugins[0], plugins.size());
 
 int Trans_delegate::before_commit(THD *thd, bool all,
                                   IO_CACHE *trx_cache_log,
@@ -315,6 +646,7 @@ int Trans_delegate::before_commit(THD *thd, bool all,
   param.trx_cache_log= trx_cache_log;
   param.stmt_cache_log= stmt_cache_log;
   param.cache_log_max_size= cache_log_max_size;
+  param.rpl_channel_type = thd->rpl_thd_ctx.get_rpl_channel_type();
 
   bool is_real_trans=
     (all || !thd->get_transaction()->is_active(Transaction_ctx::SESSION));
@@ -358,10 +690,10 @@ bool has_cascade_foreign_key(TABLE *table, THD *thd)
         f_key_info->update_method->str[0] == 'S' ||
         f_key_info->delete_method->str[0] == 'S')
     {
-      DBUG_ASSERT(!strncmp(f_key_info->update_method->str, "CASCADE", 7) ||
-                  !strncmp(f_key_info->delete_method->str, "CASCADE", 7) ||
-                  !strncmp(f_key_info->update_method->str, "SET NUL", 7) ||
-                  !strncmp(f_key_info->delete_method->str, "SET NUL", 7));
+      assert(!strncmp(f_key_info->update_method->str, "CASCADE", 7) ||
+             !strncmp(f_key_info->delete_method->str, "CASCADE", 7) ||
+             !strncmp(f_key_info->update_method->str, "SET NUL", 7) ||
+             !strncmp(f_key_info->delete_method->str, "SET NUL", 7));
       DBUG_RETURN(TRUE);
     }
   }
@@ -509,6 +841,7 @@ int Trans_delegate::before_rollback(THD *thd, bool all)
   param.server_id= thd->server_id;
   param.server_uuid= server_uuid;
   param.thread_id= thd->thread_id();
+  param.rpl_channel_type = thd->rpl_thd_ctx.get_rpl_channel_type();
 
   bool is_real_trans=
     (all || !thd->get_transaction()->is_active(Transaction_ctx::SESSION));
@@ -527,6 +860,7 @@ int Trans_delegate::after_commit(THD *thd, bool all)
   TRANS_PARAM_ZERO(param);
   param.server_uuid= server_uuid;
   param.thread_id= thd->thread_id();
+  param.rpl_channel_type = thd->rpl_thd_ctx.get_rpl_channel_type();
 
   bool is_real_trans=
     (all || !thd->get_transaction()->is_active(Transaction_ctx::SESSION));
@@ -551,6 +885,7 @@ int Trans_delegate::after_rollback(THD *thd, bool all)
   TRANS_PARAM_ZERO(param);
   param.server_uuid= server_uuid;
   param.thread_id= thd->thread_id();
+  param.rpl_channel_type = thd->rpl_thd_ctx.get_rpl_channel_type();
 
   bool is_real_trans=
     (all || !thd->get_transaction()->is_active(Transaction_ctx::SESSION));
@@ -693,7 +1028,7 @@ int Binlog_storage_delegate::after_sync(THD *thd,
   Binlog_storage_param param;
   param.server_id= thd->server_id;
 
-  DBUG_ASSERT(log_pos != 0);
+  assert(log_pos != 0);
   int ret= 0;
   FOREACH_OBSERVER(ret, after_sync, thd, (&param, log_file, log_pos));
 
@@ -753,8 +1088,11 @@ int Binlog_transmit_delegate::reserve_header(THD *thd, ushort flags,
   Observer_info *info= iter++;
   for (; info; info= iter++)
   {
-    plugin_ref plugin=
-      my_plugin_lock(thd, &info->plugin);
+    bool replication_optimize_for_static_plugin_config=
+        this->use_spin_lock_type();
+    plugin_ref plugin= (replication_optimize_for_static_plugin_config
+                            ? info->plugin
+                            : my_plugin_lock(thd, &info->plugin));
     if (!plugin)
     {
       ret= 1;
@@ -768,10 +1106,12 @@ int Binlog_transmit_delegate::reserve_header(THD *thd, ushort flags,
                                                         &hlen))
     {
       ret= 1;
-      plugin_unlock(thd, plugin);
+      if (!replication_optimize_for_static_plugin_config)
+        plugin_unlock(thd, plugin);
       break;
     }
-    plugin_unlock(thd, plugin);
+    if (!replication_optimize_for_static_plugin_config)
+      plugin_unlock(thd, plugin);
     if (hlen == 0)
       continue;
     if (hlen > RESERVE_HEADER_SIZE || packet->append((char *)header, hlen))
diff --git a/sql/rpl_handler.h b/sql/rpl_handler.h
index 25276d295d55..ed2e6f282bf9 100644
--- a/sql/rpl_handler.h
+++ b/sql/rpl_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -20,10 +27,14 @@
 #include "my_sys.h"                        // free_root
 #include "mysql/psi/mysql_thread.h"        // mysql_rwlock_t
 #include "mysqld.h"                        // key_memory_delegate
+#include "locks/shared_spin_lock.h"        // Shared_spin_lock
 #include "sql_list.h"                      // List
+#include "sql_plugin.h"                    // my_plugin_(un)lock
 #include "sql_plugin_ref.h"                // plugin_ref
 
 #include <list>
+#include <map>
+#include <iostream>
 
 class Master_info;
 class String;
@@ -35,6 +46,40 @@ struct Server_state_observer;
 struct Trans_observer;
 struct Trans_table_info;
 
+/**
+  Variable to keep the value set for the
+  `replication_optimize_for_static_plugin_config` global.
+
+  When this global variable value is set to `1`, we prevent all plugins that
+  register replication observers to be unloaded until the variable is set to
+  `0`, again. While the value of the variable is `1`, we are also exchanging the
+  `Delegate` class read-write lock by an atomic-based shared spin-lock.
+
+  This behaviour is usefull for increasing the throughtput of the master when a
+  large number of slaves is connected, by preventing the acquisition of the
+  `LOCK_plugin` mutex and using a more read-friendly lock in the `Delegate`
+  class, when invoking the observer's hooks.
+
+  Note that a large number of slaves means a large number of dump threads, which
+  means a large number of threads calling the registered observers hooks.
+
+  If `UNINSTALL` is executed on a replication observer plugin while the variable
+  is set to `1`, the unload of the plugin will be deferred until the variable's
+  value is set to `0`.
+ */
+extern bool opt_replication_optimize_for_static_plugin_config;
+/**
+  Variable to keep the value set for the
+  `replication_sender_observe_commit_only` global.
+
+  When this global variable is set to `1`, only the replication observer's
+  commit hook will be called, every other registered hook invocation is skipped.
+ */
+extern bool opt_replication_sender_observe_commit_only;
+/**
+  Atomic access version of `opt_replication_sender_observe_commit_only`
+ */
+extern int32 opt_atomic_replication_sender_observe_commit_only;
 
 class Observer_info {
 public:
@@ -45,120 +90,180 @@ class Observer_info {
   Observer_info(void *ob, st_plugin_int *p);
 };
 
+/**
+  Base class for adding replication event observer infra-structure. It's
+  meant to be sub-classed by classes that will provide the support for the
+  specific event types. This class is meant just to provide basic support
+  for managing observers and managing resource access and lock acquisition.
+ */
 class Delegate {
 public:
   typedef List<Observer_info> Observer_info_list;
   typedef List_iterator<Observer_info> Observer_info_iterator;
 
-  int add_observer(void *observer, st_plugin_int *plugin)
-  {
-    int ret= FALSE;
-    if (!inited)
-      return TRUE;
-    write_lock();
-    Observer_info_iterator iter(observer_info_list);
-    Observer_info *info= iter++;
-    while (info && info->observer != observer)
-      info= iter++;
-    if (!info)
-    {
-      info= new Observer_info(observer, plugin);
-      if (!info || observer_info_list.push_back(info, &memroot))
-        ret= TRUE;
-    }
-    else
-      ret= TRUE;
-    unlock();
-    return ret;
-  }
-
-  int remove_observer(void *observer, st_plugin_int *plugin)
-  {
-    int ret= FALSE;
-    if (!inited)
-      return TRUE;
-    write_lock();
-    Observer_info_iterator iter(observer_info_list);
-    Observer_info *info= iter++;
-    while (info && info->observer != observer)
-      info= iter++;
-    if (info)
-    {
-      iter.remove();
-      delete info;
-    }
-    else
-      ret= TRUE;
-    unlock();
-    return ret;
-  }
-
-  inline Observer_info_iterator observer_info_iter()
-  {
-    return Observer_info_iterator(observer_info_list);
-  }
-
-  inline bool is_empty()
-  {
-    DBUG_PRINT("debug", ("is_empty: %d", observer_info_list.is_empty()));
-    return observer_info_list.is_empty();
-  }
-
-  inline int read_lock()
-  {
-    if (!inited)
-      return TRUE;
-    return mysql_rwlock_rdlock(&lock);
-  }
-
-  inline int write_lock()
-  {
-    if (!inited)
-      return TRUE;
-    return mysql_rwlock_wrlock(&lock);
-  }
-
-  inline int unlock()
-  {
-    if (!inited)
-      return TRUE;
-    return mysql_rwlock_unlock(&lock);
-  }
-
-  inline bool is_inited()
-  {
-    return inited;
-  }
+  /**
+    Class constructor
 
+    @param key the PFS key for instrumenting the class lock
+   */
   Delegate(
 #ifdef HAVE_PSI_INTERFACE
            PSI_rwlock_key key
 #endif
-           )
-  {
-    inited= FALSE;
-#ifdef HAVE_PSI_INTERFACE
-    if (mysql_rwlock_init(key, &lock))
-      return;
-#else
-    if (mysql_rwlock_init(0, &lock))
-      return;
-#endif
-    init_sql_alloc(key_memory_delegate, &memroot, 1024, 0);
-    inited= TRUE;
-  }
-  ~Delegate()
-  {
-    inited= FALSE;
-    mysql_rwlock_destroy(&lock);
-    free_root(&memroot, MYF(0));
-  }
+           );
+  /**
+    Class destructor
+   */
+  virtual ~Delegate();
+  /**
+    Adds an observer to the observer list.
+
+    @param observer The observer object to be added to the list
+    @param plugin The plugin the observer is being loaded from
+
+    @return 0 upon success, 1 otherwise
+   */
+  int add_observer(void *observer, st_plugin_int *plugin);
+  /**
+    Removes an observer from the observer list.
+
+    @param observer The observer object to be added to the list
+    @param plugin The plugin the observer is being loaded from
+
+    @return 0 upon success, 1 otherwise
+   */
+  int remove_observer(void *observer, st_plugin_int *plugin);
+  /**
+    Retrieves an iterator for the observer list.
+
+    @return the iterator for the observer list
+   */
+  Observer_info_iterator observer_info_iter();
+  /**
+    Returns whether or not there are registered observers.
+
+    @return whether or not there are registered observers
+   */
+  bool is_empty();
+  /**
+    Acquires this Delegate class instance lock in read/shared mode.
+
+    @return 0 upon success, 1 otherwise
+   */
+  int read_lock();
+  /**
+    Acquires this Delegate class instance lock in write/exclusive mode.
+
+    @return 0 upon success, 1 otherwise
+   */
+  int write_lock();
+  /**
+    Releases this Delegate class instance lock.
+
+    @return 0 upon success, 1 otherwise
+   */
+  int unlock();
+  /**
+    Returns whether or not this instance was initialized.
+
+    @return whether or not this instance was initialized
+   */
+  bool is_inited();
+  /**
+    Toggles the type of lock between a classical read-write lock and a
+    shared-exclusive spin-lock.
+   */
+  void update_lock_type();
+  /**
+    Increases the `info->plugin` usage reference counting if
+    `replication_optimize_for_static_plugin_config` is being enabled, in order
+    to prevent plugin removal.
+
+    Decreases the `info->plugin` usage reference counting if
+    `replication_optimize_for_static_plugin_config` is being disabled, in order
+    to allow plugin removal.
+   */
+  void update_plugin_ref_count();
+  /**
+    Returns whether or not to use the classic read-write lock. 
+
+    The read-write lock should be used if that type of lock is already
+    acquired by some thread or if the server is not optimized for static
+    plugin configuration.
+
+    @returns true if one should use the classic read-write lock, false otherwise
+   */
+  bool use_rw_lock_type();
+  /**
+    Returns whether or not to use the shared spin-lock.
+
+    The shared spin-lock should be used if that type of lock is already
+    acquired by some thread or if the server is optimized for static plugin
+    configuration.
+
+    @returns true if one should use the shared spin-lock, false otherwise
+   */
+  bool use_spin_lock_type();
 
 private:
+  /** List of registered observers */
   Observer_info_list observer_info_list;
+  /** 
+    A read/write lock to be used when not optimizing for static plugin config
+   */
   mysql_rwlock_t lock;
+  /**
+    A shared-exclusive spin lock to be used when optimizing for static plugin
+    config.
+   */
+  lock::Shared_spin_lock m_spin_lock;
+  /** Memory pool to be used to allocate the observers list */
   MEM_ROOT memroot;
+  /** Flag statign whether or not this instance was initialized */
   bool inited;
+  /**
+    The type of lock configured to be used, either a classic read-write (-1)
+    lock or a shared-exclusive spin lock (1).
+   */
+  int32 m_configured_lock_type;
+  /**
+    The count of locks acquired: -1 will be added for each classic
+    read-write lock acquisitions; +1 will be added for each
+    shared-exclusive spin lock acquisition.
+   */
+  int32 m_acquired_locks;
+  /**
+    List of acquired plugin references, to be held while
+    `replication_optimize_for_static_plugin_config` option is enabled. If the
+    option is disabled, the references in this list will be released.
+   */
+  std::map<plugin_ref, size_t> m_acquired_references;
+
+  enum enum_delegate_lock_type
+  {
+    DELEGATE_OS_LOCK= -1,   // Lock used by this class is an OS RW lock
+    DELEGATE_SPIN_LOCK= 1,  // Lock used by this class is a spin lock
+  };
+
+  enum enum_delegate_lock_mode
+  {
+    DELEGATE_LOCK_MODE_SHARED= 0, // Lock acquired in shared/read mode
+    DELEGATE_LOCK_MODE_EXCLUSIVE= 1, // Lock acquired in exclusive/write mode
+  };
+
+  /**
+    Increases the `info->plugin` reference counting and stores that refernce
+    internally.
+   */
+  void acquire_plugin_ref_count(Observer_info *info);
+  /**
+    Locks the active lock (OS read-write lock or shared spin-lock)
+    according to the mode passed on as a parameter.
+
+    @param mode The mode to lock in, either DELEGATE_LOCK_MODE_SHARED or
+                DELEGATE_LOCK_MODE_EXCLUSIVE.
+   */
+  void lock_it(enum_delegate_lock_mode mode);
 };
 
 #ifdef HAVE_PSI_INTERFACE
@@ -308,7 +413,24 @@ class Binlog_relay_IO_delegate
 #endif /* HAVE_REPLICATION */
 
 int delegates_init();
+/**
+  Verify that the replication plugins are ready and OK to be unloaded.
+ */
+void delegates_shutdown();
 void delegates_destroy();
+/**
+  Invokes `write_lock()` for all the observer delegate objects.
+ */
+void delegates_acquire_locks();
+/**
+  Releases locks for all the observer delegate objects.
+ */
+void delegates_release_locks();
+/**
+  Toggles the type of lock between a classical read-write lock and a
+  shared-exclusive spin-lock.
+ */
+void delegates_update_lock_type();
 
 extern Trans_delegate *transaction_delegate;
 extern Binlog_storage_delegate *binlog_storage_delegate;
diff --git a/sql/rpl_info.cc b/sql/rpl_info.cc
index 5a3bec63ab8b..6c4c337d19dc 100644
--- a/sql/rpl_info.cc
+++ b/sql/rpl_info.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info.h b/sql/rpl_info.h
index bd9dd61dee3f..52c1af41afa6 100644
--- a/sql/rpl_info.h
+++ b/sql/rpl_info.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -68,7 +75,7 @@ class Rpl_info : public Slave_reporting_capability
   volatile uint slave_running;
   volatile ulong slave_run_id;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   int events_until_exit;
 #endif
 
diff --git a/sql/rpl_info_dummy.cc b/sql/rpl_info_dummy.cc
index 290372a749d2..5ddba74386c9 100644
--- a/sql/rpl_info_dummy.cc
+++ b/sql/rpl_info_dummy.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -32,33 +39,33 @@ int Rpl_info_dummy::do_init_info()
 
 int Rpl_info_dummy::do_prepare_info_for_read()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   cursor= 0;
   return 0;
 }
 
 int Rpl_info_dummy::do_prepare_info_for_write()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   cursor= 0;
   return 0;
 }
 
 enum_return_check Rpl_info_dummy::do_check_info()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   return REPOSITORY_DOES_NOT_EXIST;
 }
 
 enum_return_check Rpl_info_dummy::do_check_info(uint instance MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   return REPOSITORY_DOES_NOT_EXIST;
 }
 
 int Rpl_info_dummy::do_flush_info(const bool force MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   return 0;
 }
 
@@ -69,13 +76,13 @@ void Rpl_info_dummy::do_end_info()
 
 int Rpl_info_dummy::do_remove_info()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   return 0;
 }
 
 int Rpl_info_dummy::do_clean_info()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
   return 0;
 }
 
@@ -87,7 +94,7 @@ uint Rpl_info_dummy::do_get_rpl_info_type()
 bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const char *value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -96,7 +103,7 @@ bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const uchar *value MY_ATTRIBUTE((unused)),
                                 const size_t size MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -104,7 +111,7 @@ bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
 bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const ulong value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -112,7 +119,7 @@ bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
 bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const int value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -120,7 +127,7 @@ bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
 bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const float value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -128,7 +135,7 @@ bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
 bool Rpl_info_dummy::do_set_info(const int pos MY_ATTRIBUTE((unused)),
                                 const Server_ids *value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -138,7 +145,7 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 const size_t size MY_ATTRIBUTE((unused)),
                                 const char *default_value MY_ATTRIBUTE((unused)))
 {
-    DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -148,7 +155,7 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 const size_t size MY_ATTRIBUTE((unused)),
                                 const uchar *default_value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -157,7 +164,7 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 ulong *value MY_ATTRIBUTE((unused)),
                                 const ulong default_value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -166,7 +173,7 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 int *value MY_ATTRIBUTE((unused)),
                                 const int default_value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -175,7 +182,7 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 float *value MY_ATTRIBUTE((unused)),
                                 const float default_value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
@@ -184,28 +191,28 @@ bool Rpl_info_dummy::do_get_info(const int pos MY_ATTRIBUTE((unused)),
                                 Server_ids *value MY_ATTRIBUTE((unused)),
                                 const Server_ids *default_value MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
 
 char* Rpl_info_dummy::do_get_description_info()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return NULL;
 }
 
 bool Rpl_info_dummy::do_is_transactional()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
 
 bool Rpl_info_dummy::do_update_is_transactional()
 {
-  DBUG_ASSERT(!abort);
+  assert(!abort);
 
   return FALSE;
 }
diff --git a/sql/rpl_info_dummy.h b/sql/rpl_info_dummy.h
index 9cdda0f85a0e..dab87545c705 100644
--- a/sql/rpl_info_dummy.h
+++ b/sql/rpl_info_dummy.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_factory.cc b/sql/rpl_info_factory.cc
index 7d4f93948621..b91be28c09b6 100644
--- a/sql/rpl_info_factory.cc
+++ b/sql/rpl_info_factory.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -144,7 +151,7 @@ bool Rpl_info_factory::change_mi_repository(Master_info *mi,
   uint instances= 1;
   DBUG_ENTER("Rpl_info_factory::change_mi_repository");
 
-  DBUG_ASSERT(handler_src);
+  assert(handler_src);
 
   if (init_repositories(mi_table_data, mi_file_data, mi_option, instances,
                         NULL, &handler_dest, msg))
@@ -316,7 +323,7 @@ bool Rpl_info_factory::change_rli_repository(Relay_log_info *rli,
   uint instances= 1;
   DBUG_ENTER("Rpl_info_factory::change_rli_repository");
 
-  DBUG_ASSERT(handler_src != NULL);
+  assert(handler_src != NULL);
 
   if (init_repositories(rli_table_data, rli_file_data, rli_option,
                         instances, NULL, &handler_dest, msg))
@@ -442,8 +449,8 @@ Slave_worker *Rpl_info_factory::create_worker(uint rli_option, uint worker_id,
 
   /* get_num_instances() requires channel_map lock */
   /*
-  DBUG_ASSERT(channel_map.get_num_instances() <= 1 ||
-              (rli_option == 1 && handler_dest->get_rpl_info_type() == 1));
+    assert(channel_map.get_num_instances() <= 1 ||
+    (rli_option == 1 && handler_dest->get_rpl_info_type() == 1));
   */
   if (decide_repository(worker, rli_option, &handler_src, &handler_dest, &msg))
     goto err;
@@ -492,7 +499,7 @@ static void build_worker_info_name(char* to,
                                    const char* path,
                                    const char* fname)
 {
-  DBUG_ASSERT(to);
+  assert(to);
   char* pos= to;
   if (path[0])
     pos= my_stpcpy(pos, path);
@@ -598,8 +605,8 @@ bool Rpl_info_factory::decide_repository(Rpl_info *info, uint option,
     goto err;
   }
 
-  DBUG_ASSERT((*handler_src) != NULL && (*handler_dest) != NULL &&
-              (*handler_src) != (*handler_dest));
+  assert((*handler_src) != NULL && (*handler_dest) != NULL &&
+         (*handler_src) != (*handler_dest));
 
   return_check_src= check_src_repository(info, option, handler_src);
   return_check_dst= (*handler_dest)->do_check_info(info->get_internal_id()); // approx via scan, not field_values! Todo: reconsider any need for that at least in the Worker case
@@ -666,7 +673,7 @@ bool Rpl_info_factory::decide_repository(Rpl_info *info, uint option,
     else if (return_check_src == REPOSITORY_DOES_NOT_EXIST &&
              return_check_dst == REPOSITORY_EXISTS)
     {
-      DBUG_ASSERT(info->get_rpl_info_handler() == NULL);
+      assert(info->get_rpl_info_handler() == NULL);
       if ((*handler_dest)->do_init_info(info->get_internal_id()))
       {
         *msg= "Error reading repository";
@@ -675,8 +682,9 @@ bool Rpl_info_factory::decide_repository(Rpl_info *info, uint option,
     }
     else
     {
-      DBUG_ASSERT(return_check_src == REPOSITORY_DOES_NOT_EXIST &&
-                  return_check_dst == REPOSITORY_DOES_NOT_EXIST);
+      assert(return_check_src == REPOSITORY_DOES_NOT_EXIST &&
+             return_check_dst == REPOSITORY_DOES_NOT_EXIST);
+      info->inited= false;
     }
 
     delete (*handler_src);
@@ -873,7 +881,7 @@ bool Rpl_info_factory::init_repositories(const struct_table_data table_data,
 
   DBUG_ENTER("Rpl_info_factory::init_mi_repositories");
 
-  DBUG_ASSERT(handler_dest != NULL);
+  assert(handler_dest != NULL);
   switch (rep_option)
   {
     case INFO_REPOSITORY_FILE:
@@ -912,7 +920,7 @@ bool Rpl_info_factory::init_repositories(const struct_table_data table_data,
     break;
 
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
   error= FALSE;
 
@@ -929,7 +937,7 @@ bool Rpl_info_factory::scan_repositories(uint* found_instances,
   bool error= false;
   uint file_instances= 0;
   uint table_instances= 0;
-  DBUG_ASSERT(found_rep_option != NULL);
+  assert(found_rep_option != NULL);
 
   DBUG_ENTER("Rpl_info_factory::scan_repositories");
 
@@ -1292,7 +1300,7 @@ Rpl_info_factory::load_channel_names_from_repository(std::vector<std::string>& c
   switch(mi_repository)
   {
   case INFO_REPOSITORY_FILE:
-    DBUG_ASSERT(mi_instances == 1);
+    assert(mi_instances == 1);
     /* insert default channel */
     {
     std::string str(default_channel);
@@ -1309,7 +1317,7 @@ Rpl_info_factory::load_channel_names_from_repository(std::vector<std::string>& c
     /* file and table instanaces are zero, nothing to be done*/
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   DBUG_RETURN(false);
@@ -1367,6 +1375,8 @@ Rpl_info_factory::load_channel_names_from_table(std::vector<std::string> &channe
 
   thd= info->access->create_thd();
   saved_mode= thd->variables.sql_mode;
+  // Ensure channel names are always read consistently
+  thd->variables.sql_mode &= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
 
   /*
      Opens and locks the rpl_info table before accessing it.
diff --git a/sql/rpl_info_factory.h b/sql/rpl_info_factory.h
index 9cec7be305af..8a90db16510f 100644
--- a/sql/rpl_info_factory.h
+++ b/sql/rpl_info_factory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_file.cc b/sql/rpl_info_file.cc
index 07ff7a1566ad..4cff71372166 100644
--- a/sql/rpl_info_file.cc
+++ b/sql/rpl_info_file.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_file.h b/sql/rpl_info_file.h
index 65a83f1f3fce..c97646e2b065 100644
--- a/sql/rpl_info_file.h
+++ b/sql/rpl_info_file.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_handler.cc b/sql/rpl_info_handler.cc
index f44224948325..531ea866f5cf 100644
--- a/sql/rpl_info_handler.cc
+++ b/sql/rpl_info_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -53,7 +60,7 @@ const char* Rpl_info_handler::get_rpl_info_type_str()
   case INFO_REPOSITORY_TABLE:  return "TABLE";
   }
 
-  DBUG_ASSERT(0);
+  assert(0);
   return "";
 }
 
diff --git a/sql/rpl_info_handler.h b/sql/rpl_info_handler.h
index 64c0ffebed4a..3eef7c702114 100644
--- a/sql/rpl_info_handler.h
+++ b/sql/rpl_info_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -431,7 +438,7 @@ class Rpl_info_handler
 
   Rpl_info_handler& operator=(const Rpl_info_handler& handler);
 };
-#ifndef DBUG_OFF
+#ifndef NDEBUG
  extern ulong w_rr;
  extern uint mts_debug_concurrent_access;
 #endif
diff --git a/sql/rpl_info_table.cc b/sql/rpl_info_table.cc
index 204dd69c7570..01eea6519536 100644
--- a/sql/rpl_info_table.cc
+++ b/sql/rpl_info_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -97,6 +104,8 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance)
   THD *thd= access->create_thd();
 
   saved_mode= thd->variables.sql_mode;
+  // Ensure replication tables are always read in a consistent way
+  thd->variables.sql_mode &= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
   tmp_disable_binlog(thd);
 
   /*
@@ -125,7 +134,7 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance)
     break;
 
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     break;
   }
 
@@ -144,7 +153,7 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance)
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error= access->close_table(thd, table, &backup, error) || error;
   reenable_binlog(thd);
   thd->variables.sql_mode= saved_mode;
   access->drop_thd(thd);
@@ -254,7 +263,7 @@ int Rpl_info_table::do_flush_info(const bool force)
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error= access->close_table(thd, table, &backup, error) || error;
   thd->is_operating_substatement_implicitly= false;
   reenable_binlog(thd);
   thd->variables.sql_mode= saved_mode;
@@ -310,7 +319,7 @@ int Rpl_info_table::do_clean_info()
   /*
     Unlocks and closes the rpl_info table.
   */
-  access->close_table(thd, table, &backup, error);
+  error= access->close_table(thd, table, &backup, error) || error;
   reenable_binlog(thd);
   thd->variables.sql_mode= saved_mode;
   access->drop_thd(thd);
@@ -374,7 +383,7 @@ int Rpl_info_table::do_reset_info(uint nparam,
       todo: for another table in future, consider to make use of the
       passed parameter to locate the lookup key.
     */
-    DBUG_ASSERT(strcmp(info->str_table.str, "slave_worker_info") == 0);
+    assert(strcmp(info->str_table.str, "slave_worker_info") == 0);
 
     if (info->verify_table_primary_key_fields(table))
     {
@@ -423,7 +432,7 @@ int Rpl_info_table::do_reset_info(uint nparam,
   /*
     Unlocks and closes the rpl_info table.
   */
-  info->access->close_table(thd, table, &backup, error);
+  error= info->access->close_table(thd, table, &backup, error) || error;
   reenable_binlog(thd);
   thd->variables.sql_mode= saved_mode;
   info->access->drop_thd(thd);
@@ -598,7 +607,7 @@ bool Rpl_info_table::do_count_info(uint nparam,
   /*
     Unlocks and closes the rpl_info table.
   */
-  info->access->close_table(thd, table, &backup, error);
+  error= info->access->close_table(thd, table, &backup, error) || error;
   thd->variables.sql_mode= saved_mode;
   info->access->drop_thd(thd);
   delete info;
@@ -792,7 +801,7 @@ bool Rpl_info_table::do_update_is_transactional()
   error= FALSE;
 
 end:
-  access->close_table(thd, table, &backup, 0);
+  error= access->close_table(thd, table, &backup, 0) || error;
   reenable_binlog(thd);
   thd->variables.sql_mode= saved_mode;
   access->drop_thd(thd);
diff --git a/sql/rpl_info_table.h b/sql/rpl_info_table.h
index 9b35318e3d31..3429da0f3601 100644
--- a/sql/rpl_info_table.h
+++ b/sql/rpl_info_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_table_access.cc b/sql/rpl_info_table_access.cc
index 3eaba7431b20..cd7dc639b134 100644
--- a/sql/rpl_info_table_access.cc
+++ b/sql/rpl_info_table_access.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -63,14 +70,18 @@ void Rpl_info_table_access::before_open(THD *thd)
   committed. In this case, the changes were not done on behalf of
   any user transaction and if not finished, there would be pending
   changes.
+
+  @return
+    @retval false Success
+    @retval true  Failure
 */
-void Rpl_info_table_access::close_table(THD *thd, TABLE* table,
+bool Rpl_info_table_access::close_table(THD *thd, TABLE* table,
                                         Open_tables_backup *backup,
                                         bool error)
 {
   DBUG_ENTER("Rpl_info_table_access::close_table");
-  System_table_access::close_table(thd, table, backup, error, thd_created);
-  DBUG_VOID_RETURN;
+  bool res= System_table_access::close_table(thd, table, backup, error, thd_created);
+  DBUG_RETURN(res);
 }
 
 /**
@@ -331,6 +342,11 @@ THD *Rpl_info_table_access::create_thd()
   {
     thd= System_table_access::create_thd();
     thd->system_thread= SYSTEM_THREAD_INFO_REPOSITORY;
+    /*
+       Set the skip_readonly_check flag as this thread should not be
+       blocked by super_read_only check during ha_commit_trans.
+    */
+    thd->set_skip_readonly_check();
     thd_created= true;
   }
 
@@ -349,6 +365,7 @@ void Rpl_info_table_access::drop_thd(THD *thd)
 
   if (thd_created)
   {
+    thd->reset_skip_readonly_check();
     System_table_access::drop_thd(thd);
     thd_created= false;
   }
diff --git a/sql/rpl_info_table_access.h b/sql/rpl_info_table_access.h
index f7ed88ae44d9..8e01c928b6ae 100644
--- a/sql/rpl_info_table_access.h
+++ b/sql/rpl_info_table_access.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -44,7 +51,7 @@ class Rpl_info_table_access : public System_table_access
     @param[in]  thd  Thread requesting to open the table
   */
   void before_open(THD* thd);
-  void close_table(THD* thd, TABLE* table, Open_tables_backup* backup,
+  bool close_table(THD* thd, TABLE* table, Open_tables_backup* backup,
                    bool error);
   enum enum_return_id find_info(Rpl_info_values *field_values, TABLE *table);
   enum enum_return_id scan_info(TABLE *table, uint instance);
diff --git a/sql/rpl_info_values.cc b/sql/rpl_info_values.cc
index e7c4c32e27ed..1f41242e99a9 100644
--- a/sql/rpl_info_values.cc
+++ b/sql/rpl_info_values.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_info_values.h b/sql/rpl_info_values.h
index 6b7b77238a6d..0e4248448343 100644
--- a/sql/rpl_info_values.h
+++ b/sql/rpl_info_values.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc
index 765b9d134891..cd0134addef5 100644
--- a/sql/rpl_injector.cc
+++ b/sql/rpl_injector.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 868f986e2a47..3a937cf3ae5e 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -348,12 +355,12 @@ class injector
        */
       int check_state(enum_state const target_state)
       {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         static char const *state_name[] = {
           "START_STATE", "TABLE_STATE", "ROW_STATE", "STATE_COUNT"
         };
 
-        DBUG_ASSERT(0 <= target_state && target_state <= STATE_COUNT);
+        assert(0 <= target_state && target_state <= STATE_COUNT);
         DBUG_PRINT("info", ("In state %s", state_name[m_state]));
 #endif
 
diff --git a/sql/rpl_master.cc b/sql/rpl_master.cc
index 030db49d2ca4..6aebd6969de5 100644
--- a/sql/rpl_master.cc
+++ b/sql/rpl_master.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -29,7 +36,7 @@
 #include "rpl_handler.h"                        // RUN_HOOK
 #include "sql_class.h"                          // THD
 #include "rpl_group_replication.h"              // is_group_replication_running
-
+#include "mutex_lock.h"                         // Mutex_lock
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
 
@@ -180,7 +187,7 @@ int register_slave(THD* thd, uchar* packet, size_t packet_length)
 
 void unregister_slave(THD* thd, bool only_mine, bool need_lock_slave_list)
 {
-  if (thd->server_id)
+  if (thd->server_id && my_hash_inited(&slave_list))
   {
     if (need_lock_slave_list)
       mysql_mutex_lock(&LOCK_slave_list);
@@ -318,6 +325,7 @@ bool com_binlog_dump(THD *thd, char *packet, size_t packet_length)
   const uchar* packet_position= (uchar *) packet;
   size_t packet_bytes_todo= packet_length;
 
+  assert(!thd->status_var_aggregated);
   thd->status_var.com_other++;
   thd->enable_slow_log= opt_log_slow_admin_statements;
   if (check_global_access(thd, REPL_SLAVE_ACL))
@@ -368,6 +376,7 @@ bool com_binlog_dump_gtid(THD *thd, char *packet, size_t packet_length)
   Sid_map sid_map(NULL/*no sid_lock because this is a completely local object*/);
   Gtid_set slave_gtid_executed(&sid_map);
 
+  assert(!thd->status_var_aggregated);
   thd->status_var.com_other++;
   thd->enable_slow_log= opt_log_slow_admin_statements;
   if (check_global_access(thd, REPL_SLAVE_ACL))
@@ -428,18 +437,15 @@ String *get_slave_uuid(THD *thd, String *value)
     return NULL;
 
   /* Protects thd->user_vars. */
-  mysql_mutex_lock(&thd->LOCK_thd_data);
+  Mutex_lock lock_guard(&thd->LOCK_thd_data);
 
   user_var_entry *entry=
     (user_var_entry*) my_hash_search(&thd->user_vars, name, sizeof(name)-1);
   if (entry && entry->length() > 0)
   {
     value->copy(entry->ptr(), entry->length(), NULL);
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
     return value;
   }
-
-  mysql_mutex_unlock(&thd->LOCK_thd_data);
   return NULL;
 }
 
diff --git a/sql/rpl_master.h b/sql/rpl_master.h
index 4f75c12194e6..add7c430c031 100644
--- a/sql/rpl_master.h
+++ b/sql/rpl_master.h
@@ -1,14 +1,21 @@
 #ifndef RPL_MASTER_H_INCLUDED
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index 0328dd26e2e3..88d99408b4fe 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -132,7 +139,8 @@ Master_info::Master_info(
    checksum_alg_before_fd(binary_log::BINLOG_CHECKSUM_ALG_UNDEF),
    retry_count(master_retry_count),
    mi_description_event(NULL),
-   auto_position(false)
+   auto_position(false),
+   reset(false)
 {
   host[0] = 0; user[0] = 0; bind_addr[0] = 0;
   password[0]= 0; start_password[0]= 0;
@@ -208,6 +216,7 @@ void Master_info::end_info()
   handler->end_info();
 
   inited = 0;
+  reset = true;
 
   DBUG_VOID_RETURN;
 }
@@ -246,16 +255,25 @@ int Master_info::flush_info(bool force)
   DBUG_ENTER("Master_info::flush_info");
   DBUG_PRINT("enter",("master_pos: %lu", (ulong) master_log_pos));
 
-  if (!inited)
+  bool skip_flushing = !inited;
+  /*
+    A Master_info of a channel that was inited and then reset must be flushed
+    into the repository or else its connection configuration will be lost in
+    case the server restarts before starting the channel again.
+  */
+  if (force && reset) skip_flushing= false;
+
+  if (skip_flushing)
     DBUG_RETURN(0);
 
   /*
     We update the sync_period at this point because only here we
     now that we are handling a master info. This needs to be
     update every time we call flush because the option maybe
-    dinamically set.
+    dynamically set.
   */
-  handler->set_sync_period(sync_masterinfo_period);
+  if (inited)
+    handler->set_sync_period(sync_masterinfo_period);
 
   if (write_info(handler))
     goto err;
@@ -306,6 +324,7 @@ int Master_info::mi_init_info()
   }
 
   inited= 1;
+  reset= false;
   if (flush_info(TRUE))
     goto err;
 
@@ -562,7 +581,7 @@ void Master_info::set_password(const char* password_arg)
 {
   DBUG_ENTER("Master_info::set_password");
 
-  DBUG_ASSERT(password_arg);
+  assert(password_arg);
 
   if (password_arg && start_user_configured)
     strmake(start_password, password_arg, sizeof(start_password) - 1);
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h
index 26ca88675e29..961afb198272 100644
--- a/sql/rpl_mi.h
+++ b/sql/rpl_mi.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -501,6 +508,9 @@ friend class Rpl_info_factory;
     @param THD thd the THD object of current thread
   */
   void wait_until_no_reference(THD *thd);
+
+  /* Set true when the Master_info object was cleared by a RESET SLAVE */
+  bool reset;
 };
 int change_master_server_id_cmp(ulong *id1, ulong *id2);
 
diff --git a/sql/rpl_msr.cc b/sql/rpl_msr.cc
index c7006d9900b5..8153c4746ef0 100644
--- a/sql/rpl_msr.cc
+++ b/sql/rpl_msr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -34,7 +41,7 @@ bool Multisource_info::add_mi(const char* channel_name, Master_info* mi)
   bool res= false;
 
   /* The check of mi exceeding MAX_CHANNELS shall be done in the caller */
-  DBUG_ASSERT(current_mi_count < MAX_CHANNELS);
+  assert(current_mi_count < MAX_CHANNELS);
 
   replication_channel_map::iterator map_it;
   enum_channel_type type= is_group_replication_channel_name(channel_name)
@@ -78,7 +85,7 @@ Master_info* Multisource_info::get_mi(const char* channel_name)
 
   m_channel_map_lock->assert_some_lock();
 
-  DBUG_ASSERT(channel_name != 0);
+  assert(channel_name != 0);
 
   mi_map::iterator it;
   replication_channel_map::iterator map_it;
@@ -107,7 +114,7 @@ Master_info* Multisource_info::get_mi(const char* channel_name)
   DBUG_RETURN(it->second);
 }
 
-void Multisource_info::delete_mi(const char* channel_name)
+bool Multisource_info::delete_mi(const char* channel_name)
 {
   DBUG_ENTER("Multisource_info::delete_mi");
 
@@ -116,7 +123,7 @@ void Multisource_info::delete_mi(const char* channel_name)
   Master_info *mi= 0;
   mi_map::iterator it;
 
-  DBUG_ASSERT(channel_name != 0);
+  assert(channel_name != 0);
 
   replication_channel_map::iterator map_it;
   map_it= rep_channel_map.find(SLAVE_REPLICATION_CHANNEL);
@@ -129,10 +136,19 @@ void Multisource_info::delete_mi(const char* channel_name)
       it == map_it->second.end())
   {
     map_it= rep_channel_map.find(GROUP_REPLICATION_CHANNEL);
-    DBUG_ASSERT(map_it != rep_channel_map.end());
+    assert(map_it != rep_channel_map.end());
 
-    it= map_it->second.find(channel_name);
-    DBUG_ASSERT(it != map_it->second.end());
+    if (map_it != rep_channel_map.end())
+    {
+      it = map_it->second.find(channel_name);
+      assert(it != map_it->second.end());
+    }
+  }
+
+  if (map_it == rep_channel_map.end() || it == map_it->second.end())
+  {
+    // the channel identified by channel_name could not be found
+    DBUG_RETURN(true);
   }
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
@@ -140,7 +156,7 @@ void Multisource_info::delete_mi(const char* channel_name)
   /* get the index of mi from rpl_pfs_mi */
   index= get_index_from_rpl_pfs_mi(channel_name);
 
-  DBUG_ASSERT(index != -1);
+  assert(index != -1);
 
   /* set the current index to  0  and decrease current_mi_count */
   rpl_pfs_mi[index] = 0;
@@ -169,7 +185,7 @@ void Multisource_info::delete_mi(const char* channel_name)
     delete mi;
   }
 
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(false);
 }
 
 
diff --git a/sql/rpl_msr.h b/sql/rpl_msr.h
index 374b2b266de2..ab4450cad614 100644
--- a/sql/rpl_msr.h
+++ b/sql/rpl_msr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -140,10 +147,10 @@ class Multisource_info
       This class should be a singleton.
       The assert below is to prevent it to be instantiated more than once.
     */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     static int instance_count= 0;
     instance_count++;
-    DBUG_ASSERT(instance_count == 1);
+    assert(instance_count == 1);
 #endif
     current_mi_count= 0;
     default_channel_mi= NULL;
@@ -204,10 +211,17 @@ class Multisource_info
     replication_channel_map and sets index in the  multisource_mi to 0;
     And also delete the {mi, rli} pair corresponding to this channel
 
+    @note this requires the caller to hold the mi->channel_wrlock.
+    If the method succeeds the master info object is deleted and the lock
+    is released. If the an error occurs and the method return true, the {mi}
+    object wont be deleted and the caller should release the channel_wrlock.
+
     @param[in]    channel_name     Name of the channel for a Master_info
                                    object which must exist.
+
+    @return true if an error occurred, false otherwise
   */
-  void delete_mi(const char* channel_name);
+  bool delete_mi(const char* channel_name);
 
   /**
     Get the default channel for this multisourced_slave;
diff --git a/sql/rpl_mts_submode.cc b/sql/rpl_mts_submode.cc
index e6341ed9f5cc..22c0d789450c 100644
--- a/sql/rpl_mts_submode.cc
+++ b/sql/rpl_mts_submode.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -53,7 +60,7 @@ Mts_submode_database::attach_temp_tables(THD *thd, const Relay_log_info* rli,
   DBUG_ENTER("Mts_submode_database::attach_temp_tables");
   if (!is_mts_worker(thd) || (ev->ends_group() || ev->starts_group()))
     DBUG_VOID_RETURN;
-  DBUG_ASSERT(!thd->temporary_tables);
+  assert(!thd->temporary_tables);
   // in over max-db:s case just one special partition is locked
   parts= ((ev->mts_accessed_dbs == OVER_MAX_DBS_IN_EVENT_MTS) ? 1 :
            ev->mts_accessed_dbs);
@@ -116,7 +123,7 @@ Mts_submode_database::wait_for_workers_to_finish(Relay_log_info *rli,
 
     entry= (db_worker_hash_entry*) my_hash_element(hash, i);
 
-    DBUG_ASSERT(entry);
+    assert(entry);
 
     // the ignore Worker retains its active resources
     if (ignore && entry->worker == ignore && entry->usage > 0)
@@ -238,21 +245,21 @@ Mts_submode_database::detach_temp_tables(THD *thd, const Relay_log_info* rli,
           break;
       }
     }
-    DBUG_ASSERT(db_name && (
-                !strcmp(table->s->db.str, db_name) ||
-                !strlen(db_name))
-                );
-    DBUG_ASSERT(i < ev->mts_accessed_dbs);
+    assert(db_name && (
+                       !strcmp(table->s->db.str, db_name) ||
+                       !strlen(db_name))
+           );
+    assert(i < ev->mts_accessed_dbs);
     // table pointer is shifted inside the function
     table= mts_move_temp_table_to_entry(table, thd, ev->mts_assigned_partitions[i]);
   }
 
-  DBUG_ASSERT(!thd->temporary_tables);
-#ifndef DBUG_OFF
+  assert(!thd->temporary_tables);
+#ifndef NDEBUG
   for (int i= 0; i < parts; i++)
   {
-    DBUG_ASSERT(!ev->mts_assigned_partitions[i]->temporary_tables ||
-                !ev->mts_assigned_partitions[i]->temporary_tables->prev);
+    assert(!ev->mts_assigned_partitions[i]->temporary_tables ||
+           !ev->mts_assigned_partitions[i]->temporary_tables->prev);
   }
 #endif
   DBUG_VOID_RETURN;
@@ -276,7 +283,7 @@ Mts_submode_database::get_least_occupied_worker(Relay_log_info *rli,
 
   DBUG_ENTER("Mts_submode_database::get_least_occupied_worker");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
   if (DBUG_EVALUATE_IF("mts_distribute_round_robin", 1, 0))
   {
@@ -284,7 +291,7 @@ Mts_submode_database::get_least_occupied_worker(Relay_log_info *rli,
     sql_print_information("Chosing worker id %lu, the following is"
                           " going to be %lu", worker->id,
                           static_cast<ulong>(w_rr % ws->size()));
-    DBUG_ASSERT(worker != NULL);
+    assert(worker != NULL);
     DBUG_RETURN(worker);
   }
 #endif
@@ -298,7 +305,7 @@ Mts_submode_database::get_least_occupied_worker(Relay_log_info *rli,
       usage= (*ptr_current_worker)->usage_partition;
     }
   }
-  DBUG_ASSERT(worker != NULL);
+  assert(worker != NULL);
   DBUG_RETURN(worker);
 }
 
@@ -379,9 +386,9 @@ longlong Mts_submode_logical_clock::get_lwm_timestamp(Relay_log_info *rli,
     timestamp continuity invariant: if the queue has any item
     its timestamp is greater on one than the estimate.
   */
-  DBUG_ASSERT(lwm_estim == SEQ_UNINIT || rli->gaq->empty() ||
-              lwm_estim + 1 ==
-              rli->gaq->get_job_group(rli->gaq->entry)->sequence_number);
+  assert(lwm_estim == SEQ_UNINIT || rli->gaq->empty() ||
+         lwm_estim + 1 ==
+         rli->gaq->get_job_group(rli->gaq->entry)->sequence_number);
 
   last_lwm_index=
     rli->gaq->find_lwm(&ptr_g,
@@ -399,7 +406,7 @@ longlong Mts_submode_logical_clock::get_lwm_timestamp(Relay_log_info *rli,
   if (last_lwm_index != rli->gaq->size)
   {
     // non-decreasing lwm invariant
-    DBUG_ASSERT(clock_leq(last_lwm_timestamp, ptr_g->sequence_number));
+    assert(clock_leq(last_lwm_timestamp, ptr_g->sequence_number));
 
     last_lwm_timestamp= ptr_g->sequence_number;
   }
@@ -462,7 +469,7 @@ wait_for_last_committed_trx(Relay_log_info* rli,
 
   mysql_mutex_lock(&rli->mts_gaq_LOCK);
 
-  DBUG_ASSERT(min_waited_timestamp == SEQ_UNINIT);
+  assert(min_waited_timestamp == SEQ_UNINIT);
 
   my_atomic_store64(&min_waited_timestamp, last_committed_arg);
   /*
@@ -478,7 +485,7 @@ wait_for_last_committed_trx(Relay_log_info* rli,
     struct timespec ts[2];
     set_timespec_nsec(&ts[0], 0);
 
-    DBUG_ASSERT(rli->gaq->len >= 2); // there's someone to wait
+    assert(rli->gaq->len >= 2); // there's someone to wait
 
     thd->ENTER_COND(&rli->logical_clock_cond, &rli->mts_gaq_LOCK,
                     &stage_worker_waiting_for_commit_parent, &old_stage);
@@ -597,7 +604,7 @@ Mts_submode_logical_clock::schedule_next_event(Relay_log_info* rli,
       DBUG_PRINT("info", ("sequence_number gap found, "
                           "last_sequence_number %lld, sequence_number %lld",
                           last_sequence_number, sequence_number));
-      DBUG_ASSERT(rli->replicate_same_server_id || true /* TODO: account autopositioning */);
+      assert(rli->replicate_same_server_id || true /* TODO: account autopositioning */);
       gap_successor= true;
     }
   }
@@ -672,18 +679,18 @@ Mts_submode_logical_clock::schedule_next_event(Relay_log_info* rli,
       */
       if (gap_successor)
         last_lwm_timestamp= sequence_number - 1;
-      DBUG_ASSERT(!clock_leq(sequence_number, estimate_lwm_timestamp()));
+      assert(!clock_leq(sequence_number, estimate_lwm_timestamp()));
     }
 
     delegated_jobs++;
 
-    DBUG_ASSERT(!force_new_group);
+    assert(!force_new_group);
   }
   else
   {
-    DBUG_ASSERT(delegated_jobs >= jobs_done);
-    DBUG_ASSERT(is_error || (rli->gaq->len + jobs_done == 1 + delegated_jobs));
-    DBUG_ASSERT(rli->mts_group_status == Relay_log_info::MTS_IN_GROUP);
+    assert(delegated_jobs >= jobs_done);
+    assert(is_error || (rli->gaq->len + jobs_done == 1 + delegated_jobs));
+    assert(rli->mts_group_status == Relay_log_info::MTS_IN_GROUP);
 
     /*
       Under the new group fall the following use cases:
@@ -698,7 +705,7 @@ Mts_submode_logical_clock::schedule_next_event(Relay_log_info* rli,
       DBUG_RETURN (ER_MTS_INCONSISTENT_DATA);
 
     rli->mts_group_status= Relay_log_info::MTS_IN_GROUP; //wait set it to NOT
-    DBUG_ASSERT(min_waited_timestamp == SEQ_UNINIT);
+    assert(min_waited_timestamp == SEQ_UNINIT);
     /*
       the instant last lwm timestamp must reset when force flag is up.
     */
@@ -716,9 +723,9 @@ Mts_submode_logical_clock::schedule_next_event(Relay_log_info* rli,
       rli->last_assigned_worker= *rli->workers.begin();
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mysql_mutex_lock(&rli->mts_gaq_LOCK);
-  DBUG_ASSERT(is_error || (rli->gaq->len + jobs_done == delegated_jobs));
+  assert(is_error || (rli->gaq->len + jobs_done == delegated_jobs));
   mysql_mutex_unlock(&rli->mts_gaq_LOCK);
 #endif
   DBUG_RETURN(0);
@@ -743,7 +750,7 @@ Mts_submode_logical_clock::attach_temp_tables(THD *thd, const Relay_log_info* rl
     DBUG_VOID_RETURN;
   /* fetch coordinator's rli */
   Relay_log_info *c_rli= static_cast<const Slave_worker *>(rli)->c_rli;
-  DBUG_ASSERT(!thd->temporary_tables);
+  assert(!thd->temporary_tables);
   mysql_mutex_lock(&c_rli->mts_temp_table_LOCK);
   if (!(table= c_rli->info_thd->temporary_tables))
   {
@@ -833,7 +840,7 @@ Mts_submode_logical_clock::get_least_occupied_worker(Relay_log_info *rli,
   PSI_stage_info *old_stage= 0;
   THD* thd= rli->info_thd;
   DBUG_ENTER("Mts_submode_logical_clock::get_least_occupied_worker");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
   if (DBUG_EVALUATE_IF("mts_distribute_round_robin", 1, 0))
   {
@@ -841,7 +848,7 @@ Mts_submode_logical_clock::get_least_occupied_worker(Relay_log_info *rli,
     sql_print_information("Chosing worker id %lu, the following is"
                           " going to be %lu", worker->id,
                           static_cast<ulong>(w_rr % ws->size()));
-    DBUG_ASSERT(worker != NULL);
+    assert(worker != NULL);
     DBUG_RETURN(worker);
   }
   Slave_committed_queue *gaq= rli->gaq;
@@ -862,15 +869,15 @@ Mts_submode_logical_clock::get_least_occupied_worker(Relay_log_info *rli,
   if (rli->last_assigned_worker)
   {
     worker= rli->last_assigned_worker;
-    DBUG_ASSERT(ev->get_type_code() != binary_log::USER_VAR_EVENT || worker->id == 0 ||
-                rli->curr_group_seen_begin || rli->curr_group_seen_gtid);
+    assert(ev->get_type_code() != binary_log::USER_VAR_EVENT || worker->id == 0 ||
+           rli->curr_group_seen_begin || rli->curr_group_seen_gtid);
   }
   else
   {
     worker= get_free_worker(rli);
 
-    DBUG_ASSERT(ev->get_type_code() != binary_log::USER_VAR_EVENT ||
-                rli->curr_group_seen_begin || rli->curr_group_seen_gtid);
+    assert(ev->get_type_code() != binary_log::USER_VAR_EVENT ||
+           rli->curr_group_seen_begin || rli->curr_group_seen_gtid);
 
     if (worker == NULL)
     {
@@ -916,10 +923,10 @@ Mts_submode_logical_clock::get_least_occupied_worker(Relay_log_info *rli,
       rli->get_commit_order_manager()->register_trx(worker);
   }
 
-  DBUG_ASSERT(ptr_group);
+  assert(ptr_group);
   // assert that we have a worker thread for this event or the slave has
   // stopped.
-  DBUG_ASSERT(worker != NULL || thd->killed);
+  assert(worker != NULL || thd->killed);
   /* The master my have send  db partition info. make sure we never use them*/
   if (ev->get_type_code() == binary_log::QUERY_EVENT)
     static_cast<Query_log_event*>(ev)->mts_accessed_dbs= 0;
@@ -979,11 +986,22 @@ Mts_submode_logical_clock::
     if (mts_checkpoint_routine(rli, 0, true, true /*need_data_lock=true*/))
       DBUG_RETURN(-1);
   }
+
+  // Check if there is a failure on a not-ignored Worker
+  for (Slave_worker **it= rli->workers.begin(); it != rli->workers.end();
+      ++it)
+  {
+    Slave_worker *w_i= *it;
+    if (w_i->running_status != Slave_worker::RUNNING)
+      DBUG_RETURN(-1);
+
+  }
+
   DBUG_EXECUTE_IF("wait_for_workers_to_finish_after_wait",
                   {
                     const char act[]= "now WAIT_FOR coordinator_continue";
-                    DBUG_ASSERT(!debug_sync_set_action(rli->info_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(rli->info_thd,
+                                                  STRING_WITH_LEN(act)));
                   });
 
   // The current commit point sequence may end here (e.g Rotate to new log)
@@ -1011,7 +1029,7 @@ Mts_submode_logical_clock::get_server_and_thread_id(TABLE* table)
   char* extra_string= table->s->table_cache_key.str;
   size_t extra_string_len= table->s->table_cache_key.length;
   // assert will fail when called with non temporary tables.
-  DBUG_ASSERT(table->s->table_cache_key.length > 0);
+  assert(table->s->table_cache_key.length > 0);
   std::pair<uint, my_thread_id>ret_pair= std::make_pair
     (
       /* last 8  bytes contains the server_id + pseudo_thread_id */
diff --git a/sql/rpl_mts_submode.h b/sql/rpl_mts_submode.h
index bf29597e8477..f8baa4677649 100644
--- a/sql/rpl_mts_submode.h
+++ b/sql/rpl_mts_submode.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 0574cb7483fc..e984c253bf1c 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -109,7 +116,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
           length is stored in little-endian format, since this is the
           format used for the binlog.
         */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         const uchar *old_pack_ptr= pack_ptr;
 #endif
         pack_ptr= field->pack(pack_ptr, field->ptr + offset,
@@ -125,13 +132,13 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
       null_mask <<= 1;
       if ((null_mask & 0xFF) == 0)
       {
-        DBUG_ASSERT(null_ptr < row_data + null_byte_count);
+        assert(null_ptr < row_data + null_byte_count);
         null_mask = 1U;
         *null_ptr++ = null_bits;
         null_bits= (1U << 8) - 1;
       }
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     else
     {
       DBUG_PRINT("debug", ("Skipped"));
@@ -144,7 +151,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
   */
   if ((null_mask & 0xFF) > 1)
   {
-    DBUG_ASSERT(null_ptr < row_data + null_byte_count);
+    assert(null_ptr < row_data + null_byte_count);
     *null_ptr++ = null_bits;
   }
 
@@ -152,7 +159,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
     The null pointer should now point to the first byte of the
     packed data. If it doesn't, something is very wrong.
   */
-  DBUG_ASSERT(null_ptr == row_data + null_byte_count);
+  assert(null_ptr == row_data + null_byte_count);
   DBUG_DUMP("row_data", row_data, pack_ptr - row_data);
   DBUG_RETURN(static_cast<size_t>(pack_ptr - row_data));
 }
@@ -210,8 +217,8 @@ unpack_row(Relay_log_info const *rli,
            uchar const *const row_end)
 {
   DBUG_ENTER("unpack_row");
-  DBUG_ASSERT(row_data);
-  DBUG_ASSERT(table);
+  assert(row_data);
+  assert(table);
   size_t const master_null_byte_count= (bitmap_bits_set(cols) + 7) / 8;
   int error= 0;
 
@@ -234,7 +241,7 @@ unpack_row(Relay_log_info const *rli,
   Field **field_ptr;
   Field **const end_ptr= begin_ptr + colcnt;
 
-  DBUG_ASSERT(null_ptr < row_data + master_null_byte_count);
+  assert(null_ptr < row_data + master_null_byte_count);
 
   // Mask to mask out the correct bit among the null bits
   unsigned int null_mask= 1U;
@@ -246,7 +253,7 @@ unpack_row(Relay_log_info const *rli,
   bool table_found= rli && rli->get_table_data(table, &tabledef, &conv_table);
   DBUG_PRINT("debug", ("Table data: table_found: %d, tabldef: %p, conv_table: %p",
                        table_found, tabledef, conv_table));
-  DBUG_ASSERT(table_found);
+  assert(table_found);
 
   /*
     If rli is NULL it means that there is no source table and that the
@@ -272,7 +279,7 @@ unpack_row(Relay_log_info const *rli,
                          conv_field ? "" : "not ",
                          (*field_ptr)->field_name,
                          (long) (field_ptr - begin_ptr)));
-    DBUG_ASSERT(f != NULL);
+    assert(f != NULL);
 
     DBUG_PRINT("debug", ("field: %s; null mask: 0x%x; null bits: 0x%lx;"
                          " row start: %p; null bytes: %ld",
@@ -287,15 +294,15 @@ unpack_row(Relay_log_info const *rli,
     {
       if ((null_mask & 0xFF) == 0)
       {
-        DBUG_ASSERT(null_ptr < row_data + master_null_byte_count);
+        assert(null_ptr < row_data + master_null_byte_count);
         null_mask= 1U;
         null_bits= *null_ptr++;
       }
 
-      DBUG_ASSERT(null_mask & 0xFF); // One of the 8 LSB should be set
+      assert(null_mask & 0xFF); // One of the 8 LSB should be set
 
       /* Field...::unpack() cannot return 0 */
-      DBUG_ASSERT(pack_ptr != NULL);
+      assert(pack_ptr != NULL);
 
       if (null_bits & null_mask)
       {
@@ -339,7 +346,7 @@ unpack_row(Relay_log_info const *rli,
           normal unpack operation.
         */
         uint16 const metadata= tabledef->field_metadata(i);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         uchar const *const old_pack_ptr= pack_ptr;
 #endif
         uint32 len= tabledef->calc_field_size(i, (uchar *) pack_ptr);
@@ -350,18 +357,18 @@ unpack_row(Relay_log_info const *rli,
           DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT);
         }
         /*
-          For a virtual generated column of blob type, we have to keep
-          both the old and new value for the blob since this might be
+          For a virtual generated column based on the blob type, we have to keep
+          both the old and new value for the field since this might be
           needed by the storage engine during updates.
 
           The reason why this needs special handling is that the virtual
-          generated blobs are neither stored in the record buffers nor
-          stored by the storage engine. This special handling for blobs
-          is normally taken care of in update_generated_write_fields()
+          generated blob-based fields are neither stored in the record buffers
+          nor stored by the storage engine. This special handling for blob-based
+          fields is normally taken care of in update_generated_write_fields()
           but this function is not called when applying updated records
           in replication.
         */
-        if (f->type() == MYSQL_TYPE_BLOB && f->is_virtual_gcol())
+        if ((f->flags & BLOB_FLAG) != 0 && f->is_virtual_gcol())
           (down_cast<Field_blob*>(f))->keep_old_value();
         pack_ptr= f->unpack(f->ptr, pack_ptr, metadata, TRUE);
 	DBUG_PRINT("debug", ("Unpacked; metadata: 0x%x;"
@@ -375,9 +382,9 @@ unpack_row(Relay_log_info const *rli,
           a old decimal data type which is unsupported datatype in
           RBR mode.
          */
-        DBUG_ASSERT(tabledef->type(i) == MYSQL_TYPE_DECIMAL ||
-                    tabledef->calc_field_size(i, (uchar *) old_pack_ptr) ==
-                    (uint32) (pack_ptr - old_pack_ptr));
+        assert(tabledef->type(i) == MYSQL_TYPE_DECIMAL ||
+               tabledef->calc_field_size(i, (uchar *) old_pack_ptr) ==
+               (uint32) (pack_ptr - old_pack_ptr));
       }
 
       /*
@@ -389,7 +396,7 @@ unpack_row(Relay_log_info const *rli,
       if (conv_field)
       {
         Copy_field copy;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         char source_buf[MAX_FIELD_WIDTH];
         char value_buf[MAX_FIELD_WIDTH];
         String source_type(source_buf, sizeof(source_buf), system_charset_info);
@@ -402,7 +409,7 @@ unpack_row(Relay_log_info const *rli,
 #endif
         copy.set(*field_ptr, f, TRUE);
         copy.invoke_do_copy(&copy);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         char target_buf[MAX_FIELD_WIDTH];
         String target_type(target_buf, sizeof(target_buf), system_charset_info);
         (*field_ptr)->sql_type(target_type);
@@ -415,7 +422,7 @@ unpack_row(Relay_log_info const *rli,
 
       null_mask <<= 1;
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     else
     {
       DBUG_PRINT("debug", ("Non-existent: skipped"));
@@ -424,6 +431,26 @@ unpack_row(Relay_log_info const *rli,
     i++;
   }
 
+  /*
+    Re-evaluating generated columns since their values must be
+    recalculated prior to change.
+  */
+  if (table->has_gcol())
+  {
+    for (Field **vfield_ptr= table->vfield; *vfield_ptr; ++vfield_ptr)
+    {
+      Field *vfield= *vfield_ptr;
+      if ((vfield->is_virtual_gcol() && vfield->m_indexed) ||
+          bitmap_is_overlapping(table->write_set,
+                                &vfield->gcol_info->base_columns_map))
+      {
+        if ((vfield->flags & BLOB_FLAG) != 0 && vfield->is_virtual_gcol())
+          (down_cast<Field_blob*>(vfield))->keep_old_value();
+        vfield->gcol_info->expr_item->save_in_field(vfield, 0);
+      }
+    }
+  }
+
   /*
     throw away master's extra fields
   */
@@ -434,11 +461,11 @@ unpack_row(Relay_log_info const *rli,
     {
       if ((null_mask & 0xFF) == 0)
       {
-        DBUG_ASSERT(null_ptr < row_data + master_null_byte_count);
+        assert(null_ptr < row_data + master_null_byte_count);
         null_mask= 1U;
         null_bits= *null_ptr++;
       }
-      DBUG_ASSERT(null_mask & 0xFF); // One of the 8 LSB should be set
+      assert(null_mask & 0xFF); // One of the 8 LSB should be set
 
       if (!((null_bits & null_mask) && tabledef->maybe_null(i))) {
         uint32 len= tabledef->calc_field_size(i, (uchar *) pack_ptr);
@@ -458,7 +485,7 @@ unpack_row(Relay_log_info const *rli,
     We should now have read all the null bytes, otherwise something is
     really wrong.
    */
-  DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
+  assert(null_ptr == row_data + master_null_byte_count);
 
   DBUG_DUMP("row_data", row_data, pack_ptr - row_data);
 
@@ -513,7 +540,7 @@ int prepare_record(TABLE *const table, const MY_BITMAP *cols, const bool check)
     Just to be sure that tmp_set is currently not in use as
     the read_set already.
   */
-  DBUG_ASSERT(table->write_set != &table->tmp_set);
+  assert(table->write_set != &table->tmp_set);
   /* set the temporary write_set */
   table->column_bitmaps_set_no_signal(table->read_set,
                                       &table->tmp_set);
diff --git a/sql/rpl_record.h b/sql/rpl_record.h
index 6277bfa34ba5..d58382becc23 100644
--- a/sql/rpl_record.h
+++ b/sql/rpl_record.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_record_old.cc b/sql/rpl_record_old.cc
index 21f5830d7f54..af3bb6f70cf4 100644
--- a/sql/rpl_record_old.cc
+++ b/sql/rpl_record_old.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -95,7 +102,7 @@ unpack_row_old(Relay_log_info *rli,
                uchar const **row_end, ulong *master_reclength,
                MY_BITMAP* const rw_set, Log_event_type const event_type)
 {
-  DBUG_ASSERT(record && row);
+  assert(record && row);
   my_ptrdiff_t const offset= record - table->record[0];
   size_t master_null_bytes= table->s->null_bytes;
 
@@ -120,7 +127,7 @@ unpack_row_old(Relay_log_info *rli,
       master_null_bytes= 1;
   }
 
-  DBUG_ASSERT(master_null_bytes <= table->s->null_bytes);
+  assert(master_null_bytes <= table->s->null_bytes);
   memcpy(record, row, master_null_bytes);            // [1]
   int error= 0;
 
@@ -140,7 +147,7 @@ unpack_row_old(Relay_log_info *rli,
       ptr= f->unpack(f->ptr, ptr);
       f->move_field_offset(-offset);
       /* Field...::unpack() cannot return 0 */
-      DBUG_ASSERT(ptr != NULL);
+      assert(ptr != NULL);
     }
     else
       bitmap_clear_bit(rw_set, field_ptr - begin_ptr);
diff --git a/sql/rpl_record_old.h b/sql/rpl_record_old.h
index 4837f00df209..9de8800a2db1 100644
--- a/sql/rpl_record_old.h
+++ b/sql/rpl_record_old.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_reporting.cc b/sql/rpl_reporting.cc
index c4764873b30f..f0c748d6d18c 100644
--- a/sql/rpl_reporting.cc
+++ b/sql/rpl_reporting.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -153,7 +160,7 @@ Slave_reporting_capability::va_report(loglevel level, int err_code,
     report_function= sql_print_information;
     break;
   default:
-    DBUG_ASSERT(0);                            // should not come here
+    assert(0);                            // should not come here
     return;          // don't crash production builds, just do nothing
   }
   curr_buff= pbuff;
diff --git a/sql/rpl_reporting.h b/sql/rpl_reporting.h
index d989ec4185e8..8c4873e89074 100644
--- a/sql/rpl_reporting.h
+++ b/sql/rpl_reporting.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index d2db5758b990..d30f8806b07d 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -18,6 +25,7 @@
 #include "my_dir.h"                // MY_STAT
 #include "log.h"                   // sql_print_error
 #include "log_event.h"             // Log_event
+#include "m_string.h"
 #include "rpl_group_replication.h" // set_group_replication_retrieved_certifi...
 #include "rpl_info_factory.h"      // Rpl_info_factory
 #include "rpl_mi.h"                // Master_info
@@ -29,6 +37,7 @@
 #include "debug_sync.h"
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
+#include "mutex_lock.h"            // Mutex_lock
 
 #include <algorithm>
 using std::min;
@@ -117,6 +126,8 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery
    sql_delay(0), sql_delay_end(0), m_flags(0), row_stmt_start_timestamp(0),
    long_find_row_note_printed(false),
    thd_tx_priority(0),
+   m_ignore_write_set_memory_limit(false),
+   m_allow_drop_write_set(false),
    is_engine_ha_data_detached(false)
 {
   DBUG_ENTER("Relay_log_info::Relay_log_info");
@@ -270,15 +281,18 @@ void Relay_log_info::reset_notified_relay_log_change()
 
     New seconds_behind_master timestamp is installed.
 
-   @param shift          number of bits to shift by Worker due to the
-                         current checkpoint change.
-   @param new_ts         new seconds_behind_master timestamp value
-                         unless zero. Zero could be due to FD event
-                         or fake rotate event.
-   @param need_data_lock False if caller has locked @c data_lock
+   @param shift            number of bits to shift by Worker due to the
+                           current checkpoint change.
+   @param new_ts           new seconds_behind_master timestamp value
+                           unless zero. Zero could be due to FD event
+                           or fake rotate event.
+   @param need_data_lock   False if caller has locked @c data_lock
+   @param update_timestamp if true, this function will update the
+                           rli->last_master_timestamp.
 */
 void Relay_log_info::reset_notified_checkpoint(ulong shift, time_t new_ts,
-                                               bool need_data_lock)
+                                               bool need_data_lock,
+                                               bool update_timestamp)
 {
   /*
     If this is not a parallel execution we return immediately.
@@ -318,13 +332,13 @@ void Relay_log_info::reset_notified_checkpoint(ulong shift, time_t new_ts,
     Then the new checkpoint sequence is updated by subtracting the number
     of consecutive jobs that were successfully processed.
   */
-  DBUG_ASSERT(current_mts_submode->get_type() != MTS_PARALLEL_TYPE_DB_NAME ||
-              !(shift == 0 && checkpoint_seqno != 0));
+  assert(current_mts_submode->get_type() != MTS_PARALLEL_TYPE_DB_NAME ||
+         !(shift == 0 && checkpoint_seqno != 0));
   checkpoint_seqno= checkpoint_seqno - shift;
   DBUG_PRINT("mts", ("reset_notified_checkpoint shift --> %lu, "
              "checkpoint_seqno --> %u.", shift, checkpoint_seqno));
 
-  if (new_ts)
+  if (update_timestamp)
   {
     if (need_data_lock)
       mysql_mutex_lock(&data_lock);
@@ -395,6 +409,7 @@ static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo)
 {
   MY_STAT s;
   DBUG_ENTER("add_relay_log");
+  mysql_mutex_assert_owner(&rli->log_space_lock);
   if (!mysql_file_stat(key_file_relaylog,
                        linfo->log_file_name, &s, MYF(0)))
   {
@@ -403,7 +418,7 @@ static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo)
     DBUG_RETURN(1);
   }
   rli->log_space_total += s.st_size;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[22];
   DBUG_PRINT("info",("log_space_total: %s", llstr(rli->log_space_total,buf)));
 #endif
@@ -414,6 +429,7 @@ int Relay_log_info::count_relay_log_space()
 {
   LOG_INFO flinfo;
   DBUG_ENTER("Relay_log_info::count_relay_log_space");
+  Mutex_lock lock(&log_space_lock);
   log_space_total= 0;
   if (relay_log.find_log_pos(&flinfo, NullS, 1))
   {
@@ -637,7 +653,7 @@ int Relay_log_info::init_relay_log_pos(const char* log,
       }
     }
     my_b_seek(cur_log,(off_t)pos);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     char llbuf1[22], llbuf2[22];
     DBUG_PRINT("info", ("my_b_tell(cur_log)=%s >event_relay_log_pos=%s",
@@ -688,7 +704,8 @@ void Relay_log_info::fill_coord_err_buf(loglevel level, int err_code,
   if(level == ERROR_LEVEL)
   {
     m_last_error.number = err_code;
-    strncpy(m_last_error.message, buff_coord, MAX_SLAVE_ERRMSG);
+    my_snprintf(m_last_error.message, sizeof(m_last_error.message), "%.*s",
+                MAX_SLAVE_ERRMSG - 1, buff_coord);
     m_last_error.update_timestamp();
   }
 
@@ -735,7 +752,7 @@ int Relay_log_info::wait_for_pos(THD* thd, String* log_name,
 
   DEBUG_SYNC(thd, "begin_master_pos_wait");
 
-  set_timespec_nsec(&abstime, (ulonglong)timeout * 1000000000ULL);
+  set_timespec_nsec(&abstime, static_cast<ulonglong>(timeout * 1000000000ULL));
   mysql_mutex_lock(&data_lock);
   thd->ENTER_COND(&data_cond, &data_lock,
                   &stage_waiting_for_the_slave_thread_to_advance_position,
@@ -877,13 +894,13 @@ int Relay_log_info::wait_for_pos(THD* thd, String* log_name,
     DBUG_PRINT("info",("Got signal of master update or timed out"));
     if (error == ETIMEDOUT || error == ETIME)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       /*
         Doing this to generate a stack trace and make debugging
         easier. 
       */
       if (DBUG_EVALUATE_IF("debug_crash_slave_time_out", 1, 0))
-        DBUG_ASSERT(0);
+        assert(0);
 #endif
       error= -1;
       break;
@@ -956,7 +973,7 @@ int Relay_log_info::wait_for_gtid_set(THD* thd, const Gtid_set* wait_gtid_set,
 
   DEBUG_SYNC(thd, "begin_wait_for_gtid_set");
 
-  set_timespec_nsec(&abstime, (ulonglong) timeout * 1000000000ULL);
+  set_timespec_nsec(&abstime, static_cast<ulonglong>(timeout * 1000000000ULL));
 
   mysql_mutex_lock(&data_lock);
   thd->ENTER_COND(&data_cond, &data_lock,
@@ -1043,13 +1060,13 @@ int Relay_log_info::wait_for_gtid_set(THD* thd, const Gtid_set* wait_gtid_set,
     DBUG_PRINT("info",("Got signal of master update or timed out"));
     if (error == ETIMEDOUT || error == ETIME)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       /*
         Doing this to generate a stack trace and make debugging
         easier. 
       */
       if (DBUG_EVALUATE_IF("debug_crash_slave_time_out", 1, 0))
-        DBUG_ASSERT(0);
+        assert(0);
 #endif
       error= -1;
       break;
@@ -1133,8 +1150,8 @@ int Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos,
     Broadcast to master_pos_wait() waiters should be done after
     the table is updated.
   */
-  DBUG_ASSERT(!is_parallel_exec() ||
-              mts_group_status != Relay_log_info::MTS_IN_GROUP);
+  assert(!is_parallel_exec() ||
+         mts_group_status != Relay_log_info::MTS_IN_GROUP);
   /*
     We do not force synchronization at this point, note the
     parameter false, because a non-transactional change is
@@ -1244,7 +1261,15 @@ int Relay_log_info::purge_relay_logs(THD *thd, bool just_reset,
   if (!inited)
   {
     DBUG_PRINT("info", ("inited == 0"));
-    if (error_on_rli_init_info)
+    if (error_on_rli_init_info ||
+        /*
+          mi->reset means that the channel was reset but still exists. Channel
+          shall have the index and the first relay log file.
+
+          Those files shall be remove in a following RESET SLAVE ALL (even when
+          channel was not inited again).
+        */
+        (mi->reset && delete_only))
     {
       ln_without_channel_name= relay_log.generate_name(opt_relay_logname,
                                                        "-relay-bin", buffer);
@@ -1293,8 +1318,8 @@ int Relay_log_info::purge_relay_logs(THD *thd, bool just_reset,
   }
   else
   {
-    DBUG_ASSERT(slave_running == 0);
-    DBUG_ASSERT(mi->slave_running == 0);
+    assert(slave_running == 0);
+    assert(mi->slave_running == 0);
   }
   /* Reset the transaction boundary parser and clear the last GTID queued */
   mi->transaction_parser.reset();
@@ -1316,13 +1341,6 @@ int Relay_log_info::purge_relay_logs(THD *thd, bool just_reset,
     cur_log_fd= -1;
   }
 
-  if (relay_log.reset_logs(thd, delete_only))
-  {
-    *errmsg = "Failed during log reset";
-    error=1;
-    goto err;
-  }
-
   /**
     Clear the retrieved gtid set for this channel.
     global_sid_lock->wrlock() is needed.
@@ -1331,6 +1349,13 @@ int Relay_log_info::purge_relay_logs(THD *thd, bool just_reset,
   (const_cast<Gtid_set *>(get_gtid_set()))->clear();
   global_sid_lock->unlock();
 
+  if (relay_log.reset_logs(thd, delete_only))
+  {
+    *errmsg = "Failed during log reset";
+    error=1;
+    goto err;
+  }
+
   /* Save name of used relay log file */
   set_group_relay_log_name(relay_log.get_log_fname());
   set_event_relay_log_name(relay_log.get_log_fname());
@@ -1350,7 +1375,7 @@ int Relay_log_info::purge_relay_logs(THD *thd, bool just_reset,
                     true/*need_lock_log=true*/,
                     true/*need_lock_index=true*/);
 err:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[22];
 #endif
   DBUG_PRINT("info",("log_space_total: %s",llstr(log_space_total,buf)));
@@ -1382,7 +1407,7 @@ Relay_log_info::add_channel_to_relay_log_name(char *buff, uint buff_size,
   uint base_name_len;
   uint suffix_buff_size;
 
-  DBUG_ASSERT(base_name !=NULL);
+  assert(base_name !=NULL);
 
   base_name_len= strlen(base_name);
   suffix_buff_size= buff_size - base_name_len;
@@ -1479,7 +1504,7 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev)
       log_pos= group_relay_log_pos;
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       char buf[32];
       DBUG_PRINT("info", ("group_master_log_name='%s', group_master_log_pos=%s",
@@ -1660,11 +1685,11 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev)
     break;
 
   case UNTIL_NONE:
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
 
-  DBUG_ASSERT(0);
+  assert(0);
   DBUG_RETURN(false);
 }
 
@@ -1697,9 +1722,9 @@ int Relay_log_info::stmt_done(my_off_t event_master_log_pos)
 
   clear_flag(IN_STMT);
 
-  DBUG_ASSERT(!belongs_to_client());
+  assert(!belongs_to_client());
   /* Worker does not execute binlog update position logics */
-  DBUG_ASSERT(!is_mts_worker(info_thd));
+  assert(!is_mts_worker(info_thd));
 
   /*
     Replication keeps event and group positions to specify the
@@ -1741,7 +1766,7 @@ int Relay_log_info::stmt_done(my_off_t event_master_log_pos)
     if (is_parallel_exec())
     {
 
-      DBUG_ASSERT(!is_mts_worker(info_thd));
+      assert(!is_mts_worker(info_thd));
 
       /*
         Format Description events only can drive MTS execution to this
@@ -1765,7 +1790,7 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
 {
   DBUG_ENTER("Relay_log_info::cleanup_context");
 
-  DBUG_ASSERT(info_thd == thd);
+  assert(info_thd == thd);
   /*
     1) Instances of Table_map_log_event, if ::do_apply_event() was called on them,
     may have opened tables, which we cannot be sure have been closed (because
@@ -1790,13 +1815,14 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
       called before deleting the rows_query event.
     */
     info_thd->reset_query();
+    info_thd->reset_query_for_display();
     delete rows_query_ev;
     rows_query_ev= NULL;
     DBUG_EXECUTE_IF("after_deleting_the_rows_query_ev",
                     {
                       const char action[]="now SIGNAL deleted_rows_query_ev WAIT_FOR go_ahead";
-                      DBUG_ASSERT(!debug_sync_set_action(info_thd,
-                                                       STRING_WITH_LEN(action)));
+                      assert(!debug_sync_set_action(info_thd,
+                                                    STRING_WITH_LEN(action)));
                     };);
   }
   m_table_map.clear_tables();
@@ -1811,12 +1837,15 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
     XID_STATE *xid_state= thd->get_transaction()->xid_state();
     if (!xid_state->has_state(XID_STATE::XA_NOTR))
     {
-      DBUG_ASSERT(DBUG_EVALUATE_IF("simulate_commit_failure",1,
-                                   xid_state->has_state(XID_STATE::XA_ACTIVE)));
+      assert(DBUG_EVALUATE_IF("simulate_commit_failure",1,
+                              xid_state->has_state(XID_STATE::XA_ACTIVE) ||
+                              xid_state->has_state(XID_STATE::XA_IDLE)
+                              ));
 
       xa_trans_force_rollback(thd);
       xid_state->reset();
       cleanup_trans_state(thd);
+      thd->rpl_unflag_detached_engine_ha_data();
     }
     thd->mdl_context.release_transactional_locks();
   }
@@ -1857,7 +1886,7 @@ void Relay_log_info::cleanup_context(THD *thd, bool error)
 void Relay_log_info::clear_tables_to_lock()
 {
   DBUG_ENTER("Relay_log_info::clear_tables_to_lock()");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     When replicating in RBR and MyISAM Merge tables are involved
     open_and_lock_tables (called in do_apply_event) appends the 
@@ -1870,7 +1899,7 @@ void Relay_log_info::clear_tables_to_lock()
    */
   uint i=0;
   for (TABLE_LIST *ptr= tables_to_lock ; ptr ; ptr= ptr->next_global, i++) ;
-  DBUG_ASSERT(i == tables_to_lock_count);
+  assert(i == tables_to_lock_count);
 #endif  
 
   while (tables_to_lock)
@@ -1896,7 +1925,7 @@ void Relay_log_info::clear_tables_to_lock()
     tables_to_lock_count--;
     my_free(to_free);
   }
-  DBUG_ASSERT(tables_to_lock == NULL && tables_to_lock_count == 0);
+  assert(tables_to_lock == NULL && tables_to_lock_count == 0);
   DBUG_VOID_RETURN;
 }
 
@@ -1956,7 +1985,7 @@ bool mysql_show_relaylog_events(THD* thd)
   bool res;
   DBUG_ENTER("mysql_show_relaylog_events");
 
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
+  assert(thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
 
   channel_map.wrlock();
 
@@ -2203,7 +2232,7 @@ a file name for --relay-log-index option.", opt_relaylog_index_name);
       sql_print_error("Failed in open_index_file() called from Relay_log_info::rli_init_info().");
       DBUG_RETURN(1);
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     global_sid_lock->wrlock();
     gtid_set.dbug_print("set of GTIDs in relay log before initialization");
     global_sid_lock->unlock();
@@ -2231,7 +2260,7 @@ a file name for --relay-log-index option.", opt_relaylog_index_name);
       DBUG_RETURN(1);
     }
     gtid_retrieved_initialized= true;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     global_sid_lock->wrlock();
     gtid_set.dbug_print("set of GTIDs in relay log after initialization");
     global_sid_lock->unlock();
@@ -2342,14 +2371,14 @@ a file name for --relay-log-index option.", opt_relaylog_index_name);
       goto err;
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       char llbuf1[22], llbuf2[22];
       DBUG_PRINT("info", ("my_b_tell(cur_log)=%s event_relay_log_pos=%s",
                           llstr(my_b_tell(cur_log),llbuf1),
                           llstr(event_relay_log_pos,llbuf2)));
-      DBUG_ASSERT(event_relay_log_pos >= BIN_LOG_HEADER_SIZE);
-      DBUG_ASSERT((my_b_tell(cur_log) == event_relay_log_pos));
+      assert(event_relay_log_pos >= BIN_LOG_HEADER_SIZE);
+      assert((my_b_tell(cur_log) == event_relay_log_pos));
     }
 #endif
   }
@@ -2410,7 +2439,7 @@ void Relay_log_info::end_info()
   relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT,
                   true/*need_lock_log=true*/,
                   true/*need_lock_index=true*/);
-  relay_log.harvest_bytes_written(&log_space_total);
+  relay_log.harvest_bytes_written(this, true/*need_log_space_lock=true*/);
   /*
     Delete the slave's temporary tables from memory.
     In the future there will be other actions than this, to ensure persistance
@@ -2554,7 +2583,7 @@ bool Relay_log_info::read_info(Rpl_info_handler *from)
     constructor (or passed to it), so that we are guaranteed that it
     exists at this point. /Sven
   */
-  //DBUG_ASSERT(!belongs_to_client());
+  //assert(!belongs_to_client());
 
   /*
     Starting from 5.1.x, relay-log.info has a new format. Now, its
@@ -2636,8 +2665,8 @@ bool Relay_log_info::read_info(Rpl_info_handler *from)
   sql_delay= (int32) temp_sql_delay;
   internal_id= (uint) temp_internal_id;
 
-  DBUG_ASSERT(lines < LINES_IN_RELAY_LOG_INFO_WITH_ID ||
-             (lines >= LINES_IN_RELAY_LOG_INFO_WITH_ID && internal_id == 1));
+  assert(lines < LINES_IN_RELAY_LOG_INFO_WITH_ID ||
+         (lines >= LINES_IN_RELAY_LOG_INFO_WITH_ID && internal_id == 1));
   DBUG_RETURN(FALSE);
 }
 
@@ -2660,7 +2689,7 @@ bool Relay_log_info::write_info(Rpl_info_handler *to)
     @todo Uncomment the following assertion. See todo in
     Relay_log_info::read_info() for details. /Sven
   */
-  //DBUG_ASSERT(!belongs_to_client());
+  //assert(!belongs_to_client());
 
   if (to->prepare_info_for_write() ||
       to->set_info((int) LINES_IN_RELAY_LOG_INFO_WITH_ID) ||
@@ -2699,7 +2728,7 @@ bool Relay_log_info::write_info(Rpl_info_handler *to)
 void Relay_log_info::set_rli_description_event(Format_description_log_event *fe)
 {
   DBUG_ENTER("Relay_log_info::set_rli_description_event");
-  DBUG_ASSERT(!info_thd || !is_mts_worker(info_thd) || !fe);
+  assert(!info_thd || !is_mts_worker(info_thd) || !fe);
 
   if (fe)
   {
@@ -2731,10 +2760,10 @@ void Relay_log_info::set_rli_description_event(Format_description_log_event *fe)
   if (rli_description_event &&
       rli_description_event->usage_counter.atomic_add(-1) == 1)
     delete rli_description_event;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   else
     /* It must be MTS mode when the usage counter greater than 1. */
-    DBUG_ASSERT(!rli_description_event || is_parallel_exec());
+    assert(!rli_description_event || is_parallel_exec());
 #endif
   rli_description_event= fe;
   if (rli_description_event)
@@ -2904,13 +2933,13 @@ ulong Relay_log_info::adapt_to_master_version_updown(ulong master_version,
     When the SQL thread or MTS Coordinator executes this method
     there's a constraint on current_version argument.
   */
-  DBUG_ASSERT(!thd ||
-              thd->rli_fake != NULL ||
-              thd->system_thread == SYSTEM_THREAD_SLAVE_WORKER ||
-              (thd->system_thread == SYSTEM_THREAD_SLAVE_SQL &&
-               (!rli_description_event ||
-                current_version ==
-                rli_description_event->get_product_version())));
+  assert(!thd ||
+         thd->rli_fake != NULL ||
+         thd->system_thread == SYSTEM_THREAD_SLAVE_WORKER ||
+         (thd->system_thread == SYSTEM_THREAD_SLAVE_SQL &&
+          (!rli_description_event ||
+           current_version ==
+           rli_description_event->get_product_version())));
 
   if (master_version == current_version)
     return 0;
@@ -2935,7 +2964,7 @@ ulong Relay_log_info::adapt_to_master_version_updown(ulong master_version,
     if ((downgrade ? current_version : master_version) < ver_f)
     {
       i_last= i;
-      DBUG_ASSERT(i_last >= i_first);
+      assert(i_last >= i_first);
       break;
     }
   }
@@ -2946,14 +2975,14 @@ ulong Relay_log_info::adapt_to_master_version_updown(ulong master_version,
   for (i= i_first; i < i_last; i++)
   {
     /* Run time check of the st_feature_version items ordering */
-    DBUG_ASSERT(!i ||
-                version_product(s_features[i - 1].version_split) <=
-                version_product(s_features[i].version_split));
+    assert(!i ||
+           version_product(s_features[i - 1].version_split) <=
+           version_product(s_features[i].version_split));
 
-    DBUG_ASSERT((downgrade ? master_version : current_version) <
-                version_product(s_features[i].version_split) &&
-                (downgrade ? current_version : master_version  >=
-                 version_product(s_features[i].version_split)));
+    assert((downgrade ? master_version : current_version) <
+           version_product(s_features[i].version_split) &&
+           (downgrade ? current_version : master_version  >=
+            version_product(s_features[i].version_split)));
 
     if (downgrade && s_features[i].downgrade)
     {
@@ -3022,3 +3051,14 @@ void Relay_log_info::detach_engine_ha_data(THD *thd)
   plugin_foreach(thd, detach_native_trx,
                  MYSQL_STORAGE_ENGINE_PLUGIN, NULL);
 }
+
+void Relay_log_info::reattach_engine_ha_data(THD *thd)
+{
+  is_engine_ha_data_detached = false;
+  /*
+    In case of slave thread applier or processing binlog by client,
+    reattach the engine ha_data ("native" engine transaction)
+    in favor of dynamically created.
+  */
+  plugin_foreach(thd, reattach_native_trx, MYSQL_STORAGE_ENGINE_PLUGIN, NULL);
+}
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 827d321c4714..826690ef842f 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -143,7 +150,7 @@ class Relay_log_info : public Rpl_info
   */
   inline bool belongs_to_client()
   {
-    DBUG_ASSERT(info_thd);
+    assert(info_thd);
     return !info_thd->slave_thread;
   }
 /* Instrumentation key for performance schema for mts_temp_table_LOCK */
@@ -298,7 +305,7 @@ class Relay_log_info : public Rpl_info
   void add_logged_gtid(rpl_sidno sidno, rpl_gno gno)
   {
     global_sid_lock->assert_some_lock();
-    DBUG_ASSERT(sidno <= global_sid_map->get_max_sidno());
+    assert(sidno <= global_sid_map->get_max_sidno());
     gtid_set.ensure_sidno(sidno);
     gtid_set._add_gtid(sidno, gno);
   }
@@ -528,7 +535,7 @@ class Relay_log_info : public Rpl_info
 
   bool get_table_data(TABLE *table_arg, table_def **tabledef_var, TABLE **conv_table_var) const
   {
-    DBUG_ASSERT(tabledef_var && conv_table_var);
+    assert(tabledef_var && conv_table_var);
     for (TABLE_LIST *ptr= tables_to_lock ; ptr != NULL ; ptr= ptr->next_global)
       if (ptr->table == table_arg)
       {
@@ -814,7 +821,7 @@ class Relay_log_info : public Rpl_info
   {
     bool ret= (slave_parallel_workers > 0) && !is_mts_recovery();
 
-    DBUG_ASSERT(!ret || !workers.empty());
+    assert(!ret || !workers.empty());
 
     return ret;
   }
@@ -841,7 +848,9 @@ class Relay_log_info : public Rpl_info
      Coordinator notifies Workers about this event. Coordinator and Workers
      maintain a bitmap of executed group that is reset with a new checkpoint. 
   */
-  void reset_notified_checkpoint(ulong, time_t, bool);
+  void reset_notified_checkpoint(ulong count, time_t new_ts,
+                                 bool need_data_lock,
+                                 bool update_timestamp= false);
 
   /**
      Called when gaps execution is ended so it is crash-safe
@@ -1291,6 +1300,18 @@ class Relay_log_info : public Rpl_info
   */
   int thd_tx_priority;
 
+  /**
+    If the SQL thread should or not ignore the set limit for
+    write set collection
+   */
+  bool m_ignore_write_set_memory_limit;
+
+  /**
+    Even if a component says all transactions require write sets,
+    this variable says the SQL thread transactions can drop them
+  */
+  bool m_allow_drop_write_set;
+
 public:
   /*
     The boolean is set to true when the binlog (rli_fake) or slave
@@ -1312,6 +1333,21 @@ class Relay_log_info : public Rpl_info
   {
     return thd_tx_priority;
   }
+
+  void set_ignore_write_set_memory_limit(bool ignore_limit) {
+    m_ignore_write_set_memory_limit = ignore_limit;
+  }
+
+  bool get_ignore_write_set_memory_limit() {
+    return m_ignore_write_set_memory_limit;
+  }
+
+  void set_allow_drop_write_set(bool does_not_require_ws) {
+    m_allow_drop_write_set = does_not_require_ws;
+  }
+
+  bool get_allow_drop_write_set() { return m_allow_drop_write_set; }
+
   /**
     Detaches the engine ha_data from THD. The fact
     is memorized in @c is_engine_ha_detached flag.
@@ -1319,6 +1355,13 @@ class Relay_log_info : public Rpl_info
     @param  thd a reference to THD
   */
   void detach_engine_ha_data(THD *thd);
+  /**
+    Reattaches the engine ha_data to THD. The fact
+    is memorized in @c is_engine_ha_detached flag.
+
+    @param  thd a reference to THD
+  */
+  void reattach_engine_ha_data(THD *thd);
   /**
     Drops the engine ha_data flag when it is up.
     The method is run at execution points of the engine ha_data
diff --git a/sql/rpl_rli_pdb.cc b/sql/rpl_rli_pdb.cc
index e6ee6115c5d6..55095ebe4c88 100644
--- a/sql/rpl_rli_pdb.cc
+++ b/sql/rpl_rli_pdb.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,11 +25,12 @@
 
 #include "log.h"                            // sql_print_error
 #include "rpl_slave_commit_order_manager.h" // Commit_order_manager
+#include "rpl_msr.h"                        // for channel_map
 
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ulong w_rr= 0;
   uint mts_debug_concurrent_access= 0;
 #endif
@@ -77,11 +85,11 @@ bool handle_slave_worker_stop(Slave_worker *worker,
 
     ++rli->exit_counter;
     worker->exit_incremented= true;
-    DBUG_ASSERT(!is_mts_worker(current_thd));
+    assert(!is_mts_worker(current_thd));
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   else
-    DBUG_ASSERT(is_mts_worker(current_thd));
+    assert(is_mts_worker(current_thd));
 #endif
 
   /*
@@ -231,7 +239,7 @@ Slave_worker::Slave_worker(Relay_log_info *rli
     In the future, it would be great if we use only one identifier.
     So when factoring out this code, please, consider this.
   */
-  DBUG_ASSERT(internal_id == id + 1);
+  assert(internal_id == id + 1);
   checkpoint_relay_log_name[0]= 0;
   checkpoint_master_log_name[0]= 0;
 
@@ -246,7 +254,7 @@ Slave_worker::~Slave_worker()
   end_info();
   if (jobs.inited_queue)
   {
-    DBUG_ASSERT(jobs.m_Q.size() == jobs.size);
+    assert(jobs.m_Q.size() == jobs.size);
     jobs.m_Q.clear();
   }
   mysql_mutex_destroy(&jobs_lock);
@@ -271,7 +279,7 @@ Slave_worker::~Slave_worker()
 int Slave_worker::init_worker(Relay_log_info * rli, ulong i)
 {
   DBUG_ENTER("Slave_worker::init_worker");
-  DBUG_ASSERT(!rli->info_thd->is_error());
+  assert(!rli->info_thd->is_error());
 
   Slave_job_item empty= Slave_job_item();
 
@@ -296,7 +304,7 @@ int Slave_worker::init_worker(Relay_log_info * rli, ulong i)
   end_group_sets_max_dbs= false;
   gaq_index= last_group_done_index= c_rli->gaq->size; // out of range
   last_groups_assigned_index=0;
-  DBUG_ASSERT(!jobs.inited_queue);
+  assert(!jobs.inited_queue);
   jobs.avail= 0;
   jobs.len= 0;
   jobs.overfill= FALSE;    //  todo: move into Slave_jobs_queue constructor
@@ -304,11 +312,11 @@ int Slave_worker::init_worker(Relay_log_info * rli, ulong i)
   jobs.entry= jobs.size= c_rli->mts_slave_worker_queue_len_max;
   jobs.inited_queue= true;
   curr_group_seen_begin= curr_group_seen_gtid= false;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   curr_group_seen_sequence_number= false;
 #endif
   jobs.m_Q.resize(jobs.size, empty);
-  DBUG_ASSERT(jobs.m_Q.size() == jobs.size);
+  assert(jobs.m_Q.size() == jobs.size);
 
   wq_overrun_cnt= excess_cnt= 0;
   underrun_level= (ulong) ((rli->mts_worker_underrun_level * jobs.size) / 100.0);
@@ -322,8 +330,8 @@ int Slave_worker::init_worker(Relay_log_info * rli, ulong i)
        (Mts_submode*) new Mts_submode_logical_clock();
 
   //workers and coordinator must be of the same type
-  DBUG_ASSERT(rli->current_mts_submode->get_type() ==
-              current_mts_submode->get_type());
+  assert(rli->current_mts_submode->get_type() ==
+         current_mts_submode->get_type());
 
   m_order_commit_deadlock= false;
   DBUG_RETURN(0);
@@ -494,7 +502,7 @@ bool Slave_worker::read_info(Rpl_info_handler *from)
       from->get_info(channel, sizeof(channel),(char*)""))
     DBUG_RETURN(TRUE);
 
-  DBUG_ASSERT(nbytes <= no_bytes_in_map(&group_executed));
+  assert(nbytes <= no_bytes_in_map(&group_executed));
 
   internal_id=(uint) temp_internal_id;
   group_relay_log_pos=  temp_group_relay_log_pos;
@@ -542,7 +550,7 @@ bool Slave_worker::write_info(Rpl_info_handler *to)
 
   ulong nbytes= (ulong) no_bytes_in_map(&group_executed);
   uchar *buffer= (uchar*) group_executed.bitmap;
-  DBUG_ASSERT(nbytes <= (c_rli->checkpoint_group + 7) / 8);
+  assert(nbytes <= (c_rli->checkpoint_group + 7) / 8);
 
   if (to->prepare_info_for_write() ||
       to->set_info((int) internal_id) ||
@@ -642,13 +650,13 @@ bool Slave_worker::commit_positions(Log_event *ev, Slave_job_group* ptr_g, bool
   */
   if (ptr_g->group_relay_log_name)
   {
-    DBUG_ASSERT(strlen(ptr_g->group_relay_log_name) + 1
-                <= sizeof(group_relay_log_name));
+    assert(strlen(ptr_g->group_relay_log_name) + 1
+           <= sizeof(group_relay_log_name));
     strmake(group_relay_log_name, ptr_g->group_relay_log_name,
             sizeof(group_relay_log_name) - 1);
   }
 
-  DBUG_ASSERT(ptr_g->checkpoint_seqno <= (c_rli->checkpoint_group - 1));
+  assert(ptr_g->checkpoint_seqno <= (c_rli->checkpoint_group - 1));
 
   bitmap_set_bit(&group_executed, ptr_g->checkpoint_seqno);
   checkpoint_seqno= ptr_g->checkpoint_seqno;
@@ -707,14 +715,14 @@ static void free_entry(db_worker_hash_entry *entry)
 
   DBUG_PRINT("info", ("free_entry %s, %zu", entry->db, strlen(entry->db)));
 
-  DBUG_ASSERT(c_thd->system_thread == SYSTEM_THREAD_SLAVE_SQL);
+  assert(c_thd->system_thread == SYSTEM_THREAD_SLAVE_SQL);
 
   /*
     Although assert is correct valgrind senses entry->worker can be freed.
 
-    DBUG_ASSERT(entry->usage == 0 ||
-                !entry->worker    ||  // last entry owner could have errored out
-                entry->worker->running_status != Slave_worker::RUNNING);
+    assert(entry->usage == 0 ||
+    !entry->worker    ||  // last entry owner could have errored out
+    entry->worker->running_status != Slave_worker::RUNNING);
   */
 
   mts_move_temp_tables_to_thd(c_thd, entry->temporary_tables);
@@ -785,7 +793,7 @@ TABLE* mts_move_temp_table_to_entry(TABLE *table, THD *thd,
   else
   {
     /* removing the first item from the list */
-    DBUG_ASSERT(table == thd->temporary_tables);
+    assert(table == thd->temporary_tables);
 
     thd->temporary_tables= table->next;
     if (thd->temporary_tables)
@@ -821,7 +829,7 @@ TABLE* mts_move_temp_tables_to_thd(THD *thd, TABLE *temporary_tables)
     DBUG_RETURN(NULL);
 
   // accept only if this is the start of the list.
-  DBUG_ASSERT(!table->prev);
+  assert(!table->prev);
 
   // walk along the source list and associate the tables with thd
   do
@@ -928,9 +936,9 @@ Slave_worker *map_db_to_worker(const char *dbname, Relay_log_info *rli,
 
   DBUG_ENTER("map_db_to_worker");
 
-  DBUG_ASSERT(!rli->last_assigned_worker ||
-              rli->last_assigned_worker == last_worker);
-  DBUG_ASSERT(is_mts_db_partitioned(rli));
+  assert(!rli->last_assigned_worker ||
+         rli->last_assigned_worker == last_worker);
+  assert(is_mts_db_partitioned(rli));
 
   if (!rli->inited_hash_workers)
     DBUG_RETURN(NULL);
@@ -1023,8 +1031,8 @@ Slave_worker *map_db_to_worker(const char *dbname, Relay_log_info *rli,
       */
       for (uint i= 0; i < rli->mapping_db_to_worker.records; i++)
       {
-        DBUG_ASSERT(!entry->temporary_tables || !entry->temporary_tables->prev);
-        DBUG_ASSERT(!thd->temporary_tables || !thd->temporary_tables->prev);
+        assert(!entry->temporary_tables || !entry->temporary_tables->prev);
+        assert(!thd->temporary_tables || !thd->temporary_tables->prev);
 
         db_worker_hash_entry *entry=
           (db_worker_hash_entry*) my_hash_element(&rli->mapping_db_to_worker, i);
@@ -1071,7 +1079,7 @@ Slave_worker *map_db_to_worker(const char *dbname, Relay_log_info *rli,
     else if (entry->worker == last_worker || !last_worker)
     {
 
-      DBUG_ASSERT(entry->worker);
+      assert(entry->worker);
 
       entry->usage++;
     }
@@ -1082,8 +1090,8 @@ Slave_worker *map_db_to_worker(const char *dbname, Relay_log_info *rli,
       // the hashing conflict and is handled as the following:
       PSI_stage_info old_stage;
 
-      DBUG_ASSERT(last_worker != NULL &&
-                  rli->curr_group_assigned_parts.size() > 0);
+      assert(last_worker != NULL &&
+             rli->curr_group_assigned_parts.size() > 0);
 
       // future assignenment and marking at the same time
       entry->worker= last_worker;
@@ -1127,21 +1135,21 @@ Slave_worker *map_db_to_worker(const char *dbname, Relay_log_info *rli,
         thd->temporary_tables= NULL;
       }
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     else
     {
       // all entries must have been emptied from temps by the caller
 
       for (TABLE *table= thd->temporary_tables; table; table= table->next)
       {
-        DBUG_ASSERT(0 != strcmp(table->s->db.str, entry->db));
+        assert(0 != strcmp(table->s->db.str, entry->db));
       }
     }
 #endif
   }
   mysql_mutex_unlock(&rli->slave_worker_hash_lock);
 
-  DBUG_ASSERT(entry);
+  assert(entry);
 
 err:
   if (entry)
@@ -1188,7 +1196,7 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
   {
     ptr_g= c_rli->gaq->get_job_group(gaq_index);
 
-    DBUG_ASSERT(gaq_index == ev->mts_group_idx);
+    assert(gaq_index == ev->mts_group_idx);
     /*
       It guarantees that the worker is removed from order commit queue when
       its transaction doesn't binlog anything. It will break innodb group commit,
@@ -1198,9 +1206,9 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
       get_commit_order_manager()->report_commit(this);
 
     // first ever group must have relay log name
-    DBUG_ASSERT(last_group_done_index != c_rli->gaq->size ||
-                ptr_g->group_relay_log_name != NULL);
-    DBUG_ASSERT(ptr_g->worker_id == id);
+    assert(last_group_done_index != c_rli->gaq->size ||
+           ptr_g->group_relay_log_name != NULL);
+    assert(ptr_g->worker_id == id);
 
     if (ev->get_type_code() != binary_log::XID_EVENT)
     {
@@ -1252,11 +1260,11 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
 
     mysql_mutex_lock(&c_rli->slave_worker_hash_lock);
 
-    DBUG_ASSERT(entry);
+    assert(entry);
 
     entry->usage --;
 
-    DBUG_ASSERT(entry->usage >= 0);
+    assert(entry->usage >= 0);
 
     if (entry->usage == 0)
     {
@@ -1266,15 +1274,15 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
         with the entry at least until time Coordinator will deallocate it
         from the hash, that is either due to stop or extra size of the hash.
       */
-      DBUG_ASSERT(usage_partition >= 0);
-      DBUG_ASSERT(this->info_thd->temporary_tables == 0);
-      DBUG_ASSERT(!entry->temporary_tables ||
-                  !entry->temporary_tables->prev);
+      assert(usage_partition >= 0);
+      assert(this->info_thd->temporary_tables == 0);
+      assert(!entry->temporary_tables ||
+             !entry->temporary_tables->prev);
 
       if (entry->worker != this) // Coordinator is waiting
       {
-#ifndef DBUG_OFF
-        // TODO: open it! DBUG_ASSERT(usage_partition || !entry->worker->jobs.len);
+#ifndef NDEBUG
+        // TODO: open it! assert(usage_partition || !entry->worker->jobs.len);
 #endif
         DBUG_PRINT("info",
                    ("Notifying entry %p release by worker %lu", entry, this->id));
@@ -1283,7 +1291,7 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
       }
     }
     else
-      DBUG_ASSERT(usage_partition != 0);
+      assert(usage_partition != 0);
 
     mysql_mutex_unlock(&c_rli->slave_worker_hash_lock);
   }
@@ -1301,8 +1309,8 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
   }
   else // not DB-type scheduler
   {
-    DBUG_ASSERT(current_mts_submode->get_type() ==
-                MTS_PARALLEL_TYPE_LOGICAL_CLOCK);
+    assert(current_mts_submode->get_type() ==
+           MTS_PARALLEL_TYPE_LOGICAL_CLOCK);
     /*
       Check if there're any waiter. If there're try incrementing lwm and
       signal to those who've got sasfied with the waiting condition.
@@ -1320,8 +1328,8 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
     DBUG_EXECUTE_IF("slave_worker_ends_group_before_signal_lwm",
                     {
                       const char act[]= "now WAIT_FOR worker_continue";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     });
 
     if (unlikely(error))
@@ -1355,7 +1363,7 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
       mysql_mutex_unlock(&c_rli->mts_gaq_LOCK);
     }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     curr_group_seen_sequence_number= false;
 #endif
   }
@@ -1379,8 +1387,8 @@ void Slave_worker::slave_worker_ends_group(Log_event* ev, int error)
 template <typename Element_type>
 bool circular_buffer_queue<Element_type>::gt(ulong i, ulong k)
 {
-  DBUG_ASSERT(i < size && k < size);
-  DBUG_ASSERT(avail != entry);
+  assert(i < size && k < size);
+  assert(avail != entry);
 
   if (i >= entry)
     if (k >= entry)
@@ -1394,7 +1402,7 @@ bool circular_buffer_queue<Element_type>::gt(ulong i, ulong k)
       return i > k;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 bool Slave_committed_queue::count_done(Relay_log_info* rli)
 {
   ulong i, k, cnt= 0;
@@ -1409,7 +1417,7 @@ bool Slave_committed_queue::count_done(Relay_log_info* rli)
       cnt++;
   }
 
-  DBUG_ASSERT(cnt <= size);
+  assert(cnt <= size);
 
   DBUG_PRINT("mts", ("Checking if it can simulate a crash:"
              " mts_checkpoint_group %u counter %lu parallel slaves %lu\n",
@@ -1452,7 +1460,7 @@ ulong Slave_committed_queue::move_queue_head(Slave_worker_array *ws)
     Slave_job_group *ptr_g;
     char grl_name[FN_REFLEN];
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0) &&
         cnt == opt_mts_checkpoint_period)
       DBUG_RETURN(cnt);
@@ -1491,7 +1499,7 @@ ulong Slave_committed_queue::move_queue_head(Slave_worker_array *ws)
       Removes the job from the (G)lobal (A)ssigned (Q)ueue.
     */
     Slave_job_group g= Slave_job_group();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     ulong ind=
 #endif
       de_queue(&g);
@@ -1508,17 +1516,17 @@ ulong Slave_committed_queue::move_queue_head(Slave_worker_array *ws)
     g.group_relay_log_name= lwm.group_relay_log_name;
     lwm= g;
 
-    DBUG_ASSERT(ind == i);
-    DBUG_ASSERT(!ptr_g->group_relay_log_name);
-    DBUG_ASSERT(ptr_g->total_seqno == lwm.total_seqno);
-#ifndef DBUG_OFF
+    assert(ind == i);
+    assert(!ptr_g->group_relay_log_name);
+    assert(ptr_g->total_seqno == lwm.total_seqno);
+#ifndef NDEBUG
     {
       ulonglong l= last_done[w_i->id];
       /*
         There must be some progress otherwise we should have
         exit the loop earlier.
       */
-      DBUG_ASSERT(l < ptr_g->total_seqno);
+      assert(l < ptr_g->total_seqno);
     }
 #endif
     /*
@@ -1528,7 +1536,7 @@ ulong Slave_committed_queue::move_queue_head(Slave_worker_array *ws)
     last_done[w_i->id]= ptr_g->total_seqno;
   }
 
-  DBUG_ASSERT(cnt <= size);
+  assert(cnt <= size);
 
   DBUG_RETURN(cnt);
 }
@@ -1557,7 +1565,7 @@ ulong Slave_committed_queue::find_lwm(Slave_job_group** arg_g,
   Slave_job_group *ptr_g= NULL;
   ulong i, k, cnt;
 
-  DBUG_ASSERT(start_index <= size);
+  assert(start_index <= size);
 
   if (empty())
     return size;
@@ -1617,8 +1625,8 @@ void Slave_committed_queue::free_dynamic_items()
       my_free(ptr_g->group_master_log_name);
     }
   }
-  DBUG_ASSERT((avail == size /* full */ || entry == size /* empty */) ||
-              i == avail /* all occupied are processed */);
+  assert((avail == size /* full */ || entry == size /* empty */) ||
+         i == avail /* all occupied are processed */);
 }
 
 
@@ -1629,6 +1637,8 @@ void Slave_worker::do_report(loglevel level, int err_code, const char *msg,
   char buff_gtid[Gtid::MAX_TEXT_LENGTH + 1];
   const char* log_name= const_cast<Slave_worker*>(this)->get_master_log_name();
   ulonglong log_pos= const_cast<Slave_worker*>(this)->get_master_log_pos();
+  bool is_group_replication_applier_channel=
+    channel_map.is_group_replication_channel_name(c_rli->get_channel(), true);
   const Gtid_specification *gtid_next= &info_thd->variables.gtid_next;
   THD *thd= info_thd;
 
@@ -1638,17 +1648,31 @@ void Slave_worker::do_report(loglevel level, int err_code, const char *msg,
       thd->get_transaction()->cannot_safely_rollback(Transaction_ctx::SESSION)))
   {
     char coordinator_errmsg[MAX_SLAVE_ERRMSG];
-
-    my_snprintf(coordinator_errmsg, MAX_SLAVE_ERRMSG,
-                "Coordinator stopped because there were error(s) in the "
-                "worker(s). "
-                "The most recent failure being: Worker %u failed executing "
-                "transaction '%s' at master log %s, end_log_pos %llu. "
-                "See error log and/or "
-                "performance_schema.replication_applier_status_by_worker "
-                "table for "
-                "more details about this failure or others, if any.",
-                internal_id, buff_gtid, log_name, log_pos);
+    if (is_group_replication_applier_channel)
+    {
+      my_snprintf(coordinator_errmsg, MAX_SLAVE_ERRMSG,
+                  "Coordinator stopped because there were error(s) in the "
+                  "worker(s). "
+                  "The most recent failure being: Worker %u failed executing "
+                  "transaction '%s'. See error log and/or "
+                  "performance_schema.replication_applier_status_by_worker "
+                  "table for "
+                  "more details about this failure or others, if any.",
+                  internal_id, buff_gtid);
+    }
+    else
+    {
+      my_snprintf(coordinator_errmsg, MAX_SLAVE_ERRMSG,
+                  "Coordinator stopped because there were error(s) in the "
+                  "worker(s). "
+                  "The most recent failure being: Worker %u failed executing "
+                  "transaction '%s' at master log %s, end_log_pos %llu. "
+                  "See error log and/or "
+                  "performance_schema.replication_applier_status_by_worker "
+                  "table for "
+                  "more details about this failure or others, if any.",
+                  internal_id, buff_gtid, log_name, log_pos);
+    }
 
     /*
       We want to update the errors in coordinator as well as worker.
@@ -1661,10 +1685,19 @@ void Slave_worker::do_report(loglevel level, int err_code, const char *msg,
     c_rli->fill_coord_err_buf(level, err_code, coordinator_errmsg);
   }
 
-  my_snprintf(buff_coord, sizeof(buff_coord),
-              "Worker %u failed executing transaction '%s' at "
-              "master log %s, end_log_pos %llu",
-              internal_id, buff_gtid, log_name, log_pos);
+  if (is_group_replication_applier_channel)
+  {
+    my_snprintf(buff_coord, sizeof(buff_coord),
+                "Worker %u failed executing transaction '%s'",
+                internal_id, buff_gtid);
+  }
+  else
+  {
+    my_snprintf(buff_coord, sizeof(buff_coord),
+                "Worker %u failed executing transaction '%s' at "
+                "master log %s, end_log_pos %llu",
+                internal_id, buff_gtid, log_name, log_pos);
+  }
 
   /*
     Error reporting by the worker. The worker updates its error fields as well
@@ -1673,7 +1706,7 @@ void Slave_worker::do_report(loglevel level, int err_code, const char *msg,
   this->va_report(level, err_code, buff_coord, msg, args);
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static bool may_have_timestamp(Log_event *ev)
 {
   bool res= false;
@@ -1758,7 +1791,7 @@ int Slave_worker::slave_worker_exec_event(Log_event *ev)
   ev->thd= thd; // todo: assert because up to this point, ev->thd == 0
   ev->worker= this;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (!is_mts_db_partitioned(rli) && may_have_timestamp(ev) &&
       !curr_group_seen_sequence_number)
   {
@@ -1776,19 +1809,19 @@ int Slave_worker::slave_worker_exec_event(Log_event *ev)
       must have been satisfied by Coordinator.
       The first scheduled transaction does not have to wait for anybody.
     */
-    DBUG_ASSERT(rli->gaq->entry == ev->mts_group_idx ||
-                Mts_submode_logical_clock::clock_leq(last_committed,
-                                                     lwm_estimate));
-    DBUG_ASSERT(lwm_estimate != SEQ_UNINIT || rli->gaq->entry == ev->mts_group_idx);
+    assert(rli->gaq->entry == ev->mts_group_idx ||
+           Mts_submode_logical_clock::clock_leq(last_committed,
+                                                lwm_estimate));
+    assert(lwm_estimate != SEQ_UNINIT || rli->gaq->entry == ev->mts_group_idx);
     /*
       The current transaction's timestamp can't be less that lwm.
     */
-    DBUG_ASSERT(sequence_number == SEQ_UNINIT ||
-                !Mts_submode_logical_clock::
-                clock_leq(sequence_number,
-                          static_cast<Mts_submode_logical_clock*>
-                          (rli->current_mts_submode)->
-                          estimate_lwm_timestamp()));
+    assert(sequence_number == SEQ_UNINIT ||
+           !Mts_submode_logical_clock::
+           clock_leq(sequence_number,
+                     static_cast<Mts_submode_logical_clock*>
+                     (rli->current_mts_submode)->
+                     estimate_lwm_timestamp()));
   }
 #endif
 
@@ -1802,7 +1835,7 @@ int Slave_worker::slave_worker_exec_event(Log_event *ev)
       if (num_dbs == OVER_MAX_DBS_IN_EVENT_MTS)
         num_dbs= 1;
 
-      DBUG_ASSERT(num_dbs > 0);
+      assert(num_dbs > 0);
 
       for (uint k= 0; k < num_dbs; k++)
       {
@@ -1817,7 +1850,7 @@ int Slave_worker::slave_worker_exec_event(Log_event *ev)
         {
           /*
             notice, can't assert
-            DBUG_ASSERT(ev->mts_assigned_partitions[k]->worker == worker);
+            assert(ev->mts_assigned_partitions[k]->worker == worker);
             since entry could be marked as wanted by other worker.
           */
           curr_group_exec_parts.push_back(ev->mts_assigned_partitions[k]);
@@ -1867,6 +1900,17 @@ bool Slave_worker::worker_sleep(ulong seconds)
   return ret;
 }
 
+void Slave_worker::prepare_for_retry(Log_event &event) {
+  if (event.get_type_code() ==
+      binary_log::ROWS_QUERY_LOG_EVENT)  // If a `Rows_query_log_event`, let the
+                                         // event be disposed in the main worker
+                                         // loop.
+  {
+    event.worker= this;
+    this->rows_query_ev= NULL;
+  }
+}
+
 /**
   It is called after an error happens. It checks if that is an temporary
   error and if the situation is allow to retry the transaction. Then it will
@@ -1890,6 +1934,7 @@ bool Slave_worker::retry_transaction(uint start_relay_number,
 {
   THD *thd= info_thd;
   bool silent= false;
+  Slave_worker::Retry_context_sentry cleaned_up(*this);
 
   DBUG_ENTER("Slave_worker::retry_transaction");
 
@@ -1900,12 +1945,47 @@ bool Slave_worker::retry_transaction(uint start_relay_number,
   {
     /* Simulate a lock deadlock error */
     uint error= 0;
+    cleaned_up= false;
 
     if (found_order_commit_deadlock())
-      error= ER_LOCK_DEADLOCK;
+    {
+      /*
+        This transaction was allowed to be executed in parallel with other that
+        happened earlier according to binary log order. It was asked to be
+        rolled back by the other transaction as it was holding a lock that is
+        needed by the other transaction to progress, according to binary log
+        order this configure a deadlock.
+
+        At this point, this transaction *should* have no non-temporary errors.
 
-    if (!has_temporary_error(thd, error, &silent) ||
-        thd->get_transaction()->cannot_safely_rollback(Transaction_ctx::SESSION))
+        Having a non-temporary error may be a sign of:
+
+        a) Slave has diverged from the master;
+        b) There is an issue in the logical clock allowing a transaction to be
+           applied in parallel with its dependencies (the two transactions are
+           trying to change the same record in parallel).
+
+        For (a), a retry of this transaction will produce the same error. For
+        (b), this transaction might succeed upon retry, allowing the slave to
+        progress without manual intervention, but it is a sign of problems in LC
+        generation at the master.
+
+        So, we will make the worker to retry this transaction only if there is
+        no error or the error is a temporary error.
+      */
+      Diagnostics_area *da= thd->get_stmt_da();
+      if (!da->is_error() ||
+          has_temporary_error(thd, da->is_error() ? da->mysql_errno() : error,
+                              &silent))
+      {
+        error= ER_LOCK_DEADLOCK;
+      }
+    }
+
+    if ((!has_temporary_error(thd, error, &silent) ||
+         thd->get_transaction()->cannot_safely_rollback(
+             Transaction_ctx::SESSION)) &&
+        DBUG_EVALUATE_IF("error_on_rows_query_event_apply", false, true))
       DBUG_RETURN(true);
 
     if (trans_retries >= slave_trans_retries)
@@ -1918,6 +1998,16 @@ bool Slave_worker::retry_transaction(uint start_relay_number,
       DBUG_RETURN(true);
     }
 
+    DBUG_EXECUTE_IF("error_on_rows_query_event_apply", {
+      if (c_rli->retried_trans == 2)
+      {
+        DBUG_SET("-d,error_on_rows_query_event_apply");
+        std::string act("now SIGNAL end_retries_on_rows_query_event_apply");
+        assert(!debug_sync_set_action(thd, act.data(), act.length()));
+      }
+      silent= true;
+    };);
+
     if (!silent)
       trans_retries++;
 
@@ -1925,8 +2015,7 @@ bool Slave_worker::retry_transaction(uint start_relay_number,
     c_rli->retried_trans++;
     mysql_mutex_unlock(&c_rli->data_lock);
 
-    cleanup_context(thd, 1);
-    reset_order_commit_deadlock();
+    cleaned_up.clean();
     worker_sleep(min<ulong>(trans_retries, MAX_SLAVE_RETRY_PAUSE));
 
   } while (read_and_apply_events(start_relay_number, start_relay_pos,
@@ -2111,7 +2200,7 @@ static int en_queue(Slave_jobs_queue *jobs, Slave_job_item *item)
 {
   if (jobs->avail == jobs->size)
   {
-    DBUG_ASSERT(jobs->avail == jobs->m_Q.size());
+    assert(jobs->avail == jobs->m_Q.size());
     return -1;
   }
 
@@ -2129,12 +2218,34 @@ static int en_queue(Slave_jobs_queue *jobs, Slave_job_item *item)
   // post-boundary cond
   if (jobs->avail == jobs->entry)
     jobs->avail= jobs->size;
-  DBUG_ASSERT(jobs->avail == jobs->entry ||
-              jobs->len == (jobs->avail >= jobs->entry) ?
-              (jobs->avail - jobs->entry) : (jobs->size + jobs->avail - jobs->entry));
+  assert(jobs->avail == jobs->entry ||
+         jobs->len == (jobs->avail >= jobs->entry) ?
+         (jobs->avail - jobs->entry) : (jobs->size + jobs->avail - jobs->entry));
   return jobs->avail;
 }
 
+Slave_worker::Retry_context_sentry::Retry_context_sentry(Slave_worker &parent)
+    : m_parent(parent), m_is_cleaned_up(false) {}
+
+Slave_worker::Retry_context_sentry::~Retry_context_sentry() {
+  this->clean();
+}
+
+Slave_worker::Retry_context_sentry &Slave_worker::Retry_context_sentry::operator=(
+    bool is_cleaned_up)
+{
+  this->m_is_cleaned_up = is_cleaned_up;
+  return (*this);
+}
+
+void Slave_worker::Retry_context_sentry::clean() {
+  if (!this->m_is_cleaned_up) {
+    this->m_parent.cleanup_context(this->m_parent.info_thd, 1);
+    this->m_parent.reset_order_commit_deadlock();
+    this->m_is_cleaned_up = true;
+  }
+}
+
 /**
    return the value of @c data member of the head of the queue.
 */
@@ -2142,13 +2253,13 @@ void * head_queue(Slave_jobs_queue *jobs, Slave_job_item *ret)
 {
   if (jobs->entry == jobs->size)
   {
-    DBUG_ASSERT(jobs->len == 0);
+    assert(jobs->len == 0);
     ret->data= NULL;               // todo: move to caller
     return NULL;
   }
   *ret= jobs->m_Q[jobs->entry];
 
-  DBUG_ASSERT(ret->data);         // todo: move to caller
+  assert(ret->data);         // todo: move to caller
 
   return ret;
 }
@@ -2161,7 +2272,7 @@ Slave_job_item * de_queue(Slave_jobs_queue *jobs, Slave_job_item *ret)
 {
   if (jobs->entry == jobs->size)
   {
-    DBUG_ASSERT(jobs->len == 0);
+    assert(jobs->len == 0);
     return NULL;
   }
   *ret= jobs->m_Q[jobs->entry];
@@ -2176,10 +2287,10 @@ Slave_job_item * de_queue(Slave_jobs_queue *jobs, Slave_job_item *ret)
   if (jobs->avail == jobs->entry)
     jobs->entry= jobs->size;
 
-  DBUG_ASSERT(jobs->entry == jobs->size ||
-              (jobs->len == (jobs->avail >= jobs->entry) ?
-               (jobs->avail - jobs->entry) :
-               (jobs->size + jobs->avail - jobs->entry)));
+  assert(jobs->entry == jobs->size ||
+         (jobs->len == (jobs->avail >= jobs->entry) ?
+          (jobs->avail - jobs->entry) :
+          (jobs->size + jobs->avail - jobs->entry)));
 
   return ret;
 }
@@ -2204,7 +2315,7 @@ bool append_item_to_jobs(slave_job_item *job_item,
   ulonglong new_pend_size;
   PSI_stage_info old_stage;
 
-  DBUG_ASSERT(thd == current_thd);
+  assert(thd == current_thd);
 
   mysql_mutex_lock(&rli->pending_jobs_lock);
   new_pend_size= rli->mts_pending_jobs_size + ev_size;
@@ -2350,7 +2461,7 @@ static void remove_item_from_jobs(slave_job_item *job_item,
 
   rli->pending_jobs--;
   rli->mts_pending_jobs_size-= ev->common_header->data_written;
-  DBUG_ASSERT(rli->mts_pending_jobs_size < rli->mts_pending_jobs_size_max);
+  assert(rli->mts_pending_jobs_size < rli->mts_pending_jobs_size_max);
 
   /*
     The positive branch is underrun: number of pending assignments
@@ -2389,8 +2500,8 @@ static void remove_item_from_jobs(slave_job_item *job_item,
     rli->mts_wq_overrun_cnt++;  // statistics
 
     // guarding correctness of incrementing in case of the only one Worker
-    DBUG_ASSERT(rli->workers.size() != 1 ||
-                rli->mts_wq_excess_cnt == worker->wq_overrun_cnt);
+    assert(rli->workers.size() != 1 ||
+           rli->mts_wq_excess_cnt == worker->wq_overrun_cnt);
   }
   else if (worker->excess_cnt > 0)
   {
@@ -2400,8 +2511,8 @@ static void remove_item_from_jobs(slave_job_item *job_item,
     worker->excess_cnt= 0;
     worker->wq_overrun_cnt= 0; // and the local is reset
 
-    DBUG_ASSERT(rli->mts_wq_excess_cnt >= 0);
-    DBUG_ASSERT(rli->mts_wq_excess_cnt == 0 || rli->workers.size() > 1);
+    assert(rli->mts_wq_excess_cnt >= 0);
+    assert(rli->mts_wq_excess_cnt == 0 || rli->workers.size() > 1);
 
   }
 
@@ -2563,14 +2674,14 @@ int slave_worker_exec_job_group(Slave_worker *worker, Relay_log_info *rli)
 
     if (unlikely(thd->killed || worker->running_status == Slave_worker::STOP_ACCEPTED))
     {
-      DBUG_ASSERT(worker->running_status != Slave_worker::ERROR_LEAVING);
+      assert(worker->running_status != Slave_worker::ERROR_LEAVING);
       // de-queueing and decrement counters is in the caller's exit branch
       error= -1;
       goto err;
     }
 
     ev= job_item->data;
-    DBUG_ASSERT(ev != NULL);
+    assert(ev != NULL);
     DBUG_PRINT("info", ("W_%lu <- job item: %p data: %p thd: %p",
                         worker->id, job_item, ev, thd));
     if (is_gtid_event(ev))
@@ -2598,6 +2709,7 @@ int slave_worker_exec_job_group(Slave_worker *worker, Relay_log_info *rli)
                                              &worker->ts_exec[0]);
     if (error || worker->found_order_commit_deadlock())
     {
+      worker->prepare_for_retry(*ev);
       error= worker->retry_transaction(start_relay_number, start_relay_pos,
                                        job_item->relay_number,
                                        job_item->relay_pos);
@@ -2612,9 +2724,9 @@ int slave_worker_exec_job_group(Slave_worker *worker, Relay_log_info *rli)
       WL#7592 refines the original assert disjunction formula
       with the final disjunct.
     */
-    DBUG_ASSERT(seen_begin || is_gtid_event(ev) ||
-                ev->get_type_code() == binary_log::QUERY_EVENT ||
-                is_mts_db_partitioned(rli) || worker->id == 0 || seen_gtid);
+    assert(seen_begin || is_gtid_event(ev) ||
+           ev->get_type_code() == binary_log::QUERY_EVENT ||
+           is_mts_db_partitioned(rli) || worker->id == 0 || seen_gtid);
 
     if (ev->ends_group() ||
         (!seen_begin && !is_gtid_event(ev) &&
@@ -2636,7 +2748,7 @@ int slave_worker_exec_job_group(Slave_worker *worker, Relay_log_info *rli)
   /* The group is applied successfully, so error should be 0 */
   worker->slave_worker_ends_group(ev, 0);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_PRINT("mts", ("Check_slave_debug_group worker %lu mts_checkpoint_group"
                      " %u processed %lu debug %d\n", worker->id, opt_mts_checkpoint_group,
                      worker->groups_done,
diff --git a/sql/rpl_rli_pdb.h b/sql/rpl_rli_pdb.h
index 8c381154578a..5698a6bbad1c 100644
--- a/sql/rpl_rli_pdb.h
+++ b/sql/rpl_rli_pdb.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -27,7 +34,7 @@
 #include "rpl_rli.h"           // Relay_log_info
 #include "rpl_slave.h"         // MTS_WORKER_UNDEF
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern ulong w_rr;
 #endif
 /**
@@ -115,7 +122,7 @@ typedef struct st_slave_job_group
   int32    done;  // Flag raised by W,  read and reset by Coordinator
   ulong    shifted;     // shift the last CP bitmap at receiving a new CP
   time_t   ts;          // Group's timestampt to update Seconds_behind_master
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool     notified;    // to debug group_master_log_name change notification
 #endif
   /* Clock-based scheduler requirement: */
@@ -165,7 +172,8 @@ typedef struct st_slave_job_group
     checkpoint_relay_log_pos= 0;
     checkpoint_seqno= (uint) -1;
     done= 0;
-#ifndef DBUG_OFF
+    ts= 0;
+#ifndef NDEBUG
     notified= false;
 #endif
     last_committed= SEQ_UNINIT;
@@ -234,7 +242,12 @@ class circular_buffer_queue
   /**
      return the value of @c data member of the head of the queue.
   */
-  Element_type* head_queue();
+  Element_type* head_queue()
+  {
+    if (empty())
+      return NULL;
+    return &m_Q[entry];
+  }
 
   bool   gt(ulong i, ulong k); // comparision of ordering of two entities
   /* index is within the valid range */
@@ -297,7 +310,7 @@ class Slave_committed_queue : public circular_buffer_queue<Slave_job_group>
     }
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool count_done(Relay_log_info* rli);
 #endif
 
@@ -311,7 +324,7 @@ class Slave_committed_queue : public circular_buffer_queue<Slave_job_group>
   */
   Slave_job_group* get_job_group(ulong ind)
   {
-    DBUG_ASSERT(ind < size);
+    assert(ind < size);
     return &m_Q[ind];
   }
 
@@ -363,7 +376,7 @@ ulong circular_buffer_queue<Element_type>::en_queue(Element_type *item)
   ulong ret;
   if (avail == size)
   {
-    DBUG_ASSERT(avail == m_Q.size());
+    assert(avail == m_Q.size());
     return (ulong) -1;
   }
 
@@ -383,10 +396,10 @@ ulong circular_buffer_queue<Element_type>::en_queue(Element_type *item)
   if (avail == entry)
     avail= size;
 
-  DBUG_ASSERT(avail == entry ||
-              len == (avail >= entry) ?
-              (avail - entry) : (size + avail - entry));
-  DBUG_ASSERT(avail != entry);
+  assert(avail == entry ||
+         len == (avail >= entry) ?
+         (avail - entry) : (size + avail - entry));
+  assert(avail != entry);
 
   return ret;
 }
@@ -406,7 +419,7 @@ ulong circular_buffer_queue<Element_type>::de_queue(Element_type *item)
   ulong ret;
   if (entry == size)
   {
-    DBUG_ASSERT(len == 0);
+    assert(len == 0);
     return (ulong) -1;
   }
 
@@ -423,10 +436,10 @@ ulong circular_buffer_queue<Element_type>::de_queue(Element_type *item)
   if (avail == entry)
     entry= size;
 
-  DBUG_ASSERT(entry == size ||
-              (len == (avail >= entry)? (avail - entry) :
-               (size + avail - entry)));
-  DBUG_ASSERT(avail != entry);
+  assert(entry == size ||
+         (len == (avail >= entry)? (avail - entry) :
+          (size + avail - entry)));
+  assert(avail != entry);
 
   return ret;
 }
@@ -437,7 +450,7 @@ ulong circular_buffer_queue<Element_type>::de_tail(Element_type *item)
 {
   if (entry == size)
   {
-    DBUG_ASSERT(len == 0);
+    assert(len == 0);
     return (ulong) -1;
   }
 
@@ -449,10 +462,10 @@ ulong circular_buffer_queue<Element_type>::de_tail(Element_type *item)
   if (avail == entry)
     entry= size;
 
-  DBUG_ASSERT(entry == size ||
-              (len == (avail >= entry)? (avail - entry) :
-               (size + avail - entry)));
-  DBUG_ASSERT(avail != entry);
+  assert(entry == size ||
+         (len == (avail >= entry)? (avail - entry) :
+          (size + avail - entry)));
+  assert(avail != entry);
 
   return avail;
 }
@@ -498,7 +511,7 @@ class Slave_worker : public Relay_log_info
   curr_group_exec_parts; // Current Group Executed Partitions
 
   bool curr_group_seen_begin; // is set to TRUE with explicit B-event
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool curr_group_seen_sequence_number; // is set to TRUE about starts_group()
 #endif
   ulong id;                 // numberic identifier of the Worker
@@ -677,12 +690,12 @@ class Slave_worker : public Relay_log_info
     }
     if (rli_description_event)
     {
-      DBUG_ASSERT(rli_description_event->usage_counter.atomic_get() > 0);
+      assert(rli_description_event->usage_counter.atomic_get() > 0);
 
       if (rli_description_event->usage_counter.atomic_add(-1) == 1)
       {
         /* The being deleted by Worker FD can't be the latest one */
-        DBUG_ASSERT(rli_description_event != c_rli->get_rli_description_event());
+        assert(rli_description_event != c_rli->get_rli_description_event());
 
         delete rli_description_event;
       }
@@ -700,6 +713,17 @@ class Slave_worker : public Relay_log_info
   };
 
   int slave_worker_exec_event(Log_event *ev);
+  /**
+    Make the necessary changes to both the `Slave_worker` and current
+    `Log_event` objects, before retrying to apply the transaction.
+
+    Since the event is going to be re-read from the relay-log file, there
+    may be actions needed to be taken to reset the state both of `this`
+    instance, as well as of the current `Log_event` being processed.
+
+    @param event The `Log_event` object currently being processed.
+  */
+  void prepare_for_retry(Log_event &event);
   bool retry_transaction(uint start_relay_number, my_off_t start_relay_pos,
                          uint end_relay_number, my_off_t end_relay_pos);
 
@@ -771,6 +795,36 @@ class Slave_worker : public Relay_log_info
      Returns the index of the Channel_name field of the table repository.
   */
   static uint get_channel_field_index();
+
+  /**
+    This class aims to do cleanup for workers in retry_transaction method.
+  */
+  class Retry_context_sentry {
+  public:
+    /**
+      Constructor to inilizate class objects and flags.
+    */
+    Retry_context_sentry(Slave_worker& parent);
+    /**
+       This destructor calls clean() method which performs the cleanup.
+    */
+    virtual ~Retry_context_sentry();
+    /**
+       Operator to set the value of m_cleaned_up.
+
+       @param [out] Flag to check for cleanup.
+       @return the value of flag for each worker.
+
+    */
+    Retry_context_sentry& operator=(bool is_cleaned_up);
+    /**
+       This method performs the cleanup and resets m_order_commit_deadlock flag.
+    */
+    void clean();
+  private:
+    Slave_worker& m_parent;           // Object of enclosed class.
+    bool m_is_cleaned_up;             // Flag to check for cleanup.
+  };
 };
 
 void * head_queue(Slave_jobs_queue *jobs, Slave_job_item *ret);
diff --git a/sql/rpl_slave.cc b/sql/rpl_slave.cc
index e41caf9b3376..26345455840f 100644
--- a/sql/rpl_slave.cc
+++ b/sql/rpl_slave.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -233,8 +240,8 @@ static int check_slave_sql_config_conflict(const Relay_log_info *rli);
 static void set_thd_tx_priority(THD* thd, int priority)
 {
   DBUG_ENTER("set_thd_tx_priority");
-  DBUG_ASSERT(thd->system_thread == SYSTEM_THREAD_SLAVE_SQL ||
-              thd->system_thread == SYSTEM_THREAD_SLAVE_WORKER);
+  assert(thd->system_thread == SYSTEM_THREAD_SLAVE_SQL ||
+         thd->system_thread == SYSTEM_THREAD_SLAVE_WORKER);
 
   thd->thd_tx_priority= priority;
   DBUG_EXECUTE_IF("dbug_set_high_prio_sql_thread",
@@ -245,6 +252,25 @@ static void set_thd_tx_priority(THD* thd, int priority)
   DBUG_VOID_RETURN;
 }
 
+/**
+  Set for the thread options about the memory and size limits when
+  transactions collect write sets.
+
+  @param thd          Thread handler
+  @param ignore_limit  if the memory limits should be ignored
+  @param allow_drop_write_set if this thread does not require WS to always be
+  logged
+*/
+static void set_thd_write_set_options(THD *thd, bool ignore_limit,
+                                      bool allow_drop_write_set) {
+  thd->get_transaction()
+      ->get_transaction_write_set_ctx()
+      ->set_local_ignore_write_set_memory_limit(ignore_limit);
+  thd->get_transaction()
+      ->get_transaction_write_set_ctx()
+      ->set_local_allow_drop_write_set(allow_drop_write_set);
+}
+
 /*
   Function to set the slave's max_allowed_packet based on the value
   of slave_max_allowed_packet.
@@ -257,7 +283,7 @@ static void set_slave_max_allowed_packet(THD *thd, MYSQL *mysql)
 {
   DBUG_ENTER("set_slave_max_allowed_packet");
   // thd and mysql must be valid
-  DBUG_ASSERT(thd && mysql);
+  assert(thd && mysql);
 
   thd->variables.max_allowed_packet= slave_max_allowed_packet;
   /*
@@ -320,6 +346,9 @@ void lock_slave_threads(Master_info* mi)
 {
   DBUG_ENTER("lock_slave_threads");
 
+  //protection against mixed locking order (see header)
+  mi->channel_assert_some_wrlock();
+
   //TODO: see if we can do this without dual mutex
   mysql_mutex_lock(&mi->run_lock);
   mysql_mutex_lock(&mi->rli->run_lock);
@@ -349,9 +378,9 @@ static PSI_thread_key key_thread_slave_io, key_thread_slave_sql, key_thread_slav
 
 static PSI_thread_info all_slave_threads[]=
 {
-  { &key_thread_slave_io, "slave_io", PSI_FLAG_GLOBAL},
-  { &key_thread_slave_sql, "slave_sql", PSI_FLAG_GLOBAL},
-  { &key_thread_slave_worker, "slave_worker", PSI_FLAG_GLOBAL}
+  { &key_thread_slave_io, "slave_io", PSI_FLAG_THREAD_SYSTEM | PSI_FLAG_GLOBAL},
+  { &key_thread_slave_sql, "slave_sql", PSI_FLAG_THREAD_SYSTEM | PSI_FLAG_GLOBAL},
+  { &key_thread_slave_worker, "slave_worker", PSI_FLAG_THREAD_SYSTEM | PSI_FLAG_GLOBAL}
 };
 
 static PSI_memory_info all_slave_memory[]=
@@ -405,7 +434,7 @@ int init_slave()
                                                           &channel_map)))
     sql_print_error("Failed to create or recover replication info repositories.");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /* @todo: Print it for all the channels */
   {
     Master_info *default_mi;
@@ -459,7 +488,7 @@ int init_slave()
       mi= it->second;
 
       /* If server id is not set, start_slave_thread() will say it */
-      if (mi && mi->host[0])
+      if (mi && mi->host[0] && mi->rli->inited)
       {
         /* same as in start_slave() cache the global var values into rli's members */
         mi->rli->opt_slave_parallel_workers= opt_mts_slave_parallel_workers;
@@ -477,6 +506,11 @@ int init_slave()
                           mi->get_channel());
         }
       }
+      else
+      {
+        sql_print_information("Failed to start slave threads for channel '%s'",
+                              mi->get_channel());
+      }
     }
   }
 
@@ -525,7 +559,7 @@ bool start_slave(THD *thd)
   if (channel_map.get_num_instances() == 1)
   {
     mi= channel_map.get_default_channel_mi();
-    DBUG_ASSERT(mi);
+    assert(mi);
     if (start_slave(thd, &thd->lex->slave_connection,
                     &thd->lex->mi, thd->lex->slave_thd_opt, mi, true))
       DBUG_RETURN(true);
@@ -550,7 +584,9 @@ bool start_slave(THD *thd)
     {
       mi= it->second;
 
-      channel_configured= mi && mi->inited && mi->host[0];   // channel properly configured.
+      channel_configured= mi && // Master_info exists
+                          (mi->inited || mi->reset) // It is inited or was reset
+                          && mi->host[0]; // host is set
 
       if (channel_configured)
       {
@@ -598,8 +634,8 @@ int stop_slave(THD *thd)
   {
     mi= channel_map.get_default_channel_mi();
 
-    DBUG_ASSERT(!strcmp(mi->get_channel(),
-                        channel_map.get_default_channel()));
+    assert(!strcmp(mi->get_channel(),
+                   channel_map.get_default_channel()));
 
     error= stop_slave(thd, mi, 1,
                       false /*for_one_channel*/, &push_temp_table_warning);
@@ -654,6 +690,8 @@ bool start_slave_cmd(THD *thd)
   LEX *lex= thd->lex;
   bool res= true;  /* default, an error */
 
+  DEBUG_SYNC(thd, "begin_start_slave");
+
   channel_map.wrlock();
 
   if (!is_slave_configured())
@@ -805,13 +843,13 @@ bool stop_slave_cmd(THD *thd)
 
 /**
    Parse the given relay log and identify the rotate event from the master.
-   Ignore the Format description event, Previous_gtid log event and ignorable
-   events within the relay log. When a rotate event is found check if it is a
-   rotate that is originated from the master or not based on the server_id. If
-   the rotate is from slave or if it is a fake rotate event ignore the event.
-   If any other events are encountered apart from the above events generate an
-   error. From the rotate event extract the master's binary log name and
-   position.
+   Ignore the Format description event, Previous_gtid log event, ignorable
+   event and Stop event within the relay log as they are generated by slave.
+   When a rotate event is found check if it is a rotate that is originated from
+   the master based on the server_id. Ignore the event if the rotate is from
+   slave or if it is a fake rotate event. If any other events are encountered
+   apart from the above events generate an error. From the rotate event
+   extract the master's binary log name and position.
 
    @param filename
           Relay log name which needs to be parsed.
@@ -842,7 +880,7 @@ read_rotate_from_relay_log(char *filename, char *master_log_file,
     first event of the log.
    */
   Format_description_log_event fd_ev(BINLOG_VERSION), *fd_ev_p= &fd_ev;
-  DBUG_ASSERT(fd_ev.is_valid());
+  assert(fd_ev.is_valid());
   IO_CACHE log;
   const char *errmsg= NULL;
   File file= open_binlog_file(&log, filename, &errmsg);
@@ -875,7 +913,7 @@ read_rotate_from_relay_log(char *filename, char *master_log_file,
       if (ev->server_id && ev->server_id != ::server_id)
       {
         Rotate_log_event *rotate_ev= (Rotate_log_event *)ev;
-        DBUG_ASSERT(FN_REFLEN >= rotate_ev->ident_len + 1);
+        assert(FN_REFLEN >= rotate_ev->ident_len + 1);
         memcpy(master_log_file, rotate_ev->new_log_ident, rotate_ev->ident_len + 1);
         *master_log_pos= rotate_ev->pos;
         ret= FOUND_ROTATE;
@@ -886,6 +924,8 @@ read_rotate_from_relay_log(char *filename, char *master_log_file,
       break;
     case binary_log::IGNORABLE_LOG_EVENT:
       break;
+    case binary_log::STOP_EVENT:
+      break;
     default:
       sql_print_error("Error during --relay-log-recovery: Could not locate "
                       "rotate event from the master.");
@@ -932,8 +972,10 @@ read_rotate_from_relay_log(char *filename, char *master_log_file,
           Relay_log_info object to read relay log files and to set
           group_master_log_name and group_master_log_pos.
 
-   @retval 0 On success
-   @retval 1 On failure
+   @retval 0 Success - Rotate event was found
+   @retval 1 Failure - Found some events replicated but no rotate event was found
+   @retval 2 When no rotate event from master was found. This can happen when
+             slave server was restarted immediately after executing CHANGE MASTER
  */
 static int
 find_first_relay_log_with_rotate_from_master(Relay_log_info* rli)
@@ -981,9 +1023,13 @@ find_first_relay_log_with_rotate_from_master(Relay_log_info* rli)
   }
   if (pos== LOG_INFO_EOF)
   {
-    error= 1;
-    sql_print_error("Error during --relay-log-recovery: Could not locate "
-                    "rotate event from master in relay log file.");
+    error= 2;
+    sql_print_warning("Error during --relay-log-recovery: Could not locate "
+                      "rotate event from master in relay log file.");
+    sql_print_warning("Server was not able to find a rotate event from master "
+                      "server to initialize relay log recovery for channel "
+                      "'%s'. Skipping relay log recovery for the channel.",
+                      rli->mi->get_channel());
     goto err;
   }
   if (!error && got_rotate_from_master)
@@ -1084,6 +1130,16 @@ int init_recovery(Master_info* mi, const char** errmsg)
   int error= 0;
   Relay_log_info *rli= mi->rli;
   char *group_master_log_name= NULL;
+
+  /* Set the recovery_parallel_workers to 0 if Auto Position is enabled. */
+  bool is_gtid_with_autopos_on=
+      ((get_gtid_mode(GTID_MODE_LOCK_NONE) == GTID_MODE_ON &&
+        mi->is_auto_position())
+           ? true
+           : false);
+  if (is_gtid_with_autopos_on)
+    rli->recovery_parallel_workers = 0;
+
   if (rli->recovery_parallel_workers)
   {
     /*
@@ -1099,20 +1155,13 @@ int init_recovery(Master_info* mi, const char** errmsg)
     */
     error= mts_recovery_groups(rli);
     if (rli->mts_recovery_group_cnt)
-    {
-      if (get_gtid_mode(GTID_MODE_LOCK_NONE) == GTID_MODE_ON)
-      {
-        rli->recovery_parallel_workers= 0;
-        rli->clear_mts_recovery_groups();
-      }
-      else
-        DBUG_RETURN(error);
-    }
+      DBUG_RETURN(error);
   }
 
   group_master_log_name= const_cast<char *>(rli->get_group_master_log_name());
   if (!error)
   {
+    bool run_relay_log_recovery = 1;
     if (!group_master_log_name[0])
     {
       if (rli->replicate_same_server_id)
@@ -1125,10 +1174,17 @@ int init_recovery(Master_info* mi, const char** errmsg)
         DBUG_RETURN(error);
       }
       error= find_first_relay_log_with_rotate_from_master(rli);
-      if (error)
+      if (error == 2)
+      {
+        // No events from the master on relay log - skip relay log recovery
+        run_relay_log_recovery = false;
+        error = 0;
+      }
+      else if (error)
         DBUG_RETURN(error);
     }
-    recover_relay_log(mi);
+    if (run_relay_log_recovery)
+      recover_relay_log(mi);
   }
   DBUG_RETURN(error);
 }
@@ -1247,7 +1303,7 @@ int load_mi_and_rli_from_repositories(Master_info* mi,
                                       int thread_mask)
 {
   DBUG_ENTER("init_info");
-  DBUG_ASSERT(mi != NULL && mi->rli != NULL);
+  assert(mi != NULL && mi->rli != NULL);
   int init_error= 0;
   enum_return_check check_return= ERROR_CHECKING_REPOSITORY;
   THD *thd= current_thd;
@@ -1339,7 +1395,7 @@ int load_mi_and_rli_from_repositories(Master_info* mi,
 void end_info(Master_info* mi)
 {
   DBUG_ENTER("end_info");
-  DBUG_ASSERT(mi != NULL && mi->rli != NULL);
+  assert(mi != NULL && mi->rli != NULL);
 
   /*
     The previous implementation was not acquiring locks.  We do the same here.
@@ -1355,7 +1411,7 @@ int remove_info(Master_info* mi)
 {
   int error= 1;
   DBUG_ENTER("remove_info");
-  DBUG_ASSERT(mi != NULL && mi->rli != NULL);
+  assert(mi != NULL && mi->rli != NULL);
 
   /*
     The previous implementation was not acquiring locks.
@@ -1393,7 +1449,7 @@ int remove_info(Master_info* mi)
 int flush_master_info(Master_info* mi, bool force)
 {
   DBUG_ENTER("flush_master_info");
-  DBUG_ASSERT(mi != NULL && mi->rli != NULL);
+  assert(mi != NULL && mi->rli != NULL);
   /*
     The previous implementation was not acquiring locks.
     We do the same here. However, this is quite strange.
@@ -1440,8 +1496,8 @@ static void print_slave_skip_errors(void)
   */
   const size_t MIN_ROOM= 10;
   DBUG_ENTER("print_slave_skip_errors");
-  DBUG_ASSERT(sizeof(slave_skip_error_names) > MIN_ROOM);
-  DBUG_ASSERT(MAX_SLAVE_ERROR <= 999999); // 6 digits
+  assert(sizeof(slave_skip_error_names) > MIN_ROOM);
+  assert(MAX_SLAVE_ERROR <= 999999); // 6 digits
 
   if (!use_slave_mask || bitmap_is_clear_all(&slave_error_mask))
   {
@@ -1509,7 +1565,7 @@ void set_slave_skip_errors(char** slave_skip_errors_ptr)
 static void init_slave_skip_errors()
 {
   DBUG_ENTER("init_slave_skip_errors");
-  DBUG_ASSERT(!use_slave_mask); // not already initialized
+  assert(!use_slave_mask); // not already initialized
 
   if (bitmap_init(&slave_error_mask,0,MAX_SLAVE_ERROR,0))
   {
@@ -1523,8 +1579,8 @@ static void init_slave_skip_errors()
 static void add_slave_skip_errors(const uint* errors, uint n_errors)
 {
   DBUG_ENTER("add_slave_skip_errors");
-  DBUG_ASSERT(errors);
-  DBUG_ASSERT(use_slave_mask);
+  assert(errors);
+  assert(use_slave_mask);
 
   for (uint i = 0; i < n_errors; i++)
   {
@@ -1658,6 +1714,9 @@ int terminate_slave_threads(Master_info* mi, int thread_mask,
   {
     DBUG_PRINT("info",("Terminating SQL thread"));
     mi->rli->abort_slave= 1;
+
+    DEBUG_SYNC(current_thd, "terminate_slave_threads_after_set_abort_slave");
+
     if ((error=terminate_slave_thread(mi->rli->info_thd, sql_lock,
                                       &mi->rli->stop_cond,
                                       &mi->rli->slave_running,
@@ -1696,8 +1755,8 @@ int terminate_slave_threads(Master_info* mi, int thread_mask,
                     {
                       const char act[]=
                         "now SIGNAL reached_stopping_io_thread";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                     };);
     if ((error=terminate_slave_thread(mi->info_thd,io_lock,
                                       &mi->stop_cond,
@@ -1814,7 +1873,7 @@ terminate_slave_thread(THD *thd,
       DBUG_RETURN(ER_SLAVE_CHANNEL_NOT_RUNNING);
     }
   }
-  DBUG_ASSERT(thd != 0);
+  assert(thd != 0);
   THD_CHECK_SENTRY(thd);
 
   /*
@@ -1834,7 +1893,7 @@ terminate_slave_thread(THD *thd,
     */
 #ifndef _WIN32
     int err MY_ATTRIBUTE((unused))= pthread_kill(thd->real_id, SIGUSR1);
-    DBUG_ASSERT(err != EINVAL);
+    assert(err != EINVAL);
 #endif
     thd->awake(THD::NOT_KILLED);
     mysql_mutex_unlock(&thd->LOCK_thd_data);
@@ -1845,7 +1904,7 @@ terminate_slave_thread(THD *thd,
     */
     struct timespec abstime;
     set_timespec(&abstime,2);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int error=
 #endif
       mysql_cond_timedwait(term_cond, term_lock, &abstime);
@@ -1857,10 +1916,10 @@ terminate_slave_thread(THD *thd,
         mysql_mutex_unlock(term_lock);
       DBUG_RETURN (1);
     }
-    DBUG_ASSERT(error == ETIMEDOUT || error == 0);
+    assert(error == ETIMEDOUT || error == 0);
   }
 
-  DBUG_ASSERT(*slave_running == 0);
+  assert(*slave_running == 0);
 
   if (need_lock_term)
     mysql_mutex_unlock(term_lock);
@@ -1932,6 +1991,7 @@ bool start_slave_thread(
       if (!thd->killed)
         mysql_cond_wait(start_cond, cond_lock);
       mysql_mutex_unlock(cond_lock);
+      DEBUG_SYNC(thd, "start_slave_thread_after_signal_on_start_cond");
       thd->EXIT_COND(& saved_stage);
       mysql_mutex_lock(cond_lock); // re-acquire it
       if (thd->killed)
@@ -2153,8 +2213,8 @@ static bool io_slave_killed(THD* thd, Master_info* mi)
 {
   DBUG_ENTER("io_slave_killed");
 
-  DBUG_ASSERT(mi->info_thd == thd);
-  DBUG_ASSERT(mi->slave_running); // tracking buffer overrun
+  assert(mi->info_thd == thd);
+  assert(mi->slave_running); // tracking buffer overrun
   DBUG_RETURN(mi->abort_slave || abort_loop || thd->killed);
 }
 
@@ -2183,10 +2243,14 @@ bool sql_slave_killed(THD* thd, Relay_log_info* rli)
 
   DBUG_ENTER("sql_slave_killed");
 
-  DBUG_ASSERT(rli->info_thd == thd);
-  DBUG_ASSERT(rli->slave_running == 1);
+  assert(rli->info_thd == thd);
+  assert(rli->slave_running == 1);
   if (rli->sql_thread_kill_accepted)
     DBUG_RETURN(true);
+  DBUG_EXECUTE_IF("stop_when_mts_in_group", rli->abort_slave = 1;
+                  DBUG_SET("-d,stop_when_mts_in_group");
+                  DBUG_SET("-d,simulate_stop_when_mts_in_group");
+                  DBUG_RETURN(false););
   if (abort_loop || thd->killed || rli->abort_slave)
   {
     rli->sql_thread_kill_accepted= true;
@@ -2424,7 +2488,7 @@ io_thread_init_command(Master_info *mi, const char *query, int allowed_error,
     }
   }
   else
-    DBUG_ASSERT(master_row == NULL);
+    assert(master_row == NULL);
   DBUG_RETURN(COMMAND_STATUS_OK);
 }
 
@@ -2500,19 +2564,19 @@ static int get_master_uuid(MYSQL *mysql, Master_info *mi)
   DBUG_EXECUTE_IF("dbug.before_get_MASTER_UUID",
                   {
                     const char act[]= "now wait_for signal.get_master_uuid";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   DBUG_EXECUTE_IF("dbug.simulate_busy_io",
                   {
                     const char act[]= "now signal Reached wait_for signal.got_stop_slave";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   DBUG_EXECUTE_IF("dbug.simulate_no_such_var_server_uuid",
 		  {
 		    query_buf[strlen(query_buf) - 1]= '_'; // currupt the last char
@@ -2749,10 +2813,10 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
   mi->get_mi_description_event()->common_footer->checksum_alg=
     mi->rli->relay_log.relay_log_checksum_alg;
 
-  DBUG_ASSERT(mi->get_mi_description_event()->common_footer->checksum_alg !=
-              binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
-  DBUG_ASSERT(mi->rli->relay_log.relay_log_checksum_alg !=
-              binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(mi->get_mi_description_event()->common_footer->checksum_alg !=
+         binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(mi->rli->relay_log.relay_log_checksum_alg !=
+         binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
 
   mysql_mutex_unlock(&mi->data_lock);
 
@@ -2766,9 +2830,9 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
                     const char act[]=
                       "now "
                       "wait_for signal.get_unix_timestamp";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   master_res= NULL;
@@ -2779,6 +2843,8 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
     mysql_mutex_lock(&mi->data_lock);
     mi->clock_diff_with_master=
       (long) (time((time_t*) 0) - strtoul(master_row[0], 0, 10));
+    DBUG_EXECUTE_IF("dbug.mts.force_clock_diff_eq_0",
+      mi->clock_diff_with_master= 0;);
     mysql_mutex_unlock(&mi->data_lock);
   }
   else if (check_io_slave_killed(mi->info_thd, mi, NULL))
@@ -2819,9 +2885,9 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
                     const char act[]=
                       "now "
                       "wait_for signal.get_server_id";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd, 
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd, 
+                                                  STRING_WITH_LEN(act)));
                   };);
   master_res= NULL;
   master_row= NULL;
@@ -3126,10 +3192,10 @@ when it try to get the value of TIME_ZONE global variable from master.";
        }
 
         // valid outcome is either of
-        DBUG_ASSERT(mi->checksum_alg_before_fd ==
-                    binary_log::BINLOG_CHECKSUM_ALG_OFF ||
-                    mi->checksum_alg_before_fd ==
-                    binary_log::BINLOG_CHECKSUM_ALG_CRC32);
+       assert(mi->checksum_alg_before_fd ==
+              binary_log::BINLOG_CHECKSUM_ALG_OFF ||
+              mi->checksum_alg_before_fd ==
+              binary_log::BINLOG_CHECKSUM_ALG_CRC32);
       }
       else if (check_io_slave_killed(mi->info_thd, mi, NULL))
         goto slave_killed_err;
@@ -3158,6 +3224,21 @@ when it try to get the value of TIME_ZONE global variable from master.";
   else
     mi->checksum_alg_before_fd= binary_log::BINLOG_CHECKSUM_ALG_OFF;
 
+  if (DBUG_EVALUATE_IF("bug32442749_simulate_null_checksum", 1, 0))
+  {
+    const char query[]= "SET @master_binlog_checksum= NULL";
+    int rc = mysql_real_query(mysql, query, static_cast<ulong>(strlen(query)));
+    if (rc != 0) {
+        errmsg= "The slave I/O thread stops because a fatal error is encountered "
+          "when it tried to SET @master_binlog_checksum.";
+        err_code= ER_SLAVE_FATAL_ERROR;
+        sprintf(err_buff, "%s Error: %s", errmsg, mysql_error(mysql));
+        mysql_free_result(mysql_store_result(mysql));
+        goto err;
+    }
+    mysql_free_result(mysql_store_result(mysql));
+  }
+
   if (DBUG_EVALUATE_IF("simulate_slave_unaware_gtid", 0, 1))
   {
     enum_gtid_mode master_gtid_mode= GTID_MODE_OFF;
@@ -3253,7 +3334,7 @@ when it try to get the value of TIME_ZONE global variable from master.";
   {
     if (master_res)
       mysql_free_result(master_res);
-    DBUG_ASSERT(err_code != 0);
+    assert(err_code != 0);
     mi->report(ERROR_LEVEL, err_code, "%s", err_buff);
     DBUG_RETURN(1);
   }
@@ -3314,7 +3395,7 @@ static bool wait_for_relay_log_space(Relay_log_info* rli)
    */
   if (rli->ignore_log_space_limit)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       char llbuf1[22], llbuf2[22];
       DBUG_PRINT("info", ("log_space_limit=%s "
@@ -3330,7 +3411,7 @@ static bool wait_for_relay_log_space(Relay_log_info* rli)
     if (rli->sql_force_rotate_relay)
     {
       mysql_mutex_lock(&mi->data_lock);
-      rotate_relay_log(mi);
+      rotate_relay_log(mi, false/*need_log_space_lock=false*/);
       mysql_mutex_unlock(&mi->data_lock);
       rli->sql_force_rotate_relay= false;
     }
@@ -3351,17 +3432,22 @@ static bool wait_for_relay_log_space(Relay_log_info* rli)
 
   @param thd pointer to I/O Thread's Thd.
   @param mi  point to I/O Thread metadata class.
+  @param force_flush_mi_info when true, do not respect sync period and flush
+                             information.
+                             when false, flush will only happen if it is time to
+                             flush.
 
   @return 0 if everything went fine, 1 otherwise.
 */
-static int write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi)
+static int write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi,
+                                                  bool force_flush_mi_info)
 {
   Relay_log_info *rli= mi->rli;
   mysql_mutex_t *log_lock= rli->relay_log.get_log_lock();
   int error= 0;
   DBUG_ENTER("write_ignored_events_info_to_relay_log");
 
-  DBUG_ASSERT(thd == mi->info_thd);
+  assert(thd == mi->info_thd);
   mysql_mutex_assert_owner(&mi->data_lock);
   mysql_mutex_lock(log_lock);
   if (rli->ign_master_log_name_end[0])
@@ -3386,8 +3472,8 @@ static int write_ignored_events_info_to_relay_log(THD *thd, Master_info *mi)
                    "failed to write a Rotate event"
                    " to the relay log, SHOW SLAVE STATUS may be"
                    " inaccurate");
-      rli->relay_log.harvest_bytes_written(&rli->log_space_total);
-      if (flush_master_info(mi, TRUE))
+      rli->relay_log.harvest_bytes_written(rli, true/*need_log_space_lock=true*/);
+      if (flush_master_info(mi, force_flush_mi_info))
       {
         error= 1;
         sql_print_error("Failed to flush master info file.");
@@ -3483,6 +3569,10 @@ int register_slave_on_master(MYSQL* mysql, Master_info *mi,
     }
     DBUG_RETURN(1);
   }
+  DBUG_EXECUTE_IF("simulate_register_slave_killed", {
+    mi->abort_slave = 1;
+    DBUG_RETURN(1);
+  };);
   DBUG_RETURN(0);
 }
 
@@ -3705,7 +3795,7 @@ bool show_slave_status_send_data(THD *thd, Master_info *mi,
     until_type= "DONE";
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   protocol->store(until_type, &my_charset_bin);
   protocol->store(mi->rli->until_log_name, &my_charset_bin);
@@ -4154,6 +4244,11 @@ void set_slave_thread_options(THD* thd)
   thd->variables.option_bits= options;
   thd->variables.completion_type= 0;
 
+  /* Do not track GTIDs for slave threads to avoid performance issues. */
+  thd->variables.session_track_gtids= OFF;
+  thd->rpl_thd_ctx.session_gtids_ctx()
+      .update_tracking_activeness_from_session_variable(thd);
+
   /*
     Set autocommit= 1 when info tables are used and autocommit == 0 to
     avoid trigger asserts on mysql_execute_command(THD *thd) caused by
@@ -4211,7 +4306,7 @@ void set_slave_thread_default_charset(THD* thd, Relay_log_info const *rli)
 static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
 {
   DBUG_ENTER("init_slave_thread");
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   int simulate_error= 0;
 #endif
   thd->system_thread= (thd_type == SLAVE_THD_WORKER) ? 
@@ -4243,7 +4338,7 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
                   simulate_error|= (1 << SLAVE_THD_IO););
   DBUG_EXECUTE_IF("simulate_sql_slave_error_on_init",
                   simulate_error|= (1 << SLAVE_THD_SQL););
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   if (thd->store_globals() || simulate_error & (1<< thd_type))
 #else
   if (thd->store_globals())
@@ -4380,7 +4475,7 @@ static int request_dump(THD *thd, MYSQL* mysql, Master_info* mi,
     ptr_buffer+= encoded_data_size;
 
     command_size= ptr_buffer - command_buffer;
-    DBUG_ASSERT(command_size == (allocation_size - 1));
+    assert(command_size == (allocation_size - 1));
   }
   else
   {
@@ -4404,7 +4499,7 @@ static int request_dump(THD *thd, MYSQL* mysql, Master_info* mi,
     ptr_buffer+= BINLOG_NAME_INFO_SIZE;
 
     command_size= ptr_buffer - command_buffer;
-    DBUG_ASSERT(command_size == (allocation_size - 1));
+    assert(command_size == (allocation_size - 1));
   }
 
   if (simple_command(mysql, command, command_buffer, command_size, 1))
@@ -4458,7 +4553,7 @@ static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings)
     my_real_read() will time us out
     We check if we were told to die, and if not, try reading again
   */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (disconnect_slave_event_count && !(mi->events_until_exit--))
     DBUG_RETURN(packet_error);
 #endif
@@ -4530,7 +4625,7 @@ static int sql_delay_event(Log_event *ev, THD *thd, Relay_log_info *rli)
 
   DBUG_ENTER("sql_delay_event");
   mysql_mutex_assert_owner(&rli->data_lock);
-  DBUG_ASSERT(!rli->belongs_to_client());
+  assert(!rli->belongs_to_client());
 
   int type= ev->get_type_code();
   if (sql_delay && type != binary_log::ROTATE_EVENT &&
@@ -4684,7 +4779,7 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
   {
     reason= ev->shall_skip(rli);
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (rli->is_mts_recovery())
   {
     DBUG_PRINT("mts", ("Mts is recovering %d, number of bits set %d, "
@@ -4712,6 +4807,11 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
 
     exec_res= ev->apply_event(rli);
 
+    DBUG_EXECUTE_IF("simulate_stop_when_mts_in_group",
+                    if (rli->mts_group_status == Relay_log_info::MTS_IN_GROUP
+                        && rli->curr_group_seen_begin)
+                    DBUG_SET("+d,stop_when_mts_in_group"););
+
     if (!exec_res && (ev->worker != rli))
     {
       if (ev->worker)
@@ -4724,7 +4824,7 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
         bool need_sync= ev->is_mts_group_isolated();
 
         // all events except BEGIN-query must be marked with a non-NULL Worker
-        DBUG_ASSERT(((Slave_worker*) ev->worker) == rli->last_assigned_worker);
+        assert(((Slave_worker*) ev->worker) == rli->last_assigned_worker);
 
         DBUG_PRINT("Log_event::apply_event:",
                    ("-> job item data %p to W_%lu", job_item->data, w->id));
@@ -4847,7 +4947,7 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
          (ev->ends_group() || !rli->mts_recovery_group_seen_begin) &&
           bitmap_is_set(&rli->recovery_groups, rli->mts_recovery_index))))
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       /*
         This only prints information to the debug trace.
         
@@ -4887,7 +4987,7 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
       if (skip_event)
         free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       DBUG_PRINT("info", ("update_pos error = %d", error));
       if (!rli->belongs_to_client())
       {
@@ -4907,12 +5007,12 @@ apply_event_and_update_pos(Log_event** ptr_ev, THD* thd, Relay_log_info* rli)
         INTVAR_EVENT, RAND_EVENT, USER_VAR_EVENT and ROWS_QUERY_LOG_EVENT are
         deferred event. It means ev->worker is NULL.
       */
-      DBUG_ASSERT(*ptr_ev == ev || rli->is_parallel_exec() ||
-		  (!ev->worker &&
-		   (ev->get_type_code() == binary_log::INTVAR_EVENT ||
-		    ev->get_type_code() == binary_log::RAND_EVENT ||
-		    ev->get_type_code() == binary_log::USER_VAR_EVENT ||
-                    ev->get_type_code() == binary_log::ROWS_QUERY_LOG_EVENT)));
+      assert(*ptr_ev == ev || rli->is_parallel_exec() ||
+             (!ev->worker &&
+              (ev->get_type_code() == binary_log::INTVAR_EVENT ||
+               ev->get_type_code() == binary_log::RAND_EVENT ||
+               ev->get_type_code() == binary_log::USER_VAR_EVENT ||
+               ev->get_type_code() == binary_log::ROWS_QUERY_LOG_EVENT)));
 
       rli->inc_event_relay_log_pos();
     }
@@ -5138,7 +5238,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
 
   Log_event *ev = next_event(rli), **ptr_ev;
 
-  DBUG_ASSERT(rli->info_thd==thd);
+  assert(rli->info_thd==thd);
 
   if (sql_slave_killed(thd,rli))
   {
@@ -5159,16 +5259,22 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
       If it is an artificial event, or a relay log event (IO thread generated
       event) or ev->when is set to 0, or a FD from master, or a heartbeat
       event with server_id '0' then  we don't update the last_master_timestamp.
+
+      In case of parallel execution last_master_timestamp is only updated when
+      a job is taken out of GAQ. Thus when last_master_timestamp is 0 (which
+      indicates that GAQ is empty, all slave workers are waiting for events from
+      the Coordinator), we need to initialize it with a timestamp from the first
+      event to be executed in parallel.
     */
-    if (!(rli->is_parallel_exec() ||
-          ev->is_artificial_event() || ev->is_relay_log_event() ||
+    if ((!rli->is_parallel_exec() || rli->last_master_timestamp == 0) &&
+         !(ev->is_artificial_event() || ev->is_relay_log_event() ||
           (ev->common_header->when.tv_sec == 0) ||
           ev->get_type_code() == binary_log::FORMAT_DESCRIPTION_EVENT ||
           ev->server_id == 0))
     {
       rli->last_master_timestamp= ev->common_header->when.tv_sec +
                                   (time_t) ev->exec_time;
-      DBUG_ASSERT(rli->last_master_timestamp >= 0);
+      assert(rli->last_master_timestamp >= 0);
     }
 
     /*
@@ -5204,8 +5310,8 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
                           ((ev->get_type_code() == binary_log::QUERY_EVENT) &&
                            strcmp("COMMIT", ((Query_log_event *) ev)->query) == 0))
                       {
-                        DBUG_ASSERT(thd->get_transaction()->cannot_safely_rollback(
-                            Transaction_ctx::SESSION));
+                        assert(thd->get_transaction()->cannot_safely_rollback(
+                                                                              Transaction_ctx::SESSION));
                         rli->abort_slave= 1;
                         mysql_mutex_unlock(&rli->data_lock);
                         delete ev;
@@ -5250,15 +5356,15 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
     */
     if (*ptr_ev)
     {
-      DBUG_ASSERT(*ptr_ev == ev); // event remains to belong to Coordinator
+      assert(*ptr_ev == ev); // event remains to belong to Coordinator
 
       DBUG_EXECUTE_IF("dbug.calculate_sbm_after_previous_gtid_log_event",
                     {
                       if (ev->get_type_code() == binary_log::PREVIOUS_GTIDS_LOG_EVENT)
                       {
                         const char act[]= "now signal signal.reached wait_for signal.done_sbm_calculation";
-                        DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                        DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
+                        assert(opt_debug_sync_timeout > 0);
+                        assert(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
                       }
                     };);
       DBUG_EXECUTE_IF("dbug.calculate_sbm_after_fake_rotate_log_event",
@@ -5266,9 +5372,9 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
                       if (ev->get_type_code() == binary_log::ROTATE_EVENT && ev->is_artificial_event())
                       {
                       const char act[]= "now signal signal.reached wait_for signal.done_sbm_calculation";
-                      DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                      DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(opt_debug_sync_timeout > 0);
+                      assert(!debug_sync_set_action(thd,
+                                                    STRING_WITH_LEN(act)));
                       }
                     };);
       /*
@@ -5509,7 +5615,7 @@ extern "C" void *handle_slave_io(void *arg)
   bool suppress_warnings;
   int ret;
   int binlog_version;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uint retry_count_reg= 0, retry_count_dump= 0, retry_count_event= 0;
 #endif
   Global_THD_manager *thd_manager= Global_THD_manager::get_instance();
@@ -5517,7 +5623,7 @@ extern "C" void *handle_slave_io(void *arg)
   my_thread_init();
   DBUG_ENTER("handle_slave_io");
 
-  DBUG_ASSERT(mi->inited);
+  assert(mi->inited);
   mysql= NULL ;
   retry_count= 0;
 
@@ -5525,7 +5631,7 @@ extern "C" void *handle_slave_io(void *arg)
   /* Inform waiting threads that slave has started */
   mi->slave_run_id++;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mi->events_until_exit = disconnect_slave_event_count;
 #endif
 
@@ -5621,9 +5727,9 @@ extern "C" void *handle_slave_io(void *arg)
                       const char act[]=
                         "now "
                         "wait_for signal.io_thread_let_running";
-                      DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                      DBUG_ASSERT(!debug_sync_set_action(thd, 
-                                                         STRING_WITH_LEN(act)));
+                      assert(opt_debug_sync_timeout > 0);
+                      assert(!debug_sync_set_action(thd, 
+                                                    STRING_WITH_LEN(act)));
                     };);
     DBUG_EXECUTE_IF("dbug.calculate_sbm_after_previous_gtid_log_event",
                     {
@@ -5728,7 +5834,7 @@ requesting master dump") ||
       });
     const char *event_buf;
 
-    DBUG_ASSERT(mi->last_error().number == 0);
+    assert(mi->last_error().number == 0);
     while (!io_slave_killed(thd,mi))
     {
       ulong event_len;
@@ -5842,8 +5948,8 @@ Stopping slave I/O thread due to out-of-memory error from master");
                         const char act[]=
                           "now SIGNAL reached_after_queue_event "
                           "WAIT_FOR continue_after_queue_event";
-                        DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                           STRING_WITH_LEN(act)));
+                        assert(!debug_sync_set_action(current_thd,
+                                                      STRING_WITH_LEN(act)));
                       };);
 
       /*
@@ -5858,7 +5964,7 @@ Stopping slave I/O thread due to out-of-memory error from master");
         for no reason, but this function will do a clean read, notice the clean
         value and exit immediately.
       */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       {
         char llbuf1[22], llbuf2[22];
         DBUG_PRINT("info", ("log_space_limit=%s log_space_total=%s \
@@ -5883,9 +5989,9 @@ ignore_log_space_limit=%d",
                       if (event_buf[EVENT_TYPE_OFFSET] == binary_log::USER_VAR_EVENT)
                       {
                       const char act[]= "now signal Reached wait_for signal.flush_complete_continue";
-                      DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(opt_debug_sync_timeout > 0);
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
 
                       }
                       });
@@ -5948,8 +6054,8 @@ ignore_log_space_limit=%d",
                   {
                     const char act[]= "now SIGNAL reached_stopping_io_thread "
                                       "WAIT_FOR continue_to_stop_io_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
   thd->reset_query();
   thd->reset_db(NULL_CSTR);
@@ -5968,7 +6074,7 @@ ignore_log_space_limit=%d",
     mi->mysql=0;
   }
   mysql_mutex_lock(&mi->data_lock);
-  write_ignored_events_info_to_relay_log(thd, mi);
+  write_ignored_events_info_to_relay_log(thd, mi, false/* force_flush_mi_info */);
   mysql_mutex_unlock(&mi->data_lock);
   THD_STAGE_INFO(thd, stage_waiting_for_slave_mutex_on_exit);
   mysql_mutex_lock(&mi->run_lock);
@@ -6018,7 +6124,9 @@ ignore_log_space_limit=%d",
   mysql_mutex_unlock(&mi->run_lock);
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
   my_thread_end();
-  ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   my_thread_exit(0);
   return(0);                                    // Avoid compiler warnings
 }
@@ -6110,6 +6218,18 @@ extern "C" void *handle_slave_worker(void *arg)
                     rli->get_for_channel_str());
     goto err;
   }
+
+  if (channel_map.is_group_replication_channel_name(rli->get_channel())) {
+    if (channel_map.is_group_replication_channel_name(rli->get_channel(),
+                                                      true)) {
+      thd->rpl_thd_ctx.set_rpl_channel_type(GR_APPLIER_CHANNEL);
+    } else {
+      thd->rpl_thd_ctx.set_rpl_channel_type(GR_RECOVERY_CHANNEL);
+    }
+  } else {
+    thd->rpl_thd_ctx.set_rpl_channel_type(RPL_STANDARD_CHANNEL);
+  }
+
   mysql_mutex_lock(&w->info_thd_lock);
   w->info_thd= thd;
   mysql_mutex_unlock(&w->info_thd_lock);
@@ -6132,6 +6252,9 @@ extern "C" void *handle_slave_worker(void *arg)
   thd->init_for_queries(w);
   /* Set applier thread InnoDB priority */
   set_thd_tx_priority(thd, rli->get_thd_tx_priority());
+    /* Set write set related options */
+  set_thd_write_set_options(thd, rli->get_ignore_write_set_memory_limit(),
+                            rli->get_allow_drop_write_set());
 
   thd_manager->add_thd(thd);
   thd_added= true;
@@ -6149,7 +6272,7 @@ extern "C" void *handle_slave_worker(void *arg)
 
   mysql_mutex_unlock(&w->jobs_lock);
 
-  DBUG_ASSERT(thd->is_slave_error == 0);
+  assert(thd->is_slave_error == 0);
 
   w->stats_exec_time= w->stats_read_time= 0;
   set_timespec_nsec(&w->ts_exec[0], 0);
@@ -6174,18 +6297,18 @@ extern "C" void *handle_slave_worker(void *arg)
   {
     purge_cnt++;
     purge_size += job_item->data->common_header->data_written;
-    DBUG_ASSERT(job_item->data);
+    assert(job_item->data);
     delete job_item->data;
   }
 
-  DBUG_ASSERT(w->jobs.len == 0);
+  assert(w->jobs.len == 0);
 
   mysql_mutex_unlock(&w->jobs_lock);
 
   mysql_mutex_lock(&rli->pending_jobs_lock);
   rli->pending_jobs -= purge_cnt;
   rli->mts_pending_jobs_size -= purge_size;
-  DBUG_ASSERT(rli->mts_pending_jobs_size < rli->mts_pending_jobs_size_max);
+  assert(rli->mts_pending_jobs_size < rli->mts_pending_jobs_size_max);
 
   mysql_mutex_unlock(&rli->pending_jobs_lock);
 
@@ -6248,7 +6371,9 @@ extern "C" void *handle_slave_worker(void *arg)
   }
 
   my_thread_end();
-  ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   my_thread_exit(0);
   DBUG_RETURN(0); 
 }
@@ -6286,7 +6411,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
 
   DBUG_ENTER("mts_recovery_groups");
 
-  DBUG_ASSERT(rli->slave_parallel_workers == 0);
+  assert(rli->slave_parallel_workers == 0);
 
   /* 
      Although mts_recovery_groups() is reentrant it returns
@@ -6325,7 +6450,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
   };
 
   Format_description_log_event fdle(BINLOG_VERSION), *p_fdle= &fdle;
-  DBUG_ASSERT(p_fdle->is_valid());
+  assert(p_fdle->is_valid());
 
   /*
     Gathers information on valuable workers and stores it in 
@@ -6407,7 +6532,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
         while(!eof);
         continue;
   */
-  DBUG_ASSERT(!rli->recovery_groups_inited);
+  assert(!rli->recovery_groups_inited);
 
   if (!above_lwm_jobs.empty())
   {
@@ -6482,7 +6607,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
              (ev= Log_event::read_log_event(&log, 0, p_fdle,
                                             opt_slave_sql_verify_checksum)))
       {
-        DBUG_ASSERT(ev->is_valid());
+        assert(ev->is_valid());
 
         if (ev->get_type_code() == binary_log::FORMAT_DESCRIPTION_EVENT)
           p_fdle->common_footer->checksum_alg= ev->common_footer->checksum_alg;
@@ -6521,7 +6646,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
                                 ev->common_header->log_pos);
           if ((ret= mts_event_coord_cmp(&ev_coord, &w_last)) == 0)
           {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
             for (uint i= 0; i <= w->checkpoint_seqno; i++)
             {
               if (bitmap_is_set(&w->group_executed, i))
@@ -6547,7 +6672,7 @@ bool mts_recovery_groups(Relay_log_info *rli)
             not_reached_commit= false;
           }
           else
-            DBUG_ASSERT(ret < 0);
+            assert(ret < 0);
         }
         delete ev;
         ev= NULL;
@@ -6566,8 +6691,8 @@ bool mts_recovery_groups(Relay_log_info *rli)
       recovery_group_cnt : rli->mts_recovery_group_cnt);
   }
 
-  DBUG_ASSERT(!rli->recovery_groups_inited ||
-              rli->mts_recovery_group_cnt <= groups->n_bits);
+  assert(!rli->recovery_groups_inited ||
+         rli->mts_recovery_group_cnt <= groups->n_bits);
 
   goto end;
 err:
@@ -6605,25 +6730,33 @@ bool mts_checkpoint_routine(Relay_log_info *rli, ulonglong period,
   ulong cnt;
   bool error= FALSE;
   struct timespec curr_clock;
+  time_t ts=0;
 
   DBUG_ENTER("checkpoint_routine");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0))
   {
     if (!rli->gaq->count_done(rli))
       DBUG_RETURN(FALSE);
   }
+  DBUG_EXECUTE_IF("mts_checkpoint",
+                  {
+                    const char act[]=
+                      "now signal mts_checkpoint_start";
+                    assert(!debug_sync_set_action(rli->info_thd,
+                                                  STRING_WITH_LEN(act)));
+                 };);
 #endif
 
   /*
     rli->checkpoint_group can have two possible values due to
     two possible status of the last (being scheduled) group. 
   */
-  DBUG_ASSERT(!rli->gaq->full() ||
-              ((rli->checkpoint_seqno == rli->checkpoint_group -1 &&
-                rli->mts_group_status == Relay_log_info::MTS_IN_GROUP) ||
-               rli->checkpoint_seqno == rli->checkpoint_group));
+  assert(!rli->gaq->full() ||
+         ((rli->checkpoint_seqno == rli->checkpoint_group -1 &&
+           rli->mts_group_status == Relay_log_info::MTS_IN_GROUP) ||
+          rli->checkpoint_seqno == rli->checkpoint_group));
 
   /*
     Currently, the checkpoint routine is being called by the SQL Thread.
@@ -6651,7 +6784,7 @@ bool mts_checkpoint_routine(Relay_log_info *rli, ulonglong period,
 
     if (!is_mts_db_partitioned(rli))
       mysql_mutex_unlock(&rli->mts_gaq_LOCK);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0) &&
         cnt != opt_mts_checkpoint_period)
       sql_print_error("This an error cnt != mts_checkpoint_period");
@@ -6736,14 +6869,31 @@ bool mts_checkpoint_routine(Relay_log_info *rli, ulonglong period,
     cnt is zero. This value means that the checkpoint information
     will be completely reset.
   */
-  rli->reset_notified_checkpoint(cnt, rli->gaq->lwm.ts, need_data_lock);
 
+  /*
+    Update the rli->last_master_timestamp for reporting correct Seconds_behind_master.
+
+    If GAQ is empty, set it to zero.
+    Else, update it with the timestamp of the first job of the Slave_job_queue
+    which was assigned in the Log_event::get_slave_worker() function.
+  */
+  ts= rli->gaq->empty()
+    ? 0
+    : reinterpret_cast<Slave_job_group*>(rli->gaq->head_queue())->ts;
+  rli->reset_notified_checkpoint(cnt, ts, need_data_lock, true);
   /* end-of "Coordinator::"commit_positions" */
 
 end:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0))
     DBUG_SUICIDE();
+  DBUG_EXECUTE_IF("mts_checkpoint",
+                  {
+                    const char act[]=
+                      "now signal mts_checkpoint_end";
+                    assert(!debug_sync_set_action(rli->info_thd,
+                                                  STRING_WITH_LEN(act)));
+                  };);
 #endif
   set_timespec_nsec(&rli->last_clock, 0);
 
@@ -6784,7 +6934,7 @@ int slave_start_single_worker(Relay_log_info *rli, ulong i)
   }
 
   // We assume that workers are added in sequential order here.
-  DBUG_ASSERT(i == rli->workers.size());
+  assert(i == rli->workers.size());
   if (i >= rli->workers.size())
     rli->workers.resize(i+1);
   rli->workers[i]= w;
@@ -7018,9 +7168,9 @@ void slave_stop_workers(Relay_log_info *rli, bool *mts_inited)
     while (w->running_status != Slave_worker::NOT_RUNNING)
     {
       PSI_stage_info old_stage;
-      DBUG_ASSERT(w->running_status == Slave_worker::ERROR_LEAVING ||
-                  w->running_status == Slave_worker::STOP ||
-                  w->running_status == Slave_worker::STOP_ACCEPTED);
+      assert(w->running_status == Slave_worker::ERROR_LEAVING ||
+             w->running_status == Slave_worker::STOP ||
+             w->running_status == Slave_worker::STOP_ACCEPTED);
 
       thd->ENTER_COND(&w->jobs_cond, &w->jobs_lock,
                       &stage_slave_waiting_workers_to_exit, &old_stage);
@@ -7064,8 +7214,8 @@ void slave_stop_workers(Relay_log_info *rli, bool *mts_inited)
                       rli->mts_wq_no_underrun_cnt,
                       rli->mts_total_wait_worker_avail));
 
-  DBUG_ASSERT(rli->pending_jobs == 0);
-  DBUG_ASSERT(rli->mts_pending_jobs_size == 0);
+  assert(rli->pending_jobs == 0);
+  assert(rli->mts_pending_jobs_size == 0);
 
 end:
   rli->mts_group_status= Relay_log_info::MTS_NOT_IN_GROUP;
@@ -7108,6 +7258,7 @@ extern "C" void *handle_slave_sql(void *arg)
 
   Relay_log_info* rli = ((Master_info*)arg)->rli;
   const char *errmsg;
+  const char *error_string;
   bool mts_inited= false;
   Global_THD_manager *thd_manager= Global_THD_manager::get_instance();
   Commit_order_manager *commit_order_mngr= NULL;
@@ -7116,11 +7267,12 @@ extern "C" void *handle_slave_sql(void *arg)
   my_thread_init();
   DBUG_ENTER("handle_slave_sql");
 
-  DBUG_ASSERT(rli->inited);
+  assert(rli->inited);
   mysql_mutex_lock(&rli->run_lock);
-  DBUG_ASSERT(!rli->slave_running);
+  assert(!rli->slave_running);
   errmsg= 0;
-#ifndef DBUG_OFF
+  error_string= 0;
+#ifndef NDEBUG
   rli->events_until_exit = abort_slave_event_count;
 #endif
 
@@ -7146,6 +7298,17 @@ extern "C" void *handle_slave_sql(void *arg)
 
   rli->set_commit_order_manager(commit_order_mngr);
 
+  if (channel_map.is_group_replication_channel_name(rli->get_channel())) {
+    if (channel_map.is_group_replication_channel_name(rli->get_channel(),
+                                                      true)) {
+      thd->rpl_thd_ctx.set_rpl_channel_type(GR_APPLIER_CHANNEL);
+    } else {
+      thd->rpl_thd_ctx.set_rpl_channel_type(GR_RECOVERY_CHANNEL);
+    }
+  } else {
+    thd->rpl_thd_ctx.set_rpl_channel_type(RPL_STANDARD_CHANNEL);
+  }
+
   mysql_mutex_unlock(&rli->info_thd_lock);
 
   /* Inform waiting threads that slave has started */
@@ -7153,6 +7316,7 @@ extern "C" void *handle_slave_sql(void *arg)
   rli->slave_running = 1;
   rli->reported_unsafe_warning= false;
   rli->sql_thread_kill_accepted= false;
+  rli->last_event_start_time = 0;
 
   if (init_slave_thread(thd, SLAVE_THD_SQL))
   {
@@ -7171,6 +7335,9 @@ extern "C" void *handle_slave_sql(void *arg)
   set_thd_in_use_temporary_tables(rli);   // (re)set sql_thd in use for saved temp tables
   /* Set applier thread InnoDB priority */
   set_thd_tx_priority(thd, rli->get_thd_tx_priority());
+  /* Set write set related options */
+  set_thd_write_set_options(thd, rli->get_ignore_write_set_memory_limit(),
+                            rli->get_allow_drop_write_set());
 
   thd_manager->add_thd(thd);
   thd_added= true;
@@ -7243,8 +7410,8 @@ extern "C" void *handle_slave_sql(void *arg)
     "If a crash happens this configuration does not guarantee that the relay "
     "log info will be consistent");
 
-  mysql_mutex_unlock(&rli->run_lock);
   mysql_cond_broadcast(&rli->start_cond);
+  mysql_mutex_unlock(&rli->run_lock);
 
   DEBUG_SYNC(thd, "after_start_slave");
 
@@ -7265,13 +7432,13 @@ extern "C" void *handle_slave_sql(void *arg)
     goto err;
   }
   THD_CHECK_SENTRY(thd);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     char llbuf1[22], llbuf2[22];
     DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%s rli->event_relay_log_pos=%s",
                         llstr(my_b_tell(rli->cur_log),llbuf1),
                         llstr(rli->get_event_relay_log_pos(),llbuf2)));
-    DBUG_ASSERT(rli->get_event_relay_log_pos() >= BIN_LOG_HEADER_SIZE);
+    assert(rli->get_event_relay_log_pos() >= BIN_LOG_HEADER_SIZE);
     /*
       Wonder if this is correct. I (Guilhem) wonder if my_b_tell() returns the
       correct position when it's called just after my_b_seek() (the questionable
@@ -7282,13 +7449,13 @@ extern "C" void *handle_slave_sql(void *arg)
       fails (as we my_b_seek(rli->event_relay_log_pos) at the very end of
       init_relay_log_pos() called above). Maybe the assertion would be
       meaningful if we held rli->data_lock between the my_b_seek() and the
-      DBUG_ASSERT().
+      assert().
 
-      DBUG_ASSERT(my_b_tell(rli->cur_log) == rli->get_event_relay_log_pos());
+      assert(my_b_tell(rli->cur_log) == rli->get_event_relay_log_pos());
     */
   }
 #endif
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
   /* engine specific hook, to be made generic */
@@ -7357,7 +7524,7 @@ extern "C" void *handle_slave_sql(void *arg)
   while (!sql_slave_killed(thd,rli))
   {
     THD_STAGE_INFO(thd, stage_reading_event_from_the_relay_log);
-    DBUG_ASSERT(rli->info_thd == thd);
+    assert(rli->info_thd == thd);
     THD_CHECK_SENTRY(thd);
 
     if (saved_skip && rli->slave_skip_counter == 0)
@@ -7434,29 +7601,18 @@ extern "C" void *handle_slave_sql(void *arg)
                             err->message_text(), err->mysql_errno());
         }
         if (udf_error)
-          sql_print_error("Error loading user-defined library, slave SQL "
-            "thread aborted. Install the missing library, and restart the "
-            "slave SQL thread with \"SLAVE START\". We stopped at log '%s' "
-            "position %s", rli->get_rpl_log_name(),
-            llstr(rli->get_group_master_log_pos(), llbuff));
+          error_string= "Error loading user-defined library, slave SQL "
+            "thread aborted. Install the missing library, and restart the"
+            " slave SQL thread with \"SLAVE START\".";
         else
-          sql_print_error("\
-Error running query, slave SQL thread aborted. Fix the problem, and restart \
-the slave SQL thread with \"SLAVE START\". We stopped at log \
-'%s' position %s", rli->get_rpl_log_name(),
-llstr(rli->get_group_master_log_pos(), llbuff));
+          error_string= "Error running query, slave SQL thread aborted."
+            " Fix the problem, and restart the slave SQL thread with "
+            "\"SLAVE START\".";
       }
       goto err;
     }
   }
 
-  /* Thread stopped. Print the current replication position to the log */
-  sql_print_information("Slave SQL thread%s exiting, replication stopped in log "
-                        "'%s' at position %s",
-                        rli->get_for_channel_str(),
-                        rli->get_rpl_log_name(),
-                        llstr(rli->get_group_master_log_pos(), llbuff));
-
  err:
   /* At this point the SQL thread will not try to work anymore. */
   rli->is_stopping.atomic_set(1);
@@ -7465,6 +7621,17 @@ llstr(rli->get_group_master_log_pos(), llbuff));
                    rli->is_error() || !rli->sql_thread_kill_accepted));
 
   slave_stop_workers(rli, &mts_inited); // stopping worker pool
+  /* Thread stopped. Print the current replication position to the log */
+  if (error_string)
+    sql_print_error("%s We stopped at log '%s' position %s.", error_string,
+                    rli->get_rpl_log_name(),
+                    llstr(rli->get_group_master_log_pos(), llbuff));
+  else
+    sql_print_information("Slave SQL thread%s exiting, replication stopped in log "
+			  "'%s' at position %s", rli->get_for_channel_str(),
+			  rli->get_rpl_log_name(),
+			  llstr(rli->get_group_master_log_pos(), llbuff));
+
   delete rli->current_mts_submode;
   rli->current_mts_submode= 0;
   rli->clear_mts_recovery_groups();
@@ -7494,24 +7661,24 @@ llstr(rli->get_group_master_log_pos(), llbuff));
                   {
                     const char act[]= "now SIGNAL reached_stopping_sql_thread "
                                       "WAIT_FOR continue_to_stop_sql_thread";
-                    DBUG_ASSERT(!debug_sync_set_action(thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   THD_STAGE_INFO(thd, stage_waiting_for_slave_mutex_on_exit);
   mysql_mutex_lock(&rli->run_lock);
   /* We need data_lock, at least to wake up any waiting master_pos_wait() */
   mysql_mutex_lock(&rli->data_lock);
-  DBUG_ASSERT(rli->slave_running == 1); // tracking buffer overrun
+  assert(rli->slave_running == 1); // tracking buffer overrun
   /* When master_pos_wait() wakes up it will check this and terminate */
   rli->slave_running= 0;
   rli->is_stopping.atomic_set(0);
   /* Forget the relay log's format */
   rli->set_rli_description_event(NULL);
   /* Wake up master_pos_wait() */
-  mysql_mutex_unlock(&rli->data_lock);
   DBUG_PRINT("info",("Signaling possibly waiting master_pos_wait() functions"));
   mysql_cond_broadcast(&rli->data_cond);
+  mysql_mutex_unlock(&rli->data_lock);
   rli->ignore_log_space_limit= 0; /* don't need any lock */
   /* we die so won't remember charset - re-update them on next thread start */
   rli->cached_charset_invalidate();
@@ -7524,7 +7691,7 @@ llstr(rli->get_group_master_log_pos(), llbuff));
   thd->temporary_tables = 0; // remove tempation from destructor to close them
   // destructor will not free it, because we are weird
   thd->get_protocol_classic()->end_net();
-  DBUG_ASSERT(rli->info_thd == thd);
+  assert(rli->info_thd == thd);
   THD_CHECK_SENTRY(thd);
   mysql_mutex_lock(&rli->info_thd_lock);
   rli->info_thd= NULL;
@@ -7537,6 +7704,15 @@ llstr(rli->get_group_master_log_pos(), llbuff));
   mysql_mutex_unlock(&rli->info_thd_lock);
   set_thd_in_use_temporary_tables(rli);  // (re)set info_thd in use for saved temp tables
 
+ /*
+  Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)
+  is important. Otherwise a killer_thread can execute between the calls and
+  delete the mi structure leading to a crash! (see BUG#25306 for details)
+ */
+  mysql_cond_broadcast(&rli->stop_cond);
+  DBUG_EXECUTE_IF("simulate_slave_delay_at_terminate_bug38694", sleep(5););
+  mysql_mutex_unlock(&rli->run_lock);  // tell the world we are done
+
   thd->release_resources();
   THD_CHECK_SENTRY(thd);
   if (thd_added)
@@ -7553,18 +7729,11 @@ llstr(rli->get_group_master_log_pos(), llbuff));
   */
   delete thd;
 
- /*
-  Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)
-  is important. Otherwise a killer_thread can execute between the calls and
-  delete the mi structure leading to a crash! (see BUG#25306 for details)
- */ 
-  mysql_cond_broadcast(&rli->stop_cond);
-  DBUG_EXECUTE_IF("simulate_slave_delay_at_terminate_bug38694", sleep(5););
-  mysql_mutex_unlock(&rli->run_lock);  // tell the world we are done
-
   DBUG_LEAVE;                            // Must match DBUG_ENTER()
   my_thread_end();
-  ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   my_thread_exit(0);
   return 0;                             // Avoid compiler warnings
 }
@@ -7593,7 +7762,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
     skip_load_data_infile(net);
     DBUG_RETURN(0);
   }
-  DBUG_ASSERT(cev->inited_from_old);
+  assert(cev->inited_from_old);
   thd->file_id = cev->file_id = mi->file_id++;
   thd->server_id = cev->server_id;
   cev_not_written = 1;
@@ -7642,7 +7811,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
                      "error writing Exec_load event to relay log");
           goto err;
         }
-        mi->rli->relay_log.harvest_bytes_written(&mi->rli->log_space_total);
+        mi->rli->relay_log.harvest_bytes_written(mi->rli, true/*need_log_space_lock=true*/);
         break;
       }
       if (unlikely(cev_not_written))
@@ -7657,7 +7826,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
           goto err;
         }
         cev_not_written=0;
-        mi->rli->relay_log.harvest_bytes_written(&mi->rli->log_space_total);
+        mi->rli->relay_log.harvest_bytes_written(mi->rli, true/*need_log_space_lock=true*/);
       }
       else
       {
@@ -7671,7 +7840,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev)
                      "error writing Append_block event to relay log");
           goto err;
         }
-        mi->rli->relay_log.harvest_bytes_written(&mi->rli->log_space_total);
+        mi->rli->relay_log.harvest_bytes_written(mi->rli, true/*need_log_space_lock=true*/);
       }
     }
   }
@@ -7711,7 +7880,7 @@ static int process_io_rotate(Master_info *mi, Rotate_log_event *rev)
   mi->set_master_log_pos(rev->pos);
   DBUG_PRINT("info", ("new (master_log_name, master_log_pos): ('%s', %lu)",
                       mi->get_master_log_name(), (ulong) mi->get_master_log_pos()));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     If we do not do this, we will be getting the first
     rotate event forever, so we need to not disconnect after one.
@@ -7730,8 +7899,8 @@ static int process_io_rotate(Master_info *mi, Rotate_log_event *rev)
   Format_description_log_event *old_fdle= mi->get_mi_description_event();
   if (old_fdle->binlog_version >= 4)
   {
-    DBUG_ASSERT(old_fdle->common_footer->checksum_alg ==
-                mi->rli->relay_log.relay_log_checksum_alg);
+    assert(old_fdle->common_footer->checksum_alg ==
+           mi->rli->relay_log.relay_log_checksum_alg);
     Format_description_log_event *new_fdle= new
       Format_description_log_event(3);
     new_fdle->common_footer->checksum_alg=
@@ -7742,7 +7911,7 @@ static int process_io_rotate(Master_info *mi, Rotate_log_event *rev)
     Rotate the relay log makes binlog format detection easier (at next slave
     start or mysqlbinlog)
   */
-  int ret= rotate_relay_log(mi);
+  int ret= rotate_relay_log(mi, true/*need_log_space_lock=true*/);
   DBUG_RETURN(ret);
 }
 
@@ -7830,7 +7999,7 @@ static int queue_binlog_ver_1_event(Master_info *mi, const char *buf,
     */
   {
     /* We come here when and only when tmp_buf != 0 */
-    DBUG_ASSERT(tmp_buf != 0);
+    assert(tmp_buf != 0);
     inc_pos=event_len;
     ev->common_header->log_pos+= inc_pos;
     int error = process_io_create_file(mi,(Create_file_log_event*)ev);
@@ -7858,7 +8027,7 @@ static int queue_binlog_ver_1_event(Master_info *mi, const char *buf,
       delete ev;
       DBUG_RETURN(1);
     }
-    rli->relay_log.harvest_bytes_written(&rli->log_space_total);
+    rli->relay_log.harvest_bytes_written(rli, true/*need_log_space_lock=true*/);
   }
   delete ev;
   mi->set_master_log_pos(mi->get_master_log_pos() + inc_pos);
@@ -7916,7 +8085,7 @@ static int queue_binlog_ver_3_event(Master_info *mi, const char *buf,
     delete ev;
     DBUG_RETURN(1);
   }
-  rli->relay_log.harvest_bytes_written(&rli->log_space_total);
+  rli->relay_log.harvest_bytes_written(rli, true/*need_log_space_lock=true*/);
   delete ev;
   mi->set_master_log_pos(mi->get_master_log_pos() + inc_pos);
 err:
@@ -8000,9 +8169,9 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
   Gtid gtid= { 0, 0 };
   Log_event_type event_type= (Log_event_type)buf[EVENT_TYPE_OFFSET];
 
-  DBUG_ASSERT(checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_OFF || 
-              checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF || 
-              checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_CRC32); 
+  assert(checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_OFF || 
+         checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_UNDEF || 
+         checksum_alg == binary_log::BINLOG_CHECKSUM_ALG_CRC32); 
 
   DBUG_ENTER("queue_event");
 
@@ -8014,8 +8183,8 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
                   {
                     const char act[]= "now SIGNAL reached_queuing_event "
                                       "WAIT_FOR continue_queuing_event";
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
 
   /*
@@ -8038,12 +8207,12 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
   }
 
   // does not hold always because of old binlog can work with NM 
-  // DBUG_ASSERT(checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF);
+  // assert(checksum_alg != BINLOG_CHECKSUM_ALG_UNDEF);
 
   // should hold unless manipulations with RL. Tests that do that
   // will have to refine the clause.
-  DBUG_ASSERT(mi->rli->relay_log.relay_log_checksum_alg !=
-              binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(mi->rli->relay_log.relay_log_checksum_alg !=
+         binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
               
   // Emulate the network corruption
   DBUG_EXECUTE_IF("corrupt_queue_event",
@@ -8069,7 +8238,7 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
   }
 
   mysql_mutex_lock(&mi->data_lock);
-  DBUG_ASSERT(lock_count == 0);
+  assert(lock_count == 0);
   lock_count= 1;
 
   if (mi->get_mi_description_event() == NULL)
@@ -8125,9 +8294,11 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
       a warning message. We are taking care of avoiding transaction boundary
       issues, but it can happen.
 
-      Transaction boundary errors might happen only because of bad master
+      Transaction boundary errors might happen mostly because of bad master
       positioning in 'CHANGE MASTER TO' (or bad manipulation of master.info)
-      when GTID auto positioning is off.
+      when GTID auto positioning is off. Errors can also happen when using
+      cross-version replication, replicating from a master that supports more
+      event types than this slave.
 
       The IO thread will keep working and queuing events regardless of the
       transaction parser error, but we will throw another warning message to
@@ -8138,8 +8309,6 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
       "An unexpected event sequence was detected by the IO thread while "
       "queuing the event received from master '%s' binary log file, at "
       "position %llu.", mi->get_master_log_name(), mi->get_master_log_pos());
-
-    DBUG_ASSERT(!mi->is_auto_position());
   }
 
   if (mi->get_mi_description_event()->binlog_version < 4 &&
@@ -8205,12 +8374,12 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
       rot_crc= checksum_crc32(rot_crc, (const uchar *) rot_buf,
                            event_len - BINLOG_CHECKSUM_LEN);
       int4store(&rot_buf[event_len - BINLOG_CHECKSUM_LEN], rot_crc);
-      DBUG_ASSERT(event_len == uint4korr(&rot_buf[EVENT_LEN_OFFSET]));
-      DBUG_ASSERT(mi->get_mi_description_event()->common_footer->checksum_alg ==
-                  mi->rli->relay_log.relay_log_checksum_alg);
+      assert(event_len == uint4korr(&rot_buf[EVENT_LEN_OFFSET]));
+      assert(mi->get_mi_description_event()->common_footer->checksum_alg ==
+             mi->rli->relay_log.relay_log_checksum_alg);
       /* the first one */
-      DBUG_ASSERT(mi->checksum_alg_before_fd !=
-                  binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+      assert(mi->checksum_alg_before_fd !=
+             binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
       save_buf= (char *) buf;
       buf= rot_buf;
     }
@@ -8229,12 +8398,12 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
         int4store(&rot_buf[EVENT_LEN_OFFSET],
                   uint4korr(rot_buf + EVENT_LEN_OFFSET) -
                   BINLOG_CHECKSUM_LEN);
-        DBUG_ASSERT(event_len == uint4korr(&rot_buf[EVENT_LEN_OFFSET]));
-        DBUG_ASSERT(mi->get_mi_description_event()->common_footer->checksum_alg ==
-                    mi->rli->relay_log.relay_log_checksum_alg);
+        assert(event_len == uint4korr(&rot_buf[EVENT_LEN_OFFSET]));
+        assert(mi->get_mi_description_event()->common_footer->checksum_alg ==
+               mi->rli->relay_log.relay_log_checksum_alg);
         /* the first one */
-        DBUG_ASSERT(mi->checksum_alg_before_fd !=
-                    binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+        assert(mi->checksum_alg_before_fd !=
+               binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
         save_buf= (char *) buf;
         buf= rot_buf;
       }
@@ -8338,8 +8507,13 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
        hb.common_header->log_pos &&  mi->get_master_log_name() != NULL)
     {
 
-      DBUG_ASSERT(memcmp(const_cast<char*>(mi->get_master_log_name()),
-                         hb.get_log_ident(), hb.get_ident_len()) == 0);
+      assert(memcmp(const_cast<char*>(mi->get_master_log_name()),
+                    hb.get_log_ident(), hb.get_ident_len()) == 0);
+
+      DBUG_EXECUTE_IF("reached_heart_beat_queue_event", {
+                      const char act[] = "now SIGNAL check_slave_master_info WAIT_FOR proceed_write_rotate";
+                      assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                      };);
 
       mi->set_master_log_pos(hb.common_header->log_pos);
 
@@ -8351,7 +8525,8 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
              FN_REFLEN);
       rli->ign_master_log_pos_end = mi->get_master_log_pos();
 
-      if (write_ignored_events_info_to_relay_log(mi->info_thd, mi))
+      if (write_ignored_events_info_to_relay_log(mi->info_thd, mi,
+                                                 false/* force_flush_mi_info */))
         goto end;
     }
 
@@ -8400,7 +8575,8 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
     memcpy(rli->ign_master_log_name_end, mi->get_master_log_name(), FN_REFLEN);
     rli->ign_master_log_pos_end= mi->get_master_log_pos();
 
-    if (write_ignored_events_info_to_relay_log(mi->info_thd, mi))
+    if (write_ignored_events_info_to_relay_log(mi->info_thd, mi,
+                                               true/* force_flush_mi_info */))
       goto err;
 
     goto end;
@@ -8432,6 +8608,11 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
                            checksum_alg != binary_log::BINLOG_CHECKSUM_ALG_OFF ?
                            event_len - BINLOG_CHECKSUM_LEN : event_len,
                            mi->get_mi_description_event());
+    if (!gtid_ev.is_valid())
+    {
+      global_sid_lock->unlock();
+      goto err;
+    }
     gtid.sidno= gtid_ev.get_sidno(false);
     global_sid_lock->unlock();
     if (gtid.sidno < 0)
@@ -8512,7 +8693,7 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
   */
 
   mysql_mutex_lock(log_lock);
-  DBUG_ASSERT(lock_count == 1);
+  assert(lock_count == 1);
   lock_count= 2;
 
   s_id= uint4korr(buf + SERVER_ID_OFFSET);
@@ -8562,7 +8743,7 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
     {
       mi->set_master_log_pos(mi->get_master_log_pos() + inc_pos);
       memcpy(rli->ign_master_log_name_end, mi->get_master_log_name(), FN_REFLEN);
-      DBUG_ASSERT(rli->ign_master_log_name_end[0]);
+      assert(rli->ign_master_log_name_end[0]);
       rli->ign_master_log_pos_end= mi->get_master_log_pos();
     }
     rli->relay_log.signal_update(); // the slave SQL thread needs to re-check
@@ -8577,7 +8758,7 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
     {
       mi->set_master_log_pos(mi->get_master_log_pos() + inc_pos);
       DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->get_master_log_pos()));
-      rli->relay_log.harvest_bytes_written(&rli->log_space_total);
+      rli->relay_log.harvest_bytes_written(rli, true/*need_log_space_lock=true*/);
 
       /*
         If this event is GTID_LOG_EVENT we store its GTID to add to the
@@ -8596,7 +8777,7 @@ bool queue_event(Master_info* mi,const char* buf, ulong event_len)
         */
       if (event_type == binary_log::ANONYMOUS_GTID_LOG_EVENT)
       {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         if (!mi->get_last_gtid_queued()->is_empty())
         {
           DBUG_PRINT("info", ("Discarding Gtid(%d, %lld) as the transaction "
@@ -8700,7 +8881,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
   size_t password_size= sizeof(password);
   DBUG_ENTER("connect_to_master");
   set_slave_max_allowed_packet(thd, mysql);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   mi->events_until_exit = disconnect_slave_event_count;
 #endif
   ulong client_flag= CLIENT_REMEMBER_OPTIONS;
@@ -8728,10 +8909,6 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
                   mi->ssl_ca[0]?mi->ssl_ca:0,
                   mi->ssl_capath[0]?mi->ssl_capath:0,
                   mi->ssl_cipher[0]?mi->ssl_cipher:0);
-#ifdef HAVE_YASSL
-    mi->ssl_crl[0]= '\0';
-    mi->ssl_crlpath[0]= '\0';
-#endif
     mysql_options(mysql, MYSQL_OPT_SSL_CRL,
                   mi->ssl_crl[0] ? mi->ssl_crl : 0);
     mysql_options(mysql, MYSQL_OPT_TLS_VERSION,
@@ -8899,8 +9076,8 @@ static int safe_reconnect(THD* thd, MYSQL* mysql, Master_info* mi,
 static IO_CACHE *reopen_relay_log(Relay_log_info *rli, const char **errmsg)
 {
   DBUG_ENTER("reopen_relay_log");
-  DBUG_ASSERT(rli->cur_log != &rli->cache_buf);
-  DBUG_ASSERT(rli->cur_log_fd == -1);
+  assert(rli->cur_log != &rli->cache_buf);
+  assert(rli->cur_log_fd == -1);
 
   IO_CACHE *cur_log = rli->cur_log=&rli->cache_buf;
   if ((rli->cur_log_fd=open_binlog_file(cur_log,rli->get_event_relay_log_name(),
@@ -8937,9 +9114,9 @@ static Log_event* next_event(Relay_log_info* rli)
   THD* thd = rli->info_thd;
   DBUG_ENTER("next_event");
 
-  DBUG_ASSERT(thd != 0);
+  assert(thd != 0);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (abort_slave_event_count && !rli->events_until_exit--)
     DBUG_RETURN(0);
 #endif
@@ -8970,7 +9147,7 @@ static Log_event* next_event(Relay_log_info* rli)
     if ((hot_log = (cur_log != &rli->cache_buf)) ||
         DBUG_EVALUATE_IF("force_sql_thread_error", 1, 0))
     {
-      DBUG_ASSERT(rli->cur_log_fd == -1); // foreign descriptor
+      assert(rli->cur_log_fd == -1); // foreign descriptor
       mysql_mutex_lock(log_lock);
 
       /*
@@ -9000,7 +9177,7 @@ static Log_event* next_event(Relay_log_info* rli)
         mysql_mutex_unlock(log_lock);
       goto err;
     }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       DBUG_PRINT("info", ("assertion skip %lu file pos %lu event relay log pos %lu file %s\n",
         (ulong) rli->slave_skip_counter, (ulong) my_b_tell(cur_log),
@@ -9013,8 +9190,8 @@ static Log_event* next_event(Relay_log_info* rli)
                           llstr(my_b_tell(cur_log),llbuf1),
                           llstr(rli->get_event_relay_log_pos(),llbuf2)));
 
-      DBUG_ASSERT(my_b_tell(cur_log) >= BIN_LOG_HEADER_SIZE);
-      DBUG_ASSERT(my_b_tell(cur_log) == rli->get_event_relay_log_pos() || rli->is_parallel_exec());
+      assert(my_b_tell(cur_log) >= BIN_LOG_HEADER_SIZE);
+      assert(my_b_tell(cur_log) == rli->get_event_relay_log_pos() || rli->is_parallel_exec());
 
       DBUG_PRINT("info", ("next_event group master %s %lu group relay %s %lu event %s %lu\n",
         rli->get_group_master_log_name(),
@@ -9042,7 +9219,7 @@ static Log_event* next_event(Relay_log_info* rli)
                                        rli->get_rli_description_event(),
                                        opt_slave_sql_verify_checksum)))
     {
-      DBUG_ASSERT(thd==rli->info_thd);
+      assert(thd==rli->info_thd);
       /*
         read it while we have a lock, to avoid a mutex lock in
         inc_event_relay_log_pos()
@@ -9072,14 +9249,14 @@ static Log_event* next_event(Relay_log_info* rli)
           the checkpoint routine must be periodically invoked.
         */
         (void) mts_checkpoint_routine(rli, period, force, true/*need_data_lock=true*/); // TODO: ALFRANIO ERROR
-        DBUG_ASSERT(!force ||
-                    (force && (rli->checkpoint_seqno <= (rli->checkpoint_group - 1))) ||
-                    sql_slave_killed(thd, rli));
+        assert(!force ||
+               (force && (rli->checkpoint_seqno <= (rli->checkpoint_group - 1))) ||
+               sql_slave_killed(thd, rli));
         mysql_mutex_lock(&rli->data_lock);
       }
       DBUG_RETURN(ev);
     }
-    DBUG_ASSERT(thd==rli->info_thd);
+    assert(thd==rli->info_thd);
     if (opt_reckless_slave)                     // For mysql-test
       cur_log->error = 0;
     if (cur_log->error < 0)
@@ -9142,8 +9319,8 @@ static Log_event* next_event(Relay_log_info* rli)
         if (!rli->is_parallel_exec())
           rli->last_master_timestamp= 0;
 
-        DBUG_ASSERT(rli->relay_log.get_open_count() ==
-                    rli->cur_log_old_open_count);
+        assert(rli->relay_log.get_open_count() ==
+               rli->cur_log_old_open_count);
 
         if (rli->ign_master_log_name_end[0])
         {
@@ -9258,9 +9435,6 @@ static Log_event* next_event(Relay_log_info* rli)
             */
             (void) mts_checkpoint_routine(rli, period, false, true/*need_data_lock=true*/); // TODO: ALFRANIO ERROR
             mysql_mutex_lock(log_lock);
-            // More to the empty relay-log all assigned events done so reset it.
-            if (rli->gaq->empty())
-              rli->last_master_timestamp= 0;
 
             if (DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0))
               period= 10000000ULL;
@@ -9285,7 +9459,7 @@ static Log_event* next_event(Relay_log_info* rli)
         cases separately after doing some common initialization
       */
       end_io_cache(cur_log);
-      DBUG_ASSERT(rli->cur_log_fd >= 0);
+      assert(rli->cur_log_fd >= 0);
       mysql_file_close(rli->cur_log_fd, MYF(MY_WME));
       rli->cur_log_fd = -1;
 
@@ -9371,7 +9545,7 @@ static Log_event* next_event(Relay_log_info* rli)
 #endif
         rli->cur_log= cur_log= rli->relay_log.get_log_file();
         rli->cur_log_old_open_count= rli->relay_log.get_open_count();
-        DBUG_ASSERT(rli->cur_log_fd == -1);
+        assert(rli->cur_log_fd == -1);
 
         /*
            When the SQL thread is [stopped and] (re)started the
@@ -9499,7 +9673,7 @@ static Log_event* next_event(Relay_log_info* rli)
   is void).
 */
 
-int rotate_relay_log(Master_info* mi)
+int rotate_relay_log(Master_info* mi, bool need_log_space_lock)
 {
   DBUG_ENTER("rotate_relay_log");
 
@@ -9537,7 +9711,7 @@ int rotate_relay_log(Master_info* mi)
     If the log is closed, then this will just harvest the last writes, probably
     0 as they probably have been harvested.
   */
-  rli->relay_log.harvest_bytes_written(&rli->log_space_total);
+  rli->relay_log.harvest_bytes_written(rli, need_log_space_lock);
 end:
   DBUG_RETURN(error);
 }
@@ -9560,7 +9734,7 @@ bool flush_relay_logs(Master_info *mi)
   if (mi)
   {
     mysql_mutex_lock(&mi->data_lock);
-    if (rotate_relay_log(mi))
+    if (rotate_relay_log(mi, true/*need_log_space_lock=true*/))
       error= true;
     mysql_mutex_unlock(&mi->data_lock);
   }
@@ -9703,7 +9877,7 @@ bool rpl_master_has_bug(const Relay_log_info *rli, uint bug_id, bool report,
   const uchar *master_ver=
     rli->get_rli_description_event()->server_version_split;
 
-  DBUG_ASSERT(sizeof(rli->get_rli_description_event()->server_version_split) == 3);
+  assert(sizeof(rli->get_rli_description_event()->server_version_split) == 3);
 
   for (uint i= 0;
        i < sizeof(versions_for_all_bugs)/sizeof(*versions_for_all_bugs);i++)
@@ -9837,21 +10011,18 @@ bool start_slave(THD* thd,
 
   mi->channel_wrlock();
 
+#if !defined(EMBEDDED_LIBRARY)
   if (connection_param->user ||
       connection_param->password)
   {
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-    if (!thd->get_protocol()->get_ssl())
+    if (!thd->get_ssl())
+    {
       push_warning(thd, Sql_condition::SL_NOTE,
                    ER_INSECURE_PLAIN_TEXT,
                    ER(ER_INSECURE_PLAIN_TEXT));
-#endif
-#if !defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-    push_warning(thd, Sql_condition::SL_NOTE,
-                 ER_INSECURE_PLAIN_TEXT,
-                 ER(ER_INSECURE_PLAIN_TEXT));
-#endif
+    }
   }
+#endif
 
   lock_slave_threads(mi);  // this allows us to cleanly read slave_running
   // Get a mask of _stopped_ threads
@@ -9927,7 +10098,7 @@ bool start_slave(THD* thd,
           else
             mi->rli->channel_mts_submode = MTS_PARALLEL_TYPE_LOGICAL_CLOCK;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         if (!DBUG_EVALUATE_IF("check_slave_debug_group", 1, 0))
 #endif
           mi->rli->checkpoint_group= opt_mts_checkpoint_group;
@@ -10239,7 +10410,8 @@ int reset_slave(THD *thd)
 
   Master_info *mi= 0;
   int result= 0;
-  mi_map::iterator it;
+  mi_map::iterator it, gr_channel_map_it;
+
   if (thd->lex->reset_slave_info.all)
   {
     /* First do reset_slave for default channel */
@@ -10256,11 +10428,31 @@ int reset_slave(THD *thd)
         continue;
       }
       mi= it->second;
-      DBUG_ASSERT(mi);
+      assert(mi);
       if ((result= reset_slave(thd, mi, thd->lex->reset_slave_info.all)))
         break;
       it= channel_map.begin();
     }
+    /* RESET group replication specific channels */
+    gr_channel_map_it= channel_map.begin(GROUP_REPLICATION_CHANNEL);
+    while (gr_channel_map_it != channel_map.end(GROUP_REPLICATION_CHANNEL))
+    {
+      mi= gr_channel_map_it->second;
+      assert(mi);
+      /*
+        We cannot RESET a group replication channel while the group
+        replication is running.
+      */
+      if (is_group_replication_running())
+      {
+        my_error(ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED, MYF(0),
+                 "RESET SLAVE ALL FOR CHANNEL", mi->get_channel());
+        DBUG_RETURN(1);
+      }
+      if ((result= reset_slave(thd, mi, thd->lex->reset_slave_info.all)))
+        break;
+      gr_channel_map_it= channel_map.begin(GROUP_REPLICATION_CHANNEL);
+    }
   }
   else
   {
@@ -10268,11 +10460,32 @@ int reset_slave(THD *thd)
     while (it != channel_map.end())
     {
       mi= it->second;
-      DBUG_ASSERT(mi);
+      assert(mi);
       if ((result= reset_slave(thd, mi, thd->lex->reset_slave_info.all)))
         break;
       it++;
     }
+    /*
+      RESET group replication specific channels.
+
+      We cannot RESET a group replication channel while the group
+      replication is running.
+    */
+    gr_channel_map_it= channel_map.begin(GROUP_REPLICATION_CHANNEL);
+    while (gr_channel_map_it != channel_map.end(GROUP_REPLICATION_CHANNEL))
+    {
+      mi= gr_channel_map_it->second;
+      assert(mi);
+      if (is_group_replication_running())
+      {
+        my_error(ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED, MYF(0),
+                 "RESET SLAVE FOR CHANNEL", mi->get_channel());
+        DBUG_RETURN(1);
+      }
+      if ((result= reset_slave(thd, mi, thd->lex->reset_slave_info.all)))
+        break;
+      gr_channel_map_it++;
+    }
   }
   DBUG_RETURN(result);
 
@@ -10283,6 +10496,10 @@ int reset_slave(THD *thd)
   Execute a RESET SLAVE statement.
   Locks slave threads and unlocks the slave threads after executing
   reset slave.
+  The method also takes the mi->channel_wrlock; if this {mi} object
+  is deleted (when the parameter reset_all is true) its destructor unlocks
+  the lock. In case of error, the method shall always unlock the
+  mi channel lock.
 
   @param thd        Pointer to THD object of the client thread executing the
                     statement.
@@ -10300,7 +10517,8 @@ int reset_slave(THD *thd, Master_info* mi, bool reset_all)
   const char* errmsg= "Unknown error occured while reseting slave";
   DBUG_ENTER("reset_slave");
 
-  bool no_init_after_delete= false;
+  bool is_default_channel= strcmp(mi->get_channel(),
+                                  channel_map.get_default_channel()) == 0;
 
   /*
     RESET SLAVE command should ignore 'read-only' and 'super_read_only'
@@ -10325,18 +10543,10 @@ int reset_slave(THD *thd, Master_info* mi, bool reset_all)
 
 
   // delete relay logs, clear relay log coordinates
-
-  /*
-     For named channels, we have to delete the index and log files
-     and not init them
-  */
-  if (strcmp(mi->get_channel(), channel_map.get_default_channel()))
-    no_init_after_delete= true;
-
   if ((error= mi->rli->purge_relay_logs(thd,
                                         1 /* just reset */,
                                         &errmsg,
-                                        no_init_after_delete)))
+                                        reset_all && !is_default_channel)))
   {
     my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg);
     error= ER_RELAY_LOG_FAIL;
@@ -10346,7 +10556,7 @@ int reset_slave(THD *thd, Master_info* mi, bool reset_all)
   }
 
   /* Clear master's log coordinates and associated information */
-  DBUG_ASSERT(!mi->rli || !mi->rli->slave_running); // none writes in rli table
+  assert(!mi->rli || !mi->rli->slave_running); // none writes in rli table
   if (remove_info(mi))
   {
     error= ER_UNKNOWN_ERROR;
@@ -10356,7 +10566,25 @@ int reset_slave(THD *thd, Master_info* mi, bool reset_all)
     goto err;
   }
   if (!reset_all)
+  {
     mi->init_master_log_pos();
+    mi->master_uuid[0]= 0;
+    /*
+      This shall prevent the channel to vanish if server is restarted
+      after this RESET SLAVE and before the channel be started.
+    */
+    if (mi->reset &&
+        opt_mi_repository_id == INFO_REPOSITORY_TABLE &&
+        opt_rli_repository_id == INFO_REPOSITORY_TABLE &&
+        mi->flush_info(true))
+    {
+      error= ER_MASTER_INFO;
+      my_error(ER_MASTER_INFO, MYF(0));
+      unlock_slave_threads(mi);
+      mi->channel_unlock();
+      goto err;
+    }
+  }
 
   unlock_slave_threads(mi);
 
@@ -10371,7 +10599,14 @@ int reset_slave(THD *thd, Master_info* mi, bool reset_all)
   {
     bool is_default= !strcmp(mi->get_channel(), channel_map.get_default_channel());
 
-    channel_map.delete_mi(mi->get_channel());
+    // delete_mi will call mi->channel_unlock in case it succeeds
+    if (channel_map.delete_mi(mi->get_channel()))
+    {
+      mi->channel_unlock();
+      error= ER_UNKNOWN_ERROR;
+      my_error(ER_UNKNOWN_ERROR, MYF(0));
+      goto err;
+    }
 
     if (is_default)
     {
@@ -10624,16 +10859,13 @@ static int change_receive_options(THD* thd, LEX_MASTER_INFO* lex_mi,
 
   if (lex_mi->user || lex_mi->password)
   {
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-    if (!thd->get_protocol()->get_ssl())
+#if !defined(EMBEDDED_LIBRARY)
+    if (!thd->get_ssl())
+    {
       push_warning(thd, Sql_condition::SL_NOTE,
                    ER_INSECURE_PLAIN_TEXT,
                    ER(ER_INSECURE_PLAIN_TEXT));
-#endif
-#if !defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-    push_warning(thd, Sql_condition::SL_NOTE,
-                 ER_INSECURE_PLAIN_TEXT,
-                 ER(ER_INSECURE_PLAIN_TEXT));
+    }
 #endif
     push_warning(thd, Sql_condition::SL_NOTE,
                  ER_INSECURE_CHANGE_MASTER,
@@ -10676,8 +10908,8 @@ static int change_receive_options(THD* thd, LEX_MASTER_INFO* lex_mi,
     */
     mi->heartbeat_period= min<float>(SLAVE_MAX_HEARTBEAT_PERIOD,
                                      (slave_net_timeout/2.0f));
-    DBUG_ASSERT(mi->heartbeat_period > (float) 0.001
-                || mi->heartbeat_period == 0);
+    assert(mi->heartbeat_period > (float) 0.001
+           || mi->heartbeat_period == 0);
 
     // counter is cleared if master is CHANGED.
     mi->received_heartbeats= 0;
@@ -11007,7 +11239,7 @@ int change_master(THD* thd, Master_info* mi, LEX_MASTER_INFO* lex_mi,
         Change-Master can't be done if there is a mts group gap.
         That requires mts-recovery which START SLAVE provides.
       */
-      DBUG_ASSERT(mi->rli->recovery_parallel_workers);
+      assert(mi->rli->recovery_parallel_workers);
 
       error= ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS;
       my_message(ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS,
@@ -11189,7 +11421,7 @@ int change_master(THD* thd, Master_info* mi, LEX_MASTER_INFO* lex_mi,
       relay_log_purge= 0;
 
       /* Relay log must be already initialized */
-      DBUG_ASSERT(mi->rli->inited);
+      assert(mi->rli->inited);
       if (mi->rli->init_relay_log_pos(mi->rli->get_group_relay_log_name(),
                                       mi->rli->get_group_relay_log_pos(),
                                       true/*we do need mi->rli->data_lock*/,
diff --git a/sql/rpl_slave.h b/sql/rpl_slave.h
index fcdbdd8cb3b2..23fb13a1decf 100644
--- a/sql/rpl_slave.h
+++ b/sql/rpl_slave.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -105,25 +112,41 @@ extern bool server_id_supplied;
 /*
   MUTEXES in replication:
 
-  channel_map lock: This is to lock the Multisource datastructure (channel_map).
-  Generally it used to retrieve an mi from channel_map.It is used to SERIALIZE ALL
-  administrative commands of replication: START SLAVE, STOP SLAVE, CHANGE
-  MASTER, RESET SLAVE, end_slave() (when mysqld stops) [init_slave() does not
-  need it it's called early]. Any of these commands holds the mutex from the
-  start till the end. This thus protects us against a handful of deadlocks
-  (consider start_slave_thread() which, when starting the I/O thread, releases
-  mi->run_lock, keeps rli->run_lock, and tries to re-acquire mi->run_lock).
+  m_channel_map_lock: This rwlock is used to protect the multi source
+  replication data structure (channel_map). Any operation reading contents
+  from the channel_map should hold the rdlock during the operation. Any
+  operation changing the channel_map (either adding/removing channels to/from
+  the channel_map) should hold the wrlock during the operation.
+  [init_slave() does not need it it's called early].
+
+  In Master_info: m_channel_lock
+  It is used to SERIALIZE ALL administrative commands of replication: START
+  SLAVE, STOP SLAVE, CHANGE MASTER, RESET SLAVE, delete_slave_info_objects
+  (when mysqld stops)
+
+  This thus protects us against a handful of deadlocks, being the know ones
+  around lock_slave_threads and the mixed order they are acquired in some
+  operations:
+
+   + consider start_slave_thread() which, when starting the I/O thread,
+     releases mi->run_lock, keeps rli->run_lock, and tries to re-acquire
+     mi->run_lock.
+
+   + Same applies to stop_slave() where a stop of the I/O thread will
+     mi->run_lock, keeps rli->run_lock, and tries to re-acquire mi->run_lock.
+     For the SQL thread, the order is the opposite.
 
   In Master_info: run_lock, data_lock
   run_lock protects all information about the run state: slave_running, thd
   and the existence of the I/O thread (to stop/start it, you need this mutex).
+  Check the above m_channel_lock about locking order.
   data_lock protects some moving members of the struct: counters (log name,
   position) and relay log (MYSQL_BIN_LOG object).
 
   In Relay_log_info: run_lock, data_lock
-  see Master_info
-  However, note that run_lock does not protect
-  Relay_log_info.run_state; that is protected by data_lock.
+  see Master_info, also the above m_channel_lock about locking order.
+  However, note that run_lock does not protect Relay_log_info.run_state;
+  that is protected by data_lock.
 
   In MYSQL_BIN_LOG: LOCK_log, LOCK_index of the binlog and the relay log
   LOCK_log: when you write to it. LOCK_index: when you create/delete a binlog
@@ -146,13 +169,13 @@ extern bool server_id_supplied;
 
     stop_slave:
       channel_map lock,
-      ( mi.run_lock, thd.LOCK_thd_data
+      ( mi.channel_wrlock, mi.run_lock, thd.LOCK_thd_data
       | rli.run_lock, thd.LOCK_thd_data
       | relay.LOCK_log
       )
 
     start_slave:
-      mi.run_lock, rli.run_lock, rli.data_lock, global_sid_lock->wrlock
+      mi.channel_wrlock, mi.run_lock, rli.run_lock, rli.data_lock, global_sid_lock->wrlock
 
     reset_logs:
       THD::LOCK_thd_data, .LOCK_log, .LOCK_index, global_sid_lock->wrlock
@@ -166,7 +189,7 @@ extern bool server_id_supplied;
       binlog.LOCK_index, global_sid_lock->wrlock, LOCK_reset_gtid_table
 
     reset_slave:
-      mi.run_lock, rli.run_lock, (purge_relay_logs) rli.data_lock,
+      mi.channel_wrlock, mi.run_lock, rli.run_lock, (purge_relay_logs) rli.data_lock,
       THD::LOCK_thd_data, relay.LOCK_log, relay.LOCK_index,
       global_sid_lock->wrlock
 
@@ -212,7 +235,7 @@ extern bool server_id_supplied;
       )
 
     change_master:
-      mi.run_lock, rli.run_lock, (init_relay_log_pos) rli.data_lock,
+      mi.channel_wrlock, mi.run_lock, rli.run_lock, (init_relay_log_pos) rli.data_lock,
       relay.log_lock
 
     Sys_var_gtid_mode::global_update:
@@ -396,13 +419,24 @@ void end_slave(); /* release slave threads */
 void delete_slave_info_objects(); /* clean up slave threads data */
 void clear_until_condition(Relay_log_info* rli);
 void clear_slave_error(Relay_log_info* rli);
+/**
+  This method locks both (in this order)
+    mi->run_lock
+    rli->run_lock
+
+  @param mi The associated master info object
+
+  @note this method shall be invoked while locking mi->m_channel_lock
+  for writes. This is due to the mixed order in which these locks are released
+  and acquired in such method as the slave threads start and stop methods.
+*/
 void lock_slave_threads(Master_info* mi);
 void unlock_slave_threads(Master_info* mi);
 void init_thread_mask(int* mask,Master_info* mi,bool inverse);
 void set_slave_thread_options(THD* thd);
 void set_slave_thread_default_charset(THD *thd, Relay_log_info const *rli);
 int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli);
-int rotate_relay_log(Master_info* mi);
+int rotate_relay_log(Master_info* mi, bool need_log_space_lock);
 bool queue_event(Master_info* mi,const char* buf, ulong event_len);
 
 extern "C" void *handle_slave_io(void *arg);
diff --git a/sql/rpl_slave_commit_order_manager.cc b/sql/rpl_slave_commit_order_manager.cc
index 58cc68d6f5c4..f0ea1db7dced 100644
--- a/sql/rpl_slave_commit_order_manager.cc
+++ b/sql/rpl_slave_commit_order_manager.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,6 +23,7 @@
 #include "rpl_slave_commit_order_manager.h"
 
 #include "rpl_rli_pdb.h"     // Slave_worker
+#include "debug_sync.h"      // debug_sync_set_action
 
 Commit_order_manager::Commit_order_manager(uint32 worker_numbers)
   : m_rollback_trx(false), m_workers(worker_numbers), queue_head(QUEUE_EOF),
@@ -87,6 +95,7 @@ bool Commit_order_manager::wait_for_its_turn(Slave_worker *worker,
       {
         mysql_mutex_unlock(&m_mutex);
         thd->EXIT_COND(&old_stage);
+        my_error(ER_LOCK_DEADLOCK, MYF(0));
         DBUG_RETURN(true);
       }
       mysql_cond_wait(cond, &m_mutex);
@@ -120,7 +129,7 @@ void Commit_order_manager::unregister_trx(Slave_worker *worker)
 
     mysql_mutex_lock(&m_mutex);
 
-    DBUG_ASSERT(!queue_empty());
+    assert(!queue_empty());
 
     /* Set next manager as the head and signal the trx to commit. */
     queue_pop();
@@ -152,6 +161,12 @@ void Commit_order_manager::report_deadlock(Slave_worker *worker)
   DBUG_ENTER("Commit_order_manager::report_deadlock");
   mysql_mutex_lock(&m_mutex);
   worker->report_order_commit_deadlock();
+  DBUG_EXECUTE_IF("rpl_fake_cod_deadlock",
+                  {
+                  const char act[]= "now signal reported_deadlock";
+                  assert(!debug_sync_set_action(current_thd,
+                                                STRING_WITH_LEN(act)));
+                  });
   mysql_cond_signal(&m_workers[worker->id].cond);
   mysql_mutex_unlock(&m_mutex);
   DBUG_VOID_RETURN;
diff --git a/sql/rpl_slave_commit_order_manager.h b/sql/rpl_slave_commit_order_manager.h
index 0a5b3748d7f2..8d9d25d5b29f 100644
--- a/sql/rpl_slave_commit_order_manager.h
+++ b/sql/rpl_slave_commit_order_manager.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_table_access.cc b/sql/rpl_table_access.cc
index 3b2fd4bc4a92..899b2fdd7594 100644
--- a/sql/rpl_table_access.cc
+++ b/sql/rpl_table_access.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -115,14 +121,14 @@ bool System_table_access::close_table(THD *thd, TABLE* table,
     if (need_commit)
     {
       if (error)
-        res= ha_rollback_trans(thd, true);
+        res= ha_rollback_trans(thd, true) || res;
       else
       {
         /*
           To make the commit not to block with global read lock set
           "ignore_global_read_lock" flag to true.
          */
-        res= ha_commit_trans(thd, true, true);
+        res= ha_commit_trans(thd, true, true) || res;
       }
     }
     /*
diff --git a/sql/rpl_table_access.h b/sql/rpl_table_access.h
index d3330f6b207d..b2f576e07114 100644
--- a/sql/rpl_table_access.h
+++ b/sql/rpl_table_access.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the
-   License.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_tblmap.cc b/sql/rpl_tblmap.cc
index af559783e4a2..efa9a58d1d67 100644
--- a/sql/rpl_tblmap.cc
+++ b/sql/rpl_tblmap.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_tblmap.h b/sql/rpl_tblmap.h
index 9404dd6d3029..3e5fd3f59a0c 100644
--- a/sql/rpl_tblmap.h
+++ b/sql/rpl_tblmap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/rpl_transaction_ctx.cc b/sql/rpl_transaction_ctx.cc
index 7d012b085691..d3cb17c26baa 100644
--- a/sql/rpl_transaction_ctx.cc
+++ b/sql/rpl_transaction_ctx.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_transaction_ctx.h b/sql/rpl_transaction_ctx.h
index 25c43addc1a0..901bbbfc06aa 100644
--- a/sql/rpl_transaction_ctx.h
+++ b/sql/rpl_transaction_ctx.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_transaction_write_set_ctx.cc b/sql/rpl_transaction_write_set_ctx.cc
index 8ad77fc0de29..e918eb64cb0d 100644
--- a/sql/rpl_transaction_write_set_ctx.cc
+++ b/sql/rpl_transaction_write_set_ctx.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,36 +27,160 @@
 #include "sql_class.h"                               // THD
 #include "sql_parse.h"                               // Find_thd_with_id
 #include "debug_sync.h"                              // debug_sync_set_action
+#include "binlog.h"                              // get_opt_max_history_size
 
+int32 Rpl_transaction_write_set_ctx::m_global_component_requires_write_sets(0);
+int64 Rpl_transaction_write_set_ctx::m_global_write_set_memory_size_limit(0);
 
 Rpl_transaction_write_set_ctx::Rpl_transaction_write_set_ctx()
+    : m_has_missing_keys(false),
+      m_has_related_foreign_keys(false),
+      m_ignore_write_set_memory_limit(false),
+      m_local_allow_drop_write_set(false),
+      m_local_has_reached_write_set_limit(false)
 {
   DBUG_ENTER("Rpl_transaction_write_set_ctx::Rpl_transaction_write_set_ctx");
+  /*
+    In order to speed-up small transactions write-set extraction,
+    we preallocate 24 elements.
+    24 is a sufficient number to hold write-sets for single
+    statement transactions, even on tables with foreign keys.
+  */
+  write_set.reserve(24);
   DBUG_VOID_RETURN;
 }
 
-void Rpl_transaction_write_set_ctx::add_write_set(uint64 hash)
+bool Rpl_transaction_write_set_ctx::add_write_set(uint64 hash)
 {
-  DBUG_ENTER("Transaction_context_log_event::add_write_set");
-  write_set.push_back(hash);
-  DBUG_VOID_RETURN;
+  DBUG_EXECUTE_IF("add_write_set_no_memory", throw std::bad_alloc(););
+
+  if (!m_local_has_reached_write_set_limit) {
+    ulong binlog_trx_dependency_history_size =
+        mysql_bin_log.m_dependency_tracker.get_writeset()
+            ->get_opt_max_history_size();
+    bool is_full_writeset_required =
+        m_global_component_requires_write_sets && !m_local_allow_drop_write_set;
+
+    if (!is_full_writeset_required) {
+      if (write_set.size() >= binlog_trx_dependency_history_size) {
+        m_local_has_reached_write_set_limit = true;
+        clear_write_set();
+        return false;
+      }
+    }
+
+    uint64 mem_limit = m_global_write_set_memory_size_limit;
+    if (mem_limit && !m_ignore_write_set_memory_limit) {
+      // Check if adding a new element goes over the limit
+      if (sizeof(uint64) + write_set_memory_size() > mem_limit) {
+        my_error(ER_WRITE_SET_EXCEEDS_LIMIT, MYF(0));
+        return true;
+      }
+    }
+
+    write_set.push_back(hash);
+    write_set_unique.insert(hash);
+  }
+
+  return false;
 }
 
-std::vector<uint64>* Rpl_transaction_write_set_ctx::get_write_set()
+std::set<uint64>* Rpl_transaction_write_set_ctx::get_write_set()
 {
-  DBUG_ENTER("Transaction_context_log_event::add_write_set");
-  DBUG_RETURN(&write_set);
+  DBUG_ENTER("Rpl_transaction_write_set_ctx::get_write_set");
+  DBUG_RETURN(&write_set_unique);
 }
 
-void Rpl_transaction_write_set_ctx::clear_write_set()
-{
-  DBUG_ENTER("Transaction_context_log_event::clear_write_set");
+void Rpl_transaction_write_set_ctx::reset_state() {
+  clear_write_set();
+  m_has_missing_keys = m_has_related_foreign_keys = false;
+  m_local_has_reached_write_set_limit = false;
+}
+
+void Rpl_transaction_write_set_ctx::clear_write_set() {
   write_set.clear();
+  write_set_unique.clear();
   savepoint.clear();
   savepoint_list.clear();
+}
+
+void Rpl_transaction_write_set_ctx::set_has_missing_keys()
+{
+  DBUG_ENTER("Transaction_context_log_event::set_has_missing_keys");
+  m_has_missing_keys= true;
+  DBUG_VOID_RETURN;
+}
+
+bool Rpl_transaction_write_set_ctx::get_has_missing_keys()
+{
+  DBUG_ENTER("Transaction_context_log_event::get_has_missing_keys");
+  DBUG_RETURN(m_has_missing_keys);
+}
+
+void Rpl_transaction_write_set_ctx::set_has_related_foreign_keys()
+{
+  DBUG_ENTER("Transaction_context_log_event::set_has_related_foreign_keys");
+  m_has_related_foreign_keys= true;
   DBUG_VOID_RETURN;
 }
 
+bool Rpl_transaction_write_set_ctx::get_has_related_foreign_keys()
+{
+  DBUG_ENTER("Transaction_context_log_event::get_has_related_foreign_keys");
+  DBUG_RETURN(m_has_related_foreign_keys);
+}
+
+bool Rpl_transaction_write_set_ctx::was_write_set_limit_reached() {
+  return m_local_has_reached_write_set_limit;
+}
+
+size_t Rpl_transaction_write_set_ctx::write_set_memory_size() {
+  return sizeof(uint64) * write_set.size();
+}
+
+void Rpl_transaction_write_set_ctx::set_global_require_full_write_set(
+    bool requires_ws) {
+  assert(!requires_ws || !m_global_component_requires_write_sets);
+  if (requires_ws)
+    my_atomic_store32(&m_global_component_requires_write_sets, 1);
+  else
+    my_atomic_store32(&m_global_component_requires_write_sets, 0);
+}
+
+void require_full_write_set(int requires_ws) {
+  Rpl_transaction_write_set_ctx::set_global_require_full_write_set(requires_ws);
+}
+
+void Rpl_transaction_write_set_ctx::set_global_write_set_memory_size_limit(int64 limit) {
+  assert(m_global_write_set_memory_size_limit == 0);
+  m_global_write_set_memory_size_limit = limit;
+}
+
+void Rpl_transaction_write_set_ctx::update_global_write_set_memory_size_limit(
+    int64 limit) {
+  m_global_write_set_memory_size_limit = limit;
+}
+
+void set_write_set_memory_size_limit(long long size_limit) {
+  Rpl_transaction_write_set_ctx::set_global_write_set_memory_size_limit(
+      size_limit);
+}
+
+void update_write_set_memory_size_limit(long long size_limit) {
+  Rpl_transaction_write_set_ctx::update_global_write_set_memory_size_limit(
+      size_limit);
+}
+
+void Rpl_transaction_write_set_ctx::set_local_ignore_write_set_memory_limit(
+    bool ignore_limit) {
+  m_ignore_write_set_memory_limit = ignore_limit;
+}
+
+void Rpl_transaction_write_set_ctx::set_local_allow_drop_write_set(
+    bool allow_drop_write_set) {
+  m_local_allow_drop_write_set = allow_drop_write_set;
+}
+
 /**
   Implementation of service_rpl_transaction_write_set, see
   @file include/mysql/service_rpl_transaction_write_set.h
@@ -65,9 +196,9 @@ Transaction_write_set* get_transaction_write_set(unsigned long m_thread_id)
   thd= Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
   if (thd)
   {
-    Rpl_transaction_write_set_ctx *transaction_write_set_ctx=
-      thd->get_transaction()->get_transaction_write_set_ctx();
-    int write_set_size= transaction_write_set_ctx->get_write_set()->size();
+    std::set<uint64> *write_set= thd->get_transaction()
+        ->get_transaction_write_set_ctx()->get_write_set();
+    unsigned long write_set_size= write_set->size();
     if (write_set_size == 0)
     {
       mysql_mutex_unlock(&thd->LOCK_thd_data);
@@ -84,8 +215,8 @@ Transaction_write_set* get_transaction_write_set(unsigned long m_thread_id)
                                        sizeof(unsigned long long),
                                        MYF(0));
     int result_set_index= 0;
-    for (std::vector<uint64>::iterator it= transaction_write_set_ctx->get_write_set()->begin();
-         it!=transaction_write_set_ctx->get_write_set()->end();
+    for (std::set<uint64>::iterator it= write_set->begin();
+         it != write_set->end();
          ++it)
     {
       uint64 temp= *it;
@@ -103,13 +234,14 @@ void Rpl_transaction_write_set_ctx::add_savepoint(char* name)
 
   DBUG_EXECUTE_IF("transaction_write_set_savepoint_clear_on_commit_rollback",
                   {
-                  DBUG_ASSERT(savepoint.size() == 0);
-                  DBUG_ASSERT(write_set.size() == 0);
-                  DBUG_ASSERT(savepoint_list.size() == 0);
+                    assert(savepoint.size() == 0);
+                    assert(write_set.size() == 0);
+                    assert(write_set_unique.size() == 0);
+                    assert(savepoint_list.size() == 0);
                   });
 
   DBUG_EXECUTE_IF("transaction_write_set_savepoint_level",
-                  DBUG_ASSERT(savepoint.size() == 0););
+                  assert(savepoint.size() == 0););
 
   std::map<std::string, size_t>::iterator it;
 
@@ -124,7 +256,7 @@ void Rpl_transaction_write_set_ctx::add_savepoint(char* name)
                                                   write_set.size()));
 
   DBUG_EXECUTE_IF("transaction_write_set_savepoint_add_savepoint",
-                  DBUG_ASSERT(savepoint.find(identifier)->second == write_set.size()););
+                  assert(savepoint.find(identifier)->second == write_set.size()););
 
   DBUG_VOID_RETURN;
 }
@@ -137,7 +269,7 @@ void Rpl_transaction_write_set_ctx::del_savepoint(char* name)
   DBUG_EXECUTE_IF("transaction_write_set_savepoint_block_before_release",
                     {
                       const char act[]= "now wait_for signal.unblock_release";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                     });
 
   savepoint.erase(identifier);
@@ -154,12 +286,12 @@ void Rpl_transaction_write_set_ctx::rollback_to_savepoint(char* name)
 
   if ((elem = savepoint.find(identifier)) != savepoint.end())
   {
-    DBUG_ASSERT(elem->second <= write_set.size());
+    assert(elem->second <= write_set.size());
 
     DBUG_EXECUTE_IF("transaction_write_set_savepoint_block_before_rollback",
                     {
                       const char act[]= "now wait_for signal.unblock_rollback";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
                     });
 
     position= elem->second;
@@ -184,13 +316,19 @@ void Rpl_transaction_write_set_ctx::rollback_to_savepoint(char* name)
     {
       // Clear all elements after savepoint
       write_set.erase(write_set.begin() + position, write_set.end());
+      // Since the write_set_unique set does not have insert order, the
+      // elements are ordered according its value, we need to rebuild it.
+      write_set_unique.clear();
+      write_set_unique.insert(write_set.begin(), write_set.end());
     }
 
-    DBUG_EXECUTE_IF("transaction_write_set_savepoint_add_savepoint",
-                    DBUG_ASSERT(write_set.size() == 1););
+    DBUG_EXECUTE_IF("transaction_write_set_savepoint_add_savepoint", {
+        assert(write_set.size() == 2);
+        assert(write_set_unique.size() == 2);});
 
-    DBUG_EXECUTE_IF("transaction_write_set_size_2",
-                    DBUG_ASSERT(write_set.size() == 2););
+    DBUG_EXECUTE_IF("transaction_write_set_size_2", {
+        assert(write_set.size() == 4);
+        assert(write_set_unique.size() == 4);});
   }
 
   DBUG_VOID_RETURN;
diff --git a/sql/rpl_transaction_write_set_ctx.h b/sql/rpl_transaction_write_set_ctx.h
index 0a94254a5903..858908182e32 100644
--- a/sql/rpl_transaction_write_set_ctx.h
+++ b/sql/rpl_transaction_write_set_ctx.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -20,13 +27,73 @@
 #include <vector>
 #include <map>
 #include <list>
+#include <set>
 #include <string>
 
 /**
-  Server side support to provide a service to plugins to report if
-  a given transaction should continue or be aborted.
-  Its value is reset on Transaction_ctx::cleanup().
-  Its value is set through service service_rpl_transaction_ctx.
+  Thread class responsible for the collection of write sets associated
+  to a transaction.
+
+  It also includes suport for save points where information will be discarded
+  on rollbacks to a savepoint.
+
+  Write set and flags are reset on
+    Rpl_transaction_write_set_ctx::reset_state().
+
+  The write set collection by an executing transaction is capped to a limit.
+  The limit can be "soft" or "hard":
+  - when a writeset grows above a "soft" limit, the transaction is allowed to
+  execute and commit, but the write set is discarded, and the transaction
+  declared to not have a usable write set.
+  - when a write set grows above a "hard" limit, the transaction is forced
+  to abort and rollback.
+
+  We cannot use a soft limit for transactions that will be certified in GR,
+  since a writeset is required for correct certification. But when GR is
+  disabled, we can use a soft limit, because the writeset is only used to
+  compute transaction dependencies, and we can pessimistically mark the
+  transaction as conflicting with all other transcations when the writeset
+  is discarded.
+  A soft limit can also be used for transactions executed by the GR recovery
+  channel, since they will not be certified, and the GR applier channel,
+  since those transactions have already passed the certification stage.
+
+  For the soft limit, we use
+    - binlog_transaction_dependency_history_size.
+  Transactions bigger than that cannot be added to the writeset history
+  since they do not fit, and therefore are marked as conflicting with all
+  *subsequent* transactions anyways.
+  Therefore much of the parallelization for the transaction is already
+  destroyed, and it is unlikely that also marking it as conflicting with
+  *previous* transactions makes a significant difference.
+
+  For the hard limit, when using Group Replication, we use
+    - group_replication_transaction_size_limit.
+  Since the writeset is a subset of the transaction, and the transaction
+  is limited to this size anyways, a transaction whose writeset exceeds
+  this limit will fail anyways.
+  So failing it when generating the writeset is merely a fail-fast mechanism,
+  and it is not a restriction to apply this limit to the writeset of all
+  transactions for which the full transaction data is also subject to the limit.
+  The transactions that are subject to this limit are exactly those executed
+  when GR is enabled, except by the GR applier channel and GR recovery channel.
+
+  We expose the following interfaces so that components such as GR
+  can control the limit.
+  There is an interface to *globally*
+   disable/enable the soft limit:
+     static void set_global_require_full_write_set(bool requires_ws);
+   set/alter/remove a hard limit:
+     static void set_global_write_set_memory_size_limit(uint64 limit)
+     static void update_global_write_set_memory_size_limit(uint64 limit);
+
+  There is another interface to override the global limits for a thread:
+    void set_local_ignore_write_set_memory_limit(bool ignore_limit);
+    void set_local_allow_drop_write_set(bool allow_drop_write_set);
+
+  The local methods are used for example for Group Replication applier and
+  recovery threads as group_replication_transaction_size_limit only applies
+  to client sessions and non group replication replica threads.
 */
 class Rpl_transaction_write_set_ctx
 {
@@ -34,24 +101,62 @@ class Rpl_transaction_write_set_ctx
   Rpl_transaction_write_set_ctx();
   virtual ~Rpl_transaction_write_set_ctx() {}
 
-  /*
+  /**
     Function to add the write set of the hash of the PKE in the std::vector
     in the transaction_ctx object.
 
     @param[in] hash - the uint64 type hash value of the PKE.
   */
-  void add_write_set(uint64 hash);
+  bool add_write_set(uint64 hash);
 
   /*
-    Function to get the pointer of the write set vector in the
+    Function to get the pointer of the write set in the
     transaction_ctx object.
   */
-  std::vector<uint64> *get_write_set();
+  std::set<uint64> *get_write_set();
+
+  /**
+    Reset the object so it can be used for a new transaction.
+  */
+  void reset_state();
 
   /*
-    Cleanup function of the vector which stores the PKE.
+    mark transactions that include tables with no pk
   */
-  void clear_write_set();
+  void set_has_missing_keys();
+
+  /*
+    check if the transaction was marked as having missing keys.
+
+    @retval true  The transaction accesses tables with no PK.
+    @retval false All tables referenced in transaction have PK.
+   */
+  bool get_has_missing_keys();
+
+  /*
+    mark transactions that include tables referenced by foreign keys
+  */
+  void set_has_related_foreign_keys();
+
+  /*
+    function to check if the transaction was marked as having missing keys.
+
+    @retval true  If the transaction was marked as being referenced by a foreign key
+  */
+  bool get_has_related_foreign_keys();
+
+  /**
+    Identifies situations where the limit for number of write set entries
+    already exceeded the configure limit.
+
+    @retval true if too many write set entries exist, false otherwise
+  */
+  bool was_write_set_limit_reached();
+
+  /**
+    @returns the size of the write_set field in bytes
+  */
+  size_t write_set_memory_size();
 
   /**
     Function to add a new SAVEPOINT identifier in the savepoint map in the
@@ -89,8 +194,60 @@ class Rpl_transaction_write_set_ctx
   */
   void restore_savepoint_list();
 
+  /**
+    Adds a memory limit for write sets.
+
+    @note currently only one component can set this limit a time.
+
+    @param limit the limit to be added
+  */
+  static void set_global_write_set_memory_size_limit(int64 limit);
+
+  /**
+    Updates the memory limit for write sets.
+
+    @note Using the value 0 disables the limit
+
+    @param limit the limit to be added
+  */
+  static void update_global_write_set_memory_size_limit(int64 limit);
+
+  /**
+    Prevent or allow this class to discard writesets exceeding a size limit
+    If true, a transaction will never discard its write sets
+
+    @param requires_ws if who invoked the method needs or not write sets
+  */
+  static void set_global_require_full_write_set(bool requires_ws);
+
+  /**
+    Set if the thread shall ignore any configured memory limit
+    for write set collection
+
+    @param ignore_limit if the limit should be ignored
+  */
+  void set_local_ignore_write_set_memory_limit(bool ignore_limit);
+
+  /**
+    Set if the thread shall if needed discard write sets
+
+    @param allow_drop_write_set if full write sets are not critical
+  */
+  void set_local_allow_drop_write_set(bool allow_drop_write_set);
+
 private:
+  /*
+    Clear the vector that stores the PKEs, and clear the savepoints, but do not
+    restore all the flags. Outside transaction cleanup, this is used when
+    discarding a writeset of excessive size, without aborting the transaction.
+  */
+  void clear_write_set();
+
   std::vector<uint64> write_set;
+  std::set<uint64> write_set_unique;
+
+  bool m_has_missing_keys;
+  bool m_has_related_foreign_keys;
 
   /**
     Contains information related to SAVEPOINTs. The key on map is the
@@ -104,6 +261,28 @@ class Rpl_transaction_write_set_ctx
     identifier name when function or trigger are executed.
   */
   std::list<std::map<std::string, size_t> > savepoint_list;
+
+  // Write set restriction variables
+
+  /** There is a component requiring write sets on transactions */
+  static int32 m_global_component_requires_write_sets;
+  /** Memory size limit enforced for write set collection */
+  static int64 m_global_write_set_memory_size_limit;
+
+  /**
+    If the thread should or not ignore the set limit for
+    write set collection
+  */
+  bool m_ignore_write_set_memory_limit;
+  /**
+    Even if a component says all transactions require write sets,
+    this variable says this thread should discard them when they are
+    bigger than m_opt_max_history_size
+  */
+  bool m_local_allow_drop_write_set;
+
+  /** True if the write set size is over the configure limit */
+  bool m_local_has_reached_write_set_limit;
 };
 
 #endif	/* RPL_TRANSACTION_WRITE_SET_CTX_H */
diff --git a/sql/rpl_trx_boundary_parser.cc b/sql/rpl_trx_boundary_parser.cc
index cb634ae3ed20..c7836842d784 100644
--- a/sql/rpl_trx_boundary_parser.cc
+++ b/sql/rpl_trx_boundary_parser.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -19,7 +26,7 @@
 #include "log_event.h"     // Log_event
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /* Event parser state names */
 static const char *event_parser_state_names[]= {
   "None",
@@ -133,7 +140,7 @@ Transaction_boundary_parser::get_event_boundary_type(
       qlen= Query_log_event::get_query(buf, length, fd_event, &query);
       if (qlen == 0)
       {
-        DBUG_ASSERT(query == NULL);
+        assert(query == NULL);
         boundary_type= EVENT_BOUNDARY_TYPE_ERROR;
         break;
       }
diff --git a/sql/rpl_trx_boundary_parser.h b/sql/rpl_trx_boundary_parser.h
index 7b8fa5dc5bef..9333d5143fb5 100644
--- a/sql/rpl_trx_boundary_parser.h
+++ b/sql/rpl_trx_boundary_parser.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/rpl_trx_tracking.cc b/sql/rpl_trx_tracking.cc
new file mode 100644
index 000000000000..d8c7eeeba99e
--- /dev/null
+++ b/sql/rpl_trx_tracking.cc
@@ -0,0 +1,409 @@
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#include "rpl_trx_tracking.h"
+
+#include "mysqld.h"
+#include "binlog.h"
+
+#include "debug_sync.h"
+
+Logical_clock::Logical_clock()
+  : state(SEQ_UNINIT), offset(0)
+{}
+
+/**
+  Atomically fetch the current state.
+  @return  not subtracted "absolute" value.
+ */
+inline int64 Logical_clock::get_timestamp()
+{
+  int64 retval= 0;
+  DBUG_ENTER("Logical_clock::get_timestamp");
+  retval= my_atomic_load64(&state);
+  DBUG_RETURN(retval);
+}
+
+/**
+  Steps the absolute value of the clock (state) to return
+  an updated value.
+  The caller must be sure to call the method in no concurrent
+  execution context so either offset and state can't change.
+
+  @return  incremented "absolute" value
+ */
+inline int64 Logical_clock::step()
+{
+  assert(SEQ_UNINIT == 0);
+  DBUG_EXECUTE_IF("logical_clock_step_2", ++state;);
+  return ++state;
+}
+
+/**
+  To try setting the clock *forward*.
+  The clock does not change when the new value is in the past
+  which is reflected by the new value and by offset.
+  In other words the function main effects is described as
+    state= max(state, new_value).
+  Offset that exceeds the new value indicates the binary log rotation
+  to render such new value useless.
+
+  @param  new_val  a new value (offset included)
+  @return a (new) value of state member regardless whether it's changed or not.
+ */
+inline int64 Logical_clock::set_if_greater(int64 new_val)
+{
+  longlong old_val= new_val - 1;
+  bool cas_rc;
+
+  DBUG_ENTER("Logical_clock::set_if_greater");
+
+  assert(new_val > 0);
+
+  if (new_val <= offset)
+  {
+    /*
+      This function's invocation can be separated from the
+      transaction's flushing by few rotations. A late to log
+      transaction does not change the clock, similarly to how
+      its timestamps are handled at flushing.
+    */
+    DBUG_RETURN(SEQ_UNINIT);
+  }
+
+  assert(new_val > 0);
+
+  while (!(cas_rc= my_atomic_cas64(&state, &old_val, new_val)) &&
+         old_val < new_val)
+  {}
+
+  assert(state >= new_val); // setting can't be done to past
+
+  assert(cas_rc || old_val >= new_val);
+
+  DBUG_RETURN(cas_rc ? new_val : old_val);
+}
+
+
+/**
+  Get the sequence_number for a transaction, and get the last_commit based
+  on parallel committing transactions.
+
+  @param[in]     thd             Current THD from which to extract trx context.
+  @param[in,out] sequence_number Sequence number of current transaction.
+  @param[in,out] commit_parent   Commit_parent of current transaction,
+                                 pre-filled with the commit_parent calculated
+                                 by the logical clock logic.
+*/
+void
+Commit_order_trx_dependency_tracker::get_dependency(THD *thd,
+                                                    int64 &sequence_number,
+                                                    int64 &commit_parent)
+{
+  Transaction_ctx *trn_ctx= thd->get_transaction();
+
+  assert(trn_ctx->sequence_number
+         > m_max_committed_transaction.get_offset());
+  /*
+    Prepare sequence_number and commit_parent relative to the current
+    binlog.  This is done by subtracting the binlog's clock offset
+    from the values.
+
+    A transaction that commits after the binlog is rotated, can have a
+    commit parent in the previous binlog. In this case, subtracting
+    the offset from the sequence number results in a negative
+    number. The commit parent dependency gets lost in such
+    case. Therefore, we log the value SEQ_UNINIT in this case.
+  */
+  sequence_number=
+    trn_ctx->sequence_number - m_max_committed_transaction.get_offset();
+
+  commit_parent=
+    trn_ctx->last_committed <= m_max_committed_transaction.get_offset()
+           ? SEQ_UNINIT
+           : trn_ctx->last_committed - m_max_committed_transaction.get_offset();
+}
+
+int64
+Commit_order_trx_dependency_tracker::step()
+{
+  return m_transaction_counter.step();
+}
+
+void
+Commit_order_trx_dependency_tracker::rotate()
+{
+  m_max_committed_transaction.
+    update_offset(m_transaction_counter.get_timestamp());
+
+  m_transaction_counter.
+    update_offset(m_transaction_counter.get_timestamp());
+}
+
+void
+Commit_order_trx_dependency_tracker::update_max_committed(int64 sequence_number)
+{
+  mysql_mutex_assert_owner(&LOCK_slave_trans_dep_tracker);
+  m_max_committed_transaction.set_if_greater(sequence_number);
+}
+
+/**
+  Get the writeset dependencies of a transaction.
+  This takes the commit_parent that must be previously set using
+  Commit_order_trx_dependency_tracker and tries to make the commit_parent as
+  low as possible, using the writesets of each transaction.
+  The commit_parent returned depends on how many row hashes are stored in the
+  writeset_history, which is cleared once it reaches the user-defined maximum.
+
+  @param[in]     thd             Current THD from which to extract trx context.
+  @param[in,out] sequence_number Sequence number of current transaction.
+  @param[in,out] commit_parent   Commit_parent of current transaction,
+                                 pre-filled with the commit_parent calculated by
+                                 Commit_order_trx_dependency_tracker to use when
+                                 the writeset commit_parent is not valid.
+*/
+void
+Writeset_trx_dependency_tracker::get_dependency(THD *thd,
+                                                int64 &sequence_number,
+                                                int64 &commit_parent)
+{
+  Rpl_transaction_write_set_ctx *write_set_ctx=
+    thd->get_transaction()->get_transaction_write_set_ctx();
+  std::set<uint64> *writeset= write_set_ctx->get_write_set();
+
+#ifndef NDEBUG
+  /* The writeset of an empty transaction must be empty. */
+  if (is_empty_transaction_in_binlog_cache(thd))
+    assert(writeset->size() == 0);
+#endif
+
+  /*
+    Check if this transaction has a writeset, if the writeset will overflow the
+    history size, if the transaction_write_set_extraction is consistent
+    between session and global or if changes in the tables referenced in this
+    transaction cascade to other tables. If that happens revert to using the
+    COMMIT_ORDER and clear the history to keep data consistent.
+  */
+  bool can_use_writesets=
+    // empty writeset implies DDL or similar, except if there are missing keys
+    (writeset->size() != 0 || write_set_ctx->get_has_missing_keys() ||
+     /*
+       The empty transactions do not need to clear the writeset history, since
+       they can be executed in parallel.
+     */
+     is_empty_transaction_in_binlog_cache(thd)) &&
+    // hashing algorithm for the session must be the same as used by other rows in history
+    (global_system_variables.transaction_write_set_extraction ==
+     thd->variables.transaction_write_set_extraction) &&
+    // must not use foreign keys
+    !write_set_ctx->get_has_related_foreign_keys() &&
+    // it did not broke past the capacity already
+    !write_set_ctx->was_write_set_limit_reached();
+  bool exceeds_capacity= false;
+
+  mysql_mutex_lock(&LOCK_slave_trans_dep_tracker);
+  if (can_use_writesets)
+  {
+    /*
+     Check if adding this transaction exceeds the capacity of the writeset
+     history. If that happens, m_writeset_history will be cleared only after
+     using its information for current transaction.
+    */
+    exceeds_capacity=
+      m_writeset_history.size() + writeset->size() > get_opt_max_history_size();
+
+    /*
+     Compute the greatest sequence_number among all conflicts and add the
+     transaction's row hashes to the history.
+    */
+    DEBUG_SYNC(thd, "wait_in_get_dependency");
+    int64 last_parent= m_writeset_history_start;
+    for (std::set<uint64>::iterator it= writeset->begin();
+         it != writeset->end(); ++it)
+    {
+      Writeset_history::iterator hst= m_writeset_history.find(*it);
+      if (hst != m_writeset_history.end())
+      {
+        if (hst->second > last_parent && hst->second < sequence_number)
+          last_parent= hst->second;
+
+        hst->second= sequence_number;
+      }
+      else
+      {
+        if (!exceeds_capacity)
+          m_writeset_history.insert(std::pair<uint64, int64>(*it, sequence_number));
+      }
+    }
+
+    /*
+      If the transaction references tables with missing primary keys revert to
+      COMMIT_ORDER, update and not reset history, as it is unnecessary because
+      any transaction that refers this table will also revert to COMMIT_ORDER.
+    */
+    if (!write_set_ctx->get_has_missing_keys())
+    {
+      /*
+       The WRITESET commit_parent then becomes the minimum of largest parent
+       found using the hashes of the row touched by the transaction and the
+       commit parent calculated with COMMIT_ORDER.
+      */
+      commit_parent= std::min(last_parent, commit_parent);
+    }
+  }
+
+  if (exceeds_capacity || !can_use_writesets)
+  {
+    m_writeset_history_start= sequence_number;
+    m_writeset_history.clear();
+  }
+  mysql_mutex_unlock(&LOCK_slave_trans_dep_tracker);
+}
+
+void
+Writeset_trx_dependency_tracker::rotate(int64 start)
+{
+  m_writeset_history_start= start;
+  m_writeset_history.clear();
+}
+
+/**
+  Get the writeset commit parent of transactions using the session dependencies.
+
+  @param[in]     thd             Current THD from which to extract trx context.
+  @param[in,out] sequence_number Sequence number of current transaction.
+  @param[in,out] commit_parent   Commit_parent of current transaction,
+                                 pre-filled with the commit_parent calculated
+                                 by the Write_set_trx_dependency_tracker as a
+                                 fall-back.
+*/
+void
+Writeset_session_trx_dependency_tracker::get_dependency(THD *thd,
+                                                        int64 &sequence_number,
+                                                        int64 &commit_parent)
+{
+  int64 session_parent= thd->rpl_thd_ctx.dependency_tracker_ctx().
+                        get_last_session_sequence_number();
+
+  if (session_parent != 0 && session_parent < sequence_number)
+    commit_parent= std::max(commit_parent, session_parent);
+
+  thd->rpl_thd_ctx.dependency_tracker_ctx().
+    set_last_session_sequence_number(sequence_number);
+}
+
+/**
+  Get the dependencies in a transaction, the main entry point for the
+  dependency tracking work.
+*/
+void
+Transaction_dependency_tracker::get_dependency(THD *thd,
+                                               int64 &sequence_number,
+                                               int64 &commit_parent)
+{
+  sequence_number= commit_parent= 0;
+
+  switch(my_atomic_load64(&m_opt_tracking_mode))
+  {
+    case DEPENDENCY_TRACKING_COMMIT_ORDER:
+      m_commit_order.get_dependency(thd, sequence_number, commit_parent);
+      break;
+    case DEPENDENCY_TRACKING_WRITESET:
+      m_commit_order.get_dependency(thd, sequence_number, commit_parent);
+      m_writeset.get_dependency(thd, sequence_number, commit_parent);
+      break;
+    case DEPENDENCY_TRACKING_WRITESET_SESSION:
+      m_commit_order.get_dependency(thd, sequence_number, commit_parent);
+      m_writeset.get_dependency(thd, sequence_number, commit_parent);
+      m_writeset_session.get_dependency(thd, sequence_number, commit_parent);
+      break;
+    default:
+      assert(0);  // blow up on debug
+      /*
+        Fallback to commit order on production builds.
+       */
+      m_commit_order.get_dependency(thd, sequence_number, commit_parent);
+  }
+}
+
+void
+Transaction_dependency_tracker::tracking_mode_changed()
+{
+  Logical_clock max_committed_transaction=
+    m_commit_order.get_max_committed_transaction();
+  int64 timestamp= max_committed_transaction.get_timestamp()
+                   - max_committed_transaction.get_offset();
+
+  m_writeset.rotate(timestamp);
+}
+
+/**
+  The method is to be executed right before committing time.
+  It must be invoked even if the transaction does not commit
+  to engine being merely logged into the binary log.
+  max_committed_transaction is updated with a greater timestamp
+  value.
+  As a side effect, the transaction context's sequence_number
+  is reset.
+
+  @param thd a pointer to THD instance
+*/
+void
+Transaction_dependency_tracker::update_max_committed(THD *thd)
+{
+  Transaction_ctx *trn_ctx= thd->get_transaction();
+  m_commit_order.update_max_committed(trn_ctx->sequence_number);
+  /*
+    sequence_number timestamp isn't needed anymore, so it's cleared off.
+  */
+  trn_ctx->sequence_number= SEQ_UNINIT;
+
+  assert(trn_ctx->last_committed == SEQ_UNINIT ||
+         thd->commit_error == THD::CE_FLUSH_ERROR ||
+         thd->commit_error == THD::CE_FLUSH_GNO_EXHAUSTED_ERROR);
+}
+
+int64
+Transaction_dependency_tracker::step()
+{
+  return m_commit_order.step();
+}
+
+void
+Transaction_dependency_tracker::rotate()
+{
+  m_commit_order.rotate();
+  /*
+    To make slave appliers be able to execute transactions in parallel
+    after rotation, set the minimum commit_parent to 1 after rotation.
+  */
+  m_writeset.rotate(1);
+  if (current_thd)
+    current_thd->get_transaction()->sequence_number= 2;
+}
+
+int64 Transaction_dependency_tracker::get_max_committed_timestamp()
+{
+  return m_commit_order.get_max_committed_transaction().get_timestamp();
+}
+
+
diff --git a/sql/rpl_trx_tracking.h b/sql/rpl_trx_tracking.h
new file mode 100644
index 000000000000..45364ba1cbf0
--- /dev/null
+++ b/sql/rpl_trx_tracking.h
@@ -0,0 +1,252 @@
+#ifndef RPL_TRX_TRACKING_INCLUDED
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#define RPL_TRX_TRACKING_INCLUDED
+
+//#include <my_inttypes.h>
+#include <map>
+
+#include "my_dbug.h"
+#include "sql_class.h"
+
+
+/**
+  Logical timestamp generator for logical timestamping binlog transactions.
+  A transaction is associated with two sequence numbers see
+  @c Transaction_ctx::last_committed and @c Transaction_ctx::sequence_number.
+  The class provides necessary interfaces including that of
+  generating a next consecutive value for the latter.
+*/
+class  Logical_clock
+{
+private:
+  int64 state;
+  /*
+    Offset is subtracted from the actual "absolute time" value at
+    logging a replication event. That is the event holds logical
+    timestamps in the "relative" format. They are meaningful only in
+    the context of the current binlog.
+    The member is updated (incremented) per binary log rotation.
+  */
+  int64 offset;
+public:
+  Logical_clock();
+  int64 step();
+  int64 set_if_greater(int64 new_val);
+  int64 get_timestamp();
+  int64 get_offset() { return offset; }
+  /*
+    Updates the offset.
+    This operation is invoked when binlog rotates and at that time
+    there can't any concurrent step() callers so no need to guard
+    the assignement.
+  */
+  void update_offset(int64 new_offset)
+  {
+    assert(offset <= new_offset);
+
+    offset= new_offset;
+  }
+};
+
+/**
+  Generate logical timestamps for MTS using COMMIT_ORDER
+  in the binlog-transaction-dependency-tracking option.
+*/
+class Commit_order_trx_dependency_tracker
+{
+public:
+  /**
+    Main function that gets the dependencies using the COMMIT_ORDER tracker.
+
+    @param [in]     thd             THD of the caller.
+    @param [in,out] sequence_number sequence_number initialized and returned.
+    @param [in,out] commit_parent   commit_parent to be returned.
+   */
+  void get_dependency(THD *thd, int64 &sequence_number, int64 &commit_parent);
+
+  void update_max_committed(int64 sequence_number);
+
+  Logical_clock get_max_committed_transaction()
+  {
+    return m_max_committed_transaction;
+  }
+
+  int64 step();
+  void rotate();
+
+private:
+  /* Committed transactions timestamp */
+  Logical_clock m_max_committed_transaction;
+
+  /* "Prepared" transactions timestamp */
+  Logical_clock m_transaction_counter;
+};
+
+/**
+  Generate logical timestamps for MTS using WRITESET
+  in the binlog-transaction-dependency-tracking option.
+*/
+class Writeset_trx_dependency_tracker
+{
+public:
+  Writeset_trx_dependency_tracker(uint64 max_history_size):
+    m_opt_max_history_size(max_history_size),
+    m_writeset_history_start(0)
+  {}
+
+  /**
+    Main function that gets the dependencies using the WRITESET tracker.
+
+    @param [in]     thd             THD of the caller.
+    @param [in,out] sequence_number sequence_number initialized and returned.
+    @param [in,out] commit_parent   commit_parent to be returned.
+   */
+  void get_dependency(THD *thd, int64 &sequence_number, int64 &commit_parent);
+
+  void rotate(int64 start);
+
+   /* option opt_binlog_transaction_dependency_history_size - atomic var */
+  int64 m_opt_max_history_size;
+  /* option opt_binlog_transaction_dependency_history_size */
+  ulong m_opt_max_history_size_base_var;
+
+  /**
+    Returns the value for the max history size with an atomic read to the var
+    @return the value of opt_max_history_size
+  */
+  ulong get_opt_max_history_size(){
+    return static_cast<ulong>(my_atomic_load64(&m_opt_max_history_size));
+  }
+
+private:
+  /*
+    Monitor the last transaction with write-set to use as the minimal
+    commit parent when logical clock source is WRITE_SET, i.e., the most recent
+    transaction that is not in the history, or 0 when the history is empty.
+
+    The m_writeset_history_start must to be set to 0 initially and whenever the
+    binlog_transaction_dependency_tracking variable is changed or the history
+    is cleared, so that it is updated to the first transaction for which the
+    dependencies are checked.
+  */
+  int64 m_writeset_history_start;
+
+  /*
+    Track the last transaction sequence number that changed each row
+    in the database, using row hashes from the writeset as the index.
+  */
+  typedef std::map<uint64,int64> Writeset_history;
+  Writeset_history m_writeset_history;
+};
+
+/**
+  Generate logical timestamps for MTS using WRITESET_SESSION
+  in the binlog-transaction-dependency-tracking option.
+*/
+class Writeset_session_trx_dependency_tracker
+{
+public:
+  /**
+    Main function that gets the dependencies using the WRITESET_SESSION tracker.
+
+    @param [in]     thd             THD of the caller.
+    @param [in,out] sequence_number sequence_number initialized and returned.
+    @param [in,out] commit_parent   commit_parent to be returned.
+   */
+  void get_dependency(THD *thd, int64 &sequence_number, int64 &commit_parent);
+};
+
+/**
+  Modes for parallel transaction dependency tracking
+*/
+enum enum_binlog_transaction_dependency_tracking
+{
+  /**
+    Tracks dependencies based on the commit order of transactions.
+    The time intervals during which any transaction holds all its locks are
+    tracked (the interval ends just before storage engine commit, when locks
+    are released. For an autocommit transaction it begins just before storage
+    engine prepare. For BEGIN..COMMIT transactions it begins at the end of the
+    last statement before COMMIT). Two transactions are marked as
+    non-conflicting if their respective intervals overlap. In other words,
+    if trx1 appears before trx2 in the binlog, and trx2 had acquired all its
+    locks before trx1 released its locks, then trx2 is marked such that the
+    slave can schedule it in parallel with trx1.
+  */
+  DEPENDENCY_TRACKING_COMMIT_ORDER= 0,
+  /**
+    Tracks dependencies based on the set of rows updated. Any two transactions
+    that change disjoint sets of rows, are said concurrent and non-contending.
+  */
+  DEPENDENCY_TRACKING_WRITESET= 1,
+  /**
+    Tracks dependencies based on the set of rows updated per session. Any two
+    transactions that change disjoint sets of rows, on different sessions,
+    are said concurrent and non-contending. Transactions from the same session
+    are always said to be dependent, i.e., are never concurrent and
+    non-contending.
+  */
+  DEPENDENCY_TRACKING_WRITESET_SESSION= 2
+};
+
+/**
+  Dependency tracker is a container singleton that dispatches between the three
+  methods associated with the binlog-transaction-dependency-tracking option.
+  There is a singleton instance of each of these classes.
+*/
+class Transaction_dependency_tracker
+{
+public:
+  Transaction_dependency_tracker():
+    m_opt_tracking_mode(DEPENDENCY_TRACKING_COMMIT_ORDER), m_writeset(25000) {}
+
+  void get_dependency(THD *thd, int64 &sequence_number, int64 &commit_parent);
+
+  void tracking_mode_changed();
+
+  void update_max_committed(THD *thd);
+  int64 get_max_committed_timestamp();
+
+  int64 step();
+  void rotate();
+
+public:
+  /* option opt_binlog_transaction_dependency_tracking */
+  int64 m_opt_tracking_mode;
+
+  /* option opt_binlog_transaction_dependency_tracking associated with sysvar */
+  long m_opt_tracking_mode_value;
+
+  Writeset_trx_dependency_tracker *get_writeset()
+  {
+    return &m_writeset;
+  }
+
+private:
+  Writeset_trx_dependency_tracker m_writeset;
+  Commit_order_trx_dependency_tracker m_commit_order;
+  Writeset_session_trx_dependency_tracker m_writeset_session;
+};
+
+#endif /* RPL_TRX_TRACKING_INCLUDED */
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index 03e7e1fae097..64d5240f3e4c 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -231,7 +238,7 @@ static void show_sql_type(enum_field_types type, uint16 metadata, String *str,
       break;
 
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
     break;
@@ -381,7 +388,7 @@ can_convert_field_to(Field *field,
                      int *order_var)
 {
   DBUG_ENTER("can_convert_field_to");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char field_type_buf[MAX_FIELD_WIDTH];
   String field_type(field_type_buf, sizeof(field_type_buf), &my_charset_latin1);
   field->sql_type(field_type);
@@ -478,7 +485,7 @@ can_convert_field_to(Field *field,
         *order_var = 1;                         // Always require lossy conversions
       else
         *order_var= compare_lengths(field, source_type, metadata);
-      DBUG_ASSERT(*order_var != 0);
+      assert(*order_var != 0);
       DBUG_RETURN(is_conversion_ok(*order_var, rli));
     }
 
@@ -504,7 +511,7 @@ can_convert_field_to(Field *field,
     case MYSQL_TYPE_LONG:
     case MYSQL_TYPE_LONGLONG:
       *order_var= compare_lengths(field, source_type, metadata);
-      DBUG_ASSERT(*order_var != 0);
+      assert(*order_var != 0);
       DBUG_RETURN(is_conversion_ok(*order_var, rli));
 
     default:
@@ -624,7 +631,7 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli,
       DBUG_PRINT("debug", ("Checking column %d -"
                            " field '%s' can be converted - order: %d",
                            col, field->field_name, order));
-      DBUG_ASSERT(order >= -1 && order <= 1);
+      assert(order >= -1 && order <= 1);
 
       /*
         If order is not 0, a conversion is required, so we need to set
@@ -654,8 +661,8 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli,
       DBUG_PRINT("debug", ("Checking column %d -"
                            " field '%s' can not be converted",
                            col, field->field_name));
-      DBUG_ASSERT(col < size() && col < table->s->fields);
-      DBUG_ASSERT(table->s->db.str && table->s->table_name.str);
+      assert(col < size() && col < table->s->fields);
+      assert(table->s->db.str && table->s->table_name.str);
       const char *db_name= table->s->db.str;
       const char *tbl_name= table->s->table_name.str;
       char source_buf[MAX_FIELD_WIDTH];
@@ -701,7 +708,7 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli,
     }
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (tmp_table)
   {
     for (unsigned int col= 0; col < tmp_table->s->fields; ++col)
@@ -961,7 +968,7 @@ table_def::table_def(unsigned char *types, ulong size,
 table_def::~table_def()
 {
   my_free(m_memory);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   m_type= 0;
   m_size= 0;
 #endif
@@ -1150,7 +1157,7 @@ Hash_slave_rows::get(TABLE *table, MY_BITMAP *cols)
 bool Hash_slave_rows::next(HASH_ROW_ENTRY** entry)
 {
   DBUG_ENTER("Hash_slave_rows::next");
-  DBUG_ASSERT(*entry);
+  assert(*entry);
 
   if (*entry == NULL)
     DBUG_RETURN(true);
@@ -1199,7 +1206,7 @@ bool
 Hash_slave_rows::del(HASH_ROW_ENTRY *entry)
 {
   DBUG_ENTER("Hash_slave_rows::del");
-  DBUG_ASSERT(entry);
+  assert(entry);
 
   if (my_hash_delete(&m_hash, (uchar *) entry))
     DBUG_RETURN(true);
@@ -1288,7 +1295,7 @@ Hash_slave_rows::make_hash_key(TABLE *table, MY_BITMAP *cols)
           crc= checksum_crc32(crc, f->ptr, f->data_length());
           break;
       }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       String tmp;
       f->val_str(&tmp);
       DBUG_PRINT("debug", ("make_hash_entry: hash after field %s=%s: %u", f->field_name, tmp.c_ptr_safe(), crc));
@@ -1346,7 +1353,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli)
 {
   bool res= false;
 
-  DBUG_ASSERT(rli->deferred_events_collecting);
+  assert(rli->deferred_events_collecting);
 
   rli->deferred_events_collecting= false;
   for (Log_event **it= m_array.begin(); !res && it != m_array.end(); ++it)
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h
index d88123a57352..5b79d532d72f 100644
--- a/sql/rpl_utility.h
+++ b/sql/rpl_utility.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -270,7 +277,7 @@ class table_def
    */
   enum_field_types type(ulong index) const
   {
-    DBUG_ASSERT(index < m_size);
+    assert(index < m_size);
     /*
       If the source type is MYSQL_TYPE_STRING, it can in reality be
       either MYSQL_TYPE_STRING, MYSQL_TYPE_ENUM, or MYSQL_TYPE_SET, so
@@ -319,7 +326,7 @@ class table_def
   */
   uint16 field_metadata(uint index) const
   {
-    DBUG_ASSERT(index < m_size);
+    assert(index < m_size);
     if (m_field_metadata_size)
       return m_field_metadata[index];
     else
@@ -332,7 +339,7 @@ class table_def
   */
   my_bool maybe_null(uint index) const
   {
-    DBUG_ASSERT(index < m_size);
+    assert(index < m_size);
     return ((m_null_bits[(index / 8)] & 
             (1 << (index % 8))) == (1 << (index %8)));
   }
diff --git a/sql/rpl_write_set_handler.cc b/sql/rpl_write_set_handler.cc
index 134343b7fad3..7fc2764a4bad 100644
--- a/sql/rpl_write_set_handler.cc
+++ b/sql/rpl_write_set_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,16 +28,21 @@
 #include "sql_class.h"     // THD
 #include "sql_list.h"      // List
 #include "table.h"         // TABLE
+#include "rpl_handler.h"
 
 #include "my_murmur3.h"    // murmur3_32
-#include "../extra/lz4/my_xxhash.h" // xxHash
+#include "my_xxhash.h" // xxHash
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
+// The number of digits of ULLONG_MAX plus '\0'
+#define VALUE_LENGTH_BUFFER_SIZE 24
 #define NAME_READ_BUFFER_SIZE 1024
 #define HASH_STRING_SEPARATOR "½"
+#define COLLATION_CONVERSION_ALGORITHM 1
 
 const char *transaction_write_set_hashing_algorithms[]=
 {
@@ -56,284 +68,653 @@ get_write_set_algorithm_string(unsigned int algorithm)
   }
 }
 
-template <class type> uint64 calc_hash(ulong algorithm, type T)
+template <class type> uint64 calc_hash(ulong algorithm, type T, size_t len)
 {
   if(algorithm == HASH_ALGORITHM_MURMUR32)
-    return (murmur3_32((const uchar*)T, strlen(T), 0));
+    return (murmur3_32((const uchar*)T, len, 0));
   else
-    return (MY_XXH64((const uchar*)T, strlen(T), 0));
-}
-
-/**
-  Function to check if the given TABLE has any foreign key field. This is
-  needed to be checked to get the hash of the field value in the foreign
-  table.
-
-  @param[in] table - TABLE object
-  @param[in] thd - THD object pointing to current thread.
-
-  @param[out] foreign_key_map - a standard map which keeps track of the
-                                foreign key fields.
-*/
-void check_foreign_key(TABLE *table, THD *thd,
-                       std::map<std::string,std::string> &foreign_key_map)
-{
-  DBUG_ENTER("check_foreign_key");
-  /*
-    OPTION_NO_FOREIGN_KEY_CHECKS bit in options_bits is set at two places
-
-    1) If the user executed 'SET foreign_key_checks= 0' on the local session
-    before executing the query.
-    or
-    2) We are applying a RBR event (i.e., the event is from a remote server)
-    and logic in Rows_log_event::do_apply_event found out that the event is
-    generated from a remote server session that disabled foreign_key_checks
-    (using 'SET foreign_key_checks=0').
-
-    In either of the above cases (i.e., the foreign key check is disabled for
-    the current query/current event), we should ignore generating
-    the foreign key information as they should not participate
-    in the conflicts detecting algorithm.
-  */
-  if (thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS)
-    DBUG_VOID_RETURN;
-
-  List<FOREIGN_KEY_INFO> f_key_list;
-  table->file->get_foreign_key_list(thd, &f_key_list);
-
-  FOREIGN_KEY_INFO *f_key_info;
-  List_iterator_fast<FOREIGN_KEY_INFO> foreign_key_iterator(f_key_list);
-  LEX_STRING *f_info;
-  while ((f_key_info=foreign_key_iterator++))
-  {
-    /*
-      If referenced_key_name is NULL it means that the parent table
-      was dropped using foreign_key_checks= 0, on that case we
-      cannot check foreign key and need to skip it.
-    */
-    if (f_key_info->referenced_key_name == NULL)
-      continue;
-
-    std::string temporary_pke;
-    List_iterator_fast<LEX_STRING> foreign_fields_iterator(f_key_info->foreign_fields);
-
-    char *f_database_name= f_key_info->referenced_db->str;
-    char *f_table_name= f_key_info->referenced_table->str;
-
-    // Length of foreign database calculation.
-    uint length_database= strlen(f_database_name);
-    char *buffer_db= (char*) my_malloc(key_memory_write_set_extraction,
-                                       length_database, MYF(0));
-    char *char_length_database= my_safe_itoa(10, length_database, &buffer_db[length_database-1]);
-
-    // Length of foreign table calculation.
-    uint length_table= strlen(f_table_name);
-    char *buffer_table= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                length_table, MYF(0));
-    char *char_length_table= my_safe_itoa(10, length_table, &buffer_table[length_table-1]);
-
-    /*
-      Prefix the hash keys with the referenced index name.
-    */
-    temporary_pke.append(f_key_info->referenced_key_name->str,
-                         f_key_info->referenced_key_name->length);
-    temporary_pke.append(HASH_STRING_SEPARATOR);
-    temporary_pke.append(f_database_name);
-    temporary_pke.append(HASH_STRING_SEPARATOR);
-    temporary_pke.append(char_length_database);
-    temporary_pke.append(f_table_name);
-    temporary_pke.append(HASH_STRING_SEPARATOR);
-    temporary_pke.append(char_length_table);
-
-    my_free(buffer_db);
-    my_free(buffer_table);
-
-    while ((f_info= foreign_fields_iterator++))
-    {
-      foreign_key_map[f_info->str]= temporary_pke;
-    }
-  }
-  DBUG_VOID_RETURN;
-
+    return (MY_XXH64((const uchar*)T, len, 0));
 }
 
-void debug_check_for_write_sets(std::vector<std::string> &key_list_to_hash)
+#ifndef NDEBUG
+static void debug_check_for_write_sets(std::vector<std::string> &key_list_to_hash,
+                                       std::vector<uint64> &hash_list)
 {
   DBUG_EXECUTE_IF("PKE_assert_single_primary_key_generated_insert",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 2897372530352804122ULL);
+                  assert(hash_list[1] == 340395741608101502ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_single_primary_key_generated_insert_collation",
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[1] == key_list_to_hash[0]);
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 340395741608101502ULL);
+                  assert(hash_list[1] == hash_list[0]););
 
   DBUG_EXECUTE_IF("PKE_assert_single_primary_key_generated_update",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" ||
-                              key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" ||
+                         key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 8147168586610610204ULL ||
+                         hash_list[0] == 2897372530352804122ULL);
+                  assert(hash_list[1] == 8563267070232261320ULL ||
+                         hash_list[1] == 340395741608101502ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_single_primary_key_generated_update_collation",
+                  assert(key_list_to_hash.size() == 2);
+                  assert((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0]) ||
+                         (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0]));
+                  assert(hash_list.size() == 2);
+                  assert((hash_list[0] == 8563267070232261320ULL && hash_list[0] == hash_list[1]) ||
+                         (hash_list[0] == 340395741608101502ULL && hash_list[0] == hash_list[1])););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_primary_key_generated_insert",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
-                                                     HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 1691122509389864327ULL);
+                  assert(hash_list[1] == 13655149628280894901ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_primary_key_generated_insert_collation",
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[1] == key_list_to_hash[0]);
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 13655149628280894901ULL);
+                  assert(hash_list[1] == hash_list[0]););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_primary_key_generated_update",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "12"
-                                                     HASH_STRING_SEPARATOR "1" ||
-                              key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
-                                                     HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 2);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1" ||
+                         key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 2);
+                  assert(hash_list[0] == 3905848172375270818ULL ||
+                         hash_list[0] == 1691122509389864327ULL);
+                  assert(hash_list[1] == 16833405476607614310ULL ||
+                         hash_list[1] == 13655149628280894901ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_primary_key_generated_update_collation",
+                  assert(key_list_to_hash.size() == 2);
+                  assert((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0]) ||
+                         (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0]));
+                  assert(hash_list.size() == 2);
+                  assert((hash_list[0] == 16833405476607614310ULL && hash_list[0] == hash_list[1]) ||
+                         (hash_list[0] == 13655149628280894901ULL && hash_list[0] == hash_list[1])););
 
   DBUG_EXECUTE_IF("PKE_assert_single_primary_unique_key_generated_insert",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[2] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 6);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[5] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 6);
+                  assert(hash_list[0] == 2897372530352804122ULL);
+                  assert(hash_list[1] == 340395741608101502ULL);
+                  assert(hash_list[2] == 18399953872590645955ULL);
+                  assert(hash_list[3] == 12796928550717161120ULL);
+                  assert(hash_list[4] == 11353180532661898235ULL);
+                  assert(hash_list[5] == 11199547876733116431ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_single_primary_unique_key_generated_insert_collation",
+                  assert(key_list_to_hash.size() == 6);
+                  assert(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[4] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[1] == key_list_to_hash[0] &&
+                         key_list_to_hash[3] == key_list_to_hash[2] &&
+                         key_list_to_hash[5] == key_list_to_hash[4]);
+                  assert(hash_list.size() == 6);
+                  assert(hash_list[0] == 340395741608101502ULL && hash_list[1] == hash_list[0]);
+                  assert(hash_list[2] == 12796928550717161120ULL && hash_list[3] == hash_list[2]);
+                  assert(hash_list[4] == 11199547876733116431ULL && hash_list[5] == hash_list[4]););
 
   DBUG_EXECUTE_IF("PKE_assert_single_primary_unique_key_generated_update",
-                  DBUG_ASSERT((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1") ||
-                              (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1")););
+                  assert(key_list_to_hash.size() == 6);
+                  assert((key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1") ||
+                         (key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1"));
+                  assert(hash_list.size() == 6);
+                  assert((hash_list[0] == 14771035529829851738ULL &&
+                          hash_list[1] == 7803002059431370747ULL &&
+                          hash_list[2] == 18399953872590645955ULL &&
+                          hash_list[3] == 12796928550717161120ULL &&
+                          hash_list[4] == 11353180532661898235ULL &&
+                          hash_list[5] == 11199547876733116431ULL) ||
+                         (hash_list[0] == 2897372530352804122ULL &&
+                          hash_list[1] == 340395741608101502ULL &&
+                          hash_list[2] == 18399953872590645955ULL &&
+                          hash_list[3] == 12796928550717161120ULL &&
+                          hash_list[4] == 11353180532661898235ULL &&
+                          hash_list[5] == 11199547876733116431ULL)););
+
+  DBUG_EXECUTE_IF("PKE_assert_single_primary_unique_key_generated_update_collation",
+                  assert(key_list_to_hash.size() == 6);
+                  assert((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4]) ||
+                         (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "c3" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4]));
+                  assert(hash_list.size() == 6);
+                  assert((hash_list[0] == 7803002059431370747ULL &&
+                          hash_list[2] == 12796928550717161120ULL &&
+                          hash_list[4] == 11199547876733116431ULL &&
+                          hash_list[1] == hash_list[0] &&
+                          hash_list[3] == hash_list[2] &&
+                          hash_list[5] == hash_list[4]) ||
+                         (hash_list[0] == 340395741608101502ULL &&
+                          hash_list[2] == 12796928550717161120ULL &&
+                          hash_list[4] == 11199547876733116431ULL &&
+                          hash_list[1] == hash_list[0] &&
+                          hash_list[3] == hash_list[2] &&
+                          hash_list[5] == hash_list[4])););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_primary_unique_key_generated_insert",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
-                                                     HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[1] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[2] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                     HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 6);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[3] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[5] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 6);
+                  assert(hash_list[0] == 1691122509389864327ULL);
+                  assert(hash_list[1] == 13655149628280894901ULL);
+                  assert(hash_list[2] == 12533984864941331840ULL);
+                  assert(hash_list[3] == 8954424140835647185ULL);
+                  assert(hash_list[4] == 14184162977259375422ULL);
+                  assert(hash_list[5] == 3520344117573337805ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_primary_unique_key_generated_insert_collation",
+                  assert(key_list_to_hash.size() == 6);
+                  assert(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                         HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[2] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[4] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[1] == key_list_to_hash[0] &&
+                         key_list_to_hash[3] == key_list_to_hash[2] &&
+                         key_list_to_hash[5] == key_list_to_hash[4]);
+                  assert(hash_list.size() == 6);
+                  assert(hash_list[0] == 13655149628280894901ULL && hash_list[1] == hash_list[0]);
+                  assert(hash_list[2] == 8954424140835647185ULL && hash_list[3] == hash_list[2]);
+                  assert(hash_list[4] == 3520344117573337805ULL && hash_list[5] == hash_list[4]););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_primary_unique_key_generated_update",
-                  DBUG_ASSERT((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
-                                                       HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1") ||
-                              (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "12"
-                                                       HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1")););
+                  assert(key_list_to_hash.size() == 6);
+                  assert((key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1") ||
+                         (key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1"));
+                  assert(hash_list.size() == 6);
+                  assert((hash_list[0] == 1691122509389864327ULL &&
+                          hash_list[1] == 13655149628280894901ULL &&
+                          hash_list[2] == 12533984864941331840ULL &&
+                          hash_list[3] == 8954424140835647185ULL &&
+                          hash_list[4] == 14184162977259375422ULL &&
+                          hash_list[5] == 3520344117573337805ULL) ||
+                         (hash_list[0] == 3950570981230755523ULL &&
+                          hash_list[1] == 17122769277112661326ULL &&
+                          hash_list[2] == 12533984864941331840ULL &&
+                          hash_list[3] == 8954424140835647185ULL &&
+                          hash_list[4] == 14184162977259375422ULL &&
+                          hash_list[5] == 3520344117573337805ULL)););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_primary_unique_key_generated_update_collation",
+                  assert(key_list_to_hash.size() == 6);
+                  assert((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4]) ||
+                         (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "12"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "b" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4]));
+                  assert(hash_list.size() == 6);
+                  assert((hash_list[1] == 13655149628280894901ULL &&
+                          hash_list[3] == 8954424140835647185ULL &&
+                          hash_list[5] == 3520344117573337805ULL &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4]) ||
+                         (hash_list[1] == 17122769277112661326ULL &&
+                          hash_list[3] == 8954424140835647185ULL &&
+                          hash_list[5] == 3520344117573337805ULL &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[5] == key_list_to_hash[4])););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_foreign_key_generated_insert",
-                  DBUG_ASSERT(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                      HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
-                                                      HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                      HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[2] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                      HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
-                              key_list_to_hash[3] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
-                                                      HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1"););
+                  assert(key_list_to_hash.size() == 8);
+                  assert(key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
+                         HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                         HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[5] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[7] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                         HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1");
+                  assert(hash_list.size() == 8);
+                  assert(hash_list[0] == 4888980339825597978ULL);
+                  assert(hash_list[1] == 3283233640848908273ULL);
+                  assert(hash_list[2] == 274016005206261698ULL);
+                  assert(hash_list[3] == 17221725733811443497ULL);
+                  assert(hash_list[4] == 2897372530352804122ULL);
+                  assert(hash_list[5] == 340395741608101502ULL);
+                  assert(hash_list[6] == 3473606527244955984ULL);
+                  assert(hash_list[7] == 14682037479339770823ULL););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_foreign_key_generated_insert_collation",
+                  assert(key_list_to_hash.size() == 8);
+                  assert(key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
+                         HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                         HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[4] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                         HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[6] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                         HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                         key_list_to_hash[1] == key_list_to_hash[0] &&
+                         key_list_to_hash[3] == key_list_to_hash[2] &&
+                         key_list_to_hash[5] == key_list_to_hash[4] &&
+                         key_list_to_hash[7] == key_list_to_hash[6]);
+                  assert(hash_list.size() == 8);
+                  assert(hash_list[1] == 3283233640848908273ULL && hash_list[1] == hash_list[0]);
+                  assert(hash_list[3] == 17221725733811443497ULL && hash_list[3] == hash_list[2]);
+                  assert(hash_list[5] == 340395741608101502ULL && hash_list[5] == hash_list[4]);
+                  assert(hash_list[7] == 14682037479339770823ULL && hash_list[7] == hash_list[6]););
 
   DBUG_EXECUTE_IF("PKE_assert_multi_foreign_key_generated_update",
-                  DBUG_ASSERT((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                       HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
-                                                       HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                       HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[3] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
-                                                       HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1") ||
-                              (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                       HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "15"
-                                                       HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[1] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
-                                                       HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[2] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
-                                                       HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
-                               key_list_to_hash[3] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
-                                                       HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1")););
+                  assert(key_list_to_hash.size() == 8);
+                  assert((key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[7] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1") ||
+                         (key_list_to_hash[1] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "15"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[3] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[5] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[7] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1"));
+                  assert(hash_list.size() == 8);
+                  assert((hash_list[0] == 4888980339825597978ULL &&
+                          hash_list[1] == 3283233640848908273ULL &&
+                          hash_list[2] == 274016005206261698ULL &&
+                          hash_list[3] == 17221725733811443497ULL &&
+                          hash_list[4] == 2897372530352804122ULL &&
+                          hash_list[5] == 340395741608101502ULL &&
+                          hash_list[6] == 3473606527244955984ULL &&
+                          hash_list[7] == 14682037479339770823ULL) ||
+                         (hash_list[0] == 8035853452724126883ULL &&
+                          hash_list[1] == 12666755939597291234ULL &&
+                          hash_list[2] == 274016005206261698ULL &&
+                          hash_list[3] == 17221725733811443497ULL &&
+                          hash_list[4] == 8147168586610610204ULL &&
+                          hash_list[5] == 8563267070232261320ULL &&
+                          hash_list[6] == 3473606527244955984ULL &&
+                          hash_list[7] == 14682037479339770823ULL)););
+
+  DBUG_EXECUTE_IF("PKE_assert_multi_foreign_key_generated_update_collation",
+                  assert(key_list_to_hash.size() == 8);
+                  assert((key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "15"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[6] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[4] == key_list_to_hash[4] &&
+                          key_list_to_hash[7] == key_list_to_hash[6]) ||
+                         (key_list_to_hash[0] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "15"
+                          HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[2] == "c2" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t3"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[4] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t1"
+                          HASH_STRING_SEPARATOR "23" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[6] == "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR "4t2"
+                          HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR "1" &&
+                          key_list_to_hash[1] == key_list_to_hash[0] &&
+                          key_list_to_hash[3] == key_list_to_hash[2] &&
+                          key_list_to_hash[4] == key_list_to_hash[4] &&
+                          key_list_to_hash[7] == key_list_to_hash[6]));
+                  assert(hash_list.size() == 8);
+                  assert((hash_list[1] == 3283233640848908273ULL && hash_list[1] == hash_list[0] &&
+                          hash_list[3] == 17221725733811443497ULL && hash_list[3] == hash_list[2] &&
+                          hash_list[5] == 340395741608101502ULL && hash_list[5] == hash_list[4] &&
+                          hash_list[7] == 14682037479339770823ULL && hash_list[7] == hash_list[6]) ||
+                         (hash_list[1] == 12666755939597291234ULL && hash_list[1] == hash_list[0] &&
+                          hash_list[3] == 17221725733811443497ULL && hash_list[3] == hash_list[2] &&
+                          hash_list[5] == 8563267070232261320ULL && hash_list[5] == hash_list[4] &&
+                          hash_list[7] == 14682037479339770823ULL && hash_list[7] == hash_list[6])););
+
+  DBUG_EXECUTE_IF(
+      "PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_insert",
+      assert(key_list_to_hash.size() == 4);
+      assert(key_list_to_hash[0] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                 "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[1] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                 "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[2] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                 "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[3] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                 "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1");
+      assert(hash_list.size() == 4);
+      assert(hash_list[0] == 15066957522449671266ULL &&
+             hash_list[1] == 15066957522449671266ULL &&
+             hash_list[2] == 9647156720027801592ULL &&
+             hash_list[3] == 9647156720027801592ULL););
+
+  DBUG_EXECUTE_IF(
+      "PKE_assert_multi_column_foreign_key_on_multiple_column_primary_key_update",
+      assert(key_list_to_hash.size() == 4);
+      assert((key_list_to_hash[0] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[1] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[2] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[3] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1") ||
+             (key_list_to_hash[0] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[1] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[2] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[3] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR
+                  "12" HASH_STRING_SEPARATOR "13" HASH_STRING_SEPARATOR "1"));
+      assert(hash_list.size() == 4);
+      assert((hash_list[0] == 12726729333133305663ULL &&
+              hash_list[1] == 12726729333133305663ULL &&
+              hash_list[2] == 17273381564889724595ULL &&
+              hash_list[3] == 17273381564889724595ULL) ||
+             (hash_list[0] == 15066957522449671266ULL &&
+              hash_list[1] == 15066957522449671266ULL &&
+              hash_list[2] == 9647156720027801592ULL &&
+              hash_list[3] == 9647156720027801592ULL)););
+
+  DBUG_EXECUTE_IF(
+      "PKE_assert_multiple_column_unique_key_insert",
+      assert(key_list_to_hash.size() == 4);
+      assert(key_list_to_hash[0] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[1] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[2] ==
+                 "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[3] ==
+                 "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1");
+      assert(hash_list.size() == 4);
+      assert(hash_list[0] == 340395741608101502ULL &&
+             hash_list[1] == 340395741608101502ULL &&
+             hash_list[2] == 14341778092818779177ULL &&
+             hash_list[3] == 14341778092818779177ULL););
+
+  DBUG_EXECUTE_IF(
+      "PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_insert",
+      assert(key_list_to_hash.size() == 6);
+      assert(key_list_to_hash[0] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[1] ==
+                 "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[2] ==
+                 "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[3] ==
+                 "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t2" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[4] ==
+                 "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1" &&
+             key_list_to_hash[5] ==
+                 "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                 "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                 "13" HASH_STRING_SEPARATOR "1");
+      assert(hash_list.size() == 6);
+      assert(hash_list[0] == 10002085147685770725ULL &&
+             hash_list[1] == 10002085147685770725ULL &&
+             hash_list[2] == 7781576503154198764ULL &&
+             hash_list[3] == 7781576503154198764ULL &&
+             hash_list[4] == 14341778092818779177ULL &&
+             hash_list[5] == 14341778092818779177ULL););
+
+  DBUG_EXECUTE_IF(
+      "PKE_assert_multi_column_foreign_key_on_multiple_column_unique_key_update",
+      assert(key_list_to_hash.size() == 6);
+      assert((key_list_to_hash[0] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[1] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "24" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[2] ==
+                  "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR
+                  "16" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[3] ==
+                  "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR
+                  "16" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[4] ==
+                  "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR
+                  "16" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[5] ==
+                  "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "25" HASH_STRING_SEPARATOR
+                  "16" HASH_STRING_SEPARATOR "1") ||
+             (key_list_to_hash[0] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[1] ==
+                  "PRIMARY" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "21" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[2] ==
+                  "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                  "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[3] ==
+                  "key_e_f" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t2" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                  "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[4] ==
+                  "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                  "13" HASH_STRING_SEPARATOR "1" &&
+              key_list_to_hash[5] ==
+                  "key_b_c" HASH_STRING_SEPARATOR "test" HASH_STRING_SEPARATOR
+                  "4t1" HASH_STRING_SEPARATOR "22" HASH_STRING_SEPARATOR
+                  "13" HASH_STRING_SEPARATOR "1"));
+      assert(hash_list.size() == 6);
+      assert((hash_list[0] == 7572125940027161025ULL &&
+              hash_list[1] == 7572125940027161025ULL &&
+              hash_list[2] == 12139583969308846244ULL &&
+              hash_list[3] == 12139583969308846244ULL &&
+              hash_list[4] == 3682008013696622692ULL &&
+              hash_list[5] == 3682008013696622692ULL) ||
+             (hash_list[0] == 10002085147685770725ULL &&
+              hash_list[1] == 10002085147685770725ULL &&
+              hash_list[2] == 7781576503154198764ULL &&
+              hash_list[3] == 7781576503154198764ULL &&
+              hash_list[4] == 14341778092818779177ULL &&
+              hash_list[5] == 14341778092818779177ULL)););
 }
+#endif
 
 
 /**
   Function to generate the hash of the string passed to this function.
 
   @param[in] pke - the string to be hashed.
+  @param[in] collation_conversion_algorithm - algorithm used for the conversion
+                                              0 - converted using without
+                                                  collation support algorithm
+                                              1 - converted using with collation
+                                                  support conversion algorithm
+
   @param[in] thd - THD object pointing to current thread.
+  @param[in] write_sets - list of all write sets
+  @param[in] hash_list - list of all hashes
+  @return true if a problem occurred on generation or write set tracking.
 */
 
-void generate_hash_pke(std::string pke, THD* thd)
+static bool generate_hash_pke(const std::string &pke, uint collation_conversion_algorithm, THD* thd
+#ifndef NDEBUG
+                              , std::vector<std::string> &write_sets
+                              , std::vector<uint64> &hash_list
+#endif
+)
 {
-  DBUG_ENTER("generate_hash_pke");
-  DBUG_ASSERT(thd->variables.transaction_write_set_extraction !=
-              HASH_ALGORITHM_OFF);
-  const char* string_pke=NULL;
-  string_pke= (char *)pke.c_str();
-  DBUG_PRINT("info", ("The hashed value is %s for %u", string_pke,
-                      thd->thread_id()));
+  assert(thd->variables.transaction_write_set_extraction !=
+         HASH_ALGORITHM_OFF);
+
+  size_t length= (COLLATION_CONVERSION_ALGORITHM == collation_conversion_algorithm) ?
+                   pke.size() : strlen(pke.c_str());
   uint64 hash= calc_hash<const char *>(thd->variables.transaction_write_set_extraction,
-                                       string_pke);
-  Rpl_transaction_write_set_ctx *transaction_write_set_ctc=
-    thd->get_transaction()->get_transaction_write_set_ctx();
-  transaction_write_set_ctc->add_write_set(hash);
-  DBUG_VOID_RETURN;
+                                       pke.c_str(), length);
+  if (thd->get_transaction()->get_transaction_write_set_ctx()->add_write_set(hash))
+    return true;
+#ifndef NDEBUG
+  write_sets.push_back(pke);
+  hash_list.push_back(hash);
+#endif
+  DBUG_PRINT("info", ("pke: %s; hash: %llu", pke.c_str(), hash));
+
+  return false;
 }
 
-void add_pke(TABLE *table, THD *thd)
-{
-  DBUG_ENTER("add_pke");
-  std::string pke;
-  std::string temporary_pke;
-  // Buffer to read the names of the database and table names which is less
-  // than 1024. So its a safe limit.
-  char name_read_buffer[NAME_READ_BUFFER_SIZE];
-  // Buffer to read the row data from the table record[0].
-  String row_data(name_read_buffer, sizeof(name_read_buffer), &my_charset_bin);
-
-  // Fetching the foreign key value of the table and storing it in a map.
-  std::map<std::string,std::string> foreign_key_map;
-  check_foreign_key(table, thd, foreign_key_map);
-
-  // The database name of the table in the transaction is fetched here.
-  const char* database_name= table->s->db.str;
-  uint length_database= strlen(database_name);
-  char *buffer_db= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                length_database, MYF(0));
-  const char *char_length_database= my_safe_itoa(10, length_database,
-                                                 &buffer_db[length_database-1]);
-  temporary_pke.append(database_name);
-  temporary_pke.append(HASH_STRING_SEPARATOR);
-  temporary_pke.append(char_length_database);
-  my_free(buffer_db);
-
-  // The table name of the table in the transaction is fetched here.
-  const char* table_name= table->s->table_name.str;
-  uint length_table= strlen(table_name);
-  char *buffer_table= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                length_table, MYF(0));
-  const char *char_length_table= my_safe_itoa(10, length_table, &buffer_table[length_table-1]);
-  temporary_pke.append(table_name);
-  temporary_pke.append(HASH_STRING_SEPARATOR);
-  temporary_pke.append(char_length_table);
-
-  my_free(buffer_table);
-
-  // Finalizing the first part of the string to be hashed and storing it in
-  // the pke.
-  const char* temp_pke= NULL;
-  temp_pke= (char *)temporary_pke.c_str();
-  pke.append(temp_pke);
 
+bool add_pke(TABLE *table, THD *thd, const uchar *record)
+{
+  assert(record == table->record[0] || record == table->record[1]);
   /*
     The next section extracts the primary key equivalent of the rows that are
     changing during the current transaction.
@@ -368,111 +749,327 @@ void add_pke(TABLE *table, THD *thd)
     Finally these value are hashed using the murmur hash function to prevent sending more
     for certification algorithm.
   */
-  std::vector<std::string> key_list_to_hash;
-  bitmap_set_all(table->read_set);
+  Rpl_transaction_write_set_ctx* ws_ctx=
+    thd->get_transaction()->get_transaction_write_set_ctx();
+  int writeset_hashes_added= 0;
+
   if(table->key_info && (table->s->primary_key < MAX_KEY))
   {
+    const ptrdiff_t ptrdiff = record - table->record[0];
+
+    char value_length_buffer[VALUE_LENGTH_BUFFER_SIZE];
+    char* value_length= NULL;
+
+    std::string pke_schema_table;
+    pke_schema_table.reserve(NAME_LEN * 3);
+    pke_schema_table.append(HASH_STRING_SEPARATOR);
+    pke_schema_table.append(table->s->db.str, table->s->db.length);
+    pke_schema_table.append(HASH_STRING_SEPARATOR);
+    value_length= my_safe_itoa(10, table->s->db.length,
+                               &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+    pke_schema_table.append(value_length);
+    pke_schema_table.append(table->s->table_name.str, table->s->table_name.length);
+    pke_schema_table.append(HASH_STRING_SEPARATOR);
+    value_length= my_safe_itoa(10, table->s->table_name.length,
+                               &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+    pke_schema_table.append(value_length);
+
+    std::string pke;
+    pke.reserve(NAME_LEN * 5);
+
+    char *pk_value= NULL;
+    size_t pk_value_size= 0;
+
+    // Buffer to read the names of the database and table names which is less
+    // than 1024. So its a safe limit.
+    char name_read_buffer[NAME_READ_BUFFER_SIZE];
+    // Buffer to read the row data from the table record[0].
+    String row_data(name_read_buffer, sizeof(name_read_buffer), &my_charset_bin);
+
+#ifndef NDEBUG
+    std::vector<std::string> write_sets;
+    std::vector<uint64> hash_list;
+#endif
+
     for (uint key_number=0; key_number < table->s->keys; key_number++)
     {
       // Skip non unique.
       if (!((table->key_info[key_number].flags & (HA_NOSAME )) == HA_NOSAME))
         continue;
 
-      std::string unhashed_string;
-      unhashed_string.append(table->key_info[key_number].name);
-      unhashed_string.append(HASH_STRING_SEPARATOR);
-      unhashed_string.append(pke);
-      uint i= 0;
-      for (/*empty*/; i < table->key_info[key_number].user_defined_key_parts; i++)
-      {
-        // read the primary key field values in str.
-        int index= table->key_info[key_number].key_part[i].fieldnr;
-        table->field[index-1]->val_str(&row_data);
-
-        /* Ignore if the value is NULL. */
-        if (table->field[index-1]->is_null())
-          break;
-
-        char* pk_value= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                row_data.length()+1, MYF(0));
-        // buffer to be used for my_safe_itoa.
-        char *buf= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                row_data.length(), MYF(0));
-
-        strmake(pk_value, row_data.c_ptr_safe(), row_data.length());
-        const char *lenStr = my_safe_itoa(10, (row_data.length()),
-                                          &buf[row_data.length()-1]);
-        unhashed_string.append(pk_value);
-        unhashed_string.append(HASH_STRING_SEPARATOR);
-        unhashed_string.append(lenStr);
-        my_free(buf);
-        my_free(pk_value);
-      }
       /*
-        If any part of the key is NULL, ignore adding it to hash keys.
-        NULL cannot conflict with any value.
-        Eg: create table t1(i int primary key not null, j int, k int,
-                                                unique key (j, k));
-            insert into t1 values (1, 2, NULL);
-            insert into t1 values (2, 2, NULL); => this is allowed.
+        To handle both members having hash values with and without collation
+        in the same group, we generate and send both versions (with and without
+        collation) of the hash in the newer versions. This would mean that a row
+        change will generate 2 instead of 1 writeset, and 4 instead of 2, when PK
+        are involved. This will mean that a transaction will be certified against
+        two writesets instead of just one.
+
+        To generate both versions (with and without collation) of the hash, it
+        first converts using without collation support algorithm (old algorithm),
+        and then using with collation support conversion algorithm, and adds
+        generated value to key_list_to_hash vector, for hash generation later.
+
+        Since the collation writeset is bigger or equal than the raw one, we do
+        generate first the collation and reuse the buffer without the need to
+        resize for the raw.
       */
-      if (i == table->key_info[key_number].user_defined_key_parts)
-      {
-        key_list_to_hash.push_back(unhashed_string);
-      }
-      else
+      for (int collation_conversion_algorithm= COLLATION_CONVERSION_ALGORITHM;
+           collation_conversion_algorithm >= 0;
+           collation_conversion_algorithm--)
       {
-        /* This is impossible to happen in case of primary keys */
-        DBUG_ASSERT(key_number !=0);
+        pke.clear();
+        pke.append(table->key_info[key_number].name);
+        pke.append(pke_schema_table);
+
+        uint i= 0;
+        for (/*empty*/; i < table->key_info[key_number].user_defined_key_parts; i++)
+        {
+          // read the primary key field values in str.
+          int index= table->key_info[key_number].key_part[i].fieldnr;
+          size_t length= 0;
+
+          Field *field= table->field[index - 1];
+          /* Ignore if the value is NULL. */
+          if (field->is_null(ptrdiff)) break;
+
+          /*
+            Update the field offset as we may be working on table->record[0]
+            or table->record[1], depending on the "record" parameter.
+          */
+          field->move_field_offset(ptrdiff);
+
+          // convert using collation support conversion algorithm
+          if (COLLATION_CONVERSION_ALGORITHM == collation_conversion_algorithm)
+          {
+            const CHARSET_INFO* cs= table->field[index-1]->charset();
+            length= cs->coll->strnxfrmlen(cs,
+                                       table->field[index-1]->pack_length());
+          }
+          // convert using without collation support algorithm
+          else
+          {
+            table->field[index-1]->val_str(&row_data);
+            length= row_data.length();
+          }
+
+          if (pk_value_size < length+1)
+          {
+            pk_value_size= length+1;
+            pk_value= (char*) my_realloc(key_memory_write_set_extraction,
+                                         pk_value, pk_value_size,
+                                         MYF(MY_ZEROFILL));
+          }
+
+          // convert using collation support conversion algorithm
+          if (COLLATION_CONVERSION_ALGORITHM == collation_conversion_algorithm)
+          {
+            /*
+              convert to normalized string and store so that it can be
+              sorted using binary comparison functions like memcmp.
+            */
+            table->field[index-1]->make_sort_key((uchar*)pk_value, length);
+            pk_value[length]= 0;
+          }
+          // convert using without collation support algorithm
+          else
+          {
+            strmake(pk_value, row_data.c_ptr_safe(), length);
+          }
+
+          pke.append(pk_value, length);
+          pke.append(HASH_STRING_SEPARATOR);
+          value_length= my_safe_itoa(10, length,
+                                     &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+          pke.append(value_length);
+          field->move_field_offset(-ptrdiff);
+        }
+
+        /*
+          If any part of the key is NULL, ignore adding it to hash keys.
+          NULL cannot conflict with any value.
+          Eg: create table t1(i int primary key not null, j int, k int,
+                                                  unique key (j, k));
+              insert into t1 values (1, 2, NULL);
+              insert into t1 values (2, 2, NULL); => this is allowed.
+        */
+        if (i == table->key_info[key_number].user_defined_key_parts)
+        {
+          if (generate_hash_pke(pke, collation_conversion_algorithm, thd
+#ifndef NDEBUG
+                            , write_sets, hash_list
+#endif
+          ))
+          {
+            return true;
+          }
+          writeset_hashes_added++;
+        }
+        else
+        {
+          /* This is impossible to happen in case of primary keys */
+          assert(key_number !=0);
+        }
       }
-      unhashed_string.clear();
     }
 
-    // This part takes care of the previously fetched foreign key values of
-    // the referenced table adds it to the write set.
-    for(uint i=0; i < table->s->fields; i++)
+    /*
+      Foreign keys handling.
+
+      OPTION_NO_FOREIGN_KEY_CHECKS bit in options_bits is set at two places
+
+      1) If the user executed 'SET foreign_key_checks= 0' on the local session
+      before executing the query.
+      or
+      2) We are applying a RBR event (i.e., the event is from a remote server)
+      and logic in Rows_log_event::do_apply_event found out that the event is
+      generated from a remote server session that disabled foreign_key_checks
+      (using 'SET foreign_key_checks=0').
+
+      In either of the above cases (i.e., the foreign key check is disabled for
+      the current query/current event), we should ignore generating
+      the foreign key information as they should not participate
+      in the conflicts detecting algorithm.
+    */
+    if (!(thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS))
     {
-      std::string referenced_FQTN=
-        foreign_key_map[table->s->field[i]->field_name];
-      if (referenced_FQTN.size() > 0)
-      {
-        table->field[i]->val_str(&row_data);
+      List<FOREIGN_KEY_INFO> f_key_list;
+      table->file->get_foreign_key_list(thd, &f_key_list);
 
-        /* Ignore if the value is NULL. */
-        if (table->field[i]->is_null())
+      FOREIGN_KEY_INFO *f_key_info;
+      List_iterator_fast<FOREIGN_KEY_INFO> foreign_key_iterator(f_key_list);
+      LEX_STRING *f_info;
+      while ((f_key_info=foreign_key_iterator++))
+      {
+        /*
+          If referenced_key_name is NULL it means that the parent table
+          was dropped using foreign_key_checks= 0, on that case we
+          cannot check foreign key and need to skip it.
+        */
+        if (f_key_info->referenced_key_name == NULL)
           continue;
 
-        char* pk_value= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                row_data.length()+1, MYF(0));
-        // buffer to be used for my_safe_itoa.
-        char *buf= (char*) my_malloc(
-                                key_memory_write_set_extraction,
-                                row_data.length(), MYF(0));
-
-        strmake(pk_value, row_data.c_ptr_safe(), row_data.length());
-        const char *lenStr = my_safe_itoa(10, (row_data.length()),
-                                          &buf[row_data.length()-1]);
-        referenced_FQTN.append(pk_value);
-        referenced_FQTN.append(HASH_STRING_SEPARATOR);
-        referenced_FQTN.append(lenStr);
-
-        my_free(buf);
-        my_free(pk_value);
-        key_list_to_hash.push_back(referenced_FQTN);
+        /*
+          Prefix the hash keys with the referenced index name.
+        */
+        std::string pke_prefix;
+        pke_prefix.reserve(NAME_LEN * 5);
+        pke.clear();
+        pke_prefix.append(f_key_info->referenced_key_name->str,
+                          f_key_info->referenced_key_name->length);
+        pke_prefix.append(HASH_STRING_SEPARATOR);
+        pke_prefix.append(f_key_info->referenced_db->str,
+                          f_key_info->referenced_db->length);
+        pke_prefix.append(HASH_STRING_SEPARATOR);
+        value_length= my_safe_itoa(10, f_key_info->referenced_db->length,
+                                   &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+        pke_prefix.append(value_length);
+        pke_prefix.append(f_key_info->referenced_table->str,
+                          f_key_info->referenced_table->length);
+        pke_prefix.append(HASH_STRING_SEPARATOR);
+        value_length= my_safe_itoa(10, f_key_info->referenced_table->length,
+                                   &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+        pke_prefix.append(value_length);
+
+        for (int collation_conversion_algorithm= COLLATION_CONVERSION_ALGORITHM;
+             collation_conversion_algorithm >= 0;
+             collation_conversion_algorithm--)
+        {
+          pke.assign(pke_prefix);
+          size_t length= 0;
+
+          List_iterator_fast<LEX_STRING> foreign_fields_iterator(f_key_info->foreign_fields);
+          while ((f_info= foreign_fields_iterator++))
+          {
+            for (uint i=0; i < table->s->fields; i++)
+            {
+              Field *field = table->field[i];
+              if (field->is_null(ptrdiff)) continue;
+
+              if (!my_strcasecmp(system_charset_info, field->field_name,
+                                 f_info->str)) {
+                /*
+                  Update the field offset, since we may be operating on
+                  table->record[0] or table->record[1] and both have
+                  different offsets.
+                */
+                field->move_field_offset(ptrdiff);
+
+                // convert using collation support conversion algorithm
+                if (COLLATION_CONVERSION_ALGORITHM == collation_conversion_algorithm)
+                {
+                  const CHARSET_INFO* cs= field->charset();
+                  length= cs->coll->strnxfrmlen(cs,
+                                           field->pack_length());
+                }
+                // convert using without collation support algorithm
+                else
+                {
+                  field->val_str(&row_data);
+                  length= row_data.length();
+                }
+
+                if (pk_value_size < length+1)
+                {
+                  pk_value_size= length+1;
+                  pk_value= (char*) my_realloc(key_memory_write_set_extraction,
+                                               pk_value, pk_value_size,
+                                               MYF(MY_ZEROFILL));
+                }
+
+                // convert using collation support conversion algorithm
+                if (COLLATION_CONVERSION_ALGORITHM == collation_conversion_algorithm)
+                {
+                  /*
+                    convert to normalized string and store so that it can be
+                    sorted using binary comparison functions like memcmp.
+                  */
+                  field->make_sort_key((uchar*)pk_value, length);
+                  pk_value[length]= 0;
+                }
+                // convert using without collation support algorithm
+                else
+                {
+                  strmake(pk_value, row_data.c_ptr_safe(), length);
+                }
+
+                pke.append(pk_value, length);
+                pke.append(HASH_STRING_SEPARATOR);
+                value_length= my_safe_itoa(10, length,
+                                           &value_length_buffer[VALUE_LENGTH_BUFFER_SIZE-1]);
+                pke.append(value_length);
+
+                /* revert the field object record offset back */
+                field->move_field_offset(-ptrdiff);
+              }
+            }
+          }
+
+          if (generate_hash_pke(pke, collation_conversion_algorithm, thd
+#ifndef NDEBUG
+                            , write_sets, hash_list
+#endif
+          ))
+          {
+            return true;
+          }
+          writeset_hashes_added++;
+        }
       }
     }
 
-    debug_check_for_write_sets(key_list_to_hash);
+    if (table->file->referenced_by_foreign_key())
+      ws_ctx->set_has_related_foreign_keys();
 
-    while(key_list_to_hash.size())
-    {
-      std::string prepared_string= key_list_to_hash.back();
-      key_list_to_hash.pop_back();
-      generate_hash_pke(prepared_string, thd);
-    }
+    my_free(pk_value);
+
+#ifndef NDEBUG
+    debug_check_for_write_sets(write_sets, hash_list);
+#endif
   }
-  DBUG_VOID_RETURN;
+
+  if (writeset_hashes_added == 0)
+    ws_ctx->set_has_missing_keys();
+
+  return false;
 }
diff --git a/sql/rpl_write_set_handler.h b/sql/rpl_write_set_handler.h
index b81ed0901aaa..8857e16c865c 100644
--- a/sql/rpl_write_set_handler.h
+++ b/sql/rpl_write_set_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,6 +23,8 @@
 #ifndef RPL_WRITE_SET_HANDLER_INCLUDED
 #define RPL_WRITE_SET_HANDLER_INCLUDED
 
+#include "my_global.h"
+
 extern const char *transaction_write_set_hashing_algorithms[];
 
 class THD;
@@ -35,7 +44,9 @@ const char* get_write_set_algorithm_string(unsigned int algorithm);
 
   @param[in] table - TABLE object
   @param[in] thd - THD object pointing to current thread.
+
+  @return true if an issues exists adding the pke, false otherwise
 */
-void add_pke(TABLE *table, THD *thd);
+bool add_pke(TABLE *table, THD *thd, const uchar *record);
 
 #endif
diff --git a/sql/rules_table_service.cc b/sql/rules_table_service.cc
index d4e9e8bc064e..739ec3030a7a 100644
--- a/sql/rules_table_service.cc
+++ b/sql/rules_table_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/select_lex_visitor.cc b/sql/select_lex_visitor.cc
index d377ade3708c..77ad2d996a87 100644
--- a/sql/select_lex_visitor.cc
+++ b/sql/select_lex_visitor.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/select_lex_visitor.h b/sql/select_lex_visitor.h
index e4797d8b6321..0f3259759ac9 100644
--- a/sql/select_lex_visitor.h
+++ b/sql/select_lex_visitor.h
@@ -1,15 +1,22 @@
 #ifndef SELECT_LEX_VISITOR_INCLUDED
 #define SELECT_LEX_VISITOR_INCLUDED
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc
index 31e9a79bb3ae..1db04cd2e41d 100644
--- a/sql/session_tracker.cc
+++ b/sql/session_tracker.cc
@@ -1,19 +1,25 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-
 #include "session_tracker.h"
 
 #include "hash.h"
@@ -22,8 +28,7 @@
 #include "sql_show.h"
 #include "xa.h"
 
-static void store_lenenc_string(String &to, const char *from,
-                                size_t length);
+static void store_lenenc_string(String &to, const char *from, size_t length);
 
 /**
   Session_sysvars_tracker
@@ -34,17 +39,14 @@ static void store_lenenc_string(String &to, const char *from,
   statement.
 */
 
-class Session_sysvars_tracker : public State_tracker
-{
+class Session_sysvars_tracker : public State_tracker {
 private:
-
   struct sysvar_node_st {
     LEX_STRING m_sysvar_name;
     bool m_changed;
   };
 
-  class vars_list
-  {
+  class vars_list {
   private:
     /**
       Registered system variables. (@@session_track_system_variables)
@@ -58,77 +60,60 @@ class Session_sysvars_tracker : public State_tracker
       is to be tracked.
     */
     bool track_all;
-    void init(const CHARSET_INFO *char_set)
-    {
-      variables_list= NULL;
-      my_hash_init(&m_registered_sysvars,
-		   const_cast<CHARSET_INFO *>(char_set),
-		   4, 0, 0, (my_hash_get_key) sysvars_get_key,
-		   my_free, HASH_UNIQUE,
-                   key_memory_THD_Session_tracker);
+    void init(const CHARSET_INFO *char_set) {
+      variables_list = NULL;
+      my_hash_init(&m_registered_sysvars, const_cast<CHARSET_INFO *>(char_set),
+                   4, 0, 0, (my_hash_get_key)sysvars_get_key, my_free,
+                   HASH_UNIQUE, key_memory_THD_Session_tracker);
     }
-    void free_hash()
-    {
-      if (my_hash_inited(&m_registered_sysvars))
-      {
-	my_hash_free(&m_registered_sysvars);
+    void free_hash() {
+      if (my_hash_inited(&m_registered_sysvars)) {
+        my_hash_free(&m_registered_sysvars);
       }
     }
 
-    uchar* search(const uchar* token, size_t length)
-    {
-      return (my_hash_search(&m_registered_sysvars, token,
-			     length));
+    uchar *search(const uchar *token, size_t length) {
+      return (my_hash_search(&m_registered_sysvars, token, length));
     }
 
   public:
-    vars_list(const CHARSET_INFO *char_set)
-    {
-      init(char_set);
-    }
+    vars_list(const CHARSET_INFO *char_set) { init(char_set); }
 
-    void claim_memory_ownership()
-    {
+    void claim_memory_ownership() {
       my_claim(variables_list);
       my_hash_claim(&m_registered_sysvars);
     }
 
-    ~vars_list()
-    {
+    ~vars_list() {
       /* free the allocated hash. */
-      if (my_hash_inited(&m_registered_sysvars))
-      {
-	my_hash_free(&m_registered_sysvars);
+      if (my_hash_inited(&m_registered_sysvars)) {
+        my_hash_free(&m_registered_sysvars);
       }
       if (variables_list)
-	my_free(variables_list);
-      variables_list= NULL;
+        my_free(variables_list);
+      variables_list = NULL;
     }
 
-    uchar* search(sysvar_node_st *node, LEX_STRING tmp)
-    {
+    uchar *search(sysvar_node_st *node, LEX_STRING tmp) {
       uchar *res;
-      res= search((const uchar *)tmp.str, tmp.length);
-      if (!res)
-      {
-	if (track_all)
-	{
-	  insert(node, tmp);
-	  return search((const uchar *)tmp.str, tmp.length);
-	}
+      res = search((const uchar *)tmp.str, tmp.length);
+      if (!res) {
+        if (track_all) {
+          insert(node, tmp);
+          return search((const uchar *)tmp.str, tmp.length);
+        }
       }
       return res;
     }
 
-    uchar* operator[](ulong idx)
-    {
+    uchar *operator[](ulong idx) {
       return my_hash_element(&m_registered_sysvars, idx);
     }
     bool insert(sysvar_node_st *node, LEX_STRING var);
     void reset();
-    bool update(vars_list* from, THD *thd);
+    bool update(vars_list *from, THD *thd);
     bool parse_var_list(THD *thd, LEX_STRING var_list, bool throw_error,
-	                const CHARSET_INFO *char_set, bool session_created);
+                        const CHARSET_INFO *char_set, bool session_created);
   };
   /**
     Two objects of vars_list type are maintained to manage
@@ -138,15 +123,13 @@ class Session_sysvars_tracker : public State_tracker
 
 public:
   /** Constructor */
-  Session_sysvars_tracker(const CHARSET_INFO *char_set)
-  {
-    orig_list= new (std::nothrow) vars_list(char_set);
-    tool_list= new (std::nothrow) vars_list(char_set);
+  Session_sysvars_tracker(const CHARSET_INFO *char_set) {
+    orig_list = new (std::nothrow) vars_list(char_set);
+    tool_list = new (std::nothrow) vars_list(char_set);
   }
 
   /** Destructor */
-  ~Session_sysvars_tracker()
-  {
+  ~Session_sysvars_tracker() {
     if (orig_list)
       delete orig_list;
     if (tool_list)
@@ -158,11 +141,11 @@ class Session_sysvars_tracker : public State_tracker
     for session_track_system_variables during the server
     startup.
   */
-  static bool server_init_check(const CHARSET_INFO *char_set, LEX_STRING var_list)
-  {
+  static bool server_init_check(const CHARSET_INFO *char_set,
+                                LEX_STRING var_list) {
     vars_list dummy(char_set);
     bool result;
-    result= dummy.parse_var_list(NULL, var_list, false, char_set, true);
+    result = dummy.parse_var_list(NULL, var_list, false, char_set, true);
     return result;
   }
 
@@ -176,8 +159,7 @@ class Session_sysvars_tracker : public State_tracker
   static uchar *sysvars_get_key(const char *entry, size_t *length,
                                 my_bool not_used MY_ATTRIBUTE((unused)));
 
-  virtual void claim_memory_ownership()
-  {
+  virtual void claim_memory_ownership() {
     if (orig_list != NULL)
       orig_list->claim_memory_ownership();
     if (tool_list != NULL)
@@ -185,7 +167,6 @@ class Session_sysvars_tracker : public State_tracker
   }
 };
 
-
 /**
   Current_schema_tracker
   ----------------------
@@ -193,31 +174,24 @@ class Session_sysvars_tracker : public State_tracker
   schema for a particular connection.
 */
 
-class Current_schema_tracker : public State_tracker
-{
+class Current_schema_tracker : public State_tracker {
 private:
   bool schema_track_inited;
   void reset();
 
 public:
-
   /** Constructor */
-  Current_schema_tracker()
-  {
-    schema_track_inited= false;
-  }
+  Current_schema_tracker() { schema_track_inited = false; }
 
-  bool enable(THD *thd)
-  { return update(thd); }
-  bool check(THD *thd, set_var *var)
-  { return false; }
+  bool enable(THD *thd) { return update(thd); }
+  bool check(THD *thd, set_var *var) { return false; }
   bool update(THD *thd);
   bool store(THD *thd, String &buf);
   void mark_as_changed(THD *thd, LEX_CSTRING *tracked_item_name);
 };
 
 /* To be used in expanding the buffer. */
-static const unsigned int EXTRA_ALLOC= 1024;
+static const unsigned int EXTRA_ALLOC = 1024;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -233,11 +207,10 @@ static const unsigned int EXTRA_ALLOC= 1024;
   New encoders can extend this interface/abstract class or extend
   other encoders in the hierarchy.
 */
-class Session_gtids_ctx_encoder
-{
+class Session_gtids_ctx_encoder {
 public:
   Session_gtids_ctx_encoder() {}
-  virtual ~Session_gtids_ctx_encoder() {};
+  virtual ~Session_gtids_ctx_encoder(){};
 
   /*
    This function SHALL encode the collected GTIDs into the buffer.
@@ -247,7 +220,7 @@ class Session_gtids_ctx_encoder
            if the return value is true, then the contents of the buffer is
            undefined.
    */
-  virtual bool encode(THD *thd, String& buf)= 0;
+  virtual bool encode(THD *thd, String &buf) = 0;
 
   /*
    This function SHALL return the encoding specification used in the
@@ -256,74 +229,76 @@ class Session_gtids_ctx_encoder
 
    @return the encoding specification code.
    */
-  virtual ulonglong encoding_specification()= 0;
+  virtual ulonglong encoding_specification() = 0;
+
 private:
   // not implemented
-  Session_gtids_ctx_encoder(const Session_gtids_ctx_encoder& rsc);
-  Session_gtids_ctx_encoder& operator=(const Session_gtids_ctx_encoder& rsc);
+  Session_gtids_ctx_encoder(const Session_gtids_ctx_encoder &rsc);
+  Session_gtids_ctx_encoder &operator=(const Session_gtids_ctx_encoder &rsc);
 };
 
-class Session_gtids_ctx_encoder_string : public Session_gtids_ctx_encoder
-{
+class Session_gtids_ctx_encoder_string : public Session_gtids_ctx_encoder {
 public:
-
   Session_gtids_ctx_encoder_string() {}
   ~Session_gtids_ctx_encoder_string() {}
 
   ulonglong encoding_specification() { return 0; }
 
-  bool encode(THD *thd, String& buf)
-  {
-    const Gtid_set* state=
-      thd->rpl_thd_ctx.session_gtids_ctx().state();
+  bool encode(THD *thd, String &buf) {
+    const Gtid_set *state = thd->rpl_thd_ctx.session_gtids_ctx().state();
 
-    if (!state->is_empty())
-    {
+    if (!state->is_empty()) {
       /*
         No need to use net_length_size in the following two fields.
         These are constants in this class and will both be encoded using
         only 1 byte.
       */
-      ulonglong tracker_type_enclen= 1 /* net_length_size((ulonglong)SESSION_TRACK_GTIDS); */;
-      ulonglong encoding_spec_enclen= 1 /* net_length_size(encoding_specification()); */;
-      ulonglong gtids_string_len= state->get_string_length(&Gtid_set::default_string_format);
-      ulonglong gtids_string_len_enclen= net_length_size(gtids_string_len);
-      ulonglong entity_len= encoding_spec_enclen + gtids_string_len_enclen +
-                            gtids_string_len;
-      ulonglong entity_len_enclen= net_length_size(entity_len);
-      ulonglong total_enclen= tracker_type_enclen + entity_len_enclen +
-                              encoding_spec_enclen + gtids_string_len_enclen +
-                              gtids_string_len;
+      ulonglong tracker_type_enclen =
+          1 /* net_length_size((ulonglong)SESSION_TRACK_GTIDS); */;
+      ulonglong encoding_spec_enclen =
+          1 /* net_length_size(encoding_specification()); */;
+      ulonglong gtids_string_len =
+          state->get_string_length(&Gtid_set::default_string_format);
+      ulonglong gtids_string_len_enclen = net_length_size(gtids_string_len);
+      ulonglong entity_len =
+          encoding_spec_enclen + gtids_string_len_enclen + gtids_string_len;
+      ulonglong entity_len_enclen = net_length_size(entity_len);
+      ulonglong total_enclen = tracker_type_enclen + entity_len_enclen +
+                               encoding_spec_enclen + gtids_string_len_enclen +
+                               gtids_string_len;
 
       /* prepare the buffer */
-      uchar *to= (uchar *) buf.prep_append(total_enclen, EXTRA_ALLOC);
+      uchar *to = (uchar *)buf.prep_append(total_enclen, EXTRA_ALLOC);
 
-     /* format of the payload is as follows:
-       [ tracker type] [len] [ encoding spec ] [gtid string len] [gtid string]
-      */
+      /* format of the payload is as follows:
+        [ tracker type] [len] [ encoding spec ] [gtid string len] [gtid string]
+       */
 
       /* Session state type (SESSION_TRACK_SCHEMA) */
-      *to= (uchar) SESSION_TRACK_GTIDS; to++;
+      *to = (uchar)SESSION_TRACK_GTIDS;
+      to++;
 
       /* Length of the overall entity. */
-      to= net_store_length(to, entity_len);
+      to = net_store_length(to, entity_len);
 
       /* encoding specification */
-      *to= (uchar) encoding_specification(); to++;
+      *to = (uchar)encoding_specification();
+      to++;
 
       /* the length of the gtid set string*/
-      to= net_store_length(to, gtids_string_len);
+      to = net_store_length(to, gtids_string_len);
 
       /* the actual gtid set string */
-      state->to_string((char*)to);
-
+      state->to_string((char *)to);
     }
     return false;
   }
+
 private:
   // not implemented
-  Session_gtids_ctx_encoder_string(const Session_gtids_ctx_encoder_string& rsc);
-  Session_gtids_ctx_encoder_string& operator=(const Session_gtids_ctx_encoder_string& rsc);
+  Session_gtids_ctx_encoder_string(const Session_gtids_ctx_encoder_string &rsc);
+  Session_gtids_ctx_encoder_string &
+  operator=(const Session_gtids_ctx_encoder_string &rsc);
 };
 
 /**
@@ -334,54 +309,46 @@ class Session_gtids_ctx_encoder_string : public Session_gtids_ctx_encoder
   consistency.
 */
 
-class Session_gtids_tracker : public State_tracker, Session_consistency_gtids_ctx::Ctx_change_listener
-{
+class Session_gtids_tracker
+    : public State_tracker,
+      Session_consistency_gtids_ctx::Ctx_change_listener {
 private:
   void reset();
-  Session_gtids_ctx_encoder* m_encoder;
+  Session_gtids_ctx_encoder *m_encoder;
 
 public:
-
   /** Constructor */
-  Session_gtids_tracker() : Session_consistency_gtids_ctx::Ctx_change_listener(),
-          m_encoder(NULL)
-  { }
+  Session_gtids_tracker()
+      : Session_consistency_gtids_ctx::Ctx_change_listener(), m_encoder(NULL) {}
 
-  ~Session_gtids_tracker()
-  {
+  ~Session_gtids_tracker() {
     /*
      Unregister the listener if the tracker is being freed. This is needed
      since this may happen after a change user command.
      */
     if (m_enabled && current_thd)
-      current_thd->rpl_thd_ctx.session_gtids_ctx().unregister_ctx_change_listener(this);
+      current_thd->rpl_thd_ctx.session_gtids_ctx()
+          .unregister_ctx_change_listener(this);
     if (m_encoder)
       delete m_encoder;
   }
 
-  bool enable(THD *thd)
-  { return update(thd); }
-  bool check(THD *thd, set_var *var)
-  { return false; }
+  bool enable(THD *thd) { return update(thd); }
+  bool check(THD *thd, set_var *var) { return false; }
   bool update(THD *thd);
   bool store(THD *thd, String &buf);
   void mark_as_changed(THD *thd, LEX_CSTRING *tracked_item_name);
 
   // implementation of the Session_gtids_ctx::Ctx_change_listener
-  void notify_session_gtids_ctx_change()
-  {
-    mark_as_changed(NULL, NULL);
-  }
+  void notify_session_gtids_ctx_change() { mark_as_changed(NULL, NULL); }
 };
 
-void Session_sysvars_tracker::vars_list::reset()
-{
+void Session_sysvars_tracker::vars_list::reset() {
   if (m_registered_sysvars.records)
     my_hash_reset(&m_registered_sysvars);
-  if (variables_list)
-  {
+  if (variables_list) {
     my_free(variables_list);
-    variables_list=NULL;
+    variables_list = NULL;
   }
 }
 
@@ -396,15 +363,14 @@ void Session_sysvars_tracker::vars_list::reset()
               Else the value of track_all.
 */
 
-bool Session_sysvars_tracker::vars_list::update(vars_list* from, THD *thd)
-{
+bool Session_sysvars_tracker::vars_list::update(vars_list *from, THD *thd) {
   reset();
-  variables_list= from->variables_list;
-  track_all= from->track_all;
+  variables_list = from->variables_list;
+  track_all = from->track_all;
   free_hash();
-  m_registered_sysvars= from->m_registered_sysvars;
+  m_registered_sysvars = from->m_registered_sysvars;
   from->init(thd->charset());
-  return (m_registered_sysvars.records)? true : track_all;
+  return (m_registered_sysvars.records) ? true : track_all;
 }
 
 /**
@@ -417,29 +383,25 @@ bool Session_sysvars_tracker::vars_list::update(vars_list* from, THD *thd)
             true   error
 */
 bool Session_sysvars_tracker::vars_list::insert(sysvar_node_st *node,
-                                                LEX_STRING var)
-{
-  if (!node)
-  {
-    if (!(node= (sysvar_node_st *) my_malloc(key_memory_THD_Session_tracker,
-					     sizeof(sysvar_node_st), MY_WME)))
-    {
+                                                LEX_STRING var) {
+  if (!node) {
+    if (!(node = (sysvar_node_st *)my_malloc(key_memory_THD_Session_tracker,
+                                             sizeof(sysvar_node_st), MY_WME))) {
       reset();
-      return true;                            /* Error */
+      return true; /* Error */
     }
   }
 
-  node->m_sysvar_name.str= var.str;
-  node->m_sysvar_name.length= var.length;
-  node->m_changed= false;
-  if (my_hash_insert(&m_registered_sysvars, (uchar *) node))
-  {
+  node->m_sysvar_name.str = var.str;
+  node->m_sysvar_name.length = var.length;
+  node->m_changed = false;
+  if (my_hash_insert(&m_registered_sysvars, (uchar *)node)) {
     /* Duplicate entry. */
     my_error(ER_DUP_LIST_ENTRY, MYF(0), var.str);
     reset();
     my_free(node);
     return true;
-  }                          /* Error */
+  } /* Error */
   return false;
 }
 
@@ -453,35 +415,32 @@ bool Session_sysvars_tracker::vars_list::insert(sysvar_node_st *node,
            variables from uninstalled plugins which might get installed in
            future.
 
-	Value of @@session_track_system_variables is initially put into
-	variables_list. This string is used to update the hash with valid
-	system variables.
+        Value of @@session_track_system_variables is initially put into
+        variables_list. This string is used to update the hash with valid
+        system variables.
 
   @param thd             [IN]    The thd handle.
   @param var_list        [IN]    System variable list.
   @param throw_error     [IN]    bool when set to true, returns an error
                                  in case of invalid/duplicate values.
   @param char_set	 [IN]	 charecter set information used for string
-				 manipulations.
+                                 manipulations.
   @param session_created [IN]    bool variable which says if the parse is
                                  already executed once. The mutex on variables
-				 is not acquired if this variable is false.
+                                 is not acquired if this variable is false.
 
   @return
     true                    Error
     false                   Success
 */
-bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, LEX_STRING var_list,
-                                                        bool throw_error,
-							const CHARSET_INFO *char_set,
-							bool session_created)
-{
-  const char *separator= ",";
-  char *token, *lasts= NULL;                    /* strtok_r */
-
-  if (!var_list.str)
-  {
-    variables_list= NULL;
+bool Session_sysvars_tracker::vars_list::parse_var_list(
+    THD *thd, LEX_STRING var_list, bool throw_error,
+    const CHARSET_INFO *char_set, bool session_created) {
+  const char *separator = ",";
+  char *token, *lasts = NULL; /* strtok_r */
+
+  if (!var_list.str) {
+    variables_list = NULL;
     return false;
   }
 
@@ -489,21 +448,18 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, LEX_STRING var
     Storing of the session_track_system_variables option
     string to be used by strtok_r().
   */
-  variables_list= my_strndup(key_memory_THD_Session_tracker,
-			     var_list.str, var_list.length,
-			     MYF(0));
-  if (variables_list)
-  {
-    if(!strcmp(variables_list,(const char *)"*"))
-    {
-      track_all= true;
+  variables_list = my_strndup(key_memory_THD_Session_tracker, var_list.str,
+                              var_list.length, MYF(0));
+  if (variables_list) {
+    if (!strcmp(variables_list, (const char *)"*")) {
+      track_all = true;
       return false;
     }
   }
 
-  token= my_strtok_r(variables_list, separator, &lasts);
+  token = my_strtok_r(variables_list, separator, &lasts);
 
-  track_all= false;
+  track_all = false;
   /*
     If Lock to the plugin mutex is not acquired here itself, it results
     in having to acquire it multiple times in find_sys_var_ex for each
@@ -512,49 +468,40 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, LEX_STRING var
   */
   if (!thd || session_created)
     lock_plugin_mutex();
-  while(token)
-  {
+  while (token) {
     LEX_STRING var;
-    var.str= token;
-    var.length= strlen(token);
+    var.str = token;
+    var.length = strlen(token);
 
     /* Remove leading/trailing whitespace. */
     trim_whitespace(char_set, &var);
 
-    if (!thd || session_created)
-    {
-      if (find_sys_var_ex(thd, var.str, var.length, throw_error, true))
-      {
-	if (insert(NULL, var) == TRUE)
-	{
-	/* Error inserting into the hash. */
-	  unlock_plugin_mutex();
-	  return true;                            /* Error */
-	}
+    if (!thd || session_created) {
+      if (find_sys_var_ex(thd, var.str, var.length, throw_error, true)) {
+        if (insert(NULL, var) == TRUE) {
+          /* Error inserting into the hash. */
+          unlock_plugin_mutex();
+          return true; /* Error */
+        }
       }
 
-      else if (throw_error)
-      {
-	DBUG_ASSERT(thd);
-	push_warning_printf(thd, Sql_condition::SL_WARNING, ER_WRONG_VALUE_FOR_VAR,
-			    "%s is not a valid system variable and will be ignored.", token);
-      }
-      else
-      {
-	unlock_plugin_mutex();
-	return true;
+      else if (throw_error) {
+        assert(thd);
+        push_warning_printf(
+            thd, Sql_condition::SL_WARNING, ER_WRONG_VALUE_FOR_VAR,
+            "%s is not a valid system variable and will be ignored.", token);
+      } else {
+        unlock_plugin_mutex();
+        return true;
       }
-    }
-    else
-    {
-      if (insert(NULL, var) == TRUE)
-      {
-      /* Error inserting into the hash. */
-	return true;                            /* Error */
+    } else {
+      if (insert(NULL, var) == TRUE) {
+        /* Error inserting into the hash. */
+        return true; /* Error */
       }
     }
 
-    token= my_strtok_r(NULL, separator, &lasts);
+    token = my_strtok_r(NULL, separator, &lasts);
   }
   if (!thd || session_created)
     unlock_plugin_mutex();
@@ -567,7 +514,7 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, LEX_STRING var
          During the initialization, a session's system variable gets a copy
          of the global variable. The new value of session_track_system_variables
          is then verified & tokenized to create a hash, which is then updated to
-	 orig_list which represents all the systems variables to be tracked.
+         orig_list which represents all the systems variables to be tracked.
 
   @param thd    [IN]        The thd handle.
 
@@ -576,25 +523,24 @@ bool Session_sysvars_tracker::vars_list::parse_var_list(THD *thd, LEX_STRING var
     false                   Success
 */
 
-bool Session_sysvars_tracker::enable(THD *thd)
-{
+bool Session_sysvars_tracker::enable(THD *thd) {
   LEX_STRING var_list;
 
   if (!thd->variables.track_sysvars_ptr)
     return false;
 
-  var_list.str= thd->variables.track_sysvars_ptr;
-  var_list.length= strlen(thd->variables.track_sysvars_ptr);
+  var_list.str = thd->variables.track_sysvars_ptr;
+  var_list.length = strlen(thd->variables.track_sysvars_ptr);
 
-  if (tool_list->parse_var_list(thd, var_list, true, thd->charset(), false) == true)
+  if (tool_list->parse_var_list(thd, var_list, true, thd->charset(), false) ==
+      true)
     return true;
 
-  m_enabled= orig_list->update(tool_list,thd);
+  m_enabled = orig_list->update(tool_list, thd);
 
   return false;
 }
 
-
 /**
   @brief Check if any of the system variable name(s) in the given list of
          system variables is duplicate/invalid.
@@ -615,18 +561,16 @@ bool Session_sysvars_tracker::enable(THD *thd)
     false                   Success
 */
 
-inline bool Session_sysvars_tracker::check(THD *thd, set_var *var)
-{
+inline bool Session_sysvars_tracker::check(THD *thd, set_var *var) {
   tool_list->reset();
   return tool_list->parse_var_list(thd, var->save_result.string_value, true,
                                    thd->charset(), true);
 }
 
-
 /**
   @brief Once the value of the @@session_track_system_variables has been
          successfully updated, this function calls
-	 Session_sysvars_tracker::vars_list::update updating the hash in
+         Session_sysvars_tracker::vars_list::update updating the hash in
          orig_list which represents the system variables to be tracked.
 
   @note This function is called from the ON_UPDATE() function of the
@@ -639,15 +583,13 @@ inline bool Session_sysvars_tracker::check(THD *thd, set_var *var)
     false                   Success
 */
 
-bool Session_sysvars_tracker::update(THD *thd)
-{
+bool Session_sysvars_tracker::update(THD *thd) {
   if (!thd->variables.track_sysvars_ptr)
     return false;
-  m_enabled= orig_list->update(tool_list,thd);
+  m_enabled = orig_list->update(tool_list, thd);
   return false;
 }
 
-
 /**
   @brief Store the data for changed system variables in the specified buffer.
          Once the data is stored, we reset the flags related to state-change
@@ -661,8 +603,7 @@ bool Session_sysvars_tracker::update(THD *thd)
     true                    Error
 */
 
-bool Session_sysvars_tracker::store(THD *thd, String &buf)
-{
+bool Session_sysvars_tracker::store(THD *thd, String &buf) {
   char val_buf[1024];
   const char *value;
   sysvar_node_st *node;
@@ -671,35 +612,32 @@ bool Session_sysvars_tracker::store(THD *thd, String &buf)
   const CHARSET_INFO *charset;
   size_t val_length, length;
   uchar *to;
-  int idx= 0;
+  int idx = 0;
 
-  if (!(show= (SHOW_VAR *) thd->alloc(sizeof(SHOW_VAR))))
+  if (!(show = (SHOW_VAR *)thd->alloc(sizeof(SHOW_VAR))))
     return true;
 
   /* As its always system variable. */
-  show->type= SHOW_SYS;
+  show->type = SHOW_SYS;
 
-  while ((node= (sysvar_node_st *) (*orig_list)[idx]))
-  {
+  while ((node = (sysvar_node_st *)(*orig_list)[idx])) {
     if (node->m_changed &&
-        (var= find_sys_var_ex(thd, node->m_sysvar_name.str,
-                              node->m_sysvar_name.length, true, false)))
-    {
-      show->name= var->name.str;
-      show->value= (char *) var;
+        (var = find_sys_var_ex(thd, node->m_sysvar_name.str,
+                               node->m_sysvar_name.length, true, false))) {
+      show->name = var->name.str;
+      show->value = (char *)var;
 
-      value= get_one_variable(thd, show, OPT_SESSION, show->type, NULL,
-                              &charset, val_buf, &val_length);
+      value = get_one_variable(thd, show, OPT_SESSION, show->type, NULL,
+                               &charset, val_buf, &val_length);
 
-      length= net_length_size(node->m_sysvar_name.length) +
-              node->m_sysvar_name.length +
-              net_length_size(val_length) +
-              val_length;
+      length = net_length_size(node->m_sysvar_name.length) +
+               node->m_sysvar_name.length + net_length_size(val_length) +
+               val_length;
 
-      to= (uchar *) buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
+      to = (uchar *)buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
 
       /* Session state type (SESSION_TRACK_SYSTEM_VARIABLES) */
-      to= net_store_length(to, (ulonglong)SESSION_TRACK_SYSTEM_VARIABLES);
+      to = net_store_length(to, (ulonglong)SESSION_TRACK_SYSTEM_VARIABLES);
 
       /* Length of the overall entity. */
       net_store_length(to, (ulonglong)length);
@@ -708,10 +646,27 @@ bool Session_sysvars_tracker::store(THD *thd, String &buf)
       store_lenenc_string(buf, node->m_sysvar_name.str,
                           node->m_sysvar_name.length);
 
+      DBUG_EXECUTE_IF(
+          "store_100_chars_charset_set_client_name",
+          if (!strncmp(node->m_sysvar_name.str, "character_set_client",
+                       node->m_sysvar_name.length)) {
+            value = "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789"
+                    "0123456789";
+            val_length = 100;
+          });
+
       /* System variable's value (length-encoded string). */
       store_lenenc_string(buf, value, val_length);
     }
-    ++ idx;
+    ++idx;
   }
 
   reset();
@@ -719,7 +674,6 @@ bool Session_sysvars_tracker::store(THD *thd, String &buf)
   return false;
 }
 
-
 /**
   @brief Mark the system variable with the specified name as changed.
 
@@ -728,27 +682,25 @@ bool Session_sysvars_tracker::store(THD *thd, String &buf)
   @return                   void
 */
 
-void Session_sysvars_tracker::mark_as_changed(THD *thd, LEX_CSTRING *tracked_item_name)
-{
-  DBUG_ASSERT(tracked_item_name->str);
-  sysvar_node_st *node= NULL;
+void Session_sysvars_tracker::mark_as_changed(THD *thd,
+                                              LEX_CSTRING *tracked_item_name) {
+  assert(tracked_item_name->str);
+  sysvar_node_st *node = NULL;
   LEX_STRING tmp;
-  tmp.str= (char *) tracked_item_name->str;
-  tmp.length= tracked_item_name->length;
+  tmp.str = (char *)tracked_item_name->str;
+  tmp.length = tracked_item_name->length;
   /*
     Check if the specified system variable is being tracked, if so
     mark it as changed and also set the class's m_changed flag.
   */
-  if ((node= (sysvar_node_st *) (orig_list->search(node, tmp))))
-  {
-    node->m_changed= true;
-    m_changed= true;
+  if ((node = (sysvar_node_st *)(orig_list->search(node, tmp)))) {
+    node->m_changed = true;
+    m_changed = true;
     /* do not cache the statement when there is change in session state */
-    thd->lex->safe_to_cache_query= 0;
+    thd->lex->safe_to_cache_query = 0;
   }
 }
 
-
 /**
   @brief Supply key to the hash implementation (to be used internally by the
          implementation).
@@ -760,34 +712,30 @@ void Session_sysvars_tracker::mark_as_changed(THD *thd, LEX_CSTRING *tracked_ite
   @return                   Pointer to the key buffer.
 */
 
-uchar *Session_sysvars_tracker::sysvars_get_key(const char *entry,
-                                                size_t *length,
-                                                my_bool not_used MY_ATTRIBUTE((unused)))
-{
+uchar *Session_sysvars_tracker::sysvars_get_key(
+    const char *entry, size_t *length,
+    my_bool not_used MY_ATTRIBUTE((unused))) {
   char *key;
-  key= ((sysvar_node_st *) entry)->m_sysvar_name.str;
-  *length= ((sysvar_node_st *) entry)->m_sysvar_name.length;
-  return (uchar *) key;
+  key = ((sysvar_node_st *)entry)->m_sysvar_name.str;
+  *length = ((sysvar_node_st *)entry)->m_sysvar_name.length;
+  return (uchar *)key;
 }
 
-
 /**
   @brief Prepare/reset the m_registered_sysvars hash for next statement.
 
   @return                   void
 */
 
-void Session_sysvars_tracker::reset()
-{
+void Session_sysvars_tracker::reset() {
   sysvar_node_st *node;
-  int idx= 0;
+  int idx = 0;
 
-  while ((node= (sysvar_node_st *) (*orig_list)[idx]))
-  {
-    node->m_changed= false;
-    ++ idx;
+  while ((node = (sysvar_node_st *)(*orig_list)[idx])) {
+    node->m_changed = false;
+    ++idx;
   }
-  m_changed= false;
+  m_changed = false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -801,13 +749,11 @@ void Session_sysvars_tracker::reset()
     false (always)
 */
 
-bool Current_schema_tracker::update(THD *thd)
-{
-  m_enabled= (thd->variables.session_track_schema)? true: false;
+bool Current_schema_tracker::update(THD *thd) {
+  m_enabled = (thd->variables.session_track_schema) ? true : false;
   return false;
 }
 
-
 /**
   @brief Store the schema name as length-encoded string in the specified
          buffer.  Once the data is stored, we reset the flags related to
@@ -822,21 +768,20 @@ bool Current_schema_tracker::update(THD *thd)
     true                    Error
 */
 
-bool Current_schema_tracker::store(THD *thd, String &buf)
-{
+bool Current_schema_tracker::store(THD *thd, String &buf) {
   ulonglong db_length, length;
 
-  length= db_length= thd->db().length;
+  length = db_length = thd->db().length;
   length += net_length_size(length);
 
-  uchar *to= (uchar *) buf.prep_append(net_length_size(length) + 1,
-                                       EXTRA_ALLOC);
+  uchar *to =
+      (uchar *)buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
 
   /* Session state type (SESSION_TRACK_SCHEMA) */
-  to= net_store_length(to, (ulonglong)SESSION_TRACK_SCHEMA);
+  to = net_store_length(to, (ulonglong)SESSION_TRACK_SCHEMA);
 
   /* Length of the overall entity. */
-  to= net_store_length(to, length);
+  to = net_store_length(to, length);
 
   /* Length of the changed current schema name. */
   net_store_length(to, db_length);
@@ -849,7 +794,6 @@ bool Current_schema_tracker::store(THD *thd, String &buf)
   return false;
 }
 
-
 /**
   @brief Mark the tracker as changed.
 
@@ -858,25 +802,19 @@ bool Current_schema_tracker::store(THD *thd, String &buf)
   @return void
 */
 
-void Current_schema_tracker::mark_as_changed(THD *thd,
-                                             LEX_CSTRING *tracked_item_name
-                                             MY_ATTRIBUTE((unused)))
-{
-  m_changed= true;
-  thd->lex->safe_to_cache_query= 0;
+void Current_schema_tracker::mark_as_changed(
+    THD *thd, LEX_CSTRING *tracked_item_name MY_ATTRIBUTE((unused))) {
+  m_changed = true;
+  thd->lex->safe_to_cache_query = 0;
 }
 
-
 /**
   @brief Reset the m_changed flag for next statement.
 
   @return                   void
 */
 
-void Current_schema_tracker::reset()
-{
-  m_changed= false;
-}
+void Current_schema_tracker::reset() { m_changed = false; }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -884,18 +822,17 @@ void Current_schema_tracker::reset()
    @brief Constructor for transaction state tracker.
 */
 
-Transaction_state_tracker::Transaction_state_tracker()
-{
-  m_enabled        = false;
-  tx_changed       = TX_CHG_NONE;
-  tx_curr_state    =
-  tx_reported_state= TX_EMPTY;
-  tx_read_flags    = TX_READ_INHERIT;
-  tx_isol_level    = TX_ISOL_INHERIT;
+Transaction_state_tracker::Transaction_state_tracker() {
+  m_enabled = false;
+  tx_changed = TX_CHG_NONE;
+  tx_curr_state = tx_reported_state = TX_EMPTY;
+  tx_read_flags = TX_READ_INHERIT;
+  tx_isol_level = TX_ISOL_INHERIT;
 }
 
 /**
-  @brief Enable/disable the tracker based on @@session_track_transaction_info's value.
+  @brief Enable/disable the tracker based on @@session_track_transaction_info's
+  value.
 
   @param thd [IN]           The thd handle.
 
@@ -903,37 +840,31 @@ Transaction_state_tracker::Transaction_state_tracker()
     true if updating the tracking level failed, false otherwise
 */
 
-bool Transaction_state_tracker::update(THD *thd)
-{
+bool Transaction_state_tracker::update(THD *thd) {
 #ifdef EMBEDDED_LIBRARY
   return true;
 
 #else
-  if (thd->variables.session_track_transaction_info != TX_TRACK_NONE)
-  {
+  if (thd->variables.session_track_transaction_info != TX_TRACK_NONE) {
     /*
       If we only just turned reporting on (rather than changing between
       state and chistics reporting), start from a defined state.
     */
-    if (!m_enabled)
-    {
-      tx_curr_state     =
-      tx_reported_state = TX_EMPTY;
-      tx_changed       |= TX_CHG_STATE;
-      m_enabled= true;
+    if (!m_enabled) {
+      tx_curr_state = tx_reported_state = TX_EMPTY;
+      tx_changed |= TX_CHG_STATE;
+      m_enabled = true;
     }
     if (thd->variables.session_track_transaction_info == TX_TRACK_CHISTICS)
-      tx_changed       |= TX_CHG_CHISTICS;
+      tx_changed |= TX_CHG_CHISTICS;
     mark_as_changed(thd, NULL);
-  }
-  else
-    m_enabled= false;
+  } else
+    m_enabled = false;
 
   return false;
 #endif
 }
 
-
 /**
   @brief Store the transaction state (and, optionally, characteristics)
          as length-encoded string in the specified buffer.  Once the data
@@ -948,38 +879,38 @@ bool Transaction_state_tracker::update(THD *thd)
     true                    Error
 */
 
-bool Transaction_state_tracker::store(THD *thd, String &buf)
-{
+bool Transaction_state_tracker::store(THD *thd, String &buf) {
   /* STATE */
-  if (tx_changed & TX_CHG_STATE)
-  {
-    uchar *to= (uchar *) buf.prep_append(11, EXTRA_ALLOC);
-
-    to= net_store_length((uchar *) to,
-                         (ulonglong) SESSION_TRACK_TRANSACTION_STATE);
-
-    to= net_store_length((uchar *) to, (ulonglong) 9);
-    to= net_store_length((uchar *) to, (ulonglong) 8);
-
-    *(to++)=  (tx_curr_state & TX_EXPLICIT)       ? 'T' :
-             ((tx_curr_state & TX_IMPLICIT)       ? 'I' : '_');
-    *(to++)=  (tx_curr_state & TX_READ_UNSAFE)    ? 'r' : '_';
-    *(to++)= ((tx_curr_state & TX_READ_TRX) ||
-              (tx_curr_state & TX_WITH_SNAPSHOT)) ? 'R' : '_';
-    *(to++)=  (tx_curr_state & TX_WRITE_UNSAFE)   ? 'w' : '_';
-    *(to++)=  (tx_curr_state & TX_WRITE_TRX)      ? 'W' : '_';
-    *(to++)=  (tx_curr_state & TX_STMT_UNSAFE)    ? 's' : '_';
-    *(to++)=  (tx_curr_state & TX_RESULT_SET)     ? 'S' : '_';
-    *(to++)=  (tx_curr_state & TX_LOCKED_TABLES)  ? 'L' : '_';
+  if (tx_changed & TX_CHG_STATE) {
+    uchar *to = (uchar *)buf.prep_append(11, EXTRA_ALLOC);
+
+    to = net_store_length((uchar *)to,
+                          (ulonglong)SESSION_TRACK_TRANSACTION_STATE);
+
+    to = net_store_length((uchar *)to, (ulonglong)9);
+    to = net_store_length((uchar *)to, (ulonglong)8);
+
+    *(to++) = (tx_curr_state & TX_EXPLICIT)
+                  ? 'T'
+                  : ((tx_curr_state & TX_IMPLICIT) ? 'I' : '_');
+    *(to++) = (tx_curr_state & TX_READ_UNSAFE) ? 'r' : '_';
+    *(to++) =
+        ((tx_curr_state & TX_READ_TRX) || (tx_curr_state & TX_WITH_SNAPSHOT))
+            ? 'R'
+            : '_';
+    *(to++) = (tx_curr_state & TX_WRITE_UNSAFE) ? 'w' : '_';
+    *(to++) = (tx_curr_state & TX_WRITE_TRX) ? 'W' : '_';
+    *(to++) = (tx_curr_state & TX_STMT_UNSAFE) ? 's' : '_';
+    *(to++) = (tx_curr_state & TX_RESULT_SET) ? 'S' : '_';
+    *(to++) = (tx_curr_state & TX_LOCKED_TABLES) ? 'L' : '_';
   }
 
   /* CHARACTERISTICS -- How to restart the transaction */
 
   if ((thd->variables.session_track_transaction_info == TX_TRACK_CHISTICS) &&
-      (tx_changed & TX_CHG_CHISTICS))
-  {
-    bool is_xa= !thd->get_transaction()->xid_state()
-                    ->has_state(XID_STATE::XA_NOTR);
+      (tx_changed & TX_CHG_CHISTICS)) {
+    bool is_xa =
+        !thd->get_transaction()->xid_state()->has_state(XID_STATE::XA_NOTR);
 
     // worst case: READ UNCOMMITTED + READ WRITE + CONSISTENT SNAPSHOT
     char buffer[110];
@@ -1068,18 +999,15 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
         "ISOLATION LEVEL"
         Only legal in SET TRANSACTION, so will always be replayed as such.
       */
-      if (tx_isol_level != TX_ISOL_INHERIT)
-      {
+      if (tx_isol_level != TX_ISOL_INHERIT) {
         /*
           Unfortunately, we can't re-use tx_isolation_names /
           tx_isolation_typelib as it hyphenates its items.
         */
-        LEX_CSTRING isol[]= {
-          { STRING_WITH_LEN("READ UNCOMMITTED") },
-          { STRING_WITH_LEN("READ COMMITTED") },
-          { STRING_WITH_LEN("REPEATABLE READ") },
-          { STRING_WITH_LEN("SERIALIZABLE") }
-        };
+        LEX_CSTRING isol[] = {{STRING_WITH_LEN("READ UNCOMMITTED")},
+                              {STRING_WITH_LEN("READ COMMITTED")},
+                              {STRING_WITH_LEN("REPEATABLE READ")},
+                              {STRING_WITH_LEN("SERIALIZABLE")}};
 
         tx.append(STRING_WITH_LEN("SET TRANSACTION ISOLATION LEVEL "));
         tx.append(isol[tx_isol_level - 1].str, isol[tx_isol_level - 1].length);
@@ -1095,8 +1023,7 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
         separately before adding XA START (whereas with START TRANSACTION,
         we can merge the access mode into the same statement).
       */
-      if ((tx_curr_state & TX_EXPLICIT) && !is_xa)
-      {
+      if ((tx_curr_state & TX_EXPLICIT) && !is_xa) {
         tx.append(STRING_WITH_LEN("START TRANSACTION"));
 
         /*
@@ -1104,8 +1031,7 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
           Defaults to no, can only be enabled.
           Only appears in START TRANSACTION.
         */
-        if (tx_curr_state & TX_WITH_SNAPSHOT)
-        {
+        if (tx_curr_state & TX_WITH_SNAPSHOT) {
           tx.append(STRING_WITH_LEN(" WITH CONSISTENT SNAPSHOT"));
           if (tx_read_flags != TX_READ_INHERIT)
             tx.append(STRING_WITH_LEN(","));
@@ -1127,17 +1053,14 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
           If READ is flagged as set explicitly (rather than just inherited
           from the session's default), we'll get the actual bool from the THD.
         */
-        if (tx_read_flags != TX_READ_INHERIT)
-        {
+        if (tx_read_flags != TX_READ_INHERIT) {
           if (tx_read_flags == TX_READ_ONLY)
             tx.append(STRING_WITH_LEN(" READ ONLY"));
           else
             tx.append(STRING_WITH_LEN(" READ WRITE"));
         }
         tx.append(STRING_WITH_LEN("; "));
-      }
-      else if (tx_read_flags != TX_READ_INHERIT)
-      {
+      } else if (tx_read_flags != TX_READ_INHERIT) {
         /*
           "READ ONLY" / "READ WRITE"
           We could transform this to SET TRANSACTION even when it occurs
@@ -1151,27 +1074,23 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
           tx.append(STRING_WITH_LEN("READ WRITE; "));
       }
 
-      if ((tx_curr_state & TX_EXPLICIT) && is_xa)
-      {
-        XID *xid=thd->get_transaction()->xid_state()->get_xid();
+      if ((tx_curr_state & TX_EXPLICIT) && is_xa) {
+        XID *xid = thd->get_transaction()->xid_state()->get_xid();
         long glen, blen;
 
         tx.append(STRING_WITH_LEN("XA START"));
 
-        if ((glen= xid->get_gtrid_length()) > 0)
-        {
+        if ((glen = xid->get_gtrid_length()) > 0) {
           tx.append(STRING_WITH_LEN(" '"));
           tx.append(xid->get_data(), glen);
 
-          if ((blen= xid->get_bqual_length()) > 0)
-          {
+          if ((blen = xid->get_bqual_length()) > 0) {
             tx.append(STRING_WITH_LEN("','"));
             tx.append(xid->get_data() + glen, blen);
           }
           tx.append(STRING_WITH_LEN("'"));
 
-          if (xid->get_format_id() != 1)
-          {
+          if (xid->get_format_id() != 1) {
             tx.append(STRING_WITH_LEN(","));
             tx.append_ulonglong(xid->get_format_id());
           }
@@ -1186,22 +1105,22 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
     }
 
     {
-      ulonglong length= tx.length();      // length of the string payload ...
+      ulonglong length = tx.length(); // length of the string payload ...
       /*
         We've set up the info string, now turn it into a proper tracker
         item we can send!
       */
-      length += net_length_size(length);  // ... plus that of its length
+      length += net_length_size(length); // ... plus that of its length
 
-      uchar *to= (uchar *) buf.prep_append(net_length_size(length) + 1,
-                                           EXTRA_ALLOC);
+      uchar *to =
+          (uchar *)buf.prep_append(net_length_size(length) + 1, EXTRA_ALLOC);
 
       /* Session state type (SESSION_TRACK_TRANSACTION_CHARACTERISTICS) */
-      to= net_store_length((uchar *) to,
-                         (ulonglong) SESSION_TRACK_TRANSACTION_CHARACTERISTICS);
+      to = net_store_length(
+          (uchar *)to, (ulonglong)SESSION_TRACK_TRANSACTION_CHARACTERISTICS);
 
       /* Length of the overall entity. */
-      to= net_store_length((uchar *) to, length);
+      to = net_store_length((uchar *)to, length);
 
       /* Transaction characteristics (length-encoded string). */
       store_lenenc_string(buf, tx.ptr(), tx.length());
@@ -1213,7 +1132,6 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
   return false;
 }
 
-
 /**
   @brief Mark the tracker as changed.
 
@@ -1222,28 +1140,23 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
   @return void
 */
 
-void Transaction_state_tracker::mark_as_changed(THD *thd,
-                                                LEX_CSTRING *tracked_item_name
-                                                MY_ATTRIBUTE((unused)))
-{
-  m_changed                    = true;
+void Transaction_state_tracker::mark_as_changed(
+    THD *thd, LEX_CSTRING *tracked_item_name MY_ATTRIBUTE((unused))) {
+  m_changed = true;
 }
 
-
 /**
   @brief Reset the m_changed flag for next statement.
 
   @return                   void
 */
 
-void Transaction_state_tracker::reset()
-{
-  m_changed         =  false;
-  tx_reported_state =  tx_curr_state;
-  tx_changed        =  TX_CHG_NONE;
+void Transaction_state_tracker::reset() {
+  m_changed = false;
+  tx_reported_state = tx_curr_state;
+  tx_changed = TX_CHG_NONE;
 }
 
-
 /**
   @brief  Helper function: turn table info into table access flag.
           Accepts table lock type and engine type flag (transactional/
@@ -1258,15 +1171,14 @@ void Transaction_state_tracker::reset()
 */
 enum_tx_state Transaction_state_tracker::calc_trx_state(THD *thd,
                                                         thr_lock_type l,
-                                                        bool has_trx)
-{
-  enum_tx_state      s;
-  bool               read= (l <= TL_READ_NO_INSERT);
+                                                        bool has_trx) {
+  enum_tx_state s;
+  bool read = (l <= TL_READ_NO_INSERT);
 
   if (read)
-    s= has_trx ? TX_READ_TRX  : TX_READ_UNSAFE;
+    s = has_trx ? TX_READ_TRX : TX_READ_UNSAFE;
   else
-    s= has_trx ? TX_WRITE_TRX : TX_WRITE_UNSAFE;
+    s = has_trx ? TX_WRITE_TRX : TX_WRITE_UNSAFE;
 
   return s;
 }
@@ -1276,17 +1188,15 @@ enum_tx_state Transaction_state_tracker::calc_trx_state(THD *thd,
 
   @param thd [IN]           The thd handle
 */
-void Transaction_state_tracker::end_trx(THD *thd)
-{
-  DBUG_ASSERT(thd->variables.session_track_transaction_info > TX_TRACK_NONE);
+void Transaction_state_tracker::end_trx(THD *thd) {
+  assert(thd->variables.session_track_transaction_info > TX_TRACK_NONE);
 
   if ((!m_enabled) || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL))
     return;
 
-  if (tx_curr_state != TX_EMPTY)
-  {
+  if (tx_curr_state != TX_EMPTY) {
     if (tx_curr_state & TX_EXPLICIT)
-      tx_changed  |= TX_CHG_CHISTICS;
+      tx_changed |= TX_CHG_CHISTICS;
     tx_curr_state &= TX_LOCKED_TABLES;
   }
   update_change_flags(thd);
@@ -1299,8 +1209,7 @@ void Transaction_state_tracker::end_trx(THD *thd)
   @param thd [IN]           The thd handle.
   @param set [IN]           The flags to clear
 */
-void Transaction_state_tracker::clear_trx_state(THD *thd, uint clear)
-{
+void Transaction_state_tracker::clear_trx_state(THD *thd, uint clear) {
   if ((!m_enabled) || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL))
     return;
 
@@ -1316,13 +1225,11 @@ void Transaction_state_tracker::clear_trx_state(THD *thd, uint clear)
   @param thd [IN]           The thd handle.
   @param set [IN]           The flags to add
 */
-void Transaction_state_tracker::add_trx_state(THD *thd, uint add)
-{
+void Transaction_state_tracker::add_trx_state(THD *thd, uint add) {
   if ((!m_enabled) || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL))
     return;
 
-  if (add == TX_EXPLICIT)
-  {
+  if (add == TX_EXPLICIT) {
     /*
       Always send chistics item (if tracked), always replace state.
     */
@@ -1334,7 +1241,7 @@ void Transaction_state_tracker::add_trx_state(THD *thd, uint add)
     If we're not in an implicit or explicit transaction, but
     autocommit==0 and tables are accessed, we flag "implicit transaction."
   */
-  else if (!(tx_curr_state & (TX_EXPLICIT|TX_IMPLICIT)) &&
+  else if (!(tx_curr_state & (TX_EXPLICIT | TX_IMPLICIT)) &&
            (thd->variables.option_bits & OPTION_NOT_AUTOCOMMIT) &&
            (add &
             (TX_READ_TRX | TX_READ_UNSAFE | TX_WRITE_TRX | TX_WRITE_UNSAFE)))
@@ -1343,8 +1250,7 @@ void Transaction_state_tracker::add_trx_state(THD *thd, uint add)
   /*
     Only flag state when in transaction or LOCK TABLES is added.
   */
-  if ((tx_curr_state & (TX_EXPLICIT | TX_IMPLICIT)) ||
-      (add & TX_LOCKED_TABLES))
+  if ((tx_curr_state & (TX_EXPLICIT | TX_IMPLICIT)) || (add & TX_LOCKED_TABLES))
     tx_curr_state |= add;
 
   update_change_flags(thd);
@@ -1356,14 +1262,12 @@ void Transaction_state_tracker::add_trx_state(THD *thd, uint add)
   @param thd [IN]           The thd handle.
   @param set [IN]           The flags to add
 */
-void Transaction_state_tracker::add_trx_state_from_thd(THD *thd)
-{
-  if (m_enabled)
-  {
+void Transaction_state_tracker::add_trx_state_from_thd(THD *thd) {
+  if (m_enabled) {
     if (thd->lex->is_stmt_unsafe())
       add_trx_state(thd, TX_STMT_UNSAFE);
 
-//    update_change_flags(thd); ###
+    //    update_change_flags(thd); ###
   }
 }
 
@@ -1375,12 +1279,10 @@ void Transaction_state_tracker::add_trx_state_from_thd(THD *thd)
   @param set [IN]           The flags to set
 */
 void Transaction_state_tracker::set_read_flags(THD *thd,
-                                               enum enum_tx_read_flags flags)
-{
-  if (m_enabled && (tx_read_flags != flags))
-  {
+                                               enum enum_tx_read_flags flags) {
+  if (m_enabled && (tx_read_flags != flags)) {
     tx_read_flags = flags;
-    tx_changed   |= TX_CHG_CHISTICS;
+    tx_changed |= TX_CHG_CHISTICS;
     mark_as_changed(thd, NULL);
   }
 }
@@ -1392,23 +1294,19 @@ void Transaction_state_tracker::set_read_flags(THD *thd,
   @param set [IN]           The isolation level to set
 */
 void Transaction_state_tracker::set_isol_level(THD *thd,
-                                               enum enum_tx_isol_level level)
-{
-  if (m_enabled && (tx_isol_level != level))
-  {
+                                               enum enum_tx_isol_level level) {
+  if (m_enabled && (tx_isol_level != level)) {
     tx_isol_level = level;
-    tx_changed   |= TX_CHG_CHISTICS;
+    tx_changed |= TX_CHG_CHISTICS;
     mark_as_changed(thd, NULL);
   }
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
- 
+
 /** Constructor */
-Session_state_change_tracker::Session_state_change_tracker()
-{
-  m_changed= false;
+Session_state_change_tracker::Session_state_change_tracker() {
+  m_changed = false;
 }
 
 /**
@@ -1420,9 +1318,8 @@ Session_state_change_tracker::Session_state_change_tracker()
 
 **/
 
-bool Session_state_change_tracker::enable(THD *thd)
-{
-  m_enabled= (thd->variables.session_track_state_change)? true: false;
+bool Session_state_change_tracker::enable(THD *thd) {
+  m_enabled = (thd->variables.session_track_state_change) ? true : false;
   return false;
 }
 
@@ -1434,10 +1331,7 @@ bool Session_state_change_tracker::enable(THD *thd)
 
 **/
 
-bool Session_state_change_tracker::update(THD *thd)
-{
-  return enable(thd);
-}
+bool Session_state_change_tracker::update(THD *thd) { return enable(thd); }
 
 /**
   @brief Store the 1byte boolean flag in the specified buffer. Once the
@@ -1453,24 +1347,23 @@ bool Session_state_change_tracker::update(THD *thd)
     true                    Error
 **/
 
-bool Session_state_change_tracker::store(THD *thd, String &buf)
-{
+bool Session_state_change_tracker::store(THD *thd, String &buf) {
   /* since its a boolean tracker length is always 1 */
-  const ulonglong length= 1;
+  const ulonglong length = 1;
 
-  uchar *to= (uchar *) buf.prep_append(3,EXTRA_ALLOC);
+  uchar *to = (uchar *)buf.prep_append(3, EXTRA_ALLOC);
 
   /* format of the payload is as follows:
      [ tracker type] [length] [1 byte flag] */
 
   /* Session state type (SESSION_TRACK_STATE_CHANGE) */
-  to= net_store_length(to, (ulonglong)SESSION_TRACK_STATE_CHANGE);
+  to = net_store_length(to, (ulonglong)SESSION_TRACK_STATE_CHANGE);
 
   /* Length of the overall entity it is always 1 byte */
-  to= net_store_length(to, length);
+  to = net_store_length(to, length);
 
   /* boolean tracker will go here */
-  *to= (is_state_changed(thd) ? '1' : '0');
+  *to = (is_state_changed(thd) ? '1' : '0');
 
   reset();
 
@@ -1485,18 +1378,16 @@ bool Session_state_change_tracker::store(THD *thd, String &buf)
   @return void
 */
 
-void Session_state_change_tracker::mark_as_changed(THD *thd,
-                                                   LEX_CSTRING *tracked_item_name)
-{
+void Session_state_change_tracker::mark_as_changed(
+    THD *thd, LEX_CSTRING *tracked_item_name) {
   /* do not send the boolean flag for the tracker itself
      in the OK packet */
-  if(tracked_item_name &&
-     (strncmp(tracked_item_name->str, "session_track_state_change", 26) == 0))
-    m_changed= false;
-  else
-  {
-    m_changed= true;
-    thd->lex->safe_to_cache_query= 0;
+  if (tracked_item_name &&
+      (strncmp(tracked_item_name->str, "session_track_state_change", 26) == 0))
+    m_changed = false;
+  else {
+    m_changed = true;
+    thd->lex->safe_to_cache_query = 0;
   }
 }
 
@@ -1506,10 +1397,7 @@ void Session_state_change_tracker::mark_as_changed(THD *thd,
   @return                   void
 */
 
-void Session_state_change_tracker::reset()
-{
-  m_changed= false;
-}
+void Session_state_change_tracker::reset() { m_changed = false; }
 
 /**
   @brief find if there is a session state change
@@ -1519,8 +1407,7 @@ void Session_state_change_tracker::reset()
   false - if there is no session state change
 **/
 
-bool Session_state_change_tracker::is_state_changed(THD* thd)
-{
+bool Session_state_change_tracker::is_state_changed(THD *thd) {
   return m_changed;
 }
 
@@ -1534,23 +1421,20 @@ bool Session_state_change_tracker::is_state_changed(THD* thd)
   @return                   void
 */
 
-void Session_tracker::init(const CHARSET_INFO *char_set)
-{
-  m_trackers[SESSION_SYSVARS_TRACKER]=
-    new (std::nothrow) Session_sysvars_tracker(char_set);
-  m_trackers[CURRENT_SCHEMA_TRACKER]=
-    new (std::nothrow) Current_schema_tracker;
-  m_trackers[SESSION_STATE_CHANGE_TRACKER]=
-    new (std::nothrow) Session_state_change_tracker;
-  m_trackers[SESSION_GTIDS_TRACKER]=
-    new (std::nothrow) Session_gtids_tracker;
-  m_trackers[TRANSACTION_INFO_TRACKER]=
-    new (std::nothrow) Transaction_state_tracker;
+void Session_tracker::init(const CHARSET_INFO *char_set) {
+  m_trackers[SESSION_SYSVARS_TRACKER] =
+      new (std::nothrow) Session_sysvars_tracker(char_set);
+  m_trackers[CURRENT_SCHEMA_TRACKER] =
+      new (std::nothrow) Current_schema_tracker;
+  m_trackers[SESSION_STATE_CHANGE_TRACKER] =
+      new (std::nothrow) Session_state_change_tracker;
+  m_trackers[SESSION_GTIDS_TRACKER] = new (std::nothrow) Session_gtids_tracker;
+  m_trackers[TRANSACTION_INFO_TRACKER] =
+      new (std::nothrow) Transaction_state_tracker;
 }
 
-void Session_tracker::claim_memory_ownership()
-{
-  for (int i= 0; i <= SESSION_TRACKER_END; i ++)
+void Session_tracker::claim_memory_ownership() {
+  for (int i = 0; i <= SESSION_TRACKER_END; i++)
     m_trackers[i]->claim_memory_ownership();
 }
 
@@ -1561,9 +1445,8 @@ void Session_tracker::claim_memory_ownership()
 
   @return            void
 */
-void Session_tracker::enable(THD *thd)
-{
-  for (int i= 0; i <= SESSION_TRACKER_END; i ++)
+void Session_tracker::enable(THD *thd) {
+  for (int i = 0; i <= SESSION_TRACKER_END; i++)
     m_trackers[i]->enable(thd);
 }
 
@@ -1578,18 +1461,15 @@ void Session_tracker::enable(THD *thd)
             true            failure
 */
 bool Session_tracker::server_boot_verify(const CHARSET_INFO *char_set,
-                                         LEX_STRING var_list)
-{
+                                         LEX_STRING var_list) {
   Session_sysvars_tracker *server_tracker;
   bool result;
-  server_tracker= new (std::nothrow) Session_sysvars_tracker(char_set);
-  result= server_tracker->server_init_check(char_set, var_list);
+  server_tracker = new (std::nothrow) Session_sysvars_tracker(char_set);
+  result = server_tracker->server_init_check(char_set, var_list);
   delete server_tracker;
   return result;
 }
 
-
-
 /**
   @brief Returns the pointer to the tracker object for the specified tracker.
 
@@ -1599,12 +1479,10 @@ bool Session_tracker::server_boot_verify(const CHARSET_INFO *char_set,
 */
 
 State_tracker *
-Session_tracker::get_tracker(enum_session_tracker tracker) const
-{
+Session_tracker::get_tracker(enum_session_tracker tracker) const {
   return m_trackers[tracker];
 }
 
-
 /**
   @brief Checks if m_enabled flag is set for any of the tracker objects.
 
@@ -1614,10 +1492,8 @@ Session_tracker::get_tracker(enum_session_tracker tracker) const
 
 */
 
-bool Session_tracker::enabled_any()
-{
-  for (int i= 0; i <= SESSION_TRACKER_END; i ++)
-  {
+bool Session_tracker::enabled_any() {
+  for (int i = 0; i <= SESSION_TRACKER_END; i++) {
     if (m_trackers[i]->is_enabled())
       return true;
   }
@@ -1633,17 +1509,14 @@ bool Session_tracker::enabled_any()
     false                   None of the entities being tracked has changed.
 */
 
-bool Session_tracker::changed_any()
-{
-  for (int i= 0; i <= SESSION_TRACKER_END; i ++)
-  {
+bool Session_tracker::changed_any() {
+  for (int i = 0; i <= SESSION_TRACKER_END; i++) {
     if (m_trackers[i]->is_changed())
       return true;
   }
   return false;
 }
 
-
 /**
   @brief Store all change information in the specified buffer.
 
@@ -1654,30 +1527,27 @@ bool Session_tracker::changed_any()
   @return                   void
 */
 
-void Session_tracker::store(THD *thd, String &buf)
-{
+void Session_tracker::store(THD *thd, String &buf) {
   /* Temporary buffer to store all the changes. */
   String temp;
   size_t length;
 
   /* Get total length. */
-  for (int i= 0; i <= SESSION_TRACKER_END; i ++)
-  {
+  for (int i = 0; i <= SESSION_TRACKER_END; i++) {
     if (m_trackers[i]->is_changed())
       m_trackers[i]->store(thd, temp);
   }
 
-  length= temp.length();
+  length = temp.length();
   /* Store length first.. */
-  char *to= buf.prep_append(net_length_size(length), EXTRA_ALLOC);
-  net_store_length((uchar *) to, length);
+  char *to = buf.prep_append(net_length_size(length), EXTRA_ALLOC);
+  net_store_length((uchar *)to, length);
 
   /* .. and then the actual info. */
   buf.append(temp);
   temp.mem_free();
 }
 
-
 /**
   @brief Stores the given string in length-encoded format into the specified
          buffer.
@@ -1689,12 +1559,15 @@ void Session_tracker::store(THD *thd, String &buf)
   @return                   void.
 */
 
-static
-void store_lenenc_string(String &to, const char *from, size_t length)
-{
+static void store_lenenc_string(String &to, const char *from, size_t length) {
   char *ptr;
-  ptr= to.prep_append(net_length_size(length), EXTRA_ALLOC);
-  net_store_length((uchar *) ptr, length);
+  ptr = to.prep_append(net_length_size(length), EXTRA_ALLOC);
+  DBUG_EXECUTE_IF("session_tracker_store_lenenc_string_add1M",
+                  length += 1000000L;);
+  net_store_length((uchar *)ptr, length);
+  DBUG_EXECUTE_IF("session_tracker_store_lenenc_string_add1M",
+                  length -= 1000000L;);
+  net_store_length((uchar *)ptr, length);
   to.append(from, length);
 }
 
@@ -1707,8 +1580,7 @@ void store_lenenc_string(String &to, const char *from, size_t length)
     false (always)
 */
 
-bool Session_gtids_tracker::update(THD *thd)
-{
+bool Session_gtids_tracker::update(THD *thd) {
   /*
     We are updating this using the previous value. No change needed.
     Bailing out.
@@ -1716,17 +1588,16 @@ bool Session_gtids_tracker::update(THD *thd)
   if (m_enabled == (thd->variables.session_track_gtids != OFF))
     return false;
 
-  m_enabled= thd->variables.session_track_gtids != OFF &&
-             /* No need to track GTIDs for system threads. */
-             thd->system_thread == NON_SYSTEM_THREAD;
-  if (m_enabled)
-  {
+  m_enabled = thd->variables.session_track_gtids != OFF &&
+              /* No need to track GTIDs for system threads. */
+              thd->system_thread == NON_SYSTEM_THREAD;
+  if (m_enabled) {
     // register to listen to gtids context state changes
-    thd->rpl_thd_ctx.session_gtids_ctx().register_ctx_change_listener(this, thd);
+    thd->rpl_thd_ctx.session_gtids_ctx().register_ctx_change_listener(this,
+                                                                      thd);
 
     // instantiate the encoder if needed
-    if (m_encoder == NULL)
-    {
+    if (m_encoder == NULL) {
       /*
        TODO: in the future, there can be a variable to control which
        encoder instance to instantiate here.
@@ -1736,7 +1607,7 @@ bool Session_gtids_tracker::update(THD *thd)
 
        Right now, by default we instantiate the encoder that has.
       */
-      m_encoder= new Session_gtids_ctx_encoder_string();
+      m_encoder = new Session_gtids_ctx_encoder_string();
     }
   }
   // else /* break the bridge between tracker and collector */
@@ -1757,8 +1628,7 @@ bool Session_gtids_tracker::update(THD *thd)
     true                    Error
 */
 
-bool Session_gtids_tracker::store(THD *thd, String &buf)
-{
+bool Session_gtids_tracker::store(THD *thd, String &buf) {
   if (m_encoder && m_encoder->encode(thd, buf))
     return true;
   reset();
@@ -1776,32 +1646,29 @@ bool Session_gtids_tracker::store(THD *thd, String &buf)
 
 void Session_gtids_tracker::mark_as_changed(THD *thd MY_ATTRIBUTE((unused)),
                                             LEX_CSTRING *tracked_item_name
-                                            MY_ATTRIBUTE((unused)))
-{
-  m_changed= true;
+                                                MY_ATTRIBUTE((unused))) {
+  m_changed = true;
 }
 
-
 /**
   @brief Reset the m_changed flag for next statement.
 
   @return                   void
 */
 
-void Session_gtids_tracker::reset()
-{
+void Session_gtids_tracker::reset() {
   /*
    Delete the encoder and remove the listener if this had been previously
    deactivated.
    */
-  if (!m_enabled && m_encoder)
-  {
+  if (!m_enabled && m_encoder) {
     /* No need to listen to gtids context state changes */
-    current_thd->rpl_thd_ctx.session_gtids_ctx().unregister_ctx_change_listener(this);
+    current_thd->rpl_thd_ctx.session_gtids_ctx().unregister_ctx_change_listener(
+        this);
 
     // delete the encoder (just to free memory)
     delete m_encoder; // if not tracking, delete the encoder
-    m_encoder= NULL;
+    m_encoder = NULL;
   }
-  m_changed= false;
+  m_changed = false;
 }
diff --git a/sql/session_tracker.h b/sql/session_tracker.h
index 81f668e69aa1..b419bb888d46 100644
--- a/sql/session_tracker.h
+++ b/sql/session_tracker.h
@@ -1,16 +1,23 @@
 #ifndef SESSION_TRACKER_INCLUDED
 #define SESSION_TRACKER_INCLUDED
 
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -120,13 +127,13 @@ class Session_tracker
   /** Copy constructor */
   Session_tracker(Session_tracker const &other)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
   }
 
   /** Copy assignment operator */
   Session_tracker& operator= (Session_tracker const &rhs)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return *this;
   }
 
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 69661b4757f4..198499c59f77 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -15,6 +22,7 @@
 
 /* variable declarations are in sys_vars.cc now !!! */
 
+#include "debug_sync.h"
 #include "set_var.h"
 
 #include "hash.h"                // HASH
@@ -50,7 +58,7 @@ int sys_var_init()
   DBUG_ENTER("sys_var_init");
 
   /* Must be already initialized. */
-  DBUG_ASSERT(system_charset_info != NULL);
+  assert(system_charset_info != NULL);
 
   if (my_hash_init(&system_variable_hash, system_charset_info, 100, 0,
                    0, (my_hash_get_key) get_sys_var_length, 0, HASH_UNIQUE,
@@ -133,7 +141,8 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg,
   next(0),
   binlog_status(binlog_status_arg),
   flags(flags_arg), m_parse_flag(parse_flag), show_val_type(show_val_type_arg),
-  guard(lock), offset(off), on_check(on_check_func), on_update(on_update_func),
+  guard(lock), offset(off), on_check(on_check_func),
+  pre_update(0), on_update(on_update_func),
   deprecation_substitute(substitute),
   is_os_charset(FALSE)
 {
@@ -146,11 +155,11 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg,
     in the first (PARSE_EARLY) stage.
     See handle_options() for details.
   */
-  DBUG_ASSERT(parse_flag == PARSE_NORMAL || getopt_id <= 0 || getopt_id >= 255);
+  assert(parse_flag == PARSE_NORMAL || getopt_id <= 0 || getopt_id >= 255);
 
   name.str= name_arg;     // ER_NO_DEFAULT relies on 0-termination of name_arg
   name.length= strlen(name_arg);                // and so does this.
-  DBUG_ASSERT(name.length <= NAME_CHAR_LEN);
+  assert(name.length <= NAME_CHAR_LEN);
 
   memset(&option, 0, sizeof(option));
   option.name= name_arg;
@@ -169,6 +178,14 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg,
 
 bool sys_var::update(THD *thd, set_var *var)
 {
+  /*
+    Invoke preparatory step for updating a system variable. Doing this action
+    before we have acquired any locks allows to invoke code which acquires other
+    locks without introducing deadlocks.
+  */
+  if (pre_update && pre_update(this, thd, var))
+    return true;
+
   enum_var_type type= var->type;
   if (type == OPT_GLOBAL || scope() == GLOBAL)
   {
@@ -293,6 +310,42 @@ bool sys_var::set_default(THD *thd, set_var* var)
   DBUG_RETURN(ret);
 }
 
+Sys_var_tracker::Sys_var_tracker(sys_var *var)
+{
+  m_is_dynamic = (var->cast_pluginvar() != NULL);
+  m_name = (m_is_dynamic ? current_thd->strmake(var->name) : var->name);
+  m_var = (m_is_dynamic ? NULL : var);
+}
+
+sys_var *Sys_var_tracker::bind_system_variable(THD *thd) {
+  if (!m_is_dynamic ||                                               // (1)
+      (m_var != NULL &&                                              // (2)
+       thd->state == Query_arena::STMT_INITIALIZED_FOR_SP))          // (3)
+  {
+    /*
+      Return a previous cached value of a system variable:
+
+      - if this is a static variable (1) then always return its cached value.
+
+      - if SP body evaluation is in the process (3), and if this is not
+        a resolver phase (2): the resolver phase caches the value and the
+        executor phase reuses it; this can work since SQL statements
+        referencing SP calls don't release plugins acquired by those SP
+        calls until the SPs removed from the server memory.
+    */
+    return m_var;
+  }
+
+  m_var= find_sys_var(thd, m_name.str, m_name.length);
+  if (m_var == NULL)
+  {
+    my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), m_name.str);
+    return NULL;
+  }
+
+  return m_var;
+}
+
 void sys_var::do_deprecated_warning(THD *thd)
 {
   if (deprecation_substitute != NULL)
@@ -533,8 +586,8 @@ bool enumerate_sys_vars(THD *thd, Show_var_array *show_var_array,
                         enum enum_var_type query_scope,
                         bool strict)
 {
-  DBUG_ASSERT(show_var_array != NULL);
-  DBUG_ASSERT(query_scope == OPT_SESSION || query_scope == OPT_GLOBAL);
+  assert(show_var_array != NULL);
+  assert(query_scope == OPT_SESSION || query_scope == OPT_GLOBAL);
   int count= system_variable_hash.records;
   
   /* Resize array if necessary. */
@@ -663,6 +716,11 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list)
   }
 
 err:
+  it.rewind();
+  while ((var= it++))
+  {
+    var->cleanup();
+  }
   free_underlaid_joins(thd, thd->lex->select_lex);
   DBUG_RETURN(error);
 }
@@ -693,7 +751,7 @@ bool keyring_access_test()
 
 set_var::set_var(enum_var_type type_arg, sys_var *var_arg,
                  const LEX_STRING *base_name_arg, Item *value_arg)
-  :var(var_arg), type(type_arg), base(*base_name_arg)
+  :var(NULL), type(type_arg), base(*base_name_arg), var_tracker(var_arg)
 {
   /*
     If the set value is a field, change it to a string to allow things like
@@ -734,6 +792,15 @@ set_var::set_var(enum_var_type type_arg, sys_var *var_arg,
 int set_var::check(THD *thd)
 {
   DBUG_ENTER("set_var::check");
+  DEBUG_SYNC(current_thd, "after_error_checking");
+
+  assert(var == NULL);
+  var= var_tracker.bind_system_variable(thd);
+  if (var == NULL)
+  {
+    DBUG_RETURN(-1);
+  }
+
   var->do_deprecated_warning(thd);
   if (var->is_readonly())
   {
@@ -790,6 +857,12 @@ int set_var::check(THD *thd)
 */
 int set_var::light_check(THD *thd)
 {
+  var= var_tracker.bind_system_variable(thd);
+  if (var == NULL)
+  {
+    return 1;
+  }
+
   if (!var->check_scope(type))
   {
     int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE;
@@ -819,6 +892,8 @@ int set_var::light_check(THD *thd)
 */
 int set_var::update(THD *thd)
 {
+  assert(var != NULL);
+
   return value ? var->update(thd, this) : var->set_default(thd, this);
 }
 
diff --git a/sql/set_var.h b/sql/set_var.h
index f75b1001adfb..eee7070c6aa8 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -1,15 +1,22 @@
 #ifndef SET_VAR_INCLUDED
 #define SET_VAR_INCLUDED
-/* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -102,6 +109,7 @@ class sys_var
 
 protected:
   typedef bool (*on_check_function)(sys_var *self, THD *thd, set_var *var);
+  typedef bool (*pre_update_function)(sys_var *self, THD *thd, set_var *var);
   typedef bool (*on_update_function)(sys_var *self, THD *thd, enum_var_type type);
 
   int flags;            ///< or'ed flag_enum values
@@ -111,6 +119,11 @@ class sys_var
   PolyLock *guard;      ///< *second* lock that protects the variable
   ptrdiff_t offset;     ///< offset to the value from global_system_variables
   on_check_function on_check;
+  /**
+    Pointer to function to be invoked before updating system variable (but
+    after calling on_check hook), while we do not hold any locks yet.
+  */
+  pre_update_function pre_update;
   on_update_function on_update;
   const char *const deprecation_substitute;
   bool is_os_charset; ///< true if the value is in character_set_filesystem
@@ -160,6 +173,16 @@ class sys_var
     that support the syntax @@keycache_name.variable_name
   */
   bool is_struct() { return option.var_type & GET_ASK_ADDR; }
+  /**
+    Indicates whether this system variable is written to the binlog or not.
+
+    Variables are written to the binlog as part of "status_vars" in
+    Query_log_event, as an Intvar_log_event, or a Rand_log_event.
+
+    @param type  Scope of the system variable.
+
+    @return true if the variable is written to the binlog, false otherwise.
+  */
   bool is_written_to_binlog(enum_var_type type)
   { return type != OPT_GLOBAL && binlog_status == SESSION_VARIABLE_IN_BINLOG; }
   virtual bool check_update_type(Item_result type) = 0;
@@ -218,6 +241,26 @@ class sys_var
   uchar *global_var_ptr();
 };
 
+class Sys_var_tracker
+{
+public:
+  explicit Sys_var_tracker(sys_var *var);
+
+  sys_var *bind_system_variable(THD *thd);
+
+  bool operator==(const Sys_var_tracker &x) const {
+    return m_var && m_var == x.m_var;
+  }
+
+  bool is_sys_var(sys_var *x) const { return m_var == x; }
+
+private:
+  bool m_is_dynamic;   ///< true if dynamic variable
+  LEX_CSTRING m_name;  ///< variable name
+
+  sys_var *m_var;  ///< variable pointer
+};
+
 /****************************************************************************
   Classes for parsing of the SET command
 ****************************************************************************/
@@ -238,6 +281,7 @@ class set_var_base :public Sql_alloc
   virtual void print(THD *thd, String *str)=0;	/* To self-print */
   /// @returns whether this variable is @@@@optimizer_trace.
   virtual bool is_var_optimizer_trace() const { return false; }
+  virtual void cleanup() {}
 };
 
 
@@ -261,6 +305,10 @@ class set_var :public set_var_base
   } save_result;
   LEX_STRING base; /**< for structured variables, like keycache_name.variable_name */
 
+private:
+  Sys_var_tracker var_tracker;
+
+public:
   set_var(enum_var_type type_arg, sys_var *var_arg,
           const LEX_STRING *base_name_arg, Item *value_arg);
 
@@ -272,9 +320,10 @@ class set_var :public set_var_base
   virtual bool is_var_optimizer_trace() const
   {
     extern sys_var *Sys_optimizer_trace_ptr;
-    return var == Sys_optimizer_trace_ptr;
+    return var_tracker.is_sys_var(Sys_optimizer_trace_ptr);
   }
 #endif
+  virtual void cleanup() { var= NULL; }
 };
 
 
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt
index 78a31de566e7..9070e3e93684 100644
--- a/sql/share/CMakeLists.txt
+++ b/sql/share/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 7f91cb51d043..15216376008b 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -3,17 +3,29 @@
 <charsets max-id="99">
 
 <copyright>
-  Copyright (c) 2003-2005 MySQL AB
+  Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  Without limiting anything contained in the foregoing, this file,
+  which is part of C Driver for MySQL (Connector/C), is also subject to the
+  Universal FOSS Exception, version 1.0, a copy of which can be found at
+  http://oss.oracle.com/licenses/universal-foss-exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/armscii8.xml b/sql/share/charsets/armscii8.xml
index be3fd2584d65..82f966a5bdf1 100644
--- a/sql/share/charsets/armscii8.xml
+++ b/sql/share/charsets/armscii8.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2004 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml
index 262e5f96c291..c09e75a3280c 100644
--- a/sql/share/charsets/ascii.xml
+++ b/sql/share/charsets/ascii.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2007 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp1250.xml b/sql/share/charsets/cp1250.xml
index b4a0be96a1d3..72f518561a38 100644
--- a/sql/share/charsets/cp1250.xml
+++ b/sql/share/charsets/cp1250.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2005 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml
index 4cd584c0bf56..c73bf779484a 100644
--- a/sql/share/charsets/cp1251.xml
+++ b/sql/share/charsets/cp1251.xml
@@ -3,16 +3,23 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp1256.xml b/sql/share/charsets/cp1256.xml
index 53b48a4f4fe1..61812f29b692 100644
--- a/sql/share/charsets/cp1256.xml
+++ b/sql/share/charsets/cp1256.xml
@@ -5,17 +5,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp1257.xml b/sql/share/charsets/cp1257.xml
index da73fa4bf26b..799f5a4e2385 100644
--- a/sql/share/charsets/cp1257.xml
+++ b/sql/share/charsets/cp1257.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp850.xml b/sql/share/charsets/cp850.xml
index ebbd4bc0342a..48f6f107098b 100644
--- a/sql/share/charsets/cp850.xml
+++ b/sql/share/charsets/cp850.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp852.xml b/sql/share/charsets/cp852.xml
index 98fe9056cea2..66dcb5341bba 100644
--- a/sql/share/charsets/cp852.xml
+++ b/sql/share/charsets/cp852.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2004 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/cp866.xml b/sql/share/charsets/cp866.xml
index c4a041fd4565..7c7affea44bd 100644
--- a/sql/share/charsets/cp866.xml
+++ b/sql/share/charsets/cp866.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/dec8.xml b/sql/share/charsets/dec8.xml
index 33dabdcfdc3f..f2b1f51c1e2f 100644
--- a/sql/share/charsets/dec8.xml
+++ b/sql/share/charsets/dec8.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/geostd8.xml b/sql/share/charsets/geostd8.xml
index 3220e4060bd5..cdc5a2c943ce 100644
--- a/sql/share/charsets/geostd8.xml
+++ b/sql/share/charsets/geostd8.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/greek.xml b/sql/share/charsets/greek.xml
index 30b5ea3e4eb1..efe148b0741a 100644
--- a/sql/share/charsets/greek.xml
+++ b/sql/share/charsets/greek.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/hebrew.xml b/sql/share/charsets/hebrew.xml
index c6f0d07b086a..0b7febf2b952 100644
--- a/sql/share/charsets/hebrew.xml
+++ b/sql/share/charsets/hebrew.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2006 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/hp8.xml b/sql/share/charsets/hp8.xml
index 0dd313001047..d7bf4ca72f77 100644
--- a/sql/share/charsets/hp8.xml
+++ b/sql/share/charsets/hp8.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/keybcs2.xml b/sql/share/charsets/keybcs2.xml
index 0341692bc286..4ddd149096b6 100644
--- a/sql/share/charsets/keybcs2.xml
+++ b/sql/share/charsets/keybcs2.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/koi8r.xml b/sql/share/charsets/koi8r.xml
index b8b793e6f32e..4ac773cb4f88 100644
--- a/sql/share/charsets/koi8r.xml
+++ b/sql/share/charsets/koi8r.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/koi8u.xml b/sql/share/charsets/koi8u.xml
index 7999b4f95e3f..034466d2c7f2 100644
--- a/sql/share/charsets/koi8u.xml
+++ b/sql/share/charsets/koi8u.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/languages.html b/sql/share/charsets/languages.html
index ebc745b399c3..b756cd1cfa65 100644
--- a/sql/share/charsets/languages.html
+++ b/sql/share/charsets/languages.html
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2003 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/latin1.xml b/sql/share/charsets/latin1.xml
index 30e1d44fbc89..6a881469b939 100644
--- a/sql/share/charsets/latin1.xml
+++ b/sql/share/charsets/latin1.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2005 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/latin2.xml b/sql/share/charsets/latin2.xml
index e6d0cba79502..46d0f66a78fd 100644
--- a/sql/share/charsets/latin2.xml
+++ b/sql/share/charsets/latin2.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2005 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/latin5.xml b/sql/share/charsets/latin5.xml
index 319c0408839c..3159a138ec60 100644
--- a/sql/share/charsets/latin5.xml
+++ b/sql/share/charsets/latin5.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (c) 2003, 2005 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/latin7.xml b/sql/share/charsets/latin7.xml
index d291f6b0dd9a..d8ffafec0ddd 100644
--- a/sql/share/charsets/latin7.xml
+++ b/sql/share/charsets/latin7.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/macce.xml b/sql/share/charsets/macce.xml
index ef270fa729cc..687ceb99f6af 100644
--- a/sql/share/charsets/macce.xml
+++ b/sql/share/charsets/macce.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/macroman.xml b/sql/share/charsets/macroman.xml
index e03c6e69368d..ea0af02fc53a 100644
--- a/sql/share/charsets/macroman.xml
+++ b/sql/share/charsets/macroman.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/charsets/swe7.xml b/sql/share/charsets/swe7.xml
index b6915da5d841..06d65df43b06 100644
--- a/sql/share/charsets/swe7.xml
+++ b/sql/share/charsets/swe7.xml
@@ -3,17 +3,24 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 0f7e87267fad..732c2f1d06be 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -3825,22 +3825,22 @@ ER_NO_RAID_COMPILED
         swe "Denna version av MySQL är inte kompilerad med RAID"
         ukr "Ця версія MySQL не зкомпільована з підтримкою RAID"
 ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE  
-        cze "Update tabulky bez WHERE s klíčem není v módu bezpečných update dovoleno"
-        dan "Du bruger sikker opdaterings modus ('safe update mode') og du forsøgte at opdatere en tabel uden en WHERE klausul, der gør brug af et KEY felt"
-        nla "U gebruikt 'safe update mode' en u probeerde een tabel te updaten zonder een WHERE met een KEY kolom"
-        eng "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column"
-        est "Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita"
-        fre "Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index"
-        ger "MySQL läuft im sicheren Aktualisierungsmodus (safe update mode). Sie haben versucht, eine Tabelle zu aktualisieren, ohne in der WHERE-Klausel ein KEY-Feld anzugeben"
-        hun "On a biztonsagos update modot hasznalja, es        WHERE that uses a KEY column"
-        ita "In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave"
-        jpn "'safe update mode'で、索引を利用するWHERE句の無い更新処理を実行しようとしました。"
-        por "Você está usando modo de atualização seguro e tentou atualizar uma tabela sem uma cláusula WHERE que use uma coluna chave"
-        rus "Вы работаете в режиме безопасных обновлений (safe update mode) и попробовали изменить таблицу без использования ключевого столбца в части WHERE"
-        serbian "Vi koristite safe update mod servera, a probali ste da promenite podatke bez 'WHERE' komande koja koristi kolonu ključa"
-        spa "Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna"
-        swe "Du använder 'säker uppdateringsmod' och försökte uppdatera en tabell utan en WHERE-sats som använder sig av en nyckel"
-        ukr "Ви у режимі безпечного оновлення та намагаєтесь оновити таблицю без оператора WHERE, що використовує KEY стовбець"
+        cze "Update tabulky bez WHERE s klíčem není v módu bezpečných update dovoleno. %s"
+        dan "Du bruger sikker opdaterings modus ('safe update mode') og du forsøgte at opdatere en tabel uden en WHERE klausul, der gør brug af et KEY felt. %s"
+        nla "U gebruikt 'safe update mode' en u probeerde een tabel te updaten zonder een WHERE met een KEY kolom. %s"
+        eng "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column. %s"
+        est "Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita. %s"
+        fre "Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index. %s"
+        ger "MySQL läuft im sicheren Aktualisierungsmodus (safe update mode). Sie haben versucht, eine Tabelle zu aktualisieren, ohne in der WHERE-Klausel ein KEY-Feld anzugeben. %s"
+        hun "On a biztonsagos update modot hasznalja, es        WHERE that uses a KEY column. %s"
+        ita "In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave. %s"
+        jpn "'safe update mode'で、索引を利用するWHERE句の無い更新処理を実行しようとしました。. %s"
+        por "Você está usando modo de atualização seguro e tentou atualizar uma tabela sem uma cláusula WHERE que use uma coluna chave. %s"
+        rus "Вы работаете в режиме безопасных обновлений (safe update mode) и попробовали изменить таблицу без использования ключевого столбца в части WHERE. %s"
+        serbian "Vi koristite safe update mod servera, a probali ste da promenite podatke bez 'WHERE' komande koja koristi kolonu ključa. %s"
+        spa "Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna. %s"
+        swe "Du använder 'säker uppdateringsmod' och försökte uppdatera en tabell utan en WHERE-sats som använder sig av en nyckel. %s"
+        ukr "Ви у режимі безпечного оновлення та намагаєтесь оновити таблицю без оператора WHERE, що використовує KEY стовбець. %s"
 ER_KEY_DOES_NOT_EXITS 42000 S1009
         cze "Klíč '%-.192s' v tabulce '%-.192s' neexistuje"
         dan "Nøglen '%-.192s' eksisterer ikke i tabellen '%-.192s'"
@@ -4663,15 +4663,15 @@ ER_NOT_SUPPORTED_YET 42000
         spa "Esta versión de MySQL no soporta todavia '%s'"
         swe "Denna version av MySQL kan ännu inte utföra '%s'"
 ER_MASTER_FATAL_ERROR_READING_BINLOG  
-        nla "Kreeg fatale fout %d: '%-.320s' van master tijdens lezen van data uit binaire log"
-        eng "Got fatal error %d from master when reading data from binary log: '%-.320s'"
-        ger "Schwerer Fehler %d: '%-.320s vom Master beim Lesen des binären Logs"
-        ita "Errore fatale %d: '%-.320s' dal master leggendo i dati dal log binario"
-        jpn "致命的なエラー %d: '%-.320s' がマスターでバイナリログ読み込み中に発生しました。"
-        por "Obteve fatal erro %d: '%-.320s' do master quando lendo dados do binary log"
-        rus "Получена неисправимая ошибка %d: '%-.320s' от головного сервера в процессе выборки данных из двоичного журнала"
-        spa "Recibió fatal error %d: '%-.320s' del master cuando leyendo datos del binary log"
-        swe "Fick fatalt fel %d: '%-.320s' från master vid läsning av binärloggen"
+        nla "Kreeg fatale fout %d: '%-.512s' van master tijdens lezen van data uit binaire log"
+        eng "Got fatal error %d from master when reading data from binary log: '%-.512s'"
+        ger "Schwerer Fehler %d: '%-.512s vom Master beim Lesen des binären Logs"
+        ita "Errore fatale %d: '%-.512s' dal master leggendo i dati dal log binario"
+        jpn "致命的なエラー %d: '%-.512s' がマスターでバイナリログ読み込み中に発生しました。"
+        por "Obteve fatal erro %d: '%-.512s' do master quando lendo dados do binary log"
+        rus "Получена неисправимая ошибка %d: '%-.512s' от головного сервера в процессе выборки данных из двоичного журнала"
+        spa "Recibió fatal error %d: '%-.512s' del master cuando leyendo datos del binary log"
+        swe "Fick fatalt fel %d: '%-.512s' från master vid läsning av binärloggen"
 ER_SLAVE_IGNORED_TABLE  
         eng "Slave SQL thread ignored the query because of replicate-*-table rules"
         ger "Slave-SQL-Thread hat die Abfrage aufgrund von replicate-*-table-Regeln ignoriert"
@@ -6698,7 +6698,7 @@ ER_MALFORMED_GTID_SPECIFICATION
   eng "Malformed GTID specification '%.200s'."
 
 ER_GNO_EXHAUSTED
-  eng "Impossible to generate Global Transaction Identifier: the integer component reached the maximal value. Restart the server with a new server_uuid."
+  eng "Impossible to generate GTID: the integer component reached the maximum value. Restart the server with a new server_uuid."
 
 ER_BAD_SLAVE_AUTO_POSITION
   eng "Parameters MASTER_LOG_FILE, MASTER_LOG_POS, RELAY_LOG_FILE and RELAY_LOG_POS cannot be set when MASTER_AUTO_POSITION is active."
@@ -6740,7 +6740,7 @@ ER_GTID_MODE_CAN_ONLY_CHANGE_ONE_STEP_AT_A_TIME
   eng "The value of @@GLOBAL.GTID_MODE can only be changed one step at a time: OFF <-> OFF_PERMISSIVE <-> ON_PERMISSIVE <-> ON. Also note that this value must be stepped up or down simultaneously on all servers. See the Manual for instructions."
 
 ER_MASTER_HAS_PURGED_REQUIRED_GTIDS
-  eng "The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires."
+  eng "The slave is connecting using CHANGE MASTER TO MASTER_AUTO_POSITION = 1, but the master has purged binary logs containing GTIDs that the slave requires. Replicate the missing transactions from elsewhere, or provision a new slave from backup. Consider increasing the master's binary log expiration period. %s."
 
 ER_CANT_SET_GTID_NEXT_WHEN_OWNING_GTID
   eng "@@SESSION.GTID_NEXT cannot be changed by a client that owns a GTID. The client owns %s. Ownership is released on COMMIT or ROLLBACK."
@@ -7064,6 +7064,16 @@ ER_GTID_UNSAFE_BINLOG_SPLITTABLE_STATEMENT_AND_GTID_GROUP
 
 ER_SLAVE_HAS_MORE_GTIDS_THAN_MASTER
   eng "Slave has more GTIDs than the master has, using the master's SERVER_UUID. This may indicate that the end of the binary log was truncated or that the last binary log file was lost, e.g., after a power or disk failure when sync_binlog != 1. The master may or may not have rolled back transactions that were already replicated to the slave. Suggest to replicate any transactions that master has rolled back from slave to master, and/or commit empty transactions on master to account for transactions that have been committed on master but are not included in GTID_EXECUTED."
+
+ER_MISSING_KEY
+  eng "The table '%s.%s' does not have the necessary key(s) defined on it. Please check the table definition and create index(s) accordingly."
+
+WARN_NAMED_PIPE_ACCESS_EVERYONE
+  eng "Setting named_pipe_full_access_group='%s' is insecure. Consider using a Windows group with fewer members."
+
+ER_FOUND_MISSING_GTIDS
+  eng "Cannot replicate to server with server_uuid='%.36s' because the present server has purged required binary logs. The connecting server needs to replicate the missing transactions from elsewhere, or be replaced by a new server created from a more recent backup. To prevent this error in the future, consider increasing the binary log expiration period on the present server. %s."
+
 #
 #  End of 5.6 error messages.
 #
@@ -7640,7 +7650,7 @@ ER_INVALID_ENCRYPTION_OPTION
   eng "Invalid encryption option."
 
 ER_CANNOT_FIND_KEY_IN_KEYRING
-  eng "Can't find master key from keyring, please check keyring plugin is loaded."
+  eng "Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully."
 
 ER_CAPACITY_EXCEEDED_IN_PARSER
   eng "Parser bailed out for this query."
@@ -7696,6 +7706,111 @@ ER_KEYRING_ACCESS_DENIED_ERROR 42000
 ER_KEYRING_MIGRATION_STATUS
   eng "Keyring migration %s."
 
+ER_PLUGIN_FAILED_TO_OPEN_TABLES
+  eng "Failed to open the %s filter tables."
+
+ER_PLUGIN_FAILED_TO_OPEN_TABLE
+  eng "Failed to open '%s.%s' %s table."
+
+ER_AUDIT_LOG_NO_KEYRING_PLUGIN_INSTALLED
+  eng "No keyring plugin installed."
+
+ER_AUDIT_LOG_ENCRYPTION_PASSWORD_HAS_NOT_BEEN_SET
+  eng "Audit log encryption password has not been set; it will be generated automatically. Use audit_log_encryption_password_get to obtain the password or audit_log_encryption_password_set to set a new one."
+
+ER_AUDIT_LOG_COULD_NOT_CREATE_AES_KEY
+  eng "Could not create AES key. OpenSSL's EVP_BytesToKey function failed."
+
+ER_AUDIT_LOG_ENCRYPTION_PASSWORD_CANNOT_BE_FETCHED
+  eng "Audit log encryption password cannot be fetched from the keyring. Password used so far is used for encryption."
+
+ER_AUDIT_LOG_JSON_FILTERING_NOT_ENABLED
+  eng "Audit Log filtering has not been installed."
+
+ER_AUDIT_LOG_UDF_INSUFFICIENT_PRIVILEGE
+  eng "Request ignored for '%s'@'%s'. SUPER_ACL needed to perform operation"
+
+ER_AUDIT_LOG_SUPER_PRIVILEGE_REQUIRED
+  eng "SUPER privilege required for '%s'@'%s' user."
+
+ER_COULD_NOT_REINITIALIZE_AUDIT_LOG_FILTERS
+  eng "Could not reinitialize audit log filters."
+
+ER_AUDIT_LOG_UDF_INVALID_ARGUMENT_TYPE
+  eng "Invalid argument type"
+
+ER_AUDIT_LOG_UDF_INVALID_ARGUMENT_COUNT
+  eng "Invalid argument count"
+
+ER_AUDIT_LOG_HAS_NOT_BEEN_INSTALLED
+  eng "audit_log plugin has not been installed using INSTALL PLUGIN syntax."
+
+ER_AUDIT_LOG_UDF_READ_INVALID_MAX_ARRAY_LENGTH_ARG_TYPE
+  eng "Invalid \"max_array_length\" argument type."
+
+ER_AUDIT_LOG_UDF_READ_INVALID_MAX_ARRAY_LENGTH_ARG_VALUE
+  eng "Invalid \"max_array_length\" argument value."
+
+ER_AUDIT_LOG_JSON_FILTER_PARSING_ERROR
+  eng "%s"
+
+ER_AUDIT_LOG_JSON_FILTER_NAME_CANNOT_BE_EMPTY
+  eng "Filter name cannot be empty."
+
+ER_AUDIT_LOG_JSON_USER_NAME_CANNOT_BE_EMPTY
+  eng "User cannot be empty."
+
+ER_AUDIT_LOG_JSON_FILTER_DOES_NOT_EXISTS
+  eng "Specified filter has not been found."
+
+ER_AUDIT_LOG_USER_FIRST_CHARACTER_MUST_BE_ALPHANUMERIC
+  eng "First character of the user name must be alphanumeric."
+
+ER_AUDIT_LOG_USER_NAME_INVALID_CHARACTER
+  eng "Invalid character in the user name."
+
+ER_AUDIT_LOG_HOST_NAME_INVALID_CHARACTER
+  eng "Invalid character in the host name."
+
+WARN_DEPRECATED_MAXDB_SQL_MODE_FOR_TIMESTAMP
+  eng "With the MAXDB SQL mode enabled, TIMESTAMP is identical with DATETIME. The MAXDB SQL mode is deprecated and will be removed in a future release. Please disable the MAXDB SQL mode and use DATETIME instead."
+
+ER_XA_REPLICATION_FILTERS
+  eng "The use of replication filters with XA transactions is not supported, and can lead to an undefined state in the replication slave."
+
+ER_CANT_OPEN_ERROR_LOG
+  eng "Could not open file '%s' for error logging%s%s"
+
+ER_GROUPING_ON_TIMESTAMP_IN_DST
+  eng "Grouping on temporal is non-deterministic for timezones having DST. Please consider switching to UTC for this query."
+
+ER_CANT_START_SERVER_NAMED_PIPE
+  eng "Can't start server : Named Pipe \"%s\" already in use."
+
+ER_WRITE_SET_EXCEEDS_LIMIT
+  eng "The size of writeset data for the current transaction exceeds a limit imposed by an external component. If using Group Replication check 'group_replication_transaction_size_limit'."
+
+ER_DEPRECATED_TLS_VERSION_SESSION
+  eng "Accepted a connection with deprecated protocol '%s' for account `%s`@`%s` from host `%s`. Client supplied username `%s`"
+
+ER_WARN_DEPRECATED_TLS_VERSION
+  eng "A deprecated TLS version %s is enabled. Please use TLSv1.2 or higher."
+
+ER_WARN_WRONG_NATIVE_TABLE_STRUCTURE
+  eng "Optional native table '%-.64s'.'%-.64s' has the wrong structure or is missing."
+
+ER_AES_INVALID_KDF_NAME
+  eng "KDF method name is not valid. Please use hkdf or pbkdf2_hmac method name"
+
+ER_AES_INVALID_KDF_ITERATIONS
+  eng "For KDF method pbkdf2_hmac iterations value less than 1000 or more than 65535 is not allowed due to security reasons. Please provide iterations >= 1000 and iterations < 65535"
+
+WARN_AES_KEY_SIZE
+  eng "AES key size should be %d bytes length or secure KDF methods hkdf or pbkdf2_hmac should be used, please provide exact AES key size or use KDF methods for better security."
+
+ER_AES_INVALID_KDF_OPTION_SIZE
+  eng "KDF option size is invalid, please provide valid size < %d bytes and not NULL"
+
 #
 #  End of 5.7 error messages.
 #
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 1e6a236a330d..e3ffb297ebdf 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sp.cc b/sql/sp.cc
index 3b8edac90300..8128feee2ba3 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -356,7 +363,9 @@ class Proc_table_intact : public Table_check_intact
   bool silence_error;
 
 public:
-  Proc_table_intact() : m_print_once(TRUE), silence_error(FALSE) {}
+  Proc_table_intact() : m_print_once(TRUE), silence_error(FALSE)
+                      { has_keys= TRUE; }
+
   my_bool check_proc_table(TABLE *table);
 
 protected:
@@ -443,17 +452,9 @@ TABLE *open_proc_table_for_read(THD *thd, Open_tables_backup *backup)
   if (open_nontrans_system_tables_for_read(thd, &table, backup))
     DBUG_RETURN(NULL);
    
-  if (!table.table->key_info)
-  {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table.table->s->db.str,
-             table.table->s->table_name.str);
-    goto err;
-  }
-
   if(!proc_table_intact.check_proc_table(table.table))
     DBUG_RETURN(table.table);
 
-err:
   close_nontrans_system_tables(thd, backup);
   DBUG_RETURN(NULL);
 }
@@ -972,8 +973,7 @@ sp_returns_type(THD *thd, String &result, sp_head *sp)
   TABLE table;
   TABLE_SHARE share;
   Field *field;
-  memset(&table, 0, sizeof(table));
-  memset(&share, 0, sizeof(share));
+
   table.in_use= thd;
   table.s = &share;
   field= sp->create_result_field(0, 0, &table);
@@ -1038,8 +1038,8 @@ bool sp_create_routine(THD *thd, sp_head *sp)
   String retstr(64);
   retstr.set_charset(system_charset_info);
 
-  DBUG_ASSERT(sp->m_type == SP_TYPE_PROCEDURE ||
-              sp->m_type == SP_TYPE_FUNCTION);
+  assert(sp->m_type == SP_TYPE_PROCEDURE ||
+         sp->m_type == SP_TYPE_FUNCTION);
 
   /* Grab an exclusive MDL lock. */
   if (lock_object_name(thd, mdl_type, sp->m_db.str, sp->m_name.str))
@@ -1298,7 +1298,7 @@ bool sp_create_routine(THD *thd, sp_head *sp)
   thd->count_cuted_fields= saved_count_cuted_fields;
   thd->variables.sql_mode= saved_mode;
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(error);
@@ -1331,7 +1331,7 @@ int sp_drop_routine(THD *thd, enum_sp_type type, sp_name *name)
   DBUG_PRINT("enter", ("type: %d  name: %.*s",
 		       type, (int) name->m_name.length, name->m_name.str));
 
-  DBUG_ASSERT(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
+  assert(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
 
   /* Grab an exclusive MDL lock. */
   if (lock_object_name(thd, mdl_type, name->m_db.str, name->m_name.str))
@@ -1382,7 +1382,7 @@ int sp_drop_routine(THD *thd, enum_sp_type type, sp_name *name)
 #endif 
   }
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(ret);
@@ -1418,7 +1418,7 @@ int sp_update_routine(THD *thd, enum_sp_type type, sp_name *name,
   DBUG_PRINT("enter", ("type: %d  name: %.*s",
 		       type, (int) name->m_name.length, name->m_name.str));
 
-  DBUG_ASSERT(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
+  assert(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
 
   /* Grab an exclusive MDL lock. */
   if (lock_object_name(thd, mdl_type, name->m_db.str, name->m_name.str))
@@ -1488,7 +1488,7 @@ int sp_update_routine(THD *thd, enum_sp_type type, sp_name *name,
   }
 err:
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(ret);
@@ -1601,10 +1601,10 @@ bool lock_db_routines(THD *thd, const char *db)
   close_nontrans_system_tables(thd, &open_tables_state_backup);
 
   /* We should already hold a global IX lock and a schema X lock. */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
-                                 "", "", MDL_INTENTION_EXCLUSIVE) &&
-              thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::SCHEMA,
-                                 db, "", MDL_EXCLUSIVE));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
+                                                      "", "", MDL_INTENTION_EXCLUSIVE) &&
+         thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::SCHEMA,
+                                                      db, "", MDL_EXCLUSIVE));
   DBUG_RETURN(thd->mdl_context.acquire_locks(&mdl_requests,
                                              thd->variables.lock_wait_timeout));
 }
@@ -1722,7 +1722,7 @@ bool sp_show_create_routine(THD *thd, enum_sp_type type, sp_name *name)
                        (int) name->m_name.length,
                        name->m_name.str));
 
-  DBUG_ASSERT(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
+  assert(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
 
   /*
     @todo: Consider using prelocking for this code as well. Currently
@@ -1801,7 +1801,7 @@ sp_head *sp_find_routine(THD *thd, enum_sp_type type, sp_name *name,
                           (ulong)sp->m_first_free_instance,
                           sp->m_first_free_instance->m_recursion_level,
                           sp->m_first_free_instance->m_flags));
-      DBUG_ASSERT(!(sp->m_first_free_instance->m_flags & sp_head::IS_INVOKED));
+      assert(!(sp->m_first_free_instance->m_flags & sp_head::IS_INVOKED));
       if (sp->m_first_free_instance->m_recursion_level > depth)
       {
         recursion_level_error(thd, sp);
@@ -2108,7 +2108,7 @@ int sp_cache_routine(THD *thd, Sroutine_hash_entry *rt,
     in sroutines_list has an MDL lock unless it's a top-level call, or a
     trigger, but triggers can't occur here (see the preceding assert).
   */
-  DBUG_ASSERT(rt->mdl_request.ticket || rt == thd->lex->sroutines_list.first);
+  assert(rt->mdl_request.ticket || rt == thd->lex->sroutines_list.first);
 
   return sp_cache_routine(thd, type, &name, lookup_only, sp);
 }
@@ -2143,7 +2143,7 @@ int sp_cache_routine(THD *thd, enum_sp_type type, sp_name *name,
 
   DBUG_ENTER("sp_cache_routine");
 
-  DBUG_ASSERT(type == SP_TYPE_FUNCTION || type == SP_TYPE_PROCEDURE);
+  assert(type == SP_TYPE_FUNCTION || type == SP_TYPE_PROCEDURE);
 
 
   *sp= sp_cache_lookup(spc, name);
@@ -2419,7 +2419,7 @@ void sp_finish_parsing(THD *thd)
 {
   sp_head *sp= thd->lex->sphead;
 
-  DBUG_ASSERT(sp);
+  assert(sp);
 
   sp->set_body_end(thd);
 
@@ -2615,6 +2615,7 @@ uint sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SLAVE_START:
   case SQLCOM_SLAVE_STOP:
   case SQLCOM_ALTER_INSTANCE:
+  case SQLCOM_ALTER_TABLESPACE:
     flags= sp_head::HAS_COMMIT_OR_ROLLBACK;
     break;
   default:
@@ -2638,7 +2639,7 @@ uint sp_get_flags_for_command(LEX *lex)
 
 bool sp_check_name(LEX_STRING *ident)
 {
-  DBUG_ASSERT(ident != NULL && ident->str != NULL);
+  assert(ident != NULL && ident->str != NULL);
 
   if (!ident->str[0] || ident->str[ident->length-1] == ' ')
   {
diff --git a/sql/sp.h b/sql/sp.h
index cfba977fce07..4245e11a07d5 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index ead305e43ec7..4a6c3c3db0ab 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sp_cache.h b/sql/sp_cache.h
index 49ad9c3ef000..3af84804b7e9 100644
--- a/sql/sp_cache.h
+++ b/sql/sp_cache.h
@@ -1,14 +1,21 @@
 /* -*- C++ -*- */
-/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 5fd460b536df..4ba16a4118d1 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -303,7 +310,7 @@ void sp_head::init_sp_name(THD *thd, sp_name *spname)
 {
   /* Must be initialized in the parser. */
 
-  DBUG_ASSERT(spname && spname->m_db.str && spname->m_db.length);
+  assert(spname && spname->m_db.str && spname->m_db.length);
 
   /* We have to copy strings to get them into the right memroot. */
 
@@ -474,7 +481,7 @@ sp_head::~sp_head()
   sp_instr *i;
 
   // Parsing of SP-body must have been already finished.
-  DBUG_ASSERT(!m_parser_data.is_parsing_sp_body());
+  assert(!m_parser_data.is_parsing_sp_body());
 
   for (uint ip = 0 ; (i = get_instr(ip)) ; ip++)
     delete i;
@@ -597,7 +604,7 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
   init_sql_alloc(key_memory_sp_head_execute_root,
                  &execute_mem_root, MEM_ROOT_BLOCK_SIZE, 0);
 
-  DBUG_ASSERT(!(m_flags & IS_INVOKED));
+  assert(!(m_flags & IS_INVOKED));
   m_flags|= IS_INVOKED;
   m_first_instance->m_first_free_instance= m_next_cached_sp;
   if (m_next_cached_sp)
@@ -615,9 +622,9 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
     some instances after this one then recursion level of next instance
     greater then recursion level of current instance on 1
   */
-  DBUG_ASSERT((m_next_cached_sp == 0 &&
-               m_first_instance->m_last_cached_sp == this) ||
-              (m_recursion_level + 1 == m_next_cached_sp->m_recursion_level));
+  assert((m_next_cached_sp == 0 &&
+          m_first_instance->m_last_cached_sp == this) ||
+         (m_recursion_level + 1 == m_next_cached_sp->m_recursion_level));
 
   /*
     NOTE: The SQL Standard does not specify the context that should be
@@ -783,8 +790,8 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
       likely to change in the future, so we'll do it right from the
       start.
     */
-    if (thd->rewritten_query.length())
-      thd->rewritten_query.mem_free();
+    if (thd->rewritten_query().length())
+      thd->reset_rewritten_query();
 
     err_status= i->execute(thd, &ip);
 
@@ -846,11 +853,11 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
   if(thd->is_classic_protocol())
     /* Restore all saved */
     old_packet.swap(*thd->get_protocol_classic()->get_packet());
-  DBUG_ASSERT(thd->change_list.is_empty());
+  assert(thd->change_list.is_empty());
   old_change_list.move_elements_to(&thd->change_list);
   thd->lex= old_lex;
   thd->set_query_id(old_query_id);
-  DBUG_ASSERT(!thd->derived_tables);
+  assert(!thd->derived_tables);
   thd->derived_tables= old_derived_tables;
   thd->variables.sql_mode= save_sql_mode;
   thd->pop_reprepare_observer();
@@ -922,7 +929,7 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
   while (thd->get_stmt_da() != &sp_da)
     thd->pop_diagnostics_area();
   thd->pop_diagnostics_area();
-  DBUG_ASSERT(thd->get_stmt_da() == caller_da);
+  assert(thd->get_stmt_da() == caller_da);
 
  done:
   DBUG_PRINT("info", ("err_status: %d  killed: %d  is_slave_error: %d  report_error: %d",
@@ -961,13 +968,13 @@ bool sp_head::execute(THD *thd, bool merge_da_on_success)
     should go just after this one and recursion level of that free instance
     should be on 1 more then recursion level of this instance.
   */
-  DBUG_ASSERT((m_first_instance->m_first_free_instance == 0 &&
-               this == m_first_instance->m_last_cached_sp &&
-               m_next_cached_sp == 0) ||
-              (m_first_instance->m_first_free_instance != 0 &&
-               m_first_instance->m_first_free_instance == m_next_cached_sp &&
-               m_first_instance->m_first_free_instance->m_recursion_level ==
-               m_recursion_level + 1));
+  assert((m_first_instance->m_first_free_instance == 0 &&
+          this == m_first_instance->m_last_cached_sp &&
+          m_next_cached_sp == 0) ||
+         (m_first_instance->m_first_free_instance != 0 &&
+          m_first_instance->m_first_free_instance == m_next_cached_sp &&
+          m_first_instance->m_first_free_instance->m_recursion_level ==
+          m_recursion_level + 1));
   m_first_instance->m_first_free_instance= this;
 
   return err_status;
@@ -1176,7 +1183,7 @@ bool sp_head::execute_function(THD *thd, Item **argp, uint argcount,
   for (arg_no= 0; arg_no < argcount; arg_no++)
   {
     /* Arguments must be fixed in Item_func_sp::fix_fields */
-    DBUG_ASSERT(argp[arg_no]->fixed);
+    assert(argp[arg_no]->fixed);
 
     err_status= func_runtime_ctx->set_variable(thd, arg_no, &(argp[arg_no]));
 
@@ -1559,7 +1566,7 @@ bool sp_head::execute_procedure(THD *thd, List<Item> *args)
       Settable_routine_parameter *srp=
         arg_item->get_settable_routine_parameter();
 
-      DBUG_ASSERT(srp);
+      assert(srp);
 
       if (srp->set_value(thd, parent_sp_runtime_ctx, proc_runtime_ctx->get_item_addr(i)))
       {
@@ -1748,7 +1755,7 @@ bool sp_head::show_create_routine(THD *thd, enum_sp_type type)
 
   bool full_access;
 
-  DBUG_ASSERT(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
+  assert(type == SP_TYPE_PROCEDURE || type == SP_TYPE_FUNCTION);
 
   if (check_show_access(thd, &full_access))
     return true;
@@ -1938,7 +1945,7 @@ void sp_head::opt_mark()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 bool sp_head::show_routine_code(THD *thd)
 {
   Protocol *protocol= thd->get_protocol();
@@ -1970,8 +1977,7 @@ bool sp_head::show_routine_code(THD *thd)
     if (ip != i->get_ip())
     {
       const char *format= "Instruction at position %u has m_ip=%u";
-      char tmp[sizeof(format) + 2 * sizeof(uint) + 1];
-
+      char tmp[64 + 2 * MY_INT32_NUM_DECIMAL_DIGITS];
       sprintf(tmp, format, ip, i->get_ip());
       /*
         Since this is for debugging purposes only, we don't bother to
@@ -1994,7 +2000,7 @@ bool sp_head::show_routine_code(THD *thd)
 
   return res;
 }
-#endif // ifndef DBUG_OFF
+#endif // ifndef NDEBUG
 
 
 bool sp_head::merge_table_list(THD *thd,
@@ -2170,7 +2176,7 @@ void sp_head::add_used_tables_to_table_list(THD *thd,
 bool sp_head::check_show_access(THD *thd, bool *full_access)
 {
   TABLE_LIST tables;
-  memset(&tables, 0, sizeof(tables));
+
   tables.db= (char*) "mysql";
   tables.table_name= tables.alias= (char*) "proc";
 
@@ -2233,6 +2239,8 @@ void sp_parser_data::start_parsing_sp_body(THD *thd, sp_head *sp)
   m_saved_free_list= thd->free_list;
 
   thd->mem_root= sp->get_persistent_mem_root();
+  set_memroot_max_capacity(thd->mem_root, m_saved_memroot->max_capacity);
+  set_memroot_error_reporting(thd->mem_root, m_saved_memroot->error_for_capacity_exceeded);
   thd->free_list= NULL;
 }
 
diff --git a/sql/sp_head.h b/sql/sp_head.h
index 3c2560a1ee6a..6c15c34904c7 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -231,8 +238,8 @@ class sp_parser_data
   */
   const char *pop_expr_start_ptr()
   {
-#ifndef DBUG_OFF
-    DBUG_ASSERT(m_expr_start_ptr);
+#ifndef NDEBUG
+    assert(m_expr_start_ptr);
     const char *p= m_expr_start_ptr;
     m_expr_start_ptr= NULL;
     return p;
@@ -251,7 +258,7 @@ class sp_parser_data
   */
   void push_expr_start_ptr(const char *expr_start_ptr)
   {
-    DBUG_ASSERT(!m_expr_start_ptr);
+    assert(!m_expr_start_ptr);
     m_expr_start_ptr= expr_start_ptr;
   }
 
@@ -891,7 +898,7 @@ class sp_head : private Query_arena
                     HAS_COMMIT_OR_ROLLBACK|HAS_SQLCOM_RESET|HAS_SQLCOM_FLUSH));
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
     Return the routine instructions as a result set.
     @return Error status.
diff --git a/sql/sp_instr.cc b/sql/sp_instr.cc
index 8f3e0c7f3735..ef583024d3e3 100644
--- a/sql/sp_instr.cc
+++ b/sql/sp_instr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,6 +37,7 @@
 #include "prealloced_array.h"
 #include "binlog.h"
 #include "item_cmpfunc.h" // Item_func_eq
+#include "debug_sync.h"   // DEBUG_SYNC
 
 #include <algorithm>
 #include <functional>
@@ -44,7 +52,7 @@ class Cmp_splocal_locations :
 public:
   bool operator()(const Item_splocal *a, const Item_splocal *b)
   {
-    DBUG_ASSERT(a->pos_in_query != b->pos_in_query);
+    assert(a == b || a->pos_in_query != b->pos_in_query);
     return a->pos_in_query < b->pos_in_query;
   }
 };
@@ -306,8 +314,8 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
 
   /* Check pre-conditions. */
 
-  DBUG_ASSERT(!thd->derived_tables);
-  DBUG_ASSERT(thd->change_list.is_empty());
+  assert(!thd->derived_tables);
+  assert(thd->change_list.is_empty());
 
   /*
     Use our own lex.
@@ -440,6 +448,7 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
     }
     else
     {
+      DEBUG_SYNC(thd, "sp_lex_instr_before_exec_core");
       error= exec_core(thd, nextp);
       DBUG_PRINT("info",("exec_core returned: %d", error));
     }
@@ -563,7 +572,7 @@ LEX *sp_lex_instr::parse_expr(THD *thd, sp_head *sp)
     // The instruction has returned zero-length query string. That means, the
     // re-preparation of the instruction is not possible. We should not come
     // here in the normal life.
-    DBUG_ASSERT(false);
+    assert(false);
     my_error(ER_UNKNOWN_ERROR, MYF(0));
     return NULL;
   }
@@ -643,7 +652,7 @@ LEX *sp_lex_instr::parse_expr(THD *thd, sp_head *sp)
 
       Trigger *t= sp->m_trg_list->find_trigger(thd->lex->sphead->m_name);
 
-      DBUG_ASSERT(t);
+      assert(t);
 
       if (!t)
         return NULL; // Don't take chances in production.
@@ -696,7 +705,6 @@ bool sp_lex_instr::validate_lex_and_execute_core(THD *thd,
                                                  bool open_tables)
 {
   Reprepare_observer reprepare_observer;
-  int reprepare_attempt= 0;
 
   while (true)
   {
@@ -762,14 +770,16 @@ bool sp_lex_instr::validate_lex_and_execute_core(THD *thd,
           raise it to the user;
         - we take only 3 attempts to reprepare the query, otherwise we might end
           up in the endless loop.
+        - Reprepare_observer ensures that the statement is retried a maximum
+          number of times, to avoid an endless loop.
     */
     if (stmt_reprepare_observer &&
         !thd->is_fatal_error &&
         !thd->killed &&
         thd->get_stmt_da()->mysql_errno() == ER_NEED_REPREPARE &&
-        reprepare_attempt++ < 3)
+        stmt_reprepare_observer->can_retry())
     {
-      DBUG_ASSERT(stmt_reprepare_observer->is_invalidated());
+      assert(stmt_reprepare_observer->is_invalidated());
 
       thd->clear_error();
       free_lex();
@@ -857,7 +867,7 @@ bool sp_instr_stmt::execute(THD *thd, uint *nextp)
 
   DBUG_PRINT("info", ("query: '%.*s'", (int) m_query.length, m_query.str));
 
-  MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi, m_query.str, m_query.length);
+  thd->set_query_for_display(m_query.str, m_query.length);
 
   const LEX_CSTRING query_backup= thd->query();
 
@@ -957,8 +967,8 @@ bool sp_instr_stmt::execute(THD *thd, uint *nextp)
       double-check whether the potential conflict they created is a
       problem.
     */
-    DBUG_ASSERT((thd->query_name_consts == 0) ||
-                (thd->rewritten_query.length() == 0));
+    assert((thd->query_name_consts == 0) ||
+           (thd->rewritten_query().length() == 0));
   }
   else
     *nextp= get_ip() + 1;
@@ -1120,11 +1130,11 @@ void sp_instr_set_trigger_field::print(String *str)
 
 bool sp_instr_set_trigger_field::on_after_expr_parsing(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+  assert(thd->lex->select_lex->item_list.elements == 1);
 
   m_value_item= thd->lex->select_lex->item_list.head();
 
-  DBUG_ASSERT(!m_trigger_field);
+  assert(!m_trigger_field);
 
   m_trigger_field=
     new (thd->mem_root) Item_trigger_field(thd->lex->current_context(),
@@ -1223,7 +1233,7 @@ PSI_statement_info sp_instr_jump_if_not::psi_info=
 
 bool sp_instr_jump_if_not::exec_core(THD *thd, uint *nextp)
 {
-  DBUG_ASSERT(m_expr_item);
+  assert(m_expr_item);
 
   Item *item= sp_prepare_func_item(thd, &m_expr_item);
 
@@ -1319,7 +1329,7 @@ PSI_statement_info sp_instr_jump_case_when::psi_info=
 
 bool sp_instr_jump_case_when::exec_core(THD *thd, uint *nextp)
 {
-  DBUG_ASSERT(m_eq_item);
+  assert(m_eq_item);
 
   Item *item= sp_prepare_func_item(thd, &m_eq_item);
 
@@ -1355,7 +1365,7 @@ bool sp_instr_jump_case_when::build_expr_items(THD *thd)
   if (!m_case_expr_item)
     return true;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   m_case_expr_item->m_sp= thd->lex->sphead;
 #endif
 
@@ -1373,7 +1383,7 @@ bool sp_instr_jump_case_when::build_expr_items(THD *thd)
 
   if (!m_expr_item)
   {
-    DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+    assert(thd->lex->select_lex->item_list.elements == 1);
 
     m_expr_item= thd->lex->select_lex->item_list.head();
   }
diff --git a/sql/sp_instr.h b/sql/sp_instr.h
index e58483ef421a..0c9f30a8c89e 100644
--- a/sql/sp_instr.h
+++ b/sql/sp_instr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -532,7 +539,7 @@ class sp_instr_set : public sp_lex_instr
 
   virtual bool on_after_expr_parsing(THD *thd)
   {
-    DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+    assert(thd->lex->select_lex->item_list.elements == 1);
 
     m_value_item= thd->lex->select_lex->item_list.head();
 
@@ -685,7 +692,7 @@ class sp_instr_freturn : public sp_lex_instr
 
   virtual bool on_after_expr_parsing(THD *thd)
   {
-    DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+    assert(thd->lex->select_lex->item_list.elements == 1);
 
     m_expr_item= thd->lex->select_lex->item_list.head();
 
@@ -779,7 +786,7 @@ class sp_instr_jump : public sp_instr,
   virtual void backpatch(uint dest)
   {
     /* Calling backpatch twice is a logic flaw in jump resolution. */
-    DBUG_ASSERT(m_dest == 0);
+    assert(m_dest == 0);
     m_dest= dest;
   }
 
@@ -878,7 +885,7 @@ class sp_lex_branch_instr : public sp_lex_instr,
   virtual void backpatch(uint dest)
   {
     /* Calling backpatch twice is a logic flaw in jump resolution. */
-    DBUG_ASSERT(m_dest == 0);
+    assert(m_dest == 0);
     m_dest= dest;
   }
 
@@ -940,7 +947,7 @@ class sp_instr_jump_if_not : public sp_lex_branch_instr
 
   virtual bool on_after_expr_parsing(THD *thd)
   {
-    DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+    assert(thd->lex->select_lex->item_list.elements == 1);
 
     m_expr_item= thd->lex->select_lex->item_list.head();
 
@@ -1027,7 +1034,7 @@ class sp_instr_set_case_expr : public sp_lex_branch_instr
 
   virtual bool on_after_expr_parsing(THD *thd)
   {
-    DBUG_ASSERT(thd->lex->select_lex->item_list.elements == 1);
+    assert(thd->lex->select_lex->item_list.elements == 1);
 
     m_expr_item= thd->lex->select_lex->item_list.head();
 
@@ -1157,7 +1164,7 @@ class sp_instr_hpush_jump : public sp_instr_jump
     m_opt_hpop(0),
     m_frame(ctx->current_var_count())
   {
-    DBUG_ASSERT(m_handler->condition_values.elements == 0);
+    assert(m_handler->condition_values.elements == 0);
   }
 
   virtual ~sp_instr_hpush_jump()
@@ -1196,7 +1203,7 @@ class sp_instr_hpush_jump : public sp_instr_jump
 
   virtual void backpatch(uint dest)
   {
-    DBUG_ASSERT(!m_dest || !m_opt_hpop);
+    assert(!m_dest || !m_opt_hpop);
     if (!m_dest)
       m_dest= dest;
     else
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
index 5ee10bd71824..32e1f3996d89 100644
--- a/sql/sp_pcontext.cc
+++ b/sql/sp_pcontext.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -19,7 +26,7 @@
 
 bool sp_condition_value::equals(const sp_condition_value *cv) const
 {
-  DBUG_ASSERT(cv);
+  assert(cv);
 
   if (this == cv)
     return true;
@@ -103,7 +110,7 @@ void sp_handler::print(String *str) const
     break;
   default:
     // The handler type must be either CONTINUE or EXIT.
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   print_conditions(str);
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index 6a95eb836693..56d2e34f552f 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -1,14 +1,21 @@
 /* -*- C++ -*- */
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -166,7 +173,7 @@ class sp_condition_value : public Sql_alloc
    :Sql_alloc(),
     type(_type)
   {
-    DBUG_ASSERT(type != ERROR_CODE && type != SQLSTATE);
+    assert(type != ERROR_CODE && type != SQLSTATE);
   }
 
   /// Print a condition_value in human-readable form.
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index b56cdb2bad52..834feec95cb4 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -114,7 +121,7 @@ bool sp_rcontext::init_var_table(THD *thd)
 
   m_root_parsing_ctx->retrieve_field_definitions(&field_def_lst);
 
-  DBUG_ASSERT(field_def_lst.elements == m_root_parsing_ctx->max_var_index());
+  assert(field_def_lst.elements == m_root_parsing_ctx->max_var_index());
 
   if (!(m_var_table= create_virtual_tmp_table(thd, field_def_lst)))
     return true;
@@ -150,7 +157,7 @@ bool sp_rcontext::init_var_items(THD *thd)
 
 bool sp_rcontext::set_return_value(THD *thd, Item **return_value_item)
 {
-  DBUG_ASSERT(m_return_value_fld);
+  assert(m_return_value_fld);
 
   m_return_value_set = true;
 
@@ -182,7 +189,7 @@ bool sp_rcontext::push_cursor(sp_instr_cpush *i)
 
 void sp_rcontext::pop_cursors(uint count)
 {
-  DBUG_ASSERT(m_ccount >= count);
+  assert(m_ccount >= count);
 
   while (count--)
     delete m_cstack[--m_ccount];
@@ -233,7 +240,7 @@ void sp_rcontext::pop_handler_frame(THD *thd)
   m_activated_handlers.pop_back();
 
   // Also pop matching DA and copy new conditions.
-  DBUG_ASSERT(thd->get_stmt_da() == &frame->handler_da);
+  assert(thd->get_stmt_da() == &frame->handler_da);
   thd->pop_diagnostics_area();
   // Out with the old, in with the new!
   thd->get_stmt_da()->reset_condition_info(thd);
@@ -373,7 +380,7 @@ bool sp_rcontext::handle_sql_condition(THD *thd,
   //  - there is a pending SQL-condition (error or warning);
   //  - there is an SQL-handler for it.
 
-  DBUG_ASSERT(found_condition);
+  assert(found_condition);
 
   sp_handler_entry *handler_entry= NULL;
   for (size_t i= 0; i < m_visible_handlers.size(); ++i)
@@ -611,7 +618,7 @@ bool sp_cursor::Query_fetch_into_spvars::send_data(List<Item> &items)
   Item *item;
 
   /* Must be ensured by the caller */
-  DBUG_ASSERT(spvar_list->elements == items.elements);
+  assert(spvar_list->elements == items.elements);
 
   /*
     Assign the row fetched from a server side cursor to stored
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index e3616b6675ae..9ec41ef66682 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -231,7 +238,7 @@ class sp_rcontext : public Sql_alloc
   uint get_last_handler_continue_ip() const
   {
     uint ip= m_activated_handlers.back()->continue_ip;
-    DBUG_ASSERT(ip != 0);
+    assert(ip != 0);
 
     return ip;
   }
diff --git a/sql/spatial.cc b/sql/spatial.cc
index a4ea75e848d2..e788ddb11a60 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -49,7 +56,7 @@ int MBR::touches(const MBR *mbr) const
   int dim1= dimension();
   int dim2= mbr->dimension();
 
-  DBUG_ASSERT(dim1 >= 0 && dim1 <= 2 && dim2 >= 0 && dim2 <= 2);
+  assert(dim1 >= 0 && dim1 <= 2 && dim2 >= 0 && dim2 <= 2);
   if (dim1 == 0 && dim2 == 0)
     return 0;
   if (dim1 == 0 && dim2 == 1)
@@ -58,7 +65,7 @@ int MBR::touches(const MBR *mbr) const
   if (dim1 == 1 && dim2 == 0)
     return mbr->touches(this);
 
-  DBUG_ASSERT(dim1 + dim2 >= 2);
+  assert(dim1 + dim2 >= 2);
   ret=
     ((mbr2->xmin == mbr1->xmax || mbr2->xmax == mbr1->xmin) &&
      (mbr1->ymin <= mbr2->ymax && mbr1->ymax >= mbr2->ymin)) ||
@@ -87,7 +94,7 @@ int MBR::within(const MBR *mbr) const
   int dim1= dimension();
   int dim2= mbr->dimension();
 
-  DBUG_ASSERT(dim1 >= 0 && dim1 <= 2 && dim2 >= 0 && dim2 <= 2);
+  assert(dim1 >= 0 && dim1 <= 2 && dim2 >= 0 && dim2 <= 2);
 
   /*
     Either/both of the two operands can degrade to a point or a
@@ -97,45 +104,45 @@ int MBR::within(const MBR *mbr) const
   switch (dim1)
   {
   case 0:
-    DBUG_ASSERT(xmin == xmax && ymin == ymax);
+    assert(xmin == xmax && ymin == ymax);
     switch (dim2)
     {
     case 0:
-      DBUG_ASSERT(mbr->xmin == mbr->xmax && mbr->ymin == mbr->ymax);
+      assert(mbr->xmin == mbr->xmax && mbr->ymin == mbr->ymax);
       return equals(mbr);
       break;
     case 1:
-      DBUG_ASSERT((mbr->xmin == mbr->xmax && mbr->ymin != mbr->ymax) ||
-                  (mbr->ymin == mbr->ymax && mbr->xmin != mbr->xmax));
+      assert((mbr->xmin == mbr->xmax && mbr->ymin != mbr->ymax) ||
+             (mbr->ymin == mbr->ymax && mbr->xmin != mbr->xmax));
       return ((xmin > mbr->xmin && xmin < mbr->xmax && ymin == mbr->ymin) ||
               (ymin > mbr->ymin && ymin < mbr->ymax && xmin == mbr->xmin));
       break;
     case 2:
-      DBUG_ASSERT(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
+      assert(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
       return (xmin > mbr->xmin && xmax < mbr->xmax &&
               ymin > mbr->ymin && ymax < mbr->ymax);
       break;
     }
     break;
   case 1:
-    DBUG_ASSERT((xmin == xmax && ymin != ymax) ||
-                (ymin == ymax && xmin != xmax));
+    assert((xmin == xmax && ymin != ymax) ||
+           (ymin == ymax && xmin != xmax));
     switch (dim2)
     {
     case 0:
-      DBUG_ASSERT(mbr->xmin == mbr->xmax && mbr->ymin == mbr->ymax);
+      assert(mbr->xmin == mbr->xmax && mbr->ymin == mbr->ymax);
       return 0;
       break;
     case 1:
-      DBUG_ASSERT((mbr->xmin == mbr->xmax && mbr->ymin != mbr->ymax) ||
-                  (mbr->ymin == mbr->ymax && mbr->xmin != mbr->xmax));
+      assert((mbr->xmin == mbr->xmax && mbr->ymin != mbr->ymax) ||
+             (mbr->ymin == mbr->ymax && mbr->xmin != mbr->xmax));
       return ((xmin == xmax && mbr->xmin == mbr->xmax && mbr->xmin == xmin &&
                mbr->ymin <= ymin && mbr->ymax >= ymax) ||
               (ymin == ymax && mbr->ymin == mbr->ymax && mbr->ymin == ymin &&
                mbr->xmin <= xmin && mbr->xmax >= xmax));
       break;
     case 2:
-      DBUG_ASSERT(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
+      assert(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
       return ((xmin == xmax && xmin > mbr->xmin && xmax < mbr->xmax &&
                ymin >= mbr->ymin && ymax <= mbr->ymax) ||
               (ymin == ymax && ymin > mbr->ymin && ymax < mbr->ymax &&
@@ -144,7 +151,7 @@ int MBR::within(const MBR *mbr) const
     }
     break;
   case 2:
-    DBUG_ASSERT(xmin != xmax && ymin != ymax);
+    assert(xmin != xmax && ymin != ymax);
     switch (dim2)
     {
     case 0:
@@ -152,7 +159,7 @@ int MBR::within(const MBR *mbr) const
       return 0;
       break;
     case 2:
-      DBUG_ASSERT(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
+      assert(mbr->xmin != mbr->xmax && mbr->ymin != mbr->ymax);
       return ((mbr->xmin <= xmin) && (mbr->ymin <= ymin) &&
               (mbr->xmax >= xmax) && (mbr->ymax >= ymax));
       break;
@@ -162,7 +169,7 @@ int MBR::within(const MBR *mbr) const
   }
 
   // Never reached.
-  DBUG_ASSERT(false);
+  assert(false);
   return 0;
 }
 
@@ -476,8 +483,8 @@ Geometry *Geometry::create_from_wkt(Geometry_buffer *buffer,
  */
 bool Geometry::as_wkb(String *wkb, bool shallow_copy) const
 {
-  DBUG_ASSERT(wkb->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
-              wkb->ptr() > get_cptr() + get_nbytes());
+  assert(wkb->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
+         wkb->ptr() > get_cptr() + get_nbytes());
 
   if (shallow_copy)
   {
@@ -488,10 +495,10 @@ bool Geometry::as_wkb(String *wkb, bool shallow_copy) const
 
       Don't write to this object's own String buffer.
      */
-    DBUG_ASSERT(wkb->ptr() != get_cptr() - GEOM_HEADER_SIZE);
+    assert(wkb->ptr() != get_cptr() - GEOM_HEADER_SIZE);
 
-    DBUG_ASSERT(!(get_geotype() == wkb_polygon &&
-                  (!polygon_is_wkb_form() || is_bg_adapter())));
+    assert(!(get_geotype() == wkb_polygon &&
+             (!polygon_is_wkb_form() || is_bg_adapter())));
     wkb->set(get_cptr() - WKB_HEADER_SIZE, get_nbytes() + WKB_HEADER_SIZE,
              &my_charset_bin);
     return false;
@@ -537,15 +544,15 @@ bool Geometry::as_geometry(String *buf, bool shallow_copy) const
 
       Don't write to this object's own String buffer.
      */
-    DBUG_ASSERT(has_geom_header_space());
+    assert(has_geom_header_space());
 
-    DBUG_ASSERT(!(get_geotype() == wkb_polygon &&
-                  (!polygon_is_wkb_form() || is_bg_adapter())));
+    assert(!(get_geotype() == wkb_polygon &&
+             (!polygon_is_wkb_form() || is_bg_adapter())));
 
     if (buf->ptr() != get_cptr() - GEOM_HEADER_SIZE)
     {
-      DBUG_ASSERT(buf->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
-                  buf->ptr() > get_cptr() + get_nbytes());
+      assert(buf->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
+             buf->ptr() > get_cptr() + get_nbytes());
       buf->set(get_cptr() - GEOM_HEADER_SIZE, get_nbytes() + GEOM_HEADER_SIZE,
                &my_charset_bin);
     }
@@ -558,8 +565,8 @@ bool Geometry::as_geometry(String *buf, bool shallow_copy) const
       return false;
   }
   else
-    DBUG_ASSERT(buf->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
-                buf->ptr() > get_cptr() + get_nbytes());
+    assert(buf->ptr() < get_cptr() - GEOM_HEADER_SIZE ||
+           buf->ptr() > get_cptr() + get_nbytes());
 
   if (buf->reserve(SRID_SIZE + WKB_HEADER_SIZE + this->get_nbytes(), 512) ||
       get_data_ptr() == NULL)
@@ -706,7 +713,7 @@ class Geometry_well_formed_checker : public WKB_scanner_event_handler
       break;
     default:
       // The list of cases above should be complete (R2).
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
@@ -919,7 +926,7 @@ wkb_scanner(const char *wkb, uint32 *len, uint32 geotype, bool has_hdr,
   }
   else
   {
-    DBUG_ASSERT(geotype >= Geometry::wkb_first && geotype<= Geometry::wkb_last);
+    assert(geotype >= Geometry::wkb_first && geotype<= Geometry::wkb_last);
     q= wkb;
     gt= static_cast<Geometry::wkbType>(geotype);
     handler->on_wkb_start(Geometry::wkb_ndr, gt, q, *len, false);
@@ -970,7 +977,7 @@ wkb_scanner(const char *wkb, uint32 *len, uint32 geotype, bool has_hdr,
     comp_hashdr= true;
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -1218,7 +1225,7 @@ void Geometry::append_points(String *txt, uint32 n_points,
                              wkb_parser *wkb, uint32 offset,
                              bool bracket_pt) const
 {
-  DBUG_ASSERT(0.0 == 0 && 0 == -0 && -0.0 == 0.0);
+  assert(0.0 == 0 && 0 == -0 && -0.0 == 0.0);
 
   while (n_points--)
   {
@@ -1273,13 +1280,13 @@ bool Geometry::get_mbr_for_points(MBR *mbr, wkb_parser *wkb,
 
 Geometry::Geometry(const Geometry &geo)
 {
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   wkbType geotype= geo.get_geotype();
 #endif
-  DBUG_ASSERT(is_valid_geotype(geotype) &&
-              ((geo.get_ptr() != NULL && geo.get_nbytes() > 0) ||
-               (geo.get_ptr() == NULL && geo.get_nbytes() == 0) ||
-               (geo.get_geotype() == wkb_polygon && geo.get_nbytes() == 0)));
+  assert(is_valid_geotype(geotype) &&
+         ((geo.get_ptr() != NULL && geo.get_nbytes() > 0) ||
+          (geo.get_ptr() == NULL && geo.get_nbytes() == 0) ||
+          (geo.get_geotype() == wkb_polygon && geo.get_nbytes() == 0)));
 
   m_ptr= geo.m_ptr;
   m_flags= geo.m_flags;
@@ -1301,13 +1308,13 @@ Geometry::~Geometry()
     problem we want to address/avoid by forbiding throwing exceptions in
     destructors of Geometry classes.
 
-    Since DBUG_ASSERT only works when DBUG_OFF is not defined, the
+    Since assert only works when NDEBUG is not defined, the
     try/catch is only enabled here depending on the same condition, so that
     in release builds we don't have the overhead of the try-catch statement.
 
     This is true also for destructors of children classes of Geometry.
   */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   try
   {
 #endif
@@ -1331,12 +1338,12 @@ Geometry::~Geometry()
 
     donate_data();
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   }
   catch (...)
   {
     // Should never throw exceptions in destructor.
-    DBUG_ASSERT(false);
+    assert(false);
   }
 #endif
 }
@@ -1351,12 +1358,12 @@ Geometry &Geometry::operator=(const Geometry &rhs)
   if (this == &rhs)
     return *this;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   Geometry::wkbType geotype= rhs.get_geotype();
 #endif
-  DBUG_ASSERT((is_bg_adapter() || rhs.is_bg_adapter()) &&
-              m_flags.geotype == rhs.m_flags.geotype &&
-              is_valid_geotype(geotype));
+  assert((is_bg_adapter() || rhs.is_bg_adapter()) &&
+         m_flags.geotype == rhs.m_flags.geotype &&
+         is_valid_geotype(geotype));
 
   set_bg_adapter(true);
 
@@ -1378,11 +1385,11 @@ Geometry &Geometry::operator=(const Geometry &rhs)
 Gis_point::Gis_point(const self &pt) :Geometry(pt)
 {
   size_t nbytes= get_nbytes();
-  DBUG_ASSERT((nbytes == SIZEOF_STORED_DOUBLE * GEOM_DIM ||
-               nbytes == 0));
+  assert((nbytes == SIZEOF_STORED_DOUBLE * GEOM_DIM ||
+          nbytes == 0));
   if (nbytes == 0)
   {
-    DBUG_ASSERT(get_ownmem() == false);
+    assert(get_ownmem() == false);
     // Allocate even if pt isn't initialized with proper value, this is
     // required behavior from Boost Geometry.
     nbytes= SIZEOF_STORED_DOUBLE * GEOM_DIM;
@@ -1418,14 +1425,14 @@ Gis_point &Gis_point::operator=(const Gis_point &rhs)
   // This point may or may not have own memory. we allow this because in bg,
   // std::reverse is called to reverse a linestring/ring, and also,
   // points are of equal size. Not allowed on any other type of geometries.
-  DBUG_ASSERT((m_ptr != NULL &&
-               get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-              (m_ptr == NULL && get_nbytes() == 0 && !get_ownmem()));
+  assert((m_ptr != NULL &&
+          get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+         (m_ptr == NULL && get_nbytes() == 0 && !get_ownmem()));
 
-  DBUG_ASSERT((rhs.get_ptr() != NULL &&
-               rhs.get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-              (rhs.get_ptr() == NULL && rhs.get_nbytes() == 0 &&
-               !rhs.get_ownmem()));
+  assert((rhs.get_ptr() != NULL &&
+          rhs.get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+         (rhs.get_ptr() == NULL && rhs.get_nbytes() == 0 &&
+          !rhs.get_ownmem()));
 
   if (m_owner == NULL)
     m_owner= rhs.get_owner();
@@ -1473,15 +1480,15 @@ void Gis_point::set_ptr(void *ptr, size_t len)
   set_bg_adapter(true);
   if (m_ptr && get_ownmem())
   {
-    DBUG_ASSERT(get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM);
+    assert(get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM);
     gis_wkb_free(m_ptr);
   }
   m_ptr= ptr;
   set_nbytes(len);
   set_ownmem(false);
-  DBUG_ASSERT((m_ptr != NULL &&
-               get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-              (m_ptr == NULL && get_nbytes() == 0));
+  assert((m_ptr != NULL &&
+          get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+         (m_ptr == NULL && get_nbytes() == 0));
 }
 
 
@@ -1632,7 +1639,7 @@ bool Gis_line_string::init_from_wkt(Gis_read_stream *trs, String *wkb)
   if (n_points < 4 || memcmp(lastpt, firstpt, POINT_DATA_SIZE))
     return true;
 
-  DBUG_ASSERT(n_points == (lastpt - firstpt) / POINT_DATA_SIZE + 1);
+  assert(n_points == (lastpt - firstpt) / POINT_DATA_SIZE + 1);
 
 out:
 
@@ -1871,7 +1878,7 @@ Gis_polygon::Gis_polygon(const void *wkb, size_t nbytes,
 Gis_polygon::~Gis_polygon()
 {
   /* See ~Geometry() for why we do try-catch like this. */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   try
   {
 #endif
@@ -1899,12 +1906,12 @@ Gis_polygon::~Gis_polygon()
       given to us, we don't own it; otherwise the two pieces are already freed
       above.
      */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   }
   catch (...)
   {
     // Should never throw exceptions in destructor.
-    DBUG_ASSERT(false);
+    assert(false);
   }
 #endif
 }
@@ -1991,7 +1998,7 @@ void Gis_polygon::set_ptr(void *ptr, size_t len)
  */
 void Gis_polygon::to_wkb_unparsed()
 {
-  DBUG_ASSERT(polygon_is_wkb_form() == false && is_bg_adapter());
+  assert(polygon_is_wkb_form() == false && is_bg_adapter());
 
   size_t nbytes= 0;
   void *ptr= get_packed_ptr(this, &nbytes);
@@ -2018,7 +2025,7 @@ void Gis_polygon::to_wkb_unparsed()
  */
 bool Gis_polygon_ring::set_ring_order(bool want_ccw)
 {
-  DBUG_ASSERT(is_bg_adapter());
+  assert(is_bg_adapter());
   Gis_polygon_ring &ring= *this;
   double x1, x2, y1, y2, minx= DBL_MAX, miny= DBL_MAX;
   size_t min_i= 0, prev_i, post_i, rsz= ring.size();
@@ -2138,7 +2145,7 @@ bool Gis_polygon_ring::set_ring_order(bool want_ccw)
     char pt[POINT_DATA_SIZE];
     size_t s= ring.size();
 
-    DBUG_ASSERT(ring.get_nbytes() == (s * POINT_DATA_SIZE + 4));
+    assert(ring.get_nbytes() == (s * POINT_DATA_SIZE + 4));
     p0= p;
 
     for (size_t i= 0; i < s / 2; i++, p+= POINT_DATA_SIZE)
@@ -2159,7 +2166,7 @@ bool Gis_polygon_ring::set_ring_order(bool want_ccw)
 */
 bool Gis_polygon::set_polygon_ring_order()
 {
-  DBUG_ASSERT(is_bg_adapter());
+  assert(is_bg_adapter());
   if (outer().set_ring_order(true/* Ring order: CCW. */))
     return true;
   Gis_polygon::inner_container_type::iterator itr;
@@ -2220,7 +2227,7 @@ uint32 Gis_polygon::get_data_size() const
     For a BG adapter polygon, its Gis_polygon::m_ptr points to its outer ring
     rather than the WKB buffer, it is the only exception.
    */
-  DBUG_ASSERT(polygon_is_wkb_form() || !is_bg_adapter());
+  assert(polygon_is_wkb_form() || !is_bg_adapter());
 
   if (wkb.scan_non_zero_uint4(&n_linear_rings))
     return GET_SIZE_ERROR;
@@ -2299,7 +2306,7 @@ uint Gis_polygon::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
       return 0;
 
     wkb+= ls_len;
-    DBUG_ASSERT(len >= ls_len);
+    assert(len >= ls_len);
     len-= ls_len;
   }
 
@@ -2426,7 +2433,7 @@ const Geometry::Class_info *Gis_polygon::get_class_info() const
   */
 void *get_packed_ptr(const Geometry *geo0, size_t *pnbytes)
 {
-  DBUG_ASSERT(geo0->get_geotype() == Geometry::wkb_polygon && pnbytes != NULL);
+  assert(geo0->get_geotype() == Geometry::wkb_polygon && pnbytes != NULL);
   const Gis_polygon *geo= static_cast<const Gis_polygon *>(geo0);
   Gis_polygon::ring_type *out_ring= outer_ring(geo);
   Gis_polygon::inner_container_type *inn_rings= geo->inner_rings();
@@ -2434,7 +2441,7 @@ void *get_packed_ptr(const Geometry *geo0, size_t *pnbytes)
 
   if (out_ring == NULL)
   {
-    DBUG_ASSERT(inn_rings == NULL);
+    assert(inn_rings == NULL);
     *pnbytes= 0;
     return NULL;
   }
@@ -2464,7 +2471,7 @@ void *get_packed_ptr(const Geometry *geo0, size_t *pnbytes)
     n_inns= inn_rings->size();
   }
 
-  DBUG_ASSERT(1 + n_inns <= 0xFFFFFFFF);
+  assert(1 + n_inns <= 0xFFFFFFFF);
   int4store(static_cast<uchar *>(src_val), static_cast<uint32>(1 + n_inns));
 
   nbytes= vallen;
@@ -2482,13 +2489,13 @@ void *get_packed_ptr(const Geometry *geo0, size_t *pnbytes)
  */
 const char *get_packed_ptr(Geometry *geo0)
 {
-  DBUG_ASSERT(geo0->get_geotype() == Geometry::wkb_polygon);
+  assert(geo0->get_geotype() == Geometry::wkb_polygon);
   Gis_polygon *geo= static_cast<Gis_polygon *>(geo0);
   Gis_polygon::ring_type *out_ring= outer_ring(geo);
   Gis_polygon::inner_container_type *inn_rings= geo->inner_rings();
   if (inn_rings)
-    DBUG_ASSERT(out_ring->get_cptr() +
-                out_ring->get_nbytes() == inn_rings->get_cptr());
+    assert(out_ring->get_cptr() +
+           out_ring->get_nbytes() == inn_rings->get_cptr());
   return (out_ring->get_cptr() - sizeof(uint32)/*polygon's ring count */);
 }
 
@@ -2501,8 +2508,8 @@ const char *get_packed_ptr(Geometry *geo0)
  */
 bool polygon_is_packed(Geometry *plgn, Geometry *mplgn)
 {
-  DBUG_ASSERT(plgn->get_geotype() == Geometry::wkb_polygon &&
-              mplgn->get_geotype() == Geometry::wkb_multipolygon);
+  assert(plgn->get_geotype() == Geometry::wkb_polygon &&
+         mplgn->get_geotype() == Geometry::wkb_multipolygon);
   Gis_polygon *geo= static_cast<Gis_polygon *>(plgn);
   Gis_polygon::ring_type *out_ring= outer_ring(geo);
   Gis_polygon::inner_container_type *inn_rings= geo->inner_rings();
@@ -2514,8 +2521,8 @@ bool polygon_is_packed(Geometry *plgn, Geometry *mplgn)
   {
     // This polygon is already stored packed and inline
     if (inn_rings && inn_rings->get_nbytes())
-      DBUG_ASSERT(orstart + out_ring->get_nbytes() ==
-                  inn_rings->get_ptr());
+      assert(orstart + out_ring->get_nbytes() ==
+             inn_rings->get_ptr());
 
     ret= true;
   }
@@ -2526,7 +2533,7 @@ bool polygon_is_packed(Geometry *plgn, Geometry *mplgn)
 
 void own_rings(Geometry *geo0)
 {
-  DBUG_ASSERT(geo0->get_geotype() == Geometry::wkb_polygon);
+  assert(geo0->get_geotype() == Geometry::wkb_polygon);
   Gis_polygon *geo= static_cast<Gis_polygon *>(geo0);
 
   if (outer_ring(geo))
@@ -2783,7 +2790,7 @@ uint Gis_multi_line_string::init_from_wkb(const char *wkb, uint len,
       return 0;
     ls_len+= WKB_HEADER_SIZE;;
     wkb+= ls_len;
-    DBUG_ASSERT(len >= ls_len);
+    assert(len >= ls_len);
     len-= ls_len;
   }
   return (uint) (wkb - wkb_orig);
@@ -3024,7 +3031,7 @@ uint Gis_multi_polygon::init_from_wkb(const char *wkb, uint len,
       return 0;
     p_len+= WKB_HEADER_SIZE;
     wkb+= p_len;
-    DBUG_ASSERT(len >= p_len);
+    assert(len >= p_len);
     len-= p_len;
   }
   return (uint) (wkb - wkb_orig);
@@ -3197,8 +3204,8 @@ bool Gis_geometry_collection::append_geometry(const Geometry *geo,
   uint32 collection_len= gcbuf->length(), geo_len= geo->get_data_size();
   if (geo_len == GET_SIZE_ERROR)
     return true;
-  DBUG_ASSERT(collection_len == 0 ||
-              get_data_size() == collection_len - GEOM_HEADER_SIZE);
+  assert(collection_len == 0 ||
+         get_data_size() == collection_len - GEOM_HEADER_SIZE);
   if (gcbuf->reserve((collection_len == 0 ? GEOM_HEADER_SIZE + 4 : 0) +
                      geo_len + WKB_HEADER_SIZE, 512))
     return true;
@@ -3247,11 +3254,11 @@ bool Gis_geometry_collection::append_geometry(const Geometry *geo,
 bool Gis_geometry_collection::append_geometry(srid_t srid, wkbType gtype,
                                               const String *gbuf, String *gcbuf)
 {
-  DBUG_ASSERT(gbuf != NULL && gbuf->ptr() != NULL && gbuf->length() > 0);
+  assert(gbuf != NULL && gbuf->ptr() != NULL && gbuf->length() > 0);
 
   uint32 collection_len= gcbuf->length(), geo_len= gbuf->length();
-  DBUG_ASSERT(collection_len == 0 ||
-              get_data_size() == collection_len - GEOM_HEADER_SIZE);
+  assert(collection_len == 0 ||
+         get_data_size() == collection_len - GEOM_HEADER_SIZE);
   if (gcbuf->reserve((collection_len == 0 ? GEOM_HEADER_SIZE + 4 : 0) +
                      geo_len + WKB_HEADER_SIZE, 512))
     return true;
@@ -3301,8 +3308,8 @@ Gis_geometry_collection::Gis_geometry_collection(srid_t srid, wkbType gtype,
   : Geometry(0, 0, Flags_t(wkb_geometrycollection, 0), srid)
 {
   uint32 geo_len= gbuf ? gbuf->length() : 0, total_len= 0;
-  DBUG_ASSERT((gbuf == NULL || (gbuf->ptr() == NULL && gbuf->length() == 0)) ||
-              (gbuf->ptr() != NULL && gbuf->length() > 0));
+  assert((gbuf == NULL || (gbuf->ptr() == NULL && gbuf->length() == 0)) ||
+         (gbuf->ptr() != NULL && gbuf->length() > 0));
   total_len= geo_len + sizeof(uint32)/*NUM-objs*/ +
     SRID_SIZE + WKB_HEADER_SIZE + (geo_len > 0 ? WKB_HEADER_SIZE : 0);
 
@@ -3340,9 +3347,9 @@ Gis_geometry_collection::Gis_geometry_collection(srid_t srid, wkbType gtype,
 Gis_geometry_collection::Gis_geometry_collection(Geometry *geo, String *gcbuf)
   : Geometry(0, 0, Flags_t(wkb_geometrycollection, 0), geo->get_srid())
 {
-  DBUG_ASSERT(geo != NULL && geo->get_ptr() != NULL);
+  assert(geo != NULL && geo->get_ptr() != NULL);
   uint32 geo_len= geo->get_data_size(), total_len= 0;
-  DBUG_ASSERT(geo_len != GET_SIZE_ERROR);
+  assert(geo_len != GET_SIZE_ERROR);
   total_len= geo_len + sizeof(uint32)/*NUM-objs*/ +
     SRID_SIZE + WKB_HEADER_SIZE * 2;
 
@@ -3484,7 +3491,7 @@ uint Gis_geometry_collection::init_from_wkb(const char *wkb, uint len,
       return 0;
     g_len+= WKB_HEADER_SIZE;
     wkb+= g_len;
-    DBUG_ASSERT(len >= g_len);
+    assert(len >= g_len);
     len-= g_len;
   }
   return (uint) (wkb - wkb_orig);
@@ -3670,7 +3677,7 @@ class Stepper_base
                bool has_wkb_hdr, Geometry::wkbType geotype)
   {
     m_dim= dim;
-    DBUG_ASSERT(bo == Geometry::wkb_ndr);
+    assert(bo == Geometry::wkb_ndr);
     m_bo= bo;
     m_has_wkb_hdr= has_wkb_hdr;
     m_geotype= geotype;
@@ -3679,14 +3686,14 @@ class Stepper_base
 
   Geometry::wkbByteOrder get_current_byte_order() const
   {
-    DBUG_ASSERT((m_bo == Geometry::wkb_xdr || m_bo == Geometry::wkb_ndr));
+    assert((m_bo == Geometry::wkb_xdr || m_bo == Geometry::wkb_ndr));
     return m_bo;
   }
 
 
   Geometry::wkbType get_current_geotype()const
   {
-    DBUG_ASSERT(Geometry::is_valid_geotype(m_geotype));
+    assert(Geometry::is_valid_geotype(m_geotype));
     return m_geotype;
   }
 
@@ -3839,7 +3846,7 @@ const char *Polygon_stepper::operator()(const char *p)
 
   // m_bo is latest byte order, which allows mixed byte orders in the same
   // wkb byte string.
-  DBUG_ASSERT(m_has_wkb_hdr);
+  assert(m_has_wkb_hdr);
   Geometry::wkbByteOrder bo= get_byte_order(p);
 
   // The next one can be other geo types, in a geometry collection.
@@ -3864,7 +3871,7 @@ const char *Polygon_stepper::operator()(const char *p)
 static inline
 Gis_polygon::inner_container_type *inner_rings(const Geometry *g)
 {
-  DBUG_ASSERT(g->get_geotype() == Geometry::wkb_polygon);
+  assert(g->get_geotype() == Geometry::wkb_polygon);
   const Gis_polygon *p= static_cast<const Gis_polygon *>(g);
   return p->inner_rings();
 }
@@ -3881,7 +3888,7 @@ Gis_polygon::inner_container_type *inner_rings(const Geometry *g)
 static inline
 void set_inner_rings(Geometry *g, Gis_polygon::inner_container_type *inns)
 {
-  DBUG_ASSERT(g->get_geotype() == Geometry::wkb_polygon);
+  assert(g->get_geotype() == Geometry::wkb_polygon);
   Gis_polygon *p= static_cast<Gis_polygon *>(g);
   p->set_inner_rings(inns);
 }
@@ -3905,8 +3912,8 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
   Geometry::wkbByteOrder mybo= geom->get_byte_order();
   char dim= geom->get_dimension();
 
-  DBUG_ASSERT(geotype != Geometry::wkb_polygon_inner_rings ||
-              (geotype == Geometry::wkb_polygon_inner_rings && num_geoms != 0));
+  assert(geotype != Geometry::wkb_polygon_inner_rings ||
+         (geotype == Geometry::wkb_polygon_inner_rings && num_geoms != 0));
   geom->set_bg_adapter(true);
   if (p == NULL)
     return;
@@ -3915,7 +3922,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
   {
   case Geometry::wkb_point:
     // Point doesn't need this vector.
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   case Geometry::wkb_linestring:
     {
@@ -3940,7 +3947,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
           last= p;
         }
 
-        DBUG_ASSERT(nbytes == dim * SIZEOF_STORED_DOUBLE);
+        assert(nbytes == dim * SIZEOF_STORED_DOUBLE);
         // Construct the geometry object as below to avoid unncesarrily
         // parsing its WKB data. Parsing will be done in shallow_copy.
         Gis_point ent;
@@ -3970,7 +3977,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
       p+= sizeof(uint32);
 
       Geometry::wkbByteOrder bo= ::get_byte_order(p);
-      DBUG_ASSERT(get_wkb_geotype(p + 1) == Geometry::wkb_point);
+      assert(get_wkb_geotype(p + 1) == Geometry::wkb_point);
       p+= WKB_HEADER_SIZE;
 
       Point_stepper ptstep(dim, bo, true);
@@ -3994,7 +4001,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
         ent.set_owner(geom);
         geom->shallow_push(&ent);
         bo= ptstep.get_current_byte_order();
-        DBUG_ASSERT(ptstep.get_current_geotype() == Geometry::wkb_point);
+        assert(ptstep.get_current_geotype() == Geometry::wkb_point);
       }
 
       break;
@@ -4005,7 +4012,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
       p+= sizeof(uint32);
 
       Geometry::wkbByteOrder bo= ::get_byte_order(p);
-      DBUG_ASSERT(get_wkb_geotype(p + 1) == Geometry::wkb_linestring);
+      assert(get_wkb_geotype(p + 1) == Geometry::wkb_linestring);
       p+= WKB_HEADER_SIZE;
       Linestring_stepper lsstep(dim, bo, true);
 
@@ -4028,7 +4035,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
         ent.set_owner(geom);
         geom->shallow_push(&ent);
         bo= lsstep.get_current_byte_order();
-        DBUG_ASSERT(lsstep.get_current_geotype() == Geometry::wkb_linestring);
+        assert(lsstep.get_current_geotype() == Geometry::wkb_linestring);
       }
 
       break;
@@ -4154,7 +4161,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
       p+= sizeof(uint32);
 
       Geometry::wkbByteOrder bo= ::get_byte_order(p);
-      DBUG_ASSERT(get_wkb_geotype(p + 1) == Geometry::wkb_polygon);
+      assert(get_wkb_geotype(p + 1) == Geometry::wkb_polygon);
       p+= WKB_HEADER_SIZE;
       Polygon_stepper plgn_step(dim, bo, true);
 
@@ -4181,7 +4188,7 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
         // The object 'ent' doesn't have any data of its own.
         ent.donate_data();
         bo= plgn_step.get_current_byte_order();
-        DBUG_ASSERT(plgn_step.get_current_geotype() == Geometry::wkb_polygon);
+        assert(plgn_step.get_current_geotype() == Geometry::wkb_polygon);
       }
 
       break;
@@ -4191,10 +4198,10 @@ void parse_wkb_data(Geometry *geom, const char *p, size_t num_geoms)
       We never create a Gis_wkb_vector using a geometry collection, because
       BG never uses such a type.
      */
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 }
@@ -4239,7 +4246,7 @@ const void *Geometry::normalize_ring_order()
       This is impossible because BG doesn't use a geometry collection, and
       we can't create a Gis_wkb_vector<T> with a geometry collection.
     */
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
   if (inval)
@@ -4334,7 +4341,7 @@ void Gis_wkb_vector<T>::reassemble()
         if (out)
         {
           out= false;
-          DBUG_ASSERT(prev_start == veci->get_ptr());
+          assert(prev_start == veci->get_ptr());
         }
         prev_in= i;
         continue;
@@ -4382,12 +4389,12 @@ void Gis_wkb_vector<T>::reassemble()
         // component can be a multipoint/multilinestring/multipolygon or a
         // geometrycollection. And multipoint components are already supported
         // so not forbidding them here.
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
         Geometry::wkbType veci_gt= veci->get_geotype();
 #endif
-        DBUG_ASSERT(veci_gt != wkb_geometrycollection &&
-                    veci_gt != wkb_multilinestring &&
-                    veci_gt != wkb_multipolygon);
+        assert(veci_gt != wkb_geometrycollection &&
+               veci_gt != wkb_multilinestring &&
+               veci_gt != wkb_multipolygon);
         /* A point/multipoint/linestring is always in one memory chunk. */
         totlen+= veci->get_nbytes() + hdrsz;
       }
@@ -4396,7 +4403,7 @@ void Gis_wkb_vector<T>::reassemble()
         // Must be a polygon out of line.
         size_t nbytes= 0;
         void *plgn_base= get_packed_ptr(veci, &nbytes);
-        DBUG_ASSERT(veci->get_nbytes() == 0 || veci->get_nbytes() == nbytes);
+        assert(veci->get_nbytes() == 0 || veci->get_nbytes() == nbytes);
         veci->set_nbytes(nbytes);
         plgn_data.insert(std::make_pair(i, std::make_pair(plgn_base,nbytes)));
         totlen+= nbytes + hdrsz;
@@ -4410,7 +4417,7 @@ void Gis_wkb_vector<T>::reassemble()
       if (out)
       {
         out= false;
-        DBUG_ASSERT(prev_start == veci->get_ptr());
+        assert(prev_start == veci->get_ptr());
       }
       prev_in= i;
     }
@@ -4424,8 +4431,8 @@ void Gis_wkb_vector<T>::reassemble()
   }
 
   size_t nbytes= get_nbytes();
-  DBUG_ASSERT((nbytes == 0 && m_ptr == NULL && num == segsz) ||
-              (nbytes > 0 && num >= segsz));
+  assert((nbytes == 0 && m_ptr == NULL && num == segsz) ||
+         (nbytes > 0 && num >= segsz));
 
   // If all are out of line, m_ptr is 0 and no room for ring count, otherwise
   // the space for ring count is already counted above.
@@ -4481,13 +4488,13 @@ void Gis_wkb_vector<T>::reassemble()
     plgn_data_itr= plgn_data.find(i);
     if (veci->get_geotype() != Geometry::wkb_polygon)
     {
-      DBUG_ASSERT(plgn_data_itr == plgn_data.end());
+      assert(plgn_data_itr == plgn_data.end());
       len= veci->get_nbytes();
       memcpy(q, veci->get_ptr(), len);
     }
     else
     {
-      DBUG_ASSERT(plgn_data_itr != plgn_data.end());
+      assert(plgn_data_itr != plgn_data.end());
       len= plgn_data_itr->second.second;
       memcpy(q, plgn_data_itr->second.first, len);
     }
@@ -4502,12 +4509,12 @@ void Gis_wkb_vector<T>::reassemble()
     memcpy(q, prev_start, len);
     total_len+= len;
   }
-  DBUG_ASSERT(total_len == totlen);
+  assert(total_len == totlen);
 
   // Inner rings doesn't have ring count.
   if (!is_inns)
   {
-    DBUG_ASSERT(segsz + uint4korr(ptr) <= 0xFFFFFFFF);
+    assert(segsz + uint4korr(ptr) <= 0xFFFFFFFF);
     int4store(reinterpret_cast<uchar *>(ptr),
               uint4korr(ptr) + static_cast<uint32>(segsz));
   }
@@ -4541,7 +4548,7 @@ Gis_wkb_vector(const void *ptr, size_t nbytes, const Flags_t &flags,
                srid_t srid, bool is_bg_adapter)
   :Geometry(ptr, nbytes, flags, srid)
 {
-  DBUG_ASSERT((ptr != NULL && nbytes > 0) || (ptr == NULL && nbytes == 0));
+  assert((ptr != NULL && nbytes > 0) || (ptr == NULL && nbytes == 0));
   set_ownmem(false); // We use existing WKB data and don't own that memory.
   set_bg_adapter(is_bg_adapter);
   m_geo_vect= NULL;
@@ -4573,9 +4580,9 @@ template <typename T>
 Gis_wkb_vector<T>::
 Gis_wkb_vector(const Gis_wkb_vector<T> &v) :Geometry(v), m_geo_vect(NULL)
 {
-  DBUG_ASSERT((v.get_ptr() != NULL && v.get_nbytes() > 0) ||
-              (v.get_ptr() == NULL && !v.get_ownmem() &&
-               v.get_nbytes() == 0));
+  assert((v.get_ptr() != NULL && v.get_nbytes() > 0) ||
+         (v.get_ptr() == NULL && !v.get_ownmem() &&
+          v.get_nbytes() == 0));
   if (!v.is_bg_adapter() || (v.get_ptr() == NULL && v.m_geo_vect == NULL))
     return;
   m_geo_vect= new Geo_vector();
@@ -4620,11 +4627,11 @@ Gis_wkb_vector<T> &Gis_wkb_vector<T>::operator=(const Gis_wkb_vector<T> &rhs)
     return *this;
   Geometry::operator=(rhs);
 
-  DBUG_ASSERT((m_ptr != NULL && get_ownmem() && get_nbytes() > 0) ||
-              (m_ptr == NULL && !get_ownmem() && get_nbytes() == 0));
-  DBUG_ASSERT((rhs.get_ptr() != NULL && rhs.get_nbytes() > 0) ||
-              (rhs.get_ptr() == NULL && !rhs.get_ownmem() &&
-               rhs.get_nbytes() == 0));
+  assert((m_ptr != NULL && get_ownmem() && get_nbytes() > 0) ||
+         (m_ptr == NULL && !get_ownmem() && get_nbytes() == 0));
+  assert((rhs.get_ptr() != NULL && rhs.get_nbytes() > 0) ||
+         (rhs.get_ptr() == NULL && !rhs.get_ownmem() &&
+          rhs.get_nbytes() == 0));
 
   if (m_owner == NULL)
     m_owner= rhs.get_owner();
@@ -4709,7 +4716,7 @@ void Gis_wkb_vector<T>::shallow_push(const Geometry *g)
     m_geo_vect= new Geo_vector();
   // Allocate space and create an object with its default constructor.
   pgeo= static_cast<T *>(m_geo_vect->append_object());
-  DBUG_ASSERT(pgeo != NULL);
+  assert(pgeo != NULL);
   if (pgeo == NULL)
     return;
 
@@ -4730,7 +4737,7 @@ void Gis_wkb_vector<T>::shallow_push(const Geometry *g)
 template <typename T>
 void Gis_wkb_vector<T>::set_ptr(void *ptr, size_t len)
 {
-  DBUG_ASSERT(!(ptr == NULL && len > 0));
+  assert(!(ptr == NULL && len > 0));
   set_bg_adapter(true);
   if (get_geotype() != Geometry::wkb_polygon)
   {
@@ -4784,11 +4791,11 @@ void Gis_wkb_vector<T>::clear()
 {
   if (!m_geo_vect)
   {
-    DBUG_ASSERT(m_ptr == NULL);
+    assert(m_ptr == NULL);
     return;
   }
 
-  DBUG_ASSERT(m_geo_vect && get_geotype() != Geometry::wkb_polygon);
+  assert(m_geo_vect && get_geotype() != Geometry::wkb_polygon);
 
   // Keep the component vector because this object can be reused again.
   const void *ptr= get_ptr();
@@ -4813,7 +4820,7 @@ size_t Gis_wkb_vector<T>::current_size() const
 {
   // Polygon's data may not stay in a continuous chunk, and we update
   // its data using the outer/inner rings.
-  DBUG_ASSERT(get_geotype() != Geometry::wkb_polygon);
+  assert(get_geotype() != Geometry::wkb_polygon);
   set_bg_adapter(true);
   if (m_geo_vect == NULL || m_geo_vect->empty())
     return 0;
@@ -4827,17 +4834,17 @@ size_t Gis_wkb_vector<T>::current_size() const
 template <typename T>
 size_t Gis_wkb_vector<T>::get_nbytes_free() const
 {
-  DBUG_ASSERT((this->get_ownmem() && m_ptr) || (!get_ownmem() && !m_ptr));
+  assert((this->get_ownmem() && m_ptr) || (!get_ownmem() && !m_ptr));
 
   size_t cap= current_size();
   if (cap == 0)
   {
-    DBUG_ASSERT(m_ptr == NULL);
+    assert(m_ptr == NULL);
     return 0;
   }
 
   const char *p= NULL, *ptr= get_cptr();
-  DBUG_ASSERT(ptr != NULL);
+  assert(ptr != NULL);
 
   /*
     There will always be remaining free space because in push_back, when
@@ -4855,16 +4862,16 @@ void Gis_wkb_vector<T>::push_back(const T &val)
 {
   Geometry::wkbType geotype= get_geotype();
 
-  DBUG_ASSERT(geotype != Geometry::wkb_polygon &&
-              ((m_ptr && get_ownmem()) || (!m_ptr && !get_ownmem())));
+  assert(geotype != Geometry::wkb_polygon &&
+         ((m_ptr && get_ownmem()) || (!m_ptr && !get_ownmem())));
 
   // Only three possible types of geometries for val, thus no need to
   // do val.reassemble().
-  DBUG_ASSERT(val.get_geotype() == wkb_point ||
-              val.get_geotype() == wkb_polygon ||
-              val.get_geotype() == wkb_linestring);
+  assert(val.get_geotype() == wkb_point ||
+         val.get_geotype() == wkb_polygon ||
+         val.get_geotype() == wkb_linestring);
 
-  DBUG_ASSERT(val.get_ptr() != NULL);
+  assert(val.get_ptr() != NULL);
 
   size_t cap= 0, nalloc= 0;
   size_t vallen, needed;
@@ -4945,13 +4952,13 @@ void Gis_wkb_vector<T>::push_back(const T &val)
       geotype == Geometry::wkb_geometrycollection)
   {
     Geometry::wkbType vgt= val.get_geotype();
-    DBUG_ASSERT((geotype == Geometry::wkb_multipoint &&
-                 vgt == Geometry::wkb_point) ||
-                (geotype == Geometry::wkb_multipolygon &&
-                 vgt == Geometry::wkb_polygon) ||
-                (geotype == Geometry::wkb_multilinestring &&
-                 vgt == Geometry::wkb_linestring) ||
-                geotype == Geometry::wkb_geometrycollection);
+    assert((geotype == Geometry::wkb_multipoint &&
+            vgt == Geometry::wkb_point) ||
+           (geotype == Geometry::wkb_multipolygon &&
+            vgt == Geometry::wkb_polygon) ||
+           (geotype == Geometry::wkb_multilinestring &&
+            vgt == Geometry::wkb_linestring) ||
+           geotype == Geometry::wkb_geometrycollection);
 
     val_ptr= write_wkb_header(val_ptr, vgt);
     wkb_header_size= WKB_HEADER_SIZE;
@@ -4981,7 +4988,7 @@ void Gis_wkb_vector<T>::push_back(const T &val)
   if (geotype != Geometry::wkb_polygon_inner_rings)
   {
     int4store(get_ucptr(), uint4korr(get_ucptr()) + 1);
-    DBUG_ASSERT(uint4korr(get_ucptr()) == this->m_geo_vect->size());
+    assert(uint4korr(get_ucptr()) == this->m_geo_vect->size());
   }
 
   if (val.get_geotype() == Geometry::wkb_polygon)
@@ -5013,9 +5020,9 @@ void Gis_wkb_vector<T>::resize(size_t sz)
   // Can resize a topmost geometry or a out of line geometry which has
   // or will have its own memory(i.e. one that's not using others' memory).
   // Points are fixed size, polygon doesn't hold data directly.
-  DBUG_ASSERT(!(m_ptr != NULL && !get_ownmem()) &&
-              geotype != Geometry::wkb_point &&
-              geotype != Geometry::wkb_polygon);
+  assert(!(m_ptr != NULL && !get_ownmem()) &&
+         geotype != Geometry::wkb_point &&
+         geotype != Geometry::wkb_polygon);
   set_bg_adapter(true);
   if (sz == ngeo)
     return;
@@ -5034,15 +5041,15 @@ void Gis_wkb_vector<T>::resize(size_t sz)
     memset((get_cptr() + get_nbytes() - sublen), 0xff, sublen);
     set_nbytes(get_nbytes() - sublen);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     bool rsz_ret= m_geo_vect->resize(sz);
-    DBUG_ASSERT(rsz_ret == false);
+    assert(rsz_ret == false);
 #else
     m_geo_vect->resize(sz);
 #endif
     if (get_geotype() != Geometry::wkb_polygon_inner_rings)
     {
-      DBUG_ASSERT(uint4korr(get_ucptr()) == ngeo);
+      assert(uint4korr(get_ucptr()) == ngeo);
       int4store(get_ucptr(), static_cast<uint32>(sz));
     }
     return;
@@ -5120,10 +5127,10 @@ void Gis_wkb_vector<T>::resize(size_t sz)
       set_nbytes(get_nbytes() + ptsz);
       ptr+= ptsz;
       int4store(get_ucptr(), uint4korr(get_ucptr()) + 1);
-      DBUG_ASSERT(uint4korr(get_ucptr()) == m_geo_vect->size() + 1);
+      assert(uint4korr(get_ucptr()) == m_geo_vect->size() + 1);
     }
     else
-      DBUG_ASSERT(ptr == NULL && ptr2 == NULL);
+      assert(ptr == NULL && ptr2 == NULL);
 
     shallow_push(&tmp);
     if (tmp.get_geotype() == Geometry::wkb_polygon)
diff --git a/sql/spatial.h b/sql/spatial.h
index d996d4715636..57b08476aaf9 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -215,7 +222,7 @@ struct MBR
       same dimension.
     */
     int d= dimension();
-    DBUG_ASSERT(d >= 0 && d <= 2);
+    assert(d >= 0 && d <= 2);
 
     if (d != mbr->dimension() || d == 0 || contains(mbr) || within(mbr))
       return 0;
@@ -487,7 +494,7 @@ class Geometry
     /* Routines to skip non-interesting data */
     void skip_unsafe(size_t nbytes)
     {
-      DBUG_ASSERT(!no_data(nbytes));
+      assert(!no_data(nbytes));
       m_data+= nbytes;
     }
     bool skip(size_t nbytes)
@@ -541,7 +548,7 @@ class Geometry
     /* Routines to scan coordinate information */
     void scan_xy_unsafe(point_xy *p)
     {
-      DBUG_ASSERT(!no_data(POINT_DATA_SIZE));
+      assert(!no_data(POINT_DATA_SIZE));
       get_float8(&p->x);
       m_data+= SIZEOF_STORED_DOUBLE;
       get_float8(&p->y);
@@ -621,7 +628,7 @@ class Geometry
   }
   virtual uint32 feature_dimension() const
   {
-    DBUG_ASSERT(false);
+    assert(false);
     return 0;
   }
 
@@ -737,9 +744,9 @@ class Geometry
 
   void set_components_no_overlapped(bool b)
   {
-    DBUG_ASSERT(get_type() == wkb_multilinestring ||
-                get_type() == wkb_multipolygon ||
-                get_type() == wkb_geometrycollection);
+    assert(get_type() == wkb_multilinestring ||
+           get_type() == wkb_multipolygon ||
+           get_type() == wkb_geometrycollection);
     if (b)
       m_flags.props|= MULTIPOLYGON_NO_OVERLAPPED_COMPS;
     else
@@ -748,7 +755,7 @@ class Geometry
 
   void set_props(uint16 flag)
   {
-    DBUG_ASSERT(0xfff >= flag);
+    assert(0xfff >= flag);
     m_flags.props |= flag;
   }
 
@@ -812,6 +819,16 @@ class Geometry
   */
   class Flags_t
   {
+    void initialize_bits_to_zero()
+    {
+      bo = 0;
+      dim = 0;
+      nomem = 0;
+      geotype = 0;
+      nbytes = 0;
+      props = 0;
+      zm = 0;
+    }
   public:
     Flags_t(const Flags_t &o)
     {
@@ -822,7 +839,7 @@ class Geometry
     Flags_t()
     {
       compile_time_assert(sizeof(*this) == sizeof(uint64));
-      memset(this, 0, sizeof(*this));
+      initialize_bits_to_zero();
       bo= wkb_ndr;
       dim= GEOM_DIM - 1;
       nomem= 1;
@@ -831,7 +848,7 @@ class Geometry
     Flags_t(wkbType type, size_t len)
     {
       compile_time_assert(sizeof(*this) == sizeof(uint64));
-      memset(this, 0, sizeof(*this));
+      initialize_bits_to_zero();
       geotype= type;
       nbytes= len;
       bo= wkb_ndr;
@@ -839,14 +856,6 @@ class Geometry
       nomem= 1;
     }
 
-    Flags_t &operator=(const Flags_t &rhs)
-    {
-      compile_time_assert(sizeof(*this) == sizeof(uint64));
-      memcpy(this, &rhs, sizeof(rhs));
-      return *this;
-    }
-
-
     uint64 bo:1;
     uint64 dim:2;
     uint64 nomem:1;
@@ -910,14 +919,14 @@ class Geometry
 
   void set_byte_order(Geometry::wkbByteOrder bo)
   {
-    DBUG_ASSERT(bo == Geometry::wkb_ndr);
+    assert(bo == Geometry::wkb_ndr);
     m_flags.bo= static_cast<char>(bo);
   }
 
   void set_dimension(char dim)
   {
     // Valid dim is one of [1, 2, 3, 4].
-    DBUG_ASSERT(dim >0 && dim <5);
+    assert(dim >0 && dim <5);
     m_flags.dim= dim - 1;
   }
 
@@ -999,7 +1008,7 @@ class Geometry
 
   Geometry::wkbByteOrder get_byte_order() const
   {
-    DBUG_ASSERT(m_flags.bo == 1);
+    assert(m_flags.bo == 1);
     return Geometry::wkb_ndr;
   }
 
@@ -1132,7 +1141,7 @@ class Geometry
   void clear_wkb_data();
   virtual void shallow_push(const Geometry *)
   {
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
 protected:
@@ -1199,7 +1208,7 @@ inline Geometry::wkbType get_wkb_geotype(const void *p0)
 {
   const char *p= static_cast<const char *>(p0);
   uint32 gt= uint4korr(p);
-  DBUG_ASSERT(Geometry::is_valid_geotype(gt));
+  assert(Geometry::is_valid_geotype(gt));
   return static_cast<Geometry::wkbType>(gt);
 }
 
@@ -1325,9 +1334,9 @@ class Gis_point: public Geometry
     :Geometry(ptr, nbytes, flags, srid)
   {
     set_geotype(wkb_point);
-    DBUG_ASSERT((ptr != NULL &&
-                 get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-                (ptr == NULL && get_nbytes() == 0));
+    assert((ptr != NULL &&
+            get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+           (ptr == NULL && get_nbytes() == 0));
     set_ownmem(false);
     set_bg_adapter(true);
   }
@@ -1349,10 +1358,10 @@ class Gis_point: public Geometry
   template <std::size_t K>
   double get() const
   {
-    DBUG_ASSERT(K < static_cast<size_t>(get_dimension()) &&
-                ((m_ptr != NULL &&
-                  get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-                 (m_ptr == NULL && get_nbytes() == 0)));
+    assert(K < static_cast<size_t>(get_dimension()) &&
+           ((m_ptr != NULL &&
+             get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+            (m_ptr == NULL && get_nbytes() == 0)));
 
     set_bg_adapter(true);
     const char *p= static_cast<char *>(m_ptr) + K * SIZEOF_STORED_DOUBLE;
@@ -1380,9 +1389,9 @@ class Gis_point: public Geometry
   void set(double const &value)
   {
     /* Allow assigning to others' memory. */
-    DBUG_ASSERT((m_ptr != NULL && K < static_cast<size_t>(get_dimension()) &&
-                 get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
-                (!get_ownmem() && get_nbytes() == 0 && m_ptr == NULL));
+    assert((m_ptr != NULL && K < static_cast<size_t>(get_dimension()) &&
+            get_nbytes() == SIZEOF_STORED_DOUBLE * GEOM_DIM) ||
+           (!get_ownmem() && get_nbytes() == 0 && m_ptr == NULL));
     set_bg_adapter(true);
     if (m_ptr == NULL)
     {
@@ -1531,7 +1540,7 @@ class Gis_wkb_vector_const_iterator
   /// @return True if this iterator equals to itr; False otherwise.
   bool operator==(const self &itr) const
   {
-    DBUG_ASSERT(m_owner == itr.m_owner);
+    assert(m_owner == itr.m_owner);
     return m_curidx == itr.m_curidx;
   }
 
@@ -1551,7 +1560,7 @@ class Gis_wkb_vector_const_iterator
   /// @return True if this iterator is less than itr.
   bool operator < (const self &itr) const
   {
-    DBUG_ASSERT(m_owner == itr.m_owner);
+    assert(m_owner == itr.m_owner);
     return m_curidx < itr.m_curidx;
   }
 
@@ -1580,7 +1589,7 @@ class Gis_wkb_vector_const_iterator
   /// @return True if this iterator is greater than itr.
   bool operator > (const self &itr) const
   {
-    DBUG_ASSERT(m_owner == itr.m_owner);
+    assert(m_owner == itr.m_owner);
     return m_curidx > itr.m_curidx;
   }
   //@} // vctitr_cmp
@@ -1733,7 +1742,7 @@ class Gis_wkb_vector_const_iterator
   /// @return The index difference.
   difference_type operator-(const self &itr) const
   {
-    DBUG_ASSERT(m_owner == itr.m_owner);
+    assert(m_owner == itr.m_owner);
     return (m_curidx - itr.m_curidx);
   }
 
@@ -1752,9 +1761,9 @@ class Gis_wkb_vector_const_iterator
   /// @return The reference to the element this iterator points to.
   reference operator*() const
   {
-    DBUG_ASSERT(this->m_owner != NULL && this->m_curidx >= 0 &&
-                this->m_curidx <
-                static_cast<index_type>(this->m_owner->size()));
+    assert(this->m_owner != NULL && this->m_curidx >= 0 &&
+           this->m_curidx <
+           static_cast<index_type>(this->m_owner->size()));
     return (*m_owner)[m_curidx];
   }
 
@@ -1767,9 +1776,9 @@ class Gis_wkb_vector_const_iterator
   /// @return The address of the referenced object.
   pointer operator->() const
   {
-    DBUG_ASSERT(this->m_owner != NULL && this->m_curidx >= 0 &&
-                this->m_curidx <
-                static_cast<index_type>(this->m_owner->size()));
+    assert(this->m_owner != NULL && this->m_curidx >= 0 &&
+           this->m_curidx <
+           static_cast<index_type>(this->m_owner->size()));
     return &(*m_owner)[m_curidx];
   }
 
@@ -1786,8 +1795,8 @@ class Gis_wkb_vector_const_iterator
     self itr= *this;
     move_by(itr, offset, false);
 
-    DBUG_ASSERT(itr.m_owner != NULL && itr.m_curidx >= 0 &&
-                itr.m_curidx < static_cast<index_type>(itr.m_owner->size()));
+    assert(itr.m_owner != NULL && itr.m_curidx >= 0 &&
+           itr.m_curidx < static_cast<index_type>(itr.m_owner->size()));
     return (*m_owner)[itr.m_curidx];
   }
   //@}
@@ -2044,9 +2053,9 @@ class Gis_wkb_vector_iterator :public Gis_wkb_vector_const_iterator<T>
   /// @return The reference to the element this iterator points to.
   reference operator*() const
   {
-    DBUG_ASSERT(this->m_owner != NULL && this->m_curidx >= 0 &&
-                this->m_curidx <
-                static_cast<index_type>(this->m_owner->size()));
+    assert(this->m_owner != NULL && this->m_curidx >= 0 &&
+           this->m_curidx <
+           static_cast<index_type>(this->m_owner->size()));
     return (*this->m_owner)[this->m_curidx];
   }
 
@@ -2059,9 +2068,9 @@ class Gis_wkb_vector_iterator :public Gis_wkb_vector_const_iterator<T>
   /// @return The address of the referenced object.
   pointer operator->() const
   {
-    DBUG_ASSERT(this->m_owner != NULL && this->m_curidx >= 0 &&
-                this->m_curidx <
-                static_cast<index_type>(this->m_owner->size()));
+    assert(this->m_owner != NULL && this->m_curidx >= 0 &&
+           this->m_curidx <
+           static_cast<index_type>(this->m_owner->size()));
     return &(*this->m_owner)[this->m_curidx];
   }
 
@@ -2076,8 +2085,8 @@ class Gis_wkb_vector_iterator :public Gis_wkb_vector_const_iterator<T>
   {
     self itr= *this;
     this->move_by(itr, offset, false);
-    DBUG_ASSERT(itr.m_owner != NULL && itr.m_curidx >= 0 &&
-                itr.m_curidx < static_cast<index_type>(this->m_owner->size()));
+    assert(itr.m_owner != NULL && itr.m_curidx >= 0 &&
+           itr.m_curidx < static_cast<index_type>(this->m_owner->size()));
     return (*this->m_owner)[itr.m_curidx];
   }
   //@} // funcs_val
@@ -2259,7 +2268,7 @@ class Gis_wkb_vector : public Geometry
 
   const_reference operator[](index_type i) const
   {
-    DBUG_ASSERT(!(i < 0 || i >= (index_type)size()));
+    assert(!(i < 0 || i >= (index_type)size()));
     set_bg_adapter(true);
 
     const Geometry *p= &((*m_geo_vect)[i]);
@@ -2269,7 +2278,7 @@ class Gis_wkb_vector : public Geometry
 
   reference operator[](index_type i)
   {
-    DBUG_ASSERT(!(i < 0 || i >= (index_type)size()));
+    assert(!(i < 0 || i >= (index_type)size()));
     set_bg_adapter(true);
 
     Geometry *p= &((*m_geo_vect)[i]);
@@ -2297,7 +2306,7 @@ class Gis_wkb_vector : public Geometry
       exception now. We do so nonetheless for potential mis-use of exceptions
       in futher code.
     */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     try
     {
 #endif
@@ -2305,12 +2314,12 @@ class Gis_wkb_vector : public Geometry
         return;
       if (m_geo_vect != NULL)
         clear_wkb_data();
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     }
     catch (...)
     {
       // Should never throw exceptions in destructor.
-      DBUG_ASSERT(false);
+      assert(false);
     }
 #endif
   }
@@ -2455,7 +2464,7 @@ class Gis_polygon_ring : public Gis_wkb_vector<Gis_point>
 // For internal use only, only convert types, don't create rings.
 inline Gis_polygon_ring *outer_ring(const Geometry *g)
 {
-  DBUG_ASSERT(g->get_geotype() == Geometry::wkb_polygon);
+  assert(g->get_geotype() == Geometry::wkb_polygon);
   Gis_polygon_ring *out= static_cast<Gis_polygon_ring *>(g->get_ptr());
 
   return out;
@@ -2484,7 +2493,7 @@ class Gis_polygon: public Geometry
 
   ring_type &outer() const
   {
-    DBUG_ASSERT(!polygon_is_wkb_form());
+    assert(!polygon_is_wkb_form());
     set_bg_adapter(true);
     // Create outer ring if none, although read only, calller may just want
     // to traverse the outer ring if any.
@@ -2496,7 +2505,7 @@ class Gis_polygon: public Geometry
 
   inner_container_type &inners() const
   {
-    DBUG_ASSERT(!polygon_is_wkb_form());
+    assert(!polygon_is_wkb_form());
     set_bg_adapter(true);
     // Create inner rings if none, although read only, calller may just want
     // to traverse the inner rings if any.
@@ -2718,7 +2727,7 @@ class Gis_geometry_collection: public Geometry
   bool dimension(uint32 *dim, wkb_parser *wkb) const;
   uint32 feature_dimension() const
   {
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
   const Class_info *get_class_info() const;
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 3fb3ee24b525..41ac57125b8a 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -158,7 +165,7 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
     goto end;					// No data file
 
   /* A MERGE table must not come here. */
-  DBUG_ASSERT(table->file->ht->db_type != DB_TYPE_MRG_MYISAM);
+  assert(table->file->ht->db_type != DB_TYPE_MRG_MYISAM);
 
   // Name of data file
   strxmov(from, table->s->normalized_path.str, ext[1], NullS);
@@ -669,7 +676,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
           require upgrade. So we don't need to pre-open them before calling
           mysql_recreate_table().
         */
-        DBUG_ASSERT(! table->table->s->tmp_table);
+        assert(! table->table->s->tmp_table);
 
         trans_rollback_stmt(thd);
         trans_rollback(thd);
@@ -906,7 +913,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
       protocol->store(operator_name, system_charset_info);
       if (result_code) // either mysql_recreate_table or analyze failed
       {
-        DBUG_ASSERT(thd->is_error() || thd->killed);
+        assert(thd->is_error() || thd->killed);
         if (thd->is_error())
         {
           const char *err_msg= thd->get_stmt_da()->message_text();
@@ -1339,7 +1346,7 @@ bool Sql_cmd_alter_instance::execute(THD *thd)
       alter_instance= new Rotate_innodb_master_key(thd);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       my_error(ER_NOT_SUPPORTED_YET, MYF(0), "ALTER INSTANCE");
       DBUG_RETURN(true);
   }
diff --git a/sql/sql_admin.h b/sql/sql_admin.h
index 62f2df82f3b4..0715fcadad75 100644
--- a/sql/sql_admin.h
+++ b/sql/sql_admin.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h
index 629dfe104733..78de5674560c 100644
--- a/sql/sql_alloc.h
+++ b/sql/sql_alloc.h
@@ -1,15 +1,27 @@
 #ifndef SQL_ALLOC_INCLUDED
 #define SQL_ALLOC_INCLUDED
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -37,15 +49,14 @@ class Sql_alloc
   { return alloc_root(mem_root, size); }
   static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
   { return alloc_root(mem_root, size); }
-  static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
+  static void operator delete(void *ptr, size_t size)
+  { if (ptr != NULL) TRASH(ptr, size); }
   static void operator delete(void *ptr, MEM_ROOT *mem_root)
   { /* never called */ }
   static void operator delete[](void *ptr, MEM_ROOT *mem_root)
   { /* never called */ }
-  static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
-
-  inline Sql_alloc() {}
-  inline ~Sql_alloc() {}
+  static void operator delete[](void *ptr, size_t size)
+  { if (ptr != NULL) TRASH(ptr, size); }
 };
 
 #endif // SQL_ALLOC_INCLUDED
diff --git a/sql/sql_alloc_error_handler.cc b/sql/sql_alloc_error_handler.cc
index f819a2f17f5e..81271cf792b0 100644
--- a/sql/sql_alloc_error_handler.cc
+++ b/sql/sql_alloc_error_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc
index bab836e72559..20c1b123b59c 100644
--- a/sql/sql_alter.cc
+++ b/sql/sql_alter.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,7 @@
 #include "sql_base.h"                        // open_temporary_tables
 #include "log.h"
 
+bool has_external_data_or_index_dir(partition_info &pi);
 
 Alter_info::Alter_info(const Alter_info &rhs, MEM_ROOT *mem_root)
   :drop_list(rhs.drop_list, mem_root),
@@ -91,7 +99,7 @@ Alter_table_ctx::Alter_table_ctx()
     tables_opened(0),
     db(NULL), table_name(NULL), alias(NULL),
     new_db(NULL), new_name(NULL), new_alias(NULL)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     , tmp_table(false)
 #endif
 {
@@ -105,7 +113,7 @@ Alter_table_ctx::Alter_table_ctx(THD *thd, TABLE_LIST *table_list,
   : datetime_field(NULL), error_if_not_empty(false),
     tables_opened(tables_opened_arg),
     new_db(new_db_arg), new_name(new_name_arg)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     , tmp_table(false)
 #endif
 {
@@ -182,7 +190,7 @@ Alter_table_ctx::Alter_table_ctx(THD *thd, TABLE_LIST *table_list,
       this case. This fact is enforced with assert.
     */
     build_tmptable_filename(thd, tmp_path, sizeof(tmp_path));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     tmp_table= true;
 #endif
   }
@@ -213,6 +221,14 @@ bool Sql_cmd_alter_table::execute(THD *thd)
 
   if (thd->is_fatal_error) /* out of memory creating a copy of alter_info */
     DBUG_RETURN(TRUE);
+
+  {
+    partition_info *part_info= thd->lex->part_info;
+    if (part_info != NULL && has_external_data_or_index_dir(*part_info) &&
+        check_access(thd, FILE_ACL, any_db, NULL, NULL, FALSE, FALSE))
+
+      DBUG_RETURN(TRUE);
+  }
   /*
     We also require DROP priv for ALTER TABLE ... DROP PARTITION, as well
     as for RENAME TO, as being done by SQLCOM_RENAME_TABLE
@@ -222,9 +238,9 @@ bool Sql_cmd_alter_table::execute(THD *thd)
     priv_needed|= DROP_ACL;
 
   /* Must be set in the parser */
-  DBUG_ASSERT(select_lex->db);
-  DBUG_ASSERT(!(alter_info.flags & Alter_info::ALTER_EXCHANGE_PARTITION));
-  DBUG_ASSERT(!(alter_info.flags & Alter_info::ALTER_ADMIN_PARTITION));
+  assert(select_lex->db);
+  assert(!(alter_info.flags & Alter_info::ALTER_EXCHANGE_PARTITION));
+  assert(!(alter_info.flags & Alter_info::ALTER_ADMIN_PARTITION));
   if (check_access(thd, priv_needed, first_table->db,
                    &first_table->grant.privilege,
                    &first_table->grant.m_internal,
@@ -285,7 +301,7 @@ bool Sql_cmd_alter_table::execute(THD *thd)
   {
     // Rename of table
     TABLE_LIST tmp_table;
-    memset(&tmp_table, 0, sizeof(tmp_table));
+
     tmp_table.table_name= lex->name.str;
     tmp_table.db= select_lex->db;
     tmp_table.grant.privilege= priv;
@@ -312,8 +328,11 @@ bool Sql_cmd_alter_table::execute(THD *thd)
   if (!thd->lex->is_ignore() && thd->is_strict_mode())
     thd->push_internal_handler(&strict_handler);
 
+  Partition_in_shared_ts_error_handler partition_in_shared_ts_handler;
+  thd->push_internal_handler(&partition_in_shared_ts_handler);
   result= mysql_alter_table(thd, select_lex->db, lex->name.str,
                             &create_info, first_table, &alter_info);
+  thd->pop_internal_handler();
 
   if (!thd->lex->is_ignore() && thd->is_strict_mode())
     thd->pop_internal_handler();
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
index 146ed7397926..8378fee2451a 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -39,7 +46,7 @@ class Alter_drop :public Sql_alloc {
   Alter_drop(enum drop_type par_type,const char *par_name)
     :name(par_name), type(par_type)
   {
-    DBUG_ASSERT(par_name != NULL);
+    assert(par_name != NULL);
   }
   /**
     Used to make a clone of this object for ALTER/CREATE TABLE
@@ -388,7 +395,7 @@ class Alter_table_ctx
   */
   const char *get_new_filename() const
   {
-    DBUG_ASSERT(!tmp_table);
+    assert(!tmp_table);
     return new_filename;
   }
 
@@ -397,7 +404,7 @@ class Alter_table_ctx
   */
   const char *get_path() const
   {
-    DBUG_ASSERT(!tmp_table);
+    assert(!tmp_table);
     return path;
   }
 
@@ -406,7 +413,7 @@ class Alter_table_ctx
   */
   const char *get_new_path() const
   {
-    DBUG_ASSERT(!tmp_table);
+    assert(!tmp_table);
     return new_path;
   }
 
@@ -439,7 +446,7 @@ class Alter_table_ctx
   char new_path[FN_REFLEN + 1];
   char tmp_path[FN_REFLEN + 1];
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /** Indicates that we are altering temporary table. Used only in asserts. */
   bool tmp_table;
 #endif
diff --git a/sql/sql_alter_instance.cc b/sql/sql_alter_instance.cc
index afbd9a0d1e03..d1c4601952c2 100644
--- a/sql/sql_alter_instance.cc
+++ b/sql/sql_alter_instance.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -86,7 +93,7 @@ Rotate_innodb_master_key::execute()
   if (hton->rotate_encryption_master_key())
   {
     /* SE should have raised error */
-    DBUG_ASSERT(m_thd->get_stmt_da()->is_error());
+    assert(m_thd->get_stmt_da()->is_error());
     return true;
   }
 
diff --git a/sql/sql_alter_instance.h b/sql/sql_alter_instance.h
index 7eccee0bfd2c..02bdb5ce7b97 100644
--- a/sql/sql_alter_instance.h
+++ b/sql/sql_alter_instance.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 875bfec9e1af..97fac859cd4d 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -74,7 +81,7 @@ Query_result_analyse::init(List<Item> &field_list)
 {
   DBUG_ENTER("proc_analyse_init");
 
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SELECT);
+  assert(thd->lex->sql_command == SQLCOM_SELECT);
 
   if (!(f_info=
         (field_info**)sql_alloc(sizeof(field_info*)*field_list.elements)))
@@ -238,8 +245,9 @@ bool get_ev_num_info(EV_NUM_INFO *ev_info, NUM_INFO *info, const char *num)
 } // get_ev_num_info
 
 
-void free_string(String *s)
+void free_string(void *s_void, TREE_FREE, const void*)
 {
+  String *s= static_cast<String*>(s_void);
   s->mem_free();
 }
 
@@ -318,7 +326,7 @@ void field_str::add()
       }
       else
       {
-	memset(&s, 0, sizeof(s));  // Let tree handle free of this
+        ::new (&s) String; // Let tree handle free of this
 	if ((treemem += length) > pc->max_treemem)
 	{
 	  room_in_tree = 0;	 // Remove tree, too big tree
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h
index 804af88e86be..e8ca2db21cd4 100644
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -1,16 +1,23 @@
 #ifndef SQL_ANALYSE_INCLUDED
 #define SQL_ANALYSE_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -67,7 +74,7 @@ int compare_ulonglong(const ulonglong *s, const ulonglong *t);
 int compare_ulonglong2(void* cmp_arg MY_ATTRIBUTE((unused)),
 		       const ulonglong *s, const ulonglong *t);
 int compare_decimal2(int* len, const char *s, const char *t);
-void free_string(String*);
+void free_string(void*, TREE_FREE, const void*);
 class Query_result_analyse;
 
 class field_info :public Sql_alloc
@@ -121,7 +128,7 @@ class field_str :public field_info
     must_be_blob(0), was_zero_fill(0),
     was_maybe_zerofill(0), can_be_still_num(1)
     { init_tree(&tree, 0, 0, sizeof(String), (qsort_cmp2) sortcmp2,
-		0, (tree_element_free) free_string, NULL); };
+		0, free_string, NULL); };
 
   void	 add();
   void	 get_opt_type(String*, ha_rows);
diff --git a/sql/sql_array.h b/sql/sql_array.h
index a5f7f82ec377..9c3d45e8d664 100644
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@@ -1,16 +1,23 @@
 #ifndef SQL_ARRAY_INCLUDED
 #define SQL_ARRAY_INCLUDED
 
-/* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -57,19 +64,19 @@ template <typename Element_type> class Bounds_checked_array
    */
   void resize(size_t new_size)
   {
-    DBUG_ASSERT(new_size <= m_size);
+    assert(new_size <= m_size);
     m_size= new_size;
   }
 
   Element_type &operator[](size_t n)
   {
-    DBUG_ASSERT(n < m_size);
+    assert(n < m_size);
     return m_array[n];
   }
 
   const Element_type &operator[](size_t n) const
   {
-    DBUG_ASSERT(n < m_size);
+    assert(n < m_size);
     return m_array[n];
   }
 
@@ -93,7 +100,7 @@ template <typename Element_type> class Bounds_checked_array
 
   void pop_front()
   {
-    DBUG_ASSERT(m_size > 0);
+    assert(m_size > 0);
     m_array+= 1;
     m_size-= 1;
   }
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
index 325cb9bdb33b..17543895d2b3 100644
--- a/sql/sql_audit.cc
+++ b/sql/sql_audit.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -337,19 +344,27 @@ inline
 void thd_get_audit_query(THD *thd, MYSQL_LEX_CSTRING *query,
                          const struct charset_info_st **charset)
 {
-  if (!thd->rewritten_query.length())
+  /*
+    If we haven't tried to rewrite the query to obfuscate passwords
+    etc. yet, do so now.
+  */
+  if (thd->rewritten_query().length() == 0)
     mysql_rewrite_query(thd);
 
-  if (thd->rewritten_query.length())
-  {
-    query->str= thd->rewritten_query.ptr();
-    query->length= thd->rewritten_query.length();
-    *charset= thd->rewritten_query.charset();
+  /*
+    If there was something to rewrite, use the rewritten query;
+    otherwise, just use the original as submitted by the client.
+  */
+  if (thd->rewritten_query().length() > 0) {
+    query->str= thd->rewritten_query().ptr();
+    query->length= thd->rewritten_query().length();
+    *charset= thd->rewritten_query().charset();
   }
   else
   {
     query->str= thd->query().str;
     query->length= thd->query().length;
+    DBUG_PRINT("print_query", ("%.*s\n", (int)query->length, query->str));
     *charset= thd->charset();
   }
 }
@@ -419,7 +434,7 @@ int mysql_audit_notify(THD *thd, mysql_event_general_subclass_t subclass,
   mysql_event_general event;
   char user_buff[MAX_USER_HOST_SIZE];
 
-  DBUG_ASSERT(thd);
+  assert(thd);
 
   if (mysql_audit_acquire_plugins(thd, MYSQL_AUDIT_GENERAL_CLASS,
                                   static_cast<unsigned long>(subclass)))
@@ -451,14 +466,18 @@ int mysql_audit_notify(THD *thd, mysql_event_general_subclass_t subclass,
   event.general_command.length= msg_len;
 
   if (subclass == MYSQL_AUDIT_GENERAL_ERROR ||
-      subclass == MYSQL_AUDIT_GENERAL_STATUS)
+      subclass == MYSQL_AUDIT_GENERAL_STATUS ||
+      subclass == MYSQL_AUDIT_GENERAL_RESULT)
   {
     Ignore_event_error_handler handler(thd, subclass_name);
 
-    return event_class_dispatch(thd, MYSQL_AUDIT_GENERAL_CLASS, &event);
+    return handler.get_result(event_class_dispatch(thd,
+                                                   MYSQL_AUDIT_GENERAL_CLASS,
+                                                   &event));
   }
 
-  return event_class_dispatch(thd, MYSQL_AUDIT_GENERAL_CLASS, &event);
+  return event_class_dispatch_error(thd, MYSQL_AUDIT_GENERAL_CLASS,
+                                    subclass_name, &event);
 }
 
 int mysql_audit_notify(THD *thd, mysql_event_connection_subclass_t subclass,
@@ -678,6 +697,7 @@ int mysql_audit_table_access_notify(THD *thd, TABLE_LIST *table)
       break;
     case SQLCOM_SELECT:
     case SQLCOM_HA_READ:
+    case SQLCOM_ANALYZE:
       set_table_access_subclass(&subclass, &subclass_name,
                                 AUDIT_EVENT(MYSQL_AUDIT_TABLE_ACCESS_READ));
       break;
@@ -1051,16 +1071,25 @@ static my_bool acquire_plugins(THD *thd, plugin_ref plugin, void *arg)
     return FALSE;
   }
 
-  /* Copy subscription mask from the plugin into the array. */
-  add_audit_mask(evt->subscribed_mask, data->class_mask);
-
   /* Prevent from adding the same plugin more than one time. */
-  if (thd->audit_class_plugins.exists(plugin))
-    return FALSE;
+  if (!thd->audit_class_plugins.exists(plugin))
+  {
+    /* lock the plugin and add it to the list */
+    plugin= my_plugin_lock(NULL, &plugin);
 
-  /* lock the plugin and add it to the list */
-  plugin= my_plugin_lock(NULL, &plugin);
-  thd->audit_class_plugins.push_back(plugin);
+    /* The plugin could not be acquired. */
+    if (plugin == NULL)
+    {
+      /* Add this plugin mask to non subscribed mask. */
+      add_audit_mask(evt->not_subscribed_mask, data->class_mask);
+      return FALSE;
+    }
+
+    thd->audit_class_plugins.push_back(plugin);
+  }
+
+  /* Copy subscription mask from the plugin into the array. */
+  add_audit_mask(evt->subscribed_mask, data->class_mask);
 
   return FALSE;
 }
@@ -1187,7 +1216,7 @@ void mysql_audit_init_thd(THD *thd)
 void mysql_audit_free_thd(THD *thd)
 {
   mysql_audit_release(thd);
-  DBUG_ASSERT(thd->audit_class_plugins.empty());
+  assert(thd->audit_class_plugins.empty());
 }
 
 #ifdef HAVE_PSI_INTERFACE
@@ -1457,3 +1486,19 @@ bool is_audit_plugin_class_active(THD *thd MY_ATTRIBUTE((unused)),
 {
   return mysql_global_audit_mask[event_class] != 0;
 }
+
+/**
+  @brief Checks presence of active audit plugin
+
+  @retval      TRUE             At least one audit plugin is present
+  @retval      FALSE            No audit plugin is present
+*/
+bool is_global_audit_mask_set()
+{
+  for (int i= MYSQL_AUDIT_GENERAL_CLASS; i < MYSQL_AUDIT_CLASS_MASK_SIZE; i++)
+  {
+    if (mysql_global_audit_mask[i] != 0)
+      return true;
+  }
+  return false;
+}
diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index 86e4bef0dcc7..dbac02dc46c5 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.h
@@ -1,16 +1,23 @@
 #ifndef SQL_AUDIT_INCLUDED
 #define SQL_AUDIT_INCLUDED
 
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,6 +35,7 @@ static const size_t MAX_USER_HOST_SIZE= 512;
 #define AUDIT_EVENT(x) x, #x
 
 bool is_audit_plugin_class_active(THD *thd, unsigned long event_class);
+bool is_global_audit_mask_set();
 
 static inline size_t make_user_name(Security_context *sctx, char *buf)
 {
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 04b022a5c02e..e42eb919f281 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -246,6 +253,28 @@ bool Strict_error_handler::handle_condition(THD *thd,
   return false;
 }
 
+/**
+  Implementation of Partition_in_shared_ts error handler.
+  This internal handler is to make sure that deprecation warning is not
+  displayed again if already displayed once.
+*/
+bool Partition_in_shared_ts_error_handler::handle_condition(
+                                   THD *thd,
+                                   uint sql_errno,
+                                   const char *sqlstate,
+                                   Sql_condition::enum_severity_level *level,
+                                   const char *msg)
+{
+  if (sql_errno == ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT &&
+      strstr(msg, "InnoDB : A table partition in a shared tablespace") != NULL) {
+    if (m_is_already_reported == false) {
+      m_is_already_reported= true;
+      thd->get_stmt_da()->push_warning(thd, sql_errno, sqlstate, *level, msg);
+    }
+    return true;
+  }
+  return false;
+}
 
 /**
   This internal handler is used to trap ER_NO_SUCH_TABLE and
@@ -446,7 +475,7 @@ static size_t create_table_def_key(THD *thd, char *key,
     not longer than NAME_LEN bytes. In practice we play safe to avoid
     buffer overruns.
   */
-  DBUG_ASSERT(strlen(db_name) <= NAME_LEN && strlen(table_name) <= NAME_LEN);
+  assert(strlen(db_name) <= NAME_LEN && strlen(table_name) <= NAME_LEN);
   size_t key_length= strmake(strmake(key, db_name, NAME_LEN) +
                                              1, table_name, NAME_LEN) - key + 1;
 
@@ -487,10 +516,10 @@ size_t get_table_def_key(const TABLE_LIST *table_list, const char **key)
     is properly initialized, so table definition cache can be produced
     from key used by MDL subsystem.
   */
-  DBUG_ASSERT(!strcmp(table_list->get_db_name(),
-                      table_list->mdl_request.key.db_name()) &&
-              !strcmp(table_list->get_table_name(),
-                      table_list->mdl_request.key.name()));
+  assert(!strcmp(table_list->get_db_name(),
+                 table_list->mdl_request.key.db_name()) &&
+         !strcmp(table_list->get_table_name(),
+                 table_list->mdl_request.key.name()));
 
   *key= (const char*)table_list->mdl_request.key.ptr() + 1;
   return table_list->mdl_request.key.length() - 1;
@@ -656,9 +685,9 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list,
     To be able perform any operation on table we should own
     some kind of metadata lock on it.
   */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                 table_list->db, table_list->table_name,
-                                 MDL_SHARED));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      table_list->db, table_list->table_name,
+                                                      MDL_SHARED));
 
   /*
     Read table definition from the cache. If the share is being opened,
@@ -778,10 +807,10 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list,
                       (ulong) share, share->ref_count));
 
   /* If debug, assert that the share is actually present in the cache */
-#ifndef DBUG_OFF
-  DBUG_ASSERT(my_hash_search(&table_def_cache,
-                             reinterpret_cast<uchar*>(const_cast<char*>(key)),
-                             key_length));
+#ifndef NDEBUG
+  assert(my_hash_search(&table_def_cache,
+                        reinterpret_cast<uchar*>(const_cast<char*>(key)),
+                        key_length));
 #endif
   DBUG_RETURN(share);
 
@@ -942,7 +971,7 @@ void release_table_share(TABLE_SHARE *share)
 
   mysql_mutex_assert_owner(&LOCK_open);
 
-  DBUG_ASSERT(share->ref_count);
+  assert(share->ref_count);
   if (!--share->ref_count)
   {
     if (share->has_old_version() || table_def_shutdown_in_progress)
@@ -952,7 +981,7 @@ void release_table_share(TABLE_SHARE *share)
       /* Link share last in used_table_share list */
       DBUG_PRINT("info",("moving share to unused list"));
 
-      DBUG_ASSERT(share->next == 0);
+      assert(share->next == 0);
       share->prev= end_of_unused_share.prev;
       *end_of_unused_share.prev= share;
       end_of_unused_share.prev= &share->next;
@@ -1042,7 +1071,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild)
   TABLE_LIST table_list;
   DBUG_ENTER("list_open_tables");
 
-  memset(&table_list, 0, sizeof(table_list));
   start_list= &open_list;
   open_list=0;
 
@@ -1153,7 +1181,7 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables,
   bool found= TRUE;
   struct timespec abstime;
   DBUG_ENTER("close_cached_tables");
-  DBUG_ASSERT(thd || (!wait_for_refresh && !tables));
+  assert(thd || (!wait_for_refresh && !tables));
 
   table_cache_manager.lock_all_and_tdc();
   if (!tables)
@@ -1354,13 +1382,13 @@ static void mark_temp_tables_as_free_for_reuse(THD *thd)
 
 void mark_tmp_table_for_reuse(TABLE *table)
 {
-  DBUG_ASSERT(table->s->tmp_table);
+  assert(table->s->tmp_table);
 
   table->query_id= 0;
   table->file->ha_reset();
 
   /* Detach temporary MERGE children from temporary parent. */
-  DBUG_ASSERT(table->file);
+  assert(table->file);
   table->file->extra(HA_EXTRA_DETACH_CHILDREN);
 
   /*
@@ -1414,8 +1442,8 @@ static void mark_used_tables_as_free_for_reuse(THD *thd, TABLE *table)
 {
   for (; table ; table= table->next)
   {
-    DBUG_ASSERT(table->pos_in_locked_tables == NULL ||
-                table->pos_in_locked_tables->table == table);
+    assert(table->pos_in_locked_tables == NULL ||
+           table->pos_in_locked_tables->table == table);
     if (table->query_id == thd->query_id)
     {
       table->query_id= 0;
@@ -1529,10 +1557,7 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
 
 /* Check if the table belongs to the P_S, excluding setup and threads tables. */
 #define BELONGS_TO_P_S_UNDER_LTM(thd, tl) \
-   (UNDER_LTM(thd) && \
-    (!strcmp("performance_schema", tl->db) && \
-     strcmp(tl->table_name, "threads") && \
-     strstr(tl->table_name, "setup_") == NULL))
+   (UNDER_LTM(thd) && belongs_to_p_s(tl))
 
 /*
   Close all tables used by the current substatement, or all tables
@@ -1570,9 +1595,9 @@ void close_thread_tables(THD *thd)
     DEBUG_SYNC(thd, "before_close_thread_tables");
 #endif
 
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
-              thd->in_sub_stmt ||
-              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
+         thd->in_sub_stmt ||
+         (thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
 
   /* Detach MERGE children after every statement. Even under LOCK TABLES. */
   for (table= thd->open_tables; table; table= table->next)
@@ -1583,7 +1608,7 @@ void close_thread_tables(THD *thd)
     if (thd->locked_tables_mode <= LTM_LOCK_TABLES ||
         table->query_id == thd->query_id)
     {
-      DBUG_ASSERT(table->file);
+      assert(table->file);
       table->file->extra(HA_EXTRA_DETACH_CHILDREN);
       table->cleanup_gc_items();
     }
@@ -1731,16 +1756,16 @@ void close_thread_table(THD *thd, TABLE **table_ptr)
 {
   TABLE *table= *table_ptr;
   DBUG_ENTER("close_thread_table");
-  DBUG_ASSERT(table->key_read == 0);
-  DBUG_ASSERT(!table->file || table->file->inited == handler::NONE);
+  assert(table->key_read == 0);
+  assert(!table->file || table->file->inited == handler::NONE);
   mysql_mutex_assert_not_owner(&LOCK_open);
   /*
     The metadata lock must be released after giving back
     the table to the table cache.
   */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                 table->s->db.str, table->s->table_name.str,
-                                 MDL_SHARED));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      table->s->db.str, table->s->table_name.str,
+                                                      MDL_SHARED));
   table->mdl_ticket= NULL;
   table->pos_in_table_list= NULL;
 
@@ -1814,8 +1839,8 @@ bool close_temporary_tables(THD *thd)
   if (!thd->temporary_tables)
     DBUG_RETURN(FALSE);
 
-  DBUG_ASSERT(!thd->slave_thread ||
-              thd->system_thread != SYSTEM_THREAD_SLAVE_WORKER);
+  assert(!thd->slave_thread ||
+         thd->system_thread != SYSTEM_THREAD_SLAVE_WORKER);
 
   /*
     Ensure we don't have open HANDLERs for tables we are about to close.
@@ -1924,7 +1949,7 @@ bool close_temporary_tables(THD *thd)
   /* scan sorted tmps to generate sequence of DROP */
   for (table= thd->temporary_tables; table; table= next)
   {
-    if (is_user_table(table))
+    if (is_user_table(table) && table->should_binlog_drop_if_temp())
     {
       bool save_thread_specific_used= thd->thread_specific_used;
       my_thread_id save_pseudo_thread_id= thd->variables.pseudo_thread_id;
@@ -1945,27 +1970,28 @@ bool close_temporary_tables(THD *thd)
            table= next)
       {
         /* Separate transactional from non-transactional temp tables */
-        if (table->s->tmp_table == TRANSACTIONAL_TMP_TABLE)
-        {
-          found_trans_table= true;
-          /*
-            We are going to add ` around the table names and possible more
-            due to special characters
-          */
-          append_identifier(thd, &s_query_trans, table->s->table_name.str,
-                            strlen(table->s->table_name.str));
-          s_query_trans.append(',');
-        }
-        else if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
-        {
-          found_non_trans_table= true;
-          /*
-            We are going to add ` around the table names and possible more
-            due to special characters
-          */
-          append_identifier(thd, &s_query_non_trans, table->s->table_name.str,
-                            strlen(table->s->table_name.str));
-          s_query_non_trans.append(',');
+        if (table->should_binlog_drop_if_temp()) {
+          if (table->s->tmp_table == TRANSACTIONAL_TMP_TABLE) {
+            found_trans_table= true;
+            /*
+              We are going to add ` around the table names and possible more
+              due to special characters
+            */
+            append_identifier(thd, &s_query_trans, table->s->table_name.str,
+                              strlen(table->s->table_name.str));
+            s_query_trans.append(',');
+          }
+          else if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
+          {
+            found_non_trans_table= true;
+            /*
+              We are going to add ` around the table names and possible more
+              due to special characters
+            */
+            append_identifier(thd, &s_query_non_trans, table->s->table_name.str,
+                              strlen(table->s->table_name.str));
+            s_query_non_trans.append(',');
+          }
         }
 
         next= table->next;
@@ -2048,6 +2074,7 @@ bool close_temporary_tables(THD *thd)
     else
     {
       next= table->next;
+      mysql_lock_remove(thd, thd->lock, table);
       close_temporary(table, 1, 1);
       slave_closed_temp_tables++;
     }
@@ -2144,7 +2171,7 @@ static TABLE_LIST* find_dup_table(THD *thd, const TABLE_LIST *table,
   DBUG_ENTER("find_dup_table");
   DBUG_PRINT("enter", ("table alias: %s", table->alias));
 
-  DBUG_ASSERT(table == ((TABLE_LIST *)table)->updatable_base_table());
+  assert(table == ((TABLE_LIST *)table)->updatable_base_table());
   /*
     If this function called for CREATE command that we have not opened table
     (table->table equal to 0) and right names is in current TABLE_LIST
@@ -2153,7 +2180,7 @@ static TABLE_LIST* find_dup_table(THD *thd, const TABLE_LIST *table,
   if (table->table)
   {
     /* All MyISAMMRG children are plain MyISAM tables. */
-    DBUG_ASSERT(table->table->file->ht->db_type != DB_TYPE_MRG_MYISAM);
+    assert(table->table->file->ht->db_type != DB_TYPE_MRG_MYISAM);
 
     /* temporary table is always unique */
     if (table->table->s->tmp_table != NO_TMP_TABLE)
@@ -2232,7 +2259,7 @@ static TABLE_LIST* find_dup_table(THD *thd, const TABLE_LIST *table,
 TABLE_LIST *unique_table(THD *thd, const TABLE_LIST *table,
                          TABLE_LIST *table_list, bool check_alias)
 {
-  DBUG_ASSERT(table == ((TABLE_LIST *)table)->updatable_base_table());
+  assert(table == ((TABLE_LIST *)table)->updatable_base_table());
 
   TABLE_LIST *dup;
   if (table->table && table->table->file->ht->db_type == DB_TYPE_MRG_MYISAM)
@@ -2463,7 +2490,7 @@ void close_temporary_table(THD *thd, TABLE *table,
   else
   {
     /* removing the item from the list */
-    DBUG_ASSERT(table == thd->temporary_tables);
+    assert(table == thd->temporary_tables);
     /*
       slave must reset its temporary list pointer to zero to exclude
       passing non-zero value to end_slave via rli->save_temporary_tables
@@ -2477,7 +2504,7 @@ void close_temporary_table(THD *thd, TABLE *table,
   if (thd->slave_thread)
   {
     /* natural invariant of temporary_tables */
-    DBUG_ASSERT(thd->rli_slave->get_c_rli()->channel_open_temp_tables.atomic_get() || !thd->temporary_tables);
+    assert(thd->rli_slave->get_c_rli()->channel_open_temp_tables.atomic_get() || !thd->temporary_tables);
     slave_open_temp_tables.atomic_add(-1);
     thd->rli_slave->get_c_rli()->channel_open_temp_tables.atomic_add(-1);
   }
@@ -2606,7 +2633,7 @@ void drop_open_table(THD *thd, TABLE *table, const char *db_name,
     close_temporary_table(thd, table, 1, 1);
   else
   {
-    DBUG_ASSERT(table == thd->open_tables);
+    assert(table == thd->open_tables);
 
     handlerton *table_type= table->s->db_type();
 
@@ -2649,9 +2676,9 @@ bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool *exists)
 
   *exists= TRUE;
 
-  DBUG_ASSERT(thd->mdl_context.
-              owns_equal_or_stronger_lock(MDL_key::TABLE, table->db,
-                                          table->table_name, MDL_SHARED));
+  assert(thd->mdl_context.
+         owns_equal_or_stronger_lock(MDL_key::TABLE, table->db,
+                                     table->table_name, MDL_SHARED));
 
   mysql_mutex_lock(&LOCK_open);
   share= get_cached_table_share(thd, table->db, table->table_name);
@@ -2789,8 +2816,8 @@ open_table_get_mdl_lock(THD *thd, Open_table_context *ot_ctx,
 
       These two flags are mutually exclusive.
     */
-    DBUG_ASSERT(!(flags & MYSQL_OPEN_FORCE_SHARED_MDL) ||
-                !(flags & MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL));
+    assert(!(flags & MYSQL_OPEN_FORCE_SHARED_MDL) ||
+           !(flags & MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL));
 
     MDL_REQUEST_INIT_BY_KEY(&new_mdl_request,
                             &mdl_request->key,
@@ -2931,6 +2958,35 @@ tdc_wait_for_old_version(THD *thd, const char *db, const char *table_name,
   return res;
 }
 
+/**
+  Add a dummy LEX object for a view.
+
+  @param  thd         Thread context
+  @param  table_list  The list of tables in the view
+
+  @retval  true   error occurred
+  @retval  false  view place holder successfully added
+*/
+
+bool add_view_place_holder(THD *thd, TABLE_LIST *table_list) {
+  Prepared_stmt_arena_holder ps_arena_holder(thd);
+  LEX *lex_obj = new (thd->mem_root) st_lex_local;
+  if (lex_obj == NULL)
+    return true;
+  table_list->set_view_query(lex_obj);
+  assert(table_list->is_view());
+
+  // Create empty list of view_tables.
+  table_list->view_tables = new (thd->mem_root) List<TABLE_LIST>;
+  if (table_list->view_tables == NULL)
+    return true;
+
+  table_list->view_db.str= table_list->db;
+  table_list->view_db.length= table_list->db_length;
+  table_list->view_name.str= table_list->table_name;
+  table_list->view_name.length= table_list->table_name_length;
+  return false;
+}
 
 /**
   Open a base table.
@@ -2985,7 +3041,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
 
     open_temporary_table() must be used to open temporary tables.
   */
-  DBUG_ASSERT(!table_list->table);
+  assert(!table_list->table);
 
   /* an open table operation needs a lot of the stack space */
   if (check_stack_overrun(thd, STACK_MIN_SIZE_FOR_OPEN, (uchar *)&alias))
@@ -3021,6 +3077,14 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
     DBUG_RETURN(true);
   }
 
+  /*
+    P_S table access should be allowed while in LTM, the ignore flush flag is
+    set to avoid the infinite reopening of the table due to version number
+    mismatch.
+  */
+  if (BELONGS_TO_P_S_UNDER_LTM(thd, table_list))
+    flags|= MYSQL_OPEN_IGNORE_FLUSH;
+
   key_length= get_table_def_key(table_list, &key);
 
   /*
@@ -3124,10 +3188,22 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
           DBUG_RETURN(true);
         }
 
+        if (table_list->open_strategy == TABLE_LIST::OPEN_FOR_CREATE) {
+          /*
+            In the case of a CREATE, add a dummy LEX object to
+            indicate the presence of a view amd skip processing the
+            existing view.
+          */
+          if (add_view_place_holder(thd, table_list))
+            DBUG_RETURN(true);
+          else
+            DBUG_RETURN(false);
+        }
+
         if (!tdc_open_view(thd, table_list, alias, key, key_length,
                            CHECK_METADATA_VERSION))
         {
-          DBUG_ASSERT(table_list->is_view());
+          assert(table_list->is_view());
           DBUG_RETURN(FALSE); // VIEW
         }
       }
@@ -3202,6 +3278,12 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
       bool result= thd->mdl_context.acquire_lock(&protection_request,
                                                  ot_ctx->get_timeout());
 
+      /*
+        Unlike in other places where we acquire protection against global read
+        lock, the read_only state is not checked here since we check its state
+        later in mysql_lock_tables()
+      */
+
       thd->mdl_context.set_force_dml_deadlock_weight(false);
       thd->pop_internal_handler();
 
@@ -3304,7 +3386,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
           Table cache should not contain any unused TABLE objects with
           old versions.
         */
-        DBUG_ASSERT(!share->has_old_version());
+        assert(!share->has_old_version());
 
         /*
           Still some of already opened might become outdated (e.g. due to
@@ -3325,9 +3407,9 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
       tc->unlock();
 
       /* Call rebind_psi outside of the critical section. */
-      DBUG_ASSERT(table->file != NULL);
+      assert(table->file != NULL);
       table->file->rebind_psi();
-
+      table->file->extra(HA_EXTRA_RESET_STATE);
       thd->status_var.table_open_cache_hits++;
       goto table_found;
     }
@@ -3409,20 +3491,53 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
       goto err_unlock;
     }
 
-    /* Open view */
-    bool view_open_result= open_and_read_view(thd, share, table_list);
+    /*
+      Read definition of the existing view, unless the open is for a table
+      to be created. This scenario will happen only when there exists a view and
+      the current CREATE TABLE request is with the same name.
+    */
+    if (table_list->open_strategy != TABLE_LIST::OPEN_FOR_CREATE)
+    {
+      bool view_open_result= open_and_read_view(thd, share, table_list);
 
-    /* TODO: Don't free this */
-    release_table_share(share);
-    mysql_mutex_unlock(&LOCK_open);
+      /* TODO: Don't free this */
+      release_table_share(share);
+      mysql_mutex_unlock(&LOCK_open);
 
-    if (view_open_result)
-      DBUG_RETURN(true);
+      if (view_open_result)
+        DBUG_RETURN(true);
 
-    if (parse_view_definition(thd, table_list))
-      DBUG_RETURN(true);
+      if (table_list->is_view())
+      {
+        // See comments in tdc_open_view() for explanation.
+        if (!table_list->prelocking_placeholder &&
+            table_list->prepare_security(thd))
+          DBUG_RETURN(true);
+      }
 
-    DBUG_ASSERT(table_list->is_view());
+      if (parse_view_definition(thd, table_list))
+        DBUG_RETURN(true);
+    }
+    else
+    {
+      release_table_share(share);
+      mysql_mutex_unlock(&LOCK_open);
+      /*
+        The LEX object is used by the executor and other parts of the
+        code to detect the presence of a view. We have skipped the
+        call to parse_view_definition(), which creates the LEX
+        object. Create a dummy LEX object as this is OPEN_FOR_CREATE.
+
+        For SP and PS, LEX objects are created at the time of
+        statement prepare and open_table() is called for every execute
+        after that. Skip creation of LEX objects if it is already
+        present.
+      */
+      if (!table_list->is_view() && add_view_place_holder(thd, table_list))
+        DBUG_RETURN(true);
+    }
+
+    assert(table_list->is_view());
 
     DBUG_RETURN(false);
   }
@@ -3584,7 +3699,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
     Check that there is no reference to a condition from an earlier query
     (cf. Bug#58553). 
   */
-  DBUG_ASSERT(table->file->pushed_cond == NULL);
+  assert(table->file->pushed_cond == NULL);
   table_list->set_updatable(); // It is not derived table nor non-updatable VIEW
   table_list->set_insertable();
 
@@ -3728,10 +3843,10 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db,
 bool
 Locked_tables_list::init_locked_tables(THD *thd)
 {
-  DBUG_ASSERT(thd->locked_tables_mode == LTM_NONE);
-  DBUG_ASSERT(m_locked_tables == NULL);
-  DBUG_ASSERT(m_reopen_array == NULL);
-  DBUG_ASSERT(m_locked_tables_count == 0);
+  assert(thd->locked_tables_mode == LTM_NONE);
+  assert(m_locked_tables == NULL);
+  assert(m_reopen_array == NULL);
+  assert(m_locked_tables_count == 0);
 
   for (TABLE *table= thd->open_tables; table;
        table= table->next, m_locked_tables_count++)
@@ -3819,8 +3934,8 @@ Locked_tables_list::unlock_locked_tables(THD *thd)
 {
   if (thd)
   {
-    DBUG_ASSERT(!thd->in_sub_stmt &&
-                !(thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
+    assert(!thd->in_sub_stmt &&
+           !(thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
     /*
       Sic: we must be careful to not close open tables if
       we're not in LOCK TABLES mode: unlock_locked_tables() is
@@ -3848,7 +3963,7 @@ Locked_tables_list::unlock_locked_tables(THD *thd)
         ->clear_trx_state(thd, TX_LOCKED_TABLES);
     }
 
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
     close_thread_tables(thd);
     /*
       We rely on the caller to implicitly commit the
@@ -3903,7 +4018,7 @@ void Locked_tables_list::unlink_from_list(THD *thd,
     table_list must be set and point to pos_in_locked_tables of some
     table.
   */
-  DBUG_ASSERT(table_list->table->pos_in_locked_tables == table_list);
+  assert(table_list->table->pos_in_locked_tables == table_list);
 
   /* Clear the pointer, the table will be returned to the table cache. */
   table_list->table->pos_in_locked_tables= NULL;
@@ -3957,7 +4072,7 @@ unlink_all_closed_tables(THD *thd, MYSQL_LOCK *lock, size_t reopen_count)
         in reopen_tables() always links the opened table
         to the beginning of the open_tables list.
       */
-      DBUG_ASSERT(thd->open_tables == m_reopen_array[reopen_count]);
+      assert(thd->open_tables == m_reopen_array[reopen_count]);
 
       thd->open_tables->pos_in_locked_tables->table= NULL;
 
@@ -4017,7 +4132,7 @@ Locked_tables_list::reopen_tables(THD *thd)
     /* See also the comment on lock type in init_locked_tables(). */
     table_list->table->reginfo.lock_type= table_list->lock_type;
 
-    DBUG_ASSERT(reopen_count < m_locked_tables_count);
+    assert(reopen_count < m_locked_tables_count);
     m_reopen_array[reopen_count++]= table_list->table;
   }
   if (reopen_count)
@@ -4087,7 +4202,7 @@ void assign_new_table_id(TABLE_SHARE *share)
   DBUG_ENTER("assign_new_table_id");
 
   /* Preconditions */
-  DBUG_ASSERT(share != NULL);
+  assert(share != NULL);
   mysql_mutex_assert_owner(&LOCK_open);
 
   DBUG_EXECUTE_IF("dbug_table_map_id_500", last_table_id= 500;);
@@ -4102,7 +4217,7 @@ void assign_new_table_id(TABLE_SHARE *share)
   DBUG_VOID_RETURN;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /* Cause a spurious statement reprepare for debug purposes. */
 static bool inject_reprepare(THD *thd)
 {
@@ -4166,7 +4281,7 @@ check_and_update_table_version(THD *thd,
         previous execution of the prepared statement, and it is
         unacceptable for this SQLCOM. Error has been reported.
       */
-      DBUG_ASSERT(thd->is_error());
+      assert(thd->is_error());
       return TRUE;
     }
     /* Always maintain the latest version and type */
@@ -4230,7 +4345,7 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
         previous execution of the prepared statement, and it is
         unacceptable for this SQLCOM. Error has been reported.
       */
-      DBUG_ASSERT(thd->is_error());
+      assert(thd->is_error());
       return TRUE;
     }
     /* Always maintain the latest cache version. */
@@ -4301,6 +4416,29 @@ bool tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
     if (view_open_result)
       return true;
 
+    if (table_list->is_view())
+    {
+      /*
+        It's an execution of a PS/SP and the view has already been unfolded
+        into a list of used tables. Now we only need to update the information
+        about granted privileges in the view tables with the actual data
+        stored in MySQL privilege system.  We don't need to restore the
+        required privileges (by calling register_want_access) because they has
+        not changed since PREPARE or the previous execution: the only case
+        when this information is changed is execution of UPDATE on a view, but
+        the original want_access is restored in its end.
+
+        Optimizer trace: because tables have been unfolded already, they are
+        in LEX::query_tables of the statement using the view. So privileges on
+        them are checked as done for explicitely listed tables, in constructor
+        of Opt_trace_start. Security context change is checked in
+        prepare_security() below.
+      */
+      if (!table_list->prelocking_placeholder &&
+          table_list->prepare_security(thd))
+        return true;
+    }
+
     bool view_parse_result= false;
     if (!(flags & OPEN_VIEW_NO_PARSE))
       view_parse_result= parse_view_definition(thd, table_list);
@@ -4345,17 +4483,15 @@ static bool open_table_entry_fini(THD *thd, TABLE_SHARE *share, TABLE *entry)
     entry->file->implicit_emptied= 0;
     if (mysql_bin_log.is_open())
     {
-      bool error= false;
+      bool result= false;
       String temp_buf;
-      error= temp_buf.append("DELETE FROM ");
+      result= temp_buf.append("TRUNCATE TABLE ");
       append_identifier(thd, &temp_buf, share->db.str, strlen(share->db.str));
-      error= temp_buf.append(".");
+      result= temp_buf.append(".");
       append_identifier(thd, &temp_buf, share->table_name.str,
                         strlen(share->table_name.str));
-      if (mysql_bin_log.write_dml_directly(thd, temp_buf.c_ptr_safe(),
-                                           temp_buf.length()))
-        return TRUE;
-      if (error)
+      result= temp_buf.append(" /* generated by server, implicitly emptying in-memory table */");
+      if (result)
       {
         /*
           As replication is maybe going to be corrupted, we need to warn the
@@ -4363,11 +4499,26 @@ static bool open_table_entry_fini(THD *thd, TABLE_SHARE *share, TABLE *entry)
           because of MYF(MY_WME) in my_malloc() above).
         */
         sql_print_error("When opening HEAP table, could not allocate memory "
-                        "to write 'DELETE FROM `%s`.`%s`' to the binary log",
+                        "to write 'TRUNCATE TABLE `%s`.`%s`' to the binary log",
                         share->db.str, share->table_name.str);
         delete entry->triggers;
         return TRUE;
       }
+      /*
+        Create a new THD object for binary logging the statement which implicitly
+        empties the in-memory table.
+      */
+      THD new_thd;
+      new_thd.thread_stack= (char *) &thd;
+      new_thd.set_new_thread_id();
+      new_thd.store_globals();
+      new_thd.set_db(thd->db());
+      new_thd.variables.gtid_next.set_automatic();
+      result= mysql_bin_log.write_stmt_directly(&new_thd, temp_buf.c_ptr_safe(),
+                                               temp_buf.length(), SQLCOM_TRUNCATE);
+      new_thd.restore_globals();
+      thd->store_globals();
+      return result;
     }
   }
   return FALSE;
@@ -4546,7 +4697,7 @@ request_backoff_action(enum_open_table_action action_arg,
   */
   if (table)
   {
-    DBUG_ASSERT(action_arg == OT_DISCOVER || action_arg == OT_REPAIR);
+    assert(action_arg == OT_DISCOVER || action_arg == OT_REPAIR);
     m_failed_table= (TABLE_LIST*) m_thd->alloc(sizeof(TABLE_LIST));
     if (m_failed_table == NULL)
       return TRUE;
@@ -4674,7 +4825,7 @@ recover_from_failed_open()
         break;
       }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
   m_thd->pop_internal_handler();
   /*
@@ -4840,7 +4991,7 @@ open_and_process_routine(THD *thd, Query_tables_list *prelocking_ctx,
           Since we acquire only shared lock on routines we don't
           need to care about global intention exclusive locks.
         */
-        DBUG_ASSERT(rt->mdl_request.type == MDL_SHARED);
+        assert(rt->mdl_request.type == MDL_SHARED);
 
         /*
           Waiting for a conflicting metadata lock to go away may
@@ -4928,7 +5079,7 @@ open_and_process_routine(THD *thd, Query_tables_list *prelocking_ctx,
     break;
   default:
     /* Impossible type value. */
-    DBUG_ASSERT(0);
+    assert(0);
   }
   DBUG_RETURN(FALSE);
 }
@@ -4994,7 +5145,7 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables,
       at the same time. Otherwise, acquiring metadata lock om the view
       would have been necessary.
     */
-    DBUG_ASSERT(!tables->is_view());
+    assert(!tables->is_view());
 
     if (!mysql_schema_table(thd, lex, tables) &&
         !check_and_update_table_version(thd, tables, tables->table->s))
@@ -5017,7 +5168,7 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables,
       (TABLE_LIST::table is not NULL), that TABLE object must be a pre-opened
       temporary table.
     */
-    DBUG_ASSERT(is_temporary_table(tables));
+    assert(is_temporary_table(tables));
   }
   else if (tables->open_type == OT_TEMPORARY_ONLY)
   {
@@ -5029,9 +5180,9 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables,
       and we can simply continue without trying to open temporary or base
       table.
     */
-    DBUG_ASSERT(tables->open_strategy);
-    DBUG_ASSERT(!tables->prelocking_placeholder);
-    DBUG_ASSERT(!tables->parent_l);
+    assert(tables->open_strategy);
+    assert(!tables->prelocking_placeholder);
+    assert(!tables->parent_l);
   }
   else if (tables->prelocking_placeholder)
   {
@@ -5207,7 +5358,7 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables,
     Note that placeholders don't have the handler open.
   */
   /* MERGE tables need to access parent and child TABLE_LISTs. */
-  DBUG_ASSERT(tables->table->pos_in_table_list == tables);
+  assert(tables->table->pos_in_table_list == tables);
   /* Non-MERGE tables ignore this call. */
   if (tables->table->file->extra(HA_EXTRA_ADD_CHILDREN_LIST))
   {
@@ -5371,8 +5522,8 @@ get_and_lock_tablespace_names(THD *thd,
       {
         // Assert that we have an MDL lock on the table name. Needed to read
         // the dictionary safely.
-        DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(
-                MDL_key::TABLE, table->db, table->table_name, MDL_SHARED));
+        assert(thd->mdl_context.owns_equal_or_stronger_lock(
+                                                            MDL_key::TABLE, table->db, table->table_name, MDL_SHARED));
 
         /*
           Add names of tablespaces used by table or by its
@@ -5428,7 +5579,7 @@ lock_table_names(THD *thd,
   Hash_set<TABLE_LIST, schema_set_get_key> schema_set(PSI_INSTRUMENT_ME);
   bool need_global_read_lock_protection= false;
 
-  DBUG_ASSERT(!thd->locked_tables_mode);
+  assert(!thd->locked_tables_mode);
 
   // Phase 1: Iterate over tables, collect set of unique schema names, and
   //          construct a list of requests for table MDL locks.
@@ -5503,6 +5654,20 @@ lock_table_names(THD *thd,
   if (thd->mdl_context.acquire_locks(&mdl_requests, lock_wait_timeout))
     return true;
 
+
+  /*
+    Now when we have protection against concurrent change of read_only
+    option we can safely re-check its value.
+    Skip the check for FLUSH TABLES ... WITH READ LOCK and
+    FLUSH TABLES ... FOR EXPORT as they are not supposed to be affected
+    by read_only modes.
+  */
+  if (need_global_read_lock_protection &&
+      !(flags & MYSQL_OPEN_SKIP_SCOPED_MDL_LOCK) &&
+      !(flags & MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY) &&
+      check_readonly(thd, true))
+    return true;
+
   /*
     Phase 4: Lock tablespace names. This cannot be done as part
     of the previous phases, because we need to read the
@@ -5536,7 +5701,7 @@ open_tables_check_upgradable_mdl(THD *thd, TABLE_LIST *tables_start,
 {
   TABLE_LIST *table;
 
-  DBUG_ASSERT(thd->locked_tables_mode);
+  assert(thd->locked_tables_mode);
 
   for (table= tables_start; table && table != tables_end;
        table= table->next_global)
@@ -5545,7 +5710,7 @@ open_tables_check_upgradable_mdl(THD *thd, TABLE_LIST *tables_start,
       Check below needs to be updated if this function starts
       called for SRO locks.
     */
-    DBUG_ASSERT(table->mdl_request.type != MDL_SHARED_READ_ONLY);
+    assert(table->mdl_request.type != MDL_SHARED_READ_ONLY);
 
     if (!table->mdl_request.is_ddl_or_lock_tables_lock_request() ||
         table->open_type == OT_TEMPORARY_ONLY ||
@@ -5848,9 +6013,11 @@ bool open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags,
     }
   }
 
-  /* Accessing data in XA_IDLE or XA_PREPARED is not allowed. */
+  /* Accessing data in XA_IDLE or XA_PREPARED or when an error(rm_error) is set
+     by the resource manager, is not allowed. */
   if (*start &&
-      thd->get_transaction()->xid_state()->check_xa_idle_or_prepared(true))
+      (thd->get_transaction()->xid_state()->check_xa_idle_or_prepared(true) ||
+       thd->get_transaction()->xid_state()->xa_trans_rolled_back()))
     DBUG_RETURN(true);
 
   /*
@@ -5887,7 +6054,7 @@ bool open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags,
     if (tbl && tbl->file->ht->db_type == DB_TYPE_MRG_MYISAM)
     {
       /* MERGE tables need to access parent and child TABLE_LISTs. */
-      DBUG_ASSERT(tbl->pos_in_table_list == tables);
+      assert(tbl->pos_in_table_list == tables);
       if (tbl->file->extra(HA_EXTRA_ATTACH_CHILDREN))
       {
         error= TRUE;
@@ -6001,7 +6168,7 @@ handle_table(THD *thd, Query_tables_list *prelocking_ctx,
              TABLE_LIST *table_list, bool *need_prelocking)
 {
   /* We rely on a caller to check that table is going to be changed. */
-  DBUG_ASSERT(table_list->lock_type >= TL_WRITE_ALLOW_WRITE);
+  assert(table_list->lock_type >= TL_WRITE_ALLOW_WRITE);
 
   if (table_list->trg_event_map)
   {
@@ -6083,7 +6250,7 @@ handle_table(THD *thd, Query_tables_list *prelocking_ctx,
     return TRUE;
 
   /* We rely on a caller to check that table is going to be changed. */
-  DBUG_ASSERT(table_list->lock_type >= TL_WRITE_ALLOW_WRITE);
+  assert(table_list->lock_type >= TL_WRITE_ALLOW_WRITE);
 
   return FALSE;
 }
@@ -6170,7 +6337,7 @@ static bool check_lock_and_start_stmt(THD *thd,
     Prelocking placeholder is not set for TABLE_LIST that
     are directly used by TOP level statement.
   */
-  DBUG_ASSERT(table_list->prelocking_placeholder == false);
+  assert(table_list->prelocking_placeholder == false);
 
   /*
     TL_WRITE_DEFAULT, TL_READ_DEFAULT and TL_WRITE_CONCURRENT_DEFAULT
@@ -6318,7 +6485,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
   DBUG_ENTER("open_ltable");
 
   /* should not be used in a prelocked_mode context, see NOTE above */
-  DBUG_ASSERT(thd->locked_tables_mode < LTM_PRELOCKED);
+  assert(thd->locked_tables_mode < LTM_PRELOCKED);
 
   THD_STAGE_INFO(thd, stage_opening_tables);
 
@@ -6326,7 +6493,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
   table_list->required_type= FRMTYPE_TABLE;
 
   /* This function can't properly handle requests for such metadata locks. */
-  DBUG_ASSERT(!table_list->mdl_request.is_ddl_or_lock_tables_lock_request());
+  assert(!table_list->mdl_request.is_ddl_or_lock_tables_lock_request());
 
   while ((error= open_table(thd, table_list, &ot_ctx)) &&
          ot_ctx.can_recover_from_failed_open())
@@ -6348,7 +6515,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
       We can't have a view or some special "open_strategy" in this function
       so there should be a TABLE instance.
     */
-    DBUG_ASSERT(table_list->table);
+    assert(table_list->table);
     table= table_list->table;
     if (table->file->ht->db_type == DB_TYPE_MRG_MYISAM)
     {
@@ -6370,7 +6537,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
     }
     else
     {
-      DBUG_ASSERT(thd->lock == 0);	// You must lock everything at once
+      assert(thd->lock == 0);	// You must lock everything at once
       if ((table->reginfo.lock_type= lock_type) != TL_UNLOCK)
 	if (! (thd->lock= mysql_lock_tables(thd, &table_list->table, 1,
                                             lock_flags)))
@@ -6433,9 +6600,9 @@ bool open_and_lock_tables(THD *thd, TABLE_LIST *tables, uint flags,
     the global transaction state is inflicted when the attachable one
     will commmit.
   */
-  DBUG_ASSERT(!thd->is_attachable_ro_transaction_active() &&
-              (!thd->is_attachable_rw_transaction_active() ||
-               !strcmp(tables->table_name, "gtid_executed")));
+  assert(!thd->is_attachable_ro_transaction_active() &&
+         (!thd->is_attachable_rw_transaction_active() ||
+          !strcmp(tables->table_name, "gtid_executed")));
 
   if (open_tables(thd, &tables, &counter, flags, prelocking_strategy))
     goto err;
@@ -6490,7 +6657,7 @@ bool open_tables_for_query(THD *thd, TABLE_LIST *tables, uint flags)
   DBUG_EXECUTE_IF("open_tables_for_query__out_of_memory",
                   DBUG_SET("+d,simulate_out_of_memory"););
 
-  DBUG_ASSERT(tables == thd->lex->query_tables);
+  assert(tables == thd->lex->query_tables);
 
   if (open_tables(thd, &tables, &thd->lex->table_count, flags,
                   &prelocking_strategy))
@@ -6504,9 +6671,9 @@ bool open_tables_for_query(THD *thd, TABLE_LIST *tables, uint flags)
     table on the fly, and thus mustn't manipulate with the
     transaction of the enclosing statement.
   */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
-              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL) ||
-              thd->in_sub_stmt);
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
+         (thd->state_flags & Open_tables_state::BACKUPS_AVAIL) ||
+         thd->in_sub_stmt);
   close_thread_tables(thd);
   /* Don't keep locks for a failed statement. */
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
@@ -6581,14 +6748,14 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
     We can't meet statement requiring prelocking if we already
     in prelocked mode.
   */
-  DBUG_ASSERT(thd->locked_tables_mode <= LTM_LOCK_TABLES ||
-              !thd->lex->requires_prelocking());
+  assert(thd->locked_tables_mode <= LTM_LOCK_TABLES ||
+         !thd->lex->requires_prelocking());
 
   /*
     lock_tables() should not be called if this statement has
     already locked its tables.
   */
-  DBUG_ASSERT(thd->lex->lock_tables_state == Query_tables_list::LTS_NOT_LOCKED);
+  assert(thd->lex->lock_tables_state == Query_tables_list::LTS_NOT_LOCKED);
 
   if (!tables && !thd->lex->requires_prelocking())
   {
@@ -6615,15 +6782,52 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
   */
   if (! thd->locked_tables_mode)
   {
-    DBUG_ASSERT(thd->lock == 0);	// You must lock everything at once
+    assert(thd->lock == 0);	// You must lock everything at once
     TABLE **start,**ptr;
 
     if (!(ptr=start=(TABLE**) thd->alloc(sizeof(TABLE*)*count)))
       DBUG_RETURN(TRUE);
     for (table= tables; table; table= table->next_global)
     {
-      if (!table->is_placeholder())
-	*(ptr++)= table->table;
+      if (!table->is_placeholder() &&
+          /*
+            Do not call handler::store_lock()/external_lock() for temporary
+            tables from prelocking list.
+
+            Prelocking algorithm does not add element for a table to the
+            prelocking list if it finds that the routine that uses the table can
+            create it as a temporary during its execution. Note that such
+            routine actually can use existing temporary table if its CREATE
+            TEMPORARY TABLE has IF NOT EXISTS clause. For such tables we rely on
+            calls to handler::start_stmt() done by routine's substatement when
+            it accesses the table to inform storage engine about table
+            participation in transaction and type of operation carried out,
+            instead of calls to handler::store_lock()/external_lock() done at
+            prelocking stage.
+
+            In cases when statement uses two routines one of which can create
+            temporary table and modifies it, while another only reads from this
+            table, storage engine might be confused about real operation type
+            performed by the whole statement. Calls to
+            handler::store_lock()/external_lock() done at prelocking stage will
+            inform SE only about read part, while information about modification
+            will be delayed until handler::start_stmt() call during execution of
+            the routine doing modification. InnoDB considers this breaking of
+            promise about operation type and fails on assertion.
+
+            To avoid this problem we try to handle both the cases when temporary
+            table can be created by routine and the case when it is created
+            outside of routine and only accessed by it, uniformly. We don't call
+            handler::store_lock()/external_lock() for temporary tables used by
+            routines at prelocking stage and rely on calls to
+            handler::start_stmt(), which happen during substatement execution,
+            to pass correct information about operation type instead.
+          */
+          !(table->prelocking_placeholder &&
+            table->table->s->tmp_table != NO_TMP_TABLE))
+      {
+        *(ptr++)= table->table;
+      }
     }
 
     DEBUG_SYNC(thd, "before_lock_tables_takes_lock");
@@ -6788,8 +6992,8 @@ void close_tables_for_reopen(THD *thd, TABLE_LIST **tables,
     table on the fly, and thus mustn't manipulate with the
     transaction of the enclosing statement.
   */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
-              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
+         (thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
   close_thread_tables(thd);
   thd->mdl_context.rollback_to_savepoint(start_of_statement_svp);
 }
@@ -6844,7 +7048,7 @@ TABLE *open_table_uncached(THD *thd, const char *path, const char *db,
                                       MYF(MY_WME))))
     DBUG_RETURN(0);				/* purecov: inspected */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // In order to let purge thread callback call open_table_uncached()
   // we cannot grab LOCK_open here, as that will cause a deadlock.
 
@@ -6860,8 +7064,8 @@ TABLE *open_table_uncached(THD *thd, const char *path, const char *db,
   if (open_in_engine)
   {
     mysql_mutex_lock(&LOCK_open);
-    DBUG_ASSERT(!my_hash_search(&table_def_cache, (uchar*) cache_key,
-                                key_length));
+    assert(!my_hash_search(&table_def_cache, (uchar*) cache_key,
+                           key_length));
     mysql_mutex_unlock(&LOCK_open);
   }
 #endif
@@ -6913,6 +7117,8 @@ TABLE *open_table_uncached(THD *thd, const char *path, const char *db,
 
   if (add_to_temporary_tables_list)
   {
+    tmp_table->set_binlog_drop_if_temp(!thd->is_current_stmt_binlog_disabled()
+                                 && !thd->is_current_stmt_binlog_format_row());
     /* growing temp list at the head */
     tmp_table->next= thd->temporary_tables;
     if (tmp_table->next)
@@ -7024,7 +7230,7 @@ bool open_temporary_table(THD *thd, TABLE_LIST *tl)
     Code in open_table() assumes that TABLE_LIST::table can
     be non-zero only for pre-opened temporary tables.
   */
-  DBUG_ASSERT(tl->table == NULL);
+  assert(tl->table == NULL);
 
   /*
     This function should not be called for cases when derived or I_S
@@ -7032,7 +7238,7 @@ bool open_temporary_table(THD *thd, TABLE_LIST *tl)
     have invalid db or table name.
     Instead open_temporary_tables() should be used.
   */
-  DBUG_ASSERT(!tl->is_view_or_derived() && !tl->schema_table);
+  assert(!tl->is_view_or_derived() && !tl->schema_table);
 
   if (tl->open_type == OT_BASE_ONLY)
   {
@@ -7056,7 +7262,7 @@ bool open_temporary_table(THD *thd, TABLE_LIST *tl)
   if (tl->partition_names)
   {
     /* Partitioned temporary tables is not supported. */
-    DBUG_ASSERT(!table->part_info);
+    assert(!table->part_info);
     my_error(ER_PARTITION_CLAUSE_ON_NONPARTITIONED, MYF(0));
     DBUG_RETURN(true);
   }
@@ -7163,8 +7369,8 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list,
   Field_iterator_view field_it;
   field_it.set(table_list);
 
-  DBUG_ASSERT(table_list->schema_table_reformed ||
-              (ref != 0 && table_list->is_merged()));
+  assert(table_list->schema_table_reformed ||
+         (ref != 0 && table_list->is_merged()));
   for (; !field_it.end_of_fields(); field_it.next())
   {
     if (!my_strcasecmp(system_charset_info, field_it.name(), name))
@@ -7258,8 +7464,8 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
   DBUG_ENTER("find_field_in_natural_join");
   DBUG_PRINT("enter", ("field name: '%s', ref 0x%lx",
 		       name, (ulong) ref));
-  DBUG_ASSERT(table_ref->is_natural_join && table_ref->join_columns);
-  DBUG_ASSERT(*actual_table == NULL);
+  assert(table_ref->is_natural_join && table_ref->join_columns);
+  assert(*actual_table == NULL);
 
   for (nj_col= NULL, curr_nj_col= field_it++; curr_nj_col; 
        curr_nj_col= field_it++)
@@ -7306,7 +7512,7 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
       item->real_item()->item_name= (*ref)->item_name;
     }
 
-    DBUG_ASSERT(nj_col->table_field == NULL);
+    assert(nj_col->table_field == NULL);
     if (nj_col->table_ref->schema_table_reformed)
     {
       /*
@@ -7325,7 +7531,7 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
   else
   {
     /* This is a base table. */
-    DBUG_ASSERT(nj_col->view_field == NULL);
+    assert(nj_col->view_field == NULL);
     /*
       This fix_fields is not necessary (initially this item is fixed by
       the Item_field constructor; after reopen_tables the Item_func_eq
@@ -7339,7 +7545,7 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
                           nj_col->table_field->item_name.ptr()));
       DBUG_RETURN(NULL);
     }
-    DBUG_ASSERT(nj_col->table_ref->table == nj_col->table_field->field->table);
+    assert(nj_col->table_ref->table == nj_col->table_field->field->table);
     found_field= nj_col->table_field->field;
   }
 
@@ -7483,9 +7689,9 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list,
 {
   Field *fld;
   DBUG_ENTER("find_field_in_table_ref");
-  DBUG_ASSERT(table_list->alias);
-  DBUG_ASSERT(name);
-  DBUG_ASSERT(item_name);
+  assert(table_list->alias);
+  assert(name);
+  assert(item_name);
   DBUG_PRINT("enter",
              ("table: '%s'  field name: '%s'  item name: '%s'  ref 0x%lx",
               table_list->alias, name, item_name, (ulong) ref));
@@ -7535,7 +7741,7 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list,
   else if (!table_list->nested_join)
   {
     /* 'table_list' is a stored table. */
-    DBUG_ASSERT(table_list->table);
+    assert(table_list->table);
     if ((fld= find_field_in_table(thd, table_list->table, name, length,
                                   allow_rowid,
                                   cached_field_index_ptr)))
@@ -7589,9 +7795,9 @@ find_field_in_table_ref(THD *thd, TABLE_LIST *table_list,
       }
       else
       {
-        DBUG_ASSERT(ref && *ref && (*ref)->fixed);
-        DBUG_ASSERT(*actual_table ==
-                    ((Item_direct_view_ref *)(*ref))->cached_table);
+        assert(ref && *ref && (*ref)->fixed);
+        assert(*actual_table ==
+               ((Item_direct_view_ref *)(*ref))->cached_table);
 
         Column_privilege_tracker tracker(thd, want_privilege);
         if ((*ref)->walk(&Item::check_column_privileges, Item::WALK_PREFIX,
@@ -7833,7 +8039,7 @@ find_field_in_tables(THD *thd, Item_ident *item,
       item->cached_table= (!actual_table->cacheable_table || found) ?
                           0 : actual_table;
 
-      DBUG_ASSERT(thd->where);
+      assert(thd->where);
       /*
         If we found a fully qualified field we return it directly as it can't
         have duplicates.
@@ -8378,10 +8584,10 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
       /*
         The created items must be of sub-classes of Item_ident.
       */
-      DBUG_ASSERT(item_1->type() == Item::FIELD_ITEM ||
-                  item_1->type() == Item::REF_ITEM);
-      DBUG_ASSERT(item_2->type() == Item::FIELD_ITEM ||
-                  item_2->type() == Item::REF_ITEM);
+      assert(item_1->type() == Item::FIELD_ITEM ||
+             item_1->type() == Item::REF_ITEM);
+      assert(item_2->type() == Item::FIELD_ITEM ||
+             item_2->type() == Item::REF_ITEM);
 
       /*
         We need to cast item_1,2 to Item_ident, because we need to hook name
@@ -8514,7 +8720,7 @@ store_natural_using_join_columns(THD *thd, TABLE_LIST *natural_using_join,
   List<Natural_join_column> *non_join_columns;
   DBUG_ENTER("store_natural_using_join_columns");
 
-  DBUG_ASSERT(!natural_using_join->join_columns);
+  assert(!natural_using_join->join_columns);
 
   Prepared_stmt_arena_holder ps_arena_holder(thd);
 
@@ -8626,7 +8832,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
 {
   DBUG_ENTER("store_top_level_join_columns");
 
-  DBUG_ASSERT(!table_ref->nested_join->natural_join_processed);
+  assert(!table_ref->nested_join->natural_join_processed);
 
   Prepared_stmt_arena_holder ps_arena_holder(thd);
 
@@ -8658,7 +8864,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
           cur_table_ref->outer_join & JOIN_TYPE_RIGHT)
       {
         /* This can happen only for JOIN ... ON. */
-        DBUG_ASSERT(table_ref->nested_join->join_list.elements == 2);
+        assert(table_ref->nested_join->join_list.elements == 2);
         swap_variables(TABLE_LIST*, same_level_left_neighbor, cur_table_ref);
       }
 
@@ -8686,8 +8892,8 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
   */
   if (table_ref->is_natural_join)
   {
-    DBUG_ASSERT(table_ref->nested_join &&
-                table_ref->nested_join->join_list.elements == 2);
+    assert(table_ref->nested_join &&
+           table_ref->nested_join->join_list.elements == 2);
     List_iterator_fast<TABLE_LIST> operand_it(table_ref->nested_join->join_list);
     /*
       Notice that the order of join operands depends on whether table_ref
@@ -8827,7 +9033,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
     right_neighbor points to the left-most top-level table reference in the
     FROM clause.
   */
-  DBUG_ASSERT(right_neighbor);
+  assert(right_neighbor);
   context->first_name_resolution_table=
     right_neighbor->first_leaf_for_name_resolution();
 
@@ -8871,11 +9077,11 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
   Column_privilege_tracker column_privilege(thd, want_privilege);
 
   // Function can only be used to set up one specific operation:
-  DBUG_ASSERT(want_privilege == 0 ||
-              want_privilege == SELECT_ACL ||
-              want_privilege == INSERT_ACL ||
-              want_privilege == UPDATE_ACL);
-  DBUG_ASSERT(! (column_update && (want_privilege & SELECT_ACL)));
+  assert(want_privilege == 0 ||
+         want_privilege == SELECT_ACL ||
+         want_privilege == INSERT_ACL ||
+         want_privilege == UPDATE_ACL);
+  assert(! (column_update && (want_privilege & SELECT_ACL)));
   if (want_privilege & SELECT_ACL)
     thd->mark_used_columns= MARK_COLUMNS_READ;
   else if (want_privilege & (INSERT_ACL | UPDATE_ACL))
@@ -8903,7 +9109,7 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
   */
   if (!ref_pointer_array.is_null())
   {
-    DBUG_ASSERT(ref_pointer_array.size() >= fields.elements);
+    assert(ref_pointer_array.size() >= fields.elements);
     memset(ref_pointer_array.array(), 0, sizeof(Item *) * fields.elements);
   }
 
@@ -9017,7 +9223,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
     Field_iterator_table_ref field_iterator;
     TABLE *const table= tables->table;
 
-    DBUG_ASSERT(tables->is_leaf_for_name_resolution());
+    assert(tables->is_leaf_for_name_resolution());
 
     if ((table_name && my_strcasecmp(table_alias_charset, table_name,
                                     tables->alias)) ||
@@ -9091,7 +9297,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
       Item *const item= field_iterator.create_item(thd);
       if (!item)
         DBUG_RETURN(true);        /* purecov: inspected */
-      DBUG_ASSERT(item->fixed);
+      assert(item->fixed);
       /* cache the table for the Item_fields inserted by expanding stars */
       if (item->type() == Item::FIELD_ITEM && tables->cacheable_table)
         ((Item_field *)item)->cached_table= tables;
@@ -9115,9 +9321,9 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
       */
       if (any_privileges)
       {
-        DBUG_ASSERT((tables->field_translation == NULL && table) ||
-                    tables->is_natural_join);
-        DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
+        assert((tables->field_translation == NULL && table) ||
+               tables->is_natural_join);
+        assert(item->type() == Item::FIELD_ITEM);
         Item_field *const fld= (Item_field*) item;
         const char *field_table_name= field_iterator.get_table_name();
 
@@ -9221,7 +9427,7 @@ bool fill_record(THD *thd, TABLE *table, List<Item> &fields,
 {
   DBUG_ENTER("fill_record");
 
-  DBUG_ASSERT(fields.elements == values.elements);
+  assert(fields.elements == values.elements);
   /*
     Reset the table->auto_increment_field_not_null as it is valid for
     only one row.
@@ -9234,7 +9440,7 @@ bool fill_record(THD *thd, TABLE *table, List<Item> &fields,
   while ((fld= f++))
   {
     Item_field *const field= fld->field_for_view_update();
-    DBUG_ASSERT(field != NULL && field->table_ref->table == table);
+    assert(field != NULL && field->table_ref->table == table);
 
     Field *const rfield= field->field;
     Item *const value= v++;
@@ -9453,7 +9659,7 @@ fill_record_n_invoke_before_triggers(THD *thd, COPY_INFO *optype_info,
     if (table->triggers->has_triggers(event, TRG_ACTION_BEFORE) &&
         command_can_invoke_insert_triggers(event, thd->lex->sql_command))
     {
-      DBUG_ASSERT(num_fields);
+      assert(num_fields);
 
       MY_BITMAP insert_into_fields_bitmap;
       bitmap_init(&insert_into_fields_bitmap, NULL, num_fields, false);
@@ -9509,8 +9715,8 @@ fill_record_n_invoke_before_triggers(THD *thd, COPY_INFO *optype_info,
       Re-calculate generated fields to cater for cases when base columns are 
       updated by the triggers.
     */
-    DBUG_ASSERT(table->pos_in_table_list &&
-                !table->pos_in_table_list->is_view());
+    assert(table->pos_in_table_list &&
+           !table->pos_in_table_list->is_view());
     if (!rc && table->has_gcol())
         rc= update_generated_write_fields(table->write_set, table);
 
@@ -9563,7 +9769,7 @@ bool fill_record(THD *thd, TABLE *table, Field **ptr, List<Item> &values,
   while ((field= *ptr++) && ! thd->is_error())
   {
     Item *const value= v++;
-    DBUG_ASSERT(field->table == table);
+    assert(field->table == table);
 
     /* If bitmap over wanted fields are set, skip non marked fields. */
     if (bitmap && !bitmap_is_set(bitmap, field->field_index))
@@ -9592,7 +9798,7 @@ bool fill_record(THD *thd, TABLE *table, Field **ptr, List<Item> &values,
       update_generated_write_fields(bitmap ? bitmap : table->write_set, table))
     goto err;
 
-  DBUG_ASSERT(thd->is_error() || !v++);      // No extra value!
+  assert(thd->is_error() || !v++);      // No extra value!
   DBUG_RETURN(thd->is_error());
 
 err:
@@ -9638,8 +9844,8 @@ fill_record_n_invoke_before_triggers(THD *thd, Field **ptr,
 
   if (table->triggers)
   {
-    DBUG_ASSERT(command_can_invoke_insert_triggers(event, thd->lex->sql_command));
-    DBUG_ASSERT(num_fields);
+    assert(command_can_invoke_insert_triggers(event, thd->lex->sql_command));
+    assert(num_fields);
 
     table->triggers->enable_fields_temporary_nullability(thd);
 
@@ -9820,9 +10026,9 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
   else
     table_cache_manager.assert_owner_all_and_tdc();
 
-  DBUG_ASSERT(remove_type == TDC_RT_REMOVE_UNUSED ||
-              thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                 db, table_name, MDL_EXCLUSIVE));
+  assert(remove_type == TDC_RT_REMOVE_UNUSED ||
+         thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      db, table_name, MDL_EXCLUSIVE));
 
   key_length= create_table_def_key(thd, key, db, table_name, false);
 
@@ -9858,7 +10064,7 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
     }
     else
     {
-      DBUG_ASSERT(remove_type != TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE);
+      assert(remove_type != TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE);
       (void) my_hash_delete(&table_def_cache, (uchar*) share);
     }
   }
@@ -9898,7 +10104,7 @@ int setup_ftfuncs(SELECT_LEX *select_lex)
 
 bool init_ftfuncs(THD *thd, SELECT_LEX *select_lex)
 {
-  DBUG_ASSERT(select_lex->has_ft_funcs());
+  assert(select_lex->has_ft_funcs());
 
   List_iterator<Item_func_match> li(*(select_lex->ftfunc_list));
   DBUG_PRINT("info",("Performing FULLTEXT search"));
@@ -9975,7 +10181,7 @@ open_nontrans_system_tables_for_read(THD *thd, TABLE_LIST *table_list,
 
   for (TABLE_LIST *tables= table_list; tables; tables= tables->next_global)
   {
-    DBUG_ASSERT(tables->table->s->table_category == TABLE_CATEGORY_SYSTEM);
+    assert(tables->table->s->table_category == TABLE_CATEGORY_SYSTEM);
 
     /*
       This function must be used to open non-transactional tables only. That's
@@ -9986,7 +10192,7 @@ open_nontrans_system_tables_for_read(THD *thd, TABLE_LIST *table_list,
     if (tables->table->file->has_transactions())
     {
       // Crash in the debug build ...
-      DBUG_ASSERT(!"Transactional table");
+      assert(!"Transactional table");
 
       // ... or report an error in the release build.
       my_error(ER_UNKNOWN_ERROR, MYF(0));
@@ -10042,7 +10248,7 @@ bool open_trans_system_tables_for_read(THD *thd, TABLE_LIST *table_list)
 
   DBUG_ENTER("open_trans_system_tables_for_read");
 
-  DBUG_ASSERT(!thd->is_attachable_ro_transaction_active());
+  assert(!thd->is_attachable_ro_transaction_active());
 
   // Begin attachable transaction.
 
@@ -10066,7 +10272,7 @@ bool open_trans_system_tables_for_read(THD *thd, TABLE_LIST *table_list)
     if ((t->table->file->ha_table_flags() & HA_ATTACHABLE_TRX_COMPATIBLE) == 0)
     {
       // Crash in the debug build ...
-      DBUG_ASSERT(!"HA_ATTACHABLE_TRX_COMPATIBLE is not set");
+      assert(!"HA_ATTACHABLE_TRX_COMPATIBLE is not set");
 
       // ... or report an error in the release build.
       my_error(ER_UNKNOWN_ERROR, MYF(0));
@@ -10166,7 +10372,7 @@ void
 close_mysql_tables(THD *thd)
 {
   /* No need to commit/rollback statement transaction, it's not started. */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
   close_thread_tables(thd);
   thd->mdl_context.release_transactional_locks();
 }
@@ -10196,7 +10402,7 @@ open_system_table_for_update(THD *thd, TABLE_LIST *one_table)
                             MYSQL_LOCK_IGNORE_TIMEOUT);
   if (table)
   {
-    DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_SYSTEM);
+    assert(table->s->table_category == TABLE_CATEGORY_SYSTEM);
     table->use_all_columns();
   }
 
@@ -10231,10 +10437,10 @@ open_log_table(THD *thd, TABLE_LIST *one_table, Open_tables_backup *backup)
 
   if ((table= open_ltable(thd, one_table, one_table->lock_type, flags)))
   {
-    DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_LOG);
+    assert(table->s->table_category == TABLE_CATEGORY_LOG);
     /* Make sure all columns get assigned to a default value */
     table->use_all_columns();
-    DBUG_ASSERT(table->no_replicate);
+    assert(table->no_replicate);
   }
   else
     thd->restore_backup_open_tables_state(backup);
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 7789a6271e1a..eb2e4675bdc1 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -346,6 +353,7 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db,
                                   bool no_error);
 void mark_tmp_table_for_reuse(TABLE *table);
 bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool *exists);
+bool add_view_place_holder(THD *thd, TABLE_LIST *table_list);
 
 extern Item **not_found_item;
 extern Field *not_found_field;
@@ -764,6 +772,28 @@ class Strict_error_handler : public Internal_error_handler
   enum_set_select_behavior m_set_select_behavior;
 };
 
+/**
+  This internal handler is to make sure that deprecation warning is not
+  displayed again if already displayed once.
+*/
+
+class Partition_in_shared_ts_error_handler : public Internal_error_handler
+{
+public:
+  Partition_in_shared_ts_error_handler()
+    : m_is_already_reported(false)
+  {}
+
+  virtual bool handle_condition(THD *thd,
+                                uint sql_errno,
+                                const char* sqlstate,
+                                Sql_condition::enum_severity_level *level,
+                                const char* msg);
+
+private:
+  bool m_is_already_reported;
+};
+
 void update_indexed_column_map(TABLE *table, MY_BITMAP *read_set);
 
 #endif /* SQL_BASE_INCLUDED */
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index e2ece7a5a8cf..cc39492ecfc9 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,7 +47,7 @@ static int check_event_type(int type, Relay_log_info *rli)
   */
   if (fd_event && fd_event->event_type_permutation)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     Log_event_type new_type;
     new_type= (Log_event_type) fd_event->event_type_permutation[type];
     DBUG_PRINT("info", ("converting event type %d to %d (%s)",
@@ -179,7 +186,7 @@ void mysql_client_binlog_statement(THD* thd)
     goto end;
   }
 
-  DBUG_ASSERT(rli->belongs_to_client());
+  assert(rli->belongs_to_client());
 
   for (char const *strptr= thd->lex->comment.str ;
        strptr < thd->lex->comment.str + thd->lex->comment.length ; )
@@ -201,8 +208,8 @@ void mysql_client_binlog_statement(THD* thd)
     else if (bytes_decoded == 0)
       break; // If no bytes where read, the string contained only whitespace
 
-    DBUG_ASSERT(bytes_decoded > 0);
-    DBUG_ASSERT(endptr > strptr);
+    assert(bytes_decoded > 0);
+    assert(endptr > strptr);
     coded_len-= endptr - strptr;
     strptr= endptr;
 
diff --git a/sql/sql_binlog.h b/sql/sql_binlog.h
index 3a6d561701ab..5bcbd61e4893 100644
--- a/sql/sql_binlog.h
+++ b/sql/sql_binlog.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index ce0738b7297c..a3c9786ee1f2 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -63,7 +70,7 @@ template <uint default_width> class Bitmap
                                     (static_cast<void *>(&buf2))),
                 map2buff);
     } else {
-      DBUG_ASSERT(sizeof(buffer) >= 4);
+      assert(sizeof(buffer) >= 4);
       int4store(const_cast<uchar *>(static_cast<uchar *>
                                     (static_cast<void *>(&buf2))),
                 static_cast<uint32>(map2buff));
@@ -111,7 +118,7 @@ template <uint default_width> class Bitmap
     if (sizeof(buffer) >= 8)
       return uint8korr(static_cast<const uchar *>
                        (static_cast<const void *>(buffer)));
-    DBUG_ASSERT(sizeof(buffer) >= 4);
+    assert(sizeof(buffer) >= 4);
     return (ulonglong)
       uint4korr(static_cast<const uchar *>
                 (static_cast<const void *>(buffer)));
@@ -130,8 +137,8 @@ template <> class Bitmap<64>
   void init() { clear_all(); }
   void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
   uint length() const { return 64; }
-  void set_bit(uint n) { DBUG_ASSERT(n < 64); map|= ((ulonglong)1) << n; }
-  void clear_bit(uint n) { DBUG_ASSERT(n < 64); map&= ~(((ulonglong)1) << n); }
+  void set_bit(uint n) { assert(n < 64); map|= ((ulonglong)1) << n; }
+  void clear_bit(uint n) { assert(n < 64); map&= ~(((ulonglong)1) << n); }
   void set_prefix(uint n)
   {
     if (n >= length())
@@ -147,10 +154,10 @@ template <> class Bitmap<64>
   void subtract(const Bitmap<64>& map2) { map&= ~map2.map; }
   void merge(const Bitmap<64>& map2) { map|= map2.map; }
   my_bool is_set(uint n) const
-  { DBUG_ASSERT(n < 64); return MY_TEST(map & (((ulonglong)1) << n)); }
+  { assert(n < 64); return MY_TEST(map & (((ulonglong)1) << n)); }
   my_bool is_prefix(uint n) const
   {
-    DBUG_ASSERT(n <= 64);
+    assert(n <= 64);
     if (n < 64)
       return map == (((ulonglong)1) << n)-1;
     else
diff --git a/sql/sql_bootstrap.cc b/sql/sql_bootstrap.cc
index 40a1d84b8ea8..6a4959438537 100644
--- a/sql/sql_bootstrap.cc
+++ b/sql/sql_bootstrap.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_bootstrap.h b/sql/sql_bootstrap.h
index e111c0c66068..4efe265c1c61 100644
--- a/sql/sql_bootstrap.h
+++ b/sql/sql_bootstrap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in
index 2989763aa700..bed20c8b17ac 100644
--- a/sql/sql_builtin.cc.in
+++ b/sql/sql_builtin.cc.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 00dbc807d9bc..04a275d48e10 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -351,7 +358,7 @@ TODO list:
 using std::min;
 using std::max;
 
-#if defined(EXTRA_DEBUG) && !defined(DBUG_OFF)
+#if defined(EXTRA_DEBUG) && !defined(NDEBUG)
 #define RW_WLOCK(M) {DBUG_PRINT("lock", ("rwlock wlock 0x%lx",(ulong)(M))); \
   if (!mysql_rwlock_wrlock(M)) DBUG_PRINT("lock", ("rwlock wlock ok")); \
   else DBUG_PRINT("lock", ("rwlock wlock FAILED %d", errno)); }
@@ -508,7 +515,7 @@ bool Query_cache::try_lock(bool use_timeout)
     if (m_cache_lock_status == Query_cache::UNLOCKED)
     {
       m_cache_lock_status= Query_cache::LOCKED;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (thd)
         m_cache_lock_thread_id= thd->thread_id();
 #endif
@@ -525,7 +532,7 @@ bool Query_cache::try_lock(bool use_timeout)
     }
     else
     {
-      DBUG_ASSERT(m_cache_lock_status == Query_cache::LOCKED);
+      assert(m_cache_lock_status == Query_cache::LOCKED);
       /*
         To prevent send_result_to_client() and query_cache_insert() from
         blocking execution for too long a timeout is put on the lock.
@@ -575,7 +582,7 @@ void Query_cache::lock_and_suspend(void)
   while (m_cache_lock_status != Query_cache::UNLOCKED)
     mysql_cond_wait(&COND_cache_status_changed, &structure_guard_mutex);
   m_cache_lock_status= Query_cache::LOCKED_NO_WAIT;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (thd)
     m_cache_lock_thread_id= thd->thread_id();
 #endif
@@ -604,7 +611,7 @@ void Query_cache::lock(void)
   while (m_cache_lock_status != Query_cache::UNLOCKED)
     mysql_cond_wait(&COND_cache_status_changed, &structure_guard_mutex);
   m_cache_lock_status= Query_cache::LOCKED;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (thd)
     m_cache_lock_thread_id= thd->thread_id();
 #endif
@@ -622,13 +629,13 @@ void Query_cache::unlock(void)
 {
   DBUG_ENTER("Query_cache::unlock");
   mysql_mutex_lock(&structure_guard_mutex);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   THD *thd= current_thd;
   if (thd)
-    DBUG_ASSERT(m_cache_lock_thread_id == thd->thread_id());
+    assert(m_cache_lock_thread_id == thd->thread_id());
 #endif
-  DBUG_ASSERT(m_cache_lock_status == Query_cache::LOCKED ||
-              m_cache_lock_status == Query_cache::LOCKED_NO_WAIT);
+  assert(m_cache_lock_status == Query_cache::LOCKED ||
+         m_cache_lock_status == Query_cache::LOCKED_NO_WAIT);
   m_cache_lock_status= Query_cache::UNLOCKED;
   DBUG_PRINT("Query_cache",("Sending signal"));
   mysql_cond_signal(&COND_cache_status_changed);
@@ -736,7 +743,7 @@ inline uchar* Query_cache_block::data(void)
 
 inline Query_cache_query * Query_cache_block::query()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (type != QUERY)
     query_cache.wreck(__LINE__, "incorrect block type");
 #endif
@@ -745,7 +752,7 @@ inline Query_cache_query * Query_cache_block::query()
 
 inline Query_cache_table * Query_cache_block::table()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (type != TABLE)
     query_cache.wreck(__LINE__, "incorrect block type");
 #endif
@@ -754,7 +761,7 @@ inline Query_cache_table * Query_cache_block::table()
 
 inline Query_cache_result * Query_cache_block::result()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (type != RESULT && type != RES_CONT && type != RES_BEG &&
       type != RES_INCOMPLETE)
     query_cache.wreck(__LINE__, "incorrect block type");
@@ -1062,7 +1069,7 @@ void Query_cache::end_of_result(THD *thd)
   }
 
   /* Ensure that only complete results are cached. */
-  DBUG_ASSERT(thd->get_stmt_da()->is_eof());
+  assert(thd->get_stmt_da()->is_eof());
 
 #ifdef EMBEDDED_LIBRARY
   insert(query_cache_tls, (char*)thd,
@@ -1097,7 +1104,7 @@ void Query_cache::end_of_result(THD *thd)
         to this function. In the release version that query should be ignored
         and removed from QC.
       */
-      DBUG_ASSERT(0);
+      assert(0);
       free_query(query_block);
       unlock();
       DBUG_VOID_RETURN;
@@ -1196,7 +1203,7 @@ ulong Query_cache::resize(ulong query_cache_size_arg)
   DBUG_ENTER("Query_cache::resize");
   DBUG_PRINT("qcache", ("from %lu to %lu",query_cache_size,
 			query_cache_size_arg));
-  DBUG_ASSERT(initialized);
+  assert(initialized);
 
   lock_and_suspend();
 
@@ -1310,7 +1317,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
     */
     flags.protocol_type= (unsigned int) thd->get_protocol()->type();
     /* PROTOCOL_LOCAL results are not cached. */
-    DBUG_ASSERT(flags.protocol_type != (unsigned int) Protocol::PROTOCOL_LOCAL);
+    assert(flags.protocol_type != (unsigned int) Protocol::PROTOCOL_LOCAL);
     flags.more_results_exists= MY_TEST(thd->server_status &
                                        SERVER_MORE_RESULTS_EXISTS);
     flags.in_trans= thd->in_active_multi_stmt_transaction();
@@ -1618,8 +1625,8 @@ int Query_cache::send_result_to_client(THD *thd, const LEX_CSTRING &sql)
     }
     
     DBUG_EXECUTE_IF("test_sql_no_cache",
-                    DBUG_ASSERT(has_no_cache_directive(sql.str, i+6,
-                                                       sql.length)););
+                    assert(has_no_cache_directive(sql.str, i+6,
+                                                  sql.length)););
     if (has_no_cache_directive(sql.str, i+6, sql.length))
     {
       /*
@@ -1801,7 +1808,6 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
       }
     }
 
-    memset(&table_list, 0, sizeof(table_list));
     table_list.db = table->db();
     table_list.alias= table_list.table_name= table->table();
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
@@ -1815,8 +1821,8 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
       BLOCK_UNLOCK_RD(query_block);
       DBUG_RETURN(-1);				// Privilege error
     }
-    DBUG_ASSERT((SELECT_ACL & ~table_list.grant.privilege) ==
-                table_list.grant.want_privilege);
+    assert((SELECT_ACL & ~table_list.grant.privilege) ==
+           table_list.grant.want_privilege);
     if ((table_list.grant.privilege & SELECT_ACL) == 0)
     {
       DBUG_PRINT("qcache", ("Need to check column privileges for %s.%s",
@@ -1861,7 +1867,7 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
           Currently our engines do not request rollback from callbacks.
           If this is going to change code needs to be reworked.
         */
-        DBUG_ASSERT(! thd->transaction_rollback_request);
+        assert(! thd->transaction_rollback_request);
         trans_rollback_stmt(thd);
         goto err_unlock;				// Parse query
      }
@@ -1962,8 +1968,8 @@ void Query_cache::invalidate_single(THD *thd, TABLE_LIST *table_used,
     DBUG_VOID_RETURN;
 
   using_transactions&= thd->in_multi_stmt_transaction_mode();
-  DBUG_ASSERT(!using_transactions || table_used->table!=0);
-  DBUG_ASSERT(!table_used->is_view_or_derived());
+  assert(!using_transactions || table_used->table!=0);
+  assert(!table_used->is_view_or_derived());
   if (table_used->is_view_or_derived())
     DBUG_VOID_RETURN;
   if (using_transactions &&
@@ -3302,11 +3308,11 @@ void Query_cache::unlink_table(Query_cache_block_table *node)
   Query_cache_table *table_block_data= node->parent;
   table_block_data->m_cached_query_count--;
 
-  DBUG_ASSERT(table_block_data->m_cached_query_count >= 0);
+  assert(table_block_data->m_cached_query_count >= 0);
 
   if (neighbour->next == neighbour)
   {
-    DBUG_ASSERT(table_block_data->m_cached_query_count == 0);
+    assert(table_block_data->m_cached_query_count == 0);
     /*
       If neighbor is root of list, the list is empty.
       The root of the list is always a table-type block
@@ -3755,8 +3761,8 @@ Query_cache::process_and_count_tables(THD *thd, TABLE_LIST *tables_used,
         (!tables_used->parent_l ||
          tables_used->parent_l->table->file->ht->db_type != DB_TYPE_MRG_MYISAM))
     {
-      DBUG_ASSERT((SELECT_ACL & ~tables_used->grant.privilege) ==
-                  tables_used->grant.want_privilege);
+      assert((SELECT_ACL & ~tables_used->grant.privilege) ==
+             tables_used->grant.want_privilege);
       if ((tables_used->grant.privilege & SELECT_ACL) == 0)
       {
         DBUG_PRINT("qcache", ("Don't cache statement as it refers to "
@@ -3915,7 +3921,7 @@ my_bool Query_cache::ask_handler_allowance(THD *thd,
     if (tables_used->is_view() && tables_used->is_merged() &&
         table->s->get_table_ref_type() == TABLE_REF_TMP_TABLE)
     {
-      DBUG_ASSERT(false);
+      assert(false);
       continue;
     }
     if (!handler->register_query_cache_table(thd,
@@ -4257,7 +4263,7 @@ my_bool Query_cache::join_results(ulong join_limit)
 
   if (queries_blocks != 0)
   {
-    DBUG_ASSERT(query_cache_size > 0);
+    assert(query_cache_size > 0);
     Query_cache_block *block = queries_blocks;
     do
     {
@@ -4349,7 +4355,7 @@ size_t Query_cache::filename_2_table_key (char *key, const char *path,
   Functions to be used when debugging
 ****************************************************************************/
 
-#if defined(DBUG_OFF) || !defined(EXTRA_DEBUG)
+#if defined(NDEBUG) || !defined(EXTRA_DEBUG)
 
 void Query_cache::wreck(uint line, const char *message) { query_cache_size = 0; }
 void Query_cache::bins_dump() {}
@@ -4823,7 +4829,7 @@ bool Query_cache::check_integrity(enum_qcci_lock_mode locking)
       }
     }
   }
-  DBUG_ASSERT(result == 0);
+  assert(result == 0);
 
   if (locking == LOCK_WHILE_CHECKING)
     unlock();
@@ -5025,5 +5031,5 @@ my_bool Query_cache::in_table_list(Query_cache_block_table * root,
   return result;
 }
 
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index e9984d555684..3cbc40cc6b06 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -250,7 +257,7 @@ extern "C" void query_cache_invalidate_by_MyISAM_filename(const char* filename);
 struct Query_cache_memory_bin
 {
   Query_cache_memory_bin() {}                 /* Remove gcc warning */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ulong size;
 #endif
   uint number;
@@ -258,7 +265,7 @@ struct Query_cache_memory_bin
 
   inline void init(ulong size_arg)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     size = size_arg;
 #endif
     number = 0;
@@ -291,7 +298,7 @@ class Query_cache
 
 
 private:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   my_thread_id m_cache_lock_thread_id;
 #endif
   mysql_cond_t COND_cache_status_changed;
@@ -498,7 +505,7 @@ class Query_cache
 
   /*
     The following functions are only used when debugging
-    We don't protect these with ifndef DBUG_OFF to not have to recompile
+    We don't protect these with ifndef NDEBUG to not have to recompile
     everything if we want to add checks of the cache at some places.
   */
   void wreck(uint line, const char *message);
diff --git a/sql/sql_callback.h b/sql/sql_callback.h
index 32020c6f2da1..78859f77e2f4 100644
--- a/sql/sql_callback.h
+++ b/sql/sql_callback.h
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 3e4919184039..78b539195e22 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -50,6 +57,7 @@
 #ifdef HAVE_REPLICATION
 #include "rpl_rli_pdb.h"                     // Slave_worker
 #include "rpl_slave_commit_order_manager.h"
+#include "rpl_master.h"                      // unregister_slave
 #endif
 
 #include "pfs_file_provider.h"
@@ -118,7 +126,7 @@ THD::Attachable_trx::Attachable_trx(THD *thd)
   // The THD::transaction_rollback_request is expected to be unset in the
   // attachable transaction. It's weird to start attachable transaction when the
   // SE asked to rollback the regular transaction.
-  DBUG_ASSERT(!m_thd->transaction_rollback_request);
+  assert(!m_thd->transaction_rollback_request);
 
   // Save the transaction state.
 
@@ -187,7 +195,7 @@ THD::Attachable_trx::~Attachable_trx()
   // experienced some sort of deadlock/timeout while processing the attachable
   // transaction. That is not possible by the definition of an attachable
   // transaction.
-  DBUG_ASSERT(!m_thd->transaction_rollback_request);
+  assert(!m_thd->transaction_rollback_request);
 
   // Commit the attachable transaction before discarding transaction state.
   // This is mostly needed to properly reset transaction state in SE.
@@ -863,7 +871,7 @@ extern "C"
 THD* thd_tx_arbitrate(THD *requestor, THD* holder)
 {
  /* Should be different sessions. */
- DBUG_ASSERT(holder != requestor);
+  assert(holder != requestor);
 
  return(thd_tx_priority(requestor) == thd_tx_priority(holder)
 	? requestor
@@ -965,7 +973,7 @@ char *thd_security_context(THD *thd, char *buffer, size_t length,
     We have to copy the new string to the destination buffer because the string
     was reallocated to a larger buffer to be able to fit.
   */
-  DBUG_ASSERT(buffer != NULL);
+  assert(buffer != NULL);
   length= min(str.length(), length-1);
   memcpy(buffer, str.c_ptr_quick(), length);
   /* Make sure that the new string is null terminated */
@@ -1170,7 +1178,7 @@ THD::THD(bool enable_plugins)
   enable_slow_log= 0;
   commit_error= CE_NONE;
   durability_property= HA_REGULAR_DURABILITY;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   dbug_sentry=THD_SENTRY_MAGIC;
 #endif
 #ifndef EMBEDDED_LIBRARY
@@ -1183,6 +1191,8 @@ THD::THD(bool enable_plugins)
   peer_port= 0;					// For SHOW PROCESSLIST
   get_transaction()->m_flags.enabled= true;
   active_vio = 0;
+  m_SSL = NULL;
+  my_atomic_store32(&m_safe_to_display, 0);
   mysql_mutex_init(key_LOCK_thd_data, &LOCK_thd_data, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thd_query, &LOCK_thd_query, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thd_sysvar, &LOCK_thd_sysvar, MY_MUTEX_INIT_FAST);
@@ -1254,7 +1264,7 @@ THD::THD(bool enable_plugins)
 
 void THD::set_transaction(Transaction_ctx *transaction_ctx)
 {
-  DBUG_ASSERT(is_attachable_ro_transaction_active());
+  assert(is_attachable_ro_transaction_active());
 
   delete m_transaction.release();
   m_transaction.reset(transaction_ctx);
@@ -1294,7 +1304,7 @@ bool THD::handle_condition(uint sql_errno,
 
 Internal_error_handler *THD::pop_internal_handler()
 {
-  DBUG_ASSERT(m_internal_handler != NULL);
+  assert(m_internal_handler != NULL);
   Internal_error_handler *popped_handler= m_internal_handler;
   m_internal_handler= m_internal_handler->m_prev_internal_handler;
   return popped_handler;
@@ -1417,7 +1427,7 @@ Sql_condition* THD::raise_condition(uint sql_errno,
       (level == Sql_condition::SL_NOTE))
     DBUG_RETURN(NULL);
 
-  DBUG_ASSERT(sql_errno != 0);
+  assert(sql_errno != 0);
   if (sql_errno == 0) /* Safety in release build */
     sql_errno= ER_UNKNOWN_ERROR;
   if (msg == NULL)
@@ -1583,6 +1593,8 @@ void THD::init(void)
   owned_gtid.clear();
   owned_sid.clear();
   owned_gtid.dbug_print(NULL, "set owned_gtid (clear) in THD::init");
+
+  rpl_thd_ctx.dependency_tracker_ctx().set_last_session_sequence_number(0);
 }
 
 
@@ -1611,7 +1623,7 @@ void THD::init_for_queries(Relay_log_info *rli)
     }
     rli_slave= rli;
 
-    DBUG_ASSERT(rli_slave->info_thd == this && slave_thread);
+    assert(rli_slave->info_thd == this && slave_thread);
   }
 #endif
 }
@@ -1666,24 +1678,24 @@ void THD::cleanup_connection(void)
   profiling.cleanup();
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     /* DEBUG code only (begin) */
     bool check_cleanup= FALSE;
     DBUG_EXECUTE_IF("debug_test_cleanup_connection", check_cleanup= TRUE;);
     if(check_cleanup)
     {
       /* isolation level should be default */
-      DBUG_ASSERT(variables.tx_isolation == ISO_REPEATABLE_READ);
+      assert(variables.tx_isolation == ISO_REPEATABLE_READ);
       /* check autocommit is ON by default */
-      DBUG_ASSERT(server_status == SERVER_STATUS_AUTOCOMMIT);
+      assert(server_status == SERVER_STATUS_AUTOCOMMIT);
       /* check prepared stmts are cleaned up */
-      DBUG_ASSERT(prepared_stmt_count == 0);
+      assert(prepared_stmt_count == 0);
       /* check diagnostic area is cleaned up */
-      DBUG_ASSERT(get_stmt_da()->status() == Diagnostics_area::DA_EMPTY);
+      assert(get_stmt_da()->status() == Diagnostics_area::DA_EMPTY);
       /* check if temp tables are deleted */
-      DBUG_ASSERT(temporary_tables == NULL);
+      assert(temporary_tables == NULL);
       /* check if tables are unlocked */
-      DBUG_ASSERT(locked_tables_list.locked_tables() == NULL);
+      assert(locked_tables_list.locked_tables() == NULL);
     }
     /* DEBUG code only (end) */
 #endif
@@ -1701,7 +1713,7 @@ void THD::cleanup(void)
   XID_STATE *xs= trn_ctx->xid_state();
 
   DBUG_ENTER("THD::cleanup");
-  DBUG_ASSERT(cleanup_done == 0);
+  assert(cleanup_done == 0);
   DEBUG_SYNC(this, "thd_cleanup_start");
 
   killed= KILL_CONNECTION;
@@ -1719,7 +1731,7 @@ void THD::cleanup(void)
   locked_tables_list.unlock_locked_tables(this);
   mysql_ha_cleanup(this);
 
-  DBUG_ASSERT(open_tables == NULL);
+  assert(open_tables == NULL);
   /*
     If the thread was in the middle of an ongoing transaction (rolled
     back a few lines above) or under LOCK TABLES (unlocked the tables
@@ -1739,7 +1751,7 @@ void THD::cleanup(void)
   release_all_locking_service_locks(this);
 
   /* All metadata locks must have been released by now. */
-  DBUG_ASSERT(!mdl_context.has_locks());
+  assert(!mdl_context.has_locks());
 
   /* Protects user_vars. */
   mysql_mutex_lock(&LOCK_thd_data);
@@ -1782,21 +1794,10 @@ void THD::cleanup(void)
  */
 void THD::release_resources()
 {
-  DBUG_ASSERT(m_release_resources_done == false);
+  assert(m_release_resources_done == false);
 
   Global_THD_manager::get_instance()->release_thread_id(m_thread_id);
 
-  mysql_mutex_lock(&LOCK_status);
-  add_to_status(&global_status_var, &status_var, false);
-  /*
-    Status queries after this point should not aggregate THD::status_var
-    since the values has been added to global_status_var.
-    The status values are not reset so that they can still be read
-    by performance schema.
-  */
-  status_var_aggregated= true;
-  mysql_mutex_unlock(&LOCK_status);
-
   /* Ensure that no one is using THD */
   mysql_mutex_lock(&LOCK_thd_data);
   mysql_mutex_lock(&LOCK_query_plan);
@@ -1811,7 +1812,7 @@ void THD::release_resources()
 #endif
 
   /* modification plan for UPDATE/DELETE should be freed. */
-  DBUG_ASSERT(query_plan.get_modification_plan() == NULL);
+  assert(query_plan.get_modification_plan() == NULL);
   mysql_mutex_unlock(&LOCK_query_plan);
   mysql_mutex_unlock(&LOCK_thd_data);
   mysql_mutex_lock(&LOCK_thd_query);
@@ -1835,7 +1836,7 @@ void THD::release_resources()
 
   plugin_thdvar_cleanup(this, m_enable_plugins);
 
-  DBUG_ASSERT(timer == NULL);
+  assert(timer == NULL);
 
   if (timer_cache)
     thd_timer_destroy(timer_cache);
@@ -1852,6 +1853,18 @@ void THD::release_resources()
 
   if (current_thd == this)
     restore_globals();
+
+  mysql_mutex_lock(&LOCK_status);
+  add_to_status(&global_status_var, &status_var, false);
+  /*
+    Status queries after this point should not aggregate THD::status_var
+    since the values has been added to global_status_var.
+    The status values are not reset so that they can still be read
+    by performance schema.
+  */
+  status_var_aggregated= true;
+  mysql_mutex_unlock(&LOCK_status);
+
   m_release_resources_done= true;
 }
 
@@ -1873,7 +1886,7 @@ THD::~THD()
   mysql_mutex_lock(&LOCK_thd_query);
   mysql_mutex_unlock(&LOCK_thd_query);
 
-  DBUG_ASSERT(!m_attachable_trx);
+  assert(!m_attachable_trx);
 
   my_free(const_cast<char*>(m_db.str));
   m_db= NULL_CSTR;
@@ -1884,7 +1897,7 @@ THD::~THD()
   mysql_mutex_destroy(&LOCK_thd_sysvar);
   mysql_mutex_destroy(&LOCK_current_cond);
   mysql_cond_destroy(&COND_thr_lock);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   dbug_sentry= THD_SENTRY_GONE;
 #endif
 
@@ -1896,11 +1909,17 @@ THD::~THD()
     variables.gtid_next_list.gtid_set= NULL;
     variables.gtid_next_list.is_non_null= false;
 #else
-    DBUG_ASSERT(0);
+    assert(0);
 #endif
   }
   if (rli_slave)
     rli_slave->cleanup_after_session();
+  /*
+    As slaves can be added in one mysql command like COM_REGISTER_SLAVE
+    but then need to be removed on error scenarios, we call this method
+    here.
+  */
+  unregister_slave(this, true, true);
 #endif
 
   free_root(&main_mem_root, MYF(0));
@@ -2059,7 +2078,10 @@ void THD::awake(THD::killed_state state_to_set)
     ha_kill_connection(this);
 
   if (state_to_set == THD::KILL_TIMEOUT)
+  {
+    assert(!status_var_aggregated);
     status_var.max_execution_time_exceeded++;
+  }
 
 
   /* Broadcast a condition to kick the target if it is waiting on it. */
@@ -2096,8 +2118,8 @@ void THD::awake(THD::killed_state state_to_set)
                       {
                       const char act[]=
                       "now signal dump_thread_signal wait_for go_dump_thread";
-                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                         STRING_WITH_LEN(act)));
+                      assert(!debug_sync_set_action(current_thd,
+                                                    STRING_WITH_LEN(act)));
                       };);
       mysql_mutex_lock(current_mutex);
       mysql_cond_broadcast(current_cond);
@@ -2182,7 +2204,7 @@ bool THD::store_globals()
     Assert that thread_stack is initialized: it's necessary to be able
     to track stack overrun.
   */
-  DBUG_ASSERT(thread_stack);
+  assert(thread_stack);
 
   if (my_thread_set_THR_THD(this) ||
       my_thread_set_THR_MALLOC(&mem_root))
@@ -2195,7 +2217,7 @@ bool THD::store_globals()
     another thread to the same TLS reference.
   */
   is_killable= true;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Let mysqld define the thread id (not mysys)
     This allows us to move THD to different threads if needed.
@@ -2217,7 +2239,7 @@ void THD::restore_globals()
     Assert that thread_stack is initialized: it's necessary to be able
     to track stack overrun.
   */
-  DBUG_ASSERT(thread_stack);
+  assert(thread_stack);
 
   /* Undocking the thread specific data. */
   my_thread_set_THR_THD(NULL);
@@ -2487,7 +2509,7 @@ void THD::add_changed_table(TABLE *table)
 {
   DBUG_ENTER("THD::add_changed_table(table)");
 
-  DBUG_ASSERT(in_multi_stmt_transaction_mode() && table->file->has_transactions());
+  assert(in_multi_stmt_transaction_mode() && table->file->has_transactions());
   add_changed_table(table->s->table_cache_key.str,
                     (long) table->s->table_cache_key.length);
   DBUG_VOID_RETURN;
@@ -2546,7 +2568,7 @@ int THD::send_explain_fields(Query_result *result)
 enum_vio_type THD::get_vio_type()
 {
 #ifndef EMBEDDED_LIBRARY
-  DBUG_ENTER("shutdown_active_vio");
+  DBUG_ENTER("THD::get_vio_type");
   DBUG_RETURN(get_protocol()->connection_type());
 #else
   return NO_VIO_TYPE;
@@ -2562,6 +2584,7 @@ void THD::shutdown_active_vio()
   {
     vio_shutdown(active_vio);
     active_vio = 0;
+    m_SSL = NULL;
   }
 #endif
   DBUG_VOID_RETURN;
@@ -3105,9 +3128,9 @@ bool Query_result_export::send_data(List<Item> &items)
           so we have to use mbmaxlenlen == 2 here, which is only true
           for gb18030 currently.
         */
-        DBUG_ASSERT(character_set_client->mbmaxlen == 2 ||
-                    my_mbmaxlenlen(character_set_client) == 2 ||
-                    !character_set_client->escape_with_backslash_is_dangerous);
+        assert(character_set_client->mbmaxlen == 2 ||
+               my_mbmaxlenlen(character_set_client) == 2 ||
+               !character_set_client->escape_with_backslash_is_dangerous);
 	for (start=pos=(char*) res->ptr(),end=pos+used_length ;
 	     pos != end ;
 	     pos++)
@@ -3155,7 +3178,7 @@ bool Query_result_export::send_data(List<Item> &items)
             mbcharlen is equal to 2, because there are no
             character sets with mbmaxlen longer than 2
             and with escape_with_backslash_is_dangerous set.
-            DBUG_ASSERT before the loop makes that sure.
+            assert before the loop makes that sure.
 
             But gb18030 is an exception. First of all, 2-byte codes
             would be affected by the issue above without doubt.
@@ -3185,10 +3208,10 @@ bool Query_result_export::send_data(List<Item> &items)
             an ASCII char when we read it, which is correct.
           */
 
-          DBUG_ASSERT(in_escapable_4_bytes >= 0);
+          assert(in_escapable_4_bytes >= 0);
           if (in_escapable_4_bytes > 0)
           {
-            DBUG_ASSERT(check_following_byte);
+            assert(check_following_byte);
             /* We should escape or not escape all the 4 bytes. */
             need_escape= escape_4_bytes;
           }
@@ -3251,7 +3274,7 @@ bool Query_result_export::send_data(List<Item> &items)
 	}
 
         /* Assert that no escape mode is active here */
-        DBUG_ASSERT(in_escapable_4_bytes == 0);
+        assert(in_escapable_4_bytes == 0);
 
 	if (my_b_write(&cache,(uchar*) start,(uint) (pos-start)))
 	  goto err;
@@ -3406,7 +3429,7 @@ void Query_arena::set_query_arena(Query_arena *set)
 
 void Query_arena::cleanup_stmt()
 {
-  DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented");
+  assert(! "Query_arena::cleanup_stmt() not implemented");
 }
 
 
@@ -3428,11 +3451,11 @@ void THD::end_statement()
 void THD::set_n_backup_active_arena(Query_arena *set, Query_arena *backup)
 {
   DBUG_ENTER("THD::set_n_backup_active_arena");
-  DBUG_ASSERT(backup->is_backup_arena == FALSE);
+  assert(backup->is_backup_arena == FALSE);
 
   backup->set_query_arena(this);
   set_query_arena(set);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   backup->is_backup_arena= TRUE;
 #endif
   DBUG_VOID_RETURN;
@@ -3442,10 +3465,10 @@ void THD::set_n_backup_active_arena(Query_arena *set, Query_arena *backup)
 void THD::restore_active_arena(Query_arena *set, Query_arena *backup)
 {
   DBUG_ENTER("THD::restore_active_arena");
-  DBUG_ASSERT(backup->is_backup_arena);
+  assert(backup->is_backup_arena);
   set->set_query_arena(this);
   set_query_arena(backup);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   backup->is_backup_arena= FALSE;
 #endif
   DBUG_VOID_RETURN;
@@ -3575,7 +3598,7 @@ void Prepared_statement_map::erase(Prepared_statement *statement)
 
   my_hash_delete(&st_hash, (uchar *) statement);
   mysql_mutex_lock(&LOCK_prepared_stmt_count);
-  DBUG_ASSERT(prepared_stmt_count > 0);
+  assert(prepared_stmt_count > 0);
   prepared_stmt_count--;
   mysql_mutex_unlock(&LOCK_prepared_stmt_count);
 }
@@ -3600,7 +3623,7 @@ void Prepared_statement_map::reset()
     }
 #endif
     mysql_mutex_lock(&LOCK_prepared_stmt_count);
-    DBUG_ASSERT(prepared_stmt_count >= st_hash.records);
+    assert(prepared_stmt_count >= st_hash.records);
     prepared_stmt_count-= st_hash.records;
     mysql_mutex_unlock(&LOCK_prepared_stmt_count);
   }
@@ -3616,7 +3639,7 @@ Prepared_statement_map::~Prepared_statement_map()
     We do not want to grab the global LOCK_prepared_stmt_count mutex here.
     reset() should already have been called to maintain prepared_stmt_count.
    */
-  DBUG_ASSERT(st_hash.records == 0);
+  assert(st_hash.records == 0);
 
   my_hash_free(&names_hash);
   my_hash_free(&st_hash);
@@ -3737,11 +3760,11 @@ void THD::restore_backup_open_tables_state(Open_tables_backup *backup)
     Before we will throw away current open tables state we want
     to be sure that it was properly cleaned up.
   */
-  DBUG_ASSERT(open_tables == 0 && temporary_tables == 0 &&
-              derived_tables == 0 &&
-              lock == 0 &&
-              locked_tables_mode == LTM_NONE &&
-              get_reprepare_observer() == NULL);
+  assert(open_tables == 0 && temporary_tables == 0 &&
+         derived_tables == 0 &&
+         lock == 0 &&
+         locked_tables_mode == LTM_NONE &&
+         get_reprepare_observer() == NULL);
 
   set_open_tables_state(backup);
   DBUG_VOID_RETURN;
@@ -3750,7 +3773,7 @@ void THD::restore_backup_open_tables_state(Open_tables_backup *backup)
 
 void THD::begin_attachable_ro_transaction()
 {
-  DBUG_ASSERT(!m_attachable_trx);
+  assert(!m_attachable_trx);
 
   m_attachable_trx= new Attachable_trx(this);
 }
@@ -3758,7 +3781,7 @@ void THD::begin_attachable_ro_transaction()
 
 void THD::end_attachable_transaction()
 {
-  DBUG_ASSERT(m_attachable_trx);
+  assert(m_attachable_trx);
 
   delete m_attachable_trx;
   m_attachable_trx= NULL;
@@ -3835,7 +3858,7 @@ extern "C" const struct charset_info_st *thd_charset(MYSQL_THD thd)
 */
 extern "C" LEX_CSTRING thd_query_unsafe(MYSQL_THD thd)
 {
-  DBUG_ASSERT(current_thd == thd);
+  assert(current_thd == thd);
   return thd->query();
 }
 
@@ -3874,6 +3897,16 @@ extern "C" int thd_non_transactional_update(const MYSQL_THD thd)
     Transaction_ctx::SESSION);
 }
 
+extern "C" int thd_has_active_attachable_trx(const MYSQL_THD thd)
+{
+  return thd->is_attachable_transaction_active();
+}
+
+extern "C" int thd_is_operating_gtid_table_implicitly(const MYSQL_THD thd)
+{
+  return thd->is_operating_gtid_table_implicitly;
+}
+
 extern "C" int thd_binlog_format(const MYSQL_THD thd)
 {
   if (mysql_bin_log.is_open() && (thd->variables.option_bits & OPTION_BIN_LOG))
@@ -3885,7 +3918,7 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
 extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, int all)
 {
   DBUG_ENTER("thd_mark_transaction_to_rollback");
-  DBUG_ASSERT(thd);
+  assert(thd);
   /*
     The parameter "all" has type int since the function is defined
     in plugin.h. The corresponding parameter in the call below has
@@ -4064,7 +4097,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
    */
   if (rpl_master_erroneous_autoinc(this))
   {
-    DBUG_ASSERT(backup->auto_inc_intervals_forced.nb_elements() == 0);
+    assert(backup->auto_inc_intervals_forced.nb_elements() == 0);
     auto_inc_intervals_forced.swap(&backup->auto_inc_intervals_forced);
   }
 #endif
@@ -4126,7 +4159,7 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
   if (rpl_master_erroneous_autoinc(this))
   {
     backup->auto_inc_intervals_forced.swap(&auto_inc_intervals_forced);
-    DBUG_ASSERT(backup->auto_inc_intervals_forced.nb_elements() == 0);
+    assert(backup->auto_inc_intervals_forced.nb_elements() == 0);
   }
 #endif
 
@@ -4218,6 +4251,7 @@ void THD::inc_examined_row_count(ha_rows count)
 
 void THD::inc_status_created_tmp_disk_tables()
 {
+  assert(!status_var_aggregated);
   status_var.created_tmp_disk_tables++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_created_tmp_disk_tables)(m_statement_psi, 1);
@@ -4226,6 +4260,7 @@ void THD::inc_status_created_tmp_disk_tables()
 
 void THD::inc_status_created_tmp_tables()
 {
+  assert(!status_var_aggregated);
   status_var.created_tmp_tables++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_created_tmp_tables)(m_statement_psi, 1);
@@ -4234,6 +4269,7 @@ void THD::inc_status_created_tmp_tables()
 
 void THD::inc_status_select_full_join()
 {
+  assert(!status_var_aggregated);
   status_var.select_full_join_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_select_full_join)(m_statement_psi, 1);
@@ -4242,6 +4278,7 @@ void THD::inc_status_select_full_join()
 
 void THD::inc_status_select_full_range_join()
 {
+  assert(!status_var_aggregated);
   status_var.select_full_range_join_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_select_full_range_join)(m_statement_psi, 1);
@@ -4250,6 +4287,7 @@ void THD::inc_status_select_full_range_join()
 
 void THD::inc_status_select_range()
 {
+  assert(!status_var_aggregated);
   status_var.select_range_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_select_range)(m_statement_psi, 1);
@@ -4258,6 +4296,7 @@ void THD::inc_status_select_range()
 
 void THD::inc_status_select_range_check()
 {
+  assert(!status_var_aggregated);
   status_var.select_range_check_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_select_range_check)(m_statement_psi, 1);
@@ -4266,6 +4305,7 @@ void THD::inc_status_select_range_check()
 
 void THD::inc_status_select_scan()
 {
+  assert(!status_var_aggregated);
   status_var.select_scan_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_select_scan)(m_statement_psi, 1);
@@ -4274,6 +4314,7 @@ void THD::inc_status_select_scan()
 
 void THD::inc_status_sort_merge_passes()
 {
+  assert(!status_var_aggregated);
   status_var.filesort_merge_passes++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_sort_merge_passes)(m_statement_psi, 1);
@@ -4282,6 +4323,7 @@ void THD::inc_status_sort_merge_passes()
 
 void THD::inc_status_sort_range()
 {
+  assert(!status_var_aggregated);
   status_var.filesort_range_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_sort_range)(m_statement_psi, 1);
@@ -4299,6 +4341,7 @@ void THD::inc_status_sort_rows(ha_rows count)
 
 void THD::inc_status_sort_scan()
 {
+  assert(!status_var_aggregated);
   status_var.filesort_scan_count++;
 #ifdef HAVE_PSI_STATEMENT_INTERFACE
   PSI_STATEMENT_CALL(inc_statement_sort_scan)(m_statement_psi, 1);
@@ -4332,14 +4375,41 @@ void THD::set_command(enum enum_server_command command)
 
 void THD::set_query(const LEX_CSTRING& query_arg)
 {
-  DBUG_ASSERT(this == current_thd);
+  assert(this == current_thd);
   mysql_mutex_lock(&LOCK_thd_query);
   m_query_string= query_arg;
   mysql_mutex_unlock(&LOCK_thd_query);
+}
 
-#ifdef HAVE_PSI_THREAD_INTERFACE
-  PSI_THREAD_CALL(set_thread_info)(query_arg.str, query_arg.length);
-#endif
+
+/**
+  Set the rewritten query (with passwords obfuscated etc.) on the THD.
+  Wraps this in the LOCK_thd_query mutex to protect against race conditions
+  with SHOW PROCESSLIST inspecting that string.
+
+  This uses swap() and therefore "steals" the argument from the caller;
+  the caller MUST take care not to try to use its own string after calling
+  this function! This is an optimization for mysql_rewrite_query() so we
+  don't copy its temporary string (which may get very long, up to
+  @@max_allowed_packet).
+
+  Using this outside of mysql_rewrite_query() is almost certainly wrong;
+  please check with the runtime team!
+
+  @param query_arg  The rewritten query to use for slow/bin/general logging.
+                    The value will be released in the caller and MUST NOT
+                    be used there after calling this function.
+*/
+void THD::swap_rewritten_query(String& query_arg)
+{
+  assert(this == current_thd);
+
+  mysql_mutex_lock(&LOCK_thd_query);
+  m_rewritten_query.mem_free();
+  m_rewritten_query.swap(query_arg);
+  // The rewritten query should always be a valid C string, just in case.
+  (void) m_rewritten_query.c_ptr_safe();
+  mysql_mutex_unlock(&LOCK_thd_query);
 }
 
 
@@ -4493,7 +4563,7 @@ void THD::decrement_user_connections_counter()
 {
   DBUG_ENTER("THD::decrement_user_connections_counter");
 
-  DBUG_ASSERT(m_user_connect->connections > 0);
+  assert(m_user_connect->connections > 0);
   m_user_connect->connections--;
 
   DBUG_VOID_RETURN;
@@ -4556,7 +4626,7 @@ void THD::time_out_user_resource_limits()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void THD::Query_plan::assert_plan_is_locked_if_other() const
 {
   if (current_thd != thd)
@@ -4567,7 +4637,7 @@ void THD::Query_plan::assert_plan_is_locked_if_other() const
 void THD::Query_plan::set_query_plan(enum_sql_command sql_cmd,
                                      LEX *lex_arg, bool ps)
 {
-  DBUG_ASSERT(current_thd == thd);
+  assert(current_thd == thd);
 
   // No need to grab mutex for repeated (SQLCOM_END, NULL, false).
   if (sql_command == sql_cmd &&
@@ -4587,7 +4657,7 @@ void THD::Query_plan::set_query_plan(enum_sql_command sql_cmd,
 
 void THD::Query_plan::set_modification_plan(Modification_plan *plan_arg)
 {
-  DBUG_ASSERT(current_thd == thd);
+  assert(current_thd == thd);
   mysql_mutex_assert_owner(&thd->LOCK_query_plan);
   modification_plan= plan_arg;
 }
@@ -4688,7 +4758,7 @@ bool THD::send_result_set_row(List<Item> *row_items)
 void THD::send_statement_status()
 {
   DBUG_ENTER("send_statement_status");
-  DBUG_ASSERT(!get_stmt_da()->is_sent());
+  assert(!get_stmt_da()->is_sent());
   bool error= false;
   Diagnostics_area *da= get_stmt_da();
 
@@ -4716,7 +4786,7 @@ void THD::send_statement_status()
       break;
     case Diagnostics_area::DA_EMPTY:
     default:
-      DBUG_ASSERT(0);
+      assert(0);
           error= m_protocol->send_ok(server_status, 0, 0, 0, NULL);
           break;
   }
@@ -4766,14 +4836,26 @@ void THD::rpl_detach_engine_ha_data()
   Relay_log_info *rli=
     is_binlog_applier() ? rli_fake : (slave_thread ? rli_slave : NULL);
 
-  DBUG_ASSERT(!rli_fake  || !rli_fake-> is_engine_ha_data_detached);
-  DBUG_ASSERT(!rli_slave || !rli_slave->is_engine_ha_data_detached);
+  assert(!rli_fake  || !rli_fake-> is_engine_ha_data_detached);
+  assert(!rli_slave || !rli_slave->is_engine_ha_data_detached);
 
   if (rli)
     rli->detach_engine_ha_data(this);
 #endif
 };
 
+void THD::rpl_reattach_engine_ha_data()
+{
+#ifdef HAVE_REPLICATION
+  Relay_log_info *rli =
+      is_binlog_applier() ? rli_fake : (slave_thread ? rli_slave : NULL);
+
+  assert(!rli_fake || !rli_fake->is_engine_ha_data_detached);
+  assert(!rli_slave || !rli_slave->is_engine_ha_data_detached);
+
+  if (rli) rli->reattach_engine_ha_data(this);
+#endif
+}
 
 bool THD::rpl_unflag_detached_engine_ha_data()
 {
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 2210a3845eb6..fc34020e1947 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -51,6 +58,8 @@
 #include <memory>
 #include "mysql/thread_type.h"
 
+#include "violite.h"                       /* SSL_handle */
+
 class Reprepare_observer;
 class sp_cache;
 class Rows_log_event;
@@ -211,7 +220,7 @@ class CSET_STRING
   CSET_STRING(const char *str_arg, size_t length_arg, const CHARSET_INFO *cs_arg) :
   cs(cs_arg)
   {
-    DBUG_ASSERT(cs_arg != NULL);
+    assert(cs_arg != NULL);
     string.str= str_arg;
     string.length= length_arg;
   }
@@ -403,7 +412,7 @@ class Time_zone;
 #define THD_SENTRY_MAGIC 0xfeedd1ff
 #define THD_SENTRY_GONE  0xdeadbeef
 
-#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
+#define THD_CHECK_SENTRY(thd) assert(thd->dbug_sentry == THD_SENTRY_MAGIC)
 
 typedef ulonglong sql_mode_t;
 
@@ -560,6 +569,11 @@ typedef struct system_variables
   my_bool session_track_schema;
   my_bool session_track_state_change;
   ulong   session_track_transaction_info;
+  /**
+    Used for the verbosity of SHOW CREATE TABLE. Currently used for displaying
+    the row format in the output even if the table uses default row format.
+  */
+  my_bool show_create_table_verbosity;
   /**
     Compatibility option to mark the pre MySQL-5.6.4 temporals columns using
     the old format using comments for SHOW CREATE TABLE and in I_S.COLUMNS
@@ -700,7 +714,7 @@ mysqld_collation_get_by_name(const char *name,
 #ifdef MYSQL_SERVER
 
 /* The following macro is to make init of Query_arena simpler */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #define INIT_ARENA_DBUG_INFO is_backup_arena= 0; is_reprepared= FALSE;
 #else
 #define INIT_ARENA_DBUG_INFO
@@ -715,7 +729,7 @@ class Query_arena
   */
   Item *free_list;
   MEM_ROOT *mem_root;                   // Pointer to current memroot
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   bool is_backup_arena; /* True if this arena is used for backup. */
   bool is_reprepared;
 #endif
@@ -778,6 +792,13 @@ class Query_arena
   { return strdup_root(mem_root,str); }
   inline char *strmake(const char *str, size_t size)
   { return strmake_root(mem_root,str,size); }
+  inline LEX_CSTRING strmake(LEX_CSTRING str)
+  {
+    LEX_CSTRING ret;
+    ret.str= strmake(str.str, str.length);
+    ret.length= ret.str ? str.length : 0;
+    return ret;
+  }
   inline void *memdup(const void *str, size_t size)
   { return memdup_root(mem_root,str,size); }
 
@@ -888,7 +909,7 @@ enum enum_locked_tables_mode
   LTM_PRELOCKED_UNDER_LOCK_TABLES
 };
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Getter for the enum enum_locked_tables_mode
   @param locked_tables_mode enum for types of locked tables mode
@@ -1185,6 +1206,14 @@ class Dummy_error_handler : public Internal_error_handler
   }
 };
 
+class Key_length_error_handler : public Internal_error_handler {
+ public:
+  virtual bool handle_condition(THD *, uint sql_errno, const char *,
+                                Sql_condition::enum_severity_level *,
+                                const char *) {
+    return (sql_errno == ER_TOO_LONG_KEY);
+  }
+};
 
 /**
   This class is an internal error handler implementation for
@@ -1439,16 +1468,16 @@ class THD :public MDL_context_owner,
 {
 private:
   inline bool is_stmt_prepare() const
-  { DBUG_ASSERT(0); return Query_arena::is_stmt_prepare(); }
+  { assert(0); return Query_arena::is_stmt_prepare(); }
 
   inline bool is_stmt_prepare_or_first_sp_execute() const
-  { DBUG_ASSERT(0); return Query_arena::is_stmt_prepare_or_first_sp_execute(); }
+  { assert(0); return Query_arena::is_stmt_prepare_or_first_sp_execute(); }
 
   inline bool is_stmt_prepare_or_first_stmt_execute() const
-  { DBUG_ASSERT(0); return Query_arena::is_stmt_prepare_or_first_stmt_execute(); }
+  { assert(0); return Query_arena::is_stmt_prepare_or_first_stmt_execute(); }
 
   inline bool is_conventional() const
-  { DBUG_ASSERT(0); return Query_arena::is_conventional(); }
+  { assert(0); return Query_arena::is_conventional(); }
 
 public:
   MDL_context mdl_context;
@@ -1493,7 +1522,7 @@ class THD :public MDL_context_owner,
   */
   LEX_CSTRING m_query_string;
   String m_normalized_query;
-
+  volatile int32 m_safe_to_display;
   /**
     Currently selected catalog.
   */
@@ -1513,8 +1542,6 @@ class THD :public MDL_context_owner,
   */
   LEX_CSTRING m_db;
 
-public:
-
   /**
     In some cases, we may want to modify the query (i.e. replace
     passwords with their hashes before logging the statement etc.).
@@ -1529,8 +1556,17 @@ class THD :public MDL_context_owner,
     may follow at a later date, both pre- and post parsing of the query.
     Rewriting of binloggable statements must preserve all pertinent
     information.
+
+    Similar restrictions as for m_query_string (see there) hold for locking:
+    - Value may only be (re)set from owning thread (current_thd)
+    - Value must be modified using (reset|swap)_rewritten_query().
+      Doing so will protect the update with LOCK_thd_query.
+    - The owner (current_thd) may read the value without holding the lock.
+    - Other threads may read the value, but must hold LOCK_thd_query to do so.
   */
-  String      rewritten_query;
+  String      m_rewritten_query;
+
+public:
 
   /* Used to execute base64 coded binlog events in MySQL server */
   Relay_log_info* rli_fake;
@@ -1551,6 +1587,12 @@ class THD :public MDL_context_owner,
   */
   void rpl_detach_engine_ha_data();
 
+  /**
+    When the thread is a binlog or slave applier it reattaches the engine
+    ha_data associated with it and memorizes the fact of that.
+  */
+  void rpl_reattach_engine_ha_data();
+
   /**
     @return true   when the current binlog (rli_fake) or slave (rli_slave)
                    applier thread has detached the engine ha_data,
@@ -1639,6 +1681,7 @@ class THD :public MDL_context_owner,
   */
   void save_current_query_costs()
   {
+    assert(!status_var_aggregated);
     status_var.last_query_cost= m_current_query_cost;
     status_var.last_query_partial_plans= m_current_query_partial_plans;
   }
@@ -1745,6 +1788,22 @@ class THD :public MDL_context_owner,
     return m_protocol;
   }
 
+  SSL_handle get_ssl() const
+  {
+#ifndef NDEBUG
+    if (current_thd != this)
+    {
+      /*
+        When inspecting this thread from monitoring,
+        the monitoring thread MUST lock LOCK_thd_data,
+        to be allowed to safely inspect SSL status variables.
+      */
+      mysql_mutex_assert_owner(&LOCK_thd_data);
+    }
+#endif
+    return m_SSL;
+  }
+
   /**
     Asserts that the protocol is of type text or binary and then
     returns the m_protocol casted to Protocol_classic. This method
@@ -1752,8 +1811,8 @@ class THD :public MDL_context_owner,
   */
   Protocol_classic *get_protocol_classic() const
   {
-    DBUG_ASSERT(m_protocol->type() == Protocol::PROTOCOL_TEXT ||
-                m_protocol->type() == Protocol::PROTOCOL_BINARY);
+    assert(m_protocol->type() == Protocol::PROTOCOL_TEXT ||
+           m_protocol->type() == Protocol::PROTOCOL_BINARY);
 
     return (Protocol_classic *) m_protocol;
   }
@@ -1765,6 +1824,17 @@ class THD :public MDL_context_owner,
 
 private:
   Protocol *m_protocol;           // Current protocol
+  /**
+    SSL data attached to this connection.
+    This is an opaque pointer,
+    When building with SSL, this pointer is non NULL
+    only if the connection is using SSL.
+    When building without SSL, this pointer is always NULL.
+    The SSL data can be inspected to read per thread
+    status variables,
+    and this can be inspected while the thread is running.
+  */
+  SSL_handle m_SSL;
 
 public:
   /**
@@ -1790,7 +1860,7 @@ class THD :public MDL_context_owner,
   public:
     /// Asserts that current_thd has locked this plan, if it does not own it.
     void assert_plan_is_locked_if_other() const
-#ifdef DBUG_OFF
+#ifdef NDEBUG
     {}
 #else
     ;
@@ -1875,7 +1945,7 @@ class THD :public MDL_context_owner,
     chapter 'Miscellaneous functions', for functions GET_LOCK, RELEASE_LOCK.
   */
   HASH ull_hash;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   uint dbug_sentry; // watch out for memory corruption
 #endif
   bool is_killable;
@@ -2018,8 +2088,8 @@ class THD :public MDL_context_owner,
     format.
    */
   int is_current_stmt_binlog_format_row() const {
-    DBUG_ASSERT(current_stmt_binlog_format == BINLOG_FORMAT_STMT ||
-                current_stmt_binlog_format == BINLOG_FORMAT_ROW);
+    assert(current_stmt_binlog_format == BINLOG_FORMAT_STMT ||
+           current_stmt_binlog_format == BINLOG_FORMAT_ROW);
     return current_stmt_binlog_format == BINLOG_FORMAT_ROW;
   }
 
@@ -2053,13 +2123,13 @@ class THD :public MDL_context_owner,
 
   inline void clear_binlog_local_stmt_filter()
   {
-    DBUG_ASSERT(m_binlog_filter_state == BINLOG_FILTER_UNKNOWN);
+    assert(m_binlog_filter_state == BINLOG_FILTER_UNKNOWN);
     m_binlog_filter_state= BINLOG_FILTER_CLEAR;
   }
 
   inline void set_binlog_local_stmt_filter()
   {
-    DBUG_ASSERT(m_binlog_filter_state == BINLOG_FILTER_UNKNOWN);
+    assert(m_binlog_filter_state == BINLOG_FILTER_UNKNOWN);
     m_binlog_filter_state= BINLOG_FILTER_SET;
   }
 
@@ -2144,6 +2214,8 @@ class THD :public MDL_context_owner,
   NET     net;                          // client connection descriptor
   String  packet;                       // dynamic buffer for network I/O
 public:
+  const NET *get_net() const { return &net; }
+
   void set_skip_readonly_check()
   {
     skip_readonly_check= true;
@@ -2754,7 +2826,7 @@ class THD :public MDL_context_owner,
   void set_trans_pos(const char *file, my_off_t pos)
   {
     DBUG_ENTER("THD::set_trans_pos");
-    DBUG_ASSERT(((file == 0) && (pos == 0)) || ((file != 0) && (pos != 0)));
+    assert(((file == 0) && (pos == 0)) || ((file != 0) && (pos != 0)));
     if (file)
     {
       DBUG_PRINT("enter", ("file: %s, pos: %llu", file, pos));
@@ -2762,7 +2834,7 @@ class THD :public MDL_context_owner,
       m_trans_log_file= file + dirname_length(file);
       if (!m_trans_fixed_log_file)
         m_trans_fixed_log_file= (char*) alloc_root(&main_mem_root, FN_REFLEN+1);
-      DBUG_ASSERT(strlen(m_trans_log_file) <= FN_REFLEN);
+      assert(strlen(m_trans_log_file) <= FN_REFLEN);
       strcpy(m_trans_fixed_log_file, m_trans_log_file);
     }
     else
@@ -2815,6 +2887,7 @@ class THD :public MDL_context_owner,
   {
     CE_NONE= 0,
     CE_FLUSH_ERROR,
+    CE_FLUSH_GNO_EXHAUSTED_ERROR,
     CE_SYNC_ERROR,
     CE_COMMIT_ERROR,
     CE_ERROR_COUNT
@@ -3035,10 +3108,22 @@ class THD :public MDL_context_owner,
     mysql_mutex_unlock(&LOCK_thd_data);
   }
 
+  inline void set_ssl(Vio* vio)
+  {
+#ifdef HAVE_OPENSSL
+    mysql_mutex_lock(&LOCK_thd_data);
+    m_SSL = (SSL*) vio->ssl_arg;
+    mysql_mutex_unlock(&LOCK_thd_data);
+#else
+    m_SSL = NULL;
+#endif
+  }
+
   inline void clear_active_vio()
   {
     mysql_mutex_lock(&LOCK_thd_data);
     active_vio = 0;
+    m_SSL = NULL;
     mysql_mutex_unlock(&LOCK_thd_data);
   }
 
@@ -3414,7 +3499,7 @@ class THD :public MDL_context_owner,
   */
   inline void fatal_error()
   {
-    DBUG_ASSERT(get_stmt_da()->is_error() || killed);
+    assert(get_stmt_da()->is_error() || killed);
     is_fatal_error= 1;
     DBUG_PRINT("error",("Fatal error set"));
   }
@@ -3615,6 +3700,12 @@ class THD :public MDL_context_owner,
   /**
     @return true if there is an active attachable transaction.
   */
+  int is_attachable_transaction_active() const
+  { return m_attachable_trx != NULL; }
+
+  /**
+    @return true if there is an active attachable readonly transaction.
+  */
   bool is_attachable_ro_transaction_active() const
   { return m_attachable_trx != NULL && m_attachable_trx->is_read_only(); }
 
@@ -3638,7 +3729,7 @@ class THD :public MDL_context_owner,
       statement, remove the big comment below that, and remove the
       in_sub_stmt==0 condition from the following 'if'.
     */
-    /* DBUG_ASSERT(in_sub_stmt == 0); */
+    /* assert(in_sub_stmt == 0); */
     /*
       If in a stored/function trigger, the caller should already have done the
       change. We test in_sub_stmt to prevent introducing bugs where people
@@ -4003,7 +4094,7 @@ class THD :public MDL_context_owner,
 #ifdef HAVE_GTID_NEXT_LIST
       owned_gtid_set.clear();
 #else
-      DBUG_ASSERT(0);
+      assert(0);
 #endif
     }
     owned_gtid.clear();
@@ -4275,7 +4366,7 @@ class THD :public MDL_context_owner,
   */
   const LEX_CSTRING &query() const
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (current_thd != this)
       mysql_mutex_assert_owner(&LOCK_thd_query);
 #endif
@@ -4301,6 +4392,39 @@ class THD :public MDL_context_owner,
     return m_normalized_query;
   }
 
+  /**
+    Set query to be displayed in performance schema (threads table etc.).Also
+    mark the query safe to display for information_schema.process_list.
+  */
+  void set_query_for_display(const char *query_arg, size_t query_length_arg) {
+    // Set in pfs events statements table
+    MYSQL_SET_STATEMENT_TEXT(m_statement_psi, query_arg, query_length_arg);
+#ifdef HAVE_PSI_THREAD_INTERFACE
+    // Set in pfs threads table
+    PSI_THREAD_CALL(set_thread_info)(query_arg, query_length_arg);
+#endif
+    set_safe_display(true);
+  }
+
+  /**
+    Reset query string to be displayed in PFS. Also reset the safety flag
+    for information_schema.process_list for next query.
+  */
+  void reset_query_for_display() {
+    set_query_for_display(NULL, 0);
+    my_atomic_store32(&m_safe_to_display, 0);
+  }
+
+  /** Set if the query string to be safe to display.
+  @param[in]  safe  if it is safe to display query string */
+  void set_safe_display(bool safe) {
+    int32 value = safe ? 1 : 0;
+    my_atomic_store32(&m_safe_to_display, value);
+  }
+
+  /** @return true, if safe to display the query string. */
+  int32 safe_to_display() { return my_atomic_load32(&m_safe_to_display);}
+
   /**
     Assign a new value to thd->m_query_string.
     Protected with the LOCK_thd_query mutex.
@@ -4311,7 +4435,52 @@ class THD :public MDL_context_owner,
     set_query(tmp);
   }
   void set_query(const LEX_CSTRING& query_arg);
-  void reset_query() { set_query(LEX_CSTRING()); }
+  void reset_query() {
+    set_query(LEX_CSTRING());
+  }
+
+  /**
+    Set the rewritten query (with passwords obfuscated etc.) on the THD.
+    Wraps this in the LOCK_thd_query mutex to protect against race conditions
+    with SHOW PROCESSLIST inspecting that string.
+
+    This uses swap() and therefore "steals" the argument from the caller;
+    the caller MUST take care not to try to use its own string after calling
+    this function! This is an optimization for mysql_rewrite_query() so we
+    don't copy its temporary string (which may get very long, up to
+    @@max_allowed_packet).
+
+    Using this outside of mysql_rewrite_query() is almost certainly wrong;
+    please check with the runtime team!
+
+    @param query_arg  The rewritten query to use for slow/bin/general logging.
+                      The value will be released in the caller and MUST NOT
+                      be used there after calling this function.
+  */
+  void swap_rewritten_query(String& query_arg);
+
+  /**
+    Get the rewritten query (with passwords obfuscated etc.) from the THD.
+    If done from a different thread (from the one that the rewritten_query
+    is set on), the caller must hold LOCK_thd_query while calling this!
+  */
+  const String &rewritten_query() const {
+#ifndef NDEBUG
+    if (current_thd != this)
+      mysql_mutex_assert_owner(&LOCK_thd_query);
+#endif
+    return m_rewritten_query;
+  }
+
+  /**
+    Reset thd->rewritten_query. Protected with the LOCK_thd_query mutex.
+  */
+  void reset_rewritten_query() {
+    if (rewritten_query().length()) {
+      String empty;
+      swap_rewritten_query(empty);
+    }
+  }
 
   /**
     Assign a new value to thd->query_id.
@@ -4348,7 +4517,7 @@ class THD :public MDL_context_owner,
 
   void enter_locked_tables_mode(enum_locked_tables_mode mode_arg)
   {
-    DBUG_ASSERT(locked_tables_mode == LTM_NONE);
+    assert(locked_tables_mode == LTM_NONE);
 
     if (mode_arg == LTM_LOCK_TABLES)
     {
@@ -5230,7 +5399,7 @@ class user_var_entry
   */
   void init(THD *thd, const Simple_cstring &name, const CHARSET_INFO *cs)
   {
-    DBUG_ASSERT(thd != NULL);
+    assert(thd != NULL);
     m_owner= thd;
     copy_name(name);
     reset_value();
@@ -5577,6 +5746,20 @@ inline void reattach_engine_ha_data_to_thd(THD *thd, const struct handlerton *ht
   }
 }
 
+/**
+  Check if engine substitution is allowed in the current thread context.
+
+  @param thd         thread context
+  @return
+  @retval            true if engine substitution is allowed
+  @retval            false otherwise
+*/
+
+static inline bool is_engine_substitution_allowed(THD* thd)
+{
+  return !(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION);
+}
+
 /*************************************************************************/
 
 #endif /* MYSQL_SERVER */
diff --git a/sql/sql_client.cc b/sql/sql_client.cc
index 6327cb4ba4aa..5fac8d7230cd 100644
--- a/sql/sql_client.cc
+++ b/sql/sql_client.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h
index 8656f8326d92..c056af5337b8 100644
--- a/sql/sql_cmd.h
+++ b/sql/sql_cmd.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -89,7 +101,7 @@ class Sql_cmd : public Sql_alloc
       simply destroyed instead.
       Do not rely on the destructor for any cleanup.
     */
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
   }
 };
 
diff --git a/sql/sql_cmd_dml.h b/sql/sql_cmd_dml.h
index 5cf8934d183a..6e86558c3d4b 100644
--- a/sql/sql_cmd_dml.h
+++ b/sql/sql_cmd_dml.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_cmd_show.cc b/sql/sql_cmd_show.cc
new file mode 100644
index 000000000000..b5a6293f8e89
--- /dev/null
+++ b/sql/sql_cmd_show.cc
@@ -0,0 +1,85 @@
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/* Implementation of SHOW commands. */
+
+#include "sql_cmd_show.h"
+
+#include "sql_parse.h" // execute_sqlcom_select
+
+/*
+  MAINTAINER:
+  This code is a backport from MySQL 8.0 into MySQL 5.7,
+  stripped down to the bare minimum.
+
+  See the full implementation in 8.0
+*/
+
+bool Sql_cmd_show::execute(THD *thd) {
+  if (check_privileges(thd)) {
+    return true;
+  }
+
+  return execute_inner(thd);
+}
+
+bool Sql_cmd_show::check_privileges(THD *thd) {
+  LEX *lex = thd->lex;
+  if (lex->query_tables == NULL) return false;
+  // If SHOW command is represented by a plan, ensure user has privileges:
+  return check_table_access(thd, SELECT_ACL, lex->query_tables, false, UINT_MAX,
+                            false);
+}
+
+bool Sql_cmd_show::execute_inner(THD *thd) {
+   return execute_sqlcom_select(thd, thd->lex->query_tables);
+}
+
+bool Sql_cmd_show_processlist::check_privileges(THD *thd) {
+  if (!thd->security_context()->priv_user().str[0] &&
+      check_global_access(thd, PROCESS_ACL)) {
+    return true;
+  }
+  return Sql_cmd_show::check_privileges(thd);
+}
+
+bool Sql_cmd_show_processlist::execute_inner(THD *thd) {
+  bool rc;
+  /*
+    If the Performance Schema is configured to support SHOW PROCESSLIST,
+    then execute a query on performance_schema.processlist. Otherwise,
+    fall back to the legacy method.
+  */
+  if (use_pfs()) {
+    DEBUG_SYNC(thd, "pfs_show_processlist_performance_schema");
+    rc = Sql_cmd_show::execute_inner(thd);
+  } else {
+    DEBUG_SYNC(thd, "pfs_show_processlist_legacy");
+    mysqld_list_processes(thd,
+                          thd->security_context()->check_access(PROCESS_ACL)
+                              ? NullS
+                              : thd->security_context()->priv_user().str,
+                          m_verbose);
+    rc = false;
+  }
+  return rc;
+}
diff --git a/sql/sql_cmd_show.h b/sql/sql_cmd_show.h
new file mode 100644
index 000000000000..0f32c8920476
--- /dev/null
+++ b/sql/sql_cmd_show.h
@@ -0,0 +1,75 @@
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#ifndef SQL_CMD_SHOW_H
+#define SQL_CMD_SHOW_H
+
+#include "my_global.h"
+
+#include "sql_cmd.h" // Sql_cmd
+#include "sql_class.h" // THD
+#include "auth_common.h"            // check_global_access
+#include "debug_sync.h"            // DEBUG_SYNC
+
+/**
+  Sql_cmd_show represents the SHOW statements that are implemented
+  as SELECT statements internally.
+  Normally, preparation and execution is the same as for regular SELECT
+  statements.
+*/
+class Sql_cmd_show : public Sql_cmd {
+ public:
+  Sql_cmd_show(enum_sql_command sql_command)
+      : Sql_cmd(), m_sql_command(sql_command) {}
+
+  virtual enum_sql_command sql_command_code() const { return m_sql_command; }
+  virtual bool execute(THD *thd);
+  virtual bool check_privileges(THD *);
+  virtual bool execute_inner(THD *thd);
+
+ protected:
+  enum_sql_command m_sql_command;
+};
+
+/// Represents SHOW PROCESSLIST statement.
+
+class Sql_cmd_show_processlist : public Sql_cmd_show {
+ public:
+  Sql_cmd_show_processlist() : Sql_cmd_show(SQLCOM_SHOW_PROCESSLIST) {}
+  explicit Sql_cmd_show_processlist(bool verbose)
+      : Sql_cmd_show(SQLCOM_SHOW_PROCESSLIST),
+        m_verbose(verbose),
+        m_use_pfs(false) {}
+  virtual bool check_privileges(THD *thd);
+  virtual bool execute_inner(THD *thd);
+
+  void set_use_pfs(bool use_pfs) { m_use_pfs = use_pfs; }
+  bool verbose() const { return m_verbose; }
+
+ private:
+  bool use_pfs() { return m_use_pfs; }
+
+  bool m_verbose;
+  bool m_use_pfs;
+};
+
+#endif /* SQL_SHOW_H */
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 4dab599f52d1..9129a2c35916 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -77,8 +84,8 @@ int get_or_create_user_conn(THD *thd, const char *user,
   char temp_user[USER_HOST_BUFF_SIZE];
   struct  user_conn *uc;
 
-  DBUG_ASSERT(user != 0);
-  DBUG_ASSERT(host != 0);
+  assert(user != 0);
+  assert(host != 0);
 
   user_len= strlen(user);
   temp_len= (my_stpcpy(my_stpcpy(temp_user, user)+1, host) - temp_user)+1;
@@ -218,7 +225,7 @@ void decrease_user_connections(USER_CONN *uc)
 {
   DBUG_ENTER("decrease_user_connections");
   mysql_mutex_lock(&LOCK_user_conn);
-  DBUG_ASSERT(uc->connections);
+  assert(uc->connections);
   if (!--uc->connections && !mqh_used)
   {
     /* Last connection for user; Delete it */
@@ -244,7 +251,7 @@ void release_user_connection(THD *thd)
   if (uc)
   {
     mysql_mutex_lock(&LOCK_user_conn);
-    DBUG_ASSERT(uc->connections > 0);
+    assert(uc->connections > 0);
     thd->decrement_user_connections_counter();
     if (!uc->connections && !mqh_used)
     {
@@ -270,7 +277,7 @@ bool check_mqh(THD *thd, uint check_command)
   bool error= 0;
   const USER_CONN *uc=thd->get_user_connect();
   DBUG_ENTER("check_mqh");
-  DBUG_ASSERT(uc != 0);
+  assert(uc != 0);
 
   mysql_mutex_lock(&LOCK_user_conn);
 
@@ -508,6 +515,7 @@ static int check_connection(THD *thd)
     LEX_CSTRING main_sctx_ip;
 
     peer_rc= vio_peer_addr(net->vio, ip, &thd->peer_port, NI_MAXHOST);
+    mysql_thread_set_peer_port(thd->peer_port);
 
     /*
     ===========================================================================
@@ -698,6 +706,25 @@ static int check_connection(THD *thd)
     reset_host_connect_errors(thd->m_main_security_ctx.ip().str);
   }
 
+  /*
+    Now that acl_authenticate() is executed,
+    the SSL info is available.
+    Advertise it to THD, so SSL status variables
+    can be inspected.
+  */
+  thd->set_ssl(net->vio);
+
+  if (net->vio->ssl_arg) {
+    int version = SSL_version((SSL *)net->vio->ssl_arg);
+    if (version == TLS1_VERSION || version == TLS1_1_VERSION) {
+      Security_context *sctx = thd->security_context();
+      sql_print_warning(ER(ER_DEPRECATED_TLS_VERSION_SESSION),
+                        SSL_get_version((SSL *)net->vio->ssl_arg),
+                        sctx->priv_user().str, sctx->priv_host().str,
+                        sctx->host_or_ip().str, sctx->user().str);
+    }
+  }
+
   return auth_rc;
 }
 
@@ -726,7 +753,7 @@ static bool login_connection(THD *thd)
                       thd->thread_id()));
 
   /* Use "connect_timeout" value during connection phase */
-  thd->get_protocol_classic()->set_read_timeout(connect_timeout);
+  thd->get_protocol_classic()->set_read_timeout(connect_timeout, TRUE);
   thd->get_protocol_classic()->set_write_timeout(connect_timeout);
 
   error= check_connection(thd);
@@ -823,7 +850,16 @@ static void prepare_new_connection_state(THD* thd)
 
   if (opt_init_connect.length && !(sctx->check_access(SUPER_ACL)))
   {
+    if (sctx->password_expired())
+    {
+      sql_print_warning("init_connect variable is ignored for user: %s "
+                        "host: %s due to expired password.", sctx->priv_user().str,
+                        sctx->priv_host().str);
+      return;
+    }
+
     execute_init_command(thd, &opt_init_connect, &LOCK_sys_init_connect);
+
     if (thd->is_error())
     {
       Host_errors errors;
diff --git a/sql/sql_connect.h b/sql/sql_connect.h
index 6b2da435b0ab..da09f84c43be 100644
--- a/sql/sql_connect.h
+++ b/sql/sql_connect.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_const.h b/sql/sql_const.h
index f98302cbd4a5..ecb3c1fb7234 100644
--- a/sql/sql_const.h
+++ b/sql/sql_const.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -301,7 +308,8 @@
 #define OPTIMIZER_SWITCH_USE_INDEX_EXTENSIONS      (1ULL << 16)
 #define OPTIMIZER_SWITCH_COND_FANOUT_FILTER        (1ULL << 17)
 #define OPTIMIZER_SWITCH_DERIVED_MERGE             (1ULL << 18)
-#define OPTIMIZER_SWITCH_LAST                      (1ULL << 19)
+#define OPTIMIZER_SWITCH_PREFER_ORDERING_INDEX     (1ULL << 19)
+#define OPTIMIZER_SWITCH_LAST                      (1ULL << 20)
 
 #define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \
                                   OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \
@@ -320,7 +328,8 @@
                                   OPTIMIZER_SWITCH_SUBQ_MAT_COST_BASED | \
                                   OPTIMIZER_SWITCH_USE_INDEX_EXTENSIONS | \
                                   OPTIMIZER_SWITCH_COND_FANOUT_FILTER | \
-                                  OPTIMIZER_SWITCH_DERIVED_MERGE)
+                                  OPTIMIZER_SWITCH_DERIVED_MERGE | \
+                                  OPTIMIZER_SWITCH_PREFER_ORDERING_INDEX)
 
 enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};
 
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc
index e0842c124656..28725c953e61 100644
--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_crypt.h b/sql/sql_crypt.h
index 8e46d3865b3e..4073c0833326 100644
--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@@ -1,16 +1,23 @@
 #ifndef SQL_CRYPT_INCLUDED
 #define SQL_CRYPT_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc
index 7c2d427fa3be..0169d0928785 100644
--- a/sql/sql_cursor.cc
+++ b/sql/sql_cursor.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -244,7 +251,7 @@ int Materialized_cursor::send_result_set_metadata(
   if ((rc= table->fill_item_list(&item_list)))
     goto end;
 
-  DBUG_ASSERT(send_result_set_metadata.elements == item_list.elements);
+  assert(send_result_set_metadata.elements == item_list.elements);
 
   /*
     Unless we preserve the original metadata, it will be lost,
@@ -393,7 +400,7 @@ Materialized_cursor::~Materialized_cursor()
 bool Query_result_materialize::send_result_set_metadata(List<Item> &list,
                                                         uint flags)
 {
-  DBUG_ASSERT(table == 0);
+  assert(table == 0);
   /*
     PROCEDURE ANALYSE installs a result filter that has a different set
     of input and output column Items:
diff --git a/sql/sql_cursor.h b/sql/sql_cursor.h
index ab6918c62068..39a09b0ed21f 100644
--- a/sql/sql_cursor.h
+++ b/sql/sql_cursor.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_data_change.cc b/sql/sql_data_change.cc
index ef8e6c2185ed..479be0b16480 100644
--- a/sql/sql_data_change.cc
+++ b/sql/sql_data_change.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -45,7 +52,7 @@ static bool allocate_column_bitmap(TABLE *table, MY_BITMAP **bitmap)
   MY_BITMAP *the_struct;
   my_bitmap_map *the_bits;
 
-  DBUG_ASSERT(current_thd == table->in_use);
+  assert(current_thd == table->in_use);
   if (multi_alloc_root(table->in_use->mem_root,
                        &the_struct, sizeof(MY_BITMAP),
                        &the_bits, bitmap_buffer_size(number_bits),
@@ -121,7 +128,7 @@ void COPY_INFO::set_function_defaults(TABLE *table)
 {
   DBUG_ENTER("COPY_INFO::set_function_defaults");
 
-  DBUG_ASSERT(m_function_default_columns != NULL);
+  assert(m_function_default_columns != NULL);
 
   /* Quick reject test for checking the case when no defaults are invoked. */
   if (bitmap_is_clear_all(m_function_default_columns))
@@ -130,7 +137,7 @@ void COPY_INFO::set_function_defaults(TABLE *table)
   for (uint i= 0; i < table->s->fields; ++i)
     if (bitmap_is_set(m_function_default_columns, i))
     {
-      DBUG_ASSERT(bitmap_is_set(table->write_set, i));
+      assert(bitmap_is_set(table->write_set, i));
       switch (m_optype)
       {
       case INSERT_OPERATION:
diff --git a/sql/sql_data_change.h b/sql/sql_data_change.h
index 1b1769988339..caaa50efed3f 100644
--- a/sql/sql_data_change.h
+++ b/sql/sql_data_change.h
@@ -1,15 +1,22 @@
 #ifndef SQL_DATA_CHANGE_INCLUDED
 #define SQL_DATA_CHANGE_INCLUDED
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -169,7 +176,7 @@ class COPY_INFO: public Sql_alloc
     last_errno(0),
     update_values(NULL)
   {
-    DBUG_ASSERT(optype == INSERT_OPERATION);
+    assert(optype == INSERT_OPERATION);
   }
 
   /**
@@ -212,7 +219,7 @@ class COPY_INFO: public Sql_alloc
     last_errno(0),
     update_values(NULL)
   {
-    DBUG_ASSERT(optype == INSERT_OPERATION);
+    assert(optype == INSERT_OPERATION);
   }
 
   /**
@@ -236,7 +243,7 @@ class COPY_INFO: public Sql_alloc
     last_errno(0),
     update_values(values)
   {
-    DBUG_ASSERT(optype == UPDATE_OPERATION);
+    assert(optype == UPDATE_OPERATION);
   }
 
   operation_type get_operation_type() const { return m_optype; }
@@ -292,7 +299,7 @@ class COPY_INFO: public Sql_alloc
   */
   bool function_defaults_apply(const TABLE *table) const
   {
-    DBUG_ASSERT(m_function_default_columns != NULL);
+    assert(m_function_default_columns != NULL);
     return !bitmap_is_clear_all(m_function_default_columns);
   }
 
@@ -302,7 +309,7 @@ class COPY_INFO: public Sql_alloc
   */
   bool function_defaults_apply_on_columns(MY_BITMAP *map)
   {
-    DBUG_ASSERT(m_function_default_columns != NULL);
+    assert(m_function_default_columns != NULL);
     return bitmap_is_overlapping(m_function_default_columns, map);
   }
 
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 510eb8bfbfdf..dc1a83d20734 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -378,7 +385,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
   bool error=1;
   uint nbytes;
 
-  memset(create, 0, sizeof(*create));
+  new (create) HA_CREATE_INFO;
   create->default_table_charset= thd->variables.collation_server;
 
   /* Check if options for this database are already in the hash */
@@ -572,6 +579,12 @@ int mysql_create_db(THD *thd, const char *db, HA_CREATE_INFO *create_info,
     DBUG_RETURN(-1);
   }
 
+  if (ha_check_reserved_db_name(db))
+  {
+    my_error(ER_WRONG_DB_NAME, MYF(0), db);
+    DBUG_RETURN(-1);
+  }
+
   if (lock_schema_name(thd, db))
     DBUG_RETURN(-1);
 
@@ -1605,18 +1618,15 @@ bool mysql_change_db(THD *thd, const LEX_CSTRING &new_db_name,
   DBUG_PRINT("info",("Use database: %s", new_db_file_name.str));
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  db_access= sctx->check_access(DB_ACLS) ?
-    DB_ACLS :
-    acl_get(sctx->host().str,
-            sctx->ip().str,
-            sctx->priv_user().str,
-            new_db_file_name.str,
-            false) | sctx->master_access();
-
-  if (!force_switch &&
-      !(db_access & DB_ACLS) &&
-      check_grant_db(thd, new_db_file_name.str))
-  {
+  db_access =
+      sctx->check_access(DB_OP_ACLS)
+          ? DB_OP_ACLS
+          : acl_get(sctx->host().str, sctx->ip().str, sctx->priv_user().str,
+                    new_db_file_name.str, false) |
+                sctx->master_access();
+
+  if (!force_switch && !(db_access & DB_OP_ACLS) &&
+      check_grant_db(thd, new_db_file_name.str, true)) {
     my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
              sctx->priv_user().str,
              sctx->priv_host().str,
diff --git a/sql/sql_db.h b/sql/sql_db.h
index 11b870b72af8..3189d89766ba 100644
--- a/sql/sql_db.h
+++ b/sql/sql_db.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 9e3af2a97a7b..7d865a2df5a5 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -136,13 +143,6 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
     DBUG_RETURN(true);
 
   const_cond= (!conds || conds->const_item());
-  if (safe_update && const_cond)
-  {
-    my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
-               ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
-    DBUG_RETURN(TRUE);
-  }
-
   const_cond_result= const_cond && (!conds || conds->val_int());
   if (thd->is_error())
   {
@@ -192,6 +192,14 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
       goto exit_without_my_ok;
     }
 
+    /* Do not allow deletion of all records if safe_update is set. */
+    if (safe_update)
+    {
+      my_error(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, MYF(0),
+               thd->get_stmt_da()->get_first_condition_message());
+      DBUG_RETURN(true);
+    }
+
     DBUG_PRINT("debug", ("Trying to use delete_all_rows()"));
     if (!(error=table->file->ha_delete_all_rows()))
     {
@@ -291,7 +299,8 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
       QUICK_SELECT_I *qck;
       zero_rows= test_quick_select(thd, keys_to_use, 0, limit, safe_update,
                                    ORDER::ORDER_NOT_RELEVANT, &qep_tab,
-                                   conds, &needed_reg_dummy, &qck) < 0;
+                                   conds, &needed_reg_dummy, &qck,
+                                   qep_tab.table()->force_index) < 0;
       qep_tab.set_quick(qck);
     }
     if (zero_rows)
@@ -321,13 +330,22 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
   /* If running in safe sql mode, don't allow updates without keys */
   if (table->quick_keys.is_clear_all())
   {
-    thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
-    if (safe_update && !using_limit)
+    thd->server_status|= SERVER_QUERY_NO_INDEX_USED;
+
+    /*
+      Safe update error isn't returned if:
+      1) It is  an EXPLAIN statement OR
+      2) LIMIT is present.
+
+      Append the first warning (if any) to the error message. This allows the
+      user to understand why index access couldn't be chosen.
+    */
+    if (!thd->lex->is_explain() && safe_update &&  !using_limit)
     {
       free_underlaid_joins(thd, select_lex);
-      my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
-                 ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
-      DBUG_RETURN(TRUE);
+      my_error(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, MYF(0),
+               thd->get_stmt_da()->get_first_condition_message());
+      DBUG_RETURN(true);
     }
   }
 
@@ -373,7 +391,7 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
 
       {
         Filesort fsort(&qep_tab, order, HA_POS_ERROR);
-        DBUG_ASSERT(usable_index == MAX_KEY);
+        assert(usable_index == MAX_KEY);
         table->sort.io_cache= (IO_CACHE *) my_malloc(key_memory_TABLE_sort_io_cache,
                                                      sizeof(IO_CACHE),
                                                      MYF(MY_FAE | MY_ZEROFILL));
@@ -542,7 +560,7 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
   } // End of scope for Modification_plan
 
 cleanup:
-  DBUG_ASSERT(!thd->lex->describe);
+  assert(!thd->lex->describe);
   /*
     Invalidate the table in the query cache if something changed. This must
     be before binlog writing and ha_autocommit_...
@@ -585,10 +603,10 @@ bool Sql_cmd_delete::mysql_delete(THD *thd, ha_rows limit)
       }
     }
   }
-  DBUG_ASSERT(transactional_table ||
-              !deleted ||
-              thd->get_transaction()->cannot_safely_rollback(
-                  Transaction_ctx::STMT));
+  assert(transactional_table ||
+         !deleted ||
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
   free_underlaid_joins(thd, select_lex);
   if (error < 0)
   {
@@ -661,11 +679,10 @@ bool Sql_cmd_delete::mysql_prepare_delete(THD *thd)
     List<Item>   fields;
     List<Item>   all_fields;
 
-    memset(&tables, 0, sizeof(tables));
     tables.table = table_list->table;
     tables.alias = table_list->alias;
 
-    DBUG_ASSERT(!select->group_list.elements);
+    assert(!select->group_list.elements);
     if (select->setup_ref_array(thd))
       DBUG_RETURN(true);                     /* purecov: inspected */
     if (setup_order(thd, select->ref_pointer_array, &tables,
@@ -788,10 +805,10 @@ int Sql_cmd_delete_multi::mysql_multi_delete_prepare(THD *thd,
     }
 
     // A view must be merged, and thus cannot have a TABLE 
-    DBUG_ASSERT(!table_ref->is_view() || table_ref->table == NULL);
+    assert(!table_ref->is_view() || table_ref->table == NULL);
 
     // Enable the following code if allowing LIMIT with multi-table DELETE
-    DBUG_ASSERT(select->select_limit == 0);
+    assert(select->select_limit == 0);
   }
 
   DBUG_RETURN(false);
@@ -862,7 +879,7 @@ bool Query_result_delete::initialize_tables(JOIN *join)
   ASSERT_BEST_REF_IN_JOIN_ORDER(join);
 
   SELECT_LEX *const select= unit->first_select();
-  DBUG_ASSERT(join == select->join);
+  assert(join == select->join);
 
   if ((thd->variables.option_bits & OPTION_SAFE_UPDATES) &&
       error_if_full_join(join))
@@ -954,7 +971,7 @@ bool Query_result_delete::initialize_tables(JOIN *join)
       DBUG_RETURN(true);                     /* purecov: inspected */
     *(table_ptr++)= table;
   }
-  DBUG_ASSERT(select == thd->lex->current_select());
+  assert(select == thd->lex->current_select());
 
   if (select->has_ft_funcs() && init_ftfuncs(thd, select))
     DBUG_RETURN(true);
@@ -987,7 +1004,7 @@ bool Query_result_delete::send_data(List<Item> &values)
 
   JOIN *const join= unit->first_select()->join;
 
-  DBUG_ASSERT(thd->lex->current_select() == unit->first_select());
+  assert(thd->lex->current_select() == unit->first_select());
   int unique_counter= 0;
 
   for (uint i= 0; i < join->primary_tables; i++)
@@ -1002,7 +1019,7 @@ bool Query_result_delete::send_data(List<Item> &values)
 
     TABLE *const table= join->qep_tab[i].table();
 
-    DBUG_ASSERT(immediate || table == tables[unique_counter]);
+    assert(immediate || table == tables[unique_counter]);
 
     /*
       If not doing immediate deletion, increment unique_counter and assign
@@ -1133,7 +1150,7 @@ void Query_result_delete::abort_result_set()
     */
     error= 1;
     send_eof();
-    DBUG_ASSERT(error_handled);
+    assert(error_handled);
     DBUG_VOID_RETURN;
   }
   
@@ -1171,9 +1188,9 @@ void Query_result_delete::abort_result_set()
 int Query_result_delete::do_deletes()
 {
   DBUG_ENTER("Query_result_delete::do_deletes");
-  DBUG_ASSERT(do_delete);
+  assert(do_delete);
 
-  DBUG_ASSERT(thd->lex->current_select() == unit->first_select());
+  assert(thd->lex->current_select() == unit->first_select());
   do_delete= false;                                 // Mark called
   if (!found)
     DBUG_RETURN(0);
@@ -1334,6 +1351,7 @@ bool Query_result_delete::send_eof()
         thd->clear_error();
       else
         errcode= query_error_code(thd, killed_status == THD::NOT_KILLED);
+      thd->thread_specific_used= TRUE;
       if (thd->binlog_query(THD::ROW_QUERY_TYPE,
                             thd->query().str, thd->query().length,
                             transactional_table_map != 0, FALSE, FALSE,
@@ -1357,7 +1375,7 @@ bool Query_result_delete::send_eof()
 
 bool Sql_cmd_delete::execute(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_DELETE);
+  assert(thd->lex->sql_command == SQLCOM_DELETE);
 
   LEX *const lex= thd->lex;
   SELECT_LEX *const select_lex= lex->select_lex;
@@ -1367,7 +1385,7 @@ bool Sql_cmd_delete::execute(THD *thd)
 
   if (delete_precheck(thd, all_tables))
     return true;
-  DBUG_ASSERT(select_lex->offset_limit == 0);
+  assert(select_lex->offset_limit == 0);
   unit->set_limit(select_lex);
 
   /* Push ignore / strict error handler */
@@ -1392,7 +1410,7 @@ bool Sql_cmd_delete::execute(THD *thd)
 
 bool Sql_cmd_delete_multi::execute(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_DELETE_MULTI);
+  assert(thd->lex->sql_command == SQLCOM_DELETE_MULTI);
 
   bool res= false;
   LEX *const lex= thd->lex;
@@ -1430,9 +1448,9 @@ bool Sql_cmd_delete_multi::execute(THD *thd)
   if (!thd->is_fatal_error &&
       (del_result= new Query_result_delete(aux_tables, del_table_count)))
   {
-    DBUG_ASSERT(select_lex->having_cond() == NULL &&
-                !select_lex->order_list.elements &&
-                !select_lex->group_list.elements);
+    assert(select_lex->having_cond() == NULL &&
+           !select_lex->order_list.elements &&
+           !select_lex->group_list.elements);
 
     Ignore_error_handler ignore_handler;
     Strict_error_handler strict_handler;
diff --git a/sql/sql_delete.h b/sql/sql_delete.h
index 8bc12fd43f37..71a4cb5e4b02 100644
--- a/sql/sql_delete.h
+++ b/sql/sql_delete.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index d18d732cdd8a..dee69a84183d 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -53,11 +60,11 @@ bool TABLE_LIST::resolve_derived(THD *thd, bool apply_semijoin)
 
   thd->derived_tables_processing= true;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (SELECT_LEX *sl= derived->first_select(); sl; sl= sl->next_select())
   {
     // Make sure there are no outer references
-    DBUG_ASSERT(sl->context.outer_context == NULL);
+    assert(sl->context.outer_context == NULL);
   }
 #endif
   if (!(derived_result= new (thd->mem_root) Query_result_union))
@@ -68,7 +75,7 @@ bool TABLE_LIST::resolve_derived(THD *thd, bool apply_semijoin)
     The SELECT_STRAIGHT_JOIN option prevents semi-join transformation.
   */
   if (derived->prepare(thd, derived_result,
-                       !apply_semijoin ? SELECT_STRAIGHT_JOIN : 0, 0))
+                       !apply_semijoin ? SELECT_NO_SEMI_JOIN : 0, 0))
     DBUG_RETURN(true);
 
   if (check_duplicate_names(derived->types, 0))
@@ -104,7 +111,7 @@ bool TABLE_LIST::setup_materialized_derived(THD *thd)
 {
   DBUG_ENTER("TABLE_LIST::setup_materialized_derived");
 
-  DBUG_ASSERT(is_view_or_derived() && !is_merged() && table == NULL);
+  assert(is_view_or_derived() && !is_merged() && table == NULL);
 
   DBUG_PRINT("info", ("algorithm: TEMPORARY TABLE"));
 
@@ -167,7 +174,7 @@ bool TABLE_LIST::setup_materialized_derived(THD *thd)
 
     // Set all selected fields to be read:
     // @todo Do not set fields that are not referenced from outer query
-    DBUG_ASSERT(thd->mark_used_columns == MARK_COLUMNS_READ);
+    assert(thd->mark_used_columns == MARK_COLUMNS_READ);
     List_iterator<Item> it(sl->all_fields);
     Item *item;
     Column_privilege_tracker tracker(thd, SELECT_ACL);
@@ -203,7 +210,7 @@ bool TABLE_LIST::optimize_derived(THD *thd)
 
   SELECT_LEX_UNIT *const unit= derived_unit();
 
-  DBUG_ASSERT(unit && !unit->is_optimized());
+  assert(unit && !unit->is_optimized());
 
   if (unit->optimize(thd) || thd->is_error())
     DBUG_RETURN(true);
@@ -234,7 +241,7 @@ bool TABLE_LIST::create_derived(THD *thd)
   SELECT_LEX_UNIT *const unit= derived_unit();
 
   // @todo: Be able to assert !table->is_created() as well
-  DBUG_ASSERT(unit && uses_materialization() && table);
+  assert(unit && uses_materialization() && table);
 
   /*
     Don't create result table if:
@@ -249,13 +256,13 @@ bool TABLE_LIST::create_derived(THD *thd)
       At this point, JT_CONST derived tables should be null rows. Otherwise
       they would have been materialized already.
     */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (table != NULL)
     {
       QEP_TAB *tab= table->reginfo.qep_tab;
-      DBUG_ASSERT(tab == NULL ||
-                  tab->type() != JT_CONST ||
-                  table->has_null_row());
+      assert(tab == NULL ||
+             tab->type() != JT_CONST ||
+             table->has_null_row());
     }
 #endif
     DBUG_RETURN(false);
@@ -300,12 +307,12 @@ bool TABLE_LIST::materialize_derived(THD *thd)
 {
   DBUG_ENTER("TABLE_LIST::materialize_derived");
 
-  DBUG_ASSERT(is_view_or_derived() && uses_materialization());
+  assert(is_view_or_derived() && uses_materialization());
 
   SELECT_LEX_UNIT *const unit= derived_unit();
   bool res= false;
 
-  DBUG_ASSERT(table && table->is_created());
+  assert(table && table->is_created());
 
   if (unit->is_union())
   {
@@ -319,7 +326,7 @@ bool TABLE_LIST::materialize_derived(THD *thd)
     SELECT_LEX *save_current_select= thd->lex->current_select();
     thd->lex->set_current_select(first_select);
 
-    DBUG_ASSERT(join && join->is_optimized());
+    assert(join && join->is_optimized());
 
     unit->set_limit(first_select);
 
@@ -348,7 +355,7 @@ bool TABLE_LIST::materialize_derived(THD *thd)
 
 bool TABLE_LIST::cleanup_derived()
 {
-  DBUG_ASSERT(is_view_or_derived() && uses_materialization());
+  assert(is_view_or_derived() && uses_materialization());
 
   return derived_unit()->cleanup(false);
 }
diff --git a/sql/sql_derived.h b/sql/sql_derived.h
index 3179923f19a0..c5c9273d658f 100644
--- a/sql/sql_derived.h
+++ b/sql/sql_derived.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_digest.cc b/sql/sql_digest.cc
index 39ec1a9b5319..9104fa5928eb 100644
--- a/sql/sql_digest.cc
+++ b/sql/sql_digest.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -73,7 +80,7 @@ inline uint read_token(const sql_digest_storage *digest_storage,
 */
 inline void store_token(sql_digest_storage* digest_storage, uint token)
 {
-  DBUG_ASSERT(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
+  assert(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
 
   if (digest_storage->m_byte_count + SIZE_OF_A_TOKEN <= digest_storage->m_token_array_length)
   {
@@ -97,8 +104,8 @@ inline uint read_identifier(const sql_digest_storage* digest_storage,
   uint new_index;
   uint safe_byte_count= digest_storage->m_byte_count;
 
-  DBUG_ASSERT(index <= safe_byte_count);
-  DBUG_ASSERT(safe_byte_count <= digest_storage->m_token_array_length);
+  assert(index <= safe_byte_count);
+  assert(safe_byte_count <= digest_storage->m_token_array_length);
 
   /*
     token + length + string are written in an atomic way,
@@ -120,7 +127,7 @@ inline uint read_identifier(const sql_digest_storage* digest_storage,
       *id_length= length;
 
       new_index= index + bytes_needed;
-      DBUG_ASSERT(new_index <= safe_byte_count);
+      assert(new_index <= safe_byte_count);
       return new_index;
     }
   }
@@ -136,7 +143,7 @@ inline void store_token_identifier(sql_digest_storage* digest_storage,
                                    uint token,
                                    size_t id_length, const char *id_name)
 {
-  DBUG_ASSERT(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
+  assert(digest_storage->m_byte_count <= digest_storage->m_token_array_length);
 
   size_t bytes_needed= 2 * SIZE_OF_A_TOKEN + id_length;
   if (digest_storage->m_byte_count + bytes_needed <= (unsigned int)digest_storage->m_token_array_length)
@@ -172,7 +179,7 @@ void compute_digest_md5(const sql_digest_storage *digest_storage, unsigned char
 void compute_digest_text(const sql_digest_storage* digest_storage,
                          String *digest_text)
 {
-  DBUG_ASSERT(digest_storage != NULL);
+  assert(digest_storage != NULL);
   uint byte_count= digest_storage->m_byte_count;
   String *digest_output= digest_text;
   uint tok= 0;
@@ -288,8 +295,8 @@ void compute_digest_text(const sql_digest_storage* digest_storage,
 static inline uint peek_token(const sql_digest_storage *digest, uint index)
 {
   uint token;
-  DBUG_ASSERT(index + SIZE_OF_A_TOKEN <= digest->m_byte_count);
-  DBUG_ASSERT(digest->m_byte_count <=  digest->m_token_array_length);
+  assert(index + SIZE_OF_A_TOKEN <= digest->m_byte_count);
+  assert(digest->m_byte_count <=  digest->m_token_array_length);
 
   token= ((digest->m_token_array[index + 1])<<8) | digest->m_token_array[index];
   return token;
@@ -667,7 +674,7 @@ sql_digest_state* digest_reduce_token(sql_digest_state *state,
       REDUCE to
         TOKEN_X TOKEN_LEFT . TOKEN_Y
     */
-    DBUG_ASSERT(last_token2 == token_right);
+    assert(last_token2 == token_right);
     digest_storage->m_byte_count-= 2 * SIZE_OF_A_TOKEN;
     store_token(digest_storage, token_left);
     token_to_push= last_token;
diff --git a/sql/sql_digest.h b/sql/sql_digest.h
index 81c238b4501c..396f46e210f7 100644
--- a/sql/sql_digest.h
+++ b/sql/sql_digest.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_digest_stream.h b/sql/sql_digest_stream.h
index 55f7e2293c62..e031a1d4fd00 100644
--- a/sql/sql_digest_stream.h
+++ b/sql/sql_digest_stream.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_do.cc b/sql/sql_do.cc
index 0f035eb23d00..ae43875a839f 100644
--- a/sql/sql_do.cc
+++ b/sql/sql_do.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -30,12 +37,12 @@ bool mysql_do(THD *thd, LEX *lex)
                          false))
     DBUG_RETURN(true);
 
-  DBUG_ASSERT(!lex->unit->global_parameters()->explicit_limit);
+  assert(!lex->unit->global_parameters()->explicit_limit);
 
   if (open_tables_for_query(thd, lex->query_tables, 0))
     DBUG_RETURN(true);
 
-  DBUG_ASSERT(!lex->describe);
+  assert(!lex->describe);
 
   Query_result *result= new Query_result_do(thd);
   if (!result)
diff --git a/sql/sql_do.h b/sql/sql_do.h
index 15e331eb2bc5..94473c642a8e 100644
--- a/sql/sql_do.h
+++ b/sql/sql_do.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index 94be40537656..37b5e8bb18d7 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -205,7 +212,7 @@ Sql_condition::Sql_condition(MEM_ROOT *mem_root)
   m_severity_level(Sql_condition::SL_ERROR),
   m_mem_root(mem_root)
 {
-  DBUG_ASSERT(mem_root != NULL);
+  assert(mem_root != NULL);
   memset(m_returned_sqlstate, 0, sizeof(m_returned_sqlstate));
 }
 
@@ -230,10 +237,10 @@ Sql_condition::Sql_condition(MEM_ROOT *mem_root, uint mysql_errno,
   m_severity_level(severity),
   m_mem_root(mem_root)
 {
-  DBUG_ASSERT(mem_root != NULL);
-  DBUG_ASSERT(mysql_errno != 0);
-  DBUG_ASSERT(returned_sqlstate != NULL);
-  DBUG_ASSERT(message_text != NULL);
+  assert(mem_root != NULL);
+  assert(mysql_errno != 0);
+  assert(returned_sqlstate != NULL);
+  assert(message_text != NULL);
 
   set_message_text(message_text);
   set_returned_sqlstate(returned_sqlstate);
@@ -243,7 +250,7 @@ Sql_condition::Sql_condition(MEM_ROOT *mem_root, uint mysql_errno,
 
 void Sql_condition::copy_opt_attributes(const Sql_condition *cond)
 {
-  DBUG_ASSERT(this != cond);
+  assert(this != cond);
   copy_string(m_mem_root, & m_class_origin, & cond->m_class_origin);
   copy_string(m_mem_root, & m_subclass_origin, & cond->m_subclass_origin);
   copy_string(m_mem_root, & m_constraint_catalog, & cond->m_constraint_catalog);
@@ -263,7 +270,7 @@ void Sql_condition::set_message_text(const char* message_text)
 
   const char* copy= strdup_root(m_mem_root, message_text);
   m_message_text.set(copy, strlen(copy), error_message_charset_info);
-  DBUG_ASSERT(! m_message_text.is_alloced());
+  assert(! m_message_text.is_alloced());
 }
 
 
@@ -282,11 +289,11 @@ void Sql_condition::set_class_origins()
   cls[1]= m_returned_sqlstate[1];
 
   /* Only digits and upper case latin letter are allowed. */
-  DBUG_ASSERT(my_isdigit(&my_charset_latin1, cls[0]) ||
-              my_isupper(&my_charset_latin1, cls[0]));
+  assert(my_isdigit(&my_charset_latin1, cls[0]) ||
+         my_isupper(&my_charset_latin1, cls[0]));
 
-  DBUG_ASSERT(my_isdigit(&my_charset_latin1, cls[1]) ||
-              my_isupper(&my_charset_latin1, cls[1]));
+  assert(my_isdigit(&my_charset_latin1, cls[1]) ||
+         my_isupper(&my_charset_latin1, cls[1]));
 
   /*
     If CLASS[1] is any of: 0 1 2 3 4 A B C D E F G H
@@ -356,7 +363,7 @@ Diagnostics_area::~Diagnostics_area()
 void Diagnostics_area::reset_diagnostics_area()
 {
   DBUG_ENTER("reset_diagnostics_area");
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   set_overwrite_status(false);
   // Don't take chances in production.
   m_message_text[0]= '\0';
@@ -377,7 +384,7 @@ void Diagnostics_area::set_ok_status(ulonglong affected_rows,
                                      const char *message_text)
 {
   DBUG_ENTER("set_ok_status");
-  DBUG_ASSERT(! is_set());
+  assert(! is_set());
   /*
     In production, refuse to overwrite an error or a custom response
     with an OK packet.
@@ -401,7 +408,7 @@ void Diagnostics_area::set_eof_status(THD *thd)
 {
   DBUG_ENTER("set_eof_status");
   /* Only allowed to report eof if has not yet reported an error */
-  DBUG_ASSERT(! is_set());
+  assert(! is_set());
   /*
     In production, refuse to overwrite an error or a custom response
     with an EOF packet.
@@ -441,15 +448,15 @@ void Diagnostics_area::set_error_status(uint mysql_errno,
     The only exception is when we flush the message to the client,
     an error can happen during the flush.
   */
-  DBUG_ASSERT(! is_set() || m_can_overwrite_status);
+  assert(! is_set() || m_can_overwrite_status);
 
   // message must be set properly by the caller.
-  DBUG_ASSERT(message_text);
+  assert(message_text);
 
   // sqlstate must be set properly by the caller.
-  DBUG_ASSERT(returned_sqlstate);
+  assert(returned_sqlstate);
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   /*
     In production, refuse to overwrite a custom response with an
     ERROR packet.
@@ -497,6 +504,12 @@ bool Diagnostics_area::has_sql_condition(uint sql_errno) const
   return false;
 }
 
+const char * Diagnostics_area::get_first_condition_message()
+{
+  if (m_conditions_list.elements())
+    return m_conditions_list.front()->message_text();
+  return "";
+}
 
 void Diagnostics_area::reset_condition_info(THD *thd)
 {
@@ -689,7 +702,7 @@ Diagnostics_area::push_warning(THD *thd, const Sql_condition *sql_condition)
 void Diagnostics_area::push_diagnostics_area(THD *thd, Diagnostics_area *da,
                                              bool copy_conditions)
 {
-  DBUG_ASSERT(da->m_stacked_da == NULL);
+  assert(da->m_stacked_da == NULL);
   da->m_stacked_da= this;
   if (copy_conditions)
   {
@@ -702,7 +715,7 @@ void Diagnostics_area::push_diagnostics_area(THD *thd, Diagnostics_area *da,
 
 Diagnostics_area *Diagnostics_area::pop_diagnostics_area()
 {
-  DBUG_ASSERT(m_stacked_da);
+  assert(m_stacked_da);
   Diagnostics_area *da= m_stacked_da;
   m_stacked_da= NULL;
   return da;
@@ -729,7 +742,7 @@ void push_warning(THD *thd, Sql_condition::enum_severity_level severity,
     SL_ERROR *is* a bug.  Either use my_printf_error(),
     my_error(), or SL_WARNING.
   */
-  DBUG_ASSERT(severity != Sql_condition::SL_ERROR);
+  assert(severity != Sql_condition::SL_ERROR);
 
   if (severity == Sql_condition::SL_ERROR)
     severity= Sql_condition::SL_WARNING;
@@ -757,8 +770,8 @@ void push_warning_printf(THD *thd, Sql_condition::enum_severity_level severity,
   DBUG_ENTER("push_warning_printf");
   DBUG_PRINT("enter",("warning: %u", code));
 
-  DBUG_ASSERT(code != 0);
-  DBUG_ASSERT(format != NULL);
+  assert(code != 0);
+  assert(format != NULL);
 
   va_start(args,format);
   my_vsnprintf_ex(&my_charset_utf8_general_ci, warning,
@@ -903,7 +916,7 @@ bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
 ErrConvString::ErrConvString(double nr)
 {
   // enough to print '-[digits].E+###'
-  DBUG_ASSERT(sizeof(err_buffer) > DBL_DIG + 8);
+  assert(sizeof(err_buffer) > DBL_DIG + 8);
   buf_length= my_gcvt(nr, MY_GCVT_ARG_DOUBLE,
                       static_cast<int>(sizeof(err_buffer)) - 1,
                       err_buffer, NULL);
@@ -946,7 +959,7 @@ size_t err_conv(char *buff, size_t to_length, const char *from,
   const char *from_start= from;
   size_t res;
 
-  DBUG_ASSERT(to_length > 0);
+  assert(to_length > 0);
   to_length--;
   if (from_cs == &my_charset_bin)
   {
@@ -1023,7 +1036,7 @@ size_t convert_error_message(char *to, size_t to_length,
   uint error_count= 0;
   size_t length;
 
-  DBUG_ASSERT(to_length > 0);
+  assert(to_length > 0);
   /* Make room for the null terminator. */
   to_length--;
   to_end= (uchar*) (to + to_length);
diff --git a/sql/sql_error.h b/sql/sql_error.h
index 65be5fc055b0..090a31d6318d 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -351,7 +358,7 @@ class Diagnostics_area
   */
   void disable_status()
   {
-    DBUG_ASSERT(m_status == DA_EMPTY);
+    assert(m_status == DA_EMPTY);
     m_status= DA_DISABLED;
   }
 
@@ -376,37 +383,37 @@ class Diagnostics_area
 
   const char *message_text() const
   {
-    DBUG_ASSERT(m_status == DA_ERROR || m_status == DA_OK);
+    assert(m_status == DA_ERROR || m_status == DA_OK);
     return m_message_text;
   }
 
   uint mysql_errno() const
   {
-    DBUG_ASSERT(m_status == DA_ERROR);
+    assert(m_status == DA_ERROR);
     return m_mysql_errno;
   }
 
   const char* returned_sqlstate() const
   {
-    DBUG_ASSERT(m_status == DA_ERROR);
+    assert(m_status == DA_ERROR);
     return m_returned_sqlstate;
   }
 
   ulonglong affected_rows() const
   {
-    DBUG_ASSERT(m_status == DA_OK);
+    assert(m_status == DA_OK);
     return m_affected_rows;
   }
 
   ulonglong last_insert_id() const
   {
-    DBUG_ASSERT(m_status == DA_OK);
+    assert(m_status == DA_OK);
     return m_last_insert_id;
   }
 
   uint last_statement_cond_count() const
   {
-    DBUG_ASSERT(m_status == DA_OK || m_status == DA_EOF);
+    assert(m_status == DA_OK || m_status == DA_EOF);
     return m_last_statement_cond_count;
   }
 
@@ -484,6 +491,8 @@ class Diagnostics_area
   Sql_condition_iterator sql_conditions() const
   { return m_conditions_list; }
 
+  const char * get_first_condition_message();
+
   /** Make sure there is room for the given number of conditions. */
   void reserve_number_of_conditions(THD *thd, uint count);
 
diff --git a/sql/sql_exception_handler.cc b/sql/sql_exception_handler.cc
new file mode 100644
index 000000000000..084f8be89642
--- /dev/null
+++ b/sql/sql_exception_handler.cc
@@ -0,0 +1,96 @@
+/*
+  Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+*/
+
+/**
+  @file
+
+  @brief
+  This file defines functions to convert exceptions to MySQL error messages.
+*/
+
+#include "sql_exception_handler.h"
+
+#include <new> // std::bad_alloc
+#include <stdexcept> // Other std exceptions
+
+#include "my_global.h"  // MYF
+#include "my_sys.h"       // my_error
+#include "mysqld_error.h" // Error codes
+
+void handle_std_exception(const char *funcname)
+{
+  try
+  {
+    throw;
+  }
+  catch (const std::bad_alloc &e)
+  {
+    my_error(ER_STD_BAD_ALLOC_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::domain_error &e)
+  {
+    my_error(ER_STD_DOMAIN_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::length_error &e)
+  {
+    my_error(ER_STD_LENGTH_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::invalid_argument &e)
+  {
+    my_error(ER_STD_INVALID_ARGUMENT, MYF(0), e.what(), funcname);
+  }
+  catch (const std::out_of_range &e)
+  {
+    my_error(ER_STD_OUT_OF_RANGE_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::overflow_error &e)
+  {
+    my_error(ER_STD_OVERFLOW_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::range_error &e)
+  {
+    my_error(ER_STD_RANGE_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::underflow_error &e)
+  {
+    my_error(ER_STD_UNDERFLOW_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::logic_error &e)
+  {
+    my_error(ER_STD_LOGIC_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::runtime_error &e)
+  {
+    my_error(ER_STD_RUNTIME_ERROR, MYF(0), e.what(), funcname);
+  }
+  catch (const std::exception &e)
+  {
+    my_error(ER_STD_UNKNOWN_EXCEPTION, MYF(0), e.what(), funcname);
+  }
+  catch (...)
+  {
+    my_error(ER_UNKNOWN_ERROR, MYF(0));
+  }
+}
+
diff --git a/sql/sql_exception_handler.h b/sql/sql_exception_handler.h
new file mode 100644
index 000000000000..059614b080be
--- /dev/null
+++ b/sql/sql_exception_handler.h
@@ -0,0 +1,65 @@
+#ifndef SQL_EXCEPTION_HANDLER_H_INCLUDED
+#define SQL_EXCEPTION_HANDLER_H_INCLUDED
+
+/*
+  Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+*/
+
+/**
+  @file
+
+  @brief This file declares functions to convert exceptions to MySQL
+  error messages.
+
+  The pattern for use in other functions is:
+
+  @code
+  try
+  {
+    something_that_throws();
+  }
+  catch (...)
+  {
+    handle_foo_exception("function_name");
+  }
+  @endcode
+
+  There are different handlers for different use cases.
+*/
+
+/**
+  Handle an exception of any type.
+
+  Code that could throw exceptions should be wrapped in try/catch, and
+  the catch block should raise a corresponding MySQL error. If this
+  function is called from the catch block, it will raise a specialized
+  error message for many of the std::exception subclasses, or a more
+  generic error message if it is not a std::exception.
+
+  @param funcname the name of the function that caught an exception
+
+  @see handle_gis_exception
+*/
+void handle_std_exception(const char *funcname);
+
+#endif // SQL_EXCEPTION_HANDLER_H_INCLUDED
diff --git a/sql/sql_executor.cc b/sql/sql_executor.cc
index 56ad01caf635..0972dadbbc83 100644
--- a/sql/sql_executor.cc
+++ b/sql/sql_executor.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -104,7 +111,7 @@ JOIN::exec()
   List<Item> *columns_list= &fields_list;
   DBUG_ENTER("JOIN::exec");
 
-  DBUG_ASSERT(select_lex == thd->lex->current_select());
+  assert(select_lex == thd->lex->current_select());
 
   /*
     Check that we either
@@ -113,8 +120,8 @@ JOIN::exec()
     - called for fake_select_lex, which may have temporary tables which do
       not need locking up front.
   */
-  DBUG_ASSERT(!tables || thd->lex->is_query_tables_locked() ||
-              select_lex == unit->fake_select_lex);
+  assert(!tables || thd->lex->is_query_tables_locked() ||
+         select_lex == unit->fake_select_lex);
 
   THD_STAGE_INFO(thd, stage_executing);
   DEBUG_SYNC(thd, "before_join_exec");
@@ -237,7 +244,7 @@ JOIN::create_intermediate_table(QEP_TAB *const tab,
   tmp_table_param.using_outer_summary_function=
     tab->tmp_table_param->using_outer_summary_function;
 
-  DBUG_ASSERT(tab->idx() > 0);
+  assert(tab->idx() > 0);
   tab[-1].next_select= sub_select_op;
   if (!(tab->op= new (thd->mem_root) QEP_tmp_table(tab)))
     goto err;
@@ -424,7 +431,7 @@ JOIN::optimize_distinct()
   if (order && skip_sort_order)
   {
     /* Should already have been optimized away */
-    DBUG_ASSERT(ordered_index_usage == ordered_index_order_by);
+    assert(ordered_index_usage == ordered_index_order_by);
     if (ordered_index_usage == ordered_index_order_by)
     {
       order= NULL;
@@ -624,12 +631,18 @@ end_sj_materialize(JOIN *join, QEP_TAB *qep_tab, bool end_of_records)
     if ((error= table->file->ha_write_row(table->record[0])))
     {
       /* create_ondisk_from_heap will generate error if needed */
-      if (!table->file->is_ignorable_error(error) &&
-          create_ondisk_from_heap(thd, table,
+      if (!table->file->is_ignorable_error(error))
+      {
+        if (create_ondisk_from_heap(thd, table,
                                   sjm->table_param.start_recinfo, 
                                   &sjm->table_param.recinfo, error,
                                   TRUE, NULL))
-        DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */
+          DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */
+        /* Initialize the index, since create_ondisk_from_heap does
+           not replicate the earlier index initialization */
+        if (table->hash_field)
+          table->file->ha_index_init(0, false);
+      }
     }
   }
   DBUG_RETURN(NESTED_LOOP_OK);
@@ -791,7 +804,7 @@ void setup_tmptable_write_func(QEP_TAB *tab)
   QEP_tmp_table *op= (QEP_tmp_table *)tab->op;
   Temp_table_param *const tmp_tbl= tab->tmp_table_param;
 
-  DBUG_ASSERT(table && op);
+  assert(table && op);
 
   if (table->group && tmp_tbl->sum_func_count && 
       !tmp_tbl->precomputed_group_by)
@@ -896,7 +909,7 @@ do_select(JOIN *join)
         so we don't touch it here.
       */
       join->examined_rows++;
-      DBUG_ASSERT(join->examined_rows <= 1);
+      assert(join->examined_rows <= 1);
     }
     else if (join->send_row_on_empty_set())
     {
@@ -940,7 +953,7 @@ do_select(JOIN *join)
   else
   {
     QEP_TAB *qep_tab= join->qep_tab + join->const_tables;
-    DBUG_ASSERT(join->primary_tables);
+    assert(join->primary_tables);
     error= join->first_select(join,qep_tab,0);
     if (error >= NESTED_LOOP_OK)
       error= join->first_select(join,qep_tab,1);
@@ -965,7 +978,7 @@ do_select(JOIN *join)
       sort_tab= &join->qep_tab[join->primary_tables + join->tmp_tables - 1];
     else
     {
-      DBUG_ASSERT(!join->plan_is_const());
+      assert(!join->plan_is_const());
       sort_tab= &join->qep_tab[const_tables];
     }
     if (sort_tab->filesort &&
@@ -996,7 +1009,7 @@ do_select(JOIN *join)
   }
   else
     rc= -1;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (rc)
   {
     DBUG_PRINT("error",("Error: do_select() failed"));
@@ -1056,7 +1069,7 @@ sub_select_op(JOIN *join, QEP_TAB *qep_tab, bool end_of_records)
   QEP_operation *op= qep_tab->op;
 
   /* This function cannot be called if qep_tab has no associated operation */
-  DBUG_ASSERT(op != NULL);
+  assert(op != NULL);
 
   if (end_of_records)
   {
@@ -1072,7 +1085,7 @@ sub_select_op(JOIN *join, QEP_TAB *qep_tab, bool end_of_records)
     setup_join_buffering() disables join buffering if QS_DYNAMIC_RANGE is
     enabled.
   */
-  DBUG_ASSERT(!qep_tab->dynamic_range());
+  assert(!qep_tab->dynamic_range());
 
   rc= op->put_record();
 
@@ -1532,8 +1545,8 @@ evaluate_join_record(JOIN *join, QEP_TAB *const qep_tab)
           know all cond. guards are open and we can apply
           the 'not_exists_optimize'.
         */
-        DBUG_ASSERT(!(tab->table()->reginfo.not_exists_optimize &&
-                     !tab->condition()));
+        assert(!(tab->table()->reginfo.not_exists_optimize &&
+                 !tab->condition()));
 
         if (tab->condition() && !tab->condition()->val_int())
         {
@@ -1602,7 +1615,7 @@ evaluate_join_record(JOIN *join, QEP_TAB *const qep_tab)
          EQ_REF and LooseScan may happen if dependencies in subquery (e.g.,
          outer join) prevents table pull-out.
        */  
-      DBUG_ASSERT(qep_tab->use_order() || qep_tab->type() == JT_EQ_REF);
+      assert(qep_tab->use_order() || qep_tab->type() == JT_EQ_REF);
 
       /* 
          Previous row combination for duplicate-generating range,
@@ -1907,7 +1920,7 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos)
   if (tab->join_cond() && !table->has_null_row())
   {
     // We cannot handle outer-joined tables with expensive join conditions here:
-    DBUG_ASSERT(!tab->join_cond()->is_expensive());
+    assert(!tab->join_cond()->is_expensive());
     if (tab->join_cond()->val_int() == 0)
       table->set_null_row();
   }
@@ -2061,7 +2074,7 @@ join_read_key(QEP_TAB *tab)
     */
     if (tab->table_ref->is_inner_table_of_outer_join())
       table_ref->disable_cache= true;
-    DBUG_ASSERT(!tab->use_order()); //Don't expect sort req. for single row.
+    assert(!tab->use_order()); //Don't expect sort req. for single row.
     if ((error= table->file->ha_index_init(table_ref->key, tab->use_order())))
     {
       (void) report_handler_error(table, error);
@@ -2105,7 +2118,7 @@ join_read_key(QEP_TAB *tab)
   }
   else if (table->status == 0)
   {
-    DBUG_ASSERT(table_ref->has_record);
+    assert(table_ref->has_record);
     table_ref->use_count++;
   }
   table->reset_null_row();
@@ -2124,11 +2137,23 @@ join_read_key(QEP_TAB *tab)
 void
 join_read_key_unlock_row(QEP_TAB *tab)
 {
-  DBUG_ASSERT(tab->ref().use_count);
+  assert(tab->ref().use_count);
   if (tab->ref().use_count)
     tab->ref().use_count--;
 }
 
+/**
+  Rows from const tables are read once but potentially used
+  multiple times during execution of a query.
+  Ensure such rows are never unlocked during query execution.
+*/
+
+void
+join_const_unlock_row(QEP_TAB *tab)
+{
+  assert(tab->type() == JT_CONST);
+}
+
 /**
   Read a table *assumed* to be included in execution of a pushed join.
   This is the counterpart of join_read_key() / join_read_always_key()
@@ -2160,7 +2185,7 @@ join_read_linked_first(QEP_TAB *tab)
   TABLE *table= tab->table();
   DBUG_ENTER("join_read_linked_first");
 
-  DBUG_ASSERT(!tab->use_order()); // Pushed child can't be sorted
+  assert(!tab->use_order()); // Pushed child can't be sorted
   if (!table->file->inited &&
       (error= table->file->ha_index_init(tab->ref().key, tab->use_order())))
   {
@@ -2341,7 +2366,7 @@ join_read_prev_same(READ_RECORD *info)
     to read to the beginning of the index if no qualifying record is
     found.
   */
-  DBUG_ASSERT(table->file->pushed_idx_cond == NULL);
+  assert(table->file->pushed_idx_cond == NULL);
 
   if ((error= table->file->ha_index_prev(table->record[0])))
     return report_handler_error(table, error);
@@ -2401,8 +2426,9 @@ join_init_quick_read_record(QEP_TAB *tab)
                                   HA_POS_ERROR,
                                   false,      // don't force quick range
                                   ORDER::ORDER_NOT_RELEVANT, tab,
-                                  tab->condition(), &needed_reg_dummy, &qck);
-  DBUG_ASSERT(old_qck == NULL || old_qck != qck) ;
+                                  tab->condition(), &needed_reg_dummy, &qck,
+                                  tab->table()->force_index);
+  assert(old_qck == NULL || old_qck != qck) ;
   tab->set_quick(qck);
 
   /*
@@ -2488,7 +2514,7 @@ int join_materialize_derived(QEP_TAB *tab)
   THD *const thd= tab->table()->in_use;
   TABLE_LIST *const derived= tab->table_ref;
 
-  DBUG_ASSERT(derived->uses_materialization() && !tab->materialized);
+  assert(derived->uses_materialization() && !tab->materialized);
 
   if (derived->materializable_is_const()) // Has been materialized by optimizer
     return NESTED_LOOP_OK;
@@ -2537,7 +2563,7 @@ join_materialize_semijoin(QEP_TAB *tab)
   last->next_select= NULL;
   last->set_sj_mat_exec(NULL);
 
-#if !defined(DBUG_OFF) || defined(HAVE_VALGRIND)
+#if !defined(NDEBUG) || defined(HAVE_VALGRIND)
   // Fields of inner tables should not be read anymore:
   for (QEP_TAB *t= first; t <= last; t++)
   {
@@ -2593,9 +2619,9 @@ QEP_TAB::sort_table()
 {
   DBUG_PRINT("info",("Sorting for index"));
   THD_STAGE_INFO(join()->thd, stage_creating_sort_index);
-  DBUG_ASSERT(join()->ordered_index_usage != (filesort->order == join()->order ?
-                                              JOIN::ordered_index_order_by :
-                                              JOIN::ordered_index_group_by));
+  assert(join()->ordered_index_usage != (filesort->order == join()->order ?
+                                         JOIN::ordered_index_order_by :
+                                         JOIN::ordered_index_group_by));
   const bool rc= create_sort_index(join()->thd, join(), this) != 0;
   /*
     Filesort has filtered rows already (see skip_record() in
@@ -2766,12 +2792,12 @@ join_read_next_same_or_null(READ_RECORD *info)
 void QEP_TAB::pick_table_access_method(const JOIN_TAB *join_tab)
 {
   ASSERT_BEST_REF_IN_JOIN_ORDER(join());
-  DBUG_ASSERT(join_tab == join()->best_ref[idx()]);
-  DBUG_ASSERT(table());
-  DBUG_ASSERT(read_first_record == NULL);
+  assert(join_tab == join()->best_ref[idx()]);
+  assert(table());
+  assert(read_first_record == NULL);
   // Only some access methods support reversed access:
-  DBUG_ASSERT(!join_tab->reversed_access || type() == JT_REF ||
-              type() == JT_INDEX_SCAN);
+  assert(!join_tab->reversed_access || type() == JT_REF ||
+         type() == JT_INDEX_SCAN);
   // Fall through to set default access functions:
   switch (type())
   {
@@ -2796,6 +2822,7 @@ void QEP_TAB::pick_table_access_method(const JOIN_TAB *join_tab)
   case JT_CONST:
     read_first_record= join_read_const;
     read_record.read_record= join_no_more_records;
+    read_record.unlock_row= join_const_unlock_row;
     break;
 
   case JT_EQ_REF:
@@ -2820,7 +2847,7 @@ void QEP_TAB::pick_table_access_method(const JOIN_TAB *join_tab)
       join_init_quick_read_record : join_init_read_record;
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
 }
@@ -2834,7 +2861,7 @@ void QEP_TAB::pick_table_access_method(const JOIN_TAB *join_tab)
 void QEP_TAB::set_pushed_table_access_method(void)
 {
   DBUG_ENTER("set_pushed_table_access_method");
-  DBUG_ASSERT(table());
+  assert(table());
 
   /**
     Setup modified access function for children of pushed joins.
@@ -2850,7 +2877,7 @@ void QEP_TAB::set_pushed_table_access_method(void)
      */
     DBUG_PRINT("info", ("Modifying table access method for '%s'",
                         table()->s->table_name.str));
-    DBUG_ASSERT(type() != JT_REF_OR_NULL);
+    assert(type() != JT_REF_OR_NULL);
     read_first_record= join_read_linked_first;
     read_record.read_record= join_read_linked_next;
     // Use the default unlock_row function
@@ -2882,7 +2909,7 @@ end_send(JOIN *join, QEP_TAB *qep_tab, bool end_of_records)
     Note that qep_tab may be one past the last of qep_tab! So don't read its
     pointed content. But you can read qep_tab[-1] then.
   */
-  DBUG_ASSERT(qep_tab == NULL || qep_tab > join->qep_tab);
+  assert(qep_tab == NULL || qep_tab > join->qep_tab);
   //TODO pass fields via argument
   List<Item> *fields= qep_tab ? qep_tab[-1].fields : join->fields;
 
@@ -3103,7 +3130,7 @@ end_send_group(JOIN *join, QEP_TAB *qep_tab, bool end_of_records)
 
 static bool cmp_field_value(Field *field, my_ptrdiff_t diff)
 {
-  DBUG_ASSERT(field);
+  assert(field);
   /*
     Records are different when:
     1) NULL flags aren't the same
@@ -3261,7 +3288,7 @@ ulonglong unique_hash_group(ORDER *group)
   {
     Item *item= *(ord->item);
     field= item->get_tmp_table_field();
-    DBUG_ASSERT(field);
+    assert(field);
     unique_hash(field, &crc);
   }
 
@@ -3486,6 +3513,26 @@ end_update(JOIN *join, QEP_TAB *const qep_tab, bool end_of_records)
   init_tmptable_sum_functions(join->sum_funcs);
   if ((error=table->file->ha_write_row(table->record[0])))
   {
+    /*
+      If the error is HA_ERR_FOUND_DUPP_KEY and the grouping involves a
+      TIMESTAMP field, throw a meaningfull error to user with the actual
+      reason and the workaround. I.e, "Grouping on temporal is
+      non-deterministic for timezones having DST. Please consider switching
+      to UTC for this query". This is a temporary measure until we implement
+      WL#13148 (Do all internal handling TIMESTAMP in UTC timezone), which
+      will make such problem impossible.
+    */
+    if (error == HA_ERR_FOUND_DUPP_KEY)
+    {
+      for (group=table->group ; group ; group=group->next)
+      {
+        if (group->field->type() == MYSQL_TYPE_TIMESTAMP)
+        {
+          my_error(ER_GROUPING_ON_TIMESTAMP_IN_DST, MYF(0));
+          DBUG_RETURN(NESTED_LOOP_ERROR);
+        }
+      }
+    }
     if (create_ondisk_from_heap(join->thd, table,
                                 tmp_tbl->start_recinfo,
                                 &tmp_tbl->recinfo,
@@ -3529,7 +3576,7 @@ end_write_group(JOIN *join, QEP_TAB *const qep_tab, bool end_of_records)
         if (!join->first_record)
         {
           // Dead code or we need a test case for this branch
-          DBUG_ASSERT(false);
+          assert(false);
           /*
             If this is a subquery, we need to save and later restore
             the const table NULL info before clearing the tables
@@ -3634,7 +3681,7 @@ create_sort_index(THD *thd, JOIN *join, QEP_TAB *tab)
   DBUG_ENTER("create_sort_index");
 
   // One row, no need to sort. make_tmp_tables_info should already handle this.
-  DBUG_ASSERT(!join->plan_is_const() && fsort);
+  assert(!join->plan_is_const() && fsort);
   table=  tab->table();
 
   table->sort.io_cache=(IO_CACHE*) my_malloc(key_memory_TABLE_sort_io_cache,
@@ -3647,7 +3694,7 @@ create_sort_index(THD *thd, JOIN *join, QEP_TAB *tab)
   {
     if (tab->type() != JT_REF_OR_NULL && tab->type() != JT_FT)
     {
-      DBUG_ASSERT(tab->type() == JT_REF || tab->type() == JT_EQ_REF);
+      assert(tab->type() == JT_REF || tab->type() == JT_EQ_REF);
       // Update ref value
       if ((cp_buffer_from_ref(thd, table, &tab->ref()) && thd->is_fatal_error))
         goto err;                                   // out of memory
@@ -3725,7 +3772,7 @@ QEP_TAB::remove_duplicates()
   List<Item> *field_list= (this-1)->fields;
   DBUG_ENTER("remove_duplicates");
 
-  DBUG_ASSERT(join()->tmp_tables > 0 && table()->s->tmp_table != NO_TMP_TABLE);
+  assert(join()->tmp_tables > 0 && table()->s->tmp_table != NO_TMP_TABLE);
   THD_STAGE_INFO(join()->thd, stage_removing_duplicates);
 
   TABLE *const tbl= table();
@@ -3905,7 +3952,7 @@ static bool remove_dup_with_hash_index(THD *thd, TABLE *table,
     }
     DBUG_PRINT("info",("field_count: %u  key_length: %lu  total_length: %lu",
                        field_count, key_length, total_length));
-    DBUG_ASSERT(total_length <= key_length);
+    assert(total_length <= key_length);
     key_length= total_length;
     extra_length= ALIGN_SIZE(key_length)-key_length;
   }
@@ -4250,7 +4297,7 @@ setup_copy_fields(THD *thd, Temp_table_param *param,
 	  goto err;
         if (copy)
         {
-          DBUG_ASSERT (param->field_count > (uint) (copy - copy_start));
+          assert (param->field_count > (uint) (copy - copy_start));
           copy->set(tmp, item->result_field);
           item->result_field->move_field(copy->to_ptr, copy->to_null_ptr, 1);
           copy++;
@@ -4320,7 +4367,7 @@ copy_fields(Temp_table_param *param, const THD *thd)
   Copy_field *ptr=param->copy_field;
   Copy_field *end=param->copy_field_end;
 
-  DBUG_ASSERT((ptr != NULL && end >= ptr) || (ptr == NULL && end == NULL));
+  assert((ptr != NULL && end >= ptr) || (ptr == NULL && end == NULL));
 
   for (; ptr < end; ptr++)
     ptr->invoke_do_copy(ptr);
@@ -4416,7 +4463,7 @@ change_to_use_tmp_fields(THD *thd, Ref_ptr_array ref_pointer_array,
         ifield->table_name= iref->table_name;
         ifield->db_name= iref->db_name;
       }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (!item_field->item_name.is_set())
       {
         char buff[256];
@@ -4507,7 +4554,7 @@ change_refs_to_tmp_fields(THD *thd, Ref_ptr_array ref_pointer_array,
 */
 static void save_const_null_info(JOIN *join, table_map *save_nullinfo)
 {
-  DBUG_ASSERT(join->const_tables);
+  assert(join->const_tables);
 
   for (uint tableno= 0; tableno < join->const_tables; tableno++)
   {
@@ -4518,8 +4565,8 @@ static void save_const_null_info(JOIN *join, table_map *save_nullinfo)
       or none set. Otherwise, an additional table_map parameter is
       needed to save/restore_const_null_info() these separately
     */
-    DBUG_ASSERT(table->has_null_row() ? (table->status & STATUS_NULL_ROW) :
-                                        !(table->status & STATUS_NULL_ROW));
+    assert(table->has_null_row() ? (table->status & STATUS_NULL_ROW) :
+           !(table->status & STATUS_NULL_ROW));
 
     if (!table->has_null_row())
       *save_nullinfo|= tab->table_ref->map();
@@ -4544,7 +4591,7 @@ static void save_const_null_info(JOIN *join, table_map *save_nullinfo)
 */
 static void restore_const_null_info(JOIN *join, table_map save_nullinfo)
 {
-  DBUG_ASSERT(join->const_tables && save_nullinfo);
+  assert(join->const_tables && save_nullinfo);
 
   for (uint tableno= 0; tableno < join->const_tables; tableno++)
   {
diff --git a/sql/sql_executor.h b/sql/sql_executor.h
index 135a81c96220..529746804777 100644
--- a/sql/sql_executor.h
+++ b/sql/sql_executor.h
@@ -1,17 +1,24 @@
 #ifndef SQL_EXECUTOR_INCLUDED
 #define SQL_EXECUTOR_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights
  * reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -298,6 +305,7 @@ st_sort_field * make_unireg_sortorder(ORDER *order, uint *length,
 
 int join_read_const_table(JOIN_TAB *tab, POSITION *pos);
 void join_read_key_unlock_row(st_join_table *tab);
+void join_const_unlock_row(st_join_table *tab);
 int join_init_quick_read_record(QEP_TAB *tab);
 int join_init_read_record(QEP_TAB *tab);
 int join_read_first(QEP_TAB *tab);
@@ -381,7 +389,6 @@ class QEP_TAB : public Sql_alloc, public QEP_shared_owner
        All users do init_read_record(), which does memset(),
        rather than invoking a constructor.
     */
-    memset(&read_record, 0, sizeof(read_record));
   }
 
   /// Initializes the object from a JOIN_TAB
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc
index cb5aa5e05728..b6bb1896d320 100644
--- a/sql/sql_get_diagnostics.cc
+++ b/sql/sql_get_diagnostics.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -129,7 +136,7 @@ Diagnostics_information_item::set_value(THD *thd, Item **value)
   /* Get a settable reference to the target. */
   srp= m_target->get_settable_routine_parameter();
 
-  DBUG_ASSERT(srp);
+  assert(srp);
 
   /* Set variable/parameter value. */
   rc= srp->set_value(thd, thd->sp_runtime_ctx, value);
@@ -257,7 +264,7 @@ Condition_information::aggregate(THD *thd, const Diagnostics_area *da)
   while (cond_number--)
     cond= it_conds++;
 
-  DBUG_ASSERT(cond);
+  assert(cond);
 
   /* Evaluate the requested information in the context of the condition. */
   while ((cond_info_item= it_items++))
diff --git a/sql/sql_get_diagnostics.h b/sql/sql_get_diagnostics.h
index b134f43ec3eb..a0034c657117 100644
--- a/sql/sql_get_diagnostics.h
+++ b/sql/sql_get_diagnostics.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -98,7 +105,7 @@ class Diagnostics_information : public Sql_alloc
   */
   virtual ~Diagnostics_information()
   {
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
   /**
@@ -164,7 +171,7 @@ class Diagnostics_information_item : public Sql_alloc
   */
   virtual ~Diagnostics_information_item()
   {
-    DBUG_ASSERT(false);
+    assert(false);
   }
 
 private:
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 37ba98711164..9d5e75eb221b 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -303,7 +310,7 @@ static bool mysql_ha_open_table(THD *thd, TABLE_LIST *hash_tables)
 
   DBUG_ENTER("mysql_ha_open_table");
 
-  DBUG_ASSERT(!thd->locked_tables_mode);
+  assert(!thd->locked_tables_mode);
 
   /*
     Save and reset the open_tables list so that open_tables() won't
@@ -321,7 +328,7 @@ static bool mysql_ha_open_table(THD *thd, TABLE_LIST *hash_tables)
     'hash_tables->table' must be NULL, unless there is pre-opened
     temporary table. open_tables() will set it if successful.
   */
-  DBUG_ASSERT(! hash_tables->table || is_temporary_table(hash_tables));
+  assert(! hash_tables->table || is_temporary_table(hash_tables));
 
   error= open_tables(thd, &hash_tables, &counter, 0);
 
@@ -347,7 +354,7 @@ static bool mysql_ha_open_table(THD *thd, TABLE_LIST *hash_tables)
       If called for re-open, no need to rollback either,
       it will be done at statement end.
     */
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
     close_thread_tables(thd);
     thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
     thd->set_open_tables(backup_open_tables);
@@ -371,8 +378,8 @@ static bool mysql_ha_open_table(THD *thd, TABLE_LIST *hash_tables)
     was opened for HANDLER as it is used to link them together
     (see thd->temporary_tables).
   */
-  DBUG_ASSERT(hash_tables->table->next == NULL ||
-              hash_tables->table->s->tmp_table);
+  assert(hash_tables->table->next == NULL ||
+         hash_tables->table->s->tmp_table);
   /*
     If it's a temp table, don't reset table->query_id as the table is
     being used by this handler. For non-temp tables we use this flag
@@ -380,6 +387,15 @@ static bool mysql_ha_open_table(THD *thd, TABLE_LIST *hash_tables)
   */
   hash_tables->table->open_by_handler= 1;
 
+  /*
+    Generated column expressions have been resolved using the MEM_ROOT of the
+    current HANDLER statement, which is cleared when the statement has finished.
+    Clean up the expressions so that subsequent HANDLER ... READ calls don't
+    access data allocated on a cleared MEM_ROOT. The generated column
+    expressions have to be re-resolved on each HANDLER ... READ call.
+  */
+  hash_tables->table->cleanup_gc_items();
+
   DBUG_PRINT("exit",("OK"));
   DBUG_RETURN(FALSE);
 }
@@ -497,8 +513,8 @@ bool Sql_cmd_handler_read::execute(THD *thd)
   offset_limit_cnt= unit->offset_limit_cnt;
 
   select_lex->context.resolve_in_table_list_only(tables);
-  list.push_front(new Item_field(&select_lex->context,
-                                 NULL, NULL, "*"));
+  list.push_front(new Item_asterisk(&select_lex->context,
+                                    NULL, NULL));
   List_iterator<Item> it(list);
   it++;
 
@@ -570,7 +586,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
         This is implicit and obscure, since HANDLER position is lost in the
         process, but it's the legacy server behaviour we should preserve.
       */
-      DBUG_ASSERT(error && !thd->is_error());
+      assert(error && !thd->is_error());
       mysql_ha_close_table(thd, hash_tables);
       goto retry;
     }
@@ -582,8 +598,8 @@ bool Sql_cmd_handler_read::execute(THD *thd)
   /* save open_tables state */
   backup_open_tables= thd->open_tables;
   /* Always a one-element list, see mysql_ha_open(). */
-  DBUG_ASSERT(hash_tables->table->next == NULL ||
-              hash_tables->table->s->tmp_table);
+  assert(hash_tables->table->next == NULL ||
+         hash_tables->table->s->tmp_table);
   /*
     mysql_lock_tables() needs thd->open_tables to be set correctly to
     be able to handle aborts properly.
@@ -591,7 +607,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
   thd->set_open_tables(hash_tables->table);
 
   /* Re-use Sql_handler_lock_error instance which was initialized earlier. */
-  DBUG_ASSERT(!sql_handler_lock_error.need_reopen());
+  assert(!sql_handler_lock_error.need_reopen());
   thd->push_internal_handler(&sql_handler_lock_error);
 
   lock= mysql_lock_tables(thd, &thd->open_tables, 1, 0);
@@ -602,20 +618,20 @@ bool Sql_cmd_handler_read::execute(THD *thd)
     object with another one (reopen it). This is no longer the case
     with new MDL.
   */
-  DBUG_ASSERT(hash_tables->table == thd->open_tables);
+  assert(hash_tables->table == thd->open_tables);
   /* Restore previous context. */
   thd->set_open_tables(backup_open_tables);
 
   if (sql_handler_lock_error.need_reopen())
   {
-    DBUG_ASSERT(!lock && !thd->is_error());
+    assert(!lock && !thd->is_error());
     /*
       Always close statement transaction explicitly,
       so that the engine doesn't have to count locks.
       There should be no need to perform transaction
       rollback due to deadlock.
     */
-    DBUG_ASSERT(! thd->transaction_rollback_request);
+    assert(! thd->transaction_rollback_request);
     trans_rollback_stmt(thd);
     thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
     mysql_ha_close_table(thd, hash_tables);
@@ -679,6 +695,14 @@ bool Sql_cmd_handler_read::execute(THD *thd)
 
   table->file->init_table_handle_for_HANDLER();
 
+  /*
+    Resolve the generated column expressions. They have to be cleaned up before
+    returning, since the resolved expressions may point to memory allocated on
+    the MEM_ROOT of the current HANDLER ... READ statement, which will be
+    cleared when the statement has completed.
+  */
+  if (table->refix_gc_items(thd)) goto err;
+
   for (num_rows=0; num_rows < select_limit_cnt; )
   {
     switch (mode) {
@@ -688,7 +712,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
         if (table->file->inited == handler::INDEX)
         {
           /* Check if we read from the same index. */
-          DBUG_ASSERT((uint) keyno == table->file->get_index());
+          assert((uint) keyno == table->file->get_index());
           error= table->file->ha_index_next(table->record[0]);
           break;
         }
@@ -720,9 +744,9 @@ bool Sql_cmd_handler_read::execute(THD *thd)
       mode=RNEXT;
       break;
     case RPREV:
-      DBUG_ASSERT(m_key_name != 0);
+      assert(m_key_name != 0);
       /* Check if we read from the same index. */
-      DBUG_ASSERT((uint) keyno == table->file->get_index());
+      assert((uint) keyno == table->file->get_index());
       if (table->file->inited == handler::INDEX)
       {
         error= table->file->ha_index_prev(table->record[0]);
@@ -730,7 +754,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
       }
       /* else fall through, for more info, see comment before 'case RFIRST'. */
     case RLAST:
-      DBUG_ASSERT(m_key_name != 0);
+      assert(m_key_name != 0);
       if (!(error= table->file->ha_index_or_rnd_end()) &&
           !(error= table->file->ha_index_init(keyno, 1)))
         error= table->file->ha_index_last(table->record[0]);
@@ -738,12 +762,12 @@ bool Sql_cmd_handler_read::execute(THD *thd)
       break;
     case RNEXT_SAME:
       /* Continue scan on "(keypart1,keypart2,...)=(c1, c2, ...)  */
-      DBUG_ASSERT(table->file->inited == handler::INDEX);
+      assert(table->file->inited == handler::INDEX);
       error= table->file->ha_index_next_same(table->record[0], key, key_len);
       break;
     case RKEY:
     {
-      DBUG_ASSERT(m_key_name != 0);
+      assert(m_key_name != 0);
       KEY *keyinfo=table->key_info+keyno;
       KEY_PART_INFO *key_part=keyinfo->key_part;
       if (m_key_expr->elements > keyinfo->user_defined_key_parts)
@@ -843,6 +867,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
   trans_commit_stmt(thd);
   mysql_unlock_tables(thd,lock);
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
+  table->cleanup_gc_items();
   my_eof(thd);
   DBUG_PRINT("exit",("OK"));
   DBUG_RETURN(FALSE);
@@ -850,6 +875,7 @@ bool Sql_cmd_handler_read::execute(THD *thd)
 err:
   trans_rollback_stmt(thd);
   mysql_unlock_tables(thd,lock);
+  table->cleanup_gc_items();
 err1:
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
 err0:
@@ -916,7 +942,7 @@ void mysql_ha_rm_tables(THD *thd, TABLE_LIST *tables)
   TABLE_LIST *hash_tables, *next;
   DBUG_ENTER("mysql_ha_rm_tables");
 
-  DBUG_ASSERT(tables);
+  assert(tables);
 
   hash_tables= mysql_ha_find(thd, tables);
 
diff --git a/sql/sql_handler.h b/sql/sql_handler.h
index c00ec43bb1f6..ad701873f66d 100644
--- a/sql/sql_handler.h
+++ b/sql/sql_handler.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index 7e7a9130fdb3..ace6f445dab0 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -608,7 +615,7 @@ bool prepare_simple_select(THD *thd, Item *cond,
   const bool impossible=
     test_quick_select(thd, keys_to_use, 0, HA_POS_ERROR, false,
                       ORDER::ORDER_NOT_RELEVANT, tab, cond,
-                      &needed_reg_dummy, &qck) < 0;
+                      &needed_reg_dummy, &qck, tab->table()->force_index) < 0;
   tab->set_quick(qck);
 
   return impossible || (tab->quick() && tab->quick()->reset());
diff --git a/sql/sql_help.h b/sql/sql_help.h
index b6ae490e7570..6975072a237e 100644
--- a/sql/sql_help.h
+++ b/sql/sql_help.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_hints.yy b/sql/sql_hints.yy
index f0b2dce4cd42..8b0730a639e1 100644
--- a/sql/sql_hints.yy
+++ b/sql/sql_hints.yy
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_hset.h b/sql/sql_hset.h
index 54ec905d9dbe..d570ea902c36 100644
--- a/sql/sql_hset.h
+++ b/sql/sql_hset.h
@@ -1,15 +1,22 @@
 #ifndef SQL_HSET_INCLUDED
 #define SQL_HSET_INCLUDED
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_initialize.cc b/sql/sql_initialize.cc
index f3cbb4b4210b..56d00e7597f5 100644
--- a/sql/sql_initialize.cc
+++ b/sql/sql_initialize.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_initialize.h b/sql/sql_initialize.h
index 79c98c6c2621..c710ca7ec4fe 100644
--- a/sql/sql_initialize.h
+++ b/sql/sql_initialize.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 0509e8872f72..fd970c8caf4f 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -78,7 +85,7 @@ static bool check_single_table_insert(List<Item> &fields, TABLE_LIST *view,
              view->view_db.str, view->view_name.str);
     return true;
   }
-  DBUG_ASSERT(*insert_table_ref && (*insert_table_ref)->is_insertable());
+  assert(*insert_table_ref && (*insert_table_ref)->is_insertable());
 
   return false;
 }
@@ -112,13 +119,13 @@ static bool check_insert_fields(THD *thd, TABLE_LIST *table_list,
 {
   LEX *const lex= thd->lex;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   TABLE_LIST *const saved_insert_table_leaf= lex->insert_table_leaf;
 #endif
 
   TABLE *table= table_list->table;
 
-  DBUG_ASSERT(table_list->is_insertable());
+  assert(table_list->is_insertable());
 
   if (fields.elements == 0 && value_count_known && value_count > 0)
   {
@@ -126,7 +133,7 @@ static bool check_insert_fields(THD *thd, TABLE_LIST *table_list,
       No field list supplied, but a value list has been supplied.
       Use field list of table being updated.
     */
-    DBUG_ASSERT(table);    // This branch is not reached with a view:
+    assert(table);    // This branch is not reached with a view:
 
     lex->insert_table_leaf= table_list;
 
@@ -212,8 +219,8 @@ static bool check_insert_fields(THD *thd, TABLE_LIST *table_list,
     return true;
   }
 
-  DBUG_ASSERT(saved_insert_table_leaf == NULL ||
-              lex->insert_table_leaf == saved_insert_table_leaf);
+  assert(saved_insert_table_leaf == NULL ||
+         lex->insert_table_leaf == saved_insert_table_leaf);
 
   return false;
 }
@@ -237,7 +244,7 @@ static bool check_valid_table_refs(const TABLE_LIST *view, List<Item> &values,
   Item *item;
 
   // A base table will always match the supplied map.
-  DBUG_ASSERT(view->is_view() || (view->table && map));
+  assert(view->is_view() || (view->table && map));
 
   if (!view->is_view())       // Ignore check if called with base table.
     return false;
@@ -496,9 +503,9 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
     resolution context below is not necessary at all since the list of local
     tables for INSERT always consists of one table.
   */
-  DBUG_ASSERT(!table_list->next_local);
-  DBUG_ASSERT(!context->table_list->next_local);
-  DBUG_ASSERT(!context->first_name_resolution_table->next_name_resolution_table);
+  assert(!table_list->next_local);
+  assert(!context->table_list->next_local);
+  assert(!context->first_name_resolution_table->next_name_resolution_table);
 
   /* Save the state of the current name resolution context. */
   ctx_state.save_state(context, table_list);
@@ -507,7 +514,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
     Perform name resolution only in the first table - 'table_list',
     which is the table that is inserted into.
   */
-  DBUG_ASSERT(table_list->next_local == 0);
+  assert(table_list->next_local == 0);
   context->resolve_in_table_list_only(table_list);
 
   if (!is_locked && insert_table->part_info)
@@ -640,7 +647,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
     {
       /* Get SQL thread's rli, even for a slave worker thread */
       Relay_log_info* c_rli= thd->rli_slave->get_c_rli();
-      DBUG_ASSERT(c_rli != NULL);
+      assert(c_rli != NULL);
       if(info.get_duplicate_handling() == DUP_UPDATE &&
          insert_table->next_number_field != NULL &&
          rpl_master_has_bug(c_rli, 24432, TRUE, NULL, NULL))
@@ -707,7 +714,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
                                                TRG_EVENT_INSERT,
                                                insert_table->s->fields))
       {
-        DBUG_ASSERT(thd->is_error());
+        assert(thd->is_error());
         /*
           TODO: Convert warnings to errors if values_list.elements == 1
           and check that all items return warning in case of problem with
@@ -721,7 +728,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
                                                   table_list);
       if (res)
       {
-        DBUG_ASSERT(thd->is_error());
+        assert(thd->is_error());
         error= 1;
         break;
       }
@@ -753,7 +760,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
                                                TRG_EVENT_INSERT,
                                                insert_table->s->fields))
       {
-        DBUG_ASSERT(thd->is_error());
+        assert(thd->is_error());
         error= 1;
         break;
       }
@@ -855,7 +862,7 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
 	routines did not result in any error due to the KILLED.  In
 	such case the flag is ignored for constructing binlog event.
 	*/
-	DBUG_ASSERT(thd->killed != THD::KILL_BAD_DATA || error > 0);
+	assert(thd->killed != THD::KILL_BAD_DATA || error > 0);
         if (thd->binlog_query(THD::ROW_QUERY_TYPE,
                               thd->query().str, thd->query().length,
 			           transactional_table, FALSE, FALSE,
@@ -863,9 +870,9 @@ bool Sql_cmd_insert::mysql_insert(THD *thd,TABLE_LIST *table_list)
 	  error= 1;
       }
     }
-    DBUG_ASSERT(transactional_table || !changed || 
-                thd->get_transaction()->cannot_safely_rollback(
-                  Transaction_ctx::STMT));
+    assert(transactional_table || !changed || 
+           thd->get_transaction()->cannot_safely_rollback(
+                                                          Transaction_ctx::STMT));
   }
   THD_STAGE_INFO(thd, stage_end);
   /*
@@ -963,9 +970,9 @@ static bool check_view_insertability(THD *thd, TABLE_LIST *view,
   if (!used_fields_buff)
     DBUG_RETURN(true);                      /* purecov: inspected */
 
-  DBUG_ASSERT(view->table == NULL &&
-              table != NULL &&
-              view->field_translation != 0);
+  assert(view->table == NULL &&
+         table != NULL &&
+         view->field_translation != 0);
 
   (void) bitmap_init(&used_fields, used_fields_buff, table->s->fields, 0);
   bitmap_clear_all(&used_fields);
@@ -1164,7 +1171,7 @@ static void prepare_for_positional_update(TABLE *table, TABLE_LIST *tables)
     return;
   }
 
-  DBUG_ASSERT(tables->is_view());
+  assert(tables->is_view());
   List_iterator<TABLE_LIST> it(*tables->view_tables);
   TABLE_LIST *tbl;
   while ((tbl= it++))
@@ -1204,10 +1211,10 @@ bool Sql_cmd_insert_base::mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
   DBUG_ENTER("mysql_prepare_insert");
 
   // INSERT should have a SELECT or VALUES clause
-  DBUG_ASSERT (!select_insert || !values);
+  assert (!select_insert || !values);
 
   // Number of update fields must match number of update values
-  DBUG_ASSERT(insert_update_list.elements == insert_value_list.elements);
+  assert(insert_update_list.elements == insert_value_list.elements);
 
   LEX * const lex= thd->lex;
   SELECT_LEX *const select_lex= lex->select_lex;
@@ -1265,13 +1272,13 @@ bool Sql_cmd_insert_base::mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
   if (values)
   {
     // if we have INSERT ... VALUES () we cannot have a GROUP BY clause
-    DBUG_ASSERT (!select_lex->group_list.elements);
+    assert (!select_lex->group_list.elements);
 
     /*
       Perform name resolution only in the first table - 'table_list',
       which is the table that is inserted into.
      */
-    DBUG_ASSERT(table_list->next_local == NULL);
+    assert(table_list->next_local == NULL);
     table_list->next_local= NULL;
     context->resolve_in_table_list_only(table_list);
 
@@ -1384,7 +1391,7 @@ bool Sql_cmd_insert_base::mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
         res= validate_gc_assignment(thd, &insert_update_list,
                                     &insert_value_list,
                                     lex->insert_table_leaf->table);
-      DBUG_ASSERT(!table_list->next_name_resolution_table);
+      assert(!table_list->next_name_resolution_table);
       if (select_lex->group_list.elements == 0 && !select_lex->with_sum_func)
       {
         /*
@@ -1527,7 +1534,7 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
 
   if (duplicate_handling == DUP_REPLACE || duplicate_handling == DUP_UPDATE)
   {
-    DBUG_ASSERT(duplicate_handling != DUP_UPDATE || update != NULL);
+    assert(duplicate_handling != DUP_UPDATE || update != NULL);
     while ((error=table->file->ha_write_row(table->record[0])))
     {
       uint key_nr;
@@ -1574,14 +1581,14 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
         has value MAX_KEY as a marker for the case when no information
         about key can be found. In the last case we have to require
         that storage engine has the flag HA_DUPLICATE_POS turned on.
-        If this invariant is false then DBUG_ASSERT will crash
+        If this invariant is false then assert will crash
         the server built in debug mode. For the server that was built
         without DEBUG we have additional check for the value of key_nr
         in the code below in order to report about error in any case.
       */
-      DBUG_ASSERT(key_nr != MAX_KEY ||
-                  (key_nr == MAX_KEY &&
-                   (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
+      assert(key_nr != MAX_KEY ||
+             (key_nr == MAX_KEY &&
+              (table->file->ha_table_flags() & HA_DUPLICATE_POS)));
 
       DEBUG_SYNC(thd, "write_row_replace");
 
@@ -1623,6 +1630,14 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
 	    goto err;
 	  }
 	}
+	/*
+          If we convert INSERT operation internally to an UPDATE.
+          An INSERT operation may update table->vfield for BLOB fields,
+          So here we recalculate data for generated columns.
+	*/
+        if (table->vfield) {
+          update_generated_write_fields(table->write_set, table);
+        }
 	key_copy((uchar*) key,table->record[0],table->key_info+key_nr,0);
 	if ((error=(table->file->ha_index_read_idx_map(table->record[1],key_nr,
                                                        (uchar*) key, HA_WHOLE_KEY,
@@ -1646,7 +1661,13 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
           that matches, is updated. If update causes a conflict again,
           an error is returned
         */
-	DBUG_ASSERT(table->insert_values != NULL);
+	assert(table->insert_values != NULL);
+        /*
+          The insert has failed, store the insert_id generated for
+          this row to be re-used for the next insert.
+        */
+        if (insert_id_for_cur_row > 0) prev_insert_id = insert_id_for_cur_row;
+
         store_record(table,insert_values);
         /*
           Special check for BLOB/GEOMETRY field in statements with
@@ -1658,8 +1679,8 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
                                       &mem_root))
            goto before_trg_err;
         restore_record(table,record[1]);
-        DBUG_ASSERT(update->get_changed_columns()->elements ==
-                    update->update_values->elements);
+        assert(update->get_changed_columns()->elements ==
+               update->update_values->elements);
         if (fill_record_n_invoke_before_triggers(thd, update,
                                                  *update->get_changed_columns(),
                                                  *update->update_values,
@@ -1808,6 +1829,7 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
           we just should not expose this fact to users by invoking
           ON UPDATE triggers.
 	*/
+
 	if (last_uniq_key(table,key_nr) &&
 	    !table->file->referenced_by_foreign_key() &&
             (!table->triggers || !table->triggers->has_delete_triggers()))
@@ -1902,14 +1924,13 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
     thd->get_transaction()->mark_modified_non_trans_table(
       Transaction_ctx::STMT);
   free_root(&mem_root, MYF(0));
-  thd->lex->clear_values_map();
   DBUG_RETURN(trg_error);
 
 err:
   {
     myf error_flags= MYF(0);                      /**< Flag for fatal errors */
     info->last_errno= error;
-    DBUG_ASSERT(thd->lex->current_select() != NULL);
+    assert(thd->lex->current_select() != NULL);
     if (table->file->is_fatal_error(error))
       error_flags|= ME_FATALERROR;
 
@@ -1922,7 +1943,6 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, COPY_INFO *update)
     my_safe_afree(key, table->s->max_unique_length, MAX_KEY_LENGTH);
   table->column_bitmaps_set(save_read_set, save_write_set);
   free_root(&mem_root, MYF(0));
-  thd->lex->clear_values_map();
   DBUG_RETURN(1);
 }
 
@@ -1999,8 +2019,8 @@ bool Sql_cmd_insert_select::mysql_insert_select_prepare(THD *thd)
     exclude first table from leaf tables list, because it belong to
     INSERT
   */
-  DBUG_ASSERT(select_lex->leaf_tables != NULL);
-  DBUG_ASSERT(lex->insert_table == select_lex->leaf_tables->top_table());
+  assert(select_lex->leaf_tables != NULL);
+  assert(lex->insert_table == select_lex->leaf_tables->top_table());
 
   select_lex->leaf_tables= lex->insert_table->next_local;
   if (select_lex->leaf_tables != NULL)
@@ -2069,7 +2089,7 @@ int Query_result_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
       We use next_name_resolution_table destructively, so check it first
       (views?).
     */
-    DBUG_ASSERT (!table_list->next_name_resolution_table);
+    assert (!table_list->next_name_resolution_table);
     if (lex->select_lex->group_list.elements == 0 &&
         !lex->select_lex->with_sum_func)
     {
@@ -2151,7 +2171,7 @@ int Query_result_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   {
     /* Get SQL thread's rli, even for a slave worker thread */
     Relay_log_info *c_rli= thd->rli_slave->get_c_rli();
-    DBUG_ASSERT(c_rli != NULL);
+    assert(c_rli != NULL);
     if (duplicate_handling == DUP_UPDATE &&
         table->next_number_field != NULL &&
         rpl_master_has_bug(c_rli, 24432, TRUE, NULL, NULL))
@@ -2168,6 +2188,8 @@ int Query_result_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   if (duplicate_handling == DUP_UPDATE)
     table->file->extra(HA_EXTRA_INSERT_WITH_UPDATE);
 
+  /* Decide the logging format prior to preparing table/record metadata */
+  res= res || thd->decide_logging_format(table_list);
   if (!res)
   {
      prepare_triggers_for_insert_stmt(table);
@@ -2205,7 +2227,7 @@ int Query_result_insert::prepare2()
   if (thd->locked_tables_mode <= LTM_LOCK_TABLES &&
       !thd->lex->describe)
   {
-    DBUG_ASSERT(!bulk_insert_started);
+    assert(!bulk_insert_started);
     // TODO: Is there no better estimation than 0 == Unknown number of rows?
     table->file->ha_start_bulk_insert((ha_rows) 0);
     bulk_insert_started= true;
@@ -2220,7 +2242,7 @@ void Query_result_insert::cleanup()
     Query_result_insert/Query_result_create are never re-used
     in prepared statement
   */
-  DBUG_ASSERT(0);
+  assert(0);
 }
 
 
@@ -2363,9 +2385,9 @@ bool Query_result_insert::send_eof()
     query_cache.invalidate(thd, table, TRUE);
   }
 
-  DBUG_ASSERT(trans_table || !changed || 
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(trans_table || !changed || 
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
 
   /*
     Write to binlog before commiting transaction.  No statement will
@@ -2486,9 +2508,9 @@ void Query_result_insert::abort_result_set()
 	if (changed)
 	  query_cache.invalidate(thd, table, TRUE);
     }
-    DBUG_ASSERT(transactional_table || !changed ||
-		thd->get_transaction()->cannot_safely_rollback(
-		  Transaction_ctx::STMT));
+    assert(transactional_table || !changed ||
+           thd->get_transaction()->cannot_safely_rollback(
+                                                          Transaction_ctx::STMT));
     table->file->ha_release_auto_increment();
   }
 
@@ -2615,10 +2637,20 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
       table_field= ((Item_field *) item)->field;
       break;
     default:
-      table_field= NULL;
+      {
+        /*
+         If the expression is of temporal type having date and non-nullable,
+         a zero date is generated. If in strict mode, then zero date is
+         invalid. For such cases no default is generated.
+       */
+        table_field= NULL;
+        if (tmp_table_field->is_temporal_with_date() &&
+            thd->is_strict_mode() && !item->maybe_null)
+          tmp_table_field->flags|= NO_DEFAULT_VALUE_FLAG;
+      }
     }
 
-    DBUG_ASSERT(tmp_table_field->gcol_info== NULL && tmp_table_field->stored_in_db);
+    assert(tmp_table_field->gcol_info== NULL && tmp_table_field->stored_in_db);
     Create_field *cr_field= new Create_field(tmp_table_field, table_field);
 
     if (!cr_field)
@@ -2680,7 +2712,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
             it preparable for open. Anyway we can't drop temporary table if
             we are unable to fint it.
           */
-          DBUG_ASSERT(0);
+          assert(0);
         }
         else
         {
@@ -2711,7 +2743,7 @@ int Query_result_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   DBUG_ENTER("Query_result_create::prepare");
 
   unit= u;
-  DBUG_ASSERT(create_table->table == NULL);
+  assert(create_table->table == NULL);
 
   DEBUG_SYNC(thd,"create_table_select_before_check_if_exists");
 
@@ -2806,6 +2838,10 @@ int Query_result_create::prepare2()
         return error;
 
       TABLE const *const table = *tables;
+      create_table->table->set_binlog_drop_if_temp(
+        !thd->is_current_stmt_binlog_disabled()
+        && !thd->is_current_stmt_binlog_format_row());
+
       if (thd->is_current_stmt_binlog_format_row()  &&
           !table->s->tmp_table)
       {
@@ -2842,7 +2878,7 @@ int Query_result_create::prepare2()
   }
   if (extra_lock)
   {
-    DBUG_ASSERT(m_plock == NULL);
+    assert(m_plock == NULL);
 
     if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
       m_plock= &m_lock;
@@ -2924,21 +2960,20 @@ int Query_result_create::binlog_show_create_table(TABLE **tables, uint count)
     schema that will do a close_thread_tables(), destroying the
     statement transaction cache.
   */
-  DBUG_ASSERT(thd->is_current_stmt_binlog_format_row());
-  DBUG_ASSERT(tables && *tables && count > 0);
+  assert(thd->is_current_stmt_binlog_format_row());
+  assert(tables && *tables && count > 0);
 
   char buf[2048];
   String query(buf, sizeof(buf), system_charset_info);
   int result;
   TABLE_LIST tmp_table_list;
 
-  memset(&tmp_table_list, 0, sizeof(tmp_table_list));
   tmp_table_list.table = *tables;
   query.length(0);      // Have to zero it since constructor doesn't
 
   result= store_create_info(thd, &tmp_table_list, &query, create_info,
                             /* show_database */ TRUE);
-  DBUG_ASSERT(result == 0); /* store_create_info() always return 0 */
+  assert(result == 0); /* store_create_info() always return 0 */
 
   if (mysql_bin_log.is_open())
   {
@@ -3080,8 +3115,8 @@ void Query_result_create::abort_result_set()
 
 bool Sql_cmd_insert::execute(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_REPLACE ||
-              thd->lex->sql_command == SQLCOM_INSERT);
+  assert(thd->lex->sql_command == SQLCOM_REPLACE ||
+         thd->lex->sql_command == SQLCOM_INSERT);
 
   bool res= false;
   LEX *const lex= thd->lex;
@@ -3126,18 +3161,20 @@ bool Sql_cmd_insert::execute(THD *thd)
                     const char act[]=
                       "now "
                       "wait_for signal.continue";
-                    DBUG_ASSERT(opt_debug_sync_timeout > 0);
-                    DBUG_ASSERT(!debug_sync_set_action(current_thd,
-                                                       STRING_WITH_LEN(act)));
+                    assert(opt_debug_sync_timeout > 0);
+                    assert(!debug_sync_set_action(current_thd,
+                                                  STRING_WITH_LEN(act)));
                   };);
+
+  thd->lex->clear_values_map();
   return res;
 }
 
 
 bool Sql_cmd_insert_select::execute(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->sql_command == SQLCOM_REPLACE_SELECT ||
-              thd->lex->sql_command == SQLCOM_INSERT_SELECT);
+  assert(thd->lex->sql_command == SQLCOM_REPLACE_SELECT ||
+         thd->lex->sql_command == SQLCOM_INSERT_SELECT);
 
   bool res= false;
   LEX *const lex= thd->lex;
@@ -3223,6 +3260,7 @@ bool Sql_cmd_insert_select::execute(THD *thd)
     thd->first_successful_insert_id_in_cur_stmt=
       thd->first_successful_insert_id_in_prev_stmt;
 
+  thd->lex->clear_values_map();
   return res;
 }
 
diff --git a/sql/sql_insert.h b/sql/sql_insert.h
index 9a66e5486ef1..282d92e24c39 100644
--- a/sql/sql_insert.h
+++ b/sql/sql_insert.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -120,9 +127,9 @@ class Query_result_insert :public Query_result_interceptor
             update_values),
      insert_into_view(table_list_par && table_list_par->is_view())
   {
-    DBUG_ASSERT(target_or_source_columns != NULL);
-    DBUG_ASSERT(target_columns == target_or_source_columns ||
-                target_columns == NULL);
+    assert(target_or_source_columns != NULL);
+    assert(target_columns == target_or_source_columns ||
+           target_columns == NULL);
   }
 
 
diff --git a/sql/sql_join_buffer.cc b/sql/sql_join_buffer.cc
index b3df15168f4f..f5d0b9a37ea2 100644
--- a/sql/sql_join_buffer.cc
+++ b/sql/sql_join_buffer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -508,7 +515,7 @@ bool JOIN_CACHE::alloc_buffer()
 static void filter_gcol_for_dynamic_range_scan(QEP_TAB *const tab)
 {
   TABLE *table= tab->table();
-  DBUG_ASSERT(tab->dynamic_range() && table->vfield);
+  assert(tab->dynamic_range() && table->vfield);
 
   for (uint key= 0; key < table->s->keys; ++key)
   {
@@ -559,6 +566,7 @@ static void filter_gcol_for_dynamic_range_scan(QEP_TAB *const tab)
 
 void JOIN_CACHE::filter_virtual_gcol_base_cols()
 {
+  assert(save_read_set_for_gcol.size() == 0);
   for (QEP_TAB *tab= qep_tab - tables; tab < qep_tab; tab++)
   {
     TABLE *table= tab->table();
@@ -566,8 +574,8 @@ void JOIN_CACHE::filter_virtual_gcol_base_cols()
       continue;
 
     const uint index= tab->effective_index();
-    if (index != MAX_KEY &&
-        table->index_contains_some_virtual_gcol(index) &&
+    const bool cov_index =
+      index != MAX_KEY && table->index_contains_some_virtual_gcol(index) &&
         /*
           There are two cases:
           - If the table scan uses covering index scan, we can get the value
@@ -577,24 +585,40 @@ void JOIN_CACHE::filter_virtual_gcol_base_cols()
             After restore the base columns, the value of virtual generated
             columns can be calculated correctly.
         */
-        table->covering_keys.is_set(index))
+        table->covering_keys.is_set(index);
+
+    if (!(cov_index || tab->dynamic_range())) continue;
+
+    /*
+      Save of a copy of table->read_set in save_read_set so that it can be
+      restored. tmp_set cannot be used as recipient for this as it's already
+      used in other parts of JOIN_CACHE::init().
+    */
+    my_bitmap_map *bitbuf =
+      (my_bitmap_map *)alloc_root(tab->table()->in_use->mem_root,
+                                  table->s->column_bitmap_size);
+    MY_BITMAP *save_read_set =
+      (MY_BITMAP *)alloc_root(tab->table()->in_use->mem_root,
+                              sizeof(MY_BITMAP));
+    bitmap_init(save_read_set, bitbuf, table->s->fields, false);
+    bitmap_copy(save_read_set, table->read_set);
+    /*
+      restore_virtual_gcol_base_cols() will need old bitmap so we save a
+      reference to it.
+    */
+    save_read_set_for_gcol.push_back(save_read_set);
+
+    if (cov_index)
     {
-      DBUG_ASSERT(bitmap_is_clear_all(&table->tmp_set));
-      // Keep table->read_set in tmp_set so that it can be restored
-      bitmap_copy(&table->tmp_set, table->read_set);
       bitmap_clear_all(table->read_set);
       table->mark_columns_used_by_index_no_reset(index, table->read_set);
       if (table->s->primary_key != MAX_KEY)
         table->mark_columns_used_by_index_no_reset(table->s->primary_key,
                                                    table->read_set);
-      bitmap_intersect(table->read_set, &table->tmp_set);
+      bitmap_intersect(table->read_set, save_read_set);
     }
     else if (tab->dynamic_range())
     {
-      DBUG_ASSERT(bitmap_is_clear_all(&table->tmp_set));
-      // Keep table->read_set in tmp_set so that it can be restored
-      bitmap_copy(&table->tmp_set, table->read_set);
-
       filter_gcol_for_dynamic_range_scan(tab);
     }
   }
@@ -608,18 +632,25 @@ void JOIN_CACHE::filter_virtual_gcol_base_cols()
 
 void JOIN_CACHE::restore_virtual_gcol_base_cols()
 {
+  MY_BITMAP **save_read_set= save_read_set_for_gcol.begin();
+
   for (QEP_TAB *tab= qep_tab - tables; tab < qep_tab; tab++)
   {
     TABLE *table= tab->table();
     if (table->vfield == NULL)
       continue;
 
-    if (!bitmap_is_clear_all(&table->tmp_set))
-    {
-      bitmap_copy(table->read_set, &table->tmp_set);
-      bitmap_clear_all(&table->tmp_set);
-    }
+    const uint index= tab->effective_index();
+    const bool cov_index =
+      (index != MAX_KEY && table->index_contains_some_virtual_gcol(index) &&
+       table->covering_keys.is_set(index));
+
+    if (!(cov_index || tab->dynamic_range())) continue;
+
+    bitmap_copy(table->read_set, *save_read_set);
+    save_read_set++;
   }
+  assert(save_read_set == save_read_set_for_gcol.end());
 }
 
 /* 
@@ -1072,7 +1103,7 @@ uint JOIN_CACHE_BKA::aux_buffer_min_size() const
     For DS-MRR to work, the sort buffer must have space to store the
     reference (or primary key) for at least one record.
   */
-  DBUG_ASSERT(qep_tab->table()->file->stats.mrr_length_per_rec > 0);
+  assert(qep_tab->table()->file->stats.mrr_length_per_rec > 0);
   return qep_tab->table()->file->stats.mrr_length_per_rec;
 }
 
@@ -1559,7 +1590,7 @@ bool JOIN_CACHE::get_match_flag_by_pos(uchar *rec_ptr)
     uchar *prev_rec_ptr= prev_cache->get_rec_ref(rec_ptr);
     return prev_cache->get_match_flag_by_pos(prev_rec_ptr);
   } 
-  DBUG_ASSERT(1);
+  assert(1);
   return FALSE;
 }
 
@@ -1791,7 +1822,7 @@ bool JOIN_CACHE::read_referenced_field(CACHE_FIELD *copy,
 
 bool JOIN_CACHE::skip_record_if_match()
 {
-  DBUG_ASSERT(with_match_flag && with_length);
+  assert(with_match_flag && with_length);
   uint offset= size_of_rec_len;
   if (prev_cache)
     offset+= prev_cache->get_size_of_rec_offset();
@@ -1884,7 +1915,7 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
     TABLE_LIST * const tr= qep_tab[- cnt].table_ref;
     const uint8 status= tr->table->status;
     const table_map map= tr->map();
-    DBUG_ASSERT((status & (STATUS_DELETED | STATUS_UPDATED)) == 0);
+    assert((status & (STATUS_DELETED | STATUS_UPDATED)) == 0);
     if (status & STATUS_GARBAGE)
       saved_status_bits[0]|= map;
     if (status & STATUS_NOT_FOUND)
@@ -1968,7 +1999,7 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
 
   if (skip_last)
   {
-    DBUG_ASSERT(!is_key_access());
+    assert(!is_key_access());
     /*
        Restore the last record from the join buffer to generate
        all extensions for it.
@@ -2059,7 +2090,7 @@ enum_nested_loop_state JOIN_CACHE_BNL::join_matching_records(bool skip_last)
     put_record_in_cache();     
 
   // See setup_join_buffering(=: dynamic range => no cache.
-  DBUG_ASSERT(!(qep_tab->dynamic_range() && qep_tab->quick()));
+  assert(!(qep_tab->dynamic_range() && qep_tab->quick()));
 
   /* Start retrieving all records of the joined table */
   if ((error= (*qep_tab->read_first_record)(qep_tab)))
@@ -2180,7 +2211,7 @@ bool JOIN_CACHE::set_match_flag_if_none(QEP_TAB *first_inner,
   while (cache->qep_tab != first_inner)
   {
     cache= cache->prev_cache;
-    DBUG_ASSERT(cache);
+    assert(cache);
     rec_ptr= cache->get_rec_ref(rec_ptr);
   } 
   if (rec_ptr[0] == 0)
@@ -2362,7 +2393,7 @@ enum_nested_loop_state JOIN_CACHE::join_null_complements(bool skip_last)
   cnt= records - (is_key_access() ? 0 : MY_TEST(skip_last));
 
   /* This function may be called only for inner tables of outer joins */ 
-  DBUG_ASSERT(qep_tab->first_inner() != NO_PLAN_IDX);
+  assert(qep_tab->first_inner() != NO_PLAN_IDX);
 
   // Make sure that the rowid buffer is bound, duplicates weedout needs it
   if (qep_tab->copy_current_rowid &&
@@ -2558,7 +2589,7 @@ bool bka_range_seq_skip_record(range_seq_t rseq, char *range_info, uchar *rowid)
 enum_nested_loop_state JOIN_CACHE_BKA::join_matching_records(bool skip_last)
 {
   /* The value of skip_last must be always FALSE when this function is called */
-  DBUG_ASSERT(!skip_last);
+  assert(!skip_last);
 
   /* Return at once if there are no records in the join buffer */
   if (!records)
@@ -2647,7 +2678,7 @@ JOIN_CACHE_BKA::init_join_matching_records(RANGE_SEQ_IF *seq_funcs, uint ranges)
   qep_tab->table()->reset_null_row();
 
   /* Dynamic range access is never used with BKA */
-  DBUG_ASSERT(!qep_tab->dynamic_range());
+  assert(!qep_tab->dynamic_range());
 
   init_mrr_buff();
 
@@ -2735,7 +2766,7 @@ uint JOIN_CACHE_BKA::get_next_key(uchar ** key)
     return 0;
 
   /* Any record in a BKA cache is prepended with its length, which we need */
-  DBUG_ASSERT(with_length);
+  assert(with_length);
 
   /*
     Read keys until find non-ignorable one or EOF.
@@ -2771,7 +2802,7 @@ uint JOIN_CACHE_BKA::get_next_key(uchar ** key)
       /* An embedded key is taken directly from the join buffer */
       *key= pos;
       len= emb_key_length;
-      DBUG_ASSERT(len != 0);
+      assert(len != 0);
     }
     else
     {
@@ -2787,12 +2818,12 @@ uint JOIN_CACHE_BKA::get_next_key(uchar ** key)
         for (cache= prev_cache; key_arg_count; cache= cache->prev_cache)
         {
           uint len2= 0;
-          DBUG_ASSERT(cache);
+          assert(cache);
           rec_ptr= cache->get_rec_ref(rec_ptr);
           while (!cache->referenced_fields)
           {
             cache= cache->prev_cache;
-            DBUG_ASSERT(cache);
+            assert(cache);
             rec_ptr= cache->get_rec_ref(rec_ptr);
           }
           while (key_arg_count && 
@@ -2828,7 +2859,7 @@ uint JOIN_CACHE_BKA::get_next_key(uchar ** key)
         cp_buffer_from_ref(join->thd, qep_tab->table(), ref);
         *key= ref->key_buff;
         len= ref->key_length;
-        DBUG_ASSERT(len != 0);
+        assert(len != 0);
       }
     }
   }
@@ -3460,7 +3491,7 @@ enum_nested_loop_state
 JOIN_CACHE_BKA_UNIQUE::join_matching_records(bool skip_last)
 {
   /* The value of skip_last must be always FALSE when this function is called */
-  DBUG_ASSERT(!skip_last);
+  assert(!skip_last);
 
   /* Return at once if there are no records in the join buffer */
   if (!records)
@@ -3603,7 +3634,7 @@ uint JOIN_CACHE_BKA_UNIQUE::get_next_key(uchar ** key)
 
   *key = use_emb_key ? get_emb_key(curr_key_entry) : curr_key_entry;
 
-  DBUG_ASSERT(*key >= buff && *key < hash_table);
+  assert(*key >= buff && *key < hash_table);
 
   return key_length;
 }
diff --git a/sql/sql_join_buffer.h b/sql/sql_join_buffer.h
index 81619da3fcc8..3ea26a8a9d74 100644
--- a/sql/sql_join_buffer.h
+++ b/sql/sql_join_buffer.h
@@ -2,22 +2,31 @@
 #define SQL_JOIN_CACHE_INCLUDED
 
 #include "sql_executor.h"
+#include "mem_root_array.h"
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+
 /** @file Join buffer classes */
 
 /* 
@@ -30,6 +39,7 @@
 #define CACHE_VARSTR1   3        /* short string value (length takes 1 byte) */ 
 #define CACHE_VARSTR2   4        /* long string value (length takes 2 bytes) */
 
+
 /*
   The CACHE_FIELD structure used to describe fields of records that
   are written into a join cache buffer from record buffers and backward.
@@ -97,6 +107,11 @@ class JOIN_CACHE :public QEP_operation
   uint size_of_rec_len;
   /* Size of the offset of a field within a record in the cache */   
   uint size_of_fld_ofs;
+  /**
+    In init() there are several uses of TABLE::tmp_set, so one tmp_set isn't
+    enough; this one is specific of generated column handling.
+  */
+  Mem_root_array<MY_BITMAP*, true> save_read_set_for_gcol;
 
 protected:
        
@@ -344,7 +359,9 @@ class JOIN_CACHE :public QEP_operation
   /* Shall calculate how much space is remaining in the join buffer */ 
   virtual ulong rem_space() 
   { 
-    return std::max<ulong>(buff_size-(end_pos-buff)-aux_buff_size, 0UL);
+    assert(end_pos >= buff);
+    assert(buff_size >= ulong(end_pos - buff));
+    return ulong(buff_size - (end_pos - buff) - aux_buff_size);
   }
 
   /* Shall skip record from the join buffer if its match flag is on */
@@ -460,8 +477,10 @@ class JOIN_CACHE :public QEP_operation
     linked.
   */
   JOIN_CACHE(JOIN *j, QEP_TAB *qep_tab_arg, JOIN_CACHE *prev)
-    : QEP_operation(qep_tab_arg), join(j), buff(NULL), prev_cache(prev),
-    next_cache(NULL)
+    : QEP_operation(qep_tab_arg),
+      save_read_set_for_gcol(qep_tab_arg->table()->in_use->mem_root),
+      join(j), buff(NULL), prev_cache(prev),
+      next_cache(NULL)
     {
       if (prev_cache)
         prev_cache->next_cache= this;
@@ -812,8 +831,10 @@ class JOIN_CACHE_BKA_UNIQUE :public JOIN_CACHE_BKA
   */ 
   ulong rem_space() 
   { 
-    return std::max(static_cast<ulong>(last_key_entry - end_pos-aux_buff_size),
-                    0UL);
+    assert(last_key_entry >= end_pos);
+    assert(buff_size >= aux_buff_size);
+    assert(ulong(last_key_entry - end_pos) >= aux_buff_size);
+    return ulong(last_key_entry - end_pos - aux_buff_size);
   }
 
   /* 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 141eebe63540..afddba29e0d9 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -262,8 +269,8 @@ Lex_input_stream::reset(const char *buffer, size_t length)
 
 void Lex_input_stream::body_utf8_start(THD *thd, const char *begin_ptr)
 {
-  DBUG_ASSERT(begin_ptr);
-  DBUG_ASSERT(m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + m_buf_length);
+  assert(begin_ptr);
+  assert(m_cpp_buf <= begin_ptr && begin_ptr <= m_cpp_buf + m_buf_length);
 
   size_t body_utf8_length=
     (m_buf_length / thd->variables.character_set_client->mbminlen) *
@@ -300,8 +307,8 @@ void Lex_input_stream::body_utf8_start(THD *thd, const char *begin_ptr)
 void Lex_input_stream::body_utf8_append(const char *ptr,
                                         const char *end_ptr)
 {
-  DBUG_ASSERT(m_cpp_buf <= ptr && ptr <= m_cpp_buf + m_buf_length);
-  DBUG_ASSERT(m_cpp_buf <= end_ptr && end_ptr <= m_cpp_buf + m_buf_length);
+  assert(m_cpp_buf <= ptr && ptr <= m_cpp_buf + m_buf_length);
+  assert(m_cpp_buf <= end_ptr && end_ptr <= m_cpp_buf + m_buf_length);
 
   if (!m_body_utf8)
     return;
@@ -505,7 +512,7 @@ bool lex_start(THD *thd)
   thd->init_cost_model();
 
   const bool status= lex->new_top_level_query();
-  DBUG_ASSERT(lex->current_select() == NULL);
+  assert(lex->current_select() == NULL);
   lex->m_current_select= lex->select_lex;
 
   DBUG_RETURN(status);
@@ -522,11 +529,7 @@ void lex_end(LEX *lex)
   DBUG_PRINT("enter", ("lex: 0x%lx", (long) lex));
 
   /* release used plugins */
-  if (!lex->plugins.empty()) /* No function call and no mutex if no plugins. */
-  {
-    plugin_unlock_list(0, lex->plugins.begin(), lex->plugins.size());
-  }
-  lex->plugins.clear();
+  lex->release_plugins();
 
   delete lex->sphead;
   lex->sphead= NULL;
@@ -535,6 +538,17 @@ void lex_end(LEX *lex)
 }
 
 
+void LEX::release_plugins()
+{
+  if (!plugins.empty()) /* No function call and no mutex if no plugins. */
+  {
+    plugin_unlock_list(0, plugins.begin(), plugins.size());
+    plugins.clear();
+  }
+}
+
+
+
 st_select_lex *LEX::new_empty_query_block()
 {
   st_select_lex *select=
@@ -625,7 +639,7 @@ st_select_lex *LEX::new_query(st_select_lex *curr_select)
   else if (select->outer_select()->parsing_place == CTX_DERIVED)
   {
     // Currently, outer references are not allowed for a derived table
-    DBUG_ASSERT(select->context.outer_context == NULL);
+    assert(select->context.outer_context == NULL);
   }
   else
   {
@@ -656,7 +670,7 @@ st_select_lex *LEX::new_union_query(st_select_lex *curr_select, bool distinct)
 {
   DBUG_ENTER("LEX::new_union_query");
 
-  DBUG_ASSERT(unit != NULL && select_lex != NULL);
+  assert(unit != NULL && select_lex != NULL);
 
   // Is this the outer-most query expression?
   bool const outer_most= curr_select->master_unit() == unit;
@@ -731,11 +745,11 @@ bool LEX::new_top_level_query()
   DBUG_ENTER("LEX::new_top_level_query");
 
   // Assure that the LEX does not contain any query expression already
-  DBUG_ASSERT(unit == NULL &&
-              select_lex == NULL);
+  assert(unit == NULL &&
+         select_lex == NULL);
 
   // Check for the special situation when using INTO OUTFILE and LOAD DATA.
-  DBUG_ASSERT(result == 0);
+  assert(result == 0);
 
   select_lex= new_query(NULL);
   if (select_lex == NULL)
@@ -769,7 +783,7 @@ void LEX::new_static_query(SELECT_LEX_UNIT *sel_unit, SELECT_LEX *select)
 
   reset();
 
-  DBUG_ASSERT(unit == NULL && select_lex == NULL && current_select() == NULL);
+  assert(unit == NULL && select_lex == NULL && current_select() == NULL);
 
   select->parent_lex= this;
 
@@ -902,7 +916,7 @@ static int find_keyword(Lex_input_stream *lip, uint len, bool function)
 
 bool is_keyword(const char *name, size_t len)
 {
-  DBUG_ASSERT(len != 0);
+  assert(len != 0);
   return Lex_hash::sql_keywords.get_hash_symbol(name, len) != NULL;
 }
 
@@ -918,7 +932,7 @@ bool is_keyword(const char *name, size_t len)
 
 bool is_lex_native_function(const LEX_STRING *name)
 {
-  DBUG_ASSERT(name != NULL);
+  assert(name != NULL);
   return Lex_hash::sql_keywords_and_funcs.get_hash_symbol(name->str,
       (uint) name->length) != NULL;
 }
@@ -1029,7 +1043,7 @@ static char *get_text(Lex_input_stream *lip, int pre_skip, int post_skip)
       /* Extract the text from the token */
       str += pre_skip;
       end -= post_skip;
-      DBUG_ASSERT(end >= str);
+      assert(end >= str);
 
       if (!(start= static_cast<char *>(lip->m_thd->alloc((uint) (end-str)+1))))
 	return (char*) "";		// Sql_alloc has set error flag
@@ -1105,7 +1119,7 @@ static char *get_text(Lex_input_stream *lip, int pre_skip, int post_skip)
 
 uint Lex_input_stream::get_lineno(const char *raw_ptr)
 {
-  DBUG_ASSERT(m_buf <= raw_ptr && raw_ptr < m_end_of_query);
+  assert(m_buf <= raw_ptr && raw_ptr < m_end_of_query);
   if (!(m_buf <= raw_ptr && raw_ptr < m_end_of_query))
     return 1;
 
@@ -1231,17 +1245,27 @@ static inline uint int_token(const char *str,uint length)
 */
 bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
 {
+  // only one level of nested comments are allowed
+  assert(remaining_recursions_permitted == 0 ||
+         remaining_recursions_permitted == 1);
   uchar c;
   while (! lip->eof())
   {
     c= lip->yyGet();
 
-    if (remaining_recursions_permitted > 0)
+    if (remaining_recursions_permitted == 1)
     {
       if ((c == '/') && (lip->yyPeek() == '*'))
       {
+        lip->yyUnput('(');  // Replace nested "/*..." with "(*..."
+        lip->yySkip();      // and skip "("
+
         lip->yySkip(); /* Eat asterisk */
-        consume_comment(lip, remaining_recursions_permitted-1);
+        if (consume_comment(lip, 0))
+          return true;
+
+        lip->yyUnput(')');  // Replace "...*/" with "...*)"
+        lip->yySkip();      // and skip ")"
         continue;
       }
     }
@@ -2183,7 +2207,7 @@ st_select_lex_unit::st_select_lex_unit(enum_parsing_context parsing_context) :
       break;
     default:
       /* Subquery can't happen outside of those ^. */
-      DBUG_ASSERT(false); /* purecov: inspected */
+      assert(false); /* purecov: inspected */
       break;
   }
 }
@@ -2278,7 +2302,9 @@ st_select_lex::st_select_lex
   outer_join(0),
   opt_hints_qb(NULL),
   m_agg_func_used(false),
-  sj_candidates(NULL)
+  m_json_agg_func_used(false),
+  sj_candidates(NULL),
+  hidden_order_field_count(0)
 {
 }
 
@@ -2535,7 +2561,7 @@ ha_rows st_select_lex::get_offset()
     {
       fix_fields_successful= !offset_limit->fix_fields(master->thd, NULL);
 
-      DBUG_ASSERT(fix_fields_successful);
+      assert(fix_fields_successful);
     }
     val= fix_fields_successful ? offset_limit->val_uint() : HA_POS_ERROR;
   }
@@ -2572,7 +2598,7 @@ ha_rows st_select_lex::get_limit()
         1) it does not affect other items;
         2) it does not fail.
 
-      Nevertheless DBUG_ASSERT was added to catch future changes in
+        Nevertheless assert was added to catch future changes in
       fix_fields() implementation. Also added runtime check against a result
       of fix_fields() in order to handle error condition in non-debug build.
     */
@@ -2581,7 +2607,7 @@ ha_rows st_select_lex::get_limit()
     {
       fix_fields_successful= !select_limit->fix_fields(master->thd, NULL);
 
-      DBUG_ASSERT(fix_fields_successful);
+      assert(fix_fields_successful);
     }
     val= fix_fields_successful ? select_limit->val_uint() : HA_POS_ERROR;
   }
@@ -2958,7 +2984,7 @@ static void print_join(THD *thd,
       }
     }
   }
-  DBUG_ASSERT(tables_to_print >= 1);
+  assert(tables_to_print >= 1);
   print_table_array(thd, str, table, table + tables_to_print, query_type);
 }
 
@@ -3153,8 +3179,8 @@ void st_select_lex::print(THD *thd, String *str, enum_query_type query_type)
    be completely cleaned till the end of the query. This is valid only for
    explainable commands.
   */
-  DBUG_ASSERT(!(master_unit()->cleaned == SELECT_LEX_UNIT::UC_CLEAN &&
-                is_explainable_query(thd->lex->sql_command)));
+  assert(!(master_unit()->cleaned == SELECT_LEX_UNIT::UC_CLEAN &&
+           is_explainable_query(thd->lex->sql_command)));
 
   /* First add options */
   if (active_options() & SELECT_STRAIGHT_JOIN)
@@ -3182,7 +3208,7 @@ void st_select_lex::print(THD *thd, String *str, enum_query_type query_type)
     case SQL_CACHE_UNSPECIFIED:
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
 
   //Item List
@@ -3666,7 +3692,7 @@ LEX::copy_db_to(char **p_db, size_t *p_db_length) const
 {
   if (sphead)
   {
-    DBUG_ASSERT(sphead->m_db.str && sphead->m_db.length);
+    assert(sphead->m_db.str && sphead->m_db.length);
     /*
       It is safe to assign the string by-pointer, both sphead and
       its statements reside in the same memory root.
@@ -3687,7 +3713,7 @@ LEX::copy_db_to(char **p_db, size_t *p_db_length) const
 */
 void st_select_lex_unit::set_limit(st_select_lex *sl)
 {
-  DBUG_ASSERT(!thd->stmt_arena->is_stmt_prepare());
+  assert(!thd->stmt_arena->is_stmt_prepare());
 
   offset_limit_cnt= sl->get_offset();
   select_limit_cnt= sl->get_limit();
@@ -4291,7 +4317,7 @@ st_select_lex::type_enum st_select_lex::type()
 */
 void st_select_lex::include_down(LEX *lex, st_select_lex_unit *outer)
 {
-  DBUG_ASSERT(slave == NULL);
+  assert(slave == NULL);
 
   if ((next= outer->slave))
     next->prev= &next;
@@ -4457,7 +4483,7 @@ bool SELECT_LEX::get_optimizable_conditions(THD *thd,
     join->optimized is true => conditions are ready for reading.
     So if we are here, this should hold:
   */
-  DBUG_ASSERT(!(join && join->is_optimized()));
+  assert(!(join && join->is_optimized()));
   if (m_where_cond && !thd->stmt_arena->is_conventional())
   {
     *new_where= m_where_cond->copy_andor_structure(thd);
@@ -4583,15 +4609,15 @@ bool st_select_lex::validate_outermost_option(LEX *lex,
 
 bool st_select_lex::validate_base_options(LEX *lex, ulonglong options_arg) const
 {
-  DBUG_ASSERT(!(options_arg & ~(SELECT_STRAIGHT_JOIN |
-                                SELECT_HIGH_PRIORITY |
-                                SELECT_DISTINCT |
-                                SELECT_ALL |
-                                SELECT_SMALL_RESULT |
-                                SELECT_BIG_RESULT |
-                                OPTION_BUFFER_RESULT |
-                                OPTION_FOUND_ROWS |
-                                OPTION_TO_QUERY_CACHE)));
+  assert(!(options_arg & ~(SELECT_STRAIGHT_JOIN |
+                           SELECT_HIGH_PRIORITY |
+                           SELECT_DISTINCT |
+                           SELECT_ALL |
+                           SELECT_SMALL_RESULT |
+                           SELECT_BIG_RESULT |
+                           OPTION_BUFFER_RESULT |
+                           OPTION_FOUND_ROWS |
+                           OPTION_TO_QUERY_CACHE)));
 
   if (options_arg & SELECT_DISTINCT &&
       options_arg & SELECT_ALL)
@@ -4663,7 +4689,7 @@ bool Query_options::save_to(Parse_context *pc)
       my_error(ER_CANT_USE_OPTION_HERE, MYF(0), "SQL_NO_CACHE");
       return true;
     }
-    DBUG_ASSERT(pc->select->sql_cache == SELECT_LEX::SQL_CACHE_UNSPECIFIED);
+    assert(pc->select->sql_cache == SELECT_LEX::SQL_CACHE_UNSPECIFIED);
     lex->safe_to_cache_query= false;
     options&= ~OPTION_TO_QUERY_CACHE;
     pc->select->sql_cache= SELECT_LEX::SQL_NO_CACHE;
@@ -4674,13 +4700,13 @@ bool Query_options::save_to(Parse_context *pc)
       my_error(ER_CANT_USE_OPTION_HERE, MYF(0), "SQL_CACHE");
       return true;
     }
-    DBUG_ASSERT(pc->select->sql_cache == SELECT_LEX::SQL_CACHE_UNSPECIFIED);
+    assert(pc->select->sql_cache == SELECT_LEX::SQL_CACHE_UNSPECIFIED);
     lex->safe_to_cache_query= true;
     options|= OPTION_TO_QUERY_CACHE;
     pc->select->sql_cache= SELECT_LEX::SQL_CACHE;
     break;
   default:
-    DBUG_ASSERT(!"Unexpected cache option!");
+    assert(!"Unexpected cache option!");
   }
   if (pc->select->validate_base_options(lex, options))
     return true;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index a64943c23da7..1e35444a804a 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -696,7 +703,7 @@ class st_select_lex_unit: public Sql_alloc
   void set_explain_marker(enum_parsing_context m);
   void set_explain_marker_from(const st_select_lex_unit *u);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      Asserts that none of {this unit and its children units} is fully cleaned
      up.
@@ -728,8 +735,8 @@ class st_select_lex: public Sql_alloc
   Ref_ptr_array ref_ptr_array_slice(size_t slice_num)
   {
     size_t slice_sz= ref_pointer_array.size() / 5U;
-    DBUG_ASSERT(ref_pointer_array.size() % 5 == 0);
-    DBUG_ASSERT(slice_num < 5U);
+    assert(ref_pointer_array.size() % 5 == 0);
+    assert(slice_num < 5U);
     return Ref_ptr_array(&ref_pointer_array[slice_num * slice_sz], slice_sz);
   }
 
@@ -750,7 +757,7 @@ class st_select_lex: public Sql_alloc
     DBUG_EXECUTE_IF("no_const_tables", options_arg|= OPTION_NO_CONST_TABLES;);
 
     // Make sure we do not overwrite options by accident
-    DBUG_ASSERT(m_base_options == 0 && m_active_options == 0);
+    assert(m_base_options == 0 && m_active_options == 0);
     m_base_options= options_arg;
     m_active_options= options_arg;
   }
@@ -758,7 +765,7 @@ class st_select_lex: public Sql_alloc
   /// Add base options to a query block, also update active options
   void add_base_options(ulonglong options)
   {
-    DBUG_ASSERT(first_execution);
+    assert(first_execution);
     m_base_options|= options;
     m_active_options|= options;
   }
@@ -770,7 +777,7 @@ class st_select_lex: public Sql_alloc
   */
   void remove_base_options(ulonglong options)
   {
-    DBUG_ASSERT(first_execution);
+    assert(first_execution);
     m_base_options&= ~options;
     m_active_options&= ~options;
   }
@@ -1221,7 +1228,7 @@ class st_select_lex: public Sql_alloc
   void set_lock_for_tables(thr_lock_type lock_type);
   inline void init_order()
   {
-    DBUG_ASSERT(order_list.elements == 0);
+    assert(order_list.elements == 0);
     order_list.elements= 0;
     order_list.first= 0;
     order_list.next= &order_list.first;
@@ -1296,9 +1303,11 @@ class st_select_lex: public Sql_alloc
     function.
   */
   bool agg_func_used()      const { return m_agg_func_used; }
+  bool json_agg_func_used() const { return m_json_agg_func_used; }
 
   void set_agg_func_used(bool val)      { m_agg_func_used= val; }
 
+  void set_json_agg_func_used(bool val) { m_json_agg_func_used= val; }
   /// Lookup for SELECT_LEX type
   type_enum type();
 
@@ -1353,6 +1362,7 @@ class st_select_lex: public Sql_alloc
   void delete_unused_merged_columns(List<TABLE_LIST> *tables);
 
   bool m_agg_func_used;
+  bool m_json_agg_func_used;
 
   /// Helper for fix_prepare_information()
   void fix_prepare_information_for_order(THD *thd,
@@ -1371,6 +1381,7 @@ class st_select_lex: public Sql_alloc
   /// Merge derived table into query block
 public:
   bool merge_derived(THD *thd, TABLE_LIST *derived_table);
+  bool is_in_select_list(Item *cand);
 private:
   bool convert_subquery_to_semijoin(Item_exists_subselect *subq_pred);
   void remap_tables(THD *thd);
@@ -1379,13 +1390,12 @@ class st_select_lex: public Sql_alloc
   bool change_group_ref(THD *thd, Item_func *expr, bool *changed);
   bool flatten_subqueries();
   bool setup_wild(THD *thd);
-  bool setup_order_final(THD *thd, int hidden_order_field_count);
+  bool setup_order_final(THD *thd);
   bool setup_group(THD *thd);
   void remove_redundant_subquery_clauses(THD *thd,
-                                         int hidden_group_field_count,
-                                         int hidden_order_field_count);
+                                         int hidden_group_field_count);
   void repoint_contexts_of_join_nests(List<TABLE_LIST> join_list);
-  void empty_order_list(int hidden_order_field_count);
+  void empty_order_list(SELECT_LEX *sl);
   /**
     Pointer to collection of subqueries candidate for semijoin
     conversion.
@@ -1393,6 +1403,9 @@ class st_select_lex: public Sql_alloc
   */
   Mem_root_array<Item_exists_subselect*, true> *sj_candidates;
 public:
+  /// How many expressions are part of the order by but not select list.
+  int hidden_order_field_count;
+
   bool fix_inner_refs(THD *thd);
   bool setup_conds(THD *thd);
   bool prepare(THD *thd);
@@ -2142,7 +2155,7 @@ class Query_tables_list
   */
   inline void set_stmt_unsafe(enum_binlog_stmt_unsafe unsafe_type) {
     DBUG_ENTER("set_stmt_unsafe");
-    DBUG_ASSERT(unsafe_type >= 0 && unsafe_type < BINLOG_STMT_UNSAFE_COUNT);
+    assert(unsafe_type >= 0 && unsafe_type < BINLOG_STMT_UNSAFE_COUNT);
     binlog_stmt_flags|= (1U << unsafe_type);
     DBUG_VOID_RETURN;
   }
@@ -2157,7 +2170,7 @@ class Query_tables_list
   */
   inline void set_stmt_unsafe_flags(uint32 flags) {
     DBUG_ENTER("set_stmt_unsafe_flags");
-    DBUG_ASSERT((flags & ~BINLOG_STMT_UNSAFE_ALL_FLAGS) == 0);
+    assert((flags & ~BINLOG_STMT_UNSAFE_ALL_FLAGS) == 0);
     binlog_stmt_flags|= flags;
     DBUG_VOID_RETURN;
   }
@@ -2252,7 +2265,7 @@ class Query_tables_list
     STMT_ACCESS_TABLE_COUNT
   };
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   static inline const char *stmt_accessed_table_string(enum_stmt_accessed_table accessed_table)
   {
     switch (accessed_table)
@@ -2283,7 +2296,7 @@ class Query_tables_list
       break;
       case STMT_ACCESS_TABLE_COUNT:
       default:
-        DBUG_ASSERT(0);
+        assert(0);
       break;
     }
     MY_ASSERT_UNREACHABLE();
@@ -2318,7 +2331,7 @@ class Query_tables_list
   {
     DBUG_ENTER("LEX::set_stmt_accessed_table");
 
-    DBUG_ASSERT(accessed_table >= 0 && accessed_table < STMT_ACCESS_TABLE_COUNT);
+    assert(accessed_table >= 0 && accessed_table < STMT_ACCESS_TABLE_COUNT);
     stmt_accessed_table_flag |= (1U << accessed_table);
 
     DBUG_VOID_RETURN;
@@ -2339,7 +2352,7 @@ class Query_tables_list
   {
     DBUG_ENTER("LEX::stmt_accessed_table");
 
-    DBUG_ASSERT(accessed_table >= 0 && accessed_table < STMT_ACCESS_TABLE_COUNT);
+    assert(accessed_table >= 0 && accessed_table < STMT_ACCESS_TABLE_COUNT);
 
     DBUG_RETURN((stmt_accessed_table_flag & (1U << accessed_table)) != 0);
   }
@@ -2375,7 +2388,7 @@ class Query_tables_list
 
       unsafe= (binlog_unsafe_map[stmt_accessed_table_flag] & condition);
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
       DBUG_PRINT("LEX::is_mixed_stmt_unsafe", ("RESULT %02X %02X %02X\n", condition,
               binlog_unsafe_map[stmt_accessed_table_flag],
               (binlog_unsafe_map[stmt_accessed_table_flag] & condition)));
@@ -2562,7 +2575,7 @@ class Lex_input_stream
   */
   void skip_binary(int n)
   {
-    DBUG_ASSERT(m_ptr + n <= m_end_of_query);
+    assert(m_ptr + n <= m_end_of_query);
     if (m_echo)
     {
       memcpy(m_cpp_ptr, m_ptr, n);
@@ -2577,7 +2590,7 @@ class Lex_input_stream
   */
   unsigned char yyGet()
   {
-    DBUG_ASSERT(m_ptr <= m_end_of_query);
+    assert(m_ptr <= m_end_of_query);
     char c= *m_ptr++;
     if (m_echo)
       *m_cpp_ptr++ = c;
@@ -2598,7 +2611,7 @@ class Lex_input_stream
   */
   unsigned char yyPeek()
   {
-    DBUG_ASSERT(m_ptr <= m_end_of_query);
+    assert(m_ptr <= m_end_of_query);
     return m_ptr[0];
   }
 
@@ -2608,7 +2621,7 @@ class Lex_input_stream
   */
   unsigned char yyPeekn(int n)
   {
-    DBUG_ASSERT(m_ptr + n <= m_end_of_query);
+    assert(m_ptr + n <= m_end_of_query);
     return m_ptr[n];
   }
 
@@ -2629,7 +2642,7 @@ class Lex_input_stream
   */
   void yySkip()
   {
-    DBUG_ASSERT(m_ptr <= m_end_of_query);
+    assert(m_ptr <= m_end_of_query);
     if (m_echo)
       *m_cpp_ptr++ = *m_ptr++;
     else
@@ -2642,7 +2655,7 @@ class Lex_input_stream
   */
   void yySkipn(int n)
   {
-    DBUG_ASSERT(m_ptr + n <= m_end_of_query);
+    assert(m_ptr + n <= m_end_of_query);
     if (m_echo)
     {
       memcpy(m_cpp_ptr, m_ptr, n);
@@ -2778,7 +2791,7 @@ class Lex_input_stream
       The assumption is that the lexical analyser is always 1 character ahead,
       which the -1 account for.
     */
-    DBUG_ASSERT(m_ptr > m_tok_start);
+    assert(m_ptr > m_tok_start);
     return (uint) ((m_ptr - m_tok_start) - 1);
   }
    
@@ -2997,8 +3010,8 @@ struct LEX: public Query_tables_list
   {
     // (2) Only owning thread could change m_current_select
     // (1) bypass for bootstrap and "new THD"
-    DBUG_ASSERT(!current_thd || !thd || //(1)
-                thd == current_thd);    //(2)
+    assert(!current_thd || !thd || //(1)
+           thd == current_thd);    //(2)
     m_current_select= select;
   }
   /// @return true if this is an EXPLAIN statement
@@ -3510,12 +3523,14 @@ struct LEX: public Query_tables_list
     */ 
     if (select_lex == all_selects_list && !sroutines.records)
     {
-      DBUG_ASSERT(!all_selects_list->next_select_in_list());
+      assert(!all_selects_list->next_select_in_list());
       return TRUE;
     }
     return FALSE;
   }
 
+  void release_plugins();
+
   bool accept(Select_lex_visitor *visitor);
 
 };
@@ -3529,16 +3544,22 @@ struct LEX: public Query_tables_list
 class Yacc_state
 {
 public:
-  Yacc_state()
-  {
-    reset();
-  }
+  Yacc_state() : yacc_yyss(NULL), yacc_yyvs(NULL), yacc_yyls(NULL) { reset(); }
 
   void reset()
   {
-    yacc_yyss= NULL;
-    yacc_yyvs= NULL;
-    yacc_yyls= NULL;
+    if (yacc_yyss != NULL) {
+      my_free(yacc_yyss);
+      yacc_yyss = NULL;
+    }
+    if (yacc_yyvs != NULL) {
+      my_free(yacc_yyvs);
+      yacc_yyvs = NULL;
+    }
+    if (yacc_yyls != NULL) {
+      my_free(yacc_yyls);
+      yacc_yyls = NULL;
+    }
     m_lock_type= TL_READ_DEFAULT;
     m_mdl_type= MDL_SHARED_READ;
     m_ha_rkey_mode= HA_READ_KEY_EXACT;
@@ -3613,10 +3634,25 @@ class Yacc_state
 */
 struct Parser_input
 {
+  /**
+    True if the text parsed corresponds to an actual query,
+    and not another text artifact.
+    This flag is used to disable digest parsing of nested:
+    - view definitions
+    - table trigger definitions
+    - table partition definitions
+    - event scheduler event definitions
+  */
+  bool m_has_digest;
+  /**
+    True if the caller needs to compute a digest.
+    This flag is used to request explicitly a digest computation,
+    independently of the performance schema configuration.
+  */
   bool m_compute_digest;
 
   Parser_input()
-    : m_compute_digest(false)
+    : m_has_digest(false), m_compute_digest(false)
   {}
 };
 
diff --git a/sql/sql_lex_hash.cc b/sql/sql_lex_hash.cc
index 660de8eb2ec1..6ba32b6f5a86 100644
--- a/sql/sql_lex_hash.cc
+++ b/sql/sql_lex_hash.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_lex_hash.h b/sql/sql_lex_hash.h
index b179a27e498a..70d10ddd8a9a 100644
--- a/sql/sql_lex_hash.h
+++ b/sql/sql_lex_hash.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_lex_hints.cc b/sql/sql_lex_hints.cc
index 73723e9907a2..d6273a6e907c 100644
--- a/sql/sql_lex_hints.cc
+++ b/sql/sql_lex_hints.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -156,7 +163,7 @@ void Hint_scanner::add_hint_token_digest()
       case SUBQUERY_HINT:
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
       add_digest(TOK_HINT_ADJUST(prev_token));
     }
diff --git a/sql/sql_lex_hints.h b/sql/sql_lex_hints.h
index 4e31bc1e8c57..21f3ea9855d1 100644
--- a/sql/sql_lex_hints.h
+++ b/sql/sql_lex_hints.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -143,8 +150,8 @@ class Hint_scanner : public Sql_alloc
   template <hint_lex_char_classes Quote>
   int scan_quoted_ident()
   {
-    DBUG_ASSERT(Quote == HINT_CHR_BACKQUOTE || Quote == HINT_CHR_DOUBLEQUOTE);
-    DBUG_ASSERT(*ptr == '`' || *ptr == '"');
+    assert(Quote == HINT_CHR_BACKQUOTE || Quote == HINT_CHR_DOUBLEQUOTE);
+    assert(*ptr == '`' || *ptr == '"');
 
     if (Quote == HINT_CHR_DOUBLEQUOTE && !is_ansi_quotes)
       return get_byte();
@@ -199,7 +206,7 @@ class Hint_scanner : public Sql_alloc
           }
           else
           {
-            DBUG_ASSERT(0 < double_separators && double_separators < yyleng);
+            assert(0 < double_separators && double_separators < yyleng);
             s.length= yyleng - double_separators;
             s.str= (char *) thd->alloc(s.length);
             if (s.str == NULL)
@@ -243,7 +250,7 @@ class Hint_scanner : public Sql_alloc
 
   int scan_query_block_name()
   {
-    DBUG_ASSERT(*ptr == '@');
+    assert(*ptr == '@');
 
     skip_byte(); // skip '@'
     start_token();
@@ -288,7 +295,7 @@ class Hint_scanner : public Sql_alloc
             keyword string since symbol array is a global constant).
           */
           yytext= symbol->name;
-          DBUG_ASSERT(yyleng == symbol->length);
+          assert(yyleng == symbol->length);
 
           return symbol->tok;
         }
@@ -319,13 +326,13 @@ class Hint_scanner : public Sql_alloc
 
   bool eof() const
   {
-    DBUG_ASSERT(ptr <= input_buf_end);
+    assert(ptr <= input_buf_end);
     return ptr >= input_buf_end;
   }
 
   char peek_byte() const
   {
-    DBUG_ASSERT(!eof());
+    assert(!eof());
     return *ptr;
   }
 
@@ -336,21 +343,21 @@ class Hint_scanner : public Sql_alloc
 
   hint_lex_char_classes peek_class2() const
   {
-    DBUG_ASSERT(ptr + 1 <= input_buf_end);
+    assert(ptr + 1 <= input_buf_end);
     return ptr + 1 >= input_buf_end ?
         HINT_CHR_EOF : char_classes[static_cast<uchar>(ptr[1])];
   }
 
   void skip_newline()
   {
-    DBUG_ASSERT(!eof() && peek_byte() == '\n');
+    assert(!eof() && peek_byte() == '\n');
     skip_byte();
     lineno++;
   }
 
   uchar get_byte()
   {
-    DBUG_ASSERT(!eof());
+    assert(!eof());
     char ret= *ptr;
     yyleng++;
     ptr++;
@@ -359,7 +366,7 @@ class Hint_scanner : public Sql_alloc
 
   void skip_byte()
   {
-    DBUG_ASSERT(!eof());
+    assert(!eof());
     yyleng++;
     ptr++;
   }
@@ -388,7 +395,7 @@ class Hint_scanner : public Sql_alloc
   template <hint_lex_char_classes Separator>
   void compact(LEX_STRING *to, const char *from, size_t len, size_t doubles)
   {
-    DBUG_ASSERT(doubles > 0);
+    assert(doubles > 0);
 
     size_t d= doubles;
     char *t= to->str;
@@ -398,14 +405,14 @@ class Hint_scanner : public Sql_alloc
       case HINT_CHR_MB:
         {
           size_t len = my_ismbchar(cs, s, end);
-          DBUG_ASSERT(len > 1);
+          assert(len > 1);
           memcpy(t, s, len);
           t+= len;
           s+= len;
         }
         continue;
       case Separator:
-        DBUG_ASSERT(char_classes[(uchar) *s] == Separator);
+        assert(char_classes[(uchar) *s] == Separator);
         *t++= *s++;
         s++; //skip the 2nd separator
         d--;
@@ -417,14 +424,14 @@ class Hint_scanner : public Sql_alloc
         }
         continue;
       case HINT_CHR_EOF:
-        DBUG_ASSERT(0);
+        assert(0);
         to->length= 0;
         return;
       default:
         *t++= *s++;
       }
     }
-    DBUG_ASSERT(0);
+    assert(0);
     to->length= 0;
     return;
   }
diff --git a/sql/sql_list.cc b/sql/sql_list.cc
index 5badbe21ea0c..d138535d1b20 100644
--- a/sql/sql_list.cc
+++ b/sql/sql_list.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_list.h b/sql/sql_list.h
index f7506b5bbc61..4cfb4c5a97b3 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -1,15 +1,22 @@
 #ifndef INCLUDES_MYSQL_SQL_LIST_H
 #define INCLUDES_MYSQL_SQL_LIST_H
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -460,7 +467,7 @@ class base_list_iterator
   inline void *replace(void *element)
   {						// Return old element
     void *tmp=current->info;
-    DBUG_ASSERT(current->info != 0);
+    assert(current->info != 0);
     current->info=element;
     return tmp;
   }
@@ -724,7 +731,7 @@ class base_ilist
 
   void move_elements_to(base_ilist *new_owner)
   {
-    DBUG_ASSERT(new_owner->is_empty());
+    assert(new_owner->is_empty());
     new_owner->first= first;
     new_owner->sentinel= sentinel;
     empty();
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 6cbce9217df0..86092893f048 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -447,8 +454,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
                        MY_RETURN_REAL_PATH);
     }
 
-    if (thd->slave_thread & ((SYSTEM_THREAD_SLAVE_SQL |
-                             (SYSTEM_THREAD_SLAVE_WORKER))!=0))
+    if ((thd->system_thread &
+         (SYSTEM_THREAD_SLAVE_SQL | SYSTEM_THREAD_SLAVE_WORKER)) != 0)
     {
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
       Relay_log_info* rli= thd->rli_slave->get_c_rli();
@@ -470,7 +477,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
       /*
         This is impossible and should never happen.
       */
-      DBUG_ASSERT(FALSE); 
+      assert(FALSE); 
 #endif
     }
     else if (!is_secure_file_path(name))
@@ -715,10 +722,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   /* ok to client sent only after binlog write and engine commit */
   my_ok(thd, info.stats.copied + info.stats.deleted, 0L, name);
 err:
-  DBUG_ASSERT(table->file->has_transactions() ||
-              !(info.stats.copied || info.stats.deleted) ||
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(table->file->has_transactions() ||
+         !(info.stats.copied || info.stats.deleted) ||
+         thd->get_transaction()->cannot_safely_rollback(Transaction_ctx::STMT));
   table->file->ha_release_auto_increment();
   table->auto_increment_field_not_null= FALSE;
   DBUG_RETURN(error);
@@ -905,7 +911,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
         There is no variables in fields_vars list in this format so
         this conversion is safe (no need to check for STRING_ITEM).
       */
-      DBUG_ASSERT(item->real_item()->type() == Item::FIELD_ITEM);
+      assert(item->real_item()->type() == Item::FIELD_ITEM);
       Item_field *sql_field= static_cast<Item_field*>(item->real_item());
       Field *field= sql_field->field;                  
       if (field == table->next_number_field)
@@ -1108,7 +1114,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
 	}
         else if (item->type() == Item::STRING_ITEM)
         {
-          DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+          assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
           ((Item_user_var_as_out_param *)item)->set_null_value(
                                                   read_info.read_charset);
         }
@@ -1127,7 +1133,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
       }
       else if (item->type() == Item::STRING_ITEM)
       {
-        DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+        assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
         ((Item_user_var_as_out_param *)item)->set_value((char*) pos, length,
                                                         read_info.read_charset);
       }
@@ -1181,7 +1187,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
         }
         else if (item->type() == Item::STRING_ITEM)
         {
-          DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+          assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
           ((Item_user_var_as_out_param *)item)->set_null_value(
                                                   read_info.read_charset);
         }
@@ -1284,7 +1290,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
     xmlit.rewind();
     XML_TAG *tag= NULL;
     
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_PRINT("read_xml_field", ("skip_lines=%d", (int) skip_lines));
     while ((tag= xmlit++))
     {
@@ -1341,7 +1347,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
         }
         else
         {
-          DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+          assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
           ((Item_user_var_as_out_param *) item)->set_null_value(cs);
         }
         continue;
@@ -1357,7 +1363,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
       }
       else
       {
-        DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+        assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
         ((Item_user_var_as_out_param *) item)->set_value(
                                                  (char *) tag->value.ptr(), 
                                                  tag->value.length(), cs);
@@ -1397,7 +1403,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
         }
         else
         {
-          DBUG_ASSERT(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
+          assert(NULL != dynamic_cast<Item_user_var_as_out_param*>(item));
           ((Item_user_var_as_out_param *)item)->set_null_value(cs);
         }
       }
@@ -1579,7 +1585,7 @@ READ_INFO::~READ_INFO()
       {                                                                       \
         len= my_mbcharlen_2((cs), (chr), chr1);                               \
         /* Character is gb18030 or invalid (len = 0) */                       \
-        DBUG_ASSERT(len == 0 || len == 2 || len == 4);                        \
+        assert(len == 0 || len == 2 || len == 4);                       \
       }                                                                       \
       if (len != 0)                                                           \
         PUSH(chr1);                                                           \
diff --git a/sql/sql_load.h b/sql/sql_load.h
index ca2b34506331..28a1174f167f 100644
--- a/sql/sql_load.h
+++ b/sql/sql_load.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_locale.cc b/sql/sql_locale.cc
index 03b728152ce9..241230d752b1 100644
--- a/sql/sql_locale.cc
+++ b/sql/sql_locale.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -561,8 +568,8 @@ MY_LOCALE my_locale_es_ES
   10,
   9,
   ',',        /* decimal point es_ES */
-  '\0',       /* thousands_sep es_ES */
-  "\x80\x80", /* grouping      es_ES */
+  '.',        /* thousands_sep es_ES */
+  "\x03\x03", /* grouping      es_ES */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_ES *****/
@@ -2647,8 +2654,8 @@ MY_LOCALE my_locale_es_BO
   10,
   9,
   ',',        /* decimal point es_BO */
-  '\0',       /* thousands_sep es_BO */
-  "\x80\x80", /* grouping      es_BO */
+  '.',        /* thousands_sep es_BO */
+  "\x03\x03", /* grouping      es_BO */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_BO *****/
@@ -2667,8 +2674,8 @@ MY_LOCALE my_locale_es_CL
   10,
   9,
   ',',        /* decimal point es_CL */
-  '\0',       /* thousands_sep es_CL */
-  "\x80\x80", /* grouping      es_CL */
+  '.',        /* thousands_sep es_CL */
+  "\x03\x03", /* grouping      es_CL */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_CL *****/
@@ -2687,8 +2694,8 @@ MY_LOCALE my_locale_es_CO
   10,
   9,
   ',',        /* decimal point es_CO */
-  '\0',       /* thousands_sep es_CO */
-  "\x80\x80", /* grouping      es_CO */
+  '.',        /* thousands_sep es_CO */
+  "\x03\x03", /* grouping      es_CO */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_CO *****/
@@ -2706,9 +2713,9 @@ MY_LOCALE my_locale_es_CR
   &my_locale_typelib_ab_day_names_es_ES,
   10,
   9,
-  '.',        /* decimal point es_CR */
-  '\0',       /* thousands_sep es_CR */
-  "\x80\x80", /* grouping      es_CR */
+  ',',        /* decimal point es_CR */
+  ' ',        /* thousands_sep es_CR */
+  "\x03\x03", /* grouping      es_CR */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_CR *****/
@@ -2727,8 +2734,8 @@ MY_LOCALE my_locale_es_DO
   10,
   9,
   '.',        /* decimal point es_DO */
-  '\0',       /* thousands_sep es_DO */
-  "\x80\x80", /* grouping      es_DO */
+  ',',        /* thousands_sep es_DO */
+  "\x03\x03", /* grouping      es_DO */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_DO *****/
@@ -2747,8 +2754,8 @@ MY_LOCALE my_locale_es_EC
   10,
   9,
   ',',        /* decimal point es_EC */
-  '\0',       /* thousands_sep es_EC */
-  "\x80\x80", /* grouping      es_EC */
+  '.',        /* thousands_sep es_EC */
+  "\x03\x03", /* grouping      es_EC */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_EC *****/
@@ -2767,8 +2774,8 @@ MY_LOCALE my_locale_es_GT
   10,
   9,
   '.',        /* decimal point es_GT */
-  '\0',       /* thousands_sep es_GT */
-  "\x80\x80", /* grouping      es_GT */
+  ',',       /* thousands_sep es_GT */
+  "\x03\x03", /* grouping      es_GT */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_GT *****/
@@ -2787,8 +2794,8 @@ MY_LOCALE my_locale_es_HN
   10,
   9,
   '.',        /* decimal point es_HN */
-  '\0',       /* thousands_sep es_HN */
-  "\x80\x80", /* grouping      es_HN */
+  ',',       /* thousands_sep es_HN */
+  "\x03\x03", /* grouping      es_HN */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_HN *****/
@@ -2807,8 +2814,8 @@ MY_LOCALE my_locale_es_MX
   10,
   9,
   '.',        /* decimal point es_MX */
-  '\0',       /* thousands_sep es_MX */
-  "\x80\x80", /* grouping      es_MX */
+  ',',        /* thousands_sep es_MX */
+  "\x03\x03", /* grouping      es_MX */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_MX *****/
@@ -2827,8 +2834,8 @@ MY_LOCALE my_locale_es_NI
   10,
   9,
   '.',        /* decimal point es_NI */
-  '\0',       /* thousands_sep es_NI */
-  "\x80\x80", /* grouping      es_NI */
+  ',',        /* thousands_sep es_NI */
+  "\x03\x03", /* grouping      es_NI */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_NI *****/
@@ -2847,8 +2854,8 @@ MY_LOCALE my_locale_es_PA
   10,
   9,
   '.',        /* decimal point es_PA */
-  '\0',       /* thousands_sep es_PA */
-  "\x80\x80", /* grouping      es_PA */
+  ',',        /* thousands_sep es_PA */
+  "\x03\x03", /* grouping      es_PA */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_PA *****/
@@ -2867,8 +2874,8 @@ MY_LOCALE my_locale_es_PE
   10,
   9,
   '.',        /* decimal point es_PE */
-  '\0',       /* thousands_sep es_PE */
-  "\x80\x80", /* grouping      es_PE */
+  ',',        /* thousands_sep es_PE */
+  "\x03\x03", /* grouping      es_PE */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_PE *****/
@@ -2887,8 +2894,8 @@ MY_LOCALE my_locale_es_PR
   10,
   9,
   '.',        /* decimal point es_PR */
-  '\0',       /* thousands_sep es_PR */
-  "\x80\x80", /* grouping      es_PR */
+  ',',        /* thousands_sep es_PR */
+  "\x03\x03", /* grouping      es_PR */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_PR *****/
@@ -2907,8 +2914,8 @@ MY_LOCALE my_locale_es_PY
   10,
   9,
   ',',        /* decimal point es_PY */
-  '\0',       /* thousands_sep es_PY */
-  "\x80\x80", /* grouping      es_PY */
+  '.',        /* thousands_sep es_PY */
+  "\x03\x03", /* grouping      es_PY */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_PY *****/
@@ -2927,8 +2934,8 @@ MY_LOCALE my_locale_es_SV
   10,
   9,
   '.',        /* decimal point es_SV */
-  '\0',       /* thousands_sep es_SV */
-  "\x80\x80", /* grouping      es_SV */
+  ',',        /* thousands_sep es_SV */
+  "\x03\x03", /* grouping      es_SV */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_SV *****/
@@ -2967,8 +2974,8 @@ MY_LOCALE my_locale_es_UY
   10,
   9,
   ',',        /* decimal point es_UY */
-  '\0',       /* thousands_sep es_UY */
-  "\x80\x80", /* grouping      es_UY */
+  '.',        /* thousands_sep es_UY */
+  "\x03\x03", /* grouping      es_UY */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_UY *****/
@@ -2987,8 +2994,8 @@ MY_LOCALE my_locale_es_VE
   10,
   9,
   ',',        /* decimal point es_VE */
-  '\0',       /* thousands_sep es_VE */
-  "\x80\x80", /* grouping      es_VE */
+  '.',        /* thousands_sep es_VE */
+  "\x03\x03", /* grouping      es_VE */
   &global_errmsgs[es_ES]
 );
 /***** LOCALE END es_VE *****/
@@ -3452,7 +3459,7 @@ MY_LOCALE *my_locale_by_number(uint number)
     return NULL;
   locale= my_locales[number];
   // Check that locale is on its correct position in the array
-  DBUG_ASSERT(locale == my_locales[locale->number]);
+  assert(locale == my_locales[locale->number]);
   return locale;
 }
 
@@ -3477,7 +3484,7 @@ MY_LOCALE *my_locale_by_name(const char *name)
   if ((locale= my_locale_by_name(my_locales, name)))
   {
       // Check that locale is on its correct position in the array
-      DBUG_ASSERT(locale == my_locales[locale->number]);
+    assert(locale == my_locales[locale->number]);
       return locale;
   }
   else if ((locale= my_locale_by_name(my_locales_deprecated, name)))
diff --git a/sql/sql_locale.h b/sql/sql_locale.h
index 97938341220e..e8e2c509f534 100644
--- a/sql/sql_locale.h
+++ b/sql/sql_locale.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_manager.cc b/sql/sql_manager.cc
index c9a99c26d5ae..7fd061281839 100644
--- a/sql/sql_manager.cc
+++ b/sql/sql_manager.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_manager.h b/sql/sql_manager.h
index dfcbc74daf3d..aadc5c86a3c2 100644
--- a/sql/sql_manager.h
+++ b/sql/sql_manager.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_opt_exec_shared.h b/sql/sql_opt_exec_shared.h
index 7bdf0dcf885a..0cf5beb59df1 100644
--- a/sql/sql_opt_exec_shared.h
+++ b/sql/sql_opt_exec_shared.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -147,7 +154,7 @@ typedef struct st_table_ref : public Sql_alloc
 
   bool has_guarded_conds() const
   {
-    DBUG_ASSERT(key_parts == 0 || cond_guards != NULL);
+    assert(key_parts == 0 || cond_guards != NULL);
 
     for (uint i = 0; i < key_parts; i++)
     {
@@ -265,12 +272,12 @@ class QEP_shared : public Sql_alloc
   void set_join(JOIN *j) { m_join= j; }
   plan_idx idx() const
   {
-    DBUG_ASSERT(m_idx >= 0);                    // Index must be valid
+    assert(m_idx >= 0);                    // Index must be valid
     return m_idx;
   }
   void set_idx(plan_idx i)
   {
-    DBUG_ASSERT(m_idx == NO_PLAN_IDX);      // Index should not change in lifetime
+    assert(m_idx == NO_PLAN_IDX);      // Index should not change in lifetime
     m_idx= i;
   }
   TABLE *table() const { return m_table; }
@@ -459,7 +466,7 @@ class QEP_shared_owner
 
   /// Instructs to share the QEP_shared with another owner
   void share_qs(QEP_shared_owner *other) { other->set_qs(m_qs); }
-  void set_qs(QEP_shared *q) { DBUG_ASSERT(!m_qs); m_qs= q; }
+  void set_qs(QEP_shared *q) { assert(!m_qs); m_qs= q; }
 
   // Getters/setters forwarding to QEP_shared:
 
diff --git a/sql/sql_optimizer.cc b/sql/sql_optimizer.cc
index 8a5e9b33b3b0..2749000543e7 100644
--- a/sql/sql_optimizer.cc
+++ b/sql/sql_optimizer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -133,12 +140,12 @@ JOIN::optimize()
   uint no_jbuf_after= UINT_MAX;
 
   DBUG_ENTER("JOIN::optimize");
-  DBUG_ASSERT(select_lex->leaf_table_count == 0 ||
-              thd->lex->is_query_tables_locked() ||
-              select_lex == unit->fake_select_lex);
-  DBUG_ASSERT(tables == 0 &&
-              primary_tables == 0 &&
-              tables_list == (TABLE_LIST*)1);
+  assert(select_lex->leaf_table_count == 0 ||
+         thd->lex->is_query_tables_locked() ||
+         select_lex == unit->fake_select_lex);
+  assert(tables == 0 &&
+         primary_tables == 0 &&
+         tables_list == (TABLE_LIST*)1);
 
   // to prevent double initialization on EXPLAIN
   if (optimized)
@@ -174,8 +181,8 @@ JOIN::optimize()
 
   count_field_types(select_lex, &tmp_table_param, all_fields, false, false);
 
-  DBUG_ASSERT(tmp_table_param.sum_func_count == 0 ||
-              group_list || implicit_grouping);
+  assert(tmp_table_param.sum_func_count == 0 ||
+         group_list || implicit_grouping);
 
   if (select_lex->olap == ROLLUP_TYPE && optimize_rollup())
     DBUG_RETURN(true); /* purecov: inspected */
@@ -582,8 +589,8 @@ JOIN::optimize()
         DBUG_RETURN(true);
       if (tab->use_join_cache() != JOIN_CACHE::ALG_NONE)
         simple_sort= false;
-      DBUG_ASSERT(tab->type() != JT_FT ||
-                  tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+      assert(tab->type() != JT_FT ||
+             tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
     }
     if (!simple_sort)
     {
@@ -715,7 +722,7 @@ JOIN::optimize()
 
 setup_subq_exit:
 
-  DBUG_ASSERT(zero_result_cause != NULL);
+  assert(zero_result_cause != NULL);
   /*
     Even with zero matching rows, subqueries in the HAVING clause may
     need to be evaluated if there are aggregate functions in the
@@ -880,7 +887,7 @@ bool substitute_gc(THD *thd, SELECT_LEX *select_lex, Item *where_cond,
 void JOIN::set_plan_state(enum_plan_state plan_state_arg)
 {
   // A plan should not change to another plan:
-  DBUG_ASSERT(plan_state_arg == NO_PLAN || plan_state == NO_PLAN);
+  assert(plan_state_arg == NO_PLAN || plan_state == NO_PLAN);
   if (plan_state == NO_PLAN && plan_state_arg != NO_PLAN)
   {
     if (qep_tab != NULL)
@@ -944,7 +951,7 @@ uint QEP_TAB::get_sj_strategy() const
   if (first_sj_inner() == NO_PLAN_IDX)
     return SJ_OPT_NONE;
   const uint s= join()->qep_tab[first_sj_inner()].position()->sj_strategy;
-  DBUG_ASSERT(s != SJ_OPT_NONE);
+  assert(s != SJ_OPT_NONE);
   return s;
 }
 
@@ -966,14 +973,14 @@ uint QEP_TAB::effective_index() const
   switch (type())
   {
   case JT_SYSTEM:
-    DBUG_ASSERT(ref().key == -1);
+    assert(ref().key == -1);
     return MAX_KEY;
 
   case JT_CONST:
   case JT_EQ_REF:
   case JT_REF_OR_NULL:
   case JT_REF:
-    DBUG_ASSERT(ref().key != -1);
+    assert(ref().key != -1);
     return uint(ref().key);
 
   case JT_INDEX_SCAN:
@@ -981,7 +988,7 @@ uint QEP_TAB::effective_index() const
     return index();
 
   case JT_INDEX_MERGE:
-    DBUG_ASSERT(quick()->index == MAX_KEY);
+    assert(quick()->index == MAX_KEY);
     return MAX_KEY;
 
   case JT_RANGE:
@@ -990,7 +997,7 @@ uint QEP_TAB::effective_index() const
   case JT_ALL:
   default:
     // @todo Check why JT_UNKNOWN is a valid value here.
-    DBUG_ASSERT(type() == JT_ALL || type() == JT_UNKNOWN);
+    assert(type() == JT_ALL || type() == JT_UNKNOWN);
     return MAX_KEY;
   }
 }
@@ -1002,7 +1009,7 @@ uint JOIN_TAB::get_sj_strategy() const
   ASSERT_BEST_REF_IN_JOIN_ORDER(join());
   JOIN_TAB *tab= join()->best_ref[first_sj_inner()];
   uint s= tab->position()->sj_strategy;
-  DBUG_ASSERT(s != SJ_OPT_NONE);
+  assert(s != SJ_OPT_NONE);
   return s;
 }
 
@@ -1019,7 +1026,7 @@ int JOIN::replace_index_subquery()
     DBUG_RETURN(0);
 
   // Guaranteed by remove_redundant_subquery_clauses():
-  DBUG_ASSERT(order == NULL && !select_distinct);
+  assert(order == NULL && !select_distinct);
 
   subselect_engine *engine= NULL;
   Item_in_subselect * const in_subs=
@@ -1071,7 +1078,7 @@ int JOIN::replace_index_subquery()
 
   if (first_qep_tab->table()->covering_keys.is_set(first_qep_tab->ref().key))
   {
-    DBUG_ASSERT(!first_qep_tab->table()->no_keyread);
+    assert(!first_qep_tab->table()->no_keyread);
     first_qep_tab->table()->set_keyread(true);
   }
   // execution uses where_cond:
@@ -1310,7 +1317,7 @@ void JOIN::test_skip_sort()
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
   JOIN_TAB *const tab= best_ref[const_tables];
 
-  DBUG_ASSERT(ordered_index_usage == ordered_index_void);
+  assert(ordered_index_usage == ordered_index_void);
 
   if (group_list)   // GROUP BY honoured first
                     // (DISTINCT was rewritten to GROUP BY if skippable)
@@ -1321,7 +1328,7 @@ void JOIN::test_skip_sort()
       is going to be used as it is applied now only for one table queries
       with covering indexes.
     */
-    if (!(select_lex->active_options() & SELECT_BIG_RESULT) ||
+    if (!(select_lex->active_options() & SELECT_BIG_RESULT || with_json_agg) ||
         (tab->quick() &&
          tab->quick()->get_type() ==
            QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX))
@@ -1398,6 +1405,36 @@ static Item_func_match *test_if_ft_index_order(ORDER *order)
   return NULL;
 }
 
+/**
+  Test if this is a prefix index.
+
+  @param   table     table
+  @param   idx       index to check
+
+  @return TRUE if this is a prefix index
+*/
+bool is_prefix_index(TABLE* table, uint idx)
+{
+  if (!table || !table->key_info)
+  {
+    return false;
+  }
+  KEY* key_info = table->key_info;
+  uint key_parts = key_info[idx].user_defined_key_parts;
+  KEY_PART_INFO* key_part = key_info[idx].key_part;
+
+  for (uint i = 0; i < key_parts; i++, key_part++)
+  {
+    if (key_part->field &&
+      (key_part->length !=
+        table->field[key_part->fieldnr - 1]->key_length() &&
+        !(key_info->flags & (HA_FULLTEXT | HA_SPATIAL))))
+    {
+      return true;
+    }
+  }
+  return false;
+}
 
 /**
   Test if one can use the key to resolve ordering. 
@@ -1457,6 +1494,11 @@ int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
          const_key_parts>>= 1)
       key_part++;
 
+    /* Avoid usage of prefix index for sorting a partition table */
+    if (table->part_info && key_part != table->key_info[idx].key_part &&
+        key_part != key_part_end && is_prefix_index(table, idx))
+     DBUG_RETURN(0);
+
     if (key_part == key_part_end)
     {
       /* 
@@ -1719,7 +1761,7 @@ test_if_subkey(ORDER *order, JOIN_TAB *tab, uint ref, uint ref_key_parts,
 
 class Plan_change_watchdog
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 public:
   /**
     @param tab_arg     table whose access path is being determined
@@ -1756,13 +1798,13 @@ class Plan_change_watchdog
     if (tab == NULL)
       return;
     // changes are not allowed, we verify:
-    DBUG_ASSERT(tab->type() == type);
-    DBUG_ASSERT(tab->quick() == quick);
-    DBUG_ASSERT((quick == NULL) || tab->quick()->index == quick_index);
-    DBUG_ASSERT(tab->use_quick == use_quick);
-    DBUG_ASSERT(tab->ref().key == ref_key);
-    DBUG_ASSERT(tab->ref().key_parts == ref_key_parts);
-    DBUG_ASSERT(tab->index() == index);
+    assert(tab->type() == type);
+    assert(tab->quick() == quick);
+    assert((quick == NULL) || tab->quick()->index == quick_index);
+    assert(tab->use_quick == use_quick);
+    assert(tab->ref().key == ref_key);
+    assert(tab->ref().key_parts == ref_key_parts);
+    assert(tab->index() == index);
   }
 private:
   const JOIN_TAB *tab;            ///< table, or NULL if changes are allowed
@@ -1835,7 +1877,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
   DBUG_ENTER("test_if_skip_sort_order");
 
   /* Check that we are always called with first non-const table */
-  DBUG_ASSERT((uint)tab->idx() == join->const_tables);
+  assert((uint)tab->idx() == join->const_tables);
 
   Plan_change_watchdog watchdog(tab, no_changes);
 
@@ -1890,9 +1932,9 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
                select_limit <= ft_func->get_count())
       {
         /* test_if_ft_index_order() always returns master MATCH function. */
-        DBUG_ASSERT(!ft_func->master);
+        assert(!ft_func->master);
         /* ref is not set since there is no WHERE condition */
-        DBUG_ASSERT(tab->ref().key == -1);
+        assert(tab->ref().key == -1);
 
         /*Make EXPLAIN happy */
         tab->set_type(JT_FT);
@@ -1935,7 +1977,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
   /* Test if constant range in WHERE */
   if (tab->type() == JT_REF)
   {
-    DBUG_ASSERT(tab->ref().key >= 0 && tab->ref().key_parts);
+    assert(tab->ref().key >= 0 && tab->ref().key_parts);
     ref_key=	   tab->ref().key;
     ref_key_parts= tab->ref().key_parts;
   }
@@ -1968,6 +2010,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
   Opt_trace_object
     trace_skip_sort_order(trace, "reconsidering_access_paths_for_index_ordering");
   trace_skip_sort_order.add_alnum("clause", clause_type);
+  Opt_trace_array trace_steps(trace, "steps");
 
   if (ref_key >= 0)
   {
@@ -2027,6 +2070,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
           key_map new_ref_key_map;  // Force the creation of quick select
           new_ref_key_map.set_bit(new_ref_key); // only for new_ref_key.
 
+          Opt_trace_object trace_wrapper(trace);
           Opt_trace_object
             trace_recest(trace, "rows_estimation");
           trace_recest.add_utf8_table(tab->table_ref).
@@ -2041,9 +2085,9 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
                               false,   // don't force quick range
                               order->direction, tab,
                               // we are after make_join_select():
-                              tab->condition(), &tab->needed_reg,
-                              &qck) <= 0;
-          DBUG_ASSERT(tab->quick() == save_quick);
+                              tab->condition(), &tab->needed_reg, &qck,
+                              tab->table()->force_index) <= 0;
+          assert(tab->quick() == save_quick);
           tab->set_quick(qck);
           if (no_quick)
           {
@@ -2080,20 +2124,6 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
     const int ref_key_hint= (order_direction == 0 &&
                              tab->type() == JT_INDEX_SCAN) ? -1 : ref_key;
 
-    test_if_cheaper_ordering(tab, order, table, usable_keys,
-                             ref_key_hint,
-                             select_limit,
-                             &best_key, &best_key_direction,
-                             &select_limit, &best_key_parts,
-                             &saved_best_key_parts);
-
-    if (best_key < 0)
-    {
-      // No usable key has been found
-      can_skip_sorting= false;
-      goto fix_ICP;
-    }
-
     /*
       Does the query have a "FORCE INDEX [FOR GROUP BY] (idx)" (if
       clause is group by) or a "FORCE INDEX [FOR ORDER BY] (idx)" (if
@@ -2103,6 +2133,27 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
     const bool is_force_index= table->force_index ||
       (is_group_by ? table->force_index_group : table->force_index_order);
 
+    /*
+      Find an ordering index alternative over the chosen plan iff
+      prefer_ordering_index switch is on. This switch is overridden only when
+      force index for order/group is specified.
+    */
+    if (thd->optimizer_switch_flag(OPTIMIZER_SWITCH_PREFER_ORDERING_INDEX) ||
+        is_force_index)
+      test_if_cheaper_ordering(tab, order, table, usable_keys,
+                               ref_key_hint,
+                               select_limit,
+                               &best_key, &best_key_direction,
+                               &select_limit, &best_key_parts,
+                               &saved_best_key_parts);
+
+    if (best_key < 0)
+    {
+      // No usable key has been found
+      can_skip_sorting= false;
+      goto fix_ICP;
+    }
+
     /*
       filesort() and join cache are usually faster than reading in
       index order and not using join cache. Don't use index scan
@@ -2127,6 +2178,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
         best_key != ref_key)
     {
       tab->quick_order_tested.set_bit(best_key);
+      Opt_trace_object trace_wrapper(trace);
       Opt_trace_object
         trace_recest(trace, "rows_estimation");
       trace_recest.add_utf8_table(tab->table_ref).
@@ -2143,12 +2195,12 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
                         join->unit->select_limit_cnt,
                         true,     // force quick range
                         order->direction, tab, tab->condition(),
-                        &tab->needed_reg, &qck);
+                        &tab->needed_reg, &qck, tab->table()->force_index);
       /*
         If tab->quick() pointed to another quick than save_quick, we would
         lose access to it and leak memory.
       */
-      DBUG_ASSERT(tab->quick() == save_quick || tab->quick() == NULL);
+      assert(tab->quick() == save_quick || tab->quick() == NULL);
       tab->set_quick(qck);
     }
     order_direction= best_key_direction;
@@ -2165,8 +2217,8 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
     set_up_ref_access_to_key= false;
   }
 
-check_reverse_order:                  
-  DBUG_ASSERT(order_direction != 0);
+check_reverse_order:
+  assert(order_direction != 0);
 
   if (order_direction == -1)		// If ORDER BY ... DESC
   {
@@ -2202,7 +2254,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
     can_skip_sorting= true;
   }
 
-  DBUG_ASSERT(can_skip_sorting);
+  assert(can_skip_sorting);
 
   /*
     Update query plan with access pattern for doing 
@@ -2232,7 +2284,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
         goto fix_ICP;
       }
 
-      DBUG_ASSERT(tab->type() != JT_REF_OR_NULL && tab->type() != JT_FT);
+      assert(tab->type() != JT_REF_OR_NULL && tab->type() != JT_FT);
 
       // Changing the key makes filter_effect obsolete
       tab->position()->filter_effect= COND_FILTER_STALE;
@@ -2248,7 +2300,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
       if (!tab->quick() || tab->quick() == save_quick) // created no QUICK
       {
         // Avoid memory leak:
-        DBUG_ASSERT(tab->quick() == save_quick || tab->quick() == NULL);
+        assert(tab->quick() == save_quick || tab->quick() == NULL);
         tab->set_quick(NULL);
         tab->set_index(best_key);
         tab->set_type(JT_INDEX_SCAN);       // Read with index_first(), index_next()
@@ -2284,8 +2336,8 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
           We need to change the access method so as the quick access
           method is actually used.
         */
-        DBUG_ASSERT(tab->quick());
-        DBUG_ASSERT(tab->quick()->index==(uint)best_key);
+        assert(tab->quick());
+        assert(tab->quick()->index==(uint)best_key);
         tab->set_type(calc_join_type(tab->quick()->get_type()));
         tab->use_quick=QS_RANGE;
         tab->ref().key= -1;
@@ -2372,6 +2424,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
     }
   }
 
+  trace_steps.end();
   Opt_trace_object
     trace_change_index(trace, "index_order_summary");
   trace_change_index.add_utf8_table(tab->table_ref)
@@ -2384,7 +2437,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
   {
     // switching to another index
     // Should be no pushed conditions at this point
-    DBUG_ASSERT(!table->file->pushed_idx_cond);
+    assert(!table->file->pushed_idx_cond);
     if (unlikely(trace->is_started()))
     {
       trace_change_index.add_utf8("index", table->key_info[changed_key].name);
@@ -2414,7 +2467,7 @@ test_if_skip_sort_order(JOIN_TAB *tab, ORDER *order, ha_rows select_limit,
 
 bool JOIN::prune_table_partitions()
 {
-  DBUG_ASSERT(select_lex->partitioned_table_count);
+  assert(select_lex->partitioned_table_count);
 
   for (TABLE_LIST *tbl= select_lex->leaf_tables; tbl; tbl= tbl->next_leaf)
   {
@@ -2447,11 +2500,10 @@ bool JOIN::prune_table_partitions()
   access can utilize more keyparts than 'ref' access. Conditions
   for doing switching:
 
-  1) Range access is possible.
+  1) Range access is possible Or tab->dodgy_ref_cost is set.
   2) This function is not relevant for FT, since there is no range access for
      that type of index.
-  3) Used parts of key shouldn't have nullable parts, i.e we're
-     going to use 'ref' access, not ref_or_null.
+  3) Used parts of key shouldn't have nullable parts & ref_or_null isn't used.
   4) 'ref' access depends on a constant, not a value read from a
      table earlier in the join sequence.
 
@@ -2497,8 +2549,7 @@ bool JOIN::prune_table_partitions()
 
 static bool can_switch_from_ref_to_range(THD *thd, JOIN_TAB *tab)
 {
-
-  if (tab->quick() &&                                        // 1)
+  if ((tab->quick() || tab->dodgy_ref_cost) &&               // 1)
       tab->position()->key->keypart != FT_KEYPART)           // 2)
   {
     uint keyparts= 0, length= 0;
@@ -2513,9 +2564,9 @@ static bool can_switch_from_ref_to_range(THD *thd, JOIN_TAB *tab)
         dep_map)                                             // 4)
       return false;
 
-    if (tab->position()->key->key == tab->quick()->index &&  // 5a)
-        length < tab->quick()->max_used_key_length)          // 5b)
-      return true;
+    if (tab->quick() &&
+        tab->position()->key->key == tab->quick()->index)    // 5a)
+      return length < tab->quick()->max_used_key_length;     // 5b)
     else if (tab->dodgy_ref_cost)                            // 6)
     {
       key_map new_ref_key_map;
@@ -2523,7 +2574,10 @@ static bool can_switch_from_ref_to_range(THD *thd, JOIN_TAB *tab)
 
       Opt_trace_context * const trace= &thd->opt_trace;
       Opt_trace_object trace_wrapper(trace);
-      Opt_trace_array
+
+      Opt_trace_object
+        can_switch(trace, "check_if_range_uses_more_keyparts_than_ref");
+      Opt_trace_object
         trace_setup_cond(trace, "rerunning_range_optimizer_for_single_index");
 
       QUICK_SELECT_I *qck;
@@ -2536,18 +2590,27 @@ static bool can_switch_from_ref_to_range(THD *thd, JOIN_TAB *tab)
                             tab->join_cond() ? tab->join_cond() :
                             tab->join()->where_cond,
                             &tab->needed_reg,
-                            &qck) > 0)
+                            &qck, true) > 0)
       {
-        delete tab->quick();
-        tab->set_quick(qck);
-        return true;
+        if (length < qck->max_used_key_length)
+        {
+          delete tab->quick();
+          tab->set_quick(qck);
+          return true;
+        }
+        else
+        {
+          Opt_trace_object (trace, "access_type_unchanged").
+            add("ref_key_length", length).
+            add("range_key_length", qck->max_used_key_length);
+          delete qck;
+        }
       }
     }
   }
   return false;
 }
 
-
 /**
  An utility function - apply heuristics and optimize access methods to tables.
  Currently this function can change REF to RANGE and ALL to INDEX scan if
@@ -2624,9 +2687,9 @@ void JOIN::adjust_access_methods()
       }
     }
     // Ensure AM consistency
-    DBUG_ASSERT(!(tab->quick() && (tab->type() == JT_REF || tab->type() == JT_ALL)));
-    DBUG_ASSERT((tab->type() != JT_RANGE && tab->type() != JT_INDEX_MERGE) ||
-                tab->quick());
+    assert(!(tab->quick() && (tab->type() == JT_REF || tab->type() == JT_ALL)));
+    assert((tab->type() != JT_RANGE && tab->type() != JT_INDEX_MERGE) ||
+           tab->quick());
     if (!tab->const_keys.is_clear_all() &&
         tab->table()->reginfo.impossible_range &&
         ((i == const_tables && tab->type() == JT_REF) ||
@@ -2692,7 +2755,7 @@ bool JOIN::get_best_combination()
   DBUG_ENTER("JOIN::get_best_combination");
 
   // At this point "tables" and "primary"tables" represent the same:
-  DBUG_ASSERT(tables == primary_tables);
+  assert(tables == primary_tables);
 
   /*
     Allocate additional space for tmp tables.
@@ -2766,7 +2829,7 @@ bool JOIN::get_best_combination()
     POSITION *const pos= best_positions + tableno;
     if (has_semijoin && sj_is_materialize_strategy(pos->sj_strategy))
     {
-      DBUG_ASSERT(outer_target < inner_target);
+      assert(outer_target < inner_target);
 
       TABLE_LIST *const sj_nest= pos->table->emb_sj_nest;
 
@@ -2850,9 +2913,9 @@ bool JOIN::get_best_combination()
         // REF or RANGE, clarify later when prefix tables are set for JOIN_TABs
         tab->set_type(JT_REF);
     }
-    DBUG_ASSERT(tab->type() != JT_UNKNOWN);
+    assert(tab->type() != JT_UNKNOWN);
 
-    DBUG_ASSERT(table->reginfo.join_tab == tab);
+    assert(table->reginfo.join_tab == tab);
     if (!tab->join_cond())
       table->reginfo.not_exists_optimize= false;     // Only with LEFT JOIN
     map2table[tab->table_ref->tableno()]= tab;
@@ -2872,7 +2935,7 @@ bool JOIN::get_best_combination()
     const uint idx= outer_target + i;
     tmp_join_tabs->set_join(this);
     tmp_join_tabs->set_idx(idx);
-    DBUG_ASSERT(best_ref[idx] == NULL); // verify that not overwriting
+    assert(best_ref[idx] == NULL); // verify that not overwriting
     best_ref[idx]= tmp_join_tabs++;
     /*
       note that set_table() cannot be called yet. We may not even use this
@@ -2960,7 +3023,7 @@ void revise_cache_usage(JOIN_TAB *join_tab)
   }
   else
     join_tab->set_use_join_cache(JOIN_CACHE::ALG_NONE);
-  DBUG_ASSERT(join->qep_tab == NULL);
+  assert(join->qep_tab == NULL);
 }
 
 
@@ -3052,7 +3115,7 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
   Cost_estimate cost;
   ha_rows rows;
   uint bufsz= 4096;
-  uint join_cache_flags= HA_MRR_NO_NULL_ENDPOINTS;
+  uint join_cache_flags = 0;
   const bool bnl_on= hint_table_state(join->thd, tab->table_ref->table,
                                       BNL_HINT_ENUM, OPTIMIZER_SWITCH_BNL);
   const bool bka_on= hint_table_state(join->thd, tab->table_ref->table,
@@ -3063,13 +3126,23 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
   bool use_bka_unique= false;
   DBUG_EXECUTE_IF("test_bka_unique", use_bka_unique= true;);
 
+  /*
+    If all key_parts are null_rejecting, the MultiRangeRowIterator will
+    eliminate all NULL values in the key set, such that
+    HA_MRR_NO_NULL_ENDPOINTS can be promised.
+  */
+  const key_part_map keypart_map = make_prev_keypart_map(tab->ref().key_parts);
+  if (tab->ref().null_rejecting == keypart_map) {
+    join_cache_flags |= HA_MRR_NO_NULL_ENDPOINTS;
+  }
+
   // Set preliminary join cache setting based on decision from greedy search
   tab->set_use_join_cache(tab->position()->use_join_buffer ?
                           JOIN_CACHE::ALG_BNL : JOIN_CACHE::ALG_NONE);
 
   if (tableno == join->const_tables)
   {
-    DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+    assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
     return false;
   }
 
@@ -3114,14 +3187,14 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
     */
     if (!tab->is_single_inner_of_semi_join())
     {
-      DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+      assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
       goto no_join_cache;
     }
     break;
 
   case SJ_OPT_LOOSE_SCAN:
     /* No join buffering if this semijoin nest is handled by loosescan */
-    DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+    assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
     goto no_join_cache;
 
   case SJ_OPT_MATERIALIZE_LOOKUP:
@@ -3137,7 +3210,7 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
     */
     if (tab->first_sj_inner() == tab->idx())
     {
-      DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+      assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
       goto no_join_cache;
     }
     break;
@@ -3175,7 +3248,7 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
   case JT_INDEX_MERGE:
     if (!bnl_on)
     {
-      DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+      assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
       goto no_join_cache;
     }
 
@@ -3187,7 +3260,7 @@ static bool setup_join_buffering(JOIN_TAB *tab, JOIN *join, uint no_jbuf_after)
   case JT_EQ_REF:
     if (!bka_on)
     {
-      DBUG_ASSERT(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
+      assert(tab->use_join_cache() == JOIN_CACHE::ALG_NONE);
       goto no_join_cache;
     }
 
@@ -4357,7 +4430,7 @@ static Item *eliminate_item_equal(Item *cond, COND_EQUAL *upper_levels,
     cond= new Item_cond_and(eq_list);
   else
   {
-    DBUG_ASSERT(cond->type() == Item::COND_ITEM);
+    assert(cond->type() == Item::COND_ITEM);
     if (eq_list.elements)
       ((Item_cond *) cond)->add_at_head(&eq_list);
   }
@@ -4694,7 +4767,7 @@ uint build_bitmap_for_nested_joins(List<TABLE_LIST> *join_list,
     if ((nested_join= table->nested_join))
     {
       // We should have either a join condition or a semi-join condition
-      DBUG_ASSERT((table->join_cond() == NULL) == (table->sj_cond() != NULL));
+      assert((table->join_cond() == NULL) == (table->sj_cond() != NULL));
 
       nested_join->nj_map= 0;
       nested_join->nj_total= 0;
@@ -4705,7 +4778,7 @@ uint build_bitmap_for_nested_joins(List<TABLE_LIST> *join_list,
       */
       if (table->join_cond())
       {
-        DBUG_ASSERT(first_unused < sizeof(nested_join_map)*8);
+        assert(first_unused < sizeof(nested_join_map)*8);
         nested_join->nj_map= (nested_join_map) 1 << first_unused++;
         nested_join->nj_total= nested_join->join_list.elements;
       }
@@ -4722,7 +4795,7 @@ uint build_bitmap_for_nested_joins(List<TABLE_LIST> *join_list,
           outer_nest->nj_total+= (nested_join->join_list.elements - 1);
       }
       else
-        DBUG_ASSERT(false);
+        assert(false);
 
       first_unused= build_bitmap_for_nested_joins(&nested_join->join_list,
                                                   first_unused);
@@ -4822,7 +4895,7 @@ bool JOIN::update_equalities_for_sjm()
   {
     TABLE_LIST *const sj_nest= sjm_exec->sj_nest;
 
-    DBUG_ASSERT(!sj_nest->outer_join_nest());
+    assert(!sj_nest->outer_join_nest());
     /*
       A materialized semi-join nest cannot actually be an inner part of an
       outer join yet, this is just a preparatory step,
@@ -4888,7 +4961,7 @@ bool JOIN::update_equalities_for_sjm()
 void JOIN::set_prefix_tables()
 {
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
-  DBUG_ASSERT(!plan_is_const());
+  assert(!plan_is_const());
   /*
     The const tables are available together with the first non-const table in
     the join order.
@@ -4931,7 +5004,13 @@ void JOIN::set_prefix_tables()
 
       if (!(sjm_inner_tables & ~current_tables_map))
       {
-        // At the end of a semi-join materialization nest, restore previous map
+        /*
+          At the end of a semi-join materialization nest,
+          add non-deterministic expressions to the last table of the nest:
+        */
+        tab->add_prefix_tables(RAND_TABLE_BIT);
+
+        // Restore the previous map:
         current_tables_map= saved_tables_map;
         prev_tables_map= last_non_sjm_tab ?
                          last_non_sjm_tab->prefix_tables() : (table_map) 0;
@@ -4946,7 +5025,7 @@ void JOIN::set_prefix_tables()
     }
   }
   /*
-    Random expressions must be added to the last table's condition.
+    Non-deterministic expressions must be added to the last table's condition.
     It solves problem with queries like SELECT * FROM t1 WHERE rand() > 0.5
   */
   if (last_non_sjm_tab != NULL)
@@ -5140,7 +5219,7 @@ bool JOIN::init_planner_arrays()
   const uint sj_nests= select_lex->sj_nests.elements;
   const uint table_count= select_lex->leaf_table_count;
 
-  DBUG_ASSERT(primary_tables == 0 && tables == 0);
+  assert(primary_tables == 0 && tables == 0);
 
   if (!(join_tab= alloc_jtab_array(thd, table_count)))
     return true;
@@ -5300,7 +5379,7 @@ bool JOIN::propagate_dependencies()
       Thus, an assert has been added should this happen again.
       @todo Remove the error check below.
     */
-    DBUG_ASSERT(!(tab->dependent & tab->table_ref->map()));
+    assert(!(tab->dependent & tab->table_ref->map()));
 
     if (tab->dependent & tab->table_ref->map())
     {
@@ -5762,7 +5841,7 @@ bool JOIN::estimate_rowcount()
 
 void JOIN::set_semijoin_embedding()
 {
-  DBUG_ASSERT(!select_lex->sj_nests.is_empty());
+  assert(!select_lex->sj_nests.is_empty());
 
   JOIN_TAB *const tab_end= join_tab + primary_tables;
 
@@ -5814,8 +5893,8 @@ void semijoin_types_allow_materialization(TABLE_LIST *sj_nest)
 {
   DBUG_ENTER("semijoin_types_allow_materialization");
 
-  DBUG_ASSERT(sj_nest->nested_join->sj_outer_exprs.elements ==
-              sj_nest->nested_join->sj_inner_exprs.elements);
+  assert(sj_nest->nested_join->sj_outer_exprs.elements ==
+         sj_nest->nested_join->sj_inner_exprs.elements);
 
   if (sj_nest->nested_join->sj_outer_exprs.elements > MAX_REF_PARTS)
   {
@@ -5843,7 +5922,7 @@ void semijoin_types_allow_materialization(TABLE_LIST *sj_nest)
                               &max_key_part_length);
   while (outer= it1++, inner= it2++)
   {
-    DBUG_ASSERT(outer->real_item() && inner->real_item());
+    assert(outer->real_item() && inner->real_item());
     if (!types_allow_materialization(outer, inner))
     {
       sj_nest->nested_join->sjm.scan_allowed= false; 
@@ -5866,7 +5945,7 @@ void semijoin_types_allow_materialization(TABLE_LIST *sj_nest)
 
   if (sj_nest->embedding)
   {
-    DBUG_ASSERT(sj_nest->embedding->join_cond_optim());
+    assert(sj_nest->embedding->join_cond_optim());
     /*
       There are two issues that prevent materialization strategy from being
       used when a semi-join nest is on the inner side of an outer join:
@@ -5945,7 +6024,7 @@ static ha_rows get_quick_record_count(THD *thd, JOIN_TAB *tab, ha_rows limit)
                                  ORDER::ORDER_NOT_RELEVANT, tab,
                                  tab->join_cond() ? tab->join_cond() :
                                  tab->join()->where_cond,
-                                 &tab->needed_reg, &qck);
+                                 &tab->needed_reg, &qck, tab->table()->force_index);
     tab->set_quick(qck);
 
     if (error == 1)
@@ -6010,7 +6089,7 @@ static uint get_tmp_table_rec_length(List<Item> &items)
       break;
     case ROW_RESULT:
     default:
-      DBUG_ASSERT(0); /* purecov: deadcode */
+      assert(0); /* purecov: deadcode */
       break;
     }
   }
@@ -6038,7 +6117,7 @@ static void trace_table_dependencies(Opt_trace_context * trace,
     trace_one_table.add_utf8_table(table_ref).
       add("row_may_be_null", table_ref->table->is_nullable());
     const table_map map= table_ref->map();
-    DBUG_ASSERT(map < (1ULL << table_count));
+    assert(map < (1ULL << table_count));
     for (uint j= 0; j < table_count; j++)
     {
       if (map & (1ULL << j))
@@ -6128,7 +6207,7 @@ static void add_not_null_conds(JOIN *join)
           Item *item= tab->ref().items[keypart];
           Item *notnull;
           Item *real= item->real_item();
-          DBUG_ASSERT(real->type() == Item::FIELD_ITEM);
+          assert(real->type() == Item::FIELD_ITEM);
           Item_field *not_null_item= (Item_field*)real;
           JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
           /*
@@ -6301,7 +6380,7 @@ static bool optimize_semijoin_nests_for_materialization(JOIN *join)
         OPTIMIZER_SWITCH_MATERIALIZATION)
     {
       /* A semi-join nest should not contain tables marked as const */
-      DBUG_ASSERT(!(sj_nest->sj_inner_tables & join->const_table_map));
+      assert(!(sj_nest->sj_inner_tables & join->const_table_map));
 
       Opt_trace_object trace_wrapper(trace);
       Opt_trace_object
@@ -6383,7 +6462,14 @@ static bool find_eq_ref_candidate(TABLE_LIST *tl, table_map sj_inner_tables)
           if (!(keyuse->used_tables & sj_inner_tables) &&
               !(keyuse->optimize & KEY_OPTIMIZE_REF_OR_NULL))
           {
-            bound_parts|= (key_part_map)1 << keyuse->keypart;
+            /*
+              Consider only if the resulting condition does not pass a NULL
+              value through. Especially needed for a UNIQUE index on NULLable
+              columns where a duplicate row is possible with NULL values.
+            */
+            if (keyuse->null_rejecting || !keyuse->val->maybe_null ||
+                !keyinfo->key_part[keyuse->keypart].field->maybe_null())
+              bound_parts|= (key_part_map)1 << keyuse->keypart;
           }
           keyuse++;
         } while (keyuse->key == key && keyuse->table_ref == tl);
@@ -6456,7 +6542,7 @@ static bool pull_out_semijoin_tables(JOIN *join)
   TABLE_LIST *sj_nest;
   DBUG_ENTER("pull_out_semijoin_tables");
 
-  DBUG_ASSERT(!join->select_lex->sj_nests.is_empty());
+  assert(!join->select_lex->sj_nests.is_empty());
 
   List_iterator<TABLE_LIST> sj_list_it(join->select_lex->sj_nests);
   Opt_trace_context * const trace= &join->thd->opt_trace;
@@ -6819,14 +6905,14 @@ static uint get_semi_join_select_list_index(Item_field *item_field)
 }
 
 /**
-   @brief 
-   If EXPLAIN EXTENDED, add warning that an index cannot be used for
-   ref access
+   @brief
+   If EXPLAIN EXTENDED  or if the --safe-updates option is enabled, add a
+   warning that an index cannot be used for ref access
 
    @details
-   If EXPLAIN EXTENDED, add a warning for each index that cannot be
-   used for ref access due to either type conversion or different
-   collations on the field used for comparison
+   If EXPLAIN EXTENDED or if the --safe-updates option is enabled, add a
+   warning for each index that cannot be used for ref access due to either type
+   conversion or different collations on the field used for comparison
 
    Example type conversion (char compared to int):
 
@@ -6840,13 +6926,14 @@ static uint get_semi_join_select_list_index(Item_field *item_field)
 
    @param thd                Thread for the connection that submitted the query
    @param field              Field used in comparision
-   @param cant_use_indexes   Indexes that cannot be used for lookup
+   @param cant_use_index   Indexes that cannot be used for lookup
  */
-static void 
-warn_index_not_applicable(THD *thd, const Field *field, 
-                          const key_map cant_use_index) 
+static void
+warn_index_not_applicable(THD *thd, const Field *field,
+                          const key_map cant_use_index)
 {
-  if (thd->lex->describe)
+  if (thd->lex->describe ||
+      thd->variables.option_bits & OPTION_SAFE_UPDATES)
     for (uint j=0 ; j < field->table->s->keys ; j++)
       if (cant_use_index.is_set(j))
         push_warning_printf(thd,
@@ -6890,7 +6977,7 @@ add_key_field(Key_field **key_fields, uint and_level, Item_func *cond,
               uint num_values, table_map usable_tables,
               SARGABLE_PARAM **sargables)
 {
-  DBUG_ASSERT(eq_func || sargables);
+  assert(eq_func || sargables);
 
   Field *const field= item_field->field;
   TABLE_LIST *const tl= item_field->table_ref;
@@ -6919,7 +7006,7 @@ add_key_field(Key_field **key_fields, uint and_level, Item_func *cond,
         !tl->table->is_nullable() || field->real_maybe_null())
       return;					// Not a key. Skip it
     exists_optimize= KEY_OPTIMIZE_EXISTS;
-    DBUG_ASSERT(num_values == 1);
+    assert(num_values == 1);
   }
   else
   {
@@ -6976,14 +7063,14 @@ add_key_field(Key_field **key_fields, uint and_level, Item_func *cond,
           We do not save info about equalities as update_const_equal_items
           will take care of updating info on keys from sargable equalities. 
         */
-        DBUG_ASSERT(sargables);
+        assert(sargables);
         (*sargables)--;
         /*
           The sargables and key_fields arrays share the same memory
           buffer, and grow from opposite directions, so make sure they
           don't cross.
         */
-        DBUG_ASSERT(*sargables > *reinterpret_cast<SARGABLE_PARAM**>(key_fields));
+        assert(*sargables > *reinterpret_cast<SARGABLE_PARAM**>(key_fields));
         (*sargables)->field= field;
         (*sargables)->arg_value= value;
         (*sargables)->num_values= num_values;
@@ -7060,7 +7147,7 @@ add_key_field(Key_field **key_fields, uint and_level, Item_func *cond,
     For the moment eq_func is always true. This slot is reserved for future
     extensions where we want to remembers other things than just eq comparisons
   */
-  DBUG_ASSERT(eq_func);
+  assert(eq_func);
   /*
     If the condition has form "tbl.keypart = othertbl.field" and 
     othertbl.field can be NULL, there will be no matches if othertbl.field 
@@ -7089,8 +7176,8 @@ add_key_field(Key_field **key_fields, uint and_level, Item_func *cond,
     cross. But if sargables was NULL, eq_func had to be true and we
     don't write any sargables.
   */
-  DBUG_ASSERT(sargables == NULL ||
-              *key_fields < *reinterpret_cast<Key_field**>(sargables));
+  assert(sargables == NULL ||
+         *key_fields < *reinterpret_cast<Key_field**>(sargables));
 }
 
 /**
@@ -7385,8 +7472,8 @@ add_key_fields(JOIN *join, Key_field **key_fields, uint *and_level,
       if (cond_func->functype() == Item_func::NE_FUNC &&
         is_local_field (cond_func->arguments()[1]))
         values--;
-      DBUG_ASSERT(cond_func->functype() != Item_func::IN_FUNC ||
-                  cond_func->argument_count() != 2);
+      assert(cond_func->functype() != Item_func::IN_FUNC ||
+             cond_func->argument_count() != 2);
       add_key_equal_fields(key_fields, *and_level, cond_func,
                            (Item_field*) (cond_func->key_item()->real_item()),
                            0, values, 
@@ -7418,16 +7505,16 @@ add_key_fields(JOIN *join, Key_field **key_fields, uint *and_level,
         for (uint i= 0; i < lhs_row->cols(); ++i)
         {
           Item *const lhs_item= lhs_row->element_index(i)->real_item();
-          DBUG_ASSERT(lhs_item->type() == Item::FIELD_ITEM);
+          assert(lhs_item->type() == Item::FIELD_ITEM);
           Item_field *const lhs_column= static_cast<Item_field*>(lhs_item);
           // j goes from 1 since arguments()[0] is the lhs of IN.
           for (uint j= 1; j < cond_func->argument_count(); ++j)
           {
             // Here we pick out the i:th column in the j:th row.
             Item *rhs_item= cond_func->arguments()[j];
-            DBUG_ASSERT(rhs_item->type() == Item::ROW_ITEM);
+            assert(rhs_item->type() == Item::ROW_ITEM);
             Item_row *rhs_row= static_cast<Item_row*>(rhs_item);
-            DBUG_ASSERT(rhs_row->cols() == lhs_row->cols());
+            assert(rhs_row->cols() == lhs_row->cols());
             Item **rhs_expr_ptr= rhs_row->addr(i);
             /*
               add_key_field() will write a Key_field on each call
@@ -7448,7 +7535,7 @@ add_key_fields(JOIN *join, Key_field **key_fields, uint *and_level,
                           usable_tables,
                           NULL); // sargables
             // The pointer is not supposed to increase by more than one.
-            DBUG_ASSERT(scrap_key_field_ptr <= &scrap_key_field + 1);
+            assert(scrap_key_field_ptr <= &scrap_key_field + 1);
           }
         }
       }
@@ -7790,7 +7877,7 @@ static void add_key_fields_for_nj(JOIN *join, TABLE_LIST *nested_join_table,
   bool have_another = FALSE;
   table_map tables= 0;
   TABLE_LIST *table;
-  DBUG_ASSERT(nested_join_table->nested_join);
+  assert(nested_join_table->nested_join);
 
   while ((table= li++) || (have_another && (li=li2, have_another=FALSE,
                                             (table= li++))))
@@ -7984,7 +8071,7 @@ static void trace_indexes_added_group_distinct(Opt_trace_context *trace,
 static void
 add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab)
 {
-  DBUG_ASSERT(join_tab->const_keys.is_subset(join_tab->keys()));
+  assert(join_tab->const_keys.is_subset(join_tab->keys()));
 
   List<Item_field> indexed_fields;
   List_iterator<Item_field> indexed_fields_it(indexed_fields);
@@ -8062,7 +8149,7 @@ add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab)
     join_tab->keys().merge(possible_keys);
   }
 
-  DBUG_ASSERT(join_tab->const_keys.is_subset(join_tab->keys()));
+  assert(join_tab->const_keys.is_subset(join_tab->keys()));
 }
 
 /**
@@ -8354,7 +8441,7 @@ void JOIN::make_outerjoin_info()
 {
   DBUG_ENTER("JOIN::make_outerjoin_info");
 
-  DBUG_ASSERT(select_lex->outer_join);
+  assert(select_lex->outer_join);
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
 
   select_lex->reset_nj_counters();
@@ -8447,7 +8534,7 @@ add_found_match_trig_cond(JOIN *join, plan_idx idx, Item *cond,
                           plan_idx root_idx)
 {
   ASSERT_BEST_REF_IN_JOIN_ORDER(join);
-  DBUG_ASSERT(cond);
+  assert(cond);
 
   for ( ; idx != root_idx; idx= join->best_ref[idx]->first_upper())
   {
@@ -8522,7 +8609,7 @@ bool JOIN::attach_join_conditions(plan_idx last_tab)
       same outer join:
     */
     Item *const join_cond= best_ref[first_inner]->join_cond();
-    DBUG_ASSERT(join_cond);
+    assert(join_cond);
     /*
       Add the constant part of the join condition to the first inner table
       of the outer join.
@@ -8769,7 +8856,7 @@ void JOIN::remove_subq_pushed_predicates()
 
 bool JOIN::generate_derived_keys()
 {
-  DBUG_ASSERT(select_lex->materialized_derived_table_count);
+  assert(select_lex->materialized_derived_table_count);
 
   for (TABLE_LIST *table= select_lex->leaf_tables;
        table;
@@ -8797,7 +8884,7 @@ bool JOIN::generate_derived_keys()
 
 void JOIN::drop_unused_derived_keys()
 {
-  DBUG_ASSERT(select_lex->materialized_derived_table_count);
+  assert(select_lex->materialized_derived_table_count);
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
 
   for (uint i= 0 ; i < tables ; i++)
@@ -8858,7 +8945,7 @@ void JOIN::drop_unused_derived_keys()
 bool JOIN::cache_const_exprs()
 {
   /* No need in cache if all tables are constant. */
-  DBUG_ASSERT(!plan_is_const());
+  assert(!plan_is_const());
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
 
   for (uint i= const_tables; i < tables; i++)
@@ -9193,7 +9280,7 @@ static bool make_join_select(JOIN *join, Item *cond)
 
       if (cond && !tmp && tab->quick())
       {						// Outer join
-        DBUG_ASSERT(tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE);
+        assert(tab->type() == JT_RANGE || tab->type() == JT_INDEX_MERGE);
         /*
           Hack to handle the case where we only refer to a table
           in the ON part of an OUTER JOIN. In this case we want the code
@@ -9252,7 +9339,7 @@ static bool make_join_select(JOIN *join, Item *cond)
               We keep (for now) the QUICK AM calculated in
               get_quick_record_count().
             */
-            DBUG_ASSERT(tab->quick()->is_valid());
+            assert(tab->quick()->is_valid());
 	  }
 	  else
           {
@@ -9290,7 +9377,7 @@ static bool make_join_select(JOIN *join, Item *cond)
           enum { DONT_RECHECK, NOT_FIRST_TABLE, LOW_LIMIT }
           recheck_reason= DONT_RECHECK;
 
-          DBUG_ASSERT(tab->const_keys.is_subset(tab->keys()));
+          assert(tab->const_keys.is_subset(tab->keys()));
 
           const join_type orig_join_type= tab->type();
           const QUICK_SELECT_I *const orig_quick= tab->quick();
@@ -9379,7 +9466,15 @@ static bool make_join_select(JOIN *join, Item *cond)
                   recheck_reason= DONT_RECHECK;
                 }
               }
-              if (recheck_reason != DONT_RECHECK)
+              /*
+                We do a cost based search for an ordering index here. Do this
+                only if prefer_ordering_index switch is on or an index is
+                forced for order by
+              */
+              if (recheck_reason != DONT_RECHECK &&
+                  (tab->table()->force_index_order ||
+                   thd->optimizer_switch_flag(
+                       OPTIMIZER_SWITCH_PREFER_ORDERING_INDEX)))
               {
                 int best_key= -1;
                 ha_rows select_limit= join->unit->select_limit_cnt;
@@ -9424,7 +9519,8 @@ static bool make_join_select(JOIN *join, Item *cond)
                                   false,   // don't force quick range
                                   interesting_order, tab,
                                   tab->condition(),
-                                  &tab->needed_reg, &qck) < 0;
+                                  &tab->needed_reg, &qck,
+                                  tab->table()->force_index) < 0;
               tab->set_quick(qck);
             }
             tab->set_condition(orig_cond);
@@ -9452,7 +9548,7 @@ static bool make_join_select(JOIN *join, Item *cond)
                                   false,   //don't force quick range
                                   ORDER::ORDER_NOT_RELEVANT, tab,
                                   tab->condition(), &tab->needed_reg,
-                                  &qck) < 0;
+                                  &qck, tab->table()->force_index) < 0;
               tab->set_quick(qck);
               if (impossible_where)
                 DBUG_RETURN(1);			// Impossible WHERE
@@ -9917,7 +10013,7 @@ bool optimize_cond(THD *thd, Item **cond, COND_EQUAL **cond_equal,
     a) For a WHERE condition or a query having outer join.
     b) For a HAVING condition.
   */
-  DBUG_ASSERT(*cond || join_list);
+  assert(*cond || join_list);
 
   /*
     Build all multiple equality predicates and eliminate equality
@@ -9977,7 +10073,7 @@ bool optimize_cond(THD *thd, Item **cond, COND_EQUAL **cond_equal,
     }
     step_wrapper.add("resulting_condition", *cond);
   }
-  DBUG_ASSERT(!thd->is_error());
+  assert(!thd->is_error());
   if (thd->is_error())
     DBUG_RETURN(true);
   DBUG_RETURN(false);
@@ -10049,7 +10145,7 @@ static bool internal_remove_eq_conds(THD *thd, Item *cond,
         }
         break;
       case Item::COND_UNDEF:			// Impossible
-        DBUG_ASSERT(false);                     /* purecov: deadcode */
+        assert(false);                     /* purecov: deadcode */
       }
     }
     if (should_fix_fields)
@@ -10535,7 +10631,7 @@ get_sort_by_table(ORDER *a,ORDER *b,TABLE_LIST *tables)
 static Item_cond_and *create_cond_for_const_ref(THD *thd, JOIN_TAB *join_tab)
 {
   DBUG_ENTER("create_cond_for_const_ref");
-  DBUG_ASSERT(join_tab->ref().key_parts);
+  assert(join_tab->ref().key_parts);
 
   TABLE *table= join_tab->table();
   Item_cond_and *cond= new Item_cond_and();
@@ -10656,7 +10752,7 @@ void JOIN::optimize_keyuse()
     */
     keyuse->ref_table_rows= ~(ha_rows) 0;	// If no ref
     if (keyuse->used_tables &
-	(map= (keyuse->used_tables & ~const_table_map & ~OUTER_REF_TABLE_BIT)))
+       (map= (keyuse->used_tables & ~const_table_map & ~PSEUDO_TABLE_BITS)))
     {
       uint tableno;
       for (tableno= 0; ! (map & 1) ; map>>=1, tableno++)
@@ -10686,7 +10782,7 @@ bool JOIN::optimize_fts_query()
 {
   ASSERT_BEST_REF_IN_JOIN_ORDER(this);
 
-  DBUG_ASSERT(select_lex->has_ft_funcs());
+  assert(select_lex->has_ft_funcs());
 
   for (uint i= const_tables; i < tables; i++)
   {
@@ -10747,7 +10843,7 @@ bool JOIN::optimize_fts_query()
 
 bool JOIN::fts_index_access(JOIN_TAB *tab)
 {
-  DBUG_ASSERT(tab->type() == JT_FT);
+  assert(tab->type() == JT_FT);
   TABLE *table= tab->table();
 
   if ((table->file->ha_table_flags() & HA_CAN_FULLTEXT_EXT) == 0)
@@ -10908,7 +11004,7 @@ static void calculate_materialization_costs(JOIN *join,
  */
 bool JOIN::decide_subquery_strategy()
 {
-  DBUG_ASSERT(unit->item);
+  assert(unit->item);
 
   switch (unit->item->substype())
   {
@@ -10926,7 +11022,7 @@ bool JOIN::decide_subquery_strategy()
 
   Item_exists_subselect::enum_exec_method chosen_method= in_pred->exec_method;
   // Materialization does not allow UNION so this can't happen:
-  DBUG_ASSERT(chosen_method != Item_exists_subselect::EXEC_MATERIALIZATION);
+  assert(chosen_method != Item_exists_subselect::EXEC_MATERIALIZATION);
 
   if ((chosen_method == Item_exists_subselect::EXEC_EXISTS_OR_MAT) &&
       compare_costs_of_subquery_strategies(&chosen_method))
@@ -10939,7 +11035,7 @@ bool JOIN::decide_subquery_strategy()
   case Item_exists_subselect::EXEC_MATERIALIZATION:
     return in_pred->finalize_materialization_transform(this);
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     return true;
   }
 }
@@ -10975,8 +11071,8 @@ bool JOIN::compare_costs_of_subquery_strategies(
   if (allowed_strategies == Item_exists_subselect::EXEC_EXISTS)
     return false;
 
-  DBUG_ASSERT(allowed_strategies == Item_exists_subselect::EXEC_EXISTS_OR_MAT ||
-              allowed_strategies == Item_exists_subselect::EXEC_MATERIALIZATION);
+  assert(allowed_strategies == Item_exists_subselect::EXEC_EXISTS_OR_MAT ||
+         allowed_strategies == Item_exists_subselect::EXEC_MATERIALIZATION);
 
   const JOIN *parent_join= unit->outer_select()->join;
   if (!parent_join || !parent_join->child_subquery_can_materialize)
@@ -11013,7 +11109,7 @@ bool JOIN::compare_costs_of_subquery_strategies(
 
     // Compute plans which do not use outer references
 
-    DBUG_ASSERT(allow_outer_refs);
+    assert(allow_outer_refs);
     allow_outer_refs= false;
 
     if (optimize_semijoin_nests_for_materialization(this))
@@ -11085,7 +11181,7 @@ bool JOIN::compare_costs_of_subquery_strategies(
             t1, potentially way more than 1.
        */
         const uint idx= subs->in_cond_of_tab;
-        DBUG_ASSERT((int)idx >= 0 && idx < parent_join->tables);
+        assert((int)idx >= 0 && idx < parent_join->tables);
         trace_parent.add("subq_attached_to_table", true);
         QEP_TAB *const parent_tab= &parent_join->qep_tab[idx];
         trace_parent.add_utf8_table(parent_tab->table_ref);
@@ -11259,7 +11355,7 @@ bool JOIN::optimize_rollup()
 void JOIN::refine_best_rowcount()
 {
   // If plan is const, 0 or 1 rows should be returned
-  DBUG_ASSERT(!plan_is_const() || best_rowcount <= 1);
+  assert(!plan_is_const() || best_rowcount <= 1);
 
   if (plan_is_const())
     return;
diff --git a/sql/sql_optimizer.h b/sql/sql_optimizer.h
index 4568a4e61d43..91ff4dc6f06f 100644
--- a/sql/sql_optimizer.h
+++ b/sql/sql_optimizer.h
@@ -1,16 +1,23 @@
 #ifndef SQL_OPTIMIZER_INCLUDED
 #define SQL_OPTIMIZER_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -141,6 +148,7 @@ class JOIN :public Sql_alloc
       set_group_rpa(false),
       group_sent(false),
       calc_found_rows(false),
+      with_json_agg(select->json_agg_func_used()),
       optimized(false),
       executed(false),
       plan_state(NO_PLAN)
@@ -415,15 +423,15 @@ class JOIN :public Sql_alloc
 
     void set_flag(Explain_sort_property flag)
     {
-      DBUG_ASSERT(order);
+      assert(order);
       flags|= flag;
     }
     void reset_flag(Explain_sort_property flag) { flags&= ~flag; }
     bool get_flag(Explain_sort_property flag) const {
-      DBUG_ASSERT(order);
+      assert(order);
       return flags & flag;
     }
-    int get_flags() const { DBUG_ASSERT(order); return flags; }
+    int get_flags() const { assert(order); return flags; }
   };
 
   /**
@@ -528,6 +536,15 @@ class JOIN :public Sql_alloc
   /// If true, calculate found rows for this query block
   bool calc_found_rows;
 
+  /**
+    This will force tmp table to NOT use index + update for group
+    operation as it'll cause [de]serialization for each json aggregated
+    value and is very ineffective (times worse).
+    Server should use filesort, or tmp table + filesort to resolve GROUP BY
+    with JSON aggregate functions.
+  */
+  bool with_json_agg;
+
   /// True if plan is const, ie it will return zero or one rows.
   bool plan_is_const() const { return const_tables == primary_tables; }
 
@@ -555,7 +572,7 @@ class JOIN :public Sql_alloc
    */
   void copy_ref_ptr_array(Ref_ptr_array dst_arr, Ref_ptr_array src_arr)
   {
-    DBUG_ASSERT(dst_arr.size() >= src_arr.size());
+    assert(dst_arr.size() >= src_arr.size());
     void *dest= dst_arr.array();
     const void *src= src_arr.array();
     memcpy(dest, src, src_arr.size() * src_arr.element_size());
@@ -650,7 +667,7 @@ class JOIN :public Sql_alloc
 
   const Cost_model_server* cost_model() const
   {
-    DBUG_ASSERT(thd != NULL);
+    assert(thd != NULL);
     return thd->cost_model();
   }
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 00efd393f6d9..d5714bdd9dd3 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -125,7 +132,6 @@ using std::max;
    (LP)->sql_command == SQLCOM_DROP_FUNCTION ? \
    "FUNCTION" : "PROCEDURE")
 
-static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables);
 static void sql_kill(THD *thd, my_thread_id id, bool only_kill_query);
 
 const LEX_STRING command_name[]={
@@ -188,27 +194,53 @@ bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
   @param thd  Thread handle.
   @param db   Database name used while evaluating the filtering
               rules.
-  
+  @param sql_cmd Represents the current query that needs to be
+                 verified against the database filter rules.
+  @return TRUE Query should not be filtered out from the execution.
+          FALSE Query should be filtered out from the execution.
+
 */
-inline bool db_stmt_db_ok(THD *thd, char* db)
+inline bool check_database_filters(THD *thd, const char* db, enum_sql_command sql_cmd)
 {
-  DBUG_ENTER("db_stmt_db_ok");
-
-  if (!thd->slave_thread)
+  DBUG_ENTER("check_database_filters");
+  assert(thd->slave_thread);
+  if (!db)
     DBUG_RETURN(TRUE);
-
+  switch (sql_cmd)
+  {
+  case SQLCOM_BEGIN:
+  case SQLCOM_COMMIT:
+  case SQLCOM_SAVEPOINT:
+  case SQLCOM_ROLLBACK:
+  case SQLCOM_ROLLBACK_TO_SAVEPOINT:
+    DBUG_RETURN(TRUE);
+  default:
+    break;
+  }
+  bool db_ok= rpl_filter->db_ok(db);
   /*
     No filters exist in ignore/do_db ? Then, just check
-    wild_do_table filtering. Otherwise, check the do_db
-    rules.
+    wild_do_table filtering for 'DATABASE' related
+    statements (CREATE/DROP/ATLER DATABASE)
   */
-  bool db_ok= (rpl_filter->get_do_db()->is_empty() &&
-               rpl_filter->get_ignore_db()->is_empty()) ?
-              rpl_filter->db_ok_with_wild_table(db) :
-              rpl_filter->db_ok(db);
-
+  if (db_ok &&
+      (rpl_filter->get_do_db()->is_empty() &&
+       rpl_filter->get_ignore_db()->is_empty()))
+  {
+    switch (sql_cmd)
+    {
+    case SQLCOM_CREATE_DB:
+    case SQLCOM_ALTER_DB:
+    case SQLCOM_ALTER_DB_UPGRADE:
+    case SQLCOM_DROP_DB:
+      db_ok= rpl_filter->db_ok_with_wild_table(db);
+    default:
+      break;
+    }
+  }
   DBUG_RETURN(db_ok);
 }
+
 #endif
 
 
@@ -216,7 +248,7 @@ bool some_non_temp_table_to_be_updated(THD *thd, TABLE_LIST *tables)
 {
   for (TABLE_LIST *table= tables; table; table= table->next_global)
   {
-    DBUG_ASSERT(table->db && table->table_name);
+    assert(table->db && table->table_name);
     /*
       Update on performance_schema and temp tables are allowed
       in readonly mode.
@@ -755,14 +787,14 @@ bool sqlcom_can_generate_row_events(enum enum_sql_command command)
 
 bool is_update_query(enum enum_sql_command command)
 {
-  DBUG_ASSERT(command >= 0 && command <= SQLCOM_END);
+  assert(command >= 0 && command <= SQLCOM_END);
   return (sql_command_flags[command] & CF_CHANGES_DATA) != 0;
 }
 
 
 bool is_explainable_query(enum enum_sql_command command)
 {
-  DBUG_ASSERT(command >= 0 && command <= SQLCOM_END);
+  assert(command >= 0 && command <= SQLCOM_END);
   return (sql_command_flags[command] & CF_CAN_BE_EXPLAINED) != 0;
 }
 
@@ -773,7 +805,7 @@ bool is_explainable_query(enum enum_sql_command command)
 */
 bool is_log_table_write_query(enum enum_sql_command command)
 {
-  DBUG_ASSERT(command >= 0 && command <= SQLCOM_END);
+  assert(command >= 0 && command <= SQLCOM_END);
   return (sql_command_flags[command] & CF_WRITE_LOGS_COMMAND) != 0;
 }
 
@@ -960,7 +992,7 @@ bool do_command(THD *thd)
     /* Check if we can continue without closing the connection */
 
     /* The error must be set. */
-    DBUG_ASSERT(thd->is_error());
+    assert(thd->is_error());
     thd->send_statement_status();
 
     /* Mark the statement completed. */
@@ -984,10 +1016,10 @@ bool do_command(THD *thd)
                      command_name[command].str));
 
   DBUG_PRINT("info", ("packet: '%*.s'; command: %d",
-             thd->get_protocol_classic()->get_packet_length(),
+             (int)thd->get_protocol_classic()->get_packet_length(),
              thd->get_protocol_classic()->get_raw_packet(), command));
   if (thd->get_protocol_classic()->bad_packet)
-    DBUG_ASSERT(0);                // Should be caught earlier
+    assert(0);                // Should be caught earlier
 
   // Reclaim some memory
   thd->get_protocol_classic()->get_packet()->shrink(
@@ -1002,8 +1034,8 @@ bool do_command(THD *thd)
 
 out:
   /* The statement instrumentation must be closed in all cases. */
-  DBUG_ASSERT(thd->m_digest == NULL);
-  DBUG_ASSERT(thd->m_statement_psi == NULL);
+  assert(thd->m_digest == NULL);
+  assert(thd->m_statement_psi == NULL);
   DBUG_RETURN(return_value);
 }
 #endif  /* EMBEDDED_LIBRARY */
@@ -1135,8 +1167,8 @@ static inline bool set_statement_timer(THD *thd)
     whether timer can be set for the statement or not should be checked before
     calling set_statement_timer function.
   */
-  DBUG_ASSERT(is_timer_applicable_to_statement(thd) == true);
-  DBUG_ASSERT(thd->timer == NULL);
+  assert(is_timer_applicable_to_statement(thd) == true);
+  assert(thd->timer == NULL);
 
   thd->timer= thd_timer_set(thd, thd->timer_cache, max_execution_time);
   thd->timer_cache= NULL;
@@ -1158,7 +1190,7 @@ static inline bool set_statement_timer(THD *thd)
 
 void reset_statement_timer(THD *thd)
 {
-  DBUG_ASSERT(thd->timer);
+  assert(thd->timer);
   /* Cache the timer object if it can be reused. */
   thd->timer_cache= thd_timer_reset(thd->timer);
   thd->timer= NULL;
@@ -1250,14 +1282,14 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
 
         TODO: remove this when we have full 64 bit my_time_t support
       */
-      sql_print_error("This MySQL server doesn't support dates later then 2038");
+      sql_print_error("This MySQL server doesn't support dates later than 2038");
       ulong master_access= thd->security_context()->master_access();
       thd->security_context()->set_master_access(master_access | SHUTDOWN_ACL);
       command= COM_SHUTDOWN;
     }
   }
   thd->set_query_id(next_query_id());
-  thd->rewritten_query.mem_free();
+  thd->reset_rewritten_query();
   thd_manager->inc_thread_running();
 
   if (!(server_command_flags[command] & CF_SKIP_QUESTIONS))
@@ -1427,7 +1459,7 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
   }
   case COM_QUERY:
   {
-    DBUG_ASSERT(thd->m_digest == NULL);
+    assert(thd->m_digest == NULL);
     thd->m_digest= & thd->m_digest_state;
     thd->m_digest->reset(thd->m_token_array, max_digest_length);
 
@@ -1455,6 +1487,8 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
     if (parser_state.init(thd, thd->query().str, thd->query().length))
       break;
 
+    parser_state.m_input.m_has_digest = true;
+
     mysql_parse(thd, &parser_state);
 
     while (!thd->killed && (parser_state.m_lip.found_semicolon != NULL) &&
@@ -1635,7 +1669,7 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
 
     thd->lex->unit->cleanup(true);
     /* No need to rollback statement transaction, it's not started. */
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
     close_thread_tables(thd);
     thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
 
@@ -1699,7 +1733,7 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
     if (check_global_access(thd,RELOAD_ACL))
       break;
     query_logger.general_log_print(thd, command, NullS);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     bool debug_simulate= FALSE;
     DBUG_EXECUTE_IF("simulate_detached_thread_refresh", debug_simulate= TRUE;);
     if (debug_simulate)
@@ -1864,9 +1898,9 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
   }
 
 done:
-  DBUG_ASSERT(thd->derived_tables == NULL &&
-              (thd->open_tables == NULL ||
-               (thd->locked_tables_mode == LTM_LOCK_TABLES)));
+  assert(thd->derived_tables == NULL &&
+         (thd->open_tables == NULL ||
+          (thd->locked_tables_mode == LTM_LOCK_TABLES)));
 
   /* Finalize server status flags after executing a command. */
   thd->update_server_status();
@@ -1906,6 +1940,10 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
   thd->m_statement_psi= NULL;
   thd->m_digest= NULL;
+  thd->reset_query_for_display();
+
+  /* Prevent rewritten query from getting "stuck" in SHOW PROCESSLIST. */
+  thd->reset_rewritten_query();
 
   thd_manager->dec_thread_running();
   free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
@@ -2039,7 +2077,7 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
   case SCH_COLUMNS:
   case SCH_STATISTICS:
   {
-    DBUG_ASSERT(table_ident);
+    assert(table_ident);
     TABLE_LIST **query_tables_last= lex->query_tables_last;
     if ((schema_select_lex= lex->new_empty_query_block()) == NULL)
       DBUG_RETURN(1);        /* purecov: inspected */
@@ -2326,7 +2364,7 @@ static bool lock_tables_open_and_lock_tables(THD *thd, TABLE_LIST *tables)
   trans_rollback(thd);
   /* Close tables and release metadata locks. */
   close_thread_tables(thd);
-  DBUG_ASSERT(!thd->locked_tables_mode);
+  assert(!thd->locked_tables_mode);
   thd->mdl_context.release_transactional_locks();
   return TRUE;
 }
@@ -2426,23 +2464,25 @@ mysql_execute_command(THD *thd, bool first_level)
   TABLE_LIST *all_tables;
   /* most outer SELECT_LEX_UNIT of query */
   SELECT_LEX_UNIT *const unit= lex->unit;
-  DBUG_ASSERT(select_lex->master_unit() == unit);
+  // keep GTID violation state in order to roll it back on statement failure
+  bool gtid_consistency_violation_state = thd->has_gtid_consistency_violation;
+  assert(select_lex->master_unit() == unit);
   DBUG_ENTER("mysql_execute_command");
   /* EXPLAIN OTHER isn't explainable command, but can have describe flag. */
-  DBUG_ASSERT(!lex->describe || is_explainable_query(lex->sql_command) ||
-              lex->sql_command == SQLCOM_EXPLAIN_OTHER);
+  assert(!lex->describe || is_explainable_query(lex->sql_command) ||
+         lex->sql_command == SQLCOM_EXPLAIN_OTHER);
 
   thd->work_part_info= 0;
 
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
-              thd->in_sub_stmt);
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) ||
+         thd->in_sub_stmt);
   /*
     Each statement or replication event which might produce deadlock
     should handle transaction rollback on its own. So by the start of
     the next statement transaction rollback request should be fulfilled
     already.
   */
-  DBUG_ASSERT(! thd->transaction_rollback_request || thd->in_sub_stmt);
+  assert(! thd->transaction_rollback_request || thd->in_sub_stmt);
   /*
     In many cases first table of main SELECT_LEX have special meaning =>
     check that it is first table in global list and relink it first in
@@ -2455,8 +2495,8 @@ mysql_execute_command(THD *thd, bool first_level)
 
     Because of above in place where should be at least one table in most
     outer SELECT_LEX we have following check:
-    DBUG_ASSERT(first_table == all_tables);
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables);
+    assert(first_table == all_tables && first_table != 0);
   */
   lex->first_lists_tables_same();
   /* should be assigned after making first tables same */
@@ -2480,13 +2520,9 @@ mysql_execute_command(THD *thd, bool first_level)
 #ifdef HAVE_REPLICATION
   if (unlikely(thd->slave_thread))
   {
-    // Database filters.
-    if (lex->sql_command != SQLCOM_BEGIN &&
-        lex->sql_command != SQLCOM_COMMIT &&
-        lex->sql_command != SQLCOM_SAVEPOINT &&
-        lex->sql_command != SQLCOM_ROLLBACK &&
-        lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
-        !rpl_filter->db_ok(thd->db().str))
+    if (!check_database_filters(thd,
+                                thd->db().str,
+                                lex->sql_command))
     {
       binlog_gtid_end_transaction(thd);
       DBUG_RETURN(0);
@@ -2613,8 +2649,8 @@ mysql_execute_command(THD *thd, bool first_level)
   Opt_trace_object trace_command(&thd->opt_trace);
   Opt_trace_array trace_command_steps(&thd->opt_trace, "steps");
 
-  DBUG_ASSERT(thd->get_transaction()->cannot_safely_rollback(
-      Transaction_ctx::STMT) == false);
+  assert(thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT) == false);
 
   switch (gtid_pre_statement_checks(thd))
   {
@@ -2640,9 +2676,9 @@ mysql_execute_command(THD *thd, bool first_level)
       Note that this should never happen inside of stored functions
       or triggers as all such statements prohibited there.
     */
-    DBUG_ASSERT(! thd->in_sub_stmt);
+    assert(! thd->in_sub_stmt);
     /* Statement transaction still should not be started. */
-    DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+    assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
 
     /*
       Implicit commit is not allowed with an active XA transaction.
@@ -2676,7 +2712,7 @@ mysql_execute_command(THD *thd, bool first_level)
   }
 #endif /* !EMBEDDED_LIBRARY */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (lex->sql_command != SQLCOM_SET_OPTION)
     DEBUG_SYNC(thd,"before_execute_sql_command");
 #endif
@@ -2916,7 +2952,7 @@ case SQLCOM_PREPARE:
 
   case SQLCOM_ASSIGN_TO_KEYCACHE:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     if (check_access(thd, INDEX_ACL, first_table->db,
                      &first_table->grant.privilege,
                      &first_table->grant.m_internal,
@@ -2927,7 +2963,7 @@ case SQLCOM_PREPARE:
   }
   case SQLCOM_PRELOAD_KEYS:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     if (check_access(thd, INDEX_ACL, first_table->db,
                      &first_table->grant.privilege,
                      &first_table->grant.m_internal,
@@ -2979,7 +3015,7 @@ case SQLCOM_PREPARE:
     }
   case SQLCOM_CREATE_TABLE:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     bool link_to_local;
     TABLE_LIST *create_table= first_table;
     TABLE_LIST *select_tables= lex->create_last_non_select_table->next_global;
@@ -3235,6 +3271,10 @@ case SQLCOM_PREPARE:
       /* Push Strict_error_handler */
       if (!thd->lex->is_ignore() && thd->is_strict_mode())
         thd->push_internal_handler(&strict_handler);
+
+      Partition_in_shared_ts_error_handler partition_in_shared_ts_handler;
+      thd->push_internal_handler(&partition_in_shared_ts_handler);
+
       /* regular create */
       if (create_info.options & HA_LEX_CREATE_TABLE_LIKE)
       {
@@ -3248,6 +3288,9 @@ case SQLCOM_PREPARE:
         res= mysql_create_table(thd, create_table,
                                 &create_info, &alter_info);
       }
+
+      thd->pop_internal_handler();
+
       /* Pop Strict_error_handler */
       if (!thd->lex->is_ignore() && thd->is_strict_mode())
         thd->pop_internal_handler();
@@ -3284,7 +3327,7 @@ case SQLCOM_PREPARE:
     if (thd->is_fatal_error) /* out of memory creating a copy of alter_info */
       goto error;
 
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     if (check_one_table_access(thd, INDEX_ACL, all_tables))
       goto error; /* purecov: inspected */
     /*
@@ -3294,7 +3337,6 @@ case SQLCOM_PREPARE:
     */
     thd->enable_slow_log= opt_log_slow_admin_statements;
 
-    memset(&create_info, 0, sizeof(create_info));
     create_info.db_type= 0;
     create_info.row_type= ROW_TYPE_NOT_USED;
     create_info.default_table_charset= thd->variables.collation_database;
@@ -3303,7 +3345,7 @@ case SQLCOM_PREPARE:
     Strict_error_handler strict_handler;
     if (thd->is_strict_mode())
       thd->push_internal_handler(&strict_handler);
-    DBUG_ASSERT(!select_lex->order_list.elements);
+    assert(!select_lex->order_list.elements);
     res= mysql_alter_table(thd, first_table->db, first_table->table_name,
                            &create_info, first_table, &alter_info);
     /* Pop Strict_error_handler */
@@ -3442,7 +3484,7 @@ case SQLCOM_PREPARE:
 
   case SQLCOM_RENAME_TABLE:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     TABLE_LIST *table;
     for (table= first_table; table; table= table->next_local->next_local)
     {
@@ -3484,7 +3526,7 @@ case SQLCOM_PREPARE:
     }
 #endif /* EMBEDDED_LIBRARY */
   case SQLCOM_SHOW_CREATE:
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     {
      /*
         Access check:
@@ -3531,9 +3573,8 @@ case SQLCOM_PREPARE:
         */
         DBUG_PRINT("debug", ("first_table->grant.privilege: %lx",
                              first_table->grant.privilege));
-        if (check_some_access(thd, SHOW_CREATE_TABLE_ACLS, first_table) ||
-            (first_table->grant.privilege & SHOW_CREATE_TABLE_ACLS) == 0)
-        {
+        if (check_some_access(thd, TABLE_OP_ACLS, first_table) ||
+            (first_table->grant.privilege & TABLE_OP_ACLS) == 0) {
           my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
                    "SHOW", thd->security_context()->priv_user().str,
                    thd->security_context()->host_or_ip().str,
@@ -3548,7 +3589,7 @@ case SQLCOM_PREPARE:
     }
   case SQLCOM_CHECKSUM:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     if (check_table_access(thd, SELECT_ACL, all_tables,
                            FALSE, UINT_MAX, FALSE))
       goto error; /* purecov: inspected */
@@ -3561,8 +3602,8 @@ case SQLCOM_PREPARE:
   case SQLCOM_REPLACE_SELECT:
   case SQLCOM_INSERT_SELECT:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
-    DBUG_ASSERT(lex->m_sql_cmd != NULL);
+    assert(first_table == all_tables && first_table != 0);
+    assert(lex->m_sql_cmd != NULL);
     res= lex->m_sql_cmd->execute(thd);
     break;
   }
@@ -3571,14 +3612,14 @@ case SQLCOM_PREPARE:
   case SQLCOM_UPDATE:
   case SQLCOM_UPDATE_MULTI:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
-    DBUG_ASSERT(lex->m_sql_cmd != NULL);
+    assert(first_table == all_tables && first_table != 0);
+    assert(lex->m_sql_cmd != NULL);
     res= lex->m_sql_cmd->execute(thd);
     break;
   }
   case SQLCOM_DROP_TABLE:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     if (!lex->drop_temporary)
     {
       if (check_table_access(thd, DROP_ACL, all_tables, FALSE, UINT_MAX, FALSE))
@@ -3596,17 +3637,6 @@ case SQLCOM_PREPARE:
     }
   }
   break;
-  case SQLCOM_SHOW_PROCESSLIST:
-    if (!thd->security_context()->priv_user().str[0] &&
-        check_global_access(thd,PROCESS_ACL))
-      break;
-    mysqld_list_processes(
-      thd,
-      (thd->security_context()->check_access(PROCESS_ACL) ?
-         NullS :
-        thd->security_context()->priv_user().str),
-      lex->verbose);
-    break;
   case SQLCOM_SHOW_PRIVILEGES:
     res= mysqld_show_privileges(thd);
     break;
@@ -3630,7 +3660,7 @@ case SQLCOM_PREPARE:
 
   case SQLCOM_LOAD:
   {
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     uint privilege= (lex->duplicates == DUP_REPLACE ?
 		     INSERT_ACL | DELETE_ACL : INSERT_ACL) |
                     (lex->local_file ? 0 : FILE_ACL);
@@ -3775,20 +3805,6 @@ case SQLCOM_PREPARE:
     if (!(alias=thd->strmake(lex->name.str, lex->name.length)) ||
         (check_and_convert_db_name(&lex->name, FALSE) != IDENT_NAME_OK))
       break;
-    /*
-      If in a slave thread :
-      CREATE DATABASE DB was certainly not preceded by USE DB.
-      For that reason, db_ok() in sql/slave.cc did not check the
-      do_db/ignore_db. And as this query involves no tables, tables_ok()
-      above was not called. So we have to check rules again here.
-    */
-#ifdef HAVE_REPLICATION
-    if (!db_stmt_db_ok(thd, lex->name.str))
-    {
-      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
-      break;
-    }
-#endif
     if (check_access(thd, CREATE_ACL, lex->name.str, NULL, NULL, 1, 0))
       break;
     res= mysql_create_db(thd,(lower_case_table_names == 2 ? alias :
@@ -3799,20 +3815,6 @@ case SQLCOM_PREPARE:
   {
     if (check_and_convert_db_name(&lex->name, FALSE) != IDENT_NAME_OK)
       break;
-    /*
-      If in a slave thread :
-      DROP DATABASE DB may not be preceded by USE DB.
-      For that reason, maybe db_ok() in sql/slave.cc did not check the 
-      do_db/ignore_db. And as this query involves no tables, tables_ok()
-      above was not called. So we have to check rules again here.
-    */
-#ifdef HAVE_REPLICATION
-    if (!db_stmt_db_ok(thd, lex->name.str))
-    {
-      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
-      break;
-    }
-#endif
     if (check_access(thd, DROP_ACL, lex->name.str, NULL, NULL, 1, 0))
       break;
     res= mysql_rm_db(thd, to_lex_cstring(lex->name), lex->drop_if_exists, 0);
@@ -3821,14 +3823,6 @@ case SQLCOM_PREPARE:
   case SQLCOM_ALTER_DB_UPGRADE:
   {
     LEX_STRING *db= & lex->name;
-#ifdef HAVE_REPLICATION
-    if (!db_stmt_db_ok(thd, lex->name.str))
-    {
-      res= 1;
-      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
-      break;
-    }
-#endif
     if (check_and_convert_db_name(db, FALSE) != IDENT_NAME_OK)
       break;
     if (check_access(thd, ALTER_ACL, db->str, NULL, NULL, 1, 0) ||
@@ -3850,20 +3844,6 @@ case SQLCOM_PREPARE:
     HA_CREATE_INFO create_info(lex->create_info);
     if (check_and_convert_db_name(db, FALSE) != IDENT_NAME_OK)
       break;
-    /*
-      If in a slave thread :
-      ALTER DATABASE DB may not be preceded by USE DB.
-      For that reason, maybe db_ok() in sql/slave.cc did not check the
-      do_db/ignore_db. And as this query involves no tables, tables_ok()
-      above was not called. So we have to check rules again here.
-    */
-#ifdef HAVE_REPLICATION
-    if (!db_stmt_db_ok(thd, lex->name.str))
-    {
-      my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
-      break;
-    }
-#endif
     if (check_access(thd, ALTER_ACL, db->str, NULL, NULL, 1, 0))
       break;
     res= mysql_alter_db(thd, db->str, &create_info);
@@ -3883,7 +3863,7 @@ case SQLCOM_PREPARE:
   #ifndef EMBEDDED_LIBRARY
   do
   {
-    DBUG_ASSERT(lex->event_parse_data);
+    assert(lex->event_parse_data);
     if (lex->table_or_sp_used())
     {
       my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Usage of subqueries or stored "
@@ -3918,7 +3898,7 @@ case SQLCOM_PREPARE:
       break;
     }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
     DBUG_PRINT("info",("DDL error code=%d", res));
     if (!res)
@@ -4044,7 +4024,7 @@ case SQLCOM_PREPARE:
                        ER_WARN_HOSTNAME_WONT_WORK,
                        ER(ER_WARN_HOSTNAME_WONT_WORK));
         // Are we trying to change a password of another user
-        DBUG_ASSERT(user->host.str != 0);
+        assert(user->host.str != 0);
 
         /*
           GRANT/REVOKE PROXY has the target user as a first entry in the list. 
@@ -4069,9 +4049,9 @@ case SQLCOM_PREPARE:
       if (lex->type == TYPE_ENUM_PROCEDURE ||
           lex->type == TYPE_ENUM_FUNCTION)
       {
-        uint grants= lex->all_privileges 
-		   ? (PROC_ACLS & ~GRANT_ACL) | (lex->grant & GRANT_ACL)
-		   : lex->grant;
+        uint grants = lex->all_privileges
+                          ? (PROC_OP_ACLS) | (lex->grant & GRANT_ACL)
+                          : lex->grant;
         if (check_grant_routine(thd, grants | GRANT_ACL, all_tables,
                                 lex->type == TYPE_ENUM_PROCEDURE, 0))
 	  goto error;
@@ -4237,11 +4217,12 @@ case SQLCOM_PREPARE:
   case SQLCOM_SHOW_CREATE_USER:
   {
     LEX_USER *show_user= get_current_user(thd, lex->grant_user);
-    if (!(strcmp(thd->security_context()->priv_user().str, show_user->user.str) ||
-         my_strcasecmp(system_charset_info, show_user->host.str,
-                              thd->security_context()->priv_host().str)) ||
-        !check_access(thd, SELECT_ACL, "mysql", NULL, NULL, 1, 0))
-      res= mysql_show_create_user(thd, show_user);
+    Security_context *sctx= thd->security_context();
+    bool are_both_users_same= !strcmp(sctx->priv_user().str, show_user->user.str) &&
+                              !my_strcasecmp(system_charset_info, show_user->host.str,
+                                             sctx->priv_host().str);
+    if (are_both_users_same || !check_access(thd, SELECT_ACL, "mysql", NULL, NULL, 1, 0))
+      res= mysql_show_create_user(thd, show_user, are_both_users_same);
     break;
   }
 #endif
@@ -4252,8 +4233,8 @@ case SQLCOM_PREPARE:
     break;
   case SQLCOM_COMMIT:
   {
-    DBUG_ASSERT(thd->lock == NULL ||
-                thd->locked_tables_mode == LTM_LOCK_TABLES);
+    assert(thd->lock == NULL ||
+           thd->locked_tables_mode == LTM_LOCK_TABLES);
     bool tx_chain= (lex->tx_chain == TVL_YES ||
                     (thd->variables.completion_type == 1 &&
                      lex->tx_chain != TVL_NO));
@@ -4282,8 +4263,8 @@ case SQLCOM_PREPARE:
   }
   case SQLCOM_ROLLBACK:
   {
-    DBUG_ASSERT(thd->lock == NULL ||
-                thd->locked_tables_mode == LTM_LOCK_TABLES);
+    assert(thd->lock == NULL ||
+           thd->locked_tables_mode == LTM_LOCK_TABLES);
     bool tx_chain= (lex->tx_chain == TVL_YES ||
                     (thd->variables.completion_type == 1 &&
                      lex->tx_chain != TVL_NO));
@@ -4331,8 +4312,8 @@ case SQLCOM_PREPARE:
     uint namelen;
     char *name;
 
-    DBUG_ASSERT(lex->sphead != 0);
-    DBUG_ASSERT(lex->sphead->m_db.str); /* Must be initialized in the parser */
+    assert(lex->sphead != 0);
+    assert(lex->sphead->m_db.str); /* Must be initialized in the parser */
     /*
       Verify that the database name is allowed, optionally
       lowercase it.
@@ -4390,7 +4371,7 @@ case SQLCOM_PREPARE:
               creation of routine and implicit GRANT parts of one fully atomic
               statement.
       */
-      DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+      assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
       close_thread_tables(thd);
       /*
         Check if invoker exists on slave, then use invoker privilege to
@@ -4447,7 +4428,7 @@ case SQLCOM_PREPARE:
       */ 
       if (restore_backup_context)
       {
-        DBUG_ASSERT(thd->slave_thread == 1);
+        assert(thd->slave_thread == 1);
         thd->security_context()->restore_security_context(thd, backup);
       }
 #endif
@@ -4562,7 +4543,7 @@ case SQLCOM_PREPARE:
         }
 	else
         {
-          DBUG_ASSERT(thd->is_error() || thd->killed);
+          assert(thd->is_error() || thd->killed);
 	  goto error;		// Substatement should already have sent error
         }
       }
@@ -4680,7 +4661,7 @@ case SQLCOM_PREPARE:
               dropping of routine and implicit REVOKE parts of one fully atomic
               statement.
       */
-      DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+      assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
       close_thread_tables(thd);
 
       if (sp_result != SP_KEY_NOT_FOUND &&
@@ -4737,7 +4718,7 @@ case SQLCOM_PREPARE:
   case SQLCOM_SHOW_PROC_CODE:
   case SQLCOM_SHOW_FUNC_CODE:
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       sp_head *sp;
       enum_sp_type sp_type= (lex->sql_command == SQLCOM_SHOW_PROC_CODE) ?
                             SP_TYPE_PROCEDURE : SP_TYPE_FUNCTION;
@@ -4756,7 +4737,7 @@ case SQLCOM_PREPARE:
       my_error(ER_FEATURE_DISABLED, MYF(0),
                "SHOW PROCEDURE|FUNCTION CODE", "--with-debug");
       goto error;
-#endif // ifndef DBUG_OFF
+#endif // ifndef NDEBUG
     }
   case SQLCOM_SHOW_CREATE_TRIGGER:
     {
@@ -4831,7 +4812,7 @@ case SQLCOM_PREPARE:
   case SQLCOM_HA_OPEN:
   case SQLCOM_HA_READ:
   case SQLCOM_HA_CLOSE:
-    DBUG_ASSERT(first_table == all_tables && first_table != 0);
+    assert(first_table == all_tables && first_table != 0);
     /* fall through */
   case SQLCOM_CREATE_SERVER:
   case SQLCOM_ALTER_SERVER:
@@ -4850,7 +4831,8 @@ case SQLCOM_PREPARE:
   case SQLCOM_UNINSTALL_PLUGIN:
   case SQLCOM_SHUTDOWN:
   case SQLCOM_ALTER_INSTANCE:
-    DBUG_ASSERT(lex->m_sql_cmd != NULL);
+  case SQLCOM_SHOW_PROCESSLIST:
+    assert(lex->m_sql_cmd != NULL);
     res= lex->m_sql_cmd->execute(thd);
     break;
 
@@ -4872,10 +4854,10 @@ case SQLCOM_PREPARE:
       if (!tmp_user->host.str && !tmp_user->user.str)
       {
         /* set user information as of the current user */
-        DBUG_ASSERT(thd->security_context()->priv_host().str);
+        assert(thd->security_context()->priv_host().str);
         tmp_user->host.str= (char *) thd->security_context()->priv_host().str;
         tmp_user->host.length= strlen(thd->security_context()->priv_host().str);
-        DBUG_ASSERT(thd->security_context()->user().str);
+        assert(thd->security_context()->user().str);
         tmp_user->user.str= (char *) thd->security_context()->user().str;
         tmp_user->user.length= strlen(thd->security_context()->user().str);
       }
@@ -4886,6 +4868,7 @@ case SQLCOM_PREPARE:
       user->alter_status= thd->lex->alter_password;
 
       if (user->uses_identified_by_clause &&
+          !user->uses_identified_with_clause &&
           !thd->lex->mqh.specified_limits &&
           !user->alter_status.update_account_locked_column &&
           !user->alter_status.update_password_expired_column &&
@@ -4951,7 +4934,7 @@ case SQLCOM_PREPARE:
 #endif
   default:
 #ifndef EMBEDDED_LIBRARY
-    DBUG_ASSERT(0);                             /* Impossible */
+    assert(0);                             /* Impossible */
 #endif
     my_ok(thd);
     break;
@@ -4964,6 +4947,12 @@ case SQLCOM_PREPARE:
 finish:
   THD_STAGE_INFO(thd, stage_query_end);
 
+  if (res && thd->get_reprepare_observer() != NULL &&
+      thd->get_reprepare_observer()->is_invalidated() &&
+      thd->get_reprepare_observer()->can_retry()) {
+    thd->skip_gtid_rollback = true;
+  }
+
   // Cleanup EXPLAIN info
   if (!thd->in_sub_stmt)
   {
@@ -4979,8 +4968,8 @@ case SQLCOM_PREPARE:
     thd->query_plan.set_query_plan(SQLCOM_END, NULL, false);
   }
 
-  DBUG_ASSERT(!thd->in_active_multi_stmt_transaction() ||
-               thd->in_multi_stmt_transaction_mode());
+  assert(!thd->in_active_multi_stmt_transaction() ||
+         thd->in_multi_stmt_transaction_mode());
 
   if (! thd->in_sub_stmt)
   {
@@ -5009,6 +4998,7 @@ case SQLCOM_PREPARE:
         thd->killed == THD::KILL_BAD_DATA)
     {
       thd->killed= THD::NOT_KILLED;
+      thd->reset_query_for_display();
     }
   }
 
@@ -5017,7 +5007,7 @@ case SQLCOM_PREPARE:
   THD_STAGE_INFO(thd, stage_closing_tables);
   close_thread_tables(thd);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (lex->sql_command != SQLCOM_SET_OPTION && ! thd->in_sub_stmt)
     DEBUG_SYNC(thd, "execute_command_after_close_tables");
 #endif
@@ -5035,7 +5025,7 @@ case SQLCOM_PREPARE:
   else if (stmt_causes_implicit_commit(thd, CF_IMPLICIT_COMMIT_END))
   {
     /* No transaction control allowed in sub-statements. */
-    DBUG_ASSERT(! thd->in_sub_stmt);
+    assert(! thd->in_sub_stmt);
     /* If commit fails, we should be able to reset the OK status. */
     thd->get_stmt_da()->set_overwrite_status(true);
     /* Commit the normal transaction if one is active. */
@@ -5100,13 +5090,22 @@ case SQLCOM_PREPARE:
   }
 #endif
 
-  if (!(res || thd->is_error()))
-    binlog_gtid_end_transaction(thd);
+  if (!res && !thd->is_error()) {      // if statement succeeded
+    binlog_gtid_end_transaction(thd);  // finalize GTID life-cycle
+    DEBUG_SYNC(thd, "persist_new_state_after_statement_succeeded");
+  } else if (!gtid_consistency_violation_state &&    // if the consistency state
+             thd->has_gtid_consistency_violation) {  // was set by the failing
+                                                     // statement
+    gtid_state->end_gtid_violating_transaction(thd);  // just roll it back
+    DEBUG_SYNC(thd, "restore_previous_state_after_statement_failed");
+  }
+
+  thd->skip_gtid_rollback = false;
 
   DBUG_RETURN(res || thd->is_error());
 }
 
-static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
+bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
 {
   LEX	*lex= thd->lex;
   bool statement_timer_armed= false;
@@ -5180,7 +5179,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
 #define used_stack(A,B) (long) (B - A)
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 long max_stack_used;
 #endif
 
@@ -5195,7 +5194,7 @@ bool check_stack_overrun(THD *thd, long margin,
 			 uchar *buf MY_ATTRIBUTE((unused)))
 {
   long stack_used;
-  DBUG_ASSERT(thd == current_thd);
+  assert(thd == current_thd);
   if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >=
       (long) (my_thread_stack_size - margin))
   {
@@ -5212,7 +5211,7 @@ bool check_stack_overrun(THD *thd, long margin,
     }
     return 1;
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   max_stack_used= max(max_stack_used, stack_used);
 #endif
   return 0;
@@ -5226,7 +5225,7 @@ bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, YYLTYPE **yyls, ulong *yystacks
 {
   Yacc_state *state= & current_thd->m_parser_state->m_yacc;
   ulong old_info=0;
-  DBUG_ASSERT(state);
+  assert(state);
   if ((uint) *yystacksize >= MY_YACC_MAX)
     return 1;
   if (!state->yacc_yyvs)
@@ -5290,8 +5289,8 @@ void THD::reset_for_next_command()
   // function and move it to the proper file. /Matz
   THD *thd= this;
   DBUG_ENTER("mysql_reset_thd_for_next_command");
-  DBUG_ASSERT(!thd->sp_runtime_ctx); /* not for substatements of routines */
-  DBUG_ASSERT(! thd->in_sub_stmt);
+  assert(!thd->sp_runtime_ctx); /* not for substatements of routines */
+  assert(! thd->in_sub_stmt);
   thd->free_list= 0;
   /*
     Those two lines below are theoretically unneeded as
@@ -5321,7 +5320,7 @@ void THD::reset_for_next_command()
     thd->get_transaction()->reset_unsafe_rollback_flags(
         Transaction_ctx::SESSION);
   }
-  DBUG_ASSERT(thd->security_context()== &thd->m_main_security_ctx);
+  assert(thd->security_context()== &thd->m_main_security_ctx);
   thd->thread_specific_used= FALSE;
 
   if (opt_bin_log)
@@ -5390,7 +5389,7 @@ void create_select_for_variable(Parse_context *pc, const char *var_name)
     We set the name of Item to @@session.var_name because that then is used
     as the column name in the output.
   */
-  if ((var= get_system_var(pc, OPT_SESSION, tmp, null_lex_string)))
+  if ((var= get_system_var(pc, OPT_SESSION, tmp, null_lex_string, false)))
   {
     end= strxmov(buff, "@@session.", var_name, NullS);
     var->item_name.copy(buff, end - buff);
@@ -5449,6 +5448,9 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
     FIXME: cleanup the dependencies in the code to simplify this.
   */
   mysql_reset_thd_for_next_command(thd);
+  // It is possible that rewritten query may not be empty (in case of
+  // multiqueries). So reset it.
+  thd->reset_rewritten_query();
   lex_start(thd);
 
   thd->m_parser_state= parser_state;
@@ -5461,7 +5463,7 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
   {
     LEX *lex= thd->lex;
     const char *found_semicolon;
-
+    size_t qlen = 0;
     bool err= thd->get_stmt_da()->is_error();
 
     if (!err)
@@ -5471,61 +5473,74 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
         err= invoke_post_parse_rewrite_plugins(thd, false);
 
       found_semicolon= parser_state->m_lip.found_semicolon;
+      qlen = found_semicolon ? (found_semicolon - thd->query().str)
+                            : thd->query().length;
+
+      /*
+        We set thd->query_length correctly to not log several queries, when we
+        execute only first. We set it to not see the ';' otherwise it would get
+        into binlog and Query_log_event::print() would give ';;' output.
+      */
+      if(!thd->is_error() && found_semicolon && (ulong)(qlen))
+        thd->set_query(thd->query().str, qlen - 1);
     }
 
+    DEBUG_SYNC_C("sql_parse_before_rewrite");
+
     if (!err)
     {
       /*
-        Rewrite the query for logging and for the Performance Schema statement
-        tables. Raw logging happened earlier.
-      
+        Rewrite the query for logging and for the Performance Schema
+        statement tables. (Raw logging happened earlier.)
+
         Query-cache only handles SELECT, which we don't rewrite, so it's no
         concern of ours.
 
         Sub-routines of mysql_rewrite_query() should try to only rewrite when
         necessary (e.g. not do password obfuscation when query contains no
         password).
-      
-        If rewriting does not happen here, thd->rewritten_query is still empty
-        from being reset in alloc_query().
+
+        If rewriting does not happen here, thd->m_rewritten_query is still
+        empty from being reset in alloc_query().
       */
-      // bool general= !(opt_general_log_raw || thd->slave_thread);
 
-      mysql_rewrite_query(thd);
+      if (thd->rewritten_query().length() == 0)
+        mysql_rewrite_query(thd);
 
-      if (thd->rewritten_query.length())
+      if (thd->rewritten_query().length())
       {
         lex->safe_to_cache_query= false; // see comments below
 
-        MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
-                                 thd->rewritten_query.c_ptr_safe(),
-                                 thd->rewritten_query.length());
-      }
-      else
-      {
+        thd->set_query_for_display(thd->rewritten_query().ptr(),
+                                   thd->rewritten_query().length());
+      } else if (thd->slave_thread) {
+        /*
+          In the slave, we add the information to pfs.events_statements_history,
+          but not to pfs.threads, as that is what the test suite expects.
+        */
         MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
                                  thd->query().str,
                                  thd->query().length);
+      } else {
+        thd->set_query_for_display(thd->query().str, thd->query().length);
       }
 
       if (!(opt_general_log_raw || thd->slave_thread))
       {
-        if (thd->rewritten_query.length())
+        if (thd->rewritten_query().length())
           query_logger.general_log_write(thd, COM_QUERY,
-                                         thd->rewritten_query.c_ptr_safe(),
-                                         thd->rewritten_query.length());
+                                         thd->rewritten_query().ptr(),
+                                         thd->rewritten_query().length());
         else
         {
-          size_t qlen= found_semicolon
-            ? (found_semicolon - thd->query().str)
-            : thd->query().length;
-          
           query_logger.general_log_write(thd, COM_QUERY,
                                          thd->query().str, qlen);
         }
       }
     }
 
+    DEBUG_SYNC_C("sql_parse_after_rewrite");
+
     if (!err)
     {
       thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi,
@@ -5541,21 +5556,8 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
       else
 #endif
       {
-        if (! thd->is_error())
+        if (!thd->is_error())
         {
-          /*
-            Binlog logs a string starting from thd->query and having length
-            thd->query_length; so we set thd->query_length correctly (to not
-            log several statements in one event, when we executed only first).
-            We set it to not see the ';' (otherwise it would get into binlog
-            and Query_log_event::print() would give ';;' output).
-            This also helps display only the current query in SHOW
-            PROCESSLIST.
-          */
-          if (found_semicolon && (ulong) (found_semicolon - thd->query().str))
-            thd->set_query(thd->query().str,
-                           static_cast<size_t>(found_semicolon -
-                                               thd->query().str - 1));
           /* Actually execute the query */
           if (found_semicolon)
           {
@@ -5604,15 +5606,13 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
         SQL injection, finding the source of the SQL injection is critical, so the
         design choice is to log the query text of broken queries (a).
       */
-      MYSQL_SET_STATEMENT_TEXT(thd->m_statement_psi,
-                               thd->query().str,
-                               thd->query().length);
+      thd->set_query_for_display(thd->query().str, thd->query().length);
 
       /* Instrument this broken statement as "statement/sql/error" */
       thd->m_statement_psi= MYSQL_REFINE_STATEMENT(thd->m_statement_psi,
                                           sql_statement_info[SQLCOM_END].m_key);
 
-      DBUG_ASSERT(thd->is_error());
+      assert(thd->is_error());
       DBUG_PRINT("info",("Command aborted. Fatal_error: %d",
                  thd->is_fatal_error));
 
@@ -5624,7 +5624,7 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
     sp_cache_enforce_limit(thd->sp_func_cache, stored_program_cache_size);
     thd->end_statement();
     thd->cleanup_after_query();
-    DBUG_ASSERT(thd->change_list.is_empty());
+    assert(thd->change_list.is_empty());
   }
   else
   {
@@ -5644,6 +5644,8 @@ void mysql_parse(THD *thd, Parser_state *parser_state)
     parser_state->m_lip.found_semicolon= NULL;
   }
 
+  DEBUG_SYNC(thd, "query_rewritten");
+
   DBUG_VOID_RETURN;
 }
 
@@ -5667,7 +5669,7 @@ bool mysql_test_parse_for_slave(THD *thd)
   PSI_statement_locker *parent_locker= thd->m_statement_psi;
   DBUG_ENTER("mysql_test_parse_for_slave");
 
-  DBUG_ASSERT(thd->slave_thread);
+  assert(thd->slave_thread);
 
   Parser_state parser_state;
   if (parser_state.init(thd, thd->query().str, thd->query().length) == 0)
@@ -5681,12 +5683,9 @@ bool mysql_test_parse_for_slave(THD *thd)
     {
       if (all_tables_not_ok(thd, lex->select_lex->table_list.first))
         ignorable= true;
-      else if (lex->sql_command != SQLCOM_BEGIN &&
-               lex->sql_command != SQLCOM_COMMIT &&
-               lex->sql_command != SQLCOM_SAVEPOINT &&
-               lex->sql_command != SQLCOM_ROLLBACK &&
-               lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
-               !rpl_filter->db_ok(thd->db().str))
+      else if (!check_database_filters(thd,
+                                       thd->db().str,
+                                       lex->sql_command))
         ignorable= true;
     }
     thd->m_digest= parent_digest;
@@ -6085,7 +6084,7 @@ TABLE_LIST *st_select_lex::end_nested_join(THD *thd)
   NESTED_JOIN *nested_join;
   DBUG_ENTER("end_nested_join");
 
-  DBUG_ASSERT(embedding);
+  assert(embedding);
   ptr= embedding;
   join_list= ptr->join_list;
   embedding= ptr->embedding;
@@ -6285,8 +6284,8 @@ bool st_select_lex_unit::add_fake_select_lex(THD *thd_arg)
 {
   SELECT_LEX *first_sl= first_select();
   DBUG_ENTER("add_fake_select_lex");
-  DBUG_ASSERT(!fake_select_lex);
-  DBUG_ASSERT(thd_arg == thd);
+  assert(!fake_select_lex);
+  assert(thd_arg == thd);
 
   if (!(fake_select_lex= thd_arg->lex->new_empty_query_block()))
     DBUG_RETURN(true);       /* purecov: inspected */
@@ -6449,6 +6448,7 @@ static uint kill_one_thread(THD *thd, my_thread_id id, bool only_kill_query)
 
   DBUG_ENTER("kill_one_thread");
   DBUG_PRINT("enter", ("id=%u only_kill=%d", id, only_kill_query));
+  DEBUG_SYNC(thd, "kill_thd_begin");
   tmp= Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
   if (tmp)
   {
@@ -6529,7 +6529,7 @@ class Kill_non_super_conn : public Do_THD_Impl
   Kill_non_super_conn(THD *thd) :
 	    m_client_thd(thd)
   {
-    DBUG_ASSERT(m_client_thd->security_context()->check_access(SUPER_ACL));
+    assert(m_client_thd->security_context()->check_access(SUPER_ACL));
   }
 
   virtual void operator()(THD *thd_to_kill)
@@ -6604,7 +6604,7 @@ Comp_creator *comp_eq_creator(bool invert)
 
 Comp_creator *comp_equal_creator(bool invert)
 {
-  DBUG_ASSERT(!invert); // Function never called with true.
+  assert(!invert); // Function never called with true.
   return &equal_creator;
 }
 
@@ -7041,6 +7041,7 @@ extern int MYSQLparse(class THD *thd); // from sql_yacc.cc
       ... handle error
     }
 
+    parser_state.m_input.m_has_digest= true;
     parser_state.m_input.m_compute_digest= true;
     
     rc= parse_sql(the, &parser_state, ctx);
@@ -7071,9 +7072,9 @@ bool parse_sql(THD *thd,
 {
   DBUG_ENTER("parse_sql");
   bool ret_value;
-  DBUG_ASSERT(thd->m_parser_state == NULL);
+  assert(thd->m_parser_state == NULL);
   // TODO fix to allow parsing gcol exprs after main query.
-//  DBUG_ASSERT(thd->lex->m_sql_cmd == NULL);
+//  assert(thd->lex->m_sql_cmd == NULL);
 
   MYSQL_QUERY_PARSE_START(const_cast<char*>(thd->query().str));
   /* Backup creation context. */
@@ -7090,22 +7091,32 @@ bool parse_sql(THD *thd,
   parser_state->m_digest_psi= NULL;
   parser_state->m_lip.m_digest= NULL;
 
-  if (thd->m_digest != NULL)
-  {
-    /* Start Digest */
-    parser_state->m_digest_psi= MYSQL_DIGEST_START(thd->m_statement_psi);
-
-    if (parser_state->m_input.m_compute_digest ||
-       (parser_state->m_digest_psi != NULL))
+  /*
+    Only consider statements that are supposed to have a digest,
+    like top level queries.
+  */
+  if (parser_state->m_input.m_has_digest) {
+    /*
+      For these statements,
+      see if the digest computation is required.
+    */
+    if (thd->m_digest != NULL)
     {
-      /*
-        If either:
-        - the caller wants to compute a digest
-        - the performance schema wants to compute a digest
-        set the digest listener in the lexer.
-      */
-      parser_state->m_lip.m_digest= thd->m_digest;
-      parser_state->m_lip.m_digest->m_digest_storage.m_charset_number= thd->charset()->number;
+      /* Start Digest */
+      parser_state->m_digest_psi= MYSQL_DIGEST_START(thd->m_statement_psi);
+
+      if (parser_state->m_input.m_compute_digest ||
+         (parser_state->m_digest_psi != NULL))
+      {
+        /*
+          If either:
+          - the caller wants to compute a digest
+          - the performance schema wants to compute a digest
+          set the digest listener in the lexer.
+        */
+        parser_state->m_lip.m_digest= thd->m_digest;
+        parser_state->m_lip.m_digest->m_digest_storage.m_charset_number= thd->charset()->number;
+      }
     }
   }
 
@@ -7197,9 +7208,9 @@ bool parse_sql(THD *thd,
     handler might be for other errors than parsing one).
   */
 
-  DBUG_ASSERT(!mysql_parse_status ||
-              (mysql_parse_status && thd->is_error()) ||
-              (mysql_parse_status && thd->get_internal_handler()));
+  assert(!mysql_parse_status ||
+         (mysql_parse_status && thd->is_error()) ||
+         (mysql_parse_status && thd->get_internal_handler()));
 
   /* Reset parser state. */
 
@@ -7220,7 +7231,7 @@ bool parse_sql(THD *thd,
     /*
       On parsing success, record the digest in the performance schema.
     */
-    DBUG_ASSERT(thd->m_digest != NULL);
+    assert(thd->m_digest != NULL);
     MYSQL_DIGEST_END(parser_state->m_digest_psi,
                      & thd->m_digest->m_digest_storage);
   }
diff --git a/sql/sql_parse.h b/sql/sql_parse.h
index bb13989c0323..25d1fabe598b 100644
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,7 +47,7 @@ extern "C" int test_if_data_home_dir(const char *dir);
 
 bool stmt_causes_implicit_commit(const THD *thd, uint mask);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern void turn_parser_debug_on();
 #endif
 
@@ -161,4 +168,6 @@ bool all_tables_not_ok(THD *thd, TABLE_LIST *tables);
 #endif /*HAVE_REPLICATION*/
 bool some_non_temp_table_to_be_updated(THD *thd, TABLE_LIST *tables);
 
+bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables);
+
 #endif /* SQL_PARSE_INCLUDED */
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 9fe18bd8123f..899988082c00 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -262,7 +269,7 @@ bool partition_default_handling(TABLE *table, partition_info *part_info,
 
   if (!part_handler)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     my_error(ER_PARTITION_CLAUSE_ON_NONPARTITIONED, MYF(0));
     DBUG_RETURN(true);
   }
@@ -284,8 +291,8 @@ bool partition_default_handling(TABLE *table, partition_info *part_info,
       {
         DBUG_RETURN(TRUE);
       }
-      DBUG_ASSERT(part_info->num_parts > 0);
-      DBUG_ASSERT((num_parts % part_info->num_parts) == 0);
+      assert(part_info->num_parts > 0);
+      assert((num_parts % part_info->num_parts) == 0);
       part_info->num_subparts= num_parts / part_info->num_parts;
     }
   }
@@ -322,7 +329,7 @@ int get_parts_for_update(const uchar *old_data, uchar *new_data,
   longlong old_func_value;
   DBUG_ENTER("get_parts_for_update");
 
-  DBUG_ASSERT(new_data == rec0);             // table->record[0]
+  assert(new_data == rec0);             // table->record[0]
   set_field_ptr(part_field_array, old_data, rec0);
   error= part_info->get_partition_id(part_info, old_part_id,
                                      &old_func_value);
@@ -473,7 +480,7 @@ static bool set_up_field_array(TABLE *table,
     /*
       We are using hidden key as partitioning field
     */
-    DBUG_ASSERT(!is_sub_part);
+    assert(!is_sub_part);
     DBUG_RETURN(result);
   }
   size_field_array= (num_fields+1)*sizeof(Field*);
@@ -497,7 +504,7 @@ static bool set_up_field_array(TABLE *table,
           List_iterator<char> it(part_info->part_field_list);
           char *field_name;
 
-          DBUG_ASSERT(num_fields == part_info->part_field_list.elements);
+          assert(num_fields == part_info->part_field_list.elements);
           inx= 0;
           do
           {
@@ -514,7 +521,7 @@ static bool set_up_field_array(TABLE *table,
               add_column_list_values, handle_list_of_fields,
               check_partition_info etc.
             */
-            DBUG_ASSERT(0);
+            assert(0);
             my_error(ER_FIELD_NOT_FOUND_PART_ERROR, MYF(0));
             result= TRUE;
             continue;
@@ -1088,7 +1095,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table,
   result= set_up_field_array(table, is_sub_part);
 end:
   end_lex_with_single_table(thd, table, old_lex);
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   func_expr->walk(&Item::change_context_processor, Item::WALK_POSTFIX, NULL);
 #endif
   DBUG_RETURN(result);
@@ -1269,7 +1276,7 @@ static bool set_up_partition_bitmaps(THD *thd, partition_info *part_info)
   uint bitmap_bytes= bitmap_buffer_size(bitmap_bits);
   DBUG_ENTER("set_up_partition_bitmaps");
 
-  DBUG_ASSERT(!part_info->bitmaps_are_initialized);
+  assert(!part_info->bitmaps_are_initialized);
 
   /* Allocate for both read and lock_partitions */
   if (!(bitmap_buf= (uint32*) alloc_root(&part_info->table->mem_root,
@@ -1466,7 +1473,7 @@ static void set_up_partition_func_pointers(partition_info *part_info)
   {
     if (part_info->is_sub_partitioned())
     {
-      DBUG_ASSERT(part_info->get_part_partition_id);
+      assert(part_info->get_part_partition_id);
       if (!part_info->column_list)
       {
         part_info->get_part_partition_id_charset=
@@ -1476,7 +1483,7 @@ static void set_up_partition_func_pointers(partition_info *part_info)
     }
     else
     {
-      DBUG_ASSERT(part_info->get_partition_id);
+      assert(part_info->get_partition_id);
       if (!part_info->column_list)
       {
         part_info->get_part_partition_id_charset= part_info->get_partition_id;
@@ -1486,7 +1493,7 @@ static void set_up_partition_func_pointers(partition_info *part_info)
   }
   if (part_info->subpart_charset_field_array)
   {
-    DBUG_ASSERT(part_info->get_subpartition_id);
+    assert(part_info->get_subpartition_id);
     part_info->get_subpartition_id_charset=
           part_info->get_subpartition_id;
     part_info->get_subpartition_id= get_part_id_charset_func_subpart;
@@ -1683,7 +1690,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
   }
   if (part_info->is_sub_partitioned())
   {
-    DBUG_ASSERT(part_info->subpart_type == HASH_PARTITION);
+    assert(part_info->subpart_type == HASH_PARTITION);
     /*
       Subpartition is defined. We need to verify that subpartitioning
       function is correct.
@@ -1708,7 +1715,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
       }
     }
   }
-  DBUG_ASSERT(part_info->part_type != NOT_A_PARTITION);
+  assert(part_info->part_type != NOT_A_PARTITION);
   /*
     Partition is defined. We need to verify that partitioning
     function is correct.
@@ -1766,7 +1773,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
     }
     else
     {
-      DBUG_ASSERT(0);
+      assert(0);
       my_error(ER_INCONSISTENT_PARTITION_INFO_ERROR, MYF(0));
       goto end;
     }
@@ -1829,7 +1836,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
   }
   else
   {
-    DBUG_ASSERT(0);
+    assert(0);
     my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
   }
 end:
@@ -2355,7 +2362,7 @@ static int add_column_list_values(File fptr, partition_info *part_info,
                                &result_type,
                                &need_cs_check))
             return 1;
-          DBUG_ASSERT(result_type == field->result_type());
+          assert(result_type == field->result_type());
           if (need_cs_check)
             field_cs= field->charset();
           else
@@ -2611,7 +2618,7 @@ char *generate_partition_syntax(partition_info *part_info,
         err+= add_part_key_word(fptr, partition_keywords[PKW_HASH].str);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       /* We really shouldn't get here, no use in continuing from here */
       my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
       DBUG_RETURN(NULL);
@@ -3292,17 +3299,17 @@ uint32 get_partition_id_cols_list_for_endpoint(partition_info *part_info,
   list_index= max_list_index;
 
   /* Given value must be LESS THAN or EQUAL to the found partition. */
-  DBUG_ASSERT(list_index == part_info->num_list_values ||
-              (0 >= cmp_rec_and_tuple_prune(list_col_array +
-                                              list_index*num_columns,
-                                            nparts, left_endpoint,
-                                            include_endpoint)));
+  assert(list_index == part_info->num_list_values ||
+         (0 >= cmp_rec_and_tuple_prune(list_col_array +
+                                       list_index*num_columns,
+                                       nparts, left_endpoint,
+                                       include_endpoint)));
   /* Given value must be GREATER THAN the previous partition. */
-  DBUG_ASSERT(list_index == 0 ||
-              (0 < cmp_rec_and_tuple_prune(list_col_array +
-                                            (list_index - 1)*num_columns,
-                                           nparts, left_endpoint,
-                                           include_endpoint)));
+  assert(list_index == 0 ||
+         (0 < cmp_rec_and_tuple_prune(list_col_array +
+                                      (list_index - 1)*num_columns,
+                                      nparts, left_endpoint,
+                                      include_endpoint)));
 
   /* Include the right endpoint if not already passed end of array. */
   if (!left_endpoint && include_endpoint && cmp == 0 &&
@@ -3397,7 +3404,7 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info,
 
   if (unsigned_flag)
     part_func_value-= 0x8000000000000000ULL;
-  DBUG_ASSERT(part_info->num_list_values);
+  assert(part_info->num_list_values);
   do
   {
     list_index= (max_list_index + min_list_index) >> 1;
@@ -3624,10 +3631,10 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
   part_end_val= range_array[loc_part_id];
   if (left_endpoint)
   {
-    DBUG_ASSERT(part_func_value > part_end_val ?
-                (loc_part_id == max_partition &&
-                 !part_info->defined_max_value) :
-                1);
+    assert(part_func_value > part_end_val ?
+           (loc_part_id == max_partition &&
+            !part_info->defined_max_value) :
+           1);
     /*
       In case of PARTITION p VALUES LESS THAN MAXVALUE
       the maximum value is in the current (last) partition.
@@ -4026,8 +4033,8 @@ bool verify_data_with_partition(TABLE *table, TABLE *part_table,
   uchar *old_rec;
   partition_info *part_info;
   DBUG_ENTER("verify_data_with_partition");
-  DBUG_ASSERT(table && table->file && part_table && part_table->part_info &&
-              part_table->file);
+  assert(table && table->file && part_table && part_table->part_info &&
+         part_table->file);
 
   /*
     Verify all table rows.
@@ -4310,13 +4317,13 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index,
         We know the top partition and need to scan all underlying
         subpartitions. This is a range without holes.
       */
-      DBUG_ASSERT(sub_part == num_parts);
+      assert(sub_part == num_parts);
       part_spec->start_part= part_part * part_info->num_subparts;
       part_spec->end_part= part_spec->start_part+part_info->num_subparts - 1;
     }
     else
     {
-      DBUG_ASSERT(sub_part != num_parts);
+      assert(sub_part != num_parts);
       part_spec->start_part= sub_part;
       part_spec->end_part=sub_part+
                            (part_info->num_subparts*(part_info->num_parts-1));
@@ -4496,13 +4503,13 @@ bool mysql_unpack_partition(THD *thd,
   table->part_info= part_info;
   part_info->table= table;
   part_handler= table->file->get_partition_handler();
-  DBUG_ASSERT(part_handler != NULL);
+  assert(part_handler != NULL);
   part_handler->set_part_info(part_info, true);
   if (!part_info->default_engine_type)
     part_info->default_engine_type= default_db_type;
-  DBUG_ASSERT(part_info->default_engine_type == default_db_type);
-  DBUG_ASSERT(part_info->default_engine_type->db_type != DB_TYPE_UNKNOWN);
-  DBUG_ASSERT(!is_ha_partition_handlerton(part_info->default_engine_type));
+  assert(part_info->default_engine_type == default_db_type);
+  assert(part_info->default_engine_type->db_type != DB_TYPE_UNKNOWN);
+  assert(!is_ha_partition_handlerton(part_info->default_engine_type));
 
   {
   /*
@@ -4740,8 +4747,8 @@ static bool check_native_partitioned(HA_CREATE_INFO *create_info,bool *ret_val,
     if (thd->lex->sql_command != SQLCOM_CREATE_TABLE)
     {
       table_engine_set= TRUE;
-      DBUG_ASSERT(engine_type &&
-                  !is_ha_partition_handlerton(engine_type));
+      assert(engine_type &&
+             !is_ha_partition_handlerton(engine_type));
     }
   }
   DBUG_PRINT("info", ("engine_type = %s, table_engine_set = %u",
@@ -4913,8 +4920,6 @@ bool compare_partition_options(HA_CREATE_INFO *table_create_info,
     option_diffs[errors++]= "MAX_ROWS";
   if (part_elem->part_min_rows != table_create_info->min_rows)
     option_diffs[errors++]= "MIN_ROWS";
-  if (part_elem->data_file_name || table_create_info->data_file_name)
-    option_diffs[errors++]= "DATA DIRECTORY";
   if (part_elem->index_file_name || table_create_info->index_file_name)
     option_diffs[errors++]= "INDEX DIRECTORY";
 
@@ -4958,7 +4963,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
                            partition_info **new_part_info)
 {
   DBUG_ENTER("prep_alter_part_table");
-  DBUG_ASSERT(new_part_info);
+  assert(new_part_info);
 
   /* Foreign keys are not supported by ha_partition, waits for WL#148 */
   if (is_ha_partition_handlerton(table->file->ht) &&
@@ -4966,7 +4971,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
       (alter_info->flags & Alter_info::ADD_FOREIGN_KEY ||
        alter_info->flags & Alter_info::DROP_FOREIGN_KEY))
   {
-    DBUG_ASSERT(table->part_info);
+    assert(table->part_info);
     my_error(ER_FOREIGN_KEY_ON_PARTITIONED, MYF(0));
     DBUG_RETURN(TRUE);
   }
@@ -4984,7 +4989,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
     DBUG_RETURN(TRUE);
 
   /* ALTER_ADMIN_PARTITION is handled in mysql_admin_table */
-  DBUG_ASSERT(!(alter_info->flags & Alter_info::ALTER_ADMIN_PARTITION));
+  assert(!(alter_info->flags & Alter_info::ALTER_ADMIN_PARTITION));
 
   if (alter_info->flags &
       (Alter_info::ALTER_ADD_PARTITION |
@@ -5010,7 +5015,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
     }
     if (!part_handler)
     {
-      DBUG_ASSERT(0);
+      assert(0);
       my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
       DBUG_RETURN(true);
     }
@@ -5021,9 +5026,9 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
       Open it as a copy of the original table, and modify its partition_info
       object to allow fast_alter_partition_table to perform the changes.
     */
-    DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                   alter_ctx->db, alter_ctx->table_name,
-                                   MDL_INTENTION_EXCLUSIVE));
+    assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                        alter_ctx->db, alter_ctx->table_name,
+                                                        MDL_INTENTION_EXCLUSIVE));
 
     /*
       We will operate on a cached instance of the original table,
@@ -5147,7 +5152,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
           }
           else if (thd->work_part_info->part_type == LIST_PARTITION)
           {
-            DBUG_ASSERT(thd->work_part_info->part_type == LIST_PARTITION);
+            assert(thd->work_part_info->part_type == LIST_PARTITION);
             my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0),
                      "LIST", "IN");
           }
@@ -5158,7 +5163,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
           }
           else
           {
-            DBUG_ASSERT(tab_part_info->part_type == LIST_PARTITION);
+            assert(tab_part_info->part_type == LIST_PARTITION);
             my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
                      "LIST", "IN");
           }
@@ -5652,7 +5657,7 @@ state of p1.
       alt_part_info->part_type= tab_part_info->part_type;
       alt_part_info->subpart_type= tab_part_info->subpart_type;
       alt_part_info->num_subparts= tab_part_info->num_subparts;
-      DBUG_ASSERT(!alt_part_info->use_default_partitions);
+      assert(!alt_part_info->use_default_partitions);
       /* We specified partitions explicitly so don't use defaults anymore. */
       tab_part_info->use_default_partitions= FALSE;
       if (alt_part_info->set_up_defaults_for_partitioning(part_handler,
@@ -5776,7 +5781,7 @@ the generated partition syntax in a correct manner.
     }
     else
     {
-      DBUG_ASSERT(FALSE);
+      assert(FALSE);
     }
     *partition_changed= TRUE;
     thd->work_part_info= tab_part_info;
@@ -5943,7 +5948,7 @@ the generated partition syntax in a correct manner.
         else if (alter_info->flags == Alter_info::ALTER_UPGRADE_PARTITIONING)
         {
           DBUG_PRINT("info", ("Upgrade partitioning"));
-          DBUG_ASSERT(create_info->used_fields == 0);
+          assert(create_info->used_fields == 0);
           /* Fast alter allowed as meta-data only change. */
           *new_part_info= thd->work_part_info;
           /* Force table re-open for consistency with the main case. */
@@ -6002,8 +6007,8 @@ the generated partition syntax in a correct manner.
         else
           part_info->default_engine_type= create_info->db_type;
       }
-      DBUG_ASSERT(part_info->default_engine_type &&
-                  !is_ha_partition_handlerton(part_info->default_engine_type));
+      assert(part_info->default_engine_type &&
+             !is_ha_partition_handlerton(part_info->default_engine_type));
       if (check_native_partitioned(create_info, &is_native_partitioned,
                                    part_info, thd))
       {
@@ -6011,7 +6016,7 @@ the generated partition syntax in a correct manner.
       }
       if (!is_native_partitioned)
       {
-        DBUG_ASSERT(create_info->db_type);
+        assert(create_info->db_type);
         LEX_CSTRING name= { "partition", 9 };
         plugin_ref plugin= ha_resolve_by_name_raw(thd, name);
         if (!plugin)
@@ -6074,7 +6079,7 @@ static bool mysql_change_partitions(ALTER_PARTITION_PARAM_TYPE *lpt)
 
   if (!part_handler)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     DBUG_RETURN(true);
   }
 
@@ -6571,7 +6576,7 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
   uint next_entry= 0;
   DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
   /* write_log_drop_shadow_frm(lpt) must have been run first */
-  DBUG_ASSERT(old_first_log_entry);
+  assert(old_first_log_entry);
   DBUG_ENTER("write_log_add_change_partition");
 
   build_table_filename(path, sizeof(path) - 1, lpt->db,
@@ -6692,7 +6697,7 @@ static void write_log_completed(ALTER_PARTITION_PARAM_TYPE *lpt,
   DDL_LOG_MEMORY_ENTRY *log_entry= part_info->exec_log_entry;
   DBUG_ENTER("write_log_completed");
 
-  DBUG_ASSERT(log_entry);
+  assert(log_entry);
   mysql_mutex_lock(&LOCK_gdl);
   if (write_execute_ddl_log_entry(0UL, TRUE, &log_entry))
   {
@@ -6783,16 +6788,16 @@ bool handle_alter_part_end(ALTER_PARTITION_PARAM_TYPE *lpt,
   THD *thd= lpt->thd;
   TABLE *table= lpt->table;
   DBUG_ENTER("handle_alter_part_end");
-  DBUG_ASSERT(table->m_needs_reopen);
+  assert(table->m_needs_reopen);
 
   /* First clone the part_info to save the log entries. */
   part_info= lpt->part_info->get_clone();
 
-  DBUG_ASSERT(error ||
-              thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                                           lpt->db,
-                                                           lpt->table_name,
-                                                           MDL_EXCLUSIVE));
+  assert(error ||
+         thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      lpt->db,
+                                                      lpt->table_name,
+                                                      MDL_EXCLUSIVE));
   DEBUG_SYNC(thd, "before_handle_alter_part_end");
   /*
     All instances of this table needs to be closed.
@@ -6811,7 +6816,7 @@ bool handle_alter_part_end(ALTER_PARTITION_PARAM_TYPE *lpt,
   }
   else
   {
-    DBUG_ASSERT(error);
+    assert(error);
     /*
       At least remove this instance!
 
@@ -6822,7 +6827,7 @@ bool handle_alter_part_end(ALTER_PARTITION_PARAM_TYPE *lpt,
                                              table->pos_in_locked_tables,
                                              false);
     /* Assert that the current table is the first in list of open tables */
-    DBUG_ASSERT(thd->open_tables == table);
+    assert(thd->open_tables == table);
 
     /*
       Make sure that the table is unlocked, closed and removed from
@@ -6860,7 +6865,7 @@ bool handle_alter_part_end(ALTER_PARTITION_PARAM_TYPE *lpt,
         "The frm file is in an unknown state, and a backup",
         "is required.",
         "See error log for more info.");
-      DBUG_ASSERT(0);
+      assert(0);
       error= true;
     }
   }
@@ -6926,7 +6931,7 @@ bool fast_alter_partition_table(THD *thd,
   MDL_ticket *mdl_ticket= table->mdl_ticket;
   Partition_handler *part_handler= table->file->get_partition_handler();
   DBUG_ENTER("fast_alter_partition_table");
-  DBUG_ASSERT(table->m_needs_reopen);
+  assert(table->m_needs_reopen);
 
   part_info= new_part_info;
   lpt->thd= thd;
@@ -6949,7 +6954,7 @@ bool fast_alter_partition_table(THD *thd,
 
   if (!part_handler)
   {
-    DBUG_ASSERT(0);
+    assert(0);
     my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
     DBUG_RETURN(true);
   }
@@ -6957,9 +6962,9 @@ bool fast_alter_partition_table(THD *thd,
   if (alter_info->flags & (Alter_info::ALTER_PARTITION |
                            Alter_info::ALTER_UPGRADE_PARTITIONING))
   {
-    DBUG_ASSERT(alter_info->flags == Alter_info::ALTER_PARTITION ||
-                alter_info->flags == Alter_info::ALTER_UPGRADE_PARTITIONING);
-    DBUG_ASSERT(create_info->used_fields == 0);
+    assert(alter_info->flags == Alter_info::ALTER_PARTITION ||
+           alter_info->flags == Alter_info::ALTER_UPGRADE_PARTITIONING);
+    assert(create_info->used_fields == 0);
 
     /*
       Only metadata changes, i.e frm-only!
@@ -7747,17 +7752,17 @@ uint32 get_partition_id_cols_range_for_endpoint(partition_info *part_info,
   loc_part_id= max_part_id;
 
   /* Given value must be LESS THAN the found partition. */
-  DBUG_ASSERT(loc_part_id == part_info->num_parts ||
-              (0 > cmp_rec_and_tuple_prune(range_col_array +
-                                             loc_part_id * num_columns,
-                                           nparts, is_left_endpoint,
-                                           include_endpoint)));
+  assert(loc_part_id == part_info->num_parts ||
+         (0 > cmp_rec_and_tuple_prune(range_col_array +
+                                      loc_part_id * num_columns,
+                                      nparts, is_left_endpoint,
+                                      include_endpoint)));
   /* Given value must be GREATER THAN or EQUAL to the previous partition. */
-  DBUG_ASSERT(loc_part_id == 0 ||
-              (0 <= cmp_rec_and_tuple_prune(range_col_array +
-                                              (loc_part_id - 1) * num_columns,
-                                            nparts, is_left_endpoint,
-                                            include_endpoint)));
+  assert(loc_part_id == 0 ||
+         (0 <= cmp_rec_and_tuple_prune(range_col_array +
+                                       (loc_part_id - 1) * num_columns,
+                                       nparts, is_left_endpoint,
+                                       include_endpoint)));
 
   if (!is_left_endpoint)
   {
@@ -7778,7 +7783,7 @@ int get_part_iter_for_interval_cols_via_map(partition_info *part_info,
                                             PARTITION_ITERATOR *part_iter)
 {
   uint32 nparts;
-  get_col_endpoint_func  get_col_endpoint;
+  get_col_endpoint_func  get_col_endpoint = NULL;
   DBUG_ENTER("get_part_iter_for_interval_cols_via_map");
 
   if (part_info->part_type == RANGE_PARTITION)
@@ -7791,7 +7796,7 @@ int get_part_iter_for_interval_cols_via_map(partition_info *part_info,
     get_col_endpoint= get_partition_id_cols_list_for_endpoint;
     part_iter->get_next= get_next_partition_id_list;
     part_iter->part_info= part_info;
-    DBUG_ASSERT(part_info->num_list_values);
+    assert(part_info->num_list_values);
   }
   else
     assert(0);
@@ -7815,7 +7820,7 @@ int get_part_iter_for_interval_cols_via_map(partition_info *part_info,
       part_iter->part_nums.end= part_info->num_parts;
     else /* LIST_PARTITION */
     {
-      DBUG_ASSERT(part_info->part_type == LIST_PARTITION);
+      assert(part_info->part_type == LIST_PARTITION);
       part_iter->part_nums.end= part_info->num_list_values;
     }
   }
@@ -7887,7 +7892,7 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
   bool check_zero_dates= false;
   bool zero_in_start_date= true;
   DBUG_ENTER("get_part_iter_for_interval_via_mapping");
-  DBUG_ASSERT(!is_subpart);
+  assert(!is_subpart);
   (void) store_length_array;
   (void)min_len;
   (void)max_len;
@@ -8026,10 +8031,10 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
       DBUG_PRINT("info", ("zero end %u %04d-%02d-%02d",
                           zero_in_end_date,
                           end_date.year, end_date.month, end_date.day));
-      DBUG_ASSERT(!memcmp(((Item_func*) part_info->part_expr)->func_name(),
-                          "to_days", 7) ||
-                  !memcmp(((Item_func*) part_info->part_expr)->func_name(),
-                          "to_seconds", 10));
+      assert(!memcmp(((Item_func*) part_info->part_expr)->func_name(),
+                     "to_days", 7) ||
+             !memcmp(((Item_func*) part_info->part_expr)->func_name(),
+                     "to_seconds", 10));
       if (!zero_in_end_date &&
           start_date.month == end_date.month &&
           start_date.year == end_date.year)
@@ -8447,7 +8452,7 @@ bool set_up_table_before_create(THD *thd,
   const char *partition_name;
   DBUG_ENTER("set_up_table_before_create");
 
-  DBUG_ASSERT(part_elem);
+  assert(part_elem);
 
   if (!part_elem)
     DBUG_RETURN(true);
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index f66e0cb82d0c..27246b5f1c20 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -1,16 +1,23 @@
 #ifndef SQL_PARTITION_INCLUDED
 #define SQL_PARTITION_INCLUDED
 
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index a8913c6b4333..bd722cde608a 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -50,9 +57,9 @@ bool Sql_cmd_alter_table_exchange_partition::execute(THD *thd)
     DBUG_RETURN(TRUE);
 
   /* Must be set in the parser */
-  DBUG_ASSERT(select_lex->db);
+  assert(select_lex->db);
   /* also check the table to be exchanged with the partition */
-  DBUG_ASSERT(alter_info.flags & Alter_info::ALTER_EXCHANGE_PARTITION);
+  assert(alter_info.flags & Alter_info::ALTER_EXCHANGE_PARTITION);
 
   if (check_access(thd, priv_needed, first_table->db,
                    &first_table->grant.privilege,
@@ -68,7 +75,7 @@ bool Sql_cmd_alter_table_exchange_partition::execute(THD *thd)
     DBUG_RETURN(TRUE);
 
   /* Not allowed with EXCHANGE PARTITION */
-  DBUG_ASSERT(!create_info.data_file_name && !create_info.index_file_name);
+  assert(!create_info.data_file_name && !create_info.index_file_name);
 
   thd->enable_slow_log= opt_log_slow_admin_statements;
   DBUG_RETURN(exchange_partition(thd, first_table, &alter_info));
@@ -146,10 +153,12 @@ static bool check_exchange_partition(TABLE *table, TABLE *part_table)
   @param table      Non partitioned table.
   @param part_table Partitioned table.
   @param part_elem  Partition element to use for partition specific compare.
+  @param part_id    Id of the specific partition.
 */
 static bool compare_table_with_partition(THD *thd, TABLE *table,
                                          TABLE *part_table,
-                                         partition_element *part_elem)
+                                         partition_element *part_elem,
+                                         uint part_id)
 {
   HA_CREATE_INFO table_create_info, part_create_info;
   Alter_info part_alter_info;
@@ -157,8 +166,6 @@ static bool compare_table_with_partition(THD *thd, TABLE *table,
   DBUG_ENTER("compare_table_with_partition");
 
   bool metadata_equal= false;
-  memset(&part_create_info, 0, sizeof(HA_CREATE_INFO));
-  memset(&table_create_info, 0, sizeof(HA_CREATE_INFO));
 
   update_create_info_from_table(&table_create_info, table);
   /* get the current auto_increment value */
@@ -183,7 +190,11 @@ static bool compare_table_with_partition(THD *thd, TABLE *table,
 
   /* Check compatible row_types and set create_info accordingly. */
   {
-    enum row_type part_row_type= part_table->file->get_row_type();
+    enum row_type part_row_type;
+    Partition_handler *part_handler;
+    part_handler = part_table->file->get_partition_handler();
+    part_row_type = part_handler->get_partition_row_type(part_id);
+
     enum row_type table_row_type= table->file->get_row_type();
     if (part_row_type != table_row_type)
     {
@@ -213,10 +224,10 @@ static bool compare_table_with_partition(THD *thd, TABLE *table,
     my_error(ER_TABLES_DIFFERENT_METADATA, MYF(0));
     DBUG_RETURN(TRUE);
   }
-  DBUG_ASSERT(table->s->db_create_options ==
-              part_table->s->db_create_options);
-  DBUG_ASSERT(table->s->db_options_in_use ==
-              part_table->s->db_options_in_use);
+  assert(table->s->db_create_options ==
+         part_table->s->db_create_options);
+  assert(table->s->db_options_in_use ==
+         part_table->s->db_options_in_use);
 
   if (table_create_info.avg_row_length != part_create_info.avg_row_length)
   {
@@ -478,7 +489,7 @@ bool Sql_cmd_alter_table_exchange_partition::
   uint table_counter;
   bool error= TRUE;
   DBUG_ENTER("mysql_exchange_partition");
-  DBUG_ASSERT(alter_info->flags & Alter_info::ALTER_EXCHANGE_PARTITION);
+  assert(alter_info->flags & Alter_info::ALTER_EXCHANGE_PARTITION);
 
   /* Don't allow to exchange with log table */
   swap_table_list= table_list->next_local;
@@ -563,12 +574,13 @@ bool Sql_cmd_alter_table_exchange_partition::
 
   if (swap_part_id == NOT_A_PARTITION_ID)
   {
-    DBUG_ASSERT(part_table->part_info->is_sub_partitioned());
+    assert(part_table->part_info->is_sub_partitioned());
     my_error(ER_PARTITION_INSTEAD_OF_SUBPARTITION, MYF(0));
     DBUG_RETURN(TRUE);
   }
 
-  if (compare_table_with_partition(thd, swap_table, part_table, part_elem))
+  if (compare_table_with_partition(thd, swap_table, part_table, part_elem,
+                                   swap_part_id))
     DBUG_RETURN(TRUE);
 
   /* Table and partition has same structure/options */
@@ -815,7 +827,7 @@ bool Sql_cmd_alter_table_truncate_partition::execute(THD *thd)
     my_ok(thd);
 
   // Invalidate query cache
-  DBUG_ASSERT(!first_table->next_local);
+  assert(!first_table->next_local);
   query_cache.invalidate(thd, first_table, FALSE);
 
   DBUG_RETURN(error);
diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index aa45dbdbbe5a..fd6f30e98d0e 100644
--- a/sql/sql_partition_admin.h
+++ b/sql/sql_partition_admin.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_planner.cc b/sql/sql_planner.cc
index 3979d696d5d1..7c98c7eab590 100644
--- a/sql/sql_planner.cc
+++ b/sql/sql_planner.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -371,7 +378,7 @@ Key_use* Optimize_table_order::find_best_ref(JOIN_TAB *tab,
             }
             else
             {                              /* Prefer longer keys */
-              DBUG_ASSERT(table->s->max_key_length > 0);
+              assert(table->s->max_key_length > 0);
               cur_fanout=
                 ((double) tab->records() / (double) distinct_keys_est *
                  (1.0 +
@@ -1246,7 +1253,7 @@ float calculate_condition_filter(const JOIN_TAB *const tab,
     contribute to filtering effect.
     First, verify it's not used.
   */
-  DBUG_ASSERT(bitmap_is_clear_all(&table->tmp_set));
+  assert(bitmap_is_clear_all(&table->tmp_set));
 
   float filter= COND_FILTER_ALLPASS;
 
@@ -1324,7 +1331,7 @@ float calculate_condition_filter(const JOIN_TAB *const tab,
   */
   if (bitmap_is_subset(&table->cond_set, &table->tmp_set))
   {
-    DBUG_ASSERT(filter == COND_FILTER_ALLPASS);
+    assert(filter == COND_FILTER_ALLPASS);
     goto cleanup;
   }
   /*
@@ -1429,7 +1436,7 @@ float calculate_condition_filter(const JOIN_TAB *const tab,
 cleanup:
   // Clear tmp_set so it can be used elsewhere
   bitmap_clear_all(&table->tmp_set);
-  DBUG_ASSERT(filter >= 0.0f && filter <= 1.0f);
+  assert(filter >= 0.0f && filter <= 1.0f);
   return filter;
 }
 
@@ -1557,7 +1564,7 @@ semijoin_loosescan_fill_driving_table_position(const JOIN_TAB  *tab,
   Opt_trace_object trace_ls(trace, "searching_loose_scan_index");
 
   TABLE *const table= tab->table();
-  DBUG_ASSERT(remaining_tables & tab->table_ref->map());
+  assert(remaining_tables & tab->table_ref->map());
 
   const ulonglong bound_sj_equalities=
     get_bound_sj_equalities(tab, excluded_tables | remaining_tables);
@@ -1621,7 +1628,7 @@ semijoin_loosescan_fill_driving_table_position(const JOIN_TAB  *tab,
           continue;
         handled_sj_equalities|= 1ULL << keyuse->sj_pred_no;
         handled_keyparts|= keyuse->keypart_map;
-        DBUG_ASSERT(max_keypart <= keypart); // see sort_keyuse()
+        assert(max_keypart <= keypart); // see sort_keyuse()
         max_keypart= keypart;
       }
     }
@@ -1999,7 +2006,7 @@ void Optimize_table_order::optimize_straight_join(table_map join_tables)
   const Cost_model_server *const cost_model= join->cost_model();
 
   // resolve_subquery() disables semijoin if STRAIGHT_JOIN
-  DBUG_ASSERT(join->select_lex->sj_nests.is_empty());
+  assert(join->select_lex->sj_nests.is_empty());
 
   Opt_trace_context * const trace= &join->thd->opt_trace;
   for (JOIN_TAB **pos= join->best_ref + idx; *pos; idx++, pos++)
@@ -2017,7 +2024,7 @@ void Optimize_table_order::optimize_straight_join(table_map join_tables)
       based on them (join_tab_cmp*) guarantee that this order is compatible
       with execution, check it:
     */
-    DBUG_ASSERT(!check_interleaving_with_nj(s));
+    assert(!check_interleaving_with_nj(s));
     /* Find the best access method from 's' to the current partial plan */
     best_access_path(s, join_tables, idx, false, rowcount, position);
 
@@ -2086,7 +2093,7 @@ semijoin_order_allows_materialization(const JOIN *join,
                                       table_map remaining_tables,
                                       const JOIN_TAB *tab, uint idx)
 {
-  DBUG_ASSERT(!(remaining_tables & tab->table_ref->map()));
+  assert(!(remaining_tables & tab->table_ref->map()));
   /*
    Check if 
     1. We're in a semi-join nest that can be run with SJ-materialization
@@ -2229,7 +2236,7 @@ bool Optimize_table_order::greedy_search(table_map remaining_tables)
       'best_read < DBL_MAX' means that optimizer managed to find
       some plan and updated 'best_positions' array accordingly.
     */
-    DBUG_ASSERT(join->best_read < DBL_MAX); 
+    assert(join->best_read < DBL_MAX); 
 
     if (size_remain <= search_depth)
     {
@@ -2271,14 +2278,14 @@ bool Optimize_table_order::greedy_search(table_map remaining_tables)
     bool is_interleave_error MY_ATTRIBUTE((unused))= 
       check_interleaving_with_nj (best_table);
     /* This has been already checked by best_extension_by_limited_search */
-    DBUG_ASSERT(!is_interleave_error);
+    assert(!is_interleave_error);
 
     /* find the position of 'best_table' in 'join->best_ref' */
     best_idx= idx;
     JOIN_TAB *pos= join->best_ref[best_idx];
     while (pos && best_table != pos)
       pos= join->best_ref[++best_idx];
-    DBUG_ASSERT((pos != NULL)); // should always find 'best_table'
+    assert((pos != NULL)); // should always find 'best_table'
     /*
       Maintain '#rows-sorted' order of 'best_ref[]':
        - Shift 'best_ref[]' to make first position free. 
@@ -2628,7 +2635,7 @@ bool Optimize_table_order::best_extension_by_limited_search(
       POSITION *const position= join->positions + idx;
 
       // If optimizing a sj-mat nest, tables in this plan must be in nest:
-      DBUG_ASSERT(emb_sjm_nest == NULL || emb_sjm_nest == s->emb_sj_nest);
+      assert(emb_sjm_nest == NULL || emb_sjm_nest == s->emb_sj_nest);
       /* Find the best access method from 's' to the current partial plan */
       best_access_path(s, remaining_tables, idx, false,
                        idx ? (position-1)->prefix_rowcount : 1.0, 
@@ -2778,9 +2785,9 @@ bool Optimize_table_order::best_extension_by_limited_search(
           If plan is complete, there should be no "open" outer join nest, and
           all semi join nests should be handled by a strategy:
         */
-        DBUG_ASSERT((remaining_tables_after != 0) ||
-                    ((cur_embedding_map == 0) &&
-                     (join->positions[idx].dups_producing_tables == 0)));
+        assert((remaining_tables_after != 0) ||
+               ((cur_embedding_map == 0) &&
+                (join->positions[idx].dups_producing_tables == 0)));
       }
       backout_nj_state(remaining_tables, s);
     }
@@ -2982,7 +2989,7 @@ table_map Optimize_table_order::eq_ref_extension_by_limited_search(
       }
       POSITION *const position= join->positions + idx;
 
-      DBUG_ASSERT(emb_sjm_nest == NULL || emb_sjm_nest == s->emb_sj_nest);
+      assert(emb_sjm_nest == NULL || emb_sjm_nest == s->emb_sj_nest);
       /* Find the best access method from 's' to the current partial plan */
       best_access_path(s, remaining_tables, idx, false,
                        idx ? (position-1)->prefix_rowcount : 1.0,
@@ -3065,9 +3072,9 @@ table_map Optimize_table_order::eq_ref_extension_by_limited_search(
         else
         {
           consider_plan(idx, &trace_one_table);
-          DBUG_ASSERT((remaining_tables_after != 0) ||
-                      ((cur_embedding_map == 0) &&
-                       (join->positions[idx].dups_producing_tables == 0)));
+          assert((remaining_tables_after != 0) ||
+                 ((cur_embedding_map == 0) &&
+                  (join->positions[idx].dups_producing_tables == 0)));
         }
         backout_nj_state(remaining_tables, s);
         memcpy(join->best_ref + idx, saved_refs,
@@ -3085,7 +3092,7 @@ table_map Optimize_table_order::eq_ref_extension_by_limited_search(
     the query plan. We need to use the greedy search
     for finding the next table to be added.
   */
-  DBUG_ASSERT(!eq_ref_ext);
+  assert(!eq_ref_ext);
   if (best_extension_by_limited_search(remaining_tables,
                                        idx,
                                        current_search_depth))
@@ -3300,8 +3307,8 @@ bool Optimize_table_order::fix_semijoin_strategies()
         (join->best_positions + last_inner)->table->emb_sj_nest;
       const uint table_count= my_count_bits(sjm_nest->sj_inner_tables);
       first= last_inner - table_count + 1;
-      DBUG_ASSERT((join->best_positions + first)->table->emb_sj_nest ==
-                  sjm_nest);
+      assert((join->best_positions + first)->table->emb_sj_nest ==
+             sjm_nest);
       memcpy(join->best_positions + first, // stale semijoin strategy here too
              sjm_nest->nested_join->sjm.positions,
              sizeof(POSITION) * table_count);
@@ -3380,7 +3387,7 @@ bool Optimize_table_order::fix_semijoin_strategies()
     remaining_tables|= pos->table->table_ref->map();
   }
 
-  DBUG_ASSERT(remaining_tables == (join->all_table_map&~join->const_table_map));
+  assert(remaining_tables == (join->all_table_map&~join->const_table_map));
 
   DBUG_RETURN(FALSE);
 }
@@ -3634,7 +3641,7 @@ bool Optimize_table_order::semijoin_firstmatch_loosescan_access_paths(
         so best_access_path() should fill bound_keyparts/read_cost/fanout for
         all keys => test_all_ref_keys==true.
        */
-      DBUG_ASSERT(!test_all_ref_keys);
+      assert(!test_all_ref_keys);
       test_all_ref_keys= is_ls_driving_tab;
       best_access_path(tab, remaining_tables, i, i < no_jbuf_before,
                        rowcount * inner_fanout * outer_fanout,
@@ -3654,7 +3661,7 @@ bool Optimize_table_order::semijoin_firstmatch_loosescan_access_paths(
         }
         else
         {
-          DBUG_ASSERT(!final);
+          assert(!final);
           DBUG_RETURN(false);
         }
       }
@@ -3669,7 +3676,7 @@ bool Optimize_table_order::semijoin_firstmatch_loosescan_access_paths(
      */
     if (pos->read_cost == DBL_MAX)
     {
-      DBUG_ASSERT(loosescan && !final);
+      assert(loosescan && !final);
       DBUG_RETURN(false);
     }
 
@@ -4034,10 +4041,10 @@ void Optimize_table_order::advance_sj_state(
     within a semi-join nest have emb_sj_nest != NULL, which triggers several
     of the actions inside this function.
   */
-  DBUG_ASSERT(emb_sjm_nest == NULL);
+  assert(emb_sjm_nest == NULL);
 
   // remaining_tables include the current one:
-  DBUG_ASSERT(remaining_tables & new_join_tab->table_ref->map());
+  assert(remaining_tables & new_join_tab->table_ref->map());
   // Save it:
   const table_map remaining_tables_incl= remaining_tables;
   // And add the current table to the join prefix:
@@ -4127,8 +4134,8 @@ void Optimize_table_order::advance_sj_state(
       pos->firstmatch_need_tables= 0;
       pos->first_firstmatch_rtbl= remaining_tables;
       // All inner tables should still be part of remaining_tables_inc
-      DBUG_ASSERT(sj_inner_tables ==
-                  (remaining_tables_incl & sj_inner_tables));
+      assert(sj_inner_tables ==
+             (remaining_tables_incl & sj_inner_tables));
     }
 
     if (pos->first_firstmatch_table != MAX_TABLES)
@@ -4205,7 +4212,7 @@ void Optimize_table_order::advance_sj_state(
       else
       {
         // Stage 3: Accept outer dependent and non-dependent tables:
-        DBUG_ASSERT(emb_sj_nest != first_emb_sj_nest);
+        assert(emb_sj_nest != first_emb_sj_nest);
         if (emb_sj_nest != NULL)
           pos->first_loosescan_table= MAX_TABLES;
       }
@@ -4320,12 +4327,25 @@ void Optimize_table_order::advance_sj_state(
       The simple way to model this is to remove SJM-SCAN(...) fanout once
       we reach the point #2.
     */
-    pos->sjm_scan_need_tables=
-      emb_sj_nest->sj_inner_tables | 
-      emb_sj_nest->nested_join->sj_depends_on;
-    pos->sjm_scan_last_inner= idx;
-    Opt_trace_object(trace).add_alnum("strategy", "MaterializeScan").
-      add_alnum("choice", "deferred");
+    if (pos->sjm_scan_need_tables &&
+        emb_sj_nest != NULL &&
+        emb_sj_nest !=
+        join->positions[pos->sjm_scan_last_inner].table->emb_sj_nest)
+      /*
+        Prevent that inner tables of different semijoin nests are
+        interleaved for MaterializeScan.
+      */
+      pos->sjm_scan_need_tables= 0;
+    else
+    {
+      pos->sjm_scan_need_tables=
+        emb_sj_nest->sj_inner_tables |
+        emb_sj_nest->nested_join->sj_depends_on;
+      pos->sjm_scan_last_inner= idx;
+      Opt_trace_object(trace).add_alnum("strategy", "MaterializeScan").
+        add_alnum("choice", "deferred");
+    }
+
   }
   else if (sjm_strategy == SJ_OPT_MATERIALIZE_LOOKUP)
   {
@@ -4545,7 +4565,7 @@ void Optimize_table_order::advance_sj_state(
 void Optimize_table_order::backout_nj_state(const table_map remaining_tables,
                                             const JOIN_TAB *tab)
 {
-  DBUG_ASSERT(remaining_tables & tab->table_ref->map());
+  assert(remaining_tables & tab->table_ref->map());
 
   /* Restore the nested join state */
   TABLE_LIST *last_emb= tab->table_ref->embedding;
@@ -4558,7 +4578,7 @@ void Optimize_table_order::backout_nj_state(const table_map remaining_tables,
 
     NESTED_JOIN *const nest= last_emb->nested_join;
 
-    DBUG_ASSERT(nest->nj_counter > 0);
+    assert(nest->nj_counter > 0);
 
     cur_embedding_map|= nest->nj_map;
     bool was_fully_covered= nest->nj_total == nest->nj_counter;
diff --git a/sql/sql_planner.h b/sql/sql_planner.h
index f8ce5e6fbcad..87b008f21d2b 100644
--- a/sql/sql_planner.h
+++ b/sql/sql_planner.h
@@ -1,16 +1,23 @@
 #ifndef SQL_PLANNER_INCLUDED
 #define SQL_PLANNER_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_plist.h b/sql/sql_plist.h
index 6e820a564359..7a09630311f6 100644
--- a/sql/sql_plist.h
+++ b/sql/sql_plist.h
@@ -1,15 +1,22 @@
 #ifndef SQL_PLIST_H
 #define SQL_PLIST_H
-/* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 432b4404cfb3..60e7228e0728 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -56,7 +63,7 @@ using std::max;
 #define REPORT_TO_LOG  1
 #define REPORT_TO_USER 2
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static PSI_memory_key key_memory_plugin_ref;
 #endif
 
@@ -180,14 +187,18 @@ static int cur_plugin_info_interface_version[MYSQL_MAX_PLUGIN_TYPE_NUM]=
 
 /*
   A mutex LOCK_plugin_delete must be acquired before calling plugin_del
-  function. 
+  function.
 */
 mysql_mutex_t LOCK_plugin_delete;
 
-/*
-  A mutex LOCK_plugin must be acquired before accessing the
-  following variables/structures.
+/**
+  Serializes access to the global plugin memory list.
+
+  LOCK_plugin must be acquired before accessing
+  plugin_dl_array, plugin_array and plugin_hash.
   We are always manipulating ref count, so a rwlock here is unneccessary.
+  If it must be taken together with the LOCK_system_variables_hash then
+  LOCK_plugin must be taken before LOCK_system_variables_hash.
 */
 mysql_mutex_t LOCK_plugin;
 static Prealloced_array<st_plugin_dl*, 16> *plugin_dl_array;
@@ -277,7 +288,8 @@ class sys_var_pluginvar: public sys_var
                     st_mysql_sys_var *plugin_var_arg)
     :sys_var(chain, name_arg, plugin_var_arg->comment,
              (plugin_var_arg->flags & PLUGIN_VAR_THDLOCAL ? SESSION : GLOBAL) |
-             (plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0),
+             (plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0) |
+             (plugin_var_arg->flags & PLUGIN_VAR_INVISIBLE ? INVISIBLE : 0),
              0, -1, NO_ARG, pluginvar_show_type(plugin_var_arg), 0, 0,
              VARIABLE_NOT_IN_BINLOG,
              (plugin_var_arg->flags & PLUGIN_VAR_NODEFAULT) ?
@@ -491,6 +503,17 @@ static inline void free_plugin_mem(st_plugin_dl *p)
 }
 
 
+/**
+  Loads a dynamic plugin
+
+  Fills in a ::st_plugin_dl structure.
+  Initializes the plugin services pointer inside the plugin.
+  Does not initialize the individual plugins.
+  Must have LOCK_plugin locked. On error releases LOCK_plugin.
+
+  @arg dl      The path to the plugin binary to load
+  @arg report  a bitmask that's passed down to report_error()
+*/
 static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
 {
 #ifdef HAVE_DLOPEN
@@ -514,6 +537,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
                                system_charset_info, 1) ||
       plugin_dir_len + dl->length + 1 >= FN_REFLEN)
   {
+    mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_UDF_NO_PATHS);
     DBUG_RETURN(NULL);
   }
@@ -548,6 +572,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
       if (*errmsg == ':') errmsg++;
       if (*errmsg == ' ') errmsg++;
     }
+    mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, error_number, errmsg);
 
     /*
@@ -560,7 +585,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
      */
 #if !defined(_WIN32)
     errmsg= dlerror();
-    DBUG_ASSERT(errmsg == NULL);
+    assert(errmsg == NULL);
 #endif
     DBUG_RETURN(NULL);
   }
@@ -568,6 +593,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
   if (!(sym= dlsym(plugin_dl.handle, plugin_interface_version_sym)))
   {
     free_plugin_mem(&plugin_dl);
+    mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_interface_version_sym);
     DBUG_RETURN(NULL);
   }
@@ -577,6 +603,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
       (plugin_dl.version >> 8) > (MYSQL_PLUGIN_INTERFACE_VERSION >> 8))
   {
     free_plugin_mem(&plugin_dl);
+    mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0,
                  "plugin interface version mismatch");
     DBUG_RETURN(NULL);
@@ -596,6 +623,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
         my_snprintf(buf, sizeof(buf),
                     "service '%s' interface version mismatch",
                     list_of_services[i].name);
+        mysql_mutex_unlock(&LOCK_plugin);
         report_error(report, ER_CANT_OPEN_LIBRARY, dlpath, 0, buf);
         DBUG_RETURN(NULL);
       }
@@ -607,6 +635,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
   if (!(sym= dlsym(plugin_dl.handle, plugin_declarations_sym)))
   {
     free_plugin_mem(&plugin_dl);
+    mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_CANT_FIND_DL_ENTRY, plugin_declarations_sym);
     DBUG_RETURN(NULL);
   }
@@ -625,7 +654,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
         When the following assert starts failing, we'll have to call
         report_error(report, ER_CANT_FIND_DL_ENTRY, sizeof_st_plugin_sym);
       */
-      DBUG_ASSERT(min_plugin_interface_version == 0);
+      assert(min_plugin_interface_version == 0);
       sizeof_st_plugin= (int)offsetof(st_mysql_plugin, version);
     }
 
@@ -645,6 +674,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
     if (!cur)
     {
       free_plugin_mem(&plugin_dl);
+      mysql_mutex_unlock(&LOCK_plugin);
       report_error(report, ER_OUTOFMEMORY,
                    static_cast<int>(plugin_dl.dl.length));
       DBUG_RETURN(NULL);
@@ -674,6 +704,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
     for ( ; plugin->info ; ++plugin)
       if (plugin->flags & PLUGIN_OPT_NO_INSTALL)
       {
+        mysql_mutex_unlock(&LOCK_plugin);
         report_error(report, ER_PLUGIN_NO_INSTALL, plugin->name);
         free_plugin_mem(&plugin_dl);
         DBUG_RETURN(NULL);
@@ -685,6 +716,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
   if (! (plugin_dl.dl.str= (char*) my_malloc(key_memory_mysql_plugin_dl,
                                              plugin_dl.dl.length, MYF(0))))
   {
+    mysql_mutex_unlock(&LOCK_plugin);
     free_plugin_mem(&plugin_dl);
     report_error(report, ER_OUTOFMEMORY,
                  static_cast<int>(plugin_dl.dl.length));
@@ -697,6 +729,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
   /* Add this dll to array */
   if (! (tmp= plugin_dl_insert_or_reuse(&plugin_dl)))
   {
+    mysql_mutex_unlock(&LOCK_plugin);
     free_plugin_mem(&plugin_dl);
     report_error(report, ER_OUTOFMEMORY,
                  static_cast<int>(sizeof(st_plugin_dl)));
@@ -746,7 +779,7 @@ static st_plugin_int *plugin_find_internal(const LEX_CSTRING &name,
 {
   uint i;
   DBUG_ENTER("plugin_find_internal");
-  if (! initialized)
+  if (!initialized || !name.str)
     DBUG_RETURN(NULL);
 
   mysql_mutex_assert_owner(&LOCK_plugin);
@@ -814,7 +847,7 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc)
   if (pi->state & (PLUGIN_IS_READY | PLUGIN_IS_UNINITIALIZED))
   {
     plugin_ref plugin;
-#ifdef DBUG_OFF
+#ifdef NDEBUG
     /* built-in plugins don't need ref counting */
     if (!pi->plugin_dl)
       DBUG_RETURN(pi);
@@ -892,9 +925,12 @@ static st_plugin_int *plugin_insert_or_reuse(st_plugin_int *plugin)
 }
 
 
-/*
-  NOTE
-    Requires that a write-lock is held on LOCK_system_variables_hash
+/**
+  Adds a plugin to the global plugin list.
+
+  Also installs the plugin variables.
+  In case of error releases ::LOCK_plugin and reports the error
+  @note Requires that a write-lock is held on ::LOCK_system_variables_hash
 */
 static bool plugin_add(MEM_ROOT *tmp_root,
                        const LEX_STRING *name, const LEX_STRING *dl,
@@ -910,13 +946,14 @@ static bool plugin_add(MEM_ROOT *tmp_root,
   {
     mysql_mutex_unlock(&LOCK_plugin);
     report_error(report, ER_UDF_EXISTS, name->str);
-    mysql_mutex_lock(&LOCK_plugin);
-    DBUG_RETURN(TRUE);
+    DBUG_RETURN(true);
   }
   /* Clear the whole struct to catch future extensions. */
   memset(&tmp, 0, sizeof(tmp));
-  if (! (tmp.plugin_dl= plugin_dl_add(dl, report)))
-    DBUG_RETURN(TRUE);
+  if (!(tmp.plugin_dl = plugin_dl_add(dl, report)))
+  {
+    DBUG_RETURN(true);
+  }
   /* Find plugin by name */
   for (plugin= tmp.plugin_dl->plugins; plugin->info; plugin++)
   {
@@ -933,14 +970,17 @@ static bool plugin_add(MEM_ROOT *tmp_root,
           ((*(int*)plugin->info) >> 8) >
           (cur_plugin_info_interface_version[plugin->type] >> 8))
       {
-        char buf[256];
+        char buf[256], dl_name[FN_REFLEN];
         strxnmov(buf, sizeof(buf) - 1, "API version for ",
                  plugin_type_names[plugin->type].str,
                  " plugin is too different", NullS);
+        /* copy the library name so we can release the mutex */
+        strncpy(dl_name, dl->str, sizeof(dl_name) - 1);
+        dl_name[sizeof(dl_name) - 1] = 0;
+        plugin_dl_del(dl);
         mysql_mutex_unlock(&LOCK_plugin);
-        report_error(report, ER_CANT_OPEN_LIBRARY, dl->str, 0, buf);
-        mysql_mutex_lock(&LOCK_plugin);
-        goto err;
+        report_error(report, ER_CANT_OPEN_LIBRARY, dl_name, 0, buf);
+        DBUG_RETURN(true);
       }
       tmp.plugin= plugin;
       tmp.name.str= (char *)plugin->name;
@@ -958,25 +998,21 @@ static bool plugin_add(MEM_ROOT *tmp_root,
         {
           init_alloc_root(key_memory_plugin_int_mem_root,
                           &tmp_plugin_ptr->mem_root, 4096, 4096);
-          DBUG_RETURN(FALSE);
+          DBUG_RETURN(false);
         }
         tmp_plugin_ptr->state= PLUGIN_IS_FREED;
       }
       mysql_del_sys_var_chain(tmp.system_vars);
       restore_pluginvar_names(tmp.system_vars);
-      goto err;
-
-      /* plugin was disabled */
       plugin_dl_del(dl);
-      DBUG_RETURN(FALSE);
+      mysql_mutex_unlock(&LOCK_plugin);
+      DBUG_RETURN(true);
     }
   }
+  plugin_dl_del(dl);
   mysql_mutex_unlock(&LOCK_plugin);
   report_error(report, ER_CANT_FIND_DL_ENTRY, name->str);
-  mysql_mutex_lock(&LOCK_plugin);
-err:
-  plugin_dl_del(dl);
-  DBUG_RETURN(TRUE);
+  DBUG_RETURN(true);
 }
 
 
@@ -1102,7 +1138,7 @@ static void intern_plugin_unlock(LEX *lex, plugin_ref plugin)
 
   pi= plugin_ref_to_int(plugin);
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   if (!pi->plugin_dl)
     DBUG_VOID_RETURN;
 #else
@@ -1129,10 +1165,10 @@ static void intern_plugin_unlock(LEX *lex, plugin_ref plugin)
         break;
       }
     }
-    DBUG_ASSERT(found_it);
+    assert(found_it);
   }
 
-  DBUG_ASSERT(pi->ref_count);
+  assert(pi->ref_count);
   pi->ref_count--;
 
   if (pi->state == PLUGIN_IS_DELETED && !pi->ref_count)
@@ -1148,7 +1184,7 @@ void plugin_unlock(THD *thd, plugin_ref plugin)
   DBUG_ENTER("plugin_unlock");
   if (!plugin)
     DBUG_VOID_RETURN;
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   /* built-in plugins don't need ref counting */
   if (!plugin_dlib(plugin))
     DBUG_VOID_RETURN;
@@ -1165,7 +1201,7 @@ void plugin_unlock_list(THD *thd, plugin_ref *list, size_t count)
 {
   LEX *lex= thd ? thd->lex : 0;
   DBUG_ENTER("plugin_unlock_list");
-  DBUG_ASSERT(list);
+  assert(list);
 
   /*
     In unit tests, LOCK_plugin may be uninitialized, so do not lock it.
@@ -1189,7 +1225,7 @@ static int plugin_initialize(st_plugin_int *plugin)
 
   mysql_mutex_assert_owner(&LOCK_plugin);
   uint state= plugin->state;
-  DBUG_ASSERT(state == PLUGIN_IS_UNINITIALIZED);
+  assert(state == PLUGIN_IS_UNINITIALIZED);
 
   mysql_mutex_unlock(&LOCK_plugin);
   if (plugin_type_initialize[plugin->plugin->type])
@@ -1302,7 +1338,7 @@ static PSI_mutex_info all_plugin_mutexes[]=
 
 static PSI_memory_info all_plugin_memory[]=
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   { &key_memory_plugin_ref, "plugin_ref", PSI_FLAG_GLOBAL},
 #endif
   { &key_memory_plugin_mem_root, "plugin_mem_root", PSI_FLAG_GLOBAL},
@@ -1442,7 +1478,7 @@ bool plugin_register_early_plugins(int *argc, char **argv, int flags)
   DBUG_ENTER("plugin_register_early_plugins");
 
   /* Don't allow initializing twice */
-  DBUG_ASSERT(!initialized);
+  assert(!initialized);
 
   /* Make sure the internals are initialized */
   if ((retval= plugin_init_internals()))
@@ -1480,7 +1516,7 @@ bool plugin_register_builtin_and_init_core_se(int *argc, char **argv)
   DBUG_ENTER("plugin_register_builtin_and_init_core_se");
 
   /* Don't allow initializing twice */
-  DBUG_ASSERT(!initialized);
+  assert(!initialized);
 
   /* Allocate the temporary mem root, will be freed before returning */
   MEM_ROOT tmp_root;
@@ -1566,20 +1602,20 @@ bool plugin_register_builtin_and_init_core_se(int *argc, char **argv)
       */
       if (is_myisam)
       {
-        DBUG_ASSERT(!global_system_variables.table_plugin);
-        DBUG_ASSERT(!global_system_variables.temp_table_plugin);
+        assert(!global_system_variables.table_plugin);
+        assert(!global_system_variables.temp_table_plugin);
         global_system_variables.table_plugin=
           my_intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr));
         global_system_variables.temp_table_plugin=
           my_intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr));
-        DBUG_ASSERT(plugin_ptr->ref_count == 2);
+        assert(plugin_ptr->ref_count == 2);
       }
     }
   }
 
   /* Should now be set to MyISAM storage engine */
-  DBUG_ASSERT(global_system_variables.table_plugin);
-  DBUG_ASSERT(global_system_variables.temp_table_plugin);
+  assert(global_system_variables.table_plugin);
+  assert(global_system_variables.temp_table_plugin);
 
   mysql_mutex_unlock(&LOCK_plugin);
 
@@ -1669,8 +1705,17 @@ static bool register_builtin(st_mysql_plugin *plugin,
 }
 
 
-/*
-  called only by plugin_init()
+/**
+  Reads the plugins from mysql.plugin and loads them
+
+  Called only by plugin_init()
+  a.k.a. the bootstrap sequence.
+
+  @arg tmp_root  memory root to use for plugin_add()
+  @arg argc      number of command line arguments to process
+  @arg argv      array of command line argument to read values from
+  @retval true   failure
+  @retval false  success
 */
 static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
 {
@@ -1729,7 +1774,6 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
     environment, and it uses mysql_mutex_assert_owner(), so we lock
     the mutex here to satisfy the assert
   */
-  mysql_mutex_lock(&LOCK_plugin);
   while (!(error= read_record_info.read_record(&read_record_info)))
   {
     DBUG_PRINT("info", ("init plugin record"));
@@ -1740,12 +1784,25 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
     LEX_STRING name= {(char *)str_name.ptr(), str_name.length()};
     LEX_STRING dl= {(char *)str_dl.ptr(), str_dl.length()};
 
+    /*
+      The whole locking sequence is not strictly speaking needed since this
+      is a function that's executed only during server bootstrap, but we do
+      it properly for uniformity of the environment for plugin_add.
+      Note that it must be done for each iteration since, unlike INSTALL PLUGIN
+      the bootstrap process just reports the error and goes on.
+      So to ensure the right sequence of lock and unlock we need to take and
+      release both the wlock and the mutex.
+    */
+    mysql_mutex_lock(&LOCK_plugin);
+    mysql_rwlock_wrlock(&LOCK_system_variables_hash);
     if (plugin_add(tmp_root, &name, &dl, argc, argv, REPORT_TO_LOG))
       sql_print_warning("Couldn't load plugin named '%s' with soname '%s'.",
                         str_name.c_ptr(), str_dl.c_ptr());
+    else
+      mysql_mutex_unlock(&LOCK_plugin);
+    mysql_rwlock_unlock(&LOCK_system_variables_hash);
     free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
   }
-  mysql_mutex_unlock(&LOCK_plugin);
   if (error > 0)
     sql_print_error(ER(ER_GET_ERRNO), my_errno);
   end_read_record(&read_record_info);
@@ -1757,8 +1814,18 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
 }
 
 
-/*
-  called only by plugin_init()
+/**
+  Load a list of plugins
+
+  Called by plugin_register_early_plugins() and
+  plugin_register_dynamic_and_init_all(), a.k.a. the bootstrap sequence.
+
+  @arg tmp_root  memory root to use for plugin_add()
+  @arg argc      number of command line arguments to process
+  @arg argv      array of command line argument to read values from
+  @arg list      list of plugins to load. Ends with a NULL pointer
+  @retval true   failure
+  @retval false  success
 */
 static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
                              const char *list)
@@ -1795,7 +1862,13 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
         }
 
         dl= name;
+        /*
+          The whole locking sequence is not strictly speaking needed since this
+          is a function that's executed only during server bootstrap, but we do
+          it properly for uniformity of the environment for plugin_add.
+        */
         mysql_mutex_lock(&LOCK_plugin);
+        mysql_rwlock_wrlock(&LOCK_system_variables_hash);
         if ((plugin_dl= plugin_dl_add(&dl, REPORT_TO_LOG)))
         {
           for (plugin= plugin_dl->plugins; plugin->info; plugin++)
@@ -1805,19 +1878,37 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
 
             free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
             if (plugin_add(tmp_root, &name, &dl, argc, argv, REPORT_TO_LOG))
+            {
+              mysql_rwlock_unlock(&LOCK_system_variables_hash);
               goto error;
+            }
           }
           plugin_dl_del(&dl); // reduce ref count
         }
+        else
+        {
+          mysql_rwlock_unlock(&LOCK_system_variables_hash);
+          goto error;
+        }
       }
       else
       {
         free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
+        /*
+          The whole locking sequence is not strictly speaking needed since this
+          is a function that's executed only during server bootstrap, but we do
+          it properly for uniformity of the environment for plugin_add.
+        */
         mysql_mutex_lock(&LOCK_plugin);
+        mysql_rwlock_wrlock(&LOCK_system_variables_hash);
         if (plugin_add(tmp_root, &name, &dl, argc, argv, REPORT_TO_LOG))
+        {
+          mysql_rwlock_unlock(&LOCK_system_variables_hash);
           goto error;
+        }
       }
       mysql_mutex_unlock(&LOCK_plugin);
+      mysql_rwlock_unlock(&LOCK_system_variables_hash);
       name.length= dl.length= 0;
       dl.str= NULL; name.str= p= buffer;
       str= &name;
@@ -1839,7 +1930,6 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
   }
   DBUG_RETURN(FALSE);
 error:
-  mysql_mutex_unlock(&LOCK_plugin);
   sql_print_error("Couldn't load plugin named '%s' with soname '%s'.",
                   name.str, dl.str);
   DBUG_RETURN(TRUE);
@@ -2111,6 +2201,7 @@ static bool mysql_install_plugin(THD *thd, const LEX_STRING *name,
   if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups,
                        &argc, &argv, NULL))
   {
+    mysql_mutex_unlock(&LOCK_plugin);
     mysql_rwlock_unlock(&LOCK_system_variables_hash);
     report_error(REPORT_TO_USER, ER_PLUGIN_IS_NOT_LOADED, name->str);
     goto err;
@@ -2120,9 +2211,16 @@ static bool mysql_install_plugin(THD *thd, const LEX_STRING *name,
     free_defaults(argv);
   mysql_rwlock_unlock(&LOCK_system_variables_hash);
 
-  if (error || !(tmp= plugin_find_internal(name_cstr, MYSQL_ANY_PLUGIN)))
+  /* LOCK_plugin already unlocked by plugin_add() if error */
+  if (error)
     goto err;
 
+  if (!(tmp = plugin_find_internal(name_cstr, MYSQL_ANY_PLUGIN)))
+  {
+    mysql_mutex_unlock(&LOCK_plugin);
+    goto err;
+  }
+
   if (tmp->state == PLUGIN_IS_DISABLED)
   {
     push_warning_printf(thd, Sql_condition::SL_WARNING,
@@ -2169,8 +2267,8 @@ static bool mysql_install_plugin(THD *thd, const LEX_STRING *name,
   tmp->state= PLUGIN_IS_DELETED;
   reap_needed= true;
   reap_plugins();
-err:
   mysql_mutex_unlock(&LOCK_plugin);
+err:
   trans_rollback_stmt(thd);
   close_mysql_tables(thd);
 
@@ -2200,7 +2298,7 @@ static bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name)
 
   if (!table->key_info)
   {
-    my_error(ER_TABLE_CORRUPT, MYF(0), table->s->db.str,
+    my_error(ER_MISSING_KEY, MYF(0), table->s->db.str,
              table->s->table_name.str);
     trans_rollback_stmt(thd);
     close_thread_tables(thd);
@@ -2501,7 +2599,7 @@ static int check_func_bool(THD *thd, st_mysql_sys_var *var,
   {
     if (value->val_int(value, &tmp) < 0)
       goto err;
-    if (tmp > 1)
+    if (tmp > 1 || tmp < 0)
       goto err;
     result= (int) tmp;
   }
@@ -2884,7 +2982,7 @@ static st_bookmark *register_var(const char *plugin, const char *name,
     size= sizeof(double);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return NULL;
   };
 
@@ -2903,7 +3001,7 @@ static st_bookmark *register_var(const char *plugin, const char *name,
     result->name_len= length - 2;
     result->offset= -1;
 
-    DBUG_ASSERT(size && !(size & (size-1))); /* must be power of 2 */
+    assert(size && !(size & (size-1))); /* must be power of 2 */
 
     offset= global_system_variables.dynamic_variables_size;
     offset= (offset + size - 1) & ~(size - 1);
@@ -2948,7 +3046,7 @@ static st_bookmark *register_var(const char *plugin, const char *name,
     if (my_hash_insert(&bookmark_hash, (uchar*) result))
     {
       fprintf(stderr, "failed to add placeholder to hash");
-      DBUG_ASSERT(0);
+      assert(0);
     }
 
     /*
@@ -2961,7 +3059,7 @@ static st_bookmark *register_var(const char *plugin, const char *name,
     {
       fprintf(stderr, "failed to add placeholder to"
                       " hash of malloced string type sysvars");
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
   return result;
@@ -3001,7 +3099,7 @@ void alloc_and_copy_thd_dynamic_variables(THD *thd, bool global_lock)
     MAINTAINER:
     The following assert is wrong on purpose, useful to debug
     when thd dynamic variables are expanded:
-    DBUG_ASSERT(thd->variables.dynamic_variables_ptr == NULL);
+    assert(thd->variables.dynamic_variables_ptr == NULL);
   */
 
   thd->variables.dynamic_variables_ptr= (char*)
@@ -3014,7 +3112,7 @@ void alloc_and_copy_thd_dynamic_variables(THD *thd, bool global_lock)
     Debug hook which allows tests to check that this code is not
     called for InnoDB after connection was created.
   */
-  DBUG_EXECUTE_IF("verify_innodb_thdvars", DBUG_ASSERT(0););
+  DBUG_EXECUTE_IF("verify_innodb_thdvars", assert(0););
 
   memcpy(thd->variables.dynamic_variables_ptr +
          thd->variables.dynamic_variables_size,
@@ -3074,8 +3172,8 @@ void alloc_and_copy_thd_dynamic_variables(THD *thd, bool global_lock)
 */
 static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock)
 {
-  DBUG_ASSERT(offset >= 0);
-  DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head);
+  assert(offset >= 0);
+  assert((uint)offset <= global_system_variables.dynamic_variables_head);
 
   if (!thd)
     return (uchar*) global_system_variables.dynamic_variables_ptr + offset;
@@ -3208,12 +3306,14 @@ static void cleanup_variables(THD *thd, struct system_variables *vars)
   {
     /* Block the Performance Schema from accessing THD::variables. */
     mysql_mutex_lock(&thd->LOCK_thd_data);
-    
+
     plugin_var_memalloc_free(&thd->variables);
+    /* Remove references to session_sysvar_res_mgr memory before freeing it. */
+    thd->variables.track_sysvars_ptr = NULL;
     thd->session_sysvar_res_mgr.deinit();
   }
-  DBUG_ASSERT(vars->table_plugin == NULL);
-  DBUG_ASSERT(vars->temp_table_plugin == NULL);
+  assert(vars->table_plugin == NULL);
+  assert(vars->temp_table_plugin == NULL);
 
   my_free(vars->dynamic_variables_ptr);
   vars->dynamic_variables_ptr= NULL;
@@ -3303,7 +3403,7 @@ static SHOW_TYPE pluginvar_show_type(st_mysql_sys_var *plugin_var)
   case PLUGIN_VAR_DOUBLE:
     return SHOW_DOUBLE;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return SHOW_UNDEF;
   }
 }
@@ -3465,7 +3565,7 @@ bool sys_var_pluginvar::check_update_type(Item_result type)
 
 uchar* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type type)
 {
-  DBUG_ASSERT(thd || (type == OPT_GLOBAL));
+  assert(thd || (type == OPT_GLOBAL));
   if (plugin_var->flags & PLUGIN_VAR_THDLOCAL)
   {
     if (type == OPT_GLOBAL)
@@ -3513,8 +3613,8 @@ uchar* sys_var_pluginvar::do_value_ptr(THD *running_thd, THD *target_thd, enum_v
 bool sys_var_pluginvar::do_check(THD *thd, set_var *var)
 {
   st_item_value_holder value;
-  DBUG_ASSERT(!is_readonly());
-  DBUG_ASSERT(plugin_var->check);
+  assert(!is_readonly());
+  assert(plugin_var->check);
 
   value.value_type= item_value_type;
   value.val_str= item_val_str;
@@ -3529,9 +3629,9 @@ bool sys_var_pluginvar::do_check(THD *thd, set_var *var)
 bool sys_var_pluginvar::session_update(THD *thd, set_var *var)
 {
   bool rc= false;
-  DBUG_ASSERT(!is_readonly());
-  DBUG_ASSERT(plugin_var->flags & PLUGIN_VAR_THDLOCAL);
-  DBUG_ASSERT(thd == current_thd);
+  assert(!is_readonly());
+  assert(plugin_var->flags & PLUGIN_VAR_THDLOCAL);
+  assert(thd == current_thd);
 
   mysql_mutex_lock(&LOCK_global_system_variables);
   void *tgt= real_value_ptr(thd, var->type);
@@ -3552,7 +3652,7 @@ bool sys_var_pluginvar::session_update(THD *thd, set_var *var)
 bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
 {
   bool rc= false;
-  DBUG_ASSERT(!is_readonly());
+  assert(!is_readonly());
   mysql_mutex_assert_owner(&LOCK_global_system_variables);
 
   void *tgt= real_value_ptr(thd, var->type);
@@ -3610,7 +3710,7 @@ bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
       src= &((thdvar_double_t*) plugin_var)->def_val;
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
 
@@ -3653,8 +3753,8 @@ bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
 bool sys_var_pluginvar::on_check_pluginvar(sys_var *self, THD *thd, set_var *var)
 {
   /* This handler is installed only if NO_DEFAULT is specified */
-  DBUG_ASSERT(((sys_var_pluginvar *) self)->plugin_var->flags &
-              PLUGIN_VAR_NODEFAULT);
+  assert(((sys_var_pluginvar *) self)->plugin_var->flags &
+         PLUGIN_VAR_NODEFAULT);
 
   return (!var->value);
 }
@@ -3774,7 +3874,7 @@ static void plugin_opt_set_limits(struct my_option *options,
     options->def_value= (intptr) ((thdvar_str_t*) opt)->def_val;
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
   options->arg_type= REQUIRED_ARG;
   if (opt->flags & PLUGIN_VAR_NOCMDARG)
@@ -4156,7 +4256,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, st_plugin_int *tmp,
   size_t len;
   uint count= EXTRA_OPTIONS;
   DBUG_ENTER("test_plugin_options");
-  DBUG_ASSERT(tmp->plugin && tmp->name.str);
+  assert(tmp->plugin && tmp->name.str);
 
   /*
     The 'federated' and 'ndbcluster' storage engines are always disabled by
@@ -4250,7 +4350,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, st_plugin_int *tmp,
       convert_dash_to_underscore(varname, len-1);
       v= new (mem_root) sys_var_pluginvar(&chain, varname, o);
     }
-    DBUG_ASSERT(v); /* check that an object was actually constructed */
+    assert(v); /* check that an object was actually constructed */
   } /* end for */
   if (chain.first)
   {
@@ -4355,8 +4455,5 @@ bool Sql_cmd_uninstall_plugin::execute(THD *thd)
   bool st= mysql_uninstall_plugin(thd, &m_comment);
   if (!st)
     my_ok(thd);
-#ifndef EMBEDDED_LIBRARY
-  mysql_audit_release(thd);
-#endif
   return st;
 }
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h
index 9a5e13c1cdd9..43140f5f3e7b 100644
--- a/sql/sql_plugin.h
+++ b/sql/sql_plugin.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -33,7 +40,7 @@ extern mysql_mutex_t LOCK_plugin_delete;
 #include "sql_cmd.h"
 #include "sql_plugin_ref.h"
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 #define plugin_ref_to_int(A) A
 #define plugin_int_to_ref(A) A
 #else
diff --git a/sql/sql_plugin_enum.h b/sql/sql_plugin_enum.h
index 331f4bce6c69..e356c3303f37 100644
--- a/sql/sql_plugin_enum.h
+++ b/sql/sql_plugin_enum.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_plugin_ref.h b/sql/sql_plugin_ref.h
index 89709d9ebdbe..ec6f2ba3d83c 100644
--- a/sql/sql_plugin_ref.h
+++ b/sql/sql_plugin_ref.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -53,7 +60,7 @@ struct st_plugin_int
   conditionally defined plugin_ref type
 */
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 typedef struct st_plugin_int *plugin_ref;
 
 inline st_mysql_plugin *plugin_decl(st_plugin_int *ref)
diff --git a/sql/sql_plugin_services.h b/sql/sql_plugin_services.h
index 203279edea37..9ad7ca610a76 100644
--- a/sql/sql_plugin_services.h
+++ b/sql/sql_plugin_services.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -131,7 +138,7 @@ static struct rpl_transaction_ctx_service_st rpl_transaction_ctx_handler= {
 };
 
 static struct transaction_write_set_service_st transaction_write_set_handler= {
-  get_transaction_write_set,
+  get_transaction_write_set, require_full_write_set, set_write_set_memory_size_limit, update_write_set_memory_size_limit,
 };
 
 static struct mysql_locking_service_st locking_service_handler=
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 62ba2c95b6e3..476d9487a416 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -86,6 +93,7 @@ When one supplies long data for a placeholder:
 #include "sql_prepare.h"
 #include "auth_common.h"        // insert_precheck
 #include "log.h"                // query_logger
+#include "m_string.h"
 #include "opt_trace.h"          // Opt_trace_array
 #include "probes_mysql.h"       // MYSQL_QUERY_EXEC_START
 #include "set_var.h"            // set_var_base
@@ -118,6 +126,7 @@ When one supplies long data for a placeholder:
 #include "sql_query_rewrite.h"
 
 #include <algorithm>
+#include <limits>
 using std::max;
 using std::min;
 
@@ -158,7 +167,6 @@ class Protocol_local : public Protocol
   virtual void end_partial_result_set();
   virtual int shutdown(bool server_shutdown= false);
   virtual bool connection_alive();
-  virtual SSL_handle get_ssl();
   virtual void start_row();
   virtual bool end_row();
   virtual void abort_row(){};
@@ -233,8 +241,19 @@ static inline void rewrite_query_if_needed(THD *thd)
                  !(opt_general_log_raw || thd->slave_thread));
 
   if ((thd->sp_runtime_ctx == NULL) &&
-      (general || opt_slow_log || opt_bin_log))
+      (general || opt_slow_log || opt_bin_log)) {
+    /*
+      thd->m_rewritten_query may already contain "PREPARE stmt FROM ..."
+      at this point, so we reset it here so mysql_rewrite_query()
+      won't complain.
+    */
+    thd->reset_rewritten_query();
+    /*
+      Now replace the "PREPARE ..." with the obfuscated version of the
+      actual query were prepare.
+    */
     mysql_rewrite_query(thd);
+  }
 }
 
 /**
@@ -257,10 +276,10 @@ static inline void log_execute_line(THD *thd)
   if (thd->sp_runtime_ctx != NULL)
     return;
 
-  if (thd->rewritten_query.length())
+  if (thd->rewritten_query().length())
     query_logger.general_log_write(thd, COM_STMT_EXECUTE,
-                                   thd->rewritten_query.c_ptr_safe(),
-                                   thd->rewritten_query.length());
+                                   thd->rewritten_query().ptr(),
+                                   thd->rewritten_query().length());
   else
     query_logger.general_log_write(thd, COM_STMT_EXECUTE,
                                    thd->query().str, thd->query().length);
@@ -277,6 +296,7 @@ class Statement_backup
 {
   LEX *m_lex;
   LEX_CSTRING m_query_string;
+  bool m_safe_to_display;
 
 public:
   LEX *lex() const { return m_lex; }
@@ -297,6 +317,12 @@ class Statement_backup
     m_query_string= thd->query();
     thd->set_query(stmt->m_query_string);
 
+    m_safe_to_display = thd->safe_to_display();
+
+    /* Keep the current behaviour of displaying prepared statements always by
+    default. This can be changed in future if required. */
+    thd->set_safe_display(true);
+
     DBUG_VOID_RETURN;
   }
 
@@ -314,6 +340,7 @@ class Statement_backup
     thd->lex=  m_lex;
     mysql_mutex_unlock(&thd->LOCK_thd_data);
 
+    thd->set_safe_display(m_safe_to_display);
     stmt->m_query_string= thd->query();
     thd->set_query(m_query_string);
 
@@ -762,7 +789,7 @@ static void setup_one_conversion_function(THD *thd, Item_param *param,
     param->value.cs_info.character_set_of_placeholder= &my_charset_bin;
     param->value.cs_info.character_set_client=
       thd->variables.character_set_client;
-    DBUG_ASSERT(thd->variables.character_set_client);
+    assert(thd->variables.character_set_client);
     param->value.cs_info.final_character_set_of_str_value= &my_charset_bin;
     param->item_type= Item::STRING_ITEM;
     param->item_result_type= STRING_RESULT;
@@ -1107,15 +1134,13 @@ bool Prepared_statement::insert_params_from_vars(List<LEX_STRING>& varnames,
   user_var_entry *entry;
   LEX_STRING *varname;
   List_iterator<LEX_STRING> var_it(varnames);
-  String buf;
+  StringBuffer<STRING_BUFFER_USUAL_SIZE> buf;
   const String *val;
   size_t length= 0;
 
   DBUG_ENTER("insert_params_from_vars");
 
-  if (with_log && query->copy(m_query_string.str,
-                              m_query_string.length, default_charset_info))
-    DBUG_RETURN(1);
+  if (with_log) query->reserve(m_query_string.length + 32 * param_count);
 
   /* Protects thd->user_vars */
   mysql_mutex_lock(&thd->LOCK_thd_data);
@@ -1142,17 +1167,34 @@ bool Prepared_statement::insert_params_from_vars(List<LEX_STRING>& varnames,
       if (param->convert_str_value(thd))
         goto error;
 
-      if (query->replace(param->pos_in_query+length, 1, *val))
+      assert(param->pos_in_query > length);
+     size_t num_bytes = param->pos_in_query - length;
+     if (query->length() + num_bytes + val->length() >
+          std::numeric_limits<uint32>::max())
         goto error;
-      length+= val->length()-1;
+
+     if (query->append(m_query_string.str + length, num_bytes) ||
+          query->append(*val))
+        goto error;
+
+      length = param->pos_in_query + 1;
     }
     else
     {
-      if (param->set_from_user_var(thd, entry) ||
-          param->convert_str_value(thd))
+      if (param->set_from_user_var(thd, entry))
         goto error;
+
+       if (entry)
+         length+= entry->length();
+
+       if (length > std::numeric_limits<uint32>::max() ||
+           param->convert_str_value(thd))
+         goto error;
     }
   }
+  // If logging, take care of tail.
+  if (with_log)
+    query->append(m_query_string.str + length, m_query_string.length - length);
 
   mysql_mutex_unlock(&thd->LOCK_thd_data);
   DBUG_RETURN(0);
@@ -1265,7 +1307,7 @@ int Sql_cmd_update::mysql_test_update(THD *thd)
 
   if (table_list->is_multiple_tables())
   {
-    DBUG_ASSERT(table_list->is_view());
+    assert(table_list->is_view());
     DBUG_PRINT("info", ("Switch to multi-update"));
     /* convert to multiupdate */
     DBUG_RETURN(2);
@@ -1300,8 +1342,8 @@ bool Sql_cmd_delete::prepared_statement_test(THD *thd)
 
   SELECT_LEX *const select= thd->lex->select_lex;
 
-  DBUG_ASSERT(thd->lex->query_tables ==
-              thd->lex->select_lex->get_table_list());
+  assert(thd->lex->query_tables ==
+         thd->lex->select_lex->get_table_list());
   TABLE_LIST *const table_list= select->get_table_list();
 
   if (delete_precheck(thd, table_list))
@@ -1437,7 +1479,7 @@ static bool mysql_test_set_fields(Prepared_statement *stmt,
   THD *thd= stmt->thd;
   set_var_base *var;
   DBUG_ENTER("mysql_test_set_fields");
-  DBUG_ASSERT(stmt->is_stmt_prepare());
+  assert(stmt->is_stmt_prepare());
 
   if (tables &&
       check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE))
@@ -1450,6 +1492,7 @@ static bool mysql_test_set_fields(Prepared_statement *stmt,
   {
     if (var->light_check(thd))
       DBUG_RETURN(true);              /* purecov: inspected */
+    var->cleanup();
   }
 
   DBUG_RETURN(false);
@@ -1475,7 +1518,7 @@ static bool mysql_test_call_fields(Prepared_statement *stmt,
   THD *thd= stmt->thd;
   Item *item;
   DBUG_ENTER("mysql_test_call_fields");
-  DBUG_ASSERT(stmt->is_stmt_prepare());
+  assert(stmt->is_stmt_prepare());
 
   if (tables &&
       check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE))
@@ -1633,7 +1676,7 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
   TABLE_LIST *create_table= lex->query_tables;
   TABLE_LIST *tables= lex->create_last_non_select_table->next_global;
   DBUG_ENTER("mysql_test_create_table");
-  DBUG_ASSERT(stmt->is_stmt_prepare());
+  assert(stmt->is_stmt_prepare());
 
   if (create_table_precheck(thd, tables, create_table))
     DBUG_RETURN(TRUE);
@@ -1694,7 +1737,7 @@ static bool mysql_test_create_view(Prepared_statement *stmt)
   TABLE_LIST *view= lex->unlink_first_table(&link_to_local);
   TABLE_LIST *tables= lex->query_tables;
   DBUG_ENTER("mysql_test_create_view");
-  DBUG_ASSERT(stmt->is_stmt_prepare());
+  assert(stmt->is_stmt_prepare());
 
   if (create_view_precheck(thd, tables, view, lex->create_view_mode))
     goto err;
@@ -1809,7 +1852,7 @@ bool Sql_cmd_insert_select::prepared_statement_test(THD *thd)
 
   /* store it, because Sql_cmd_insert_select::prepare() change it */
   first_local_table= lex->select_lex->table_list.first;
-  DBUG_ASSERT(first_local_table != 0);
+  assert(first_local_table != 0);
 
   res=
     select_like_stmt_cmd_test_with_open(thd, tables,
@@ -1842,7 +1885,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
 {
   THD *thd= stmt->thd;
   LEX *lex= stmt->lex;
-  DBUG_ASSERT(lex == thd->lex); // set_n_backup_active_arena() guarantees that
+  assert(lex == thd->lex); // set_n_backup_active_arena() guarantees that
   SELECT_LEX *select_lex= lex->select_lex;
   enum enum_sql_command sql_command= lex->sql_command;
   int res= 0;
@@ -1897,7 +1940,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
   case SQLCOM_UPDATE_MULTI:
   case SQLCOM_DELETE:
   case SQLCOM_DELETE_MULTI:
-    DBUG_ASSERT(thd->lex == stmt->lex);
+    assert(thd->lex == stmt->lex);
     res=
       static_cast<Sql_cmd_dml *>(lex->m_sql_cmd)->prepared_statement_test(thd);
     break;
@@ -2185,7 +2228,7 @@ static const char *get_dynamic_sql_string(LEX *lex, size_t *query_len)
         NULL value of variable checked early as entry->value so here
         we can't get NULL in normal conditions
       */
-      DBUG_ASSERT(!is_var_null);
+      assert(!is_var_null);
       if (!var_value)
         goto end;
     }
@@ -2337,6 +2380,13 @@ bool reinit_stmt_before_use(THD *thd, LEX *lex)
 
   // Default to READ access for every field that is resolved
   thd->mark_used_columns= MARK_COLUMNS_READ;
+
+  /*
+    THD::derived_tables_processing is not reset if derived table resolving fails
+    for the previous sub-statement. Hence resetting it here.
+  */
+  thd->derived_tables_processing= false;
+
   /*
     We have to update "thd" pointer in LEX, all its units and in LEX::result,
     since statements which belong to trigger body are associated with TABLE
@@ -2366,15 +2416,15 @@ bool reinit_stmt_before_use(THD *thd, LEX *lex)
 
       if (sl->where_cond())
       {
-        DBUG_ASSERT(sl->where_cond()->real_item()); // no dangling 'ref'
+        assert(sl->where_cond()->real_item()); // no dangling 'ref'
         sl->where_cond()->cleanup();
       }
       if (sl->having_cond())
       {
-        DBUG_ASSERT(sl->having_cond()->real_item());
+        assert(sl->having_cond()->real_item());
         sl->having_cond()->cleanup();
       }
-      DBUG_ASSERT(sl->join == 0);
+      assert(sl->join == 0);
       ORDER *order;
       /* Fix GROUP list */
       if (sl->group_list_ptrs && sl->group_list_ptrs->size() > 0)
@@ -2465,7 +2515,7 @@ bool reinit_stmt_before_use(THD *thd, LEX *lex)
     if (reprepare_observer &&
         reprepare_observer->report_error(thd))
     {
-      DBUG_ASSERT(thd->is_error());
+      assert(thd->is_error());
       DBUG_RETURN(true);
     }
   }
@@ -2512,8 +2562,6 @@ static void reset_stmt_params(Prepared_statement *stmt)
 void mysqld_stmt_execute(THD *thd, ulong stmt_id, ulong flags, uchar *params,
                          ulong params_length)
 {
-  /* Query text for binary, general or slow log, if any of them is open */
-  String expanded_query;
   Prepared_statement *stmt;
   Protocol *save_protocol= thd->get_protocol();
   bool open_cursor;
@@ -2547,9 +2595,8 @@ void mysqld_stmt_execute(THD *thd, ulong stmt_id, ulong flags, uchar *params,
   thd->set_protocol(&thd->protocol_binary);
 
   MYSQL_EXECUTE_PS(thd->m_statement_psi, stmt->m_prepared_stmt);
-  
-  stmt->execute_loop(&expanded_query, open_cursor, params,
-                    params + params_length);
+
+  stmt->execute_loop(open_cursor, params, params + params_length);
   thd->set_protocol(save_protocol);
 
   sp_cache_enforce_limit(thd->sp_proc_cache, stored_program_cache_size);
@@ -2585,8 +2632,6 @@ void mysql_sql_stmt_execute(THD *thd)
   LEX *lex= thd->lex;
   Prepared_statement *stmt;
   const LEX_CSTRING &name= lex->prepared_stmt_name;
-  /* Query text for binary, general or slow log, if any of them is open */
-  String expanded_query;
   DBUG_ENTER("mysql_sql_stmt_execute");
   DBUG_PRINT("info", ("EXECUTE: %.*s\n", (int) name.length, name.str));
 
@@ -2607,7 +2652,7 @@ void mysql_sql_stmt_execute(THD *thd)
 
   MYSQL_EXECUTE_PS(thd->m_statement_psi, stmt->m_prepared_stmt);
 
-  (void) stmt->execute_loop(&expanded_query, FALSE, NULL, NULL);
+  (void) stmt->execute_loop(FALSE, NULL, NULL);
 
   DBUG_VOID_RETURN;
 }
@@ -2736,7 +2781,7 @@ void mysqld_stmt_close(THD *thd, ulong stmt_id)
     The only way currently a statement can be deallocated when it's
     in use is from within Dynamic SQL.
   */
-  DBUG_ASSERT(! stmt->is_in_use());
+  assert(! stmt->is_in_use());
   MYSQL_DESTROY_PS(stmt->m_prepared_stmt);
   stmt->deallocate();
   query_logger.general_log_print(thd, thd->get_command(), NullS);
@@ -2836,9 +2881,8 @@ void mysql_stmt_get_longdata(THD *thd, ulong stmt_id, uint param_number,
   {
     stmt->state= Query_arena::STMT_ERROR;
     stmt->last_errno= thd->get_stmt_da()->mysql_errno();
-    size_t len= sizeof(stmt->last_error);
-    strncpy(stmt->last_error, thd->get_stmt_da()->message_text(), len - 1);
-    stmt->last_error[len - 1] = '\0';
+    my_snprintf(stmt->last_error, sizeof(stmt->last_error), "%.*s",
+                MYSQL_ERRMSG_SIZE - 1, thd->get_stmt_da()->message_text());
   }
   thd->pop_diagnostics_area();
 
@@ -2928,6 +2972,7 @@ Reprepare_observer::report_error(THD *thd)
   thd->get_stmt_da()->reset_diagnostics_area();
   thd->get_stmt_da()->set_error_status(ER_NEED_REPREPARE);
   m_invalidated= TRUE;
+  m_attempt++;
 
   return TRUE;
 }
@@ -3065,7 +3110,11 @@ void Prepared_statement::setup_set_params()
       opt_general_log || opt_slow_log ||
       (lex->sql_command == SQLCOM_SELECT &&
        lex->safe_to_cache_query &&
-       !lex->describe))
+       !lex->describe)
+#ifndef EMBEDDED_LIBRARY
+       || is_global_audit_mask_set()
+#endif
+     )
   {
     with_log= true;
   }
@@ -3093,7 +3142,7 @@ Prepared_statement::~Prepared_statement()
   free_items();
   if (lex)
   {
-    DBUG_ASSERT(lex->sphead == NULL);
+    assert(lex->sphead == NULL);
     lex_end(lex);
     delete lex->result;
     delete (st_lex_local *) lex;                // TRASH memory
@@ -3248,6 +3297,8 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
   digest.reset(token_array, max_digest_length);
   thd->m_digest= &digest;
 
+  parser_state.m_input.m_has_digest = true;
+
   enable_digest_if_any_plugin_needs_it(thd, &parser_state);
 #ifndef EMBEDDED_LIBRARY
   if (is_audit_plugin_class_active(thd, MYSQL_AUDIT_GENERAL_CLASS))
@@ -3296,7 +3347,7 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
     If called from a stored procedure, ensure that we won't rollback
     external changes when cleaning up after validation.
   */
-  DBUG_ASSERT(thd->change_list.is_empty());
+  assert(thd->change_list.is_empty());
 
   /*
     Marker used to release metadata locks acquired while the prepared
@@ -3318,13 +3369,13 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
     statements: ensure we have no memory leak here if by someone tries
     to PREPARE stmt FROM "CREATE PROCEDURE ..."
   */
-  DBUG_ASSERT(lex->sphead == NULL || error != 0);
+  assert(lex->sphead == NULL || error != 0);
   /* The order is important */
   lex->unit->cleanup(true);
   lex->clear_values_map();
 
   /* No need to commit statement transaction, it's not started. */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
 
   close_thread_tables(thd);
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
@@ -3337,7 +3388,7 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
     Once dynamic SQL is allowed as substatements the below if-statement
     has to be adjusted to not do rollback in substatement.
   */
-  DBUG_ASSERT(! thd->in_sub_stmt);
+  assert(! thd->in_sub_stmt);
   if (thd->transaction_rollback_request)
   {
     trans_rollback_implicit(thd);
@@ -3348,18 +3399,18 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
 
   rewrite_query_if_needed(thd);
 
-  if (thd->rewritten_query.length())
+  if (thd->rewritten_query().length())
   {
     MYSQL_SET_PS_TEXT(m_prepared_stmt,
-                      thd->rewritten_query.c_ptr_safe(),
-                      thd->rewritten_query.length());
+                      thd->rewritten_query().ptr(),
+                      thd->rewritten_query().length());
   }
   else
   {
     MYSQL_SET_PS_TEXT(m_prepared_stmt,
                       thd->query().str,
                       thd->query().length);
-  }  
+  }
 
   cleanup_stmt();
   stmt_backup.restore_thd(thd, this);
@@ -3401,10 +3452,10 @@ bool Prepared_statement::prepare(const char *query_str, size_t query_length)
     */
     if (thd->sp_runtime_ctx == NULL)
     {
-      if (thd->rewritten_query.length())
+      if (thd->rewritten_query().length())
         query_logger.general_log_write(thd, COM_STMT_PREPARE,
-                                       thd->rewritten_query.c_ptr_safe(),
-                                       thd->rewritten_query.length());
+                                       thd->rewritten_query().ptr(),
+                                       thd->rewritten_query().length());
       else
         query_logger.general_log_write(thd, COM_STMT_PREPARE,
                                        m_query_string.str,
@@ -3488,31 +3539,33 @@ Prepared_statement::set_parameters(String *expanded_query,
   validation error, prepare a new copy of the prepared statement,
   swap the old and the new statements, and try again.
   If there is a validation error again, repeat the above, but
-  perform no more than MAX_REPREPARE_ATTEMPTS.
+  perform not more than a maximum number of times. Reprepare_observer
+  ensures that a prepared statement execution is retried not more than a
+  maximum number of times.
 
   @note We have to try several times in a loop since we
   release metadata locks on tables after prepared statement
   prepare. Therefore, a DDL statement may sneak in between prepare
-  and execute of a new statement. If this happens repeatedly
-  more than MAX_REPREPARE_ATTEMPTS times, we give up.
+  and execute of a new statement. If a prepared statement execution
+  is retried for a maximum number of times then we give up.
+
 
   @return TRUE if an error, FALSE if success
-  @retval  TRUE    either MAX_REPREPARE_ATTEMPTS has been reached,
-                   or some general error
+  @retval  TRUE    either statement execution is retried for
+                   a maximum number of times or some general error.
   @retval  FALSE   successfully executed the statement, perhaps
                    after having reprepared it a few times.
 */
 
 bool
-Prepared_statement::execute_loop(String *expanded_query,
-                                 bool open_cursor,
+Prepared_statement::execute_loop(bool open_cursor,
                                  uchar *packet,
                                  uchar *packet_end)
 {
-  const int MAX_REPREPARE_ATTEMPTS= 3;
   Reprepare_observer reprepare_observer;
   bool error;
-  int reprepare_attempt= 0;
+  /* Query text for binary, general or slow log, if any of them is open */
+  String expanded_query;
 
   /* Check if we got an error when sending long data */
   if (state == Query_arena::STMT_ERROR)
@@ -3521,9 +3574,9 @@ Prepared_statement::execute_loop(String *expanded_query,
     return TRUE;
   }
 
-  DBUG_ASSERT(!thd->get_stmt_da()->is_set());
+  assert(!thd->get_stmt_da()->is_set());
 
-  if (set_parameters(expanded_query, packet, packet_end))
+  if (set_parameters(&expanded_query, packet, packet_end))
     return TRUE;
 
   if (unlikely(thd->security_context()->password_expired() &&
@@ -3539,7 +3592,7 @@ Prepared_statement::execute_loop(String *expanded_query,
     allocated items when cleaning up after validation of the prepared
     statement.
   */
-  DBUG_ASSERT(thd->free_list == NULL);
+  assert(thd->free_list == NULL);
 
   /*
     Install the metadata observer. If some metadata version is
@@ -3557,16 +3610,16 @@ Prepared_statement::execute_loop(String *expanded_query,
 
   thd->push_reprepare_observer(stmt_reprepare_observer);
 
-  error= execute(expanded_query, open_cursor) || thd->is_error();
+  error= execute(&expanded_query, open_cursor) || thd->is_error();
 
   thd->pop_reprepare_observer();
 
   if ((sql_command_flags[lex->sql_command] & CF_REEXECUTION_FRAGILE) &&
       error && !thd->is_fatal_error && !thd->killed &&
       reprepare_observer.is_invalidated() &&
-      reprepare_attempt++ < MAX_REPREPARE_ATTEMPTS)
+      reprepare_observer.can_retry())
   {
-    DBUG_ASSERT(thd->get_stmt_da()->mysql_errno() == ER_NEED_REPREPARE);
+    assert(thd->get_stmt_da()->mysql_errno() == ER_NEED_REPREPARE);
     thd->clear_error();
 
     error= reprepare();
@@ -3662,7 +3715,7 @@ Prepared_statement::reprepare()
 
     swap_prepared_statement(&copy);
     swap_parameter_array(param_array, copy.param_array, param_count);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     is_reprepared= TRUE;
 #endif
     /*
@@ -3755,8 +3808,8 @@ Prepared_statement::swap_prepared_statement(Prepared_statement *copy)
   /* Ditto */
   swap_variables(LEX_CSTRING, m_db, copy->m_db);
 
-  DBUG_ASSERT(param_count == copy->param_count);
-  DBUG_ASSERT(thd == copy->thd);
+  assert(param_count == copy->param_count);
+  assert(thd == copy->thd);
   last_error[0]= '\0';
   last_errno= 0;
 }
@@ -3841,7 +3894,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
     If the free_list is not empty, we'll wrongly free some externally
     allocated items when cleaning up after execution of this statement.
   */
-  DBUG_ASSERT(thd->change_list.is_empty());
+  assert(thd->change_list.is_empty());
 
   /*
    The only case where we should have items in the thd->free_list is
@@ -3863,9 +3916,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
                           &cur_db_changed))
   {
     flags&= ~ (uint) IS_IN_USE;
-    mysql_mutex_lock(&thd->LOCK_thd_data);
-    thd->lex= stmt_backup.lex();
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
+    stmt_backup.restore_thd(thd, this);
     return TRUE;
   }
 
@@ -3877,9 +3928,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
   {
     my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR), expanded_query->length());
     flags&= ~ (uint) IS_IN_USE;
-    mysql_mutex_lock(&thd->LOCK_thd_data);
-    thd->lex= stmt_backup.lex();
-    mysql_mutex_unlock(&thd->LOCK_thd_data);
+    stmt_backup.restore_thd(thd, this);
     return TRUE;
   }
 
@@ -3967,19 +4016,25 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
     mysql_change_db(thd, to_lex_cstring(saved_cur_db_name), true);
 
   /* Assert that if an error, no cursor is open */
-  DBUG_ASSERT(! (error && cursor));
+  assert(! (error && cursor));
 
   if (! cursor)
     cleanup_stmt();
 
+  thd->lex->release_plugins();
+
   /*
-    Expanded query is needed for slow logging, so we want thd->query
-    to point at it even after we restore from backup. This is ok, as
-    expanded query was allocated in thd->mem_root.
+   Note that we cannot call restore_thd() here as that would overwrite
+   the expanded query in THD::m_query_string, which is needed for slow
+   logging. Use alloc_query() to make sure the query is allocated on
+   the correct MEM_ROOT, since otherwise THD::m_query_string could end
+   up as a dangling pointer (i.e. pointer to freed memory) once the PS
+   MEM_ROOT is freed.
   */
   mysql_mutex_lock(&thd->LOCK_thd_data);
   thd->lex= stmt_backup.lex();
   mysql_mutex_unlock(&thd->LOCK_thd_data);
+  alloc_query(thd, thd->query().str, thd->query().length);
 
   thd->stmt_arena= old_stmt_arena;
 
@@ -4149,6 +4204,14 @@ bool Ed_connection::execute_direct(Server_runnable *server_runnable)
   */
   m_current_rset= m_rsets;
 
+  /*
+    Reset rewritten (for password obfuscation etc.) query after
+    internal call from NDB etc.  Without this, a rewritten query
+    would get "stuck" in SHOW PROCESSLIST.
+  */
+  m_thd->reset_rewritten_query();
+  m_thd->reset_query_for_display();
+
   DBUG_RETURN(rc);
 }
 
@@ -4196,7 +4259,7 @@ Ed_connection::store_result_set()
 {
   Ed_result_set *ed_result_set;
 
-  DBUG_ASSERT(m_current_rset);
+  assert(m_current_rset);
 
   if (m_current_rset == m_rsets)
   {
@@ -4477,7 +4540,7 @@ bool Protocol_local::send_eof(uint server_status, uint statement_warn_count)
 {
   Ed_result_set *ed_result_set;
 
-  DBUG_ASSERT(m_rset);
+  assert(m_rset);
 
   opt_add_row_to_rset();
   m_current_row= 0;
@@ -4491,7 +4554,7 @@ bool Protocol_local::send_eof(uint server_status, uint statement_warn_count)
     return TRUE;
 
   /* In case of successful allocation memory ownership was transferred. */
-  DBUG_ASSERT(!alloc_root_inited(&m_rset_root));
+  assert(!alloc_root_inited(&m_rset_root));
 
   /*
     Link the created Ed_result_set instance into the list of connection
@@ -4546,11 +4609,6 @@ Protocol_local::shutdown(bool server_shutdown)
   return 0;
 }
 
-SSL_handle Protocol_local::get_ssl()
-{
-  return NULL;
-}
-
 /**
   Called between two result set rows.
 
@@ -4563,7 +4621,7 @@ void
 Protocol_local::start_row()
 {
   DBUG_ENTER("Protocol_local::start_row");
-  DBUG_ASSERT(alloc_root_inited(&m_rset_root));
+  assert(alloc_root_inited(&m_rset_root));
 
   opt_add_row_to_rset();
   /* Start a new row. */
diff --git a/sql/sql_prepare.h b/sql/sql_prepare.h
index f1fd3ae89cb3..25e9e10c62a0 100644
--- a/sql/sql_prepare.h
+++ b/sql/sql_prepare.h
@@ -1,15 +1,22 @@
 #ifndef SQL_PREPARE_H
 #define SQL_PREPARE_H
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -50,6 +57,8 @@ struct LEX;
 class Reprepare_observer
 {
 public:
+  Reprepare_observer() : m_invalidated(FALSE), m_attempt(0) {}
+
   /**
     Check if a change of metadata is OK. In future
     the signature of this method may be extended to accept the old
@@ -57,10 +66,30 @@ class Reprepare_observer
     simple, we only need the THD to report an error.
   */
   bool report_error(THD *thd);
+  /**
+    @returns true if some table metadata is changed and statement should be
+                  re-prepared.
+  */
   bool is_invalidated() const { return m_invalidated; }
   void reset_reprepare_observer() { m_invalidated= FALSE; }
+  /// @returns true if prepared statement can (and will) be retried
+  bool can_retry() const {
+    // Only call for a statement that is invalidated
+    assert(is_invalidated());
+    return m_attempt <= MAX_REPREPARE_ATTEMPTS &&
+           DBUG_EVALUATE_IF("simulate_max_reprepare_attempts_hit_case", false,
+                            true);
+  }
+
 private:
   bool m_invalidated;
+  int m_attempt;
+
+  /*
+    We take only 3 attempts to reprepare the query, otherwise we might end up
+    in endless loop.
+  */
+  static const int MAX_REPREPARE_ATTEMPTS = 3;
 };
 
 
@@ -351,7 +380,7 @@ class Ed_row: public Sql_alloc
   }
   const Ed_column *get_column(const unsigned int column_index) const
   {
-    DBUG_ASSERT(column_index < size());
+    assert(column_index < size());
     return m_column_array + column_index;
   }
   size_t size() const { return m_column_count; }
@@ -461,8 +490,7 @@ class Prepared_statement: public Query_arena
   bool is_sql_prepare() const { return flags & (uint) IS_SQL_PREPARE; }
   void set_sql_prepare() { flags|= (uint) IS_SQL_PREPARE; }
   bool prepare(const char *packet, size_t packet_length);
-  bool execute_loop(String *expanded_query,
-                    bool open_cursor,
+  bool execute_loop(bool open_cursor,
                     uchar *packet_arg, uchar *packet_end_arg);
   bool execute_server_runnable(Server_runnable *server_runnable);
 #ifdef HAVE_PSI_PS_INTERFACE
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc
index db7893a84351..0d7f72e309f9 100644
--- a/sql/sql_profile.cc
+++ b/sql/sql_profile.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -57,7 +64,7 @@ int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables,
   const char *old= thd->lex->sql_command == SQLCOM_SHOW_PROFILE ?
                      "SHOW PROFILE" : "INFORMATION_SCHEMA.PROFILING";
 
-  DBUG_ASSERT(thd->lex->sql_command != SQLCOM_SHOW_PROFILES);
+  assert(thd->lex->sql_command != SQLCOM_SHOW_PROFILES);
 
   push_deprecated_warn(thd, old, "Performance Schema");
   return(thd->profiling.fill_statistics_info(thd, tables, cond));
@@ -207,7 +214,7 @@ void PROF_MEASUREMENT::set_label(const char *status_arg,
 
   allocated_status_memory= (char *) my_malloc(key_memory_PROFILE,
                                               sizes[0] + sizes[1] + sizes[2], MYF(0));
-  DBUG_ASSERT(allocated_status_memory != NULL);
+  assert(allocated_status_memory != NULL);
 
   cursor= allocated_status_memory;
 
@@ -292,7 +299,7 @@ void QUERY_PROFILE::set_query_source(const char *query_source_arg,
   /* Truncate to avoid DoS attacks. */
   size_t length= min(MAX_QUERY_LENGTH, query_length_arg);
 
-  DBUG_ASSERT(m_query_source.str == NULL); /* we don't leak memory */
+  assert(m_query_source.str == NULL); /* we don't leak memory */
   if (query_source_arg != NULL)
   {
     m_query_source.str= my_strndup(key_memory_PROFILE,
@@ -308,7 +315,7 @@ void QUERY_PROFILE::new_status(const char *status_arg,
   PROF_MEASUREMENT *prof;
   DBUG_ENTER("QUERY_PROFILE::status");
 
-  DBUG_ASSERT(status_arg != NULL);
+  assert(status_arg != NULL);
 
   if ((function_arg != NULL) && (file_arg != NULL))
     prof= new PROF_MEASUREMENT(this, status_arg, function_arg, base_name(file_arg), line_arg);
@@ -392,7 +399,7 @@ void PROFILING::start_new_query(const char *initial_state)
 
   if (! enabled) DBUG_VOID_RETURN;
 
-  DBUG_ASSERT(current == NULL);
+  assert(current == NULL);
   current= new QUERY_PROFILE(this, initial_state);
 
   DBUG_VOID_RETURN;
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 904eba86c5e9..71e1232852ba 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -108,7 +115,7 @@ template <class T> class Queue
       first= new_item;
     if (last != NULL)
     {
-      DBUG_ASSERT(last->next == NULL);
+      assert(last->next == NULL);
       last->next= new_item;
     }
     new_item->previous= last;
@@ -144,7 +151,7 @@ template <class T> class Queue
 
   bool is_empty()
   {
-    DBUG_ASSERT(((elements > 0) && (first != NULL)) || ((elements == 0) || (first == NULL)));
+    assert(((elements > 0) && (first != NULL)) || ((elements == 0) || (first == NULL)));
     return (elements == 0);
   }
 
diff --git a/sql/sql_query_rewrite.cc b/sql/sql_query_rewrite.cc
index 18c34e582be9..2bc91ac80909 100644
--- a/sql/sql_query_rewrite.cc
+++ b/sql/sql_query_rewrite.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -62,8 +69,8 @@ void invoke_pre_parse_rewrite_plugins(THD *thd)
   {
     // It is a rewrite fulltext plugin and we need a rewrite we must have
     // generated a new query then.
-    DBUG_ASSERT(rewritten_query.str != NULL &&
-                rewritten_query.length > 0);
+    assert(rewritten_query.str != NULL &&
+           rewritten_query.length > 0);
     raise_query_rewritten_note(thd, thd->query().str, rewritten_query.str);
     alloc_query(thd, rewritten_query.str, rewritten_query.length);
     thd->m_parser_state->init(thd, thd->query().str, thd->query().length);
@@ -111,19 +118,19 @@ bool invoke_post_parse_rewrite_plugins(THD *thd, my_bool is_prepared)
        We have to call a function in rules_table_service.cc, or the service
        won't be visible to plugins.
     */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     int dummy= 
 #endif
       rules_table_service::
       dummy_function_to_ensure_we_are_linked_into_the_server();
-    DBUG_ASSERT(dummy == 1);
+    assert(dummy == 1);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     dummy=
 #endif
       ssl_wrappe_service::
       dummy_function_to_ensure_we_are_linked_into_the_server();
-    DBUG_ASSERT(dummy == 1);
+    assert(dummy == 1);
   }
 
   mysql_event_parse_rewrite_plugin_flag flags=
diff --git a/sql/sql_query_rewrite.h b/sql/sql_query_rewrite.h
index e7326a4640f6..8e02828de80f 100644
--- a/sql/sql_query_rewrite.h
+++ b/sql/sql_query_rewrite.h
@@ -1,16 +1,23 @@
 #ifndef SQL_QUERY_REWRITE_INCLUDED
 #define SQL_QUERY_REWRITE_INCLUDED
 
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index de4fef958d47..c7d1d6ef730d 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -64,7 +71,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
   select_errors=0;				/* Write if more errors */
   int tmp_write_to_binlog= *write_to_binlog= 1;
 
-  DBUG_ASSERT(!thd || !thd->in_sub_stmt);
+  assert(!thd || !thd->in_sub_stmt);
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (options & REFRESH_GRANT)
@@ -126,10 +133,12 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
       result= 1;
 
   if ((options & REFRESH_SLOW_LOG) && opt_slow_log)
-    query_logger.reopen_log_file(QUERY_LOG_SLOW);
+    if (query_logger.reopen_log_file(QUERY_LOG_SLOW))
+      result= 1;
 
   if ((options & REFRESH_GENERAL_LOG) && opt_general_log)
-    query_logger.reopen_log_file(QUERY_LOG_GENERAL);
+    if (query_logger.reopen_log_file(QUERY_LOG_GENERAL))
+      result= 1;
 
   if (options & REFRESH_ENGINE_LOG)
     if (ha_flush_logs(NULL))
@@ -187,12 +196,12 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
     query_cache.flush();			// RESET QUERY CACHE
   }
 
-  DBUG_ASSERT(!thd || thd->locked_tables_mode ||
-              !thd->mdl_context.has_locks() ||
-              thd->handler_tables_hash.records ||
-              thd->mdl_context.has_locks(MDL_key::USER_LEVEL_LOCK) ||
-              thd->mdl_context.has_locks(MDL_key::LOCKING_SERVICE) ||
-              thd->global_read_lock.is_acquired());
+  assert(!thd || thd->locked_tables_mode ||
+         !thd->mdl_context.has_locks() ||
+         thd->handler_tables_hash.records ||
+         thd->mdl_context.has_locks(MDL_key::USER_LEVEL_LOCK) ||
+         thd->mdl_context.has_locks(MDL_key::LOCKING_SERVICE) ||
+         thd->global_read_lock.is_acquired());
 
   /*
     Note that if REFRESH_READ_LOCK bit is set then REFRESH_TABLES is set too
@@ -306,7 +315,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
 #ifdef HAVE_REPLICATION
   if (options & REFRESH_MASTER)
   {
-    DBUG_ASSERT(thd);
+    assert(thd);
     tmp_write_to_binlog= 0;
     if (reset_master(thd))
     {
diff --git a/sql/sql_reload.h b/sql/sql_reload.h
index c21cb24891fe..c500a3b469ee 100644
--- a/sql/sql_reload.h
+++ b/sql/sql_reload.h
@@ -1,15 +1,22 @@
 #ifndef SQL_RELOAD_INCLUDED
 #define SQL_RELOAD_INCLUDED
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index b96abc2ca083..f597037370de 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -254,7 +261,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table,
     old_alias= ren_table->table_name;
     new_alias= new_table_name;
   }
-  DBUG_ASSERT(new_alias);
+  assert(new_alias);
 
   build_table_filename(name, sizeof(name) - 1,
                        new_db, new_alias, reg_ext, 0);
@@ -310,7 +317,7 @@ do_rename(THD *thd, TABLE_LIST *ren_table,
         rc= mysql_rename_view(thd, new_db, new_alias, ren_table);
       break;
     default:
-      DBUG_ASSERT(0); // should never happen
+      assert(0); // should never happen
     case FRMTYPE_ERROR:
       { 
         char errbuf[MYSYS_STRERROR_SIZE];
diff --git a/sql/sql_rename.h b/sql/sql_rename.h
index 4361fabbc9ca..bc672eb63023 100644
--- a/sql/sql_rename.h
+++ b/sql/sql_rename.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_resolver.cc b/sql/sql_resolver.cc
index b0b111d71550..d035201fb40f 100644
--- a/sql/sql_resolver.cc
+++ b/sql/sql_resolver.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -33,6 +40,7 @@
 #include "opt_explain_format.h"
 #include "sql_test.h"            // print_where
 #include "aggregate_check.h"
+#include "template_utils.h"
 
 static void propagate_nullability(List<TABLE_LIST> *tables, bool nullable);
 
@@ -98,8 +106,8 @@ bool SELECT_LEX::prepare(THD *thd)
   // We may do subquery transformation, or Item substitution:
   Prepare_error_tracker tracker(thd);
 
-  DBUG_ASSERT(this == thd->lex->current_select());
-  DBUG_ASSERT(join == NULL);
+  assert(this == thd->lex->current_select());
+  assert(join == NULL);
 
   SELECT_LEX_UNIT *const unit= master_unit();
 
@@ -165,7 +173,7 @@ bool SELECT_LEX::prepare(THD *thd)
     We are not parsing anymore: any new Items created now are due to
     query rewriting, so stop incrementing counters.
    */
-  DBUG_ASSERT(parsing_place == CTX_NONE);
+  assert(parsing_place == CTX_NONE);
   parsing_place= CTX_NONE;
 
   resolve_place= RESOLVE_SELECT_LIST;
@@ -230,7 +238,6 @@ bool SELECT_LEX::prepare(THD *thd)
 
   // Set up the ORDER BY clause
   all_fields_count= all_fields.elements;
-  int hidden_order_field_count= 0;
   if (order_list.elements)
   {
     if (setup_order(thd, ref_ptrs, get_table_list(), fields_list, all_fields,
@@ -256,11 +263,11 @@ bool SELECT_LEX::prepare(THD *thd)
       first_execution &&                                   // 2)
       !(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW)) // 3)
   {
-    remove_redundant_subquery_clauses(thd, hidden_group_field_count,
-                                      hidden_order_field_count);
+    remove_redundant_subquery_clauses(thd, hidden_group_field_count);
   }
 
-  if (order_list.elements && setup_order_final(thd, hidden_order_field_count))
+  if (order_list.elements &&
+      setup_order_final(thd))
     DBUG_RETURN(true);     /* purecov: inspected */
 
   if (is_distinct() &&
@@ -362,8 +369,15 @@ bool SELECT_LEX::prepare(THD *thd)
 
   sj_candidates= NULL;
 
+  /*
+    When reaching the top-most query block, or the next-to-top query block for
+    the SQL command SET and for SP instructions (indicated with SQLCOM_END),
+    apply local transformations to this query block and all underlying query
+    blocks.
+  */
   if (outer_select() == NULL ||
-      (parent_lex->sql_command == SQLCOM_SET_OPTION &&
+      ((parent_lex->sql_command == SQLCOM_SET_OPTION ||
+       parent_lex->sql_command == SQLCOM_END) &&
        outer_select()->outer_select() == NULL))
   {
     /*
@@ -390,7 +404,7 @@ bool SELECT_LEX::prepare(THD *thd)
       DBUG_RETURN(true);
   }
 
-  DBUG_ASSERT(!thd->is_error());
+  assert(!thd->is_error());
   DBUG_RETURN(false);
 }
 
@@ -527,8 +541,8 @@ bool subquery_allows_materialization(Item_in_subselect *predicate,
 {
   const uint elements= predicate->unit->first_select()->item_list.elements;
   DBUG_ENTER("subquery_allows_materialization");
-  DBUG_ASSERT(elements >= 1);
-  DBUG_ASSERT(predicate->left_expr->cols() == elements);
+  assert(elements >= 1);
+  assert(predicate->left_expr->cols() == elements);
 
   OPT_TRACE_TRANSFORM(&thd->opt_trace, trace_wrapper, trace_mat,
                       select_lex->select_number,
@@ -587,7 +601,7 @@ bool subquery_allows_materialization(Item_in_subselect *predicate,
       This is a temporary fix for BUG#36752; see bug report for
       description of restrictions we need to put on the compared expressions.
     */
-    DBUG_ASSERT(predicate->left_expr->fixed);
+    assert(predicate->left_expr->fixed);
     // @see comment in Item_subselect::element_index()
     bool has_nullables= predicate->left_expr->maybe_null;
 
@@ -635,7 +649,7 @@ bool subquery_allows_materialization(Item_in_subselect *predicate,
       }
     }
   }
-  DBUG_ASSERT(cause != NULL);
+  assert(cause != NULL);
   trace_mat.add("possible", false).add_alnum("cause", cause);
   DBUG_RETURN(false);
 }
@@ -655,10 +669,10 @@ static TABLE_LIST **make_leaf_tables(TABLE_LIST **list, TABLE_LIST *tables)
   for (TABLE_LIST *table= tables; table; table= table->next_local)
   {
     // A mergable view is not allowed to have a table pointer.
-    DBUG_ASSERT(!(table->is_view() && table->is_merged() && table->table));
+    assert(!(table->is_view() && table->is_merged() && table->table));
     if (table->merge_underlying_list)
     {
-      DBUG_ASSERT(table->is_merged());
+      assert(table->is_merged());
 
       list= make_leaf_tables(list, table->merge_underlying_list);
     }
@@ -734,9 +748,9 @@ bool st_select_lex::setup_tables(THD *thd, TABLE_LIST *tables,
 {
   DBUG_ENTER("st_select_lex::setup_tables");
 
-  DBUG_ASSERT ((select_insert && !tables->next_name_resolution_table) ||
-               !tables || 
-               (context.table_list && context.first_name_resolution_table));
+  assert ((select_insert && !tables->next_name_resolution_table) ||
+          !tables || 
+          (context.table_list && context.first_name_resolution_table));
 
   make_leaf_tables(&leaf_tables, tables);
 
@@ -858,7 +872,7 @@ bool st_select_lex::resolve_derived(THD *thd, bool apply_semijoin)
 {
   DBUG_ENTER("st_select_lex::resolve_derived");
 
-  DBUG_ASSERT(derived_table_count);
+  assert(derived_table_count);
 
   // Prepare derived tables and views that belong to this query block.
   for (TABLE_LIST *tl= get_table_list(); tl; tl= tl->next_local)
@@ -892,8 +906,8 @@ bool st_select_lex::resolve_derived(THD *thd, bool apply_semijoin)
   for (TABLE_LIST *tl= get_table_list(); tl; tl= tl->next_local)
   {
     // Ensure that any derived table is merged or materialized after prepare:
-    DBUG_ASSERT(first_execution || !tl->is_view_or_derived() ||
-                tl->is_merged() || tl->uses_materialization());
+    assert(first_execution || !tl->is_view_or_derived() ||
+           tl->is_merged() || tl->uses_materialization());
     if (!tl->is_view_or_derived() || tl->is_merged())
       continue;
     if (tl->setup_materialized_derived(thd))
@@ -914,7 +928,7 @@ bool st_select_lex::resolve_derived(THD *thd, bool apply_semijoin)
     {
       if (!tl->is_view_or_derived() || tl->table != NULL)
         continue;
-      DBUG_ASSERT(!tl->is_merged());
+      assert(!tl->is_merged());
       if (tl->resolve_derived(thd, apply_semijoin))
         DBUG_RETURN(true);        /* purecov: inspected */
       if (tl->setup_materialized_derived(thd))
@@ -966,7 +980,7 @@ bool SELECT_LEX::resolve_subquery(THD *thd)
     EXEC_UNSPECIFIED.
   */
   Item_subselect *subq_predicate= master_unit()->item;
-  DBUG_ASSERT(subq_predicate);
+  assert(subq_predicate);
   /**
     @note
     In this case: IN (SELECT ... UNION SELECT ...), SELECT_LEX::prepare() is
@@ -1022,9 +1036,10 @@ bool SELECT_LEX::resolve_subquery(THD *thd)
       a single table UPDATE/DELETE (TODO: We should handle this at some
       point by switching to multi-table UPDATE/DELETE)
       7. We're not in a confluent table-less subquery, like "SELECT 1".
-      8. No execution method was already chosen (by a prepared statement)
-      9. Parent select is not a confluent table-less select
-      10. Neither parent nor child select have STRAIGHT_JOIN option.
+      8. No execution method was already chosen (by a prepared statement).
+      9. Parent query block is not a confluent table-less query block.
+      10. Neither parent nor child query block has straight join.
+      11. Parent query block does not prohibit semi-join.
   */
   if (semijoin_enabled(thd) &&
       in_predicate &&                                                   // 1
@@ -1035,12 +1050,13 @@ bool SELECT_LEX::resolve_subquery(THD *thd)
        outer->resolve_place == st_select_lex::RESOLVE_JOIN_NEST) &&     // 5a
       !outer->semijoin_disallowed &&                                    // 5b
       outer->sj_candidates &&                                           // 6
-      leaf_table_count &&                                               // 7
+      leaf_table_count > 0 &&                                           // 7
       in_predicate->exec_method ==
                            Item_exists_subselect::EXEC_UNSPECIFIED &&   // 8
       outer->leaf_table_count &&                                        // 9
       !((active_options() | outer->active_options()) &
-       SELECT_STRAIGHT_JOIN))                                           //10
+        SELECT_STRAIGHT_JOIN) &&                                        //10
+      !(outer->active_options() & SELECT_NO_SEMI_JOIN))                 //11
   {
     DBUG_PRINT("info", ("Subquery is semi-join conversion candidate"));
 
@@ -1083,7 +1099,7 @@ bool SELECT_LEX::setup_wild(THD *thd)
 {
   DBUG_ENTER("SELECT_LEX::setup_wild");
 
-  DBUG_ASSERT(with_wild);
+  assert(with_wild);
 
   // PS/SP uses arena so that changes are made permanently.
   Prepared_stmt_arena_holder ps_arena_holder(thd);
@@ -1095,11 +1111,10 @@ bool SELECT_LEX::setup_wild(THD *thd)
   {
     Item_field *item_field;
     if (item->type() == Item::FIELD_ITEM &&
-        (item_field= (Item_field *) item) &&
-        item_field->field_name &&
-        item_field->field_name[0] == '*' &&
-        !item_field->field)
+        (item_field= down_cast<Item_field *>(item)) &&
+        item_field->is_asterisk())
     {
+      assert(item_field->field == NULL);
       const uint elem= fields_list.elements;
       const bool any_privileges= item_field->any_privileges;
       Item_subselect *subsel= master_unit()->item;
@@ -1223,8 +1238,8 @@ bool SELECT_LEX::setup_conds(THD *thd)
 
   is_item_list_lookup= save_is_item_list_lookup;
 
-  DBUG_ASSERT(thd->lex->current_select() == this);
-  DBUG_ASSERT(!thd->is_error());
+  assert(thd->lex->current_select() == this);
+  assert(!thd->is_error());
   DBUG_RETURN(false);
 }
 
@@ -1443,7 +1458,7 @@ SELECT_LEX::simplify_joins(THD *thd,
 
         if (join_cond != table->join_cond())
         {
-          DBUG_ASSERT(join_cond);
+          assert(join_cond);
           table->set_join_cond(join_cond);
         }
       }
@@ -1494,7 +1509,7 @@ SELECT_LEX::simplify_joins(THD *thd,
             It is always a new item as both the upper-level condition and a
             join condition existed
           */
-          DBUG_ASSERT(!new_cond->fixed);
+          assert(!new_cond->fixed);
           if (new_cond->fix_fields(thd, NULL))
             DBUG_RETURN(true);
 
@@ -1533,7 +1548,7 @@ SELECT_LEX::simplify_joins(THD *thd,
       table->dep_tables|= table->join_cond()->used_tables();
 
       // At this point the joined tables always have an embedding join nest:
-      DBUG_ASSERT(table->embedding);
+      assert(table->embedding);
 
       table->dep_tables&= ~table->embedding->nested_join->used_tables;
 
@@ -1684,8 +1699,8 @@ static int subq_sj_candidate_cmp(Item_exists_subselect* const *el1,
   /*
     Remove this assert when we support semijoin on non-IN subqueries.
   */
-  DBUG_ASSERT((*el1)->substype() == Item_subselect::IN_SUBS &&
-              (*el2)->substype() == Item_subselect::IN_SUBS);
+  assert((*el1)->substype() == Item_subselect::IN_SUBS &&
+         (*el2)->substype() == Item_subselect::IN_SUBS);
   return ((*el1)->sj_convert_priority < (*el2)->sj_convert_priority) ? 1 : 
          ( ((*el1)->sj_convert_priority == (*el2)->sj_convert_priority)? 0 : -1);
 }
@@ -1760,12 +1775,12 @@ static void fix_tables_after_pullout(st_select_lex *parent_select,
          transl < tr->field_translation_end;
          transl++)
     {
-      DBUG_ASSERT(transl->item->fixed);
+      assert(transl->item->fixed);
       transl->item->fix_after_pullout(parent_select, removed_select);
     }
     // Update used table info for the WHERE clause of the derived table
-    DBUG_ASSERT(!tr->derived_where_cond ||
-                tr->derived_where_cond->fixed);
+    assert(!tr->derived_where_cond ||
+           tr->derived_where_cond->fixed);
     if (tr->derived_where_cond)
       tr->derived_where_cond->fix_after_pullout(parent_select,
                                                 removed_select);
@@ -1852,7 +1867,7 @@ SELECT_LEX::convert_subquery_to_semijoin(Item_exists_subselect *subq_pred)
   THD *const thd= subq_pred->unit->thd;
   DBUG_ENTER("convert_subquery_to_semijoin");
 
-  DBUG_ASSERT(subq_pred->substype() == Item_subselect::IN_SUBS);
+  assert(subq_pred->substype() == Item_subselect::IN_SUBS);
 
   bool outer_join= false;  // True if predicate is inner to an outer join
 
@@ -1967,6 +1982,20 @@ SELECT_LEX::convert_subquery_to_semijoin(Item_exists_subselect *subq_pred)
           break;
         }
       }
+
+      /*
+        outer_tbl is replaced by wrap_nest.
+        For subselects, update embedding_join_nest to point to wrap_nest
+        instead of outer_tbl
+      */
+      for (Item_exists_subselect **subquery= sj_candidates->begin();
+           subquery < sj_candidates->end();
+           subquery++)
+      {
+        if ((*subquery)->embedding_join_nest == outer_tbl)
+          (*subquery)->embedding_join_nest= wrap_nest;
+      }
+
       /*
         Ok now wrap_nest 'contains' outer_tbl and we're ready to add the 
         semi-join nest into it
@@ -2054,7 +2083,7 @@ SELECT_LEX::convert_subquery_to_semijoin(Item_exists_subselect *subq_pred)
   {
     Item_in_subselect *in_subq_pred= (Item_in_subselect *)subq_pred;
 
-    DBUG_ASSERT(is_fixed_or_outer_ref(in_subq_pred->left_expr));
+    assert(is_fixed_or_outer_ref(in_subq_pred->left_expr));
 
     in_subq_pred->exec_method= Item_exists_subselect::EXEC_SEMI_JOIN;
     /*
@@ -2246,7 +2275,7 @@ bool SELECT_LEX::merge_derived(THD *thd, TABLE_LIST *derived_table)
   SELECT_LEX_UNIT *const derived_unit= derived_table->derived_unit();
 
   // A derived table must be prepared before we can merge it
-  DBUG_ASSERT(derived_unit->is_prepared());
+  assert(derived_unit->is_prepared());
 
   LEX *const lex= parent_lex;
 
@@ -2421,7 +2450,7 @@ bool SELECT_LEX::merge_derived(THD *thd, TABLE_LIST *derived_table)
      the outer query contains only one table reference.
     */
     // LIMIT currently blocks derived table merge
-    DBUG_ASSERT(!derived_select->has_limit());
+    assert(!derived_select->has_limit());
 
     if ((lex->sql_command == SQLCOM_SELECT ||
          lex->sql_command == SQLCOM_UPDATE ||
@@ -2431,7 +2460,38 @@ bool SELECT_LEX::merge_derived(THD *thd, TABLE_LIST *derived_table)
           is_distinct() ||
           is_ordered() ||
           get_table_list()->next_local != NULL))
+    {
       order_list.push_back(&derived_select->order_list);
+      /*
+        If at outer-most level (not within another derived table), ensure
+        the ordering columns are marked in read_set, since columns selected
+        from derived tables are not marked in initial resolving.
+      */
+      if (!thd->derived_tables_processing)
+      {
+        Mark_field mf(thd->mark_used_columns);
+        for (ORDER *o = derived_select->order_list.first; o != NULL;
+             o = o->next) {
+          o->item[0]->walk(&Item::mark_field_in_map, Item::WALK_POSTFIX,
+                           pointer_cast<uchar *>(&mf));
+          /*
+            If the expression in order by was part of the select list
+            of the merged derived query block and if it is unused in the
+            outer query block, delete_unused_merged_columns() could
+            delete the select expression. So, we set that the merged
+            order by expression is used and therefore should not be deleted.
+          */
+          o->item[0]->walk(&Item::propagate_set_derived_used,
+                           Item::WALK_POSTFIX, NULL);
+        }
+      }
+    }
+    else
+    {
+      derived_select->empty_order_list(this);
+      trace_derived.add_alnum("transformations_to_derived_table",
+                              "removed_ordering");
+    }
   }
 
   // Add any full-text functions from derived table into outer query
@@ -2498,7 +2558,7 @@ static bool replace_subcondition(THD *thd, Item **tree,
   }
   else
     // If we came here it means there were an error during prerequisites check.
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
 
   return TRUE;
 }
@@ -2589,12 +2649,12 @@ bool SELECT_LEX::flatten_subqueries()
     /*
       Currently, we only support transformation of IN subqueries.
     */
-    DBUG_ASSERT((*subq)->substype() == Item_subselect::IN_SUBS);
+    assert((*subq)->substype() == Item_subselect::IN_SUBS);
 
     st_select_lex *child_select= (*subq)->unit->first_select();
 
     // Check that we proceeded bottom-up
-    DBUG_ASSERT(child_select->sj_candidates == NULL);
+    assert(child_select->sj_candidates == NULL);
 
     (*subq)->sj_convert_priority= 
       (((*subq)->unit->uncacheable & UNCACHEABLE_DEPENDENT) ? MAX_TABLES : 0) +
@@ -2697,6 +2757,19 @@ bool SELECT_LEX::flatten_subqueries()
   DBUG_RETURN(FALSE);
 }
 
+bool SELECT_LEX::is_in_select_list(Item *cand) {
+  List_iterator<Item> li(fields_list);
+  Item *item;
+  while ((item = li++)) {
+    // Use a walker to detect if cand is present in this select item
+
+    if (item->walk(&Item::find_item_processor, Item::WALK_SUBQUERY_POSTFIX,
+                   pointer_cast<uchar *>(cand)))
+      return true;
+  }
+  return false;
+}
+
 /**
   Propagate nullability into inner tables of outer join operation
 
@@ -2941,14 +3014,11 @@ bool SELECT_LEX::fix_inner_refs(THD *thd)
    @param thd               thread handler
    @param hidden_group_field_count Number of hidden group fields added
                             by setup_group().
-   @param hidden_order_field_count Number of hidden order fields added
-                            by setup_order().
 */
 
 
 void SELECT_LEX::remove_redundant_subquery_clauses(THD *thd,
-                                                   int hidden_group_field_count,
-                                                   int hidden_order_field_count)
+                                                   int hidden_group_field_count)
 {
   Item_subselect *subq_predicate= master_unit()->item;
   /*
@@ -2962,10 +3032,10 @@ void SELECT_LEX::remove_redundant_subquery_clauses(THD *thd,
     return;
 
   // A subquery that is not single row should be one of IN/ALL/ANY/EXISTS.
-  DBUG_ASSERT (subq_predicate->substype() == Item_subselect::EXISTS_SUBS ||
-               subq_predicate->substype() == Item_subselect::IN_SUBS     ||
-               subq_predicate->substype() == Item_subselect::ALL_SUBS    ||
-               subq_predicate->substype() == Item_subselect::ANY_SUBS);
+  assert (subq_predicate->substype() == Item_subselect::EXISTS_SUBS ||
+          subq_predicate->substype() == Item_subselect::IN_SUBS     ||
+          subq_predicate->substype() == Item_subselect::ALL_SUBS    ||
+          subq_predicate->substype() == Item_subselect::ANY_SUBS);
 
   enum change
   {
@@ -2980,7 +3050,7 @@ void SELECT_LEX::remove_redundant_subquery_clauses(THD *thd,
   if (order_list.elements)
   {
     changelog|= REMOVE_ORDER;
-    empty_order_list(hidden_order_field_count);
+    empty_order_list(this);
   }
 
   if (is_distinct())
@@ -3031,16 +3101,24 @@ void SELECT_LEX::remove_redundant_subquery_clauses(THD *thd,
   Delete corresponding elements from all_fields and ref_ptrs too.
   If ORDER list contain any subqueries, delete them from the query block list.
 
-  @param hidden_order_field_count Number of hidden order fields to remove
+  @param sl  Query block that possible subquery blocks in the ORDER BY clause
+             are attached to (may be different from "this" when query block has
+             been merged into an outer query block).
 */
 
-void SELECT_LEX::empty_order_list(int hidden_order_field_count)
+void SELECT_LEX::empty_order_list(SELECT_LEX *sl)
 {
   for (ORDER *o= order_list.first; o != NULL; o= o->next)
   {
-    if (*o->item == o->item_ptr)
+    /*
+      Do not remove the order by expression if it has a view
+      reference. There is possibility that this view reference could
+      be used elsewhere in the query
+    */
+    if (*o->item == o->item_ptr) {
       (*o->item)->walk(&Item::clean_up_after_removal, walk_subquery,
-                       reinterpret_cast<uchar*>(this));
+                       pointer_cast<uchar *>(sl));
+    }
   }
   order_list.empty();
   while (hidden_order_field_count-- > 0)
@@ -3263,7 +3341,7 @@ find_order_in_list(THD *thd, Ref_ptr_array ref_pointer_array,
     item is removed from the query. In that case, we must call walk()
     with clean_up_after_removal() on the old order->item.
   */
-  DBUG_ASSERT(order_item == *order->item);
+  assert(order_item == *order->item);
   order->item= &ref_pointer_array[el];
   return FALSE;
 }
@@ -3284,7 +3362,7 @@ find_order_in_list(THD *thd, Ref_ptr_array ref_pointer_array,
 bool setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables,
                  List<Item> &fields, List<Item> &all_fields, ORDER *order)
 {
-  DBUG_ASSERT(order);
+  assert(order);
 
   SELECT_LEX *const select= thd->lex->current_select();
 
@@ -3378,17 +3456,15 @@ bool SELECT_LEX::check_only_full_group_by(THD *thd)
   Split any aggregate functions.
 
   @param thd                      Thread handler
-  @param hidden_order_field_count Number of fields to delete from ref array
-                                  if ORDER BY clause is redundant.
 
   @returns false if success, true if error
 */
-bool SELECT_LEX::setup_order_final(THD *thd, int hidden_order_field_count)
+bool SELECT_LEX::setup_order_final(THD *thd)
 {
   if (is_implicitly_grouped())
   {
     // Result will contain zero or one row - ordering is redundant
-    empty_order_list(hidden_order_field_count);
+    empty_order_list(this);
     return false;
   }
 
@@ -3397,7 +3473,7 @@ bool SELECT_LEX::setup_order_final(THD *thd, int hidden_order_field_count)
       !(braces && explicit_limit))
   {
     // Part of UNION which requires global ordering may skip local order
-    empty_order_list(hidden_order_field_count);
+    empty_order_list(this);
     return false;
   }
 
@@ -3430,7 +3506,7 @@ bool SELECT_LEX::setup_order_final(THD *thd, int hidden_order_field_count)
 
 bool SELECT_LEX::setup_group(THD *thd)
 {
-  DBUG_ASSERT(group_list.elements);
+  assert(group_list.elements);
 
   thd->where="group statement";
   for (ORDER *group= group_list.first; group; group= group->next)
@@ -3610,7 +3686,7 @@ validate_gc_assignment(THD * thd, List<Item> *fields,
     Field *rfield;
 
     if (!use_table_field)
-      rfield= ((Item_field *)f++)->field;
+      rfield= (down_cast<Item_field*>((f++)->real_item()))->field;
     else
       rfield= *(fld++);
     if (rfield->table != table)
@@ -3659,7 +3735,7 @@ void SELECT_LEX::delete_unused_merged_columns(List<TABLE_LIST> *tables)
       {
         Item *const item= transl->item;
 
-        DBUG_ASSERT(item->fixed);
+        assert(item->fixed);
         if (!item->has_subquery())
           continue;
 
diff --git a/sql/sql_resolver.h b/sql/sql_resolver.h
index dffce6c3c062..80a1c18155b0 100644
--- a/sql/sql_resolver.h
+++ b/sql/sql_resolver.h
@@ -1,16 +1,23 @@
 #ifndef SQL_RESOLVER_INCLUDED
 #define SQL_RESOLVER_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_rewrite.cc b/sql/sql_rewrite.cc
index 9f92ce26207b..f216280ae8a4 100644
--- a/sql/sql_rewrite.cc
+++ b/sql/sql_rewrite.cc
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -233,7 +239,7 @@ void mysql_rewrite_grant(THD *thd, String *rlb)
               cols.append(STRING_WITH_LEN(", "));
             else
               comma_inner= TRUE;
-            cols.append(column->column.ptr(),column->column.length());
+            append_identifier(thd, &cols, column->column.ptr(), column->column.length());
           }
         }
         cols.append(STRING_WITH_LEN(")"));
@@ -350,12 +356,14 @@ static void mysql_rewrite_set(THD *thd, String *rlb)
 /**
   Rewrite CREATE/ALTER USER statement.
 
-  @param thd      The THD to rewrite for.
-  @param rlb      An empty String object to put the rewritten query in.
+  @param thd                     The THD to rewrite for.
+  @param rlb                     An empty String object to put the rewritten query in.
+  @param hide_password_hash      If password hash has to be shown as <secret> or not.
 */
 
 void mysql_rewrite_create_alter_user(THD *thd, String *rlb,
-                                     std::set<LEX_USER *> *extra_users)
+                                     std::set<LEX_USER *> *extra_users,
+                                     bool hide_password_hash)
 {
   LEX                      *lex= thd->lex;
   LEX_USER                 *user_name, *tmp_user_name;
@@ -383,7 +391,7 @@ void mysql_rewrite_create_alter_user(THD *thd, String *rlb,
           thd->lex->sql_command != SQLCOM_ALTER_USER)
         append_user(thd, rlb, user_name, comma, true);
       else
-        append_user_new(thd, rlb, user_name, comma);
+        append_user_new(thd, rlb, user_name, comma, hide_password_hash);
       comma= TRUE;
     }
   }
@@ -794,31 +802,39 @@ static void mysql_rewrite_prepare(THD *thd, String *rlb)
 /**
    Rewrite a query (to obfuscate passwords etc.)
 
-   Side-effects: thd->rewritten_query will contain a rewritten query,
-   or be cleared if no rewriting took place.
+   Side-effects:
+
+   - thd->m_rewritten_query will contain a rewritten query,
+     or be cleared if no rewriting took place.
+     LOCK_thd_query will be temporarily acquired to make that change.
+
+   @note Keep in mind that these side-effects will only happen when
+         calling this top-level function, but not when calling
+         individual sub-functions directly!
 
    @param thd     The THD to rewrite for.
 */
 
 void mysql_rewrite_query(THD *thd)
 {
-  String *rlb= &thd->rewritten_query;
+  String rlb;
 
-  rlb->mem_free();
+  // We should not come through here twice for the same query.
+  assert(thd->rewritten_query().length() == 0);
 
   if (thd->lex->contains_plaintext_password)
   {
     switch(thd->lex->sql_command)
     {
-    case SQLCOM_GRANT:         mysql_rewrite_grant(thd, rlb);         break;
-    case SQLCOM_SET_OPTION:    mysql_rewrite_set(thd, rlb);           break;
+    case SQLCOM_GRANT:         mysql_rewrite_grant(thd, &rlb);         break;
+    case SQLCOM_SET_OPTION:    mysql_rewrite_set(thd, &rlb);           break;
     case SQLCOM_CREATE_USER:
     case SQLCOM_ALTER_USER:
-                        mysql_rewrite_create_alter_user(thd, rlb);    break;
-    case SQLCOM_CHANGE_MASTER: mysql_rewrite_change_master(thd, rlb); break;
-    case SQLCOM_SLAVE_START:   mysql_rewrite_start_slave(thd, rlb);   break;
-    case SQLCOM_CREATE_SERVER: mysql_rewrite_create_server(thd, rlb); break;
-    case SQLCOM_ALTER_SERVER:  mysql_rewrite_alter_server(thd, rlb);  break;
+                        mysql_rewrite_create_alter_user(thd, &rlb);    break;
+    case SQLCOM_CHANGE_MASTER: mysql_rewrite_change_master(thd, &rlb); break;
+    case SQLCOM_SLAVE_START:   mysql_rewrite_start_slave(thd, &rlb);   break;
+    case SQLCOM_CREATE_SERVER: mysql_rewrite_create_server(thd, &rlb); break;
+    case SQLCOM_ALTER_SERVER:  mysql_rewrite_alter_server(thd, &rlb);  break;
 
     /*
       PREPARE stmt FROM <string> is rewritten so that <string> is
@@ -833,8 +849,12 @@ void mysql_rewrite_query(THD *thd)
       prepare function calls the logger (and comes by here with
       sql_command set to the command being prepared).
     */
-    case SQLCOM_PREPARE:       mysql_rewrite_prepare(thd, rlb);       break;
-    default:                   /* unhandled query types are legal. */ break;
+    case SQLCOM_PREPARE:       mysql_rewrite_prepare(thd, &rlb);       break;
+    default:                   /* unhandled query types are legal. */  break;
     }
   }
+
+  // Note that we succeeded in rewriting (where applicable).
+  if (rlb.length() > 0)
+    thd->swap_rewritten_query(rlb);
 }
diff --git a/sql/sql_rewrite.h b/sql/sql_rewrite.h
index 561f01259f07..b40afbee88e7 100644
--- a/sql/sql_rewrite.h
+++ b/sql/sql_rewrite.h
@@ -1,14 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b7385caabcca..9981fd7ca282 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -103,10 +110,10 @@ bool handle_query(THD *thd, LEX *lex, Query_result *result,
   SELECT_LEX *const select= unit->first_select();
   bool res;
 
-  DBUG_ASSERT(thd == unit->thd);
+  assert(thd == unit->thd);
 
-  DBUG_ASSERT(!unit->is_prepared() && !unit->is_optimized() &&
-              !unit->is_executed());
+  assert(!unit->is_prepared() && !unit->is_optimized() &&
+         !unit->is_executed());
 
   if (lex->proc_analyse && lex->sql_command != SQLCOM_SELECT)
   {
@@ -141,7 +148,7 @@ bool handle_query(THD *thd, LEX *lex, Query_result *result,
       goto err;
   }
 
-  DBUG_ASSERT(!lex->is_query_tables_locked());
+  assert(!lex->is_query_tables_locked());
   /*
     Locking of tables is done after preparation but before optimization.
     This allows to do better partition pruning and avoid locking unused
@@ -193,7 +200,7 @@ bool handle_query(THD *thd, LEX *lex, Query_result *result,
     }
   }
 
-  DBUG_ASSERT(!thd->is_error());
+  assert(!thd->is_error());
 
   thd->update_previous_found_rows();
   THD_STAGE_INFO(thd, stage_end);
@@ -204,7 +211,7 @@ bool handle_query(THD *thd, LEX *lex, Query_result *result,
   DBUG_RETURN(res);
 
 err:
-  DBUG_ASSERT(thd->is_error() || thd->killed);
+  assert(thd->is_error() || thd->killed);
   DBUG_PRINT("info",("report_error: %d", thd->is_error()));
   THD_STAGE_INFO(thd, stage_end);
 
@@ -458,7 +465,7 @@ static bool setup_semijoin_dups_elimination(JOIN *join, uint no_jbuf_after)
   QEP_TAB *const qep_array= join->qep_tab;
   for (tableno= join->const_tables; tableno < join->primary_tables; )
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     const bool tab_in_sj_nest= join->best_ref[tableno]->emb_sj_nest != NULL;
 #endif
     QEP_TAB *const tab= &qep_array[tableno];
@@ -473,13 +480,13 @@ static bool setup_semijoin_dups_elimination(JOIN *join, uint no_jbuf_after)
     switch (pos->sj_strategy) {
       case SJ_OPT_MATERIALIZE_LOOKUP:
       case SJ_OPT_MATERIALIZE_SCAN:
-        DBUG_ASSERT(false); // Should not occur among "primary" tables
+        assert(false); // Should not occur among "primary" tables
         // Do nothing
         tableno+= pos->n_sj_tables;
         break;
       case SJ_OPT_LOOSE_SCAN:
       {
-        DBUG_ASSERT(tab_in_sj_nest); // First table must be inner
+        assert(tab_in_sj_nest); // First table must be inner
         /* We jump from the last table to the first one */
         tab->match_tab= last_sj_tab->idx();
 
@@ -494,12 +501,12 @@ static bool setup_semijoin_dups_elimination(JOIN *join, uint no_jbuf_after)
         */
         if (tab->quick())
         {
-          DBUG_ASSERT(tab->quick()->index == pos->loosescan_key);
+          assert(tab->quick()->index == pos->loosescan_key);
           tab->quick()->need_sorted_output();
         }
 
         const uint keyno= pos->loosescan_key;
-        DBUG_ASSERT(tab->keys().is_set(keyno));
+        assert(tab->keys().is_set(keyno));
         tab->set_index(keyno);
 
         /* Calculate key length */
@@ -518,7 +525,7 @@ static bool setup_semijoin_dups_elimination(JOIN *join, uint no_jbuf_after)
       }
       case SJ_OPT_DUPS_WEEDOUT:
       {
-        DBUG_ASSERT(tab_in_sj_nest); // First table must be inner
+        assert(tab_in_sj_nest); // First table must be inner
         /*
           Consider a semijoin of one outer and one inner table, both
           with two rows. The inner table is assumed to be confluent
@@ -696,7 +703,7 @@ static bool setup_semijoin_dups_elimination(JOIN *join, uint no_jbuf_after)
           this range of inner tables, etc.
         */
         plan_idx jump_to= tab->idx() - 1;
-        DBUG_ASSERT(tab_in_sj_nest); // First table must be inner
+        assert(tab_in_sj_nest); // First table must be inner
         for (QEP_TAB *tab_in_range= tab;
              tab_in_range <= last_sj_tab; 
              tab_in_range++)
@@ -786,7 +793,7 @@ static int clear_sj_tmp_tables(JOIN *join)
           pick_table_access_method() which sets materialize_table, so the
           assertion is disabled in this case.
         */
-        DBUG_ASSERT(join->zero_result_cause || tab->materialize_table);
+        assert(join->zero_result_cause || tab->materialize_table);
         tab->materialized= false;
         // The materialized table must be re-read on next evaluation:
         tab->table()->status= STATUS_GARBAGE | STATUS_NOT_FOUND;
@@ -933,7 +940,7 @@ bool JOIN::destroy()
 
   if (qep_tab)
   {
-    DBUG_ASSERT(!join_tab);
+    assert(!join_tab);
     for (uint i= 0; i < tables; i++)
       qep_tab[i].cleanup();
   }
@@ -999,7 +1006,7 @@ bool SELECT_LEX::optimize(THD *thd)
 {
   DBUG_ENTER("SELECT_LEX::optimize");
 
-  DBUG_ASSERT(join == NULL);
+  assert(join == NULL);
   JOIN *const join_local= new JOIN(thd, this);
   if (!join_local)
     DBUG_RETURN(true);  /* purecov: inspected */
@@ -1095,7 +1102,7 @@ bool JOIN::init_ref_access()
 
     if (tab->type() == JT_REF) // Here JT_REF means all kinds of ref access
     {
-      DBUG_ASSERT(tab->position() && tab->position()->key);
+      assert(tab->position() && tab->position()->key);
       if (create_ref_for_key(this, tab, tab->position()->key,
                              tab->prefix_tables()))
         DBUG_RETURN(true);
@@ -1164,7 +1171,7 @@ void calc_length_and_keyparts(Key_use *keyuse, JOIN_TAB *tab, const uint key,
                               uint *length_out, uint *keyparts_out,
                               table_map *dep_map, bool *maybe_null)
 {
-  DBUG_ASSERT(!dep_map || maybe_null);
+  assert(!dep_map || maybe_null);
   uint keyparts= 0, length= 0;
   uint found_part_ref_or_null= 0;
   KEY *const keyinfo= tab->table()->key_info + key;
@@ -1184,7 +1191,7 @@ void calc_length_and_keyparts(Key_use *keyuse, JOIN_TAB *tab, const uint key,
         keyparts == keyuse->keypart &&
         !(found_part_ref_or_null & keyuse->optimize))
     {
-      DBUG_ASSERT(keyparts <= MAX_REF_PARTS);
+      assert(keyparts <= MAX_REF_PARTS);
       if (chosen_keyuses)
         chosen_keyuses[keyparts]= keyuse;
       keyparts++;
@@ -1199,7 +1206,7 @@ void calc_length_and_keyparts(Key_use *keyuse, JOIN_TAB *tab, const uint key,
     }
     keyuse++;
   } while (keyuse->table_ref == tab->table_ref && keyuse->key == key);
-  DBUG_ASSERT(keyparts > 0);
+  assert(keyparts > 0);
   *length_out= length;
   *keyparts_out= keyparts;
 }
@@ -1244,7 +1251,7 @@ bool create_ref_for_key(JOIN *join, JOIN_TAB *j, Key_use *org_keyuse,
   KEY   *const keyinfo= table->key_info+key;
   Key_use *chosen_keyuses[MAX_REF_PARTS];
 
-  DBUG_ASSERT(j->keys().is_set(org_keyuse->key));
+  assert(j->keys().is_set(org_keyuse->key));
 
   /* Calculate the length of the used key. */
   if (ftkey)
@@ -1369,7 +1376,7 @@ bool create_ref_for_key(JOIN *join, JOIN_TAB *j, Key_use *org_keyuse,
       */
       if ((keyuse->optimize & KEY_OPTIMIZE_REF_OR_NULL) && maybe_null)
       {
-        DBUG_ASSERT(null_ref_key == NULL); // or we would overwrite it below
+        assert(null_ref_key == NULL); // or we would overwrite it below
         null_ref_key= key_buff;
       }
       key_buff+=keyinfo->key_part[part_no].store_length;
@@ -1484,8 +1491,8 @@ enum store_key::store_key_result store_key_hash_item::copy_inner()
 
 bool and_conditions(Item **e1, Item *e2)
 {
-  DBUG_ASSERT(!(*e1) || (*e1)->fixed);
-  DBUG_ASSERT(!e2 || e2->fixed);
+  assert(!(*e1) || (*e1)->fixed);
+  assert(!e2 || e2->fixed);
   if (*e1)
   {
     if (!e2)
@@ -1538,7 +1545,7 @@ bool and_conditions(Item **e1, Item *e2)
 static Item *make_cond_for_index(Item *cond, TABLE *table, uint keyno,
                                  bool other_tbls_ok)
 {
-  DBUG_ASSERT(cond != NULL);
+  assert(cond != NULL);
 
   if (cond->type() == Item::COND_ITEM)
   {
@@ -1690,7 +1697,7 @@ void QEP_TAB::push_index_cond(const JOIN_TAB *join_tab,
   DBUG_ENTER("push_index_cond");
 
   ASSERT_BEST_REF_IN_JOIN_ORDER(join_);
-  DBUG_ASSERT(join_tab == join_->best_ref[idx()]);
+  assert(join_tab == join_->best_ref[idx()]);
 
   if (join_tab->reversed_access) // @todo: historical limitation, lift it!
     DBUG_VOID_RETURN;
@@ -1790,9 +1797,9 @@ void QEP_TAB::push_index_cond(const JOIN_TAB *join_tab,
           3. The index condition contains an updatable user variable
              (test this by checking that the RAND_TABLE_BIT is set).
         */
-        DBUG_ASSERT(other_tbls_ok ||                                  // 1
-                    idx_cond->const_item() ||                         // 2
-                    (idx_cond->used_tables() & RAND_TABLE_BIT) );     // 3
+        assert(other_tbls_ok ||                                  // 1
+               idx_cond->const_item() ||                         // 2
+               (idx_cond->used_tables() & RAND_TABLE_BIT) );     // 3
         DBUG_VOID_RETURN;
       }
 
@@ -1886,8 +1893,8 @@ bool JOIN::setup_semijoin_materialized_table(JOIN_TAB *tab, uint tableno,
   Semijoin_mat_exec *const sjm_exec= tab->sj_mat_exec();
   const uint field_count= emb_sj_nest->nested_join->sj_inner_exprs.elements;
 
-  DBUG_ASSERT(inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_LOOKUP ||
-              inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_SCAN);
+  assert(inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_LOOKUP ||
+         inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_SCAN);
 
   /* 
     Set up the table to write to, do as
@@ -1930,9 +1937,9 @@ bool JOIN::setup_semijoin_materialized_table(JOIN_TAB *tab, uint tableno,
     created for temporary table, semijoin_types_allow_materialization must
     assure that MATERIALIZE_LOOKUP can't be chosen.
   */
-  DBUG_ASSERT((inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_LOOKUP &&
-              !table->hash_field) ||
-              inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_SCAN);
+  assert((inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_LOOKUP &&
+          !table->hash_field) ||
+         inner_pos->sj_strategy == SJ_OPT_MATERIALIZE_SCAN);
 
   TABLE_LIST *tl;
   if (!(tl= (TABLE_LIST *) alloc_root(thd->mem_root, sizeof(TABLE_LIST))))
@@ -2025,9 +2032,9 @@ bool JOIN::setup_semijoin_materialized_table(JOIN_TAB *tab, uint tableno,
 void QEP_TAB::init_join_cache(JOIN_TAB *join_tab)
 {
   JOIN *const join_= join();
-  DBUG_ASSERT(idx() > 0);
+  assert(idx() > 0);
   ASSERT_BEST_REF_IN_JOIN_ORDER(join_);
-  DBUG_ASSERT(join_tab == join_->best_ref[idx()]);
+  assert(join_tab == join_->best_ref[idx()]);
 
   JOIN_CACHE *prev_cache= NULL;
   if ((uint)idx() > join_->const_tables)
@@ -2060,7 +2067,7 @@ void QEP_TAB::init_join_cache(JOIN_TAB *join_tab)
     op= new JOIN_CACHE_BKA_UNIQUE(join_, this, join_tab->join_cache_flags, prev_cache);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
 
   }
   DBUG_EXECUTE_IF("jb_alloc_with_prev_fail",
@@ -2099,7 +2106,7 @@ void QEP_TAB::init_join_cache(JOIN_TAB *join_tab)
         delete q->op;
         q->op= NULL;
       }
-      DBUG_ASSERT(i > 0);
+      assert(i > 0);
       /*
         Make the immediately preceding QEP_TAB channel the work to the
         non-buffered nested loop algorithm:
@@ -2168,7 +2175,7 @@ make_join_readinfo(JOIN *join, uint no_jbuf_after)
     qep_tab->next_select=sub_select;		/* normal select */
     qep_tab->cache_idx_cond= NULL;
     table->status= STATUS_GARBAGE | STATUS_NOT_FOUND;
-    DBUG_ASSERT(!qep_tab->read_first_record);
+    assert(!qep_tab->read_first_record);
     qep_tab->read_record.read_record= NULL;
     qep_tab->read_record.unlock_row= rr_unlock_row;
 
@@ -2255,7 +2262,7 @@ make_join_readinfo(JOIN *join, uint no_jbuf_after)
       {
         if (table->covering_keys.is_set(qep_tab->quick()->index))
         {
-          DBUG_ASSERT(qep_tab->quick()->index != MAX_KEY);
+          assert(qep_tab->quick()->index != MAX_KEY);
           table->set_keyread(TRUE);
         }
         if (!table->key_read)
@@ -2286,7 +2293,7 @@ make_join_readinfo(JOIN *join, uint no_jbuf_after)
       break;
     default:
       DBUG_PRINT("error",("Table type %d found",qep_tab->type())); /* purecov: deadcode */
-      DBUG_ASSERT(0);
+      assert(0);
       break;					/* purecov: deadcode */
     }
 
@@ -2341,11 +2348,22 @@ bool error_if_full_join(JOIN *join)
   for (uint i= 0; i < join->primary_tables; i++)
   {
     JOIN_TAB *const tab= join->best_ref[i];
+    THD *thd = join->thd;
+
+    /*
+      Safe update error isn't returned if:
+      1) It is  an EXPLAIN statement OR
+      2) Table is not the target.
+
+      Append the first warning (if any) to the error message. Allows the user
+      to understand why index access couldn't be chosen.
+    */
 
-    if (tab->type() == JT_ALL && (!tab->quick()))
+    if (!thd->lex->is_explain() && tab->table()->pos_in_table_list->updating &&
+        tab->type() == JT_ALL)
     {
-      my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
-                 ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
+      my_error(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, MYF(0),
+               thd->get_stmt_da()->get_first_condition_message());
       return true;
     }
   }
@@ -2434,7 +2452,7 @@ void QEP_shared_owner::qs_cleanup()
 
 uint QEP_TAB::sjm_query_block_id() const
 {
-  DBUG_ASSERT(sj_is_materialize_strategy(get_sj_strategy()));
+  assert(sj_is_materialize_strategy(get_sj_strategy()));
   for (uint i= 0; i < join()->primary_tables; ++i)
   {
     // Find the sj-mat tmp table whose sj nest contains us:
@@ -2444,7 +2462,7 @@ uint QEP_TAB::sjm_query_block_id() const
         (uint)idx() <  sjm->inner_table_index + sjm->table_count)
       return sjm->sj_nest->nested_join->query_block_id;
   }
-  DBUG_ASSERT(false);
+  assert(false);
   return 0;
 }
 
@@ -2585,8 +2603,8 @@ void JOIN::cleanup()
 {
   DBUG_ENTER("JOIN::cleanup");
 
-  DBUG_ASSERT(const_tables <= primary_tables &&
-              primary_tables <= tables);
+  assert(const_tables <= primary_tables &&
+         primary_tables <= tables);
 
   if (qep_tab || join_tab || best_ref)
   {
@@ -2597,7 +2615,7 @@ void JOIN::cleanup()
       QEP_operation *op;
       if (qep_tab)
       {
-        DBUG_ASSERT(!join_tab);
+        assert(!join_tab);
         qtab= &qep_tab[i];
         op= qtab->op;
         table= qtab->table();
@@ -2659,7 +2677,7 @@ ORDER *simple_remove_const(ORDER *order, Item *where)
   ORDER *first= NULL, *prev= NULL;
   for (; order; order= order->next)
   {
-    DBUG_ASSERT(!order->item[0]->with_sum_func); // should never happen
+    assert(!order->item[0]->with_sum_func); // should never happen
     if (!const_expression_in_where(where, order->item[0]))
     {
       if (!first)
@@ -2721,7 +2739,7 @@ test_if_equality_guarantees_uniqueness(Item *l, Item *r)
 
 static bool equal(Item *i1, Item *i2, Field *f2)
 {
-  DBUG_ASSERT((i2 == NULL) ^ (f2 == NULL));
+  assert((i2 == NULL) ^ (f2 == NULL));
 
   if (i2 != NULL)
     return i1->eq(i2, 1);
@@ -2751,7 +2769,7 @@ bool
 const_expression_in_where(Item *cond, Item *comp_item, Field *comp_field,
                           Item **const_item)
 {
-  DBUG_ASSERT((comp_item == NULL) ^ (comp_field == NULL));
+  assert((comp_item == NULL) ^ (comp_field == NULL));
 
   Item *intermediate= NULL;
   if (const_item == NULL)
@@ -2997,7 +3015,7 @@ calc_group_buffer(JOIN *join,ORDER *group)
       }
       default:
         /* This case should never be choosen */
-        DBUG_ASSERT(0);
+        assert(0);
         my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
       }
     }
@@ -3418,8 +3436,8 @@ bool JOIN::add_having_as_tmp_table_cond(uint curr_tmp_table)
       items, which could thus still have other tables in their
       used_tables() information.
     */
-    DBUG_ASSERT(having_cond->has_subquery() ||
-                !(having_cond->used_tables() & ~(1 | PSEUDO_TABLE_BITS)));
+    assert(having_cond->has_subquery() ||
+           !(having_cond->used_tables() & ~(1 | PSEUDO_TABLE_BITS)));
     used_tables= 1;
   }
 
@@ -3499,7 +3517,7 @@ bool JOIN::add_having_as_tmp_table_cond(uint curr_tmp_table)
 
 bool JOIN::make_tmp_tables_info()
 {
-  DBUG_ASSERT(!join_tab);
+  assert(!join_tab);
   List<Item> *curr_all_fields= &all_fields;
   List<Item> *curr_fields_list= &fields_list;
   bool materialize_join= false;
@@ -3550,11 +3568,13 @@ bool JOIN::make_tmp_tables_info()
     /*
       Create temporary table on first execution of this join.
       (Will be reused if this is a subquery that is executed several times.)
+      Don't use tmp table grouping for json aggregate funcs as it's
+      very ineffective.
     */
     init_items_ref_array();
 
     ORDER_with_src tmp_group;
-    if (!simple_group && !(test_flags & TEST_NO_KEY_GROUP))
+    if (!simple_group && !(test_flags & TEST_NO_KEY_GROUP) && !with_json_agg)
       tmp_group= group_list;
       
     tmp_table_param.hidden_field_count= 
@@ -3575,14 +3595,14 @@ bool JOIN::make_tmp_tables_info()
       Exception: LooseScan strategy for semijoin requires
       sorted access even if final result is not to be sorted.
     */
-    DBUG_ASSERT(
-      !(ordered_index_usage == ordered_index_void &&
-        !plan_is_const() && 
-        qep_tab[const_tables].position()->sj_strategy != SJ_OPT_LOOSE_SCAN &&
-        qep_tab[const_tables].use_order()));
+    assert(
+           !(ordered_index_usage == ordered_index_void &&
+             !plan_is_const() && 
+             qep_tab[const_tables].position()->sj_strategy != SJ_OPT_LOOSE_SCAN &&
+             qep_tab[const_tables].use_order()));
 
     /* Change sum_fields reference to calculated fields in tmp_table */
-    DBUG_ASSERT(items1.is_null());
+    assert(items1.is_null());
     items1= select_lex->ref_ptr_array_slice(2);
     if (sort_and_group || qep_tab[curr_tmp_table].table()->group ||
         tmp_table_param.precomputed_group_by)
@@ -3722,7 +3742,7 @@ bool JOIN::make_tmp_tables_info()
           DBUG_RETURN(true);
       }
       // No sum funcs anymore
-      DBUG_ASSERT(items2.is_null());
+      assert(items2.is_null());
 
       items2= select_lex->ref_ptr_array_slice(3);
       if (change_to_use_tmp_fields(thd, items2,
@@ -3780,9 +3800,9 @@ bool JOIN::make_tmp_tables_info()
         or end_write_group()) if JOIN::group is set to false.
       */
       // the temporary table was explicitly requested
-      DBUG_ASSERT(select_lex->active_options() & OPTION_BUFFER_RESULT);
+      assert(select_lex->active_options() & OPTION_BUFFER_RESULT);
       // the temporary table does not have a grouping expression
-      DBUG_ASSERT(!qep_tab[curr_tmp_table].table()->group);
+      assert(!qep_tab[curr_tmp_table].table()->group);
     }
     calc_group_buffer(this, group_list);
     count_field_types(select_lex, &tmp_table_param, *curr_all_fields, false,
@@ -3794,7 +3814,7 @@ bool JOIN::make_tmp_tables_info()
     if (make_group_fields(this, this))
       DBUG_RETURN(true);
 
-    DBUG_ASSERT(items3.is_null());
+    assert(items3.is_null());
 
     if (items0.is_null())
       init_items_ref_array();
@@ -4101,7 +4121,7 @@ test_if_cheaper_ordering(const JOIN_TAB *tab, ORDER *order, TABLE *table,
       else
         refkey_rows_estimate= 1.0;              // No index statistics
     }
-    DBUG_ASSERT(refkey_rows_estimate >= 1.0);    
+    assert(refkey_rows_estimate >= 1.0);    
   }
 
   for (nr=0; nr < table->s->keys ; nr++)
@@ -4117,7 +4137,7 @@ test_if_cheaper_ordering(const JOIN_TAB *tab, ORDER *order, TABLE *table,
         key (where "ordering key" is a key that will return rows
         in the order required by ORDER BY).
       */
-      DBUG_ASSERT (ref_key != (int) nr);
+      assert (ref_key != (int) nr);
 
       bool is_covering= table->covering_keys.is_set(nr) ||
                         (nr == table->s->primary_key &&
@@ -4352,7 +4372,7 @@ uint get_index_for_order(ORDER *order, QEP_TAB *tab,
         }
       }
     }
-    DBUG_ASSERT(0);
+    assert(0);
   }
   else if (limit != HA_POS_ERROR)
   { // check if some index scan & LIMIT is more efficient than filesort
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 95f525672b04..1ad39d5ef6ad 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1,16 +1,23 @@
 #ifndef SQL_SELECT_INCLUDED
 #define SQL_SELECT_INCLUDED
 
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -534,8 +541,8 @@ class Filesort;
    cells, and best_ref may not even have been allocated.
 */
 #define ASSERT_BEST_REF_IN_JOIN_ORDER(join) \
-  do { DBUG_ASSERT(join->tables == 0 ||                         \
-                   (join->best_ref && !join->join_tab)); } while(0)
+  do { assert(join->tables == 0 ||                              \
+              (join->best_ref && !join->join_tab)); } while(0)
 
 
 /**
@@ -781,7 +788,7 @@ class Join_tab_compare_default :
   bool operator()(const JOIN_TAB *jt1, const JOIN_TAB *jt2)
   {
     // Sorting distinct tables, so a table should not be compared with itself
-    DBUG_ASSERT(jt1 != jt2);
+    assert(jt1 != jt2);
 
     if (jt1->dependent & jt2->table_ref->map())
       return false;
@@ -819,15 +826,15 @@ class Join_tab_compare_straight :
   bool operator()(const JOIN_TAB *jt1, const JOIN_TAB *jt2)
   {
     // Sorting distinct tables, so a table should not be compared with itself
-    DBUG_ASSERT(jt1 != jt2);
+    assert(jt1 != jt2);
 
     /*
       We don't do subquery flattening if the parent or child select has
       STRAIGHT_JOIN modifier. It is complicated to implement and the semantics
       is hardly useful.
     */
-    DBUG_ASSERT(!jt1->emb_sj_nest);
-    DBUG_ASSERT(!jt2->emb_sj_nest);
+    assert(!jt1->emb_sj_nest);
+    assert(!jt2->emb_sj_nest);
 
     if (jt1->dependent & jt2->table_ref->map())
       return false;
@@ -855,7 +862,7 @@ class Join_tab_compare_embedded_first :
   bool operator()(const JOIN_TAB *jt1, const JOIN_TAB *jt2)
   {
     // Sorting distinct tables, so a table should not be compared with itself
-    DBUG_ASSERT(jt1 != jt2);
+    assert(jt1 != jt2);
 
     if (jt1->emb_sj_nest == emb_nest && jt2->emb_sj_nest != emb_nest)
       return true;
@@ -968,7 +975,7 @@ type_conversion_status_to_store_key (type_conversion_status ts)
   case TYPE_ERR_OOM:
     return store_key::STORE_KEY_FATAL;
   default:
-    DBUG_ASSERT(false); // not possible
+    assert(false); // not possible
   }
 
   return store_key::STORE_KEY_FATAL;
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index 8594e4a3f4ed..2daf66f50293 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -364,9 +371,7 @@ static bool close_cached_connection_tables(THD *thd,
   TABLE_LIST tmp, *tables= NULL;
   bool result= FALSE;
   DBUG_ENTER("close_cached_connection_tables");
-  DBUG_ASSERT(thd);
-
-  memset(&tmp, 0, sizeof(TABLE_LIST));
+  assert(thd);
 
   mysql_mutex_lock(&LOCK_open);
 
diff --git a/sql/sql_servers.h b/sql/sql_servers.h
index 796a665eb76a..778a77893ee7 100644
--- a/sql/sql_servers.h
+++ b/sql/sql_servers.h
@@ -1,16 +1,23 @@
 #ifndef SQL_SERVERS_INCLUDED
 #define SQL_SERVERS_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 8c8963dcb4c1..1f1f90cdf3ba 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -183,7 +190,7 @@ static my_bool show_plugins(THD *thd, plugin_ref plugin,
     table->field[2]->store(STRING_WITH_LEN("DISABLED"), cs);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   table->field[3]->store(plugin_type_names[plug->type].str,
@@ -480,7 +487,7 @@ ignore_db_dirs_process_additions()
   size_t len;
   char *ptr;
 
-  DBUG_ASSERT(opt_ignore_db_dirs == NULL);
+  assert(opt_ignore_db_dirs == NULL);
 
   if (my_hash_init(&ignore_db_dirs_hash, 
                    lower_case_table_names ?
@@ -550,10 +557,10 @@ ignore_db_dirs_process_additions()
   if (ptr > opt_ignore_db_dirs)
   {
     ptr--;
-    DBUG_ASSERT(*ptr == ',');
+    assert(*ptr == ',');
   }
   /* make sure the string is terminated */
-  DBUG_ASSERT(ptr - opt_ignore_db_dirs <= (ptrdiff_t) len);
+  assert(ptr - opt_ignore_db_dirs <= (ptrdiff_t) len);
   *ptr= 0;
 
   /* 
@@ -627,8 +634,6 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
 
 
 
-  memset(&table_list, 0, sizeof(table_list));
-
   if (!(dirp = my_dir(path,MYF(dir ? MY_WANT_STAT : 0))))
   {
     if (my_errno() == ENOENT)
@@ -701,13 +706,21 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
     }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+    char tname[NAME_LEN + 1];
     /* Don't show tables where we don't have any privileges */
     if (db && !(col_access & TABLE_ACLS))
     {
       table_list.db= (char*) db;
       table_list.db_length= strlen(db);
-      table_list.table_name= uname;
       table_list.table_name_length= file_name_len;
+      if (lower_case_table_names == 2)
+      {
+        strcpy(tname, uname);
+        my_casedn_str(files_charset_info, tname);
+        table_list.table_name= tname;
+      }
+      else
+        table_list.table_name= uname;
       table_list.grant.privilege=col_access;
       if (check_grant(thd, TABLE_ACLS, &table_list, TRUE, 1, TRUE))
         continue;
@@ -1049,14 +1062,13 @@ bool mysqld_show_create_db(THD *thd, char *dbname,
     my_casedn_str(files_charset_info, dbname);
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  if (sctx->check_access(DB_ACLS))
-    db_access=DB_ACLS;
+  if (sctx->check_access(DB_OP_ACLS))
+    db_access = DB_OP_ACLS;
   else
     db_access= (acl_get(sctx->host().str, sctx->ip().str,
                         sctx->priv_user().str, dbname, 0) |
                 sctx->master_access());
-  if (!(db_access & DB_ACLS) && check_grant_db(thd,dbname))
-  {
+  if (!(db_access & DB_OP_ACLS) && check_grant_db(thd, dbname, true)) {
     my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
              sctx->priv_user().str, sctx->host_or_ip().str, dbname);
     query_logger.general_log_print(thd,COM_INIT_DB,ER(ER_DBACCESS_DENIED_ERROR),
@@ -1350,7 +1362,7 @@ static void append_directory(THD *thd, String *packet, const char *dir_type,
 */
 static bool print_on_update_clause(Field *field, String *val, bool lcase)
 {
-  DBUG_ASSERT(val->charset()->mbminlen == 1);
+  assert(val->charset()->mbminlen == 1);
   val->length(0);
   if (field->has_update_default_function())
   {
@@ -1627,7 +1639,7 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
       packet->append(STRING_WITH_LEN(" /*!50606 STORAGE MEMORY */"));
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
 
@@ -1641,7 +1653,7 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
       packet->append(STRING_WITH_LEN(" /*!50606 COLUMN_FORMAT DYNAMIC */"));
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
 
@@ -1670,7 +1682,6 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
   }
 
   key_info= table->key_info;
-  memset(&create_info, 0, sizeof(create_info));
   /* Allow update_create_info to update row type */
   create_info.row_type= share->row_type;
   file->update_create_info(&create_info);
@@ -1883,11 +1894,32 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
       packet->append(STRING_WITH_LEN(" CHECKSUM=1"));
     if (share->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
       packet->append(STRING_WITH_LEN(" DELAY_KEY_WRITE=1"));
-    if (create_info.row_type != ROW_TYPE_DEFAULT)
+
+    /*
+      If 'show_create_table_verbosity' is enabled, the row format would
+      be displayed in the output of SHOW CREATE TABLE even if default
+      row format is used. Otherwise only the explicitly mentioned
+      row format would be displayed.
+    */
+    if (thd->variables.show_create_table_verbosity)
+    {
+      enum row_type row_type = file->get_row_type();
+      packet->append(STRING_WITH_LEN(" ROW_FORMAT="));
+      if (row_type == ROW_TYPE_NOT_USED || row_type == ROW_TYPE_DEFAULT)
+      {
+        row_type= ((share->db_options_in_use & HA_OPTION_COMPRESS_RECORD) ?
+                   ROW_TYPE_COMPRESSED :
+                   (share->db_options_in_use & HA_OPTION_PACK_RECORD) ?
+                   ROW_TYPE_DYNAMIC : ROW_TYPE_FIXED);
+      }
+      packet->append(ha_row_type[(uint) row_type]);
+    }
+    else if (create_info.row_type != ROW_TYPE_DEFAULT)
     {
       packet->append(STRING_WITH_LEN(" ROW_FORMAT="));
       packet->append(ha_row_type[(uint) create_info.row_type]);
     }
+
     if (table->s->key_block_size)
     {
       char *end;
@@ -1988,8 +2020,8 @@ static void store_key_options(THD *thd, String *packet, TABLE *table,
       end= longlong10_to_str(key_info->block_size, buff, 10);
       packet->append(buff, (uint) (end - buff));
     }
-    DBUG_ASSERT(MY_TEST(key_info->flags & HA_USES_COMMENT) == 
-               (key_info->comment.length > 0));
+    assert(MY_TEST(key_info->flags & HA_USES_COMMENT) == 
+           (key_info->comment.length > 0));
     if (key_info->flags & HA_USES_COMMENT)
     {
       packet->append(STRING_WITH_LEN(" COMMENT "));
@@ -2037,7 +2069,7 @@ static void append_algorithm(TABLE_LIST *table, String *buff)
     buff->append(STRING_WITH_LEN("MERGE "));
     break;
   default:
-    DBUG_ASSERT(0); // never should happen
+    assert(0); // never should happen
   }
 }
 
@@ -2281,9 +2313,28 @@ class List_process_list : public Do_THD_Impl
     /* INFO */
     mysql_mutex_lock(&inspect_thd->LOCK_thd_query);
     {
-      const char *query_str= inspect_thd->query().str;
-      size_t query_length= inspect_thd->query().length;
+      const char *query_str= NULL;
+      size_t query_length= 0;
+
+      /* If a rewritten query exists, use that. */
+      if (inspect_thd->rewritten_query().length() > 0) {
+        query_length = inspect_thd->rewritten_query().length();
+        query_str = inspect_thd->rewritten_query().ptr();
+      }
+      /*
+        Otherwise, use the original query. If the query contains password in
+        plain text, we have the query re-written immediately after parsing and
+        password string is replaced. However, there is a unsafe window before
+        rewrite is done and in such case we should not display the plain text
+        password.
+      */
+      else if (inspect_thd->safe_to_display()) {
+        query_length = inspect_thd->query().length;
+        query_str = inspect_thd->query().str;
+      }
+
 #ifndef EMBEDDED_LIBRARY
+      /* In the stand-alone server, add "PLUGIN" as needed. */
       String buf;
       if (inspect_thd->is_a_srv_session())
       {
@@ -2297,6 +2348,7 @@ class List_process_list : public Do_THD_Impl
       }
       /* No else. We need fall-through */
 #endif
+      /* If we managed to create query info, set a copy on thd_info. */
       if (query_str)
       {
         const size_t width= min<size_t>(m_max_query_length, query_length);
@@ -2486,9 +2538,28 @@ class Fill_process_list : public Do_THD_Impl
     /* INFO */
     mysql_mutex_lock(&inspect_thd->LOCK_thd_query);
     {
-      const char *query_str= inspect_thd->query().str;
-      size_t query_length= inspect_thd->query().length;
+      const char *query_str= NULL;
+      size_t query_length= 0;
+
+      /* If a rewritten query exists, use that. */
+      if (inspect_thd->rewritten_query().length() > 0) {
+        query_length = inspect_thd->rewritten_query().length();
+        query_str = inspect_thd->rewritten_query().ptr();
+      }
+      /*
+        Otherwise, use the original query. If the query contains password in
+        plain text, we have the query re-written immediately after parsing and
+        password string is replaced. However, there is a unsafe window before
+        rewrite is done and in such case we should not display the plain text
+        password.
+      */
+      else if (inspect_thd->safe_to_display()) {
+        query_length = inspect_thd->query().length;
+        query_str = inspect_thd->query().str;
+      }
+
 #ifndef EMBEDDED_LIBRARY
+      /* In the stand-alone server, add "PLUGIN" as needed. */
       String buf;
       if (inspect_thd->is_a_srv_session())
       {
@@ -2502,6 +2573,7 @@ class Fill_process_list : public Do_THD_Impl
       }
       /* No else. We need fall-through */
 #endif
+      /* If we managed to create query info, set a copy on thd_info. */
       if (query_str)
       {
         const size_t width= min<size_t>(PROCESS_LIST_INFO_WIDTH, query_length);
@@ -2606,7 +2678,7 @@ int add_status_vars(const SHOW_VAR *list)
     while (list->name)
       all_status_vars.push_back(*list++);
   }
-  catch (std::bad_alloc)
+  catch (const std::bad_alloc &)
   {
     my_error(ER_OUTOFMEMORY, MYF(ME_FATALERROR),
              static_cast<int>(sizeof(Status_var_array::value_type)));
@@ -2961,7 +3033,7 @@ const char* get_one_variable_ext(THD *running_thd, THD *target_thd,
     case SHOW_SYS:          /* Cannot happen */
 
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
   }
 
@@ -2969,7 +3041,7 @@ const char* get_one_variable_ext(THD *running_thd, THD *target_thd,
   /* Some callers do not use the result. */
   if (charset != NULL)
   {
-    DBUG_ASSERT(value_charset != NULL);
+    assert(value_charset != NULL);
     *charset= value_charset;
   }
   return pos;
@@ -3756,7 +3828,27 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
       }
     }
     else
-    {    
+    {
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+      if (!(thd->col_access & TABLE_ACLS))
+      {
+        TABLE_LIST table_list;
+
+        /*
+          Database name and table name have already been converted to lowercase
+          if lower_case_table_names is > 0. We can safely use lookup_field_vals
+          here.
+        */
+        table_list.db= db_name->str;
+        table_list.db_length= db_name->length;
+        table_list.table_name_length= lookup_field_vals->table_value.length;
+        table_list.table_name= lookup_field_vals->table_value.str;
+        table_list.grant.privilege=thd->col_access;
+
+        if (check_grant(thd, TABLE_ACLS, &table_list, TRUE, 1, TRUE))
+         return 2;
+      }
+#endif
       if (table_names->push_back(&lookup_field_vals->table_value))
         return 1;
       /*
@@ -3997,7 +4089,7 @@ fill_schema_table_by_open(THD *thd, MEM_ROOT *mem_root,
   lex_end(thd->lex);
 
   // Free items, before restoring backup_arena below.
-  DBUG_ASSERT(i_s_arena.free_list == NULL);
+  assert(i_s_arena.free_list == NULL);
   thd->free_items();
 
   /*
@@ -4068,7 +4160,7 @@ static int fill_schema_table_names(THD *thd, TABLE *table,
                                system_charset_info);
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
       }
     if (thd->is_error() &&
         thd->get_stmt_da()->mysql_errno() == ER_NO_SUCH_TABLE)
@@ -4232,10 +4324,8 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
   size_t key_length;
   char db_name_buff[NAME_LEN + 1], table_name_buff[NAME_LEN + 1];
 
-  memset(&table_list, 0, sizeof(TABLE_LIST));
-
-  DBUG_ASSERT(db_name->length <= NAME_LEN);
-  DBUG_ASSERT(table_name->length <= NAME_LEN);
+  assert(db_name->length <= NAME_LEN);
+  assert(table_name->length <= NAME_LEN);
 
   if (lower_case_table_names)
   {
@@ -4279,7 +4369,7 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
       lock and deadlocks can occur due to waiting for it to go away.
       So instead of waiting skip this table with an appropriate warning.
     */
-    DBUG_ASSERT(can_deadlock);
+    assert(can_deadlock);
 
     push_warning_printf(thd, Sql_condition::SL_WARNING,
                         ER_WARN_I_S_SKIPPED_TABLE,
@@ -4299,7 +4389,6 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
     {
       TABLE tbl;
 
-      memset(&tbl, 0, sizeof(TABLE));
       init_sql_alloc(key_memory_table_triggers_list,
                      &tbl.mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
 
@@ -4370,6 +4459,13 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
 
     if (!view_open_result)
     {
+      if (table_list.is_view())
+      {
+        // See comments in tdc_open_view() for explanation.
+        if (!table_list.prelocking_placeholder &&
+            table_list.prepare_security(thd))
+          goto end;
+      }
       // Actual view query is not needed, just indicate that this is a view:
       table_list.set_view_query((LEX *) 1);
       res= schema_table->process_table(thd, &table_list, table,
@@ -4380,7 +4476,6 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
 
   {
     TABLE tbl;
-    memset(&tbl, 0, sizeof(TABLE));
     init_sql_alloc(key_memory_table_triggers_list,
                    &tbl.mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
 
@@ -4391,8 +4486,10 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
       tbl.s= share;
       table_list.table= &tbl;
       table_list.set_view_query((LEX*) share->is_view);
+      mysql_mutex_unlock(&LOCK_open);
       res= schema_table->process_table(thd, &table_list, table,
                                        res, db_name, table_name);
+      mysql_mutex_lock(&LOCK_open);
       closefrm(&tbl, 0);
       free_root(&tbl.mem_root, MYF(0));
       my_free((void *) tbl.alias);
@@ -4423,7 +4520,7 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
     We don't have any tables open since we took backup, so rolling back to
     savepoint is safe.
   */
-  DBUG_ASSERT(thd->open_tables == NULL);
+  assert(thd->open_tables == NULL);
   thd->mdl_context.rollback_to_savepoint(open_tables_state_backup->mdl_system_tables_svp);
   thd->clear_error();
   return res;
@@ -4626,14 +4723,14 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, Item *cond)
   it.rewind(); /* To get access to new elements in basis list */
   while ((db_name= it++))
   {
-    DBUG_ASSERT(db_name->length <= NAME_LEN);
+    assert(db_name->length <= NAME_LEN);
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-    if (!(check_access(thd, SELECT_ACL, db_name->str,
-                       &thd->col_access, NULL, 0, 1) ||
+    if (!(check_access(thd, SELECT_ACL, db_name->str, &thd->col_access, NULL, 0,
+                       1) ||
           (!thd->col_access && check_grant_db(thd, db_name->str))) ||
-        sctx->check_access(DB_ACLS | SHOW_DB_ACL, true) ||
-        acl_get(sctx->host().str, sctx->ip().str,
-                sctx->priv_user().str, db_name->str, 0))
+        sctx->check_access(DB_OP_ACLS | SHOW_DB_ACL, true) ||
+        acl_get(sctx->host().str, sctx->ip().str, sctx->priv_user().str,
+                db_name->str, 0))
 #endif
     {
       List<LEX_STRING> table_names;
@@ -4648,7 +4745,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, Item *cond)
       List_iterator_fast<LEX_STRING> it_files(table_names);
       while ((table_name= it_files++))
       {
-        DBUG_ASSERT(table_name->length <= NAME_LEN);
+        assert(table_name->length <= NAME_LEN);
 	restore_record(table, s->default_values);
         table->field[schema_table->idx_field1]->
           store(db_name->str, db_name->length, system_charset_info);
@@ -4819,7 +4916,7 @@ int fill_schema_schemata(THD *thd, TABLE_LIST *tables, Item *cond)
   List_iterator_fast<LEX_STRING> it(db_names);
   while ((db_name=it++))
   {
-    DBUG_ASSERT(db_name->length <= NAME_LEN);
+    assert(db_name->length <= NAME_LEN);
     if (with_i_schema)       // information schema name is always first in list
     {
       if (store_schema_shemata(thd, table, db_name,
@@ -4829,10 +4926,10 @@ int fill_schema_schemata(THD *thd, TABLE_LIST *tables, Item *cond)
       continue;
     }
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-    if (sctx->check_access(DB_ACLS | SHOW_DB_ACL, true) ||
-	acl_get(sctx->host().str, sctx->ip().str,
-                sctx->priv_user().str, db_name->str, 0) ||
-                !check_grant_db(thd, db_name->str))
+    if (sctx->check_access(DB_OP_ACLS | SHOW_DB_ACL, true) ||
+        acl_get(sctx->host().str, sctx->ip().str, sctx->priv_user().str,
+                db_name->str, 0) ||
+        !check_grant_db(thd, db_name->str))
 #endif
     {
       load_db_opt_by_name(thd, db_name->str, &create);
@@ -5663,7 +5760,6 @@ bool store_schema_params(THD *thd, TABLE *table, TABLE *proc_table,
   bool free_sp_head;
   DBUG_ENTER("store_schema_params");
 
-  memset(&tbl, 0, sizeof(TABLE));
   (void) build_table_filename(path, sizeof(path), "", "", "", 0);
   init_tmp_table_share(thd, &share, "", 0, "", path);
 
@@ -5876,7 +5972,6 @@ bool store_schema_proc(THD *thd, TABLE *table, TABLE *proc_table,
           Field *field;
           Create_field *field_def= &sp->m_return_field_def;
 
-          memset(&tbl, 0, sizeof(TABLE));
           (void) build_table_filename(path, sizeof(path), "", "", "", 0);
           init_tmp_table_share(thd, &share, "", 0, "", path);
           field= make_field(&share, (uchar*) 0, field_def->length,
@@ -5961,7 +6056,6 @@ int fill_schema_proc(THD *thd, TABLE_LIST *tables, Item *cond)
   strxmov(definer, thd->security_context()->priv_user().str, "@",
           thd->security_context()->priv_host().str, NullS);
   /* We use this TABLE_LIST instance only for checking of privileges. */
-  memset(&proc_tables, 0, sizeof(proc_tables));
   proc_tables.db= (char*) "mysql";
   proc_tables.db_length= 5;
   proc_tables.table_name= proc_tables.alias= (char*) "proc";
@@ -6104,8 +6198,8 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables,
         else
           table->field[14]->store("", 0, cs);
         table->field[14]->set_notnull();
-        DBUG_ASSERT(MY_TEST(key_info->flags & HA_USES_COMMENT) ==
-                   (key_info->comment.length > 0));
+        assert(MY_TEST(key_info->flags & HA_USES_COMMENT) ==
+               (key_info->comment.length > 0));
         if (key_info->flags & HA_USES_COMMENT)
           table->field[15]->store(key_info->comment.str, 
                                   key_info->comment.length, cs);
@@ -6149,7 +6243,6 @@ static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
         {
           TABLE_LIST table_list;
           uint view_access;
-          memset(&table_list, 0, sizeof(table_list));
           table_list.db= tables->db;
           table_list.table_name= tables->table_name;
           table_list.grant.privilege= thd->col_access;
@@ -6682,6 +6775,10 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
     table->field[18]->store_time(&time);
     table->field[18]->set_notnull();
   }
+  else
+  {
+    table->field[18]->set_null();
+  }
   if (stat_info.update_time)
   {
     thd->variables.time_zone->gmt_sec_to_TIME(&time,
@@ -6689,6 +6786,10 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
     table->field[19]->store_time(&time);
     table->field[19]->set_notnull();
   }
+  else
+  {
+    table->field[19]->set_null();
+  }
   if (stat_info.check_time)
   {
     thd->variables.time_zone->gmt_sec_to_TIME(&time,
@@ -6696,6 +6797,10 @@ static void store_schema_partitions_record(THD *thd, TABLE *schema_table,
     table->field[20]->store_time(&time);
     table->field[20]->set_notnull();
   }
+  else
+  {
+    table->field[20]->set_null();
+  }
   if (file->ha_table_flags() & (ulong) HA_HAS_CHECKSUM)
   {
     table->field[21]->store((longlong) check_sum, TRUE);
@@ -6840,7 +6945,7 @@ static int get_schema_partitions_record(THD *thd, TABLE_LIST *tables,
       table->field[7]->store(tmp_res.ptr(), tmp_res.length(), cs);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR));
       DBUG_RETURN(1);
     }
@@ -7137,7 +7242,7 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table)
       sch_table->field[ISE_STATUS]->store(STRING_WITH_LEN("DISABLED"), scs);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
   sch_table->field[ISE_ORIGINATOR]->store(et.originator, TRUE);
 
@@ -7150,11 +7255,11 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table)
                                 store(STRING_WITH_LEN("PRESERVE"), scs);
     
   number_to_datetime(et.created, &time, 0, &not_used);
-  DBUG_ASSERT(not_used==0);
+  assert(not_used==0);
   sch_table->field[ISE_CREATED]->store_time(&time);
 
   number_to_datetime(et.modified, &time, 0, &not_used);
-  DBUG_ASSERT(not_used==0);
+  assert(not_used==0);
   sch_table->field[ISE_LAST_ALTERED]->store_time(&time);
 
   if (et.last_executed)
@@ -7283,7 +7388,7 @@ int fill_variables(THD *thd, TABLE_LIST *tables, Item *cond)
   }
   else
   {
-    DBUG_ASSERT(schema_table_idx == SCH_SESSION_VARIABLES);
+    assert(schema_table_idx == SCH_SESSION_VARIABLES);
     option_type= OPT_SESSION;
   }
 
@@ -7381,7 +7486,7 @@ int fill_status(THD *thd, TABLE_LIST *tables, Item *cond)
   }
   else
   {
-    DBUG_ASSERT(schema_table_idx == SCH_SESSION_STATUS);
+    assert(schema_table_idx == SCH_SESSION_STATUS);
     option_type= OPT_SESSION;
     status_var_ptr= &thd->status_var;
   }
@@ -7687,7 +7792,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
       break;
     default:
       /* Don't let unimplemented types pass through. Could be a grave error. */
-      DBUG_ASSERT(fields_info->field_type == MYSQL_TYPE_STRING);
+      assert(fields_info->field_type == MYSQL_TYPE_STRING);
 
       if (!(item= new Item_empty_string("", fields_info->field_length, cs)))
       {
@@ -8121,7 +8226,7 @@ static bool do_fill_table(THD *thd,
     QEP_TAB::sort_table() (=filesort, for ORDER BY), so we can trust
     that condition() is complete, has not been zeroed by filesort:
   */
-  DBUG_ASSERT(qep_tab->condition() == qep_tab->condition_optim());
+  assert(qep_tab->condition() == qep_tab->condition_optim());
 
   bool res= table_list->schema_table->fill_table(
     thd, table_list, qep_tab->condition());
@@ -8293,6 +8398,9 @@ int hton_fill_schema_table(THD *thd, TABLE_LIST *tables, Item *cond)
   args.tables= tables;
   args.cond= cond;
 
+  if (check_global_access(thd, PROCESS_ACL))
+    DBUG_RETURN(1);
+
   plugin_foreach(thd, run_hton_fill_schema_table,
                  MYSQL_STORAGE_ENGINE_PLUGIN, &args);
 
diff --git a/sql/sql_show.h b/sql/sql_show.h
index ee003b72efb3..b4a345c76eec 100644
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_show_processlist.cc b/sql/sql_show_processlist.cc
new file mode 100644
index 000000000000..bb6f07f8c774
--- /dev/null
+++ b/sql/sql_show_processlist.cc
@@ -0,0 +1,289 @@
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <stddef.h>
+
+#include "sql_show_processlist.h"
+
+#include "auth/auth_acls.h"
+#include "debug_sync.h"
+#include "item_cmpfunc.h"  // Item_func_like
+#include "item_func.h"     // Item_func_connection_id
+#include "m_string.h"      // STRING_WITH_LEN
+#include "mem_root_array.h"
+#include "parse_tree_items.h"  // PTI_simple_ident_ident
+#include "parse_tree_nodes.h"  // PT_select_item_list
+#include "sql_class.h"         // THD
+#include "sql_const.h"         // PROCESS_LIST_WIDTH
+#include "sql_lex.h"           // Query_options
+#include "sql_parse.h"         // check_table_access
+#include "sql_string.h"
+#include "strfunc.h"
+
+bool pfs_processlist_enabled = false;
+
+static const LEX_STRING field_id = {C_STRING_WITH_LEN("ID")};
+static const LEX_STRING alias_id = {C_STRING_WITH_LEN("Id")};
+static const LEX_STRING field_user = {C_STRING_WITH_LEN("USER")};
+static const LEX_STRING alias_user = {C_STRING_WITH_LEN("User")};
+static const LEX_STRING field_host = {C_STRING_WITH_LEN("HOST")};
+static const LEX_STRING alias_host = {C_STRING_WITH_LEN("Host")};
+static const LEX_STRING field_db = {C_STRING_WITH_LEN("DB")};
+static const LEX_STRING alias_db = {C_STRING_WITH_LEN("db")};
+static const LEX_STRING field_command = {C_STRING_WITH_LEN("COMMAND")};
+static const LEX_STRING alias_command = {C_STRING_WITH_LEN("Command")};
+static const LEX_STRING field_time = {C_STRING_WITH_LEN("TIME")};
+static const LEX_STRING alias_time = {C_STRING_WITH_LEN("Time")};
+static const LEX_STRING field_state = {C_STRING_WITH_LEN("STATE")};
+static const LEX_STRING alias_state = {C_STRING_WITH_LEN("State")};
+static const LEX_STRING field_info = {C_STRING_WITH_LEN("INFO")};
+static const LEX_STRING alias_info = {C_STRING_WITH_LEN("Info")};
+
+static const LEX_STRING pfs = {C_STRING_WITH_LEN("performance_schema")};
+static const LEX_STRING table_processlist = {C_STRING_WITH_LEN("processlist")};
+
+static const Query_options options = {
+    0 /* query_spec_options */,
+    SELECT_LEX::SQL_CACHE_UNSPECIFIED /* sql_cache */
+};
+
+static const Select_lock_type lock_type = {
+    false,   /* is_set */
+    TL_READ, /* lock_type */
+    false    /* is_safe_to_cache_query */
+};
+
+/**
+  Build a replacement query for SHOW PROCESSLIST.
+  When the parser accepts the following syntax:
+
+  <code>
+    SHOW [FULL] PROCESSLIST
+  </code>
+
+  the parsed tree built for this query is in fact:
+
+  <code>
+  SELECT * FROM
+    (SELECT ID Id, USER User, HOST Host, DB db, COMMAND Command,
+       TIME Time, STATE State, LEFT(INFO, <info_len>) Info
+     FROM performance_schema.processlist)
+    AS show_processlist;
+  </code>
+
+  where @c info_len is 100 by default, otherwise 1024 for FULL PROCESSLIST.
+
+  MAINTAINER:
+  This code builds a parsed tree for a query.
+  Write the query to build in SQL first, then see turn_parser_debug_on()
+  in sql_yacc.yy to understand which grammar actions are needed to build
+  a parsed tree for this SQL query.
+*/
+
+static bool add_expression(const POS &pos, THD *thd,
+                           PT_select_item_list *item_list,
+                           const LEX_STRING &field, const LEX_STRING &alias) {
+  /* Field */
+  PTI_simple_ident_ident *ident;
+  ident = new (thd->mem_root) PTI_simple_ident_ident(pos, field);
+  if (ident == NULL) return true;
+
+  /* Alias */
+  PTI_expr_with_alias *expr;
+  expr = new (thd->mem_root) PTI_expr_with_alias(pos, ident, pos.cpp, alias);
+  if (expr == NULL) return true;
+
+  /* Add to item list */
+  item_list->push_back(expr);
+  return false;
+}
+
+bool build_processlist_query(const POS &pos, THD *thd, bool verbose) {
+  /* ... * ... */
+  Item *star = new (thd->mem_root) Item_asterisk(pos, NULL, NULL);
+  if (star == NULL) return true;
+
+  PT_select_item_list *item_list_star =
+      new (thd->mem_root) PT_select_item_list();
+  if (item_list_star == NULL) return true;
+
+  item_list_star->push_back(star);
+
+  /* SELECT * ... */
+  PT_select_options_and_item_list *select_options_and_item_list =
+      new (thd->mem_root)
+          PT_select_options_and_item_list(options, item_list_star);
+  if (select_options_and_item_list == NULL) return true;
+
+  LEX_STRING info_len;
+  /*
+    Default Info field length is 100. Verbose field length is limited to the
+    size of the INFO columns in the Performance Schema.
+  */
+  assert(PROCESS_LIST_WIDTH == 100);
+  if (verbose) {
+    if (!thd->make_lex_string(&info_len, "1024", 4, false)) return true;
+  } else {
+    if (!thd->make_lex_string(&info_len, "100", 3, false)) return true;
+  }
+
+  /* Id, User, Host, db, Command, Time, State */
+  PT_select_item_list *item_list = new (thd->mem_root) PT_select_item_list();
+  if (item_list == NULL) return true;
+
+  if (add_expression(pos, thd, item_list, field_id, alias_id)) return true;
+  if (add_expression(pos, thd, item_list, field_user, alias_user)) return true;
+  if (add_expression(pos, thd, item_list, field_host, alias_host)) return true;
+  if (add_expression(pos, thd, item_list, field_db, alias_db)) return true;
+  if (add_expression(pos, thd, item_list, field_command, alias_command))
+    return true;
+  if (add_expression(pos, thd, item_list, field_time, alias_time)) return true;
+  if (add_expression(pos, thd, item_list, field_state, alias_state))
+    return true;
+
+  /* ... INFO ... */
+  PTI_simple_ident_ident *ident_info =
+      new (thd->mem_root) PTI_simple_ident_ident(pos, field_info);
+  if (ident_info == NULL) return true;
+
+  /* Info length is either "100" or "1024" depending on verbose */
+  Item_int *item_info_len =
+      new (thd->mem_root) PTI_num_literal_num(pos, info_len);
+  if (item_info_len == NULL) return true;
+
+  /* ... LEFT(INFO, <info_len>) AS Info ...*/
+  Item_func_left *func_left =
+      new (thd->mem_root) Item_func_left(pos, ident_info, item_info_len);
+  if (func_left == NULL) return true;
+
+  PTI_expr_with_alias *expr_left = new (thd->mem_root)
+      PTI_expr_with_alias(pos, func_left, pos.cpp, alias_info);
+  if (expr_left == NULL) return true;
+
+  item_list->push_back(expr_left);
+
+  /*
+    make_table_list() might alter the database and table name strings. Create
+    copies and leave the original values unaltered.
+  */
+
+  /* ... performance_schema ... */
+  LEX_CSTRING tmp_db_name;
+  if (!thd->make_lex_string(&tmp_db_name, pfs.str, pfs.length, false))
+    return true;
+
+  /* ... processlist ... */
+  LEX_CSTRING tmp_table_processlist;
+  if (!thd->make_lex_string(&tmp_table_processlist, table_processlist.str,
+                            table_processlist.length, false))
+    return true;
+
+  /* ... performance_schema.processlist ... */
+  Table_ident *table_ident_processlist =
+      new (thd->mem_root) Table_ident(tmp_db_name, tmp_table_processlist);
+  if (table_ident_processlist == NULL) return true;
+
+  /* ... FROM performance_schema.processlist ... */
+  PT_table_factor_table_ident *table_factor_processlist = new (thd->mem_root)
+      PT_table_factor_table_ident(table_ident_processlist, NULL, NULL, NULL);
+  if (table_factor_processlist == NULL) return true;
+
+  PT_join_table_list *join_table_list_1 =
+      new (thd->mem_root) PT_join_table_list(pos, table_factor_processlist);
+  if (join_table_list_1 == NULL) return true;
+
+  PT_table_reference_list *table_reference_list_1 =
+      new (thd->mem_root) PT_table_reference_list(join_table_list_1);
+  if (table_reference_list_1 == NULL) return true;
+
+  PT_table_expression *table_expression = new (thd->mem_root)
+      PT_table_expression(table_reference_list_1, NULL, NULL, NULL, NULL, NULL,
+                          NULL, lock_type);
+  if (table_expression == NULL) return true;
+
+  /* ... FROM (SELECT ...) ... */
+  PT_table_factor_select_sym *table_factor_nested =
+      new (thd->mem_root) PT_table_factor_select_sym(
+          pos, NULL, options, item_list, table_expression);
+  if (table_factor_nested == NULL) return true;
+
+  PT_select_derived *derived =
+      new (thd->mem_root) PT_select_derived(pos, table_factor_nested);
+  if (derived == NULL) return true;
+
+  PT_select_derived_union_select *derived_union =
+      new (thd->mem_root) PT_select_derived_union_select(derived, NULL, pos);
+  if (derived_union == NULL) return true;
+
+  /* ... derived_table ... */
+  LEX_STRING derived_table_name;
+  if (!thd->make_lex_string(&derived_table_name, table_processlist.str,
+                            table_processlist.length, false))
+    return true;
+
+  PT_table_factor_parenthesis *table_factor_2 = new (thd->mem_root)
+      PT_table_factor_parenthesis(derived_union, &derived_table_name, pos);
+  if (table_factor_2 == NULL) return true;
+
+  PT_join_table_list *join_table_list_2 =
+      new (thd->mem_root) PT_join_table_list(pos, table_factor_2);
+  if (join_table_list_2 == NULL) return true;
+
+  PT_table_reference_list *table_reference_list_2 =
+      new (thd->mem_root) PT_table_reference_list(join_table_list_2);
+  if (table_reference_list_2 == NULL) return true;
+
+  PT_select_part2 *select_part2;
+  select_part2 = new (thd->mem_root) PT_select_part2(
+      select_options_and_item_list, /* select_options_and_item_list */
+      NULL,                         /* opt_into */
+      table_reference_list_2,       /* from_clause */
+      NULL,                         /* opt_where_clause */
+      NULL,                         /* opt_group_clause */
+      NULL,                         /* opt_having_clause */
+      NULL,                         /* opt_order_clause */
+      NULL,                         /* opt_limit_clause */
+      NULL,                         /* opt_procedure_analyse_clause */
+      NULL,                         /* opt_into */
+      lock_type);                   /* opt_select_lock_type */
+  if (select_part2 == NULL) return true;
+
+  PT_select_init2 *select_init2 =
+      new (thd->mem_root) PT_select_init2(NULL, select_part2, NULL);
+  if (select_init2 == NULL) return true;
+
+  PT_select *select =
+      new (thd->mem_root) PT_select(select_init2, SQLCOM_SELECT);
+  if (select == NULL) return true;
+
+  LEX *lex = thd->lex;
+  SELECT_LEX *current_select = lex->current_select();
+  Parse_context pc(thd, current_select);
+  if (thd->is_error()) return true;
+
+  if (select->contextualize(&pc)) return true;
+
+  /* contextualize sets to COM_SELECT */
+  lex->sql_command = SQLCOM_SHOW_PROCESSLIST;
+
+  return false;
+}
diff --git a/sql/sql_show_processlist.h b/sql/sql_show_processlist.h
new file mode 100644
index 000000000000..7211b82313f8
--- /dev/null
+++ b/sql/sql_show_processlist.h
@@ -0,0 +1,34 @@
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef SQL_SHOW_PROCESSLIST_H
+#define SQL_SHOW_PROCESSLIST_H
+
+#include "parse_tree_node_base.h"  // POS
+
+class THD;
+
+extern bool pfs_processlist_enabled;
+
+bool build_processlist_query(const POS &pos, THD *thd, bool verbose);
+
+#endif /* SQL_SHOW_PROCESSLIST_H */
diff --git a/sql/sql_show_status.cc b/sql/sql_show_status.cc
index ee5660442fef..6d46e915ce57 100644
--- a/sql/sql_show_status.cc
+++ b/sql/sql_show_status.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -83,7 +90,7 @@ build_query(const POS &pos,
 
 
   /* * */
-  Item *star= new (thd->mem_root) Item_field(pos, NULL, NULL, "*");
+  Item *star= new (thd->mem_root) Item_asterisk(pos, NULL, NULL);
 
   PT_select_item_list *item_list2;
   item_list2= new (thd->mem_root) PT_select_item_list();
diff --git a/sql/sql_show_status.h b/sql/sql_show_status.h
index 95cf6d86c8dd..e1da9c7c8c18 100644
--- a/sql/sql_show_status.h
+++ b/sql/sql_show_status.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc
index a67dd27c572c..73feb4824301 100644
--- a/sql/sql_signal.cc
+++ b/sql/sql_signal.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,7 +98,7 @@ void Sql_cmd_common_signal::assign_defaults(
 
 void Sql_cmd_common_signal::eval_defaults(THD *thd, Sql_condition *cond)
 {
-  DBUG_ASSERT(cond);
+  assert(cond);
 
   const char* sqlstate;
   bool set_defaults= (m_cond != 0);
@@ -101,16 +108,16 @@ void Sql_cmd_common_signal::eval_defaults(THD *thd, Sql_condition *cond)
     /*
       SIGNAL is restricted in sql_yacc.yy to only signal SQLSTATE conditions.
     */
-    DBUG_ASSERT(m_cond->type == sp_condition_value::SQLSTATE);
+    assert(m_cond->type == sp_condition_value::SQLSTATE);
     sqlstate= m_cond->sql_state;
     cond->set_returned_sqlstate(sqlstate);
   }
   else
     sqlstate= cond->returned_sqlstate();
 
-  DBUG_ASSERT(sqlstate);
+  assert(sqlstate);
   /* SQLSTATE class "00": illegal, rejected in the parser. */
-  DBUG_ASSERT(!is_sqlstate_completion(sqlstate));
+  assert(!is_sqlstate_completion(sqlstate));
 
   if (is_sqlstate_warning(sqlstate))
   {
@@ -190,7 +197,7 @@ static bool assign_fixed_string(MEM_ROOT *mem_root,
                                           & well_formed_error_pos,
                                           & cannot_convert_error_pos,
                                           & from_end_pos);
-      DBUG_ASSERT(dst_copied <= dst_len);
+      assert(dst_copied <= dst_len);
       dst_len= dst_copied; /* In case the copy truncated the data */
       dst_str[dst_copied]= '\0';
     }
@@ -418,15 +425,15 @@ bool Sql_cmd_signal::execute(THD *thd)
   thd->set_row_count_func(0);
   thd->get_stmt_da()->reset_condition_info(thd);
 
-  DBUG_ASSERT(thd->lex->query_tables == NULL);
+  assert(thd->lex->query_tables == NULL);
 
   eval_defaults(thd, &cond);
   if (eval_signal_informations(thd, &cond))
     DBUG_RETURN(true);
 
   /* SIGNAL should not signal SL_NOTE */
-  DBUG_ASSERT((cond.severity() == Sql_condition::SL_WARNING) ||
-              (cond.severity() == Sql_condition::SL_ERROR));
+  assert((cond.severity() == Sql_condition::SL_WARNING) ||
+         (cond.severity() == Sql_condition::SL_ERROR));
 
   Sql_condition *raised= thd->raise_condition(cond.mysql_errno(),
                                               cond.returned_sqlstate(),
@@ -522,9 +529,9 @@ bool Sql_cmd_resignal::execute(THD *thd)
   }
 
   // RESIGNAL should not resignal SL_NOTE
-  DBUG_ASSERT(!raised ||
-              (raised->severity() == Sql_condition::SL_WARNING) ||
-              (raised->severity() == Sql_condition::SL_ERROR));
+  assert(!raised ||
+         (raised->severity() == Sql_condition::SL_WARNING) ||
+         (raised->severity() == Sql_condition::SL_ERROR));
 
   /*
     We now have the following possibilities:
diff --git a/sql/sql_signal.h b/sql/sql_signal.h
index 2d5967d1a15d..04e23ebeb2d9 100644
--- a/sql/sql_signal.h
+++ b/sql/sql_signal.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index fb988ac8c8a8..12cfe531e2df 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -1,16 +1,23 @@
 #ifndef SQL_SORT_INCLUDED
 #define SQL_SORT_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -118,7 +125,7 @@ struct Merge_chunk
   }
   void set_buffer_end(uchar *end)
   {
-    DBUG_ASSERT(m_buffer_end == NULL || end <= m_buffer_end);
+    assert(m_buffer_end == NULL || end <= m_buffer_end);
     m_buffer_end= end;
   }
 
@@ -192,7 +199,7 @@ class Addon_fields {
       m_addon_buf_length(0),
       m_using_packed_addons(false)
   {
-    DBUG_ASSERT(!arr.is_null());
+    assert(!arr.is_null());
   }
 
   Sort_addon_field *begin() { return m_field_descriptors.begin(); }
@@ -204,7 +211,7 @@ class Addon_fields {
   {
     if (m_addon_buf != NULL)
     {
-      DBUG_ASSERT(m_addon_buf_length == sz);
+      assert(m_addon_buf_length == sz);
       return m_addon_buf;
     }
     m_addon_buf= static_cast<uchar*>(sql_alloc(sz));
@@ -343,8 +350,8 @@ class Sort_param {
   /// Are we packing the "addon fields"?
   bool using_packed_addons() const
   {
-    DBUG_ASSERT(m_using_packed_addons ==
-                (addon_fields != NULL && addon_fields->using_packed_addons()));
+    assert(m_using_packed_addons ==
+           (addon_fields != NULL && addon_fields->using_packed_addons()));
     return m_using_packed_addons;
   }
 
@@ -384,7 +391,7 @@ class Sort_param {
     }
     uchar *plen= record_start + sort_length;
     *resl= Addon_fields::read_addon_length(plen);
-    DBUG_ASSERT(*resl <= res_length);
+    assert(*resl <= res_length);
     const uchar *record_end= plen + *resl;
     *recl= static_cast<uint>(record_end - record_start);
   }
@@ -553,7 +560,7 @@ void reuse_freed_buff(Merge_chunk *old_top, Heap_type *heap)
     if (old_top->merge_freed_buff(*it))
       return;
   }
-  DBUG_ASSERT(0);
+  assert(0);
 }
 
 #endif /* SQL_SORT_INCLUDED */
diff --git a/sql/sql_state.c b/sql/sql_state.c
index 77cd2927e321..57395a2eb973 100644
--- a/sql/sql_state.c
+++ b/sql/sql_state.c
@@ -1,14 +1,21 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 2d645013bd9f..db9c1ce8775e 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -388,9 +395,9 @@ size_t explain_filename(THD* thd,
 */
 
 size_t filename_to_tablename(const char *from, char *to, size_t to_length
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                            , bool stay_quiet
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
                            )
 {
   uint errors;
@@ -412,13 +419,13 @@ size_t filename_to_tablename(const char *from, char *to, size_t to_length
     {
       res= (strxnmov(to, to_length, MYSQL50_TABLE_NAME_PREFIX,  from, NullS) -
             to);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (!stay_quiet) {
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
         sql_print_error("Invalid (old?) table or database name '%s'", from);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
       /*
         TODO: add a stored procedure for fix table and database names,
         and mention its name in error log.
@@ -620,7 +627,7 @@ size_t build_tmptable_filename(THD* thd, char *buff, size_t bufflen)
   DBUG_ENTER("build_tmptable_filename");
 
   char *p= my_stpnmov(buff, mysql_tmpdir, bufflen);
-  DBUG_ASSERT(sizeof(my_thread_id) == 4);
+  assert(sizeof(my_thread_id) == 4);
   my_snprintf(p, bufflen - (p - buff), "/%s%lx_%lx_%x",
               tmp_file_prefix, current_pid,
               thd->thread_id(), thd->tmp_table++);
@@ -844,8 +851,8 @@ static uint read_ddl_log_header()
     entry_no= uint4korr(&file_entry_buf[DDL_LOG_NUM_ENTRY_POS]);
     global_ddl_log.name_len= uint4korr(&file_entry_buf[DDL_LOG_NAME_LEN_POS]);
     global_ddl_log.io_size= uint4korr(&file_entry_buf[DDL_LOG_IO_SIZE_POS]);
-    DBUG_ASSERT(global_ddl_log.io_size <=
-                sizeof(global_ddl_log.file_entry_buf));
+    assert(global_ddl_log.io_size <=
+           sizeof(global_ddl_log.file_entry_buf));
   }
   else
   {
@@ -876,25 +883,25 @@ static void set_global_from_ddl_log_entry(const DDL_LOG_ENTRY *ddl_log_entry)
   global_ddl_log.file_entry_buf[DDL_LOG_PHASE_POS]= 0;
   int4store(&global_ddl_log.file_entry_buf[DDL_LOG_NEXT_ENTRY_POS],
             ddl_log_entry->next_entry);
-  DBUG_ASSERT(strlen(ddl_log_entry->name) < FN_REFLEN);
+  assert(strlen(ddl_log_entry->name) < FN_REFLEN);
   strmake(&global_ddl_log.file_entry_buf[DDL_LOG_NAME_POS],
           ddl_log_entry->name, FN_REFLEN - 1);
   if (ddl_log_entry->action_type == DDL_LOG_RENAME_ACTION ||
       ddl_log_entry->action_type == DDL_LOG_REPLACE_ACTION ||
       ddl_log_entry->action_type == DDL_LOG_EXCHANGE_ACTION)
   {
-    DBUG_ASSERT(strlen(ddl_log_entry->from_name) < FN_REFLEN);
+    assert(strlen(ddl_log_entry->from_name) < FN_REFLEN);
     strmake(&global_ddl_log.file_entry_buf[DDL_LOG_NAME_POS + FN_REFLEN],
           ddl_log_entry->from_name, FN_REFLEN - 1);
   }
   else
     global_ddl_log.file_entry_buf[DDL_LOG_NAME_POS + FN_REFLEN]= 0;
-  DBUG_ASSERT(strlen(ddl_log_entry->handler_name) < FN_REFLEN);
+  assert(strlen(ddl_log_entry->handler_name) < FN_REFLEN);
   strmake(&global_ddl_log.file_entry_buf[DDL_LOG_NAME_POS + (2*FN_REFLEN)],
           ddl_log_entry->handler_name, FN_REFLEN - 1);
   if (ddl_log_entry->action_type == DDL_LOG_EXCHANGE_ACTION)
   {
-    DBUG_ASSERT(strlen(ddl_log_entry->tmp_name) < FN_REFLEN);
+    assert(strlen(ddl_log_entry->tmp_name) < FN_REFLEN);
     strmake(&global_ddl_log.file_entry_buf[DDL_LOG_NAME_POS + (3*FN_REFLEN)],
           ddl_log_entry->tmp_name, FN_REFLEN - 1);
   }
@@ -1084,18 +1091,18 @@ static bool deactivate_ddl_log_entry_no_lock(uint entry_no)
         file_entry_buf[DDL_LOG_ENTRY_TYPE_POS]= DDL_IGNORE_LOG_ENTRY_CODE;
       else if (file_entry_buf[DDL_LOG_ACTION_TYPE_POS] == DDL_LOG_REPLACE_ACTION)
       {
-        DBUG_ASSERT(file_entry_buf[DDL_LOG_PHASE_POS] == 0);
+        assert(file_entry_buf[DDL_LOG_PHASE_POS] == 0);
         file_entry_buf[DDL_LOG_PHASE_POS]= 1;
       }
       else if (file_entry_buf[DDL_LOG_ACTION_TYPE_POS] == DDL_LOG_EXCHANGE_ACTION)
       {
-        DBUG_ASSERT(file_entry_buf[DDL_LOG_PHASE_POS] <=
-                                                 EXCH_PHASE_FROM_TO_NAME);
+        assert(file_entry_buf[DDL_LOG_PHASE_POS] <=
+               EXCH_PHASE_FROM_TO_NAME);
         file_entry_buf[DDL_LOG_PHASE_POS]++;
       }
       else
       {
-        DBUG_ASSERT(0);
+        assert(0);
       }
       if (write_ddl_log_file_entry(entry_no))
       {
@@ -1187,7 +1194,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
             if (my_errno() != ENOENT)
               break;
           }
-          DBUG_ASSERT(strcmp("partition", ddl_log_entry->handler_name));
+          assert(strcmp("partition", ddl_log_entry->handler_name));
           strxmov(to_path, ddl_log_entry->name, par_ext, NullS);
           if (access(to_path, F_OK) == 0)
           {
@@ -1211,7 +1218,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
         if (ddl_log_entry->action_type == DDL_LOG_DELETE_ACTION)
           break;
       }
-      DBUG_ASSERT(ddl_log_entry->action_type == DDL_LOG_REPLACE_ACTION);
+      assert(ddl_log_entry->action_type == DDL_LOG_REPLACE_ACTION);
       /*
         Fall through and perform the rename action of the replace
         action. We have already indicated the success of the delete
@@ -1228,7 +1235,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
         strxmov(from_path, ddl_log_entry->from_name, reg_ext, NullS);
         if (mysql_file_rename(key_file_frm, from_path, to_path, MYF(MY_WME)))
           break;
-        DBUG_ASSERT(strcmp("partition", ddl_log_entry->handler_name));
+        assert(strcmp("partition", ddl_log_entry->handler_name));
         strxmov(to_path, ddl_log_entry->name, par_ext, NullS);
         strxmov(from_path, ddl_log_entry->from_name, par_ext, NullS);
         if (access(from_path, F_OK) == 0)
@@ -1256,7 +1263,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
       /* We hold LOCK_gdl, so we can alter global_ddl_log.file_entry_buf */
       char *file_entry_buf= (char*)&global_ddl_log.file_entry_buf;
       /* not yet implemented for frm */
-      DBUG_ASSERT(!frm_action);
+      assert(!frm_action);
       /*
         Using a case-switch here to revert all currently done phases,
         since it will fall through until the first phase is undone.
@@ -1297,14 +1304,14 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
           error= FALSE;
           break;
         default:
-          DBUG_ASSERT(0);
+          assert(0);
           break;
       }
 
       break;
     }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       break;
   }
   delete file;
@@ -1394,8 +1401,8 @@ static bool execute_ddl_log_entry_no_lock(THD *thd, uint first_entry)
       error= true;
       break;
     }
-    DBUG_ASSERT(ddl_log_entry.entry_type == DDL_LOG_ENTRY_CODE ||
-                ddl_log_entry.entry_type == DDL_IGNORE_LOG_ENTRY_CODE);
+    assert(ddl_log_entry.entry_type == DDL_LOG_ENTRY_CODE ||
+           ddl_log_entry.entry_type == DDL_IGNORE_LOG_ENTRY_CODE);
 
     if ((error= execute_ddl_log_action(thd, &ddl_log_entry)))
     {
@@ -1856,7 +1863,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
     }
     if (lpt->table->file->ht != lpt->create_info->db_type)
     {
-      DBUG_ASSERT(lpt->create_info->db_type->partition_flags != NULL);
+      assert(lpt->create_info->db_type->partition_flags != NULL);
       new_handler= get_new_handler(NULL, lpt->thd->mem_root,
                                    lpt->create_info->db_type);
       if (new_handler == NULL)
@@ -2149,7 +2156,7 @@ bool mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists,
             table locked with LOCK TABLES as a side effect of temporary
             table drop.
           */
-          DBUG_ASSERT(table->mdl_request.ticket == NULL);
+          assert(table->mdl_request.ticket == NULL);
         }
         else
         {
@@ -2353,10 +2360,10 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
       the ticket should be NULL to ensure that we don't release a lock
       on a base table later.
     */
-    DBUG_ASSERT(!(thd->locked_tables_mode &&
-                  table->open_type != OT_BASE_ONLY &&
-                  find_temporary_table(thd, table) &&
-                  table->mdl_request.ticket != NULL));
+    assert(!(thd->locked_tables_mode &&
+             table->open_type != OT_BASE_ONLY &&
+             find_temporary_table(thd, table) &&
+             table->mdl_request.ticket != NULL));
 
     thd->add_to_binlog_accessed_dbs(table->db);
 
@@ -2370,7 +2377,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
       error= 1;
     else if ((error= drop_temporary_table(thd, table, &is_trans)) == -1)
     {
-      DBUG_ASSERT(thd->in_sub_stmt);
+      assert(thd->in_sub_stmt);
       goto err;
     }
 
@@ -2442,9 +2449,9 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
       }
 
       /* Check that we have an exclusive lock on the table to be dropped. */
-      DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                     table->db, table->table_name,
-                                     MDL_EXCLUSIVE));
+      assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                          table->db, table->table_name,
+                                                          MDL_EXCLUSIVE));
       if (thd->killed)
       {
         error= -1;
@@ -2605,8 +2612,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
 #endif
   }
   DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog");
-  thd->thread_specific_used|= (trans_tmp_table_deleted ||
-                               non_trans_tmp_table_deleted);
+  thd->thread_specific_used= true;
   error= 0;
 err:
   if (wrong_tables.length())
@@ -3033,7 +3039,7 @@ int prepare_create_field(Create_field *sql_field,
     This code came from mysql_prepare_create_table.
     Indent preserved to make patching easier
   */
-  DBUG_ASSERT(sql_field->charset);
+  assert(sql_field->charset);
 
   switch (sql_field->sql_type) {
   case MYSQL_TYPE_BLOB:
@@ -3409,7 +3415,7 @@ static bool check_duplicate_key(THD *thd, const char *error_schema_name,
       Key_part_spec *c1= key_column_iterator++;
       Key_part_spec *c2= k_column_iterator++;
   
-      DBUG_ASSERT(c1 && c2);
+      assert(c1 && c2);
 
       if (my_strcasecmp(system_charset_info,
                         c1->field_name.str, c2->field_name.str) ||
@@ -3604,7 +3610,7 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
         int comma_length= cs->cset->wc_mb(cs, ',', (uchar*) comma_buf,
                                           (uchar*) comma_buf + 
                                           sizeof(comma_buf));
-        DBUG_ASSERT(comma_length > 0);
+        assert(comma_length > 0);
         for (uint i= 0; (tmp= int_it++); i++)
         {
           size_t lengthsp;
@@ -3678,7 +3684,7 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
       else  /* MYSQL_TYPE_ENUM */
       {
         size_t field_length;
-        DBUG_ASSERT(sql_field->sql_type == MYSQL_TYPE_ENUM);
+        assert(sql_field->sql_type == MYSQL_TYPE_ENUM);
         if (sql_field->def != NULL)
         {
           String str, *def= sql_field->def->val_str(&str);
@@ -3816,7 +3822,7 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
   it.rewind();
   while ((sql_field=it++))
   {
-    DBUG_ASSERT(sql_field->charset != 0);
+    assert(sql_field->charset != 0);
 
     if (prepare_create_field(sql_field, &blob_columns, 
 			     file->ha_table_flags()))
@@ -4331,10 +4337,11 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
           size_t max_field_size= blob_length_by_type(sql_field->sql_type);
 	  if (key_part_length > max_field_size ||
               key_part_length > max_key_length ||
-	      key_part_length > file->max_key_part_length())
+	      key_part_length > file->max_key_part_length(create_info))
 	  {
             // Given prefix length is too large, adjust it.
-	    key_part_length= min(max_key_length, file->max_key_part_length());
+	    key_part_length= min(max_key_length,
+                                 file->max_key_part_length(create_info));
 	    if (max_field_size)
               key_part_length= min(key_part_length, max_field_size);
 	    if (key->type == KEYTYPE_MULTIPLE)
@@ -4385,10 +4392,10 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
 	my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name.str);
 	  DBUG_RETURN(TRUE);
       }
-      if (key_part_length > file->max_key_part_length() &&
+      if (key_part_length > file->max_key_part_length(create_info) &&
           key->type != KEYTYPE_FULLTEXT)
       {
-        key_part_length= file->max_key_part_length();
+        key_part_length= file->max_key_part_length(create_info);
 	if (key->type == KEYTYPE_MULTIPLE)
 	{
 	  /* not a critical problem */
@@ -4412,7 +4419,8 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
       }
       key_part_info->length= (uint16) key_part_length;
       /* Use packed keys for long strings on the first column */
-      if (!((*db_options) & HA_OPTION_NO_PACK_KEYS) &&
+      if ((create_info->db_type->flags & HTON_SUPPORTS_PACKED_KEYS) &&
+          !((*db_options) & HA_OPTION_NO_PACK_KEYS) &&
           !((create_info->table_options & HA_OPTION_NO_PACK_KEYS)) &&
 	  (key_part_length >= KEY_DEFAULT_PACK_LENGTH &&
 	   (sql_field->sql_type == MYSQL_TYPE_STRING ||
@@ -4481,7 +4489,8 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
     if (key_length > max_key_length && key->type != KEYTYPE_FULLTEXT)
     {
       my_error(ER_TOO_LONG_KEY,MYF(0),max_key_length);
-      DBUG_RETURN(TRUE);
+      if (thd->is_error())  // May be silenced - see Bug#20629014
+        DBUG_RETURN(true);
     }
     if (validate_comment_length(thd, key->key_create_info.comment.str,
                                 &key->key_create_info.comment.length,
@@ -4785,7 +4794,7 @@ static void sp_prepare_create_field(THD *thd, Create_field *sql_field)
                           FIELDFLAG_TREAT_BIT_AS_CHAR;
   }
   sql_field->create_length_to_internal_length();
-  DBUG_ASSERT(sql_field->def == 0);
+  assert(sql_field->def == 0);
   /* Can't go wrong as sql_field->def is not defined */
   (void) prepare_blob_field(thd, sql_field);
 }
@@ -4846,6 +4855,10 @@ bool create_table_impl(THD *thd,
   uint		db_options;
   handler	*file;
   bool		error= TRUE;
+  bool		is_whitelisted_table;
+  bool		prepare_error;
+  Key_length_error_handler error_handler;
+
   DBUG_ENTER("create_table_impl");
   DBUG_PRINT("enter", ("db: '%s'  table: '%s'  tmp: %d",
                        db, table_name, internal_tmp_table));
@@ -4859,17 +4872,52 @@ bool create_table_impl(THD *thd,
     DBUG_RETURN(TRUE);
   }
 
+  if (check_engine(thd, db, table_name, create_info))
+    DBUG_RETURN(TRUE);
+
   // Check if new table creation is disallowed by the storage engine.
   if (!internal_tmp_table &&
       ha_is_storage_engine_disabled(create_info->db_type))
   {
-    my_error(ER_DISABLED_STORAGE_ENGINE, MYF(0),
-              ha_resolve_storage_engine_name(create_info->db_type));
-    DBUG_RETURN(true);
-  }
+    /*
+      If table creation is disabled for the engine then substitute the engine
+      for the table with the default engine only if sql mode
+      NO_ENGINE_SUBSTITUTION is disabled.
+    */
+    handlerton *new_engine= NULL;
+    if (is_engine_substitution_allowed(thd))
+      new_engine= ha_default_handlerton(thd);
 
-  if (check_engine(thd, db, table_name, create_info))
-    DBUG_RETURN(TRUE);
+    /*
+      Proceed with the engine substitution only if,
+      1. The disabled engine and the default engine are not the same.
+      2. The default engine is not in the disabled engines list.
+      else report an error.
+    */
+    if (new_engine && create_info->db_type &&
+        new_engine != create_info->db_type &&
+        !ha_is_storage_engine_disabled(new_engine))
+    {
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_DISABLED_STORAGE_ENGINE,
+                          ER(ER_DISABLED_STORAGE_ENGINE),
+                          ha_resolve_storage_engine_name(create_info->db_type));
+
+      create_info->db_type= new_engine;
+
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_WARN_USING_OTHER_HANDLER,
+                          ER(ER_WARN_USING_OTHER_HANDLER),
+                          ha_resolve_storage_engine_name(create_info->db_type),
+                          table_name);
+    }
+    else
+    {
+      my_error(ER_DISABLED_STORAGE_ENGINE, MYF(0),
+               ha_resolve_storage_engine_name(create_info->db_type));
+      DBUG_RETURN(true);
+    }
+  }
 
   set_table_default_charset(thd, create_info, (char*) db);
 
@@ -4889,7 +4937,7 @@ bool create_table_impl(THD *thd,
       (create_info->db_type->partition_flags() & HA_USE_AUTO_PARTITION))
   {
     Partition_handler *part_handler= file->get_partition_handler();
-    DBUG_ASSERT(part_handler != NULL);
+    assert(part_handler != NULL);
 
     /*
       Table is not defined as a partitioned table but the engine handles
@@ -5032,7 +5080,7 @@ bool create_table_impl(THD *thd,
         goto no_partitioning;
       }
       create_info->db_type= plugin_data<handlerton*>(plugin);
-      DBUG_ASSERT(create_info->db_type->flags & HTON_NOT_USER_SELECTABLE);
+      assert(create_info->db_type->flags & HTON_NOT_USER_SELECTABLE);
       delete file;
       if (!(file= get_new_handler(NULL, thd->mem_root, create_info->db_type)))
       {
@@ -5041,13 +5089,13 @@ bool create_table_impl(THD *thd,
       }
       if (file->ht != create_info->db_type)
       {
-	DBUG_ASSERT(0);
+	assert(0);
         goto no_partitioning;
       }
       Partition_handler *part_handler= file->get_partition_handler();
       if (!part_handler)
       {
-        DBUG_ASSERT(0);
+        assert(0);
         goto no_partitioning;
       }
       part_handler->set_part_info(part_info, false);
@@ -5075,7 +5123,7 @@ bool create_table_impl(THD *thd,
         uint i;
         List_iterator<partition_element> part_it(part_info->partitions);
         part_it++;
-        DBUG_ASSERT(thd->lex->sql_command != SQLCOM_CREATE_TABLE);
+        assert(thd->lex->sql_command != SQLCOM_CREATE_TABLE);
         for (i= 1; i < part_info->partitions.elements; i++)
           (part_it++)->part_state= PART_TO_BE_DROPPED;
       }
@@ -5085,7 +5133,7 @@ bool create_table_impl(THD *thd,
                (int)part_info->num_subparts !=
                  part_handler->get_default_num_partitions(create_info))
       {
-        DBUG_ASSERT(thd->lex->sql_command != SQLCOM_CREATE_TABLE);
+        assert(thd->lex->sql_command != SQLCOM_CREATE_TABLE);
         part_info->num_subparts=
           part_handler->get_default_num_partitions(create_info);
       }
@@ -5128,13 +5176,28 @@ bool create_table_impl(THD *thd,
     }
   }
 
-  if (mysql_prepare_create_table(thd, db, error_table_name,
-                                 create_info, alter_info,
-                                 internal_tmp_table,
-                                 &db_options, file,
-                                 key_info, key_count,
-                                 select_field_count))
-    goto err;
+  /*
+    System tables residing in mysql database and created
+    by innodb engine could be created with any supported
+    innodb page size ( 4k,8k,16K).  We have a index size
+    limit depending upon the page size, but for system
+    tables which are whitelisted we can skip this check,
+    since the innodb engine ensures that the index size
+    will be supported.
+  */
+  is_whitelisted_table = (file->ht->db_type == DB_TYPE_INNODB) ?
+    ha_is_supported_system_table(file->ht, db, error_table_name) : false;
+  if (is_whitelisted_table) thd->push_internal_handler(&error_handler);
+
+  prepare_error= mysql_prepare_create_table(thd, db, error_table_name,
+					    create_info, alter_info,
+					    internal_tmp_table,
+					    &db_options, file,
+					    key_info, key_count,
+					    select_field_count);
+
+  if (is_whitelisted_table) thd->pop_internal_handler();
+  if (prepare_error) goto err;
 
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
     create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
@@ -5334,7 +5397,7 @@ bool create_table_impl(THD *thd,
       needs to modify item tree. May need call THD::rollback_item_tree_changes
       later before calling closefrm if the change list is not empty.
     */
-    DBUG_ASSERT(thd->change_list.is_empty());
+    assert(thd->change_list.is_empty());
     if (!result)
       (void) closefrm(&table, 0);
 
@@ -5727,8 +5790,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
   if (src_table->table->s->tablespace &&
       strlen(src_table->table->s->tablespace) > 0)
   {
-    DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                  src_table->db, src_table->table_name, MDL_SHARED));
+    assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                        src_table->db, src_table->table_name, MDL_SHARED));
 
     if (tablespace_set.insert(
           const_cast<char*>(src_table->table->s->tablespace)))
@@ -5752,7 +5815,6 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
   }
 
   /* Fill HA_CREATE_INFO and Alter_info with description of source table. */
-  memset(&local_create_info, 0, sizeof(local_create_info));
   local_create_info.db_type= src_table->table->s->db_type();
   local_create_info.row_type= src_table->table->s->row_type;
   if (mysql_prepare_alter_table(thd, src_table->table, &local_create_info,
@@ -5797,17 +5859,17 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
     LOCK TABLE a non-existing table). And the only way we then can end up here
     is if IF EXISTS was used.
   */
-  DBUG_ASSERT(table->table || table->is_view() ||
-              (create_info->options & HA_LEX_CREATE_TMP_TABLE) ||
-              (thd->locked_tables_mode != LTM_LOCK_TABLES &&
-               thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                  table->db, table->table_name,
-                                  MDL_EXCLUSIVE)) ||
-              (thd->locked_tables_mode == LTM_LOCK_TABLES &&
-               (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS) &&
-               thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                  table->db, table->table_name,
-                                  MDL_SHARED_NO_WRITE)));
+  assert(table->table || table->is_view() ||
+         (create_info->options & HA_LEX_CREATE_TMP_TABLE) ||
+         (thd->locked_tables_mode != LTM_LOCK_TABLES &&
+          thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                       table->db, table->table_name,
+                                                       MDL_EXCLUSIVE)) ||
+         (thd->locked_tables_mode == LTM_LOCK_TABLES &&
+          (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS) &&
+          thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                       table->db, table->table_name,
+                                                       MDL_SHARED_NO_WRITE)));
 
   DEBUG_SYNC(thd, "create_table_like_before_binlog");
 
@@ -5891,13 +5953,13 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
             store_create_info(thd, table, &query,
                               create_info, TRUE /* show_database */);
 
-          DBUG_ASSERT(result == 0); // store_create_info() always return 0
+          assert(result == 0); // store_create_info() always return 0
           if (write_bin_log(thd, TRUE, query.ptr(), query.length()))
             goto err;
 
           if (new_table)
           {
-            DBUG_ASSERT(thd->open_tables == table->table);
+            assert(thd->open_tables == table->table);
             /*
               When opening the table, we ignored the locked tables
               (MYSQL_OPEN_GET_NEW_TABLE). Now we can close the table
@@ -6218,6 +6280,9 @@ static bool has_index_def_changed(Alter_inplace_info *ha_alter_info,
   const Create_field *new_field;
   Alter_info *alter_info= ha_alter_info->alter_info;
 
+  DBUG_EXECUTE_IF("assert_index_def_has_no_pack_flag",
+                  assert(!(table_key->flags & (HA_PACK_KEY | HA_BINARY_PACK_KEY))););
+
   /* Check that the key types are compatible between old and new tables. */
   if ((table_key->algorithm != new_key->algorithm) ||
       ((table_key->flags & HA_KEYFLAG_MASK) !=
@@ -6243,18 +6308,30 @@ static bool has_index_def_changed(Alter_inplace_info *ha_alter_info,
        key_part < end;
        key_part++, new_part++)
   {
+
+    new_field= get_field_by_index(alter_info, new_part->fieldnr);
+
     /*
-      Key definition has changed if we are using a different field or
-      if the used key part length is different. It makes sense to
-      check lengths first as in case when fields differ it is likely
-      that lengths differ too and checking fields is more expensive
-      in general case.
+      If there is a change in index length due to column expansion
+      like varchar(X) changed to varchar(X + N) and has a compatible
+      packed data representation, we mark it for fast/INPLACE change
+      in index definition. Some engines like InnoDB supports INPLACE
+      alter for such cases.
+
+      In other cases, key definition has changed if we are using a
+      different field or if the used key part length is different, or
+      key part direction has changed.
     */
-    if (key_part->length != new_part->length)
+    if (key_part->length != new_part->length &&
+        ha_alter_info->alter_info->flags == Alter_info::ALTER_CHANGE_COLUMN &&
+        (key_part->field->is_equal((Create_field *)new_field) == IS_EQUAL_PACK_LENGTH))
+    {
+      ha_alter_info->handler_flags|=
+          Alter_inplace_info::ALTER_COLUMN_INDEX_LENGTH;
+    }
+    else if (key_part->length != new_part->length)
       return true;
 
-    new_field= get_field_by_index(alter_info, new_part->fieldnr);
-
     /*
       For prefix keys KEY_PART_INFO::field points to cloned Field
       object with adjusted length. So below we have to check field
@@ -6525,14 +6602,14 @@ static bool fill_alter_inplace_info(THD *thd,
                                          ALTER_COLUMN_EQUAL_PACK_LENGTH;
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
       }
 
       // Conversion to and from generated column is supported if stored:
       if (field->is_gcol() != new_field->is_gcol())
       {
-        DBUG_ASSERT((field->is_gcol() && !field->is_virtual_gcol()) ||
-                    (new_field->is_gcol() && !new_field->is_virtual_gcol()));
+        assert((field->is_gcol() && !field->is_virtual_gcol()) ||
+               (new_field->is_gcol() && !new_field->is_virtual_gcol()));
         ha_alter_info->handler_flags|=
           Alter_inplace_info::ALTER_STORED_COLUMN_TYPE;
       }
@@ -6541,7 +6618,7 @@ static bool fill_alter_inplace_info(THD *thd,
       if (field->is_gcol() && new_field->is_gcol())
       {
         // Modification of storage attribute is not supported
-        DBUG_ASSERT(field->is_virtual_gcol() == new_field->is_virtual_gcol());
+        assert(field->is_virtual_gcol() == new_field->is_virtual_gcol());
         if (!field->gcol_expr_is_equal(new_field))
         {
           if (field->is_virtual_gcol())
@@ -6637,7 +6714,7 @@ static bool fill_alter_inplace_info(THD *thd,
       /*
         Field is not present in new version of table and therefore was dropped.
       */
-      DBUG_ASSERT(alter_info->flags & Alter_info::ALTER_DROP_COLUMN);
+      assert(alter_info->flags & Alter_info::ALTER_DROP_COLUMN);
       if (field->is_virtual_gcol())
         ha_alter_info->handler_flags|=
           Alter_inplace_info::DROP_VIRTUAL_COLUMN;
@@ -6672,10 +6749,10 @@ static bool fill_alter_inplace_info(THD *thd,
       }
     }
     /* One of these should be set since Alter_info::ALTER_ADD_COLUMN was set. */
-    DBUG_ASSERT(ha_alter_info->handler_flags &
-                (Alter_inplace_info::ADD_VIRTUAL_COLUMN |
-                 Alter_inplace_info::ADD_STORED_BASE_COLUMN |
-                 Alter_inplace_info::ADD_STORED_GENERATED_COLUMN));
+    assert(ha_alter_info->handler_flags &
+           (Alter_inplace_info::ADD_VIRTUAL_COLUMN |
+            Alter_inplace_info::ADD_STORED_BASE_COLUMN |
+            Alter_inplace_info::ADD_STORED_GENERATED_COLUMN));
   }
 
   /*
@@ -7126,7 +7203,7 @@ static void push_zero_date_warning(THD *thd, Create_field *datetime_field)
     t_type= MYSQL_TIMESTAMP_DATETIME;
     break;
   default:
-    DBUG_ASSERT(false);  // Should not get here.
+    assert(false);  // Should not get here.
   }
   make_truncated_value_warning(thd, Sql_condition::SL_WARNING,
                                ErrConvString(my_zero_datetime6, f_length),
@@ -7409,7 +7486,7 @@ static bool mysql_inplace_alter_table(THD *thd,
   if (alter_ctx->error_if_not_empty)
   {
     bool has_records= true;
-    DBUG_ASSERT(table->mdl_ticket->get_type() == MDL_EXCLUSIVE);
+    assert(table->mdl_ticket->get_type() == MDL_EXCLUSIVE);
     if (table_list->table->file->ha_table_flags() & HA_HAS_RECORDS)
     {
       ha_rows tmp= 0;
@@ -7457,7 +7534,7 @@ static bool mysql_inplace_alter_table(THD *thd,
   switch (inplace_supported) {
   case HA_ALTER_ERROR:
   case HA_ALTER_INPLACE_NOT_SUPPORTED:
-    DBUG_ASSERT(0);
+    assert(0);
     // fall through
   case HA_ALTER_INPLACE_NO_LOCK:
   case HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE:
@@ -7500,7 +7577,7 @@ static bool mysql_inplace_alter_table(THD *thd,
       table->mdl_ticket->downgrade_lock(MDL_SHARED_NO_WRITE);
     else
     {
-      DBUG_ASSERT(inplace_supported == HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE);
+      assert(inplace_supported == HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE);
       table->mdl_ticket->downgrade_lock(MDL_SHARED_UPGRADABLE);
     }
   }
@@ -7679,7 +7756,7 @@ blob_length_by_type(enum_field_types type)
   case MYSQL_TYPE_LONG_BLOB:
     return 4294967295U;
   default:
-    DBUG_ASSERT(0); // we should never go here
+    assert(0); // we should never go here
     return 0;
   }
 }
@@ -7781,10 +7858,10 @@ upgrade_old_temporal_types(THD *thd, Alter_info *alter_info)
       continue;
     }
 
-    DBUG_ASSERT(!def->gcol_info ||
-                (def->gcol_info  &&
-                 (def->sql_type != MYSQL_TYPE_DATETIME
-                 || def->sql_type != MYSQL_TYPE_TIMESTAMP)));
+    assert(!def->gcol_info ||
+           (def->gcol_info  &&
+            (def->sql_type != MYSQL_TYPE_DATETIME
+             || def->sql_type != MYSQL_TYPE_TIMESTAMP)));
     // Replace the old temporal field with the new temporal field.
     Create_field *temporal_field= NULL;
     if (!(temporal_field= new (thd->mem_root) Create_field()) ||
@@ -8387,7 +8464,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
       case Alter_drop::FOREIGN_KEY:
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
     }
@@ -8560,10 +8637,10 @@ fk_check_column_changes(THD *thd, Alter_info *alter_info,
           return FK_COLUMN_DATA_CHANGE;
         }
       }
-      DBUG_ASSERT(old_field->is_gcol() == new_field->is_gcol() &&
-                  old_field->is_virtual_gcol() == new_field->is_virtual_gcol());
-      DBUG_ASSERT(!old_field->is_gcol() ||
-                  old_field->gcol_expr_is_equal(new_field));
+      assert(old_field->is_gcol() == new_field->is_gcol() &&
+             old_field->is_virtual_gcol() == new_field->is_virtual_gcol());
+      assert(!old_field->is_gcol() ||
+             old_field->gcol_expr_is_equal(new_field));
     }
     else
     {
@@ -8692,7 +8769,7 @@ static bool fk_check_copy_alter_table(THD *thd, TABLE *table,
       DBUG_RETURN(true);
     }
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
 
@@ -8753,7 +8830,7 @@ static bool fk_check_copy_alter_table(THD *thd, TABLE *table,
                f_key->foreign_id->str);
       DBUG_RETURN(true);
     default:
-      DBUG_ASSERT(0);
+      assert(0);
     }
   }
 
@@ -9089,15 +9166,33 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
   if (error)
     DBUG_RETURN(true);
 
-  // Check if ALTER TABLE ... ENGINE is disallowed by the storage engine.
+  /*
+    Check if ALTER TABLE ... ENGINE is disallowed by the desired storage
+    engine.
+  */
   if (table_list->table->s->db_type() != create_info->db_type &&
       (alter_info->flags & Alter_info::ALTER_OPTIONS) &&
       (create_info->used_fields & HA_CREATE_USED_ENGINE) &&
        ha_is_storage_engine_disabled(create_info->db_type))
   {
-    my_error(ER_DISABLED_STORAGE_ENGINE, MYF(0),
-              ha_resolve_storage_engine_name(create_info->db_type));
-    DBUG_RETURN(true);
+    /*
+      If NO_ENGINE_SUBSTITUTION is disabled, then report a warning and do not
+      alter the table.
+    */
+    if (is_engine_substitution_allowed(thd))
+    {
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_UNKNOWN_STORAGE_ENGINE,
+                          ER(ER_UNKNOWN_STORAGE_ENGINE),
+                          ha_resolve_storage_engine_name(create_info->db_type));
+      create_info->db_type= table_list->table->s->db_type();
+    }
+    else
+    {
+      my_error(ER_DISABLED_STORAGE_ENGINE, MYF(0),
+               ha_resolve_storage_engine_name(create_info->db_type));
+      DBUG_RETURN(true);
+    }
   }
 
   TABLE *table= table_list->table;
@@ -9180,8 +9275,8 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
         Global intention exclusive lock must have been already acquired when
         table to be altered was open, so there is no need to do it here.
       */
-      DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
-                                     "", "", MDL_INTENTION_EXCLUSIVE));
+      assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::GLOBAL,
+                                                          "", "", MDL_INTENTION_EXCLUSIVE));
 
       if (thd->mdl_context.acquire_locks(&mdl_requests,
                                          thd->variables.lock_wait_timeout))
@@ -9598,7 +9693,7 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
                     };);
 
     // We assume that the table is non-temporary.
-    DBUG_ASSERT(!table->s->tmp_table);
+   assert(!table->s->tmp_table);
 
     if (!(altered_table= open_table_uncached(thd, alter_ctx.get_tmp_path(),
                                              alter_ctx.new_db,
@@ -9857,7 +9952,7 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
   else
   {
     /* Should be MERGE only */
-    DBUG_ASSERT(new_table->file->ht->db_type == DB_TYPE_MRG_MYISAM);
+    assert(new_table->file->ht->db_type == DB_TYPE_MRG_MYISAM);
     if (!table->s->tmp_table &&
         wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
       goto err_new_table_cleanup;
@@ -9951,7 +10046,7 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
     anything goes wrong while renaming the new table.
   */
   char backup_name[32];
-  DBUG_ASSERT(sizeof(my_thread_id) == 4);
+  assert(sizeof(my_thread_id) == 4);
   my_snprintf(backup_name, sizeof(backup_name), "%s2-%lx-%lx", tmp_file_prefix,
               current_pid, thd->thread_id());
   if (lower_case_table_names)
@@ -10035,9 +10130,9 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
                       thd->query().str, thd->query().length,
                       alter_ctx.db, alter_ctx.table_name);
 
-  DBUG_ASSERT(!(mysql_bin_log.is_open() &&
-                thd->is_current_stmt_binlog_format_row() &&
-                (create_info->options & HA_LEX_CREATE_TMP_TABLE)));
+  assert(!(mysql_bin_log.is_open() &&
+           thd->is_current_stmt_binlog_format_row() &&
+           (create_info->options & HA_LEX_CREATE_TMP_TABLE)));
   if (write_bin_log(thd, true, thd->query().str, thd->query().length))
     DBUG_RETURN(true);
 
@@ -10266,7 +10361,6 @@ copy_data_between_tables(PSI_stage_progress *psi,
       from->sort.io_cache=(IO_CACHE*) my_malloc(key_memory_TABLE_sort_io_cache,
                                                 sizeof(IO_CACHE),
                                                 MYF(MY_FAE | MY_ZEROFILL));
-      memset(&tables, 0, sizeof(tables));
       tables.table= from;
       tables.alias= tables.table_name= from->s->table_name.str;
       tables.db= from->s->db.str;
@@ -10427,13 +10521,12 @@ bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list, bool table_copy)
   Alter_info alter_info;
 
   DBUG_ENTER("mysql_recreate_table");
-  DBUG_ASSERT(!table_list->next_global);
+  assert(!table_list->next_global);
   /* Set lock type which is appropriate for ALTER TABLE. */
   table_list->lock_type= TL_READ_NO_INSERT;
   /* Same applies to MDL request. */
   table_list->mdl_request.set_type(MDL_SHARED_NO_WRITE);
 
-  memset(&create_info, 0, sizeof(create_info));
   create_info.row_type=ROW_TYPE_NOT_USED;
   create_info.default_table_charset=default_charset_info;
   /* Force alter table to recreate table */
@@ -10462,7 +10555,7 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
     CHECKSUM TABLE returns results and rollbacks statement transaction,
     so it should not be used in stored function or trigger.
   */
-  DBUG_ASSERT(! thd->in_sub_stmt);
+  assert(! thd->in_sub_stmt);
 
   field_list.push_back(item = new Item_empty_string("Table", NAME_LEN*2));
   item->maybe_null= 1;
@@ -10628,6 +10721,11 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
   DBUG_RETURN(TRUE);
 }
 
+// Return true if ENCRYPTION clause requests for table encryption.
+static inline bool is_encrypted(const std::string type) {
+  return (type.empty() == false && type != "" && type != "N" && type != "n");
+}
+
 /**
   @brief Check if the table can be created in the specified storage engine.
 
@@ -10650,7 +10748,7 @@ static bool check_engine(THD *thd, const char *db_name,
   handlerton **new_engine= &create_info->db_type;
   handlerton *req_engine= *new_engine;
   bool no_substitution=
-        MY_TEST(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION);
+        MY_TEST(!is_engine_substitution_allowed(thd));
   if (!(*new_engine= ha_checktype(thd, ha_legacy_type(req_engine),
                                   no_substitution, 1)))
     DBUG_RETURN(true);
@@ -10677,11 +10775,11 @@ static bool check_engine(THD *thd, const char *db_name,
   }
 
   /*
-    Check, if the given table name is system table, and if the storage engine 
+    Check, if the given table name is system table, and if the storage engine
     does supports it.
   */
   if ((create_info->used_fields & HA_CREATE_USED_ENGINE) &&
-      !ha_check_if_supported_system_table(*new_engine, db_name, table_name))
+      !ha_is_valid_system_or_user_table(*new_engine, db_name, table_name))
   {
     my_error(ER_UNSUPPORTED_ENGINE, MYF(0),
              ha_resolve_storage_engine_name(*new_engine), db_name, table_name);
@@ -10689,5 +10787,15 @@ static bool check_engine(THD *thd, const char *db_name,
     DBUG_RETURN(true);
   }
 
+  // Check if the storage engine supports encryption.
+  if (create_info->encrypt_type.str &&
+      is_encrypted(create_info->encrypt_type.str) &&
+      !((*new_engine)->flags & HTON_SUPPORTS_TABLE_ENCRYPTION))
+  {
+     my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
+	      ha_resolve_storage_engine_name(*new_engine), "ENCRYPTION");
+     DBUG_RETURN(true);
+  }
+
   DBUG_RETURN(false);
 }
diff --git a/sql/sql_table.h b/sql/sql_table.h
index 762d4ad7fe0c..61cefc2ee2b5 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -146,9 +153,9 @@ static const uint NO_HA_TABLE=     1 << 4;
 static const uint NO_FK_CHECKS=    1 << 5;
 
 size_t filename_to_tablename(const char *from, char *to, size_t to_length
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                            , bool stay_quiet = false
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
                            );
 size_t tablename_to_filename(const char *from, char *to, size_t to_length);
 size_t check_n_cut_mysql50_prefix(const char *from, char *to, size_t to_length);
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index da1916dc7ac8..259d17e5cc98 100644
--- a/sql/sql_tablespace.cc
+++ b/sql/sql_tablespace.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -122,7 +129,7 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
 
   DBUG_ENTER("mysql_alter_tablespace");
 
-  DBUG_ASSERT(ts_info);
+  assert(ts_info);
   handlerton *hton= ts_info->storage_engine;
 
   /*
diff --git a/sql/sql_tablespace.h b/sql/sql_tablespace.h
index cc012d517c02..22a532d4c781 100644
--- a/sql/sql_tablespace.h
+++ b/sql/sql_tablespace.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index a2880c0379d0..00d6f5d97337 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -58,7 +65,7 @@ const char *lock_descriptions[TL_WRITE_ONLY + 1] =
 };
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 void
 print_where(Item *cond,const char *info, enum_query_type query_type)
@@ -101,7 +108,7 @@ TEST_join(JOIN *join)
 {
   uint i,ref;
   DBUG_ENTER("TEST_join");
-  DBUG_ASSERT(!join->join_tab);
+  assert(!join->join_tab);
   /*
     Assemble results of all the calls to full_name() first,
     in order not to garble the tabular output below.
@@ -156,12 +163,12 @@ TEST_join(JOIN *join)
   DBUG_VOID_RETURN;
 }
 
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 void print_keyuse_array(Opt_trace_context *trace,
                         const Key_use_array *keyuse_array)
 {
-#if !defined(DBUG_OFF) || defined(OPTIMIZER_TRACE)
+#if !defined(NDEBUG) || defined(OPTIMIZER_TRACE)
   if (unlikely(!trace->is_started()))
     return;
   Opt_trace_object wrapper(trace);
@@ -183,10 +190,10 @@ void print_keyuse_array(Opt_trace_context *trace,
       add("equals", keyuse.val).
       add("null_rejecting", keyuse.null_rejecting);
   }
-#endif /* !DBUG_OFF || OPTIMIZER_TRACE */
+#endif /* !NDEBUG || OPTIMIZER_TRACE */
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /* purecov: begin inspected */
 
 /** 
@@ -287,7 +294,7 @@ print_plan(JOIN* join, uint idx, double record_count, double read_time,
   DBUG_UNLOCK_FILE;
 }
 
-#endif  /* !DBUG_OFF */
+#endif  /* !NDEBUG */
 
 C_MODE_START
 static int print_key_cache_status(const char *name, KEY_CACHE *key_cache);
@@ -465,7 +472,7 @@ void mysql_print_status()
          Global_THD_manager::get_instance()->get_thd_count(),
 	 (long) my_thread_stack_size);
   thr_print_locks();				// Write some debug info
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   print_cached_tables();
 #endif
   /* Print key cache status */
@@ -512,7 +519,7 @@ Open streams:  %10lu\n",
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #ifdef EXTRA_DEBUG_DUMP_TABLE_LISTS
 
 
diff --git a/sql/sql_test.h b/sql/sql_test.h
index d0bf15bc2a4d..4336db2a0ab6 100644
--- a/sql/sql_test.h
+++ b/sql/sql_test.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,7 +37,7 @@ typedef Mem_root_array<Key_use, true> Key_use_array;
 
 extern const char *lock_descriptions[TL_WRITE_ONLY + 1];
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void print_where(Item *cond,const char *info, enum_query_type query_type);
 void TEST_join(JOIN *join);
 void print_plan(JOIN* join,uint idx, double record_count, double read_time,
diff --git a/sql/sql_thd_internal_api.cc b/sql/sql_thd_internal_api.cc
index ae19f58e6e76..db3a90ba488e 100644
--- a/sql/sql_thd_internal_api.cc
+++ b/sql/sql_thd_internal_api.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -42,6 +49,7 @@ int thd_init(THD *thd, char *stack_start, bool bound, PSI_thread_key psi_key)
   {
     PSI_THREAD_CALL(set_thread_os_id)(psi);
   }
+  PSI_THREAD_CALL(set_thread_THD)(psi, thd);
   thd->set_psi(psi);
 #endif
 
@@ -114,8 +122,8 @@ bool is_mysql_datadir_path(const char *path)
 
 int mysql_tmpfile_path(const char *path, const char *prefix)
 {
-  DBUG_ASSERT(path != NULL);
-  DBUG_ASSERT((strlen(path) + strlen(prefix)) <= FN_REFLEN);
+  assert(path != NULL);
+  assert((strlen(path) + strlen(prefix)) <= FN_REFLEN);
 
   char filename[FN_REFLEN];
   File fd = create_temp_file(filename, path, prefix,
diff --git a/sql/sql_thd_internal_api.h b/sql/sql_thd_internal_api.h
index 7ea05ae985fe..632eb347ce96 100644
--- a/sql/sql_thd_internal_api.h
+++ b/sql/sql_thd_internal_api.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index 99832f2ecc8b..76dfc6bfa1e6 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -297,8 +304,8 @@ bool time_add_nanoseconds_with_round(MYSQL_TIME *ltime,
                                      uint nanoseconds, int *warnings)
 {
   /* We expect correct input data */
-  DBUG_ASSERT(nanoseconds < 1000000000);
-  DBUG_ASSERT(!check_time_mmssff_range(ltime));
+  assert(nanoseconds < 1000000000);
+  assert(!check_time_mmssff_range(ltime));
 
   if (nanoseconds < 500)
     return false;
@@ -346,7 +353,7 @@ bool time_add_nanoseconds_with_round(MYSQL_TIME *ltime,
 bool datetime_add_nanoseconds_with_round(MYSQL_TIME *ltime,
                                          uint nanoseconds, int *warnings)
 {
-  DBUG_ASSERT(nanoseconds < 1000000000);
+  assert(nanoseconds < 1000000000);
   if (nanoseconds < 500)
     return false;
 
@@ -668,7 +675,7 @@ bool datetime_with_no_zero_in_date_to_timeval(THD *thd,
 {
   if (!ltime->month) /* Zero date */
   {
-    DBUG_ASSERT(!ltime->year && !ltime->day);
+    assert(!ltime->year && !ltime->day);
     if (non_zero_time(ltime))
     {
       /*
@@ -802,7 +809,7 @@ void calc_time_from_sec(MYSQL_TIME *to, longlong seconds, long microseconds)
   to->year= 0;
   to->month= 0;
   to->day= 0;
-  DBUG_ASSERT(seconds < (0xFFFFFFFFLL * 3600LL));
+  assert(seconds < (0xFFFFFFFFLL * 3600LL));
   to->hour=  (long) (seconds / 3600L);
   t_seconds= (long) (seconds % 3600L);
   to->minute= t_seconds/60L;
@@ -1038,7 +1045,7 @@ bool parse_date_time_format(timestamp_type format_type,
       return 0;
     break;
   default:
-    DBUG_ASSERT(1);
+    assert(1);
     break;
   }
   return 1;					// Error
@@ -1115,7 +1122,7 @@ const char *get_date_time_format_str(Known_date_time_format *format,
   case MYSQL_TIMESTAMP_TIME:
     return format->time_format;
   default:
-    DBUG_ASSERT(0);				// Impossible
+    assert(0);				// Impossible
     return 0;
   }
 }
@@ -1485,7 +1492,7 @@ static uint msec_round_add[7]=
 bool my_time_round(MYSQL_TIME *ltime, uint dec)
 {
   int warnings= 0;
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   /* Add half away from zero */
   bool rc= time_add_nanoseconds_with_round(ltime,
                                            msec_round_add[dec], &warnings);
@@ -1504,7 +1511,7 @@ bool my_time_round(MYSQL_TIME *ltime, uint dec)
 */
 bool my_datetime_round(MYSQL_TIME *ltime, uint dec, int *warnings)
 {
-  DBUG_ASSERT(dec <= DATETIME_MAX_DECIMALS);
+  assert(dec <= DATETIME_MAX_DECIMALS);
   /* Add half away from zero */
   bool rc= datetime_add_nanoseconds_with_round(ltime,
                                                msec_round_add[dec], warnings);
@@ -1523,7 +1530,7 @@ bool my_datetime_round(MYSQL_TIME *ltime, uint dec, int *warnings)
 */
 bool my_timeval_round(struct timeval *tv, uint decimals)
 {
-  DBUG_ASSERT(decimals <= DATETIME_MAX_DECIMALS);
+  assert(decimals <= DATETIME_MAX_DECIMALS);
   uint nanoseconds= msec_round_add[decimals];
   tv->tv_usec+= (nanoseconds + 500) / 1000;
   if (tv->tv_usec < 1000000)
@@ -1551,8 +1558,8 @@ bool my_timeval_round(struct timeval *tv, uint decimals)
 */
 void mix_date_and_time(MYSQL_TIME *ldate, const MYSQL_TIME *ltime)
 {
-  DBUG_ASSERT(ldate->time_type == MYSQL_TIMESTAMP_DATE ||
-              ldate->time_type == MYSQL_TIMESTAMP_DATETIME);
+  assert(ldate->time_type == MYSQL_TIMESTAMP_DATE ||
+         ldate->time_type == MYSQL_TIMESTAMP_DATETIME);
 
   if (!ltime->neg && ltime->hour < 24)
   {
@@ -1572,14 +1579,14 @@ void mix_date_and_time(MYSQL_TIME *ldate, const MYSQL_TIME *ltime)
     long days, useconds;
     int sign= ltime->neg ? 1 : -1;
     ldate->neg= calc_time_diff(ldate, ltime, sign, &seconds, &useconds);
-    DBUG_ASSERT(!ldate->neg);
+    assert(!ldate->neg);
 
     /*
       We pass current date to mix_date_and_time. If we want to use
       this function with arbitrary dates, this code will need
       to cover cases when ltime is negative and "ldate < -ltime".
     */
-    DBUG_ASSERT(ldate->year > 0);
+    assert(ldate->year > 0);
 
     days= (long) (seconds / SECONDS_IN_24H);
     calc_time_from_sec(ldate, seconds % SECONDS_IN_24H, useconds);
@@ -1638,7 +1645,7 @@ void TIME_from_longlong_packed(MYSQL_TIME *ltime,
     TIME_from_longlong_datetime_packed(ltime, packed_value);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     set_zero_time(ltime, MYSQL_TIMESTAMP_ERROR);
     break;
   }
@@ -1674,7 +1681,7 @@ my_decimal *my_decimal_from_datetime_packed(my_decimal *dec,
       TIME_from_longlong_datetime_packed(&ltime, packed_value);
       return date2my_decimal(&ltime, dec);
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       ulonglong2decimal(0, dec);
       return dec;
   }
@@ -1706,7 +1713,7 @@ longlong longlong_from_datetime_packed(enum enum_field_types type,
       TIME_from_longlong_datetime_packed(&ltime, packed_value);
       return TIME_to_ulonglong_datetime(&ltime);
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       return 0;
   }
 }
diff --git a/sql/sql_time.h b/sql/sql_time.h
index 84e252a8fa22..0d829d5b71ea 100644
--- a/sql/sql_time.h
+++ b/sql/sql_time.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -164,7 +171,7 @@ extern LEX_STRING interval_type_to_name[];
 /* Date/time rounding and truncation functions */
 inline long my_time_fraction_remainder(long nr, uint decimals)
 {
-  DBUG_ASSERT(decimals <= DATETIME_MAX_DECIMALS);
+  assert(decimals <= DATETIME_MAX_DECIMALS);
   return nr % (long) log_10_int[DATETIME_MAX_DECIMALS - decimals];
 }
 inline void my_time_trunc(MYSQL_TIME *ltime, uint decimals)
@@ -223,7 +230,7 @@ inline ulonglong TIME_to_ulonglong_round(const MYSQL_TIME *ltime)
   case MYSQL_TIMESTAMP_DATE:
     return TIME_to_ulonglong_date(ltime);
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return 0;
   }
 }
diff --git a/sql/sql_timer.cc b/sql/sql_timer.cc
index 4a7fdb086bde..ed4ed2870cb7 100644
--- a/sql/sql_timer.cc
+++ b/sql/sql_timer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -81,7 +88,7 @@ timer_notify(THD_timer_info *thd_timer)
   Find_thd_with_id find_thd_with_id(thd_timer->thread_id);
   THD *thd= Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
 
-  DBUG_ASSERT(!thd_timer->destroy || !thd_timer->thread_id);
+  assert(!thd_timer->destroy || !thd_timer->thread_id);
   /*
     Statement might have finished while the timer notification
     was being delivered. If this is the case, the timer object
@@ -149,7 +156,7 @@ thd_timer_set(THD *thd, THD_timer_info *thd_timer, unsigned long time)
   if (thd_timer == NULL && (thd_timer= thd_timer_create()) == NULL)
     DBUG_RETURN(NULL);
 
-  DBUG_ASSERT(!thd_timer->destroy && !thd_timer->thread_id);
+  assert(!thd_timer->destroy && !thd_timer->thread_id);
 
   /* Mark the notification as pending. */
   thd_timer->thread_id= thd->thread_id();
@@ -178,10 +185,10 @@ static bool
 reap_timer(THD_timer_info *thd_timer, bool pending)
 {
   /* Cannot be tagged for destruction. */
-  DBUG_ASSERT(!thd_timer->destroy);
+  assert(!thd_timer->destroy);
 
   /* If not pending, timer hasn't fired. */
-  DBUG_ASSERT(pending || thd_timer->thread_id);
+  assert(pending || thd_timer->thread_id);
 
   /*
     The timer object can be reused if the timer was stopped before
diff --git a/sql/sql_timer.h b/sql/sql_timer.h
index 00ee81e11c61..32954f4a2833 100644
--- a/sql/sql_timer.h
+++ b/sql/sql_timer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_tmp_table.cc b/sql/sql_tmp_table.cc
index 7838f5b7d8f0..249cc49ba21d 100644
--- a/sql/sql_tmp_table.cc
+++ b/sql/sql_tmp_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -140,7 +147,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
                                item->item_name.ptr(), item->unsigned_flag);
     break;
   case STRING_RESULT:
-    DBUG_ASSERT(item->collation.collation);
+    assert(item->collation.collation);
   
     /*
       DATE/TIME, GEOMETRY and JSON fields have STRING_RESULT result type.
@@ -164,7 +171,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
   case ROW_RESULT:
   default:
     // This case should never be choosen
-    DBUG_ASSERT(0);
+    assert(0);
     new_field= 0;
     break;
   }
@@ -345,7 +352,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
 
       if (make_copy_field)
       {
-        DBUG_ASSERT(item_func_sp->result_field);
+        assert(item_func_sp->result_field);
         *from_field= item_func_sp->result_field;
       }
       else
@@ -383,7 +390,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
   case Item::PARAM_ITEM:
     if (make_copy_field)
     {
-      DBUG_ASSERT(((Item_result_field*)item)->result_field);
+      assert(((Item_result_field*)item)->result_field);
       *from_field= ((Item_result_field*)item)->result_field;
     }
     result= create_tmp_field_from_item(thd, item, table,
@@ -391,13 +398,14 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
                                        modify_item);
     break;
   case Item::TYPE_HOLDER:  
-    result= ((Item_type_holder *)item)->make_field_by_type(table);
+    result= ((Item_type_holder *)item)->make_field_by_type(table,
+                                                           thd->is_strict_mode());
     if (!result)
       break;
     result->set_derivation(item->collation.derivation);
     break;
   default:					// Dosen't have to be stored
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   return result;
@@ -461,7 +469,7 @@ void Cache_temp_engine_properties::init(THD *thd)
   db_plugin= ha_lock_engine(0, heap_hton);
   handler= get_new_handler((TABLE_SHARE *)0, thd->mem_root, heap_hton);
   HEAP_MAX_KEY_LENGTH= handler->max_key_length();
-  HEAP_MAX_KEY_PART_LENGTH= handler->max_key_part_length();
+  HEAP_MAX_KEY_PART_LENGTH= handler->max_key_part_length(0);
   HEAP_MAX_KEY_PARTS= handler->max_key_parts();
   delete handler;
   plugin_unlock(0, db_plugin);
@@ -469,7 +477,7 @@ void Cache_temp_engine_properties::init(THD *thd)
   db_plugin= ha_lock_engine(0, myisam_hton);
   handler= get_new_handler((TABLE_SHARE *)0, thd->mem_root, myisam_hton);
   MYISAM_MAX_KEY_LENGTH= handler->max_key_length();
-  MYISAM_MAX_KEY_PART_LENGTH= handler->max_key_part_length();
+  MYISAM_MAX_KEY_PART_LENGTH= handler->max_key_part_length(0);
   MYISAM_MAX_KEY_PARTS= handler->max_key_parts();
   delete handler;
   plugin_unlock(0, db_plugin);
@@ -505,7 +513,7 @@ uint Cache_temp_engine_properties::INNODB_MAX_KEY_PARTS= 0;
 
 void init_cache_tmp_engine_properties()
 {
-  DBUG_ASSERT(!current_thd);
+  assert(!current_thd);
   THD *thd= new THD();
   thd->thread_stack= pointer_cast<char *>(&thd);
   thd->store_globals();
@@ -525,7 +533,7 @@ void get_max_key_and_part_length(uint *max_key_length,
                                  uint *max_key_part_length)
 {
   // Make sure these cached properties are initialized.
-  DBUG_ASSERT(Cache_temp_engine_properties::HEAP_MAX_KEY_LENGTH);
+  assert(Cache_temp_engine_properties::HEAP_MAX_KEY_LENGTH);
 
   switch (internal_tmp_disk_storage_engine)
   {
@@ -541,8 +549,8 @@ void get_max_key_and_part_length(uint *max_key_length,
       It is correct as long as HEAP'S not bigger than on-disk temp table
       engine's, which we check here.
     */
-    DBUG_ASSERT(Cache_temp_engine_properties::HEAP_MAX_KEY_PARTS <=
-                Cache_temp_engine_properties::MYISAM_MAX_KEY_PARTS);
+    assert(Cache_temp_engine_properties::HEAP_MAX_KEY_PARTS <=
+           Cache_temp_engine_properties::MYISAM_MAX_KEY_PARTS);
     break;
   case TMP_TABLE_INNODB:
   default:
@@ -552,8 +560,8 @@ void get_max_key_and_part_length(uint *max_key_length,
     *max_key_part_length=
       std::min(Cache_temp_engine_properties::HEAP_MAX_KEY_PART_LENGTH,
                Cache_temp_engine_properties::INNODB_MAX_KEY_PART_LENGTH);
-    DBUG_ASSERT(Cache_temp_engine_properties::HEAP_MAX_KEY_PARTS <=
-                Cache_temp_engine_properties::INNODB_MAX_KEY_PARTS);
+    assert(Cache_temp_engine_properties::HEAP_MAX_KEY_PARTS <=
+           Cache_temp_engine_properties::INNODB_MAX_KEY_PARTS);
     break;
   }
 }
@@ -664,6 +672,12 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
   uint  temp_pool_slot=MY_BIT_NONE;
   uint fieldnr= 0;
   ulong reclength, string_total_length, distinct_key_length= 0;
+  /**
+    When true, enforces unique constraint (by adding a hidden hash_field and
+    creating a key over this field) when:
+    (1) unique key is too long or
+    (2) number of key parts in distinct key is too big.
+  */
   bool  using_unique_constraint= false;
   bool  use_packed_rows= false;
   bool  not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
@@ -704,7 +718,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
   else
   {
     /* if we run out of slots or we are not using tempool */
-    DBUG_ASSERT(sizeof(my_thread_id) == 4);
+    assert(sizeof(my_thread_id) == 4);
     sprintf(path,"%s%lx_%x_%x", tmp_file_prefix, current_pid,
             thd->thread_id(), thd->tmp_table++);
   }
@@ -731,8 +745,15 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
       (*tmp->item)->marker= 4;
       const uint char_len=
         (*tmp->item)->max_length / (*tmp->item)->collation.collation->mbmaxlen;
-      if (char_len > CONVERT_IF_BIGGER_TO_BLOB)
+      /*
+        Use hash key as the unique constraint if the group-by key is
+        big or if it is non-deterministic. Group-by items get evaluated
+        twice and a non-deterministic function would cause a discrepancy.
+      */
+      if (char_len > CONVERT_IF_BIGGER_TO_BLOB ||
+          (*tmp->item)->is_non_deterministic()) {
         using_unique_constraint= true;
+      }
     }
     if (group)
     {
@@ -797,7 +818,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
   my_stpcpy(tmpname,path);
   /* make table according to fields */
 
-  memset(table, 0, sizeof(*table));
+  new (table) TABLE;
   memset(reg_field, 0, sizeof(Field*)*(field_count + 2));
   memset(default_field, 0, sizeof(Field*) * (field_count + 1));
   memset(from_field, 0, sizeof(Field*)*(field_count + 1));
@@ -961,7 +982,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
 
       if (!new_field)
       {
-        DBUG_ASSERT(thd->is_fatal_error);
+        assert(thd->is_fatal_error);
         goto err;				// Got OOM
       }
       if (type == Item::SUM_FUNC_ITEM)
@@ -1005,7 +1026,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
     /*
       Calculate length of distinct key. The goal is to decide what to use -
       key or unique constraint. As blobs force unique constraint on their
-      own, they aren't taken into account.
+      own due to their length, they aren't taken into account.
     */
     if (distinct && !using_unique_constraint && hidden_field_count <= 0 &&
         new_field)
@@ -1038,8 +1059,8 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
       total_uneven_bit_length= 0;
     }
   }
-  DBUG_ASSERT(fieldnr == (uint) (reg_field - table->field));
-  DBUG_ASSERT(field_count >= (uint) (reg_field - table->field));
+  assert(fieldnr == (uint) (reg_field - table->field));
+  assert(field_count >= (uint) (reg_field - table->field));
   field_count= fieldnr;
   *reg_field= 0;
   *blob_field= 0;				// End marker
@@ -1069,7 +1090,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
       share->db_plugin= ha_lock_engine(0, innodb_hton);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       share->db_plugin= ha_lock_engine(0, innodb_hton);
     }
 
@@ -1129,7 +1150,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
       for (; cur_group ; cur_group= cur_group->next, key_part_info++)
       {
         Field *field= (*cur_group->item)->get_tmp_table_field();
-        DBUG_ASSERT(field->table == table);
+        assert(field->table == table);
         key_part_info->init_from_field(field);
 
         /* In GROUP BY 'a' and 'a ' are equal for VARCHAR fields */
@@ -1206,7 +1227,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
           Field_longlong(sizeof(ulonglong), false, "<hash_field>", true);
     if (!field)
     {
-      DBUG_ASSERT(thd->is_fatal_error);
+      assert(thd->is_fatal_error);
       goto err;   // Got OOM
     }
 
@@ -1278,7 +1299,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
     share->default_values= table->record[1]+alloc_length;
   }
   param->func_count= copy_func->size();
-  DBUG_ASSERT(param->func_count <= copy_func_count); // Used <= allocated
+  assert(param->func_count <= copy_func_count); // Used <= allocated
 
   setup_tmp_table_column_bitmaps(table, bitmaps);
 
@@ -1299,7 +1320,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
   }
   null_count= (blob_count == 0) ? 1 : 0;
   hidden_field_count=param->hidden_field_count;
-  DBUG_ASSERT((uint)hidden_field_count <= field_count);
+  assert((uint)hidden_field_count <= field_count);
   for (i=0,reg_field=table->field; i < field_count; i++,reg_field++,recinfo++)
   {
     Field *field= *reg_field;
@@ -1428,7 +1449,7 @@ create_tmp_table(THD *thd, Temp_table_param *param, List<Item> &fields,
     for (; cur_group ; cur_group= cur_group->next, key_part_info++)
     {
       Field *field= (*cur_group->item)->get_tmp_table_field();
-      DBUG_ASSERT(field->table == table);
+      assert(field->table == table);
       bool maybe_null= (*cur_group->item)->maybe_null;
       key_part_info->init_from_field(key_part_info->field);
       keyinfo->key_length+= key_part_info->store_length;
@@ -1588,7 +1609,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
   uint i;
 
   DBUG_ENTER("create_duplicate_weedout_tmp_table");
-  DBUG_ASSERT(!sjtbl->is_confluent);
+  assert(!sjtbl->is_confluent);
   /*
     STEP 1: Get temporary table name
   */
@@ -1602,7 +1623,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
   else
   {
     /* if we run out of slots or we are not using tempool */
-    DBUG_ASSERT(sizeof(my_thread_id) == 4);
+    assert(sizeof(my_thread_id) == 4);
     sprintf(path,"%s%lx_%x_%x", tmp_file_prefix,current_pid,
             thd->thread_id(), thd->tmp_table++);
   }
@@ -1636,7 +1657,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
   my_stpcpy(tmpname,path);
 
   /* STEP 4: Create TABLE description */
-  memset(table, 0, sizeof(*table));
+  new (table) TABLE;
   memset(reg_field, 0, sizeof(Field*) * 3);
 
   table->mem_root= own_root;
@@ -1674,7 +1695,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
           Field_longlong(sizeof(ulonglong), false, "<hash_field>", true);
     if (!field)
     {
-      DBUG_ASSERT(thd->is_fatal_error);
+      assert(thd->is_fatal_error);
       goto err;				// Got OOM
     }
     // Mark hash_field as NOT NULL
@@ -1724,7 +1745,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
       share->db_plugin= ha_lock_engine(0, innodb_hton);
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
       share->db_plugin= ha_lock_engine(0, innodb_hton);
     }
     table->file= get_new_handler(share, &table->mem_root,
@@ -1871,7 +1892,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
     keyinfo->key_length=0;
     {
       key_part_info->init_from_field(field);
-      DBUG_ASSERT(key_part_info->key_type == FIELDFLAG_BINARY);
+      assert(key_part_info->key_type == FIELDFLAG_BINARY);
 
       key_field= field->new_key_field(thd->mem_root, table, group_buff);
       if (!key_field)
@@ -1955,8 +1976,8 @@ TABLE *create_virtual_tmp_table(THD *thd, List<Create_field> &field_list)
                         NullS))
     return 0;
 
-  memset(table, 0, sizeof(*table));
-  memset(share, 0, sizeof(*share));
+  new (table) TABLE;
+  new (share) TABLE_SHARE;
   table->field= field;
   table->s= share;
   table->temp_pool_slot= MY_BIT_NONE;
@@ -2115,7 +2136,7 @@ bool create_myisam_tmp_table(TABLE *table, KEY *keyinfo,
   {						// Get keys for ni_create
     if (share->keys > 1)
     {
-      DBUG_ASSERT(0); // This code can't handle more than 1 key
+      assert(0); // This code can't handle more than 1 key
       share->keys= 1;
     }
     HA_KEYSEG *seg= (HA_KEYSEG*) alloc_root(&table->mem_root,
@@ -2236,8 +2257,6 @@ bool create_innodb_tmp_table(TABLE *table, KEY *keyinfo)
 
   HA_CREATE_INFO create_info;
 
-  memset(&create_info, 0, sizeof(create_info));
-
   create_info.db_type= table->s->db_type();
   create_info.row_type= table->s->row_type;
   create_info.options|= HA_LEX_CREATE_TMP_TABLE |
@@ -2321,7 +2340,7 @@ static void trace_tmp_table(Opt_trace_context *trace, const TABLE *table)
   }
   else
   {
-    DBUG_ASSERT(table->s->db_type() == heap_hton);
+    assert(table->s->db_type() == heap_hton);
     trace_tmp.add_alnum("location", "memory (heap)").
       add("row_limit_estimate", table->s->max_rows);
   }
@@ -2353,9 +2372,9 @@ bool instantiate_tmp_table(TABLE *table, KEY *keyinfo,
                            ulonglong options, my_bool big_tables,
                            Opt_trace_context *trace)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (uint i= 0; i < table->s->fields; i++)
-    DBUG_ASSERT(table->field[i]->gcol_info== NULL && table->field[i]->stored_in_db);
+    assert(table->field[i]->gcol_info== NULL && table->field[i]->stored_in_db);
 #endif
 
   if (table->s->db_type() == innodb_hton)
@@ -2506,7 +2525,7 @@ bool create_ondisk_from_heap(THD *thd, TABLE *table,
     new_table.s->db_plugin= ha_lock_engine(thd, innodb_hton);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     new_table.s->db_plugin= ha_lock_engine(thd, innodb_hton);
   }
 
@@ -2544,7 +2563,7 @@ bool create_ondisk_from_heap(THD *thd, TABLE *table,
     Opt_trace_context * trace= &thd->opt_trace;
     Opt_trace_object wrapper(trace);
     Opt_trace_object convert(trace, "converting_tmp_table_to_ondisk");
-    DBUG_ASSERT(error == HA_ERR_RECORD_FILE_FULL);
+    assert(error == HA_ERR_RECORD_FILE_FULL);
     convert.add_alnum("cause", "memory_table_size_exceeded");
     trace_tmp_table(trace, &new_table);
   }
@@ -2608,14 +2627,14 @@ bool create_ondisk_from_heap(THD *thd, TABLE *table,
   /* Update quick select, if any. */
   {
     QEP_TAB *tab= table->reginfo.qep_tab;
-    DBUG_ASSERT(tab || !table->reginfo.join_tab);
+    assert(tab || !table->reginfo.join_tab);
     if (tab && tab->quick())
     {
       /*
         This could happen only with result of derived table/view
         materialization.
       */
-      DBUG_ASSERT(tab->table_ref && tab->table_ref->uses_materialization());
+      assert(tab->table_ref && tab->table_ref->uses_materialization());
       tab->quick()->set_handler(table->file);
     }
   }
diff --git a/sql/sql_tmp_table.h b/sql/sql_tmp_table.h
index e66f38334981..88c91592df47 100644
--- a/sql/sql_tmp_table.h
+++ b/sql/sql_tmp_table.h
@@ -1,16 +1,23 @@
 #ifndef SQL_TMP_TABLE_INCLUDED
 #define SQL_TMP_TABLE_INCLUDED
 
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index f4296c2be033..6fae19a1bc7d 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -148,7 +155,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
 
     if (!tables)
     {
-      DBUG_ASSERT(if_exists);
+      assert(if_exists);
       /*
         Since the trigger does not exist, there is no associated table,
         and therefore :
@@ -181,7 +188,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
   }
 
   /* We should have only one table in table list. */
-  DBUG_ASSERT(tables->next_global == 0);
+  assert(tables->next_global == 0);
 
   /* We do not allow creation of triggers on temporary tables. */
   if (create && find_temporary_table(thd, tables))
@@ -437,13 +444,13 @@ bool change_trigger_table_name(THD *thd,
     This method interfaces the mysql server code protected by
     an exclusive metadata lock.
   */
-  DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
-                                                           db_name,
-                                                           table_name,
-                                                           MDL_EXCLUSIVE));
+  assert(thd->mdl_context.owns_equal_or_stronger_lock(MDL_key::TABLE,
+                                                      db_name,
+                                                      table_name,
+                                                      MDL_EXCLUSIVE));
 
-  DBUG_ASSERT(my_strcasecmp(table_alias_charset, db_name, new_db_name) ||
-              my_strcasecmp(table_alias_charset, table_alias, new_table_name));
+  assert(my_strcasecmp(table_alias_charset, db_name, new_db_name) ||
+         my_strcasecmp(table_alias_charset, table_alias, new_table_name));
 
   Table_trigger_dispatcher d(db_name, table_name);
 
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
index c749e1b58198..983aa673e7dd 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -2,16 +2,23 @@
 #define SQL_TRIGGER_INCLUDED
 
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 7ac17f9f10bf..1d27c0cc52d8 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -149,13 +156,13 @@ fk_truncate_illegal_if_parent(THD *thd, TABLE *table)
   /* Loop over the set of foreign keys for which this table is a parent. */
   while ((fk_info= it++))
   {
-    DBUG_ASSERT(!my_strcasecmp(system_charset_info,
-                               fk_info->referenced_db->str,
-                               table->s->db.str));
+    assert(!my_strcasecmp(system_charset_info,
+                          fk_info->referenced_db->str,
+                          table->s->db.str));
 
-    DBUG_ASSERT(!my_strcasecmp(system_charset_info,
-                               fk_info->referenced_table->str,
-                               table->s->table_name.str));
+    assert(!my_strcasecmp(system_charset_info,
+                          fk_info->referenced_table->str,
+                          table->s->table_name.str));
 
     if (my_strcasecmp(system_charset_info, fk_info->foreign_db->str,
                       table->s->db.str) ||
@@ -209,7 +216,7 @@ Sql_cmd_truncate_table::handler_truncate(THD *thd, TABLE_LIST *table_ref,
   if (!is_tmp_table)
   {
     /* We don't need to load triggers. */
-    DBUG_ASSERT(table_ref->trg_event_map == 0);
+    assert(table_ref->trg_event_map == 0);
     /*
       Our metadata lock guarantees that no transaction is reading
       or writing into the table. Yet, to open a write cursor we need
@@ -281,8 +288,6 @@ static bool recreate_temporary_table(THD *thd, TABLE *table)
   handlerton *table_type= table->s->db_type();
   DBUG_ENTER("recreate_temporary_table");
 
-  memset(&create_info, 0, sizeof(create_info));
-
   table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);
 
   /*
@@ -338,9 +343,9 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
   DBUG_ENTER("Sql_cmd_truncate_table::lock_table");
 
   /* Lock types are set in the parser. */
-  DBUG_ASSERT(table_ref->lock_type == TL_WRITE);
+  assert(table_ref->lock_type == TL_WRITE);
   /* The handler truncate protocol dictates a exclusive lock. */
-  DBUG_ASSERT(table_ref->mdl_request.type == MDL_EXCLUSIVE);
+  assert(table_ref->mdl_request.type == MDL_EXCLUSIVE);
 
   /*
     Before doing anything else, acquire a metadata lock on the table,
@@ -368,7 +373,7 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
   else
   {
     /* Acquire an exclusive lock. */
-    DBUG_ASSERT(table_ref->next_global == NULL);
+    assert(table_ref->next_global == NULL);
     if (lock_table_names(thd, table_ref, NULL,
                          thd->variables.lock_wait_timeout, 0))
       DBUG_RETURN(TRUE);
@@ -425,8 +430,8 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref)
   bool binlog_stmt;
   DBUG_ENTER("Sql_cmd_truncate_table::truncate_table");
 
-  DBUG_ASSERT((!table_ref->table) ||
-              (table_ref->table && table_ref->table->s));
+  assert((!table_ref->table) ||
+         (table_ref->table && table_ref->table->s));
 
   /* Initialize, or reinitialize in case of reexecution (SP). */
   m_ticket_downgrade= NULL;
@@ -445,8 +450,8 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref)
       if ((error= recreate_temporary_table(thd, tmp_table)))
         binlog_stmt= FALSE; /* No need to binlog failed truncate-by-recreate. */
 
-      DBUG_ASSERT(! thd->get_transaction()->cannot_safely_rollback(
-        Transaction_ctx::STMT));
+      assert(! thd->get_transaction()->cannot_safely_rollback(
+                                                              Transaction_ctx::STMT));
     }
     else
     {
@@ -468,6 +473,13 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref)
   }
   else /* It's not a temporary table. */
   {
+    /*
+      Truncate is allowed for performance schema tables in both read_only and
+      super_read_only mode.
+    */
+    if (is_perfschema_db(table_ref->db))
+      thd->set_skip_readonly_check();
+
     bool hton_can_recreate;
 
     if (lock_table(thd, table_ref, &hton_can_recreate))
diff --git a/sql/sql_truncate.h b/sql/sql_truncate.h
index 66f4a5d1fb4d..553db504e689 100644
--- a/sql/sql_truncate.h
+++ b/sql/sql_truncate.h
@@ -1,15 +1,22 @@
 #ifndef SQL_TRUNCATE_INCLUDED
 #define SQL_TRUNCATE_INCLUDED
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 41bbcf6b064c..262192db5108 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -192,8 +199,22 @@ void udf_init()
     DBUG_PRINT("info",("init udf record"));
     LEX_STRING name;
     name.str=get_field(&mem, table->field[0]);
+
+    // Check the name.str is NULL or not.
+    if (name.str == NULL)
+    {
+      sql_print_error("Invalid row in mysql.func table for column 'name'");
+      continue;
+    }
+
     name.length = strlen(name.str);
     char *dl_name= get_field(&mem, table->field[2]);
+    if (dl_name == NULL)
+    {
+      sql_print_error("Invalid row in mysql.func table for function '%.64s'",
+                      name.str);
+      continue;
+    }
     bool new_dl=0;
     Item_udftype udftype=UDFTYPE_FUNCTION;
     if (table->s->fields >= 4)			// New func table
@@ -547,13 +568,13 @@ int mysql_create_function(THD *thd,udf_func *udf)
   if (write_bin_log(thd, true, thd->query().str, thd->query().length))
   {
     /* Restore the state of binlog format */
-    DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    assert(!thd->is_current_stmt_binlog_format_row());
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(1);
   }
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(0);
@@ -563,7 +584,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
     dlclose(dl);
   mysql_rwlock_unlock(&THR_LOCK_udf);
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(1);
@@ -640,7 +661,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
     error= 0;
 exit:
   /* Restore the state of binlog format */
-  DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+  assert(!thd->is_current_stmt_binlog_format_row());
   if (save_binlog_row_based)
     thd->set_current_stmt_binlog_format_row();
   DBUG_RETURN(error);
diff --git a/sql/sql_udf.h b/sql/sql_udf.h
index 4b425777e4a3..f6776aca8a4e 100644
--- a/sql/sql_udf.h
+++ b/sql/sql_udf.h
@@ -1,16 +1,23 @@
 #ifndef SQL_UDF_INCLUDED
 #define SQL_UDF_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 709202d357f6..3dc98c9aaf69 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -119,7 +126,7 @@ bool Query_result_union::create_result_table(THD *thd_arg,
                                              bool bit_fields_as_long,
                                              bool create_table)
 {
-  DBUG_ASSERT(table == NULL);
+  assert(table == NULL);
   tmp_table_param= Temp_table_param();
   count_field_types(thd_arg->lex->current_select(), &tmp_table_param,
                     *column_types, false, true);
@@ -205,7 +212,7 @@ class Query_result_union_direct :public Query_result_union
   uint field_count(List<Item> &fields) const
   {
     // Only called for top-level Query_results, usually Query_result_send
-    DBUG_ASSERT(false); /* purecov: inspected */
+    assert(false); /* purecov: inspected */
     return 0; /* purecov: inspected */
   }
   bool postponed_prepare(List<Item> &types);
@@ -221,7 +228,7 @@ class Query_result_union_direct :public Query_result_union
   bool check_simple_select() const
   {
     // Only called for top-level Query_results, usually Query_result_send
-    DBUG_ASSERT(false); /* purecov: inspected */
+    assert(false); /* purecov: inspected */
     return false; /* purecov: inspected */
   }
   void abort_result_set()
@@ -236,12 +243,12 @@ class Query_result_union_direct :public Query_result_union
       and for the results of subquery engines
       (select_<something>_subselect).
     */
-    DBUG_ASSERT(false); /* purecov: inspected */
+    assert(false); /* purecov: inspected */
   }
   void begin_dataset()
   {
     // Only called for sp_cursor::Select_fetch_into_spvars
-    DBUG_ASSERT(false); /* purecov: inspected */
+    assert(false); /* purecov: inspected */
   }
 };
 
@@ -376,7 +383,7 @@ bool st_select_lex_unit::prepare_fake_select_lex(THD *thd_arg)
 {
   DBUG_ENTER("st_select_lex_unit::prepare_fake_select_lex");
 
-  DBUG_ASSERT(thd_arg->lex->current_select() == fake_select_lex);
+  assert(thd_arg->lex->current_select() == fake_select_lex);
 
   // The UNION result table is input table for this query block
   fake_select_lex->table_list.link_in_list(&result_table_list,
@@ -425,11 +432,11 @@ bool st_select_lex_unit::prepare_fake_select_lex(THD *thd_arg)
   if (fake_select_lex->ref_pointer_array.is_null())
     fake_select_lex->n_child_sum_items+= fake_select_lex->n_sum_items;
 
-  DBUG_ASSERT(fake_select_lex->with_wild == 0 &&
-              fake_select_lex->master_unit() == this &&
-              !fake_select_lex->group_list.elements &&
-              fake_select_lex->where_cond() == NULL &&
-              fake_select_lex->having_cond() == NULL);
+  assert(fake_select_lex->with_wild == 0 &&
+         fake_select_lex->master_unit() == this &&
+         !fake_select_lex->group_list.elements &&
+         fake_select_lex->where_cond() == NULL &&
+         fake_select_lex->having_cond() == NULL);
 
   if (fake_select_lex->prepare(thd_arg))
     DBUG_RETURN(true);
@@ -454,7 +461,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, Query_result *sel_result,
 {
   DBUG_ENTER("st_select_lex_unit::prepare");
 
-  DBUG_ASSERT(!is_prepared());
+  assert(!is_prepared());
 
   SELECT_LEX *lex_select_save= thd_arg->lex->current_select();
 
@@ -550,10 +557,10 @@ bool st_select_lex_unit::prepare(THD *thd_arg, Query_result *sel_result,
           been fixed yet. An Item_type_holder must be created based on a fixed
           Item, so use the inner Item instead.
         */
-        DBUG_ASSERT(item_tmp->fixed ||
-                    (item_tmp->type() == Item::REF_ITEM &&
-                     down_cast<Item_ref *>(item_tmp)->ref_type() ==
-                     Item_ref::OUTER_REF));
+        assert(item_tmp->fixed ||
+               (item_tmp->type() == Item::REF_ITEM &&
+                down_cast<Item_ref *>(item_tmp)->ref_type() ==
+                Item_ref::OUTER_REF));
         if (!item_tmp->fixed)
           item_tmp= item_tmp->real_item();
 
@@ -631,7 +638,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, Query_result *sel_result,
                                           create_options, "", false,
                                           instantiate_tmp_table))
       goto err;
-    memset(&result_table_list, 0, sizeof(result_table_list));
+    new (&result_table_list) TABLE_LIST;
     result_table_list.db= (char*) "";
     result_table_list.table_name= result_table_list.alias= (char*) "union";
     result_table_list.table= table= union_result->table;
@@ -689,7 +696,7 @@ bool st_select_lex_unit::optimize(THD *thd)
 {
   DBUG_ENTER("st_select_lex_unit::optimize");
 
-  DBUG_ASSERT(is_prepared() && !is_optimized());
+  assert(is_prepared() && !is_optimized());
 
   SELECT_LEX *save_select= thd->lex->current_select();
 
@@ -731,12 +738,12 @@ bool st_select_lex_unit::optimize(THD *thd)
       subquery execution rather than EXPLAIN line production. In order 
       to reset them back, we re-do all of the actions (yes it is ugly).
     */
-    DBUG_ASSERT(fake_select_lex->with_wild == 0 &&
-                fake_select_lex->master_unit() == this &&
-                !fake_select_lex->group_list.elements &&
-                fake_select_lex->get_table_list() == &result_table_list &&
-                fake_select_lex->where_cond() == NULL &&
-                fake_select_lex->having_cond() == NULL);
+    assert(fake_select_lex->with_wild == 0 &&
+           fake_select_lex->master_unit() == this &&
+           !fake_select_lex->group_list.elements &&
+           fake_select_lex->get_table_list() == &result_table_list &&
+           fake_select_lex->where_cond() == NULL &&
+           fake_select_lex->having_cond() == NULL);
 
     if (fake_select_lex->optimize(thd))
       DBUG_RETURN(true);
@@ -760,7 +767,7 @@ bool st_select_lex_unit::explain(THD *ethd)
 {
   DBUG_ENTER("st_select_lex_unit::explain");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   SELECT_LEX *lex_select_save= thd->lex->current_select();
 #endif
   Explain_format *fmt= ethd->lex->explain_format;
@@ -769,7 +776,7 @@ bool st_select_lex_unit::explain(THD *ethd)
 
   if (!other)
   {
-    DBUG_ASSERT(!is_simple() && is_optimized());
+    assert(!is_simple() && is_optimized());
     set_executed();
   }
 
@@ -791,7 +798,7 @@ bool st_select_lex_unit::explain(THD *ethd)
     ret= explain_query_specification(ethd, fake_select_lex, CTX_UNION_RESULT);
   }
   if (!other)
-    DBUG_ASSERT(thd->lex->current_select() == lex_select_save);
+    assert(thd->lex->current_select() == lex_select_save);
 
   if (ret)
     DBUG_RETURN(true);
@@ -812,7 +819,7 @@ bool st_select_lex_unit::explain(THD *ethd)
 bool st_select_lex_unit::execute(THD *thd)
 {
   DBUG_ENTER("st_select_lex_unit::exec");
-  DBUG_ASSERT(!is_simple() && is_optimized());
+  assert(!is_simple() && is_optimized());
 
   if (is_executed() && !uncacheable)
     DBUG_RETURN(false);
@@ -860,7 +867,7 @@ bool st_select_lex_unit::execute(THD *thd)
     if (sl == union_distinct)
     {
       // This is UNION DISTINCT, so there should be a fake_select_lex
-      DBUG_ASSERT(fake_select_lex != NULL);
+      assert(fake_select_lex != NULL);
       if (table->file->ha_disable_indexes(HA_KEY_SWITCH_ALL))
         DBUG_RETURN(true); /* purecov: inspected */
       table->no_keyread= 1;
@@ -911,7 +918,7 @@ bool st_select_lex_unit::cleanup(bool full)
 {
   DBUG_ENTER("st_select_lex_unit::cleanup");
 
-  DBUG_ASSERT(thd == current_thd);
+  assert(thd == current_thd);
 
   if (cleaned >= (full ? UC_CLEAN : UC_PART_CLEAN))
     DBUG_RETURN(false);
@@ -945,10 +952,10 @@ bool st_select_lex_unit::cleanup(bool full)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void st_select_lex_unit::assert_not_fully_clean()
 {
-  DBUG_ASSERT(cleaned < UC_CLEAN);
+  assert(cleaned < UC_CLEAN);
   SELECT_LEX *sl= first_select();
   for (;;)
   {
@@ -973,7 +980,7 @@ void st_select_lex_unit::assert_not_fully_clean()
 void st_select_lex_unit::reinit_exec_mechanism()
 {
   prepared= optimized= executed= false;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (is_union())
   {
     List_iterator_fast<Item> it(item_list);
@@ -1035,7 +1042,7 @@ st_select_lex_unit::change_query_result(Query_result_interceptor *new_result,
 
 List<Item> *st_select_lex_unit::get_unit_column_types()
 {
-  DBUG_ASSERT(is_prepared());
+  assert(is_prepared());
 
   return is_union() ? &types : &first_select()->item_list;
 }
@@ -1053,7 +1060,7 @@ List<Item> *st_select_lex_unit::get_unit_column_types()
 
 List<Item> *st_select_lex_unit::get_field_list()
 {
-  DBUG_ASSERT(is_optimized());
+  assert(is_optimized());
 
   return is_union() ? &types : first_select()->join->fields;
 }
@@ -1074,7 +1081,7 @@ bool st_select_lex::cleanup(bool full)
   {
     if (full)
     {
-      DBUG_ASSERT(join->select_lex == this);
+      assert(join->select_lex == this);
       error= join->destroy();
       delete join;
       join= NULL;
diff --git a/sql/sql_union.h b/sql/sql_union.h
index 73e2be6adc9e..4e6f63a61b84 100644
--- a/sql/sql_union.h
+++ b/sql/sql_union.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 8ebbd8f7f931..1ee4f876ed43 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -68,7 +75,7 @@ bool records_are_comparable(const TABLE *table) {
 */
 bool compare_records(const TABLE *table)
 {
-  DBUG_ASSERT(records_are_comparable(table));
+  assert(records_are_comparable(table));
 
   if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) != 0)
   {
@@ -151,7 +158,7 @@ static bool check_fields(THD *thd, List<Item> &items,
       result_field on Item_ref which refer on this field
     */
     Item_field *const base_table_field= item->field_for_view_update();
-    DBUG_ASSERT(base_table_field != NULL);
+    assert(base_table_field != NULL);
 
     Item_field *const cloned_field= new Item_field(thd, base_table_field);
     if (!cloned_field)
@@ -493,7 +500,8 @@ bool mysql_update(THD *thd,
       QUICK_SELECT_I *qck;
       impossible= test_quick_select(thd, keys_to_use, 0, limit, safe_update,
                                     ORDER::ORDER_NOT_RELEVANT, &qep_tab,
-                                    conds, &needed_reg_dummy, &qck) < 0;
+                                    conds, &needed_reg_dummy, &qck,
+                                    qep_tab.table()->force_index) < 0;
       qep_tab.set_quick(qck);
     }
     if (impossible)
@@ -531,12 +539,21 @@ bool mysql_update(THD *thd,
   /* If running in safe sql mode, don't allow updates without keys */
   if (table->quick_keys.is_clear_all())
   {
-    thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
-    if (safe_update && !using_limit)
+    thd->server_status|= SERVER_QUERY_NO_INDEX_USED;
+
+    /*
+      No safe update error will be returned if:
+      1) Statement is an EXPLAIN OR
+      2) LIMIT is present.
+
+      Append the first warning (if any) to the error message. Allows the user
+      to understand why index access couldn't be chosen.
+    */
+    if (!thd->lex->is_explain() && safe_update && !using_limit)
     {
-      my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE,
-		 ER(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE), MYF(0));
-      goto exit_without_my_ok;
+      my_error(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, MYF(0),
+               thd->get_stmt_da()->get_first_condition_message());
+      DBUG_RETURN(true);
     }
   }
   if (select_lex->has_ft_funcs() && init_ftfuncs(thd, select_lex))
@@ -578,7 +595,7 @@ bool mysql_update(THD *thd,
       rows= limit;
     else
     {
-      DBUG_ASSERT(table->pos_in_table_list == update_table_ref);
+      assert(table->pos_in_table_list == update_table_ref);
       update_table_ref->fetch_number_of_rows();
       rows= table->file->stats.records;
     }
@@ -617,7 +634,7 @@ bool mysql_update(THD *thd,
         ha_rows examined_rows, found_rows, returned_rows;
         Filesort fsort(&qep_tab, order, limit);
 
-        DBUG_ASSERT(table->sort.io_cache == NULL);
+        assert(table->sort.io_cache == NULL);
         table->sort.io_cache= (IO_CACHE*) my_malloc(key_memory_TABLE_sort_io_cache,
                                                     sizeof(IO_CACHE),
                                                     MYF(MY_FAE | MY_ZEROFILL));
@@ -731,7 +748,7 @@ bool mysql_update(THD *thd,
         if (reinit_io_cache(tempfile, READ_CACHE, 0L, 0, 0))
           error=1; /* purecov: inspected */
 
-        DBUG_ASSERT(table->sort.io_cache == NULL);
+        assert(table->sort.io_cache == NULL);
         /*
           After this assignment, init_read_record() will run, and decide to
           read from sort.io_cache. This cache will be freed when qep_tab is
@@ -893,6 +910,18 @@ bool mysql_update(THD *thd,
               break;
           }
         }
+        else
+        {
+          /*
+             Some no operation dml statements do not go through SE.
+             In read_only mode, if a no operation dml is not marked as
+             read_write then binlogging cant be restricted for that statement.
+             To make binlogging be consistent in read_only mode,
+             if the no operation dml statement doesn't go through SE then mark
+             that statement as noop_read_write here.
+          */
+          table->file->mark_trx_noop_dml();
+        }
 
         if (!error && table->triggers &&
             table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
@@ -1063,9 +1092,9 @@ bool mysql_update(THD *thd,
       }
     }
   }
-  DBUG_ASSERT(transactional_table || !updated ||
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(transactional_table || !updated ||
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
   free_underlaid_joins(thd, select_lex);
 
   /* If LAST_INSERT_ID(X) was used, report X */
@@ -1113,7 +1142,7 @@ bool mysql_prepare_update(THD *thd, const TABLE_LIST *update_table_ref,
   TABLE_LIST *const table_list= select->get_table_list();
   DBUG_ENTER("mysql_prepare_update");
 
-  DBUG_ASSERT(select->item_list.elements == update_value_list.elements);
+  assert(select->item_list.elements == update_value_list.elements);
 
   lex->allow_sum_func= 0;
 
@@ -1355,9 +1384,9 @@ static bool multi_update_check_table_access(THD *thd, TABLE_LIST *table,
       updated.
       If it is a non-mergeable view or a derived table then it can't be updated.
     */
-    DBUG_ASSERT(table->merge_underlying_list ||
-                (!table->is_updatable() &&
-                 !(table->map() & tables_for_update)));
+    assert(table->merge_underlying_list ||
+           (!table->is_updatable() &&
+            !(table->map() & tables_for_update)));
 
     Internal_error_handler_holder<View_error_handler, TABLE_LIST>
       view_handler(thd, true, table->merge_underlying_list);
@@ -1416,7 +1445,7 @@ int Sql_cmd_update::mysql_multi_update_prepare(THD *thd)
   bool original_multiupdate= (thd->lex->sql_command == SQLCOM_UPDATE_MULTI);
   DBUG_ENTER("mysql_multi_update_prepare");
 
-  DBUG_ASSERT(select->item_list.elements == update_value_list.elements);
+  assert(select->item_list.elements == update_value_list.elements);
 
   Prepare_error_tracker tracker(thd);
 
@@ -1518,7 +1547,7 @@ int Sql_cmd_update::mysql_multi_update_prepare(THD *thd)
         Last argument routine_modifies_data for read_lock_type_for_table()
         is ignored, as prelocking placeholder will never be set here.
       */
-      DBUG_ASSERT(tl->prelocking_placeholder == false);
+      assert(tl->prelocking_placeholder == false);
       tl->lock_type= read_lock_type_for_table(thd, lex, tl, true);
       /* Update TABLE::lock_type accordingly. */
       if (!tl->is_placeholder() && !using_lock_tables)
@@ -1602,7 +1631,7 @@ int Sql_cmd_update::mysql_multi_update_prepare(THD *thd)
   {
     if (tl->is_merged())
     {
-      DBUG_ASSERT(tl->is_view_or_derived());
+      assert(tl->is_view_or_derived());
       TABLE_LIST *for_update= NULL;
       if (tl->check_single_table(&for_update, tables_for_update))
       {
@@ -1660,10 +1689,10 @@ bool mysql_multi_update(THD *thd,
                                          handle_duplicates)))
     DBUG_RETURN(true); /* purecov: inspected */
 
-  DBUG_ASSERT(select_lex->having_cond() == NULL &&
-              !select_lex->order_list.elements &&
-              !select_lex->group_list.elements &&
-              !select_lex->select_limit);
+  assert(select_lex->having_cond() == NULL &&
+         !select_lex->order_list.elements &&
+         !select_lex->group_list.elements &&
+         !select_lex->select_limit);
 
   res= handle_query(thd, thd->lex, *result,
                     SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK |
@@ -1731,7 +1760,7 @@ int Query_result_update::prepare(List<Item> &not_used_values,
     if (tables_to_update & tr->map())
     {
       TABLE *const table= tr->table;
-      DBUG_ASSERT(table->read_set == &table->def_read_set);
+      assert(table->read_set == &table->def_read_set);
       table->read_set= &table->tmp_set;
       bitmap_clear_all(table->read_set);
     }
@@ -1836,7 +1865,7 @@ int Query_result_update::prepare(List<Item> &not_used_values,
   values_for_table= (List_item **) thd->alloc(sizeof(List_item *) *
 					      table_count);
 
-  DBUG_ASSERT(update_operations == NULL);
+  assert(update_operations == NULL);
   update_operations= (COPY_INFO**) thd->mem_calloc(sizeof(COPY_INFO*) *
                                                table_count);
 
@@ -2003,7 +2032,7 @@ bool Query_result_update::initialize_tables(JOIN *join)
   table_to_update= 0;
 
   /* Any update has at least one pair (field, value) */
-  DBUG_ASSERT(fields->elements);
+  assert(fields->elements);
   /*
    Only one table may be modified by UPDATE of an updatable view.
    For an updatable view first_table_for_update indicates this
@@ -2018,7 +2047,7 @@ bool Query_result_update::initialize_tables(JOIN *join)
     TABLE *table=table_ref->table;
     uint cnt= table_ref->shared;
     List<Item> temp_fields;
-    ORDER     group;
+    ORDER *group = NULL;
     Temp_table_param *tmp_param;
     if (table->vfield &&
         validate_gc_assignment(thd, fields, values, table))
@@ -2151,9 +2180,14 @@ bool Query_result_update::initialize_tables(JOIN *join)
         that we need a position to be read first.
       */
       tbl->prepare_for_position();
+      /*
+        A tmp table is moved to InnoDB if it doesn't fit in memory,
+        and InnoDB does not support fixed length string fields bigger
+        than 1024 bytes, so use a variable length string field.
+      */
+      Field_varstring *field = new Field_varstring(
+          tbl->file->ref_length, false, tbl->alias, tbl->s, &my_charset_bin);
 
-      Field_string *field= new Field_string(tbl->file->ref_length, 0,
-                                            tbl->alias, &my_charset_bin);
       if (!field)
         DBUG_RETURN(1);
       field->init(tbl);
@@ -2161,7 +2195,6 @@ bool Query_result_update::initialize_tables(JOIN *join)
         The field will be converted to varstring when creating tmp table if
         table to be updated was created by mysql 4.1. Deny this.
       */
-      field->can_alter_field_type= 0;
       Item_field *ifield= new Item_field((Field *) field);
       if (!ifield)
          DBUG_RETURN(1);
@@ -2173,19 +2206,20 @@ bool Query_result_update::initialize_tables(JOIN *join)
     temp_fields.concat(fields_for_table[cnt]);
 
     /* Make an unique key over the first field to avoid duplicated updates */
-    memset(&group, 0, sizeof(group));
-    group.direction= ORDER::ORDER_ASC;
-    group.item= temp_fields.head_ref();
+    group = new ORDER;
+    memset(group, 0, sizeof(*group));
+    group->direction = ORDER::ORDER_ASC;
+    group->item = temp_fields.head_ref();
 
     tmp_param->quick_group=1;
     tmp_param->field_count=temp_fields.elements;
     tmp_param->group_parts=1;
     tmp_param->group_length= table->file->ref_length;
     /* small table, ignore SQL_BIG_TABLES */
-    my_bool save_big_tables= thd->variables.big_tables; 
+    my_bool save_big_tables= thd->variables.big_tables;
     thd->variables.big_tables= FALSE;
     tmp_tables[cnt]=create_tmp_table(thd, tmp_param, temp_fields,
-                                     &group, 0, 0,
+                                     group, 0, 0,
                                      TMP_TABLE_ALL_COLUMNS, HA_POS_ERROR, "");
     thd->variables.big_tables= save_big_tables;
     if (!tmp_tables[cnt])
@@ -2200,6 +2234,7 @@ bool Query_result_update::initialize_tables(JOIN *join)
     */
     tmp_tables[cnt]->triggers= table->triggers;
     tmp_tables[cnt]->file->extra(HA_EXTRA_WRITE_CACHE);
+    tmp_tables[cnt]->file->ha_index_init(0, false /*sorted*/);
   }
   DBUG_RETURN(0);
 }
@@ -2221,6 +2256,8 @@ Query_result_update::~Query_result_update()
     {
       if (tmp_tables[cnt])
       {
+        tmp_tables[cnt]->file->ha_index_or_rnd_end();
+        delete tmp_tables[cnt]->group;
 	free_tmp_table(thd, tmp_tables[cnt]);
 	tmp_table_param[cnt].cleanup();
       }
@@ -2229,9 +2266,9 @@ Query_result_update::~Query_result_update()
   if (copy_field)
     delete [] copy_field;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;		// Restore this setting
-  DBUG_ASSERT(trans_safe || !updated ||
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(trans_safe || !updated ||
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
 
   if (update_operations != NULL)
     for (uint i= 0; i < table_count; i++)
@@ -2356,8 +2393,9 @@ bool Query_result_update::send_data(List<Item> &not_used_values)
       do
       {
         tbl->file->position(tbl->record[0]);
-        memcpy((char*) tmp_table->visible_field_ptr()[field_num]->ptr,
-               (char*) tbl->file->ref, tbl->file->ref_length);
+        tmp_table->visible_field_ptr()[field_num]->store(
+            reinterpret_cast<const char *>(tbl->file->ref),
+            tbl->file->ref_length, &my_charset_bin);
         /*
          For outer joins a rowid field may have no NOT_NULL_FLAG,
          so we have to reset NULL bit for this field.
@@ -2387,19 +2425,24 @@ bool Query_result_update::send_data(List<Item> &not_used_values)
                   1 + unupdated_check_opt_tables.elements,
                   *values_for_table[offset], NULL, NULL);
 
+      // check if a record exists with the same hash value
+      if (!check_unique_constraint(tmp_table))
+        DBUG_RETURN(0); // skip adding duplicate record to the temp table
+
       /* Write row, ignoring duplicated updates to a row */
       error= tmp_table->file->ha_write_row(tmp_table->record[0]);
       if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE)
       {
         if (error &&
-            create_ondisk_from_heap(thd, tmp_table,
-                                         tmp_table_param[offset].start_recinfo,
-                                         &tmp_table_param[offset].recinfo,
-                                         error, TRUE, NULL))
-        {
-          do_update= 0;
-	  DBUG_RETURN(1);			// Not a table_is_full error
-	}
+            (create_ondisk_from_heap(thd, tmp_table,
+                                     tmp_table_param[offset].start_recinfo,
+                                     &tmp_table_param[offset].recinfo,
+                                     error, TRUE, NULL) ||
+             tmp_table->file->ha_index_init(0, false /*sorted*/)))
+         {
+           do_update= 0;
+           DBUG_RETURN(1);			// Not a table_is_full error
+         }
         found++;
       }
     }
@@ -2444,8 +2487,8 @@ void Query_result_update::abort_result_set()
 
   if (! trans_safe)
   {
-    DBUG_ASSERT(thd->get_transaction()->cannot_safely_rollback(
-      Transaction_ctx::STMT));
+    assert(thd->get_transaction()->cannot_safely_rollback(
+                                                          Transaction_ctx::STMT));
     if (do_update && table_count > 1)
     {
       /* Add warning here */
@@ -2476,9 +2519,9 @@ void Query_result_update::abort_result_set()
                               transactional_tables, false, false, errcode);
     }
   }
-  DBUG_ASSERT(trans_safe || !updated ||
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(trans_safe || !updated ||
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
 }
 
 
@@ -2539,6 +2582,7 @@ int Query_result_update::do_updates()
       continue;                                        // Already updated
     org_updated= updated;
     tmp_table= tmp_tables[cur_table->shared];
+    tmp_table->file->ha_index_or_rnd_end();
     tmp_table->file->extra(HA_EXTRA_CACHE);	// Change to read cache
     if ((local_error= table->file->ha_rnd_init(0)))
     {
@@ -2607,10 +2651,16 @@ int Query_result_update::do_updates()
       uint field_num= 0;
       do
       {
-        if((local_error=
-              tbl->file->ha_rnd_pos(tbl->record[0],
-                                    (uchar *) tmp_table->visible_field_ptr()[field_num]->ptr)))
-        {
+        /*
+          The row-id is after the "length bytes", and the storage
+          engine knows its length. Pass the pointer to the data after
+          the "length bytes" to ha_rnd_pos().
+        */
+        uchar *data_ptr = NULL;
+        tmp_table->visible_field_ptr()[field_num]->get_ptr(&data_ptr);
+        if ((local_error = tbl->file->ha_rnd_pos(
+                 tbl->record[0],
+                 const_cast<uchar *>(data_ptr)))) {
           if (table->file->is_fatal_error(local_error))
             error_flags|= ME_FATALERROR;
 
@@ -2789,9 +2839,9 @@ bool Query_result_update::send_eof()
       }
     }
   }
-  DBUG_ASSERT(trans_safe || !updated || 
-              thd->get_transaction()->cannot_safely_rollback(
-                Transaction_ctx::STMT));
+  assert(trans_safe || !updated || 
+         thd->get_transaction()->cannot_safely_rollback(
+                                                        Transaction_ctx::STMT));
 
   if (local_error != 0)
     error_handled= TRUE; // to force early leave from ::send_error()
@@ -2853,7 +2903,7 @@ bool Sql_cmd_update::try_single_table_update(THD *thd,
   if (lex->is_ignore())
     lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_UPDATE_IGNORE);
 
-  DBUG_ASSERT(select_lex->offset_limit == 0);
+  assert(select_lex->offset_limit == 0);
   unit->set_limit(select_lex);
   MYSQL_UPDATE_START(const_cast<char*>(thd->query().str));
 
@@ -2894,7 +2944,7 @@ bool Sql_cmd_update::try_single_table_update(THD *thd,
   }
   else
   {
-    DBUG_ASSERT(all_tables->is_view());
+    assert(all_tables->is_view());
     DBUG_PRINT("info", ("Switch to multi-update"));
     if (!thd->in_sub_stmt)
       thd->query_plan.set_query_plan(SQLCOM_UPDATE_MULTI, lex,
@@ -3018,7 +3068,7 @@ bool Sql_cmd_update::execute(THD *thd)
 
 bool Sql_cmd_update::prepared_statement_test(THD *thd)
 {
-  DBUG_ASSERT(thd->lex->query_tables == thd->lex->select_lex->get_table_list());
+  assert(thd->lex->query_tables == thd->lex->select_lex->get_table_list());
   if (thd->lex->sql_command == SQLCOM_UPDATE)
   {
     int res= mysql_test_update(thd);
diff --git a/sql/sql_update.h b/sql/sql_update.h
index 16d824ff970b..ca1b0ffa547f 100644
--- a/sql/sql_update.h
+++ b/sql/sql_update.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index d9605a294dac..6ee1391cb46d 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -211,8 +218,13 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
   size_t key_length;
   LEX *lex= thd->lex;
   TABLE_LIST decoy;
-
-  memcpy (&decoy, view, sizeof (TABLE_LIST));
+  decoy= *view;
+  /*
+    It's not clear what the above assignment actually wants to
+    accomplish. What we do know is that it does *not* want to copy the MDL
+    request, so we overwrite it with an uninitialized request.
+  */
+  decoy.mdl_request = MDL_request();
 
   key_length= get_table_def_key(view, &key);
 
@@ -411,8 +423,8 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   DBUG_ENTER("mysql_create_view");
 
   /* This is ensured in the parser. */
-  DBUG_ASSERT(!lex->proc_analyse && !lex->result &&
-              !lex->param_list.elements);
+  assert(!lex->proc_analyse && !lex->result &&
+         !lex->param_list.elements);
 
   /*
     We can't allow taking exclusive meta-data locks of unlocked view under
@@ -564,7 +576,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
         (they were not copied at derived tables processing)
       */
       tbl->table->grant.privilege= tbl->grant.privilege;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       tbl->table->grant.want_privilege= tbl->grant.want_privilege;
 #endif
     }
@@ -655,7 +667,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
     
     for (sl= select_lex; sl; sl= sl->next_select())
     {
-      DBUG_ASSERT(view->db);                     /* Must be set in the parser */
+      assert(view->db);                     /* Must be set in the parser */
       List_iterator_fast<Item> it(sl->item_list);
       Item *item;
       while ((item= it++))
@@ -1165,24 +1177,8 @@ bool open_and_read_view(THD *thd, TABLE_SHARE *share,
   {
     /*
       It's an execution of a PS/SP and the view has already been unfolded
-      into a list of used tables. Now we only need to update the information
-      about granted privileges in the view tables with the actual data
-      stored in MySQL privilege system.  We don't need to restore the
-      required privileges (by calling register_want_access) because they has
-      not changed since PREPARE or the previous execution: the only case
-      when this information is changed is execution of UPDATE on a view, but
-      the original want_access is restored in its end.
-
-      Optimizer trace: because tables have been unfolded already, they are
-      in LEX::query_tables of the statement using the view. So privileges on
-      them are checked as done for explicitely listed tables, in constructor
-      of Opt_trace_start. Security context change is checked in
-      prepare_security() below.
+      into a list of used tables.
     */
-    if (!view_ref->prelocking_placeholder &&
-        view_ref->prepare_security(thd))
-      DBUG_RETURN(true);
-
     DBUG_PRINT("info",
                ("VIEW %s.%s is already processed on previous PS/SP execution",
                 view_ref->view_db.str, view_ref->view_name.str));
@@ -1223,7 +1219,7 @@ bool open_and_read_view(THD *thd, TABLE_SHARE *share,
   view_ref->definer.user.str= view_ref->definer.host.str= 0;
   view_ref->definer.user.length= view_ref->definer.host.length= 0;
 
-  DBUG_ASSERT(share->view_def != NULL);
+  assert(share->view_def != NULL);
   if (share->view_def->parse((uchar*)view_ref, thd->mem_root,
                              view_parameters, required_view_parameters,
                              &file_parser_dummy_hook))
@@ -1232,9 +1228,9 @@ bool open_and_read_view(THD *thd, TABLE_SHARE *share,
   // Check old format view .frm file
   if (!view_ref->definer.user.str)
   {
-    DBUG_ASSERT(!view_ref->definer.host.str &&
-                !view_ref->definer.user.length &&
-                !view_ref->definer.host.length);
+    assert(!view_ref->definer.host.str &&
+           !view_ref->definer.user.length &&
+           !view_ref->definer.host.length);
     push_warning_printf(thd, Sql_condition::SL_WARNING,
                         ER_VIEW_FRM_NO_USER, ER(ER_VIEW_FRM_NO_USER),
                         view_ref->db, view_ref->table_name);
@@ -1251,6 +1247,19 @@ bool open_and_read_view(THD *thd, TABLE_SHARE *share,
   DBUG_RETURN(false);
 }
 
+/**
+  Merge a view query expression into the parent expression.
+  Update all LEX pointers inside the view expression to point to the parent LEX.
+
+  @param view_lex  View's LEX object.
+  @param parent_lex   Original LEX object.
+*/
+void merge_query_blocks(LEX *view_lex, LEX *parent_lex)
+{
+  for (SELECT_LEX *select= view_lex->all_selects_list;
+       select != NULL; select= select->next_select_in_list())
+    select->parent_lex= parent_lex;
+}
 
 /**
   Parse a view definition.
@@ -1363,8 +1372,9 @@ bool parse_view_definition(THD *thd, TABLE_LIST *view_ref)
   thd->variables.sql_mode&= ~(MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
                               MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES);
 
-  if (thd->m_digest != NULL)
-    thd->m_digest->reset(thd->m_token_array, max_digest_length);
+  // Do not pollute the current statement
+  // with a digest of the view definition
+  assert(! parser_state.m_input.m_has_digest);
 
   // Parse the query text of the view
   result= parse_sql(thd, &parser_state, view_ref->view_creation_ctx);
@@ -1430,7 +1440,7 @@ bool parse_view_definition(THD *thd, TABLE_LIST *view_ref)
     view_no_suid.db= view_ref->db;
     view_no_suid.table_name= view_ref->table_name;
 
-    DBUG_ASSERT(view_tables == NULL || view_tables->security_ctx == NULL);
+    assert(view_tables == NULL || view_tables->security_ctx == NULL);
 
     if (check_table_access(thd, SELECT_ACL, view_tables,
                            false, UINT_MAX, true) ||
@@ -1656,7 +1666,7 @@ bool parse_view_definition(THD *thd, TABLE_LIST *view_ref)
   // Assign the context to the tables referenced in the view
   if (view_tables)
   {
-    DBUG_ASSERT(view_tables_tail);
+    assert(view_tables_tail);
     for (TABLE_LIST *tbl= view_tables;
          tbl != view_tables_tail->next_global;
          tbl= tbl->next_global)
@@ -1681,11 +1691,18 @@ bool parse_view_definition(THD *thd, TABLE_LIST *view_ref)
     sl->context.view_error_handler_arg= view_ref;
   }
 
+  merge_query_blocks(thd->lex, old_lex);
+
   view_select->linkage= DERIVED_TABLE_TYPE;
 
   // Updatability is not decided yet
-  DBUG_ASSERT(!view_ref->is_updatable());
+  assert(!view_ref->is_updatable());
 
+  // another level of nesting would exceed the max supported nesting level
+  if (view_ref->select_lex->nest_level >= (int) MAX_SELECT_NESTING) {
+    my_error(ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT, MYF(0));
+    DBUG_RETURN(true);
+  }
   // Link query expression of view into the outer query
   view_lex->unit->include_down(old_lex, view_ref->select_lex);
 
@@ -1697,10 +1714,56 @@ bool parse_view_definition(THD *thd, TABLE_LIST *view_ref)
 
   view_ref->derived_key_list.empty();
 
-  DBUG_ASSERT(view_lex == thd->lex);
+  assert(view_lex == thd->lex);
   thd->lex= old_lex;                            // Needed for prepare_security
-  result= !view_ref->prelocking_placeholder &&
-          view_ref->prepare_security(thd);
+
+  result= view_ref->prepare_security(thd);
+
+  if (!result && old_lex->sql_command == SQLCOM_LOCK_TABLES && view_tables)
+  {
+    /*
+      For LOCK TABLES we need to check if user which security context is used
+      for view execution has necessary privileges for acquiring strong locks
+      on its underlying tables. These are LOCK TABLES and SELECT privileges.
+      Note that we only require SELECT and not LOCK TABLES on underlying
+      tables at view creation time. And these privileges might have been
+      revoked from user since then in any case.
+    */
+    assert(view_tables_tail);
+    for (TABLE_LIST *tbl= view_tables; tbl != view_tables_tail->next_global;
+         tbl= tbl->next_global)
+    {
+      bool fake_lock_tables_acl;
+      if (check_lock_view_underlying_table_access(thd, tbl,
+                                                  &fake_lock_tables_acl))
+      {
+        result= true;
+        break;
+      }
+
+      if (fake_lock_tables_acl)
+      {
+        /*
+          Do not acquire strong metadata locks for I_S and read-only/
+          truncatable-only P_S tables (i.e. for cases when we override
+          refused LOCK_TABLES_ACL). It is safe to do this since:
+          1) For read-only/truncatable-only P_S tables under LOCK TABLES
+             we do not look at locked tables, and open them separately.
+          2) Before 8.0 all I_S tables are implemented as temporary tables
+             populated by special hook, so we do not acquire metadata
+             locks or do normal open for them at all.
+        */
+        assert(belongs_to_p_s(tbl) || tbl->schema_table);
+        tbl->mdl_request.set_type(MDL_SHARED_READ);
+        /*
+          We must override thr_lock_type (which can be a write type) as
+          well. This is necessary to keep consistency with MDL and to allow
+          concurrent access to read-only and truncatable-only P_S tables.
+        */
+        tbl->lock_type= TL_READ_DEFAULT;
+      }
+    }
+  }
 
   lex_end(view_lex);
 
@@ -2075,7 +2138,6 @@ mysql_rename_view(THD *thd,
       view definition parsing or use temporary 'view_def'
       object for it.
     */
-    memset(&view_def, 0, sizeof(view_def));
     view_def.timestamp.str= view_def.timestamp_buffer;
     view_def.view_suid= TRUE;
 
diff --git a/sql/sql_view.h b/sql/sql_view.h
index e060755f9825..8bdeb917ffc3 100644
--- a/sql/sql_view.h
+++ b/sql/sql_view.h
@@ -2,16 +2,23 @@
 #define SQL_VIEW_INCLUDED
 
 /* -*- C++ -*- */
-/* Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 2275de122f46..db055a56c425 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,6 +35,7 @@ Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 #define YYLIP (& YYTHD->m_parser_state->m_lip)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 #define YYCSCL (YYLIP->query_charset)
+#define YYCLIENT_NO_SCHEMA (YYTHD->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA))
 
 #define YYINITDEPTH 100
 #define YYMAXDEPTH 3200                        /* Because of 64K stack */
@@ -76,6 +84,7 @@ Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 #include "item_json_func.h"
 #include "sql_plugin.h"                      // plugin_is_ready
 #include "parse_tree_hints.h"
+#include "sql_show_processlist.h"
 
 /* this is to get the bison compilation windows warnings out */
 #ifdef _MSC_VER
@@ -168,7 +177,7 @@ int yylex(void *yylval, void *yythd);
   } while(0)
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #define YYDEBUG 1
 #else
 #define YYDEBUG 0
@@ -211,7 +220,7 @@ void MYSQLerror(YYLTYPE *, THD *thd, const char *s)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 void turn_parser_debug_on()
 {
   /*
@@ -463,6 +472,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
    Comments for TOKENS.
    For each token, please include in the same line a comment that contains
    the following tags:
+   SQL-2015-R : Reserved keyword as per SQL-2015 draft
    SQL-2003-R : Reserved keyword as per SQL-2003
    SQL-2003-N : Non Reserved keyword as per SQL-2003
    SQL-1999-R : Reserved keyword as per SQL-1999
@@ -1127,6 +1137,12 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
 %token  YEAR_SYM                      /* SQL-2003-R */
 %token  ZEROFILL
 
+/*
+   Tokens from MySQL 8.0
+*/
+%token  JSON_OBJECTAGG                /* SQL-2015-R */
+%token  JSON_ARRAYAGG                 /* SQL-2015-R */
+
 /*
   Resolve column attribute ambiguity -- force precedence of "UNIQUE KEY" against
   simple "UNIQUE" and "KEY" attributes:
@@ -1175,7 +1191,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
         text_string opt_gconcat_separator
 
 %type <num>
-        type type_with_opt_collate int_type real_type order_dir lock_option
+        type type_with_opt_collate int_type real_type lock_option
         udf_type if_exists opt_local opt_table_options table_options
         table_option opt_if_not_exists opt_no_write_to_binlog
         opt_temporary all_or_any opt_distinct
@@ -1185,6 +1201,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, YYLTYPE **c, ulong *yystacksize);
         opt_ev_status opt_ev_on_completion ev_on_completion opt_ev_comment
         ev_alter_on_schedule_completion opt_ev_rename_to opt_ev_sql_stmt
         trg_action_time trg_event field_def
+        ordering_direction opt_ordering_direction
 
 /*
   Bit field of MYSQL_START_TRANS_OPT_* flags.
@@ -1423,6 +1440,7 @@ END_OF_INPUT
 %type <subselect> subselect
 
 %type <order_expr> order_expr
+        grouping_expr
 
 %type <order_list> order_list group_list gorder_list opt_gorder_clause
 
@@ -1815,7 +1833,7 @@ change:
               Clear LEX_MASTER_INFO struct. repl_ignore_server_ids is cleared
               in THD::cleanup_after_query. So it is guaranteed to be empty here.
             */
-            DBUG_ASSERT(Lex->mi.repl_ignore_server_ids.empty());
+            assert(Lex->mi.repl_ignore_server_ids.empty());
             lex->mi.set_unspecified();
           }
           master_defs opt_channel
@@ -1824,7 +1842,7 @@ change:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->sql_command = SQLCOM_CHANGE_REPLICATION_FILTER;
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_change_repl_filter();
             if (lex->m_sql_cmd == NULL)
@@ -1843,42 +1861,42 @@ filter_def:
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_DO_DB);
           }
         | REPLICATE_IGNORE_DB EQ opt_filter_db_list
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_IGNORE_DB);
           }
         | REPLICATE_DO_TABLE EQ opt_filter_table_list
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
            filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_DO_TABLE);
           }
         | REPLICATE_IGNORE_TABLE EQ opt_filter_table_list
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_IGNORE_TABLE);
           }
         | REPLICATE_WILD_DO_TABLE EQ opt_filter_string_list
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_WILD_DO_TABLE);
           }
         | REPLICATE_WILD_IGNORE_TABLE EQ opt_filter_string_list
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3,
                                              OPT_REPLICATE_WILD_IGNORE_TABLE);
           }
@@ -1886,7 +1904,7 @@ filter_def:
           {
             Sql_cmd_change_repl_filter * filter_sql_cmd=
               (Sql_cmd_change_repl_filter*) Lex->m_sql_cmd;
-            DBUG_ASSERT(filter_sql_cmd);
+              assert(filter_sql_cmd);
             filter_sql_cmd->set_filter_value($3, OPT_REPLICATE_REWRITE_DB);
           }
         ;
@@ -2267,7 +2285,7 @@ create:
             lex->alter_info.reset();
             lex->col_list.empty();
             lex->change=NullS;
-            memset(&lex->create_info, 0, sizeof(lex->create_info));
+	    new (&lex->create_info) HA_CREATE_INFO;
             lex->create_info.options=$2 | $4;
             lex->create_info.default_table_charset= NULL;
             lex->name.str= 0;
@@ -2932,10 +2950,22 @@ sp_decl:
             uint num_vars= pctx->context_var_count();
             enum enum_field_types var_type= (enum enum_field_types) $4;
             Item *dflt_value_item= $5;
+            const bool has_default_clause = (dflt_value_item != NULL);
+            bool is_const_item = false;
+
             LEX_STRING dflt_value_query= EMPTY_STR;
 
-            if (dflt_value_item)
-            {
+            if (has_default_clause) {
+              // Handling a NEG_FUNC wrapping a constant.
+              if (dflt_value_item->type() == Item::FUNC_ITEM) {
+                Item_func *func_item = down_cast<Item_func *>(dflt_value_item);
+                if (func_item->functype() == Item_func::NEG_FUNC) {
+                  is_const_item = true;
+                }
+              } else if (dflt_value_item->const_item()) {
+                is_const_item = true;
+              }
+
               // sp_opt_default only pushes start ptr for DEFAULT clause.
               const char *expr_start_ptr=
                 sp->m_parser_data.pop_expr_start_ptr();
@@ -2955,10 +2985,13 @@ sp_decl:
                 MYSQL_YYABORT;
             }
 
+            sp_variable *first_spvar = NULL;
+            const uint first_var_num = num_vars - $2;
+
             // We can have several variables in DECLARE statement.
             // We need to create an sp_instr_set instruction for each variable.
 
-            for (uint i = num_vars-$2 ; i < num_vars ; i++)
+            for (uint i = first_var_num; i < num_vars; i++)
             {
               uint var_idx= pctx->var_context2runtime(i);
               sp_variable *spvar= pctx->find_variable(var_idx);
@@ -2967,8 +3000,33 @@ sp_decl:
                 MYSQL_YYABORT;
 
               spvar->type= var_type;
+
+              // Transforming the following declare statements having non-const
+              // expressions:
+              // DECLARE a, b, c type DEFAULT expr;
+              //              to
+              // DECLARE a type DEFAULT expr, b type DEFAULT a,
+              //         c type DEFAULT a;
+
+              if (i == first_var_num) {
+                first_spvar = spvar;
+              } else if (has_default_clause && !is_const_item) {
+                Item_splocal *item =
+                  NEW_PTN Item_splocal(first_spvar->name, first_spvar->offset,
+                                       first_spvar->type, 0, 0);
+                if (item == NULL)
+                  MYSQL_YYABORT; // OOM
+#ifndef NDEBUG
+                item->m_sp = lex->sphead;
+#endif
+                dflt_value_item = item;
+              }
               spvar->default_value= dflt_value_item;
 
+              if (has_default_clause && !is_const_item && (i > first_var_num)) {
+                dflt_value_query = first_spvar->name;
+              }
+
               if (fill_field_definition(thd, sp, var_type, &spvar->field_def))
                 MYSQL_YYABORT;
 
@@ -3109,7 +3167,7 @@ sp_decl:
             LEX *cursor_lex= Lex;
             sp_head *sp= cursor_lex->sphead;
 
-            DBUG_ASSERT(cursor_lex->sql_command == SQLCOM_SELECT);
+assert(cursor_lex->sql_command == SQLCOM_SELECT);
 
             if (cursor_lex->result)
             {
@@ -3704,8 +3762,8 @@ sp_proc_stmt_statement:
               instructions for them were already added during processing
               of "set" rule.
             */
-            DBUG_ASSERT(lex->sql_command != SQLCOM_SET_OPTION ||
-                        lex->var_list.is_empty());
+            assert(lex->sql_command != SQLCOM_SET_OPTION ||
+            lex->var_list.is_empty());
             if (lex->sql_command != SQLCOM_SET_OPTION)
             {
               /* Extract the query statement from the tokenizer. */
@@ -5391,12 +5449,12 @@ sub_part_field_item:
 part_func_expr:
           bit_expr
           {
+            LEX *lex= Lex;
+            lex->safe_to_cache_query = true;
             ITEMIZE($1, &$1);
 
-            LEX *lex= Lex;
             bool not_corr_func;
             not_corr_func= !lex->safe_to_cache_query;
-            lex->safe_to_cache_query= 1;
             if (not_corr_func)
             {
               my_syntax_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR));
@@ -5509,56 +5567,47 @@ opt_part_values:
           {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
-            if (! lex->is_partition_management())
+            if (part_info->part_type == NOT_A_PARTITION)
+              part_info->part_type= HASH_PARTITION;
+            else if (part_info->part_type == RANGE_PARTITION)
             {
-              if (part_info->part_type == RANGE_PARTITION)
-              {
-                my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
-                         "RANGE", "LESS THAN");
-                MYSQL_YYABORT;
-              }
-              if (part_info->part_type == LIST_PARTITION)
-              {
-                my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
-                         "LIST", "IN");
-                MYSQL_YYABORT;
-              }
+              my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
+                       "RANGE", "LESS THAN");
+              MYSQL_YYABORT;
+            }
+            else if (part_info->part_type == LIST_PARTITION)
+            {
+              my_error(ER_PARTITION_REQUIRES_VALUES_ERROR, MYF(0),
+                       "LIST", "IN");
+              MYSQL_YYABORT;
             }
-            else
-              part_info->part_type= HASH_PARTITION;
           }
         | VALUES LESS_SYM THAN_SYM
           {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
-            if (! lex->is_partition_management())
+            if (part_info->part_type == NOT_A_PARTITION)
+              part_info->part_type= RANGE_PARTITION;
+            else if (part_info->part_type != RANGE_PARTITION)
             {
-              if (part_info->part_type != RANGE_PARTITION)
-              {
-                my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0),
-                         "RANGE", "LESS THAN");
-                MYSQL_YYABORT;
-              }
+              my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0),
+                       "RANGE", "LESS THAN");
+              MYSQL_YYABORT;
             }
-            else
-              part_info->part_type= RANGE_PARTITION;
           }
           part_func_max {}
         | VALUES IN_SYM
           {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
-            if (! lex->is_partition_management())
+            if (part_info->part_type == NOT_A_PARTITION)
+              part_info->part_type= LIST_PARTITION;
+            else if (part_info->part_type != LIST_PARTITION)
             {
-              if (part_info->part_type != LIST_PARTITION)
-              {
-                my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0),
-                               "LIST", "IN");
-                MYSQL_YYABORT;
-              }
+              my_error(ER_PARTITION_WRONG_VALUES_ERROR, MYF(0),
+                       "LIST", "IN");
+              MYSQL_YYABORT;
             }
-            else
-              part_info->part_type= LIST_PARTITION;
           }
           part_values_in {}
         ;
@@ -5693,9 +5742,10 @@ part_value_expr_item:
           }
         | bit_expr
           {
+            LEX *lex= Lex;
+            lex->safe_to_cache_query = true;
             ITEMIZE($1, &$1);
 
-            LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
             Item *part_expr= $1;
 
@@ -6076,8 +6126,8 @@ create_table_option:
               table being created/altered and parent tables.
             */
             TABLE_LIST *last_non_sel_table= lex->create_last_non_select_table;
-            DBUG_ASSERT(last_non_sel_table->next_global ==
-                        lex->create_info.merge_list.first);
+            assert(last_non_sel_table->next_global ==
+            lex->create_info.merge_list.first);
             last_non_sel_table->next_global= 0;
             Lex->query_tables_last= &last_non_sel_table->next_global;
 
@@ -6169,7 +6219,7 @@ storage_engines:
               $$= plugin_data<handlerton*>(plugin);
             else
             {
-              if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
+              if (!is_engine_substitution_allowed(thd))
               {
                 my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
                 MYSQL_YYABORT;
@@ -6352,6 +6402,12 @@ field_def:
           opt_gcol_attribute_list
           {
             $$= $1;
+            /* column of type SERIAL cannot set as generated */
+            if (Lex->type & SERIAL_FLAG)
+            {
+                my_error(ER_WRONG_USAGE, MYF(0), "SERIAL", "generated column");
+                MYSQL_YYABORT;
+            }
             if (Lex->charset)
             {
               Lex->charset= merge_charset_and_collation(Lex->charset, $2);
@@ -6582,7 +6638,12 @@ type:
           {
             Lex->dec= const_cast<char *>($2);
             if (YYTHD->variables.sql_mode & MODE_MAXDB)
+            {
+              push_warning(current_thd, Sql_condition::SL_WARNING,
+                  WARN_DEPRECATED_MAXDB_SQL_MODE_FOR_TIMESTAMP,
+                  ER_THD(YYTHD, WARN_DEPRECATED_MAXDB_SQL_MODE_FOR_TIMESTAMP));
               $$=MYSQL_TYPE_DATETIME2;
+            }
             else
             {
               /*
@@ -6714,7 +6775,7 @@ type:
           {
             $$=MYSQL_TYPE_LONGLONG;
             Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
-              UNIQUE_FLAG);
+              UNIQUE_FLAG | SERIAL_FLAG);
           }
         | JSON_SYM
           {
@@ -7432,8 +7493,14 @@ btree_or_rtree:
         ;
 
 key_list:
-          key_list ',' key_part order_dir { Lex->col_list.push_back($3); }
-        | key_part order_dir { Lex->col_list.push_back($1); }
+          key_list ',' key_part opt_ordering_direction
+          {
+            Lex->col_list.push_back($3);
+          }
+        | key_part opt_ordering_direction
+          {
+            Lex->col_list.push_back($1);
+          }
         ;
 
 key_part:
@@ -7492,7 +7559,7 @@ alter:
             lex->select_lex->init_order();
             lex->select_lex->db=
                     const_cast<char*>((lex->select_lex->table_list.first)->db);
-            memset(&lex->create_info, 0, sizeof(lex->create_info));
+	    new (&lex->create_info) HA_CREATE_INFO;
             lex->create_info.db_type= 0;
             lex->create_info.default_table_charset= NULL;
             lex->create_info.row_type= ROW_TYPE_NOT_USED;
@@ -7500,7 +7567,7 @@ alter:
             lex->no_write_to_binlog= 0;
             lex->create_info.storage_media= HA_SM_DEFAULT;
             lex->create_last_non_select_table= lex->last_table();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
           }
           alter_commands
           {
@@ -7889,7 +7956,7 @@ standalone_alter_commands:
             LEX *lex= thd->lex;
             lex->no_write_to_binlog= $3;
             lex->check_opt.init();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                               Sql_cmd_alter_table_optimize_partition();
             if (lex->m_sql_cmd == NULL)
@@ -7903,7 +7970,7 @@ standalone_alter_commands:
             LEX *lex= thd->lex;
             lex->no_write_to_binlog= $3;
             lex->check_opt.init();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                               Sql_cmd_alter_table_analyze_partition();
             if (lex->m_sql_cmd == NULL)
@@ -7914,7 +7981,7 @@ standalone_alter_commands:
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->check_opt.init();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                               Sql_cmd_alter_table_check_partition();
             if (lex->m_sql_cmd == NULL)
@@ -7928,7 +7995,7 @@ standalone_alter_commands:
             LEX *lex= thd->lex;
             lex->no_write_to_binlog= $3;
             lex->check_opt.init();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                               Sql_cmd_alter_table_repair_partition();
             if (lex->m_sql_cmd == NULL)
@@ -7947,7 +8014,7 @@ standalone_alter_commands:
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             lex->check_opt.init();
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                               Sql_cmd_alter_table_truncate_partition();
             if (lex->m_sql_cmd == NULL)
@@ -7974,7 +8041,7 @@ standalone_alter_commands:
                                                     TL_READ_NO_INSERT,
                                                     MDL_SHARED_NO_WRITE))
               MYSQL_YYABORT;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+              assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root)
                                Sql_cmd_alter_table_exchange_partition();
             if (lex->m_sql_cmd == NULL)
@@ -8694,7 +8761,7 @@ repair:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_repair_table();
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
@@ -8732,7 +8799,7 @@ analyze:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_analyze_table();
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
@@ -8767,7 +8834,7 @@ check:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_check_table();
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
@@ -8808,7 +8875,7 @@ optimize:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_optimize_table();
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
@@ -9198,9 +9265,9 @@ select_item_list:
           }
         | '*'
           {
-            Item *item= NEW_PTN Item_field(@$, NULL, NULL, "*");
+            Item *item = NEW_PTN Item_asterisk(@$, NULL, NULL);
             $$= NEW_PTN PT_select_item_list;
-            if ($$ == NULL || $$->push_back(item))
+            if ($$ == NULL || item == NULL || $$->push_back(item))
               MYSQL_YYABORT;
           }
         ;
@@ -10051,6 +10118,14 @@ sum_expr:
           {
             $$= NEW_PTN Item_sum_or(@$, $3);
           }
+        | JSON_ARRAYAGG '(' in_sum_expr ')'
+          {
+            $$= NEW_PTN Item_sum_json_array(@$, $3);
+          }
+        | JSON_OBJECTAGG '(' in_sum_expr ',' in_sum_expr ')'
+          {
+            $$= NEW_PTN Item_sum_json_object(@$, $3, $5);
+          }
         | BIT_XOR  '(' in_sum_expr ')'
           {
             $$= NEW_PTN Item_sum_xor(@$, $3);
@@ -10169,7 +10244,7 @@ gorder_list:
         | order_expr
           {
             $$= NEW_PTN PT_gorder_list();
-            if ($1 == NULL)
+            if ($$ == NULL)
               MYSQL_YYABORT;
             $$->push_back($1);
           }
@@ -10789,15 +10864,15 @@ opt_group_clause:
         ;
 
 group_list:
-          group_list ',' order_expr
+          group_list ',' grouping_expr
           {
             $1->push_back($3);
             $$= $1;
           }
-        | order_expr
+        | grouping_expr
           {
             $$= NEW_PTN PT_order_list();
-            if ($1 == NULL)
+            if ($$ == NULL)
               MYSQL_YYABORT;
             $$->push_back($1);
           }
@@ -10837,7 +10912,7 @@ alter_order_list:
         ;
 
 alter_order_item:
-          simple_ident_nospvar order_dir
+          simple_ident_nospvar opt_ordering_direction
           {
             ITEMIZE($1, &$1);
 
@@ -10877,15 +10952,19 @@ order_list:
         | order_expr
           {
             $$= NEW_PTN PT_order_list();
-            if ($1 == NULL)
+            if ($$ == NULL)
               MYSQL_YYABORT;
             $$->push_back($1);
           }
         ;
 
-order_dir:
+opt_ordering_direction:
           /* empty */ { $$ =  1; }
-        | ASC  { $$ =1; }
+        | ordering_direction
+        ;
+
+ordering_direction:
+          ASC  { $$ =1; }
         | DESC { $$ =0; }
         ;
 
@@ -11708,7 +11787,7 @@ truncate:
           {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
-            DBUG_ASSERT(!lex->m_sql_cmd);
+            assert(!lex->m_sql_cmd);
             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_truncate_table();
             if (lex->m_sql_cmd == NULL)
               MYSQL_YYABORT;
@@ -11787,7 +11866,7 @@ show:
           SHOW
           {
             LEX *lex=Lex;
-            memset(&lex->create_info, 0, sizeof(lex->create_info));
+	    new (&lex->create_info) HA_CREATE_INFO;
           }
           show_param
         ;
@@ -11995,7 +12074,12 @@ show_param:
             }
           }
         | opt_full PROCESSLIST_SYM
-          { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
+          {
+            THD *thd= YYTHD;
+            LEX *lex= thd->lex;
+            PT_statement *stmt = NEW_PTN PT_show_processlist(@$, lex->verbose /* $1 */);
+            MAKE_CMD(stmt);
+          }
         | opt_var_type VARIABLES opt_wild_or_where_for_show
           {
             THD *thd= YYTHD;
@@ -12258,7 +12342,7 @@ describe:
           opt_describe_column
           {
             // Ensure we're resetting parsing context of the right select
-            DBUG_ASSERT(Select->parsing_place == CTX_SELECT_LIST);
+            assert(Select->parsing_place == CTX_SELECT_LIST);
             Select->parsing_place= CTX_NONE;
           }
         | describe_command opt_extended_describe
@@ -12696,7 +12780,7 @@ opt_ignore_lines:
           /* empty */
         | IGNORE_SYM NUM lines_or_rows
           {
-            DBUG_ASSERT(Lex->exchange != 0);
+          assert(Lex->exchange != 0);
             Lex->exchange->skip_lines= atol($2.str);
           }
         ;
@@ -12816,6 +12900,7 @@ param_marker:
           {
             $$= NEW_PTN Item_param(@$,
                                    (uint) (@1.raw.start - YYLIP->get_buf()));
+            Lex->param_list.push_back($$);
           }
         ;
 
@@ -12929,21 +13014,35 @@ insert_ident:
 table_wild:
           ident '.' '*'
           {
-            $$= NEW_PTN PTI_table_wild(@$, NULL, $1.str);
+            $$= NEW_PTN Item_asterisk(@$, NULL, $1.str);
           }
         | ident '.' ident '.' '*'
           {
-            $$= NEW_PTN PTI_table_wild(@$, $1.str, $3.str);
+            const char *schema_name = YYCLIENT_NO_SCHEMA ? NULL : $1.str;
+            $$= NEW_PTN Item_asterisk(@$, schema_name, $3.str);
           }
         ;
 
 order_expr:
-          expr order_dir
+          expr opt_ordering_direction
           {
             $$= NEW_PTN PT_order_expr($1, $2);
           }
         ;
 
+grouping_expr:
+          expr
+          {
+            $$= NEW_PTN PT_order_expr($1, 1);
+          }
+        | expr ordering_direction
+          {
+            push_deprecated_warn(YYTHD, "GROUP BY with ASC/DESC",
+                                 "GROUP BY ... ORDER BY ... ASC/DESC");
+            $$= NEW_PTN PT_order_expr($1, $2);
+          }
+        ;
+
 simple_ident:
           ident
           {
@@ -13021,11 +13120,9 @@ table_ident:
           }
         | ident '.' ident
           {
-            if (YYTHD->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA))
-              $$= NEW_PTN Table_ident(to_lex_cstring($3));
-            else {
-              $$= NEW_PTN Table_ident(to_lex_cstring($1), to_lex_cstring($3));
-            }
+            LEX_CSTRING schema_name= YYCLIENT_NO_SCHEMA ? LEX_CSTRING()
+                                                        : to_lex_cstring($1);
+            $$= NEW_PTN Table_ident(schema_name, to_lex_cstring($3));
             if ($$ == NULL)
               MYSQL_YYABORT;
           }
@@ -14366,7 +14463,7 @@ grant_ident:
             if (lex->copy_db_to(&lex->current_select()->db, &dummy))
               MYSQL_YYABORT;
             if (lex->grant == GLOBAL_ACLS)
-              lex->grant = DB_ACLS & ~GRANT_ACL;
+              lex->grant = DB_OP_ACLS;
             else if (lex->columns.elements)
             {
               my_message(ER_ILLEGAL_GRANT_FOR_TABLE,
@@ -14379,7 +14476,7 @@ grant_ident:
             LEX *lex= Lex;
             lex->current_select()->db = $1.str;
             if (lex->grant == GLOBAL_ACLS)
-              lex->grant = DB_ACLS & ~GRANT_ACL;
+              lex->grant = DB_OP_ACLS;
             else if (lex->columns.elements)
             {
               my_message(ER_ILLEGAL_GRANT_FOR_TABLE,
@@ -14407,7 +14504,7 @@ grant_ident:
                                                         TL_OPTION_UPDATING))
               MYSQL_YYABORT;
             if (lex->grant == GLOBAL_ACLS)
-              lex->grant =  TABLE_ACLS & ~GRANT_ACL;
+              lex->grant =  TABLE_OP_ACLS;
           }
         ;
 
diff --git a/sql/srv_session.cc b/sql/srv_session.cc
index 4c5df101c115..3db8079afd1c 100644
--- a/sql/srv_session.cc
+++ b/sql/srv_session.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -804,7 +811,7 @@ void Srv_session::deinit_thread()
 
   my_set_thread_local(THR_srv_session_thread, NULL);
 
-  DBUG_ASSERT(my_get_thread_local(THR_stack_start_address));
+  assert(my_get_thread_local(THR_stack_start_address));
   my_set_thread_local(THR_stack_start_address, NULL);
   my_thread_end();
 }
@@ -938,7 +945,7 @@ bool Srv_session::open()
   DBUG_ENTER("Srv_session::open");
 
   DBUG_PRINT("info",("Session=%p  THD=%p  DA=%p", this, &thd, &da));
-  DBUG_ASSERT(state == SRV_SESSION_CREATED || state == SRV_SESSION_CLOSED);
+  assert(state == SRV_SESSION_CREATED || state == SRV_SESSION_CLOSED);
 
   thd.set_protocol(&protocol_error);
   thd.push_diagnostics_area(&da);
@@ -1109,7 +1116,7 @@ bool Srv_session::detach()
   DBUG_PRINT("info",("Session=%p THD=%p current_thd=%p",
                      this, &thd, current_thd));
 
-  DBUG_ASSERT(&thd == current_thd);
+  assert(&thd == current_thd);
   thd.restore_globals();
 
   set_psi(NULL);
@@ -1147,7 +1154,7 @@ bool Srv_session::close()
   DBUG_PRINT("info",("Session=%p THD=%p current_thd=%p",
                      this, &thd, current_thd));
 
-  DBUG_ASSERT(state < SRV_SESSION_CLOSED);
+  assert(state < SRV_SESSION_CLOSED);
 
   /*
     RAII
@@ -1242,7 +1249,7 @@ int Srv_session::execute_command(enum enum_server_command command,
     DBUG_RETURN(1);
   }
 
-  DBUG_ASSERT(thd.get_protocol() == &protocol_error);
+  assert(thd.get_protocol() == &protocol_error);
 
   // RAII:the destructor restores the state
   Srv_session::Session_backup_and_attach backup(this, false);
@@ -1269,7 +1276,7 @@ int Srv_session::execute_command(enum enum_server_command command,
   if (command != COM_QUERY)
     thd.reset_for_next_command();
 
-  DBUG_ASSERT(thd.m_statement_psi == NULL);
+  assert(thd.m_statement_psi == NULL);
   thd.m_statement_psi= MYSQL_START_STATEMENT(&thd.m_statement_state,
                                              stmt_info_new_packet.m_key,
                                              thd.db().str,
diff --git a/sql/srv_session.h b/sql/srv_session.h
index 66e6b0ee2d02..45e01f8b922f 100644
--- a/sql/srv_session.h
+++ b/sql/srv_session.h
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/sql/srv_session_info_service.cc b/sql/srv_session_info_service.cc
index cf9010a3baa2..5206b61af731 100644
--- a/sql/srv_session_info_service.cc
+++ b/sql/srv_session_info_service.cc
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/sql/srv_session_service.cc b/sql/srv_session_service.cc
index e39187e46304..57817db0ee9c 100644
--- a/sql/srv_session_service.cc
+++ b/sql/srv_session_service.cc
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
diff --git a/sql/ssl_wrapper_service.cc b/sql/ssl_wrapper_service.cc
index 772b4f145569..7d1e997fcb9c 100644
--- a/sql/ssl_wrapper_service.cc
+++ b/sql/ssl_wrapper_service.cc
@@ -1,14 +1,20 @@
-/*  Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/*  Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; version 2 of the
-    License.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License, version 2.0,
+    as published by the Free Software Foundation.
+
+    This program is also distributed with certain software (including
+    but not limited to OpenSSL) that is licensed under separate terms,
+    as designated in a particular file or component or in included license
+    documentation.  The authors of MySQL hereby grant you an additional
+    permission to link the program and your derivative works with the
+    separately licensed software that they have included with MySQL.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License, version 2.0, for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
@@ -23,9 +29,6 @@
 #include <my_global.h>
 #include "mysql/service_rules_table.h"
 #include "openssl/ssl.h"
-#if defined(HAVE_YASSL)
-using namespace yaSSL;
-#endif // defined(HAVE_YASSL)
 #include "mysql/service_ssl_wrapper.h"
 
 #ifndef EMBEDDED_LIBRARY
@@ -41,18 +44,6 @@ dummy_function_to_ensure_we_are_linked_into_the_server() { return 1; }
 extern "C"
 {
 
-#ifdef HAVE_YASSL
-
-static char *
-my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
-{
-  if (!time)
-      return NULL;
-  return yaSSL_ASN1_TIME_to_string(time, buf, len);
-}
-
-#else /* openssl */
-
 static char *
 my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
 {
@@ -79,8 +70,6 @@ my_asn1_time_to_string(ASN1_TIME *time, char *buf, size_t len)
   return res;
 }
 
-#endif
-
 /**
   Return version of SSL used in current connection
 
@@ -322,10 +311,10 @@ long ssl_wrapper_sess_accept_good(struct st_VioSSLFd *vio_ssl)
 */
 void ssl_wrapper_thread_cleanup()
 {
-#if !defined(HAVE_YASSL)
   ERR_clear_error();
-  ERR_remove_state(0);
-#endif // !defined(HAVE_YASSL)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+  ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 }
 
 } /* extern "C" */
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index 151d84447532..daec5037e01a 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/strfunc.h b/sql/strfunc.h
index dc422b88a8cc..0bb1a43e3514 100644
--- a/sql/strfunc.h
+++ b/sql/strfunc.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/string_service.cc b/sql/string_service.cc
index 053eb129193d..3a608fe2ad57 100644
--- a/sql/string_service.cc
+++ b/sql/string_service.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/string_service.h b/sql/string_service.h
index e9d78e341dd9..373194ef27bb 100644
--- a/sql/string_service.h
+++ b/sql/string_service.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 63e4d959ca93..1a3367f61ba7 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -46,6 +53,7 @@
 #include "log_event.h"                   // MAX_MAX_ALLOWED_PACKET
 #include "rpl_info_factory.h"            // Rpl_info_factory
 #include "rpl_info_handler.h"            // INFO_REPOSITORY_FILE
+#include "rpl_handler.h"                 // delegates_set_lock_type
 #include "rpl_mi.h"                      // Master_info
 #include "rpl_msr.h"                     // channel_map
 #include "rpl_mts_submode.h"             // MTS_PARALLEL_TYPE_DB_NAME
@@ -61,18 +69,23 @@
 #include "transaction.h"                 // trans_commit_stmt
 #include "rpl_write_set_handler.h"       // transaction_write_set_hashing_algorithms
 #include "rpl_group_replication.h"       // is_group_replication_running
+#ifdef _WIN32
+#include "named_pipe.h"
+#endif
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
 #include "../storage/perfschema/pfs_server.h"
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
 
+#include "sql_show_processlist.h" // pfs_processlist_enabled
+
 TYPELIB bool_typelib={ array_elements(bool_values)-1, "", bool_values, 0 };
 
 static bool update_buffer_size(THD *thd, KEY_CACHE *key_cache,
                                ptrdiff_t offset, ulonglong new_value)
 {
   bool error= false;
-  DBUG_ASSERT(offset == offsetof(KEY_CACHE, param_buff_size));
+  assert(offset == offsetof(KEY_CACHE, param_buff_size));
 
   if (new_value == 0)
   {
@@ -124,7 +137,7 @@ static bool update_keycache_param(THD *thd, KEY_CACHE *key_cache,
                                   ptrdiff_t offset, ulonglong new_value)
 {
   bool error= false;
-  DBUG_ASSERT(offset != offsetof(KEY_CACHE, param_buff_size));
+  assert(offset != offsetof(KEY_CACHE, param_buff_size));
 
   keycache_var(key_cache, offset)= new_value;
 
@@ -169,6 +182,14 @@ static Sys_var_charptr Sys_pfs_instrument(
        DEFAULT(""),
        PFS_TRAILING_PROPERTIES);
 
+static Sys_var_mybool Sys_pfs_processlist(
+       "performance_schema_show_processlist",
+       "Default startup value to enable SHOW PROCESSLIST "
+       "in the performance schema.",
+       GLOBAL_VAR(pfs_processlist_enabled), CMD_LINE(OPT_ARG), DEFAULT(false),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL),
+       NULL, sys_var::PARSE_NORMAL);
+
 static Sys_var_mybool Sys_pfs_consumer_events_stages_current(
        "performance_schema_consumer_events_stages_current",
        "Default startup value for the events_stages_current consumer.",
@@ -746,9 +767,9 @@ static Sys_var_int32 Sys_binlog_max_flush_queue_time(
        CMD_LINE(REQUIRED_ARG, OPT_BINLOG_MAX_FLUSH_QUEUE_TIME),
        VALID_RANGE(0, 100000), DEFAULT(0), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
-static Sys_var_ulong Sys_binlog_group_commit_sync_delay(
+static Sys_var_long Sys_binlog_group_commit_sync_delay(
        "binlog_group_commit_sync_delay",
        "The number of microseconds the server waits for the "
        "binary log group commit sync queue to fill before "
@@ -772,7 +793,7 @@ static Sys_var_ulong Sys_binlog_group_commit_sync_no_delay_count(
 
 static bool check_has_super(sys_var *self, THD *thd, set_var *var)
 {
-  DBUG_ASSERT(self->scope() != sys_var::GLOBAL);// don't abuse check_has_super()
+  assert(self->scope() != sys_var::GLOBAL);// don't abuse check_has_super()
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (!(thd->security_context()->check_access(SUPER_ACL)))
   {
@@ -1104,6 +1125,7 @@ static bool repository_check(sys_var *self, THD *thd, set_var *var, SLAVE_THD_TY
 
   if (mi != NULL)
   {
+    mi->channel_wrlock();
     lock_slave_threads(mi);
     init_thread_mask(&running, mi, FALSE);
     if(!running)
@@ -1153,6 +1175,7 @@ static bool repository_check(sys_var *self, THD *thd, set_var *var, SLAVE_THD_TY
       my_error(ER_SLAVE_CHANNEL_MUST_STOP, MYF(0),mi->get_channel());
     }
     unlock_slave_threads(mi);
+    mi->channel_unlock();
   }
   channel_map.unlock();
 #endif
@@ -1172,7 +1195,7 @@ static bool master_info_repository_check(sys_var *self, THD *thd, set_var *var)
 static const char *repository_names[]=
 {
   "FILE", "TABLE",
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   "DUMMY",
 #endif
   0
@@ -1262,8 +1285,8 @@ static bool check_storage_engine(sys_var *self, THD *thd, set_var *var)
     {
       // Use the default value defined by sys_var.
       lex_string_set(&se_name,
-        reinterpret_cast<const char*>(
-        dynamic_cast<Sys_var_plugin*>(self)->global_value_ptr(thd, NULL)));
+        pointer_cast<const char*>(
+          down_cast<Sys_var_plugin*>(self)->global_value_ptr(thd, NULL)));
     }
 
     plugin_ref plugin;
@@ -1490,7 +1513,7 @@ static Sys_var_charptr Sys_datadir(
        READ_ONLY GLOBAL_VAR(mysql_real_data_home_ptr),
        CMD_LINE(REQUIRED_ARG, 'h'), IN_FS_CHARSET, DEFAULT(mysql_real_data_home));
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static Sys_var_dbug Sys_dbug(
        "debug", "Debug log", sys_var::SESSION,
        CMD_LINE(OPT_ARG, '#'), DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG,
@@ -1536,7 +1559,7 @@ static Sys_var_ulong Sys_delayed_insert_limit(
        GLOBAL_VAR(delayed_insert_limit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_delayed_insert_timeout(
        "delayed_insert_timeout",
@@ -1546,7 +1569,7 @@ static Sys_var_ulong Sys_delayed_insert_timeout(
        GLOBAL_VAR(delayed_insert_timeout), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(DELAYED_WAIT_TIMEOUT),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(0), DEPRECATED(""));
+       ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_delayed_queue_size(
        "delayed_queue_size",
@@ -1557,7 +1580,7 @@ static Sys_var_ulong Sys_delayed_queue_size(
        GLOBAL_VAR(delayed_queue_size), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 #ifndef EMBEDDED_LIBRARY
 static const char *event_scheduler_names[]= { "OFF", "ON", "DISABLED", NullS };
@@ -1873,6 +1896,18 @@ static bool transaction_write_set_check(sys_var *self, THD *thd, set_var *var)
              var->var->name.str);
     return true;
   }
+  /*
+    Disallow changing variable 'transaction_write_set_extraction' while
+    binlog_transaction_dependency_tracking is different from COMMIT_ORDER.
+  */
+  if (mysql_bin_log.m_dependency_tracker.m_opt_tracking_mode
+      != DEPENDENCY_TRACKING_COMMIT_ORDER)
+  {
+    my_error(ER_WRONG_USAGE, MYF(0),
+             "transaction_write_set_extraction (changed)",
+             "binlog_transaction_dependency_tracking (!= COMMIT_ORDER)");
+    return true;
+  }
   return false;
 }
 
@@ -2017,7 +2052,7 @@ static Sys_var_ulong Sys_log_warnings(
        CMD_LINE(OPT_ARG, 'W'),
        VALID_RANGE(0, 2), DEFAULT(2), BLOCK_SIZE(1), NO_MUTEX_GUARD,
        NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(update_log_warnings),
-       DEPRECATED("log_error_verbosity"));
+       DEPRECATED_VAR("log_error_verbosity"));
 
 static bool update_log_error_verbosity(sys_var *self, THD *thd,
                                        enum_var_type type)
@@ -2351,7 +2386,7 @@ static Sys_var_ulong Sys_max_insert_delayed_threads(
        NO_CMD_LINE, VALID_RANGE(0, 16384), DEFAULT(20),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(check_max_delayed_threads), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_max_delayed_threads(
        "max_delayed_threads",
@@ -2362,7 +2397,7 @@ static Sys_var_ulong Sys_max_delayed_threads(
        CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 16384), DEFAULT(20),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG,
        ON_CHECK(check_max_delayed_threads), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_max_error_count(
        "max_error_count",
@@ -2383,7 +2418,7 @@ static Sys_var_ulong Sys_metadata_locks_cache_size(
        READ_ONLY GLOBAL_VAR(mdl_locks_cache_size_unused),
        CMD_LINE(REQUIRED_ARG, OPT_MDL_CACHE_SIZE),
        VALID_RANGE(1, 1024*1024), DEFAULT(1024), BLOCK_SIZE(1), NO_MUTEX_GUARD,
-       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static ulong mdl_locks_hash_partitions_unused;
 static Sys_var_ulong Sys_metadata_locks_hash_instances(
@@ -2391,9 +2426,9 @@ static Sys_var_ulong Sys_metadata_locks_hash_instances(
        READ_ONLY GLOBAL_VAR(mdl_locks_hash_partitions_unused),
        CMD_LINE(REQUIRED_ARG, OPT_MDL_HASH_INSTANCES),
        VALID_RANGE(1, 1024), DEFAULT(8), BLOCK_SIZE(1), NO_MUTEX_GUARD,
-       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
-// relies on DBUG_ASSERT(sizeof(my_thread_id) == 4);
+// relies on assert(sizeof(my_thread_id) == 4);
 static Sys_var_uint Sys_pseudo_thread_id(
        "pseudo_thread_id",
        "This variable is for internal server use",
@@ -2506,7 +2541,7 @@ static Sys_var_ulong Sys_max_tmp_tables(
        "Maximum number of temporary tables a client can keep open at a time",
        SESSION_VAR(max_tmp_tables), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, ULONG_MAX), DEFAULT(32), BLOCK_SIZE(1), NO_MUTEX_GUARD,
-       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_max_write_lock_count(
        "max_write_lock_count",
@@ -2526,7 +2561,39 @@ static Sys_var_mybool Sys_named_pipe(
        "named_pipe", "Enable the named pipe (NT)",
        READ_ONLY GLOBAL_VAR(opt_enable_named_pipe), CMD_LINE(OPT_ARG),
        DEFAULT(FALSE));
-#endif
+#ifndef EMBEDDED_LIBRARY
+
+static PolyLock_rwlock PLock_named_pipe_full_access_group(
+  &LOCK_named_pipe_full_access_group);
+static bool check_named_pipe_full_access_group(sys_var *self, THD *thd,
+  set_var *var)
+{
+  if (!var->value) return false;  // DEFAULT is ok
+
+  if (!is_valid_named_pipe_full_access_group(
+    var->save_result.string_value.str))
+  {
+    my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), self->name.str,
+      var->save_result.string_value.str);
+    return true;
+  }
+  return false;
+}
+static bool fix_named_pipe_full_access_group(sys_var *, THD *, enum_var_type) {
+  return update_named_pipe_full_access_group(named_pipe_full_access_group);
+}
+static Sys_var_charptr Sys_named_pipe_full_access_group(
+  "named_pipe_full_access_group",
+  "Name of Windows group granted full access to the named pipe",
+  GLOBAL_VAR(named_pipe_full_access_group),
+  CMD_LINE(REQUIRED_ARG, OPT_NAMED_PIPE_FULL_ACCESS_GROUP), IN_FS_CHARSET,
+  DEFAULT(DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP),
+  &PLock_named_pipe_full_access_group, NOT_IN_BINLOG,
+  ON_CHECK(check_named_pipe_full_access_group),
+  ON_UPDATE(fix_named_pipe_full_access_group));
+
+#endif /* EMBEDDED_LIBRARY */
+#endif /* _WIN32 */
 
 
 static bool 
@@ -2782,7 +2849,7 @@ static const char *optimizer_switch_names[]=
   "materialization", "semijoin", "loosescan", "firstmatch", "duplicateweedout",
   "subquery_materialization_cost_based",
   "use_index_extensions", "condition_fanout_filter", "derived_merge",
-  "default", NullS
+  "prefer_ordering_index", "default", NullS
 };
 static Sys_var_flagset Sys_optimizer_switch(
        "optimizer_switch",
@@ -2793,7 +2860,8 @@ static Sys_var_flagset Sys_optimizer_switch(
        ", materialization, semijoin, loosescan, firstmatch, duplicateweedout,"
        " subquery_materialization_cost_based"
        ", block_nested_loop, batched_key_access, use_index_extensions,"
-       " condition_fanout_filter, derived_merge} and val is one of "
+       " condition_fanout_filter, derived_merge, prefer_ordering_index}"
+       " and val is one of "
        "{on, off, default}",
        SESSION_VAR(optimizer_switch), CMD_LINE(REQUIRED_ARG),
        optimizer_switch_names, DEFAULT(OPTIMIZER_SWITCH_DEFAULT),
@@ -3174,7 +3242,7 @@ static Sys_var_ulong Sys_multi_range_count(
        SESSION_VAR(multi_range_count), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(1, ULONG_MAX), DEFAULT(256), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static bool fix_thd_mem_root(sys_var *self, THD *thd, enum_var_type type)
 {
@@ -3318,7 +3386,7 @@ static Sys_var_ulong Sys_query_cache_size(
        GLOBAL_VAR(query_cache_size), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, ULONG_MAX), DEFAULT(1024U*1024U), BLOCK_SIZE(1024),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(fix_query_cache_size), DEPRECATED(""));
+       ON_UPDATE(fix_query_cache_size), DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_query_cache_limit(
        "query_cache_limit",
@@ -3327,7 +3395,7 @@ static Sys_var_ulong Sys_query_cache_limit(
        GLOBAL_VAR(query_cache.query_cache_limit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, ULONG_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static bool fix_qcache_min_res_unit(sys_var *self, THD *thd, enum_var_type type)
 {
@@ -3342,7 +3410,7 @@ static Sys_var_ulong Sys_query_cache_min_res_unit(
        GLOBAL_VAR(query_cache_min_res_unit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, ULONG_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE),
        BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(fix_qcache_min_res_unit), DEPRECATED(""));
+       ON_UPDATE(fix_qcache_min_res_unit), DEPRECATED_VAR(""));
 
 static const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND", 0 };
 static bool check_query_cache_type(sys_var *self, THD *thd, set_var *var)
@@ -3368,7 +3436,7 @@ static Sys_var_enum Sys_query_cache_type(
        "This variable is deprecated and will be removed in a future release.",
        SESSION_VAR(query_cache_type), CMD_LINE(REQUIRED_ARG),
        query_cache_type_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(check_query_cache_type), ON_UPDATE(NULL), DEPRECATED(""));
+       ON_CHECK(check_query_cache_type), ON_UPDATE(NULL), DEPRECATED_VAR(""));
 
 static Sys_var_mybool Sys_query_cache_wlock_invalidate(
        "query_cache_wlock_invalidate",
@@ -3376,7 +3444,7 @@ static Sys_var_mybool Sys_query_cache_wlock_invalidate(
        "This variable is deprecated and will be removed in a future release.",
        SESSION_VAR(query_cache_wlock_invalidate), CMD_LINE(OPT_ARG),
        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL),
-       ON_UPDATE(NULL), DEPRECATED(""));
+       ON_UPDATE(NULL), DEPRECATED_VAR(""));
 
 static bool
 on_check_opt_secure_auth(sys_var *self, THD *thd, set_var *var)
@@ -3548,6 +3616,70 @@ static Sys_var_enum Mts_parallel_type(
        NOT_IN_BINLOG, ON_CHECK(check_slave_stopped),
        ON_UPDATE(NULL));
 
+static bool check_binlog_transaction_dependency_tracking(sys_var *self, THD *thd, set_var *var)
+{
+  if (global_system_variables.transaction_write_set_extraction == HASH_ALGORITHM_OFF
+      && var->save_result.ulonglong_value != DEPENDENCY_TRACKING_COMMIT_ORDER)
+  {
+    my_error(ER_WRONG_USAGE, MYF(0),
+             "binlog_transaction_dependency_tracking (!= COMMIT_ORDER)",
+             "transaction_write_set_extraction (= OFF)");
+
+    return true;
+  }
+  return false;
+}
+
+static bool update_binlog_transaction_dependency_tracking(sys_var* var, THD* thd, enum_var_type v)
+{
+  /*
+    m_opt_tracking_mode is read and written in an atomic way based
+    on the value of m_opt_tracking_mode_value that is associated
+    with the sys_var variable.
+  */
+    set_mysqld_opt_tracking_mode();
+  /*
+    the writeset_history_start needs to be set to 0 whenever there is a
+    change in the transaction dependency source so that WS and COMMIT
+    transition smoothly.
+  */
+    mysql_bin_log.m_dependency_tracker.tracking_mode_changed();
+    return false;
+}
+
+static bool update_binlog_transaction_dependency_history_size(sys_var* var, THD* thd, enum_var_type v)
+{
+  my_atomic_store64(&mysql_bin_log.m_dependency_tracker.get_writeset()->m_opt_max_history_size,
+                    static_cast<int64>(mysql_bin_log.m_dependency_tracker.get_writeset()->
+                        m_opt_max_history_size_base_var));
+  return false;
+}
+
+
+static PolyLock_mutex
+PLock_slave_trans_dep_tracker(&LOCK_slave_trans_dep_tracker);
+static const char *opt_binlog_transaction_dependency_tracking_names[]=
+       {"COMMIT_ORDER", "WRITESET", "WRITESET_SESSION", NullS};
+static Sys_var_enum Binlog_transaction_dependency_tracking(
+       "binlog_transaction_dependency_tracking",
+       "Selects the source of dependency information from which to "
+       "assess which transactions can be executed in parallel by the "
+       "slave's multi-threaded applier. "
+       "Possible values are COMMIT_ORDER, WRITESET and WRITESET_SESSION.",
+       GLOBAL_VAR(mysql_bin_log.m_dependency_tracker.m_opt_tracking_mode_value),
+       CMD_LINE(REQUIRED_ARG), opt_binlog_transaction_dependency_tracking_names,
+       DEFAULT(DEPENDENCY_TRACKING_COMMIT_ORDER),
+       &PLock_slave_trans_dep_tracker,
+       NOT_IN_BINLOG, ON_CHECK(check_binlog_transaction_dependency_tracking),
+       ON_UPDATE(update_binlog_transaction_dependency_tracking));
+static Sys_var_ulong Binlog_transaction_dependency_history_size(
+       "binlog_transaction_dependency_history_size",
+       "Maximum number of rows to keep in the writeset history.",
+       GLOBAL_VAR(mysql_bin_log.m_dependency_tracker.get_writeset()->m_opt_max_history_size_base_var),
+       CMD_LINE(REQUIRED_ARG, 0), VALID_RANGE(1, 1000000), DEFAULT(25000),
+       BLOCK_SIZE(1), &PLock_slave_trans_dep_tracker, NOT_IN_BINLOG, ON_CHECK(NULL),
+       ON_UPDATE(update_binlog_transaction_dependency_history_size));
+
 static Sys_var_mybool Sys_slave_preserve_commit_order(
        "slave_preserve_commit_order",
        "Force slave workers to make commits in the same order as on the master. "
@@ -3562,6 +3694,12 @@ bool Sys_var_enum_binlog_checksum::global_update(THD *thd, set_var *var)
 {
   bool check_purge= false;
 
+  /*
+    SET binlog_checksome command should ignore 'read-only' and 'super_read_only'
+    options so that it can update 'mysql.gtid_executed' replication repository
+    table.
+  */
+  thd->set_skip_readonly_check();
   mysql_mutex_lock(mysql_bin_log.get_log_lock());
   if(mysql_bin_log.is_open())
   {
@@ -3578,9 +3716,9 @@ bool Sys_var_enum_binlog_checksum::global_update(THD *thd, set_var *var)
     binlog_checksum_options=
       static_cast<ulong>(var->save_result.ulonglong_value);
   }
-  DBUG_ASSERT(binlog_checksum_options == var->save_result.ulonglong_value);
-  DBUG_ASSERT(mysql_bin_log.checksum_alg_reset ==
-              binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
+  assert(binlog_checksum_options == var->save_result.ulonglong_value);
+  assert(mysql_bin_log.checksum_alg_reset ==
+         binary_log::BINLOG_CHECKSUM_ALG_UNDEF);
   mysql_mutex_unlock(mysql_bin_log.get_log_lock());
   
   if (check_purge)
@@ -3720,6 +3858,22 @@ static bool check_sql_mode(sys_var *self, THD *thd, set_var *var)
                           ER_THD(thd, ER_WARN_DEPRECATED_SQLMODE),
                           "NO_AUTO_CREATE_USER");
     }
+    static const sql_mode_t deprecated_mask= MODE_DB2 | MODE_MAXDB |
+      MODE_MSSQL | MODE_MYSQL323 | MODE_MYSQL40 | MODE_ORACLE |
+      MODE_POSTGRESQL | MODE_NO_FIELD_OPTIONS | MODE_NO_KEY_OPTIONS |
+      MODE_NO_TABLE_OPTIONS;
+    sql_mode_t deprecated_modes=
+      var->save_result.ulonglong_value & deprecated_mask;
+    if (deprecated_modes != 0)
+    {
+      LEX_STRING buf;
+      if (sql_mode_string_representation(thd, deprecated_modes, &buf))
+        return true; // OOM
+      push_warning_printf(thd, Sql_condition::SL_WARNING,
+                          ER_WARN_DEPRECATED_SQLMODE,
+                          ER_THD(thd, ER_WARN_DEPRECATED_SQLMODE),
+                          buf.str);
+    }
   }
 
   return false;
@@ -3814,11 +3968,7 @@ static Sys_var_charptr Sys_tls_version(
        "tls_version",
        "TLS version, permitted values are TLSv1, TLSv1.1, TLSv1.2(Only for openssl)",
        READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),
-#ifdef HAVE_YASSL
-       IN_FS_CHARSET, "TLSv1,TLSv1.1");
-#else
        IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");
-#endif
 
 static Sys_var_charptr Sys_ssl_cert(
        "ssl_cert", "X509 cert in PEM format (implies --ssl)",
@@ -3847,7 +3997,7 @@ static Sys_var_charptr Sys_ssl_crlpath(
        READ_ONLY GLOBAL_VAR(opt_ssl_crlpath), SSL_OPT(OPT_SSL_CRLPATH),
        IN_FS_CHARSET, DEFAULT(0));
 
-#if defined(HAVE_OPENSSL) && !defined(HAVE_YASSL)
+#if defined(HAVE_OPENSSL)
 static Sys_var_mybool Sys_auto_generate_certs(
        "auto_generate_certs",
        "Auto generate SSL certificates at server startup if --ssl is set to "
@@ -3861,7 +4011,7 @@ static Sys_var_mybool Sys_auto_generate_certs(
        ON_CHECK(NULL),
        ON_UPDATE(NULL),
        NULL);
-#endif /* HAVE_OPENSSL && !HAVE_YASSL */
+#endif /* HAVE_OPENSSL */
 
 // why ENUM and not BOOL ?
 static const char *updatable_views_with_limit_names[]= {"NO", "YES", 0};
@@ -3879,7 +4029,7 @@ static Sys_var_mybool Sys_sync_frm(
        "sync_frm", "Sync .frm files to disk on creation",
        GLOBAL_VAR(opt_sync_frm), CMD_LINE(OPT_ARG),
        DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-       ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static char *system_time_zone_ptr;
 static Sys_var_charptr Sys_system_time_zone(
@@ -3968,7 +4118,7 @@ static bool check_transaction_isolation(sys_var *self, THD *thd, set_var *var)
   if (var->type == OPT_DEFAULT && (thd->in_active_multi_stmt_transaction() ||
                                    thd->in_sub_stmt))
   {
-    DBUG_ASSERT(thd->in_multi_stmt_transaction_mode() || thd->in_sub_stmt);
+    assert(thd->in_multi_stmt_transaction_mode() || thd->in_sub_stmt);
     my_error(ER_CANT_CHANGE_TX_CHARACTERISTICS, MYF(0));
     return true;
   }
@@ -4076,7 +4226,7 @@ static Sys_var_tx_isolation Sys_tx_isolation(
        tx_isolation_names, DEFAULT(ISO_REPEATABLE_READ),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_transaction_isolation),
        ON_UPDATE(update_transaction_isolation),
-       DEPRECATED("'@@transaction_isolation'"));
+       DEPRECATED_VAR("'@@transaction_isolation'"));
 
 
 // NO_CMD_LINE
@@ -4107,7 +4257,7 @@ static bool check_transaction_read_only(sys_var *self, THD *thd, set_var *var)
   if (var->type == OPT_DEFAULT && (thd->in_active_multi_stmt_transaction() ||
                                    thd->in_sub_stmt))
   {
-    DBUG_ASSERT(thd->in_multi_stmt_transaction_mode() || thd->in_sub_stmt);
+    assert(thd->in_multi_stmt_transaction_mode() || thd->in_sub_stmt);
     my_error(ER_CANT_CHANGE_TX_CHARACTERISTICS, MYF(0));
     return true;
   }
@@ -4200,7 +4350,7 @@ static Sys_var_tx_read_only Sys_tx_read_only(
        UNTRACKED_DEFAULT SESSION_VAR(tx_read_only), NO_CMD_LINE, DEFAULT(0),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_transaction_read_only),
        ON_UPDATE(update_transaction_read_only),
-       DEPRECATED("'@@transaction_read_only'"));
+       DEPRECATED_VAR("'@@transaction_read_only'"));
 
 
 static Sys_var_tx_read_only Sys_transaction_read_only(
@@ -4305,7 +4455,7 @@ static Sys_var_charptr Sys_date_format(
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
        DEFAULT(known_date_time_formats[ISO_FORMAT].date_format),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_charptr Sys_datetime_format(
        "datetime_format", "The DATETIME format (ignored)",
@@ -4313,7 +4463,7 @@ static Sys_var_charptr Sys_datetime_format(
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
        DEFAULT(known_date_time_formats[ISO_FORMAT].datetime_format),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_charptr Sys_time_format(
        "time_format", "The TIME format (ignored)",
@@ -4321,7 +4471,36 @@ static Sys_var_charptr Sys_time_format(
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
        DEFAULT(known_date_time_formats[ISO_FORMAT].time_format),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
+
+/**
+  Pre-update function to commit connection's active transactions when autocommit
+  is enabled.
+
+  @note This hook relies on the fact that it is called while not holding any
+        locks. Breaking this assumption might result in deadlocks as commit
+        acquires many different locks in its process (e.g. to open GTID-related
+        tables).
+
+  @param[in] self   A pointer to the sys_var, i.e. Sys_autocommit.
+  @param[in] thd    A reference to THD object.
+  @param[in] var    A pointer to the set_var created by the parser.
+
+  @retval true   Error during commit
+  @retval false  Otherwise
+*/
+static bool pre_autocommit(sys_var *self, THD *thd, set_var *var)
+{
+  if (!(var->type == OPT_GLOBAL) &&
+      (thd->variables.option_bits & OPTION_NOT_AUTOCOMMIT) &&
+       var->save_result.ulonglong_value)
+  {
+    // Autocommit mode is about to be activated.
+    if (trans_commit_stmt(thd) || trans_commit(thd))
+      return true;
+  }
+  return false;
+}
 
 static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type)
 {
@@ -4337,12 +4516,6 @@ static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type)
   if (thd->variables.option_bits & OPTION_AUTOCOMMIT &&
       thd->variables.option_bits & OPTION_NOT_AUTOCOMMIT)
   { // activating autocommit
-
-    if (trans_commit_stmt(thd) || trans_commit(thd))
-    {
-      thd->variables.option_bits&= ~OPTION_AUTOCOMMIT;
-      return true;
-    }
     /*
       Don't close thread tables or release metadata locks: if we do so, we
       risk releasing locks/closing tables of expressions used to assign
@@ -4377,7 +4550,8 @@ static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type)
 static Sys_var_bit Sys_autocommit(
        "autocommit", "autocommit",
        SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_AUTOCOMMIT, DEFAULT(TRUE),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_autocommit));
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+       PRE_UPDATE(pre_autocommit), ON_UPDATE(fix_autocommit));
 export sys_var *Sys_autocommit_ptr= &Sys_autocommit; // for sql_yacc.yy
 
 static Sys_var_mybool Sys_big_tables(
@@ -4407,7 +4581,7 @@ static Sys_var_bit Sys_log_off(
 static bool fix_sql_log_bin_after_update(sys_var *self, THD *thd,
                                          enum_var_type type)
 {
-  DBUG_ASSERT(type == OPT_SESSION);
+  assert(type == OPT_SESSION);
 
   if (thd->variables.sql_log_bin)
     thd->variables.option_bits |= OPTION_BIN_LOG;
@@ -4511,13 +4685,13 @@ static Sys_var_bit Sys_profiling(
        "profiling", "profiling",
        SESSION_VAR(option_bits), NO_CMD_LINE, OPTION_PROFILING,
        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-       ON_UPDATE(0), DEPRECATED(""));
+       PRE_UPDATE(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static Sys_var_ulong Sys_profiling_history_size(
        "profiling_history_size", "Limit of query profiling memory",
        SESSION_VAR(profiling_history_size), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, 100), DEFAULT(15), BLOCK_SIZE(1), NO_MUTEX_GUARD,
-       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 #endif
 
 static Sys_var_harows Sys_select_limit(
@@ -4924,7 +5098,7 @@ static Sys_var_have Sys_have_openssl(
 static Sys_var_have Sys_have_profiling(
        "have_profiling", "have_profiling",
        READ_ONLY GLOBAL_VAR(have_profiling), NO_CMD_LINE, NO_MUTEX_GUARD,
-       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED(""));
+       NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED_VAR(""));
 
 static Sys_var_have Sys_have_query_cache(
        "have_query_cache",
@@ -4932,7 +5106,7 @@ static Sys_var_have Sys_have_query_cache(
        "This variable is deprecated and will be removed in a future release.",
        READ_ONLY GLOBAL_VAR(have_query_cache), NO_CMD_LINE,
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL),
-       DEPRECATED(""));
+       DEPRECATED_VAR(""));
 
 static Sys_var_have Sys_have_rtree_keys(
        "have_rtree_keys", "have_rtree_keys",
@@ -5214,22 +5388,22 @@ static Sys_var_uint Sys_checkpoint_mts_period(
        "Update progress status of Multi-threaded slave and flush "
        "the relay log info to disk after every #th milli-seconds.",
        GLOBAL_VAR(opt_mts_checkpoint_period), CMD_LINE(REQUIRED_ARG),
-#ifndef DBUG_OFF
+#ifndef NDEBUG
        VALID_RANGE(0, UINT_MAX), DEFAULT(300), BLOCK_SIZE(1));
 #else
        VALID_RANGE(1, UINT_MAX), DEFAULT(300), BLOCK_SIZE(1));
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 static Sys_var_uint Sys_checkpoint_mts_group(
        "slave_checkpoint_group",
        "Maximum number of processed transactions by Multi-threaded slave "
        "before a checkpoint operation is called to update progress status.",
        GLOBAL_VAR(opt_mts_checkpoint_group), CMD_LINE(REQUIRED_ARG),
-#ifndef DBUG_OFF
+#ifndef NDEBUG
        VALID_RANGE(1, MTS_MAX_BITS_IN_GROUP), DEFAULT(512), BLOCK_SIZE(1));
 #else
        VALID_RANGE(32, MTS_MAX_BITS_IN_GROUP), DEFAULT(512), BLOCK_SIZE(8));
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 #endif /* HAVE_REPLICATION */
 
 static Sys_var_uint Sys_sync_binlog_period(
@@ -5497,7 +5671,7 @@ static bool check_gtid_next_list(sys_var *self, THD *thd, set_var *var)
 
 static bool update_gtid_next_list(sys_var *self, THD *thd, enum_var_type type)
 {
-  DBUG_ASSERT(type == OPT_SESSION);
+  assert(type == OPT_SESSION);
   if (thd->get_gtid_next_list() != NULL)
     return gtid_acquire_ownership_multiple(thd) != 0 ? true : false;
   return false;
@@ -5794,7 +5968,7 @@ static Sys_var_mybool Sys_avoid_temporal_upgrade(
         CMD_LINE(OPT_ARG, OPT_AVOID_TEMPORAL_UPGRADE),
         DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
         ON_CHECK(0), ON_UPDATE(0),
-        DEPRECATED(""));
+        DEPRECATED_VAR(""));
 
 static Sys_var_mybool Sys_show_old_temporals(
        "show_old_temporals",
@@ -5806,7 +5980,7 @@ static Sys_var_mybool Sys_show_old_temporals(
         CMD_LINE(OPT_ARG, OPT_SHOW_OLD_TEMPORALS),
         DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
         ON_CHECK(0), ON_UPDATE(0),
-        DEPRECATED(""));
+        DEPRECATED_VAR(""));
 
 static Sys_var_charptr Sys_disabled_storage_engines(
        "disabled_storage_engines",
@@ -5815,6 +5989,15 @@ static Sys_var_charptr Sys_disabled_storage_engines(
        CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
        DEFAULT(""));
 
+static Sys_var_mybool Sys_show_create_table_verbosity(
+       "show_create_table_verbosity",
+       "When this option is enabled, it increases the verbosity of "
+       "'SHOW CREATE TABLE'.",
+        SESSION_VAR(show_create_table_verbosity),
+        CMD_LINE(OPT_ARG),
+        DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG,
+        ON_CHECK(0), ON_UPDATE(0));
+
 static bool check_keyring_access(sys_var*, THD* thd, set_var*)
 {
   if (!(thd->security_context()->check_access(SUPER_ACL)))
@@ -5850,3 +6033,56 @@ static Sys_var_mybool Sys_keyring_operations(
        NOT_IN_BINLOG,
        ON_CHECK(check_keyring_access),
        ON_UPDATE(0));
+
+/**
+  Changes the `Delegate` internal state in regards to which type of lock to
+  use and in regards to whether or not to take plugin locks in each hook
+  invocation.
+ */
+static bool handle_plugin_lock_type_change(sys_var *, THD *,
+                                           enum_var_type)
+{
+  DBUG_ENTER("handle_plugin_lock_type_change");
+  delegates_acquire_locks();
+  delegates_update_lock_type();
+  delegates_release_locks();
+  DBUG_RETURN(false);
+}
+
+static Sys_var_mybool Sys_replication_optimize_for_static_plugin_config(
+       "replication_optimize_for_static_plugin_config",
+       "Optional flag that blocks plugin install/uninstall and allows skipping "
+       "the acquisition of the lock to read from the plugin list and the usage "
+       "of read-optimized spin-locks. Use only when plugin hook callback needs "
+       "optimization (a lot of semi-sync slaves, for instance).",
+       GLOBAL_VAR(opt_replication_optimize_for_static_plugin_config),
+       CMD_LINE(OPT_ARG),
+       DEFAULT(FALSE),
+       NO_MUTEX_GUARD,
+       NOT_IN_BINLOG,
+       ON_CHECK(0),
+       ON_UPDATE(handle_plugin_lock_type_change));
+
+/**
+  Updates the atomic access version of
+  `opt_replication_sender_observe_commit_only`.
+ */
+static bool handle_sender_observe_commit_change(sys_var *, THD *, enum_var_type)
+{
+  DBUG_ENTER("handle_sender_observe_commit_change");
+  my_atomic_store32(&opt_atomic_replication_sender_observe_commit_only,
+                    opt_replication_sender_observe_commit_only);
+  DBUG_RETURN(false);
+}
+
+static Sys_var_mybool Sys_replication_sender_observe_commit_only(
+       "replication_sender_observe_commit_only",
+       "Optional flag that allows for only calling back observer hooks at "
+       "commit.",
+       GLOBAL_VAR(opt_replication_sender_observe_commit_only),
+       CMD_LINE(OPT_ARG),
+       DEFAULT(FALSE),
+       NO_MUTEX_GUARD,
+       NOT_IN_BINLOG,
+       ON_CHECK(0),
+       ON_UPDATE(handle_sender_observe_commit_change));
diff --git a/sql/sys_vars.h b/sql/sys_vars.h
index 2c1f58b424b2..3426dce8fbf9 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.h
@@ -1,15 +1,22 @@
 #ifndef SYS_VARS_H_INCLUDED
 #define SYS_VARS_H_INCLUDED
-/* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -62,6 +69,7 @@
 #define NOT_IN_BINLOG sys_var::VARIABLE_NOT_IN_BINLOG
 #define ON_READ(X) X
 #define ON_CHECK(X) X
+#define PRE_UPDATE(X) X
 #define ON_UPDATE(X) X
 #define READ_ONLY sys_var::READONLY+
 #define NOT_VISIBLE sys_var::INVISIBLE+
@@ -73,7 +81,7 @@
   @@foreign_key_checks <-> OPTION_NO_FOREIGN_KEY_CHECKS
 */
 #define REVERSE(X) ~(X)
-#define DEPRECATED(X) X
+#define DEPRECATED_VAR(X) X
 
 #define session_var(THD, TYPE) (*(TYPE*)session_var_ptr(THD))
 #define global_var(TYPE) (*(TYPE*)global_var_ptr())
@@ -147,12 +155,12 @@ class Sys_var_integer: public sys_var
     if (offset >= 0)
       global_var(T)= def_val;
 
-    DBUG_ASSERT(size == sizeof(T));
-    DBUG_ASSERT(min_val < max_val);
-    DBUG_ASSERT(min_val <= def_val);
-    DBUG_ASSERT(max_val >= def_val);
-    DBUG_ASSERT(block_size > 0);
-    DBUG_ASSERT(def_val % block_size == 0);
+    assert(size == sizeof(T));
+    assert(min_val < max_val);
+    assert(min_val <= def_val);
+    assert(max_val >= def_val);
+    assert(block_size > 0);
+    assert(def_val % block_size == 0);
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -359,8 +367,8 @@ class Sys_var_enum: public Sys_var_typelib
   {
     option.var_type= GET_ENUM;
     global_var(ulong)= def_val;
-    DBUG_ASSERT(def_val < typelib.count);
-    DBUG_ASSERT(size == sizeof(ulong));
+    assert(def_val < typelib.count);
+    assert(size == sizeof(ulong));
   }
   bool session_update(THD *thd, set_var *var)
   {
@@ -409,9 +417,9 @@ class Sys_var_mybool: public Sys_var_typelib
   {
     option.var_type= GET_BOOL;
     global_var(my_bool)= def_val;
-    DBUG_ASSERT(def_val < 2);
-    DBUG_ASSERT(getopt.arg_type == OPT_ARG || getopt.id == -1);
-    DBUG_ASSERT(size == sizeof(my_bool));
+    assert(def_val < 2);
+    assert(getopt.arg_type == OPT_ARG || getopt.id == -1);
+    assert(size == sizeof(my_bool));
   }
   bool session_update(THD *thd, set_var *var)
   {
@@ -508,8 +516,8 @@ class Sys_var_multi_enum : public sys_var
     command_line_no_value(command_line_no_value_arg)
   {
     for (alias_count= 0; aliases[alias_count].alias; alias_count++)
-      DBUG_ASSERT(aliases[alias_count].number < value_count);
-    DBUG_ASSERT(def_val < alias_count);
+      assert(aliases[alias_count].number < value_count);
+    assert(def_val < alias_count);
 
     option.var_type= GET_STR;
     option.value= &command_line_value;
@@ -517,8 +525,8 @@ class Sys_var_multi_enum : public sys_var
 
     global_var(ulong)= aliases[def_val].number;
 
-    DBUG_ASSERT(getopt.arg_type == OPT_ARG || getopt.id == -1);
-    DBUG_ASSERT(size == sizeof(ulong));
+    assert(getopt.arg_type == OPT_ARG || getopt.id == -1);
+    assert(size == sizeof(ulong));
   }
 
   /**
@@ -612,7 +620,7 @@ class Sys_var_multi_enum : public sys_var
   bool session_update(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_multi_enum::session_update");
-    DBUG_ASSERT(0);
+    assert(0);
     /*
     Currently not used: uncomment if this class is used as a base for
     a session variable.
@@ -625,7 +633,7 @@ class Sys_var_multi_enum : public sys_var
   bool global_update(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_multi_enum::global_update");
-    DBUG_ASSERT(0);
+    assert(0);
     /*
     Currently not used: uncomment if this some inheriting class does
     not override..
@@ -639,13 +647,13 @@ class Sys_var_multi_enum : public sys_var
   void session_save_default(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_multi_enum::session_save_default");
-    DBUG_ASSERT(0);
+    assert(0);
     /*
     Currently not used: uncomment if this class is used as a base for
     a session variable.
 
     int value= find_value((char *)option.def_value);
-    DBUG_ASSERT(value != -1);
+    assert(value != -1);
     var->save_result.ulonglong_value= value;
     */
     DBUG_VOID_RETURN;
@@ -654,7 +662,7 @@ class Sys_var_multi_enum : public sys_var
   {
     DBUG_ENTER("Sys_var_multi_enum::global_save_default");
     int value= find_value((char *)option.def_value);
-    DBUG_ASSERT(value != -1);
+    assert(value != -1);
     var->save_result.ulonglong_value= value;
     DBUG_VOID_RETURN;
   }
@@ -662,7 +670,7 @@ class Sys_var_multi_enum : public sys_var
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
   {
     DBUG_ENTER("Sys_var_multi_enum::session_value_ptr");
-    DBUG_ASSERT(0);
+    assert(0);
     /*
     Currently not used: uncomment if this class is used as a base for
     a session variable.
@@ -725,7 +733,7 @@ class Sys_var_charptr: public sys_var
     is_os_charset= is_os_charset_arg == IN_FS_CHARSET;
     option.var_type= (flags & ALLOCATED) ? GET_STR_ALLOC : GET_STR;
     global_var(const char*)= def_val;
-    DBUG_ASSERT(size == sizeof(char *));
+    assert(size == sizeof(char *));
   }
 
   void cleanup()
@@ -855,23 +863,23 @@ class Sys_var_proxy_user: public sys_var
   }
   bool do_check(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   bool session_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   bool global_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return false;
   }
   void session_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   void global_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   bool check_update_type(Item_result type)
   { return true; }
 protected:
@@ -927,7 +935,7 @@ class Sys_var_lexstring: public Sys_var_charptr
               on_check_func, on_update_func, substitute)
   {
     global_var(LEX_STRING).length= strlen(def_val);
-    DBUG_ASSERT(size == sizeof(LEX_STRING));
+    assert(size == sizeof(LEX_STRING));
     *const_cast<SHOW_TYPE*>(&show_val_type)= SHOW_LEX_STRING;
   }
   bool global_update(THD *thd, set_var *var)
@@ -939,7 +947,7 @@ class Sys_var_lexstring: public Sys_var_charptr
   }
 };
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   @@session.dbug and @@global.dbug variables.
 
@@ -1059,7 +1067,7 @@ class Sys_var_keycache: public Sys_var_ulonglong
     option.var_type|= GET_ASK_ADDR;
     option.value= (uchar**)1; // crash me, please
     keycache_var(dflt_key_cache, off)= def_val;
-    DBUG_ASSERT(scope() == GLOBAL);
+    assert(scope() == GLOBAL);
   }
   bool global_update(THD *thd, set_var *var)
   {
@@ -1129,10 +1137,10 @@ class Sys_var_double: public sys_var
     option.min_value= (longlong) getopt_double2ulonglong(min_val);
     option.max_value= (longlong) getopt_double2ulonglong(max_val);
     global_var(double)= (double)option.def_value;
-    DBUG_ASSERT(min_val <= max_val);
-    DBUG_ASSERT(min_val <= def_val);
-    DBUG_ASSERT(max_val >= def_val);
-    DBUG_ASSERT(size == sizeof(double));
+    assert(min_val <= max_val);
+    assert(min_val <= def_val);
+    assert(max_val >= def_val);
+    assert(size == sizeof(double));
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -1262,11 +1270,11 @@ class Sys_var_flagset: public Sys_var_typelib
   {
     option.var_type= GET_FLAGSET;
     global_var(ulonglong)= def_val;
-    DBUG_ASSERT(typelib.count > 1);
-    DBUG_ASSERT(typelib.count <= 65);
-    DBUG_ASSERT(def_val < MAX_SET(typelib.count));
-    DBUG_ASSERT(strcmp(values[typelib.count-1], "default") == 0);
-    DBUG_ASSERT(size == sizeof(ulonglong));
+    assert(typelib.count > 1);
+    assert(typelib.count <= 65);
+    assert(def_val < MAX_SET(typelib.count));
+    assert(strcmp(values[typelib.count-1], "default") == 0);
+    assert(size == sizeof(ulonglong));
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -1374,10 +1382,10 @@ class Sys_var_set: public Sys_var_typelib
   {
     option.var_type= GET_SET;
     global_var(ulonglong)= def_val;
-    DBUG_ASSERT(typelib.count > 0);
-    DBUG_ASSERT(typelib.count <= 64);
-    DBUG_ASSERT(def_val < MAX_SET(typelib.count));
-    DBUG_ASSERT(size == sizeof(ulonglong));
+    assert(typelib.count > 0);
+    assert(typelib.count <= 64);
+    assert(def_val < MAX_SET(typelib.count));
+    assert(size == sizeof(ulonglong));
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -1482,8 +1490,8 @@ class Sys_var_plugin: public sys_var
     plugin_type(plugin_type_arg)
   {
     option.var_type= GET_STR;
-    DBUG_ASSERT(size == sizeof(plugin_ref));
-    DBUG_ASSERT(getopt.id == -1); // force NO_CMD_LINE
+    assert(size == sizeof(plugin_ref));
+    assert(getopt.id == -1); // force NO_CMD_LINE
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -1560,7 +1568,7 @@ class Sys_var_plugin: public sys_var
       LEX_CSTRING pname_cstr= {pname.str,pname.length};
       plugin= my_plugin_lock_by_name(thd, pname_cstr, plugin_type);
     }
-    DBUG_ASSERT(plugin);
+    assert(plugin);
 
     var->save_result.plugin= my_plugin_lock(thd, &plugin);
   }
@@ -1601,7 +1609,7 @@ class Sys_var_debug_sync :public sys_var
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute, parse_flag)
   {
-    DBUG_ASSERT(scope() == ONLY_SESSION);
+    assert(scope() == ONLY_SESSION);
     option.var_type= GET_NO_ARG;
   }
   bool do_check(THD *thd, set_var *var)
@@ -1622,7 +1630,7 @@ class Sys_var_debug_sync :public sys_var
   }
   bool global_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   void session_save_default(THD *thd, set_var *var)
@@ -1632,7 +1640,7 @@ class Sys_var_debug_sync :public sys_var
   }
   void global_save_default(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
   }
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
   {
@@ -1641,7 +1649,7 @@ class Sys_var_debug_sync :public sys_var
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return 0;
   }
   bool check_update_type(Item_result type)
@@ -1686,6 +1694,7 @@ class Sys_var_bit: public Sys_var_typelib
           ulonglong bitmask_arg, my_bool def_val, PolyLock *lock=0,
           enum binlog_status_enum binlog_status_arg=VARIABLE_NOT_IN_BINLOG,
           on_check_function on_check_func=0,
+          pre_update_function pre_update_func=0,
           on_update_function on_update_func=0,
           const char *substitute=0)
     : Sys_var_typelib(name_arg, comment, flag_args, off, getopt,
@@ -1694,12 +1703,13 @@ class Sys_var_bit: public Sys_var_typelib
                       substitute)
   {
     option.var_type= GET_BOOL;
+    pre_update= pre_update_func;
     reverse_semantics= my_count_bits(bitmask_arg) > 1;
     bitmask= reverse_semantics ? ~bitmask_arg : bitmask_arg;
     set(global_var_ptr(), def_val);
-    DBUG_ASSERT(def_val < 2);
-    DBUG_ASSERT(getopt.id == -1); // force NO_CMD_LINE
-    DBUG_ASSERT(size == sizeof(ulonglong));
+    assert(def_val < 2);
+    assert(getopt.id == -1); // force NO_CMD_LINE
+    assert(size == sizeof(ulonglong));
   }
   bool session_update(THD *thd, set_var *var)
   {
@@ -1769,20 +1779,20 @@ class Sys_var_session_special: public Sys_var_ulonglong
               substitute),
       read_func(read_func_arg), update_func(update_func_arg)
   {
-    DBUG_ASSERT(scope() == ONLY_SESSION);
-    DBUG_ASSERT(getopt.id == -1); // NO_CMD_LINE, because the offset is fake
+    assert(scope() == ONLY_SESSION);
+    assert(getopt.id == -1); // NO_CMD_LINE, because the offset is fake
   }
   bool session_update(THD *thd, set_var *var)
   { return update_func(thd, var); }
   bool global_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   void session_save_default(THD *thd, set_var *var)
   { var->value= 0; }
   void global_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
   {
     running_thd->sys_var_tmp.ulonglong_value= read_func(target_thd);
@@ -1790,7 +1800,7 @@ class Sys_var_session_special: public Sys_var_ulonglong
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return 0;
   }
 };
@@ -1823,20 +1833,20 @@ class Sys_var_session_special_double: public Sys_var_double
               substitute),
       read_func(read_func_arg), update_func(update_func_arg)
   {
-    DBUG_ASSERT(scope() == ONLY_SESSION);
-    DBUG_ASSERT(getopt.id == -1); // NO_CMD_LINE, because the offset is fake
+    assert(scope() == ONLY_SESSION);
+    assert(getopt.id == -1); // NO_CMD_LINE, because the offset is fake
   }
   bool session_update(THD *thd, set_var *var)
   { return update_func(thd, var); }
   bool global_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   void session_save_default(THD *thd, set_var *var)
   { var->value= 0; }
   void global_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
   {
     running_thd->sys_var_tmp.double_value= read_func(target_thd);
@@ -1844,7 +1854,7 @@ class Sys_var_session_special_double: public Sys_var_double
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return 0;
   }
 };
@@ -1877,33 +1887,33 @@ class Sys_var_have: public sys_var
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute, parse_flag)
   {
-    DBUG_ASSERT(scope() == GLOBAL);
-    DBUG_ASSERT(getopt.id == -1);
-    DBUG_ASSERT(lock == 0);
-    DBUG_ASSERT(binlog_status_arg == VARIABLE_NOT_IN_BINLOG);
-    DBUG_ASSERT(is_readonly());
-    DBUG_ASSERT(on_update == 0);
-    DBUG_ASSERT(size == sizeof(enum SHOW_COMP_OPTION));
+    assert(scope() == GLOBAL);
+    assert(getopt.id == -1);
+    assert(lock == 0);
+    assert(binlog_status_arg == VARIABLE_NOT_IN_BINLOG);
+    assert(is_readonly());
+    assert(on_update == 0);
+    assert(size == sizeof(enum SHOW_COMP_OPTION));
   }
   bool do_check(THD *thd, set_var *var) {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   bool session_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   bool global_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
   void session_save_default(THD *thd, set_var *var) { }
   void global_save_default(THD *thd, set_var *var) { }
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return 0;
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
@@ -1956,8 +1966,8 @@ class Sys_var_struct: public sys_var
       thus all struct command-line options should be added manually
       to my_long_options in mysqld.cc
     */
-    DBUG_ASSERT(getopt.id == -1);
-    DBUG_ASSERT(size == sizeof(void *));
+    assert(getopt.id == -1);
+    assert(size == sizeof(void *));
   }
   bool do_check(THD *thd, set_var *var)
   { return false; }
@@ -2019,8 +2029,8 @@ class Sys_var_tz: public sys_var
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute, parse_flag)
   {
-    DBUG_ASSERT(getopt.id == -1);
-    DBUG_ASSERT(size == sizeof(Time_zone *));
+    assert(getopt.id == -1);
+    assert(size == sizeof(Time_zone *));
   }
   bool do_check(THD *thd, set_var *var)
   {
@@ -2210,7 +2220,7 @@ class Sys_var_gtid_next: public sys_var
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute, parse_flag)
   {
-    DBUG_ASSERT(size == sizeof(Gtid_specification));
+    assert(size == sizeof(Gtid_specification));
   }
   bool session_update(THD *thd, set_var *var)
   {
@@ -2222,8 +2232,8 @@ class Sys_var_gtid_next: public sys_var
     if (!var->value)
     {
       // set session gtid_next= default
-      DBUG_ASSERT(var->save_result.string_value.str);
-      DBUG_ASSERT(var->save_result.string_value.length);
+      assert(var->save_result.string_value.str);
+      assert(var->save_result.string_value.length);
       res= var->save_result.string_value.str;
     }
     else if (var->value->val_str(&str))
@@ -2246,7 +2256,7 @@ class Sys_var_gtid_next: public sys_var
     DBUG_RETURN(ret);
   }
   bool global_update(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); return true; }
+  { assert(FALSE); return true; }
   void session_save_default(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_gtid_next::session_save_default");
@@ -2256,7 +2266,7 @@ class Sys_var_gtid_next: public sys_var
     DBUG_VOID_RETURN;
   }
   void global_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   bool do_check(THD *thd, set_var *var)
   { return false; }
   bool check_update_type(Item_result type)
@@ -2273,7 +2283,7 @@ class Sys_var_gtid_next: public sys_var
     DBUG_RETURN((uchar *)ret);
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
-  { DBUG_ASSERT(FALSE); return NULL; }
+  { assert(FALSE); return NULL; }
 };
 
 #ifdef HAVE_GTID_NEXT_LIST
@@ -2302,7 +2312,7 @@ class Sys_var_gtid_set: public sys_var
               lock, binlog_status_arg, on_check_func, on_update_func,
               substitute, parse_flag)
   {
-    DBUG_ASSERT(size == sizeof(Gtid_set_or_null));
+    assert(size == sizeof(Gtid_set_or_null));
   }
   bool session_update(THD *thd, set_var *var)
   {
@@ -2343,7 +2353,7 @@ class Sys_var_gtid_set: public sys_var
     DBUG_RETURN(false);
   }
   bool global_update(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); return true; }
+  { assert(FALSE); return true; }
   void session_save_default(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_gtid_set::session_save_default");
@@ -2355,7 +2365,7 @@ class Sys_var_gtid_set: public sys_var
     DBUG_VOID_RETURN;
   }
   void global_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
   bool do_check(THD *thd, set_var *var)
   {
     DBUG_ENTER("Sys_var_gtid_set::do_check");
@@ -2366,7 +2376,7 @@ class Sys_var_gtid_set: public sys_var
       var->save_result.string_value.str= NULL;
       DBUG_RETURN(FALSE);
     }
-    DBUG_ASSERT(res->ptr() != NULL);
+    assert(res->ptr() != NULL);
     var->save_result.string_value.str= thd->strmake(res->ptr(), res->length());
     if (var->save_result.string_value.str == NULL)
     {
@@ -2397,7 +2407,7 @@ class Sys_var_gtid_set: public sys_var
     DBUG_RETURN((uchar *)buf);
   }
   uchar *global_value_ptr(THD *thd, LEX_STRING *base)
-  { DBUG_ASSERT(FALSE); return NULL; }
+  { assert(FALSE); return NULL; }
 };
 #endif
 
@@ -2420,21 +2430,21 @@ class Sys_var_charptr_func: public sys_var
               NULL/*on_check_func*/, NULL/*on_update_func*/,
               NULL/*substitute*/, PARSE_NORMAL/*parse_flag*/)
   {
-    DBUG_ASSERT(flag_arg == sys_var::GLOBAL || flag_arg == sys_var::SESSION ||
-                flag_arg == sys_var::ONLY_SESSION);
+    assert(flag_arg == sys_var::GLOBAL || flag_arg == sys_var::SESSION ||
+           flag_arg == sys_var::ONLY_SESSION);
   }
   bool session_update(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); return true; }
+  { assert(FALSE); return true; }
   bool global_update(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); return true; }
-  void session_save_default(THD *thd, set_var *var) { DBUG_ASSERT(FALSE); }
-  void global_save_default(THD *thd, set_var *var) { DBUG_ASSERT(FALSE); }
-  bool do_check(THD *thd, set_var *var) { DBUG_ASSERT(FALSE); return true; }
-  bool check_update_type(Item_result type) { DBUG_ASSERT(FALSE); return true; }
+  { assert(FALSE); return true; }
+  void session_save_default(THD *thd, set_var *var) { assert(FALSE); }
+  void global_save_default(THD *thd, set_var *var) { assert(FALSE); }
+  bool do_check(THD *thd, set_var *var) { assert(FALSE); return true; }
+  bool check_update_type(Item_result type) { assert(FALSE); return true; }
   virtual uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
-  { DBUG_ASSERT(FALSE); return NULL; }
+  { assert(FALSE); return NULL; }
   virtual uchar *global_value_ptr(THD *thd, LEX_STRING *base)
-  { DBUG_ASSERT(FALSE); return NULL; }
+  { assert(FALSE); return NULL; }
 };
 
 
@@ -2540,12 +2550,12 @@ class Sys_var_gtid_purged : public sys_var
 
   bool session_update(THD *thd, set_var *var)
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     return true;
   }
 
   void session_save_default(THD *thd, set_var *var)
-  { DBUG_ASSERT(FALSE); }
+  { assert(FALSE); }
 
   bool global_update(THD *thd, set_var *var);
 
@@ -2605,7 +2615,7 @@ class Sys_var_gtid_purged : public sys_var
   }
 
   uchar *session_value_ptr(THD *running_thd, THD *target_thd, LEX_STRING *base)
-  { DBUG_ASSERT(0); return NULL; }
+  { assert(0); return NULL; }
 };
 
 
@@ -2626,7 +2636,7 @@ class Sys_var_gtid_owned : Sys_var_charptr_func
       DBUG_RETURN((uchar *)running_thd->mem_strdup(""));
     else if (target_thd->owned_gtid.sidno == THD::OWNED_SIDNO_ANONYMOUS)
     {
-      DBUG_ASSERT(gtid_state->get_anonymous_ownership_count() > 0);
+      assert(gtid_state->get_anonymous_ownership_count() > 0);
       DBUG_RETURN((uchar *)running_thd->mem_strdup("ANONYMOUS"));
     }
     else if (target_thd->owned_gtid.sidno == THD::OWNED_SIDNO_GTID_SET)
@@ -2642,7 +2652,7 @@ class Sys_var_gtid_owned : Sys_var_charptr_func
       else
         my_error(ER_OUT_OF_RESOURCES, MYF(0));
 #else
-     DBUG_ASSERT(0); 
+      assert(0); 
 #endif
     }
     else
@@ -2703,6 +2713,13 @@ class Sys_var_gtid_mode : public Sys_var_enum
     DBUG_ENTER("Sys_var_gtid_mode::global_update");
     bool ret= true;
 
+     /*
+      SET GITD_MODE command should ignore 'read-only' and 'super_read_only'
+      options so that it can update 'mysql.gtid_executed' replication repository
+      table.
+     */
+    thd->set_skip_readonly_check();
+
     /*
       Hold lock_log so that:
       - other transactions are not flushed while gtid_mode is changed;
@@ -2733,7 +2750,7 @@ class Sys_var_gtid_mode : public Sys_var_enum
     enum_gtid_mode new_gtid_mode=
       (enum_gtid_mode)var->save_result.ulonglong_value;
     enum_gtid_mode old_gtid_mode= get_gtid_mode(GTID_MODE_LOCK_SID);
-    DBUG_ASSERT(new_gtid_mode <= GTID_MODE_ON);
+    assert(new_gtid_mode <= GTID_MODE_ON);
 
     DBUG_PRINT("info", ("old_gtid_mode=%d new_gtid_mode=%d",
                         old_gtid_mode, new_gtid_mode));
@@ -2783,8 +2800,8 @@ class Sys_var_gtid_mode : public Sys_var_enum
     // Can't set GTID_MODE != ON when group replication is enabled.
     if (is_group_replication_running())
     {
-      DBUG_ASSERT(old_gtid_mode == GTID_MODE_ON);
-      DBUG_ASSERT(new_gtid_mode == GTID_MODE_ON_PERMISSIVE);
+      assert(old_gtid_mode == GTID_MODE_ON);
+      assert(new_gtid_mode == GTID_MODE_ON_PERMISSIVE);
       my_error(ER_CANT_SET_GTID_MODE, MYF(0),
                get_gtid_mode_string(new_gtid_mode),
                "group replication requires @@GLOBAL.GTID_MODE=ON");
@@ -2888,8 +2905,8 @@ class Sys_var_gtid_mode : public Sys_var_enum
 end:
     ret= false;
 err:
-    DBUG_ASSERT(lock_count >= 0);
-    DBUG_ASSERT(lock_count <= 4);
+    assert(lock_count >= 0);
+    assert(lock_count <= 4);
     if (lock_count == 4)
       global_sid_lock->unlock();
     mysql_mutex_unlock(mysql_bin_log.get_log_lock());
@@ -2942,7 +2959,7 @@ class Sys_var_enforce_gtid_consistency : public Sys_var_multi_enum
     enum_gtid_consistency_mode old_mode= get_gtid_consistency_mode();
     enum_gtid_mode gtid_mode= get_gtid_mode(GTID_MODE_LOCK_SID);
 
-    DBUG_ASSERT(new_mode <= GTID_CONSISTENCY_MODE_WARN);
+    assert(new_mode <= GTID_CONSISTENCY_MODE_WARN);
 
     DBUG_PRINT("info", ("old enforce_gtid_consistency=%d "
                         "new enforce_gtid_consistency=%d "
diff --git a/sql/sys_vars_resource_mgr.cc b/sql/sys_vars_resource_mgr.cc
index 0a7c5d030732..5be46199feae 100644
--- a/sql/sys_vars_resource_mgr.cc
+++ b/sql/sys_vars_resource_mgr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sys_vars_resource_mgr.h b/sql/sys_vars_resource_mgr.h
index c7de5b1094b8..6a2712fa8010 100644
--- a/sql/sys_vars_resource_mgr.h
+++ b/sql/sys_vars_resource_mgr.h
@@ -1,16 +1,23 @@
 #ifndef SYS_VARS_RESOURCE_MGR_INCLUDED
 #define SYS_VARS_RESOURCE_MGR_INCLUDED
 #include <hash.h>
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/sys_vars_shared.h b/sql/sys_vars_shared.h
index 7936f7d13381..24e39004e1ef 100644
--- a/sql/sys_vars_shared.h
+++ b/sql/sys_vars_shared.h
@@ -1,16 +1,23 @@
 #ifndef SYS_VARS_SHARED_INCLUDED
 #define SYS_VARS_SHARED_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -66,6 +73,14 @@ class PolyLock_rwlock: public PolyLock
   void unlock() { mysql_rwlock_unlock(rwlock); }
 };
 
+class PolyLock_lock_log: public PolyLock
+{
+public:
+  void rdlock();
+  void wrlock();
+  void unlock();
+};
+
 class AutoWLock
 {
   PolyLock *lock;
diff --git a/sql/table.cc b/sql/table.cc
index 302114c78968..ca7ac29093b6 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -228,7 +235,7 @@ GRANT_INFO::GRANT_INFO()
   grant_table= 0;
   version= 0;
   privilege= NO_ACCESS;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   want_privilege= 0;
 #endif
 }
@@ -277,8 +284,8 @@ char *fn_rext(char *name)
 static TABLE_CATEGORY get_table_category(const LEX_STRING &db,
                                          const LEX_STRING &name)
 {
-  DBUG_ASSERT(db.str != NULL);
-  DBUG_ASSERT(name.str != NULL);
+  assert(db.str != NULL);
+  assert(name.str != NULL);
 
   if (is_infoschema_db(db.str, db.length))
     return TABLE_CATEGORY_INFORMATION;
@@ -392,7 +399,7 @@ TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, const char *key,
                        table_cache_instances * sizeof(*cache_element_array),
                        NULL))
   {
-    memset(share, 0, sizeof(*share));
+    new (share) TABLE_SHARE;
 
     share->set_table_cache_key(key_buff, key, key_length);
 
@@ -458,7 +465,7 @@ void init_tmp_table_share(THD *thd, TABLE_SHARE *share, const char *key,
   DBUG_ENTER("init_tmp_table_share");
   DBUG_PRINT("enter", ("table: '%s'.'%s'", key, table_name));
 
-  memset(share, 0, sizeof(*share));
+  new (share) TABLE_SHARE;
   init_sql_alloc(key_memory_table_share,
                  &share->mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
   share->table_category=         TABLE_CATEGORY_TEMPORARY;
@@ -550,7 +557,7 @@ void free_table_share(TABLE_SHARE *share)
 {
   DBUG_ENTER("free_table_share");
   DBUG_PRINT("enter", ("table: %s.%s", share->db.str, share->table_name.str));
-  DBUG_ASSERT(share->ref_count == 0);
+  assert(share->ref_count == 0);
 
   if (share->m_flush_tickets.is_empty())
   {
@@ -739,7 +746,7 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
       The following is a safety test and should never fail
       as the old file name should never be longer than the new one.
     */
-    DBUG_ASSERT(length <= share->normalized_path.length);
+    assert(length <= share->normalized_path.length);
     /*
       If the old and the new names have the same length,
       then table name does not have tricky characters,
@@ -847,7 +854,7 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
 
 void KEY_PART_INFO::init_flags()
 {
-  DBUG_ASSERT(field);
+  assert(field);
   if (field->type() == MYSQL_TYPE_BLOB ||
       field->type() == MYSQL_TYPE_GEOMETRY)
     key_part_flag|= HA_BLOB_PART;
@@ -968,28 +975,36 @@ static void setup_key_part_field(TABLE_SHARE *share, handler *handler_file,
   @param[in]     share         Pointer to TABLE_SHARE
   @param[in]     handler       Pointer to handler
   @param[in,out] usable_parts  Pointer to usable_parts variable
+  @param[in]     use_extended_sk  TRUE if use_index_extensions is ON
 
   @retval                      Number of added key parts
 */
 
 static uint add_pk_parts_to_sk(KEY *sk, uint sk_n, KEY *pk, uint pk_n,
                                TABLE_SHARE *share, handler *handler_file,
-                               uint *usable_parts)
+                               uint *usable_parts, bool use_extended_sk)
 {
   uint max_key_length= sk->key_length;
-  bool is_unique_key= false;
+  /*
+    Secondary key becomes unique if the key does not exceed
+    key length limitation(MAX_KEY_LENGTH) and key parts
+    limitation(MAX_REF_PARTS) and PK parts are added to SK.
+  */
+  bool is_unique_key = use_extended_sk;
+  uint pk_part = 0;
   KEY_PART_INFO *current_key_part= &sk->key_part[sk->user_defined_key_parts];
 
   /* 
      For each keypart in the primary key: check if the keypart is
      already part of the secondary key and add it if not.
   */
-  for (uint pk_part= 0; pk_part < pk->user_defined_key_parts; pk_part++)
-  {
+  for (; pk_part < pk->user_defined_key_parts; pk_part++) {
     KEY_PART_INFO *pk_key_part= &pk->key_part[pk_part];
-    /* MySQL does not supports more key parts than MAX_REF_LENGTH */
-    if (sk->actual_key_parts >= MAX_REF_PARTS)
-      goto end;
+    /* No more than MAX_REF_PARTS key parts are supported. */
+    if (sk->actual_key_parts >= MAX_REF_PARTS) {
+      is_unique_key = false;
+      break;
+    }
 
     bool pk_field_is_in_sk= false;
     for (uint j= 0; j < sk->user_defined_key_parts; j++)
@@ -1003,12 +1018,18 @@ static uint add_pk_parts_to_sk(KEY *sk, uint sk_n, KEY *pk, uint pk_n,
       }
     }
 
-    /* Add PK field to secondary key if it's not already  part of the key. */
     if (!pk_field_is_in_sk)
     {
-      /* MySQL does not supports keys longer than MAX_KEY_LENGTH */
-      if (max_key_length + pk_key_part->length > MAX_KEY_LENGTH)
-        goto end;
+      if (max_key_length + pk_key_part->length > MAX_KEY_LENGTH) {
+        is_unique_key = false;
+        break;
+      }
+      max_key_length += pk_key_part->length;
+      /*
+        Do not add key part if SK is a unique key or
+        if use_index_extensions is OFF.
+      */
+      if ((sk->flags & HA_NOSAME) || !use_extended_sk) continue;
 
       *current_key_part= *pk_key_part;
       setup_key_part_field(share, handler_file, pk_n, sk, sk_n,
@@ -1018,18 +1039,20 @@ static uint add_pk_parts_to_sk(KEY *sk, uint sk_n, KEY *pk, uint pk_n,
       sk->rec_per_key[sk->actual_key_parts - 1]= 0;
       sk->set_records_per_key(sk->actual_key_parts - 1, REC_PER_KEY_UNKNOWN);
       current_key_part++;
-      max_key_length+= pk_key_part->length;
-      /*
-        Secondary key will be unique if the key  does not exceed
-        key length limitation and key parts limitation.
-      */
-      is_unique_key= true;
     }
   }
   if (is_unique_key)
     sk->actual_flags|= HA_NOSAME;
 
-end:
+  /*
+    Clean key maps for those PK parts which exceed
+    MAX_KEY_LENGTH or MAX_REF_PARTS limits.
+  */
+  for (; pk_part < pk->user_defined_key_parts; pk_part++) {
+    Field *fld = pk->key_part[pk_part].field;
+    fld->part_of_key.clear_bit(sk_n);
+    fld->part_of_sortkey.clear_bit(sk_n);
+  }
   return (sk->actual_key_parts - sk->user_defined_key_parts);
 }
 
@@ -1106,7 +1129,7 @@ bool get_table_and_parts_tablespace_names(
                                          ha_checktype(thd,
                                                       db_type, false, false));
     handlerton *se_hton= plugin_data<handlerton*>(se_plugin);
-    DBUG_ASSERT(se_hton);
+    assert(se_hton);
 
     // Now, assemble the parameters:
     // 1. The tablespace name (to be retrieved).
@@ -1445,7 +1468,7 @@ static int make_field_from_frm(THD *thd,
         return 4;
 
       gcol_info_length= uint2korr(*gcol_screen_pos + 1);
-      DBUG_ASSERT(gcol_info_length); // Expect non-null expression
+      assert(gcol_info_length); // Expect non-null expression
 
       fld_stored_in_db= (bool) (uint) (*gcol_screen_pos)[3];
       gcol_info->set_field_stored(fld_stored_in_db);
@@ -1637,6 +1660,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
   uint i,j;
   bool use_extended_sk;   // Supported extending of secondary keys with PK parts
   bool use_hash;
+  bool use_packed_keys;   // Supports packed keys.
   char *keynames, *names, *comment_pos, *gcol_screen_pos;
   char *orig_comment_pos, *orig_gcol_screen_pos;
   uchar forminfo[288];
@@ -1686,7 +1710,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
     goto err;
   DBUG_PRINT("info", ("default_part_db_type = %u", head[61]));
   legacy_db_type= (enum legacy_db_type) (uint) *(head+3);
-  DBUG_ASSERT(share->db_plugin == NULL);
+  assert(share->db_plugin == NULL);
   /*
     if the storage engine is dynamic, no point in resolving it by its
     dynamically allocated legacy_db_type. We will resolve it later by name.
@@ -1780,6 +1804,10 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
   share->key_info= keyinfo;
   key_part= reinterpret_cast<KEY_PART_INFO*>(keyinfo+keys);
 
+  use_packed_keys=
+    ha_check_storage_engine_flag(share->db_type(),
+                                 HTON_SUPPORTS_PACKED_KEYS);
+
   for (i=0 ; i < keys ; i++, keyinfo++)
   {
     keyinfo->table= 0;                           // Updated in open_frm
@@ -1801,6 +1829,23 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
       strpos+=4;
     }
 
+    /*
+      Beginning in 5.7.23, HA_PACK_KEY and HA_BINARY_PACK_KEY are no longer set
+      if the SE does not support it. If the index was created prior to 5.7.23
+      these bits may be set in the flags option, and when being added to
+      key_info->flags, the ALTER algorithm analysis will be broken because the
+      intermediate table is created without these flags, and hence, the
+      analysis will incorrectly conclude that all indexes have changed.
+
+      To workaround this issue, we remove the flags below, depending on the SE
+      capabilities, when preparing the table share. Thus, if we ALTER the table
+      at a later stage, indexes not being touched by the ALTER statement will
+      have the same flags both in the source table and the intermediate table,
+      and hence, the algorithm analysis will come to the right conclusion.
+    */
+    if (!use_packed_keys)
+      keyinfo->flags &= ~(HA_PACK_KEY | HA_BINARY_PACK_KEY);
+
     keyinfo->key_part= key_part;
     keyinfo->set_rec_per_key_array(rec_per_key, rec_per_key_float);
     keyinfo->set_in_memory_estimate(IN_MEMORY_ESTIMATE_UNKNOWN);
@@ -1866,8 +1911,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
                                          keyinfo->comment.length);
       strpos+= 2 + keyinfo->comment.length;
     } 
-    DBUG_ASSERT(MY_TEST(keyinfo->flags & HA_USES_COMMENT) ==
-               (keyinfo->comment.length > 0));
+    assert(MY_TEST(keyinfo->flags & HA_USES_COMMENT) ==
+           (keyinfo->comment.length > 0));
   }
 
   share->reclength = uint2korr((head+16));
@@ -1969,8 +2014,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
           Partition engine is ready, share->db_plugin must already contain a
           properly locked reference to it.
         */
-	DBUG_ASSERT(is_ha_partition_handlerton(plugin_data<handlerton*>(
-                                                 share->db_plugin)));
+	assert(is_ha_partition_handlerton(plugin_data<handlerton*>(
+                                                                   share->db_plugin)));
         DBUG_PRINT("info", ("setting dbtype to '%.*s' (%d)",
                             str_db_type_length, next_chunk + 2,
                             ha_legacy_type(share->db_type())));
@@ -2328,7 +2373,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
     comment_pos= orig_comment_pos;
     gcol_screen_pos= orig_gcol_screen_pos;
     // Generated columns can be present only in new .FRMs.
-    DBUG_ASSERT(new_frm_ver >= 3);
+    assert(new_frm_ver >= 3);
     for (i=0 ; i < share->fields; i++, strpos+=field_pack_length)
     {
       if ((strpos[10] & Field::GENERATED_FIELD) && // Field::unireg_check
@@ -2363,8 +2408,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
   error= 4;
   share->field[share->fields]= 0; // End marker
   /* Sanity checks: */
-  DBUG_ASSERT(share->fields >= share->stored_fields);
-  DBUG_ASSERT(share->reclength >= share->stored_rec_length);
+  assert(share->fields >= share->stored_fields);
+  assert(share->reclength >= share->stored_rec_length);
 
   /* Fix key->name and key_part->field */
   if (key_parts)
@@ -2394,7 +2439,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
 	primary_key=key;
 	for (i=0 ; i < keyinfo->user_defined_key_parts ;i++)
 	{
-          DBUG_ASSERT(key_part[i].fieldnr > 0);
+          assert(key_part[i].fieldnr > 0);
           // Table field corresponding to the i'th key part.
           Field *table_field= share->field[key_part[i].fieldnr - 1];
 
@@ -2527,11 +2572,11 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
         }
       }
 
-
-      if (use_extended_sk && primary_key < MAX_KEY &&
-          key && !(keyinfo->flags & HA_NOSAME))
-        key_part+= add_pk_parts_to_sk(keyinfo, key, share->key_info, primary_key,
-                                      share,  handler_file, &usable_parts);
+      if (primary_key < MAX_KEY && key != primary_key &&
+          (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX))
+        key_part += add_pk_parts_to_sk(keyinfo, key, share->key_info,
+                                       primary_key, share, handler_file,
+                                       &usable_parts, use_extended_sk);
 
       /* Skip unused key parts if they exist */
       key_part+= keyinfo->unused_key_parts;
@@ -2635,7 +2680,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
   bitmap_set_all(&share->all_set);
 
   delete handler_file;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (use_hash)
     (void) my_hash_check(&share->name_hash);
 #endif
@@ -2673,7 +2718,7 @@ static bool validate_generated_expr(Field *field)
   DBUG_ENTER("validate_generate_expr");
   Item* expr= field->gcol_info->expr_item;
   const char *field_name= field->field_name;
-  DBUG_ASSERT(expr);
+  assert(expr);
 
   /**
     These are not allowed:
@@ -2690,7 +2735,7 @@ static bool validate_generated_expr(Field *field)
     my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), field_name);
     DBUG_RETURN(TRUE);
   }
-  DBUG_ASSERT(!expr->has_subquery());           // 4)
+  assert(!expr->has_subquery());           // 4)
   /*
     Walk through the Item tree, checking the validity of items
     belonging to the generated column.
@@ -2736,7 +2781,7 @@ static bool fix_fields_gcol_func(THD *thd, Field *field)
   char db_name_string[FN_REFLEN];
   bool save_use_only_table_context;
   enum_mark_columns save_mark_used_columns= thd->mark_used_columns;
-  DBUG_ASSERT(func_expr);
+  assert(func_expr);
   DBUG_ENTER("fix_fields_gcol_func");
 
   /*
@@ -2810,7 +2855,7 @@ static bool fix_fields_gcol_func(THD *thd, Field *field)
     goto end;
 
   // Virtual columns expressions that substitute themselves are invalid
-  DBUG_ASSERT(new_func == func_expr);
+  assert(new_func == func_expr);
   result= FALSE;
 
 end:
@@ -2834,7 +2879,7 @@ bool Generated_column::register_base_columns(TABLE *table)
   my_bitmap_map *bitbuf=
     static_cast<my_bitmap_map *>(alloc_root(&table->mem_root,
                                 bitmap_buffer_size(table->s->fields)));
-  DBUG_ASSERT(num_non_virtual_base_cols == 0);
+  assert(num_non_virtual_base_cols == 0);
   bitmap_init(&base_columns_map, bitbuf, table->s->fields, 0);
 
   MY_BITMAP *save_old_read_set= table->read_set;
@@ -2893,9 +2938,9 @@ static bool unpack_gcol_info_from_frm(THD *thd,
                                       bool *error_reported)
 {
   DBUG_ENTER("unpack_gcol_info_from_frm");
-  DBUG_ASSERT(field->table == table);
+  assert(field->table == table);
   LEX_STRING *gcol_expr= &field->gcol_info->expr_str;
-  DBUG_ASSERT(gcol_expr);
+  assert(gcol_expr);
   /*
     Step 1: Construct a statement for the parser.
     The parsed string needs to take the following format:
@@ -3066,7 +3111,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
                       share->table_name.str, (long) outparam));
 
   error= 1;
-  memset(outparam, 0, sizeof(*outparam));
+  new (outparam) TABLE;
   outparam->in_use= thd;
   outparam->s= share;
   outparam->db_stat= db_stat;
@@ -3096,7 +3141,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
   }
   else
   {
-    DBUG_ASSERT(!db_stat);
+    assert(!db_stat);
   }
 
   error= 4;
@@ -3373,7 +3418,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
 	    ibd file might be missing
           */
           error= 1;
-          DBUG_ASSERT(my_errno() == HA_ERR_TABLESPACE_MISSING);
+          assert(my_errno() == HA_ERR_TABLESPACE_MISSING);
           break;
         case HA_ERR_NO_SUCH_TABLE:
 	  /*
@@ -3995,8 +4040,8 @@ File create_frm(THD *thd, const char *name, const char *db,
     */
     for (i= 0; i < keys; i++)
     {
-      DBUG_ASSERT(MY_TEST(key_info[i].flags & HA_USES_COMMENT) ==
-                 (key_info[i].comment.length > 0));
+      assert(MY_TEST(key_info[i].flags & HA_USES_COMMENT) ==
+             (key_info[i].comment.length > 0));
       if (key_info[i].flags & HA_USES_COMMENT)
         key_comment_total_bytes += 2 + key_info[i].comment.length;
     }
@@ -4314,7 +4359,7 @@ Table_check_intact::check(TABLE *table, const TABLE_FIELD_DEF *table_def)
 
   /* Whether the table definition has already been validated. */
   if (table->s->table_field_def_cache == table_def)
-    DBUG_RETURN(FALSE);
+    goto end;
 
   if (table->s->fields != table_def->count)
   {
@@ -4432,6 +4477,15 @@ Table_check_intact::check(TABLE *table, const TABLE_FIELD_DEF *table_def)
   if (! error)
     table->s->table_field_def_cache= table_def;
 
+end:
+
+  if (has_keys && !error && !table->key_info)
+  {
+    my_error(ER_MISSING_KEY, MYF(0), table->s->db.str,
+             table->s->table_name.str);
+    error= TRUE;
+  }
+
   DBUG_RETURN(error);
 }
 
@@ -4532,7 +4586,7 @@ bool TABLE_SHARE::visit_subgraph(Wait_for_flush *wait_for_flush,
   gvisitor->m_lock_open_count--;
   if (locked)
   {
-    DBUG_ASSERT(gvisitor->m_lock_open_count == 0);
+    assert(gvisitor->m_lock_open_count == 0);
     table_cache_manager.unlock_all_and_tdc();
   }
 
@@ -4584,7 +4638,7 @@ bool TABLE_SHARE::wait_for_old_version(THD *thd, struct timespec *abstime,
     up to date and the share is referenced. Otherwise our
     thread will never be woken up from wait.
   */
-  DBUG_ASSERT(version != refresh_version && ref_count != 0);
+  assert(version != refresh_version && ref_count != 0);
 
   m_flush_tickets.push_front(&ticket);
 
@@ -4642,7 +4696,7 @@ bool TABLE_SHARE::wait_for_old_version(THD *thd, struct timespec *abstime,
   case MDL_wait::KILLED:
     return TRUE;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     return TRUE;
   }
 }
@@ -4661,7 +4715,7 @@ bool TABLE_SHARE::wait_for_old_version(THD *thd, struct timespec *abstime,
 
 void TABLE::init(THD *thd, TABLE_LIST *tl)
 {
-  DBUG_ASSERT(s->ref_count > 0 || s->tmp_table != NO_TMP_TABLE);
+  assert(s->ref_count > 0 || s->tmp_table != NO_TMP_TABLE);
 
   if (thd->lex->need_correct_ident())
     alias_name_used= my_strcasecmp(table_alias_charset,
@@ -4689,18 +4743,18 @@ void TABLE::init(THD *thd, TABLE_LIST *tl)
   reginfo.impossible_range= 0;
 
   /* Catch wrong handling of the auto_increment_field_not_null. */
-  DBUG_ASSERT(!auto_increment_field_not_null);
+  assert(!auto_increment_field_not_null);
   auto_increment_field_not_null= FALSE;
 
   pos_in_table_list= tl;
 
   clear_column_bitmaps();
 
-  DBUG_ASSERT(key_read == 0);
+  assert(key_read == 0);
   no_keyread= false;
 
   /* Tables may be reused in a sub statement. */
-  DBUG_ASSERT(!file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
+  assert(!file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
   
   /*
     Do not call refix_gc_items() for tables which are not directly used by the
@@ -4718,7 +4772,7 @@ void TABLE::init(THD *thd, TABLE_LIST *tl)
   if (!pos_in_table_list->prelocking_placeholder)
   {
     bool error MY_ATTRIBUTE((unused))= refix_gc_items(thd);
-    DBUG_ASSERT(!error);
+    assert(!error);
   }
 }
 
@@ -4730,7 +4784,7 @@ bool TABLE::refix_gc_items(THD *thd)
     for (Field **vfield_ptr= vfield; *vfield_ptr; vfield_ptr++)
     {
       Field *vfield= *vfield_ptr;
-      DBUG_ASSERT(vfield->gcol_info && vfield->gcol_info->expr_item);
+      assert(vfield->gcol_info && vfield->gcol_info->expr_item);
       if (!vfield->gcol_info->expr_item->fixed)
       {
         bool res= false;
@@ -4860,7 +4914,7 @@ void TABLE::reset_item_list(List<Item> *item_list) const
   for (Field **ptr= visible_field_ptr(); *ptr; ptr++, i++)
   {
     Item_field *item_field= (Item_field*) it++;
-    DBUG_ASSERT(item_field != 0);
+    assert(item_field != 0);
     item_field->reset_field(*ptr);
   }
 }
@@ -4883,17 +4937,19 @@ TABLE_LIST *TABLE_LIST::new_nested_join(MEM_ROOT *allocator,
                             List<TABLE_LIST> *belongs_to,
                             class st_select_lex *select)
 {
-  DBUG_ASSERT(belongs_to && select);
+  assert(belongs_to && select);
 
   TABLE_LIST *const join_nest=
-    (TABLE_LIST *) alloc_root(allocator, ALIGN_SIZE(sizeof(TABLE_LIST))+
-                                                    sizeof(NESTED_JOIN));
+    (TABLE_LIST*) alloc_root(allocator, sizeof(TABLE_LIST));
   if (join_nest == NULL)
     return NULL;
+  new (join_nest) TABLE_LIST;
 
-  memset(join_nest, 0, ALIGN_SIZE(sizeof(TABLE_LIST)) + sizeof(NESTED_JOIN));
   join_nest->nested_join=
-    (NESTED_JOIN *) ((uchar *)join_nest + ALIGN_SIZE(sizeof(TABLE_LIST)));
+    (NESTED_JOIN*) alloc_root(allocator, sizeof(NESTED_JOIN));
+  if (join_nest->nested_join == NULL)
+    return NULL;
+  new (join_nest->nested_join) NESTED_JOIN;
 
   join_nest->db= (char *)"";
   join_nest->db_length= 0;
@@ -4920,7 +4976,7 @@ TABLE_LIST *TABLE_LIST::new_nested_join(MEM_ROOT *allocator,
 
 bool TABLE_LIST::merge_underlying_tables(class st_select_lex *select)
 {
-  DBUG_ASSERT(nested_join->join_list.is_empty());
+  assert(nested_join->join_list.is_empty());
 
   List_iterator_fast<TABLE_LIST> li(select->top_join_list);
   TABLE_LIST *tl;
@@ -4988,7 +5044,7 @@ bool TABLE_LIST::merge_where(THD *thd)
 {
   DBUG_ENTER("TABLE_LIST::merge_where");
 
-  DBUG_ASSERT(is_merged());
+  assert(is_merged());
 
   Item *const condition= derived_unit()->first_select()->where_cond();
 
@@ -5031,9 +5087,9 @@ bool TABLE_LIST::create_field_translation(THD *thd)
   List_iterator_fast<Item> it(select->item_list);
   uint field_count= 0;
 
-  DBUG_ASSERT(derived->is_prepared());
+  assert(derived->is_prepared());
 
-  DBUG_ASSERT(!field_translation);
+  assert(!field_translation);
 
   Prepared_stmt_arena_holder ps_arena_holder(thd);
 
@@ -5135,7 +5191,7 @@ static bool merge_join_conditions(THD *thd, TABLE_LIST *table, Item **pcond)
 bool TABLE_LIST::prepare_check_option(THD *thd, bool is_cascaded)
 {
   DBUG_ENTER("TABLE_LIST::prepare_check_option");
-  DBUG_ASSERT(is_view());
+  assert(is_view());
 
   /*
     True if conditions of underlying views should be treated as WITH CASCADED
@@ -5331,7 +5387,7 @@ bool TABLE_LIST::set_insert_values(MEM_ROOT *mem_root)
   }
   else
   {
-    DBUG_ASSERT(view && merge_underlying_list);
+    assert(view && merge_underlying_list);
     for (TABLE_LIST *tbl= merge_underlying_list; tbl; tbl= tbl->next_local)
       if (tbl->set_insert_values(mem_root))
         return true;                     /* purecov: inspected */
@@ -5393,7 +5449,7 @@ TABLE_LIST *TABLE_LIST::first_leaf_for_name_resolution()
 
   if (is_leaf_for_name_resolution())
     return this;
-  DBUG_ASSERT(nested_join);
+  assert(nested_join);
 
   for (cur_nested_join= nested_join;
        cur_nested_join;
@@ -5450,7 +5506,7 @@ TABLE_LIST *TABLE_LIST::last_leaf_for_name_resolution()
 
   if (is_leaf_for_name_resolution())
     return this;
-  DBUG_ASSERT(nested_join);
+  assert(nested_join);
 
   for (cur_nested_join= nested_join;
        cur_nested_join;
@@ -5485,7 +5541,7 @@ TABLE_LIST *TABLE_LIST::last_leaf_for_name_resolution()
 
 void TABLE_LIST::set_want_privilege(ulong want_privilege)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   // Remove SHOW_VIEW_ACL, because it will be checked during making view
   want_privilege&= ~SHOW_VIEW_ACL;
 
@@ -5516,11 +5572,11 @@ bool TABLE_LIST::prepare_view_securety_context(THD *thd)
   DBUG_ENTER("TABLE_LIST::prepare_view_securety_context");
   DBUG_PRINT("enter", ("table: %s", alias));
 
-  DBUG_ASSERT(!prelocking_placeholder && view);
+  assert(!prelocking_placeholder && view);
   if (view_suid)
   {
     DBUG_PRINT("info", ("This table is suid view => load contest"));
-    DBUG_ASSERT(view && view_sctx);
+    assert(view && view_sctx);
     if (acl_getroot(view_sctx,
                     const_cast<char*>(definer.user.str),
                     const_cast<char*>(definer.host.str),
@@ -5579,10 +5635,10 @@ Security_context *TABLE_LIST::find_view_security_context(THD *thd)
   TABLE_LIST *upper_view= this;
   DBUG_ENTER("TABLE_LIST::find_view_security_context");
 
-  DBUG_ASSERT(view);
+  assert(view);
   while (upper_view && !upper_view->view_suid)
   {
-    DBUG_ASSERT(!upper_view->prelocking_placeholder);
+    assert(!upper_view->prelocking_placeholder);
     upper_view= upper_view->referencing_view;
   }
   if (upper_view)
@@ -5590,7 +5646,7 @@ Security_context *TABLE_LIST::find_view_security_context(THD *thd)
     DBUG_PRINT("info", ("Securety context of view %s will be used",
                         upper_view->alias));
     sctx= upper_view->view_sctx;
-    DBUG_ASSERT(sctx);
+    assert(sctx);
   }
   else
   {
@@ -5622,14 +5678,14 @@ bool TABLE_LIST::prepare_security(THD *thd)
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   Security_context *save_security_ctx= thd->security_context();
 
-  DBUG_ASSERT(!prelocking_placeholder);
+  assert(!prelocking_placeholder);
   if (prepare_view_securety_context(thd))
     DBUG_RETURN(TRUE);
   thd->set_security_context(find_view_security_context(thd));
   opt_trace_disable_if_no_security_context_access(thd);
   while ((tbl= tb++))
   {
-    DBUG_ASSERT(tbl->referencing_view);
+    assert(tbl->referencing_view);
     const char *local_db, *local_table_name;
     if (tbl->is_view())
     {
@@ -5664,7 +5720,7 @@ bool TABLE_LIST::prepare_security(THD *thd)
 Natural_join_column::Natural_join_column(Field_translator *field_param,
                                          TABLE_LIST *tab)
 {
-  DBUG_ASSERT(tab->field_translation);
+  assert(tab->field_translation);
   view_field= field_param;
   table_field= NULL;
   table_ref= tab;
@@ -5675,7 +5731,7 @@ Natural_join_column::Natural_join_column(Field_translator *field_param,
 Natural_join_column::Natural_join_column(Item_field *field_param,
                                          TABLE_LIST *tab)
 {
-  DBUG_ASSERT(tab->table == field_param->field->table);
+  assert(tab->table == field_param->field->table);
   table_field= field_param;
   /*
     Cache table, to have no resolution problem after natural join nests have
@@ -5693,7 +5749,7 @@ const char *Natural_join_column::name()
 {
   if (view_field)
   {
-    DBUG_ASSERT(table_field == NULL);
+    assert(table_field == NULL);
     return view_field->name;
   }
 
@@ -5705,7 +5761,7 @@ Item *Natural_join_column::create_item(THD *thd)
 {
   if (view_field)
   {
-    DBUG_ASSERT(table_field == NULL);
+    assert(table_field == NULL);
     SELECT_LEX *select= thd->lex->current_select();
     return create_view_field(thd, table_ref, &view_field->item,
                              view_field->name, &select->context);
@@ -5718,7 +5774,7 @@ Field *Natural_join_column::field()
 {
   if (view_field)
   {
-    DBUG_ASSERT(table_field == NULL);
+    assert(table_field == NULL);
     return NULL;
   }
   return table_field->field;
@@ -5727,7 +5783,7 @@ Field *Natural_join_column::field()
 
 const char *Natural_join_column::table_name()
 {
-  DBUG_ASSERT(table_ref);
+  assert(table_ref);
   return table_ref->alias;
 }
 
@@ -5742,11 +5798,11 @@ const char *Natural_join_column::db_name()
     ensure consistency. An exception are I_S schema tables, which
     are inconsistent in this respect.
   */
-  DBUG_ASSERT(!strcmp(table_ref->db,
-                      table_ref->table->s->db.str) ||
-              (table_ref->schema_table &&
-               is_infoschema_db(table_ref->table->s->db.str,
-                                table_ref->table->s->db.length)));
+  assert(!strcmp(table_ref->db,
+                 table_ref->table->s->db.str) ||
+         (table_ref->schema_table &&
+          is_infoschema_db(table_ref->table->s->db.str,
+                           table_ref->table->s->db.length)));
   return table_ref->db;
 }
 
@@ -5761,7 +5817,7 @@ GRANT_INFO *Natural_join_column::grant()
 
 void Field_iterator_view::set(TABLE_LIST *table)
 {
-  DBUG_ASSERT(table->field_translation);
+  assert(table->field_translation);
   view= table;
   ptr= table->field_translation;
   array_end= table->field_translation_end;
@@ -5820,11 +5876,11 @@ static Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
       ('mysql_schema_table' function). So we can return directly the
       field. This case happens only for 'show & where' commands.
     */
-    DBUG_ASSERT(field && field->fixed);
+    assert(field && field->fixed);
     DBUG_RETURN(field);
   }
 
-  DBUG_ASSERT(field);
+  assert(field);
   if (!field->fixed)
   {
     if (field->fix_fields(thd, field_ref))
@@ -5845,7 +5901,7 @@ static Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
       field= down_cast<Item_ref *>(field)->ref[0];
     }
     if (field->type() == Item::FIELD_ITEM)
-      table_name= down_cast<Item_field *>(field)->table_name;
+      table_name= thd->mem_strdup(down_cast<Item_field *>(field)->table_name);
     else
       table_name= "";
   }
@@ -5870,7 +5926,7 @@ static Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
 
 void Field_iterator_natural_join::set(TABLE_LIST *table_ref)
 {
-  DBUG_ASSERT(table_ref->join_columns);
+  assert(table_ref->join_columns);
   column_ref_it.init(*(table_ref->join_columns));
   cur_column_ref= column_ref_it++;
 }
@@ -5879,9 +5935,9 @@ void Field_iterator_natural_join::set(TABLE_LIST *table_ref)
 void Field_iterator_natural_join::next()
 {
   cur_column_ref= column_ref_it++;
-  DBUG_ASSERT(!cur_column_ref || ! cur_column_ref->table_field ||
-              cur_column_ref->table_ref->table ==
-              cur_column_ref->table_field->field->table);
+  assert(!cur_column_ref || ! cur_column_ref->table_field ||
+         cur_column_ref->table_ref->table ==
+         cur_column_ref->table_field->field->table);
 }
 
 
@@ -5898,18 +5954,18 @@ void Field_iterator_table_ref::set_field_iterator()
   if (table_ref->is_join_columns_complete)
   {
     /* Necesary, but insufficient conditions. */
-    DBUG_ASSERT(table_ref->is_natural_join ||
-                table_ref->nested_join ||
-                (table_ref->join_columns &&
-                /* This is a merge view. */
-                ((table_ref->field_translation &&
-                  table_ref->join_columns->elements ==
-                  (ulong)(table_ref->field_translation_end -
-                          table_ref->field_translation)) ||
-                 /* This is stored table or a tmptable view. */
-                 (!table_ref->field_translation &&
-                  table_ref->join_columns->elements ==
-                  table_ref->table->s->fields))));
+    assert(table_ref->is_natural_join ||
+           table_ref->nested_join ||
+           (table_ref->join_columns &&
+            /* This is a merge view. */
+            ((table_ref->field_translation &&
+              table_ref->join_columns->elements ==
+              (ulong)(table_ref->field_translation_end -
+                      table_ref->field_translation)) ||
+             /* This is stored table or a tmptable view. */
+             (!table_ref->field_translation &&
+              table_ref->join_columns->elements ==
+              table_ref->table->s->fields))));
     field_it= &natural_join_it;
     DBUG_PRINT("info",("field_it for '%s' is Field_iterator_natural_join",
                        table_ref->alias));
@@ -5917,7 +5973,7 @@ void Field_iterator_table_ref::set_field_iterator()
   /* This is a merge view, so use field_translation. */
   else if (table_ref->field_translation)
   {
-    DBUG_ASSERT(table_ref->is_merged());
+    assert(table_ref->is_merged());
     field_it= &view_field_it;
     DBUG_PRINT("info", ("field_it for '%s' is Field_iterator_view",
                         table_ref->alias));
@@ -5925,7 +5981,7 @@ void Field_iterator_table_ref::set_field_iterator()
   /* This is a base table or stored view. */
   else
   {
-    DBUG_ASSERT(table_ref->table || table_ref->is_view());
+    assert(table_ref->table || table_ref->is_view());
     field_it= &table_field_it;
     DBUG_PRINT("info", ("field_it for '%s' is Field_iterator_table",
                         table_ref->alias));
@@ -5937,10 +5993,10 @@ void Field_iterator_table_ref::set_field_iterator()
 
 void Field_iterator_table_ref::set(TABLE_LIST *table)
 {
-  DBUG_ASSERT(table);
+  assert(table);
   first_leaf= table->first_leaf_for_name_resolution();
   last_leaf=  table->last_leaf_for_name_resolution();
-  DBUG_ASSERT(first_leaf && last_leaf);
+  assert(first_leaf && last_leaf);
   table_ref= first_leaf;
   set_field_iterator();
 }
@@ -5957,7 +6013,7 @@ void Field_iterator_table_ref::next()
   if (field_it->end_of_fields() && table_ref != last_leaf)
   {
     table_ref= table_ref->next_name_resolution_table;
-    DBUG_ASSERT(table_ref);
+    assert(table_ref);
     set_field_iterator();
   }
 }
@@ -5970,8 +6026,8 @@ const char *Field_iterator_table_ref::get_table_name()
   else if (table_ref->is_natural_join)
     return natural_join_it.column_ref()->table_name();
 
-  DBUG_ASSERT(!strcmp(table_ref->table_name,
-                      table_ref->table->s->table_name.str));
+  assert(!strcmp(table_ref->table_name,
+                 table_ref->table->s->table_name.str));
   return table_ref->table_name;
 }
 
@@ -5988,10 +6044,10 @@ const char *Field_iterator_table_ref::get_db_name()
     ensure consistency. An exception are I_S schema tables, which
     are inconsistent in this respect.
   */
-  DBUG_ASSERT(!strcmp(table_ref->db, table_ref->table->s->db.str) ||
-              (table_ref->schema_table &&
-               is_infoschema_db(table_ref->table->s->db.str,
-                                table_ref->table->s->db.length)));
+  assert(!strcmp(table_ref->db, table_ref->table->s->db.str) ||
+         (table_ref->schema_table &&
+          is_infoschema_db(table_ref->table->s->db.str,
+                           table_ref->table->s->db.length)));
 
   return table_ref->db;
 }
@@ -6079,13 +6135,13 @@ Field_iterator_table_ref::get_or_create_column_ref(THD *thd, TABLE_LIST *parent_
       already created via one of the two constructor calls above. In this case
       we just return the already created column reference.
     */
-    DBUG_ASSERT(table_ref->is_join_columns_complete);
+    assert(table_ref->is_join_columns_complete);
     is_created= FALSE;
     nj_col= natural_join_it.column_ref();
-    DBUG_ASSERT(nj_col);
+    assert(nj_col);
   }
-  DBUG_ASSERT(!nj_col->table_field ||
-              nj_col->table_ref->table == nj_col->table_field->field->table);
+  assert(!nj_col->table_field ||
+         nj_col->table_ref->table == nj_col->table_field->field->table);
 
   /*
     If the natural join column was just created add it to the list of
@@ -6095,7 +6151,7 @@ Field_iterator_table_ref::get_or_create_column_ref(THD *thd, TABLE_LIST *parent_
   if (is_created)
   {
     /* Make sure not all columns were materialized. */
-    DBUG_ASSERT(!add_table_ref->is_join_columns_complete);
+    assert(!add_table_ref->is_join_columns_complete);
     if (!add_table_ref->join_columns)
     {
       /* Create a list of natural join columns on demand. */
@@ -6141,16 +6197,16 @@ Field_iterator_table_ref::get_natural_column_ref()
 {
   Natural_join_column *nj_col;
 
-  DBUG_ASSERT(field_it == &natural_join_it);
+  assert(field_it == &natural_join_it);
   /*
     The field belongs to a NATURAL join, therefore the column reference was
     already created via one of the two constructor calls above. In this case
     we just return the already created column reference.
   */
   nj_col= natural_join_it.column_ref();
-  DBUG_ASSERT(nj_col &&
-              (!nj_col->table_field ||
-               nj_col->table_ref->table == nj_col->table_field->field->table));
+  assert(nj_col &&
+         (!nj_col->table_field ||
+          nj_col->table_ref->table == nj_col->table_field->field->table));
   return nj_col;
 }
 
@@ -6256,7 +6312,7 @@ void TABLE::mark_column_used(THD *thd, Field *field,
       DBUG_PRINT("warning", ("Found duplicated field"));
       thd->dup_field= field;
     }
-    DBUG_ASSERT(!get_fields_in_item_tree);
+    assert(!get_fields_in_item_tree);
 
     if (field->is_gcol())
       mark_gcol_in_maps(field);
@@ -6349,7 +6405,7 @@ void TABLE::mark_columns_used_by_index_no_reset(uint index,
 
 void TABLE::mark_auto_increment_column()
 {
-  DBUG_ASSERT(found_next_number_field);
+  assert(found_next_number_field);
   /*
     We must set bit in read set as update_auto_increment() is using the
     store() to check overflow of auto_increment values
@@ -6549,8 +6605,8 @@ void TABLE::mark_columns_needed_for_update(bool mark_binlog_columns)
 void TABLE::mark_columns_per_binlog_row_image()
 {
   DBUG_ENTER("mark_columns_per_binlog_row_image");
-  DBUG_ASSERT(read_set->bitmap);
-  DBUG_ASSERT(write_set->bitmap);
+  assert(read_set->bitmap);
+  assert(write_set->bitmap);
 
   /**
     If in RBR we may need to mark some extra columns,
@@ -6603,7 +6659,7 @@ void TABLE::mark_columns_per_binlog_row_image()
         break;
 
       default: 
-        DBUG_ASSERT(FALSE);
+        assert(FALSE);
     }
     file->column_bitmaps_signal();
   }
@@ -6628,7 +6684,7 @@ void TABLE::mark_columns_per_binlog_row_image()
 
 bool TABLE::alloc_keys(uint key_count)
 {
-  DBUG_ASSERT(!s->keys);
+  assert(!s->keys);
   max_keys= key_count;
   if (!(key_info= s->key_info=
         (KEY*) alloc_root(&mem_root, sizeof(KEY)*max_keys)))
@@ -6660,7 +6716,7 @@ bool TABLE::alloc_keys(uint key_count)
 
 bool TABLE::add_tmp_key(Field_map *key_parts, char *key_name)
 {
-  DBUG_ASSERT(!created && s->keys < max_keys && key_parts);
+  assert(!created && s->keys < max_keys && key_parts);
 
   KEY* cur_key= key_info + s->keys;
   Field **reg_field;
@@ -6677,7 +6733,7 @@ bool TABLE::add_tmp_key(Field_map *key_parts, char *key_name)
     {
       KEY_PART_INFO tkp;
       // Ensure that we're not creating a key over a blob field.
-      DBUG_ASSERT(!((*reg_field)->flags & BLOB_FLAG));
+      assert(!((*reg_field)->flags & BLOB_FLAG));
       /*
         Check if possible key is too long, ignore it if so.
         The reason to use MI_MAX_KEY_LENGTH (myisam's default) is that it is
@@ -6773,7 +6829,7 @@ bool TABLE::add_tmp_key(Field_map *key_parts, char *key_name)
 
 void TABLE::use_index(int key_to_save)
 {
-  DBUG_ASSERT(!created && s->keys && key_to_save < (int)s->keys);
+  assert(!created && s->keys && key_to_save < (int)s->keys);
 
   Field **reg_field;
   /*
@@ -6923,7 +6979,7 @@ void TABLE::mark_generated_columns(bool is_update)
     for (vfield_ptr= vfield; *vfield_ptr; vfield_ptr++)
     {
       tmp_vfield= *vfield_ptr;
-      DBUG_ASSERT(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
+      assert(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
 
       /*
         We need to evaluate the GC if:
@@ -6955,7 +7011,7 @@ void TABLE::mark_generated_columns(bool is_update)
     for (vfield_ptr= vfield; *vfield_ptr; vfield_ptr++)
     {
       tmp_vfield= *vfield_ptr;
-      DBUG_ASSERT(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
+      assert(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
       tmp_vfield->table->mark_column_used(in_use, tmp_vfield,
                                           MARK_COLUMNS_WRITE);
       bitmap_updated= TRUE;
@@ -6984,7 +7040,7 @@ bool TABLE::is_field_used_by_generated_columns(uint field_index)
   for (Field **vfield_ptr= vfield; *vfield_ptr; vfield_ptr++)
   {
     Field *tmp_vfield= *vfield_ptr;
-    DBUG_ASSERT(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
+    assert(tmp_vfield->gcol_info && tmp_vfield->gcol_info->expr_item);
     Mark_field mark_fld(MARK_COLUMNS_TEMP);
     tmp_vfield->gcol_info->expr_item->walk(&Item::mark_field_in_map,
                                            Item::WALK_PREFIX, (uchar *) &mark_fld);
@@ -7272,7 +7328,7 @@ bool TABLE_LIST::is_mergeable() const
 ///  @returns true if materializable table contains one or zero rows
 bool TABLE_LIST::materializable_is_const() const
 {
-  DBUG_ASSERT(uses_materialization());
+  assert(uses_materialization());
   return derived_unit()->query_result()->estimated_rowcount <= 1;
 }
 
@@ -7284,7 +7340,7 @@ bool TABLE_LIST::materializable_is_const() const
 uint TABLE_LIST::leaf_tables_count() const
 {
   // Join nests are not permissible, except as merged views
-  DBUG_ASSERT(nested_join == NULL || is_merged());
+  assert(nested_join == NULL || is_merged());
   if (!is_merged())  // Base table or materialized view
     return 1;
 
@@ -7555,7 +7611,7 @@ bool TABLE_LIST::generate_keys()
   Derived_key *entry;
   uint key= 0;
   char buf[NAME_CHAR_LEN];
-  DBUG_ASSERT(uses_materialization());
+  assert(uses_materialization());
 
   if (!derived_key_list.elements)
     return FALSE;
@@ -7630,8 +7686,8 @@ bool TABLE::check_read_removal(uint index)
   bool retval= false;
 
   DBUG_ENTER("check_read_removal");
-  DBUG_ASSERT(file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL);
-  DBUG_ASSERT(index != MAX_KEY);
+  assert(file->ha_table_flags() & HA_READ_BEFORE_WRITE_REMOVAL);
+  assert(index != MAX_KEY);
 
   // Index must be unique
   if ((key_info[index].flags & HA_NOSAME) == 0)
@@ -7706,7 +7762,7 @@ void repoint_field_to_record(TABLE *table, uchar *old_rec, uchar *new_rec)
 bool update_generated_read_fields(uchar *buf, TABLE *table, uint active_index)
 {
   DBUG_ENTER("update_generated_read_fields");
-  DBUG_ASSERT(table && table->vfield);
+  assert(table && table->vfield);
   if (active_index != MAX_KEY && table->key_read)
   {
     /*
@@ -7738,7 +7794,7 @@ bool update_generated_read_fields(uchar *buf, TABLE *table, uint active_index)
   for (Field **vfield_ptr= table->vfield; *vfield_ptr; vfield_ptr++)
   {
     Field *vfield= *vfield_ptr;
-    DBUG_ASSERT(vfield->gcol_info && vfield->gcol_info->expr_item);
+    assert(vfield->gcol_info && vfield->gcol_info->expr_item);
     /*
       Only calculate those virtual generated fields that are marked in the
       read_set bitmap.
@@ -7746,7 +7802,7 @@ bool update_generated_read_fields(uchar *buf, TABLE *table, uint active_index)
     if (!vfield->stored_in_db &&
         bitmap_is_set(table->read_set, vfield->field_index))
     {
-      if (vfield->type() == MYSQL_TYPE_BLOB)
+      if ((vfield->flags & BLOB_FLAG) != 0)
       {
         (down_cast<Field_blob*>(vfield))->keep_old_value();
         (down_cast<Field_blob*>(vfield))->set_keep_old_value(true);
@@ -7808,23 +7864,23 @@ bool update_generated_write_fields(const MY_BITMAP *bitmap, TABLE *table)
   Field **vfield_ptr;
   int error= 0;
 
-  DBUG_ASSERT(table->vfield);
+  assert(table->vfield);
   /* Iterate over generated fields in the table */
   for (vfield_ptr= table->vfield; *vfield_ptr; vfield_ptr++)
   {
     Field *vfield;
     vfield= (*vfield_ptr);
-    DBUG_ASSERT(vfield->gcol_info && vfield->gcol_info->expr_item);
+    assert(vfield->gcol_info && vfield->gcol_info->expr_item);
 
     /* Only update those fields that are marked in the bitmap */
     if (bitmap_is_set(bitmap, vfield->field_index))
     {
       /*
-        For a virtual generated column of blob type, we have to keep
+        For a virtual generated column based on the blob type, we have to keep
         the current blob value since this might be needed by the
         storage engine during updates.
       */
-      if (vfield->type() == MYSQL_TYPE_BLOB && vfield->is_virtual_gcol())
+      if ((vfield->flags & BLOB_FLAG) != 0 && vfield->is_virtual_gcol())
       {
         (down_cast<Field_blob*>(vfield))->keep_old_value();
         (down_cast<Field_blob*>(vfield))->set_keep_old_value(true);
@@ -7919,4 +7975,14 @@ void TABLE::blobs_need_not_keep_old_value()
     if (vfield->type() == MYSQL_TYPE_BLOB && vfield->is_virtual_gcol())
       (down_cast<Field_blob*>(vfield))->set_keep_old_value(false);
   }
-}
\ No newline at end of file
+}
+
+void TABLE::set_binlog_drop_if_temp(bool should_binlog)
+{
+  should_binlog_drop_if_temp_flag= should_binlog;
+}
+
+bool TABLE::should_binlog_drop_if_temp(void) const
+{
+  return should_binlog_drop_if_temp_flag;
+}
diff --git a/sql/table.h b/sql/table.h
index 32ba877275de..82d4be3ff66e 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1,16 +1,23 @@
 #ifndef TABLE_INCLUDED
 #define TABLE_INCLUDED
 
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -245,6 +252,13 @@ typedef struct st_order {
 */
 struct st_grant_internal_info
 {
+  st_grant_internal_info()
+    : m_schema_lookup_done(false),
+      m_schema_access(NULL),
+      m_table_lookup_done(false),
+      m_table_access(NULL)
+  {}
+
   /** True if the internal lookup by schema name was done. */
   bool m_schema_lookup_done;
   /** Cached internal schema access. */
@@ -307,7 +321,7 @@ struct GRANT_INFO
      The set is implemented as a bitmap, with the bits defined in sql_acl.h.
    */
   ulong privilege;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      @brief the set of privileges that the current user needs to fulfil in
      order to carry out the requested operation. Used in debug build to
@@ -496,10 +510,11 @@ typedef struct st_table_field_def
 class Table_check_intact
 {
 protected:
+  bool has_keys;
   virtual void report_error(uint code, const char *fmt, ...)= 0;
 
 public:
-  Table_check_intact() {}
+  Table_check_intact() : has_keys(FALSE) {}
   virtual ~Table_check_intact() {}
 
   /** Checks whether a table is intact. */
@@ -553,7 +568,7 @@ typedef I_P_List <Wait_for_flush,
 
 struct TABLE_SHARE
 {
-  TABLE_SHARE() {}                    /* Remove gcc warning */
+  TABLE_SHARE() { memset(this, 0, sizeof(*this)); }
 
   /** Category of this table. */
   TABLE_CATEGORY table_category;
@@ -628,7 +643,7 @@ struct TABLE_SHARE
   plugin_ref db_plugin;			/* storage engine plugin */
   inline handlerton *db_type() const	/* table_type for handler */
   { 
-    // DBUG_ASSERT(db_plugin);
+    // assert(db_plugin);
     return db_plugin ? plugin_data<handlerton*>(db_plugin) : NULL;
   }
   enum row_type row_type;		/* How rows are stored */
@@ -979,7 +994,7 @@ typedef Bitmap<MAX_FIELDS> Field_map;
 
 struct TABLE
 {
-  TABLE() {}                               /* Remove gcc warning */
+  TABLE() { memset(this, 0, sizeof(*this)); }
   /*
     Since TABLE instances are often cleared using memset(), do not
     add virtual members and do not inherit from TABLE.
@@ -1326,7 +1341,7 @@ struct TABLE
 
   void set_keyread(bool flag)
   {
-    DBUG_ASSERT(file);
+    assert(file);
     if (flag && !key_read)
     {
       key_read= 1;
@@ -1351,7 +1366,7 @@ struct TABLE
   */
   inline bool index_contains_some_virtual_gcol(uint index_no)
   {
-    DBUG_ASSERT(index_no < s->keys);
+    assert(index_no < s->keys);
     return key_info[index_no].flags & HA_VIRTUAL_GEN_KEY;
   }
   bool update_const_key_parts(Item *conds);
@@ -1460,12 +1475,34 @@ struct TABLE
    @returns  false for success, true for error
  */
  bool contains_records(THD *thd, bool *retval);
+private:
 
+  /**
+    This flag decides whether or not we should log the drop temporary table
+    command.
+  */
+  bool should_binlog_drop_if_temp_flag;
+
+public:
   /**
     Virtual fields of type BLOB have a flag m_keep_old_value. This flag is set
     to false for all such fields in this table.
   */
   void blobs_need_not_keep_old_value();
+
+  /**
+    Set the variable should_binlog_drop_if_temp_flag, so that
+    the logging of temporary tables can be decided.
+
+    @param should_binlog  the value to set flag should_binlog_drop_if_temp_flag
+  */
+  void set_binlog_drop_if_temp(bool should_binlog);
+
+  /**
+    @return whether should_binlog_drop_if_temp_flag flag is
+            set or not
+  */
+  bool should_binlog_drop_if_temp(void) const;
 };
 
 
@@ -1645,11 +1682,21 @@ typedef struct st_lex_alter {
   bool account_locked;
 } LEX_ALTER;
 
+/*
+  This structure holds the specifications related to
+  mysql user and the associated auth details.
+*/
 typedef struct	st_lex_user {
   LEX_CSTRING user;
   LEX_CSTRING host;
   LEX_CSTRING plugin;
   LEX_CSTRING auth;
+/*
+  The following flags are indicators for the SQL syntax used while
+  parsing CREATE/ALTER user. While other members are self-explanatory,
+  'uses_authentication_string_clause' signifies if the password is in
+  hash form (if the var was set to true) or not.
+*/
   bool uses_identified_by_clause;
   bool uses_identified_with_clause;
   bool uses_authentication_string_clause;
@@ -1732,7 +1779,7 @@ class Derived_key: public Sql_alloc {
 
 struct TABLE_LIST
 {
-  TABLE_LIST() {}                          /* Remove gcc warning */
+  TABLE_LIST() { memset(this, 0, sizeof(*this)); }
 
   /**
     Prepare TABLE_LIST that consists of one table instance to use in
@@ -1746,7 +1793,7 @@ struct TABLE_LIST
                              enum thr_lock_type lock_type_arg,
                              enum enum_mdl_type mdl_type_arg)
   {
-    memset(this, 0, sizeof(*this));
+    new (this) TABLE_LIST;
     m_map= 1;
     db= (char*) db_name_arg;
     db_length= db_length_arg;
@@ -1788,8 +1835,8 @@ struct TABLE_LIST
   void          set_join_cond(Item *val)
   {
     // If optimization has started, it's too late to change m_join_cond.
-    DBUG_ASSERT(m_join_cond_optim == NULL ||
-                m_join_cond_optim == (Item*)1);
+    assert(m_join_cond_optim == NULL ||
+           m_join_cond_optim == (Item*)1);
     m_join_cond= val;
   }
   Item *join_cond_optim() const { return m_join_cond_optim; }
@@ -1799,8 +1846,8 @@ struct TABLE_LIST
       Either we are setting to "empty", or there must pre-exist a
       permanent condition.
     */
-    DBUG_ASSERT(cond == NULL || cond == (Item*)1 ||
-                m_join_cond != NULL);
+    assert(cond == NULL || cond == (Item*)1 ||
+           m_join_cond != NULL);
     m_join_cond_optim= cond;
   }
   Item **join_cond_optim_ref() { return &m_join_cond_optim; }
@@ -1811,7 +1858,7 @@ struct TABLE_LIST
   /// Set the semi-join condition for a semi-join nest
   void set_sj_cond(Item *cond)
   {
-    DBUG_ASSERT(m_sj_cond == NULL);
+    assert(m_sj_cond == NULL);
     m_sj_cond= cond;
   }
 
@@ -1910,7 +1957,7 @@ struct TABLE_LIST
   /// Set table to be merged
   void set_merged()
   {
-    DBUG_ASSERT(effective_algorithm == VIEW_ALGORITHM_UNDEFINED);
+    assert(effective_algorithm == VIEW_ALGORITHM_UNDEFINED);
     effective_algorithm= VIEW_ALGORITHM_MERGE;
   }
 
@@ -1924,8 +1971,8 @@ struct TABLE_LIST
   void set_uses_materialization()
   {
     // @todo We should do this only once, but currently we cannot:
-    //DBUG_ASSERT(effective_algorithm == VIEW_ALGORITHM_UNDEFINED);
-    DBUG_ASSERT(effective_algorithm != VIEW_ALGORITHM_MERGE);
+    //assert(effective_algorithm == VIEW_ALGORITHM_UNDEFINED);
+    assert(effective_algorithm != VIEW_ALGORITHM_MERGE);
     effective_algorithm= VIEW_ALGORITHM_TEMPTABLE;
   }
 
@@ -1949,12 +1996,12 @@ struct TABLE_LIST
   {
     if (is_view_or_derived())
     {
-      DBUG_ASSERT(is_merged());         // Cannot be a materialized view
+      assert(is_merged());         // Cannot be a materialized view
       return leaf_tables_count() > 1;
     }
     else
     {
-      DBUG_ASSERT(nested_join == NULL); // Must be a base table
+      assert(nested_join == NULL); // Must be a base table
       return false;
     }
   }
@@ -2002,7 +2049,7 @@ struct TABLE_LIST
   /// Return the valid LEX object for a view.
   LEX *view_query() const
   {
-    DBUG_ASSERT(view != NULL && view != (LEX *)1);
+    assert(view != NULL && view != (LEX *)1);
     return view;
   }
 
@@ -2018,14 +2065,14 @@ struct TABLE_LIST
   /// Return the query expression of a derived table or view.
   st_select_lex_unit *derived_unit() const
   {
-    DBUG_ASSERT(derived);
+    assert(derived);
     return derived;
   }
 
   /// Set temporary name from underlying temporary table:
   void set_name_temporary()
   {
-    DBUG_ASSERT(is_view_or_derived() && uses_materialization());
+    assert(is_view_or_derived() && uses_materialization());
     table_name= table->s->table_name.str;
     table_name_length= table->s->table_name.length;
     db= (char *)"";
@@ -2035,8 +2082,8 @@ struct TABLE_LIST
   /// Reset original name for temporary table.
   void reset_name_temporary()
   {
-    DBUG_ASSERT(is_view_or_derived() && uses_materialization());
-    DBUG_ASSERT(db != view_db.str && table_name != view_name.str);
+    assert(is_view_or_derived() && uses_materialization());
+    assert(db != view_db.str && table_name != view_name.str);
     if (is_view())
     {
       db= view_db.str;
@@ -2195,11 +2242,11 @@ struct TABLE_LIST
   TABLE_LIST *updatable_base_table()
   {
     TABLE_LIST *tbl= this;
-    DBUG_ASSERT(tbl->is_updatable() && !tbl->is_multiple_tables());
+    assert(tbl->is_updatable() && !tbl->is_multiple_tables());
     while (tbl->is_view_or_derived())
     {
       tbl= tbl->merge_underlying_list;
-      DBUG_ASSERT(tbl->is_updatable() && !tbl->is_multiple_tables());
+      assert(tbl->is_updatable() && !tbl->is_multiple_tables());
     }
     return tbl;
   }
@@ -2544,7 +2591,7 @@ struct TABLE_LIST
   /// Set table number
   void set_tableno(uint tableno)
   {
-    DBUG_ASSERT(tableno < MAX_TABLES);
+    assert(tableno < MAX_TABLES);
     m_tableno= tableno;
     m_map= (table_map)1 << tableno;
   }
@@ -2554,7 +2601,7 @@ struct TABLE_LIST
   /// Return table map derived from table number
   table_map map() const
   {
-    DBUG_ASSERT(((table_map)1 << m_tableno) == m_map);
+    assert(((table_map)1 << m_tableno) == m_map);
     return m_map;
   }
 
@@ -2748,6 +2795,8 @@ struct Semijoin_mat_optimize
 */
 typedef struct st_nested_join
 {
+  st_nested_join() { memset(this, 0, sizeof(*this)); }
+
   List<TABLE_LIST>  join_list;       /* list of elements in the nested join */
   table_map         used_tables;     /* bitmap of tables in the nested join */
   table_map         not_null_tables; /* tables that rejects nulls           */
@@ -2833,7 +2882,7 @@ static inline void tmp_restore_column_map(MY_BITMAP *bitmap,
 static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table,
                                                       MY_BITMAP *bitmap)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   return tmp_use_all_columns(table, bitmap);
 #else
   return 0;
@@ -2843,7 +2892,7 @@ static inline my_bitmap_map *dbug_tmp_use_all_columns(TABLE *table,
 static inline void dbug_tmp_restore_column_map(MY_BITMAP *bitmap,
                                                my_bitmap_map *old)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   tmp_restore_column_map(bitmap, old);
 #endif
 }
@@ -2858,7 +2907,7 @@ static inline void dbug_tmp_use_all_columns(TABLE *table,
                                             MY_BITMAP *read_set,
                                             MY_BITMAP *write_set)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   save[0]= read_set->bitmap;
   save[1]= write_set->bitmap;
   (void) tmp_use_all_columns(table, read_set);
@@ -2871,7 +2920,7 @@ static inline void dbug_tmp_restore_column_maps(MY_BITMAP *read_set,
                                                 MY_BITMAP *write_set,
                                                 my_bitmap_map **old)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   tmp_restore_column_map(read_set, old[0]);
   tmp_restore_column_map(write_set, old[1]);
 #endif
@@ -2994,6 +3043,20 @@ inline bool is_perfschema_db(const char *name)
                         PERFORMANCE_SCHEMA_DB_NAME.str, name);
 }
 
+/**
+  Check if the table belongs to the P_S, excluding setup and threads tables.
+
+  @note Performance Schema tables must be accessible independently of the
+        LOCK TABLE mode. This function is needed to handle the special case
+        of P_S tables being used under LOCK TABLE mode.
+*/
+inline bool belongs_to_p_s(TABLE_LIST *tl)
+{
+  return (!strcmp("performance_schema", tl->db) &&
+          strcmp(tl->table_name, "threads") &&
+          strstr(tl->table_name, "setup_") == NULL);
+}
+
 TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings);
 
 /**
diff --git a/sql/table_cache.cc b/sql/table_cache.cc
index fd2b5ac5f8e2..6f671f43fb8c 100644
--- a/sql/table_cache.cc
+++ b/sql/table_cache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -124,9 +131,9 @@ void Table_cache::check_unused()
     while ((entry= it++))
     {
       /* We must not have TABLEs in the free list that have their file closed. */
-      DBUG_ASSERT(entry->db_stat && entry->file);
+      assert(entry->db_stat && entry->file);
       /* Merge children should be detached from a merge parent */
-      DBUG_ASSERT(! entry->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
+      assert(! entry->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
 
       if (entry->in_use)
         DBUG_PRINT("error",("Used table is in share's list of unused tables"));
@@ -162,7 +169,7 @@ void Table_cache::free_all_unused_tables()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Print debug information for the contents of the table cache.
 */
@@ -360,9 +367,9 @@ void Table_cache_manager::free_table(THD *thd,
       Table_cache_element::TABLE_list::Iterator it(cache_el[i]->free_tables);
       TABLE *table;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if (remove_type == TDC_RT_REMOVE_ALL)
-        DBUG_ASSERT(cache_el[i]->used_tables.is_empty());
+        assert(cache_el[i]->used_tables.is_empty());
       else if (remove_type == TDC_RT_REMOVE_NOT_OWN ||
                remove_type == TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE)
       {
@@ -370,7 +377,7 @@ void Table_cache_manager::free_table(THD *thd,
         while ((table= it2++))
         {
           if (table->in_use != thd)
-            DBUG_ASSERT(0);
+            assert(0);
         }
       }
 #endif
@@ -396,7 +403,7 @@ void Table_cache_manager::free_all_unused_tables()
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Print debug information for the contents of all table cache instances.
 */
diff --git a/sql/table_cache.h b/sql/table_cache.h
index 28049ee83259..ada59127fed3 100644
--- a/sql/table_cache.h
+++ b/sql/table_cache.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -132,7 +139,7 @@ class Table_cache
 
   void free_all_unused_tables();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void print_tables();
 #endif
 };
@@ -180,7 +187,7 @@ class Table_cache_manager
 
   void free_all_unused_tables();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   void print_tables();
 #endif
 
@@ -352,7 +359,7 @@ bool Table_cache::add_used_table(THD *thd, TABLE *table)
 
   assert_owner();
 
-  DBUG_ASSERT(table->in_use == thd);
+  assert(table->in_use == thd);
 
   /*
     Try to get Table_cache_element representing this table in the cache
@@ -370,9 +377,9 @@ bool Table_cache::add_used_table(THD *thd, TABLE *table)
       Allocate new Table_cache_element object and add it to the cache
       and array in TABLE_SHARE.
     */
-    DBUG_ASSERT(! my_hash_search(&m_cache,
-                                 (uchar*)table->s->table_cache_key.str,
-                                 table->s->table_cache_key.length));
+    assert(! my_hash_search(&m_cache,
+                            (uchar*)table->s->table_cache_key.str,
+                            table->s->table_cache_key.length));
 
     if (!(el= new Table_cache_element(table->s)))
       return true;
@@ -480,7 +487,7 @@ TABLE* Table_cache::get_table(THD *thd, my_hash_value_type hash_value,
 
   if ((table= el->free_tables.front()))
   {
-    DBUG_ASSERT(!table->in_use);
+    assert(!table->in_use);
 
     /*
       Unlink table from list of unused TABLE objects for this
@@ -499,9 +506,9 @@ TABLE* Table_cache::get_table(THD *thd, my_hash_value_type hash_value,
 
     table->in_use= thd;
     /* The ex-unused table must be fully functional. */
-    DBUG_ASSERT(table->db_stat && table->file);
+    assert(table->db_stat && table->file);
     /* The children must be detached from the table. */
-    DBUG_ASSERT(! table->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
+    assert(! table->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
   }
 
   return table;
@@ -523,11 +530,11 @@ void Table_cache::release_table(THD *thd, TABLE *table)
 
   assert_owner();
 
-  DBUG_ASSERT(table->in_use);
-  DBUG_ASSERT(table->file);
+  assert(table->in_use);
+  assert(table->file);
 
   /* We shouldn't put the table to 'unused' list if the share is old. */
-  DBUG_ASSERT(! table->s->has_old_version());
+  assert(! table->s->has_old_version());
 
   table->in_use= NULL;
 
diff --git a/sql/table_trigger_dispatcher.cc b/sql/table_trigger_dispatcher.cc
index 7f59d90bd729..ab8bc5747cec 100644
--- a/sql/table_trigger_dispatcher.cc
+++ b/sql/table_trigger_dispatcher.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -263,7 +270,7 @@ bool Table_trigger_dispatcher::create_trigger(
     of Field objects here.
    */
 
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   m_old_field= m_subject_table->field;
   m_new_field= m_subject_table->field;
@@ -350,7 +357,7 @@ bool Table_trigger_dispatcher::drop_trigger(THD *thd,
   if (*trigger_found)
     return false;
 
-  DBUG_ASSERT (!*trigger_found);
+  assert (!*trigger_found);
   my_message(ER_TRG_DOES_NOT_EXIST, ER(ER_TRG_DOES_NOT_EXIST), MYF(0));
 
   return true;
@@ -371,7 +378,7 @@ bool Table_trigger_dispatcher::prepare_record1_accessors()
 {
   Field **fld, **old_fld;
 
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   m_record1_field= (Field **) alloc_root(
     get_mem_root(),
@@ -527,8 +534,8 @@ Trigger_chain *Table_trigger_dispatcher::create_trigger_chain(
   enum_trigger_event_type event,
   enum_trigger_action_time_type action_time)
 {
-  DBUG_ASSERT(event != TRG_EVENT_MAX);
-  DBUG_ASSERT(action_time != TRG_ACTION_MAX);
+  assert(event != TRG_EVENT_MAX);
+  assert(action_time != TRG_ACTION_MAX);
 
   Trigger_chain *tc= get_triggers(event, action_time);
 
@@ -716,7 +723,7 @@ void Table_trigger_dispatcher::parse_triggers(THD *thd)
 
     if (fatal_parse_error || t->has_parse_error())
     {
-      DBUG_ASSERT(!t->get_sp()); // SP must be NULL.
+      assert(!t->get_sp()); // SP must be NULL.
 
       if (t->has_parse_error())
         set_parse_error_message(t->get_parse_error_message());
@@ -730,7 +737,7 @@ void Table_trigger_dispatcher::parse_triggers(THD *thd)
       continue;
     }
 
-    DBUG_ASSERT(!t->has_parse_error());
+    assert(!t->has_parse_error());
 
     sp_head *sp= t->get_sp();
 
@@ -770,7 +777,7 @@ bool Table_trigger_dispatcher::process_triggers(
   if (!tc)
     return false;
 
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   if (old_row_is_record1)
   {
@@ -786,8 +793,8 @@ bool Table_trigger_dispatcher::process_triggers(
     This trigger must have been processed by the pre-locking
     algorithm.
   */
-  DBUG_ASSERT(m_subject_table->pos_in_table_list->trg_event_map &
-              static_cast<uint>(1 << static_cast<int>(event)));
+  assert(m_subject_table->pos_in_table_list->trg_event_map &
+         static_cast<uint>(1 << static_cast<int>(event)));
 
   bool rc= tc->execute_triggers(thd);
 
@@ -817,8 +824,8 @@ bool Table_trigger_dispatcher::add_tables_and_routines_for_triggers(
   Query_tables_list *prelocking_ctx,
   TABLE_LIST *table_list)
 {
-  DBUG_ASSERT(static_cast<int>(table_list->lock_type) >=
-              static_cast<int>(TL_WRITE_ALLOW_WRITE));
+  assert(static_cast<int>(table_list->lock_type) >=
+         static_cast<int>(TL_WRITE_ALLOW_WRITE));
 
   for (int i= 0; i < (int) TRG_EVENT_MAX; ++i)
   {
@@ -847,7 +854,7 @@ bool Table_trigger_dispatcher::add_tables_and_routines_for_triggers(
 
 void Table_trigger_dispatcher::enable_fields_temporary_nullability(THD *thd)
 {
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   for (Field **next_field= m_subject_table->field; *next_field; ++next_field)
   {
@@ -878,7 +885,7 @@ void Table_trigger_dispatcher::enable_fields_temporary_nullability(THD *thd)
 
 void Table_trigger_dispatcher::disable_fields_temporary_nullability()
 {
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   for (Field **next_field= m_subject_table->field; *next_field; ++next_field)
     (*next_field)->reset_tmp_nullable();
@@ -922,7 +929,7 @@ bool Table_trigger_dispatcher::mark_fields(enum_trigger_event_type event)
   if (check_for_broken_triggers())
     return true;
 
-  DBUG_ASSERT(m_subject_table);
+  assert(m_subject_table);
 
   for (int i= 0; i < (int) TRG_ACTION_MAX; ++i)
   {
diff --git a/sql/table_trigger_dispatcher.h b/sql/table_trigger_dispatcher.h
index 50306ea85f42..0bb892bda1e0 100644
--- a/sql/table_trigger_dispatcher.h
+++ b/sql/table_trigger_dispatcher.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -93,15 +100,15 @@ class Table_trigger_dispatcher : public Sql_alloc,
 
   Trigger_chain *get_triggers(int event, int action_time)
   {
-    DBUG_ASSERT(0 <= event && event < TRG_EVENT_MAX);
-    DBUG_ASSERT(0 <= action_time && action_time < TRG_ACTION_MAX);
+    assert(0 <= event && event < TRG_EVENT_MAX);
+    assert(0 <= action_time && action_time < TRG_ACTION_MAX);
     return m_trigger_map[event][action_time];
   }
 
   const Trigger_chain *get_triggers(int event, int action_time) const
   {
-    DBUG_ASSERT(0 <= event && event < TRG_EVENT_MAX);
-    DBUG_ASSERT(0 <= action_time && action_time < TRG_ACTION_MAX);
+    assert(0 <= event && event < TRG_EVENT_MAX);
+    assert(0 <= action_time && action_time < TRG_ACTION_MAX);
     return m_trigger_map[event][action_time];
   }
 
diff --git a/sql/table_trigger_field_support.h b/sql/table_trigger_field_support.h
index 1a563cd76ffd..9d998ae53ae9 100644
--- a/sql/table_trigger_field_support.h
+++ b/sql/table_trigger_field_support.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/tc_log.cc b/sql/tc_log.cc
index 290d51ddf337..d59760b4477d 100644
--- a/sql/tc_log.cc
+++ b/sql/tc_log.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -93,8 +100,8 @@ int TC_LOG_MMAP::open(const char *opt_name)
   bool crashed=FALSE;
   PAGE *pg;
 
-  DBUG_ASSERT(total_ha_2pc > 1);
-  DBUG_ASSERT(opt_name && opt_name[0]);
+  assert(total_ha_2pc > 1);
+  assert(opt_name && opt_name[0]);
 
   tc_log_page_size= my_getpagesize();
 
@@ -139,7 +146,7 @@ int TC_LOG_MMAP::open(const char *opt_name)
   inited=2;
 
   npages=(uint)file_length/tc_log_page_size;
-  DBUG_ASSERT(npages >= 3);             // to guarantee non-empty pool
+  assert(npages >= 3);             // to guarantee non-empty pool
   if (!(pages=(PAGE *)my_malloc(key_memory_TC_LOG_MMAP_pages,
                                 npages*sizeof(PAGE), MYF(MY_WME|MY_ZEROFILL))))
     goto err;
@@ -382,7 +389,7 @@ ulong TC_LOG_MMAP::log_xid(my_xid xid)
       goto done;                             // we're done
     }
   }                                          // page was not synced! do it now
-  DBUG_ASSERT(active == p && syncing == NULL);
+  assert(active == p && syncing == NULL);
   syncing= p;                                 // place is vacant - take it
   active= NULL;                                  // page is not active anymore
   mysql_cond_broadcast(&COND_active);        // in case somebody's waiting
@@ -403,7 +410,7 @@ ulong TC_LOG_MMAP::log_xid(my_xid xid)
 */
 bool TC_LOG_MMAP::sync()
 {
-  DBUG_ASSERT(syncing != active);
+  assert(syncing != active);
 
   /*
     sit down and relax - this can take a while...
@@ -443,13 +450,13 @@ void TC_LOG_MMAP::unlog(ulong cookie, my_xid xid)
   PAGE *p= pages + (cookie / tc_log_page_size);
   my_xid *x= (my_xid *)(data + cookie);
 
-  DBUG_ASSERT(*x == xid);
-  DBUG_ASSERT(x >= p->start && x < p->end);
+  assert(*x == xid);
+  assert(x >= p->start && x < p->end);
   *x= 0;
 
   mysql_mutex_lock(&LOCK_tc);
   p->free++;
-  DBUG_ASSERT(p->free <= p->size);
+  assert(p->free <= p->size);
   set_if_smaller(p->ptr, x);
   if (p->free == p->size)               // the page is completely empty
     tc_log_cur_pages_used--;
diff --git a/sql/tc_log.h b/sql/tc_log.h
index 5ae114c0ff0f..a4f5c284fd52 100644
--- a/sql/tc_log.h
+++ b/sql/tc_log.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -220,7 +227,7 @@ class TC_LOG_MMAP: public TC_LOG
     while (*p->ptr)
     {
       p->ptr++;
-      DBUG_ASSERT(p->ptr < p->end);               // because p->free > 0
+      assert(p->ptr < p->end);               // because p->free > 0
     }
 
     /* found! store xid there and mark the page dirty */
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc
index 0b6cf8e38bfe..c52f5bb758fe 100644
--- a/sql/thr_malloc.cc
+++ b/sql/thr_malloc.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/thr_malloc.h b/sql/thr_malloc.h
index 6af9488d8efb..d5638afcf048 100644
--- a/sql/thr_malloc.h
+++ b/sql/thr_malloc.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/transaction.cc b/sql/transaction.cc
index 791f4b7da9ef..2dc0a4ebadb1 100644
--- a/sql/transaction.cc
+++ b/sql/transaction.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -74,7 +81,7 @@ bool trans_check_state(THD *thd)
     Always commit statement transaction before manipulating with
     the normal one.
   */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT));
 
   if (unlikely(thd->in_sub_stmt))
   {
@@ -118,7 +125,7 @@ bool trans_begin(THD *thd, uint flags)
 
   thd->locked_tables_list.unlock_locked_tables(thd);
 
-  DBUG_ASSERT(!thd->locked_tables_mode);
+  assert(!thd->locked_tables_mode);
 
   if (thd->in_multi_stmt_transaction_mode() ||
       (thd->variables.option_bits & OPTION_TABLE_LOCK))
@@ -143,8 +150,8 @@ bool trans_begin(THD *thd, uint flags)
   thd->mdl_context.release_transactional_locks();
 
   // The RO/RW options are mutually exclusive.
-  DBUG_ASSERT(!((flags & MYSQL_START_TRANS_OPT_READ_ONLY) &&
-                (flags & MYSQL_START_TRANS_OPT_READ_WRITE)));
+  assert(!((flags & MYSQL_START_TRANS_OPT_READ_ONLY) &&
+           (flags & MYSQL_START_TRANS_OPT_READ_WRITE)));
   if (flags & MYSQL_START_TRANS_OPT_READ_ONLY)
   {
     thd->tx_read_only= true;
@@ -171,7 +178,7 @@ bool trans_begin(THD *thd, uint flags)
   }
 
   DBUG_EXECUTE_IF("dbug_set_high_prio_trx", {
-    DBUG_ASSERT(thd->tx_priority==0);
+      assert(thd->tx_priority==0);
     thd->tx_priority= 1;
   });
 
@@ -260,7 +267,7 @@ bool trans_commit(THD *thd)
   thd->lex->start_transaction_opt= 0;
 
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
 
   thd->tx_priority= 0;
 
@@ -291,9 +298,9 @@ bool trans_commit_implicit(THD *thd)
     by asserting that conditions that are checked in the former function are
     true.
   */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) &&
-              !thd->in_sub_stmt &&
-              !thd->get_transaction()->xid_state()->check_in_xa(false));
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) &&
+         !thd->in_sub_stmt &&
+         !thd->get_transaction()->xid_state()->check_in_xa(false));
 
   if (thd->in_multi_stmt_transaction_mode() ||
       (thd->variables.option_bits & OPTION_TABLE_LOCK))
@@ -307,7 +314,7 @@ bool trans_commit_implicit(THD *thd)
     res= MY_TEST(ha_commit_trans(thd, TRUE));
   }
   else if (tc_log)
-    tc_log->commit(thd, true);
+    res= tc_log->commit(thd, true);
 
   if (res == FALSE)
     if (thd->rpl_thd_ctx.session_gtids_ctx().
@@ -317,7 +324,7 @@ bool trans_commit_implicit(THD *thd)
   thd->get_transaction()->reset_unsafe_rollback_flags(Transaction_ctx::SESSION);
 
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
 
   /*
     Upon implicit commit, reset the current transaction
@@ -360,7 +367,7 @@ bool trans_rollback(THD *thd)
   thd->lex->start_transaction_opt= 0;
 
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
 
   thd->tx_priority= 0;
 
@@ -396,8 +403,8 @@ bool trans_rollback_implicit(THD *thd)
     Don't perform rollback in the middle of sub-statement, wait till
     its end.
   */
-  DBUG_ASSERT(thd->get_transaction()->is_empty(Transaction_ctx::STMT) &&
-              !thd->in_sub_stmt);
+  assert(thd->get_transaction()->is_empty(Transaction_ctx::STMT) &&
+         !thd->in_sub_stmt);
 
   thd->server_status&=
     ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
@@ -408,9 +415,9 @@ bool trans_rollback_implicit(THD *thd)
     Transaction_ctx::SESSION);
 
   /* Rollback should clear transaction_rollback_request flag. */
-  DBUG_ASSERT(!thd->transaction_rollback_request);
+  assert(!thd->transaction_rollback_request);
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
 
   trans_track_end_trx(thd);
 
@@ -443,13 +450,13 @@ bool trans_commit_stmt(THD *thd)
     a savepoint for each nested statement, and release the
     savepoint when statement has succeeded.
   */
-  DBUG_ASSERT(! thd->in_sub_stmt);
+  assert(! thd->in_sub_stmt);
 
   /*
     Some code in MYSQL_BIN_LOG::commit and ha_commit_low() is not safe
     for attachable transactions.
   */
-  DBUG_ASSERT(!thd->is_attachable_ro_transaction_active());
+  assert(!thd->is_attachable_ro_transaction_active());
 
   thd->get_transaction()->merge_unsafe_rollback_flags();
 
@@ -460,14 +467,14 @@ bool trans_commit_stmt(THD *thd)
       trans_reset_one_shot_chistics(thd);
   }
   else if (tc_log)
-    tc_log->commit(thd, false);
+    res= tc_log->commit(thd, false);
   if (res == FALSE && !thd->in_active_multi_stmt_transaction())
     if (thd->rpl_thd_ctx.session_gtids_ctx().
         notify_after_transaction_commit(thd))
       sql_print_warning("Failed to collect GTID to send in the response packet!");
   /* In autocommit=1 mode the transaction should be marked as complete in P_S */
-  DBUG_ASSERT(thd->in_active_multi_stmt_transaction() ||
-              thd->m_transaction_psi == NULL);
+  assert(thd->in_active_multi_stmt_transaction() ||
+         thd->m_transaction_psi == NULL);
 
   thd->get_transaction()->reset(Transaction_ctx::STMT);
 
@@ -493,13 +500,13 @@ bool trans_rollback_stmt(THD *thd)
     a savepoint for each nested statement, and release the
     savepoint when statement has succeeded.
   */
-  DBUG_ASSERT(! thd->in_sub_stmt);
+  assert(! thd->in_sub_stmt);
 
   /*
     Some code in MYSQL_BIN_LOG::rollback and ha_rollback_low() is not safe
     for attachable transactions.
   */
-  DBUG_ASSERT(!thd->is_attachable_ro_transaction_active());
+  assert(!thd->is_attachable_ro_transaction_active());
 
   thd->get_transaction()->merge_unsafe_rollback_flags();
 
@@ -533,10 +540,10 @@ bool trans_rollback_stmt(THD *thd)
   }
 
   /* In autocommit=1 mode the transaction should be marked as complete in P_S */
-  DBUG_ASSERT(thd->in_active_multi_stmt_transaction() ||
-              thd->m_transaction_psi == NULL ||
-              /* Todo: BUG#20488921 is in the way. */
-              DBUG_EVALUATE_IF("simulate_xa_commit_log_failure", true, false));
+  assert(thd->in_active_multi_stmt_transaction() ||
+         thd->m_transaction_psi == NULL ||
+         /* Todo: BUG#20488921 is in the way. */
+         DBUG_EVALUATE_IF("simulate_xa_commit_log_failure", true, false));
 
   thd->get_transaction()->reset(Transaction_ctx::STMT);
 
@@ -562,17 +569,17 @@ bool trans_commit_attachable(THD *thd)
   int res= 0;
 
   /* This function only handles attachable transactions. */
-  DBUG_ASSERT(thd->is_attachable_ro_transaction_active());
+  assert(thd->is_attachable_ro_transaction_active());
 
   /*
     Since the attachable transaction is AUTOCOMMIT we only need to commit
     statement transaction.
   */
-  DBUG_ASSERT(! thd->get_transaction()->is_active(Transaction_ctx::SESSION));
+  assert(! thd->get_transaction()->is_active(Transaction_ctx::SESSION));
 
   /* Attachable transactions should not do anything unsafe. */
-  DBUG_ASSERT(!thd->get_transaction()->
-                 cannot_safely_rollback(Transaction_ctx::STMT));
+  assert(!thd->get_transaction()->
+         cannot_safely_rollback(Transaction_ctx::STMT));
 
 
   if (thd->get_transaction()->is_active(Transaction_ctx::STMT))
@@ -580,7 +587,7 @@ bool trans_commit_attachable(THD *thd)
     res= ha_commit_attachable(thd);
   }
 
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
 
   thd->get_transaction()->reset(Transaction_ctx::STMT);
 
diff --git a/sql/transaction.h b/sql/transaction.h
index 395787fb265f..7a60145a874e 100644
--- a/sql/transaction.h
+++ b/sql/transaction.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/transaction_info.cc b/sql/transaction_info.cc
index 0867735e096c..3136b8642ad1 100644
--- a/sql/transaction_info.cc
+++ b/sql/transaction_info.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/transaction_info.h b/sql/transaction_info.h
index 96408f759f03..1fe017a525d9 100644
--- a/sql/transaction_info.h
+++ b/sql/transaction_info.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -69,9 +76,9 @@ class Ha_trx_info
     DBUG_PRINT("enter", ("ht: 0x%llx (%s)",
                          (ulonglong) ht_arg,
                          ha_legacy_type_name(ht_arg->db_type)));
-    DBUG_ASSERT(m_flags == 0);
-    DBUG_ASSERT(m_ht == NULL);
-    DBUG_ASSERT(m_next == NULL);
+    assert(m_flags == 0);
+    assert(m_ht == NULL);
+    assert(m_next == NULL);
 
     m_ht= ht_arg;
     m_flags= (int) TRX_READ_ONLY; /* Assume read-only at start. */
@@ -101,16 +108,35 @@ class Ha_trx_info
 
   void set_trx_read_write()
   {
-    DBUG_ASSERT(is_started());
+    assert(is_started());
     m_flags|= (int) TRX_READ_WRITE;
   }
 
   bool is_trx_read_write() const
   {
-    DBUG_ASSERT(is_started());
+    assert(is_started());
     return m_flags & (int) TRX_READ_WRITE;
   }
 
+  /**
+    Set the transaction flag to noop_read_write
+    If the transaction has no operation dml statement.
+  */
+  void set_trx_noop_read_write()
+  {
+    assert(is_started());
+    m_flags|= (int) TRX_NOOP_READ_WRITE;
+  }
+
+  /**
+    Check if the stmt transaction has noop_read_write flag set.
+  */
+  bool is_trx_noop_read_write() const
+  {
+    assert(is_started());
+    return m_flags & (int) TRX_NOOP_READ_WRITE;
+  }
+
   bool is_started() const
   {
     return m_ht != NULL;
@@ -128,25 +154,27 @@ class Ha_trx_info
       Can be called many times, e.g. when we have many
       read-write statements in a transaction.
     */
-    DBUG_ASSERT(is_started());
+    assert(is_started());
     if (stmt_trx->is_trx_read_write())
       set_trx_read_write();
+    if (stmt_trx->is_trx_noop_read_write())
+      set_trx_noop_read_write();
   }
 
   Ha_trx_info *next() const
   {
-    DBUG_ASSERT(is_started());
+    assert(is_started());
     return m_next;
   }
 
   handlerton *ht() const
   {
-    DBUG_ASSERT(is_started());
+    assert(is_started());
     return m_ht;
   }
 
 private:
-  enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1 };
+  enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1, TRX_NOOP_READ_WRITE= 2 };
   /**
     Auxiliary, used for ha_list management
   */
@@ -337,7 +365,7 @@ class Transaction_ctx
     bool real_commit;               // Is this a "real" commit?
     bool commit_low;                // see MYSQL_BIN_LOG::ordered_commit
     bool run_hooks;                 // Call the after_commit hook
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     bool ready_preempt;             // internal in MYSQL_BIN_LOG::ordered_commit
 #endif
   } m_flags;
@@ -383,7 +411,7 @@ class Transaction_ctx
     m_savepoints= NULL;
     m_xid_state.cleanup();
     m_rpl_transaction_ctx.cleanup();
-    m_transaction_write_set_ctx.clear_write_set();
+    m_transaction_write_set_ctx.reset_state();
     free_root(&m_mem_root,MYF(MY_KEEP_PREALLOC));
     DBUG_VOID_RETURN;
   }
diff --git a/sql/trigger.cc b/sql/trigger.cc
index 99e5c956c60d..4f992e8bac0d 100644
--- a/sql/trigger.cc
+++ b/sql/trigger.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -426,7 +433,6 @@ Trigger::Trigger(MEM_ROOT *mem_root,
   m_on_table_name= NULL_STR;
 
   m_parse_error_message[0]= 0;
-  memset(&m_subject_table_grant, 0, sizeof (m_subject_table_grant));
 }
 
 
@@ -556,7 +562,7 @@ bool Trigger::parse(THD *thd)
 
   // Ensure that lex.sp_head is NULL in case of parse errors.
 
-  DBUG_ASSERT(!parse_error || (parse_error && lex.sphead == NULL));
+  assert(!parse_error || (parse_error && lex.sphead == NULL));
 
   // fatal_parse_error will be returned from this method.
 
@@ -609,8 +615,8 @@ bool Trigger::parse(THD *thd)
 
   // Set correct m_event and m_action_time.
 
-  DBUG_ASSERT(m_event == TRG_EVENT_MAX);
-  DBUG_ASSERT(m_action_time == TRG_ACTION_MAX);
+  assert(m_event == TRG_EVENT_MAX);
+  assert(m_action_time == TRG_ACTION_MAX);
 
   m_event= lex.sphead->m_trg_chistics.event;
   m_action_time= lex.sphead->m_trg_chistics.action_time;
@@ -626,7 +632,7 @@ bool Trigger::parse(THD *thd)
 
   // Take ownership of SP object.
 
-  DBUG_ASSERT(!m_sp);
+  assert(!m_sp);
 
   m_sp= lex.sphead;
   lex.sphead= NULL; /* Prevent double cleanup. */
@@ -642,14 +648,14 @@ bool Trigger::parse(THD *thd)
                  &lex.sp_chistics,
                  m_sql_mode);
 
-  DBUG_ASSERT(!m_sp->get_creation_ctx());
+  assert(!m_sp->get_creation_ctx());
   m_sp->set_creation_ctx(creation_ctx);
 
   // Set the definer attribute in SP.
 
   if (!m_definer.length)
   {
-    DBUG_ASSERT(m_definer.str); // m_definer must be EMPTY_STR here.
+    assert(m_definer.str); // m_definer must be EMPTY_STR here.
 
     /*
       This trigger was created/imported in MySQL version, which does not support
@@ -677,7 +683,7 @@ bool Trigger::parse(THD *thd)
                                        m_sp->m_name.str, m_sp->m_name.length);
 #endif
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /*
     Check that we correctly update trigger definitions when we rename tables
     with triggers.
@@ -690,19 +696,19 @@ bool Trigger::parse(THD *thd)
   */
 
   char fname[NAME_LEN + 1];
-  DBUG_ASSERT((!my_strcasecmp(table_alias_charset,
-                              lex.query_tables->db, m_db_name.str) ||
-               (check_n_cut_mysql50_prefix(m_db_name.str,
-                                           fname, sizeof(fname)) &&
-                !my_strcasecmp(table_alias_charset,
-                               lex.query_tables->db, fname))));
-  DBUG_ASSERT((!my_strcasecmp(table_alias_charset,
-                              lex.query_tables->table_name,
-                              m_subject_table_name.str) ||
-               (check_n_cut_mysql50_prefix(m_subject_table_name.str,
-                                           fname, sizeof(fname)) &&
-                !my_strcasecmp(table_alias_charset,
-                               lex.query_tables->table_name, fname))));
+  assert((!my_strcasecmp(table_alias_charset,
+                         lex.query_tables->db, m_db_name.str) ||
+          (check_n_cut_mysql50_prefix(m_db_name.str,
+                                      fname, sizeof(fname)) &&
+           !my_strcasecmp(table_alias_charset,
+                          lex.query_tables->db, fname))));
+  assert((!my_strcasecmp(table_alias_charset,
+                         lex.query_tables->table_name,
+                         m_subject_table_name.str) ||
+          (check_n_cut_mysql50_prefix(m_subject_table_name.str,
+                                      fname, sizeof(fname)) &&
+           !my_strcasecmp(table_alias_charset,
+                          lex.query_tables->table_name, fname))));
 #endif
 
 cleanup:
@@ -794,9 +800,9 @@ void Trigger::rename_subject_table(THD *thd, const LEX_STRING &new_table_name)
 
   // NOTE: 'on_table_name' is supposed to point inside m_definition.
 
-  DBUG_ASSERT(m_on_table_name.str);
-  DBUG_ASSERT(m_on_table_name.str > m_definition.str);
-  DBUG_ASSERT(m_on_table_name.str < (m_definition.str + m_definition.length));
+  assert(m_on_table_name.str);
+  assert(m_on_table_name.str > m_definition.str);
+  assert(m_on_table_name.str < (m_definition.str + m_definition.length));
 
   size_t before_on_len= m_on_table_name.str - m_definition.str;
 
diff --git a/sql/trigger.h b/sql/trigger.h
index 7f764107ba50..107b9bb6edfb 100644
--- a/sql/trigger.h
+++ b/sql/trigger.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/trigger_chain.cc b/sql/trigger_chain.cc
index 66ce4d59069b..f7be7650a458 100644
--- a/sql/trigger_chain.cc
+++ b/sql/trigger_chain.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -59,7 +66,7 @@ bool Trigger_chain::add_trigger(MEM_ROOT *mem_root,
   case TRG_ORDER_FOLLOWS:
   case TRG_ORDER_PRECEDES:
     {
-      DBUG_ASSERT(referenced_trigger_name.str);
+      assert(referenced_trigger_name.str);
 
       List_iterator<Trigger> it(m_triggers);
       List_iterator<Trigger> it2= it;
@@ -99,7 +106,7 @@ bool Trigger_chain::add_trigger(MEM_ROOT *mem_root,
     }
   }
 
-  DBUG_ASSERT(false);
+  assert(false);
   return true;
 }
 
diff --git a/sql/trigger_chain.h b/sql/trigger_chain.h
index bef8fe089fe6..b359afe11142 100644
--- a/sql/trigger_chain.h
+++ b/sql/trigger_chain.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/trigger_creation_ctx.cc b/sql/trigger_creation_ctx.cc
index 2f41452a620d..17ea8c8edaaa 100644
--- a/sql/trigger_creation_ctx.cc
+++ b/sql/trigger_creation_ctx.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/trigger_creation_ctx.h b/sql/trigger_creation_ctx.h
index 0c27293f4ec3..ce5666c873ce 100644
--- a/sql/trigger_creation_ctx.h
+++ b/sql/trigger_creation_ctx.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/trigger_def.h b/sql/trigger_def.h
index 8432e27f485c..ff5b0ba9c216 100644
--- a/sql/trigger_def.h
+++ b/sql/trigger_def.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/trigger_loader.cc b/sql/trigger_loader.cc
index 30d0f38afe2c..ea841c044f7b 100644
--- a/sql/trigger_loader.cc
+++ b/sql/trigger_loader.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -610,11 +617,11 @@ bool Trigger_loader::load_triggers(THD *thd,
 
   if (trg.definitions.is_empty())
   {
-    DBUG_ASSERT(trg.sql_modes.is_empty());
-    DBUG_ASSERT(trg.definers_list.is_empty());
-    DBUG_ASSERT(trg.client_cs_names.is_empty());
-    DBUG_ASSERT(trg.connection_cl_names.is_empty());
-    DBUG_ASSERT(trg.db_cl_names.is_empty());
+    assert(trg.sql_modes.is_empty());
+    assert(trg.definers_list.is_empty());
+    assert(trg.client_cs_names.is_empty());
+    assert(trg.connection_cl_names.is_empty());
+    assert(trg.db_cl_names.is_empty());
     DBUG_RETURN(false);
   }
 
diff --git a/sql/trigger_loader.h b/sql/trigger_loader.h
index cd1c2954e1b6..214f546f183b 100644
--- a/sql/trigger_loader.h
+++ b/sql/trigger_loader.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/tzfile.h b/sql/tzfile.h
index db35c74ddfe3..f0722aa9eecc 100644
--- a/sql/tzfile.h
+++ b/sql/tzfile.h
@@ -1,16 +1,23 @@
 #ifndef TZFILE_INCLUDED
 #define TZFILE_INCLUDED
 
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 2261144ae2c4..258c02e277a5 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -58,11 +65,11 @@ using std::min;
 #if defined(TZINFO2SQL)
 #define ABBR_ARE_USED
 #else
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 /* Let use abbreviations for debug purposes */
 #undef ABBR_ARE_USED
 #define ABBR_ARE_USED
-#endif /* !defined(DBUG_OFF) */
+#endif /* !defined(NDEBUG) */
 #endif /* defined(TZINFO2SQL) */
 
 /* Structure describing local time type (e.g. Moscow summer time (MSD)) */
@@ -662,7 +669,7 @@ find_time_range(my_time_t t, const my_time_t *range_boundaries,
   /*
     Function will work without this assertion but result would be meaningless.
   */
-  DBUG_ASSERT(higher_bound > 0 && t >= range_boundaries[0]);
+  assert(higher_bound > 0 && t >= range_boundaries[0]);
 
   /*
     Do binary search for minimal interval which contain t. We preserve:
@@ -813,12 +820,12 @@ static my_time_t
 sec_since_epoch(int year, int mon, int mday, int hour, int min ,int sec)
 {
   /* Guard against my_time_t overflow(on system with 32 bit my_time_t) */
-  DBUG_ASSERT(!(year == TIMESTAMP_MAX_YEAR && mon == 1 && mday > 17));
+  assert(!(year == TIMESTAMP_MAX_YEAR && mon == 1 && mday > 17));
   /*
     It turns out that only whenever month is normalized or unnormalized
     plays role.
   */
-  DBUG_ASSERT(mon > 0 && mon < 13);
+  assert(mon > 0 && mon < 13);
   long days= year * DAYS_PER_NYEAR - EPOCH_YEAR * DAYS_PER_NYEAR +
              LEAPS_THRU_END_OF(year - 1) -
              LEAPS_THRU_END_OF(EPOCH_YEAR - 1);
@@ -950,7 +957,7 @@ TIME_to_gmt_sec(const MYSQL_TIME *t, const TIME_ZONE_INFO *sp,
                            saved_seconds ? 0 : t->second);
 
   /* We have at least one range */
-  DBUG_ASSERT(sp->revcnt >= 1);
+  assert(sp->revcnt >= 1);
 
   if (local_t < sp->revts[0] || local_t > sp->revts[sp->revcnt])
   {
@@ -1154,7 +1161,7 @@ my_time_t
 Time_zone_utc::TIME_to_gmt_sec(const MYSQL_TIME *t, my_bool *in_dst_time_gap) const
 {
   /* Should be never called */
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -1201,7 +1208,7 @@ const String *
 Time_zone_utc::get_name() const
 {
   /* Should be never called */
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -1537,10 +1544,9 @@ my_offset_tzs_get_key(Time_zone_offset *entry,
 static void
 tz_init_table_list(TABLE_LIST *tz_tabs)
 {
-  memset(tz_tabs, 0, sizeof(TABLE_LIST) * MY_TZ_TABLES_COUNT);
-
   for (int i= 0; i < MY_TZ_TABLES_COUNT; i++)
   {
+    new (&tz_tabs[i]) TABLE_LIST;
     tz_tabs[i].alias= tz_tabs[i].table_name= tz_tables_names[i].str;
     tz_tabs[i].table_name_length= tz_tables_names[i].length;
     tz_tabs[i].db= tz_tables_db_name.str;
@@ -1680,7 +1686,6 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap)
     leap seconds shared by all time zones.
   */
   thd->set_db(db);
-  memset(&tz_tables[0], 0, sizeof(TABLE_LIST));
   tz_tables[0].alias= tz_tables[0].table_name=
     (char*)"time_zone_leap_second";
   tz_tables[0].table_name_length= 21;
@@ -1910,8 +1915,8 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
       HA_ERR_LOCK_WAIT_TIMEOUT/HA_ERR_LOCK_DEADLOCK on return from read
       from storage engine.
     */
-    DBUG_ASSERT(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
-                res != HA_ERR_LOCK_DEADLOCK);
+    assert(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
+           res != HA_ERR_LOCK_DEADLOCK);
 #ifdef EXTRA_DEBUG
     /*
       Most probably user has mistyped time zone name, so no need to bark here
@@ -1942,8 +1947,8 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
                                       HA_WHOLE_KEY, HA_READ_KEY_EXACT);
   if (res)
   {
-    DBUG_ASSERT(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
-                res != HA_ERR_LOCK_DEADLOCK);
+    assert(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
+           res != HA_ERR_LOCK_DEADLOCK);
 
     sql_print_error("Can't find description of time zone '%u'", tzid);
     goto end;
@@ -2014,7 +2019,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
 #endif
 
     /* ttid is increasing because we are reading using index */
-    DBUG_ASSERT(ttid >= tmp_tz_info.typecnt);
+    assert(ttid >= tmp_tz_info.typecnt);
 
     tmp_tz_info.typecnt= ttid + 1;
 
@@ -2024,8 +2029,8 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
 
   if (res != HA_ERR_END_OF_FILE)
   {
-    DBUG_ASSERT(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
-                res != HA_ERR_LOCK_DEADLOCK);
+    assert(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
+           res != HA_ERR_LOCK_DEADLOCK);
     sql_print_error("Error while loading time zone description from "
                     "mysql.time_zone_transition_type table");
     goto end;
@@ -2084,8 +2089,8 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
   */
   if (res != HA_ERR_END_OF_FILE && res != HA_ERR_KEY_NOT_FOUND)
   {
-    DBUG_ASSERT(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
-                res != HA_ERR_LOCK_DEADLOCK);
+    assert(res != HA_ERR_LOCK_WAIT_TIMEOUT &&
+           res != HA_ERR_LOCK_DEADLOCK);
     sql_print_error("Error while loading time zone description from "
                     "mysql.time_zone_transition table");
     goto end;
diff --git a/sql/tztime.h b/sql/tztime.h
index 9e22cf6f17ec..3027205423d1 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -1,16 +1,23 @@
 #ifndef TZTIME_INCLUDED
 #define TZTIME_INCLUDED
 
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/udf_example.cc b/sql/udf_example.cc
index 834b525deb59..a5d3aea2d787 100644
--- a/sql/udf_example.cc
+++ b/sql/udf_example.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/udf_example.def b/sql/udf_example.def
index 5e9eb7c90f41..a0985e1b3dd2 100644
--- a/sql/udf_example.def
+++ b/sql/udf_example.def
@@ -1,3 +1,25 @@
+; Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+;
+; This program is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License, version 2.0,
+; as published by the Free Software Foundation.
+;
+; This program is also distributed with certain software (including
+; but not limited to OpenSSL) that is licensed under separate terms,
+; as designated in a particular file or component or in included license
+; documentation.  The authors of MySQL hereby grant you an additional
+; permission to link the program and your derivative works with the
+; separately licensed software that they have included with MySQL.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License, version 2.0, for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program; if not, write to the Free Software
+; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 LIBRARY		udf_example
 VERSION		1.0
 EXPORTS
diff --git a/sql/uniques.cc b/sql/uniques.cc
index 5cff3deb6cdc..d794018a1465 100644
--- a/sql/uniques.cc
+++ b/sql/uniques.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -492,7 +499,7 @@ static bool merge_walk(uchar *merge_buffer, size_t merge_buffer_size,
   // read_to_buffer() needs only rec_length.
   Sort_param sort_param;
   sort_param.rec_length= key_length;
-  DBUG_ASSERT(!sort_param.using_addon_fields());
+  assert(!sort_param.using_addon_fields());
 
   /*
     Invariant: queue must contain top element from each tree, until a tree
@@ -508,7 +515,7 @@ static bool merge_walk(uchar *merge_buffer, size_t merge_buffer_size,
     bytes_read= read_to_buffer(file, top, &sort_param);
     if (bytes_read == (uint) (-1))
       goto end;
-    DBUG_ASSERT(bytes_read);
+    assert(bytes_read);
     queue.push(top);
   }
   top= queue.top();
@@ -649,7 +656,7 @@ bool Unique::get(TABLE *table)
   if (my_b_tell(&file) == 0)
   {
     /* Whole tree is in memory;  Don't use disk if you don't need to */
-    DBUG_ASSERT(table->sort.sorted_result == NULL);
+    assert(table->sort.sorted_result == NULL);
     if ((record_pointers= table->sort.sorted_result= (uchar*)
 	 my_malloc(key_memory_Filesort_info_record_pointers,
                    size * tree.elements_in_tree, MYF(0))))
@@ -670,11 +677,14 @@ bool Unique::get(TABLE *table)
   my_off_t save_pos;
   bool error=1;
 
-      /* Open cached file if it isn't open */
-  DBUG_ASSERT(table->sort.io_cache == NULL);
-  outfile=table->sort.io_cache=(IO_CACHE*) my_malloc(key_memory_TABLE_sort_io_cache,
-                                                     sizeof(IO_CACHE),
-                                MYF(MY_ZEROFILL));
+  /*
+    Open cached file if it isn't open. Reuse the existing io_cache if it is
+    already present.
+  */
+  if (!table->sort.io_cache)
+    outfile=table->sort.io_cache=(IO_CACHE*) my_malloc(key_memory_TABLE_sort_io_cache,
+                                                       sizeof(IO_CACHE),
+                                                       MYF(MY_ZEROFILL));
 
   if (!outfile || (! my_b_inited(outfile) &&
       open_cached_file(outfile,mysql_tmpdir,TEMP_PREFIX,READ_RECORD_BUFFER,
diff --git a/sql/uniques.h b/sql/uniques.h
index c0d618357ffd..f88388cf558d 100644
--- a/sql/uniques.h
+++ b/sql/uniques.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 5dd4f1f8e1b0..45ceeb52e1cf 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -127,11 +134,11 @@ bool mysql_create_frm(THD *thd, const char *file_name,
   size_t tablespace_length= 0;
   DBUG_ENTER("mysql_create_frm");
 
-  DBUG_ASSERT(*fn_rext((char*)file_name)); // Check .frm extension
+  assert(*fn_rext((char*)file_name)); // Check .frm extension
 
   if (!(screen_buff=pack_screens(create_fields,&info_length,&screens,0)))
     DBUG_RETURN(1);
-  DBUG_ASSERT(db_file != NULL);
+  assert(db_file != NULL);
 
  /* If fixed row records, we need one bit to check for deleted rows */
   if (!(create_info->table_options & HA_OPTION_PACK_RECORD))
@@ -257,10 +264,10 @@ bool mysql_create_frm(THD *thd, const char *file_name,
     */
     if (tablespace_length > 0 &&
         !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
-      DBUG_ASSERT(thd->mdl_context.owns_equal_or_stronger_lock(
-                                     MDL_key::TABLESPACE, "",
-                                     create_info->tablespace,
-                                     MDL_INTENTION_EXCLUSIVE));
+      assert(thd->mdl_context.owns_equal_or_stronger_lock(
+                                                          MDL_key::TABLESPACE, "",
+                                                          create_info->tablespace,
+                                                          MDL_INTENTION_EXCLUSIVE));
   }
   format_section_length=
     format_section_header_size +
@@ -308,7 +315,7 @@ bool mysql_create_frm(THD *thd, const char *file_name,
     Even if the form file exists, create_frm must truncate it to
     ensure one form per form file.
   */
-  DBUG_ASSERT(uint2korr(fileinfo+8) == 0);
+  assert(uint2korr(fileinfo+8) == 0);
 
   if (!(filepos= make_new_entry(file, fileinfo, NULL, "")))
     goto err;
@@ -422,7 +429,7 @@ bool mysql_create_frm(THD *thd, const char *file_name,
       *ptr= field_flags;
       ptr++;
     }
-    DBUG_ASSERT(format_section_buff + format_section_length == ptr);
+    assert(format_section_buff + format_section_length == ptr);
 
     if (mysql_file_write(file, format_section_buff,
                          format_section_length, MYF_RW))
@@ -544,7 +551,7 @@ int rea_create_table(THD *thd, const char *path,
     DBUG_RETURN(1);
 
   // Make sure mysql_create_frm din't remove extension
-  DBUG_ASSERT(*fn_rext(frm_name));
+  assert(*fn_rext(frm_name));
   if (thd->variables.keep_files_on_create)
     create_info->options|= HA_CREATE_KEEP_FILES;
 
@@ -836,7 +843,7 @@ static bool pack_header(uchar *forminfo, enum legacy_db_type table_type,
       in mysql_prepare_create_table. So the offset is messed up by
       vitual generated columns. The original assert is not correct
       any more.
-      DBUG_ASSERT(reclength == field->offset + data_offset);
+      assert(reclength == field->offset + data_offset);
      */
     if (field->offset + data_offset + length > reclength)
       reclength= field->offset + data_offset + length;
@@ -1203,7 +1210,7 @@ bool make_default_value(THD *thd, TABLE *table, Create_field *field,
       Storing the value of a function is pointless as this function may not
       be constant.
     */
-    DBUG_ASSERT(field->def->type() != Item::FUNC_ITEM);
+    assert(field->def->type() != Item::FUNC_ITEM);
     type_conversion_status res= field->def->save_in_field(regfield, true);
     if (res != TYPE_OK && res != TYPE_NOTE_TIME_TRUNCATED &&
         res != TYPE_NOTE_TRUNCATED)
@@ -1287,8 +1294,6 @@ static bool make_empty_rec(THD *thd, File file,
   DBUG_ENTER("make_empty_rec");
 
   /* We need a table to generate columns for default values */
-  memset(&table, 0, sizeof(table));
-  memset(&share, 0, sizeof(share));
   table.s= &share;
 
   if (!(buff=(uchar*) my_malloc(key_memory_frm,
@@ -1345,7 +1350,7 @@ static bool make_empty_rec(THD *thd, File file,
       }
     }
   }
-  DBUG_ASSERT(data_offset == ((null_count + 7) / 8));
+  assert(data_offset == ((null_count + 7) / 8));
 
   /*
     We need to set the unused bits to 1. If the number of bits is a multiple
diff --git a/sql/unireg.h b/sql/unireg.h
index 064dcbb64dc4..d356a70a491b 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -1,16 +1,23 @@
 #ifndef UNIREG_INCLUDED
 #define UNIREG_INCLUDED
 
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/sql/xa.cc b/sql/xa.cc
index c091ba76a7b4..ff60838a526e 100644
--- a/sql/xa.cc
+++ b/sql/xa.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -92,7 +99,7 @@ static my_bool xarecover_handlerton(THD *unused, plugin_ref plugin,
         my_xid x= info->list[i].get_my_xid();
         if (!x) // not "mine" - that is generated by external TM
         {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           char buf[XIDDATASIZE * 4 + 6]; // see xid_to_str
           XID *xid= info->list + i;
           sql_print_information("ignore xid %s", xid->xid_to_str(buf));
@@ -111,7 +118,7 @@ static my_bool xarecover_handlerton(THD *unused, plugin_ref plugin,
             my_hash_search(info->commit_list, (uchar *)&x, sizeof(x)) != 0 :
             tc_heuristic_recover == TC_HEURISTIC_RECOVER_COMMIT)
         {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           char buf[XIDDATASIZE * 4 + 6]; // see xid_to_str
           XID *xid= info->list + i;
           sql_print_information("commit xid %s", xid->xid_to_str(buf));
@@ -120,7 +127,7 @@ static my_bool xarecover_handlerton(THD *unused, plugin_ref plugin,
         }
         else
         {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           char buf[XIDDATASIZE * 4 + 6]; // see xid_to_str
           XID *xid= info->list + i;
           sql_print_information("rollback xid %s", xid->xid_to_str(buf));
@@ -147,10 +154,10 @@ int ha_recover(HASH *commit_list)
   info.list= NULL;
 
   /* commit_list and tc_heuristic_recover cannot be set both */
-  DBUG_ASSERT(info.commit_list == 0 ||
-              tc_heuristic_recover == TC_HEURISTIC_NOT_USED);
+  assert(info.commit_list == 0 ||
+         tc_heuristic_recover == TC_HEURISTIC_NOT_USED);
   /* if either is set, total_ha_2pc must be set too */
-  DBUG_ASSERT(info.dry_run || total_ha_2pc>(ulong)opt_bin_log);
+  assert(info.dry_run || total_ha_2pc>(ulong)opt_bin_log);
 
   if (total_ha_2pc <= (ulong)opt_bin_log)
     DBUG_RETURN(0);
@@ -261,8 +268,8 @@ bool Sql_cmd_xa_commit::trans_xa_commit(THD *thd)
 
   DBUG_ENTER("trans_xa_commit");
 
-  DBUG_ASSERT(!thd->slave_thread || xid_state->get_xid()->is_null() ||
-              m_xa_opt == XA_ONE_PHASE);
+  assert(!thd->slave_thread || xid_state->get_xid()->is_null() ||
+         m_xa_opt == XA_ONE_PHASE);
 
   if (!xid_state->has_same_xid(m_xid))
   {
@@ -296,7 +303,7 @@ bool Sql_cmd_xa_commit::trans_xa_commit(THD *thd)
       DBUG_RETURN(true);
     }
 
-    DBUG_ASSERT(xs->is_in_recovery());
+    assert(xs->is_in_recovery());
     /*
       Resumed transaction XA-commit.
       The case deals with the "external" XA-commit by either a slave applier
@@ -472,7 +479,7 @@ bool Sql_cmd_xa_commit::trans_xa_commit(THD *thd)
   }
   else
   {
-    DBUG_ASSERT(!need_clear_owned_gtid);
+    assert(!need_clear_owned_gtid);
 
     my_error(ER_XAER_RMFAIL, MYF(0), xid_state->state_name());
     DBUG_RETURN(true);
@@ -484,7 +491,7 @@ bool Sql_cmd_xa_commit::trans_xa_commit(THD *thd)
   xid_state->unset_binlogged();
   trans_track_end_trx(thd);
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL || res);
+  assert(thd->m_transaction_psi == NULL || res);
   DBUG_RETURN(res);
 }
 
@@ -548,7 +555,7 @@ bool Sql_cmd_xa_rollback::trans_xa_rollback(THD *thd)
 
     bool gtid_error= false;
 
-    DBUG_ASSERT(xs->is_in_recovery());
+    assert(xs->is_in_recovery());
 
     /*
       Acquire metadata lock which will ensure that XA ROLLBACK is blocked
@@ -637,7 +644,7 @@ bool Sql_cmd_xa_rollback::trans_xa_rollback(THD *thd)
   xid_state->unset_binlogged();
   trans_track_end_trx(thd);
   /* The transaction should be marked as complete in P_S. */
-  DBUG_ASSERT(thd->m_transaction_psi == NULL);
+  assert(thd->m_transaction_psi == NULL);
   DBUG_RETURN(res);
 }
 
@@ -748,7 +755,8 @@ bool Sql_cmd_xa_end::trans_xa_end(THD *thd)
   /* TODO: SUSPEND and FOR MIGRATE are not supported yet. */
   if (m_xa_opt != XA_NONE)
     my_error(ER_XAER_INVAL, MYF(0));
-  else if (!xid_state->has_state(XID_STATE::XA_ACTIVE))
+  else if (!xid_state->has_state(XID_STATE::XA_ACTIVE) &&
+           !xid_state->has_state(XID_STATE::XA_ROLLBACK_ONLY))
     my_error(ER_XAER_RMFAIL, MYF(0), xid_state->state_name());
   else if (!xid_state->has_same_xid(m_xid))
     my_error(ER_XAER_NOTA, MYF(0));
@@ -798,8 +806,13 @@ bool Sql_cmd_xa_prepare::trans_xa_prepare(THD *thd)
     my_error(ER_XAER_RMFAIL, MYF(0), xid_state->state_name());
   else if (!xid_state->has_same_xid(m_xid))
     my_error(ER_XAER_NOTA, MYF(0));
-  else
-  {
+  else if (thd->slave_thread &&
+           is_transaction_empty(
+               thd)) // No changes in none of the storage engine
+                     // means, filtered statements in the slave
+    my_error(ER_XA_REPLICATION_FILTERS,
+             MYF(0)); // Empty XA transactions not allowed
+  else {
     /*
       Acquire metadata lock which will ensure that XA PREPARE is blocked
       by active FLUSH TABLES WITH READ LOCK (and vice versa PREPARE in
@@ -822,7 +835,7 @@ bool Sql_cmd_xa_prepare::trans_xa_prepare(THD *thd)
         ha_rollback_trans(thd, true);
 
 #ifdef HAVE_PSI_TRANSACTION_INTERFACE
-      DBUG_ASSERT(thd->m_transaction_psi == NULL);
+      assert(thd->m_transaction_psi == NULL);
 #endif
 
       /*
@@ -1040,7 +1053,7 @@ void XID_STATE::store_xid_info(Protocol *protocol, bool print_xid_as_hex) const
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 char* XID::xid_to_str(char *buf) const
 {
   char *s= buf;
@@ -1225,12 +1238,12 @@ bool transaction_cache_detach(Transaction_ctx *transaction)
   bool was_logged= xs->is_binlogged();
 
 
-  DBUG_ASSERT(xs->has_state(XID_STATE::XA_PREPARED));
+  assert(xs->has_state(XID_STATE::XA_PREPARED));
 
   mysql_mutex_lock(&LOCK_transaction_cache);
 
-  DBUG_ASSERT(my_hash_search(&transaction_cache, xid.key(),
-                             xid.key_length()));
+  assert(my_hash_search(&transaction_cache, xid.key(),
+                        xid.key_length()));
 
   my_hash_delete(&transaction_cache, (uchar *)transaction);
   res= create_and_insert_new_transaction(&xid, was_logged);
@@ -1295,6 +1308,15 @@ static void attach_native_trx(THD *thd)
       ha_info->reset();
     }
   }
+  else
+  {
+    /*
+      Although the current `Ha_trx_info` object is null, we need to make sure
+      that the data engine plugins have the oportunity to attach their internal
+      transactions and clean up the session.
+     */
+    thd->rpl_reattach_engine_ha_data();
+  }
 }
 
 
@@ -1375,7 +1397,7 @@ my_bool detach_native_trx(THD *thd, plugin_ref plugin, void *unused)
   if (hton->replace_native_transaction_in_thd)
   {
     /* Ensure any active backup engine ha_data won't be overwritten */
-    DBUG_ASSERT(!thd->ha_data[hton->slot].ha_ptr_backup);
+    assert(!thd->ha_data[hton->slot].ha_ptr_backup);
 
     hton->replace_native_transaction_in_thd(thd, NULL,
                                             thd_ha_data_backup(thd, hton));
@@ -1383,3 +1405,19 @@ my_bool detach_native_trx(THD *thd, plugin_ref plugin, void *unused)
 
   return FALSE;
 }
+
+my_bool reattach_native_trx(THD *thd, plugin_ref plugin, void *)
+{
+  DBUG_ENTER("reattach_native_trx");
+  handlerton *hton = plugin_data<handlerton *>(plugin);
+
+  if (hton->replace_native_transaction_in_thd)
+  {
+    /* restore the saved original engine transaction's link with thd */
+    void **trx_backup = &thd->ha_data[hton->slot].ha_ptr_backup;
+
+    hton->replace_native_transaction_in_thd(thd, *trx_backup, NULL);
+    *trx_backup = NULL;
+  }
+  DBUG_RETURN(FALSE);
+}
diff --git a/sql/xa.h b/sql/xa.h
index 683bc987b6c4..463112759b7b 100644
--- a/sql/xa.h
+++ b/sql/xa.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -284,7 +291,7 @@ typedef struct xid_t
 
   void set_data(const void* v, long l)
   {
-    DBUG_ASSERT(l <= XIDDATASIZE);
+    assert(l <= XIDDATASIZE);
     memcpy(data, v, l);
   }
 
@@ -356,7 +363,7 @@ typedef struct xid_t
     return serialize_xid(buf, formatID, gtrid_length, bqual_length, data);
   }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   /**
      Get printable XID value.
 
@@ -495,7 +502,7 @@ class XID_STATE
 
   void start_normal_xa(const XID *xid)
   {
-    DBUG_ASSERT(m_xid.is_null());
+    assert(m_xid.is_null());
     xa_state= XA_ACTIVE;
     m_xid.set(xid);
     in_recovery= false;
@@ -707,7 +714,22 @@ struct st_plugin_int *plugin_find_by_type(const LEX_CSTRING &plugin, int type);
 
 my_bool detach_native_trx(THD *thd, plugin_ref plugin,
                                       void *unused);
+/**
+  The function reattaches existing storage engines transaction
+  context to thd. Backup area to save it is provided to low level
+  storage engine function.
+
+  is invoked by plugin_foreach() after
+  trans_xa_prepare() for each storage engine.
+
+  @param[in,out]     thd     Thread context
+  @param             plugin  Reference to handlerton
+
+  @return    FALSE   on success,
+             TRUE    otherwise.
+*/
 
+my_bool reattach_native_trx(THD *thd, plugin_ref plugin, void *);
 
 /**
   Reset some transaction state information and delete corresponding
diff --git a/sql/xa_aux.h b/sql/xa_aux.h
index b26fe8e08159..5f0ac4f7bd32 100644
--- a/sql/xa_aux.h
+++ b/sql/xa_aux.h
@@ -1,13 +1,20 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All Rights Reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
index b685675ce43e..f6c7429a632c 100644
--- a/storage/archive/CMakeLists.txt
+++ b/storage/archive/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c
index ca726259e859..454727b28472 100644
--- a/storage/archive/archive_reader.c
+++ b/storage/archive/archive_reader.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -250,7 +257,7 @@ int main(int argc, char *argv[])
       read= (unsigned int)azread(&reader_handle, buffer + ARCHIVE_ROW_HEADER_SIZE, 
                                  row_len, &error); 
 
-      DBUG_ASSERT(read == row_len);
+      assert(read == row_len);
 
       azwrite(&writer_handle, buffer, row_len + ARCHIVE_ROW_HEADER_SIZE);
 
@@ -350,7 +357,7 @@ static struct my_option my_long_options[] =
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"check", 'c', "Check table for errors.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"debug", '#',
    "Output debug log. Often this is 'd:t:o,filename'.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
diff --git a/storage/archive/archive_test.c b/storage/archive/archive_test.c
index d01c1e0b22e1..7f6f1a67fcd6 100644
--- a/storage/archive/archive_test.c
+++ b/storage/archive/archive_test.c
@@ -1,14 +1,21 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/archive/azio.c b/storage/archive/azio.c
index 32bc8587a086..d0188c3cc17e 100644
--- a/storage/archive/azio.c
+++ b/storage/archive/azio.c
@@ -8,7 +8,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * This file was modified by Oracle on 2015-01-23.
- * Modifications copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Modifications Copyright (c) 2015, 2023, Oracle and/or its affiliates.
  */
 
 /* @(#) $Id$ */
@@ -63,21 +63,21 @@ int az_open (azio_stream *s, const char *path, int Flags, File fd)
   memset(s, 0, sizeof(azio_stream));
   s->stream.next_in = s->inbuf;
   s->stream.next_out = s->outbuf;
-  DBUG_ASSERT(s->z_err == Z_OK);
+  assert(s->z_err == Z_OK);
   s->back = EOF;
   s->crc = crc32(0L, Z_NULL, 0);
   s->mode = 'r';
   /* this needs to be a define to version */
   s->version = (unsigned char)az_magic[1];
   s->minor_version= (unsigned char) az_magic[2]; /* minor version */
-  DBUG_ASSERT(s->dirty == AZ_STATE_CLEAN);
+  assert(s->dirty == AZ_STATE_CLEAN);
 
   /*
     We do our own version of append by nature.
     We must always have write access to take card of the header.
   */
-  DBUG_ASSERT(Flags | O_APPEND);
-  DBUG_ASSERT(Flags | O_WRONLY);
+  assert(Flags | O_APPEND);
+  assert(Flags | O_WRONLY);
 
   if (Flags & O_RDWR) 
     s->mode = 'w';
diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h
index df5aa53ba766..df1e7ef9a8f4 100644
--- a/storage/archive/azlib.h
+++ b/storage/archive/azlib.h
@@ -3,8 +3,7 @@
      -Brian Aker
 
   This file was modified by Oracle on 02-08-2016.
-  Modifications copyright (c) 2016, Oracle and/or its affiliates.
-  All rights reserved.
+  Modifications Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 */
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 33f8f95db3f7..6b9eeb37cc58 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1,15 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -513,7 +519,7 @@ Archive_share *ha_archive::get_share(const char *table_name, int *rc)
 err:
   unlock_shared_ha_data();
 
-  DBUG_ASSERT(tmp_share || *rc);
+  assert(tmp_share || *rc);
 
   DBUG_RETURN(tmp_share);
 }
@@ -1181,7 +1187,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
   DBUG_ENTER("ha_archive::fix_rec_buff");
   DBUG_PRINT("ha_archive", ("Fixing %u for %u", 
                             length, record_buffer->length));
-  DBUG_ASSERT(record_buffer->buffer);
+  assert(record_buffer->buffer);
 
   if (length > record_buffer->length)
   {
@@ -1195,7 +1201,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
     record_buffer->length= length;
   }
 
-  DBUG_ASSERT(length <= record_buffer->length);
+  assert(length <= record_buffer->length);
 
   DBUG_RETURN(0);
 }
@@ -1227,7 +1233,7 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record)
   {
     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
   }
-  DBUG_ASSERT(row_len <= record_buffer->length);
+  assert(row_len <= record_buffer->length);
 
   read= azread(file_to_read, record_buffer->buffer, row_len, &error);
 
@@ -1644,7 +1650,7 @@ int ha_archive::info(uint flag)
   if (share->dirty)
   {
     DBUG_PRINT("ha_archive", ("archive flushing out rows for scan"));
-    DBUG_ASSERT(share->archive_write_open);
+    assert(share->archive_write_open);
     azflush(&(share->archive_write), Z_SYNC_FLUSH);
     share->dirty= FALSE;
   }
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index e3b508906425..bca76fd07a66 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -118,7 +125,9 @@ class ha_archive: public handler
                                   ulonglong *nb_reserved_values);
   uint max_supported_keys()          const { return 1; }
   uint max_supported_key_length()    const { return sizeof(ulonglong); }
-  uint max_supported_key_part_length() const { return sizeof(ulonglong); }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                    *create_info MY_ATTRIBUTE((unused))) const
+  { return sizeof(ulonglong); }
   virtual int records(ha_rows *num_rows)
   {
     *num_rows= share->rows_recorded;
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
index ce90949c03f1..947e9feab241 100644
--- a/storage/blackhole/CMakeLists.txt
+++ b/storage/blackhole/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 53952450f4ac..fc8618a640e3 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -163,7 +170,7 @@ int ha_blackhole::rnd_pos(uchar * buf, uchar *pos)
   DBUG_ENTER("ha_blackhole::rnd_pos");
   MYSQL_READ_ROW_START(table_share->db.str, table_share->table_name.str,
                        FALSE);
-  DBUG_ASSERT(0);
+  assert(0);
   MYSQL_READ_ROW_DONE(0);
   DBUG_RETURN(0);
 }
@@ -172,7 +179,7 @@ int ha_blackhole::rnd_pos(uchar * buf, uchar *pos)
 void ha_blackhole::position(const uchar *record)
 {
   DBUG_ENTER("ha_blackhole::position");
-  DBUG_ASSERT(0);
+  assert(0);
   DBUG_VOID_RETURN;
 }
 
@@ -181,7 +188,7 @@ int ha_blackhole::info(uint flag)
 {
   DBUG_ENTER("ha_blackhole::info");
 
-  memset(&stats, 0, sizeof(stats));
+  new (&stats) ha_statistics;
   if (flag & HA_STATUS_AUTO)
     stats.auto_increment_value= 1;
   DBUG_RETURN(0);
diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h
index cb8e25569478..70c4a6244518 100644
--- a/storage/blackhole/ha_blackhole.h
+++ b/storage/blackhole/ha_blackhole.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -69,7 +76,9 @@ class ha_blackhole: public handler
 #define BLACKHOLE_MAX_KEY_LENGTH 1000
   uint max_supported_keys()          const { return BLACKHOLE_MAX_KEY; }
   uint max_supported_key_length()    const { return BLACKHOLE_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return BLACKHOLE_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                        *create_info MY_ATTRIBUTE((unused))) const
+  { return BLACKHOLE_MAX_KEY_LENGTH; }
   int open(const char *name, int mode, uint test_if_locked);
   int close(void);
   int truncate();
diff --git a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt
index 4e2865083c8a..f1d436d0e45c 100644
--- a/storage/csv/CMakeLists.txt
+++ b/storage/csv/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 75d7b42673d9..fc704b6ea4e0 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -1092,7 +1099,7 @@ int ha_tina::update_row(const uchar * old_data, uchar * new_data)
   rc= 0;
 
   /* UPDATE should never happen on the log tables */
-  DBUG_ASSERT(!share->is_log_table);
+  assert(!share->is_log_table);
 
 err:
   DBUG_PRINT("info",("rc = %d", rc));
@@ -1119,13 +1126,13 @@ int ha_tina::delete_row(const uchar * buf)
 
   stats.records--;
   /* Update shared info */
-  DBUG_ASSERT(share->rows_recorded);
+  assert(share->rows_recorded);
   mysql_mutex_lock(&share->mutex);
   share->rows_recorded--;
   mysql_mutex_unlock(&share->mutex);
 
   /* DELETE should never happen on the log table */
-  DBUG_ASSERT(!share->is_log_table);
+  assert(!share->is_log_table);
 
   DBUG_RETURN(0);
 }
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 161cbfd2172f..6a092d70e272 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/csv/transparent_file.cc b/storage/csv/transparent_file.cc
index 8dfa184a647c..ed1eaa97fbad 100644
--- a/storage/csv/transparent_file.cc
+++ b/storage/csv/transparent_file.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/csv/transparent_file.h b/storage/csv/transparent_file.h
index 033448fa7ec5..310a2dfd65e2 100644
--- a/storage/csv/transparent_file.h
+++ b/storage/csv/transparent_file.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/example/CMakeLists.txt b/storage/example/CMakeLists.txt
index 1510342b3fe0..3f335ee54c4c 100644
--- a/storage/example/CMakeLists.txt
+++ b/storage/example/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index e6e647ed5199..7ae66fd43879 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index 22ea339cb1c7..08e60eb06af2 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
index 27f8904ba6ab..d961e1cf3b99 100644
--- a/storage/federated/CMakeLists.txt
+++ b/storage/federated/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 8524d65a7a98..c14e8f5389af 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -1425,8 +1432,9 @@ bool ha_federated::create_where_from_key(String *to,
           {
             goto err;
           }
+          break;
         }
-        break;
+        // Fall through
       case HA_READ_KEY_OR_NEXT:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
         if (emit_key_part_name(&tmp, key_part) ||
@@ -1444,8 +1452,9 @@ bool ha_federated::create_where_from_key(String *to,
               emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
                                     part_length))
             goto err;
+          break;
         }
-        break;
+        // Fall through
       case HA_READ_KEY_OR_PREV:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
         if (emit_key_part_name(&tmp, key_part) ||
@@ -1465,7 +1474,7 @@ bool ha_federated::create_where_from_key(String *to,
       if (store_length >= length)
         break;
       DBUG_PRINT("info", ("remainder %d", remainder));
-      DBUG_ASSERT(remainder > 1);
+      assert(remainder > 1);
       length-= store_length;
       /*
         For nullable columns, null-byte is already skipped before, that is
@@ -1657,7 +1666,7 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked)
     DBUG_RETURN(1);
   thr_lock_data_init(&share->lock, &lock, NULL);
 
-  DBUG_ASSERT(mysql == NULL);
+  assert(mysql == NULL);
 
   ref_length= sizeof(MYSQL_RES *) + sizeof(MYSQL_ROW_OFFSET);
   DBUG_PRINT("info", ("ref_length: %u", ref_length));
@@ -2525,7 +2534,7 @@ int ha_federated::read_range_first(const key_range *start_key,
   DBUG_ENTER("ha_federated::read_range_first");
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
 
-  DBUG_ASSERT(!(start_key == NULL && end_key == NULL));
+  assert(!(start_key == NULL && end_key == NULL));
 
   sql_query.length(0);
   sql_query.append(share->select_query);
@@ -2761,7 +2770,7 @@ void ha_federated::position(const uchar *record MY_ATTRIBUTE ((unused)))
 {
   DBUG_ENTER("ha_federated::position");
   
-  DBUG_ASSERT(stored_result);
+  assert(stored_result);
 
   position_called= TRUE;
   /* Store result set address. */
@@ -2794,7 +2803,7 @@ int ha_federated::rnd_pos(uchar *buf, uchar *pos)
 
   /* Get stored result set. */
   memcpy(&result, pos, sizeof(MYSQL_RES *));
-  DBUG_ASSERT(result);
+  assert(result);
   /* Set data cursor position. */
   memcpy(&result->data_cursor, pos + sizeof(MYSQL_RES *),
          sizeof(MYSQL_ROW_OFFSET));
@@ -3183,7 +3192,7 @@ int ha_federated::real_connect()
   */
   mysql_mutex_assert_not_owner(&LOCK_open);
 
-  DBUG_ASSERT(mysql == NULL);
+  assert(mysql == NULL);
 
   if (!(mysql= mysql_init(NULL)))
   {
@@ -3285,6 +3294,9 @@ int ha_federated::stash_remote_error()
   if (remote_error_number == ER_DUP_ENTRY ||
       remote_error_number == ER_DUP_KEY)
     DBUG_RETURN(HA_ERR_FOUND_DUPP_KEY);
+  if (remote_error_number == ER_NO_REFERENCED_ROW ||
+      remote_error_number == ER_NO_REFERENCED_ROW_2)
+    DBUG_RETURN(HA_ERR_NO_REFERENCED_ROW);
   DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
 }
 
@@ -3443,6 +3455,23 @@ int ha_federated::execute_simple_query(const char *query, int len)
   DBUG_RETURN(0);
 }
 
+
+int ha_federated::rnd_pos_by_record(uchar *record) {
+  int error;
+  assert(table_flags() & HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
+
+  error = ha_rnd_init(false);
+  if (error != 0) return error;
+
+  if (stored_result) {
+    position(record);
+    error = ha_rnd_pos(record, ref);
+  }
+
+  ha_rnd_end();
+  return error;
+}
+
 struct st_mysql_storage_engine federated_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index f60aa79967ca..10d7c9bb9baa 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -168,7 +175,9 @@ class ha_federated: public handler
   uint max_supported_keys()          const { return MAX_KEY; }
   uint max_supported_key_parts()     const { return MAX_REF_PARTS; }
   uint max_supported_key_length()    const { return FEDERATED_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return FEDERATED_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                    *create_info MY_ATTRIBUTE((unused))) const
+  { return FEDERATED_MAX_KEY_LENGTH; }
   /*
     Called in test_quick_select to determine if indexes should be used.
     Normally, we need to know number of blocks . For federated we need to
@@ -269,5 +278,6 @@ class ha_federated: public handler
   int connection_autocommit(bool state);
   int execute_simple_query(const char *query, int len);
   int reset(void);
+  int rnd_pos_by_record(uchar *record);
 };
 
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index 4ec40fec59de..70bfcf0bf0ad 100644
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/heap/_check.c b/storage/heap/_check.c
index 5f291b0ca4ac..8539f0cba1ea 100644
--- a/storage/heap/_check.c
+++ b/storage/heap/_check.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/_rectest.c b/storage/heap/_rectest.c
index 33ca8cd0d78e..e30bc467b7de 100644
--- a/storage/heap/_rectest.c
+++ b/storage/heap/_rectest.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 9fe4b2b33315..e8addfb8416d 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -285,7 +292,7 @@ int ha_heap::index_read_map(uchar *buf, const uchar *key,
                             enum ha_rkey_function find_flag)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error = heap_rkey(file,buf,active_index, key, keypart_map, find_flag);
   table->status = error ? STATUS_NOT_FOUND : 0;
@@ -297,7 +304,7 @@ int ha_heap::index_read_last_map(uchar *buf, const uchar *key,
                                  key_part_map keypart_map)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error= heap_rkey(file, buf, active_index, key, keypart_map,
 		       HA_READ_PREFIX_LAST);
@@ -321,7 +328,7 @@ int ha_heap::index_read_idx_map(uchar *buf, uint index, const uchar *key,
 int ha_heap::index_next(uchar * buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_next_count);
   int error=heap_rnext(file,buf);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -332,7 +339,7 @@ int ha_heap::index_next(uchar * buf)
 int ha_heap::index_prev(uchar * buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_prev_count);
   int error=heap_rprev(file,buf);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -343,7 +350,7 @@ int ha_heap::index_prev(uchar * buf)
 int ha_heap::index_first(uchar * buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_first_count);
   int error=heap_rfirst(file, buf, active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -354,7 +361,7 @@ int ha_heap::index_first(uchar * buf)
 int ha_heap::index_last(uchar * buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_last_count);
   int error=heap_rlast(file, buf, active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -588,7 +595,7 @@ THR_LOCK_DATA **ha_heap::store_lock(THD *thd,
     as they don't have properly initialized THR_LOCK and THR_LOCK_DATA
     structures.
   */
-  DBUG_ASSERT(!internal_table);
+  assert(!internal_table);
   if (lock_type != TL_IGNORE && file->lock.type == TL_UNLOCK)
     file->lock.type=lock_type;
   *to++= &file->lock;
@@ -638,7 +645,7 @@ ha_rows ha_heap::records_in_range(uint inx, key_range *min_key,
     return stats.records;
 
   /* Assert that info() did run. We need current statistics here. */
-  DBUG_ASSERT(key_stat_version == file->s->key_stat_version);
+  assert(key_stat_version == file->s->key_stat_version);
   return key->rec_per_key[key->user_defined_key_parts - 1];
 }
 
@@ -687,7 +694,7 @@ heap_prepare_hp_create_info(TABLE *table_arg, bool internal_table,
       mem_per_row+=sizeof(TREE_ELEMENT)+pos->key_length+sizeof(char*);
       break;
     default:
-      DBUG_ASSERT(0); // cannot happen
+      assert(0); // cannot happen
     }
 
     for (; key_part != key_part_end; key_part++, seg++)
@@ -776,7 +783,7 @@ int ha_heap::create(const char *name, TABLE *table_arg,
 				  create_info->auto_increment_value - 1 : 0);
   error= heap_create(name, &hp_create_info, &internal_share, &created);
   my_free(hp_create_info.keydef);
-  DBUG_ASSERT(file == 0);
+  assert(file == 0);
   return (error);
 }
 
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index cb25623b58fc..d92d292d6073 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -61,7 +68,9 @@ class ha_heap: public handler
   }
   const key_map *keys_to_use_for_scanning() { return &btree_keys; }
   uint max_supported_keys()          const { return MAX_KEY; }
-  uint max_supported_key_part_length() const { return MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                    *create_info MY_ATTRIBUTE((unused))) const
+  { return MAX_KEY_LENGTH; }
   double scan_time()
   { return (double) (stats.records+stats.deleted) / 20.0+10; }
   double read_time(uint index, uint ranges, ha_rows rows)
diff --git a/storage/heap/heapdef.h b/storage/heap/heapdef.h
index 0ed3d1ff85a1..cd7fafbcdbf7 100644
--- a/storage/heap/heapdef.h
+++ b/storage/heap/heapdef.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_block.c b/storage/heap/hp_block.c
index b18265cef770..b73287a0f682 100644
--- a/storage/heap/hp_block.c
+++ b/storage/heap/hp_block.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_clear.c b/storage/heap/hp_clear.c
index 05ce9458d7c9..4ba464ca3635 100644
--- a/storage/heap/hp_clear.c
+++ b/storage/heap/hp_clear.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000-2002, 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_close.c b/storage/heap/hp_close.c
index 43eb41d01c90..5b3653e9def1 100644
--- a/storage/heap/hp_close.c
+++ b/storage/heap/hp_close.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -35,7 +42,7 @@ int hp_close(HP_INFO *info)
 {
   int error=0;
   DBUG_ENTER("hp_close");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (info->s->changed && heap_check_heap(info,0))
   {
     error= HA_ERR_CRASHED;
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
index 15e816dd690c..f20b911d48cb 100644
--- a/storage/heap/hp_create.c
+++ b/storage/heap/hp_create.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -92,7 +99,14 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info,
           /* Fall through. */
         case HA_KEYTYPE_VARTEXT1:
           keyinfo->flag|= HA_VAR_LENGTH_KEY;
-          length+= 2;
+          /*
+            For BTREE algorithm, key length, greater than or equal
+            to 255, is packed on 3 bytes.
+          */
+          if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
+            length+= size_to_store_key_length(keyinfo->seg[j].length);
+          else
+            length+= 2;
           /* Save number of bytes used to store length */
           keyinfo->seg[j].bit_start= 1;
           break;
@@ -101,7 +115,14 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info,
           /* fall_through */
         case HA_KEYTYPE_VARTEXT2:
           keyinfo->flag|= HA_VAR_LENGTH_KEY;
-          length+= 2;
+          /*
+            For BTREE algorithm, key length, greater than or equal
+            to 255, is packed on 3 bytes.
+          */
+          if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
+            length+= size_to_store_key_length(keyinfo->seg[j].length);
+          else
+            length+= 2;
           /* Save number of bytes used to store length */
           keyinfo->seg[j].bit_start= 2;
           /*
diff --git a/storage/heap/hp_delete.c b/storage/heap/hp_delete.c
index 451444d66bb7..e22ad120ab5f 100644
--- a/storage/heap/hp_delete.c
+++ b/storage/heap/hp_delete.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,7 +55,7 @@ int heap_delete(HP_INFO *info, const uchar *record)
   pos[share->reclength]=0;		/* Record deleted */
   share->deleted++;
   info->current_hash_ptr=0;
-#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
+#if !defined(NDEBUG) && defined(EXTRA_HEAP_DEBUG)
   DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
 #endif
 
diff --git a/storage/heap/hp_extra.c b/storage/heap/hp_extra.c
index 03d2aeb78882..89150390e372 100644
--- a/storage/heap/hp_extra.c
+++ b/storage/heap/hp_extra.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c
index 31b2872a07aa..66b06eeea264 100644
--- a/storage/heap/hp_hash.c
+++ b/storage/heap/hp_hash.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -874,7 +881,7 @@ void heap_update_auto_increment(HP_INFO *info, const uchar *record)
     value= uint8korr(key);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     value=0;                                    /* Error */
     break;
   }
diff --git a/storage/heap/hp_info.c b/storage/heap/hp_info.c
index 107144739542..b6ece0438c0a 100644
--- a/storage/heap/hp_info.c
+++ b/storage/heap/hp_info.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_open.c b/storage/heap/hp_open.c
index fa71d87ac39f..755a21fd7c63 100644
--- a/storage/heap/hp_open.c
+++ b/storage/heap/hp_open.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -51,7 +58,7 @@ HP_INFO *heap_open_from_share(HP_SHARE *share, int mode)
   info->mode= mode;
   info->current_record= (ulong) ~0L;		/* No current record */
   info->lastinx= info->errkey= -1;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   info->opt_flag= READ_CHECK_USED;		/* Check when changing */
 #endif
   DBUG_PRINT("exit",("heap: 0x%lx  reclength: %d  records_in_block: %d",
diff --git a/storage/heap/hp_panic.c b/storage/heap/hp_panic.c
index e1e421a5115e..ff4f8e3cd611 100644
--- a/storage/heap/hp_panic.c
+++ b/storage/heap/hp_panic.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2002, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rename.c b/storage/heap/hp_rename.c
index 706e2d2d0b60..1282ea0481f6 100644
--- a/storage/heap/hp_rename.c
+++ b/storage/heap/hp_rename.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rfirst.c b/storage/heap/hp_rfirst.c
index 6b9b24900892..e9cee35f9475 100644
--- a/storage/heap/hp_rfirst.c
+++ b/storage/heap/hp_rfirst.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -62,7 +69,7 @@ int heap_rfirst(HP_INFO *info, uchar *record, int inx)
       set_my_errno(HA_ERR_END_OF_FILE);
       DBUG_RETURN(my_errno());
     }
-    DBUG_ASSERT(0); /* TODO fix it */
+    assert(0); /* TODO fix it */
     info->current_record=0;
     info->current_hash_ptr=0;
     info->update=HA_STATE_PREV_FOUND;
diff --git a/storage/heap/hp_rkey.c b/storage/heap/hp_rkey.c
index 8cb765be3f47..1ef0117b27ec 100644
--- a/storage/heap/hp_rkey.c
+++ b/storage/heap/hp_rkey.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rlast.c b/storage/heap/hp_rlast.c
index fd227cda537a..4d667a057c87 100644
--- a/storage/heap/hp_rlast.c
+++ b/storage/heap/hp_rlast.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rnext.c b/storage/heap/hp_rnext.c
index 25b8250a1974..189f7a1339b4 100644
--- a/storage/heap/hp_rnext.c
+++ b/storage/heap/hp_rnext.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rprev.c b/storage/heap/hp_rprev.c
index 4455832b16c9..63d832704455 100644
--- a/storage/heap/hp_rprev.c
+++ b/storage/heap/hp_rprev.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rrnd.c b/storage/heap/hp_rrnd.c
index 8d7d2ae18d09..50dd975eba10 100644
--- a/storage/heap/hp_rrnd.c
+++ b/storage/heap/hp_rrnd.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_rsame.c b/storage/heap/hp_rsame.c
index 3cc6c39336da..7d087a6a624a 100644
--- a/storage/heap/hp_rsame.c
+++ b/storage/heap/hp_rsame.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_scan.c b/storage/heap/hp_scan.c
index 4104fe9b7d01..c7313a944142 100644
--- a/storage/heap/hp_scan.c
+++ b/storage/heap/hp_scan.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_static.c b/storage/heap/hp_static.c
index a17115dd8665..a21b58dfa604 100644
--- a/storage/heap/hp_static.c
+++ b/storage/heap/hp_static.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_test1.c b/storage/heap/hp_test1.c
index f6c7060489c7..decfb34e94f2 100644
--- a/storage/heap/hp_test1.c
+++ b/storage/heap/hp_test1.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_test2.c b/storage/heap/hp_test2.c
index e91cdc295b15..5eda8425304d 100644
--- a/storage/heap/hp_test2.c
+++ b/storage/heap/hp_test2.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/heap/hp_update.c b/storage/heap/hp_update.c
index 40f1c389d0c4..b271853b36a3 100644
--- a/storage/heap/hp_update.c
+++ b/storage/heap/hp_update.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -49,7 +56,7 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new)
   memcpy(pos,heap_new,(size_t) share->reclength);
   if (++(share->records) == share->blength) share->blength+= share->blength;
 
-#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
+#if !defined(NDEBUG) && defined(EXTRA_HEAP_DEBUG)
   DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
 #endif
   if (auto_key_changed)
diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c
index c3fba81aced8..83d12f2a43cb 100644
--- a/storage/heap/hp_write.c
+++ b/storage/heap/hp_write.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -35,7 +42,7 @@ int heap_write(HP_INFO *info, const uchar *record)
   uchar *pos;
   HP_SHARE *share=info->s;
   DBUG_ENTER("heap_write");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (info->mode & O_RDONLY)
   {
     set_my_errno(EACCES);
@@ -60,7 +67,7 @@ int heap_write(HP_INFO *info, const uchar *record)
   info->current_ptr=pos;
   info->current_hash_ptr=0;
   info->update|=HA_STATE_AKTIV;
-#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
+#if !defined(NDEBUG) && defined(EXTRA_HEAP_DEBUG)
   DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
 #endif
   if (share->auto_key)
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 463394bdff7a..9af75636f7ef 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -25,6 +32,7 @@ SET(INNOBASE_SOURCES
 	btr/btr0pcur.cc
 	btr/btr0sea.cc
 	btr/btr0bulk.cc
+	buf/buf0block_hint.cc
 	buf/buf0buddy.cc
 	buf/buf0buf.cc
 	buf/buf0dblwr.cc
@@ -166,9 +174,9 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(innobase GenError)
 ENDIF()
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 # Avoid generating Hardware Capabilities due to crc32 instructions
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
-  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
   MY_CHECK_CXX_COMPILER_FLAG("-Wa,-nH" HAVE_WA_NH)
   IF(HAVE_WA_NH)
     ADD_COMPILE_FLAGS(
@@ -178,6 +186,19 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
   ENDIF()
 ENDIF()
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98753
+IF(MY_COMPILER_IS_GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+  ADD_COMPILE_FLAGS(
+    pars/pars0grm.cc
+    COMPILE_FLAGS "-Wno-free-nonheap-object")
+ENDIF()
+
+MY_CHECK_CXX_COMPILER_FLAG("-Wcast-function-type" HAVE_CAST_FUNCTION_TYPE)
+IF(HAVE_CAST_FUNCTION_TYPE)
+  ADD_COMPILE_FLAGS(fts/fts0pars.cc
+    COMPILE_FLAGS "-Wno-cast-function-type")
+ENDIF()
+
 # A GCC bug causes crash when compiling these files on ARM64 with -O1+
 # Compile them with -O0 as a workaround.
 IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
diff --git a/storage/innobase/Doxyfile b/storage/innobase/Doxyfile
index 6ba82dab1468..11268f086e21 100644
--- a/storage/innobase/Doxyfile
+++ b/storage/innobase/Doxyfile
@@ -1,13 +1,20 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/innobase/api/api0api.cc b/storage/innobase/api/api0api.cc
index 5e08b32b4217..12e4e651a3ae 100644
--- a/storage/innobase/api/api0api.cc
+++ b/storage/innobase/api/api0api.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2008, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -390,6 +398,17 @@ ib_read_tuple(
 				tuple->heap);
 
 			ut_a(len != UNIV_SQL_NULL);
+			/* Reset the data length if it fails to copy
+			externally stored column */
+			if (data == NULL) {
+				/* data == NULL means that the externally
+				stored field was not written yet.
+				This record should only be seen by
+				TRX_ISO_READ_UNCOMMITTED transactions. */
+				ut_ad(ib_cfg_trx_level() ==
+					IB_TRX_READ_UNCOMMITTED);
+				len = 0;
+			}
 		}
 
 		dfield_set_data(dfield, data, len);
diff --git a/storage/innobase/api/api0misc.cc b/storage/innobase/api/api0misc.cc
index 3864e4b9a7f2..36815c1d19df 100644
--- a/storage/innobase/api/api0misc.cc
+++ b/storage/innobase/api/api0misc.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2008, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index a7bc8a21f863..1adf766b989d 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -4414,9 +4422,9 @@ btr_index_page_validate(
 {
 	page_cur_t	cur;
 	ibool		ret	= TRUE;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	ulint		nth	= 1;
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 	page_cur_set_before_first(block, &cur);
 
@@ -4744,7 +4752,7 @@ btr_validate_level(
 		now. Will enhanced in special R-Tree index validation scheme */
 		if (!dict_index_is_spatial(index)
 		    && cmp_rec_rec(rec, right_rec,
-				   offsets, offsets2, index) >= 0) {
+				   offsets, offsets2, index, false) >= 0) {
 
 			btr_validate_report2(index, level, block, right_block);
 
diff --git a/storage/innobase/btr/btr0bulk.cc b/storage/innobase/btr/btr0bulk.cc
index ca255d629abc..0d474da9f68f 100644
--- a/storage/innobase/btr/btr0bulk.cc
+++ b/storage/innobase/btr/btr0bulk.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -50,7 +58,11 @@ PageBulk::init()
 	mtr = static_cast<mtr_t*>(
 		mem_heap_alloc(m_heap, sizeof(mtr_t)));
 	mtr_start(mtr);
-	mtr_x_lock(dict_index_get_lock(m_index), mtr);
+
+	if (!dict_index_is_online_ddl(m_index)) {
+		mtr_x_lock(dict_index_get_lock(m_index), mtr);
+	}
+
 	mtr_set_log_mode(mtr, MTR_LOG_NO_REDO);
 	mtr_set_flush_observer(mtr, m_flush_observer);
 
@@ -177,7 +189,8 @@ PageBulk::insert(
 		ulint*	old_offsets = rec_get_offsets(
 			old_rec, m_index, NULL,	ULINT_UNDEFINED, &m_heap);
 
-		ut_ad(cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index)
+		ut_ad(cmp_rec_rec(rec, old_rec, offsets, old_offsets, m_index,
+				  page_is_spatial_non_leaf(old_rec, m_index))
 		      > 0);
 	}
 
@@ -581,6 +594,7 @@ void
 PageBulk::release()
 {
 	ut_ad(!dict_index_is_spatial(m_index));
+	ut_ad(m_block->page.buf_fix_count > 0);
 
 	/* We fix the block because we will re-pin it soon. */
 	buf_block_buf_fix_inc(m_block, __FILE__, __LINE__);
@@ -598,10 +612,16 @@ PageBulk::latch()
 	ibool	ret;
 
 	mtr_start(m_mtr);
-	mtr_x_lock(dict_index_get_lock(m_index), m_mtr);
+
+	if (!dict_index_is_online_ddl(m_index)) {
+		mtr_x_lock(dict_index_get_lock(m_index), m_mtr);
+	}
+
 	mtr_set_log_mode(m_mtr, MTR_LOG_NO_REDO);
 	mtr_set_flush_observer(m_mtr, m_flush_observer);
 
+	ut_ad(m_block->page.buf_fix_count > 0);
+
 	/* TODO: need a simple and wait version of buf_page_optimistic_get. */
 	ret = buf_page_optimistic_get(RW_X_LATCH, m_block, m_modify_clock,
 				      __FILE__, __LINE__, m_mtr);
@@ -617,10 +637,36 @@ PageBulk::latch()
 	}
 
 	buf_block_buf_fix_dec(m_block);
+	/*
+	The caller is going to use the m_block, so it needs to be buffer-fixed even
+	after the decrement above. This works like this:
+	release(){ //initially buf_fix_count == N > 0
+		buf_fix_count++ // N+1
+		mtr_commit(){
+			buf_fix_count-- // N
+		}
+	}//at the end buf_fix_count == N > 0
+	latch(){//initially buf_fix_count == M > 0
+		buf_page_get_gen/buf_page_optimistic_get internally(){
+			buf_fix_count++ // M+1
+		}
+		buf_fix_count-- // M
+	}//at the end buf_fix_count == M > 0
+	*/
+	ut_ad(m_block->page.buf_fix_count > 0);
 
 	ut_ad(m_cur_rec > m_page && m_cur_rec < m_heap_top);
 }
 
+#ifdef UNIV_DEBUG
+/* Check if an index is locked */
+bool PageBulk::isIndexXLocked() {
+	return (dict_index_is_online_ddl(m_index) &&
+		mtr_memo_contains_flagged(m_mtr, dict_index_get_lock(m_index),
+			MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK));
+}
+#endif // UNIV_DEBUG
+
 /** Split a page
 @param[in]	page_bulk	page to split
 @param[in]	next_page_bulk	next page
@@ -695,6 +741,16 @@ BtrBulk::pageCommit(
 		page_bulk->setNext(FIL_NULL);
 	}
 
+	/* Assert that no locks are held during bulk load operation
+	in case of a online ddl operation. Insert thread acquires index->lock
+	to check the online status of index. During bulk load index,
+	there are no concurrent insert of reads and hence, there is no
+	need to acquire a lock in that case. */
+	ut_ad(!page_bulk->isIndexXLocked());
+
+	DBUG_EXECUTE_IF("innodb_bulk_load_sleep",
+			os_thread_sleep(1000000););
+
 	/* Compress page if it's a compressed table. */
 	if (page_bulk->getPageZip() != NULL && !page_bulk->compress()) {
 		return(pageSplit(page_bulk, next_page_bulk));
@@ -729,29 +785,20 @@ BtrBulk::logFreeCheck()
 	}
 }
 
-/** Release all latches */
+/** Release latch on the rightmost leaf page in the index tree */
 void
 BtrBulk::release()
 {
-	ut_ad(m_root_level + 1 == m_page_bulks->size());
-
-	for (ulint level = 0; level <= m_root_level; level++) {
-		PageBulk*    page_bulk = m_page_bulks->at(level);
-
-		page_bulk->release();
-	}
+	PageBulk* page_bulk = m_page_bulks->at(0);
+	page_bulk->release();
 }
 
-/** Re-latch all latches */
+/** Re-latch latch on the rightmost leaf page in the index tree */
 void
 BtrBulk::latch()
 {
-	ut_ad(m_root_level + 1 == m_page_bulks->size());
-
-	for (ulint level = 0; level <= m_root_level; level++) {
-		PageBulk*    page_bulk = m_page_bulks->at(level);
-		page_bulk->latch();
-	}
+	PageBulk* page_bulk = m_page_bulks->at(0);
+	page_bulk->latch();
 }
 
 /** Insert a tuple to page in a level
@@ -778,16 +825,23 @@ BtrBulk::insert(
 			return(err);
 		}
 
+		DEBUG_SYNC_C("bulk_load_insert");
 		m_page_bulks->push_back(new_page_bulk);
 		ut_ad(level + 1 == m_page_bulks->size());
 		m_root_level = level;
 
 		is_left_most = true;
+		if (level > 0) {
+			new_page_bulk->release();
+		}
 	}
 
 	ut_ad(m_page_bulks->size() > level);
 
 	PageBulk*	page_bulk = m_page_bulks->at(level);
+	if (level > 0) {
+		page_bulk->latch();
+	}
 
 	if (is_left_most && level > 0 && page_bulk->getRecNo() == 0) {
 		/* The node pointer must be marked as the predefined minimum
@@ -809,7 +863,8 @@ BtrBulk::insert(
 		big_rec = dtuple_convert_big_rec(m_index, 0, tuple, &n_ext);
 
 		if (big_rec == NULL) {
-			return(DB_TOO_BIG_RECORD);
+			err = DB_TOO_BIG_RECORD;
+			goto func_exit;
 		}
 
 		rec_size = rec_get_converted_size(m_index, tuple, n_ext);
@@ -862,7 +917,6 @@ BtrBulk::insert(
 
 			logFreeCheck();
 		}
-
 	}
 
 	/* Convert tuple to rec. */
@@ -877,27 +931,16 @@ BtrBulk::insert(
 		ut_ad(dict_index_is_clust(m_index));
 		ut_ad(page_bulk->getLevel() == 0);
 		ut_ad(page_bulk == m_page_bulks->at(0));
-
-		/* Release all latched but leaf node. */
-		for (ulint level = 1; level <= m_root_level; level++) {
-			PageBulk*    page_bulk = m_page_bulks->at(level);
-
-			page_bulk->release();
-		}
-
 		err = page_bulk->storeExt(big_rec, offsets);
-
-		/* Latch */
-		for (ulint level = 1; level <= m_root_level; level++) {
-			PageBulk*    page_bulk = m_page_bulks->at(level);
-			page_bulk->latch();
-		}
 	}
 
 func_exit:
 	if (big_rec != NULL) {
 		dtuple_convert_back_big_rec(m_index, tuple, big_rec);
 	}
+	if (level > 0) {
+		page_bulk->release();
+	}
 
 	return(err);
 }
@@ -914,6 +957,11 @@ BtrBulk::finish(dberr_t	err)
 
 	ut_ad(!dict_table_is_temporary(m_index->table));
 
+#ifdef UNIV_DEBUG
+	/* Assert that the index online status has not changed */
+	ut_ad(m_index->online_status == m_index_online);
+#endif // UNIV_DEBUG
+
 	if (m_page_bulks->size() == 0) {
 		/* The table is empty. The root page of the index tree
 		is already in a consistent state. No need to flush. */
@@ -925,6 +973,9 @@ BtrBulk::finish(dberr_t	err)
 	/* Finish all page bulks */
 	for (ulint level = 0; level <= m_root_level; level++) {
 		PageBulk*	page_bulk = m_page_bulks->at(level);
+		if (level > 0) {
+			page_bulk->latch();
+		}
 
 		last_page_no = page_bulk->getPageNo();
 
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index 54429a384180..a749d0b8e22c 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 Copyright (c) 2012, Facebook Inc.
 
@@ -10,13 +10,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -420,6 +428,8 @@ btr_cur_optimistic_latch_leaves(
 {
 	ulint		mode;
 	ulint		left_page_no;
+	ut_ad(block->page.buf_fix_count > 0);
+	ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
 
 	switch (*latch_mode) {
 	case BTR_SEARCH_LEAF:
@@ -431,20 +441,11 @@ btr_cur_optimistic_latch_leaves(
 		mode = *latch_mode == BTR_SEARCH_PREV
 			? RW_S_LATCH : RW_X_LATCH;
 
-		buf_page_mutex_enter(block);
-		if (buf_block_get_state(block) != BUF_BLOCK_FILE_PAGE) {
-			buf_page_mutex_exit(block);
-			return(false);
-		}
-		/* pin the block not to be relocated */
-		buf_block_buf_fix_inc(block, file, line);
-		buf_page_mutex_exit(block);
-
 		rw_lock_s_lock(&block->lock);
 		if (block->modify_clock != modify_clock) {
 			rw_lock_s_unlock(&block->lock);
 
-			goto unpin_failed;
+			return(false);
 		}
 		left_page_no = btr_page_get_prev(
 			buf_block_get_frame(block), mtr);
@@ -455,10 +456,11 @@ btr_cur_optimistic_latch_leaves(
 				dict_index_get_space(cursor->index),
 				left_page_no);
 
-			cursor->left_block = btr_block_get(
+			cursor->left_block = buf_page_get_gen(
 				page_id,
 				dict_table_page_size(cursor->index->table),
-				mode, cursor->index, mtr);
+				mode, NULL, BUF_GET_POSSIBLY_FREED,
+				__FILE__, __LINE__, mtr);
 		} else {
 			cursor->left_block = NULL;
 		}
@@ -467,29 +469,27 @@ btr_cur_optimistic_latch_leaves(
 					    file, line, mtr)) {
 			if (btr_page_get_prev(buf_block_get_frame(block), mtr)
 			    == left_page_no) {
-				/* adjust buf_fix_count */
-				buf_page_mutex_enter(block);
-				buf_block_buf_fix_dec(block);
-				buf_page_mutex_exit(block);
-
+				/* We've entered this function with the block already buffer-fixed,
+				and buf_page_optimistic_get() buffer-fixes it again. The caller should
+				unfix the block once (to undo their buffer-fixing). */
+				ut_ad(2 <= block->page.buf_fix_count);
 				*latch_mode = mode;
 				return(true);
 			} else {
-				/* release the block */
+				/* release the block, which will also decrement the buf_fix_count once
+				undoing the increment in successful buf_page_optimistic_get() */
 				btr_leaf_page_release(block, mode, mtr);
 			}
 		}
 
+		/* If we are still here then buf_page_optimistic_get() did not buffer-fix
+		the page, but it should still be buffer-fixed as it was before the call.*/
+		ut_ad(0 < block->page.buf_fix_count);
 		/* release the left block */
 		if (cursor->left_block != NULL) {
 			btr_leaf_page_release(cursor->left_block,
 					      mode, mtr);
 		}
-unpin_failed:
-		/* unpin the block */
-		buf_page_mutex_enter(block);
-		buf_block_buf_fix_dec(block);
-		buf_page_mutex_exit(block);
 
 		return(false);
 
@@ -597,44 +597,64 @@ btr_cur_will_modify_tree(
 	if (lock_intention <= BTR_INTENTION_BOTH) {
 		ulint	margin;
 
-		/* check delete will cause. (BTR_INTENTION_BOTH
-		or BTR_INTENTION_DELETE) */
-		/* first, 2nd, 2nd-last and last records are 4 records */
-		if (page_get_n_recs(page) < 5) {
-			return(true);
-		}
+		if (lock_intention == BTR_INTENTION_BOTH) {
+			ulint	level = btr_page_get_level(page, mtr);
+
+			/* This value is the worst expectation for the node_ptr
+			records to be deleted from this page. It is used to
+			expect whether the cursor position can be the left_most
+			record in this page or not. */
+			ulint   max_nodes_deleted = 0;
+
+			/* By modifying tree operations from the under of this
+			level, logically (2 ^ (level - 1)) opportunities to
+			deleting records in maximum even unreally rare case. */
+			if (level > 7) {
+				/* TODO: adjust this practical limit. */
+				max_nodes_deleted = 64;
+			} else if (level > 0) {
+				max_nodes_deleted = (ulint)1 << (level - 1);
+			}
 
-		/* is first, 2nd or last record */
-		if (page_rec_is_first(rec, page)
-		    || (mach_read_from_4(page + FIL_PAGE_NEXT) != FIL_NULL
-			&& (page_rec_is_last(rec, page)
-			    || page_rec_is_second_last(rec, page)))
-		    || (mach_read_from_4(page + FIL_PAGE_PREV) != FIL_NULL
-			&& page_rec_is_second(rec, page))) {
-			return(true);
-		}
+			/* check delete will cause. (BTR_INTENTION_BOTH
+			or BTR_INTENTION_DELETE) */
+			if (page_get_n_recs(page) <= max_nodes_deleted * 2
+			    || page_rec_is_first(rec, page)) {
+				/* The cursor record can be the left most record
+				in this page. */
+				return(true);
+			}
+
+			if (fil_page_get_prev(page) != FIL_NULL
+			    && page_rec_distance_is_at_most(
+					page_get_infimum_rec(page), rec,
+					max_nodes_deleted)) {
+				return (true);
+			}
+
+			if (fil_page_get_next(page) != FIL_NULL
+			    && page_rec_distance_is_at_most(
+					rec, page_get_supremum_rec(page),
+					max_nodes_deleted)) {
+				return (true);
+			}
 
-		if (lock_intention == BTR_INTENTION_BOTH) {
 			/* Delete at leftmost record in a page causes delete
 			& insert at its parent page. After that, the delete
 			might cause btr_compress() and delete record at its
-			parent page. Thus we should consider max 2 deletes. */
+			parent page. Thus we should consider max deletes. */
 
-			margin = rec_size * 2;
+			margin = rec_size * max_nodes_deleted;
 		} else {
 			ut_ad(lock_intention == BTR_INTENTION_DELETE);
 
 			margin = rec_size;
 		}
-		/* NOTE: call mach_read_from_4() directly to avoid assertion
-		failure. It is safe because we already have SX latch of the
-		index tree */
+		/* Safe because we already have SX latch of the index tree */
 		if (page_get_data_size(page)
 			< margin + BTR_CUR_PAGE_COMPRESS_LIMIT(index)
-		    || (mach_read_from_4(page + FIL_PAGE_NEXT)
-				== FIL_NULL
-			&& mach_read_from_4(page + FIL_PAGE_PREV)
-				== FIL_NULL)) {
+		    || (fil_page_get_next(page) == FIL_NULL
+			&& fil_page_get_prev(page) == FIL_NULL)) {
 			return(true);
 		}
 	}
@@ -755,7 +775,6 @@ btr_cur_search_to_nth_level(
 {
 	page_t*		page = NULL; /* remove warning */
 	buf_block_t*	block;
-	buf_block_t*	guess;
 	ulint		height;
 	ulint		up_match;
 	ulint		up_bytes;
@@ -794,9 +813,7 @@ btr_cur_search_to_nth_level(
 
 	DBUG_ENTER("btr_cur_search_to_nth_level");
 
-#ifdef BTR_CUR_ADAPT
 	btr_search_t*	info;
-#endif /* BTR_CUR_ADAPT */
 	mem_heap_t*	heap		= NULL;
 	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
 	ulint*		offsets		= offsets_;
@@ -890,19 +907,8 @@ btr_cur_search_to_nth_level(
 	cursor->flag = BTR_CUR_BINARY;
 	cursor->index = index;
 
-#ifndef BTR_CUR_ADAPT
-	guess = NULL;
-#else
 	info = btr_search_get_info(index);
 
-	if (!buf_pool_is_obsolete(info->withdraw_clock)) {
-		guess = info->root_guess;
-	} else {
-		guess = NULL;
-	}
-
-#ifdef BTR_CUR_HASH_ADAPT
-
 # ifdef UNIV_SEARCH_PERF_STAT
 	info->n_searches++;
 # endif
@@ -939,8 +945,6 @@ btr_cur_search_to_nth_level(
 
 		DBUG_VOID_RETURN;
 	}
-# endif /* BTR_CUR_HASH_ADAPT */
-#endif /* BTR_CUR_ADAPT */
 	btr_cur_n_non_sea++;
 
 	/* If the hash search did not succeed, do binary search down the
@@ -1103,8 +1107,12 @@ btr_cur_search_to_nth_level(
 retry_page_get:
 	ut_ad(n_blocks < BTR_MAX_LEVELS);
 	tree_savepoints[n_blocks] = mtr_set_savepoint(mtr);
-	block = buf_page_get_gen(page_id, page_size, rw_latch, guess,
-				 buf_mode, file, line, mtr);
+	block = buf_page_get_gen(
+		page_id, page_size, rw_latch,
+		(height == ULINT_UNDEFINED ? info->root_guess : NULL),
+		buf_mode, file, line, mtr
+	);
+
 	tree_blocks[n_blocks] = block;
 
 	if (block == NULL) {
@@ -1287,12 +1295,7 @@ btr_cur_search_to_nth_level(
 			rtr_get_mbr_from_tuple(tuple, &cursor->rtr_info->mbr);
 		}
 
-#ifdef BTR_CUR_ADAPT
-		if (block != guess) {
-			info->root_guess = block;
-			info->withdraw_clock = buf_withdraw_clock;
-		}
-#endif
+		info->root_guess = block;
 	}
 
 	if (height == 0) {
@@ -1487,7 +1490,6 @@ btr_cur_search_to_nth_level(
 		ut_ad(height > 0);
 
 		height--;
-		guess = NULL;
 
 		node_ptr = page_cur_get_rec(page_cursor);
 
@@ -1626,8 +1628,9 @@ btr_cur_search_to_nth_level(
 					first_rec, index, offsets2,
 					ULINT_UNDEFINED, &heap);
 				cmp_rec_rec_with_match(node_ptr, first_rec,
-					offsets, offsets2, index, FALSE,
-					&matched_fields);
+					offsets, offsets2, index,
+					page_is_spatial_non_leaf(first_rec, index),
+					false, &matched_fields);
 
 				if (matched_fields
 				    >= rec_offs_n_fields(offsets) - 1) {
@@ -1647,7 +1650,8 @@ btr_cur_search_to_nth_level(
 					cmp_rec_rec_with_match(
 						node_ptr, last_rec,
 						offsets, offsets2, index,
-						FALSE, &matched_fields);
+						page_is_spatial_non_leaf(last_rec, index),
+						false, &matched_fields);
 					if (matched_fields
 					    >= rec_offs_n_fields(offsets) - 1) {
 						detected_same_key_root = true;
@@ -1842,8 +1846,6 @@ btr_cur_search_to_nth_level(
 		/* btr_insert_into_right_sibling() might cause
 		deleting node_ptr at upper level */
 
-		guess = NULL;
-
 		if (height == 0) {
 			/* release the leaf pages if latched */
 			for (uint i = 0; i < 3; i++) {
@@ -1908,7 +1910,6 @@ btr_cur_search_to_nth_level(
 		cursor->up_match = up_match;
 		cursor->up_bytes = up_bytes;
 
-#ifdef BTR_CUR_ADAPT
 		/* We do a dirty read of btr_search_enabled here.  We
 		will properly check btr_search_enabled again in
 		btr_search_build_page_hash_index() before building a
@@ -1916,7 +1917,6 @@ btr_cur_search_to_nth_level(
 		if (btr_search_enabled && !index->disable_ahi) {
 			btr_search_info_update(index, cursor);
 		}
-#endif
 		ut_ad(cursor->up_match != ULINT_UNDEFINED
 		      || mode != PAGE_CUR_GE);
 		ut_ad(cursor->up_match != ULINT_UNDEFINED
@@ -3264,7 +3264,6 @@ btr_cur_optimistic_insert(
 		}
 	}
 
-#ifdef BTR_CUR_HASH_ADAPT
 	if (!index->disable_ahi) {
 		if (!reorg && leaf && (cursor->flag == BTR_CUR_HASH)) {
 			btr_search_update_hash_node_on_insert(cursor);
@@ -3272,7 +3271,6 @@ btr_cur_optimistic_insert(
 			btr_search_update_hash_on_insert(cursor);
 		}
 	}
-#endif /* BTR_CUR_HASH_ADAPT */
 
 	if (!(flags & BTR_NO_LOCKING_FLAG) && inherit) {
 
@@ -3457,11 +3455,9 @@ btr_cur_pessimistic_insert(
 		}
 	}
 
-#ifdef BTR_CUR_ADAPT
 	if (!index->disable_ahi) {
 		btr_search_update_hash_on_insert(cursor);
 	}
-#endif
 	if (inherit && !(flags & BTR_NO_LOCKING_FLAG)) {
 
 		lock_update_insert(btr_cur_get_block(cursor), *rec);
@@ -4357,7 +4353,9 @@ btr_cur_pessimistic_update(
 
 	ut_ad(!page_is_comp(page) || !rec_get_node_ptr_flag(rec));
 	ut_ad(rec_offs_validate(rec, index, *offsets));
-	n_ext += btr_push_update_extern_fields(new_entry, update, entry_heap);
+
+	/* Get number of externally stored columns in updated record */
+	n_ext = new_entry->get_n_ext();
 
 	/* UNDO logging is also turned-off during normal operation on intrinsic
 	table so condition needs to ensure that table is not intrinsic. */
@@ -5214,6 +5212,8 @@ btr_cur_pessimistic_delete(
 	ulint		level;
 	mem_heap_t*	heap;
 	ulint*		offsets;
+	bool		allow_merge = true; /* if true, implies we have taken appropriate page
+			latches needed to merge this page.*/
 #ifdef UNIV_DEBUG
 	bool		parent_latched	= false;
 #endif /* UNIV_DEBUG */
@@ -5222,6 +5222,9 @@ btr_cur_pessimistic_delete(
 	page = buf_block_get_frame(block);
 	index = btr_cur_get_index(cursor);
 
+	ulint rec_size_est = dict_index_node_ptr_max_size(index);
+	const page_size_t       page_size(dict_table_page_size(index->table));
+
 	ut_ad(flags == 0 || flags == BTR_CREATE_FLAG);
 	ut_ad(!dict_index_is_online_ddl(index)
 	      || dict_index_is_clust(index)
@@ -5361,6 +5364,15 @@ btr_cur_pessimistic_delete(
 
 	btr_search_update_hash_on_delete(cursor);
 
+	if (page_is_leaf(page) || dict_index_is_spatial(index)) {
+	/* Set allow merge to true for spatial indexes as the tree is X
+        locked incase of delete operation on spatial indexes thus avoiding
+        possibility of upward locking.*/
+		allow_merge = true;
+	} else {
+		allow_merge = btr_cur_will_modify_tree(index,page,BTR_INTENTION_DELETE,
+                                        rec,rec_size_est,page_size,mtr);
+	}
 	page_cur_delete_rec(btr_cur_get_page_cur(cursor), index, offsets, mtr);
 #ifdef UNIV_ZIP_DEBUG
 	ut_a(!page_zip || page_zip_validate(page_zip, page, index));
@@ -5374,8 +5386,20 @@ btr_cur_pessimistic_delete(
 
 	mem_heap_free(heap);
 
-	if (ret == FALSE) {
-		ret = btr_cur_compress_if_useful(cursor, FALSE, mtr);
+	if(!ret) {
+		bool do_merge = btr_cur_compress_recommendation(cursor,mtr);
+		/* We are not allowed do merge because appropriate locks
+		are not taken while positioning the cursor. */
+		if (!allow_merge && do_merge) {
+			ib::info() << "Ignoring merge recommendation for page"
+				"as we could not predict it early .Page"
+				"number being\n" << page_get_page_no(page) <<
+				"Index name\n" << index->name;
+			ut_ad(false);
+		} else if (do_merge) {
+
+			ret = btr_cur_compress_if_useful(cursor, FALSE, mtr);
+		}
 	}
 
 	if (!srv_read_only_mode
@@ -6151,7 +6175,9 @@ btr_estimate_number_of_different_key_vals(
 
 			cmp_rec_rec_with_match(rec, next_rec,
 					       offsets_rec, offsets_next_rec,
-					       index, stats_null_not_equal,
+					       index,
+					       page_is_spatial_non_leaf(next_rec, index),
+					       stats_null_not_equal,
 					       &matched_fields);
 
 			for (j = matched_fields; j < n_cols; j++) {
@@ -6436,87 +6462,6 @@ btr_cur_unmark_extern_fields(
 	}
 }
 
-/*******************************************************************//**
-Flags the data tuple fields that are marked as extern storage in the
-update vector.  We use this function to remember which fields we must
-mark as extern storage in a record inserted for an update.
-@return number of flagged external columns */
-ulint
-btr_push_update_extern_fields(
-/*==========================*/
-	dtuple_t*	tuple,	/*!< in/out: data tuple */
-	const upd_t*	update,	/*!< in: update vector */
-	mem_heap_t*	heap)	/*!< in: memory heap */
-{
-	ulint			n_pushed	= 0;
-	ulint			n;
-	const upd_field_t*	uf;
-
-	ut_ad(tuple);
-	ut_ad(update);
-
-	uf = update->fields;
-	n = upd_get_n_fields(update);
-
-	for (; n--; uf++) {
-		if (dfield_is_ext(&uf->new_val)) {
-			dfield_t*	field
-				= dtuple_get_nth_field(tuple, uf->field_no);
-
-			if (!dfield_is_ext(field)) {
-				dfield_set_ext(field);
-				n_pushed++;
-			}
-
-			switch (uf->orig_len) {
-				byte*	data;
-				ulint	len;
-				byte*	buf;
-			case 0:
-				break;
-			case BTR_EXTERN_FIELD_REF_SIZE:
-				/* Restore the original locally stored
-				part of the column.  In the undo log,
-				InnoDB writes a longer prefix of externally
-				stored columns, so that column prefixes
-				in secondary indexes can be reconstructed. */
-				dfield_set_data(field,
-						(byte*) dfield_get_data(field)
-						+ dfield_get_len(field)
-						- BTR_EXTERN_FIELD_REF_SIZE,
-						BTR_EXTERN_FIELD_REF_SIZE);
-				dfield_set_ext(field);
-				break;
-			default:
-				/* Reconstruct the original locally
-				stored part of the column.  The data
-				will have to be copied. */
-				ut_a(uf->orig_len > BTR_EXTERN_FIELD_REF_SIZE);
-
-				data = (byte*) dfield_get_data(field);
-				len = dfield_get_len(field);
-
-				buf = (byte*) mem_heap_alloc(heap,
-							     uf->orig_len);
-				/* Copy the locally stored prefix. */
-				memcpy(buf, data,
-				       uf->orig_len
-				       - BTR_EXTERN_FIELD_REF_SIZE);
-				/* Copy the BLOB pointer. */
-				memcpy(buf + uf->orig_len
-				       - BTR_EXTERN_FIELD_REF_SIZE,
-				       data + len - BTR_EXTERN_FIELD_REF_SIZE,
-				       BTR_EXTERN_FIELD_REF_SIZE);
-
-				dfield_set_data(field, buf, uf->orig_len);
-				dfield_set_ext(field);
-			}
-		}
-	}
-
-	return(n_pushed);
-}
-
 /*******************************************************************//**
 Returns the length of a BLOB part stored on the header page.
 @return part length */
@@ -6755,7 +6700,8 @@ btr_store_big_rec_extern_fields(
 	ut_ad(mtr_memo_contains_flagged(btr_mtr, dict_index_get_lock(index),
 					MTR_MEMO_X_LOCK
 					| MTR_MEMO_SX_LOCK)
-	      || dict_table_is_intrinsic(index->table));
+	      || dict_table_is_intrinsic(index->table)
+	      || !index->is_committed());
 	ut_ad(mtr_is_block_fix(
 		btr_mtr, rec_block, MTR_MEMO_PAGE_X_FIX, index->table));
 	ut_ad(buf_block_get_frame(rec_block) == page_align(rec));
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc
index f673b7b7022b..bb9faade3e8e 100644
--- a/storage/innobase/btr/btr0pcur.cc
+++ b/storage/innobase/btr/btr0pcur.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -179,11 +187,10 @@ btr_pcur_store_position(
 		index, rec, &cursor->old_n_fields,
 		&cursor->old_rec_buf, &cursor->buf_size);
 
-	cursor->block_when_stored = block;
+	cursor->block_when_stored.store(block);
 
 	/* Function try to check if block is S/X latch. */
 	cursor->modify_clock = buf_block_get_modify_clock(block);
-	cursor->withdraw_clock = buf_withdraw_clock;
 }
 
 /**************************************************************//**
@@ -213,6 +220,26 @@ btr_pcur_copy_stored_position(
 	pcur_receive->old_n_fields = pcur_donate->old_n_fields;
 }
 
+/** This is a backported version of a lambda expression:
+  [&](buf_block_t *hint) {
+     return hint != nullptr && btr_cur_optimistic_latch_leaves(hint...);
+  }
+for compilers which do not support lambda expressions, nor passing local types
+as template arguments. */
+struct Btr_cur_optimistic_latch_leaves_functor_t{
+	btr_pcur_t * &cursor;
+	ulint &latch_mode;
+	const char * &file;
+	ulint &line;
+	mtr_t * &mtr;
+	bool operator() (buf_block_t *hint) const {
+		return hint != NULL && btr_cur_optimistic_latch_leaves(
+			hint, cursor->modify_clock, &latch_mode,
+			btr_pcur_get_btr_cur(cursor), file, line, mtr
+		);
+	}
+};
+
 /**************************************************************//**
 Restores the stored position of a persistent cursor bufferfixing the page and
 obtaining the specified latches. If the cursor position was saved when the
@@ -265,7 +292,7 @@ btr_pcur_restore_position_func(
 		cursor->latch_mode =
 			BTR_LATCH_MODE_WITHOUT_INTENTION(latch_mode);
 		cursor->pos_state = BTR_PCUR_IS_POSITIONED;
-		cursor->block_when_stored = btr_pcur_get_block(cursor);
+		cursor->block_when_stored.clear();
 
 		return(FALSE);
 	}
@@ -282,11 +309,8 @@ btr_pcur_restore_position_func(
             && !dict_table_is_intrinsic(cursor->btr_cur.index->table)) {
 		/* Try optimistic restoration. */
 
-		if (!buf_pool_is_obsolete(cursor->withdraw_clock)
-		    && btr_cur_optimistic_latch_leaves(
-			cursor->block_when_stored, cursor->modify_clock,
-			&latch_mode, btr_pcur_get_btr_cur(cursor),
-			file, line, mtr)) {
+		Btr_cur_optimistic_latch_leaves_functor_t functor={cursor,latch_mode,file,line,mtr};
+		if (cursor->block_when_stored.run_with_hint(functor)) {
 
 			cursor->pos_state = BTR_PCUR_IS_POSITIONED;
 			cursor->latch_mode = latch_mode;
@@ -313,7 +337,7 @@ btr_pcur_restore_position_func(
 
 				ut_ad(!cmp_rec_rec(cursor->old_rec,
 						   rec, offsets1, offsets2,
-						   index));
+						   index,page_is_spatial_non_leaf(rec, index)));
 				mem_heap_free(heap);
 #endif /* UNIV_DEBUG */
 				return(TRUE);
@@ -373,11 +397,10 @@ btr_pcur_restore_position_func(
 		since the cursor can now be on a different page!
 		But we can retain the value of old_rec */
 
-		cursor->block_when_stored = btr_pcur_get_block(cursor);
-		cursor->modify_clock = buf_block_get_modify_clock(
-						cursor->block_when_stored);
+		buf_block_t * block = btr_pcur_get_block(cursor);
+		cursor->block_when_stored.store(block);
+		cursor->modify_clock = buf_block_get_modify_clock(block);
 		cursor->old_stored = true;
-		cursor->withdraw_clock = buf_withdraw_clock;
 
 		mem_heap_free(heap);
 
@@ -449,9 +472,23 @@ btr_pcur_move_to_next_page(
 
 	next_page = buf_block_get_frame(next_block);
 #ifdef UNIV_BTR_DEBUG
-	ut_a(page_is_comp(next_page) == page_is_comp(page));
-	ut_a(btr_page_get_prev(next_page, mtr)
-	     == btr_pcur_get_block(cursor)->page.id.page_no());
+	if (!cursor->import_ctx) {
+		ut_a(page_is_comp(next_page) == page_is_comp(page));
+		ut_a(btr_page_get_prev(next_page, mtr)
+			== btr_pcur_get_block(cursor)->page.id.page_no());
+	}
+	else {
+		if (page_is_comp(next_page) != page_is_comp(page)
+			|| btr_page_get_prev(next_page, mtr) !=
+			btr_pcur_get_block(cursor)->page.id.page_no()) {
+			/* next page does not contain valid previous page
+			number, next page is corrupted, can't move cursor
+			to the next page */
+			cursor->import_ctx->is_error = true;
+		}
+		DBUG_EXECUTE_IF("ib_import_page_corrupt",
+				cursor->import_ctx->is_error = true;);
+	}
 #endif /* UNIV_BTR_DEBUG */
 
 	btr_leaf_page_release(btr_pcur_get_block(cursor), mode, mtr);
diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc
index ba0e7028c560..262a52b960a0 100644
--- a/storage/innobase/btr/btr0sea.cc
+++ b/storage/innobase/btr/btr0sea.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -389,7 +397,6 @@ btr_search_info_create(mem_heap_t* heap)
 
 	info->ref_count = 0;
 	info->root_guess = NULL;
-	info->withdraw_clock = 0;
 
 	info->hash_analysis = 0;
 	info->n_hash_potential = 0;
diff --git a/storage/innobase/buf/buf0block_hint.cc b/storage/innobase/buf/buf0block_hint.cc
new file mode 100644
index 000000000000..1f12d546583d
--- /dev/null
+++ b/storage/innobase/buf/buf0block_hint.cc
@@ -0,0 +1,90 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License, version 2.0, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
+#include "buf0block_hint.h"
+#include "buf0buf.h"
+namespace buf {
+
+void Block_hint::store(buf_block_t *block) {
+  ut_ad(block->page.buf_fix_count > 0);
+  m_block = block;
+  m_page_id.copy_from(block->page.id);
+}
+
+void Block_hint::clear() { m_block = NULL; }
+
+void Block_hint::buffer_fix_block_if_still_valid() {
+  /* We need to check if m_block points to one of chunks. For this to be
+  meaningful we need to prevent freeing memory while we check, and until we
+  buffer-fix the block. For this purpose it is enough to latch any of the many
+  latches taken by buf_resize().
+  However, for buffer-fixing to be meaningful, the block has to contain a page
+  (as opposed to being already empty, which might mean that buf_pool_resize()
+  can proceed and free it once we free the s-latch), so we confirm that the
+  block contains a page. However, it is not sufficient to check that this is
+  just any page, because just after we check it could get freed, unless we
+  have a latch which prevents this. This is tricky because page_hash latches
+  are sharded by page_id and we don't know the page_id until we look into the
+  block. To solve this chicken-and-egg problem somewhat, we latch the shard
+  for the m_page_id and compare block->page.id to it - so if is equal then we
+  can be reasonably sure that we have the correct latch.
+  There is still a theoretical problem here, where other threads might try
+  to modify the m_block->page.id while we are comparing it, but the chance of
+  accidentally causing the old space_id == m_page_id.m_space and the new
+  page_no == m_page_id.m_page_no is minimal as compilers emit a single 8-byte
+  comparison instruction to compare both at the same time atomically, and f()
+  will probably double-check the block->page.id again, anyway.
+  Finally, assuming that we have correct hash bucket latched, we should check if
+  the state of the block is BUF_BLOCK_FILE_PAGE before buffer-fixing the block,
+  as otherwise we risk buffer-fixing and operating on a block, which is already
+  meant to be freed. In particular, buf_LRU_free_page() first calls
+  buf_LRU_block_remove_hashed() under hash bucket latch protection to change the
+  state to BUF_BLOCK_REMOVE_HASH and then releases the latch. Later it calls
+  buf_LRU_block_free_hashed_page() without any latch to change the state to
+  BUF_BLOCK_MEMORY and reset the page's id, which means buf_resize() can free it
+  regardless of our buffer-fixing. */
+  if (m_block != NULL) {
+    const buf_pool_t *const pool = buf_pool_get(m_page_id);
+    rw_lock_t *latch = buf_page_hash_lock_get(pool, m_page_id);
+    rw_lock_s_lock(latch);
+    /* If not own buf_pool_mutex, page_hash can be changed. */
+    latch = buf_page_hash_lock_s_confirm(latch, pool, m_page_id);
+    if (buf_pointer_is_block_field_instance(pool, m_block) &&
+        m_page_id.equals_to(m_block->page.id) &&
+        buf_block_get_state(m_block) == BUF_BLOCK_FILE_PAGE) {
+      buf_block_buf_fix_inc(m_block, __FILE__, __LINE__);
+    } else {
+      clear();
+    }
+    rw_lock_s_unlock(latch);
+  }
+}
+void Block_hint::buffer_unfix_block_if_needed(buf_block_t *block) {
+  if (block != NULL) {
+    buf_block_buf_fix_dec(block);
+  }
+}
+}  // namespace buf
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc
index 1d6083a5f777..bf22ea57db69 100644
--- a/storage/innobase/buf/buf0buddy.cc
+++ b/storage/innobase/buf/buf0buddy.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -129,7 +137,7 @@ buf_buddy_stamp_free(
 	buf_buddy_free_t*	buf,	/*!< in/out: block to stamp */
 	ulint			i)	/*!< in: block size */
 {
-	ut_d(memset(buf, static_cast<int>(i), BUF_BUDDY_LOW << i));
+	ut_d(memset(&buf->stamp, static_cast<int>(i), BUF_BUDDY_LOW << i));
 	buf_buddy_mem_invalid(buf, i);
 	mach_write_to_4(buf->stamp.bytes + BUF_BUDDY_STAMP_OFFSET,
 			BUF_BUDDY_STAMP_FREE);
@@ -643,7 +651,7 @@ buf_buddy_relocate(
 
 	if (buf_page_can_relocate(bpage)) {
 		/* Relocate the compressed page. */
-		uintmax_t	usec = ut_time_us(NULL);
+		ib_time_monotonic_us_t usec = ut_time_monotonic_us();
 
 		ut_a(bpage->zip.data == src);
 
@@ -659,7 +667,7 @@ buf_buddy_relocate(
 
 		buf_buddy_stat_t*	buddy_stat = &buf_pool->buddy_stat[i];
 		buddy_stat->relocated++;
-		buddy_stat->relocated_usec += ut_time_us(NULL) - usec;
+		buddy_stat->relocated_usec += ut_time_monotonic_us() - usec;
 		return(true);
 	}
 
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index c6226bae7add..beb57c9a8d5b 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -87,14 +95,16 @@ struct set_numa_interleave_t
 
 			ib::info() << "Setting NUMA memory policy to"
 				" MPOL_INTERLEAVE";
+			struct bitmask* numa_nodes = numa_get_mems_allowed();
 			if (set_mempolicy(MPOL_INTERLEAVE,
-					  numa_all_nodes_ptr->maskp,
-					  numa_all_nodes_ptr->size) != 0) {
+					  numa_nodes->maskp,
+					  numa_nodes->size) != 0) {
 
 				ib::warn() << "Failed to set NUMA memory"
 					" policy to MPOL_INTERLEAVE: "
 					<< strerror(errno);
 			}
+			numa_bitmask_free(numa_nodes);
 		}
 	}
 
@@ -324,14 +334,6 @@ buf_pool_t*	buf_pool_ptr;
 /** true when resizing buffer pool is in the critical path. */
 volatile bool	buf_pool_resizing;
 
-/** true when withdrawing buffer pool pages might cause page relocation */
-volatile bool	buf_pool_withdrawing;
-
-/** the clock is incremented every time a pointer to a page may become obsolete;
-if the withdrwa clock has not changed, the pointer is still valid in buffer
-pool. if changed, the pointer might not be in buffer pool any more. */
-volatile ulint	buf_withdraw_clock;
-
 /** Map of buffer pool chunks by its first frame address
 This is newly made by initialization of buffer pool and buf_resize_thread.
 Currently, no need mutex protection for update. */
@@ -422,8 +424,14 @@ buf_pool_get_oldest_modification(void)
 		/* We don't let log-checkpoint halt because pages from system
 		temporary are not yet flushed to the disk. Anyway, object
 		residing in system temporary doesn't generate REDO logging. */
-		for (bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
-		     bpage != NULL
+		bpage = buf_pool->oldest_hp.get();
+		if (bpage != NULL) {
+			ut_ad(bpage->in_flush_list);
+		} else {
+			bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
+		}
+
+		for (; bpage != NULL
 			&& fsp_is_system_temporary(bpage->id.space());
 		     bpage = UT_LIST_GET_PREV(list, bpage)) {
 			/* Do nothing. */
@@ -432,6 +440,12 @@ buf_pool_get_oldest_modification(void)
 		if (bpage != NULL) {
 			ut_ad(bpage->in_flush_list);
 			lsn = bpage->oldest_modification;
+			buf_pool->oldest_hp.set(bpage);
+		} else {
+			/* The last scanned page as entry point,
+			or nullptr. */
+			buf_pool->oldest_hp.set(
+				UT_LIST_GET_FIRST(buf_pool->flush_list));
 		}
 
 		buf_flush_list_mutex_exit(buf_pool);
@@ -1512,16 +1526,18 @@ buf_chunk_init(
 
 #ifdef HAVE_LIBNUMA
 	if (srv_numa_interleave) {
+		struct 	bitmask* numa_nodes = numa_get_mems_allowed();
 		int	st = mbind(chunk->mem, chunk->mem_size(),
 				   MPOL_INTERLEAVE,
-				   numa_all_nodes_ptr->maskp,
-				   numa_all_nodes_ptr->size,
+				   numa_nodes->maskp,
+				   numa_nodes->size,
 				   MPOL_MF_MOVE);
 		if (st != 0) {
 			ib::warn() << "Failed to set NUMA memory policy of"
 				" buffer pool page frames to MPOL_INTERLEAVE"
 				" (error: " << strerror(errno) << ").";
 		}
+		numa_bitmask_free(numa_nodes);
 	}
 #endif /* HAVE_LIBNUMA */
 
@@ -1813,11 +1829,9 @@ buf_pool_init_instance(
 			LATCH_ID_HASH_TABLE_RW_LOCK,
 			srv_n_page_hash_locks, MEM_HEAP_FOR_PAGE_HASH);
 
-		buf_pool->page_hash_old = NULL;
-
 		buf_pool->zip_hash = hash_create(2 * buf_pool->curr_size);
 
-		buf_pool->last_printout_time = ut_time();
+		buf_pool->last_printout_time = ut_time_monotonic();
 	}
 	/* 2. Initialize flushing fields
 	-------------------------------- */
@@ -1842,6 +1856,10 @@ buf_pool_init_instance(
 	new(&buf_pool->flush_hp)
 		FlushHp(buf_pool, &buf_pool->flush_list_mutex);
 
+	/* Initialize the hazard pointer for the oldest page scan */
+	new (&buf_pool->oldest_hp)
+		FlushHp(buf_pool, &buf_pool->flush_list_mutex);
+
 	/* Initialize the hazard pointer for LRU batches */
 	new(&buf_pool->lru_hp) LRUHp(buf_pool, &buf_pool->mutex);
 
@@ -1944,8 +1962,6 @@ buf_pool_init(
 	NUMA_MEMPOLICY_INTERLEAVE_IN_SCOPE;
 
 	buf_pool_resizing = false;
-	buf_pool_withdrawing = false;
-	buf_withdraw_clock = 0;
 
 	buf_pool_ptr = (buf_pool_t*) ut_zalloc_nokey(
 		n_instances * sizeof *buf_pool_ptr);
@@ -2005,7 +2021,6 @@ buf_page_realloc(
 {
 	buf_block_t*	new_block;
 
-	ut_ad(buf_pool_withdrawing);
 	ut_ad(buf_pool_mutex_own(buf_pool));
 	ut_ad(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
 
@@ -2024,7 +2039,7 @@ buf_page_realloc(
 		mutex_enter(&new_block->mutex);
 
 		memcpy(new_block->frame, block->frame, UNIV_PAGE_SIZE);
-		memcpy(&new_block->page, &block->page, sizeof block->page);
+		new (&new_block->page) buf_page_t(block->page);
 
 		/* relocate LRU list */
 		ut_ad(block->page.in_LRU_list);
@@ -2427,7 +2442,6 @@ buf_pool_withdraw_blocks(
 		<< UT_LIST_GET_LEN(buf_pool->withdraw) << " blocks.";
 
 	/* retry is not needed */
-	++buf_withdraw_clock;
 	os_wmb;
 
 	return(false);
@@ -2442,8 +2456,6 @@ buf_pool_resize_hash(
 {
 	hash_table_t*	new_hash_table;
 
-	ut_ad(buf_pool->page_hash_old == NULL);
-
 	/* recreate page_hash */
 	new_hash_table = ib_recreate(
 		buf_pool->page_hash, 2 * buf_pool->curr_size);
@@ -2474,9 +2486,12 @@ buf_pool_resize_hash(
 				prev_bpage);
 		}
 	}
-
-	buf_pool->page_hash_old = buf_pool->page_hash;
-	buf_pool->page_hash = new_hash_table;
+        /* Concurrent threads may be accessing buf_pool->page_hash->n_cells,
+        n_sync_obj and try to latch sync_obj[i] while we are resizing. Therefore we
+        never deallocate page_hash, instead we overwrite n_cells (and other fields)
+        with the new values. The n_sync_obj and sync_obj are actually same in both. */
+        std::swap(*buf_pool->page_hash, *new_hash_table);
+        hash_table_free(new_hash_table);
 
 	/* recreate zip_hash */
 	new_hash_table = hash_create(2 * buf_pool->curr_size);
@@ -2513,7 +2528,7 @@ buf_pool_resize_hash(
 	buf_pool->zip_hash = new_hash_table;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /** This is a debug routine to inject an memory allocation failure error. */
 static
 void
@@ -2528,7 +2543,7 @@ buf_pool_resize_chunk_make_null(buf_chunk_t** new_chunks)
 
 	count++;
 }
-#endif // DBUG_OFF
+#endif // NDEBUG
 
 /** Resize the buffer pool based on srv_buf_pool_size from
 srv_buf_pool_old_size. */
@@ -2542,7 +2557,6 @@ buf_pool_resize()
 	NUMA_MEMPOLICY_INTERLEAVE_IN_SCOPE;
 
 	ut_ad(!buf_pool_resizing);
-	ut_ad(!buf_pool_withdrawing);
 	ut_ad(srv_buf_pool_chunk_unit > 0);
 
 	new_instance_size = srv_buf_pool_size / srv_buf_pool_instances;
@@ -2608,7 +2622,6 @@ buf_pool_resize()
 
 			ut_ad(buf_pool->withdraw_target == 0);
 			buf_pool->withdraw_target = withdraw_target;
-			buf_pool_withdrawing = true;
 		}
 	}
 
@@ -2633,7 +2646,6 @@ buf_pool_resize()
 
 	if (srv_shutdown_state != SRV_SHUTDOWN_NONE) {
 		/* abort to resize for shutdown. */
-		buf_pool_withdrawing = false;
 		return;
 	}
 
@@ -2694,11 +2706,9 @@ buf_pool_resize()
 		goto withdraw_retry;
 	}
 
-	buf_pool_withdrawing = false;
-
 	buf_resize_status("Latching whole of buffer pool.");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	{
 		bool	should_wait = true;
 
@@ -2709,7 +2719,7 @@ buf_pool_resize()
 				should_wait = true; os_thread_sleep(10000););
 		}
 	}
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 	if (srv_shutdown_state != SRV_SHUTDOWN_NONE) {
 		return;
@@ -2803,6 +2813,9 @@ buf_pool_resize()
 					= buf_pool->n_chunks;
 				warning = true;
 				buf_pool->chunks_old = NULL;
+				for (ulint j = 0; j < buf_pool->n_chunks_new; j++) {
+					buf_pool_register_chunk(&(buf_pool->chunks[j]));
+				}
 				goto calc_buf_pool_size;
 			}
 
@@ -2931,11 +2944,6 @@ buf_pool_resize()
 
 		hash_unlock_x_all(buf_pool->page_hash);
 		buf_pool_mutex_exit(buf_pool);
-
-		if (buf_pool->page_hash_old != NULL) {
-			hash_table_free(buf_pool->page_hash_old);
-			buf_pool->page_hash_old = NULL;
-		}
 	}
 
 	UT_DELETE(chunk_map_old);
@@ -3131,7 +3139,7 @@ buf_relocate(
 	}
 #endif /* UNIV_DEBUG */
 
-	memcpy(dpage, bpage, sizeof *dpage);
+	new (dpage) buf_page_t(*bpage);
 
 	/* Important that we adjust the hazard pointer before
 	removing bpage from LRU list. */
@@ -3204,6 +3212,21 @@ HazardPointer::is_hp(const buf_page_t* bpage)
 	return(bpage == m_hp);
 }
 
+/** Adjust the value of hp for moving. This happens when some other thread
+working on the same list attempts to relocate the hp of the page.
+@param bpage	buffer block to be compared
+@param dpage	buffer block to be moved to */
+void
+HazardPointer::move(const buf_page_t *bpage, buf_page_t *dpage)
+{
+	ut_ad(bpage != NULL);
+	ut_ad(dpage != NULL);
+
+	if (is_hp(bpage)) {
+		m_hp = dpage;
+	}
+}
+
 /** Adjust the value of hp. This happens when some other thread working
 on the same list attempts to remove the hp from the list.
 @param bpage	buffer block to be compared */
@@ -3898,17 +3921,8 @@ buf_block_from_ahi(const byte* ptr)
 	return(block);
 }
 
-/********************************************************************//**
-Find out if a pointer belongs to a buf_block_t. It can be a pointer to
-the buf_block_t itself or a member of it. This functions checks one of
-the buffer pool instances.
-@return TRUE if ptr belongs to a buf_block_t struct */
-static
-ibool
-buf_pointer_is_block_field_instance(
-/*================================*/
-	buf_pool_t*	buf_pool,	/*!< in: buffer pool instance */
-	const void*	ptr)		/*!< in: pointer not dereferenced */
+ibool buf_pointer_is_block_field_instance(
+	const buf_pool_t* buf_pool, const void* ptr)
 {
 	const buf_chunk_t*		chunk	= buf_pool->chunks;
 	const buf_chunk_t* const	echunk	= chunk + ut_min(
@@ -3929,49 +3943,6 @@ buf_pointer_is_block_field_instance(
 	return(FALSE);
 }
 
-/********************************************************************//**
-Find out if a pointer belongs to a buf_block_t. It can be a pointer to
-the buf_block_t itself or a member of it
-@return TRUE if ptr belongs to a buf_block_t struct */
-ibool
-buf_pointer_is_block_field(
-/*=======================*/
-	const void*	ptr)	/*!< in: pointer not dereferenced */
-{
-	ulint	i;
-
-	for (i = 0; i < srv_buf_pool_instances; i++) {
-		ibool	found;
-
-		found = buf_pointer_is_block_field_instance(
-			buf_pool_from_array(i), ptr);
-		if (found) {
-			return(TRUE);
-		}
-	}
-
-	return(FALSE);
-}
-
-/********************************************************************//**
-Find out if a buffer block was created by buf_chunk_init().
-@return TRUE if "block" has been added to buf_pool->free by buf_chunk_init() */
-static
-ibool
-buf_block_is_uncompressed(
-/*======================*/
-	buf_pool_t*		buf_pool,	/*!< in: buffer pool instance */
-	const buf_block_t*	block)		/*!< in: pointer to block,
-						not dereferenced */
-{
-	if ((((ulint) block) % sizeof *block) != 0) {
-		/* The pointer should be aligned. */
-		return(FALSE);
-	}
-
-	return(buf_pointer_is_block_field_instance(buf_pool, (void*) block));
-}
-
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 /********************************************************************//**
 Return true if probe is enabled.
@@ -4113,9 +4084,14 @@ buf_page_get_gen(
 
 		/* If the guess is a compressed page descriptor that
 		has been allocated by buf_page_alloc_descriptor(),
-		it may have been freed by buf_relocate(). */
+		it may have been freed by buf_relocate().
+		Also, the buffer pool could get resized and m_guess's chunk could
+		get freed, so we need to check the `block` pointer is still within one
+		of the chunks before dereferencing it to verify it still contains the
+		same m_page_id */
+
 
-		if (!buf_block_is_uncompressed(buf_pool, block)
+		if (!buf_pointer_is_block_field_instance(buf_pool, block)
 		    || !page_id.equals_to(block->page.id)
 		    || buf_block_get_state(block) != BUF_BLOCK_FILE_PAGE) {
 
@@ -6242,7 +6218,7 @@ buf_pool_validate_instance(
 
 	buf_pool_mutex_exit(buf_pool);
 
-	ut_a(buf_LRU_validate());
+	buf_LRU_validate_instance(buf_pool);
 	ut_a(buf_flush_validate(buf_pool));
 
 	return(TRUE);
@@ -6883,7 +6859,7 @@ buf_refresh_io_stats(
 /*=================*/
 	buf_pool_t*	buf_pool)	/*!< in: buffer pool instance */
 {
-	buf_pool->last_printout_time = ut_time();
+	buf_pool->last_printout_time = ut_time_monotonic();
 	buf_pool->old_stat = buf_pool->stat;
 }
 
diff --git a/storage/innobase/buf/buf0checksum.cc b/storage/innobase/buf/buf0checksum.cc
index a88497a76ebb..7be825229ad8 100644
--- a/storage/innobase/buf/buf0checksum.cc
+++ b/storage/innobase/buf/buf0checksum.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
index 3291f2c5062d..71f1bb93aa8e 100644
--- a/storage/innobase/buf/buf0dblwr.cc
+++ b/storage/innobase/buf/buf0dblwr.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc
index 8606e0fe1fae..c8302e1cf774 100644
--- a/storage/innobase/buf/buf0dump.cc
+++ b/storage/innobase/buf/buf0dump.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -266,7 +274,7 @@ buf_dump(
 #define SHOULD_QUIT()	(SHUTTING_DOWN() && obey_shutdown)
 
 	char	full_filename[OS_FILE_MAX_PATH];
-	char	tmp_filename[OS_FILE_MAX_PATH];
+	char	tmp_filename[OS_FILE_MAX_PATH + 11];
 	char	now[32];
 	FILE*	f;
 	ulint	i;
@@ -415,28 +423,30 @@ buf_dump(
 			"Buffer pool(s) dump completed at %s", now);
 }
 
-/*****************************************************************//**
-Artificially delay the buffer pool loading if necessary. The idea of
-this function is to prevent hogging the server with IO and slowing down
-too much normal client queries. */
+/** Artificially delay the buffer pool loading if necessary. The idea of this
+function is to prevent hogging the server with IO and slowing down too much
+normal client queries.
+@param[in,out]	last_check_time		milliseconds since epoch of the last
+                                        time we did check if throttling is
+                                        needed, we do the check every
+                                        srv_io_capacity IO ops.
+@param[in]	last_activity_count	activity count
+@param[in]	n_io			number of IO ops done since buffer
+                                        pool load has started */
 UNIV_INLINE
 void
 buf_load_throttle_if_needed(
 /*========================*/
-	ulint*	last_check_time,	/*!< in/out: milliseconds since epoch
-					of the last time we did check if
-					throttling is needed, we do the check
-					every srv_io_capacity IO ops. */
-	ulint*	last_activity_count,
-	ulint	n_io)			/*!< in: number of IO ops done since
-					buffer pool load has started */
+	ib_time_monotonic_ms_t*	last_check_time,
+	ulint*			last_activity_count,
+	ulint 			n_io)
 {
 	if (n_io % srv_io_capacity < srv_io_capacity - 1) {
 		return;
 	}
 
 	if (*last_check_time == 0 || *last_activity_count == 0) {
-		*last_check_time = ut_time_ms();
+		*last_check_time = ut_time_monotonic_ms();
 		*last_activity_count = srv_get_activity_count();
 		return;
 	}
@@ -451,7 +461,7 @@ buf_load_throttle_if_needed(
 
 	/* There has been other activity, throttle. */
 
-	ulint	now = ut_time_ms();
+	ib_time_monotonic_ms_t	now = ut_time_monotonic_ms();
 	ulint	elapsed_time = now - *last_check_time;
 
 	/* Notice that elapsed_time is not the time for the last
@@ -471,13 +481,13 @@ buf_load_throttle_if_needed(
 	The deficiency is that we could have slept at 3., but for this we
 	would have to update last_check_time before the
 	"cur_activity_count == *last_activity_count" check and calling
-	ut_time_ms() that often may turn out to be too expensive. */
+	ut_time_monotonic_ms() that often may turn out to be too expensive. */
 
 	if (elapsed_time < 1000 /* 1 sec (1000 milli secs) */) {
 		os_thread_sleep((1000 - elapsed_time) * 1000 /* micro secs */);
 	}
 
-	*last_check_time = ut_time_ms();
+	*last_check_time = ut_time_monotonic_ms();
 	*last_activity_count = srv_get_activity_count();
 }
 
@@ -632,7 +642,7 @@ buf_load()
 		std::sort(dump, dump + dump_n);
 	}
 
-	ulint		last_check_time = 0;
+	ib_time_monotonic_ms_t		last_check_time = 0;
 	ulint		last_activity_cnt = 0;
 
 	/* Avoid calling the expensive fil_space_acquire_silent() for each
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 5a8a3567e0fc..726e5b4f54d7 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -132,9 +140,9 @@ struct page_cleaner_slot_t {
 	bool			succeeded_list;
 					/*!< true if flush_list flushing
 					succeeded. */
-	ulint			flush_lru_time;
+	uint64_t		flush_lru_time;
 					/*!< elapsed time for LRU flushing */
-	ulint			flush_list_time;
+	uint64_t		flush_list_time;
 					/*!< elapsed time for flush_list
 					flushing */
 	ulint			flush_lru_pass;
@@ -172,7 +180,7 @@ struct page_cleaner_t {
 						/*!< number of slots
 						in the state
 						PAGE_CLEANER_STATE_FINISHED */
-	ulint			flush_time;	/*!< elapsed time to flush
+	uint64_t		flush_time;	/*!< elapsed time to flush
 						requests for all slots */
 	ulint			flush_pass;	/*!< count to finish to flush
 						requests for all slots */
@@ -553,6 +561,11 @@ buf_flush_insert_sorted_into_flush_list(
 		UT_LIST_INSERT_AFTER(buf_pool->flush_list, prev_b, &block->page);
 	}
 
+	if (buf_pool->oldest_hp.get() != NULL) {
+		/* clear oldest_hp */
+		buf_pool->oldest_hp.set(NULL);
+	}
+
 	incr_flush_list_size_in_bytes(block, buf_pool);
 
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
@@ -650,6 +663,7 @@ buf_flush_remove(
 	/* Important that we adjust the hazard pointer before removing
 	the bpage from flush list. */
 	buf_pool->flush_hp.adjust(bpage);
+	buf_pool->oldest_hp.adjust(bpage);
 
 	switch (buf_page_get_state(bpage)) {
 	case BUF_BLOCK_POOL_WATCH:
@@ -749,7 +763,8 @@ buf_flush_relocate_on_flush_list(
 
 	/* Important that we adjust the hazard pointer before removing
 	the bpage from the flush list. */
-	buf_pool->flush_hp.adjust(bpage);
+	buf_pool->flush_hp.move(bpage, dpage);
+	buf_pool->oldest_hp.move(bpage, dpage);
 
 	/* Must be done after we have removed it from the flush_rbt
 	because we assert on in_flush_list in comparison function. */
@@ -2440,7 +2455,7 @@ page_cleaner_flush_pages_recommendation(
 	static	ulint		sum_pages = 0;
 	static	ulint		avg_page_rate = 0;
 	static	ulint		n_iterations = 0;
-	static	time_t		prev_time;
+	static	ib_time_monotonic_t		prev_time;
 	lsn_t			oldest_lsn;
 	lsn_t			cur_lsn;
 	lsn_t			age;
@@ -2455,7 +2470,7 @@ page_cleaner_flush_pages_recommendation(
 	if (prev_lsn == 0) {
 		/* First time around. */
 		prev_lsn = cur_lsn;
-		prev_time = ut_time();
+		prev_time = ut_time_monotonic();
 		return(0);
 	}
 
@@ -2465,13 +2480,14 @@ page_cleaner_flush_pages_recommendation(
 
 	sum_pages += last_pages_in;
 
-	time_t	curr_time = ut_time();
-	double	time_elapsed = difftime(curr_time, prev_time);
+	ib_time_monotonic_t	curr_time    = ut_time_monotonic();
+	uint64_t	        time_elapsed = curr_time - prev_time;
+	const ulong             avg_loop     = srv_flushing_avg_loops;
 
 	/* We update our variables every srv_flushing_avg_loops
 	iterations to smooth out transition in workload. */
-	if (++n_iterations >= srv_flushing_avg_loops
-	    || time_elapsed >= srv_flushing_avg_loops) {
+	if (++n_iterations >= avg_loop
+	    || time_elapsed >= (uint64_t)avg_loop) {
 
 		if (time_elapsed < 1) {
 			time_elapsed = 1;
@@ -2493,14 +2509,14 @@ page_cleaner_flush_pages_recommendation(
 		/* aggregate stats of all slots */
 		mutex_enter(&page_cleaner->mutex);
 
-		ulint	flush_tm = page_cleaner->flush_time;
+		uint64_t  flush_tm = page_cleaner->flush_time;
 		ulint	flush_pass = page_cleaner->flush_pass;
 
 		page_cleaner->flush_time = 0;
 		page_cleaner->flush_pass = 0;
 
-		ulint	lru_tm = 0;
-		ulint	list_tm = 0;
+		uint64_t lru_tm = 0;
+		uint64_t list_tm = 0;
 		ulint	lru_pass = 0;
 		ulint	list_pass = 0;
 
@@ -2590,6 +2606,15 @@ page_cleaner_flush_pages_recommendation(
 	lsn_t	target_lsn = oldest_lsn
 			     + lsn_avg_rate * buf_flush_lsn_scan_factor;
 
+	/* Cap the maximum IO capacity that we are going to use by
+	max_io_capacity. Limit the value to avoid too quick increase */
+	const ulint	sum_pages_max = srv_max_io_capacity * 2;
+
+	/* Limit individual BP scan based on overall capacity. */
+	const ulint	pages_for_lsn_max =
+		(sum_pages_max / srv_buf_pool_instances) *
+		buf_flush_lsn_scan_factor * 2;
+
 	for (ulint i = 0; i < srv_buf_pool_instances; i++) {
 		buf_pool_t*	buf_pool = buf_pool_from_array(i);
 		ulint		pages_for_lsn = 0;
@@ -2602,6 +2627,9 @@ page_cleaner_flush_pages_recommendation(
 				break;
 			}
 			++pages_for_lsn;
+			if (pages_for_lsn >= pages_for_lsn_max) {
+				break;
+			}
 		}
 		buf_flush_list_mutex_exit(buf_pool);
 
@@ -2623,7 +2651,7 @@ page_cleaner_flush_pages_recommendation(
 	/* Cap the maximum IO capacity that we are going to use by
 	max_io_capacity. Limit the value to avoid too quick increase */
 	ulint	pages_for_lsn =
-		std::min<ulint>(sum_pages_for_lsn, srv_max_io_capacity * 2);
+		std::min<ulint>(sum_pages_for_lsn, sum_pages_max);
 
 	n_pages = (PCT_IO(pct_total) + avg_page_rate + pages_for_lsn) / 3;
 
@@ -2673,18 +2701,19 @@ static
 ulint
 pc_sleep_if_needed(
 /*===============*/
-	ulint		next_loop_time,
+	ib_time_monotonic_ms_t		next_loop_time,
 	int64_t		sig_count)
 {
-	ulint	cur_time = ut_time_ms();
+	ib_time_monotonic_ms_t	cur_time = ut_time_monotonic_ms();
 
 	if (next_loop_time > cur_time) {
 		/* Get sleep interval in micro seconds. We use
 		ut_min() to avoid long sleep in case of wrap around. */
-		ulint	sleep_us;
+		int64_t sleep_us;
 
-		sleep_us = ut_min(static_cast<ulint>(1000000),
-				  (next_loop_time - cur_time) * 1000);
+		sleep_us = ut_min(int64_t(1000000),
+			         (next_loop_time - cur_time) * int64_t(1000));
+		ut_a(sleep_us > 0);
 
 		return(os_event_wait_time_low(buf_flush_event,
 					      sleep_us, sig_count));
@@ -2808,8 +2837,8 @@ static
 ulint
 pc_flush_slot(void)
 {
-	ulint	lru_tm = 0;
-	ulint	list_tm = 0;
+	ib_time_monotonic_ms_t	lru_tm = 0;
+	ib_time_monotonic_ms_t	list_tm = 0;
 	int	lru_pass = 0;
 	int	list_pass = 0;
 
@@ -2849,12 +2878,12 @@ pc_flush_slot(void)
 
 		mutex_exit(&page_cleaner->mutex);
 
-		lru_tm = ut_time_ms();
+		lru_tm = ut_time_monotonic_ms();
 
 		/* Flush pages from end of LRU if required */
 		slot->n_flushed_lru = buf_flush_LRU_list(buf_pool);
 
-		lru_tm = ut_time_ms() - lru_tm;
+		lru_tm = ut_time_monotonic_ms() - lru_tm;
 		lru_pass++;
 
 		if (!page_cleaner->is_running) {
@@ -2865,7 +2894,7 @@ pc_flush_slot(void)
 		/* Flush pages from flush_list if required */
 		if (page_cleaner->requested) {
 
-			list_tm = ut_time_ms();
+			list_tm = ut_time_monotonic_ms();
 
 			slot->succeeded_list = buf_flush_do_batch(
 				buf_pool, BUF_FLUSH_LIST,
@@ -2873,7 +2902,7 @@ pc_flush_slot(void)
 				page_cleaner->lsn_limit,
 				&slot->n_flushed_list);
 
-			list_tm = ut_time_ms() - list_tm;
+			list_tm = ut_time_monotonic_ms() - list_tm;
 			list_pass++;
 		} else {
 			slot->n_flushed_list = 0;
@@ -3097,7 +3126,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 			/*!< in: a dummy parameter required by
 			os_thread_create */
 {
-	ulint	next_loop_time = ut_time_ms() + 1000;
+	ib_time_monotonic_t	next_loop_time = ut_time_monotonic_ms() + 1000;
 	ulint	n_flushed = 0;
 	ulint	last_activity = srv_get_activity_count();
 	ulint	last_pages = 0;
@@ -3193,7 +3222,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 			if (srv_shutdown_state != SRV_SHUTDOWN_NONE) {
 				break;
 			}
-		} else if (ut_time_ms() > next_loop_time) {
+		} else if (ut_time_monotonic_ms() > next_loop_time) {
 			ret_sleep = OS_SYNC_TIME_EXCEEDED;
 		} else {
 			ret_sleep = 0;
@@ -3202,7 +3231,8 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 		sig_count = os_event_reset(buf_flush_event);
 
 		if (ret_sleep == OS_SYNC_TIME_EXCEEDED) {
-			ulint	curr_time = ut_time_ms();
+			ib_time_monotonic_ms_t curr_time =
+						ut_time_monotonic_ms();
 
 			if (curr_time > next_loop_time + 3000) {
 				if (warn_count == 0) {
@@ -3248,14 +3278,14 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 			/* Request flushing for threads */
 			pc_request(ULINT_MAX, lsn_limit);
 
-			ulint tm = ut_time_ms();
+			ib_time_monotonic_ms_t tm = ut_time_monotonic_ms();
 
 			/* Coordinator also treats requests */
 			while (pc_flush_slot() > 0) {}
 
 			/* only coordinator is using these counters,
 			so no need to protect by lock. */
-			page_cleaner->flush_time += ut_time_ms() - tm;
+			page_cleaner->flush_time += ut_time_monotonic_ms() - tm;
 			page_cleaner->flush_pass++;
 
 			/* Wait for all slots to be finished */
@@ -3292,7 +3322,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 			/* Request flushing for threads */
 			pc_request(n_to_flush, lsn_limit);
 
-			ulint tm = ut_time_ms();
+			ib_time_monotonic_ms_t tm = ut_time_monotonic_ms();
 
 			/* Coordinator also treats requests */
 			while (pc_flush_slot() > 0) {
@@ -3301,7 +3331,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 
 			/* only coordinator is using these counters,
 			so no need to protect by lock. */
-			page_cleaner->flush_time += ut_time_ms() - tm;
+			page_cleaner->flush_time += ut_time_monotonic_ms() - tm;
 			page_cleaner->flush_pass++ ;
 
 			/* Wait for all slots to be finished */
@@ -3416,8 +3446,19 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 	buf_flush_wait_LRU_batch_end();
 
 	bool	success;
+	bool	are_any_read_ios_still_underway;
 
 	do {
+		/* If there are any read operations pending, they can result in the ibuf
+		merges and a dirtying page after the read is completed. If there are any
+		IO reads running before we run the flush loop, we risk having some dirty
+		pages after flushing reports n_flushed == 0. The ibuf change merging on
+		page results in dirtying the page and is followed by decreasing the
+		n_pend_reads counter, thus it's safe to check it before flush loop and
+		have guarantees if it was seen with value of 0. These reads could be issued
+		in the previous stage(s), the srv_master thread on shutdown tasks clear the
+		ibuf unless it's the fast shutdown. */
+		are_any_read_ios_still_underway = buf_get_n_pending_read_ios() > 0;
 		pc_request(ULINT_MAX, LSN_MAX);
 
 		while (pc_flush_slot() > 0) {}
@@ -3431,7 +3472,7 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(
 		buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
 		buf_flush_wait_LRU_batch_end();
 
-	} while (!success || n_flushed > 0);
+	} while (!success || n_flushed > 0 || are_any_read_ios_still_underway);
 
 	/* Some sanity checks */
 	ut_a(srv_get_active_thread_type() == SRV_NONE);
diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc
index a78112746f5c..b866bd929bad 100644
--- a/storage/innobase/buf/buf0lru.cc
+++ b/storage/innobase/buf/buf0lru.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -636,13 +644,13 @@ buf_flush_or_remove_pages(
 			processed = 0;
 		}
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 		if (flush) {
 			DBUG_EXECUTE_IF("ib_export_flush_crash",
 					static ulint	n_pages;
 					if (++n_pages == 4) {DBUG_SUICIDE();});
 		}
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 		/* The check for trx is interrupted is expensive, we want
 		to check every N iterations. */
@@ -1906,7 +1914,7 @@ buf_LRU_free_page(
 	} else if (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE) {
 		b = buf_page_alloc_descriptor();
 		ut_a(b);
-		memcpy(b, bpage, sizeof *b);
+                new (b) buf_page_t(*bpage);
 	}
 
 	ut_ad(buf_pool_mutex_own(buf_pool));
@@ -2592,7 +2600,6 @@ buf_LRU_stat_update(void)
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
 /**********************************************************************//**
 Validates the LRU list for one buffer pool instance. */
-static
 void
 buf_LRU_validate_instance(
 /*======================*/
diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc
index 1f8c46c432e0..5c7ea179e0c4 100644
--- a/storage/innobase/buf/buf0rea.cc
+++ b/storage/innobase/buf/buf0rea.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/compile-innodb b/storage/innobase/compile-innodb
index fa791282b289..ef81f01f3f7d 100755
--- a/storage/innobase/compile-innodb
+++ b/storage/innobase/compile-innodb
@@ -1,14 +1,22 @@
 #!/bin/sh
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc
index 4b788c8952c4..84cc9c758a3d 100644
--- a/storage/innobase/data/data0data.cc
+++ b/storage/innobase/data/data0data.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc
index 581d521a9280..a9b348e28600 100644
--- a/storage/innobase/data/data0type.cc
+++ b/storage/innobase/data/data0type.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc
index 5c07d05f7472..af8004a9b870 100644
--- a/storage/innobase/dict/dict0boot.cc
+++ b/storage/innobase/dict/dict0boot.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc
index 63e44366fe15..b4f8142de5ea 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -2245,6 +2253,13 @@ dict_foreign_base_for_stored(
 		dict_s_col_t	s_col = *it;
 
 		for (ulint j = 0; j < s_col.num_base; j++) {
+			/** If the stored column can refer to virtual column
+			or another stored column then it can points to NULL. */
+
+			if (s_col.base_col[j] == NULL) {
+				continue;
+			}
+
 			if (strcmp(col_name, dict_table_get_col_name(
 						table,
 						s_col.base_col[j]->ind)) == 0) {
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index 6dec1efd547a..8cab430326a6 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -84,6 +92,9 @@ ib_warn_row_too_big(const dict_table_t*	table);
 #include "sync0sync.h"
 #include "trx0undo.h"
 #include "ut0new.h"
+#ifdef UNIV_DEBUG
+#include "trx0purge.h"
+#endif /* !UNIV_DEBUG */
 
 #include <vector>
 #include <algorithm>
@@ -914,6 +925,43 @@ dict_table_autoinc_unlock(
 {
 	mutex_exit(table->autoinc_mutex);
 }
+
+/** Create and initialize the analyze index lock for a given table.
+This lock is used to serialize two concurrent analyze index operations
+@param[in]	table_void	table whose analyze_index latch to create */
+static
+void
+dict_table_analyze_index_alloc(
+	void*	table_void)
+{
+	dict_table_t*	table = static_cast<dict_table_t*>(table_void);
+	table->analyze_index_mutex = UT_NEW_NOKEY(AnalyzeIndexMutex());
+	ut_a(table->analyze_index_mutex != NULL);
+	mutex_create(LATCH_ID_ANALYZE_INDEX_MUTEX, table->analyze_index_mutex);
+}
+
+/** Acquire the analyze index lock.
+@param[in]	table table whose analyze_index latch to lock */
+void
+dict_table_analyze_index_lock(
+	dict_table_t*	table)
+{
+	os_once::do_or_wait_for_done(
+		&table->analyze_index_mutex_created,
+		dict_table_analyze_index_alloc, table);
+
+	mutex_enter(table->analyze_index_mutex);
+}
+
+/** Release the analyze index lock.
+@param[in]	table table whose analyze_index latch to unlock */
+void
+dict_table_analyze_index_unlock(
+	dict_table_t*	table)
+{
+	ut_a(table->analyze_index_mutex != NULL);
+	mutex_exit(table->analyze_index_mutex);
+}
 #endif /* !UNIV_HOTBACKUP */
 
 /** Looks for column n in an index.
@@ -1559,6 +1607,13 @@ dict_make_room_in_cache(
 
 		if (dict_table_can_be_evicted(table)) {
 
+			DBUG_EXECUTE_IF("crash_if_fts_table_is_evicted",
+			{
+				  if (table->fts &&
+				      dict_table_has_fts_index(table)) {
+					ut_ad(0);
+				  }
+			};);
 			dict_table_remove_from_cache_low(table, TRUE);
 
 			++n_evicted;
@@ -1920,7 +1975,7 @@ dict_table_rename_in_cache(
 
 			ulint	db_len;
 			char*	old_id;
-			char    old_name_cs_filename[MAX_TABLE_NAME_LEN+20];
+			char    old_name_cs_filename[MAX_FULL_NAME_LEN + 1];
 			uint    errors = 0;
 
 			/* All table names are internally stored in charset
@@ -1937,7 +1992,7 @@ dict_table_rename_in_cache(
 			in old_name_cs_filename */
 
 			strncpy(old_name_cs_filename, old_name,
-				MAX_TABLE_NAME_LEN);
+				sizeof(old_name_cs_filename));
 			if (strstr(old_name, TEMP_TABLE_PATH_PREFIX) == NULL) {
 
 				innobase_convert_to_system_charset(
@@ -1959,7 +2014,7 @@ dict_table_rename_in_cache(
 					/* Old name already in
 					my_charset_filename */
 					strncpy(old_name_cs_filename, old_name,
-						MAX_TABLE_NAME_LEN);
+						sizeof(old_name_cs_filename));
 				}
 			}
 
@@ -1985,7 +2040,7 @@ dict_table_rename_in_cache(
 
 				/* This is a generated >= 4.0.18 format id */
 
-				char	table_name[MAX_TABLE_NAME_LEN] = "";
+				char	table_name[MAX_TABLE_NAME_LEN + 1] = "";
 				uint	errors = 0;
 
 				if (strlen(table->name.m_name)
@@ -2292,7 +2347,6 @@ dict_index_node_ptr_max_size(
 	}
 
 	comp = dict_table_is_comp(index->table);
-
 	/* Each record has page_no, length of page_no and header. */
 	rec_max_size = comp
 		? REC_NODE_PTR_SIZE + 1 + REC_N_NEW_EXTRA_BYTES
@@ -2331,6 +2385,14 @@ dict_index_node_ptr_max_size(
 		}
 
 		field_max_size = dict_col_get_max_size(col);
+		/* A varchar(0) case when the max size of field
+		can't be estimated accurately */
+		if (field_max_size == 0) {
+			ulint page_rec_max = srv_page_size == UNIV_PAGE_SIZE_MAX
+				? REC_MAX_DATA_SIZE - 1
+			: page_get_free_space_of_empty(comp) / 2;
+			rec_max_size += page_rec_max;
+		}
 		field_ext_max_size = field_max_size < 256 ? 1 : 2;
 
 		if (field->prefix_len
@@ -2548,6 +2610,44 @@ dict_index_add_to_cache(
 		table, index, NULL, page_no, strict));
 }
 
+/** Clears the virtual column's index list before index is
+being freed.
+@param[in]  index   Index being freed */
+void
+dict_index_remove_from_v_col_list(dict_index_t* index) {
+	/* Index is not completely formed */
+	if (!index->cached) {
+		return;
+	}
+        if (dict_index_has_virtual(index)) {
+                const dict_col_t*       col;
+                const dict_v_col_t*     vcol;
+
+                for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
+                        col =  dict_index_get_nth_col(index, i);
+                        if (dict_col_is_virtual(col)) {
+                                vcol = reinterpret_cast<const dict_v_col_t*>(
+                                        col);
+				/* This could be NULL, when we do add
+                                virtual column, add index together. We do not
+                                need to track this virtual column's index */
+				if (vcol->v_indexes == NULL) {
+                                        continue;
+                                }
+				dict_v_idx_list::iterator       it;
+				for (it = vcol->v_indexes->begin();
+                                     it != vcol->v_indexes->end(); ++it) {
+                                        dict_v_idx_t    v_index = *it;
+                                        if (v_index.index == index) {
+                                                vcol->v_indexes->erase(it);
+                                                break;
+                                        }
+				}
+			}
+		}
+	}
+}
+
 /** Adds an index to the dictionary cache, with possible indexing newly
 added column.
 @param[in,out]	table	table on which the index is
@@ -3495,23 +3595,6 @@ dict_index_build_internal_fts(
 }
 /*====================== FOREIGN KEY PROCESSING ========================*/
 
-/** Check whether the dict_table_t is a partition.
-A partitioned table on the SQL level is composed of InnoDB tables,
-where each InnoDB table is a [sub]partition including its secondary indexes
-which belongs to the partition.
-@param[in]	table	Table to check.
-@return true if the dict_table_t is a partition else false. */
-UNIV_INLINE
-bool
-dict_table_is_partition(
-	const dict_table_t*	table)
-{
-	/* Check both P and p on all platforms in case it was moved to/from
-	WIN. */
-	return(strstr(table->name.m_name, "#p#")
-	       || strstr(table->name.m_name, "#P#"));
-}
-
 /*********************************************************************//**
 Checks if a table is referenced by foreign keys.
 @return TRUE if table is referenced by a foreign key */
@@ -3614,6 +3697,11 @@ dict_foreign_find_index(
 		    && !(index->type & DICT_FTS)
 		    && !dict_index_is_spatial(index)
 		    && !index->to_be_dropped
+		    && (!(index->uncommitted
+			&& ((index->online_status
+			     ==  ONLINE_INDEX_ABORTED_DROPPED)
+			     || (index->online_status
+				== ONLINE_INDEX_ABORTED))))
 		    && dict_foreign_qualify_index(
 			    table, col_names, columns, n_cols,
 			    index, types_idx,
@@ -6297,9 +6385,20 @@ dict_table_schema_check(
 		/* check length for exact match */
 		if (req_schema->columns[i].len != table->cols[j].len) {
 
-			CREATE_TYPES_NAMES();
+			if(!strcmp(req_schema->table_name, TABLE_STATS_NAME)
+			   || !strcmp(req_schema->table_name, INDEX_STATS_NAME)) {
+				ut_ad(table->cols[j].len <
+					req_schema->columns[i].len);
+				ib::warn() << "Table " << req_schema->table_name
+					   << " has length mismatch in the"
+					   << " column name "
+					   << req_schema->columns[i].name
+					   << ".  Please run mysql_upgrade";
+			} else {
 
-			ut_snprintf(errstr, errstr_sz,
+				CREATE_TYPES_NAMES();
+
+				ut_snprintf(errstr, errstr_sz,
 				    "Column %s in table %s is %s"
 				    " but should be %s (length mismatch).",
 				    req_schema->columns[i].name,
@@ -6307,7 +6406,8 @@ dict_table_schema_check(
 						   buf, sizeof(buf)),
 				    actual_type, req_type);
 
-			return(DB_ERROR);
+				return(DB_ERROR);
+			}
 		}
 
 		/* check mtype for exact match */
@@ -6659,6 +6759,11 @@ dict_foreign_qualify_index(
 		return(false);
 	}
 
+	if (index->type & DICT_SPATIAL) {
+		/* Spatial index cannot be used as foreign keys */
+		return(false);
+	}
+
 	for (ulint i = 0; i < n_cols; i++) {
 		dict_field_t*	field;
 		const char*	col_name;
@@ -7064,3 +7169,39 @@ dict_table_extent_size(
 
 	return(pages_in_extent);
 }
+
+/** @return number of base columns of virtual column in foreign key column
+@param[in]      vcol    in-memory virtual column
+@param[in]      foreign in-memory Foreign key constraint */
+uint32_t dict_vcol_base_is_foreign_key(dict_v_col_t *vcol,
+                                   dict_foreign_t *foreign) {
+
+	const dict_table_t *table = foreign->foreign_table;
+	uint32_t foreign_col_count = 0;
+
+	for (uint32_t i = 0; i < foreign->n_fields; i++) {
+		const char *foreign_col_name = foreign->foreign_col_names[i];
+		for (uint32_t j = 0; j < vcol->num_base; j++) {
+			if (innobase_strcasecmp(foreign_col_name,
+			    dict_table_get_col_name(table,
+			    vcol->base_col[j]->ind)) == 0) {
+				foreign_col_count++;
+			}
+		}
+	}
+	return foreign_col_count;
+}
+
+#ifndef UNIV_HOTBACKUP
+#ifdef UNIV_DEBUG
+/** Validate no active background threads to cause purge or rollback
+operations. */
+void
+dict_validate_no_purge_rollback_threads() {
+	/* No concurrent background threads to access to the table */
+	ut_ad(trx_purge_state() == PURGE_STATE_STOP
+	      || trx_purge_state() == PURGE_STATE_DISABLED);
+	ut_ad(!trx_rollback_or_clean_is_active);
+}
+#endif /* UNIV_DEBUG */
+#endif /* !UNIV_HOTBACKUP */
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index 96a30a7ed4f3..b3d37d153293 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc
index 863cf6da5c5b..29ea9fa514e6 100644
--- a/storage/innobase/dict/dict0mem.cc
+++ b/storage/innobase/dict/dict0mem.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -150,6 +158,8 @@ dict_mem_table_create(
 	/* lazy creation of table autoinc latch */
 	dict_table_autoinc_create_lazy(table);
 
+	dict_table_analyze_index_create_lazy(table);
+
 	table->autoinc = 0;
 	table->sess_row_id = 0;
 	table->sess_trx_id = 0;
@@ -201,6 +211,7 @@ dict_mem_table_free(
 		}
 	}
 #ifndef UNIV_HOTBACKUP
+	dict_table_analyze_index_destroy(table);
 	dict_table_autoinc_destroy(table);
 #endif /* UNIV_HOTBACKUP */
 
@@ -227,6 +238,7 @@ dict_mem_table_free(
 	}
 
 	mem_heap_free(table->heap);
+        table = NULL;
 }
 
 /****************************************************************//**
@@ -1023,6 +1035,7 @@ dict_mem_index_free(
 		UT_DELETE(index->rtr_track->rtr_active);
 	}
 
+	dict_index_remove_from_v_col_list(index);
 	mem_heap_free(index->heap);
 }
 
diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index 5a9f34624c55..b8e97f46a938 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2009, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -183,7 +191,7 @@ dict_stats_persistent_storage_check(
 			DATA_NOT_NULL, 192},
 
 		{"table_name", DATA_VARMYSQL,
-			DATA_NOT_NULL, 192},
+			DATA_NOT_NULL, 597},
 
 		{"last_update", DATA_FIXBINARY,
 			DATA_NOT_NULL, 4},
@@ -211,7 +219,7 @@ dict_stats_persistent_storage_check(
 			DATA_NOT_NULL, 192},
 
 		{"table_name", DATA_VARMYSQL,
-			DATA_NOT_NULL, 192},
+			DATA_NOT_NULL, 597},
 
 		{"index_name", DATA_VARMYSQL,
 			DATA_NOT_NULL, 192},
@@ -877,6 +885,8 @@ dict_stats_update_transient(
 	dict_index_t*	index;
 	ulint		sum_of_index_sizes	= 0;
 
+	dict_table_analyze_index_lock(table);
+
 	/* Find out the sizes of the indexes and how many different values
 	for the key they approximately have */
 
@@ -885,6 +895,7 @@ dict_stats_update_transient(
 	if (dict_table_is_discarded(table)) {
 		/* Nothing to do. */
 		dict_stats_empty_table(table);
+		dict_table_analyze_index_unlock(table);
 		return;
 	} else if (index == NULL) {
 		/* Table definition is corrupt */
@@ -892,6 +903,7 @@ dict_stats_update_transient(
 		ib::warn() << "Table " << table->name
 			<< " has no indexes. Cannot calculate statistics.";
 		dict_stats_empty_table(table);
+		dict_table_analyze_index_unlock(table);
 		return;
 	}
 
@@ -914,6 +926,8 @@ dict_stats_update_transient(
 		sum_of_index_sizes += index->stat_index_size;
 	}
 
+	dict_table_stats_lock(table, RW_X_LATCH);
+
 	index = dict_table_get_first_index(table);
 
 	table->stat_n_rows = index->stat_n_diff_key_vals[
@@ -924,11 +938,16 @@ dict_stats_update_transient(
 	table->stat_sum_of_other_index_sizes = sum_of_index_sizes
 		- index->stat_index_size;
 
-	table->stats_last_recalc = ut_time();
+	table->stats_last_recalc = ut_time_monotonic();
 
 	table->stat_modified_counter = 0;
 
 	table->stat_initialized = TRUE;
+
+	dict_table_stats_unlock(table, RW_X_LATCH);
+
+	dict_table_analyze_index_unlock(table);
+
 }
 
 /* @{ Pseudo code about the relation between the following functions
@@ -1131,7 +1150,8 @@ dict_stats_analyze_index_level(
 					       rec_offsets,
 					       prev_rec_offsets,
 					       index,
-					       FALSE,
+					       false,
+					       false,
 					       &matched_fields);
 
 			for (i = matched_fields; i < n_uniq; i++) {
@@ -1371,7 +1391,7 @@ dict_stats_scan_page(
 		the first n_prefix fields */
 		cmp_rec_rec_with_match(rec, next_rec,
 				       offsets_rec, offsets_next_rec,
-				       index, FALSE, &matched_fields);
+				       index, false, false, &matched_fields);
 
 		if (matched_fields < n_prefix) {
 			/* rec != next_rec, => rec is non-boring */
@@ -1890,6 +1910,10 @@ dict_stats_analyze_index(
 	ulint		size;
 	DBUG_ENTER("dict_stats_analyze_index");
 
+	/* stats_latch is created on 1st lock. */
+	ut_ad(!(index->table->stats_latch_created) ||
+		!rw_lock_own(index->table->stats_latch, RW_X_LATCH));
+
 	DBUG_PRINT("info", ("index: %s, online status: %d", index->name(),
 			    dict_index_get_online_status(index)));
 
@@ -2188,7 +2212,9 @@ dict_stats_update_persistent(
 
 	DEBUG_PRINTF("%s(table=%s)\n", __func__, table->name);
 
-	dict_table_stats_lock(table, RW_X_LATCH);
+	dict_table_analyze_index_lock(table);
+
+	DEBUG_SYNC_C("innodb_dict_stats_update_persistent");
 
 	/* analyze the clustered index first */
 
@@ -2199,8 +2225,8 @@ dict_stats_update_persistent(
 	    || (index->type | DICT_UNIQUE) != (DICT_CLUSTERED | DICT_UNIQUE)) {
 
 		/* Table definition is corrupt */
-		dict_table_stats_unlock(table, RW_X_LATCH);
 		dict_stats_empty_table(table);
+		dict_table_analyze_index_unlock(table);
 
 		return(DB_CORRUPTION);
 	}
@@ -2211,13 +2237,13 @@ dict_stats_update_persistent(
 
 	ulint	n_unique = dict_index_get_n_unique(index);
 
-	table->stat_n_rows = index->stat_n_diff_key_vals[n_unique - 1];
+	ib_uint64_t stat_n_rows_tmp = index->stat_n_diff_key_vals[n_unique - 1];
 
-	table->stat_clustered_index_size = index->stat_index_size;
+	ib_uint64_t stat_clustered_index_size_tmp = index->stat_index_size;
 
 	/* analyze other indexes from the table, if any */
 
-	table->stat_sum_of_other_index_sizes = 0;
+	ib_uint64_t stat_sum_of_other_index_sizes_tmp = 0;
 
 	for (index = dict_table_get_next_index(index);
 	     index != NULL;
@@ -2239,11 +2265,19 @@ dict_stats_update_persistent(
 			dict_stats_analyze_index(index);
 		}
 
-		table->stat_sum_of_other_index_sizes
+		stat_sum_of_other_index_sizes_tmp
 			+= index->stat_index_size;
 	}
 
-	table->stats_last_recalc = ut_time();
+	dict_table_stats_lock(table, RW_X_LATCH);
+
+	table->stat_n_rows = stat_n_rows_tmp;
+
+	table->stat_clustered_index_size = stat_clustered_index_size_tmp;
+
+	table->stat_sum_of_other_index_sizes = stat_sum_of_other_index_sizes_tmp;
+
+	table->stats_last_recalc = ut_time_monotonic();
 
 	table->stat_modified_counter = 0;
 
@@ -2253,6 +2287,8 @@ dict_stats_update_persistent(
 
 	dict_table_stats_unlock(table, RW_X_LATCH);
 
+	dict_table_analyze_index_unlock(table);
+
 	return(DB_SUCCESS);
 }
 
@@ -3019,9 +3055,13 @@ dict_stats_update_for_index(
 	if (dict_stats_is_persistent_enabled(index->table)) {
 
 		if (dict_stats_persistent_storage_check(false)) {
-			dict_table_stats_lock(index->table, RW_X_LATCH);
+			dict_table_analyze_index_lock(index->table);
 			dict_stats_analyze_index(index);
+			ulint stat_sum_of_other_index_sizes_tmp = index->stat_index_size;
+			dict_table_stats_lock(index->table, RW_X_LATCH);
+			index->table->stat_sum_of_other_index_sizes += stat_sum_of_other_index_sizes_tmp;
 			dict_table_stats_unlock(index->table, RW_X_LATCH);
+			dict_table_analyze_index_unlock(index->table);
 			dict_stats_save(index->table, &index->id);
 			DBUG_VOID_RETURN;
 		}
@@ -3085,6 +3125,11 @@ dict_stats_update(
 			goto transient;
 		}
 
+		/* wakes the last purge batch for exact recalculation */
+		if (trx_sys->rseg_history_len > 0) {
+			srv_wake_purge_thread_if_not_active();
+		}
+
 		/* Persistent recalculation requested, called from
 		1) ANALYZE TABLE, or
 		2) the auto recalculation background thread, or
@@ -3250,12 +3295,8 @@ dict_stats_update(
 
 transient:
 
-	dict_table_stats_lock(table, RW_X_LATCH);
-
 	dict_stats_update_transient(table);
 
-	dict_table_stats_unlock(table, RW_X_LATCH);
-
 	return(DB_SUCCESS);
 }
 
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc
index 9020f4455b5a..44c0aefc5673 100644
--- a/storage/innobase/dict/dict0stats_bg.cc
+++ b/storage/innobase/dict/dict0stats_bg.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -335,15 +343,14 @@ dict_stats_process_entry_from_recalc_pool()
 
 	mutex_exit(&dict_sys->mutex);
 
-	/* ut_time() could be expensive, the current function
+	/* ut_time_monotonic() could be expensive, the current function
 	is called once every time a table has been changed more than 10% and
 	on a system with lots of small tables, this could become hot. If we
 	find out that this is a problem, then the check below could eventually
 	be replaced with something else, though a time interval is the natural
 	approach. */
 
-	if (ut_difftime(ut_time(), table->stats_last_recalc)
-	    < MIN_RECALC_INTERVAL) {
+	if (ut_time_monotonic() - table->stats_last_recalc < MIN_RECALC_INTERVAL) {
 
 		/* Stats were (re)calculated not long ago. To avoid
 		too frequent stats updates we put back the table on
diff --git a/storage/innobase/eval/eval0eval.cc b/storage/innobase/eval/eval0eval.cc
index a525cb604ea7..285955883fda 100644
--- a/storage/innobase/eval/eval0eval.cc
+++ b/storage/innobase/eval/eval0eval.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/eval/eval0proc.cc b/storage/innobase/eval/eval0proc.cc
index cdd6fdc2a0a2..2e540c543b73 100644
--- a/storage/innobase/eval/eval0proc.cc
+++ b/storage/innobase/eval/eval0proc.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1998, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1998, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 1ac07f731ee0..4549872c4cce 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -604,6 +612,8 @@ fil_node_create_low(
 
 	node->size = size;
 
+	node->flush_size = size;
+
 	node->magic_n = FIL_NODE_MAGIC_N;
 
 	node->init_size = size;
@@ -758,7 +768,10 @@ fil_node_open_file(
 
 		/* Read the first page of the tablespace */
 
-		buf2 = static_cast<byte*>(ut_malloc_nokey(2 * UNIV_PAGE_SIZE));
+		const ulint buf2_size = recv_recovery_is_on()
+			? (2 * UNIV_PAGE_SIZE) : UNIV_PAGE_SIZE;
+		buf2 = static_cast<byte*>(
+			ut_malloc_nokey(buf2_size + UNIV_PAGE_SIZE));
 
 		/* Align the memory for file i/o if we might have O_DIRECT
 		set */
@@ -768,8 +781,7 @@ fil_node_open_file(
 		IORequest	request(IORequest::READ);
 
 		success = os_file_read(
-			request,
-			node->handle, page, 0, UNIV_PAGE_SIZE);
+			request, node->handle, page, 0, buf2_size);
 
 		space_id = fsp_header_get_space_id(page);
 		flags = fsp_header_get_flags(page);
@@ -832,6 +844,20 @@ fil_node_open_file(
 			space->size_in_header = size;
 			space->free_limit = free_limit;
 			space->free_len = free_len;
+
+			/* Set estimated value for space->compression_type
+			during recovery process. */
+			if (recv_recovery_is_on()
+			    && (Compression::is_compressed_page(
+					page + page_size.physical())
+			        || Compression::is_compressed_encrypted_page(
+					page + page_size.physical()))) {
+				ut_ad(buf2_size >= (2 * UNIV_PAGE_SIZE));
+				Compression::meta_t header;
+				Compression::deserialize_header(
+					page + page_size.physical(), &header);
+				space->compression_type = header.m_algorithm;
+			}
 		}
 
 		ut_free(buf2);
@@ -850,7 +876,7 @@ fil_node_open_file(
 		}
 
 		if (node->size == 0) {
-			ulint	extent_size;
+			uint64_t	extent_size;
 
 			extent_size = page_size.physical() * FSP_EXTENT_SIZE;
 
@@ -1611,18 +1637,23 @@ fil_space_get_flags(
 	return(flags);
 }
 
-/** Check if table is mark for truncate.
+/** Check if tablespace exists and is marked for truncation.
 @param[in]	id	space id
+@return true if tablespace is missing.
 @return true if tablespace is marked for truncate. */
 bool
 fil_space_is_being_truncated(
 	ulint id)
 {
-	bool	mark_for_truncate;
+	bool flag = true;
+	fil_space_t* space;
 	mutex_enter(&fil_system->mutex);
-	mark_for_truncate = fil_space_get_by_id(id)->is_being_truncated;
+	space = fil_space_get_space(id);
+	if (space != NULL) {
+		flag = space->is_being_truncated;
+        }
 	mutex_exit(&fil_system->mutex);
-	return(mark_for_truncate);
+	return(flag);
 }
 
 /** Open each fil_node_t of a named fil_space_t if not already open.
@@ -2997,13 +3028,10 @@ fil_reinit_space_header_for_table(
 	they won't violate the latch ordering. */
 	dict_table_x_unlock_indexes(table);
 	row_mysql_unlock_data_dictionary(trx);
+	DEBUG_SYNC_C("trunc_table_index_dropped_release_dict_lock");
 
-	/* Lock the search latch in shared mode to prevent user
-	from disabling AHI during the scan */
-	btr_search_s_lock_all();
 	DEBUG_SYNC_C("simulate_buffer_pool_scan");
 	buf_LRU_flush_or_remove_pages(id, BUF_REMOVE_ALL_NO_WRITE, 0);
-	btr_search_s_unlock_all();
 
 	row_mysql_lock_data_dictionary(trx);
 
@@ -5001,7 +5029,7 @@ fil_space_extend(
 	}
 
 	page_size_t	pageSize(space->flags);
-	const ulint	page_size = pageSize.physical();
+	const os_offset_t	page_size = pageSize.physical();
 	fil_node_t*	node = UT_LIST_GET_LAST(space->chain);
 
 	if (!node->being_extended) {
@@ -5070,24 +5098,40 @@ fil_space_extend(
 
 #if !defined(NO_FALLOCATE) && defined(UNIV_LINUX)
 		int     ret = posix_fallocate(node->handle.m_file, node_start, len);
-		/* We already pass the valid offset and len in, if EINVAL
-		is returned, it could only mean that the file system doesn't
-		support fallocate(), currently one known case is
-		ext3 FS with O_DIRECT. We ignore EINVAL here so that the
-		error message won't flood. */
-		if (ret != 0 && ret != EINVAL) {
-			ib::error()
-				<< "posix_fallocate(): Failed to preallocate"
-				" data for file "
-				<< node->name << ", desired size "
-				<< len << " bytes."
-				" Operating system error number "
-				<< ret << ". Check"
-				" that the disk is not full or a disk quota"
-				" exceeded. Make sure the file system supports"
-				" this function. Some operating system error"
-				" numbers are described at " REFMAN
-				" operating-system-error-codes.html";
+
+		DBUG_EXECUTE_IF("ib_posix_fallocate_fail_eintr",
+				ret = EINTR;);
+
+		DBUG_EXECUTE_IF("ib_posix_fallocate_fail_einval",
+				ret = EINVAL;);
+
+		if (ret != 0) {
+			/* We already pass the valid offset and len in,
+			if EINVAL is returned, it could only mean that the
+			file system doesn't support fallocate(), currently
+			one known case is ext3 with O_DIRECT.
+
+			Also because above call could be interrupted,
+			in this case, simply go to plan B by writing zeroes.
+
+			Both error messages for above two scenarios are
+			skipped in case of flooding error messages, because
+			they can be ignored by users. */
+			if (ret != EINTR && ret != EINVAL) {
+				ib::error()
+					<< "posix_fallocate(): Failed to"
+					" preallocate data for file "
+					<< node->name << ", desired size "
+					<< len << " bytes."
+					" Operating system error number "
+					<< ret << ". Check"
+					" that the disk is not full or a disk"
+					" quota exceeded. Make sure the file"
+					" system supports this function."
+					" Some operating system error"
+					" numbers are described at " REFMAN
+					"operating-system-error-codes.html";
+			}
 
 			err = DB_IO_ERROR;
 		}
@@ -5904,26 +5948,35 @@ fil_flush(
 		return;
 	}
 
-	if (fil_buffering_disabled(space)) {
+	bool fbd = fil_buffering_disabled(space);
+	if (fbd) {
 
 		/* No need to flush. User has explicitly disabled
-		buffering. */
+		buffering. However, flush should be called if the file
+                size changes to keep OS metadata in sync. */
 		ut_ad(!space->is_in_unflushed_spaces);
 		ut_ad(fil_space_is_flushed(space));
-		ut_ad(space->n_pending_flushes == 0);
 
-#ifdef UNIV_DEBUG
+		/* Flush only if the file size changes */
+		bool no_flush = true;
 		for (node = UT_LIST_GET_FIRST(space->chain);
 		     node != NULL;
 		     node = UT_LIST_GET_NEXT(chain, node)) {
+#ifdef UNIV_DEBUG
 			ut_ad(node->modification_counter
 			      == node->flush_counter);
-			ut_ad(node->n_pending_flushes == 0);
-		}
 #endif /* UNIV_DEBUG */
+			if (node->flush_size != node->size) {
+				/* Found at least one file whose size has changed */
+				no_flush = false;
+				break;
+			}
+		}
 
-		mutex_exit(&fil_system->mutex);
-		return;
+		if (no_flush) {
+			mutex_exit(&fil_system->mutex);
+			return;
+		}
 	}
 
 	space->n_pending_flushes++;	/*!< prevent dropping of the space while
@@ -5934,11 +5987,26 @@ fil_flush(
 
 		int64_t	old_mod_counter = node->modification_counter;
 
-		if (old_mod_counter <= node->flush_counter) {
+		if (!node->is_open) {
 			continue;
 		}
 
-		ut_a(node->is_open);
+		/* Skip flushing if the file size has not changed since
+		last flush was done and the flush mode is O_DIRECT_NO_FSYNC */
+		if (fbd && (node->flush_size == node->size)) {
+			continue;
+		}
+
+		/* If we are here and the flush mode is O_DIRECT_NO_FSYNC, then
+		it means that the file size has changed and hence, it shold be
+		flushed, irrespective of the mod_counter and flush counter values,
+		which are always same in case of O_DIRECT_NO_FSYNC to avoid flush
+		on every write operation.
+		For other flush modes, if the flush_counter is same or ahead of
+		the mode_counter, skip the flush. */
+		if (!fbd && (old_mod_counter <= node->flush_counter)) {
+			continue;
+		}
 
 		switch (space->purpose) {
 		case FIL_TYPE_TEMPORARY:
@@ -5991,6 +6059,8 @@ fil_flush(
 
 		os_file_flush(file);
 
+		node->flush_size = node->size;
+
 		mutex_enter(&fil_system->mutex);
 
 		os_event_set(node->sync_event);
@@ -6287,6 +6357,7 @@ struct fil_iterator_t {
 	byte*		io_buffer;		/*!< Buffer to use for IO */
 	byte*		encryption_key;		/*!< Encryption key */
 	byte*		encryption_iv;		/*!< Encryption iv */
+	size_t		block_size;		/*!< FS Block Size */
 };
 
 /********************************************************************//**
@@ -6361,6 +6432,7 @@ fil_iterate(
 
 		dberr_t		err;
 		IORequest	read_request(read_type);
+		read_request.block_size(iter.block_size);
 
 		/* For encrypted table, set encryption information. */
 		if (iter.encryption_key != NULL && offset != 0) {
@@ -6407,6 +6479,7 @@ fil_iterate(
 		}
 
 		IORequest	write_request(write_type);
+		write_request.block_size(iter.block_size);
 
 		/* For encrypted table, set encryption information. */
 		if (iter.encryption_key != NULL && offset != 0) {
@@ -6514,6 +6587,17 @@ fil_tablespace_iterate(
 		err = DB_SUCCESS;
 	}
 
+	/* Set File System Block Size */
+	size_t block_size;
+	{
+		os_file_stat_t stat_info;
+
+		ut_d(dberr_t err =) os_file_get_status(filepath, &stat_info, false, false);
+		ut_ad(err == DB_SUCCESS);
+
+		block_size = stat_info.block_size;
+	}
+
 	callback.set_file(filepath, file);
 
 	os_offset_t	file_size = os_file_get_size(file);
@@ -6556,6 +6640,7 @@ fil_tablespace_iterate(
 		iter.file_size = file_size;
 		iter.n_io_buffers = n_io_buffers;
 		iter.page_size = callback.get_page_size().physical();
+		iter.block_size = block_size;
 
 		/* Set encryption info. */
 		iter.encryption_key = table->encryption_key;
@@ -6564,14 +6649,22 @@ fil_tablespace_iterate(
 		/* Check encryption is matched or not. */
 		ulint	space_flags = callback.get_space_flags();
 		if (FSP_FLAGS_GET_ENCRYPTION(space_flags)) {
-			ut_ad(table->encryption_key != NULL);
-
 			if (!dict_table_is_encrypted(table)) {
 				ib::error() << "Table is not in an encrypted"
-					" tablespace, but the data file which"
-					" trying to import is an encrypted"
+					" tablespace, but the data file"
+                                        " intended for import is an encrypted"
 					" tablespace";
 				err = DB_IO_NO_ENCRYPT_TABLESPACE;
+			} else {
+				/* encryption_key must have been populated
+                                while reading CFP file. */
+				ut_ad(table->encryption_key != NULL &&
+				table->encryption_iv != NULL);
+
+				if (table->encryption_key == NULL ||
+					table->encryption_iv == NULL) {
+					err = DB_ERROR;
+				}
 			}
 		}
 
@@ -7103,6 +7196,7 @@ truncate_t::truncate(
 			ib::error() << "Failed to open tablespace file "
 				<< path << ".";
 
+			mutex_exit(&fil_system->mutex);
 			ut_free(path);
 
 			return(DB_ERROR);
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc
index 59db3224fb80..e108e97c130c 100644
--- a/storage/innobase/fsp/fsp0file.cc
+++ b/storage/innobase/fsp/fsp0file.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -647,10 +655,9 @@ Datafile::validate_first_page(lsn_t*	flush_lsn,
 			ib::error()
 				<< "Encryption information in"
 				<< " datafile: " << m_filepath
-				<< " can't be decrypted"
-				<< " , please confirm the keyfile"
-				<< " is match and keyring plugin"
-				<< " is loaded.";
+				<< " can't be decrypted,"
+				<< " please check if a keyring plugin"
+				<< " is loaded and initialized successfully.";
 
 			m_is_valid = false;
 			free_first_page();
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index ba45c016e605..9ad7a1fe51fd 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1282,8 +1290,8 @@ fsp_header_decode_encryption_info(
 	crc1 = mach_read_from_4(ptr);
 	crc2 = ut_crc32(key_info, ENCRYPTION_KEY_LEN * 2);
 	if (crc1 != crc2) {
-		ib::error() << "Failed to decrpt encryption information,"
-			<< " please check key file is not changed!";
+		ib::error() << "Failed to decrypt encryption information,"
+			<< " please confirm the master key was not changed.";
 		my_free(master_key);
 		return(false);
 	}
diff --git a/storage/innobase/fsp/fsp0space.cc b/storage/innobase/fsp/fsp0space.cc
index c391e5c338f9..63e7688c7914 100644
--- a/storage/innobase/fsp/fsp0space.cc
+++ b/storage/innobase/fsp/fsp0space.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fsp/fsp0sysspace.cc b/storage/innobase/fsp/fsp0sysspace.cc
index a0d7cb0be148..ec2cbfd92205 100644
--- a/storage/innobase/fsp/fsp0sysspace.cc
+++ b/storage/innobase/fsp/fsp0sysspace.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/Makefile.query b/storage/innobase/fts/Makefile.query
index 12dcd833064b..9fe3bccc4afc 100644
--- a/storage/innobase/fts/Makefile.query
+++ b/storage/innobase/fts/Makefile.query
@@ -1,3 +1,25 @@
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 LEX=flex
 YACC=bison
 PREFIX=fts
diff --git a/storage/innobase/fts/fts0ast.cc b/storage/innobase/fts/fts0ast.cc
index 8c542aab2899..03cbc7a8dfbf 100644
--- a/storage/innobase/fts/fts0ast.cc
+++ b/storage/innobase/fts/fts0ast.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -28,6 +36,7 @@ Created 2007/3/16 Sunny Bains.
 #include "fts0ast.h"
 #include "fts0pars.h"
 #include "fts0fts.h"
+#include "row0sel.h"
 
 /* The FTS ast visit pass. */
 enum fts_ast_visit_pass_t {
@@ -545,8 +554,7 @@ fts_ast_node_check_union(
 	fts_ast_node_t*	node)
 {
 	if (node->type == FTS_AST_LIST
-	    || node->type == FTS_AST_SUBEXP_LIST
-	    || node->type == FTS_AST_PARSER_PHRASE_LIST) {
+	    || node->type == FTS_AST_SUBEXP_LIST) {
 
 		for (node = node->list.head; node; node = node->next) {
 			if (!fts_ast_node_check_union(node)) {
@@ -554,6 +562,9 @@ fts_ast_node_check_union(
 			}
 		}
 
+	} else if (node->type == FTS_AST_PARSER_PHRASE_LIST) {
+		/* Phrase search for plugin parser */
+		return(false);
 	} else if (node->type == FTS_AST_OPER
 		   && (node->oper == FTS_IGNORE
 		       || node->oper == FTS_EXIST)) {
@@ -590,6 +601,7 @@ fts_ast_visit(
 	bool			revisit = false;
 	bool			will_be_ignored = false;
 	fts_ast_visit_pass_t	visit_pass = FTS_PASS_FIRST;
+	trx_t*	trx = node->trx;
 
 	start_node = node->list.head;
 
@@ -688,6 +700,10 @@ fts_ast_visit(
 		}
 	}
 
+	if (trx_is_interrupted(trx)) {
+		return (DB_INTERRUPTED);
+	}
+
 	if (revisit) {
 		/* Exist pass processes the skipped FTS_EXIST operation. */
                 for (node = start_node;
diff --git a/storage/innobase/fts/fts0blex.cc b/storage/innobase/fts/fts0blex.cc
index 183e05edd046..92927c66e1d7 100644
--- a/storage/innobase/fts/fts0blex.cc
+++ b/storage/innobase/fts/fts0blex.cc
@@ -451,19 +451,27 @@ static yyconst flex_int16_t yy_chk[32] =
 #line 1 "fts0blex.l"
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 *****************************************************************************/
 /**
diff --git a/storage/innobase/fts/fts0blex.l b/storage/innobase/fts/fts0blex.l
index ce61fc6b2d94..923fc50d2e0c 100644
--- a/storage/innobase/fts/fts0blex.l
+++ b/storage/innobase/fts/fts0blex.l
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/fts0config.cc b/storage/innobase/fts/fts0config.cc
index 740ee87fe012..005481b128db 100644
--- a/storage/innobase/fts/fts0config.cc
+++ b/storage/innobase/fts/fts0config.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index 103d8830537d..08adc1cb1d36 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -76,7 +84,7 @@ ulong	fts_min_token_size;
 
 
 // FIXME: testing
-ib_time_t elapsed_time = 0;
+ib_time_monotonic_t elapsed_time = 0;
 ulint n_nodes = 0;
 
 #ifdef FTS_CACHE_SIZE_DEBUG
@@ -93,7 +101,6 @@ static const ulint FTS_DEADLOCK_RETRY_WAIT = 100000;
 /** variable to record innodb_fts_internal_tbl_name for information
 schema table INNODB_FTS_INSERTED etc. */
 char* fts_internal_tbl_name		= NULL;
-char* fts_internal_tbl_name2		= NULL;
 
 /** InnoDB default stopword list:
 There are different versions of stopwords, the stop words listed
@@ -215,7 +222,7 @@ FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	sync		sync state
 @param[in]	unlock_cache	whether unlock cache lock when write node
 @param[in]	wait		whether wait when a sync is in progress
-@param[in]      has_dict        whether has dict operation lock
+@param[in]	has_dict_lock	whether has dict operation lock
 @return DB_SUCCESS if all OK */
 static
 dberr_t
@@ -223,7 +230,7 @@ fts_sync(
 	fts_sync_t*	sync,
 	bool		unlock_cache,
 	bool		wait,
-	bool		has_dict);
+	bool		has_dict_lock);
 
 /****************************************************************//**
 Release all resources help by the words rb tree e.g., the node ilist. */
@@ -572,6 +579,7 @@ fts_cache_init(
 	cache->sync_heap->arg = mem_heap_create(1024);
 
 	cache->total_size = 0;
+	cache->total_size_before_sync = 0;
 
 	mutex_enter((ib_mutex_t*) &cache->deleted_lock);
 	cache->deleted_doc_ids = ib_vector_create(
@@ -834,37 +842,28 @@ fts_drop_index(
 
 			err = fts_drop_index_tables(trx, index);
 
-			for(;;) {
-				bool retry = false;
-				if (index->index_fts_syncing) {
-					retry = true;
-				}
-				if (!retry){
-					 fts_free(table);
-					break;
-				}
+			while (index->index_fts_syncing
+				&& !trx_is_interrupted(trx)) {
 				DICT_BG_YIELD(trx);
 			}
+
+			fts_free(table);
+
 			return(err);
 		}
 
-			for(;;) {
-				bool retry = false;
-				if (index->index_fts_syncing) {
-                                        retry = true;
-                                }
-                                if (!retry){
-					current_doc_id = table->fts->cache->next_doc_id;
-					first_doc_id = table->fts->cache->first_doc_id;
-					fts_cache_clear(table->fts->cache);
-					fts_cache_destroy(table->fts->cache);
-					table->fts->cache = fts_cache_create(table);
-					table->fts->cache->next_doc_id = current_doc_id;
-					table->fts->cache->first_doc_id = first_doc_id;
-					break;
-                                }
-				DICT_BG_YIELD(trx);
-			}
+		while (index->index_fts_syncing
+			&& !trx_is_interrupted(trx)) {
+			DICT_BG_YIELD(trx);
+		}
+
+		current_doc_id = table->fts->cache->next_doc_id;
+		first_doc_id = table->fts->cache->first_doc_id;
+		fts_cache_clear(table->fts->cache);
+		fts_cache_destroy(table->fts->cache);
+		table->fts->cache = fts_cache_create(table);
+		table->fts->cache->next_doc_id = current_doc_id;
+		table->fts->cache->first_doc_id = first_doc_id;
 
 	} else {
 		fts_cache_t*            cache = table->fts->cache;
@@ -875,19 +874,16 @@ fts_drop_index(
 		index_cache = fts_find_index_cache(cache, index);
 
 		if (index_cache != NULL) {
-			for(;;) {
-                                bool retry = false;
-                                if (index->index_fts_syncing) {
-                                        retry = true;
-                                }
-				if (!retry && index_cache->words) {
-					fts_words_free(index_cache->words);
-					rbt_free(index_cache->words);
-					break;
-				}
+			while (index->index_fts_syncing
+				&& !trx_is_interrupted(trx)) {
 				DICT_BG_YIELD(trx);
 			}
 
+			if (index_cache->words) {
+				fts_words_free(index_cache->words);
+				rbt_free(index_cache->words);
+			}
+
 			ib_vector_remove(cache->indexes, *(void**) index_cache);
 		}
 
@@ -1331,6 +1327,9 @@ fts_cache_node_add_positions(
 		ptr = ilist + node->ilist_size;
 
 		node->ilist_size_alloc = new_size;
+		if (cache) {
+			cache->total_size += new_size;
+		}
 	}
 
 	ptr_start = ptr;
@@ -1357,6 +1356,9 @@ fts_cache_node_add_positions(
 		if (node->ilist_size > 0) {
 			memcpy(ilist, node->ilist, node->ilist_size);
 			ut_free(node->ilist);
+			if (cache) {
+				cache->total_size -= node->ilist_size;
+			}
 		}
 
 		node->ilist = ilist;
@@ -1364,10 +1366,6 @@ fts_cache_node_add_positions(
 
 	node->ilist_size += enc_len;
 
-	if (cache) {
-		cache->total_size += enc_len;
-	}
-
 	if (node->first_doc_id == FTS_NULL_DOC_ID) {
 		node->first_doc_id = doc_id;
 	}
@@ -1787,9 +1785,10 @@ ulint
 fts_get_table_flags2_for_aux_tables(
 	ulint	flags2)
 {
-	/* Extract the file_per_table flag & temporary file flag
-	from the main FTS table flags2 */
+	/* Extract the file_per_table flag, temporary file flag and
+	encryption flag from the main FTS table flags2 */
 	return((flags2 & DICT_TF2_USE_FILE_PER_TABLE) |
+               (flags2 & DICT_TF2_ENCRYPTION) |
 	       (flags2 & DICT_TF2_TEMPORARY));
 }
 
@@ -2427,7 +2426,9 @@ fts_trx_table_create(
 	ftt = static_cast<fts_trx_table_t*>(
 		mem_heap_alloc(fts_trx->heap, sizeof(*ftt)));
 
-	memset(ftt, 0x0, sizeof(*ftt));
+	if (ftt != NULL) {
+		memset(ftt, 0x0, sizeof(*ftt));
+	}
 
 	ftt->table = table;
 	ftt->fts_trx = fts_trx;
@@ -3648,6 +3649,7 @@ fts_add_doc_by_id(
 				btr_pcur_store_position(doc_pcur, &mtr);
 				mtr_commit(&mtr);
 
+				DEBUG_SYNC_C("fts_instrument_sync_cache_wait");
 				rw_lock_x_lock(&table->fts->cache->lock);
 
 				if (table->fts->cache->stopword_info.status
@@ -3662,14 +3664,24 @@ fts_add_doc_by_id(
 					doc_id, doc.tokens);
 
 				bool	need_sync = false;
-				if ((cache->total_size > fts_max_cache_size / 10
-				     || fts_need_sync)
+				if ((cache->total_size -
+				    cache->total_size_before_sync >
+				    fts_max_cache_size / 10 || fts_need_sync)
 				    && !cache->sync->in_progress) {
 					need_sync = true;
+					cache->total_size_before_sync =
+					    cache->total_size;
 				}
 
 				rw_lock_x_unlock(&table->fts->cache->lock);
 
+				DBUG_EXECUTE_IF(
+                                        "fts_instrument_sync_cache_wait",
+					srv_fatal_semaphore_wait_threshold = 25;
+					fts_max_cache_size = 100;
+                                        fts_sync(cache->sync, true, true, false);
+                                );
+
 				DBUG_EXECUTE_IF(
 					"fts_instrument_sync",
 					fts_optimize_request_sync_table(table);
@@ -3954,7 +3966,7 @@ fts_write_node(
 	pars_info_t*	info;
 	dberr_t		error;
 	ib_uint32_t	doc_count;
-	ib_time_t	start_time;
+	ib_time_monotonic_t	start_time;
 	doc_id_t	last_doc_id;
 	doc_id_t	first_doc_id;
 	char		table_name[MAX_FULL_NAME_LEN];
@@ -4003,9 +4015,9 @@ fts_write_node(
 			"  :last_doc_id, :doc_count, :ilist);");
 	}
 
-	start_time = ut_time();
+	start_time = ut_time_monotonic();
 	error = fts_eval_sql(trx, *graph);
-	elapsed_time += ut_time() - start_time;
+	elapsed_time += ut_time_monotonic() - start_time;
 	++n_nodes;
 
 	return(error);
@@ -4071,13 +4083,18 @@ fts_sync_add_deleted_cache(
 @param[in,out]	trx		transaction
 @param[in]	index_cache	index cache
 @param[in]	unlock_cache	whether unlock cache when write node
+				Also set this to true if sync takes
+				very long
+@param[in]	sync_start_time	Holds the timestamp of start of sync
+				for deducing the length of sync time
 @return DB_SUCCESS if all went well else error code */
 static MY_ATTRIBUTE((nonnull, warn_unused_result))
 dberr_t
 fts_sync_write_words(
 	trx_t*			trx,
 	fts_index_cache_t*	index_cache,
-	bool			unlock_cache)
+	bool			unlock_cache,
+	ib_time_t		sync_start_time)
 {
 	fts_table_t	fts_table;
 	ulint		n_nodes = 0;
@@ -4086,6 +4103,13 @@ fts_sync_write_words(
 	dberr_t		error = DB_SUCCESS;
 	ibool		print_error = FALSE;
 	dict_table_t*	table = index_cache->index->table;
+	/* We use this to deduce threshold value of time
+	that we can let sync to go on holding cache lock */
+	const float cutoff = 0.98;
+	ulint		lock_threshold =
+			(srv_fatal_semaphore_wait_threshold % SRV_SEMAPHORE_WAIT_EXTENSION)
+			* cutoff;
+	bool		timeout_extended = false;
 #ifdef FTS_DOC_STATS_DEBUG
 	ulint		n_new_words = 0;
 #endif /* FTS_DOC_STATS_DEBUG */
@@ -4107,6 +4131,9 @@ fts_sync_write_words(
 
 		word = rbt_value(fts_tokenizer_word_t, rbt_node);
 
+		DBUG_EXECUTE_IF("fts_instrument_write_words_before_select_index",
+				os_thread_sleep(300000););
+
 		selected = fts_select_index(
 			index_cache->charset, word->text.f_str,
 			word->text.f_len);
@@ -4146,6 +4173,30 @@ fts_sync_write_words(
 
 			/*FIXME: we need to handle the error properly. */
 			if (error == DB_SUCCESS) {
+				DEBUG_SYNC_C("fts_instrument_sync");
+				DBUG_EXECUTE_IF("fts_instrument_sync",
+			                        os_thread_sleep(10000000););
+				if (!unlock_cache) {
+					ulint cache_lock_time = ut_time_monotonic() - sync_start_time;
+					if (cache_lock_time > lock_threshold) {
+						if (!timeout_extended) {
+							os_atomic_increment_ulint(
+							&srv_fatal_semaphore_wait_threshold,
+							SRV_SEMAPHORE_WAIT_EXTENSION);
+							timeout_extended = true;
+							lock_threshold +=
+							SRV_SEMAPHORE_WAIT_EXTENSION;
+						} else {
+							unlock_cache = true;
+							os_atomic_decrement_ulint(
+							&srv_fatal_semaphore_wait_threshold,
+							SRV_SEMAPHORE_WAIT_EXTENSION);
+							timeout_extended = false;
+
+						}
+					}
+				}
+
 				if (unlock_cache) {
 					rw_lock_x_unlock(
 						&table->fts->cache->lock);
@@ -4155,6 +4206,8 @@ fts_sync_write_words(
 					trx,
 					&index_cache->ins_graph[selected],
 					&fts_table, &word->text, fts_node);
+				DBUG_EXECUTE_IF("fts_instrument_sync",
+                                                os_thread_sleep(15000000););
 
 				DEBUG_SYNC_C("fts_write_node");
 				DBUG_EXECUTE_IF("fts_write_node_crash",
@@ -4444,7 +4497,7 @@ fts_sync_begin(
 	n_nodes = 0;
 	elapsed_time = 0;
 
-	sync->start_time = ut_time();
+	sync->start_time = ut_time_monotonic();
 
 	sync->trx = trx_allocate_for_background();
 
@@ -4478,7 +4531,8 @@ fts_sync_index(
 
 	ut_ad(rbt_validate(index_cache->words));
 
-	error = fts_sync_write_words(trx, index_cache, sync->unlock_cache);
+	error = fts_sync_write_words(trx, index_cache, sync->unlock_cache,
+				     sync->start_time);
 
 #ifdef FTS_DOC_STATS_DEBUG
 	/* FTS_RESOLVE: the word counter info in auxiliary table "DOC_ID"
@@ -4596,7 +4650,7 @@ fts_sync_commit(
 	if (fts_enable_diag_print && elapsed_time) {
 		ib::info() << "SYNC for table " << sync->table->name
 			<< ": SYNC time: "
-			<< (ut_time() - sync->start_time)
+			<< (ut_time_monotonic() - sync->start_time)
 			<< " secs: elapsed "
 			<< (double) n_nodes / elapsed_time
 			<< " ins/sec";
@@ -4662,12 +4716,42 @@ fts_sync_rollback(
 	trx_free_for_background(trx);
 }
 
+/** Check that all indexes are synced.
+@param[in,out]	sync		sync state
+@return true if all indexes are synced, false otherwise. */
+static
+bool
+fts_check_all_indexes_synced(
+	fts_sync_t*	sync)
+{
+	ulint i;
+	fts_cache_t*	cache = sync->table->fts->cache;
+
+	/* Make sure all the caches are synced. */
+	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
+		fts_index_cache_t*	index_cache;
+
+		index_cache = static_cast<fts_index_cache_t*>(
+			ib_vector_get(cache->indexes, i));
+
+		if (index_cache->index->to_be_dropped
+		    || index_cache->index->table->to_be_dropped
+		    || fts_sync_index_check(index_cache)) {
+			continue;
+		}
+
+		return false;
+	}
+
+	return true;
+}
+
 /** Run SYNC on the table, i.e., write out data from the cache to the
 FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	sync		sync state
 @param[in]	unlock_cache	whether unlock cache lock when write node
 @param[in]	wait		whether wait when a sync is in progress
-@param[in]      has_dict        whether has dict operation lock
+@param[in]	has_dict_lock		whether has dict operation lock
 @return DB_SUCCESS if all OK */
 static
 dberr_t
@@ -4675,7 +4759,7 @@ fts_sync(
 	fts_sync_t*	sync,
 	bool		unlock_cache,
 	bool		wait,
-	bool		has_dict)
+	bool		has_dict_lock)
 {
 	ulint		i;
 	dberr_t		error = DB_SUCCESS;
@@ -4704,66 +4788,54 @@ fts_sync(
 	DEBUG_SYNC_C("fts_sync_begin");
 	fts_sync_begin(sync);
 
-	/* When sync in background, we hold dict operation lock
-	to prevent DDL like DROP INDEX, etc. */
-	if (has_dict) {
+	if (has_dict_lock) {
+		/* If lock is already taken mark that in transaction
+		 * so rollback will not try to take it again.
+		 */
 		sync->trx->dict_operation_lock_mode = RW_S_LATCH;
 	}
 
-begin_sync:
-	if (cache->total_size > fts_max_cache_size) {
-		/* Avoid the case: sync never finish when
-		insert/update keeps comming. */
-		ut_ad(sync->unlock_cache);
-		sync->unlock_cache = false;
-	}
+	do {
+		if (cache->total_size > fts_max_cache_size) {
+			/* Avoid the case: sync never finish when
+			insert/update keeps comming. */
+			ut_ad(sync->unlock_cache);
+			sync->unlock_cache = false;
+		}
 
-	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
-		fts_index_cache_t*	index_cache;
+		for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
+			fts_index_cache_t*	index_cache;
 
-		index_cache = static_cast<fts_index_cache_t*>(
-			ib_vector_get(cache->indexes, i));
+			index_cache = static_cast<fts_index_cache_t*>(
+				ib_vector_get(cache->indexes, i));
 
-		if (index_cache->index->to_be_dropped
-		    || index_cache->index->table->to_be_dropped) {
-			continue;
-		}
+			if (index_cache->index->to_be_dropped
+			    || index_cache->index->table->to_be_dropped) {
+				continue;
+			}
 
-		index_cache->index->index_fts_syncing = true;
-		DBUG_EXECUTE_IF("fts_instrument_sync_sleep_drop_waits",
-                        os_thread_sleep(10000000);
-                        );
+			DBUG_EXECUTE_IF("fts_instrument_sync_before_syncing",
+				os_thread_sleep(300000););
 
-		error = fts_sync_index(sync, index_cache);
+			index_cache->index->index_fts_syncing = true;
 
-		if (error != DB_SUCCESS && !sync->interrupted) {
+			error = fts_sync_index(sync, index_cache);
 
-			goto end_sync;
+			if (error != DB_SUCCESS) {
+				break;
+			}
 		}
-	}
-
-	DBUG_EXECUTE_IF("fts_instrument_sync_interrupted",
-			sync->interrupted = true;
-			error = DB_INTERRUPTED;
-			goto end_sync;
-	);
-
-	/* Make sure all the caches are synced. */
-	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
-		fts_index_cache_t*	index_cache;
 
-		index_cache = static_cast<fts_index_cache_t*>(
-			ib_vector_get(cache->indexes, i));
+		DBUG_EXECUTE_IF("fts_instrument_sync_interrupted",
+				sync->interrupted = true;
+				error = DB_INTERRUPTED;
+		);
 
-		if (index_cache->index->to_be_dropped
-		    || fts_sync_index_check(index_cache)) {
-			continue;
+		if (error != DB_SUCCESS) {
+			break;
 		}
+	} while (!fts_check_all_indexes_synced(sync));
 
-		goto begin_sync;
-	}
-
-end_sync:
 	if (error == DB_SUCCESS && !sync->interrupted) {
 		error = fts_sync_commit(sync);
 	} else {
@@ -4771,8 +4843,9 @@ fts_sync(
 	}
 
 	rw_lock_x_lock(&cache->lock);
-	/* Clear fts syncing flags of any indexes incase sync is
-	interrupeted */
+	/* Clear fts syncing flags of any indexes in case sync is
+	interrupted */
+	DEBUG_SYNC_C("fts_instrument_sync");
 	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
 		fts_index_cache_t*      index_cache;
 		index_cache = static_cast<fts_index_cache_t*>(
@@ -7531,9 +7604,9 @@ fts_check_and_drop_orphaned_tables(
 						DICT_TF2_FTS_AUX_HEX_NAME);
 				}
 			}
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 table_exit:
-#endif	/* !DBUG_OFF */
+#endif	/* !NDEBUG */
 
 			if (table != NULL) {
 				dict_table_close(table, TRUE, FALSE);
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 1b77e489e91c..0d3b139d8345 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -45,6 +53,9 @@ Completed 2011/7/10 Sunny and Jimmy Yang
 /** The FTS optimize thread's work queue. */
 static ib_wqueue_t* fts_optimize_wq;
 
+/** The FTS vector to store fts_slot_t */
+static ib_vector_t*  fts_slots;
+
 /** Time to wait for a message. */
 static const ulint FTS_QUEUE_WAIT_IN_USECS = 5000000;
 
@@ -61,13 +72,7 @@ static os_event_t fts_opt_shutdown_event = NULL;
 static const ulint FTS_WORD_NODES_INIT_SIZE = 64;
 
 /** Last time we did check whether system need a sync */
-static ib_time_t	last_check_sync_time;
-
-#if 0
-/** Check each table in round robin to see whether they'd
-need to be "optimized" */
-static	ulint	fts_optimize_sync_iterator = 0;
-#endif
+static ib_time_monotonic_t	last_check_sync_time;
 
 /** State of a table within the optimization sub system. */
 enum fts_state_t {
@@ -80,17 +85,11 @@ enum fts_state_t {
 
 /** FTS optimize thread message types. */
 enum fts_msg_type_t {
-	FTS_MSG_START,			/*!< Start optimizing thread */
-
-	FTS_MSG_PAUSE,			/*!< Pause optimizing thread */
-
 	FTS_MSG_STOP,			/*!< Stop optimizing and exit thread */
 
 	FTS_MSG_ADD_TABLE,		/*!< Add table to the optimize thread's
 					work queue */
 
-	FTS_MSG_OPTIMIZE_TABLE,		/*!< Optimize a table */
-
 	FTS_MSG_DEL_TABLE,		/*!< Remove a table from the optimize
 					threads work queue */
 	FTS_MSG_SYNC_TABLE		/*!< Sync fts cache of a table */
@@ -204,12 +203,12 @@ struct fts_slot_t {
 	ulint		deleted;	/*!< Number of doc ids deleted since the
 					last time this table was optimized */
 
-	ib_time_t	last_run;	/*!< Time last run completed */
+	ib_time_monotonic_t	last_run;  /*!< Time last run completed */
 
-	ib_time_t	completed;	/*!< Optimize finish time */
+	ib_time_monotonic_t	completed; /*!< Optimize finish time */
 
-	ib_time_t	interval_time;	/*!< Minimum time to wait before
-					optimizing the table again. */
+	ib_time_t	interval_time;	   /*!< Minimum time to wait before
+					   optimizing the table again. */
 };
 
 /** A table remove message for the FTS optimize thread. */
@@ -235,7 +234,7 @@ struct fts_msg_t {
 /** The number of words to read and optimize in a single pass. */
 ulong	fts_num_word_optimize;
 
-// FIXME
+/** Whether to enable additional FTS diagnostic printout. */
 char	fts_enable_diag_print;
 
 /** ZLib compressed block size.*/
@@ -688,7 +687,7 @@ fts_fetch_index_words(
 	fts_zip_t*	zip = static_cast<fts_zip_t*>(user_arg);
 	que_node_t*	exp = sel_node->select_list;
 	dfield_t*	dfield = que_node_get_val(exp);
-	short		len =  static_cast<short>(dfield_get_len(dfield));
+	ushort		len =  static_cast<ushort>(dfield_get_len(dfield));
 	void*		data = dfield_get_data(dfield);
 
 	/* Skip the duplicate words. */
@@ -1553,9 +1552,10 @@ static MY_ATTRIBUTE((nonnull, warn_unused_result))
 dberr_t
 fts_optimize_compact(
 /*=================*/
-	fts_optimize_t*	optim,		/*!< in: optimize state data */
-	dict_index_t*	index,		/*!< in: current FTS being optimized */
-	ib_time_t	start_time)	/*!< in: optimize start time */
+	fts_optimize_t*	optim,		     /*!< in: optimize state data */
+	dict_index_t*	index,		     /*!< in: current FTS being
+					      optimized */
+	ib_time_monotonic_t	start_time)  /*!< in: optimize start time */
 {
 	ulint		i;
 	dberr_t		error = DB_SUCCESS;
@@ -1589,7 +1589,8 @@ fts_optimize_compact(
 		fts_word_free(word);
 
 		if (fts_optimize_time_limit > 0
-		    && (ut_time() - start_time) > fts_optimize_time_limit) {
+		    && (ut_time_monotonic() - start_time) >
+		        fts_optimize_time_limit) {
 
 			optim->done = TRUE;
 		}
@@ -1787,7 +1788,7 @@ fts_optimize_words(
 	fts_string_t*	word)	/*!< in: the starting word to optimize */
 {
 	fts_fetch_t	fetch;
-	ib_time_t	start_time;
+	ib_time_monotonic_t	start_time;
 	que_t*		graph = NULL;
 	CHARSET_INFO*	charset = optim->fts_index_table.charset;
 
@@ -1797,7 +1798,7 @@ fts_optimize_words(
 	fts_optimize_time_limit = fts_optimize_get_time_limit(
 		optim->trx, &optim->fts_common_table);
 
-	start_time = ut_time();
+	start_time = ut_time_monotonic();
 
 	/* Setup the callback to use for fetching the word ilist etc. */
 	fetch.read_arg = optim->words;
@@ -2411,7 +2412,7 @@ fts_optimize_table_bk(
 
 	/* Avoid optimizing tables that were optimized recently. */
 	if (slot->last_run > 0
-	    && (ut_time() - slot->last_run) < slot->interval_time) {
+	    && (ut_time_monotonic() - slot->last_run) < slot->interval_time) {
 
 		return(DB_SUCCESS);
 
@@ -2423,14 +2424,14 @@ fts_optimize_table_bk(
 		if (error == DB_SUCCESS) {
 			slot->state = FTS_STATE_DONE;
 			slot->last_run = 0;
-			slot->completed = ut_time();
+			slot->completed = ut_time_monotonic();
 		}
 	} else {
 		error = DB_SUCCESS;
 	}
 
 	/* Note time this run completed. */
-	slot->last_run = ut_time();
+	slot->last_run = ut_time_monotonic();
 
 	return(error);
 }
@@ -2551,16 +2552,15 @@ fts_optimize_create_msg(
 	return(msg);
 }
 
-/**********************************************************************//**
-Add the table to add to the OPTIMIZER's list. */
+/** Add the table to add to the OPTIMIZER's list.
+@param[in]	table	table to add */
 void
 fts_optimize_add_table(
-/*===================*/
-	dict_table_t*	table)			/*!< in: table to add */
+	dict_table_t*	table)
 {
 	fts_msg_t*	msg;
 
-	if (!fts_optimize_wq) {
+	if (!fts_optimize_is_init()) {
 		return;
 	}
 
@@ -2572,25 +2572,6 @@ fts_optimize_add_table(
 	ib_wqueue_add(fts_optimize_wq, msg, msg->heap);
 }
 
-/**********************************************************************//**
-Optimize a table. */
-void
-fts_optimize_do_table(
-/*==================*/
-	dict_table_t*	table)			/*!< in: table to optimize */
-{
-	fts_msg_t*	msg;
-
-	/* Optimizer thread could be shutdown */
-	if (!fts_optimize_wq) {
-		return;
-	}
-
-	msg = fts_optimize_create_msg(FTS_MSG_OPTIMIZE_TABLE, table);
-
-	ib_wqueue_add(fts_optimize_wq, msg, msg->heap);
-}
-
 /**********************************************************************//**
 Remove the table from the OPTIMIZER's list. We do wait for
 acknowledgement from the consumer of the message. */
@@ -2604,7 +2585,7 @@ fts_optimize_remove_table(
 	fts_msg_del_t*	remove;
 
 	/* if the optimize system not yet initialized, return */
-	if (!fts_optimize_wq) {
+	if (!fts_optimize_is_init()) {
 		return;
 	}
 
@@ -2644,7 +2625,7 @@ fts_optimize_request_sync_table(
 	table_id_t*	table_id;
 
 	/* if the optimize system not yet initialized, return */
-	if (!fts_optimize_wq) {
+	if (!fts_optimize_is_init()) {
 		return;
 	}
 
@@ -2663,53 +2644,9 @@ fts_optimize_request_sync_table(
 	msg->ptr = table_id;
 
 	ib_wqueue_add(fts_optimize_wq, msg, msg->heap);
-}
-
-/**********************************************************************//**
-Find the slot for a particular table.
-@return slot if found else NULL. */
-static
-fts_slot_t*
-fts_optimize_find_slot(
-/*===================*/
-	ib_vector_t*		tables,		/*!< in: vector of tables */
-	const dict_table_t*	table)		/*!< in: table to add */
-{
-	ulint		i;
-
-	for (i = 0; i < ib_vector_size(tables); ++i) {
-		fts_slot_t*	slot;
-
-		slot = static_cast<fts_slot_t*>(ib_vector_get(tables, i));
-
-		if (slot->table == table) {
-			return(slot);
-		}
-	}
-
-	return(NULL);
-}
-
-/**********************************************************************//**
-Start optimizing table. */
-static
-void
-fts_optimize_start_table(
-/*=====================*/
-	ib_vector_t*		tables,		/*!< in/out: vector of tables */
-	dict_table_t*		table)		/*!< in: table to optimize */
-{
-	fts_slot_t*	slot;
-
-	slot = fts_optimize_find_slot(tables, table);
-
-	if (slot == NULL) {
-		ib::error() << "Table " << table->name << " not registered"
-			" with the optimize thread.";
-	} else {
-		slot->last_run = 0;
-		slot->completed = 0;
-	}
+	DBUG_EXECUTE_IF("fts_optimize_wq_count_check",
+	    if (ib_wqueue_get_count(fts_optimize_wq) > 1000) {
+	    DBUG_SUICIDE(); });
 }
 
 /**********************************************************************//**
@@ -2809,11 +2746,11 @@ fts_optimize_how_many(
 						vector*/
 {
 	ulint		i;
-	ib_time_t	delta;
+	ib_time_monotonic_t	delta;
 	ulint		n_tables = 0;
-	ib_time_t	current_time;
+	ib_time_monotonic_t	current_time;
 
-	current_time = ut_time();
+	current_time = ut_time_monotonic();
 
 	for (i = 0; i < ib_vector_size(tables); ++i) {
 		const fts_slot_t*	slot;
@@ -2867,13 +2804,13 @@ fts_is_sync_needed(
 						vector*/
 {
 	ulint	total_memory = 0;
-	double	time_diff = difftime(ut_time(), last_check_sync_time);
+	uint64_t time_diff = ut_time_monotonic() - last_check_sync_time;
 
 	if (fts_need_sync || time_diff < 5) {
 		return(false);
 	}
 
-	last_check_sync_time = ut_time();
+	last_check_sync_time = ut_time_monotonic();
 
 	for (ulint i = 0; i < ib_vector_size(tables); ++i) {
 		const fts_slot_t*	slot;
@@ -2894,57 +2831,6 @@ fts_is_sync_needed(
 	return(false);
 }
 
-#if 0
-/*********************************************************************//**
-Check whether a table needs to be optimized. */
-static
-void
-fts_optimize_need_sync(
-/*===================*/
-	ib_vector_t*	tables)	/*!< in: list of tables */
-{
-	dict_table_t*	table = NULL;
-	fts_slot_t*	slot;
-	ulint		num_table = ib_vector_size(tables);
-
-	if (!num_table) {
-		return;
-	}
-
-	if (fts_optimize_sync_iterator >= num_table) {
-		fts_optimize_sync_iterator = 0;
-	}
-
-	slot = ib_vector_get(tables, fts_optimize_sync_iterator);
-	table = slot->table;
-
-	if (!table) {
-		return;
-	}
-
-	ut_ad(table->fts);
-
-	if (table->fts->cache) {
-		ulint	deleted = table->fts->cache->deleted;
-
-		if (table->fts->cache->added
-		    >= fts_optimize_add_threshold) {
-			fts_sync_table(table);
-		} else if (deleted >= fts_optimize_delete_threshold) {
-			fts_optimize_do_table(table);
-
-			mutex_enter(&table->fts->cache->deleted_lock);
-			table->fts->cache->deleted -= deleted;
-			mutex_exit(&table->fts->cache->deleted_lock);
-		}
-	}
-
-	fts_optimize_sync_iterator++;
-
-	return;
-}
-#endif
-
 /** Sync fts cache of a table
 @param[in]	table_id	table id */
 void
@@ -2957,7 +2843,7 @@ fts_optimize_sync_table(
 
 	if (table) {
 		if (dict_table_has_fts_index(table) && table->fts->cache) {
-			fts_sync_table(table, true, false, true);
+			fts_sync_table(table, true, false, false);
 		}
 
 		dict_table_close(table, FALSE, FALSE);
@@ -2972,9 +2858,6 @@ fts_optimize_thread(
 /*================*/
 	void*		arg)			/*!< in: work queue*/
 {
-	mem_heap_t*	heap;
-	ib_vector_t*	tables;
-	ib_alloc_t*	heap_alloc;
 	ulint		current = 0;
 	ibool		done = FALSE;
 	ulint		n_tables = 0;
@@ -2984,10 +2867,10 @@ fts_optimize_thread(
 	ut_ad(!srv_read_only_mode);
 	my_thread_init();
 
-	heap = mem_heap_create(sizeof(dict_table_t*) * 64);
-	heap_alloc = ib_heap_allocator_create(heap);
+	ut_ad(fts_slots);
 
-	tables = ib_vector_create(heap_alloc, sizeof(fts_slot_t), 4);
+	/* Assign number of tables added in fts_slots_t to n_tables */
+	n_tables = ib_vector_size(fts_slots);
 
 	while (!done && srv_shutdown_state == SRV_SHUTDOWN_NONE) {
 
@@ -3001,10 +2884,10 @@ fts_optimize_thread(
 
 			fts_slot_t*	slot;
 
-			ut_a(ib_vector_size(tables) > 0);
+			ut_a(ib_vector_size(fts_slots) > 0);
 
 			slot = static_cast<fts_slot_t*>(
-				ib_vector_get(tables, current));
+				ib_vector_get(fts_slots, current));
 
 			/* Handle the case of empty slots. */
 			if (slot->state != FTS_STATE_EMPTY) {
@@ -3017,8 +2900,8 @@ fts_optimize_thread(
 			++current;
 
 			/* Wrap around the counter. */
-			if (current >= ib_vector_size(tables)) {
-				n_optimize = fts_optimize_how_many(tables);
+			if (current >= ib_vector_size(fts_slots)) {
+				n_optimize = fts_optimize_how_many(fts_slots);
 
 				current = 0;
 			}
@@ -3027,12 +2910,11 @@ fts_optimize_thread(
 			fts_msg_t*	msg;
 
 			msg = static_cast<fts_msg_t*>(
-				ib_wqueue_timedwait(wq,
-						    FTS_QUEUE_WAIT_IN_USECS));
+				ib_wqueue_timedwait(wq, FTS_QUEUE_WAIT_IN_USECS));
 
 			/* Timeout ? */
 			if (msg == NULL) {
-				if (fts_is_sync_needed(tables)) {
+				if (fts_is_sync_needed(fts_slots)) {
 					fts_need_sync = true;
 				}
 
@@ -3040,12 +2922,6 @@ fts_optimize_thread(
 			}
 
 			switch (msg->type) {
-			case FTS_MSG_START:
-				break;
-
-			case FTS_MSG_PAUSE:
-				break;
-
 			case FTS_MSG_STOP:
 				done = TRUE;
 				break;
@@ -3053,36 +2929,28 @@ fts_optimize_thread(
 			case FTS_MSG_ADD_TABLE:
 				ut_a(!done);
 				if (fts_optimize_new_table(
-					tables,
-					static_cast<dict_table_t*>(
-					msg->ptr))) {
+					fts_slots,
+					static_cast<dict_table_t*>(msg->ptr))) {
 					++n_tables;
 				}
 				break;
 
-			case FTS_MSG_OPTIMIZE_TABLE:
-				if (!done) {
-					fts_optimize_start_table(
-						tables,
-						static_cast<dict_table_t*>(
-						msg->ptr));
-				}
-				break;
-
 			case FTS_MSG_DEL_TABLE:
 				if (fts_optimize_del_table(
-					tables, static_cast<fts_msg_del_t*>(
-						msg->ptr))) {
+					fts_slots, static_cast<fts_msg_del_t*>(msg->ptr))) {
 					--n_tables;
 				}
 
 				/* Signal the producer that we have
 				removed the table. */
-				os_event_set(
-					((fts_msg_del_t*) msg->ptr)->event);
+				os_event_set(((fts_msg_del_t*) msg->ptr)->event);
 				break;
 
 			case FTS_MSG_SYNC_TABLE:
+				DBUG_EXECUTE_IF("fts_instrument_msg_sync_sleep",
+					os_thread_sleep(300000);
+				);
+
 				fts_optimize_sync_table(
 					*static_cast<table_id_t*>(msg->ptr));
 				break;
@@ -3094,7 +2962,7 @@ fts_optimize_thread(
 			mem_heap_free(msg->heap);
 
 			if (!done) {
-				n_optimize = fts_optimize_how_many(tables);
+				n_optimize = fts_optimize_how_many(fts_slots);
 			} else {
 				n_optimize = 0;
 			}
@@ -3106,11 +2974,11 @@ fts_optimize_thread(
 	if (n_tables > 0) {
 		ulint	i;
 
-		for (i = 0; i < ib_vector_size(tables); i++) {
+		for (i = 0; i < ib_vector_size(fts_slots); i++) {
 			fts_slot_t*	slot;
 
 			slot = static_cast<fts_slot_t*>(
-				ib_vector_get(tables, i));
+				ib_vector_get(fts_slots, i));
 
 			if (slot->state != FTS_STATE_EMPTY) {
 				fts_optimize_sync_table(slot->table_id);
@@ -3118,7 +2986,7 @@ fts_optimize_thread(
 		}
 	}
 
-	ib_vector_free(tables);
+	ib_vector_free(fts_slots);
 
 	ib::info() << "FTS optimize thread exiting.";
 
@@ -3138,22 +3006,60 @@ void
 fts_optimize_init(void)
 /*===================*/
 {
+	mem_heap_t*	heap;
+	ib_alloc_t*     heap_alloc;
+	dict_table_t*   table;
+
 	ut_ad(!srv_read_only_mode);
 
 	/* For now we only support one optimize thread. */
-	ut_a(fts_optimize_wq == NULL);
+	ut_a(!fts_optimize_is_init());
 
+	/* Create FTS optimize work queue */
 	fts_optimize_wq = ib_wqueue_create();
-	fts_opt_shutdown_event = os_event_create(0);
 	ut_a(fts_optimize_wq != NULL);
-	last_check_sync_time = ut_time();
+
+	/* Create FTS vector to store fts_slot_t */
+	heap = mem_heap_create(sizeof(dict_table_t*) * 64);
+	heap_alloc = ib_heap_allocator_create(heap);
+	fts_slots = ib_vector_create(heap_alloc, sizeof(fts_slot_t), 4);
+
+	/* Add fts tables to the fts_slots vector which were skipped during restart */
+	std::vector<dict_table_t*> table_vector;
+	std::vector<dict_table_t*>::iterator it;
+
+	mutex_enter(&dict_sys->mutex);
+	for (table = UT_LIST_GET_FIRST(dict_sys->table_LRU);
+             table != NULL;
+             table = UT_LIST_GET_NEXT(table_LRU, table)) {
+                if (table->fts &&
+                    dict_table_has_fts_index(table)) {
+			if (fts_optimize_new_table(fts_slots,
+						   table)){
+				table_vector.push_back(table);
+			}
+		}
+	}
+
+	/* It is better to call dict_table_prevent_eviction()
+	outside the above loop because it operates on
+	dict_sys->table_LRU list.*/
+	for (it=table_vector.begin();it!=table_vector.end();++it) {
+		dict_table_prevent_eviction(*it);
+	}
+
+	mutex_exit(&dict_sys->mutex);
+	table_vector.clear();
+
+	fts_opt_shutdown_event = os_event_create(0);
+	last_check_sync_time = ut_time_monotonic();
 
 	os_thread_create(fts_optimize_thread, fts_optimize_wq, NULL);
 }
 
 /**********************************************************************//**
 Check whether the work queue is initialized.
-@return TRUE if optimze queue is initialized. */
+@return TRUE if optimize queue is initialized. */
 ibool
 fts_optimize_is_init(void)
 /*======================*/
diff --git a/storage/innobase/fts/fts0pars.cc b/storage/innobase/fts/fts0pars.cc
index e4d1bba2be69..59799d6fb088 100644
--- a/storage/innobase/fts/fts0pars.cc
+++ b/storage/innobase/fts/fts0pars.cc
@@ -4,15 +4,21 @@
 
       Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
diff --git a/storage/innobase/fts/fts0pars.y b/storage/innobase/fts/fts0pars.y
index 1f4ec9922e3b..8786673815e2 100644
--- a/storage/innobase/fts/fts0pars.y
+++ b/storage/innobase/fts/fts0pars.y
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/fts0plugin.cc b/storage/innobase/fts/fts0plugin.cc
index b68e2abc5268..bc9ca46bd02c 100644
--- a/storage/innobase/fts/fts0plugin.cc
+++ b/storage/innobase/fts/fts0plugin.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc
index adc6c44d7d08..d69afe99a920 100644
--- a/storage/innobase/fts/fts0que.cc
+++ b/storage/innobase/fts/fts0que.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -160,6 +168,9 @@ struct fts_query_t {
 	/** number of docs fetched by query. This is to restrict the
 	result with limit value */
 	ulonglong		n_docs;
+
+	ulint		nested_exp_count; /*!< number of nested sub expression
+					  limit */
 };
 
 /** For phrase matching, first we collect the documents and the positions
@@ -3084,6 +3095,17 @@ fts_ast_visit_sub_exp(
 
 	DBUG_ENTER("fts_ast_visit_sub_exp");
 
+	/* sub-expression list may contains sub-expressions.
+	So we increase sub-expression depth counter.
+	If this counter reaches to the threshold then
+	we abort the search opertion and reports an error */
+	if (query->nested_exp_count > FTS_MAX_NESTED_EXP) {
+		query->error = DB_FTS_TOO_MANY_NESTED_EXP;
+		DBUG_RETURN(query->error);
+	}
+	query->nested_exp_count++;
+
+
 	ut_a(node->type == FTS_AST_SUBEXP_LIST);
 
 	cur_oper = query->oper;
@@ -3956,7 +3978,7 @@ fts_query(
 	bool		boolean_mode;
 	trx_t*		query_trx;
 	CHARSET_INFO*	charset;
-	ulint		start_time_ms;
+	ib_time_monotonic_ms_t		start_time_ms;
 	bool		will_be_ignored = false;
 
 	boolean_mode = flags & FTS_BOOL;
@@ -3966,7 +3988,7 @@ fts_query(
 	query_trx = trx_allocate_for_background();
 	query_trx->op_info = "FTS query";
 
-	start_time_ms = ut_time_ms();
+	start_time_ms = ut_time_monotonic_ms();
 
 	query.trx = query_trx;
 	query.index = index;
@@ -4085,6 +4107,7 @@ fts_query(
 	/* Parse the input query string. */
 	if (fts_query_parse(&query, lc_query_str, result_len)) {
 		fts_ast_node_t*	ast = query.root;
+		ast->trx = trx;
 
 		/* Optimize query to check if it's a single term */
 		fts_query_can_optimize(&query, flags);
@@ -4111,6 +4134,11 @@ fts_query(
 		query.error = fts_ast_visit(
 			FTS_NONE, ast, fts_query_visitor,
 			&query, &will_be_ignored);
+		if (query.error == DB_INTERRUPTED) {
+			error = DB_INTERRUPTED;
+			ut_free(lc_query_str);
+			goto func_exit;
+		}
 
 		/* If query expansion is requested, extend the search
 		with first search pass result */
@@ -4137,10 +4165,19 @@ fts_query(
 			ut_zalloc_nokey(sizeof(**result)));
 	}
 
+	if (trx_is_interrupted(trx)) {
+		error = DB_INTERRUPTED;
+		ut_free(lc_query_str);
+		if (result != NULL) {
+			fts_query_free_result(*result);
+		}
+		goto func_exit;
+	}
+
 	ut_free(lc_query_str);
 
 	if (fts_enable_diag_print && (*result)) {
-		ulint	diff_time = ut_time_ms() - start_time_ms;
+		uint64_t diff_time = ut_time_monotonic_ms() - start_time_ms;
 
 		ib::info() << "FTS Search Processing time: "
 			<< diff_time / 1000 << " secs: " << diff_time % 1000
@@ -4449,24 +4486,27 @@ fts_phrase_or_proximity_search(
 			if (k == ib_vector_size(query->match_array[j])) {
 				end_list = TRUE;
 
-				if (match[j]->doc_id != match[0]->doc_id) {
-					/* no match */
-					if (query->flags & FTS_PHRASE) {
-						ulint	s;
+				if (query->flags & FTS_PHRASE) {
+					ulint	s;
+					/* Since i is the last doc id in the
+					match_array[j], remove all doc ids > i
+					from the match_array[0]. */
+					fts_match_t*    match_temp;
+					for (s = i + 1; s < n_matched; s++) {
+						match_temp = static_cast<
+						fts_match_t*>(ib_vector_get(
+						query->match_array[0], s));
+						match_temp->doc_id = 0;
+					}
 
+					if (match[j]->doc_id !=
+						match[0]->doc_id) {
+						/* no match */
 						match[0]->doc_id = 0;
-
-						for (s = i + 1; s < n_matched;
-						     s++) {
-							match[0] = static_cast<
-							fts_match_t*>(
-							ib_vector_get(
-							query->match_array[0],
-							s));
-							match[0]->doc_id = 0;
-						}
 					}
+				}
 
+				if (match[j]->doc_id != match[0]->doc_id) {
 					goto func_exit;
 				}
 			}
diff --git a/storage/innobase/fts/fts0sql.cc b/storage/innobase/fts/fts0sql.cc
index 4900ff3be1a4..780b885be023 100644
--- a/storage/innobase/fts/fts0sql.cc
+++ b/storage/innobase/fts/fts0sql.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/fts0tlex.cc b/storage/innobase/fts/fts0tlex.cc
index 4cb09784e03b..a447f94ff3ee 100644
--- a/storage/innobase/fts/fts0tlex.cc
+++ b/storage/innobase/fts/fts0tlex.cc
@@ -447,19 +447,27 @@ static yyconst flex_int16_t yy_chk[29] =
 #line 1 "fts0tlex.l"
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 *****************************************************************************/
 /**
diff --git a/storage/innobase/fts/fts0tlex.l b/storage/innobase/fts/fts0tlex.l
index 242bfebda525..8d49ca1475cc 100644
--- a/storage/innobase/fts/fts0tlex.l
+++ b/storage/innobase/fts/fts0tlex.l
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fts/make_parser.sh b/storage/innobase/fts/make_parser.sh
index 52b63eff6745..c1e54a8fde4a 100755
--- a/storage/innobase/fts/make_parser.sh
+++ b/storage/innobase/fts/make_parser.sh
@@ -1,14 +1,22 @@
 #!/bin/sh
 #
-# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fut/fut0fut.cc b/storage/innobase/fut/fut0fut.cc
index 9bb1c512182d..484b5aad9ea0 100644
--- a/storage/innobase/fut/fut0fut.cc
+++ b/storage/innobase/fut/fut0fut.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/fut/fut0lst.cc b/storage/innobase/fut/fut0lst.cc
index 3a1d39e81141..88187beca104 100644
--- a/storage/innobase/fut/fut0lst.cc
+++ b/storage/innobase/fut/fut0lst.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/gis/gis0geo.cc b/storage/innobase/gis/gis0geo.cc
index 7d85106a5c9b..a4d5906ac368 100644
--- a/storage/innobase/gis/gis0geo.cc
+++ b/storage/innobase/gis/gis0geo.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
index ee89e0a913f5..34def748eda0 100644
--- a/storage/innobase/gis/gis0rtree.cc
+++ b/storage/innobase/gis/gis0rtree.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -663,7 +671,6 @@ rtr_adjust_upper_level(
 
 	/* Create a memory heap where the data tuple is stored */
 	heap = mem_heap_create(1024);
-	memset(&cursor, 0, sizeof(cursor));
 
 	cursor.thr = sea_cur->thr;
 
@@ -728,15 +735,30 @@ rtr_adjust_upper_level(
 		cursor.rtr_info = sea_cur->rtr_info;
 		cursor.tree_height = sea_cur->tree_height;
 
+		mem_heap_t *new_heap = NULL;
+
+		DBUG_EXECUTE_IF("rtr_page_need_first_split", {
+			DBUG_SET("+d,rtr_page_need_second_split");
+		});
+
 		err = btr_cur_pessimistic_insert(flags
 						 | BTR_NO_LOCKING_FLAG
 						 | BTR_KEEP_SYS_FLAG
 						 | BTR_NO_UNDO_LOG_FLAG,
-						 &cursor, &offsets, &heap,
+						 &cursor, &offsets, &new_heap,
 						 node_ptr_upper, &rec,
 						 &dummy_big_rec, 0, NULL, mtr);
+
+		DBUG_EXECUTE_IF("rtr_page_need_first_split", {
+			DBUG_SET("-d,rtr_page_need_second_split");
+		});
+
 		cursor.rtr_info = NULL;
 		ut_a(err == DB_SUCCESS);
+
+		if (new_heap) {
+			mem_heap_free(new_heap);
+		}
 	}
 
 	prdt.data = static_cast<void*>(mbr);
@@ -1032,6 +1054,7 @@ rtr_page_split_and_insert(
 	}
 
 func_start:
+	ut_ad(tuple->m_heap != *heap);
 	mem_heap_empty(*heap);
 	*offsets = NULL;
 
@@ -1346,7 +1369,6 @@ rtr_ins_enlarge_mbr(
 	page_cur_t*		page_cursor;
 	ulint*			offsets;
 	node_visit_t*		node_visit;
-	btr_cur_t		cursor;
 	page_t*			page;
 
 	ut_ad(dict_index_is_spatial(index));
@@ -1380,7 +1402,7 @@ rtr_ins_enlarge_mbr(
 		rtr_page_cal_mbr(index, block, &new_mbr, heap);
 
 		/* Get father block. */
-		memset(&cursor, 0, sizeof(cursor));
+		btr_cur_t cursor;
 		offsets = rtr_page_get_father_block(
 			NULL, heap, index, block, mtr, btr_cur, &cursor);
 
@@ -1472,7 +1494,9 @@ rtr_page_copy_rec_list_end_no_locks(
 						   ULINT_UNDEFINED, &heap);
 			cmp = cmp_rec_rec_with_match(cur1_rec, cur_rec,
 						     offsets1, offsets2,
-						     index, FALSE,
+						     index,
+						     page_is_spatial_non_leaf(cur1_rec, index),
+						     false,
 						     &cur_matched_fields);
 			if (cmp < 0) {
 				page_cur_move_to_prev(&page_cur);
@@ -1591,7 +1615,9 @@ rtr_page_copy_rec_list_start_no_locks(
 						   ULINT_UNDEFINED, &heap);
 			cmp = cmp_rec_rec_with_match(cur1_rec, cur_rec,
 						     offsets1, offsets2,
-						     index, FALSE,
+						     index,
+						     page_is_spatial_non_leaf(cur1_rec, index),
+						     false,
 						     &cur_matched_fields);
 			if (cmp < 0) {
 				page_cur_move_to_prev(&page_cur);
diff --git a/storage/innobase/gis/gis0sea.cc b/storage/innobase/gis/gis0sea.cc
index b7a061a8fef5..aa3cd3f61ca8 100644
--- a/storage/innobase/gis/gis0sea.cc
+++ b/storage/innobase/gis/gis0sea.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -385,8 +393,7 @@ rtr_pcur_getnext_from_path(
 		if (mode != PAGE_CUR_RTREE_INSERT
 		    && mode != PAGE_CUR_RTREE_LOCATE
 		    && mode >= PAGE_CUR_CONTAIN
-		    && btr_cur->rtr_info->need_prdt_lock
-		    && found) {
+		    && btr_cur->rtr_info->need_prdt_lock) {
 			lock_prdt_t	prdt;
 
 			trx_t*		trx = thr_get_trx(
@@ -1258,7 +1265,23 @@ rtr_check_discard_page(
 	lock_prdt_page_free_from_discard(block, lock_sys->prdt_page_hash);
 	lock_mutex_exit();
 }
-
+/** This is a backported version of a lambda expression:
+  [&](buf_block_t *hint) {
+     return hint != nullptr && buf_page_optimistic_get(...hint...);
+  }
+for compilers which do not support lambda expressions, nor passing local types
+as template arguments. */
+struct Buf_page_optimistic_get_functor_t{
+	btr_pcur_t * &r_cursor;
+	const char * &file;
+	ulint &line;
+	mtr_t * &mtr;
+	bool operator()(buf_block_t *hint) const {
+		return hint != NULL && buf_page_optimistic_get(
+			RW_X_LATCH, hint, r_cursor->modify_clock, file, line, mtr
+		);
+	}
+};
 /**************************************************************//**
 Restores the stored position of a persistent cursor bufferfixing the page */
 bool
@@ -1294,11 +1317,8 @@ rtr_cur_restore_position_func(
 	);
 
 	ut_ad(latch_mode == BTR_CONT_MODIFY_TREE);
-
-	if (!buf_pool_is_obsolete(r_cursor->withdraw_clock)
-	    && buf_page_optimistic_get(RW_X_LATCH,
-				    r_cursor->block_when_stored,
-				    r_cursor->modify_clock, file, line, mtr)) {
+	Buf_page_optimistic_get_functor_t functor={r_cursor,file,line,mtr};
+	if (r_cursor->block_when_stored.run_with_hint(functor)){
 		ut_ad(r_cursor->pos_state == BTR_PCUR_IS_POSITIONED);
 
 		ut_ad(r_cursor->rel_pos == BTR_PCUR_ON);
@@ -1329,7 +1349,7 @@ rtr_cur_restore_position_func(
 
 				ut_ad(!cmp_rec_rec(r_cursor->old_rec,
 						   rec, offsets1, offsets2,
-						   index));
+						   index,page_is_spatial_non_leaf(rec, index)));
 			}
 
 			mem_heap_free(heap);
@@ -1399,7 +1419,7 @@ rtr_cur_restore_position_func(
 			r_cursor->pos_state = BTR_PCUR_IS_POSITIONED;
 			ret = true;
 		} else if (!cmp_rec_rec(r_cursor->old_rec, rec, offsets1, offsets2,
-				 index)) {
+				 index,page_is_spatial_non_leaf(rec, index))) {
 			r_cursor->pos_state = BTR_PCUR_IS_POSITIONED;
 			ret = true;
 		}
@@ -1547,7 +1567,7 @@ rtr_copy_buf(
 	will be copied. It is also undefined what will happen with the
 	newly memcpy()ed mutex if the source mutex was acquired by
 	(another) thread while it was copied. */
-	memcpy(&matches->block.page, &block->page, sizeof(buf_page_t));
+	new (&matches->block.page) buf_page_t(block->page);
 	matches->block.frame = block->frame;
 #ifndef UNIV_HOTBACKUP
 	matches->block.unzip_LRU = block->unzip_LRU;
@@ -1966,7 +1986,7 @@ rtr_cur_search_with_match(
 						  &heap);
 
 			ut_ad(cmp_rec_rec(test_rec.r_rec, last_match_rec,
-					  offsets2, offsets, index) == 0);
+					  offsets2, offsets, index, false) == 0);
 #endif /* UNIV_DEBUG */
 			/* Pop the last match record and position on it */
 			match_rec->matched_recs->pop_back();
diff --git a/storage/innobase/ha/ha0ha.cc b/storage/innobase/ha/ha0ha.cc
index 2e18891304e5..d477443b701f 100644
--- a/storage/innobase/ha/ha0ha.cc
+++ b/storage/innobase/ha/ha0ha.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ha/ha0storage.cc b/storage/innobase/ha/ha0storage.cc
index a36fd573a4f9..59560556509c 100644
--- a/storage/innobase/ha/ha0storage.cc
+++ b/storage/innobase/ha/ha0storage.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ha/hash0hash.cc b/storage/innobase/ha/hash0hash.cc
index 234fd7ac0329..a8bc71f6dffb 100644
--- a/storage/innobase/ha/hash0hash.cc
+++ b/storage/innobase/ha/hash0hash.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 9b2ef2f234d6..d913bae0647d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 Copyright (c) 2012, Facebook Inc.
@@ -18,13 +18,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -320,6 +328,9 @@ static const char* innobase_change_buffering_values[IBUF_USE_COUNT] = {
 	"all"		/* IBUF_USE_ALL */
 };
 
+/* Deprecation warning text */
+const char PARTITION_IN_SHARED_TABLESPACE_WARNING[] =
+  "InnoDB : A table partition in a shared tablespace";
 
 /* This tablespace name is reserved by InnoDB in order to explicitly
 create a file_per_table tablespace for the table. */
@@ -441,6 +452,7 @@ static PSI_mutex_info all_innodb_mutexes[] = {
 	PSI_KEY(zip_pad_mutex),
 	PSI_KEY(row_drop_list_mutex),
 	PSI_KEY(master_key_id_mutex),
+	PSI_KEY(analyze_index_mutex),
 };
 # endif /* UNIV_PFS_MUTEX */
 
@@ -591,20 +603,22 @@ srv_mbr_debug(const byte* data)
 	ut_ad(a && b && c &&d);
 }
 #endif
-/*************************************************************//**
-Check whether valid argument given to innodb_ft_*_stopword_table.
+
+/**Check whether valid argument given to innobase_*_stopword_table.
 This function is registered as a callback with MySQL.
+@param[in]	thd		thread handle
+@param[in]	var		pointer to system variable
+@param[out]	save		immediate result for update function
+@param[in]	value		incoming string
 @return 0 for valid stopword table */
 static
 int
 innodb_stopword_table_validate(
 /*===========================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to system
-						variable */
-	void*				save,	/*!< out: immediate result
-						for update function */
-	struct st_mysql_value*		value);	/*!< in: incoming string */
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				save,
+	struct st_mysql_value*		value);
 
 /** Validate passed-in "value" is a valid directory name.
 This function is registered as a callback with MySQL.
@@ -1269,6 +1283,17 @@ innobase_fts_store_docid(
 	dbug_tmp_restore_column_map(tbl->write_set, old_map);
 }
 
+/*****************************************************************//**
+Checks if the filename name is reserved in InnoDB.
+@return true if the name is reserved */
+static
+bool
+innobase_check_reserved_file_name(
+/*===================*/
+        handlerton*     hton,           /*!< in: handlerton of Innodb */
+        const char*     name);          /*!< in: Name of the database */
+
+
 /*************************************************************//**
 Check for a valid value of innobase_commit_concurrency.
 @return 0 for valid innodb_commit_concurrency */
@@ -1482,13 +1507,12 @@ innobase_srv_conc_enter_innodb(
 	row_prebuilt_t*	prebuilt)
 {
 	/* We rely on server to do external_lock(F_UNLCK) to reset the
-	srv_conc.n_active counter. Since there are no locks on instrinsic
-	tables, we should skip this for intrinsic temporary tables. */
-	if (dict_table_is_intrinsic(prebuilt->table)) {
+	srv_conc.n_active counter.*/
+	if (skip_concurrency_ticket(prebuilt)) {
 		return;
 	}
 
-	trx_t*	trx	= prebuilt->trx;
+	trx_t*  trx     = prebuilt->trx;
 	if (srv_thread_concurrency) {
 		if (trx->n_tickets_to_enter_innodb > 0) {
 
@@ -1520,9 +1544,8 @@ innobase_srv_conc_exit_innodb(
 	row_prebuilt_t*	prebuilt)
 {
 	/* We rely on server to do external_lock(F_UNLCK) to reset the
-	srv_conc.n_active counter. Since there are no locks on instrinsic
-	tables, we should skip this for intrinsic temporary tables. */
-	if (dict_table_is_intrinsic(prebuilt->table)) {
+	srv_conc.n_active counter.*/
+	if (skip_concurrency_ticket(prebuilt)) {
 		return;
 	}
 
@@ -1561,6 +1584,36 @@ innobase_srv_conc_force_exit_innodb(
 	}
 }
 
+ibool
+skip_concurrency_ticket(row_prebuilt_t* prebuilt) {
+	/* Since there are no locks on instrinsic tables,
+	we should skip this for intrinsic temporary tables.*/
+	if (dict_table_is_intrinsic(prebuilt->table)) {
+		return true;
+	}
+
+	THD *thd =  prebuilt->trx->mysql_thd;
+	if (thd == NULL) {
+		thd = current_thd;
+	}
+	/* Skip concurrency ticket in following cases
+	 (a) while implicitly updating GTID table.This
+	 is to avoid deadlock otherwise possible with
+	 low innodb_thread_concurrency.
+	 Session: RESET MASTER -> FLUSH LOGS -> get innodb ticket
+	 -> wait for GTID flush.
+	 GTID Background: Write to GTID table -> wait for innodb ticket.
+         (b) For attachable transaction. If a attachable trx in
+	 thread asks for a ticket while the main transaction
+	 has reserved a ticket. */
+	if (thd && (thd_has_active_attachable_trx(thd)
+		|| thd_is_operating_gtid_table_implicitly(thd))) {
+		return true;
+	}
+
+	return false;
+}
+
 /******************************************************************//**
 Returns the NUL terminated value of glob_hostname.
 @return pointer to glob_hostname. */
@@ -1734,7 +1787,7 @@ innobase_release_temporary_latches(
 	handlerton*	hton,	/*!< in: handlerton */
 	THD*		thd)	/*!< in: MySQL thread */
 {
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (!innodb_inited) {
 
@@ -1958,24 +2011,27 @@ convert_error_code_to_mysql(
 		return(HA_ERR_WRONG_FILE_NAME);
 	case DB_COMPUTE_VALUE_FAILED:
 		return(HA_ERR_COMPUTE_FAILED);
+	case DB_FTS_TOO_MANY_NESTED_EXP:
+		return(HA_ERR_FTS_TOO_MANY_NESTED_EXP);
 	}
 }
 
 /*************************************************************//**
 Prints info of a THD object (== user session thread) to the given file. */
-void
-innobase_mysql_print_thd(
-/*=====================*/
-	FILE*	f,		/*!< in: output stream */
-	THD*	thd,		/*!< in: MySQL THD object */
-	uint	max_query_len)	/*!< in: max query length to print, or 0 to
-				use the default max length */
+void innobase_mysql_print_thd(FILE *f,            /*!< in: output stream */
+                              THD *thd,           /*!< in: MySQL THD object */
+                              uint max_query_len) /*!< in: max query length to
+                                                  print, must be positive */
 {
-	char	buffer[1024];
+  // This is meant to be an upper bound for non-SQL part of the context,
+  // such as trx's id, state and stats.
+  ut_a(0 < max_query_len);
+  const size_t ADDITIONAL_CTX_LEN = 1024;
+  std::vector<char> buffer(ADDITIONAL_CTX_LEN + max_query_len);
 
-	fputs(thd_security_context(thd, buffer, sizeof buffer,
-				   max_query_len), f);
-	putc('\n', f);
+  fputs(thd_security_context(thd, buffer.data(), buffer.size(), max_query_len),
+        f);
+  putc('\n', f);
 }
 
 /******************************************************************//**
@@ -2212,6 +2268,9 @@ innobase_get_lower_case_table_names(void)
 	return(lower_case_table_names);
 }
 
+/** return one of the temporary dir from tmpdir
+@return temporary directory */
+char *innobase_mysql_tmpdir(void) { return (mysql_tmpdir); }
 
 /** Creates a temporary file in the location specified by the parameter
 path. If the path is NULL, then it will be created in tmpdir.
@@ -2558,8 +2617,8 @@ innobase_trx_init(
 	trx_t*	trx)	/*!< in/out: InnoDB transaction handle */
 {
 	DBUG_ENTER("innobase_trx_init");
-	DBUG_ASSERT(EQ_CURRENT_THD(thd));
-	DBUG_ASSERT(thd == trx->mysql_thd);
+	assert(EQ_CURRENT_THD(thd));
+	assert(thd == trx->mysql_thd);
 
 	trx->check_foreigns = !thd_test_options(
 		thd, OPTION_NO_FOREIGN_KEY_CHECKS);
@@ -2581,8 +2640,8 @@ innobase_trx_allocate(
 	trx_t*	trx;
 
 	DBUG_ENTER("innobase_trx_allocate");
-	DBUG_ASSERT(thd != NULL);
-	DBUG_ASSERT(EQ_CURRENT_THD(thd));
+	assert(thd != NULL);
+	assert(EQ_CURRENT_THD(thd));
 
 	trx = trx_allocate_for_mysql();
 
@@ -2653,15 +2712,17 @@ innodb_replace_trx_in_thd(
 		ut_ad(trx == NULL
 		      || (trx->mysql_thd == thd && !trx->is_recovered));
 
-	} else if (trx->state == TRX_STATE_NOT_STARTED) {
-		ut_ad(thd == trx->mysql_thd);
-		trx_free_for_mysql(trx);
-	} else {
-		ut_ad(thd == trx->mysql_thd);
-		ut_ad(trx_state_eq(trx, TRX_STATE_PREPARED));
-		trx_disconnect_prepared(trx);
-	}
-	trx = static_cast<trx_t*>(new_trx_arg);
+	} else if (trx != NULL) {
+    if (trx->state == TRX_STATE_NOT_STARTED) {
+      ut_ad(thd == trx->mysql_thd);
+      trx_free_for_mysql(trx);
+    } else {
+      ut_ad(thd == trx->mysql_thd);
+      ut_ad(trx_state_eq(trx, TRX_STATE_PREPARED));
+      trx_disconnect_prepared(trx);
+    }
+  }
+  trx = static_cast<trx_t *>(new_trx_arg);
 }
 
 /*********************************************************************//**
@@ -2829,7 +2890,7 @@ ha_innobase::update_thd(
 		   m_user_thd, thd));
 
 	/* The table should have been opened in ha_innobase::open(). */
-	DBUG_ASSERT(m_prebuilt->table->n_ref_count > 0);
+	assert(m_prebuilt->table->n_ref_count > 0);
 
 	trx_t*	trx = check_trx_exists(thd);
 
@@ -2847,8 +2908,8 @@ ha_innobase::update_thd(
 
 	m_user_thd = thd;
 
-	DBUG_ASSERT(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
-	DBUG_ASSERT(m_prebuilt->trx == thd_to_trx(m_user_thd));
+	assert(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
+	assert(m_prebuilt->trx == thd_to_trx(m_user_thd));
 
 	DBUG_VOID_RETURN;
 }
@@ -2883,7 +2944,7 @@ innobase_register_trx(
 	THD*		thd,	/* in: MySQL thd (connection) object */
 	trx_t*		trx)	/* in: transaction to register */
 {
-	const ulonglong	trx_id = static_cast<const ulonglong>(
+	const ulonglong	trx_id = static_cast<ulonglong>(
 		trx_get_id_for_print(trx));
 
 	trans_register_ha(thd, FALSE, hton, &trx_id);
@@ -3233,6 +3294,7 @@ ha_innobase::reset_template(void)
 	m_prebuilt->keep_other_fields_on_keyread = 0;
 	m_prebuilt->read_just_key = 0;
 	m_prebuilt->in_fts_query = 0;
+        m_prebuilt->m_end_range = false;
 
 	/* Reset index condition pushdown state. */
 	if (m_prebuilt->idx_cond) {
@@ -3365,6 +3427,8 @@ static bool innobase_is_supported_system_table(const char *db,
 							"time_zone_name",
 							"time_zone_transition",
 							"time_zone_transition_type",
+							"innodb_table_stats",
+							"innodb_index_stats",
 							(const char *)NULL };
 
 	if (!is_sql_layer_system_table)
@@ -3529,13 +3593,15 @@ innobase_init(
 	innobase_hton->show_status = innobase_show_status;
 	innobase_hton->fill_is_table = innobase_fill_i_s_table;
 	innobase_hton->flags =
-		HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS;
+		HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS |
+		HTON_SUPPORTS_TABLE_ENCRYPTION;
 
 	innobase_hton->release_temporary_latches =
 		innobase_release_temporary_latches;
         innobase_hton->replace_native_transaction_in_thd =
                 innodb_replace_trx_in_thd;
 	innobase_hton->data = &innodb_api_cb;
+	innobase_hton->is_reserved_db_name= innobase_check_reserved_file_name;
 
 	innobase_hton->is_supported_system_table=
 		innobase_is_supported_system_table;
@@ -3545,7 +3611,7 @@ innobase_init(
 
 	ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	static const char	test_filename[] = "-@";
 	char			test_tablename[sizeof test_filename
 				+ sizeof(srv_mysql50_table_name_prefix) - 1];
@@ -3563,7 +3629,7 @@ innobase_init(
 		sql_print_error("tablename encoding has been changed");
 		DBUG_RETURN(innobase_init_abort());
 	}
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 	/* Check that values don't overflow on 32-bit systems. */
 	if (sizeof(ulint) == 4) {
@@ -3646,6 +3712,8 @@ innobase_init(
 
 	/* Supports raw devices */
 	if (!srv_sys_space.parse_params(innobase_data_file_path, true)) {
+		ib::error() << "Unable to parse innodb_data_file_path="
+			    << innobase_data_file_path;
 		DBUG_RETURN(innobase_init_abort());
 	}
 
@@ -3668,6 +3736,8 @@ innobase_init(
 	srv_tmp_space.set_flags(fsp_flags);
 
 	if (!srv_tmp_space.parse_params(innobase_temp_data_file_path, false)) {
+		ib::error() << "Unable to parse innodb_temp_data_file_path="
+			    << innobase_temp_data_file_path;
 		DBUG_RETURN(innobase_init_abort());
 	}
 
@@ -4027,6 +4097,8 @@ innobase_init(
 
 #endif /* HAVE_PSI_INTERFACE */
 
+	os_event_global_init();
+
 	/* Set buffer pool size to default for fast startup when mysqld is
 	run with --help --verbose options. */
 	ulint	srv_buf_pool_size_org = 0;
@@ -4153,7 +4225,7 @@ innobase_end(
 	int	err= 0;
 
 	DBUG_ENTER("innobase_end");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (innodb_inited) {
 
@@ -4170,9 +4242,12 @@ innobase_end(
 
 		innobase_space_shutdown();
 
+
 		mysql_mutex_destroy(&innobase_share_mutex);
 		mysql_mutex_destroy(&commit_cond_m);
 		mysql_cond_destroy(&commit_cond);
+
+		os_event_global_destroy();
 	}
 
 	DBUG_RETURN(err);
@@ -4190,7 +4265,7 @@ innobase_flush_logs(
 	bool		binlog_group_flush)
 {
 	DBUG_ENTER("innobase_flush_logs");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (srv_read_only_mode) {
 		DBUG_RETURN(false);
@@ -4245,7 +4320,7 @@ innobase_start_trx_and_assign_read_view(
 				whom the transaction should be committed */
 {
 	DBUG_ENTER("innobase_start_trx_and_assign_read_view");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	/* Create a new trx struct for thd, if it does not yet have one */
 
@@ -4303,7 +4378,7 @@ innobase_commit(
 					ended */
 {
 	DBUG_ENTER("innobase_commit");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 	DBUG_PRINT("trans", ("ending transaction"));
 
 	trx_t*	trx = check_trx_exists(thd);
@@ -4457,7 +4532,7 @@ innobase_rollback(
 					statement only */
 {
 	DBUG_ENTER("innobase_rollback");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 	DBUG_PRINT("trans", ("aborting transaction"));
 
 	trx_t*	trx = check_trx_exists(thd);
@@ -4568,7 +4643,7 @@ innobase_rollback_to_savepoint(
 {
 
 	DBUG_ENTER("innobase_rollback_to_savepoint");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = check_trx_exists(thd);
 
@@ -4610,7 +4685,7 @@ innobase_rollback_to_savepoint_can_release_mdl(
 					be rolled back to savepoint */
 {
 	DBUG_ENTER("innobase_rollback_to_savepoint_can_release_mdl");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = check_trx_exists(thd);
 
@@ -4645,7 +4720,7 @@ innobase_release_savepoint(
 	char		name[64];
 
 	DBUG_ENTER("innobase_release_savepoint");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx = check_trx_exists(thd);
 
@@ -4676,7 +4751,7 @@ innobase_savepoint(
 	void*		savepoint)/*!< in: savepoint data */
 {
 	DBUG_ENTER("innobase_savepoint");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	/* In the autocommit mode there is no sense to set a savepoint
 	(unless we are in sub-statement), so SQL layer ensures that
@@ -4689,7 +4764,7 @@ innobase_savepoint(
 	innobase_srv_conc_force_exit_innodb(trx);
 
 	/* Cannot happen outside of transaction */
-	DBUG_ASSERT(trx_is_registered_for_2pc(trx));
+	assert(trx_is_registered_for_2pc(trx));
 
 	/* TODO: use provided savepoint data area to store savepoint data */
 	char	name[64];
@@ -4718,7 +4793,7 @@ innobase_close_connection(
 {
 
 	DBUG_ENTER("innobase_close_connection");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = thd_to_trx(thd);
 	bool	free_trx = false;
@@ -4812,7 +4887,7 @@ innobase_kill_connection(
 				killed */
 {
 	DBUG_ENTER("innobase_kill_connection");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = thd_to_trx(thd);
 
@@ -4916,7 +4991,11 @@ ha_innobase::index_type(
 {
 	dict_index_t*	index = innobase_get_index(keynr);
 
-	if (index && index->type & DICT_FTS) {
+	if (index == NULL) {
+		return("NONE");
+	}
+
+	if (index->type & DICT_FTS) {
 		return("FULLTEXT");
 	} else if (dict_index_is_spatial(index)) {
 		return("SPATIAL");
@@ -5077,7 +5156,7 @@ create_table_info_t::normalize_table_name_low(
 		ptr--;
 	}
 
-	DBUG_ASSERT(ptr >= name);
+	assert(ptr >= name);
 
 	/* seek to the last but one path separator or one char before
 	the beginning of name */
@@ -5104,7 +5183,7 @@ create_table_info_t::normalize_table_name_low(
 	}
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 /*********************************************************************
 Test normalize_table_name_low(). */
 static
@@ -5230,7 +5309,7 @@ test_ut_format_name()
 		}
 	}
 }
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 /** Match index columns between MySQL and InnoDB.
 This function checks whether the index column information
@@ -5849,11 +5928,7 @@ ha_innobase::open(
 	normalize_table_name(norm_name, name);
 
 	m_user_thd = NULL;
-
-	if (!(m_share = get_share(name))) {
-
-		DBUG_RETURN(1);
-	}
+	m_share = NULL;
 
 	/* Will be allocated if it is needed in ::update_row() */
 	m_upd_buf = NULL;
@@ -5887,6 +5962,18 @@ ha_innobase::open(
 		ut_ad(dict_table_is_intrinsic(ib_table));
 	}
 
+	/* m_share might hold pointers to dict table indexes without any pin.
+	We must always allocate m_share after opening the dict_table_t object
+	and free it before de-allocating dict_table_t to avoid race. */
+	if (ib_table != NULL) {
+		m_share = get_share(name);
+		if (m_share == NULL) {
+			dict_table_close(ib_table, FALSE, FALSE);
+			DBUG_RETURN(HA_ERR_SE_OUT_OF_MEMORY);
+		}
+	}
+
+
 	if (ib_table != NULL
 	    && ((!DICT_TF2_FLAG_IS_SET(ib_table, DICT_TF2_FTS_HAS_DOC_ID)
 		 && table->s->fields != dict_table_get_n_tot_u_cols(ib_table))
@@ -5905,6 +5992,7 @@ ha_innobase::open(
 		/* Mark this table as corrupted, so the drop table
 		or force recovery can still use it, but not others. */
 		ib_table->corrupted = true;
+		free_share(m_share);
 		dict_table_close(ib_table, FALSE, FALSE);
 		ib_table = NULL;
 		is_part = NULL;
@@ -5920,11 +6008,11 @@ ha_innobase::open(
 		/* Mark this table as corrupted, so the drop table
 		or force recovery can still use it, but not others. */
 
+		free_share(m_share);
 		dict_table_close(ib_table, FALSE, FALSE);
 		ib_table = NULL;
 		is_part = NULL;
 
-		free_share(m_share);
 		my_error(ER_CANNOT_FIND_KEY_IN_KEYRING, MYF(0));
 
 		DBUG_RETURN(HA_ERR_TABLE_CORRUPT);
@@ -5941,7 +6029,6 @@ ha_innobase::open(
 			" internal data dictionary of InnoDB though the .frm"
 			" file for the table exists. " << TROUBLESHOOTING_MSG;
 
-		free_share(m_share);
 		set_my_errno(ENOENT);
 
 		DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
@@ -6326,7 +6413,7 @@ ha_innobase::clone(
 		handler::clone(name, mem_root));
 
 	if (new_handler != NULL) {
-		DBUG_ASSERT(new_handler->m_prebuilt != NULL);
+		assert(new_handler->m_prebuilt != NULL);
 
 		new_handler->m_prebuilt->select_lock_type
 			= m_prebuilt->select_lock_type;
@@ -6337,14 +6424,23 @@ ha_innobase::clone(
 
 
 uint
-ha_innobase::max_supported_key_part_length() const
+ha_innobase::max_supported_key_part_length(HA_CREATE_INFO *create_info) const
 /*==============================================*/
 {
 	/* A table format specific index column length check will be performed
 	at ha_innobase::add_index() and row_create_index_for_mysql() */
-	return(innobase_large_prefix
-		? REC_VERSION_56_MAX_INDEX_COL_LEN
-		: REC_ANTELOPE_MAX_INDEX_COL_LEN - 1);
+	switch (create_info->row_type) {
+	case ROW_TYPE_REDUNDANT:
+	case ROW_TYPE_COMPACT:
+		return (REC_ANTELOPE_MAX_INDEX_COL_LEN - 1);
+		break;
+	default:
+		if (innobase_large_prefix)
+			return (REC_VERSION_56_MAX_INDEX_COL_LEN);
+		else
+			return (REC_ANTELOPE_MAX_INDEX_COL_LEN - 1);
+	}
+
 }
 
 /******************************************************************//**
@@ -6363,6 +6459,8 @@ ha_innobase::close()
 		innobase_release_temporary_latches(ht, thd);
 	}
 
+	free_share(m_share);
+
 	row_prebuilt_free(m_prebuilt, FALSE);
 
 	if (m_upd_buf != NULL) {
@@ -6372,8 +6470,6 @@ ha_innobase::close()
 		m_upd_buf_size = 0;
 	}
 
-	free_share(m_share);
-
 	MONITOR_INC(MONITOR_TABLE_CLOSE);
 
 	/* Tell InnoDB server that there might be work for
@@ -6604,11 +6700,11 @@ get_innobase_type_from_mysql_type(
 	8 bits: this is used in ibuf and also when DATA_NOT_NULL is ORed to
 	the type */
 
-	DBUG_ASSERT((ulint)MYSQL_TYPE_STRING < 256);
-	DBUG_ASSERT((ulint)MYSQL_TYPE_VAR_STRING < 256);
-	DBUG_ASSERT((ulint)MYSQL_TYPE_DOUBLE < 256);
-	DBUG_ASSERT((ulint)MYSQL_TYPE_FLOAT < 256);
-	DBUG_ASSERT((ulint)MYSQL_TYPE_DECIMAL < 256);
+	assert((ulint)MYSQL_TYPE_STRING < 256);
+	assert((ulint)MYSQL_TYPE_VAR_STRING < 256);
+	assert((ulint)MYSQL_TYPE_DOUBLE < 256);
+	assert((ulint)MYSQL_TYPE_FLOAT < 256);
+	assert((ulint)MYSQL_TYPE_DECIMAL < 256);
 
 	if (field->flags & UNSIGNED_FLAG) {
 
@@ -6674,7 +6770,7 @@ get_innobase_type_from_mysql_type(
 		case MYSQL_TYPE_TIMESTAMP:
 			return(DATA_INT);
 		default: /* Fall through */
-			DBUG_ASSERT((ulint)MYSQL_TYPE_DECIMAL < 256);
+			assert((ulint)MYSQL_TYPE_DECIMAL < 256);
 		case MYSQL_TYPE_TIME2:
 		case MYSQL_TYPE_DATETIME2:
 		case MYSQL_TYPE_TIMESTAMP2:
@@ -6850,12 +6946,22 @@ build_template_field(
 		templ->clust_rec_field_no = v_no;
 		if (dict_index_is_clust(index)) {
 			templ->rec_field_no = templ->clust_rec_field_no;
+			templ->icp_rec_field_no = ULINT_UNDEFINED;
 		} else {
+
 			templ->rec_field_no
 				= dict_index_get_nth_col_or_prefix_pos(
 					index, v_no, FALSE, true);
+			/* Virtual columns may have to be read from the
+			secondary index before evaluating a pushed down
+			end-range condition in row_search_end_range_check().*/
+			templ->icp_rec_field_no =
+				templ->rec_field_no != ULINT_UNDEFINED ?
+				templ->rec_field_no :
+				dict_index_get_nth_col_or_prefix_pos(
+					index, v_no, true ,true);
+
 		}
-		templ->icp_rec_field_no = ULINT_UNDEFINED;
 	}
 
 	if (field->real_maybe_null()) {
@@ -8641,7 +8747,7 @@ ha_innobase::index_read(
 	/* Note that if the index for which the search template is built is not
 	necessarily m_prebuilt->index, but can also be the clustered index */
 
-	if (m_prebuilt->sql_stat_start) {
+	if (m_prebuilt->sql_stat_start && !can_reuse_mysql_template()) {
 		build_template(false);
 	}
 
@@ -8658,7 +8764,7 @@ ha_innobase::index_read(
 			(ulint) key_len,
 			m_prebuilt->trx);
 
-		DBUG_ASSERT(m_prebuilt->search_tuple->n_fields > 0);
+		assert(m_prebuilt->search_tuple->n_fields > 0);
 	} else {
 		/* We position the cursor to the last or the first entry
 		in the index */
@@ -9814,8 +9920,7 @@ innodb_base_col_setup_for_stored(
 	for (uint i= 0; i < field->table->s->fields; ++i) {
 		const Field* base_field = field->table->field[i];
 
-		if (!innobase_is_s_fld(base_field)
-		    && !innobase_is_v_fld(base_field)
+		if (!innobase_is_v_fld(base_field)
 		    && bitmap_is_set(&field->gcol_info->base_columns_map,
 				     i)) {
 			ulint	z;
@@ -9868,7 +9973,7 @@ create_table_info_t::create_table_def()
 	DBUG_ENTER("create_table_def");
 	DBUG_PRINT("enter", ("table_name: %s", m_table_name));
 
-	DBUG_ASSERT(m_trx->mysql_thd == m_thd);
+	assert(m_trx->mysql_thd == m_thd);
 
 	/* MySQL does the name length check. But we do additional check
 	on the name length here */
@@ -10696,6 +10801,29 @@ bool
 create_table_info_t::create_option_tablespace_is_valid()
 {
 	if (!m_use_shared_space) {
+		/* Do not allow creation of a temp table
+		with innodb_file_per_table option. */
+		if ((m_create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
+		    tablespace_is_file_per_table(m_create_info)) {
+			if (THDVAR(m_thd, strict_mode)) {
+				/* Return error if STRICT mode is enabled. */
+				my_printf_error(ER_ILLEGAL_HA_CREATE_OPTION,
+					"InnoDB: TABLESPACE=%s option"
+					" is disallowed for temporary tables"
+					" with INNODB_STRICT_NODE=ON. This option is"
+					" deprecated and will be removed in a future release",
+					MYF(0), m_create_info->tablespace);
+				return(false);
+			}
+			/* STRICT mode turned off. Proceed with the
+			execution with a warning. */
+			push_warning_printf(m_thd, Sql_condition::SL_WARNING,
+				ER_ILLEGAL_HA_CREATE_OPTION,
+				"InnoDB: TABLESPACE=%s option is ignored."
+				" This option is deprecated and will be"
+				" removed in a future release.",
+				m_create_info->tablespace);
+		}
 		return(true);
 	}
 
@@ -11480,6 +11608,13 @@ create_table_info_t::innobase_table_flags()
 			m_flags2 |= DICT_TF2_INTRINSIC;
 			innodb_row_format = REC_FORMAT_DYNAMIC;
 		}
+		if (m_create_info->tablespace != NULL &&
+		    strcmp(m_create_info->tablespace, reserved_temporary_space_name) == 0) {
+			push_warning_printf(m_thd, Sql_condition::SL_WARNING,
+			    ER_ILLEGAL_HA_CREATE_OPTION,
+			    "InnoDB: TABLESPACE=innodb_temporary option is"
+			    " deprecated and will be removed in a future release.");
+		}
 	}
 
 	/* Set the table flags */
@@ -12018,23 +12153,23 @@ create_table_info_t::create_table_update_dict()
 		ut_ad(dict_table_is_intrinsic(innobase_table));
 	}
 
-	DBUG_ASSERT(innobase_table != 0);
+	assert(innobase_table != 0);
 	if (innobase_table->fts != NULL) {
 		if (innobase_table->fts_doc_id_index == NULL) {
 			innobase_table->fts_doc_id_index
 				= dict_table_get_index_on_name(
 					innobase_table, FTS_DOC_ID_INDEX_NAME);
-			DBUG_ASSERT(innobase_table->fts_doc_id_index != NULL);
+			assert(innobase_table->fts_doc_id_index != NULL);
 		} else {
-			DBUG_ASSERT(innobase_table->fts_doc_id_index
-				    == dict_table_get_index_on_name(
-						innobase_table,
-						FTS_DOC_ID_INDEX_NAME));
+			assert(innobase_table->fts_doc_id_index
+			       == dict_table_get_index_on_name(
+				       innobase_table,
+				       FTS_DOC_ID_INDEX_NAME));
 		}
 	}
 
-	DBUG_ASSERT((innobase_table->fts == NULL)
-		    == (innobase_table->fts_doc_id_index == NULL));
+	assert((innobase_table->fts == NULL)
+	       == (innobase_table->fts_doc_id_index == NULL));
 
 	innobase_copy_frm_flags_from_create_info(innobase_table, m_create_info);
 
@@ -12090,9 +12225,10 @@ create_table_info_t::create_table_update_dict()
 		dict_table_autoinc_unlock(innobase_table);
 	}
 
-	dict_table_close(innobase_table, FALSE, FALSE);
+        innobase_parse_hint_from_comment(m_thd, innobase_table, m_form->s);
+
+        dict_table_close(innobase_table, FALSE, FALSE);
 
-	innobase_parse_hint_from_comment(m_thd, innobase_table, m_form->s);
 
 	DBUG_RETURN(0);
 }
@@ -12771,7 +12907,7 @@ innobase_create_tablespace(
 	Tablespace	tablespace;
 
 	DBUG_ENTER("innobase_create_tablespace");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	/* Be sure the input parameters are valid before continuing. */
 	error = validate_create_tablespace_info(thd, alter_info);
@@ -12858,7 +12994,7 @@ innobase_drop_tablespace(
 	ulint		space_id;
 
 	DBUG_ENTER("innobase_drop_tablespace");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (srv_read_only_mode) {
 		DBUG_RETURN(HA_ERR_INNODB_READ_ONLY);
@@ -13014,7 +13150,7 @@ innobase_drop_database(
 	/* Get the transaction associated with the current thd, or create one
 	if not yet created */
 
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (srv_read_only_mode) {
 		return;
@@ -13096,7 +13232,7 @@ innobase_rename_table(
 	char	norm_from[FN_REFLEN];
 
 	DBUG_ENTER("innobase_rename_table");
-	DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
+	assert(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
 
 	ut_ad(!srv_read_only_mode);
 
@@ -13114,6 +13250,37 @@ innobase_rename_table(
 
 	row_mysql_lock_data_dictionary(trx);
 
+	dict_table_t*   table                   = NULL;
+	table = dict_table_open_on_name(norm_from, TRUE, FALSE,
+					DICT_ERR_IGNORE_NONE);
+
+	/* Since DICT_BG_YIELD has sleep for 250 milliseconds,
+	Convert	lock_wait_timeout unit from second to 250 milliseconds */
+	long int lock_wait_timeout = thd_lock_wait_timeout(thd) * 4;
+	if (table != NULL) {
+		for (dict_index_t* index = dict_table_get_first_index(table);
+		     index != NULL;
+		     index = dict_table_get_next_index(index)) {
+
+			if (index->type & DICT_FTS) {
+				/* Found */
+				while (index->index_fts_syncing
+					&& !trx_is_interrupted(trx)
+					&& (lock_wait_timeout--) > 0) {
+					DICT_BG_YIELD(trx);
+				}
+			}
+		}
+		dict_table_close(table, TRUE, FALSE);
+	}
+
+	/* FTS sync is in progress. We shall timeout this operation */
+	if (lock_wait_timeout < 0) {
+		error = DB_LOCK_WAIT_TIMEOUT;
+		row_mysql_unlock_data_dictionary(trx);
+		DBUG_RETURN(error);
+	}
+
 	/* Transaction must be flagged as a locking transaction or it hasn't
 	been started yet. */
 
@@ -13278,6 +13445,12 @@ ha_innobase::rename_table(
 		error = DB_ERROR;
 	}
 
+	else if (error == DB_LOCK_WAIT_TIMEOUT) {
+		my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0), to);
+
+		error = DB_LOCK_WAIT;
+	}
+
 	DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL));
 }
 
@@ -13471,9 +13644,9 @@ ha_innobase::records_in_range(
 		(ulint) (min_key ? min_key->length : 0),
 		m_prebuilt->trx);
 
-	DBUG_ASSERT(min_key
-		    ? range_start->n_fields > 0
-		    : range_start->n_fields == 0);
+	assert(min_key
+	       ? range_start->n_fields > 0
+	       : range_start->n_fields == 0);
 
 	row_sel_convert_mysql_key_to_innobase(
 		range_end,
@@ -13484,9 +13657,9 @@ ha_innobase::records_in_range(
 		(ulint) (max_key ? max_key->length : 0),
 		m_prebuilt->trx);
 
-	DBUG_ASSERT(max_key
-		    ? range_end->n_fields > 0
-		    : range_end->n_fields == 0);
+	assert(max_key
+	       ? range_end->n_fields > 0
+	       : range_end->n_fields == 0);
 
 	mode1 = convert_search_mode_to_innobase(
 		min_key ? min_key->flag : HA_READ_KEY_EXACT);
@@ -13898,7 +14071,7 @@ ha_innobase::info_low(
 	trx_search_latch_release_if_reserved(m_prebuilt->trx);
 
 	ib_table = m_prebuilt->table;
-	DBUG_ASSERT(ib_table->n_ref_count > 0);
+	assert(ib_table->n_ref_count > 0);
 
 	if (flag & HA_STATUS_TIME) {
 		if (is_analyze || innobase_stats_on_metadata) {
@@ -14252,7 +14425,7 @@ ha_innobase::info_low(
 		ut_a(m_prebuilt->trx);
 		ut_a(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
 
-		err_index = trx_get_error_info(m_prebuilt->trx);
+		err_index = trx_get_error_index(m_prebuilt->trx);
 
 		if (err_index) {
 			errkey = innobase_get_mysql_key_number_for_index(
@@ -14445,7 +14618,7 @@ ha_innobase::check(
 	dberr_t		ret;
 
 	DBUG_ENTER("ha_innobase::check");
-	DBUG_ASSERT(thd == ha_thd());
+	assert(thd == ha_thd());
 	ut_a(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
 	ut_a(m_prebuilt->trx == thd_to_trx(thd));
 
@@ -15205,7 +15378,12 @@ ha_innobase::extra(
 	enum ha_extra_function operation)
 			   /*!< in: HA_EXTRA_FLUSH or some other flag */
 {
-	check_trx_exists(ha_thd());
+	if (m_prebuilt->table) {
+#ifdef UNIV_DEBUG
+		if (m_prebuilt->table->n_ref_count > 0)
+#endif
+			update_thd();
+	}
 
 	/* Warning: since it is not sure that MySQL calls external_lock
 	before calling this function, the trx field in m_prebuilt can be
@@ -15280,11 +15458,14 @@ ha_innobase::end_stmt()
 
 	/* This transaction had called ha_innobase::start_stmt() */
 	trx_t*	trx = m_prebuilt->trx;
-
+	if (!dict_table_is_temporary(m_prebuilt->table) &&
+		trx != thd_to_trx(ha_thd())) {
+		ut_ad(false);
+		return(0);
+	}
 	if (trx->lock.start_stmt) {
-		TrxInInnoDB::end_stmt(trx);
-
 		trx->lock.start_stmt = false;
+		TrxInInnoDB::end_stmt(trx);
 	}
 
 	return(0);
@@ -15358,6 +15539,7 @@ ha_innobase::start_stmt(
 		case SQLCOM_INSERT:
 		case SQLCOM_UPDATE:
 		case SQLCOM_DELETE:
+		case SQLCOM_REPLACE:
 			init_table_handle_for_HANDLER();
 			m_prebuilt->select_lock_type = LOCK_X;
 			m_prebuilt->stored_select_lock_type = LOCK_X;
@@ -15412,10 +15594,8 @@ ha_innobase::start_stmt(
 
 	/* Only do it once per transaction. */
 	if (!trx->lock.start_stmt && lock_type != TL_UNLOCK) {
-
-		TrxInInnoDB::begin_stmt(trx);
-
 		trx->lock.start_stmt = true;
+		TrxInInnoDB::begin_stmt(trx);
 	}
 
 	DBUG_RETURN(0);
@@ -15751,7 +15931,7 @@ innodb_show_status(
 	bool			ret_val;
 
 	DBUG_ENTER("innodb_show_status");
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	/* We don't create the temp files or associated
 	mutexes in read-only-mode */
@@ -16045,7 +16225,7 @@ innodb_show_mutex_status(
 
 	ShowStatus	collector;
 
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	mutex_monitor->iterate(collector);
 
@@ -16074,7 +16254,7 @@ innodb_show_rwlock_status(
 	ulint		block_rwlock_oswait_count = 0;
 	uint		hton_name_len = (uint) strlen(innobase_hton_name);
 
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	mutex_enter(&rw_lock_list_mutex);
 
@@ -16187,7 +16367,7 @@ innobase_show_status(
 	stat_print_fn*		stat_print,
 	enum ha_stat_type	stat_type)
 {
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	switch (stat_type) {
 	case HA_ENGINE_STATUS:
@@ -16376,7 +16556,7 @@ ha_innobase::store_lock(
 		}
 	}
 
-	DBUG_ASSERT(EQ_CURRENT_THD(thd));
+	assert(EQ_CURRENT_THD(thd));
 	const bool in_lock_tables = thd_in_lock_tables(thd);
 	const uint sql_command = thd_sql_command(thd);
 
@@ -16633,26 +16813,31 @@ ha_innobase::get_auto_increment(
 
 	(3) It is restricted only for insert operations. */
 
+
 	if (increment > 1 && thd_sql_command(m_user_thd) != SQLCOM_ALTER_TABLE
 	    && autoinc < col_max_value) {
 
-		ulonglong	prev_auto_inc = autoinc;
+		ulonglong diff = ULLONG_MAX - autoinc;
+		/* Check for overflow */
+		if (increment <= diff) {
 
-		autoinc = ((autoinc - 1) + increment - offset)/ increment;
+			ulonglong prev_auto_inc = autoinc;
 
-		autoinc = autoinc * increment + offset;
+			autoinc = ((autoinc - 1) + increment - offset)/ increment;
 
-		/* If autoinc exceeds the col_max_value then reset
-		to old autoinc value. Because in case of non-strict
-		sql mode, boundary value is not considered as error. */
+			autoinc = autoinc * increment + offset;
 
-		if (autoinc >= col_max_value) {
-			autoinc = prev_auto_inc;
-		}
+			/* If autoinc exceeds the col_max_value then reset
+			to old autoinc value. Because in case of non-strict
+			sql mode, boundary value is not considered as error. */
 
-		ut_ad(autoinc > 0);
-	}
+			if (autoinc >= col_max_value) {
+				autoinc = prev_auto_inc;
+			}
 
+			ut_ad(autoinc > 0);
+		}
+	}
 	/* Called for the first time ? */
 	if (trx->n_autoinc_rows == 0) {
 
@@ -16686,22 +16871,6 @@ ha_innobase::get_auto_increment(
 
 		current = *first_value > col_max_value ? autoinc : *first_value;
 
-		/* If the increment step of the auto increment column
-		decreases then it is not affecting the immediate
-		next value in the series. */
-		if (m_prebuilt->autoinc_increment > increment) {
-
-			current = autoinc - m_prebuilt->autoinc_increment;
-
-			current = innobase_next_autoinc(
-				current, 1, increment, 1, col_max_value);
-
-			dict_table_autoinc_initialize(
-				m_prebuilt->table, current);
-
-			*first_value = current;
-		}
-
 		/* Compute the last value in the interval */
 		next_value = innobase_next_autoinc(
 			current, *nb_reserved_values, increment, offset,
@@ -16778,7 +16947,7 @@ ha_innobase::get_foreign_dup_key(
 	ut_a(m_prebuilt->trx != NULL);
 	ut_a(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
 
-	err_index = trx_get_error_info(m_prebuilt->trx);
+	err_index = trx_get_error_index(m_prebuilt->trx);
 
 	if (err_index == NULL) {
 		return(false);
@@ -16993,7 +17162,7 @@ innobase_xa_prepare(
 {
 	trx_t*		trx = check_trx_exists(thd);
 
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	thd_get_xid(thd, (MYSQL_XID*) trx->xid);
 
@@ -17090,7 +17259,7 @@ innobase_xa_recover(
 	XID*		xid_list,/*!< in/out: prepared transactions */
 	uint		len)	/*!< in: number of slots in xid_list */
 {
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	if (len == 0 || xid_list == NULL) {
 
@@ -17111,7 +17280,7 @@ innobase_commit_by_xid(
 	handlerton*	hton,
 	XID*		xid)	/*!< in: X/Open XA transaction identification */
 {
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = trx_get_trx_by_xid(xid);
 
@@ -17143,7 +17312,7 @@ innobase_rollback_by_xid(
 	XID*		xid)	/*!< in: X/Open XA transaction
 				identification */
 {
-	DBUG_ASSERT(hton == innodb_hton_ptr);
+	assert(hton == innodb_hton_ptr);
 
 	trx_t*	trx = trx_get_trx_by_xid(xid);
 
@@ -17626,20 +17795,20 @@ innodb_undo_logs_update(
 	*static_cast<ulong*>(var_ptr) = *static_cast<const ulong*>(save);
 }
 
-/*************************************************************//**
-Check whether valid argument given to innobase_*_stopword_table.
+/**Check whether valid argument given to innobase_*_stopword_table.
 This function is registered as a callback with MySQL.
+@param[in]	thd		thread handle
+@param[in]	var		pointer to system variable
+@param[out]	save		immediate result for update function
+@param[in]	value		incoming string
 @return 0 for valid stopword table */
 static
 int
 innodb_stopword_table_validate(
-/*===========================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to system
-						variable */
-	void*				save,	/*!< out: immediate result
-						for update function */
-	struct st_mysql_value*		value)	/*!< in: incoming string */
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				save,
+	struct st_mysql_value*		value)
 {
 	const char*	stopword_table_name;
 	char		buff[STRING_BUFFER_USUAL_SIZE];
@@ -17652,6 +17821,15 @@ innodb_stopword_table_validate(
 
 	stopword_table_name = value->val_str(value, buff, &len);
 
+	if (stopword_table_name != NULL) {
+		if (stopword_table_name == buff) {
+			/* Allocate from thd's memroot */
+			stopword_table_name = thd_strmake(thd,
+							  stopword_table_name,
+							  len);
+		}
+	}
+
 	trx = check_trx_exists(thd);
 
 	row_mysql_lock_data_dictionary(trx);
@@ -17695,20 +17873,20 @@ innodb_buffer_pool_size_update(
 		<< " (new size: " << in_val << " bytes)";
 }
 
-/*************************************************************//**
-Check whether valid argument given to "innodb_fts_internal_tbl_name"
+/** Check whether valid argument given to "innodb_fts_internal_tbl_name"
 This function is registered as a callback with MySQL.
+@param[in]	thd		thread handle
+@param[in]	var		pointer to system variable
+@param[out]	save		immediate result for update function
+@param[in]	value		incoming string
 @return 0 for valid stopword table */
 static
 int
 innodb_internal_table_validate(
-/*===========================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to system
-						variable */
-	void*				save,	/*!< out: immediate result
-						for update function */
-	struct st_mysql_value*		value)	/*!< in: incoming string */
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				save,
+	struct st_mysql_value*		value)
 {
 	const char*	table_name;
 	char		buff[STRING_BUFFER_USUAL_SIZE];
@@ -17724,6 +17902,9 @@ innodb_internal_table_validate(
 	if (!table_name) {
 		*static_cast<const char**>(save) = NULL;
 		return(0);
+	} else if (table_name == buff) {
+		/* Allocate memory from thd's mem_root */
+		table_name = thd_strmake(thd, table_name, len);
 	}
 
 	user_table = dict_table_open_on_name(
@@ -17747,50 +17928,6 @@ innodb_internal_table_validate(
 	return(ret);
 }
 
-/****************************************************************//**
-Update global variable "fts_internal_tbl_name" with the "saved"
-stopword table name value. This function is registered as a callback
-with MySQL. */
-static
-void
-innodb_internal_table_update(
-/*=========================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to
-						system variable */
-	void*				var_ptr,/*!< out: where the
-						formal string goes */
-	const void*			save)	/*!< in: immediate result
-						from check function */
-{
-	const char*	table_name;
-	char*		old;
-
-	ut_a(save != NULL);
-	ut_a(var_ptr != NULL);
-
-	table_name = *static_cast<const char*const*>(save);
-	old = *(char**) var_ptr;
-
-	if (table_name) {
-		*(char**) var_ptr =  my_strdup(PSI_INSTRUMENT_ME,
-					       table_name,  MYF(0));
-	} else {
-		*(char**) var_ptr = NULL;
-	}
-
-	if (old) {
-		my_free(old);
-	}
-
-	fts_internal_tbl_name2 = *(char**) var_ptr;
-	if (fts_internal_tbl_name2 == NULL) {
-		fts_internal_tbl_name = const_cast<char*>("default");
-	} else {
-		fts_internal_tbl_name = fts_internal_tbl_name2;
-	}
-}
-
 /****************************************************************//**
 Update the system variable innodb_adaptive_hash_index using the "saved"
 value. This function is registered as a callback with MySQL. */
@@ -18491,23 +18628,22 @@ innodb_monitor_update(
 	return;
 }
 
-#ifdef _WIN32
-/*************************************************************//**
-Validate if passed-in "value" is a valid value for
+/** Validate if passed-in "value" is a valid value for
 innodb_buffer_pool_filename. On Windows, file names with colon (:)
-are not allowed.
-
+are not allowed. Don't allow NULL as filename
+@param[in]	thd		thread handle
+@param[in]	var		pointer to system variable
+@param[out]	save		immediate result for update function
+@param[in]	value		incoming string
 @return 0 for valid name */
 static
 int
 innodb_srv_buf_dump_filename_validate(
 /*==================================*/
-	THD*				thd,	/*!< in: thread handle */
-	struct st_mysql_sys_var*	var,	/*!< in: pointer to system
-						variable */
-	void*				save,	/*!< out: immediate result
-						for update function */
-	struct st_mysql_value*		value)	/*!< in: incoming string */
+	THD*				thd,
+	struct st_mysql_sys_var*	var,
+	void*				save,
+	struct st_mysql_value*		value)
 {
 	char		buff[OS_FILE_MAX_PATH];
 	int		len = sizeof(buff);
@@ -18517,25 +18653,35 @@ innodb_srv_buf_dump_filename_validate(
 
 	const char*	buf_name = value->val_str(value, buff, &len);
 
-	if (buf_name != NULL) {
-		if (is_filename_allowed(buf_name, len, FALSE)){
-			*static_cast<const char**>(save) = buf_name;
-			return(0);
-		} else {
-			push_warning_printf(thd,
-				Sql_condition::SL_WARNING,
-				ER_WRONG_ARGUMENTS,
-				"InnoDB: innodb_buffer_pool_filename"
-				" cannot have colon (:) in the file name.");
+	if (buf_name == NULL)  {
+		return(1);
+	}
 
-		}
+	if (buf_name == buff) {
+		ut_ad(len <= OS_FILE_MAX_PATH);
+		/* Allocate from thd's memroot */
+		buf_name = thd_strmake(thd, buf_name, len);
 	}
 
-	return(1);
-}
+#ifdef _WIN32
+	if (is_filename_allowed(buf_name, len, FALSE)){
+		*static_cast<const char**>(save) = buf_name;
+		return(0);
+	} else {
+		push_warning_printf(thd,
+			Sql_condition::SL_WARNING,
+			ER_WRONG_ARGUMENTS,
+			"InnoDB: innodb_buffer_pool_filename"
+			" cannot have colon (:) in the file name.");
+		return(1);
+
+	}
 #else /* _WIN32 */
-# define innodb_srv_buf_dump_filename_validate NULL
+		*static_cast<const char**>(save) = buf_name;
+		return(0);
 #endif /* _WIN32 */
+}
+
 
 #ifdef UNIV_DEBUG
 static char* srv_buffer_pool_evict;
@@ -18568,6 +18714,14 @@ innodb_buffer_pool_evict_uncompressed(void)
 
 			if (!buf_LRU_free_page(&block->page, false)) {
 				all_evicted = false;
+			} else {
+				/* buf_LRU_free_page() might release
+				buf_pool_mutex temporarily.
+				have to restart the unzip_LRU scan for
+				consistency. */
+				block = UT_LIST_GET_LAST(
+					buf_pool->unzip_LRU);
+				continue;
 			}
 
 			block = prev_block;
@@ -19343,6 +19497,12 @@ static MYSQL_SYSVAR_UINT(merge_threshold_set_all_debug,
   " cache by the specified value dynamically, at the time.",
   NULL, innodb_merge_threshold_set_all_debug_update,
   DICT_INDEX_MERGE_THRESHOLD_DEFAULT, 1, 50, 0);
+
+static MYSQL_SYSVAR_ULONG(semaphore_wait_timeout_debug,
+  srv_fatal_semaphore_wait_threshold,
+  PLUGIN_VAR_RQCMDARG,
+  "Number of seconds that a semaphore can be held. If semaphore wait crosses"
+  "this value, server will crash", NULL, NULL, 600, 100, 600, 0);
 #endif /* UNIV_DEBUG */
 
 static MYSQL_SYSVAR_ULONG(purge_batch_size, srv_purge_batch_size,
@@ -19622,13 +19782,13 @@ static MYSQL_SYSVAR_LONGLONG(buffer_pool_size, innobase_buffer_pool_size,
   static_cast<longlong>(srv_buf_pool_min_size),
   LLONG_MAX, 1024*1024L);
 
-static MYSQL_SYSVAR_ULONG(buffer_pool_chunk_size, srv_buf_pool_chunk_unit,
+static MYSQL_SYSVAR_ULONGLONG(buffer_pool_chunk_size, srv_buf_pool_chunk_unit,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Size of a single memory chunk within each buffer pool instance"
   " for resizing buffer pool. Online buffer pool resizing happens"
   " at this granularity. 0 means disable resizing buffer pool.",
   NULL, NULL,
-  128 * 1024 * 1024, 1024 * 1024, LONG_MAX, 1024 * 1024);
+  128 * 1024 * 1024, 1024 * 1024, ULONG_MAX, 1024 * 1024);
 
 #if defined UNIV_DEBUG || defined UNIV_PERF_DEBUG
 static MYSQL_SYSVAR_ULONG(page_hash_locks, srv_n_page_hash_locks,
@@ -19735,11 +19895,11 @@ static MYSQL_SYSVAR_BOOL(disable_sort_file_cache, srv_disable_sort_file_cache,
   "Whether to disable OS system file cache for sort I/O",
   NULL, NULL, FALSE);
 
-static MYSQL_SYSVAR_STR(ft_aux_table, fts_internal_tbl_name2,
-  PLUGIN_VAR_NOCMDARG,
+static MYSQL_SYSVAR_STR(ft_aux_table, fts_internal_tbl_name,
+  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_MEMALLOC ,
   "FTS internal auxiliary table to be checked",
   innodb_internal_table_validate,
-  innodb_internal_table_update, NULL);
+  NULL, NULL);
 
 static MYSQL_SYSVAR_ULONG(ft_cache_size, fts_max_cache_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
@@ -19806,12 +19966,12 @@ static MYSQL_SYSVAR_ULONG(force_recovery, srv_force_recovery,
   "Helps to save your data in case the disk image of the database becomes corrupt.",
   NULL, NULL, 0, 0, 6, 0);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 static MYSQL_SYSVAR_ULONG(force_recovery_crash, srv_force_recovery_crash,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Kills the server during crash recovery.",
   NULL, NULL, 0, 0, 100, 0);
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 static MYSQL_SYSVAR_ULONG(page_size, srv_page_size,
   PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
@@ -20232,9 +20392,9 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   MYSQL_SYSVAR(flush_log_at_trx_commit),
   MYSQL_SYSVAR(flush_method),
   MYSQL_SYSVAR(force_recovery),
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   MYSQL_SYSVAR(force_recovery_crash),
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
   MYSQL_SYSVAR(fill_factor),
   MYSQL_SYSVAR(ft_cache_size),
   MYSQL_SYSVAR(ft_total_cache_size),
@@ -20327,6 +20487,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   MYSQL_SYSVAR(log_checkpoint_now),
   MYSQL_SYSVAR(buf_flush_list_now),
   MYSQL_SYSVAR(merge_threshold_set_all_debug),
+  MYSQL_SYSVAR(semaphore_wait_timeout_debug),
 #endif /* UNIV_DEBUG */
 #if defined UNIV_DEBUG || defined UNIV_PERF_DEBUG
   MYSQL_SYSVAR(page_hash_locks),
@@ -20517,8 +20678,8 @@ innobase_index_cond(
 
 	ha_innobase*	h = reinterpret_cast<class ha_innobase*>(file);
 
-	DBUG_ASSERT(h->pushed_idx_cond);
-	DBUG_ASSERT(h->pushed_idx_cond_keyno != MAX_KEY);
+	assert(h->pushed_idx_cond);
+	assert(h->pushed_idx_cond_keyno != MAX_KEY);
 
 	if (h->end_range && h->compare_key_icp(h->end_range) > 0) {
 
@@ -20635,32 +20796,35 @@ innobase_rename_vc_templ(
 given col_no.
 @param[in]	foreign		foreign key information
 @param[in]	update		updated parent vector.
-@param[in]	col_no		column position of the table
+@param[in]	col_no		base column position of the child table to check
 @return updated field from the parent update vector, else NULL */
-static
 dfield_t*
 innobase_get_field_from_update_vector(
 	dict_foreign_t*	foreign,
 	upd_t*		update,
-	ulint		col_no)
+	uint32_t	col_no)
 {
 	dict_table_t*	parent_table = foreign->referenced_table;
 	dict_index_t*	parent_index = foreign->referenced_index;
-	ulint		parent_field_no;
-	ulint		parent_col_no;
-
-	for (ulint i = 0; i < foreign->n_fields; i++) {
-
+	uint32_t	parent_field_no;
+	uint32_t	parent_col_no;
+	uint32_t	child_col_no;
+
+	for (uint32_t i = 0; i < foreign->n_fields; i++) {
+		child_col_no = dict_index_get_nth_col_no(
+			foreign->foreign_index, i);
+		if (child_col_no != col_no) {
+			continue;
+		}
 		parent_col_no = dict_index_get_nth_col_no(parent_index, i);
 		parent_field_no = dict_table_get_nth_col_pos(
 			parent_table, parent_col_no);
 
-		for (ulint j = 0; j < update->n_fields; j++) {
+		for (uint32_t j = 0; j < update->n_fields; j++) {
 			upd_field_t*	parent_ufield
 				= &update->fields[j];
 
-			if (parent_ufield->field_no == parent_field_no
-			    && parent_col_no == col_no) {
+			if (parent_ufield->field_no == parent_field_no) {
 				return(&parent_ufield->new_val);
 			}
 		}
@@ -20736,7 +20900,7 @@ innobase_get_computed_value(
 	for (ulint i = 0; i < col->num_base; i++) {
 		dict_col_t*			base_col = col->base_col[i];
 		const dfield_t*			row_field = NULL;
-		ulint				col_no = base_col->ind;
+		uint32_t			col_no = base_col->ind;
 		const mysql_row_templ_t*	templ
 			= index->table->vc_templ->vtempl[col_no];
 		const byte*			data;
@@ -20898,8 +21062,8 @@ ha_innobase::idx_cond_push(
 	class Item*	idx_cond)
 {
 	DBUG_ENTER("ha_innobase::idx_cond_push");
-	DBUG_ASSERT(keyno != MAX_KEY);
-	DBUG_ASSERT(idx_cond != NULL);
+	assert(keyno != MAX_KEY);
+	assert(idx_cond != NULL);
 
 	pushed_idx_cond = idx_cond;
 	pushed_idx_cond_keyno = keyno;
@@ -21239,7 +21403,7 @@ innodb_buffer_pool_size_validate(
 		push_warning_printf(thd, Sql_condition::SL_WARNING,
 			ER_WRONG_ARGUMENTS,
 			"InnoDB: Cannot resize buffer pool to lesser than"
-			" chunk size of %lu bytes.", srv_buf_pool_chunk_unit);
+			" chunk size of %llu bytes.", srv_buf_pool_chunk_unit);
 		/* nothing to do */
 		return(0);
 	}
@@ -21260,3 +21424,30 @@ innodb_buffer_pool_size_validate(
 
 	return(0);
 }
+
+/*****************************************************************//**
+Checks if the file name is reserved in InnoDB. Currently
+redo log files(ib_logfile*) is reserved.
+@return true if the name is reserved */
+static
+bool
+innobase_check_reserved_file_name(
+/*===================*/
+	handlerton*     hton,		/*!< in: handlerton of Innodb */
+	const char*	name)		/*!< in: Name of the database */
+{
+	CHARSET_INFO *ci= system_charset_info;
+	size_t logname_size = strlen(ib_logfile_basename);
+
+	/* Name is smaller than reserved name */
+	if (strlen(name) < logname_size) {
+		return (false);
+	}
+	/* Do case insensitive comparison for name. */
+	for (uint i=0; i < logname_size; i++) {
+		if (my_tolower(ci, name[i]) != ib_logfile_basename[i]){
+			return (false);
+		}
+	}
+	return (true);
+}
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index b83b70cb4463..456eb53aaa66 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -22,6 +30,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 system clustered index when there is no primary key. */
 extern const char innobase_index_reserve_name[];
 
+/* Deprecation warning text */
+extern const char PARTITION_IN_SHARED_TABLESPACE_WARNING[];
+
 /* "innodb_file_per_table" tablespace name  is reserved by InnoDB in order
 to explicitly create a file_per_table tablespace for the table. */
 extern const char reserved_file_per_table_space_name[];
@@ -91,7 +102,7 @@ class ha_innobase: public handler
 
 	uint max_supported_key_length() const;
 
-	uint max_supported_key_part_length() const;
+	uint max_supported_key_part_length(HA_CREATE_INFO *create_info) const;
 
 	const key_map* keys_to_use_for_scanning();
 
@@ -463,6 +474,12 @@ class ha_innobase: public handler
 	doesn't give any clue that it is called at the end of a statement. */
 	int end_stmt();
 
+	/** Can reuse the template. Mainly used for partition.
+	@retval true Can reuse the mysql_template */
+	virtual bool can_reuse_mysql_template() {
+		return(false);
+	}
+
 
 	/** The multi range read session object */
 	DsMrr_impl		m_ds_mrr;
@@ -536,6 +553,18 @@ int thd_slave_thread(const MYSQL_THD thd);
 @retval 1 the user thread is running a non-transactional update */
 int thd_non_transactional_update(const MYSQL_THD thd);
 
+/** Check if the thread has attachable transaction
+@param thd user thread
+@retval 0 thd doesn't have attachable trx
+@retval 1 thd has attachable trx */
+int thd_has_active_attachable_trx(const MYSQL_THD thd);
+
+/** Check if the thread is doing a gtid operation implicitly
+@param thd user thread
+@retval 0 thd is not doing any gtid implicit operation
+@retval 1 thd is doing gtid implicit operation */
+int thd_is_operating_gtid_table_implicitly(const MYSQL_THD thd);
+
 /** Get the user thread's binary logging format
 @param thd user thread
 @return Value to be used as index into the binlog_format_names array */
@@ -589,6 +618,12 @@ typedef struct new_ft_info
 	fts_result_t*		ft_result;
 } NEW_FT_INFO;
 
+/* Check if the thread can skip  innodb concurrency check
+@param[in]	row_prebuilt_t*	 prebuilt
+@return true if thread can skip innodb concurrency check*/
+ibool
+skip_concurrency_ticket(row_prebuilt_t* prebuilt);
+
 /**
 Allocates an InnoDB transaction for a MySQL handler object.
 @return InnoDB transaction handle */
@@ -670,6 +705,18 @@ const HA_CREATE_INFO*	create_info)
 				reserved_system_space_name)));
 }
 
+/** Check if tablespace is shared tablespace.
+@param[in]      tablespace_name Name of the tablespace
+@return true if tablespace is a shared tablespace. */
+UNIV_INLINE
+bool is_shared_tablespace(const char *tablespace_name) {
+  if (tablespace_name != NULL && tablespace_name[0] != '\0' &&
+      (strcmp(tablespace_name, reserved_file_per_table_space_name) != 0)) {
+    return true;
+  }
+  return false;
+}
+
 /** Parse hint for table and its indexes, and update the information
 in dictionary.
 @param[in]	thd		Connection thread
diff --git a/storage/innobase/handler/ha_innopart.cc b/storage/innobase/handler/ha_innopart.cc
index 3a1cdcc314f3..67f7cbf7992d 100644
--- a/storage/innobase/handler/ha_innopart.cc
+++ b/storage/innobase/handler/ha_innopart.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -52,6 +60,7 @@ Created Nov 22, 2013 Mattias Jonsson */
 #include "ha_innopart.h"
 #include "partition_info.h"
 #include "key.h"
+#include "dict0priv.h"
 
 #define INSIDE_HA_INNOPART_CC
 
@@ -263,11 +272,11 @@ Ha_innopart_share::open_table_parts(
 	char	partition_name[FN_REFLEN];
 	bool	index_loaded = true;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	if (m_table_share->tmp_table == NO_TMP_TABLE) {
 		mysql_mutex_assert_owner(&m_table_share->LOCK_ha_data);
 	}
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 	m_ref_count++;
 	if (m_table_parts != NULL) {
 		ut_ad(m_ref_count > 1);
@@ -424,11 +433,11 @@ Ha_innopart_share::open_table_parts(
 void
 Ha_innopart_share::close_table_parts()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	if (m_table_share->tmp_table == NO_TMP_TABLE) {
 		mysql_mutex_assert_owner(&m_table_share->LOCK_ha_data);
 	}
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 	m_ref_count--;
 	if (m_ref_count != 0) {
 
@@ -852,7 +861,7 @@ ha_innopart::initialize_auto_increment(
 	ulonglong	auto_inc = 0;
 	const Field*	field = table->found_next_number_field;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	if (table_share->tmp_table == NO_TMP_TABLE)
 	{
 		mysql_mutex_assert_owner(m_part_share->auto_inc_mutex);
@@ -1040,8 +1049,6 @@ ha_innopart::open(
 	m_upd_buf = NULL;
 	m_upd_buf_size = 0;
 
-	/* Get pointer to a table object in InnoDB dictionary cache. */
-	ib_table = m_part_share->get_table_part(0);
 
 	m_pcur_parts = NULL;
 	m_clust_pcur_parts = NULL;
@@ -1071,54 +1078,54 @@ ha_innopart::open(
 
 	MONITOR_INC(MONITOR_TABLE_OPEN);
 
-	bool	no_tablespace;
 
-	/* TODO: Should we do this check for every partition during ::open()? */
 	/* TODO: refactor this in ha_innobase so it can increase code reuse. */
-	if (dict_table_is_discarded(ib_table)) {
-
-		ib_senderrf(thd,
-			IB_LOG_LEVEL_WARN, ER_TABLESPACE_DISCARDED,
-			table->s->table_name.str);
+	for (uint part_id = 0; part_id < m_tot_parts; part_id++) {
+		bool	no_tablespace;
+		ib_table = m_part_share->get_table_part(part_id);
+		if (dict_table_is_discarded(ib_table)) {
 
-		/* Allow an open because a proper DISCARD should have set
-		all the flags and index root page numbers to FIL_NULL that
-		should prevent any DML from running but it should allow DDL
-		operations. */
+			ib_senderrf(thd,
+				IB_LOG_LEVEL_WARN, ER_TABLESPACE_DISCARDED,
+				table->s->table_name.str);
 
-		no_tablespace = false;
+			/* Allow an open because a proper DISCARD should have set
+			all the flags and index root page numbers to FIL_NULL that
+			should prevent any DML from running but it should allow DDL
+			operations. */
 
-	} else if (ib_table->ibd_file_missing) {
+			no_tablespace = false;
 
-		ib_senderrf(
-			thd, IB_LOG_LEVEL_WARN,
-			ER_TABLESPACE_MISSING, norm_name);
+		} else if (ib_table->ibd_file_missing) {
 
-		/* This means we have no idea what happened to the tablespace
-		file, best to play it safe. */
+			ib_senderrf(
+				thd, IB_LOG_LEVEL_WARN,
+				ER_TABLESPACE_MISSING, norm_name);
 
-		no_tablespace = true;
-	} else {
-		no_tablespace = false;
-	}
+			/* This means we have no idea what happened to the tablespace
+			file, best to play it safe. */
 
-	if (!thd_tablespace_op(thd) && no_tablespace) {
-                set_my_errno(ENOENT);
-
-		lock_shared_ha_data();
-		m_part_share->close_table_parts();
-		unlock_shared_ha_data();
-		m_part_share = NULL;
+			no_tablespace = true;
+		} else {
+			no_tablespace = false;
+		}
 
-		DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
+		if (!thd_tablespace_op(thd) && no_tablespace) {
+			set_my_errno(ENOENT);
+			close();
+			DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
+		}
 	}
 
+	/* Get pointer to a table object in InnoDB dictionary cache. */
+	ib_table = m_part_share->get_table_part(0);
+
 	m_prebuilt = row_create_prebuilt(ib_table, table->s->reclength);
 
 	m_prebuilt->default_rec = table->s->default_values;
 	ut_ad(m_prebuilt->default_rec);
 
-	DBUG_ASSERT(table != NULL);
+	assert(table != NULL);
 	m_prebuilt->m_mysql_table = table;
 	m_prebuilt->m_mysql_handler = this;
 
@@ -1342,6 +1349,7 @@ ha_innopart::open(
 		close();  // Frees all the above.
 		DBUG_RETURN(HA_ERR_OUT_OF_MEM);
 	}
+	m_reuse_mysql_template = false;
 	info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
 
 	DBUG_RETURN(0);
@@ -1452,8 +1460,10 @@ ha_innopart::close()
 
 	/* Prevent double close of m_prebuilt->table. The real one was done
 	done in m_part_share->close_table_parts(). */
-	m_prebuilt->table = NULL;
-	row_prebuilt_free(m_prebuilt, FALSE);
+	if (m_prebuilt != NULL) {
+		m_prebuilt->table = NULL;
+		row_prebuilt_free(m_prebuilt, FALSE);
+        }
 
 	if (m_upd_buf != NULL) {
 		ut_ad(m_upd_buf_size != 0);
@@ -1573,6 +1583,7 @@ ha_innopart::update_partition(
 	m_row_read_type_parts[part_id] = m_prebuilt->row_read_type;
 	if (m_prebuilt->sql_stat_start == 0) {
 		clear_bit(m_sql_stat_start_parts, part_id);
+		m_reuse_mysql_template = true;
 	}
 	m_last_part = part_id;
 	DBUG_VOID_RETURN;
@@ -2721,6 +2732,8 @@ ha_innopart::create(
 	char		tablespace_name[NAME_LEN + 1];
 	char*		table_name_end;
 	size_t		table_name_len;
+	size_t		db_name_length;
+	ulint		stat_table_name_length;
 	char*		partition_name_start;
 	char		table_data_file_name[FN_REFLEN];
 	char		table_level_tablespace_name[NAME_LEN + 1];
@@ -2736,6 +2749,12 @@ ha_innopart::create(
 				     tablespace_name);
 
 	DBUG_ENTER("ha_innopart::create");
+
+        if (is_shared_tablespace(create_info->tablespace)) {
+		push_deprecated_warn_no_replacement(
+			ha_thd(), PARTITION_IN_SHARED_TABLESPACE_WARNING);
+        }
+
 	ut_ad(create_info != NULL);
 	ut_ad(m_part_info == form->part_info);
 	ut_ad(table_share != NULL);
@@ -2759,6 +2778,7 @@ ha_innopart::create(
 		DBUG_RETURN(error);
 	}
 	ut_ad(temp_path[0] == '\0');
+	db_name_length = strchr(table_name,'/') - table_name;
 	strcpy(partition_name, table_name);
 	partition_name_start = partition_name + strlen(partition_name);
 	table_name_len = strlen(table_name);
@@ -2793,6 +2813,33 @@ ha_innopart::create(
 
 	row_mysql_lock_data_dictionary(info.trx());
 
+	/* Mismatch can occur in the length of the column "table_name" in
+	mysql.innodb_table_stats and mysql.innodb_index_stats after the
+	fix to increase the column length of table_name column to accomdate
+	partition_names, so we first need to determine the length of the
+	"table_name" column and accordingly we can decide the length
+	of partition name .*/
+
+	dict_table_t *table = dict_table_get_low(TABLE_STATS_NAME);
+	if (table != NULL) {
+		ulint col_no = dict_table_has_column(table,"table_name",0);
+		ut_ad (col_no != table->n_def);
+		stat_table_name_length =  table->cols[col_no].len;
+		if (stat_table_name_length > NAME_LEN) {
+			/* The maximum allowed length is 597 bytes
+			,but the file name length cannot cross
+			FN_LEN */
+			stat_table_name_length = FN_LEN;
+		} else {
+			stat_table_name_length = NAME_LEN;
+		}
+
+	} else {
+		/* set the old length of 192 bytes in case of failure */
+		stat_table_name_length = NAME_LEN;
+		ib::warn() << TABLE_STATS_NAME << " doesnt exist.";
+	}
+
 	/* TODO: use the new DD tables instead to decrease duplicate info. */
 	List_iterator_fast <partition_element>
 		part_it(form->part_info->partitions);
@@ -2808,7 +2855,18 @@ ha_innopart::create(
 		exceeds maximum path length. */
 		if ((table_name_len + len + sizeof "/") >= FN_REFLEN) {
 			error = HA_ERR_INTERNAL_ERROR;
-			my_error(ER_PATH_LENGTH, MYF(0), partition_name);
+			my_error(ER_IDENT_CAUSES_TOO_LONG_PATH, MYF(0), FN_REFLEN,
+				partition_name);
+			goto cleanup;
+		}
+
+		/* Report error if table name with partition name exceeds
+		maximum file name length */
+		if ((len + table_name_len - db_name_length - 1)
+		     > stat_table_name_length) {
+			error = HA_ERR_INTERNAL_ERROR;
+			my_error(ER_PATH_LENGTH, MYF(0),
+				 partition_name + db_name_length + 1 );
 			goto cleanup;
 		}
 
@@ -2816,6 +2874,11 @@ ha_innopart::create(
 		set_create_info_dir(part_elem, create_info);
 
 		if (!form->part_info->is_sub_partitioned()) {
+			if (is_shared_tablespace(part_elem->tablespace_name)) {
+				push_deprecated_warn_no_replacement(
+					ha_thd(), PARTITION_IN_SHARED_TABLESPACE_WARNING);
+			}
+
 			error = info.prepare_create_table(partition_name);
 			if (error != 0) {
 				goto cleanup;
@@ -2836,6 +2899,11 @@ ha_innopart::create(
 			while ((sub_elem = sub_it++)) {
 				ut_ad(sub_elem->partition_name != NULL);
 
+				if (is_shared_tablespace(sub_elem->tablespace_name)) {
+					push_deprecated_warn_no_replacement(
+						ha_thd(), PARTITION_IN_SHARED_TABLESPACE_WARNING);
+				}
+
 				/* 'table' will be
 				<name>#P#<part_name>#SP#<subpart_name>.
 				Append the sub-partition name to
@@ -2850,9 +2918,22 @@ ha_innopart::create(
 				exceeds maximum path length. */
 				if ((len + part_name_len + sizeof "/") >= FN_REFLEN) {
 					error = HA_ERR_INTERNAL_ERROR;
-					my_error(ER_PATH_LENGTH, MYF(0), partition_name);
+					my_error(ER_IDENT_CAUSES_TOO_LONG_PATH, MYF(0),
+						 FN_REFLEN,
+						 partition_name);
+					goto cleanup;
+				}
+
+				/* Report error if table name with partition
+				name exceeds maximum file name length */
+				if ((len + part_name_len - db_name_length -1)
+				     > stat_table_name_length ) {
+					error = HA_ERR_INTERNAL_ERROR;;
+					my_error(ER_PATH_LENGTH, MYF(0),
+					partition_name + db_name_length + 1);
 					goto cleanup;
 				}
+
 				/* Override part level DATA/INDEX DIRECTORY. */
 				set_create_info_dir(sub_elem, create_info);
 
@@ -2907,14 +2988,6 @@ ha_innopart::create(
 				part_sep,
 				FN_REFLEN - table_name_len);
 
-		/* Report error if table name with partition name exceeds
-		maximum length */
-		if ((len + table_name_len) >= NAME_LEN) {
-			my_error(ER_PATH_LENGTH, MYF(0), table_name);
-			error = HA_ERR_INTERNAL_ERROR;
-			goto end;
-		}
-
 		if (!form->part_info->is_sub_partitioned()) {
 			error = info.create_table_update_dict();
 			if (error != 0) {
@@ -2934,14 +3007,6 @@ ha_innopart::create(
 						sub_sep,
 						FN_REFLEN - table_name_len
 						- part_name_len);
-				/* Report error if table name with partition
-				name exceeds maximum length */
-				if ((len + table_name_len +
-					part_name_len) >= NAME_LEN) {
-					my_error(ER_PATH_LENGTH, MYF(0), table_name);
-					error = HA_ERR_INTERNAL_ERROR;
-					goto end;
-				}
 
 				error = info.create_table_update_dict();
 				if (error != 0) {
@@ -2963,13 +3028,24 @@ ha_innopart::create(
 	DBUG_RETURN(error);
 
 cleanup:
-	trx_rollback_for_mysql(info.trx());
+    trx_rollback_for_mysql(info.trx());
 
-	row_mysql_unlock_data_dictionary(info.trx());
+    row_mysql_unlock_data_dictionary(info.trx());
 
-	trx_free_for_mysql(info.trx());
+    ulint dummy;
+    char norm_name[FN_REFLEN];
 
-	DBUG_RETURN(error);
+    normalize_table_name(norm_name, name);
+
+    uint lent = (uint)strlen(norm_name);
+    ut_a(lent < FN_REFLEN);
+    norm_name[lent] = '#';
+    norm_name[lent + 1] = 0;
+
+    row_drop_database_for_mysql(norm_name, info.trx(), &dummy);
+
+    trx_free_for_mysql(info.trx());
+    DBUG_RETURN(error);
 }
 
 /** Discards or imports an InnoDB tablespace.
@@ -3872,7 +3948,7 @@ ha_innopart::info_low(
 		ut_a(m_prebuilt->trx);
 		ut_a(m_prebuilt->trx->magic_n == TRX_MAGIC_N);
 
-		err_index = trx_get_error_info(m_prebuilt->trx);
+		err_index = trx_get_error_index(m_prebuilt->trx);
 
 		if (err_index != NULL) {
 			errkey = m_part_share->get_mysql_key(m_last_part,
@@ -4119,6 +4195,7 @@ ha_innopart::start_stmt(
 		memset(m_sql_stat_start_parts, 0,
 		       UT_BITS_IN_BYTES(m_tot_parts));
 	}
+	m_reuse_mysql_template = false;
 	return(error);
 }
 
@@ -4198,6 +4275,15 @@ ha_innopart::external_lock(
 
 				ut_ad(table->quiesce == QUIESCE_START);
 
+				if (dict_table_is_discarded(table)) {
+					ib_senderrf(m_prebuilt->trx->mysql_thd,
+						    IB_LOG_LEVEL_ERROR,
+						    ER_TABLESPACE_DISCARDED,
+						    table->name.m_name);
+
+					return (HA_ERR_NO_SUCH_TABLE);
+				}
+
 				row_quiesce_table_start(table,
 							m_prebuilt->trx);
 
@@ -4243,6 +4329,7 @@ ha_innopart::external_lock(
 		memset(m_sql_stat_start_parts, 0,
 		       UT_BITS_IN_BYTES(m_tot_parts));
 	}
+	m_reuse_mysql_template = false;
 	return(error);
 }
 
@@ -4276,6 +4363,16 @@ ha_innopart::get_auto_increment(
 	DBUG_VOID_RETURN;
 }
 
+/** Get partition row type
+@param[in] Id of partition for which row type to be retrieved
+@return Partition row type */
+enum row_type ha_innopart::get_partition_row_type(
+        uint part_id)
+{
+	set_partition(part_id);
+	return get_row_type();
+}
+
 /** Compares two 'refs'.
 A 'ref' is the (internal) primary key value of the row.
 If there is no explicitly declared non-null unique key or a primary key, then
@@ -4365,6 +4462,11 @@ ha_innopart::create_new_partition(
 		DBUG_RETURN(HA_WRONG_CREATE_OPTION);
 	}
 
+	if (tablespace_is_shared_space(create_info)) {
+		push_deprecated_warn_no_replacement(
+			ha_thd(), PARTITION_IN_SHARED_TABLESPACE_WARNING);
+	}
+
 	error = ha_innobase::create(norm_name, table, create_info);
 	create_info->tablespace = tablespace_name_backup;
 	create_info->data_file_name = data_file_name_backup;
@@ -4504,8 +4606,8 @@ ha_innopart::rnd_pos_by_record(uchar*  record)
 {
 	int error;
 	DBUG_ENTER("ha_innopart::rnd_pos_by_record");
-	DBUG_ASSERT(ha_table_flags() &
-		HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
+	assert(ha_table_flags() &
+	       HA_PRIMARY_KEY_REQUIRED_FOR_POSITION);
 	/* TODO: Support HA_READ_BEFORE_WRITE_REMOVAL */
 	/* Set m_last_part correctly. */
 	if (unlikely(get_part_for_delete(record,
diff --git a/storage/innobase/handler/ha_innopart.h b/storage/innobase/handler/ha_innopart.h
index d2d7ae5389d4..7f1b4c368ec5 100644
--- a/storage/innobase/handler/ha_innopart.h
+++ b/storage/innobase/handler/ha_innopart.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -414,6 +422,12 @@ class ha_innopart:
 		ulonglong*	first_value,
 		ulonglong*	nb_reserved_values);
 
+
+	/** Get partition row type
+	@param[in] Id of partition for which row type to be retrieved
+	@return Partition row type */
+	enum row_type get_partition_row_type(uint part_id);
+
 	int
 	cmp_ref(
 		const uchar*	ref1,
@@ -680,6 +694,9 @@ class ha_innopart:
 	/** New partitions during ADD/REORG/... PARTITION. */
 	Altered_partitions*	m_new_partitions;
 
+	/** Can reuse the template for the previous partition. */
+	bool			m_reuse_mysql_template;
+
 	/** Clear used ins_nodes and upd_nodes. */
 	void
 	clear_ins_upd_nodes();
@@ -1317,5 +1334,9 @@ class ha_innopart:
 	info_low(
 		uint	flag,
 		bool	is_analyze);
+
+	bool can_reuse_mysql_template() {
+		return(m_reuse_mysql_template);
+	}
 };
 #endif /* ha_innopart_h */
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 8728b8a7067f..19745e6c7315 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -110,7 +118,8 @@ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_NOREBUILD
 	| Alter_inplace_info::ALTER_INDEX_COMMENT
 	| Alter_inplace_info::ADD_VIRTUAL_COLUMN
 	| Alter_inplace_info::DROP_VIRTUAL_COLUMN
-	| Alter_inplace_info::ALTER_VIRTUAL_COLUMN_ORDER;
+	| Alter_inplace_info::ALTER_VIRTUAL_COLUMN_ORDER
+        | Alter_inplace_info::ALTER_COLUMN_INDEX_LENGTH;
 	/* | Alter_inplace_info::ALTER_VIRTUAL_COLUMN_TYPE; */
 
 struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
@@ -246,6 +255,26 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
 	@return whether the table will be rebuilt */
 	bool need_rebuild () const { return(old_table != new_table); }
 
+	/** Set shared data between the passed in handler context
+	and current context.
+	@param[in] inplace_alter_handler_ctx        handler context */
+	void set_shared_data(
+		const inplace_alter_handler_ctx *ctx)
+	{
+		ut_ad(ctx != NULL);
+		if (this->add_autoinc == ULINT_UNDEFINED) {
+			return;
+		}
+		const ha_innobase_inplace_ctx* ha_ctx =
+			static_cast<const ha_innobase_inplace_ctx*> (ctx);
+
+		/* In InnoDB table, if it's adding AUTOINC column,
+		the sequence value should be shared among contexts.*/
+		ut_ad(ha_ctx->add_autoinc != ULINT_UNDEFINED);
+		this->sequence = ha_ctx->sequence;
+
+        }
+
 private:
 	// Disable copying
 	ha_innobase_inplace_ctx(const ha_innobase_inplace_ctx&);
@@ -711,8 +740,8 @@ ha_innobase::check_if_supported_inplace_alter(
 		     key_part++) {
 			const Create_field*	new_field;
 
-			DBUG_ASSERT(key_part->fieldnr
-				    < altered_table->s->fields);
+			assert(key_part->fieldnr
+			       < altered_table->s->fields);
 
 			cf_it.rewind();
 			for (uint fieldnr = 0; (new_field = cf_it++);
@@ -722,7 +751,7 @@ ha_innobase::check_if_supported_inplace_alter(
 				}
 			}
 
-			DBUG_ASSERT(new_field);
+			assert(new_field);
 
 			key_part->field = altered_table->field[
 				key_part->fieldnr];
@@ -739,8 +768,8 @@ ha_innobase::check_if_supported_inplace_alter(
 			}
 
 			/* This is an added column. */
-			DBUG_ASSERT(ha_alter_info->handler_flags
-				    & Alter_inplace_info::ADD_COLUMN);
+			assert(ha_alter_info->handler_flags
+			       & Alter_inplace_info::ADD_COLUMN);
 
 			/* We cannot replace a hidden FTS_DOC_ID
 			with a user-visible FTS_DOC_ID. */
@@ -755,16 +784,16 @@ ha_innobase::check_if_supported_inplace_alter(
 				DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
 			}
 
-			DBUG_ASSERT((MTYP_TYPENR(key_part->field->unireg_check)
-				     == Field::NEXT_NUMBER)
-				    == !!(key_part->field->flags
-					  & AUTO_INCREMENT_FLAG));
+			assert((MTYP_TYPENR(key_part->field->unireg_check)
+				== Field::NEXT_NUMBER)
+			       == !!(key_part->field->flags
+				     & AUTO_INCREMENT_FLAG));
 
 			if (key_part->field->flags & AUTO_INCREMENT_FLAG) {
 				/* We cannot assign an AUTO_INCREMENT
 				column values during online ALTER. */
-				DBUG_ASSERT(key_part->field == altered_table
-					    -> found_next_number_field);
+				assert(key_part->field == altered_table
+				       -> found_next_number_field);
 				ha_alter_info->unsupported_reason = innobase_get_err_msg(
 					ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC);
 				online = false;
@@ -791,10 +820,10 @@ ha_innobase::check_if_supported_inplace_alter(
 		}
 	}
 
-	DBUG_ASSERT(!m_prebuilt->table->fts || m_prebuilt->table->fts->doc_col
-		    <= table->s->fields);
-	DBUG_ASSERT(!m_prebuilt->table->fts || m_prebuilt->table->fts->doc_col
-		    < dict_table_get_n_user_cols(m_prebuilt->table));
+	assert(!m_prebuilt->table->fts || m_prebuilt->table->fts->doc_col
+	       <= table->s->fields);
+	assert(!m_prebuilt->table->fts || m_prebuilt->table->fts->doc_col
+	       < dict_table_get_n_user_cols(m_prebuilt->table));
 
 	if (ha_alter_info->handler_flags
 	    & Alter_inplace_info::ADD_SPATIAL_INDEX) {
@@ -882,11 +911,11 @@ ha_innobase::check_if_supported_inplace_alter(
 				&ha_alter_info->key_info_buffer[
 					ha_alter_info->index_add_buffer[i]];
 			if (key->flags & HA_FULLTEXT) {
-				DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
-					      & ~(HA_FULLTEXT
-						  | HA_PACK_KEY
-						  | HA_GENERATED_KEY
-						  | HA_BINARY_PACK_KEY)));
+				assert(!(key->flags & HA_KEYFLAG_MASK
+					 & ~(HA_FULLTEXT
+					     | HA_PACK_KEY
+					     | HA_GENERATED_KEY
+					     | HA_BINARY_PACK_KEY)));
 				ha_alter_info->unsupported_reason = innobase_get_err_msg(
 					ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS);
 				online = false;
@@ -1999,7 +2028,7 @@ innobase_create_index_def(
 	ulint		n_fields = key->user_defined_key_parts;
 
 	DBUG_ENTER("innobase_create_index_def");
-	DBUG_ASSERT(!key_clustered || new_clustered);
+	assert(!key_clustered || new_clustered);
 
 	index->fields = static_cast<index_field_t*>(
 		mem_heap_alloc(heap, n_fields * sizeof *index->fields));
@@ -2012,15 +2041,15 @@ innobase_create_index_def(
 	index->rebuild = new_clustered;
 
 	if (key_clustered) {
-		DBUG_ASSERT(!(key->flags & (HA_FULLTEXT | HA_SPATIAL)));
-		DBUG_ASSERT(key->flags & HA_NOSAME);
+		assert(!(key->flags & (HA_FULLTEXT | HA_SPATIAL)));
+		assert(key->flags & HA_NOSAME);
 		index->ind_type = DICT_CLUSTERED | DICT_UNIQUE;
 	} else if (key->flags & HA_FULLTEXT) {
-		DBUG_ASSERT(!(key->flags & (HA_SPATIAL | HA_NOSAME)));
-		DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
-			      & ~(HA_FULLTEXT
-				  | HA_PACK_KEY
-				  | HA_BINARY_PACK_KEY)));
+		assert(!(key->flags & (HA_SPATIAL | HA_NOSAME)));
+		assert(!(key->flags & HA_KEYFLAG_MASK
+			 & ~(HA_FULLTEXT
+			     | HA_PACK_KEY
+			     | HA_BINARY_PACK_KEY)));
 		index->ind_type = DICT_FTS;
 
 		/* Set plugin parser */
@@ -2054,7 +2083,7 @@ innobase_create_index_def(
 			ut_ad(index->parser);
 		}
 	} else if (key->flags & HA_SPATIAL) {
-		DBUG_ASSERT(!(key->flags & HA_NOSAME));
+		assert(!(key->flags & HA_NOSAME));
 		index->ind_type = DICT_SPATIAL;
 		ut_ad(n_fields == 1);
 		ulint	num_v = 0;
@@ -2357,8 +2386,8 @@ innobase_create_key_defs(
 		= ha_alter_info->key_info_buffer;
 
 	DBUG_ENTER("innobase_create_key_defs");
-	DBUG_ASSERT(!add_fts_doc_id || add_fts_doc_idx);
-	DBUG_ASSERT(ha_alter_info->index_add_count == n_add);
+	assert(!add_fts_doc_id || add_fts_doc_idx);
+	assert(ha_alter_info->index_add_count == n_add);
 
 	/* If there is a primary key, it is always the first index
 	defined for the innodb_table. */
@@ -2397,9 +2426,9 @@ innobase_create_key_defs(
 
 		if (new_primary) {
 			if (n_add == 0) {
-				DBUG_ASSERT(got_default_clust);
-				DBUG_ASSERT(altered_table->s->primary_key
-					    == 0);
+				assert(got_default_clust);
+				assert(altered_table->s->primary_key
+				       == 0);
 				primary_key_number = 0;
 			} else {
 				primary_key_number = *add;
@@ -2491,7 +2520,7 @@ innobase_create_key_defs(
 		}
 	}
 
-	DBUG_ASSERT(indexdefs + n_add == indexdef);
+	assert(indexdefs + n_add == indexdef);
 
 	if (add_fts_doc_idx) {
 		index_def_t*	index = indexdef++;
@@ -2515,11 +2544,11 @@ innobase_create_key_defs(
 		n_add++;
 	}
 
-	DBUG_ASSERT(indexdef > indexdefs);
-	DBUG_ASSERT((ulint) (indexdef - indexdefs)
-		    <= ha_alter_info->key_count
-		    + add_fts_doc_idx + got_default_clust);
-	DBUG_ASSERT(ha_alter_info->index_add_count <= n_add);
+	assert(indexdef > indexdefs);
+	assert((ulint) (indexdef - indexdefs)
+	       <= ha_alter_info->key_count
+	       + add_fts_doc_idx + got_default_clust);
+	assert(ha_alter_info->index_add_count <= n_add);
 	DBUG_RETURN(indexdefs);
 }
 
@@ -2541,6 +2570,75 @@ innobase_check_column_length(
 	return(false);
 }
 
+/** Search for a given column in each index that is not being dropped. Return true if the column is part of any of the active indexes or it is a system column.
+@param[in]	table	table object
+@param[in]	col_no	column number of the column which is to be checked
+@param[in]	is_v	if this is a virtual column
+@retval	true the column exists or it is a system column
+@retval	false column does not exist */
+static
+bool
+check_col_exists_in_indexes(
+	const dict_table_t*	table,
+	ulint			col_no,
+	bool			is_v)
+{
+	/* This function does not check system columns */
+	if (!is_v && dict_table_get_nth_col(table, col_no)->mtype == DATA_SYS) {
+		return(true);
+	}
+
+	for (dict_index_t* index = dict_table_get_first_index(table); index;
+		index = dict_table_get_next_index(index)) {
+
+		if (index->to_be_dropped) {
+			continue;
+		}
+
+		for (ulint i = 0; i < index->n_user_defined_cols; i++) {
+			const dict_col_t* idx_col
+				= dict_index_get_nth_col(index, i);
+
+			if (is_v && dict_col_is_virtual(idx_col)) {
+				const dict_v_col_t*   v_col = reinterpret_cast<
+					const dict_v_col_t*>(idx_col);
+				if (v_col->v_pos == col_no) {
+					return(true);
+				}
+			}
+
+			if (!is_v && !dict_col_is_virtual(idx_col)
+			    && dict_col_get_no(idx_col) == col_no) {
+				return(true);
+			}
+		}
+	}
+
+	return(false);
+}
+
+/** Reset dict_col_t::ord_part for those columns that fail to be indexed,
+Check every existing column to see if any current index references them.
+This should be checked after an index is dropped during ALTER TABLE.
+@param[in,out]	table	InnoDB table to check */
+static
+inline
+void
+reset_column_ord_part(
+	dict_table_t	*table) {
+	for (ulint i = 0; i < dict_table_get_n_cols(table); i++) {
+		if (!check_col_exists_in_indexes(table, i, false)) {
+			table->cols[i].ord_part = 0;
+		}
+	}
+
+	for (ulint i = 0; i < dict_table_get_n_v_cols(table); i++) {
+		if (!check_col_exists_in_indexes(table, i, true)) {
+			table->v_cols[i].m_col.ord_part = 0;
+		}
+	}
+}
+
 /********************************************************************//**
 Drop any indexes that we were not able to free previously due to
 open table handles. */
@@ -2563,6 +2661,7 @@ online_retry_drop_indexes_low(
 
 	if (table->drop_aborted) {
 		row_merge_drop_indexes(trx, table, TRUE);
+                reset_column_ord_part(table);
 	}
 }
 
@@ -2882,18 +2981,18 @@ innobase_build_col_map(
 	mem_heap_t*		heap)
 {
 	DBUG_ENTER("innobase_build_col_map");
-	DBUG_ASSERT(altered_table != table);
-	DBUG_ASSERT(new_table != old_table);
-	DBUG_ASSERT(dict_table_get_n_cols(new_table)
-		    + dict_table_get_n_v_cols(new_table)
-		    >= altered_table->s->fields + DATA_N_SYS_COLS);
-	DBUG_ASSERT(dict_table_get_n_cols(old_table)
-		    + dict_table_get_n_v_cols(old_table)
-		    >= table->s->fields + DATA_N_SYS_COLS);
-	DBUG_ASSERT(!!add_cols == !!(ha_alter_info->handler_flags
-				     & Alter_inplace_info::ADD_COLUMN));
-	DBUG_ASSERT(!add_cols || dtuple_get_n_fields(add_cols)
-		    == dict_table_get_n_cols(new_table));
+	assert(altered_table != table);
+	assert(new_table != old_table);
+	assert(dict_table_get_n_cols(new_table)
+	       + dict_table_get_n_v_cols(new_table)
+	       >= altered_table->s->fields + DATA_N_SYS_COLS);
+	assert(dict_table_get_n_cols(old_table)
+	       + dict_table_get_n_v_cols(old_table)
+	       >= table->s->fields + DATA_N_SYS_COLS);
+	assert(!!add_cols == !!(ha_alter_info->handler_flags
+				& Alter_inplace_info::ADD_COLUMN));
+	assert(!add_cols || dtuple_get_n_fields(add_cols)
+	       == dict_table_get_n_cols(new_table));
 
 	ulint*	col_map = static_cast<ulint*>(
 		mem_heap_alloc(
@@ -2956,7 +3055,7 @@ innobase_build_col_map(
 		}
 	}
 
-	DBUG_ASSERT(i == altered_table->s->fields - num_v);
+	assert(i == altered_table->s->fields - num_v);
 
 	i = table->s->fields - old_table->n_v_cols;
 
@@ -2964,37 +3063,37 @@ innobase_build_col_map(
 	if (i + DATA_N_SYS_COLS < old_table->n_cols) {
 		/* There should be exactly one extra field,
 		the FTS_DOC_ID. */
-		DBUG_ASSERT(DICT_TF2_FLAG_IS_SET(old_table,
-						 DICT_TF2_FTS_HAS_DOC_ID));
-		DBUG_ASSERT(i + DATA_N_SYS_COLS + 1 == old_table->n_cols);
-		DBUG_ASSERT(!strcmp(dict_table_get_col_name(
-					    old_table, i),
-				    FTS_DOC_ID_COL_NAME));
+		assert(DICT_TF2_FLAG_IS_SET(old_table,
+					    DICT_TF2_FTS_HAS_DOC_ID));
+		assert(i + DATA_N_SYS_COLS + 1 == old_table->n_cols);
+		assert(!strcmp(dict_table_get_col_name(
+				       old_table, i),
+			       FTS_DOC_ID_COL_NAME));
 		if (altered_table->s->fields + DATA_N_SYS_COLS
 		    - new_table->n_v_cols
 		    < new_table->n_cols) {
-			DBUG_ASSERT(DICT_TF2_FLAG_IS_SET(
-					    new_table,
-					    DICT_TF2_FTS_HAS_DOC_ID));
-			DBUG_ASSERT(altered_table->s->fields
-				    + DATA_N_SYS_COLS + 1
-				    == static_cast<ulint>(
-					new_table->n_cols
-					+ new_table->n_v_cols));
+			assert(DICT_TF2_FLAG_IS_SET(
+				       new_table,
+				       DICT_TF2_FTS_HAS_DOC_ID));
+			assert(altered_table->s->fields
+			       + DATA_N_SYS_COLS + 1
+			       == static_cast<ulint>(
+				       new_table->n_cols
+				       + new_table->n_v_cols));
 			col_map[i] = altered_table->s->fields
 				     - new_table->n_v_cols;
 		} else {
-			DBUG_ASSERT(!DICT_TF2_FLAG_IS_SET(
-					    new_table,
-					    DICT_TF2_FTS_HAS_DOC_ID));
+			assert(!DICT_TF2_FLAG_IS_SET(
+				       new_table,
+				       DICT_TF2_FTS_HAS_DOC_ID));
 			col_map[i] = ULINT_UNDEFINED;
 		}
 
 		i++;
 	} else {
-		DBUG_ASSERT(!DICT_TF2_FLAG_IS_SET(
-				    old_table,
-				    DICT_TF2_FTS_HAS_DOC_ID));
+		assert(!DICT_TF2_FLAG_IS_SET(
+			       old_table,
+			       DICT_TF2_FTS_HAS_DOC_ID));
 	}
 
 	for (; i < old_table->n_cols; i++) {
@@ -3056,9 +3155,9 @@ innobase_get_col_names(
 	uint			i;
 
 	DBUG_ENTER("innobase_get_col_names");
-	DBUG_ASSERT(user_table->n_t_def > table->s->fields);
-	DBUG_ASSERT(ha_alter_info->handler_flags
-		    & Alter_inplace_info::ALTER_COLUMN_NAME);
+	assert(user_table->n_t_def > table->s->fields);
+	assert(ha_alter_info->handler_flags
+	       & Alter_inplace_info::ALTER_COLUMN_NAME);
 
 	cols = static_cast<const char**>(
 		mem_heap_zalloc(heap, user_table->n_def * sizeof *cols));
@@ -3068,7 +3167,7 @@ innobase_get_col_names(
 		ha_alter_info->alter_info->create_list);
 	while (const Create_field* new_field = cf_it++) {
 		ulint	num_v = 0;
-		DBUG_ASSERT(i < altered_table->s->fields);
+		assert(i < altered_table->s->fields);
 
 		if (innobase_is_v_fld(new_field)) {
 			continue;
@@ -3298,7 +3397,7 @@ innobase_update_gis_column_type(
 
 	DBUG_ENTER("innobase_update_gis_column_type");
 
-	DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
+	assert(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
 	ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
@@ -4216,17 +4315,17 @@ prepare_inplace_alter_table_dict(
 	ctx = static_cast<ha_innobase_inplace_ctx*>
 		(ha_alter_info->handler_ctx);
 
-	DBUG_ASSERT((ctx->add_autoinc != ULINT_UNDEFINED)
-		    == (ctx->sequence.m_max_value > 0));
-	DBUG_ASSERT(!ctx->num_to_drop_index == !ctx->drop_index);
-	DBUG_ASSERT(!ctx->num_to_drop_fk == !ctx->drop_fk);
-	DBUG_ASSERT(!add_fts_doc_id || add_fts_doc_id_idx);
-	DBUG_ASSERT(!add_fts_doc_id_idx
-		    || innobase_fulltext_exist(altered_table));
-	DBUG_ASSERT(!ctx->add_cols);
-	DBUG_ASSERT(!ctx->add_index);
-	DBUG_ASSERT(!ctx->add_key_numbers);
-	DBUG_ASSERT(!ctx->num_to_add_index);
+	assert((ctx->add_autoinc != ULINT_UNDEFINED)
+	       == (ctx->sequence.m_max_value > 0));
+	assert(!ctx->num_to_drop_index == !ctx->drop_index);
+	assert(!ctx->num_to_drop_fk == !ctx->drop_fk);
+	assert(!add_fts_doc_id || add_fts_doc_id_idx);
+	assert(!add_fts_doc_id_idx
+	       || innobase_fulltext_exist(altered_table));
+	assert(!ctx->add_cols);
+	assert(!ctx->add_index);
+	assert(!ctx->add_key_numbers);
+	assert(!ctx->num_to_add_index);
 
 	user_table = ctx->new_table;
 
@@ -4251,6 +4350,19 @@ prepare_inplace_alter_table_dict(
 		for create index */
 		if (ha_alter_info->handler_flags
 		    & Alter_inplace_info::ADD_INDEX) {
+                        for (ulint i = 0;
+                             i < ctx->num_to_add_vcol;
+                             i++) {
+                                /* Set mbminmax for newly added column */
+                                ulint   i_mbminlen, i_mbmaxlen;
+                                dtype_get_mblen(ctx->add_vcol[i].m_col.mtype,
+                                                ctx->add_vcol[i].m_col.prtype,
+                                                &i_mbminlen, &i_mbmaxlen);
+
+				dtype_set_mbminmaxlen(
+					(dtype_t*) &ctx->add_vcol[i].m_col,
+					i_mbminlen, i_mbmaxlen);
+                        }
 			add_v = static_cast<dict_add_v_col_t*>(
 				mem_heap_alloc(ctx->heap, sizeof *add_v));
 			add_v->n_v_col = ctx->num_to_add_vcol;
@@ -4312,10 +4424,10 @@ prepare_inplace_alter_table_dict(
 	/* The primary index would be rebuilt if a FTS Doc ID
 	column is to be added, and the primary index definition
 	is just copied from old table and stored in indexdefs[0] */
-	DBUG_ASSERT(!add_fts_doc_id || new_clustered);
-	DBUG_ASSERT(!!new_clustered ==
-		    (innobase_need_rebuild(ha_alter_info)
-		     || add_fts_doc_id));
+	assert(!add_fts_doc_id || new_clustered);
+	assert(!!new_clustered ==
+	       (innobase_need_rebuild(ha_alter_info)
+		|| add_fts_doc_id));
 
 	/* Allocate memory for dictionary index definitions */
 
@@ -4399,14 +4511,14 @@ prepare_inplace_alter_table_dict(
 
 		if (add_fts_doc_id) {
 			n_cols++;
-			DBUG_ASSERT(flags2 & DICT_TF2_FTS);
-			DBUG_ASSERT(add_fts_doc_id_idx);
+			assert(flags2 & DICT_TF2_FTS);
+			assert(add_fts_doc_id_idx);
 			flags2 |= DICT_TF2_FTS_ADD_DOC_ID
 				| DICT_TF2_FTS_HAS_DOC_ID
 				| DICT_TF2_FTS;
 		}
 
-		DBUG_ASSERT(!add_fts_doc_id_idx || (flags2 & DICT_TF2_FTS));
+		assert(!add_fts_doc_id_idx || (flags2 & DICT_TF2_FTS));
 
 		/* Create the table. */
 		trx_set_dict_operation(ctx->trx, TRX_DICT_OP_TABLE);
@@ -4648,7 +4760,7 @@ prepare_inplace_alter_table_dict(
 			/* n_ref_count must be 1, because purge cannot
 			be executing on this very table as we are
 			holding dict_operation_lock X-latch. */
-			DBUG_ASSERT(ctx->new_table->get_ref_count() == 1);
+			assert(ctx->new_table->get_ref_count() == 1);
 			break;
 		case DB_TABLESPACE_EXISTS:
 			my_error(ER_TABLESPACE_EXISTS, MYF(0),
@@ -4665,7 +4777,7 @@ prepare_inplace_alter_table_dict(
 		default:
 			my_error_innodb(error, table_name, flags);
 new_clustered_failed:
-			DBUG_ASSERT(ctx->trx != ctx->prebuilt->trx);
+			assert(ctx->trx != ctx->prebuilt->trx);
 			trx_rollback_to_savepoint(ctx->trx, NULL);
 
 			ut_ad(user_table->get_ref_count() == 1);
@@ -4693,9 +4805,9 @@ prepare_inplace_alter_table_dict(
 			add_cols, ctx->heap);
 		ctx->add_cols = add_cols;
 	} else {
-		DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info));
-		DBUG_ASSERT(old_table->s->primary_key
-			    == altered_table->s->primary_key);
+		assert(!innobase_need_rebuild(ha_alter_info));
+		assert(old_table->s->primary_key
+		       == altered_table->s->primary_key);
 
 		for (dict_index_t* index
 			     = dict_table_get_first_index(user_table);
@@ -4730,7 +4842,7 @@ prepare_inplace_alter_table_dict(
 
 	/* Assign table_id, so that no table id of
 	fts_create_index_tables() will be written to the undo logs. */
-	DBUG_ASSERT(ctx->new_table->id != 0);
+	assert(ctx->new_table->id != 0);
 	ctx->trx->table_id = ctx->new_table->id;
 
 	/* Create the indexes in SYS_INDEXES and load into dictionary. */
@@ -4752,17 +4864,17 @@ prepare_inplace_alter_table_dict(
 
 		if (!ctx->add_index[a]) {
 			error = ctx->trx->error_state;
-			DBUG_ASSERT(error != DB_SUCCESS);
+			assert(error != DB_SUCCESS);
 			goto error_handling;
 		}
 
-		DBUG_ASSERT(ctx->add_index[a]->is_committed()
-			    == !!new_clustered);
+		assert(ctx->add_index[a]->is_committed()
+		       == !!new_clustered);
 
 		if (ctx->add_index[a]->type & DICT_FTS) {
-			DBUG_ASSERT(num_fts_index);
-			DBUG_ASSERT(!fts_index);
-			DBUG_ASSERT(ctx->add_index[a]->type == DICT_FTS);
+			assert(num_fts_index);
+			assert(!fts_index);
+			assert(ctx->add_index[a]->type == DICT_FTS);
 			fts_index = ctx->add_index[a];
 		}
 
@@ -4813,7 +4925,7 @@ prepare_inplace_alter_table_dict(
 			ctx->col_map, clust_index, new_clust_index);
 
 		DBUG_EXECUTE_IF("innodb_alter_table_pk_assert_no_sort",
-			DBUG_ASSERT(ctx->skip_pk_sort););
+				assert(ctx->skip_pk_sort););
 
 		if (ctx->online) {
 			/* Allocate a log for online table rebuild. */
@@ -4865,7 +4977,7 @@ prepare_inplace_alter_table_dict(
 			ctx->new_table->fts_doc_id_index
 				= dict_table_get_index_on_name(
 					ctx->new_table, FTS_DOC_ID_INDEX_NAME);
-			DBUG_ASSERT(ctx->new_table->fts_doc_id_index != NULL);
+			assert(ctx->new_table->fts_doc_id_index != NULL);
 		}
 
 		/* This function will commit the transaction and reset
@@ -4915,7 +5027,7 @@ prepare_inplace_alter_table_dict(
 		ut_ad(trx_get_dict_operation(ctx->trx) == op);
 	}
 
-	DBUG_ASSERT(error == DB_SUCCESS);
+	assert(error == DB_SUCCESS);
 
 	/* Commit the data dictionary transaction in order to release
 	the table locks on the system tables.  This means that if
@@ -4958,7 +5070,7 @@ prepare_inplace_alter_table_dict(
 
 error_handled:
 
-	ctx->prebuilt->trx->error_info = NULL;
+	ctx->prebuilt->trx->error_index = NULL;
 	ctx->trx->error_state = DB_SUCCESS;
 
 	if (!dict_locked) {
@@ -4998,7 +5110,7 @@ prepare_inplace_alter_table_dict(
 		/* n_ref_count must be 1, because purge cannot
 		be executing on this very table as we are
 		holding dict_operation_lock X-latch. */
-		DBUG_ASSERT(user_table->get_ref_count() == 1 || ctx->online);
+		assert(user_table->get_ref_count() == 1 || ctx->online);
 
 		online_retry_drop_indexes_with_trx(user_table, ctx->trx);
 	} else {
@@ -5014,8 +5126,8 @@ prepare_inplace_alter_table_dict(
 #ifdef UNIV_DEBUG
 	/* Clear the to_be_dropped flag in the data dictionary cache. */
 	for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
-		DBUG_ASSERT(ctx->drop_index[i]->is_committed());
-		DBUG_ASSERT(ctx->drop_index[i]->to_be_dropped);
+		assert(ctx->drop_index[i]->is_committed());
+		assert(ctx->drop_index[i]->to_be_dropped);
 		ctx->drop_index[i]->to_be_dropped = 0;
 	}
 #endif /* UNIV_DEBUG */
@@ -5081,7 +5193,7 @@ innobase_check_foreign_key_index(
 			    ha_alter_info->index_add_count)) {
 
 			/* Index cannot be dropped. */
-			trx->error_info = index;
+			trx->error_index = index;
 			return(true);
 		}
 	}
@@ -5115,7 +5227,7 @@ innobase_check_foreign_key_index(
 			    ha_alter_info->index_add_count)) {
 
 			/* Index cannot be dropped. */
-			trx->error_info = index;
+			trx->error_index = index;
 			return(true);
 		}
 	}
@@ -5321,18 +5433,24 @@ alter_fill_stored_column(
 	dict_s_col_list**	s_cols,
 	mem_heap_t**		s_heap)
 {
-       ulint   n_cols = altered_table->s->fields;
+	ulint   n_cols = altered_table->s->fields;
+	ulint	stored_col_no = 0;
 
 	for (ulint i = 0; i < n_cols; i++) {
 		Field* field = altered_table->field[i];
 		dict_s_col_t	s_col;
 
+		if (!innobase_is_v_fld(field)) {
+			stored_col_no++;
+		}
+
 		if (!innobase_is_s_fld(field)) {
 			continue;
 		}
 
 		ulint	num_base = field->gcol_info->non_virtual_base_columns();
-		dict_col_t*	col = dict_table_get_nth_col(table, i);
+		dict_col_t*	col
+			= dict_table_get_nth_col(table, stored_col_no);
 
 		s_col.m_col = col;
 		s_col.s_pos = i;
@@ -5398,9 +5516,9 @@ ha_innobase::prepare_inplace_alter_table(
 	mem_heap_t*	s_heap			= NULL;
 
 	DBUG_ENTER("prepare_inplace_alter_table");
-	DBUG_ASSERT(!ha_alter_info->handler_ctx);
-	DBUG_ASSERT(ha_alter_info->create_info);
-	DBUG_ASSERT(!srv_read_only_mode);
+	assert(!ha_alter_info->handler_ctx);
+	assert(ha_alter_info->create_info);
+	assert(!srv_read_only_mode);
 
 	MONITOR_ATOMIC_INC(MONITOR_PENDING_ALTER_TABLE);
 
@@ -5419,7 +5537,7 @@ ha_innobase::prepare_inplace_alter_table(
 
 	if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
 		/* Nothing to do */
-		DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
+		assert(m_prebuilt->trx->dict_operation_lock_mode == 0);
 		if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
 
 			online_retry_drop_indexes(
@@ -5491,7 +5609,7 @@ ha_innobase::prepare_inplace_alter_table(
 		    ha_alter_info->key_info_buffer,
 		    ha_alter_info->key_count)) {
 err_exit_no_heap:
-		DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
+		assert(m_prebuilt->trx->dict_operation_lock_mode == 0);
 		if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
 
 			online_retry_drop_indexes(
@@ -5573,7 +5691,17 @@ ha_innobase::prepare_inplace_alter_table(
 		goto err_exit_no_heap;
 	}
 
-	max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags());
+
+	/* The copy algorithm uses the default row format while
+	in-place uses the current format. Find the limit for
+	the resulting format.*/
+	if (innobase_need_rebuild(ha_alter_info)) {
+		max_col_len =
+			DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags());
+	} else {
+		max_col_len =
+			DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(m_prebuilt->table->flags);
+	}
 
 	/* Check each index's column length to make sure they do not
 	exceed limit */
@@ -5585,11 +5713,11 @@ ha_innobase::prepare_inplace_alter_table(
 			/* The column length does not matter for
 			fulltext search indexes. But, UNIQUE
 			fulltext indexes are not supported. */
-			DBUG_ASSERT(!(key->flags & HA_NOSAME));
-			DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
-				      & ~(HA_FULLTEXT
-					  | HA_PACK_KEY
-					  | HA_BINARY_PACK_KEY)));
+			assert(!(key->flags & HA_NOSAME));
+			assert(!(key->flags & HA_KEYFLAG_MASK
+				 & ~(HA_FULLTEXT
+				     | HA_PACK_KEY
+				     | HA_BINARY_PACK_KEY)));
 			add_fts_idx = true;
 			continue;
 		}
@@ -5619,8 +5747,8 @@ ha_innobase::prepare_inplace_alter_table(
 	     index;
 	     index = dict_table_get_next_index(index)) {
 		if (index->type & DICT_FTS) {
-			DBUG_ASSERT(index->type == DICT_FTS
-				    || (index->type & DICT_CORRUPT));
+			assert(index->type == DICT_FTS
+			       || (index->type & DICT_CORRUPT));
 
 			/* We need to drop any corrupted fts indexes
 			before we add a new fts index. */
@@ -5670,7 +5798,7 @@ ha_innobase::prepare_inplace_alter_table(
 
 	if (ha_alter_info->handler_flags
 	    & Alter_inplace_info::DROP_FOREIGN_KEY) {
-		DBUG_ASSERT(ha_alter_info->alter_info->drop_list.elements > 0);
+		assert(ha_alter_info->alter_info->drop_list.elements > 0);
 
 		drop_fk = static_cast<dict_foreign_t**>(
 			mem_heap_alloc(
@@ -5694,7 +5822,7 @@ ha_innobase::prepare_inplace_alter_table(
 				dict_foreign_t*	foreign = *it;
 				const char* fid = strchr(foreign->id, '/');
 
-				DBUG_ASSERT(fid);
+				assert(fid);
 				/* If no database/ prefix was present in
 				the FOREIGN KEY constraint name, compare
 				to the full constraint name. */
@@ -5714,10 +5842,10 @@ ha_innobase::prepare_inplace_alter_table(
 			continue;
 		}
 
-		DBUG_ASSERT(n_drop_fk > 0);
+		assert(n_drop_fk > 0);
 
-		DBUG_ASSERT(n_drop_fk
-			    == ha_alter_info->alter_info->drop_list.elements);
+		assert(n_drop_fk
+		       == ha_alter_info->alter_info->drop_list.elements);
 	} else {
 		drop_fk = NULL;
 	}
@@ -5725,10 +5853,10 @@ ha_innobase::prepare_inplace_alter_table(
 	if (ha_alter_info->index_drop_count) {
 		dict_index_t*	drop_primary = NULL;
 
-		DBUG_ASSERT(ha_alter_info->handler_flags
-			    & (Alter_inplace_info::DROP_INDEX
-			       | Alter_inplace_info::DROP_UNIQUE_INDEX
-			       | Alter_inplace_info::DROP_PK_INDEX));
+		assert(ha_alter_info->handler_flags
+		       & (Alter_inplace_info::DROP_INDEX
+			  | Alter_inplace_info::DROP_UNIQUE_INDEX
+			  | Alter_inplace_info::DROP_PK_INDEX));
 		/* Check which indexes to drop. */
 		drop_index = static_cast<dict_index_t**>(
 			mem_heap_alloc(
@@ -5776,7 +5904,7 @@ ha_innobase::prepare_inplace_alter_table(
 				goto check_if_can_drop_indexes;
 			}
 
-			DBUG_ASSERT(!fts_doc_index->to_be_dropped);
+			assert(!fts_doc_index->to_be_dropped);
 
 			for (uint i = 0; i < table->s->keys; i++) {
 				if (!my_strcasecmp(
@@ -5820,7 +5948,7 @@ ha_innobase::prepare_inplace_alter_table(
 				m_prebuilt->trx, drop_fk, n_drop_fk)) {
 				row_mysql_unlock_data_dictionary(
 					m_prebuilt->trx);
-				m_prebuilt->trx->error_info = index;
+				m_prebuilt->trx->error_index = index;
 				print_error(HA_ERR_DROP_INDEX_FK,
 					    MYF(0));
 				goto err_exit;
@@ -5948,7 +6076,7 @@ ha_innobase::prepare_inplace_alter_table(
 					col_names, ULINT_UNDEFINED, 0, 0, 0);
 		}
 
-		DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
+		assert(m_prebuilt->trx->dict_operation_lock_mode == 0);
 		if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
 
 			online_retry_drop_indexes(
@@ -6009,7 +6137,7 @@ ha_innobase::prepare_inplace_alter_table(
 				 FTS_DOC_ID_INDEX_NAME);
 			goto err_exit;
 		case FTS_EXIST_DOC_ID_INDEX:
-			DBUG_ASSERT(
+			assert(
 				doc_col_no == fts_doc_col_no
 				|| doc_col_no == ULINT_UNDEFINED
 				|| (ha_alter_info->handler_flags
@@ -6027,7 +6155,7 @@ ha_innobase::prepare_inplace_alter_table(
 	while (const Create_field* new_field = cf_it++) {
 		const Field*	field;
 
-		DBUG_ASSERT(i < altered_table->s->fields);
+		assert(i < altered_table->s->fields);
 
 		for (uint old_i = 0; table->field[old_i]; old_i++) {
 			if (new_field->field == table->field[old_i]) {
@@ -6036,15 +6164,15 @@ ha_innobase::prepare_inplace_alter_table(
 		}
 
 		/* This is an added column. */
-		DBUG_ASSERT(!new_field->field);
-		DBUG_ASSERT(ha_alter_info->handler_flags
-			    & Alter_inplace_info::ADD_COLUMN);
+		assert(!new_field->field);
+		assert(ha_alter_info->handler_flags
+		       & Alter_inplace_info::ADD_COLUMN);
 
 		field = altered_table->field[i];
 
-		DBUG_ASSERT((MTYP_TYPENR(field->unireg_check)
-			     == Field::NEXT_NUMBER)
-			    == !!(field->flags & AUTO_INCREMENT_FLAG));
+		assert((MTYP_TYPENR(field->unireg_check)
+			== Field::NEXT_NUMBER)
+		       == !!(field->flags & AUTO_INCREMENT_FLAG));
 
 		if (field->flags & AUTO_INCREMENT_FLAG) {
 			if (add_autoinc_col_no != ULINT_UNDEFINED) {
@@ -6068,9 +6196,9 @@ ha_innobase::prepare_inplace_alter_table(
 		i++;
 	}
 
-	DBUG_ASSERT(heap);
-	DBUG_ASSERT(m_user_thd == m_prebuilt->trx->mysql_thd);
-	DBUG_ASSERT(!ha_alter_info->handler_ctx);
+	assert(heap);
+	assert(m_user_thd == m_prebuilt->trx->mysql_thd);
+	assert(!ha_alter_info->handler_ctx);
 
 	ha_alter_info->handler_ctx = new ha_innobase_inplace_ctx(
 		(*m_prebuilt_ptr),
@@ -6203,7 +6331,7 @@ ha_innobase::inplace_alter_table(
 	struct TABLE*		eval_table = altered_table;
 	bool			rebuild_templ = false;
 	DBUG_ENTER("inplace_alter_table");
-	DBUG_ASSERT(!srv_read_only_mode);
+	assert(!srv_read_only_mode);
 
 	ut_ad(!rw_lock_own(dict_operation_lock, RW_LOCK_X));
 	ut_ad(!rw_lock_own(dict_operation_lock, RW_LOCK_S));
@@ -6226,9 +6354,9 @@ ha_innobase::inplace_alter_table(
 		= static_cast<ha_innobase_inplace_ctx*>
 		(ha_alter_info->handler_ctx);
 
-	DBUG_ASSERT(ctx);
-	DBUG_ASSERT(ctx->trx);
-	DBUG_ASSERT(ctx->prebuilt == m_prebuilt);
+	assert(ctx);
+	assert(ctx->trx);
+	assert(ctx->prebuilt == m_prebuilt);
 
 	dict_index_t*	pk = dict_table_get_first_index(m_prebuilt->table);
 	ut_ad(pk != NULL);
@@ -6306,6 +6434,8 @@ ha_innobase::inplace_alter_table(
 	/* Read the clustered index of the table and build
 	indexes based on this information using temporary
 	files and merge sort. */
+	DEBUG_SYNC_C("alter_table_update_log");
+
 	DBUG_EXECUTE_IF("innodb_OOM_inplace_alter",
 			error = DB_OUT_OF_MEMORY; goto oom;);
 	error = row_merge_build_indexes(
@@ -6317,9 +6447,9 @@ ha_innobase::inplace_alter_table(
 		ctx->add_autoinc, ctx->sequence, ctx->skip_pk_sort,
 		ctx->m_stage, add_v, eval_table);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 oom:
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 	if (error == DB_SUCCESS && ctx->online && ctx->need_rebuild()) {
 		DEBUG_SYNC_C("row_log_table_apply1_before");
 		error = row_log_table_apply(
@@ -6364,16 +6494,28 @@ ha_innobase::inplace_alter_table(
 			table. Either way, we should be seeing and
 			reporting a bogus duplicate key error. */
 			dup_key = NULL;
-		} else {
-			DBUG_ASSERT(m_prebuilt->trx->error_key_num
-				    < ha_alter_info->key_count);
+		} else if (m_prebuilt->trx->error_key_num == 0) {
 			dup_key = &ha_alter_info->key_info_buffer[
 				m_prebuilt->trx->error_key_num];
+		} else {
+			/* Check if there is generated cluster index column */
+			if (ctx->num_to_add_index > ha_alter_info->key_count) {
+				assert(m_prebuilt->trx->error_key_num
+				       <= ha_alter_info->key_count);
+				dup_key = &ha_alter_info->key_info_buffer[
+					m_prebuilt->trx->error_key_num - 1];
+			}
+			else {
+				assert(m_prebuilt->trx->error_key_num
+				       < ha_alter_info->key_count);
+				dup_key = &ha_alter_info->key_info_buffer[
+					m_prebuilt->trx->error_key_num];
+			}
 		}
 		print_keydup_error(altered_table, dup_key, MYF(0));
 		break;
 	case DB_ONLINE_LOG_TOO_BIG:
-		DBUG_ASSERT(ctx->online);
+		assert(ctx->online);
 		my_error(ER_INNODB_ONLINE_LOG_TOO_BIG, MYF(0),
 			 get_error_key_name(m_prebuilt->trx->error_key_num,
 					    ha_alter_info, m_prebuilt->table));
@@ -6391,7 +6533,7 @@ ha_innobase::inplace_alter_table(
 
 	/* prebuilt->table->n_ref_count can be anything here, given
 	that we hold at most a shared lock on the table. */
-	m_prebuilt->trx->error_info = NULL;
+	m_prebuilt->trx->error_index = NULL;
 	ctx->trx->error_state = DB_SUCCESS;
 
 	DBUG_RETURN(true);
@@ -6420,61 +6562,11 @@ innobase_online_rebuild_log_free(
 		DEBUG_SYNC_C("innodb_online_rebuild_log_free_aborted");
 	}
 
-	DBUG_ASSERT(dict_index_get_online_status(clust_index)
-		    == ONLINE_INDEX_COMPLETE);
+	assert(dict_index_get_online_status(clust_index)
+	       == ONLINE_INDEX_COMPLETE);
 	rw_lock_x_unlock(&clust_index->lock);
 }
 
-/** For each user column, which is part of an index which is not going to be
-dropped, it checks if the column number of the column is same as col_no
-argument passed.
-@param[in]	table	table object
-@param[in]	col_no	column number of the column which is to be checked
-@param[in]	is_v	if this is a virtual column
-@retval true column exists
-@retval false column does not exist, true if column is system column or
-it is in the index. */
-static
-bool
-check_col_exists_in_indexes(
-	const dict_table_t*	table,
-	ulint			col_no,
-	bool			is_v)
-{
-	/* This function does not check system columns */
-	if (!is_v && dict_table_get_nth_col(table, col_no)->mtype == DATA_SYS) {
-		return(true);
-	}
-
-	for (dict_index_t* index = dict_table_get_first_index(table); index;
-	     index = dict_table_get_next_index(index)) {
-
-		if (index->to_be_dropped) {
-			continue;
-		}
-
-		for (ulint i = 0; i < index->n_user_defined_cols; i++) {
-			const dict_col_t* idx_col
-				= dict_index_get_nth_col(index, i);
-
-			if (is_v && dict_col_is_virtual(idx_col)) {
-				const dict_v_col_t*   v_col = reinterpret_cast<
-					const dict_v_col_t*>(idx_col);
-				if (v_col->v_pos == col_no) {
-					return(true);
-				}
-			}
-
-			if (!is_v && !dict_col_is_virtual(idx_col)
-			    && dict_col_get_no(idx_col) == col_no) {
-				return(true);
-			}
-		}
-	}
-
-	return(false);
-}
-
 /** Rollback a secondary index creation, drop the indexes with
 temparary index prefix
 @param user_table InnoDB table
@@ -6576,9 +6668,9 @@ rollback_inplace_alter_table(
 			fail = true;
 		}
 	} else {
-		DBUG_ASSERT(!(ha_alter_info->handler_flags
-			      & Alter_inplace_info::ADD_PK_INDEX));
-		DBUG_ASSERT(ctx->new_table == prebuilt->table);
+		assert(!(ha_alter_info->handler_flags
+			 & Alter_inplace_info::ADD_PK_INDEX));
+		assert(ctx->new_table == prebuilt->table);
 
 		innobase_rollback_sec_index(
 			prebuilt->table, table, FALSE, ctx->trx);
@@ -6589,16 +6681,16 @@ rollback_inplace_alter_table(
 	trx_free_for_mysql(ctx->trx);
 
 func_exit:
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	dict_index_t* clust_index = dict_table_get_first_index(
 		prebuilt->table);
-	DBUG_ASSERT(!clust_index->online_log);
-	DBUG_ASSERT(dict_index_get_online_status(clust_index)
-		    == ONLINE_INDEX_COMPLETE);
-#endif /* !DBUG_OFF */
+	assert(!clust_index->online_log);
+	assert(dict_index_get_online_status(clust_index)
+	       == ONLINE_INDEX_COMPLETE);
+#endif /* !NDEBUG */
 
 	if (ctx) {
-		DBUG_ASSERT(ctx->prebuilt == prebuilt);
+		assert(ctx->prebuilt == prebuilt);
 
 		if (ctx->num_to_add_fk) {
 			for (ulint i = 0; i < ctx->num_to_add_fk; i++) {
@@ -6616,7 +6708,7 @@ rollback_inplace_alter_table(
 			commit_inplace_alter_table(). */
 			for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
 				dict_index_t*	index = ctx->drop_index[i];
-				DBUG_ASSERT(index->is_committed());
+				assert(index->is_committed());
 				index->to_be_dropped = 0;
 			}
 
@@ -6624,20 +6716,7 @@ rollback_inplace_alter_table(
 		}
 	}
 
-	/* Reset dict_col_t::ord_part for those columns fail to be indexed,
-	we do this by checking every existing column, if any current
-	index would index them */
-	for (ulint i = 0; i < dict_table_get_n_cols(prebuilt->table); i++) {
-		if (!check_col_exists_in_indexes(prebuilt->table, i, false)) {
-			prebuilt->table->cols[i].ord_part = 0;
-		}
-	}
-
-	for (ulint i = 0; i < dict_table_get_n_v_cols(prebuilt->table); i++) {
-		if (!check_col_exists_in_indexes(prebuilt->table, i, true)) {
-			prebuilt->table->v_cols[i].m_col.ord_part = 0;
-		}
-	}
+	reset_column_ord_part(prebuilt->table);
 
 	trx_commit_for_mysql(prebuilt->trx);
 	MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
@@ -6660,7 +6739,7 @@ innobase_drop_foreign_try(
 {
 	DBUG_ENTER("innobase_drop_foreign_try");
 
-	DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
+	assert(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
 	ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
@@ -6723,7 +6802,7 @@ innobase_rename_column_try(
 
 	DBUG_ENTER("innobase_rename_column_try");
 
-	DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
+	assert(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
 	ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
@@ -6928,9 +7007,9 @@ innobase_rename_columns_try(
 	uint	i = 0;
 	ulint	num_v = 0;
 
-	DBUG_ASSERT(ctx);
-	DBUG_ASSERT(ha_alter_info->handler_flags
-		    & Alter_inplace_info::ALTER_COLUMN_NAME);
+	assert(ctx);
+	assert(ha_alter_info->handler_flags
+	       & Alter_inplace_info::ALTER_COLUMN_NAME);
 
 	for (Field** fp = table->field; *fp; fp++, i++) {
 		bool	is_virtual = innobase_is_v_fld(*fp);
@@ -7002,7 +7081,7 @@ innobase_enlarge_column_try(
 
 	DBUG_ENTER("innobase_enlarge_column_try");
 
-	DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
+	assert(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
 	ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
 	ut_ad(mutex_own(&dict_sys->mutex));
 	ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
@@ -7189,13 +7268,15 @@ innobase_rename_or_enlarge_columns_cache(
 }
 
 /** Get the auto-increment value of the table on commit.
-@param ha_alter_info Data used during in-place alter
-@param ctx In-place ALTER TABLE context
-@param altered_table MySQL table that is being altered
-@param old_table MySQL table as it is before the ALTER operation
-@return the next auto-increment value (0 if not present) */
+@param[in]  ha_alter_info Data used during in-place alter
+@param[in,out]  ctx In-place ALTER TABLE context.
+		return autoinc value in ctx->max_autoinc
+@param[in]  altered_table MySQL table that is being altered
+@param[in]  old_table MySQL table as it is before the ALTER operation
+@retval true Failure
+@retval false Success*/
 static MY_ATTRIBUTE((warn_unused_result))
-ulonglong
+bool
 commit_get_autoinc(
 /*===============*/
 	Alter_inplace_info*	ha_alter_info,
@@ -7203,23 +7284,27 @@ commit_get_autoinc(
 	const TABLE*		altered_table,
 	const TABLE*		old_table)
 {
-	ulonglong		max_autoinc;
-
 	DBUG_ENTER("commit_get_autoinc");
 
 	if (!altered_table->found_next_number_field) {
 		/* There is no AUTO_INCREMENT column in the table
 		after the ALTER operation. */
-		max_autoinc = 0;
+		ctx->max_autoinc = 0;
 	} else if (ctx->add_autoinc != ULINT_UNDEFINED) {
 		/* An AUTO_INCREMENT column was added. Get the last
 		value from the sequence, which may be based on a
 		supplied AUTO_INCREMENT value. */
-		max_autoinc = ctx->sequence.last();
+		ctx->max_autoinc = ctx->sequence.last();
 	} else if ((ha_alter_info->handler_flags
 		    & Alter_inplace_info::CHANGE_CREATE_OPTION)
 		   && (ha_alter_info->create_info->used_fields
 		       & HA_CREATE_USED_AUTO)) {
+
+		/* Check if the table is discarded */
+		if(dict_table_is_discarded(ctx->old_table)) {
+			DBUG_RETURN(true);
+		}
+
 		/* An AUTO_INCREMENT value was supplied, but the table was not
 		rebuilt. Get the user-supplied value or the last value from the
 		sequence. */
@@ -7232,7 +7317,8 @@ commit_get_autoinc(
 		dict_index_t*	index = dict_table_get_index_on_first_col(
 			ctx->old_table, autoinc_field->field_index);
 
-		max_autoinc = ha_alter_info->create_info->auto_increment_value;
+		ctx->max_autoinc =
+			ha_alter_info->create_info->auto_increment_value;
 
 		dict_table_autoinc_lock(ctx->old_table);
 
@@ -7241,15 +7327,15 @@ commit_get_autoinc(
 
 		if (err != DB_SUCCESS) {
 			ut_ad(0);
-			max_autoinc = 0;
-		} else if (max_autoinc <= max_value_table) {
+			ctx->max_autoinc = 0;
+		} else if (ctx->max_autoinc <= max_value_table) {
 			ulonglong	col_max_value;
 			ulonglong	offset;
 
 			col_max_value = autoinc_field->get_max_int_value();
 
 			offset = ctx->prebuilt->autoinc_offset;
-			max_autoinc = innobase_next_autoinc(
+			ctx->max_autoinc = innobase_next_autoinc(
 				max_value_table, 1, 1, offset,
 				col_max_value);
 		}
@@ -7259,11 +7345,11 @@ commit_get_autoinc(
 		Read the old counter value from the table. */
 		ut_ad(old_table->found_next_number_field);
 		dict_table_autoinc_lock(ctx->old_table);
-		max_autoinc = ctx->old_table->autoinc;
+		ctx->max_autoinc = ctx->old_table->autoinc;
 		dict_table_autoinc_unlock(ctx->old_table);
 	}
 
-	DBUG_RETURN(max_autoinc);
+	DBUG_RETURN(false);
 }
 
 /** Add or drop foreign key constraints to the data dictionary tables,
@@ -7287,7 +7373,7 @@ innobase_update_foreign_try(
 	ulint	i;
 
 	DBUG_ENTER("innobase_update_foreign_try");
-	DBUG_ASSERT(ctx);
+	assert(ctx);
 
 	foreign_id = dict_table_get_highest_foreign_id(ctx->new_table);
 
@@ -7343,7 +7429,7 @@ innobase_update_foreign_try(
 	for (i = 0; i < ctx->num_to_drop_fk; i++) {
 		dict_foreign_t* fk = ctx->drop_fk[i];
 
-		DBUG_ASSERT(fk->foreign_table == ctx->old_table);
+		assert(fk->foreign_table == ctx->old_table);
 
 		if (innobase_drop_foreign_try(trx, table_name, fk->id)) {
 			DBUG_RETURN(true);
@@ -7385,9 +7471,9 @@ innobase_update_foreign_cache(
 		/* The rebuilt table is already using the renamed
 		column names. No need to pass col_names or to drop
 		constraints from the data dictionary cache. */
-		DBUG_ASSERT(!ctx->col_names);
-		DBUG_ASSERT(user_table->foreign_set.empty());
-		DBUG_ASSERT(user_table->referenced_set.empty());
+		assert(!ctx->col_names);
+		assert(user_table->foreign_set.empty());
+		assert(user_table->referenced_set.empty());
 		user_table = ctx->new_table;
 	} else {
 		/* Drop the foreign key constraints if the
@@ -7487,18 +7573,18 @@ commit_try_rebuild(
 	dict_table_t*	user_table	= ctx->old_table;
 
 	DBUG_ENTER("commit_try_rebuild");
-	DBUG_ASSERT(ctx->need_rebuild());
-	DBUG_ASSERT(trx->dict_operation_lock_mode == RW_X_LATCH);
-	DBUG_ASSERT(!(ha_alter_info->handler_flags
-		      & Alter_inplace_info::DROP_FOREIGN_KEY)
-		    || ctx->num_to_drop_fk > 0);
+	assert(ctx->need_rebuild());
+	assert(trx->dict_operation_lock_mode == RW_X_LATCH);
+	assert(!(ha_alter_info->handler_flags
+		 & Alter_inplace_info::DROP_FOREIGN_KEY)
+	       || ctx->num_to_drop_fk > 0);
 
 	for (dict_index_t* index = dict_table_get_first_index(rebuilt_table);
 	     index;
 	     index = dict_table_get_next_index(index)) {
-		DBUG_ASSERT(dict_index_get_online_status(index)
-			    == ONLINE_INDEX_COMPLETE);
-		DBUG_ASSERT(index->is_committed());
+		assert(dict_index_get_online_status(index)
+		       == ONLINE_INDEX_COMPLETE);
+		assert(index->is_committed());
 		if (dict_index_is_corrupted(index)) {
 			my_error(ER_INDEX_CORRUPT, MYF(0), index->name());
 			DBUG_RETURN(true);
@@ -7515,9 +7601,9 @@ commit_try_rebuild(
 	of user_table. */
 	for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
 		dict_index_t*	index = ctx->drop_index[i];
-		DBUG_ASSERT(index->table == user_table);
-		DBUG_ASSERT(index->is_committed());
-		DBUG_ASSERT(index->to_be_dropped);
+		assert(index->table == user_table);
+		assert(index->is_committed());
+		assert(index->to_be_dropped);
 		index->to_be_dropped = 0;
 	}
 
@@ -7565,10 +7651,19 @@ commit_try_rebuild(
 				FTS_DOC_ID. */
 				dup_key = NULL;
 			} else {
-				DBUG_ASSERT(err_key <
-					    ha_alter_info->key_count);
-				dup_key = &ha_alter_info
-					->key_info_buffer[err_key];
+				/* Check if there is generated cluster index column */
+				if (ctx->num_to_add_index > ha_alter_info->key_count) {
+					assert(err_key <=
+					       ha_alter_info->key_count);
+					dup_key = &ha_alter_info
+						->key_info_buffer[err_key - 1];
+				}
+				else {
+					assert(err_key <
+					       ha_alter_info->key_count);
+					dup_key = &ha_alter_info
+						->key_info_buffer[err_key];
+				}
 			}
 			print_keydup_error(altered_table, dup_key, MYF(0));
 			DBUG_RETURN(true);
@@ -7615,7 +7710,7 @@ commit_try_rebuild(
 		user_table, rebuilt_table, ctx->tmp_name, trx);
 
 	/* We must be still holding a table handle. */
-	DBUG_ASSERT(user_table->get_ref_count() >= 1);
+	assert(user_table->get_ref_count() >= 1);
 
 	DBUG_EXECUTE_IF("ib_ddl_crash_after_rename", DBUG_SUICIDE(););
 	DBUG_EXECUTE_IF("ib_rebuild_cannot_rename", error = DB_ERROR;);
@@ -7664,9 +7759,9 @@ commit_cache_rebuild(
 
 	DBUG_ENTER("commit_cache_rebuild");
 	DEBUG_SYNC_C("commit_cache_rebuild");
-	DBUG_ASSERT(ctx->need_rebuild());
-	DBUG_ASSERT(dict_table_is_discarded(ctx->old_table)
-		    == dict_table_is_discarded(ctx->new_table));
+	assert(ctx->need_rebuild());
+	assert(dict_table_is_discarded(ctx->old_table)
+	       == dict_table_is_discarded(ctx->new_table));
 
 	const char* old_name = mem_heap_strdup(
 		ctx->heap, ctx->old_table->name.m_name);
@@ -7747,21 +7842,21 @@ commit_try_norebuild(
 	const char*		table_name)
 {
 	DBUG_ENTER("commit_try_norebuild");
-	DBUG_ASSERT(!ctx->need_rebuild());
-	DBUG_ASSERT(trx->dict_operation_lock_mode == RW_X_LATCH);
-	DBUG_ASSERT(!(ha_alter_info->handler_flags
-		      & Alter_inplace_info::DROP_FOREIGN_KEY)
-		    || ctx->num_to_drop_fk > 0);
-	DBUG_ASSERT(ctx->num_to_drop_fk
-		    == ha_alter_info->alter_info->drop_list.elements
-		    || ctx->num_to_drop_vcol
-		       == ha_alter_info->alter_info->drop_list.elements);
+	assert(!ctx->need_rebuild());
+	assert(trx->dict_operation_lock_mode == RW_X_LATCH);
+	assert(!(ha_alter_info->handler_flags
+		 & Alter_inplace_info::DROP_FOREIGN_KEY)
+	       || ctx->num_to_drop_fk > 0);
+	assert(ctx->num_to_drop_fk
+	       == ha_alter_info->alter_info->drop_list.elements
+	       || ctx->num_to_drop_vcol
+	       == ha_alter_info->alter_info->drop_list.elements);
 
 	for (ulint i = 0; i < ctx->num_to_add_index; i++) {
 		dict_index_t*	index = ctx->add_index[i];
-		DBUG_ASSERT(dict_index_get_online_status(index)
-			    == ONLINE_INDEX_COMPLETE);
-		DBUG_ASSERT(!index->is_committed());
+		assert(dict_index_get_online_status(index)
+		       == ONLINE_INDEX_COMPLETE);
+		assert(!index->is_committed());
 		if (dict_index_is_corrupted(index)) {
 			/* Report a duplicate key
 			error for the index that was
@@ -7789,9 +7884,9 @@ commit_try_norebuild(
 	/* We altered the table in place. Mark the indexes as committed. */
 	for (ulint i = 0; i < ctx->num_to_add_index; i++) {
 		dict_index_t*	index = ctx->add_index[i];
-		DBUG_ASSERT(dict_index_get_online_status(index)
-			    == ONLINE_INDEX_COMPLETE);
-		DBUG_ASSERT(!index->is_committed());
+		assert(dict_index_get_online_status(index)
+		       == ONLINE_INDEX_COMPLETE);
+		assert(!index->is_committed());
 		error = row_merge_rename_index_to_add(
 			trx, ctx->new_table->id, index->id);
 		switch (error) {
@@ -7803,14 +7898,14 @@ commit_try_norebuild(
 			probably be corrupted. This is because a
 			'trigger' on SYS_INDEXES could already have invoked
 			btr_free_if_exists(), which cannot be rolled back. */
-			DBUG_ASSERT(trx->undo_no == 0);
+			assert(trx->undo_no == 0);
 			my_error(ER_TOO_MANY_CONCURRENT_TRXS, MYF(0));
 			DBUG_RETURN(true);
 		default:
 			sql_print_error(
 				"InnoDB: rename index to add: %lu\n",
 				(ulong) error);
-			DBUG_ASSERT(0);
+			assert(0);
 			my_error(ER_INTERNAL_ERROR, MYF(0),
 				 "rename index to add");
 			DBUG_RETURN(true);
@@ -7822,9 +7917,9 @@ commit_try_norebuild(
 
 	for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
 		dict_index_t*	index = ctx->drop_index[i];
-		DBUG_ASSERT(index->is_committed());
-		DBUG_ASSERT(index->table == ctx->new_table);
-		DBUG_ASSERT(index->to_be_dropped);
+		assert(index->is_committed());
+		assert(index->table == ctx->new_table);
+		assert(index->to_be_dropped);
 
 		error = row_merge_rename_index_to_drop(
 			trx, index->table->id, index->id);
@@ -7832,7 +7927,7 @@ commit_try_norebuild(
 			sql_print_error(
 				"InnoDB: rename index to drop: %lu\n",
 				(ulong) error);
-			DBUG_ASSERT(0);
+			assert(0);
 			my_error(ER_INTERNAL_ERROR, MYF(0),
 				 "rename index to drop");
 			DBUG_RETURN(true);
@@ -7897,14 +7992,14 @@ commit_cache_norebuild(
 
 	bool	found = true;
 
-	DBUG_ASSERT(!ctx->need_rebuild());
+	assert(!ctx->need_rebuild());
 
 	col_set			drop_list;
 	col_set			v_drop_list;
 	col_set::const_iterator col_it;
 
 	/* Check if the column, part of an index to be dropped is part of any
-	other index which is not being dropped. If it so, then set the ord_part
+	other index which is not being dropped. If not, then set the ord_part
 	of the column to 0. */
 	get_col_list_to_be_dropped(ctx, drop_list, v_drop_list);
 
@@ -7925,9 +8020,9 @@ commit_cache_norebuild(
 
 	for (ulint i = 0; i < ctx->num_to_add_index; i++) {
 		dict_index_t*	index = ctx->add_index[i];
-		DBUG_ASSERT(dict_index_get_online_status(index)
-			    == ONLINE_INDEX_COMPLETE);
-		DBUG_ASSERT(!index->is_committed());
+		assert(dict_index_get_online_status(index)
+		       == ONLINE_INDEX_COMPLETE);
+		assert(!index->is_committed());
 		index->set_committed(true);
 	}
 
@@ -7943,9 +8038,9 @@ commit_cache_norebuild(
 
 		for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
 			dict_index_t*	index = ctx->drop_index[i];
-			DBUG_ASSERT(index->is_committed());
-			DBUG_ASSERT(index->table == ctx->new_table);
-			DBUG_ASSERT(index->to_be_dropped);
+			assert(index->is_committed());
+			assert(index->table == ctx->new_table);
+			assert(index->to_be_dropped);
 
 			/* Replace the indexes in foreign key
 			constraints if needed. */
@@ -7967,14 +8062,14 @@ commit_cache_norebuild(
 
 		for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
 			dict_index_t*	index = ctx->drop_index[i];
-			DBUG_ASSERT(index->is_committed());
-			DBUG_ASSERT(index->table == ctx->new_table);
+			assert(index->is_committed());
+			assert(index->table == ctx->new_table);
 
 			if (index->type & DICT_FTS) {
-				DBUG_ASSERT(index->type == DICT_FTS
-					    || (index->type
-						& DICT_CORRUPT));
-				DBUG_ASSERT(index->table->fts);
+				assert(index->type == DICT_FTS
+				       || (index->type
+					   & DICT_CORRUPT));
+				assert(index->table->fts);
 				fts_drop_index(index->table, index, trx);
 			}
 
@@ -7992,8 +8087,8 @@ commit_cache_norebuild(
 #ifdef UNIV_DEBUG
 	if (!(ctx->new_table->fts != NULL
 	   && ctx->new_table->fts->cache->sync->in_progress)) {
-		DBUG_ASSERT((ctx->new_table->fts == NULL)
-			== (ctx->new_table->fts_doc_id_index == NULL));
+		assert((ctx->new_table->fts == NULL)
+		       == (ctx->new_table->fts_doc_id_index == NULL));
 	}
 #endif
 	DBUG_RETURN(found);
@@ -8021,7 +8116,7 @@ alter_stats_norebuild(
 	ulint	i;
 
 	DBUG_ENTER("alter_stats_norebuild");
-	DBUG_ASSERT(!ctx->need_rebuild());
+	assert(!ctx->need_rebuild());
 
 	if (!dict_stats_is_persistent_enabled(ctx->new_table)) {
 		DBUG_VOID_RETURN;
@@ -8087,7 +8182,7 @@ alter_stats_norebuild(
 
 	for (i = 0; i < ctx->num_to_add_index; i++) {
 		dict_index_t*	index = ctx->add_index[i];
-		DBUG_ASSERT(index->table == ctx->new_table);
+		assert(index->table == ctx->new_table);
 
 		if (!(index->type & DICT_FTS)) {
 			dict_stats_init(ctx->new_table);
@@ -8120,9 +8215,9 @@ alter_stats_rebuild(
 		DBUG_VOID_RETURN;
 	}
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	bool	ibd_file_missing_orig = false;
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 	DBUG_EXECUTE_IF(
 		"ib_rename_index_fail2",
@@ -8150,7 +8245,7 @@ alter_stats_rebuild(
 	DBUG_VOID_RETURN;
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 # define DBUG_INJECT_CRASH(prefix, count)			\
 do {								\
 	char buf[32];						\
@@ -8190,16 +8285,16 @@ ha_innobase::commit_inplace_alter_table(
 	ctx0 = static_cast<ha_innobase_inplace_ctx*>
 		(ha_alter_info->handler_ctx);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	uint	crash_inject_count	= 1;
 	uint	crash_fail_inject_count	= 1;
 	uint	failure_inject_count	= 1;
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 	DBUG_ENTER("commit_inplace_alter_table");
-	DBUG_ASSERT(!srv_read_only_mode);
-	DBUG_ASSERT(!ctx0 || ctx0->prebuilt == m_prebuilt);
-	DBUG_ASSERT(!ctx0 || ctx0->old_table == m_prebuilt->table);
+	assert(!srv_read_only_mode);
+	assert(!ctx0 || ctx0->prebuilt == m_prebuilt);
+	assert(!ctx0 || ctx0->old_table == m_prebuilt->table);
 
 	DEBUG_SYNC_C("innodb_commit_inplace_alter_table_enter");
 
@@ -8220,13 +8315,13 @@ ha_innobase::commit_inplace_alter_table(
 	}
 
 	if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
-		DBUG_ASSERT(!ctx0);
+		assert(!ctx0);
 		MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
 		ha_alter_info->group_commit_ctx = NULL;
 		DBUG_RETURN(false);
 	}
 
-	DBUG_ASSERT(ctx0);
+	assert(ctx0);
 
 	inplace_alter_handler_ctx**	ctx_array;
 	inplace_alter_handler_ctx*	ctx_single[2];
@@ -8239,7 +8334,7 @@ ha_innobase::commit_inplace_alter_table(
 		ctx_array = ctx_single;
 	}
 
-	DBUG_ASSERT(ctx0 == ctx_array[0]);
+	assert(ctx0 == ctx_array[0]);
 	ut_ad(m_prebuilt->table == ctx0->old_table);
 	ha_alter_info->group_commit_ctx = NULL;
 
@@ -8263,7 +8358,7 @@ ha_innobase::commit_inplace_alter_table(
 	for (inplace_alter_handler_ctx** pctx = ctx_array; *pctx; pctx++) {
 		ha_innobase_inplace_ctx*	ctx
 			= static_cast<ha_innobase_inplace_ctx*>(*pctx);
-		DBUG_ASSERT(ctx->prebuilt->trx == m_prebuilt->trx);
+		assert(ctx->prebuilt->trx == m_prebuilt->trx);
 
 		/* Exclusively lock the table, to ensure that no other
 		transaction is holding locks on the table while we
@@ -8289,29 +8384,29 @@ ha_innobase::commit_inplace_alter_table(
 	trx_t*		trx		= ctx0->trx;
 	bool		fail		= false;
 
-	if (new_clustered) {
-		for (inplace_alter_handler_ctx** pctx = ctx_array;
-		     *pctx; pctx++) {
-			ha_innobase_inplace_ctx*	ctx
-				= static_cast<ha_innobase_inplace_ctx*>(*pctx);
-			DBUG_ASSERT(ctx->need_rebuild());
+	/* Stop background FTS operations. */
+	for (inplace_alter_handler_ctx** pctx = ctx_array;
+			 *pctx; pctx++) {
+		ha_innobase_inplace_ctx*	ctx
+			= static_cast<ha_innobase_inplace_ctx*>(*pctx);
+
+		assert(new_clustered == ctx->need_rebuild());
 
+		if (new_clustered) {
 			if (ctx->old_table->fts) {
 				ut_ad(!ctx->old_table->fts->add_wq);
-				fts_optimize_remove_table(
-					ctx->old_table);
+				fts_optimize_remove_table(ctx->old_table);
 			}
+		}
 
-			if (ctx->new_table->fts) {
-				ut_ad(!ctx->new_table->fts->add_wq);
-				fts_optimize_remove_table(
-					ctx->new_table);
-			}
+		if (ctx->new_table->fts) {
+			ut_ad(!ctx->new_table->fts->add_wq);
+			fts_optimize_remove_table(ctx->new_table);
 		}
 	}
 
 	if (!trx) {
-		DBUG_ASSERT(!new_clustered);
+		assert(!new_clustered);
 		trx = innobase_trx_allocate(m_user_thd);
 	}
 
@@ -8332,7 +8427,7 @@ ha_innobase::commit_inplace_alter_table(
 			ha_innobase_inplace_ctx*	ctx
 				= static_cast<ha_innobase_inplace_ctx*>(*pctx);
 
-			DBUG_ASSERT(new_clustered == ctx->need_rebuild());
+			assert(new_clustered == ctx->need_rebuild());
 
 			if (new_clustered
 			    && !dict_stats_stop_bg(ctx->old_table)) {
@@ -8359,11 +8454,15 @@ ha_innobase::commit_inplace_alter_table(
 		ha_innobase_inplace_ctx*	ctx
 			= static_cast<ha_innobase_inplace_ctx*>(*pctx);
 
-		DBUG_ASSERT(new_clustered == ctx->need_rebuild());
-
-		ctx->max_autoinc = commit_get_autoinc(
-			ha_alter_info, ctx, altered_table, table);
+		assert(new_clustered == ctx->need_rebuild());
 
+		if (commit_get_autoinc(ha_alter_info, ctx, altered_table,
+			table)) {
+			fail = true;
+			my_error(ER_TABLESPACE_DISCARDED, MYF(0),
+				 table->s->table_name.str);
+			goto rollback_trx;
+		}
 		if (ctx->need_rebuild()) {
 			ctx->tmp_name = dict_mem_create_temporary_tablename(
 				ctx->heap, ctx->new_table->name.m_name,
@@ -8379,7 +8478,7 @@ ha_innobase::commit_inplace_alter_table(
 		}
 		DBUG_INJECT_CRASH("ib_commit_inplace_crash",
 				  crash_inject_count++);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 		{
 			/* Generate a dynamic dbug text. */
 			char buf[32];
@@ -8396,7 +8495,7 @@ ha_innobase::commit_inplace_alter_table(
 		}
 #endif
 	}
-
+rollback_trx:
 	/* Commit or roll back the changes to the data dictionary. */
 
 	if (fail) {
@@ -8412,7 +8511,7 @@ ha_innobase::commit_inplace_alter_table(
 			ha_innobase_inplace_ctx*	ctx
 				= static_cast<ha_innobase_inplace_ctx*>(*pctx);
 
-			DBUG_ASSERT(ctx->need_rebuild());
+			assert(ctx->need_rebuild());
 			/* Check for any possible problems for any
 			file operations that will be performed in
 			commit_cache_rebuild(), and if none, generate
@@ -8502,7 +8601,7 @@ ha_innobase::commit_inplace_alter_table(
 		ha_innobase_inplace_ctx*	ctx
 			= static_cast<ha_innobase_inplace_ctx*>(*pctx);
 
-		DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
+		assert(ctx->need_rebuild() == new_clustered);
 
 		if (new_clustered) {
 			innobase_online_rebuild_log_free(ctx->old_table);
@@ -8532,48 +8631,44 @@ ha_innobase::commit_inplace_alter_table(
 			continue;
 		}
 
-	/* Make a concurrent Drop fts Index to wait until sync of that
-	fts index is happening in the background */
-	for (;;) {
-                bool    retry = false;
-
-                for (inplace_alter_handler_ctx** pctx = ctx_array;
-                     *pctx; pctx++) {
-			int count =0;
-                        ha_innobase_inplace_ctx*        ctx
-                                = static_cast<ha_innobase_inplace_ctx*>(*pctx);
-
-                        DBUG_ASSERT(new_clustered == ctx->need_rebuild());
-			if (dict_fts_index_syncing(ctx->old_table)) {
-				count++;
-				if (count == 100) {
-					ib::info() <<
-					 "Drop index waiting for background sync"
-					 "to finish\n";
+		/* Make a concurrent Drop fts Index to wait until sync of that
+		fts index is happening in the background */
+		for (int retry_count = 0;;) {
+			bool	retry = false;
+
+			for (inplace_alter_handler_ctx** pctx = ctx_array; *pctx; pctx++) {
+				ha_innobase_inplace_ctx* ctx
+					= static_cast<ha_innobase_inplace_ctx*>(*pctx);
+
+				assert(new_clustered == ctx->need_rebuild());
+
+				if (dict_fts_index_syncing(ctx->old_table)) {
+					retry = true;
+					break;
+				}
+
+				if (new_clustered && dict_fts_index_syncing(ctx->new_table)) {
+					retry = true;
+					break;
 				}
-				retry = true;
 			}
 
-			if (new_clustered && dict_fts_index_syncing(ctx->new_table)) {
-				count++;
-				if (count == 100) {
-                                        ib::info() <<
-                                         "Drop index waiting for background sync"
-                                         "to finish\n";
-                                }
+			if (!retry) {
+				break;
+			}
 
-                                retry = true;
-                        }
+			/* Print a message if waiting for a long time. */
+			if (retry_count < 100) {
+				retry_count++;
+			} else {
+				ib::info() <<
+					"Drop index waiting for background sync to finish\n";
+				retry_count = 0;
+			}
 
+			DICT_BG_YIELD(trx);
 		}
 
-                if (!retry) {
-                        break;
-                }
-
-                DICT_BG_YIELD(trx);
-        }
-
 		innobase_copy_frm_flags_from_table_share(
 			ctx->new_table, altered_table->s);
 
@@ -8662,7 +8757,7 @@ ha_innobase::commit_inplace_alter_table(
 			ha_innobase_inplace_ctx*	ctx
 				= static_cast<ha_innobase_inplace_ctx*>
 				(*pctx);
-			DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
+			assert(ctx->need_rebuild() == new_clustered);
 
 			ut_d(dict_table_check_for_dup_indexes(
 				     ctx->old_table,
@@ -8670,6 +8765,11 @@ ha_innobase::commit_inplace_alter_table(
 			ut_a(fts_check_cached_index(ctx->old_table));
 			DBUG_INJECT_CRASH("ib_commit_inplace_crash_fail",
 					  crash_fail_inject_count++);
+
+			/* Restart the FTS background operations. */
+			if (ctx->old_table->fts) {
+				fts_optimize_add_table(ctx->old_table);
+			}
 		}
 
 		row_mysql_unlock_data_dictionary(trx);
@@ -8737,7 +8837,7 @@ ha_innobase::commit_inplace_alter_table(
 		ha_innobase_inplace_ctx*	ctx
 			= static_cast<ha_innobase_inplace_ctx*>
 			(*pctx);
-		DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
+		assert(ctx->need_rebuild() == new_clustered);
 
 		if (altered_table->found_next_number_field) {
 			dict_table_t* t = ctx->new_table;
@@ -8747,8 +8847,6 @@ ha_innobase::commit_inplace_alter_table(
 			dict_table_autoinc_unlock(t);
 		}
 
-		bool	add_fts	= false;
-
 		/* Publish the created fulltext index, if any.
 		Note that a fulltext index can be created without
 		creating the clustered index, if there already exists
@@ -8758,19 +8856,19 @@ ha_innobase::commit_inplace_alter_table(
 			dict_index_t*	index = ctx->add_index[i];
 
 			if (index->type & DICT_FTS) {
-				DBUG_ASSERT(index->type == DICT_FTS);
+				assert(index->type == DICT_FTS);
 				/* We reset DICT_TF2_FTS here because the bit
 				is left unset when a drop proceeds the add. */
 				DICT_TF2_FLAG_SET(ctx->new_table, DICT_TF2_FTS);
 				fts_add_index(index, ctx->new_table);
-				add_fts = true;
 			}
 		}
 
 		ut_d(dict_table_check_for_dup_indexes(
 			     ctx->new_table, CHECK_ALL_COMPLETE));
 
-		if (add_fts) {
+		/* Start/Restart the FTS background operations. */
+		if (ctx->new_table->fts) {
 			fts_optimize_add_table(ctx->new_table);
 		}
 
@@ -8790,15 +8888,16 @@ ha_innobase::commit_inplace_alter_table(
 
 			char	errstr[1024];
 
-			DBUG_ASSERT(0 == strcmp(ctx->old_table->name.m_name,
-						ctx->tmp_name));
+			assert(0 == strcmp(ctx->old_table->name.m_name,
+					   ctx->tmp_name));
 
 			DBUG_EXECUTE_IF(
 				"ib_rename_index_fail3",
 				DBUG_SET("+d,innodb_report_deadlock");
 			);
 
-			if (dict_stats_drop_table(
+			if (dict_stats_is_persistent_enabled(ctx->new_table) &&
+				dict_stats_drop_table(
 				    ctx->new_table->name.m_name,
 				    errstr, sizeof(errstr))
 			    != DB_SUCCESS) {
@@ -8826,7 +8925,16 @@ ha_innobase::commit_inplace_alter_table(
 			bool update_own_prebuilt =
 				(m_prebuilt == ctx->prebuilt);
 			trx_t* const	user_trx = m_prebuilt->trx;
-
+			if (dict_table_is_partition(ctx->new_table)) {
+			/* Set blob_heap to NULL for partitioned
+			tables to avoid row_prebuilt_free() from
+			freeing them. We do this to avoid double free
+			of blob_heap since all partitions point to
+			the same blob_heap in prebuilt. Blob heaps of
+			all the partitions will be freed later in the
+			ha_innopart::clear_blob_heaps() */
+				ctx->prebuilt->blob_heap = NULL;
+			}
 			row_prebuilt_free(ctx->prebuilt, TRUE);
 
 			/* Drop the copy of the old table, which was
@@ -8865,7 +8973,7 @@ ha_innobase::commit_inplace_alter_table(
 			ha_innobase_inplace_ctx*	ctx
 				= static_cast<ha_innobase_inplace_ctx*>
 				(*pctx);
-			DBUG_ASSERT(ctx->need_rebuild());
+			assert(ctx->need_rebuild());
 
 			alter_stats_rebuild(
 				ctx->new_table, table->s->table_name.str,
@@ -8879,7 +8987,7 @@ ha_innobase::commit_inplace_alter_table(
 			ha_innobase_inplace_ctx*	ctx
 				= static_cast<ha_innobase_inplace_ctx*>
 				(*pctx);
-			DBUG_ASSERT(!ctx->need_rebuild());
+			assert(!ctx->need_rebuild());
 
 			alter_stats_norebuild(
 				ha_alter_info, ctx, altered_table,
@@ -8899,19 +9007,19 @@ ha_innobase::commit_inplace_alter_table(
 	/* TODO: Also perform DROP TABLE and DROP INDEX after
 	the MDL downgrade. */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	dict_index_t* clust_index = dict_table_get_first_index(
 		ctx0->prebuilt->table);
-	DBUG_ASSERT(!clust_index->online_log);
-	DBUG_ASSERT(dict_index_get_online_status(clust_index)
-		    == ONLINE_INDEX_COMPLETE);
+	assert(!clust_index->online_log);
+	assert(dict_index_get_online_status(clust_index)
+	       == ONLINE_INDEX_COMPLETE);
 
 	for (dict_index_t* index = clust_index;
 	     index;
 	     index = dict_table_get_next_index(index)) {
-		DBUG_ASSERT(!index->to_be_dropped);
+		assert(!index->to_be_dropped);
 	}
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 	MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
 	DBUG_RETURN(false);
 }
@@ -8967,7 +9075,7 @@ ha_innopart::check_if_supported_inplace_alter(
 	Alter_inplace_info*	ha_alter_info)
 {
 	DBUG_ENTER("ha_innopart::check_if_supported_inplace_alter");
-	DBUG_ASSERT(ha_alter_info->handler_ctx == NULL);
+	assert(ha_alter_info->handler_ctx == NULL);
 
 	/* Not supporting these for partitioned tables yet! */
 
@@ -8989,11 +9097,11 @@ ha_innopart::check_if_supported_inplace_alter(
 				&ha_alter_info->key_info_buffer[
 					ha_alter_info->index_add_buffer[i]];
 			if (key->flags & HA_FULLTEXT) {
-				DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
-					      & ~(HA_FULLTEXT
-						  | HA_PACK_KEY
-						  | HA_GENERATED_KEY
-						  | HA_BINARY_PACK_KEY)));
+				assert(!(key->flags & HA_KEYFLAG_MASK
+					 & ~(HA_FULLTEXT
+					     | HA_PACK_KEY
+					     | HA_GENERATED_KEY
+					     | HA_BINARY_PACK_KEY)));
 				ha_alter_info->unsupported_reason =
 					innobase_get_err_msg(
 					ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING);
@@ -9061,10 +9169,16 @@ ha_innopart::prepare_inplace_alter_table(
 	ha_innopart_inplace_ctx* ctx_parts;
 	bool res = true;
 	DBUG_ENTER("ha_innopart::prepare_inplace_alter_table");
-	DBUG_ASSERT(ha_alter_info->handler_ctx == NULL);
+	assert(ha_alter_info->handler_ctx == NULL);
 
 	thd = ha_thd();
 
+	if (ha_alter_info->create_info->used_fields & HA_CREATE_USED_TABLESPACE
+	    && tablespace_is_shared_space(ha_alter_info->create_info)) {
+		push_deprecated_warn_no_replacement(
+			ha_thd(), PARTITION_IN_SHARED_TABLESPACE_WARNING);
+	}
+
 	/* Clean up all ins/upd nodes. */
 	clear_ins_upd_nodes();
 	/* Based on Sql_alloc class, return NULL for new on failure. */
@@ -9173,6 +9287,12 @@ ha_innopart::inplace_alter_table(
 		m_prebuilt = ctx_parts->prebuilt_array[i];
 		ha_alter_info->handler_ctx = ctx_parts->ctx_array[i];
 		set_partition(i);
+
+		if (i != 0 && ha_alter_info->handler_ctx != NULL) {
+			ha_alter_info->handler_ctx->set_shared_data(
+				                  ctx_parts->ctx_array[i - 1]);
+                }
+
 		res = ha_innobase::inplace_alter_table(altered_table,
 						ha_alter_info);
 		ut_ad(ctx_parts->ctx_array[i] == ha_alter_info->handler_ctx);
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 8f8a7223b545..0da366fdd7a3 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1459,7 +1467,7 @@ i_s_cmp_fill_low(
 		table->field[5]->store(zip_stat->decompressed_usec / 1000000, true);
 
 		if (reset) {
-			memset(zip_stat, 0, sizeof *zip_stat);
+			new (zip_stat) page_zip_stat_t;
 		}
 
 		if (schema_table_store_record(thd, table)) {
@@ -2610,7 +2618,7 @@ i_s_metrics_fill(
 			time_diff = 0;
 		}
 
-		/* Unless MONITOR__NO_AVERAGE is marked, we will need
+		/* Unless MONITOR_NO_AVERAGE is marked, we will need
 		to calculate the average value. If this is a monitor set
 		owner marked by MONITOR_SET_OWNER, divide
 		the value by another counter (number of calls) designated
@@ -2641,6 +2649,7 @@ i_s_metrics_fill(
 					/ MONITOR_VALUE(
 					monitor_info->monitor_related_id),
 					FALSE));
+				fields[METRIC_AVG_VALUE_RESET]->set_notnull();
 			} else {
 				fields[METRIC_AVG_VALUE_RESET]->set_null();
 			}
@@ -2998,7 +3007,17 @@ i_s_fts_deleted_generic_fill(
 		DBUG_RETURN(0);
 	}
 
+	mysql_mutex_lock(&LOCK_global_system_variables);
+
 	if (!fts_internal_tbl_name) {
+		mysql_mutex_unlock(&LOCK_global_system_variables);
+		DBUG_RETURN(0);
+	}
+
+	std::string fts_table_name(fts_internal_tbl_name);
+	mysql_mutex_unlock(&LOCK_global_system_variables);
+
+	if(!fts_table_name.c_str()) {
 		DBUG_RETURN(0);
 	}
 
@@ -3006,7 +3025,8 @@ i_s_fts_deleted_generic_fill(
 	rw_lock_s_lock(dict_operation_lock);
 
 	user_table = dict_table_open_on_name(
-		fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);
+				fts_table_name.c_str(),
+				FALSE, FALSE, DICT_ERR_IGNORE_NONE);
 
 	if (!user_table) {
 		rw_lock_s_unlock(dict_operation_lock);
@@ -3421,12 +3441,22 @@ i_s_fts_index_cache_fill(
 		DBUG_RETURN(0);
 	}
 
-	if (!fts_internal_tbl_name) {
-		DBUG_RETURN(0);
-	}
+        mysql_mutex_lock(&LOCK_global_system_variables);
+
+        if (!fts_internal_tbl_name) {
+                mysql_mutex_unlock(&LOCK_global_system_variables);
+                DBUG_RETURN(0);
+        }
+
+	std::string fts_table_name(fts_internal_tbl_name);
+	mysql_mutex_unlock(&LOCK_global_system_variables);
+
+        if(!fts_table_name.c_str()) {
+                DBUG_RETURN(0);
+        }
 
 	user_table = dict_table_open_on_name(
-		fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);
+		fts_table_name.c_str(), FALSE, FALSE, DICT_ERR_IGNORE_NONE);
 
 	if (!user_table) {
 		DBUG_RETURN(0);
@@ -3442,6 +3472,12 @@ i_s_fts_index_cache_fill(
 
 	ut_a(cache);
 
+	/* Check if cache is being synced.
+	Note: we wait till cache is being synced. */
+	while (cache->sync->in_progress) {
+		os_event_wait(cache->sync->event);
+	}
+
 	for (ulint i = 0; i < ib_vector_size(cache->indexes); i++) {
 		fts_index_cache_t*      index_cache;
 
@@ -3784,7 +3820,7 @@ i_s_fts_index_table_fill_one_index(
 	int			ret = 0;
 
 	DBUG_ENTER("i_s_fts_index_table_fill_one_index");
-	DBUG_ASSERT(!dict_index_is_online_ddl(index));
+	assert(!dict_index_is_online_ddl(index));
 
 	heap = mem_heap_create(1024);
 
@@ -3869,15 +3905,25 @@ i_s_fts_index_table_fill(
 		DBUG_RETURN(0);
 	}
 
-	if (!fts_internal_tbl_name) {
-		DBUG_RETURN(0);
-	}
+        mysql_mutex_lock(&LOCK_global_system_variables);
+
+        if (!fts_internal_tbl_name) {
+                mysql_mutex_unlock(&LOCK_global_system_variables);
+                DBUG_RETURN(0);
+        }
+
+	std::string fts_table_name(fts_internal_tbl_name);
+	mysql_mutex_unlock(&LOCK_global_system_variables);
+
+        if(!fts_table_name.c_str()) {
+                DBUG_RETURN(0);
+        }
 
 	/* Prevent DDL to drop fts aux tables. */
 	rw_lock_s_lock(dict_operation_lock);
 
 	user_table = dict_table_open_on_name(
-		fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);
+		fts_table_name.c_str(), FALSE, FALSE, DICT_ERR_IGNORE_NONE);
 
 	if (!user_table) {
 		rw_lock_s_unlock(dict_operation_lock);
@@ -4029,9 +4075,19 @@ i_s_fts_config_fill(
 		DBUG_RETURN(0);
 	}
 
-	if (!fts_internal_tbl_name) {
-		DBUG_RETURN(0);
-	}
+        mysql_mutex_lock(&LOCK_global_system_variables);
+
+        if (!fts_internal_tbl_name) {
+                mysql_mutex_unlock(&LOCK_global_system_variables);
+                DBUG_RETURN(0);
+        }
+
+	std::string fts_table_name(fts_internal_tbl_name);
+	mysql_mutex_unlock(&LOCK_global_system_variables);
+
+        if(!fts_table_name.c_str()) {
+                DBUG_RETURN(0);
+        }
 
 	DEBUG_SYNC_C("i_s_fts_config_fille_check");
 
@@ -4041,7 +4097,7 @@ i_s_fts_config_fill(
 	rw_lock_s_lock(dict_operation_lock);
 
 	user_table = dict_table_open_on_name(
-		fts_internal_tbl_name, FALSE, FALSE, DICT_ERR_IGNORE_NONE);
+		fts_table_name.c_str(), FALSE, FALSE, DICT_ERR_IGNORE_NONE);
 
 	if (!user_table) {
 		rw_lock_s_unlock(dict_operation_lock);
@@ -4063,7 +4119,7 @@ i_s_fts_config_fill(
 	if (!ib_vector_is_empty(user_table->fts->indexes)) {
 		index = (dict_index_t*) ib_vector_getp_const(
 				user_table->fts->indexes, 0);
-		DBUG_ASSERT(!dict_index_is_online_ddl(index));
+		assert(!dict_index_is_online_ddl(index));
 	}
 
 	while (fts_config_key[i]) {
diff --git a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
index 4b95ae19ff3f..413e02ec5013 100644
--- a/storage/innobase/handler/i_s.h
+++ b/storage/innobase/handler/i_s.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc
index 07c698e4f4ce..f56ec9ac7fab 100644
--- a/storage/innobase/ibuf/ibuf0ibuf.cc
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -2704,7 +2712,7 @@ ibuf_merge_in_background(
 		mutex_enter(&ibuf_mutex);
 
 		/* If the ibuf->size is more than half the max_size
-		then we make more agreesive contraction.
+		then we make more aggressive contraction.
 		+1 is to avoid division by zero. */
 		if (ibuf->size > ibuf->max_size / 2) {
 			ulint diff = ibuf->size - ibuf->max_size / 2;
@@ -4250,10 +4258,11 @@ ibuf_restore_pos(
 		return(TRUE);
 	}
 
-	if (fil_space_get_flags(space) == ULINT_UNDEFINED) {
-		/* The tablespace has been dropped.  It is possible
-		that another thread has deleted the insert buffer
-		entry.  Do not complain. */
+	if (fil_space_get_flags(space) == ULINT_UNDEFINED ||
+		fil_space_is_being_truncated(space)) {
+		/* The tablespace has been dropped. Or the tablespace is being
+		truncated. It is possible that another thread has deleted
+		the insert buffer entry.  Do not complain. */
 		ibuf_btr_pcur_commit_specify_mtr(pcur, mtr);
 	} else {
 		ib::error() << "ibuf cursor restoration fails!."
diff --git a/storage/innobase/include/api0api.h b/storage/innobase/include/api0api.h
index ec02febee742..3c00aae6b3bf 100644
--- a/storage/innobase/include/api0api.h
+++ b/storage/innobase/include/api0api.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/api0misc.h b/storage/innobase/include/api0misc.h
index 84ac3d622a9e..6c2a6f0dda90 100644
--- a/storage/innobase/include/api0misc.h
+++ b/storage/innobase/include/api0misc.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2008, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
index 2ea9c64db032..03833b371894 100644
--- a/storage/innobase/include/btr0btr.h
+++ b/storage/innobase/include/btr0btr.h
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic
index db42fb12e8bd..88ee096bddc7 100644
--- a/storage/innobase/include/btr0btr.ic
+++ b/storage/innobase/include/btr0btr.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/btr0bulk.h b/storage/innobase/include/btr0bulk.h
index a4d111afb9a2..a0a93a4c0e1d 100644
--- a/storage/innobase/include/btr0bulk.h
+++ b/storage/innobase/include/btr0bulk.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -192,6 +200,11 @@ class PageBulk
 		return(m_page_zip);
 	}
 
+#ifdef UNIV_DEBUG
+	/** Check if index is X locked */
+	bool isIndexXLocked();
+#endif // UNIV_DEBUG
+
 	/* Memory heap for internal allocation */
 	mem_heap_t*	m_heap;
 
@@ -277,6 +290,7 @@ class BtrBulk
 		ut_ad(m_flush_observer != NULL);
 #ifdef UNIV_DEBUG
 		fil_space_inc_redo_skipped_count(m_index->space);
+		m_index_online = m_index->online_status;
 #endif /* UNIV_DEBUG */
 	}
 
@@ -316,10 +330,10 @@ class BtrBulk
 	@return error code  */
 	dberr_t finish(dberr_t	err);
 
-	/** Release all latches */
+	/** Release latch on the rightmost leaf page in the index tree */
 	void release();
 
-	/** Re-latch all latches */
+	/** Re-latch latch on the rightmost leaf page in the index tree */
 	void latch();
 
 private:
@@ -378,6 +392,13 @@ class BtrBulk
 
 	/** Page cursor vector for all level */
 	page_bulk_vector*	m_page_bulks;
+
+#ifdef UNIV_DEBUG
+	/** State of the index. Used for asserting at the end of a
+	bulk load operation to ensure that the online status of the
+	index does not change */
+	unsigned		m_index_online;
+#endif // UNIV_DEBUG
 };
 
 #endif
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h
index 8e706d5f15b8..4cc911aa5dc2 100644
--- a/storage/innobase/include/btr0cur.h
+++ b/storage/innobase/include/btr0cur.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -65,9 +73,6 @@ struct btr_latch_leaves_t {
 #include "row0types.h"
 #include "ha0ha.h"
 
-#define BTR_CUR_ADAPT
-#define BTR_CUR_HASH_ADAPT
-
 #ifdef UNIV_DEBUG
 /*********************************************************//**
 Returns the page cursor component of a tree cursor.
@@ -798,18 +803,6 @@ btr_rec_copy_externally_stored_field(
 	ulint*			len,
 	mem_heap_t*		heap);
 
-/*******************************************************************//**
-Flags the data tuple fields that are marked as extern storage in the
-update vector.  We use this function to remember which fields we must
-mark as extern storage in a record inserted for an update.
-@return number of flagged external columns */
-ulint
-btr_push_update_extern_fields(
-/*==========================*/
-	dtuple_t*	tuple,	/*!< in/out: data tuple */
-	const upd_t*	update,	/*!< in: update vector */
-	mem_heap_t*	heap);	/*!< in: memory heap */
-
 /***********************************************************//**
 Sets a secondary index record's delete mark to the given value. This
 function is only used by the insert buffer merge mechanism. */
@@ -907,6 +900,8 @@ enum btr_cur_method {
 /** The tree cursor: the definition appears here only for the compiler
 to know struct size! */
 struct btr_cur_t {
+	btr_cur_t() { memset(this, 0, sizeof(*this)); }
+
 	dict_index_t*	index;		/*!< index where positioned */
 	page_cur_t	page_cur;	/*!< page cursor */
 	purge_node_t*	purge_node;	/*!< purge node, for BTR_DELETE */
@@ -972,7 +967,6 @@ struct btr_cur_t {
 					information of the path through
 					the tree */
 	rtr_info_t*	rtr_info;	/*!< rtree search info */
-	btr_cur_t():thr(NULL), rtr_info(NULL) {}
 					/* default values */
 };
 
diff --git a/storage/innobase/include/btr0cur.ic b/storage/innobase/include/btr0cur.ic
index 45c0d59a8aad..9266d6946637 100644
--- a/storage/innobase/include/btr0cur.ic
+++ b/storage/innobase/include/btr0cur.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h
index 956b7646bd92..4fb651844dc3 100644
--- a/storage/innobase/include/btr0pcur.h
+++ b/storage/innobase/include/btr0pcur.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -33,6 +41,7 @@ Created 2/23/1996 Heikki Tuuri
 #include "page0cur.h"
 #include "btr0cur.h"
 #include "btr0btr.h"
+#include "buf0block_hint.h"
 #include "btr0types.h"
 #include "gis0rtree.h"
 
@@ -493,10 +502,18 @@ enum pcur_pos_t {
 	BTR_PCUR_IS_POSITIONED
 };
 
+/* Import tablespace context for persistent B-tree cursor. */
+struct import_ctx_t{
+	/* true if cursor fails to move to the next page during import. */
+	bool	is_error;
+};
+
 /* The persistent B-tree cursor structure. This is used mainly for SQL
 selects, updates, and deletes. */
 
 struct btr_pcur_t{
+	btr_pcur_t() { memset(this, 0, sizeof(*this)); }
+
 	/** a B-tree cursor */
 	btr_cur_t	btr_cur;
 	/** see TODO note below!
@@ -518,13 +535,11 @@ struct btr_pcur_t{
 	whether cursor was on, before, or after the old_rec record */
 	enum btr_pcur_pos_t	rel_pos;
 	/** buffer block when the position was stored */
-	buf_block_t*	block_when_stored;
+	buf::Block_hint	block_when_stored;
 	/** the modify clock value of the buffer block when the cursor position
 	was stored */
 	ib_uint64_t	modify_clock;
-	/** the withdraw clock value of the buffer pool when the cursor
-	position was stored */
-	ulint		withdraw_clock;
+
 	/** btr_pcur_store_position() and btr_pcur_restore_position() state. */
 	enum pcur_pos_t	pos_state;
 	/** PAGE_CUR_G, ... */
@@ -541,6 +556,10 @@ struct btr_pcur_t{
 	/** old_rec_buf size if old_rec_buf is not NULL */
 	ulint		buf_size;
 
+	/* NOTE that the following field is initialized only during import
+	tablespace, otherwise undefined */
+	import_ctx_t*	import_ctx;
+
 	/** Return the index of this persistent cursor */
 	dict_index_t*	index() const { return(btr_cur.index); }
 };
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index 77e29a15d0c8..845f66ecdd2b 100644
--- a/storage/innobase/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -401,6 +409,7 @@ btr_pcur_init(
 	pcur->old_rec = NULL;
 
 	pcur->btr_cur.rtr_info = NULL;
+	pcur->import_ctx = NULL;
 }
 
 /** Free old_rec_buf.
diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index 126590379042..75e18f90ec28 100644
--- a/storage/innobase/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -272,8 +280,6 @@ struct btr_search_t{
 	the machine word, i.e., they cannot be turned into bit-fields. */
 	buf_block_t* root_guess;/*!< the root page frame when it was last time
 				fetched, or NULL */
-	ulint	withdraw_clock;	/*!< the withdraw clock value of the buffer
-				pool when root_guess was stored */
 	ulint	hash_analysis;	/*!< when this exceeds
 				BTR_SEARCH_HASH_ANALYSIS, the hash
 				analysis starts; this is reset if no
diff --git a/storage/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic
index 5f7c39ba500d..f0b0617affbd 100644
--- a/storage/innobase/include/btr0sea.ic
+++ b/storage/innobase/include/btr0sea.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h
index 19c21982011d..755bdee8ae82 100644
--- a/storage/innobase/include/btr0types.h
+++ b/storage/innobase/include/btr0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0block_hint.h b/storage/innobase/include/buf0block_hint.h
new file mode 100644
index 000000000000..6f32f47d0981
--- /dev/null
+++ b/storage/innobase/include/buf0block_hint.h
@@ -0,0 +1,82 @@
+/*****************************************************************************
+
+Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License, version 2.0, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+#ifndef buf0block_hint_h
+#define buf0block_hint_h
+#include "buf0buf.h"
+
+namespace buf {
+class Block_hint {
+ public:
+  Block_hint():m_block(NULL),m_page_id(0,0){}
+  /** Stores the pointer to the block, which is currently buffer-fixed.
+  @param[in]  block   a pointer to a buffer-fixed block to be stored */
+  void store(buf_block_t *block);
+
+  /** Clears currently stored pointer. */
+  void clear();
+
+  /** Executes given function with the block pointer which was previously stored
+  or with nullptr if the pointer is no longer valid, was cleared or not stored.
+  @param[in]  f   The function to be executed. It will be passed the pointer.
+                  If you wish to use the block pointer subsequently, you need to
+                  ensure you buffer-fix it before returning from f.
+  @return the return value of f
+  */
+  template <typename F>
+  bool run_with_hint(const F &f) {
+    buffer_fix_block_if_still_valid();
+    /* m_block could be changed during f() call, so we use local variable to
+    remember which block we need to unfix */
+    buf_block_t *buffer_fixed_block = m_block;
+    bool res = f(buffer_fixed_block);
+    buffer_unfix_block_if_needed(buffer_fixed_block);
+    return res;
+  }
+
+  Block_hint &operator=(const Block_hint&other){
+    m_block=other.m_block;
+    m_page_id.copy_from(other.m_page_id);
+    return *this;
+  }
+
+ private:
+  /** The block pointer stored by store(). */
+  buf_block_t *m_block;
+  /** If m_block is non-null, the m_block->page.id at time it was stored. */
+  page_id_t m_page_id;
+
+  /** A helper function which checks if m_block is not a dangling pointer and
+  still points to block with page with m_page_id and if so, buffer-fixes it,
+  otherwise clear()s it */
+  void buffer_fix_block_if_still_valid();
+
+  /** A helper function which decrements block->buf_fix_count if it's non-null
+  @param[in]  block   A pointer to a block or nullptr */
+  static void buffer_unfix_block_if_needed(buf_block_t *block);
+};
+
+}  // namespace buf
+#endif /* buf0hint_h*/
diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h
index 3c9edc069160..3d7b40a79399 100644
--- a/storage/innobase/include/buf0buddy.h
+++ b/storage/innobase/include/buf0buddy.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic
index e4aea4b905bb..97573e860dfe 100644
--- a/storage/innobase/include/buf0buddy.ic
+++ b/storage/innobase/include/buf0buddy.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 0df5cd04c039..5b86ef80bb52 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -91,13 +99,6 @@ struct fil_addr_t;
 extern	buf_pool_t*	buf_pool_ptr;	/*!< The buffer pools
 					of the database */
 
-extern	volatile bool	buf_pool_withdrawing; /*!< true when withdrawing buffer
-					pool pages might cause page relocation */
-
-extern	volatile ulint	buf_withdraw_clock; /*!< the clock is incremented
-					every time a pointer to a page may
-					become obsolete */
-
 #ifdef UNIV_DEBUG
 extern my_bool	buf_disable_resize_buffer_pool_debug; /*!< if TRUE, resizing
 					buffer pool is not allowed. */
@@ -1186,7 +1187,7 @@ buf_page_set_old(
 	ibool		old);	/*!< in: old */
 /*********************************************************************//**
 Determine the time of first access of a block in the buffer pool.
-@return ut_time_ms() at the time of first access, 0 if not accessed */
+@return ut_time_monotonic_ms() at the time of first access, 0 if not accessed */
 UNIV_INLINE
 unsigned
 buf_page_is_accessed(
@@ -1240,25 +1241,18 @@ This function does not return if the block is not identified.
 buf_block_t*
 buf_block_from_ahi(const byte* ptr);
 
+
 /********************************************************************//**
 Find out if a pointer belongs to a buf_block_t. It can be a pointer to
-the buf_block_t itself or a member of it
+the buf_block_t itself or a member of it. This functions checks one of
+the buffer pool instances.
 @return TRUE if ptr belongs to a buf_block_t struct */
 ibool
-buf_pointer_is_block_field(
-/*=======================*/
-	const void*		ptr);	/*!< in: pointer not
-					dereferenced */
-/** Find out if a pointer corresponds to a buf_block_t::mutex.
-@param m in: mutex candidate
-@return TRUE if m is a buf_block_t::mutex */
-#define buf_pool_is_block_mutex(m)			\
-	buf_pointer_is_block_field((const void*)(m))
-/** Find out if a pointer corresponds to a buf_block_t::lock.
-@param l in: rw-lock candidate
-@return TRUE if l is a buf_block_t::lock */
-#define buf_pool_is_block_lock(l)			\
-	buf_pointer_is_block_field((const void*)(l))
+buf_pointer_is_block_field_instance(
+/*================================*/
+       const buf_pool_t*  buf_pool,   /*!< in: buffer pool instance */
+       const void*        ptr);       /*!< in: pointer not dereferenced */
+
 
 /** Inits a page for read to the buffer buf_pool. If the page is
 (1) already in buf_pool, or
@@ -1493,14 +1487,6 @@ buf_get_nth_chunk_block(
 	ulint		n,		/*!< in: nth chunk in the buffer pool */
 	ulint*		chunk_size);	/*!< in: chunk size */
 
-/** Verify the possibility that a stored page is not in buffer pool.
-@param[in]	withdraw_clock	withdraw clock when stored the page
-@retval true	if the page might be relocated */
-UNIV_INLINE
-bool
-buf_pool_is_obsolete(
-	ulint	withdraw_clock);
-
 /** Calculate aligned buffer pool size based on srv_buf_pool_chunk_unit,
 if needed.
 @param[in]	size	size in bytes
@@ -1915,6 +1901,13 @@ class HazardPointer {
 	@param bpage	buffer block to be compared */
 	virtual void adjust(const buf_page_t*) = 0;
 
+	/** Adjust the value of hp for moving. This happens
+	when some other thread working on the same list
+	attempts to relocate the hp of the page.
+	@param bpage	buffer block to be compared
+	@param dpage	buffer block to be moved to */
+	void move(const buf_page_t *bpage, buf_page_t *dpage);
+
 protected:
 	/** Disable copying */
 	HazardPointer(const HazardPointer&);
@@ -2108,8 +2101,6 @@ struct buf_pool_t{
 					page_hash mutex. Lookups can happen
 					while holding the buf_pool->mutex or
 					the relevant page_hash mutex. */
-	hash_table_t*	page_hash_old;	/*!< old pointer to page_hash to be
-					freed after resizing buffer pool */
 	hash_table_t*	zip_hash;	/*!< hash table of buf_block_t blocks
 					whose frames are allocated to the
 					zip buddy system,
@@ -2118,7 +2109,7 @@ struct buf_pool_t{
 					operations */
 	ulint		n_pend_unzip;	/*!< number of pending decompressions */
 
-	time_t		last_printout_time;
+	ib_time_monotonic_t		last_printout_time;
 					/*!< when buf_print_io was last time
 					called */
 	buf_buddy_stat_t buddy_stat[BUF_BUDDY_SIZES_MAX + 1];
@@ -2145,6 +2136,8 @@ struct buf_pool_t{
 					used during scan of flush_list
 					while doing flush list batch.
 					Protected by flush_list_mutex */
+	FlushHp			oldest_hp;/*!< entry pointer to scan the oldest
+					page except for system temporary */
 	UT_LIST_BASE_NODE_T(buf_page_t) flush_list;
 					/*!< base node of the modified block
 					list */
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
index b9724ce12873..0896154b9327 100644
--- a/storage/innobase/include/buf0buf.ic
+++ b/storage/innobase/include/buf0buf.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -191,12 +199,12 @@ buf_page_peek_if_too_old(
 
 		/* It is possible that the below comparison returns an
 		unexpected result. 2^32 milliseconds pass in about 50 days,
-		so if the difference between ut_time_ms() and access_time
-		is e.g. 50 days + 15 ms, then the below will behave as if
-		it is 15 ms. This is known and fixing it would require to
+		so if the difference between ut_time_monotonic_ms() and
+		access_time is e.g. 50 days + 15 ms, then the below will behave
+		as if it is 15 ms. This is known and fixing it would require to
 		increase buf_page_t::access_time from 32 to 64 bits. */
 		if (access_time > 0
-		    && ((ib_uint32_t) (ut_time_ms() - access_time))
+		    && ((ib_uint32_t) (ut_time_monotonic_ms() - access_time))
 		    >= buf_LRU_old_threshold_ms) {
 			return(TRUE);
 		}
@@ -612,7 +620,8 @@ buf_page_set_old(
 
 /*********************************************************************//**
 Determine the time of first access of a block in the buffer pool.
-@return ut_time_ms() at the time of first access, 0 if not accessed */
+@return ut_time_monotonic_ms() at the time of first access, 0 if not accessed
+*/
 UNIV_INLINE
 unsigned
 buf_page_is_accessed(
@@ -642,7 +651,7 @@ buf_page_set_accessed(
 
 	if (bpage->access_time == 0) {
 		/* Make this the time of the first access. */
-		bpage->access_time = static_cast<uint>(ut_time_ms());
+		bpage->access_time = static_cast<uint>(ut_time_monotonic_ms());
 	}
 }
 
@@ -985,8 +994,6 @@ buf_block_buf_fix_dec(
 /*==================*/
 	buf_block_t*	block)	/*!< in/out: block to bufferunfix */
 {
-	buf_block_unfix(block);
-
 #ifdef UNIV_DEBUG
 	/* No debug latch is acquired if block belongs to system temporary.
 	Debug latch is not of much help if access to block is single
@@ -995,6 +1002,8 @@ buf_block_buf_fix_dec(
 		rw_lock_s_unlock(&block->debug_latch);
 	}
 #endif /* UNIV_DEBUG */
+
+	buf_block_unfix(block);
 }
 
 /** Returns the buffer pool instance given a page id.
@@ -1356,18 +1365,6 @@ buf_get_nth_chunk_block(
 	return(chunk->blocks);
 }
 
-/** Verify the possibility that a stored page is not in buffer pool.
-@param[in]	withdraw_clock	withdraw clock when stored the page
-@retval true	if the page might be relocated */
-UNIV_INLINE
-bool
-buf_pool_is_obsolete(
-	ulint	withdraw_clock)
-{
-	return(buf_pool_withdrawing
-	       || buf_withdraw_clock != withdraw_clock);
-}
-
 /** Calculate aligned buffer pool size based on srv_buf_pool_chunk_unit,
 if needed.
 @param[in]	size	size in bytes
diff --git a/storage/innobase/include/buf0checksum.h b/storage/innobase/include/buf0checksum.h
index 80fe6076998f..6dec4d1db6fb 100644
--- a/storage/innobase/include/buf0checksum.h
+++ b/storage/innobase/include/buf0checksum.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0dblwr.h b/storage/innobase/include/buf0dblwr.h
index c7663584c9c1..992536b1b941 100644
--- a/storage/innobase/include/buf0dblwr.h
+++ b/storage/innobase/include/buf0dblwr.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0dump.h b/storage/innobase/include/buf0dump.h
index 3dbddfa6bf58..0db6b9899025 100644
--- a/storage/innobase/include/buf0dump.h
+++ b/storage/innobase/include/buf0dump.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h
index 76bd62b7ed99..fbe726ed8531 100644
--- a/storage/innobase/include/buf0flu.h
+++ b/storage/innobase/include/buf0flu.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic
index ecb98e326195..4946e3fc789b 100644
--- a/storage/innobase/include/buf0flu.ic
+++ b/storage/innobase/include/buf0flu.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index 0cbd77878ec3..6375cd3d19ff 100644
--- a/storage/innobase/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -227,6 +235,12 @@ Validates the LRU list.
 ibool
 buf_LRU_validate(void);
 /*==================*/
+/**********************************************************************//**
+Validates the LRU list for one buffer pool instance. */
+void
+buf_LRU_validate_instance(
+/*======================*/
+	buf_pool_t*	buf_pool);	/*!< in: buffer pool instance */
 #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
 #if defined UNIV_DEBUG_PRINT || defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
 /**********************************************************************//**
diff --git a/storage/innobase/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic
index 6e0da7a25886..c4157c596e62 100644
--- a/storage/innobase/include/buf0lru.ic
+++ b/storage/innobase/include/buf0lru.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
index 4dc20e64c28a..38cd9f7e3f0e 100644
--- a/storage/innobase/include/buf0rea.h
+++ b/storage/innobase/include/buf0rea.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
index 102b831ec61c..d7411fcaa9af 100644
--- a/storage/innobase/include/buf0types.h
+++ b/storage/innobase/include/buf0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/data0data.h b/storage/innobase/include/data0data.h
index 9988186a1014..7a2bba8f847b 100644
--- a/storage/innobase/include/data0data.h
+++ b/storage/innobase/include/data0data.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -610,11 +618,27 @@ struct dtuple_t {
 					/*!< data tuples can be linked into a
 					list using this field */
 #ifdef UNIV_DEBUG
+	mem_heap_t	*m_heap;	/*!< memory heap where this tuple is
+					allocated. */
 	ulint		magic_n;	/*!< magic number, used in
 					debug assertions */
 /** Value of dtuple_t::magic_n */
 # define		DATA_TUPLE_MAGIC_N	65478679
 #endif /* UNIV_DEBUG */
+
+
+	/** Get number of externally stored fields.
+	@retval number of externally stored fields. */
+	inline ulint get_n_ext() const
+	{
+		ulint n_ext = 0;
+		for (ulint i = 0; i < n_fields; ++i) {
+			if (dfield_is_ext(&fields[i])) {
+				n_ext++;
+			}
+		}
+		return (n_ext);
+	}
 };
 
 
diff --git a/storage/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic
index dc51735d340d..9b850f9fdc77 100644
--- a/storage/innobase/include/data0data.ic
+++ b/storage/innobase/include/data0data.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -580,6 +588,9 @@ dtuple_create_with_vcol(
 
 	tuple = dtuple_create_from_mem(buf, buf_size, n_fields, n_v_fields);
 
+#ifdef UNIV_DEBUG
+	tuple->m_heap = heap;
+#endif /* UNIV_DEBUG */
 	return(tuple);
 }
 
diff --git a/storage/innobase/include/data0type.h b/storage/innobase/include/data0type.h
index 00073dfca2c2..8566623413a8 100644
--- a/storage/innobase/include/data0type.h
+++ b/storage/innobase/include/data0type.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic
index 57770ec0e17f..156d2ad5bdd5 100644
--- a/storage/innobase/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -505,6 +513,7 @@ dtype_get_fixed_size_low(
 			return(0);
 		}
 #endif /* UNIV_DEBUG */
+	// Fall through.
 	case DATA_CHAR:
 	case DATA_FIXBINARY:
 	case DATA_INT:
@@ -585,6 +594,7 @@ dtype_get_min_size_low(
 			return(0);
 		}
 #endif /* UNIV_DEBUG */
+	// Fall through.
 	case DATA_CHAR:
 	case DATA_FIXBINARY:
 	case DATA_INT:
diff --git a/storage/innobase/include/data0types.h b/storage/innobase/include/data0types.h
index bd2bb5776119..0cb70207a874 100644
--- a/storage/innobase/include/data0types.h
+++ b/storage/innobase/include/data0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h
index ae5eae718c31..a4b27d8d219e 100644
--- a/storage/innobase/include/db0err.h
+++ b/storage/innobase/include/db0err.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -187,10 +195,12 @@ enum dberr_t {
 	DB_DATA_MISMATCH = 2000,	/*!< Column update or read failed
 					because the types mismatch */
 
-	DB_SCHEMA_NOT_LOCKED		/*!< If an API function expects the
+	DB_SCHEMA_NOT_LOCKED,		/*!< If an API function expects the
 					schema to be locked in exclusive mode
 					and if it's not then that API function
 					will return this error code */
+	DB_FTS_TOO_MANY_NESTED_EXP	/*< Too many nested sub expression
+					in full-text search string */
 
 };
 
diff --git a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h
index 5884ba4bcc23..5c89f2e0ee01 100644
--- a/storage/innobase/include/dict0boot.h
+++ b/storage/innobase/include/dict0boot.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic
index e40c3f844e3b..eed02565e2ba 100644
--- a/storage/innobase/include/dict0boot.ic
+++ b/storage/innobase/include/dict0boot.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index 0fd1c414e86f..be02e24aa9ac 100644
--- a/storage/innobase/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic
index 565e4ed1a8cf..2dd844026e31 100644
--- a/storage/innobase/include/dict0crea.ic
+++ b/storage/innobase/include/dict0crea.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -68,7 +76,7 @@ dict_create_add_foreign_id(
 			sprintf(id, "%s_ibfk_%lu", name,
 				(ulong) (*id_nr)++);
 		} else {
-			char	table_name[MAX_TABLE_NAME_LEN + 20] = "";
+			char	table_name[MAX_TABLE_NAME_LEN + 20 + 1] = "";
 			uint	errors = 0;
 
 			strncpy(table_name, name,
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index 1f947730f131..b691c4ed58e2 100644
--- a/storage/innobase/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -352,6 +360,23 @@ dict_table_autoinc_unlock(
 /*======================*/
 	dict_table_t*	table);	/*!< in/out: table */
 
+/** Acquire the analyze index lock.
+@param[in]	table table whose analyze_index latch to lock */
+void
+dict_table_analyze_index_lock(
+	dict_table_t*	table);
+
+/** Release the analyze index lock.
+@param[in]	table table whose analyze_index latch to unlock */
+void
+dict_table_analyze_index_unlock(
+	dict_table_t*	table);
+#ifdef UNIV_DEBUG
+/** Validate no active background threads to cause purge or rollback
+operations. */
+void
+dict_validate_no_purge_rollback_threads();
+#endif /* UNIV_DEBUG */
 #endif /* !UNIV_HOTBACKUP */
 /**********************************************************************//**
 Adds system columns to a table object. */
@@ -1137,6 +1162,12 @@ dict_index_add_to_cache(
 	ibool		strict)
 	MY_ATTRIBUTE((warn_unused_result));
 
+/** Clears the virtual column's index list before index is being freed.
+@param[in]  index   Index being freed */
+void
+dict_index_remove_from_v_col_list(
+	dict_index_t* index);
+
 /** Adds an index to the dictionary cache, with possible indexing newly
 added column.
 @param[in]	table	table on which the index is
@@ -2116,6 +2147,19 @@ void
 dict_allocate_mem_intrinsic_cache(
                 dict_index_t*           index);
 
+/** Check whether the table is a partitioned table.
+@param[in]      table   Table to check.
+@return true if the table is a partitioned table else false. */
+UNIV_INLINE
+bool
+dict_table_is_partition(
+        const dict_table_t*     table);
+
+/** @return true if all base column of virtual column is foreign key column
+@param[in]	vcol	in-memory virtul column
+@param[in]	foreign	in-memory Foreign key constraint */
+uint32_t dict_vcol_base_is_foreign_key(dict_v_col_t *vcol, dict_foreign_t *foreign);
+
 #endif /* !UNIV_HOTBACKUP */
 
 #ifndef UNIV_NONINL
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic
index 927aa84094ab..7163e552f931 100644
--- a/storage/innobase/include/dict0dict.ic
+++ b/storage/innobase/include/dict0dict.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1075,16 +1083,20 @@ dict_table_x_lock_indexes(
 	dict_table_t*	table)	/*!< in: table */
 {
 	dict_index_t*   index;
+	dict_index_t*   clustered_index;
 
 	ut_a(table);
 	ut_ad(mutex_own(&dict_sys->mutex));
+	ut_d(dict_validate_no_purge_rollback_threads());
 
 	/* Loop through each index of the table and lock them */
-	for (index = dict_table_get_first_index(table);
+	clustered_index = dict_table_get_first_index(table);
+	for (index = dict_table_get_next_index(clustered_index);
 	     index != NULL;
 	     index = dict_table_get_next_index(index)) {
 		rw_lock_x_lock(dict_index_get_lock(index));
 	}
+	rw_lock_x_lock(dict_index_get_lock(clustered_index));
 }
 /*********************************************************************//**
 Returns true if the particular FTS index in the table is still syncing
@@ -1800,7 +1812,23 @@ dict_table_get_index_on_first_col(
 {
 	ut_ad(col_index < table->n_cols);
 
-	dict_col_t* column = dict_table_get_nth_col(table, col_index);
+	ulint	non_v_col_index = col_index;
+	dict_col_t* column = NULL;
+
+	/** Decrement the col_index if the virtual column encountered
+	before the col_index of the table. */
+	for (ulint i = 0; i < table->n_v_cols; i++) {
+		column = reinterpret_cast<dict_col_t*>(
+				dict_table_get_nth_v_col(table, i));
+
+		if (column->ind >= col_index) {
+			break;
+		}
+
+		non_v_col_index--;
+	}
+
+	column = dict_table_get_nth_col(table, non_v_col_index);
 
 	for (dict_index_t* index = dict_table_get_first_index(table);
 		index != NULL; index = dict_table_get_next_index(index)) {
@@ -1982,4 +2010,18 @@ dict_allocate_mem_intrinsic_cache(
         new (index->last_sel_cur) last_ops_cur_t();
 }
 
+/** Check whether the table is a partitioned table.
+@param[in]	table	Table to check.
+@return true if the table is a partitioned table else false. */
+UNIV_INLINE
+bool
+dict_table_is_partition(
+	const dict_table_t*	table)
+{
+	/* Check both P and p on all platforms in case it was moved to/from
+	WIN. */
+	return(strstr(table->name.m_name, "#p#")
+	       || strstr(table->name.m_name, "#P#"));
+}
+
 #endif /* !UNIV_HOTBACKUP */
diff --git a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h
index 6d01c38c4321..1acbb54539e9 100644
--- a/storage/innobase/include/dict0load.h
+++ b/storage/innobase/include/dict0load.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0load.ic b/storage/innobase/include/dict0load.ic
index 2c0f1ff38a5c..c78727030599 100644
--- a/storage/innobase/include/dict0load.ic
+++ b/storage/innobase/include/dict0load.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 1578b572b05a..a62fca580507 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -688,6 +696,8 @@ be REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes */
 
 /** Data structure for a field in an index */
 struct dict_field_t{
+	dict_field_t() { memset(this, 0, sizeof(*this)); }
+
 	dict_col_t*	col;		/*!< pointer to the table column */
 	id_name_t	name;		/*!< name of the column */
 	unsigned	prefix_len:12;	/*!< 0 or the length of the column
@@ -1313,6 +1323,8 @@ if table->memcached_sync_count == DICT_TABLE_IN_DDL means there's DDL running on
 the table, DML from memcached will be blocked. */
 #define DICT_TABLE_IN_DDL -1
 
+typedef ib_mutex_t AnalyzeIndexMutex;
+
 /** Data structure for a database table.  Most fields will be
 initialized to 0, NULL or FALSE in dict_mem_table_create(). */
 struct dict_table_t {
@@ -1536,7 +1548,7 @@ struct dict_table_t {
 	unsigned				stat_initialized:1;
 
 	/** Timestamp of last recalc of the stats. */
-	ib_time_t				stats_last_recalc;
+	ib_time_monotonic_t				stats_last_recalc;
 
 	/** The two bits below are set in the 'stat_persistent' member. They
 	have the following meaning:
@@ -1583,10 +1595,10 @@ struct dict_table_t {
 	ib_uint64_t				stat_n_rows;
 
 	/** Approximate clustered index size in database pages. */
-	ulint					stat_clustered_index_size;
+	ib_uint64_t				stat_clustered_index_size;
 
 	/** Approximate size of other indexes in database pages. */
-	ulint					stat_sum_of_other_index_sizes;
+	ib_uint64_t				stat_sum_of_other_index_sizes;
 
 	/** How many rows are modified since last stats recalc. When a row is
 	inserted, updated, or deleted, we add 1 to this number; we calculate
@@ -1657,6 +1669,12 @@ struct dict_table_t {
 
 	/* @} */
 
+	/** Creation state of analyze_index member */
+	volatile os_once::state_t	analyze_index_mutex_created;
+
+	/** Mutex protecting the index during analyze. */
+	AnalyzeIndexMutex*			analyze_index_mutex;
+
 	/** Count of how many handles are opened to this table from memcached.
 	DDL on the table is NOT allowed until this count goes to zero. If
 	it is -1, then there's DDL on the table, DML from memcached will be
@@ -1742,6 +1760,31 @@ struct dict_foreign_add_to_referenced_table {
 	}
 };
 
+/** Request for lazy creation of the analyze index mutex of a given table.
+@param[in,out]	table	table whose mutex is to be created. */
+inline
+void
+dict_table_analyze_index_create_lazy(
+	dict_table_t*	table)
+{
+	table->analyze_index_mutex = NULL;
+	table->analyze_index_mutex_created = os_once::NEVER_DONE;
+}
+
+/** Destroy the analyze index mutex of the given table.
+@param[in,out]	table	table whose mutex to destroy */
+inline
+void
+dict_table_analyze_index_destroy(
+	dict_table_t*	table)
+{
+	if (table->analyze_index_mutex_created == os_once::DONE
+	    && table->analyze_index_mutex != NULL) {
+		mutex_free(table->analyze_index_mutex);
+		UT_DELETE(table->analyze_index_mutex);
+	}
+}
+
 /** Destroy the autoinc latch of the given table.
 This function is only called from either single threaded environment
 or from a thread that has not shared the table object with other threads.
diff --git a/storage/innobase/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic
index 393211dbf967..2815d2da724b 100644
--- a/storage/innobase/include/dict0mem.ic
+++ b/storage/innobase/include/dict0mem.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0priv.h b/storage/innobase/include/dict0priv.h
index 5bbe96ed0573..371e70ae8be2 100644
--- a/storage/innobase/include/dict0priv.h
+++ b/storage/innobase/include/dict0priv.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0priv.ic b/storage/innobase/include/dict0priv.ic
index 0229fe712961..fcc6c9f7c511 100644
--- a/storage/innobase/include/dict0priv.ic
+++ b/storage/innobase/include/dict0priv.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h
index 1090273aeedb..7ddae09c1d5b 100644
--- a/storage/innobase/include/dict0stats.h
+++ b/storage/innobase/include/dict0stats.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2009, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -31,6 +39,9 @@ Created Jan 06, 2010 Vasil Dimov
 #include "dict0types.h"
 #include "trx0types.h"
 
+#define TABLE_STATS_NAME        "mysql/innodb_table_stats"
+#define INDEX_STATS_NAME        "mysql/innodb_index_stats"
+
 enum dict_stats_upd_option_t {
 	DICT_STATS_RECALC_PERSISTENT,/* (re) calculate the
 				statistics using a precise and slow
diff --git a/storage/innobase/include/dict0stats.ic b/storage/innobase/include/dict0stats.ic
index 807090917342..bf602333b729 100644
--- a/storage/innobase/include/dict0stats.ic
+++ b/storage/innobase/include/dict0stats.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0stats_bg.h b/storage/innobase/include/dict0stats_bg.h
index 788d2804ea04..4fd4005badd1 100644
--- a/storage/innobase/include/dict0stats_bg.h
+++ b/storage/innobase/include/dict0stats_bg.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0stats_bg.ic b/storage/innobase/include/dict0stats_bg.ic
index 87e3225de589..9deb1bd1a9b0 100644
--- a/storage/innobase/include/dict0stats_bg.ic
+++ b/storage/innobase/include/dict0stats_bg.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h
index fa77bac86c4c..b35633584c7f 100644
--- a/storage/innobase/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dyn0buf.h b/storage/innobase/include/dyn0buf.h
index 3126c8e46837..ac6b9f0a08a9 100644
--- a/storage/innobase/include/dyn0buf.h
+++ b/storage/innobase/include/dyn0buf.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/dyn0types.h b/storage/innobase/include/dyn0types.h
index 058a22f46e11..a8da23506a6c 100644
--- a/storage/innobase/include/dyn0types.h
+++ b/storage/innobase/include/dyn0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h
index f0e5b4006b6d..8d0ce2801b8f 100644
--- a/storage/innobase/include/eval0eval.h
+++ b/storage/innobase/include/eval0eval.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic
index 2f759301c032..42a8d55acbbd 100644
--- a/storage/innobase/include/eval0eval.ic
+++ b/storage/innobase/include/eval0eval.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h
index 6705c2c7b64d..3d09975d17e5 100644
--- a/storage/innobase/include/eval0proc.h
+++ b/storage/innobase/include/eval0proc.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1998, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1998, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic
index cda3fd7b8747..698711df2dd9 100644
--- a/storage/innobase/include/eval0proc.ic
+++ b/storage/innobase/include/eval0proc.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1998, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1998, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index f21a2fb44bb9..6bd7980b2ff5 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -259,6 +267,11 @@ struct fil_node_t {
 	the possible last incomplete megabyte may be ignored
 	if space->id == 0 */
 	ulint		size;
+
+	/** Size of the file when last flushed, used to force the flush when file
+	grows to keep the filesystem metadata synced when using O_DIRECT_NO_FSYNC */
+	ulint		flush_size;
+
 	/** initial size of the file in database pages;
 	FIL_IBD_FILE_INITIAL_SIZE by default */
 	ulint		init_size;
diff --git a/storage/innobase/include/fsp0file.h b/storage/innobase/include/fsp0file.h
index 79611a3f1732..ad5d88ce571f 100644
--- a/storage/innobase/include/fsp0file.h
+++ b/storage/innobase/include/fsp0file.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index 301337f7615f..0fb1a9a1e99c 100644
--- a/storage/innobase/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fsp0fsp.ic b/storage/innobase/include/fsp0fsp.ic
index 8bb8470b7be8..a587fc6150d0 100644
--- a/storage/innobase/include/fsp0fsp.ic
+++ b/storage/innobase/include/fsp0fsp.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fsp0space.h b/storage/innobase/include/fsp0space.h
index 1c75d3426bee..e2360079f9cf 100644
--- a/storage/innobase/include/fsp0space.h
+++ b/storage/innobase/include/fsp0space.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fsp0sysspace.h b/storage/innobase/include/fsp0sysspace.h
index 66457eba1ea8..f9885bea8a92 100644
--- a/storage/innobase/include/fsp0sysspace.h
+++ b/storage/innobase/include/fsp0sysspace.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h
index 912459f0f36e..5323ad9f5f59 100644
--- a/storage/innobase/include/fsp0types.h
+++ b/storage/innobase/include/fsp0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0ast.h b/storage/innobase/include/fts0ast.h
index 87b7cf709c85..e876ef00c061 100644
--- a/storage/innobase/include/fts0ast.h
+++ b/storage/innobase/include/fts0ast.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -323,6 +331,7 @@ struct fts_ast_node_t {
 	fts_ast_node_t*	next_alloc;		/*!< For tracking allocations */
 	bool		visited;		/*!< whether this node is
 						already processed */
+	trx_t*		trx;
 	/* Used by plugin parser */
 	fts_ast_node_t* up_node;		/*!< Direct up node */
 	bool		go_up;			/*!< Flag if go one level up */
diff --git a/storage/innobase/include/fts0blex.h b/storage/innobase/include/fts0blex.h
index da93ab8617de..667c0350811b 100644
--- a/storage/innobase/include/fts0blex.h
+++ b/storage/innobase/include/fts0blex.h
@@ -1,3 +1,29 @@
+/*****************************************************************************
+
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License, version 2.0, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
 #ifndef fts0bHEADER_H
 #define fts0bHEADER_H 1
 #define fts0bIN_HEADER 1
diff --git a/storage/innobase/include/fts0fts.h b/storage/innobase/include/fts0fts.h
index c28a4a5c27f6..b53f0bcc72bd 100644
--- a/storage/innobase/include/fts0fts.h
+++ b/storage/innobase/include/fts0fts.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -126,6 +134,8 @@ should not exceed FTS_DOC_ID_MAX_STEP */
 #define FTS_INDEX_DOC_COUNT_LEN		4
 /* BLOB COLUMN, 0 means VARIABLE SIZE */
 #define FTS_INDEX_ILIST_LEN		0
+/* Maximum nested expression in fulltext binary search string */
+#define FTS_MAX_NESTED_EXP		31
 
 /** Variable specifying the FTS parallel sort degree */
 extern ulong		fts_sort_pll_degree;
@@ -731,6 +741,12 @@ fts_drop_index_tables(
 	dict_index_t*	index)			/*!< in: Index to drop */
 	MY_ATTRIBUTE((warn_unused_result));
 
+/** Add the table to add to the OPTIMIZER's list.
+@param[in]	table	table to add */
+void
+fts_optimize_add_table(
+	dict_table_t*	table);
+
 /******************************************************************//**
 Remove the table from the OPTIMIZER's list. We do wait for
 acknowledgement from the consumer of the message. */
diff --git a/storage/innobase/include/fts0opt.h b/storage/innobase/include/fts0opt.h
index a9185ad8df1a..348031224c6b 100644
--- a/storage/innobase/include/fts0opt.h
+++ b/storage/innobase/include/fts0opt.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2001, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2001, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0pars.h b/storage/innobase/include/fts0pars.h
index 8108e8115990..9b3ae9d7e82a 100644
--- a/storage/innobase/include/fts0pars.h
+++ b/storage/innobase/include/fts0pars.h
@@ -4,16 +4,22 @@
    
       Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
diff --git a/storage/innobase/include/fts0plugin.h b/storage/innobase/include/fts0plugin.h
index 9bc9b6b9dd79..aec2842bfad4 100644
--- a/storage/innobase/include/fts0plugin.h
+++ b/storage/innobase/include/fts0plugin.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0priv.h b/storage/innobase/include/fts0priv.h
index 1fd33c2b103d..974c7b6c7972 100644
--- a/storage/innobase/include/fts0priv.h
+++ b/storage/innobase/include/fts0priv.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -595,20 +603,6 @@ fts_get_table_id(
 					long */
 	MY_ATTRIBUTE((warn_unused_result));
 
-/******************************************************************//**
-Add the table to add to the OPTIMIZER's list. */
-void
-fts_optimize_add_table(
-/*===================*/
-	dict_table_t*	table);		/*!< in: table to add */
-
-/******************************************************************//**
-Optimize a table. */
-void
-fts_optimize_do_table(
-/*==================*/
-	dict_table_t*	table);		/*!< in: table to optimize */
-
 /******************************************************************//**
 Construct the prefix name of an FTS table.
 @return own: table name, must be freed with ut_free() */
diff --git a/storage/innobase/include/fts0priv.ic b/storage/innobase/include/fts0priv.ic
index eb92ba9b12bd..c6588458eeaa 100644
--- a/storage/innobase/include/fts0priv.ic
+++ b/storage/innobase/include/fts0priv.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0tlex.h b/storage/innobase/include/fts0tlex.h
index 49bea8b08d46..16f41a49a02a 100644
--- a/storage/innobase/include/fts0tlex.h
+++ b/storage/innobase/include/fts0tlex.h
@@ -1,3 +1,29 @@
+/*****************************************************************************
+
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License, version 2.0, as published by the
+Free Software Foundation.
+
+This program is also distributed with certain software (including but not
+limited to OpenSSL) that is licensed under separate terms, as designated in a
+particular file or component or in included license documentation. The authors
+of MySQL hereby grant you an additional permission to link the program and
+your derivative works with the separately licensed software that they have
+included with MySQL.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+*****************************************************************************/
+
 #ifndef fts0tHEADER_H
 #define fts0tHEADER_H 1
 #define fts0tIN_HEADER 1
diff --git a/storage/innobase/include/fts0tokenize.h b/storage/innobase/include/fts0tokenize.h
index 15726aea1de0..1e02b1562e18 100644
--- a/storage/innobase/include/fts0tokenize.h
+++ b/storage/innobase/include/fts0tokenize.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0types.h b/storage/innobase/include/fts0types.h
index 039006265f61..af48fc282bc8 100644
--- a/storage/innobase/include/fts0types.h
+++ b/storage/innobase/include/fts0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -123,7 +131,8 @@ struct fts_sync_t {
 	doc_id_t	max_doc_id;	/*!< The doc id at which the cache was
 					noted as being full, we use this to
 					set the upper_limit field */
-	ib_time_t	start_time;	/*!< SYNC start time */
+	ib_time_monotonic_t	start_time;
+	/*!< SYNC start time */
 	bool		in_progress;	/*!< flag whether sync is in progress.*/
 	bool		unlock_cache;	/*!< flag whether unlock cache when
 					write fts node */
@@ -163,6 +172,9 @@ struct fts_cache_t {
 	ulint		total_size;	/*!< total size consumed by the ilist
 					field of all nodes. SYNC is run
 					whenever this gets too big */
+	uint64_t	total_size_before_sync;
+	/*!< total size of fts cache, when last SYNC request was sent */
+
 	fts_sync_t*	sync;		/*!< sync structure to sync data to
 					disk */
 	ib_alloc_t*	sync_heap;	/*!< The heap allocator, for indexes
diff --git a/storage/innobase/include/fts0types.ic b/storage/innobase/include/fts0types.ic
index 6fc03c2f246c..1512d47305f9 100644
--- a/storage/innobase/include/fts0types.ic
+++ b/storage/innobase/include/fts0types.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fts0vlc.ic b/storage/innobase/include/fts0vlc.ic
index e79bcf593477..2656e34213a1 100644
--- a/storage/innobase/include/fts0vlc.ic
+++ b/storage/innobase/include/fts0vlc.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2011, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h
index 0b8b8b0e43b5..1148c516b77e 100644
--- a/storage/innobase/include/fut0fut.h
+++ b/storage/innobase/include/fut0fut.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic
index eca520c99c6d..b7e8915b3187 100644
--- a/storage/innobase/include/fut0fut.ic
+++ b/storage/innobase/include/fut0fut.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h
index 4729a5d29c35..323c69852553 100644
--- a/storage/innobase/include/fut0lst.h
+++ b/storage/innobase/include/fut0lst.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic
index 128dc77ed92c..7dbfb6465db2 100644
--- a/storage/innobase/include/fut0lst.ic
+++ b/storage/innobase/include/fut0lst.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/gis0geo.h b/storage/innobase/include/gis0geo.h
index 08895af545eb..c3c421b8281e 100644
--- a/storage/innobase/include/gis0geo.h
+++ b/storage/innobase/include/gis0geo.h
@@ -1,14 +1,21 @@
 /*****************************************************************************
-Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h
index 436374fd6b25..b83d73a26160 100644
--- a/storage/innobase/include/gis0rtree.h
+++ b/storage/innobase/include/gis0rtree.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/gis0rtree.ic b/storage/innobase/include/gis0rtree.ic
index a30db1222738..1fbe6cb86e76 100644
--- a/storage/innobase/include/gis0rtree.ic
+++ b/storage/innobase/include/gis0rtree.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/gis0type.h b/storage/innobase/include/gis0type.h
index 14c098f96082..12c8fa2e29b6 100644
--- a/storage/innobase/include/gis0type.h
+++ b/storage/innobase/include/gis0type.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index 15a99ddf683d..4fe51842aed6 100644
--- a/storage/innobase/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic
index 854ff9bc046f..1477cf34fa84 100644
--- a/storage/innobase/include/ha0ha.ic
+++ b/storage/innobase/include/ha0ha.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ha0storage.h b/storage/innobase/include/ha0storage.h
index 7dd6d26bad0a..4ff75ea0405f 100644
--- a/storage/innobase/include/ha0storage.h
+++ b/storage/innobase/include/ha0storage.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic
index e841925d3200..2b24a6f74d3d 100644
--- a/storage/innobase/include/ha0storage.ic
+++ b/storage/innobase/include/ha0storage.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index fc28eaa1a717..31c7b74fb5f7 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -153,8 +161,8 @@ innobase_mysql_print_thd(
 /*=====================*/
 	FILE*	f,		/*!< in: output stream */
 	THD*	thd,		/*!< in: pointer to a MySQL THD object */
-	uint	max_query_len);	/*!< in: max query length to print, or 0 to
-				   use the default max length */
+	uint	max_query_len);	/*!< in: max query length to print, 
+				 must be positive */
 
 /** Converts a MySQL type to an InnoDB type. Note that this function returns
 the 'mtype' of InnoDB. InnoDB differentiates between MySQL's old <= 4.1
diff --git a/storage/innobase/include/handler0alter.h b/storage/innobase/include/handler0alter.h
index 1c6908394499..550fe93ac705 100644
--- a/storage/innobase/include/handler0alter.h
+++ b/storage/innobase/include/handler0alter.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -62,7 +70,9 @@ innobase_rec_reset(
 	MY_ATTRIBUTE((nonnull));
 
 /** Generate the next autoinc based on a snapshot of the session
-auto_increment_increment and auto_increment_offset variables. */
+auto_increment_increment and auto_increment_offset variables.
+Assingnment operator would be used during the inplace_alter_table()
+phase only **/
 struct ib_sequence_t {
 
 	/**
@@ -82,7 +92,19 @@ struct ib_sequence_t {
 		return(m_eof);
 	}
 
-	/**
+	/** assignment operator to copy the sequence values
+	@param in 		sequence to copy from */
+        ib_sequence_t &operator=(const ib_sequence_t &in) {
+		ut_ad(in.m_next_value > 0);
+		ut_ad(in.m_max_value == m_max_value);
+		m_next_value = in.m_next_value;
+		m_increment = in.m_increment;
+		m_offset = in.m_offset;
+		m_eof = in.m_eof;
+		return (*this);
+        };
+
+        /**
 	@return the next value in the sequence */
 	ulonglong last() const UNIV_NOTHROW
 	{
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index e088fed47cf2..27bb1a9b9e48 100644
--- a/storage/innobase/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic
index b99ac1eb5014..061ddda61357 100644
--- a/storage/innobase/include/hash0hash.ic
+++ b/storage/innobase/include/hash0hash.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ib0mutex.h b/storage/innobase/include/ib0mutex.h
index 6cf40a6bfc61..87050b509e5f 100644
--- a/storage/innobase/include/ib0mutex.h
+++ b/storage/innobase/include/ib0mutex.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index 5f5cbd14c6b7..5112c7037e73 100644
--- a/storage/innobase/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic
index de39592ae6b0..91a0c2aef4d5 100644
--- a/storage/innobase/include/ibuf0ibuf.ic
+++ b/storage/innobase/include/ibuf0ibuf.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h
index 3fdbf078b0ba..6e1e6ebfa1a3 100644
--- a/storage/innobase/include/ibuf0types.h
+++ b/storage/innobase/include/ibuf0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/lock0iter.h b/storage/innobase/include/lock0iter.h
index ca97d22556a6..bfb202ecd901 100644
--- a/storage/innobase/include/lock0iter.h
+++ b/storage/innobase/include/lock0iter.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index 8db09e50f48c..7b0f615b4721 100644
--- a/storage/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -563,6 +571,16 @@ void
 lock_trx_release_locks(
 /*===================*/
 	trx_t*	trx);	/*!< in/out: transaction */
+
+/** Release read locks of a transacion. It is called during XA
+prepare to release locks early.
+@param[in,out]	trx		transaction
+@param[in]	only_gap	release only GAP locks */
+void
+lock_trx_release_read_locks(
+	trx_t*	trx,
+	bool	only_gap);
+
 /*********************************************************************//**
 Removes locks on a table to be dropped or truncated.
 If remove_also_table_sx_locks is TRUE then table-level S and X locks are
@@ -1030,6 +1048,20 @@ struct lock_sys_t{
 						is running */
 };
 
+/*********************************************************************//**
+This function is kind of wrapper to lock_rec_convert_impl_to_expl_for_trx()
+function with functionailty added to facilitate lock conversion from implicit
+to explicit for partial rollback cases */
+void
+lock_rec_convert_active_impl_to_expl(
+/*==================================*/
+        const buf_block_t*      block,  /*!< in: buffer block of rec */
+        const rec_t*            rec,    /*!< in: user record on page */
+        dict_index_t*           index,  /*!< in: index of record */
+        const ulint*            offsets,/*!< in: rec_get_offsets(rec, index) */
+        trx_t*                  trx,    /*!< in/out: active transaction */
+        ulint                   heap_no);/*!< in: rec heap number to lock */
+
 /*************************************************************//**
 Removes a record lock request, waiting or granted, from the queue. */
 void
diff --git a/storage/innobase/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic
index ba2311c02ea3..9bf7a7d6d2be 100644
--- a/storage/innobase/include/lock0lock.ic
+++ b/storage/innobase/include/lock0lock.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/lock0prdt.h b/storage/innobase/include/lock0prdt.h
index 93bbd203eccc..9fa1b6a5864d 100644
--- a/storage/innobase/include/lock0prdt.h
+++ b/storage/innobase/include/lock0prdt.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h
index d148c305d7d3..157a56c5870a 100644
--- a/storage/innobase/include/lock0priv.h
+++ b/storage/innobase/include/lock0priv.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -130,6 +138,16 @@ struct lock_t {
 					LOCK_INSERT_INTENTION,
 					wait flag, ORed */
 
+	/** Remove GAP lock from a next Key Lock */
+	void remove_gap_lock()
+	{
+		ut_ad(!is_gap());
+		ut_ad(!is_insert_intention());
+		ut_ad(is_record_lock());
+
+		type_mode |= LOCK_REC_NOT_GAP;
+	}
+
 	/** Determine if the lock object is a record lock.
 	@return true if record lock, false otherwise. */
 	bool is_record_lock() const
@@ -137,6 +155,13 @@ struct lock_t {
 		return(type() == LOCK_REC);
 	}
 
+	/** Determine if it is predicate lock.
+	@return true if predicate lock, false otherwise. */
+	bool is_predicate() const
+	{
+		return(type_mode & (LOCK_PREDICATE | LOCK_PRDT_PAGE));
+	}
+
 	bool is_waiting() const
 	{
 		return(type_mode & LOCK_WAIT);
@@ -166,6 +191,27 @@ struct lock_t {
 		return(static_cast<enum lock_mode>(type_mode & LOCK_MODE_MASK));
 	}
 
+	/** Get lock hash table
+	@return lock hash table */
+	hash_table_t* hash_table() const
+	{
+		return(lock_hash_get(type_mode));
+	}
+
+	/** Get tablespace ID for the lock
+	@return space ID */
+	ulint space() const
+	{
+		return(un_member.rec_lock.space);
+	}
+
+	/** Get page number of the lock
+	@return page number */
+	ulint page_number() const
+	{
+		return(un_member.rec_lock.page_no);
+	}
+
 	/** Print the lock object into the given output stream.
 	@param[in,out]	out	the output stream
 	@return the given output stream. */
diff --git a/storage/innobase/include/lock0priv.ic b/storage/innobase/include/lock0priv.ic
index f6e5f7acb8fe..ae33e4daea02 100644
--- a/storage/innobase/include/lock0priv.ic
+++ b/storage/innobase/include/lock0priv.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h
index d08eaabfb1e3..60fabe2ed5a6 100644
--- a/storage/innobase/include/lock0types.h
+++ b/storage/innobase/include/lock0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index dcd4d8709482..4c2b90464bbf 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2009, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -67,6 +75,8 @@ typedef ulint (*log_checksum_func_t)(const byte* log_block);
 log_sys->mutex. */
 extern log_checksum_func_t log_checksum_algorithm_ptr;
 
+static const char ib_logfile_basename[] = "ib_logfile";
+
 /*******************************************************************//**
 Calculates where in log files we find a specified lsn.
 @return log file number */
diff --git a/storage/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic
index b6e5db13e71e..d680e281493d 100644
--- a/storage/innobase/include/log0log.ic
+++ b/storage/innobase/include/log0log.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
index 24369eaeeaa6..9fb60145e941 100644
--- a/storage/innobase/include/log0recv.h
+++ b/storage/innobase/include/log0recv.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/log0recv.ic b/storage/innobase/include/log0recv.ic
index d197e5e33372..2457309f7b7a 100644
--- a/storage/innobase/include/log0recv.ic
+++ b/storage/innobase/include/log0recv.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/log0types.h b/storage/innobase/include/log0types.h
index 7674c7584035..c00339bb471a 100644
--- a/storage/innobase/include/log0types.h
+++ b/storage/innobase/include/log0types.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -8,13 +8,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h
index 4d32e2e71702..d25f496a239c 100644
--- a/storage/innobase/include/mach0data.h
+++ b/storage/innobase/include/mach0data.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mach0data.ic b/storage/innobase/include/mach0data.ic
index 0868e1cba20d..c66657d2f631 100644
--- a/storage/innobase/include/mach0data.ic
+++ b/storage/innobase/include/mach0data.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h
index f8fdb53e1326..1201301c84c8 100644
--- a/storage/innobase/include/mem0mem.h
+++ b/storage/innobase/include/mem0mem.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
index 3b4109ee52d0..5097bb20db4a 100644
--- a/storage/innobase/include/mem0mem.ic
+++ b/storage/innobase/include/mem0mem.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -589,8 +597,13 @@ mem_strdupl(
 	ulint		len)	/*!< in: length of str, in bytes */
 {
 	char*	s = static_cast<char*>(ut_malloc_nokey(len + 1));
-	s[len] = 0;
-	return(static_cast<char*>(memcpy(s, str, len)));
+	if (s != NULL) {
+		s[len] = 0;
+	}
+	if (len > 0) {
+		memcpy(s, str, len);
+	}
+	return s;
 }
 
 /**********************************************************************//**
diff --git a/storage/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h
index 3819d3f694ae..dc8b536ca251 100644
--- a/storage/innobase/include/mtr0log.h
+++ b/storage/innobase/include/mtr0log.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index d957c73ce97e..e95d89c7d277 100644
--- a/storage/innobase/include/mtr0log.ic
+++ b/storage/innobase/include/mtr0log.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h
index 2ead92b5b5c0..17df6b060d42 100644
--- a/storage/innobase/include/mtr0mtr.h
+++ b/storage/innobase/include/mtr0mtr.h
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic
index b3d9b052d529..b3e54bd331d2 100644
--- a/storage/innobase/include/mtr0mtr.ic
+++ b/storage/innobase/include/mtr0mtr.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -176,9 +184,8 @@ mtr_t::release_block_at_savepoint(
 
 	ut_a(slot->object == block);
 
-	buf_block_unfix(reinterpret_cast<buf_block_t*>(block));
-
 	buf_page_release_latch(block, slot->type);
+	buf_block_unfix(block);
 
 	slot->object = NULL;
 }
diff --git a/storage/innobase/include/mtr0types.h b/storage/innobase/include/mtr0types.h
index f15a6b2927e8..59424e8c32d8 100644
--- a/storage/innobase/include/mtr0types.h
+++ b/storage/innobase/include/mtr0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0atomic.h b/storage/innobase/include/os0atomic.h
index c52ec8b3d4bd..1234b7d519dd 100644
--- a/storage/innobase/include/os0atomic.h
+++ b/storage/innobase/include/os0atomic.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -8,13 +8,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0atomic.ic b/storage/innobase/include/os0atomic.ic
index 1f1c460bc476..9b0e40102806 100644
--- a/storage/innobase/include/os0atomic.ic
+++ b/storage/innobase/include/os0atomic.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0event.h b/storage/innobase/include/os0event.h
index d5fdc6ba0804..f4ade4396a4e 100644
--- a/storage/innobase/include/os0event.h
+++ b/storage/innobase/include/os0event.h
@@ -1,13 +1,21 @@
 /*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -126,6 +134,14 @@ os_event_wait_time_low(
 	int64_t		reset_sig_count);	/*!< in: zero or the value
 						returned by previous call of
 						os_event_reset(). */
+/** Initializes support for os_event objects. Must be called once,
+ and before any os_event object is created. */
+void os_event_global_init(void);
+
+/** Deinitializes support for os_event objects. Must be called once,
+ and after all os_event objects are destroyed. After it is called, no
+new os_event is allowed to be created. */
+void os_event_global_destroy(void);
 
 /** Blocking timed wait on an event.
 @param e - event to wait on.
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index c4402c58fddc..c9acda57e4fd 100644
--- a/storage/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2009, Percona Inc.
 
 Portions of this file contain modifications contributed and copyrighted
@@ -10,14 +10,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -235,12 +242,27 @@ struct Compression {
 #endif /* UNIV_DEBUG */
 	}
 
+	/** Version of compressed page */
+	static const uint8_t FIL_PAGE_VERSION_1 = 1;
+	static const uint8_t FIL_PAGE_VERSION_2 = 2;
+
 	/** Check the page header type field.
 	@param[in]	page		Page contents
 	@return true if it is a compressed page */
 	static bool is_compressed_page(const byte* page)
 		MY_ATTRIBUTE((warn_unused_result));
 
+	/** Check the page header type field.
+	@param[in]   page            Page contents
+	@return true if it is a compressed and encrypted page */
+	static bool is_compressed_encrypted_page(const byte *page)
+		MY_ATTRIBUTE((warn_unused_result));
+
+	/** Check if the version on page is valid.
+	@param[in]   version         version
+	@return true if version is valid */
+	static bool is_valid_page_version(uint8_t version);
+
         /** Check wether the compression algorithm is supported.
         @param[in]      algorithm       Compression algorithm to check
         @param[out]     type            The type that algorithm maps to
@@ -510,7 +532,6 @@ struct Encryption {
 #define IORequestWrite		IORequest(IORequest::WRITE)
 #define IORequestLogRead	IORequest(IORequest::LOG | IORequest::READ)
 #define IORequestLogWrite	IORequest(IORequest::LOG | IORequest::WRITE)
-
 /**
 The IO Context that is passed down to the low level IO code */
 class IORequest {
@@ -554,7 +575,10 @@ class IORequest {
 		This can be used to force a read and write without any
 		compression e.g., for redo log, merge sort temporary files
 		and the truncate redo log. */
-		NO_COMPRESSION = 512
+		NO_COMPRESSION = 512,
+
+		/** Row log used in online DDL */
+		ROW_LOG = 1024
 	};
 
 	/** Default constructor */
@@ -578,7 +602,7 @@ class IORequest {
 		m_compression(),
 		m_encryption()
 	{
-		if (is_log()) {
+		if (is_log() || is_row_log()) {
 			disable_compression();
 		}
 
@@ -618,6 +642,13 @@ class IORequest {
 		return((m_type & LOG) == LOG);
 	}
 
+	/** @return true if it is a row log entry used in online DDL */
+	bool is_row_log() const
+		MY_ATTRIBUTE((warn_unused_result))
+	{
+		return((m_type & ROW_LOG) == ROW_LOG);
+	}
+
 	/** @return true if the simulated AIO thread should be woken up */
 	bool is_wake() const
 		MY_ATTRIBUTE((warn_unused_result))
@@ -2042,6 +2073,11 @@ os_file_get_status(
 	bool		read_only);
 
 #if !defined(UNIV_HOTBACKUP)
+/** return one of the tmpdir path
+@return tmporary dir*/
+char *innobase_mysql_tmpdir(void);
+
+
 /** Creates a temporary file in the location specified by the parameter
 path. If the path is NULL then it will be created on --tmpdir location.
 This function is defined in ha_innodb.cc.
diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
index 7ea71972f16b..9f4c732121b1 100644
--- a/storage/innobase/include/os0file.ic
+++ b/storage/innobase/include/os0file.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0once.h b/storage/innobase/include/os0once.h
index 8cde40286bc8..59d4f41d3c1b 100644
--- a/storage/innobase/include/os0once.h
+++ b/storage/innobase/include/os0once.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h
index af57b5d6a7a4..72066dad8a8a 100644
--- a/storage/innobase/include/os0proc.h
+++ b/storage/innobase/include/os0proc.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0proc.ic b/storage/innobase/include/os0proc.ic
index 506f4f8ce0c1..d7742792801e 100644
--- a/storage/innobase/include/os0proc.ic
+++ b/storage/innobase/include/os0proc.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h
index 7edfb953359d..e9437586651c 100644
--- a/storage/innobase/include/os0thread.h
+++ b/storage/innobase/include/os0thread.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/os0thread.ic b/storage/innobase/include/os0thread.ic
index 0622d22f2dcf..84a2dded2e5a 100644
--- a/storage/innobase/include/os0thread.ic
+++ b/storage/innobase/include/os0thread.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h
index c111717d868c..bd009b4ba55f 100644
--- a/storage/innobase/include/page0cur.h
+++ b/storage/innobase/include/page0cur.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic
index 6184361c8563..4e4232b7c5dd 100644
--- a/storage/innobase/include/page0cur.ic
+++ b/storage/innobase/include/page0cur.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h
index 2ef6291171a3..6ceb36fcba46 100644
--- a/storage/innobase/include/page0page.h
+++ b/storage/innobase/include/page0page.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -705,6 +713,22 @@ page_rec_is_last(
 	const page_t*	page)	/*!< in: page */
 	MY_ATTRIBUTE((warn_unused_result));
 
+/************************************************************//**
+true if distance between the records (measured in number of times we have to
+move to the next record) is at most the specified value
+@param[in]	left_rec	lefter record
+@param[in]	right_rec	righter record
+@param[in]	val		specified value to compare
+@return true if the distance is smaller than the value */
+UNIV_INLINE
+bool
+page_rec_distance_is_at_most(
+/*=========================*/
+	const rec_t*	left_rec,
+	const rec_t*	right_rec,
+	ulint		val)
+	MY_ATTRIBUTE((warn_unused_result));
+
 /************************************************************//**
 true if the record is the second last user record on a page.
 @return true if the second last user record */
@@ -1148,6 +1172,16 @@ page_warn_strict_checksum(
 	srv_checksum_algorithm_t	page_checksum,
 	const page_id_t&		page_id);
 
+/** This function checks if the page in which record is present is a
+non-leaf node of a spatial index.
+param[in]       rec     Btree record
+param[in]       index   index
+@return TRUE if ok */
+bool page_is_spatial_non_leaf(
+/*==========================*/
+	const rec_t* rec,/*!< in: Btree record */
+	dict_index_t* index);/*!< in: index */
+
 #ifdef UNIV_MATERIALIZE
 #undef UNIV_INLINE
 #define UNIV_INLINE  UNIV_INLINE_ORIGINAL
diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic
index 1abd2c3a3038..da1d0d2f444f 100644
--- a/storage/innobase/include/page0page.ic
+++ b/storage/innobase/include/page0page.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -571,6 +579,26 @@ page_rec_is_last(
 	return(page_rec_get_next_const(rec) == page_get_supremum_rec(page));
 }
 
+/************************************************************//**
+true if distance between the records (measured in number of times we have to
+move to the next record) is at most the specified value */
+UNIV_INLINE
+bool
+page_rec_distance_is_at_most(
+/*=========================*/
+	const rec_t*	left_rec,
+	const rec_t*	right_rec,
+	ulint		val)
+{
+	for (ulint i = 0; i <= val; i++) {
+		if (left_rec == right_rec) {
+			return (true);
+		}
+		left_rec = page_rec_get_next_const(left_rec);
+	}
+	return (false);
+}
+
 /************************************************************//**
 true if the record is the second last user record on a page.
 @return true if the second last user record */
diff --git a/storage/innobase/include/page0size.h b/storage/innobase/include/page0size.h
index ab917e1ff059..4f6738d5cff7 100644
--- a/storage/innobase/include/page0size.h
+++ b/storage/innobase/include/page0size.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h
index fe56468c4541..4c24b6629a4c 100644
--- a/storage/innobase/include/page0types.h
+++ b/storage/innobase/include/page0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h
index 7b5df3d306be..4d71ec74ce5b 100644
--- a/storage/innobase/include/page0zip.h
+++ b/storage/innobase/include/page0zip.h
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic
index a15024381403..7ed0054f7b8d 100644
--- a/storage/innobase/include/page0zip.ic
+++ b/storage/innobase/include/page0zip.ic
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0grm.h b/storage/innobase/include/pars0grm.h
index 8e725fe95454..bbc78c767f81 100644
--- a/storage/innobase/include/pars0grm.h
+++ b/storage/innobase/include/pars0grm.h
@@ -6,14 +6,20 @@
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h
index cb1ce60ac228..bea0fbb8385b 100644
--- a/storage/innobase/include/pars0opt.h
+++ b/storage/innobase/include/pars0opt.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic
index 786d911ca3d3..bcbd14a95cb2 100644
--- a/storage/innobase/include/pars0opt.ic
+++ b/storage/innobase/include/pars0opt.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index 7e153d0c19bc..6aacb62cafde 100644
--- a/storage/innobase/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic
index 4c88337a265d..1e4e73728d0c 100644
--- a/storage/innobase/include/pars0pars.ic
+++ b/storage/innobase/include/pars0pars.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h
index abd0c5cd4c8a..f251f7d87e21 100644
--- a/storage/innobase/include/pars0sym.h
+++ b/storage/innobase/include/pars0sym.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic
index 266c1a6310df..ea5650c8bd60 100644
--- a/storage/innobase/include/pars0sym.ic
+++ b/storage/innobase/include/pars0sym.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/pars0types.h b/storage/innobase/include/pars0types.h
index 47f4b432d203..c2fbcd92b70b 100644
--- a/storage/innobase/include/pars0types.h
+++ b/storage/innobase/include/pars0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1998, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1998, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h
index 3e90e0b25e35..0bccfb60ec8d 100644
--- a/storage/innobase/include/que0que.h
+++ b/storage/innobase/include/que0que.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic
index ec61081cfe24..0f653a6aeec1 100644
--- a/storage/innobase/include/que0que.ic
+++ b/storage/innobase/include/que0que.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/que0types.h b/storage/innobase/include/que0types.h
index 0f11cad301af..73ab773ea15c 100644
--- a/storage/innobase/include/que0types.h
+++ b/storage/innobase/include/que0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h
index 129341be77c8..ce9ccdb4bac6 100644
--- a/storage/innobase/include/read0read.h
+++ b/storage/innobase/include/read0read.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/read0types.h b/storage/innobase/include/read0types.h
index c83c7e04f11d..f439e3740a78 100644
--- a/storage/innobase/include/read0types.h
+++ b/storage/innobase/include/read0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h
index a59479849a87..af4f15f153c9 100644
--- a/storage/innobase/include/rem0cmp.h
+++ b/storage/innobase/include/rem0cmp.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -197,6 +205,7 @@ cmp_rec_rec_simple(
 @param[in] offsets1 rec_get_offsets(rec1, index)
 @param[in] offsets2 rec_get_offsets(rec2, index)
 @param[in] index B-tree index
+@param[in] spatial_index_non_leaf true if record is in spatial non leaf page
 @param[in] nulls_unequal true if this is for index cardinality
 statistics estimation, and innodb_stats_method=nulls_unequal
 or innodb_stats_method=nulls_ignored
@@ -213,16 +222,18 @@ cmp_rec_rec_with_match(
 	const ulint*		offsets1,
 	const ulint*		offsets2,
 	const dict_index_t*	index,
+	bool			spatial_index_non_leaf,
 	bool			nulls_unequal,
 	ulint*			matched_fields);
 
 /** Compare two B-tree records.
 Only the common first fields are compared, and externally stored field
 are treated as equal.
-@param[in]	rec1		B-tree record
-@param[in]	rec2		B-tree record
-@param[in]	offsets1	rec_get_offsets(rec1, index)
-@param[in]	offsets2	rec_get_offsets(rec2, index)
+@param[in]	rec1				B-tree record
+@param[in]	rec2				B-tree record
+@param[in]	offsets1			rec_get_offsets(rec1, index)
+@param[in]	offsets2			rec_get_offsets(rec2, index)
+@param[in]	spatial_index_non_leaf		true if spatial index non leaf records
 @param[out]	matched_fields	number of completely matched fields
 				within the first field not completely matched
 @return positive, 0, negative if rec1 is greater, equal, less, than rec2,
@@ -235,6 +246,7 @@ cmp_rec_rec(
 	const ulint*		offsets1,
 	const ulint*		offsets2,
 	const dict_index_t*	index,
+	bool			spatial_index_non_leaf,
 	ulint*			matched_fields = NULL);
 
 /** Compare two data fields.
diff --git a/storage/innobase/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic
index bf913b93bfb6..0daca7d8a85d 100644
--- a/storage/innobase/include/rem0cmp.ic
+++ b/storage/innobase/include/rem0cmp.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -70,13 +78,15 @@ cmp_rec_rec(
 	const ulint*		offsets1,
 	const ulint*		offsets2,
 	const dict_index_t*	index,
+	bool			spatial_index_non_leaf,
 	ulint*			matched_fields)
 {
 	ulint	match_f;
 	int	ret;
 
 	ret = cmp_rec_rec_with_match(
-		rec1, rec2, offsets1, offsets2, index, false, &match_f);
+		rec1, rec2, offsets1, offsets2, index,
+		spatial_index_non_leaf ,false, &match_f);
 
 	if (matched_fields != NULL) {
 		*matched_fields = match_f;
diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index c99a63cfeb8f..179ebdcf5c56 100644
--- a/storage/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1012,7 +1020,7 @@ struct rec_offsets_print
 std::ostream&
 operator<<(std::ostream& o, const rec_offsets_print& r);
 
-# ifndef DBUG_OFF
+# ifndef NDEBUG
 /** Pretty-printer of records and tuples */
 class rec_printer : public std::ostringstream {
 public:
@@ -1067,7 +1075,7 @@ class rec_printer : public std::ostringstream {
 	/** Assignment operator */
 	rec_printer& operator=(const rec_printer& other);
 };
-# endif /* !DBUG_OFF */
+# endif /* !NDEBUG */
 
 # ifdef UNIV_DEBUG
 /************************************************************//**
diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic
index b855a39da9ea..f12bbca5c062 100644
--- a/storage/innobase/include/rem0rec.ic
+++ b/storage/innobase/include/rem0rec.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1655,6 +1663,7 @@ rec_get_converted_size(
 
 	data_size = dtuple_get_data_size(dtuple, 0);
 
+	ut_ad(n_ext == dtuple->get_n_ext());
 	extra_size = rec_get_converted_extra_size(
 		data_size, dtuple_get_n_fields(dtuple), n_ext);
 
diff --git a/storage/innobase/include/rem0types.h b/storage/innobase/include/rem0types.h
index f8133f77466d..968a211a2aa5 100644
--- a/storage/innobase/include/rem0types.h
+++ b/storage/innobase/include/rem0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0ext.h b/storage/innobase/include/row0ext.h
index 1d788a4c2176..a9a4c256d7f9 100644
--- a/storage/innobase/include/row0ext.h
+++ b/storage/innobase/include/row0ext.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0ext.ic b/storage/innobase/include/row0ext.ic
index 39e150d91d5f..17d9f6bf4237 100644
--- a/storage/innobase/include/row0ext.ic
+++ b/storage/innobase/include/row0ext.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0ftsort.h b/storage/innobase/include/row0ftsort.h
index 0ea266b28cbf..7aff11dd7191 100644
--- a/storage/innobase/include/row0ftsort.h
+++ b/storage/innobase/include/row0ftsort.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -105,6 +113,8 @@ typedef UT_LIST_BASE_NODE_T(row_fts_token_t)     fts_token_list_t;
 
 /** Structure stores information from string tokenization operation */
 struct fts_tokenize_ctx {
+	fts_tokenize_ctx() { memset(this, 0, sizeof(*this)); }
+
 	ulint			processed_len;  /*!< processed string length */
 	ulint			init_pos;       /*!< doc start position */
 	ulint			buf_used;       /*!< the sort buffer (ID) when
diff --git a/storage/innobase/include/row0import.h b/storage/innobase/include/row0import.h
index 137c28ac1faa..3aaf45e7ac9d 100644
--- a/storage/innobase/include/row0import.h
+++ b/storage/innobase/include/row0import.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0import.ic b/storage/innobase/include/row0import.ic
index c5bbab49f6fb..ad5c00009420 100644
--- a/storage/innobase/include/row0import.ic
+++ b/storage/innobase/include/row0import.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h
index 4038c32b9c05..0ddb88711f27 100644
--- a/storage/innobase/include/row0ins.h
+++ b/storage/innobase/include/row0ins.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -150,18 +158,18 @@ row_ins_index_entry_big_rec_func(
 	mem_heap_t**		heap,	/*!< in/out: memory heap */
 	dict_index_t*		index,	/*!< in: index */
 	const char*		file,	/*!< in: file name of caller */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	const void*		thd,	/*!< in: connection, or NULL */
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 	ulint			line)	/*!< in: line number of caller */
 	MY_ATTRIBUTE((nonnull(1,2,3,4,5,6), warn_unused_result));
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 # define row_ins_index_entry_big_rec(e,big,ofs,heap,index,thd,file,line) \
 	row_ins_index_entry_big_rec_func(e,big,ofs,heap,index,file,line)
-#else /* DBUG_OFF */
+#else /* NDEBUG */
 # define row_ins_index_entry_big_rec(e,big,ofs,heap,index,thd,file,line) \
 	row_ins_index_entry_big_rec_func(e,big,ofs,heap,index,file,thd,line)
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 /***************************************************************//**
 Inserts an entry into a clustered index. Tries first optimistic,
 then pessimistic descent down the tree. If the entry matches enough
@@ -231,10 +239,6 @@ struct ins_node_t{
 				entry_list and sys fields are stored here;
 				if this is NULL, entry list should be created
 				and buffers for sys fields in row allocated */
-	dict_index_t*   duplicate;
-				/* This is the first index that reported
-				DB_DUPLICATE_KEY.  Used in the case of REPLACE
-				or INSERT ... ON DUPLICATE UPDATE. */
 	ulint		magic_n;
 };
 
diff --git a/storage/innobase/include/row0ins.ic b/storage/innobase/include/row0ins.ic
index 9c191d869a23..44aa9e1c6f02 100644
--- a/storage/innobase/include/row0ins.ic
+++ b/storage/innobase/include/row0ins.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h
index bc541316917a..f6b37cf8e9b2 100644
--- a/storage/innobase/include/row0log.h
+++ b/storage/innobase/include/row0log.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0log.ic b/storage/innobase/include/row0log.ic
index 3570e5dca1b8..e3f003d1b9f5 100644
--- a/storage/innobase/include/row0log.ic
+++ b/storage/innobase/include/row0log.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h
index f871bcad1c9a..9b319c35ceaa 100644
--- a/storage/innobase/include/row0merge.h
+++ b/storage/innobase/include/row0merge.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index aacbb0bb0709..162bbf46da56 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -625,8 +633,8 @@ struct mysql_row_templ_t {
 					ROW_MYSQL_WHOLE_ROW */
 	ulint	icp_rec_field_no;	/*!< field number of the column in an
 					Innobase record in the current index;
-					not defined unless
-					index condition pushdown is used */
+					used to evaluate the pushed index
+					condition and/or end-range condition */
 	ulint	mysql_col_offset;	/*!< offset of the column in the MySQL
 					row format */
 	ulint	mysql_col_len;		/*!< length of the column in the MySQL
@@ -943,6 +951,18 @@ struct SysIndexCallback {
 	virtual void operator()(mtr_t* mtr, btr_pcur_t* pcur) throw() = 0;
 };
 
+/** Get the updated parent field value from the update vector for the
+given col_no.
+@param[in]	foreign		foreign key information
+@param[in]	update		updated parent vector.
+@param[in]	col_no		base column position of the child table to check
+@return updated field from the parent update vector, else NULL */
+dfield_t*
+innobase_get_field_from_update_vector(
+	dict_foreign_t*	foreign,
+	upd_t*		update,
+	uint32_t	col_no);
+
 /** Get the computed value by supplying the base column values.
 @param[in,out]	row		the data row
 @param[in]	col		virtual column
diff --git a/storage/innobase/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic
index 2eb60898c462..b68a1a19d69e 100644
--- a/storage/innobase/include/row0mysql.ic
+++ b/storage/innobase/include/row0mysql.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2001, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h
index 41c867e6c072..f4ea4d563c01 100644
--- a/storage/innobase/include/row0purge.h
+++ b/storage/innobase/include/row0purge.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0purge.ic b/storage/innobase/include/row0purge.ic
index 700106d1048c..b25a4fbbb85f 100644
--- a/storage/innobase/include/row0purge.ic
+++ b/storage/innobase/include/row0purge.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0quiesce.h b/storage/innobase/include/row0quiesce.h
index ae14b3c63c14..6ae90d695748 100644
--- a/storage/innobase/include/row0quiesce.h
+++ b/storage/innobase/include/row0quiesce.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0quiesce.ic b/storage/innobase/include/row0quiesce.ic
index f570a6aed05a..7f996090fe72 100644
--- a/storage/innobase/include/row0quiesce.ic
+++ b/storage/innobase/include/row0quiesce.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index 903d7d1b9167..240c072b4d0c 100644
--- a/storage/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0row.ic b/storage/innobase/include/row0row.ic
index 08c0f18e95b9..8809ec2c6e3f 100644
--- a/storage/innobase/include/row0row.ic
+++ b/storage/innobase/include/row0row.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
index 6722284d9cab..095b5699f31b 100644
--- a/storage/innobase/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0sel.ic b/storage/innobase/include/row0sel.ic
index a816e4440e24..61b19565ee4c 100644
--- a/storage/innobase/include/row0sel.ic
+++ b/storage/innobase/include/row0sel.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0trunc.h b/storage/innobase/include/row0trunc.h
index 87dc37f4af5c..b1b3407ea212 100644
--- a/storage/innobase/include/row0trunc.h
+++ b/storage/innobase/include/row0trunc.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0types.h b/storage/innobase/include/row0types.h
index 52c89cb01fa2..e306fa61de26 100644
--- a/storage/innobase/include/row0types.h
+++ b/storage/innobase/include/row0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h
index 95a714d2338f..c7ac66ae32da 100644
--- a/storage/innobase/include/row0uins.h
+++ b/storage/innobase/include/row0uins.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0uins.ic b/storage/innobase/include/row0uins.ic
index 54da2e498740..076473e297cb 100644
--- a/storage/innobase/include/row0uins.ic
+++ b/storage/innobase/include/row0uins.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h
index a1bb42035a96..74bf5e6fcbda 100644
--- a/storage/innobase/include/row0umod.h
+++ b/storage/innobase/include/row0umod.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0umod.ic b/storage/innobase/include/row0umod.ic
index 00a8cd86e01b..5e87ad7dd715 100644
--- a/storage/innobase/include/row0umod.ic
+++ b/storage/innobase/include/row0umod.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h
index 3d5b3574afa7..9da869e85e6e 100644
--- a/storage/innobase/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -36,6 +44,16 @@ Created 1/8/1997 Heikki Tuuri
 #include "que0types.h"
 #include "row0types.h"
 
+
+/***************************************************************//**
+Converts an implict lock on the record to explict in case of partial
+rollback.*/
+void
+row_convert_impl_to_expl_if_needed(
+/*===============================*/
+	btr_cur_t* cursor,	/*!< in: cursor to record */
+	undo_node_t* node);	/*!< in: undo node */
+
 /********************************************************************//**
 Creates a row undo node to a query graph.
 @return own: undo node */
@@ -44,7 +62,8 @@ row_undo_node_create(
 /*=================*/
 	trx_t*		trx,	/*!< in: transaction */
 	que_thr_t*	parent,	/*!< in: parent node, i.e., a thr node */
-	mem_heap_t*	heap);	/*!< in: memory heap where created */
+	mem_heap_t*	heap,	/*!< in: memory heap where created */
+	bool		partial_rollback); /*!< in: true if partial rollback */
 /***********************************************************//**
 Looks for the clustered index record when node has the row reference.
 The pcur in node is used in the search. If found, stores the row to node,
@@ -123,6 +142,7 @@ struct undo_node_t{
 	mem_heap_t*	heap;	/*!< memory heap used as auxiliary storage for
 				row; this must be emptied after undo is tried
 				on a row */
+	bool		partial;/*!< true if partial rollback */
 };
 
 
diff --git a/storage/innobase/include/row0undo.ic b/storage/innobase/include/row0undo.ic
index b97ffca590e1..912f3a125f2d 100644
--- a/storage/innobase/include/row0undo.ic
+++ b/storage/innobase/include/row0undo.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h
index 14917985230a..7519509f328a 100644
--- a/storage/innobase/include/row0upd.h
+++ b/storage/innobase/include/row0upd.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -227,6 +235,7 @@ the equal ordering fields. NOTE: we compare the fields as binary strings!
 @param[in]	heap		memory heap from which allocated
 @param[in,out]	mysql_table	NULL, or mysql table object when
 				user thread invokes dml
+@param[out]	error		error number in case of failure
 @return own: update vector of differing fields, excluding roll ptr and
 trx id */
 upd_t*
@@ -238,7 +247,8 @@ row_upd_build_difference_binary(
 	bool		no_sys,
 	trx_t*		trx,
 	mem_heap_t*	heap,
-	TABLE*		mysql_table)
+	TABLE*		mysql_table,
+	dberr_t*	error)
 	MY_ATTRIBUTE((warn_unused_result));
 /***********************************************************//**
 Replaces the new column values stored in the update vector to the index entry
diff --git a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
index ab1dc5c70767..1b2cd18ac6e3 100644
--- a/storage/innobase/include/row0upd.ic
+++ b/storage/innobase/include/row0upd.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h
index 489db305fac6..68ca0f6d081f 100644
--- a/storage/innobase/include/row0vers.h
+++ b/storage/innobase/include/row0vers.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/row0vers.ic b/storage/innobase/include/row0vers.ic
index ef43a55bf702..1cdad28a4eec 100644
--- a/storage/innobase/include/row0vers.ic
+++ b/storage/innobase/include/row0vers.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sess0sess.h b/storage/innobase/include/sess0sess.h
index 3778a45d64f1..ce4b4fc2e241 100644
--- a/storage/innobase/include/sess0sess.h
+++ b/storage/innobase/include/sess0sess.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/srv0conc.h b/storage/innobase/include/srv0conc.h
index 9573c5add847..9ac07ef1d629 100644
--- a/storage/innobase/include/srv0conc.h
+++ b/storage/innobase/include/srv0conc.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -15,13 +15,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h
index 1bd67fd9a176..a071b065e2a4 100644
--- a/storage/innobase/include/srv0mon.h
+++ b/storage/innobase/include/srv0mon.h
@@ -1,16 +1,23 @@
 /***********************************************************************
 
-Copyright (c) 2010, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -677,8 +684,8 @@ monitor counter
 #define	MONITOR_INC_TIME_IN_MICRO_SECS(monitor, value)			\
 	MONITOR_CHECK_DEFINED(value);					\
 	if (MONITOR_IS_ON(monitor)) {					\
-		uintmax_t	old_time = (value);				\
-		value = ut_time_us(NULL);				\
+		uint64_t	old_time = (value);			\
+		value = ut_time_monotonic_us(); 			\
 		MONITOR_VALUE(monitor) += (mon_type_t) (value - old_time);\
 	}
 
diff --git a/storage/innobase/include/srv0mon.ic b/storage/innobase/include/srv0mon.ic
index 0cf76b2ea01b..42d7a797d192 100644
--- a/storage/innobase/include/srv0mon.ic
+++ b/storage/innobase/include/srv0mon.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 45430beaeeab..465a5b3c4697 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, 2009, Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -17,13 +17,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -305,7 +313,7 @@ extern const ulint	srv_buf_pool_min_size;
 extern const ulint	srv_buf_pool_def_size;
 /** Requested buffer pool chunk size. Each buffer pool instance consists
 of one or more chunks. */
-extern ulong		srv_buf_pool_chunk_unit;
+extern ulonglong	srv_buf_pool_chunk_unit;
 /** Requested number of buffer pool instances */
 extern ulong		srv_buf_pool_instances;
 /** Default number of buffer pool instances */
@@ -366,9 +374,9 @@ extern ulong	srv_adaptive_flushing_lwm;
 extern ulong	srv_flushing_avg_loops;
 
 extern ulong	srv_force_recovery;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 extern ulong	srv_force_recovery_crash;
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 extern ulint	srv_fast_shutdown;	/*!< If this is 1, do not do a
 					purge and index buffer merge.
@@ -433,7 +441,7 @@ extern my_bool	srv_purge_view_update_only_debug;
 extern my_bool	srv_master_thread_disabled_debug;
 #endif /* UNIV_DEBUG */
 
-extern ulint	srv_fatal_semaphore_wait_threshold;
+extern ulong	srv_fatal_semaphore_wait_threshold;
 #define SRV_SEMAPHORE_WAIT_EXTENSION	7200
 extern ulint	srv_dml_needed_delay;
 
@@ -945,7 +953,7 @@ struct srv_slot_t{
 	ibool		suspended;		/*!< TRUE if the thread is
 						waiting for the event of this
 						slot */
-	ib_time_t	suspend_time;		/*!< time when the thread was
+	ib_time_monotonic_t	suspend_time;	/*!< time when the thread was
 						suspended. Initialized by
 						lock_wait_table_reserve_slot()
 						for lock wait */
diff --git a/storage/innobase/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic
index 53405c06f973..a33e6fe0a449 100644
--- a/storage/innobase/include/srv0srv.ic
+++ b/storage/innobase/include/srv0srv.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
index e03fdd3e2d8a..29cb7a147d5a 100644
--- a/storage/innobase/include/srv0start.h
+++ b/storage/innobase/include/srv0start.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -33,7 +41,7 @@ Created 10/10/1995 Heikki Tuuri
 // Forward declaration
 struct dict_table_t;
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 # define RECOVERY_CRASH(x) do {} while(0)
 #else
 # define RECOVERY_CRASH(x) do {						\
@@ -44,7 +52,7 @@ struct dict_table_t;
 		_exit(3);						\
 	}								\
 } while (0)
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 /** Log 'spaces' have id's >= this */
 #define SRV_LOG_SPACE_FIRST_ID		0xFFFFFFF0UL
diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index 944242070ff2..461275cd1bef 100644
--- a/storage/innobase/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic
index a15e2176278d..46fd2b8904df 100644
--- a/storage/innobase/include/sync0arr.ic
+++ b/storage/innobase/include/sync0arr.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sync0debug.h b/storage/innobase/include/sync0debug.h
index 6b80c0b25a11..5a911e5e2e7f 100644
--- a/storage/innobase/include/sync0debug.h
+++ b/storage/innobase/include/sync0debug.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -8,13 +8,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h
index 0eaefc7167a5..58ea9fb2a389 100644
--- a/storage/innobase/include/sync0policy.h
+++ b/storage/innobase/include/sync0policy.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sync0policy.ic b/storage/innobase/include/sync0policy.ic
index f7598fe7854c..b9b9d70e836a 100644
--- a/storage/innobase/include/sync0policy.ic
+++ b/storage/innobase/include/sync0policy.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index af41588f3061..4183be2e2892 100644
--- a/storage/innobase/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -163,7 +171,7 @@ unlocking, not the corresponding function. */
 	rw_lock_sx_lock_func((M), (P), __FILE__, __LINE__)
 
 #define rw_lock_sx_lock_nowait(M, P)				\
-	rw_lock_sx_lock_low((M), (P), __FILE__, __LINE__)
+	rw_lock_sx_lock_func_nowait((M), (P), __FILE__, __LINE__)
 
 # ifdef UNIV_DEBUG
 #  define rw_lock_sx_unlock(L)		rw_lock_sx_unlock_func(0, L)
@@ -239,7 +247,7 @@ unlocking, not the corresponding function. */
 	pfs_rw_lock_sx_lock_func((M), (P), __FILE__, __LINE__)
 
 #define rw_lock_sx_lock_nowait(M, P)				\
-	pfs_rw_lock_sx_lock_low((M), (P), __FILE__, __LINE__)
+	pfs_rw_lock_sx_lock_func_nowait((M), (P), __FILE__, __LINE__)
 
 # ifdef UNIV_DEBUG
 #  define rw_lock_sx_unlock(L)		pfs_rw_lock_sx_unlock_func(0, L)
@@ -382,11 +390,13 @@ rw_lock_x_lock_func(
 	const char*	file_name,/*!< in: file name where lock requested */
 	ulint		line);	/*!< in: line where requested */
 /******************************************************************//**
-Low-level function for acquiring an sx lock.
+NOTE! Use the corresponding macro, not directly this function! Lock an
+rw-lock in SX mode for the current thread if the lock can be
+obtained immediately.
 @return FALSE if did not succeed, TRUE if success. */
 ibool
-rw_lock_sx_lock_low(
-/*================*/
+rw_lock_sx_lock_func_nowait(
+/*========================*/
 	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
 	ulint		pass,	/*!< in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
@@ -523,8 +533,9 @@ void
 rw_lock_set_writer_id_and_recursion_flag(
 /*=====================================*/
 	rw_lock_t*	lock,		/*!< in/out: lock to work on */
-	bool		recursive);	/*!< in: true if recursion
+	bool		recursive,	/*!< in: true if recursion
 					allowed */
+	const os_thread_id_t curr_thread);/*!< in: current thread id */
 #ifdef UNIV_DEBUG
 /******************************************************************//**
 Checks if the thread has locked the rw-lock in the specified mode, with
@@ -887,8 +898,8 @@ NOTE! Please use the corresponding macro, not directly
 this function! */
 UNIV_INLINE
 ibool
-pfs_rw_lock_sx_lock_low(
-/*================*/
+pfs_rw_lock_sx_lock_func_nowait(
+/*===========================*/
 	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
 	ulint		pass,	/*!< in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index c48df97adeaa..0ef7ba9a3db2 100644
--- a/storage/innobase/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -335,11 +343,10 @@ void
 rw_lock_set_writer_id_and_recursion_flag(
 /*=====================================*/
 	rw_lock_t*	lock,		/*!< in/out: lock to work on */
-	bool		recursive)	/*!< in: true if recursion
+	bool		recursive,	/*!< in: true if recursion
 					allowed */
+	const os_thread_id_t curr_thread)/*!< in: current thread id */
 {
-	os_thread_id_t	curr_thread	= os_thread_get_curr_id();
-
 #ifdef INNODB_RW_LOCKS_USE_ATOMICS
 	os_thread_id_t	local_thread;
 	ibool		success;
@@ -447,6 +454,8 @@ rw_lock_x_lock_func_nowait(
 	const char*	file_name,/*!< in: file name where lock requested */
 	ulint		line)	/*!< in: line where requested */
 {
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
+
 	ibool success;
 
 #ifdef INNODB_RW_LOCKS_USE_ATOMICS
@@ -463,11 +472,11 @@ rw_lock_x_lock_func_nowait(
 
 #endif
 	if (success) {
-		rw_lock_set_writer_id_and_recursion_flag(lock, true);
+		rw_lock_set_writer_id_and_recursion_flag(lock, true,
+							 curr_thread);
 
 	} else if (lock->recursive
-		   && os_thread_eq(lock->writer_thread,
-				   os_thread_get_curr_id())) {
+		   && os_thread_eq(lock->writer_thread, curr_thread)) {
 		/* Relock: this lock_word modification is safe since no other
 		threads can modify (lock, unlock, or reserve) lock_word while
 		there is an exclusive writer and this is the writer thread. */
@@ -882,8 +891,8 @@ directly this function!
 @return TRUE if success */
 UNIV_INLINE
 ibool
-pfs_rw_lock_sx_lock_low(
-/*====================*/
+pfs_rw_lock_sx_lock_func_nowait(
+/*============================*/
 	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
 	ulint		pass,	/*!< in: pass value; != 0, if the
 				lock will be passed to another
@@ -904,14 +913,14 @@ pfs_rw_lock_sx_lock_low(
 			PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK,
 			file_name, static_cast<uint>(line));
 
-		ret = rw_lock_sx_lock_low(lock, pass, file_name, line);
+		ret = rw_lock_sx_lock_func_nowait(lock, pass, file_name, line);
 
 		if (locker != NULL) {
 			PSI_RWLOCK_CALL(end_rwlock_rdwait)(
 				locker, static_cast<int>(ret));
 		}
 	} else {
-		ret = rw_lock_sx_lock_low(lock, pass, file_name, line);
+		ret = rw_lock_sx_lock_func_nowait(lock, pass, file_name, line);
 	}
 
 	return(ret);
diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
index c3dd885abdfd..7674a970062c 100644
--- a/storage/innobase/include/sync0sync.h
+++ b/storage/innobase/include/sync0sync.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 Copyright (c) 2012, Facebook Inc.
 
@@ -10,13 +10,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -119,6 +127,7 @@ extern mysql_pfs_key_t	thread_mutex_key;
 extern mysql_pfs_key_t  zip_pad_mutex_key;
 extern mysql_pfs_key_t  row_drop_list_mutex_key;
 extern mysql_pfs_key_t	master_key_id_mutex_key;
+extern mysql_pfs_key_t	analyze_index_mutex_key;
 #endif /* UNIV_PFS_MUTEX */
 
 #ifdef UNIV_PFS_RWLOCK
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h
index 09a8741ee1a1..e71e8741252b 100644
--- a/storage/innobase/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -270,6 +278,7 @@ enum latch_level_t {
 	SYNC_TREE_NODE_FROM_HASH,
 	SYNC_TREE_NODE_NEW,
 	SYNC_INDEX_TREE,
+	SYNC_ANALYZE_INDEX,
 
 	SYNC_IBUF_PESS_INSERT_MUTEX,
 	SYNC_IBUF_HEADER,
@@ -390,6 +399,7 @@ enum latch_id_t {
 	LATCH_ID_BUF_CHUNK_MAP_LATCH,
 	LATCH_ID_SYNC_DEBUG_MUTEX,
 	LATCH_ID_MASTER_KEY_ID_MUTEX,
+	LATCH_ID_ANALYZE_INDEX_MUTEX,
 	LATCH_ID_TEST_MUTEX,
 	LATCH_ID_MAX = LATCH_ID_TEST_MUTEX
 };
@@ -683,6 +693,7 @@ class LatchCounter {
 	void iterate(Callback& callback) const
 		UNIV_NOTHROW
 	{
+		m_mutex.enter();
 		Counters::const_iterator	end = m_counters.end();
 
 		for (Counters::const_iterator it = m_counters.begin();
@@ -691,6 +702,7 @@ class LatchCounter {
 
 			callback(*it);
 		}
+		m_mutex.exit();
 	}
 
 	/** Disable the monitoring */
@@ -750,7 +762,7 @@ class LatchCounter {
 	typedef std::vector<Count*> Counters;
 
 	/** Mutex protecting m_counters */
-	Mutex			m_mutex;
+	mutable Mutex		m_mutex;
 
 	/** Counters for the latches */
 	Counters		m_counters;
diff --git a/storage/innobase/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h
index f588d8207430..9735f01bb0c2 100644
--- a/storage/innobase/include/trx0i_s.h
+++ b/storage/innobase/include/trx0i_s.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index 2a9fb86e9b5a..bc169ffaab71 100644
--- a/storage/innobase/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic
index c32651b7a00d..e49759211f66 100644
--- a/storage/innobase/include/trx0purge.ic
+++ b/storage/innobase/include/trx0purge.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 23135a44bd3a..53ec55bfba1d 100644
--- a/storage/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -39,15 +47,18 @@ Created 3/26/1996 Heikki Tuuri
 #ifndef UNIV_HOTBACKUP
 # include "que0types.h"
 
-/***********************************************************************//**
-Copies the undo record to the heap.
-@return own: copy of undo log record */
+/** Copies the undo record to the heap.
+@param[in]	undo_page	Undo Page
+@param[in]	undo_offset     Offset of the undo record in the page
+@param[in]	heap		Heap where undo record is copied
+@return copy of undo log record */
 UNIV_INLINE
 trx_undo_rec_t*
 trx_undo_rec_copy(
-/*==============*/
-	const trx_undo_rec_t*	undo_rec,	/*!< in: undo log record */
-	mem_heap_t*		heap);		/*!< in: heap where copied */
+	const page_t*		undo_page,
+	ulint			undo_offset,
+	mem_heap_t*		heap);
+
 /**********************************************************************//**
 Reads the undo log record type.
 @return record type */
diff --git a/storage/innobase/include/trx0rec.ic b/storage/innobase/include/trx0rec.ic
index 111c05c60aa7..f52f835cbd7a 100644
--- a/storage/innobase/include/trx0rec.ic
+++ b/storage/innobase/include/trx0rec.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -81,21 +89,29 @@ trx_undo_rec_get_undo_no(
 	return(mach_u64_read_much_compressed(ptr));
 }
 
-/***********************************************************************//**
-Copies the undo record to the heap.
-@return own: copy of undo log record */
 UNIV_INLINE
 trx_undo_rec_t*
 trx_undo_rec_copy(
-/*==============*/
-	const trx_undo_rec_t*	undo_rec,	/*!< in: undo log record */
-	mem_heap_t*		heap)		/*!< in: heap where copied */
+	const page_t*	undo_page,
+	ulint		undo_offset,
+	mem_heap_t*	heap)
 {
-	ulint		len;
+	ulint			len;
+	ulint			next_undo_offset;
+	trx_undo_rec_t*		undo_rec = (trx_undo_rec_t*) (undo_page + undo_offset);
+
+	/* Read the offset of next undo record from the current undo record
+	and subtract it from current undo record offset to get the length
+	of record */
+
+	ut_ad(undo_offset < UNIV_PAGE_SIZE);
+	next_undo_offset = mach_read_from_2(undo_rec);
+	ut_a(next_undo_offset > undo_offset);
+
+	len = next_undo_offset - undo_offset;
+	ut_a(len < UNIV_PAGE_SIZE);
 
-	len = mach_read_from_2(undo_rec)
-		- ut_align_offset(undo_rec, UNIV_PAGE_SIZE);
-	ut_ad(len < UNIV_PAGE_SIZE);
 	return((trx_undo_rec_t*) mem_heap_dup(heap, undo_rec, len));
 }
+
 #endif /* !UNIV_HOTBACKUP */
diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
index ec4c7d57e5dd..dcfc83147c49 100644
--- a/storage/innobase/include/trx0roll.h
+++ b/storage/innobase/include/trx0roll.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -199,6 +207,12 @@ trx_roll_savepoints_free(
 	trx_named_savept_t*	savep);	/*!< in: free all savepoints > this one;
 					if this is NULL, free all savepoints
 					of trx */
+/*******************************************************************//**
+Waits for rollback after recovery end. */
+UNIV_INLINE
+void
+trx_rollback_or_clean_wait();
+
 /** Rollback node states */
 enum roll_node_state {
 	ROLL_NODE_NONE = 0,		/*!< Unknown state */
diff --git a/storage/innobase/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic
index b09a1471150f..6a23ef7c77c9 100644
--- a/storage/innobase/include/trx0roll.ic
+++ b/storage/innobase/include/trx0roll.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -60,3 +68,12 @@ trx_roll_check_undo_rec_ordering(
 }
 #endif /* UNIV_DEBUG */
 
+/*******************************************************************//**
+Waits for rollback after recovery end. */
+UNIV_INLINE
+void
+trx_rollback_or_clean_wait() {
+	while (trx_rollback_or_clean_is_active) {
+		os_thread_sleep(100000);
+	}
+}
diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index b9cbd387a627..2fd7502feaaf 100644
--- a/storage/innobase/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -152,6 +160,12 @@ trx_rseg_get_n_undo_tablespaces(
 /*============================*/
 	ulint*		space_ids);	/*!< out: array of space ids of
 					UNDO tablespaces */
+
+/** Reset no-redo rseg slots on disk used by pre-5.7.2 rsegs. All data for
+these rsegs are already purged. This is a deferred action to be done post
+redo log recovery. */
+void trx_rseg_reset_pending();
+
 /* Number of undo log slots in a rollback segment file copy */
 #define TRX_RSEG_N_SLOTS	(UNIV_PAGE_SIZE / 16)
 
diff --git a/storage/innobase/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic
index 9574be67ff86..6b3303dd1ef1 100644
--- a/storage/innobase/include/trx0rseg.ic
+++ b/storage/innobase/include/trx0rseg.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index 205670ae512f..f7fa1f906421 100644
--- a/storage/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -619,7 +627,7 @@ struct trx_sys_t {
 					transactions), protected by
 					rseg->mutex */
 
-	trx_rseg_t*	const pending_purge_rseg_array[TRX_SYS_N_RSEGS];
+	trx_rseg_t*	pending_purge_rseg_array[TRX_SYS_N_RSEGS];
 					/*!< Pointer array to rollback segments
 					between slot-1..slot-srv_tmp_undo_logs
 					that are now replaced by non-redo
diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
index fb67022a7f20..baf26fec6dc1 100644
--- a/storage/innobase/include/trx0sys.ic
+++ b/storage/innobase/include/trx0sys.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 1a5f5b168554..1f8fe7f663cc 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -89,11 +97,11 @@ trx_set_detailed_error_from_file(
 	trx_t*	trx,	/*!< in: transaction struct */
 	FILE*	file);	/*!< in: file to read message from */
 /****************************************************************//**
-Retrieves the error_info field from a trx.
+Retrieves the index causing the error from a trx.
 @return the error info */
 UNIV_INLINE
 const dict_index_t*
-trx_get_error_info(
+trx_get_error_index(
 /*===============*/
 	const trx_t*	trx);	/*!< in: trx object */
 /********************************************************************//**
@@ -370,7 +378,7 @@ trx_print_low(
 			/*!< in: transaction */
 	ulint		max_query_len,
 			/*!< in: max query length to print,
-			or 0 to use the default max length */
+			must be positive */ 
 	ulint		n_rec_locks,
 			/*!< in: lock_number_of_rows_locked(&trx->lock) */
 	ulint		n_trx_locks,
@@ -388,7 +396,7 @@ trx_print_latched(
 	FILE*		f,		/*!< in: output stream */
 	const trx_t*	trx,		/*!< in: transaction */
 	ulint		max_query_len);	/*!< in: max query length to print,
-					or 0 to use the default max length */
+					  must be positive */
 
 /**********************************************************************//**
 Prints info about a transaction.
@@ -399,7 +407,7 @@ trx_print(
 	FILE*		f,		/*!< in: output stream */
 	const trx_t*	trx,		/*!< in: transaction */
 	ulint		max_query_len);	/*!< in: max query length to print,
-					or 0 to use the default max length */
+					 must be positive */
 
 /**********************************************************************//**
 Determine if a transaction is a dictionary operation.
@@ -988,6 +996,13 @@ struct trx_t {
 
 	trx_state_t	state;
 
+	/* If set, this transaction should stop inheriting (GAP)locks.
+	Generally set to true during transaction prepare for RC or lower
+	isolation, if requested. Needed for replication replay where
+	we don't want to get blocked on GAP locks taken for protecting
+	concurrent unique insert or replace operation. */
+	bool		skip_lock_inheritance;
+
 	ReadView*	read_view;	/*!< consistent read view used in the
 					transaction, or NULL if not yet set */
 
@@ -1134,7 +1149,7 @@ struct trx_t {
 					doing the transaction is allowed to
 					set this field: this is NOT protected
 					by any mutex */
-	const dict_index_t*error_info;	/*!< if the error number indicates a
+	const dict_index_t*error_index;	/*!< if the error number indicates a
 					duplicate key error, a pointer to
 					the problematic index is stored here */
 	ulint		error_key_num;	/*!< if the index creation fails to a
diff --git a/storage/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic
index 7120a7aaced1..fca3c40ea86f 100644
--- a/storage/innobase/include/trx0trx.ic
+++ b/storage/innobase/include/trx0trx.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -72,15 +80,15 @@ trx_state_eq(
 }
 
 /****************************************************************//**
-Retrieves the error_info field from a trx.
+Retrieves the index causing the error from a trx.
 @return the error info */
 UNIV_INLINE
 const dict_index_t*
-trx_get_error_info(
+trx_get_error_index(
 /*===============*/
 	const trx_t*	trx)	/*!< in: trx object */
 {
-	return(trx->error_info);
+	return(trx->error_index);
 }
 
 /*******************************************************************//**
diff --git a/storage/innobase/include/trx0types.h b/storage/innobase/include/trx0types.h
index 7024bfa83812..5b3b95e1cbfd 100644
--- a/storage/innobase/include/trx0types.h
+++ b/storage/innobase/include/trx0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h
index f60a01693c40..a646fba2f349 100644
--- a/storage/innobase/include/trx0undo.h
+++ b/storage/innobase/include/trx0undo.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -483,8 +491,6 @@ struct trx_undo_t {
 	undo_no_t	top_undo_no;	/*!< undo number of the latest record */
 	buf_block_t*	guess_block;	/*!< guess for the buffer block where
 					the top page might reside */
-	ulint		withdraw_clock;	/*!< the withdraw clock value of the
-					buffer pool when guess_block was stored */
 	/*-----------------------------*/
 	UT_LIST_NODE_T(trx_undo_t) undo_list;
 					/*!< undo log objects in the rollback
diff --git a/storage/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic
index 6f60d4b53c6e..e88770e00a9d 100644
--- a/storage/innobase/include/trx0undo.ic
+++ b/storage/innobase/include/trx0undo.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/trx0xa.h b/storage/innobase/include/trx0xa.h
index 1bf2dc0e9fc1..be5fc2ddc272 100644
--- a/storage/innobase/include/trx0xa.h
+++ b/storage/innobase/include/trx0xa.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 72ab814609e8..84b6459e8bc1 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/usr0sess.h b/storage/innobase/include/usr0sess.h
index 21c329862592..05739fe2b5d3 100644
--- a/storage/innobase/include/usr0sess.h
+++ b/storage/innobase/include/usr0sess.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic
index 284e59537fee..4f5e8722df4e 100644
--- a/storage/innobase/include/usr0sess.ic
+++ b/storage/innobase/include/usr0sess.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/usr0types.h b/storage/innobase/include/usr0types.h
index 6ba937cacc8a..9d80c7de6137 100644
--- a/storage/innobase/include/usr0types.h
+++ b/storage/innobase/include/usr0types.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h
index bcf1b8e4a2d6..8601c8813a12 100644
--- a/storage/innobase/include/ut0byte.h
+++ b/storage/innobase/include/ut0byte.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
index cb9a4d941040..2e9b17ddf7d7 100644
--- a/storage/innobase/include/ut0byte.ic
+++ b/storage/innobase/include/ut0byte.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0counter.h b/storage/innobase/include/ut0counter.h
index 6b187ecc172c..f10104d33c6a 100644
--- a/storage/innobase/include/ut0counter.h
+++ b/storage/innobase/include/ut0counter.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0crc32.h b/storage/innobase/include/ut0crc32.h
index 04eb9e085269..80ba3a4c1e4c 100644
--- a/storage/innobase/include/ut0crc32.h
+++ b/storage/innobase/include/ut0crc32.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h
index 1a61ed84a380..a4cc3218d14e 100644
--- a/storage/innobase/include/ut0dbg.h
+++ b/storage/innobase/include/ut0dbg.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0list.h b/storage/innobase/include/ut0list.h
index c7334786e2ab..945e091c28a9 100644
--- a/storage/innobase/include/ut0list.h
+++ b/storage/innobase/include/ut0list.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0list.ic b/storage/innobase/include/ut0list.ic
index b14d346a7f70..7b37fc5a743b 100644
--- a/storage/innobase/include/ut0list.ic
+++ b/storage/innobase/include/ut0list.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0lst.h b/storage/innobase/include/ut0lst.h
index ce14225ea349..6920dd2459de 100644
--- a/storage/innobase/include/ut0lst.h
+++ b/storage/innobase/include/ut0lst.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h
index 6d56be4d8201..3cdf272414f8 100644
--- a/storage/innobase/include/ut0mem.h
+++ b/storage/innobase/include/ut0mem.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic
index 224ff98b0f42..474eaa22c437 100644
--- a/storage/innobase/include/ut0mem.ic
+++ b/storage/innobase/include/ut0mem.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0mutex.h b/storage/innobase/include/ut0mutex.h
index 2614e26c7a2b..7e2dfbbf8367 100644
--- a/storage/innobase/include/ut0mutex.h
+++ b/storage/innobase/include/ut0mutex.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0mutex.ic b/storage/innobase/include/ut0mutex.ic
index 04f1ecd2a851..988122aa2b0d 100644
--- a/storage/innobase/include/ut0mutex.ic
+++ b/storage/innobase/include/ut0mutex.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -8,13 +8,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h
index 9663f777a9a0..d02f282d47b8 100644
--- a/storage/innobase/include/ut0new.h
+++ b/storage/innobase/include/ut0new.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -654,8 +662,8 @@ class ut_allocator {
 
 		/* e.g. "btr0cur", derived from "/path/to/btr0cur.cc" */
 		char		keyname[FILENAME_MAX];
-		const size_t	len = ut_basename_noext(file, keyname,
-							sizeof(keyname));
+		const size_t	len MY_ATTRIBUTE((unused)) =
+			ut_basename_noext(file, keyname, sizeof(keyname));
 		/* If sizeof(keyname) was not enough then the output would
 		be truncated, assert that this did not happen. */
 		ut_a(len < sizeof(keyname));
diff --git a/storage/innobase/include/ut0pool.h b/storage/innobase/include/ut0pool.h
index f60608bf6c69..07ca824c7bd0 100644
--- a/storage/innobase/include/ut0pool.h
+++ b/storage/innobase/include/ut0pool.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0rbt.h b/storage/innobase/include/ut0rbt.h
index 5a95dc5c10bf..cb25458a5810 100644
--- a/storage/innobase/include/ut0rbt.h
+++ b/storage/innobase/include/ut0rbt.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
index aa5b4b6745dc..22722a637d87 100644
--- a/storage/innobase/include/ut0rnd.h
+++ b/storage/innobase/include/ut0rnd.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
index 743c02825de4..ad62d9d5a256 100644
--- a/storage/innobase/include/ut0rnd.ic
+++ b/storage/innobase/include/ut0rnd.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h
index 75648b5c317b..0d27df04a408 100644
--- a/storage/innobase/include/ut0sort.h
+++ b/storage/innobase/include/ut0sort.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2009, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0stage.h b/storage/innobase/include/ut0stage.h
index 072ec10c6be2..dc018b197d13 100644
--- a/storage/innobase/include/ut0stage.h
+++ b/storage/innobase/include/ut0stage.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index c73aaf45216c..7fc963377576 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -53,6 +61,18 @@ Created 1/20/1994 Heikki Tuuri
 /** Time stamp */
 typedef time_t	ib_time_t;
 
+/** Time stamp read from the monotonic clock (returned by ut_time_monotonic()).
+ */
+typedef int64_t ib_time_monotonic_t;
+
+/** Number of milliseconds read from the monotonic clock (returned by
+ * ut_time_monotonic_ms()). */
+typedef int64_t ib_time_monotonic_ms_t;
+
+/** Number of microseconds read from the monotonic clock (returned by
+ * ut_time_monotonic_us()). */
+typedef int64_t ib_time_monotonic_us_t;
+
 #ifndef UNIV_HOTBACKUP
 # if defined(HAVE_PAUSE_INSTRUCTION)
    /* According to the gcc info page, asm volatile means that the
@@ -91,11 +111,16 @@ if cond becomes true.
 @param max_wait_us in: maximum delay to wait, in microseconds */
 #define UT_WAIT_FOR(cond, max_wait_us)				\
 do {								\
-	uintmax_t	start_us;					\
-	start_us = ut_time_us(NULL);				\
-	while (!(cond)						\
-	       && ut_time_us(NULL) - start_us < (max_wait_us)) {\
-								\
+	uint64_t	start_us;				\
+	start_us = ut_time_monotonic_us();			\
+	while (!(cond)) {					\
+		ib_time_monotonic_us_t diff;                    \
+		diff = ut_time_monotonic_us() - start_us;       \
+		uint64_t limit = max_wait_us;			\
+		if(limit <= 0 || (diff > 0 &&			\
+			         ((uint64_t)diff > limit))) {	\
+			break;					\
+		}						\
 		os_thread_sleep(2000 /* 2 ms */);		\
 	}							\
 } while (0)
@@ -213,33 +238,18 @@ ut_time(void);
 /*=========*/
 #ifndef UNIV_HOTBACKUP
 /**********************************************************//**
-Returns system time.
-Upon successful completion, the value 0 is returned; otherwise the
-value -1 is returned and the global variable errno is set to indicate the
-error.
-@return 0 on success, -1 otherwise */
-int
-ut_usectime(
-/*========*/
-	ulint*	sec,	/*!< out: seconds since the Epoch */
-	ulint*	ms);	/*!< out: microseconds since the Epoch+*sec */
+Returns the number of microseconds since epoch. Uses the monotonic clock.
+ @return us since epoch or 0 if failed to retrieve */
+ib_time_monotonic_us_t ut_time_monotonic_us(void);
+
+/** Returns the number of milliseconds since epoch. Uses the monotonic clock.
+ @return ms since epoch */
+ib_time_monotonic_ms_t ut_time_monotonic_ms(void);
+
+/** Returns the number of seconds since epoch. Uses the monotonic clock.
+ @return us since epoch or 0 if failed to retrieve */
+ib_time_monotonic_t ut_time_monotonic(void);
 
-/**********************************************************//**
-Returns the number of microseconds since epoch. Similar to
-time(3), the return value is also stored in *tloc, provided
-that tloc is non-NULL.
-@return us since epoch */
-uintmax_t
-ut_time_us(
-/*=======*/
-	uintmax_t*	tloc);	/*!< out: us since epoch, if non-NULL */
-/**********************************************************//**
-Returns the number of milliseconds since some epoch.  The
-value may wrap around.  It should only be used for heuristic
-purposes.
-@return ms since epoch */
-ulint
-ut_time_ms(void);
 /*============*/
 #ifdef _WIN32
 /**********************************************************//**
diff --git a/storage/innobase/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic
index 31e81f7336ea..863f66639720 100644
--- a/storage/innobase/include/ut0ut.ic
+++ b/storage/innobase/include/ut0ut.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0vec.h b/storage/innobase/include/ut0vec.h
index b5c0beddc158..3a77fa92da76 100644
--- a/storage/innobase/include/ut0vec.h
+++ b/storage/innobase/include/ut0vec.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0vec.ic b/storage/innobase/include/ut0vec.ic
index 17f4df579b6d..c1a60dec40b9 100644
--- a/storage/innobase/include/ut0vec.ic
+++ b/storage/innobase/include/ut0vec.ic
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/include/ut0wqueue.h b/storage/innobase/include/ut0wqueue.h
index 6fd039ba2632..7aff5c2d2574 100644
--- a/storage/innobase/include/ut0wqueue.h
+++ b/storage/innobase/include/ut0wqueue.h
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -63,6 +71,14 @@ ib_wqueue_add(
 	mem_heap_t*	heap);		/*!< in: memory heap to use for
 					allocating the list node */
 
+/****************************************************************//**
+read total number of work item to the queue.
+@return total count of work item in the queue */
+uint64_t
+ib_wqueue_get_count(
+/*==========*/
+	ib_wqueue_t *wq);		/*!< in: work queue */
+
 /********************************************************************
 Check if queue is empty. */
 ibool
diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake
index a90fe67f4926..c58df349f6ad 100644
--- a/storage/innobase/innodb.cmake
+++ b/storage/innobase/innodb.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -19,9 +26,8 @@ INCLUDE(CheckFunctionExists)
 INCLUDE(CheckCSourceCompiles)
 INCLUDE(CheckCSourceRuns)
 
-IF(LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
+IF(LZ4_LIBRARY)
   ADD_DEFINITIONS(-DHAVE_LZ4=1)
-  INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
 ENDIF()
 
 # OS tests
diff --git a/storage/innobase/lock/lock0iter.cc b/storage/innobase/lock/lock0iter.cc
index db30bcf1ca63..9b26553e9368 100644
--- a/storage/innobase/lock/lock0iter.cc
+++ b/storage/innobase/lock/lock0iter.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 77f388774a59..528efd49ee79 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -2426,6 +2434,37 @@ lock_rec_cancel(
 	trx_mutex_exit(lock->trx);
 }
 
+/** Grant lock to waiting requests that no longer conflicts
+@param[in]	in_lock		record lock object: grant all non-conflicting
+				locks waiting behind this lock object */
+static
+void
+lock_rec_grant(lock_t* in_lock)
+{
+	lock_t*		lock;
+
+	ulint		space = in_lock->space();
+	ulint		page_no = in_lock->page_number();
+	hash_table_t*	lock_hash = in_lock->hash_table();
+
+	/* Check if waiting locks in the queue can now be granted: grant
+	locks if there are no conflicting locks ahead. Stop at the first
+	X lock that is waiting or has been granted. */
+
+	for (lock = lock_rec_get_first_on_page_addr(lock_hash, space, page_no);
+	     lock != NULL;
+	     lock = lock_rec_get_next_on_page(lock)) {
+
+		if (lock_get_wait(lock)
+		    && !lock_rec_has_to_wait_in_queue(lock)) {
+
+			/* Grant the lock */
+			ut_ad(lock->trx != in_lock->trx);
+			lock_grant(lock);
+		}
+	}
+}
+
 /*************************************************************//**
 Removes a record lock request, waiting or granted, from the queue and
 grants locks to other transactions in the queue if they now are entitled
@@ -2442,7 +2481,6 @@ lock_rec_dequeue_from_page(
 {
 	ulint		space;
 	ulint		page_no;
-	lock_t*		lock;
 	trx_lock_t*	trx_lock;
 	hash_table_t*	lock_hash;
 
@@ -2468,22 +2506,7 @@ lock_rec_dequeue_from_page(
 	MONITOR_INC(MONITOR_RECLOCK_REMOVED);
 	MONITOR_DEC(MONITOR_NUM_RECLOCK);
 
-	/* Check if waiting locks in the queue can now be granted: grant
-	locks if there are no conflicting locks ahead. Stop at the first
-	X lock that is waiting or has been granted. */
-
-	for (lock = lock_rec_get_first_on_page_addr(lock_hash, space, page_no);
-	     lock != NULL;
-	     lock = lock_rec_get_next_on_page(lock)) {
-
-		if (lock_get_wait(lock)
-		    && !lock_rec_has_to_wait_in_queue(lock)) {
-
-			/* Grant the lock */
-			ut_ad(lock->trx != in_lock->trx);
-			lock_grant(lock);
-		}
-	}
+	lock_rec_grant(in_lock);
 }
 
 /*************************************************************//**
@@ -2657,6 +2680,12 @@ lock_rec_inherit_to_gap(
 	     lock != NULL;
 	     lock = lock_rec_get_next(heap_no, lock)) {
 
+		/* Skip inheriting lock if set */
+		if (lock->trx->skip_lock_inheritance) {
+
+			continue;
+		}
+
 		if (!lock_rec_get_insert_intention(lock)
 		    && !((srv_locks_unsafe_for_binlog
 			  || lock->trx->isolation_level
@@ -2695,6 +2724,12 @@ lock_rec_inherit_to_gap_if_gap_lock(
 	     lock != NULL;
 	     lock = lock_rec_get_next(heap_no, lock)) {
 
+		/* Skip inheriting lock if set */
+		if (lock->trx->skip_lock_inheritance) {
+
+			continue;
+		}
+
 		if (!lock_rec_get_insert_intention(lock)
 		    && (heap_no == PAGE_HEAP_NO_SUPREMUM
 			|| !lock_rec_get_rec_not_gap(lock))) {
@@ -4330,6 +4365,103 @@ lock_check_dict_lock(
 }
 #endif /* UNIV_DEBUG */
 
+/** Remove GAP lock from a next key record lock
+@param[in,out]	lock	lock object */
+static
+void
+lock_remove_gap_lock(lock_t* lock)
+{
+	/* Remove lock on supremum */
+	lock_rec_reset_nth_bit(lock, PAGE_HEAP_NO_SUPREMUM);
+
+	/* Remove GAP lock for other records */
+	lock->remove_gap_lock();
+}
+
+/** Release read locks of a transacion. It is called during XA
+prepare to release locks early.
+@param[in,out]	trx		transaction
+@param[in]	only_gap	release only GAP locks */
+void
+lock_trx_release_read_locks(
+	trx_t*		trx,
+	bool		only_gap)
+{
+	lock_t*		lock;
+	lock_t*		next_lock;
+	ulint		count = 0;
+
+	/* Avoid taking lock_sys if trx didn't acquire any lock */
+	if (UT_LIST_GET_LEN(trx->lock.trx_locks) == 0) {
+
+		return;
+	}
+
+	lock_mutex_enter();
+
+	lock = UT_LIST_GET_FIRST(trx->lock.trx_locks);
+
+	while (lock != NULL) {
+
+		next_lock = UT_LIST_GET_NEXT(trx_locks, lock);
+
+		/* Check only for record lock */
+		if (!lock->is_record_lock()
+		    || lock->is_insert_intention()
+		    || lock->is_predicate()) {
+
+			lock = next_lock;
+			continue;
+		}
+
+		/* Release any GAP only lock. */
+		if (lock->is_gap()) {
+
+			lock_rec_dequeue_from_page(lock);
+			lock = next_lock;
+			continue;
+		}
+
+		/* Don't release any non-GAP lock if not asked. */
+		if (lock->is_record_not_gap() && only_gap) {
+
+			lock = next_lock;
+			continue;
+		}
+
+		/* Release Shared Next Key Lock(SH + GAP) if asked for */
+		if (lock->mode() == LOCK_S && !only_gap) {
+
+			lock_rec_dequeue_from_page(lock);
+			lock = next_lock;
+			continue;
+		}
+
+		/* Release GAP lock from Next Key lock */
+		lock_remove_gap_lock(lock);
+
+		/* Grant locks */
+		lock_rec_grant(lock);
+
+		lock = next_lock;
+
+		++count;
+
+		if (count == LOCK_RELEASE_INTERVAL) {
+			/* Release the mutex for a while, so that we
+			do not monopolize it */
+
+			lock_mutex_exit();
+
+			lock_mutex_enter();
+
+			count = 0;
+		}
+	}
+
+	lock_mutex_exit();
+}
+
 /*********************************************************************//**
 Releases transaction locks, and releases possible other transactions waiting
 because of these locks. */
@@ -5043,7 +5175,7 @@ lock_trx_print_wait_and_mvcc_state(
 {
 	fprintf(file, "---");
 
-	trx_print_latched(file, trx, 600);
+	trx_print_latched(file, trx, 3000);
 
 	const ReadView*	read_view = trx_get_read_view(trx);
 
@@ -5991,6 +6123,19 @@ lock_rec_convert_impl_to_expl(
 	}
 }
 
+void
+lock_rec_convert_active_impl_to_expl(
+	const buf_block_t*	block,	/*!< in: buffer block of rec */
+	const rec_t*		rec,	/*!< in: user record on page */
+	dict_index_t*		index,	/*!< in: index of record */
+	const ulint*		offsets,/*!< in: rec_get_offsets(rec, index) */
+	trx_t*			trx,	/*!< in/out: active transaction */
+	ulint			heap_no)/*!< in: rec heap number to lock */
+{
+	trx_reference(trx, true);
+	lock_rec_convert_impl_to_expl_for_trx(block, rec, index, offsets,
+					      trx, heap_no);
+}
 /*********************************************************************//**
 Checks if locks of other transactions prevent an immediate modify (update,
 delete mark, or delete unmark) of a clustered index record. If they do,
diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc
index d26ae0f91e4d..b096d7bee42e 100644
--- a/storage/innobase/lock/lock0prdt.cc
+++ b/storage/innobase/lock/lock0prdt.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc
index cc74d8df19f4..62e851e788ed 100644
--- a/storage/innobase/lock/lock0wait.cc
+++ b/storage/innobase/lock/lock0wait.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -56,7 +64,7 @@ lock_wait_table_print(void)
 			(ulong) slot->in_use,
 			(ulong) slot->suspended,
 			slot->wait_timeout,
-			(ulong) difftime(ut_time(), slot->suspend_time));
+			(ulong) (ut_time_monotonic() - slot->suspend_time));
 	}
 }
 
@@ -153,7 +161,7 @@ lock_wait_table_reserve_slot(
 
 			os_event_reset(slot->event);
 			slot->suspended = TRUE;
-			slot->suspend_time = ut_time();
+			slot->suspend_time = ut_time_monotonic();
 			slot->wait_timeout = wait_timeout;
 
 			if (slot == lock_sys->last_slot) {
@@ -190,13 +198,11 @@ lock_wait_suspend_thread(
 				user OS thread */
 {
 	srv_slot_t*	slot;
-	double		wait_time;
+	int64_t		wait_time;
 	trx_t*		trx;
 	ibool		was_declared_inside_innodb;
-	int64_t		start_time = 0;
-	int64_t		finish_time;
-	ulint		sec;
-	ulint		ms;
+	ib_time_monotonic_ms_t 		start_time = 0;
+	ib_time_monotonic_ms_t 		finish_time;
 	ulong		lock_wait_timeout;
 
 	trx = thr_get_trx(thr);
@@ -243,11 +249,7 @@ lock_wait_suspend_thread(
 		srv_stats.n_lock_wait_count.inc();
 		srv_stats.n_lock_wait_current_count.inc();
 
-		if (ut_usectime(&sec, &ms) == -1) {
-			start_time = -1;
-		} else {
-			start_time = static_cast<int64_t>(sec) * 1000000 + ms;
-		}
+		start_time = ut_time_monotonic_us();
 	}
 
 	/* Wake the lock timeout monitor thread, if it is suspended */
@@ -310,8 +312,12 @@ lock_wait_suspend_thread(
 		thd_wait_begin(trx->mysql_thd, THD_WAIT_TABLE_LOCK);
 	}
 
+	DEBUG_SYNC_C("lock_wait_will_wait");
+
 	os_event_wait(slot->event);
 
+        DEBUG_SYNC_C("lock_wait_has_finished_waiting");
+
 	thd_wait_end(trx->mysql_thd);
 
 	/* After resuming, reacquire the data dictionary latch if
@@ -329,7 +335,7 @@ lock_wait_suspend_thread(
 		row_mysql_freeze_data_dictionary(trx);
 	}
 
-	wait_time = ut_difftime(ut_time(), slot->suspend_time);
+	wait_time = ut_time_monotonic() - slot->suspend_time;
 
 	/* Release the slot for others to use */
 
@@ -337,15 +343,10 @@ lock_wait_suspend_thread(
 
 	if (thr->lock_state == QUE_THR_LOCK_ROW) {
 		ulint	diff_time;
-
-		if (ut_usectime(&sec, &ms) == -1) {
-			finish_time = -1;
-		} else {
-			finish_time = static_cast<int64_t>(sec) * 1000000 + ms;
-		}
+		finish_time = ut_time_monotonic_us();
 
 		diff_time = (finish_time > start_time) ?
-			    (ulint) (finish_time - start_time) : 0;
+			    (uint64_t) (finish_time - start_time) : 0;
 
 		srv_stats.n_lock_wait_current_count.dec();
 		srv_stats.n_lock_wait_time.add(diff_time);
@@ -353,8 +354,7 @@ lock_wait_suspend_thread(
 		/* Only update the variable if we successfully
 		retrieved the start and finish times. See Bug#36819. */
 		if (diff_time > lock_sys->n_lock_max_wait_time
-		    && start_time != -1
-		    && finish_time != -1) {
+		    && start_time != -1) {
 
 			lock_sys->n_lock_max_wait_time = diff_time;
 		}
@@ -427,8 +427,8 @@ lock_wait_check_and_cancel(
 					thread when the wait started */
 {
 	trx_t*		trx;
-	double		wait_time;
-	ib_time_t	suspend_time = slot->suspend_time;
+	int64_t			wait_time;
+	ib_time_monotonic_t	suspend_time = slot->suspend_time;
 
 	ut_ad(lock_wait_mutex_own());
 
@@ -436,13 +436,13 @@ lock_wait_check_and_cancel(
 
 	ut_ad(slot->suspended);
 
-	wait_time = ut_difftime(ut_time(), suspend_time);
+	wait_time = ut_time_monotonic() - suspend_time;
 
 	trx = thr_get_trx(slot->thr);
 
 	if (trx_is_interrupted(trx)
 	    || (slot->wait_timeout < 100000000
-		&& (wait_time > (double) slot->wait_timeout
+		&& (wait_time > (int64_t) slot->wait_timeout
 		   || wait_time < 0))) {
 
 		/* Timeout exceeded or a wrap-around in system
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index 0b5210e6ff81..3818bba3af49 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2009, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -2088,10 +2096,10 @@ logs_empty_and_mark_files_at_shutdown(void)
 
 	ib::info() << "Starting shutdown...";
 
-	while (srv_fast_shutdown == 0 && trx_rollback_or_clean_is_active) {
+	if (srv_fast_shutdown == 0) {
 		/* we should wait until rollback after recovery end
 		for slow shutdown */
-		os_thread_sleep(100000);
+		trx_rollback_or_clean_wait();
 	}
 
 	/* Wait until the master thread and all other operations are idle: our
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 35db4f1c80c6..aa9a0d2dc233 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -164,13 +172,13 @@ mysql_pfs_key_t	recv_writer_thread_key;
 volatile bool	recv_writer_thread_active = false;
 #endif /* !UNIV_HOTBACKUP */
 
-#ifndef	DBUG_OFF
+#ifndef	NDEBUG
 /** Return string name of the redo log record type.
 @param[in]	type	record log record enum
 @return string name of record log record */
 const char*
 get_mlog_string(mlog_id_t type);
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 /* prototypes */
 
@@ -908,8 +916,6 @@ DECLARE_THREAD(recv_writer_thread)(
 		<< os_thread_pf(os_thread_get_curr_id());
 #endif /* UNIV_DEBUG_THREAD_CREATION */
 
-	recv_writer_thread_active = true;
-
 	while (srv_shutdown_state == SRV_SHUTDOWN_NONE) {
 
 		os_thread_sleep(100000);
@@ -3792,7 +3798,7 @@ recv_group_scan_log_recs(
 	bool		last_phase)
 {
 	DBUG_ENTER("recv_group_scan_log_recs");
-	DBUG_ASSERT(!last_phase || recv_sys->mlog_checkpoint_lsn > 0);
+	assert(!last_phase || recv_sys->mlog_checkpoint_lsn > 0);
 
 	mutex_enter(&recv_sys->mutex);
 	recv_sys->len = 0;
@@ -4018,6 +4024,7 @@ recv_init_crash_recovery_spaces(void)
 	if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
 		/* Spawn the background thread to flush dirty pages
 		from the buffer pools. */
+		recv_writer_thread_active = true;
 		os_thread_create(recv_writer_thread, 0, 0);
 	}
 
@@ -4484,7 +4491,6 @@ recv_reset_log_files_for_backup(
 	ulint		i;
 	ulint		log_dir_len;
 	char		name[5000];
-	static const char ib_logfile_basename[] = "ib_logfile";
 
 	log_dir_len = strlen(log_dir);
 	/* full path name of ib_logfile consists of log dir path + basename
@@ -4604,7 +4610,7 @@ recv_dblwr_t::find_page(ulint space_id, ulint page_no)
 	return(result);
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /** Return string name of the redo log record type.
 @param[in]	type	record log record enum
 @return string name of record log record */
@@ -4779,7 +4785,7 @@ get_mlog_string(mlog_id_t type)
 	case MLOG_TRUNCATE:
 		return("MLOG_TRUNCATE");
 	}
-	DBUG_ASSERT(0);
+	assert(0);
 	return(NULL);
 }
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
diff --git a/storage/innobase/mach/mach0data.cc b/storage/innobase/mach/mach0data.cc
index 3512d08cc06b..498a1af75d0e 100644
--- a/storage/innobase/mach/mach0data.cc
+++ b/storage/innobase/mach/mach0data.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/mem/mem0mem.cc b/storage/innobase/mem/mem0mem.cc
index 41292ccf842c..610f0a120adf 100644
--- a/storage/innobase/mem/mem0mem.cc
+++ b/storage/innobase/mem/mem0mem.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/mtr/mtr0log.cc b/storage/innobase/mtr/mtr0log.cc
index b64e7008e5f9..f924191e1ef6 100644
--- a/storage/innobase/mtr/mtr0log.cc
+++ b/storage/innobase/mtr/mtr0log.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc
index bcfba19d5b92..3083d630b3f2 100644
--- a/storage/innobase/mtr/mtr0mtr.cc
+++ b/storage/innobase/mtr/mtr0mtr.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -188,8 +196,8 @@ memo_slot_release(mtr_memo_slot_t* slot)
 
 		block = reinterpret_cast<buf_block_t*>(slot->object);
 
-		buf_block_unfix(block);
 		buf_page_release_latch(block, slot->type);
+		buf_block_unfix(block);
 		break;
 	}
 
@@ -214,91 +222,6 @@ memo_slot_release(mtr_memo_slot_t* slot)
 	slot->object = NULL;
 }
 
-/** Unfix a page, do not release the latches on the page.
-@param slot	memo slot */
-static
-void
-memo_block_unfix(mtr_memo_slot_t* slot)
-{
-	switch (slot->type) {
-	case MTR_MEMO_BUF_FIX:
-	case MTR_MEMO_PAGE_S_FIX:
-	case MTR_MEMO_PAGE_X_FIX:
-	case MTR_MEMO_PAGE_SX_FIX: {
-		buf_block_unfix(reinterpret_cast<buf_block_t*>(slot->object));
-		break;
-	}
-
-	case MTR_MEMO_S_LOCK:
-	case MTR_MEMO_X_LOCK:
-	case MTR_MEMO_SX_LOCK:
-		break;
-#ifdef UNIV_DEBUG
-	default:
-#endif /* UNIV_DEBUG */
-		break;
-	}
-}
-/** Release latches represented by a slot.
-@param slot	memo slot */
-static
-void
-memo_latch_release(mtr_memo_slot_t* slot)
-{
-	switch (slot->type) {
-	case MTR_MEMO_BUF_FIX:
-	case MTR_MEMO_PAGE_S_FIX:
-	case MTR_MEMO_PAGE_SX_FIX:
-	case MTR_MEMO_PAGE_X_FIX: {
-		buf_block_t*	block;
-
-		block = reinterpret_cast<buf_block_t*>(slot->object);
-
-		memo_block_unfix(slot);
-
-		buf_page_release_latch(block, slot->type);
-
-		slot->object = NULL;
-		break;
-	}
-
-	case MTR_MEMO_S_LOCK:
-		rw_lock_s_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
-		slot->object = NULL;
-		break;
-
-	case MTR_MEMO_X_LOCK:
-		rw_lock_x_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
-		slot->object = NULL;
-		break;
-
-	case MTR_MEMO_SX_LOCK:
-		rw_lock_sx_unlock(reinterpret_cast<rw_lock_t*>(slot->object));
-		slot->object = NULL;
-		break;
-
-#ifdef UNIV_DEBUG
-	default:
-		ut_ad(slot->type == MTR_MEMO_MODIFY);
-
-		slot->object = NULL;
-#endif /* UNIV_DEBUG */
-	}
-}
-
-/** Release the latches acquired by the mini-transaction. */
-struct ReleaseLatches {
-
-	/** @return true always. */
-	bool operator()(mtr_memo_slot_t* slot) const
-	{
-		if (slot->object != NULL) {
-			memo_latch_release(slot);
-		}
-
-		return(true);
-	}
-};
 
 /** Release the latches and blocks acquired by the mini-transaction. */
 struct ReleaseAll {
@@ -415,9 +338,6 @@ class mtr_t::Command {
 	/** Release the blocks used in this mini-transaction. */
 	void release_blocks();
 
-	/** Release the latches acquired by the mini-transaction. */
-	void release_latches();
-
 	/** Release both the latches and blocks used in the mini-transaction. */
 	void release_all();
 
@@ -925,19 +845,6 @@ mtr_t::Command::release_all()
 	m_locks_released = 1;
 }
 
-/** Release the latches acquired by this mini-transaction */
-void
-mtr_t::Command::release_latches()
-{
-	ReleaseLatches release;
-	Iterate<ReleaseLatches> iterator(release);
-
-	m_impl->m_memo.for_each_block_in_reverse(iterator);
-
-	/* Note that we have released the latches. */
-	m_locks_released = 1;
-}
-
 /** Release the blocks used in this mini-transaction */
 void
 mtr_t::Command::release_blocks()
@@ -976,7 +883,7 @@ mtr_t::Command::execute()
 		log_flush_order_mutex_exit();
 	}
 
-	release_latches();
+	release_all();
 
 	release_resources();
 }
diff --git a/storage/innobase/os/os0event.cc b/storage/innobase/os/os0event.cc
index ef00fcbc3708..e51bc735fdac 100644
--- a/storage/innobase/os/os0event.cc
+++ b/storage/innobase/os/os0event.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -35,7 +43,10 @@ Created 2012-09-23 Sunny Bains
 #include <list>
 
 /** The number of microsecnds in a second. */
-static const ulint MICROSECS_IN_A_SECOND = 1000000;
+static const uint64_t MICROSECS_IN_A_SECOND = 1000000;
+
+/** The number of nanoseconds in a second. */
+static const uint64_t NANOSECS_IN_A_SECOND = 1000 * MICROSECS_IN_A_SECOND;
 
 #ifdef _WIN32
 /** Native condition variable. */
@@ -54,6 +65,9 @@ struct os_event {
 
 	~os_event() UNIV_NOTHROW;
 
+	friend void os_event_global_init();
+	friend void os_event_global_destroy();
+
 	/**
 	Destroys a condition variable */
 	void destroy() UNIV_NOTHROW
@@ -144,7 +158,7 @@ struct os_event {
 		{
 			int	ret;
 
-			ret = pthread_cond_init(&cond_var, NULL);
+			ret = pthread_cond_init(&cond_var, &cond_attr);
 			ut_a(ret == 0);
 		}
 #endif /* _WIN32 */
@@ -215,6 +229,11 @@ struct os_event {
 		DWORD		time_in_ms
 #endif /* !_WIN32 */
 	);
+#ifndef _WIN32
+	/** Returns absolute time until which we should wait if
+	we wanted to wait for time_in_usec microseconds since now. */
+	struct timespec get_wait_timelimit(ulint time_in_usec);
+#endif /* !_WIN32 */
 
 private:
 	bool			m_set;		/*!< this is true when the
@@ -231,6 +250,18 @@ struct os_event {
 
 	os_cond_t		cond_var;	/*!< condition variable is
 						used in waiting for the event */
+#ifndef _WIN32
+	/** Attributes object passed to pthread_cond_* functions.
+	Defines usage of the monotonic clock if it's available.
+	Initialized once, in the os_event::global_init(), and
+	destroyed in the os_event::global_destroy(). */
+	static pthread_condattr_t cond_attr;
+
+	/** True iff usage of the monotonic clock has been successfuly
+	enabled for the cond_attr object. */
+	static bool cond_attr_has_monotonic_clock;
+#endif /* !_WIN32 */
+	static bool global_initialized;
 
 public:
 	event_iter_t		event_iter;	/*!< For O(1) removal from
@@ -341,6 +372,70 @@ os_event::wait_low(
 	mutex.exit();
 }
 
+#ifndef _WIN32
+
+struct timespec os_event::get_wait_timelimit(ulint time_in_usec) {
+    for (int i = 0;; i++) {
+	ut_a(i < 10);
+	if (cond_attr_has_monotonic_clock) {
+	    struct timespec tp;
+	    if (clock_gettime(CLOCK_MONOTONIC, &tp) == -1) {
+		int errno_clock_gettime = errno;
+
+#ifndef UNIV_NO_ERR_MSGS
+		ib::error() << "clock_gettime() failed: " <<
+			strerror(errno_clock_gettime);
+#endif /* !UNIV_NO_ERR_MSGS */
+
+		os_thread_sleep(100000); /* 0.1 sec */
+		errno = errno_clock_gettime;
+
+	    } else {
+		const uint64_t increased = tp.tv_nsec +
+				       time_in_usec * 1000;
+		if (increased >= NANOSECS_IN_A_SECOND) {
+		  tp.tv_sec += increased / NANOSECS_IN_A_SECOND;
+		  tp.tv_nsec = increased % NANOSECS_IN_A_SECOND;
+		} else {
+		  tp.tv_nsec = increased;
+		}
+		return (tp);
+	      }
+
+	} else {
+	    struct timeval tv;
+	    if (gettimeofday(&tv, NULL) == -1) {
+		const int errno_gettimeofday = errno;
+
+#ifndef UNIV_NO_ERR_MSGS
+		ib::error( ) << "clock_gettime() failed: " <<
+			strerror(errno_gettimeofday);
+#endif /* !UNIV_NO_ERR_MSGS */
+
+		os_thread_sleep(100000); /* 0.1 sec */
+		errno = errno_gettimeofday;
+
+	    } else {
+		uint64_t increased = tv.tv_usec + uint64_t(time_in_usec);
+
+		if (increased >= MICROSECS_IN_A_SECOND) {
+		    tv.tv_sec += increased / MICROSECS_IN_A_SECOND;
+		    tv.tv_usec = increased % MICROSECS_IN_A_SECOND;
+		} else {
+		    tv.tv_usec = increased;
+		}
+
+		struct timespec abstime;
+		abstime.tv_sec = tv.tv_sec;
+		abstime.tv_nsec = tv.tv_usec * 1000;
+		return (abstime);
+	    }
+	}
+    }
+}
+
+#endif /* !_WIN32 */
+
 /**
 Waits for an event object until it is in the signaled state or
 a timeout is exceeded.
@@ -367,26 +462,7 @@ os_event::wait_time_low(
 	struct timespec	abstime;
 
 	if (time_in_usec != OS_SYNC_INFINITE_TIME) {
-		struct timeval	tv;
-		int		ret;
-		ulint		sec;
-		ulint		usec;
-
-		ret = ut_usectime(&sec, &usec);
-		ut_a(ret == 0);
-
-		tv.tv_sec = sec;
-		tv.tv_usec = usec;
-
-		tv.tv_usec += time_in_usec;
-
-		if ((ulint) tv.tv_usec >= MICROSECS_IN_A_SECOND) {
-			tv.tv_sec += tv.tv_usec / MICROSECS_IN_A_SECOND;
-			tv.tv_usec %= MICROSECS_IN_A_SECOND;
-		}
-
-		abstime.tv_sec  = tv.tv_sec;
-		abstime.tv_nsec = tv.tv_usec * 1000;
+		abstime = os_event::get_wait_timelimit(time_in_usec);
 	} else {
 		abstime.tv_nsec = 999999999;
 		abstime.tv_sec = (time_t) ULINT_MAX;
@@ -424,6 +500,7 @@ os_event::wait_time_low(
 /** Constructor */
 os_event::os_event(const char* name) UNIV_NOTHROW
 {
+	ut_a(global_initialized);
 	init();
 
 	m_set = false;
@@ -547,3 +624,48 @@ os_event_destroy(
 		event = NULL;
 	}
 }
+
+#ifndef _WIN32
+pthread_condattr_t os_event::cond_attr;
+bool os_event::cond_attr_has_monotonic_clock (false);
+#endif /* !_WIN32 */
+bool os_event::global_initialized (false);
+
+
+void os_event_global_init(void) {
+#ifndef _WIN32
+	int ret = pthread_condattr_init(&os_event::cond_attr);
+	ut_a(ret == 0);
+
+#ifdef UNIV_LINUX /* MacOS does not have support. */
+#ifdef HAVE_CLOCK_GETTIME
+	ret = pthread_condattr_setclock(&os_event::cond_attr, CLOCK_MONOTONIC);
+	if (ret == 0) {
+	  os_event::cond_attr_has_monotonic_clock = true;
+  }
+#endif /* HAVE_CLOCK_GETTIME */
+
+#ifndef UNIV_NO_ERR_MSGS
+  if (!os_event::cond_attr_has_monotonic_clock) {
+    ib::warn() << "CLOCK_MONOTONIC is unsupported, so do not change the" <<
+	          " system time when MySQL is running !";
+  }
+#endif /* !UNIV_NO_ERR_MSGS */
+
+#endif /* UNIV_LINUX */
+#endif /* !_WIN32 */
+	os_event::global_initialized = true;
+}
+
+void os_event_global_destroy(void) {
+	ut_a(os_event::global_initialized);
+#ifndef _WIN32
+	os_event::cond_attr_has_monotonic_clock = false;
+#ifdef UNIV_DEBUG
+	const int ret =
+#endif /* UNIV_DEBUG */
+		pthread_condattr_destroy(&os_event::cond_attr);
+	ut_ad(ret == 0);
+#endif /* !_WIN32 */
+	os_event::global_initialized = false;
+}
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 166aa80acfee..3642bd124dda 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2009, Percona Inc.
 
 Portions of this file contain modifications contributed and copyrighted
@@ -10,14 +10,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -43,6 +50,7 @@ Created 10/21/1995 Heikki Tuuri
 #include "os0file.ic"
 #endif
 
+#include "page0page.h"
 #include "srv0srv.h"
 #include "srv0start.h"
 #include "fil0fil.h"
@@ -209,6 +217,8 @@ mysql_pfs_key_t  innodb_temp_file_key;
 
 /** The asynchronous I/O context */
 struct Slot {
+	Slot() { memset(this, 0, sizeof(*this)); }
+
 	/** index of the slot in the aio array */
 	uint16_t		pos;
 
@@ -216,7 +226,7 @@ struct Slot {
 	bool			is_reserved;
 
 	/** time when reserved */
-	time_t			reservation_time;
+	ib_time_monotonic_t	reservation_time;
 
 	/** buffer used in i/o */
 	byte*			buf;
@@ -758,7 +768,7 @@ ulint	os_n_pending_writes = 0;
 /** Number of pending read operations */
 ulint	os_n_pending_reads = 0;
 
-time_t	os_last_printout;
+ib_time_monotonic_t	os_last_printout;
 bool	os_has_said_disk_full	= false;
 
 /** Default Zip compression level */
@@ -825,7 +835,7 @@ os_file_io_complete(
 	byte*		buf,
 	byte*		scratch,
 	ulint		src_len,
-	ulint		offset,
+	os_offset_t	offset,
 	ulint		len);
 
 /** Does simulated AIO. This function should be called by an i/o-handler
@@ -969,8 +979,7 @@ class AIOHandler {
 		return(os_file_io_complete(
 				slot->type, slot->file.m_file, slot->buf,
 				NULL, slot->original_len,
-				static_cast<ulint>(slot->offset),
-				slot->len));
+				slot->offset, slot->len));
 	}
 
 private:
@@ -1023,7 +1032,7 @@ class AIOHandler {
 
 		version = mach_read_from_1(src + FIL_PAGE_VERSION);
 
-		ut_a(version == 1);
+		ut_a(Compression::is_valid_page_version(version));
 
 		/* Includes the page header size too */
 		ulint		size = compressed_page_size(slot);
@@ -1112,7 +1121,7 @@ os_file_compressed_page_size(const byte* buf)
 
 	if (type == FIL_PAGE_COMPRESSED) {
 		ulint	version = mach_read_from_1(buf + FIL_PAGE_VERSION);
-		ut_a(version == 1);
+		ut_a(Compression::is_valid_page_version(version));
 		return(mach_read_from_2(buf + FIL_PAGE_COMPRESS_SIZE_V1));
 	}
 
@@ -1131,7 +1140,7 @@ os_file_original_page_size(const byte* buf)
 	if (type == FIL_PAGE_COMPRESSED) {
 
 		ulint	version = mach_read_from_1(buf + FIL_PAGE_VERSION);
-		ut_a(version == 1);
+		ut_a(Compression::is_valid_page_version(version));
 
 		return(mach_read_from_2(buf + FIL_PAGE_ORIGINAL_SIZE_V1));
 	}
@@ -1417,7 +1426,7 @@ os_file_compress_page(
 	/* Add compression control information. Required for decompressing. */
 	mach_write_to_2(dst + FIL_PAGE_TYPE, FIL_PAGE_COMPRESSED);
 
-	mach_write_to_1(dst + FIL_PAGE_VERSION, 1);
+	mach_write_to_1(dst + FIL_PAGE_VERSION, Compression::FIL_PAGE_VERSION_2);
 
 	mach_write_to_1(dst + FIL_PAGE_ALGORITHM_V1, compression.m_type);
 
@@ -1690,7 +1699,7 @@ os_file_io_complete(
 	byte*		buf,
 	byte*		scratch,
 	ulint		src_len,
-	ulint		offset,
+	os_offset_t	offset,
 	ulint		len)
 {
 	/* We never compress/decompress the first page */
@@ -1706,6 +1715,7 @@ os_file_io_complete(
 		Encryption	encryption(type.encryption_algorithm());
 
 		ut_ad(!type.is_log());
+		ut_ad(!type.is_row_log());
 
 		ret = encryption.decrypt(type, buf, src_len, scratch, len);
 		if (ret == DB_SUCCESS) {
@@ -1933,6 +1943,12 @@ os_file_get_parent_dir(
 		return(NULL);
 	}
 
+	if (last_slash - path < 0) {
+		/* Sanity check, it prevents gcc from trying to handle this case which
+		 * results in warnings for some optimized builds */
+		return (NULL);
+	}
+
 	/* Non-trivial directory component */
 
 	return(mem_strdupl(path, last_slash - path));
@@ -2086,6 +2102,8 @@ os_file_compress_page(
 		old_compressed_len = ut_calc_align(
 			old_compressed_len + FIL_PAGE_DATA,
 			type.block_size());
+	} else {
+		old_compressed_len = *n;
 	}
 
 	byte*	compressed_page;
@@ -2343,6 +2361,9 @@ LinuxAIOHandler::resubmit(Slot* slot)
 	slot->n_bytes = 0;
 	slot->io_already_done = false;
 
+	/* make sure that slot->offset fits in off_t */
+	ut_ad(sizeof(off_t) >= sizeof(os_offset_t));
+
 	struct iocb*	iocb = &slot->control;
 	if (slot->type.is_read()) {
 		io_prep_pread(
@@ -2350,7 +2371,7 @@ LinuxAIOHandler::resubmit(Slot* slot)
 			slot->file.m_file,
 			slot->ptr,
 			slot->len,
-			static_cast<off_t>(slot->offset));
+			slot->offset);
 
 	} else {
 
@@ -2361,7 +2382,7 @@ LinuxAIOHandler::resubmit(Slot* slot)
 			slot->file.m_file,
 			slot->ptr,
 			slot->len,
-			static_cast<off_t>(slot->offset));
+			slot->offset);
 	}
 
 	iocb->data = slot;
@@ -2537,10 +2558,24 @@ LinuxAIOHandler::collect()
 			will be done in the calling function. */
 			m_array->acquire();
 
-			slot->ret = events[i].res2;
+			/* events[i].res2 should always be ZERO */
+			ut_ad(events[i].res2 == 0);
 			slot->io_already_done = true;
-			slot->n_bytes = events[i].res;
 
+			/*Even though events[i].res is an unsigned number
+			in libaio, it is used to return a negative value
+			(negated errno value) to indicate error and a positive
+			value to indicate number of bytes read or written. */
+
+			if (events[i].res > slot->len) {
+				/* failure */
+				slot->n_bytes = 0;
+				slot->ret = events[i].res;
+			} else {
+				/* success */
+				slot->n_bytes = events[i].res;
+				slot->ret = 0;
+			}
 			m_array->release();
 		}
 
@@ -3075,20 +3110,8 @@ os_file_fsync_posix(
 
 		case EIO:
 
-			++failures;
-			ut_a(failures < 1000);
-
-			if (!(failures % 100)) {
-
-				ib::warn()
-					<< "fsync(): "
-					<< "An error occurred during "
-					<< "synchronization,"
-					<< " retrying";
-			}
-
-			/* 0.2 sec */
-			os_thread_sleep(200000);
+                        ib::fatal()
+				<< "fsync() returned EIO, aborting.";
 			break;
 
 		case EINTR:
@@ -3128,7 +3151,8 @@ os_file_status_posix(
 	if (!ret) {
 		/* file exists, everything OK */
 
-	} else if (errno == ENOENT || errno == ENOTDIR) {
+	} else if (errno == ENOENT || errno == ENOTDIR
+		   || errno == ENAMETOOLONG) {
 		/* file does not exist */
 		return(true);
 
@@ -4158,7 +4182,8 @@ os_file_status_win32(
 	if (!ret) {
 		/* file exists, everything OK */
 
-	} else if (errno == ENOENT || errno == ENOTDIR) {
+	} else if (errno == ENOENT || errno == ENOTDIR
+		  || errno == ENAMETOOLONG) {
 		/* file does not exist */
 		return(true);
 
@@ -5449,8 +5474,7 @@ os_file_io(
 				*err = os_file_io_complete(
 					type, file,
 					reinterpret_cast<byte*>(buf),
-					NULL, original_n,
-					static_cast<ulint>(offset), n);
+					NULL, original_n, offset, n);
 			} else {
 
 				*err = DB_SUCCESS;
@@ -5561,7 +5585,7 @@ os_file_write_page(
 	if ((ulint) n_bytes != n && !os_has_said_disk_full) {
 
 		ib::error()
-			<< "Write to file " << name << "failed at offset "
+			<< "Write to file " << name << " failed at offset "
 			<< offset << ", " << n
 			<< " bytes should have been written,"
 			" only " << n_bytes << " were written."
@@ -6301,7 +6325,7 @@ AIO::AIO(
 	m_not_full = os_event_create("aio_not_full");
 	m_is_empty = os_event_create("aio_is_empty");
 
-	memset(&m_slots[0], 0x0, sizeof(m_slots[0]) * m_slots.size());
+	std::uninitialized_fill(m_slots.begin(), m_slots.end(), Slot());
 #ifdef LINUX_NATIVE_AIO
 	memset(&m_events[0], 0x0, sizeof(m_events[0]) * m_events.size());
 #endif /* LINUX_NATIVE_AIO */
@@ -6585,7 +6609,7 @@ AIO::start(
 		os_aio_segment_wait_events[i] = os_event_create(0);
 	}
 
-	os_last_printout = ut_time();
+	os_last_printout = ut_time_monotonic();
 
 	return(true);
 }
@@ -6961,7 +6985,7 @@ AIO::reserve_slot(
 	}
 
 	slot->is_reserved = true;
-	slot->reservation_time = ut_time();
+	slot->reservation_time = ut_time_monotonic();
 	slot->m1       = m1;
 	slot->m2       = m2;
 	slot->file     = file;
@@ -7003,7 +7027,7 @@ AIO::reserve_slot(
 #else
 		slot->len = static_cast<ulint>(compressed_len);
 #endif /* _WIN32 */
-		slot->skip_punch_hole = type.punch_hole();
+		slot->skip_punch_hole = !type.punch_hole();
 
 		acquire();
 	}
@@ -7871,9 +7895,10 @@ class SimulatedAIOHandler {
 	@param[in]	slot		The slot to check */
 	void select_if_older(Slot* slot)
 	{
-		ulint	age;
+		int64_t time_diff = ut_time_monotonic() -
+					slot->reservation_time;
 
-		age = (ulint) difftime(ut_time(), slot->reservation_time);
+		const uint64_t age = time_diff > 0 ? (uint64_t) time_diff : 0;
 
 		if ((age >= 2 && age > m_oldest)
 		    || (age >= 2
@@ -8252,9 +8277,9 @@ AIO::print_all(FILE* file)
 void
 os_aio_print(FILE*	file)
 {
-	time_t		current_time;
-	double		time_elapsed;
-	double		avg_bytes_read;
+	ib_time_monotonic_t 		current_time;
+	double	 			time_elapsed;
+	double				avg_bytes_read;
 
 	for (ulint i = 0; i < srv_n_file_io_threads; ++i) {
 		fprintf(file, "I/O thread %lu state: %s (%s)",
@@ -8276,8 +8301,8 @@ os_aio_print(FILE*	file)
 	AIO::print_all(file);
 
 	putc('\n', file);
-	current_time = ut_time();
-	time_elapsed = 0.001 + difftime(current_time, os_last_printout);
+	current_time = ut_time_monotonic();
+	time_elapsed = 0.001 + (current_time - os_last_printout);
 
 	fprintf(file,
 		"Pending flushes (fsync) log: " ULINTPF "; "
@@ -8341,7 +8366,7 @@ os_aio_refresh_stats()
 
 	os_bytes_read_since_printout = 0;
 
-	os_last_printout = ut_time();
+	os_last_printout = ut_time_monotonic();
 }
 
 /** Checks that all slots in the system have been freed, that is, there are
@@ -8467,6 +8492,9 @@ os_free_block(Block* block)
 
 #endif /* !UNIV_INNOCHECKSUM */
 
+/** Minimum length needed for encryption */
+const unsigned int MIN_ENCRYPTION_LEN = 2 * MY_AES_BLOCK_SIZE + FIL_PAGE_DATA;
+
 /**
 @param[in]      type            The compression type
 @return the string representation */
@@ -8511,6 +8539,17 @@ Compression::is_compressed_page(const byte* page)
 	return(mach_read_from_2(page + FIL_PAGE_TYPE) == FIL_PAGE_COMPRESSED);
 }
 
+bool
+Compression::is_compressed_encrypted_page(const byte *page) {
+	return (mach_read_from_2(page + FIL_PAGE_TYPE) ==
+		FIL_PAGE_COMPRESSED_AND_ENCRYPTED);
+}
+
+bool
+Compression::is_valid_page_version(uint8_t version) {
+	return (version == FIL_PAGE_VERSION_1 || version == FIL_PAGE_VERSION_2);
+}
+
 /** Deserizlise the page header compression meta-data
 @param[in]	page		Pointer to the page header
 @param[out]	control		Deserialised data */
@@ -8519,7 +8558,7 @@ Compression::deserialize_header(
 	const byte*		page,
 	Compression::meta_t*	control)
 {
-	ut_ad(is_compressed_page(page));
+	ut_ad(is_compressed_page(page) || is_compressed_encrypted_page(page));
 
 	control->m_version = static_cast<uint8_t>(
 		mach_read_from_1(page + FIL_PAGE_VERSION));
@@ -8563,9 +8602,9 @@ Compression::deserialize(
 
 	byte*	ptr = src + FIL_PAGE_DATA;
 
-	ut_ad(header.m_version == 1);
+	ut_ad(is_valid_page_version(header.m_version));
 
-	if (header.m_version != 1
+	if (!is_valid_page_version(header.m_version)
 	    || header.m_original_size < UNIV_PAGE_SIZE_MIN - (FIL_PAGE_DATA + 8)
 	    || header.m_original_size > UNIV_PAGE_SIZE_MAX - FIL_PAGE_DATA
 	    || dst_len < header.m_original_size + FIL_PAGE_DATA) {
@@ -8621,29 +8660,11 @@ Compression::deserialize(
 
 	case Compression::LZ4:
 
-		if (dblwr_recover) {
-
-			ret = LZ4_decompress_safe(
-				reinterpret_cast<char*>(ptr),
-				reinterpret_cast<char*>(dst),
-				header.m_compressed_size,
-				header.m_original_size);
-
-		} else {
-
-			/* This can potentially read beyond the input
-			buffer if the data is malformed. According to
-			the LZ4 documentation it is a little faster
-			than the above function. When recovering from
-			the double write buffer we can afford to us the
-			slower function above. */
-
-			ret = LZ4_decompress_fast(
-				reinterpret_cast<char*>(ptr),
-				reinterpret_cast<char*>(dst),
-				header.m_original_size);
-		}
-
+                ret = LZ4_decompress_safe(
+                        reinterpret_cast<char*>(ptr),
+                        reinterpret_cast<char*>(dst),
+                        header.m_compressed_size,
+                        header.m_original_size);
 		if (ret < 0) {
 
 			if (block != NULL) {
@@ -8973,13 +8994,8 @@ Encryption::encrypt(
 	byte*			dst,
 	ulint*			dst_len)
 {
-	ulint		len = 0;
-	ulint		page_type = mach_read_from_2(src + FIL_PAGE_TYPE);
-	ulint		data_len;
-	ulint		main_len;
-	ulint		remain_len;
-	byte		remain_buf[MY_AES_BLOCK_SIZE * 2];
-
+	ut_ad(m_type != NONE);
+	ut_ad(!type.is_log());
 #ifdef UNIV_ENCRYPT_DEBUG
 	ulint space_id =
 		mach_read_from_4(src + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
@@ -8990,16 +9006,23 @@ Encryption::encrypt(
 #endif
 
 	/* Shouldn't encrypte an already encrypted page. */
-	ut_ad(page_type != FIL_PAGE_ENCRYPTED
-	      && page_type != FIL_PAGE_COMPRESSED_AND_ENCRYPTED
-	      && page_type != FIL_PAGE_ENCRYPTED_RTREE);
+	ut_ad(!is_encrypted_page(src));
 
-	ut_ad(m_type != Encryption::NONE);
+	const uint16_t page_type = mach_read_from_2(src + FIL_PAGE_TYPE);
 
 	/* This is data size which need to encrypt. */
-	data_len = src_len - FIL_PAGE_DATA;
-	main_len = (data_len / MY_AES_BLOCK_SIZE) * MY_AES_BLOCK_SIZE;
-	remain_len = data_len - main_len;
+	ulint src_enc_len = src_len;
+
+	/* In FIL_PAGE_VERSION_2, we encrypt the actual compressed data length. */
+	if (page_type == FIL_PAGE_COMPRESSED) {
+		src_enc_len = mach_read_from_2(src + FIL_PAGE_COMPRESS_SIZE_V1) +
+					       FIL_PAGE_DATA;
+		/* Extend src_enc_len if needed */
+		if (src_enc_len < MIN_ENCRYPTION_LEN) {
+			src_enc_len = MIN_ENCRYPTION_LEN;
+		}
+		ut_a(src_enc_len <= src_len);
+	}
 
 	/* Only encrypt the data + trailer, leave the header alone */
 
@@ -9008,19 +9031,29 @@ Encryption::encrypt(
 		ut_error;
 
 	case Encryption::AES: {
-		lint			elen;
-
 		ut_ad(m_klen == ENCRYPTION_KEY_LEN);
 
-		elen = my_aes_encrypt(
-			src + FIL_PAGE_DATA,
-			static_cast<uint32>(main_len),
-			dst + FIL_PAGE_DATA,
-			reinterpret_cast<unsigned char*>(m_key),
-			static_cast<uint32>(m_klen),
-			my_aes_256_cbc,
-			reinterpret_cast<unsigned char*>(m_iv),
-			false);
+		/* Total length of the data to encrypt. */
+		const ulint data_len = src_enc_len - FIL_PAGE_DATA;
+
+		/* Server encryption functions expect input data to be in
+		multiples of MY_AES_BLOCK SIZE. Therefore we encrypt the
+		overlapping data of the chunk_len and trailer_len twice.
+		First we encrypt the bigger chunk of data then we do the
+		trailer. The trailer encryption block starts at
+		2 * MY_AES_BLOCK_SIZE bytes offset from the end of the enc_len.
+		During decryption we do the reverse of the above process. */
+		ut_ad(data_len >= 2 * MY_AES_BLOCK_SIZE);
+
+		const ulint chunk_len =
+			 (data_len / MY_AES_BLOCK_SIZE) * MY_AES_BLOCK_SIZE;
+		const ulint remain_len = data_len - chunk_len;
+
+		lint elen = my_aes_encrypt(
+			src + FIL_PAGE_DATA, static_cast<uint32>(chunk_len),
+			dst + FIL_PAGE_DATA, reinterpret_cast<byte *>(m_key),
+			static_cast<uint32>(m_klen), my_aes_256_cbc,
+			reinterpret_cast<byte *>(m_iv), false);
 
 		if (elen == MY_AES_BAD_DATA) {
 			ulint	page_no =mach_read_from_4(
@@ -9042,27 +9075,25 @@ Encryption::encrypt(
 			return(src);
 		}
 
-		len = static_cast<ulint>(elen);
-		ut_ad(len == main_len);
-
-		/* Copy remain bytes and page tailer. */
-		memcpy(dst + FIL_PAGE_DATA + len,
-		       src + FIL_PAGE_DATA + len,
-		       src_len - FIL_PAGE_DATA - len);
+		const ulint len = static_cast<ulint>(elen);
+		ut_ad(len == chunk_len);
 
-		/* Encrypt the remain bytes. */
+		/* Encrypt the trailing bytes. */
 		if (remain_len != 0) {
-			remain_len = MY_AES_BLOCK_SIZE * 2;
+			/* Copy remaining bytes and page tailer. */
+			memcpy(dst + FIL_PAGE_DATA + len,
+			       src + FIL_PAGE_DATA + len,
+			       remain_len);
+
+			const ulint trailer_len = MY_AES_BLOCK_SIZE * 2;
+			byte buf[trailer_len];
 
 			elen = my_aes_encrypt(
-				dst + FIL_PAGE_DATA + data_len - remain_len,
-				static_cast<uint32>(remain_len),
-				remain_buf,
+				dst + FIL_PAGE_DATA + data_len - trailer_len,
+				static_cast<uint32>(trailer_len), buf,
 				reinterpret_cast<unsigned char*>(m_key),
-				static_cast<uint32>(m_klen),
-				my_aes_256_cbc,
-				reinterpret_cast<unsigned char*>(m_iv),
-				false);
+				static_cast<uint32>(m_klen), my_aes_256_cbc,
+				reinterpret_cast<byte *>(m_iv), false);
 
 			if (elen == MY_AES_BAD_DATA) {
 				ulint	page_no =mach_read_from_4(
@@ -9084,8 +9115,10 @@ Encryption::encrypt(
 				return(src);
 			}
 
-			memcpy(dst + FIL_PAGE_DATA + data_len - remain_len,
-			       remain_buf, remain_len);
+			ut_a(static_cast<ulint>(elen) == trailer_len);
+
+			memcpy(dst + FIL_PAGE_DATA + data_len - trailer_len,
+			       buf, trailer_len);
 		}
 
 
@@ -9110,8 +9143,7 @@ Encryption::encrypt(
 			     dst+FIL_PAGE_TYPE+2,
 			     FIL_PAGE_DATA-FIL_PAGE_TYPE-2) == 0);
 	} else if (page_type == FIL_PAGE_RTREE) {
-		/* If the page is R-tree page, we need to save original
-		type. */
+		/* If the page is R-tree page, we need to save original type. */
 		mach_write_to_2(dst + FIL_PAGE_TYPE, FIL_PAGE_ENCRYPTED_RTREE);
 	} else{
 		mach_write_to_2(dst + FIL_PAGE_TYPE, FIL_PAGE_ENCRYPTED);
@@ -9140,8 +9172,13 @@ Encryption::encrypt(
 	fprintf(stderr, "Encrypted page:%lu.%lu\n", space_id, page_no);
 #endif
 #endif
-	*dst_len = src_len;
 
+	/* Add padding 0 for unused portion */
+	if (src_len > src_enc_len) {
+		memset(dst + src_enc_len, 0, src_len - src_enc_len);
+	}
+
+	*dst_len = src_len;
 
 	return(dst);
 }
@@ -9184,7 +9221,16 @@ Encryption::decrypt(
 			mach_read_from_2(src + FIL_PAGE_COMPRESS_SIZE_V1))
 			+ FIL_PAGE_DATA;
 #ifndef UNIV_INNOCHECKSUM
-		src_len = ut_calc_align(src_len, type.block_size());
+		Compression::meta_t header;
+		Compression::deserialize_header(src, &header);
+		if (header.m_version == Compression::FIL_PAGE_VERSION_1) {
+			src_len = ut_calc_align(src_len, type.block_size());
+		} else {
+			/* Extend src_len if needed */
+			if (src_len < MIN_ENCRYPTION_LEN) {
+				src_len = MIN_ENCRYPTION_LEN;
+			}
+		}
 #endif
 	}
 #ifdef UNIV_ENCRYPT_DEBUG
diff --git a/storage/innobase/os/os0proc.cc b/storage/innobase/os/os0proc.cc
index ac4457194578..207a848d7780 100644
--- a/storage/innobase/os/os0proc.cc
+++ b/storage/innobase/os/os0proc.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/os/os0thread.cc b/storage/innobase/os/os0thread.cc
index 1a9f129abc5e..964bc5470b55 100644
--- a/storage/innobase/os/os0thread.cc
+++ b/storage/innobase/os/os0thread.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc
index d3f39b649a9e..2d29b23c3236 100644
--- a/storage/innobase/page/page0cur.cc
+++ b/storage/innobase/page/page0cur.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -52,7 +60,7 @@ number between 0 and 2^64-1 inclusive. The formula and the constants
 being used are:
 X[n+1] = (a * X[n] + c) mod m
 where:
-X[0] = ut_time_us(NULL)
+X[0] = ut_time_monotonic_us()
 a = 1103515245 (3^5 * 5 * 7 * 129749)
 c = 12345 (3 * 5 * 823)
 m = 18446744073709551616 (2^64)
@@ -69,7 +77,7 @@ page_cur_lcg_prng(void)
 	static ibool		initialized = FALSE;
 
 	if (!initialized) {
-		lcg_current = (ib_uint64_t) ut_time_us(NULL);
+		lcg_current = (ib_uint64_t) ut_time_monotonic_us();
 		initialized = TRUE;
 	}
 
diff --git a/storage/innobase/page/page0page.cc b/storage/innobase/page/page0page.cc
index 1f283e3d16de..72f5f1652504 100644
--- a/storage/innobase/page/page0page.cc
+++ b/storage/innobase/page/page0page.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -847,9 +855,9 @@ page_copy_rec_list_start(
 		if (!page_zip_compress(new_page_zip, new_page, index,
 				       page_zip_level, NULL, mtr)) {
 			ulint	ret_pos;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 zip_reorganize:
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 			/* Before trying to reorganize the page,
 			store the number of preceding records on the page. */
 			ret_pos = page_rec_get_n_recs_before(ret);
@@ -2326,6 +2334,21 @@ page_simple_validate_new(
 	return(ret);
 }
 
+/***************************************************************//**
+This function checks if the page in which record is present is a
+non-leaf node of a spatial index.
+param[in]	rec	Btree record
+param[in]	index	index
+@return TRUE if ok */
+bool
+page_is_spatial_non_leaf(
+/*====================*/
+	const rec_t*	rec,
+	dict_index_t*	index)
+{
+     return (dict_index_is_spatial(index) && !page_is_leaf(page_align(rec)));
+}
+
 /***************************************************************//**
 This function checks the consistency of an index page.
 @return TRUE if ok */
@@ -2447,7 +2470,8 @@ page_validate(
 		    && !page_rec_is_supremum(rec)) {
 
 			int	ret = cmp_rec_rec(
-				rec, old_rec, offsets, old_offsets, index);
+				rec, old_rec, offsets, old_offsets, index,
+				page_is_spatial_non_leaf(rec, index));
 
 			/* For spatial index, on nonleaf leavel, we
 			allow recs to be equal. */
diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc
index cb5fe4c27507..aa47063427ae 100644
--- a/storage/innobase/page/page0zip.cc
+++ b/storage/innobase/page/page0zip.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1289,7 +1297,7 @@ page_zip_compress(
 						columns */
 	index_id_t		ind_id;
 #ifndef UNIV_HOTBACKUP
-	uintmax_t		usec = ut_time_us(NULL);
+	ib_time_monotonic_us_t usec = ut_time_monotonic_us();
 #endif /* !UNIV_HOTBACKUP */
 #ifdef PAGE_ZIP_COMPRESS_DBG
 	FILE*			logfile = NULL;
@@ -1553,7 +1561,7 @@ page_zip_compress(
 			dict_index_zip_failure(index);
 		}
 
-		uintmax_t	time_diff = ut_time_us(NULL) - usec;
+		uint64_t time_diff = ut_time_monotonic_us() - usec;
 		page_zip_stat[page_zip->ssize - 1].compressed_usec
 			+= time_diff;
 		if (cmp_per_index_enabled) {
@@ -1623,7 +1631,7 @@ page_zip_compress(
 	}
 #endif /* PAGE_ZIP_COMPRESS_DBG */
 #ifndef UNIV_HOTBACKUP
-	uintmax_t	time_diff = ut_time_us(NULL) - usec;
+	uint64_t time_diff = ut_time_monotonic_us() - usec;
 	page_zip_stat[page_zip->ssize - 1].compressed_ok++;
 	page_zip_stat[page_zip->ssize - 1].compressed_usec += time_diff;
 	if (cmp_per_index_enabled) {
@@ -3248,7 +3256,7 @@ page_zip_decompress(
 				after page creation */
 {
 #ifndef UNIV_HOTBACKUP
-	uintmax_t	usec = ut_time_us(NULL);
+	ib_time_monotonic_us_t	usec = ut_time_monotonic_ms();
 #endif /* !UNIV_HOTBACKUP */
 
 	if (!page_zip_decompress_low(page_zip, page, all)) {
@@ -3256,7 +3264,7 @@ page_zip_decompress(
 	}
 
 #ifndef UNIV_HOTBACKUP
-	uintmax_t	time_diff = ut_time_us(NULL) - usec;
+	uint64_t time_diff = ut_time_monotonic_us() - usec;
 	page_zip_stat[page_zip->ssize - 1].decompressed++;
 	page_zip_stat[page_zip->ssize - 1].decompressed_usec += time_diff;
 
diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc
index b97afd7c76b3..943a7ef342cb 100644
--- a/storage/innobase/pars/lexyy.cc
+++ b/storage/innobase/pars/lexyy.cc
@@ -916,19 +916,27 @@ char *yytext;
 #line 1 "pars0lex.l"
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 *****************************************************************************/
 /******************************************************
diff --git a/storage/innobase/pars/make_bison.sh b/storage/innobase/pars/make_bison.sh
index 2b0c15662fc4..8a0558d68163 100755
--- a/storage/innobase/pars/make_bison.sh
+++ b/storage/innobase/pars/make_bison.sh
@@ -1,14 +1,22 @@
 #!/bin/bash
 #
-# Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh
index 2c4930974631..59cf80841d88 100755
--- a/storage/innobase/pars/make_flex.sh
+++ b/storage/innobase/pars/make_flex.sh
@@ -1,14 +1,22 @@
 #!/bin/bash
 #
-# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/pars/pars0grm.cc b/storage/innobase/pars/pars0grm.cc
index 5fbb70c44812..74015d3c4de9 100644
--- a/storage/innobase/pars/pars0grm.cc
+++ b/storage/innobase/pars/pars0grm.cc
@@ -6,14 +6,20 @@
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index 2f0c83da8e3a..1756b900e7cf 100644
--- a/storage/innobase/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index 3efcc2c8b4df..4c59c37a92a5 100644
--- a/storage/innobase/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc
index dc0d07ec19d5..79037c0062d9 100644
--- a/storage/innobase/pars/pars0opt.cc
+++ b/storage/innobase/pars/pars0opt.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc
index 66514752ace0..077b3a1c840e 100644
--- a/storage/innobase/pars/pars0pars.cc
+++ b/storage/innobase/pars/pars0pars.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
diff --git a/storage/innobase/pars/pars0sym.cc b/storage/innobase/pars/pars0sym.cc
index b6305368362a..665a0de84682 100644
--- a/storage/innobase/pars/pars0sym.cc
+++ b/storage/innobase/pars/pars0sym.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
index afe10f0fc769..31f4c7ea8a16 100644
--- a/storage/innobase/que/que0que.cc
+++ b/storage/innobase/que/que0que.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -693,10 +701,6 @@ que_thr_stop(
 		trx->lock.wait_thr = thr;
 		thr->state = QUE_THR_LOCK_WAIT;
 
-	} else if (trx->duplicates && trx->error_state == DB_DUPLICATE_KEY) {
-
-		return(FALSE);
-
 	} else if (trx->error_state != DB_SUCCESS
 		   && trx->error_state != DB_LOCK_WAIT) {
 
@@ -904,7 +908,7 @@ que_node_get_containing_loop_node(
 	return(node);
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /** Gets information of an SQL query graph node.
 @return type description */
 static MY_ATTRIBUTE((warn_unused_result, nonnull))
@@ -961,7 +965,7 @@ que_node_type_string(
 		return("UNKNOWN NODE TYPE");
 	}
 }
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 /**********************************************************************//**
 Performs an execution step on a query thread.
diff --git a/storage/innobase/read/read0read.cc b/storage/innobase/read/read0read.cc
index 2fb7083b0b2f..44537798f082 100644
--- a/storage/innobase/read/read0read.cc
+++ b/storage/innobase/read/read0read.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/rem/rem0cmp.cc b/storage/innobase/rem/rem0cmp.cc
index 21a1c1d48e9e..50e9a1fe8074 100644
--- a/storage/innobase/rem/rem0cmp.cc
+++ b/storage/innobase/rem/rem0cmp.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1112,6 +1120,7 @@ cmp_rec_rec_simple(
 @param[in] offsets1 rec_get_offsets(rec1, index)
 @param[in] offsets2 rec_get_offsets(rec2, index)
 @param[in] index B-tree index
+@param[in] spatial_index_non_leaf true if record present in spatial index non leaf
 @param[in] nulls_unequal true if this is for index cardinality
 statistics estimation, and innodb_stats_method=nulls_unequal
 or innodb_stats_method=nulls_ignored
@@ -1128,6 +1137,7 @@ cmp_rec_rec_with_match(
 	const ulint*		offsets1,
 	const ulint*		offsets2,
 	const dict_index_t*	index,
+	bool			spatial_index_non_leaf,
 	bool			nulls_unequal,
 	ulint*			matched_fields)
 {
@@ -1188,12 +1198,22 @@ cmp_rec_rec_with_match(
 			mtype = DATA_BINARY;
 			prtype = 0;
 		} else {
-			const dict_col_t*	col;
-
-			col	= dict_index_get_nth_col(index, cur_field);
-
-			mtype = col->mtype;
-			prtype = col->prtype;
+			/* When the page is non-leaf spatial index page
+			we should not depend upon the dictionary information because the
+			page doesnt hold any primary key information. The non leaf node
+			of a spatial index has only two fields 1)MBR 2)page number of
+			child node. */
+
+			if ((cur_field == 1) && spatial_index_non_leaf) {
+				ut_ad(dict_index_is_spatial(index));
+				mtype = DATA_SYS_CHILD;
+				prtype = 0;
+			} else {
+				const dict_col_t* col;
+				col= dict_index_get_nth_col(index, cur_field);
+				mtype = col->mtype;
+				prtype = col->prtype;
+			}
 
 			/* If the index is spatial index, we mark the
 			prtype of the first field as MBR field. */
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc
index c6b5bd1df812..1742287b3ee5 100644
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/row/row0ext.cc b/storage/innobase/row/row0ext.cc
index 38c4e2ba6fb0..cfc653a83310 100644
--- a/storage/innobase/row/row0ext.cc
+++ b/storage/innobase/row/row0ext.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc
index cea6a3062c59..36ce6eb6cca7 100644
--- a/storage/innobase/row/row0ftsort.cc
+++ b/storage/innobase/row/row0ftsort.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -478,7 +486,9 @@ row_merge_fts_doc_tokenize(
 
 	/* Tokenize the data and add each word string, its corresponding
 	doc id and position to sort buffer */
-	while (t_ctx->processed_len < doc->text.f_len) {
+	while (parser == NULL ?
+			t_ctx->processed_len < doc->text.f_len :
+			t_ctx->processed_len == 0 || UT_LIST_GET_LEN(t_ctx->fts_token_list) != 0) {
 		ulint		idx = 0;
 		ib_uint32_t	position;
 		ulint		cur_len = 0;
@@ -758,7 +768,6 @@ fts_parallel_tokenization(
 	merge_file = psort_info->merge_file;
 	blob_heap = mem_heap_create(512);
 	memset(&doc, 0, sizeof(doc));
-	memset(&t_ctx, 0, sizeof(t_ctx));
 	memset(mycount, 0, FTS_NUM_AUX_INDEX * sizeof(int));
 
 	doc.charset = fts_index_get_charset(
@@ -815,7 +824,6 @@ fts_parallel_tokenization(
 			/* Not yet finish processing the "doc" on hand,
 			continue processing it */
 			ut_ad(doc.text.f_str);
-			ut_ad(t_ctx.processed_len < doc.text.f_len);
 		}
 
 		processed = row_merge_fts_doc_tokenize(
@@ -826,7 +834,6 @@ fts_parallel_tokenization(
 
 		/* Current sort buffer full, need to recycle */
 		if (!processed) {
-			ut_ad(t_ctx.processed_len < doc.text.f_len);
 			ut_ad(t_ctx.rows_added[t_ctx.buf_used]);
 			break;
 		}
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index 723500c95905..9490285eb195 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -109,18 +117,18 @@ struct row_index_t {
 struct row_import {
 	row_import() UNIV_NOTHROW
 		:
-		m_table(),
-		m_version(),
-		m_hostname(),
-		m_table_name(),
-		m_autoinc(),
+		m_table(NULL),
+		m_version(0),
+		m_hostname(NULL),
+		m_table_name(NULL),
+		m_autoinc(0),
 		m_page_size(0, 0, false),
-		m_flags(),
-		m_n_cols(),
-		m_cols(),
-		m_col_names(),
-		m_n_indexes(),
-		m_indexes(),
+		m_flags(0),
+		m_n_cols(0),
+		m_cols(NULL),
+		m_col_names(NULL),
+		m_n_indexes(0),
+		m_indexes(NULL),
 		m_missing(true),
 		m_cfp_missing(true)	{ }
 
@@ -1311,11 +1319,30 @@ row_import::match_schema(
 	/* Do some simple checks. */
 
 	if (m_flags != m_table->flags) {
-		ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
-			 "Table flags don't match, server table has 0x%lx"
-			 " and the meta-data file has 0x%lx",
-			 (ulong) m_table->n_cols, (ulong) m_flags);
-
+		if (dict_tf_to_row_format_string(m_flags) !=
+				dict_tf_to_row_format_string(m_table->flags)) {
+			ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
+				 "Table flags don't match, server table has %s"
+				 " and the meta-data file has %s",
+				(const char*)dict_tf_to_row_format_string(m_table->flags),
+				(const char*)dict_tf_to_row_format_string(m_flags));
+		} else if (DICT_TF_HAS_DATA_DIR(m_flags) !=
+				DICT_TF_HAS_DATA_DIR(m_table->flags)) {
+			/* If the meta-data flag is set for data_dir,
+			but table flag is not set for data_dir or vice versa
+			then return error. */
+			ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
+				"Table location flags do not match. "
+				"The source table %s a DATA DIRECTORY "
+				"but the destination table %s.",
+				(DICT_TF_HAS_DATA_DIR(m_flags) ? "uses"
+				: "does not use"),
+				(DICT_TF_HAS_DATA_DIR(m_table->flags) ? "does"
+				: "does not"));
+		} else {
+			ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
+				"Table flags don't match");
+		}
 		return(DB_ERROR);
 	} else if (m_table->n_cols != m_n_cols) {
 		ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
@@ -1471,6 +1498,8 @@ IndexPurge::garbage_collect() UNIV_NOTHROW
 	/* Open the persistent cursor and start the mini-transaction. */
 
 	open();
+	import_ctx_t import_ctx = {false};
+	m_pcur.import_ctx = &import_ctx;
 
 	while ((err = next()) == DB_SUCCESS) {
 
@@ -1487,6 +1516,12 @@ IndexPurge::garbage_collect() UNIV_NOTHROW
 	/* Close the persistent cursor and commit the mini-transaction. */
 
 	close();
+	if (m_pcur.import_ctx->is_error == true) {
+		m_pcur.import_ctx = NULL;
+		return DB_TABLE_CORRUPT;
+	}
+
+	m_pcur.import_ctx = NULL;
 
 	return(err == DB_END_OF_INDEX ? DB_SUCCESS : err);
 }
@@ -1547,7 +1582,7 @@ IndexPurge::next() UNIV_NOTHROW
 		return(DB_END_OF_INDEX);
 	}
 
-	return(DB_SUCCESS);
+	return (DB_SUCCESS);
 }
 
 /**
@@ -1782,12 +1817,6 @@ PageConverter::update_records(
 
 		rec_t*	rec = m_rec_iter.current();
 
-		/* FIXME: Move out of the loop */
-
-		if (rec_get_status(rec) == REC_STATUS_NODE_PTR) {
-			break;
-		}
-
 		ibool	deleted = rec_get_deleted_flag(rec, comp);
 
 		/* For the clustered index we have to adjust the BLOB
@@ -1888,6 +1917,10 @@ PageConverter::update_index_page(
 		return(DB_SUCCESS);
 	}
 
+	if (!page_is_leaf(block->frame)) {
+		return (DB_SUCCESS);
+	}
+
 	return(update_records(block));
 }
 
@@ -2119,7 +2152,7 @@ row_import_discard_changes(
 
 	ut_a(err != DB_SUCCESS);
 
-	prebuilt->trx->error_info = NULL;
+	prebuilt->trx->error_index = NULL;
 
 	ib::info() << "Discarding tablespace of table "
 		<< prebuilt->table->name
@@ -2500,7 +2533,7 @@ row_import_cfg_read_index_fields(
 
 	dict_field_t*	field = index->m_fields;
 
-	memset(field, 0x0, sizeof(*field) * n_fields);
+	std::uninitialized_fill_n(field, n_fields, dict_field_t());
 
 	for (ulint i = 0; i < n_fields; ++i, ++field) {
 		byte*		ptr = row;
@@ -3169,8 +3202,7 @@ dberr_t
 row_import_read_encryption_data(
 	dict_table_t*	table,
 	FILE*		file,
-	THD*		thd,
-	row_import&	import)
+	THD*		thd)
 {
 	byte		row[sizeof(ib_uint32_t)];
 	ulint		key_size;
@@ -3300,8 +3332,6 @@ row_import_read_cfp(
 	FILE*	file = fopen(name, "rb");
 
 	if (file == NULL) {
-		import.m_cfp_missing = true;
-
 		/* If there's no cfp file, we assume it's not an
 		encrpyted table. return directly. */
 
@@ -3313,7 +3343,7 @@ row_import_read_cfp(
 		import.m_cfp_missing = false;
 
 		err = row_import_read_encryption_data(table, file,
-						      thd, import);
+						      thd);
 		fclose(file);
 	}
 
@@ -3620,8 +3650,37 @@ row_import_for_mysql(
 	row_import	cfg;
 	ulint		space_flags = 0;
 
-	memset(&cfg, 0x0, sizeof(cfg));
+	/* Read CFP file */
+	if (dict_table_is_encrypted(table)) {
+		/* First try to read CFP file here. */
+		err = row_import_read_cfp(table, trx->mysql_thd, cfg);
+		ut_ad(cfg.m_cfp_missing || err == DB_SUCCESS);
+
+		if (err != DB_SUCCESS) {
+			rw_lock_s_unlock_gen(dict_operation_lock, 0);
+			return (row_import_error(prebuilt, trx, err));
+		}
+
+		/* If table is encrypted, but can't find cfp file,
+                return error. */
+		if (cfg.m_cfp_missing) {
+			ib_errf(trx->mysql_thd, IB_LOG_LEVEL_ERROR,
+				ER_TABLE_SCHEMA_MISMATCH,
+				"Table is in an encrypted tablespace, but the"
+				" encryption meta-data file cannot be found"
+				" while importing.");
+			err = DB_ERROR;
+			rw_lock_s_unlock_gen(dict_operation_lock, 0);
+			return (row_import_error(prebuilt, trx, err));
+		} else {
+			/* If CFP file is read, encryption_key must have been
+			populted. */
+			ut_ad(table->encryption_key != NULL &&
+				table->encryption_iv != NULL);
+		}
+	}
 
+	/* Read CFG file */
 	err = row_import_read_cfg(table, trx->mysql_thd, cfg);
 
 	/* Check if the table column definitions match the contents
@@ -3683,47 +3742,41 @@ row_import_for_mysql(
 
 		space_flags = fetchIndexRootPages.get_space_flags();
 
-	} else {
-		rw_lock_s_unlock_gen(dict_operation_lock, 0);
-	}
-
-	/* Try to read encryption information. */
-	if (err == DB_SUCCESS) {
-		err = row_import_read_cfp(table, trx->mysql_thd, cfg);
-
-		/* If table is not set to encrypted, but the fsp flag
-		is not, then return error. */
-		if (!dict_table_is_encrypted(table)
-		    && space_flags != 0
-		    && FSP_FLAGS_GET_ENCRYPTION(space_flags)) {
-
+		/* If the fsp flag is set for data_dir, but table flag is not
+		set for data_dir or vice versa then return error. */
+		if (err == DB_SUCCESS
+			&& FSP_FLAGS_HAS_DATA_DIR(space_flags) !=
+			DICT_TF_HAS_DATA_DIR(table->flags)) {
 			ib_errf(trx->mysql_thd, IB_LOG_LEVEL_ERROR,
-				 ER_TABLE_SCHEMA_MISMATCH,
-				 "Table is not marked as encrypted, but"
-				 " the tablespace is marked as encrypted");
-
+				ER_TABLE_SCHEMA_MISMATCH,
+				"Table location flags do not match. "
+				"The source table %s a DATA DIRECTORY "
+				"but the destination table %s.",
+				(FSP_FLAGS_HAS_DATA_DIR(space_flags) ? "uses"
+				: "does not use"),
+				(DICT_TF_HAS_DATA_DIR(table->flags) ? "does"
+				: "does not"));
 			err = DB_ERROR;
 			return(row_import_error(prebuilt, trx, err));
 		}
 
-		/* If table is set to encrypted, but can't find
-		cfp file, then return error. */
-		if (cfg.m_cfp_missing== true
-		    && ((space_flags != 0
-			 && FSP_FLAGS_GET_ENCRYPTION(space_flags))
-			|| dict_table_is_encrypted(table))) {
+	} else {
+		rw_lock_s_unlock_gen(dict_operation_lock, 0);
+	}
+
+	if (err != DB_SUCCESS) {
+		if (err == DB_IO_NO_ENCRYPT_TABLESPACE) {
 			ib_errf(trx->mysql_thd, IB_LOG_LEVEL_ERROR,
-				 ER_TABLE_SCHEMA_MISMATCH,
-				 "Table is in an encrypted tablespace, but"
-				 " can't find the encryption meta-data file"
-				 " in importing");
-			err = DB_ERROR;
-			return(row_import_error(prebuilt, trx, err));
+				ER_TABLE_SCHEMA_MISMATCH,
+				"Encryption attribute in the file does not"
+				" match the dictionary.");
 		}
-	} else {
 		return(row_import_error(prebuilt, trx, err));
 	}
 
+	/* At this point, all required information has been collected for
+	IMPORT. */
+
 	prebuilt->trx->op_info = "importing tablespace";
 
 	ib::info() << "Phase I - Update all pages";
@@ -3744,15 +3797,10 @@ row_import_for_mysql(
 			err = DB_TOO_MANY_CONCURRENT_TRXS;);
 
 	if (err == DB_IO_NO_ENCRYPT_TABLESPACE) {
-		char	table_name[MAX_FULL_NAME_LEN + 1];
-
-		innobase_format_name(
-			table_name, sizeof(table_name),
-			table->name.m_name);
-
 		ib_errf(trx->mysql_thd, IB_LOG_LEVEL_ERROR,
 			ER_TABLE_SCHEMA_MISMATCH,
-			"Encryption attribute is no matched");
+			"Encryption attribute in the file does not match the"
+			" dictionary.");
 
 		return(row_import_cleanup(prebuilt, trx, err));
 	}
@@ -3871,7 +3919,9 @@ row_import_for_mysql(
 	if (err != DB_SUCCESS) {
 		return(row_import_error(prebuilt, trx, err));
 	}
-
+	DBUG_EXECUTE_IF("ib_import_page_corrupt",
+			row_index_t* i_index = cfg.get_index(index->name);
+			++i_index->m_stats.m_n_purge_failed;);
 	if (err != DB_SUCCESS) {
 		return(row_import_error(prebuilt, trx, err));
 	} else if (cfg.requires_purge(index->name)) {
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index e60184b00a3d..5a85abde44ee 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -92,7 +100,6 @@ ins_node_create(
 	node->select = NULL;
 
 	node->trx_id = 0;
-	node->duplicate = NULL;
 
 	node->entry_sys_heap = mem_heap_create(128);
 
@@ -205,7 +212,6 @@ ins_node_set_new_row(
 	node->state = INS_NODE_SET_IX_LOCK;
 	node->index = NULL;
 	node->entry = NULL;
-	node->duplicate = NULL;
 
 	node->row = row;
 
@@ -346,7 +352,7 @@ row_ins_clust_index_entry_by_modify(
 {
 	const rec_t*	rec;
 	upd_t*		update;
-	dberr_t		err;
+	dberr_t		err = DB_SUCCESS;
 	btr_cur_t*	cursor	= btr_pcur_get_btr_cur(pcur);
 	TABLE*		mysql_table = NULL;
 	ut_ad(dict_index_is_clust(cursor->index));
@@ -366,7 +372,11 @@ row_ins_clust_index_entry_by_modify(
 
 	update = row_upd_build_difference_binary(
 		cursor->index, entry, rec, NULL, true,
-		thr_get_trx(thr), heap, mysql_table);
+		thr_get_trx(thr), heap, mysql_table, &err);
+	if (err != DB_SUCCESS) {
+		return(err);
+	}
+
 	if (mode != BTR_MODIFY_TREE) {
 		ut_ad((mode & ~BTR_ALREADY_S_LATCHED) == BTR_MODIFY_LEAF);
 
@@ -946,12 +956,12 @@ row_ins_foreign_fill_virtual(
 	row_ext_t*	ext;
 	THD*		thd = current_thd;
 	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
+	mem_heap_t*	v_heap = NULL;
+	upd_t*		update = cascade->update;
 	rec_offs_init(offsets_);
 	const ulint*	offsets =
 		rec_get_offsets(rec, index, offsets_,
-				ULINT_UNDEFINED, &cascade->heap);
-	mem_heap_t*	v_heap = NULL;
-	upd_t*		update = cascade->update;
+				ULINT_UNDEFINED, &update->heap);
 	ulint		n_v_fld = index->table->n_v_def;
 	ulint		n_diff;
 	upd_field_t*	upd_field;
@@ -960,7 +970,7 @@ row_ins_foreign_fill_virtual(
 	update->old_vrow = row_build(
 		ROW_COPY_POINTERS, index, rec,
 		offsets, index->table, NULL, NULL,
-		&ext, cascade->heap);
+		&ext, update->heap);
 
 	n_diff = update->n_fields;
 
@@ -996,7 +1006,7 @@ row_ins_foreign_fill_virtual(
 		upd_field = upd_get_nth_field(update, n_diff);
 
 		upd_field->old_v_val = static_cast<dfield_t*>(
-				mem_heap_alloc(cascade->heap,
+				mem_heap_alloc(update->heap,
 					sizeof *upd_field->old_v_val));
 
 		dfield_copy(upd_field->old_v_val, vfield);
@@ -1006,8 +1016,35 @@ row_ins_foreign_fill_virtual(
 		if (node->is_delete
 		    ? (foreign->type & DICT_FOREIGN_ON_DELETE_SET_NULL)
 		    : (foreign->type & DICT_FOREIGN_ON_UPDATE_SET_NULL)) {
+			uint32_t col_match_count =
+			    dict_vcol_base_is_foreign_key(col, foreign);
+			if (col_match_count == col->num_base) {
+				/* If all base columns of virtual col are
+				in FK */
+				dfield_set_null(&upd_field->new_val);
+			} else if (col_match_count == 0) {
+				/* If no base column of virtual col is in FK */
+				dfield_copy(&(upd_field->new_val), vfield);
+			} else {
+				/* If at least one base column of virtual col
+				is in FK */
+				for (uint32_t j = 0; j < col->num_base; j++) {
+					dict_col_t *base_col = col->base_col[j];
+					uint32_t col_no = base_col->ind;
+					dfield_t *row_field =
+					  innobase_get_field_from_update_vector(
+					  foreign, node->update, col_no);
+					if (row_field != NULL) {
+						dfield_set_null(row_field);
+					}
+				}
+				dfield_t *new_vfield = innobase_get_computed_value(
+				    update->old_vrow, col, index, &v_heap,
+				    update->heap, NULL, thd, NULL,
+				    NULL, node->update, foreign);
+				dfield_copy(&(upd_field->new_val), new_vfield);
+			}
 
-			dfield_set_null(&upd_field->new_val);
 		}
 
 		if (!node->is_delete
@@ -1266,6 +1303,11 @@ row_ins_foreign_check_on_constraint(
 						 clust_index, tmp_heap);
 	}
 
+	if (cascade->is_delete && foreign->v_cols != NULL
+	    && foreign->v_cols->size() > 0
+	    && table->vc_templ == NULL) {
+		innobase_init_vc_templ(table);
+	}
 	if (node->is_delete
 	    ? (foreign->type & DICT_FOREIGN_ON_DELETE_SET_NULL)
 	    : (foreign->type & DICT_FOREIGN_ON_UPDATE_SET_NULL)) {
@@ -1618,7 +1660,8 @@ row_ins_check_foreign_constraint(
 
 	if (check_table == NULL
 	    || check_table->ibd_file_missing
-	    || check_index == NULL) {
+	    || check_index == NULL
+	    || fil_space_is_being_truncated(check_table->space)) {
 
 		if (!srv_read_only_mode && check_ref) {
 			FILE*	ef = dict_foreign_err_file;
@@ -1640,7 +1683,8 @@ row_ins_check_foreign_constraint(
 			ut_print_name(ef, trx,
 				      foreign->referenced_table_name);
 			fputs("\nor its .ibd file does"
-			      " not currently exist!\n", ef);
+			      " not currently exist!, or"
+			      " is undergoing truncate!\n", ef);
 			mutex_exit(&dict_foreign_err_mutex);
 
 			err = DB_NO_REFERENCED_ROW;
@@ -1856,6 +1900,11 @@ row_ins_check_foreign_constraint(
 
 		thr->lock_state = QUE_THR_LOCK_NOLOCK;
 
+		if(trx->error_state != DB_SUCCESS) {
+		    err = trx->error_state;
+		    goto exit_func;
+		}
+
 		DBUG_PRINT("to_be_dropped",
 			   ("table: %s", check_table->name.m_name));
 		if (check_table->to_be_dropped) {
@@ -1873,6 +1922,7 @@ row_ins_check_foreign_constraint(
 		mem_heap_free(heap);
 	}
 
+	DEBUG_SYNC_C("finished_scanning_index");
 	DBUG_RETURN(err);
 }
 
@@ -2126,7 +2176,7 @@ row_ins_scan_sec_index_for_duplicate(
 							index, offsets)) {
 				err = DB_DUPLICATE_KEY;
 
-				thr_get_trx(thr)->error_info = index;
+				thr_get_trx(thr)->error_index = index;
 
 				/* If the duplicate is on hidden FTS_DOC_ID,
 				state so in the error log */
@@ -2288,12 +2338,6 @@ row_ins_duplicate_error_in_clust(
 			offsets = rec_get_offsets(rec, cursor->index, offsets,
 						  ULINT_UNDEFINED, &heap);
 
-			ulint lock_type;
-
-			lock_type =
-				trx->isolation_level <= TRX_ISO_READ_COMMITTED
-				? LOCK_REC_NOT_GAP : LOCK_ORDINARY;
-
 			/* We set a lock on the possible duplicate: this
 			is needed in logical logging of MySQL to make
 			sure that in roll-forward we get the same duplicate
@@ -2310,13 +2354,13 @@ row_ins_duplicate_error_in_clust(
 				INSERT ON DUPLICATE KEY UPDATE). */
 
 				err = row_ins_set_exclusive_rec_lock(
-					lock_type,
+					LOCK_REC_NOT_GAP,
 					btr_cur_get_block(cursor),
 					rec, cursor->index, offsets, thr);
 			} else {
 
 				err = row_ins_set_shared_rec_lock(
-					lock_type,
+					LOCK_REC_NOT_GAP,
 					btr_cur_get_block(cursor), rec,
 					cursor->index, offsets, thr);
 			}
@@ -2332,7 +2376,7 @@ row_ins_duplicate_error_in_clust(
 			if (row_ins_dupl_error_with_rec(
 				    rec, entry, cursor->index, offsets)) {
 duplicate:
-				trx->error_info = cursor->index;
+				trx->error_index = cursor->index;
 				err = DB_DUPLICATE_KEY;
 				goto func_exit;
 			}
@@ -2536,7 +2580,7 @@ row_ins_clust_index_entry_low(
 				/* fall through */
 			case DB_SUCCESS_LOCKED_REC:
 			case DB_DUPLICATE_KEY:
-				thr_get_trx(thr)->error_info = cursor->index;
+				thr_get_trx(thr)->error_index = cursor->index;
 			}
 		} else {
 			/* Note that the following may return also
@@ -3079,44 +3123,6 @@ row_ins_sec_index_entry_low(
 		}
 	}
 
-	if (!(flags & BTR_NO_LOCKING_FLAG)
-	    && dict_index_is_unique(index)
-	    && thr_get_trx(thr)->duplicates
-	    && thr_get_trx(thr)->isolation_level >= TRX_ISO_REPEATABLE_READ) {
-
-		/* When using the REPLACE statement or ON DUPLICATE clause, a
-		gap lock is taken on the position of the to-be-inserted record,
-		to avoid other concurrent transactions from inserting the same
-		record. */
-
-		dberr_t	err;
-		const rec_t* rec = page_rec_get_next_const(
-			btr_cur_get_rec(&cursor));
-
-		ut_ad(!page_rec_is_infimum(rec));
-
-		offsets = rec_get_offsets(rec, index, offsets,
-					  ULINT_UNDEFINED, &offsets_heap);
-
-		err = row_ins_set_exclusive_rec_lock(
-			LOCK_GAP, btr_cur_get_block(&cursor), rec,
-			index, offsets, thr);
-
-		switch (err) {
-		case DB_SUCCESS:
-		case DB_SUCCESS_LOCKED_REC:
-			if (thr_get_trx(thr)->error_state != DB_DUPLICATE_KEY) {
-				break;
-			}
-			/* Fall through (skip actual insert) after we have
-			successfully acquired the gap lock. */
-		default:
-			goto func_exit;
-		}
-	}
-
-	ut_ad(thr_get_trx(thr)->error_state == DB_SUCCESS);
-
 	if (dup_chk_only) {
 		goto func_exit;
 	}
@@ -3218,9 +3224,9 @@ row_ins_index_entry_big_rec_func(
 	mem_heap_t**		heap,	/*!< in/out: memory heap */
 	dict_index_t*		index,	/*!< in: index */
 	const char*		file,	/*!< in: file name of caller */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	const void*		thd,    /*!< in: connection, or NULL */
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 	ulint			line)	/*!< in: line number of caller */
 {
 	mtr_t		mtr;
@@ -3231,6 +3237,7 @@ row_ins_index_entry_big_rec_func(
 	ut_ad(dict_index_is_clust(index));
 
 	DEBUG_SYNC_C_IF_THD(thd, "before_row_ins_extern_latch");
+	DEBUG_SYNC_C("before_insertion_of_blob");
 
 	mtr_start(&mtr);
 	mtr.set_named_space(index->space);
@@ -3719,10 +3726,6 @@ row_ins(
 
 	DBUG_PRINT("row_ins", ("table: %s", node->table->name.m_name));
 
-	if (node->duplicate) {
-		thr_get_trx(thr)->error_state = DB_DUPLICATE_KEY;
-	}
-
 	if (node->state == INS_NODE_ALLOC_ROW_ID) {
 
 		row_ins_alloc_row_id_step(node);
@@ -3747,53 +3750,20 @@ row_ins(
 	while (node->index != NULL) {
 		if (node->index->type != DICT_FTS) {
 			err = row_ins_index_entry_step(node, thr);
-
-			switch (err) {
+			switch(err) {
 			case DB_SUCCESS:
 				break;
 			case DB_DUPLICATE_KEY:
-				ut_ad(dict_index_is_unique(node->index));
-
-				if (thr_get_trx(thr)->isolation_level
-				    >= TRX_ISO_REPEATABLE_READ
-				    && thr_get_trx(thr)->duplicates) {
-
-					/* When we are in REPLACE statement or
-					INSERT ..  ON DUPLICATE UPDATE
-					statement, we process all the
-					unique secondary indexes, even after we
-					encounter a duplicate error. This is
-					done to take necessary gap locks in
-					secondary indexes to block concurrent
-					transactions from inserting the
-					searched records. */
-					if (!node->duplicate) {
-						/* Save 1st dup error. Ignore
-						subsequent dup errors. */
-						node->duplicate = node->index;
-						thr_get_trx(thr)->error_state
-							= DB_DUPLICATE_KEY;
-					}
-					break;
-				}
-				// fall through
+				thr_get_trx(thr)->error_state
+						= DB_DUPLICATE_KEY;
+				thr_get_trx(thr)->error_index
+						= node->index;
+			//fall through
 			default:
 				DBUG_RETURN(err);
 			}
 		}
 
-		if (node->duplicate && dict_table_is_temporary(node->table)) {
-			ut_ad(thr_get_trx(thr)->error_state
-			      == DB_DUPLICATE_KEY);
-			/* For TEMPORARY TABLE, we won't lock anything,
-			so we can simply break here instead of requiring
-			GAP locks for other unique secondary indexes,
-			pretending we have consumed all indexes. */
-			node->index = NULL;
-			node->entry = NULL;
-			break;
-		}
-
 		node->index = dict_table_get_next_index(node->index);
 		node->entry = UT_LIST_GET_NEXT(tuple_list, node->entry);
 
@@ -3808,29 +3778,13 @@ row_ins(
 			node->entry = UT_LIST_GET_NEXT(tuple_list, node->entry);
 		}
 
-		/* After encountering a duplicate key error, we process
-		remaining indexes just to place gap locks and no actual
-		insertion will take place.  These gap locks are needed
-		only for unique indexes.  So skipping non-unique indexes. */
-		if (node->duplicate) {
-			while (node->index
-			       && !dict_index_is_unique(node->index)) {
-
-				node->index = dict_table_get_next_index(
-					node->index);
-				node->entry = UT_LIST_GET_NEXT(tuple_list,
-							       node->entry);
-			}
-			thr_get_trx(thr)->error_state = DB_DUPLICATE_KEY;
-		}
 	}
 
 	ut_ad(node->entry == NULL);
-
-	thr_get_trx(thr)->error_info = node->duplicate;
+	thr_get_trx(thr)->error_index = NULL;
 	node->state = INS_NODE_ALLOC_ROW_ID;
 
-	DBUG_RETURN(node->duplicate ? DB_DUPLICATE_KEY : DB_SUCCESS);
+	DBUG_RETURN(DB_SUCCESS);
 }
 
 /***********************************************************//**
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
index 659d77b8865f..54a227d797b2 100644
--- a/storage/innobase/row/row0log.cc
+++ b/storage/innobase/row/row0log.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -356,7 +364,7 @@ row_log_online_op(
 
 	if (mrec_size >= avail_size) {
 		dberr_t			err;
-		IORequest		request(IORequest::WRITE);
+		IORequest		request(IORequest::ROW_LOG | IORequest::WRITE);
 		const os_offset_t	byte_offset
 			= (os_offset_t) log->tail.blocks
 			* srv_sort_buf_size;
@@ -475,7 +483,8 @@ row_log_table_close_func(
 
 	if (size >= avail) {
 		dberr_t			err;
-		IORequest		request(IORequest::WRITE);
+		IORequest		request(IORequest::ROW_LOG | IORequest::WRITE);
+
 		const os_offset_t	byte_offset
 			= (os_offset_t) log->tail.blocks
 			* srv_sort_buf_size;
@@ -842,7 +851,7 @@ row_log_table_low_redundant(
 
 		old_pk_size = rec_get_converted_size_temp(
 			new_index, old_pk->fields, old_pk->n_fields,
-			ventry, &old_pk_extra_size);
+			NULL, &old_pk_extra_size);
 		ut_ad(old_pk_extra_size < 0x100);
 		mrec_size += 1/*old_pk_extra_size*/ + old_pk_size;
 	}
@@ -967,11 +976,17 @@ row_log_table_low(
 		+ (extra_size >= 0x80) + rec_offs_size(offsets) - omit_size;
 
 	if (ventry && ventry->n_v_fields > 0) {
-		ulint	v_extra = 0;
-		mrec_size += rec_get_converted_size_temp(
+		ulint		v_extra = 0;
+		uint64_t	rec_size = rec_get_converted_size_temp(
 			new_index, NULL, 0, ventry, &v_extra);
 
-		if (o_ventry) {
+		mrec_size += rec_size;
+
+		/* If there is actually nothing to be logged for new entry,
+		then there must be also nothing to do with old entry.
+		In this case, make it same with the case below, by only keep
+		2 bytes length marker */
+		if (rec_size > 2 && o_ventry != NULL) {
 			mrec_size += rec_get_converted_size_temp(
 				new_index, NULL, 0, o_ventry, &v_extra);
 		}
@@ -1028,11 +1043,16 @@ row_log_table_low(
 		b += rec_offs_data_size(offsets);
 
 		if (ventry && ventry->n_v_fields > 0) {
+			uint64_t	new_v_size;
+
 			rec_convert_dtuple_to_temp(
 				b, new_index, NULL, 0, ventry);
-			b += mach_read_from_2(b);
+			new_v_size = mach_read_from_2(b);
+			b += new_v_size;
 
-			if (o_ventry) {
+			/* Nothing for new entry to be logged,
+			skip the old one too. */
+			if (new_v_size != 2 && o_ventry != NULL) {
 				rec_convert_dtuple_to_temp(
 					b, new_index, NULL, 0, o_ventry);
 				b += mach_read_from_2(b);
@@ -1664,6 +1684,7 @@ row_log_table_apply_insert_low(
 	}
 
 	do {
+		n_index++;
 		if (!(index = dict_table_get_next_index(index))) {
 			break;
 		}
@@ -2200,7 +2221,10 @@ row_log_table_apply_update(
 		row, NULL, index, heap, ROW_BUILD_FOR_INSERT);
 	upd_t*		update	= row_upd_build_difference_binary(
 		index, entry, btr_pcur_get_rec(&pcur), cur_offsets,
-		false, NULL, heap, dup->table);
+		false, NULL, heap, dup->table, &error);
+	if (error != DB_SUCCESS) {
+			goto func_exit;
+	}
 
 	if (!update->n_fields) {
 		/* Nothing to do. */
@@ -2244,14 +2268,13 @@ row_log_table_apply_update(
 	dtuple_t*	old_row;
 	row_ext_t*	old_ext;
 
-	if (dict_table_get_next_index(index)) {
+	if (dict_table_get_next_index(index) != NULL) {
 		/* Construct the row corresponding to the old value of
 		the record. */
 		old_row = row_build(
-			ROW_COPY_DATA, index, btr_pcur_get_rec(&pcur),
-			cur_offsets, NULL, NULL, NULL, &old_ext, heap);
+                        ROW_COPY_DATA, index, btr_pcur_get_rec(&pcur),
+                        cur_offsets, NULL, NULL, NULL, &old_ext, heap);
 		ut_ad(old_row);
-
 		DBUG_PRINT("ib_alter_table",
 			   ("update table " IB_ID_FMT
 			    "(index " IB_ID_FMT "): %s to %s",
@@ -2283,7 +2306,10 @@ row_log_table_apply_update(
 		dtuple_big_rec_free(big_rec);
 	}
 
+	bool vfields_copied = false;
 	while ((index = dict_table_get_next_index(index)) != NULL) {
+
+		n_index++;
 		if (error != DB_SUCCESS) {
 			break;
 		}
@@ -2291,16 +2317,17 @@ row_log_table_apply_update(
 		if (index->type & DICT_FTS) {
 			continue;
 		}
+		
+		if (!vfields_copied && dict_index_has_virtual(index)) {
+			dtuple_copy_v_fields(old_row, old_pk);
+			vfields_copied = true;
+		}
 
 		if (!row_upd_changes_ord_field_binary(
 			    index, update, thr, old_row, NULL)) {
 			continue;
 		}
 
-		if (dict_index_has_virtual(index)) {
-			dtuple_copy_v_fields(old_row, old_pk);
-		}
-
 		mtr_commit(&mtr);
 
 		entry = row_build_index_entry(old_row, old_ext, index, heap);
@@ -2646,6 +2673,11 @@ row_log_table_apply_op(
 		if (num_v) {
 			ulint		o_v_size = 0;
 			ulint		n_v_size = 0;
+
+			if (next_mrec + 2 > mrec_end) {
+				return(NULL);
+			}
+
 			n_v_size = mach_read_from_2(next_mrec);
 			next_mrec += n_v_size;
 			if (next_mrec > mrec_end) {
@@ -2654,17 +2686,22 @@ row_log_table_apply_op(
 
 			/* if there is more than 2 bytes length info */
 			if (n_v_size > 2) {
+				if (next_mrec + 2 > mrec_end) {
+					return(NULL);
+				}
+				o_v_size = mach_read_from_2(next_mrec);
+				if (next_mrec + o_v_size > mrec_end) {
+					return(NULL);
+				}
+
 				trx_undo_read_v_cols(
 					log->table, const_cast<byte*>(
 					next_mrec), old_pk, false,
 					&(log->col_map[log->n_old_col]));
-				o_v_size = mach_read_from_2(next_mrec);
 			}
 
 			next_mrec += o_v_size;
-			if (next_mrec > mrec_end) {
-				return(NULL);
-			}
+			ut_ad(next_mrec <= mrec_end);
 		}
 
 		ut_ad(next_mrec <= mrec_end);
@@ -2886,8 +2923,7 @@ row_log_table_apply_ops(
 			goto func_exit;
 		}
 
-		IORequest	request;
-
+		IORequest request(IORequest::READ | IORequest::ROW_LOG);
 		err = os_file_read_no_error_handling_int_fd(
 			request,
 			index->online_log->fd,
@@ -2995,7 +3031,15 @@ row_log_table_apply_ops(
 
 	while (!trx_is_interrupted(trx)) {
 		mrec = next_mrec;
-		ut_ad(mrec < mrec_end);
+		ut_ad(mrec <= mrec_end);
+
+		if (mrec == mrec_end) {
+			/* We are at the end of the log.
+			   Mark the replay all_done. */
+			if (has_index_lock) {
+				goto all_done;
+			}
+		}
 
 		if (!has_index_lock) {
 			/* We are applying operations from a different
@@ -3717,7 +3761,7 @@ row_log_apply_ops(
 			goto func_exit;
 		}
 
-		IORequest	request;
+		IORequest	request(IORequest::READ | IORequest::ROW_LOG);
 		dberr_t	err = os_file_read_no_error_handling_int_fd(
 			request,
 				index->online_log->fd,
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index b3d9c5a55de3..3738ff47e56d 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1299,24 +1307,24 @@ row_merge_write_rec_low(
 /*====================*/
 	byte*		b,	/*!< out: buffer */
 	ulint		e,	/*!< in: encoded extra_size */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	ulint		size,	/*!< in: total size to write */
 	int		fd,	/*!< in: file descriptor */
 	ulint		foffs,	/*!< in: file offset */
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 	const mrec_t*	mrec,	/*!< in: record to write */
 	const ulint*	offsets)/*!< in: offsets of mrec */
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 # define row_merge_write_rec_low(b, e, size, fd, foffs, mrec, offsets)	\
 	row_merge_write_rec_low(b, e, mrec, offsets)
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 {
 	DBUG_ENTER("row_merge_write_rec_low");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	const byte* const end = b + size;
-#endif /* DBUG_OFF */
-	DBUG_ASSERT(e == rec_offs_extra_size(offsets) + 1);
+#endif /* NDEBUG */
+	assert(e == rec_offs_extra_size(offsets) + 1);
 	DBUG_PRINT("ib_merge_sort",
 		   ("%p,fd=%d,%lu: %s",
 		    reinterpret_cast<const void*>(b), fd, ulong(foffs),
@@ -1330,7 +1338,7 @@ row_merge_write_rec_low(
 	}
 
 	memcpy(b, mrec - rec_offs_extra_size(offsets), rec_offs_size(offsets));
-	DBUG_ASSERT(b + rec_offs_size(offsets) == end);
+	assert(b + rec_offs_size(offsets) == end);
 	DBUG_VOID_RETURN;
 }
 
@@ -1870,11 +1878,11 @@ row_merge_read_clustered_index(
 				}
 			}
 
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 # define dbug_run_purge	false
-#else /* DBUG_OFF */
+#else /* NDEBUG */
 			bool	dbug_run_purge = false;
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 			DBUG_EXECUTE_IF(
 				"ib_purge_on_create_index_page_switch",
 				dbug_run_purge = true;);
@@ -3730,21 +3738,27 @@ int
 row_merge_file_create_low(
 	const char*	path)
 {
-	int	fd;
+    int fd;
+    if (path == NULL) {
+      path = innobase_mysql_tmpdir();
+    }
 #ifdef UNIV_PFS_IO
 	/* This temp file open does not go through normal
 	file APIs, add instrumentation to register with
 	performance schema */
 	struct PSI_file_locker*	locker = NULL;
-	PSI_file_locker_state	state;
-	locker = PSI_FILE_CALL(get_thread_file_name_locker)(
-				&state, innodb_temp_file_key.m_value, PSI_FILE_OPEN,
-				"Innodb Merge Temp File", &locker);
-	if (locker != NULL) {
+	Datafile df;
+	df.make_filepath(path, "Innodb Merge Temp File", NO_EXT);
+
+        PSI_file_locker_state	state;
+        locker = PSI_FILE_CALL(get_thread_file_name_locker)(
+            &state, innodb_temp_file_key.m_value, PSI_FILE_OPEN, df.filepath(),
+            &locker);
+        if (locker != NULL) {
 		PSI_FILE_CALL(start_file_open_wait)(locker,
 						__FILE__,
 						__LINE__);
-	}
+        }
 #endif
 	fd = innobase_mysql_tmpfile(path);
 #ifdef UNIV_PFS_IO
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index a7cdce94e2c5..0d0eeff538fa 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1759,7 +1767,6 @@ row_insert_for_mysql_using_ins_graph(
 			goto run_again;
 		}
 
-		node->duplicate = NULL;
 		trx->op_info = "";
 
 		if (blob_heap != NULL) {
@@ -1769,7 +1776,6 @@ row_insert_for_mysql_using_ins_graph(
 		return(err);
 	}
 
-	node->duplicate = NULL;
 
 	if (dict_table_has_fts_index(table)) {
 		doc_id_t	doc_id;
@@ -1804,8 +1810,7 @@ row_insert_for_mysql_using_ins_graph(
 			doc_ids difference should not exceed
 			FTS_DOC_ID_MAX_STEP value. */
 
-			if (next_doc_id > 1
-			    && doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) {
+			if (doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) {
 				 ib::error() << "Doc ID " << doc_id
 					<< " is too big. Its difference with"
 					" largest used Doc ID "
@@ -2079,6 +2084,70 @@ class ib_dec_counter {
 	}
 };
 
+/** Do an in-place update in the intrinsic table.  The update should not
+modify any of the keys and it should not change the size of any fields.
+@param[in]	node	the update node.
+@return DB_SUCCESS on success, an error code on failure. */
+static
+dberr_t
+row_update_inplace_for_intrinsic(const upd_node_t* node)
+{
+	mtr_t		mtr;
+	dict_table_t*	table = node->table;
+	mem_heap_t*	heap = node->heap;
+	dtuple_t*	entry = node->row;
+	ulint           offsets_[REC_OFFS_NORMAL_SIZE];
+	ulint*          offsets         = offsets_;
+
+	ut_ad(dict_table_is_intrinsic(table));
+
+	rec_offs_init(offsets_);
+	mtr_start(&mtr);
+	mtr_set_log_mode(&mtr, MTR_LOG_NO_REDO);
+
+	btr_pcur_t pcur;
+
+	dict_index_t* index = dict_table_get_first_index(table);
+
+	entry = row_build_index_entry(node->row, node->ext,
+				      index, heap);
+
+	btr_pcur_open(index, entry, PAGE_CUR_LE,
+		      BTR_MODIFY_LEAF, &pcur, &mtr);
+
+	rec_t* rec = btr_pcur_get_rec(&pcur);
+
+	ut_ad(!page_rec_is_infimum(rec));
+	ut_ad(!page_rec_is_supremum(rec));
+
+	offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
+
+	ut_ad(!cmp_dtuple_rec(entry, rec, offsets));
+
+	ut_ad(!rec_get_deleted_flag(rec, dict_table_is_comp(index->table)));
+
+	ut_ad(btr_pcur_get_block(&pcur)->made_dirty_with_no_latch);
+
+	bool size_changes = row_upd_changes_field_size_or_external(
+		index, offsets, node->update);
+
+	if (size_changes) {
+		mtr_commit(&mtr);
+		return(DB_FAIL);
+	}
+
+	row_upd_rec_in_place(rec, index, offsets, node->update, NULL);
+
+	/* Set the changed pages as modified, so that if the page is
+	evicted from the buffer pool it is flushed and we don't lose
+	the changes */
+
+	mtr.set_modified();
+
+	mtr_commit(&mtr);
+
+	return(DB_SUCCESS);
+}
 
 typedef	std::vector<btr_pcur_t, ut_allocator<btr_pcur_t> >	cursors_t;
 
@@ -2100,7 +2169,7 @@ row_delete_for_mysql_using_cursor(
 {
 	mtr_t		mtr;
 	dict_table_t*	table = node->table;
-	mem_heap_t*	heap = mem_heap_create(1000);
+	mem_heap_t*	heap = node->heap;
 	dberr_t		err = DB_SUCCESS;
 	dtuple_t*	entry;
 
@@ -2111,8 +2180,8 @@ row_delete_for_mysql_using_cursor(
 	     index != NULL && err == DB_SUCCESS && !restore_delete;
 	     index = UT_LIST_GET_NEXT(indexes, index)) {
 
-		entry = row_build_index_entry(
-			node->row, node->ext, index, heap);
+		entry = row_build_index_entry(node->row, node->ext,
+					      index, heap);
 
 		btr_pcur_t	pcur;
 
@@ -2208,8 +2277,6 @@ row_delete_for_mysql_using_cursor(
 
 	mtr_commit(&mtr);
 
-	mem_heap_free(heap);
-
 	return(err);
 }
 
@@ -2227,7 +2294,7 @@ row_update_for_mysql_using_cursor(
 {
 	dberr_t		err = DB_SUCCESS;
 	dict_table_t*	table = node->table;
-	mem_heap_t*	heap = mem_heap_create(1000);
+	mem_heap_t*	heap = node->heap;
 	dtuple_t*	entry;
 	dfield_t*	trx_id_field;
 
@@ -2261,12 +2328,12 @@ row_update_for_mysql_using_cursor(
 		entry = row_build_index_entry(
 			node->upd_row, node->upd_ext, index, heap);
 
+
 		if (dict_index_is_clust(index)) {
 			if (!dict_index_is_auto_gen_clust(index)) {
 				err = row_ins_clust_index_entry(
 					index, entry, thr,
-					node->upd_ext
-					? node->upd_ext->n_ext : 0,
+					entry->get_n_ext(),
 					true);
 			}
 		} else {
@@ -2289,9 +2356,10 @@ row_update_for_mysql_using_cursor(
 			node->upd_row, node->upd_ext, index, heap);
 
 		if (dict_index_is_clust(index)) {
+
 			err = row_ins_clust_index_entry(
 				index, entry, thr,
-				node->upd_ext ? node->upd_ext->n_ext : 0,
+				entry->get_n_ext(),
 				false);
 			/* Commit the open mtr as we are processing UPDATE. */
 			if (index->last_ins_cur) {
@@ -2313,9 +2381,6 @@ row_update_for_mysql_using_cursor(
 		}
 	}
 
-	if (heap != NULL) {
-		mem_heap_free(heap);
-	}
 	return(err);
 }
 
@@ -2361,6 +2426,33 @@ row_del_upd_for_mysql_using_cursor(
 	should not be any virtual columns. */
 	row_upd_store_row(node, NULL, NULL);
 
+	if (!node->is_delete) {
+		/* UPDATE operation */
+		bool key_changed = false;
+		dict_table_t* table = prebuilt->table;
+
+		for (dict_index_t* index = UT_LIST_GET_FIRST(table->indexes);
+			index != NULL;
+			index = UT_LIST_GET_NEXT(indexes, index)) {
+
+			key_changed = row_upd_changes_ord_field_binary(
+				index, node->update, thr, node->upd_row,
+				node->upd_ext);
+
+			if (key_changed) {
+				break;
+			}
+		}
+
+		if (!key_changed) {
+			err = row_update_inplace_for_intrinsic(node);
+
+			if (err == DB_SUCCESS) {
+				return(err);
+			}
+		}
+	}
+
 	/* Step-2: Execute DELETE operation. */
 	err = row_delete_for_mysql_using_cursor(node, delete_entries, false);
 
@@ -2968,9 +3060,9 @@ row_create_table_for_mysql(
 		ib::error() << "Trying to create a MySQL system table "
 			<< table->name << " of type InnoDB. MySQL system"
 			" tables must be of the MyISAM type!";
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 err_exit:
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 		dict_mem_table_free(table);
 
 		if (commit) {
@@ -3835,33 +3927,6 @@ row_discard_tablespace(
 		return(err);
 	}
 
-	/* For encrypted table, before we discard the tablespace,
-	we need save the encryption information into table, otherwise,
-	this information will be lost in fil_discard_tablespace along
-	with fil_space_free(). */
-	if (dict_table_is_encrypted(table)) {
-		ut_ad(table->encryption_key == NULL
-		      && table->encryption_iv == NULL);
-
-		table->encryption_key =
-			static_cast<byte*>(mem_heap_alloc(table->heap,
-							  ENCRYPTION_KEY_LEN));
-
-		table->encryption_iv =
-			static_cast<byte*>(mem_heap_alloc(table->heap,
-							  ENCRYPTION_KEY_LEN));
-
-		fil_space_t*	space = fil_space_get(table->space);
-		ut_ad(FSP_FLAGS_GET_ENCRYPTION(space->flags));
-
-		memcpy(table->encryption_key,
-		       space->encryption_key,
-		       ENCRYPTION_KEY_LEN);
-		memcpy(table->encryption_iv,
-		       space->encryption_iv,
-		       ENCRYPTION_KEY_LEN);
-	}
-
 	/* Discard the physical file that is used for the tablespace. */
 
 	err = fil_discard_tablespace(table->space);
@@ -4338,11 +4403,12 @@ row_drop_table_for_mysql(
 		persistent storage if it exists and if there are stats for this
 		table in there. This function creates its own trx and commits
 		it. */
-		char	errstr[1024];
-		err = dict_stats_drop_table(name, errstr, sizeof(errstr));
-
-		if (err != DB_SUCCESS) {
-			ib::warn() << errstr;
+		if (dict_stats_is_persistent_enabled(table)) {
+			char	errstr[1024];
+			err = dict_stats_drop_table(name, errstr, sizeof(errstr));
+			if (err != DB_SUCCESS) {
+				ib::warn() << errstr;
+			}
 		}
 	}
 
@@ -5241,7 +5307,8 @@ row_rename_table_for_mysql(
 	pars_info_t*	info			= NULL;
 	int		retry;
 	bool		aux_fts_rename		= false;
-
+	bool		is_new_part;
+	bool		is_old_part;
 	ut_a(old_name != NULL);
 	ut_a(new_name != NULL);
 	ut_ad(trx->state == TRX_STATE_ACTIVE);
@@ -5256,7 +5323,17 @@ row_rename_table_for_mysql(
 		ib::error() << "Trying to create a MySQL system table "
 			<< new_name << " of type InnoDB. MySQL system tables"
 			" must be of the MyISAM type!";
+		goto funct_exit;
+	}
+
+	/* Check the table identifier length here. It is possible that when we
+	are renaming a temporary table back to original name (after alter)
+	the table identifier length can exceed the maximum file name limit */
 
+	if (strlen(strchr(new_name,'/') + 1) > FN_LEN ) {
+		my_error(ER_PATH_LENGTH, MYF(0),
+			 strchr(new_name,'/')+1);
+		err = DB_IDENTIFIER_TOO_LONG;
 		goto funct_exit;
 	}
 
@@ -5270,6 +5347,12 @@ row_rename_table_for_mysql(
 	table = dict_table_open_on_name(old_name, dict_locked, FALSE,
 					DICT_ERR_IGNORE_NONE);
 
+	is_old_part = strstr((char*)old_name, "#p#") ||
+	              strstr((char*)old_name, "#P");
+
+	is_new_part = strstr((char*)new_name, "#p#") ||
+	              strstr((char*)new_name, "#P");
+
 	if (!table) {
 		err = DB_TABLE_NOT_FOUND;
 		goto funct_exit;
@@ -5303,6 +5386,45 @@ row_rename_table_for_mysql(
 		}
 	}
 
+        /* To exchange a normal table(t1) with partition table (p1), the
+           rename logic is something like: 1) t1 -> tmp table 2) p1-> t1
+           3) tmp -> p1. And special handling of dict_table_t::data_dir_path
+           is necessary if DATA DIRECTORY is specified.
+           For example if DATA DIRECTORY Is '/tmp', the data directory for
+           nomral table is '/tmp/t1', while for partition is '/tmp'. So during
+           above rename step 2) and 3), the postfix table name 't1' should
+           either be truncated or appended.*/
+        if (old_is_tmp && is_new_part && table->data_dir_path != NULL) {
+		std::string str(table->data_dir_path);
+		size_t found = str.find_last_of("/\\");
+
+		ut_ad(found != std::string::npos);
+		found++;
+
+		table->data_dir_path[found] = '\0';
+
+        } else if (is_old_part && !is_new_part &&
+                   table->data_dir_path != NULL && !new_is_tmp) {
+
+		uint old_size = mem_heap_get_size(table->heap);
+
+		std::string str(table->data_dir_path);
+
+		/* new_name contains database/name but we require name */
+                const char *name = strchr(new_name, '/') + 1;
+
+                str.append(name);
+
+		table->data_dir_path =
+		    mem_heap_strdup(table->heap, str.c_str());
+
+		uint new_size = mem_heap_get_size(table->heap);
+
+		ut_ad(mutex_own(&dict_sys->mutex));
+
+		dict_sys->size += new_size - old_size;
+        }
+
 	/* Is a foreign key check running on this table? */
 	for (retry = 0; retry < 100
 	     && table->n_foreign_key_checks_running > 0; ++retry) {
@@ -5382,8 +5504,8 @@ row_rename_table_for_mysql(
 
 	if (!new_is_tmp) {
 		/* Rename all constraints. */
-		char	new_table_name[MAX_TABLE_NAME_LEN] = "";
-		char	old_table_utf8[MAX_TABLE_NAME_LEN] = "";
+		char	new_table_name[MAX_TABLE_NAME_LEN + 1] = "";
+		char	old_table_utf8[MAX_TABLE_NAME_LEN + 1] = "";
 		uint	errors = 0;
 
 		strncpy(old_table_utf8, old_name, MAX_TABLE_NAME_LEN);
@@ -5488,6 +5610,9 @@ row_rename_table_for_mysql(
 			"    = TO_BINARY(:old_table_name);\n"
 			"END;\n"
 			, FALSE, trx);
+		if (err != DB_SUCCESS) {
+			goto end;
+		}
 
 	} else if (n_constraints_to_drop > 0) {
 		/* Drop some constraints of tmp tables. */
@@ -5507,8 +5632,9 @@ row_rename_table_for_mysql(
 		}
 	}
 
-	if (dict_table_has_fts_index(table)
-	    && !dict_tables_have_same_db(old_name, new_name)) {
+	if ((dict_table_has_fts_index(table)
+		|| DICT_TF2_FLAG_IS_SET(table, DICT_TF2_FTS_HAS_DOC_ID))
+		&& !dict_tables_have_same_db(old_name, new_name)) {
 		err = fts_rename_aux_tables(table, new_name, trx);
 		if (err != DB_TABLE_NOT_FOUND) {
 			aux_fts_rename = true;
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
index 7e8f4f68c93f..93a27344c630 100644
--- a/storage/innobase/row/row0purge.cc
+++ b/storage/innobase/row/row0purge.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -23,6 +31,8 @@ Purge obsolete records
 Created 3/14/1997 Heikki Tuuri
 *******************************************************/
 
+#include <debug_sync.h>
+
 #include "row0purge.h"
 
 #ifdef UNIV_NONINL
@@ -170,6 +180,16 @@ row_purge_remove_clust_if_poss_low(
 	} else {
 		dberr_t	err;
 		ut_ad(mode == (BTR_MODIFY_TREE | BTR_LATCH_FOR_DELETE));
+
+		DBUG_EXECUTE_IF("pessimistic_row_purge_clust", {
+			const char act[] =
+				"now SIGNAL pessimistic_row_purge_clust_pause "
+				"WAIT_FOR pessimistic_row_purge_clust_continue";
+			assert(opt_debug_sync_timeout > 0);
+			assert(!debug_sync_set_action(
+				       current_thd, STRING_WITH_LEN(act)));
+		});
+
 		btr_cur_pessimistic_delete(
 			&err, FALSE, btr_pcur_get_btr_cur(&node->pcur), 0,
 			false, &mtr);
@@ -875,7 +895,13 @@ row_purge_parse_undo_rec(
 		ib::info() << "Record with space id "
 			   << node->table->space
 			   << " belongs to table which is being truncated"
+			   << " or tablespace which is missing"
 			   << " therefore skipping this undo record.";
+		if (dict_table_is_encrypted(node->table)) {
+
+			ib::info() << "Skipped record belongs to encrypted tablespace,"
+				   << " Check if the keyring plugin is loaded.";
+		}
 #endif
 		ut_ad(dict_table_is_file_per_table(node->table));
 		dict_table_close(node->table, FALSE, FALSE);
diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc
index 4d3b3c2b2615..b7ec34c51f88 100644
--- a/storage/innobase/row/row0quiesce.cc
+++ b/storage/innobase/row/row0quiesce.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -34,6 +42,7 @@ Created 2012-02-08 by Sunny Bains.
 #include "ibuf0ibuf.h"
 #include "srv0start.h"
 #include "trx0purge.h"
+#include "trx0roll.h"
 #include "fsp0sysspace.h"
 
 #include <my_aes.h>
@@ -905,10 +914,23 @@ row_quiesce_set_state(
 			    " FTS auxiliary tables will not be flushed.");
 	}
 
+	/* We should wait until rollback after recovery end,
+	to lock the table consistently. */
+	trx_rollback_or_clean_wait();
+
+	if (trx_purge_state() != PURGE_STATE_DISABLED) {
+		/* We should stop purge to lock the table consistently. */
+		trx_purge_stop();
+	}
+
 	row_mysql_lock_data_dictionary(trx);
 
 	dict_table_x_lock_indexes(table);
 
+	if (trx_purge_state() != PURGE_STATE_DISABLED) {
+		trx_purge_run();
+	}
+
 	switch (state) {
 	case QUIESCE_START:
 		break;
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc
index 8d374286dbc6..442d74d982a1 100644
--- a/storage/innobase/row/row0row.cc
+++ b/storage/innobase/row/row0row.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -278,6 +286,7 @@ row_build_index_entry_low(
 			continue;
 		}
 
+
 		if ((!ind_field || ind_field->prefix_len == 0)
 		    && (!dfield_is_ext(dfield)
 			|| dict_index_is_clust(index))) {
@@ -298,7 +307,8 @@ row_build_index_entry_low(
 		stored off-page. */
 		ut_ad(col->ord_part);
 
-		if (ext) {
+		if (ext && !dict_col_is_virtual(col)) {
+
 			/* See if the column is stored externally. */
 			const byte*	buf = row_ext_lookup(ext, col_no,
 							     &len);
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 4e740d84ac6c..0e57a65bba91 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -3145,17 +3153,24 @@ row_sel_store_mysql_field_func(
 			field_no, &len, heap);
 
 		if (UNIV_UNLIKELY(!data)) {
+
 			/* The externally stored field was not written
-			yet. This record should only be seen by
-			recv_recovery_rollback_active() or any
+			yet. This can happen after optimization which
+			was done after for Bug#23481444 where we read
+			last record in the page to find the end range
+			scan. If we encounter this we just return false
+			In any other case this row should be only seen
+			by recv_recovery_rollback_active() or any
 			TRX_ISO_READ_UNCOMMITTED transactions. */
-
 			if (heap != prebuilt->blob_heap) {
 				mem_heap_free(heap);
 			}
 
-			ut_a(prebuilt->trx->isolation_level
-			     == TRX_ISO_READ_UNCOMMITTED);
+			ut_a((!prebuilt->idx_cond &&
+			     prebuilt->m_mysql_handler->end_range != NULL)
+			     || (prebuilt->trx->isolation_level
+			     == TRX_ISO_READ_UNCOMMITTED));
+
 			DBUG_RETURN(FALSE);
 		}
 
@@ -4184,17 +4199,52 @@ row_search_idx_cond_check(
 if records are not with in view and also to avoid prefetching too
 many records into the record buffer.
 @param[in]	mysql_rec	record in MySQL format
-@param[in,out]	handler		the MySQL handler performing the scan
-@retval true	if the row in mysql_rec is out of range
-@retval false	if the row in mysql_rec is in range */
+@param[in]	rec			InnoDB record
+@param[in]	prebuilt		prebuilt struct
+@param[in]	clust_templ_for_sec	true if \a rec belongs to the secondary
+					index but the \a prebuilt template is in
+					clustered index format
+@param[in]	offsets			information about column offsets in the
+					secondary index, if virtual columns need
+					to be copied into \a mysql_rec
+@retval true	if the row in \a mysql_rec is out of range
+@retval false	if the row in \a mysql_rec is in range */
 static
 bool
 row_search_end_range_check(
-	const byte*	mysql_rec,
-	ha_innobase*	handler)
+	byte*	mysql_rec,
+	const rec_t*	rec,
+	row_prebuilt_t*	prebuilt,
+	bool clust_templ_for_sec,
+	const ulint*	offsets)
 {
-	if (handler->end_range &&
-	    handler->compare_key_in_buffer(mysql_rec) > 0) {
+	ha_innobase*    handler = prebuilt->m_mysql_handler;
+	ut_ad(handler->end_range != NULL);
+
+	/* When reading from non-covering secondary indexes, mysql_rec won't
+	have the values of virtual columns until the handler has called
+	update_generated_read_fields(). If the end-range condition refers to a
+	virtual column, we may have to copy its value from the secondary index
+	before evaluating the condition. */
+	if (clust_templ_for_sec && handler->m_virt_gcol_in_end_range) {
+		ut_ad(offsets != NULL);
+		for (ulint i = 0; i < prebuilt->n_template; ++i) {
+			const mysql_row_templ_t* templ =  prebuilt->mysql_template + i;
+			if (templ->is_virtual &&
+			    templ->icp_rec_field_no != ULINT_UNDEFINED &&
+			    !row_sel_store_mysql_field(mysql_rec, prebuilt,
+						       rec,
+						       prebuilt->index,
+						       offsets,
+						       templ->icp_rec_field_no,
+						       templ,
+						       false)) {
+				return(false);
+			}
+		}
+	}
+
+	if (handler->compare_key_in_buffer(mysql_rec) > 0) {
 		return(true);
 	}
 
@@ -4574,6 +4624,33 @@ row_sel_fill_vrow(
 	}
 }
 
+#ifdef UNIV_DEBUG
+/** If the record is not old version, copies an initial segment
+of a physical record to be compared later for debug assertion code.
+@param[in]	pcur		cursor whose position has been stored
+@param[in]	index		index
+@param[in]	rec		record for which to copy prefix
+@param[out]	n_fields	number of fields copied
+@param[in,out]	buf		memory buffer for the copied prefix, or NULL
+@param[in,out]	buf_size	buffer size
+@return pointer to the prefix record if not old version. or NULL if old */
+static inline rec_t *row_search_debug_copy_rec_order_prefix(
+	const btr_pcur_t* pcur,
+	const dict_index_t* index,
+	const rec_t*	rec,
+	ulint*	n_fields,
+	byte**	buf,
+	ulint*	buf_size)
+{
+	if (btr_pcur_get_rec(pcur) == rec) {
+		return dict_index_copy_rec_order_prefix(
+				index, rec, n_fields, buf, buf_size);
+	} else {
+		return NULL;
+	}
+}
+#endif /* UNIV_DEBUG */
+
 /** Searches for rows in the database using cursor.
 Function is mainly used for tables that are shared accorss connection and
 so it employs technique that can help re-construct the rows that
@@ -4611,6 +4688,12 @@ row_search_mvcc(
 	dict_index_t*	clust_index;
 	que_thr_t*	thr;
 	const rec_t*	prev_rec = NULL;
+#ifdef UNIV_DEBUG
+	const rec_t*	prev_rec_debug = NULL;
+	ulint prev_rec_debug_n_fields = 0;
+	byte *prev_rec_debug_buf = NULL;
+	ulint prev_rec_debug_buf_size = 0;
+#endif /* UNIV_DEBUG */
 	const rec_t*	rec = NULL;
 	byte*		end_range_cache = NULL;
 	const dtuple_t*	prev_vrow = NULL;
@@ -4718,6 +4801,7 @@ row_search_mvcc(
 		prebuilt->n_rows_fetched = 0;
 		prebuilt->n_fetch_cached = 0;
 		prebuilt->fetch_cache_first = 0;
+		prebuilt->m_end_range = false;
 
 		if (prebuilt->sel_graph == NULL) {
 			/* Build a dummy select query graph */
@@ -5061,6 +5145,8 @@ row_search_mvcc(
 			&same_user_rec, BTR_SEARCH_LEAF,
 			pcur, moves_up, &mtr);
 
+		ut_ad(prev_rec == NULL);
+
 		if (UNIV_UNLIKELY(need_to_process)) {
 			if (UNIV_UNLIKELY(prebuilt->row_read_type
 					  == ROW_READ_DID_SEMI_CONSISTENT)) {
@@ -5191,20 +5277,21 @@ row_search_mvcc(
 		passed to InnoDB when there is no ICP and number of
 		loops in row_search_mvcc for rows found but not
 		reporting due to search views etc. */
-		if (prev_rec != NULL
+		if (prev_rec != NULL && !prebuilt->innodb_api
 		    && prebuilt->m_mysql_handler->end_range != NULL
 		    && prebuilt->idx_cond == NULL && end_loop >= 100) {
 
+			bool clust_templ_for_sec =
+				index != clust_index &&
+				prebuilt->need_to_access_clustered;
 			dict_index_t*	key_index = prebuilt->index;
-			bool		clust_templ_for_sec = false;
 
 			if (end_range_cache == NULL) {
 				end_range_cache = static_cast<byte*>(
 					ut_malloc_nokey(prebuilt->mysql_row_len));
 			}
 
-			if (index != clust_index
-			    && prebuilt->need_to_access_clustered) {
+			if (clust_templ_for_sec) {
 				/** Secondary index record but the template
 				based on PK. */
 				key_index = clust_index;
@@ -5221,8 +5308,8 @@ row_search_mvcc(
 				clust_templ_for_sec)) {
 
 				if (row_search_end_range_check(
-					end_range_cache,
-					prebuilt->m_mysql_handler)) {
+					end_range_cache, prev_rec, prebuilt,
+					clust_templ_for_sec, offsets)) {
 
 					/** In case of prebuilt->fetch,
 					set the error in prebuilt->end_range. */
@@ -5234,6 +5321,8 @@ row_search_mvcc(
 					goto normal_return;
 				}
 			}
+
+			DEBUG_SYNC_C("allow_insert");
 		}
 
 		if (set_also_gap_locks
@@ -5360,6 +5449,9 @@ row_search_mvcc(
 	}
 
 	prev_rec = rec;
+	ut_d(prev_rec_debug = row_search_debug_copy_rec_order_prefix(
+		pcur, index, prev_rec, &prev_rec_debug_n_fields,
+		&prev_rec_debug_buf, &prev_rec_debug_buf_size));
 
 	/* Note that we cannot trust the up_match value in the cursor at this
 	place because we can arrive here after moving the cursor! Thus
@@ -5525,6 +5617,7 @@ row_search_mvcc(
 				prebuilt->new_rec_locks = 1;
 			}
 			err = DB_SUCCESS;
+ 			// Fall through
 		case DB_SUCCESS:
 			break;
 		case DB_LOCK_WAIT:
@@ -5584,6 +5677,11 @@ row_search_mvcc(
 			did_semi_consistent_read = TRUE;
 			rec = old_vers;
 			prev_rec = rec;
+			ut_d(prev_rec_debug
+			     = row_search_debug_copy_rec_order_prefix(
+				pcur, index, prev_rec,
+				&prev_rec_debug_n_fields, &prev_rec_debug_buf,
+				&prev_rec_debug_buf_size));
 			break;
 		case DB_RECORD_NOT_FOUND:
 			if (dict_index_is_spatial(index)) {
@@ -5640,6 +5738,12 @@ row_search_mvcc(
 
 				rec = old_vers;
 				prev_rec = rec;
+				ut_d(prev_rec_debug
+				     = row_search_debug_copy_rec_order_prefix(
+					pcur, index, prev_rec,
+					&prev_rec_debug_n_fields,
+					&prev_rec_debug_buf,
+					&prev_rec_debug_buf_size));
 			}
 		} else {
 			/* We are looking into a non-clustered index,
@@ -6069,6 +6173,8 @@ row_search_mvcc(
 		order if we would access a different clustered
 		index page right away without releasing the previous. */
 
+		bool is_pcur_rec = (btr_pcur_get_rec(pcur) == prev_rec);
+
 		/* No need to do store restore for R-tree */
 		if (!spatial_search) {
 			btr_pcur_store_position(pcur, &mtr);
@@ -6077,13 +6183,50 @@ row_search_mvcc(
 		mtr_commit(&mtr);
 		mtr_has_extra_clust_latch = FALSE;
 
+		DEBUG_SYNC_C("row_search_before_mtr_restart_for_extra_clust");
+
 		mtr_start(&mtr);
 
-		if (!spatial_search
-		    && sel_restore_position_for_mysql(&same_user_rec,
-						   BTR_SEARCH_LEAF,
-						   pcur, moves_up, &mtr)) {
-			goto rec_loop;
+		if (!spatial_search) {
+			const ibool result = sel_restore_position_for_mysql(
+				&same_user_rec, BTR_SEARCH_LEAF, pcur,
+				moves_up, &mtr);
+
+			if (result) {
+				prev_rec = NULL;
+				goto rec_loop;
+			}
+
+			ut_ad(same_user_rec);
+
+			if (is_pcur_rec
+			    && btr_pcur_get_rec(pcur) != prev_rec) {
+				/* prev_rec is invalid. */
+				prev_rec = NULL;
+			}
+#ifdef UNIV_DEBUG
+			if (prev_rec != NULL && prev_rec_debug != NULL) {
+				const ulint *offsets1;
+				const ulint *offsets2;
+
+				mem_heap_t* heap_tmp = mem_heap_create(256);
+
+				offsets1 = rec_get_offsets(
+					prev_rec_debug, index, NULL,
+					prev_rec_debug_n_fields, &heap_tmp);
+
+				offsets2 = rec_get_offsets(
+					prev_rec, index, NULL,
+					prev_rec_debug_n_fields, &heap_tmp);
+
+				ut_ad(!cmp_rec_rec(
+					prev_rec_debug, prev_rec, offsets1,
+					offsets2, index,
+					page_is_spatial_non_leaf(
+						prev_rec, index)));
+				mem_heap_free(heap_tmp);
+			}
+#endif /* UNIV_DEBUG */
 		}
 	}
 
@@ -6164,6 +6307,7 @@ row_search_mvcc(
 			sel_restore_position_for_mysql(
 				&same_user_rec, BTR_SEARCH_LEAF, pcur,
 				moves_up, &mtr);
+			prev_rec = NULL;
 		}
 
 		if ((srv_locks_unsafe_for_binlog
@@ -6257,6 +6401,12 @@ row_search_mvcc(
 		mem_heap_free(heap);
 	}
 
+#ifdef UNIV_DEBUG
+	if (prev_rec_debug_buf != NULL) {
+		ut_free(prev_rec_debug_buf);
+	}
+#endif /* UNIV_DEBUG */
+
 	/* Set or reset the "did semi-consistent read" flag on return.
 	The flag did_semi_consistent_read is set if and only if
 	the record being returned was fetched with a semi-consistent read. */
diff --git a/storage/innobase/row/row0trunc.cc b/storage/innobase/row/row0trunc.cc
index 73bed52e8be8..2aa7c95275da 100644
--- a/storage/innobase/row/row0trunc.cc
+++ b/storage/innobase/row/row0trunc.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2013, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -35,6 +43,8 @@ Created 2013-04-12 Sunny Bains
 #include "srv0start.h"
 #include "row0trunc.h"
 #include "os0file.h"
+#include "trx0purge.h"
+#include "trx0roll.h"
 #include <vector>
 
 bool	truncate_t::s_fix_up_active = false;
@@ -617,7 +627,7 @@ TruncateLogParser::scan(
 			}
 			memset(log_file_name, 0, sz);
 
-			strncpy(log_file_name, dir_path, dir_len);
+			memcpy(log_file_name, dir_path, dir_len);
 			ulint	log_file_name_len = strlen(log_file_name);
 			if (log_file_name[log_file_name_len - 1]
 				!= OS_PATH_SEPARATOR) {
@@ -1227,6 +1237,10 @@ row_truncate_complete(
 	TruncateLogger*		&logger,
 	dberr_t			err)
 {
+	if (trx_purge_state() != PURGE_STATE_DISABLED) {
+		trx_purge_run();
+	}
+
 	bool	is_file_per_table = dict_table_is_file_per_table(table);
 
 	if (table->memcached_sync_count == DICT_TABLE_IN_DDL) {
@@ -1235,6 +1249,11 @@ row_truncate_complete(
 		table->memcached_sync_count = 0;
 	}
 
+	/* Add the table back to FTS optimize background thread. */
+	if (table->fts) {
+		fts_optimize_add_table(table);
+	}
+
 	row_mysql_unlock_data_dictionary(trx);
 
 	DEBUG_SYNC_C("ib_trunc_table_trunc_completing");
@@ -1580,6 +1599,9 @@ row_truncate_update_system_tables(
 
 		/* Reset the Doc ID in cache to 0 */
 		if (has_internal_doc_id && table->fts->cache != NULL) {
+			DBUG_EXECUTE_IF("ib_trunc_sleep_before_fts_cache_clear",
+					os_thread_sleep(10000000););
+
 			table->fts->fts_status |= TABLE_DICT_LOCKED;
 			fts_update_next_doc_id(trx, table, NULL, 0);
 			fts_cache_clear(table->fts->cache);
@@ -1827,6 +1849,15 @@ row_truncate_table_for_mysql(
 		trx_start_for_ddl(trx, TRX_DICT_OP_TABLE);
 	}
 
+	/* We should wait until rollback after recovery end,
+	to lock the table consistently. */
+	trx_rollback_or_clean_wait();
+
+	if (trx_purge_state() != PURGE_STATE_DISABLED) {
+		/* We should stop purge to lock the table consistently. */
+		trx_purge_stop();
+	}
+
 	/* Step-3: Validate ownership of needed locks (Exclusive lock).
 	Ownership will also ensure there is no active SQL queries, INSERT,
 	SELECT, .....*/
@@ -1838,6 +1869,13 @@ row_truncate_table_for_mysql(
 
 	/* Step-4: Stop all the background process associated with table. */
 	dict_stats_wait_bg_to_stop_using_table(table, trx);
+	if (table->fts) {
+		/* Remove from FTS optimize thread. Unlock is needed to allow
+		finishing background operations in progress. */
+		row_mysql_unlock_data_dictionary(trx);
+		fts_optimize_remove_table(table);
+		row_mysql_lock_data_dictionary(trx);
+	}
 
 	/* Step-5: There are few foreign key related constraint under which
 	we can't truncate table (due to referential integrity unless it is
diff --git a/storage/innobase/row/row0uins.cc b/storage/innobase/row/row0uins.cc
index 4615a4e233b0..d08929dbee42 100644
--- a/storage/innobase/row/row0uins.cc
+++ b/storage/innobase/row/row0uins.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -47,7 +55,6 @@ Created 2/25/1997 Heikki Tuuri
 #include "ibuf0ibuf.h"
 #include "log0log.h"
 #include "fil0fil.h"
-
 /*************************************************************************
 IMPORTANT NOTE: Any operation that generates redo MUST check that there
 is enough space in the redo log before for that operation. This is
@@ -137,6 +144,8 @@ row_undo_ins_remove_clust_rec(
 		ut_a(success);
 	}
 
+	row_convert_impl_to_expl_if_needed(btr_cur, node);
+
 	if (btr_cur_optimistic_delete(btr_cur, 0, &mtr)) {
 		err = DB_SUCCESS;
 		goto func_exit;
@@ -190,7 +199,8 @@ row_undo_ins_remove_sec_low(
 				pessimistic descent down the index tree */
 	dict_index_t*	index,	/*!< in: index */
 	dtuple_t*	entry,	/*!< in: index entry to remove */
-	que_thr_t*	thr)	/*!< in: query thread */
+	que_thr_t*	thr,	/*!< in: query thread */
+	undo_node_t*	node)	/*!< in: undo node */
 {
 	btr_pcur_t		pcur;
 	btr_cur_t*		btr_cur;
@@ -198,9 +208,9 @@ row_undo_ins_remove_sec_low(
 	mtr_t			mtr;
 	enum row_search_result	search_result;
 	ibool			modify_leaf = false;
+	ulint			rec_deleted;
 
 	log_free_check();
-	memset(&pcur, 0, sizeof(pcur));
 
 	mtr_start(&mtr);
 	mtr.set_named_space(index->space);
@@ -244,10 +254,11 @@ row_undo_ins_remove_sec_low(
 		ut_error;
 	}
 
+	rec_deleted = rec_get_deleted_flag(btr_pcur_get_rec(&pcur),
+					   dict_table_is_comp(index->table));
+
 	if (search_result == ROW_FOUND && dict_index_is_spatial(index)) {
-		rec_t*	rec = btr_pcur_get_rec(&pcur);
-		if (rec_get_deleted_flag(rec,
-					 dict_table_is_comp(index->table))) {
+		if(rec_deleted) {
 			ib::error() << "Record found in index " << index->name
 				<< " is deleted marked on insert rollback.";
 		}
@@ -255,6 +266,15 @@ row_undo_ins_remove_sec_low(
 
 	btr_cur = btr_pcur_get_btr_cur(&pcur);
 
+	if (rec_deleted == 0) {
+		/* This record is not delete marked and has an implicit
+		lock on it. For delete marked record, INSERT has not
+		modified it yet and we don't have implicit lock on it.
+		We must convert to explicit if and only if we have
+		implicit lock on the record.*/
+		row_convert_impl_to_expl_if_needed(btr_cur, node);
+	}
+
 	if (modify_leaf) {
 		err = btr_cur_optimistic_delete(btr_cur, 0, &mtr)
 			? DB_SUCCESS : DB_FAIL;
@@ -285,14 +305,15 @@ row_undo_ins_remove_sec(
 /*====================*/
 	dict_index_t*	index,	/*!< in: index */
 	dtuple_t*	entry,	/*!< in: index entry to insert */
-	que_thr_t*	thr)	/*!< in: query thread */
+	que_thr_t*	thr,	/*!< in: query thread */
+	undo_node_t*	node)
 {
 	dberr_t	err;
 	ulint	n_tries	= 0;
 
 	/* Try first optimistic descent to the B-tree */
 
-	err = row_undo_ins_remove_sec_low(BTR_MODIFY_LEAF, index, entry, thr);
+	err = row_undo_ins_remove_sec_low(BTR_MODIFY_LEAF, index, entry, thr, node);
 
 	if (err == DB_SUCCESS) {
 
@@ -303,7 +324,7 @@ row_undo_ins_remove_sec(
 retry:
 	err = row_undo_ins_remove_sec_low(
 		BTR_MODIFY_TREE | BTR_LATCH_FOR_DELETE,
-		index, entry, thr);
+		index, entry, thr, node);
 
 	/* The delete operation may fail if we have little
 	file space left: TODO: easiest to crash the database
@@ -426,7 +447,7 @@ row_undo_ins_remove_sec_rec(
 			assume that the secondary index record does
 			not exist. */
 		} else {
-			err = row_undo_ins_remove_sec(index, entry, thr);
+			err = row_undo_ins_remove_sec(index, entry, thr, node);
 
 			if (UNIV_UNLIKELY(err != DB_SUCCESS)) {
 				goto func_exit;
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc
index 3d50bb05708d..53434309051b 100644
--- a/storage/innobase/row/row0umod.cc
+++ b/storage/innobase/row/row0umod.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -124,6 +132,10 @@ row_undo_mod_clust_low(
 		*rebuilt_old_pk = NULL;
 	}
 
+	/* Update would release the implicit lock. Must convert to
+	explicit lock before applying update undo.*/
+	row_convert_impl_to_expl_if_needed(btr_cur, node);
+
 	if (mode != BTR_MODIFY_TREE) {
 		ut_ad((mode & ~BTR_ALREADY_S_LATCHED) == BTR_MODIFY_LEAF);
 
@@ -351,6 +363,8 @@ row_undo_mod_clust(
 
 	btr_pcur_commit_specify_mtr(pcur, &mtr);
 
+	DEBUG_SYNC_C("ib_undo_mod_before_remove_clust");
+
 	if (err == DB_SUCCESS && node->rec_type == TRX_UNDO_UPD_DEL_REC) {
 
 		mtr_start(&mtr);
@@ -415,6 +429,7 @@ row_undo_mod_del_mark_or_remove_sec_low(
 	mtr_t			mtr_vers;
 	row_search_result	search_result;
 	ibool			modify_leaf = false;
+	ulint			rec_deleted;
 
 	log_free_check();
 	mtr_start(&mtr);
@@ -496,23 +511,33 @@ row_undo_mod_del_mark_or_remove_sec_low(
 					       btr_pcur_get_rec(&(node->pcur)),
 					       &mtr_vers, index, entry,
 					       0, 0);
+
+	/* If the key is delete marked then the statement could not modify the
+	key yet and the transaction has no implicit lock on it. We must convert
+	to explicit lock if and only if we are the transaction which has implicit
+	lock on it.Note that it is still ok to purge the delete mark key if it is
+	purgeable.*/
+	rec_deleted = rec_get_deleted_flag(btr_pcur_get_rec(&pcur),
+                                                 dict_table_is_comp(index->table));
+	if (rec_deleted == 0) {
+		row_convert_impl_to_expl_if_needed(btr_cur, node);
+	}
+
 	if (old_has) {
 		err = btr_cur_del_mark_set_sec_rec(BTR_NO_LOCKING_FLAG,
 						   btr_cur, TRUE, thr, &mtr);
 		ut_ad(err == DB_SUCCESS);
 	} else {
 		/* Remove the index record */
-
 		if (dict_index_is_spatial(index)) {
-			rec_t*	rec = btr_pcur_get_rec(&pcur);
-			if (rec_get_deleted_flag(rec,
-						 dict_table_is_comp(index->table))) {
+			if (rec_deleted) {
 				ib::error() << "Record found in index "
 					<< index->name << " is deleted marked"
 					" on rollback update.";
 			}
 		}
 
+
 		if (modify_leaf) {
 			success = btr_cur_optimistic_delete(btr_cur, 0, &mtr);
 			if (success) {
diff --git a/storage/innobase/row/row0undo.cc b/storage/innobase/row/row0undo.cc
index f72e8aa14eac..4cce8366304f 100644
--- a/storage/innobase/row/row0undo.cc
+++ b/storage/innobase/row/row0undo.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -130,7 +138,8 @@ row_undo_node_create(
 /*=================*/
 	trx_t*		trx,	/*!< in/out: transaction */
 	que_thr_t*	parent,	/*!< in: parent node, i.e., a thr node */
-	mem_heap_t*	heap)	/*!< in: memory heap where created */
+	mem_heap_t*	heap,	/*!< in: memory heap where created */
+	bool		partial_rollback) /*!< in: true if partial rollback */
 {
 	undo_node_t*	undo;
 
@@ -147,6 +156,8 @@ row_undo_node_create(
 	undo->state = UNDO_NODE_FETCH_NEXT;
 	undo->trx = trx;
 
+	undo->partial = partial_rollback;
+
 	btr_pcur_init(&(undo->pcur));
 
 	undo->heap = mem_heap_create(256);
@@ -344,6 +355,45 @@ row_undo(
 	return(err);
 }
 
+void
+row_convert_impl_to_expl_if_needed(
+/*===============================*/
+	btr_cur_t*	cursor, /*!< in: cursor to record */
+	undo_node_t*	node)	/*!< in: undo node */
+{
+	ulint*		offsets = NULL;
+
+	/* In case of partial rollback implicit lock on the
+	record is released in the middle of transaction, which
+	can break the serializability of IODKU and REPLACE
+	statements. Normal rollback is not affected by this
+	becasue we release the locks after the rollback. So
+	to prevent any other transaction modifying the record
+	in between the partial rollback we convert the implicit
+	lock on the record to explict. When the record is actually
+	deleted this lock be inherited by the next record.  */
+
+	if (!node->partial
+	    || (node->trx == NULL)
+	    || node->trx->isolation_level < TRX_ISO_REPEATABLE_READ){
+		return;
+	}
+
+	ut_ad(node->trx->in_rollback);
+	dict_index_t*	index = btr_cur_get_index(cursor);
+	rec_t*		rec = btr_cur_get_rec(cursor);
+	buf_block_t*	block = btr_cur_get_block(cursor);
+	ulint		heap_no = page_rec_get_heap_no(rec);
+
+	if (heap_no != PAGE_HEAP_NO_SUPREMUM
+	    && !dict_table_is_intrinsic(index->table)
+	    && !dict_table_is_temporary(index->table)
+	    && !dict_index_is_spatial(index)) {
+		lock_rec_convert_active_impl_to_expl(block, rec, index,
+						      offsets,node->trx,heap_no);
+	}
+}
+
 /***********************************************************//**
 Undoes a row operation in a table. This is a high-level function used
 in SQL execution graphs.
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index dd7206500c54..03c874a56356 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -267,9 +275,10 @@ row_upd_check_references_constraints(
 			if it is interrupted. So if the foreign table is
 			undergoing a truncate, ignore the FK check. */
 
-			if (foreign_table != NULL
-			    && fil_space_is_being_truncated(
-						foreign_table->space)) {
+			if (foreign_table != NULL &&
+			   (dict_table_is_discarded(foreign_table)
+			    || fil_space_is_being_truncated(
+						foreign_table->space))) {
 				continue;
 			}
 
@@ -876,8 +885,9 @@ the equal ordering fields. NOTE: we compare the fields as binary strings!
 @param[in]	heap		memory heap from which allocated
 @param[in]	mysql_table	NULL, or mysql table object when
 				user thread invokes dml
+@param[out]	error		error number in case of failure
 @return own: update vector of differing fields, excluding roll ptr and
-trx id */
+trx id,if error is not equal to DB_SUCCESS, return NULL */
 upd_t*
 row_upd_build_difference_binary(
 	dict_index_t*	index,
@@ -887,7 +897,8 @@ row_upd_build_difference_binary(
 	bool		no_sys,
 	trx_t*		trx,
 	mem_heap_t*	heap,
-	TABLE*		mysql_table)
+	TABLE*		mysql_table,
+	dberr_t*	error)
 {
 	upd_field_t*	upd_field;
 	dfield_t*	dfield;
@@ -993,6 +1004,10 @@ row_upd_build_difference_binary(
 				update->old_vrow, col, index,
 				&v_heap, heap, NULL, thd, mysql_table,
 				NULL, NULL, NULL);
+			if (vfield == NULL) {
+				*error = DB_COMPUTE_VALUE_FAILED;
+				return(NULL);
+			}
 
 			if (!dfield_data_is_binary_equal(
 				dfield, vfield->len,
@@ -1939,9 +1954,26 @@ row_upd_eval_new_vals(
 	}
 }
 
+/** Copies the data pointed to by the new values for virtual fields to update
+@param[in,out]	update		an update vector */
+static
+void
+row_upd_dup_v_new_vals(
+	const upd_t*	update)
+{
+	ut_ad(update != NULL);
+
+	for (ulint j = 0; j < upd_get_n_fields(update); j++) {
+		upd_field_t *upd_field = upd_get_nth_field(update, j);
+		if (upd_field->new_val.type.prtype & DATA_VIRTUAL) {
+			dfield_dup(&upd_field->new_val, update->heap);
+		}
+	}
+}
+
 /** Stores to the heap the virtual columns that need for any indexes
 @param[in,out]	node		row update node
-@param[in]	update		an update vector if it is update
+@param[in,out]	update		an update vector if it is update
 @param[in]	thd		mysql thread handle
 @param[in,out]	mysql_table	mysql table object */
 static
@@ -1954,6 +1986,8 @@ row_upd_store_v_row(
 {
 	mem_heap_t*	heap = NULL;
 	dict_index_t*	index = dict_table_get_first_index(node->table);
+	bool		new_val_v_cols_dup = false;
+	const ulint	n_upd = update ? upd_get_n_fields(update) : 0;
 
 	for (ulint col_no = 0; col_no < dict_table_get_n_v_cols(node->table);
 	     col_no++) {
@@ -1964,8 +1998,6 @@ row_upd_store_v_row(
 		if (col->m_col.ord_part) {
 			dfield_t*	dfield
 				= dtuple_get_nth_v_field(node->row, col_no);
-			ulint		n_upd
-				= update ? upd_get_n_fields(update) : 0;
 			ulint		i = 0;
 
 			/* Check if the value is already in update vector */
@@ -1979,6 +2011,7 @@ row_upd_store_v_row(
 				}
 
 				dfield_copy_data(dfield, upd_field->old_v_val);
+				dfield_dup(dfield, node->heap);
 				break;
 			}
 
@@ -1999,6 +2032,19 @@ row_upd_store_v_row(
 								update->old_vrow,
 								col_no);
 						dfield_copy_data(dfield, vfield);
+						dfield_dup(dfield, node->heap);
+						if (dfield_is_null(dfield)) {
+						  if (!new_val_v_cols_dup) {
+						    row_upd_dup_v_new_vals(
+						      update);
+						    new_val_v_cols_dup = true;
+						  }
+						  innobase_get_computed_value(
+							node->row, col, index,
+							&heap, node->heap, NULL,
+							thd, mysql_table, NULL,
+							NULL, NULL);
+						}
 					}
 				} else {
 					/* Need to compute, this happens when
@@ -2572,7 +2618,7 @@ row_upd_clust_rec_by_insert(
 
 	err = row_ins_clust_index_entry(
 		index, entry, thr,
-		node->upd_ext ? node->upd_ext->n_ext : 0, false);
+		entry->get_n_ext(), false);
 	node->state = UPD_NODE_INSERT_CLUSTERED;
 
 	mem_heap_free(heap);
diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc
index fa10cc12eb95..a3fe1d6a906f 100644
--- a/storage/innobase/row/row0vers.cc
+++ b/storage/innobase/row/row0vers.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -911,11 +919,11 @@ row_vers_old_has_index_entry(
 				NULL, NULL, NULL, &ext, heap);
 
 		if (dict_index_has_virtual(index)) {
-#ifdef DBUG_OFF
+#ifdef NDEBUG
 # define dbug_v_purge false
-#else /* DBUG_OFF */
+#else /* NDEBUG */
                         bool    dbug_v_purge = false;
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 
 			DBUG_EXECUTE_IF(
 				"ib_purge_virtual_index_callback",
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc
index ae06869c1ec6..ea333bf6e908 100644
--- a/storage/innobase/srv/srv0conc.cc
+++ b/storage/innobase/srv/srv0conc.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -15,13 +15,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
index f23790abe893..d86181cddc7d 100644
--- a/storage/innobase/srv/srv0mon.cc
+++ b/storage/innobase/srv/srv0mon.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
-Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 Copyright (c) 2012, Facebook Inc.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1933,7 +1941,7 @@ srv_mon_process_existing_counter(
 			    & MONITOR_DISPLAY_CURRENT) {
 				MONITOR_SET(monitor_id, value);
 			} else {
-				/* Most status counters are montonically
+				/* Most status counters are monotonically
 				increasing, no need to update their
 				minimum values. Only do so
 				if "update_min" set to TRUE */
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index fa8109cc6de2..dbe514ba9670 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -17,13 +17,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -78,7 +86,7 @@ Created 10/8/1995 Heikki Tuuri
 #endif /* UNIV_PFS_THREAD */
 
 /* The following is the maximum allowed duration of a lock wait. */
-ulint	srv_fatal_semaphore_wait_threshold = 600;
+ulong	srv_fatal_semaphore_wait_threshold = 600;
 
 /* How much data manipulation language (DML) statements need to be delayed,
 in microseconds, in order to reduce the lagging of the purge thread. */
@@ -250,7 +258,7 @@ const ulint	srv_buf_pool_min_size	= 5 * 1024 * 1024;
 const ulint	srv_buf_pool_def_size	= 128 * 1024 * 1024;
 /** Requested buffer pool chunk size. Each buffer pool instance consists
 of one or more chunks. */
-ulong	srv_buf_pool_chunk_unit;
+ulonglong	srv_buf_pool_chunk_unit;
 /** Requested number of buffer pool instances */
 ulong	srv_buf_pool_instances;
 /** Default number of buffer pool instances */
@@ -350,11 +358,11 @@ starting from SRV_FORCE_IGNORE_CORRUPT, so that data can be recovered
 by SELECT or mysqldump. When this is nonzero, we do not allow any user
 modifications to the data. */
 ulong	srv_force_recovery;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /** Inject a crash at different steps of the recovery process.
 This is for testing and debugging only. */
 ulong	srv_force_recovery_crash;
-#endif /* !DBUG_OFF */
+#endif /* !NDEBUG */
 
 /** Print all user-level transactions deadlocks to mysqld stderr */
 
@@ -419,7 +427,7 @@ i/o handler thread */
 const char* srv_io_thread_op_info[SRV_MAX_N_IO_THREADS];
 const char* srv_io_thread_function[SRV_MAX_N_IO_THREADS];
 
-time_t	srv_last_monitor_time;
+ib_time_monotonic_t	srv_last_monitor_time;
 
 ib_mutex_t	srv_innodb_monitor_mutex;
 
@@ -462,7 +470,7 @@ static ulint		srv_log_writes_and_flush	= 0;
 time when the last flush of log file has happened. The master
 thread ensures that we flush the log files at least once per
 second. */
-static time_t	srv_last_log_flush_time;
+static ib_time_monotonic_t	srv_last_log_flush_time;
 
 /* Interval in seconds at which various tasks are performed by the
 master thread when server is active. In order to balance the workload,
@@ -1139,7 +1147,7 @@ srv_refresh_innodb_monitor_stats(void)
 {
 	mutex_enter(&srv_innodb_monitor_mutex);
 
-	srv_last_monitor_time = time(NULL);
+	srv_last_monitor_time = ut_time_monotonic();
 
 	os_aio_refresh_stats();
 
@@ -1173,23 +1181,22 @@ srv_printf_innodb_monitor(
 	ulint*	trx_end)	/*!< out: file position of the end of
 				the list of active transactions */
 {
-	double	time_elapsed;
-	time_t	current_time;
+	double 			time_elapsed;
+	ib_time_monotonic_t	current_time;
 	ulint	n_reserved;
 	ibool	ret;
 
 	mutex_enter(&srv_innodb_monitor_mutex);
 
-	current_time = time(NULL);
+	current_time = ut_time_monotonic();
 
 	/* We add 0.001 seconds to time_elapsed to prevent division
 	by zero if two users happen to call SHOW ENGINE INNODB STATUS at the
 	same time */
 
-	time_elapsed = difftime(current_time, srv_last_monitor_time)
-		+ 0.001;
+	time_elapsed = current_time - srv_last_monitor_time + 0.001;
 
-	srv_last_monitor_time = time(NULL);
+	srv_last_monitor_time = ut_time_monotonic();
 
 	fputs("\n=====================================\n", file);
 
@@ -1554,9 +1561,9 @@ DECLARE_THREAD(srv_monitor_thread)(
 			os_thread_create */
 {
 	int64_t		sig_count;
-	double		time_elapsed;
-	time_t		current_time;
-	time_t		last_monitor_time;
+	ib_time_monotonic_t		time_elapsed;
+	ib_time_monotonic_t		current_time;
+	ib_time_monotonic_t		last_monitor_time;
 	ulint		mutex_skipped;
 	ibool		last_srv_print_monitor;
 
@@ -1573,7 +1580,7 @@ DECLARE_THREAD(srv_monitor_thread)(
 	srv_monitor_active = TRUE;
 
 	UT_NOT_USED(arg);
-	srv_last_monitor_time = last_monitor_time = ut_time();
+	srv_last_monitor_time = last_monitor_time = ut_time_monotonic();
 	mutex_skipped = 0;
 	last_srv_print_monitor = srv_print_innodb_monitor;
 loop:
@@ -1584,12 +1591,12 @@ DECLARE_THREAD(srv_monitor_thread)(
 
 	os_event_wait_time_low(srv_monitor_event, 5000000, sig_count);
 
-	current_time = ut_time();
+	current_time = ut_time_monotonic();
 
-	time_elapsed = difftime(current_time, last_monitor_time);
+	time_elapsed = current_time - last_monitor_time;
 
 	if (time_elapsed > 15) {
-		last_monitor_time = ut_time();
+		last_monitor_time = ut_time_monotonic();
 
 		if (srv_print_innodb_monitor) {
 			/* Reset mutex_skipped counter everytime
@@ -1709,7 +1716,7 @@ DECLARE_THREAD(srv_error_monitor_thread)(
 
 	old_lsn = new_lsn;
 
-	if (difftime(time(NULL), srv_last_monitor_time) > 60) {
+	if (ut_difftime(ut_time_monotonic(), srv_last_monitor_time) > 60) {
 		/* We referesh InnoDB Monitor values so that averages are
 		printed from at most 60 last seconds */
 
@@ -1957,11 +1964,11 @@ void
 srv_sync_log_buffer_in_background(void)
 /*===================================*/
 {
-	time_t	current_time = time(NULL);
+	ib_time_monotonic_t	current_time = ut_time_monotonic();
 
 	srv_main_thread_op_info = "flushing log";
-	if (difftime(current_time, srv_last_log_flush_time)
-	    >= srv_flush_log_at_timeout) {
+	if ((current_time - srv_last_log_flush_time)
+			>= srv_flush_log_at_timeout) {
 		log_buffer_sync_in_background(true);
 		srv_last_log_flush_time = current_time;
 		srv_log_writes_and_flush++;
@@ -2000,21 +2007,21 @@ static
 void
 srv_shutdown_print_master_pending(
 /*==============================*/
-	ib_time_t*	last_print_time,	/*!< last time the function
-						print the message */
-	ulint		n_tables_to_drop,	/*!< number of tables to
-						be dropped */
-	ulint		n_bytes_merged)		/*!< number of change buffer
-						just merged */
+	ib_time_monotonic_t*	last_print_time, /*!< last time the function
+						 print the message */
+	ulint		n_tables_to_drop,	 /*!< number of tables to
+						 be dropped */
+	ulint		n_bytes_merged)		 /*!< number of change buffer
+						 just merged */
 {
-	ib_time_t	current_time;
-	double		time_elapsed;
+	ib_time_monotonic_t	current_time;
+	ib_time_monotonic_t	time_elapsed;
 
-	current_time = ut_time();
-	time_elapsed = ut_difftime(current_time, *last_print_time);
+	current_time = ut_time_monotonic();
+	time_elapsed = current_time - *last_print_time;
 
 	if (time_elapsed > 60) {
-		*last_print_time = ut_time();
+		*last_print_time = ut_time_monotonic();
 
 		if (n_tables_to_drop) {
 			ib::info() << "Waiting for " << n_tables_to_drop
@@ -2097,8 +2104,8 @@ void
 srv_master_do_active_tasks(void)
 /*============================*/
 {
-	ib_time_t	cur_time = ut_time();
-	uintmax_t	counter_time = ut_time_us(NULL);
+	ib_time_monotonic_t	cur_time     = ut_time_monotonic();
+	ib_time_monotonic_us_t	counter_time = ut_time_monotonic_us();
 
 	/* First do the tasks that we are suppose to do at each
 	invocation of this function. */
@@ -2128,7 +2135,7 @@ srv_master_do_active_tasks(void)
 
 	/* Do an ibuf merge */
 	srv_main_thread_op_info = "doing insert buffer merge";
-	counter_time = ut_time_us(NULL);
+	counter_time = ut_time_monotonic_us();
 	ibuf_merge_in_background(false);
 	MONITOR_INC_TIME_IN_MICRO_SECS(
 		MONITOR_SRV_IBUF_MERGE_MICROSECOND, counter_time);
@@ -2150,6 +2157,10 @@ srv_master_do_active_tasks(void)
 		return;
 	}
 
+	if (trx_sys->rseg_history_len > 0) {
+		srv_wake_purge_thread_if_not_active();
+	}
+
 	if (cur_time % SRV_MASTER_DICT_LRU_INTERVAL == 0) {
 		srv_main_thread_op_info = "enforcing dict cache limit";
 		ulint	n_evicted = srv_master_evict_from_table_cache(50);
@@ -2187,7 +2198,7 @@ void
 srv_master_do_idle_tasks(void)
 /*==========================*/
 {
-	uintmax_t	counter_time;
+	ib_time_monotonic_t	counter_time;
 
 	++srv_main_idle_loops;
 
@@ -2197,7 +2208,7 @@ srv_master_do_idle_tasks(void)
 	/* ALTER TABLE in MySQL requires on Unix that the table handler
 	can drop tables lazily after there no longer are SELECT
 	queries to them. */
-	counter_time = ut_time_us(NULL);
+	counter_time = ut_time_monotonic_us();
 	srv_main_thread_op_info = "doing background drop tables";
 	row_drop_tables_for_mysql_in_background();
 	MONITOR_INC_TIME_IN_MICRO_SECS(
@@ -2216,7 +2227,7 @@ srv_master_do_idle_tasks(void)
 	log_free_check();
 
 	/* Do an ibuf merge */
-	counter_time = ut_time_us(NULL);
+	counter_time = ut_time_monotonic_us();
 	srv_main_thread_op_info = "doing insert buffer merge";
 	ibuf_merge_in_background(true);
 	MONITOR_INC_TIME_IN_MICRO_SECS(
@@ -2226,6 +2237,10 @@ srv_master_do_idle_tasks(void)
 		return;
 	}
 
+	if (trx_sys->rseg_history_len > 0) {
+		srv_wake_purge_thread_if_not_active();
+	}
+
 	srv_main_thread_op_info = "enforcing dict cache limit";
 	ulint	n_evicted = srv_master_evict_from_table_cache(100);
 	if (n_evicted != 0) {
@@ -2263,7 +2278,7 @@ static
 ibool
 srv_master_do_shutdown_tasks(
 /*=========================*/
-	ib_time_t*	last_print_time)/*!< last time the function
+	ib_time_monotonic_t*	last_print_time)/*!< last time the function
 					print the message */
 {
 	ulint		n_bytes_merged = 0;
@@ -2347,7 +2362,7 @@ DECLARE_THREAD(srv_master_thread)(
 
 	srv_slot_t*	slot;
 	ulint		old_activity_count = srv_get_activity_count();
-	ib_time_t	last_print_time;
+	ib_time_monotonic_t	last_print_time;
 
 	ut_ad(!srv_read_only_mode);
 
@@ -2366,7 +2381,7 @@ DECLARE_THREAD(srv_master_thread)(
 	slot = srv_reserve_slot(SRV_MASTER);
 	ut_a(slot == srv_sys->sys_threads);
 
-	last_print_time = ut_time();
+	last_print_time = ut_time_monotonic();
 loop:
 	if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) {
 		goto suspend_thread;
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 6f9b58ecb17d..3daa050f3e08 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -17,13 +17,21 @@ documentation. The contributions by Percona Inc. are incorporated with
 their permission, and subject to the conditions contained in the file
 COPYING.Percona.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -2413,6 +2421,12 @@ innobase_start_or_create_for_mysql(void)
 		trx_sys_file_format_tag_init();
 	}
 
+	if (!create_new_db) {
+		/* Check and reset any no-redo rseg slot on disk used by
+		pre-5.7.2 redo resg with no data to purge. */
+		trx_rseg_reset_pending();
+	}
+
 	if (!create_new_db && sum_of_new_sizes > 0) {
 		/* New data file(s) were added */
 		mtr_start(&mtr);
diff --git a/storage/innobase/sync/sync0arr.cc b/storage/innobase/sync/sync0arr.cc
index c75b9c78acd8..740de8d3cce7 100644
--- a/storage/innobase/sync/sync0arr.cc
+++ b/storage/innobase/sync/sync0arr.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -116,8 +124,8 @@ struct sync_cell_t {
 					has not been signalled in the
 					period between the reset and
 					wait call. */
-	time_t		reservation_time;/*!< time when the thread reserved
-					the wait cell */
+	/*!< time when the thread reserved the wait cell */
+	ib_time_monotonic_t reservation_time;
 };
 
 /* NOTE: It is allowed for a thread to wait for an event allocated for
@@ -381,7 +389,7 @@ sync_array_reserve_cell(
 
 	cell->thread_id = os_thread_get_curr_id();
 
-	cell->reservation_time = ut_time();
+	cell->reservation_time = ut_time_monotonic();
 
 	/* Make sure the event is reset and also store the value of
 	signal_count at which the event was reset. */
@@ -496,10 +504,10 @@ sync_array_cell_print(
 
 	fprintf(file,
 		"--Thread %lu has waited at %s line %lu"
-		" for %.2f seconds the semaphore:\n",
+		" for " UINT64PF "  seconds the semaphore:\n",
 		(ulong) os_thread_pf(cell->thread_id),
 		innobase_basename(cell->file), (ulong) cell->line,
-		difftime(time(NULL), cell->reservation_time));
+		(uint64_t)(ut_time_monotonic() - cell->reservation_time));
 
 	if (type == SYNC_MUTEX) {
 		WaitMutex*	mutex = cell->latch.mutex;
@@ -1118,7 +1126,9 @@ sync_array_print_long_waits_low(
 			continue;
 		}
 
-		double	diff = difftime(time(NULL), cell->reservation_time);
+		int64_t time_diff = ut_time_monotonic() -
+					cell->reservation_time;
+		uint64_t diff = time_diff > 0 ? (uint64_t)time_diff : 0;
 
 		if (diff > SYNC_ARRAY_TIMEOUT) {
 			ib::warn() << "A long semaphore wait:";
diff --git a/storage/innobase/sync/sync0debug.cc b/storage/innobase/sync/sync0debug.cc
index c9c0d76d590b..42c801d26874 100644
--- a/storage/innobase/sync/sync0debug.cc
+++ b/storage/innobase/sync/sync0debug.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
 Portions of this file contain modifications contributed and copyrighted by
 Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -8,13 +8,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -515,6 +523,7 @@ LatchDebug::LatchDebug()
 	LEVEL_MAP_INSERT(SYNC_TREE_NODE);
 	LEVEL_MAP_INSERT(SYNC_TREE_NODE_FROM_HASH);
 	LEVEL_MAP_INSERT(SYNC_TREE_NODE_NEW);
+	LEVEL_MAP_INSERT(SYNC_ANALYZE_INDEX);
 	LEVEL_MAP_INSERT(SYNC_INDEX_TREE);
 	LEVEL_MAP_INSERT(SYNC_IBUF_PESS_INSERT_MUTEX);
 	LEVEL_MAP_INSERT(SYNC_IBUF_HEADER);
@@ -950,6 +959,11 @@ LatchDebug::check_order(
 		basic_check(latches, level, SYNC_TREE_NODE - 1);
 		break;
 
+	case SYNC_ANALYZE_INDEX:
+
+		basic_check(latches, level, SYNC_ANALYZE_INDEX - 1);
+		break;
+
 	case SYNC_IBUF_TREE_NODE:
 
 		ut_a(find(latches, SYNC_IBUF_INDEX_TREE) != 0
@@ -1579,6 +1593,9 @@ sync_latch_meta_init()
 	LATCH_ADD_MUTEX(MASTER_KEY_ID_MUTEX, SYNC_NO_ORDER_CHECK,
 			master_key_id_mutex_key);
 
+	LATCH_ADD_MUTEX(ANALYZE_INDEX_MUTEX, SYNC_ANALYZE_INDEX,
+			analyze_index_mutex_key);
+
 	latch_id_t	id = LATCH_ID_NONE;
 
 	/* The array should be ordered on latch ID.We need to
diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc
index 72654dbf9e02..94c1ef9c5464 100644
--- a/storage/innobase/sync/sync0rw.cc
+++ b/storage/innobase/sync/sync0rw.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -340,10 +348,14 @@ rw_lock_s_lock_spin(
 	sync_array_t*	sync_arr;
 	ulint		spin_count = 0;
 	uint64_t	count_os_wait = 0;
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
 
 	/* We reuse the thread id to index into the counter, cache
 	it here for efficiency. */
 
+	const size_t counter_index = (size_t) ut_rnd_gen_next_ulint(
+							(ulint) curr_thread);
+
 	ut_ad(rw_lock_validate(lock));
 
 lock_loop:
@@ -370,10 +382,12 @@ rw_lock_s_lock_spin(
 		if (count_os_wait > 0) {
 			lock->count_os_wait +=
 				static_cast<uint32_t>(count_os_wait);
-			rw_lock_stats.rw_s_os_wait_count.add(count_os_wait);
+			rw_lock_stats.rw_s_os_wait_count.add(counter_index,
+							     count_os_wait);
 		}
 
-		rw_lock_stats.rw_s_spin_round_count.add(spin_count);
+		rw_lock_stats.rw_s_spin_round_count.add(counter_index,
+							spin_count);
 
 		return; /* Success */
 	} else {
@@ -404,10 +418,11 @@ rw_lock_s_lock_spin(
 					static_cast<uint32_t>(count_os_wait);
 
 				rw_lock_stats.rw_s_os_wait_count.add(
-					count_os_wait);
+					counter_index, count_os_wait);
 			}
 
-			rw_lock_stats.rw_s_spin_round_count.add(spin_count);
+			rw_lock_stats.rw_s_spin_round_count.add(counter_index,
+								spin_count);
 
 			return; /* Success */
 		}
@@ -415,7 +430,7 @@ rw_lock_s_lock_spin(
 		/* see comments in trx_commit_low() to
 		before_trx_state_committed_in_memory explaining
 		this care to invoke the following sync check.*/
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #ifdef UNIV_DEBUG
 		if (lock->get_level() != SYNC_DICT_OPERATION) {
 			DEBUG_SYNC_C("rw_s_lock_waiting");
@@ -444,9 +459,11 @@ rw_lock_x_lock_move_ownership(
 	rw_lock_t*	lock)	/*!< in: lock which was x-locked in the
 				buffer read */
 {
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
+
 	ut_ad(rw_lock_is_locked(lock, RW_LOCK_X));
 
-	rw_lock_set_writer_id_and_recursion_flag(lock, true);
+	rw_lock_set_writer_id_and_recursion_flag(lock, true, curr_thread);
 }
 
 /******************************************************************//**
@@ -462,6 +479,7 @@ rw_lock_x_lock_wait_func(
 				be passed to another thread to unlock */
 #endif
 	lint		threshold,/*!< in: threshold to wait for */
+	const os_thread_id_t curr_thread,/*!< in: current thread id */
 	const char*	file_name,/*!< in: file name where lock requested */
 	ulint		line)	/*!< in: line where requested */
 {
@@ -469,6 +487,12 @@ rw_lock_x_lock_wait_func(
 	ulint		n_spins = 0;
 	sync_array_t*	sync_arr;
 	uint64_t	count_os_wait = 0;
+	size_t		counter_index;
+
+	/* We reuse the thread id to index into the counter, cache
+	it here for efficiency. */
+
+	counter_index = (size_t) ut_rnd_gen_next_ulint((ulint) curr_thread);
 
 	os_rmb;
 	ut_ad(lock->lock_word <= threshold);
@@ -521,21 +545,22 @@ rw_lock_x_lock_wait_func(
 		}
 	}
 
-	rw_lock_stats.rw_x_spin_round_count.add(n_spins);
+	rw_lock_stats.rw_x_spin_round_count.add(counter_index, n_spins);
 
 	if (count_os_wait > 0) {
 		lock->count_os_wait +=
 			static_cast<uint32_t>(count_os_wait);
-		rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);
+		rw_lock_stats.rw_x_os_wait_count.add(counter_index,
+						     count_os_wait);
 	}
 }
 
 #ifdef UNIV_DEBUG
-# define rw_lock_x_lock_wait(L, P, T, F, O)		\
-	rw_lock_x_lock_wait_func(L, P, T, F, O)
+# define rw_lock_x_lock_wait(L, P, T, C, F, O)		\
+	rw_lock_x_lock_wait_func(L, P, T, C, F, O)
 #else
-# define rw_lock_x_lock_wait(L, P, T, F, O)		\
-	rw_lock_x_lock_wait_func(L, T, F, O)
+# define rw_lock_x_lock_wait(L, P, T, C, F, O)		\
+	rw_lock_x_lock_wait_func(L, T, C, F, O)
 #endif /* UNIV_DBEUG */
 
 /******************************************************************//**
@@ -548,6 +573,7 @@ rw_lock_x_lock_low(
 	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
 	ulint		pass,	/*!< in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
+	const os_thread_id_t curr_thread,/*!< in: current thread id */
 	const char*	file_name,/*!< in: file name where lock requested */
 	ulint		line)	/*!< in: line where requested */
 {
@@ -561,22 +587,25 @@ rw_lock_x_lock_low(
 
 		/* Decrement occurred: we are writer or next-writer. */
 		rw_lock_set_writer_id_and_recursion_flag(
-			lock, !pass);
+			lock, !pass, curr_thread);
 
-		rw_lock_x_lock_wait(lock, pass, 0, file_name, line);
+		rw_lock_x_lock_wait(lock, pass, 0, curr_thread,
+				    file_name, line);
 
 	} else {
-		os_thread_id_t	thread_id = os_thread_get_curr_id();
+		bool recursive;
+		os_thread_id_t writer_thread;
 
 		if (!pass) {
+			recursive = lock->recursive;
 			os_rmb;
+			writer_thread = lock->writer_thread;
 		}
 
 		/* Decrement failed: An X or SX lock is held by either
 		this thread or another. Try to relock. */
-		if (!pass
-		    && lock->recursive
-		    && os_thread_eq(lock->writer_thread, thread_id)) {
+		if (!pass && recursive
+		    && os_thread_eq(writer_thread, curr_thread)) {
 			/* Other s-locks can be allowed. If it is request x
 			recursively while holding sx lock, this x lock should
 			be along with the latching-order. */
@@ -590,7 +619,7 @@ rw_lock_x_lock_low(
 				released. */
 				rw_lock_x_lock_wait(
 					lock, pass, -X_LOCK_HALF_DECR,
-					file_name, line);
+					curr_thread, file_name, line);
 
 			} else {
 				/* At least one X lock by this thread already
@@ -621,12 +650,14 @@ rw_lock_x_lock_low(
 /******************************************************************//**
 Low-level function for acquiring an sx lock.
 @return FALSE if did not succeed, TRUE if success. */
+UNIV_INLINE
 ibool
 rw_lock_sx_lock_low(
 /*================*/
 	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
 	ulint		pass,	/*!< in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
+	const os_thread_id_t curr_thread,/*!< in: current thread id */
 	const char*	file_name,/*!< in: file name where lock requested */
 	ulint		line)	/*!< in: line where requested */
 {
@@ -640,22 +671,25 @@ rw_lock_sx_lock_low(
 
 		/* Decrement occurred: we are the SX lock owner. */
 		rw_lock_set_writer_id_and_recursion_flag(
-			lock, !pass);
+			lock, !pass, curr_thread);
 
 		lock->sx_recursive = 1;
 
 	} else {
-		os_thread_id_t	thread_id = os_thread_get_curr_id();
+		bool recursive;
+		os_thread_id_t writer_thread;
 
 		if (!pass) {
+			recursive = lock->recursive;
 			os_rmb;
+			writer_thread = lock->writer_thread;
 		}
 
 		/* Decrement failed: It already has an X or SX lock by this
 		thread or another thread. If it is this thread, relock,
 		else fail. */
-		if (!pass && lock->recursive
-		    && os_thread_eq(lock->writer_thread, thread_id)) {
+		if (!pass && recursive
+		    && os_thread_eq(writer_thread, curr_thread)) {
 			/* This thread owns an X or SX lock */
 			if (lock->sx_recursive++ == 0) {
 				/* This thread is making first SX-lock request
@@ -720,21 +754,30 @@ rw_lock_x_lock_func(
 	sync_array_t*	sync_arr;
 	ulint		spin_count = 0;
 	uint64_t	count_os_wait = 0;
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
+
+	/* We reuse the thread id to index into the counter, cache
+	it here for efficiency. */
+
+	const size_t counter_index = (size_t) ut_rnd_gen_next_ulint(
+							(ulint) curr_thread);
 
 	ut_ad(rw_lock_validate(lock));
 	ut_ad(!rw_lock_own(lock, RW_LOCK_S));
 
 lock_loop:
 
-	if (rw_lock_x_lock_low(lock, pass, file_name, line)) {
+	if (rw_lock_x_lock_low(lock, pass, curr_thread, file_name, line)) {
 
 		if (count_os_wait > 0) {
 			lock->count_os_wait +=
 				static_cast<uint32_t>(count_os_wait);
-			rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);
+			rw_lock_stats.rw_x_os_wait_count.add(counter_index,
+							     count_os_wait);
 		}
 
-		rw_lock_stats.rw_x_spin_round_count.add(spin_count);
+		rw_lock_stats.rw_x_spin_round_count.add(counter_index,
+							spin_count);
 
 		/* Locking succeeded */
 		return;
@@ -775,16 +818,18 @@ rw_lock_x_lock_func(
 	is sent. This could lead to a few unnecessary wake-up signals. */
 	rw_lock_set_waiter_flag(lock);
 
-	if (rw_lock_x_lock_low(lock, pass, file_name, line)) {
+	if (rw_lock_x_lock_low(lock, pass, curr_thread, file_name, line)) {
 		sync_array_free_cell(sync_arr, cell);
 
 		if (count_os_wait > 0) {
 			lock->count_os_wait +=
 				static_cast<uint32_t>(count_os_wait);
-			rw_lock_stats.rw_x_os_wait_count.add(count_os_wait);
+			rw_lock_stats.rw_x_os_wait_count.add(counter_index,
+							     count_os_wait);
 		}
 
-		rw_lock_stats.rw_x_spin_round_count.add(spin_count);
+		rw_lock_stats.rw_x_spin_round_count.add(counter_index,
+							spin_count);
 
 		/* Locking succeeded */
 		return;
@@ -823,22 +868,32 @@ rw_lock_sx_lock_func(
 	ulint		spin_count = 0;
 	uint64_t	count_os_wait = 0;
 	ulint		spin_wait_count = 0;
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
+
+	/* We reuse the thread id to index into the counter, cache
+	it here for efficiency. */
+
+	const size_t counter_index = (size_t) ut_rnd_gen_next_ulint(
+							(ulint) curr_thread);
 
 	ut_ad(rw_lock_validate(lock));
 	ut_ad(!rw_lock_own(lock, RW_LOCK_S));
 
 lock_loop:
 
-	if (rw_lock_sx_lock_low(lock, pass, file_name, line)) {
+	if (rw_lock_sx_lock_low(lock, pass, curr_thread, file_name, line)) {
 
 		if (count_os_wait > 0) {
 			lock->count_os_wait +=
 				static_cast<uint32_t>(count_os_wait);
-			rw_lock_stats.rw_sx_os_wait_count.add(count_os_wait);
+			rw_lock_stats.rw_sx_os_wait_count.add(counter_index,
+							      count_os_wait);
 		}
 
-		rw_lock_stats.rw_sx_spin_round_count.add(spin_count);
-		rw_lock_stats.rw_sx_spin_wait_count.add(spin_wait_count);
+		rw_lock_stats.rw_sx_spin_round_count.add(counter_index,
+							 spin_count);
+		rw_lock_stats.rw_sx_spin_wait_count.add(counter_index,
+							spin_wait_count);
 
 		/* Locking succeeded */
 		return;
@@ -881,18 +936,21 @@ rw_lock_sx_lock_func(
 	is sent. This could lead to a few unnecessary wake-up signals. */
 	rw_lock_set_waiter_flag(lock);
 
-	if (rw_lock_sx_lock_low(lock, pass, file_name, line)) {
+	if (rw_lock_sx_lock_low(lock, pass, curr_thread, file_name, line)) {
 
 		sync_array_free_cell(sync_arr, cell);
 
 		if (count_os_wait > 0) {
 			lock->count_os_wait +=
 				static_cast<uint32_t>(count_os_wait);
-			rw_lock_stats.rw_sx_os_wait_count.add(count_os_wait);
+			rw_lock_stats.rw_sx_os_wait_count.add(counter_index,
+							      count_os_wait);
 		}
 
-		rw_lock_stats.rw_sx_spin_round_count.add(spin_count);
-		rw_lock_stats.rw_sx_spin_wait_count.add(spin_wait_count);
+		rw_lock_stats.rw_sx_spin_round_count.add(counter_index,
+							 spin_count);
+		rw_lock_stats.rw_sx_spin_wait_count.add(counter_index,
+							spin_wait_count);
 
 		/* Locking succeeded */
 		return;
@@ -907,6 +965,25 @@ rw_lock_sx_lock_func(
 	goto lock_loop;
 }
 
+/******************************************************************//**
+NOTE! Use the corresponding macro, not directly this function! Lock an
+rw-lock in SX mode for the current thread if the lock can be
+obtained immediately.
+@return FALSE if did not succeed, TRUE if success. */
+ibool
+rw_lock_sx_lock_func_nowait(
+/*========================*/
+	rw_lock_t*	lock,	/*!< in: pointer to rw-lock */
+	ulint		pass,	/*!< in: pass value; != 0, if the lock will
+				be passed to another thread to unlock */
+	const char*	file_name,/*!< in: file name where lock requested */
+	ulint		line)	/*!< in: line where requested */
+{
+	const os_thread_id_t curr_thread = os_thread_get_curr_id();
+
+	return(rw_lock_sx_lock_low(lock, pass, curr_thread, file_name, line));
+}
+
 #ifdef UNIV_DEBUG
 
 /******************************************************************//**
diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc
index 31fed60500ab..21a6b77c5066 100644
--- a/storage/innobase/sync/sync0sync.cc
+++ b/storage/innobase/sync/sync0sync.cc
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2023, Oracle and/or its affiliates.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -9,13 +9,21 @@ briefly in the InnoDB documentation. The contributions by Google are
 incorporated with their permission, and subject to the conditions contained in
 the file COPYING.Google.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -108,6 +116,7 @@ mysql_pfs_key_t	thread_mutex_key;
 mysql_pfs_key_t zip_pad_mutex_key;
 mysql_pfs_key_t row_drop_list_mutex_key;
 mysql_pfs_key_t	master_key_id_mutex_key;
+mysql_pfs_key_t	analyze_index_mutex_key;
 
 #endif /* UNIV_PFS_MUTEX */
 
diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc
index 05bf6ff7b6a0..0e48379dcf48 100644
--- a/storage/innobase/trx/trx0i_s.cc
+++ b/storage/innobase/trx/trx0i_s.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -147,12 +155,12 @@ struct i_s_table_cache_t {
 
 /** This structure describes the intermediate buffer */
 struct trx_i_s_cache_t {
-	rw_lock_t*	rw_lock;	/*!< read-write lock protecting
-					the rest of this structure */
-	uintmax_t	last_read;	/*!< last time the cache was read;
+	rw_lock_t*	rw_lock;         /*!< read-write lock protecting
+				         the rest of this structure */
+	ib_time_monotonic_us_t  last_read;/*!< last time the cache was read;
 					measured in microseconds since
-					epoch */
-	ib_mutex_t		last_read_mutex;/*!< mutex protecting the
+				        epoch */
+	ib_mutex_t	      last_read_mutex;/*!< mutex protecting the
 					last_read member - it is updated
 					inside a shared lock of the
 					rw_lock member */
@@ -1210,7 +1218,7 @@ can_cache_be_updated(
 /*=================*/
 	trx_i_s_cache_t*	cache)	/*!< in: cache */
 {
-	uintmax_t	now;
+	ib_time_monotonic_us_t now;
 
 	/* Here we read cache->last_read without acquiring its mutex
 	because last_read is only updated when a shared rw lock on the
@@ -1221,7 +1229,7 @@ can_cache_be_updated(
 
 	ut_ad(rw_lock_own(cache->rw_lock, RW_LOCK_X));
 
-	now = ut_time_us(NULL);
+	now = ut_time_monotonic_us();
 	if (now - cache->last_read > CACHE_MIN_IDLE_TIME_US) {
 
 		return(TRUE);
@@ -1464,12 +1472,12 @@ trx_i_s_cache_end_read(
 /*===================*/
 	trx_i_s_cache_t*	cache)	/*!< in: cache */
 {
-	uintmax_t	now;
+	ib_time_monotonic_us_t  now;
 
 	ut_ad(rw_lock_own(cache->rw_lock, RW_LOCK_S));
 
 	/* update cache last read time */
-	now = ut_time_us(NULL);
+	now = ut_time_monotonic_us();
 	mutex_enter(&cache->last_read_mutex);
 	cache->last_read = now;
 	mutex_exit(&cache->last_read_mutex);
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index 1735270cdb5a..ec8648df1d7d 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -251,7 +259,7 @@ trx_purge_sys_create(
 	here only because the query threads code requires it. It is otherwise
 	quite unnecessary. We should get rid of it eventually. */
 	purge_sys->trx->id = 0;
-	purge_sys->trx->start_time = ut_time();
+	purge_sys->trx->start_time = ut_time_monotonic();
 	purge_sys->trx->state = TRX_STATE_ACTIVE;
 	purge_sys->trx->op_info = "purge trx";
 
@@ -374,7 +382,10 @@ trx_purge_add_update_undo_to_history(
 	if (update_rseg_history_len) {
 		os_atomic_increment_ulint(
 			&trx_sys->rseg_history_len, n_added_logs);
-		srv_wake_purge_thread_if_not_active();
+		if (trx_sys->rseg_history_len
+		    > srv_n_purge_threads * srv_purge_batch_size) {
+			srv_wake_purge_thread_if_not_active();
+		}
 	}
 
 	/* Write the trx number to the undo log header */
@@ -1551,7 +1562,6 @@ trx_purge_get_next_rec(
 		undo_page = trx_undo_page_get_s_latched(
 			page_id_t(space, page_no), page_size, &mtr);
 
-		rec = undo_page + offset;
 	} else {
 		page = page_align(rec2);
 
@@ -1566,10 +1576,8 @@ trx_purge_get_next_rec(
 		}
 	}
 
-	rec_copy = trx_undo_rec_copy(rec, heap);
-
+	rec_copy = trx_undo_rec_copy(undo_page, offset, heap);
 	mtr_commit(&mtr);
-
 	return(rec_copy);
 }
 
@@ -1741,7 +1749,9 @@ trx_purge_dml_delay(void)
 	Note: we do a dirty read of the trx_sys_t data structure here,
 	without holding trx_sys->mutex. */
 
-	if (srv_max_purge_lag > 0) {
+	if (srv_max_purge_lag > 0
+	    && trx_sys->rseg_history_len
+	       > srv_n_purge_threads * srv_purge_batch_size) {
 		float	ratio;
 
 		ratio = float(trx_sys->rseg_history_len) / srv_max_purge_lag;
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc
index e789a6f09a22..dc4a751a8b88 100644
--- a/storage/innobase/trx/trx0rec.cc
+++ b/storage/innobase/trx/trx0rec.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1965,9 +1973,7 @@ trx_undo_report_row_operation(
 
 	undo_block = buf_page_get_gen(
 		page_id_t(undo->space, page_no), undo->page_size, RW_X_LATCH,
-		buf_pool_is_obsolete(undo->withdraw_clock)
-		? NULL : undo->guess_block, BUF_GET, __FILE__, __LINE__,
-		&mtr);
+		undo->guess_block, BUF_GET, __FILE__, __LINE__,&mtr);
 
 	buf_block_dbg_add_level(undo_block, SYNC_TRX_UNDO_PAGE);
 
@@ -2027,14 +2033,13 @@ trx_undo_report_row_operation(
 			mtr_commit(&mtr);
 		} else {
 			/* Success */
-			undo->withdraw_clock = buf_withdraw_clock;
+			undo->guess_block = undo_block;
 			mtr_commit(&mtr);
 
 			undo->empty = FALSE;
 			undo->top_page_no = page_no;
 			undo->top_offset  = offset;
 			undo->top_undo_no = trx->undo_no;
-			undo->guess_block = undo_block;
 
 			trx->undo_no++;
 			trx->undo_rseg_space = undo_ptr->rseg->space;
@@ -2121,7 +2126,7 @@ trx_undo_get_undo_rec_low(
 		page_id_t(rseg->space, page_no), rseg->page_size,
 		&mtr);
 
-	undo_rec = trx_undo_rec_copy(undo_page + offset, heap);
+	undo_rec = trx_undo_rec_copy(undo_page, offset, heap);
 
 	mtr_commit(&mtr);
 
@@ -2350,12 +2355,14 @@ trx_undo_prev_version_build(
 
 		entry = row_rec_to_index_entry(
 			rec, index, offsets, &n_ext, heap);
-		n_ext += btr_push_update_extern_fields(entry, update, heap);
 		/* The page containing the clustered index record
 		corresponding to entry is latched in mtr.  Thus the
 		following call is safe. */
 		row_upd_index_replace_new_col_vals(entry, index, update, heap);
 
+		/* Get number of externally stored columns in updated record */
+		n_ext = entry->get_n_ext();
+
 		buf = static_cast<byte*>(mem_heap_alloc(
 			heap, rec_get_converted_size(index, entry, n_ext)));
 
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index 5bc03c15a5eb..f5644c7fcbb9 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -901,17 +909,21 @@ trx_roll_try_truncate(
 	}
 }
 
-/***********************************************************************//**
-Pops the topmost undo log record in a single undo log and updates the info
+/** Pops the topmost undo log record in a single undo log and updates the info
 about the topmost record in the undo log memory struct.
-@return undo log record, the page s-latched */
+@param[in]	trx		transaction
+@param[in[	undo		undo log
+@param[in]	mtr		mtr
+@param[out]	undo_offset	offset of undo record in the page
+@return Undo page where undo log record resides, the page s-latched */
 static
-trx_undo_rec_t*
+page_t*
 trx_roll_pop_top_rec(
 /*=================*/
-	trx_t*		trx,	/*!< in: transaction */
-	trx_undo_t*	undo,	/*!< in: undo log */
-	mtr_t*		mtr)	/*!< in: mtr */
+	trx_t*		trx,	 /*!< in: transaction */
+	trx_undo_t*	undo,	 /*!< in: undo log */
+	mtr_t*		mtr,	 /*!< in: mtr */
+	ulint*		undo_offset) /*!< out: offset of undo record in the page */
 {
 	ut_ad(mutex_own(&trx->undo_mutex));
 
@@ -919,10 +931,10 @@ trx_roll_pop_top_rec(
 		page_id_t(undo->space, undo->top_page_no),
 		undo->page_size, mtr);
 
-	ulint	offset = undo->top_offset;
+	*undo_offset = undo->top_offset;
 
 	trx_undo_rec_t*	prev_rec = trx_undo_get_prev_rec(
-		undo_page + offset, undo->hdr_page_no, undo->hdr_offset,
+		(trx_undo_rec_t*) (undo_page + *undo_offset), undo->hdr_page_no, undo->hdr_offset,
 		true, mtr);
 
 	if (prev_rec == NULL) {
@@ -941,7 +953,7 @@ trx_roll_pop_top_rec(
 		undo->top_undo_no = trx_undo_rec_get_undo_no(prev_rec);
 	}
 
-	return(undo_page + offset);
+	return(undo_page);
 }
 
 
@@ -963,10 +975,11 @@ trx_roll_pop_top_rec_of_trx_low(
 	trx_undo_t*	undo;
 	trx_undo_t*	ins_undo;
 	trx_undo_t*	upd_undo;
-	trx_undo_rec_t*	undo_rec;
 	trx_undo_rec_t*	undo_rec_copy;
+	const page_t*	undo_page;
 	undo_no_t	undo_no;
 	ibool		is_insert;
+	ulint		undo_offset;
 	trx_rseg_t*	rseg;
 	mtr_t		mtr;
 
@@ -1010,9 +1023,9 @@ trx_roll_pop_top_rec_of_trx_low(
 
 	mtr_start(&mtr);
 
-	undo_rec = trx_roll_pop_top_rec(trx, undo, &mtr);
+	undo_page = trx_roll_pop_top_rec(trx, undo, &mtr, &undo_offset);
 
-	undo_no = trx_undo_rec_get_undo_no(undo_rec);
+	undo_no = trx_undo_rec_get_undo_no(undo_page + undo_offset);
 
 	ut_ad(trx_roll_check_undo_rec_ordering(
 		undo_no, undo->rseg->space, trx));
@@ -1041,7 +1054,7 @@ trx_roll_pop_top_rec_of_trx_low(
 	trx->undo_no = undo_no;
 	trx->undo_rseg_space = undo->rseg->space;
 
-	undo_rec_copy = trx_undo_rec_copy(undo_rec, heap);
+	undo_rec_copy = trx_undo_rec_copy(undo_page, undo_offset, heap);
 
 	mutex_exit(&trx->undo_mutex);
 
@@ -1087,7 +1100,8 @@ static
 que_t*
 trx_roll_graph_build(
 /*=================*/
-	trx_t*	trx)	/*!< in/out: transaction */
+	trx_t*	trx,			/*!< in/out: transaction */
+	bool	partial_rollback)	/*!< in: partial rollback */
 {
 	mem_heap_t*	heap;
 	que_fork_t*	fork;
@@ -1101,7 +1115,7 @@ trx_roll_graph_build(
 
 	thr = que_thr_create(fork, heap, NULL);
 
-	thr->child = row_undo_node_create(trx, thr, heap);
+	thr->child = row_undo_node_create(trx, thr, heap, partial_rollback);
 
 	return(fork);
 }
@@ -1115,9 +1129,10 @@ que_thr_t*
 trx_rollback_start(
 /*===============*/
 	trx_t*		trx,		/*!< in: transaction */
-	ib_id_t		roll_limit)	/*!< in: rollback to undo no (for
+	ib_id_t		roll_limit,	/*!< in: rollback to undo no (for
 					partial undo), 0 if we are rolling back
 					the entire transaction */
+	bool		partial_rollback) /*!< in: partial rollback */
 {
 	ut_ad(trx_mutex_own(trx));
 
@@ -1135,7 +1150,7 @@ trx_rollback_start(
 
 	/* Build a 'query' graph which will perform the undo operations */
 
-	que_t*	roll_graph = trx_roll_graph_build(trx);
+	que_t*	roll_graph = trx_roll_graph_build(trx, partial_rollback);
 
 	trx->graph = roll_graph;
 
@@ -1212,7 +1227,9 @@ trx_rollback_step(
 
 		trx_commit_or_rollback_prepare(trx);
 
-		node->undo_thr = trx_rollback_start(trx, roll_limit);
+		node->undo_thr = trx_rollback_start(trx,
+						    roll_limit,
+						    node->partial);
 
 		trx_mutex_exit(trx);
 
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc
index d5520b783b1e..c3531f9f3b16 100644
--- a/storage/innobase/trx/trx0rseg.cc
+++ b/storage/innobase/trx/trx0rseg.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -97,8 +105,8 @@ trx_rseg_header_create(
 	}
 
 	if (!trx_sys_is_noredo_rseg_slot(rseg_slot_no)) {
-		/* Non-redo rseg are re-created on restart and so no need
-		to persist this information in sys-header. Anyway, on restart
+		/* No-redo rsegs are re-created on restart and no need to
+		persist this information in sys-header. Anyway, on restart
 		this information is not valid too as there is no space with
 		persisted space-id on restart. */
 
@@ -269,109 +277,251 @@ trx_rseg_mem_create(
 	return(rseg);
 }
 
-/********************************************************************
-Check if rseg in given slot needs to be scheduled for purge. */
-static
-void
-trx_rseg_schedule_pending_purge(
-/*============================*/
-	trx_sysf_t*	sys_header,	/*!< in: trx system header */
-	purge_pq_t*	purge_queue,	/*!< in/out: rseg queue */
-	ulint		slot,		/*!< in: check rseg from given slot. */
-	mtr_t*		mtr)		/*!< in: mtr */
+/* Read information from system header page for a rollback segment.
+@param[in]	rseg_id		rollback segment ID
+@param[in,out]	mtr		mini transaction for reading
+@param[out]	space		space ID for the rollback segment
+@param[out]	page_no		page number of the rollback segment
+@return	page size for the rollback segment space.  */
+static const page_size_t
+read_sys_rseg_info(
+	ulint	rseg_id,
+	mtr_t	*mtr,
+	ulint	&space,
+	ulint	&page_no)
 {
-	ulint	page_no;
-	ulint	space;
+	trx_sysf_t* sys_header = trx_sysf_get(mtr);
 
-	page_no = trx_sysf_rseg_get_page_no(sys_header, slot, mtr);
-	space = trx_sysf_rseg_get_space(sys_header, slot, mtr);
+	page_no = trx_sysf_rseg_get_page_no(sys_header, rseg_id, mtr);
 
-	if (page_no != FIL_NULL
-	    && is_system_or_undo_tablespace(space)) {
+	if (page_no == FIL_NULL) {
+		space = 0;
+		return (univ_page_size);
+	}
 
-		/* rseg resides in system or undo tablespace and so
-		this is an upgrade scenario. trx_rseg_mem_create
-		will add rseg to purge queue if needed. */
+	space = trx_sysf_rseg_get_space(sys_header, rseg_id, mtr);
 
-		trx_rseg_t*		rseg = NULL;
-		bool			found = true;
-		const page_size_t&	page_size
-			= is_system_tablespace(space)
-			? univ_page_size
-			: fil_space_get_page_size(space, &found);
+	bool found = true;
 
-		ut_ad(found);
+	const page_size_t& page_size
+		= is_system_tablespace(space)
+		? univ_page_size
+		: fil_space_get_page_size(space, &found);
 
-		trx_rseg_t** rseg_array =
-			((trx_rseg_t**) trx_sys->pending_purge_rseg_array);
-		rseg = trx_rseg_mem_create(
-			slot, space, page_no, page_size,
-			purge_queue, rseg_array, mtr);
+	ut_ad(found);
+	return (page_size);
+}
 
-		ut_a(rseg->id == slot);
+/** Initialize a redo rollback segment and add to purge queue if it has anything
+left to purge.
+@param[in]	rseg_id		rollback segment ID
+@param[in,out]	rseg_array	rollback segment array
+@param[in,out]	purge_queue	queue for rollback segments that need purging */
+static void
+trx_rseg_initialize(
+	ulint		rseg_id,
+	trx_rseg_t**	rseg_array,
+	purge_pq_t*	purge_queue)
+{
+	ut_a(rseg_array[rseg_id] == NULL);
+
+	mtr_t mtr;
+	mtr.start();
+
+	ulint space = 0;
+	ulint page_no = FIL_NULL;
+
+	const page_size_t& page_size =
+		read_sys_rseg_info(rseg_id, &mtr, space, page_no);
+
+	if (page_no == FIL_NULL) {
+		mtr.commit();
+		return;
 	}
+
+	trx_rseg_t* rseg = trx_rseg_mem_create(rseg_id, space, page_no,
+		page_size, purge_queue, rseg_array, &mtr);
+
+	ut_a(rseg->id == rseg_id);
+
+	mtr.commit();
 }
 
-/********************************************************************
-Creates the memory copies for the rollback segments and initializes the
-rseg array in trx_sys at a database startup. */
-static
-void
-trx_rseg_create_instance(
-/*=====================*/
-	purge_pq_t*	purge_queue)	/*!< in/out: rseg queue */
+/* Check if any of the redo rollback segment has same space, page reference
+@param[in]	space		space ID for the rollback segment
+@param[in]	page_no		page number of the rollback segment
+@return	true iff duplicate is found. */
+static bool
+check_duplicate_rseg(
+	ulint	space,
+	ulint	page_no)
 {
-	ulint		i;
+	for (ulint rseg_id = 0; rseg_id < TRX_SYS_N_RSEGS; rseg_id++) {
+		/* Skip over no-redo rollback segments. */
+		if (trx_sys_is_noredo_rseg_slot(rseg_id)) {
+			continue;
+		}
 
-	for (i = 0; i < TRX_SYS_N_RSEGS; i++) {
-		ulint	page_no;
+		trx_rseg_t* rseg = trx_sys->rseg_array[rseg_id];
 
-		mtr_t	mtr;
-		mtr.start();
-		trx_sysf_t* sys_header = trx_sysf_get(&mtr);
+		if (rseg != NULL && rseg->space == space &&
+		    rseg->page_no == page_no) {
+			ib::info() << "Found duplicate reference rseg: "
+				   << rseg_id << " space: " << space
+				   << " page: " << page_no;
+			return (true);
+		}
+	}
+	return (false);
+}
 
-		page_no = trx_sysf_rseg_get_page_no(sys_header, i, &mtr);
+/** Check if pre-5.7.2 rollback segment has data to be purged.
+@param[in]	rseg_id		rollback segment ID
+@param[out]	reset_rseg	true iff need to reset rseg slot
+@return true iff there is data to purge.
+*/
+static bool is_purge_pending(
+	ulint	rseg_id,
+	bool&	reset_rseg)
+{
+	ut_a(trx_sys_is_noredo_rseg_slot(rseg_id));
 
-		/* Slot-1....Slot-n are reserved for non-redo rsegs.
-		Non-redo rsegs are recreated on server re-start so
-		avoid initializing the existing non-redo rsegs. */
-		if (trx_sys_is_noredo_rseg_slot(i)) {
+	mtr_t mtr;
+	mtr.start();
 
-			/* If this is an upgrade scenario then existing rsegs
-			in range from slot-1....slot-n needs to be scheduled
-			for purge if there are pending purge operation. */
-			trx_rseg_schedule_pending_purge(
-				sys_header, purge_queue, i, &mtr);
+	ulint space = 0;
+	ulint page_no = FIL_NULL;
 
-		} else if (page_no != FIL_NULL) {
-			ulint		space;
-			trx_rseg_t*	rseg = NULL;
+	const page_size_t& page_size =
+		read_sys_rseg_info(rseg_id, &mtr, space, page_no);
 
-			ut_a(!trx_rseg_get_on_id(i, true));
+	reset_rseg = (page_no != FIL_NULL);
 
-			space = trx_sysf_rseg_get_space(sys_header, i, &mtr);
+	if (page_no == FIL_NULL || !is_system_or_undo_tablespace(space)) {
+		mtr.commit();
+		return (false);
+	}
+
+	/* There is an issue till 5.7.34, which could cause a pre-5.7.2 rseg to
+	point to some redo rseg after undo tablespace truncate. We need to check
+	for it and should not add it for purge in such case. */
+	if (check_duplicate_rseg(space, page_no)) {
+		mtr.commit();
+		ib::info() << "Reset pre-5.7.2 rseg: " << rseg_id
+			   << " after duplicate is found.";
+		return (false);
+	}
 
-			bool			found = true;
-			const page_size_t&	page_size
-				= is_system_tablespace(space)
-				? univ_page_size
-				: fil_space_get_page_size(space, &found);
+	trx_rsegf_t* rseg_header =
+		trx_rsegf_get_new(space, page_no, page_size, &mtr);
 
-			ut_ad(found);
+	ulint len = flst_get_len(rseg_header + TRX_RSEG_HISTORY);
+
+	mtr.commit();
+
+	if (len > 0) {
+		ib::info() << "pre-5.7.2 rseg: " << rseg_id
+			   << " holds data to be purged. History length: "
+			   << len << ". Recommend slow shutdown with"
+			   << " innodb_fast_shutdown=0 and restart";
+		reset_rseg = false;
+		return (true);
+	}
+	return (false);
+}
 
-			trx_rseg_t** rseg_array =
-				static_cast<trx_rseg_t**>(trx_sys->rseg_array);
+/** Rollback segment IDs that needs to be reset on disk. */
+static std::vector<ulint> s_pending_reset_rseg_ids;
 
-			rseg = trx_rseg_mem_create(
-				i, space, page_no, page_size,
-				purge_queue, rseg_array, &mtr);
+/** Creates the memory copies for the rollback segments and initializes the
+rseg array in trx_sys at a database startup.
+@param[in,out]	purge_queue	queue for rollback segments that need purging
+*/
+static void trx_rseg_create_instance(
+	purge_pq_t*	purge_queue)
+{
+        /* Initialize redo rollback segments. */
+	for (ulint rseg_id = 0; rseg_id < TRX_SYS_N_RSEGS; rseg_id++) {
+                /* Skip all no-redo segments. Slot-1....Slot-n are reserved for
+		no-redo rsegs. These no-redo rsegs are recreated on server
+		re-start and we should avoid initializing them. There could also
+		be some leftover redo rollback segments from pre-5.7.2, which we
+		handle in next iteration. */
+		if (trx_sys_is_noredo_rseg_slot(rseg_id)) {
+			continue;
+		}
+		trx_rseg_initialize(rseg_id, trx_sys->rseg_array, purge_queue);
+	}
 
-			ut_a(rseg->id == i);
-		} else {
-			ut_a(trx_sys->rseg_array[i] == NULL);
+        /* Check and initialize redo rollback segments carried forward from
+	pre-5.7.2. They could occupy the no-redo rseg slots in range from
+	slot-1...slot-n. We need to schedule them for purge if there are pending
+	purge operations. It is only possible if pre-5.7.2 server is upgraded
+	without using slow shutdown (innodb_fast_shutdown = 0). */
+	for (ulint rseg_id = 0; rseg_id < TRX_SYS_N_RSEGS; rseg_id++) {
+                /* Skip all redo slots which are handled already in previous
+		iteration. */
+		if (!trx_sys_is_noredo_rseg_slot(rseg_id)) {
+			continue;
 		}
-		mtr.commit();
+
+		bool reset_rseg_slot = false;
+
+		if (is_purge_pending(rseg_id, reset_rseg_slot)) {
+			trx_rseg_initialize(rseg_id,
+				trx_sys->pending_purge_rseg_array, purge_queue);
+			continue;
+		}
+
+		if (reset_rseg_slot) {
+			/* We need to reset this rollback segment slot on disk.
+			Redo recovery is not finished at this point and we don't
+			want to start DB modification generating new redo logs.
+			The reset is deferred till recovery end and done by
+			trx_rseg_reset_pending(). */
+			s_pending_reset_rseg_ids.push_back(rseg_id);
+		}
+		ut_a(trx_sys->pending_purge_rseg_array[rseg_id] == NULL);
+	}
+}
+
+/** Reset no-redo rollback segment slot on disk.
+@param[in]	rseg_id	rollback segment ID */
+static void trx_rseg_reset_slot(
+	ulint	rseg_id)
+{
+	ut_a(rseg_id < TRX_SYS_N_RSEGS);
+	ut_a(trx_sys_is_noredo_rseg_slot(rseg_id));
+
+	/* Reset rollback segment slot on disk. */
+	mtr_t	mtr;
+	mtr.start();
+	trx_sysf_t* sys_header = trx_sysf_get(&mtr);
+
+	trx_sysf_rseg_set_page_no(
+                              sys_header, rseg_id, FIL_NULL, &mtr);
+	mtr.commit();
+}
+
+void trx_rseg_reset_pending() {
+	if (s_pending_reset_rseg_ids.empty()) {
+		return;
+
+	} else if (srv_read_only_mode) {
+		ib::warn() << "Could not reset pre-5.7.2 rseg slots"
+			   << " in read-only mode.";
+		return;
 	}
+        /* Check and reset no-redo rollback segment slots carried forward from
+	pre-5.7.2 with no left-over data to purge. This is a deferred action
+	from trx_rseg_create_instance(). */
+	std::for_each(s_pending_reset_rseg_ids.begin(),
+		      s_pending_reset_rseg_ids.end(), trx_rseg_reset_slot);
+
+	ib::info() << "Successfully reset " << s_pending_reset_rseg_ids.size()
+		   << " pre-5.7.2 rseg slots.";
+
+	s_pending_reset_rseg_ids.clear();
 }
 
 /*********************************************************************
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc
index fd5fd2d4ede7..9d74d82ec6ec 100644
--- a/storage/innobase/trx/trx0sys.cc
+++ b/storage/innobase/trx/trx0sys.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1200,15 +1208,14 @@ trx_sys_close(void)
 		}
 	}
 
-	rseg_array = ((trx_rseg_t**) trx_sys->pending_purge_rseg_array);
-
 	for (ulint i = 0; i < TRX_SYS_N_RSEGS; ++i) {
 		trx_rseg_t*	rseg;
 
 		rseg = trx_sys->pending_purge_rseg_array[i];
 
 		if (rseg != NULL) {
-			trx_rseg_mem_free(rseg, rseg_array);
+			trx_rseg_mem_free(rseg,
+				trx_sys->pending_purge_rseg_array);
 		}
 	}
 
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 8dedb0d04d3d..aaab1ea8f0a2 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -127,6 +135,8 @@ trx_init(
 
 	trx->no = TRX_ID_MAX;
 
+	trx->skip_lock_inheritance = false;
+
 	trx->is_recovered = false;
 
 	trx->op_info = "";
@@ -182,6 +192,7 @@ trx_init(
 	trx->lock.rec_cached = 0;
 
 	trx->lock.table_cached = 0;
+	trx->error_index = NULL;
 
 	/* During asynchronous rollback, we should reset forced rollback flag
 	only after rollback is complete to avoid race with the thread owning
@@ -1981,13 +1992,6 @@ trx_commit_in_memory(
 		}
 	}
 
-	if (trx->rsegs.m_redo.rseg != NULL) {
-		trx_rseg_t*	rseg = trx->rsegs.m_redo.rseg;
-		mutex_enter(&rseg->mutex);
-		ut_ad(rseg->trx_ref_count > 0);
-		--rseg->trx_ref_count;
-		mutex_exit(&rseg->mutex);
-	}
 
 	if (mtr != NULL) {
 		if (trx->rsegs.m_redo.insert_undo != NULL) {
@@ -2050,6 +2054,24 @@ trx_commit_in_memory(
 		srv_active_wake_master_thread();
 	}
 
+	/* Do not decrement the reference count before this point.
+	There is a potential issue where a thread attempting to truncate
+	an undo tablespace may end up truncating this undo space
+	before this thread can complete the cleanup.
+	While truncating an undo space, the server tries to find if any
+	transaction is actively using the undo log being truncated. A
+	non-zero reference count ensures that the thread attempting to
+	truncate the undo tablespace cannot be successful as the undo log
+	cannot be truncated until it is empty. */
+	if (trx->rsegs.m_redo.rseg != NULL) {
+		trx_rseg_t*	rseg = trx->rsegs.m_redo.rseg;
+		mutex_enter(&rseg->mutex);
+		ut_ad(rseg->trx_ref_count > 0);
+		--rseg->trx_ref_count;
+		mutex_exit(&rseg->mutex);
+		trx->rsegs.m_redo.rseg = NULL;
+	}
+
 	/* Free all savepoints, starting from the first. */
 	trx_named_savept_t*	savep = UT_LIST_GET_FIRST(trx->trx_savepoints);
 
@@ -2161,7 +2183,7 @@ trx_commit_low(
 	} else {
 		serialised = false;
 	}
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 	/* In case of this function is called from a stack executing
 	   THD::release_resources -> ...
               innobase_connection_close() ->
@@ -2494,7 +2516,7 @@ trx_print_low(
 			/*!< in: transaction */
 	ulint		max_query_len,
 			/*!< in: max query length to print,
-			or 0 to use the default max length */
+			must be positive */
 	ulint		n_rec_locks,
 			/*!< in: lock_number_of_rows_locked(&trx->lock) */
 	ulint		n_trx_locks,
@@ -2834,6 +2856,22 @@ trx_prepare(
 	trx_sys_mutex_exit();
 	/*--------------------------------------*/
 
+	/* Force isolation level to RC and release GAP locks
+	for test purpose. */
+	DBUG_EXECUTE_IF("ib_force_release_gap_lock_prepare",
+			trx->isolation_level = TRX_ISO_READ_COMMITTED;);
+
+	/* Release read locks after PREPARE for READ COMMITTED
+	and lower isolation. */
+	if (trx->isolation_level <= TRX_ISO_READ_COMMITTED) {
+
+		/* Stop inheriting GAP locks. */
+		trx->skip_lock_inheritance = true;
+
+		/* Release only GAP locks for now. */
+		lock_trx_release_read_locks(trx, true);
+	}
+
 	switch (thd_requested_durability(trx->mysql_thd)) {
 	case HA_IGNORE_DURABILITY:
 		/* We set the HA_IGNORE_DURABILITY during prepare phase of
@@ -3183,6 +3221,7 @@ trx_set_rw_mode(
 	ut_ad(trx->rsegs.m_redo.rseg == 0);
 	ut_ad(!trx->in_rw_trx_list);
 	ut_ad(!trx_is_autocommit_non_locking(trx));
+	ut_ad(!trx->read_only);
 
 	if (srv_force_recovery >= SRV_FORCE_NO_TRX_UNDO) {
 		return;
@@ -3222,11 +3261,9 @@ trx_set_rw_mode(
 	}
 #endif /* UNIV_DEBUG */
 
-	if (!trx->read_only) {
-		UT_LIST_ADD_FIRST(trx_sys->rw_trx_list, trx);
+	UT_LIST_ADD_FIRST(trx_sys->rw_trx_list, trx);
 
-		ut_d(trx->in_rw_trx_list = true);
-	}
+	ut_d(trx->in_rw_trx_list = true);
 
 	mutex_exit(&trx_sys->mutex);
 }
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc
index f1c932c8a84a..a7ad855e86b5 100644
--- a/storage/innobase/trx/trx0undo.cc
+++ b/storage/innobase/trx/trx0undo.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -1519,7 +1527,6 @@ trx_undo_mem_create(
 	undo->empty = TRUE;
 	undo->top_page_no = page_no;
 	undo->guess_block = NULL;
-	undo->withdraw_clock = 0;
 
 	return(undo);
 }
@@ -2174,6 +2181,24 @@ trx_undo_truncate_tablespace(
 		rseg->last_trx_no = 0;
 		rseg->last_del_marks = FALSE;
 	}
+
+	/* During Upgrade, existing rsegs in range from slot-1....slot-32
+	were added into the array pending_purge_rseg_array[]. These rsegs also
+	reside in system or undo tablespace. */
+	trx_sysf_t* sys_header = trx_sysf_get(&mtr);
+	for (ulint i = 0; i < TRX_SYS_N_RSEGS; ++i) {
+		trx_rseg_t*	rseg = trx_sys->pending_purge_rseg_array[i];
+		if(rseg != NULL
+			&& rseg->space == undo_trunc->get_marked_space_id()) {
+			/* Reset the rollback segment slot in the trx
+			system header */
+			trx_sysf_rseg_set_page_no(
+				sys_header, rseg->id, FIL_NULL, &mtr);
+			/* Free a pending rollback segment instance in memory */
+			trx_rseg_mem_free(rseg,
+				trx_sys->pending_purge_rseg_array);
+		}
+	}
 	mtr_commit(&mtr);
 
 	return(success);
diff --git a/storage/innobase/usr/usr0sess.cc b/storage/innobase/usr/usr0sess.cc
index 0cb2ea0db15d..c5475d312e3c 100644
--- a/storage/innobase/usr/usr0sess.cc
+++ b/storage/innobase/usr/usr0sess.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1996, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0byte.cc b/storage/innobase/ut/ut0byte.cc
index bc592edc6bfa..678c7b631c92 100644
--- a/storage/innobase/ut/ut0byte.cc
+++ b/storage/innobase/ut/ut0byte.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2009, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc
index 979713f1f3bd..b9709e1048c6 100644
--- a/storage/innobase/ut/ut0crc32.cc
+++ b/storage/innobase/ut/ut0crc32.cc
@@ -1,15 +1,23 @@
 /*****************************************************************************
 
 Copyright (c) 2009, 2010 Facebook, Inc. All Rights Reserved.
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2011, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0dbg.cc b/storage/innobase/ut/ut0dbg.cc
index bcf9d5fd1b5b..09a8e0fd717b 100644
--- a/storage/innobase/ut/ut0dbg.cc
+++ b/storage/innobase/ut/ut0dbg.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0list.cc b/storage/innobase/ut/ut0list.cc
index f62cbf8232b0..a1ceaeb3243d 100644
--- a/storage/innobase/ut/ut0list.cc
+++ b/storage/innobase/ut/ut0list.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0mem.cc b/storage/innobase/ut/ut0mem.cc
index 0ad251be157f..01752225e08e 100644
--- a/storage/innobase/ut/ut0mem.cc
+++ b/storage/innobase/ut/ut0mem.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0new.cc b/storage/innobase/ut/ut0new.cc
index c2e3eb813af7..869d6fe84ae4 100644
--- a/storage/innobase/ut/ut0new.cc
+++ b/storage/innobase/ut/ut0new.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0rbt.cc b/storage/innobase/ut/ut0rbt.cc
index 8345c2c7593c..fdb801b06a43 100644
--- a/storage/innobase/ut/ut0rbt.cc
+++ b/storage/innobase/ut/ut0rbt.cc
@@ -1,14 +1,22 @@
 /***************************************************************************//**
 
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2007, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0rnd.cc b/storage/innobase/ut/ut0rnd.cc
index 2d2d8977ad7d..dbc4d1f9d0ad 100644
--- a/storage/innobase/ut/ut0rnd.cc
+++ b/storage/innobase/ut/ut0rnd.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc
index 1034928a47cc..fc13e4981799 100644
--- a/storage/innobase/ut/ut0ut.cc
+++ b/storage/innobase/ut/ut0ut.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -137,85 +145,53 @@ ut_time(void)
 }
 
 #ifndef UNIV_HOTBACKUP
-/**********************************************************//**
-Returns system time.
-Upon successful completion, the value 0 is returned; otherwise the
-value -1 is returned and the global variable errno is set to indicate the
-error.
-@return 0 on success, -1 otherwise */
-int
-ut_usectime(
-/*========*/
-	ulint*	sec,	/*!< out: seconds since the Epoch */
-	ulint*	ms)	/*!< out: microseconds since the Epoch+*sec */
-{
-	struct timeval	tv;
-	int		ret;
-	int		errno_gettimeofday;
-	int		i;
-
-	for (i = 0; i < 10; i++) {
-
-		ret = ut_gettimeofday(&tv, NULL);
-
-		if (ret == -1) {
-			errno_gettimeofday = errno;
-			ib::error() << "gettimeofday(): "
-				<< strerror(errno_gettimeofday);
-			os_thread_sleep(100000);  /* 0.1 sec */
-			errno = errno_gettimeofday;
-		} else {
-			break;
-		}
-	}
-
-	if (ret != -1) {
-		*sec = (ulint) tv.tv_sec;
-		*ms  = (ulint) tv.tv_usec;
-	}
-
-	return(ret);
-}
 
-/**********************************************************//**
-Returns the number of microseconds since epoch. Similar to
-time(3), the return value is also stored in *tloc, provided
-that tloc is non-NULL.
-@return us since epoch */
-uintmax_t
-ut_time_us(
-/*=======*/
-	uintmax_t*	tloc)	/*!< out: us since epoch, if non-NULL */
-{
-	struct timeval	tv;
+/** Returns the number of microseconds since epoch. Uses the monotonic clock.
+ For windows it return normal time.
+ @return us since epoch or 0 if failed to retrieve */
+ib_time_monotonic_us_t ut_time_monotonic_us(void) {
 	uintmax_t	us;
-
+#ifdef HAVE_CLOCK_GETTIME
+	struct timespec tp;
+	clock_gettime(CLOCK_MONOTONIC,&tp);
+	us = static_cast<uintmax_t>(tp.tv_sec) *1000000 + tp.tv_nsec / 1000;
+#else
+	struct timeval	tv;
 	ut_gettimeofday(&tv, NULL);
-
 	us = static_cast<uintmax_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-
-	if (tloc != NULL) {
-		*tloc = us;
-	}
-
+#endif /* HAVE_CLOCK_GETTIME */
 	return(us);
 }
 
-/**********************************************************//**
-Returns the number of milliseconds since some epoch.  The
-value may wrap around.  It should only be used for heuristic
-purposes.
-@return ms since epoch */
-ulint
-ut_time_ms(void)
-/*============*/
-{
+/** Returns the number of milliseconds since epoch. Uses the monotonic clock.
+ For windows,MacOS it return normal time.
+ @return us since epoch or 0 if failed to retrieve */
+ib_time_monotonic_ms_t ut_time_monotonic_ms(void) {
+#ifdef HAVE_CLOCK_GETTIME
+	struct timespec tp;
+	clock_gettime(CLOCK_MONOTONIC,&tp);
+	return ((ulint) tp.tv_sec * 1000 + tp.tv_nsec / 1000 / 1000);
+#else
 	struct timeval	tv;
-
 	ut_gettimeofday(&tv, NULL);
-
 	return((ulint) tv.tv_sec * 1000 + tv.tv_usec / 1000);
+#endif /* HAVE_CLOCK_GETTIME */
+}
+
+/** Returns the number of seconds since epoch. Uses the monotonic clock.
+ For windows it return normal time.
+ @return us since epoch or 0 if failed to retrieve */
+ib_time_monotonic_us_t ut_time_monotonic(void) {
+#ifdef HAVE_CLOCK_GETTIME
+	struct timespec tp;
+	clock_gettime(CLOCK_MONOTONIC,&tp);
+	return tp.tv_sec;
+#else
+	return(time(NULL));
+#endif /* HAVE_CLOCK_GETTIME */
+
 }
+
 #endif /* !UNIV_HOTBACKUP */
 
 /**********************************************************//**
@@ -855,6 +831,9 @@ ut_strerr(
 	case DB_COMPUTE_VALUE_FAILED:
 		return("Compute generated column failed");
 
+	case DB_FTS_TOO_MANY_NESTED_EXP:
+		return("Too many nested sub-expressions in a full-text search");
+
 	/* do not add default: in order to produce a warning if new code
 	is added to the enum but not added here */
 	}
diff --git a/storage/innobase/ut/ut0vec.cc b/storage/innobase/ut/ut0vec.cc
index f4a893967c75..e0a87dde03c7 100644
--- a/storage/innobase/ut/ut0vec.cc
+++ b/storage/innobase/ut/ut0vec.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
diff --git a/storage/innobase/ut/ut0wqueue.cc b/storage/innobase/ut/ut0wqueue.cc
index 87df9cbcc495..31f9cd6a3b05 100644
--- a/storage/innobase/ut/ut0wqueue.cc
+++ b/storage/innobase/ut/ut0wqueue.cc
@@ -1,14 +1,22 @@
 /*****************************************************************************
 
-Copyright (c) 2006, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc.,
@@ -31,6 +39,7 @@ Created 4/26/2006 Osku Salerma
 struct ib_wqueue_t {
 	ib_mutex_t	mutex;	/*!< mutex protecting everything */
 	ib_list_t*	items;	/*!< work item list */
+	uint64_t	count;	/*!< total number of work items */
 	os_event_t	event;	/*!< event we use to signal additions to list */
 };
 
@@ -51,6 +60,7 @@ ib_wqueue_create(void)
 
 	wq->items = ib_list_create();
 	wq->event = os_event_create(0);
+	wq->count = 0;
 
 	return(wq);
 }
@@ -82,6 +92,7 @@ ib_wqueue_add(
 	mutex_enter(&wq->mutex);
 
 	ib_list_add_last(wq->items, item, heap);
+	wq->count++;
 	os_event_set(wq->event);
 
 	mutex_exit(&wq->mutex);
@@ -106,7 +117,7 @@ ib_wqueue_wait(
 
 		if (node) {
 			ib_list_remove(wq->items, node);
-
+			wq->count--;
 			if (!ib_list_get_first(wq->items)) {
 				/* We must reset the event when the list
 				gets emptied. */
@@ -124,6 +135,20 @@ ib_wqueue_wait(
 	return(node->data);
 }
 
+/********************************************************************
+read total number of work item to the queue.
+@return total count of work item in the queue */
+uint64_t
+ib_wqueue_get_count(
+/*==========*/
+	ib_wqueue_t *wq)		/*!< in: work queue */
+{
+	uint64_t count;
+	mutex_enter(&wq->mutex);
+	count = wq->count;
+	mutex_exit(&wq->mutex);
+	return count;
+}
 
 /********************************************************************
 Wait for a work item to appear in the queue for specified time. */
@@ -146,7 +171,7 @@ ib_wqueue_timedwait(
 
 		if (node) {
 			ib_list_remove(wq->items, node);
-
+			wq->count--;
 			mutex_exit(&wq->mutex);
 			break;
 		}
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index f09d31513886..a0859ec8bc70 100644
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -1,19 +1,28 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
                                 ha_myisam.cc
 				ft_stopwords.c ft_update.c mi_cache.c mi_changed.c mi_check.c
@@ -24,9 +33,17 @@ SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
 				mi_rfirst.c mi_rlast.c mi_rnext.c mi_rnext_same.c mi_rprev.c mi_rrnd.c
 				mi_rsame.c mi_rsamepos.c mi_scan.c mi_search.c mi_static.c mi_statrec.c
 				mi_unique.c mi_update.c mi_write.c rt_index.c rt_key.c rt_mbr.c
-				rt_split.c sort.c sp_key.c mi_extrafunc.h myisamdef.h
+				rt_split.c sort.cc sp_key.c mi_extrafunc.h myisamdef.h
 				rt_index.h mi_rkey.c)
 
+MY_CHECK_CXX_COMPILER_FLAG("-Wcast-function-type" HAVE_CAST_FUNCTION_TYPE)
+IF(HAVE_CAST_FUNCTION_TYPE)
+  ADD_COMPILE_FLAGS(
+    mi_write.c
+    myisamlog.c
+    COMPILE_FLAGS "-Wno-cast-function-type")
+ENDIF()
+
 MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES} 
   STORAGE_ENGINE 
   MANDATORY 
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
index 647e57c5a5d3..3857f13c956c 100644
--- a/storage/myisam/ft_boolean_search.c
+++ b/storage/myisam/ft_boolean_search.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -270,7 +277,7 @@ static int ftb_query_add_word(MYSQL_FTPARSER_PARAM *param,
       info->quot= 0;
       if (ftb_param->ftbe->up)
       {
-        DBUG_ASSERT(ftb_param->depth);
+        assert(ftb_param->depth);
         ftb_param->ftbe= ftb_param->ftbe->up;
         ftb_param->depth--;
         ftb_param->up_quot= 0;
@@ -308,7 +315,7 @@ static int _ftb_parse_query(FTB *ftb, uchar *query, uint len,
   MYSQL_FTPARSER_PARAM *param;
   MY_FTB_PARAM ftb_param;
   DBUG_ENTER("_ftb_parse_query");
-  DBUG_ASSERT(parser);
+  assert(parser);
 
   if (ftb->state != UNINITIALIZED)
     DBUG_RETURN(0);
@@ -476,7 +483,7 @@ static int _ft2_search_no_lock(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
     ftbw->key_root=info->lastpos;
     ftbw->keyinfo=& info->s->ft2_keyinfo;
     r=_mi_search_first(info, ftbw->keyinfo, ftbw->key_root);
-    DBUG_ASSERT(r==0);  /* found something */
+    assert(r==0);  /* found something */
     memcpy(lastkey_buf+off, info->lastkey, info->lastkey_length);
   }
   ftbw->docid[0]=info->lastpos;
@@ -581,7 +588,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, uchar *query,
   ftb->info=info;
   ftb->keynr=keynr;
   ftb->charset=cs;
-  DBUG_ASSERT(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);
+  assert(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);
   ftb->with_scan=0;
   ftb->lastpos=HA_OFFSET_ERROR;
   memset(&ftb->no_dupes, 0, sizeof(TREE));
@@ -712,7 +719,7 @@ static int _ftb_check_phrase(FTB *ftb, const uchar *document, uint len,
   MY_FTB_PHRASE_PARAM ftb_param;
   MYSQL_FTPARSER_PARAM *param;
   DBUG_ENTER("_ftb_check_phrase");
-  DBUG_ASSERT(parser);
+  assert(parser);
 
   if (! (param= ftparser_call_initializer(ftb->info, ftb->keynr, 1)))
     DBUG_RETURN(0);
diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c
index 0bed577b6220..145886ea29b4 100644
--- a/storage/myisam/ft_nlq_search.c
+++ b/storage/myisam/ft_nlq_search.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/ft_parser.c b/storage/myisam/ft_parser.c
index d9370ffc5ac1..bf70a03ce076 100644
--- a/storage/myisam/ft_parser.c
+++ b/storage/myisam/ft_parser.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -269,7 +276,7 @@ static int ft_add_word(MYSQL_FTPARSER_PARAM *param,
   if (param->flags & MYSQL_FTFLAGS_NEED_COPY)
   {
     uchar *ptr;
-    DBUG_ASSERT(wtree->with_delete == 0);
+    assert(wtree->with_delete == 0);
     ptr= (uchar *)alloc_root(ft_param->mem_root, word_len);
     memcpy(ptr, word, word_len);
     w.pos= ptr;
@@ -309,7 +316,7 @@ int ft_parse(TREE *wtree, uchar *doc, int doclen,
 {
   MY_FT_PARSER_PARAM my_param;
   DBUG_ENTER("ft_parse");
-  DBUG_ASSERT(parser);
+  assert(parser);
 
   my_param.wtree= wtree;
   my_param.mem_root= mem_root;
@@ -371,7 +378,7 @@ MYSQL_FTPARSER_PARAM *ftparser_call_initializer(MI_INFO *info,
     ftparser_nr= info->s->keyinfo[keynr].ftkey_nr;
     parser= info->s->keyinfo[keynr].parser;
   }
-  DBUG_ASSERT(paramnr < MAX_PARAM_NR);
+  assert(paramnr < MAX_PARAM_NR);
   ftparser_nr= ftparser_nr*MAX_PARAM_NR + paramnr;
   if (! info->ftparser_param[ftparser_nr].mysql_add_word)
   {
diff --git a/storage/myisam/ft_static.c b/storage/myisam/ft_static.c
index 30b0c7e88c9c..ade72e652397 100644
--- a/storage/myisam/ft_static.c
+++ b/storage/myisam/ft_static.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c
index 26f1aa282cc1..3377acc98f81 100644
--- a/storage/myisam/ft_stopwords.c
+++ b/storage/myisam/ft_stopwords.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/ft_update.c b/storage/myisam/ft_update.c
index ab9fb7161b0e..13159849f343 100644
--- a/storage/myisam/ft_update.c
+++ b/storage/myisam/ft_update.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/ftbench/Ecompare.pl b/storage/myisam/ftbench/Ecompare.pl
index 57908acf2fcb..6730e4aedc8e 100755
--- a/storage/myisam/ftbench/Ecompare.pl
+++ b/storage/myisam/ftbench/Ecompare.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/storage/myisam/ftbench/Ecreate.pl b/storage/myisam/ftbench/Ecreate.pl
index 906efb3f18fd..ef779df8ca92 100755
--- a/storage/myisam/ftbench/Ecreate.pl
+++ b/storage/myisam/ftbench/Ecreate.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/storage/myisam/ftbench/Ereport.pl b/storage/myisam/ftbench/Ereport.pl
index 4fcab2ec0aa7..e82bc8479087 100755
--- a/storage/myisam/ftbench/Ereport.pl
+++ b/storage/myisam/ftbench/Ereport.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/storage/myisam/ftbench/ft-test-run.sh b/storage/myisam/ftbench/ft-test-run.sh
index 35e76a605b7f..7ed7627508a2 100755
--- a/storage/myisam/ftbench/ft-test-run.sh
+++ b/storage/myisam/ftbench/ft-test-run.sh
@@ -1,17 +1,23 @@
 #!/bin/sh
 
-# Copyright (c) 2003, 2005, 2006 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/storage/myisam/ftdefs.h b/storage/myisam/ftdefs.h
index c811c31063fa..ef9a2956f8b5 100644
--- a/storage/myisam/ftdefs.h
+++ b/storage/myisam/ftdefs.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/fulltext.h b/storage/myisam/fulltext.h
index 00f9875fa43c..b174f4861993 100644
--- a/storage/myisam/fulltext.h
+++ b/storage/myisam/fulltext.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 08eebeca58ea..af090b06d84e 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -77,12 +84,6 @@ static MYSQL_SYSVAR_SET(recover_options, myisam_recover_options,
   "DEFAULT, BACKUP, FORCE, QUICK, or OFF",
   NULL, NULL, 0, &myisam_recover_typelib);
 
-static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG,
-  "If larger than 1, when repairing a MyISAM table all indexes will be "
-  "created in parallel, with one thread per index. The value of 1 "
-  "disables parallel repair", NULL, NULL,
-  1, 1, ULONG_MAX, 1);
-
 static MYSQL_THDVAR_ULONGLONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG,
   "The buffer that is allocated when sorting the index when doing "
   "a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE", NULL, NULL,
@@ -103,7 +104,7 @@ static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG,
   "and NULLS_IGNORED", NULL, NULL,
   MI_STATS_METHOD_NULLS_NOT_EQUAL, &myisam_stats_method_typelib);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 /**
   Causes the thread to wait in a spin lock for a query kill signal.
   This function is used by the test frame work to identify race conditions.
@@ -171,13 +172,7 @@ static void mi_check_print_msg(MI_CHECK *param,	const char* msg_type,
     TODO: switch from protocol to push_warning here. The main reason we didn't
     it yet is parallel repair. Due to following trace:
     mi_check_print_msg/push_warning/sql_alloc/my_pthread_getspecific_ptr.
-
-    Also we likely need to lock mutex here (in both cases with protocol and
-    push_warning).
   */
-  if (param->need_print_msg_lock)
-    mysql_mutex_lock(&param->print_msg_mutex);
-
   protocol->start_row();
   protocol->store(name, length, system_charset_info);
   protocol->store(param->op_name, system_charset_info);
@@ -187,9 +182,6 @@ static void mi_check_print_msg(MI_CHECK *param,	const char* msg_type,
     sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n",
 		    msgbuf);
 
-  if (param->need_print_msg_lock)
-    mysql_mutex_unlock(&param->print_msg_mutex);
-
   return;
 }
 
@@ -875,7 +867,7 @@ int ha_myisam::write_row(uchar *buf)
     If we have an auto_increment column and we are writing a changed row
     or a new row, then update the auto_increment value in the record.
   */
-  if (table->next_number_field && buf == table->record[0])
+  if (table && table->next_number_field && buf == table->record[0])
   {
     int error;
     if ((error= update_auto_increment()))
@@ -1139,31 +1131,13 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool do_optimize)
       local_testflag|= T_STATISTICS;
       param.testflag|= T_STATISTICS;		// We get this for free
       statistics_done=1;
-      if (THDVAR(thd, repair_threads)>1)
-      {
-        char buf[40];
-        /* TODO: respect myisam_repair_threads variable */
-        my_snprintf(buf, 40, "Repair with %d threads", my_count_bits(key_map));
-        thd_proc_info(thd, buf);
-        /*
-          The new file is created with the right stats, so we can skip
-          copying file stats from old to new.
-        */
-        error = mi_repair_parallel(&param, file, fixed_name,
-                                   param.testflag & T_QUICK, TRUE);
-        thd_proc_info(thd, "Repair done"); // to reset proc_info, as
-                                      // it was pointing to local buffer
-      }
-      else
-      {
-        thd_proc_info(thd, "Repair by sorting");
-        /*
-          The new file is created with the right stats, so we can skip
-          copying file stats from old to new.
-        */
-        error = mi_repair_by_sort(&param, file, fixed_name,
-                                  param.testflag & T_QUICK, TRUE);
-      }
+      thd_proc_info(thd, "Repair by sorting");
+      /*
+        The new file is created with the right stats, so we can skip
+        copying file stats from old to new.
+      */
+      error= mi_repair_by_sort(&param, file, fixed_name,
+                               param.testflag & T_QUICK, TRUE);
     }
     else
     {
@@ -1224,10 +1198,14 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool do_optimize)
     if (file->s->base.auto_key)
       update_auto_increment_key(&param, file, 1);
     if (optimize_done)
+    {
+      mysql_mutex_lock(&share->intern_lock);
       error = update_state_info(&param, file,
 				UPDATE_TIME | UPDATE_OPEN_COUNT |
 				(local_testflag &
 				 T_STATISTICS ? UPDATE_STAT : 0));
+      mysql_mutex_unlock(&share->intern_lock);
+    }
     info(HA_STATUS_NO_LOCK | HA_STATUS_TIME | HA_STATUS_VARIABLE |
 	 HA_STATUS_CONST);
     if (rows != file->state->records && ! (param.testflag & T_VERY_SILENT))
@@ -1709,7 +1687,7 @@ int ha_myisam::index_read_map(uchar *buf, const uchar *key,
                               enum ha_rkey_function find_flag)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=mi_rkey(file, buf, active_index, key, keypart_map, find_flag);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -1721,8 +1699,8 @@ int ha_myisam::index_read_idx_map(uchar *buf, uint index, const uchar *key,
                                   key_part_map keypart_map,
                                   enum ha_rkey_function find_flag)
 {
-  DBUG_ASSERT(pushed_idx_cond == NULL);
-  DBUG_ASSERT(pushed_idx_cond_keyno == MAX_KEY);
+  assert(pushed_idx_cond == NULL);
+  assert(pushed_idx_cond_keyno == MAX_KEY);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=mi_rkey(file, buf, index, key, keypart_map, find_flag);
@@ -1736,7 +1714,7 @@ int ha_myisam::index_read_last_map(uchar *buf, const uchar *key,
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   DBUG_ENTER("ha_myisam::index_read_last");
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=mi_rkey(file, buf, active_index, key, keypart_map,
                     HA_READ_PREFIX_LAST);
@@ -1748,7 +1726,7 @@ int ha_myisam::index_read_last_map(uchar *buf, const uchar *key,
 int ha_myisam::index_next(uchar *buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_next_count);
   int error=mi_rnext(file,buf,active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -1759,7 +1737,7 @@ int ha_myisam::index_next(uchar *buf)
 int ha_myisam::index_prev(uchar *buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_prev_count);
   int error=mi_rprev(file,buf, active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -1770,7 +1748,7 @@ int ha_myisam::index_prev(uchar *buf)
 int ha_myisam::index_first(uchar *buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_first_count);
   int error=mi_rfirst(file, buf, active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -1781,7 +1759,7 @@ int ha_myisam::index_first(uchar *buf)
 int ha_myisam::index_last(uchar *buf)
 {
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_last_count);
   int error=mi_rlast(file, buf, active_index);
   table->status=error ? STATUS_NOT_FOUND: 0;
@@ -1794,7 +1772,7 @@ int ha_myisam::index_next_same(uchar *buf,
 			       uint length MY_ATTRIBUTE((unused)))
 {
   int error;
-  DBUG_ASSERT(inited==INDEX);
+  assert(inited==INDEX);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_next_count);
   do
@@ -1932,8 +1910,8 @@ int ha_myisam::extra(enum ha_extra_function operation)
 int ha_myisam::reset(void)
 {
   /* Reset MyISAM specific part for index condition pushdown */
-  DBUG_ASSERT(pushed_idx_cond == NULL);
-  DBUG_ASSERT(pushed_idx_cond_keyno == MAX_KEY);
+  assert(pushed_idx_cond == NULL);
+  assert(pushed_idx_cond_keyno == MAX_KEY);
   mi_set_index_cond_func(file, NULL, 0);
   ds_mrr.reset();
   return mi_reset(file);
@@ -2295,7 +2273,8 @@ static int myisam_init(void *p)
   myisam_hton->create= myisam_create_handler;
   myisam_hton->panic= myisam_panic;
   myisam_hton->close_connection= myisam_close_connection;
-  myisam_hton->flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
+  myisam_hton->flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES |
+                      HTON_SUPPORTS_PACKED_KEYS;
   myisam_hton->is_supported_system_table= myisam_is_supported_system_table;
 
   main_thread_keycache_var= st_keycache_thread_var();
@@ -2395,7 +2374,6 @@ static struct st_mysql_sys_var* myisam_sysvars[]= {
   MYSQL_SYSVAR(data_pointer_size),
   MYSQL_SYSVAR(max_sort_file_size),
   MYSQL_SYSVAR(recover_options),
-  MYSQL_SYSVAR(repair_threads),
   MYSQL_SYSVAR(sort_buffer_size),
   MYSQL_SYSVAR(use_mmap),
   MYSQL_SYSVAR(mmap_size),
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index f7794b7c85fc..f0bbc55ddb1d 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -83,7 +90,9 @@ class ha_myisam: public handler
   }
   uint max_supported_keys()          const { return MI_MAX_KEY; }
   uint max_supported_key_length()    const { return MI_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                    *create_info MY_ATTRIBUTE((unused))) const
+  { return MI_MAX_KEY_LENGTH; }
   uint checksum() const;
 
   int open(const char *name, int mode, uint test_if_locked);
diff --git a/storage/myisam/mi_cache.c b/storage/myisam/mi_cache.c
index 3bee18accc6b..4078213888f3 100644
--- a/storage/myisam/mi_cache.c
+++ b/storage/myisam/mi_cache.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_changed.c b/storage/myisam/mi_changed.c
index e7ceff24287b..9b8281ccf584 100644
--- a/storage/myisam/mi_changed.c
+++ b/storage/myisam/mi_changed.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2001, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 444fdfc11e6f..26221219f1ad 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -98,7 +105,6 @@ void myisamchk_init(MI_CHECK *param)
   param->max_record_length= LLONG_MAX;
   param->key_cache_block_size= KEY_CACHE_BLOCK_SIZE;
   param->stats_method= MI_STATS_METHOD_NULLS_NOT_EQUAL;
-  param->need_print_msg_lock= 0;
 }
 
 	/* Check the status flags for the table */
@@ -867,7 +873,7 @@ static int chk_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
     }
     if (record >= info->state->data_file_length)
     {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       char llbuff2[22], llbuff3[22];
 #endif
       mi_check_print_error(param,"Found key at page %s that points to record outside datafile",llstr(page,llbuff));
@@ -1548,7 +1554,7 @@ int mi_repair(MI_CHECK *param, MI_INFO *info,
   if (info->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
     param->testflag|=T_CALC_CHECKSUM;
 
-  DBUG_ASSERT(param->use_buffers < SIZE_T_MAX);
+  assert(param->use_buffers < SIZE_T_MAX);
 
   if (!param->using_global_keycache)
     (void) init_key_cache(dflt_key_cache, param->key_cache_block_size,
@@ -2063,7 +2069,7 @@ static int sort_one_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
   DBUG_ENTER("sort_one_index");
 
   /* cannot walk over R-tree indices */
-  DBUG_ASSERT(keyinfo->key_alg != HA_KEY_ALG_RTREE);
+  assert(keyinfo->key_alg != HA_KEY_ALG_RTREE);
   new_page_pos=param->new_file_pos;
   param->new_file_pos+=keyinfo->block_length;
 
@@ -2102,7 +2108,7 @@ static int sort_one_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
       if (keypos >= endpos ||
 	  (key_length=(*keyinfo->get_key)(keyinfo,nod_flag,&keypos,key)) == 0)
 	break;
-      DBUG_ASSERT(keypos <= endpos);
+      assert(keypos <= endpos);
       if (keyinfo->flag & HA_FULLTEXT)
       {
         uint off;
@@ -2603,537 +2609,6 @@ int mi_repair_by_sort(MI_CHECK *param, MI_INFO *info,
   DBUG_RETURN(got_error);
 }
 
-/*
-  Threaded repair of table using sorting
-
-  SYNOPSIS
-    mi_repair_parallel()
-    param		Repair parameters
-    info		MyISAM handler to repair
-    name		Name of table (for warnings)
-    rep_quick		set to <> 0 if we should not change data file
-    no_copy_stat        Don't copy file stats from old to new file,
-                        assume that new file was created with correct stats
-
-  DESCRIPTION
-    Same as mi_repair_by_sort but do it multithreaded
-    Each key is handled by a separate thread.
-    TODO: make a number of threads a parameter
-
-    In parallel repair we use one thread per index. There are two modes:
-
-    Quick
-
-      Only the indexes are rebuilt. All threads share a read buffer.
-      Every thread that needs fresh data in the buffer enters the shared
-      cache lock. The last thread joining the lock reads the buffer from
-      the data file and wakes all other threads.
-
-    Non-quick
-
-      The data file is rebuilt and all indexes are rebuilt to point to
-      the new record positions. One thread is the master thread. It
-      reads from the old data file and writes to the new data file. It
-      also creates one of the indexes. The other threads read from a
-      buffer which is filled by the master. If they need fresh data,
-      they enter the shared cache lock. If the masters write buffer is
-      full, it flushes it to the new data file and enters the shared
-      cache lock too. When all threads joined in the lock, the master
-      copies its write buffer to the read buffer for the other threads
-      and wakes them.
-
-  RESULT
-    0	ok
-    <>0	Error
-*/
-
-int mi_repair_parallel(MI_CHECK *param, MI_INFO *info,
-                       const char * name, int rep_quick, my_bool no_copy_stat)
-{
-  int got_error;
-  uint i,key, total_key_length, istep;
-  ulong rec_length;
-  ha_rows start_records;
-  my_off_t new_header_length,del;
-  File new_file;
-  MI_SORT_PARAM *sort_param=0;
-  MYISAM_SHARE *share=info->s;
-  ulong   *rec_per_key_part;
-  HA_KEYSEG *keyseg;
-  char llbuff[22];
-  IO_CACHE new_data_cache; /* For non-quick repair. */
-  IO_CACHE_SHARE io_share;
-  SORT_INFO sort_info;
-  ulonglong key_map= 0;
-  my_thread_attr_t thr_attr;
-  ulong max_pack_reclength;
-  int error;
-  DBUG_ENTER("mi_repair_parallel");
-
-  memset(&new_data_cache, 0, sizeof(IO_CACHE));
-  start_records=info->state->records;
-  got_error=1;
-  new_file= -1;
-  new_header_length=(param->testflag & T_UNPACK) ? 0 :
-    share->pack.header_length;
-  if (!(param->testflag & T_SILENT))
-  {
-    printf("- parallel recovering (with sort) MyISAM-table '%s'\n",name);
-    printf("Data records: %s\n", llstr(start_records,llbuff));
-  }
-  param->testflag|=T_REP; /* for easy checking */
-
-  if (info->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
-    param->testflag|=T_CALC_CHECKSUM;
-
-  /*
-    Quick repair (not touching data file, rebuilding indexes):
-    {
-      Read  cache is (MI_CHECK *param)->read_cache using info->dfile.
-    }
-
-    Non-quick repair (rebuilding data file and indexes):
-    {
-      Master thread:
-
-        Read  cache is (MI_CHECK *param)->read_cache using info->dfile.
-        Write cache is (MI_INFO   *info)->rec_cache  using new_file.
-
-      Slave threads:
-
-        Read  cache is new_data_cache synced to master rec_cache.
-
-      The final assignment of the filedescriptor for rec_cache is done
-      after the cache creation.
-
-      Don't check file size on new_data_cache, as the resulting file size
-      is not known yet.
-
-      As rec_cache and new_data_cache are synced, write_buffer_length is
-      used for the read cache 'new_data_cache'. Both start at the same
-      position 'new_header_length'.
-    }
-  */
-  DBUG_PRINT("info", ("is quick repair: %d", rep_quick));
-  memset(&sort_info, 0, sizeof(sort_info));
-  /* Initialize pthread structures before goto err. */
-  mysql_mutex_init(mi_key_mutex_MI_SORT_INFO_mutex,
-                   &sort_info.mutex, MY_MUTEX_INIT_FAST);
-  mysql_cond_init(mi_key_cond_MI_SORT_INFO_cond, &sort_info.cond);
-  mysql_mutex_init(mi_key_mutex_MI_CHECK_print_msg,
-                   &param->print_msg_mutex, MY_MUTEX_INIT_FAST);
-  param->need_print_msg_lock= 1;
-
-  if (!(sort_info.key_block=
-	alloc_key_blocks(param, (uint) param->sort_key_blocks,
-			 share->base.max_key_block_length)) ||
-      init_io_cache(&param->read_cache, info->dfile,
-                    (uint) param->read_buffer_length,
-                    READ_CACHE, share->pack.header_length, 1, MYF(MY_WME)) ||
-      (!rep_quick &&
-       (init_io_cache(&info->rec_cache, info->dfile,
-                      (uint) param->write_buffer_length,
-                      WRITE_CACHE, new_header_length, 1,
-                      MYF(MY_WME | MY_WAIT_IF_FULL) & param->myf_rw) ||
-        init_io_cache(&new_data_cache, -1,
-                      (uint) param->write_buffer_length,
-                      READ_CACHE, new_header_length, 1,
-                      MYF(MY_WME | MY_DONT_CHECK_FILESIZE)))))
-    goto err;
-  sort_info.key_block_end=sort_info.key_block+param->sort_key_blocks;
-  info->opt_flag|=WRITE_CACHE_USED;
-  info->rec_cache.file=info->dfile;         /* for sort_delete_record */
-
-  if (!rep_quick)
-  {
-    /* Get real path for data file */
-    if ((new_file= mysql_file_create(mi_key_file_datatmp,
-                                     fn_format(param->temp_filename,
-                                               share->data_file_name, "",
-                                               DATA_TMP_EXT, 2+4),
-                                     0, param->tmpfile_createflag,
-                                     MYF(0))) < 0)
-    {
-      mi_check_print_error(param,"Can't create new tempfile: '%s'",
-			   param->temp_filename);
-      goto err;
-    }
-    if (new_header_length &&
-        filecopy(param, new_file,info->dfile,0L,new_header_length,
-		 "datafile-header"))
-      goto err;
-    if (param->testflag & T_UNPACK)
-    {
-      share->options&= ~HA_OPTION_COMPRESS_RECORD;
-      mi_int2store(share->state.header.options,share->options);
-    }
-    share->state.dellink= HA_OFFSET_ERROR;
-    info->rec_cache.file=new_file;
-  }
-
-  info->update= (short) (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
-
-  /* Optionally drop indexes and optionally modify the key_map. */
-  mi_drop_all_indexes(param, info, FALSE);
-  key_map= share->state.key_map;
-  if (param->testflag & T_CREATE_MISSING_KEYS)
-  {
-    /* Invert the copied key_map to recreate all disabled indexes. */
-    key_map= ~key_map;
-  }
-
-  sort_info.info=info;
-  sort_info.param = param;
-
-  set_data_file_type(&sort_info, share);
-  sort_info.dupp=0;
-  sort_info.buff=0;
-  param->read_cache.end_of_file=sort_info.filelength=
-    mysql_file_seek(param->read_cache.file, 0L, MY_SEEK_END, MYF(0));
-
-  if (share->data_file_type == DYNAMIC_RECORD)
-    rec_length= MY_MAX(share->base.min_pack_length + 1, share->base.min_block_length);
-  else if (share->data_file_type == COMPRESSED_RECORD)
-    rec_length=share->base.min_block_length;
-  else
-    rec_length=share->base.pack_reclength;
-  /*
-    +1 below is required hack for parallel repair mode.
-    The info->state->records value, that is compared later
-    to sort_info.max_records and cannot exceed it, is
-    increased in sort_key_write. In mi_repair_by_sort, sort_key_write
-    is called after sort_key_read, where the comparison is performed,
-    but in parallel mode master thread can call sort_key_write
-    before some other repair thread calls sort_key_read.
-    Furthermore I'm not even sure +1 would be enough.
-    May be sort_info.max_records shold be always set to max value in
-    parallel mode.
-  */
-  sort_info.max_records=
-    ((param->testflag & T_CREATE_MISSING_KEYS) ? info->state->records + 1:
-     (ha_rows) (sort_info.filelength/rec_length+1));
-
-  del=info->state->del;
-  param->glob_crc=0;
-  /* for compressed tables */
-  max_pack_reclength= share->base.pack_reclength;
-  if (share->options & HA_OPTION_COMPRESS_RECORD)
-    set_if_bigger(max_pack_reclength, share->max_pack_length);
-  if (!(sort_param=(MI_SORT_PARAM *)
-        my_malloc(mi_key_memory_MI_SORT_PARAM,
-                  (uint) share->base.keys *
-		  (sizeof(MI_SORT_PARAM) + max_pack_reclength),
-		  MYF(MY_ZEROFILL))))
-  {
-    mi_check_print_error(param,"Not enough memory for key!");
-    goto err;
-  }
-  total_key_length=0;
-  rec_per_key_part= param->rec_per_key_part;
-  info->state->records=info->state->del=share->state.split=0;
-  info->state->empty=0;
-
-  for (i=key=0, istep=1 ; key < share->base.keys ;
-       rec_per_key_part+=sort_param[i].keyinfo->keysegs, i+=istep, key++)
-  {
-    sort_param[i].key=key;
-    sort_param[i].keyinfo=share->keyinfo+key;
-    sort_param[i].seg=sort_param[i].keyinfo->seg;
-    /*
-      Skip this index if it is marked disabled in the copied
-      (and possibly inverted) key_map.
-    */
-    if (! mi_is_key_active(key_map, key))
-    {
-      /* Remember old statistics for key */
-      memcpy((char*) rec_per_key_part,
-	     (char*) (share->state.rec_per_key_part+
-		      (uint) (rec_per_key_part - param->rec_per_key_part)),
-	     sort_param[i].keyinfo->keysegs*sizeof(*rec_per_key_part));
-      istep=0;
-      continue;
-    }
-    istep=1;
-    if ((!(param->testflag & T_SILENT)))
-      printf ("- Fixing index %d\n",key+1);
-    if (sort_param[i].keyinfo->flag & HA_FULLTEXT)
-    {
-      sort_param[i].key_read=sort_ft_key_read;
-      sort_param[i].key_write=sort_ft_key_write;
-    }
-    else
-    {
-      sort_param[i].key_read=sort_key_read;
-      sort_param[i].key_write=sort_key_write;
-    }
-    sort_param[i].key_cmp=sort_key_cmp;
-    sort_param[i].lock_in_memory=lock_memory;
-    sort_param[i].tmpdir=param->tmpdir;
-    sort_param[i].sort_info=&sort_info;
-    sort_param[i].master=0;
-    sort_param[i].fix_datafile=0;
-    sort_param[i].calc_checksum= 0;
-
-    sort_param[i].filepos=new_header_length;
-    sort_param[i].max_pos=sort_param[i].pos=share->pack.header_length;
-
-    sort_param[i].record= (((uchar *)(sort_param+share->base.keys))+
-			   (max_pack_reclength * i));
-    if (!mi_alloc_rec_buff(info, -1, &sort_param[i].rec_buff))
-    {
-      mi_check_print_error(param,"Not enough memory!");
-      goto err;
-    }
-
-    sort_param[i].key_length=share->rec_reflength;
-    for (keyseg=sort_param[i].seg; keyseg->type != HA_KEYTYPE_END;
-	 keyseg++)
-    {
-      sort_param[i].key_length+=keyseg->length;
-      if (keyseg->flag & HA_SPACE_PACK)
-        sort_param[i].key_length+=get_pack_length(keyseg->length);
-      if (keyseg->flag & (HA_BLOB_PART | HA_VAR_LENGTH_PART))
-        sort_param[i].key_length+=2 + MY_TEST(keyseg->length >= 127);
-      if (keyseg->flag & HA_NULL_PART)
-        sort_param[i].key_length++;
-    }
-    total_key_length+=sort_param[i].key_length;
-
-    if (sort_param[i].keyinfo->flag & HA_FULLTEXT)
-    {
-      uint ft_max_word_len_for_sort=FT_MAX_WORD_LEN_FOR_SORT*
-                                    sort_param[i].keyinfo->seg->charset->mbmaxlen;
-      sort_param[i].key_length+=ft_max_word_len_for_sort-HA_FT_MAXBYTELEN;
-      init_alloc_root(mi_key_memory_MI_SORT_PARAM_wordroot,
-                      &sort_param[i].wordroot, FTPARSER_MEMROOT_ALLOC_SIZE, 0);
-    }
-  }
-  sort_info.total_keys=i;
-  sort_param[0].master= 1;
-  sort_param[0].fix_datafile= (my_bool)(! rep_quick);
-  sort_param[0].calc_checksum= MY_TEST(param->testflag & T_CALC_CHECKSUM);
-
-  if (!ftparser_alloc_param(info))
-    goto err;
-
-  sort_info.got_error=0;
-  mysql_mutex_lock(&sort_info.mutex);
-
-  /*
-    Initialize the I/O cache share for use with the read caches and, in
-    case of non-quick repair, the write cache. When all threads join on
-    the cache lock, the writer copies the write cache contents to the
-    read caches.
-  */
-  if (i > 1)
-  {
-    if (rep_quick)
-      init_io_cache_share(&param->read_cache, &io_share, NULL, i);
-    else
-      init_io_cache_share(&new_data_cache, &io_share, &info->rec_cache, i);
-  }
-  else
-    io_share.total_threads= 0; /* share not used */
-
-  (void) my_thread_attr_init(&thr_attr);
-  (void) my_thread_attr_setdetachstate(&thr_attr, MY_THREAD_CREATE_DETACHED);
-
-  for (i=0 ; i < sort_info.total_keys ; i++)
-  {
-    /*
-      Copy the properly initialized IO_CACHE structure so that every
-      thread has its own copy. In quick mode param->read_cache is shared
-      for use by all threads. In non-quick mode all threads but the
-      first copy the shared new_data_cache, which is synchronized to the
-      write cache of the first thread. The first thread copies
-      param->read_cache, which is not shared.
-    */
-    sort_param[i].read_cache= ((rep_quick || !i) ? param->read_cache :
-                               new_data_cache);
-    DBUG_PRINT("io_cache_share", ("thread: %u  read_cache: 0x%lx",
-                                  i, (long) &sort_param[i].read_cache));
-
-    sort_param[i].sortbuff_size=
-      param->sort_buffer_length/sort_info.total_keys;
-    if ((error= mysql_thread_create(mi_key_thread_find_all_keys,
-                                    &sort_param[i].thr, &thr_attr,
-                                    thr_find_all_keys,
-                                    (void *) (sort_param+i))))
-    {
-      mi_check_print_error(param,"Cannot start a repair thread (errno= %d)",
-                           error);
-      /* Cleanup: Detach from the share. Avoid others to be blocked. */
-      if (io_share.total_threads)
-        remove_io_thread(&sort_param[i].read_cache);
-      DBUG_PRINT("error", ("Cannot start a repair thread"));
-      sort_info.got_error=1;
-    }
-    else
-      sort_info.threads_running++;
-  }
-  (void) my_thread_attr_destroy(&thr_attr);
-
-  /* waiting for all threads to finish */
-  while (sort_info.threads_running)
-    mysql_cond_wait(&sort_info.cond, &sort_info.mutex);
-  mysql_mutex_unlock(&sort_info.mutex);
-
-  if ((got_error= thr_write_keys(sort_param)))
-  {
-    param->retry_repair=1;
-    goto err;
-  }
-  got_error=1;				/* Assume the following may go wrong */
-
-  if (sort_param[0].fix_datafile)
-  {
-    /*
-      Append some nuls to the end of a memory mapped file. Destroy the
-      write cache. The master thread did already detach from the share
-      by remove_io_thread() in sort.c:thr_find_all_keys().
-    */
-    if (write_data_suffix(&sort_info,1) || end_io_cache(&info->rec_cache))
-      goto err;
-    if (param->testflag & T_SAFE_REPAIR)
-    {
-      /* Don't repair if we loosed more than one row */
-      if (info->state->records+1 < start_records)
-      {
-        info->state->records=start_records;
-        goto err;
-      }
-    }
-    share->state.state.data_file_length= info->state->data_file_length=
-      sort_param->filepos;
-    /* Only whole records */
-    share->state.version=(ulong) time((time_t*) 0);
-
-    /*
-      Exchange the data file descriptor of the table, so that we use the
-      new file from now on.
-     */
-    mysql_file_close(info->dfile, MYF(0));
-    info->dfile=new_file;
-
-    share->data_file_type=sort_info.new_data_file_type;
-    share->pack.header_length=(ulong) new_header_length;
-  }
-  else
-    info->state->data_file_length=sort_param->max_pos;
-
-  if (rep_quick && del+sort_info.dupp != info->state->del)
-  {
-    mi_check_print_error(param,"Couldn't fix table with quick recovery: Found wrong number of deleted records");
-    mi_check_print_error(param,"Run recovery again without -q");
-    param->retry_repair=1;
-    param->testflag|=T_RETRY_WITHOUT_QUICK;
-    goto err;
-  }
-
-  if (rep_quick & T_FORCE_UNIQUENESS)
-  {
-    my_off_t skr=info->state->data_file_length+
-      (share->options & HA_OPTION_COMPRESS_RECORD ?
-       MEMMAP_EXTRA_MARGIN : 0);
-    if (skr != sort_info.filelength)
-      if (mysql_file_chsize(info->dfile, skr, 0, MYF(0)))
-	mi_check_print_warning(param,
-			       "Can't change size of datafile,  error: %d",
-			       my_errno());
-  }
-  if (param->testflag & T_CALC_CHECKSUM)
-    info->state->checksum=param->glob_crc;
-
-  if (mysql_file_chsize(share->kfile, info->state->key_file_length, 0, MYF(0)))
-    mi_check_print_warning(param,
-			   "Can't change size of indexfile, error: %d", my_errno());
-
-  if (!(param->testflag & T_SILENT))
-  {
-    if (start_records != info->state->records)
-      printf("Data records: %s\n", llstr(info->state->records,llbuff));
-    if (sort_info.dupp)
-      mi_check_print_warning(param,
-			     "%s records have been removed",
-			     llstr(sort_info.dupp,llbuff));
-  }
-  got_error=0;
-
-  if (&share->state.state != info->state)
-    memcpy(&share->state.state, info->state, sizeof(*info->state));
-
-err:
-  got_error|= flush_blocks(param, share->key_cache, share->kfile);
-  /*
-    Destroy the write cache. The master thread did already detach from
-    the share by remove_io_thread() or it was not yet started (if the
-    error happend before creating the thread).
-  */
-  (void) end_io_cache(&info->rec_cache);
-  /*
-    Destroy the new data cache in case of non-quick repair. All slave
-    threads did either detach from the share by remove_io_thread()
-    already or they were not yet started (if the error happend before
-    creating the threads).
-  */
-  if (!rep_quick)
-    (void) end_io_cache(&new_data_cache);
-  if (!got_error)
-  {
-    /* Replace the actual file with the temporary file */
-    if (new_file >= 0)
-    {
-      myf flags= 0;
-      if (param->testflag & T_BACKUP_DATA)
-        flags |= MY_REDEL_MAKE_BACKUP;
-      if (no_copy_stat)
-        flags |= MY_REDEL_NO_COPY_STAT;
-      mysql_file_close(new_file, MYF(0));
-      info->dfile=new_file= -1;
-      if (change_to_newfile(share->data_file_name, MI_NAME_DEXT, DATA_TMP_EXT,
-			    flags) ||
-	  mi_open_datafile(info,share,name,-1))
-	got_error=1;
-    }
-  }
-  if (got_error)
-  {
-    if (! param->error_printed)
-      mi_check_print_error(param,"%d when fixing table",my_errno());
-    if (new_file >= 0)
-    {
-      (void) mysql_file_close(new_file, MYF(0));
-      (void) mysql_file_delete(mi_key_file_datatmp,
-                               param->temp_filename, MYF(MY_WME));
-      if (info->dfile == new_file) /* Retry with key cache */
-        if (unlikely(mi_open_datafile(info, share, name, -1)))
-          param->retry_repair= 0; /* Safety */
-    }
-    mi_mark_crashed_on_repair(info);
-  }
-  else if (key_map == share->state.key_map)
-    share->state.changed&= ~STATE_NOT_OPTIMIZED_KEYS;
-  share->state.changed|=STATE_NOT_SORTED_PAGES;
-
-  mysql_cond_destroy(&sort_info.cond);
-  mysql_mutex_destroy(&sort_info.mutex);
-  mysql_mutex_destroy(&param->print_msg_mutex);
-  param->need_print_msg_lock= 0;
-
-  my_free(sort_info.ft_buf);
-  my_free(sort_info.key_block);
-  my_free(sort_param);
-  my_free(sort_info.buff);
-  (void) end_io_cache(&param->read_cache);
-  info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
-  if (!got_error && (param->testflag & T_UNPACK))
-  {
-    share->state.header.options[0]&= (uchar) ~HA_OPTION_COMPRESS_RECORD;
-    share->pack.header_length=0;
-  }
-  DBUG_RETURN(got_error);
-}
-
 	/* Read next record and return next key */
 
 static int sort_key_read(MI_SORT_PARAM *sort_param, void *key)
@@ -3839,7 +3314,7 @@ static int sort_key_write(MI_SORT_PARAM *sort_param, const void *a)
       _mi_print_key(stdout,sort_param->seg,(uchar*) a, USE_WHOLE_KEY);
     return (sort_delete_record(sort_param));
   }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (cmp > 0)
   {
     mi_check_print_error(param,
@@ -4454,6 +3929,10 @@ int update_state_info(MI_CHECK *param, MI_INFO *info,uint update)
     int error;
     uint r_locks=share->r_locks,w_locks=share->w_locks;
     share->r_locks= share->w_locks= share->tot_locks= 0;
+
+    DBUG_EXECUTE_IF("simulate_incorrect_share_wlock_value",
+                    DEBUG_SYNC_C("after_share_wlock_set_to_0"););
+
     error=_mi_writeinfo(info,WRITEINFO_NO_UNLOCK);
     share->r_locks=r_locks;
     share->w_locks=w_locks;
@@ -4674,8 +4153,8 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows)
   MI_KEYDEF    *key=share->keyinfo;
   uint          i;
 
-  DBUG_ASSERT(info->state->records == 0 &&
-              (!rows || rows >= MI_MIN_ROWS_TO_DISABLE_INDEXES));
+  assert(info->state->records == 0 &&
+         (!rows || rows >= MI_MIN_ROWS_TO_DISABLE_INDEXES));
   for (i=0 ; i < share->base.keys ; i++,key++)
   {
     if (!(key->flag & (HA_NOSAME | HA_SPATIAL | HA_AUTO_KEY)) &&
@@ -4820,7 +4299,7 @@ static HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
       break;
     case HA_KEYTYPE_END:                        /* purecov: inspected */
       /* keep compiler happy */
-      DBUG_ASSERT(0);
+      assert(0);
       break;
     }
   }
diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c
index fc80b0012eec..54f2f6b3f175 100644
--- a/storage/myisam/mi_checksum.c
+++ b/storage/myisam/mi_checksum.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_close.c b/storage/myisam/mi_close.c
index 7d38de4ed965..ae5d8ae380a9 100644
--- a/storage/myisam/mi_close.c
+++ b/storage/myisam/mi_close.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index 9090781c1baa..e66aa1076ce4 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -380,7 +387,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
 	}
 	if (keyseg->flag & HA_SPACE_PACK)
 	{
-          DBUG_ASSERT(!(keyseg->flag & HA_VAR_LENGTH_PART));
+          assert(!(keyseg->flag & HA_VAR_LENGTH_PART));
 	  keydef->flag |= HA_SPACE_PACK_USED | HA_VAR_LENGTH_KEY;
 	  options|=HA_OPTION_PACK_KEYS;		/* Using packed keys */
 	  length++;				/* At least one length byte */
@@ -393,8 +400,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
 	}
 	if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
 	{
-          DBUG_ASSERT(!test_all_bits(keyseg->flag,
-                                    (HA_VAR_LENGTH_PART | HA_BLOB_PART)));
+          assert(!test_all_bits(keyseg->flag,
+                                (HA_VAR_LENGTH_PART | HA_BLOB_PART)));
 	  keydef->flag|=HA_VAR_LENGTH_KEY;
 	  length++;				/* At least one length byte */
 	  options|=HA_OPTION_PACK_KEYS;		/* Using packed keys */
@@ -685,7 +692,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
   if (mi_state_info_write(file, &share.state, 2) ||
       mi_base_info_write(file, &share.base))
     goto err;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if ((uint) mysql_file_tell(file, MYF(0)) != base_pos + MI_BASE_INFO_SIZE)
   {
     uint pos=(uint) mysql_file_tell(file, MYF(0));
@@ -780,7 +787,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
     if (mi_recinfo_write(file, &recinfo[i]))
       goto err;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if ((uint) mysql_file_tell(file, MYF(0)) != info_length)
   {
     uint pos= (uint) mysql_file_tell(file, MYF(0));
@@ -841,7 +848,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
 
 uint mi_get_pointer_length(ulonglong file_length, uint def)
 {
-  DBUG_ASSERT(def >= 2 && def <= 7);
+  assert(def >= 2 && def <= 7);
   if (file_length)				/* If not default */
   {
     if (file_length >= 1ULL << 48)
diff --git a/storage/myisam/mi_dbug.c b/storage/myisam/mi_dbug.c
index 51cdb29a6522..4e9116eaa9f4 100644
--- a/storage/myisam/mi_dbug.c
+++ b/storage/myisam/mi_dbug.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_delete.c b/storage/myisam/mi_delete.c
index 92e6c37e3de4..cac9891400b4 100644
--- a/storage/myisam/mi_delete.c
+++ b/storage/myisam/mi_delete.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -244,7 +251,7 @@ static int d_search(MI_INFO *info, MI_KEYDEF *keyinfo,
 
     get_key_full_length_rdonly(off, lastkey);
     subkeys=ft_sintXkorr(lastkey+off);
-    DBUG_ASSERT(info->ft1_to_ft2==0 || subkeys >=0);
+    assert(info->ft1_to_ft2==0 || subkeys >=0);
     comp_flag=SEARCH_SAME;
     if (subkeys >= 0)
     {
diff --git a/storage/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c
index 8bdf09743601..5b6b689f49c5 100644
--- a/storage/myisam/mi_delete_all.c
+++ b/storage/myisam/mi_delete_all.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c
index 7d215fb70167..04612a6586dc 100644
--- a/storage/myisam/mi_delete_table.c
+++ b/storage/myisam/mi_delete_table.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 16e4fbbc9ea7..05d7f862fc4f 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -283,7 +290,7 @@ int _mi_write_blob_record(MI_INFO *info, const uchar *record)
 			   record);
   DBUG_PRINT("info",("reclength: %lu  reclength2: %lu",
 		     reclength, reclength2));
-  DBUG_ASSERT(reclength2 <= reclength);
+  assert(reclength2 <= reclength);
   error=write_dynamic_record(info,rec_buff+ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER),
 			     reclength2);
   my_free(rec_buff);
@@ -793,6 +800,7 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, uchar *record,
   DBUG_ENTER("update_dynamic_record");
 
   flag=block_info.second_read=0;
+  block_info.next_filepos= HA_OFFSET_ERROR;
   /*
      Check if we have enough room for the record.
      First we do simplified check to make usual case faster.
@@ -1717,6 +1725,12 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, uchar *buf,
   MYISAM_SHARE *share=info->s;
   DBUG_ENTER("_mi_read_rnd_dynamic_record");
 
+  DBUG_EXECUTE_IF("catch_file_offset_deviation",
+		 {
+                   if (filepos)
+		     DBUG_RETURN(HA_ERR_RECORD_DELETED);
+                 });
+
   info_read=0;
 
   if (info->lock_type == F_UNLCK)
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index 4a2b9681af90..27583721c66c 100644
--- a/storage/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_extrafunc.h b/storage/myisam/mi_extrafunc.h
index 4ae7fa93dfbc..4d5e202e3a25 100644
--- a/storage/myisam/mi_extrafunc.h
+++ b/storage/myisam/mi_extrafunc.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_info.c b/storage/myisam/mi_info.c
index 5d6c26dd2154..255b78a8687b 100644
--- a/storage/myisam/mi_info.c
+++ b/storage/myisam/mi_info.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c
index d5564dcd46b6..7cafb5ae5639 100644
--- a/storage/myisam/mi_key.c
+++ b/storage/myisam/mi_key.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -218,7 +225,7 @@ uint _mi_pack_key(MI_INFO *info, uint keynr, uchar *key, uchar *old,
     keypart_map= (((key_part_map)1) << (2*SPDIMS)) - 1;
 
   /* only key prefixes are supported */
-  DBUG_ASSERT(((keypart_map+1) & keypart_map) == 0);
+  assert(((keypart_map+1) & keypart_map) == 0);
 
   for (keyseg= info->s->keyinfo[keynr].seg ; keyseg->type && keypart_map;
        old+= keyseg->length, keyseg++)
@@ -564,7 +571,7 @@ ulonglong retrieve_auto_increment(MI_INFO *info,const uchar *record)
     value= uint8korr(key);
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     value=0;                                    /* Error */
     break;
   }
diff --git a/storage/myisam/mi_keycache.c b/storage/myisam/mi_keycache.c
index 68919bfa7c6b..640fe777a666 100644
--- a/storage/myisam/mi_keycache.c
+++ b/storage/myisam/mi_keycache.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 2dd49fd17b1c..5bf77061187c 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -229,6 +236,10 @@ int mi_lock_database(MI_INFO *info, int lock_type)
       info->invalidator=info->s->invalidator;
       share->w_locks++;
       share->tot_locks++;
+
+      DBUG_EXECUTE_IF("simulate_incorrect_share_wlock_value",
+                      DEBUG_SYNC_C("after_share_wlock_increment"););
+
       info->s->in_use= list_add(info->s->in_use, &info->in_use);
       break;
     default:
@@ -277,7 +288,7 @@ void mi_get_status(void* param, int concurrent_insert)
 		     (long) info->s->state.state.key_file_length,
 		     (long) info->s->state.state.data_file_length,
                      concurrent_insert));
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (info->state->key_file_length > info->s->state.state.key_file_length ||
       info->state->data_file_length > info->s->state.state.data_file_length)
     DBUG_PRINT("warning",("old info:  key_file: %ld  data_file: %ld",
@@ -304,7 +315,7 @@ void mi_update_status(void* param)
   */
   if (info->state == &info->save_state)
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     DBUG_PRINT("info",("updating status:  key_file: %ld  data_file: %ld",
 		       (long) info->state->key_file_length,
 		       (long) info->state->data_file_length));
diff --git a/storage/myisam/mi_log.c b/storage/myisam/mi_log.c
index 98fd730514e9..7478bb5988ad 100644
--- a/storage/myisam/mi_log.c
+++ b/storage/myisam/mi_log.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index 658d5a090d6b..fe35ea8ed695 100644
--- a/storage/myisam/mi_open.c
+++ b/storage/myisam/mi_open.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index 6b6bb7e38c12..8a271160ce5b 100644
--- a/storage/myisam/mi_packrec.c
+++ b/storage/myisam/mi_packrec.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1323,7 +1330,7 @@ int _mi_read_rnd_pack_record(MI_INFO *info, uchar *buf,
                                    &info->rec_buff, info->dfile, filepos);
   if (b_type)
     goto err;					/* Error code is already set */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (block_info.rec_len > share->max_pack_length)
   {
     set_my_errno(HA_ERR_WRONG_IN_RECORD);
@@ -1548,7 +1555,7 @@ my_bool _mi_memmap_file(MI_INFO *info)
 
 void _mi_unmap_file(MI_INFO *info)
 {
-  DBUG_ASSERT(info->s->options & HA_OPTION_COMPRESS_RECORD);
+  assert(info->s->options & HA_OPTION_COMPRESS_RECORD);
 
   (void) my_munmap((char*) info->s->file_map, (size_t) info->s->mmaped_length);
 
@@ -1624,7 +1631,7 @@ static int _mi_read_rnd_mempack_record(MI_INFO *info, uchar *buf,
 						(start=share->file_map+
 						 filepos))))
     goto err;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (block_info.rec_len > info->s->max_pack_length)
   {
     set_my_errno(HA_ERR_WRONG_IN_RECORD);
@@ -1661,7 +1668,7 @@ uint save_pack_length(uint version, uchar *block_buff, ulong length)
   *(uchar*) block_buff=255;
   if (version == 1) /* old format */
   {
-    DBUG_ASSERT(length <= 0xFFFFFF);
+    assert(length <= 0xFFFFFF);
     int3store(block_buff + 1, (ulong) length);
     return 4;
   }
diff --git a/storage/myisam/mi_page.c b/storage/myisam/mi_page.c
index bacf06bb1cb7..378bb92eb2fe 100644
--- a/storage/myisam/mi_page.c
+++ b/storage/myisam/mi_page.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_panic.c b/storage/myisam/mi_panic.c
index ab316f2db4be..33064f2e3ea7 100644
--- a/storage/myisam/mi_panic.c
+++ b/storage/myisam/mi_panic.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_preload.c b/storage/myisam/mi_preload.c
index d29943631c21..b7fe84d4ffcd 100644
--- a/storage/myisam/mi_preload.c
+++ b/storage/myisam/mi_preload.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -54,7 +61,7 @@ int mi_preload(MI_INFO *info, ulonglong key_map, my_bool ignore_leaves)
     DBUG_RETURN(0);
 
   /* Preload into a non initialized key cache should never happen. */
-  DBUG_ASSERT(share->key_cache->key_cache_inited);
+  assert(share->key_cache->key_cache_inited);
 
   block_length= keyinfo[0].block_length;
 
diff --git a/storage/myisam/mi_range.c b/storage/myisam/mi_range.c
index 9fe5f45a1fea..1f3ce9c6342d 100644
--- a/storage/myisam/mi_range.c
+++ b/storage/myisam/mi_range.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -127,7 +134,7 @@ static ha_rows _mi_record_pos(MI_INFO *info, const uchar *key,
 
   DBUG_ENTER("_mi_record_pos");
   DBUG_PRINT("enter",("search_flag: %d",search_flag));
-  DBUG_ASSERT(keypart_map);
+  assert(keypart_map);
 
   key_buff=info->lastkey+info->s->base.max_key_length;
   key_len=_mi_pack_key(info,inx,key_buff,(uchar*) key, keypart_map,
diff --git a/storage/myisam/mi_rename.c b/storage/myisam/mi_rename.c
index 897ca56c31f8..c3a96cac0435 100644
--- a/storage/myisam/mi_rename.c
+++ b/storage/myisam/mi_rename.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rfirst.c b/storage/myisam/mi_rfirst.c
index 4edc64e82b2e..0dfc667cf8ae 100644
--- a/storage/myisam/mi_rfirst.c
+++ b/storage/myisam/mi_rfirst.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2001, 2005-2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c
index 10144c5674d5..0ee9777eff19 100644
--- a/storage/myisam/mi_rkey.c
+++ b/storage/myisam/mi_rkey.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -56,7 +63,7 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key,
   }
   else
   {
-    DBUG_ASSERT(keypart_map);
+    assert(keypart_map);
     /* Save the packed key for later use in the second buffer of lastkey. */
     key_buff=info->lastkey+info->s->base.max_key_length;
     pack_key_length=_mi_pack_key(info,(uint) inx, key_buff, (uchar*) key,
@@ -184,7 +191,7 @@ int mi_rkey(MI_INFO *info, uchar *buf, int inx, const uchar *key,
     info->last_rkey_length= pack_key_length;
 
   /* Next call to mi_rnext_same should set rnext_same_key. */
-    info->set_rnext_same_key= TRUE;
+  info->set_rnext_same_key= TRUE;
 
   /* Check if we don't want to have record back, only error message */
   if (!buf)
diff --git a/storage/myisam/mi_rlast.c b/storage/myisam/mi_rlast.c
index ef0d4bb9623b..29845eeb01d6 100644
--- a/storage/myisam/mi_rlast.c
+++ b/storage/myisam/mi_rlast.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2001, 2005-2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c
index 403878b604d3..fd5071119611 100644
--- a/storage/myisam/mi_rnext.c
+++ b/storage/myisam/mi_rnext.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rnext_same.c b/storage/myisam/mi_rnext_same.c
index 4e20399216d3..dd8d3d36f9f8 100644
--- a/storage/myisam/mi_rnext_same.c
+++ b/storage/myisam/mi_rnext_same.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rprev.c b/storage/myisam/mi_rprev.c
index 7a8ac8e9e953..d46f4576650e 100644
--- a/storage/myisam/mi_rprev.c
+++ b/storage/myisam/mi_rprev.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rrnd.c b/storage/myisam/mi_rrnd.c
index e53f906329c1..1053242cbb67 100644
--- a/storage/myisam/mi_rrnd.c
+++ b/storage/myisam/mi_rrnd.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rsame.c b/storage/myisam/mi_rsame.c
index ba1d76d94da5..19de5861028d 100644
--- a/storage/myisam/mi_rsame.c
+++ b/storage/myisam/mi_rsame.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_rsamepos.c b/storage/myisam/mi_rsamepos.c
index e98d851ad616..5ffdf37a3c3f 100644
--- a/storage/myisam/mi_rsamepos.c
+++ b/storage/myisam/mi_rsamepos.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_scan.c b/storage/myisam/mi_scan.c
index 96da846aefc7..ecaae6471cb7 100644
--- a/storage/myisam/mi_scan.c
+++ b/storage/myisam/mi_scan.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index 9107e8f22d5a..4d7816a42e13 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -492,7 +499,7 @@ int _mi_prefix_search(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
 	  for (vseg_end= vseg + (len-cmplen) ;
 	       vseg < vseg_end && *vseg == (uchar) ' ';
 	       vseg++, matched++) ;
-	  DBUG_ASSERT(vseg < vseg_end);
+	  assert(vseg < vseg_end);
 
 	  if (*vseg > (uchar) ' ')
 	  {
@@ -518,7 +525,7 @@ int _mi_prefix_search(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
 	      visited and 0 otherwise,  i.e. flag <=0 here always !!!
 	    */
 	fix_flag:
-	    DBUG_ASSERT(flag <= 0);
+	    assert(flag <= 0);
 	    if (nextflag & (SEARCH_NO_FIND | SEARCH_LAST))
 	      flag=(nextflag & (SEARCH_BIGGER | SEARCH_LAST)) ? -1 : 1;
 	    if (flag>=0)
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c
index 43f20fe61065..32cdfe368886 100644
--- a/storage/myisam/mi_static.c
+++ b/storage/myisam/mi_static.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -92,14 +99,11 @@ PSI_memory_key mi_key_memory_stPageList_pages;
 PSI_memory_key mi_key_memory_keycache_thread_var;
 
 #ifdef HAVE_PSI_INTERFACE
-PSI_mutex_key mi_key_mutex_MYISAM_SHARE_intern_lock,
-  mi_key_mutex_MI_SORT_INFO_mutex, mi_key_mutex_MI_CHECK_print_msg;
+PSI_mutex_key mi_key_mutex_MYISAM_SHARE_intern_lock;
 
-static PSI_mutex_info all_myisam_mutexes[]=
+static PSI_mutex_info all_myisam_mutexes[] =
 {
-  { &mi_key_mutex_MI_SORT_INFO_mutex, "MI_SORT_INFO::mutex", 0},
-  { &mi_key_mutex_MYISAM_SHARE_intern_lock, "MYISAM_SHARE::intern_lock", 0},
-  { &mi_key_mutex_MI_CHECK_print_msg, "MI_CHECK::print_msg", 0}
+  { &mi_key_mutex_MYISAM_SHARE_intern_lock, "MYISAM_SHARE::intern_lock", 0}
 };
 
 PSI_rwlock_key mi_key_rwlock_MYISAM_SHARE_key_root_lock,
@@ -111,12 +115,10 @@ static PSI_rwlock_info all_myisam_rwlocks[]=
   { &mi_key_rwlock_MYISAM_SHARE_mmap_lock, "MYISAM_SHARE::mmap_lock", 0}
 };
 
-PSI_cond_key mi_key_cond_MI_SORT_INFO_cond;
 PSI_cond_key mi_keycache_thread_var_suspend;
 
 static PSI_cond_info all_myisam_conds[]=
 {
-  { &mi_key_cond_MI_SORT_INFO_cond, "MI_SORT_INFO::cond", 0},
   { &mi_keycache_thread_var_suspend, "keycache_thread_var::suspend", 0}
 };
 
diff --git a/storage/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c
index bdd3cad54514..2f9c79192d7c 100644
--- a/storage/myisam/mi_statrec.c
+++ b/storage/myisam/mi_statrec.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_test1.c b/storage/myisam/mi_test1.c
index 7db493da0041..a940ba73f5aa 100644
--- a/storage/myisam/mi_test1.c
+++ b/storage/myisam/mi_test1.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -534,7 +541,7 @@ static struct my_option my_long_options[] =
 {
   {"checksum", 'c', "Undocumented",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {"debug", '#', "Undocumented",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif
diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 1b10d69d5951..6cbe5a53d0d0 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,8 +25,8 @@
 #ifndef USE_MY_FUNC		/* We want to be able to dbug this !! */
 #define USE_MY_FUNC
 #endif
-#ifdef DBUG_OFF
-#undef DBUG_OFF
+#ifdef NDEBUG
+#undef NDEBUG
 #endif
 #include "myisamdef.h"
 #include <m_ctype.h>
diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index 88b4b7655a05..ff9728637b7e 100644
--- a/storage/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh
index a55b8fc9ea0f..e588c8faa51f 100755
--- a/storage/myisam/mi_test_all.sh
+++ b/storage/myisam/mi_test_all.sh
@@ -1,17 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2000, 2007 MySQL AB
+# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/storage/myisam/mi_unique.c b/storage/myisam/mi_unique.c
index 3ac96d28ccb9..39785753d0e3 100644
--- a/storage/myisam/mi_unique.c
+++ b/storage/myisam/mi_unique.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_update.c b/storage/myisam/mi_update.c
index f0a91b52061e..6a033950f3ee 100644
--- a/storage/myisam/mi_update.c
+++ b/storage/myisam/mi_update.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c
index 6cdd227588f6..9677e89b8f03 100644
--- a/storage/myisam/mi_write.c
+++ b/storage/myisam/mi_write.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -396,7 +403,7 @@ static int w_search(MI_INFO *info, MI_KEYDEF *keyinfo,
                                       &root, comp_flag);
         _mi_dpointer(info, keypos+HA_FT_WLEN, root);
         subkeys--; /* should there be underflow protection ? */
-        DBUG_ASSERT(subkeys < 0);
+        assert(subkeys < 0);
         ft_intXstore(keypos, subkeys);
         if (!error)
           error=_mi_write_keypage(info,keyinfo,page,DFLT_INIT_HITS,temp_buff);
@@ -477,7 +484,7 @@ int _mi_insert(MI_INFO *info, MI_KEYDEF *keyinfo,
 				(key_pos == endpos ? (uchar*) 0 : key_pos),
 				prev_key, prev_key,
 				key,&s_temp);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (key_pos != anc_buff+2+nod_flag && (keyinfo->flag &
 					 (HA_BINARY_PACK_KEY | HA_PACK_KEY)))
   {
@@ -529,14 +536,14 @@ int _mi_insert(MI_INFO *info, MI_KEYDEF *keyinfo,
       uchar *a=key, *b=anc_buff+2+nod_flag;
       uint alen, blen, ft2len=info->s->ft2_keyinfo.keylength;
       /* the very first key on the page is always unpacked */
-      DBUG_ASSERT((*b & 128) == 0);
+      assert((*b & 128) == 0);
 #if HA_FT_MAXLEN >= 127 /* TODO: Undefined symbol */
       blen= mi_uint2korr(b); b+=2;
 #else
       blen= *b++;
 #endif
       get_key_length(alen,a);
-      DBUG_ASSERT(info->ft1_to_ft2==0);
+      assert(info->ft1_to_ft2==0);
       if (alen == blen &&
           ha_compare_text(keyinfo->seg->charset, a, alen, b, blen, 0, 0)==0)
       {
@@ -969,8 +976,8 @@ int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows)
   DBUG_ENTER("_mi_init_bulk_insert");
   DBUG_PRINT("enter",("cache_size: %lu", cache_size));
 
-  DBUG_ASSERT(!info->bulk_insert &&
-	      (!rows || rows >= MI_MIN_ROWS_TO_USE_BULK_INSERT));
+  assert(!info->bulk_insert &&
+         (!rows || rows >= MI_MIN_ROWS_TO_USE_BULK_INSERT));
 
   mi_clear_all_keys_active(key_map);
   for (i=total_keylength=num_keys=0 ; i < share->base.keys ; i++)
diff --git a/storage/myisam/myisam_ftdump.c b/storage/myisam/myisam_ftdump.c
index 4c1dc52fce7c..343ac8c66678 100644
--- a/storage/myisam/myisam_ftdump.c
+++ b/storage/myisam/myisam_ftdump.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index 57e238c8873c..d189d6289699 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -180,7 +187,7 @@ static struct my_option my_long_options[] =
   {"correct-checksum", OPT_CORRECT_CHECKSUM,
    "Correct checksum information for table.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
@@ -235,9 +242,6 @@ static struct my_option my_long_options[] =
   {"recover", 'r',
    "Can fix almost anything except unique keys that aren't unique.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"parallel-recover", 'p',
-   "Same as '-r' but creates all the keys in parallel.",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-recover", 'o',
    "Uses old recovery method; Slower than '-r' but can handle a couple of cases where '-r' reports that it can't fix the data file.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -364,7 +368,7 @@ static void usage(void)
   puts("Used without options all tables on the command will be checked for errors");
   printf("Usage: %s [OPTIONS] tables[.MYI]\n", my_progname_short);
   printf("\nGlobal options:\n");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   printf("\
   -#, --debug=...     Output debug log. Often this is 'd:t:o,filename'.\n");
 #endif
@@ -425,9 +429,6 @@ static void usage(void)
                       unique.\n\
   -n, --sort-recover  Forces recovering with sorting even if the temporary\n\
 		      file would be very big.\n\
-  -p, --parallel-recover\n\
-                      Uses the same technique as '-r' and '-n', but creates\n\
-                      all the keys in parallel, in different threads.\n\
   -o, --safe-recover  Uses old recovery method; Slower than '-r' but can\n\
 		      handle a couple of cases where '-r' reports that it\n\
 		      can't fix the data file.\n\
@@ -588,11 +589,6 @@ get_one_option(int optid,
     if (argument != disabled_my_option)
       check_param.testflag|= T_REP_BY_SORT;
     break;
-  case 'p':
-    check_param.testflag&= ~T_REP_ANY;
-    if (argument != disabled_my_option)
-      check_param.testflag|= T_REP_PARALLEL;
-    break;
   case 'o':
     check_param.testflag&= ~T_REP_ANY;
     check_param.force_sort= 0;
@@ -1000,7 +996,7 @@ static int myisamchk(MI_CHECK *param, char * filename)
       }
       if (!error)
       {
-	if ((param->testflag & (T_REP_BY_SORT | T_REP_PARALLEL)) &&
+	if ((param->testflag & T_REP_BY_SORT) &&
 	    (mi_is_any_key_active(share->state.key_map) ||
 	     (rep_quick && !param->keys_in_use && !recreate)) &&
 	    mi_test_if_sort_rep(info, info->state->records,
@@ -1011,10 +1007,7 @@ static int myisamchk(MI_CHECK *param, char * filename)
             The new file might not be created with the right stats depending
             on how myisamchk is run, so we must copy file stats from old to new.
           */
-          if (param->testflag & T_REP_BY_SORT)
-            error= mi_repair_by_sort(param, info, filename, rep_quick, FALSE);
-          else
-            error= mi_repair_parallel(param, info, filename, rep_quick, FALSE);
+          error= mi_repair_by_sort(param, info, filename, rep_quick, FALSE);
 	  state_updated=1;
 	}
 	else if (param->testflag & T_REP_ANY)
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index 6e167f1d14db..a63ad92c043c 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -324,10 +331,9 @@ typedef struct st_buffpek {
 
 typedef struct st_mi_sort_param
 {
-  my_thread_handle thr;
   IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
   DYNAMIC_ARRAY buffpek;
-  MI_BIT_BUFF   bit_buff;               /* For parallel repair of packrec. */
+  MI_BIT_BUFF   bit_buff;               /* For sort repair of packrec. */
 
   /*
     The next two are used to collect statistics, see update_key_parts for
@@ -473,6 +479,10 @@ typedef struct st_mi_sort_param
 
 extern mysql_mutex_t THR_LOCK_myisam;
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 	/* Some extern variables */
 
 extern LIST *myisam_open_list;
@@ -634,6 +644,10 @@ extern ulonglong mi_safe_mul(ulonglong a,ulonglong b);
 extern int _mi_ft_update(MI_INFO *info, uint keynr, uchar *keybuf,
 			 const uchar *oldrec, const uchar *newrec, my_off_t pos);
 
+#ifdef __cplusplus
+}
+#endif
+
 struct st_sort_info;
 
 
@@ -778,8 +792,6 @@ void mi_check_print_warning(MI_CHECK *param, const char *fmt,...);
 void mi_check_print_info(MI_CHECK *param, const char *fmt,...);
 int flush_pending_blocks(MI_SORT_PARAM *param);
 int sort_ft_buf_flush(MI_SORT_PARAM *sort_param);
-int thr_write_keys(MI_SORT_PARAM *sort_param);
-void *thr_find_all_keys(void *arg);
 int flush_blocks(MI_CHECK *param, KEY_CACHE *key_cache, File file);
 
 int sort_write_record(MI_SORT_PARAM *sort_param);
@@ -795,8 +807,7 @@ extern thread_local_key_t keycache_tls_key;
 
 #ifdef HAVE_PSI_INTERFACE
 C_MODE_START
-extern PSI_mutex_key mi_key_mutex_MYISAM_SHARE_intern_lock,
-  mi_key_mutex_MI_SORT_INFO_mutex, mi_key_mutex_MI_CHECK_print_msg;
+extern PSI_mutex_key mi_key_mutex_MYISAM_SHARE_intern_lock;
 
 extern PSI_rwlock_key mi_key_rwlock_MYISAM_SHARE_key_root_lock,
   mi_key_rwlock_MYISAM_SHARE_mmap_lock;
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index 3a2c5847c447..5387aab51d47 100644
--- a/storage/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 25e7f738c687..2df6158b65d6 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -174,7 +181,7 @@ static int save_state_mrg(File file,PACK_MRG_INFO *isam_file,my_off_t new_length
 static int mrg_close(PACK_MRG_INFO *mrg);
 static int mrg_rrnd(PACK_MRG_INFO *info,uchar *buf);
 static void mrg_reset(PACK_MRG_INFO *mrg);
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 static void fakebigcodes(HUFF_COUNTS *huff_counts, HUFF_COUNTS *end_count);
 static int fakecmp(my_off_t **count1, my_off_t **count2);
 #endif
@@ -272,7 +279,7 @@ static struct my_option my_long_options[] =
   {"character-sets-dir", OPT_CHARSETS_DIR_MP,
    "Directory where character sets are.", &charsets_dir,
    &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DBUG_OFF
+#ifdef NDEBUG
   {"debug", '#', "This is a non-debug version. Catch this and exit.",
    0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #else
@@ -2012,7 +2019,7 @@ static char *bindigits(ulonglong value, uint bits)
   char *ptr= digits;
   uint idx= bits;
 
-  DBUG_ASSERT(idx < sizeof(digits));
+  assert(idx < sizeof(digits));
   while (idx)
     *(ptr++)= '0' + ((char) (value >> (--idx)) & (char) 1);
   *ptr= '\0';
@@ -2041,7 +2048,7 @@ static char *hexdigits(ulonglong value)
   char *ptr= digits;
   uint idx= 2 * sizeof(value); /* Two hex digits per byte. */
 
-  DBUG_ASSERT(idx < sizeof(digits));
+  assert(idx < sizeof(digits));
   while (idx)
   {
     if ((*(ptr++)= '0' + ((char) (value >> (4 * (--idx))) & (char) 0xf)) > '9')
@@ -2923,8 +2930,8 @@ static void end_file_buffer(void)
 
 static void write_bits(ulonglong value, uint bits)
 {
-  DBUG_ASSERT(((bits < 8 * sizeof(value)) && ! (value >> bits)) ||
-              (bits == 8 * sizeof(value)));
+  assert(((bits < 8 * sizeof(value)) && ! (value >> bits)) ||
+         (bits == 8 * sizeof(value)));
 
   if ((file_buffer.bits-= (int) bits) >= 0)
   {
@@ -3125,7 +3132,7 @@ static int mrg_close(PACK_MRG_INFO *mrg)
 }
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 /*
   Fake the counts to get big Huffman codes.
 
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c
index 324a91e3527a..9b82c24862f8 100644
--- a/storage/myisam/rt_index.c
+++ b/storage/myisam/rt_index.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
@@ -175,14 +182,14 @@ int rtree_find_first(MI_INFO *info, uint keynr, uchar *key, uint key_length,
     // This is assumed to happen only when the index is empty. If that
     // doesn't hold, the code in mi_rkey() that checks the record
     // count has to be changed.
-    DBUG_ASSERT(info->s->state.state.records == 0);
+    assert(info->s->state.state.records == 0);
     set_my_errno(HA_ERR_END_OF_FILE);
     return -1;
   }
 
   // All empty indexes should be caught above. Negative record counts
   // should never occur.
-  DBUG_ASSERT(info->s->state.state.records > 0);
+  assert(info->s->state.state.records > 0);
 
   /*
     Save searched key, include data pointer.
diff --git a/storage/myisam/rt_index.h b/storage/myisam/rt_index.h
index ca3f67e94e50..6f6daba7c4ab 100644
--- a/storage/myisam/rt_index.h
+++ b/storage/myisam/rt_index.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
diff --git a/storage/myisam/rt_key.c b/storage/myisam/rt_key.c
index d339d98091ca..ecdd5df85bf3 100644
--- a/storage/myisam/rt_key.c
+++ b/storage/myisam/rt_key.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
@@ -41,16 +48,16 @@ int rtree_add_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
     if (nod_flag)
     {
       /* save key */
-      DBUG_ASSERT(_mi_kpos(nod_flag, key) < info->state->key_file_length);
+      assert(_mi_kpos(nod_flag, key) < info->state->key_file_length);
       memcpy(rt_PAGE_END(page_buf), key - nod_flag, key_length + nod_flag); 
       page_size += key_length + nod_flag;
     }
     else
     {
       /* save key */
-      DBUG_ASSERT(_mi_dpos(info, nod_flag, key + key_length +
-                           info->s->base.rec_reflength) <
-                  info->state->data_file_length + info->s->base.pack_reclength);
+      assert(_mi_dpos(info, nod_flag, key + key_length +
+                      info->s->base.rec_reflength) <
+             info->state->data_file_length + info->s->base.pack_reclength);
       memcpy(rt_PAGE_END(page_buf), key, key_length + 
                                          info->s->base.rec_reflength);
       page_size += key_length + info->s->base.rec_reflength;
diff --git a/storage/myisam/rt_key.h b/storage/myisam/rt_key.h
index 5580f78ecfce..18ca165106d1 100644
--- a/storage/myisam/rt_key.h
+++ b/storage/myisam/rt_key.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
diff --git a/storage/myisam/rt_mbr.c b/storage/myisam/rt_mbr.c
index bcccff503ab3..263606727257 100644
--- a/storage/myisam/rt_mbr.c
+++ b/storage/myisam/rt_mbr.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
@@ -54,7 +61,7 @@
   }\
   else /* if unknown comparison operator */ \
   { \
-    DBUG_ASSERT(0); \
+    assert(0);                                  \
   }
 
 #define RT_CMP_KORR(type, korr_func, len, nextflag) \
diff --git a/storage/myisam/rt_mbr.h b/storage/myisam/rt_mbr.h
index 3e9d79898288..3fb70a1a0cf5 100644
--- a/storage/myisam/rt_mbr.h
+++ b/storage/myisam/rt_mbr.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
diff --git a/storage/myisam/rt_split.c b/storage/myisam/rt_split.c
index 8d6b22637f5e..e24839ea2ce3 100644
--- a/storage/myisam/rt_split.c
+++ b/storage/myisam/rt_split.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
diff --git a/storage/myisam/rt_test.c b/storage/myisam/rt_test.c
index bf4a5fba4e2b..6b12459a349c 100644
--- a/storage/myisam/rt_test.c
+++ b/storage/myisam/rt_test.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c
deleted file mode 100644
index 9fcb8d5ce410..000000000000
--- a/storage/myisam/sort.c
+++ /dev/null
@@ -1,1080 +0,0 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-/*
-  Creates a index for a database by reading keys, sorting them and outputing
-  them in sorted order through SORT_INFO functions.
-*/
-
-#include "fulltext.h"
-#if defined(_WIN32)
-#include <fcntl.h>
-#else
-#include <stddef.h>
-#endif
-#include <queues.h>
-
-/* static variables */
-
-#undef MYF_RW
-#undef DISK_BUFFER_SIZE
-
-#define MERGEBUFF 15
-#define MERGEBUFF2 31
-#define MYF_RW  MYF(MY_NABP | MY_WME | MY_WAIT_IF_FULL)
-#define DISK_BUFFER_SIZE (IO_SIZE*16)
-
-
-/*
- Pointers of functions for store and read keys from temp file
-*/
-
-extern void print_error(const char *fmt,...);
-
-/* Functions defined in this file */
-
-static ha_rows find_all_keys(MI_SORT_PARAM *info,uint keys,
-                             uchar **sort_keys,
-                             DYNAMIC_ARRAY *buffpek,int *maxbuffer,
-                             IO_CACHE *tempfile,
-                             IO_CACHE *tempfile_for_exceptions);
-static int write_keys(MI_SORT_PARAM *info,uchar **sort_keys,
-                      uint count, BUFFPEK *buffpek,IO_CACHE *tempfile);
-static int write_key(MI_SORT_PARAM *info, uchar *key,
-                     IO_CACHE *tempfile);
-static int write_index(MI_SORT_PARAM *info,uchar * *sort_keys,
-                       uint count);
-static int merge_many_buff(MI_SORT_PARAM *info,uint keys,
-                           uchar * *sort_keys,
-                           BUFFPEK *buffpek,int *maxbuffer,
-                           IO_CACHE *t_file);
-static uint read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek,
-                           uint sort_length);
-static int merge_buffers(MI_SORT_PARAM *info,uint keys,
-                         IO_CACHE *from_file, IO_CACHE *to_file,
-                         uchar * *sort_keys, BUFFPEK *lastbuff,
-                         BUFFPEK *Fb, BUFFPEK *Tb);
-static int merge_index(MI_SORT_PARAM *,uint,uchar **,BUFFPEK *, int,
-                       IO_CACHE *);
-static int flush_ft_buf(MI_SORT_PARAM *info);
-
-static int write_keys_varlen(MI_SORT_PARAM *info,uchar **sort_keys,
-                             uint count, BUFFPEK *buffpek,
-                             IO_CACHE *tempfile);
-static uint read_to_buffer_varlen(IO_CACHE *fromfile,BUFFPEK *buffpek,
-                                  uint sort_length);
-static int write_merge_key(MI_SORT_PARAM *info, IO_CACHE *to_file,
-                           uchar *key, uint sort_length, uint count);
-static int write_merge_key_varlen(MI_SORT_PARAM *info,
-                                  IO_CACHE *to_file,
-                                  uchar* key, uint sort_length,
-                                  uint count);
-static inline int
-my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs);
-
-/*
-  Creates a index of sorted keys
-
-  SYNOPSIS
-    _create_index_by_sort()
-    info		Sort parameters
-    no_messages		Set to 1 if no output
-    sortbuff_size	Size if sortbuffer to allocate
-
-  RESULT
-    0	ok
-   <> 0 Error
-*/
-
-int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
-			  ulonglong sortbuff_size)
-{
-  int error,maxbuffer,skr;
-  uint sort_length, keys= 0;
-  ulonglong memavl, old_memavl;
-  DYNAMIC_ARRAY buffpek;
-  ha_rows records;
-  uchar **sort_keys;
-  IO_CACHE tempfile, tempfile_for_exceptions;
-  DBUG_ENTER("_create_index_by_sort");
-  DBUG_PRINT("enter",("sort_length: %d", info->key_length));
-
-  if (info->keyinfo->flag & HA_VAR_LENGTH_KEY)
-  {
-    info->write_keys=write_keys_varlen;
-    info->read_to_buffer=read_to_buffer_varlen;
-    info->write_key= write_merge_key_varlen;
-  }
-  else
-  {
-    info->write_keys=write_keys;
-    info->read_to_buffer=read_to_buffer;
-    info->write_key=write_merge_key;
-  }
-
-  my_b_clear(&tempfile);
-  my_b_clear(&tempfile_for_exceptions);
-  memset(&buffpek, 0, sizeof(buffpek));
-  sort_keys= (uchar **) NULL; error= 1;
-  maxbuffer=1;
-
-  memavl= MY_MAX(sortbuff_size, MIN_SORT_BUFFER);
-  records=	info->sort_info->max_records;
-  sort_length=	info->key_length;
-
-  if ((memavl - sizeof(BUFFPEK)) / (sort_length + sizeof(char *)) > UINT_MAX32)
-    memavl= sizeof(BUFFPEK) + UINT_MAX32 * (sort_length + sizeof(char *));
-
-  while (memavl >= MIN_SORT_BUFFER)
-  {
-    if ((records < UINT_MAX32) && 
-       ((my_off_t) (records + 1) * 
-        (sort_length + sizeof(char*)) <= (my_off_t) memavl))
-      keys= (uint)records+1;
-    else
-      do
-      {
-	skr=maxbuffer;
-	if (memavl < sizeof(BUFFPEK)*(uint) maxbuffer ||
-	    (keys= (uint)((memavl-sizeof(BUFFPEK)*(uint) maxbuffer)/
-                          (sort_length+sizeof(char*)))) <= 1 ||
-            keys < (uint) maxbuffer)
-	{
-	  mi_check_print_error(info->sort_info->param,
-			       "myisam_sort_buffer_size is too small");
-	  goto err;
-	}
-      }
-      while ((maxbuffer= (int) (records/(keys-1)+1)) != skr);
-
-    if ((sort_keys=(uchar **)my_malloc(PSI_NOT_INSTRUMENTED,
-                                       keys*(sort_length+sizeof(char*))+
-				       HA_FT_MAXBYTELEN, MYF(0))))
-    {
-      if (my_init_dynamic_array(&buffpek,
-                                PSI_NOT_INSTRUMENTED,
-                                sizeof(BUFFPEK),
-                                NULL,
-                                maxbuffer,
-                                maxbuffer/2))
-      {
-	my_free(sort_keys);
-        sort_keys= 0;
-      }
-      else
-	break;
-    }
-    old_memavl=memavl;
-    if ((memavl= memavl/4*3) < MIN_SORT_BUFFER && old_memavl > MIN_SORT_BUFFER)
-      memavl= MIN_SORT_BUFFER;
-  }
-  if (memavl < MIN_SORT_BUFFER)
-  {
-    mi_check_print_error(info->sort_info->param,"MyISAM sort buffer too small"); /* purecov: tested */
-    goto err; /* purecov: tested */
-  }
-  (*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
-
-  if (!no_messages)
-    printf("  - Searching for keys, allocating buffer for %d keys\n",keys);
-
-  if ((records=find_all_keys(info,keys,sort_keys,&buffpek,&maxbuffer,
-                                  &tempfile,&tempfile_for_exceptions))
-      == HA_POS_ERROR)
-    goto err; /* purecov: tested */
-  if (maxbuffer == 0)
-  {
-    if (!no_messages)
-      printf("  - Dumping %lu keys\n", (ulong) records);
-    if (write_index(info,sort_keys, (uint) records))
-      goto err; /* purecov: inspected */
-  }
-  else
-  {
-    keys=(keys*(sort_length+sizeof(char*)))/sort_length;
-    if (maxbuffer >= MERGEBUFF2)
-    {
-      if (!no_messages)
-	printf("  - Merging %lu keys\n", (ulong) records); /* purecov: tested */
-      if (merge_many_buff(info,keys,sort_keys,
-                  dynamic_element(&buffpek,0,BUFFPEK *),&maxbuffer,&tempfile))
-	goto err;				/* purecov: inspected */
-    }
-    if (flush_io_cache(&tempfile) ||
-	reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
-      goto err;					/* purecov: inspected */
-    if (!no_messages)
-      printf("  - Last merge and dumping keys\n"); /* purecov: tested */
-    if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
-                    maxbuffer,&tempfile))
-      goto err;					/* purecov: inspected */
-  }
-
-  if (flush_ft_buf(info) || flush_pending_blocks(info))
-    goto err;
-
-  if (my_b_inited(&tempfile_for_exceptions))
-  {
-    MI_INFO *idx=info->sort_info->info;
-    uint     keyno=info->key;
-    uint     key_length, ref_length=idx->s->rec_reflength;
-
-    if (!no_messages)
-      printf("  - Adding exceptions\n"); /* purecov: tested */
-    if (flush_io_cache(&tempfile_for_exceptions) ||
-	reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0))
-      goto err;
-
-    while (!my_b_read(&tempfile_for_exceptions,(uchar*)&key_length,
-		      sizeof(key_length))
-        && !my_b_read(&tempfile_for_exceptions,(uchar*)sort_keys,
-		      (uint) key_length))
-    {
-	if (_mi_ck_write(idx,keyno,(uchar*) sort_keys,key_length-ref_length))
-	  goto err;
-    }
-  }
-
-  error =0;
-
-err:
-  my_free(sort_keys);
-  delete_dynamic(&buffpek);
-  close_cached_file(&tempfile);
-  close_cached_file(&tempfile_for_exceptions);
-
-  DBUG_RETURN(error ? -1 : 0);
-} /* _create_index_by_sort */
-
-
-/* Search after all keys and place them in a temp. file */
-
-static ha_rows find_all_keys(MI_SORT_PARAM *info, uint keys,
-                             uchar **sort_keys, DYNAMIC_ARRAY *buffpek,
-                             int *maxbuffer, IO_CACHE *tempfile,
-                             IO_CACHE *tempfile_for_exceptions)
-{
-  int error;
-  uint idx;
-  DBUG_ENTER("find_all_keys");
-
-  idx=error=0;
-  sort_keys[0]=(uchar*) (sort_keys+keys);
-
-  while (!(error=(*info->key_read)(info,sort_keys[idx])))
-  {
-    if (info->real_key_length > info->key_length)
-    {
-      if (write_key(info,sort_keys[idx],tempfile_for_exceptions))
-        DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
-      continue;
-    }
-
-    if (++idx == keys)
-    {
-      if (info->write_keys(info,sort_keys,idx-1,(BUFFPEK *)alloc_dynamic(buffpek),
-		     tempfile))
-      DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
-
-      sort_keys[0]=(uchar*) (sort_keys+keys);
-      memcpy(sort_keys[0],sort_keys[idx-1],(size_t) info->key_length);
-      idx=1;
-    }
-    sort_keys[idx]=sort_keys[idx-1]+info->key_length;
-  }
-  if (error > 0)
-    DBUG_RETURN(HA_POS_ERROR);		/* Aborted by get_key */ /* purecov: inspected */
-  if (buffpek->elements)
-  {
-    if (info->write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),
-		   tempfile))
-      DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
-    *maxbuffer=buffpek->elements-1;
-  }
-  else
-    *maxbuffer=0;
-
-  DBUG_RETURN((*maxbuffer)*(keys-1)+idx);
-} /* find_all_keys */
-
-
-/* Search after all keys and place them in a temp. file */
-
-void *thr_find_all_keys(void *arg)
-{
-  MI_SORT_PARAM *sort_param= (MI_SORT_PARAM*) arg;
-  int error;
-  ulonglong memavl, old_memavl;
-  uint keys= 0, sort_length;
-  uint idx, maxbuffer;
-  uchar **sort_keys=0;
-  st_keycache_thread_var thread_keycache_var;
-
-  error=1;
-
-  if (my_thread_init())
-    goto err;
-
-  memset(&thread_keycache_var, 0, sizeof(st_keycache_thread_var));
-  mysql_cond_init(PSI_NOT_INSTRUMENTED,
-                  &thread_keycache_var.suspend);
-  my_set_thread_local(keycache_tls_key, &thread_keycache_var);
-
-  { /* Add extra block since DBUG_ENTER declare variables */
-    DBUG_ENTER("thr_find_all_keys");
-    DBUG_PRINT("enter", ("master: %d", sort_param->master));
-    if (sort_param->sort_info->got_error)
-      goto err;
-
-    if (sort_param->keyinfo->flag & HA_VAR_LENGTH_KEY)
-    {
-      sort_param->write_keys=     write_keys_varlen;
-      sort_param->read_to_buffer= read_to_buffer_varlen;
-      sort_param->write_key=      write_merge_key_varlen;
-    }
-    else
-    {
-      sort_param->write_keys=     write_keys;
-      sort_param->read_to_buffer= read_to_buffer;
-      sort_param->write_key=      write_merge_key;
-    }
-
-    my_b_clear(&sort_param->tempfile);
-    my_b_clear(&sort_param->tempfile_for_exceptions);
-    memset(&sort_param->buffpek, 0, sizeof(sort_param->buffpek));
-    memset(&sort_param->unique, 0, sizeof(sort_param->unique));
-    sort_keys= (uchar **) NULL;
-
-    memavl=       MY_MAX(sort_param->sortbuff_size, MIN_SORT_BUFFER);
-    idx=          (uint)sort_param->sort_info->max_records;
-    sort_length=  sort_param->key_length;
-    maxbuffer=    1;
-
-    if ((memavl - sizeof(BUFFPEK)) / (sort_length +
-                                      sizeof(char *)) > UINT_MAX32)
-      memavl= sizeof(BUFFPEK) + UINT_MAX32 * (sort_length + sizeof(char *));    
-
-    while (memavl >= MIN_SORT_BUFFER)
-    {
-      if ((my_off_t) (idx+1)*(sort_length+sizeof(char*)) <=
-          (my_off_t) memavl)
-        keys= idx+1;
-      else
-      {
-        uint skr;
-        do
-        {
-          skr= maxbuffer;
-          if (memavl < sizeof(BUFFPEK)*maxbuffer ||
-              (keys=(uint)((memavl-sizeof(BUFFPEK)*maxbuffer)/
-                           (sort_length+sizeof(char*)))) <= 1 ||
-              keys < (uint) maxbuffer)
-          {
-            mi_check_print_error(sort_param->sort_info->param,
-                                 "myisam_sort_buffer_size is too small");
-            goto err;
-          }
-        }
-        while ((maxbuffer= (int) (idx/(keys-1)+1)) != skr);
-      }
-      if ((sort_keys= (uchar**)
-           my_malloc(PSI_NOT_INSTRUMENTED,
-                     keys*(sort_length+sizeof(char*))+
-                     ((sort_param->keyinfo->flag & HA_FULLTEXT) ?
-                      HA_FT_MAXBYTELEN : 0), MYF(0))))
-      {
-        if (my_init_dynamic_array(&sort_param->buffpek,
-                                  PSI_NOT_INSTRUMENTED,
-                                  sizeof(BUFFPEK),
-                                  NULL,
-                                  maxbuffer, maxbuffer/2))
-        {
-          my_free(sort_keys);
-          sort_keys= (uchar **) NULL; /* for err: label */
-        }
-        else
-          break;
-      }
-      old_memavl= memavl;
-      if ((memavl= memavl / 4 * 3) < MIN_SORT_BUFFER &&
-          old_memavl > MIN_SORT_BUFFER)
-        memavl= MIN_SORT_BUFFER;
-    }
-    if (memavl < MIN_SORT_BUFFER)
-    {
-      mi_check_print_error(sort_param->sort_info->param,
-                           "MyISAM sort buffer too small");
-      goto err; /* purecov: tested */
-    }
-
-    if (sort_param->sort_info->param->testflag & T_VERBOSE)
-      printf("Key %d - Allocating buffer for %d keys\n",
-             sort_param->key + 1, keys);
-    sort_param->sort_keys= sort_keys;
-
-    idx= error= 0;
-    sort_keys[0]= (uchar*) (sort_keys+keys);
-
-    DBUG_PRINT("info", ("reading keys"));
-    while (!(error= sort_param->sort_info->got_error) &&
-           !(error= (*sort_param->key_read)(sort_param, sort_keys[idx])))
-    {
-      if (sort_param->real_key_length > sort_param->key_length)
-      {
-        if (write_key(sort_param, sort_keys[idx],
-                      &sort_param->tempfile_for_exceptions))
-          goto err;
-        continue;
-      }
-
-      if (++idx == keys)
-      {
-        if (sort_param->write_keys(sort_param, sort_keys, idx - 1,
-                                   (BUFFPEK*) alloc_dynamic(&sort_param->buffpek),
-                                   &sort_param->tempfile))
-          goto err;
-        sort_keys[0]= (uchar*) (sort_keys+keys);
-        memcpy(sort_keys[0], sort_keys[idx - 1], (size_t) sort_param->key_length);
-        idx= 1;
-      }
-      sort_keys[idx]= sort_keys[idx - 1] + sort_param->key_length;
-    }
-    if (error > 0)
-      goto err;
-    if (sort_param->buffpek.elements)
-    {
-      if (sort_param->write_keys(sort_param, sort_keys, idx,
-                                 (BUFFPEK*) alloc_dynamic(&sort_param->buffpek),
-                                 &sort_param->tempfile))
-        goto err;
-      sort_param->keys= (sort_param->buffpek.elements - 1) * (keys - 1) + idx;
-    }
-    else
-      sort_param->keys= idx;
-
-    sort_param->sort_keys_length= keys;
-    goto ok;
-
-err:
-    DBUG_PRINT("error", ("got some error"));
-    sort_param->sort_info->got_error= 1; /* no need to protect with a mutex */
-    my_free(sort_keys);
-    sort_param->sort_keys= 0;
-    delete_dynamic(& sort_param->buffpek);
-    close_cached_file(&sort_param->tempfile);
-    close_cached_file(&sort_param->tempfile_for_exceptions);
-
-ok:
-    free_root(&sort_param->wordroot, MYF(0));
-    /*
-      Detach from the share if the writer is involved. Avoid others to
-      be blocked. This includes a flush of the write buffer. This will
-      also indicate EOF to the readers.
-      That means that a writer always gets here first and readers -
-      only when they see EOF. But if a reader finishes prematurely
-      because of an error it may reach this earlier - don't allow it
-      to detach the writer thread.
-    */
-    if (sort_param->master && sort_param->sort_info->info->rec_cache.share)
-      remove_io_thread(&sort_param->sort_info->info->rec_cache);
-
-    /* Readers detach from the share if any. Avoid others to be blocked. */
-    if (sort_param->read_cache.share)
-      remove_io_thread(&sort_param->read_cache);
-
-    mysql_mutex_lock(&sort_param->sort_info->mutex);
-    if (!--sort_param->sort_info->threads_running)
-      mysql_cond_signal(&sort_param->sort_info->cond);
-    mysql_mutex_unlock(&sort_param->sort_info->mutex);
-    DBUG_PRINT("exit", ("======== ending thread ========"));
-  }
-  mysql_cond_destroy(&thread_keycache_var.suspend);
-  my_thread_end();
-  return NULL;
-}
-
-
-int thr_write_keys(MI_SORT_PARAM *sort_param)
-{
-  SORT_INFO *sort_info=sort_param->sort_info;
-  MI_CHECK *param=sort_info->param;
-  size_t length= 0;
-  ulong keys;
-  ulong *rec_per_key_part=param->rec_per_key_part;
-  int got_error=sort_info->got_error;
-  uint i;
-  MI_INFO *info=sort_info->info;
-  MYISAM_SHARE *share=info->s;
-  MI_SORT_PARAM *sinfo;
-  uchar *mergebuf=0;
-  DBUG_ENTER("thr_write_keys");
-
-  for (i= 0, sinfo= sort_param ;
-       i < sort_info->total_keys ;
-       i++, sinfo++)
-  {
-    if (!sinfo->sort_keys)
-    {
-      got_error=1;
-      my_free(mi_get_rec_buff_ptr(info, sinfo->rec_buff));
-      continue;
-    }
-    if (!got_error)
-    {
-      mi_set_key_active(share->state.key_map, sinfo->key);
-      if (!sinfo->buffpek.elements)
-      {
-        if (param->testflag & T_VERBOSE)
-        {
-          printf("Key %d  - Dumping %u keys\n",sinfo->key+1, sinfo->keys);
-          fflush(stdout);
-        }
-        if (write_index(sinfo, sinfo->sort_keys, sinfo->keys) ||
-            flush_ft_buf(sinfo) || flush_pending_blocks(sinfo))
-          got_error=1;
-      }
-    }
-    my_free(sinfo->sort_keys);
-    my_free(mi_get_rec_buff_ptr(info, sinfo->rec_buff));
-    sinfo->sort_keys=0;
-  }
-
-  for (i= 0, sinfo= sort_param ;
-       i < sort_info->total_keys ;
-       i++,
-	 delete_dynamic(&sinfo->buffpek),
-	 close_cached_file(&sinfo->tempfile),
-	 close_cached_file(&sinfo->tempfile_for_exceptions),
-         rec_per_key_part+= sinfo->keyinfo->keysegs, sinfo++)
-  {
-    if (got_error)
-      continue;
-    if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY)
-    {
-      sinfo->write_keys=write_keys_varlen;
-      sinfo->read_to_buffer=read_to_buffer_varlen;
-      sinfo->write_key=write_merge_key_varlen;
-    }
-    else
-    {
-      sinfo->write_keys=write_keys;
-      sinfo->read_to_buffer=read_to_buffer;
-      sinfo->write_key=write_merge_key;
-    }
-    if (sinfo->buffpek.elements)
-    {
-      uint maxbuffer=sinfo->buffpek.elements-1;
-      if (!mergebuf)
-      {
-        length= (size_t)param->sort_buffer_length;
-        while (length >= MIN_SORT_BUFFER)
-        {
-          if ((mergebuf= my_malloc(PSI_NOT_INSTRUMENTED,
-                                   length, MYF(0))))
-              break;
-          length=length*3/4;
-        }
-        if (!mergebuf)
-        {
-          got_error=1;
-          continue;
-        }
-      }
-      keys=length/sinfo->key_length;
-      if (maxbuffer >= MERGEBUFF2)
-      {
-        if (param->testflag & T_VERBOSE)
-          printf("Key %d  - Merging %u keys\n",sinfo->key+1, sinfo->keys);
-        if (merge_many_buff(sinfo, keys, (uchar **)mergebuf,
-			    dynamic_element(&sinfo->buffpek, 0, BUFFPEK *),
-			    (int*) &maxbuffer, &sinfo->tempfile))
-        {
-          got_error=1;
-          continue;
-        }
-      }
-      if (flush_io_cache(&sinfo->tempfile) ||
-          reinit_io_cache(&sinfo->tempfile,READ_CACHE,0L,0,0))
-      {
-        got_error=1;
-        continue;
-      }
-      if (param->testflag & T_VERBOSE)
-        printf("Key %d  - Last merge and dumping keys\n", sinfo->key+1);
-      if (merge_index(sinfo, keys, (uchar **)mergebuf,
-                      dynamic_element(&sinfo->buffpek,0,BUFFPEK *),
-                      maxbuffer,&sinfo->tempfile) ||
-          flush_ft_buf(sinfo) ||
-	  flush_pending_blocks(sinfo))
-      {
-        got_error=1;
-        continue;
-      }
-    }
-    if (my_b_inited(&sinfo->tempfile_for_exceptions))
-    {
-      uint key_length;
-
-      if (param->testflag & T_VERBOSE)
-        printf("Key %d  - Dumping 'long' keys\n", sinfo->key+1);
-
-      if (flush_io_cache(&sinfo->tempfile_for_exceptions) ||
-          reinit_io_cache(&sinfo->tempfile_for_exceptions,READ_CACHE,0L,0,0))
-      {
-        got_error=1;
-        continue;
-      }
-
-      while (!got_error &&
-	     !my_b_read(&sinfo->tempfile_for_exceptions,(uchar*)&key_length,
-			sizeof(key_length)))
-      {
-        uchar ft_buf[HA_FT_MAXBYTELEN + HA_FT_WLEN + 10];
-        if (key_length > sizeof(ft_buf) ||
-            my_b_read(&sinfo->tempfile_for_exceptions, (uchar*)ft_buf,
-                      (uint)key_length) ||
-            _mi_ck_write(info, sinfo->key, (uchar*)ft_buf,
-                         key_length - info->s->rec_reflength))
-          got_error=1;
-      }
-    }
-    if (!got_error && param->testflag & T_STATISTICS)
-      update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique,
-                       param->stats_method == MI_STATS_METHOD_IGNORE_NULLS ?
-                       sinfo->notnull : NULL,
-                       (ulonglong) info->state->records);
-  }
-  my_free(mergebuf);
-  DBUG_RETURN(got_error);
-}
-
-        /* Write all keys in memory to file for later merge */
-
-static int write_keys(MI_SORT_PARAM *info, uchar **sort_keys,
-                      uint count, BUFFPEK *buffpek, IO_CACHE *tempfile)
-{
-  uchar **end;
-  uint sort_length=info->key_length;
-  DBUG_ENTER("write_keys");
-
-  my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
-            info);
-  if (!my_b_inited(tempfile) &&
-      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
-                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
-    DBUG_RETURN(1); /* purecov: inspected */
-
-  buffpek->file_pos=my_b_tell(tempfile);
-  buffpek->count=count;
-
-  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
-  {
-    if (my_b_write(tempfile,(uchar*) *sort_keys,(uint) sort_length))
-      DBUG_RETURN(1); /* purecov: inspected */
-  }
-  DBUG_RETURN(0);
-} /* write_keys */
-
-
-static inline int
-my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs)
-{
-  int err;
-  uint16 len = _mi_keylength(info->keyinfo, (uchar*) bufs);
-
-  /* The following is safe as this is a local file */
-  if ((err= my_b_write(to_file, (uchar*)&len, sizeof(len))))
-    return (err);
-  if ((err= my_b_write(to_file,bufs, (uint) len)))
-    return (err);
-  return (0);
-}
-
-
-static int write_keys_varlen(MI_SORT_PARAM *info,
-                             uchar **sort_keys,
-                             uint count, BUFFPEK *buffpek,
-                             IO_CACHE *tempfile)
-{
-  uchar **end;
-  int err;
-  DBUG_ENTER("write_keys_varlen");
-
-  my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
-            info);
-  if (!my_b_inited(tempfile) &&
-      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
-                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
-    DBUG_RETURN(1); /* purecov: inspected */
-
-  buffpek->file_pos=my_b_tell(tempfile);
-  buffpek->count=count;
-  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
-  {
-    if ((err= my_var_write(info,tempfile, (uchar*) *sort_keys)))
-      DBUG_RETURN(err);
-  }
-  DBUG_RETURN(0);
-} /* write_keys_varlen */
-
-
-static int write_key(MI_SORT_PARAM *info, uchar *key, IO_CACHE *tempfile)
-{
-  uint key_length=info->real_key_length;
-  DBUG_ENTER("write_key");
-
-  if (!my_b_inited(tempfile) &&
-      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
-                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
-    DBUG_RETURN(1);
-
-  if (my_b_write(tempfile,(uchar*)&key_length,sizeof(key_length)) ||
-      my_b_write(tempfile,(uchar*)key,(uint) key_length))
-    DBUG_RETURN(1);
-  DBUG_RETURN(0);
-} /* write_key */
-
-
-/* Write index */
-
-static int write_index(MI_SORT_PARAM *info, uchar **sort_keys,
-                       uint count)
-{
-  DBUG_ENTER("write_index");
-
-  my_qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*),
-           (qsort2_cmp) info->key_cmp,info);
-  while (count--)
-  {
-    if ((*info->key_write)(info,*sort_keys++))
-      DBUG_RETURN(-1); /* purecov: inspected */
-  }
-  DBUG_RETURN(0);
-} /* write_index */
-
-
-        /* Merge buffers to make < MERGEBUFF2 buffers */
-
-static int merge_many_buff(MI_SORT_PARAM *info, uint keys,
-                           uchar **sort_keys, BUFFPEK *buffpek,
-                           int *maxbuffer, IO_CACHE *t_file)
-{
-  int i;
-  IO_CACHE t_file2, *from_file, *to_file, *temp;
-  BUFFPEK *lastbuff;
-  DBUG_ENTER("merge_many_buff");
-
-  if (*maxbuffer < MERGEBUFF2)
-    DBUG_RETURN(0);                             /* purecov: inspected */
-  if (flush_io_cache(t_file) ||
-      open_cached_file(&t_file2,my_tmpdir(info->tmpdir),"ST",
-                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
-    DBUG_RETURN(1);                             /* purecov: inspected */
-
-  from_file= t_file ; to_file= &t_file2;
-  while (*maxbuffer >= MERGEBUFF2)
-  {
-    reinit_io_cache(from_file,READ_CACHE,0L,0,0);
-    reinit_io_cache(to_file,WRITE_CACHE,0L,0,0);
-    lastbuff=buffpek;
-    for (i=0 ; i <= *maxbuffer-MERGEBUFF*3/2 ; i+=MERGEBUFF)
-    {
-      if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
-                        buffpek+i,buffpek+i+MERGEBUFF-1))
-        goto cleanup;
-    }
-    if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
-                      buffpek+i,buffpek+ *maxbuffer))
-      break; /* purecov: inspected */
-    if (flush_io_cache(to_file))
-      break;                                    /* purecov: inspected */
-    temp=from_file; from_file=to_file; to_file=temp;
-    *maxbuffer= (int) (lastbuff-buffpek)-1;
-  }
-cleanup:
-  close_cached_file(to_file);                   /* This holds old result */
-  if (to_file == t_file)
-  {
-    DBUG_ASSERT(t_file2.type == WRITE_CACHE);
-    *t_file=t_file2;                            /* Copy result file */
-    t_file->current_pos= &t_file->write_pos;
-    t_file->current_end= &t_file->write_end;
-  }
-
-  DBUG_RETURN(*maxbuffer >= MERGEBUFF2);        /* Return 1 if interrupted */
-} /* merge_many_buff */
-
-
-/*
-   Read data to buffer
-
-  SYNOPSIS
-    read_to_buffer()
-    fromfile		File to read from
-    buffpek		Where to read from
-    sort_length		max length to read
-  RESULT
-    > 0	Ammount of bytes read
-    -1	Error
-*/
-
-static uint read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
-                           uint sort_length)
-{
-  uint count;
-  uint length;
-
-  if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
-  {
-    if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base,
-                         (length= sort_length*count),
-                         buffpek->file_pos, MYF_RW))
-      return((uint) -1);                        /* purecov: inspected */
-    buffpek->key=buffpek->base;
-    buffpek->file_pos+= length;                 /* New filepos */
-    buffpek->count-=    count;
-    buffpek->mem_count= count;
-  }
-  return (count*sort_length);
-} /* read_to_buffer */
-
-static uint read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
-                                  uint sort_length)
-{
-  uint count;
-  uint16 length_of_key = 0;
-  uint idx;
-  uchar *buffp;
-
-  if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys, buffpek->count)))
-  {
-    buffp = buffpek->base;
-
-    for (idx=1;idx<=count;idx++)
-    {
-      if (mysql_file_pread(fromfile->file, (uchar*)&length_of_key,
-                           sizeof(length_of_key), buffpek->file_pos, MYF_RW))
-        return((uint) -1);
-      buffpek->file_pos+=sizeof(length_of_key);
-      if (mysql_file_pread(fromfile->file, (uchar*) buffp,
-                           length_of_key, buffpek->file_pos, MYF_RW))
-        return((uint) -1);
-      buffpek->file_pos+=length_of_key;
-      buffp = buffp + sort_length;
-    }
-    buffpek->key=buffpek->base;
-    buffpek->count-=    count;
-    buffpek->mem_count= count;
-  }
-  return (count*sort_length);
-} /* read_to_buffer_varlen */
-
-
-static int write_merge_key_varlen(MI_SORT_PARAM *info,
-                                  IO_CACHE *to_file, uchar* key,
-                                  uint sort_length, uint count)
-{
-  uint idx;
-  uchar *bufs = key;
-
-  for (idx=1;idx<=count;idx++)
-  {
-    int err;
-    if ((err= my_var_write(info, to_file, bufs)))
-      return (err);
-    bufs=bufs+sort_length;
-  }
-  return(0);
-}
-
-
-static int write_merge_key(MI_SORT_PARAM *info MY_ATTRIBUTE((unused)),
-                           IO_CACHE *to_file, uchar *key,
-                           uint sort_length, uint count)
-{
-  return my_b_write(to_file, key, (size_t) sort_length*count);
-}
-
-/*
-  Merge buffers to one buffer
-  If to_file == 0 then use info->key_write
-*/
-
-static int
-merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
-              IO_CACHE *to_file, uchar **sort_keys, BUFFPEK *lastbuff,
-              BUFFPEK *Fb, BUFFPEK *Tb)
-{
-  int error;
-  uint sort_length,maxcount;
-  ha_rows count;
-  my_off_t to_start_filepos= 0;
-  uchar *strpos;
-  BUFFPEK *buffpek,**refpek;
-  QUEUE queue;
-  volatile int *killed= killed_ptr(info->sort_info->param);
-  DBUG_ENTER("merge_buffers");
-
-  count=error=0;
-  maxcount=keys/((uint) (Tb-Fb) +1);
-  DBUG_ASSERT(maxcount > 0);
-  if (to_file)
-    to_start_filepos=my_b_tell(to_file);
-  strpos=(uchar*) sort_keys;
-  sort_length=info->key_length;
-
-  if (init_queue(&queue,(uint) (Tb-Fb)+1,offsetof(BUFFPEK,key),0,
-                 (int (*)(void*, uchar *,uchar*)) info->key_cmp,
-                 (void*) info))
-    DBUG_RETURN(1); /* purecov: inspected */
-
-  for (buffpek= Fb ; buffpek <= Tb ; buffpek++)
-  {
-    count+= buffpek->count;
-    buffpek->base= strpos;
-    buffpek->max_keys=maxcount;
-    strpos+= (uint) (error=(int) info->read_to_buffer(from_file,buffpek,
-                                                      sort_length));
-    if (error == -1)
-      goto err; /* purecov: inspected */
-    queue_insert(&queue,(uchar*) buffpek);
-  }
-
-  while (queue.elements > 1)
-  {
-    for (;;)
-    {
-      if (*killed)
-      {
-        error=1; goto err;
-      }
-      buffpek=(BUFFPEK*) queue_top(&queue);
-      if (to_file)
-      {
-        if (info->write_key(info,to_file,(uchar*) buffpek->key,
-                            (uint) sort_length,1))
-        {
-          error=1; goto err; /* purecov: inspected */
-        }
-      }
-      else
-      {
-        if ((*info->key_write)(info,(void*) buffpek->key))
-        {
-          error=1; goto err; /* purecov: inspected */
-        }
-      }
-      buffpek->key+=sort_length;
-      if (! --buffpek->mem_count)
-      {
-        if (!(error=(int) info->read_to_buffer(from_file,buffpek,sort_length)))
-        {
-          uchar *base=buffpek->base;
-          uint max_keys=buffpek->max_keys;
-
-          (void) queue_remove(&queue,0);
-
-          /* Put room used by buffer to use in other buffer */
-          for (refpek= (BUFFPEK**) &queue_top(&queue);
-               refpek <= (BUFFPEK**) &queue_end(&queue);
-               refpek++)
-          {
-            buffpek= *refpek;
-            if (buffpek->base+buffpek->max_keys*sort_length == base)
-            {
-              buffpek->max_keys+=max_keys;
-              break;
-            }
-            else if (base+max_keys*sort_length == buffpek->base)
-            {
-              buffpek->base=base;
-              buffpek->max_keys+=max_keys;
-              break;
-            }
-          }
-          break;                /* One buffer have been removed */
-        }
-      }
-      else if (error == -1)
-        goto err;               /* purecov: inspected */
-      queue_replaced(&queue);   /* Top element has been replaced */
-    }
-  }
-  buffpek=(BUFFPEK*) queue_top(&queue);
-  buffpek->base=(uchar *) sort_keys;
-  buffpek->max_keys=keys;
-  do
-  {
-    if (to_file)
-    {
-      if (info->write_key(info,to_file,(uchar*) buffpek->key,
-                         sort_length,buffpek->mem_count))
-      {
-        error=1; goto err; /* purecov: inspected */
-      }
-    }
-    else
-    {
-      uchar *end;
-      strpos= buffpek->key;
-      for (end=strpos+buffpek->mem_count*sort_length;
-           strpos != end ;
-           strpos+=sort_length)
-      {
-        if ((*info->key_write)(info,(void*) strpos))
-        {
-          error=1; goto err; /* purecov: inspected */
-        }
-      }
-    }
-  }
-  while ((error=(int) info->read_to_buffer(from_file,buffpek,sort_length)) != -1 &&
-         error != 0);
-
-  lastbuff->count=count;
-  if (to_file)
-    lastbuff->file_pos=to_start_filepos;
-err:
-  delete_queue(&queue);
-  DBUG_RETURN(error);
-} /* merge_buffers */
-
-
-        /* Do a merge to output-file (save only positions) */
-
-static int
-merge_index(MI_SORT_PARAM *info, uint keys, uchar **sort_keys,
-            BUFFPEK *buffpek, int maxbuffer, IO_CACHE *tempfile)
-{
-  DBUG_ENTER("merge_index");
-  if (merge_buffers(info,keys,tempfile,(IO_CACHE*) 0,sort_keys,buffpek,buffpek,
-                    buffpek+maxbuffer))
-    DBUG_RETURN(1); /* purecov: inspected */
-  DBUG_RETURN(0);
-} /* merge_index */
-
-static int
-flush_ft_buf(MI_SORT_PARAM *info)
-{
-  int err=0;
-  if (info->sort_info->ft_buf)
-  {
-    err=sort_ft_buf_flush(info);
-    my_free(info->sort_info->ft_buf);
-    info->sort_info->ft_buf=0;
-  }
-  return err;
-}
-
diff --git a/storage/myisam/sort.cc b/storage/myisam/sort.cc
new file mode 100644
index 000000000000..7affe7fdc150
--- /dev/null
+++ b/storage/myisam/sort.cc
@@ -0,0 +1,752 @@
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/*
+  Creates a index for a database by reading keys, sorting them and outputing
+  them in sorted order through SORT_INFO functions.
+*/
+
+#include <algorithm>
+
+#include "fulltext.h"
+#if defined(_WIN32)
+#include <fcntl.h>
+#else
+#include <stddef.h>
+#endif
+#include <queues.h>
+
+/* static variables */
+
+#undef MYF_RW
+#undef DISK_BUFFER_SIZE
+
+#define MERGEBUFF 15
+#define MERGEBUFF2 31
+#define MYF_RW  MYF(MY_NABP | MY_WME | MY_WAIT_IF_FULL)
+#define DISK_BUFFER_SIZE (IO_SIZE*16)
+
+
+class Key_compare :
+  public std::binary_function<const uchar*, const uchar*, bool>
+{
+public:
+  Key_compare(MI_SORT_PARAM *param) : info(param) {}
+  bool operator()(const uchar *a, const uchar *b)
+  {
+    return info->key_cmp(info, &a, &b) < 0;
+  }
+  MI_SORT_PARAM *info;
+};
+
+
+/*
+ Pointers of functions for store and read keys from temp file
+*/
+
+extern void print_error(const char *fmt,...);
+
+/* Functions defined in this file */
+
+static ha_rows find_all_keys(MI_SORT_PARAM *info,uint keys,
+                             uchar **sort_keys,
+                             DYNAMIC_ARRAY *buffpek,int *maxbuffer,
+                             IO_CACHE *tempfile,
+                             IO_CACHE *tempfile_for_exceptions);
+static int write_keys(MI_SORT_PARAM *info,uchar **sort_keys,
+                      uint count, BUFFPEK *buffpek,IO_CACHE *tempfile);
+static int write_key(MI_SORT_PARAM *info, uchar *key,
+                     IO_CACHE *tempfile);
+static int write_index(MI_SORT_PARAM *info,uchar * *sort_keys,
+                       uint count);
+static int merge_many_buff(MI_SORT_PARAM *info,uint keys,
+                           uchar * *sort_keys,
+                           BUFFPEK *buffpek,int *maxbuffer,
+                           IO_CACHE *t_file);
+static uint read_to_buffer(IO_CACHE *fromfile,BUFFPEK *buffpek,
+                           uint sort_length);
+static int merge_buffers(MI_SORT_PARAM *info,uint keys,
+                         IO_CACHE *from_file, IO_CACHE *to_file,
+                         uchar * *sort_keys, BUFFPEK *lastbuff,
+                         BUFFPEK *Fb, BUFFPEK *Tb);
+static int merge_index(MI_SORT_PARAM *,uint,uchar **,BUFFPEK *, int,
+                       IO_CACHE *);
+static int flush_ft_buf(MI_SORT_PARAM *info);
+
+static int write_keys_varlen(MI_SORT_PARAM *info,uchar **sort_keys,
+                             uint count, BUFFPEK *buffpek,
+                             IO_CACHE *tempfile);
+static uint read_to_buffer_varlen(IO_CACHE *fromfile,BUFFPEK *buffpek,
+                                  uint sort_length);
+static int write_merge_key(MI_SORT_PARAM *info, IO_CACHE *to_file,
+                           uchar *key, uint sort_length, uint count);
+static int write_merge_key_varlen(MI_SORT_PARAM *info,
+                                  IO_CACHE *to_file,
+                                  uchar* key, uint sort_length,
+                                  uint count);
+static inline int
+my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs);
+
+/*
+  Creates a index of sorted keys
+
+  SYNOPSIS
+    _create_index_by_sort()
+    info		Sort parameters
+    no_messages		Set to 1 if no output
+    sortbuff_size	Size if sortbuffer to allocate
+
+  RESULT
+    0	ok
+   <> 0 Error
+*/
+
+int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
+			  ulonglong sortbuff_size)
+{
+  int error,maxbuffer,skr;
+  uint sort_length, keys= 0;
+  ulonglong memavl, old_memavl;
+  DYNAMIC_ARRAY buffpek;
+  ha_rows records;
+  uchar **sort_keys;
+  IO_CACHE tempfile, tempfile_for_exceptions;
+  DBUG_ENTER("_create_index_by_sort");
+  DBUG_PRINT("enter",("sort_length: %d", info->key_length));
+
+  if (info->keyinfo->flag & HA_VAR_LENGTH_KEY)
+  {
+    info->write_keys=write_keys_varlen;
+    info->read_to_buffer=read_to_buffer_varlen;
+    info->write_key= write_merge_key_varlen;
+  }
+  else
+  {
+    info->write_keys=write_keys;
+    info->read_to_buffer=read_to_buffer;
+    info->write_key=write_merge_key;
+  }
+
+  my_b_clear(&tempfile);
+  my_b_clear(&tempfile_for_exceptions);
+  memset(&buffpek, 0, sizeof(buffpek));
+  sort_keys= (uchar **) NULL; error= 1;
+  maxbuffer=1;
+
+  memavl= MY_MAX(sortbuff_size, MIN_SORT_BUFFER);
+  records=	info->sort_info->max_records;
+  sort_length=	info->key_length;
+
+  if ((memavl - sizeof(BUFFPEK)) / (sort_length + sizeof(char *)) > UINT_MAX32)
+    memavl= sizeof(BUFFPEK) + UINT_MAX32 * (sort_length + sizeof(char *));
+
+  while (memavl >= MIN_SORT_BUFFER)
+  {
+    if ((records < UINT_MAX32) && 
+       ((my_off_t) (records + 1) * 
+        (sort_length + sizeof(char*)) <= (my_off_t) memavl))
+      keys= (uint)records+1;
+    else
+      do
+      {
+	skr=maxbuffer;
+	if (memavl < sizeof(BUFFPEK)*(uint) maxbuffer ||
+	    (keys= (uint)((memavl-sizeof(BUFFPEK)*(uint) maxbuffer)/
+                          (sort_length+sizeof(char*)))) <= 1 ||
+            keys < (uint) maxbuffer)
+	{
+	  mi_check_print_error(info->sort_info->param,
+			       "myisam_sort_buffer_size is too small");
+	  goto err;
+	}
+      }
+      while ((maxbuffer= (int) (records/(keys-1)+1)) != skr);
+
+    if ((sort_keys=(uchar **)my_malloc(PSI_NOT_INSTRUMENTED,
+                                       keys*(sort_length+sizeof(char*))+
+				       HA_FT_MAXBYTELEN, MYF(0))))
+    {
+      if (my_init_dynamic_array(&buffpek,
+                                PSI_NOT_INSTRUMENTED,
+                                sizeof(BUFFPEK),
+                                NULL,
+                                maxbuffer,
+                                maxbuffer/2))
+      {
+	my_free(sort_keys);
+        sort_keys= 0;
+      }
+      else
+	break;
+    }
+    old_memavl=memavl;
+    if ((memavl= memavl/4*3) < MIN_SORT_BUFFER && old_memavl > MIN_SORT_BUFFER)
+      memavl= MIN_SORT_BUFFER;
+  }
+  if (memavl < MIN_SORT_BUFFER)
+  {
+    mi_check_print_error(info->sort_info->param,"MyISAM sort buffer too small"); /* purecov: tested */
+    goto err; /* purecov: tested */
+  }
+  (*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
+
+  if (!no_messages)
+    printf("  - Searching for keys, allocating buffer for %d keys\n",keys);
+
+  if ((records=find_all_keys(info,keys,sort_keys,&buffpek,&maxbuffer,
+                                  &tempfile,&tempfile_for_exceptions))
+      == HA_POS_ERROR)
+    goto err; /* purecov: tested */
+  if (maxbuffer == 0)
+  {
+    if (!no_messages)
+      printf("  - Dumping %lu keys\n", (ulong) records);
+    if (write_index(info,sort_keys, (uint) records))
+      goto err; /* purecov: inspected */
+  }
+  else
+  {
+    keys=(keys*(sort_length+sizeof(char*)))/sort_length;
+    if (maxbuffer >= MERGEBUFF2)
+    {
+      if (!no_messages)
+	printf("  - Merging %lu keys\n", (ulong) records); /* purecov: tested */
+      if (merge_many_buff(info,keys,sort_keys,
+                  dynamic_element(&buffpek,0,BUFFPEK *),&maxbuffer,&tempfile))
+	goto err;				/* purecov: inspected */
+    }
+    if (flush_io_cache(&tempfile) ||
+	reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
+      goto err;					/* purecov: inspected */
+    if (!no_messages)
+      printf("  - Last merge and dumping keys\n"); /* purecov: tested */
+    if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
+                    maxbuffer,&tempfile))
+      goto err;					/* purecov: inspected */
+  }
+
+  if (flush_ft_buf(info) || flush_pending_blocks(info))
+    goto err;
+
+  if (my_b_inited(&tempfile_for_exceptions))
+  {
+    MI_INFO *idx=info->sort_info->info;
+    uint     keyno=info->key;
+    uint     key_length, ref_length=idx->s->rec_reflength;
+
+    if (!no_messages)
+      printf("  - Adding exceptions\n"); /* purecov: tested */
+    if (flush_io_cache(&tempfile_for_exceptions) ||
+	reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0))
+      goto err;
+
+    while (!my_b_read(&tempfile_for_exceptions,(uchar*)&key_length,
+		      sizeof(key_length))
+        && !my_b_read(&tempfile_for_exceptions,(uchar*)sort_keys,
+		      (uint) key_length))
+    {
+	if (_mi_ck_write(idx,keyno,(uchar*) sort_keys,key_length-ref_length))
+	  goto err;
+    }
+  }
+
+  error =0;
+
+err:
+  my_free(sort_keys);
+  delete_dynamic(&buffpek);
+  close_cached_file(&tempfile);
+  close_cached_file(&tempfile_for_exceptions);
+
+  DBUG_RETURN(error ? -1 : 0);
+} /* _create_index_by_sort */
+
+
+/* Search after all keys and place them in a temp. file */
+
+static ha_rows find_all_keys(MI_SORT_PARAM *info, uint keys,
+                             uchar **sort_keys, DYNAMIC_ARRAY *buffpek,
+                             int *maxbuffer, IO_CACHE *tempfile,
+                             IO_CACHE *tempfile_for_exceptions)
+{
+  int error;
+  uint idx;
+  DBUG_ENTER("find_all_keys");
+
+  idx=error=0;
+  sort_keys[0]=(uchar*) (sort_keys+keys);
+
+  while (!(error=(*info->key_read)(info,sort_keys[idx])))
+  {
+    if (info->real_key_length > info->key_length)
+    {
+      if (write_key(info,sort_keys[idx],tempfile_for_exceptions))
+        DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
+      continue;
+    }
+
+    if (++idx == keys)
+    {
+      if (info->write_keys(info,sort_keys,idx-1,(BUFFPEK *)alloc_dynamic(buffpek),
+		     tempfile))
+      DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
+
+      sort_keys[0]=(uchar*) (sort_keys+keys);
+      memcpy(sort_keys[0],sort_keys[idx-1],(size_t) info->key_length);
+      idx=1;
+    }
+    sort_keys[idx]=sort_keys[idx-1]+info->key_length;
+  }
+  if (error > 0)
+    DBUG_RETURN(HA_POS_ERROR);		/* Aborted by get_key */ /* purecov: inspected */
+  if (buffpek->elements)
+  {
+    if (info->write_keys(info,sort_keys,idx,(BUFFPEK *)alloc_dynamic(buffpek),
+		   tempfile))
+      DBUG_RETURN(HA_POS_ERROR);		/* purecov: inspected */
+    *maxbuffer=buffpek->elements-1;
+  }
+  else
+    *maxbuffer=0;
+
+  DBUG_RETURN((*maxbuffer)*(keys-1)+idx);
+} /* find_all_keys */
+
+
+        /* Write all keys in memory to file for later merge */
+
+static int write_keys(MI_SORT_PARAM *info, uchar **sort_keys,
+                      uint count, BUFFPEK *buffpek, IO_CACHE *tempfile)
+{
+  uchar **end;
+  uint sort_length=info->key_length;
+  DBUG_ENTER("write_keys");
+
+  std::sort(sort_keys, sort_keys + count, Key_compare(info));
+
+  if (!my_b_inited(tempfile) &&
+      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
+                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
+    DBUG_RETURN(1); /* purecov: inspected */
+
+  buffpek->file_pos=my_b_tell(tempfile);
+  buffpek->count=count;
+
+  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
+  {
+    if (my_b_write(tempfile,(uchar*) *sort_keys,(uint) sort_length))
+      DBUG_RETURN(1); /* purecov: inspected */
+  }
+  DBUG_RETURN(0);
+} /* write_keys */
+
+
+static inline int
+my_var_write(MI_SORT_PARAM *info, IO_CACHE *to_file, uchar *bufs)
+{
+  int err;
+  uint16 len = _mi_keylength(info->keyinfo, (uchar*) bufs);
+
+  /* The following is safe as this is a local file */
+  if ((err= my_b_write(to_file, (uchar*)&len, sizeof(len))))
+    return (err);
+  if ((err= my_b_write(to_file,bufs, (uint) len)))
+    return (err);
+  return (0);
+}
+
+
+static int write_keys_varlen(MI_SORT_PARAM *info,
+                             uchar **sort_keys,
+                             uint count, BUFFPEK *buffpek,
+                             IO_CACHE *tempfile)
+{
+  uchar **end;
+  int err;
+  DBUG_ENTER("write_keys_varlen");
+
+  std::sort(sort_keys, sort_keys + count, Key_compare(info));
+
+  if (!my_b_inited(tempfile) &&
+      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
+                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
+    DBUG_RETURN(1); /* purecov: inspected */
+
+  buffpek->file_pos=my_b_tell(tempfile);
+  buffpek->count=count;
+  for (end=sort_keys+count ; sort_keys != end ; sort_keys++)
+  {
+    if ((err= my_var_write(info,tempfile, (uchar*) *sort_keys)))
+      DBUG_RETURN(err);
+  }
+  DBUG_RETURN(0);
+} /* write_keys_varlen */
+
+
+static int write_key(MI_SORT_PARAM *info, uchar *key, IO_CACHE *tempfile)
+{
+  uint key_length=info->real_key_length;
+  DBUG_ENTER("write_key");
+
+  if (!my_b_inited(tempfile) &&
+      open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
+                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
+    DBUG_RETURN(1);
+
+  if (my_b_write(tempfile,(uchar*)&key_length,sizeof(key_length)) ||
+      my_b_write(tempfile,(uchar*)key,(uint) key_length))
+    DBUG_RETURN(1);
+  DBUG_RETURN(0);
+} /* write_key */
+
+
+/* Write index */
+
+static int write_index(MI_SORT_PARAM *info, uchar **sort_keys,
+                       uint count)
+{
+  DBUG_ENTER("write_index");
+
+  std::sort(sort_keys, sort_keys + count, Key_compare(info));
+
+  while (count--)
+  {
+    if ((*info->key_write)(info,*sort_keys++))
+      DBUG_RETURN(-1); /* purecov: inspected */
+  }
+  DBUG_RETURN(0);
+} /* write_index */
+
+
+        /* Merge buffers to make < MERGEBUFF2 buffers */
+
+static int merge_many_buff(MI_SORT_PARAM *info, uint keys,
+                           uchar **sort_keys, BUFFPEK *buffpek,
+                           int *maxbuffer, IO_CACHE *t_file)
+{
+  int i;
+  IO_CACHE t_file2, *from_file, *to_file, *temp;
+  BUFFPEK *lastbuff;
+  DBUG_ENTER("merge_many_buff");
+
+  if (*maxbuffer < MERGEBUFF2)
+    DBUG_RETURN(0);                             /* purecov: inspected */
+  if (flush_io_cache(t_file) ||
+      open_cached_file(&t_file2,my_tmpdir(info->tmpdir),"ST",
+                       DISK_BUFFER_SIZE, info->sort_info->param->myf_rw))
+    DBUG_RETURN(1);                             /* purecov: inspected */
+
+  from_file= t_file ; to_file= &t_file2;
+  while (*maxbuffer >= MERGEBUFF2)
+  {
+    reinit_io_cache(from_file,READ_CACHE,0L,0,0);
+    reinit_io_cache(to_file,WRITE_CACHE,0L,0,0);
+    lastbuff=buffpek;
+    for (i=0 ; i <= *maxbuffer-MERGEBUFF*3/2 ; i+=MERGEBUFF)
+    {
+      if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
+                        buffpek+i,buffpek+i+MERGEBUFF-1))
+        goto cleanup;
+    }
+    if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
+                      buffpek+i,buffpek+ *maxbuffer))
+      break; /* purecov: inspected */
+    if (flush_io_cache(to_file))
+      break;                                    /* purecov: inspected */
+    temp=from_file; from_file=to_file; to_file=temp;
+    *maxbuffer= (int) (lastbuff-buffpek)-1;
+  }
+cleanup:
+  close_cached_file(to_file);                   /* This holds old result */
+  if (to_file == t_file)
+  {
+    assert(t_file2.type == WRITE_CACHE);
+    *t_file=t_file2;                            /* Copy result file */
+    t_file->current_pos= &t_file->write_pos;
+    t_file->current_end= &t_file->write_end;
+  }
+
+  DBUG_RETURN(*maxbuffer >= MERGEBUFF2);        /* Return 1 if interrupted */
+} /* merge_many_buff */
+
+
+/*
+   Read data to buffer
+
+  SYNOPSIS
+    read_to_buffer()
+    fromfile		File to read from
+    buffpek		Where to read from
+    sort_length		max length to read
+  RESULT
+    > 0	Ammount of bytes read
+    -1	Error
+*/
+
+static uint read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek,
+                           uint sort_length)
+{
+  uint count;
+  uint length;
+
+  if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count)))
+  {
+    if (mysql_file_pread(fromfile->file, (uchar*) buffpek->base,
+                         (length= sort_length*count),
+                         buffpek->file_pos, MYF_RW))
+      return((uint) -1);                        /* purecov: inspected */
+    buffpek->key=buffpek->base;
+    buffpek->file_pos+= length;                 /* New filepos */
+    buffpek->count-=    count;
+    buffpek->mem_count= count;
+  }
+  return (count*sort_length);
+} /* read_to_buffer */
+
+static uint read_to_buffer_varlen(IO_CACHE *fromfile, BUFFPEK *buffpek,
+                                  uint sort_length)
+{
+  uint count;
+  uint16 length_of_key = 0;
+  uint idx;
+  uchar *buffp;
+
+  if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys, buffpek->count)))
+  {
+    buffp = buffpek->base;
+
+    for (idx=1;idx<=count;idx++)
+    {
+      if (mysql_file_pread(fromfile->file, (uchar*)&length_of_key,
+                           sizeof(length_of_key), buffpek->file_pos, MYF_RW))
+        return((uint) -1);
+      buffpek->file_pos+=sizeof(length_of_key);
+      if (mysql_file_pread(fromfile->file, (uchar*) buffp,
+                           length_of_key, buffpek->file_pos, MYF_RW))
+        return((uint) -1);
+      buffpek->file_pos+=length_of_key;
+      buffp = buffp + sort_length;
+    }
+    buffpek->key=buffpek->base;
+    buffpek->count-=    count;
+    buffpek->mem_count= count;
+  }
+  return (count*sort_length);
+} /* read_to_buffer_varlen */
+
+
+static int write_merge_key_varlen(MI_SORT_PARAM *info,
+                                  IO_CACHE *to_file, uchar* key,
+                                  uint sort_length, uint count)
+{
+  uint idx;
+  uchar *bufs = key;
+
+  for (idx=1;idx<=count;idx++)
+  {
+    int err;
+    if ((err= my_var_write(info, to_file, bufs)))
+      return (err);
+    bufs=bufs+sort_length;
+  }
+  return(0);
+}
+
+
+static int write_merge_key(MI_SORT_PARAM *info MY_ATTRIBUTE((unused)),
+                           IO_CACHE *to_file, uchar *key,
+                           uint sort_length, uint count)
+{
+  return my_b_write(to_file, key, (size_t) sort_length*count);
+}
+
+/*
+  Merge buffers to one buffer
+  If to_file == 0 then use info->key_write
+*/
+
+static int
+merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
+              IO_CACHE *to_file, uchar **sort_keys, BUFFPEK *lastbuff,
+              BUFFPEK *Fb, BUFFPEK *Tb)
+{
+  int error;
+  uint sort_length,maxcount;
+  ha_rows count;
+  my_off_t to_start_filepos= 0;
+  uchar *strpos;
+  BUFFPEK *buffpek,**refpek;
+  QUEUE queue;
+  volatile int *killed= killed_ptr(info->sort_info->param);
+  DBUG_ENTER("merge_buffers");
+
+  count=error=0;
+  maxcount=keys/((uint) (Tb-Fb) +1);
+  assert(maxcount > 0);
+  if (to_file)
+    to_start_filepos=my_b_tell(to_file);
+  strpos=(uchar*) sort_keys;
+  sort_length=info->key_length;
+
+  if (init_queue(&queue,(uint) (Tb-Fb)+1,offsetof(BUFFPEK,key),0,
+                 (int (*)(void*, uchar *,uchar*)) info->key_cmp,
+                 (void*) info))
+    DBUG_RETURN(1); /* purecov: inspected */
+
+  for (buffpek= Fb ; buffpek <= Tb ; buffpek++)
+  {
+    count+= buffpek->count;
+    buffpek->base= strpos;
+    buffpek->max_keys=maxcount;
+    strpos+= (uint) (error=(int) info->read_to_buffer(from_file,buffpek,
+                                                      sort_length));
+    if (error == -1)
+      goto err; /* purecov: inspected */
+    queue_insert(&queue,(uchar*) buffpek);
+  }
+
+  while (queue.elements > 1)
+  {
+    for (;;)
+    {
+      if (*killed)
+      {
+        error=1; goto err;
+      }
+      buffpek=(BUFFPEK*) queue_top(&queue);
+      if (to_file)
+      {
+        if (info->write_key(info,to_file,(uchar*) buffpek->key,
+                            (uint) sort_length,1))
+        {
+          error=1; goto err; /* purecov: inspected */
+        }
+      }
+      else
+      {
+        if ((*info->key_write)(info,(void*) buffpek->key))
+        {
+          error=1; goto err; /* purecov: inspected */
+        }
+      }
+      buffpek->key+=sort_length;
+      if (! --buffpek->mem_count)
+      {
+        if (!(error=(int) info->read_to_buffer(from_file,buffpek,sort_length)))
+        {
+          uchar *base=buffpek->base;
+          uint max_keys=buffpek->max_keys;
+
+          (void) queue_remove(&queue,0);
+
+          /* Put room used by buffer to use in other buffer */
+          for (refpek= (BUFFPEK**) &queue_top(&queue);
+               refpek <= (BUFFPEK**) &queue_end(&queue);
+               refpek++)
+          {
+            buffpek= *refpek;
+            if (buffpek->base+buffpek->max_keys*sort_length == base)
+            {
+              buffpek->max_keys+=max_keys;
+              break;
+            }
+            else if (base+max_keys*sort_length == buffpek->base)
+            {
+              buffpek->base=base;
+              buffpek->max_keys+=max_keys;
+              break;
+            }
+          }
+          break;                /* One buffer have been removed */
+        }
+      }
+      else if (error == -1)
+        goto err;               /* purecov: inspected */
+      queue_replaced(&queue);   /* Top element has been replaced */
+    }
+  }
+  buffpek=(BUFFPEK*) queue_top(&queue);
+  buffpek->base=(uchar *) sort_keys;
+  buffpek->max_keys=keys;
+  do
+  {
+    if (to_file)
+    {
+      if (info->write_key(info,to_file,(uchar*) buffpek->key,
+                         sort_length,buffpek->mem_count))
+      {
+        error=1; goto err; /* purecov: inspected */
+      }
+    }
+    else
+    {
+      uchar *end;
+      strpos= buffpek->key;
+      for (end=strpos+buffpek->mem_count*sort_length;
+           strpos != end ;
+           strpos+=sort_length)
+      {
+        if ((*info->key_write)(info,(void*) strpos))
+        {
+          error=1; goto err; /* purecov: inspected */
+        }
+      }
+    }
+  }
+  while ((error=(int) info->read_to_buffer(from_file,buffpek,sort_length)) != -1 &&
+         error != 0);
+
+  lastbuff->count=count;
+  if (to_file)
+    lastbuff->file_pos=to_start_filepos;
+err:
+  delete_queue(&queue);
+  DBUG_RETURN(error);
+} /* merge_buffers */
+
+
+        /* Do a merge to output-file (save only positions) */
+
+static int
+merge_index(MI_SORT_PARAM *info, uint keys, uchar **sort_keys,
+            BUFFPEK *buffpek, int maxbuffer, IO_CACHE *tempfile)
+{
+  DBUG_ENTER("merge_index");
+  if (merge_buffers(info,keys,tempfile,(IO_CACHE*) 0,sort_keys,buffpek,buffpek,
+                    buffpek+maxbuffer))
+    DBUG_RETURN(1); /* purecov: inspected */
+  DBUG_RETURN(0);
+} /* merge_index */
+
+static int
+flush_ft_buf(MI_SORT_PARAM *info)
+{
+  int err=0;
+  if (info->sort_info->ft_buf)
+  {
+    err=sort_ft_buf_flush(info);
+    my_free(info->sort_info->ft_buf);
+    info->sort_info->ft_buf=0;
+  }
+  return err;
+}
+
diff --git a/storage/myisam/sp_defs.h b/storage/myisam/sp_defs.h
index ae02e1c61c82..bac23a57e87a 100644
--- a/storage/myisam/sp_defs.h
+++ b/storage/myisam/sp_defs.h
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
diff --git a/storage/myisam/sp_key.c b/storage/myisam/sp_key.c
index 6ea95086161b..3e0d18b525cd 100644
--- a/storage/myisam/sp_key.c
+++ b/storage/myisam/sp_key.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
@@ -57,10 +64,10 @@ uint sp_make_key(MI_INFO *info, uint keynr, uchar *key,
     uint length = keyseg->length, start= keyseg->start;
     double val;
 
-    DBUG_ASSERT(length == sizeof(double));
-    DBUG_ASSERT(!(start % sizeof(double)));
-    DBUG_ASSERT(start < sizeof(mbr));
-    DBUG_ASSERT(keyseg->type == HA_KEYTYPE_DOUBLE);
+    assert(length == sizeof(double));
+    assert(!(start % sizeof(double)));
+    assert(start < sizeof(mbr));
+    assert(keyseg->type == HA_KEYTYPE_DOUBLE);
     
     val= mbr[start / sizeof (double)];
     if (my_isnan(val))
diff --git a/storage/myisam/sp_test.c b/storage/myisam/sp_test.c
index cd8f6758f083..8c3e642c8d13 100644
--- a/storage/myisam/sp_test.c
+++ b/storage/myisam/sp_test.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-   
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index eec3ca783dc5..65346ad8fd2b 100644
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 5fda19d0cbdf..2da89b3a4ec3 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -271,7 +278,7 @@ extern "C" int myisammrg_parent_open_callback(void *callback_param,
   }
   else
   {
-    DBUG_ASSERT(strlen(filename) < sizeof(dir_path));
+    assert(strlen(filename) < sizeof(dir_path));
     fn_format(dir_path, filename, "", "", 0);
     /* Extract child table name and database name from filename. */
     dirlen= dirname_length(dir_path);
@@ -353,7 +360,7 @@ int ha_myisammrg::open(const char *name, int mode MY_ATTRIBUTE((unused)),
   DBUG_PRINT("myrg", ("test_if_locked_arg: %u", test_if_locked_arg));
 
   /* Must not be used when table is open. */
-  DBUG_ASSERT(!this->file);
+  assert(!this->file);
 
   /* Save for later use. */
   test_if_locked= test_if_locked_arg;
@@ -377,6 +384,7 @@ int ha_myisammrg::open(const char *name, int mode MY_ATTRIBUTE((unused)),
   /* retrieve children table list. */
   if (is_cloned)
   {
+    DEBUG_SYNC(current_thd, "before_myrg_open");
     /*
       Open and attaches the MyISAM tables,that are under the MERGE table 
       parent, on the MyISAM storage engine interface directly within the
@@ -394,6 +402,13 @@ int ha_myisammrg::open(const char *name, int mode MY_ATTRIBUTE((unused)),
     file->children_attached= TRUE;
 
     info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
+    /*
+      There may arise a scenario where it might end up with two different
+      MYMERGE_INFO data if any one of the child table is updated in
+      between myrg_open() and the last ha_myisammrg::info(). So we need make
+      sure that the MYMERGE_INFO data are in sync.
+    */
+    table->file->info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
   }
   else if (!(file= myrg_parent_open(name, myisammrg_parent_open_callback, this)))
   {
@@ -433,7 +448,7 @@ int ha_myisammrg::add_children_list(void)
                       this->table->s->table_name.str, (long) this->table));
 
   /* Must call this with open table. */
-  DBUG_ASSERT(this->file);
+  assert(this->file);
 
   /* Ignore this for empty MERGE tables (UNION=()). */
   if (!this->file->tables)
@@ -443,10 +458,10 @@ int ha_myisammrg::add_children_list(void)
   }
 
   /* Must not call this with attached children. */
-  DBUG_ASSERT(!this->file->children_attached);
+  assert(!this->file->children_attached);
 
   /* Must not call this with children list in place. */
-  DBUG_ASSERT(this->children_l == NULL);
+  assert(this->children_l == NULL);
 
   /*
     Prevent inclusion of another MERGE table, which could make infinite
@@ -630,7 +645,7 @@ extern "C" MI_INFO *myisammrg_attach_children_callback(void *callback_param)
     Number of children in the list and MYRG_INFO::tables_count,
     which is used by caller of this function, should always match.
   */
-  DBUG_ASSERT(child_l);
+  assert(child_l);
 
   child= child_l->table;
 
@@ -797,7 +812,7 @@ int ha_myisammrg::attach_children(void)
   DBUG_PRINT("myrg", ("test_if_locked: %u", this->test_if_locked));
 
   /* Must call this with open table. */
-  DBUG_ASSERT(this->file);
+  assert(this->file);
 
   /*
     A MERGE table with no children (empty union) is always seen as
@@ -811,11 +826,11 @@ int ha_myisammrg::attach_children(void)
   DBUG_PRINT("myrg", ("child tables: %u", this->file->tables));
 
   /* Must not call this with attached children. */
-  DBUG_ASSERT(!this->file->children_attached);
+  assert(!this->file->children_attached);
 
   DEBUG_SYNC(current_thd, "before_myisammrg_attach");
   /* Must call this with children list in place. */
-  DBUG_ASSERT(this->table->pos_in_table_list->next_global == this->children_l);
+  assert(this->table->pos_in_table_list->next_global == this->children_l);
 
   if (myrg_attach_children(this->file, this->test_if_locked |
                            current_thd->open_options,
@@ -895,7 +910,7 @@ int ha_myisammrg::attach_children(void)
       goto err; /* purecov: inspected */
 
     List_iterator_fast<Mrg_child_def> def_it(child_def_list);
-    DBUG_ASSERT(this->children_l);
+    assert(this->children_l);
     for (child_l= this->children_l; ; child_l= child_l->next_global)
     {
       Mrg_child_def *mrg_child_def= def_it++;
@@ -948,7 +963,7 @@ int ha_myisammrg::detach_children(void)
   DBUG_ENTER("ha_myisammrg::detach_children");
 
   /* Must call this with open table. */
-  DBUG_ASSERT(this->file);
+  assert(this->file);
 
   /* A MERGE table with no children (empty union) cannot be detached. */
   if (!this->file->tables)
@@ -965,7 +980,7 @@ int ha_myisammrg::detach_children(void)
     for (child_l= this->children_l; ; child_l= child_l->next_global)
     {
       /*
-        Do not DBUG_ASSERT(child_l->table); open_tables might be
+        Do not assert(child_l->table); open_tables might be
         incomplete.
 
         Clear the table reference.
@@ -1073,7 +1088,7 @@ int ha_myisammrg::close(void)
 int ha_myisammrg::write_row(uchar * buf)
 {
   DBUG_ENTER("ha_myisammrg::write_row");
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   ha_statistic_increment(&SSV::ha_write_count);
 
   if (file->merge_insert_method == MERGE_INSERT_DISABLED || !file->tables)
@@ -1090,14 +1105,14 @@ int ha_myisammrg::write_row(uchar * buf)
 
 int ha_myisammrg::update_row(const uchar * old_data, uchar * new_data)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   ha_statistic_increment(&SSV::ha_update_count);
   return myrg_update(file,old_data,new_data);
 }
 
 int ha_myisammrg::delete_row(const uchar * buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   ha_statistic_increment(&SSV::ha_delete_count);
   return myrg_delete(file,buf);
 }
@@ -1106,7 +1121,7 @@ int ha_myisammrg::index_read_map(uchar * buf, const uchar * key,
                                  key_part_map keypart_map,
                                  enum ha_rkey_function find_flag)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=myrg_rkey(file,buf,active_index, key, keypart_map, find_flag);
@@ -1119,7 +1134,7 @@ int ha_myisammrg::index_read_idx_map(uchar * buf, uint index, const uchar * key,
                                      key_part_map keypart_map,
                                      enum ha_rkey_function find_flag)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=myrg_rkey(file,buf,index, key, keypart_map, find_flag);
@@ -1131,7 +1146,7 @@ int ha_myisammrg::index_read_idx_map(uchar * buf, uint index, const uchar * key,
 int ha_myisammrg::index_read_last_map(uchar *buf, const uchar *key,
                                       key_part_map keypart_map)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error=myrg_rkey(file,buf,active_index, key, keypart_map,
@@ -1143,7 +1158,7 @@ int ha_myisammrg::index_read_last_map(uchar *buf, const uchar *key,
 
 int ha_myisammrg::index_next(uchar * buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_next_count);
   int error=myrg_rnext(file,buf,active_index);
@@ -1154,7 +1169,7 @@ int ha_myisammrg::index_next(uchar * buf)
 
 int ha_myisammrg::index_prev(uchar * buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_prev_count);
   int error=myrg_rprev(file,buf, active_index);
@@ -1165,7 +1180,7 @@ int ha_myisammrg::index_prev(uchar * buf)
 
 int ha_myisammrg::index_first(uchar * buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_first_count);
   int error=myrg_rfirst(file, buf, active_index);
@@ -1176,7 +1191,7 @@ int ha_myisammrg::index_first(uchar * buf)
 
 int ha_myisammrg::index_last(uchar * buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_last_count);
   int error=myrg_rlast(file, buf, active_index);
@@ -1190,7 +1205,7 @@ int ha_myisammrg::index_next_same(uchar * buf,
                                   uint length MY_ATTRIBUTE((unused)))
 {
   int error;
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_INDEX_READ_ROW_START(table_share->db.str, table_share->table_name.str);
   ha_statistic_increment(&SSV::ha_read_next_count);
   do
@@ -1205,14 +1220,14 @@ int ha_myisammrg::index_next_same(uchar * buf,
 
 int ha_myisammrg::rnd_init(bool scan)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   return myrg_reset(file);
 }
 
 
 int ha_myisammrg::rnd_next(uchar *buf)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_READ_ROW_START(table_share->db.str, table_share->table_name.str,
                        TRUE);
   ha_statistic_increment(&SSV::ha_read_rnd_next_count);
@@ -1225,7 +1240,7 @@ int ha_myisammrg::rnd_next(uchar *buf)
 
 int ha_myisammrg::rnd_pos(uchar * buf, uchar *pos)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   MYSQL_READ_ROW_START(table_share->db.str, table_share->table_name.str,
                        TRUE);
   ha_statistic_increment(&SSV::ha_read_rnd_count);
@@ -1237,7 +1252,7 @@ int ha_myisammrg::rnd_pos(uchar * buf, uchar *pos)
 
 void ha_myisammrg::position(const uchar *record)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   ulonglong row_position= myrg_position(file);
   my_store_ptr(ref, ref_length, (my_off_t) row_position);
 }
@@ -1246,7 +1261,7 @@ void ha_myisammrg::position(const uchar *record)
 ha_rows ha_myisammrg::records_in_range(uint inx, key_range *min_key,
                                        key_range *max_key)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   return (ha_rows) myrg_records_in_range(file, (int) inx, min_key, max_key);
 }
 
@@ -1270,7 +1285,7 @@ int ha_myisammrg::truncate()
 int ha_myisammrg::info(uint flag)
 {
   MYMERGE_INFO mrg_info;
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   (void) myrg_status(file,&mrg_info,flag);
   /*
     The following fails if one has not compiled MySQL with -DBIG_TABLES
@@ -1391,7 +1406,7 @@ int ha_myisammrg::reset(void)
 
 int ha_myisammrg::extra_opt(enum ha_extra_function operation, ulong cache_size)
 {
-  DBUG_ASSERT(this->file->children_attached);
+  assert(this->file->children_attached);
   return myrg_extra(file, operation, (void*) &cache_size);
 }
 
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index 2f91986d1f47..cdc51e19b4c7 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -99,7 +106,9 @@ class ha_myisammrg: public handler
   }
   uint max_supported_keys()          const { return MI_MAX_KEY; }
   uint max_supported_key_length()    const { return MI_MAX_KEY_LENGTH; }
-  uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
+  uint max_supported_key_part_length(HA_CREATE_INFO
+                    *create_info MY_ATTRIBUTE((unused))) const
+  { return MI_MAX_KEY_LENGTH; }
   double scan_time()
   { return ulonglong2double(stats.data_file_length) / IO_SIZE + file->tables; }
 
diff --git a/storage/myisammrg/myrg_close.c b/storage/myisammrg/myrg_close.c
index f9b24e4f88a9..43e91cc2fd1b 100644
--- a/storage/myisammrg/myrg_close.c
+++ b/storage/myisammrg/myrg_close.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_create.c b/storage/myisammrg/myrg_create.c
index 1fff451e97df..87feada3ae13 100644
--- a/storage/myisammrg/myrg_create.c
+++ b/storage/myisammrg/myrg_create.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_def.h b/storage/myisammrg/myrg_def.h
index cae4bcaf7a21..3ec6686a60b9 100644
--- a/storage/myisammrg/myrg_def.h
+++ b/storage/myisammrg/myrg_def.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_delete.c b/storage/myisammrg/myrg_delete.c
index 231b758cea91..274cfe166652 100644
--- a/storage/myisammrg/myrg_delete.c
+++ b/storage/myisammrg/myrg_delete.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_extra.c b/storage/myisammrg/myrg_extra.c
index 18cc66cf9372..3d87511f9eb2 100644
--- a/storage/myisammrg/myrg_extra.c
+++ b/storage/myisammrg/myrg_extra.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000-2003, 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_info.c b/storage/myisammrg/myrg_info.c
index be194a03a9d4..fd799dd140a7 100644
--- a/storage/myisammrg/myrg_info.c
+++ b/storage/myisammrg/myrg_info.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2001, 2005, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c
index c709179addc4..6c744373fcae 100644
--- a/storage/myisammrg/myrg_locking.c
+++ b/storage/myisammrg/myrg_locking.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c
index be159f935127..fe40be3ec3e4 100644
--- a/storage/myisammrg/myrg_open.c
+++ b/storage/myisammrg/myrg_open.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -110,7 +117,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
                                            key_parts*sizeof(long),
                                            MYF(MY_WME|MY_ZEROFILL))))
         goto err;
-      DBUG_ASSERT(files);
+      assert(files);
       m_info->open_tables=(MYRG_TABLE *) (m_info+1);
       m_info->rec_per_key_part=(ulong *) (m_info->open_tables+files);
       m_info->tables= files;
diff --git a/storage/myisammrg/myrg_panic.c b/storage/myisammrg/myrg_panic.c
index 4ced5f77d193..35730d0414c8 100644
--- a/storage/myisammrg/myrg_panic.c
+++ b/storage/myisammrg/myrg_panic.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_queue.c b/storage/myisammrg/myrg_queue.c
index 658409d31558..0c6c4d0f0060 100644
--- a/storage/myisammrg/myrg_queue.c
+++ b/storage/myisammrg/myrg_queue.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -73,7 +80,7 @@ int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag)
       this branch with underlying table that has less keys than merge table
       have.
     */
-    DBUG_ASSERT(!info->tables);
+    assert(!info->tables);
     error= HA_ERR_END_OF_FILE;
     set_my_errno(error);
   }
diff --git a/storage/myisammrg/myrg_range.c b/storage/myisammrg/myrg_range.c
index 62f5ba981f28..93be5b397558 100644
--- a/storage/myisammrg/myrg_range.c
+++ b/storage/myisammrg/myrg_range.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2004-2006 MySQL AB
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_records.c b/storage/myisammrg/myrg_records.c
index a08f34f5347d..f70ce3364c29 100644
--- a/storage/myisammrg/myrg_records.c
+++ b/storage/myisammrg/myrg_records.c
@@ -1,14 +1,21 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rfirst.c b/storage/myisammrg/myrg_rfirst.c
index f012b6b7daf4..dacdf5965e5b 100644
--- a/storage/myisammrg/myrg_rfirst.c
+++ b/storage/myisammrg/myrg_rfirst.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rkey.c b/storage/myisammrg/myrg_rkey.c
index 1b772c682aa3..ba824b99b7c9 100644
--- a/storage/myisammrg/myrg_rkey.c
+++ b/storage/myisammrg/myrg_rkey.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rlast.c b/storage/myisammrg/myrg_rlast.c
index 3084400e2f20..f3d2e4347565 100644
--- a/storage/myisammrg/myrg_rlast.c
+++ b/storage/myisammrg/myrg_rlast.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rnext.c b/storage/myisammrg/myrg_rnext.c
index ddffdeb841be..e66c0325b74a 100644
--- a/storage/myisammrg/myrg_rnext.c
+++ b/storage/myisammrg/myrg_rnext.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000-2003, 2005-2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rnext_same.c b/storage/myisammrg/myrg_rnext_same.c
index 9425df5bf40a..5da5742e8633 100644
--- a/storage/myisammrg/myrg_rnext_same.c
+++ b/storage/myisammrg/myrg_rnext_same.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2002, 2004-2007 MySQL AB
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rprev.c b/storage/myisammrg/myrg_rprev.c
index 69f5fd0ddcbc..5e34b03718e6 100644
--- a/storage/myisammrg/myrg_rprev.c
+++ b/storage/myisammrg/myrg_rprev.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000-2003, 2005-2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rrnd.c b/storage/myisammrg/myrg_rrnd.c
index 7fbf78369bd8..5397d592bb7e 100644
--- a/storage/myisammrg/myrg_rrnd.c
+++ b/storage/myisammrg/myrg_rrnd.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_rsame.c b/storage/myisammrg/myrg_rsame.c
index c8ba626d00a4..9ff31db65577 100644
--- a/storage/myisammrg/myrg_rsame.c
+++ b/storage/myisammrg/myrg_rsame.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_static.c b/storage/myisammrg/myrg_static.c
index 67163ff37a27..1c92a75d84a6 100644
--- a/storage/myisammrg/myrg_static.c
+++ b/storage/myisammrg/myrg_static.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_update.c b/storage/myisammrg/myrg_update.c
index 4485a96a1316..a4c6e3a23a98 100644
--- a/storage/myisammrg/myrg_update.c
+++ b/storage/myisammrg/myrg_update.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/myisammrg/myrg_write.c b/storage/myisammrg/myrg_write.c
index 8ef1707cbc4f..3a67f07b44a2 100644
--- a/storage/myisammrg/myrg_write.c
+++ b/storage/myisammrg/myrg_write.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/CMakeLists.txt b/storage/ndb/CMakeLists.txt
index 871774372645..4a2fcce3cb05 100644
--- a/storage/ndb/CMakeLists.txt
+++ b/storage/ndb/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -64,7 +71,23 @@ ENDIF()
 # if the compiler supports the flag
 IF(CMAKE_COMPILER_IS_GNUCXX)
   INCLUDE(CheckCXXCompilerFlag)
-  FOREACH(warning "unused-but-set-variable" "strict-aliasing")
+
+  FOREACH(warning
+      "class-memaccess"
+      )
+    STRING(REPLACE "-" "_" warning_ ${warning})
+    STRING(TOUPPER ${warning_} WARNING)
+    CHECK_CXX_COMPILER_FLAG("-Wno-${warning}" HAVE_${WARNING})
+    IF(HAVE_${WARNING})
+      MESSAGE(STATUS "Disabling -W${warning} warning for building NDB")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${warning}")
+    ENDIF()
+  ENDFOREACH()
+
+  FOREACH(warning
+      "strict-aliasing"
+      "unused-but-set-variable"
+      )
     STRING(REPLACE "-" "_" warning_ ${warning})
     STRING(TOUPPER ${warning_} WARNING)
     CHECK_CXX_COMPILER_FLAG("-Wno-${warning}" HAVE_${WARNING})
@@ -185,7 +208,6 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/include
 
   # Util library includes
-  ${ZLIB_INCLUDE_DIR}
   ${EDITLINE_INCLUDE_DIR})
 
 # The root of storage/ndb/
diff --git a/storage/ndb/clusterj/CMakeLists.txt b/storage/ndb/clusterj/CMakeLists.txt
index 4c8431ab275f..da3b5c630d39 100644
--- a/storage/ndb/clusterj/CMakeLists.txt
+++ b/storage/ndb/clusterj/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/CMakeLists.txt b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt
index 2a51c3a75221..006bd7c78c24 100644
--- a/storage/ndb/clusterj/clusterj-api/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/pom.xml.in b/storage/ndb/clusterj/clusterj-api/pom.xml.in
index bc14ca6a8164..de247c1c588d 100644
--- a/storage/ndb/clusterj/clusterj-api/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-api/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJDatastoreException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJDatastoreException.java
index b12fdf55b25f..0a70173dccb0 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJDatastoreException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJDatastoreException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJException.java
index 9afd8e630999..05f40f739beb 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJException.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalException.java
index ebff7c4aff4e..4dc86bac3dfd 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalInternalException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalInternalException.java
index 9477e6a8ed94..1e39279983d8 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalInternalException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalInternalException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalUserException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalUserException.java
index 506275381ac7..5dbddb71d6bf 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalUserException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJFatalUserException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJHelper.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJHelper.java
index 82255dc58cad..5d8d8ec3f7f8 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJHelper.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJHelper.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJUserException.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJUserException.java
index 131a8eadd3fa..449c627d5560 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJUserException.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ClusterJUserException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnMetadata.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnMetadata.java
index 70927aae687a..839bcf669efa 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnMetadata.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnMetadata.java
@@ -1,14 +1,21 @@
 /*
-   Copyright 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnType.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnType.java
index 4e22cb280c95..4b43cdbbb1ed 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnType.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/ColumnType.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Constants.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Constants.java
index d7102c834730..a3aa5101833e 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Constants.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Constants.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Dbug.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Dbug.java
index e9651140faa7..0d1fb49c2ec7 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Dbug.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Dbug.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObject.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObject.java
index 6f2abce377d0..3c75bd5b134d 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObject.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObject.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObjectDelegate.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObjectDelegate.java
index 0c0e3ec63768..6f7036555281 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObjectDelegate.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObjectDelegate.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/LockMode.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/LockMode.java
index da87fbf585c1..7fe52bd4e2e0 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/LockMode.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/LockMode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.java
index c5c8e290958f..2bcefdcc9018 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Query.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Results.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Results.java
index 71995bc648a0..9f541cab420d 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Results.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Results.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Session.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Session.java
index 1e100ea95a5f..7bd3108f564d 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Session.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Session.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactory.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactory.java
index f1ca7c3001c8..010e52aedd6c 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactory.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactory.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactoryService.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactoryService.java
index b66358f3ad00..edcfdc293e1f 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactoryService.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/SessionFactoryService.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Transaction.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Transaction.java
index 71d096beb050..c5293ed6b48b 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Transaction.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/Transaction.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Column.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Column.java
index 501d3e32183b..14d12d063289 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Column.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Column.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Columns.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Columns.java
index e40bd8b0940a..18a47b9bb877 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Columns.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Columns.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extension.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extension.java
index 26da86adf6d7..ca7648c56519 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extension.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extension.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extensions.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extensions.java
index ec96c00f9b2b..a1ab65d0e7a5 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extensions.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Extensions.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Index.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Index.java
index d5db48ac4d62..2a92feb174fa 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Index.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Index.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Indices.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Indices.java
index 14c157b4293d..14692f7babc8 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Indices.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Indices.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Lob.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Lob.java
index 0e44332f01fa..cbd2b5bd92a7 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Lob.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Lob.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NotPersistent.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NotPersistent.java
index 062ae133b964..1995648a690f 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NotPersistent.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NotPersistent.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NullValue.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NullValue.java
index bf36f6bf2d6e..a27017013982 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NullValue.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/NullValue.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PartitionKey.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PartitionKey.java
index 1cf836aaebc0..225ec1bc184b 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PartitionKey.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PartitionKey.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceCapable.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceCapable.java
index 3f7d3b4db91e..c01b18d33ffe 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceCapable.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceCapable.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceModifier.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceModifier.java
index 90963f4e873d..f35beb3ee3ce 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceModifier.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PersistenceModifier.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Persistent.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Persistent.java
index ba80e0812aaa..a0faa17b9e34 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Persistent.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/Persistent.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PrimaryKey.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PrimaryKey.java
index c1ce14529b77..b2a58e607b92 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PrimaryKey.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/PrimaryKey.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/package.html b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/package.html
index caa4d03039be..404fbc3e4117 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/package.html
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/annotation/package.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/package.html b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/package.html
index 38e9a33c3aad..133cbffe6502 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/package.html
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/package.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/Predicate.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/Predicate.java
index aa8edbb48ace..f6c794a81011 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/Predicate.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/Predicate.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/PredicateOperand.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/PredicateOperand.java
index 4833412f210d..381081fe19e3 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/PredicateOperand.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/PredicateOperand.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryBuilder.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryBuilder.java
index e2281b7f1809..70d7e3c23456 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryBuilder.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryBuilder.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDefinition.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDefinition.java
index b9327b51834c..bc5764423b08 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDefinition.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDefinition.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDomainType.java b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDomainType.java
index 41778a2ab0a3..9736cf20b939 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDomainType.java
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/QueryDomainType.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/package.html b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/package.html
index fd0cc0fdc3d4..efa5c7c4541d 100644
--- a/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/package.html
+++ b/storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/query/package.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/BlobImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/BlobImpl.java
index f9d5ab91490c..226f13b89fd1 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/BlobImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/BlobImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionImpl.java
index 2299d90c1812..dd5b553b47eb 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionServiceImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionServiceImpl.java
index 749143e297c5..d4889e8cc195 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionServiceImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterConnectionServiceImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterTransactionImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterTransactionImpl.java
index c1c096a48562..e163ddf567c5 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterTransactionImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ClusterTransactionImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ColumnImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ColumnImpl.java
index b7c6d496905a..6e9db244f978 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ColumnImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ColumnImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DbImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DbImpl.java
index c797c0862ec5..86ead7a238c0 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DbImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DbImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DictionaryImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DictionaryImpl.java
index 277688840353..7c79dc739e2f 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DictionaryImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/DictionaryImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexImpl.java
index f1793d634a09..d20375707e31 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexOperationImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexOperationImpl.java
index e206ef19e0ea..3c8304624994 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexOperationImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexScanOperationImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexScanOperationImpl.java
index 656a35fb0490..ad04a73cb834 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/IndexScanOperationImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/OperationImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/OperationImpl.java
index d34a877d2355..fd0da4c5edc2 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/OperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/OperationImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ResultDataImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ResultDataImpl.java
index 4a09bad84d8b..fbfe926c7e1a 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ResultDataImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ResultDataImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanFilterImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanFilterImpl.java
index d47d2bc1a46a..5da0150b6ca4 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanFilterImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanFilterImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanOperationImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanOperationImpl.java
index a3599fa4f1b3..f6cc78da5633 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/ScanOperationImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/TableImpl.java b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/TableImpl.java
index 905ad3e51e25..84c5b1459f5f 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/TableImpl.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/java/com/mysql/clusterj/bindings/TableImpl.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/main/resources/com/mysql/clusterj/bindings/Bundle.properties b/storage/ndb/clusterj/clusterj-bindings/src/main/resources/com/mysql/clusterj/bindings/Bundle.properties
index 9294532a6765..b1f9aca6ff2a 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/main/resources/com/mysql/clusterj/bindings/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-bindings/src/main/resources/com/mysql/clusterj/bindings/Bundle.properties
@@ -1,14 +1,21 @@
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/AutoCommitTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/AutoCommitTest.java
index 47cb07feeba1..165fd94118e4 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/AutoCommitTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/AutoCommitTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BinaryTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BinaryTypesTest.java
index d35997c80fa4..0d65ce90ea24 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BinaryTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BinaryTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BlobTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BlobTest.java
index 34439df72b63..d3ef17f6d513 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BlobTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/BlobTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/CharsetTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/CharsetTest.java
index b797b89b8e49..d792f82b3a37 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/CharsetTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/CharsetTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DateTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DateTypesTest.java
index 42315df2858a..9982d48d1b24 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DatetimeTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DatetimeTypesTest.java
index 9333daf0e367..7440d26090cc 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DatetimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DatetimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DecimalTypesTest.java
index ab1d08e1d1b5..dbb92d3f371a 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteAllByClassTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteAllByClassTest.java
index 05905efe0868..a02034516c57 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteAllByClassTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteAllByClassTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteInsertTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteInsertTest.java
index 49f55bc71d2e..9035f65e95b4 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteInsertTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DeleteInsertTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DomainTypeHandlerFactoryTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DomainTypeHandlerFactoryTest.java
index 6ce01227987d..6269a9fc0f98 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DomainTypeHandlerFactoryTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/DomainTypeHandlerFactoryTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/FindByPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/FindByPrimaryKeyTest.java
index 5ffa0e829076..17544a1c8bd6 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/FindByPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/FindByPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/LongLongStringPKTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/LongLongStringPKTest.java
index 4eb55c8d0366..a9df22a67856 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/LongLongStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/LongLongStringPKTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/MultiplePKTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/MultiplePKTest.java
index 533a7359e853..a35805f122da 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/MultiplePKTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/MultiplePKTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NegativeMetadataTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NegativeMetadataTest.java
index d40ca2f03f9b..893c6fbd2b53 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NegativeMetadataTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NegativeMetadataTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NotPersistentTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NotPersistentTest.java
index e8c217e5f7bb..e2c11f0d6a9e 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NotPersistentTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NotPersistentTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NullValuesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NullValuesTest.java
index 2a690095bc4d..d4a71550986c 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NullValuesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/NullValuesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/ObjectNotFoundTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/ObjectNotFoundTest.java
index fd9853d7da83..a4d722487021 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/ObjectNotFoundTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/ObjectNotFoundTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryAllPrimitivesTest.java
index e36ce4981c4d..4e9cef2792a1 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryAllPrimitivesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryBtreeIndexScanTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryBtreeIndexScanTest.java
index d1e3d2af0823..fd03471a8154 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryBtreeIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryBtreeIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryByteArrayTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryByteArrayTypesTest.java
index 7f21089e8d09..1af0211cbf59 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryByteArrayTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryByteArrayTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTimeTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTimeTypesTest.java
index 79653d21eb81..b77c53962803 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTypesTest.java
index 57f1c609f1d1..5427a6ae516e 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDecimalTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDecimalTypesTest.java
index f989c31783c8..8e80f7c70968 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDoubleTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDoubleTypesTest.java
index 981d492ec088..142185d53c28 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDoubleTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryDoubleTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryFloatTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryFloatTypesTest.java
index c7ca8871012f..14e4c36871e0 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryFloatTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryFloatTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryHashIndexScanTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryHashIndexScanTest.java
index 7fb02abd0ac6..fa1749272876 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryHashIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryHashIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryPrimaryKeyTest.java
index a54507954b40..cdf8f9f289a9 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTableScanTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTableScanTest.java
index 90739becfb5d..3d6ec2e1475d 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTableScanTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTableScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimeTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimeTypesTest.java
index 17ef51381f72..27fede1cea46 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimestampTypesTest.java
index e85a44f9c308..e961453b5bcb 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryUniqueKeyTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryUniqueKeyTest.java
index f835c84d25be..3fbf6d963ec5 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryUniqueKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryUniqueKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryYearTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryYearTypesTest.java
index 1905914a0ee5..eb3d56c433eb 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryYearTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/QueryYearTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SaveTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SaveTest.java
index a4232a15ad80..0f6e844df553 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SaveTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SaveTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SerialTransactionsTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SerialTransactionsTest.java
index 8f920d94b64b..27efaf545f24 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SerialTransactionsTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/SerialTransactionsTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimeTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimeTypesTest.java
index 07483d30e7be..4e98ee75428a 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimestampTypesTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimestampTypesTest.java
index 517c7f496a61..5ab242d06121 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TransactionStateTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TransactionStateTest.java
index a329390f08f9..414b643ef2ee 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TransactionStateTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/TransactionStateTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/UpdateTest.java b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/UpdateTest.java
index cb3fe8ee91ed..fda8794f7373 100644
--- a/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/UpdateTest.java
+++ b/storage/ndb/clusterj/clusterj-bindings/src/test/java/testsuite/clusterj/bindings/UpdateTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/CMakeLists.txt b/storage/ndb/clusterj/clusterj-core/CMakeLists.txt
index d3e4b81ffaa8..428fb067f426 100644
--- a/storage/ndb/clusterj/clusterj-core/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-core/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/pom.xml.in b/storage/ndb/clusterj/clusterj-core/pom.xml.in
index 638df4b59f11..d721cff32317 100644
--- a/storage/ndb/clusterj/clusterj-core/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-core/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/CacheManager.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/CacheManager.java
index 82474a294f69..461e5ef9c42a 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/CacheManager.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/CacheManager.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java
index af0ee27cf9cd..000a193337ea 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryServiceImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryServiceImpl.java
index a64c4d397941..48c930455c7d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryServiceImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryServiceImpl.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
index 879c1b96085c..9bc805d9c2b0 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StateManager.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StateManager.java
index 5c5a976c65b8..afa1f946ccf4 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StateManager.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StateManager.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StoreManager.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StoreManager.java
index d1dfc1daa4a1..0dc8c72e2bb4 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StoreManager.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/StoreManager.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/TransactionImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/TransactionImpl.java
index 18b8b17f6a82..365eb7f16910 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/TransactionImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/TransactionImpl.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java
index 54268d1e098f..d94db4d5fb0d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainFieldHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java
index 479733f3be5f..58040ef1c5e5 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/AbstractDomainTypeHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java
index 1e72096d39cb..36df1b8a0062 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainFieldHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java
index 703cd4b52ba7..ef541ddd6918 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerFactoryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
index 63a70ba2b1e0..27665185c597 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/IndexHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/IndexHandlerImpl.java
index f03067c3bb69..6286085b715c 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/IndexHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/IndexHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java
index ff0e69e9b931..2ece9e033364 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/InvocationHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java
index 89f6f1bdf807..ab38425b8cd8 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/KeyValueHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/AndPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/AndPredicateImpl.java
index 7d8b99cab204..6c235322c720 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/AndPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/AndPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/BetweenPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/BetweenPredicateImpl.java
index 43ade6f18a0a..ad9fcd546190 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/BetweenPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/BetweenPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/CandidateIndexImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/CandidateIndexImpl.java
index 2d3242095d3c..af2c6b23a3f5 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/CandidateIndexImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/CandidateIndexImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ComparativePredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ComparativePredicateImpl.java
index 285692d36efe..ba330317082a 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ComparativePredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ComparativePredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/EqualPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/EqualPredicateImpl.java
index 1aae71c4defa..ef255d3bd142 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/EqualPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/EqualPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java
index 98baf6bc8d61..fce233d2c189 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterEqualPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java
index 994c50fad256..88d8fef0ad6d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/GreaterThanPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/InPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/InPredicateImpl.java
index c944d397af13..bec34b3c39d9 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/InPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/InPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNotNullPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNotNullPredicateImpl.java
index 0c3fbf4b7baa..fafc39742501 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNotNullPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNotNullPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNullPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNullPredicateImpl.java
index ea84fbbe3469..27c36783a419 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNullPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/IsNullPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java
index dbaedb128c4b..d8c175f91bcc 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessEqualPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessThanPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessThanPredicateImpl.java
index 67a35660211c..990367d43444 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessThanPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LessThanPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java
index 78185aa3685d..b662937775ec 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/NotPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/NotPredicateImpl.java
index aae380e5fd8e..4121a0b1908e 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/NotPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/NotPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/OrPredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/OrPredicateImpl.java
index ada474c6202b..112805bf40f4 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/OrPredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/OrPredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ParameterImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ParameterImpl.java
index 472fbb5f82ff..3e32ce11b423 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ParameterImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/ParameterImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PredicateImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PredicateImpl.java
index e1920df20149..029ac8fb2acc 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PredicateImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PredicateImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java
index 09e8c3c27d5a..3f7b15f62d83 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryBuilderImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryBuilderImpl.java
index 60be4cd9ab08..e889cfa9df22 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryBuilderImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryBuilderImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java
index e214b8903ad3..006a1fefbe76 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryDomainTypeImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java
index 9db3c82d41d6..0621a545ab1d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryExecutionContextImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryImpl.java
index 81ecd7e862d2..330e3db4b4bb 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/QueryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainFieldHandler.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainFieldHandler.java
index 84eaae3041e3..4d294973ac30 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainFieldHandler.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainFieldHandler.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandler.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandler.java
index a4d178407531..97707e1bfd0d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandler.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandler.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandlerFactory.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandlerFactory.java
index a8ec783183d6..3b40304f91b0 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandlerFactory.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/DomainTypeHandlerFactory.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/QueryExecutionContext.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/QueryExecutionContext.java
index 1c8d59a6e99f..02972e80faad 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/QueryExecutionContext.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/QueryExecutionContext.java
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 package com.mysql.clusterj.core.spi;
 
 import java.math.BigDecimal;
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java
index 8016e78f2ee5..411113d84e70 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SessionSPI.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java
index 7996c10f5a27..d00c70690d91 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/SmartValueHandler.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandler.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandler.java
index fcb2386942bd..fb1813e86c68 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandler.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandler.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerBatching.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerBatching.java
index a28de6926be9..48141f2c3644 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerBatching.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerBatching.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java
index fd8cb84fd950..d419c9528fbe 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/spi/ValueHandlerFactory.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Blob.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Blob.java
index 12bf8ab910cd..990b9c2f789f 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Blob.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Blob.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnection.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnection.java
index b8f41c534bd1..9e064fc999fa 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnection.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnection.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnectionService.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnectionService.java
index 43753d3ae848..3947eeb52b57 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnectionService.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterConnectionService.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterTransaction.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterTransaction.java
index 6f5ce2abb5e1..531971262631 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterTransaction.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ClusterTransaction.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Column.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Column.java
index 42370b73528c..cb5bad7eac85 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Column.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Column.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Db.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Db.java
index a3c6f16d54de..12a955ecd62d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Db.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Db.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Dictionary.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Dictionary.java
index 69d54a720d6e..d9abd0c81dfc 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Dictionary.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Dictionary.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Index.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Index.java
index ed9cbe24c3be..88c42b399445 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Index.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Index.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexOperation.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexOperation.java
index 89eaa41533e9..60aaa21f9ec0 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexOperation.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexOperation.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexScanOperation.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexScanOperation.java
index 2f6b69c21788..9bc4afacc6b7 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexScanOperation.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/IndexScanOperation.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Operation.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Operation.java
index a4476cf7b91f..ca2a11bec4d3 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Operation.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Operation.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/PartitionKey.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/PartitionKey.java
index 90d9b32bfeec..50e156bd1f2c 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/PartitionKey.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/PartitionKey.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ResultData.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ResultData.java
index e4e443ca19e0..9a615a8ac238 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ResultData.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ResultData.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanFilter.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanFilter.java
index 3a2c8fc9d292..c61f5499fef1 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanFilter.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanFilter.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanOperation.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanOperation.java
index f45c7ebaa8af..9622dfe364e6 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanOperation.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/ScanOperation.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Table.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Table.java
index cf6f594d2bec..3454f889e261 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Table.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/store/Table.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/I18NHelper.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/I18NHelper.java
index 5625deee2e04..7767c5c66f6e 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/I18NHelper.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/I18NHelper.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerFactoryImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerFactoryImpl.java
index d460d7f9e4eb..3b28b913d56d 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerFactoryImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerFactoryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerImpl.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerImpl.java
index 833acfacca2e..8c594c4c8630 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerImpl.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/JDK14LoggerImpl.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/Logger.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/Logger.java
index a9412198437a..8bbdc5bbac58 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/Logger.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/Logger.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactory.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactory.java
index db7a4aa9da6d..0c713c1edc20 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactory.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactory.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactoryService.java b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactoryService.java
index cfd01790f2b2..44c7ec7d1405 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactoryService.java
+++ b/storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/util/LoggerFactoryService.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties b/storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
index 0fab8d7b8fa2..2ea321813ba1 100644
--- a/storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/AbstractClusterJCoreTest.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/AbstractClusterJCoreTest.java
index 2d9d03d6cee1..ca52b1e66c39 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/AbstractClusterJCoreTest.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/AbstractClusterJCoreTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/NegativeClusterConnectionServicePropertyTest.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/NegativeClusterConnectionServicePropertyTest.java
index 221335e3a62f..9b3519e1b89e 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/NegativeClusterConnectionServicePropertyTest.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/NegativeClusterConnectionServicePropertyTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/DoesNotImplementClusterConnectionService.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/DoesNotImplementClusterConnectionService.java
index 1f7583b89faf..0a5285ca13a1 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/DoesNotImplementClusterConnectionService.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/DoesNotImplementClusterConnectionService.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/I18NTest.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/I18NTest.java
index 926ae6109d81..1d876a54098a 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/I18NTest.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/I18NTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/LoggerTest.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/LoggerTest.java
index dfa67b81c396..292bda283bc5 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/LoggerTest.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/LoggerTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/NoPublicConstructorClusterConnectionService.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/NoPublicConstructorClusterConnectionService.java
index 69bde5a0efc5..c625f6858c9e 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/NoPublicConstructorClusterConnectionService.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/NoPublicConstructorClusterConnectionService.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/deeper/I18NDeeperTest.java b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/deeper/I18NDeeperTest.java
index dedc12a65e04..d9a5b74b65db 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/deeper/I18NDeeperTest.java
+++ b/storage/ndb/clusterj/clusterj-core/src/test/java/testsuite/clusterj/util/deeper/I18NDeeperTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-core/src/test/resources/testsuite/clusterj/util/Bundle.properties b/storage/ndb/clusterj/clusterj-core/src/test/resources/testsuite/clusterj/util/Bundle.properties
index f8897c93c6da..a973cfd654ae 100644
--- a/storage/ndb/clusterj/clusterj-core/src/test/resources/testsuite/clusterj/util/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-core/src/test/resources/testsuite/clusterj/util/Bundle.properties
@@ -1,14 +1,21 @@
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/pom.xml.in b/storage/ndb/clusterj/clusterj-jdbc/pom.xml.in
index 3e15602d6de4..8eaab7f22c70 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-jdbc/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g
index 007ec59e7b68..1a3a8009dc0a 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Lexer.g
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2008, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g
index fa1ce4889618..24a421c4990e 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/com/mysql/clusterj/jdbc/antlr/MySQL51Parser.g
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2008, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g
index b616c8619261..f998b4827bb9 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/antlr3/imports/MySQL51Functions.g
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java
index 764f59752ce0..c399190e1560 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ConnectionLifecycleInterceptor.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ConnectionLifecycleInterceptor.java
index ee059bbf59cf..46d0aae4fea6 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ConnectionLifecycleInterceptor.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ConnectionLifecycleInterceptor.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainFieldHandlerImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainFieldHandlerImpl.java
index 59ce71225571..ac7ec421bd33 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainFieldHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainFieldHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java
index a1355f1983d9..87dade47cc46 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/InterceptorImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/InterceptorImpl.java
index ae754d92d9e0..71f67b3e6fa0 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/InterceptorImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/InterceptorImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java
index 1e9c37db67d1..028a63c79752 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/QueryExecutionContextJDBCImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java
index fd8f882a6102..7ea59a404a15 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java
index 61f5f3af43fc..32cdb5663d52 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ResultSetInternalMethodsUpdateCount.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java
index 97bb0fa2f234..b276e59ee9cd 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/SQLExecutor.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/StatementInterceptor.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/StatementInterceptor.java
index 9fe1d18c72bf..0b257cf9b621 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/StatementInterceptor.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/StatementInterceptor.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBatchingJDBCSetImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBatchingJDBCSetImpl.java
index 357cc8ff1056..5caa2a9733a7 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBatchingJDBCSetImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBatchingJDBCSetImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBindValuesImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBindValuesImpl.java
index 2fd69987f0a7..0ea51b1c5937 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBindValuesImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerBindValuesImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerImpl.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerImpl.java
index 7ac58401aea8..292e5b816a05 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/ValueHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseFileStream.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseFileStream.java
index ca5bbae5f2a2..536e3390575a 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseFileStream.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseFileStream.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseStringStream.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseStringStream.java
index e9261245f828..498a174144bb 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseStringStream.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ANTLRNoCaseStringStream.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/BaseErrorListener.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/BaseErrorListener.java
index 7f844619a8d8..15015ed39a33 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/BaseErrorListener.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/BaseErrorListener.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ErrorListener.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ErrorListener.java
index b249fcdfefd3..7988235014f4 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ErrorListener.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/ErrorListener.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLLexer.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLLexer.java
index 87a955e8588e..0993b35ec4c1 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLLexer.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLLexer.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLParser.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLParser.java
index 17a47d1d6910..5a13e1ce09d6 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLParser.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/MySQLParser.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/QueuingErrorListener.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/QueuingErrorListener.java
index 84b82226f1e5..98ac97c53695 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/QueuingErrorListener.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/QueuingErrorListener.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/RecognizerErrorDelegate.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/RecognizerErrorDelegate.java
index 8e623cb84720..14fc4acca409 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/RecognizerErrorDelegate.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/RecognizerErrorDelegate.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/AndNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/AndNode.java
index 7321d97dc7c6..514fa3110b6b 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/AndNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/AndNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BetweenNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BetweenNode.java
index 735cfb1c1675..35f8d53c6d93 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BetweenNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BetweenNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BinaryOperatorNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BinaryOperatorNode.java
index 3366fcb26372..906be6164304 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BinaryOperatorNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BinaryOperatorNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BooleanOperatorNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BooleanOperatorNode.java
index 496074d0d4d6..4a246a04beb8 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BooleanOperatorNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/BooleanOperatorNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/CommandNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/CommandNode.java
index 4bce801d6e59..e5850d657caa 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/CommandNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/CommandNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/DeleteNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/DeleteNode.java
index e9555795f070..7dcbfcc760f3 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/DeleteNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/DeleteNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/EqualsNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/EqualsNode.java
index af802fb3de5a..d06c1d4b358d 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/EqualsNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/EqualsNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterEqualsNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterEqualsNode.java
index 9617b076a0aa..16ff902088c4 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterEqualsNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterEqualsNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterThanNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterThanNode.java
index c2a01ea2c74c..beae2bae5663 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterThanNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/GreaterThanNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/InsertNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/InsertNode.java
index 02c077e69dab..59d36617e4d6 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/InsertNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/InsertNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessEqualsNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessEqualsNode.java
index f85af05dec81..47f52a7a28ad 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessEqualsNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessEqualsNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessThanNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessThanNode.java
index 9f53162a5a79..1b81472a09bb 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessThanNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/LessThanNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/Node.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/Node.java
index 1bc0cc3e4cd7..8660ad53d69c 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/Node.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/Node.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/NotNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/NotNode.java
index 8e8088889526..02e2f5b0659b 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/NotNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/NotNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/OrNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/OrNode.java
index 1f6d5e034afa..1375fba64979 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/OrNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/OrNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/ParensNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/ParensNode.java
index be83dae550d7..f07308ae4fb5 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/ParensNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/ParensNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PlaceholderNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PlaceholderNode.java
index 77e943cf4244..433ca16b6c91 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PlaceholderNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PlaceholderNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PredicateNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PredicateNode.java
index 93cae81966cc..9ae59d9a0cbe 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PredicateNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/PredicateNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/SelectNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/SelectNode.java
index 5b75536cc6df..a539f187c057 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/SelectNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/SelectNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/WhereNode.java b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/WhereNode.java
index 5acde9c59547..b181f25fa6d7 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/WhereNode.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/antlr/node/WhereNode.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties b/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties
index a1f06b190ee8..40aeaae9f286 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BadConnectionLifecycleInterceptor.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BadConnectionLifecycleInterceptor.java
index 51abfda51b99..7f445e4a50b9 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BadConnectionLifecycleInterceptor.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BadConnectionLifecycleInterceptor.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchDeleteQueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchDeleteQueryAllPrimitivesTest.java
index 317cd4e9cd09..132edb6afbbc 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchDeleteQueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchDeleteQueryAllPrimitivesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchTest.java
index be8ac9f93268..711b675f3dae 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BatchTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BigIntegerTypesTest.java
index 0ad811e23a62..8a35ab528b85 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/BigIntegerTypesTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/CoordinatedTransactionIdVariableTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/CoordinatedTransactionIdVariableTest.java
index 0a8e9e3f760f..dd1c4e30b869 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/CoordinatedTransactionIdVariableTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/CoordinatedTransactionIdVariableTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DecimalTypesTest.java
index f1cc48174156..49a728dcaad0 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DecimalTypesTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DeleteQueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DeleteQueryAllPrimitivesTest.java
index a92e9ad46b8e..54d6b3f1bbfc 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DeleteQueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/DeleteQueryAllPrimitivesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java
index 6e7f67e0a412..67b6c5fc803d 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/JDBCQueryTest.java
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 package jdbctest;
 
 import java.sql.Connection;
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeBadConnectionLifecycleInterceptorTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeBadConnectionLifecycleInterceptorTest.java
index 3e6a08764a43..52ca27d36e14 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeBadConnectionLifecycleInterceptorTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeBadConnectionLifecycleInterceptorTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingConnectionLifecycleInterceptorTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingConnectionLifecycleInterceptorTest.java
index 047afc91e98e..0fe1ad057b34 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingConnectionLifecycleInterceptorTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingConnectionLifecycleInterceptorTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingStatementInterceptorTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingStatementInterceptorTest.java
index fe4553cee40e..9b02d732633c 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingStatementInterceptorTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/NegativeMissingStatementInterceptorTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/UpdateDecimalTypesTest.java b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/UpdateDecimalTypesTest.java
index 71a7fa9d3261..78b6f230faf7 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/UpdateDecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/java/jdbctest/UpdateDecimalTypesTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-bad-connection-lifecycle-interceptor.properties b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-bad-connection-lifecycle-interceptor.properties
index 0db91ffd50d2..9c0be6cfeecb 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-bad-connection-lifecycle-interceptor.properties
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-bad-connection-lifecycle-interceptor.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-connection-lifecycle-interceptor.properties b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-connection-lifecycle-interceptor.properties
index 77ff1d5ed3eb..598049a99bf6 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-connection-lifecycle-interceptor.properties
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-connection-lifecycle-interceptor.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-statement-interceptor.properties b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-statement-interceptor.properties
index d09fba9b8c4e..7b8a5c31f442 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-statement-interceptor.properties
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/bad-connection-no-statement-interceptor.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/clusterj.properties b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/clusterj.properties
index 1fc10bdaaee3..e9b6554b18c7 100644
--- a/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/clusterj.properties
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/test/resources/clusterj.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
index 74a54da9a336..7421f2755acb 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/pom.xml.in b/storage/ndb/clusterj/clusterj-jpatest/pom.xml.in
index 0bad1753309d..b771988fda8d 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-jpatest/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/AbstractJPABaseTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/AbstractJPABaseTest.java
index 268259cc722b..7c1710402fa7 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/AbstractJPABaseTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/AbstractJPABaseTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BigIntegerTypesTest.java
index 9143e1f6a948..4db94ed622d7 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BlobTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BlobTest.java
index 606d3a748823..6cb3dc4b74a5 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BlobTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BlobTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BytePKTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BytePKTest.java
index 51bc288625c8..81325679521e 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BytePKTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/BytePKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ClobTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ClobTest.java
index a116a287d782..8da1da2a058a 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ClobTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ClobTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsSqlDateTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsSqlDateTest.java
index 9f25bb82887a..e5ff687978da 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsSqlDateTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsSqlDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsUtilDateTest.java
index 102a2dbcfad1..7f9252e24a65 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DateAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsSqlTimestampTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsSqlTimestampTest.java
index ccfb43e215af..3b895fcbd62f 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsSqlTimestampTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsSqlTimestampTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsUtilDateTest.java
index 7d9c9dc60f1d..97b65fc06de0 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DatetimeAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DecimalTypesTest.java
index dd1c13b83b75..db7e826a8ae3 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/DecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Driver.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Driver.java
index ad3211b0e39d..cd74e28ee81c 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Driver.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Driver.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/EmbeddedTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/EmbeddedTest.java
index 7973c67d7f86..9235c425fa5f 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/EmbeddedTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/EmbeddedTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Ignore.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Ignore.java
index f8488ab71cf4..13097a3fc982 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Ignore.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/Ignore.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/JpaLoad.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/JpaLoad.java
index 284503d292d0..e35e0dc15d06 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/JpaLoad.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/JpaLoad.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/LazyTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/LazyTest.java
index c54f371025ec..25809772f01b 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/LazyTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/LazyTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java
index 4223c208244d..6184101e80c0 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/PersistenceTestCase.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/QueryCacheTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/QueryCacheTest.java
index 521a7f85e14a..0f24222a4c9e 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/QueryCacheTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/QueryCacheTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ShortPKTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ShortPKTest.java
index 7237f459e40c..3a0fd0f20ef1 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ShortPKTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/ShortPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMFTestCase.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMFTestCase.java
index b0e50a98a6d6..b75c73fca5c4 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMFTestCase.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMFTestCase.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMTestCase.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMTestCase.java
index 11441153990e..275d8514f710 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMTestCase.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SingleEMTestCase.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SlowTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SlowTest.java
index dbfc89114da1..d4c9b7b0662d 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SlowTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/SlowTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsSqlTimeTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsSqlTimeTest.java
index a077f830819f..9772e5219cff 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsSqlTimeTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsSqlTimeTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsUtilDateTest.java
index 79cd6fec28a1..bac1866bf80b 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimeAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
index d1f676d507dd..e25645dcd95f 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java
index c52cd1963834..7e80122d162a 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/A.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/A.java
index 0516838ad68d..7cfbbb6eb5b1 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/A.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/A.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/B0.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/B0.java
index 0048b57e8b73..a4b0828c88b7 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/B0.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/B0.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BigIntegerTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BigIntegerTypes.java
index 7297e8d3777e..e2eea8151028 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BigIntegerTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BigIntegerTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BlobTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BlobTypes.java
index 9e3deef22525..68d638174224 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BlobTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BlobTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BytePK.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BytePK.java
index cd278dc98dde..fabb10949902 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BytePK.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/BytePK.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ClobTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ClobTypes.java
index c20715033e4a..3bb7192f3f9a 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ClobTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ClobTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsSqlDateTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsSqlDateTypes.java
index 0c84d7266781..82c8c483d5af 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsSqlDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsSqlDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsUtilDateTypes.java
index b49b349cf704..d7c7983dcf42 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DateAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsSqlTimestampTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsSqlTimestampTypes.java
index fcf00bbffd05..1c13a8599748 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsSqlTimestampTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsSqlTimestampTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsUtilDateTypes.java
index d2004ffc3ee7..424b9d31c145 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DatetimeAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DecimalTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DecimalTypes.java
index 7105e2abfaee..cd2ef0ce0faa 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DecimalTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/DecimalTypes.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedded.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedded.java
index a1212a887f06..69a6a3f182fb 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedded.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedded.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedding.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedding.java
index c471b28edc0e..bce1084a1c51 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedding.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Embedding.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Employee.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Employee.java
index 44c0649f7b26..266bae8bd95f 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Employee.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/Employee.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/IdBase.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/IdBase.java
index a10530a9e99c..74394eae8a42 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/IdBase.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/IdBase.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LazyEmployee.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LazyEmployee.java
index dd7d8490b578..a0e4c04b6417 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LazyEmployee.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LazyEmployee.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringConstants.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringConstants.java
index 236e4766d2a1..45dee68ba8e9 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringConstants.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringConstants.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java
index 0eca4956c789..da9a55e59c98 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringFKOneOne.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringOid.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringOid.java
index 9d2b86523223..eba4d578f57b 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringOid.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringOid.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java
index 1e79d699e1cf..a14e388c03a3 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongIntStringPKOneOne.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringConstants.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringConstants.java
index 96a126cef6f2..3e2ec91817bc 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringConstants.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringConstants.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringFKManyOne.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringFKManyOne.java
index cd58bc076192..1c43668a5ab0 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringFKManyOne.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringFKManyOne.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringOid.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringOid.java
index 250fac0c23b1..5b8d187f7571 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringOid.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringOid.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPK.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPK.java
index 6c05c86f4281..93c6b99452ea 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPK.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPK.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPKOneMany.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPKOneMany.java
index 4689fda2a182..b3ca2416273c 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPKOneMany.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/LongLongStringPKOneMany.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ShortPK.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ShortPK.java
index 4caae9a67dc5..789f76c934ba 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ShortPK.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/ShortPK.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsSqlTimeTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsSqlTimeTypes.java
index b35111b40486..d7c2c2a09270 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsSqlTimeTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsSqlTimeTypes.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsUtilDateTypes.java
index 196ea5c0ab45..ea8857083e09 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimeAsUtilDateTypes.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsSqlTimestampTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsSqlTimestampTypes.java
index 703740baa582..042eebf30365 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsSqlTimestampTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsSqlTimestampTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsUtilDateTypes.java
index dab646e092d5..3cf649e2ccc9 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/model/TimestampAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-jpatest/src/main/resources/META-INF/persistence.xml b/storage/ndb/clusterj/clusterj-jpatest/src/main/resources/META-INF/persistence.xml
index aaf9418d4483..6cd0e37e6267 100644
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/resources/META-INF/persistence.xml
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/resources/META-INF/persistence.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
index a05469f1bd02..daac90c270e0 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaClusterj.properties b/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaClusterj.properties
index 374fce9713ba..198423e5fef3 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaClusterj.properties
+++ b/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaClusterj.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaMysql.properties b/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaMysql.properties
index f41b453fc25d..b913a68f7ee2 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaMysql.properties
+++ b/storage/ndb/clusterj/clusterj-openjpa/crundOpenjpaMysql.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/crundRun.properties b/storage/ndb/clusterj/clusterj-openjpa/crundRun.properties
index 0bcd6bf1b2ff..ee05d790c4af 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/crundRun.properties
+++ b/storage/ndb/clusterj/clusterj-openjpa/crundRun.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/pom.xml.in b/storage/ndb/clusterj/clusterj-openjpa/pom.xml.in
index 7c8196a9654c..faafdae76a3e 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-openjpa/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPABrokerFactory.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPABrokerFactory.java
index e700962708d1..342ace8fa079 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPABrokerFactory.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPABrokerFactory.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfiguration.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfiguration.java
index 40cbdb2a6dbc..327da0b17e7c 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfiguration.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfiguration.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfigurationImpl.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfigurationImpl.java
index 2ebb33e1fab0..0fcf9c91bb4d 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfigurationImpl.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAConfigurationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java
index acac069e20e0..48b674ed14c0 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java
index 6e7c7c9bdf7c..3ac2c9a08cfb 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainTypeHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAProductDerivation.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAProductDerivation.java
index 0bc6e1c1b6ac..ceca04dbfde2 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAProductDerivation.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAProductDerivation.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAResult.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAResult.java
index 3e375021f658..f1c4c5ab18b9 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAResult.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAResult.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreManager.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreManager.java
index 9e2befeb7bba..0b3db5bdbb24 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreManager.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreManager.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreQuery.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreQuery.java
index fed4b75feb41..68647cc6088f 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreQuery.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAStoreQuery.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAUtility.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAUtility.java
index 6268a016d8af..e7d21447dd23 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAUtility.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAUtility.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAValueHandler.java b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAValueHandler.java
index 0e7bc6e86147..af4067c64090 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAValueHandler.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPAValueHandler.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/main/resources/com/mysql/clusterj/openjpa/Bundle.properties b/storage/ndb/clusterj/clusterj-openjpa/src/main/resources/com/mysql/clusterj/openjpa/Bundle.properties
index 052f89844cc3..68337eefc0b0 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/main/resources/com/mysql/clusterj/openjpa/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/main/resources/com/mysql/clusterj/openjpa/Bundle.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BasicTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BasicTest.java
index 16dc8e8ab3fe..d98d86e9d5df 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BasicTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BasicTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BigIntegerTypesTest.java
index 44718053cb1b..8b3041e4a257 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BlobTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BlobTest.java
index bd1e8523a99a..0b03fa07379e 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BlobTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BlobTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BytePKTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BytePKTest.java
index 5bc9bbd4391e..c57437228813 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BytePKTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/BytePKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ClobTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ClobTest.java
index 0c51cb80f895..90f9ee26770a 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ClobTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ClobTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/CrundTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/CrundTest.java
index 90c62c63ebe5..d4e276a21c37 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/CrundTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/CrundTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsSqlDateTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsSqlDateTest.java
index 3899e6f6292a..c98844f5fccf 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsSqlDateTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsSqlDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsUtilDateTest.java
index 9920c3da32d6..4352c16f33c3 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DateAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsSqlTimestampTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsSqlTimestampTest.java
index f216fa2d540a..f5c43f70ae2e 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsSqlTimestampTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsSqlTimestampTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsUtilDateTest.java
index 8b289661b461..15f2884e5143 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DatetimeAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DecimalTypesTest.java
index 1bed9a285b8c..057dabc1e5e9 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/DecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/EmbeddedTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/EmbeddedTest.java
index 886684ba52cc..b24d5f4719fd 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/EmbeddedTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/EmbeddedTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LazyTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LazyTest.java
index bef0bf97e484..0e5d4ede7b7f 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LazyTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LazyTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongIntStringPKOneOneTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongIntStringPKOneOneTest.java
index a56686b0d903..f8fb04ee1bf5 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongIntStringPKOneOneTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongIntStringPKOneOneTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKOneManyTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKOneManyTest.java
index 3540e67d2abd..e32710f662f9 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKOneManyTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKOneManyTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKTest.java
index 8bdc83dfc1dd..7cd1d2ca6a69 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/LongLongStringPKTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java
index 653a0e9816b4..2d1020301e38 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/OneToManyRelationshipTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/QueryCacheTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/QueryCacheTest.java
index 6eb67e86fba8..a51caa5e85dc 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/QueryCacheTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/QueryCacheTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ShortPKTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ShortPKTest.java
index 98ad17eabd8c..806f5f84186b 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ShortPKTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/ShortPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java
index 2c31ec287bfe..d6097b01f3be 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TestBadPersistenceUnitNoConnectString.java
@@ -1,16 +1,23 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *   All rights reserved. Use is subject to license terms.
  *  
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- * 
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
+ *  GNU General Public License, version 2.0, for more details.
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsSqlTimeTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsSqlTimeTest.java
index 2f10c94a3f9a..47b0a0697bb6 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsSqlTimeTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsSqlTimeTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsUtilDateTest.java
index 111b078bfc4b..f0f7bcc47b54 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimeAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsSqlTimestampTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsSqlTimestampTest.java
index 431fe8a1cc9e..1c0658397ad0 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsSqlTimestampTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsSqlTimestampTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsUtilDateTest.java b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsUtilDateTest.java
index a8cdaf6a5bf1..a49e31d2740d 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsUtilDateTest.java
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/java/com/mysql/clusterj/openjpatest/TimestampAsUtilDateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-openjpa/src/test/resources/META-INF/persistence.xml b/storage/ndb/clusterj/clusterj-openjpa/src/test/resources/META-INF/persistence.xml
index f4ae0fa7aba0..265f6f909238 100644
--- a/storage/ndb/clusterj/clusterj-openjpa/src/test/resources/META-INF/persistence.xml
+++ b/storage/ndb/clusterj/clusterj-openjpa/src/test/resources/META-INF/persistence.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/CMakeLists.txt b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt
index 06988e122cae..683f0f267e51 100644
--- a/storage/ndb/clusterj/clusterj-test/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/pom.xml.in b/storage/ndb/clusterj/clusterj-test/pom.xml.in
index e6b9d6df9344..fc0bcb279337 100644
--- a/storage/ndb/clusterj/clusterj-test/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-test/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/regression/Bug54619.java b/storage/ndb/clusterj/clusterj-test/src/main/java/regression/Bug54619.java
index 44eaf6f4dcd8..e87b988ee84c 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/regression/Bug54619.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/regression/Bug54619.java
@@ -1,15 +1,22 @@
 /*
- Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJModelTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJModelTest.java
index aeb232738cd0..dcf9a46f8134 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJModelTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJModelTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
index 64b4c33b14f7..4ef149cae434 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java
index c03e7654c592..fc9d1a974160 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AbstractQueryTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AllTests.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AllTests.java
index 80e1eee54912..73ae36881ad2 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AllTests.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AllTests.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoCommitTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoCommitTest.java
index 03dc5d48118e..48d29f00f723 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoCommitTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoCommitTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoPKTest.java
index a3c91cc7e34d..f652de474559 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AutoPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BigIntegerTypesTest.java
index 4138566a60eb..2fdd2f5686c8 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryPKTest.java
index 92c2d2bd49a4..27532669b807 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryTypesTest.java
index f6ce867bedd6..923c9dcaeecd 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BinaryTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java
index 64508e0f839d..f62a4c5fdd54 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BitTypesTest.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BlobTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BlobTest.java
index c8765ec92fbb..b0e4ad52e935 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BlobTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/BlobTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/Bug17200163Test.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/Bug17200163Test.java
index e8b508253c1e..d45f7948ba87 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/Bug17200163Test.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/Bug17200163Test.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CharsetTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CharsetTest.java
index 8a5c2427a3d8..cd7d308345c1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CharsetTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CharsetTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ConnectionPoolTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ConnectionPoolTest.java
index 6585079371dd..7ae45fd9fe44 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ConnectionPoolTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ConnectionPoolTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java
index 57b2dd933431..4fd3140ffec0 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsSqlDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsSqlDateTypesTest.java
index 9cfd53214679..40b5ac696233 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsSqlDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsSqlDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsUtilDateTypesTest.java
index 9e00b434aecc..aba078f1d001 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DateAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsSqlTimestampTypesTest.java
index 4fc19b38d204..274d3628ebb8 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsUtilDateTypesTest.java
index 73d514d7d392..17592c9ae56b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DatetimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java
index e65af6bcc0eb..2a1f34ce8c75 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DbugTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DecimalTypesTest.java
index f17e88203de2..80292474a6be 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DefaultConnectValuesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DefaultConnectValuesTest.java
index c135ade60af6..a91d75a68207 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DefaultConnectValuesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DefaultConnectValuesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java
index b4f1b7ed196c..2c7b3f9d9aa1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteAllByClassTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteInsertTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteInsertTest.java
index 1d7933378898..f5d9e72e6978 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteInsertTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteInsertTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteQueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteQueryAllPrimitivesTest.java
index 34818421e5b5..0947da91c112 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteQueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DeleteQueryAllPrimitivesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DomainTypeHandlerFactoryTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DomainTypeHandlerFactoryTest.java
index 9d99060dcdc0..ca60ddf0f31f 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DomainTypeHandlerFactoryTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DomainTypeHandlerFactoryTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBinaryPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBinaryPKTest.java
index 3804b749897b..38dfce587ed7 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBytePKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBytePKTest.java
index 054787a616fe..7b99bdd4c44d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBytePKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicBytePKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java
index 19e0743ef99f..d5268b2096c9 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicShortPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicShortPKTest.java
index 6f0e9347740f..0a5bd58adcf3 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicShortPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicShortPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKey2Test.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKey2Test.java
index 91eff2338d44..348a05d089e9 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKey2Test.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKey2Test.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKeyTest.java
index 92d8df8f9b45..7ff5b56fe4a3 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FindByPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FixedLengthCharTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FixedLengthCharTest.java
index f259590af268..1fd79fc65d71 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FixedLengthCharTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/FixedLengthCharTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/HashOnlyLongIntStringPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/HashOnlyLongIntStringPKTest.java
index eefeba0f6a26..dafef97683ea 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/HashOnlyLongIntStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/HashOnlyLongIntStringPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LoadTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LoadTest.java
index 87d607bc2e92..c05d90ee4fca 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LoadTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LoadTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongIntStringPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongIntStringPKTest.java
index 02491d6dec27..4a2ed7a9e7d0 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongIntStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongIntStringPKTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongLongStringPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongLongStringPKTest.java
index 27717caf0e76..654d9f8c4e5a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongLongStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongLongStringPKTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongvarbinaryPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongvarbinaryPKTest.java
index 2be71bae8b86..22f03a170502 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongvarbinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LongvarbinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultiplePKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultiplePKTest.java
index d1ae13362f7e..80ffd3e2f221 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultiplePKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultiplePKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedFindTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedFindTest.java
index a5a348e79f56..46d54a7f6fd6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedFindTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedFindTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedTest.java
index 2b2f4b53befa..6fa2bb2a12f4 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/MultithreadedTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NegativeMetadataTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NegativeMetadataTest.java
index a2bae403134a..cc622650138b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NegativeMetadataTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NegativeMetadataTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NotPersistentTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NotPersistentTest.java
index c86d0f1f0fec..8d71583e0012 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NotPersistentTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NotPersistentTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NullValuesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NullValuesTest.java
index c50f0162c293..b0a6628016f6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NullValuesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/NullValuesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java
index 236f1d9d12c6..d78cb58648b8 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ObjectNotFoundTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/PartitionKeyTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/PartitionKeyTest.java
index 3dabde3c922e..709c0d875c48 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/PartitionKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/PartitionKeyTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryAllPrimitivesTest.java
index 4b0a0c02805c..c8971f4943d9 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryAllPrimitivesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBigIntegerTypesTest.java
index adddb1de3044..1b09805be69e 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBlobIndexScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBlobIndexScanTest.java
index 35b1fa5ddd72..a2f0f285a4a1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBlobIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBlobIndexScanTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBtreeIndexScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBtreeIndexScanTest.java
index ba539c1de610..e47ebb4e788b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBtreeIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryBtreeIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryByteArrayTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryByteArrayTypesTest.java
index 6cc68935e308..baa495367f50 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryByteArrayTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryByteArrayTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsSqlDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsSqlDateTypesTest.java
index 2ca1c7a4cf6f..d4862c565a49 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsSqlDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsSqlDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsUtilDateTypesTest.java
index 95b5b03467f4..9ca9b17b0702 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDateAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsSqlTimestampTypesTest.java
index 6373827c5495..3548de20e8b0 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsUtilDateTypesTest.java
index a695e54dbd54..a0b072f8c8f3 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDatetimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDecimalTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDecimalTypesTest.java
index b22351cd34d9..9dbd5a7ac2d1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDoubleTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDoubleTypesTest.java
index 05d06e773379..8aa9218e048c 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDoubleTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryDoubleTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java
index 68ed1149723a..8e18fe20abd2 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExplainTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExtraConditionsTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExtraConditionsTest.java
index 205414755f0d..14735a09582e 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExtraConditionsTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryExtraConditionsTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryFloatTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryFloatTypesTest.java
index a239eb065366..a8f91f5277a6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryFloatTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryFloatTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashIndexScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashIndexScanTest.java
index 58bcdf632f0e..5782d4b4c968 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashPKScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashPKScanTest.java
index 8b33c0a00848..8e261a76d569 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashPKScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryHashPKScanTest.java
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryInTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryInTest.java
index 97e4ef530c36..b433d58c5b77 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryInTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryInTest.java
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeByteArrayTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeByteArrayTypesTest.java
index b0d8de823365..5d5bfc3f1be6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeByteArrayTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeByteArrayTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeTest.java
index 039eeaf0a115..0cb7b4235d41 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLimitsTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLimitsTest.java
index 7ea04c003d1e..8a5a9c4c5586 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLimitsTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLimitsTest.java
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java
index d7547cd08da4..ffc4ce260f99 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultiColumnIndexInTest.java
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultipleParameterTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultipleParameterTest.java
index 2ed7fcf4e0df..43d75bfbfe97 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultipleParameterTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryMultipleParameterTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotNullTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotNullTest.java
index 3eda1ca1d446..2df2f3ba7e3b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotNullTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotNullTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotTest.java
index 9a4e1eea4a4f..8d39621f8d70 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNotTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNullTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNullTest.java
index 3c7505c7dd45..66d5a122b54c 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNullTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryNullTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrTest.java
index 6f6bd5598411..f61c2482bece 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrTest.java
@@ -1,15 +1,22 @@
 /*
-Copyright 2010 Sun Microsystems, Inc.
+Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 All rights reserved. Use is subject to license terms.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
index ddd77f839895..58a4853cb58d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryPrimaryKeyTest.java
index fe791b5fd3f0..e6a322428930 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryScanLockTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryScanLockTest.java
index ca276c917988..45d69a8d7993 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryScanLockTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryScanLockTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryStringTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryStringTypesTest.java
index 00ae85c8b4b5..7321184972c1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryStringTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryStringTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTableScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTableScanTest.java
index 57092499c5f1..5772209dbfd9 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTableScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTableScanTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTextIndexScanTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTextIndexScanTest.java
index f73a87223edf..07126578ea3c 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTextIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTextIndexScanTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsSqlTimeTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsSqlTimeTypesTest.java
index bc9dd6fe3fc4..ead5913b1226 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsSqlTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsSqlTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsUtilDateTypesTest.java
index 9514bdfd620c..93864bd209bd 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsSqlTimestampTypesTest.java
index e248717ecf76..16a2ccafe400 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsUtilDateTypesTest.java
index e27becc5c333..e2b78d99c753 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryTimestampAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
index e7134f4dd0fd..e7c87eefaffa 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryUniqueKeyTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryYearTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryYearTypesTest.java
index 58386f30a21e..095f4eeeee28 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryYearTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryYearTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ReleaseTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ReleaseTest.java
index 3a1d3a97d7e7..90ce4bc2eeea 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ReleaseTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ReleaseTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SaveTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SaveTest.java
index efac1424a7ee..4fcc2f8cd6c1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SaveTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SaveTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
index c78af6ee34c0..de9f03d2b726 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SchemaChangeTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SerialTransactionsTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SerialTransactionsTest.java
index c0005d2e6b30..31cdbc6cf29b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SerialTransactionsTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/SerialTransactionsTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/StressTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/StressTest.java
index f67c26f02e3f..c8ac0a0f16b2 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/StressTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/StressTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java
index d156900ea763..0ec47edb4712 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsSqlTimeTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsSqlTimeTypesTest.java
index 6114eb9e6e9a..8b2ef6efea09 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsSqlTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsSqlTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsUtilDateTypesTest.java
index 02971703edd7..c6a66825d90d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsSqlTimestampTypesTest.java
index 4f68c995229e..47fae9cfed61 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsSqlTimestampTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsUtilDateTypesTest.java
index 7cf7ee247100..efac44d83069 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TimestampAsUtilDateTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionErrorSetPartitionKeyTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionErrorSetPartitionKeyTest.java
index 53d13ede67b7..e61f2aaba978 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionErrorSetPartitionKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionErrorSetPartitionKeyTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionStateTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionStateTest.java
index 84043dd7c81f..5684ee704492 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionStateTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TransactionStateTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/UpdateTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/UpdateTest.java
index 4180a90bfcfa..cf7ee76f1e55 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/UpdateTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/UpdateTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryPKTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryPKTest.java
index ab2cce2c5f48..e83a8be40532 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryTypesTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryTypesTest.java
index 4a365e657c8d..4251c5dc94b5 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarbinaryTypesTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java
index 14a383d71ba5..e16481851788 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java
index 141c49750412..b740d707df32 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/domaintypehandler/CrazyDomainTypeHandlerFactoryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AllPrimitives.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AllPrimitives.java
index b3b8d1dde4ce..9fff1f0fd47e 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AllPrimitives.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AllPrimitives.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKBigint.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKBigint.java
index 75f1229e25e0..e51808d5ad82 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKBigint.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKBigint.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKInt.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKInt.java
index 3f109479503c..f558e44e11b6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKInt.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKInt.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKSmallint.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKSmallint.java
index d3f00c2a716b..c15513b81366 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKSmallint.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKSmallint.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKTinyint.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKTinyint.java
index 6221e92e5ab4..444e71898c8a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKTinyint.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/AutoPKTinyint.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeNoPrimaryKeyAnnotationOnClass.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeNoPrimaryKeyAnnotationOnClass.java
index f4b5ba2ccbd7..4a6e85c9c85f 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeNoPrimaryKeyAnnotationOnClass.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeNoPrimaryKeyAnnotationOnClass.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationColumnAndColumns.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationColumnAndColumns.java
index dd417687c49f..d72f40e5d16a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationColumnAndColumns.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationColumnAndColumns.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationNoColumnOrColumns.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationNoColumnOrColumns.java
index 98a61db9675a..9d4b7f1ed6cf 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationNoColumnOrColumns.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationNoColumnOrColumns.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationOnClassMisspelledField.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationOnClassMisspelledField.java
index f93acebb2369..f2d9e4239c5a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationOnClassMisspelledField.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeePrimaryKeyAnnotationOnClassMisspelledField.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeWrongPrimaryKeyAnnotationOnClass.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeWrongPrimaryKeyAnnotationOnClass.java
index d42347ad042c..de02b8c99295 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeWrongPrimaryKeyAnnotationOnClass.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadEmployeeWrongPrimaryKeyAnnotationOnClass.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateColumn.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateColumn.java
index 044ec9ddefc4..3c76da3e11b1 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateColumn.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateColumn.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateIndexName.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateIndexName.java
index 3f019d1b253d..1c3b4bb922a6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateIndexName.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexDuplicateIndexName.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexMissingColumn.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexMissingColumn.java
index c4a7cffdf16c..9a8a94105c4d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexMissingColumn.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BadIndexMissingColumn.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BigIntegerTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BigIntegerTypes.java
index 008fad688a78..642678bd515e 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BigIntegerTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BigIntegerTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryPK.java
index 6c70e175741b..b3b6472f4cde 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryPK.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryTypes.java
index 0728b1c219d6..ea6de35134be 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BinaryTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BitTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BitTypes.java
index 144b9389b633..c068a45a00f5 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BitTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BitTypes.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BlobTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BlobTypes.java
index a7d2c8ca8fc4..c5633b4678c7 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BlobTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/BlobTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ByteArrayTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ByteArrayTypes.java
index 846a8d7ebb6b..53a9e698497d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ByteArrayTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ByteArrayTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetBig5.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetBig5.java
index aec07c52977c..2c15e558eacc 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetBig5.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetBig5.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetLatin1.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetLatin1.java
index 05ffcbcde08b..0fe13229d509 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetLatin1.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetLatin1.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetModel.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetModel.java
index 2833d007ab57..16d90336b48f 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetModel.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetModel.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSjis.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSjis.java
index 9a07e83f6972..24843d510fc2 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSjis.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSjis.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSwedishUtf8.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSwedishUtf8.java
index 6fe3b8bd50d9..a5281ab9d1e6 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSwedishUtf8.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetSwedishUtf8.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetUtf8.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetUtf8.java
index 5c26e813f252..2d5aae13cf6b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetUtf8.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CharsetUtf8.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ConversationSummary.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ConversationSummary.java
index 8b1fd7fd2bd1..1ba10de9745d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ConversationSummary.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ConversationSummary.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2013, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CrazyDelegate.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CrazyDelegate.java
index 67a38e34d6f8..03c7dfb7e9c7 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CrazyDelegate.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/CrazyDelegate.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Customer.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Customer.java
index 03eecefe9eff..bc2726c546df 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Customer.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Customer.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsSqlDateTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsSqlDateTypes.java
index 2a424f7ad0d9..a43b9feed425 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsSqlDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsSqlDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsUtilDateTypes.java
index 65691007884b..5667aaea8480 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DateAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsSqlTimestampTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsSqlTimestampTypes.java
index 1f075504d7e9..bd7f4608e579 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsSqlTimestampTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsSqlTimestampTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsUtilDateTypes.java
index 5c52fef3ab45..d608ec500be8 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DatetimeAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DecimalTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DecimalTypes.java
index 69e0a096e89d..705f4aba2625 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DecimalTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DecimalTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Dn2id.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Dn2id.java
index a44611db8b88..dda63c057214 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Dn2id.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Dn2id.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DoubleTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DoubleTypes.java
index b78a787fd238..30d06704daf0 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DoubleTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DoubleTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DynamicPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DynamicPK.java
index d7b52694730d..8a15e074c42a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DynamicPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/DynamicPK.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee.java
index 056f9a95d1e1..a95e49426970 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee2.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee2.java
index 5873a95d9ac4..fe47bdb8597d 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee2.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Employee2.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/FloatTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/FloatTypes.java
index db96a5dac2c8..fc31aefb3704 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/FloatTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/FloatTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/HashOnlyLongIntStringPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/HashOnlyLongIntStringPK.java
index 620eb620d862..3845bf7f5cee 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/HashOnlyLongIntStringPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/HashOnlyLongIntStringPK.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IdBase.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IdBase.java
index 4dcf3db8b414..a85ba91eeb97 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IdBase.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IdBase.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IndexesRUs.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IndexesRUs.java
index 7089313d0579..ae426b2b36a5 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IndexesRUs.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/IndexesRUs.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringIndex.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringIndex.java
index 5a5b7b165f78..8d464cce5bd7 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringIndex.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringIndex.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringPK.java
index 08ed52b6c41b..bae448dd1d3b 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongIntStringPK.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongLongStringPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongLongStringPK.java
index f351a3bde4e4..9289e52789b8 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongLongStringPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongLongStringPK.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongvarbinaryPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongvarbinaryPK.java
index 82702f23fb8d..ba75d4a3df80 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongvarbinaryPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/LongvarbinaryPK.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NotPersistentTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NotPersistentTypes.java
index 4430032a74d3..30305e6c8420 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NotPersistentTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NotPersistentTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NullValues.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NullValues.java
index ec3a3c592e51..b757b5982eaa 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NullValues.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/NullValues.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Order.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Order.java
index a34ffdc53e5d..9446750c97ec 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Order.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/Order.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/OrderLine.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/OrderLine.java
index b2cd452db4a1..900142226632 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/OrderLine.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/OrderLine.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/StringTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/StringTypes.java
index fb0505396f72..620ea2df3046 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/StringTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/StringTypes.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ThrowNullPointerException.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ThrowNullPointerException.java
index a39d12513f5d..24697066bb3f 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ThrowNullPointerException.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/ThrowNullPointerException.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsSqlTimeTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsSqlTimeTypes.java
index 7a8bf9c21b6e..a1976b8b18f5 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsSqlTimeTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsSqlTimeTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsUtilDateTypes.java
index bbf204cde15f..84f70ff80b8a 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimeAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsSqlTimestampTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsSqlTimestampTypes.java
index 4d88f21cec05..54e1f118de69 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsSqlTimestampTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsSqlTimestampTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsUtilDateTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsUtilDateTypes.java
index dab9641ba5d8..e416f87bd2e3 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsUtilDateTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/TimestampAsUtilDateTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryPK.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryPK.java
index d3b8836777a7..3a4f22c5c4df 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryPK.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryPK.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryTypes.java
index 5e36e5c6531c..485de5aec33c 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/VarbinaryTypes.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/YearTypes.java b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/YearTypes.java
index c2c8c4771be0..d462f9c39ccf 100644
--- a/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/YearTypes.java
+++ b/storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/model/YearTypes.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt b/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt
index 319e9fccbe93..a0dc0a2b2f31 100644
--- a/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt
+++ b/storage/ndb/clusterj/clusterj-tie/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/pom.xml.in b/storage/ndb/clusterj/clusterj-tie/pom.xml.in
index 68daf4ee3afa..ca4365492d04 100644
--- a/storage/ndb/clusterj/clusterj-tie/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-tie/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/BlobImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/BlobImpl.java
index e5c3cc0207da..fcd0e4e1c9e8 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/BlobImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/BlobImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java
index 517f2a1e91b7..9c42f75faf97 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java
index 4451a9ca5e1f..e67e9f8b1048 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterConnectionServiceImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java
index ff6944566022..c93e3fa3810c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2009, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ColumnImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ColumnImpl.java
index 0a170490070b..fb39f08824a7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ColumnImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ColumnImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java
index 47369b710c89..b6f97c9e42ff 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImplForNdbRecord.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImplForNdbRecord.java
index 606bd60e514c..c917db2148d3 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImplForNdbRecord.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbImplForNdbRecord.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbugImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbugImpl.java
index e1e7f5b94df4..8ab285368d23 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbugImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DbugImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java
index 6061f6dfae1a..d6cf0517d807 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/DictionaryImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/FixedByteBufferPoolImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/FixedByteBufferPoolImpl.java
index d3c08fb9463d..27a952960297 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/FixedByteBufferPoolImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/FixedByteBufferPoolImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2015, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexImpl.java
index 2552ca99e12b..15006240da0f 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexOperationImpl.java
index b308856c3648..30e70b6b54f1 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexOperationImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexScanOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexScanOperationImpl.java
index 58948627b04a..e3d108a66a75 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/IndexScanOperationImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/KeyPart.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/KeyPart.java
index b1dde4b55e66..7811c598f8a7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/KeyPart.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/KeyPart.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordBlobImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordBlobImpl.java
index 820af8b7172a..6d320af90796 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordBlobImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordBlobImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2012, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordDeleteOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordDeleteOperationImpl.java
index 5de22942fd22..f9b2a958e3da 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordDeleteOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordDeleteOperationImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2012, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java
index fc0594f4b979..447eca6960c6 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
index 99cbedcb9b60..73fde8c2a82e 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java
index d0c422e87e4e..262d7079e949 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordInsertOperationImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2012, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java
index 76ea6ab86679..f942d10bdaab 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordKeyOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java
index 2bbd76c76933..749dfd93c8e4 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java
index 43d3e17daa76..0c532aded959 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordResultDataImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
index 21f996407cb4..7780a56ddd43 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java
index 8837ea3e3058..2c563c930cde 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanResultDataImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java
index fe8698d7ce65..846a8912cb27 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerFactoryImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java
index 84e8f5f7bf61..fd3ba1ab077a 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordSmartValueHandlerImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java
index 3b64e7559a8c..71ff57ad9f36 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordTableScanOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java
index 4a5a1c8c2dfb..78b59f9a472a 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordUniqueKeyOperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
index 93c0a8e6ec23..2127f675b68e 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/PartitionKeyImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/PartitionKeyImpl.java
index 57414fb82ccb..9638f7e29e86 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/PartitionKeyImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/PartitionKeyImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java
index d1ace107afab..1bd737f8eeae 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanFilterImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanFilterImpl.java
index 7f2478f2212a..91903ef4b855 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanFilterImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanFilterImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java
index a6b4be07dc37..5ef80183251c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java
index 8a29ad5b58c2..0f6ccc911d84 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/TableImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/TableImpl.java
index 928f8d995ef8..1d1215a323f6 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/TableImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/TableImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
index d743e7d78788..487f06c9ddff 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/VariableByteBufferPoolImpl.java b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/VariableByteBufferPoolImpl.java
index cf3a20f6b102..cdb22f8d7e16 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/VariableByteBufferPoolImpl.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/VariableByteBufferPoolImpl.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2015, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties b/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties
index 917b38e4745f..79c884ee441f 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties
+++ b/storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/com/mysql/clusterj/tie/UtilityTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/com/mysql/clusterj/tie/UtilityTest.java
index 05398abb6012..5ae41971eba7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/com/mysql/clusterj/tie/UtilityTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/com/mysql/clusterj/tie/UtilityTest.java
@@ -1,15 +1,22 @@
 /*
- *  Copyright 2010 Sun Microsystems, Inc.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *  All rights reserved. Use is subject to license terms.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/AutoCommitTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/AutoCommitTest.java
index 69114385fdd6..920c4acf591d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/AutoCommitTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/AutoCommitTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BigIntegerTypesTest.java
index 30bfdaf51d3b..fb31c444be57 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryPKTest.java
index f5ec8533aca2..261d43ed53c3 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryTypesTest.java
index 5b48e5f1ce41..74f1d3d89ac6 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BinaryTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BitTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BitTypesTest.java
index 2425f63334d5..5b624f10bfb5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BitTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BitTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BlobTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BlobTest.java
index 9d40359306ef..c89d06e23034 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BlobTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/BlobTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug17200163Test.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug17200163Test.java
index 9e59a234116c..4345da07dc52 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug17200163Test.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug17200163Test.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug54619Test.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug54619Test.java
index 808a5fd9361c..22c24ddc19d9 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug54619Test.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/Bug54619Test.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CharsetTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CharsetTest.java
index 268f1e447030..4cf4607071a6 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CharsetTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CharsetTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java
index d687fd859707..a2cef79c0ea1 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ConnectionPoolTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CoordinatedTransactionIdVariableTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CoordinatedTransactionIdVariableTest.java
index 66af1544fb6a..9d6104001621 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CoordinatedTransactionIdVariableTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/CoordinatedTransactionIdVariableTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsSqlDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsSqlDateTypesTest.java
index e5e7cdcd3d4b..ca19fb87bf36 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsSqlDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsSqlDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsUtilDateTypesTest.java
index 6f37f4ed0dab..35132b03b281 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DateAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsSqlTimestampTypesTest.java
index ccbbb3e540df..4ba611ab2525 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsUtilDateTypesTest.java
index 8260ad12adf4..d2c088197a20 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DatetimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DbugTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DbugTest.java
index f5bba43188d7..56fc62132e10 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DbugTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DbugTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DecimalTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DecimalTypesTest.java
index 32fd0a228411..f705baec6cc2 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DefaultConnectValuesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DefaultConnectValuesTest.java
index 606dee3c582c..d642dc1c22f5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DefaultConnectValuesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DefaultConnectValuesTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteAllByClassTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteAllByClassTest.java
index 7818133a81fe..28978d535d9d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteAllByClassTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteAllByClassTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteInsertTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteInsertTest.java
index 91760e40cba2..86d68c45873f 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteInsertTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteInsertTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteQueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteQueryAllPrimitivesTest.java
index 754a9ce7f7eb..8c51afe09f5d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteQueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DeleteQueryAllPrimitivesTest.java
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 package testsuite.clusterj.tie;
 
 public class DeleteQueryAllPrimitivesTest extends testsuite.clusterj.DeleteQueryAllPrimitivesTest {
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DomainTypeHandlerFactoryTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DomainTypeHandlerFactoryTest.java
index ac2e47b26885..d5b2270f5717 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DomainTypeHandlerFactoryTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DomainTypeHandlerFactoryTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBinaryPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBinaryPKTest.java
index e26277af0a6c..5f4517e0cbd0 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBytePKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBytePKTest.java
index 5d35448ad6f7..6c9443bcac89 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBytePKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicBytePKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicObjectTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicObjectTest.java
index 9f94d24fb4ad..2e1457232b96 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicObjectTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicObjectTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicShortPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicShortPKTest.java
index b62c7543c58e..5717aabd877b 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicShortPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/DynamicShortPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKey2Test.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKey2Test.java
index ee198e340d47..aae33f2ea6db 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKey2Test.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKey2Test.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKeyTest.java
index 19055c0eec30..581c71c12cbe 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FindByPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FixedLengthCharTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FixedLengthCharTest.java
index 1e22c5b39df2..90e360dc7543 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FixedLengthCharTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/FixedLengthCharTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2014, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/HashOnlyLongIntStringPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/HashOnlyLongIntStringPKTest.java
index 943fca07adbd..c4ac391fea0e 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/HashOnlyLongIntStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/HashOnlyLongIntStringPKTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LoadTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LoadTest.java
index 40f5c7417636..37c474cd3034 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LoadTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LoadTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongIntStringPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongIntStringPKTest.java
index b93fbfd309b5..0646c3e999fc 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongIntStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongIntStringPKTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongLongStringPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongLongStringPKTest.java
index bb51d7c149b4..9a1ff0d34a86 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongLongStringPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongLongStringPKTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongvarbinaryPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongvarbinaryPKTest.java
index e093c2e734fb..2d41d50deedb 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongvarbinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/LongvarbinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultiplePKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultiplePKTest.java
index 639cdcd689b2..0404f3cf52f5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultiplePKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultiplePKTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedFindTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedFindTest.java
index 119ca3bd8cbc..7e2396b8e80e 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedFindTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedFindTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedTest.java
index 21e34d918941..9d73f031d3f7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/MultithreadedTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NegativeMetadataTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NegativeMetadataTest.java
index c327f32df299..e0eff58aa996 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NegativeMetadataTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NegativeMetadataTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NotPersistentTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NotPersistentTest.java
index e525e0eba62e..495b0ed55e2a 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NotPersistentTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NotPersistentTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NullValuesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NullValuesTest.java
index 03ddd8878f4b..7dd84d756d90 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NullValuesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/NullValuesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ObjectNotFoundTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ObjectNotFoundTest.java
index 548cba4d89f0..7f3daa14ddb0 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ObjectNotFoundTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ObjectNotFoundTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/PartitionKeyTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/PartitionKeyTest.java
index 178160e77c72..62f1e2ad1aad 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/PartitionKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/PartitionKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryAllPrimitivesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryAllPrimitivesTest.java
index 503203163e73..1c4582fbe8ac 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryAllPrimitivesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryAllPrimitivesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBigIntegerTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBigIntegerTypesTest.java
index ff973bb9a515..6931d0fa394c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBigIntegerTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBigIntegerTypesTest.java
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBlobIndexScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBlobIndexScanTest.java
index 3bc62a54df68..53a86a75c637 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBlobIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBlobIndexScanTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBtreeIndexScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBtreeIndexScanTest.java
index b382373bd549..ea9de856c7f5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBtreeIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryBtreeIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryByteArrayTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryByteArrayTypesTest.java
index 07a54d410c9f..4069c918004d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryByteArrayTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryByteArrayTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsSqlDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsSqlDateTypesTest.java
index b620d256eda2..0bfe3f6a7ae7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsSqlDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsSqlDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsUtilDateTypesTest.java
index e8288fe9bce0..5510b2041fb5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDateAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsSqlTimestampTypesTest.java
index 305099b02819..7938014f9221 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsUtilDateTypesTest.java
index 3f260066e869..32869adfc58d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDatetimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDecimalTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDecimalTypesTest.java
index 34605b4b829d..bcaab3b78c97 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDecimalTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDecimalTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDoubleTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDoubleTypesTest.java
index e26be9027e77..43b4d8858d89 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDoubleTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryDoubleTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExplainTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExplainTest.java
index ccec270294f2..96e4158bfdb1 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExplainTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExplainTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExtraConditionsTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExtraConditionsTest.java
index 25ebabe511fd..06d61de096bc 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExtraConditionsTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryExtraConditionsTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryFloatTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryFloatTypesTest.java
index eee741ec405b..2f672ef8f40d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryFloatTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryFloatTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashIndexScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashIndexScanTest.java
index 7f78ae00f869..1e335559158a 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashIndexScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashPKScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashPKScanTest.java
index 23c00e14bb56..4129125e0842 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashPKScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryHashPKScanTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryInTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryInTest.java
index 9c6a84c3c5af..701d8e841bcd 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryInTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryInTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeByteArrayTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeByteArrayTypesTest.java
index 90c767640d2c..f1d2213e45e5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeByteArrayTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeByteArrayTypesTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeTest.java
index c80fae7f75f4..772fb4354943 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLimitsTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLimitsTest.java
index 9a48068cbc70..2d69ebf66801 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLimitsTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLimitsTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultiColumnIndexInTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultiColumnIndexInTest.java
index c9a77eee74d3..ccd542b12dc1 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultiColumnIndexInTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultiColumnIndexInTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultipleParameterTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultipleParameterTest.java
index 76604b26b25e..c0e8442ae766 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultipleParameterTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryMultipleParameterTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotNullTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotNullTest.java
index fba67bce4188..fd54efe7e3e5 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotNullTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotNullTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotTest.java
index f1a7458e7ad2..317ff1eede0a 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNotTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNullTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNullTest.java
index 9914395dd27d..513828427020 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNullTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryNullTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrTest.java
index 1579c7ab5919..b84a7267a782 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrderingTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrderingTest.java
index 11e61ca02fc4..ab24e9be69d4 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrderingTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryOrderingTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryPrimaryKeyTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryPrimaryKeyTest.java
index c15164e59d3d..9c87ce5936f0 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryPrimaryKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryPrimaryKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryScanLockTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryScanLockTest.java
index e88cd1878d72..e997c990dba2 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryScanLockTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryScanLockTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryStringTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryStringTypesTest.java
index d447e2203bb2..e800e3b970bc 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryStringTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryStringTypesTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTableScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTableScanTest.java
index a31e55b79a6c..bed55cdf6344 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTableScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTableScanTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTextIndexScanTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTextIndexScanTest.java
index 51fbe2073a12..4ee0b87f7f21 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTextIndexScanTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTextIndexScanTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsSqlTimeTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsSqlTimeTypesTest.java
index 6afe048d3771..c209be276f2c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsSqlTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsSqlTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsUtilDateTypesTest.java
index 4895a3c13a3d..dc34ef84e906 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsSqlTimestampTypesTest.java
index 34ee973e3d56..f37ecf5c8007 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsUtilDateTypesTest.java
index 703561ca4770..63c2739696a1 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryTimestampAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryUniqueKeyTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryUniqueKeyTest.java
index e630287b30c5..d5307c4cdaa7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryUniqueKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryUniqueKeyTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryYearTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryYearTypesTest.java
index b4502d2014a7..479f63d0fae0 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryYearTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryYearTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ReleaseTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ReleaseTest.java
index f3056d5c3533..476533880c62 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ReleaseTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/ReleaseTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SaveTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SaveTest.java
index 09eeeae40b2c..24eaea6563e7 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SaveTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SaveTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SchemaChangeTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SchemaChangeTest.java
index 209e26d1d2f0..16bc1c70ccad 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SchemaChangeTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SchemaChangeTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SerialTransactionsTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SerialTransactionsTest.java
index b9b48bddf0f0..45aba732eec0 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SerialTransactionsTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/SerialTransactionsTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java
index 3fd4aad852c4..039bff6a10fe 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/StressTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java
index 31bbe3a7b529..494dc6bc8427 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsSqlTimeTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsSqlTimeTypesTest.java
index b673e3d44d9d..e613277d820b 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsSqlTimeTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsSqlTimeTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsUtilDateTypesTest.java
index c0e6b91b006b..5bbbd87b93c8 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimeAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsSqlTimestampTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsSqlTimestampTypesTest.java
index 93be11c246a3..8351f3bace92 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsSqlTimestampTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsSqlTimestampTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsUtilDateTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsUtilDateTypesTest.java
index 0d7351816fb5..5b91d9fa2c0c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsUtilDateTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TimestampAsUtilDateTypesTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionErrorSetPartitionKeyTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionErrorSetPartitionKeyTest.java
index 46d05e48a23a..9fa4fbd0f0bb 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionErrorSetPartitionKeyTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionErrorSetPartitionKeyTest.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionStateTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionStateTest.java
index 3f73262e636f..ec73647f7423 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionStateTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TransactionStateTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/UpdateTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/UpdateTest.java
index 0f887edd9509..fe49e62789a8 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/UpdateTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/UpdateTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryPKTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryPKTest.java
index fa31b694d6f2..b6e8007b6903 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryPKTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryPKTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryTypesTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryTypesTest.java
index 63b6e8249780..2b7510057b2c 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryTypesTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarbinaryTypesTest.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarcharStringLengthTest.java b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarcharStringLengthTest.java
index 5f8a907980c6..83c09a28181d 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarcharStringLengthTest.java
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/VarcharStringLengthTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-tie/src/test/resources/clusterj.properties b/storage/ndb/clusterj/clusterj-tie/src/test/resources/clusterj.properties
index 83f7dfc95db4..82b30a57e6f6 100644
--- a/storage/ndb/clusterj/clusterj-tie/src/test/resources/clusterj.properties
+++ b/storage/ndb/clusterj/clusterj-tie/src/test/resources/clusterj.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/pom.xml.in b/storage/ndb/clusterj/clusterj-unit/pom.xml.in
index 1695324292f4..a4a41eb4c52c 100644
--- a/storage/ndb/clusterj/clusterj-unit/pom.xml.in
+++ b/storage/ndb/clusterj/clusterj-unit/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java
index d8fa24481949..97196496d81c 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/AssertionFailedError.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java
index 6c39acb89969..7e3dda587726 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/Test.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
index fffb87d520d2..5dd4b2eb9611 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java
index aba16caa8676..a2dd77fea8f7 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestListener.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java
index 79aac52bcb78..99ff4317dbe0 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestResult.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java
index 3a7565e90e84..625608b12348 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestSuite.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/ResultPrinter.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/ResultPrinter.java
index 59bf280f89d4..0c9128506224 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/ResultPrinter.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/ResultPrinter.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java
index 7c52f7bd5674..4ba847dfe87d 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/junit/textui/TestRunner.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java b/storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java
index 0cd20e694bc6..1405872a8362 100644
--- a/storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java
+++ b/storage/ndb/clusterj/clusterj-unit/src/main/java/org/junit/Ignore.java
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/logging.properties b/storage/ndb/clusterj/logging.properties
index 143cbb57ea76..4fa0350d617d 100644
--- a/storage/ndb/clusterj/logging.properties
+++ b/storage/ndb/clusterj/logging.properties
@@ -1,14 +1,21 @@
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/mvn_install_ndbjtie.cmd.in b/storage/ndb/clusterj/mvn_install_ndbjtie.cmd.in
index 353060db5335..3b6219739e5a 100644
--- a/storage/ndb/clusterj/mvn_install_ndbjtie.cmd.in
+++ b/storage/ndb/clusterj/mvn_install_ndbjtie.cmd.in
@@ -1 +1,23 @@
+rem Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
+rem You should have received a copy of the GNU General Public License
+rem along with this program; if not, write to the Free Software
+rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 mvn.cmd install:install-file -Dfile=/Users/clr/ndb/bzr-repo/mysql-5.5-cluster-7.2/storage/ndb/src/ndbjtie/ndbjtie-@JAVA_NDB_VERSION@.jar -DgroupId=ndbjtie -DartifactId=ndbjtie -Dversion=@JAVA_NDB_VERSION@@JAVA_MVN_VERSION@ -Dpackaging=jar -DgeneratePom=true
diff --git a/storage/ndb/clusterj/mvn_install_ndbjtie.sh.in b/storage/ndb/clusterj/mvn_install_ndbjtie.sh.in
index 703f6813868b..77c5dab322bd 100644
--- a/storage/ndb/clusterj/mvn_install_ndbjtie.sh.in
+++ b/storage/ndb/clusterj/mvn_install_ndbjtie.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/clusterj/pom.xml.in b/storage/ndb/clusterj/pom.xml.in
index 34e3e0f212fb..7d5559335b53 100644
--- a/storage/ndb/clusterj/pom.xml.in
+++ b/storage/ndb/clusterj/pom.xml.in
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/cmake/ndb_add_target_property.cmake b/storage/ndb/cmake/ndb_add_target_property.cmake
index cecec16e2dfc..d7ca589b83de 100644
--- a/storage/ndb/cmake/ndb_add_target_property.cmake
+++ b/storage/ndb/cmake/ndb_add_target_property.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/cmake/ndb_check_mysql_include_file.cmake b/storage/ndb/cmake/ndb_check_mysql_include_file.cmake
index 5ec77cfd0d6e..fe54a19b8053 100644
--- a/storage/ndb/cmake/ndb_check_mysql_include_file.cmake
+++ b/storage/ndb/cmake/ndb_check_mysql_include_file.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/cmake/ndb_get_config_value.cmake b/storage/ndb/cmake/ndb_get_config_value.cmake
index cb47965501d6..f8e6f8c1794a 100644
--- a/storage/ndb/cmake/ndb_get_config_value.cmake
+++ b/storage/ndb/cmake/ndb_get_config_value.cmake
@@ -1,3 +1,25 @@
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 MACRO(NDB_GET_CONFIG_VALUE keyword var)
  IF(NOT ${var})
    # Read the line which contains the keyword
diff --git a/storage/ndb/cmake/ndb_require_variable.cmake b/storage/ndb/cmake/ndb_require_variable.cmake
index 22cb8be575e9..f209ef414ee3 100644
--- a/storage/ndb/cmake/ndb_require_variable.cmake
+++ b/storage/ndb/cmake/ndb_require_variable.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/cmake/os/Windows.cmake b/storage/ndb/cmake/os/Windows.cmake
index 781c8bb47445..77e70067cb10 100644
--- a/storage/ndb/cmake/os/Windows.cmake
+++ b/storage/ndb/cmake/os/Windows.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/cmake/os/WindowsCache.cmake b/storage/ndb/cmake/os/WindowsCache.cmake
index db654c3fd3b6..4c9d8ecc6f22 100644
--- a/storage/ndb/cmake/os/WindowsCache.cmake
+++ b/storage/ndb/cmake/os/WindowsCache.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/compile-cluster b/storage/ndb/compile-cluster
index f41c17783cbf..f110de69704d 100755
--- a/storage/ndb/compile-cluster
+++ b/storage/ndb/compile-cluster
@@ -1,15 +1,22 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_JAVA.cmake b/storage/ndb/config/type_JAVA.cmake
index f96da5343cb7..9f26e51973d2 100644
--- a/storage/ndb/config/type_JAVA.cmake
+++ b/storage/ndb/config/type_JAVA.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_kernel.cmake b/storage/ndb/config/type_kernel.cmake
index cf7d0424ab79..6e37bb5a98fd 100644
--- a/storage/ndb/config/type_kernel.cmake
+++ b/storage/ndb/config/type_kernel.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_mgmapiclient.cmake b/storage/ndb/config/type_mgmapiclient.cmake
index 78b6c68c2ed8..e1f23d081d9b 100644
--- a/storage/ndb/config/type_mgmapiclient.cmake
+++ b/storage/ndb/config/type_mgmapiclient.cmake
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_ndbapiclient.cmake b/storage/ndb/config/type_ndbapiclient.cmake
index 8d12ce2af2b6..c108dc872cfb 100644
--- a/storage/ndb/config/type_ndbapiclient.cmake
+++ b/storage/ndb/config/type_ndbapiclient.cmake
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_ndbapitest.cmake b/storage/ndb/config/type_ndbapitest.cmake
index b15478091481..3fa581e320dd 100644
--- a/storage/ndb/config/type_ndbapitest.cmake
+++ b/storage/ndb/config/type_ndbapitest.cmake
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_ndbapitools.cmake b/storage/ndb/config/type_ndbapitools.cmake
index 629100527506..5f4d86b5f7ea 100644
--- a/storage/ndb/config/type_ndbapitools.cmake
+++ b/storage/ndb/config/type_ndbapitools.cmake
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB, 2010 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/config/type_util.cmake b/storage/ndb/config/type_util.cmake
index a2b193fc93f5..0c12d8809429 100644
--- a/storage/ndb/config/type_util.cmake
+++ b/storage/ndb/config/type_util.cmake
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/demos/1-node/1-mgm-1/template_config.ini b/storage/ndb/demos/1-node/1-mgm-1/template_config.ini
index 76bb7867e3cb..eb1ac8400f30 100644
--- a/storage/ndb/demos/1-node/1-mgm-1/template_config.ini
+++ b/storage/ndb/demos/1-node/1-mgm-1/template_config.ini
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 ###############################################################################
 #
 #  Initial system configuration file for MySQL Cluster v3.1.0  (Demo 1)
diff --git a/storage/ndb/demos/2-node/2-mgm-1/template_config.ini b/storage/ndb/demos/2-node/2-mgm-1/template_config.ini
index 3edb909609ac..0bfd2dda6a38 100644
--- a/storage/ndb/demos/2-node/2-mgm-1/template_config.ini
+++ b/storage/ndb/demos/2-node/2-mgm-1/template_config.ini
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 ###############################################################################
 #
 #  Initial system configuration file for MySQL Cluster v3.1.0  (Demo 2)
diff --git a/storage/ndb/demos/config-templates/config_template-1-REP.ini b/storage/ndb/demos/config-templates/config_template-1-REP.ini
index 71be3f2f53ff..aa58dfe174bc 100644
--- a/storage/ndb/demos/config-templates/config_template-1-REP.ini
+++ b/storage/ndb/demos/config-templates/config_template-1-REP.ini
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 ###############################################################################
 #
 #  Initial system configuration file for MySQL Cluster v3.1.0  (Demo 1)
diff --git a/storage/ndb/demos/config-templates/config_template-4.ini b/storage/ndb/demos/config-templates/config_template-4.ini
index e47c9037344b..594ff9f6a3c8 100644
--- a/storage/ndb/demos/config-templates/config_template-4.ini
+++ b/storage/ndb/demos/config-templates/config_template-4.ini
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 ###############################################################################
 #
 #  4-node system configuration file for MySQL Cluster
diff --git a/storage/ndb/demos/config-templates/config_template-install.ini b/storage/ndb/demos/config-templates/config_template-install.ini
index e31906ba6097..caffeea50252 100644
--- a/storage/ndb/demos/config-templates/config_template-install.ini
+++ b/storage/ndb/demos/config-templates/config_template-install.ini
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 ###############################################################################
 #
 #  Initial system configuration file for MySQL Cluster v3.1.0  (Demo 1)
diff --git a/storage/ndb/demos/run_demo1-PS-SS_common.sh b/storage/ndb/demos/run_demo1-PS-SS_common.sh
index 625e96550876..fe0ed2089c1a 100644
--- a/storage/ndb/demos/run_demo1-PS-SS_common.sh
+++ b/storage/ndb/demos/run_demo1-PS-SS_common.sh
@@ -1,3 +1,25 @@
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 echo $NDB_HOST $NDB_EXTHOST
 
 NDB_PORT=$NDB_PORT_BASE"00"
diff --git a/storage/ndb/demos/run_demo1-PS.sh b/storage/ndb/demos/run_demo1-PS.sh
index 82cfdd5e65b3..d846836b2d05 100755
--- a/storage/ndb/demos/run_demo1-PS.sh
+++ b/storage/ndb/demos/run_demo1-PS.sh
@@ -1,4 +1,26 @@
 #!/bin/sh
+
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 if [ -z "$MYSQLCLUSTER_TOP" ]; then
   echo "MYSQLCLUSTER_TOP not set"
   exit 1
diff --git a/storage/ndb/demos/run_demo1-SS.sh b/storage/ndb/demos/run_demo1-SS.sh
index 5ede57c44c46..85e7adde9df9 100755
--- a/storage/ndb/demos/run_demo1-SS.sh
+++ b/storage/ndb/demos/run_demo1-SS.sh
@@ -1,4 +1,26 @@
 #!/bin/sh
+
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 if [ -z "$MYSQLCLUSTER_TOP" ]; then
   echo "MYSQLCLUSTER_TOP not set"
   exit 1
diff --git a/storage/ndb/demos/run_demo1.sh b/storage/ndb/demos/run_demo1.sh
index df6e3fc799db..e922ff6ca97b 100755
--- a/storage/ndb/demos/run_demo1.sh
+++ b/storage/ndb/demos/run_demo1.sh
@@ -1,4 +1,26 @@
 #!/bin/sh
+
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 if [ -z "$MYSQLCLUSTER_TOP" ]; then
   echo "MYSQLCLUSTER_TOP not set"
   exit 1
diff --git a/storage/ndb/demos/run_demo2.sh b/storage/ndb/demos/run_demo2.sh
index 9bae7517d5f0..615a89ea7043 100755
--- a/storage/ndb/demos/run_demo2.sh
+++ b/storage/ndb/demos/run_demo2.sh
@@ -1,4 +1,26 @@
 #!/bin/sh
+
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 if [ -z "$MYSQLCLUSTER_TOP" ]; then
   echo "MYSQLCLUSTER_TOP not set"
   exit 1
diff --git a/storage/ndb/docs/doxygen/Doxyfile.mgmapi b/storage/ndb/docs/doxygen/Doxyfile.mgmapi
index 787132187924..71c4f05a621a 100644
--- a/storage/ndb/docs/doxygen/Doxyfile.mgmapi
+++ b/storage/ndb/docs/doxygen/Doxyfile.mgmapi
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/Doxyfile.ndb b/storage/ndb/docs/doxygen/Doxyfile.ndb
index 95c5f553f8d9..559e543e5c53 100644
--- a/storage/ndb/docs/doxygen/Doxyfile.ndb
+++ b/storage/ndb/docs/doxygen/Doxyfile.ndb
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/Doxyfile.ndbapi b/storage/ndb/docs/doxygen/Doxyfile.ndbapi
index 5bf78c517b04..844ce5f17748 100644
--- a/storage/ndb/docs/doxygen/Doxyfile.ndbapi
+++ b/storage/ndb/docs/doxygen/Doxyfile.ndbapi
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/Doxyfile.odbc b/storage/ndb/docs/doxygen/Doxyfile.odbc
index f7bd206ac69a..2d3df551914c 100644
--- a/storage/ndb/docs/doxygen/Doxyfile.odbc
+++ b/storage/ndb/docs/doxygen/Doxyfile.odbc
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/Doxyfile.test b/storage/ndb/docs/doxygen/Doxyfile.test
index 57e17d64d053..0a2f198ec5fc 100644
--- a/storage/ndb/docs/doxygen/Doxyfile.test
+++ b/storage/ndb/docs/doxygen/Doxyfile.test
@@ -1,16 +1,23 @@
 # Doxyfile 1.2.14
 
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/postdoxy.pl b/storage/ndb/docs/doxygen/postdoxy.pl
index 18851335d4b4..5e8e38fc0674 100755
--- a/storage/ndb/docs/doxygen/postdoxy.pl
+++ b/storage/ndb/docs/doxygen/postdoxy.pl
@@ -2,13 +2,20 @@
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/docs/doxygen/predoxy.pl b/storage/ndb/docs/doxygen/predoxy.pl
index 5bc3aa858ee0..9149a6ca56a8 100755
--- a/storage/ndb/docs/doxygen/predoxy.pl
+++ b/storage/ndb/docs/doxygen/predoxy.pl
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB, 2010 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/CMakeLists.txt b/storage/ndb/include/CMakeLists.txt
index 2c1f1f646819..6f92687adee4 100644
--- a/storage/ndb/include/CMakeLists.txt
+++ b/storage/ndb/include/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/debugger/DebuggerNames.hpp b/storage/ndb/include/debugger/DebuggerNames.hpp
index fc65128078b2..7013bc79863a 100644
--- a/storage/ndb/include/debugger/DebuggerNames.hpp
+++ b/storage/ndb/include/debugger/DebuggerNames.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/debugger/EventLogger.hpp b/storage/ndb/include/debugger/EventLogger.hpp
index 928966bc7687..390b948ba237 100644
--- a/storage/ndb/include/debugger/EventLogger.hpp
+++ b/storage/ndb/include/debugger/EventLogger.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/debugger/SignalLoggerManager.hpp b/storage/ndb/include/debugger/SignalLoggerManager.hpp
index 9e1935d6eeef..253996b3a914 100644
--- a/storage/ndb/include/debugger/SignalLoggerManager.hpp
+++ b/storage/ndb/include/debugger/SignalLoggerManager.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/AttributeDescriptor.hpp b/storage/ndb/include/kernel/AttributeDescriptor.hpp
index 5ec7ad538be2..e27d2afa64e8 100644
--- a/storage/ndb/include/kernel/AttributeDescriptor.hpp
+++ b/storage/ndb/include/kernel/AttributeDescriptor.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/AttributeHeader.hpp b/storage/ndb/include/kernel/AttributeHeader.hpp
index 9840aac4db3b..74b8bc0e9106 100644
--- a/storage/ndb/include/kernel/AttributeHeader.hpp
+++ b/storage/ndb/include/kernel/AttributeHeader.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/AttributeList.hpp b/storage/ndb/include/kernel/AttributeList.hpp
index 8c6bc4f6769d..79bf62f2ead9 100644
--- a/storage/ndb/include/kernel/AttributeList.hpp
+++ b/storage/ndb/include/kernel/AttributeList.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/BlockNames.hpp b/storage/ndb/include/kernel/BlockNames.hpp
index 5d4b1dce817a..5fac465050ad 100644
--- a/storage/ndb/include/kernel/BlockNames.hpp
+++ b/storage/ndb/include/kernel/BlockNames.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/BlockNumbers.h b/storage/ndb/include/kernel/BlockNumbers.h
index d6559b69559e..f2fa38b2998e 100644
--- a/storage/ndb/include/kernel/BlockNumbers.h
+++ b/storage/ndb/include/kernel/BlockNumbers.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/GlobalSignalNumbers.h b/storage/ndb/include/kernel/GlobalSignalNumbers.h
index 521c80ff302e..56b9e5e9b45e 100644
--- a/storage/ndb/include/kernel/GlobalSignalNumbers.h
+++ b/storage/ndb/include/kernel/GlobalSignalNumbers.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/Interpreter.hpp b/storage/ndb/include/kernel/Interpreter.hpp
index c8ccb498d956..5b039bd1390e 100644
--- a/storage/ndb/include/kernel/Interpreter.hpp
+++ b/storage/ndb/include/kernel/Interpreter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/LogLevel.hpp b/storage/ndb/include/kernel/LogLevel.hpp
index ff1433e3006f..92b20cc6de28 100644
--- a/storage/ndb/include/kernel/LogLevel.hpp
+++ b/storage/ndb/include/kernel/LogLevel.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/NodeBitmask.hpp b/storage/ndb/include/kernel/NodeBitmask.hpp
index 88ca5464e0c8..6ce80ca79810 100644
--- a/storage/ndb/include/kernel/NodeBitmask.hpp
+++ b/storage/ndb/include/kernel/NodeBitmask.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/NodeInfo.hpp b/storage/ndb/include/kernel/NodeInfo.hpp
index 57108089b6a2..493549eee466 100644
--- a/storage/ndb/include/kernel/NodeInfo.hpp
+++ b/storage/ndb/include/kernel/NodeInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/NodeState.hpp b/storage/ndb/include/kernel/NodeState.hpp
index 28986654e64d..a849c2423b48 100644
--- a/storage/ndb/include/kernel/NodeState.hpp
+++ b/storage/ndb/include/kernel/NodeState.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/RefConvert.hpp b/storage/ndb/include/kernel/RefConvert.hpp
index 45c88af8dbc6..4336f912b136 100644
--- a/storage/ndb/include/kernel/RefConvert.hpp
+++ b/storage/ndb/include/kernel/RefConvert.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/kernel_config_parameters.h b/storage/ndb/include/kernel/kernel_config_parameters.h
index a3f9a289ed43..40ca2730a8a1 100644
--- a/storage/ndb/include/kernel/kernel_config_parameters.h
+++ b/storage/ndb/include/kernel/kernel_config_parameters.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/kernel_types.h b/storage/ndb/include/kernel/kernel_types.h
index 4a7547464681..ab63ea83ef31 100644
--- a/storage/ndb/include/kernel/kernel_types.h
+++ b/storage/ndb/include/kernel/kernel_types.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006, 2008 MySQL AB, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h
index 6ee526cb6d41..98f27d2dd207 100644
--- a/storage/ndb/include/kernel/ndb_limits.h
+++ b/storage/ndb/include/kernel/ndb_limits.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AbortAll.hpp b/storage/ndb/include/kernel/signaldata/AbortAll.hpp
index f3a078e0b813..82f4d4fb76a2 100644
--- a/storage/ndb/include/kernel/signaldata/AbortAll.hpp
+++ b/storage/ndb/include/kernel/signaldata/AbortAll.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AccFrag.hpp b/storage/ndb/include/kernel/signaldata/AccFrag.hpp
index ef765c2d4033..af40946d090d 100644
--- a/storage/ndb/include/kernel/signaldata/AccFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AccLock.hpp b/storage/ndb/include/kernel/signaldata/AccLock.hpp
index e45a9e3c7636..647650db43f8 100644
--- a/storage/ndb/include/kernel/signaldata/AccLock.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccLock.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AccScan.hpp b/storage/ndb/include/kernel/signaldata/AccScan.hpp
index 08647798ab01..8cebc83ac95f 100644
--- a/storage/ndb/include/kernel/signaldata/AccScan.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccScan.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
index 0154f0342db7..eee51dd15bb0 100644
--- a/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AllocMem.hpp b/storage/ndb/include/kernel/signaldata/AllocMem.hpp
index 257e9928ac18..da68a96e14e3 100644
--- a/storage/ndb/include/kernel/signaldata/AllocMem.hpp
+++ b/storage/ndb/include/kernel/signaldata/AllocMem.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp b/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
index 7ca1aec2f24c..7b519ed85e12 100644
--- a/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
+++ b/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AlterIndx.hpp b/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
index 51966d294fba..14257a6cd5f5 100644
--- a/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp b/storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp
index 03565444d9cf..e2c43c17bf0d 100644
--- a/storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterIndxImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AlterTab.hpp b/storage/ndb/include/kernel/signaldata/AlterTab.hpp
index 86a66ecd3c5d..f0572d5435b5 100644
--- a/storage/ndb/include/kernel/signaldata/AlterTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AlterTable.hpp b/storage/ndb/include/kernel/signaldata/AlterTable.hpp
index 2cbc9870f292..c9899a662f78 100644
--- a/storage/ndb/include/kernel/signaldata/AlterTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp b/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
index ede6e9de7970..7758e2e9c9ba 100644
--- a/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
+++ b/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
index 7fe86d086284..05e411cdd313 100644
--- a/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ApiVersion.hpp b/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
index 56def225a0c1..9ef6f7c80656 100644
--- a/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
+++ b/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp b/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
index c285ec03dced..ca0b4213fe29 100644
--- a/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/AttrInfo.hpp b/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
index ae7d22d344ac..5d53c436b930 100644
--- a/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
index c3731baf47d3..c78bf0d46b3d 100644
--- a/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BackupImpl.hpp b/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
index 64b6d31d172a..e512a38cef74 100644
--- a/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BackupLockTab.hpp b/storage/ndb/include/kernel/signaldata/BackupLockTab.hpp
index cc579f4fb21d..42e2abe635be 100644
--- a/storage/ndb/include/kernel/signaldata/BackupLockTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupLockTab.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp b/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
index 88f49e9c6ef6..ccf65cffbf3a 100644
--- a/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp b/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
index 77c6106f148a..bdbc19a79d70 100644
--- a/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BuildFK.hpp b/storage/ndb/include/kernel/signaldata/BuildFK.hpp
index 4197536f7f9c..d33b0771e73c 100644
--- a/storage/ndb/include/kernel/signaldata/BuildFK.hpp
+++ b/storage/ndb/include/kernel/signaldata/BuildFK.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BuildFKImpl.hpp b/storage/ndb/include/kernel/signaldata/BuildFKImpl.hpp
index b42fb79b637e..4f8cb4fbaea5 100644
--- a/storage/ndb/include/kernel/signaldata/BuildFKImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/BuildFKImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BuildIndx.hpp b/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
index 70874ef8848d..44d9da3830d8 100644
--- a/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp b/storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp
index ec4d4e6c8b20..2bb5b32c61f2 100644
--- a/storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/BuildIndxImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CallbackSignal.hpp b/storage/ndb/include/kernel/signaldata/CallbackSignal.hpp
index 21bd9669c961..0d781ef5cbd4 100644
--- a/storage/ndb/include/kernel/signaldata/CallbackSignal.hpp
+++ b/storage/ndb/include/kernel/signaldata/CallbackSignal.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp b/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
index 2d283d2ff5c6..a18f8aa9e336 100644
--- a/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
+++ b/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp b/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
index 38de776da905..c4a6ef82c3f4 100644
--- a/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CmInit.hpp b/storage/ndb/include/kernel/signaldata/CmInit.hpp
index a8db2791d67b..24fa3630ebec 100644
--- a/storage/ndb/include/kernel/signaldata/CmInit.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmInit.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
index 711355aec36e..7bf96c601206 100644
--- a/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp b/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
index c6102a64185d..7aee80817a46 100644
--- a/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
index 974adb620ea3..cd285049e966 100644
--- a/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
index d55feb4a0259..34717d4142f9 100644
--- a/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CntrStart.hpp b/storage/ndb/include/kernel/signaldata/CntrStart.hpp
index 589cf6ac5f3f..58c7ba85c711 100644
--- a/storage/ndb/include/kernel/signaldata/CntrStart.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrStart.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ConfigChange.hpp b/storage/ndb/include/kernel/signaldata/ConfigChange.hpp
index 6b2836daed2c..fdf94cfaa51d 100644
--- a/storage/ndb/include/kernel/signaldata/ConfigChange.hpp
+++ b/storage/ndb/include/kernel/signaldata/ConfigChange.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp b/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
index 40d80f1ca260..6fd3e537f971 100644
--- a/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
+++ b/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
index 79b33f128d7d..306f1de1318c 100644
--- a/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
+++ b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CopyActive.hpp b/storage/ndb/include/kernel/signaldata/CopyActive.hpp
index ca549476880e..a7219612315b 100644
--- a/storage/ndb/include/kernel/signaldata/CopyActive.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyActive.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CopyData.hpp b/storage/ndb/include/kernel/signaldata/CopyData.hpp
index 639772fe8b0f..0a06c5400d07 100644
--- a/storage/ndb/include/kernel/signaldata/CopyData.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyData.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CopyFrag.hpp b/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
index a31f5ed3462e..23b186e1b4dd 100644
--- a/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp b/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
index fb6992e4a8bb..b6a37b50a0e0 100644
--- a/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CopyTab.hpp b/storage/ndb/include/kernel/signaldata/CopyTab.hpp
index b3cf44e60936..64a118ec373e 100644
--- a/storage/ndb/include/kernel/signaldata/CopyTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp b/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
index f75941957859..b19dfec73c46 100644
--- a/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateFK.hpp b/storage/ndb/include/kernel/signaldata/CreateFK.hpp
index 200d704513cd..44b859e36771 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFK.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFK.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateFKImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateFKImpl.hpp
index 0e43e5ecf822..1f0eaa4e526d 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFKImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFKImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp b/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
index c9b47b4a31bb..dd9fd775c0b2 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
index 6a1c4f086ab7..c6543201eb5e 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp b/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
index cccf6ef3b1ac..dbef04183657 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateHashMap.hpp b/storage/ndb/include/kernel/signaldata/CreateHashMap.hpp
index 024ee107186d..af2bcbd4f045 100644
--- a/storage/ndb/include/kernel/signaldata/CreateHashMap.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateHashMap.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateIndx.hpp b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
index 1b471a6b5094..8218986e832f 100644
--- a/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp
index d81346bd7cb7..3430c3e5a5a6 100644
--- a/storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateIndxImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateNodegroup.hpp b/storage/ndb/include/kernel/signaldata/CreateNodegroup.hpp
index 65d55ab3e907..6713aba027bb 100644
--- a/storage/ndb/include/kernel/signaldata/CreateNodegroup.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateNodegroup.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp
index 013d3ade4fcd..b593624c677e 100644
--- a/storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateNodegroupImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateObj.hpp b/storage/ndb/include/kernel/signaldata/CreateObj.hpp
index 077fa9207038..d41f35493187 100644
--- a/storage/ndb/include/kernel/signaldata/CreateObj.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateObj.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateTab.hpp b/storage/ndb/include/kernel/signaldata/CreateTab.hpp
index 1a450cacc284..2269ac33d38c 100644
--- a/storage/ndb/include/kernel/signaldata/CreateTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateTable.hpp b/storage/ndb/include/kernel/signaldata/CreateTable.hpp
index bdd70df10c98..15bf2de9d9a4 100644
--- a/storage/ndb/include/kernel/signaldata/CreateTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateTrig.hpp b/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
index f460017d5071..5b9354ef73cd 100644
--- a/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp
index 05473bb926e4..5d10f48d3509 100644
--- a/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTrigImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DataFileOrd.hpp b/storage/ndb/include/kernel/signaldata/DataFileOrd.hpp
index 5b88a7d0e4e9..7b8bef71a505 100644
--- a/storage/ndb/include/kernel/signaldata/DataFileOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/DataFileOrd.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DbinfoScan.hpp b/storage/ndb/include/kernel/signaldata/DbinfoScan.hpp
index a630e0a6d508..db7402aa8ee7 100644
--- a/storage/ndb/include/kernel/signaldata/DbinfoScan.hpp
+++ b/storage/ndb/include/kernel/signaldata/DbinfoScan.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DbspjErr.hpp b/storage/ndb/include/kernel/signaldata/DbspjErr.hpp
index 7e783fff86b3..da801f2c71a2 100644
--- a/storage/ndb/include/kernel/signaldata/DbspjErr.hpp
+++ b/storage/ndb/include/kernel/signaldata/DbspjErr.hpp
@@ -1,15 +1,22 @@
 
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DiAddTab.hpp b/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
index 7d4ddb82b3b7..0046fa261562 100644
--- a/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp b/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
index 9d50749f0e41..4e045ee11a72 100644
--- a/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
+++ b/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictLock.hpp b/storage/ndb/include/kernel/signaldata/DictLock.hpp
index 9ee3f1eb21a6..767c1d12024f 100644
--- a/storage/ndb/include/kernel/signaldata/DictLock.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictLock.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictObjOp.hpp b/storage/ndb/include/kernel/signaldata/DictObjOp.hpp
index 6d9544262b22..2784ca79e8e3 100644
--- a/storage/ndb/include/kernel/signaldata/DictObjOp.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictObjOp.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp b/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
index 6f94e21020e4..fce437f683d2 100644
--- a/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictSignal.hpp b/storage/ndb/include/kernel/signaldata/DictSignal.hpp
index 3650df5bf84d..49c1c00dc282 100644
--- a/storage/ndb/include/kernel/signaldata/DictSignal.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictSignal.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
index c1d1c18b10cc..794225c9e4f3 100644
--- a/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictStart.hpp b/storage/ndb/include/kernel/signaldata/DictStart.hpp
index 9b6a5aaf3902..8745d560db3e 100644
--- a/storage/ndb/include/kernel/signaldata/DictStart.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictStart.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
index cc90f13cc12f..f9c965a4b2a9 100644
--- a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DictTakeover.hpp b/storage/ndb/include/kernel/signaldata/DictTakeover.hpp
index 27183706d3c2..73ae56437204 100644
--- a/storage/ndb/include/kernel/signaldata/DictTakeover.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictTakeover.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp b/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
index 17e3b2c9d729..e4a380e45ed9 100644
--- a/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihContinueB.hpp b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
index 1d609266cbcb..991ea7e12b3b 100644
--- a/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihFragCount.hpp b/storage/ndb/include/kernel/signaldata/DihFragCount.hpp
index d4f036680803..5ca24a42efc2 100644
--- a/storage/ndb/include/kernel/signaldata/DihFragCount.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihFragCount.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihGetTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DihGetTabInfo.hpp
index d38a35254f03..18b1b7a618a6 100644
--- a/storage/ndb/include/kernel/signaldata/DihGetTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihGetTabInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihRestart.hpp b/storage/ndb/include/kernel/signaldata/DihRestart.hpp
index 0cd7eda90f9c..e0500e8dbd70 100644
--- a/storage/ndb/include/kernel/signaldata/DihRestart.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihRestart.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihScanTab.hpp b/storage/ndb/include/kernel/signaldata/DihScanTab.hpp
index 026bd4c6d3e5..a76cb5f14e1d 100644
--- a/storage/ndb/include/kernel/signaldata/DihScanTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihScanTab.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
index 05149c7338b9..83047f0c99d2 100644
--- a/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihStartTab.hpp b/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
index ac2aac43ea3c..6a44b4ec9a92 100644
--- a/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp b/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
index 46623bae2192..668bcf48b5e5 100644
--- a/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp b/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
index 41919c1dbf78..87d854b826fb 100644
--- a/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropFK.hpp b/storage/ndb/include/kernel/signaldata/DropFK.hpp
index 30be49a1bd36..f4d45ef69b0d 100644
--- a/storage/ndb/include/kernel/signaldata/DropFK.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropFK.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropFKImpl.hpp b/storage/ndb/include/kernel/signaldata/DropFKImpl.hpp
index 67bb06eb49ce..3afd3bb692d4 100644
--- a/storage/ndb/include/kernel/signaldata/DropFKImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropFKImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp b/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
index d2df19cb3b74..397243e3b135 100644
--- a/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
index 6997512e6cfa..81b0fdb248e3 100644
--- a/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropIndx.hpp b/storage/ndb/include/kernel/signaldata/DropIndx.hpp
index 3a1ea1b72d7f..f1569488b5f7 100644
--- a/storage/ndb/include/kernel/signaldata/DropIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropIndx.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp b/storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp
index ac56b1d911e0..310e13ced424 100644
--- a/storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropIndxImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropNodegroup.hpp b/storage/ndb/include/kernel/signaldata/DropNodegroup.hpp
index 432ceb5c6c7e..93c70d98dd27 100644
--- a/storage/ndb/include/kernel/signaldata/DropNodegroup.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropNodegroup.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp
index 8b2f7b025108..d1df478629bf 100644
--- a/storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropNodegroupImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropObj.hpp b/storage/ndb/include/kernel/signaldata/DropObj.hpp
index 3ffdca2889ab..732968c15f4b 100644
--- a/storage/ndb/include/kernel/signaldata/DropObj.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropObj.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropTab.hpp b/storage/ndb/include/kernel/signaldata/DropTab.hpp
index 3576d7325e5a..bb88c354d4f2 100644
--- a/storage/ndb/include/kernel/signaldata/DropTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropTabFile.hpp b/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
index 9784671547f7..b0f33388227d 100644
--- a/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropTable.hpp b/storage/ndb/include/kernel/signaldata/DropTable.hpp
index b2fbcfb41f87..a2f8946a439e 100644
--- a/storage/ndb/include/kernel/signaldata/DropTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropTrig.hpp b/storage/ndb/include/kernel/signaldata/DropTrig.hpp
index dab068648e74..d415c46265ec 100644
--- a/storage/ndb/include/kernel/signaldata/DropTrig.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTrig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DropTrigImpl.hpp b/storage/ndb/include/kernel/signaldata/DropTrigImpl.hpp
index 3a089547c952..6abe264a157b 100644
--- a/storage/ndb/include/kernel/signaldata/DropTrigImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTrigImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
index b3989a8d369e..5c737a50144a 100644
--- a/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp b/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
index db5935c7b933..b89a929836df 100644
--- a/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
+++ b/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/EnableCom.hpp b/storage/ndb/include/kernel/signaldata/EnableCom.hpp
index 3512a9f12a10..e6d7ff796ee6 100644
--- a/storage/ndb/include/kernel/signaldata/EnableCom.hpp
+++ b/storage/ndb/include/kernel/signaldata/EnableCom.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/EventReport.hpp b/storage/ndb/include/kernel/signaldata/EventReport.hpp
index fb305ae14bad..00b81ebecf84 100644
--- a/storage/ndb/include/kernel/signaldata/EventReport.hpp
+++ b/storage/ndb/include/kernel/signaldata/EventReport.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp b/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
index 576a65c37094..8cca94e20c2e 100644
--- a/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp b/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
index 5c025e77cdf1..5efa63413cdc 100644
--- a/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/Extent.hpp b/storage/ndb/include/kernel/signaldata/Extent.hpp
index 300640ee4ea5..c82e725ef292 100644
--- a/storage/ndb/include/kernel/signaldata/Extent.hpp
+++ b/storage/ndb/include/kernel/signaldata/Extent.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FailRep.hpp b/storage/ndb/include/kernel/signaldata/FailRep.hpp
index 47970266c358..13b17645cc70 100644
--- a/storage/ndb/include/kernel/signaldata/FailRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/FailRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
index b740dca9ea30..093b13bffe58 100644
--- a/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp b/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
index 39a542328ed0..cafff007eae5 100644
--- a/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp b/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
index c38d5c03b6c9..f6abbbcb9e84 100644
--- a/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsConf.hpp b/storage/ndb/include/kernel/signaldata/FsConf.hpp
index 164cd19b29a2..f69b9d372145 100644
--- a/storage/ndb/include/kernel/signaldata/FsConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
index eec6fad3a86e..3794abe6d9ca 100644
--- a/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
index 59b342c1ef4d..f9ae55421ff6 100644
--- a/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsRef.hpp b/storage/ndb/include/kernel/signaldata/FsRef.hpp
index f143f0292479..6b59336f1a19 100644
--- a/storage/ndb/include/kernel/signaldata/FsRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsRef.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp b/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
index 97bfca7c83b9..ee6a0946776c 100644
--- a/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/GCP.hpp b/storage/ndb/include/kernel/signaldata/GCP.hpp
index b5e1ffe0f862..5820d9f6e0a8 100644
--- a/storage/ndb/include/kernel/signaldata/GCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/GCP.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/GetConfig.hpp b/storage/ndb/include/kernel/signaldata/GetConfig.hpp
index 8c3056a4f381..940eb88d9862 100644
--- a/storage/ndb/include/kernel/signaldata/GetConfig.hpp
+++ b/storage/ndb/include/kernel/signaldata/GetConfig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
index ead9e3ed145f..a5ce7170ba08 100644
--- a/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/GetTableId.hpp b/storage/ndb/include/kernel/signaldata/GetTableId.hpp
index a12fda0925c4..addb69c4a9e1 100644
--- a/storage/ndb/include/kernel/signaldata/GetTableId.hpp
+++ b/storage/ndb/include/kernel/signaldata/GetTableId.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/HashMapImpl.hpp b/storage/ndb/include/kernel/signaldata/HashMapImpl.hpp
index 07735f3b164f..6a76ef9a523d 100644
--- a/storage/ndb/include/kernel/signaldata/HashMapImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/HashMapImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp b/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
index e447b06293cf..a09f665a2615 100644
--- a/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp b/storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp
index b9ff11055208..d7b3ff142532 100644
--- a/storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp
+++ b/storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
index c0d520c74bd4..6bf6c5273346 100644
--- a/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
index c780f6abc367..f8a799bb00b7 100644
--- a/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
index 9213a7aa27e1..7089f80cba28 100644
--- a/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
index bdd110d62096..388d9c84c3b1 100644
--- a/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/IsolateOrd.hpp b/storage/ndb/include/kernel/signaldata/IsolateOrd.hpp
index 07f390336404..c32020c1b5b1 100644
--- a/storage/ndb/include/kernel/signaldata/IsolateOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/IsolateOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014  Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/KeyInfo.hpp b/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
index 72da8d2b1eb6..44216ac2a9b4 100644
--- a/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LCP.hpp b/storage/ndb/include/kernel/signaldata/LCP.hpp
index f3d9fc1e1182..52104fa157da 100644
--- a/storage/ndb/include/kernel/signaldata/LCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/LCP.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp b/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
index 2474b01cd17d..ddc42bfc4507 100644
--- a/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ListTables.hpp b/storage/ndb/include/kernel/signaldata/ListTables.hpp
index f2647a193467..ad2080c4d076 100644
--- a/storage/ndb/include/kernel/signaldata/ListTables.hpp
+++ b/storage/ndb/include/kernel/signaldata/ListTables.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LocalRouteOrd.hpp b/storage/ndb/include/kernel/signaldata/LocalRouteOrd.hpp
index 52774a14cd63..baa7e86f291f 100644
--- a/storage/ndb/include/kernel/signaldata/LocalRouteOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/LocalRouteOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LqhFrag.hpp b/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
index d6eb16ff1a33..a39ab4dfb490 100644
--- a/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LqhKey.hpp b/storage/ndb/include/kernel/signaldata/LqhKey.hpp
index 9bb2a2ca5385..c113aaf00781 100644
--- a/storage/ndb/include/kernel/signaldata/LqhKey.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhKey.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
index e9813c4fe22b..f9d592aea33e 100644
--- a/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
index 181bcb5f7088..712d5a6fa001 100644
--- a/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/LqhTransReq.hpp b/storage/ndb/include/kernel/signaldata/LqhTransReq.hpp
index 8f687a36dd3a..d7d51ca9ea60 100644
--- a/storage/ndb/include/kernel/signaldata/LqhTransReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhTransReq.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/MasterGCP.hpp b/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
index e52454e4c0dd..a31aa9a2dae4 100644
--- a/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/MasterLCP.hpp b/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
index e99cb5d5e4bb..970941e564ed 100644
--- a/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp b/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
index cf59c03f4b5c..c3bbab0d51cc 100644
--- a/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NdbSttor.hpp b/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
index dd2de5e920a0..62820d289a43 100644
--- a/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
+++ b/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp b/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
index 2d35c53b5dc7..8c241e1881b3 100644
--- a/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NextScan.hpp b/storage/ndb/include/kernel/signaldata/NextScan.hpp
index 82901e43a662..8a6c2b569b3a 100644
--- a/storage/ndb/include/kernel/signaldata/NextScan.hpp
+++ b/storage/ndb/include/kernel/signaldata/NextScan.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp b/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
index 39f3e732feb4..1382d50a2078 100644
--- a/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NodePing.hpp b/storage/ndb/include/kernel/signaldata/NodePing.hpp
index 19a94df1789d..321dea885960 100644
--- a/storage/ndb/include/kernel/signaldata/NodePing.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodePing.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NodeRecoveryStatusRep.hpp b/storage/ndb/include/kernel/signaldata/NodeRecoveryStatusRep.hpp
index a27e7a5e394b..e9e241699dad 100644
--- a/storage/ndb/include/kernel/signaldata/NodeRecoveryStatusRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodeRecoveryStatusRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp b/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
index b3870ac479fc..75f5d0711330 100644
--- a/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/PackedSignal.hpp b/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
index acc973790436..15403079cad8 100644
--- a/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
+++ b/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp b/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
index c38376b2f209..c4bb1df126cc 100644
--- a/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp b/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
index 84b1667aff6a..ea9183892641 100644
--- a/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp b/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
index 81d682955efe..1b4774ba143f 100644
--- a/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/QueryTree.hpp b/storage/ndb/include/kernel/signaldata/QueryTree.hpp
index ae1dcb64c956..7afc1f88a2c2 100644
--- a/storage/ndb/include/kernel/signaldata/QueryTree.hpp
+++ b/storage/ndb/include/kernel/signaldata/QueryTree.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ReadConfig.hpp b/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
index 6a6e984d8d90..5b6afd47f4b0 100644
--- a/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
+++ b/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp b/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
index eeeb312fcdf8..b14c46161fbe 100644
--- a/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/RelTabMem.hpp b/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
index cfb09b0dd056..d217e221b216 100644
--- a/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
+++ b/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ReleasePages.hpp b/storage/ndb/include/kernel/signaldata/ReleasePages.hpp
index 92e2e370baf5..ac45efc6788c 100644
--- a/storage/ndb/include/kernel/signaldata/ReleasePages.hpp
+++ b/storage/ndb/include/kernel/signaldata/ReleasePages.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp b/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
index 4a3914853f96..af1723102e21 100644
--- a/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp b/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
index ea2e9e61dae4..53e9e847d1c0 100644
--- a/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ResumeReq.hpp b/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
index f751a55a3357..c69cb3a42a2a 100644
--- a/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/RouteOrd.hpp b/storage/ndb/include/kernel/signaldata/RouteOrd.hpp
index 43bf139cb64d..9c9df636276b 100644
--- a/storage/ndb/include/kernel/signaldata/RouteOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/RouteOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ScanFrag.hpp b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
index f3dd5c625b51..cd95a81249aa 100644
--- a/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/ScanTab.hpp b/storage/ndb/include/kernel/signaldata/ScanTab.hpp
index 459e58d95df6..c392afb92ea1 100644
--- a/storage/ndb/include/kernel/signaldata/ScanTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/ScanTab.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SchemaTrans.hpp b/storage/ndb/include/kernel/signaldata/SchemaTrans.hpp
index f0f32112cf0c..20b872c048d0 100644
--- a/storage/ndb/include/kernel/signaldata/SchemaTrans.hpp
+++ b/storage/ndb/include/kernel/signaldata/SchemaTrans.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SchemaTransImpl.hpp b/storage/ndb/include/kernel/signaldata/SchemaTransImpl.hpp
index f300fb6f2db2..ab679ebf37f9 100644
--- a/storage/ndb/include/kernel/signaldata/SchemaTransImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/SchemaTransImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
index 3cd726dd8680..272c58a5e099 100644
--- a/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SetVarReq.hpp b/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
index d4815d3d093d..37dac0f74ddc 100644
--- a/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SignalData.hpp b/storage/ndb/include/kernel/signaldata/SignalData.hpp
index 12e345559716..841548acfe9c 100644
--- a/storage/ndb/include/kernel/signaldata/SignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp b/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
index 124e4d076d67..ea2cdd45b4f6 100644
--- a/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp b/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
index d748dcd33ea5..82ea9cf17f41 100644
--- a/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp b/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
index b72d19266f05..933793ede41b 100644
--- a/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartFragReq.hpp b/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
index 2ae620d5ae3f..114c4d464f03 100644
--- a/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartInfo.hpp b/storage/ndb/include/kernel/signaldata/StartInfo.hpp
index abd6a8fc4a23..39f8f694158e 100644
--- a/storage/ndb/include/kernel/signaldata/StartInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartMe.hpp b/storage/ndb/include/kernel/signaldata/StartMe.hpp
index 23bf4c4ed4b4..e0c84e084870 100644
--- a/storage/ndb/include/kernel/signaldata/StartMe.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartMe.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartOrd.hpp b/storage/ndb/include/kernel/signaldata/StartOrd.hpp
index cfb8eea7473d..299197aae1a9 100644
--- a/storage/ndb/include/kernel/signaldata/StartOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartPerm.hpp b/storage/ndb/include/kernel/signaldata/StartPerm.hpp
index a61dc83499ff..a2c71f2b48c0 100644
--- a/storage/ndb/include/kernel/signaldata/StartPerm.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartPerm.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StartRec.hpp b/storage/ndb/include/kernel/signaldata/StartRec.hpp
index 3d47a4501dd0..c78922040b87 100644
--- a/storage/ndb/include/kernel/signaldata/StartRec.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartRec.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StopForCrash.hpp b/storage/ndb/include/kernel/signaldata/StopForCrash.hpp
index 7f287697b1c7..3177e783e633 100644
--- a/storage/ndb/include/kernel/signaldata/StopForCrash.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopForCrash.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StopMe.hpp b/storage/ndb/include/kernel/signaldata/StopMe.hpp
index b2b1441c3810..80aa9666fd28 100644
--- a/storage/ndb/include/kernel/signaldata/StopMe.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopMe.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StopPerm.hpp b/storage/ndb/include/kernel/signaldata/StopPerm.hpp
index 588f6a4731cf..f6e0c92b8e9c 100644
--- a/storage/ndb/include/kernel/signaldata/StopPerm.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopPerm.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/StopReq.hpp b/storage/ndb/include/kernel/signaldata/StopReq.hpp
index 2fb2fc75316b..c99e5edcba82 100644
--- a/storage/ndb/include/kernel/signaldata/StopReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SumaImpl.hpp b/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
index 9d0161f507b2..9efcf0b9bb9e 100644
--- a/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/Sync.hpp b/storage/ndb/include/kernel/signaldata/Sync.hpp
index 31ef34439d8d..6570e3414ff5 100644
--- a/storage/ndb/include/kernel/signaldata/Sync.hpp
+++ b/storage/ndb/include/kernel/signaldata/Sync.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/SystemError.hpp b/storage/ndb/include/kernel/signaldata/SystemError.hpp
index 33dc1d710b32..b03673c70f34 100644
--- a/storage/ndb/include/kernel/signaldata/SystemError.hpp
+++ b/storage/ndb/include/kernel/signaldata/SystemError.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TabCommit.hpp b/storage/ndb/include/kernel/signaldata/TabCommit.hpp
index 5323c2219706..3174e5e8966c 100644
--- a/storage/ndb/include/kernel/signaldata/TabCommit.hpp
+++ b/storage/ndb/include/kernel/signaldata/TabCommit.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TakeOver.hpp b/storage/ndb/include/kernel/signaldata/TakeOver.hpp
index d0d9b051cee7..272831d08cc4 100644
--- a/storage/ndb/include/kernel/signaldata/TakeOver.hpp
+++ b/storage/ndb/include/kernel/signaldata/TakeOver.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TamperOrd.hpp b/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
index 6af1d66d9378..03ab84bf7d01 100644
--- a/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcCommit.hpp b/storage/ndb/include/kernel/signaldata/TcCommit.hpp
index 0499d002ee6c..5271661b78ed 100644
--- a/storage/ndb/include/kernel/signaldata/TcCommit.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcCommit.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcContinueB.hpp b/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
index 120913a3d4e3..d6f1a8801112 100644
--- a/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcHbRep.hpp b/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
index 3aa61cf362a7..b790861e0648 100644
--- a/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcIndx.hpp b/storage/ndb/include/kernel/signaldata/TcIndx.hpp
index 79eb81095b7e..8a8695398aa5 100644
--- a/storage/ndb/include/kernel/signaldata/TcIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcIndx.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
index b4e02c596f11..bc49763146ec 100644
--- a/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
index eb4bea3de391..dc03a7061fbc 100644
--- a/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
index ce501ce924c3..4a9fa3f7da91 100644
--- a/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
index 19b8ba83d2b9..f42c657e6b80 100644
--- a/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
index 5a55d4e86e89..a75362657ac5 100644
--- a/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
index d32d6625bd76..e8e8023ead9b 100644
--- a/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TestOrd.hpp b/storage/ndb/include/kernel/signaldata/TestOrd.hpp
index ae5ac06edb09..d8eec646e5af 100644
--- a/storage/ndb/include/kernel/signaldata/TestOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/TestOrd.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TransIdAI.hpp b/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
index 3deee866a918..ca375c72f923 100644
--- a/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
+++ b/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
index 9e8bc2815bbd..4f67c6334af9 100644
--- a/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp b/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
index 02b19ad0510d..f9130ed32b37 100644
--- a/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TupCommit.hpp b/storage/ndb/include/kernel/signaldata/TupCommit.hpp
index 89cac920ef1e..f0ad9607878f 100644
--- a/storage/ndb/include/kernel/signaldata/TupCommit.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupCommit.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TupFrag.hpp b/storage/ndb/include/kernel/signaldata/TupFrag.hpp
index d1ae8e7309ca..bb4d42da5626 100644
--- a/storage/ndb/include/kernel/signaldata/TupFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupFrag.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TupKey.hpp b/storage/ndb/include/kernel/signaldata/TupKey.hpp
index c0c83e94e576..3b1565b93b66 100644
--- a/storage/ndb/include/kernel/signaldata/TupKey.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupKey.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
index 0ec1d018447e..83a1b779b0b1 100644
--- a/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TuxBound.hpp b/storage/ndb/include/kernel/signaldata/TuxBound.hpp
index 6d0898fea5d1..43640cadb2ac 100644
--- a/storage/ndb/include/kernel/signaldata/TuxBound.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxBound.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp b/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
index 314b4020af2e..d570e723452f 100644
--- a/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TuxMaint.hpp b/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
index f6103bbe1f10..c7aa6cbb38a2 100644
--- a/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
index c3ced7ce7435..c7225aeed237 100644
--- a/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/Upgrade.hpp b/storage/ndb/include/kernel/signaldata/Upgrade.hpp
index a1bbb6867ee3..8e4103371a8b 100644
--- a/storage/ndb/include/kernel/signaldata/Upgrade.hpp
+++ b/storage/ndb/include/kernel/signaldata/Upgrade.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilDelete.hpp b/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
index 4d16a713e03e..eb1ad5f67a50 100644
--- a/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilExecute.hpp b/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
index eee4e940be4a..75d1de70bb85 100644
--- a/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilLock.hpp b/storage/ndb/include/kernel/signaldata/UtilLock.hpp
index b2e60d0e0f0e..5987a86f8c26 100644
--- a/storage/ndb/include/kernel/signaldata/UtilLock.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilLock.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp b/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
index 5562a2177323..a8c56852d4f4 100644
--- a/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilRelease.hpp b/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
index b47b094b607f..71deaa606747 100644
--- a/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/UtilSequence.hpp b/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
index 6da178632722..b1a906d80b1f 100644
--- a/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/signaldata/WaitGCP.hpp b/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
index 8176ab5a7ae8..ff46bef296b0 100644
--- a/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/statedesc.hpp b/storage/ndb/include/kernel/statedesc.hpp
index 0dfb675be0cf..cfefc06c0fe9 100644
--- a/storage/ndb/include/kernel/statedesc.hpp
+++ b/storage/ndb/include/kernel/statedesc.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/kernel/trigger_definitions.h b/storage/ndb/include/kernel/trigger_definitions.h
index ab5407f3a0e2..a4827493ab60 100644
--- a/storage/ndb/include/kernel/trigger_definitions.h
+++ b/storage/ndb/include/kernel/trigger_definitions.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/logger/ConsoleLogHandler.hpp b/storage/ndb/include/logger/ConsoleLogHandler.hpp
index fe7f91e2f367..2184b5d5876d 100644
--- a/storage/ndb/include/logger/ConsoleLogHandler.hpp
+++ b/storage/ndb/include/logger/ConsoleLogHandler.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/logger/FileLogHandler.hpp b/storage/ndb/include/logger/FileLogHandler.hpp
index 132da7ba8a86..c38ba31e995f 100644
--- a/storage/ndb/include/logger/FileLogHandler.hpp
+++ b/storage/ndb/include/logger/FileLogHandler.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/logger/LogHandler.hpp b/storage/ndb/include/logger/LogHandler.hpp
index 12150c088978..1e52ea4d46b9 100644
--- a/storage/ndb/include/logger/LogHandler.hpp
+++ b/storage/ndb/include/logger/LogHandler.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/logger/Logger.hpp b/storage/ndb/include/logger/Logger.hpp
index 6ce2c200ae07..2eb5bb0c9faa 100644
--- a/storage/ndb/include/logger/Logger.hpp
+++ b/storage/ndb/include/logger/Logger.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/logger/SysLogHandler.hpp b/storage/ndb/include/logger/SysLogHandler.hpp
index 6909edc6a1f5..a81fb7dae977 100644
--- a/storage/ndb/include/logger/SysLogHandler.hpp
+++ b/storage/ndb/include/logger/SysLogHandler.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/mgmapi.h b/storage/ndb/include/mgmapi/mgmapi.h
index 95dd7bd5be67..474ce902a45f 100644
--- a/storage/ndb/include/mgmapi/mgmapi.h
+++ b/storage/ndb/include/mgmapi/mgmapi.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
index d327779c254a..08c277357b49 100644
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h b/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
index 34b0735d4e33..1ce639d9d98e 100644
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/mgmapi_debug.h b/storage/ndb/include/mgmapi/mgmapi_debug.h
index 1a4e652af2f7..bda1bec9275f 100644
--- a/storage/ndb/include/mgmapi/mgmapi_debug.h
+++ b/storage/ndb/include/mgmapi/mgmapi_debug.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/mgmapi_error.h b/storage/ndb/include/mgmapi/mgmapi_error.h
index 68b591859c71..0dba18fabb87 100644
--- a/storage/ndb/include/mgmapi/mgmapi_error.h
+++ b/storage/ndb/include/mgmapi/mgmapi_error.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/ndb_logevent.h b/storage/ndb/include/mgmapi/ndb_logevent.h
index f1b366cf14ac..2540354523f6 100644
--- a/storage/ndb/include/mgmapi/ndb_logevent.h
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmapi/ndbd_exit_codes.h b/storage/ndb/include/mgmapi/ndbd_exit_codes.h
index 0e873bffc4af..f1852a003b65 100644
--- a/storage/ndb/include/mgmapi/ndbd_exit_codes.h
+++ b/storage/ndb/include/mgmapi/ndbd_exit_codes.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmcommon/ConfigRetriever.hpp b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
index 0fd276c302c5..5786a1859998 100644
--- a/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
+++ b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/mgmcommon/IPCConfig.hpp b/storage/ndb/include/mgmcommon/IPCConfig.hpp
index 949a00b64aaf..315f377c6dd0 100644
--- a/storage/ndb/include/mgmcommon/IPCConfig.hpp
+++ b/storage/ndb/include/mgmcommon/IPCConfig.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_config.h.in b/storage/ndb/include/ndb_config.h.in
index 96ba007310d4..4008b3eec314 100644
--- a/storage/ndb/include/ndb_config.h.in
+++ b/storage/ndb/include/ndb_config.h.in
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_constants.h b/storage/ndb/include/ndb_constants.h
index 4cba72ae9b8f..5d6be370ab0e 100644
--- a/storage/ndb/include/ndb_constants.h
+++ b/storage/ndb/include/ndb_constants.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_global.h b/storage/ndb/include/ndb_global.h
index 14673574d0b6..3b0125f41aff 100644
--- a/storage/ndb/include/ndb_global.h
+++ b/storage/ndb/include/ndb_global.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_init.h b/storage/ndb/include/ndb_init.h
index a8e80010c842..e538ece965a8 100644
--- a/storage/ndb/include/ndb_init.h
+++ b/storage/ndb/include/ndb_init.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_net.h b/storage/ndb/include/ndb_net.h
index 661723064788..8c4e04d7d62c 100644
--- a/storage/ndb/include/ndb_net.h
+++ b/storage/ndb/include/ndb_net.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_types.h.in b/storage/ndb/include/ndb_types.h.in
index 377e8189b679..ec698a5beef8 100644
--- a/storage/ndb/include/ndb_types.h.in
+++ b/storage/ndb/include/ndb_types.h.in
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndb_version.h.in b/storage/ndb/include/ndb_version.h.in
index 9af333195266..a97b6f9c83b4 100644
--- a/storage/ndb/include/ndb_version.h.in
+++ b/storage/ndb/include/ndb_version.h.in
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp
index 56c25dc5df37..7468745fd61b 100644
--- a/storage/ndb/include/ndbapi/Ndb.hpp
+++ b/storage/ndb/include/ndbapi/Ndb.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbApi.hpp b/storage/ndb/include/ndbapi/NdbApi.hpp
index a11173688adf..83c32dd5de49 100644
--- a/storage/ndb/include/ndbapi/NdbApi.hpp
+++ b/storage/ndb/include/ndbapi/NdbApi.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbBlob.hpp b/storage/ndb/include/ndbapi/NdbBlob.hpp
index 648cca18bfaf..425c6e8bb059 100644
--- a/storage/ndb/include/ndbapi/NdbBlob.hpp
+++ b/storage/ndb/include/ndbapi/NdbBlob.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp
index 92d7e10aa904..b5fd608ee1dc 100644
--- a/storage/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbError.hpp b/storage/ndb/include/ndbapi/NdbError.hpp
index b7622f479385..f10f7e0ee4eb 100644
--- a/storage/ndb/include/ndbapi/NdbError.hpp
+++ b/storage/ndb/include/ndbapi/NdbError.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbEventOperation.hpp b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
index dfa1dd62cd40..5d6ea23bb200 100644
--- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbIndexOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
index 241c2abbe7c8..6d8c01688588 100644
--- a/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
index a288eda3d441..954f49ab257c 100644
--- a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbIndexStat.hpp b/storage/ndb/include/ndbapi/NdbIndexStat.hpp
index b7bdded3a2ea..497c1a8a9e36 100644
--- a/storage/ndb/include/ndbapi/NdbIndexStat.hpp
+++ b/storage/ndb/include/ndbapi/NdbIndexStat.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp b/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp
index 96c079d965d3..2d61aa030ce9 100644
--- a/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp
+++ b/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbOperation.hpp b/storage/ndb/include/ndbapi/NdbOperation.hpp
index 6db480833cbc..cc036b586058 100644
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbPool.hpp b/storage/ndb/include/ndbapi/NdbPool.hpp
index 1a8cbbc1a7e0..551b2cd73399 100644
--- a/storage/ndb/include/ndbapi/NdbPool.hpp
+++ b/storage/ndb/include/ndbapi/NdbPool.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbRecAttr.hpp b/storage/ndb/include/ndbapi/NdbRecAttr.hpp
index a87cc87056b4..c32c3fcdfb0d 100644
--- a/storage/ndb/include/ndbapi/NdbRecAttr.hpp
+++ b/storage/ndb/include/ndbapi/NdbRecAttr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbReceiver.hpp b/storage/ndb/include/ndbapi/NdbReceiver.hpp
index 3770c1c43489..5c46303875a7 100644
--- a/storage/ndb/include/ndbapi/NdbReceiver.hpp
+++ b/storage/ndb/include/ndbapi/NdbReceiver.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbScanFilter.hpp b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
index d990e4e6e765..5300c849d915 100644
--- a/storage/ndb/include/ndbapi/NdbScanFilter.hpp
+++ b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbScanOperation.hpp b/storage/ndb/include/ndbapi/NdbScanOperation.hpp
index 2e9e0f123f6a..671764a23193 100644
--- a/storage/ndb/include/ndbapi/NdbScanOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbScanOperation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/NdbTransaction.hpp b/storage/ndb/include/ndbapi/NdbTransaction.hpp
index f57907787e0e..c9a9aaae49f1 100644
--- a/storage/ndb/include/ndbapi/NdbTransaction.hpp
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp b/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
index 0e8175f837ae..41410aedecae 100644
--- a/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
+++ b/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/ndb_opt_defaults.h b/storage/ndb/include/ndbapi/ndb_opt_defaults.h
index 5eea6e7c8080..9fc44248741b 100644
--- a/storage/ndb/include/ndbapi/ndb_opt_defaults.h
+++ b/storage/ndb/include/ndbapi/ndb_opt_defaults.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/ndbapi_limits.h b/storage/ndb/include/ndbapi/ndbapi_limits.h
index bc76fd7cf791..e72b219c9d80 100644
--- a/storage/ndb/include/ndbapi/ndbapi_limits.h
+++ b/storage/ndb/include/ndbapi/ndbapi_limits.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/ndbapi/ndberror.h b/storage/ndb/include/ndbapi/ndberror.h
index d9a2c9f79567..b8df3a537143 100644
--- a/storage/ndb/include/ndbapi/ndberror.h
+++ b/storage/ndb/include/ndbapi/ndberror.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/newtonapi/dba.h b/storage/ndb/include/newtonapi/dba.h
index 75ef2d329c96..6b2ea3446c87 100644
--- a/storage/ndb/include/newtonapi/dba.h
+++ b/storage/ndb/include/newtonapi/dba.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/newtonapi/defs/pcn_types.h b/storage/ndb/include/newtonapi/defs/pcn_types.h
index fe15bc9c91a9..1618e74d9eca 100644
--- a/storage/ndb/include/newtonapi/defs/pcn_types.h
+++ b/storage/ndb/include/newtonapi/defs/pcn_types.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbCondition.h b/storage/ndb/include/portlib/NdbCondition.h
index 9fc90712c613..41df23584e74 100644
--- a/storage/ndb/include/portlib/NdbCondition.h
+++ b/storage/ndb/include/portlib/NdbCondition.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbConfig.h b/storage/ndb/include/portlib/NdbConfig.h
index 4a37f3a6c394..2f36ef27e1c2 100644
--- a/storage/ndb/include/portlib/NdbConfig.h
+++ b/storage/ndb/include/portlib/NdbConfig.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbDir.hpp b/storage/ndb/include/portlib/NdbDir.hpp
index 5957f28cce10..c714d7e658fe 100644
--- a/storage/ndb/include/portlib/NdbDir.hpp
+++ b/storage/ndb/include/portlib/NdbDir.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbEnv.h b/storage/ndb/include/portlib/NdbEnv.h
index d248e527f907..b3338275cb72 100644
--- a/storage/ndb/include/portlib/NdbEnv.h
+++ b/storage/ndb/include/portlib/NdbEnv.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbGetRUsage.h b/storage/ndb/include/portlib/NdbGetRUsage.h
index 80856faabb67..41788f161330 100644
--- a/storage/ndb/include/portlib/NdbGetRUsage.h
+++ b/storage/ndb/include/portlib/NdbGetRUsage.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbHost.h b/storage/ndb/include/portlib/NdbHost.h
index 0f42e5d4c76e..4bf8d89a4db0 100644
--- a/storage/ndb/include/portlib/NdbHost.h
+++ b/storage/ndb/include/portlib/NdbHost.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbLockCpuUtil.h b/storage/ndb/include/portlib/NdbLockCpuUtil.h
index dfa8847bb62e..8607ea6e734d 100644
--- a/storage/ndb/include/portlib/NdbLockCpuUtil.h
+++ b/storage/ndb/include/portlib/NdbLockCpuUtil.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbMain.h b/storage/ndb/include/portlib/NdbMain.h
index d9745c45c4ac..18d64ae3fcaa 100644
--- a/storage/ndb/include/portlib/NdbMain.h
+++ b/storage/ndb/include/portlib/NdbMain.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbMem.h b/storage/ndb/include/portlib/NdbMem.h
index e45fd60fc493..a4b4988c8c53 100644
--- a/storage/ndb/include/portlib/NdbMem.h
+++ b/storage/ndb/include/portlib/NdbMem.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbMutex.h b/storage/ndb/include/portlib/NdbMutex.h
index c0f0f9f1677d..65ac42604b46 100644
--- a/storage/ndb/include/portlib/NdbMutex.h
+++ b/storage/ndb/include/portlib/NdbMutex.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbNuma.h b/storage/ndb/include/portlib/NdbNuma.h
index c51fae2de852..19f4030992c8 100644
--- a/storage/ndb/include/portlib/NdbNuma.h
+++ b/storage/ndb/include/portlib/NdbNuma.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbSleep.h b/storage/ndb/include/portlib/NdbSleep.h
index e70526ff8df7..37c7156f12b2 100644
--- a/storage/ndb/include/portlib/NdbSleep.h
+++ b/storage/ndb/include/portlib/NdbSleep.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbTCP.h b/storage/ndb/include/portlib/NdbTCP.h
index a7e4ff0d5a39..863c4d98b13c 100644
--- a/storage/ndb/include/portlib/NdbTCP.h
+++ b/storage/ndb/include/portlib/NdbTCP.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbThread.h b/storage/ndb/include/portlib/NdbThread.h
index 6fea5fbc954d..8bb77cc28170 100644
--- a/storage/ndb/include/portlib/NdbThread.h
+++ b/storage/ndb/include/portlib/NdbThread.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/NdbTick.h b/storage/ndb/include/portlib/NdbTick.h
index 99a3fd582851..07cbee5d975b 100644
--- a/storage/ndb/include/portlib/NdbTick.h
+++ b/storage/ndb/include/portlib/NdbTick.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_daemon.h b/storage/ndb/include/portlib/ndb_daemon.h
index ffbc1c138d8e..7e12fa578e88 100644
--- a/storage/ndb/include/portlib/ndb_daemon.h
+++ b/storage/ndb/include/portlib/ndb_daemon.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_localtime.h b/storage/ndb/include/portlib/ndb_localtime.h
index dc2c73f2dffc..50f58cc8a1e0 100644
--- a/storage/ndb/include/portlib/ndb_localtime.h
+++ b/storage/ndb/include/portlib/ndb_localtime.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_prefetch.h b/storage/ndb/include/portlib/ndb_prefetch.h
index 86ab69b711d2..fd389629395b 100644
--- a/storage/ndb/include/portlib/ndb_prefetch.h
+++ b/storage/ndb/include/portlib/ndb_prefetch.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_socket.h b/storage/ndb/include/portlib/ndb_socket.h
index 86ceddd8aaee..d768e7a54a89 100644
--- a/storage/ndb/include/portlib/ndb_socket.h
+++ b/storage/ndb/include/portlib/ndb_socket.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_socket_poller.h b/storage/ndb/include/portlib/ndb_socket_poller.h
index 561bf4ed0f59..a61d5f366c5c 100644
--- a/storage/ndb/include/portlib/ndb_socket_poller.h
+++ b/storage/ndb/include/portlib/ndb_socket_poller.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_socket_posix.h b/storage/ndb/include/portlib/ndb_socket_posix.h
index 0fdcce404517..6d7b0e8f1930 100644
--- a/storage/ndb/include/portlib/ndb_socket_posix.h
+++ b/storage/ndb/include/portlib/ndb_socket_posix.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/portlib/ndb_socket_win32.h b/storage/ndb/include/portlib/ndb_socket_win32.h
index ce992b7502de..7d148b84536e 100644
--- a/storage/ndb/include/portlib/ndb_socket_win32.h
+++ b/storage/ndb/include/portlib/ndb_socket_win32.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/transporter/TransporterCallback.hpp b/storage/ndb/include/transporter/TransporterCallback.hpp
index a5bf134dcc29..785b6d7a1e32 100644
--- a/storage/ndb/include/transporter/TransporterCallback.hpp
+++ b/storage/ndb/include/transporter/TransporterCallback.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/transporter/TransporterDefinitions.hpp b/storage/ndb/include/transporter/TransporterDefinitions.hpp
index d4f528c98436..c68af9e655dc 100644
--- a/storage/ndb/include/transporter/TransporterDefinitions.hpp
+++ b/storage/ndb/include/transporter/TransporterDefinitions.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/transporter/TransporterRegistry.hpp b/storage/ndb/include/transporter/TransporterRegistry.hpp
index f24b576e7960..83fa061238aa 100644
--- a/storage/ndb/include/transporter/TransporterRegistry.hpp
+++ b/storage/ndb/include/transporter/TransporterRegistry.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/BaseString.hpp b/storage/ndb/include/util/BaseString.hpp
index c903dfb8e045..1a8ac2bbcb3d 100644
--- a/storage/ndb/include/util/BaseString.hpp
+++ b/storage/ndb/include/util/BaseString.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/Bitmask.hpp b/storage/ndb/include/util/Bitmask.hpp
index 4c185e54649b..a12f795081da 100644
--- a/storage/ndb/include/util/Bitmask.hpp
+++ b/storage/ndb/include/util/Bitmask.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/CharsetMap.hpp b/storage/ndb/include/util/CharsetMap.hpp
index 45c958f1dbbe..7c2044e11861 100644
--- a/storage/ndb/include/util/CharsetMap.hpp
+++ b/storage/ndb/include/util/CharsetMap.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/Checksum.hpp b/storage/ndb/include/util/Checksum.hpp
index a764d3267132..4bf8440de356 100644
--- a/storage/ndb/include/util/Checksum.hpp
+++ b/storage/ndb/include/util/Checksum.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/ConfigValues.hpp b/storage/ndb/include/util/ConfigValues.hpp
index 22cfc1f2d206..6a5584905b79 100644
--- a/storage/ndb/include/util/ConfigValues.hpp
+++ b/storage/ndb/include/util/ConfigValues.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/File.hpp b/storage/ndb/include/util/File.hpp
index 78c59c3dd327..c20e9ac29649 100644
--- a/storage/ndb/include/util/File.hpp
+++ b/storage/ndb/include/util/File.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/HashMap.hpp b/storage/ndb/include/util/HashMap.hpp
index 2a4ada777e0c..2f139f83a0c8 100644
--- a/storage/ndb/include/util/HashMap.hpp
+++ b/storage/ndb/include/util/HashMap.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/HashMap2.hpp b/storage/ndb/include/util/HashMap2.hpp
index a7c5768cc8af..6de6fdb34c0b 100644
--- a/storage/ndb/include/util/HashMap2.hpp
+++ b/storage/ndb/include/util/HashMap2.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/InputStream.hpp b/storage/ndb/include/util/InputStream.hpp
index 90cd8fb15971..3d3dc7280abe 100644
--- a/storage/ndb/include/util/InputStream.hpp
+++ b/storage/ndb/include/util/InputStream.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/LinkedStack.hpp b/storage/ndb/include/util/LinkedStack.hpp
index aa6ddb93757b..1171bd1135a4 100644
--- a/storage/ndb/include/util/LinkedStack.hpp
+++ b/storage/ndb/include/util/LinkedStack.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbAutoPtr.hpp b/storage/ndb/include/util/NdbAutoPtr.hpp
index e7a41926e91d..21f83d7dff75 100644
--- a/storage/ndb/include/util/NdbAutoPtr.hpp
+++ b/storage/ndb/include/util/NdbAutoPtr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbOut.hpp b/storage/ndb/include/util/NdbOut.hpp
index 918fda4f014b..aa45bb48c33c 100644
--- a/storage/ndb/include/util/NdbOut.hpp
+++ b/storage/ndb/include/util/NdbOut.hpp
@@ -1,14 +1,21 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbPack.hpp b/storage/ndb/include/util/NdbPack.hpp
index 23182dec594e..1351f40dce29 100644
--- a/storage/ndb/include/util/NdbPack.hpp
+++ b/storage/ndb/include/util/NdbPack.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbSqlUtil.hpp b/storage/ndb/include/util/NdbSqlUtil.hpp
index 4763e76b66dc..0660f9687e79 100644
--- a/storage/ndb/include/util/NdbSqlUtil.hpp
+++ b/storage/ndb/include/util/NdbSqlUtil.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbTap.hpp b/storage/ndb/include/util/NdbTap.hpp
index f947601fa8e7..dfe584b00c1a 100644
--- a/storage/ndb/include/util/NdbTap.hpp
+++ b/storage/ndb/include/util/NdbTap.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/NdbTypesUtil.hpp b/storage/ndb/include/util/NdbTypesUtil.hpp
index 64338c535d1a..aa9285eb332b 100644
--- a/storage/ndb/include/util/NdbTypesUtil.hpp
+++ b/storage/ndb/include/util/NdbTypesUtil.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/OutputStream.hpp b/storage/ndb/include/util/OutputStream.hpp
index 826b5f04605e..c1144d8c3afa 100644
--- a/storage/ndb/include/util/OutputStream.hpp
+++ b/storage/ndb/include/util/OutputStream.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/Parser.hpp b/storage/ndb/include/util/Parser.hpp
index 1098a57a9a16..cf6980c56baf 100644
--- a/storage/ndb/include/util/Parser.hpp
+++ b/storage/ndb/include/util/Parser.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/Properties.hpp b/storage/ndb/include/util/Properties.hpp
index cc86627300f9..575858a4164a 100644
--- a/storage/ndb/include/util/Properties.hpp
+++ b/storage/ndb/include/util/Properties.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/SimpleProperties.hpp b/storage/ndb/include/util/SimpleProperties.hpp
index 815bdd974481..2fa1233556a5 100644
--- a/storage/ndb/include/util/SimpleProperties.hpp
+++ b/storage/ndb/include/util/SimpleProperties.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/SocketAuthenticator.hpp b/storage/ndb/include/util/SocketAuthenticator.hpp
index 8de15074cc6a..850972e54cf0 100644
--- a/storage/ndb/include/util/SocketAuthenticator.hpp
+++ b/storage/ndb/include/util/SocketAuthenticator.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/SocketClient.hpp b/storage/ndb/include/util/SocketClient.hpp
index f8cdc1c1b626..d350054268a6 100644
--- a/storage/ndb/include/util/SocketClient.hpp
+++ b/storage/ndb/include/util/SocketClient.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/SocketServer.hpp b/storage/ndb/include/util/SocketServer.hpp
index 8df41ac0739e..4e632c868faf 100644
--- a/storage/ndb/include/util/SocketServer.hpp
+++ b/storage/ndb/include/util/SocketServer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/SparseBitmask.hpp b/storage/ndb/include/util/SparseBitmask.hpp
index 59a12044f471..678eed0eff6c 100644
--- a/storage/ndb/include/util/SparseBitmask.hpp
+++ b/storage/ndb/include/util/SparseBitmask.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/UtilBuffer.hpp b/storage/ndb/include/util/UtilBuffer.hpp
index 10f42b15e11a..2ea1d857980c 100644
--- a/storage/ndb/include/util/UtilBuffer.hpp
+++ b/storage/ndb/include/util/UtilBuffer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/Vector.hpp b/storage/ndb/include/util/Vector.hpp
index eb1aaee69581..98a6c9771d6d 100644
--- a/storage/ndb/include/util/Vector.hpp
+++ b/storage/ndb/include/util/Vector.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/basestring_vsnprintf.h b/storage/ndb/include/util/basestring_vsnprintf.h
index 0b77fa7afb1e..ffb545bbaeaf 100644
--- a/storage/ndb/include/util/basestring_vsnprintf.h
+++ b/storage/ndb/include/util/basestring_vsnprintf.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/dbug_utils.hpp b/storage/ndb/include/util/dbug_utils.hpp
index ed337925fce9..9c2cc6a026dc 100644
--- a/storage/ndb/include/util/dbug_utils.hpp
+++ b/storage/ndb/include/util/dbug_utils.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
@@ -29,10 +36,10 @@
  * 
  * As the DBUG macros/functions don't check arguments, the caller (or JVM!)
  * crashes in case, for instance, of NULL args.  Also, macros returning a
- * value (like DBUG_EXPLAIN) ought to do so even if DBUG_OFF was defined.
+ * value (like DBUG_EXPLAIN) ought to do so even if NDEBUG was defined.
  */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 #define MY_DBUG_PUSH(a1)                                                \
     do { if ((a1)) DBUG_PUSH(a1); } while (0)
@@ -45,7 +52,7 @@
 #define MY_DBUG_PRINT(keyword, arglist)                                 \
     do { if ((keyword)) DBUG_PRINT(keyword, arglist); } while (0)
 
-#else // DBUG_OFF
+#else // NDEBUG
 
 #define MY_DBUG_PUSH(a1)
 #define MY_DBUG_POP()
@@ -53,7 +60,7 @@
 #define MY_DBUG_EXPLAIN(buf,len) 1
 #define MY_DBUG_PRINT(keyword, arglist)
 
-#endif // DBUG_OFF
+#endif // NDEBUG
 
 /*
  * These DBUG functions provide suitable mapping targets for use from Java.
diff --git a/storage/ndb/include/util/decimal_utils.hpp b/storage/ndb/include/util/decimal_utils.hpp
index ff2bc5e9a1cf..0bb0f77b82fc 100644
--- a/storage/ndb/include/util/decimal_utils.hpp
+++ b/storage/ndb/include/util/decimal_utils.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/md5_hash.hpp b/storage/ndb/include/util/md5_hash.hpp
index c8e71ebbc16c..b1053d22791b 100644
--- a/storage/ndb/include/util/md5_hash.hpp
+++ b/storage/ndb/include/util/md5_hash.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/ndb_base64.h b/storage/ndb/include/util/ndb_base64.h
index d2df0c8358f2..0caf11a14376 100644
--- a/storage/ndb/include/util/ndb_base64.h
+++ b/storage/ndb/include/util/ndb_base64.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/ndb_math.h b/storage/ndb/include/util/ndb_math.h
index 21b676939b32..4f0d28846dc1 100644
--- a/storage/ndb/include/util/ndb_math.h
+++ b/storage/ndb/include/util/ndb_math.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/ndb_opts.h b/storage/ndb/include/util/ndb_opts.h
index eb942c91798c..a1ff965d27c4 100644
--- a/storage/ndb/include/util/ndb_opts.h
+++ b/storage/ndb/include/util/ndb_opts.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -40,7 +47,7 @@ OPT_EXTERN(my_bool,opt_core,NONE);
 OPT_EXTERN(my_bool,opt_ndb_optimized_node_selection,NONE);
 OPT_EXTERN(const char *,opt_ndb_connectstring,=0);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 OPT_EXTERN(const char *,opt_debug,= 0);
 #endif
 
@@ -87,7 +94,7 @@ OPT_EXTERN(const char *,opt_debug,= 0);
      "Directory where character sets are.", (uchar**) &charsets_dir,\
      (uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}\
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #define NDB_STD_OPTS(prog_name) \
   { "debug", '#', "Output debug log. Often this is 'd:t:o,filename'.", \
     (uchar**) &opt_debug, (uchar**) &opt_debug, \
diff --git a/storage/ndb/include/util/ndb_rand.h b/storage/ndb/include/util/ndb_rand.h
index 71dd963eade8..f6f52f5228b8 100644
--- a/storage/ndb/include/util/ndb_rand.h
+++ b/storage/ndb/include/util/ndb_rand.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/ndbzio.h b/storage/ndb/include/util/ndbzio.h
index c5cc2dbd4ec8..3b08445af37d 100644
--- a/storage/ndb/include/util/ndbzio.h
+++ b/storage/ndb/include/util/ndbzio.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/random.h b/storage/ndb/include/util/random.h
index b8d22cabe89c..90fcc92e43bf 100644
--- a/storage/ndb/include/util/random.h
+++ b/storage/ndb/include/util/random.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/socket_io.h b/storage/ndb/include/util/socket_io.h
index 38659ba3b8ec..a67957eace84 100644
--- a/storage/ndb/include/util/socket_io.h
+++ b/storage/ndb/include/util/socket_io.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/uucode.h b/storage/ndb/include/util/uucode.h
index 065c5862b094..79f8fe84f3c7 100644
--- a/storage/ndb/include/util/uucode.h
+++ b/storage/ndb/include/util/uucode.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/include/util/version.h b/storage/ndb/include/util/version.h
index 1681fafc94ef..284484dc6c60 100644
--- a/storage/ndb/include/util/version.h
+++ b/storage/ndb/include/util/version.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/CMakeLists.txt b/storage/ndb/mcc/CMakeLists.txt
index b30201d1bb8f..be67dec3b7a7 100644
--- a/storage/ndb/mcc/CMakeLists.txt
+++ b/storage/ndb/mcc/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/clusterhost.py b/storage/ndb/mcc/clusterhost.py
index 95a8cbaa1381..be7b5bc5b35f 100644
--- a/storage/ndb/mcc/clusterhost.py
+++ b/storage/ndb/mcc/clusterhost.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/config_parser.py b/storage/ndb/mcc/config_parser.py
index 99d16be5992b..1f215b6d2484 100644
--- a/storage/ndb/mcc/config_parser.py
+++ b/storage/ndb/mcc/config_parser.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/CMakeLists.txt b/storage/ndb/mcc/frontend/CMakeLists.txt
index 57b3401d23ce..aad3caa6bca6 100644
--- a/storage/ndb/mcc/frontend/CMakeLists.txt
+++ b/storage/ndb/mcc/frontend/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/README.unittests b/storage/ndb/mcc/frontend/README.unittests
index 5c5e3707f476..ea897ba0af5d 100644
--- a/storage/ndb/mcc/frontend/README.unittests
+++ b/storage/ndb/mcc/frontend/README.unittests
@@ -1,13 +1,20 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/content.html b/storage/ndb/mcc/frontend/content.html
index 5ac2fb3b2377..1a1147e8c83e 100644
--- a/storage/ndb/mcc/frontend/content.html
+++ b/storage/ndb/mcc/frontend/content.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/css/content.css b/storage/ndb/mcc/frontend/css/content.css
index 4627a2f983c2..5f7e26cd69b4 100644
--- a/storage/ndb/mcc/frontend/css/content.css
+++ b/storage/ndb/mcc/frontend/css/content.css
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/css/welcome.css b/storage/ndb/mcc/frontend/css/welcome.css
index bfeb595630ea..99a2888b6b06 100644
--- a/storage/ndb/mcc/frontend/css/welcome.css
+++ b/storage/ndb/mcc/frontend/css/welcome.css
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/hlp/css/help.css b/storage/ndb/mcc/frontend/hlp/css/help.css
index a62708a17744..71ae451dcbc8 100644
--- a/storage/ndb/mcc/frontend/hlp/css/help.css
+++ b/storage/ndb/mcc/frontend/hlp/css/help.css
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/hlp/html/help.html b/storage/ndb/mcc/frontend/hlp/html/help.html
index ad23f0c24a42..28a71c394fcd 100644
--- a/storage/ndb/mcc/frontend/hlp/html/help.html
+++ b/storage/ndb/mcc/frontend/hlp/html/help.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/hlp/html/help_cnt.html b/storage/ndb/mcc/frontend/hlp/html/help_cnt.html
index 9a9cdef9c35e..ded1ad162080 100644
--- a/storage/ndb/mcc/frontend/hlp/html/help_cnt.html
+++ b/storage/ndb/mcc/frontend/hlp/html/help_cnt.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/hlp/html/help_hdr.html b/storage/ndb/mcc/frontend/hlp/html/help_hdr.html
index a9dc5daea8d4..e9836cf2ea70 100644
--- a/storage/ndb/mcc/frontend/hlp/html/help_hdr.html
+++ b/storage/ndb/mcc/frontend/hlp/html/help_hdr.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/hlp/html/help_toc.html b/storage/ndb/mcc/frontend/hlp/html/help_toc.html
index b631c46b1587..8fc94f12f54c 100644
--- a/storage/ndb/mcc/frontend/hlp/html/help_toc.html
+++ b/storage/ndb/mcc/frontend/hlp/html/help_toc.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/configuration.js b/storage/ndb/mcc/frontend/js/mcc/configuration.js
index b4c2d0c39720..d9d16eb0aa88 100644
--- a/storage/ndb/mcc/frontend/js/mcc/configuration.js
+++ b/storage/ndb/mcc/frontend/js/mcc/configuration.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js b/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
index 1b7a1d5c6d40..88b73718d7f5 100644
--- a/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
+++ b/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/configuration/deploy.js b/storage/ndb/mcc/frontend/js/mcc/configuration/deploy.js
index 16ec4633e1ac..e7dec6650fcf 100644
--- a/storage/ndb/mcc/frontend/js/mcc/configuration/deploy.js
+++ b/storage/ndb/mcc/frontend/js/mcc/configuration/deploy.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/configuration/parameters.js b/storage/ndb/mcc/frontend/js/mcc/configuration/parameters.js
index 179beb502947..742253282fed 100644
--- a/storage/ndb/mcc/frontend/js/mcc/configuration/parameters.js
+++ b/storage/ndb/mcc/frontend/js/mcc/configuration/parameters.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui.js b/storage/ndb/mcc/frontend/js/mcc/gui.js
index deb3a2511d8f..d58bf2caa7ff 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js b/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js
index 3d834dc45f49..89137cd57e6c 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/clusterdef.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/deploymenttree.js b/storage/ndb/mcc/frontend/js/mcc/gui/deploymenttree.js
index a89e4f13eed7..4b253b381ed2 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/deploymenttree.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/deploymenttree.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/hostdef.js b/storage/ndb/mcc/frontend/js/mcc/gui/hostdef.js
index 07a0cc182956..61f93ea7e3d8 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/hostdef.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/hostdef.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/hosttree.js b/storage/ndb/mcc/frontend/js/mcc/gui/hosttree.js
index bc80e046971e..3b1ea23a9cc6 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/hosttree.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/hosttree.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/hosttreedetails.js b/storage/ndb/mcc/frontend/js/mcc/gui/hosttreedetails.js
index 790ce44a4763..07e149d680da 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/hosttreedetails.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/hosttreedetails.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/processtree.js b/storage/ndb/mcc/frontend/js/mcc/gui/processtree.js
index c6eaea365a8e..95bc3763c970 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/processtree.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/processtree.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/processtreedetails.js b/storage/ndb/mcc/frontend/js/mcc/gui/processtreedetails.js
index 1f710de69711..f4735c8824fb 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/processtreedetails.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/processtreedetails.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js b/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js
index 4d9c86520de5..6029202ba27c 100644
--- a/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/server.js b/storage/ndb/mcc/frontend/js/mcc/server.js
index 97d1ff2e017d..214d77c508e4 100644
--- a/storage/ndb/mcc/frontend/js/mcc/server.js
+++ b/storage/ndb/mcc/frontend/js/mcc/server.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/server/api.js b/storage/ndb/mcc/frontend/js/mcc/server/api.js
index e5a3e8452111..243899225a50 100644
--- a/storage/ndb/mcc/frontend/js/mcc/server/api.js
+++ b/storage/ndb/mcc/frontend/js/mcc/server/api.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/storage.js b/storage/ndb/mcc/frontend/js/mcc/storage.js
index 112b876b25ef..f59ee0871ee4 100644
--- a/storage/ndb/mcc/frontend/js/mcc/storage.js
+++ b/storage/ndb/mcc/frontend/js/mcc/storage.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js b/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
index c63e8a277226..ab3c62632e96 100644
--- a/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
+++ b/storage/ndb/mcc/frontend/js/mcc/storage/MCCStorage.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/storage/Storage.js b/storage/ndb/mcc/frontend/js/mcc/storage/Storage.js
index d95973ee39ce..4db54b4ab531 100644
--- a/storage/ndb/mcc/frontend/js/mcc/storage/Storage.js
+++ b/storage/ndb/mcc/frontend/js/mcc/storage/Storage.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/storage/StorageItem.js b/storage/ndb/mcc/frontend/js/mcc/storage/StorageItem.js
index d2492429d656..10a4c93f0c0a 100644
--- a/storage/ndb/mcc/frontend/js/mcc/storage/StorageItem.js
+++ b/storage/ndb/mcc/frontend/js/mcc/storage/StorageItem.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/storage/stores.js b/storage/ndb/mcc/frontend/js/mcc/storage/stores.js
index 4cfbf7197295..f5e1fba81318 100644
--- a/storage/ndb/mcc/frontend/js/mcc/storage/stores.js
+++ b/storage/ndb/mcc/frontend/js/mcc/storage/stores.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/template.js b/storage/ndb/mcc/frontend/js/mcc/template.js
index 64601b48cc3c..7c5a3e967087 100644
--- a/storage/ndb/mcc/frontend/js/mcc/template.js
+++ b/storage/ndb/mcc/frontend/js/mcc/template.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util.js b/storage/ndb/mcc/frontend/js/mcc/util.js
index 6b059ebd8b71..dcebf4442c60 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/assert.js b/storage/ndb/mcc/frontend/js/mcc/util/assert.js
index a8027dca0e36..bd2986067b25 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/assert.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/assert.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/cluster.js b/storage/ndb/mcc/frontend/js/mcc/util/cluster.js
index b23e0c5c6d4d..d791eff55a5c 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/cluster.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/cluster.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/cookies.js b/storage/ndb/mcc/frontend/js/mcc/util/cookies.js
index d8276ac5eb96..6c1bcff56751 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/cookies.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/cookies.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/html.js b/storage/ndb/mcc/frontend/js/mcc/util/html.js
index 344df3614523..b64ea0e93914 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/html.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/html.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/log.js b/storage/ndb/mcc/frontend/js/mcc/util/log.js
index dea3e3de6b69..fc2066ca48ad 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/log.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/log.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/platform.js b/storage/ndb/mcc/frontend/js/mcc/util/platform.js
index 2f2b816037af..d8b21e007c01 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/platform.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/platform.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/assert.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/assert.js
index 06b4f98e9e75..f0fe8a41751d 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/assert.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/assert.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/cluster.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/cluster.js
index 4ecd090c000a..262827ba6132 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/cluster.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/cluster.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/cookies.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/cookies.js
index 29d0e3ec35ab..d64172d2e4ad 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/cookies.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/cookies.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/html.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/html.js
index 442f808b488b..3956df3c54b2 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/html.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/html.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.html b/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.html
index 7e61098eaedb..976810097e83 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.html
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.html
@@ -1,14 +1,21 @@
 <!--
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.js
index c94447e918ff..e5f048e7508d 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/html_gui.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/log.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/log.js
index f175235af895..b3394da3fd3f 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/log.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/log.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/runTests.html b/storage/ndb/mcc/frontend/js/mcc/util/tests/runTests.html
index 3f02d6c9fd64..466343c45631 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/runTests.html
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/runTests.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/js/mcc/util/tests/util.js b/storage/ndb/mcc/frontend/js/mcc/util/tests/util.js
index 58bef8c33f42..c53b316f1428 100644
--- a/storage/ndb/mcc/frontend/js/mcc/util/tests/util.js
+++ b/storage/ndb/mcc/frontend/js/mcc/util/tests/util.js
@@ -1,14 +1,21 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/testProtocol.html b/storage/ndb/mcc/frontend/testProtocol.html
index 3998899acdf0..0343b34489d4 100644
--- a/storage/ndb/mcc/frontend/testProtocol.html
+++ b/storage/ndb/mcc/frontend/testProtocol.html
@@ -1,16 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
     "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/frontend/welcome.html b/storage/ndb/mcc/frontend/welcome.html
index 08114ae32422..d9c55c8155a8 100644
--- a/storage/ndb/mcc/frontend/welcome.html
+++ b/storage/ndb/mcc/frontend/welcome.html
@@ -1,15 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/host_info/CMakeLists.txt b/storage/ndb/mcc/host_info/CMakeLists.txt
index dc9dac550222..b94e0d572058 100644
--- a/storage/ndb/mcc/host_info/CMakeLists.txt
+++ b/storage/ndb/mcc/host_info/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/host_info/config.h.cmake b/storage/ndb/mcc/host_info/config.h.cmake
index bde580bf7f15..e371035f3c8f 100644
--- a/storage/ndb/mcc/host_info/config.h.cmake
+++ b/storage/ndb/mcc/host_info/config.h.cmake
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/host_info/host_info.c b/storage/ndb/mcc/host_info/host_info.c
index bc9fecc4704e..e8792d1d2d7b 100644
--- a/storage/ndb/mcc/host_info/host_info.c
+++ b/storage/ndb/mcc/host_info/host_info.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/mcc_config.py.in b/storage/ndb/mcc/mcc_config.py.in
index 1043e041e4af..434fd93e8d8c 100644
--- a/storage/ndb/mcc/mcc_config.py.in
+++ b/storage/ndb/mcc/mcc_config.py.in
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/mcc_utils.cmake b/storage/ndb/mcc/mcc_utils.cmake
index 0b1b1a6b2e35..ccd829becf27 100644
--- a/storage/ndb/mcc/mcc_utils.cmake
+++ b/storage/ndb/mcc/mcc_utils.cmake
@@ -1,3 +1,24 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 MACRO(PY_INSTALL)
 
diff --git a/storage/ndb/mcc/ndb_setup.py b/storage/ndb/mcc/ndb_setup.py
index 64e21e62b079..97ae2f926627 100755
--- a/storage/ndb/mcc/ndb_setup.py
+++ b/storage/ndb/mcc/ndb_setup.py
@@ -1,4 +1,27 @@
 #! /usr/bin/env python
+
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 """Launch script for the configurator backend. Parses command line options and starts the web server."""
 
 import sys
diff --git a/storage/ndb/mcc/post-install.py.in b/storage/ndb/mcc/post-install.py.in
index b6828896cc1c..cd20dc9321f5 100644
--- a/storage/ndb/mcc/post-install.py.in
+++ b/storage/ndb/mcc/post-install.py.in
@@ -1,3 +1,25 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 import zipfile
 import sys
 import platform
diff --git a/storage/ndb/mcc/python.cmake b/storage/ndb/mcc/python.cmake
index 54a089319d80..ac45048dcffe 100644
--- a/storage/ndb/mcc/python.cmake
+++ b/storage/ndb/mcc/python.cmake
@@ -1,3 +1,25 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 INCLUDE(mcc_utils)
 
 PY_INSTALL(FILES python.exe python27.dll msvcr100.dll 
diff --git a/storage/ndb/mcc/remote_clusterhost.py b/storage/ndb/mcc/remote_clusterhost.py
index d0d6a0625427..4669caf35c02 100644
--- a/storage/ndb/mcc/remote_clusterhost.py
+++ b/storage/ndb/mcc/remote_clusterhost.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/request_handler.py b/storage/ndb/mcc/request_handler.py
index 6a5950ef39a1..2dfa2b029b29 100644
--- a/storage/ndb/mcc/request_handler.py
+++ b/storage/ndb/mcc/request_handler.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/setup-debug.bat b/storage/ndb/mcc/setup-debug.bat
index 8ec80f56ff34..697288597e43 100755
--- a/storage/ndb/mcc/setup-debug.bat
+++ b/storage/ndb/mcc/setup-debug.bat
@@ -1 +1,23 @@
+rem Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
+rem You should have received a copy of the GNU General Public License
+rem along with this program; if not, write to the Free Software
+rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 .\Python\python.exe mcc -d DEBUG %*
diff --git a/storage/ndb/mcc/setup-debug.bat.in b/storage/ndb/mcc/setup-debug.bat.in
index 77364af2c67f..0fe4083a8dbc 100644
--- a/storage/ndb/mcc/setup-debug.bat.in
+++ b/storage/ndb/mcc/setup-debug.bat.in
@@ -1,3 +1,25 @@
+rem Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
+rem You should have received a copy of the GNU General Public License
+rem along with this program; if not, write to the Free Software
+rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 set PATH=%~dp0\@MCC_PY_INSTALL_DIR@;%PATH%
 set PYTHONLIB=%~dp0\@MCC_PY_INSTALL_DIR@\Lib
 
diff --git a/storage/ndb/mcc/setup.bat.in b/storage/ndb/mcc/setup.bat.in
index 6060e08d1f51..d814e0548c12 100644
--- a/storage/ndb/mcc/setup.bat.in
+++ b/storage/ndb/mcc/setup.bat.in
@@ -1,3 +1,25 @@
+rem Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
+rem You should have received a copy of the GNU General Public License
+rem along with this program; if not, write to the Free Software
+rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 set PATH=%~dp0\@MCC_PY_INSTALL_DIR@;%PATH%
 set PYTHONLIB=%~dp0\@MCC_PY_INSTALL_DIR@\Lib
 
diff --git a/storage/ndb/mcc/tst/tst_main.py b/storage/ndb/mcc/tst/tst_main.py
index f9711d17ee45..c2f5c4331781 100644
--- a/storage/ndb/mcc/tst/tst_main.py
+++ b/storage/ndb/mcc/tst/tst_main.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/tst/xmlrunner2.py b/storage/ndb/mcc/tst/xmlrunner2.py
index 009237da2c7b..5b02c43cfbda 100644
--- a/storage/ndb/mcc/tst/xmlrunner2.py
+++ b/storage/ndb/mcc/tst/xmlrunner2.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/mcc/util.py b/storage/ndb/mcc/util.py
index 1b8f1557f4ea..08cb0a70d19e 100644
--- a/storage/ndb/mcc/util.py
+++ b/storage/ndb/mcc/util.py
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/memcache/CMakeLists.txt b/storage/ndb/memcache/CMakeLists.txt
index c1f34583beec..54f964354145 100644
--- a/storage/ndb/memcache/CMakeLists.txt
+++ b/storage/ndb/memcache/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -51,12 +58,12 @@ if(WITH_BUNDLED_MEMCACHED)
   else()
     # NOTE! Seems to be a slight confusion which variables
     # are set by cmake/libevent.cmake. The comment says
-    # LIBEVENT_LIBRARIES and LIBEVENT_INCLUDE_DIR, but actually
+    # LIBEVENT_LIBRARIES and LIBEVENT_INCLUDE_DIRS, but actually
     # slightly different varables are set depending on bundled or not.
     # Thus using the same variable names as plugin/innodb_memcached/ assuming
     # that things does _not_ build unless using bundled libevent.
-    ndb_require_variable(LIBEVENT_LIBRARY)
-    ndb_require_variable(LIBEVENT_INCLUDE_DIR)
+    ndb_require_variable(LIBEVENT_LIBRARIES)
+    ndb_require_variable(LIBEVENT_INCLUDE_DIRS)
   endif()
 
   add_subdirectory(extra/memcached)
@@ -67,7 +74,19 @@ endif()
 ####################################################
 
 # Don't disable assert
-remove_definitions(-DNDEBUG)
+REMOVE_DEFINITIONS(-DNDEBUG)
+FOREACH(flag
+    CMAKE_C_FLAGS_DEBUG
+    CMAKE_C_FLAGS_RELWITHDEBINFO
+    CMAKE_C_FLAGS_RELEASE
+    CMAKE_C_FLAGS_MINSIZEREL
+    CMAKE_CXX_FLAGS_DEBUG
+    CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    CMAKE_CXX_FLAGS_RELEASE
+    CMAKE_CXX_FLAGS_MINSIZEREL
+    )
+  STRING(REPLACE "-DNDEBUG"  "" "${flag}" "${${flag}}")
+ENDFOREACH()
 
 include("FindMemcached.cmake")
 include(CheckLibraryExists)
diff --git a/storage/ndb/memcache/FindMemcached.cmake b/storage/ndb/memcache/FindMemcached.cmake
index 8fead7a869dc..c08e4397339f 100644
--- a/storage/ndb/memcache/FindMemcached.cmake
+++ b/storage/ndb/memcache/FindMemcached.cmake
@@ -1,3 +1,23 @@
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 SET(MEMCACHED_HOME "" CACHE PATH "Path to installed Memcached 1.6")
 
diff --git a/storage/ndb/memcache/atomics.cmake b/storage/ndb/memcache/atomics.cmake
index e2c2a560673d..173a6d3858fe 100644
--- a/storage/ndb/memcache/atomics.cmake
+++ b/storage/ndb/memcache/atomics.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/ndb/memcache/extra/memcached/CMakeLists.txt b/storage/ndb/memcache/extra/memcached/CMakeLists.txt
index 441ae3930f99..eb3b959d794c 100644
--- a/storage/ndb/memcache/extra/memcached/CMakeLists.txt
+++ b/storage/ndb/memcache/extra/memcached/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -20,7 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include
                     ${CMAKE_CURRENT_SOURCE_DIR}/include/memcached
                     ${CMAKE_CURRENT_SOURCE_DIR}/utilities 
                     ${CMAKE_CURRENT_SOURCE_DIR}/daemon                                    
-                    ${LIBEVENT_INCLUDE_DIR})
+                    ${LIBEVENT_INCLUDE_DIRS})
 
 IF(${CMAKE_COMPILER_IS_GNUCC})
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
@@ -77,7 +84,7 @@ add_executable(memcached ${MEMCACHED_SOURCES})
 
 target_link_libraries(memcached 
                       ndb_memcached_utilities
-                      ${LIBEVENT_LIBRARY}
+                      ${LIBEVENT_LIBRARIES}
                       ${LIBM} ${LIBNSL} ${LIBSOCKET})
 IF(HAVE_LIBDL)
 target_link_libraries(memcached dl)
diff --git a/storage/ndb/memcache/extra/memcached/config_tests.in b/storage/ndb/memcache/extra/memcached/config_tests.in
index a089a73a9d12..98e2445821d1 100644
--- a/storage/ndb/memcache/extra/memcached/config_tests.in
+++ b/storage/ndb/memcache/extra/memcached/config_tests.in
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/memcache/extra/memcached/daemon/cache.c b/storage/ndb/memcache/extra/memcached/daemon/cache.c
index ddd3824ddc91..d4fc8ed3332f 100644
--- a/storage/ndb/memcache/extra/memcached/daemon/cache.c
+++ b/storage/ndb/memcache/extra/memcached/daemon/cache.c
@@ -1,4 +1,4 @@
-/* Modifications copyright (c) 2015, Oracle and/or its affiliates */
+/* Modifications Copyright (c) 2015, 2021, Oracle and/or its affiliates. */
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 #include <stdlib.h>
 #include <string.h>
diff --git a/storage/ndb/memcache/extra/memcached/include/memcached/protocol_binary.h b/storage/ndb/memcache/extra/memcached/include/memcached/protocol_binary.h
index f29ccfe0cb20..34d2cd43e20a 100644
--- a/storage/ndb/memcache/extra/memcached/include/memcached/protocol_binary.h
+++ b/storage/ndb/memcache/extra/memcached/include/memcached/protocol_binary.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (c) <2008>, Sun Microsystems, Inc.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates.
  * Use is subject to license terms
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/storage/ndb/memcache/extra/memcached/include/memcached/util.h b/storage/ndb/memcache/extra/memcached/include/memcached/util.h
index f9070f7788be..268b11478e56 100644
--- a/storage/ndb/memcache/extra/memcached/include/memcached/util.h
+++ b/storage/ndb/memcache/extra/memcached/include/memcached/util.h
@@ -1,4 +1,4 @@
-/* Modifications copyright (c) 2015, Oracle and/or its affiliates
+/* Modifications Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 */
 #ifndef UTIL_H
 #define UTIL_H
diff --git a/storage/ndb/memcache/extra/memcached/utilities/util.c b/storage/ndb/memcache/extra/memcached/utilities/util.c
index 35ba8345c094..c813f5de3617 100644
--- a/storage/ndb/memcache/extra/memcached/utilities/util.c
+++ b/storage/ndb/memcache/extra/memcached/utilities/util.c
@@ -1,4 +1,4 @@
-/* Modifications copyright (c) 2015, Oracle and/or its affiliates
+/* Modifications Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 */
 #include "config.h"
 #include <stdio.h>
diff --git a/storage/ndb/memcache/include/ClusterConnectionPool.h b/storage/ndb/memcache/include/ClusterConnectionPool.h
index 2c42751bbc04..c16ba1cb479a 100644
--- a/storage/ndb/memcache/include/ClusterConnectionPool.h
+++ b/storage/ndb/memcache/include/ClusterConnectionPool.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Config_v1.h b/storage/ndb/memcache/include/Config_v1.h
index f99d22caa1e6..a0296d6cf5cd 100644
--- a/storage/ndb/memcache/include/Config_v1.h
+++ b/storage/ndb/memcache/include/Config_v1.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Configuration.h b/storage/ndb/memcache/include/Configuration.h
index 20faddac1b57..d6b7ee0532ed 100644
--- a/storage/ndb/memcache/include/Configuration.h
+++ b/storage/ndb/memcache/include/Configuration.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ConnQueryPlanSet.h b/storage/ndb/memcache/include/ConnQueryPlanSet.h
index 01c0e086dc02..8d8f7f68e060 100644
--- a/storage/ndb/memcache/include/ConnQueryPlanSet.h
+++ b/storage/ndb/memcache/include/ConnQueryPlanSet.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/DataTypeHandler.h b/storage/ndb/memcache/include/DataTypeHandler.h
index 2a0b91983582..0e6a05bf1499 100644
--- a/storage/ndb/memcache/include/DataTypeHandler.h
+++ b/storage/ndb/memcache/include/DataTypeHandler.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ExpireTime.h b/storage/ndb/memcache/include/ExpireTime.h
index c0dc8f1d5679..2b542f56009a 100644
--- a/storage/ndb/memcache/include/ExpireTime.h
+++ b/storage/ndb/memcache/include/ExpireTime.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011 Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ExternalValue.h b/storage/ndb/memcache/include/ExternalValue.h
index 6f0cd467419d..5ad28b968b51 100644
--- a/storage/ndb/memcache/include/ExternalValue.h
+++ b/storage/ndb/memcache/include/ExternalValue.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/GlobalConfigManager.h b/storage/ndb/memcache/include/GlobalConfigManager.h
index 53e42b920d2c..5a7f33810610 100644
--- a/storage/ndb/memcache/include/GlobalConfigManager.h
+++ b/storage/ndb/memcache/include/GlobalConfigManager.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/KeyPrefix.h b/storage/ndb/memcache/include/KeyPrefix.h
index ca66d0944247..c62b7225f39d 100644
--- a/storage/ndb/memcache/include/KeyPrefix.h
+++ b/storage/ndb/memcache/include/KeyPrefix.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/LookupTable.h b/storage/ndb/memcache/include/LookupTable.h
index ca6097621d31..d51b7395647e 100644
--- a/storage/ndb/memcache/include/LookupTable.h
+++ b/storage/ndb/memcache/include/LookupTable.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/NdbInstance.h b/storage/ndb/memcache/include/NdbInstance.h
index 635a1cd90f94..c94709e48043 100644
--- a/storage/ndb/memcache/include/NdbInstance.h
+++ b/storage/ndb/memcache/include/NdbInstance.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Operation.h b/storage/ndb/memcache/include/Operation.h
index 51aff1b7e880..c08755d8b9b5 100644
--- a/storage/ndb/memcache/include/Operation.h
+++ b/storage/ndb/memcache/include/Operation.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/QueryPlan.h b/storage/ndb/memcache/include/QueryPlan.h
index 518fec17cd6d..50af383f52ed 100644
--- a/storage/ndb/memcache/include/QueryPlan.h
+++ b/storage/ndb/memcache/include/QueryPlan.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Queue.h b/storage/ndb/memcache/include/Queue.h
index 7faf85f0d40a..01fa15e31a18 100644
--- a/storage/ndb/memcache/include/Queue.h
+++ b/storage/ndb/memcache/include/Queue.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Record.h b/storage/ndb/memcache/include/Record.h
index f1d1d58fd82a..d7389d4328a0 100644
--- a/storage/ndb/memcache/include/Record.h
+++ b/storage/ndb/memcache/include/Record.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/Scheduler.h b/storage/ndb/memcache/include/Scheduler.h
index 22d77517ed8d..bb12f4b76fee 100644
--- a/storage/ndb/memcache/include/Scheduler.h
+++ b/storage/ndb/memcache/include/Scheduler.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/SchedulerConfigManager.h b/storage/ndb/memcache/include/SchedulerConfigManager.h
index 11d3e19dab23..ad95db4f9938 100644
--- a/storage/ndb/memcache/include/SchedulerConfigManager.h
+++ b/storage/ndb/memcache/include/SchedulerConfigManager.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/TabSeparatedValues.h b/storage/ndb/memcache/include/TabSeparatedValues.h
index 1e5b5dafba85..644764f98dba 100644
--- a/storage/ndb/memcache/include/TabSeparatedValues.h
+++ b/storage/ndb/memcache/include/TabSeparatedValues.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/TableSpec.h b/storage/ndb/memcache/include/TableSpec.h
index 9019be0a8dd2..bffb35f3eb23 100644
--- a/storage/ndb/memcache/include/TableSpec.h
+++ b/storage/ndb/memcache/include/TableSpec.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/atomics.h b/storage/ndb/memcache/include/atomics.h
index ffaea0f77f2f..925cbd52cf3d 100644
--- a/storage/ndb/memcache/include/atomics.h
+++ b/storage/ndb/memcache/include/atomics.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/debug.h b/storage/ndb/memcache/include/debug.h
index 308dc9822c95..bb339fce23ba 100644
--- a/storage/ndb/memcache/include/debug.h
+++ b/storage/ndb/memcache/include/debug.h
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/hash_item_util.h b/storage/ndb/memcache/include/hash_item_util.h
index 60df940f3fe7..16f397ea0385 100644
--- a/storage/ndb/memcache/include/hash_item_util.h
+++ b/storage/ndb/memcache/include/hash_item_util.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/int3korr.h b/storage/ndb/memcache/include/int3korr.h
index 6d9b9b67be04..9342aa4449e6 100644
--- a/storage/ndb/memcache/include/int3korr.h
+++ b/storage/ndb/memcache/include/int3korr.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_configuration.h b/storage/ndb/memcache/include/ndb_configuration.h
index 16a107404370..af852821b42c 100644
--- a/storage/ndb/memcache/include/ndb_configuration.h
+++ b/storage/ndb/memcache/include/ndb_configuration.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_engine.h b/storage/ndb/memcache/include/ndb_engine.h
index 2d4d48f6082e..1119a5db5618 100644
--- a/storage/ndb/memcache/include/ndb_engine.h
+++ b/storage/ndb/memcache/include/ndb_engine.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_engine_errors.h b/storage/ndb/memcache/include/ndb_engine_errors.h
index 26a90991dcea..8aef6720c334 100644
--- a/storage/ndb/memcache/include/ndb_engine_errors.h
+++ b/storage/ndb/memcache/include/ndb_engine_errors.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_error_logger.h b/storage/ndb/memcache/include/ndb_error_logger.h
index a7726282c0d9..a5dd70865fe3 100644
--- a/storage/ndb/memcache/include/ndb_error_logger.h
+++ b/storage/ndb/memcache/include/ndb_error_logger.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_pipeline.h b/storage/ndb/memcache/include/ndb_pipeline.h
index eb0a85232c1e..7d880f803c0e 100644
--- a/storage/ndb/memcache/include/ndb_pipeline.h
+++ b/storage/ndb/memcache/include/ndb_pipeline.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndb_worker.h b/storage/ndb/memcache/include/ndb_worker.h
index 9bdd83c46bed..1a4c245d02ba 100644
--- a/storage/ndb/memcache/include/ndb_worker.h
+++ b/storage/ndb/memcache/include/ndb_worker.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndbmemcache_config.in b/storage/ndb/memcache/include/ndbmemcache_config.in
index 500113a6db0b..b08d0bcaa716 100644
--- a/storage/ndb/memcache/include/ndbmemcache_config.in
+++ b/storage/ndb/memcache/include/ndbmemcache_config.in
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/ndbmemcache_global.h b/storage/ndb/memcache/include/ndbmemcache_global.h
index b94da82d7e24..93c8837ce369 100644
--- a/storage/ndb/memcache/include/ndbmemcache_global.h
+++ b/storage/ndb/memcache/include/ndbmemcache_global.h
@@ -1,16 +1,22 @@
 /*
-Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
 reserved.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; version 2 of
-the License.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
diff --git a/storage/ndb/memcache/include/status_block.h b/storage/ndb/memcache/include/status_block.h
index 4534d99bcda6..bebf997eba93 100644
--- a/storage/ndb/memcache/include/status_block.h
+++ b/storage/ndb/memcache/include/status_block.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/thread_identifier.h b/storage/ndb/memcache/include/thread_identifier.h
index f76fcb3337be..900b3b8a2165 100644
--- a/storage/ndb/memcache/include/thread_identifier.h
+++ b/storage/ndb/memcache/include/thread_identifier.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/timing.h b/storage/ndb/memcache/include/timing.h
index fe9a37c80fc5..af884513a35f 100644
--- a/storage/ndb/memcache/include/timing.h
+++ b/storage/ndb/memcache/include/timing.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/workitem.h b/storage/ndb/memcache/include/workitem.h
index cd384cf9a970..42b62bce96da 100644
--- a/storage/ndb/memcache/include/workitem.h
+++ b/storage/ndb/memcache/include/workitem.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/include/workqueue.h b/storage/ndb/memcache/include/workqueue.h
index 6a015f8c9109..a6365606699e 100644
--- a/storage/ndb/memcache/include/workqueue.h
+++ b/storage/ndb/memcache/include/workqueue.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/memcached_path.pl.in b/storage/ndb/memcache/memcached_path.pl.in
index cb2fcd36ec29..1cd412d098fd 100644
--- a/storage/ndb/memcache/memcached_path.pl.in
+++ b/storage/ndb/memcache/memcached_path.pl.in
@@ -1,15 +1,22 @@
 # -*- cperl -*-
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/memcache/memclient.pl b/storage/ndb/memcache/memclient.pl
index e8f3d4778773..f5d6c9cdd073 100755
--- a/storage/ndb/memcache/memclient.pl
+++ b/storage/ndb/memcache/memclient.pl
@@ -2,17 +2,24 @@
 
 # -*- cperl -*-
 
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. 
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates. 
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/memcache/sandbox.sh.in b/storage/ndb/memcache/sandbox.sh.in
index 7843de9c67ac..7ac7b60edc30 100644
--- a/storage/ndb/memcache/sandbox.sh.in
+++ b/storage/ndb/memcache/sandbox.sh.in
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/ndb/memcache/scripts/ndb_memcache_metadata.sql b/storage/ndb/memcache/scripts/ndb_memcache_metadata.sql
index a31274bce84d..3caca752f7a4 100644
--- a/storage/ndb/memcache/scripts/ndb_memcache_metadata.sql
+++ b/storage/ndb/memcache/scripts/ndb_memcache_metadata.sql
@@ -1,16 +1,22 @@
--- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 -- reserved.
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; version 2 of
--- the License.
--- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
--- 
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/scripts/pmpstack.awk b/storage/ndb/memcache/scripts/pmpstack.awk
index 58783c1c0b51..d00a9bea5680 100644
--- a/storage/ndb/memcache/scripts/pmpstack.awk
+++ b/storage/ndb/memcache/scripts/pmpstack.awk
@@ -1,16 +1,22 @@
 # Copyright (c)2011, Oracle and/or its affiliates. All rights
 # reserved.
 # 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 of
-# the License.
-# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/scripts/update_to_1.2.sql b/storage/ndb/memcache/scripts/update_to_1.2.sql
index 817be8f3e882..0a8724fdef66 100644
--- a/storage/ndb/memcache/scripts/update_to_1.2.sql
+++ b/storage/ndb/memcache/scripts/update_to_1.2.sql
@@ -1,16 +1,22 @@
--- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 -- reserved.
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; version 2 of
--- the License.
--- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
--- 
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/scripts/update_to_1.2a.sql b/storage/ndb/memcache/scripts/update_to_1.2a.sql
index 945ee95c2c7a..70cde7fdf074 100644
--- a/storage/ndb/memcache/scripts/update_to_1.2a.sql
+++ b/storage/ndb/memcache/scripts/update_to_1.2a.sql
@@ -1,16 +1,22 @@
--- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 -- reserved.
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; version 2 of
--- the License.
--- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
--- 
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License, version 2.0, for more details.
+--
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ClusterConnectionPool.cc b/storage/ndb/memcache/src/ClusterConnectionPool.cc
index b27fd4ab4a04..785100fa3827 100644
--- a/storage/ndb/memcache/src/ClusterConnectionPool.cc
+++ b/storage/ndb/memcache/src/ClusterConnectionPool.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/Config_v1.cc b/storage/ndb/memcache/src/Config_v1.cc
index 338edba91c33..3f8c57c839c9 100644
--- a/storage/ndb/memcache/src/Config_v1.cc
+++ b/storage/ndb/memcache/src/Config_v1.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/Configuration.cc b/storage/ndb/memcache/src/Configuration.cc
index d588059ce85c..469566a7b3c3 100644
--- a/storage/ndb/memcache/src/Configuration.cc
+++ b/storage/ndb/memcache/src/Configuration.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ConnQueryPlanSet.cc b/storage/ndb/memcache/src/ConnQueryPlanSet.cc
index bcf2df21a0a4..7ebc62ff42a7 100644
--- a/storage/ndb/memcache/src/ConnQueryPlanSet.cc
+++ b/storage/ndb/memcache/src/ConnQueryPlanSet.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/DataTypeHandler.cc b/storage/ndb/memcache/src/DataTypeHandler.cc
index e6feb377679b..a29ecd249722 100644
--- a/storage/ndb/memcache/src/DataTypeHandler.cc
+++ b/storage/ndb/memcache/src/DataTypeHandler.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ExpireTime.cc b/storage/ndb/memcache/src/ExpireTime.cc
index eaf5f9add93a..6763cbd37716 100644
--- a/storage/ndb/memcache/src/ExpireTime.cc
+++ b/storage/ndb/memcache/src/ExpireTime.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ExternalValue.cc b/storage/ndb/memcache/src/ExternalValue.cc
index 2b194a7fbec4..d58227717526 100644
--- a/storage/ndb/memcache/src/ExternalValue.cc
+++ b/storage/ndb/memcache/src/ExternalValue.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/GlobalConfigManager.cc b/storage/ndb/memcache/src/GlobalConfigManager.cc
index 8e3280eb25db..2168e41073de 100644
--- a/storage/ndb/memcache/src/GlobalConfigManager.cc
+++ b/storage/ndb/memcache/src/GlobalConfigManager.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public Licensein
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/KeyPrefix.cc b/storage/ndb/memcache/src/KeyPrefix.cc
index 411b67ac81f3..bd98351bdb01 100644
--- a/storage/ndb/memcache/src/KeyPrefix.cc
+++ b/storage/ndb/memcache/src/KeyPrefix.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/NdbInstance.cc b/storage/ndb/memcache/src/NdbInstance.cc
index 73c11738eee0..8631bf112cfd 100644
--- a/storage/ndb/memcache/src/NdbInstance.cc
+++ b/storage/ndb/memcache/src/NdbInstance.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/Operation.cc b/storage/ndb/memcache/src/Operation.cc
index 7e43340e3b82..8bb3fe663821 100644
--- a/storage/ndb/memcache/src/Operation.cc
+++ b/storage/ndb/memcache/src/Operation.cc
@@ -1,18 +1,24 @@
 
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/QueryPlan.cc b/storage/ndb/memcache/src/QueryPlan.cc
index e2d26f0111be..9fcb4416b540 100644
--- a/storage/ndb/memcache/src/QueryPlan.cc
+++ b/storage/ndb/memcache/src/QueryPlan.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/Record.cc b/storage/ndb/memcache/src/Record.cc
index 375632916007..0d42a03aae11 100644
--- a/storage/ndb/memcache/src/Record.cc
+++ b/storage/ndb/memcache/src/Record.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/Scheduler.cc b/storage/ndb/memcache/src/Scheduler.cc
index 0325c86f250d..653da21971d7 100644
--- a/storage/ndb/memcache/src/Scheduler.cc
+++ b/storage/ndb/memcache/src/Scheduler.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public Licensein
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/SchedulerConfigManager.cc b/storage/ndb/memcache/src/SchedulerConfigManager.cc
index 04a27120c3ea..4043ac4db150 100644
--- a/storage/ndb/memcache/src/SchedulerConfigManager.cc
+++ b/storage/ndb/memcache/src/SchedulerConfigManager.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/TabSeparatedValues.cc b/storage/ndb/memcache/src/TabSeparatedValues.cc
index fe66bd83ca1a..1f6eaf644c3f 100644
--- a/storage/ndb/memcache/src/TabSeparatedValues.cc
+++ b/storage/ndb/memcache/src/TabSeparatedValues.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/TableSpec.cc b/storage/ndb/memcache/src/TableSpec.cc
index 00342afd307e..3ca73b898a46 100644
--- a/storage/ndb/memcache/src/TableSpec.cc
+++ b/storage/ndb/memcache/src/TableSpec.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/atomics.c b/storage/ndb/memcache/src/atomics.c
index bfb4b46076e2..2c0efc23327f 100644
--- a/storage/ndb/memcache/src/atomics.c
+++ b/storage/ndb/memcache/src/atomics.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/debug.c b/storage/ndb/memcache/src/debug.c
index 297828e4f9b3..bef485410022 100644
--- a/storage/ndb/memcache/src/debug.c
+++ b/storage/ndb/memcache/src/debug.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/embedded_default_engine.c b/storage/ndb/memcache/src/embedded_default_engine.c
index 6aa437a2b995..ba96e46d8c6f 100644
--- a/storage/ndb/memcache/src/embedded_default_engine.c
+++ b/storage/ndb/memcache/src/embedded_default_engine.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/hash_item_util.c b/storage/ndb/memcache/src/hash_item_util.c
index a0ebf8ce7bff..592b77eb1961 100644
--- a/storage/ndb/memcache/src/hash_item_util.c
+++ b/storage/ndb/memcache/src/hash_item_util.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_configuration.cc b/storage/ndb/memcache/src/ndb_configuration.cc
index 2c98aa935090..6dc3156976f9 100644
--- a/storage/ndb/memcache/src/ndb_configuration.cc
+++ b/storage/ndb/memcache/src/ndb_configuration.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_engine.c b/storage/ndb/memcache/src/ndb_engine.c
index 231d1a06dcb0..5f94390cd8f8 100644
--- a/storage/ndb/memcache/src/ndb_engine.c
+++ b/storage/ndb/memcache/src/ndb_engine.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_engine_errors.cc b/storage/ndb/memcache/src/ndb_engine_errors.cc
index 13716c916258..f9e34a780a0d 100644
--- a/storage/ndb/memcache/src/ndb_engine_errors.cc
+++ b/storage/ndb/memcache/src/ndb_engine_errors.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_engine_private.h b/storage/ndb/memcache/src/ndb_engine_private.h
index 06968f07666f..79c25f99c3e2 100644
--- a/storage/ndb/memcache/src/ndb_engine_private.h
+++ b/storage/ndb/memcache/src/ndb_engine_private.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_error_logger.cc b/storage/ndb/memcache/src/ndb_error_logger.cc
index f044af13eb85..be9f0ef2a913 100644
--- a/storage/ndb/memcache/src/ndb_error_logger.cc
+++ b/storage/ndb/memcache/src/ndb_error_logger.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_flush.cc b/storage/ndb/memcache/src/ndb_flush.cc
index 64292b0667a6..58c6cf0e5153 100644
--- a/storage/ndb/memcache/src/ndb_flush.cc
+++ b/storage/ndb/memcache/src/ndb_flush.cc
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_pipeline.cc b/storage/ndb/memcache/src/ndb_pipeline.cc
index 7fc88c3c1387..2bf608df1ad2 100644
--- a/storage/ndb/memcache/src/ndb_pipeline.cc
+++ b/storage/ndb/memcache/src/ndb_pipeline.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/ndb_worker.cc b/storage/ndb/memcache/src/ndb_worker.cc
index 8cf93981e9da..e3971a0e830d 100644
--- a/storage/ndb/memcache/src/ndb_worker.cc
+++ b/storage/ndb/memcache/src/ndb_worker.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/S_sched.cc b/storage/ndb/memcache/src/schedulers/S_sched.cc
index cf4967d51d69..176b446a72e2 100644
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public Licensein
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/S_sched.h b/storage/ndb/memcache/src/schedulers/S_sched.h
index d00c9c52067f..9ac28bda611b 100644
--- a/storage/ndb/memcache/src/schedulers/S_sched.h
+++ b/storage/ndb/memcache/src/schedulers/S_sched.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Scheduler73.cc b/storage/ndb/memcache/src/schedulers/Scheduler73.cc
index 9773654256d9..217c955c94b8 100644
--- a/storage/ndb/memcache/src/schedulers/Scheduler73.cc
+++ b/storage/ndb/memcache/src/schedulers/Scheduler73.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public Licensein
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Scheduler73.h b/storage/ndb/memcache/src/schedulers/Scheduler73.h
index 003e9676c184..6fa5b35d6e6d 100644
--- a/storage/ndb/memcache/src/schedulers/Scheduler73.h
+++ b/storage/ndb/memcache/src/schedulers/Scheduler73.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Stockholm.cc b/storage/ndb/memcache/src/schedulers/Stockholm.cc
index 5fd29b5b8c41..d6763e7932c1 100644
--- a/storage/ndb/memcache/src/schedulers/Stockholm.cc
+++ b/storage/ndb/memcache/src/schedulers/Stockholm.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Stockholm.h b/storage/ndb/memcache/src/schedulers/Stockholm.h
index d1cc3267f18b..29390b22bd0e 100644
--- a/storage/ndb/memcache/src/schedulers/Stockholm.h
+++ b/storage/ndb/memcache/src/schedulers/Stockholm.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Trondheim.cc b/storage/ndb/memcache/src/schedulers/Trondheim.cc
index 7e8a444e5200..345ae9471c78 100644
--- a/storage/ndb/memcache/src/schedulers/Trondheim.cc
+++ b/storage/ndb/memcache/src/schedulers/Trondheim.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/schedulers/Trondheim.h b/storage/ndb/memcache/src/schedulers/Trondheim.h
index a56fc6262ed1..334b6871fc92 100644
--- a/storage/ndb/memcache/src/schedulers/Trondheim.h
+++ b/storage/ndb/memcache/src/schedulers/Trondheim.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/stub.cc b/storage/ndb/memcache/src/stub.cc
index 8126c3653b2a..75b5c6dcf4d9 100644
--- a/storage/ndb/memcache/src/stub.cc
+++ b/storage/ndb/memcache/src/stub.cc
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 int unused_stub_function(int j) {
   return j + 3 - ( j * j) ;
 }
diff --git a/storage/ndb/memcache/src/thread_identifier.c b/storage/ndb/memcache/src/thread_identifier.c
index 883782027329..b25bc373fd6f 100644
--- a/storage/ndb/memcache/src/thread_identifier.c
+++ b/storage/ndb/memcache/src/thread_identifier.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/timing.c b/storage/ndb/memcache/src/timing.c
index 39d86100fb60..c760da5b6462 100644
--- a/storage/ndb/memcache/src/timing.c
+++ b/storage/ndb/memcache/src/timing.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/workitem.c b/storage/ndb/memcache/src/workitem.c
index d4621e75a51e..904ab354505c 100644
--- a/storage/ndb/memcache/src/workitem.c
+++ b/storage/ndb/memcache/src/workitem.c
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
  
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/src/workqueue.c b/storage/ndb/memcache/src/workqueue.c
index 401d13290903..dcc2631bc857 100644
--- a/storage/ndb/memcache/src/workqueue.c
+++ b/storage/ndb/memcache/src/workqueue.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/CMakeLists.txt b/storage/ndb/memcache/unit/CMakeLists.txt
index 28cdfccc0b2c..e56b955a2e1f 100644
--- a/storage/ndb/memcache/unit/CMakeLists.txt
+++ b/storage/ndb/memcache/unit/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/ndb/memcache/unit/all_tests.h b/storage/ndb/memcache/unit/all_tests.h
index 7b87dddea264..ce3d0f2ca6fc 100644
--- a/storage/ndb/memcache/unit/all_tests.h
+++ b/storage/ndb/memcache/unit/all_tests.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/alloc.cc b/storage/ndb/memcache/unit/alloc.cc
index f2ab9013e8e5..cfd4f378b568 100644
--- a/storage/ndb/memcache/unit/alloc.cc
+++ b/storage/ndb/memcache/unit/alloc.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/cas.cc b/storage/ndb/memcache/unit/cas.cc
index 56c3e7effe74..bcc0baf456ea 100644
--- a/storage/ndb/memcache/unit/cas.cc
+++ b/storage/ndb/memcache/unit/cas.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/casbits.cc b/storage/ndb/memcache/unit/casbits.cc
index c6143334d05e..8e7b9fc33c95 100644
--- a/storage/ndb/memcache/unit/casbits.cc
+++ b/storage/ndb/memcache/unit/casbits.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/connpool.cc b/storage/ndb/memcache/unit/connpool.cc
index cd4f2dfa2577..4faa94fed27f 100644
--- a/storage/ndb/memcache/unit/connpool.cc
+++ b/storage/ndb/memcache/unit/connpool.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/harness.cc b/storage/ndb/memcache/unit/harness.cc
index 7c792a821c17..d5a52b5dffee 100644
--- a/storage/ndb/memcache/unit/harness.cc
+++ b/storage/ndb/memcache/unit/harness.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/incr.cc b/storage/ndb/memcache/unit/incr.cc
index df7b50ed3ca6..67510ce5e70a 100644
--- a/storage/ndb/memcache/unit/incr.cc
+++ b/storage/ndb/memcache/unit/incr.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/lookuptable.cc b/storage/ndb/memcache/unit/lookuptable.cc
index e766a8caf80a..0fe487778eda 100644
--- a/storage/ndb/memcache/unit/lookuptable.cc
+++ b/storage/ndb/memcache/unit/lookuptable.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/queue.cc b/storage/ndb/memcache/unit/queue.cc
index 185a0fc4dbd7..91a2c54d702e 100644
--- a/storage/ndb/memcache/unit/queue.cc
+++ b/storage/ndb/memcache/unit/queue.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/stub_logger.c b/storage/ndb/memcache/unit/stub_logger.c
index f07ada4be104..ff738b319601 100644
--- a/storage/ndb/memcache/unit/stub_logger.c
+++ b/storage/ndb/memcache/unit/stub_logger.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/test_workqueue.c b/storage/ndb/memcache/unit/test_workqueue.c
index 3e1848a2bbdb..3f31f6d90ce2 100644
--- a/storage/ndb/memcache/unit/test_workqueue.c
+++ b/storage/ndb/memcache/unit/test_workqueue.c
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/memcache/unit/tsv.cc b/storage/ndb/memcache/unit/tsv.cc
index d12b58041732..dc431f0bb44e 100644
--- a/storage/ndb/memcache/unit/tsv.cc
+++ b/storage/ndb/memcache/unit/tsv.cc
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/ndb_configure.cmake b/storage/ndb/ndb_configure.cmake
index efeaf408cb62..a1ccef102361 100644
--- a/storage/ndb/ndb_configure.cmake
+++ b/storage/ndb/ndb_configure.cmake
@@ -1,15 +1,22 @@
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -228,10 +235,9 @@ IF(NOT DEFINED WITH_ZLIB)
   # Hardcode use of the bundled zlib if not set by MySQL
   MESSAGE(STATUS "Using bundled zlib (hardcoded)")
   SET(ZLIB_LIBRARY zlib)
-  SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/zlib)
+  INCLUDE_DIRECTORIES(SYSTEM ${CMAKE_SOURCE_DIR}/zlib)
 ENDIF()
 NDB_REQUIRE_VARIABLE(ZLIB_LIBRARY)
-NDB_REQUIRE_VARIABLE(ZLIB_INCLUDE_DIR)
 
 IF(WITH_CLASSPATH)
   MESSAGE(STATUS "Using supplied classpath: ${WITH_CLASSPATH}")
diff --git a/storage/ndb/ndbapi-examples/CMakeLists.txt b/storage/ndb/ndbapi-examples/CMakeLists.txt
index cb6a01c970e6..5bbe876b85e8 100644
--- a/storage/ndb/ndbapi-examples/CMakeLists.txt
+++ b/storage/ndb/ndbapi-examples/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/common/array_adapter.hpp b/storage/ndb/ndbapi-examples/common/array_adapter.hpp
index d687d08857c1..a57460992e6e 100644
--- a/storage/ndb/ndbapi-examples/common/array_adapter.hpp
+++ b/storage/ndb/ndbapi-examples/common/array_adapter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/common/error_handling.hpp b/storage/ndb/ndbapi-examples/common/error_handling.hpp
index 102037ff146e..3f686801670a 100644
--- a/storage/ndb/ndbapi-examples/common/error_handling.hpp
+++ b/storage/ndb/ndbapi-examples/common/error_handling.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/common/ndb_util.hpp b/storage/ndb/ndbapi-examples/common/ndb_util.hpp
index 409039d82b76..a7c703017e15 100644
--- a/storage/ndb/ndbapi-examples/common/ndb_util.hpp
+++ b/storage/ndb/ndbapi-examples/common/ndb_util.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/common/util.hpp b/storage/ndb/ndbapi-examples/common/util.hpp
index 5863284da88b..4d3a5aad18c8 100644
--- a/storage/ndb/ndbapi-examples/common/util.hpp
+++ b/storage/ndb/ndbapi-examples/common/util.hpp
@@ -2,16 +2,23 @@
 #define UTIL_HPP
 
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile b/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
index 558650ddbf22..9d011f310827 100644
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp b/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
index 27083c55c237..311d4fb7d53d 100644
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005-2007 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile b/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
index 93213cd5a849..d9af2bbf4aad 100644
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2006, 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp b/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
index 68a09d63e1bf..56480b8e6e91 100644
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2006, 2007 MySQL AB
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_array_simple/ndbapi_array_simple.cpp b/storage/ndb/ndbapi-examples/ndbapi_array_simple/ndbapi_array_simple.cpp
index a428f0f0757c..c196679a3829 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_array_simple/ndbapi_array_simple.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_array_simple/ndbapi_array_simple.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_array_using_adapter/ndbapi_array_using_adapter.cpp b/storage/ndb/ndbapi-examples/ndbapi_array_using_adapter/ndbapi_array_using_adapter.cpp
index 0297b09cf157..82ec8e37af24 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_array_using_adapter/ndbapi_array_using_adapter.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_array_using_adapter/ndbapi_array_using_adapter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async/Makefile b/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
index 1eb0146918df..01f89d4c9b94 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_async/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp b/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
index a49074519924..a6ca16a534ba 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile b/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
index c1eb720f05ac..1987e3065fd6 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp b/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
index 26ec67dd35f5..05d0cf119912 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile b/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile
index 8a1816398626..e314d8acdf80 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_blob/ndbapi_blob.cpp b/storage/ndb/ndbapi-examples/ndbapi_blob/ndbapi_blob.cpp
index 04c367a51d05..891552dba7a9 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_blob/ndbapi_blob.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob/ndbapi_blob.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile b/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile
index 044662621943..dc0ae611230e 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp
index 8251161ab328..16531a0cf5e6 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_event/Makefile b/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
index ffefd6705b4a..c4b5937c54e3 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_event/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp b/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
index ce8cd9968039..d06f61135cc4 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp
index 38dd8bbe1cb2..91e528a98f35 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_multi_cursor/main.cpp
@@ -1,13 +1,20 @@
-/* Copyright (C) 2008 Sun Microsystems Inc.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile b/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile
index 2075a5880e9a..97c95f28464e 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp
index 144600cc5cfa..12e6a66b1a0f 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile b/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
index a77a2b4d21ef..5e58164dcd79 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp b/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
index f55d945ee261..2f376adcf138 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile b/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile
index 2942d787b2d9..d0dff9a5f3f6 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp
index 0c86d241f64f..15cfda7ddc21 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile b/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
index ebbd3fafa523..545c25bd8f18 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp b/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
index a8ef25b19e41..32a8e5a8b6fb 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
@@ -1,15 +1,22 @@
 
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile b/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
index b4097a2c9fc2..2900ba62f489 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
index e47f73456695..3caf826ee7f1 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
index 6d83bc771da9..fe1ceb284b4b 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2006, 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
index f969f25bb4c6..8db9d71cd7a8 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile b/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
index d7afcf0a9944..631f75614a05 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2005, 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
index 2bd8d8d22f9d..7a0123ae45e1 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/API-documentation/Batch b/storage/ndb/nodejs/API-documentation/Batch
index bf9f4408b9a6..de0a2a8cf11c 100644
--- a/storage/ndb/nodejs/API-documentation/Batch
+++ b/storage/ndb/nodejs/API-documentation/Batch
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /** Find a specific instance based on primary or unique key value.
  * ASYNC
  *
diff --git a/storage/ndb/nodejs/API-documentation/Converter b/storage/ndb/nodejs/API-documentation/Converter
index 754eac81745e..5ca444d8488c 100644
--- a/storage/ndb/nodejs/API-documentation/Converter
+++ b/storage/ndb/nodejs/API-documentation/Converter
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /*   
    Converter classes convert between JavaScript types and MySQL types.
diff --git a/storage/ndb/nodejs/API-documentation/Errors b/storage/ndb/nodejs/API-documentation/Errors
index b6f7bab785bf..2d3cfc030c02 100644
--- a/storage/ndb/nodejs/API-documentation/Errors
+++ b/storage/ndb/nodejs/API-documentation/Errors
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* Errors returned by mysql-js are JavaScript Error objects.
    They contain:
      message: a string with a description of the problem
diff --git a/storage/ndb/nodejs/API-documentation/Meta b/storage/ndb/nodejs/API-documentation/Meta
index 37ee5dc6da64..3ae8c857e61b 100644
--- a/storage/ndb/nodejs/API-documentation/Meta
+++ b/storage/ndb/nodejs/API-documentation/Meta
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /** meta is a factory used to define forward mapping for tables and columns.
  * Functions are called to create Meta objects that are stored with field mappings.
diff --git a/storage/ndb/nodejs/API-documentation/Mynode b/storage/ndb/nodejs/API-documentation/Mynode
index 943d07bd8219..5bcf301e5860 100644
--- a/storage/ndb/nodejs/API-documentation/Mynode
+++ b/storage/ndb/nodejs/API-documentation/Mynode
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /**
  * ConnectionProperties()
diff --git a/storage/ndb/nodejs/API-documentation/Projection b/storage/ndb/nodejs/API-documentation/Projection
index f7f819cb3efb..21752c6f5dff 100644
--- a/storage/ndb/nodejs/API-documentation/Projection
+++ b/storage/ndb/nodejs/API-documentation/Projection
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /** @class Projection 
  *
  * A Projection describes the projection of a domain object in the application.
diff --git a/storage/ndb/nodejs/API-documentation/Query b/storage/ndb/nodejs/API-documentation/Query
index fbaff07ae5b6..3f90b53a1b06 100644
--- a/storage/ndb/nodejs/API-documentation/Query
+++ b/storage/ndb/nodejs/API-documentation/Query
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /** Query is returned from Session.createQuery().
  *
  * Query is created based on a mapped domain object, a mapped constructor,
diff --git a/storage/ndb/nodejs/API-documentation/Session b/storage/ndb/nodejs/API-documentation/Session
index cd7edd5b6615..0b117c61cd58 100644
--- a/storage/ndb/nodejs/API-documentation/Session
+++ b/storage/ndb/nodejs/API-documentation/Session
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* @Class Session
  * 
  */
diff --git a/storage/ndb/nodejs/API-documentation/SessionFactory b/storage/ndb/nodejs/API-documentation/SessionFactory
index bcd109ff821f..6d46b89333a1 100644
--- a/storage/ndb/nodejs/API-documentation/SessionFactory
+++ b/storage/ndb/nodejs/API-documentation/SessionFactory
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /** openSession() : open a database session object
  * ASYNC
diff --git a/storage/ndb/nodejs/API-documentation/Stats b/storage/ndb/nodejs/API-documentation/Stats
index 90b925eb657e..7509517f1d12 100644
--- a/storage/ndb/nodejs/API-documentation/Stats
+++ b/storage/ndb/nodejs/API-documentation/Stats
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* 
    The connector maintains "statistics" -- internal counters recording certain
    important method calls and database operations.
diff --git a/storage/ndb/nodejs/API-documentation/TableMapping b/storage/ndb/nodejs/API-documentation/TableMapping
index 7bcf24a1b965..506b9e9ce7f6 100644
--- a/storage/ndb/nodejs/API-documentation/TableMapping
+++ b/storage/ndb/nodejs/API-documentation/TableMapping
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /** @class TableMapping 
  *
  * A TableMapping describes the mapping of a domain object in the application
diff --git a/storage/ndb/nodejs/API-documentation/TableMetadata b/storage/ndb/nodejs/API-documentation/TableMetadata
index 359cabbdca3b..23d4b0a0f519 100644
--- a/storage/ndb/nodejs/API-documentation/TableMetadata
+++ b/storage/ndb/nodejs/API-documentation/TableMetadata
@@ -1,4 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* TableMetadata object represents a table.
    This is the object returned in the getTable() callback.
diff --git a/storage/ndb/nodejs/API-documentation/Transaction b/storage/ndb/nodejs/API-documentation/Transaction
index b78370189a43..ad9615d5765f 100644
--- a/storage/ndb/nodejs/API-documentation/Transaction
+++ b/storage/ndb/nodejs/API-documentation/Transaction
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /** Transactions are either automatic or explicit. If automatic,
   * (autocommit) every operation is performed as part of a new
   * transaction that is automatically committed.
diff --git a/storage/ndb/nodejs/Adapter/adapter_config.js b/storage/ndb/nodejs/Adapter/adapter_config.js
index 0d251447d1d3..4255ecd2a576 100644
--- a/storage/ndb/nodejs/Adapter/adapter_config.js
+++ b/storage/ndb/nodejs/Adapter/adapter_config.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Batch.js b/storage/ndb/nodejs/Adapter/api/Batch.js
index d0600e05fb71..36ebdd1aced7 100644
--- a/storage/ndb/nodejs/Adapter/api/Batch.js
+++ b/storage/ndb/nodejs/Adapter/api/Batch.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Db.js b/storage/ndb/nodejs/Adapter/api/Db.js
index 066373a3daeb..fad4a61eb14a 100644
--- a/storage/ndb/nodejs/Adapter/api/Db.js
+++ b/storage/ndb/nodejs/Adapter/api/Db.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Meta.js b/storage/ndb/nodejs/Adapter/api/Meta.js
index add7a2c521ef..7eafbc399404 100644
--- a/storage/ndb/nodejs/Adapter/api/Meta.js
+++ b/storage/ndb/nodejs/Adapter/api/Meta.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Projection.js b/storage/ndb/nodejs/Adapter/api/Projection.js
index b89c066f8274..8267e9478eae 100644
--- a/storage/ndb/nodejs/Adapter/api/Projection.js
+++ b/storage/ndb/nodejs/Adapter/api/Projection.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/ProxyFactory.js b/storage/ndb/nodejs/Adapter/api/ProxyFactory.js
index f1eed3d958c3..317f7032d6ff 100644
--- a/storage/ndb/nodejs/Adapter/api/ProxyFactory.js
+++ b/storage/ndb/nodejs/Adapter/api/ProxyFactory.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Query.js b/storage/ndb/nodejs/Adapter/api/Query.js
index b1abb97985fe..4d93310224bc 100644
--- a/storage/ndb/nodejs/Adapter/api/Query.js
+++ b/storage/ndb/nodejs/Adapter/api/Query.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Session.js b/storage/ndb/nodejs/Adapter/api/Session.js
index bf3de83ed638..117798ce1115 100644
--- a/storage/ndb/nodejs/Adapter/api/Session.js
+++ b/storage/ndb/nodejs/Adapter/api/Session.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/SessionFactory.js b/storage/ndb/nodejs/Adapter/api/SessionFactory.js
index ec2424d4b668..65937c1dbd5d 100644
--- a/storage/ndb/nodejs/Adapter/api/SessionFactory.js
+++ b/storage/ndb/nodejs/Adapter/api/SessionFactory.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/TableMapping.js b/storage/ndb/nodejs/Adapter/api/TableMapping.js
index af382a5fb36e..e3cb181e23f4 100644
--- a/storage/ndb/nodejs/Adapter/api/TableMapping.js
+++ b/storage/ndb/nodejs/Adapter/api/TableMapping.js
@@ -1,18 +1,24 @@
  
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/Transaction.js b/storage/ndb/nodejs/Adapter/api/Transaction.js
index fd47e94645f7..01c62897da44 100644
--- a/storage/ndb/nodejs/Adapter/api/Transaction.js
+++ b/storage/ndb/nodejs/Adapter/api/Transaction.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/UserContext.js b/storage/ndb/nodejs/Adapter/api/UserContext.js
index 2d0c1eb1a034..37442c14a642 100644
--- a/storage/ndb/nodejs/Adapter/api/UserContext.js
+++ b/storage/ndb/nodejs/Adapter/api/UserContext.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/mynode.js b/storage/ndb/nodejs/Adapter/api/mynode.js
index 8c12972aef1b..6b0d71175866 100644
--- a/storage/ndb/nodejs/Adapter/api/mynode.js
+++ b/storage/ndb/nodejs/Adapter/api/mynode.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/stats.js b/storage/ndb/nodejs/Adapter/api/stats.js
index 9f181983adce..3cbc2780a448 100644
--- a/storage/ndb/nodejs/Adapter/api/stats.js
+++ b/storage/ndb/nodejs/Adapter/api/stats.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/api/unified_debug.js b/storage/ndb/nodejs/Adapter/api/unified_debug.js
index 1591606ec607..d5327238e813 100644
--- a/storage/ndb/nodejs/Adapter/api/unified_debug.js
+++ b/storage/ndb/nodejs/Adapter/api/unified_debug.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBConnectionPool b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBConnectionPool
index 06cc96a7ab93..ab574a12661f 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBConnectionPool
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBConnectionPool
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* DBConnectionPool
    DBConnectionPool specifies a common SPI for a database connection.
 
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBOperation b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBOperation
index feda263d10db..3853f1da14bd 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBOperation
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBOperation
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* A DBOperation object represents a database operation. 
    It contains read-only user-visible fields.
 */
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBServiceProvider b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBServiceProvider
index fb9e6528da4c..9347c99daebc 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBServiceProvider
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBServiceProvider
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* This is the top level of the Database Storage Service Provider Interface.
    Its methods correspond to top-level methods in the API. 
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBSession b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBSession
index 915b0ef04e43..0e83bb93cb4f 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBSession
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBSession
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* DBSession
    Represents a single user's session (e.g., a single HTTP request).
 */
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTableHandler b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTableHandler
index 918022f7a4cf..0931a77645ed 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTableHandler
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTableHandler
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* 
    A DBTableHandler is a persistent metadata object that combines table 
    information from the data dictionary with user-supplied information about 
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTransactionHandler b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTransactionHandler
index edb3f77c478c..4fcd77056e31 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTransactionHandler
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/DBTransactionHandler
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* DBTransactionHandler represents a database transaction.
 */
 
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/NDB_Properties b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/NDB_Properties
index c3bc059e93d0..2c0520ea5162 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/NDB_Properties
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/NDB_Properties
@@ -1,5 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /*
   NDB Connection Pool Properties
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/Overview b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/Overview
index d1f7aec4bd9c..7ebb208780d0 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI-documentation/Overview
+++ b/storage/ndb/nodejs/Adapter/impl/SPI-documentation/Overview
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 The goal of the API is to provide a productive environment for creating 
 database applications; the goal of the SPI is to make it easy to provide 
 those applications with some backend database adapter.  We mean to 
@@ -55,4 +79,4 @@ Concepts
    DBTableHandler encapsulates the relationship between a DBTable -- which is a 
    metadata object obtained from the data dictionary -- and a class of domain
    objects mapped to that table. 
-   
\ No newline at end of file
+   
diff --git a/storage/ndb/nodejs/Adapter/impl/SPI.js b/storage/ndb/nodejs/Adapter/impl/SPI.js
index 86d229335a7a..cf58d4489c41 100644
--- a/storage/ndb/nodejs/Adapter/impl/SPI.js
+++ b/storage/ndb/nodejs/Adapter/impl/SPI.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/BitMask.js b/storage/ndb/nodejs/Adapter/impl/common/BitMask.js
index 53b947a6048b..2f9815d22a97 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/BitMask.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/BitMask.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/DBTableHandler.js b/storage/ndb/nodejs/Adapter/impl/common/DBTableHandler.js
index 2ce5e4818358..2c79b36f0fb7 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/DBTableHandler.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/DBTableHandler.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/IndexBounds.js b/storage/ndb/nodejs/Adapter/impl/common/IndexBounds.js
index bc74c7e99ddd..befc0031af62 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/IndexBounds.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/IndexBounds.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/MySQLTime.js b/storage/ndb/nodejs/Adapter/impl/common/MySQLTime.js
index 10ba529e720f..227c4c8c9ca0 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/MySQLTime.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/MySQLTime.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/MysqlErrToSQLStateMap.js b/storage/ndb/nodejs/Adapter/impl/common/MysqlErrToSQLStateMap.js
index 79b7fe47ca05..903006e7c67e 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/MysqlErrToSQLStateMap.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/MysqlErrToSQLStateMap.js
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* Automatically generated from sql/share/errmsg-utf8.txt 
    by setup/generate-SQLState_js.awk
    Do not edit by hand. 
diff --git a/storage/ndb/nodejs/Adapter/impl/common/QueuedAsyncCall.js b/storage/ndb/nodejs/Adapter/impl/common/QueuedAsyncCall.js
index e7e38565e300..fb67c4e07a9a 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/QueuedAsyncCall.js
+++ b/storage/ndb/nodejs/Adapter/impl/common/QueuedAsyncCall.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/AsyncMethodCall.h b/storage/ndb/nodejs/Adapter/impl/common/include/AsyncMethodCall.h
index 6b86a254195e..9e6fbf725ad5 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/AsyncMethodCall.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/AsyncMethodCall.h
@@ -1,17 +1,23 @@
 
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/ConcurrentFlag.h b/storage/ndb/nodejs/Adapter/impl/common/include/ConcurrentFlag.h
index 9b8d41ee9fd4..e3f7730626b8 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/ConcurrentFlag.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/ConcurrentFlag.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/JsConverter.h b/storage/ndb/nodejs/Adapter/impl/common/include/JsConverter.h
index 89308b633701..7c7a13db429d 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/JsConverter.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/JsConverter.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/JsWrapper.h b/storage/ndb/nodejs/Adapter/impl/common/include/JsWrapper.h
index 2a86a8a6b8a4..053904561f2a 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/JsWrapper.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/JsWrapper.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/NativeCFunctionCall.h b/storage/ndb/nodejs/Adapter/impl/common/include/NativeCFunctionCall.h
index f9885870ad8a..e6766a9c0e55 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/NativeCFunctionCall.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/NativeCFunctionCall.h
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/NativeMethodCall.h b/storage/ndb/nodejs/Adapter/impl/common/include/NativeMethodCall.h
index 84dcad49740b..90318caf310e 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/NativeMethodCall.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/NativeMethodCall.h
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/SharedList.h b/storage/ndb/nodejs/Adapter/impl/common/include/SharedList.h
index daee5b2bb501..d58a5d1c1b77 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/SharedList.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/SharedList.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/adapter_global.h b/storage/ndb/nodejs/Adapter/impl/common/include/adapter_global.h
index 8215db3d117f..975082ee08c6 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/adapter_global.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/adapter_global.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/async_common.h b/storage/ndb/nodejs/Adapter/impl/common/include/async_common.h
index e81339e7c5fd..a06af22134fc 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/async_common.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/async_common.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/common_v8_values.h b/storage/ndb/nodejs/Adapter/impl/common/include/common_v8_values.h
index 49c6c8901074..fc8f68b7f39a 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/common_v8_values.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/common_v8_values.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/compat_uv.h b/storage/ndb/nodejs/Adapter/impl/common/include/compat_uv.h
index 1cb178b501a6..dff29fc8b99e 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/compat_uv.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/compat_uv.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/js_wrapper_macros.h b/storage/ndb/nodejs/Adapter/impl/common/include/js_wrapper_macros.h
index b4bd13d2f0d5..9f6ea06dbab9 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/js_wrapper_macros.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/js_wrapper_macros.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/unified_debug.h b/storage/ndb/nodejs/Adapter/impl/common/include/unified_debug.h
index 27a0f81d991c..119c1d2522c2 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/unified_debug.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/unified_debug.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/include/v8_binder.h b/storage/ndb/nodejs/Adapter/impl/common/include/v8_binder.h
index 5dc35b2b40eb..431ee9c68ade 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/include/v8_binder.h
+++ b/storage/ndb/nodejs/Adapter/impl/common/include/v8_binder.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/src/async_common.cpp b/storage/ndb/nodejs/Adapter/impl/common/src/async_common.cpp
index 48c0e72dbf54..c54bfd81f6e4 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/src/async_common.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/common/src/async_common.cpp
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/common/src/common_v8_values.cpp b/storage/ndb/nodejs/Adapter/impl/common/src/common_v8_values.cpp
index a8c75143cbfc..77ad608f21a0 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/src/common_v8_values.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/common/src/common_v8_values.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/common/src/unified_debug.cpp b/storage/ndb/nodejs/Adapter/impl/common/src/unified_debug.cpp
index f734df5b964d..e67dbc07a6f4 100644
--- a/storage/ndb/nodejs/Adapter/impl/common/src/unified_debug.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/common/src/unified_debug.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnection.js b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnection.js
index 2e2834e49764..e1ba105b61f7 100644
--- a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnection.js
+++ b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnection.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnectionPool.js b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnectionPool.js
index d97801263c92..47192de0a785 100644
--- a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnectionPool.js
+++ b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLConnectionPool.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLDictionary.js b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLDictionary.js
index 345b7ecad4f0..a02b2f8ec916 100644
--- a/storage/ndb/nodejs/Adapter/impl/mysql/MySQLDictionary.js
+++ b/storage/ndb/nodejs/Adapter/impl/mysql/MySQLDictionary.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/mysql/mysql_service_provider.js b/storage/ndb/nodejs/Adapter/impl/mysql/mysql_service_provider.js
index 6c1d3c7c3848..5514c37aa1d6 100644
--- a/storage/ndb/nodejs/Adapter/impl/mysql/mysql_service_provider.js
+++ b/storage/ndb/nodejs/Adapter/impl/mysql/mysql_service_provider.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbAutoIncrement.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbAutoIncrement.js
index 67eeb3db4c00..c39905502180 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbAutoIncrement.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbAutoIncrement.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnection.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnection.js
index e5474354e3fb..60ecb8031905 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnection.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnection.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnectionPool.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnectionPool.js
index 5a9f93b5bf6a..097446b51321 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnectionPool.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbConnectionPool.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbOperation.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbOperation.js
index 5c328c690f88..06955a2bd8d8 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbOperation.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbOperation.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014 Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbScanFilter.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbScanFilter.js
index 460f1cabf8d5..e369a6aebb16 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbScanFilter.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbScanFilter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbSession.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbSession.js
index df30244432fa..259dee19ad13 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbSession.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbSession.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/NdbTransactionHandler.js b/storage/ndb/nodejs/Adapter/impl/ndb/NdbTransactionHandler.js
index 101036225a17..1c21a867eb38 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/NdbTransactionHandler.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/NdbTransactionHandler.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/AsyncNdbContext.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/AsyncNdbContext.h
index 1e4ad4e0e815..ee7832a3d535 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/AsyncNdbContext.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/AsyncNdbContext.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/BlobHandler.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/BlobHandler.h
index 43cea3fbb406..a54f6455f2f0 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/BlobHandler.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/BlobHandler.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnHandler.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnHandler.h
index 6c6fbe0b6ef0..d39bcc4be39e 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnHandler.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnHandler.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnProxy.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnProxy.h
index 0d20b2ab8186..6dc7e3cdc634 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnProxy.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ColumnProxy.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBOperationSet.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBOperationSet.h
index 3da9a9316c08..a0dde2e232a8 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBOperationSet.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBOperationSet.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBSessionImpl.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBSessionImpl.h
index 9a9a3351b668..c5e145746950 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBSessionImpl.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBSessionImpl.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBTransactionContext.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBTransactionContext.h
index 234956d40351..7b429ccd904d 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/DBTransactionContext.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/DBTransactionContext.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/EncoderCharset.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/EncoderCharset.h
index e3f1d6a3ca9d..4b26438f1744 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/EncoderCharset.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/EncoderCharset.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/KeyOperation.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/KeyOperation.h
index d10505d21828..73213b3e5d90 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/KeyOperation.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/KeyOperation.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbJsConverters.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbJsConverters.h
index 1b240cfa8b0f..3971e73f0926 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbJsConverters.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbJsConverters.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbRecordObject.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbRecordObject.h
index 01d7070e9f9a..81c821ad0987 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbRecordObject.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbRecordObject.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbTypeEncoders.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbTypeEncoders.h
index e2c8c9fcef34..2b8b84238a91 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbTypeEncoders.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbTypeEncoders.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrapperErrors.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrapperErrors.h
index c9d510d3ba88..3ea9937b532d 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrapperErrors.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrapperErrors.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrappers.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrappers.h
index a90346266b17..01e857a117ca 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrappers.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/NdbWrappers.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/Record.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/Record.h
index 1187aea7b27e..ebbe661ba149 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/Record.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/Record.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ScanOperation.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/ScanOperation.h
index d2c19be0d9ff..e3f0f36a8475 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ScanOperation.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ScanOperation.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/compat_ndb.h b/storage/ndb/nodejs/Adapter/impl/ndb/include/compat_ndb.h
index 47f06c0107fb..3d3e4158ecdf 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/compat_ndb.h
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/compat_ndb.h
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/CharsetMap.hpp b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/CharsetMap.hpp
index 574fe933c524..0c0c15722796 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/CharsetMap.hpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/CharsetMap.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/NdbWaitGroup.hpp b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/NdbWaitGroup.hpp
index 6ddd852acd16..b369ba2ea7e6 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/NdbWaitGroup.hpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/NdbWaitGroup.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/decimal_utils.hpp b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/decimal_utils.hpp
index ff2bc5e9a1cf..0bb0f77b82fc 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/decimal_utils.hpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/include/ndb_util/decimal_utils.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/ndb_service_provider.js b/storage/ndb/nodejs/Adapter/impl/ndb/ndb_service_provider.js
index 77249b3721a8..6642d665f242 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/ndb_service_provider.js
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/ndb_service_provider.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext.cpp
index bfa0eaa4acc2..7c4f9a16c4e7 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext_wrapper.cpp
index 34b61ff3c3b6..ac9f6105fcf8 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/AsyncNdbContext_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/BlobHandler.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/BlobHandler.cpp
index 0c9d816519d3..9a184d66b663 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/BlobHandler.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/BlobHandler.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnHandler.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnHandler.cpp
index b6eb8e1813d1..33da3b98df3d 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnHandler.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnHandler.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnProxy.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnProxy.cpp
index 45111e32b3c5..93cb6f22e976 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnProxy.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/ColumnProxy.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBDictionaryImpl.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBDictionaryImpl.cpp
index 364f14073443..9f2c4718359a 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBDictionaryImpl.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBDictionaryImpl.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationHelper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationHelper.cpp
index d3788d40d54d..f43caa684f96 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationHelper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationHelper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet.cpp
index 7772fa0c38f2..b60154355543 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet_wrapper.cpp
index c8c2b7e82827..0d0de7554d3b 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBOperationSet_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl.cpp
index a727a3826ce4..009da63919e0 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl_wrapper.cpp
index 3fdffba94146..c1c2ac548173 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBSessionImpl_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext.cpp
index 697aae5dce4d..adfe5b2c8388 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext_wrapper.cpp
index 784d7e089784..62bcb693ac6f 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/DBTransactionContext_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/EncoderCharset.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/EncoderCharset.cpp
index 79e8a700ab7d..ffb653bfe30c 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/EncoderCharset.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/EncoderCharset.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/IndexBoundHelper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/IndexBoundHelper.cpp
index f42e59dbdd36..a57290a0b251 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/IndexBoundHelper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/IndexBoundHelper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/KeyOperation.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/KeyOperation.cpp
index 7982e0261c85..2d77e9e876ee 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/KeyOperation.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/KeyOperation.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbError_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbError_wrapper.cpp
index 6ebc0f892cf0..aa91f6bc7188 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbError_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbError_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbInterpretedCode_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbInterpretedCode_wrapper.cpp
index ff113ba8b25e..9db112c35859 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbInterpretedCode_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbInterpretedCode_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbRecordObject.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbRecordObject.cpp
index b77c48213c44..e05a964be105 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbRecordObject.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbRecordObject.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbScanFilter_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbScanFilter_wrapper.cpp
index ccf09a8c9169..64b9e981be08 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbScanFilter_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbScanFilter_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbTypeEncoders.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbTypeEncoders.cpp
index 0459945c63d0..93a0cb0557cc 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbTypeEncoders.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/NdbTypeEncoders.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_cluster_connection_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_cluster_connection_wrapper.cpp
index d84e3f339dcc..40be4cda4a33 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_cluster_connection_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_cluster_connection_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_init_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_init_wrapper.cpp
index e264b964bdd5..6bf20074a9bf 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_init_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_init_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_util_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_util_wrapper.cpp
index b2967c662fa1..ed55d7733d30 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_util_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_util_wrapper.cpp
@@ -1,16 +1,22 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_wrapper.cpp
index f2fe69c40269..84de2165f9c8 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Ndb_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Record.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Record.cpp
index 2fd5131c96eb..273346458f33 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Record.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Record.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/Record_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/Record_wrapper.cpp
index 8d5424210cb0..f8840fdbd0f4 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/Record_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/Record_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation.cpp
index 18e47a4271dc..a660969bd97e 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation_wrapper.cpp
index e365b97bc409..2e1f390f7d0c 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/ScanOperation_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/ValueObject.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/ValueObject.cpp
index 4068e4465a5b..1e067dd27f8b 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/ValueObject.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/ValueObject.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/mysqlclient_wrapper.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/mysqlclient_wrapper.cpp
index 6db7acc934bd..8be5be016c71 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/mysqlclient_wrapper.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/mysqlclient_wrapper.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/ndb/src/node_module.cpp b/storage/ndb/nodejs/Adapter/impl/ndb/src/node_module.cpp
index fcfc6cf9ca8b..ee55effb3ab6 100644
--- a/storage/ndb/nodejs/Adapter/impl/ndb/src/node_module.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/ndb/src/node_module.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/test/api-mapper.cc b/storage/ndb/nodejs/Adapter/impl/test/api-mapper.cc
index ec22f88ab276..d799809390f1 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/api-mapper.cc
+++ b/storage/ndb/nodejs/Adapter/impl/test/api-mapper.cc
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include "v8_binder.h"
 
 #include "c-api.h"
diff --git a/storage/ndb/nodejs/Adapter/impl/test/c-api.cc b/storage/ndb/nodejs/Adapter/impl/test/c-api.cc
index ac9cd8652696..d66d2c708452 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/c-api.cc
+++ b/storage/ndb/nodejs/Adapter/impl/test/c-api.cc
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /* A simple C API */
 
 #include <string.h>
diff --git a/storage/ndb/nodejs/Adapter/impl/test/c-api.h b/storage/ndb/nodejs/Adapter/impl/test/c-api.h
index 3d6350d42e99..78d5b5d70f1d 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/c-api.h
+++ b/storage/ndb/nodejs/Adapter/impl/test/c-api.h
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* A simple C API */
 
diff --git a/storage/ndb/nodejs/Adapter/impl/test/cxx-api.hpp b/storage/ndb/nodejs/Adapter/impl/test/cxx-api.hpp
index 7b3eb0ece2b0..97027bff6f75 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/cxx-api.hpp
+++ b/storage/ndb/nodejs/Adapter/impl/test/cxx-api.hpp
@@ -1,4 +1,26 @@
-
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* cxx-api.hpp */
 
diff --git a/storage/ndb/nodejs/Adapter/impl/test/debug_dlopen.cpp b/storage/ndb/nodejs/Adapter/impl/test/debug_dlopen.cpp
index 858bbb49dc3e..94eac8949ede 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/debug_dlopen.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/test/debug_dlopen.cpp
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Adapter/impl/test/js-constructor.cpp b/storage/ndb/nodejs/Adapter/impl/test/js-constructor.cpp
index 09595d68994f..c2d624d36ca6 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/js-constructor.cpp
+++ b/storage/ndb/nodejs/Adapter/impl/test/js-constructor.cpp
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include "node.h"
 
 using namespace v8;
diff --git a/storage/ndb/nodejs/Adapter/impl/test/loadtest.js b/storage/ndb/nodejs/Adapter/impl/test/loadtest.js
index 0a194619aab6..f04a16e68469 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/loadtest.js
+++ b/storage/ndb/nodejs/Adapter/impl/test/loadtest.js
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 var dbdl = require("../build/Release/test/debug_dlopen");
 
 function test(f) { 
diff --git a/storage/ndb/nodejs/Adapter/impl/test/maptest.js b/storage/ndb/nodejs/Adapter/impl/test/maptest.js
index 6b5661d7452e..2eb36620e548 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/maptest.js
+++ b/storage/ndb/nodejs/Adapter/impl/test/maptest.js
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 console.log("line 1");
 var udebug = require("../../api/unified_debug.js").getLogger("maptest.js");
 var mapper = require("../build/Release/test/mapper.node");
diff --git a/storage/ndb/nodejs/Adapter/impl/test/outer-mapper.cc b/storage/ndb/nodejs/Adapter/impl/test/outer-mapper.cc
index d95856df9c62..6a8893537575 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/outer-mapper.cc
+++ b/storage/ndb/nodejs/Adapter/impl/test/outer-mapper.cc
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include "v8_binder.h"
 
 #include "c-api.h"
diff --git a/storage/ndb/nodejs/Adapter/impl/test/test.cc b/storage/ndb/nodejs/Adapter/impl/test/test.cc
index 4f12758a518e..2d29d19adba9 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/test.cc
+++ b/storage/ndb/nodejs/Adapter/impl/test/test.cc
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include <stdio.h>
 
 #include "c-api.h"
@@ -10,4 +34,4 @@ main() {
   printf("whatnumber: %d\n", whatnumber(6,"mercy"));
   printf("quadrant: %d\n", p.quadrant());
   printf("area: %f\n", c.area());
-}
\ No newline at end of file
+}
diff --git a/storage/ndb/nodejs/Adapter/impl/test/wscript b/storage/ndb/nodejs/Adapter/impl/test/wscript
index fd0249d11e4c..5f220058de3a 100644
--- a/storage/ndb/nodejs/Adapter/impl/test/wscript
+++ b/storage/ndb/nodejs/Adapter/impl/test/wscript
@@ -1,3 +1,25 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 def configure(conf):
   pass
 
diff --git a/storage/ndb/nodejs/Adapter/impl/wscript b/storage/ndb/nodejs/Adapter/impl/wscript
index c345d442166d..7168fc8aaf82 100644
--- a/storage/ndb/nodejs/Adapter/impl/wscript
+++ b/storage/ndb/nodejs/Adapter/impl/wscript
@@ -1,3 +1,25 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 def configure(conf):
   conf.env.append_unique("CPPPATH", conf.env.my_inc)
   conf.env.append_unique("CPPPATH", conf.env.ndb_inc)
@@ -55,4 +77,4 @@ def build(ctx):
   "ndb/src/mysqlclient_wrapper.cpp " +\
   ""
   
-  ctx.recurse("test")
\ No newline at end of file
+  ctx.recurse("test")
diff --git a/storage/ndb/nodejs/Backend-documentation/mysql_properties.js b/storage/ndb/nodejs/Backend-documentation/mysql_properties.js
index 3908caba7e74..d0df6918d7b4 100644
--- a/storage/ndb/nodejs/Backend-documentation/mysql_properties.js
+++ b/storage/ndb/nodejs/Backend-documentation/mysql_properties.js
@@ -1,3 +1,27 @@
+/*
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 /*
   MySQL Connection Properties
 
diff --git a/storage/ndb/nodejs/Backend-documentation/ndb_properties.js b/storage/ndb/nodejs/Backend-documentation/ndb_properties.js
index 774c33ef4786..4ac4b7e30c44 100644
--- a/storage/ndb/nodejs/Backend-documentation/ndb_properties.js
+++ b/storage/ndb/nodejs/Backend-documentation/ndb_properties.js
@@ -1,4 +1,26 @@
+/*
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /*
   NDB Connection Properties
diff --git a/storage/ndb/nodejs/CMakeLists.txt b/storage/ndb/nodejs/CMakeLists.txt
index 763a2e683d34..a1b99de3e294 100644
--- a/storage/ndb/nodejs/CMakeLists.txt
+++ b/storage/ndb/nodejs/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.  
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.  
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/Converters/JSONConverter.js b/storage/ndb/nodejs/Converters/JSONConverter.js
index 4e33761bec4b..c57dae1e7305 100644
--- a/storage/ndb/nodejs/Converters/JSONConverter.js
+++ b/storage/ndb/nodejs/Converters/JSONConverter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Converters/JSONSparseConverter.js b/storage/ndb/nodejs/Converters/JSONSparseConverter.js
index f25615cd42f6..2da4f36db5b2 100644
--- a/storage/ndb/nodejs/Converters/JSONSparseConverter.js
+++ b/storage/ndb/nodejs/Converters/JSONSparseConverter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Converters/NdbDateConverter.js b/storage/ndb/nodejs/Converters/NdbDateConverter.js
index 432759080802..5557614c2539 100644
--- a/storage/ndb/nodejs/Converters/NdbDateConverter.js
+++ b/storage/ndb/nodejs/Converters/NdbDateConverter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Converters/NdbDatetimeConverter.js b/storage/ndb/nodejs/Converters/NdbDatetimeConverter.js
index 6b2f2d296157..1a6108f61d6e 100644
--- a/storage/ndb/nodejs/Converters/NdbDatetimeConverter.js
+++ b/storage/ndb/nodejs/Converters/NdbDatetimeConverter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/Converters/NdbTimeConverter.js b/storage/ndb/nodejs/Converters/NdbTimeConverter.js
index 332f4aca177f..29363dcbaa16 100644
--- a/storage/ndb/nodejs/Converters/NdbTimeConverter.js
+++ b/storage/ndb/nodejs/Converters/NdbTimeConverter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/binding.gyp b/storage/ndb/nodejs/binding.gyp
index 77568e04c7b7..dec6bbdc4e2f 100644
--- a/storage/ndb/nodejs/binding.gyp
+++ b/storage/ndb/nodejs/binding.gyp
@@ -1,3 +1,25 @@
+#   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License, version 2.0,
+#   as published by the Free Software Foundation.
+
+#   This program is also distributed with certain software (including
+#   but not limited to OpenSSL) that is licensed under separate terms,
+#   as designated in a particular file or component or in included license
+#   documentation.  The authors of MySQL hereby grant you an additional
+#   permission to link the program and your derivative works with the
+#   separately licensed software that they have included with MySQL.
+
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License, version 2.0, for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 # Some help:
 #  Microsoft linker options:  
 #     http://msdn.microsoft.com/en-us/library/4khtbfyf.aspx
diff --git a/storage/ndb/nodejs/configure.js b/storage/ndb/nodejs/configure.js
index 4ac5e6062075..4af8c022f308 100644
--- a/storage/ndb/nodejs/configure.js
+++ b/storage/ndb/nodejs/configure.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/loadme.js b/storage/ndb/nodejs/loadme.js
index 3b7c38dd204c..7d76d1eb5a12 100644
--- a/storage/ndb/nodejs/loadme.js
+++ b/storage/ndb/nodejs/loadme.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/README b/storage/ndb/nodejs/perftest/README
index 0203d8a1084b..03f7be597778 100644
--- a/storage/ndb/nodejs/perftest/README
+++ b/storage/ndb/nodejs/perftest/README
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/create.sql b/storage/ndb/nodejs/perftest/create.sql
index 006a36b61c01..fe5714d0cc0b 100644
--- a/storage/ndb/nodejs/perftest/create.sql
+++ b/storage/ndb/nodejs/perftest/create.sql
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/nodejs/perftest/insert.js b/storage/ndb/nodejs/perftest/insert.js
index 99d04838c3d1..6e9edb214da6 100644
--- a/storage/ndb/nodejs/perftest/insert.js
+++ b/storage/ndb/nodejs/perftest/insert.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/jscrund.js b/storage/ndb/nodejs/perftest/jscrund.js
index 05a4df644f03..568db84f8abe 100644
--- a/storage/ndb/nodejs/perftest/jscrund.js
+++ b/storage/ndb/nodejs/perftest/jscrund.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/jscrund_config.dist b/storage/ndb/nodejs/perftest/jscrund_config.dist
index 105c39c83e8a..64f2d8c5b4a0 100644
--- a/storage/ndb/nodejs/perftest/jscrund_config.dist
+++ b/storage/ndb/nodejs/perftest/jscrund_config.dist
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* To customize jscrund behavior, rename this file to jscrund.config and edit here.
    Properties on the command line override these options.
diff --git a/storage/ndb/nodejs/perftest/jscrund_dbspi.js b/storage/ndb/nodejs/perftest/jscrund_dbspi.js
index 7c7b99243b96..0671ee04ea72 100644
--- a/storage/ndb/nodejs/perftest/jscrund_dbspi.js
+++ b/storage/ndb/nodejs/perftest/jscrund_dbspi.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/jscrund_mysqljs.js b/storage/ndb/nodejs/perftest/jscrund_mysqljs.js
index 9920bd053e7b..81de7b5a38e2 100644
--- a/storage/ndb/nodejs/perftest/jscrund_mysqljs.js
+++ b/storage/ndb/nodejs/perftest/jscrund_mysqljs.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/jscrund_null.js b/storage/ndb/nodejs/perftest/jscrund_null.js
index bf3c403891fd..2bdee38ce2a6 100644
--- a/storage/ndb/nodejs/perftest/jscrund_null.js
+++ b/storage/ndb/nodejs/perftest/jscrund_null.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/jscrund_sql.js b/storage/ndb/nodejs/perftest/jscrund_sql.js
index 82ed7e4deccd..37a566b38d82 100644
--- a/storage/ndb/nodejs/perftest/jscrund_sql.js
+++ b/storage/ndb/nodejs/perftest/jscrund_sql.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/lib.js b/storage/ndb/nodejs/perftest/lib.js
index 113210e374bc..4b2ab8915269 100644
--- a/storage/ndb/nodejs/perftest/lib.js
+++ b/storage/ndb/nodejs/perftest/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/run_std_bench.sh b/storage/ndb/nodejs/perftest/run_std_bench.sh
index 1f110b7148ad..d3d7a097c024 100755
--- a/storage/ndb/nodejs/perftest/run_std_bench.sh
+++ b/storage/ndb/nodejs/perftest/run_std_bench.sh
@@ -1,3 +1,25 @@
+# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 LOGDIR='./benchmark_logs'
 SUMMARYFILE="$LOGDIR/All-runs-summary.txt"
 
diff --git a/storage/ndb/nodejs/perftest/webserver.js b/storage/ndb/nodejs/perftest/webserver.js
index d4b5b3418514..e474f64c569b 100644
--- a/storage/ndb/nodejs/perftest/webserver.js
+++ b/storage/ndb/nodejs/perftest/webserver.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/perftest/webserver2.js b/storage/ndb/nodejs/perftest/webserver2.js
index efd218956b3b..c256c22ee4e5 100644
--- a/storage/ndb/nodejs/perftest/webserver2.js
+++ b/storage/ndb/nodejs/perftest/webserver2.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/find.js b/storage/ndb/nodejs/samples/find.js
index d9bbd5253bc4..21d79207d513 100644
--- a/storage/ndb/nodejs/samples/find.js
+++ b/storage/ndb/nodejs/samples/find.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/insert.js b/storage/ndb/nodejs/samples/insert.js
index 154d16ba5adc..3ed1fdfb652c 100644
--- a/storage/ndb/nodejs/samples/insert.js
+++ b/storage/ndb/nodejs/samples/insert.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/dbloader.js b/storage/ndb/nodejs/samples/loader/dbloader.js
index a89df2416781..34dca194bc56 100644
--- a/storage/ndb/nodejs/samples/loader/dbloader.js
+++ b/storage/ndb/nodejs/samples/loader/dbloader.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/BadRecordLogger.js b/storage/ndb/nodejs/samples/loader/lib/BadRecordLogger.js
index deab1d390ab7..0ab6be0a4f7d 100644
--- a/storage/ndb/nodejs/samples/loader/lib/BadRecordLogger.js
+++ b/storage/ndb/nodejs/samples/loader/lib/BadRecordLogger.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/Controller.js b/storage/ndb/nodejs/samples/loader/lib/Controller.js
index 956b853cd9d3..d22582856677 100644
--- a/storage/ndb/nodejs/samples/loader/lib/Controller.js
+++ b/storage/ndb/nodejs/samples/loader/lib/Controller.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the  Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/DataSource.js b/storage/ndb/nodejs/samples/loader/lib/DataSource.js
index 31a888ab6876..8d8ab9d825dc 100644
--- a/storage/ndb/nodejs/samples/loader/lib/DataSource.js
+++ b/storage/ndb/nodejs/samples/loader/lib/DataSource.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/DbWriter.js b/storage/ndb/nodejs/samples/loader/lib/DbWriter.js
index 1076d7560ca0..6e3f3a571436 100644
--- a/storage/ndb/nodejs/samples/loader/lib/DbWriter.js
+++ b/storage/ndb/nodejs/samples/loader/lib/DbWriter.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/LoaderJob.js b/storage/ndb/nodejs/samples/loader/lib/LoaderJob.js
index 11da18c168ce..066d57af4245 100644
--- a/storage/ndb/nodejs/samples/loader/lib/LoaderJob.js
+++ b/storage/ndb/nodejs/samples/loader/lib/LoaderJob.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/LoaderModule.js b/storage/ndb/nodejs/samples/loader/lib/LoaderModule.js
index e56b21cd0627..331e0bfe8628 100644
--- a/storage/ndb/nodejs/samples/loader/lib/LoaderModule.js
+++ b/storage/ndb/nodejs/samples/loader/lib/LoaderModule.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/Parser.js b/storage/ndb/nodejs/samples/loader/lib/Parser.js
index 96c2ad3f956b..61c83b68e7cf 100644
--- a/storage/ndb/nodejs/samples/loader/lib/Parser.js
+++ b/storage/ndb/nodejs/samples/loader/lib/Parser.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/RandomData.js b/storage/ndb/nodejs/samples/loader/lib/RandomData.js
index 6fab3df7a01e..814ff05a5077 100644
--- a/storage/ndb/nodejs/samples/loader/lib/RandomData.js
+++ b/storage/ndb/nodejs/samples/loader/lib/RandomData.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/Scanner.js b/storage/ndb/nodejs/samples/loader/lib/Scanner.js
index 66668cd2435e..0564cc314439 100644
--- a/storage/ndb/nodejs/samples/loader/lib/Scanner.js
+++ b/storage/ndb/nodejs/samples/loader/lib/Scanner.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/lib/control_file.js b/storage/ndb/nodejs/samples/loader/lib/control_file.js
index a2cad7cbe044..5e608832e5d8 100644
--- a/storage/ndb/nodejs/samples/loader/lib/control_file.js
+++ b/storage/ndb/nodejs/samples/loader/lib/control_file.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/sample_modules/PluginApi.js b/storage/ndb/nodejs/samples/loader/sample_modules/PluginApi.js
index 9ae407c44145..c3f6534241ab 100644
--- a/storage/ndb/nodejs/samples/loader/sample_modules/PluginApi.js
+++ b/storage/ndb/nodejs/samples/loader/sample_modules/PluginApi.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/loader/sample_modules/data_lines.js b/storage/ndb/nodejs/samples/loader/sample_modules/data_lines.js
index 39abc256f9d0..b8b7b1b78c72 100644
--- a/storage/ndb/nodejs/samples/loader/sample_modules/data_lines.js
+++ b/storage/ndb/nodejs/samples/loader/sample_modules/data_lines.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/tweet/test_tweet.sh b/storage/ndb/nodejs/samples/tweet/test_tweet.sh
index 3c7f555e86b7..e4777722cd55 100755
--- a/storage/ndb/nodejs/samples/tweet/test_tweet.sh
+++ b/storage/ndb/nodejs/samples/tweet/test_tweet.sh
@@ -1,18 +1,24 @@
 #!/bin/sh
 
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
 # reserved.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 of
-# the License.
-# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/tweet/tweet.js b/storage/ndb/nodejs/samples/tweet/tweet.js
index 3becb366064e..b1e74949807f 100644
--- a/storage/ndb/nodejs/samples/tweet/tweet.js
+++ b/storage/ndb/nodejs/samples/tweet/tweet.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/samples/tweet/tweet.properties.js b/storage/ndb/nodejs/samples/tweet/tweet.properties.js
index ee68b831b82d..eefb827440cb 100644
--- a/storage/ndb/nodejs/samples/tweet/tweet.properties.js
+++ b/storage/ndb/nodejs/samples/tweet/tweet.properties.js
@@ -1,18 +1,24 @@
 
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/setup/generate-SQLState_js.awk b/storage/ndb/nodejs/setup/generate-SQLState_js.awk
index 654cff6bcd5b..6a0cc3947a1d 100644
--- a/storage/ndb/nodejs/setup/generate-SQLState_js.awk
+++ b/storage/ndb/nodejs/setup/generate-SQLState_js.awk
@@ -1,16 +1,22 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
 # reserved.
 # 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 of
-# the License.
-# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/DefaultImplementationTest.js b/storage/ndb/nodejs/test/api/DefaultImplementationTest.js
index bcfd4319a15c..c9ba44aa2a38 100644
--- a/storage/ndb/nodejs/test/api/DefaultImplementationTest.js
+++ b/storage/ndb/nodejs/test/api/DefaultImplementationTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/FieldMappingErrorTest.js b/storage/ndb/nodejs/test/api/FieldMappingErrorTest.js
index 912793b33d0c..ac0299f619ef 100644
--- a/storage/ndb/nodejs/test/api/FieldMappingErrorTest.js
+++ b/storage/ndb/nodejs/test/api/FieldMappingErrorTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/MynodeTest.js b/storage/ndb/nodejs/test/api/MynodeTest.js
index a46caa41081f..222f08403125 100755
--- a/storage/ndb/nodejs/test/api/MynodeTest.js
+++ b/storage/ndb/nodejs/test/api/MynodeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/PromisesTest.js b/storage/ndb/nodejs/test/api/PromisesTest.js
index 5e72ccd3b40e..d8411d2d6ea5 100644
--- a/storage/ndb/nodejs/test/api/PromisesTest.js
+++ b/storage/ndb/nodejs/test/api/PromisesTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/StatsTest.js b/storage/ndb/nodejs/test/api/StatsTest.js
index cf9d835c8336..6bce315dc0af 100644
--- a/storage/ndb/nodejs/test/api/StatsTest.js
+++ b/storage/ndb/nodejs/test/api/StatsTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/TableMappingErrorTest.js b/storage/ndb/nodejs/test/api/TableMappingErrorTest.js
index 9dfab793dfa0..ed757bd7982f 100644
--- a/storage/ndb/nodejs/test/api/TableMappingErrorTest.js
+++ b/storage/ndb/nodejs/test/api/TableMappingErrorTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/api/TableMappingTest.js b/storage/ndb/nodejs/test/api/TableMappingTest.js
index 66521b99dd71..a2dabc49e34e 100644
--- a/storage/ndb/nodejs/test/api/TableMappingTest.js
+++ b/storage/ndb/nodejs/test/api/TableMappingTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/autoincrement/AutoPKInsertTest.js b/storage/ndb/nodejs/test/autoincrement/AutoPKInsertTest.js
index ddc5a0c52a2b..c718c9dbdf49 100644
--- a/storage/ndb/nodejs/test/autoincrement/AutoPKInsertTest.js
+++ b/storage/ndb/nodejs/test/autoincrement/AutoPKInsertTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/autoincrement/AutoUKInsertTest.js b/storage/ndb/nodejs/test/autoincrement/AutoUKInsertTest.js
index 7d34713615bb..ea0cff130631 100644
--- a/storage/ndb/nodejs/test/autoincrement/AutoUKInsertTest.js
+++ b/storage/ndb/nodejs/test/autoincrement/AutoUKInsertTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/autoincrement/ClearSmokeTest.js b/storage/ndb/nodejs/test/autoincrement/ClearSmokeTest.js
index cdcb6c781a9d..0fbd9e7a47d7 100644
--- a/storage/ndb/nodejs/test/autoincrement/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/autoincrement/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/autoincrement/SmokeTest.js b/storage/ndb/nodejs/test/autoincrement/SmokeTest.js
index 49f8a44518e0..e3d6205ad8a3 100644
--- a/storage/ndb/nodejs/test/autoincrement/SmokeTest.js
+++ b/storage/ndb/nodejs/test/autoincrement/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/autoincrement/create.sql b/storage/ndb/nodejs/test/autoincrement/create.sql
index f7a55df9755a..3bfb1ca5e88b 100644
--- a/storage/ndb/nodejs/test/autoincrement/create.sql
+++ b/storage/ndb/nodejs/test/autoincrement/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists autopk;
 create table if not exists autopk (
diff --git a/storage/ndb/nodejs/test/autoincrement/drop.sql b/storage/ndb/nodejs/test/autoincrement/drop.sql
index 2c8e91c351b2..d40947d1005d 100644
--- a/storage/ndb/nodejs/test/autoincrement/drop.sql
+++ b/storage/ndb/nodejs/test/autoincrement/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists autopk;
 drop table if exists autouk;
diff --git a/storage/ndb/nodejs/test/autoincrement/lib.js b/storage/ndb/nodejs/test/autoincrement/lib.js
index e991d85bccc3..f5970a97f94c 100644
--- a/storage/ndb/nodejs/test/autoincrement/lib.js
+++ b/storage/ndb/nodejs/test/autoincrement/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/ClearSmokeTest.js b/storage/ndb/nodejs/test/composition/ClearSmokeTest.js
index 60c94255dacf..7443596fbdc4 100644
--- a/storage/ndb/nodejs/test/composition/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/composition/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/ProjectionErrorTest.js b/storage/ndb/nodejs/test/composition/ProjectionErrorTest.js
index fd2188137af2..b2e335425d7c 100644
--- a/storage/ndb/nodejs/test/composition/ProjectionErrorTest.js
+++ b/storage/ndb/nodejs/test/composition/ProjectionErrorTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/ProjectionTest.js b/storage/ndb/nodejs/test/composition/ProjectionTest.js
index 85e460631938..a913a1b39a67 100644
--- a/storage/ndb/nodejs/test/composition/ProjectionTest.js
+++ b/storage/ndb/nodejs/test/composition/ProjectionTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/RelationshipMappingTest.js b/storage/ndb/nodejs/test/composition/RelationshipMappingTest.js
index 54dd72e1b3ed..3e24ddfc5f68 100644
--- a/storage/ndb/nodejs/test/composition/RelationshipMappingTest.js
+++ b/storage/ndb/nodejs/test/composition/RelationshipMappingTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/SmokeTest.js b/storage/ndb/nodejs/test/composition/SmokeTest.js
index 78105d70859c..9e4ee4bf2688 100644
--- a/storage/ndb/nodejs/test/composition/SmokeTest.js
+++ b/storage/ndb/nodejs/test/composition/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/composition/create.sql b/storage/ndb/nodejs/test/composition/create.sql
index eb8a2d80d715..464fdad30e38 100644
--- a/storage/ndb/nodejs/test/composition/create.sql
+++ b/storage/ndb/nodejs/test/composition/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 create database if not exists testfk;
 drop table if exists testfk.fkdifferentdb;
 
diff --git a/storage/ndb/nodejs/test/composition/drop.sql b/storage/ndb/nodejs/test/composition/drop.sql
index 874318b55805..19316c9d0a97 100644
--- a/storage/ndb/nodejs/test/composition/drop.sql
+++ b/storage/ndb/nodejs/test/composition/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 # drop tables in proper order to avoid foreign key constraint violations
 drop table if exists testfk.fkdifferentdb;
diff --git a/storage/ndb/nodejs/test/composition/lib.js b/storage/ndb/nodejs/test/composition/lib.js
index 8cf7591d35af..a36902b16bd2 100644
--- a/storage/ndb/nodejs/test/composition/lib.js
+++ b/storage/ndb/nodejs/test/composition/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/db/ClearSmokeTest.js b/storage/ndb/nodejs/test/db/ClearSmokeTest.js
index 31d1cfc21259..1be372234cbc 100644
--- a/storage/ndb/nodejs/test/db/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/db/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/db/InsertTest.js b/storage/ndb/nodejs/test/db/InsertTest.js
index b44f7f4aed3f..dc050e4d154b 100644
--- a/storage/ndb/nodejs/test/db/InsertTest.js
+++ b/storage/ndb/nodejs/test/db/InsertTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/db/SmokeTest.js b/storage/ndb/nodejs/test/db/SmokeTest.js
index b0166fb9f3df..ea5edd0b252a 100644
--- a/storage/ndb/nodejs/test/db/SmokeTest.js
+++ b/storage/ndb/nodejs/test/db/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/db/create.sql b/storage/ndb/nodejs/test/db/create.sql
index 0f347e0f989c..1045c3fade0a 100644
--- a/storage/ndb/nodejs/test/db/create.sql
+++ b/storage/ndb/nodejs/test/db/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists db_new_schema1;
 drop table if exists db_new_schema2;
diff --git a/storage/ndb/nodejs/test/db/drop.sql b/storage/ndb/nodejs/test/db/drop.sql
index a9093c59ad14..b460c88a7793 100644
--- a/storage/ndb/nodejs/test/db/drop.sql
+++ b/storage/ndb/nodejs/test/db/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 
 drop table if exists db_basic;
diff --git a/storage/ndb/nodejs/test/disabled-tests.dist b/storage/ndb/nodejs/test/disabled-tests.dist
index adfcf2423e4b..cae321d2cc78 100644
--- a/storage/ndb/nodejs/test/disabled-tests.dist
+++ b/storage/ndb/nodejs/test/disabled-tests.dist
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /**
   How to disable certain test cases: 
diff --git a/storage/ndb/nodejs/test/driver.js b/storage/ndb/nodejs/test/driver.js
index aec5df139929..9004a255c073 100644
--- a/storage/ndb/nodejs/test/driver.js
+++ b/storage/ndb/nodejs/test/driver.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, 2014 Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/ClearSmokeTest.js b/storage/ndb/nodejs/test/freeform/ClearSmokeTest.js
index c279c8250e84..d3974bf46a03 100644
--- a/storage/ndb/nodejs/test/freeform/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/freeform/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/ExcludeFieldsTest.js b/storage/ndb/nodejs/test/freeform/ExcludeFieldsTest.js
index e7a988852e7e..6c40adfea455 100644
--- a/storage/ndb/nodejs/test/freeform/ExcludeFieldsTest.js
+++ b/storage/ndb/nodejs/test/freeform/ExcludeFieldsTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/FreeformMappingErrorTest.js b/storage/ndb/nodejs/test/freeform/FreeformMappingErrorTest.js
index 293f839e566f..fa19fd7a8886 100644
--- a/storage/ndb/nodejs/test/freeform/FreeformMappingErrorTest.js
+++ b/storage/ndb/nodejs/test/freeform/FreeformMappingErrorTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/FreeformTest.js b/storage/ndb/nodejs/test/freeform/FreeformTest.js
index fe50507d3e7b..b35cc63426e1 100644
--- a/storage/ndb/nodejs/test/freeform/FreeformTest.js
+++ b/storage/ndb/nodejs/test/freeform/FreeformTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/IncludeFieldTest.js b/storage/ndb/nodejs/test/freeform/IncludeFieldTest.js
index cf5246cd55f7..899bc2a05c7c 100644
--- a/storage/ndb/nodejs/test/freeform/IncludeFieldTest.js
+++ b/storage/ndb/nodejs/test/freeform/IncludeFieldTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/SemistructTest.js b/storage/ndb/nodejs/test/freeform/SemistructTest.js
index b6441644aaa0..5bef9f22aef5 100644
--- a/storage/ndb/nodejs/test/freeform/SemistructTest.js
+++ b/storage/ndb/nodejs/test/freeform/SemistructTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/SmokeTest.js b/storage/ndb/nodejs/test/freeform/SmokeTest.js
index bf5f56f85d7e..feeda7f3e491 100644
--- a/storage/ndb/nodejs/test/freeform/SmokeTest.js
+++ b/storage/ndb/nodejs/test/freeform/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/freeform/create.sql b/storage/ndb/nodejs/test/freeform/create.sql
index 3aeabfec1465..4628b26715c4 100644
--- a/storage/ndb/nodejs/test/freeform/create.sql
+++ b/storage/ndb/nodejs/test/freeform/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists freeform;
 create table if not exists freeform (
diff --git a/storage/ndb/nodejs/test/freeform/drop.sql b/storage/ndb/nodejs/test/freeform/drop.sql
index ab5f1411e40c..3c4ceda2ada1 100644
--- a/storage/ndb/nodejs/test/freeform/drop.sql
+++ b/storage/ndb/nodejs/test/freeform/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists freeform;
 drop table if exists semistruct;
diff --git a/storage/ndb/nodejs/test/innodb.sql b/storage/ndb/nodejs/test/innodb.sql
index 16e357d19d9c..00c5998df9b1 100644
--- a/storage/ndb/nodejs/test/innodb.sql
+++ b/storage/ndb/nodejs/test/innodb.sql
@@ -1 +1,23 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 set default_storage_engine=innodb;
diff --git a/storage/ndb/nodejs/test/issues/2013-04-27Test.js b/storage/ndb/nodejs/test/issues/2013-04-27Test.js
index 99baa12d1faf..561831f2e8ca 100644
--- a/storage/ndb/nodejs/test/issues/2013-04-27Test.js
+++ b/storage/ndb/nodejs/test/issues/2013-04-27Test.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/issues/2014-03-17Test.js b/storage/ndb/nodejs/test/issues/2014-03-17Test.js
index 2542c5606d17..dd16e97094b6 100644
--- a/storage/ndb/nodejs/test/issues/2014-03-17Test.js
+++ b/storage/ndb/nodejs/test/issues/2014-03-17Test.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/issues/ClearSmokeTest.js b/storage/ndb/nodejs/test/issues/ClearSmokeTest.js
index 101e2c3cd147..f31937fe09df 100644
--- a/storage/ndb/nodejs/test/issues/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/issues/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/issues/SmokeTest.js b/storage/ndb/nodejs/test/issues/SmokeTest.js
index aa98e5c672a9..68fb7aed74b0 100644
--- a/storage/ndb/nodejs/test/issues/SmokeTest.js
+++ b/storage/ndb/nodejs/test/issues/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/issues/create.sql b/storage/ndb/nodejs/test/issues/create.sql
index 8bc57f2cb875..0ab3da240ad0 100644
--- a/storage/ndb/nodejs/test/issues/create.sql
+++ b/storage/ndb/nodejs/test/issues/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 DROP TABLE if EXISTS towns;
 DROP TABLE if EXISTS a;
diff --git a/storage/ndb/nodejs/test/issues/drop.sql b/storage/ndb/nodejs/test/issues/drop.sql
index 1137485148ef..cba1f7460efe 100644
--- a/storage/ndb/nodejs/test/issues/drop.sql
+++ b/storage/ndb/nodejs/test/issues/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists towns;
 drop table if exists a;
diff --git a/storage/ndb/nodejs/test/lib/QueryTest.js b/storage/ndb/nodejs/test/lib/QueryTest.js
index 7020f8c152a2..afdcc75a8a21 100644
--- a/storage/ndb/nodejs/test/lib/QueryTest.js
+++ b/storage/ndb/nodejs/test/lib/QueryTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/lib/doc_parser.js b/storage/ndb/nodejs/test/lib/doc_parser.js
index 007f8477a3d8..909bccea15f1 100644
--- a/storage/ndb/nodejs/test/lib/doc_parser.js
+++ b/storage/ndb/nodejs/test/lib/doc_parser.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/lib/harness.js b/storage/ndb/nodejs/test/lib/harness.js
index 572598553486..d896149c5062 100644
--- a/storage/ndb/nodejs/test/lib/harness.js
+++ b/storage/ndb/nodejs/test/lib/harness.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/lib/list_docs.js b/storage/ndb/nodejs/test/lib/list_docs.js
index 170c3d5728b8..62113ab77c2a 100644
--- a/storage/ndb/nodejs/test/lib/list_docs.js
+++ b/storage/ndb/nodejs/test/lib/list_docs.js
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 var doc_parser = require("./doc_parser.js");
 
diff --git a/storage/ndb/nodejs/test/lib/read_write.js b/storage/ndb/nodejs/test/lib/read_write.js
index 8e6eb1015721..7f6e4772b29a 100644
--- a/storage/ndb/nodejs/test/lib/read_write.js
+++ b/storage/ndb/nodejs/test/lib/read_write.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/lib/test_connection_js.dist b/storage/ndb/nodejs/test/lib/test_connection_js.dist
index b36431cbac2b..7d7f7630aa8b 100644
--- a/storage/ndb/nodejs/test/lib/test_connection_js.dist
+++ b/storage/ndb/nodejs/test/lib/test_connection_js.dist
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* Configure local connection properties for the test suite 
  
diff --git a/storage/ndb/nodejs/test/lint/LintTest.js b/storage/ndb/nodejs/test/lint/LintTest.js
index c6c624e73d34..17b2492fd73d 100644
--- a/storage/ndb/nodejs/test/lint/LintTest.js
+++ b/storage/ndb/nodejs/test/lint/LintTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multidb/ClearSmokeTest.js b/storage/ndb/nodejs/test/multidb/ClearSmokeTest.js
index ebbda4764ec5..366e903baf75 100644
--- a/storage/ndb/nodejs/test/multidb/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/multidb/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multidb/ConnectTest.js b/storage/ndb/nodejs/test/multidb/ConnectTest.js
index 9baf2b9c8046..d7b0a1821cd7 100644
--- a/storage/ndb/nodejs/test/multidb/ConnectTest.js
+++ b/storage/ndb/nodejs/test/multidb/ConnectTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multidb/SmokeTest.js b/storage/ndb/nodejs/test/multidb/SmokeTest.js
index 5d30f7b8efbb..4426db10fa8a 100644
--- a/storage/ndb/nodejs/test/multidb/SmokeTest.js
+++ b/storage/ndb/nodejs/test/multidb/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multidb/create.sql b/storage/ndb/nodejs/test/multidb/create.sql
index 1dab2934304d..d665b4f8405f 100644
--- a/storage/ndb/nodejs/test/multidb/create.sql
+++ b/storage/ndb/nodejs/test/multidb/create.sql
@@ -1,3 +1,24 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 create database IF NOT EXISTS mysqljs_multidb_test1;
 use mysqljs_multidb_test1;
diff --git a/storage/ndb/nodejs/test/multidb/drop.sql b/storage/ndb/nodejs/test/multidb/drop.sql
index 159f5993f82e..dfa8d3352471 100644
--- a/storage/ndb/nodejs/test/multidb/drop.sql
+++ b/storage/ndb/nodejs/test/multidb/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 drop table if exists mysqljs_multidb_test1.tbl1;
 drop table if exists mysqljs_multidb_test2.tbl2;
 drop table if exists mysqljs_multidb_test3.tbl3;
diff --git a/storage/ndb/nodejs/test/multipartkeys/ClearSmokeTest.js b/storage/ndb/nodejs/test/multipartkeys/ClearSmokeTest.js
index ebbda4764ec5..366e903baf75 100644
--- a/storage/ndb/nodejs/test/multipartkeys/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/multipartkeys/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multipartkeys/QueryScanTest.js b/storage/ndb/nodejs/test/multipartkeys/QueryScanTest.js
index 7078bed534cf..8bb465c0a572 100644
--- a/storage/ndb/nodejs/test/multipartkeys/QueryScanTest.js
+++ b/storage/ndb/nodejs/test/multipartkeys/QueryScanTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multipartkeys/SmokeTest.js b/storage/ndb/nodejs/test/multipartkeys/SmokeTest.js
index 6f631f5ef2f7..805a56c3bac8 100644
--- a/storage/ndb/nodejs/test/multipartkeys/SmokeTest.js
+++ b/storage/ndb/nodejs/test/multipartkeys/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/multipartkeys/create.sql b/storage/ndb/nodejs/test/multipartkeys/create.sql
index 36d0945c8d2c..6ccb0405c7b0 100644
--- a/storage/ndb/nodejs/test/multipartkeys/create.sql
+++ b/storage/ndb/nodejs/test/multipartkeys/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists mpk1;
 create table if not exists mpk1 (
@@ -34,4 +56,4 @@ INSERT INTO mpk1
           (20, 5,    NULL, NULL, "Twenty"),
           (21, NULL, NULL, NULL, "Twenty One");
 
-          
\ No newline at end of file
+          
diff --git a/storage/ndb/nodejs/test/multipartkeys/drop.sql b/storage/ndb/nodejs/test/multipartkeys/drop.sql
index 74521911688a..56ca6bc6a933 100644
--- a/storage/ndb/nodejs/test/multipartkeys/drop.sql
+++ b/storage/ndb/nodejs/test/multipartkeys/drop.sql
@@ -1,2 +1,24 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists mpk1;
diff --git a/storage/ndb/nodejs/test/mysql56types/CharsetTest.js b/storage/ndb/nodejs/test/mysql56types/CharsetTest.js
index cd54acc661c0..72b4cc84c758 100644
--- a/storage/ndb/nodejs/test/mysql56types/CharsetTest.js
+++ b/storage/ndb/nodejs/test/mysql56types/CharsetTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/mysql56types/ClearSmokeTest.js b/storage/ndb/nodejs/test/mysql56types/ClearSmokeTest.js
index 101e2c3cd147..f31937fe09df 100644
--- a/storage/ndb/nodejs/test/mysql56types/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/mysql56types/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/mysql56types/SmokeTest.js b/storage/ndb/nodejs/test/mysql56types/SmokeTest.js
index aa98e5c672a9..68fb7aed74b0 100644
--- a/storage/ndb/nodejs/test/mysql56types/SmokeTest.js
+++ b/storage/ndb/nodejs/test/mysql56types/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/mysql56types/TemporalTest.js b/storage/ndb/nodejs/test/mysql56types/TemporalTest.js
index 8cddd88ef27e..aeb08661a08b 100644
--- a/storage/ndb/nodejs/test/mysql56types/TemporalTest.js
+++ b/storage/ndb/nodejs/test/mysql56types/TemporalTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/mysql56types/create.sql b/storage/ndb/nodejs/test/mysql56types/create.sql
index f1843aef17cf..61fe6a778a4a 100644
--- a/storage/ndb/nodejs/test/mysql56types/create.sql
+++ b/storage/ndb/nodejs/test/mysql56types/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 create table if not exists mysql56strings (
   id int not null PRIMARY KEY,
diff --git a/storage/ndb/nodejs/test/mysql56types/drop.sql b/storage/ndb/nodejs/test/mysql56types/drop.sql
index 0d6b77f25798..146fbae5cc94 100644
--- a/storage/ndb/nodejs/test/mysql56types/drop.sql
+++ b/storage/ndb/nodejs/test/mysql56types/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists mysql56strings;
 drop table if exists mysql56times;
diff --git a/storage/ndb/nodejs/test/ndb.sql b/storage/ndb/nodejs/test/ndb.sql
index 49969c577625..f6a7145a3fd7 100644
--- a/storage/ndb/nodejs/test/ndb.sql
+++ b/storage/ndb/nodejs/test/ndb.sql
@@ -1 +1,23 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 set default_storage_engine=ndbcluster;
diff --git a/storage/ndb/nodejs/test/numerictypes/ClearSmokeTest.js b/storage/ndb/nodejs/test/numerictypes/ClearSmokeTest.js
index feddb54fdb29..928879cb37eb 100644
--- a/storage/ndb/nodejs/test/numerictypes/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/FindTest.js b/storage/ndb/nodejs/test/numerictypes/FindTest.js
index 90ec1dc586c6..09f8e387cc4f 100644
--- a/storage/ndb/nodejs/test/numerictypes/FindTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/FindTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryBtreeIndexScanLimitTest.js b/storage/ndb/nodejs/test/numerictypes/QueryBtreeIndexScanLimitTest.js
index dca35f365a81..25e8ff9b1bad 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryBtreeIndexScanLimitTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryBtreeIndexScanLimitTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryFindTest.js b/storage/ndb/nodejs/test/numerictypes/QueryFindTest.js
index cfda6c807df1..36a00ea68db1 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryFindTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryFindTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryIndexScanTest.js b/storage/ndb/nodejs/test/numerictypes/QueryIndexScanTest.js
index 3382ee900a38..4863f763e83c 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryIndexScanTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryIndexScanTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryKeywordTest.js b/storage/ndb/nodejs/test/numerictypes/QueryKeywordTest.js
index fa093319aad0..64445b988b71 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryKeywordTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryKeywordTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanLimitTest.js b/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanLimitTest.js
index cede96e21678..1282504e4a12 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanLimitTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanLimitTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanTest.js b/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanTest.js
index e856ff066751..3815fa35c28a 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryPrimaryIndexScanTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryTableScanTest.js b/storage/ndb/nodejs/test/numerictypes/QueryTableScanTest.js
index 4e88cf62c4f0..098d990ffc1f 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryTableScanTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryTableScanTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/QueryVisitorTest.js b/storage/ndb/nodejs/test/numerictypes/QueryVisitorTest.js
index d8fbf0762807..acd75d6506c3 100644
--- a/storage/ndb/nodejs/test/numerictypes/QueryVisitorTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/QueryVisitorTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/SmokeTest.js b/storage/ndb/nodejs/test/numerictypes/SmokeTest.js
index ae4febee545f..b65d0cea66eb 100644
--- a/storage/ndb/nodejs/test/numerictypes/SmokeTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/TypeCastsTest.js b/storage/ndb/nodejs/test/numerictypes/TypeCastsTest.js
index ca3a1572e2e1..5204502ff97e 100644
--- a/storage/ndb/nodejs/test/numerictypes/TypeCastsTest.js
+++ b/storage/ndb/nodejs/test/numerictypes/TypeCastsTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/numerictypes/create.sql b/storage/ndb/nodejs/test/numerictypes/create.sql
index 0b60e0425930..2cb76d43a4d9 100644
--- a/storage/ndb/nodejs/test/numerictypes/create.sql
+++ b/storage/ndb/nodejs/test/numerictypes/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists integraltypes;
 create table integraltypes (
diff --git a/storage/ndb/nodejs/test/numerictypes/drop.sql b/storage/ndb/nodejs/test/numerictypes/drop.sql
index f1cbd0d50f33..782813a9261c 100644
--- a/storage/ndb/nodejs/test/numerictypes/drop.sql
+++ b/storage/ndb/nodejs/test/numerictypes/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists integraltypes;
 drop table if exists numerictypes;
diff --git a/storage/ndb/nodejs/test/numerictypes/lib.js b/storage/ndb/nodejs/test/numerictypes/lib.js
index ea177cd672fa..a76a40d1f85f 100644
--- a/storage/ndb/nodejs/test/numerictypes/lib.js
+++ b/storage/ndb/nodejs/test/numerictypes/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/BasicVarcharTest.js b/storage/ndb/nodejs/test/spi/BasicVarcharTest.js
index 3f77b0a397dd..654eaeaeded2 100644
--- a/storage/ndb/nodejs/test/spi/BasicVarcharTest.js
+++ b/storage/ndb/nodejs/test/spi/BasicVarcharTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/ClearSmokeTest.js b/storage/ndb/nodejs/test/spi/ClearSmokeTest.js
index c60f9d095ff8..14a8be6149f1 100644
--- a/storage/ndb/nodejs/test/spi/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/spi/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/DBConnectionPoolTest.js b/storage/ndb/nodejs/test/spi/DBConnectionPoolTest.js
index 43353f7627c6..d48a258be61f 100644
--- a/storage/ndb/nodejs/test/spi/DBConnectionPoolTest.js
+++ b/storage/ndb/nodejs/test/spi/DBConnectionPoolTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/DBDictionaryTest.js b/storage/ndb/nodejs/test/spi/DBDictionaryTest.js
index d1f46d9b78b5..65aa8a1a8ae7 100644
--- a/storage/ndb/nodejs/test/spi/DBDictionaryTest.js
+++ b/storage/ndb/nodejs/test/spi/DBDictionaryTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/DBServiceProviderTest.js b/storage/ndb/nodejs/test/spi/DBServiceProviderTest.js
index de24c9a02d45..d9458e12849d 100644
--- a/storage/ndb/nodejs/test/spi/DBServiceProviderTest.js
+++ b/storage/ndb/nodejs/test/spi/DBServiceProviderTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/InsertAndDeleteIntTest.js b/storage/ndb/nodejs/test/spi/InsertAndDeleteIntTest.js
index 053f594e79bc..82a7194736f7 100644
--- a/storage/ndb/nodejs/test/spi/InsertAndDeleteIntTest.js
+++ b/storage/ndb/nodejs/test/spi/InsertAndDeleteIntTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/InsertDuplicateTest.js b/storage/ndb/nodejs/test/spi/InsertDuplicateTest.js
index dfdfb7b30773..bcfdaaf77b0c 100644
--- a/storage/ndb/nodejs/test/spi/InsertDuplicateTest.js
+++ b/storage/ndb/nodejs/test/spi/InsertDuplicateTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/NoCommitTest.js b/storage/ndb/nodejs/test/spi/NoCommitTest.js
index 36bf1d2c353d..c474cf47878d 100644
--- a/storage/ndb/nodejs/test/spi/NoCommitTest.js
+++ b/storage/ndb/nodejs/test/spi/NoCommitTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/SmokeTest.js b/storage/ndb/nodejs/test/spi/SmokeTest.js
index c691d087fedd..4a7d542a50c3 100644
--- a/storage/ndb/nodejs/test/spi/SmokeTest.js
+++ b/storage/ndb/nodejs/test/spi/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/TableMappingTest.js b/storage/ndb/nodejs/test/spi/TableMappingTest.js
index 9bab826b7fb2..b3d3604a07ab 100644
--- a/storage/ndb/nodejs/test/spi/TableMappingTest.js
+++ b/storage/ndb/nodejs/test/spi/TableMappingTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/UniqueKeyTest.js b/storage/ndb/nodejs/test/spi/UniqueKeyTest.js
index 8c622a4757dd..c39abf4e55d7 100644
--- a/storage/ndb/nodejs/test/spi/UniqueKeyTest.js
+++ b/storage/ndb/nodejs/test/spi/UniqueKeyTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/spi/create.sql b/storage/ndb/nodejs/test/spi/create.sql
index 74b3679a4b8b..373f585657f5 100644
--- a/storage/ndb/nodejs/test/spi/create.sql
+++ b/storage/ndb/nodejs/test/spi/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists tbl1;
 create table IF NOT EXISTS tbl1 (i int primary key not null, j int);
diff --git a/storage/ndb/nodejs/test/spi/drop.sql b/storage/ndb/nodejs/test/spi/drop.sql
index f579ec526f18..02dd6066f6ef 100644
--- a/storage/ndb/nodejs/test/spi/drop.sql
+++ b/storage/ndb/nodejs/test/spi/drop.sql
@@ -1,3 +1,25 @@
+- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists tbl1;
 drop table if exists tbl2;
diff --git a/storage/ndb/nodejs/test/spi/lib.js b/storage/ndb/nodejs/test/spi/lib.js
index 2f114b95b701..9b8c6944042d 100644
--- a/storage/ndb/nodejs/test/spi/lib.js
+++ b/storage/ndb/nodejs/test/spi/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/BinaryTest.js b/storage/ndb/nodejs/test/stringtypes/BinaryTest.js
index f59af651e168..2707f2534ef9 100644
--- a/storage/ndb/nodejs/test/stringtypes/BinaryTest.js
+++ b/storage/ndb/nodejs/test/stringtypes/BinaryTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014 , Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/CharsetTest.js b/storage/ndb/nodejs/test/stringtypes/CharsetTest.js
index e35dfaf10f34..a358f607cb3c 100644
--- a/storage/ndb/nodejs/test/stringtypes/CharsetTest.js
+++ b/storage/ndb/nodejs/test/stringtypes/CharsetTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/ClearSmokeTest.js b/storage/ndb/nodejs/test/stringtypes/ClearSmokeTest.js
index 9fc7f3863b8e..52ca71255cfc 100644
--- a/storage/ndb/nodejs/test/stringtypes/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/stringtypes/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/SmokeTest.js b/storage/ndb/nodejs/test/stringtypes/SmokeTest.js
index e4f6c27cf25a..4f26327911df 100644
--- a/storage/ndb/nodejs/test/stringtypes/SmokeTest.js
+++ b/storage/ndb/nodejs/test/stringtypes/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/TextTest.js b/storage/ndb/nodejs/test/stringtypes/TextTest.js
index ebbd317e66b3..47bb08ed7e06 100644
--- a/storage/ndb/nodejs/test/stringtypes/TextTest.js
+++ b/storage/ndb/nodejs/test/stringtypes/TextTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/stringtypes/create.sql b/storage/ndb/nodejs/test/stringtypes/create.sql
index c9813fc2647e..63483010274c 100644
--- a/storage/ndb/nodejs/test/stringtypes/create.sql
+++ b/storage/ndb/nodejs/test/stringtypes/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 create table if not exists charset_test (
   id int not null PRIMARY KEY,
diff --git a/storage/ndb/nodejs/test/stringtypes/drop.sql b/storage/ndb/nodejs/test/stringtypes/drop.sql
index 7f7388298a77..30b6576a9823 100644
--- a/storage/ndb/nodejs/test/stringtypes/drop.sql
+++ b/storage/ndb/nodejs/test/stringtypes/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists charset_test;
 drop table if exists binary_test;
diff --git a/storage/ndb/nodejs/test/stringtypes/lib.js b/storage/ndb/nodejs/test/stringtypes/lib.js
index b1d9713afe61..8f6dfb5b33f9 100644
--- a/storage/ndb/nodejs/test/stringtypes/lib.js
+++ b/storage/ndb/nodejs/test/stringtypes/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014 , Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/BatchTest.js b/storage/ndb/nodejs/test/t_basic/BatchTest.js
index b6da25ded5c9..a3cb83124318 100644
--- a/storage/ndb/nodejs/test/t_basic/BatchTest.js
+++ b/storage/ndb/nodejs/test/t_basic/BatchTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/ClearSmokeTest.js b/storage/ndb/nodejs/test/t_basic/ClearSmokeTest.js
index 0dc690949e10..6caf2c38ae05 100644
--- a/storage/ndb/nodejs/test/t_basic/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/t_basic/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/ColumnConverterTest.js b/storage/ndb/nodejs/test/t_basic/ColumnConverterTest.js
index 9b4d255b8342..d1b3e80307d5 100644
--- a/storage/ndb/nodejs/test/t_basic/ColumnConverterTest.js
+++ b/storage/ndb/nodejs/test/t_basic/ColumnConverterTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/DataTypeCastsTest.js b/storage/ndb/nodejs/test/t_basic/DataTypeCastsTest.js
index 225b4eff329b..6f9274f82941 100644
--- a/storage/ndb/nodejs/test/t_basic/DataTypeCastsTest.js
+++ b/storage/ndb/nodejs/test/t_basic/DataTypeCastsTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/DefaultValuesTest.js b/storage/ndb/nodejs/test/t_basic/DefaultValuesTest.js
index f59639a4bdb4..209ef5c01f79 100644
--- a/storage/ndb/nodejs/test/t_basic/DefaultValuesTest.js
+++ b/storage/ndb/nodejs/test/t_basic/DefaultValuesTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/DifferentColumnNameTest.js b/storage/ndb/nodejs/test/t_basic/DifferentColumnNameTest.js
index cf74503b0ee4..c816cffea721 100644
--- a/storage/ndb/nodejs/test/t_basic/DifferentColumnNameTest.js
+++ b/storage/ndb/nodejs/test/t_basic/DifferentColumnNameTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/FindTest.js b/storage/ndb/nodejs/test/t_basic/FindTest.js
index dc7a41f1e5f3..1a3a988fbd02 100644
--- a/storage/ndb/nodejs/test/t_basic/FindTest.js
+++ b/storage/ndb/nodejs/test/t_basic/FindTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/GetMappingTest.js b/storage/ndb/nodejs/test/t_basic/GetMappingTest.js
index 7bfe290736eb..0d344f78296a 100644
--- a/storage/ndb/nodejs/test/t_basic/GetMappingTest.js
+++ b/storage/ndb/nodejs/test/t_basic/GetMappingTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/IllegalArgumentTest.js b/storage/ndb/nodejs/test/t_basic/IllegalArgumentTest.js
index 952f71b65c92..be1bc2ac2762 100644
--- a/storage/ndb/nodejs/test/t_basic/IllegalArgumentTest.js
+++ b/storage/ndb/nodejs/test/t_basic/IllegalArgumentTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/InsertTest.js b/storage/ndb/nodejs/test/t_basic/InsertTest.js
index 9be91d1b90d0..5257a2ef6b8a 100644
--- a/storage/ndb/nodejs/test/t_basic/InsertTest.js
+++ b/storage/ndb/nodejs/test/t_basic/InsertTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/LoadTest.js b/storage/ndb/nodejs/test/t_basic/LoadTest.js
index 3ee019a55001..2783ffda7903 100644
--- a/storage/ndb/nodejs/test/t_basic/LoadTest.js
+++ b/storage/ndb/nodejs/test/t_basic/LoadTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/MissingCallbackTest.js b/storage/ndb/nodejs/test/t_basic/MissingCallbackTest.js
index 374261cbe4b0..3a140ace9167 100644
--- a/storage/ndb/nodejs/test/t_basic/MissingCallbackTest.js
+++ b/storage/ndb/nodejs/test/t_basic/MissingCallbackTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/NonExistentTableTest.js b/storage/ndb/nodejs/test/t_basic/NonExistentTableTest.js
index 9a5e8357c978..58a9061f09f4 100644
--- a/storage/ndb/nodejs/test/t_basic/NonExistentTableTest.js
+++ b/storage/ndb/nodejs/test/t_basic/NonExistentTableTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/ParallelOperationTest.js b/storage/ndb/nodejs/test/t_basic/ParallelOperationTest.js
index 82e3cd027b8c..489eb70e3073 100644
--- a/storage/ndb/nodejs/test/t_basic/ParallelOperationTest.js
+++ b/storage/ndb/nodejs/test/t_basic/ParallelOperationTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/PromisesTest.js b/storage/ndb/nodejs/test/t_basic/PromisesTest.js
index b255bd94e239..a242c3efc0fc 100644
--- a/storage/ndb/nodejs/test/t_basic/PromisesTest.js
+++ b/storage/ndb/nodejs/test/t_basic/PromisesTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/ReadModifyUpdateTest.js b/storage/ndb/nodejs/test/t_basic/ReadModifyUpdateTest.js
index b39c654e2aef..dd08dc1c63d5 100644
--- a/storage/ndb/nodejs/test/t_basic/ReadModifyUpdateTest.js
+++ b/storage/ndb/nodejs/test/t_basic/ReadModifyUpdateTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/ReadWriteTest.js b/storage/ndb/nodejs/test/t_basic/ReadWriteTest.js
index dfa2f354668d..5cf83d2009cd 100644
--- a/storage/ndb/nodejs/test/t_basic/ReadWriteTest.js
+++ b/storage/ndb/nodejs/test/t_basic/ReadWriteTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/RollbackOnlyTest.js b/storage/ndb/nodejs/test/t_basic/RollbackOnlyTest.js
index a1ade270f54a..23e433675e11 100644
--- a/storage/ndb/nodejs/test/t_basic/RollbackOnlyTest.js
+++ b/storage/ndb/nodejs/test/t_basic/RollbackOnlyTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/SaveTest.js b/storage/ndb/nodejs/test/t_basic/SaveTest.js
index e8faa2e4e4b9..54a58597d389 100644
--- a/storage/ndb/nodejs/test/t_basic/SaveTest.js
+++ b/storage/ndb/nodejs/test/t_basic/SaveTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/SmokeTest.js b/storage/ndb/nodejs/test/t_basic/SmokeTest.js
index d2121f47ed23..43bb540fb10f 100644
--- a/storage/ndb/nodejs/test/t_basic/SmokeTest.js
+++ b/storage/ndb/nodejs/test/t_basic/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/TransactionTest.js b/storage/ndb/nodejs/test/t_basic/TransactionTest.js
index 9acb10b56fa5..4c4bc38019f6 100644
--- a/storage/ndb/nodejs/test/t_basic/TransactionTest.js
+++ b/storage/ndb/nodejs/test/t_basic/TransactionTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/UnmappedDomainObjectTest.js b/storage/ndb/nodejs/test/t_basic/UnmappedDomainObjectTest.js
index e7cc4715d3fd..66ccd9282f33 100644
--- a/storage/ndb/nodejs/test/t_basic/UnmappedDomainObjectTest.js
+++ b/storage/ndb/nodejs/test/t_basic/UnmappedDomainObjectTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/UpdateTest.js b/storage/ndb/nodejs/test/t_basic/UpdateTest.js
index 5f088c2a50e4..45f1547ce241 100644
--- a/storage/ndb/nodejs/test/t_basic/UpdateTest.js
+++ b/storage/ndb/nodejs/test/t_basic/UpdateTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/t_basic/create.sql b/storage/ndb/nodejs/test/t_basic/create.sql
index 915174e459cc..16a325341e38 100644
--- a/storage/ndb/nodejs/test/t_basic/create.sql
+++ b/storage/ndb/nodejs/test/t_basic/create.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists t_basic;
 create table if not exists t_basic (
diff --git a/storage/ndb/nodejs/test/t_basic/drop.sql b/storage/ndb/nodejs/test/t_basic/drop.sql
index dfa7667fbea4..14adf16f5c99 100644
--- a/storage/ndb/nodejs/test/t_basic/drop.sql
+++ b/storage/ndb/nodejs/test/t_basic/drop.sql
@@ -1,2 +1,24 @@
+- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists t_basic;
diff --git a/storage/ndb/nodejs/test/t_basic/lib.js b/storage/ndb/nodejs/test/t_basic/lib.js
index a417678e5e2a..f2d217a8f625 100644
--- a/storage/ndb/nodejs/test/t_basic/lib.js
+++ b/storage/ndb/nodejs/test/t_basic/lib.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/ClearSmokeTest.js b/storage/ndb/nodejs/test/temporaltypes/ClearSmokeTest.js
index 101e2c3cd147..f31937fe09df 100644
--- a/storage/ndb/nodejs/test/temporaltypes/ClearSmokeTest.js
+++ b/storage/ndb/nodejs/test/temporaltypes/ClearSmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/QueryTimestampTest.js b/storage/ndb/nodejs/test/temporaltypes/QueryTimestampTest.js
index ce4c276bedb9..a2caad7cbbed 100644
--- a/storage/ndb/nodejs/test/temporaltypes/QueryTimestampTest.js
+++ b/storage/ndb/nodejs/test/temporaltypes/QueryTimestampTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/SmokeTest.js b/storage/ndb/nodejs/test/temporaltypes/SmokeTest.js
index aa98e5c672a9..68fb7aed74b0 100644
--- a/storage/ndb/nodejs/test/temporaltypes/SmokeTest.js
+++ b/storage/ndb/nodejs/test/temporaltypes/SmokeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/TimezoneTest.js b/storage/ndb/nodejs/test/temporaltypes/TimezoneTest.js
index 5edf48bd0292..9fe8d74b4281 100644
--- a/storage/ndb/nodejs/test/temporaltypes/TimezoneTest.js
+++ b/storage/ndb/nodejs/test/temporaltypes/TimezoneTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/TypeTest.js b/storage/ndb/nodejs/test/temporaltypes/TypeTest.js
index 42a6d927d1ca..ae2ce72d8a03 100644
--- a/storage/ndb/nodejs/test/temporaltypes/TypeTest.js
+++ b/storage/ndb/nodejs/test/temporaltypes/TypeTest.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2013, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/test/temporaltypes/create.sql b/storage/ndb/nodejs/test/temporaltypes/create.sql
index 131e978f016a..d7839ea5c679 100644
--- a/storage/ndb/nodejs/test/temporaltypes/create.sql
+++ b/storage/ndb/nodejs/test/temporaltypes/create.sql
@@ -1,3 +1,25 @@
+- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists temporaltypes;
 create table if not exists temporaltypes (
diff --git a/storage/ndb/nodejs/test/temporaltypes/drop.sql b/storage/ndb/nodejs/test/temporaltypes/drop.sql
index 9db2e1242b46..d549ba020e7e 100644
--- a/storage/ndb/nodejs/test/temporaltypes/drop.sql
+++ b/storage/ndb/nodejs/test/temporaltypes/drop.sql
@@ -1,3 +1,25 @@
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
 use test;
 drop table if exists temporaltypes;
 
diff --git a/storage/ndb/nodejs/test/utilities.js b/storage/ndb/nodejs/test/utilities.js
index ed82a57e5ee8..b8571c2f257a 100644
--- a/storage/ndb/nodejs/test/utilities.js
+++ b/storage/ndb/nodejs/test/utilities.js
@@ -1,17 +1,23 @@
 /*
- Copyright (c) 2012, 2013, 2014 Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights
  reserved.
  
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2 of
- the License.
- 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
diff --git a/storage/ndb/nodejs/wscript b/storage/ndb/nodejs/wscript
index d33c2bf905c2..c5656736bf49 100644
--- a/storage/ndb/nodejs/wscript
+++ b/storage/ndb/nodejs/wscript
@@ -1,3 +1,25 @@
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 import os
 import string
 
diff --git a/storage/ndb/src/CMakeLists.txt b/storage/ndb/src/CMakeLists.txt
index 09f84d514d4f..443d688f57f1 100644
--- a/storage/ndb/src/CMakeLists.txt
+++ b/storage/ndb/src/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -49,8 +56,33 @@ SET(NDBCLIENT_LIBS
   ndbgeneral
   ndbconf)
 
+SET(LIBS_TO_MERGE
+  mysys dbug strings mysys_ssl
+  ndbapi
+  ndbtransport
+  ndbtrace
+  ndbsignaldata
+  ndbmgmapi
+  ndbmgmcommon
+  ndblogger
+  ndbportlib
+  ndbgeneral
+  ndbconf)
+
+IF(WITH_ZLIB STREQUAL "bundled")
+  LIST(APPEND LIBS_TO_MERGE ${ZLIB_LIBRARY})
+ENDIF()
+IF(NOT APPLE AND NOT WITH_SSL STREQUAL "system")
+  LIST(APPEND LIBS_TO_MERGE ${SSL_LIBRARIES})
+ENDIF()
+
+
+MESSAGE(STATUS "LIBS_TO_MERGE ${LIBS_TO_MERGE}")
+MESSAGE(STATUS "NDBCLIENT_LIBS ${NDBCLIENT_LIBS}")
+
 MERGE_CONVENIENCE_LIBRARIES(
-  ndbclient_static ${NDBCLIENT_LIBS} COMPONENT Development)
+  ndbclient_static ${LIBS_TO_MERGE} COMPONENT Development)
+TARGET_LINK_LIBRARIES(ndbclient_static ${SSL_LIBRARIES})
 
 SET(KNOWN_CONVENIENCE_LIBRARIES
   ${KNOWN_CONVENIENCE_LIBRARIES} ndbclient_static CACHE INTERNAL "" FORCE)
@@ -75,7 +107,7 @@ TARGET_LINK_LIBRARIES(ndbclient_static_link_test ndbclient_static)
 #
 # Build shared ndbclient library
 #
-SET(NDBCLIENT_SO_LIBS ${NDBCLIENT_LIBS} ${NDBJTIE_LIB})
+SET(NDBCLIENT_SO_LIBS ${LIBS_TO_MERGE} ${NDBJTIE_LIB})
 
 # Extract version from storage/ndb/VERSION
 INCLUDE(ndb_get_config_value)
@@ -168,7 +200,7 @@ SET_TARGET_PROPERTIES(ndbclient_so PROPERTIES
   SOVERSION ${NDB_SHARED_LIB_VERSION})
 MYSQL_INSTALL_TARGETS(ndbclient_so
   DESTINATION "${INSTALL_LIBDIR}"
-  COMPONENT Developement)
+  COMPONENT Development)
 # Build test program to check linking against ndclient_so
 ADD_EXECUTABLE(ndbclient_shared_link_test ndbclient_link_test.cpp)
 TARGET_LINK_LIBRARIES(ndbclient_shared_link_test ndbclient_so)
diff --git a/storage/ndb/src/common/CMakeLists.txt b/storage/ndb/src/common/CMakeLists.txt
index 8d55efe3a3f9..95e93c1361a9 100644
--- a/storage/ndb/src/common/CMakeLists.txt
+++ b/storage/ndb/src/common/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/BlockNames.cpp b/storage/ndb/src/common/debugger/BlockNames.cpp
index eaae12537689..5b99727b8d51 100644
--- a/storage/ndb/src/common/debugger/BlockNames.cpp
+++ b/storage/ndb/src/common/debugger/BlockNames.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/CMakeLists.txt b/storage/ndb/src/common/debugger/CMakeLists.txt
index 19807e9c95c1..de3367d5b892 100644
--- a/storage/ndb/src/common/debugger/CMakeLists.txt
+++ b/storage/ndb/src/common/debugger/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/DebuggerNames.cpp b/storage/ndb/src/common/debugger/DebuggerNames.cpp
index 174cc00d5725..50c55b317e12 100644
--- a/storage/ndb/src/common/debugger/DebuggerNames.cpp
+++ b/storage/ndb/src/common/debugger/DebuggerNames.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp
index cd921a749262..70759163cd8f 100644
--- a/storage/ndb/src/common/debugger/EventLogger.cpp
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
index 02bda5f276e6..aa18d6a60367 100644
--- a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AccLock.cpp b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
index 53a9f5046eda..84248b78506e 100644
--- a/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AllocNodeId.cpp b/storage/ndb/src/common/debugger/signaldata/AllocNodeId.cpp
index 00d8f96efef3..e604e0c55fd8 100644
--- a/storage/ndb/src/common/debugger/signaldata/AllocNodeId.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AllocNodeId.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
index 9a0e8d4af5fa..e2c885e0dc9e 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp b/storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp
index 9ee0b8a885de..9b03060f00eb 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterIndxImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
index bb92404224b3..5a9c30276001 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
index ef1111ce02dd..8a121dfc21cb 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp b/storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp
index 9f8903c6478e..fee3701fe53c 100644
--- a/storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
index 15cceaf27fa4..17cb78609cd1 100644
--- a/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
index 5c84130e257a..6c4b5a5c3e90 100644
--- a/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp b/storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp
index 6f9f84b21c84..d0dbdfb1c87c 100644
--- a/storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BuildIndx.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp b/storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp
index b7f8caddeae7..7521c80d7518 100644
--- a/storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BuildIndxImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
index 6983e05a8475..89fa7c6e9dfe 100644
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
index 1a63042383b8..4c7469841340 100644
--- a/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
index d5cb4aad26c8..e82e47b3b329 100644
--- a/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
index 40ee238e1a22..899706942e11 100644
--- a/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
index 736bd3e8f191..fcabd3e2b57a 100644
--- a/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
index b79293d18858..d445614aa54a 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateFK.cpp b/storage/ndb/src/common/debugger/signaldata/CreateFK.cpp
index 6ec744adddbf..3e461c1b375e 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateFK.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateFK.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
index 1b88d801f236..fcc424931721 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
index 6297974962c5..153af8a24c3a 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp b/storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp
index 78036393e1f1..0fdae4f38ed2 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateIndxImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateTab.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTab.cpp
index 843a1c157090..3ae53d255cde 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTab.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateTable.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTable.cpp
index 1ed7909bc48f..114a83973d3f 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateTable.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTable.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
index 9b947c5b3385..b7620d4a31c6 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp
index 4a85ab2a67b9..387b8f32d955 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DbinfoScan.cpp b/storage/ndb/src/common/debugger/signaldata/DbinfoScan.cpp
index 4039f6f45c41..03f3de377af3 100644
--- a/storage/ndb/src/common/debugger/signaldata/DbinfoScan.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DbinfoScan.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
index 49754220b1cf..25209ae22b44 100644
--- a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
index adeee9a1655d..e4e1a246337c 100644
--- a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
index 8902325f93c4..091fd5acb72f 100644
--- a/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
index d052932642d2..7c213753ecfd 100644
--- a/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropFK.cpp b/storage/ndb/src/common/debugger/signaldata/DropFK.cpp
index e61f5e09422e..1af6f697fb40 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropFK.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropFK.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
index 25e0b2b11fa8..55a5738c339e 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp b/storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp
index 83ffcc15ce99..55194006f630 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropIndxImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTab.cpp b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
index 2e10d6def87f..f46ff5050a10 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTable.cpp b/storage/ndb/src/common/debugger/signaldata/DropTable.cpp
index 1f9d75f1339c..944dc03b1cf1 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTable.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTable.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
index c395008914a4..2faf98be8b1a 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp b/storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp
index 92b0a08bdecc..9d339a00d65d 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTrigImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FailRep.cpp b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
index 8c581a41df25..c8589adb2af3 100644
--- a/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
index 79b780cce2a8..8e86b7628f05 100644
--- a/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
index 7a77d320915a..479b51c266ac 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
index 8d51cff2199c..2c370297d837 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FsConf.cpp b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
index c58623703d1c..a8af3ae60d9c 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
index 1e53f4ddc17c..f4e782c15bcf 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
index 05cc475f2c3d..2d53f0e66531 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/FsRef.cpp b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
index 46041758b352..e4c7ac73d996 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/GCP.cpp b/storage/ndb/src/common/debugger/signaldata/GCP.cpp
index 8e0d6ba2c439..65806bc85bda 100644
--- a/storage/ndb/src/common/debugger/signaldata/GCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/GCP.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/GetConfig.cpp b/storage/ndb/src/common/debugger/signaldata/GetConfig.cpp
index 5b5412f0cb81..a418ed078c86 100644
--- a/storage/ndb/src/common/debugger/signaldata/GetConfig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/GetConfig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp
index b54c65eedb7a..f17010811000 100644
--- a/storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/GetTabInfo.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp b/storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp
index 04faf3b25bc0..3331bdd24455 100644
--- a/storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp
@@ -1,13 +1,20 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
index 12efd1052e93..d1f50283e888 100644
--- a/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
index 47c49af41618..58fc2d23e3af 100644
--- a/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/IsolateOrd.cpp b/storage/ndb/src/common/debugger/signaldata/IsolateOrd.cpp
index ff7cafd81b80..68d271ee00fa 100644
--- a/storage/ndb/src/common/debugger/signaldata/IsolateOrd.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IsolateOrd.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014  Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/LCP.cpp b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
index 1482cdc42e78..7ecec47591be 100644
--- a/storage/ndb/src/common/debugger/signaldata/LCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/LocalRouteOrd.cpp b/storage/ndb/src/common/debugger/signaldata/LocalRouteOrd.cpp
index 4687f11aa866..82063be5d9e0 100644
--- a/storage/ndb/src/common/debugger/signaldata/LocalRouteOrd.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LocalRouteOrd.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright 2009 Sun Microsystems, Inc.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
index e4550bd7e6cd..4edc9860f626 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
index 04dece832f9a..2f57fb9a80b7 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
index 78da010d1dae..14cb4813c3f8 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
index e9d19a6d6c79..770a93cdd1d2 100644
--- a/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
index 1287c0bf0bfe..6e17326568f9 100644
--- a/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
index 6cafcc0ec859..056ffea1b1ba 100644
--- a/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
index 5fd7450714c4..5dca9cea7ad1 100644
--- a/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/NodePing.cpp b/storage/ndb/src/common/debugger/signaldata/NodePing.cpp
index b778aa2008b2..5dbf20ff8ed4 100644
--- a/storage/ndb/src/common/debugger/signaldata/NodePing.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NodePing.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
index eb1c98e1b89c..9fbf664c7975 100644
--- a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
index 90917e1cf25a..888138ef37c6 100644
--- a/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
index 8460dff63952..1f59047af9e7 100644
--- a/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
index 4a4eac92bf64..b9ec11273914 100644
--- a/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
index 7ee96d3212b4..e0f98d5e9e95 100644
--- a/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
index 8fa6f52f228e..96b29869cbac 100644
--- a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SchemaTrans.cpp b/storage/ndb/src/common/debugger/signaldata/SchemaTrans.cpp
index da7918210fd7..1d32d494a460 100644
--- a/storage/ndb/src/common/debugger/signaldata/SchemaTrans.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SchemaTrans.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp b/storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp
index ad2227e9e5c2..52e48f229f4a 100644
--- a/storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2007, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
index 2c0c3761f7a8..52ae0a8738b5 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
index b73469dc14c8..b00d92de0cdd 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 63eee4d94c96..5340818a974a 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/StartRec.cpp b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
index e1cf170b1281..0a7573f834d1 100644
--- a/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
index 94b8e76012a8..39881ef6f504 100644
--- a/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/SystemError.cpp b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
index b94ca7c4e958..3e6af60f7c83 100644
--- a/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
index f476dfa48190..26e3880432a7 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
index 6949a62c6957..fcbb8700d428 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
index 50b1fc152b18..ffb2f827386b 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
index 3fd2a328c237..10b1cd309bec 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
index 75aa1629c208..ec04488ee78e 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
index 36c245f13100..341f639e6426 100644
--- a/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
index 16f8a3879fb6..1ab55bb6d824 100644
--- a/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TupKey.cpp b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
index f8ecc86154c4..2b3e34d795f0 100644
--- a/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
index b2dfba38fbe0..f8f8a54871f3 100644
--- a/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
index a36d1435434a..41fa012bdb26 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
index d9e151f4ba72..a96918a3c1cb 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
index bd0040a2a002..f0ad4010f457 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
index 335a2a5af426..d754f7c41b05 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
index 915b493967e0..b5b364ae9a07 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/debugger/signaldata/print.awk b/storage/ndb/src/common/debugger/signaldata/print.awk
index d589e7e85c70..ea18d49bb9e7 100644
--- a/storage/ndb/src/common/debugger/signaldata/print.awk
+++ b/storage/ndb/src/common/debugger/signaldata/print.awk
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005, 2006 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/CMakeLists.txt b/storage/ndb/src/common/logger/CMakeLists.txt
index 109f81bf65f6..a595276eced6 100644
--- a/storage/ndb/src/common/logger/CMakeLists.txt
+++ b/storage/ndb/src/common/logger/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/ConsoleLogHandler.cpp b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
index 0b87de545407..a217f6106ebd 100644
--- a/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
+++ b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/EventLogHandler.cpp b/storage/ndb/src/common/logger/EventLogHandler.cpp
index 19e90ef1473b..0ccf007d6eeb 100644
--- a/storage/ndb/src/common/logger/EventLogHandler.cpp
+++ b/storage/ndb/src/common/logger/EventLogHandler.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/EventLogHandler.hpp b/storage/ndb/src/common/logger/EventLogHandler.hpp
index 9e32f040e86f..8fce57f6962f 100644
--- a/storage/ndb/src/common/logger/EventLogHandler.hpp
+++ b/storage/ndb/src/common/logger/EventLogHandler.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/FileLogHandler.cpp b/storage/ndb/src/common/logger/FileLogHandler.cpp
index 3e8320245f97..d2010b6782d4 100644
--- a/storage/ndb/src/common/logger/FileLogHandler.cpp
+++ b/storage/ndb/src/common/logger/FileLogHandler.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/LogHandler.cpp b/storage/ndb/src/common/logger/LogHandler.cpp
index 13618eb22bd4..2fe9fbd1bace 100644
--- a/storage/ndb/src/common/logger/LogHandler.cpp
+++ b/storage/ndb/src/common/logger/LogHandler.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/LogHandlerList.cpp b/storage/ndb/src/common/logger/LogHandlerList.cpp
index 86cc9d2a658d..bdeca955d806 100644
--- a/storage/ndb/src/common/logger/LogHandlerList.cpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/LogHandlerList.hpp b/storage/ndb/src/common/logger/LogHandlerList.hpp
index f91ee480ba92..a4a9cf378086 100644
--- a/storage/ndb/src/common/logger/LogHandlerList.hpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/Logger.cpp b/storage/ndb/src/common/logger/Logger.cpp
index 80365baa62c0..93b757ebbb0e 100644
--- a/storage/ndb/src/common/logger/Logger.cpp
+++ b/storage/ndb/src/common/logger/Logger.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/SysLogHandler.cpp b/storage/ndb/src/common/logger/SysLogHandler.cpp
index 23f7a6148e30..8162022c63de 100644
--- a/storage/ndb/src/common/logger/SysLogHandler.cpp
+++ b/storage/ndb/src/common/logger/SysLogHandler.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/logger/message.h b/storage/ndb/src/common/logger/message.h
index e1cb5272e565..ad99f3b68526 100644
--- a/storage/ndb/src/common/logger/message.h
+++ b/storage/ndb/src/common/logger/message.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/common/logger/message.rc b/storage/ndb/src/common/logger/message.rc
index a928b138ef4c..5d3f0e34a303 100644
--- a/storage/ndb/src/common/logger/message.rc
+++ b/storage/ndb/src/common/logger/message.rc
@@ -1,2 +1,24 @@
+// Copyright (c) 2010, 2021, Oracle and/or its affiliates.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License, version 2.0, for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 LANGUAGE 0x9,0x1
 1 11 "MSG00001.bin"
diff --git a/storage/ndb/src/common/mgmcommon/CMakeLists.txt b/storage/ndb/src/common/mgmcommon/CMakeLists.txt
index a5d13a42bf62..02727103c410 100644
--- a/storage/ndb/src/common/mgmcommon/CMakeLists.txt
+++ b/storage/ndb/src/common/mgmcommon/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
index 8529b75db484..bfe3a69baeec 100644
--- a/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
+++ b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
index 740455a7dd13..42b9a49c8608 100644
--- a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/mgmcommon/printConfig/Makefile b/storage/ndb/src/common/mgmcommon/printConfig/Makefile
index 79bc75eb6228..d291add6117e 100644
--- a/storage/ndb/src/common/mgmcommon/printConfig/Makefile
+++ b/storage/ndb/src/common/mgmcommon/printConfig/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
index f673e4f3ea88..e579d150086e 100644
--- a/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/CMakeLists.txt b/storage/ndb/src/common/portlib/CMakeLists.txt
index d8f4e9f2a8ed..919d2c8a2cca 100644
--- a/storage/ndb/src/common/portlib/CMakeLists.txt
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbCondition.c b/storage/ndb/src/common/portlib/NdbCondition.c
index 75f384e05d85..4d5ad6802aca 100644
--- a/storage/ndb/src/common/portlib/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/NdbCondition.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbConfig.c b/storage/ndb/src/common/portlib/NdbConfig.c
index d6e387ab5f19..6ff5e54ae7f1 100644
--- a/storage/ndb/src/common/portlib/NdbConfig.c
+++ b/storage/ndb/src/common/portlib/NdbConfig.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbDir.cpp b/storage/ndb/src/common/portlib/NdbDir.cpp
index 744bf82f5a7c..ae52a366beb2 100644
--- a/storage/ndb/src/common/portlib/NdbDir.cpp
+++ b/storage/ndb/src/common/portlib/NdbDir.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbEnv.c b/storage/ndb/src/common/portlib/NdbEnv.c
index a6944a63d73d..5c0a9c8dc6e7 100644
--- a/storage/ndb/src/common/portlib/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/NdbEnv.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbGetRUsage.cpp b/storage/ndb/src/common/portlib/NdbGetRUsage.cpp
index d4c4c106ac67..10a8547d849e 100644
--- a/storage/ndb/src/common/portlib/NdbGetRUsage.cpp
+++ b/storage/ndb/src/common/portlib/NdbGetRUsage.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2014 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbHost.c b/storage/ndb/src/common/portlib/NdbHost.c
index 2e9f936b8772..913abb6088d6 100644
--- a/storage/ndb/src/common/portlib/NdbHost.c
+++ b/storage/ndb/src/common/portlib/NdbHost.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbLockCpuUtil.c b/storage/ndb/src/common/portlib/NdbLockCpuUtil.c
index 3b5415c33ad6..2ef28f0139fa 100644
--- a/storage/ndb/src/common/portlib/NdbLockCpuUtil.c
+++ b/storage/ndb/src/common/portlib/NdbLockCpuUtil.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbMem.c b/storage/ndb/src/common/portlib/NdbMem.c
index 836e143ae017..b0eeb058e347 100644
--- a/storage/ndb/src/common/portlib/NdbMem.c
+++ b/storage/ndb/src/common/portlib/NdbMem.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbMutex.c b/storage/ndb/src/common/portlib/NdbMutex.c
index a983914d91ca..cf0dc6275c7c 100644
--- a/storage/ndb/src/common/portlib/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/NdbMutex.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp b/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp
index 1f2f6901f606..00ebd29b4eac 100644
--- a/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp
+++ b/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h b/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h
index 94a7b1fc6d08..ae8d655cb86d 100644
--- a/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h
+++ b/storage/ndb/src/common/portlib/NdbMutex_DeadlockDetector.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbNuma.cpp b/storage/ndb/src/common/portlib/NdbNuma.cpp
index 52a347028c07..6f463d071e1b 100644
--- a/storage/ndb/src/common/portlib/NdbNuma.cpp
+++ b/storage/ndb/src/common/portlib/NdbNuma.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbPortLibTest.cpp b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
index b59b8b26e9e2..10a19ccbda60 100644
--- a/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
+++ b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbTCP.cpp b/storage/ndb/src/common/portlib/NdbTCP.cpp
index 1a227f5d355f..99cda059ce94 100644
--- a/storage/ndb/src/common/portlib/NdbTCP.cpp
+++ b/storage/ndb/src/common/portlib/NdbTCP.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbThread.c b/storage/ndb/src/common/portlib/NdbThread.c
index 0dbe4e9a4b2f..7d796958067a 100644
--- a/storage/ndb/src/common/portlib/NdbThread.c
+++ b/storage/ndb/src/common/portlib/NdbThread.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/NdbTick.cpp b/storage/ndb/src/common/portlib/NdbTick.cpp
index b8ebb7241d48..8ced9054a257 100644
--- a/storage/ndb/src/common/portlib/NdbTick.cpp
+++ b/storage/ndb/src/common/portlib/NdbTick.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/memtest.c b/storage/ndb/src/common/portlib/memtest.c
index 4004e1fe5f2e..e41d2c17d330 100644
--- a/storage/ndb/src/common/portlib/memtest.c
+++ b/storage/ndb/src/common/portlib/memtest.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/mmstest.cpp b/storage/ndb/src/common/portlib/mmstest.cpp
index f4f85b55afcd..8d90fc9684e1 100644
--- a/storage/ndb/src/common/portlib/mmstest.cpp
+++ b/storage/ndb/src/common/portlib/mmstest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/munmaptest.cpp b/storage/ndb/src/common/portlib/munmaptest.cpp
index a2ca2fa702ad..4c10b5349d52 100644
--- a/storage/ndb/src/common/portlib/munmaptest.cpp
+++ b/storage/ndb/src/common/portlib/munmaptest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/ndb_daemon.cc b/storage/ndb/src/common/portlib/ndb_daemon.cc
index 376fec557eaa..a104cebe9f9b 100644
--- a/storage/ndb/src/common/portlib/ndb_daemon.cc
+++ b/storage/ndb/src/common/portlib/ndb_daemon.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/portlib/ndb_socket.cpp b/storage/ndb/src/common/portlib/ndb_socket.cpp
index 9021cc6c4851..83f99be91ee5 100644
--- a/storage/ndb/src/common/portlib/ndb_socket.cpp
+++ b/storage/ndb/src/common/portlib/ndb_socket.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/CMakeLists.txt b/storage/ndb/src/common/transporter/CMakeLists.txt
index 802c9d8b5c77..22b78b8a658f 100644
--- a/storage/ndb/src/common/transporter/CMakeLists.txt
+++ b/storage/ndb/src/common/transporter/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Loopback_Transporter.cpp b/storage/ndb/src/common/transporter/Loopback_Transporter.cpp
index cd99ee64e4be..f78564bc8590 100644
--- a/storage/ndb/src/common/transporter/Loopback_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/Loopback_Transporter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Loopback_Transporter.hpp b/storage/ndb/src/common/transporter/Loopback_Transporter.hpp
index 75998ca42073..0552a314a55d 100644
--- a/storage/ndb/src/common/transporter/Loopback_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/Loopback_Transporter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Packer.cpp b/storage/ndb/src/common/transporter/Packer.cpp
index c85637f0d529..01adab2033f6 100644
--- a/storage/ndb/src/common/transporter/Packer.cpp
+++ b/storage/ndb/src/common/transporter/Packer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Packer.hpp b/storage/ndb/src/common/transporter/Packer.hpp
index 78af7f432610..a0650fb218ef 100644
--- a/storage/ndb/src/common/transporter/Packer.hpp
+++ b/storage/ndb/src/common/transporter/Packer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SCI_Transporter.cpp b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
index ced05e496594..f61bba7c5150 100644
--- a/storage/ndb/src/common/transporter/SCI_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SCI_Transporter.hpp b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
index c0bc062a1eed..b640d85c493c 100644
--- a/storage/ndb/src/common/transporter/SCI_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SHM_Buffer.hpp b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
index 77cb17cadac2..8908cfa51e79 100644
--- a/storage/ndb/src/common/transporter/SHM_Buffer.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
index fbe83fe3e0a9..93d4193835ff 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.hpp b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
index cabf91cdf7dc..079fcf707537 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
index b6abf69541a3..0044861d1603 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
index 0f3b230e94d8..5f7d900a5132 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
index 6a8fc2aa2199..44ba964a6dc8 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/TCP_Transporter.hpp b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
index c5e643b883b8..4e7e2143dba4 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Transporter.cpp b/storage/ndb/src/common/transporter/Transporter.cpp
index 998cdf3dcc87..048ea485f6a1 100644
--- a/storage/ndb/src/common/transporter/Transporter.cpp
+++ b/storage/ndb/src/common/transporter/Transporter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/Transporter.hpp b/storage/ndb/src/common/transporter/Transporter.hpp
index 1ade238cbc2f..95cafeac4dbd 100644
--- a/storage/ndb/src/common/transporter/Transporter.hpp
+++ b/storage/ndb/src/common/transporter/Transporter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
index 37919ee89942..f4b4b960f345 100644
--- a/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
+++ b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/TransporterRegistry.cpp b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
index 71206f6f2113..20ed918e99cc 100644
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -1,13 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -391,7 +399,7 @@ void TransporterRegistry::set_mgm_handle(NdbMgmHandle h)
     ndb_mgm_destroy_handle(&m_mgm_handle);
   m_mgm_handle= h;
   ndb_mgm_set_timeout(m_mgm_handle, 5000);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (h)
   {
     char buf[256];
diff --git a/storage/ndb/src/common/transporter/basictest/Makefile b/storage/ndb/src/common/transporter/basictest/Makefile
index 4d45cd2705fd..e4399e9ff0ef 100644
--- a/storage/ndb/src/common/transporter/basictest/Makefile
+++ b/storage/ndb/src/common/transporter/basictest/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
index 33f13f1c889e..023b0aedc003 100644
--- a/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/buddy.cpp b/storage/ndb/src/common/transporter/buddy.cpp
index 7db1ab0c97ae..639edeca0f8d 100644
--- a/storage/ndb/src/common/transporter/buddy.cpp
+++ b/storage/ndb/src/common/transporter/buddy.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/buddy.hpp b/storage/ndb/src/common/transporter/buddy.hpp
index 3c913a8cc888..f26ed995c435 100644
--- a/storage/ndb/src/common/transporter/buddy.hpp
+++ b/storage/ndb/src/common/transporter/buddy.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/failoverSCI/Makefile b/storage/ndb/src/common/transporter/failoverSCI/Makefile
index 79f2982b3564..5b89dfa9972d 100644
--- a/storage/ndb/src/common/transporter/failoverSCI/Makefile
+++ b/storage/ndb/src/common/transporter/failoverSCI/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
index 0848b13f0a18..4ab6677bf143 100644
--- a/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
+++ b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/perftest/Makefile b/storage/ndb/src/common/transporter/perftest/Makefile
index 821b76f4d03d..ea269806c962 100644
--- a/storage/ndb/src/common/transporter/perftest/Makefile
+++ b/storage/ndb/src/common/transporter/perftest/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
index ab34097741a6..07711375a003 100644
--- a/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/Makefile b/storage/ndb/src/common/transporter/priotest/Makefile
index 6672872f7e78..ffc08d7dd6ec 100644
--- a/storage/ndb/src/common/transporter/priotest/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile b/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile
index d05b53be00f6..59e99361a9b7 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
index df90e4b37258..db02315ea4fa 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile b/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile
index d7975a705018..9b4dd72fdb45 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
index 2210a0167084..a8d756c91edd 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile b/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile
index 06613e2f0f42..d8b8f9ca9ba9 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
index 278267004d23..d20ae9864f47 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
index db49ae8eee6c..eb6c6b57e547 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
index 08c351582bba..b0eb354c36c9 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/BaseString.cpp b/storage/ndb/src/common/util/BaseString.cpp
index 84664eeadad3..1bca438decc5 100644
--- a/storage/ndb/src/common/util/BaseString.cpp
+++ b/storage/ndb/src/common/util/BaseString.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/Bitmask.cpp b/storage/ndb/src/common/util/Bitmask.cpp
index 32e81c43fa1c..9d07089d9eff 100644
--- a/storage/ndb/src/common/util/Bitmask.cpp
+++ b/storage/ndb/src/common/util/Bitmask.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/CMakeLists.txt b/storage/ndb/src/common/util/CMakeLists.txt
index 2d02895e760c..7ddcae103c4d 100644
--- a/storage/ndb/src/common/util/CMakeLists.txt
+++ b/storage/ndb/src/common/util/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/CharsetMap.cpp b/storage/ndb/src/common/util/CharsetMap.cpp
index 1983139fc76b..03d345b708c9 100644
--- a/storage/ndb/src/common/util/CharsetMap.cpp
+++ b/storage/ndb/src/common/util/CharsetMap.cpp
@@ -1,15 +1,22 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- 
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/common/util/CharsetMapImpl.cpp b/storage/ndb/src/common/util/CharsetMapImpl.cpp
index b864dd0a07bb..0a0de2280413 100644
--- a/storage/ndb/src/common/util/CharsetMapImpl.cpp
+++ b/storage/ndb/src/common/util/CharsetMapImpl.cpp
@@ -1,16 +1,23 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
  
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- 
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/common/util/CharsetMapImpl.h b/storage/ndb/src/common/util/CharsetMapImpl.h
index 57f3811aecc0..52238fd4bae4 100644
--- a/storage/ndb/src/common/util/CharsetMapImpl.h
+++ b/storage/ndb/src/common/util/CharsetMapImpl.h
@@ -1,15 +1,22 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- 
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
+ GNU General Public License, version 2.0, for more details.
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/common/util/ConfigValues.cpp b/storage/ndb/src/common/util/ConfigValues.cpp
index 461c849ceedc..2d2b1716192e 100644
--- a/storage/ndb/src/common/util/ConfigValues.cpp
+++ b/storage/ndb/src/common/util/ConfigValues.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/File.cpp b/storage/ndb/src/common/util/File.cpp
index ceaddb17311f..f5f98303e9ac 100644
--- a/storage/ndb/src/common/util/File.cpp
+++ b/storage/ndb/src/common/util/File.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/HashMap.cpp b/storage/ndb/src/common/util/HashMap.cpp
index 16ee2aeb81c8..0cb1d69e03bd 100644
--- a/storage/ndb/src/common/util/HashMap.cpp
+++ b/storage/ndb/src/common/util/HashMap.cpp
@@ -1,14 +1,21 @@
-/* Copyright 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/HashMap2.cpp b/storage/ndb/src/common/util/HashMap2.cpp
index b765d9263f29..44e083d66be1 100644
--- a/storage/ndb/src/common/util/HashMap2.cpp
+++ b/storage/ndb/src/common/util/HashMap2.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp
index 61b764ac6046..cec33ca28951 100644
--- a/storage/ndb/src/common/util/InputStream.cpp
+++ b/storage/ndb/src/common/util/InputStream.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/LinkedStack.cpp b/storage/ndb/src/common/util/LinkedStack.cpp
index fd69f1fba583..f73444726b49 100644
--- a/storage/ndb/src/common/util/LinkedStack.cpp
+++ b/storage/ndb/src/common/util/LinkedStack.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/NdbOut.cpp b/storage/ndb/src/common/util/NdbOut.cpp
index 6c27e7b47944..3e2b3bdf3515 100644
--- a/storage/ndb/src/common/util/NdbOut.cpp
+++ b/storage/ndb/src/common/util/NdbOut.cpp
@@ -1,14 +1,21 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/NdbPack.cpp b/storage/ndb/src/common/util/NdbPack.cpp
index 9d2165c29cd6..7246a3bb06c5 100644
--- a/storage/ndb/src/common/util/NdbPack.cpp
+++ b/storage/ndb/src/common/util/NdbPack.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/NdbSqlUtil.cpp b/storage/ndb/src/common/util/NdbSqlUtil.cpp
index 2051edbfe789..c88e9e12fe82 100644
--- a/storage/ndb/src/common/util/NdbSqlUtil.cpp
+++ b/storage/ndb/src/common/util/NdbSqlUtil.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp
index 703a044ad5cb..a2a85d97bfe6 100644
--- a/storage/ndb/src/common/util/OutputStream.cpp
+++ b/storage/ndb/src/common/util/OutputStream.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/Parser.cpp b/storage/ndb/src/common/util/Parser.cpp
index 6a5521106752..4ff9c886beba 100644
--- a/storage/ndb/src/common/util/Parser.cpp
+++ b/storage/ndb/src/common/util/Parser.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/Properties.cpp b/storage/ndb/src/common/util/Properties.cpp
index 7cf66d6c9ea0..c9e2cfac7e07 100644
--- a/storage/ndb/src/common/util/Properties.cpp
+++ b/storage/ndb/src/common/util/Properties.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/SimpleProperties.cpp b/storage/ndb/src/common/util/SimpleProperties.cpp
index 8734beb64664..8be88959def7 100644
--- a/storage/ndb/src/common/util/SimpleProperties.cpp
+++ b/storage/ndb/src/common/util/SimpleProperties.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/SocketAuthenticator.cpp b/storage/ndb/src/common/util/SocketAuthenticator.cpp
index 24bb888bb05e..6c9cef76aa6e 100644
--- a/storage/ndb/src/common/util/SocketAuthenticator.cpp
+++ b/storage/ndb/src/common/util/SocketAuthenticator.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/SocketClient.cpp b/storage/ndb/src/common/util/SocketClient.cpp
index 32fb1494f583..5f29d756710e 100644
--- a/storage/ndb/src/common/util/SocketClient.cpp
+++ b/storage/ndb/src/common/util/SocketClient.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp
index 57c997a580bc..313bbe7aaf77 100644
--- a/storage/ndb/src/common/util/SocketServer.cpp
+++ b/storage/ndb/src/common/util/SocketServer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/SparseBitmask.cpp b/storage/ndb/src/common/util/SparseBitmask.cpp
index 4a77045e9169..2eb57fff3fbf 100644
--- a/storage/ndb/src/common/util/SparseBitmask.cpp
+++ b/storage/ndb/src/common/util/SparseBitmask.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/Vector.cpp b/storage/ndb/src/common/util/Vector.cpp
index fbad4063eed8..4e295b3e23c5 100644
--- a/storage/ndb/src/common/util/Vector.cpp
+++ b/storage/ndb/src/common/util/Vector.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/basestring_vsnprintf.c b/storage/ndb/src/common/util/basestring_vsnprintf.c
index 0577abe9ff58..c14fc7dc0aaa 100644
--- a/storage/ndb/src/common/util/basestring_vsnprintf.c
+++ b/storage/ndb/src/common/util/basestring_vsnprintf.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/decimal_utils.cpp b/storage/ndb/src/common/util/decimal_utils.cpp
index b72db2761927..bb89a8434c61 100644
--- a/storage/ndb/src/common/util/decimal_utils.cpp
+++ b/storage/ndb/src/common/util/decimal_utils.cpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/md5_hash.cpp b/storage/ndb/src/common/util/md5_hash.cpp
index 6cc12861d836..8fb58cbae661 100644
--- a/storage/ndb/src/common/util/md5_hash.cpp
+++ b/storage/ndb/src/common/util/md5_hash.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/mysql_utils_test.cpp b/storage/ndb/src/common/util/mysql_utils_test.cpp
index 33ac8321dcfc..18ef763c81f9 100644
--- a/storage/ndb/src/common/util/mysql_utils_test.cpp
+++ b/storage/ndb/src/common/util/mysql_utils_test.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/ndb_init.cpp b/storage/ndb/src/common/util/ndb_init.cpp
index c75496ad7f27..c1d221d760e0 100644
--- a/storage/ndb/src/common/util/ndb_init.cpp
+++ b/storage/ndb/src/common/util/ndb_init.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/ndb_opts.cpp b/storage/ndb/src/common/util/ndb_opts.cpp
index 1d5fb5bba059..c3e8252d4d65 100644
--- a/storage/ndb/src/common/util/ndb_opts.cpp
+++ b/storage/ndb/src/common/util/ndb_opts.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,7 +98,7 @@ ndb_std_get_one_option(int optid,
                        char *argument MY_ATTRIBUTE((unused)))
 {
   switch (optid) {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   case '#':
     if (!opt_debug)
       opt_debug= "d:t";
@@ -112,7 +119,7 @@ ndb_std_get_one_option(int optid,
 extern "C"
 void ndb_std_print_version()
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const char *suffix= "-debug";
 #else
   const char *suffix= "";
diff --git a/storage/ndb/src/common/util/ndb_rand.c b/storage/ndb/src/common/util/ndb_rand.c
index 38eb3a57f43f..becdce347a39 100644
--- a/storage/ndb/src/common/util/ndb_rand.c
+++ b/storage/ndb/src/common/util/ndb_rand.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/ndb_show_compat.cpp b/storage/ndb/src/common/util/ndb_show_compat.cpp
index ca84598d8985..96a1b7fc05cd 100644
--- a/storage/ndb/src/common/util/ndb_show_compat.cpp
+++ b/storage/ndb/src/common/util/ndb_show_compat.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/ndbzio.c b/storage/ndb/src/common/util/ndbzio.c
index 5852ec075a01..fd5474fa4b0b 100644
--- a/storage/ndb/src/common/util/ndbzio.c
+++ b/storage/ndb/src/common/util/ndbzio.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -45,11 +52,11 @@
  * This is a casual hack to do static memory allocation
  * (needed by NDB)
  */
-#include "../../../../zlib/zutil.h"
-#include "../../../../zlib/zconf.h"
-#include "../../../../zlib/inftrees.h"
-#include "../../../../zlib/inflate.h"
-#include "../../../../zlib/deflate.h"
+#include <zutil.h>
+#include <zlib.h>
+#include <inftrees.h>
+#include <inflate.h>
+#include <deflate.h>
 
 #include <util/ndbzio.h>
 
diff --git a/storage/ndb/src/common/util/parse_mask.hpp b/storage/ndb/src/common/util/parse_mask.hpp
index b4fb32fefb96..267f940b218d 100644
--- a/storage/ndb/src/common/util/parse_mask.hpp
+++ b/storage/ndb/src/common/util/parse_mask.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/random.c b/storage/ndb/src/common/util/random.c
index 423f5f9492e4..e4732d0f7f26 100644
--- a/storage/ndb/src/common/util/random.c
+++ b/storage/ndb/src/common/util/random.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/require.c b/storage/ndb/src/common/util/require.c
index 1972763ed90c..c1d760456e24 100644
--- a/storage/ndb/src/common/util/require.c
+++ b/storage/ndb/src/common/util/require.c
@@ -1,15 +1,22 @@
 /*
-   Copyright 2009 Sun Microsystems, Inc.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/socket_io.cpp b/storage/ndb/src/common/util/socket_io.cpp
index a212a5d144d3..99bc17d4aadb 100644
--- a/storage/ndb/src/common/util/socket_io.cpp
+++ b/storage/ndb/src/common/util/socket_io.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/strdup.c b/storage/ndb/src/common/util/strdup.c
index 97f695fab38b..0a7fa0663c2f 100644
--- a/storage/ndb/src/common/util/strdup.c
+++ b/storage/ndb/src/common/util/strdup.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testConfigValues/Makefile b/storage/ndb/src/common/util/testConfigValues/Makefile
index 6877afcfb74b..81fa4b4ef6ff 100644
--- a/storage/ndb/src/common/util/testConfigValues/Makefile
+++ b/storage/ndb/src/common/util/testConfigValues/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
index 2e9ecdb5ed39..1ae76d54cb46 100644
--- a/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
+++ b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testProperties/Makefile b/storage/ndb/src/common/util/testProperties/Makefile
index 6c0a741fb399..d2c7eb333180 100644
--- a/storage/ndb/src/common/util/testProperties/Makefile
+++ b/storage/ndb/src/common/util/testProperties/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testProperties/testProperties.cpp b/storage/ndb/src/common/util/testProperties/testProperties.cpp
index 39c5a8b91158..04a25bf33ec8 100644
--- a/storage/ndb/src/common/util/testProperties/testProperties.cpp
+++ b/storage/ndb/src/common/util/testProperties/testProperties.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testSimpleProperties/Makefile b/storage/ndb/src/common/util/testSimpleProperties/Makefile
index 8ea954bcc74f..b56f7f75cf36 100644
--- a/storage/ndb/src/common/util/testSimpleProperties/Makefile
+++ b/storage/ndb/src/common/util/testSimpleProperties/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
index 4adff2d68d86..bb3fb765c091 100644
--- a/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
+++ b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/uucode.c b/storage/ndb/src/common/util/uucode.c
index c3a46906416b..84ce6b78b1a8 100644
--- a/storage/ndb/src/common/util/uucode.c
+++ b/storage/ndb/src/common/util/uucode.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/common/util/version.cpp b/storage/ndb/src/common/util/version.cpp
index 325d8191c3f2..e2b05fc75cde 100644
--- a/storage/ndb/src/common/util/version.cpp
+++ b/storage/ndb/src/common/util/version.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/APIService.cpp b/storage/ndb/src/cw/cpcd/APIService.cpp
index 73da42c17b76..59b610497324 100644
--- a/storage/ndb/src/cw/cpcd/APIService.cpp
+++ b/storage/ndb/src/cw/cpcd/APIService.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/APIService.hpp b/storage/ndb/src/cw/cpcd/APIService.hpp
index 75c0f6477c85..925d616cfcce 100644
--- a/storage/ndb/src/cw/cpcd/APIService.hpp
+++ b/storage/ndb/src/cw/cpcd/APIService.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/CMakeLists.txt b/storage/ndb/src/cw/cpcd/CMakeLists.txt
index ae6a2bf3cd30..05a2ad5d9317 100644
--- a/storage/ndb/src/cw/cpcd/CMakeLists.txt
+++ b/storage/ndb/src/cw/cpcd/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/CPCD.cpp b/storage/ndb/src/cw/cpcd/CPCD.cpp
index 4abc3cd32766..c2e7e408f445 100644
--- a/storage/ndb/src/cw/cpcd/CPCD.cpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/CPCD.hpp b/storage/ndb/src/cw/cpcd/CPCD.hpp
index 3317490f3764..dc3679253977 100644
--- a/storage/ndb/src/cw/cpcd/CPCD.hpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB, 2009, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/Monitor.cpp b/storage/ndb/src/cw/cpcd/Monitor.cpp
index e5ad9ef0f078..6abd80972986 100644
--- a/storage/ndb/src/cw/cpcd/Monitor.cpp
+++ b/storage/ndb/src/cw/cpcd/Monitor.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/Process.cpp b/storage/ndb/src/cw/cpcd/Process.cpp
index 83c48e8db186..554df577b2a0 100644
--- a/storage/ndb/src/cw/cpcd/Process.cpp
+++ b/storage/ndb/src/cw/cpcd/Process.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/common.cpp b/storage/ndb/src/cw/cpcd/common.cpp
index 635e1b141a60..9139503d0ba0 100644
--- a/storage/ndb/src/cw/cpcd/common.cpp
+++ b/storage/ndb/src/cw/cpcd/common.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/common.hpp b/storage/ndb/src/cw/cpcd/common.hpp
index 1504b108fab8..b6475222be6e 100644
--- a/storage/ndb/src/cw/cpcd/common.hpp
+++ b/storage/ndb/src/cw/cpcd/common.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/cw/cpcd/main.cpp b/storage/ndb/src/cw/cpcd/main.cpp
index cb4e3314400f..eef97e363042 100644
--- a/storage/ndb/src/cw/cpcd/main.cpp
+++ b/storage/ndb/src/cw/cpcd/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/CMakeLists.txt b/storage/ndb/src/kernel/CMakeLists.txt
index 3d169eb6e5b0..cd6440650449 100644
--- a/storage/ndb/src/kernel/CMakeLists.txt
+++ b/storage/ndb/src/kernel/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp
index 813014b211c4..a978d4186306 100644
--- a/storage/ndb/src/kernel/SimBlockList.cpp
+++ b/storage/ndb/src/kernel/SimBlockList.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/angel.cpp b/storage/ndb/src/kernel/angel.cpp
index a42a8a15362e..bfdf467492fb 100644
--- a/storage/ndb/src/kernel/angel.cpp
+++ b/storage/ndb/src/kernel/angel.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/angel.hpp b/storage/ndb/src/kernel/angel.hpp
index 484df2bd41a5..bdaf4725c228 100644
--- a/storage/ndb/src/kernel/angel.hpp
+++ b/storage/ndb/src/kernel/angel.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/CMakeLists.txt b/storage/ndb/src/kernel/blocks/CMakeLists.txt
index 23beb83e08b3..3884d6dafbc1 100644
--- a/storage/ndb/src/kernel/blocks/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ERROR_codes.txt b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
index 6995ee00b5b3..a09904994fc0 100644
--- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/LocalProxy.cpp b/storage/ndb/src/kernel/blocks/LocalProxy.cpp
index 9cbcc352eacb..4bd4b18d1ebb 100644
--- a/storage/ndb/src/kernel/blocks/LocalProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/LocalProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/LocalProxy.hpp b/storage/ndb/src/kernel/blocks/LocalProxy.hpp
index 3c368f0d84bd..fa1a40ecc36e 100644
--- a/storage/ndb/src/kernel/blocks/LocalProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/LocalProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/PgmanProxy.cpp b/storage/ndb/src/kernel/blocks/PgmanProxy.cpp
index 1b5763475ea5..2d0b2c81d13e 100644
--- a/storage/ndb/src/kernel/blocks/PgmanProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/PgmanProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/PgmanProxy.hpp b/storage/ndb/src/kernel/blocks/PgmanProxy.hpp
index f69c02477bd4..7d8c6f7da190 100644
--- a/storage/ndb/src/kernel/blocks/PgmanProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/PgmanProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/RestoreProxy.cpp b/storage/ndb/src/kernel/blocks/RestoreProxy.cpp
index e1c03f635129..54e14c296a7e 100644
--- a/storage/ndb/src/kernel/blocks/RestoreProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/RestoreProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/RestoreProxy.hpp b/storage/ndb/src/kernel/blocks/RestoreProxy.hpp
index 59190a04eab7..d083db3dc8c4 100644
--- a/storage/ndb/src/kernel/blocks/RestoreProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/RestoreProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
index 05cb32cf581c..5de86cc9c3cf 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
index a964ae62275c..ba8105b89429 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
index 357109db6011..3dcd7f5f4d28 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
index d08dc5f46ca2..6447f647ba7a 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp b/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
index f12e4ed5381d..004ed2420c3d 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp b/storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
index 3bbc59b5c023..d0b547adafbc 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt b/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
index c011b0b93ebe..0c8b77bc985c 100644
--- a/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
index 27ecb4e9b71c..a5885a83c16b 100644
--- a/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/backup/read.cpp b/storage/ndb/src/kernel/blocks/backup/read.cpp
index 169403def282..0f013106969c 100644
--- a/storage/ndb/src/kernel/blocks/backup/read.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/read.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index a916a22aa876..4b041a748fd2 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
index a480cf50cb74..e0b8bac02ce3 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/Container.hpp b/storage/ndb/src/kernel/blocks/dbacc/Container.hpp
index 2001e76ad103..355440856f94 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/Container.hpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/Container.hpp
@@ -2,16 +2,23 @@
 #define CONTAINER_HPP
 
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
index 5dfb2aedd25b..894c4f71e77f 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
index 37d93626d841..6ea5877454be 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index c332c782e9fe..b6a9f3b10c19 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp
index 5640477fc514..659e642bd65c 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp
index 7870a58675fa..a9040791e55a 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt b/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
index cf1ae9db1e6d..1659479c93a4 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index dfadc48c7999..2a5bad4296b4 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
index 11f234f881b7..ecb703bff545 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
index 9bb635a1f3cc..bf981e8c8610 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
@@ -1,14 +1,21 @@
-// Copyright (C) 2003, 2005, 2006 MySQL AB
+// Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 //  All rights reserved. Use is subject to license terms.
 //
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// GNU General Public License, version 2.0, for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
index 4551e01b6eed..b846a9f4ad8f 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
index 2aa952e09709..9bb1c4c657d4 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
@@ -1,14 +1,21 @@
-// Copyright (C) 2003, 2005, 2006 MySQL AB
+// Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 //  All rights reserved. Use is subject to license terms.
 //
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// GNU General Public License, version 2.0, for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
index 1801e177f7a4..c2283353672a 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt b/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
index 6acb3425d306..187f3ac71418 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
index 8970cd49e8d0..1400ff209350 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
index 1b787fe7d694..02cad398a33e 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 435ba31332e3..4f29a6d98afd 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21070,7 +21077,7 @@ void Dbdih::initRestartInfo(Signal* signal)
   } while (nodePtr.i != RNIL);
 
   Uint32 startGci = 1;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #ifdef NDB_USE_GET_ENV
   {
     char envBuf[256];
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
index 62a10a74becd..029bb9a140bf 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/printFragfile.cpp b/storage/ndb/src/kernel/blocks/dbdih/printFragfile.cpp
index 578b75be6f87..8d7d8ba9b44c 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/printFragfile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/printFragfile.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
index 4e7ecf3a8b00..b250c2700a32 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.cpp b/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.cpp
index b057c4658b9c..7e2887a98389 100644
--- a/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2000, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.hpp b/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.hpp
index 22b475c0481c..f86328aff095 100644
--- a/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbgdm/DbgdmProxy.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
index 1d36c4c3d84d..6270c2ce800e 100644
--- a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
+++ b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
index b02c78d8914e..47ef9f4e4f9d 100644
--- a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
+++ b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
index 4c63b93bbe5d..13d55ac4618d 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index f0eeccd3941f..958ac16ff081 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp
index 86dd8651fc20..31f694bf4a72 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp
index 8b69978c0c00..e986446f2862 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 30d431b52b61..9b182b6739a9 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index c57ed7c0b165..1c5264147bf4 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
index 46dde65f6813..e452b94fa7de 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
index 534953e47f03..32f0e199ff86 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp
index 4b8ee09a7867..7c6978e75618 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhStateDesc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
index 2a782333d8ea..d1618a280fea 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
index 124e925128be..d806d2537104 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
index 432f5fcae258..1f97acd8279a 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp b/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
index 57633ce340d0..5846a32ca6b9 100644
--- a/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
+++ b/storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp b/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp
index 5f20f36c02c7..16306cde50a8 100644
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
index d9ea012e3466..bf34ea93a05c 100644
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.cpp b/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.cpp
index a2b6c5726226..35422d8ec314 100644
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp b/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp
index 9a0e75967918..37933593f0f2 100644
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
index 13ad1622efad..b5d51434b55f 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
index 81645fd80707..e28368c8b477 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index bb6c8e8330fe..770e4bcd0a74 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
index 7ab0a4388f05..2b28ab7bf353 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
index cddae7a8a69e..4638e8a568b0 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp
index c3681476617c..67f2af4c8323 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcStateDesc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
index 21b5a01c8174..a60caf33b77b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt b/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt
index 3a94d9b9a457..48ee4c2d9cd1 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt
+++ b/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB, 2008, 2010 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index d0e76d12faff..7c5f4a86bfd7 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
index cc76332eea27..9d8529d7b655 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
index d02844998b5e..bdad36850f11 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupClient.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupClient.cpp
index b2d484f27eef..f97b64342fb3 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupClient.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupClient.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index d9435e1dcafe..887376ab72ed 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
index 80f4c1042d61..cf67fc35eb90 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
index f40af90a4770..4f69b5466618 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index c5c31845c118..e99e79c6d46c 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
index 2840209866ec..30d04732279a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index d5af5732a676..11e1636fec97 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
index f3b794a1a602..ddcd74854588 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
index 17c2a33b95e7..0bbb3b633d1a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
index fce941131449..7890f4faf72f 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
index 220d86f7f5a1..508532c71e8b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
index 33f42556c820..f5348cfd8652 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
index 2fca855836ce..86644425f9ad 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index 9fd374de767e..fa56871b501b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
index 0608b4fdf73a..c186335a433b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
index c9c30b62c286..f7b0519161d0 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
index acb3e38a7179..9b75f2d4a25d 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
index 9768b632e2f7..ef4f96b00d10 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
index 8810aceb41dc..19956149ccbd 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
index 56364ed42739..dca738514dcb 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
index 1628ee3b12b3..5dcb3e1d1d31 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/test_dynbm.c b/storage/ndb/src/kernel/blocks/dbtup/test_dynbm.c
index 8e041cb9dca6..e7c3caa6d928 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/test_dynbm.c
+++ b/storage/ndb/src/kernel/blocks/dbtup/test_dynbm.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp b/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
index 3e8693b5d312..78df8a279a69 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp b/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
index 496b33a60564..de99c07ec88d 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp b/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
index 295fec6b77d4..7fcc23d49509 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
index 37025b6238ed..0d10aebab0b0 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp
index c6940e53ced0..f964af333022 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
index 8ebda8568ea7..fd467363aa70 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
index 73f1670d15e2..345822d50142 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
index fa2944a1c8de..cb1a725dac32 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
index 466e1fc0c0b9..e32cd1d75468 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
index 5a39fb313be5..68bbc6516d50 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
index 5a11d79fb2a1..63f97c9363d7 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
index bff86973ad55..9189e9e50382 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
index b51183551172..395a246c20f8 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
index a070c95806e2..cac070c4e8a8 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
index 759a48532204..b3456d4c28b7 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
index 93ef5422a731..bebd5c8b1ebe 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
index 18950ce56ef7..5c076db1afe1 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html b/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html
index e172c8adf98b..fd0a3a67dc6a 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html
+++ b/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html
@@ -1,15 +1,22 @@
 <!--
-   Copyright (C) 2003, 2005 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
index 38e3770cf47d..25e50e227b39 100644
--- a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
index 75640968536e..7b9d018cd3a4 100644
--- a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/diskpage.cpp b/storage/ndb/src/kernel/blocks/diskpage.cpp
index 23a52bab00c1..68cbfffbc705 100644
--- a/storage/ndb/src/kernel/blocks/diskpage.cpp
+++ b/storage/ndb/src/kernel/blocks/diskpage.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/diskpage.hpp b/storage/ndb/src/kernel/blocks/diskpage.hpp
index 138900f78653..28890f9efb68 100644
--- a/storage/ndb/src/kernel/blocks/diskpage.hpp
+++ b/storage/ndb/src/kernel/blocks/diskpage.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/lgman.cpp b/storage/ndb/src/kernel/blocks/lgman.cpp
index 6283e884ccb4..12ae6171102b 100644
--- a/storage/ndb/src/kernel/blocks/lgman.cpp
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp
@@ -1,14 +1,20 @@
-/* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/lgman.hpp b/storage/ndb/src/kernel/blocks/lgman.hpp
index bfda1f8ab088..4415ac4dae3d 100644
--- a/storage/ndb/src/kernel/blocks/lgman.hpp
+++ b/storage/ndb/src/kernel/blocks/lgman.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/mutexes.hpp b/storage/ndb/src/kernel/blocks/mutexes.hpp
index 53734f558fc4..3e2d1f31c0d5 100644
--- a/storage/ndb/src/kernel/blocks/mutexes.hpp
+++ b/storage/ndb/src/kernel/blocks/mutexes.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
index 6dc9a425d87a..95e9f019294d 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
index ef71e2f07b63..9a55da1017d8 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index fdadba43249d..4ab77c058714 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
index 139e55a1a1a9..b061391c619e 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index e6be5252bead..c58aa6f99b48 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
index e747a0957ec8..bf775de5bd0e 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
index f112e8dab97d..c89b3432d6f2 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
index 880c0c7e6183..09cfcf7da035 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp
index ec0d000b0de8..1fb88607f51d 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -131,8 +138,8 @@ AsyncIoThread::run()
   // Create theMemoryChannel in the thread that will wait for it
   NdbMutex_Lock(theStartMutexPtr);
   theStartFlag = true;
-  NdbMutex_Unlock(theStartMutexPtr);
   NdbCondition_Signal(theStartConditionPtr);
+  NdbMutex_Unlock(theStartMutexPtr);
 
   EmulatedJamBuffer jamBuffer;
   jamBuffer.theEmulatedJamIndex = 0;
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
index 7c8d6e71cb8b..6e6a15d33c77 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
index c1c6e2547a09..101fdf9905d3 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
index 42e3cddf03b4..ffd3ad7362ad 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
index d9dac5199d43..9c382189e4c9 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
index d92ab941132f..24ca49afbed7 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
index 4071d5b382d1..d8dc4003ca34 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
index e8b83ff34ceb..1b4bf27f12fc 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index d3bba5ad5bfc..09dadee88d90 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
index 4d5243fe3810..55b416b8d102 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
index a4265ec7ed68..04e7eba4f11e 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
index a56da34317f9..17f0edecb8cc 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
index 401f3e59deda..5b9be8ee453a 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -740,7 +747,7 @@ void PosixAsyncFile::closeReq(Request *request)
   nzf.stream.opaque = (void*)&nz_mempool;
 
   if (-1 == r) {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if (theFd == -1) {
       DEBUG(ndbout_c("close on fd = -1"));
       abort();
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp
index df2436021a18..bc89b8b69f35 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
index d9115e0ee895..2ebd2ee06458 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
index 49afd1d33f61..e0e3e3d9e7e6 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp
index a4da59a39ceb..82097a738d31 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp
index 2b2facab5b7b..e49bef5fbe73 100644
--- a/storage/ndb/src/kernel/blocks/pgman.cpp
+++ b/storage/ndb/src/kernel/blocks/pgman.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/pgman.hpp b/storage/ndb/src/kernel/blocks/pgman.hpp
index c7e3704a1bb5..4a145382b493 100644
--- a/storage/ndb/src/kernel/blocks/pgman.hpp
+++ b/storage/ndb/src/kernel/blocks/pgman.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/print_file.cpp b/storage/ndb/src/kernel/blocks/print_file.cpp
index d5819b64f04a..bc02657ce809 100644
--- a/storage/ndb/src/kernel/blocks/print_file.cpp
+++ b/storage/ndb/src/kernel/blocks/print_file.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
index d8b353458133..f10f3ca8b8d6 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
index 2236cfffd6ea..51d29d1f8712 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
index 48dba4395e27..616fd6b0ca68 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/qmgr/timer.hpp b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
index 9397890f8aff..2fdc12254283 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/record_types.hpp b/storage/ndb/src/kernel/blocks/record_types.hpp
index 8b514416355b..a982092b3384 100644
--- a/storage/ndb/src/kernel/blocks/record_types.hpp
+++ b/storage/ndb/src/kernel/blocks/record_types.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/restore.cpp b/storage/ndb/src/kernel/blocks/restore.cpp
index b71c00d49922..346c5a2d73a4 100644
--- a/storage/ndb/src/kernel/blocks/restore.cpp
+++ b/storage/ndb/src/kernel/blocks/restore.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/restore.hpp b/storage/ndb/src/kernel/blocks/restore.hpp
index f8d982bac995..59293ab4f027 100644
--- a/storage/ndb/src/kernel/blocks/restore.hpp
+++ b/storage/ndb/src/kernel/blocks/restore.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
index 4af45dd342d4..1be1bd08366f 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -772,7 +779,7 @@ Suma::execCHECKNODEGROUPSCONF(Signal *signal)
 
   fix_nodegroup();
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   for (Uint32 i = 0; i < c_noNodesInGroup; i++) {
     DBUG_PRINT("exit",("Suma: NodeGroup %u, me %u, "
 		       "member[%u] %u",
@@ -5464,7 +5471,7 @@ Suma::execALTER_TAB_REQ(Signal *signal)
   }
   // dict coordinator sends info to API
   
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   ndbout_c("DICT_TAB_INFO in SUMA,  tabInfoPtr.sz = %d", tabInfoPtr.sz);
   SimplePropertiesSectionReader reader(handle.m_ptr[0],
 				       getSectionSegmentPool());
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.hpp b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
index bc938cf5a2c6..a31feff4eaff 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.hpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
index c08a2894f3b5..ae03c9ff3124 100644
--- a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/thrman.cpp b/storage/ndb/src/kernel/blocks/thrman.cpp
index 98814f359b3e..da0106775a45 100644
--- a/storage/ndb/src/kernel/blocks/thrman.cpp
+++ b/storage/ndb/src/kernel/blocks/thrman.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/thrman.hpp b/storage/ndb/src/kernel/blocks/thrman.hpp
index a9210d5e9910..3adfe09ac51a 100644
--- a/storage/ndb/src/kernel/blocks/thrman.hpp
+++ b/storage/ndb/src/kernel/blocks/thrman.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/trix/Trix.cpp b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
index c37c2bf944ea..636556bcd49c 100644
--- a/storage/ndb/src/kernel/blocks/trix/Trix.cpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/trix/Trix.hpp b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
index 016767af871a..0d9f416dd857 100644
--- a/storage/ndb/src/kernel/blocks/trix/Trix.hpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/trpman.cpp b/storage/ndb/src/kernel/blocks/trpman.cpp
index 8e6f18f02b09..63a1bb6b5180 100644
--- a/storage/ndb/src/kernel/blocks/trpman.cpp
+++ b/storage/ndb/src/kernel/blocks/trpman.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/trpman.hpp b/storage/ndb/src/kernel/blocks/trpman.hpp
index 154855dfed19..aaa8ff6d38ab 100644
--- a/storage/ndb/src/kernel/blocks/trpman.hpp
+++ b/storage/ndb/src/kernel/blocks/trpman.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/tsman.cpp b/storage/ndb/src/kernel/blocks/tsman.cpp
index 111c3226a1ee..2ab257892fa2 100644
--- a/storage/ndb/src/kernel/blocks/tsman.cpp
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/blocks/tsman.hpp b/storage/ndb/src/kernel/blocks/tsman.hpp
index 1b7e3cf66666..5c23144b1fba 100644
--- a/storage/ndb/src/kernel/blocks/tsman.hpp
+++ b/storage/ndb/src/kernel/blocks/tsman.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/CMakeLists.txt b/storage/ndb/src/kernel/error/CMakeLists.txt
index dc75559db25f..075d45732248 100644
--- a/storage/ndb/src/kernel/error/CMakeLists.txt
+++ b/storage/ndb/src/kernel/error/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
index d4b3bb83e92a..c0262f0d6ca2 100644
--- a/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
+++ b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/ErrorReporter.cpp b/storage/ndb/src/kernel/error/ErrorReporter.cpp
index 0421707f8e74..1f35218b84d0 100644
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/ErrorReporter.hpp b/storage/ndb/src/kernel/error/ErrorReporter.hpp
index b455c61253ca..bbb948782a12 100644
--- a/storage/ndb/src/kernel/error/ErrorReporter.hpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/TimeModule.cpp b/storage/ndb/src/kernel/error/TimeModule.cpp
index e1b324c9893e..7d63852c7c58 100644
--- a/storage/ndb/src/kernel/error/TimeModule.cpp
+++ b/storage/ndb/src/kernel/error/TimeModule.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/TimeModule.hpp b/storage/ndb/src/kernel/error/TimeModule.hpp
index 3dea76671998..a0a2210594ed 100644
--- a/storage/ndb/src/kernel/error/TimeModule.hpp
+++ b/storage/ndb/src/kernel/error/TimeModule.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/error/ndbd_exit_codes.c b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
index 7b5bf84cd757..e9bc28acec43 100644
--- a/storage/ndb/src/kernel/error/ndbd_exit_codes.c
+++ b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/main.cpp b/storage/ndb/src/kernel/main.cpp
index 4c4ce4bea677..251214a65062 100644
--- a/storage/ndb/src/kernel/main.cpp
+++ b/storage/ndb/src/kernel/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -145,7 +152,7 @@ real_main(int argc, char** argv)
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndbd.trace";
 #endif
 
diff --git a/storage/ndb/src/kernel/ndbd.cpp b/storage/ndb/src/kernel/ndbd.cpp
index 5ec76edddd77..925db1ffe4eb 100644
--- a/storage/ndb/src/kernel/ndbd.cpp
+++ b/storage/ndb/src/kernel/ndbd.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/ndbd.hpp b/storage/ndb/src/kernel/ndbd.hpp
index bde5454e21e3..b744d07437e9 100644
--- a/storage/ndb/src/kernel/ndbd.hpp
+++ b/storage/ndb/src/kernel/ndbd.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ArenaPool.cpp b/storage/ndb/src/kernel/vm/ArenaPool.cpp
index e68be8cca7c4..bc4c93483ad7 100644
--- a/storage/ndb/src/kernel/vm/ArenaPool.cpp
+++ b/storage/ndb/src/kernel/vm/ArenaPool.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ArenaPool.hpp b/storage/ndb/src/kernel/vm/ArenaPool.hpp
index 0a9d4e70c4b6..627d58d250e9 100644
--- a/storage/ndb/src/kernel/vm/ArenaPool.hpp
+++ b/storage/ndb/src/kernel/vm/ArenaPool.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Array.hpp b/storage/ndb/src/kernel/vm/Array.hpp
index e774dfcab68a..46ad8ebeb93b 100644
--- a/storage/ndb/src/kernel/vm/Array.hpp
+++ b/storage/ndb/src/kernel/vm/Array.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ArrayPool.hpp b/storage/ndb/src/kernel/vm/ArrayPool.hpp
index 0831b976e918..7a710c1ab62c 100644
--- a/storage/ndb/src/kernel/vm/ArrayPool.hpp
+++ b/storage/ndb/src/kernel/vm/ArrayPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/CArray.hpp b/storage/ndb/src/kernel/vm/CArray.hpp
index e19313ccb3ef..c77026162912 100644
--- a/storage/ndb/src/kernel/vm/CArray.hpp
+++ b/storage/ndb/src/kernel/vm/CArray.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/CMakeLists.txt b/storage/ndb/src/kernel/vm/CMakeLists.txt
index 198d0035b417..ad97409d9dfa 100644
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Callback.hpp b/storage/ndb/src/kernel/vm/Callback.hpp
index 7ce8361ea0a5..07d6d87908c0 100644
--- a/storage/ndb/src/kernel/vm/Callback.hpp
+++ b/storage/ndb/src/kernel/vm/Callback.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
index 29b4eb967f8e..e6f12bd616cf 100644
--- a/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
index b4114653058c..ffad686b74d2 100644
--- a/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp
index 652d238d7132..3b71e5b2e4ac 100644
--- a/storage/ndb/src/kernel/vm/Configuration.cpp
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Configuration.hpp b/storage/ndb/src/kernel/vm/Configuration.hpp
index a98358f0ed5b..b80317c9137d 100644
--- a/storage/ndb/src/kernel/vm/Configuration.hpp
+++ b/storage/ndb/src/kernel/vm/Configuration.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/CountingPool.cpp b/storage/ndb/src/kernel/vm/CountingPool.cpp
index 465eebaa70ae..0671aff73f93 100644
--- a/storage/ndb/src/kernel/vm/CountingPool.cpp
+++ b/storage/ndb/src/kernel/vm/CountingPool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/CountingPool.hpp b/storage/ndb/src/kernel/vm/CountingPool.hpp
index da4cec44c94a..527815187a83 100644
--- a/storage/ndb/src/kernel/vm/CountingPool.hpp
+++ b/storage/ndb/src/kernel/vm/CountingPool.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/CountingSemaphore.hpp b/storage/ndb/src/kernel/vm/CountingSemaphore.hpp
index 75811cf9e291..c1236410bad7 100644
--- a/storage/ndb/src/kernel/vm/CountingSemaphore.hpp
+++ b/storage/ndb/src/kernel/vm/CountingSemaphore.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DLCHashTable.hpp b/storage/ndb/src/kernel/vm/DLCHashTable.hpp
index a66ca1d484a6..4475867bcaf7 100644
--- a/storage/ndb/src/kernel/vm/DLCHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLCHashTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DLHashTable.hpp b/storage/ndb/src/kernel/vm/DLHashTable.hpp
index f43637c617b1..01b79d8eaf81 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DLHashTable2.hpp b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
index 9f7c3ddb51f0..5a3001e4fa9c 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable2.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DataBuffer.hpp b/storage/ndb/src/kernel/vm/DataBuffer.hpp
index 6efd2df8c267..d06ca10bb2a1 100644
--- a/storage/ndb/src/kernel/vm/DataBuffer.hpp
+++ b/storage/ndb/src/kernel/vm/DataBuffer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DataBuffer2.hpp b/storage/ndb/src/kernel/vm/DataBuffer2.hpp
index 58608c246004..7bd8739edf5d 100644
--- a/storage/ndb/src/kernel/vm/DataBuffer2.hpp
+++ b/storage/ndb/src/kernel/vm/DataBuffer2.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DynArr256.cpp b/storage/ndb/src/kernel/vm/DynArr256.cpp
index d26f94298004..cbebb3767c75 100644
--- a/storage/ndb/src/kernel/vm/DynArr256.cpp
+++ b/storage/ndb/src/kernel/vm/DynArr256.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/DynArr256.hpp b/storage/ndb/src/kernel/vm/DynArr256.hpp
index 2da4f8b6e7ed..cf33b61dff0a 100644
--- a/storage/ndb/src/kernel/vm/DynArr256.hpp
+++ b/storage/ndb/src/kernel/vm/DynArr256.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Emulator.cpp b/storage/ndb/src/kernel/vm/Emulator.cpp
index 9a9ddefb79ee..ca1fdbe25d53 100644
--- a/storage/ndb/src/kernel/vm/Emulator.cpp
+++ b/storage/ndb/src/kernel/vm/Emulator.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Emulator.hpp b/storage/ndb/src/kernel/vm/Emulator.hpp
index 09146fa44974..2d84f2e57c00 100644
--- a/storage/ndb/src/kernel/vm/Emulator.hpp
+++ b/storage/ndb/src/kernel/vm/Emulator.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/FastScheduler.cpp b/storage/ndb/src/kernel/vm/FastScheduler.cpp
index 34837c66a656..645ff8b8823e 100644
--- a/storage/ndb/src/kernel/vm/FastScheduler.cpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/FastScheduler.hpp b/storage/ndb/src/kernel/vm/FastScheduler.hpp
index 0a2f4b87813c..09b54be096ca 100644
--- a/storage/ndb/src/kernel/vm/FastScheduler.hpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/GlobalData.cpp b/storage/ndb/src/kernel/vm/GlobalData.cpp
index 8a1d49c74d8b..cbcd1f9ffbe1 100644
--- a/storage/ndb/src/kernel/vm/GlobalData.cpp
+++ b/storage/ndb/src/kernel/vm/GlobalData.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/GlobalData.hpp b/storage/ndb/src/kernel/vm/GlobalData.hpp
index 27eba9d7effc..ba4e831eb17c 100644
--- a/storage/ndb/src/kernel/vm/GlobalData.hpp
+++ b/storage/ndb/src/kernel/vm/GlobalData.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/IntrusiveList.cpp b/storage/ndb/src/kernel/vm/IntrusiveList.cpp
index 252b96eebd4f..423559e678eb 100644
--- a/storage/ndb/src/kernel/vm/IntrusiveList.cpp
+++ b/storage/ndb/src/kernel/vm/IntrusiveList.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/IntrusiveList.hpp b/storage/ndb/src/kernel/vm/IntrusiveList.hpp
index 723d539933dc..64e8f1a9c6b8 100644
--- a/storage/ndb/src/kernel/vm/IntrusiveList.hpp
+++ b/storage/ndb/src/kernel/vm/IntrusiveList.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/KeyDescriptor.hpp b/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
index 6adba615fe1a..cdaac8462739 100644
--- a/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
+++ b/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/KeyTable.hpp b/storage/ndb/src/kernel/vm/KeyTable.hpp
index fc7d8935b083..583d70c3fb29 100644
--- a/storage/ndb/src/kernel/vm/KeyTable.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/KeyTable2.hpp b/storage/ndb/src/kernel/vm/KeyTable2.hpp
index 4e2ec57084a7..6f323f6c5e69 100644
--- a/storage/ndb/src/kernel/vm/KeyTable2.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable2.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp b/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
index b388a10ab145..8d35cd62bae4 100644
--- a/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LHLevel.cpp b/storage/ndb/src/kernel/vm/LHLevel.cpp
index 40f2f70117d8..ce8a2393c838 100644
--- a/storage/ndb/src/kernel/vm/LHLevel.cpp
+++ b/storage/ndb/src/kernel/vm/LHLevel.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LHLevel.hpp b/storage/ndb/src/kernel/vm/LHLevel.hpp
index fcd93791976d..33b25849ab97 100644
--- a/storage/ndb/src/kernel/vm/LHLevel.hpp
+++ b/storage/ndb/src/kernel/vm/LHLevel.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LinearPool.hpp b/storage/ndb/src/kernel/vm/LinearPool.hpp
index cc088c93b40e..2614bdbf0053 100644
--- a/storage/ndb/src/kernel/vm/LinearPool.hpp
+++ b/storage/ndb/src/kernel/vm/LinearPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LockQueue.cpp b/storage/ndb/src/kernel/vm/LockQueue.cpp
index 85b3cc236334..a25126af054f 100644
--- a/storage/ndb/src/kernel/vm/LockQueue.cpp
+++ b/storage/ndb/src/kernel/vm/LockQueue.cpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LockQueue.hpp b/storage/ndb/src/kernel/vm/LockQueue.hpp
index f4d89295a1e2..25304091f53a 100644
--- a/storage/ndb/src/kernel/vm/LockQueue.hpp
+++ b/storage/ndb/src/kernel/vm/LockQueue.hpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LongSignal.cpp b/storage/ndb/src/kernel/vm/LongSignal.cpp
index 6dfd741438e5..0c109b9239ed 100644
--- a/storage/ndb/src/kernel/vm/LongSignal.cpp
+++ b/storage/ndb/src/kernel/vm/LongSignal.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LongSignal.hpp b/storage/ndb/src/kernel/vm/LongSignal.hpp
index 9b4e04371638..657861b9271c 100644
--- a/storage/ndb/src/kernel/vm/LongSignal.hpp
+++ b/storage/ndb/src/kernel/vm/LongSignal.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LongSignalImpl.hpp b/storage/ndb/src/kernel/vm/LongSignalImpl.hpp
index 29e95252088a..20b425dc3933 100644
--- a/storage/ndb/src/kernel/vm/LongSignalImpl.hpp
+++ b/storage/ndb/src/kernel/vm/LongSignalImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LongSignal_mt.cpp b/storage/ndb/src/kernel/vm/LongSignal_mt.cpp
index 0ab6b436b2dc..7f5ed847e870 100644
--- a/storage/ndb/src/kernel/vm/LongSignal_mt.cpp
+++ b/storage/ndb/src/kernel/vm/LongSignal_mt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/LongSignal_nonmt.cpp b/storage/ndb/src/kernel/vm/LongSignal_nonmt.cpp
index 427c1ed8ad55..accb18e732b4 100644
--- a/storage/ndb/src/kernel/vm/LongSignal_nonmt.cpp
+++ b/storage/ndb/src/kernel/vm/LongSignal_nonmt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Mutex.cpp b/storage/ndb/src/kernel/vm/Mutex.cpp
index aaff8b593add..f280f466b036 100644
--- a/storage/ndb/src/kernel/vm/Mutex.cpp
+++ b/storage/ndb/src/kernel/vm/Mutex.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Mutex.hpp b/storage/ndb/src/kernel/vm/Mutex.hpp
index dd20f05a9bad..9a009ec29375 100644
--- a/storage/ndb/src/kernel/vm/Mutex.hpp
+++ b/storage/ndb/src/kernel/vm/Mutex.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/NdbSeqLock.hpp b/storage/ndb/src/kernel/vm/NdbSeqLock.hpp
index 953bca78877e..92e967ff4a5f 100644
--- a/storage/ndb/src/kernel/vm/NdbSeqLock.hpp
+++ b/storage/ndb/src/kernel/vm/NdbSeqLock.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
index ad7ca0f72a28..ba0ac046e3c4 100644
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp b/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
index a0b52ea33d94..448d3304e5dc 100644
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Ndbinfo.cpp b/storage/ndb/src/kernel/vm/Ndbinfo.cpp
index a09bcf9ab8db..a37a878b2865 100644
--- a/storage/ndb/src/kernel/vm/Ndbinfo.cpp
+++ b/storage/ndb/src/kernel/vm/Ndbinfo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Ndbinfo.hpp b/storage/ndb/src/kernel/vm/Ndbinfo.hpp
index 1edd2f1660ad..b770e40fa96b 100644
--- a/storage/ndb/src/kernel/vm/Ndbinfo.hpp
+++ b/storage/ndb/src/kernel/vm/Ndbinfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/NdbinfoTables.cpp b/storage/ndb/src/kernel/vm/NdbinfoTables.cpp
index a0ef76808fbd..c7cb7b6b921a 100644
--- a/storage/ndb/src/kernel/vm/NdbinfoTables.cpp
+++ b/storage/ndb/src/kernel/vm/NdbinfoTables.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Pool.cpp b/storage/ndb/src/kernel/vm/Pool.cpp
index 29c008b9d2fe..0d0646d23b9d 100644
--- a/storage/ndb/src/kernel/vm/Pool.cpp
+++ b/storage/ndb/src/kernel/vm/Pool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Pool.hpp b/storage/ndb/src/kernel/vm/Pool.hpp
index a38ce9e88647..4b58e5e689c1 100644
--- a/storage/ndb/src/kernel/vm/Pool.hpp
+++ b/storage/ndb/src/kernel/vm/Pool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Prio.hpp b/storage/ndb/src/kernel/vm/Prio.hpp
index 0eb586c2ace3..f0773eb1193d 100644
--- a/storage/ndb/src/kernel/vm/Prio.hpp
+++ b/storage/ndb/src/kernel/vm/Prio.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/RWPool.cpp b/storage/ndb/src/kernel/vm/RWPool.cpp
index 82ba39accc33..cce5c80f0bf1 100644
--- a/storage/ndb/src/kernel/vm/RWPool.cpp
+++ b/storage/ndb/src/kernel/vm/RWPool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/RWPool.hpp b/storage/ndb/src/kernel/vm/RWPool.hpp
index ab58ec8628fa..b47b84a62164 100644
--- a/storage/ndb/src/kernel/vm/RWPool.hpp
+++ b/storage/ndb/src/kernel/vm/RWPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/RequestTracker.hpp b/storage/ndb/src/kernel/vm/RequestTracker.hpp
index 5796c9bf108a..608875891203 100644
--- a/storage/ndb/src/kernel/vm/RequestTracker.hpp
+++ b/storage/ndb/src/kernel/vm/RequestTracker.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Rope.cpp b/storage/ndb/src/kernel/vm/Rope.cpp
index 7301ab71867d..30557efa226a 100644
--- a/storage/ndb/src/kernel/vm/Rope.cpp
+++ b/storage/ndb/src/kernel/vm/Rope.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/Rope.hpp b/storage/ndb/src/kernel/vm/Rope.hpp
index e9c3d75412fd..99c92320ecba 100644
--- a/storage/ndb/src/kernel/vm/Rope.hpp
+++ b/storage/ndb/src/kernel/vm/Rope.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SafeCounter.cpp b/storage/ndb/src/kernel/vm/SafeCounter.cpp
index 723fe25cd0a8..68e14383f5eb 100644
--- a/storage/ndb/src/kernel/vm/SafeCounter.cpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SafeCounter.hpp b/storage/ndb/src/kernel/vm/SafeCounter.hpp
index 1b4fae721aa9..39e589e0ee6a 100644
--- a/storage/ndb/src/kernel/vm/SafeCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SafeMutex.cpp b/storage/ndb/src/kernel/vm/SafeMutex.cpp
index b1ca51255a2f..c1fefc037e00 100644
--- a/storage/ndb/src/kernel/vm/SafeMutex.cpp
+++ b/storage/ndb/src/kernel/vm/SafeMutex.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SafeMutex.hpp b/storage/ndb/src/kernel/vm/SafeMutex.hpp
index 74a0392fa41f..727845c17e09 100644
--- a/storage/ndb/src/kernel/vm/SafeMutex.hpp
+++ b/storage/ndb/src/kernel/vm/SafeMutex.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SectionReader.cpp b/storage/ndb/src/kernel/vm/SectionReader.cpp
index fbb93e050e6f..3fa335cd0e5b 100644
--- a/storage/ndb/src/kernel/vm/SectionReader.cpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SectionReader.hpp b/storage/ndb/src/kernel/vm/SectionReader.hpp
index 0cbfa3463c8a..877707de5e5b 100644
--- a/storage/ndb/src/kernel/vm/SectionReader.hpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SegmentList.cpp b/storage/ndb/src/kernel/vm/SegmentList.cpp
index d7125e32c2eb..f3d074a5fae7 100644
--- a/storage/ndb/src/kernel/vm/SegmentList.cpp
+++ b/storage/ndb/src/kernel/vm/SegmentList.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SegmentList.hpp b/storage/ndb/src/kernel/vm/SegmentList.hpp
index c2c831e9fd64..1a7aa870f151 100644
--- a/storage/ndb/src/kernel/vm/SegmentList.hpp
+++ b/storage/ndb/src/kernel/vm/SegmentList.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SignalCounter.hpp b/storage/ndb/src/kernel/vm/SignalCounter.hpp
index effbe84ca306..c7f3cbf39c57 100644
--- a/storage/ndb/src/kernel/vm/SignalCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SignalCounter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimBlockList.hpp b/storage/ndb/src/kernel/vm/SimBlockList.hpp
index 464f34871599..93edd7818f7e 100644
--- a/storage/ndb/src/kernel/vm/SimBlockList.hpp
+++ b/storage/ndb/src/kernel/vm/SimBlockList.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
index 9d90d144a55a..97eedec061d1 100644
--- a/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
+++ b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimplePropertiesSection_mt.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection_mt.cpp
index a97bddd8d7b5..1423489ee721 100644
--- a/storage/ndb/src/kernel/vm/SimplePropertiesSection_mt.cpp
+++ b/storage/ndb/src/kernel/vm/SimplePropertiesSection_mt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimplePropertiesSection_nonmt.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection_nonmt.cpp
index c38c259fe20e..6e73a5b87623 100644
--- a/storage/ndb/src/kernel/vm/SimplePropertiesSection_nonmt.cpp
+++ b/storage/ndb/src/kernel/vm/SimplePropertiesSection_nonmt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
index 0bba006812a1..6edb0522a5d7 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
index 35126edf8729..d48c30671a1f 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp
index ec5df55a0948..85754ee2281a 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock_mt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp
index 11e84778d1f0..0551a39f789e 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock_nonmt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SuperPool.cpp b/storage/ndb/src/kernel/vm/SuperPool.cpp
index 96163bac19bd..56d0ea9b4664 100644
--- a/storage/ndb/src/kernel/vm/SuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/SuperPool.hpp b/storage/ndb/src/kernel/vm/SuperPool.hpp
index 2d85acad5507..f25d5b9c98d9 100644
--- a/storage/ndb/src/kernel/vm/SuperPool.hpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ThreadConfig.cpp b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
index 9438065855a9..240724096cfd 100644
--- a/storage/ndb/src/kernel/vm/ThreadConfig.cpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ThreadConfig.hpp b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
index bf669d7267e3..0996fcec7ae5 100644
--- a/storage/ndb/src/kernel/vm/ThreadConfig.hpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TimeQueue.cpp b/storage/ndb/src/kernel/vm/TimeQueue.cpp
index caaa78e62cc4..9855bdd0948a 100644
--- a/storage/ndb/src/kernel/vm/TimeQueue.cpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TimeQueue.hpp b/storage/ndb/src/kernel/vm/TimeQueue.hpp
index f9b55589f387..c8a93c872cd2 100644
--- a/storage/ndb/src/kernel/vm/TimeQueue.hpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TransporterCallback.cpp b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
index 8be8b53360a3..cf7053f556ba 100644
--- a/storage/ndb/src/kernel/vm/TransporterCallback.cpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp b/storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp
index 4c3457618128..40067c427a24 100644
--- a/storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp b/storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp
index c60a8a447e42..270c439b8228 100644
--- a/storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallback_mt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp b/storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp
index b4790c5c90f8..e17b5a2d2cfa 100644
--- a/storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallback_nonmt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/VMSignal.cpp b/storage/ndb/src/kernel/vm/VMSignal.cpp
index 38310eb1a15e..1444e7f21a15 100644
--- a/storage/ndb/src/kernel/vm/VMSignal.cpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/VMSignal.hpp b/storage/ndb/src/kernel/vm/VMSignal.hpp
index 49d8e50fa4cc..e9dc3ccedb25 100644
--- a/storage/ndb/src/kernel/vm/VMSignal.hpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/WOPool.cpp b/storage/ndb/src/kernel/vm/WOPool.cpp
index b37f7d3ebb95..4309b6bd860b 100644
--- a/storage/ndb/src/kernel/vm/WOPool.cpp
+++ b/storage/ndb/src/kernel/vm/WOPool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/WOPool.hpp b/storage/ndb/src/kernel/vm/WOPool.hpp
index 083cc8860683..5dacff3b1589 100644
--- a/storage/ndb/src/kernel/vm/WOPool.hpp
+++ b/storage/ndb/src/kernel/vm/WOPool.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/WaitQueue.hpp b/storage/ndb/src/kernel/vm/WaitQueue.hpp
index 088e28ea7a7a..3748b41bce13 100644
--- a/storage/ndb/src/kernel/vm/WaitQueue.hpp
+++ b/storage/ndb/src/kernel/vm/WaitQueue.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/WatchDog.cpp b/storage/ndb/src/kernel/vm/WatchDog.cpp
index 24e0943ca094..31d1c76b46aa 100644
--- a/storage/ndb/src/kernel/vm/WatchDog.cpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/WatchDog.hpp b/storage/ndb/src/kernel/vm/WatchDog.hpp
index 787189208197..3bca3d476d4c 100644
--- a/storage/ndb/src/kernel/vm/WatchDog.hpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/al_test/Makefile b/storage/ndb/src/kernel/vm/al_test/Makefile
index f28389c1a766..3263016933b4 100644
--- a/storage/ndb/src/kernel/vm/al_test/Makefile
+++ b/storage/ndb/src/kernel/vm/al_test/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
index 08f91df88095..3ea5ce816f2b 100644
--- a/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
index b56bc54d8b6d..08d705bd87ee 100644
--- a/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/al_test/main.cpp b/storage/ndb/src/kernel/vm/al_test/main.cpp
index d5e246ca8aea..b0a61e97a620 100644
--- a/storage/ndb/src/kernel/vm/al_test/main.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/bench_pool.cpp b/storage/ndb/src/kernel/vm/bench_pool.cpp
index 3220a71ef89b..5d1377b083fe 100644
--- a/storage/ndb/src/kernel/vm/bench_pool.cpp
+++ b/storage/ndb/src/kernel/vm/bench_pool.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/dummy_mt.cpp b/storage/ndb/src/kernel/vm/dummy_mt.cpp
index 0ff1518d272b..c7cd61a37414 100644
--- a/storage/ndb/src/kernel/vm/dummy_mt.cpp
+++ b/storage/ndb/src/kernel/vm/dummy_mt.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/dummy_nonmt.cpp b/storage/ndb/src/kernel/vm/dummy_nonmt.cpp
index 581896f93626..359f58914762 100644
--- a/storage/ndb/src/kernel/vm/dummy_nonmt.cpp
+++ b/storage/ndb/src/kernel/vm/dummy_nonmt.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/mt-asm.h b/storage/ndb/src/kernel/vm/mt-asm.h
index 963eb54c0365..89c1796b170d 100644
--- a/storage/ndb/src/kernel/vm/mt-asm.h
+++ b/storage/ndb/src/kernel/vm/mt-asm.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -132,6 +139,21 @@ xcng(volatile unsigned * addr, int val)
   return prev;
 }
 
+#elif defined(__aarch64__)
+#include <atomic>
+#define NDB_HAVE_MB
+#define NDB_HAVE_RMB
+#define NDB_HAVE_WMB
+#define NDB_HAVE_READ_BARRIER_DEPENDS
+//#define NDB_HAVE_XCNG
+
+#define mb() std::atomic_thread_fence(std::memory_order_seq_cst)
+#define rmb() std::atomic_thread_fence(std::memory_order_seq_cst)
+#define wmb() std::atomic_thread_fence(std::memory_order_seq_cst)
+#define read_barrier_depends() do {} while(0)
+
+#define cpu_pause()  __asm__ __volatile__ ("yield")
+
 #else
 #define NDB_NO_ASM "Unsupported architecture (gcc)"
 #endif
diff --git a/storage/ndb/src/kernel/vm/mt-lock.hpp b/storage/ndb/src/kernel/vm/mt-lock.hpp
index fe313f4f7c04..64750b46de09 100644
--- a/storage/ndb/src/kernel/vm/mt-lock.hpp
+++ b/storage/ndb/src/kernel/vm/mt-lock.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/mt-send-t.cpp b/storage/ndb/src/kernel/vm/mt-send-t.cpp
index 4d779da8e01d..7c6e41cd60aa 100644
--- a/storage/ndb/src/kernel/vm/mt-send-t.cpp
+++ b/storage/ndb/src/kernel/vm/mt-send-t.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/mt.cpp b/storage/ndb/src/kernel/vm/mt.cpp
index f3b7a0a06c11..25619dc712cc 100644
--- a/storage/ndb/src/kernel/vm/mt.cpp
+++ b/storage/ndb/src/kernel/vm/mt.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -4350,7 +4357,11 @@ execute_signals(thr_data *selfptr,
         wakeup(&h->m_waiter);
       }
     }
-
+#if defined(__aarch64__)
+    // this is to address the missing memory barrier issue on Apple M1 platform
+    // regarding the bug#33650674 the less intrusive place should be found
+    rmb();
+#endif
     /*
      * These pre-fetching were found using OProfile to reduce cache misses.
      * (Though on Intel Core 2, they do not give much speedup, as apparently
diff --git a/storage/ndb/src/kernel/vm/mt.hpp b/storage/ndb/src/kernel/vm/mt.hpp
index 0048782d385f..a42e39537bbb 100644
--- a/storage/ndb/src/kernel/vm/mt.hpp
+++ b/storage/ndb/src/kernel/vm/mt.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/mt_thr_config.cpp b/storage/ndb/src/kernel/vm/mt_thr_config.cpp
index df045fefe646..d685076a7da1 100644
--- a/storage/ndb/src/kernel/vm/mt_thr_config.cpp
+++ b/storage/ndb/src/kernel/vm/mt_thr_config.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/mt_thr_config.hpp b/storage/ndb/src/kernel/vm/mt_thr_config.hpp
index 198c0fb44ee9..17e216cf4c7e 100644
--- a/storage/ndb/src/kernel/vm/mt_thr_config.hpp
+++ b/storage/ndb/src/kernel/vm/mt_thr_config.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
index bb5906ff0076..90731e55e00b 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc.hpp b/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
index f250864a8eeb..e50bcd418637 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
index 689946cfe3bc..67541ea7a47e 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
index a9a414c3c870..f425de4484e0 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/pc.hpp b/storage/ndb/src/kernel/vm/pc.hpp
index 0008a5d81bde..a8aa7e41e68f 100644
--- a/storage/ndb/src/kernel/vm/pc.hpp
+++ b/storage/ndb/src/kernel/vm/pc.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testCopy/Makefile b/storage/ndb/src/kernel/vm/testCopy/Makefile
index 68504858bb3e..409a1b3dbafa 100644
--- a/storage/ndb/src/kernel/vm/testCopy/Makefile
+++ b/storage/ndb/src/kernel/vm/testCopy/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testCopy/rr.cpp b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
index 133d3b63b86b..aff2618c9a10 100644
--- a/storage/ndb/src/kernel/vm/testCopy/rr.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
index 5dce31fc658b..ae892a104acf 100644
--- a/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testDataBuffer/Makefile b/storage/ndb/src/kernel/vm/testDataBuffer/Makefile
index 5ef8d9039458..a2a7e83a4fdf 100644
--- a/storage/ndb/src/kernel/vm/testDataBuffer/Makefile
+++ b/storage/ndb/src/kernel/vm/testDataBuffer/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
index 619415a2718c..5f9343bc38d9 100644
--- a/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
+++ b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
index d21620fb6f84..5c0e47ca8770 100644
--- a/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
+++ b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
index d15887edb422..882fb8133a3f 100644
--- a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
+++ b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
index 3523add12293..d33a27c04dd5 100644
--- a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
+++ b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/testSuperPool.cpp b/storage/ndb/src/kernel/vm/testSuperPool.cpp
index f9a7f9f2697e..ad688139d11a 100644
--- a/storage/ndb/src/kernel/vm/testSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/testSuperPool.cpp
@@ -7,16 +7,23 @@ exit $?
 #endif
 
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/test_context.cpp b/storage/ndb/src/kernel/vm/test_context.cpp
index ecaabb4d1bf4..2a12a0aa60a4 100644
--- a/storage/ndb/src/kernel/vm/test_context.cpp
+++ b/storage/ndb/src/kernel/vm/test_context.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/kernel/vm/test_context.hpp b/storage/ndb/src/kernel/vm/test_context.hpp
index f27a7a357968..226e4f22225b 100644
--- a/storage/ndb/src/kernel/vm/test_context.hpp
+++ b/storage/ndb/src/kernel/vm/test_context.hpp
@@ -2,16 +2,23 @@
 # define TESTBLOCK_HPP
 
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/CMakeLists.txt b/storage/ndb/src/mgmapi/CMakeLists.txt
index 987c0201a148..66e931381e3c 100644
--- a/storage/ndb/src/mgmapi/CMakeLists.txt
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/LocalConfig.cpp b/storage/ndb/src/mgmapi/LocalConfig.cpp
index a03f62faebe1..820d6c25d444 100644
--- a/storage/ndb/src/mgmapi/LocalConfig.cpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/LocalConfig.hpp b/storage/ndb/src/mgmapi/LocalConfig.hpp
index 5aac038e6a15..0639405ef166 100644
--- a/storage/ndb/src/mgmapi/LocalConfig.hpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/mgmapi-t.cpp b/storage/ndb/src/mgmapi/mgmapi-t.cpp
index 1e62363c3789..d8e32df52108 100644
--- a/storage/ndb/src/mgmapi/mgmapi-t.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi-t.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp
index 742c107f007b..f4ffcae03cf9 100644
--- a/storage/ndb/src/mgmapi/mgmapi.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -797,7 +804,7 @@ ndb_mgm_connect(NdbMgmHandle handle, int no_retries,
     }
     if (my_socket_valid(sockfd))
       break;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     {
       DBUG_PRINT("info",("Unable to connect with connect string: %s",
 			 cfg.makeConnectString(buf,sizeof(buf))));
diff --git a/storage/ndb/src/mgmapi/mgmapi_configuration.cpp b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
index 989e1977968a..179a8a86671c 100644
--- a/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
    reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/mgmapi_configuration.hpp b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
index 17ca13cf5305..417289276931 100644
--- a/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/mgmapi_error.c b/storage/ndb/src/mgmapi/mgmapi_error.c
index 481bc7267112..11b6c54657a6 100644
--- a/storage/ndb/src/mgmapi/mgmapi_error.c
+++ b/storage/ndb/src/mgmapi/mgmapi_error.c
@@ -1,15 +1,22 @@
 /*
-   Copyright 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/mgmapi_internal.h b/storage/ndb/src/mgmapi/mgmapi_internal.h
index 20d6faf9d43b..b04385b64a9a 100644
--- a/storage/ndb/src/mgmapi/mgmapi_internal.h
+++ b/storage/ndb/src/mgmapi/mgmapi_internal.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/ndb_logevent.cpp b/storage/ndb/src/mgmapi/ndb_logevent.cpp
index e26e9a1753b5..7bb4e2d1973f 100644
--- a/storage/ndb/src/mgmapi/ndb_logevent.cpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/ndb_logevent.hpp b/storage/ndb/src/mgmapi/ndb_logevent.hpp
index 50f3b807b45e..6b129e801298 100644
--- a/storage/ndb/src/mgmapi/ndb_logevent.hpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/test/keso.c b/storage/ndb/src/mgmapi/test/keso.c
index 56440a102281..f8cb605198d8 100644
--- a/storage/ndb/src/mgmapi/test/keso.c
+++ b/storage/ndb/src/mgmapi/test/keso.c
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
index 12082a75abff..1e31ceab53ab 100644
--- a/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
+++ b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmclient/CMakeLists.txt b/storage/ndb/src/mgmclient/CMakeLists.txt
index d4bf52813619..c9fe4a293913 100644
--- a/storage/ndb/src/mgmclient/CMakeLists.txt
+++ b/storage/ndb/src/mgmclient/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
index 1a3893b0aa71..f4da3d5e47e3 100644
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1933,7 +1940,7 @@ CommandInterpreter::executeClusterLog(char* parameters)
       const char *str= ndb_mgm_get_event_severity_string(enabled[i].category);
       if (str == 0)
       {
-	DBUG_ASSERT(false);
+	assert(false);
 	continue;
       }
       if(enabled[i].value)
diff --git a/storage/ndb/src/mgmclient/main.cpp b/storage/ndb/src/mgmclient/main.cpp
index a742f24217ab..2b12d93e9af6 100644
--- a/storage/ndb/src/mgmclient/main.cpp
+++ b/storage/ndb/src/mgmclient/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -117,7 +124,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL, load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_mgm.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/src/mgmclient/ndb_mgmclient.hpp b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
index 3ac2a9f1559c..193ebd6e5aa7 100644
--- a/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
+++ b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmclient/test_cpcd/Makefile b/storage/ndb/src/mgmclient/test_cpcd/Makefile
index ba83ac223e76..f323dfc9120f 100644
--- a/storage/ndb/src/mgmclient/test_cpcd/Makefile
+++ b/storage/ndb/src/mgmclient/test_cpcd/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
index 15f03a62ef60..e14bad6a3b85 100644
--- a/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
+++ b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/CMakeLists.txt b/storage/ndb/src/mgmsrv/CMakeLists.txt
index c64b40ad6c59..a032891cc658 100644
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/Config.cpp b/storage/ndb/src/mgmsrv/Config.cpp
index fc142bf7604d..3c633a8a3ab7 100644
--- a/storage/ndb/src/mgmsrv/Config.cpp
+++ b/storage/ndb/src/mgmsrv/Config.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/Config.hpp b/storage/ndb/src/mgmsrv/Config.hpp
index 20ec9837c45d..e278585561f5 100644
--- a/storage/ndb/src/mgmsrv/Config.hpp
+++ b/storage/ndb/src/mgmsrv/Config.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
index 45f4fc80e4b6..46026982cd0b 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -4803,7 +4810,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
 	  break;
         }
       }
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       else
       {
         switch (ctx.m_info->getType(ctx.m_currentInfo, name)){
@@ -6081,7 +6088,7 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections,
             } 
           } 
           i_group++; 
-          DBUG_ASSERT(i_group <= replicas); 
+          assert(i_group <= replicas); 
           if (i_group == replicas) 
           { 
             unsigned c= 0; 
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.hpp b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
index 284457da09e5..f288c83e0761 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.hpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/ConfigManager.cpp b/storage/ndb/src/mgmsrv/ConfigManager.cpp
index 8fc832704990..ee793148a240 100644
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/ConfigManager.hpp b/storage/ndb/src/mgmsrv/ConfigManager.hpp
index 1bd622955974..dd97b499d722 100644
--- a/storage/ndb/src/mgmsrv/ConfigManager.hpp
+++ b/storage/ndb/src/mgmsrv/ConfigManager.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/ConfigSubscriber.hpp b/storage/ndb/src/mgmsrv/ConfigSubscriber.hpp
index eb0b161fb01f..890d9d1ea8f6 100644
--- a/storage/ndb/src/mgmsrv/ConfigSubscriber.hpp
+++ b/storage/ndb/src/mgmsrv/ConfigSubscriber.hpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/Defragger.hpp b/storage/ndb/src/mgmsrv/Defragger.hpp
index 89484dbbe0cc..2fc1251f2145 100644
--- a/storage/ndb/src/mgmsrv/Defragger.hpp
+++ b/storage/ndb/src/mgmsrv/Defragger.hpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
      All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
index 23db6c69538e..b47704fe0c24 100644
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
index 0d448a9f5c0c..4d2dcaba156a 100644
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
index 14902ec08b25..dd44ec3f0e4d 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -649,7 +656,7 @@ MgmtSrvr::configure_eventlogger(const BaseString& logdestination) const
 void
 MgmtSrvr::setClusterLog(const Config* config)
 {
-  DBUG_ASSERT(_ownNodeId);
+  assert(_ownNodeId);
 
   ConfigIter iter(config, CFG_SECTION_NODE);
   require(iter.find(CFG_NODE_ID, _ownNodeId) == 0);
@@ -3806,7 +3813,7 @@ MgmtSrvr::alloc_node_id_impl(NodeId& nodeid,
   }
 
   // nodes.size() == 0 handled inside find_node_type
-  DBUG_ASSERT(nodes.size() != 0);
+  assert(nodes.size() != 0);
 
   if (type == NDB_MGM_NODE_TYPE_MGM && nodes.size() > 1)
   {
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
index e955d7d721ab..e5b24a3b2209 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/MgmtThread.hpp b/storage/ndb/src/mgmsrv/MgmtThread.hpp
index 299931c34c11..08e3e90adaec 100644
--- a/storage/ndb/src/mgmsrv/MgmtThread.hpp
+++ b/storage/ndb/src/mgmsrv/MgmtThread.hpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp
index 64ed781dbd0f..6a4d8f3ac2f3 100644
--- a/storage/ndb/src/mgmsrv/Services.cpp
+++ b/storage/ndb/src/mgmsrv/Services.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/Services.hpp b/storage/ndb/src/mgmsrv/Services.hpp
index 787b6deb28db..e906bec3c386 100644
--- a/storage/ndb/src/mgmsrv/Services.hpp
+++ b/storage/ndb/src/mgmsrv/Services.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/main.cpp b/storage/ndb/src/mgmsrv/main.cpp
index 78cf21ea917d..8aa6a45c7ed8 100644
--- a/storage/ndb/src/mgmsrv/main.cpp
+++ b/storage/ndb/src/mgmsrv/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -206,7 +213,7 @@ static int mgmd_main(int argc, char** argv)
   defaults_argv= argv; /* Must be freed by 'free_defaults' */
 
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= IF_WIN("d:t:i:F:o,c:\\ndb_mgmd.trace",
                     "d:t:i:F:o,/tmp/ndb_mgmd.trace");
 #endif
diff --git a/storage/ndb/src/mgmsrv/mkconfig/Makefile b/storage/ndb/src/mgmsrv/mkconfig/Makefile
index a08d316c614f..1331b75a19d9 100644
--- a/storage/ndb/src/mgmsrv/mkconfig/Makefile
+++ b/storage/ndb/src/mgmsrv/mkconfig/Makefile
@@ -1,14 +1,21 @@
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
index 49338514ef9f..42bcfc73e440 100644
--- a/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
+++ b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/ndb_mgmd_error.h b/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
index 6aa18597aca6..52a5cf39c807 100644
--- a/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
+++ b/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/mgmsrv/testConfig.cpp b/storage/ndb/src/mgmsrv/testConfig.cpp
index dafe6f88fa12..d88b1ec5a4b6 100644
--- a/storage/ndb/src/mgmsrv/testConfig.cpp
+++ b/storage/ndb/src/mgmsrv/testConfig.cpp
@@ -1,15 +1,22 @@
 /*
-  Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/API.hpp b/storage/ndb/src/ndbapi/API.hpp
index 1ae19a0a696d..201f7dca0b7e 100644
--- a/storage/ndb/src/ndbapi/API.hpp
+++ b/storage/ndb/src/ndbapi/API.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/CMakeLists.txt b/storage/ndb/src/ndbapi/CMakeLists.txt
index 2364d703723f..06259a95b703 100644
--- a/storage/ndb/src/ndbapi/CMakeLists.txt
+++ b/storage/ndb/src/ndbapi/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp
index 718a913a715a..87d5b45b3701 100644
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.hpp b/storage/ndb/src/ndbapi/ClusterMgr.hpp
index e1da21002842..961bab526537 100644
--- a/storage/ndb/src/ndbapi/ClusterMgr.hpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/DictCache.cpp b/storage/ndb/src/ndbapi/DictCache.cpp
index 7aea0f9b604c..038708983ea0 100644
--- a/storage/ndb/src/ndbapi/DictCache.cpp
+++ b/storage/ndb/src/ndbapi/DictCache.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -103,7 +110,7 @@ LocalDictCache::drop(const char * name){
   ASSERT_NOT_MYSQLD;
   assert(! is_ndb_blob_table(name));
   Ndb_local_table_info *info= m_tableHash.deleteKey(name, (Uint32)strlen(name));
-  DBUG_ASSERT(info != 0);
+  assert(info != 0);
   Ndb_local_table_info::destroy(info);
 }
 
diff --git a/storage/ndb/src/ndbapi/DictCache.hpp b/storage/ndb/src/ndbapi/DictCache.hpp
index b7315314cd42..aa2b73e26f45 100644
--- a/storage/ndb/src/ndbapi/DictCache.hpp
+++ b/storage/ndb/src/ndbapi/DictCache.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp
index 2cfab0aabddc..266fee49d21d 100644
--- a/storage/ndb/src/ndbapi/Ndb.cpp
+++ b/storage/ndb/src/ndbapi/Ndb.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -435,7 +442,7 @@ Ndb::computeHash(Uint32 *retval,
       partcols[j++] = cols[i];
     }
   }
-  DBUG_ASSERT(j == parts);
+  assert(j == parts);
 
   for (Uint32 i = 0; i<parts; i++)
   {
@@ -1722,7 +1729,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table,
     theError.code = tConnection->theError.code;
   if (theError.code == 0 && tOperation != NULL)
     theError.code = tOperation->theError.code;
-  DBUG_ASSERT(theError.code != 0);
+  assert(theError.code != 0);
 
   NdbError savedError;
   savedError = theError;
diff --git a/storage/ndb/src/ndbapi/NdbApiSignal.cpp b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
index 4fcdf02799a9..a647d2096690 100644
--- a/storage/ndb/src/ndbapi/NdbApiSignal.cpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbApiSignal.hpp b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
index 362480296ab3..a314aae144b8 100644
--- a/storage/ndb/src/ndbapi/NdbApiSignal.hpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp
index d4c00569259d..446259166204 100644
--- a/storage/ndb/src/ndbapi/NdbBlob.cpp
+++ b/storage/ndb/src/ndbapi/NdbBlob.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbBlobImpl.hpp b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
index 98f551b04886..e03deb30d7ad 100644
--- a/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp
index 4fbbc7a6ac83..e9f0fc7585ec 100644
--- a/storage/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 89fc50ed8dc4..0f3f6ecac864 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -3052,7 +3059,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
   } 
   else
   {
-    DBUG_ASSERT(impl->m_fragmentCount > 0);
+    assert(impl->m_fragmentCount > 0);
   }
   DBUG_RETURN(0);
 }
@@ -4152,8 +4159,8 @@ NdbDictionaryImpl::dropTableGlobal(NdbTableImpl & impl, int flags)
 {
   int res;
   DBUG_ENTER("NdbDictionaryImpl::dropTableGlobal");
-  DBUG_ASSERT(impl.m_status != NdbDictionary::Object::New);
-  DBUG_ASSERT(impl.m_indexType == NdbDictionary::Object::TypeUndefined);
+  assert(impl.m_status != NdbDictionary::Object::New);
+  assert(impl.m_indexType == NdbDictionary::Object::TypeUndefined);
 
   List list;
   if ((res = listDependentObjects(list, impl.m_id)) == -1){
@@ -8932,7 +8939,7 @@ NdbDictInterface::create_fk(const NdbForeignKeyImpl& src,
     fk.ChildColumns[i] = src.m_child_columns[i];
   fk.ChildColumnsLength = 4 * src.m_child_columns.size(); // bytes :(
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     char buf[2048];
     ndbout_print(fk, buf, sizeof(buf));
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
index a41e3393e381..d019a23daeee 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1434,7 +1441,7 @@ class InitIndex : public GlobalCacheInitObject
   
   int init(NdbDictionaryImpl *dict, NdbTableImpl &tab) const {
     DBUG_ENTER("InitIndex::init");
-    DBUG_ASSERT(tab.m_indexType != NdbDictionary::Object::TypeUndefined);
+    assert(tab.m_indexType != NdbDictionary::Object::TypeUndefined);
     /**
      * Create index impl
      */
diff --git a/storage/ndb/src/ndbapi/NdbErrorOut.cpp b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
index 381bf652ff7d..6ef722e2c5d9 100644
--- a/storage/ndb/src/ndbapi/NdbErrorOut.cpp
+++ b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbEventOperation.cpp b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
index f059dd4ab5bf..c81980ef18e4 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 74ec9e11a711..826f8f87725b 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -3940,7 +3947,7 @@ EventBufData_list::add_gci_op(Gci_op g)
       m_gci_op_alloc = n;
     }
     assert(m_gci_op_count < m_gci_op_alloc);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     i = m_gci_op_count;
 #endif
     m_gci_op_list[m_gci_op_count++] = g;
@@ -4113,7 +4120,7 @@ NdbEventBuffer::dropEventOperation(NdbEventOperation* tOp)
   
   assert(m_ndb->theImpl->m_ev_op == 0 || m_ndb->theImpl->m_ev_op->m_prev == 0);
   
-  DBUG_ASSERT(op->m_ref_count > 0);
+  assert(op->m_ref_count > 0);
   // remove user reference
   // added in createEventOperation
   // user error to use reference after this
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
index 7dc3f85d1966..1f293951d148 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbImpl.hpp b/storage/ndb/src/ndbapi/NdbImpl.hpp
index 1885bb0b122e..d50489a59081 100644
--- a/storage/ndb/src/ndbapi/NdbImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbIndexOperation.cpp b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
index 16fe78935660..6877e4f67c77 100644
--- a/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -62,7 +69,7 @@ NdbIndexOperation::indxInit(const NdbIndexImpl * anIndex,
     setErrorCodeAbort(4003);
     return -1;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   m_theIndex = anIndex;
diff --git a/storage/ndb/src/ndbapi/NdbIndexStat.cpp b/storage/ndb/src/ndbapi/NdbIndexStat.cpp
index 0e9f7fefc88d..afeed31c1aa3 100644
--- a/storage/ndb/src/ndbapi/NdbIndexStat.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexStat.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -593,7 +600,7 @@ NdbIndexStat::query_stat(const Range& range_f, Stat& stat_f)
   NdbIndexStatImpl::Bound& bound2 =
     *(NdbIndexStatImpl::Bound*)bound2_f.m_impl;
   NdbIndexStatImpl::Range range(bound1, bound2);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   const uint sz = 8000;
   char buf[sz];
   DBUG_PRINT("index_stat", ("lo: %s", bound1.m_bound.print(buf, sz)));
@@ -629,7 +636,7 @@ NdbIndexStat::get_rir(const Stat& stat_f, double* rir)
     x = 1.0;
   require(rir != 0);
   *rir = x;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[100];
   sprintf(buf, "%.2f", *rir);
 #endif
@@ -648,7 +655,7 @@ NdbIndexStat::get_rpk(const Stat& stat_f, Uint32 k, double* rpk)
     x = 1.0;
   require(rpk != 0);
   *rpk = x;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   char buf[100];
   sprintf(buf, "%.2f", *rpk);
 #endif
diff --git a/storage/ndb/src/ndbapi/NdbIndexStatFrmData.cpp b/storage/ndb/src/ndbapi/NdbIndexStatFrmData.cpp
index efcbcbaa56cc..3b3b15463fbd 100644
--- a/storage/ndb/src/ndbapi/NdbIndexStatFrmData.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexStatFrmData.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
index fbfa090d9a1a..39a795de6798 100644
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp b/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
index d75394d6aa3d..b8bafd49d868 100644
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfo.cpp b/storage/ndb/src/ndbapi/NdbInfo.cpp
index ad285250d001..fb2c64af731f 100644
--- a/storage/ndb/src/ndbapi/NdbInfo.cpp
+++ b/storage/ndb/src/ndbapi/NdbInfo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfo.hpp b/storage/ndb/src/ndbapi/NdbInfo.hpp
index 0aa3153a0428..b734f40dc61b 100644
--- a/storage/ndb/src/ndbapi/NdbInfo.hpp
+++ b/storage/ndb/src/ndbapi/NdbInfo.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp b/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp
index 85dcef01aa89..0854318f7699 100644
--- a/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp
+++ b/storage/ndb/src/ndbapi/NdbInfoRecAttr.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoScanNodes.cpp b/storage/ndb/src/ndbapi/NdbInfoScanNodes.cpp
index a76043485781..089ddde2f132 100644
--- a/storage/ndb/src/ndbapi/NdbInfoScanNodes.cpp
+++ b/storage/ndb/src/ndbapi/NdbInfoScanNodes.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoScanNodes.hpp b/storage/ndb/src/ndbapi/NdbInfoScanNodes.hpp
index 325e7090d7fc..e2d69f3e1078 100644
--- a/storage/ndb/src/ndbapi/NdbInfoScanNodes.hpp
+++ b/storage/ndb/src/ndbapi/NdbInfoScanNodes.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoScanOperation.hpp b/storage/ndb/src/ndbapi/NdbInfoScanOperation.hpp
index c79efa590fec..f0d7a088201e 100644
--- a/storage/ndb/src/ndbapi/NdbInfoScanOperation.hpp
+++ b/storage/ndb/src/ndbapi/NdbInfoScanOperation.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoScanVirtual.cpp b/storage/ndb/src/ndbapi/NdbInfoScanVirtual.cpp
index 15815d2c7a7b..fd49262bce80 100644
--- a/storage/ndb/src/ndbapi/NdbInfoScanVirtual.cpp
+++ b/storage/ndb/src/ndbapi/NdbInfoScanVirtual.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInfoScanVirtual.hpp b/storage/ndb/src/ndbapi/NdbInfoScanVirtual.hpp
index f29cf6eafdf5..30c4e9a414f4 100644
--- a/storage/ndb/src/ndbapi/NdbInfoScanVirtual.hpp
+++ b/storage/ndb/src/ndbapi/NdbInfoScanVirtual.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp b/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
index 27e10db4069f..fdd3ea226ba0 100644
--- a/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
+++ b/storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbLinHash.hpp b/storage/ndb/src/ndbapi/NdbLinHash.hpp
index 6d90b295bc51..4d5526ffb880 100644
--- a/storage/ndb/src/ndbapi/NdbLinHash.hpp
+++ b/storage/ndb/src/ndbapi/NdbLinHash.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperation.cpp b/storage/ndb/src/ndbapi/NdbOperation.cpp
index 56ffbdb7bd0f..3c1d2d982e1e 100644
--- a/storage/ndb/src/ndbapi/NdbOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
index e3a28546af6b..062efd8878b6 100644
--- a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
index a616ddc81a08..c6d2f58b0493 100644
--- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperationInt.cpp b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
index 87c0b5a7abe1..ee99d5d0baeb 100644
--- a/storage/ndb/src/ndbapi/NdbOperationInt.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperationScan.cpp b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
index 46d47d2d96b8..81aca4a58fa1 100644
--- a/storage/ndb/src/ndbapi/NdbOperationScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbOperationSearch.cpp b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
index 9a4f10bf74ba..346161fbb8bb 100644
--- a/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbPool.cpp b/storage/ndb/src/ndbapi/NdbPool.cpp
index 027599ea4b90..6145f06bbde8 100644
--- a/storage/ndb/src/ndbapi/NdbPool.cpp
+++ b/storage/ndb/src/ndbapi/NdbPool.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbPoolImpl.cpp b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
index a0b13d4caeff..cdf707ce4b48 100644
--- a/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -279,8 +286,8 @@ NdbPool::return_ndb_object(Ndb* returned_ndb, Uint32 id)
       pool_cond = input_pool_cond;
     }
     add_wait_list(id);
-    NdbMutex_Unlock(pool_mutex);
     NdbCondition_Signal(pool_cond);
+    NdbMutex_Unlock(pool_mutex);
   } else {
     add_free_list(id);
     add_db_hash(id);
diff --git a/storage/ndb/src/ndbapi/NdbPoolImpl.hpp b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
index 8a628663ed17..8bd549a70e62 100644
--- a/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
index 262dfb66f5e7..abbdec0799cd 100644
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1135,7 +1142,7 @@ NdbQueryBuilderImpl::~NdbQueryBuilderImpl()
 
 void NdbQueryBuilderImpl::setErrorCode(int aErrorCode)
 { 
-  DBUG_ASSERT(aErrorCode != 0);
+  assert(aErrorCode != 0);
   m_error.code = aErrorCode;
   m_hasError = true;
 }
@@ -1498,7 +1505,7 @@ NdbGenericConstOperandImpl::convert2ColumnType()
   }
   else
   {
-    DBUG_ASSERT(0);
+    assert(0);
   }
 
   memcpy (dst, m_value, len);
diff --git a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
index cc3ff0016239..88ed0d29f26a 100644
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
index 9a46eb176bf7..5d43b0e361c0 100644
--- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp
index f3caa63738ae..27d32702c985 100644
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1652,7 +1659,7 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
         return QRY_PARAMETER_HAS_WRONG_TYPE;
       
       len = static_cast<Uint32>(sizeof(m_value.uint16));
-      DBUG_ASSERT(len == maxSize);
+      assert(len == maxSize);
       dst.appendBytes(&m_value.uint16, len);
       break;
 
@@ -1662,7 +1669,7 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
         return QRY_PARAMETER_HAS_WRONG_TYPE;
 
       len = static_cast<Uint32>(sizeof(m_value.uint32));
-      DBUG_ASSERT(len == maxSize);
+      assert(len == maxSize);
       dst.appendBytes(&m_value.uint32, len);
       break;
 
@@ -1672,7 +1679,7 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
         return QRY_PARAMETER_HAS_WRONG_TYPE;
 
       len = static_cast<Uint32>(sizeof(m_value.uint64));
-      DBUG_ASSERT(len == maxSize);
+      assert(len == maxSize);
       dst.appendBytes(&m_value.uint64, len);
       break;
 
@@ -1681,7 +1688,7 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
         return QRY_PARAMETER_HAS_WRONG_TYPE;
 
       len = static_cast<Uint32>(sizeof(m_value.dbl));
-      DBUG_ASSERT(len == maxSize);
+      assert(len == maxSize);
       dst.appendBytes(&m_value.dbl, len);
       break;
 
@@ -1710,8 +1717,8 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
       {
         len  = 1+*((Uint8*)(m_value.raw));
 
-        DBUG_ASSERT(column.getType() == NdbDictionary::Column::Varchar ||
-                    column.getType() == NdbDictionary::Column::Varbinary);
+        assert(column.getType() == NdbDictionary::Column::Varchar ||
+               column.getType() == NdbDictionary::Column::Varbinary);
         if (unlikely(len > 1+static_cast<Uint32>(column.getLength())))
           return QRY_CHAR_PARAMETER_TRUNCATED;
 
@@ -1721,15 +1728,15 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
       {
         len  = 2+uint2korr((Uint8*)m_value.raw);
 
-        DBUG_ASSERT(column.getType() == NdbDictionary::Column::Longvarchar ||
-                    column.getType() == NdbDictionary::Column::Longvarbinary);
+        assert(column.getType() == NdbDictionary::Column::Longvarchar ||
+               column.getType() == NdbDictionary::Column::Longvarbinary);
         if (unlikely(len > 2+static_cast<Uint32>(column.getLength())))
           return QRY_CHAR_PARAMETER_TRUNCATED;
         dst.appendBytes(m_value.raw, len);
       }
       else
       {
-        DBUG_ASSERT(0);
+        assert(0);
       }
       break;
 
@@ -1738,8 +1745,8 @@ NdbQueryParamValue::serializeValue(const class NdbColumnImpl& column,
       if (unlikely(column.m_arrayType != NDB_ARRAYTYPE_SHORT_VAR))
         return QRY_PARAMETER_HAS_WRONG_TYPE;
 
-      DBUG_ASSERT(column.getType() == NdbDictionary::Column::Varchar ||
-                  column.getType() == NdbDictionary::Column::Varbinary);
+      assert(column.getType() == NdbDictionary::Column::Varchar ||
+             column.getType() == NdbDictionary::Column::Varbinary);
 
       {
         // Convert from two-byte to one-byte length field.
diff --git a/storage/ndb/src/ndbapi/NdbQueryOperation.hpp b/storage/ndb/src/ndbapi/NdbQueryOperation.hpp
index e12ce1f72ac7..8a2929bf3ab4 100644
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.hpp
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
index 5c97a409d7a5..6a634cce6d1d 100644
--- a/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbRecAttr.cpp b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
index abeb21dd0bf4..f8214d01fdb3 100644
--- a/storage/ndb/src/ndbapi/NdbRecAttr.cpp
+++ b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbReceiver.cpp b/storage/ndb/src/ndbapi/NdbReceiver.cpp
index 48f27843b9a3..b22483268d91 100644
--- a/storage/ndb/src/ndbapi/NdbReceiver.cpp
+++ b/storage/ndb/src/ndbapi/NdbReceiver.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbRecord.hpp b/storage/ndb/src/ndbapi/NdbRecord.hpp
index cb390ad0717f..f5e5f3d264dc 100644
--- a/storage/ndb/src/ndbapi/NdbRecord.hpp
+++ b/storage/ndb/src/ndbapi/NdbRecord.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
index b460e84b5017..22f8ba43ed19 100644
--- a/storage/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
index 7f43f7f9af35..dda89f6b3c47 100644
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp
index ec76f2eb3bab..72da5686f716 100644
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -704,7 +711,7 @@ NdbTransaction::executeAsynchPrepare(NdbTransaction::ExecType aTypeOfExec,
   /**
    * Reset error.code on execute
    */
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (theError.code != 0)
     DBUG_PRINT("enter", ("Resetting error %d on execute", theError.code));
 #endif
diff --git a/storage/ndb/src/ndbapi/NdbTransactionScan.cpp b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
index 5390c5032620..efafd23ea648 100644
--- a/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbUtil.cpp b/storage/ndb/src/ndbapi/NdbUtil.cpp
index 5670ebe2b04c..1ba3f5fb110e 100644
--- a/storage/ndb/src/ndbapi/NdbUtil.cpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbUtil.hpp b/storage/ndb/src/ndbapi/NdbUtil.hpp
index 4f4d6d7e80c9..8d4434081c32 100644
--- a/storage/ndb/src/ndbapi/NdbUtil.hpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbWaitGroup.cpp b/storage/ndb/src/ndbapi/NdbWaitGroup.cpp
index 21f2904d4d6e..ebcd1fe9845e 100644
--- a/storage/ndb/src/ndbapi/NdbWaitGroup.cpp
+++ b/storage/ndb/src/ndbapi/NdbWaitGroup.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbWaitGroup.hpp b/storage/ndb/src/ndbapi/NdbWaitGroup.hpp
index 3622a3b91211..66efa2c8d879 100644
--- a/storage/ndb/src/ndbapi/NdbWaitGroup.hpp
+++ b/storage/ndb/src/ndbapi/NdbWaitGroup.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/NdbWaiter.hpp b/storage/ndb/src/ndbapi/NdbWaiter.hpp
index 3d7f4bca0b4f..9ec50f6235c9 100644
--- a/storage/ndb/src/ndbapi/NdbWaiter.hpp
+++ b/storage/ndb/src/ndbapi/NdbWaiter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/Ndberr.cpp b/storage/ndb/src/ndbapi/Ndberr.cpp
index a9cac232f694..79c45b64e94c 100644
--- a/storage/ndb/src/ndbapi/Ndberr.cpp
+++ b/storage/ndb/src/ndbapi/Ndberr.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/Ndbif.cpp b/storage/ndb/src/ndbapi/Ndbif.cpp
index fc30c31b2d4b..baa152c04d45 100644
--- a/storage/ndb/src/ndbapi/Ndbif.cpp
+++ b/storage/ndb/src/ndbapi/Ndbif.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -38,7 +45,7 @@
 #include <ndb_limits.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #include <NdbSleep.h>
 #endif
 #include <EventLogger.hpp>
@@ -79,7 +86,7 @@ Ndb::init(int aMaxNoOfTransactions)
 
   const Uint32 tRef = theImpl->open(theFacade);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if(DBUG_EVALUATE_IF("sleep_in_ndbinit", true, false))
   {
     fprintf(stderr, "Ndb::init() (%p) taking a break\n", this);
@@ -1373,7 +1380,7 @@ Ndb::check_send_timeout()
   const Uint32 timeout = theImpl->get_ndbapi_config_parameters().m_waitfor_timeout;
   const Uint64 current_time = NdbTick_CurrentMillisecond();
   assert(current_time >= the_last_check_time);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if(DBUG_EVALUATE_IF("early_trans_timeout", true, false))
   {
     fprintf(stderr, "Forcing immediate timeout check in Ndb::check_send_timeout()\n");
@@ -1385,7 +1392,7 @@ Ndb::check_send_timeout()
     Uint32 no_of_sent = theNoOfSentTransactions;
     for (Uint32 i = 0; i < no_of_sent; i++) {
       NdbTransaction* a_con = theSentTransactionsArray[i];
-#ifndef DBUG_OFF
+#ifndef NDEBUG
       if(DBUG_EVALUATE_IF("early_trans_timeout", true, false))
       {
         fprintf(stderr, "Inducing early timeout in Ndb::check_send_timeout()\n");
@@ -1589,7 +1596,7 @@ Ndb::waitCompletedTransactions(int aMilliSecondsToWait,
     const NDB_TICKS now = NdbTick_getCurrentTicks();
     waitTime = aMilliSecondsToWait - 
       (int)NdbTick_Elapsed(start,now).milliSec();
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     if(DBUG_EVALUATE_IF("early_trans_timeout", true, false))
     {
       fprintf(stderr, "Inducing early timeout in Ndb::waitCompletedTransactions()\n");
diff --git a/storage/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp
index b2268ecf9a9a..bc86a6e292d8 100644
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/Ndblist.cpp b/storage/ndb/src/ndbapi/Ndblist.cpp
index 7c4676c4348e..39bf367b1cbb 100644
--- a/storage/ndb/src/ndbapi/Ndblist.cpp
+++ b/storage/ndb/src/ndbapi/Ndblist.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -31,12 +38,12 @@ Ndb::checkFailedNode()
 
   DBUG_PRINT("enter", ("theNoOfDBnodes: %d", tNoOfDbNodes));
 
-  DBUG_ASSERT(tNoOfDbNodes < MAX_NDB_NODES);
+  assert(tNoOfDbNodes < MAX_NDB_NODES);
   for (Uint32 i = 0; i < tNoOfDbNodes; i++){
     const NodeId node_id = theDBnodes[i];
     DBUG_PRINT("info", ("i: %d, node_id: %d", i, node_id));
     
-    DBUG_ASSERT(node_id < MAX_NDB_NODES);    
+    assert(node_id < MAX_NDB_NODES);    
     if (the_release_ind[node_id] == 1){
 
       /**
diff --git a/storage/ndb/src/ndbapi/ObjectMap.cpp b/storage/ndb/src/ndbapi/ObjectMap.cpp
index 06f3eaf6d500..9e4fd6ec6ad9 100644
--- a/storage/ndb/src/ndbapi/ObjectMap.cpp
+++ b/storage/ndb/src/ndbapi/ObjectMap.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ObjectMap.hpp b/storage/ndb/src/ndbapi/ObjectMap.hpp
index fcb1b3375908..0e24933613a5 100644
--- a/storage/ndb/src/ndbapi/ObjectMap.hpp
+++ b/storage/ndb/src/ndbapi/ObjectMap.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/SignalSender.cpp b/storage/ndb/src/ndbapi/SignalSender.cpp
index f44af3be9e5b..8d59e8941760 100644
--- a/storage/ndb/src/ndbapi/SignalSender.cpp
+++ b/storage/ndb/src/ndbapi/SignalSender.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/SignalSender.hpp b/storage/ndb/src/ndbapi/SignalSender.hpp
index 1cf213872d5b..64b449faf485 100644
--- a/storage/ndb/src/ndbapi/SignalSender.hpp
+++ b/storage/ndb/src/ndbapi/SignalSender.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/TransporterFacade.cpp b/storage/ndb/src/ndbapi/TransporterFacade.cpp
index 87d33b303351..9e390f2daf5f 100644
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -177,7 +184,7 @@ setSignalLog(){
   } else if(tmp !=0){
     if (strcmp(tmp, "-") == 0)
         signalLogger.setOutputStream(stdout);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     else if (strcmp(tmp, "+") == 0)
         signalLogger.setOutputStream(DBUG_FILE);
 #endif
diff --git a/storage/ndb/src/ndbapi/TransporterFacade.hpp b/storage/ndb/src/ndbapi/TransporterFacade.hpp
index 5a7331178753..39c4d9a8fd7d 100644
--- a/storage/ndb/src/ndbapi/TransporterFacade.hpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/WakeupHandler.cpp b/storage/ndb/src/ndbapi/WakeupHandler.cpp
index 3228de6b4736..bf8b9e39986d 100644
--- a/storage/ndb/src/ndbapi/WakeupHandler.cpp
+++ b/storage/ndb/src/ndbapi/WakeupHandler.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/WakeupHandler.hpp b/storage/ndb/src/ndbapi/WakeupHandler.hpp
index 34123a6e7731..36fe0fe2dee1 100644
--- a/storage/ndb/src/ndbapi/WakeupHandler.hpp
+++ b/storage/ndb/src/ndbapi/WakeupHandler.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
index 3fd95e89c6d7..1c200df7b2c5 100644
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1042,7 +1049,7 @@ void Ndb_cluster_connection_impl::connect_thread()
       break;
     if (r == -1) {
       printf("Ndb_cluster_connection::connect_thread error\n");
-      DBUG_ASSERT(false);
+      assert(false);
       m_run_connect_thread= 0;
     } else {
       // Wait before making a new connect attempt
diff --git a/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
index a416220b8726..46442f2a49de 100644
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ndb_internal.cpp b/storage/ndb/src/ndbapi/ndb_internal.cpp
index dc4f33720d1e..457e89234d99 100644
--- a/storage/ndb/src/ndbapi/ndb_internal.cpp
+++ b/storage/ndb/src/ndbapi/ndb_internal.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ndb_internal.hpp b/storage/ndb/src/ndbapi/ndb_internal.hpp
index c2d1ca8ba0c3..f1d12b787f76 100644
--- a/storage/ndb/src/ndbapi/ndb_internal.hpp
+++ b/storage/ndb/src/ndbapi/ndb_internal.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index 380a8a757857..10b28c8ebb9b 100644
--- a/storage/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/ndberror_check.cpp b/storage/ndb/src/ndbapi/ndberror_check.cpp
index 68e7eaa949c4..15c616dbce9e 100644
--- a/storage/ndb/src/ndbapi/ndberror_check.cpp
+++ b/storage/ndb/src/ndbapi/ndberror_check.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_buffer.cpp b/storage/ndb/src/ndbapi/trp_buffer.cpp
index 02c958cd99b2..f08f9634d5cf 100644
--- a/storage/ndb/src/ndbapi/trp_buffer.cpp
+++ b/storage/ndb/src/ndbapi/trp_buffer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_buffer.hpp b/storage/ndb/src/ndbapi/trp_buffer.hpp
index dda4ceb86081..2f524f2414f2 100644
--- a/storage/ndb/src/ndbapi/trp_buffer.hpp
+++ b/storage/ndb/src/ndbapi/trp_buffer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_client.cpp b/storage/ndb/src/ndbapi/trp_client.cpp
index f052ced891cf..a17a6b23c94c 100644
--- a/storage/ndb/src/ndbapi/trp_client.cpp
+++ b/storage/ndb/src/ndbapi/trp_client.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_client.hpp b/storage/ndb/src/ndbapi/trp_client.hpp
index 5f79858cf7fc..21f8cc5e11d4 100644
--- a/storage/ndb/src/ndbapi/trp_client.hpp
+++ b/storage/ndb/src/ndbapi/trp_client.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_node.cpp b/storage/ndb/src/ndbapi/trp_node.cpp
index af06a3b09052..93b9943214a8 100644
--- a/storage/ndb/src/ndbapi/trp_node.cpp
+++ b/storage/ndb/src/ndbapi/trp_node.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbapi/trp_node.hpp b/storage/ndb/src/ndbapi/trp_node.hpp
index f590e9007b80..1c39db68d167 100644
--- a/storage/ndb/src/ndbapi/trp_node.hpp
+++ b/storage/ndb/src/ndbapi/trp_node.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbclient_exports.cpp b/storage/ndb/src/ndbclient_exports.cpp
index 3fafc55e87a4..1747dad0df10 100644
--- a/storage/ndb/src/ndbclient_exports.cpp
+++ b/storage/ndb/src/ndbclient_exports.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbclient_link_test.cpp b/storage/ndb/src/ndbclient_link_test.cpp
index e74905bbad7f..1c71b4c66ed7 100644
--- a/storage/ndb/src/ndbclient_link_test.cpp
+++ b/storage/ndb/src/ndbclient_link_test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/CMakeLists.txt b/storage/ndb/src/ndbjtie/CMakeLists.txt
index 3eca3a6a31a0..1140dd6d9f22 100644
--- a/storage/ndb/src/ndbjtie/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/MysqlUtilsWrapper.hpp b/storage/ndb/src/ndbjtie/MysqlUtilsWrapper.hpp
index 70bf1fc35354..e49f28e22703 100644
--- a/storage/ndb/src/ndbjtie/MysqlUtilsWrapper.hpp
+++ b/storage/ndb/src/ndbjtie/MysqlUtilsWrapper.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/NdbApiWrapper.hpp b/storage/ndb/src/ndbjtie/NdbApiWrapper.hpp
index 0b91c8439514..c518ded08502 100644
--- a/storage/ndb/src/ndbjtie/NdbApiWrapper.hpp
+++ b/storage/ndb/src/ndbjtie/NdbApiWrapper.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mgmapi/MGMAPI.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mgmapi/MGMAPI.java
index aec3e3a57036..5b3a6d5130ea 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mgmapi/MGMAPI.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mgmapi/MGMAPI.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMap.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMap.java
index 14658415ff8d..11976ca0c5b8 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMap.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMap.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMapConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMapConst.java
index 537696e67427..e691777445cd 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMapConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/CharsetMapConst.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/Utils.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/Utils.java
index cc3491a37ff9..e513404d9071 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/Utils.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/mysql/Utils.java
@@ -1,14 +1,21 @@
 /*
- *  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java
index 6340396c88a7..991fdacd9dcc 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPI.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java
index 02698b0f0550..43b2c3cb9b30 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NDBAPIConst.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java
index 9b42b0ad5cb1..7d0e6917624e 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlob.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlob.java
index be9a82864bc7..7f41e86f58cd 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlob.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlob.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlobConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlobConst.java
index b2e21ef2af68..fa36b3129394 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlobConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbBlobConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbConst.java
index 3c504260a942..30f31d3b4bea 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java
index 0620ec7d5f63..b1be3672a40d 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbDictionary.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbError.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbError.java
index 14b0c7f19fd1..a9abd0a88dee 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbError.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbError.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbErrorConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbErrorConst.java
index 07b57fc3be36..8f1e2ff53d7c 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbErrorConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbErrorConst.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperation.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperation.java
index 3b9c4ea0421b..f2c589216104 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperation.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperation.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperationConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperationConst.java
index a4c049e9692a..c583eecab1bc 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperationConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbEventOperationConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperation.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperation.java
index 16295fe91706..f1eefa206cea 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperation.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperation.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperationConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperationConst.java
index bee75f6a1ee4..c7a89e6ccfc6 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperationConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexOperationConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java
index c7f1edb3bd7d..1ab324c7fe17 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperation.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperationConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperationConst.java
index b25737675230..17ded5f3e8b8 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperationConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbIndexScanOperationConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java
index fda3bb9827ad..58bf4b9a641a 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCode.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCodeConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCodeConst.java
index 03b3fd29c391..31736495991f 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCodeConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbInterpretedCodeConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandle.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandle.java
index 92f733a5243c..a2ec9e2e04e2 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandle.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandle.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandleConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandleConst.java
index bf68ac899870..575c336fa7ac 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandleConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbLockHandleConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java
index 4faf43febc4f..bdeb65de7476 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperation.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java
index 39e9499eee94..6af4ab51a500 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbOperationConst.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttr.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttr.java
index 530e2f7e9f59..e5c18da17f35 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttr.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttr.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttrConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttrConst.java
index 4a8a99e1a2d9..a05f231a1c5d 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttrConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecAttrConst.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecord.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecord.java
index bad9d9c07639..46e01361ba93 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecord.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecord.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecordConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecordConst.java
index 605943ba0d33..b0f14c4cb055 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecordConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbRecordConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilter.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilter.java
index 62ffb0d45c7f..41a18ae2afcf 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilter.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilter.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilterConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilterConst.java
index aef285b0ee4e..b38b61770e3d 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilterConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanFilterConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java
index f5cfc64dfc8c..8df28c7b2cb2 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperation.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperationConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperationConst.java
index 00966f64921b..9d8e478c692c 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperationConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbScanOperationConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java
index dab3ed9da1ec..4daa72bb804b 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransaction.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransactionConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransactionConst.java
index 748b9593f562..d7bde6a168e2 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransactionConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/NdbTransactionConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java
index 92b334547981..7d7cfcd23779 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connection.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connectionConst.java b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connectionConst.java
index c8efebb0ffce..34d459eda17e 100644
--- a/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connectionConst.java
+++ b/storage/ndb/src/ndbjtie/com/mysql/ndbjtie/ndbapi/Ndb_cluster_connectionConst.java
@@ -1,15 +1,22 @@
 /*
-  Copyright 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt b/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt
index 88c11a732eba..b200bfdd481d 100644
--- a/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/jtie/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/ArrayWrapper.java b/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/ArrayWrapper.java
index a4d57cd77c49..f52246b05259 100644
--- a/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/ArrayWrapper.java
+++ b/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/ArrayWrapper.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/Wrapper.java b/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/Wrapper.java
index e7bf983dac30..65b298ee520a 100644
--- a/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/Wrapper.java
+++ b/storage/ndb/src/ndbjtie/jtie/com/mysql/jtie/Wrapper.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie.hpp b/storage/ndb/src/ndbjtie/jtie/jtie.hpp
index 6f55963bdc61..a9bc12bf47a6 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_gcalls.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_gcalls.hpp
index 38387b070751..bb6c73b5fae4 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_gcalls.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_gcalls.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_lib.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_lib.hpp
index bd50c0c33b2e..503e28785a47 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_lib.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_lib.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_stdint.h b/storage/ndb/src/ndbjtie/jtie/jtie_stdint.h
index bf4a52d5722d..81f8cf560e19 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_stdint.h
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_stdint.h
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv.hpp
index 6498a51b94ac..8df6d3306fe9 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp
index 177d5daf0e08..dd7747e69fe4 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_array_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum.hpp
index 486592070de1..28e4074cb043 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum_impl.hpp
index 73dc96f92e5f..703645f225d7 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_enum_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
index cf680ecf06ea..f6d7fabb0cca 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl.hpp
index b658bf029142..494862803f0d 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl_default.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl_default.hpp
index 9c2181f152b5..45629acfd13a 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl_default.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_impl_default.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object.hpp
index 984e9e498cb4..31318944a427 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object_impl.hpp
index d822dbadba89..68cbfca8da26 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_object_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb.hpp
index f4ddd32ed10e..34bf88cd7c9e 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb_impl.hpp
index 735538eb8a48..dc9aa9dad3fc 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbybb_impl.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval.hpp
index 6000795a79ab..909df6d66242 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval_impl.hpp
index 5ae7a6b05124..98fceb0c6123 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_ptrbyval_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb.hpp
index ae2329cfe2b5..e877a06bf3d3 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb_impl.hpp
index 2dcd868fae39..f289ab137905 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbybb_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval.hpp
index fcab8f2763d1..cce2ba8daf1b 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval_impl.hpp
index bea3ebc27c14..3e18db9cef19 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_refbyval_impl.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string.hpp
index e441374b86a0..b51a02a4f29b 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string_impl.hpp
index 21c27018b07a..12fabc83355e 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_string_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_utils_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_utils_impl.hpp
index 95ae446724b8..f038bab88085 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_utils_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_utils_impl.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value.hpp
index 41217ce28d58..70937e109b08 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value_impl.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value_impl.hpp
index 76fa235a9931..c24fb76a8eee 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value_impl.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_value_impl.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_vwidth.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_vwidth.hpp
index 3fbaea89a215..1c309ed00559 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_vwidth.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_vwidth.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_xwidth.hpp b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_xwidth.hpp
index 2557cbcd3f5b..b614973af8e8 100644
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_xwidth.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_xwidth.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt b/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt
index ff0166d351a1..4086b3055489 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/jtie/test/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.alt b/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.alt
index c76ce746fdf5..5b67c806e188 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.alt
+++ b/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.alt
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.cpp b/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.cpp
index 80e2276d317d..5a54ad724fbc 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.cpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/jtie_unit_tests-t.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/CMakeLists.txt b/storage/ndb/src/ndbjtie/jtie/test/myapi/CMakeLists.txt
index 5d474111e939..0ec787136ebc 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp
index 2bd739e6dea4..09ef3a42d045 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2014 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.hpp b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.hpp
index f139448b5566..58b4b9f6b3f6 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test.cpp b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test.cpp
index 6063c8d5e89c..c92602f957f9 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test.cpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/myapi_test.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.cmd.in b/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.cmd.in
index 521e0849fed6..59b8cbb2ad32 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.cmd.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.sh.in b/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.sh.in
index 227b35a4248a..e56eb9a1ea14 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.sh.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/test_myapi.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt b/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
index a894cb9edf91..02cf1a720745 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/MyApiWrapper.hpp b/storage/ndb/src/ndbjtie/jtie/test/myjapi/MyApiWrapper.hpp
index 80995b9cf8ed..6ef813e25b74 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/MyApiWrapper.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/MyApiWrapper.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/A.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/A.java
index caec794e0ddb..d83a1a135f0f 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/A.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/A.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B0.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B0.java
index 919b90f9c733..6bd81320ebfd 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B0.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B0.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B1.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B1.java
index b341d2414be2..5a3be1301a19 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B1.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/B1.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/CI.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/CI.java
index 1a2a104c37fb..06f7fd5c9681 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/CI.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/CI.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D0.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D0.java
index d75f30894d25..5ca147dedde5 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D0.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D0.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D1.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D1.java
index 99f29f0c8371..afe8f3f0efe9 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D1.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D1.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D2.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D2.java
index 2ea3cc72a81b..7e51141638bd 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D2.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/D2.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/E.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/E.java
index fe05b3e9d611..53302da8923e 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/E.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/E.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapi.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapi.java
index c40bf005a16c..bb0addd07528 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapi.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapi.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapiCtypes.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapiCtypes.java
index 016bbd4e5185..205440c82b7c 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapiCtypes.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi/MyJapiCtypes.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.hpp b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.hpp
index 054960070bbf..720c7387f86d 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.hpp b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.hpp
index 9320b43126ba..cf01182a7c86 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_classes.hpp b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_classes.hpp
index 298cbd71702b..718e8b703579 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_classes.hpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_classes.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_lib.cpp b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_lib.cpp
index 521776556930..b47c73e2bba2 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_lib.cpp
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/myjapi_lib.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java
index 2193a04ad741..bb897ca53455 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test/MyJapiTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.cmd.in b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.cmd.in
index ef8e1665e1cf..ea118870c0f8 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.cmd.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.sh.in b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.sh.in
index d7668482ee52..7c7317bebcd2 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.sh.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/test_myjapi.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt b/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt
index 8d0d94a8c850..97924b60a402 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java b/storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java
index bf14e8776b37..b184d18e0c19 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/test/MyLoadUnloadTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.cmd.in b/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.cmd.in
index c60b0d612c0d..98b350eab74e 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.cmd.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.sh.in b/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.sh.in
index bd2b8d122444..f194968da235 100644
--- a/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.sh.in
+++ b/storage/ndb/src/ndbjtie/jtie/test/unload/test_unload.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/mgmapi_jtie.hpp b/storage/ndb/src/ndbjtie/mgmapi_jtie.hpp
index c53879901e70..5eb5a29ae1aa 100644
--- a/storage/ndb/src/ndbjtie/mgmapi_jtie.hpp
+++ b/storage/ndb/src/ndbjtie/mgmapi_jtie.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/mysql_utils_jtie.hpp b/storage/ndb/src/ndbjtie/mysql_utils_jtie.hpp
index d72eda4fc621..6a0419b42621 100644
--- a/storage/ndb/src/ndbjtie/mysql_utils_jtie.hpp
+++ b/storage/ndb/src/ndbjtie/mysql_utils_jtie.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
index 78a8df5b9e66..35383867ec9f 100644
--- a/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
+++ b/storage/ndb/src/ndbjtie/ndbapi_jtie.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/ndbjtie_defs.hpp b/storage/ndb/src/ndbjtie/ndbjtie_defs.hpp
index ab21926f2b39..a6f3eb199695 100644
--- a/storage/ndb/src/ndbjtie/ndbjtie_defs.hpp
+++ b/storage/ndb/src/ndbjtie/ndbjtie_defs.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp b/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp
index f39eee6ebf4a..17b768714758 100644
--- a/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp
+++ b/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/CMakeLists.txt b/storage/ndb/src/ndbjtie/test/CMakeLists.txt
index 41baf2561108..7379cdc96470 100644
--- a/storage/ndb/src/ndbjtie/test/CMakeLists.txt
+++ b/storage/ndb/src/ndbjtie/test/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt
index 7a510c1ca63f..283ba5e852f9 100644
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.alt
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp
index c13851962551..f541c79a24cb 100644
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests-t.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp
index 2c6f0a23b2f7..9c7139afd83d 100644
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, 2014 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp
index fc9da6ed0f88..f75217b0c8b3 100644
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_consts.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp
index d174e617d019..82a8984e9bc7 100644
--- a/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp
+++ b/storage/ndb/src/ndbjtie/test/ndbjtie_unit_tests_lib.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test/JTieTestBase.java b/storage/ndb/src/ndbjtie/test/test/JTieTestBase.java
index f2c7976275aa..bd9b6cf6f252 100644
--- a/storage/ndb/src/ndbjtie/test/test/JTieTestBase.java
+++ b/storage/ndb/src/ndbjtie/test/test/JTieTestBase.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test/MySqlUtilsTest.java b/storage/ndb/src/ndbjtie/test/test/MySqlUtilsTest.java
index c257dbab7680..026d52b591d4 100644
--- a/storage/ndb/src/ndbjtie/test/test/MySqlUtilsTest.java
+++ b/storage/ndb/src/ndbjtie/test/test/MySqlUtilsTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java b/storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java
index e09764d5eeb3..a0b7833b777b 100644
--- a/storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java
+++ b/storage/ndb/src/ndbjtie/test/test/NdbJTieConstantsTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java b/storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java
index ba186d23e934..a7a4a09a5a00 100644
--- a/storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java
+++ b/storage/ndb/src/ndbjtie/test/test/NdbJTieMultiLibTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test/NdbJTieSmokeTest.java b/storage/ndb/src/ndbjtie/test/test/NdbJTieSmokeTest.java
index bca0e8b6f19c..7bfb0f96ef4d 100644
--- a/storage/ndb/src/ndbjtie/test/test/NdbJTieSmokeTest.java
+++ b/storage/ndb/src/ndbjtie/test/test/NdbJTieSmokeTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_mutils.cmd.in b/storage/ndb/src/ndbjtie/test/test_mutils.cmd.in
index 11546277c999..72d1e1b955fe 100644
--- a/storage/ndb/src/ndbjtie/test/test_mutils.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_mutils.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_mutils.sh.in b/storage/ndb/src/ndbjtie/test/test_mutils.sh.in
index 45a683baa204..ec33ef21affd 100644
--- a/storage/ndb/src/ndbjtie/test/test_mutils.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_mutils.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in
index e839b7478323..2b5481238e95 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.cmd.in
@@ -1,15 +1,22 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
 rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
 rem
 rem This program is distributed in the hope that it will be useful,
 rem but WITHOUT ANY WARRANTY; without even the implied warranty of
 rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem GNU General Public License, version 2.0, for more details.
 rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in
index b616bc8f0a14..366c4f40e024 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_constants.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in
index 42384b8d2552..03fcc5097e2e 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in
index 69cadbbbcfe5..0b598b5cf95c 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_multilib.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.cmd.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.cmd.in
index 152d1b39259b..31ff080cd3ef 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.sh.in b/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.sh.in
index 3b94435a4a44..adbac075b525 100644
--- a/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_ndbjtie_smoke.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_mutils.cmd.in b/storage/ndb/src/ndbjtie/test/test_unload_mutils.cmd.in
index 074eaa45492a..c6abb61a8f5f 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_mutils.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_mutils.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_mutils.sh.in b/storage/ndb/src/ndbjtie/test/test_unload_mutils.sh.in
index a6ebd8e1de7c..2cf7d04ce7f0 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_mutils.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_mutils.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in
index 3c8394187295..8539ca645ad0 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.cmd.in
@@ -1,15 +1,22 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
 rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
 rem
 rem This program is distributed in the hope that it will be useful,
 rem but WITHOUT ANY WARRANTY; without even the implied warranty of
 rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem GNU General Public License, version 2.0, for more details.
 rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in
index 6ed0a1996da0..654234cfe0da 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_constants.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in
index 1da63bde45b6..7c14ed595dc0 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in
index 393aaa7b11f6..a70cf2f730e2 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_multilib.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.cmd.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.cmd.in
index e33d537110f0..e1a82cde605a 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.cmd.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.cmd.in
@@ -1,16 +1,23 @@
 @echo off
 setlocal
-rem Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-rem
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; version 2 of the License.
-rem
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
+rem Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 rem
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License, version 2.0,
+rem as published by the Free Software Foundation.
+rem
+rem This program is also distributed with certain software (including
+rem but not limited to OpenSSL) that is licensed under separate terms,
+rem as designated in a particular file or component or in included license
+rem documentation.  The authors of MySQL hereby grant you an additional
+rem permission to link the program and your derivative works with the
+rem separately licensed software that they have included with MySQL.
+rem
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License, version 2.0, for more details.
+rem
 rem You should have received a copy of the GNU General Public License
 rem along with this program; if not, write to the Free Software
 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
diff --git a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.sh.in b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.sh.in
index c1adf6794a48..9c6455319abf 100644
--- a/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.sh.in
+++ b/storage/ndb/src/ndbjtie/test/test_unload_ndbjtie_smoke.sh.in
@@ -1,14 +1,21 @@
 #!/bin/sh
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/utils/helpers.hpp b/storage/ndb/src/ndbjtie/utils/helpers.hpp
index 157e37ce6669..9ab794d7bbb3 100644
--- a/storage/ndb/src/ndbjtie/utils/helpers.hpp
+++ b/storage/ndb/src/ndbjtie/utils/helpers.hpp
@@ -1,15 +1,22 @@
 /*
- Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights
  reserved.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/src/ndbjtie/utils/mystdint.h b/storage/ndb/src/ndbjtie/utils/mystdint.h
index d338c7dacfe6..f931801359dc 100644
--- a/storage/ndb/src/ndbjtie/utils/mystdint.h
+++ b/storage/ndb/src/ndbjtie/utils/mystdint.h
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/CMakeLists.txt b/storage/ndb/test/CMakeLists.txt
index 74c37dab4cc9..014ded4356e7 100644
--- a/storage/ndb/test/CMakeLists.txt
+++ b/storage/ndb/test/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/Makefile b/storage/ndb/test/crund/Makefile
index b87c563986ae..47b3b2b01fa2 100644
--- a/storage/ndb/test/crund/Makefile
+++ b/storage/ndb/test/crund/Makefile
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/Makefile.defaults b/storage/ndb/test/crund/Makefile.defaults
index 54c39c33ec47..4e5086f1343d 100644
--- a/storage/ndb/test/crund/Makefile.defaults
+++ b/storage/ndb/test/crund/Makefile.defaults
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/build.xml b/storage/ndb/test/crund/build.xml
index 6da85f373212..6e01ea353c85 100644
--- a/storage/ndb/test/crund/build.xml
+++ b/storage/ndb/test/crund/build.xml
@@ -1,14 +1,21 @@
 <!--
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/config.ini b/storage/ndb/test/crund/config_samples/config.ini
index 62943094471d..0e4d4002ac15 100644
--- a/storage/ndb/test/crund/config_samples/config.ini
+++ b/storage/ndb/test/crund/config_samples/config.ini
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/config.ini_commented b/storage/ndb/test/crund/config_samples/config.ini_commented
index af48c9d2f8ce..67b25e14d74f 100644
--- a/storage/ndb/test/crund/config_samples/config.ini_commented
+++ b/storage/ndb/test/crund/config_samples/config.ini_commented
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/config2.ini b/storage/ndb/test/crund/config_samples/config2.ini
index e0cc43245041..cbdd58c955b0 100644
--- a/storage/ndb/test/crund/config_samples/config2.ini
+++ b/storage/ndb/test/crund/config_samples/config2.ini
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundClusterj.properties b/storage/ndb/test/crund/config_samples/crundClusterj.properties
index 61246f988220..0d8bf043072b 100644
--- a/storage/ndb/test/crund/config_samples/crundClusterj.properties
+++ b/storage/ndb/test/crund/config_samples/crundClusterj.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundClusterjdbc.properties b/storage/ndb/test/crund/config_samples/crundClusterjdbc.properties
index 1fc10bdaaee3..e9b6554b18c7 100644
--- a/storage/ndb/test/crund/config_samples/crundClusterjdbc.properties
+++ b/storage/ndb/test/crund/config_samples/crundClusterjdbc.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundMysql.properties b/storage/ndb/test/crund/config_samples/crundMysql.properties
index 929fff90ebca..659baf31f253 100644
--- a/storage/ndb/test/crund/config_samples/crundMysql.properties
+++ b/storage/ndb/test/crund/config_samples/crundMysql.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundNdb.properties b/storage/ndb/test/crund/config_samples/crundNdb.properties
index a9b92bfd7412..abfa11b8ebee 100644
--- a/storage/ndb/test/crund/config_samples/crundNdb.properties
+++ b/storage/ndb/test/crund/config_samples/crundNdb.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundOpenjpa.properties b/storage/ndb/test/crund/config_samples/crundOpenjpa.properties
index 78991ad95cb2..6d351e807caf 100644
--- a/storage/ndb/test/crund/config_samples/crundOpenjpa.properties
+++ b/storage/ndb/test/crund/config_samples/crundOpenjpa.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundOpenjpaClusterj.properties b/storage/ndb/test/crund/config_samples/crundOpenjpaClusterj.properties
index 5af84916155c..8b3c144505ad 100644
--- a/storage/ndb/test/crund/config_samples/crundOpenjpaClusterj.properties
+++ b/storage/ndb/test/crund/config_samples/crundOpenjpaClusterj.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/crundRun.properties b/storage/ndb/test/crund/config_samples/crundRun.properties
index 76fc19ceb02f..101b926f81bb 100644
--- a/storage/ndb/test/crund/config_samples/crundRun.properties
+++ b/storage/ndb/test/crund/config_samples/crundRun.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/env.properties b/storage/ndb/test/crund/config_samples/env.properties
index e8b60ce17167..05c41322a9c6 100644
--- a/storage/ndb/test/crund/config_samples/env.properties
+++ b/storage/ndb/test/crund/config_samples/env.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/my.cnf b/storage/ndb/test/crund/config_samples/my.cnf
index d2032680b621..d16425678657 100644
--- a/storage/ndb/test/crund/config_samples/my.cnf
+++ b/storage/ndb/test/crund/config_samples/my.cnf
@@ -1,14 +1,21 @@
-# Copyright (c) 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/my.cnf_commented b/storage/ndb/test/crund/config_samples/my.cnf_commented
index a63bc06929c4..692a75013cda 100644
--- a/storage/ndb/test/crund/config_samples/my.cnf_commented
+++ b/storage/ndb/test/crund/config_samples/my.cnf_commented
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/config_samples/my71.cnf b/storage/ndb/test/crund/config_samples/my71.cnf
index 7c2d62ee2ca1..7464fbeac284 100644
--- a/storage/ndb/test/crund/config_samples/my71.cnf
+++ b/storage/ndb/test/crund/config_samples/my71.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/HrtProfiler.java b/storage/ndb/test/crund/helpers/src/utils/HrtProfiler.java
index 4d304a924941..a673a2945011 100644
--- a/storage/ndb/test/crund/helpers/src/utils/HrtProfiler.java
+++ b/storage/ndb/test/crund/helpers/src/utils/HrtProfiler.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/HrtStopwatch.java b/storage/ndb/test/crund/helpers/src/utils/HrtStopwatch.java
index c2eaf973cb3e..488210b90e8d 100644
--- a/storage/ndb/test/crund/helpers/src/utils/HrtStopwatch.java
+++ b/storage/ndb/test/crund/helpers/src/utils/HrtStopwatch.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/HrtStopwatchTest.java b/storage/ndb/test/crund/helpers/src/utils/HrtStopwatchTest.java
index dd9097bcf9eb..a8c707990e11 100644
--- a/storage/ndb/test/crund/helpers/src/utils/HrtStopwatchTest.java
+++ b/storage/ndb/test/crund/helpers/src/utils/HrtStopwatchTest.java
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/JniInstrumentationTest.java b/storage/ndb/test/crund/helpers/src/utils/JniInstrumentationTest.java
index f49da8330191..63a60993e8be 100644
--- a/storage/ndb/test/crund/helpers/src/utils/JniInstrumentationTest.java
+++ b/storage/ndb/test/crund/helpers/src/utils/JniInstrumentationTest.java
@@ -1,15 +1,22 @@
 /*
- Copyright 2010 Sun Microsystems, Inc.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  All rights reserved. Use is subject to license terms.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/Properties.hpp b/storage/ndb/test/crund/helpers/src/utils/Properties.hpp
index b6ed9d6c5293..25cfe42518bb 100644
--- a/storage/ndb/test/crund/helpers/src/utils/Properties.hpp
+++ b/storage/ndb/test/crund/helpers/src/utils/Properties.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/Properties_test.cpp b/storage/ndb/test/crund/helpers/src/utils/Properties_test.cpp
index 72be65ae9e90..ab6818188620 100644
--- a/storage/ndb/test/crund/helpers/src/utils/Properties_test.cpp
+++ b/storage/ndb/test/crund/helpers/src/utils/Properties_test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/Properties_test.properties b/storage/ndb/test/crund/helpers/src/utils/Properties_test.properties
index e58471c94f0e..c6f6d072bf81 100644
--- a/storage/ndb/test/crund/helpers/src/utils/Properties_test.properties
+++ b/storage/ndb/test/crund/helpers/src/utils/Properties_test.properties
@@ -1,14 +1,21 @@
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/helpers.hpp b/storage/ndb/test/crund/helpers/src/utils/helpers.hpp
index 5d9e6c32aeca..b1116bbe7812 100644
--- a/storage/ndb/test/crund/helpers/src/utils/helpers.hpp
+++ b/storage/ndb/test/crund/helpers/src/utils/helpers.hpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.c b/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.c
index 690f1f207ae3..c67eb1a35d1a 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.c
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.h b/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.h
index 6d5a725431aa..05dc79ef9bc3 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.h
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_gstopwatch.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.c b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.c
index a5d52f0978cb..0d4cea062b70 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.c
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.h b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.h
index 9e295c9d1654..29c6ffba2403 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.h
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch_test.c b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch_test.c
index b9c48a79d57b..6be6b29c5785 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch_test.c
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_stopwatch_test.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_utils.c b/storage/ndb/test/crund/helpers/src/utils/hrt_utils.c
index 54dfb284498d..fe3901f5ce5a 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_utils.c
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_utils.c
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_utils.h b/storage/ndb/test/crund/helpers/src/utils/hrt_utils.h
index f08e61dc0cbc..673fcb45fc0d 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_utils.h
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_utils.h
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/hrt_utils_test.c b/storage/ndb/test/crund/helpers/src/utils/hrt_utils_test.c
index 759083de986d..15440821c497 100644
--- a/storage/ndb/test/crund/helpers/src/utils/hrt_utils_test.c
+++ b/storage/ndb/test/crund/helpers/src/utils/hrt_utils_test.c
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/utils_HrtStopwatch.c b/storage/ndb/test/crund/helpers/src/utils/utils_HrtStopwatch.c
index 588d810f49f5..d47b1e84a890 100644
--- a/storage/ndb/test/crund/helpers/src/utils/utils_HrtStopwatch.c
+++ b/storage/ndb/test/crund/helpers/src/utils/utils_HrtStopwatch.c
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/helpers/src/utils/utils_JniInstrumentationTest.c b/storage/ndb/test/crund/helpers/src/utils/utils_JniInstrumentationTest.c
index a41fc378c625..cabd077f25f6 100644
--- a/storage/ndb/test/crund/helpers/src/utils/utils_JniInstrumentationTest.c
+++ b/storage/ndb/test/crund/helpers/src/utils/utils_JniInstrumentationTest.c
@@ -1,15 +1,22 @@
 /*
-   Copyright 2010 Sun Microsystems, Inc.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/schema.sql b/storage/ndb/test/crund/schema_driven_load_unfinished/schema.sql
index bc1c8bafd837..53fd6472a6df 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/schema.sql
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/schema.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.cpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.cpp
index f9246977229d..acf361327351 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.cpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.cpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.hpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.hpp
index eb895234656a..c7db17794706 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.hpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/Driver.hpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.cpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.cpp
index 2cd64b5d8ef4..2421fc1be191 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.cpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.cpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.hpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.hpp
index 821d272671d9..dc7f7fa61892 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.hpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/NdbApiTwsDriver.hpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.cpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.cpp
index 3f983de05bce..fc72e7174b15 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.cpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.cpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.hpp b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.hpp
index 569dc24f0a03..15fb578c9e7f 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.hpp
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_cpp/TwsDriver.hpp
@@ -1,16 +1,23 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/build.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/build.xml
index b45e4e85a084..3f77b91d74a4 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/build.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/build.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/build-impl.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/build-impl.xml
index 5d8acf087f5c..810377817d6f 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/build-impl.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/build-impl.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-dbg.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-dbg.properties
index bc192ab937af..33b99e65bd03 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-dbg.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-dbg.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-opt.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-opt.properties
index ede60a16aaa0..6c4e7c562668 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-opt.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/configs_sample/server-opt.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/genfiles.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/genfiles.properties
index e0da964431bf..e52ebbe3ae20 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/genfiles.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/genfiles.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/config.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/config.properties
index 948e24dffee3..53eece39a1ac 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/config.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/config.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-dbg.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-dbg.properties
index 170ee80aea39..5285b9571bb1 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-dbg.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-dbg.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-opt.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-opt.properties
index 170ee80aea39..5285b9571bb1 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-opt.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/configs/server-opt.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.properties
index 74550a8cd069..fab063f500d9 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.xml
index 6ed51bd2ef2b..991187698333 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/private.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/profiler/configurations.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/profiler/configurations.xml
index 254e67d162b8..310e8a233d69 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/profiler/configurations.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/private_sample/profiler/configurations.xml
@@ -2,16 +2,23 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <!--
 
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/profiler-build-impl.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/profiler-build-impl.xml
index 08f7fb6358d0..b2be83e5c133 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/profiler-build-impl.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/profiler-build-impl.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.properties b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.properties
index e96675a2fbf2..3b2c7c812bc1 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.properties
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.properties
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.xml b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.xml
index 4c1784178fd3..06e3043a0fc6 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.xml
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/nbproject/project.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/ClusterjLoad.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/ClusterjLoad.java
index 5689e4f2a193..640b85301e00 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/ClusterjLoad.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/ClusterjLoad.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/Driver.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/Driver.java
index 9d8e7ee61abf..9a0596254638 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/Driver.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/Driver.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/JdbcLoad.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/JdbcLoad.java
index 2a96c8e2f5d0..26f2df6e2629 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/JdbcLoad.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/JdbcLoad.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/NdbjtieLoad.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/NdbjtieLoad.java
index 5078b715ab03..6841f0d0327d 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/NdbjtieLoad.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/NdbjtieLoad.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java
index 5661147f3a02..2737d9eaf69c 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsLoad.java b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsLoad.java
index f4a5299402d4..727902898fe8 100644
--- a/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsLoad.java
+++ b/storage/ndb/test/crund/schema_driven_load_unfinished/tws_java/src/com/mysql/cluster/benchmark/tws/TwsLoad.java
@@ -1,16 +1,23 @@
 /* -*- mode: java; c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=4:tabstop=4:smarttab:
  *
- *  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  it under the terms of the GNU General Public License, version 2.0,
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is also distributed with certain software (including
+ *  but not limited to OpenSSL) that is licensed under separate terms,
+ *  as designated in a particular file or component or in included license
+ *  documentation.  The authors of MySQL hereby grant you an additional
+ *  permission to link the program and your derivative works with the
+ *  separately licensed software that they have included with MySQL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  GNU General Public License, version 2.0, for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/bench_crund.sh b/storage/ndb/test/crund/scripts/bench_crund.sh
index 2e18b749688c..e972922bbd07 100755
--- a/storage/ndb/test/crund/scripts/bench_crund.sh
+++ b/storage/ndb/test/crund/scripts/bench_crund.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/grant_privileges.sh b/storage/ndb/test/crund/scripts/grant_privileges.sh
index e04eea8d0d21..8a3b05d18424 100755
--- a/storage/ndb/test/crund/scripts/grant_privileges.sh
+++ b/storage/ndb/test/crund/scripts/grant_privileges.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/mgm.sh b/storage/ndb/test/crund/scripts/mgm.sh
index 17dde78883d5..66f91e101599 100755
--- a/storage/ndb/test/crund/scripts/mgm.sh
+++ b/storage/ndb/test/crund/scripts/mgm.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/mysql.sh b/storage/ndb/test/crund/scripts/mysql.sh
index 2626d5ec0f74..304ce88e5d03 100755
--- a/storage/ndb/test/crund/scripts/mysql.sh
+++ b/storage/ndb/test/crund/scripts/mysql.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/nstats_diff.sql b/storage/ndb/test/crund/scripts/nstats_diff.sql
index 82a7d030380b..45620c792c3a 100644
--- a/storage/ndb/test/crund/scripts/nstats_diff.sql
+++ b/storage/ndb/test/crund/scripts/nstats_diff.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/nstats_reset.sql b/storage/ndb/test/crund/scripts/nstats_reset.sql
index 6e507d108ddf..c98db0d67287 100644
--- a/storage/ndb/test/crund/scripts/nstats_reset.sql
+++ b/storage/ndb/test/crund/scripts/nstats_reset.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/nstats_schema.sql b/storage/ndb/test/crund/scripts/nstats_schema.sql
index cad81dd5c7f0..d4fb0a3d25e4 100644
--- a/storage/ndb/test/crund/scripts/nstats_schema.sql
+++ b/storage/ndb/test/crund/scripts/nstats_schema.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/pdelay_mac.sh b/storage/ndb/test/crund/scripts/pdelay_mac.sh
index 237227ca44d6..9761b7b11075 100755
--- a/storage/ndb/test/crund/scripts/pdelay_mac.sh
+++ b/storage/ndb/test/crund/scripts/pdelay_mac.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/pdelay_ndb.sh b/storage/ndb/test/crund/scripts/pdelay_ndb.sh
index 2aee90f0cc76..2eacf3e4b696 100755
--- a/storage/ndb/test/crund/scripts/pdelay_ndb.sh
+++ b/storage/ndb/test/crund/scripts/pdelay_ndb.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/process.sh b/storage/ndb/test/crund/scripts/process.sh
index e78487cb48fa..e39f14f940f3 100755
--- a/storage/ndb/test/crund/scripts/process.sh
+++ b/storage/ndb/test/crund/scripts/process.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/restart_cluster.sh b/storage/ndb/test/crund/scripts/restart_cluster.sh
index bf790f1ba091..82a0887e3b90 100755
--- a/storage/ndb/test/crund/scripts/restart_cluster.sh
+++ b/storage/ndb/test/crund/scripts/restart_cluster.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/restart_mysqld.sh b/storage/ndb/test/crund/scripts/restart_mysqld.sh
index 373c1ec56b94..6396bb2090b5 100755
--- a/storage/ndb/test/crund/scripts/restart_mysqld.sh
+++ b/storage/ndb/test/crund/scripts/restart_mysqld.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/restart_ndb.sh b/storage/ndb/test/crund/scripts/restart_ndb.sh
index ca84f631cb87..77266d5b9b56 100755
--- a/storage/ndb/test/crund/scripts/restart_ndb.sh
+++ b/storage/ndb/test/crund/scripts/restart_ndb.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/show_cluster.sh b/storage/ndb/test/crund/scripts/show_cluster.sh
index ec1cc5c66a6a..551a5b361a0f 100755
--- a/storage/ndb/test/crund/scripts/show_cluster.sh
+++ b/storage/ndb/test/crund/scripts/show_cluster.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/slay.sh b/storage/ndb/test/crund/scripts/slay.sh
index 616407d5e73f..3b674823ac32 100755
--- a/storage/ndb/test/crund/scripts/slay.sh
+++ b/storage/ndb/test/crund/scripts/slay.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/start_cluster.sh b/storage/ndb/test/crund/scripts/start_cluster.sh
index 13f892113886..31b6f75b8505 100755
--- a/storage/ndb/test/crund/scripts/start_cluster.sh
+++ b/storage/ndb/test/crund/scripts/start_cluster.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/start_mgmd.sh b/storage/ndb/test/crund/scripts/start_mgmd.sh
index be75ceb87c93..609e5a8ee5e5 100755
--- a/storage/ndb/test/crund/scripts/start_mgmd.sh
+++ b/storage/ndb/test/crund/scripts/start_mgmd.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/start_mysqld.sh b/storage/ndb/test/crund/scripts/start_mysqld.sh
index c942cc3639f9..2a5c7db1805c 100755
--- a/storage/ndb/test/crund/scripts/start_mysqld.sh
+++ b/storage/ndb/test/crund/scripts/start_mysqld.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/start_ndb.sh b/storage/ndb/test/crund/scripts/start_ndb.sh
index 0864cdc71d5a..116df0622ce0 100755
--- a/storage/ndb/test/crund/scripts/start_ndb.sh
+++ b/storage/ndb/test/crund/scripts/start_ndb.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/stop_cluster.sh b/storage/ndb/test/crund/scripts/stop_cluster.sh
index 63671ac197b9..133a36cb9506 100755
--- a/storage/ndb/test/crund/scripts/stop_cluster.sh
+++ b/storage/ndb/test/crund/scripts/stop_cluster.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/stop_mysqld.sh b/storage/ndb/test/crund/scripts/stop_mysqld.sh
index 4d260a421a9d..3c43b41a23e8 100755
--- a/storage/ndb/test/crund/scripts/stop_mysqld.sh
+++ b/storage/ndb/test/crund/scripts/stop_mysqld.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/scripts/stop_ndb.sh b/storage/ndb/test/crund/scripts/stop_ndb.sh
index a349600886e6..14d80a6e5e31 100755
--- a/storage/ndb/test/crund/scripts/stop_ndb.sh
+++ b/storage/ndb/test/crund/scripts/stop_ndb.sh
@@ -1,15 +1,22 @@
 #!/bin/bash
 
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/A.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/A.java
index b10a93ae1dbf..adea994a6ca0 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/A.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/A.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/B.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/B.java
index c8aa9e9eecd0..1dbd75e6c511 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/B.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/B.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjAB.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjAB.java
index da9dfec34e53..258229457a6a 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjAB.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjAB.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjS.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjS.java
index e73c25994078..cae807ef2620 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjS.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjS.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java
index ac3e2e34cf9e..463b0fef154f 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundLoad.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundLoad.java
index 754a2ae6c8de..87a092e57da8 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundLoad.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundLoad.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundSLoad.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundSLoad.java
index 1c014cf0c81a..25a9b0498066 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundSLoad.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundSLoad.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java
index 51f15c9cd433..775a5b58961c 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java
index 1b9e04f1a739..42284ba3fc10 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB.java
index b2f8611e9fac..298f96420db9 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcAB.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcAB.java
index 443e273491bc..aa0138d35ecb 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcAB.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcAB.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcDriverTest.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcDriverTest.java
index 7e946b752d98..333c9e874349 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcDriverTest.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcDriverTest.java
@@ -1,15 +1,22 @@
 /*
-  Copyright (c) 2010 Sun Microsystems, Inc.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcS.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcS.java
index 7e3601b141ce..1fc4fd20f998 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcS.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcS.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaAB.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaAB.java
index 68ddde9f7ba5..fa8732592e87 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaAB.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaAB.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/Load.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/Load.java
index caaf9e13bba2..092dd64a2489 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/Load.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/Load.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieAB.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieAB.java
index 752d10783a52..3ed0a7f91086 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieAB.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieAB.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieS.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieS.java
index fba80f824fb2..fdc8bece4b18 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieS.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjtieS.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java
index 686db1af01dc..61f1669dc37e 100644
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/CrundDriver.cpp b/storage/ndb/test/crund/src/cpp/CrundDriver.cpp
index 6086f5621eca..369f73395a4c 100644
--- a/storage/ndb/test/crund/src/cpp/CrundDriver.cpp
+++ b/storage/ndb/test/crund/src/cpp/CrundDriver.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/CrundDriver.hpp b/storage/ndb/test/crund/src/cpp/CrundDriver.hpp
index 7aa3bd12518a..f7e5e59c492b 100644
--- a/storage/ndb/test/crund/src/cpp/CrundDriver.hpp
+++ b/storage/ndb/test/crund/src/cpp/CrundDriver.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/CrundLoad.cpp b/storage/ndb/test/crund/src/cpp/CrundLoad.cpp
index fd84046c2cad..384074c6fc92 100644
--- a/storage/ndb/test/crund/src/cpp/CrundLoad.cpp
+++ b/storage/ndb/test/crund/src/cpp/CrundLoad.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/CrundLoad.hpp b/storage/ndb/test/crund/src/cpp/CrundLoad.hpp
index 0dadc553befe..832292e697db 100644
--- a/storage/ndb/test/crund/src/cpp/CrundLoad.hpp
+++ b/storage/ndb/test/crund/src/cpp/CrundLoad.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/Driver.cpp b/storage/ndb/test/crund/src/cpp/Driver.cpp
index 14f9b7c3b916..3cfe6a3c7e42 100644
--- a/storage/ndb/test/crund/src/cpp/Driver.cpp
+++ b/storage/ndb/test/crund/src/cpp/Driver.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/Driver.hpp b/storage/ndb/test/crund/src/cpp/Driver.hpp
index 8bfa642a2c58..c172acb40736 100644
--- a/storage/ndb/test/crund/src/cpp/Driver.hpp
+++ b/storage/ndb/test/crund/src/cpp/Driver.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/Load.hpp b/storage/ndb/test/crund/src/cpp/Load.hpp
index 76b8728b293b..28b434135345 100644
--- a/storage/ndb/test/crund/src/cpp/Load.hpp
+++ b/storage/ndb/test/crund/src/cpp/Load.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/NdbapiAB.cpp b/storage/ndb/test/crund/src/cpp/NdbapiAB.cpp
index 6fe09c31647b..615d2bac9155 100644
--- a/storage/ndb/test/crund/src/cpp/NdbapiAB.cpp
+++ b/storage/ndb/test/crund/src/cpp/NdbapiAB.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/NdbapiAB.hpp b/storage/ndb/test/crund/src/cpp/NdbapiAB.hpp
index c24cd975f1ef..5e49888e795c 100644
--- a/storage/ndb/test/crund/src/cpp/NdbapiAB.hpp
+++ b/storage/ndb/test/crund/src/cpp/NdbapiAB.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.cpp b/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.cpp
index 69267f20a284..16571734f2b7 100644
--- a/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.cpp
+++ b/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.hpp b/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.hpp
index 81320d5ea9d4..c48e15f156c6 100644
--- a/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.hpp
+++ b/storage/ndb/test/crund/src/cpp/NdbapiTwsDriver.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/TwsDriver.cpp b/storage/ndb/test/crund/src/cpp/TwsDriver.cpp
index 2793b74bc37f..5e785889f920 100644
--- a/storage/ndb/test/crund/src/cpp/TwsDriver.cpp
+++ b/storage/ndb/test/crund/src/cpp/TwsDriver.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/TwsDriver.hpp b/storage/ndb/test/crund/src/cpp/TwsDriver.hpp
index c21c62c6f5fc..c1edf085a5df 100644
--- a/storage/ndb/test/crund/src/cpp/TwsDriver.hpp
+++ b/storage/ndb/test/crund/src/cpp/TwsDriver.hpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/crund.cpp b/storage/ndb/test/crund/src/cpp/crund.cpp
index 1909e9575c50..cfaf065a4eb3 100644
--- a/storage/ndb/test/crund/src/cpp/crund.cpp
+++ b/storage/ndb/test/crund/src/cpp/crund.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/crundAB.cpp b/storage/ndb/test/crund/src/cpp/crundAB.cpp
index 2cf4c74d7593..4d0f5f63ce7a 100644
--- a/storage/ndb/test/crund/src/cpp/crundAB.cpp
+++ b/storage/ndb/test/crund/src/cpp/crundAB.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/cpp/string_helpers.hpp b/storage/ndb/test/crund/src/cpp/string_helpers.hpp
index daa716dd75ba..d815e9fb45eb 100644
--- a/storage/ndb/test/crund/src/cpp/string_helpers.hpp
+++ b/storage/ndb/test/crund/src/cpp/string_helpers.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/crund/src/crund_schema.sql b/storage/ndb/test/crund/src/crund_schema.sql
index 2ec110ab7a03..3a896bbfef06 100755
--- a/storage/ndb/test/crund/src/crund_schema.sql
+++ b/storage/ndb/test/crund/src/crund_schema.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/AtrtClient.hpp b/storage/ndb/test/include/AtrtClient.hpp
index 05842389f05e..5352847556c2 100644
--- a/storage/ndb/test/include/AtrtClient.hpp
+++ b/storage/ndb/test/include/AtrtClient.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/ConfigFactory.hpp b/storage/ndb/test/include/ConfigFactory.hpp
index b966f8c9955b..47227f5e6f59 100644
--- a/storage/ndb/test/include/ConfigFactory.hpp
+++ b/storage/ndb/test/include/ConfigFactory.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or it affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/CpcClient.hpp b/storage/ndb/test/include/CpcClient.hpp
index 335d8560412c..2f2eeba54c46 100644
--- a/storage/ndb/test/include/CpcClient.hpp
+++ b/storage/ndb/test/include/CpcClient.hpp
@@ -1,16 +1,23 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/DbUtil.hpp b/storage/ndb/test/include/DbUtil.hpp
index 7ce0221c9bf1..047756fb49ea 100644
--- a/storage/ndb/test/include/DbUtil.hpp
+++ b/storage/ndb/test/include/DbUtil.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoAsynchTransactions.hpp b/storage/ndb/test/include/HugoAsynchTransactions.hpp
index 943d6396c802..75c607bf7d8c 100644
--- a/storage/ndb/test/include/HugoAsynchTransactions.hpp
+++ b/storage/ndb/test/include/HugoAsynchTransactions.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoCalculator.hpp b/storage/ndb/test/include/HugoCalculator.hpp
index def6683f1704..e86978c7e584 100644
--- a/storage/ndb/test/include/HugoCalculator.hpp
+++ b/storage/ndb/test/include/HugoCalculator.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoOperations.hpp b/storage/ndb/test/include/HugoOperations.hpp
index 905f9f9bd566..08733a270fd1 100644
--- a/storage/ndb/test/include/HugoOperations.hpp
+++ b/storage/ndb/test/include/HugoOperations.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoQueries.hpp b/storage/ndb/test/include/HugoQueries.hpp
index 53d6bc985f56..91d97787c21a 100644
--- a/storage/ndb/test/include/HugoQueries.hpp
+++ b/storage/ndb/test/include/HugoQueries.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoQueryBuilder.hpp b/storage/ndb/test/include/HugoQueryBuilder.hpp
index ee76faad6a65..645b574b79d7 100644
--- a/storage/ndb/test/include/HugoQueryBuilder.hpp
+++ b/storage/ndb/test/include/HugoQueryBuilder.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/HugoTransactions.hpp b/storage/ndb/test/include/HugoTransactions.hpp
index e2fb15207278..586cabc6d975 100644
--- a/storage/ndb/test/include/HugoTransactions.hpp
+++ b/storage/ndb/test/include/HugoTransactions.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT.hpp b/storage/ndb/test/include/NDBT.hpp
index 8f8c23c9caf6..a0c117528a9b 100644
--- a/storage/ndb/test/include/NDBT.hpp
+++ b/storage/ndb/test/include/NDBT.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_DataSet.hpp b/storage/ndb/test/include/NDBT_DataSet.hpp
index cca2d9459f61..4db76997f2ed 100644
--- a/storage/ndb/test/include/NDBT_DataSet.hpp
+++ b/storage/ndb/test/include/NDBT_DataSet.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_DataSetTransaction.hpp b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
index fe3f13a4db11..902773c49006 100644
--- a/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
+++ b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Error.hpp b/storage/ndb/test/include/NDBT_Error.hpp
index e0243e357ba5..74a6789e7965 100644
--- a/storage/ndb/test/include/NDBT_Error.hpp
+++ b/storage/ndb/test/include/NDBT_Error.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Find.hpp b/storage/ndb/test/include/NDBT_Find.hpp
index 7599f8130300..4dda57cc3cbf 100644
--- a/storage/ndb/test/include/NDBT_Find.hpp
+++ b/storage/ndb/test/include/NDBT_Find.hpp
@@ -1,16 +1,23 @@
 /*
-   Copyright 2009 Sun Microsystems, Inc.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Output.hpp b/storage/ndb/test/include/NDBT_Output.hpp
index 3faef183a0cb..44c17d4fdb55 100644
--- a/storage/ndb/test/include/NDBT_Output.hpp
+++ b/storage/ndb/test/include/NDBT_Output.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_ResultRow.hpp b/storage/ndb/test/include/NDBT_ResultRow.hpp
index 65c958263e85..ecefc2ec1cca 100644
--- a/storage/ndb/test/include/NDBT_ResultRow.hpp
+++ b/storage/ndb/test/include/NDBT_ResultRow.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_ReturnCodes.h b/storage/ndb/test/include/NDBT_ReturnCodes.h
index 28084fa4037b..98e8fc217d5d 100644
--- a/storage/ndb/test/include/NDBT_ReturnCodes.h
+++ b/storage/ndb/test/include/NDBT_ReturnCodes.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Stats.hpp b/storage/ndb/test/include/NDBT_Stats.hpp
index ce15176e36e4..76114d0c5482 100644
--- a/storage/ndb/test/include/NDBT_Stats.hpp
+++ b/storage/ndb/test/include/NDBT_Stats.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Table.hpp b/storage/ndb/test/include/NDBT_Table.hpp
index 2269ed211a5c..be89a3bd9dff 100644
--- a/storage/ndb/test/include/NDBT_Table.hpp
+++ b/storage/ndb/test/include/NDBT_Table.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Tables.hpp b/storage/ndb/test/include/NDBT_Tables.hpp
index 91481d6b7563..dc1dd65a2b36 100644
--- a/storage/ndb/test/include/NDBT_Tables.hpp
+++ b/storage/ndb/test/include/NDBT_Tables.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Test.hpp b/storage/ndb/test/include/NDBT_Test.hpp
index 28503e87f70b..ae68e75eb0be 100644
--- a/storage/ndb/test/include/NDBT_Test.hpp
+++ b/storage/ndb/test/include/NDBT_Test.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Thread.hpp b/storage/ndb/test/include/NDBT_Thread.hpp
index 4584efcb60f6..4ab9ede9672d 100644
--- a/storage/ndb/test/include/NDBT_Thread.hpp
+++ b/storage/ndb/test/include/NDBT_Thread.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NDBT_Workingdir.hpp b/storage/ndb/test/include/NDBT_Workingdir.hpp
index 08056b4fb89e..c42f98b26055 100644
--- a/storage/ndb/test/include/NDBT_Workingdir.hpp
+++ b/storage/ndb/test/include/NDBT_Workingdir.hpp
@@ -1,16 +1,23 @@
 /*
-   Copyright 2009 Sun Microsystems, Inc.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbBackup.hpp b/storage/ndb/test/include/NdbBackup.hpp
index 29e710dff7b0..a1fd063bea96 100644
--- a/storage/ndb/test/include/NdbBackup.hpp
+++ b/storage/ndb/test/include/NdbBackup.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbConfig.hpp b/storage/ndb/test/include/NdbConfig.hpp
index 9a307aff05c9..609b4b6fd6ce 100644
--- a/storage/ndb/test/include/NdbConfig.hpp
+++ b/storage/ndb/test/include/NdbConfig.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbMgmd.hpp b/storage/ndb/test/include/NdbMgmd.hpp
index 2ae5c6317d03..0e4b036b57e2 100644
--- a/storage/ndb/test/include/NdbMgmd.hpp
+++ b/storage/ndb/test/include/NdbMgmd.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbMixRestarter.hpp b/storage/ndb/test/include/NdbMixRestarter.hpp
index 46c883ec5a02..1f08a4f9cf25 100644
--- a/storage/ndb/test/include/NdbMixRestarter.hpp
+++ b/storage/ndb/test/include/NdbMixRestarter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbProcess.hpp b/storage/ndb/test/include/NdbProcess.hpp
index a02c8d133d1b..bb415566cf8a 100644
--- a/storage/ndb/test/include/NdbProcess.hpp
+++ b/storage/ndb/test/include/NdbProcess.hpp
@@ -1,15 +1,22 @@
 /*
-  Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbRestarter.hpp b/storage/ndb/test/include/NdbRestarter.hpp
index cf8622510d47..4aa776b3df96 100644
--- a/storage/ndb/test/include/NdbRestarter.hpp
+++ b/storage/ndb/test/include/NdbRestarter.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbRestarts.hpp b/storage/ndb/test/include/NdbRestarts.hpp
index 957b07a79f92..567683f4b02c 100644
--- a/storage/ndb/test/include/NdbRestarts.hpp
+++ b/storage/ndb/test/include/NdbRestarts.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbSchemaCon.hpp b/storage/ndb/test/include/NdbSchemaCon.hpp
index 03638ec99f3c..21b4134ee3c0 100644
--- a/storage/ndb/test/include/NdbSchemaCon.hpp
+++ b/storage/ndb/test/include/NdbSchemaCon.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbSchemaOp.hpp b/storage/ndb/test/include/NdbSchemaOp.hpp
index 24a772d9c199..95bf8fb2977e 100644
--- a/storage/ndb/test/include/NdbSchemaOp.hpp
+++ b/storage/ndb/test/include/NdbSchemaOp.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbTest.hpp b/storage/ndb/test/include/NdbTest.hpp
index edde1efcc343..26dfd482f245 100644
--- a/storage/ndb/test/include/NdbTest.hpp
+++ b/storage/ndb/test/include/NdbTest.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/NdbTimer.hpp b/storage/ndb/test/include/NdbTimer.hpp
index f0436d39857d..4678cf4f8493 100644
--- a/storage/ndb/test/include/NdbTimer.hpp
+++ b/storage/ndb/test/include/NdbTimer.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/SocketInputStream2.hpp b/storage/ndb/test/include/SocketInputStream2.hpp
index 143f21d1d98a..60784edbd2dd 100644
--- a/storage/ndb/test/include/SocketInputStream2.hpp
+++ b/storage/ndb/test/include/SocketInputStream2.hpp
@@ -1,14 +1,21 @@
-/* Copyright 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/SqlClient.hpp b/storage/ndb/test/include/SqlClient.hpp
index 5448c9e698a4..eb1cf956930e 100644
--- a/storage/ndb/test/include/SqlClient.hpp
+++ b/storage/ndb/test/include/SqlClient.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2008 MySQL AB
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/TestNdbEventOperation.hpp b/storage/ndb/test/include/TestNdbEventOperation.hpp
index 5a5f762a0214..177099d55bfc 100644
--- a/storage/ndb/test/include/TestNdbEventOperation.hpp
+++ b/storage/ndb/test/include/TestNdbEventOperation.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/UtilTransactions.hpp b/storage/ndb/test/include/UtilTransactions.hpp
index 39cc83ee8d61..8a55a60d8c61 100644
--- a/storage/ndb/test/include/UtilTransactions.hpp
+++ b/storage/ndb/test/include/UtilTransactions.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/include/getarg.h b/storage/ndb/test/include/getarg.h
index aeee1e467149..92da54db20e2 100644
--- a/storage/ndb/test/include/getarg.h
+++ b/storage/ndb/test/include/getarg.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/CMakeLists.txt b/storage/ndb/test/ndbapi/CMakeLists.txt
index 296873acc255..e28b1a1750a2 100644
--- a/storage/ndb/test/ndbapi/CMakeLists.txt
+++ b/storage/ndb/test/ndbapi/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/InsertRecs.cpp b/storage/ndb/test/ndbapi/InsertRecs.cpp
index 120d8323174e..277f49004d0b 100644
--- a/storage/ndb/test/ndbapi/InsertRecs.cpp
+++ b/storage/ndb/test/ndbapi/InsertRecs.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ScanFilter.hpp b/storage/ndb/test/ndbapi/ScanFilter.hpp
index ef40b804bc7d..ea3765215079 100644
--- a/storage/ndb/test/ndbapi/ScanFilter.hpp
+++ b/storage/ndb/test/ndbapi/ScanFilter.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ScanFunctions.hpp b/storage/ndb/test/ndbapi/ScanFunctions.hpp
index 4638d2ec76bd..0492e284cc77 100644
--- a/storage/ndb/test/ndbapi/ScanFunctions.hpp
+++ b/storage/ndb/test/ndbapi/ScanFunctions.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ScanInterpretTest.hpp b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
index de5aa621538f..b44f6bf8e9cf 100644
--- a/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
+++ b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/TraceNdbApi.cpp b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
index 28c4b363c05e..c57cf23d5ff8 100644
--- a/storage/ndb/test/ndbapi/TraceNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/VerifyNdbApi.cpp b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
index b2ffc9a05452..101eb20f1e13 100644
--- a/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/acid.cpp b/storage/ndb/test/ndbapi/acid.cpp
index c54d9285a8e6..ff2705719a18 100644
--- a/storage/ndb/test/ndbapi/acid.cpp
+++ b/storage/ndb/test/ndbapi/acid.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/acid2.cpp b/storage/ndb/test/ndbapi/acid2.cpp
index 34ea046fea66..894b86c770e8 100644
--- a/storage/ndb/test/ndbapi/acid2.cpp
+++ b/storage/ndb/test/ndbapi/acid2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/asyncGenerator.cpp b/storage/ndb/test/ndbapi/asyncGenerator.cpp
index 4d5c09513ab9..adf0c82e425a 100644
--- a/storage/ndb/test/ndbapi/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/asyncGenerator.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/Bank.cpp b/storage/ndb/test/ndbapi/bank/Bank.cpp
index 78cb3a0731e4..d632bae73d8c 100644
--- a/storage/ndb/test/ndbapi/bank/Bank.cpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/Bank.hpp b/storage/ndb/test/ndbapi/bank/Bank.hpp
index a16b54283bd4..ae353d4baa32 100644
--- a/storage/ndb/test/ndbapi/bank/Bank.hpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/BankLoad.cpp b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
index 92328fefe9cc..8662c13c5af9 100644
--- a/storage/ndb/test/ndbapi/bank/BankLoad.cpp
+++ b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/CMakeLists.txt b/storage/ndb/test/ndbapi/bank/CMakeLists.txt
index 979fe4ef7333..9289839f8fb0 100644
--- a/storage/ndb/test/ndbapi/bank/CMakeLists.txt
+++ b/storage/ndb/test/ndbapi/bank/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankCreator.cpp b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
index c053c8689fe5..cc3d5c96970a 100644
--- a/storage/ndb/test/ndbapi/bank/bankCreator.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
index 73c25f2e9a40..6b0895ba31a7 100644
--- a/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
index 485b131f41d0..7f2800e0b61e 100644
--- a/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankTimer.cpp b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
index 013016ae35c9..2c7d64e5ee17 100644
--- a/storage/ndb/test/ndbapi/bank/bankTimer.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
index 39d2104c2e11..3c99f28707d2 100644
--- a/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
index 8b30e7a5c801..3785cce6316d 100644
--- a/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bank/testBank.cpp b/storage/ndb/test/ndbapi/bank/testBank.cpp
index b2d74241753c..8977615a5fad 100644
--- a/storage/ndb/test/ndbapi/bank/testBank.cpp
+++ b/storage/ndb/test/ndbapi/bank/testBank.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
index 26a8f7b86d7e..d418350fe079 100644
--- a/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/dbGenerator.h b/storage/ndb/test/ndbapi/bench/dbGenerator.h
index 7f195ef4a7d6..0f183020f484 100644
--- a/storage/ndb/test/ndbapi/bench/dbGenerator.h
+++ b/storage/ndb/test/ndbapi/bench/dbGenerator.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/dbPopulate.cpp b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
index 2c44fc133430..4409fe6d85a1 100644
--- a/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/dbPopulate.h b/storage/ndb/test/ndbapi/bench/dbPopulate.h
index cf3b37fa1242..948fa6c4d488 100644
--- a/storage/ndb/test/ndbapi/bench/dbPopulate.h
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/macros.h b/storage/ndb/test/ndbapi/bench/macros.h
index d372f39f03db..6e66bb15ba6c 100644
--- a/storage/ndb/test/ndbapi/bench/macros.h
+++ b/storage/ndb/test/ndbapi/bench/macros.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
index 96ea05980c6f..ceba776e2246 100644
--- a/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/mainPopulate.cpp b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
index adbe0dc04f56..73e35ed0e164 100644
--- a/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_async1.cpp b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
index 80d2c249d57e..609635dd8eca 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_async2.cpp b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
index 49f9922850bb..a364bf15cffe 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_error.hpp b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
index 2acca3c16d08..2152d9e2c698 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_error.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_schema.hpp b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
index ccb0837bd16d..26971fc07d46 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB, 2008 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
index 248e0b8d3571..e53ba4952d77 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
index e79ee842b061..b0dcc3d05bcd 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
index 3ad75e9d1fcc..4e01eaa2575a 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
index 406f49b3e1f5..64ec7fd049e2 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
index 1ca036db818d..ac2f3e587414 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
index 4735a5dbd4d1..4f1068749676 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/testData.h b/storage/ndb/test/ndbapi/bench/testData.h
index 6755722537ef..40f3a4b044c3 100644
--- a/storage/ndb/test/ndbapi/bench/testData.h
+++ b/storage/ndb/test/ndbapi/bench/testData.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/testDefinitions.h b/storage/ndb/test/ndbapi/bench/testDefinitions.h
index f46bd6a17a30..616fffad8db2 100644
--- a/storage/ndb/test/ndbapi/bench/testDefinitions.h
+++ b/storage/ndb/test/ndbapi/bench/testDefinitions.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/userInterface.cpp b/storage/ndb/test/ndbapi/bench/userInterface.cpp
index 5a0ff9aaa231..5b4397e0e88c 100644
--- a/storage/ndb/test/ndbapi/bench/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/bench/userInterface.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bench/userInterface.h b/storage/ndb/test/ndbapi/bench/userInterface.h
index 6fc2fbe2510b..e13cb2959b1e 100644
--- a/storage/ndb/test/ndbapi/bench/userInterface.h
+++ b/storage/ndb/test/ndbapi/bench/userInterface.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2005, 2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/benchronja.cpp b/storage/ndb/test/ndbapi/benchronja.cpp
index c923af8fb04e..4e0162d416b0 100644
--- a/storage/ndb/test/ndbapi/benchronja.cpp
+++ b/storage/ndb/test/ndbapi/benchronja.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/bulk_copy.cpp b/storage/ndb/test/ndbapi/bulk_copy.cpp
index be8e9ca37b92..43ff94ca9669 100644
--- a/storage/ndb/test/ndbapi/bulk_copy.cpp
+++ b/storage/ndb/test/ndbapi/bulk_copy.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/cdrserver.cpp b/storage/ndb/test/ndbapi/cdrserver.cpp
index e6d6671e586c..16457cfc6442 100644
--- a/storage/ndb/test/ndbapi/cdrserver.cpp
+++ b/storage/ndb/test/ndbapi/cdrserver.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/celloDb.cpp b/storage/ndb/test/ndbapi/celloDb.cpp
index ad41ecff6ea0..7e894e636b3c 100644
--- a/storage/ndb/test/ndbapi/celloDb.cpp
+++ b/storage/ndb/test/ndbapi/celloDb.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/create_all_tabs.cpp b/storage/ndb/test/ndbapi/create_all_tabs.cpp
index 47876dbf46e5..18dbfe12deaf 100644
--- a/storage/ndb/test/ndbapi/create_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/create_all_tabs.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/create_tab.cpp b/storage/ndb/test/ndbapi/create_tab.cpp
index b9307bdad79a..3eeeb6d36479 100644
--- a/storage/ndb/test/ndbapi/create_tab.cpp
+++ b/storage/ndb/test/ndbapi/create_tab.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/drop_all_tabs.cpp b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
index 0274af64dafb..b9e0e5cef2d2 100644
--- a/storage/ndb/test/ndbapi/drop_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexAsynch.cpp b/storage/ndb/test/ndbapi/flexAsynch.cpp
index da302907fee6..6e3b7b3e3652 100644
--- a/storage/ndb/test/ndbapi/flexAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexAsynch.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexBench.cpp b/storage/ndb/test/ndbapi/flexBench.cpp
index 260694b73d83..d74bd3c85bd3 100644
--- a/storage/ndb/test/ndbapi/flexBench.cpp
+++ b/storage/ndb/test/ndbapi/flexBench.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexHammer.cpp b/storage/ndb/test/ndbapi/flexHammer.cpp
index 5a822733f7f9..ed069320c5cc 100644
--- a/storage/ndb/test/ndbapi/flexHammer.cpp
+++ b/storage/ndb/test/ndbapi/flexHammer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexScan.cpp b/storage/ndb/test/ndbapi/flexScan.cpp
index 3d386b7845f6..7d9bf122a16f 100644
--- a/storage/ndb/test/ndbapi/flexScan.cpp
+++ b/storage/ndb/test/ndbapi/flexScan.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexTT.cpp b/storage/ndb/test/ndbapi/flexTT.cpp
index 8adb1285f062..bb9e1bca3e72 100644
--- a/storage/ndb/test/ndbapi/flexTT.cpp
+++ b/storage/ndb/test/ndbapi/flexTT.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flexTimedAsynch.cpp b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
index ad68eec252a3..e8fe69f85f74 100644
--- a/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/flex_bench_mysql.cpp b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
index 8dd8bd61c21d..ce2e36c3a56a 100644
--- a/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
+++ b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/index.cpp b/storage/ndb/test/ndbapi/index.cpp
index 6bd1b95987ca..d033811217d8 100644
--- a/storage/ndb/test/ndbapi/index.cpp
+++ b/storage/ndb/test/ndbapi/index.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/index2.cpp b/storage/ndb/test/ndbapi/index2.cpp
index 6237dca1221b..37ae02f2ace8 100644
--- a/storage/ndb/test/ndbapi/index2.cpp
+++ b/storage/ndb/test/ndbapi/index2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/initronja.cpp b/storage/ndb/test/ndbapi/initronja.cpp
index f48dd8957d6e..f55a3801e62b 100644
--- a/storage/ndb/test/ndbapi/initronja.cpp
+++ b/storage/ndb/test/ndbapi/initronja.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2007 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/interpreterInTup.cpp b/storage/ndb/test/ndbapi/interpreterInTup.cpp
index 176363782b91..4f4a8a2a69eb 100644
--- a/storage/ndb/test/ndbapi/interpreterInTup.cpp
+++ b/storage/ndb/test/ndbapi/interpreterInTup.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
index e72f736b6c66..bbadfb93f3b8 100644
--- a/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/msa.cpp b/storage/ndb/test/ndbapi/msa.cpp
index 6085726e23df..16c3c3783991 100644
--- a/storage/ndb/test/ndbapi/msa.cpp
+++ b/storage/ndb/test/ndbapi/msa.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_async1.cpp b/storage/ndb/test/ndbapi/ndb_async1.cpp
index c0a95649530c..ced4f714d98e 100644
--- a/storage/ndb/test/ndbapi/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async1.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_async2.cpp b/storage/ndb/test/ndbapi/ndb_async2.cpp
index 1ca19ad5e1b8..5b491e76591b 100644
--- a/storage/ndb/test/ndbapi/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_populate.cpp b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
index c4acf844db21..b128c694d8dd 100644
--- a/storage/ndb/test/ndbapi/ndb_user_populate.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
index df47f2ea93d0..a877788cb8ea 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
index e052d23bfe89..ca5b2045c5c2 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
index 1b4f558b5e6c..d33a9ef99526 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
index 0d8cc0286f68..bfbb40e57414 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
index a899e7db3dae..0962a48acef9 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
index 8427fa416d09..8cf10edace57 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndbapi_50compat0.cpp b/storage/ndb/test/ndbapi/ndbapi_50compat0.cpp
index bbc48a101a60..ee6273cfe5c0 100644
--- a/storage/ndb/test/ndbapi/ndbapi_50compat0.cpp
+++ b/storage/ndb/test/ndbapi/ndbapi_50compat0.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB, 2010 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/ndbapi_50compat1.cpp b/storage/ndb/test/ndbapi/ndbapi_50compat1.cpp
index 35a138dd1b0f..4a4f3ee8374c 100644
--- a/storage/ndb/test/ndbapi/ndbapi_50compat1.cpp
+++ b/storage/ndb/test/ndbapi/ndbapi_50compat1.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/reorg_tab.cpp b/storage/ndb/test/ndbapi/reorg_tab.cpp
index dbddfbb82446..0f43446980ad 100644
--- a/storage/ndb/test/ndbapi/reorg_tab.cpp
+++ b/storage/ndb/test/ndbapi/reorg_tab.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/restarter.cpp b/storage/ndb/test/ndbapi/restarter.cpp
index 076a40b7e412..7664b17c3d3e 100644
--- a/storage/ndb/test/ndbapi/restarter.cpp
+++ b/storage/ndb/test/ndbapi/restarter.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/restarter2.cpp b/storage/ndb/test/ndbapi/restarter2.cpp
index 30a8b6aee5b1..531e0e53f115 100644
--- a/storage/ndb/test/ndbapi/restarter2.cpp
+++ b/storage/ndb/test/ndbapi/restarter2.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/restarts.cpp b/storage/ndb/test/ndbapi/restarts.cpp
index 43834435cba7..eaa7c51d5a6e 100644
--- a/storage/ndb/test/ndbapi/restarts.cpp
+++ b/storage/ndb/test/ndbapi/restarts.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/slow_select.cpp b/storage/ndb/test/ndbapi/slow_select.cpp
index b40c063f5426..844f58fd4943 100644
--- a/storage/ndb/test/ndbapi/slow_select.cpp
+++ b/storage/ndb/test/ndbapi/slow_select.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004, 2005 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testAsynchMultiwait.cpp b/storage/ndb/test/ndbapi/testAsynchMultiwait.cpp
index e71b651e9289..54107fad8c25 100644
--- a/storage/ndb/test/ndbapi/testAsynchMultiwait.cpp
+++ b/storage/ndb/test/ndbapi/testAsynchMultiwait.cpp
@@ -1,14 +1,21 @@
 /*
- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License, version 2.0,
+ as published by the Free Software Foundation.
+
+ This program is also distributed with certain software (including
+ but not limited to OpenSSL) that is licensed under separate terms,
+ as designated in a particular file or component or in included license
+ documentation.  The authors of MySQL hereby grant you an additional
+ permission to link the program and your derivative works with the
+ separately licensed software that they have included with MySQL.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ GNU General Public License, version 2.0, for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testBackup.cpp b/storage/ndb/test/ndbapi/testBackup.cpp
index 43d7665fa3af..29e3d44cb8d3 100644
--- a/storage/ndb/test/ndbapi/testBackup.cpp
+++ b/storage/ndb/test/ndbapi/testBackup.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testBasic.cpp b/storage/ndb/test/ndbapi/testBasic.cpp
index 73b404e0f2ea..b66f4b7b4138 100644
--- a/storage/ndb/test/ndbapi/testBasic.cpp
+++ b/storage/ndb/test/ndbapi/testBasic.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testBasicAsynch.cpp b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
index ae3111229217..24d224c7cc06 100644
--- a/storage/ndb/test/ndbapi/testBasicAsynch.cpp
+++ b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp
index d76776f57290..a08ec9e9435f 100644
--- a/storage/ndb/test/ndbapi/testBitfield.cpp
+++ b/storage/ndb/test/ndbapi/testBitfield.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testBlobs.cpp b/storage/ndb/test/ndbapi/testBlobs.cpp
index 22c6cb89563a..2f9dff8c5198 100644
--- a/storage/ndb/test/ndbapi/testBlobs.cpp
+++ b/storage/ndb/test/ndbapi/testBlobs.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testDataBuffers.cpp b/storage/ndb/test/ndbapi/testDataBuffers.cpp
index d7e967ac8214..2fd92e7df75c 100644
--- a/storage/ndb/test/ndbapi/testDataBuffers.cpp
+++ b/storage/ndb/test/ndbapi/testDataBuffers.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testDeadlock.cpp b/storage/ndb/test/ndbapi/testDeadlock.cpp
index 2cf3008df8d3..22fc527a21d3 100644
--- a/storage/ndb/test/ndbapi/testDeadlock.cpp
+++ b/storage/ndb/test/ndbapi/testDeadlock.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testDebugger.cpp b/storage/ndb/test/ndbapi/testDebugger.cpp
index 1a95c778ceba..5d4d50d1f61e 100644
--- a/storage/ndb/test/ndbapi/testDebugger.cpp
+++ b/storage/ndb/test/ndbapi/testDebugger.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index e350022716f5..8fdd9e915758 100644
--- a/storage/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testFK.cpp b/storage/ndb/test/ndbapi/testFK.cpp
index 774b882c3598..eb0346981742 100644
--- a/storage/ndb/test/ndbapi/testFK.cpp
+++ b/storage/ndb/test/ndbapi/testFK.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testIndex.cpp b/storage/ndb/test/ndbapi/testIndex.cpp
index bec141fd563f..4ef2e2af4fad 100644
--- a/storage/ndb/test/ndbapi/testIndex.cpp
+++ b/storage/ndb/test/ndbapi/testIndex.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testIndexStat.cpp b/storage/ndb/test/ndbapi/testIndexStat.cpp
index c08a0217f98a..32e0a6da9e8c 100644
--- a/storage/ndb/test/ndbapi/testIndexStat.cpp
+++ b/storage/ndb/test/ndbapi/testIndexStat.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testInterpreter.cpp b/storage/ndb/test/ndbapi/testInterpreter.cpp
index 7013415d9a94..c77841c75318 100644
--- a/storage/ndb/test/ndbapi/testInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testInterpreter.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testLcp.cpp b/storage/ndb/test/ndbapi/testLcp.cpp
index 1f0c4bca0870..ebde9e870098 100644
--- a/storage/ndb/test/ndbapi/testLcp.cpp
+++ b/storage/ndb/test/ndbapi/testLcp.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testLimits.cpp b/storage/ndb/test/ndbapi/testLimits.cpp
index 2000dcd9b247..7d889427b06c 100644
--- a/storage/ndb/test/ndbapi/testLimits.cpp
+++ b/storage/ndb/test/ndbapi/testLimits.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testMgm.cpp b/storage/ndb/test/ndbapi/testMgm.cpp
index a9aed8b7653f..07130aef4c61 100644
--- a/storage/ndb/test/ndbapi/testMgm.cpp
+++ b/storage/ndb/test/ndbapi/testMgm.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testMgmDisconnect.c b/storage/ndb/test/ndbapi/testMgmDisconnect.c
index e315bf9faaba..ad756b6ff2ca 100644
--- a/storage/ndb/test/ndbapi/testMgmDisconnect.c
+++ b/storage/ndb/test/ndbapi/testMgmDisconnect.c
@@ -1,15 +1,22 @@
 /* 
-   Copyright 2008 Sun Microsystems, Inc.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testMgmd.cpp b/storage/ndb/test/ndbapi/testMgmd.cpp
index 4ae60aff94aa..15af7fa9b3f3 100644
--- a/storage/ndb/test/ndbapi/testMgmd.cpp
+++ b/storage/ndb/test/ndbapi/testMgmd.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testNDBT.cpp b/storage/ndb/test/ndbapi/testNDBT.cpp
index 0827a80fbf18..3e0e78fb1ce9 100644
--- a/storage/ndb/test/ndbapi/testNDBT.cpp
+++ b/storage/ndb/test/ndbapi/testNDBT.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2008 MySQL AB
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testNativeDefault.cpp b/storage/ndb/test/ndbapi/testNativeDefault.cpp
index 139282e0ca25..7b6d1f261bb0 100644
--- a/storage/ndb/test/ndbapi/testNativeDefault.cpp
+++ b/storage/ndb/test/ndbapi/testNativeDefault.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testNdbApi.cpp b/storage/ndb/test/ndbapi/testNdbApi.cpp
index a031e00d667a..7f2695ef78b6 100644
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testNdbinfo.cpp b/storage/ndb/test/ndbapi/testNdbinfo.cpp
index 20f7763605f9..8b0eece261c9 100644
--- a/storage/ndb/test/ndbapi/testNdbinfo.cpp
+++ b/storage/ndb/test/ndbapi/testNdbinfo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
index 68ece4baedd5..35d3e57f7c13 100644
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testOIBasic.cpp b/storage/ndb/test/ndbapi/testOIBasic.cpp
index 9e9930eb516b..9014956b811d 100644
--- a/storage/ndb/test/ndbapi/testOIBasic.cpp
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testOperations.cpp b/storage/ndb/test/ndbapi/testOperations.cpp
index b07cab19f689..5f254d181358 100644
--- a/storage/ndb/test/ndbapi/testOperations.cpp
+++ b/storage/ndb/test/ndbapi/testOperations.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testOrderedIndex.cpp b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
index 8bea7a0ea918..982ebf2a71c6 100644
--- a/storage/ndb/test/ndbapi/testOrderedIndex.cpp
+++ b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testPartitioning.cpp b/storage/ndb/test/ndbapi/testPartitioning.cpp
index 3a8467d7bb06..a6fae8c1d816 100644
--- a/storage/ndb/test/ndbapi/testPartitioning.cpp
+++ b/storage/ndb/test/ndbapi/testPartitioning.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testReadPerf.cpp b/storage/ndb/test/ndbapi/testReadPerf.cpp
index 99f238fe6d62..1916a6ae12b5 100644
--- a/storage/ndb/test/ndbapi/testReadPerf.cpp
+++ b/storage/ndb/test/ndbapi/testReadPerf.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testReconnect.cpp b/storage/ndb/test/ndbapi/testReconnect.cpp
index e068053fdd27..8d78062be38b 100644
--- a/storage/ndb/test/ndbapi/testReconnect.cpp
+++ b/storage/ndb/test/ndbapi/testReconnect.cpp
@@ -1,14 +1,21 @@
 /* 
-   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testRedo.cpp b/storage/ndb/test/ndbapi/testRedo.cpp
index de8dd53dcfac..d3d5296bc583 100644
--- a/storage/ndb/test/ndbapi/testRedo.cpp
+++ b/storage/ndb/test/ndbapi/testRedo.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testRestartGci.cpp b/storage/ndb/test/ndbapi/testRestartGci.cpp
index 53dea0f11bfe..7b6bbe1a9515 100644
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testSRBank.cpp b/storage/ndb/test/ndbapi/testSRBank.cpp
index 3c437e226577..cc1c2dcd41dc 100644
--- a/storage/ndb/test/ndbapi/testSRBank.cpp
+++ b/storage/ndb/test/ndbapi/testSRBank.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testScan.cpp b/storage/ndb/test/ndbapi/testScan.cpp
index b833b4277f06..adb971c15029 100644
--- a/storage/ndb/test/ndbapi/testScan.cpp
+++ b/storage/ndb/test/ndbapi/testScan.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testScanFilter.cpp b/storage/ndb/test/ndbapi/testScanFilter.cpp
index fb9eec895549..1d3cad232250 100644
--- a/storage/ndb/test/ndbapi/testScanFilter.cpp
+++ b/storage/ndb/test/ndbapi/testScanFilter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testScanInterpreter.cpp b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
index 473393bb72df..bc64c007a2fb 100644
--- a/storage/ndb/test/ndbapi/testScanInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006, 2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testScanPerf.cpp b/storage/ndb/test/ndbapi/testScanPerf.cpp
index 505d92c0642d..2b9a2a778158 100644
--- a/storage/ndb/test/ndbapi/testScanPerf.cpp
+++ b/storage/ndb/test/ndbapi/testScanPerf.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testSingleUserMode.cpp b/storage/ndb/test/ndbapi/testSingleUserMode.cpp
index 8601aea4045c..c1464f9367fb 100644
--- a/storage/ndb/test/ndbapi/testSingleUserMode.cpp
+++ b/storage/ndb/test/ndbapi/testSingleUserMode.cpp
@@ -1,14 +1,21 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testSpj.cpp b/storage/ndb/test/ndbapi/testSpj.cpp
index 376f782f77e2..5c3b07c42d8c 100644
--- a/storage/ndb/test/ndbapi/testSpj.cpp
+++ b/storage/ndb/test/ndbapi/testSpj.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp
index 1873c4ed7883..abbc35271b34 100644
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testTimeout.cpp b/storage/ndb/test/ndbapi/testTimeout.cpp
index 11d149efb4bf..5b1ad04f3ad5 100644
--- a/storage/ndb/test/ndbapi/testTimeout.cpp
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testTransactions.cpp b/storage/ndb/test/ndbapi/testTransactions.cpp
index d8d80ca774bf..3d44a21d90eb 100644
--- a/storage/ndb/test/ndbapi/testTransactions.cpp
+++ b/storage/ndb/test/ndbapi/testTransactions.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
index 8d9d74109356..2db0fe3e76e3 100644
--- a/storage/ndb/test/ndbapi/testUpgrade.cpp
+++ b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/test_event.cpp b/storage/ndb/test/ndbapi/test_event.cpp
index 134a74b58835..58631acc501d 100644
--- a/storage/ndb/test/ndbapi/test_event.cpp
+++ b/storage/ndb/test/ndbapi/test_event.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/test_event_merge.cpp b/storage/ndb/test/ndbapi/test_event_merge.cpp
index 42098b5f945e..e8b875c85b82 100644
--- a/storage/ndb/test/ndbapi/test_event_merge.cpp
+++ b/storage/ndb/test/ndbapi/test_event_merge.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/ndbapi/test_event_multi_table.cpp b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
index e8d7372e87d1..cce951999939 100644
--- a/storage/ndb/test/ndbapi/test_event_multi_table.cpp
+++ b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
@@ -1,15 +1,21 @@
 /*
-   Copyright (C) 2005, 2006, 2008 MySQL AB
-    All rights reserved. Use is subject to license terms.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -272,7 +278,7 @@ main(int argc, char** argv)
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
 
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:F:L";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options, 
diff --git a/storage/ndb/test/ndbapi/userInterface.cpp b/storage/ndb/test/ndbapi/userInterface.cpp
index a411cdbe5b53..bbf2b5c9a993 100644
--- a/storage/ndb/test/ndbapi/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/userInterface.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
index cdac48123288..69875b8318a3 100644
--- a/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
index 5beee7f0de40..5eef64e40869 100644
--- a/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/common.cpp b/storage/ndb/test/newtonapi/basic_test/common.cpp
index 2d5b3654d557..303a3f4798d4 100644
--- a/storage/ndb/test/newtonapi/basic_test/common.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/common.hpp b/storage/ndb/test/newtonapi/basic_test/common.hpp
index e2f81fe5217e..76efd57668f3 100644
--- a/storage/ndb/test/newtonapi/basic_test/common.hpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
index 8d6256ea1946..7f04c1867f02 100644
--- a/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/basic_test/too_basic.cpp b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
index ed08f08e5613..e45a74865d2e 100644
--- a/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/newtonapi/perf_test/perf.cpp b/storage/ndb/test/newtonapi/perf_test/perf.cpp
index 001fb0a03cad..e4472d7c4228 100644
--- a/storage/ndb/test/newtonapi/perf_test/perf.cpp
+++ b/storage/ndb/test/newtonapi/perf_test/perf.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/load_and_run.sh b/storage/ndb/test/rqg/load_and_run.sh
index 44c255e43dcd..d62c8309e822 100755
--- a/storage/ndb/test/rqg/load_and_run.sh
+++ b/storage/ndb/test/rqg/load_and_run.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/load_rqg.sh b/storage/ndb/test/rqg/load_rqg.sh
index 26356e5c8dfb..5cd0dfa69077 100755
--- a/storage/ndb/test/rqg/load_rqg.sh
+++ b/storage/ndb/test/rqg/load_rqg.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/parseargs.sh b/storage/ndb/test/rqg/parseargs.sh
index 3fd6f70dfa7b..f21c1d498a8a 100644
--- a/storage/ndb/test/rqg/parseargs.sh
+++ b/storage/ndb/test/rqg/parseargs.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/run_rqg.sh b/storage/ndb/test/rqg/run_rqg.sh
index 52f3725986aa..d034f4a2175e 100755
--- a/storage/ndb/test/rqg/run_rqg.sh
+++ b/storage/ndb/test/rqg/run_rqg.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/runall.sh b/storage/ndb/test/rqg/runall.sh
index a347bd0b1343..82e4e8555b8c 100755
--- a/storage/ndb/test/rqg/runall.sh
+++ b/storage/ndb/test/rqg/runall.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/rqg/spj_test.yy b/storage/ndb/test/rqg/spj_test.yy
index 54164cbe603d..3b753d9be884 100644
--- a/storage/ndb/test/rqg/spj_test.yy
+++ b/storage/ndb/test/rqg/spj_test.yy
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/16node-tests.txt b/storage/ndb/test/run-test/16node-tests.txt
index 507f304ab633..8297c34f9d08 100644
--- a/storage/ndb/test/run-test/16node-tests.txt
+++ b/storage/ndb/test/run-test/16node-tests.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/CMakeLists.txt b/storage/ndb/test/run-test/CMakeLists.txt
index a9a03e4d5fcf..c47cc45b376f 100644
--- a/storage/ndb/test/run-test/CMakeLists.txt
+++ b/storage/ndb/test/run-test/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -32,7 +39,15 @@ IF(NOT WIN32)
   ADD_DEFINITIONS(-DDEFAULT_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
 ENDIF()
 ADD_EXECUTABLE(atrt main.cpp setup.cpp files.cpp db.cpp command.cpp)
-TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient_static mysqlclient)
+IF(WIN32)
+  # All clients will need auth_win_client
+  TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient_static mysqlclient)
+ELSE()
+  # Linking with mysqlclient may fail on macOS, so link individual libs instead.
+  TARGET_LINK_LIBRARIES(atrt ndbNDBT ndbclient_static
+    clientlib vio mysys mysys_ssl)
+ENDIF()
+
 
 FILE(GLOB testcase_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*-tests.txt")
 ADD_TEST(NAME check_testcase_files
diff --git a/storage/ndb/test/run-test/atrt-analyze-result.sh b/storage/ndb/test/run-test/atrt-analyze-result.sh
index 7dfa28e70ef1..45e60d6b425c 100644
--- a/storage/ndb/test/run-test/atrt-analyze-result.sh
+++ b/storage/ndb/test/run-test/atrt-analyze-result.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 
-# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-backtrace.sh b/storage/ndb/test/run-test/atrt-backtrace.sh
index 26d15f0d8e43..7578bb2ea0ce 100755
--- a/storage/ndb/test/run-test/atrt-backtrace.sh
+++ b/storage/ndb/test/run-test/atrt-backtrace.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-gather-result.sh b/storage/ndb/test/run-test/atrt-gather-result.sh
index 41a9fbef1fd8..15374d345431 100755
--- a/storage/ndb/test/run-test/atrt-gather-result.sh
+++ b/storage/ndb/test/run-test/atrt-gather-result.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-mysql-test-run b/storage/ndb/test/run-test/atrt-mysql-test-run
index 6f8cd015bce2..c78af5edeef3 100755
--- a/storage/ndb/test/run-test/atrt-mysql-test-run
+++ b/storage/ndb/test/run-test/atrt-mysql-test-run
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-mysqltest b/storage/ndb/test/run-test/atrt-mysqltest
index 8080d7c03f7e..b15ceb9a9d38 100755
--- a/storage/ndb/test/run-test/atrt-mysqltest
+++ b/storage/ndb/test/run-test/atrt-mysqltest
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-setup.sh b/storage/ndb/test/run-test/atrt-setup.sh
index 62720f34365f..fd9c3de88f71 100755
--- a/storage/ndb/test/run-test/atrt-setup.sh
+++ b/storage/ndb/test/run-test/atrt-setup.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt-testBackup b/storage/ndb/test/run-test/atrt-testBackup
index c4af30662d42..c55ce024685b 100755
--- a/storage/ndb/test/run-test/atrt-testBackup
+++ b/storage/ndb/test/run-test/atrt-testBackup
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/atrt.hpp b/storage/ndb/test/run-test/atrt.hpp
index 820136cd4a9d..b18aeeb282f9 100644
--- a/storage/ndb/test/run-test/atrt.hpp
+++ b/storage/ndb/test/run-test/atrt.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/autotest-boot.sh b/storage/ndb/test/run-test/autotest-boot.sh
index 35a9bfb95e61..5494ab683f2a 100644
--- a/storage/ndb/test/run-test/autotest-boot.sh
+++ b/storage/ndb/test/run-test/autotest-boot.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/autotest-run.sh b/storage/ndb/test/run-test/autotest-run.sh
index ac6c8373cafd..cafda44b347a 100644
--- a/storage/ndb/test/run-test/autotest-run.sh
+++ b/storage/ndb/test/run-test/autotest-run.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/basic.txt b/storage/ndb/test/run-test/basic.txt
index 009db7e27043..b485adf13b8d 100644
--- a/storage/ndb/test/run-test/basic.txt
+++ b/storage/ndb/test/run-test/basic.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2004, 2005 MySQL AB
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/check-tests.sh b/storage/ndb/test/run-test/check-tests.sh
index eb3b3295d74e..ca7adc20584e 100644
--- a/storage/ndb/test/run-test/check-tests.sh
+++ b/storage/ndb/test/run-test/check-tests.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/command.cpp b/storage/ndb/test/run-test/command.cpp
index 5e0bbfff51d4..216cd4b641a8 100644
--- a/storage/ndb/test/run-test/command.cpp
+++ b/storage/ndb/test/run-test/command.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/conf-blade08.cnf b/storage/ndb/test/run-test/conf-blade08.cnf
index be741f27fdd4..0f186ea06992 100644
--- a/storage/ndb/test/run-test/conf-blade08.cnf
+++ b/storage/ndb/test/run-test/conf-blade08.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/conf-mikael1.cnf b/storage/ndb/test/run-test/conf-mikael1.cnf
index 6132c3a09db3..f585e66bb90c 100644
--- a/storage/ndb/test/run-test/conf-mikael1.cnf
+++ b/storage/ndb/test/run-test/conf-mikael1.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/conf-ndb07.cnf b/storage/ndb/test/run-test/conf-ndb07.cnf
index 4e9e875c7fb3..345a69ae2c4a 100644
--- a/storage/ndb/test/run-test/conf-ndb07.cnf
+++ b/storage/ndb/test/run-test/conf-ndb07.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/conf-tyr13.cnf b/storage/ndb/test/run-test/conf-tyr13.cnf
index afff27761913..c38f0b8cbd00 100644
--- a/storage/ndb/test/run-test/conf-tyr13.cnf
+++ b/storage/ndb/test/run-test/conf-tyr13.cnf
@@ -1,13 +1,20 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/create_mtr_suites.pl b/storage/ndb/test/run-test/create_mtr_suites.pl
index 4e05b96053ff..a57a3fac4115 100755
--- a/storage/ndb/test/run-test/create_mtr_suites.pl
+++ b/storage/ndb/test/run-test/create_mtr_suites.pl
@@ -1,17 +1,24 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
index 96c7d85b47ba..fec230120451 100644
--- a/storage/ndb/test/run-test/daily-basic-tests.txt
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/daily-devel-tests.txt b/storage/ndb/test/run-test/daily-devel-tests.txt
index 5ea327ee4531..ea193c83a4e5 100644
--- a/storage/ndb/test/run-test/daily-devel-tests.txt
+++ b/storage/ndb/test/run-test/daily-devel-tests.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/daily-perf-tests.txt b/storage/ndb/test/run-test/daily-perf-tests.txt
index 5117c498408e..8fe851f284ea 100644
--- a/storage/ndb/test/run-test/daily-perf-tests.txt
+++ b/storage/ndb/test/run-test/daily-perf-tests.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/db.cpp b/storage/ndb/test/run-test/db.cpp
index ca7a7299c0a6..f0b6b2375203 100644
--- a/storage/ndb/test/run-test/db.cpp
+++ b/storage/ndb/test/run-test/db.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/files.cpp b/storage/ndb/test/run-test/files.cpp
index e4c2acf04c56..6b6fd27a725a 100644
--- a/storage/ndb/test/run-test/files.cpp
+++ b/storage/ndb/test/run-test/files.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
index ecf01c93e572..1b76e55918ad 100644
--- a/storage/ndb/test/run-test/main.cpp
+++ b/storage/ndb/test/run-test/main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/make-config.sh b/storage/ndb/test/run-test/make-config.sh
index 1e8aae7d03ab..9c3036abb6eb 100755
--- a/storage/ndb/test/run-test/make-config.sh
+++ b/storage/ndb/test/run-test/make-config.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/make-html-reports.sh b/storage/ndb/test/run-test/make-html-reports.sh
index 695ffcc71c48..3c34a5883eb9 100755
--- a/storage/ndb/test/run-test/make-html-reports.sh
+++ b/storage/ndb/test/run-test/make-html-reports.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/make-index.sh b/storage/ndb/test/run-test/make-index.sh
index f5b64f243e9f..7e5239db11d1 100755
--- a/storage/ndb/test/run-test/make-index.sh
+++ b/storage/ndb/test/run-test/make-index.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/ndb-autotest.sh b/storage/ndb/test/run-test/ndb-autotest.sh
index cfb649b6be9b..d0c13701785c 100755
--- a/storage/ndb/test/run-test/ndb-autotest.sh
+++ b/storage/ndb/test/run-test/ndb-autotest.sh
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2005, 2006 MySQL AB
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/setup.cpp b/storage/ndb/test/run-test/setup.cpp
index 179d3057e3d8..86038171e123 100644
--- a/storage/ndb/test/run-test/setup.cpp
+++ b/storage/ndb/test/run-test/setup.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/upgrade-boot.sh b/storage/ndb/test/run-test/upgrade-boot.sh
index 76c69340bc0f..651e51f26534 100644
--- a/storage/ndb/test/run-test/upgrade-boot.sh
+++ b/storage/ndb/test/run-test/upgrade-boot.sh
@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/run-test/upgrade-tests.txt b/storage/ndb/test/run-test/upgrade-tests.txt
index d7d8a556d711..8bf20af24aa3 100644
--- a/storage/ndb/test/run-test/upgrade-tests.txt
+++ b/storage/ndb/test/run-test/upgrade-tests.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/AtrtClient.cpp b/storage/ndb/test/src/AtrtClient.cpp
index 6a8a1a253432..399fe20f053f 100644
--- a/storage/ndb/test/src/AtrtClient.cpp
+++ b/storage/ndb/test/src/AtrtClient.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/CMakeLists.txt b/storage/ndb/test/src/CMakeLists.txt
index e5a576d45a34..153c6a5dfb05 100644
--- a/storage/ndb/test/src/CMakeLists.txt
+++ b/storage/ndb/test/src/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (C) 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #  All rights reserved. Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/CpcClient.cpp b/storage/ndb/test/src/CpcClient.cpp
index 6abe01fb8f64..a512132d700b 100644
--- a/storage/ndb/test/src/CpcClient.cpp
+++ b/storage/ndb/test/src/CpcClient.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/DbUtil.cpp b/storage/ndb/test/src/DbUtil.cpp
index 3e152d1f03de..aa80a41dd59a 100644
--- a/storage/ndb/test/src/DbUtil.cpp
+++ b/storage/ndb/test/src/DbUtil.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007, 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoAsynchTransactions.cpp b/storage/ndb/test/src/HugoAsynchTransactions.cpp
index 5f488d6eb32f..2095bfe7343a 100644
--- a/storage/ndb/test/src/HugoAsynchTransactions.cpp
+++ b/storage/ndb/test/src/HugoAsynchTransactions.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoCalculator.cpp b/storage/ndb/test/src/HugoCalculator.cpp
index cc32edd5d858..e234ace27728 100644
--- a/storage/ndb/test/src/HugoCalculator.cpp
+++ b/storage/ndb/test/src/HugoCalculator.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoOperations.cpp b/storage/ndb/test/src/HugoOperations.cpp
index cf75a020035e..e0a030c71d50 100644
--- a/storage/ndb/test/src/HugoOperations.cpp
+++ b/storage/ndb/test/src/HugoOperations.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoQueries.cpp b/storage/ndb/test/src/HugoQueries.cpp
index 57390eba9740..b377f7b88271 100644
--- a/storage/ndb/test/src/HugoQueries.cpp
+++ b/storage/ndb/test/src/HugoQueries.cpp
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoQueryBuilder.cpp b/storage/ndb/test/src/HugoQueryBuilder.cpp
index 98e1928fa781..942988c49b77 100644
--- a/storage/ndb/test/src/HugoQueryBuilder.cpp
+++ b/storage/ndb/test/src/HugoQueryBuilder.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/HugoTransactions.cpp b/storage/ndb/test/src/HugoTransactions.cpp
index 6974bbd03b6b..4324f0c5010f 100644
--- a/storage/ndb/test/src/HugoTransactions.cpp
+++ b/storage/ndb/test/src/HugoTransactions.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Error.cpp b/storage/ndb/test/src/NDBT_Error.cpp
index 0c1f55e9bd08..de7e9ec11cc6 100644
--- a/storage/ndb/test/src/NDBT_Error.cpp
+++ b/storage/ndb/test/src/NDBT_Error.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Find.cpp b/storage/ndb/test/src/NDBT_Find.cpp
index bed9821498f5..835ba8306be7 100644
--- a/storage/ndb/test/src/NDBT_Find.cpp
+++ b/storage/ndb/test/src/NDBT_Find.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Output.cpp b/storage/ndb/test/src/NDBT_Output.cpp
index e1487f845c27..499e277d7357 100644
--- a/storage/ndb/test/src/NDBT_Output.cpp
+++ b/storage/ndb/test/src/NDBT_Output.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003, 2005, 2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_ResultRow.cpp b/storage/ndb/test/src/NDBT_ResultRow.cpp
index b1534a9ed9ab..803ac354c465 100644
--- a/storage/ndb/test/src/NDBT_ResultRow.cpp
+++ b/storage/ndb/test/src/NDBT_ResultRow.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_ReturnCodes.cpp b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
index cce3a50b1014..63e6b2eaf479 100644
--- a/storage/ndb/test/src/NDBT_ReturnCodes.cpp
+++ b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Table.cpp b/storage/ndb/test/src/NDBT_Table.cpp
index 68f016268f4f..e71903b792d0 100644
--- a/storage/ndb/test/src/NDBT_Table.cpp
+++ b/storage/ndb/test/src/NDBT_Table.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Tables.cpp b/storage/ndb/test/src/NDBT_Tables.cpp
index 659a52843deb..31cb4e14c0ff 100644
--- a/storage/ndb/test/src/NDBT_Tables.cpp
+++ b/storage/ndb/test/src/NDBT_Tables.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index 4df400659ad4..27606e55da73 100644
--- a/storage/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1478,7 +1485,7 @@ int NDBT_TestSuite::execute(int argc, const char** argv){
   char** defaults_argv= _argv;
 
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:i:F:L";
 #endif
   if ((ho_error=handle_options(&argc, &_argv, my_long_options,
diff --git a/storage/ndb/test/src/NDBT_Thread.cpp b/storage/ndb/test/src/NDBT_Thread.cpp
index 524544bd9d01..765fd1802b47 100644
--- a/storage/ndb/test/src/NDBT_Thread.cpp
+++ b/storage/ndb/test/src/NDBT_Thread.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp
index a13044206c55..fdf79c665e36 100644
--- a/storage/ndb/test/src/NdbBackup.cpp
+++ b/storage/ndb/test/src/NdbBackup.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbConfig.cpp b/storage/ndb/test/src/NdbConfig.cpp
index 1b0e72fde26b..1e6f225031b8 100644
--- a/storage/ndb/test/src/NdbConfig.cpp
+++ b/storage/ndb/test/src/NdbConfig.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbMixRestarter.cpp b/storage/ndb/test/src/NdbMixRestarter.cpp
index ec4e860d24a7..38b794e4b821 100644
--- a/storage/ndb/test/src/NdbMixRestarter.cpp
+++ b/storage/ndb/test/src/NdbMixRestarter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp
index 757aafdd5f6f..234edfc747b1 100644
--- a/storage/ndb/test/src/NdbRestarter.cpp
+++ b/storage/ndb/test/src/NdbRestarter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbRestarts.cpp b/storage/ndb/test/src/NdbRestarts.cpp
index 519a368f42d8..89e2f5c2f5ad 100644
--- a/storage/ndb/test/src/NdbRestarts.cpp
+++ b/storage/ndb/test/src/NdbRestarts.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbSchemaCon.cpp b/storage/ndb/test/src/NdbSchemaCon.cpp
index 4c3b4d470280..756274c1eec9 100644
--- a/storage/ndb/test/src/NdbSchemaCon.cpp
+++ b/storage/ndb/test/src/NdbSchemaCon.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/NdbSchemaOp.cpp b/storage/ndb/test/src/NdbSchemaOp.cpp
index 7c50fce2ac6b..4de8e0c0e151 100644
--- a/storage/ndb/test/src/NdbSchemaOp.cpp
+++ b/storage/ndb/test/src/NdbSchemaOp.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/SocketInputStream2.cpp b/storage/ndb/test/src/SocketInputStream2.cpp
index bab79f61260f..728e2347f7fb 100644
--- a/storage/ndb/test/src/SocketInputStream2.cpp
+++ b/storage/ndb/test/src/SocketInputStream2.cpp
@@ -1,14 +1,21 @@
-/* Copyright 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/SqlClient.cpp b/storage/ndb/test/src/SqlClient.cpp
index 4f76b946a7e7..6ca4286d0457 100644
--- a/storage/ndb/test/src/SqlClient.cpp
+++ b/storage/ndb/test/src/SqlClient.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2008 MySQL AB
+   Copyright (c) 2008, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/UtilTransactions.cpp b/storage/ndb/test/src/UtilTransactions.cpp
index bbe3b9bf4dc0..0e8b968c8b3d 100644
--- a/storage/ndb/test/src/UtilTransactions.cpp
+++ b/storage/ndb/test/src/UtilTransactions.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/src/getarg.c b/storage/ndb/test/src/getarg.c
index 152a347e6e29..aeb3307e1860 100644
--- a/storage/ndb/test/src/getarg.c
+++ b/storage/ndb/test/src/getarg.c
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 4; -*- */
 /*
- * Copyright (C) 2003-2005 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates.
  * Use is subject to license terms
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
diff --git a/storage/ndb/test/tools/CMakeLists.txt b/storage/ndb/test/tools/CMakeLists.txt
index f4ae0f121944..54f915d50575 100644
--- a/storage/ndb/test/tools/CMakeLists.txt
+++ b/storage/ndb/test/tools/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/connect.cpp b/storage/ndb/test/tools/connect.cpp
index c70a80b0956e..83b02bdce83e 100644
--- a/storage/ndb/test/tools/connect.cpp
+++ b/storage/ndb/test/tools/connect.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +64,7 @@ int main(int argc, char** argv){
   const char *load_default_groups[]= { "mysql_cluster",0 };
   ndb_load_defaults(NULL, load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_connect.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options, 
diff --git a/storage/ndb/test/tools/copy_tab.cpp b/storage/ndb/test/tools/copy_tab.cpp
index fe5ee1e98513..3f319f9ae68e 100644
--- a/storage/ndb/test/tools/copy_tab.cpp
+++ b/storage/ndb/test/tools/copy_tab.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/cpcc.cpp b/storage/ndb/test/tools/cpcc.cpp
index 62f10408620a..df08d1881946 100644
--- a/storage/ndb/test/tools/cpcc.cpp
+++ b/storage/ndb/test/tools/cpcc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/create_fk.cpp b/storage/ndb/test/tools/create_fk.cpp
index 4e7e0e1b38f8..eed100420be5 100644
--- a/storage/ndb/test/tools/create_fk.cpp
+++ b/storage/ndb/test/tools/create_fk.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/create_index.cpp b/storage/ndb/test/tools/create_index.cpp
index aaeeee3c39f8..9722d1aefcfe 100644
--- a/storage/ndb/test/tools/create_index.cpp
+++ b/storage/ndb/test/tools/create_index.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/drop_fk.cpp b/storage/ndb/test/tools/drop_fk.cpp
index be129c94c9cc..c5c9949924ab 100644
--- a/storage/ndb/test/tools/drop_fk.cpp
+++ b/storage/ndb/test/tools/drop_fk.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoCalculator.cpp b/storage/ndb/test/tools/hugoCalculator.cpp
index 182be497f305..83e96020d283 100644
--- a/storage/ndb/test/tools/hugoCalculator.cpp
+++ b/storage/ndb/test/tools/hugoCalculator.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoFill.cpp b/storage/ndb/test/tools/hugoFill.cpp
index 35e1c3d1eb12..1a25aa3ff4b9 100644
--- a/storage/ndb/test/tools/hugoFill.cpp
+++ b/storage/ndb/test/tools/hugoFill.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoJoin.cpp b/storage/ndb/test/tools/hugoJoin.cpp
index a0fa0d0b1925..53af7cada12b 100644
--- a/storage/ndb/test/tools/hugoJoin.cpp
+++ b/storage/ndb/test/tools/hugoJoin.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoLoad.cpp b/storage/ndb/test/tools/hugoLoad.cpp
index 9d847c18245e..03148d8e6bdf 100644
--- a/storage/ndb/test/tools/hugoLoad.cpp
+++ b/storage/ndb/test/tools/hugoLoad.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoLockRecords.cpp b/storage/ndb/test/tools/hugoLockRecords.cpp
index be500a710344..d6f21bcf2709 100644
--- a/storage/ndb/test/tools/hugoLockRecords.cpp
+++ b/storage/ndb/test/tools/hugoLockRecords.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoPkDelete.cpp b/storage/ndb/test/tools/hugoPkDelete.cpp
index 8cafd5d23557..c40e3020353e 100644
--- a/storage/ndb/test/tools/hugoPkDelete.cpp
+++ b/storage/ndb/test/tools/hugoPkDelete.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoPkRead.cpp b/storage/ndb/test/tools/hugoPkRead.cpp
index 5220983e4e0d..f78d33629bdd 100644
--- a/storage/ndb/test/tools/hugoPkRead.cpp
+++ b/storage/ndb/test/tools/hugoPkRead.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoPkReadRecord.cpp b/storage/ndb/test/tools/hugoPkReadRecord.cpp
index b6d500000841..c4a563d260b5 100644
--- a/storage/ndb/test/tools/hugoPkReadRecord.cpp
+++ b/storage/ndb/test/tools/hugoPkReadRecord.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoPkUpdate.cpp b/storage/ndb/test/tools/hugoPkUpdate.cpp
index 025b1a74b0f3..cc855a873708 100644
--- a/storage/ndb/test/tools/hugoPkUpdate.cpp
+++ b/storage/ndb/test/tools/hugoPkUpdate.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2008 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoScanRead.cpp b/storage/ndb/test/tools/hugoScanRead.cpp
index 7ab4f2000238..cb034f4849c3 100644
--- a/storage/ndb/test/tools/hugoScanRead.cpp
+++ b/storage/ndb/test/tools/hugoScanRead.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/hugoScanUpdate.cpp b/storage/ndb/test/tools/hugoScanUpdate.cpp
index 8af501273d46..2b456e0b33d3 100644
--- a/storage/ndb/test/tools/hugoScanUpdate.cpp
+++ b/storage/ndb/test/tools/hugoScanUpdate.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/listen.cpp b/storage/ndb/test/tools/listen.cpp
index e8df3f64a107..f56269133817 100644
--- a/storage/ndb/test/tools/listen.cpp
+++ b/storage/ndb/test/tools/listen.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/log_listner.cpp b/storage/ndb/test/tools/log_listner.cpp
index 03bc312deea9..f8dc0d2ff3db 100644
--- a/storage/ndb/test/tools/log_listner.cpp
+++ b/storage/ndb/test/tools/log_listner.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -49,7 +56,7 @@ main(int argc, char** argv)
   const char *load_default_groups[]= { "mysql_cluster",0 };
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/eventlog.trace";
 #endif
 
diff --git a/storage/ndb/test/tools/rep_latency.cpp b/storage/ndb/test/tools/rep_latency.cpp
index d87468ed505e..79f3ce62d845 100644
--- a/storage/ndb/test/tools/rep_latency.cpp
+++ b/storage/ndb/test/tools/rep_latency.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/restart.cpp b/storage/ndb/test/tools/restart.cpp
index 6b1b1bf5ef63..522f561f3ac7 100644
--- a/storage/ndb/test/tools/restart.cpp
+++ b/storage/ndb/test/tools/restart.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/spj_performance_test.cpp b/storage/ndb/test/tools/spj_performance_test.cpp
index 1a1eeaf9230c..fd615261a3df 100644
--- a/storage/ndb/test/tools/spj_performance_test.cpp
+++ b/storage/ndb/test/tools/spj_performance_test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/spj_sanity_test.cpp b/storage/ndb/test/tools/spj_sanity_test.cpp
index e9261289073d..06947ebc2a5c 100644
--- a/storage/ndb/test/tools/spj_sanity_test.cpp
+++ b/storage/ndb/test/tools/spj_sanity_test.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/test/tools/test_spj.cpp b/storage/ndb/test/tools/test_spj.cpp
index 09156fae37d3..96ff98a64fca 100644
--- a/storage/ndb/test/tools/test_spj.cpp
+++ b/storage/ndb/test/tools/test_spj.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -81,7 +88,7 @@ int main(int argc, char** argv)
   const char *load_default_groups[]= { "mysql_cluster",0 };
   load_defaults("my",load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_desc.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/test/tools/verify_index.cpp b/storage/ndb/test/tools/verify_index.cpp
index 7fe7479a3bfe..89d3b13107e9 100644
--- a/storage/ndb/test/tools/verify_index.cpp
+++ b/storage/ndb/test/tools/verify_index.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2003-2006 MySQL AB
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/CMakeLists.txt b/storage/ndb/tools/CMakeLists.txt
index bb4c0a6c6686..aa8cc306fbc0 100644
--- a/storage/ndb/tools/CMakeLists.txt
+++ b/storage/ndb/tools/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/delete_all.cpp b/storage/ndb/tools/delete_all.cpp
index 26bc43bb4089..0952f477d9a7 100644
--- a/storage/ndb/tools/delete_all.cpp
+++ b/storage/ndb/tools/delete_all.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -66,7 +73,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_delete_all.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/tools/desc.cpp b/storage/ndb/tools/desc.cpp
index 541a4bba8ff5..d42bafc0dfe4 100644
--- a/storage/ndb/tools/desc.cpp
+++ b/storage/ndb/tools/desc.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -86,7 +93,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_desc.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options, 
diff --git a/storage/ndb/tools/drop_index.cpp b/storage/ndb/tools/drop_index.cpp
index 4d7f15a317bb..95d98bf35201 100644
--- a/storage/ndb/tools/drop_index.cpp
+++ b/storage/ndb/tools/drop_index.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/drop_tab.cpp b/storage/ndb/tools/drop_tab.cpp
index 8bb123a8043c..3c1d192ac8d4 100644
--- a/storage/ndb/tools/drop_tab.cpp
+++ b/storage/ndb/tools/drop_tab.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/listTables.cpp b/storage/ndb/tools/listTables.cpp
index fd51bd5aeecc..5533f1ade983 100644
--- a/storage/ndb/tools/listTables.cpp
+++ b/storage/ndb/tools/listTables.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -304,7 +311,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_show_tables.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/tools/ndb_blob_tool.cpp b/storage/ndb/tools/ndb_blob_tool.cpp
index fef2c9ec42e8..b12786a08db4 100644
--- a/storage/ndb/tools/ndb_blob_tool.cpp
+++ b/storage/ndb/tools/ndb_blob_tool.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_config.cpp b/storage/ndb/tools/ndb_config.cpp
index e397d35164a1..f1743dd9f549 100644
--- a/storage/ndb/tools/ndb_config.cpp
+++ b/storage/ndb/tools/ndb_config.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_dist_priv.sql b/storage/ndb/tools/ndb_dist_priv.sql
index c65d5580c783..cfcd4df63fdc 100644
--- a/storage/ndb/tools/ndb_dist_priv.sql
+++ b/storage/ndb/tools/ndb_dist_priv.sql
@@ -1,13 +1,20 @@
--- Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2011, 2021, Oracle and/or its affiliates.
 --
 -- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; version 2 of the License.
+-- it under the terms of the GNU General Public License, version 2.0,
+-- as published by the Free Software Foundation.
+--
+-- This program is also distributed with certain software (including
+-- but not limited to OpenSSL) that is licensed under separate terms,
+-- as designated in a particular file or component or in included license
+-- documentation.  The authors of MySQL hereby grant you an additional
+-- permission to link the program and your derivative works with the
+-- separately licensed software that they have included with MySQL.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
+-- GNU General Public License, version 2.0, for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_dump_frm_data.cpp b/storage/ndb/tools/ndb_dump_frm_data.cpp
index 035a32d65d87..902f7214370c 100644
--- a/storage/ndb/tools/ndb_dump_frm_data.cpp
+++ b/storage/ndb/tools/ndb_dump_frm_data.cpp
@@ -1,13 +1,20 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_error_reporter.pl b/storage/ndb/tools/ndb_error_reporter.pl
index 57a1facbe4f7..1c2510e705a2 100644
--- a/storage/ndb/tools/ndb_error_reporter.pl
+++ b/storage/ndb/tools/ndb_error_reporter.pl
@@ -1,15 +1,22 @@
 #!/usr/bin/perl -w
 
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_index_stat.cpp b/storage/ndb/tools/ndb_index_stat.cpp
index 06d049cc940b..af4c1ca5b987 100644
--- a/storage/ndb/tools/ndb_index_stat.cpp
+++ b/storage/ndb/tools/ndb_index_stat.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_lib_move_data.cpp b/storage/ndb/tools/ndb_lib_move_data.cpp
index 6cba893c1e31..54d5386ed525 100644
--- a/storage/ndb/tools/ndb_lib_move_data.cpp
+++ b/storage/ndb/tools/ndb_lib_move_data.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_lib_move_data.hpp b/storage/ndb/tools/ndb_lib_move_data.hpp
index f4afbba83ff7..62be5ca9ae4a 100644
--- a/storage/ndb/tools/ndb_lib_move_data.hpp
+++ b/storage/ndb/tools/ndb_lib_move_data.hpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_move_data.cpp b/storage/ndb/tools/ndb_move_data.cpp
index 9ec6baa768d0..1d53f7d432ab 100644
--- a/storage/ndb/tools/ndb_move_data.cpp
+++ b/storage/ndb/tools/ndb_move_data.cpp
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_size.pl b/storage/ndb/tools/ndb_size.pl
index 4b18fa6a8ae2..be8f28ca9172 100644
--- a/storage/ndb/tools/ndb_size.pl
+++ b/storage/ndb/tools/ndb_size.pl
@@ -1,15 +1,22 @@
 #!/usr/bin/perl -w
 
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndb_test_platform.cpp b/storage/ndb/tools/ndb_test_platform.cpp
index cfba2e70b2da..043d44679c00 100644
--- a/storage/ndb/tools/ndb_test_platform.cpp
+++ b/storage/ndb/tools/ndb_test_platform.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/ndbinfo_select_all.cpp b/storage/ndb/tools/ndbinfo_select_all.cpp
index 26b0faccb55b..7ca395aa3c63 100644
--- a/storage/ndb/tools/ndbinfo_select_all.cpp
+++ b/storage/ndb/tools/ndbinfo_select_all.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -57,7 +64,7 @@ main(int argc, char** argv)
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndbinfo_select_all.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/tools/ndbinfo_sql.cpp b/storage/ndb/tools/ndbinfo_sql.cpp
index 10fe7707effc..68105de53e4a 100644
--- a/storage/ndb/tools/ndbinfo_sql.cpp
+++ b/storage/ndb/tools/ndbinfo_sql.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
index ca854a6c97f7..af979a8550f1 100644
--- a/storage/ndb/tools/restore/Restore.cpp
+++ b/storage/ndb/tools/restore/Restore.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/Restore.hpp b/storage/ndb/tools/restore/Restore.hpp
index f8e6fbe87d4b..836f66ef8da2 100644
--- a/storage/ndb/tools/restore/Restore.hpp
+++ b/storage/ndb/tools/restore/Restore.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer.cpp b/storage/ndb/tools/restore/consumer.cpp
index c69fe74225d1..fe41e8e099a2 100644
--- a/storage/ndb/tools/restore/consumer.cpp
+++ b/storage/ndb/tools/restore/consumer.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer.hpp b/storage/ndb/tools/restore/consumer.hpp
index b7ca545bc2f6..0b188eedd334 100644
--- a/storage/ndb/tools/restore/consumer.hpp
+++ b/storage/ndb/tools/restore/consumer.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer_printer.cpp b/storage/ndb/tools/restore/consumer_printer.cpp
index 2c24c4b00bd4..b32da1322b98 100644
--- a/storage/ndb/tools/restore/consumer_printer.cpp
+++ b/storage/ndb/tools/restore/consumer_printer.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer_printer.hpp b/storage/ndb/tools/restore/consumer_printer.hpp
index 10be8be85ed0..67473857f3fb 100644
--- a/storage/ndb/tools/restore/consumer_printer.hpp
+++ b/storage/ndb/tools/restore/consumer_printer.hpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp
index 40efb7bff1dc..0261087f3356 100644
--- a/storage/ndb/tools/restore/consumer_restore.cpp
+++ b/storage/ndb/tools/restore/consumer_restore.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer_restore.hpp b/storage/ndb/tools/restore/consumer_restore.hpp
index ab45da772880..143311decc0d 100644
--- a/storage/ndb/tools/restore/consumer_restore.hpp
+++ b/storage/ndb/tools/restore/consumer_restore.hpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/consumer_restorem.cpp b/storage/ndb/tools/restore/consumer_restorem.cpp
index 82ca3fb32614..9b92dd6dad20 100644
--- a/storage/ndb/tools/restore/consumer_restorem.cpp
+++ b/storage/ndb/tools/restore/consumer_restorem.cpp
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2004-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/ndb_nodegroup_map.h b/storage/ndb/tools/restore/ndb_nodegroup_map.h
index 3f9eb74bb7b6..fadd478feac3 100644
--- a/storage/ndb/tools/restore/ndb_nodegroup_map.h
+++ b/storage/ndb/tools/restore/ndb_nodegroup_map.h
@@ -1,15 +1,22 @@
 /*
-   Copyright (C) 2006 MySQL AB
+   Copyright (c) 2006, 2021, Oracle and/or its affiliates.
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
index 4277cca32ff5..7e4cb67c9044 100644
--- a/storage/ndb/tools/restore/restore_main.cpp
+++ b/storage/ndb/tools/restore/restore_main.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -442,7 +449,7 @@ static my_bool
 get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
 	       char *argument)
 {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_restore.trace";
 #endif
   ndb_std_get_one_option(optid, opt, argument);
diff --git a/storage/ndb/tools/select_all.cpp b/storage/ndb/tools/select_all.cpp
index e3a0829f63de..6f405fc08236 100644
--- a/storage/ndb/tools/select_all.cpp
+++ b/storage/ndb/tools/select_all.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -122,7 +129,7 @@ int main(int argc, char** argv){
   ndb_load_defaults(NULL, load_default_groups,&argc,&argv);
   const char* _tabname;
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_select_all.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/tools/select_count.cpp b/storage/ndb/tools/select_count.cpp
index 60e7355e5c78..665824e8ce75 100644
--- a/storage/ndb/tools/select_count.cpp
+++ b/storage/ndb/tools/select_count.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -69,7 +76,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
   int ho_error;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_select_count.trace";
 #endif
   if ((ho_error=handle_options(&argc, &argv, my_long_options,
diff --git a/storage/ndb/tools/waiter.cpp b/storage/ndb/tools/waiter.cpp
index a2a7713b6137..0a9107ba2f35 100644
--- a/storage/ndb/tools/waiter.cpp
+++ b/storage/ndb/tools/waiter.cpp
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2021, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,7 +98,7 @@ int main(int argc, char** argv){
   ndb_opt_set_usage_funcs(short_usage_sub, usage);
   ndb_load_defaults(NULL,load_default_groups,&argc,&argv);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   opt_debug= "d:t:O,/tmp/ndb_waiter.trace";
 #endif
 
diff --git a/storage/ndb/wix/CMakeLists.txt b/storage/ndb/wix/CMakeLists.txt
index dd6b2ae59584..577e6c646d5a 100644
--- a/storage/ndb/wix/CMakeLists.txt
+++ b/storage/ndb/wix/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/ndb/wix/fix_create_msi.cmake b/storage/ndb/wix/fix_create_msi.cmake
index 53f88e1b8535..98d888788e99 100644
--- a/storage/ndb/wix/fix_create_msi.cmake
+++ b/storage/ndb/wix/fix_create_msi.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/ndb/wix/ndb_create_wxs.cmake b/storage/ndb/wix/ndb_create_wxs.cmake
index 17c4f0a7ea15..3ad5aca8ecba 100644
--- a/storage/ndb/wix/ndb_create_wxs.cmake
+++ b/storage/ndb/wix/ndb_create_wxs.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/ndb/wix/update_cache.cmake b/storage/ndb/wix/update_cache.cmake
index c7d8224f18f6..9b695b866c7e 100644
--- a/storage/ndb/wix/update_cache.cmake
+++ b/storage/ndb/wix/update_cache.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/ndb/wix/write_wxs.cmake b/storage/ndb/wix/write_wxs.cmake
index 99841db22109..1fe8fa1f5094 100644
--- a/storage/ndb/wix/write_wxs.cmake
+++ b/storage/ndb/wix/write_wxs.cmake
@@ -1,14 +1,21 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates.
 # 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/storage/partition/CMakeLists.txt b/storage/partition/CMakeLists.txt
index c85bf7c9bb27..ac88ca42c4c5 100644
--- a/storage/partition/CMakeLists.txt
+++ b/storage/partition/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/storage/partition/ha_partition.cc b/storage/partition/ha_partition.cc
index c0bbc7a7a2af..748747ac7c5d 100644
--- a/storage/partition/ha_partition.cc
+++ b/storage/partition/ha_partition.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -66,7 +73,7 @@
 #include "log.h"                             // sql_print_error
 
 #include "debug_sync.h"
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 #include "sql_test.h"                        // print_where
 #endif
 
@@ -170,7 +177,7 @@ Parts_share_refs::~Parts_share_refs()
 
 bool Parts_share_refs::init(uint arg_num_parts)
 {
-  DBUG_ASSERT(!num_parts && !ha_shares);
+  assert(!num_parts && !ha_shares);
   num_parts= arg_num_parts;
   /* Allocate an array of Handler_share pointers */
   ha_shares= new Handler_share *[num_parts];
@@ -462,7 +469,7 @@ bool ha_partition::initialize_partition(MEM_ROOT *mem_root)
   }
   if (m_part_info)
   {
-    DBUG_ASSERT(m_tot_parts > 0);
+    assert(m_tot_parts > 0);
     if (new_handlers_from_part_info(mem_root))
       DBUG_RETURN(true);
   }
@@ -684,7 +691,7 @@ int ha_partition::create(const char *name, TABLE *table_arg,
   TABLE_SHARE *share= table_arg->s;
   DBUG_ENTER("ha_partition::create");
 
-  DBUG_ASSERT(*fn_rext((char*)name) == '\0');
+  assert(*fn_rext((char*)name) == '\0');
 
   /* Not allowed to create temporary partitioned tables */
   if (create_info && create_info->options & HA_LEX_CREATE_TMP_TABLE)
@@ -695,7 +702,7 @@ int ha_partition::create(const char *name, TABLE *table_arg,
 
   if (get_from_handler_file(name, ha_thd()->mem_root, false))
     DBUG_RETURN(TRUE);
-  DBUG_ASSERT(m_file_buffer);
+  assert(m_file_buffer);
   DBUG_PRINT("enter", ("name: (%s)", name));
   name_buffer_ptr= m_name_buffer_ptr;
   file= m_file;
@@ -937,7 +944,7 @@ int ha_partition::handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt,
     error= file->preload_keys(thd, check_opt);
   else
   {
-    DBUG_ASSERT(FALSE);
+    assert(FALSE);
     error= 1;
   }
   if (error == HA_ADMIN_ALREADY_DONE)
@@ -1401,7 +1408,6 @@ void ha_partition::update_create_info(HA_CREATE_INFO *create_info)
   uint num_parts = num_subparts ? m_file_tot_parts / num_subparts
                                 : m_file_tot_parts;
   HA_CREATE_INFO dummy_info;
-  memset(&dummy_info, 0, sizeof(dummy_info));
 
   /*
   Since update_create_info() can be called from mysql_prepare_alter_table()
@@ -1438,16 +1444,16 @@ void ha_partition::update_create_info(HA_CREATE_INFO *create_info)
   for (i= 0; i < num_parts; i++)
   {
     part_elem= part_it++;
-    DBUG_ASSERT(part_elem);
+    assert(part_elem);
     if (m_is_sub_partitioned)
     {
       List_iterator<partition_element> subpart_it(part_elem->subpartitions);
       for (j= 0; j < num_subparts; j++)
       {
         sub_elem= subpart_it++;
-        DBUG_ASSERT(sub_elem);
+        assert(sub_elem);
         part= i * num_subparts + j;
-        DBUG_ASSERT(part < m_file_tot_parts && m_file[part]);
+        assert(part < m_file_tot_parts && m_file[part]);
         if (ha_legacy_type(m_file[part]->ht) == DB_TYPE_INNODB)
         {
           dummy_info.data_file_name= dummy_info.index_file_name = NULL;
@@ -1466,7 +1472,7 @@ void ha_partition::update_create_info(HA_CREATE_INFO *create_info)
     }
     else
     {
-      DBUG_ASSERT(m_file[i]);
+      assert(m_file[i]);
       if (ha_legacy_type(m_file[i]->ht) == DB_TYPE_INNODB)
       {
         dummy_info.data_file_name= dummy_info.index_file_name= NULL;
@@ -1508,7 +1514,7 @@ void ha_partition::change_table_ptr(TABLE *table_arg, TABLE_SHARE *share)
   if (m_file)
   {
     file_array= m_file;
-    DBUG_ASSERT(*file_array);
+    assert(*file_array);
     do
     {
       (*file_array)->change_table_ptr(table_arg, share);
@@ -1562,7 +1568,7 @@ int ha_partition::del_ren_table(const char *from, const char *to)
 
   if (get_from_handler_file(from, ha_thd()->mem_root, false))
     DBUG_RETURN(error);
-  DBUG_ASSERT(m_file_buffer);
+  assert(m_file_buffer);
   DBUG_PRINT("enter", ("from: (%s) to: (%s)", from, to ? to : "(nil)"));
   name_buffer_ptr= m_name_buffer_ptr;
   file= m_file;
@@ -1912,8 +1918,8 @@ bool ha_partition::new_handlers_from_part_info(MEM_ROOT *mem_root)
   }
   m_file_tot_parts= m_tot_parts;
   memset(m_file, 0, alloc_len);
-  DBUG_ASSERT(m_part_info->num_parts > 0);
-  DBUG_ASSERT(m_part_info->num_parts == m_part_info->partitions.elements);
+  assert(m_part_info->num_parts > 0);
+  assert(m_part_info->num_parts == m_part_info->partitions.elements);
 
   i= 0;
   part_count= 0;
@@ -2006,7 +2012,7 @@ bool ha_partition::read_par_file(const char *name)
     goto err2;
   m_tot_parts= uint4korr((file_buffer) + PAR_NUM_PARTS_OFFSET);
   DBUG_PRINT("info", ("No of parts = %u", m_tot_parts));
-  DBUG_ASSERT(!m_file_tot_parts || m_file_tot_parts == m_tot_parts);
+  assert(!m_file_tot_parts || m_file_tot_parts == m_tot_parts);
   tot_partition_words= (m_tot_parts + PAR_WORD_SIZE - 1) / PAR_WORD_SIZE;
 
   tot_name_len_offset= file_buffer + PAR_ENGINES_OFFSET +
@@ -2050,8 +2056,8 @@ bool ha_partition::setup_engine_array(MEM_ROOT *mem_root)
   handlerton *first_engine;
   enum legacy_db_type db_type, first_db_type;
 
-  DBUG_ASSERT(!m_file);
-  DBUG_ASSERT(!m_engine_array);
+  assert(!m_file);
+  assert(!m_engine_array);
   DBUG_ENTER("ha_partition::setup_engine_array");
 
   buff= (uchar *) (m_file_buffer + PAR_ENGINES_OFFSET);
@@ -2073,7 +2079,7 @@ bool ha_partition::setup_engine_array(MEM_ROOT *mem_root)
       DBUG_PRINT("error", ("partition %u engine %d is not same as "
                            "first partition %d", i, db_type,
                            (int) first_db_type));
-      DBUG_ASSERT(0);
+      assert(0);
       clear_handler_file();
       goto err;
     }
@@ -2154,16 +2160,16 @@ bool ha_partition::set_ha_share_ref(Handler_share **ha_share_arg)
   uint i;
   DBUG_ENTER("ha_partition::set_ha_share_ref");
 
-  DBUG_ASSERT(!part_share);
-  DBUG_ASSERT(table_share);
-  DBUG_ASSERT(!m_is_clone_of);
-  DBUG_ASSERT(m_tot_parts);
+  assert(!part_share);
+  assert(table_share);
+  assert(!m_is_clone_of);
+  assert(m_tot_parts);
   if (handler::set_ha_share_ref(ha_share_arg))
     DBUG_RETURN(true);
   if (!(part_share= get_share()))
     DBUG_RETURN(true);
-  DBUG_ASSERT(part_share->partitions_share_refs);
-  DBUG_ASSERT(part_share->partitions_share_refs->num_parts >= m_tot_parts);
+  assert(part_share->partitions_share_refs);
+  assert(part_share->partitions_share_refs->num_parts >= m_tot_parts);
   ha_shares= part_share->partitions_share_refs->ha_shares;
   for (i= 0; i < m_tot_parts; i++)
   {
@@ -2189,7 +2195,7 @@ Ha_partition_share *ha_partition::get_share()
 {
   Ha_partition_share *tmp_share;
   DBUG_ENTER("ha_partition::get_share");
-  DBUG_ASSERT(table_share);
+  assert(table_share);
 
   lock_shared_ha_data();
   if (!(tmp_share= static_cast<Ha_partition_share*>(get_ha_share_ptr())))
@@ -2268,7 +2274,7 @@ bool ha_partition::init_partition_bitmaps()
   /* Initialize the bitmap for read/lock_partitions */
   if (!m_is_clone_of)
   {
-    DBUG_ASSERT(!m_clone_mem_root);
+    assert(!m_clone_mem_root);
     if (m_part_info->set_partition_bitmaps(NULL))
     {
       free_partition_bitmaps();
@@ -2311,8 +2317,8 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
   ulonglong check_table_flags;
   DBUG_ENTER("ha_partition::open");
 
-  DBUG_ASSERT(table->s == table_share);
-  DBUG_ASSERT(m_part_info);
+  assert(table->s == table_share);
+  assert(m_part_info);
   ref_length= 0;
   m_mode= mode;
   m_open_test_lock= test_if_locked;
@@ -2341,7 +2347,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
   {
     goto err;
   }
-  DBUG_ASSERT(!m_file_tot_parts || m_file_tot_parts == m_tot_parts);
+  assert(!m_file_tot_parts || m_file_tot_parts == m_tot_parts);
   if (!m_part_ids_sorted_by_num_of_records)
   {
     if (!(m_part_ids_sorted_by_num_of_records=
@@ -2361,12 +2367,12 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
     goto err;
   }
 
-  DBUG_ASSERT(m_part_info);
+  assert(m_part_info);
 
   if (m_is_clone_of)
   {
     uint i, alloc_len;
-    DBUG_ASSERT(m_clone_mem_root);
+    assert(m_clone_mem_root);
     /* Allocate an array of handler pointers for the partitions handlers. */
     alloc_len= (m_tot_parts + 1) * sizeof(handler*);
     if (!(m_file= (handler **) alloc_root(m_clone_mem_root, alloc_len)))
@@ -2406,7 +2412,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
         goto err_handler;
       if (m_file == file)
         m_num_locks= (*file)->lock_count();
-      DBUG_ASSERT(m_num_locks == (*file)->lock_count());
+      assert(m_num_locks == (*file)->lock_count());
       name_buffer_ptr+= strlen(name_buffer_ptr) + 1;
     } while (*(++file));
   }
@@ -2491,7 +2497,7 @@ void ha_partition::unbind_psi()
   handler::unbind_psi();
   for (i= 0; i < m_tot_parts; i++)
   {
-    DBUG_ASSERT(m_file[i] != NULL);
+    assert(m_file[i] != NULL);
     m_file[i]->unbind_psi();
   }
   DBUG_VOID_RETURN;
@@ -2505,7 +2511,7 @@ void ha_partition::rebind_psi()
   handler::rebind_psi();
   for (i= 0; i < m_tot_parts; i++)
   {
-    DBUG_ASSERT(m_file[i] != NULL);
+    assert(m_file[i] != NULL);
     m_file[i]->rebind_psi();
   }
   DBUG_VOID_RETURN;
@@ -2591,10 +2597,10 @@ int ha_partition::close(void)
   handler **file;
   DBUG_ENTER("ha_partition::close");
 
-  DBUG_ASSERT(table->s == table_share);
+  assert(table->s == table_share);
   close_partitioning();
   free_partition_bitmaps();
-  DBUG_ASSERT(m_part_info);
+  assert(m_part_info);
   file= m_file;
 
   do
@@ -2653,7 +2659,7 @@ int ha_partition::external_lock(THD *thd, int lock_type)
   MY_BITMAP *used_partitions;
   DBUG_ENTER("ha_partition::external_lock");
 
-  DBUG_ASSERT(!m_auto_increment_lock && !m_auto_increment_safe_stmt_log_lock);
+  assert(!m_auto_increment_lock && !m_auto_increment_safe_stmt_log_lock);
 
   if (lock_type == F_UNLCK)
     used_partitions= &m_locked_partitions;
@@ -2753,7 +2759,7 @@ THR_LOCK_DATA **ha_partition::store_lock(THD *thd,
 {
   uint i;
   DBUG_ENTER("ha_partition::store_lock");
-  DBUG_ASSERT(thd == current_thd);
+  assert(thd == current_thd);
 
   /*
     This can be called from get_lock_data() in mysql_lock_abort_for_thread(),
@@ -2800,15 +2806,15 @@ int ha_partition::start_stmt(THD *thd, thr_lock_type lock_type)
   int error= 0;
   uint i;
   /* Assert that read_partitions is included in lock_partitions */
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->read_partitions,
-                               &m_part_info->lock_partitions));
+  assert(bitmap_is_subset(&m_part_info->read_partitions,
+                          &m_part_info->lock_partitions));
   /*
     m_locked_partitions is set in previous external_lock/LOCK TABLES.
     Current statement's lock requests must not include any partitions
     not previously locked.
   */
-  DBUG_ASSERT(bitmap_is_subset(&m_part_info->lock_partitions,
-                               &m_locked_partitions));
+  assert(bitmap_is_subset(&m_part_info->lock_partitions,
+                          &m_locked_partitions));
   DBUG_ENTER("ha_partition::start_stmt");
 
   for (i= bitmap_get_first_set(&(m_part_info->lock_partitions));
@@ -2899,8 +2905,8 @@ void ha_partition::unlock_row()
 bool ha_partition::was_semi_consistent_read()
 {
   DBUG_ENTER("ha_partition::was_semi_consistent_read");
-  DBUG_ASSERT(m_last_part < m_tot_parts &&
-              m_part_info->is_partition_used(m_last_part));
+  assert(m_last_part < m_tot_parts &&
+         m_part_info->is_partition_used(m_last_part));
   DBUG_RETURN(m_file[m_last_part]->was_semi_consistent_read());
 }
 
@@ -2929,7 +2935,7 @@ void ha_partition::try_semi_consistent_read(bool yes)
   DBUG_ENTER("ha_partition::try_semi_consistent_read");
 
   i= m_part_info->get_first_used_partition();
-  DBUG_ASSERT(i != MY_BIT_NONE);
+  assert(i != MY_BIT_NONE);
   for (;
        i < m_tot_parts;
        i= m_part_info->get_next_used_partition(i))
@@ -3173,7 +3179,7 @@ void ha_partition::start_part_bulk_insert(THD *thd, uint part_id)
   if (!bitmap_is_set(&m_bulk_insert_started, part_id) &&
       bitmap_is_set(&m_bulk_insert_started, m_tot_parts))
   {
-    DBUG_ASSERT(bitmap_is_set(&(m_part_info->lock_partitions), part_id));
+    assert(bitmap_is_set(&(m_part_info->lock_partitions), part_id));
     old_buffer_size= thd->variables.read_buff_size;
     /* Update read_buffer_size for this partition */
     thd->variables.read_buff_size= estimate_read_buffer_size(old_buffer_size);
@@ -3273,7 +3279,7 @@ int ha_partition::end_bulk_insert()
 
   if (!bitmap_is_set(&m_bulk_insert_started, m_tot_parts))
   {
-    DBUG_ASSERT(0);
+    assert(0);
     DBUG_RETURN(error);
   }
 
@@ -3845,10 +3851,10 @@ int ha_partition::info(uint flag)
   int res, error= 0;
   DBUG_ENTER("ha_partition::info");
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (bitmap_is_set_all(&(m_part_info->read_partitions)))
     DBUG_PRINT("info", ("All partitions are used"));
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
   if (flag & HA_STATUS_AUTO)
   {
     DBUG_PRINT("info", ("HA_STATUS_AUTO"));
@@ -4073,7 +4079,7 @@ void ha_partition::get_dynamic_partition_info(ha_statistics *stat_info,
                                               uint part_id)
 {
   handler *file= m_file[part_id];
-  DBUG_ASSERT(bitmap_is_set(&(m_part_info->read_partitions), part_id));
+  assert(bitmap_is_set(&(m_part_info->read_partitions), part_id));
   file->info(HA_STATUS_TIME | HA_STATUS_VARIABLE |
              HA_STATUS_VARIABLE_EXTRA | HA_STATUS_NO_LOCK);
 
@@ -4461,7 +4467,7 @@ int ha_partition::extra(enum ha_extra_function operation)
     {
       if (!m_extra_cache)
         m_extra_cache_part_id= m_part_spec.start_part;
-      DBUG_ASSERT(m_extra_cache_part_id == m_part_spec.start_part);
+      assert(m_extra_cache_part_id == m_part_spec.start_part);
       (void) m_file[m_part_spec.start_part]->extra(HA_EXTRA_PREPARE_FOR_UPDATE);
     }
     break;
@@ -4572,10 +4578,10 @@ int ha_partition::extra(enum ha_extra_function operation)
     // so we can avoid allocating ref_length bytes for every used partition
     // in init_record_priority_queue()!
     /* index_init(sorted=true) must have been called! */
-    DBUG_ASSERT(m_ordered);
-    DBUG_ASSERT(m_ordered_rec_buffer);
+    assert(m_ordered);
+    assert(m_ordered_rec_buffer);
     /* No index_read call must have been done! */
-    DBUG_ASSERT(m_queue->empty());
+    assert(m_queue->empty());
     /* If not PK is set as secondary sort, do secondary sort by rowid/ref. */
     if (!m_curr_key_info[1])
     {
@@ -4584,10 +4590,14 @@ int ha_partition::extra(enum ha_extra_function operation)
     }
     break;
   }
+  case HA_EXTRA_RESET_STATE:
+  {
+    break;
+  }
   default:
   {
     /* Temporary crash to discover what is wrong */
-    DBUG_ASSERT(0);
+    assert(0);
     break;
   }
   }
@@ -4643,7 +4653,7 @@ int ha_partition::extra_opt(enum ha_extra_function operation, ulong cachesize)
 {
   DBUG_ENTER("ha_partition::extra_opt()");
 
-  DBUG_ASSERT(HA_EXTRA_CACHE == operation);
+  assert(HA_EXTRA_CACHE == operation);
   prepare_extra_cache(cachesize);
   DBUG_RETURN(0);
 }
@@ -4669,8 +4679,8 @@ void ha_partition::prepare_extra_cache(uint cachesize)
   m_extra_cache_size= cachesize;
   if (m_part_spec.start_part != NO_CURRENT_PART_ID)
   {
-    DBUG_ASSERT(bitmap_is_set(&m_partitions_to_reset,
-                              m_part_spec.start_part));
+    assert(bitmap_is_set(&m_partitions_to_reset,
+                         m_part_spec.start_part));
     bitmap_set_bit(&m_partitions_to_reset, m_part_spec.start_part);
     late_extra_cache(m_part_spec.start_part);
   }
@@ -4767,7 +4777,7 @@ void ha_partition::late_extra_no_cache(uint partition_id)
     DBUG_VOID_RETURN;
   file= m_file[partition_id];
   (void) file->extra(HA_EXTRA_NO_CACHE);
-  DBUG_ASSERT(partition_id == m_extra_cache_part_id);
+  assert(partition_id == m_extra_cache_part_id);
   m_extra_cache_part_id= NO_CURRENT_PART_ID;
   DBUG_VOID_RETURN;
 }
@@ -5067,7 +5077,7 @@ bool ha_partition::can_switch_engines()
   {
     if (!(*file)->can_switch_engines())
     {
-      DBUG_ASSERT(0);          // A ha_partition table should never have FKs!!!
+      assert(0);          // A ha_partition table should never have FKs!!!
       DBUG_RETURN(FALSE);
     }
   } while (*(++file));
@@ -5104,7 +5114,7 @@ const char *ha_partition::index_type(uint inx)
 
   if (first_used_partition == MY_BIT_NONE)
   {
-    DBUG_ASSERT(0);                             // How can this happen?
+    assert(0);                             // How can this happen?
     DBUG_RETURN(handler::index_type(inx));
   }
 
@@ -5119,7 +5129,7 @@ enum row_type ha_partition::get_row_type() const
   DBUG_ENTER("ha_partition::get_row_type");
 
   i= m_part_info->get_first_used_partition();
-  DBUG_ASSERT(i < m_tot_parts);
+  assert(i < m_tot_parts);
   if (i >= m_tot_parts)
     DBUG_RETURN(ROW_TYPE_NOT_USED);
 
@@ -5322,7 +5332,7 @@ ha_partition::check_if_supported_inplace_alter(TABLE *altered_table,
     else if (first_is_set != (ha_alter_info->handler_ctx != NULL))
     {
       /* Either none or all partitions must set handler_ctx! */
-      DBUG_ASSERT(0);
+      assert(0);
       DBUG_RETURN(HA_ALTER_ERROR);
     }
     if (p_result < result)
@@ -5444,8 +5454,8 @@ bool ha_partition::commit_inplace_alter_table(TABLE *altered_table,
 
   if (commit)
   {
-    DBUG_ASSERT(ha_alter_info->group_commit_ctx ==
-                part_inplace_ctx->handler_ctx_array);
+    assert(ha_alter_info->group_commit_ctx ==
+           part_inplace_ctx->handler_ctx_array);
     ha_alter_info->handler_ctx= part_inplace_ctx->handler_ctx_array[0];
     error= m_file[0]->ha_commit_inplace_alter_table(altered_table,
                                                     ha_alter_info, commit);
@@ -5462,7 +5472,7 @@ bool ha_partition::commit_inplace_alter_table(TABLE *altered_table,
         Loop over all other partitions as to follow the protocol!
       */
       uint i;
-      DBUG_ASSERT(0);
+      assert(0);
       for (i= 1; i < m_tot_parts; i++)
       {
         ha_alter_info->handler_ctx= part_inplace_ctx->handler_ctx_array[i];
@@ -5552,6 +5562,21 @@ uint ha_partition::min_of_the_max_uint(
 }
 
 
+uint ha_partition::min_of_the_max_uint(HA_CREATE_INFO *create_info,
+                       uint (handler::*operator_func)(HA_CREATE_INFO *) const) const
+{
+  handler **file;
+  uint min_of_the_max= ((*m_file)->*operator_func)(create_info);
+
+  for (file= m_file+1; *file; file++)
+  {
+    uint tmp= ((*file)->*operator_func)(create_info);
+    set_if_smaller(min_of_the_max, tmp);
+  }
+  return min_of_the_max;
+}
+
+
 uint ha_partition::max_supported_key_parts() const
 {
   return min_of_the_max_uint(&handler::max_supported_key_parts);
@@ -5564,9 +5589,11 @@ uint ha_partition::max_supported_key_length() const
 }
 
 
-uint ha_partition::max_supported_key_part_length() const
+uint ha_partition::max_supported_key_part_length(HA_CREATE_INFO
+                                                 *create_info) const
 {
-  return min_of_the_max_uint(&handler::max_supported_key_part_length);
+  return
+  min_of_the_max_uint(create_info, &handler::max_supported_key_part_length);
 }
 
 
@@ -5652,7 +5679,7 @@ int ha_partition::cmp_ref(const uchar *ref1, const uchar *ref2)
     partitions, but in myisam it is possible since we are comparing offsets.
     Remove this assert if DB_ROW_ID is changed to be per partition.
   */
-  DBUG_ASSERT(!m_innodb);
+  assert(!m_innodb);
 
   diff1= ref2[1] - ref1[1];
   diff2= ref2[0] - ref1[0];
@@ -5694,7 +5721,7 @@ Item *ha_partition::idx_cond_push(uint keyno, Item* idx_cond)
   DBUG_ENTER("ha_partition::idx_cond_push");
   DBUG_EXECUTE("where", print_where(idx_cond, "cond", QT_ORDINARY););
   DBUG_PRINT("info", ("keyno: %u, active_index: %u", keyno, active_index));
-  DBUG_ASSERT(pushed_idx_cond == NULL);
+  assert(pushed_idx_cond == NULL);
 
   for (i= m_part_info->get_first_used_partition();
        i < m_tot_parts;
@@ -5708,9 +5735,9 @@ Item *ha_partition::idx_cond_push(uint keyno, Item* idx_cond)
         All partitions has the same structure, so if the first partition
         succeeds, then the rest will also succeed.
       */
-      DBUG_ASSERT(i == m_part_info->get_first_used_partition());
+      assert(i == m_part_info->get_first_used_partition());
       /* Only supports entire index conditions or no conditions! */
-      DBUG_ASSERT(res == idx_cond);
+      assert(res == idx_cond);
       if (res != idx_cond)
         m_file[i]->cancel_pushed_idx_cond();
       /* cancel previous calls. */
@@ -5723,7 +5750,7 @@ Item *ha_partition::idx_cond_push(uint keyno, Item* idx_cond)
       DBUG_RETURN(idx_cond);
     }
   }
-  DBUG_ASSERT(pushed_idx_cond_keyno == MAX_KEY);
+  assert(pushed_idx_cond_keyno == MAX_KEY);
   pushed_idx_cond= idx_cond;
   pushed_idx_cond_keyno= keyno;
   DBUG_PRINT("info", ("Index condition pushdown used for keyno: %u", keyno));
@@ -5767,13 +5794,13 @@ void ha_partition::cancel_pushed_idx_cond()
 inline int ha_partition::initialize_auto_increment(bool no_lock)
 {
   DBUG_ENTER("ha_partition::initialize_auto_increment");
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (table_share->tmp_table == NO_TMP_TABLE)
   {
     mysql_mutex_assert_owner(part_share->auto_inc_mutex);
   }
 #endif
-  DBUG_ASSERT(!part_share->auto_inc_initialized);
+  assert(!part_share->auto_inc_initialized);
 
   /*
     The auto-inc mutex in the table_share is locked, so we do not need
@@ -5800,7 +5827,7 @@ inline int ha_partition::initialize_auto_increment(bool no_lock)
     }
   } while (*(++file_array));
 
-  DBUG_ASSERT(auto_increment_value);
+  assert(auto_increment_value);
   stats.auto_increment_value= auto_increment_value;
   /*
     We only use the cached auto inc value if it is
@@ -5808,7 +5835,7 @@ inline int ha_partition::initialize_auto_increment(bool no_lock)
   */
   if (table_share->next_number_keypart == 0)
   {
-    DBUG_ASSERT(part_share->next_auto_inc_val <= auto_increment_value);
+    assert(part_share->next_auto_inc_val <= auto_increment_value);
     part_share->next_auto_inc_val= auto_increment_value;
     part_share->auto_inc_initialized= true;
     DBUG_PRINT("info", ("initializing next_auto_inc_val to %lu",
@@ -5836,7 +5863,7 @@ void ha_partition::get_auto_increment(ulonglong offset, ulonglong increment,
   DBUG_PRINT("info", ("offset: %lu inc: %lu desired_values: %lu "
                       "first_value: %lu", (ulong) offset, (ulong) increment,
                       (ulong) nb_desired_values, (ulong) *first_value));
-  DBUG_ASSERT(increment && nb_desired_values);
+  assert(increment && nb_desired_values);
   *first_value= 0;
   if (table->s->next_number_keypart)
   {
@@ -5881,12 +5908,21 @@ void ha_partition::get_auto_increment(ulonglong offset, ulonglong increment,
   DBUG_VOID_RETURN;
 }
 
+/** Get partition row type
+@param[in] Id of partition for which row type to be retrieved
+@return Partition row type */
+enum row_type ha_partition::get_partition_row_type(
+        uint part_id)
+{
+	return m_file[part_id]->get_row_type();
+}
+
 void ha_partition::release_auto_increment_all_parts()
 {
   uint i;
   DBUG_ENTER("ha_partition::release_auto_increment_all_parts");
 
-  DBUG_ASSERT(table->s->next_number_keypart);
+  assert(table->s->next_number_keypart);
   for (i= m_part_info->get_first_used_partition();
        i < m_tot_parts;
        i= bitmap_get_next_set(&m_part_info->lock_partitions, i))
@@ -5947,7 +5983,7 @@ int ha_partition::disable_indexes(uint mode)
   handler **file;
   int error= 0;
 
-  DBUG_ASSERT(bitmap_is_set_all(&(m_part_info->lock_partitions)));
+  assert(bitmap_is_set_all(&(m_part_info->lock_partitions)));
   for (file= m_file; *file; file++)
   {
     if ((error= (*file)->ha_disable_indexes(mode)))
@@ -5972,7 +6008,7 @@ int ha_partition::enable_indexes(uint mode)
   handler **file;
   int error= 0;
 
-  DBUG_ASSERT(bitmap_is_set_all(&(m_part_info->lock_partitions)));
+  assert(bitmap_is_set_all(&(m_part_info->lock_partitions)));
   for (file= m_file; *file; file++)
   {
     if ((error= (*file)->ha_enable_indexes(mode)))
@@ -5997,7 +6033,7 @@ int ha_partition::indexes_are_disabled(void)
   handler **file;
   int error= 0;
 
-  DBUG_ASSERT(bitmap_is_set_all(&(m_part_info->lock_partitions)));
+  assert(bitmap_is_set_all(&(m_part_info->lock_partitions)));
   for (file= m_file; *file; file++)
   {
     if ((error= (*file)->indexes_are_disabled()))
diff --git a/storage/partition/ha_partition.h b/storage/partition/ha_partition.h
index 2f7311e10c6e..873489dde47a 100644
--- a/storage/partition/ha_partition.h
+++ b/storage/partition/ha_partition.h
@@ -2,16 +2,23 @@
 #define HA_PARTITION_INCLUDED
 
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -902,11 +909,13 @@ class ha_partition :
     The maximum supported values is the minimum of all handlers in the table
   */
   uint min_of_the_max_uint(uint (handler::*operator_func)(void) const) const;
+  uint min_of_the_max_uint(HA_CREATE_INFO *create_info,
+                           uint (handler::*operator_func)(HA_CREATE_INFO *) const) const;
   virtual uint max_supported_record_length() const;
   virtual uint max_supported_keys() const;
   virtual uint max_supported_key_parts() const;
   virtual uint max_supported_key_length() const;
-  virtual uint max_supported_key_part_length() const;
+  virtual uint max_supported_key_part_length(HA_CREATE_INFO *create_info) const;
 
   /*
     All handlers in a partitioned table must have the same low_byte_first
@@ -986,6 +995,10 @@ class ha_partition :
                                   ulonglong nb_desired_values,
                                   ulonglong *first_value,
                                   ulonglong *nb_reserved_values);
+  /** Get partition row type
+  @param[in] Id of partition for which row type to be retrieved
+  @return Partition row type */
+  enum row_type get_partition_row_type(uint part_id);
   void release_auto_increment()
   {
     Partition_helper::ph_release_auto_increment();
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
index 3e4ad1414e9a..953d3b1c0787 100644
--- a/storage/perfschema/CMakeLists.txt
+++ b/storage/perfschema/CMakeLists.txt
@@ -1,25 +1,30 @@
-# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 #
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
-                    ${CMAKE_SOURCE_DIR}/include
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_BINARY_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${SSL_INCLUDE_DIRS})
 
 ADD_DEFINITIONS(-DMYSQL_SERVER)
@@ -82,6 +87,7 @@ table_esms_by_host_by_event_name.h
 table_esms_by_digest.h
 table_esms_by_program.h
 table_prepared_stmt_instances.h
+table_processlist.h
 table_esms_by_thread_by_event_name.h
 table_esms_by_user_by_event_name.h
 table_esms_global_by_event_name.h
@@ -198,6 +204,7 @@ table_esms_by_host_by_event_name.cc
 table_esms_by_digest.cc
 table_esms_by_program.cc
 table_prepared_stmt_instances.cc
+table_processlist.cc
 table_esms_by_thread_by_event_name.cc
 table_esms_by_user_by_event_name.cc
 table_esms_global_by_event_name.cc
diff --git a/storage/perfschema/cursor_by_account.cc b/storage/perfschema/cursor_by_account.cc
index 9bad70792cfc..3518ee61331e 100644
--- a/storage/perfschema/cursor_by_account.cc
+++ b/storage/perfschema/cursor_by_account.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_account.h b/storage/perfschema/cursor_by_account.h
index 5331d98c69e8..77c01b3d912d 100644
--- a/storage/perfschema/cursor_by_account.h
+++ b/storage/perfschema/cursor_by_account.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_host.cc b/storage/perfschema/cursor_by_host.cc
index 8a26dd5c1a31..6338e06f8238 100644
--- a/storage/perfschema/cursor_by_host.cc
+++ b/storage/perfschema/cursor_by_host.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_host.h b/storage/perfschema/cursor_by_host.h
index d48988b59e1e..b0c4368c6a9b 100644
--- a/storage/perfschema/cursor_by_host.h
+++ b/storage/perfschema/cursor_by_host.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_thread.cc b/storage/perfschema/cursor_by_thread.cc
index 9eedd959fd3a..50a5d9197492 100644
--- a/storage/perfschema/cursor_by_thread.cc
+++ b/storage/perfschema/cursor_by_thread.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_thread.h b/storage/perfschema/cursor_by_thread.h
index c4d287dd8a38..848656d9ca96 100644
--- a/storage/perfschema/cursor_by_thread.h
+++ b/storage/perfschema/cursor_by_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_thread_connect_attr.cc b/storage/perfschema/cursor_by_thread_connect_attr.cc
index 37ca356b4262..8945625c90ad 100644
--- a/storage/perfschema/cursor_by_thread_connect_attr.cc
+++ b/storage/perfschema/cursor_by_thread_connect_attr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/cursor_by_thread_connect_attr.h b/storage/perfschema/cursor_by_thread_connect_attr.h
index ccc232aac71f..d98a24bf2c0b 100644
--- a/storage/perfschema/cursor_by_thread_connect_attr.h
+++ b/storage/perfschema/cursor_by_thread_connect_attr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/cursor_by_user.cc b/storage/perfschema/cursor_by_user.cc
index 61f16c823493..b45c9563dc06 100644
--- a/storage/perfschema/cursor_by_user.cc
+++ b/storage/perfschema/cursor_by_user.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/cursor_by_user.h b/storage/perfschema/cursor_by_user.h
index ed27205325fb..3b201f6d77f4 100644
--- a/storage/perfschema/cursor_by_user.h
+++ b/storage/perfschema/cursor_by_user.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc
index aa4cfda2b83b..bad9cb6ae61f 100644
--- a/storage/perfschema/ha_perfschema.cc
+++ b/storage/perfschema/ha_perfschema.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -261,7 +268,7 @@ int ha_perfschema::write_row(uchar *buf)
   if (!PFS_ENABLED())
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 
-  DBUG_ASSERT(m_table_share);
+  assert(m_table_share);
   ha_statistic_increment(&SSV::ha_write_count);
   result= m_table_share->write_row(table, buf, table->field);
   DBUG_RETURN(result);
@@ -287,7 +294,7 @@ int ha_perfschema::update_row(const uchar *old_data, uchar *new_data)
   if (is_executed_by_slave())
     DBUG_RETURN(0);
 
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   ha_statistic_increment(&SSV::ha_update_count);
   int result= m_table->update_row(table, old_data, new_data, table->field);
   DBUG_RETURN(result);
@@ -299,7 +306,7 @@ int ha_perfschema::delete_row(const uchar *buf)
   if (!PFS_ENABLED())
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   ha_statistic_increment(&SSV::ha_delete_count);
   int result= m_table->delete_row(table, buf, table->field);
   DBUG_RETURN(result);
@@ -310,8 +317,8 @@ int ha_perfschema::rnd_init(bool scan)
   int result;
   DBUG_ENTER("ha_perfschema::rnd_init");
 
-  DBUG_ASSERT(m_table_share);
-  DBUG_ASSERT(m_table_share->m_open_table != NULL);
+  assert(m_table_share);
+  assert(m_table_share->m_open_table != NULL);
 
   stats.records= 0;
   if (m_table == NULL)
@@ -329,7 +336,7 @@ int ha_perfschema::rnd_init(bool scan)
 int ha_perfschema::rnd_end(void)
 {
   DBUG_ENTER("ha_perfschema::rnd_end");
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   delete m_table;
   m_table= NULL;
   DBUG_RETURN(0);
@@ -344,7 +351,7 @@ int ha_perfschema::rnd_next(uchar *buf)
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
 
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   ha_statistic_increment(&SSV::ha_read_rnd_next_count);
 
   int result= m_table->rnd_next();
@@ -362,7 +369,7 @@ void ha_perfschema::position(const uchar *record)
 {
   DBUG_ENTER("ha_perfschema::position");
 
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   m_table->get_position(ref);
   DBUG_VOID_RETURN;
 }
@@ -376,7 +383,7 @@ int ha_perfschema::rnd_pos(uchar *buf, uchar *pos)
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
 
-  DBUG_ASSERT(m_table);
+  assert(m_table);
   ha_statistic_increment(&SSV::ha_read_rnd_count);
   int result= m_table->rnd_pos(pos);
   if (result == 0)
@@ -388,7 +395,7 @@ int ha_perfschema::rnd_pos(uchar *buf, uchar *pos)
 int ha_perfschema::info(uint flag)
 {
   DBUG_ENTER("ha_perfschema::info");
-  DBUG_ASSERT(m_table_share);
+  assert(m_table_share);
   if (flag & HA_STATUS_VARIABLE)
     stats.records= m_table_share->get_row_count();
   if (flag & HA_STATUS_CONST)
@@ -407,7 +414,7 @@ int ha_perfschema::delete_all_rows(void)
   if (is_executed_by_slave())
     DBUG_RETURN(0);
 
-  DBUG_ASSERT(m_table_share);
+  assert(m_table_share);
   if (m_table_share->m_delete_all_rows)
     result= m_table_share->m_delete_all_rows();
   else
@@ -436,6 +443,53 @@ THR_LOCK_DATA **ha_perfschema::store_lock(THD *thd,
 int ha_perfschema::delete_table(const char *name)
 {
   DBUG_ENTER("ha_perfschema::delete_table");
+
+  /*
+    The name string looks like:
+    "./performance_schema/processlist"
+
+    Make a copy of it, parse the '/' to
+    isolate the schema and table name.
+  */
+
+  char table_path[FN_REFLEN+1];
+  strncpy(table_path, name, sizeof(table_path));
+  table_path[FN_REFLEN]='\0';
+
+  char *ptr;
+  char *table_name;
+  char *db_name;
+  const PFS_engine_table_share *share;
+
+  /* Start scan from the end. */
+  ptr = strend(table_path) - 1;
+
+  /* Find path separator */
+  while ((ptr >= table_path) && (*ptr != '\\') && (*ptr != '/')) {
+    ptr--;
+  }
+
+  table_name = ptr + 1;
+  *ptr = '\0';
+
+  /* Find path separator */
+  while ((ptr >= table_path) && (*ptr != '\\') && (*ptr != '/')) {
+    ptr--;
+  }
+
+  db_name = ptr + 1;
+
+  share = find_table_share(db_name, table_name);
+  if (share != NULL) {
+    if (share->m_optional) {
+      /*
+        An optional table is deleted,
+        disarm the checked flag so we don't trust it any more.
+      */
+      share->m_state->m_checked = false;
+    }
+  }
+
   DBUG_RETURN(0);
 }
 
@@ -449,8 +503,8 @@ int ha_perfschema::create(const char *name, TABLE *table_arg,
                           HA_CREATE_INFO *create_info)
 {
   DBUG_ENTER("ha_perfschema::create");
-  DBUG_ASSERT(table_arg);
-  DBUG_ASSERT(table_arg->s);
+  assert(table_arg);
+  assert(table_arg->s);
   if (find_table_share(table_arg->s->db.str,
                        table_arg->s->table_name.str))
   {
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index bbeac749e144..681684d77a87 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -228,8 +235,8 @@ class ha_perfschema : public handler
   */
   bool is_executed_by_slave() const
   {
-    DBUG_ASSERT(table != NULL);
-    DBUG_ASSERT(table->in_use != NULL);
+    assert(table != NULL);
+    assert(table->in_use != NULL);
     return table->in_use->slave_thread;
 
   }
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index 4b12ea0c500b..037c321f2117 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -85,9 +92,9 @@ static void report_memory_accounting_error(
                   old_thread->m_thread_internal_id,
                   old_thread->m_class->m_name);
 
-  DBUG_ASSERT(strcmp(new_thread->m_class->m_name, "thread/sql/event_worker") != 0);
-  DBUG_ASSERT(strcmp(new_thread->m_class->m_name, "thread/sql/event_scheduler") != 0);
-  DBUG_ASSERT(strcmp(new_thread->m_class->m_name, "thread/sql/one_connection") != 0);
+  assert(strcmp(new_thread->m_class->m_name, "thread/sql/event_worker") != 0);
+  assert(strcmp(new_thread->m_class->m_name, "thread/sql/event_scheduler") != 0);
+  assert(strcmp(new_thread->m_class->m_name, "thread/sql/one_connection") != 0);
 }
 #endif /* PFS_PARANOID */
 
@@ -1360,16 +1367,16 @@ bool THR_PFS_initialized= false;
 static inline PFS_thread*
 my_thread_get_THR_PFS()
 {
-  DBUG_ASSERT(THR_PFS_initialized);
+  assert(THR_PFS_initialized);
   PFS_thread *thread= static_cast<PFS_thread*>(my_get_thread_local(THR_PFS));
-  DBUG_ASSERT(thread == NULL || sanitize_thread(thread) != NULL);
+  assert(thread == NULL || sanitize_thread(thread) != NULL);
   return thread;
 }
 
 static inline void
 my_thread_set_THR_PFS(PFS_thread *pfs)
 {
-  DBUG_ASSERT(THR_PFS_initialized);
+  assert(THR_PFS_initialized);
   my_set_thread_local(THR_PFS, pfs);
 }
 
@@ -1546,8 +1553,8 @@ static int build_prefix(const LEX_STRING *prefix, const char *category,
   size_t len;                                                               \
   size_t full_length;                                                       \
                                                                             \
-  DBUG_ASSERT(category != NULL);                                            \
-  DBUG_ASSERT(info != NULL);                                                \
+  assert(category != NULL);                                             \
+  assert(info != NULL);                                                 \
   if (unlikely(build_prefix(&PREFIX, category,                              \
                    formatted_name, &prefix_length)) ||                      \
       ! pfs_initialized)                                                    \
@@ -1559,8 +1566,8 @@ static int build_prefix(const LEX_STRING *prefix, const char *category,
                                                                             \
   for (; count>0; count--, info++)                                          \
   {                                                                         \
-    DBUG_ASSERT(info->m_key != NULL);                                       \
-    DBUG_ASSERT(info->m_name != NULL);                                      \
+    assert(info->m_key != NULL);                                        \
+    assert(info->m_name != NULL);                                       \
     len= strlen(info->m_name);                                              \
     full_length= prefix_length + len;                                       \
     if (likely(full_length <= PFS_MAX_INFO_NAME_LENGTH))                    \
@@ -1612,8 +1619,8 @@ void pfs_register_rwlock_v1(const char *category,
   size_t len;
   size_t full_length;
 
-  DBUG_ASSERT(category != NULL);
-  DBUG_ASSERT(info != NULL);
+  assert(category != NULL);
+  assert(info != NULL);
   if (build_prefix(&rwlock_instrument_prefix, category,
                    rw_formatted_name, &rw_prefix_length) ||
       build_prefix(&sxlock_instrument_prefix, category,
@@ -1627,8 +1634,8 @@ void pfs_register_rwlock_v1(const char *category,
 
   for (; count>0; count--, info++)
   {
-    DBUG_ASSERT(info->m_key != NULL);
-    DBUG_ASSERT(info->m_name != NULL);
+    assert(info->m_key != NULL);
+    assert(info->m_name != NULL);
     len= strlen(info->m_name);
 
     if (info->m_flags & PSI_RWLOCK_FLAG_SX)
@@ -1716,8 +1723,8 @@ void pfs_register_stage_v1(const char *category,
   size_t full_length;
   PSI_stage_info_v1 *info;
 
-  DBUG_ASSERT(category != NULL);
-  DBUG_ASSERT(info_array != NULL);
+  assert(category != NULL);
+  assert(info_array != NULL);
   if (unlikely(build_prefix(&stage_instrument_prefix, category,
                formatted_name, &prefix_length)) ||
       ! pfs_initialized)
@@ -1730,8 +1737,8 @@ void pfs_register_stage_v1(const char *category,
   for (; count>0; count--, info_array++)
   {
     info= *info_array;
-    DBUG_ASSERT(info != NULL);
-    DBUG_ASSERT(info->m_name != NULL);
+    assert(info != NULL);
+    assert(info->m_name != NULL);
     len= strlen(info->m_name);
     full_length= prefix_length + len;
     if (likely(full_length <= PFS_MAX_INFO_NAME_LENGTH))
@@ -1761,8 +1768,8 @@ void pfs_register_statement_v1(const char *category,
   size_t len;
   size_t full_length;
 
-  DBUG_ASSERT(category != NULL);
-  DBUG_ASSERT(info != NULL);
+  assert(category != NULL);
+  assert(info != NULL);
   if (unlikely(build_prefix(&statement_instrument_prefix,
                             category, formatted_name, &prefix_length)) ||
       ! pfs_initialized)
@@ -1774,7 +1781,7 @@ void pfs_register_statement_v1(const char *category,
 
   for (; count>0; count--, info++)
   {
-    DBUG_ASSERT(info->m_name != NULL);
+    assert(info->m_name != NULL);
     len= strlen(info->m_name);
     full_length= prefix_length + len;
     if (likely(full_length <= PFS_MAX_INFO_NAME_LENGTH))
@@ -1828,7 +1835,7 @@ void pfs_destroy_mutex_v1(PSI_mutex* mutex)
 {
   PFS_mutex *pfs= reinterpret_cast<PFS_mutex*> (mutex);
 
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
 
   destroy_mutex(pfs);
 }
@@ -1851,7 +1858,7 @@ void pfs_destroy_rwlock_v1(PSI_rwlock* rwlock)
 {
   PFS_rwlock *pfs= reinterpret_cast<PFS_rwlock*> (rwlock);
 
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
 
   destroy_rwlock(pfs);
 }
@@ -1874,7 +1881,7 @@ void pfs_destroy_cond_v1(PSI_cond* cond)
 {
   PFS_cond *pfs= reinterpret_cast<PFS_cond*> (cond);
 
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
 
   destroy_cond(pfs);
 }
@@ -1992,7 +1999,7 @@ pfs_rebind_table_v1(PSI_table_share *share, const void *identity, PSI_table *tab
   PFS_table *pfs= reinterpret_cast<PFS_table*> (table);
   if (likely(pfs != NULL))
   {
-    DBUG_ASSERT(pfs->m_thread_owner == NULL);
+    assert(pfs->m_thread_owner == NULL);
 
     if (unlikely(! pfs->m_share->m_enabled))
     {
@@ -2076,7 +2083,7 @@ void pfs_destroy_socket_v1(PSI_socket *socket)
 {
   PFS_socket *pfs= reinterpret_cast<PFS_socket*> (socket);
 
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
 
   destroy_socket(pfs);
 }
@@ -2318,9 +2325,9 @@ void pfs_set_thread_user_v1(const char *user, int user_len)
   pfs_dirty_state dirty_state;
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT((user != NULL) || (user_len == 0));
-  DBUG_ASSERT(user_len >= 0);
-  DBUG_ASSERT((uint) user_len <= sizeof(pfs->m_username));
+  assert((user != NULL) || (user_len == 0));
+  assert(user_len >= 0);
+  assert((uint) user_len <= sizeof(pfs->m_username));
 
   if (unlikely(pfs == NULL))
     return;
@@ -2376,11 +2383,11 @@ void pfs_set_thread_account_v1(const char *user, int user_len,
   pfs_dirty_state dirty_state;
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT((user != NULL) || (user_len == 0));
-  DBUG_ASSERT(user_len >= 0);
-  DBUG_ASSERT((uint) user_len <= sizeof(pfs->m_username));
-  DBUG_ASSERT((host != NULL) || (host_len == 0));
-  DBUG_ASSERT(host_len >= 0);
+  assert((user != NULL) || (user_len == 0));
+  assert(user_len >= 0);
+  assert((uint) user_len <= sizeof(pfs->m_username));
+  assert((host != NULL) || (host_len == 0));
+  assert(host_len >= 0);
 
   host_len= min<size_t>(host_len, sizeof(pfs->m_hostname));
   if (unlikely(pfs == NULL))
@@ -2437,9 +2444,9 @@ void pfs_set_thread_db_v1(const char* db, int db_len)
 {
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT((db != NULL) || (db_len == 0));
-  DBUG_ASSERT(db_len >= 0);
-  DBUG_ASSERT((uint) db_len <= sizeof(pfs->m_dbname));
+  assert((db != NULL) || (db_len == 0));
+  assert(db_len >= 0);
+  assert((uint) db_len <= sizeof(pfs->m_dbname));
 
   if (likely(pfs != NULL))
   {
@@ -2460,8 +2467,8 @@ void pfs_set_thread_command_v1(int command)
 {
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT(command >= 0);
-  DBUG_ASSERT(command <= (int) COM_END);
+  assert(command >= 0);
+  assert(command <= (int) COM_END);
 
   if (likely(pfs != NULL))
   {
@@ -2477,8 +2484,8 @@ void pfs_set_connection_type_v1(opaque_vio_type conn_type)
 {
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT(conn_type >= FIRST_VIO_TYPE);
-  DBUG_ASSERT(conn_type <= LAST_VIO_TYPE);
+  assert(conn_type >= FIRST_VIO_TYPE);
+  assert(conn_type <= LAST_VIO_TYPE);
 
   if (likely(pfs != NULL))
   {
@@ -2519,7 +2526,7 @@ void pfs_set_thread_info_v1(const char* info, uint info_len)
   pfs_dirty_state dirty_state;
   PFS_thread *pfs= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT((info != NULL) || (info_len == 0));
+  assert((info != NULL) || (info_len == 0));
 
   if (likely(pfs != NULL))
   {
@@ -2552,6 +2559,16 @@ void pfs_set_thread_v1(PSI_thread* thread)
   my_thread_set_THR_PFS(pfs);
 }
 
+/**
+  Implementation of the thread instrumentation interface.
+*/
+void pfs_set_thread_peer_port_v1(PSI_thread *thread, uint port) {
+  PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
+  if (likely(pfs != NULL)) {
+    pfs->m_peer_port = port;
+  }
+}
+
 /**
   Implementation of the thread instrumentation interface.
   @sa PSI_v1::delete_current_thread.
@@ -2592,12 +2609,12 @@ pfs_start_mutex_wait_v1(PSI_mutex_locker_state *state,
                         const char *src_file, uint src_line)
 {
   PFS_mutex *pfs_mutex= reinterpret_cast<PFS_mutex*> (mutex);
-  DBUG_ASSERT((int) op >= 0);
-  DBUG_ASSERT((uint) op < array_elements(mutex_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert((int) op >= 0);
+  assert((uint) op < array_elements(mutex_operation_map));
+  assert(state != NULL);
 
-  DBUG_ASSERT(pfs_mutex != NULL);
-  DBUG_ASSERT(pfs_mutex->m_class != NULL);
+  assert(pfs_mutex != NULL);
+  assert(pfs_mutex->m_class != NULL);
 
   if (! pfs_mutex->m_enabled)
     return NULL;
@@ -2691,31 +2708,31 @@ pfs_start_rwlock_wait_v1(PSI_rwlock_locker_state *state,
                          const char *src_file, uint src_line)
 {
   PFS_rwlock *pfs_rwlock= reinterpret_cast<PFS_rwlock*> (rwlock);
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(rwlock_operation_map));
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(pfs_rwlock != NULL);
-  DBUG_ASSERT(pfs_rwlock->m_class != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(rwlock_operation_map));
+  assert(state != NULL);
+  assert(pfs_rwlock != NULL);
+  assert(pfs_rwlock->m_class != NULL);
 
   /* Operations supported for READ WRITE LOCK */
 
-  DBUG_ASSERT(   pfs_rwlock->m_class->is_shared_exclusive()
-              || (op == PSI_RWLOCK_READLOCK)
-              || (op == PSI_RWLOCK_WRITELOCK)
-              || (op == PSI_RWLOCK_TRYREADLOCK)
-              || (op == PSI_RWLOCK_TRYWRITELOCK)
-             );
+  assert(   pfs_rwlock->m_class->is_shared_exclusive()
+            || (op == PSI_RWLOCK_READLOCK)
+            || (op == PSI_RWLOCK_WRITELOCK)
+            || (op == PSI_RWLOCK_TRYREADLOCK)
+            || (op == PSI_RWLOCK_TRYWRITELOCK)
+            );
 
   /* Operations supported for SHARED EXCLUSIVE LOCK */
 
-  DBUG_ASSERT(   ! pfs_rwlock->m_class->is_shared_exclusive()
-              || (op == PSI_RWLOCK_SHAREDLOCK)
-              || (op == PSI_RWLOCK_SHAREDEXCLUSIVELOCK)
-              || (op == PSI_RWLOCK_EXCLUSIVELOCK)
-              || (op == PSI_RWLOCK_TRYSHAREDLOCK)
-              || (op == PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK)
-              || (op == PSI_RWLOCK_TRYEXCLUSIVELOCK)
-             );
+  assert(   ! pfs_rwlock->m_class->is_shared_exclusive()
+            || (op == PSI_RWLOCK_SHAREDLOCK)
+            || (op == PSI_RWLOCK_SHAREDEXCLUSIVELOCK)
+            || (op == PSI_RWLOCK_EXCLUSIVELOCK)
+            || (op == PSI_RWLOCK_TRYSHAREDLOCK)
+            || (op == PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK)
+            || (op == PSI_RWLOCK_TRYEXCLUSIVELOCK)
+            );
 
   if (! pfs_rwlock->m_enabled)
     return NULL;
@@ -2804,10 +2821,10 @@ pfs_start_rwlock_rdwait_v1(PSI_rwlock_locker_state *state,
                            PSI_rwlock_operation op,
                            const char *src_file, uint src_line)
 {
-  DBUG_ASSERT((op == PSI_RWLOCK_READLOCK) ||
-              (op == PSI_RWLOCK_TRYREADLOCK) ||
-              (op == PSI_RWLOCK_SHAREDLOCK) ||
-              (op == PSI_RWLOCK_TRYSHAREDLOCK));
+  assert((op == PSI_RWLOCK_READLOCK) ||
+         (op == PSI_RWLOCK_TRYREADLOCK) ||
+         (op == PSI_RWLOCK_SHAREDLOCK) ||
+         (op == PSI_RWLOCK_TRYSHAREDLOCK));
 
   return pfs_start_rwlock_wait_v1(state, rwlock, op, src_file, src_line);
 }
@@ -2818,12 +2835,12 @@ pfs_start_rwlock_wrwait_v1(PSI_rwlock_locker_state *state,
                            PSI_rwlock_operation op,
                            const char *src_file, uint src_line)
 {
-  DBUG_ASSERT((op == PSI_RWLOCK_WRITELOCK) ||
-              (op == PSI_RWLOCK_TRYWRITELOCK) ||
-              (op == PSI_RWLOCK_SHAREDEXCLUSIVELOCK) ||
-              (op == PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK) ||
-              (op == PSI_RWLOCK_EXCLUSIVELOCK) ||
-              (op == PSI_RWLOCK_TRYEXCLUSIVELOCK));
+  assert((op == PSI_RWLOCK_WRITELOCK) ||
+         (op == PSI_RWLOCK_TRYWRITELOCK) ||
+         (op == PSI_RWLOCK_SHAREDEXCLUSIVELOCK) ||
+         (op == PSI_RWLOCK_TRYSHAREDEXCLUSIVELOCK) ||
+         (op == PSI_RWLOCK_EXCLUSIVELOCK) ||
+         (op == PSI_RWLOCK_TRYEXCLUSIVELOCK));
 
   return pfs_start_rwlock_wait_v1(state, rwlock, op, src_file, src_line);
 }
@@ -2850,11 +2867,11 @@ pfs_start_cond_wait_v1(PSI_cond_locker_state *state,
     in start_cond_wait_v1() and end_cond_wait_v1().
   */
   PFS_cond *pfs_cond= reinterpret_cast<PFS_cond*> (cond);
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(cond_operation_map));
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(pfs_cond != NULL);
-  DBUG_ASSERT(pfs_cond->m_class != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(cond_operation_map));
+  assert(state != NULL);
+  assert(pfs_cond != NULL);
+  assert(pfs_cond->m_class != NULL);
 
   if (! pfs_cond->m_enabled)
     return NULL;
@@ -2966,7 +2983,7 @@ static inline PFS_TL_LOCK_TYPE lock_flags_to_lock_type(uint flags)
     case TL_WRITE_DEFAULT:
     case TL_WRITE_CONCURRENT_DEFAULT:
     default:
-      DBUG_ASSERT(false);
+      assert(false);
   }
 
   /* Dead code */
@@ -2975,7 +2992,7 @@ static inline PFS_TL_LOCK_TYPE lock_flags_to_lock_type(uint flags)
 
 static inline PFS_TL_LOCK_TYPE external_lock_flags_to_lock_type(uint flags)
 {
-  DBUG_ASSERT(flags == F_RDLCK || flags == F_WRLCK);
+  assert(flags == F_RDLCK || flags == F_WRLCK);
   return (flags == F_RDLCK ? PFS_TL_READ_EXTERNAL : PFS_TL_WRITE_EXTERNAL);
 }
 
@@ -2990,12 +3007,12 @@ pfs_start_table_io_wait_v1(PSI_table_locker_state *state,
                            uint index,
                            const char *src_file, uint src_line)
 {
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(table_io_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(table_io_operation_map));
+  assert(state != NULL);
   PFS_table *pfs_table= reinterpret_cast<PFS_table*> (table);
-  DBUG_ASSERT(pfs_table != NULL);
-  DBUG_ASSERT(pfs_table->m_share != NULL);
+  assert(pfs_table != NULL);
+  assert(pfs_table->m_share != NULL);
 
   if (! pfs_table->m_io_enabled)
     return NULL;
@@ -3092,13 +3109,13 @@ pfs_start_table_lock_wait_v1(PSI_table_locker_state *state,
                              ulong op_flags,
                              const char *src_file, uint src_line)
 {
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT((op == PSI_TABLE_LOCK) || (op == PSI_TABLE_EXTERNAL_LOCK));
+  assert(state != NULL);
+  assert((op == PSI_TABLE_LOCK) || (op == PSI_TABLE_EXTERNAL_LOCK));
 
   PFS_table *pfs_table= reinterpret_cast<PFS_table*> (table);
 
-  DBUG_ASSERT(pfs_table != NULL);
-  DBUG_ASSERT(pfs_table->m_share != NULL);
+  assert(pfs_table != NULL);
+  assert(pfs_table->m_share != NULL);
 
   if (! pfs_table->m_lock_enabled)
     return NULL;
@@ -3128,10 +3145,10 @@ pfs_start_table_lock_wait_v1(PSI_table_locker_state *state,
       break;
     default:
       lock_type= PFS_TL_READ;
-      DBUG_ASSERT(false);
+      assert(false);
   }
 
-  DBUG_ASSERT((uint) lock_type < array_elements(table_lock_operation_map));
+  assert((uint) lock_type < array_elements(table_lock_operation_map));
 
   uint flags;
   ulonglong timer_start= 0;
@@ -3221,9 +3238,9 @@ pfs_get_thread_file_name_locker_v1(PSI_file_locker_state *state,
                                    PSI_file_operation op,
                                    const char *name, const void *identity)
 {
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(file_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(file_operation_map));
+  assert(state != NULL);
 
   if (! flag_global_instrumentation)
     return NULL;
@@ -3298,13 +3315,13 @@ pfs_get_thread_file_stream_locker_v1(PSI_file_locker_state *state,
                                      PSI_file *file, PSI_file_operation op)
 {
   PFS_file *pfs_file= reinterpret_cast<PFS_file*> (file);
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(file_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(file_operation_map));
+  assert(state != NULL);
 
   if (unlikely(pfs_file == NULL))
     return NULL;
-  DBUG_ASSERT(pfs_file->m_class != NULL);
+  assert(pfs_file->m_class != NULL);
   PFS_file_class *klass= pfs_file->m_class;
 
   if (! pfs_file->m_enabled)
@@ -3391,9 +3408,9 @@ pfs_get_thread_file_descriptor_locker_v1(PSI_file_locker_state *state,
                                          File file, PSI_file_operation op)
 {
   int index= static_cast<int> (file);
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(file_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(file_operation_map));
+  assert(state != NULL);
 
   if (unlikely((index < 0) || (index >= file_handle_max)))
     return NULL;
@@ -3416,7 +3433,7 @@ pfs_get_thread_file_descriptor_locker_v1(PSI_file_locker_state *state,
   if (! pfs_file->m_enabled)
     return NULL;
 
-  DBUG_ASSERT(pfs_file->m_class != NULL);
+  assert(pfs_file->m_class != NULL);
   PFS_file_class *klass= pfs_file->m_class;
 
   /* Needed for the LF_HASH */
@@ -3500,13 +3517,13 @@ pfs_start_socket_wait_v1(PSI_socket_locker_state *state,
                          size_t count,
                          const char *src_file, uint src_line)
 {
-  DBUG_ASSERT(static_cast<int> (op) >= 0);
-  DBUG_ASSERT(static_cast<uint> (op) < array_elements(socket_operation_map));
-  DBUG_ASSERT(state != NULL);
+  assert(static_cast<int> (op) >= 0);
+  assert(static_cast<uint> (op) < array_elements(socket_operation_map));
+  assert(state != NULL);
   PFS_socket *pfs_socket= reinterpret_cast<PFS_socket*> (socket);
 
-  DBUG_ASSERT(pfs_socket != NULL);
-  DBUG_ASSERT(pfs_socket->m_class != NULL);
+  assert(pfs_socket != NULL);
+  assert(pfs_socket->m_class != NULL);
 
   if (!pfs_socket->m_enabled || pfs_socket->m_idle)
     return NULL;
@@ -3622,7 +3639,7 @@ void pfs_unlock_mutex_v1(PSI_mutex *mutex)
 {
   PFS_mutex *pfs_mutex= reinterpret_cast<PFS_mutex*> (mutex);
 
-  DBUG_ASSERT(pfs_mutex != NULL);
+  assert(pfs_mutex != NULL);
 
   /*
     Note that this code is still protected by the instrumented mutex,
@@ -3658,10 +3675,10 @@ void pfs_unlock_mutex_v1(PSI_mutex *mutex)
 void pfs_unlock_rwlock_v1(PSI_rwlock *rwlock)
 {
   PFS_rwlock *pfs_rwlock= reinterpret_cast<PFS_rwlock*> (rwlock);
-  DBUG_ASSERT(pfs_rwlock != NULL);
-  DBUG_ASSERT(pfs_rwlock == sanitize_rwlock(pfs_rwlock));
-  DBUG_ASSERT(pfs_rwlock->m_class != NULL);
-  DBUG_ASSERT(pfs_rwlock->m_lock.is_populated());
+  assert(pfs_rwlock != NULL);
+  assert(pfs_rwlock == sanitize_rwlock(pfs_rwlock));
+  assert(pfs_rwlock->m_class != NULL);
+  assert(pfs_rwlock->m_lock.is_populated());
 
   bool last_writer= false;
   bool last_reader= false;
@@ -3738,7 +3755,7 @@ void pfs_signal_cond_v1(PSI_cond* cond)
 #ifdef PFS_LATER
   PFS_cond *pfs_cond= reinterpret_cast<PFS_cond*> (cond);
 
-  DBUG_ASSERT(pfs_cond != NULL);
+  assert(pfs_cond != NULL);
 
   pfs_cond->m_cond_stat.m_signal_count++;
 #endif
@@ -3753,7 +3770,7 @@ void pfs_broadcast_cond_v1(PSI_cond* cond)
 #ifdef PFS_LATER
   PFS_cond *pfs_cond= reinterpret_cast<PFS_cond*> (cond);
 
-  DBUG_ASSERT(pfs_cond != NULL);
+  assert(pfs_cond != NULL);
 
   pfs_cond->m_cond_stat.m_broadcast_count++;
 #endif
@@ -3766,7 +3783,7 @@ void pfs_broadcast_cond_v1(PSI_cond* cond)
 PSI_idle_locker*
 pfs_start_idle_wait_v1(PSI_idle_locker_state* state, const char *src_file, uint src_line)
 {
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (!flag_global_instrumentation)
     return NULL;
@@ -3787,7 +3804,7 @@ pfs_start_idle_wait_v1(PSI_idle_locker_state* state, const char *src_file, uint
     state->m_thread= reinterpret_cast<PSI_thread *> (pfs_thread);
     flags= STATE_FLAG_THREAD;
 
-    DBUG_ASSERT(pfs_thread->m_events_statements_count == 0);
+    assert(pfs_thread->m_events_statements_count == 0);
 
     if (global_idle_class.m_timed)
     {
@@ -3852,7 +3869,7 @@ pfs_start_idle_wait_v1(PSI_idle_locker_state* state, const char *src_file, uint
 void pfs_end_idle_wait_v1(PSI_idle_locker* locker)
 {
   PSI_idle_locker_state *state= reinterpret_cast<PSI_idle_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
@@ -3884,7 +3901,7 @@ void pfs_end_idle_wait_v1(PSI_idle_locker* locker)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -3894,7 +3911,7 @@ void pfs_end_idle_wait_v1(PSI_idle_locker* locker)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 
@@ -3917,13 +3934,13 @@ void pfs_end_idle_wait_v1(PSI_idle_locker* locker)
 void pfs_end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
 {
   PSI_mutex_locker_state *state= reinterpret_cast<PSI_mutex_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
   PFS_mutex *mutex= reinterpret_cast<PFS_mutex *> (state->m_mutex);
-  DBUG_ASSERT(mutex != NULL);
+  assert(mutex != NULL);
   PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
 
   uint flags= state->m_flags;
@@ -3953,8 +3970,8 @@ void pfs_end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
     event_name_array= thread->write_instr_class_waits_stats();
     uint index= mutex->m_class->m_event_name_index;
 
-    DBUG_ASSERT(index <= wait_class_max);
-    DBUG_ASSERT(sanitize_thread(thread) != NULL);
+    assert(index <= wait_class_max);
+    assert(sanitize_thread(thread) != NULL);
 
     if (flags & STATE_FLAG_TIMED)
     {
@@ -3970,7 +3987,7 @@ void pfs_end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -3980,7 +3997,7 @@ void pfs_end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 }
@@ -3992,13 +4009,13 @@ void pfs_end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
 void pfs_end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
 {
   PSI_rwlock_locker_state *state= reinterpret_cast<PSI_rwlock_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
   PFS_rwlock *rwlock= reinterpret_cast<PFS_rwlock *> (state->m_rwlock);
-  DBUG_ASSERT(rwlock != NULL);
+  assert(rwlock != NULL);
 
   if (state->m_flags & STATE_FLAG_TIMED)
   {
@@ -4031,7 +4048,7 @@ void pfs_end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
   if (state->m_flags & STATE_FLAG_THREAD)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
 
     PFS_single_stat *event_name_array;
     event_name_array= thread->write_instr_class_waits_stats();
@@ -4051,7 +4068,7 @@ void pfs_end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
     if (state->m_flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -4061,7 +4078,7 @@ void pfs_end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 }
@@ -4073,13 +4090,13 @@ void pfs_end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
 void pfs_end_rwlock_wrwait_v1(PSI_rwlock_locker* locker, int rc)
 {
   PSI_rwlock_locker_state *state= reinterpret_cast<PSI_rwlock_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
   PFS_rwlock *rwlock= reinterpret_cast<PFS_rwlock *> (state->m_rwlock);
-  DBUG_ASSERT(rwlock != NULL);
+  assert(rwlock != NULL);
   PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
 
   if (state->m_flags & STATE_FLAG_TIMED)
@@ -4130,7 +4147,7 @@ void pfs_end_rwlock_wrwait_v1(PSI_rwlock_locker* locker, int rc)
     if (state->m_flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -4140,7 +4157,7 @@ void pfs_end_rwlock_wrwait_v1(PSI_rwlock_locker* locker, int rc)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 }
@@ -4152,7 +4169,7 @@ void pfs_end_rwlock_wrwait_v1(PSI_rwlock_locker* locker, int rc)
 void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc)
 {
   PSI_cond_locker_state *state= reinterpret_cast<PSI_cond_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
@@ -4176,7 +4193,7 @@ void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc)
   if (state->m_flags & STATE_FLAG_THREAD)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
 
     PFS_single_stat *event_name_array;
     event_name_array= thread->write_instr_class_waits_stats();
@@ -4196,7 +4213,7 @@ void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc)
     if (state->m_flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -4206,7 +4223,7 @@ void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 }
@@ -4218,19 +4235,19 @@ void pfs_end_cond_wait_v1(PSI_cond_locker* locker, int rc)
 void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
 {
   PSI_table_locker_state *state= reinterpret_cast<PSI_table_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
   PFS_table *table= reinterpret_cast<PFS_table *> (state->m_table);
-  DBUG_ASSERT(table != NULL);
+  assert(table != NULL);
 
   PFS_single_stat *stat;
   PFS_table_io_stat *table_io_stat;
 
-  DBUG_ASSERT((state->m_index < table->m_share->m_key_count) ||
-              (state->m_index == MAX_INDEXES));
+  assert((state->m_index < table->m_share->m_key_count) ||
+         (state->m_index == MAX_INDEXES));
 
   table_io_stat= & table->m_table_stat.m_index_stat[state->m_index];
   table_io_stat->m_has_data= true;
@@ -4250,7 +4267,7 @@ void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
     stat= & table_io_stat->m_delete;
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     stat= NULL;
     break;
   }
@@ -4271,7 +4288,7 @@ void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
   if (flags & STATE_FLAG_THREAD)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
 
     PFS_single_stat *event_name_array;
     event_name_array= thread->write_instr_class_waits_stats();
@@ -4292,7 +4309,7 @@ void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -4303,7 +4320,7 @@ void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 
@@ -4317,13 +4334,13 @@ void pfs_end_table_io_wait_v1(PSI_table_locker* locker, ulonglong numrows)
 void pfs_end_table_lock_wait_v1(PSI_table_locker* locker)
 {
   PSI_table_locker_state *state= reinterpret_cast<PSI_table_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
 
   PFS_table *table= reinterpret_cast<PFS_table *> (state->m_table);
-  DBUG_ASSERT(table != NULL);
+  assert(table != NULL);
 
   PFS_single_stat *stat= & table->m_table_stat.m_lock_stat.m_stat[state->m_index];
 
@@ -4343,7 +4360,7 @@ void pfs_end_table_lock_wait_v1(PSI_table_locker* locker)
   if (flags & STATE_FLAG_THREAD)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
 
     PFS_single_stat *event_name_array;
     event_name_array= thread->write_instr_class_waits_stats();
@@ -4364,7 +4381,7 @@ void pfs_end_table_lock_wait_v1(PSI_table_locker* locker)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -4374,7 +4391,7 @@ void pfs_end_table_lock_wait_v1(PSI_table_locker* locker)
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 
@@ -4411,7 +4428,7 @@ pfs_end_file_open_wait_v1(PSI_file_locker *locker,
                           void *result)
 {
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   switch (state->m_operation)
   {
@@ -4432,7 +4449,7 @@ pfs_end_file_open_wait_v1(PSI_file_locker *locker,
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -4451,7 +4468,7 @@ void pfs_end_file_open_wait_and_bind_to_descriptor_v1
   PFS_file *pfs_file= NULL;
   int index= (int) file;
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (index >= 0)
   {
@@ -4485,9 +4502,9 @@ void pfs_end_file_open_wait_and_bind_to_descriptor_v1
 void pfs_end_temp_file_open_wait_and_bind_to_descriptor_v1
   (PSI_file_locker *locker, File file, const char *filename)
 {
-  DBUG_ASSERT(filename != NULL);
+  assert(filename != NULL);
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   /* Set filename that was generated during creation of temporary file. */
   state->m_name= filename;
@@ -4512,7 +4529,7 @@ void pfs_start_file_wait_v1(PSI_file_locker *locker,
 {
   ulonglong timer_start= 0;
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   uint flags= state->m_flags;
 
@@ -4525,7 +4542,7 @@ void pfs_start_file_wait_v1(PSI_file_locker *locker,
   if (flags & STATE_FLAG_EVENT)
   {
     PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-    DBUG_ASSERT(wait != NULL);
+    assert(wait != NULL);
 
     wait->m_timer_start= timer_start;
     wait->m_source_file= src_file;
@@ -4542,7 +4559,7 @@ void pfs_end_file_wait_v1(PSI_file_locker *locker,
                           size_t byte_count)
 {
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
   PFS_file *file= reinterpret_cast<PFS_file *> (state->m_file);
   PFS_file_class *klass= reinterpret_cast<PFS_file_class *> (state->m_class);
   PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
@@ -4593,7 +4610,7 @@ void pfs_end_file_wait_v1(PSI_file_locker *locker,
       byte_stat= &file_stat->m_io_stat.m_misc;
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       byte_stat= NULL;
       break;
   }
@@ -4614,7 +4631,7 @@ void pfs_end_file_wait_v1(PSI_file_locker *locker,
 
   if (flags & STATE_FLAG_THREAD)
   {
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
 
     PFS_single_stat *event_name_array;
     event_name_array= thread->write_instr_class_waits_stats();
@@ -4634,7 +4651,7 @@ void pfs_end_file_wait_v1(PSI_file_locker *locker,
     if (state->m_flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_number_of_bytes= bytes;
@@ -4649,7 +4666,7 @@ void pfs_end_file_wait_v1(PSI_file_locker *locker,
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
 }
@@ -4667,7 +4684,7 @@ void pfs_start_file_close_wait_v1(PSI_file_locker *locker,
   uint len;
   PFS_file *pfs_file;
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   switch (state->m_operation)
   {
@@ -4682,7 +4699,7 @@ void pfs_start_file_close_wait_v1(PSI_file_locker *locker,
   case PSI_FILE_CLOSE:
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -4698,7 +4715,7 @@ void pfs_start_file_close_wait_v1(PSI_file_locker *locker,
 void pfs_end_file_close_wait_v1(PSI_file_locker *locker, int rc)
 {
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   pfs_end_file_wait_v1(locker, 0);
 
@@ -4715,7 +4732,7 @@ void pfs_end_file_close_wait_v1(PSI_file_locker *locker, int rc)
       {
         if (file->m_temporary)
         {
-          DBUG_ASSERT(file->m_file_stat.m_open_count <= 1);
+          assert(file->m_file_stat.m_open_count <= 1);
           destroy_file(thread, file);
         }
         else
@@ -4731,7 +4748,7 @@ void pfs_end_file_close_wait_v1(PSI_file_locker *locker, int rc)
         destroy_file(thread, file);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
     }
   }
@@ -4746,8 +4763,8 @@ void pfs_end_file_rename_wait_v1(PSI_file_locker *locker, const char *old_name,
                                  const char *new_name, int rc)
 {
   PSI_file_locker_state *state= reinterpret_cast<PSI_file_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(state->m_operation == PSI_FILE_RENAME);
+  assert(state != NULL);
+  assert(state->m_operation == PSI_FILE_RENAME);
 
   if (rc == 0)
   {
@@ -4952,8 +4969,8 @@ pfs_get_thread_statement_locker_v1(PSI_statement_locker_state *state,
                                    PSI_statement_key key,
                                    const void *charset, PSI_sp_share *sp_share)
 {
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(charset != NULL);
+  assert(state != NULL);
+  assert(charset != NULL);
   if (! flag_global_instrumentation)
     return NULL;
   PFS_statement_class *klass= find_statement_class(key);
@@ -5145,11 +5162,11 @@ pfs_refine_statement_v1(PSI_statement_locker *locker,
   PSI_statement_locker_state *state= reinterpret_cast<PSI_statement_locker_state*> (locker);
   if (state == NULL)
     return NULL;
-  DBUG_ASSERT(state->m_class != NULL);
+  assert(state->m_class != NULL);
   PFS_statement_class *klass;
   /* Only refine statements for mutable instrumentation */
   klass= reinterpret_cast<PFS_statement_class*> (state->m_class);
-  DBUG_ASSERT(klass->is_mutable());
+  assert(klass->is_mutable());
   klass= find_statement_class(key);
 
   uint flags= state->m_flags;
@@ -5160,7 +5177,7 @@ pfs_refine_statement_v1(PSI_statement_locker *locker,
     if (flags & STATE_FLAG_THREAD)
     {
       PFS_thread *pfs_thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-      DBUG_ASSERT(pfs_thread != NULL);
+      assert(pfs_thread != NULL);
       if (pfs_thread->m_events_statements_count > 0)
         pfs_thread->m_events_statements_count--;
     }
@@ -5175,7 +5192,7 @@ pfs_refine_statement_v1(PSI_statement_locker *locker,
   if (flags & STATE_FLAG_EVENT)
   {
     PFS_events_statements *pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
 
     /* mutate EVENTS_STATEMENTS_CURRENT.EVENT_NAME */
     pfs->m_class= klass;
@@ -5191,7 +5208,7 @@ void pfs_start_statement_v1(PSI_statement_locker *locker,
                             const char *src_file, uint src_line)
 {
   PSI_statement_locker_state *state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   uint flags= state->m_flags;
   ulonglong timer_start= 0;
@@ -5203,7 +5220,7 @@ void pfs_start_statement_v1(PSI_statement_locker *locker,
   }
 
   compile_time_assert(PSI_SCHEMA_NAME_LEN == NAME_LEN);
-  DBUG_ASSERT(db_len <= sizeof(state->m_schema_name));
+  assert(db_len <= sizeof(state->m_schema_name));
 
   if (db_len > 0)
     memcpy(state->m_schema_name, db, db_len);
@@ -5212,13 +5229,13 @@ void pfs_start_statement_v1(PSI_statement_locker *locker,
   if (flags & STATE_FLAG_EVENT)
   {
     PFS_events_statements *pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
 
     pfs->m_timer_start= timer_start;
     pfs->m_source_file= src_file;
     pfs->m_source_line= src_line;
 
-    DBUG_ASSERT(db_len <= sizeof(pfs->m_current_schema_name));
+    assert(db_len <= sizeof(pfs->m_current_schema_name));
     if (db_len > 0)
       memcpy(pfs->m_current_schema_name, db, db_len);
     pfs->m_current_schema_name_length= db_len;
@@ -5229,7 +5246,7 @@ void pfs_set_statement_text_v1(PSI_statement_locker *locker,
                                const char *text, uint text_len)
 {
   PSI_statement_locker_state *state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (state->m_discarded)
     return;
@@ -5237,7 +5254,7 @@ void pfs_set_statement_text_v1(PSI_statement_locker *locker,
   if (state->m_flags & STATE_FLAG_EVENT)
   {
     PFS_events_statements *pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
     if (text_len > pfs_max_sqltext)
     {
       text_len= (uint)pfs_max_sqltext;
@@ -5264,7 +5281,7 @@ void pfs_set_statement_text_v1(PSI_statement_locker *locker,
   {                                                                     \
     PFS_events_statements *pfs;                                         \
     pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement); \
-    DBUG_ASSERT(pfs != NULL);                                           \
+    assert(pfs != NULL);                                                \
     pfs->ATTR= VALUE;                                                   \
   }                                                                     \
   return;
@@ -5281,7 +5298,7 @@ void pfs_set_statement_text_v1(PSI_statement_locker *locker,
   {                                                                     \
     PFS_events_statements *pfs;                                         \
     pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement); \
-    DBUG_ASSERT(pfs != NULL);                                           \
+    assert(pfs != NULL);                                                \
     pfs->ATTR+= VALUE;                                                  \
   }                                                                     \
   return;
@@ -5384,14 +5401,14 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
 {
   PSI_statement_locker_state *state= reinterpret_cast<PSI_statement_locker_state*> (locker);
   Diagnostics_area *da= reinterpret_cast<Diagnostics_area*> (stmt_da);
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(da != NULL);
+  assert(state != NULL);
+  assert(da != NULL);
 
   if (state->m_discarded)
     return;
 
   PFS_statement_class *klass= reinterpret_cast<PFS_statement_class *> (state->m_class);
-  DBUG_ASSERT(klass != NULL);
+  assert(klass != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
@@ -5418,7 +5435,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
   if (flags & STATE_FLAG_THREAD)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
     event_name_array= thread->write_instr_class_statements_stats();
     /* Aggregate to EVENTS_STATEMENTS_SUMMARY_BY_THREAD_BY_EVENT_NAME */
     stat= & event_name_array[index];
@@ -5439,7 +5456,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_statements *pfs= reinterpret_cast<PFS_events_statements*> (state->m_statement);
-      DBUG_ASSERT(pfs != NULL);
+      assert(pfs != NULL);
 
       pfs_dirty_state dirty_state;
       thread->m_stmt_lock.allocated_to_dirty(& dirty_state);
@@ -5493,7 +5510,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
       if (thread->m_flag_events_statements_history_long)
         insert_events_statements_history_long(pfs);
 
-      DBUG_ASSERT(thread->m_events_statements_count > 0);
+      assert(thread->m_events_statements_count > 0);
       thread->m_events_statements_count--;
       thread->m_stmt_lock.dirty_to_allocated(& dirty_state);
     }
@@ -5756,7 +5773,7 @@ static inline enum_object_type sp_type_to_object_type(uint sp_type)
     case SP_TYPE_EVENT:
       return OBJECT_TYPE_EVENT;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       /* Dead code */
       return NO_OBJECT_TYPE;
   }
@@ -5802,7 +5819,7 @@ void pfs_release_sp_share_v1(PSI_sp_share* sp_share)
 PSI_sp_locker* pfs_start_sp_v1(PSI_sp_locker_state *state,
                                PSI_sp_share *sp_share)
 {
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
   if (! flag_global_instrumentation)
     return NULL;
 
@@ -5840,7 +5857,7 @@ PSI_sp_locker* pfs_start_sp_v1(PSI_sp_locker_state *state,
 void pfs_end_sp_v1(PSI_sp_locker *locker)
 {
   PSI_sp_locker_state *state= reinterpret_cast<PSI_sp_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end;
   ulonglong wait_time;
@@ -5891,7 +5908,7 @@ pfs_get_thread_transaction_locker_v1(PSI_transaction_locker_state *state,
                                      my_bool read_only,
                                      my_bool autocommit)
 {
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (!flag_global_instrumentation)
     return NULL;
@@ -5979,7 +5996,7 @@ void pfs_start_transaction_v1(PSI_transaction_locker *locker,
                               const char *src_file, uint src_line)
 {
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   uint flags= state->m_flags;
   ulonglong timer_start= 0;
@@ -5993,7 +6010,7 @@ void pfs_start_transaction_v1(PSI_transaction_locker *locker,
   if (flags & STATE_FLAG_EVENT)
   {
     PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
 
     pfs->m_timer_start= timer_start;
     pfs->m_source_file= src_file;
@@ -6009,14 +6026,14 @@ void pfs_set_transaction_gtid_v1(PSI_transaction_locker *locker,
                                  const void *gtid_spec)
 {
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(sid != NULL);
-  DBUG_ASSERT(gtid_spec != NULL);
+  assert(state != NULL);
+  assert(sid != NULL);
+  assert(gtid_spec != NULL);
 
   if (state->m_flags & STATE_FLAG_EVENT)
   {
     PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
     pfs->m_sid= *(rpl_sid *)sid;
     pfs->m_gtid_spec= *(Gtid_specification *)gtid_spec;
   }
@@ -6027,13 +6044,13 @@ void pfs_set_transaction_xid_v1(PSI_transaction_locker *locker,
                                 int xa_state)
 {
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (state->m_flags & STATE_FLAG_EVENT)
   {
     PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-    DBUG_ASSERT(pfs != NULL);
-    DBUG_ASSERT(xid != NULL);
+    assert(pfs != NULL);
+    assert(xid != NULL);
 
     pfs->m_xid= *(PSI_xid *)xid;
     pfs->m_xa_state= (enum_xa_transaction_state)xa_state;
@@ -6046,12 +6063,12 @@ void pfs_set_transaction_xa_state_v1(PSI_transaction_locker *locker,
                                      int xa_state)
 {
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (state->m_flags & STATE_FLAG_EVENT)
   {
     PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
 
     pfs->m_xa_state= (enum_xa_transaction_state)xa_state;
     pfs->m_xa= true;
@@ -6062,15 +6079,15 @@ void pfs_set_transaction_xa_state_v1(PSI_transaction_locker *locker,
 void pfs_set_transaction_trxid_v1(PSI_transaction_locker *locker,
                                   const ulonglong *trxid)
 {
-  DBUG_ASSERT(trxid != NULL);
+  assert(trxid != NULL);
 
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   if (state->m_flags & STATE_FLAG_EVENT)
   {
     PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
 
     if (pfs->m_trxid == 0)
       pfs->m_trxid= *trxid;
@@ -6087,7 +6104,7 @@ void pfs_set_transaction_trxid_v1(PSI_transaction_locker *locker,
   {                                                                     \
     PFS_events_transactions *pfs;                                       \
     pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction); \
-    DBUG_ASSERT(pfs != NULL);                                           \
+    assert(pfs != NULL);                                                \
     pfs->ATTR+= VALUE;                                                  \
   }                                                                     \
   return;
@@ -6114,7 +6131,7 @@ void pfs_inc_transaction_release_savepoint_v1(PSI_transaction_locker *locker,
 void pfs_end_transaction_v1(PSI_transaction_locker *locker, my_bool commit)
 {
   PSI_transaction_locker_state *state= reinterpret_cast<PSI_transaction_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
@@ -6131,7 +6148,7 @@ void pfs_end_transaction_v1(PSI_transaction_locker *locker, my_bool commit)
   if (flags & STATE_FLAG_THREAD)
   {
     PFS_thread *pfs_thread= reinterpret_cast<PFS_thread *> (state->m_thread);
-    DBUG_ASSERT(pfs_thread != NULL);
+    assert(pfs_thread != NULL);
 
     /* Aggregate to EVENTS_TRANSACTIONS_SUMMARY_BY_THREAD_BY_EVENT_NAME */
     stat= &pfs_thread->write_instr_class_transactions_stats()[GLOBAL_TRANSACTION_INDEX];
@@ -6139,7 +6156,7 @@ void pfs_end_transaction_v1(PSI_transaction_locker *locker, my_bool commit)
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_transactions *pfs= reinterpret_cast<PFS_events_transactions*> (state->m_transaction);
-      DBUG_ASSERT(pfs != NULL);
+      assert(pfs != NULL);
 
       /* events_transactions_current may have been cleared while the transaction was active */
       if (unlikely(pfs->m_class == NULL))
@@ -6195,10 +6212,10 @@ void pfs_end_transaction_v1(PSI_transaction_locker *locker, my_bool commit)
 void pfs_end_socket_wait_v1(PSI_socket_locker *locker, size_t byte_count)
 {
   PSI_socket_locker_state *state= reinterpret_cast<PSI_socket_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   PFS_socket *socket= reinterpret_cast<PFS_socket *>(state->m_socket);
-  DBUG_ASSERT(socket != NULL);
+  assert(socket != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
@@ -6233,7 +6250,7 @@ void pfs_end_socket_wait_v1(PSI_socket_locker *locker, size_t byte_count)
       byte_stat= &socket->m_socket_stat.m_io_stat.m_misc;
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       byte_stat= NULL;
       break;
   }
@@ -6257,9 +6274,9 @@ void pfs_end_socket_wait_v1(PSI_socket_locker *locker, size_t byte_count)
   if (flags & STATE_FLAG_EVENT)
   {
     PFS_thread *thread= reinterpret_cast<PFS_thread *>(state->m_thread);
-    DBUG_ASSERT(thread != NULL);
+    assert(thread != NULL);
     PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-    DBUG_ASSERT(wait != NULL);
+    assert(wait != NULL);
 
     wait->m_timer_end= timer_end;
     wait->m_end_event_id= thread->m_event_id;
@@ -6271,17 +6288,17 @@ void pfs_end_socket_wait_v1(PSI_socket_locker *locker, size_t byte_count)
       insert_events_waits_history_long(wait);
     thread->m_events_waits_current--;
 
-    DBUG_ASSERT(wait == thread->m_events_waits_current);
+    assert(wait == thread->m_events_waits_current);
   }
 }
 
 void pfs_set_socket_state_v1(PSI_socket *socket, PSI_socket_state state)
 {
-  DBUG_ASSERT((state == PSI_SOCKET_STATE_IDLE) || (state == PSI_SOCKET_STATE_ACTIVE));
+  assert((state == PSI_SOCKET_STATE_IDLE) || (state == PSI_SOCKET_STATE_ACTIVE));
   PFS_socket *pfs= reinterpret_cast<PFS_socket*>(socket);
-  DBUG_ASSERT(pfs != NULL);
-  DBUG_ASSERT(pfs->m_idle || (state == PSI_SOCKET_STATE_IDLE));
-  DBUG_ASSERT(!pfs->m_idle || (state == PSI_SOCKET_STATE_ACTIVE));
+  assert(pfs != NULL);
+  assert(pfs->m_idle || (state == PSI_SOCKET_STATE_IDLE));
+  assert(!pfs->m_idle || (state == PSI_SOCKET_STATE_ACTIVE));
   pfs->m_idle= (state == PSI_SOCKET_STATE_IDLE);
 }
 
@@ -6294,7 +6311,7 @@ void pfs_set_socket_info_v1(PSI_socket *socket,
                             socklen_t addr_len)
 {
   PFS_socket *pfs= reinterpret_cast<PFS_socket*>(socket);
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
 
   /** Set socket descriptor */
   if (fd != NULL)
@@ -6320,7 +6337,7 @@ void pfs_set_socket_info_v1(PSI_socket *socket,
 void pfs_set_socket_thread_owner_v1(PSI_socket *socket)
 {
   PFS_socket *pfs_socket= reinterpret_cast<PFS_socket*>(socket);
-  DBUG_ASSERT(pfs_socket != NULL);
+  assert(pfs_socket != NULL);
   pfs_socket->m_thread_owner= my_thread_get_THR_PFS();
 }
 
@@ -6329,7 +6346,7 @@ pfs_digest_start_v1(PSI_statement_locker *locker)
 {
   PSI_statement_locker_state *statement_state;
   statement_state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(statement_state != NULL);
+  assert(statement_state != NULL);
 
   if (statement_state->m_discarded)
     return NULL;
@@ -6346,8 +6363,8 @@ void pfs_digest_end_v1(PSI_digest_locker *locker, const sql_digest_storage *dige
 {
   PSI_statement_locker_state *statement_state;
   statement_state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(statement_state != NULL);
-  DBUG_ASSERT(digest != NULL);
+  assert(statement_state != NULL);
+  assert(digest != NULL);
 
   if (statement_state->m_discarded)
     return;
@@ -6391,7 +6408,7 @@ void pfs_execute_prepared_stmt_v1 (PSI_statement_locker *locker,
                                    PSI_prepared_stmt* ps)
 {
   PSI_statement_locker_state *state= reinterpret_cast<PSI_statement_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   state->m_parent_prepared_stmt= ps;
   state->m_in_prepare= false;
@@ -6420,7 +6437,7 @@ void pfs_set_prepared_stmt_text_v1(PSI_prepared_stmt *prepared_stmt,
 {
   PFS_prepared_stmt *pfs_prepared_stmt =
     reinterpret_cast<PFS_prepared_stmt *>(prepared_stmt);
-  DBUG_ASSERT(pfs_prepared_stmt != NULL);
+  assert(pfs_prepared_stmt != NULL);
 
   uint max_len = COL_INFO_SIZE;
   if (text_len > max_len)
@@ -6443,7 +6460,7 @@ int pfs_set_thread_connect_attrs_v1(const char *buffer, uint length,
 {
   PFS_thread *thd= my_thread_get_THR_PFS();
 
-  DBUG_ASSERT(buffer != NULL);
+  assert(buffer != NULL);
 
   if (likely(thd != NULL) && session_connect_attrs_size_per_thread > 0)
   {
@@ -6480,7 +6497,7 @@ void pfs_register_memory_v1(const char *category,
 PSI_memory_key pfs_memory_alloc_v1(PSI_memory_key key, size_t size, PSI_thread **owner)
 {
   PFS_thread ** owner_thread= reinterpret_cast<PFS_thread**>(owner);
-  DBUG_ASSERT(owner_thread != NULL);
+  assert(owner_thread != NULL);
 
   if (! flag_global_instrumentation)
   {
@@ -6550,7 +6567,7 @@ PSI_memory_key pfs_memory_alloc_v1(PSI_memory_key key, size_t size, PSI_thread *
 PSI_memory_key pfs_memory_realloc_v1(PSI_memory_key key, size_t old_size, size_t new_size, PSI_thread **owner)
 {
   PFS_thread ** owner_thread_hdl= reinterpret_cast<PFS_thread**>(owner);
-  DBUG_ASSERT(owner != NULL);
+  assert(owner != NULL);
 
   PFS_memory_class *klass= find_memory_class(key);
   if (klass == NULL)
@@ -6628,7 +6645,7 @@ PSI_memory_key pfs_memory_realloc_v1(PSI_memory_key key, size_t old_size, size_t
 PSI_memory_key pfs_memory_claim_v1(PSI_memory_key key, size_t size, PSI_thread **owner)
 {
   PFS_thread ** owner_thread= reinterpret_cast<PFS_thread**>(owner);
-  DBUG_ASSERT(owner_thread != NULL);
+  assert(owner_thread != NULL);
 
   PFS_memory_class *klass= find_memory_class(key);
   if (klass == NULL)
@@ -6760,7 +6777,7 @@ void pfs_unlock_table_v1(PSI_table *table)
 {
   PFS_table *pfs_table= reinterpret_cast<PFS_table*> (table);
 
-  DBUG_ASSERT(pfs_table != NULL);
+  assert(pfs_table != NULL);
 
   pfs_table->m_internal_lock= PFS_TL_NONE;
   return;
@@ -6804,7 +6821,7 @@ void
 pfs_set_metadata_lock_status_v1(PSI_metadata_lock *lock, opaque_mdl_status mdl_status)
 {
   PFS_metadata_lock *pfs= reinterpret_cast<PFS_metadata_lock*> (lock);
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   pfs->m_mdl_status= mdl_status;
 }
 
@@ -6812,7 +6829,7 @@ void
 pfs_destroy_metadata_lock_v1(PSI_metadata_lock *lock)
 {
   PFS_metadata_lock *pfs= reinterpret_cast<PFS_metadata_lock*> (lock);
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   destroy_metadata_lock(pfs);
 }
 
@@ -6823,8 +6840,8 @@ pfs_start_metadata_wait_v1(PSI_metadata_locker_state *state,
                            uint src_line)
 {
   PFS_metadata_lock *pfs_lock= reinterpret_cast<PFS_metadata_lock*> (lock);
-  DBUG_ASSERT(state != NULL);
-  DBUG_ASSERT(pfs_lock != NULL);
+  assert(state != NULL);
+  assert(pfs_lock != NULL);
 
   if (! pfs_lock->m_enabled)
     return NULL;
@@ -6913,7 +6930,7 @@ pfs_end_metadata_wait_v1(PSI_metadata_locker *locker,
                          int rc)
 {
   PSI_metadata_locker_state *state= reinterpret_cast<PSI_metadata_locker_state*> (locker);
-  DBUG_ASSERT(state != NULL);
+  assert(state != NULL);
 
   ulonglong timer_end= 0;
   ulonglong wait_time= 0;
@@ -6947,7 +6964,7 @@ pfs_end_metadata_wait_v1(PSI_metadata_locker *locker,
     if (flags & STATE_FLAG_EVENT)
     {
       PFS_events_waits *wait= reinterpret_cast<PFS_events_waits*> (state->m_wait);
-      DBUG_ASSERT(wait != NULL);
+      assert(wait != NULL);
 
       wait->m_timer_end= timer_end;
       wait->m_end_event_id= thread->m_event_id;
@@ -6957,7 +6974,7 @@ pfs_end_metadata_wait_v1(PSI_metadata_locker *locker,
         insert_events_waits_history_long(wait);
       thread->m_events_waits_current--;
 
-      DBUG_ASSERT(wait == thread->m_events_waits_current);
+      assert(wait == thread->m_events_waits_current);
     }
   }
   else
@@ -7114,7 +7131,8 @@ PSI_v1 PFS_v1=
   pfs_set_metadata_lock_status_v1,
   pfs_destroy_metadata_lock_v1,
   pfs_start_metadata_wait_v1,
-  pfs_end_metadata_wait_v1
+  pfs_end_metadata_wait_v1,
+  pfs_set_thread_peer_port_v1
 };
 
 static void* get_interface(int version)
diff --git a/storage/perfschema/pfs.h b/storage/perfschema/pfs.h
index 811c27006ae8..5d4889f9bb90 100644
--- a/storage/perfschema/pfs.h
+++ b/storage/perfschema/pfs.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_account.cc b/storage/perfschema/pfs_account.cc
index e8d36f8fdb54..b5d6a3449f26 100644
--- a/storage/perfschema/pfs_account.cc
+++ b/storage/perfschema/pfs_account.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -67,9 +74,9 @@ static uchar *account_hash_get_key(const uchar *entry, size_t *length,
   const PFS_account *account;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_account* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   account= *typed_entry;
-  DBUG_ASSERT(account != NULL);
+  assert(account != NULL);
   *length= account->m_key.m_key_length;
   result= account->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -116,8 +123,8 @@ static void set_account_key(PFS_account_key *key,
                               const char *user, uint user_length,
                               const char *host, uint host_length)
 {
-  DBUG_ASSERT(user_length <= USERNAME_LENGTH);
-  DBUG_ASSERT(host_length <= HOSTNAME_LENGTH);
+  assert(user_length <= USERNAME_LENGTH);
+  assert(host_length <= HOSTNAME_LENGTH);
 
   char *ptr= &key->m_hash_key[0];
   if (user_length > 0)
@@ -520,30 +527,18 @@ void PFS_account::aggregate_memory(bool alive, PFS_user *safe_user, PFS_host *sa
 
 void PFS_account::aggregate_status(PFS_user *safe_user, PFS_host *safe_host)
 {
-  if (likely(safe_user != NULL && safe_host != NULL))
-  {
-    /*
-      Aggregate STATUS_BY_ACCOUNT to:
-      - STATUS_BY_USER
-      - STATUS_BY_HOST
-    */
-    safe_user->m_status_stats.aggregate(& m_status_stats);
-    safe_host->m_status_stats.aggregate(& m_status_stats);
-    m_status_stats.reset();
-    return;
-  }
+  /*
+    Never aggregate to global_status_var,
+    because of the parallel THD -> global_status_var flow.
+  */
 
   if (safe_user != NULL)
   {
     /*
       Aggregate STATUS_BY_ACCOUNT to:
       - STATUS_BY_USER
-      - GLOBAL_STATUS
     */
     safe_user->m_status_stats.aggregate(& m_status_stats);
-    m_status_stats.aggregate_to(& global_status_var);
-    m_status_stats.reset();
-    return;
   }
 
   if (safe_host != NULL)
@@ -553,15 +548,8 @@ void PFS_account::aggregate_status(PFS_user *safe_user, PFS_host *safe_host)
       - STATUS_BY_HOST
     */
     safe_host->m_status_stats.aggregate(& m_status_stats);
-    m_status_stats.reset();
-    return;
   }
 
-  /*
-    Aggregate STATUS_BY_ACCOUNT to:
-    - GLOBAL_STATUS
-  */
-  m_status_stats.aggregate_to(& global_status_var);
   m_status_stats.reset();
   return;
 }
@@ -646,7 +634,7 @@ void purge_account(PFS_thread *thread, PFS_account *account)
                     account->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    DBUG_ASSERT(*entry == account);
+    assert(*entry == account);
     if (account->get_refcount() == 0)
     {
       lf_hash_delete(&account_hash, pins,
diff --git a/storage/perfschema/pfs_account.h b/storage/perfschema/pfs_account.h
index 29382e9c8bce..b317a5d74f76 100644
--- a/storage/perfschema/pfs_account.h
+++ b/storage/perfschema/pfs_account.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_atomic.h b/storage/perfschema/pfs_atomic.h
index 458d627dd95d..8b45c71dcd2d 100644
--- a/storage/perfschema/pfs_atomic.h
+++ b/storage/perfschema/pfs_atomic.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_autosize.cc b/storage/perfschema/pfs_autosize.cc
index feb12f3f8c72..c5ca8586d1fa 100644
--- a/storage/perfschema/pfs_autosize.cc
+++ b/storage/perfschema/pfs_autosize.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -235,15 +242,15 @@ void pfs_automated_sizing(PFS_global_param *param)
     heuristic= estimate_hints(param);
     apply_heuristic(param, heuristic);
 
-    DBUG_ASSERT(param->m_events_waits_history_sizing >= 0);
-    DBUG_ASSERT(param->m_events_waits_history_long_sizing >= 0);
-    DBUG_ASSERT(param->m_events_stages_history_sizing >= 0);
-    DBUG_ASSERT(param->m_events_stages_history_long_sizing >= 0);
-    DBUG_ASSERT(param->m_events_statements_history_sizing >= 0);
-    DBUG_ASSERT(param->m_events_statements_history_long_sizing >= 0);
-    DBUG_ASSERT(param->m_events_transactions_history_sizing >= 0);
-    DBUG_ASSERT(param->m_events_transactions_history_long_sizing >= 0);
-    DBUG_ASSERT(param->m_session_connect_attrs_sizing >= 0);
+    assert(param->m_events_waits_history_sizing >= 0);
+    assert(param->m_events_waits_history_long_sizing >= 0);
+    assert(param->m_events_stages_history_sizing >= 0);
+    assert(param->m_events_stages_history_long_sizing >= 0);
+    assert(param->m_events_statements_history_sizing >= 0);
+    assert(param->m_events_statements_history_long_sizing >= 0);
+    assert(param->m_events_transactions_history_sizing >= 0);
+    assert(param->m_events_transactions_history_long_sizing >= 0);
+    assert(param->m_session_connect_attrs_sizing >= 0);
   }
   else
   {
diff --git a/storage/perfschema/pfs_buffer_container.cc b/storage/perfschema/pfs_buffer_container.cc
index 6a870d85a0e3..04f6f5219a33 100644
--- a/storage/perfschema/pfs_buffer_container.cc
+++ b/storage/perfschema/pfs_buffer_container.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_buffer_container.h b/storage/perfschema/pfs_buffer_container.h
index e711d7b8ab5b..241ef6f91a38 100644
--- a/storage/perfschema/pfs_buffer_container.h
+++ b/storage/perfschema/pfs_buffer_container.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -152,7 +159,7 @@ class PFS_buffer_default_allocator
 
   void free_array(array_type *array)
   {
-    DBUG_ASSERT(array->m_max > 0);
+    assert(array->m_max > 0);
 
     PFS_FREE_ARRAY(m_builtin_class,
                    array->m_max, sizeof(T), array->m_ptr);
@@ -252,7 +259,7 @@ class PFS_buffer_container
 
   iterator_type iterate(uint index)
   {
-    DBUG_ASSERT(index <= m_max);
+    assert(index <= m_max);
     return PFS_buffer_iterator<T, U, V>(this, index);
   }
 
@@ -312,7 +319,7 @@ class PFS_buffer_container
 
   inline value_type* get(uint index)
   {
-    DBUG_ASSERT(index < m_max);
+    assert(index < m_max);
 
     value_type *pfs= m_array.m_ptr + index;
     if (pfs->m_lock.is_populated())
@@ -357,7 +364,7 @@ class PFS_buffer_container
 private:
   value_type* scan_next(uint & index, uint * found_index)
   {
-    DBUG_ASSERT(index <= m_max);
+    assert(index <= m_max);
 
     value_type *pfs_first= m_array.get_first();
     value_type *pfs= pfs_first + index;
@@ -472,9 +479,9 @@ class PFS_buffer_scalable_container
       m_full= false;
     }
 
-    DBUG_ASSERT(m_max_page_count <= PFS_PAGE_COUNT);
-    DBUG_ASSERT(0 < m_last_page_size);
-    DBUG_ASSERT(m_last_page_size <= PFS_PAGE_SIZE);
+    assert(m_max_page_count <= PFS_PAGE_COUNT);
+    assert(0 < m_last_page_size);
+    assert(m_last_page_size <= PFS_PAGE_SIZE);
 
     native_mutex_init(& m_critical_section, NULL);
     return 0;
@@ -685,7 +692,7 @@ class PFS_buffer_scalable_container
         // ==================================================================
       }
 
-      DBUG_ASSERT(array != NULL);
+      assert(array != NULL);
       pfs= array->allocate(dirty_state);
       if (pfs != NULL)
       {
@@ -746,7 +753,7 @@ class PFS_buffer_scalable_container
 
   iterator_type iterate(uint index)
   {
-    DBUG_ASSERT(index <= m_max);
+    assert(index <= m_max);
     return PFS_buffer_scalable_iterator<T, PFS_PAGE_SIZE, PFS_PAGE_COUNT, U, V>(this, index);
   }
 
@@ -854,7 +861,7 @@ class PFS_buffer_scalable_container
 
   value_type* get(uint index)
   {
-    DBUG_ASSERT(index < m_max);
+    assert(index < m_max);
 
     uint index_1= index / PFS_PAGE_SIZE;
     array_type *page= m_pages[index_1];
@@ -951,13 +958,13 @@ class PFS_buffer_scalable_container
   {
     if (page_index + 1 < m_max_page_count)
       return PFS_PAGE_SIZE;
-    DBUG_ASSERT(page_index + 1 == m_max_page_count);
+    assert(page_index + 1 == m_max_page_count);
     return m_last_page_size;
   }
 
   value_type* scan_next(uint & index, uint * found_index)
   {
-    DBUG_ASSERT(index <= m_max);
+    assert(index <= m_max);
 
     uint index_1= index / PFS_PAGE_SIZE;
     uint index_2= index % PFS_PAGE_SIZE;
@@ -1172,7 +1179,7 @@ class PFS_partitioned_buffer_scalable_container
 
   value_type *allocate(pfs_dirty_state *dirty_state, uint partition)
   {
-    DBUG_ASSERT(partition < PFS_PARTITION_COUNT);
+    assert(partition < PFS_PARTITION_COUNT);
 
     return m_partitions[partition]->allocate(dirty_state);
   }
@@ -1301,7 +1308,7 @@ class PFS_partitioned_buffer_scalable_container
   value_type* scan_next(uint & partition_index, uint & sub_index, uint * found_partition, uint * found_sub_index)
   {
     value_type *record= NULL;
-    DBUG_ASSERT(partition_index < PFS_PARTITION_COUNT);
+    assert(partition_index < PFS_PARTITION_COUNT);
 
     while (partition_index < PFS_PARTITION_COUNT)
     {
diff --git a/storage/perfschema/pfs_builtin_memory.cc b/storage/perfschema/pfs_builtin_memory.cc
index 461952e49b4f..6a5f90820a59 100644
--- a/storage/perfschema/pfs_builtin_memory.cc
+++ b/storage/perfschema/pfs_builtin_memory.cc
@@ -1,19 +1,27 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #include "my_global.h"
+#include "m_string.h"
 #include "pfs_global.h"
 #include "pfs_builtin_memory.h"
 
@@ -108,9 +116,10 @@ static void init_builtin_memory_class(PFS_builtin_memory_class *klass, const cha
   klass->m_class.m_timed= false; /* Immutable */
   klass->m_class.m_flags= PSI_FLAG_GLOBAL;
   klass->m_class.m_event_name_index= 0;
-  strncpy(klass->m_class.m_name, name, sizeof(klass->m_class.m_name));
+  my_snprintf(klass->m_class.m_name, sizeof(klass->m_class.m_name), "%.*s",
+              PFS_MAX_INFO_NAME_LENGTH - 1, name);
   klass->m_class.m_name_length= strlen(name);
-  DBUG_ASSERT(klass->m_class.m_name_length < sizeof(klass->m_class.m_name));
+  assert(klass->m_class.m_name_length < sizeof(klass->m_class.m_name));
   klass->m_class.m_timer= NULL;
 
   klass->m_stat.reset();
diff --git a/storage/perfschema/pfs_builtin_memory.h b/storage/perfschema/pfs_builtin_memory.h
index 07e9e598a8a5..956b31c5dcf3 100644
--- a/storage/perfschema/pfs_builtin_memory.h
+++ b/storage/perfschema/pfs_builtin_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_check.cc b/storage/perfschema/pfs_check.cc
index 9ab1650cb697..c48f9e5ad3cf 100644
--- a/storage/perfschema/pfs_check.cc
+++ b/storage/perfschema/pfs_check.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_column_types.h b/storage/perfschema/pfs_column_types.h
index 0020a79c3ce1..e820bc8c8510 100644
--- a/storage/perfschema/pfs_column_types.h
+++ b/storage/perfschema/pfs_column_types.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_column_values.cc b/storage/perfschema/pfs_column_values.cc
index 82ed1020ddd4..eba320a0b269 100644
--- a/storage/perfschema/pfs_column_values.cc
+++ b/storage/perfschema/pfs_column_values.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_column_values.h b/storage/perfschema/pfs_column_values.h
index 2dc778c1c5c6..cbaeabebcd20 100644
--- a/storage/perfschema/pfs_column_values.h
+++ b/storage/perfschema/pfs_column_values.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_con_slice.cc b/storage/perfschema/pfs_con_slice.cc
index e3523863776b..ea8f3865bb91 100644
--- a/storage/perfschema/pfs_con_slice.cc
+++ b/storage/perfschema/pfs_con_slice.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_con_slice.h b/storage/perfschema/pfs_con_slice.h
index f73628921895..cdf62a428bcd 100644
--- a/storage/perfschema/pfs_con_slice.h
+++ b/storage/perfschema/pfs_con_slice.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_defaults.cc b/storage/perfschema/pfs_defaults.cc
index 283c678e00fe..a72ca36335a4 100644
--- a/storage/perfschema/pfs_defaults.cc
+++ b/storage/perfschema/pfs_defaults.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_defaults.h b/storage/perfschema/pfs_defaults.h
index bbb041504e2c..c61b0dd8d557 100644
--- a/storage/perfschema/pfs_defaults.h
+++ b/storage/perfschema/pfs_defaults.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc
index ed74b07083ab..6e3943ad380c 100644
--- a/storage/perfschema/pfs_digest.cc
+++ b/storage/perfschema/pfs_digest.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -139,9 +146,9 @@ static uchar *digest_hash_get_key(const uchar *entry, size_t *length,
   const PFS_statements_digest_stat *digest;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_statements_digest_stat*const*>(entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   digest= *typed_entry;
-  DBUG_ASSERT(digest != NULL);
+  assert(digest != NULL);
   *length= sizeof (PFS_digest_key);
   result= & digest->m_digest_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -191,7 +198,7 @@ find_or_create_digest(PFS_thread *thread,
                       const char *schema_name,
                       uint schema_name_length)
 {
-  DBUG_ASSERT(digest_storage != NULL);
+  assert(digest_storage != NULL);
 
   if (statements_digest_stat_array == NULL)
     return NULL;
@@ -269,7 +276,7 @@ find_or_create_digest(PFS_thread *thread,
     }
 
     /* Add a new record in digest stat array. */
-    DBUG_ASSERT(safe_index < digest_max);
+    assert(safe_index < digest_max);
     pfs= &statements_digest_stat_array[safe_index];
 
     if (pfs->m_lock.is_free())
diff --git a/storage/perfschema/pfs_digest.h b/storage/perfschema/pfs_digest.h
index b26bf11d7f28..143db774d582 100644
--- a/storage/perfschema/pfs_digest.h
+++ b/storage/perfschema/pfs_digest.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index b082fb99ecd7..87563eb8b105 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -41,6 +48,7 @@
 #include "table_file_summary_by_instance.h"
 #include "table_file_summary_by_event_name.h"
 #include "table_threads.h"
+#include "table_processlist.h"
 
 #include "table_ews_by_host_by_event_name.h"
 #include "table_ews_by_user_by_event_name.h"
@@ -139,13 +147,13 @@ bool PFS_table_context::initialize(void)
   {
     /* Restore context from TLS. */
     PFS_table_context *context= static_cast<PFS_table_context *>(my_get_thread_local(m_thr_key));
-    DBUG_ASSERT(context != NULL);
+    assert(context != NULL);
 
     if(context)
     {
       m_last_version= context->m_current_version;
       m_map= context->m_map;
-      DBUG_ASSERT(m_map_size == context->m_map_size);
+      assert(m_map_size == context->m_map_size);
       m_map_size= context->m_map_size;
       m_word_size= context->m_word_size;
     }
@@ -154,7 +162,7 @@ bool PFS_table_context::initialize(void)
   {
     /* Check that TLS is not in use. */
     PFS_table_context *context= static_cast<PFS_table_context *>(my_get_thread_local(m_thr_key));
-    //DBUG_ASSERT(context == NULL);
+    //assert(context == NULL);
 
     context= this;
 
@@ -326,6 +334,8 @@ static PFS_engine_table_share *all_shares[]=
   &table_global_variables::m_share,
   &table_session_variables::m_share,
 
+  &table_processlist::m_share,
+
   NULL
 };
 
@@ -378,6 +388,21 @@ void PFS_check_intact::report_error(uint code, const char *fmt, ...)
   sql_print_error("%s", buff);
 }
 
+/** Error reporting for schema integrity checks. */
+class PFS_silent_check_intact : public Table_check_intact
+{
+protected:
+  virtual void report_error(uint code, const char *fmt, ...) {}
+
+public:
+  PFS_silent_check_intact()
+  {}
+
+  ~PFS_silent_check_intact()
+  {}
+};
+
+
 /**
   Check integrity of the actual table schema.
   The actual table schema (.frm) is compared to the expected schema.
@@ -391,6 +416,8 @@ void PFS_engine_table_share::check_one_table(THD *thd)
                         PERFORMANCE_SCHEMA_str.length,
                         m_name.str, m_name.length,
                         m_name.str, TL_READ);
+  TABLE_LIST *tl = &tables;
+  uint count = 1;
 
   /* Work around until Bug#32115 is backported. */
   LEX dummy_lex;
@@ -398,22 +425,60 @@ void PFS_engine_table_share::check_one_table(THD *thd)
   thd->lex= &dummy_lex;
   lex_start(thd);
 
-  if (! open_and_lock_tables(thd, &tables, MYSQL_LOCK_IGNORE_TIMEOUT))
+  if (! open_tables(thd, &tl, &count, MYSQL_LOCK_IGNORE_TIMEOUT))
   {
     PFS_check_intact checker;
 
-    if (!checker.check(tables.table, m_field_def))
-      m_checked= true;
+    if (!checker.check(tables.table, m_field_def)) {
+      m_state->m_checked= true;
+    }
     close_thread_tables(thd);
   }
   else
-    sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE),
-                    PERFORMANCE_SCHEMA_str.str, m_name.str);
+  {
+    if (m_optional) {
+      /*
+        TABLE performance_schema.PROCESSLIST is:
+        - a backport from 8.0
+        - a native table
+        - an optional table, not created by upgrade scripts
+      */
+      sql_print_warning(ER(ER_WARN_WRONG_NATIVE_TABLE_STRUCTURE),
+                        PERFORMANCE_SCHEMA_str.str, m_name.str);
+    } else {
+      sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE),
+                      PERFORMANCE_SCHEMA_str.str, m_name.str);
+    }
+  }
 
   lex_end(&dummy_lex);
   thd->lex= old_lex;
 }
 
+bool PFS_engine_table_share::is_table_checked(TABLE *table) const {
+  if (! m_state->m_checked) {
+    if (m_optional) {
+      /*
+        For optional tables (i.e., processlist),
+        the DBA can add the table with CREATE TABLE
+        at any time.
+        The m_checked flag can be still false if the
+        table was missing during server bootstrap.
+        We do not want to force a server shutdown + restart
+        to re-evaluate this flag for an upgraded instance,
+        so perform a last chance check dynamically here.
+      */
+      PFS_silent_check_intact checker;
+
+      if (! checker.check(table, m_field_def)) {
+        m_state->m_checked= true;
+      }
+    }
+  }
+
+  return m_state->m_checked;
+}
+
 /** Initialize all the table share locks. */
 void PFS_engine_table_share::init_all_locks(void)
 {
@@ -446,7 +511,7 @@ int PFS_engine_table_share::write_row(TABLE *table, unsigned char *buf,
     Make sure the table structure is as expected before mapping
     hard wired columns in m_write_row.
   */
-  if (! m_checked)
+  if (! is_table_checked(table))
   {
     return HA_ERR_TABLE_NEEDS_UPGRADE;
   }
@@ -525,7 +590,7 @@ int PFS_engine_table::read_row(TABLE *table,
     Make sure the table structure is as expected before mapping
     hard wired columns in read_row_values.
   */
-  if (! m_share_ptr->m_checked)
+  if (! m_share_ptr->is_table_checked(table))
   {
     return HA_ERR_TABLE_NEEDS_UPGRADE;
   }
@@ -570,7 +635,7 @@ int PFS_engine_table::update_row(TABLE *table,
     Make sure the table structure is as expected before mapping
     hard wired columns in update_row_values.
   */
-  if (! m_share_ptr->m_checked)
+  if (! m_share_ptr->is_table_checked(table))
   {
     return HA_ERR_TABLE_NEEDS_UPGRADE;
   }
@@ -593,7 +658,7 @@ int PFS_engine_table::delete_row(TABLE *table,
     Make sure the table structure is as expected before mapping
     hard wired columns in delete_row_values.
   */
-  if (! m_share_ptr->m_checked)
+  if (! m_share_ptr->is_table_checked(table))
   {
     return HA_ERR_TABLE_NEEDS_UPGRADE;
   }
@@ -646,28 +711,28 @@ void PFS_engine_table::get_normalizer(PFS_instr_class *instr_class)
 
 void PFS_engine_table::set_field_long(Field *f, long value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_LONG);
+  assert(f->real_type() == MYSQL_TYPE_LONG);
   Field_long *f2= (Field_long*) f;
   f2->store(value, false);
 }
 
 void PFS_engine_table::set_field_ulong(Field *f, ulong value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_LONG);
+  assert(f->real_type() == MYSQL_TYPE_LONG);
   Field_long *f2= (Field_long*) f;
   f2->store(value, true);
 }
 
 void PFS_engine_table::set_field_longlong(Field *f, longlong value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_LONGLONG);
+  assert(f->real_type() == MYSQL_TYPE_LONGLONG);
   Field_longlong *f2= (Field_longlong*) f;
   f2->store(value, false);
 }
 
 void PFS_engine_table::set_field_ulonglong(Field *f, ulonglong value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_LONGLONG);
+  assert(f->real_type() == MYSQL_TYPE_LONGLONG);
   Field_longlong *f2= (Field_longlong*) f;
   f2->store(value, true);
 }
@@ -675,7 +740,7 @@ void PFS_engine_table::set_field_ulonglong(Field *f, ulonglong value)
 void PFS_engine_table::set_field_char_utf8(Field *f, const char* str,
                                            uint len)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_STRING);
+  assert(f->real_type() == MYSQL_TYPE_STRING);
   Field_string *f2= (Field_string*) f;
   f2->store(str, len, &my_charset_utf8_bin);
 }
@@ -685,7 +750,7 @@ void PFS_engine_table::set_field_varchar(Field *f,
                                          const char* str,
                                          uint len)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_VARCHAR);
+  assert(f->real_type() == MYSQL_TYPE_VARCHAR);
   Field_varstring *f2= (Field_varstring*) f;
   f2->store(str, len, cs);
 }
@@ -693,7 +758,7 @@ void PFS_engine_table::set_field_varchar(Field *f,
 void PFS_engine_table::set_field_varchar_utf8(Field *f, const char* str,
                                               uint len)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_VARCHAR);
+  assert(f->real_type() == MYSQL_TYPE_VARCHAR);
   Field_varstring *f2= (Field_varstring*) f;
   f2->store(str, len, &my_charset_utf8_bin);
 }
@@ -701,7 +766,7 @@ void PFS_engine_table::set_field_varchar_utf8(Field *f, const char* str,
 void PFS_engine_table::set_field_longtext_utf8(Field *f, const char* str,
                                                uint len)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_BLOB);
+  assert(f->real_type() == MYSQL_TYPE_BLOB);
   Field_blob *f2= (Field_blob*) f;
   f2->store(str, len, &my_charset_utf8_bin);
 }
@@ -709,14 +774,14 @@ void PFS_engine_table::set_field_longtext_utf8(Field *f, const char* str,
 void PFS_engine_table::set_field_blob(Field *f, const char* val,
                                       uint len)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_BLOB);
+  assert(f->real_type() == MYSQL_TYPE_BLOB);
   Field_blob *f2= (Field_blob*) f;
   f2->store(val, len, &my_charset_utf8_bin);
 }
 
 void PFS_engine_table::set_field_enum(Field *f, ulonglong value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_ENUM);
+  assert(f->real_type() == MYSQL_TYPE_ENUM);
   Field_enum *f2= (Field_enum*) f;
   f2->store_type(value);
 }
@@ -726,21 +791,21 @@ void PFS_engine_table::set_field_timestamp(Field *f, ulonglong value)
   struct timeval tm;
   tm.tv_sec= (long)(value / 1000000);
   tm.tv_usec= (long)(value % 1000000);
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_TIMESTAMP2);
+  assert(f->real_type() == MYSQL_TYPE_TIMESTAMP2);
   Field_timestampf *f2= (Field_timestampf*) f;
   f2->store_timestamp(& tm);
 }
 
 void PFS_engine_table::set_field_double(Field *f, double value)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_DOUBLE);
+  assert(f->real_type() == MYSQL_TYPE_DOUBLE);
   Field_double *f2= (Field_double*) f;
   f2->store(value);
 }
 
 ulonglong PFS_engine_table::get_field_enum(Field *f)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_ENUM);
+  assert(f->real_type() == MYSQL_TYPE_ENUM);
   Field_enum *f2= (Field_enum*) f;
   return f2->val_int();
 }
@@ -748,7 +813,7 @@ ulonglong PFS_engine_table::get_field_enum(Field *f)
 String*
 PFS_engine_table::get_field_char_utf8(Field *f, String *val)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_STRING);
+  assert(f->real_type() == MYSQL_TYPE_STRING);
   Field_string *f2= (Field_string*) f;
   val= f2->val_str(NULL, val);
   return val;
@@ -757,7 +822,7 @@ PFS_engine_table::get_field_char_utf8(Field *f, String *val)
 String*
 PFS_engine_table::get_field_varchar_utf8(Field *f, String *val)
 {
-  DBUG_ASSERT(f->real_type() == MYSQL_TYPE_VARCHAR);
+  assert(f->real_type() == MYSQL_TYPE_VARCHAR);
   Field_varstring *f2= (Field_varstring*) f;
   val= f2->val_str(NULL, val);
   return val;
@@ -838,6 +903,32 @@ void initialize_performance_schema_acl(bool bootstrap)
   }
 }
 
+static bool allow_drop_table_privilege() {
+  /*
+    The same DROP_ACL privilege is used for different statements,
+    in particular:
+    - TRUNCATE TABLE
+    - DROP TABLE
+    - ALTER TABLE
+    Here, we want to prevent DROP / ALTER  while allowing TRUNCATE.
+    Note that we must also allow GRANT to transfer the truncate privilege.
+  */
+  THD *thd= current_thd;
+  if (thd == NULL) {
+    return false;
+  }
+
+  assert(thd->lex != NULL);
+  if ((thd->lex->sql_command != SQLCOM_TRUNCATE) &&
+      (thd->lex->sql_command != SQLCOM_GRANT) &&
+      (thd->lex->sql_command != SQLCOM_REVOKE)) {
+    return false;
+  }
+
+  return true;
+}
+
+
 PFS_readonly_acl pfs_readonly_acl;
 
 ACL_internal_access_result
@@ -861,7 +952,37 @@ PFS_readonly_world_acl::check(ulong want_access, ulong *save_priv) const
 {
   ACL_internal_access_result res= PFS_readonly_acl::check(want_access, save_priv);
   if (res == ACL_INTERNAL_ACCESS_CHECK_GRANT)
-    res= ACL_INTERNAL_ACCESS_GRANTED;
+  {
+    if (want_access == SELECT_ACL)
+      res= ACL_INTERNAL_ACCESS_GRANTED;
+  }
+  return res;
+}
+
+PFS_readonly_processlist_acl pfs_readonly_processlist_acl;
+
+ACL_internal_access_result PFS_readonly_processlist_acl::check(
+    ulong want_access, ulong *save_priv) const {
+  ACL_internal_access_result res =
+      PFS_readonly_acl::check(want_access, save_priv);
+
+  if ((res == ACL_INTERNAL_ACCESS_CHECK_GRANT) && (want_access == SELECT_ACL)) {
+    THD *thd = current_thd;
+    if (thd != NULL) {
+      if (thd->lex->sql_command == SQLCOM_SHOW_PROCESSLIST ||
+          thd->lex->sql_command == SQLCOM_SELECT) {
+        /*
+          For compatibility with the historical
+          SHOW PROCESSLIST command,
+          SHOW PROCESSLIST does not require a
+          SELECT privilege on table performance_schema.processlist,
+          when rewriting the query using table processlist.
+        */
+        return ACL_INTERNAL_ACCESS_GRANTED;
+      }
+    }
+  }
+
   return res;
 }
 
@@ -889,7 +1010,15 @@ PFS_truncatable_world_acl::check(ulong want_access, ulong *save_priv) const
 {
   ACL_internal_access_result res= PFS_truncatable_acl::check(want_access, save_priv);
   if (res == ACL_INTERNAL_ACCESS_CHECK_GRANT)
-    res= ACL_INTERNAL_ACCESS_GRANTED;
+  {
+    if (want_access == DROP_ACL)
+    {
+      if (allow_drop_table_privilege())
+        res= ACL_INTERNAL_ACCESS_GRANTED;
+    }
+    else if (want_access == SELECT_ACL)
+      res= ACL_INTERNAL_ACCESS_GRANTED;
+  }
   return res;
 }
 
diff --git a/storage/perfschema/pfs_engine_table.h b/storage/perfschema/pfs_engine_table.h
index d29c263c9e66..5d25160e51d1 100644
--- a/storage/perfschema/pfs_engine_table.h
+++ b/storage/perfschema/pfs_engine_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -278,6 +285,11 @@ typedef int (*pfs_delete_all_rows_t)(void);
 /** Callback to get a row count. */
 typedef ha_rows (*pfs_get_row_count_t)(void);
 
+struct PFS_engine_table_share_state {
+  /** Schema integrity flag. */
+  bool m_checked;
+};
+
 /**
   A PERFORMANCE_SCHEMA table share.
   This data is shared by all the table handles opened on the same table.
@@ -286,6 +298,7 @@ struct PFS_engine_table_share
 {
   static void check_all_tables(THD *thd);
   void check_one_table(THD *thd);
+  bool is_table_checked(TABLE *table) const;
   static void init_all_locks(void);
   static void delete_all_locks(void);
   /** Get the row count. */
@@ -311,10 +324,12 @@ struct PFS_engine_table_share
   THR_LOCK *m_thr_lock_ptr;
   /** Table fields definition. */
   TABLE_FIELD_DEF *m_field_def;
-  /** Schema integrity flag. */
-  bool m_checked;
   /** Table is available even if the Performance Schema is disabled. */
   bool m_perpetual;
+  /** Table is optional. */
+  bool m_optional;
+  /** Dynamic state. */
+  PFS_engine_table_share_state *m_state;
 };
 
 /**
@@ -450,6 +465,24 @@ class PFS_truncatable_world_acl : public PFS_truncatable_acl
 extern PFS_truncatable_world_acl pfs_truncatable_world_acl;
 
 
+/**
+  Privileges for readable processlist tables.
+*/
+class PFS_readonly_processlist_acl : public PFS_readonly_acl {
+ public:
+  PFS_readonly_processlist_acl()
+  {}
+
+  ~PFS_readonly_processlist_acl()
+  {}
+
+  virtual ACL_internal_access_result check(ulong want_access, ulong *save_priv) const;
+};
+
+/** Singleton instance of PFS_readonly_processlist_acl */
+extern PFS_readonly_processlist_acl pfs_readonly_processlist_acl;
+
+
 /** Position of a cursor, for simple iterations. */
 struct PFS_simple_index
 {
diff --git a/storage/perfschema/pfs_events.h b/storage/perfschema/pfs_events.h
index 454fea195fd5..f66ea2ec4dc5 100644
--- a/storage/perfschema/pfs_events.h
+++ b/storage/perfschema/pfs_events.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_events_stages.cc b/storage/perfschema/pfs_events_stages.cc
index a777a06bfa11..721617b38065 100644
--- a/storage/perfschema/pfs_events_stages.cc
+++ b/storage/perfschema/pfs_events_stages.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -94,7 +101,7 @@ void insert_events_stages_history(PFS_thread *thread, PFS_events_stages *stage)
   if (unlikely(events_stages_history_per_thread == 0))
     return;
 
-  DBUG_ASSERT(thread->m_stages_history != NULL);
+  assert(thread->m_stages_history != NULL);
 
   uint index= thread->m_stages_history_index;
 
@@ -126,7 +133,7 @@ void insert_events_stages_history_long(PFS_events_stages *stage)
   if (unlikely(events_stages_history_long_size == 0))
     return;
 
-  DBUG_ASSERT(events_stages_history_long_array != NULL);
+  assert(events_stages_history_long_array != NULL);
 
   uint index= PFS_atomic::add_u32(&events_stages_history_long_index.m_u32, 1);
 
diff --git a/storage/perfschema/pfs_events_stages.h b/storage/perfschema/pfs_events_stages.h
index f51904f03385..600573b2a4eb 100644
--- a/storage/perfschema/pfs_events_stages.h
+++ b/storage/perfschema/pfs_events_stages.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_events_statements.cc b/storage/perfschema/pfs_events_statements.cc
index d755f72f6d9b..91a2dec69d52 100644
--- a/storage/perfschema/pfs_events_statements.cc
+++ b/storage/perfschema/pfs_events_statements.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -173,7 +180,7 @@ void insert_events_statements_history(PFS_thread *thread, PFS_events_statements
   if (unlikely(events_statements_history_per_thread == 0))
     return;
 
-  DBUG_ASSERT(thread->m_statements_history != NULL);
+  assert(thread->m_statements_history != NULL);
 
   uint index= thread->m_statements_history_index;
 
@@ -205,7 +212,7 @@ void insert_events_statements_history_long(PFS_events_statements *statement)
   if (unlikely(events_statements_history_long_size == 0))
     return ;
 
-  DBUG_ASSERT(events_statements_history_long_array != NULL);
+  assert(events_statements_history_long_array != NULL);
 
   uint index= PFS_atomic::add_u32(&events_statements_history_long_index.m_u32, 1);
 
diff --git a/storage/perfschema/pfs_events_statements.h b/storage/perfschema/pfs_events_statements.h
index 9815e02305f6..ceed4fb84299 100644
--- a/storage/perfschema/pfs_events_statements.h
+++ b/storage/perfschema/pfs_events_statements.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_events_transactions.cc b/storage/perfschema/pfs_events_transactions.cc
index d6906ec73b29..5ccdb0345d7e 100644
--- a/storage/perfschema/pfs_events_transactions.cc
+++ b/storage/perfschema/pfs_events_transactions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -94,7 +101,7 @@ void insert_events_transactions_history(PFS_thread *thread, PFS_events_transacti
   if (unlikely(events_transactions_history_per_thread == 0))
     return;
 
-  DBUG_ASSERT(thread->m_transactions_history != NULL);
+  assert(thread->m_transactions_history != NULL);
 
   uint index= thread->m_transactions_history_index;
 
@@ -126,7 +133,7 @@ void insert_events_transactions_history_long(PFS_events_transactions *transactio
   if (unlikely(events_transactions_history_long_size == 0))
     return ;
 
-  DBUG_ASSERT(events_transactions_history_long_array != NULL);
+  assert(events_transactions_history_long_array != NULL);
 
   uint index= PFS_atomic::add_u32(&events_transactions_history_long_index.m_u32, 1);
 
@@ -245,7 +252,7 @@ bool xid_printable(PSI_xid *xid, size_t offset, size_t length)
   if (xid->is_null())
     return false;
 
-  DBUG_ASSERT(offset + length <= MYSQL_XIDDATASIZE);
+  assert(offset + length <= MYSQL_XIDDATASIZE);
 
   unsigned char *c= (unsigned char*)&xid->data + offset;
 
diff --git a/storage/perfschema/pfs_events_transactions.h b/storage/perfschema/pfs_events_transactions.h
index 7edea1821dfb..fb7813628111 100644
--- a/storage/perfschema/pfs_events_transactions.h
+++ b/storage/perfschema/pfs_events_transactions.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_events_waits.cc b/storage/perfschema/pfs_events_waits.cc
index 18f2c9f55279..11f09e3f317b 100644
--- a/storage/perfschema/pfs_events_waits.cc
+++ b/storage/perfschema/pfs_events_waits.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_events_waits.h b/storage/perfschema/pfs_events_waits.h
index 4b39994bf75b..a33bee6cb8df 100644
--- a/storage/perfschema/pfs_events_waits.h
+++ b/storage/perfschema/pfs_events_waits.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_global.cc b/storage/perfschema/pfs_global.cc
index 9bec27d310ed..6bb62c62e02c 100644
--- a/storage/perfschema/pfs_global.cc
+++ b/storage/perfschema/pfs_global.cc
@@ -1,14 +1,21 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights
    reserved.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -50,8 +57,8 @@ bool pfs_initialized= false;
 */
 void *pfs_malloc(PFS_builtin_memory_class *klass, size_t size, myf flags)
 {
-  DBUG_ASSERT(klass != NULL);
-  DBUG_ASSERT(size > 0);
+  assert(klass != NULL);
+  assert(size > 0);
 
   void *ptr= NULL;
 
@@ -128,9 +135,9 @@ void pfs_free(PFS_builtin_memory_class *klass, size_t size, void *ptr)
 */
 void *pfs_malloc_array(PFS_builtin_memory_class *klass, size_t n, size_t size, myf flags)
 {
-  DBUG_ASSERT(klass != NULL);
-  DBUG_ASSERT(n > 0);
-  DBUG_ASSERT(size > 0);
+  assert(klass != NULL);
+  assert(n > 0);
+  assert(size > 0);
   void *ptr= NULL;
   size_t array_size= n * size;
   /* Check for overflow before allocating. */
@@ -163,7 +170,7 @@ void pfs_free_array(PFS_builtin_memory_class *klass, size_t n, size_t size, void
     return;
   size_t array_size= n * size;
   /* Overflow should have been detected by pfs_malloc_array. */
-  DBUG_ASSERT(!is_overflow(array_size, n, size));
+  assert(!is_overflow(array_size, n, size));
   return pfs_free(klass, array_size, ptr);
 }
 
@@ -206,9 +213,9 @@ uint pfs_get_socket_address(char *host,
                             const struct sockaddr_storage *src_addr,
                             socklen_t src_len)
 {
-  DBUG_ASSERT(host);
-  DBUG_ASSERT(src_addr);
-  DBUG_ASSERT(port);
+  assert(host);
+  assert(src_addr);
+  assert(port);
 
   memset(host, 0, host_len);
   *port= 0;
diff --git a/storage/perfschema/pfs_global.h b/storage/perfschema/pfs_global.h
index 31a385c5aef3..c29a4b12dfa7 100644
--- a/storage/perfschema/pfs_global.h
+++ b/storage/perfschema/pfs_global.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -167,7 +174,7 @@ inline uint randomized_index(const void *ptr, uint max_size)
   seed2= seed1*seed1;
   seed1= result;
 
-  DBUG_ASSERT(result < max_size);
+  assert(result < max_size);
   return result;
 }
 
diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
index fd08b5c6cd81..fa6b369f4355 100644
--- a/storage/perfschema/pfs_host.cc
+++ b/storage/perfschema/pfs_host.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -64,9 +71,9 @@ static uchar *host_hash_get_key(const uchar *entry, size_t *length,
   const PFS_host *host;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_host* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   host= *typed_entry;
-  DBUG_ASSERT(host != NULL);
+  assert(host != NULL);
   *length= host->m_key.m_key_length;
   result= host->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -112,7 +119,7 @@ static LF_PINS* get_host_hash_pins(PFS_thread *thread)
 static void set_host_key(PFS_host_key *key,
                          const char *host, uint host_length)
 {
-  DBUG_ASSERT(host_length <= HOSTNAME_LENGTH);
+  assert(host_length <= HOSTNAME_LENGTH);
 
   char *ptr= &key->m_hash_key[0];
   if (host_length > 0)
@@ -274,11 +281,7 @@ void PFS_host::aggregate_memory(bool alive)
 
 void PFS_host::aggregate_status()
 {
-  /*
-    Aggregate STATUS_BY_HOST to:
-    - GLOBAL_STATUS
-  */
-  m_status_stats.aggregate_to(& global_status_var);
+  /* No parent to aggregate to, clean the stats */
   m_status_stats.reset();
 }
 
@@ -325,7 +328,7 @@ void purge_host(PFS_thread *thread, PFS_host *host)
                     host->m_key.m_hash_key, host->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    DBUG_ASSERT(*entry == host);
+    assert(*entry == host);
     if (host->get_refcount() == 0)
     {
       lf_hash_delete(&host_hash, pins,
diff --git a/storage/perfschema/pfs_host.h b/storage/perfschema/pfs_host.h
index 10dfdef0c6c4..0c65c3d8c8b9 100644
--- a/storage/perfschema/pfs_host.h
+++ b/storage/perfschema/pfs_host.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
index 4d3cb4bb6789..c7e27036dea8 100644
--- a/storage/perfschema/pfs_instr.cc
+++ b/storage/perfschema/pfs_instr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -98,7 +105,7 @@ int init_instruments(const PFS_global_param *param)
   uint index;
 
   /* Make sure init_event_name_sizing is called */
-  DBUG_ASSERT(wait_class_max != 0);
+  assert(wait_class_max != 0);
 
   file_handle_max= param->m_file_handle_sizing;
   file_handle_full= false;
@@ -250,9 +257,9 @@ static uchar *filename_hash_get_key(const uchar *entry, size_t *length,
   const PFS_file *file;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_file* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   file= *typed_entry;
-  DBUG_ASSERT(file != NULL);
+  assert(file != NULL);
   *length= file->m_filename_length;
   result= file->m_filename;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -319,7 +326,7 @@ PFS_mutex* create_mutex(PFS_mutex_class *klass, const void *identity)
 */
 void destroy_mutex(PFS_mutex *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   PFS_mutex_class *klass= pfs->m_class;
   /* Aggregate to EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME */
   klass->m_mutex_stat.aggregate(& pfs->m_mutex_stat);
@@ -367,7 +374,7 @@ PFS_rwlock* create_rwlock(PFS_rwlock_class *klass, const void *identity)
 */
 void destroy_rwlock(PFS_rwlock *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   PFS_rwlock_class *klass= pfs->m_class;
   /* Aggregate to EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME */
   klass->m_rwlock_stat.aggregate(& pfs->m_rwlock_stat);
@@ -411,7 +418,7 @@ PFS_cond* create_cond(PFS_cond_class *klass, const void *identity)
 */
 void destroy_cond(PFS_cond *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   PFS_cond_class *klass= pfs->m_class;
   /* Aggregate to EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME */
   klass->m_cond_stat.aggregate(& pfs->m_cond_stat);
@@ -567,6 +574,8 @@ PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
     pfs->m_account= NULL;
     set_thread_account(pfs);
 
+    pfs->m_peer_port = 0;
+
     /*
       For child waits, by default,
       - NESTING_EVENT_ID is NULL
@@ -642,14 +651,14 @@ PFS_metadata_lock *sanitize_metadata_lock(PFS_metadata_lock *unsafe)
 */
 void destroy_thread(PFS_thread *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   pfs->reset_session_connect_attrs();
   if (pfs->m_account != NULL)
   {
     pfs->m_account->release();
     pfs->m_account= NULL;
-    DBUG_ASSERT(pfs->m_user == NULL);
-    DBUG_ASSERT(pfs->m_host == NULL);
+    assert(pfs->m_user == NULL);
+    assert(pfs->m_host == NULL);
   }
   else
   {
@@ -743,7 +752,7 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
 {
   PFS_file *pfs;
 
-  DBUG_ASSERT(klass != NULL || ! create);
+  assert(klass != NULL || ! create);
 
   LF_PINS *pins= get_filename_hash_pins(thread);
   if (unlikely(pins == NULL))
@@ -864,7 +873,7 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
     pfs->m_class= klass;
     pfs->m_enabled= klass->m_enabled && flag_global_instrumentation;
     pfs->m_timed= klass->m_timed;
-    strncpy(pfs->m_filename, normalized_filename, normalized_length);
+    memcpy(pfs->m_filename, normalized_filename, normalized_length);
     pfs->m_filename[normalized_length]= '\0';
     pfs->m_filename_length= normalized_length;
     pfs->m_file_stat.m_open_count= 1;
@@ -918,7 +927,7 @@ void find_and_rename_file(PFS_thread *thread, const char *old_filename,
 {
   PFS_file *pfs;
 
-  DBUG_ASSERT(thread != NULL);
+  assert(thread != NULL);
 
   LF_PINS *pins= get_filename_hash_pins(thread);
   if (unlikely(pins == NULL))
@@ -1038,7 +1047,7 @@ void find_and_rename_file(PFS_thread *thread, const char *old_filename,
   normalized_filename= buffer;
   normalized_length= (uint)strlen(normalized_filename);
 
-  strncpy(pfs->m_filename, normalized_filename, normalized_length);
+  memcpy(pfs->m_filename, normalized_filename, normalized_length);
   pfs->m_filename[normalized_length]= '\0';
   pfs->m_filename_length= normalized_length;
 
@@ -1061,7 +1070,7 @@ void find_and_rename_file(PFS_thread *thread, const char *old_filename,
 */
 void release_file(PFS_file *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   pfs->m_file_stat.m_open_count--;
 }
 
@@ -1072,8 +1081,8 @@ void release_file(PFS_file *pfs)
 */
 void destroy_file(PFS_thread *thread, PFS_file *pfs)
 {
-  DBUG_ASSERT(thread != NULL);
-  DBUG_ASSERT(pfs != NULL);
+  assert(thread != NULL);
+  assert(pfs != NULL);
   PFS_file_class *klass= pfs->m_class;
 
   /* Aggregate to FILE_SUMMARY_BY_EVENT_NAME */
@@ -1084,7 +1093,7 @@ void destroy_file(PFS_thread *thread, PFS_file *pfs)
     klass->m_singleton= NULL;
 
   LF_PINS *pins= get_filename_hash_pins(thread);
-  DBUG_ASSERT(pins != NULL);
+  assert(pins != NULL);
 
   lf_hash_delete(&filename_hash, pins,
                  pfs->m_filename, pfs->m_filename_length);
@@ -1178,8 +1187,8 @@ void PFS_table::safe_aggregate_io(const TABLE_SHARE *optional_server_share,
                                   PFS_table_stat *table_stat,
                                   PFS_table_share *table_share)
 {
-  DBUG_ASSERT(table_stat != NULL);
-  DBUG_ASSERT(table_share != NULL);
+  assert(table_stat != NULL);
+  assert(table_share != NULL);
 
   uint key_count= sanitize_index_count(table_share->m_key_count);
 
@@ -1187,7 +1196,7 @@ void PFS_table::safe_aggregate_io(const TABLE_SHARE *optional_server_share,
   PFS_table_io_stat *from_stat;
   uint index;
 
-  DBUG_ASSERT(key_count <= MAX_INDEXES);
+  assert(key_count <= MAX_INDEXES);
 
   /* Aggregate stats for each index, if any */
   for (index= 0; index < key_count; index++)
@@ -1241,8 +1250,8 @@ void PFS_table::safe_aggregate_io(const TABLE_SHARE *optional_server_share,
 void PFS_table::safe_aggregate_lock(PFS_table_stat *table_stat,
                                     PFS_table_share *table_share)
 {
-  DBUG_ASSERT(table_stat != NULL);
-  DBUG_ASSERT(table_share != NULL);
+  assert(table_stat != NULL);
+  assert(table_share != NULL);
 
   PFS_table_lock_stat *from_stat= & table_stat->m_lock_stat;
 
@@ -1264,7 +1273,7 @@ void PFS_table::safe_aggregate_lock(PFS_table_stat *table_stat,
 */
 void destroy_table(PFS_table *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   pfs->m_share->dec_refcount();
   global_table_container.deallocate(pfs);
 }
@@ -1332,7 +1341,7 @@ PFS_socket* create_socket(PFS_socket_class *klass, const my_socket *fd,
 */
 void destroy_socket(PFS_socket *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   PFS_socket_class *klass= pfs->m_class;
 
   /* Aggregate to SOCKET_SUMMARY_BY_EVENT_NAME */
@@ -1399,7 +1408,7 @@ PFS_metadata_lock* create_metadata_lock(void *identity,
 
 void destroy_metadata_lock(PFS_metadata_lock *pfs)
 {
-  DBUG_ASSERT(pfs != NULL);
+  assert(pfs != NULL);
   global_mdl_container.deallocate(pfs);
 }
 
@@ -1626,8 +1635,8 @@ void aggregate_all_statements(PFS_statement_stat *from_array,
 void aggregate_all_transactions(PFS_transaction_stat *from_array,
                                 PFS_transaction_stat *to_array)
 {
-  DBUG_ASSERT(from_array != NULL);
-  DBUG_ASSERT(to_array != NULL);
+  assert(from_array != NULL);
+  assert(to_array != NULL);
 
   if (from_array->count() > 0)
   {
@@ -1640,9 +1649,9 @@ void aggregate_all_transactions(PFS_transaction_stat *from_array,
                                 PFS_transaction_stat *to_array_1,
                                 PFS_transaction_stat *to_array_2)
 {
-  DBUG_ASSERT(from_array != NULL);
-  DBUG_ASSERT(to_array_1 != NULL);
-  DBUG_ASSERT(to_array_2 != NULL);
+  assert(from_array != NULL);
+  assert(to_array_1 != NULL);
+  assert(to_array_2 != NULL);
 
   if (from_array->count() > 0)
   {
@@ -2151,9 +2160,9 @@ void clear_thread_account(PFS_thread *thread)
 
 void set_thread_account(PFS_thread *thread)
 {
-  DBUG_ASSERT(thread->m_account == NULL);
-  DBUG_ASSERT(thread->m_user == NULL);
-  DBUG_ASSERT(thread->m_host == NULL);
+  assert(thread->m_account == NULL);
+  assert(thread->m_user == NULL);
+  assert(thread->m_host == NULL);
 
   thread->m_account= find_or_create_account(thread,
                                                 thread->m_username,
diff --git a/storage/perfschema/pfs_instr.h b/storage/perfschema/pfs_instr.h
index d363adab5f23..61140c9c3260 100644
--- a/storage/perfschema/pfs_instr.h
+++ b/storage/perfschema/pfs_instr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -603,6 +610,9 @@ struct PFS_ALIGNED PFS_thread : PFS_connection_slice
   PFS_user *m_user;
   PFS_account *m_account;
 
+  /** Remote (peer) port */
+  uint m_peer_port;
+
   /** Reset session connect attributes */
   void reset_session_connect_attrs();
 
diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc
index 35631bb2ea92..01725a755fab 100644
--- a/storage/perfschema/pfs_instr_class.cc
+++ b/storage/perfschema/pfs_instr_class.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -402,9 +409,9 @@ static uchar *table_share_hash_get_key(const uchar *entry, size_t *length,
   const PFS_table_share *share;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_table_share* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   share= *typed_entry;
-  DBUG_ASSERT(share != NULL);
+  assert(share != NULL);
   *length= share->m_key.m_key_length;
   result= &share->m_key.m_hash_key[0];
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -463,8 +470,8 @@ static void set_table_share_key(PFS_table_share_key *key,
                                 const char *schema_name, size_t schema_name_length,
                                 const char *table_name, size_t table_name_length)
 {
-  DBUG_ASSERT(schema_name_length <= NAME_LEN);
-  DBUG_ASSERT(table_name_length <= NAME_LEN);
+  assert(schema_name_length <= NAME_LEN);
+  assert(table_name_length <= NAME_LEN);
   char *saved_schema_name;
   char *saved_table_name;
 
@@ -578,7 +585,7 @@ void PFS_table_share::destroy_lock_stat()
 PFS_table_share_index*
 PFS_table_share::find_index_stat(uint index) const
 {
-  DBUG_ASSERT(index <= MAX_INDEXES);
+  assert(index <= MAX_INDEXES);
 
   PFS_table_share *that= const_cast<PFS_table_share*>(this);
   void *addr= & that->m_race_index_stat[index];
@@ -602,7 +609,7 @@ PFS_table_share::find_index_stat(uint index) const
 PFS_table_share_index*
 PFS_table_share::find_or_create_index_stat(const TABLE_SHARE *server_share, uint index)
 {
-  DBUG_ASSERT(index <= MAX_INDEXES);
+  assert(index <= MAX_INDEXES);
 
   void *addr= & this->m_race_index_stat[index];
   void * volatile * typed_addr= static_cast<void * volatile *>(addr);
@@ -755,7 +762,7 @@ int init_table_share_index_stat(uint index_stat_sizing)
 PFS_table_share_index*
 create_table_share_index_stat(const TABLE_SHARE *server_share, uint server_index)
 {
-  DBUG_ASSERT((server_share != NULL) || (server_index == MAX_INDEXES));
+  assert((server_share != NULL) || (server_index == MAX_INDEXES));
 
   PFS_table_share_index *pfs= NULL;
   pfs_dirty_state dirty_state;
@@ -997,9 +1004,9 @@ static void init_instr_class(PFS_instr_class *klass,
                              int flags,
                              PFS_class_type class_type)
 {
-  DBUG_ASSERT(name_length <= PFS_MAX_INFO_NAME_LENGTH);
+  assert(name_length <= PFS_MAX_INFO_NAME_LENGTH);
   memset(klass, 0, sizeof(PFS_instr_class));
-  strncpy(klass->m_name, name, name_length);
+  memcpy(klass->m_name, name, name_length);
   klass->m_name_length= name_length;
   klass->m_flags= flags;
   klass->m_enabled= true;
@@ -1053,7 +1060,7 @@ static void configure_instr_class(PFS_instr_class *entry)
     if ((entry->m_name_length == NAME_LENGTH) &&                       \
         (strncmp(entry->m_name, NAME, NAME_LENGTH) == 0))              \
     {                                                                  \
-      DBUG_ASSERT(entry->m_flags == flags);                            \
+      assert(entry->m_flags == flags);                                 \
       return (INDEX + 1);                                              \
     }                                                                  \
   }
@@ -1307,7 +1314,7 @@ PFS_thread_key register_thread_class(const char *name, uint name_length,
   if (index < thread_class_max)
   {
     entry= &thread_class_array[index];
-    DBUG_ASSERT(name_length <= PFS_MAX_INFO_NAME_LENGTH);
+    assert(name_length <= PFS_MAX_INFO_NAME_LENGTH);
     strncpy(entry->m_name, name, name_length);
     entry->m_name_length= name_length;
     entry->m_enabled= true;
@@ -1874,7 +1881,7 @@ void PFS_table_share::sum_io(PFS_single_stat *result, uint key_count)
   uint index;
   PFS_table_share_index *stat;
 
-  DBUG_ASSERT(key_count <= MAX_INDEXES);
+  assert(key_count <= MAX_INDEXES);
 
   /* Sum stats for each index, if any */
   for (index= 0; index < key_count; index++)
@@ -1922,7 +1929,7 @@ void PFS_table_share::aggregate_lock(void)
 
 void release_table_share(PFS_table_share *pfs)
 {
-  DBUG_ASSERT(pfs->get_refcount() > 0);
+  assert(pfs->get_refcount() > 0);
   pfs->dec_refcount();
 }
 
diff --git a/storage/perfschema/pfs_instr_class.h b/storage/perfschema/pfs_instr_class.h
index 10339d937d0a..a011870d5e62 100644
--- a/storage/perfschema/pfs_instr_class.h
+++ b/storage/perfschema/pfs_instr_class.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -166,13 +173,13 @@ struct PFS_instr_class
 
   bool is_progress() const
   {
-    DBUG_ASSERT(m_type == PFS_CLASS_STAGE);
+    assert(m_type == PFS_CLASS_STAGE);
     return m_flags & PSI_FLAG_STAGE_PROGRESS;
   }
 
   bool is_shared_exclusive() const
   {
-    DBUG_ASSERT(m_type == PFS_CLASS_RWLOCK);
+    assert(m_type == PFS_CLASS_RWLOCK);
     return m_flags & PSI_RWLOCK_FLAG_SX;
   }
 
@@ -240,6 +247,9 @@ struct PFS_ALIGNED PFS_thread_class
   char m_name[PFS_MAX_INFO_NAME_LENGTH];
   /** Length in bytes of @c m_name. */
   uint m_name_length;
+  /** Instrument flags. */
+  int m_flags;
+  bool is_system_thread() const { return m_flags & PSI_FLAG_THREAD_SYSTEM; }
 };
 
 /** Key identifying a table share. */
diff --git a/storage/perfschema/pfs_lock.h b/storage/perfschema/pfs_lock.h
index 51a5c62000c6..f8ab3a6c87ce 100644
--- a/storage/perfschema/pfs_lock.h
+++ b/storage/perfschema/pfs_lock.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -166,7 +173,7 @@ struct pfs_lock
   {
     uint32 copy= copy_version_state();
     /* Make sure the record was ALLOCATED. */
-    DBUG_ASSERT((copy & STATE_MASK) == PFS_LOCK_ALLOCATED);
+    assert((copy & STATE_MASK) == PFS_LOCK_ALLOCATED);
     /* Keep the same version, set the DIRTY state */
     uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_DIRTY;
     /* We own the record, no need to use compare and swap. */
@@ -184,7 +191,7 @@ struct pfs_lock
   void dirty_to_allocated(const pfs_dirty_state *copy)
   {
     /* Make sure the record was DIRTY. */
-    DBUG_ASSERT((copy->m_version_state & STATE_MASK) == PFS_LOCK_DIRTY);
+    assert((copy->m_version_state & STATE_MASK) == PFS_LOCK_DIRTY);
     /* Increment the version, set the ALLOCATED state */
     uint32 new_val= (copy->m_version_state & VERSION_MASK) + VERSION_INC + PFS_LOCK_ALLOCATED;
 
@@ -227,7 +234,7 @@ struct pfs_lock
   void dirty_to_free(const pfs_dirty_state *copy)
   {
     /* Make sure the record was DIRTY. */
-    DBUG_ASSERT((copy->m_version_state & STATE_MASK) == PFS_LOCK_DIRTY);
+    assert((copy->m_version_state & STATE_MASK) == PFS_LOCK_DIRTY);
     /* Keep the same version, set the FREE state */
     uint32 new_val= (copy->m_version_state & VERSION_MASK) + PFS_LOCK_FREE;
 
@@ -247,7 +254,7 @@ struct pfs_lock
     */
     uint32 copy= copy_version_state();
     /* Make sure the record was ALLOCATED. */
-    DBUG_ASSERT(((copy & STATE_MASK) == PFS_LOCK_ALLOCATED));
+    assert(((copy & STATE_MASK) == PFS_LOCK_ALLOCATED));
     /* Keep the same version, set the FREE state */
     uint32 new_val= (copy & VERSION_MASK) + PFS_LOCK_FREE;
 
diff --git a/storage/perfschema/pfs_memory.cc b/storage/perfschema/pfs_memory.cc
index 726f6206b076..0ee8e3dd7df0 100644
--- a/storage/perfschema/pfs_memory.cc
+++ b/storage/perfschema/pfs_memory.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_memory.h b/storage/perfschema/pfs_memory.h
index 44b09614855e..ee90b7d90e9b 100644
--- a/storage/perfschema/pfs_memory.h
+++ b/storage/perfschema/pfs_memory.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_prepared_stmt.cc b/storage/perfschema/pfs_prepared_stmt.cc
index 43e96f2f0e14..de9c50d912e7 100644
--- a/storage/perfschema/pfs_prepared_stmt.cc
+++ b/storage/perfschema/pfs_prepared_stmt.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_prepared_stmt.h b/storage/perfschema/pfs_prepared_stmt.h
index 3081626311ad..80680f48af5d 100644
--- a/storage/perfschema/pfs_prepared_stmt.h
+++ b/storage/perfschema/pfs_prepared_stmt.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -22,8 +29,8 @@
 */
 
 #include "pfs_stat.h"
-#include "include/mysql/psi/psi.h"
-#include "include/mysql/psi/mysql_ps.h"
+#include "mysql/psi/psi.h"
+#include "mysql/psi/mysql_ps.h"
 #include "pfs_program.h"
 
 #define PS_NAME_LENGTH NAME_LEN
diff --git a/storage/perfschema/pfs_program.cc b/storage/perfschema/pfs_program.cc
index 1d6efa00e142..43207997e1dc 100644
--- a/storage/perfschema/pfs_program.cc
+++ b/storage/perfschema/pfs_program.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -63,9 +70,9 @@ static uchar *program_hash_get_key(const uchar *entry, size_t *length,
   const PFS_program *program;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_program* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   program= *typed_entry;
-  DBUG_ASSERT(program != NULL);
+  assert(program != NULL);
   *length= program->m_key.m_key_length;
   result= program->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -102,8 +109,8 @@ static void set_program_key(PFS_program_key *key,
                             const char *object_name, uint object_name_length,
                             const char *schema_name, uint schema_name_length)
 {
-  DBUG_ASSERT(object_name_length <= COL_OBJECT_NAME_SIZE);
-  DBUG_ASSERT(schema_name_length <= COL_OBJECT_SCHEMA_SIZE);
+  assert(object_name_length <= COL_OBJECT_NAME_SIZE);
+  assert(schema_name_length <= COL_OBJECT_SCHEMA_SIZE);
 
   /*
     To make sure generated key is case insensitive,
diff --git a/storage/perfschema/pfs_program.h b/storage/perfschema/pfs_program.h
index 35959dee7caa..a5a6245c1cc4 100644
--- a/storage/perfschema/pfs_program.h
+++ b/storage/perfschema/pfs_program.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_server.cc b/storage/perfschema/pfs_server.cc
index 82278367332a..51a0645d5d93 100644
--- a/storage/perfschema/pfs_server.cc
+++ b/storage/perfschema/pfs_server.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -204,7 +211,7 @@ initialize_performance_schema(PFS_global_param *param)
 static void destroy_pfs_thread(void *key)
 {
   PFS_thread* pfs= reinterpret_cast<PFS_thread*> (key);
-  DBUG_ASSERT(pfs);
+  assert(pfs);
   /*
     This automatic cleanup is a last resort and best effort to avoid leaks,
     and may not work on windows due to the implementation of pthread_key_create().
diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h
index 73904c273381..fe21f44cc2b4 100644
--- a/storage/perfschema/pfs_server.h
+++ b/storage/perfschema/pfs_server.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -28,7 +35,7 @@
   #define PFS_MAX_MUTEX_CLASS 210
 #endif
 #ifndef PFS_MAX_RWLOCK_CLASS
-  #define PFS_MAX_RWLOCK_CLASS 40
+  #define PFS_MAX_RWLOCK_CLASS 50
 #endif
 #ifndef PFS_MAX_COND_CLASS
   #define PFS_MAX_COND_CLASS 80
diff --git a/storage/perfschema/pfs_setup_actor.cc b/storage/perfschema/pfs_setup_actor.cc
index 559c18640bc7..c7f1a150a8d0 100644
--- a/storage/perfschema/pfs_setup_actor.cc
+++ b/storage/perfschema/pfs_setup_actor.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -63,9 +70,9 @@ static uchar *setup_actor_hash_get_key(const uchar *entry, size_t *length,
   const PFS_setup_actor *setup_actor;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_setup_actor* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   setup_actor= *typed_entry;
-  DBUG_ASSERT(setup_actor != NULL);
+  assert(setup_actor != NULL);
   *length= setup_actor->m_key.m_key_length;
   result= setup_actor->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -114,8 +121,8 @@ static void set_setup_actor_key(PFS_setup_actor_key *key,
                                 const char *host, uint host_length,
                                 const char *role, uint role_length)
 {
-  DBUG_ASSERT(user_length <= USERNAME_LENGTH);
-  DBUG_ASSERT(host_length <= HOSTNAME_LENGTH);
+  assert(user_length <= USERNAME_LENGTH);
+  assert(host_length <= HOSTNAME_LENGTH);
 
   char *ptr= &key->m_hash_key[0];
   memcpy(ptr, user, user_length);
diff --git a/storage/perfschema/pfs_setup_actor.h b/storage/perfschema/pfs_setup_actor.h
index cc7224f2bae2..8fa1860a337b 100644
--- a/storage/perfschema/pfs_setup_actor.h
+++ b/storage/perfschema/pfs_setup_actor.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_setup_object.cc b/storage/perfschema/pfs_setup_object.cc
index 637ecf535c84..b5f91bb44a0b 100644
--- a/storage/perfschema/pfs_setup_object.cc
+++ b/storage/perfschema/pfs_setup_object.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -63,9 +70,9 @@ static uchar *setup_object_hash_get_key(const uchar *entry, size_t *length,
   const PFS_setup_object *setup_object;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_setup_object* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   setup_object= *typed_entry;
-  DBUG_ASSERT(setup_object != NULL);
+  assert(setup_object != NULL);
   *length= setup_object->m_key.m_key_length;
   result= setup_object->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -113,8 +120,8 @@ static void set_setup_object_key(PFS_setup_object_key *key,
                                  const char *schema, uint schema_length,
                                  const char *object, uint object_length)
 {
-  DBUG_ASSERT(schema_length <= NAME_LEN);
-  DBUG_ASSERT(object_length <= NAME_LEN);
+  assert(schema_length <= NAME_LEN);
+  assert(object_length <= NAME_LEN);
 
   char *ptr= &key->m_hash_key[0];
   ptr[0]= (char) object_type;
@@ -271,7 +278,7 @@ void lookup_setup_object(PFS_thread *thread,
     - TABLE foo.bar
     - TEMPORARY TABLE foo.bar
   */
-  DBUG_ASSERT(object_type != OBJECT_TYPE_TEMPORARY_TABLE);
+  assert(object_type != OBJECT_TYPE_TEMPORARY_TABLE);
 
   LF_PINS* pins= get_setup_object_hash_pins(thread);
   if (unlikely(pins == NULL))
diff --git a/storage/perfschema/pfs_setup_object.h b/storage/perfschema/pfs_setup_object.h
index 9f9dcf0adaca..0b3504f19b9b 100644
--- a/storage/perfschema/pfs_setup_object.h
+++ b/storage/perfschema/pfs_setup_object.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_stat.h b/storage/perfschema/pfs_stat.h
index 4670ed73dea1..10cd7cde5392 100644
--- a/storage/perfschema/pfs_stat.h
+++ b/storage/perfschema/pfs_stat.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -714,7 +721,7 @@ struct PFS_table_stat
     PFS_table_io_stat *to_stat_last;
     const PFS_table_io_stat *from_stat;
 
-    DBUG_ASSERT(key_count <= MAX_INDEXES);
+    assert(key_count <= MAX_INDEXES);
 
     /* Aggregate stats for each index, if any */
     to_stat= & m_index_stat[0];
@@ -745,7 +752,7 @@ struct PFS_table_stat
     PFS_table_io_stat *stat;
     PFS_table_io_stat *stat_last;
 
-    DBUG_ASSERT(key_count <= MAX_INDEXES);
+    assert(key_count <= MAX_INDEXES);
 
     /* Sum stats for each index, if any */
     stat= & m_index_stat[0];
diff --git a/storage/perfschema/pfs_status.cc b/storage/perfschema/pfs_status.cc
index 5d67bf2fa6fe..1894cc2851cb 100644
--- a/storage/perfschema/pfs_status.cc
+++ b/storage/perfschema/pfs_status.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_status.h b/storage/perfschema/pfs_status.h
index 26b9974deda5..7517d4910c3c 100644
--- a/storage/perfschema/pfs_status.h
+++ b/storage/perfschema/pfs_status.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_timer.cc b/storage/perfschema/pfs_timer.cc
index 68be91c7b5d3..6571740e3f40 100644
--- a/storage/perfschema/pfs_timer.cc
+++ b/storage/perfschema/pfs_timer.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -245,7 +252,7 @@ ulonglong get_timer_raw_value(enum_timer_name timer_name)
   case TIMER_NAME_TICK:
     return my_timer_ticks();
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
   return 0;
 }
@@ -271,7 +278,7 @@ ulonglong get_timer_raw_value_and_function(enum_timer_name timer_name, timer_fct
     return my_timer_ticks();
   default:
     *fct= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
   }
   return 0;
 }
@@ -299,7 +306,7 @@ ulonglong get_timer_pico_value(enum_timer_name timer_name)
     break;
   default:
     result= 0;
-    DBUG_ASSERT(false);
+    assert(false);
   }
   return result;
 }
@@ -308,8 +315,8 @@ time_normalizer* time_normalizer::get(enum_timer_name timer_name)
 {
   uint index= static_cast<uint> (timer_name);
 
-  DBUG_ASSERT(index >= FIRST_TIMER_NAME);
-  DBUG_ASSERT(index <= LAST_TIMER_NAME);
+  assert(index >= FIRST_TIMER_NAME);
+  assert(index <= LAST_TIMER_NAME);
 
   return & to_pico_data[index];
 }
diff --git a/storage/perfschema/pfs_timer.h b/storage/perfschema/pfs_timer.h
index 212254cd2fd4..adaa07d7ad16 100644
--- a/storage/perfschema/pfs_timer.h
+++ b/storage/perfschema/pfs_timer.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc
index 868e37e2edfb..8c403f5b723d 100644
--- a/storage/perfschema/pfs_user.cc
+++ b/storage/perfschema/pfs_user.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -64,9 +71,9 @@ static uchar *user_hash_get_key(const uchar *entry, size_t *length,
   const PFS_user *user;
   const void *result;
   typed_entry= reinterpret_cast<const PFS_user* const *> (entry);
-  DBUG_ASSERT(typed_entry != NULL);
+  assert(typed_entry != NULL);
   user= *typed_entry;
-  DBUG_ASSERT(user != NULL);
+  assert(user != NULL);
   *length= user->m_key.m_key_length;
   result= user->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
@@ -112,7 +119,7 @@ static LF_PINS* get_user_hash_pins(PFS_thread *thread)
 static void set_user_key(PFS_user_key *key,
                          const char *user, uint user_length)
 {
-  DBUG_ASSERT(user_length <= USERNAME_LENGTH);
+  assert(user_length <= USERNAME_LENGTH);
 
   char *ptr= &key->m_hash_key[0];
   if (user_length > 0)
@@ -286,7 +293,7 @@ void purge_user(PFS_thread *thread, PFS_user *user)
                     user->m_key.m_hash_key, user->m_key.m_key_length));
   if (entry && (entry != MY_ERRPTR))
   {
-    DBUG_ASSERT(*entry == user);
+    assert(*entry == user);
     if (user->get_refcount() == 0)
     {
       lf_hash_delete(&user_hash, pins,
diff --git a/storage/perfschema/pfs_user.h b/storage/perfschema/pfs_user.h
index bfb6e516b428..45faf36821ec 100644
--- a/storage/perfschema/pfs_user.h
+++ b/storage/perfschema/pfs_user.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/pfs_variable.cc b/storage/perfschema/pfs_variable.cc
index 397377b2f0c5..be3d5bf82998 100644
--- a/storage/perfschema/pfs_variable.cc
+++ b/storage/perfschema/pfs_variable.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -36,7 +43,7 @@
 */
 bool PFS_system_variable_cache::init_show_var_array(enum_var_type scope, bool strict)
 {
-  DBUG_ASSERT(!m_initialized);
+  assert(!m_initialized);
   m_query_scope= scope;
 
   mysql_rwlock_rdlock(&LOCK_system_variables_hash);
@@ -123,7 +130,7 @@ int PFS_system_variable_cache::do_materialize_global(void)
   {
     const char* name= show_var->name;
     sys_var *value= (sys_var *)show_var->value;
-    DBUG_ASSERT(value);
+    assert(value);
 
     if ((m_query_scope == OPT_GLOBAL) &&
         (!my_strcasecmp(system_charset_info, name, "sql_log_bin")))
@@ -151,7 +158,7 @@ int PFS_system_variable_cache::do_materialize_global(void)
         The assert below will fail once SQL_LOG_BIN really is defined
         as SESSION_ONLY (in 5.8), so that this special case can be removed.
       */
-      DBUG_ASSERT(value->scope() == sys_var::SESSION);
+      assert(value->scope() == sys_var::SESSION);
       continue;
     }
 
@@ -159,7 +166,7 @@ int PFS_system_variable_cache::do_materialize_global(void)
     if (match_scope(value->scope()))
     {
       /* Resolve value, convert to text, add to cache. */
-      System_variable system_var(m_current_thd, show_var, m_query_scope);
+      System_variable system_var(m_current_thd, show_var, m_query_scope, false);
       m_cache.push_back(system_var);
     }
   }
@@ -195,12 +202,14 @@ int PFS_system_variable_cache::do_materialize_all(THD *unsafe_thd)
   /* Get and lock a validated THD from the thread manager. */
   if ((m_safe_thd= get_THD(unsafe_thd)) != NULL)
   {
+    DEBUG_SYNC(m_current_thd, "materialize_session_variable_array_THD_locked");
     for (Show_var_array::iterator show_var= m_show_var_array.begin();
          show_var->value && (show_var != m_show_var_array.end()); show_var++)
     {
       const char* name= show_var->name;
       sys_var *value= (sys_var *)show_var->value;
-      DBUG_ASSERT(value);
+      assert(value);
+      bool ignore= false;
 
       if (value->scope() == sys_var::SESSION &&
           (!my_strcasecmp(system_charset_info, name, "gtid_executed")))
@@ -225,10 +234,11 @@ int PFS_system_variable_cache::do_materialize_all(THD *unsafe_thd)
          This special case needs be removed once @@SESSION.GTID_EXECUTED is
          deprecated.
         */
-        continue;
+        ignore= true;
+        
       }
       /* Resolve value, convert to text, add to cache. */
-      System_variable system_var(m_safe_thd, show_var, m_query_scope);
+      System_variable system_var(m_safe_thd, show_var, m_query_scope, ignore);
       m_cache.push_back(system_var);
     }
 
@@ -253,7 +263,7 @@ void PFS_system_variable_cache::set_mem_root(void)
     init_sql_alloc(PSI_INSTRUMENT_ME, &m_mem_sysvar, SYSVAR_MEMROOT_BLOCK_SIZE, 0);
     m_mem_sysvar_ptr= &m_mem_sysvar;
   }
-  m_mem_thd= my_thread_get_THR_MALLOC(); /* pointer to current THD mem_root */
+  m_mem_thd= my_thread_get_THR_MALLOC();  /* pointer to current THD mem_root */
   m_mem_thd_save= *m_mem_thd;             /* restore later */
   *m_mem_thd= &m_mem_sysvar;              /* use temporary mem_root */
 }
@@ -309,7 +319,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
   mysql_mutex_lock(&LOCK_plugin_delete);
 
   /* The SHOW_VAR array must be initialized externally. */
-  DBUG_ASSERT(m_initialized);
+  assert(m_initialized);
 
   /* Use a temporary mem_root to avoid depleting THD mem_root. */
   if (m_use_mem_root)
@@ -327,17 +337,16 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
       if (match_scope(value->scope()))
       {
         const char* name= show_var->name;
+        bool ignore= false;
+
         if (value->scope() == sys_var::SESSION &&
             (!my_strcasecmp(system_charset_info, name, "gtid_executed")))
         {
-          /*
-            Please check PFS_system_variable_cache::do_materialize_all for
-            details about this special case.
-          */
-          continue;
+          /* Deprecated. See PFS_system_variable_cache::do_materialize_all. */
+          ignore= true;
         }
         /* Resolve value, convert to text, add to cache. */
-        System_variable system_var(m_safe_thd, show_var, m_query_scope);
+        System_variable system_var(m_safe_thd, show_var, m_query_scope, ignore);
         m_cache.push_back(system_var);
       }
     }
@@ -374,7 +383,7 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread, ui
   mysql_mutex_lock(&LOCK_plugin_delete);
 
   /* The SHOW_VAR array must be initialized externally. */
-  DBUG_ASSERT(m_initialized);
+  assert(m_initialized);
 
   /* Get and lock a validated THD from the thread manager. */
   if ((m_safe_thd= get_THD(pfs_thread)) != NULL)
@@ -390,18 +399,17 @@ int PFS_system_variable_cache::do_materialize_session(PFS_thread *pfs_thread, ui
       if (match_scope(value->scope()))
       {
         const char* name= show_var->name;
-        /*
-          Please check PFS_system_variable_cache::do_materialize_all for
-          details about this special case.
-        */
-        if ((my_strcasecmp(system_charset_info, name, "gtid_executed") != 0) ||
-            (value->scope() != sys_var::SESSION &&
-             (!my_strcasecmp(system_charset_info, name, "gtid_executed"))))
+        bool ignore= false;
+
+        if (value->scope() == sys_var::SESSION &&
+            (!my_strcasecmp(system_charset_info, name, "gtid_executed")))
         {
-          /* Resolve value, convert to text, add to cache. */
-          System_variable system_var(m_safe_thd, show_var, m_query_scope);
-          m_cache.push_back(system_var);
+          /* Deprecated. See PFS_system_variable_cache::do_materialize_all. */
+          ignore= true;
         }
+        /* Resolve value, convert to text, add to cache. */
+        System_variable system_var(m_safe_thd, show_var, m_query_scope, ignore);
+        m_cache.push_back(system_var);
       }
     }
 
@@ -451,17 +459,17 @@ int PFS_system_variable_cache::do_materialize_session(THD *unsafe_thd)
       if (match_scope(value->scope()))
       {
         const char* name= show_var->name;
+        bool ignore= false;
+
         if (value->scope() == sys_var::SESSION &&
             (!my_strcasecmp(system_charset_info, name, "gtid_executed")))
         {
-          /*
-            Please check PFS_system_variable_cache::do_materialize_all for
-            details about this special case.
-          */
-          continue;
+          /* Deprecated. See PFS_system_variable_cache::do_materialize_all. */
+          ignore= true;
         }
         /* Resolve value, convert to text, add to cache. */
-        System_variable system_var(m_safe_thd, show_var, m_query_scope);
+        System_variable system_var(m_safe_thd, show_var, m_query_scope, ignore);
+
         m_cache.push_back(system_var);
       }
     }
@@ -487,7 +495,7 @@ int PFS_system_variable_cache::do_materialize_session(THD *unsafe_thd)
 */
 System_variable::System_variable()
   : m_name(NULL), m_name_length(0), m_value_length(0), m_type(SHOW_UNDEF), m_scope(0),
-    m_charset(NULL), m_initialized(false)
+    m_ignore(false), m_charset(NULL), m_initialized(false)
 {
   m_value_str[0]= '\0';
 }
@@ -496,9 +504,9 @@ System_variable::System_variable()
   GLOBAL or SESSION system variable.
 */
 System_variable::System_variable(THD *target_thd, const SHOW_VAR *show_var,
-                                 enum_var_type query_scope)
+                                 enum_var_type query_scope, bool ignore)
   : m_name(NULL), m_name_length(0), m_value_length(0), m_type(SHOW_UNDEF), m_scope(0),
-    m_charset(NULL), m_initialized(false)
+    m_ignore(ignore), m_charset(NULL), m_initialized(false)
 {
   init(target_thd, show_var, query_scope);
 }
@@ -513,12 +521,22 @@ void System_variable::init(THD *target_thd, const SHOW_VAR *show_var,
     return;
 
   enum_mysql_show_type show_var_type= show_var->type;
-  DBUG_ASSERT(show_var_type == SHOW_SYS);
-  THD *current_thread= current_thd;
-
+  assert(show_var_type == SHOW_SYS);
+  
   m_name= show_var->name;
   m_name_length= strlen(m_name);
 
+  /* Deprecated variables are ignored but must still be accounted for. */
+  if (m_ignore)
+  {
+    m_value_str[0]= '\0';
+    m_value_length= 0;
+    m_initialized= true;
+    return;
+  }
+
+  THD *current_thread= current_thd;
+
   /* Block remote target thread from updating this system variable. */
   if (target_thd != current_thread)
     mysql_mutex_lock(&target_thd->LOCK_thd_sysvar);
@@ -526,7 +544,7 @@ void System_variable::init(THD *target_thd, const SHOW_VAR *show_var,
   mysql_mutex_lock(&LOCK_global_system_variables);
 
   sys_var *system_var= (sys_var *)show_var->value;
-  DBUG_ASSERT(system_var != NULL);
+  assert(system_var != NULL);
   m_charset= system_var->charset(target_thd);
   m_type= system_var->show_type();
   m_scope= system_var->scope();
@@ -555,7 +573,6 @@ void System_variable::init(THD *target_thd, const SHOW_VAR *show_var,
     return;
 #endif
 
-
   m_initialized= true;
 }
 
@@ -665,8 +682,8 @@ bool PFS_status_variable_cache::match_scope(SHOW_SCOPE variable_scope, bool stri
 */
 bool PFS_status_variable_cache::filter_by_name(const SHOW_VAR *show_var)
 {
-  DBUG_ASSERT(show_var);
-  DBUG_ASSERT(show_var->name);
+  assert(show_var);
+  assert(show_var->name);
 
   if (show_var->type == SHOW_ARRAY)
   {
@@ -776,7 +793,7 @@ bool PFS_status_variable_cache::filter_show_var(const SHOW_VAR *show_var, bool s
 */
 bool PFS_status_variable_cache::init_show_var_array(enum_var_type scope, bool strict)
 {
-  DBUG_ASSERT(!m_initialized);
+  assert(!m_initialized);
 
   /* Resize if necessary. */
   m_show_var_array.reserve(all_status_vars.size()+1);
@@ -854,7 +871,7 @@ void PFS_status_variable_cache::expand_show_var_array(const SHOW_VAR *show_var_a
 char * PFS_status_variable_cache::make_show_var_name(const char* prefix, const char* name,
                                                      char *name_buf, size_t buf_len)
 {
-  DBUG_ASSERT(name_buf != NULL);
+  assert(name_buf != NULL);
   char *prefix_end= name_buf;
 
   if (prefix && *prefix)
@@ -970,7 +987,7 @@ int PFS_status_variable_cache::do_materialize_global(void)
 int PFS_status_variable_cache::do_materialize_all(THD* unsafe_thd)
 {
   int ret= 1;
-  DBUG_ASSERT(unsafe_thd != NULL);
+  assert(unsafe_thd != NULL);
 
   m_unsafe_thd= unsafe_thd;
   m_materialized= false;
@@ -1016,7 +1033,7 @@ int PFS_status_variable_cache::do_materialize_all(THD* unsafe_thd)
 int PFS_status_variable_cache::do_materialize_session(THD* unsafe_thd)
 {
   int ret= 1;
-  DBUG_ASSERT(unsafe_thd != NULL);
+  assert(unsafe_thd != NULL);
 
   m_unsafe_thd= unsafe_thd;
   m_materialized= false;
@@ -1063,7 +1080,7 @@ int PFS_status_variable_cache::do_materialize_session(THD* unsafe_thd)
 int PFS_status_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
 {
   int ret= 1;
-  DBUG_ASSERT(pfs_thread != NULL);
+  assert(pfs_thread != NULL);
 
   m_pfs_thread= pfs_thread;
   m_materialized= false;
@@ -1074,7 +1091,7 @@ int PFS_status_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
     mysql_mutex_lock(&LOCK_status);
 
   /* The SHOW_VAR array must be initialized externally. */
-  DBUG_ASSERT(m_initialized);
+  assert(m_initialized);
 
     /* Get and lock a validated THD from the thread manager. */
   if ((m_safe_thd= get_THD(pfs_thread)) != NULL)
@@ -1106,7 +1123,7 @@ int PFS_status_variable_cache::do_materialize_session(PFS_thread *pfs_thread)
 */
 int PFS_status_variable_cache::do_materialize_client(PFS_client *pfs_client)
 {
-  DBUG_ASSERT(pfs_client != NULL);
+  assert(pfs_client != NULL);
   STATUS_VAR status_totals;
 
   m_pfs_client= pfs_client;
@@ -1118,7 +1135,7 @@ int PFS_status_variable_cache::do_materialize_client(PFS_client *pfs_client)
     mysql_mutex_lock(&LOCK_status);
 
   /* The SHOW_VAR array must be initialized externally. */
-  DBUG_ASSERT(m_initialized);
+  assert(m_initialized);
 
   /*
     Generate status totals from active threads and from totals aggregated
@@ -1296,8 +1313,6 @@ void reset_pfs_status_stats()
   reset_status_by_account();
   reset_status_by_user();
   reset_status_by_host();
-  /* Clear again, updated by previous aggregations. */
-  reset_global_status();
 }
 
 /** @} */
diff --git a/storage/perfschema/pfs_variable.h b/storage/perfschema/pfs_variable.h
index bc08650ed238..3f08baf72ac9 100644
--- a/storage/perfschema/pfs_variable.h
+++ b/storage/perfschema/pfs_variable.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -137,10 +144,12 @@ class System_variable
 {
 public:
   System_variable();
-  System_variable(THD *target_thd, const SHOW_VAR *show_var, enum_var_type query_scope);
+  System_variable(THD *target_thd, const SHOW_VAR *show_var,
+                  enum_var_type query_scope, bool ignore);
   ~System_variable() {}
 
-  bool is_null() const {return !m_initialized;};
+  bool is_null() const { return !m_initialized; }
+  bool is_ignored() const { return m_ignore; }
 
 public:
   const char *m_name;
@@ -149,6 +158,7 @@ class System_variable
   size_t m_value_length;
   enum_mysql_show_type m_type;
   int m_scope;
+  bool m_ignore;
   const CHARSET_INFO *m_charset;
 
 private:
@@ -452,7 +462,16 @@ PFS_variable_cache<Var_type>::~PFS_variable_cache()
 template <class Var_type>
 THD *PFS_variable_cache<Var_type>::get_THD(THD *unsafe_thd)
 {
-  DBUG_ASSERT(unsafe_thd != NULL);
+  if (unsafe_thd == NULL)
+  {
+    /*
+      May happen, precisely because the pointer is unsafe
+      (THD just disconnected for example).
+      No need to walk Global_THD_manager for that.
+    */
+    return NULL;
+  }
+
   m_thd_finder.set_unsafe_thd(unsafe_thd);
   THD* safe_thd= Global_THD_manager::get_instance()->find_thd(&m_thd_finder);
   return safe_thd;
@@ -461,7 +480,7 @@ THD *PFS_variable_cache<Var_type>::get_THD(THD *unsafe_thd)
 template <class Var_type>
 THD *PFS_variable_cache<Var_type>::get_THD(PFS_thread *pfs_thread)
 {
-  DBUG_ASSERT(pfs_thread != NULL);
+  assert(pfs_thread != NULL);
   return get_THD(pfs_thread->m_thd);
 }
 
diff --git a/storage/perfschema/pfs_visitor.cc b/storage/perfschema/pfs_visitor.cc
index 25ba1d9df1c6..3c2edea94e54 100644
--- a/storage/perfschema/pfs_visitor.cc
+++ b/storage/perfschema/pfs_visitor.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -56,8 +63,8 @@ void PFS_connection_iterator::visit_global(bool with_hosts, bool with_users,
                                            bool with_THDs,
                                            PFS_connection_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(! with_threads || ! with_THDs);
+  assert(visitor != NULL);
+  assert(! with_threads || ! with_THDs);
 
   visitor->visit_global();
 
@@ -156,8 +163,8 @@ void PFS_connection_iterator::visit_host(PFS_host *host,
                                          bool with_THDs,
                                          PFS_connection_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(! with_threads || ! with_THDs);
+  assert(visitor != NULL);
+  assert(! with_threads || ! with_THDs);
 
   visitor->visit_host(host);
 
@@ -245,8 +252,8 @@ void PFS_connection_iterator::visit_user(PFS_user *user,
                                          bool with_THDs,
                                          PFS_connection_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(! with_threads || ! with_THDs);
+  assert(visitor != NULL);
+  assert(! with_threads || ! with_THDs);
 
   visitor->visit_user(user);
 
@@ -326,8 +333,8 @@ void PFS_connection_iterator::visit_account(PFS_account *account,
                                             bool with_THDs,
                                             PFS_connection_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(! with_threads || ! with_THDs);
+  assert(visitor != NULL);
+  assert(! with_threads || ! with_THDs);
 
   visitor->visit_account(account);
 
@@ -356,7 +363,7 @@ void PFS_connection_iterator::visit_account(PFS_account *account,
 void PFS_connection_iterator::visit_THD(THD *thd,
                                         PFS_connection_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
   visitor->visit_THD(thd);
 }
 
@@ -497,7 +504,7 @@ void PFS_instance_iterator::visit_all_file_instances(PFS_instance_visitor *visit
 void PFS_instance_iterator::visit_mutex_instances(PFS_mutex_class *klass,
                                                   PFS_instance_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_mutex_class(klass);
 
@@ -531,7 +538,7 @@ void PFS_instance_iterator::visit_mutex_instances(PFS_mutex_class *klass,
 void PFS_instance_iterator::visit_rwlock_instances(PFS_rwlock_class *klass,
                                                    PFS_instance_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_rwlock_class(klass);
 
@@ -565,7 +572,7 @@ void PFS_instance_iterator::visit_rwlock_instances(PFS_rwlock_class *klass,
 void PFS_instance_iterator::visit_cond_instances(PFS_cond_class *klass,
                                                  PFS_instance_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_cond_class(klass);
 
@@ -599,7 +606,7 @@ void PFS_instance_iterator::visit_cond_instances(PFS_cond_class *klass,
 void PFS_instance_iterator::visit_file_instances(PFS_file_class *klass,
                                                  PFS_instance_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_file_class(klass);
 
@@ -635,7 +642,7 @@ void PFS_instance_iterator::visit_file_instances(PFS_file_class *klass,
 void PFS_instance_iterator::visit_socket_instances(PFS_socket_class *klass,
                                                    PFS_instance_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_socket_class(klass);
 
@@ -673,8 +680,8 @@ void PFS_instance_iterator::visit_socket_instances(PFS_socket_class *klass,
                                                    PFS_thread *thread,
                                                    bool visit_class)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(thread != NULL);
+  assert(visitor != NULL);
+  assert(thread != NULL);
 
   if (visit_class)
     visitor->visit_socket_class(klass);
@@ -713,8 +720,8 @@ void PFS_instance_iterator::visit_instances(PFS_instr_class *klass,
                                             PFS_thread *thread,
                                             bool visit_class)
 {
-  DBUG_ASSERT(visitor != NULL);
-  DBUG_ASSERT(klass != NULL);
+  assert(visitor != NULL);
+  assert(klass != NULL);
 
   switch (klass->m_type)
   {
@@ -782,7 +789,7 @@ class Proc_all_table_handles
 
 void PFS_object_iterator::visit_all_tables(PFS_object_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   visitor->visit_global();
 
@@ -819,7 +826,7 @@ class Proc_one_table_share_handles
 void PFS_object_iterator::visit_tables(PFS_table_share *share,
                                        PFS_object_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   if (!share->m_enabled)
     return;
@@ -862,7 +869,7 @@ void PFS_object_iterator::visit_table_indexes(PFS_table_share *share,
                                               uint index,
                                               PFS_object_visitor *visitor)
 {
-  DBUG_ASSERT(visitor != NULL);
+  assert(visitor != NULL);
 
   if (!share->m_enabled)
     return;
@@ -898,8 +905,8 @@ void PFS_connection_wait_visitor::visit_global()
     For waits, do not sum by connection but by instances,
     it is more efficient.
   */
-  DBUG_ASSERT(   (m_index == global_idle_class.m_event_name_index)
-              || (m_index == global_metadata_class.m_event_name_index));
+  assert(   (m_index == global_idle_class.m_event_name_index)
+            || (m_index == global_metadata_class.m_event_name_index));
 
   if (m_index == global_idle_class.m_event_name_index)
   {
@@ -961,7 +968,7 @@ PFS_connection_all_wait_visitor::~PFS_connection_all_wait_visitor()
 void PFS_connection_all_wait_visitor::visit_global()
 {
   /* Sum by instances, not by connection */
-  DBUG_ASSERT(false);
+  assert(false);
 }
 
 void PFS_connection_all_wait_visitor::visit_connection_slice(PFS_connection_slice *pfs)
diff --git a/storage/perfschema/pfs_visitor.h b/storage/perfschema/pfs_visitor.h
index d1773f45baeb..411e1a452487 100644
--- a/storage/perfschema/pfs_visitor.h
+++ b/storage/perfschema/pfs_visitor.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/table_accounts.cc b/storage/perfschema/table_accounts.cc
index 32da94039e13..08126551d87e 100644
--- a/storage/perfschema/table_accounts.cc
+++ b/storage/perfschema/table_accounts.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -54,6 +61,11 @@ TABLE_FIELD_DEF
 table_accounts::m_field_def=
 { 4, field_types };
 
+PFS_engine_table_share_state
+table_accounts::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_accounts::m_share=
 {
@@ -66,8 +78,9 @@ table_accounts::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_accounts::create()
@@ -133,7 +146,7 @@ int table_accounts::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -151,7 +164,7 @@ int table_accounts::read_row_values(TABLE *table,
         m_row.m_connection_stat.set_field(f->field_index - 2, f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_accounts.h b/storage/perfschema/table_accounts.h
index b8910feba5cb..919e299728e8 100644
--- a/storage/perfschema/table_accounts.h
+++ b/storage/perfschema/table_accounts.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -42,6 +49,7 @@ struct row_accounts
 class table_accounts : public cursor_by_account
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_all_instr.cc b/storage/perfschema/table_all_instr.cc
index f425c337f488..c9a9313f65e1 100644
--- a/storage/perfschema/table_all_instr.cc
+++ b/storage/perfschema/table_all_instr.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/table_all_instr.h b/storage/perfschema/table_all_instr.h
index 762b85d167c2..a5f22f379e89 100644
--- a/storage/perfschema/table_all_instr.h
+++ b/storage/perfschema/table_all_instr.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/table_esgs_by_account_by_event_name.cc b/storage/perfschema/table_esgs_by_account_by_event_name.cc
index 6241b7214772..3c51b7c28f4f 100644
--- a/storage/perfschema/table_esgs_by_account_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_account_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -79,6 +86,11 @@ TABLE_FIELD_DEF
 table_esgs_by_account_by_event_name::m_field_def=
 { 8, field_types };
 
+PFS_engine_table_share_state
+table_esgs_by_account_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esgs_by_account_by_event_name::m_share=
 {
@@ -91,8 +103,9 @@ table_esgs_by_account_by_event_name::m_share=
   sizeof(pos_esgs_by_account_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -216,7 +229,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esgs_by_account_by_event_name.h b/storage/perfschema/table_esgs_by_account_by_event_name.h
index 4335d1a5ddb7..b64435ebd58c 100644
--- a/storage/perfschema/table_esgs_by_account_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_account_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_esgs_by_account_by_event_name
 class table_esgs_by_account_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esgs_by_host_by_event_name.cc b/storage/perfschema/table_esgs_by_host_by_event_name.cc
index 322764ba159c..43cf8a06cc78 100644
--- a/storage/perfschema/table_esgs_by_host_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_host_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -75,6 +82,11 @@ TABLE_FIELD_DEF
 table_esgs_by_host_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_esgs_by_host_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esgs_by_host_by_event_name::m_share=
 {
@@ -87,8 +99,9 @@ table_esgs_by_host_by_event_name::m_share=
   sizeof(pos_esgs_by_host_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -214,7 +227,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esgs_by_host_by_event_name.h b/storage/perfschema/table_esgs_by_host_by_event_name.h
index b4f0449f930d..9097012da8c4 100644
--- a/storage/perfschema/table_esgs_by_host_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_host_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_esgs_by_host_by_event_name
 class table_esgs_by_host_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esgs_by_thread_by_event_name.cc b/storage/perfschema/table_esgs_by_thread_by_event_name.cc
index 93f9f0d289f2..9580e387be3c 100644
--- a/storage/perfschema/table_esgs_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_thread_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -74,6 +81,11 @@ TABLE_FIELD_DEF
 table_esgs_by_thread_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_esgs_by_thread_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esgs_by_thread_by_event_name::m_share=
 {
@@ -86,8 +98,9 @@ table_esgs_by_thread_by_event_name::m_share=
   sizeof(pos_esgs_by_thread_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -206,7 +219,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_esgs_by_thread_by_event_name.h b/storage/perfschema/table_esgs_by_thread_by_event_name.h
index 2adf4d70363d..ef2a9ce882c3 100644
--- a/storage/perfschema/table_esgs_by_thread_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_thread_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -81,6 +88,7 @@ struct pos_esgs_by_thread_by_event_name
 class table_esgs_by_thread_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esgs_by_user_by_event_name.cc b/storage/perfschema/table_esgs_by_user_by_event_name.cc
index 393dd5f12472..c4cf38b32f90 100644
--- a/storage/perfschema/table_esgs_by_user_by_event_name.cc
+++ b/storage/perfschema/table_esgs_by_user_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -74,6 +81,11 @@ TABLE_FIELD_DEF
 table_esgs_by_user_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_esgs_by_user_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esgs_by_user_by_event_name::m_share=
 {
@@ -86,8 +98,9 @@ table_esgs_by_user_by_event_name::m_share=
   sizeof(pos_esgs_by_user_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -213,7 +226,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esgs_by_user_by_event_name.h b/storage/perfschema/table_esgs_by_user_by_event_name.h
index de726bd96fd1..af88de1dda65 100644
--- a/storage/perfschema/table_esgs_by_user_by_event_name.h
+++ b/storage/perfschema/table_esgs_by_user_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -82,6 +89,7 @@ struct pos_esgs_by_user_by_event_name
 class table_esgs_by_user_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esgs_global_by_event_name.cc b/storage/perfschema/table_esgs_global_by_event_name.cc
index 6f9097c55f4c..2b6dbda7138e 100644
--- a/storage/perfschema/table_esgs_global_by_event_name.cc
+++ b/storage/perfschema/table_esgs_global_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -70,6 +77,11 @@ TABLE_FIELD_DEF
 table_esgs_global_by_event_name::m_field_def=
 { 6, field_types };
 
+PFS_engine_table_share_state
+table_esgs_global_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esgs_global_by_event_name::m_share=
 {
@@ -82,8 +94,9 @@ table_esgs_global_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -194,7 +207,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_esgs_global_by_event_name.h b/storage/perfschema/table_esgs_global_by_event_name.h
index 047241072875..18b0ba4f9aec 100644
--- a/storage/perfschema/table_esgs_global_by_event_name.h
+++ b/storage/perfschema/table_esgs_global_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -48,6 +55,7 @@ struct row_esgs_global_by_event_name
 class table_esgs_global_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_account_by_event_name.cc b/storage/perfschema/table_esms_by_account_by_event_name.cc
index ad1915d1c952..ca03e6608bd2 100644
--- a/storage/perfschema/table_esms_by_account_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_account_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -174,6 +181,11 @@ TABLE_FIELD_DEF
 table_esms_by_account_by_event_name::m_field_def=
 { 27, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_account_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_account_by_event_name::m_share=
 {
@@ -186,8 +198,9 @@ table_esms_by_account_by_event_name::m_share=
   sizeof(pos_esms_by_account_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -314,7 +327,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esms_by_account_by_event_name.h b/storage/perfschema/table_esms_by_account_by_event_name.h
index 5c9d1b19a7ef..afc63419aa00 100644
--- a/storage/perfschema/table_esms_by_account_by_event_name.h
+++ b/storage/perfschema/table_esms_by_account_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_esms_by_account_by_event_name
 class table_esms_by_account_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_digest.cc b/storage/perfschema/table_esms_by_digest.cc
index 45dc6f5f87d9..a05ab1451557 100644
--- a/storage/perfschema/table_esms_by_digest.cc
+++ b/storage/perfschema/table_esms_by_digest.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -187,6 +194,11 @@ TABLE_FIELD_DEF
 table_esms_by_digest::m_field_def=
 { 29, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_digest::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_digest::m_share=
 {
@@ -199,8 +211,9 @@ table_esms_by_digest::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -312,7 +325,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     Set the null bits. It indicates how many fields could be null
     in the table.
   */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esms_by_digest.h b/storage/perfschema/table_esms_by_digest.h
index 6130deb8117c..5e683e98ea56 100644
--- a/storage/perfschema/table_esms_by_digest.h
+++ b/storage/perfschema/table_esms_by_digest.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -51,6 +58,7 @@ struct row_esms_by_digest
 class table_esms_by_digest : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_host_by_event_name.cc b/storage/perfschema/table_esms_by_host_by_event_name.cc
index 18fc0ff1fcaf..31ba44d82c21 100644
--- a/storage/perfschema/table_esms_by_host_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_host_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -170,6 +177,11 @@ TABLE_FIELD_DEF
 table_esms_by_host_by_event_name::m_field_def=
 { 26, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_host_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_host_by_event_name::m_share=
 {
@@ -182,8 +194,9 @@ table_esms_by_host_by_event_name::m_share=
   sizeof(pos_esms_by_host_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -312,7 +325,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esms_by_host_by_event_name.h b/storage/perfschema/table_esms_by_host_by_event_name.h
index 090c629cf7fd..cbe666ad8e39 100644
--- a/storage/perfschema/table_esms_by_host_by_event_name.h
+++ b/storage/perfschema/table_esms_by_host_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_esms_by_host_by_event_name
 class table_esms_by_host_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_program.cc b/storage/perfschema/table_esms_by_program.cc
index db727ca0ffe0..05b15d0c9ff1 100644
--- a/storage/perfschema/table_esms_by_program.cc
+++ b/storage/perfschema/table_esms_by_program.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -202,6 +209,11 @@ TABLE_FIELD_DEF
 table_esms_by_program::m_field_def=
 { 32, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_program::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_program::m_share=
 {
@@ -214,8 +226,9 @@ table_esms_by_program::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -327,7 +340,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     Set the null bits. It indicates how many fields could be null
     in the table.
   */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esms_by_program.h b/storage/perfschema/table_esms_by_program.h
index ab1ee135cab6..f9e686efc6f8 100644
--- a/storage/perfschema/table_esms_by_program.h
+++ b/storage/perfschema/table_esms_by_program.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -61,6 +68,7 @@ struct row_esms_by_program
 class table_esms_by_program : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_thread_by_event_name.cc b/storage/perfschema/table_esms_by_thread_by_event_name.cc
index d0b2c2beb027..b62bfd23b320 100644
--- a/storage/perfschema/table_esms_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_thread_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -169,6 +176,11 @@ TABLE_FIELD_DEF
 table_esms_by_thread_by_event_name::m_field_def=
 { 26, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_thread_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_thread_by_event_name::m_share=
 {
@@ -181,8 +193,9 @@ table_esms_by_thread_by_event_name::m_share=
   sizeof(pos_esms_by_thread_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -305,7 +318,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_esms_by_thread_by_event_name.h b/storage/perfschema/table_esms_by_thread_by_event_name.h
index a7a01a6b313c..6a1ddbbdcb7f 100644
--- a/storage/perfschema/table_esms_by_thread_by_event_name.h
+++ b/storage/perfschema/table_esms_by_thread_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -81,6 +88,7 @@ struct pos_esms_by_thread_by_event_name
 class table_esms_by_thread_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_by_user_by_event_name.cc b/storage/perfschema/table_esms_by_user_by_event_name.cc
index 0219dc0544f3..be7f88cb893f 100644
--- a/storage/perfschema/table_esms_by_user_by_event_name.cc
+++ b/storage/perfschema/table_esms_by_user_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -169,6 +176,11 @@ TABLE_FIELD_DEF
 table_esms_by_user_by_event_name::m_field_def=
 { 26, field_types };
 
+PFS_engine_table_share_state
+table_esms_by_user_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_by_user_by_event_name::m_share=
 {
@@ -181,8 +193,9 @@ table_esms_by_user_by_event_name::m_share=
   sizeof(pos_esms_by_user_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -311,7 +324,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_esms_by_user_by_event_name.h b/storage/perfschema/table_esms_by_user_by_event_name.h
index 7af1e68d9338..8e512d13a142 100644
--- a/storage/perfschema/table_esms_by_user_by_event_name.h
+++ b/storage/perfschema/table_esms_by_user_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_esms_by_user_by_event_name
 class table_esms_by_user_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_esms_global_by_event_name.cc b/storage/perfschema/table_esms_global_by_event_name.cc
index 4bfb80a82585..e83d79067d79 100644
--- a/storage/perfschema/table_esms_global_by_event_name.cc
+++ b/storage/perfschema/table_esms_global_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -165,6 +172,11 @@ TABLE_FIELD_DEF
 table_esms_global_by_event_name::m_field_def=
 { 25, field_types };
 
+PFS_engine_table_share_state
+table_esms_global_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_esms_global_by_event_name::m_share=
 {
@@ -177,8 +189,9 @@ table_esms_global_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -294,7 +307,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_esms_global_by_event_name.h b/storage/perfschema/table_esms_global_by_event_name.h
index 4dd659c54c52..9814a18fb84b 100644
--- a/storage/perfschema/table_esms_global_by_event_name.h
+++ b/storage/perfschema/table_esms_global_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -48,6 +55,7 @@ struct row_esms_global_by_event_name
 class table_esms_global_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ets_by_account_by_event_name.cc b/storage/perfschema/table_ets_by_account_by_event_name.cc
index 338ee8af30f1..ddffd0bf12af 100644
--- a/storage/perfschema/table_ets_by_account_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_account_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -129,6 +136,11 @@ TABLE_FIELD_DEF
 table_ets_by_account_by_event_name::m_field_def=
 { 18, field_types };
 
+PFS_engine_table_share_state
+table_ets_by_account_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ets_by_account_by_event_name::m_share=
 {
@@ -141,8 +153,9 @@ table_ets_by_account_by_event_name::m_share=
   sizeof(pos_ets_by_account_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -266,7 +279,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ets_by_account_by_event_name.h b/storage/perfschema/table_ets_by_account_by_event_name.h
index b255a519b456..a5202b299e02 100644
--- a/storage/perfschema/table_ets_by_account_by_event_name.h
+++ b/storage/perfschema/table_ets_by_account_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -81,6 +88,7 @@ struct pos_ets_by_account_by_event_name
 class table_ets_by_account_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ets_by_host_by_event_name.cc b/storage/perfschema/table_ets_by_host_by_event_name.cc
index f95e95cc0f31..5cad8c21c995 100644
--- a/storage/perfschema/table_ets_by_host_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_host_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -125,6 +132,11 @@ TABLE_FIELD_DEF
 table_ets_by_host_by_event_name::m_field_def=
 { 17, field_types };
 
+PFS_engine_table_share_state
+table_ets_by_host_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ets_by_host_by_event_name::m_share=
 {
@@ -137,8 +149,9 @@ table_ets_by_host_by_event_name::m_share=
   sizeof(pos_ets_by_host_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -264,7 +277,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ets_by_host_by_event_name.h b/storage/perfschema/table_ets_by_host_by_event_name.h
index f6a1b375e0bd..00b4dbd02f8f 100644
--- a/storage/perfschema/table_ets_by_host_by_event_name.h
+++ b/storage/perfschema/table_ets_by_host_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -81,6 +88,7 @@ struct pos_ets_by_host_by_event_name
 class table_ets_by_host_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ets_by_thread_by_event_name.cc b/storage/perfschema/table_ets_by_thread_by_event_name.cc
index 1403d5b45acf..70c229dd6cef 100644
--- a/storage/perfschema/table_ets_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_thread_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -124,6 +131,11 @@ TABLE_FIELD_DEF
 table_ets_by_thread_by_event_name::m_field_def=
 { 17, field_types };
 
+PFS_engine_table_share_state
+table_ets_by_thread_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ets_by_thread_by_event_name::m_share=
 {
@@ -136,8 +148,9 @@ table_ets_by_thread_by_event_name::m_share=
   sizeof(pos_ets_by_thread_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -257,7 +270,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_ets_by_thread_by_event_name.h b/storage/perfschema/table_ets_by_thread_by_event_name.h
index 526bb8f37a08..1fa62f84e518 100644
--- a/storage/perfschema/table_ets_by_thread_by_event_name.h
+++ b/storage/perfschema/table_ets_by_thread_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -85,6 +92,7 @@ struct pos_ets_by_thread_by_event_name
 class table_ets_by_thread_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ets_by_user_by_event_name.cc b/storage/perfschema/table_ets_by_user_by_event_name.cc
index 535766744859..0e610dedf0d6 100644
--- a/storage/perfschema/table_ets_by_user_by_event_name.cc
+++ b/storage/perfschema/table_ets_by_user_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -124,6 +131,11 @@ TABLE_FIELD_DEF
 table_ets_by_user_by_event_name::m_field_def=
 { 17, field_types };
 
+PFS_engine_table_share_state
+table_ets_by_user_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ets_by_user_by_event_name::m_share=
 {
@@ -136,8 +148,9 @@ table_ets_by_user_by_event_name::m_share=
   sizeof(pos_ets_by_user_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -263,7 +276,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ets_by_user_by_event_name.h b/storage/perfschema/table_ets_by_user_by_event_name.h
index d73e7e517ed9..9bd5b859ef9f 100644
--- a/storage/perfschema/table_ets_by_user_by_event_name.h
+++ b/storage/perfschema/table_ets_by_user_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -81,6 +88,7 @@ struct pos_ets_by_user_by_event_name
 class table_ets_by_user_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ets_global_by_event_name.cc b/storage/perfschema/table_ets_global_by_event_name.cc
index 59dbfce892cd..d27c19547a21 100644
--- a/storage/perfschema/table_ets_global_by_event_name.cc
+++ b/storage/perfschema/table_ets_global_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -120,6 +127,11 @@ TABLE_FIELD_DEF
 table_ets_global_by_event_name::m_field_def=
 { 16, field_types };
 
+PFS_engine_table_share_state
+table_ets_global_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ets_global_by_event_name::m_share=
 {
@@ -132,8 +144,9 @@ table_ets_global_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -238,7 +251,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_ets_global_by_event_name.h b/storage/perfschema/table_ets_global_by_event_name.h
index a29e9f07156a..d5a67f435052 100644
--- a/storage/perfschema/table_ets_global_by_event_name.h
+++ b/storage/perfschema/table_ets_global_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -52,6 +59,7 @@ struct row_ets_global_by_event_name
 class table_ets_global_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_events_stages.cc b/storage/perfschema/table_events_stages.cc
index aa8b2ca5b844..56695f288b45 100644
--- a/storage/perfschema/table_events_stages.cc
+++ b/storage/perfschema/table_events_stages.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -98,6 +105,11 @@ TABLE_FIELD_DEF
 table_events_stages_current::m_field_def=
 {12 , field_types };
 
+PFS_engine_table_share_state
+table_events_stages_current::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_stages_current::m_share=
 {
@@ -110,12 +122,18 @@ table_events_stages_current::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_stages_history::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_stages_history::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_stages_history::m_share=
 {
@@ -128,12 +146,18 @@ table_events_stages_history::m_share=
   sizeof(pos_events_stages_history), /* ref length */
   &m_table_lock,
   &table_events_stages_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_stages_history_long::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_stages_history_long::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_stages_history_long::m_share=
 {
@@ -146,8 +170,9 @@ table_events_stages_history_long::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &table_events_stages_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 table_events_stages_common::table_events_stages_common
@@ -162,8 +187,6 @@ table_events_stages_common::table_events_stages_common
 */
 void table_events_stages_common::make_row(PFS_events_stages *stage)
 {
-  const char *base;
-  const char *safe_source_file;
   ulonglong timer_end;
 
   m_row_exists= false;
@@ -194,15 +217,8 @@ void table_events_stages_common::make_row(PFS_events_stages *stage)
   m_row.m_name= klass->m_name;
   m_row.m_name_length= klass->m_name_length;
 
-  safe_source_file= stage->m_source_file;
-  if (unlikely(safe_source_file == NULL))
-    return;
-
-  base= base_name(safe_source_file);
-  m_row.m_source_length= my_snprintf(m_row.m_source, sizeof(m_row.m_source),
-                                     "%s:%d", base, stage->m_source_line);
-  if (m_row.m_source_length > sizeof(m_row.m_source))
-    m_row.m_source_length= sizeof(m_row.m_source);
+  /* Disable source file and line to avoid stale __FILE__ pointers. */
+  m_row.m_source_length= 0;
 
   if (klass->is_progress())
   {
@@ -230,7 +246,7 @@ int table_events_stages_common::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 2);
+  assert(table->s->null_bytes == 2);
   buf[0]= 0;
   buf[1]= 0;
 
@@ -301,7 +317,7 @@ int table_events_stages_common::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -450,10 +466,10 @@ int table_events_stages_history::rnd_pos(const void *pos)
   PFS_thread *pfs_thread;
   PFS_events_stages *stage;
 
-  DBUG_ASSERT(events_stages_history_per_thread != 0);
+  assert(events_stages_history_per_thread != 0);
   set_position(pos);
 
-  DBUG_ASSERT(m_pos.m_index_2 < events_stages_history_per_thread);
+  assert(m_pos.m_index_2 < events_stages_history_per_thread);
 
   pfs_thread= global_thread_container.get(m_pos.m_index_1);
   if (pfs_thread != NULL)
diff --git a/storage/perfschema/table_events_stages.h b/storage/perfschema/table_events_stages.h
index b867d470bd5a..9a00c3b03f3e 100644
--- a/storage/perfschema/table_events_stages.h
+++ b/storage/perfschema/table_events_stages.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -115,6 +122,7 @@ class table_events_stages_common : public PFS_engine_table
 class table_events_stages_current : public table_events_stages_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -156,6 +164,7 @@ class table_events_stages_current : public table_events_stages_common
 class table_events_stages_history : public table_events_stages_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -188,6 +197,7 @@ class table_events_stages_history : public table_events_stages_common
 class table_events_stages_history_long : public table_events_stages_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_events_statements.cc b/storage/perfschema/table_events_statements.cc
index fd78aa55e6d5..3d56a77ab8bf 100644
--- a/storage/perfschema/table_events_statements.cc
+++ b/storage/perfschema/table_events_statements.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -245,6 +252,11 @@ TABLE_FIELD_DEF
 table_events_statements_current::m_field_def=
 {41 , field_types };
 
+PFS_engine_table_share_state
+table_events_statements_current::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_statements_current::m_share=
 {
@@ -257,12 +269,18 @@ table_events_statements_current::m_share=
   sizeof(pos_events_statements_current), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_statements_history::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_statements_history::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_statements_history::m_share=
 {
@@ -275,12 +293,18 @@ table_events_statements_history::m_share=
   sizeof(pos_events_statements_history), /* ref length */
   &m_table_lock,
   &table_events_statements_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_statements_history_long::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_statements_history_long::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_statements_history_long::m_share=
 {
@@ -293,8 +317,9 @@ table_events_statements_history_long::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &table_events_statements_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 table_events_statements_common::table_events_statements_common
@@ -310,8 +335,6 @@ table_events_statements_common::table_events_statements_common
 void table_events_statements_common::make_row_part_1(PFS_events_statements *statement,
                                                      sql_digest_storage *digest)
 {
-  const char *base;
-  const char *safe_source_file;
   ulonglong timer_end;
 
   m_row_exists= false;
@@ -391,15 +414,8 @@ void table_events_statements_common::make_row_part_1(PFS_events_statements *stat
   if (m_row.m_object_name_length > 0)
     memcpy(m_row.m_object_name, statement->m_object_name, m_row.m_object_name_length);
 
-  safe_source_file= statement->m_source_file;
-  if (unlikely(safe_source_file == NULL))
-    return;
-
-  base= base_name(safe_source_file);
-  m_row.m_source_length= my_snprintf(m_row.m_source, sizeof(m_row.m_source),
-                                     "%s:%d", base, statement->m_source_line);
-  if (m_row.m_source_length > sizeof(m_row.m_source))
-    m_row.m_source_length= sizeof(m_row.m_source);
+  /* Disable source file and line to avoid stale __FILE__ pointers. */
+  m_row.m_source_length= 0;
 
   memcpy(m_row.m_message_text, statement->m_message_text, sizeof(m_row.m_message_text));
   m_row.m_sql_errno= statement->m_sql_errno;
@@ -474,7 +490,7 @@ int table_events_statements_common::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 3);
+  assert(table->s->null_bytes == 3);
   buf[0]= 0;
   buf[1]= 0;
   buf[2]= 0;
@@ -663,7 +679,7 @@ int table_events_statements_common::read_row_values(TABLE *table,
           set_field_ulong(f, m_row.m_nesting_event_level);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -756,7 +772,7 @@ int table_events_statements_current::rnd_pos(const void *pos)
         return HA_ERR_RECORD_DELETED;
     }
 
-    DBUG_ASSERT(m_pos.m_index_2 < statement_stack_max);
+    assert(m_pos.m_index_2 < statement_stack_max);
 
     statement= &pfs_thread->m_statement_stack[m_pos.m_index_2];
 
@@ -878,13 +894,13 @@ int table_events_statements_history::rnd_pos(const void *pos)
   PFS_thread *pfs_thread;
   PFS_events_statements *statement;
 
-  DBUG_ASSERT(events_statements_history_per_thread != 0);
+  assert(events_statements_history_per_thread != 0);
   set_position(pos);
 
   pfs_thread= global_thread_container.get(m_pos.m_index_1);
   if (pfs_thread != NULL)
   {
-    DBUG_ASSERT(m_pos.m_index_2 < events_statements_history_per_thread);
+    assert(m_pos.m_index_2 < events_statements_history_per_thread);
 
     if ( ! pfs_thread->m_statements_history_full &&
         (m_pos.m_index_2 >= pfs_thread->m_statements_history_index))
diff --git a/storage/perfschema/table_events_statements.h b/storage/perfschema/table_events_statements.h
index 6496706bdfb1..0e0ce22dfbca 100644
--- a/storage/perfschema/table_events_statements.h
+++ b/storage/perfschema/table_events_statements.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -202,6 +209,7 @@ class table_events_statements_common : public PFS_engine_table
 class table_events_statements_current : public table_events_statements_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -245,6 +253,7 @@ class table_events_statements_current : public table_events_statements_common
 class table_events_statements_history : public table_events_statements_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -279,6 +288,7 @@ class table_events_statements_history : public table_events_statements_common
 class table_events_statements_history_long : public table_events_statements_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_events_transactions.cc b/storage/perfschema/table_events_transactions.cc
index 7c258fc9b88d..48564dcca138 100644
--- a/storage/perfschema/table_events_transactions.cc
+++ b/storage/perfschema/table_events_transactions.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -160,6 +167,11 @@ TABLE_FIELD_DEF
 table_events_transactions_current::m_field_def=
 {24 , field_types };
 
+PFS_engine_table_share_state
+table_events_transactions_current::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_transactions_current::m_share=
 {
@@ -172,12 +184,18 @@ table_events_transactions_current::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_transactions_history::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_transactions_history::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_transactions_history::m_share=
 {
@@ -190,12 +208,18 @@ table_events_transactions_history::m_share=
   sizeof(pos_events_transactions_history), /* ref length */
   &m_table_lock,
   &table_events_transactions_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_transactions_history_long::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_transactions_history_long::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_transactions_history_long::m_share=
 {
@@ -208,8 +232,9 @@ table_events_transactions_history_long::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &table_events_transactions_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 table_events_transactions_common::table_events_transactions_common
@@ -224,8 +249,6 @@ table_events_transactions_common::table_events_transactions_common
 */
 void table_events_transactions_common::make_row(PFS_events_transactions *transaction)
 {
-  const char *base;
-  const char *safe_source_file;
   ulonglong timer_end;
 
   m_row_exists= false;
@@ -255,15 +278,8 @@ void table_events_transactions_common::make_row(PFS_events_transactions *transac
   m_row.m_name= klass->m_name;
   m_row.m_name_length= klass->m_name_length;
 
-  safe_source_file= transaction->m_source_file;
-  if (unlikely(safe_source_file == NULL))
-    return;
-
-  base= base_name(safe_source_file);
-  m_row.m_source_length= (uint)my_snprintf(m_row.m_source, sizeof(m_row.m_source),
-                                     "%s:%d", base, transaction->m_source_line);
-  if (m_row.m_source_length > sizeof(m_row.m_source))
-    m_row.m_source_length= sizeof(m_row.m_source);
+  /* Disable source file and line to avoid stale __FILE__ pointers. */
+  m_row.m_source_length= 0;
 
   /* A GTID consists of the SID (source id) and GNO (transaction number).
      The SID is stored in transaction->m_sid and the GNO is stored in
@@ -322,8 +338,8 @@ static const ulong XID_BUFFER_SIZE= XIDDATASIZE*2 + 2 + 1;
 */
 static uint xid_to_hex(char *buf, size_t buf_len, PSI_xid *xid, size_t offset, size_t length)
 {
-  DBUG_ASSERT(buf_len >= XID_BUFFER_SIZE);
-  DBUG_ASSERT(offset + length <= XIDDATASIZE);
+  assert(buf_len >= XID_BUFFER_SIZE);
+  assert(offset + length <= XIDDATASIZE);
   *buf++= '0';
   *buf++= 'x';
   return bin_to_hex_str(buf, buf_len-2, (char*)(xid->data + offset), length) + 2;
@@ -340,7 +356,7 @@ static uint xid_to_hex(char *buf, size_t buf_len, PSI_xid *xid, size_t offset, s
 */
 static void xid_store(Field *field, PSI_xid *xid, size_t offset, size_t length)
 {
-  DBUG_ASSERT(!xid->is_null());
+  assert(!xid->is_null());
   if (xid_printable(xid, offset, length))
   {
     field->store(xid->data + offset, length, &my_charset_bin);
@@ -379,7 +395,7 @@ int table_events_transactions_common::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 3);
+  assert(table->s->null_bytes == 3);
   buf[0]= 0;
   buf[1]= 0;
   buf[2]= 0;
@@ -497,7 +513,7 @@ int table_events_transactions_common::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -652,10 +668,10 @@ int table_events_transactions_history::rnd_pos(const void *pos)
   PFS_thread *pfs_thread;
   PFS_events_transactions *transaction;
 
-  DBUG_ASSERT(events_transactions_history_per_thread != 0);
+  assert(events_transactions_history_per_thread != 0);
   set_position(pos);
 
-  DBUG_ASSERT(m_pos.m_index_2 < events_transactions_history_per_thread);
+  assert(m_pos.m_index_2 < events_transactions_history_per_thread);
 
   pfs_thread= global_thread_container.get(m_pos.m_index_1);
   if (pfs_thread != NULL)
diff --git a/storage/perfschema/table_events_transactions.h b/storage/perfschema/table_events_transactions.h
index 10056c85d03b..328418b7e299 100644
--- a/storage/perfschema/table_events_transactions.h
+++ b/storage/perfschema/table_events_transactions.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -142,6 +149,7 @@ class table_events_transactions_common : public PFS_engine_table
 class table_events_transactions_current : public table_events_transactions_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -183,6 +191,7 @@ class table_events_transactions_current : public table_events_transactions_commo
 class table_events_transactions_history : public table_events_transactions_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -215,6 +224,7 @@ class table_events_transactions_history : public table_events_transactions_commo
 class table_events_transactions_history_long : public table_events_transactions_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_events_waits.cc b/storage/perfschema/table_events_waits.cc
index c4e3eb90efb1..d5475d3fac99 100644
--- a/storage/perfschema/table_events_waits.cc
+++ b/storage/perfschema/table_events_waits.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -135,6 +142,11 @@ TABLE_FIELD_DEF
 table_events_waits_current::m_field_def=
 { 19, field_types };
 
+PFS_engine_table_share_state
+table_events_waits_current::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_waits_current::m_share=
 {
@@ -147,12 +159,18 @@ table_events_waits_current::m_share=
   sizeof(pos_events_waits_current), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_waits_history::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_waits_history::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_waits_history::m_share=
 {
@@ -165,12 +183,18 @@ table_events_waits_history::m_share=
   sizeof(pos_events_waits_history), /* ref length */
   &m_table_lock,
   &table_events_waits_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 THR_LOCK table_events_waits_history_long::m_table_lock;
 
+PFS_engine_table_share_state
+table_events_waits_history_long::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_waits_history_long::m_share=
 {
@@ -183,8 +207,9 @@ table_events_waits_history_long::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &table_events_waits_current::m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 table_events_waits_common::table_events_waits_common
@@ -481,8 +506,6 @@ int table_events_waits_common::make_metadata_lock_object_columns(PFS_events_wait
 void table_events_waits_common::make_row(PFS_events_waits *wait)
 {
   PFS_instr_class *safe_class;
-  const char *base;
-  const char *safe_source_file;
   enum_timer_name timer_name= wait_timer;
   ulonglong timer_end;
 
@@ -585,19 +608,9 @@ void table_events_waits_common::make_row(PFS_events_waits *wait)
   m_row.m_name= safe_class->m_name;
   m_row.m_name_length= safe_class->m_name_length;
 
-  /*
-    We are assuming this pointer is sane,
-    since it comes from __FILE__.
-  */
-  safe_source_file= wait->m_source_file;
-  if (unlikely(safe_source_file == NULL))
-    return;
+  /* Disable source file and line to avoid stale __FILE__ pointers. */
+  m_row.m_source_length= 0;
 
-  base= base_name(wait->m_source_file);
-  m_row.m_source_length= my_snprintf(m_row.m_source, sizeof(m_row.m_source),
-                                     "%s:%d", base, wait->m_source_line);
-  if (m_row.m_source_length > sizeof(m_row.m_source))
-    m_row.m_source_length= sizeof(m_row.m_source);
   m_row.m_operation= wait->m_operation;
   m_row.m_number_of_bytes= wait->m_number_of_bytes;
   m_row.m_flags= wait->m_flags;
@@ -714,7 +727,7 @@ int table_events_waits_common::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 2);
+  assert(table->s->null_bytes == 2);
   buf[0]= 0;
   buf[1]= 0;
 
@@ -846,7 +859,7 @@ int table_events_waits_common::read_row_values(TABLE *table,
         f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -965,7 +978,7 @@ int table_events_waits_current::rnd_pos(const void *pos)
     }
 #endif
 
-    DBUG_ASSERT(m_pos.m_index_2 < WAIT_STACK_LOGICAL_SIZE);
+    assert(m_pos.m_index_2 < WAIT_STACK_LOGICAL_SIZE);
 
     if (wait->m_wait_class != NO_WAIT_CLASS)
     {
@@ -1066,13 +1079,13 @@ int table_events_waits_history::rnd_pos(const void *pos)
   PFS_thread *pfs_thread;
   PFS_events_waits *wait;
 
-  DBUG_ASSERT(events_waits_history_per_thread != 0);
+  assert(events_waits_history_per_thread != 0);
   set_position(pos);
 
   pfs_thread= global_thread_container.get(m_pos.m_index_1);
   if (pfs_thread != NULL)
   {
-    DBUG_ASSERT(m_pos.m_index_2 < events_waits_history_per_thread);
+    assert(m_pos.m_index_2 < events_waits_history_per_thread);
 
     if ( ! pfs_thread->m_waits_history_full &&
         (m_pos.m_index_2 >= pfs_thread->m_waits_history_index))
diff --git a/storage/perfschema/table_events_waits.h b/storage/perfschema/table_events_waits.h
index 74aced71affb..e189396ae079 100644
--- a/storage/perfschema/table_events_waits.h
+++ b/storage/perfschema/table_events_waits.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -160,6 +167,7 @@ class table_events_waits_common : public PFS_engine_table
 class table_events_waits_current : public table_events_waits_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -202,6 +210,7 @@ class table_events_waits_current : public table_events_waits_common
 class table_events_waits_history : public table_events_waits_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -235,6 +244,7 @@ class table_events_waits_history : public table_events_waits_common
 class table_events_waits_history_long : public table_events_waits_common
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_events_waits_summary.cc b/storage/perfschema/table_events_waits_summary.cc
index 7da688e6eb00..da551f7826e2 100644
--- a/storage/perfschema/table_events_waits_summary.cc
+++ b/storage/perfschema/table_events_waits_summary.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -72,6 +79,11 @@ TABLE_FIELD_DEF
 table_events_waits_summary_by_instance::m_field_def=
 { 7, ews_by_instance_field_types };
 
+PFS_engine_table_share_state
+table_events_waits_summary_by_instance::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_events_waits_summary_by_instance::m_share=
 {
@@ -84,8 +96,9 @@ table_events_waits_summary_by_instance::m_share=
   sizeof(pos_all_instr),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_events_waits_summary_by_instance::create(void)
@@ -226,7 +239,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -256,7 +269,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
         set_field_ulonglong(f, m_row.m_stat.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_events_waits_summary.h b/storage/perfschema/table_events_waits_summary.h
index 1d42f0e56152..5f89dbfdf6b6 100644
--- a/storage/perfschema/table_events_waits_summary.h
+++ b/storage/perfschema/table_events_waits_summary.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -50,6 +57,7 @@ struct row_events_waits_summary_by_instance
 class table_events_waits_summary_by_instance : public table_all_instr
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ews_by_account_by_event_name.cc b/storage/perfschema/table_ews_by_account_by_event_name.cc
index 3d2cca20f805..7c309fd9c603 100644
--- a/storage/perfschema/table_ews_by_account_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_account_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -79,6 +86,11 @@ TABLE_FIELD_DEF
 table_ews_by_account_by_event_name::m_field_def=
 { 8, field_types };
 
+PFS_engine_table_share_state
+table_ews_by_account_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ews_by_account_by_event_name::m_share=
 {
@@ -91,8 +103,9 @@ table_ews_by_account_by_event_name::m_share=
   sizeof(pos_ews_by_account_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -171,7 +184,7 @@ int table_ews_by_account_by_event_name::rnd_next(void)
           break;
         default:
           instr_class= NULL;
-          DBUG_ASSERT(false);
+          assert(false);
           break;
         }
 
@@ -228,7 +241,7 @@ table_ews_by_account_by_event_name::rnd_pos(const void *pos)
     break;
   default:
     instr_class= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
   }
   if (instr_class)
   {
@@ -277,7 +290,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ews_by_account_by_event_name.h b/storage/perfschema/table_ews_by_account_by_event_name.h
index 1b433b50fe23..7a5feb3efac9 100644
--- a/storage/perfschema/table_ews_by_account_by_event_name.h
+++ b/storage/perfschema/table_ews_by_account_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -89,6 +96,7 @@ struct pos_ews_by_account_by_event_name
 class table_ews_by_account_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ews_by_host_by_event_name.cc b/storage/perfschema/table_ews_by_host_by_event_name.cc
index d57d512bd6ad..083b2d459dc4 100644
--- a/storage/perfschema/table_ews_by_host_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_host_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -75,6 +82,11 @@ TABLE_FIELD_DEF
 table_ews_by_host_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_ews_by_host_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ews_by_host_by_event_name::m_share=
 {
@@ -87,8 +99,9 @@ table_ews_by_host_by_event_name::m_share=
   sizeof(pos_ews_by_host_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -168,7 +181,7 @@ int table_ews_by_host_by_event_name::rnd_next(void)
           break;
         default:
           instr_class= NULL;
-          DBUG_ASSERT(false);
+          assert(false);
           break;
         }
 
@@ -225,7 +238,7 @@ table_ews_by_host_by_event_name::rnd_pos(const void *pos)
     break;
   default:
     instr_class= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   if (instr_class)
@@ -276,7 +289,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ews_by_host_by_event_name.h b/storage/perfschema/table_ews_by_host_by_event_name.h
index abd809d46633..77f7d558092b 100644
--- a/storage/perfschema/table_ews_by_host_by_event_name.h
+++ b/storage/perfschema/table_ews_by_host_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -89,6 +96,7 @@ struct pos_ews_by_host_by_event_name
 class table_ews_by_host_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ews_by_thread_by_event_name.cc b/storage/perfschema/table_ews_by_thread_by_event_name.cc
index 4c9e491b0c56..213cfc29feac 100644
--- a/storage/perfschema/table_ews_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_thread_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -74,6 +81,11 @@ TABLE_FIELD_DEF
 table_ews_by_thread_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_ews_by_thread_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ews_by_thread_by_event_name::m_share=
 {
@@ -86,8 +98,9 @@ table_ews_by_thread_by_event_name::m_share=
   sizeof(pos_ews_by_thread_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -164,7 +177,7 @@ int table_ews_by_thread_by_event_name::rnd_next(void)
           instr_class= find_metadata_class(m_pos.m_index_3);
           break;
         default:
-          DBUG_ASSERT(false);
+          assert(false);
           instr_class= NULL;
           break;
         }
@@ -220,7 +233,7 @@ table_ews_by_thread_by_event_name::rnd_pos(const void *pos)
       instr_class= find_metadata_class(m_pos.m_index_3);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       instr_class= NULL;
     }
 
@@ -283,7 +296,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_ews_by_thread_by_event_name.h b/storage/perfschema/table_ews_by_thread_by_event_name.h
index 414119d18844..cdc7756d410c 100644
--- a/storage/perfschema/table_ews_by_thread_by_event_name.h
+++ b/storage/perfschema/table_ews_by_thread_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -88,6 +95,7 @@ struct pos_ews_by_thread_by_event_name
 class table_ews_by_thread_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ews_by_user_by_event_name.cc b/storage/perfschema/table_ews_by_user_by_event_name.cc
index 102008f1eaf4..f1817ed5d2fc 100644
--- a/storage/perfschema/table_ews_by_user_by_event_name.cc
+++ b/storage/perfschema/table_ews_by_user_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -74,6 +81,11 @@ TABLE_FIELD_DEF
 table_ews_by_user_by_event_name::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_ews_by_user_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ews_by_user_by_event_name::m_share=
 {
@@ -86,8 +98,9 @@ table_ews_by_user_by_event_name::m_share=
   sizeof(pos_ews_by_user_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -167,7 +180,7 @@ int table_ews_by_user_by_event_name::rnd_next(void)
           break;
         default:
           instr_class= NULL;
-          DBUG_ASSERT(false);
+          assert(false);
           break;
         }
 
@@ -224,7 +237,7 @@ table_ews_by_user_by_event_name::rnd_pos(const void *pos)
     break;
   default:
     instr_class= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
   if (instr_class)
@@ -275,7 +288,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_ews_by_user_by_event_name.h b/storage/perfschema/table_ews_by_user_by_event_name.h
index 742badd984ca..868130a93726 100644
--- a/storage/perfschema/table_ews_by_user_by_event_name.h
+++ b/storage/perfschema/table_ews_by_user_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -89,6 +96,7 @@ struct pos_ews_by_user_by_event_name
 class table_ews_by_user_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_ews_global_by_event_name.cc b/storage/perfschema/table_ews_global_by_event_name.cc
index c26789dc58f1..a82f06492634 100644
--- a/storage/perfschema/table_ews_global_by_event_name.cc
+++ b/storage/perfschema/table_ews_global_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -70,6 +77,11 @@ TABLE_FIELD_DEF
 table_ews_global_by_event_name::m_field_def=
 { 6, field_types };
 
+PFS_engine_table_share_state
+table_ews_global_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_ews_global_by_event_name::m_share=
 {
@@ -82,8 +94,9 @@ table_ews_global_by_event_name::m_share=
   sizeof(pos_ews_global_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -266,8 +279,8 @@ table_ews_global_by_event_name::rnd_pos(const void *pos)
     }
     break;
   case pos_ews_global_by_event_name::VIEW_TABLE:
-    DBUG_ASSERT(m_pos.m_index_2 >= 1);
-    DBUG_ASSERT(m_pos.m_index_2 <= 2);
+    assert(m_pos.m_index_2 >= 1);
+    assert(m_pos.m_index_2 <= 2);
     if (m_pos.m_index_2 == 1)
       make_table_io_row(&global_table_io_class);
     else
@@ -298,7 +311,7 @@ table_ews_global_by_event_name::rnd_pos(const void *pos)
     }
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     break;
   }
 
@@ -440,7 +453,7 @@ ::read_row_values(TABLE *table, unsigned char *, Field **fields,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_ews_global_by_event_name.h b/storage/perfschema/table_ews_global_by_event_name.h
index 19a1a378c30f..6de4ad89ad3e 100644
--- a/storage/perfschema/table_ews_global_by_event_name.h
+++ b/storage/perfschema/table_ews_global_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -77,6 +84,7 @@ struct pos_ews_global_by_event_name
 class table_ews_global_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_file_instances.cc b/storage/perfschema/table_file_instances.cc
index ec4217a4a3f1..95544c7e908e 100644
--- a/storage/perfschema/table_file_instances.cc
+++ b/storage/perfschema/table_file_instances.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -53,6 +60,11 @@ TABLE_FIELD_DEF
 table_file_instances::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_file_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_file_instances::m_share=
 {
@@ -65,8 +77,9 @@ table_file_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_file_instances::create(void)
@@ -159,7 +172,7 @@ int table_file_instances::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -178,7 +191,7 @@ int table_file_instances::read_row_values(TABLE *table,
         set_field_ulong(f, m_row.m_open_count);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_file_instances.h b/storage/perfschema/table_file_instances.h
index 3b540e6dbe40..cd7c98f3e3a0 100644
--- a/storage/perfschema/table_file_instances.h
+++ b/storage/perfschema/table_file_instances.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -48,6 +55,7 @@ struct row_file_instances
 class table_file_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_file_summary_by_event_name.cc b/storage/perfschema/table_file_summary_by_event_name.cc
index ab80b2b6a557..d9bc90c0cb53 100644
--- a/storage/perfschema/table_file_summary_by_event_name.cc
+++ b/storage/perfschema/table_file_summary_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -159,6 +166,11 @@ TABLE_FIELD_DEF
 table_file_summary_by_event_name::m_field_def=
 { 23, field_types };
 
+PFS_engine_table_share_state
+table_file_summary_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_file_summary_by_event_name::m_share=
 {
@@ -171,8 +183,9 @@ table_file_summary_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_file_summary_by_event_name::create(void)
@@ -267,7 +280,7 @@ int table_file_summary_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -349,7 +362,7 @@ int table_file_summary_by_event_name::read_row_values(TABLE *table,
         break;
 
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
     } // if
diff --git a/storage/perfschema/table_file_summary_by_event_name.h b/storage/perfschema/table_file_summary_by_event_name.h
index ff5046aafdac..7cfeebcf54a7 100644
--- a/storage/perfschema/table_file_summary_by_event_name.h
+++ b/storage/perfschema/table_file_summary_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -48,6 +55,7 @@ struct row_file_summary_by_event_name
 class table_file_summary_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_file_summary_by_instance.cc b/storage/perfschema/table_file_summary_by_instance.cc
index 8dcb3cadeb1a..ba48fcd3b5c4 100644
--- a/storage/perfschema/table_file_summary_by_instance.cc
+++ b/storage/perfschema/table_file_summary_by_instance.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -169,6 +176,11 @@ TABLE_FIELD_DEF
 table_file_summary_by_instance::m_field_def=
 { 25, field_types };
 
+PFS_engine_table_share_state
+table_file_summary_by_instance::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_file_summary_by_instance::m_share=
 {
@@ -181,8 +193,9 @@ table_file_summary_by_instance::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_file_summary_by_instance::create(void)
@@ -289,7 +302,7 @@ int table_file_summary_by_instance::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -377,7 +390,7 @@ int table_file_summary_by_instance::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.m_io_stat.m_misc.m_waits.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_file_summary_by_instance.h b/storage/perfschema/table_file_summary_by_instance.h
index 98389e944560..7860dd52ad21 100644
--- a/storage/perfschema/table_file_summary_by_instance.h
+++ b/storage/perfschema/table_file_summary_by_instance.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -56,6 +63,7 @@ struct row_file_summary_by_instance
 class table_file_summary_by_instance : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_global_status.cc b/storage/perfschema/table_global_status.cc
index a12f1aa41ec5..54192380869d 100644
--- a/storage/perfschema/table_global_status.cc
+++ b/storage/perfschema/table_global_status.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -46,6 +53,11 @@ TABLE_FIELD_DEF
 table_global_status::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_global_status::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_global_status::m_share=
 {
@@ -58,8 +70,9 @@ table_global_status::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  true   /* perpetual */
+  true, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -174,7 +187,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -190,7 +203,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_global_status.h b/storage/perfschema/table_global_status.h
index 5eee59cb51d2..5b5f6e60c37f 100644
--- a/storage/perfschema/table_global_status.h
+++ b/storage/perfschema/table_global_status.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -61,6 +68,7 @@ class table_global_status : public PFS_engine_table
   typedef PFS_simple_index pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_global_variables.cc b/storage/perfschema/table_global_variables.cc
index c7dbc632fc90..2d43da85b0c9 100644
--- a/storage/perfschema/table_global_variables.cc
+++ b/storage/perfschema/table_global_variables.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -46,6 +53,11 @@ TABLE_FIELD_DEF
 table_global_variables::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_global_variables::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_global_variables::m_share=
 {
@@ -58,8 +70,9 @@ table_global_variables::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  true   /* perpetual */
+  true, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -134,7 +147,7 @@ int table_global_variables::rnd_pos(const void *pos)
     return HA_ERR_RECORD_DELETED;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < m_sysvar_cache.size());
+  assert(m_pos.m_index < m_sysvar_cache.size());
 
   const System_variable *system_var= m_sysvar_cache.get(m_pos.m_index);
   if (system_var != NULL)
@@ -149,7 +162,7 @@ void table_global_variables
 ::make_row(const System_variable *system_var)
 {
   m_row_exists= false;
-  if (system_var->is_null())
+  if (system_var->is_null() || system_var->is_ignored())
     return;
   m_row.m_variable_name.make_row(system_var->m_name, system_var->m_name_length);
   m_row.m_variable_value.make_row(system_var);
@@ -168,7 +181,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -184,7 +197,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_global_variables.h b/storage/perfschema/table_global_variables.h
index e9ad7e59c304..49083e632921 100644
--- a/storage/perfschema/table_global_variables.h
+++ b/storage/perfschema/table_global_variables.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -61,6 +68,7 @@ class table_global_variables : public PFS_engine_table
   typedef PFS_simple_index pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_helper.cc b/storage/perfschema/table_helper.cc
index d0a2ec03f7b5..2a7e16501802 100644
--- a/storage/perfschema/table_helper.cc
+++ b/storage/perfschema/table_helper.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -100,7 +107,7 @@ void PFS_account_row::set_field(uint index, Field *f)
         f->set_null();
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -174,7 +181,7 @@ void PFS_digest_row::set_field(uint index, Field *f)
         f->set_null();
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -311,7 +318,7 @@ void PFS_object_row::set_field(uint index, Field *f)
       PFS_engine_table::set_field_varchar_utf8(f, m_object_name, m_object_name_length);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
   }
 }
 
@@ -338,7 +345,7 @@ void PFS_object_row::set_nullable_field(uint index, Field *f)
         f->set_null();
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
   }
 }
 
@@ -394,7 +401,7 @@ void PFS_index_row::set_field(uint index, Field *f)
         f->set_null();
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
   }
 }
 
@@ -467,7 +474,7 @@ void PFS_statement_stat_row::set_field(uint index, Field *f)
       PFS_engine_table::set_field_ulonglong(f, m_no_good_index_used);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -498,7 +505,7 @@ void PFS_transaction_stat_row::set_field(uint index, Field *f)
       m_read_only_row.set_field(index-10, f);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -514,7 +521,7 @@ void PFS_connection_stat_row::set_field(uint index, Field *f)
       PFS_engine_table::set_field_ulonglong(f, m_total_connections);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -561,7 +568,7 @@ void set_field_object_type(Field *f, enum_object_type object_type)
     break;
   case NO_OBJECT_TYPE:
   default:
-    DBUG_ASSERT(false);
+    assert(false);
     PFS_engine_table::set_field_varchar_utf8(f, "", 0);
     break;
   }
@@ -605,7 +612,7 @@ void set_field_lock_type(Field *f, PFS_TL_LOCK_TYPE lock_type)
     f->set_null();
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -648,7 +655,7 @@ void set_field_mdl_type(Field *f, opaque_mdl_type mdl_type)
     PFS_engine_table::set_field_varchar_utf8(f, "EXCLUSIVE", 9);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -668,7 +675,7 @@ void set_field_mdl_duration(Field *f, opaque_mdl_duration mdl_duration)
     break;
   case MDL_DURATION_END:
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -691,7 +698,7 @@ void set_field_mdl_status(Field *f, opaque_mdl_status mdl_status)
     PFS_engine_table::set_field_varchar_utf8(f, "POST_RELEASE_NOTIFY", 19);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -738,7 +745,7 @@ void PFS_memory_stat_row::set_field(uint index, Field *f)
       PFS_engine_table::set_field_longlong(f, val);
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 }
@@ -760,7 +767,7 @@ void set_field_isolation_level(Field *f, enum_isolation_level iso_level)
     PFS_engine_table::set_field_varchar_utf8(f, "SERIALIZABLE", 12);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
@@ -787,14 +794,14 @@ void set_field_xa_state(Field *f, enum_xa_transaction_state xa_state)
     PFS_engine_table::set_field_varchar_utf8(f, "COMMITTED", 9);
     break;
   default:
-    DBUG_ASSERT(false);
+    assert(false);
   }
 }
 
 void PFS_variable_name_row::make_row(const char* str, size_t length)
 {
-  DBUG_ASSERT(length <= sizeof(m_str));
-  DBUG_ASSERT(length <= NAME_CHAR_LEN);
+  assert(length <= sizeof(m_str));
+  assert(length <= NAME_CHAR_LEN);
 
   m_length= MY_MIN(length, NAME_CHAR_LEN); /* enforce max name length */
   if (m_length > 0)
@@ -814,8 +821,8 @@ void PFS_variable_value_row::make_row(const System_variable *var)
 
 void PFS_variable_value_row::make_row(const CHARSET_INFO *cs, const char* str, size_t length)
 {
-  DBUG_ASSERT(cs != NULL);
-  DBUG_ASSERT(length <= sizeof(m_str));
+  assert(cs != NULL);
+  assert(length <= sizeof(m_str));
   if (length > 0)
   {
     memcpy(m_str, str, length);
diff --git a/storage/perfschema/table_helper.h b/storage/perfschema/table_helper.h
index b3e0c25a4c4f..07dd9b06e128 100644
--- a/storage/perfschema/table_helper.h
+++ b/storage/perfschema/table_helper.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -271,7 +278,7 @@ struct PFS_stat_row
         PFS_engine_table::set_field_ulonglong(f, m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
     }
   }
 };
diff --git a/storage/perfschema/table_host_cache.cc b/storage/perfschema/table_host_cache.cc
index 284923ce277a..a60e6857a0d0 100644
--- a/storage/perfschema/table_host_cache.cc
+++ b/storage/perfschema/table_host_cache.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -180,6 +187,11 @@ TABLE_FIELD_DEF
 table_host_cache::m_field_def=
 { 29, field_types };
 
+PFS_engine_table_share_state
+table_host_cache::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_host_cache::m_share=
 {
@@ -192,8 +204,9 @@ table_host_cache::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_host_cache::create(void)
@@ -202,7 +215,7 @@ PFS_engine_table* table_host_cache::create(void)
   if (t != NULL)
   {
     THD *thd= current_thd;
-    DBUG_ASSERT(thd != NULL);
+    assert(thd != NULL);
     t->materialize(thd);
   }
   return t;
@@ -245,8 +258,8 @@ void table_host_cache::materialize(THD *thd)
   row_host_cache *rows;
   row_host_cache *row;
 
-  DBUG_ASSERT(m_all_rows == NULL);
-  DBUG_ASSERT(m_row_count == 0);
+  assert(m_all_rows == NULL);
+  assert(m_row_count == 0);
 
   hostname_cache_lock();
 
@@ -359,7 +372,7 @@ int table_host_cache::rnd_next(void)
 int table_host_cache::rnd_pos(const void *pos)
 {
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < m_row_count);
+  assert(m_pos.m_index < m_row_count);
   m_row= &m_all_rows[m_pos.m_index];
   return 0;
 }
@@ -371,10 +384,10 @@ int table_host_cache::read_row_values(TABLE *table,
 {
   Field *f;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -480,7 +493,7 @@ int table_host_cache::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_host_cache.h b/storage/perfschema/table_host_cache.h
index 66d7966066c1..c6777d6517d6 100644
--- a/storage/perfschema/table_host_cache.h
+++ b/storage/perfschema/table_host_cache.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -100,6 +107,7 @@ struct row_host_cache
 class table_host_cache : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_hosts.cc b/storage/perfschema/table_hosts.cc
index 06ae8c23d955..872d140d4940 100644
--- a/storage/perfschema/table_hosts.cc
+++ b/storage/perfschema/table_hosts.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -50,6 +57,11 @@ TABLE_FIELD_DEF
 table_hosts::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_hosts::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_hosts::m_share=
 {
@@ -62,8 +74,9 @@ table_hosts::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_hosts::create()
@@ -137,7 +150,7 @@ int table_hosts::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -154,7 +167,7 @@ int table_hosts::read_row_values(TABLE *table,
         m_row.m_connection_stat.set_field(f->field_index - 1, f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_hosts.h b/storage/perfschema/table_hosts.h
index 7687db2ee211..b64f447fc9b8 100644
--- a/storage/perfschema/table_hosts.h
+++ b/storage/perfschema/table_hosts.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -42,6 +49,7 @@ struct row_hosts
 class table_hosts : public cursor_by_host
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_md_locks.cc b/storage/perfschema/table_md_locks.cc
index d0967af732de..f3d66b40ca8f 100644
--- a/storage/perfschema/table_md_locks.cc
+++ b/storage/perfschema/table_md_locks.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -88,6 +95,11 @@ TABLE_FIELD_DEF
 table_metadata_locks::m_field_def=
 { 10, field_types };
 
+PFS_engine_table_share_state
+table_metadata_locks::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_metadata_locks::m_share=
 {
@@ -100,8 +112,9 @@ table_metadata_locks::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_metadata_locks::create(void)
@@ -162,8 +175,6 @@ int table_metadata_locks::rnd_pos(const void *pos)
 void table_metadata_locks::make_row(PFS_metadata_lock *pfs)
 {
   pfs_optimistic_state lock;
-  const char *base;
-  const char *safe_source_file;
 
   m_row_exists= false;
 
@@ -175,20 +186,8 @@ void table_metadata_locks::make_row(PFS_metadata_lock *pfs)
   m_row.m_mdl_duration= pfs->m_mdl_duration;
   m_row.m_mdl_status= pfs->m_mdl_status;
 
-  safe_source_file= pfs->m_src_file;
-  if (safe_source_file != NULL)
-  {
-    base= base_name(safe_source_file);
-    m_row.m_source_length= my_snprintf(m_row.m_source,
-                                       sizeof(m_row.m_source),
-                                       "%s:%d", base, pfs->m_src_line);
-    if (m_row.m_source_length > sizeof(m_row.m_source))
-      m_row.m_source_length= sizeof(m_row.m_source);
-  }
-  else
-  {
-    m_row.m_source_length= 0;
-  }
+  /* Disable source file and line to avoid stale __FILE__ pointers. */
+  m_row.m_source_length= 0;
 
   m_row.m_owner_thread_id= static_cast<ulong>(pfs->m_owner_thread_id);
   m_row.m_owner_event_id= static_cast<ulong>(pfs->m_owner_event_id);
@@ -211,7 +210,7 @@ int table_metadata_locks::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -253,7 +252,7 @@ int table_metadata_locks::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_md_locks.h b/storage/perfschema/table_md_locks.h
index eba03218333b..5c9ad9b56381 100644
--- a/storage/perfschema/table_md_locks.h
+++ b/storage/perfschema/table_md_locks.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -56,6 +63,7 @@ struct row_metadata_lock
 class table_metadata_locks : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_mems_by_account_by_event_name.cc b/storage/perfschema/table_mems_by_account_by_event_name.cc
index e425d22effd4..3d90c743ff86 100644
--- a/storage/perfschema/table_mems_by_account_by_event_name.cc
+++ b/storage/perfschema/table_mems_by_account_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -105,6 +112,11 @@ TABLE_FIELD_DEF
 table_mems_by_account_by_event_name::m_field_def=
 { 13, field_types };
 
+PFS_engine_table_share_state
+table_mems_by_account_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mems_by_account_by_event_name::m_share=
 {
@@ -117,8 +129,9 @@ table_mems_by_account_by_event_name::m_share=
   sizeof(pos_mems_by_account_by_event_name),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mems_by_account_by_event_name::create(void)
@@ -247,7 +260,7 @@ int table_mems_by_account_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_mems_by_account_by_event_name.h b/storage/perfschema/table_mems_by_account_by_event_name.h
index 54cf7a42d828..e242bc40ac6e 100644
--- a/storage/perfschema/table_mems_by_account_by_event_name.h
+++ b/storage/perfschema/table_mems_by_account_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -78,6 +85,7 @@ struct pos_mems_by_account_by_event_name
 class table_mems_by_account_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_mems_by_host_by_event_name.cc b/storage/perfschema/table_mems_by_host_by_event_name.cc
index fe42a06d870f..0f322537b994 100644
--- a/storage/perfschema/table_mems_by_host_by_event_name.cc
+++ b/storage/perfschema/table_mems_by_host_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -100,6 +107,11 @@ TABLE_FIELD_DEF
 table_mems_by_host_by_event_name::m_field_def=
 { 12, field_types };
 
+PFS_engine_table_share_state
+table_mems_by_host_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mems_by_host_by_event_name::m_share=
 {
@@ -112,8 +124,9 @@ table_mems_by_host_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mems_by_host_by_event_name::create(void)
@@ -244,7 +257,7 @@ int table_mems_by_host_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_mems_by_host_by_event_name.h b/storage/perfschema/table_mems_by_host_by_event_name.h
index 03b914fe1379..7920b362b5ea 100644
--- a/storage/perfschema/table_mems_by_host_by_event_name.h
+++ b/storage/perfschema/table_mems_by_host_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -78,6 +85,7 @@ struct pos_mems_by_host_by_event_name
 class table_mems_by_host_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_mems_by_thread_by_event_name.cc b/storage/perfschema/table_mems_by_thread_by_event_name.cc
index 47a837ebb131..c2ddf7e7920f 100644
--- a/storage/perfschema/table_mems_by_thread_by_event_name.cc
+++ b/storage/perfschema/table_mems_by_thread_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -100,6 +107,11 @@ TABLE_FIELD_DEF
 table_mems_by_thread_by_event_name::m_field_def=
 { 12, field_types };
 
+PFS_engine_table_share_state
+table_mems_by_thread_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mems_by_thread_by_event_name::m_share=
 {
@@ -112,8 +124,9 @@ table_mems_by_thread_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mems_by_thread_by_event_name::create(void)
@@ -238,7 +251,7 @@ int table_mems_by_thread_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_mems_by_thread_by_event_name.h b/storage/perfschema/table_mems_by_thread_by_event_name.h
index da9f7df249d0..0f698990b477 100644
--- a/storage/perfschema/table_mems_by_thread_by_event_name.h
+++ b/storage/perfschema/table_mems_by_thread_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -78,6 +85,7 @@ struct pos_mems_by_thread_by_event_name
 class table_mems_by_thread_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_mems_by_user_by_event_name.cc b/storage/perfschema/table_mems_by_user_by_event_name.cc
index 726dad620c93..39fbc231664a 100644
--- a/storage/perfschema/table_mems_by_user_by_event_name.cc
+++ b/storage/perfschema/table_mems_by_user_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -100,6 +107,11 @@ TABLE_FIELD_DEF
 table_mems_by_user_by_event_name::m_field_def=
 { 12, field_types };
 
+PFS_engine_table_share_state
+table_mems_by_user_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mems_by_user_by_event_name::m_share=
 {
@@ -112,8 +124,9 @@ table_mems_by_user_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mems_by_user_by_event_name::create(void)
@@ -244,7 +257,7 @@ int table_mems_by_user_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_mems_by_user_by_event_name.h b/storage/perfschema/table_mems_by_user_by_event_name.h
index d247efa31e61..c17f5d3302bc 100644
--- a/storage/perfschema/table_mems_by_user_by_event_name.h
+++ b/storage/perfschema/table_mems_by_user_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -78,6 +85,7 @@ struct pos_mems_by_user_by_event_name
 class table_mems_by_user_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_mems_global_by_event_name.cc b/storage/perfschema/table_mems_global_by_event_name.cc
index 6924fb4e8f4b..e637486d7804 100644
--- a/storage/perfschema/table_mems_global_by_event_name.cc
+++ b/storage/perfschema/table_mems_global_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -95,6 +102,11 @@ TABLE_FIELD_DEF
 table_mems_global_by_event_name::m_field_def=
 { 11, field_types };
 
+PFS_engine_table_share_state
+table_mems_global_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mems_global_by_event_name::m_share=
 {
@@ -107,8 +119,9 @@ table_mems_global_by_event_name::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mems_global_by_event_name::create(void)
@@ -264,7 +277,7 @@ int table_mems_global_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
diff --git a/storage/perfschema/table_mems_global_by_event_name.h b/storage/perfschema/table_mems_global_by_event_name.h
index 029f5b4c781d..ae3cd0435d69 100644
--- a/storage/perfschema/table_mems_global_by_event_name.h
+++ b/storage/perfschema/table_mems_global_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -80,6 +87,7 @@ class table_mems_global_by_event_name : public PFS_engine_table
   typedef pos_mems_global_by_event_name pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_os_global_by_type.cc b/storage/perfschema/table_os_global_by_type.cc
index c86047141213..27c154ce2db4 100644
--- a/storage/perfschema/table_os_global_by_type.cc
+++ b/storage/perfschema/table_os_global_by_type.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -78,6 +85,11 @@ TABLE_FIELD_DEF
 table_os_global_by_type::m_field_def=
 { 8, field_types };
 
+PFS_engine_table_share_state
+table_os_global_by_type::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_os_global_by_type::m_share=
 {
@@ -90,8 +102,9 @@ table_os_global_by_type::m_share=
   sizeof(pos_os_global_by_type),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -291,7 +304,7 @@ int table_os_global_by_type::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -327,7 +340,7 @@ int table_os_global_by_type::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.m_stat.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_os_global_by_type.h b/storage/perfschema/table_os_global_by_type.h
index a0cc0019200f..171ff388c9c6 100644
--- a/storage/perfschema/table_os_global_by_type.h
+++ b/storage/perfschema/table_os_global_by_type.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -79,6 +86,7 @@ struct pos_os_global_by_type : public PFS_double_index,
 class table_os_global_by_type : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_performance_timers.cc b/storage/perfschema/table_performance_timers.cc
index bb1529b05174..c22b555e85f5 100644
--- a/storage/perfschema/table_performance_timers.cc
+++ b/storage/perfschema/table_performance_timers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -56,6 +63,11 @@ TABLE_FIELD_DEF
 table_performance_timers::m_field_def=
 { 4, field_types };
 
+PFS_engine_table_share_state
+table_performance_timers::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_performance_timers::m_share=
 {
@@ -68,8 +80,9 @@ table_performance_timers::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_performance_timers::create(void)
@@ -140,7 +153,7 @@ int table_performance_timers::rnd_next(void)
 int table_performance_timers::rnd_pos(const void *pos)
 {
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < COUNT_TIMER_NAME);
+  assert(m_pos.m_index < COUNT_TIMER_NAME);
   m_row= &m_data[m_pos.m_index];
   return 0;
 }
@@ -152,10 +165,10 @@ int table_performance_timers::read_row_values(TABLE *table,
 {
   Field *f;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -186,7 +199,7 @@ int table_performance_timers::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_performance_timers.h b/storage/perfschema/table_performance_timers.h
index d4ea510aac5c..9a75f1e1bf41 100644
--- a/storage/perfschema/table_performance_timers.h
+++ b/storage/perfschema/table_performance_timers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -46,6 +53,7 @@ struct row_performance_timers
 class table_performance_timers : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_prepared_stmt_instances.cc b/storage/perfschema/table_prepared_stmt_instances.cc
index 9cae5c72567a..68e3da09f4e1 100644
--- a/storage/perfschema/table_prepared_stmt_instances.cc
+++ b/storage/perfschema/table_prepared_stmt_instances.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -217,6 +224,11 @@ TABLE_FIELD_DEF
 table_prepared_stmt_instances::m_field_def=
 { 35, field_types };
 
+PFS_engine_table_share_state
+table_prepared_stmt_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_prepared_stmt_instances::m_share=
 {
@@ -229,8 +241,9 @@ table_prepared_stmt_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -360,7 +373,7 @@ ::read_row_values(TABLE *table, unsigned char *buf, Field **fields,
   /*
     Set the null bits.
   */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
diff --git a/storage/perfschema/table_prepared_stmt_instances.h b/storage/perfschema/table_prepared_stmt_instances.h
index 709cbfa8d354..8bd9acafce5a 100644
--- a/storage/perfschema/table_prepared_stmt_instances.h
+++ b/storage/perfschema/table_prepared_stmt_instances.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -80,6 +87,7 @@ struct row_prepared_stmt_instances
 class table_prepared_stmt_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_processlist.cc b/storage/perfschema/table_processlist.cc
new file mode 100644
index 000000000000..3098a2bbe246
--- /dev/null
+++ b/storage/perfschema/table_processlist.cc
@@ -0,0 +1,406 @@
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/**
+  @file storage/perfschema/table_processlist.cc
+  TABLE PROCESSLIST.
+*/
+
+#include "my_global.h"
+
+#include "table_processlist.h"
+
+#include <assert.h>
+// #include "lex_string.h"
+#include "my_compiler.h"
+
+#include "my_thread.h"
+#include "auth_acls.h"
+#include "field.h"
+#include "sql_class.h"
+#include "sql_parse.h"
+#include "table.h"
+#include "pfs_buffer_container.h"
+#include "pfs_global.h"
+#include "pfs_instr.h"
+#include "pfs_instr_class.h"
+
+THR_LOCK table_processlist::m_table_lock;
+
+static const TABLE_FIELD_TYPE field_types[] =
+{
+  {
+    { C_STRING_WITH_LEN("ID") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("USER") },
+    { C_STRING_WITH_LEN("varchar(" USERNAME_CHAR_LENGTH_STR ")") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("HOST") },
+    { C_STRING_WITH_LEN("varchar(" HOST_AND_PORT_LENGTH_STR ")") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("DB") },
+    { C_STRING_WITH_LEN("varchar(64)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("COMMAND") },
+    { C_STRING_WITH_LEN("varchar(16)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("TIME") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("STATE") },
+    { C_STRING_WITH_LEN("varchar(64)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("INFO") },
+    { C_STRING_WITH_LEN("longtext") },
+    { NULL, 0}
+  },
+};
+
+TABLE_FIELD_DEF
+table_processlist::m_field_def = {8, field_types};
+
+PFS_engine_table_share_state
+table_processlist::m_share_state = {
+  false /* m_checked */
+};
+
+PFS_engine_table_share table_processlist::m_share = {
+  {C_STRING_WITH_LEN("processlist")},
+  &pfs_readonly_processlist_acl,
+  table_processlist::create,
+  NULL, /* write_row */
+  NULL, /* delete_all_rows */
+  cursor_by_thread::get_row_count,
+  sizeof(PFS_simple_index), /* ref length */
+  &m_table_lock,
+  &m_field_def,
+  false, /* m_perpetual */
+  true, /* m_optional */
+  &m_share_state
+};
+
+PFS_engine_table *table_processlist::create() {
+  return new table_processlist();
+}
+
+table_processlist::table_processlist()
+    : cursor_by_thread(&m_share), m_row_exists(false) {
+  m_row_priv.m_auth = PROCESSLIST_DENIED;
+}
+
+int table_processlist::set_access(void) {
+  THD *thd = current_thd;
+  if (thd == NULL) {
+    /* Robustness, no user session. */
+    m_row_priv.m_auth = PROCESSLIST_DENIED;
+    return 0;
+  }
+
+  if (thd->security_context()->check_access(PROCESS_ACL)) {
+    /* PROCESS_ACL granted. */
+    m_row_priv.m_auth = PROCESSLIST_ALL;
+    return 0;
+  }
+
+  LEX_CSTRING client_priv_user = thd->security_context()->priv_user();
+  if (client_priv_user.length == 0) {
+    /* Anonymous user. */
+    m_row_priv.m_auth = PROCESSLIST_DENIED;
+    return 0;
+  }
+
+  /* Authenticated user, PROCESS_ACL not granted. */
+  m_row_priv.m_auth = PROCESSLIST_USER_ONLY;
+  m_row_priv.m_priv_user_length =
+      std::min(client_priv_user.length, sizeof(m_row_priv.m_priv_user));
+  memcpy(m_row_priv.m_priv_user, client_priv_user.str,
+         m_row_priv.m_priv_user_length);
+  return 0;
+}
+
+int table_processlist::rnd_init(bool scan) {
+  set_access();
+  return 0;
+}
+
+void table_processlist::make_row(PFS_thread *pfs) {
+  pfs_optimistic_state lock;
+  pfs_optimistic_state session_lock;
+  pfs_optimistic_state stmt_lock;
+  PFS_stage_class *stage_class;
+  PFS_thread_class *safe_class;
+
+  m_row_exists = false;
+
+  if (m_row_priv.m_auth == PROCESSLIST_DENIED) {
+    return;
+  }
+
+  /* Protect this reader against thread termination */
+  pfs->m_lock.begin_optimistic_lock(&lock);
+
+  safe_class = sanitize_thread_class(pfs->m_class);
+  if (unlikely(safe_class == NULL)) {
+    return;
+  }
+
+  /* Ignore background threads. */
+  if (pfs->m_username_length == 0 || pfs->m_processlist_id == 0) return;
+
+  m_row.m_processlist_id = pfs->m_processlist_id;
+
+  /* Protect this reader against session attribute changes */
+  pfs->m_session_lock.begin_optimistic_lock(&session_lock);
+
+  /* Maintain user/host compatibility with the legacy SHOW PROCESSLIST. */
+  const char *username = pfs->m_username;
+  uint username_len = pfs->m_username_length;
+  uint hostname_len = pfs->m_hostname_length;
+
+  if (pfs->m_class->is_system_thread()) {
+    if (username_len == 0 ||
+        (!strncmp(username, "root", 4) && username_len == 4)) {
+      username = "system user";
+      username_len = strlen(username);
+      hostname_len = 0;
+    }
+  } else {
+    if (username_len == 0) {
+      username = "unauthenticated user";
+      username_len = strlen(username);
+      hostname_len = 0;
+    }
+  }
+
+  m_row.m_username_length = username_len;
+  if (unlikely(m_row.m_username_length > sizeof(m_row.m_username))) {
+    return;
+  }
+
+  if (m_row.m_username_length != 0) {
+    memcpy(m_row.m_username, username, username_len);
+  }
+
+  m_row.m_hostname_length = hostname_len;
+  if (unlikely(m_row.m_hostname_length > sizeof(m_row.m_hostname))) {
+    return;
+  }
+
+  if (m_row.m_hostname_length != 0) {
+    memcpy(m_row.m_hostname, pfs->m_hostname, m_row.m_hostname_length);
+  }
+
+  if (!pfs->m_session_lock.end_optimistic_lock(&session_lock)) {
+    /*
+      One of the columns:
+      - USER
+      - HOST
+      is being updated.
+      Do not discard the entire row.
+      Do not loop waiting for a stable value.
+      Just return NULL values.
+    */
+    m_row.m_username_length = 0;
+    m_row.m_hostname_length = 0;
+  }
+
+  /* Enforce row filtering. */
+  if (m_row_priv.m_auth == PROCESSLIST_USER_ONLY) {
+    if (m_row.m_username_length != m_row_priv.m_priv_user_length) {
+      return;
+    }
+    if (strncmp(m_row.m_username, m_row_priv.m_priv_user,
+                m_row_priv.m_priv_user_length) != 0) {
+      return;
+    }
+  }
+
+  /* Protect this reader against statement attributes changes */
+  pfs->m_stmt_lock.begin_optimistic_lock(&stmt_lock);
+
+  m_row.m_dbname_length = pfs->m_dbname_length;
+  if (unlikely(m_row.m_dbname_length > sizeof(m_row.m_dbname))) {
+    return;
+  }
+
+  if (m_row.m_dbname_length != 0) {
+    memcpy(m_row.m_dbname, pfs->m_dbname, m_row.m_dbname_length);
+  }
+
+  m_row.m_processlist_info_ptr = &pfs->m_processlist_info[0];
+  m_row.m_processlist_info_length = pfs->m_processlist_info_length;
+
+  if (!pfs->m_stmt_lock.end_optimistic_lock(&stmt_lock)) {
+    /*
+      One of the columns:
+      - DB
+      - INFO
+      is being updated.
+      Do not discard the entire row.
+      Do not loop waiting for a stable value.
+      Just return NULL values.
+    */
+    m_row.m_dbname_length = 0;
+    m_row.m_processlist_info_length = 0;
+  }
+
+  /* Dirty read, sanitize the command. */
+  m_row.m_command = pfs->m_command;
+  if ((m_row.m_command < 0) || (m_row.m_command > COM_END)) {
+    m_row.m_command = COM_END;
+  }
+
+  m_row.m_start_time = pfs->m_start_time;
+
+  stage_class = find_stage_class(pfs->m_stage);
+  if (stage_class != NULL) {
+    m_row.m_processlist_state_ptr =
+        stage_class->m_name + stage_class->m_prefix_length;
+    m_row.m_processlist_state_length =
+        stage_class->m_name_length - stage_class->m_prefix_length;
+    if (m_row.m_processlist_state_length > 64) {
+      /*
+        Column STATE is VARCHAR(64)
+        for compatibility reasons with the historical
+        INFORMATION_SCHEMA.PROCESSLIST table.
+        Stages however can have longer names.
+        We silently truncate data here,
+        so it fits into STATE.
+      */
+      m_row.m_processlist_state_length = 64;
+    }
+  } else {
+    m_row.m_processlist_state_ptr = "";
+    m_row.m_processlist_state_length = 0;
+  }
+
+  m_row.m_port = pfs->m_peer_port;
+
+  if (m_row.m_hostname_length > 0 && m_row.m_port != 0) {
+    /* Create HOST:PORT. */
+    char str_port[10];
+    sprintf(str_port, ":%d", m_row.m_port);
+    std::string host(m_row.m_hostname, m_row.m_hostname_length);
+    std::string host_ip = host + str_port;
+    m_row.m_hostname_length =
+        std::min((int)HOST_AND_PORT_LENGTH, (int)host_ip.length());
+    memcpy(m_row.m_hostname, host_ip.c_str(), m_row.m_hostname_length);
+  }
+
+  if (!pfs->m_lock.end_optimistic_lock(&lock)) {
+    return;
+  }
+
+  m_row_exists = true;
+  return;
+}
+
+int table_processlist::read_row_values(TABLE *table, unsigned char *buf,
+                                       Field **fields, bool read_all) {
+  Field *f;
+
+  if (unlikely(!m_row_exists)) {
+    return HA_ERR_RECORD_DELETED;
+  }
+
+  /* Set the null bits */
+  assert(table->s->null_bytes == 1);
+  buf[0] = 0;
+
+  for (; (f = *fields); fields++) {
+    if (read_all || bitmap_is_set(table->read_set, f->field_index)) {
+      switch (f->field_index) {
+        case 0: /* ID */
+          set_field_ulonglong(f, m_row.m_processlist_id);
+          break;
+        case 1: /* USER */
+          if (m_row.m_username_length > 0) {
+            set_field_varchar_utf8(f, m_row.m_username,
+                                   m_row.m_username_length);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 2: /* HOST */
+          if (m_row.m_hostname_length > 0) {
+            set_field_varchar_utf8(f, m_row.m_hostname,
+                                   m_row.m_hostname_length);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 3: /* DB */
+          if (m_row.m_dbname_length > 0) {
+            set_field_varchar_utf8(f, m_row.m_dbname, m_row.m_dbname_length);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 4: /* COMMAND */
+          set_field_varchar_utf8(f, command_name[m_row.m_command].str,
+                                 command_name[m_row.m_command].length);
+          break;
+        case 5: /* TIME */
+          if (m_row.m_start_time) {
+            time_t now = my_time(0);
+            ulonglong elapsed =
+                (now > m_row.m_start_time ? now - m_row.m_start_time : 0);
+            set_field_ulonglong(f, elapsed);
+          } else {
+            f->set_null();
+          }
+          break;
+        case 6: /* STATE */
+          /* For compatibility, leave blank if state is NULL. */
+          set_field_varchar_utf8(f, m_row.m_processlist_state_ptr,
+                                 m_row.m_processlist_state_length);
+          break;
+        case 7: /* INFO */
+          if (m_row.m_processlist_info_length > 0)
+            set_field_blob(f, m_row.m_processlist_info_ptr,
+                           m_row.m_processlist_info_length);
+          else {
+            f->set_null();
+          }
+          break;
+        default:
+          assert(false);
+      }
+    }
+  }
+  return 0;
+}
diff --git a/storage/perfschema/table_processlist.h b/storage/perfschema/table_processlist.h
new file mode 100644
index 000000000000..94978d2ebe7e
--- /dev/null
+++ b/storage/perfschema/table_processlist.h
@@ -0,0 +1,133 @@
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License, version 2.0, for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef TABLE_PROCESSLIST_H
+#define TABLE_PROCESSLIST_H
+
+/**
+  @file storage/perfschema/table_processlist.h
+  TABLE THREADS.
+*/
+
+#include <sys/types.h>
+#include <time.h>
+#include <algorithm>
+
+#include "my_hostname.h"
+// #include "my_inttypes.h"
+#include "cursor_by_thread.h"
+#include "pfs_column_types.h"
+
+struct PFS_thread;
+
+/**
+  @addtogroup performance_schema_tables
+  @{
+*/
+
+/**
+  A row of PERFORMANCE_SCHEMA.PROCESSLIST.
+*/
+struct row_processlist {
+  /** Column ID. */
+  ulonglong m_processlist_id;
+  /** Column USER. */
+  char m_username[USERNAME_LENGTH];
+  /** Length in bytes of @c m_username. */
+  uint m_username_length;
+  /** Column HOST. */
+  char m_hostname[HOST_AND_PORT_LENGTH];
+  /** Length in bytes of @c m_hostname. */
+  uint m_hostname_length;
+  /** Port. */
+  uint m_port;
+  /** Column DB. */
+  char m_dbname[NAME_LEN];
+  /** Length in bytes of @c m_dbname. */
+  uint m_dbname_length;
+  /** Column COMMAND. */
+  int m_command;
+  /** Column TIME. */
+  time_t m_start_time;
+  /** Column STATE. */
+  const char *m_processlist_state_ptr;
+  /** Length in bytes of @c m_processlist_state_ptr. */
+  uint m_processlist_state_length;
+  /** Column INFO. */
+  const char *m_processlist_info_ptr;
+  /** Length in bytes of @c m_processlist_info_ptr. */
+  uint m_processlist_info_length;
+};
+
+enum enum_priv_processlist {
+  /** User is not allowed to see any data. */
+  PROCESSLIST_DENIED,
+  /** User does not have the PROCESS_ACL priviledge. */
+  PROCESSLIST_USER_ONLY,
+  /** User has the PROCESS_ACL priviledge. */
+  PROCESSLIST_ALL
+};
+
+struct row_priv_processlist {
+  enum enum_priv_processlist m_auth;
+  char m_priv_user[USERNAME_LENGTH];
+  size_t m_priv_user_length;
+};
+
+/** Table PERFORMANCE_SCHEMA.PROCESSLIST. */
+class table_processlist : public cursor_by_thread {
+ public:
+  static PFS_engine_table_share_state m_share_state;
+  /** Table share */
+  static PFS_engine_table_share m_share;
+  /** Table builder */
+  static PFS_engine_table *create();
+
+ protected:
+  table_processlist();
+
+  virtual int rnd_init(bool scan);
+
+  virtual int read_row_values(TABLE *table, unsigned char *buf, Field **fields,
+                      bool read_all);
+  int set_access(void);
+
+ public:
+  virtual ~table_processlist() {}
+
+ private:
+  virtual void make_row(PFS_thread *pfs);
+  /** Table share lock. */
+  static THR_LOCK m_table_lock;
+  /** Fields definition. */
+  static TABLE_FIELD_DEF m_field_def;
+
+  /** Current row. */
+  row_processlist m_row;
+  /** Row privileges. */
+  row_priv_processlist m_row_priv;
+  /** True if the current row exists. */
+  bool m_row_exists;
+};
+
+/** @} */
+#endif
diff --git a/storage/perfschema/table_replication_applier_configuration.cc b/storage/perfschema/table_replication_applier_configuration.cc
index a88e0f82846d..9c13964b960e 100644
--- a/storage/perfschema/table_replication_applier_configuration.cc
+++ b/storage/perfschema/table_replication_applier_configuration.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -56,6 +63,11 @@ TABLE_FIELD_DEF
 table_replication_applier_configuration::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_replication_applier_configuration::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_applier_configuration::m_share=
 {
@@ -65,11 +77,12 @@ table_replication_applier_configuration::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_applier_configuration::get_row_count,
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_applier_configuration::create(void)
@@ -103,12 +116,10 @@ ha_rows table_replication_applier_configuration::get_row_count()
 int table_replication_applier_configuration::rnd_next(void)
 {
   Master_info *mi;
-  int res= HA_ERR_END_OF_FILE;
-
   channel_map.rdlock();
 
   for (m_pos.set_at(&m_next_pos);
-       m_pos.m_index < channel_map.get_max_channels() && res != 0;
+       m_pos.m_index < channel_map.get_max_channels();
        m_pos.next())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index);
@@ -117,12 +128,13 @@ int table_replication_applier_configuration::rnd_next(void)
     {
       make_row(mi);
       m_next_pos.set_after(&m_pos);
-      res= 0;
+      channel_map.unlock();
+      return 0;
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 int table_replication_applier_configuration::rnd_pos(const void *pos)
@@ -148,8 +160,8 @@ void table_replication_applier_configuration::make_row(Master_info *mi)
 {
   m_row_exists= false;
 
-  DBUG_ASSERT(mi != NULL);
-  DBUG_ASSERT(mi->rli != NULL);
+  assert(mi != NULL);
+  assert(mi->rli != NULL);
 
   mysql_mutex_lock(&mi->data_lock);
   mysql_mutex_lock(&mi->rli->data_lock);
@@ -184,7 +196,7 @@ int table_replication_applier_configuration::read_row_values(TABLE *table,
     the table record reserves an extra null byte, see open_binary_frm().
   */
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -200,7 +212,7 @@ int table_replication_applier_configuration::read_row_values(TABLE *table,
         set_field_ulong(f, static_cast<ulong>(m_row.desired_delay));
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_applier_configuration.h b/storage/perfschema/table_replication_applier_configuration.h
index e5ec69a64b8e..77dbbb8d50fd 100644
--- a/storage/perfschema/table_replication_applier_configuration.h
+++ b/storage/perfschema/table_replication_applier_configuration.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -48,6 +55,8 @@ struct st_row_applier_config {
 /** Table PERFORMANCE_SCHEMA.replication_applier_configuration */
 class table_replication_applier_configuration: public PFS_engine_table
 {
+  typedef PFS_simple_index pos_t;
+
 private:
   void make_row(Master_info *mi);
 
@@ -60,9 +69,9 @@ class table_replication_applier_configuration: public PFS_engine_table
   /** True is the current row exists. */
   bool m_row_exists;
   /** Current position. */
-  PFS_simple_index m_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -83,6 +92,7 @@ class table_replication_applier_configuration: public PFS_engine_table
 public:
   ~table_replication_applier_configuration();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_applier_status.cc b/storage/perfschema/table_replication_applier_status.cc
index e0824b056feb..1aa6b90cb43e 100644
--- a/storage/perfschema/table_replication_applier_status.cc
+++ b/storage/perfschema/table_replication_applier_status.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -65,6 +72,11 @@ TABLE_FIELD_DEF
 table_replication_applier_status::m_field_def=
 { 4, field_types };
 
+PFS_engine_table_share_state
+table_replication_applier_status::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_applier_status::m_share=
 {
@@ -74,11 +86,12 @@ table_replication_applier_status::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_applier_status::get_row_count,    /* records */
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 
@@ -110,12 +123,10 @@ ha_rows table_replication_applier_status::get_row_count()
 int table_replication_applier_status::rnd_next(void)
 {
   Master_info *mi;
-  int res= HA_ERR_END_OF_FILE;
-
   channel_map.rdlock();
 
   for(m_pos.set_at(&m_next_pos);
-      m_pos.m_index < channel_map.get_max_channels() && res != 0;
+      m_pos.m_index < channel_map.get_max_channels();
       m_pos.next())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index);
@@ -124,12 +135,13 @@ int table_replication_applier_status::rnd_next(void)
     {
       make_row(mi);
       m_next_pos.set_after(&m_pos);
-      res= 0;
+      channel_map.unlock();
+      return 0;
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 
@@ -158,8 +170,8 @@ void table_replication_applier_status::make_row(Master_info *mi)
 
   m_row_exists= false;
 
-  DBUG_ASSERT(mi != NULL);
-  DBUG_ASSERT(mi->rli != NULL);
+  assert(mi != NULL);
+  assert(mi->rli != NULL);
 
   m_row.channel_name_length= mi->get_channel()? strlen(mi->get_channel()):0;
   memcpy(m_row.channel_name, mi->get_channel(), m_row.channel_name_length);
@@ -209,7 +221,7 @@ int table_replication_applier_status::read_row_values(TABLE *table,
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -234,7 +246,7 @@ int table_replication_applier_status::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.count_transactions_retries);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_applier_status.h b/storage/perfschema/table_replication_applier_status.h
index 955439be6daf..1c1beb0f8b76 100644
--- a/storage/perfschema/table_replication_applier_status.h
+++ b/storage/perfschema/table_replication_applier_status.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -59,6 +66,8 @@ struct st_row_applier_status {
 /** Table PERFORMANCE_SCHEMA.replication_applier_status */
 class table_replication_applier_status: public PFS_engine_table
 {
+  typedef PFS_simple_index pos_t;
+
 private:
   void make_row(Master_info *mi);
 
@@ -71,9 +80,9 @@ class table_replication_applier_status: public PFS_engine_table
   /** True is the current row exists. */
   bool m_row_exists;
   /** Current position. */
-  PFS_simple_index m_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -94,6 +103,7 @@ class table_replication_applier_status: public PFS_engine_table
 public:
   ~table_replication_applier_status();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_applier_status_by_coordinator.cc b/storage/perfschema/table_replication_applier_status_by_coordinator.cc
index 5f2427bed67f..1d16b14104f4 100644
--- a/storage/perfschema/table_replication_applier_status_by_coordinator.cc
+++ b/storage/perfschema/table_replication_applier_status_by_coordinator.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -76,6 +83,11 @@ TABLE_FIELD_DEF
 table_replication_applier_status_by_coordinator::m_field_def=
 { 6, field_types };
 
+PFS_engine_table_share_state
+table_replication_applier_status_by_coordinator::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_applier_status_by_coordinator::m_share=
 {
@@ -85,11 +97,12 @@ table_replication_applier_status_by_coordinator::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_applier_status_by_coordinator::get_row_count,
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_applier_status_by_coordinator::create(void)
@@ -122,12 +135,10 @@ ha_rows table_replication_applier_status_by_coordinator::get_row_count()
 int table_replication_applier_status_by_coordinator::rnd_next(void)
 {
   Master_info *mi;
-  int res= HA_ERR_END_OF_FILE;
-
   channel_map.rdlock();
 
   for(m_pos.set_at(&m_next_pos);
-      m_pos.m_index < channel_map.get_max_channels() && res != 0;
+      m_pos.m_index < channel_map.get_max_channels();
       m_pos.next())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index);
@@ -144,12 +155,13 @@ int table_replication_applier_status_by_coordinator::rnd_next(void)
     {
       make_row(mi);
       m_next_pos.set_after(&m_pos);
-      res= 0;
+      channel_map.unlock();
+      return 0;
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 int table_replication_applier_status_by_coordinator::rnd_pos(const void *pos)
@@ -175,8 +187,8 @@ void table_replication_applier_status_by_coordinator::make_row(Master_info *mi)
 {
   m_row_exists= false;
 
-  DBUG_ASSERT(mi != NULL);
-  DBUG_ASSERT(mi->rli != NULL);
+  assert(mi != NULL);
+  assert(mi->rli != NULL);
 
   mysql_mutex_lock(&mi->rli->data_lock);
 
@@ -236,7 +248,7 @@ int table_replication_applier_status_by_coordinator
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -268,7 +280,7 @@ int table_replication_applier_status_by_coordinator
         set_field_timestamp(f, m_row.last_error_timestamp);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_applier_status_by_coordinator.h b/storage/perfschema/table_replication_applier_status_by_coordinator.h
index 30a1f39ee466..ef6bf07b68bf 100644
--- a/storage/perfschema/table_replication_applier_status_by_coordinator.h
+++ b/storage/perfschema/table_replication_applier_status_by_coordinator.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -65,6 +72,8 @@ struct st_row_coordinator {
 /** Table PERFORMANCE_SCHEMA.replication_applier_status_by_coordinator */
 class table_replication_applier_status_by_coordinator: public PFS_engine_table
 {
+  typedef PFS_simple_index pos_t;
+
 private:
   void make_row(Master_info *mi);
 
@@ -77,9 +86,9 @@ class table_replication_applier_status_by_coordinator: public PFS_engine_table
   /** True is the current row exists. */
   bool m_row_exists;
   /** Current position. */
-  PFS_simple_index m_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -100,6 +109,7 @@ class table_replication_applier_status_by_coordinator: public PFS_engine_table
 public:
   ~table_replication_applier_status_by_coordinator();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_applier_status_by_worker.cc b/storage/perfschema/table_replication_applier_status_by_worker.cc
index e4e99dc23259..b68b6f3e4a08 100644
--- a/storage/perfschema/table_replication_applier_status_by_worker.cc
+++ b/storage/perfschema/table_replication_applier_status_by_worker.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -85,6 +92,11 @@ TABLE_FIELD_DEF
 table_replication_applier_status_by_worker::m_field_def=
 { 8, field_types };
 
+PFS_engine_table_share_state
+table_replication_applier_status_by_worker::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_applier_status_by_worker::m_share=
 {
@@ -94,11 +106,12 @@ table_replication_applier_status_by_worker::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_applier_status_by_worker::get_row_count, /*records*/
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_applier_status_by_worker::create(void)
@@ -109,8 +122,7 @@ PFS_engine_table* table_replication_applier_status_by_worker::create(void)
 table_replication_applier_status_by_worker
   ::table_replication_applier_status_by_worker()
   : PFS_engine_table(&m_share, &m_pos),
-    m_row_exists(false), m_pos(), m_next_pos(),
-    m_applier_pos(0), m_applier_next_pos(0)
+    m_row_exists(false), m_pos(), m_next_pos()
 {}
 
 table_replication_applier_status_by_worker
@@ -121,8 +133,6 @@ void table_replication_applier_status_by_worker::reset_position(void)
 {
   m_pos.reset();
   m_next_pos.reset();
-  m_applier_pos.m_index=0;
-  m_applier_next_pos.m_index=0;
 }
 
 ha_rows table_replication_applier_status_by_worker::get_row_count()
@@ -138,52 +148,47 @@ int table_replication_applier_status_by_worker::rnd_next(void)
 {
   Slave_worker *worker;
   Master_info *mi;
-  int res= HA_ERR_END_OF_FILE;
+  size_t wc;
 
   channel_map.rdlock();
 
-  /*
-    For each SQL Thread in all channels get the respective Master_info and
-    construct a row to display its status in
-    'replication_applier_status_by_worker' table in case of single threaded
-    slave mode.
-  */
-  for(m_applier_pos.set_at(&m_applier_next_pos);
-      m_applier_pos.m_index < channel_map.get_max_channels();
-      m_applier_pos.next())
-  {
-    mi= channel_map.get_mi_at_pos(m_applier_pos.m_index);
-
-    if (mi && mi->host[0] && mi->rli && mi->rli->get_worker_count()==0)
-    {
-      make_row(mi);
-      m_applier_next_pos.set_after(&m_applier_pos);
-
-      channel_map.unlock();
-      return 0;
-    }
-  }
-
   for (m_pos.set_at(&m_next_pos);
-       m_pos.has_more_channels(channel_map.get_max_channels()) && res != 0;
+       m_pos.has_more_channels(channel_map.get_max_channels());
        m_pos.next_channel())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index_1);
 
     if (mi && mi->host[0])
     {
-      worker= mi->rli->get_worker(m_pos.m_index_2);
-      if (worker)
+      wc= mi->rli->get_worker_count();
+
+      if (wc == 0)
       {
-        make_row(worker);
-        m_next_pos.set_after(&m_pos);
-        res= 0;
+        /* Single Thread Slave */
+        make_row(mi);
+        m_next_pos.set_channel_after(&m_pos);
+        channel_map.unlock();
+        return 0;
+      }
+
+      for (; m_pos.m_index_2 < wc; m_pos.next_worker())
+      {
+        /* Multi Thread Slave */
+
+        worker = mi->rli->get_worker(m_pos.m_index_2);
+        if (worker)
+        {
+          make_row(worker);
+          m_next_pos.set_after(&m_pos);
+          channel_map.unlock();
+          return 0;
+        }
       }
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 int table_replication_applier_status_by_worker::rnd_pos(const void *pos)
@@ -191,6 +196,7 @@ int table_replication_applier_status_by_worker::rnd_pos(const void *pos)
   Slave_worker *worker;
   Master_info *mi;
   int res= HA_ERR_RECORD_DELETED;
+  size_t wc;
 
   set_position(pos);
 
@@ -201,22 +207,26 @@ int table_replication_applier_status_by_worker::rnd_pos(const void *pos)
   if (!mi || !mi->rli || !mi->host[0])
     goto end;
 
-  DBUG_ASSERT(m_pos.m_index_1 < mi->rli->get_worker_count());
-  /*
-    Display SQL Thread's status only in the case of single threaded mode.
-  */
-  if (mi->rli->get_worker_count() == 0)
+  wc = mi->rli->get_worker_count();
+
+  if (wc == 0)
   {
+    /* Single Thread Slave */
     make_row(mi);
-    res= 0;
-    goto end;
+    res=0;
   }
-  worker= mi->rli->get_worker(m_pos.m_index_2);
-
-  if (worker != NULL)
+  else
   {
-    make_row(worker);
-    res= 0;
+    /* Multi Thread Slave */
+    if (m_pos.m_index_2 < wc)
+    {
+      worker = mi->rli->get_worker(m_pos.m_index_2);
+      if (worker != NULL)
+      {
+        make_row(worker);
+        res=0;
+      }
+    }
   }
 
 end:
@@ -240,8 +250,8 @@ void table_replication_applier_status_by_worker::make_row(Master_info *mi)
 
   m_row.thread_id= 0;
 
-  DBUG_ASSERT(mi != NULL);
-  DBUG_ASSERT(mi->rli != NULL);
+  assert(mi != NULL);
+  assert(mi->rli != NULL);
 
   mysql_mutex_lock(&mi->rli->data_lock);
 
@@ -289,7 +299,7 @@ void table_replication_applier_status_by_worker::make_row(Master_info *mi)
       AUTOMATIC_GROUP when the SQL thread is not executing any
       transaction.  For this case, the field should be empty.
     */
-    DBUG_ASSERT(mi->rli->currently_executing_gtid.type == AUTOMATIC_GROUP);
+    assert(mi->rli->currently_executing_gtid.type == AUTOMATIC_GROUP);
     m_row.last_seen_transaction_length= 0;
     memcpy(m_row.last_seen_transaction, "", 1);
   }
@@ -372,7 +382,7 @@ void table_replication_applier_status_by_worker::make_row(Slave_worker *w)
       AUTOMATIC_GROUP when the worker is not executing any
       transaction.  For this case, the field should be empty.
     */
-    DBUG_ASSERT(w->currently_executing_gtid.type == AUTOMATIC_GROUP);
+    assert(w->currently_executing_gtid.type == AUTOMATIC_GROUP);
     m_row.last_seen_transaction_length= 0;
     memcpy(m_row.last_seen_transaction, "", 1);
   }
@@ -406,7 +416,7 @@ int table_replication_applier_status_by_worker
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -443,7 +453,7 @@ int table_replication_applier_status_by_worker
         set_field_timestamp(f, m_row.last_error_timestamp);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_applier_status_by_worker.h b/storage/perfschema/table_replication_applier_status_by_worker.h
index ed0ce7480b26..18a15ceba9ad 100644
--- a/storage/perfschema/table_replication_applier_status_by_worker.h
+++ b/storage/perfschema/table_replication_applier_status_by_worker.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -74,14 +81,16 @@ struct st_row_worker {
 };
 
 /**
-  Index 1 for replication channel
-  Index 2 for worker
+  Position in table replication_applier_status_by_worker.
+  Index 1 for replication channel.
+  Index 2 for worker:
+  - position [0] is for Single Thread Slave (Master_info)
+  - position [1] .. [N] is for Multi Thread Slave (Slave_worker)
 */
-struct workers_per_channel
-:public PFS_double_index
+struct pos_replication_applier_status_by_worker : public PFS_double_index
 {
-  workers_per_channel()
-    :PFS_double_index(0,0)
+
+  pos_replication_applier_status_by_worker() : PFS_double_index(0, 0)
   {}
 
   inline void reset(void)
@@ -98,12 +107,26 @@ struct workers_per_channel
     m_index_1++;
     m_index_2= 0;
   }
+
+  inline void next_worker()
+  {
+    m_index_2++;
+  }
+
+  inline void
+  set_channel_after(const pos_replication_applier_status_by_worker *other)
+  {
+    m_index_1 = other->m_index_1 + 1;
+    m_index_2 = 0;
+  }
 };
 
 
 /** Table PERFORMANCE_SCHEMA.replication_applier_status_by_worker */
 class table_replication_applier_status_by_worker: public PFS_engine_table
 {
+  typedef pos_replication_applier_status_by_worker pos_t;
+
 private:
   void make_row(Slave_worker *);
   /*
@@ -121,13 +144,9 @@ class table_replication_applier_status_by_worker: public PFS_engine_table
   /** True is the current row exists. */
   bool m_row_exists;
   /** Current position. */
-  workers_per_channel m_pos;
-  /** Next position. */
-  workers_per_channel m_next_pos;
-  /** Current position. */
-  PFS_simple_index m_applier_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_applier_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -148,6 +167,7 @@ class table_replication_applier_status_by_worker: public PFS_engine_table
 public:
   ~table_replication_applier_status_by_worker();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_connection_configuration.cc b/storage/perfschema/table_replication_connection_configuration.cc
index 8fe04802aac2..6d631988252c 100644
--- a/storage/perfschema/table_replication_connection_configuration.cc
+++ b/storage/perfschema/table_replication_connection_configuration.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -138,6 +145,11 @@ TABLE_FIELD_DEF
 table_replication_connection_configuration::m_field_def=
 { 19, field_types };
 
+PFS_engine_table_share_state
+table_replication_connection_configuration::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_connection_configuration::m_share=
 {
@@ -147,11 +159,12 @@ table_replication_connection_configuration::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_connection_configuration::get_row_count, /* records */
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 
@@ -189,12 +202,10 @@ ha_rows table_replication_connection_configuration::get_row_count()
 int table_replication_connection_configuration::rnd_next(void)
 {
   Master_info *mi;
-  int res= HA_ERR_END_OF_FILE;
-
   channel_map.rdlock();
 
   for (m_pos.set_at(&m_next_pos);
-       m_pos.m_index < channel_map.get_max_channels() && res != 0;
+       m_pos.m_index < channel_map.get_max_channels();
        m_pos.next())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index);
@@ -203,12 +214,13 @@ int table_replication_connection_configuration::rnd_next(void)
     {
       make_row(mi);
       m_next_pos.set_after(&m_pos);
-      res= 0;
+      channel_map.unlock();
+      return 0;
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 int table_replication_connection_configuration::rnd_pos(const void *pos)
@@ -237,7 +249,7 @@ void table_replication_connection_configuration::make_row(Master_info *mi)
   m_row_exists= false;
 
 
-  DBUG_ASSERT(mi != NULL);
+  assert(mi != NULL);
 
   mysql_mutex_lock(&mi->data_lock);
   mysql_mutex_lock(&mi->rli->data_lock);
@@ -329,7 +341,7 @@ int table_replication_connection_configuration::read_row_values(TABLE *table,
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -402,7 +414,7 @@ int table_replication_connection_configuration::read_row_values(TABLE *table,
                                m_row.tls_version_length);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_connection_configuration.h b/storage/perfschema/table_replication_connection_configuration.h
index f71aecefd0ef..f53a8bc43feb 100644
--- a/storage/perfschema/table_replication_connection_configuration.h
+++ b/storage/perfschema/table_replication_connection_configuration.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -93,6 +100,8 @@ struct st_row_connect_config {
 /** Table PERFORMANCE_SCHEMA.TABLE_REPLICATION_CONNECTION_CONFIGURATION. */
 class table_replication_connection_configuration: public PFS_engine_table
 {
+  typedef PFS_simple_index pos_t;
+
 private:
   void make_row(Master_info *);
 
@@ -105,9 +114,9 @@ class table_replication_connection_configuration: public PFS_engine_table
   /** Current row */
   st_row_connect_config m_row;
   /** Current position. */
-  PFS_simple_index m_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -128,6 +137,7 @@ class table_replication_connection_configuration: public PFS_engine_table
 public:
   ~table_replication_connection_configuration();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_connection_status.cc b/storage/perfschema/table_replication_connection_status.cc
index 72ac8c1fc920..f07bc8324191 100644
--- a/storage/perfschema/table_replication_connection_status.cc
+++ b/storage/perfschema/table_replication_connection_status.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -142,6 +149,11 @@ static const TABLE_FIELD_TYPE field_types[]=
 TABLE_FIELD_DEF
 table_replication_connection_status::m_field_def= { 11, field_types };
 
+PFS_engine_table_share_state
+table_replication_connection_status::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_connection_status::m_share=
 {
@@ -151,11 +163,12 @@ table_replication_connection_status::m_share=
   NULL, /* write_row */
   NULL, /* delete_all_rows */
   table_replication_connection_status::get_row_count, /* records */
-  sizeof(PFS_simple_index), /* ref length */
+  sizeof(pos_t), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_connection_status::create(void)
@@ -190,12 +203,10 @@ ha_rows table_replication_connection_status::get_row_count()
 int table_replication_connection_status::rnd_next(void)
 {
   Master_info *mi= NULL;
-  int res= HA_ERR_END_OF_FILE;
-
   channel_map.rdlock();
 
   for (m_pos.set_at(&m_next_pos);
-       m_pos.m_index < channel_map.get_max_channels() && res != 0;
+       m_pos.m_index < channel_map.get_max_channels();
        m_pos.next())
   {
     mi= channel_map.get_mi_at_pos(m_pos.m_index);
@@ -204,12 +215,13 @@ int table_replication_connection_status::rnd_next(void)
     {
       make_row(mi);
       m_next_pos.set_after(&m_pos);
-      res= 0;
+      channel_map.unlock();
+      return 0;
     }
   }
 
   channel_map.unlock();
-  return res;
+  return HA_ERR_END_OF_FILE;
 }
 
 int table_replication_connection_status::rnd_pos(const void *pos)
@@ -243,8 +255,8 @@ void table_replication_connection_status::make_row(Master_info *mi)
   m_row.thread_id_is_null= true;
   m_row.service_state= PS_RPL_CONNECT_SERVICE_STATE_NO;
 
-  DBUG_ASSERT(mi != NULL);
-  DBUG_ASSERT(mi->rli != NULL);
+  assert(mi != NULL);
+  assert(mi->rli != NULL);
 
   mysql_mutex_lock(&mi->data_lock);
   mysql_mutex_lock(&mi->rli->data_lock);
@@ -370,7 +382,7 @@ int table_replication_connection_status::read_row_values(TABLE *table,
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -424,7 +436,7 @@ int table_replication_connection_status::read_row_values(TABLE *table,
         set_field_timestamp(f, m_row.last_error_timestamp);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_connection_status.h b/storage/perfschema/table_replication_connection_status.h
index 6c95da19235a..7151ce55ef7b 100644
--- a/storage/perfschema/table_replication_connection_status.h
+++ b/storage/perfschema/table_replication_connection_status.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,6 +98,8 @@ struct st_row_connect_status {
 /** Table PERFORMANCE_SCHEMA.REPLICATION_CONNECTION_STATUS. */
 class table_replication_connection_status: public PFS_engine_table
 {
+  typedef PFS_simple_index pos_t;
+
 private:
   void make_row(Master_info *mi);
 
@@ -103,9 +112,9 @@ class table_replication_connection_status: public PFS_engine_table
   /** Current row */
   st_row_connect_status m_row;
   /** Current position. */
-  PFS_simple_index m_pos;
+  pos_t m_pos;
   /** Next position. */
-  PFS_simple_index m_next_pos;
+  pos_t m_next_pos;
 
 protected:
   /**
@@ -126,6 +135,7 @@ class table_replication_connection_status: public PFS_engine_table
 public:
   ~table_replication_connection_status();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_group_member_stats.cc b/storage/perfschema/table_replication_group_member_stats.cc
index 14be756ff385..84d693860ecb 100644
--- a/storage/perfschema/table_replication_group_member_stats.cc
+++ b/storage/perfschema/table_replication_group_member_stats.cc
@@ -1,14 +1,21 @@
 /*
-  Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -181,6 +188,11 @@ TABLE_FIELD_DEF
 table_replication_group_member_stats::m_field_def=
 { 9, field_types };
 
+PFS_engine_table_share_state
+table_replication_group_member_stats::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_group_member_stats::m_share=
 {
@@ -193,8 +205,9 @@ table_replication_group_member_stats::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_group_member_stats::create(void)
@@ -256,7 +269,7 @@ int table_replication_group_member_stats::rnd_pos(const void *pos)
     return HA_ERR_END_OF_FILE;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < 1);
+  assert(m_pos.m_index < 1);
   make_row();
 
   return 0;
@@ -316,7 +329,7 @@ int table_replication_group_member_stats::read_row_values(TABLE *table,
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -357,7 +370,7 @@ int table_replication_group_member_stats::read_row_values(TABLE *table,
 
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_group_member_stats.h b/storage/perfschema/table_replication_group_member_stats.h
index 12e95acf3258..8aec5e650d10 100644
--- a/storage/perfschema/table_replication_group_member_stats.h
+++ b/storage/perfschema/table_replication_group_member_stats.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -94,6 +101,7 @@ class table_replication_group_member_stats: public PFS_engine_table
 public:
   ~table_replication_group_member_stats();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_replication_group_members.cc b/storage/perfschema/table_replication_group_members.cc
index b8619c71fc5d..e5cc7d27c00e 100644
--- a/storage/perfschema/table_replication_group_members.cc
+++ b/storage/perfschema/table_replication_group_members.cc
@@ -1,14 +1,21 @@
 /*
-      Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; version 2 of the License.
+      it under the terms of the GNU General Public License, version 2.0,
+      as published by the Free Software Foundation.
+
+      This program is also distributed with certain software (including
+      but not limited to OpenSSL) that is licensed under separate terms,
+      as designated in a particular file or component or in included license
+      documentation.  The authors of MySQL hereby grant you an additional
+      permission to link the program and your derivative works with the
+      separately licensed software that they have included with MySQL.
 
       This program is distributed in the hope that it will be useful,
       but WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
+      GNU General Public License, version 2.0, for more details.
 
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
@@ -123,6 +130,11 @@ TABLE_FIELD_DEF
 table_replication_group_members::m_field_def=
 { 5, field_types };
 
+PFS_engine_table_share_state
+table_replication_group_members::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_replication_group_members::m_share=
 {
@@ -135,8 +147,9 @@ table_replication_group_members::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_replication_group_members::create(void)
@@ -186,7 +199,7 @@ int table_replication_group_members::rnd_pos(const void *pos)
     return HA_ERR_END_OF_FILE;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < get_row_count());
+  assert(m_pos.m_index < get_row_count());
   make_row(m_pos.m_index);
 
   return 0;
@@ -238,7 +251,7 @@ int table_replication_group_members::read_row_values(TABLE *table,
   if (unlikely(! m_row_exists))
     return HA_ERR_RECORD_DELETED;
 
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -266,7 +279,7 @@ int table_replication_group_members::read_row_values(TABLE *table,
         set_field_char_utf8(f, m_row.member_state, m_row.member_state_length);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_replication_group_members.h b/storage/perfschema/table_replication_group_members.h
index 8a0ab2640c82..b56c72212b33 100644
--- a/storage/perfschema/table_replication_group_members.h
+++ b/storage/perfschema/table_replication_group_members.h
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -87,6 +94,7 @@ class table_replication_group_members: public PFS_engine_table
 public:
   ~table_replication_group_members();
 
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_session_account_connect_attrs.cc b/storage/perfschema/table_session_account_connect_attrs.cc
index 0502489bff0c..806623f956b5 100644
--- a/storage/perfschema/table_session_account_connect_attrs.cc
+++ b/storage/perfschema/table_session_account_connect_attrs.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -17,6 +24,11 @@
 
 THR_LOCK table_session_account_connect_attrs::m_table_lock;
 
+PFS_engine_table_share_state
+table_session_account_connect_attrs::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_session_account_connect_attrs::m_share=
 {
@@ -29,8 +41,9 @@ table_session_account_connect_attrs::m_share=
   sizeof(pos_connect_attr_by_thread_by_attr), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_session_account_connect_attrs::create()
@@ -51,7 +64,7 @@ table_session_account_connect_attrs::thread_fits(PFS_thread *thread)
     return false;
 
   /* The thread we compare to, by definition, has some instrumentation. */
-  DBUG_ASSERT(thread != NULL);
+  assert(thread != NULL);
 
   uint username_length= current_thread->m_username_length;
   uint hostname_length= current_thread->m_hostname_length;
diff --git a/storage/perfschema/table_session_account_connect_attrs.h b/storage/perfschema/table_session_account_connect_attrs.h
index f40178ec020f..b209c4f0e05d 100644
--- a/storage/perfschema/table_session_account_connect_attrs.h
+++ b/storage/perfschema/table_session_account_connect_attrs.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -26,6 +33,7 @@
 class table_session_account_connect_attrs : public table_session_connect
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc
index 1e1d6d3e1e76..503e0ba33b54 100644
--- a/storage/perfschema/table_session_connect.cc
+++ b/storage/perfschema/table_session_connect.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -273,7 +280,7 @@ int table_session_connect::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -303,7 +310,7 @@ int table_session_connect::read_row_values(TABLE *table,
         set_field_ulong(f, m_row.m_ordinal_position);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_session_connect.h b/storage/perfschema/table_session_connect.h
index feb593bad6be..f48631e63d29 100644
--- a/storage/perfschema/table_session_connect.h
+++ b/storage/perfschema/table_session_connect.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/table_session_connect_attrs.cc b/storage/perfschema/table_session_connect_attrs.cc
index 45f5daf5aaf9..bbb4ef389fdb 100644
--- a/storage/perfschema/table_session_connect_attrs.cc
+++ b/storage/perfschema/table_session_connect_attrs.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -17,6 +24,11 @@
 
 THR_LOCK table_session_connect_attrs::m_table_lock;
 
+PFS_engine_table_share_state
+table_session_connect_attrs::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_session_connect_attrs::m_share=
 {
@@ -29,8 +41,9 @@ table_session_connect_attrs::m_share=
   sizeof(pos_connect_attr_by_thread_by_attr), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_session_connect_attrs::create()
diff --git a/storage/perfschema/table_session_connect_attrs.h b/storage/perfschema/table_session_connect_attrs.h
index 788a68a95fd8..161c54473fd7 100644
--- a/storage/perfschema/table_session_connect_attrs.h
+++ b/storage/perfschema/table_session_connect_attrs.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -26,6 +33,7 @@
 class table_session_connect_attrs : public table_session_connect
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_session_status.cc b/storage/perfschema/table_session_status.cc
index 7e5a69a16dfd..437fb6ec9d0f 100644
--- a/storage/perfschema/table_session_status.cc
+++ b/storage/perfschema/table_session_status.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -46,6 +53,11 @@ TABLE_FIELD_DEF
 table_session_status::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_session_status::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_session_status::m_share=
 {
@@ -58,8 +70,9 @@ table_session_status::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  true   /* perpetual */
+  true, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -133,7 +146,7 @@ table_session_status::rnd_pos(const void *pos)
     return HA_ERR_RECORD_DELETED;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < m_status_cache.size());
+  assert(m_pos.m_index < m_status_cache.size());
 
   if (m_status_cache.is_materialized())
   {
@@ -169,7 +182,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -185,7 +198,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_session_status.h b/storage/perfschema/table_session_status.h
index 4680586d2f8d..0b3e16c60114 100644
--- a/storage/perfschema/table_session_status.h
+++ b/storage/perfschema/table_session_status.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -63,6 +70,7 @@ class table_session_status : public PFS_engine_table
   typedef PFS_simple_index pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_session_variables.cc b/storage/perfschema/table_session_variables.cc
index d5eb79d27790..6b98beaeddfd 100644
--- a/storage/perfschema/table_session_variables.cc
+++ b/storage/perfschema/table_session_variables.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -46,6 +53,11 @@ TABLE_FIELD_DEF
 table_session_variables::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_session_variables::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_session_variables::m_share=
 {
@@ -58,8 +70,9 @@ table_session_variables::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  true   /* perpetual */
+  true, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -134,7 +147,7 @@ int table_session_variables::rnd_pos(const void *pos)
     return HA_ERR_RECORD_DELETED;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < m_sysvar_cache.size());
+  assert(m_pos.m_index < m_sysvar_cache.size());
 
   if (m_sysvar_cache.is_materialized())
   {
@@ -152,6 +165,8 @@ void table_session_variables
 ::make_row(const System_variable *system_var)
 {
   m_row_exists= false;
+  if (system_var->is_null() || system_var->is_ignored())
+    return;
   m_row.m_variable_name.make_row(system_var->m_name, system_var->m_name_length);
   m_row.m_variable_value.make_row(system_var);
   m_row_exists= true;
@@ -169,7 +184,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -185,7 +200,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_session_variables.h b/storage/perfschema/table_session_variables.h
index 15c3ac8ea910..f46d9967e5cc 100644
--- a/storage/perfschema/table_session_variables.h
+++ b/storage/perfschema/table_session_variables.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -61,6 +68,7 @@ class table_session_variables : public PFS_engine_table
   typedef PFS_simple_index pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index 593dd1d45a9c..e9b7d44a4a2e 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -64,6 +71,11 @@ TABLE_FIELD_DEF
 table_setup_actors::m_field_def=
 { 5, field_types };
 
+PFS_engine_table_share_state
+table_setup_actors::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_setup_actors::m_share=
 {
@@ -76,8 +88,9 @@ table_setup_actors::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_setup_actors::create()
@@ -122,7 +135,7 @@ int table_setup_actors::write_row(TABLE *table, unsigned char *buf,
         history_value= (enum_yes_no) get_field_enum(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -243,7 +256,7 @@ int table_setup_actors::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
 
   for (; (f= *fields) ; fields++)
   {
@@ -267,7 +280,7 @@ int table_setup_actors::read_row_values(TABLE *table,
         set_field_enum(f, (*m_row.m_history_ptr) ? ENUM_YES : ENUM_NO);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -309,7 +322,7 @@ int table_setup_actors::update_row_values(TABLE *table,
         *m_row.m_history_ptr= (value == ENUM_YES) ? true : false;
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -322,7 +335,7 @@ int table_setup_actors::delete_row_values(TABLE *table,
                                           const unsigned char *buf,
                                           Field **fields)
 {
-  DBUG_ASSERT(m_row_exists);
+  assert(m_row_exists);
 
   CHARSET_INFO *cs= &my_charset_utf8_bin;
   String user(m_row.m_username, m_row.m_username_length, cs);
diff --git a/storage/perfschema/table_setup_actors.h b/storage/perfschema/table_setup_actors.h
index 0f5827ea13fc..69b8041907a6 100644
--- a/storage/perfschema/table_setup_actors.h
+++ b/storage/perfschema/table_setup_actors.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -55,6 +62,7 @@ struct row_setup_actors
 class table_setup_actors : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   /** Table builder. */
diff --git a/storage/perfschema/table_setup_consumers.cc b/storage/perfschema/table_setup_consumers.cc
index 78f4d74b359c..c52c6979f783 100644
--- a/storage/perfschema/table_setup_consumers.cc
+++ b/storage/perfschema/table_setup_consumers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -142,6 +149,11 @@ TABLE_FIELD_DEF
 table_setup_consumers::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_setup_consumers::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_setup_consumers::m_share=
 {
@@ -154,8 +166,9 @@ table_setup_consumers::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_setup_consumers::create(void)
@@ -204,7 +217,7 @@ int table_setup_consumers::rnd_next(void)
 int table_setup_consumers::rnd_pos(const void *pos)
 {
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < COUNT_SETUP_CONSUMERS);
+  assert(m_pos.m_index < COUNT_SETUP_CONSUMERS);
   m_row= &all_setup_consumers_data[m_pos.m_index];
   return 0;
 }
@@ -216,11 +229,11 @@ int table_setup_consumers::read_row_values(TABLE *table,
 {
   Field *f;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -235,7 +248,7 @@ int table_setup_consumers::read_row_values(TABLE *table,
         set_field_enum(f, (*m_row->m_enabled_ptr) ? ENUM_YES : ENUM_NO);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -251,7 +264,7 @@ int table_setup_consumers::update_row_values(TABLE *table,
   Field *f;
   enum_yes_no value;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
   for (; (f= *fields) ; fields++)
   {
@@ -268,7 +281,7 @@ int table_setup_consumers::update_row_values(TABLE *table,
         break;
       }
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_setup_consumers.h b/storage/perfschema/table_setup_consumers.h
index b9c72c1d437c..8f7617153908 100644
--- a/storage/perfschema/table_setup_consumers.h
+++ b/storage/perfschema/table_setup_consumers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -46,6 +53,7 @@ struct row_setup_consumers
 class table_setup_consumers : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_setup_instruments.cc b/storage/perfschema/table_setup_instruments.cc
index e3f0f065b649..fd4c7c258600 100644
--- a/storage/perfschema/table_setup_instruments.cc
+++ b/storage/perfschema/table_setup_instruments.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -55,6 +62,11 @@ TABLE_FIELD_DEF
 table_setup_instruments::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_setup_instruments::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_setup_instruments::m_share=
 {
@@ -67,8 +79,9 @@ table_setup_instruments::m_share=
   sizeof(pos_setup_instruments),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_setup_instruments::create(void)
@@ -269,7 +282,7 @@ int table_setup_instruments::read_row_values(TABLE *table,
 {
   Field *f;
 
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   /*
     The row always exist, the instrument classes
@@ -292,7 +305,7 @@ int table_setup_instruments::read_row_values(TABLE *table,
         set_field_enum(f, m_row.m_instr_class->m_timed ? ENUM_YES : ENUM_NO);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -333,7 +346,7 @@ int table_setup_instruments::update_row_values(TABLE *table,
         }
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -377,7 +390,7 @@ int table_setup_instruments::update_row_values(TABLE *table,
       update_metadata_derived_flags();
       break;
     default:
-      DBUG_ASSERT(false);
+      assert(false);
       break;
   }
 
diff --git a/storage/perfschema/table_setup_instruments.h b/storage/perfschema/table_setup_instruments.h
index d0e3119cf5b7..ea07095e700e 100644
--- a/storage/perfschema/table_setup_instruments.h
+++ b/storage/perfschema/table_setup_instruments.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -84,6 +91,7 @@ struct pos_setup_instruments : public PFS_double_index
 class table_setup_instruments : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_setup_objects.cc b/storage/perfschema/table_setup_objects.cc
index 0312793119fd..d33647253f51 100644
--- a/storage/perfschema/table_setup_objects.cc
+++ b/storage/perfschema/table_setup_objects.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -65,6 +72,11 @@ TABLE_FIELD_DEF
 table_setup_objects::m_field_def=
 { 5, field_types };
 
+PFS_engine_table_share_state
+table_setup_objects::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_setup_objects::m_share=
 {
@@ -77,8 +89,9 @@ table_setup_objects::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 int update_derived_flags()
@@ -135,7 +148,7 @@ int table_setup_objects::write_row(TABLE *table, unsigned char *buf,
         timed_value= (enum_yes_no) get_field_enum(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -252,7 +265,7 @@ int table_setup_objects::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -285,7 +298,7 @@ int table_setup_objects::read_row_values(TABLE *table,
         set_field_enum(f, (*m_row.m_timed_ptr) ? ENUM_YES : ENUM_NO);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -327,7 +340,7 @@ int table_setup_objects::update_row_values(TABLE *table,
         *m_row.m_timed_ptr= (value == ENUM_YES) ? true : false;
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -340,7 +353,7 @@ int table_setup_objects::delete_row_values(TABLE *table,
                                            const unsigned char *buf,
                                            Field **fields)
 {
-  DBUG_ASSERT(m_row_exists);
+  assert(m_row_exists);
 
   CHARSET_INFO *cs= &my_charset_utf8_bin;
   enum_object_type object_type= OBJECT_TYPE_TABLE;
diff --git a/storage/perfschema/table_setup_objects.h b/storage/perfschema/table_setup_objects.h
index a759d0c8329b..7485b89d6860 100644
--- a/storage/perfschema/table_setup_objects.h
+++ b/storage/perfschema/table_setup_objects.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -54,6 +61,7 @@ struct row_setup_objects
 class table_setup_objects : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   /** Table builder. */
diff --git a/storage/perfschema/table_setup_timers.cc b/storage/perfschema/table_setup_timers.cc
index d5abcdeb6f66..4ae5205ab5ca 100644
--- a/storage/perfschema/table_setup_timers.cc
+++ b/storage/perfschema/table_setup_timers.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -73,6 +80,11 @@ TABLE_FIELD_DEF
 table_setup_timers::m_field_def=
 { 2, field_types };
 
+PFS_engine_table_share_state
+table_setup_timers::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_setup_timers::m_share=
 {
@@ -85,8 +97,9 @@ table_setup_timers::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_setup_timers::create(void)
@@ -142,7 +155,7 @@ int table_setup_timers::rnd_next(void)
 int table_setup_timers::rnd_pos(const void *pos)
 {
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index < COUNT_SETUP_TIMERS);
+  assert(m_pos.m_index < COUNT_SETUP_TIMERS);
   m_row= &all_setup_timers_data[m_pos.m_index];
   return 0;
 }
@@ -154,10 +167,10 @@ int table_setup_timers::read_row_values(TABLE *table,
 {
   Field *f;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -172,7 +185,7 @@ int table_setup_timers::read_row_values(TABLE *table,
         set_field_enum(f, *(m_row->m_timer_name_ptr));
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -188,7 +201,7 @@ int table_setup_timers::update_row_values(TABLE *table,
   Field *f;
   longlong value;
 
-  DBUG_ASSERT(m_row);
+  assert(m_row);
 
   for (; (f= *fields) ; fields++)
   {
@@ -206,7 +219,7 @@ int table_setup_timers::update_row_values(TABLE *table,
           return HA_ERR_WRONG_COMMAND;
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_setup_timers.h b/storage/perfschema/table_setup_timers.h
index c7dfec8f42b9..309c14cac545 100644
--- a/storage/perfschema/table_setup_timers.h
+++ b/storage/perfschema/table_setup_timers.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -42,6 +49,7 @@ struct row_setup_timers
 class table_setup_timers : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_socket_instances.cc b/storage/perfschema/table_socket_instances.cc
index 1cf163ba981e..498e08a9fc92 100644
--- a/storage/perfschema/table_socket_instances.cc
+++ b/storage/perfschema/table_socket_instances.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -73,6 +80,11 @@ TABLE_FIELD_DEF
 table_socket_instances::m_field_def=
 { 7, field_types };
 
+PFS_engine_table_share_state
+table_socket_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_socket_instances::m_share=
 {
@@ -85,8 +97,9 @@ table_socket_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_socket_instances::create(void)
@@ -194,7 +207,7 @@ int table_socket_instances::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -228,7 +241,7 @@ int table_socket_instances::read_row_values(TABLE *table,
         set_field_enum(f, m_row.m_state);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_socket_instances.h b/storage/perfschema/table_socket_instances.h
index 99d0ba6c8cbc..d53baf788343 100644
--- a/storage/perfschema/table_socket_instances.h
+++ b/storage/perfschema/table_socket_instances.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -60,6 +67,7 @@ struct row_socket_instances
 class table_socket_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_socket_summary_by_event_name.cc b/storage/perfschema/table_socket_summary_by_event_name.cc
index 1a344b6de993..77b485e51d32 100644
--- a/storage/perfschema/table_socket_summary_by_event_name.cc
+++ b/storage/perfschema/table_socket_summary_by_event_name.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -159,6 +166,11 @@ TABLE_FIELD_DEF
 table_socket_summary_by_event_name::m_field_def=
 { 23, field_types };
 
+PFS_engine_table_share_state
+table_socket_summary_by_event_name::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_socket_summary_by_event_name::m_share=
 {
@@ -171,8 +183,9 @@ table_socket_summary_by_event_name::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_socket_summary_by_event_name::create(void)
@@ -262,7 +275,7 @@ int table_socket_summary_by_event_name::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -344,7 +357,7 @@ int table_socket_summary_by_event_name::read_row_values(TABLE *table,
         break;
 
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
     } // if
diff --git a/storage/perfschema/table_socket_summary_by_event_name.h b/storage/perfschema/table_socket_summary_by_event_name.h
index 8f5bbe829738..ba4a5d93305b 100644
--- a/storage/perfschema/table_socket_summary_by_event_name.h
+++ b/storage/perfschema/table_socket_summary_by_event_name.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -49,6 +56,7 @@ struct row_socket_summary_by_event_name
 class table_socket_summary_by_event_name : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_socket_summary_by_instance.cc b/storage/perfschema/table_socket_summary_by_instance.cc
index db5a9d9f62a5..64ba51c3dc9c 100644
--- a/storage/perfschema/table_socket_summary_by_instance.cc
+++ b/storage/perfschema/table_socket_summary_by_instance.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -164,6 +171,11 @@ TABLE_FIELD_DEF
 table_socket_summary_by_instance::m_field_def=
 { 24, field_types };
 
+PFS_engine_table_share_state
+table_socket_summary_by_instance::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_socket_summary_by_instance::m_share=
 {
@@ -176,8 +188,9 @@ table_socket_summary_by_instance::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_socket_summary_by_instance::create(void)
@@ -280,7 +293,7 @@ int table_socket_summary_by_instance::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -365,7 +378,7 @@ int table_socket_summary_by_instance::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.m_io_stat.m_misc.m_waits.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
         break;
       }
     }
diff --git a/storage/perfschema/table_socket_summary_by_instance.h b/storage/perfschema/table_socket_summary_by_instance.h
index 55802ec5fbaf..8507b46db4f0 100644
--- a/storage/perfschema/table_socket_summary_by_instance.h
+++ b/storage/perfschema/table_socket_summary_by_instance.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -52,6 +59,7 @@ struct row_socket_summary_by_instance
 class table_socket_summary_by_instance : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_status_by_account.cc b/storage/perfschema/table_status_by_account.cc
index 04a2a547e873..941af9120a29 100644
--- a/storage/perfschema/table_status_by_account.cc
+++ b/storage/perfschema/table_status_by_account.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -57,6 +64,11 @@ TABLE_FIELD_DEF
 table_status_by_account::m_field_def=
 { 4, field_types };
 
+PFS_engine_table_share_state
+table_status_by_account::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_status_by_account::m_share=
 {
@@ -69,8 +81,9 @@ table_status_by_account::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -182,7 +195,7 @@ table_status_by_account::rnd_pos(const void *pos)
     return HA_ERR_END_OF_FILE;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index_1 < global_account_container.get_row_count());
+  assert(m_pos.m_index_1 < global_account_container.get_row_count());
 
   PFS_account *pfs_account= global_account_container.get(m_pos.m_index_1);
 
@@ -234,7 +247,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -254,7 +267,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_status_by_account.h b/storage/perfschema/table_status_by_account.h
index d1f46487da84..c8d270c59269 100644
--- a/storage/perfschema/table_status_by_account.h
+++ b/storage/perfschema/table_status_by_account.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -97,6 +104,7 @@ class table_status_by_account : public PFS_engine_table
   typedef pos_status_by_account pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_status_by_host.cc b/storage/perfschema/table_status_by_host.cc
index 18e55122963a..33109eff07af 100644
--- a/storage/perfschema/table_status_by_host.cc
+++ b/storage/perfschema/table_status_by_host.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -52,6 +59,11 @@ TABLE_FIELD_DEF
 table_status_by_host::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_status_by_host::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_status_by_host::m_share=
 {
@@ -64,8 +76,9 @@ table_status_by_host::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -178,7 +191,7 @@ table_status_by_host::rnd_pos(const void *pos)
     return HA_ERR_END_OF_FILE;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index_1 < global_host_container.get_row_count());
+  assert(m_pos.m_index_1 < global_host_container.get_row_count());
 
   PFS_host *pfs_host= global_host_container.get(m_pos.m_index_1);
 
@@ -230,7 +243,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -249,7 +262,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_status_by_host.h b/storage/perfschema/table_status_by_host.h
index 40639f05373e..4e28966c0160 100644
--- a/storage/perfschema/table_status_by_host.h
+++ b/storage/perfschema/table_status_by_host.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -95,6 +102,7 @@ class table_status_by_host : public PFS_engine_table
   typedef pos_status_by_host pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_status_by_thread.cc b/storage/perfschema/table_status_by_thread.cc
index 3a31619b105d..89499a1f8e18 100644
--- a/storage/perfschema/table_status_by_thread.cc
+++ b/storage/perfschema/table_status_by_thread.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -51,6 +58,11 @@ TABLE_FIELD_DEF
 table_status_by_thread::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_status_by_thread::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_status_by_thread::m_share=
 {
@@ -63,8 +75,9 @@ table_status_by_thread::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -75,7 +88,7 @@ table_status_by_thread::create(void)
 
 int table_status_by_thread::delete_all_rows(void)
 {
-  /* Lock required to aggregate to global_status_vars. */
+  /* Lock required to aggregate to global_status_var. */
   mysql_mutex_lock(&LOCK_status);
 
   reset_status_by_thread();
@@ -171,7 +184,7 @@ table_status_by_thread::rnd_pos(const void *pos)
     return HA_ERR_RECORD_DELETED;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index_1 < global_thread_container.get_row_count());
+  assert(m_pos.m_index_1 < global_thread_container.get_row_count());
 
   PFS_thread *pfs_thread= global_thread_container.get(m_pos.m_index_1);
   /*
@@ -224,7 +237,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -243,7 +256,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_status_by_thread.h b/storage/perfschema/table_status_by_thread.h
index 4c14e3bb101c..770490438f19 100644
--- a/storage/perfschema/table_status_by_thread.h
+++ b/storage/perfschema/table_status_by_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -93,6 +100,7 @@ class table_status_by_thread : public PFS_engine_table
   typedef pos_status_by_thread pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_status_by_user.cc b/storage/perfschema/table_status_by_user.cc
index eb9cdae48c60..26a7ce28725e 100644
--- a/storage/perfschema/table_status_by_user.cc
+++ b/storage/perfschema/table_status_by_user.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -53,6 +60,11 @@ TABLE_FIELD_DEF
 table_status_by_user::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_status_by_user::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_status_by_user::m_share=
 {
@@ -65,8 +77,9 @@ table_status_by_user::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -179,7 +192,7 @@ table_status_by_user::rnd_pos(const void *pos)
     return HA_ERR_END_OF_FILE;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index_1 < global_user_container.get_row_count());
+  assert(m_pos.m_index_1 < global_user_container.get_row_count());
 
   PFS_user *pfs_user= global_user_container.get(m_pos.m_index_1);
 
@@ -231,7 +244,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -250,7 +263,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_status_by_user.h b/storage/perfschema/table_status_by_user.h
index ec96a348c40b..1954b15d8206 100644
--- a/storage/perfschema/table_status_by_user.h
+++ b/storage/perfschema/table_status_by_user.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -95,6 +102,7 @@ class table_status_by_user : public PFS_engine_table
   typedef pos_status_by_user pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_sync_instances.cc b/storage/perfschema/table_sync_instances.cc
index 8879712766c5..5b9cd2cb5a61 100644
--- a/storage/perfschema/table_sync_instances.cc
+++ b/storage/perfschema/table_sync_instances.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -54,6 +61,11 @@ TABLE_FIELD_DEF
 table_mutex_instances::m_field_def=
 { 3, mutex_field_types };
 
+PFS_engine_table_share_state
+table_mutex_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_mutex_instances::m_share=
 {
@@ -66,8 +78,9 @@ table_mutex_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_mutex_instances::create(void)
@@ -168,7 +181,7 @@ int table_mutex_instances::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -190,7 +203,7 @@ int table_mutex_instances::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -228,6 +241,11 @@ TABLE_FIELD_DEF
 table_rwlock_instances::m_field_def=
 { 4, rwlock_field_types };
 
+PFS_engine_table_share_state
+table_rwlock_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_rwlock_instances::m_share=
 {
@@ -240,8 +258,9 @@ table_rwlock_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_rwlock_instances::create(void)
@@ -346,7 +365,7 @@ int table_rwlock_instances::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -371,7 +390,7 @@ int table_rwlock_instances::read_row_values(TABLE *table,
         set_field_ulong(f, m_row.m_readers);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -399,6 +418,11 @@ TABLE_FIELD_DEF
 table_cond_instances::m_field_def=
 { 2, cond_field_types };
 
+PFS_engine_table_share_state
+table_cond_instances::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_cond_instances::m_share=
 {
@@ -411,8 +435,9 @@ table_cond_instances::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_cond_instances::create(void)
@@ -503,7 +528,7 @@ int table_cond_instances::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 0);
+  assert(table->s->null_bytes == 0);
 
   for (; (f= *fields) ; fields++)
   {
@@ -518,7 +543,7 @@ int table_cond_instances::read_row_values(TABLE *table,
         set_field_ulonglong(f, (intptr) m_row.m_identity);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_sync_instances.h b/storage/perfschema/table_sync_instances.h
index 527fd55262f4..a96d79df0783 100644
--- a/storage/perfschema/table_sync_instances.h
+++ b/storage/perfschema/table_sync_instances.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -52,6 +59,7 @@ struct row_mutex_instances
 class table_mutex_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -112,6 +120,7 @@ struct row_rwlock_instances
 class table_rwlock_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
@@ -166,6 +175,7 @@ struct row_cond_instances
 class table_cond_instances : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share. */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_table_handles.cc b/storage/perfschema/table_table_handles.cc
index ba8e400d55fc..b2e4e4e2ea9f 100644
--- a/storage/perfschema/table_table_handles.cc
+++ b/storage/perfschema/table_table_handles.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -79,6 +86,11 @@ TABLE_FIELD_DEF
 table_table_handles::m_field_def=
 { 8, field_types };
 
+PFS_engine_table_share_state
+table_table_handles::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_table_handles::m_share=
 {
@@ -91,8 +103,9 @@ table_table_handles::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -208,7 +221,7 @@ int table_table_handles::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -238,7 +251,7 @@ int table_table_handles::read_row_values(TABLE *table,
         set_field_lock_type(f, m_row.m_external_lock);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_table_handles.h b/storage/perfschema/table_table_handles.h
index 11002df63fa7..7e184deb9a0b 100644
--- a/storage/perfschema/table_table_handles.h
+++ b/storage/perfschema/table_table_handles.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -56,6 +63,7 @@ struct row_table_handles
 class table_table_handles : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_threads.cc b/storage/perfschema/table_threads.cc
index 22335f7e8ebc..c138586ef449 100644
--- a/storage/perfschema/table_threads.cc
+++ b/storage/perfschema/table_threads.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -115,6 +122,11 @@ TABLE_FIELD_DEF
 table_threads::m_field_def=
 { 17, field_types };
 
+PFS_engine_table_share_state
+table_threads::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_threads::m_share=
 {
@@ -127,8 +139,9 @@ table_threads::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_threads::create()
@@ -263,7 +276,7 @@ int table_threads::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 2);
+  assert(table->s->null_bytes == 2);
   buf[0]= 0;
   buf[1]= 0;
 
@@ -336,7 +349,7 @@ int table_threads::read_row_values(TABLE *table,
            server is updating this column for those threads. To prevent this
            kind of issue, an assert is added.
          */
-        DBUG_ASSERT(m_row.m_processlist_state_length <= f->char_length());
+        assert(m_row.m_processlist_state_length <= f->char_length());
         if (m_row.m_processlist_state_length > 0)
           set_field_varchar_utf8(f, m_row.m_processlist_state_ptr,
                                  m_row.m_processlist_state_length);
@@ -379,7 +392,7 @@ int table_threads::read_row_values(TABLE *table,
           f->set_null();
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
@@ -426,7 +439,7 @@ int table_threads::update_row_values(TABLE *table,
       case 16: /* THREAD_OS_ID */
         return HA_ERR_WRONG_COMMAND;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_threads.h b/storage/perfschema/table_threads.h
index 50e2fc8842e5..db27d973cd2c 100644
--- a/storage/perfschema/table_threads.h
+++ b/storage/perfschema/table_threads.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -81,6 +88,7 @@ struct row_threads
 class table_threads : public cursor_by_thread
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_tiws_by_index_usage.cc b/storage/perfschema/table_tiws_by_index_usage.cc
index 2ab235208b1d..9dcfd6915008 100644
--- a/storage/perfschema/table_tiws_by_index_usage.cc
+++ b/storage/perfschema/table_tiws_by_index_usage.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -234,6 +241,11 @@ TABLE_FIELD_DEF
 table_tiws_by_index_usage::m_field_def=
 { 39, field_types };
 
+PFS_engine_table_share_state
+table_tiws_by_index_usage::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_tiws_by_index_usage::m_share=
 {
@@ -246,8 +258,9 @@ table_tiws_by_index_usage::m_share=
   sizeof(pos_tiws_by_index_usage),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -357,7 +370,7 @@ void table_tiws_by_index_usage::make_row(PFS_table_share *pfs_share,
   PFS_table_share_index *pfs_index;
   pfs_optimistic_state lock;
 
-  DBUG_ASSERT(index <= MAX_INDEXES);
+  assert(index <= MAX_INDEXES);
 
   m_row_exists= false;
 
@@ -398,7 +411,7 @@ int table_tiws_by_index_usage::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -519,7 +532,7 @@ int table_tiws_by_index_usage::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.m_stat.m_delete.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_tiws_by_index_usage.h b/storage/perfschema/table_tiws_by_index_usage.h
index 5d1b8bc9d652..822de366bd20 100644
--- a/storage/perfschema/table_tiws_by_index_usage.h
+++ b/storage/perfschema/table_tiws_by_index_usage.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -73,6 +80,7 @@ struct pos_tiws_by_index_usage : public PFS_double_index
 class table_tiws_by_index_usage : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_tiws_by_table.cc b/storage/perfschema/table_tiws_by_table.cc
index 59905b3e5404..4fa073e4268b 100644
--- a/storage/perfschema/table_tiws_by_table.cc
+++ b/storage/perfschema/table_tiws_by_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -229,6 +236,11 @@ TABLE_FIELD_DEF
 table_tiws_by_table::m_field_def=
 { 38, field_types };
 
+PFS_engine_table_share_state
+table_tiws_by_table::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_tiws_by_table::m_share=
 {
@@ -241,8 +253,9 @@ table_tiws_by_table::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -357,7 +370,7 @@ int table_tiws_by_table::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -477,7 +490,7 @@ int table_tiws_by_table::read_row_values(TABLE *table,
         set_field_ulonglong(f, m_row.m_stat.m_delete.m_max);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_tiws_by_table.h b/storage/perfschema/table_tiws_by_table.h
index 0951f7c1a1b9..908ca5e5eed8 100644
--- a/storage/perfschema/table_tiws_by_table.h
+++ b/storage/perfschema/table_tiws_by_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -48,6 +55,7 @@ struct row_tiws_by_table
 class table_tiws_by_table : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_tlws_by_table.cc b/storage/perfschema/table_tlws_by_table.cc
index 8cd85e45f43d..a0339eac2d6d 100644
--- a/storage/perfschema/table_tlws_by_table.cc
+++ b/storage/perfschema/table_tlws_by_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -379,6 +386,11 @@ TABLE_FIELD_DEF
 table_tlws_by_table::m_field_def=
 { sizeof(field_types) / sizeof(TABLE_FIELD_TYPE), field_types };
 
+PFS_engine_table_share_state
+table_tlws_by_table::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_tlws_by_table::m_share=
 {
@@ -391,8 +403,9 @@ table_tlws_by_table::m_share=
   sizeof(PFS_simple_index),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -507,7 +520,7 @@ int table_tlws_by_table::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -728,7 +741,7 @@ int table_tlws_by_table::read_row_values(TABLE *table,
         break;
 
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_tlws_by_table.h b/storage/perfschema/table_tlws_by_table.h
index 827d39bd562b..60bf458bc9df 100644
--- a/storage/perfschema/table_tlws_by_table.h
+++ b/storage/perfschema/table_tlws_by_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -48,6 +55,7 @@ struct row_tlws_by_table
 class table_tlws_by_table : public PFS_engine_table
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_users.cc b/storage/perfschema/table_users.cc
index d481f6ef49f6..04f6be7bb79c 100644
--- a/storage/perfschema/table_users.cc
+++ b/storage/perfschema/table_users.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -50,6 +57,11 @@ TABLE_FIELD_DEF
 table_users::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_users::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_users::m_share=
 {
@@ -62,8 +74,9 @@ table_users::m_share=
   sizeof(PFS_simple_index), /* ref length */
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table* table_users::create()
@@ -137,7 +150,7 @@ int table_users::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -154,7 +167,7 @@ int table_users::read_row_values(TABLE *table,
         m_row.m_connection_stat.set_field(f->field_index - 1, f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_users.h b/storage/perfschema/table_users.h
index 490775b2ca28..3d8ea61686d0 100644
--- a/storage/perfschema/table_users.h
+++ b/storage/perfschema/table_users.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -42,6 +49,7 @@ struct row_users
 class table_users : public cursor_by_user
 {
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   /** Table builder */
diff --git a/storage/perfschema/table_uvar_by_thread.cc b/storage/perfschema/table_uvar_by_thread.cc
index 8c21d975a023..3ea2907fc2dc 100644
--- a/storage/perfschema/table_uvar_by_thread.cc
+++ b/storage/perfschema/table_uvar_by_thread.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -98,7 +105,7 @@ void User_variables::materialize(PFS_thread *pfs, THD *thd)
     /* Copy VARIABLE_NAME */
     const char *name= sql_uvar->entry_name.ptr();
     size_t name_length= sql_uvar->entry_name.length();
-    DBUG_ASSERT(name_length <= sizeof(pfs_uvar.m_name));
+    assert(name_length <= sizeof(pfs_uvar.m_name));
     pfs_uvar.m_name.make_row(name, name_length);
 
     /* Copy VARIABLE_VALUE */
@@ -145,6 +152,11 @@ TABLE_FIELD_DEF
 table_uvar_by_thread::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_uvar_by_thread::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_uvar_by_thread::m_share=
 {
@@ -157,8 +169,9 @@ table_uvar_by_thread::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  false  /* perpetual */
+  false, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -300,11 +313,11 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
-  DBUG_ASSERT(m_row.m_variable_name != NULL);
-  DBUG_ASSERT(m_row.m_variable_value != NULL);
+  assert(m_row.m_variable_name != NULL);
+  assert(m_row.m_variable_value != NULL);
 
   for (; (f= *fields) ; fields++)
   {
@@ -333,7 +346,7 @@ ::read_row_values(TABLE *table,
         }
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_uvar_by_thread.h b/storage/perfschema/table_uvar_by_thread.h
index 8ff3dbacb166..a6e29f9d34dc 100644
--- a/storage/perfschema/table_uvar_by_thread.h
+++ b/storage/perfschema/table_uvar_by_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -70,7 +77,7 @@ class User_variables
 
   bool is_materialized(PFS_thread *pfs)
   {
-    DBUG_ASSERT(pfs != NULL);
+    assert(pfs != NULL);
     if (m_pfs != pfs)
       return false;
     if (m_thread_internal_id != pfs->m_thread_internal_id)
@@ -139,6 +146,7 @@ class table_uvar_by_thread : public PFS_engine_table
   typedef pos_uvar_by_thread pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/table_variables_by_thread.cc b/storage/perfschema/table_variables_by_thread.cc
index 306da621890f..3174496998e9 100644
--- a/storage/perfschema/table_variables_by_thread.cc
+++ b/storage/perfschema/table_variables_by_thread.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -51,6 +58,11 @@ TABLE_FIELD_DEF
 table_variables_by_thread::m_field_def=
 { 3, field_types };
 
+PFS_engine_table_share_state
+table_variables_by_thread::m_share_state = {
+  false /* m_checked */
+};
+
 PFS_engine_table_share
 table_variables_by_thread::m_share=
 {
@@ -63,8 +75,9 @@ table_variables_by_thread::m_share=
   sizeof(pos_t),
   &m_table_lock,
   &m_field_def,
-  false, /* checked */
-  true   /* perpetual */
+  true, /* m_perpetual */
+  false, /* m_optional */
+  &m_share_state
 };
 
 PFS_engine_table*
@@ -156,7 +169,7 @@ table_variables_by_thread::rnd_pos(const void *pos)
     return HA_ERR_RECORD_DELETED;
 
   set_position(pos);
-  DBUG_ASSERT(m_pos.m_index_1 < global_thread_container.get_row_count());
+  assert(m_pos.m_index_1 < global_thread_container.get_row_count());
 
   PFS_thread *pfs_thread= global_thread_container.get(m_pos.m_index_1);
     /*
@@ -186,7 +199,7 @@ ::make_row(PFS_thread *thread, const System_variable *system_var)
 {
   pfs_optimistic_state lock;
   m_row_exists= false;
-  if (system_var->is_null())
+  if (system_var->is_null() || system_var->is_ignored())
     return;
 
   /* Protect this reader against a thread termination */
@@ -214,7 +227,7 @@ ::read_row_values(TABLE *table,
     return HA_ERR_RECORD_DELETED;
 
   /* Set the null bits */
-  DBUG_ASSERT(table->s->null_bytes == 1);
+  assert(table->s->null_bytes == 1);
   buf[0]= 0;
 
   for (; (f= *fields) ; fields++)
@@ -233,7 +246,7 @@ ::read_row_values(TABLE *table,
         m_row.m_variable_value.set_field(f);
         break;
       default:
-        DBUG_ASSERT(false);
+        assert(false);
       }
     }
   }
diff --git a/storage/perfschema/table_variables_by_thread.h b/storage/perfschema/table_variables_by_thread.h
index 90d9b4df7e6e..99adcda4e981 100644
--- a/storage/perfschema/table_variables_by_thread.h
+++ b/storage/perfschema/table_variables_by_thread.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
@@ -94,6 +101,7 @@ class table_variables_by_thread : public PFS_engine_table
   typedef pos_variables_by_thread pos_t;
 
 public:
+  static PFS_engine_table_share_state m_share_state;
   /** Table share */
   static PFS_engine_table_share m_share;
   static PFS_engine_table* create();
diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt
index ef01904de37f..6643ccb27d6d 100644
--- a/storage/perfschema/unittest/CMakeLists.txt
+++ b/storage/perfschema/unittest/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -75,6 +82,3 @@ ADD_TEST(pfs_connect_attr pfs_connect_attr-t)
 # ADD_EXECUTABLE(pfs_benchmark-t pfs_benchmark-t.cc pfs_benchmark_helper.cc)
 # TARGET_LINK_LIBRARIES(pfs_benchmark-t mytap perfschema mysys pfs_server_stubs)
 # ADD_TEST(pfs_benchmark pfs_benchmark-t)
-
-# On windows, pfs_connect_attr-t may depend on openssl dlls.
-COPY_OPENSSL_DLLS(copy_openssl_pfs_unittest)
diff --git a/storage/perfschema/unittest/conf.txt b/storage/perfschema/unittest/conf.txt
index 8afd0b4dca77..0cbca30eb479 100644
--- a/storage/perfschema/unittest/conf.txt
+++ b/storage/perfschema/unittest/conf.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs-t.cc b/storage/perfschema/unittest/pfs-t.cc
index ee01561a29c9..943c82737676 100644
--- a/storage/perfschema/unittest/pfs-t.cc
+++ b/storage/perfschema/unittest/pfs-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_account-oom-t.cc b/storage/perfschema/unittest/pfs_account-oom-t.cc
index 5749e05691a1..29187800034c 100644
--- a/storage/perfschema/unittest/pfs_account-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_account-oom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_connect_attr-t.cc b/storage/perfschema/unittest/pfs_connect_attr-t.cc
index 7f02242a2199..08124dcbefbe 100644
--- a/storage/perfschema/unittest/pfs_connect_attr-t.cc
+++ b/storage/perfschema/unittest/pfs_connect_attr-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_host-oom-t.cc b/storage/perfschema/unittest/pfs_host-oom-t.cc
index e558689b4683..bd5396231549 100644
--- a/storage/perfschema/unittest/pfs_host-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_host-oom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_instr-oom-t.cc b/storage/perfschema/unittest/pfs_instr-oom-t.cc
index 6bfcf66827b6..5873a72bbd8d 100644
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_instr-t.cc b/storage/perfschema/unittest/pfs_instr-t.cc
index 5337be4567d3..d8c96a8c7cc7 100644
--- a/storage/perfschema/unittest/pfs_instr-t.cc
+++ b/storage/perfschema/unittest/pfs_instr-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
index 3477dfd28f22..b119c6834069 100644
--- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_instr_class-t.cc b/storage/perfschema/unittest/pfs_instr_class-t.cc
index 55b47609456c..41f248566490 100644
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_misc-t.cc b/storage/perfschema/unittest/pfs_misc-t.cc
index 54d6e6231550..a5823f972a60 100644
--- a/storage/perfschema/unittest/pfs_misc-t.cc
+++ b/storage/perfschema/unittest/pfs_misc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_noop-t.cc b/storage/perfschema/unittest/pfs_noop-t.cc
index 0728006f98ad..e1d6f34243d5 100644
--- a/storage/perfschema/unittest/pfs_noop-t.cc
+++ b/storage/perfschema/unittest/pfs_noop-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -221,6 +228,8 @@ void test_noop()
 
   PSI_server->set_thread_THD(NULL, NULL);
 
+  PSI_server->set_thread_peer_port(NULL, 0);
+
   ok(true, "all noop api called");
 }
 
diff --git a/storage/perfschema/unittest/pfs_server_stubs.cc b/storage/perfschema/unittest/pfs_server_stubs.cc
index fbdd2dbeb96f..339686f83f6b 100644
--- a/storage/perfschema/unittest/pfs_server_stubs.cc
+++ b/storage/perfschema/unittest/pfs_server_stubs.cc
@@ -1,14 +1,21 @@
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights
    reserved.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/unittest/pfs_timer-t.cc b/storage/perfschema/unittest/pfs_timer-t.cc
index cc806aeada84..41e79c73ac72 100644
--- a/storage/perfschema/unittest/pfs_timer-t.cc
+++ b/storage/perfschema/unittest/pfs_timer-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/pfs_user-oom-t.cc b/storage/perfschema/unittest/pfs_user-oom-t.cc
index 20eaf79b8b45..63cb49bdaa83 100644
--- a/storage/perfschema/unittest/pfs_user-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_user-oom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/stub_global_status_var.h b/storage/perfschema/unittest/stub_global_status_var.h
index b1c72ccea445..c9f4be01f1a6 100644
--- a/storage/perfschema/unittest/stub_global_status_var.h
+++ b/storage/perfschema/unittest/stub_global_status_var.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/storage/perfschema/unittest/stub_pfs_defaults.h b/storage/perfschema/unittest/stub_pfs_defaults.h
index f4fa24245d57..4b37c46fc287 100644
--- a/storage/perfschema/unittest/stub_pfs_defaults.h
+++ b/storage/perfschema/unittest/stub_pfs_defaults.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
diff --git a/storage/perfschema/unittest/stub_pfs_global.h b/storage/perfschema/unittest/stub_pfs_global.h
index c883927b040c..46a2d747feff 100644
--- a/storage/perfschema/unittest/stub_pfs_global.h
+++ b/storage/perfschema/unittest/stub_pfs_global.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
@@ -30,7 +37,7 @@ void *pfs_malloc(PFS_builtin_memory_class *klass, size_t size, myf)
   /*
     Catch non initialized sizing parameter in the unit tests.
   */
-  DBUG_ASSERT(size <= 100*1024*1024);
+  assert(size <= 100*1024*1024);
 
   if (stub_alloc_always_fails)
     return NULL;
diff --git a/storage/perfschema/unittest/stub_print_error.h b/storage/perfschema/unittest/stub_print_error.h
index fe9857a5348c..6c84ba4e3607 100644
--- a/storage/perfschema/unittest/stub_print_error.h
+++ b/storage/perfschema/unittest/stub_print_error.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  it under the terms of the GNU General Public License, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU General Public License, version 2.0, for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
diff --git a/strings/CHARSET_INFO.txt b/strings/CHARSET_INFO.txt
index 711c02761a4d..8cb854d10329 100644
--- a/strings/CHARSET_INFO.txt
+++ b/strings/CHARSET_INFO.txt
@@ -1,3 +1,24 @@
+Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2.0,
+as published by the Free Software Foundation.
+
+This program is also distributed with certain software (including
+but not limited to OpenSSL) that is licensed under separate terms,
+as designated in a particular file or component or in included license
+documentation.  The authors of MySQL hereby grant you an additional
+permission to link the program and your derivative works with the
+separately licensed software that they have included with MySQL.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License, version 2.0, for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 CHARSET_INFO
 ============
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index c0ce839d81ab..00e849a4d6bd 100644
--- a/strings/CMakeLists.txt
+++ b/strings/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -35,7 +42,3 @@ ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
 
 ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c)
 TARGET_LINK_LIBRARIES(conf_to_src strings)
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/strings/bchange.c b/strings/bchange.c
index 303344aa9236..9f47377833dd 100644
--- a/strings/bchange.c
+++ b/strings/bchange.c
@@ -1,14 +1,26 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index 80051831b345..70bcef47fcfa 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -183,7 +190,7 @@ static int my_read_charset_file(const char *filename)
   }
   
   len=read(fd,buf,MAX_BUF);
-  DBUG_ASSERT(len < MAX_BUF);
+  assert(len < MAX_BUF);
   close(fd);
   
   if (my_parse_charset_xml(&loader, buf, len))
@@ -278,16 +285,23 @@ static void
 fprint_copyright(FILE *file)
 {
   fprintf(file,
-"/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.\n"
+"/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.\n"
 "\n"
 "   This program is free software; you can redistribute it and/or modify\n"
-"   it under the terms of the GNU General Public License as published by\n"
-"   the Free Software Foundation; version 2 of the License.\n"
+"   it under the terms of the GNU General Public License, version 2.0,\n"
+"   as published by the Free Software Foundation.\n"
+"\n"
+"   This program is also distributed with certain software (including\n"
+"   but not limited to OpenSSL) that is licensed under separate terms,\n"
+"   as designated in a particular file or component or in included license\n"
+"   documentation.  The authors of MySQL hereby grant you an additional\n"
+"   permission to link the program and your derivative works with the\n"
+"   separately licensed software that they have included with MySQL.\n"
 "\n"
 "   This program is distributed in the hope that it will be useful,\n"
 "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"   GNU General Public License for more details.\n"
+"   GNU General Public License, version 2.0, for more details.\n"
 "\n"
 "   You should have received a copy of the GNU General Public License\n"
 "   along with this program; if not, write to the Free Software\n"
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 3581f861e47f..178fe7c0ee9c 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 19ea41b43935..5fb8866ccf70 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index 44645dd285b8..3a87b885b8c4 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index d222be6e8c00..208d125f4436 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index e5a8731620c5..160f1b5caf0e 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 6e061c3ef8ca..41fe53dc8f83 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2005, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index a3a71ff75cf4..98ab568605fb 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -6,16 +6,28 @@
     ./conf_to_src {CMAKE_SOURCE_DIR}/sql/share/charsets/ > ctype-extra.c
 */
 
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-gb18030.c b/strings/ctype-gb18030.c
index de9342204d62..44b4112735de 100644
--- a/strings/ctype-gb18030.c
+++ b/strings/ctype-gb18030.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21074,7 +21086,7 @@ uint gb18030_chs_to_code(const uchar *src, size_t srclen)
 {
   uint r= 0;
 
-  DBUG_ASSERT(srclen == 1 || srclen == 2 || srclen == 4);
+  assert(srclen == 1 || srclen == 2 || srclen == 4);
 
   switch (srclen)
   {
@@ -21088,7 +21100,7 @@ uint gb18030_chs_to_code(const uchar *src, size_t srclen)
       r= (src[0] << 24) + (src[1] << 16) + (src[2] << 8) + src[3];
       break;
     default:
-      DBUG_ASSERT(0);
+      assert(0);
   }
 
   return r;
@@ -21112,7 +21124,7 @@ code_to_gb18030_chs(uchar *dst, size_t dstlen, uint code)
   for (i= 0; code != 0; i++, code>>= 8)
     r[i]= (uchar) (code & 0xFF);
 
-  DBUG_ASSERT(i == 1 || i == 2 || i == 4);
+  assert(i == 1 || i == 2 || i == 4);
   for (; i > 0 && dst < dst_end; --i, ++len)
     *dst++= r[i - 1];
 
@@ -21132,7 +21144,7 @@ code_to_gb18030_chs(uchar *dst, size_t dstlen, uint code)
 static uint
 diff_to_gb18030_4(uchar *dst, uint dstlen, uint diff)
 {
-  DBUG_ASSERT(dstlen >= 4);
+  assert(dstlen >= 4);
 
   if (diff > MAX_GB18030_DIFF || dstlen < 4)
     return 0;
@@ -21158,16 +21170,16 @@ gb18030_4_code_to_diff(uint code)
 {
   uint diff= 0;
 
-  DBUG_ASSERT(is_mb_odd((code >> 24) & 0xFF));
+  assert(is_mb_odd((code >> 24) & 0xFF));
   diff+= ((code >> 24) & 0xFF) - MIN_MB_ODD_BYTE;
   diff*= 10;
-  DBUG_ASSERT(is_mb_even_4((code >> 16) & 0xFF));
+  assert(is_mb_even_4((code >> 16) & 0xFF));
   diff+= ((code >> 16) & 0xFF) - MIN_MB_EVEN_BYTE_4;
   diff*= 126;
-  DBUG_ASSERT(is_mb_odd((code >> 8) & 0xFF));
+  assert(is_mb_odd((code >> 8) & 0xFF));
   diff+= ((code >> 8) & 0xFF) - MIN_MB_ODD_BYTE;
   diff*= 10;
-  DBUG_ASSERT(is_mb_even_4(code & 0xFF));
+  assert(is_mb_even_4(code & 0xFF));
   diff+= (code & 0xFF) - MIN_MB_EVEN_BYTE_4;
 
   return diff;
@@ -21202,7 +21214,7 @@ static uint
 my_ismbchar_gb18030(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
                     const char *p, const char *e)
 {
-  DBUG_ASSERT(e > p);
+  assert(e > p);
 
   if (e - p <= 1 || !is_mb_odd(p[0]))
     return 0;
@@ -21349,12 +21361,12 @@ my_wc_mb_gb18030_chs(const CHARSET_INFO *cs  MY_ATTRIBUTE((unused)),
         return MY_CS_TOOSMALL4;
 
       err= diff_to_gb18030_4(s, 4, idx);
-      DBUG_ASSERT(err != 0);
+      assert(err != 0);
 
       return err != 0 ? len : MY_CS_ILUNI;
   }
 
-  DBUG_ASSERT(0);
+  assert(0);
   return MY_CS_ILUNI;
 }
 
@@ -21451,7 +21463,7 @@ my_mb_wc_gb18030(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
       /* (GB+8431A439, GB+90308130) and (GB+E3329A35, GB+FE39FE39) */
       cp= 0x003F;
     else
-      DBUG_ASSERT(0);
+      assert(0);
 
     *pwc= cp;
     return 4;
@@ -21512,7 +21524,7 @@ get_case_info(const CHARSET_INFO *cs, const uchar *src, size_t srclen)
 {
   const MY_UNICASE_CHARACTER *p= NULL;
 
-  DBUG_ASSERT(cs != NULL);
+  assert(cs != NULL);
 
   switch (srclen)
   {
@@ -21541,7 +21553,7 @@ get_case_info(const CHARSET_INFO *cs, const uchar *src, size_t srclen)
       return p ? &p[code & 0xFF] : NULL;
   }
 
-  DBUG_ASSERT(0);
+  assert(0);
   return NULL;
 }
 
@@ -21568,10 +21580,10 @@ case_info_code_to_gb18030(uint code)
              code <= (MAX_3_BYTE_FROM_UNI & 0xFFFF))
       code+= (MIN_3_BYTE_FROM_UNI & 0xFF0000);
     else
-      DBUG_ASSERT(0);
+      assert(0);
 
     r= diff_to_gb18030_4(gbchs, 4, code);
-    DBUG_ASSERT(r == 4);
+    assert(r == 4);
 
     return r == 4 ? gb18030_chs_to_code(gbchs, 4) : 0;
   }
@@ -21594,7 +21606,7 @@ get_casefolded_code(const CHARSET_INFO *cs, const uchar *src,
 {
   const MY_UNICASE_CHARACTER *ch= get_case_info(cs, src, srclen);
 
-  DBUG_ASSERT(srclen == 1 || srclen == 2 || srclen == 4);
+  assert(srclen == 1 || srclen == 2 || srclen == 4);
 
   return ch ? case_info_code_to_gb18030(is_upper ? ch->toupper : ch->tolower) :
          0;
@@ -21627,7 +21639,7 @@ my_casefold_gb18030(const CHARSET_INFO *cs, char *src, size_t srclen,
   {
     uint mblen= my_ismbchar_gb18030(cs, src, srcend);
 
-    DBUG_ASSERT(dst < dst_end);
+    assert(dst < dst_end);
     if (mblen)
     {
       uint code= get_casefolded_code(cs, (uchar *) src, mblen, is_upper);
@@ -21637,14 +21649,14 @@ my_casefold_gb18030(const CHARSET_INFO *cs, char *src, size_t srclen,
         size_t mblen_dst= code_to_gb18030_chs((uchar *) dst, dst_end - dst,
                                               code);
 
-        DBUG_ASSERT(dst + mblen_dst <= dst_end);
+        assert(dst + mblen_dst <= dst_end);
         src+= mblen;
         dst+= mblen_dst;
       }
       else
       {
-        DBUG_ASSERT(mblen == 2 || mblen == 4);
-        DBUG_ASSERT(dst + mblen <= dst_end);
+        assert(mblen == 2 || mblen == 4);
+        assert(dst + mblen <= dst_end);
 
         if (mblen == 4)
         {
@@ -21677,9 +21689,9 @@ static size_t
 my_casedn_gb18030(const CHARSET_INFO *cs, char *src, size_t srclen,
                   char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(cs != NULL);
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
-  DBUG_ASSERT(dstlen >= srclen * cs->casedn_multiply);
+  assert(cs != NULL);
+  assert(src != dst || cs->casedn_multiply == 1);
+  assert(dstlen >= srclen * cs->casedn_multiply);
   return my_casefold_gb18030(cs, src, srclen, dst, dstlen, cs->to_lower, 0);
 }
 
@@ -21697,9 +21709,9 @@ static size_t
 my_caseup_gb18030(const CHARSET_INFO *cs, char *src, size_t srclen,
                   char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(cs != NULL);
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
-  DBUG_ASSERT(dstlen >= srclen * cs->caseup_multiply);
+  assert(cs != NULL);
+  assert(src != dst || cs->caseup_multiply == 1);
+  assert(dstlen >= srclen * cs->caseup_multiply);
   return my_casefold_gb18030(cs, src, srclen, dst, dstlen, cs->to_upper, 1);
 }
 
@@ -21723,9 +21735,9 @@ my_casedn_gb18030_uca(const CHARSET_INFO *cs, char *src, size_t srclen,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
 
-  DBUG_ASSERT(cs != NULL);
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
-  DBUG_ASSERT(dstlen >= srclen * cs->casedn_multiply);
+  assert(cs != NULL);
+  assert(src != dst || cs->casedn_multiply == 1);
+  assert(dstlen >= srclen * cs->casedn_multiply);
 
   uni_plane= cs->caseinfo;
 
@@ -21771,9 +21783,9 @@ my_caseup_gb18030_uca(const CHARSET_INFO *cs, char *src, size_t srclen,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
 
-  DBUG_ASSERT(cs != NULL);
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
-  DBUG_ASSERT(dstlen >= srclen * cs->caseup_multiply);
+  assert(cs != NULL);
+  assert(src != dst || cs->caseup_multiply == 1);
+  assert(dstlen >= srclen * cs->caseup_multiply);
 
   uni_plane= cs->caseinfo;
 
@@ -21876,7 +21888,7 @@ get_weight_for_mbchar(const CHARSET_INFO *cs, const uchar *src, size_t mblen)
 {
   uint weight, caseup_code, code= gb18030_chs_to_code(src, mblen);
 
-  DBUG_ASSERT(mblen == 2 || mblen == 4);
+  assert(mblen == 2 || mblen == 4);
 
   /* Make sure the max 4-byte gb18030 code has the max weight */
   if (code == 0xFE39FE39)
@@ -21908,11 +21920,11 @@ get_weight_for_mbchar(const CHARSET_INFO *cs, const uchar *src, size_t mblen)
 static uint
 get_weight_for_gb18030_chs(const CHARSET_INFO *cs, const char *s, size_t s_len)
 {
-  DBUG_ASSERT(s_len == 1 || s_len == 2 || s_len == 4);
+  assert(s_len == 1 || s_len == 2 || s_len == 4);
 
   if (s_len == 1)
   {
-    DBUG_ASSERT(is_mb_1(*s));
+    assert(is_mb_1(*s));
     return cs->sort_order[(uchar) *s];
   }
 
@@ -21947,7 +21959,7 @@ get_code_and_length(const CHARSET_INFO *cs, const char *s,
   if ((len= my_ismbchar_gb18030(cs, s, e)) == 0)
     return 0;
 
-  DBUG_ASSERT(len == 2 || len == 4);
+  assert(len == 2 || len == 4);
   *code= gb18030_chs_to_code((const uchar *) s, len);
   return len;
 }
@@ -21977,7 +21989,7 @@ my_strnncoll_gb18030_internal(const CHARSET_INFO *cs,
   const uchar *se= s + s_length;
   const uchar *te= t + t_length;
 
-  DBUG_ASSERT(cs != NULL);
+  assert(cs != NULL);
 
   while (s < se && t < te)
   {
@@ -22118,7 +22130,7 @@ my_strnxfrm_gb18030(const CHARSET_INFO *cs,
   const uchar *se= src + srclen;
   const uchar *sort_order;
 
-  DBUG_ASSERT(cs != NULL);
+  assert(cs != NULL);
   sort_order= cs->sort_order;
 
   for (; dst < de && src < se && nweights; nweights--)
@@ -22176,11 +22188,11 @@ unicode_to_gb18030_code(const CHARSET_INFO *cs, int unicode)
   uint dst_len;
   int res;
 
-  DBUG_ASSERT(cs != NULL);
+  assert(cs != NULL);
 
   res= cs->cset->wc_mb(cs, unicode, dst, dst + 4);
 
-  DBUG_ASSERT(res == 1 || res == 2 || res == 4);
+  assert(res == 1 || res == 2 || res == 4);
 
   dst_len= (uint) res;
   return gb18030_chs_to_code(dst, dst_len);
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index 0d74438afde7..70fa418233a1 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index fa410d43dc55..84a4319a1ca1 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 40782de70515..fab883994b58 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 784aab1bd22d..f21c4865a6f5 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -79,9 +91,9 @@ size_t my_caseup_mb(const CHARSET_INFO *cs, char *src, size_t srclen,
   char *srcend= src + srclen;
   const uchar *map= cs->to_upper;
 
-  DBUG_ASSERT(cs->caseup_multiply == 1);
-  DBUG_ASSERT(src == dst && srclen == dstlen);
-  DBUG_ASSERT(cs->mbmaxlen == 2);
+  assert(cs->caseup_multiply == 1);
+  assert(src == dst && srclen == dstlen);
+  assert(cs->mbmaxlen == 2);
 
   while (src < srcend)
   {
@@ -114,9 +126,9 @@ size_t my_casedn_mb(const CHARSET_INFO *cs, char *src, size_t srclen,
   char *srcend= src + srclen;
   const uchar *map=cs->to_lower;
 
-  DBUG_ASSERT(cs->casedn_multiply == 1);
-  DBUG_ASSERT(src == dst && srclen == dstlen);
-  DBUG_ASSERT(cs->mbmaxlen == 2);
+  assert(cs->casedn_multiply == 1);
+  assert(src == dst && srclen == dstlen);
+  assert(cs->mbmaxlen == 2);
 
   while (src < srcend)
   {
@@ -159,7 +171,7 @@ my_casefold_mb_varlen(const CHARSET_INFO *cs,
 {
   char *srcend= src + srclen, *dst0= dst;
 
-  DBUG_ASSERT(cs->mbmaxlen == 2);
+  assert(cs->mbmaxlen == 2);
 
   while (src < srcend)
   {
@@ -194,8 +206,8 @@ size_t
 my_casedn_mb_varlen(const CHARSET_INFO *cs, char *src, size_t srclen,
                     char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(dstlen >= srclen * cs->casedn_multiply); 
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
+  assert(dstlen >= srclen * cs->casedn_multiply); 
+  assert(src != dst || cs->casedn_multiply == 1);
   return my_casefold_mb_varlen(cs, src, srclen, dst, dstlen, cs->to_lower, 0);
 }
 
@@ -204,8 +216,8 @@ size_t
 my_caseup_mb_varlen(const CHARSET_INFO *cs, char *src, size_t srclen,
                     char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(dstlen >= srclen * cs->caseup_multiply);
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
+  assert(dstlen >= srclen * cs->caseup_multiply);
+  assert(src != dst || cs->caseup_multiply == 1);
   return my_casefold_mb_varlen(cs, src, srclen, dst, dstlen, cs->to_upper, 1);
 }
 
@@ -233,7 +245,7 @@ int my_strcasecmp_mb(const CHARSET_INFO *cs,const char *s, const char *t)
       return 1;
   }
   /* At least one of '*s' and '*t' is zero here. */
-  DBUG_ASSERT(!*t || !*s);
+  assert(!*t || !*s);
   return (*t != *s);
 }
 
@@ -605,7 +617,7 @@ my_strnxfrm_mb(const CHARSET_INFO *cs,
   const uchar *se= src + srclen;
   const uchar *sort_order= cs->sort_order;
 
-  DBUG_ASSERT(cs->mbmaxlen <= 4);
+  assert(cs->mbmaxlen <= 4);
 
   /*
     If "srclen" is smaller than both "dstlen" and "nweights"
@@ -735,7 +747,7 @@ static void pad_max_char(const CHARSET_INFO *cs, char *str, char *end)
     else
     {
       /* Currently, it's only for GB18030, so it must be a 4-byte char */
-      DBUG_ASSERT(cs->max_sort_char > 0xFFFFFF);
+      assert(cs->max_sort_char > 0xFFFFFF);
       buf[0]= cs->max_sort_char >> 24 & 0xFF;
       buf[1]= cs->max_sort_char >> 16 & 0xFF;
       buf[2]= cs->max_sort_char >> 8 & 0xFF;
@@ -749,7 +761,7 @@ static void pad_max_char(const CHARSET_INFO *cs, char *str, char *end)
                             (uchar*) buf + sizeof(buf));
   }
   
-  DBUG_ASSERT(buflen > 0);
+  assert(buflen > 0);
   do
   {
     if ((str + buflen) <= end)
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 953eb75c66f6..02194a304131 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -230,7 +242,7 @@ size_t my_caseup_8bit(const CHARSET_INFO *cs, char *src, size_t srclen,
 {
   char *end= src + srclen;
   const uchar *map= cs->to_upper;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
   for ( ; src != end ; src++)
     *src= (char) map[(uchar) *src];
   return srclen;
@@ -243,7 +255,7 @@ size_t my_casedn_8bit(const CHARSET_INFO *cs, char *src, size_t srclen,
 {
   char *end= src + srclen;
   const uchar *map=cs->to_lower;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
   for ( ; src != end ; src++)
     *src= (char) map[(uchar) *src];
   return srclen;
@@ -1560,7 +1572,7 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
     str++;
     if (str < end)
     {
-      int negative_exp, exponent;
+      longlong negative_exp, exponent;
       if ((negative_exp= (*str == '-')) || *str=='+')
       {
         if (++str == end)
@@ -1570,7 +1582,10 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
            str < end && (ch= (uchar) (*str - '0')) < 10;
            str++)
       {
-        exponent= exponent * 10 + ch;
+        if (exponent <= (LLONG_MAX - ch) / 10)
+         exponent= exponent * 10 + ch;
+        else
+         goto ret_too_big;
       }
       shift+= negative_exp ? -exponent : exponent;
     }
@@ -1591,7 +1606,7 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
   {
     ulonglong d, r;
     
-    if (-shift >= DIGITS_IN_ULONGLONG)
+    if (shift == INT_MIN32 || -shift >= DIGITS_IN_ULONGLONG)
       goto ret_zero; /* Exponent is a big negative number, return 0 */
     
     d= d10[-shift];
@@ -1743,7 +1758,7 @@ my_bool my_propagate_complex(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
 
 uint my_strxfrm_flag_normalize(uint flags, uint maximum)
 {
-  DBUG_ASSERT(maximum >= 1 && maximum <= MY_STRXFRM_NLEVELS);
+  assert(maximum >= 1 && maximum <= MY_STRXFRM_NLEVELS);
   
   /* If levels are omitted, then 1-maximum is assumed*/
   if (!(flags & MY_STRXFRM_LEVEL_ALL))
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 4307b96f2951..939365397b17 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index a3a6abcd6952..5d88cc04768b 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index aba5102d2b14..8bc855727fc1 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -19536,14 +19536,14 @@ my_uca_add_contraction(MY_CONTRACTIONS *list, my_wc_t *wc, size_t len,
     Contraction is never longer than MY_UCA_MAX_CONTRACTION,
     which is guaranteed by using my_coll_rule_expand() with proper limit.
   */
-  DBUG_ASSERT(len > 1 && len <= MY_UCA_MAX_CONTRACTION);
+  assert(len > 1 && len <= MY_UCA_MAX_CONTRACTION);
   for (i= 0; i < len; i++)
   {
     /*
       We don't support contractions with U+0000.
       my_coll_rule_expand() guarantees there're no U+0000 in a contraction.
     */
-    DBUG_ASSERT(wc[i] != 0);
+    assert(wc[i] != 0);
     next->ch[i]= wc[i];
   }
   if (i < MY_UCA_MAX_CONTRACTION)
@@ -21061,7 +21061,7 @@ my_coll_rule_shift_at_level(MY_COLL_RULE *r, int level)
     /* Do nothing for '=': use the previous offsets for all levels */
     break;
   default:
-    DBUG_ASSERT(0);
+    assert(0);
   }
 }
 
@@ -21387,7 +21387,7 @@ my_coll_parser_scan_logical_position(MY_COLL_RULE_PARSER *p,
       Let's assert in debug version and print
       a nice error message in production version.
     */
-    DBUG_ASSERT(0);
+    assert(0);
     return my_coll_parser_too_long_error(p, "Logical position");
   }
   return my_coll_parser_scan(p);
@@ -21776,7 +21776,7 @@ my_uca_copy_page(MY_CHARSET_LOADER *loader,
   if (!(dst->weights[page]= (uint16 *) (loader->once_alloc)(size)))
     return TRUE;
 
-  DBUG_ASSERT(src->lengths[page] <= dst->lengths[page]);
+  assert(src->lengths[page] <= dst->lengths[page]);
   memset(dst->weights[page], 0, size);
   for (chc=0 ; chc < 256; chc++)
   {
@@ -21833,7 +21833,7 @@ apply_shift(MY_CHARSET_LOADER *loader,
   else
   {
     /* Shift to an ignorable character, e.g.: & \u0000 < \u0001 */
-    DBUG_ASSERT(to[0] == 0);
+    assert(to[0] == 0);
     to[0]= r->diff[level];
   }
   return FALSE; 
@@ -21878,7 +21878,7 @@ apply_one_rule(MY_CHARSET_LOADER *loader,
   else
   {
     my_wc_t pagec= (r->curr[0] >> 8);
-    DBUG_ASSERT(dst->weights[pagec]);
+    assert(dst->weights[pagec]);
     to= my_char_weight_addr(dst, r->curr[0]);
     /* Store weights of the "reset to" character */
     nweights= my_char_weight_put(dst, to, dst->lengths[pagec], r->base, nreset);
@@ -24735,7 +24735,7 @@ MY_COLLATION_HANDLER my_collation_utf32_uca_handler =
 
 extern MY_CHARSET_HANDLER my_charset_utf32_handler;
 
-#define MY_CS_UTF32_UCA_FLAGS (MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII)
+#define MY_CS_UTF32_UCA_FLAGS (MY_CS_COMPILED|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_UNICODE_SUPPLEMENT|MY_CS_NONASCII)
 
 CHARSET_INFO my_charset_utf32_unicode_ci=
 {
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 16d39d488d8f..a423435d5e96 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -64,7 +64,7 @@ static size_t
 my_caseup_str_mb2_or_mb4(const CHARSET_INFO * cs  MY_ATTRIBUTE((unused)), 
                          char * s MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -73,7 +73,7 @@ static size_t
 my_casedn_str_mb2_or_mb4(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), 
                          char * s MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -83,7 +83,7 @@ my_strcasecmp_mb2_or_mb4(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
                          const char *s MY_ATTRIBUTE((unused)),
                          const char *t MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return 0;
 }
 
@@ -726,7 +726,7 @@ my_strtoll10_mb2(const CHARSET_INFO *cs,
       Odd length indicates a bug in the caller.
       Assert in debug, round in production.
     */
-    DBUG_ASSERT((*endptr - s) % 2 == 0);
+    assert((*endptr - s) % 2 == 0);
     end= s + ((*endptr - s) / 2) * 2;
 
     for ( ; ; ) /* Skip leading spaces and tabs */
@@ -939,12 +939,12 @@ my_fill_mb2(const CHARSET_INFO *cs, char *s, size_t slen, int fill)
   char buf[10];
   int buflen;
 
-  DBUG_ASSERT((slen % 2) == 0);
+  assert((slen % 2) == 0);
 
   buflen= cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
                           (uchar*) buf + sizeof(buf));
 
-  DBUG_ASSERT(buflen > 0);
+  assert(buflen > 0);
 
   while (slen >= (size_t) buflen)
   {
@@ -1037,7 +1037,7 @@ my_vsnprintf_mb2(char *dst, size_t n, const char* fmt, va_list ap)
     *dst++= '%';                            /* % used as % or unknown code */
   }
   
-  DBUG_ASSERT(dst <= end);
+  assert(dst <= end);
   *dst='\0';                                /* End of errmessage */
   return (size_t) (dst - start);
 }
@@ -1205,7 +1205,7 @@ my_caseup_utf16(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((src < srcend) &&
          (res= cs->cset->mb_wc(cs, &wc, (uchar *) src, (uchar *) srcend)) > 0)
@@ -1258,7 +1258,7 @@ my_casedn_utf16(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((src < srcend) &&
          (res= cs->cset->mb_wc(cs, &wc, (uchar *) src, (uchar *) srcend)) > 0)
@@ -1347,8 +1347,8 @@ my_strnncollsp_utf16(const CHARSET_INFO *cs,
   const uchar *se= s + slen, *te= t + tlen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
 
-  DBUG_ASSERT((slen % 2) == 0);
-  DBUG_ASSERT((tlen % 2) == 0);
+  assert((slen % 2) == 0);
+  assert((tlen % 2) == 0);
 
 #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
   diff_if_only_endspace_difference= FALSE;
@@ -1422,7 +1422,7 @@ static uint
 my_mbcharlen_utf16(const CHARSET_INFO *cs  MY_ATTRIBUTE((unused)),
                    uint c MY_ATTRIBUTE((unused)))
 {
-  DBUG_ASSERT(0);
+  assert(0);
   return MY_UTF16_HIGH_HEAD(c) ? 4 : 2;
 }
 
@@ -1546,8 +1546,8 @@ my_strnncollsp_utf16_bin(const CHARSET_INFO *cs,
   my_wc_t s_wc= 0, t_wc= 0;
   const uchar *se= s + slen, *te= t + tlen;
 
-  DBUG_ASSERT((slen % 2) == 0);
-  DBUG_ASSERT((tlen % 2) == 0);
+  assert((slen % 2) == 0);
+  assert((tlen % 2) == 0);
 
 #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
   diff_if_only_endspace_difference= FALSE;
@@ -2006,7 +2006,7 @@ my_caseup_utf32(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((src < srcend) &&
          (res= my_utf32_uni(cs, &wc, (uchar *)src, (uchar*) srcend)) > 0)
@@ -2076,7 +2076,7 @@ my_casedn_utf32(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((res= my_utf32_uni(cs, &wc, (uchar*) src, (uchar*) srcend)) > 0)
   {
@@ -2164,8 +2164,8 @@ my_strnncollsp_utf32(const CHARSET_INFO *cs,
   const uchar *se= s + slen, *te= t + tlen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
 
-  DBUG_ASSERT((slen % 4) == 0);
-  DBUG_ASSERT((tlen % 4) == 0);
+  assert((slen % 4) == 0);
+  assert((tlen % 4) == 0);
 
 #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE
   diff_if_only_endspace_difference= FALSE;
@@ -2216,7 +2216,7 @@ my_strnncollsp_utf32(const CHARSET_INFO *cs,
     {
       if ((s_res= my_utf32_uni(cs, &s_wc, s, se)) < 0)
       {
-        DBUG_ASSERT(0);
+        assert(0);
         return 0;
       }
       if (s_wc != ' ')
@@ -2256,7 +2256,7 @@ static size_t
 my_vsnprintf_utf32(char *dst, size_t n, const char* fmt, va_list ap)
 {
   char *start= dst, *end= dst + n;
-  DBUG_ASSERT((n % 4) == 0);
+  assert((n % 4) == 0);
   for (; *fmt ; fmt++)
   {
     if (fmt[0] != '%')
@@ -2332,7 +2332,7 @@ my_vsnprintf_utf32(char *dst, size_t n, const char* fmt, va_list ap)
     *dst++= '%';    /* % used as % or unknown code */
   }
   
-  DBUG_ASSERT(dst < end);
+  assert(dst < end);
   *dst++= '\0';
   *dst++= '\0';
   *dst++= '\0';
@@ -2549,7 +2549,7 @@ my_well_formed_len_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
   /* Ensure string length is divisible by 4 */
   const char *b0= b;
   size_t length= e - b;
-  DBUG_ASSERT((length % 4) == 0);
+  assert((length % 4) == 0);
   *error= 0;
   nchars*= 4;
   if (length > nchars)
@@ -2577,14 +2577,14 @@ void my_fill_utf32(const CHARSET_INFO *cs,
   char buf[10];
   char *e= s + slen;
 
-  DBUG_ASSERT((slen % 4) == 0);
+  assert((slen % 4) == 0);
   {
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     uint buflen=
 #endif
       cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf,
                       (uchar*) buf + sizeof(buf));
-    DBUG_ASSERT(buflen == 4);
+    assert(buflen == 4);
   }
   while (s < e)
   {
@@ -2599,7 +2599,7 @@ my_lengthsp_utf32(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
                   const char *ptr, size_t length)
 {
   const char *end= ptr + length;
-  DBUG_ASSERT((length % 4) == 0);
+  assert((length % 4) == 0);
   while (end > ptr + 3 && end[-1] == ' ' && !end[-2] && !end[-3] && !end[-4])
     end-= 4;
   return (size_t) (end - ptr);
@@ -2682,8 +2682,8 @@ my_strnncollsp_utf32_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
   const uchar *se, *te;
   size_t minlen;
 
-  DBUG_ASSERT((slen % 4) == 0);
-  DBUG_ASSERT((tlen % 4) == 0);
+  assert((slen % 4) == 0);
+  assert((tlen % 4) == 0);
 
   se= s + slen;
   te= t + tlen;
@@ -2811,7 +2811,7 @@ MY_CHARSET_HANDLER my_charset_utf32_handler=
 CHARSET_INFO my_charset_utf32_general_ci=
 {
   60,0,0,              /* number       */
-  MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII,
+  MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_UNICODE_SUPPLEMENT|MY_CS_NONASCII,
   "utf32",             /* cs name    */
   "utf32_general_ci",  /* name         */
   "UTF-32 Unicode",    /* comment      */
@@ -3002,7 +3002,7 @@ static size_t my_caseup_ucs2(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((src < srcend) &&
          (res= my_ucs2_uni(cs, &wc, (uchar *)src, (uchar*) srcend)) > 0)
@@ -3055,7 +3055,7 @@ static size_t my_casedn_ucs2(const CHARSET_INFO *cs, char *src, size_t srclen,
   int res;
   char *srcend= src + srclen;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src == dst && srclen == dstlen);
+  assert(src == dst && srclen == dstlen);
 
   while ((src < srcend) &&
          (res= my_ucs2_uni(cs, &wc, (uchar*) src, (uchar*) srcend)) > 0)
@@ -3073,7 +3073,7 @@ static void
 my_fill_ucs2(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), 
              char *s, size_t l, int fill)
 {
-  DBUG_ASSERT(fill <= 0xFFFF);
+  assert(fill <= 0xFFFF);
   for ( ; l >= 2; s[0]= (fill >> 8), s[1]= (fill & 0xFF), s+= 2, l-= 2);
 }
 
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index a4e68776ee64..63adf3272054 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
-   Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, tommy@valley.ne.jp
+   Copyright (c) 2002, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -67230,8 +67230,8 @@ size_t
 my_casedn_ujis(const CHARSET_INFO *cs, char *src, size_t srclen,
                char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(dstlen >= srclen * cs->casedn_multiply); 
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
+  assert(dstlen >= srclen * cs->casedn_multiply); 
+  assert(src != dst || cs->casedn_multiply == 1);
   return my_casefold_ujis(cs, src, srclen, dst, dstlen, cs->to_lower, 0);
 }
 
@@ -67243,8 +67243,8 @@ size_t
 my_caseup_ujis(const CHARSET_INFO *cs, char *src, size_t srclen,
                char *dst, size_t dstlen)
 {
-  DBUG_ASSERT(dstlen >= srclen * cs->caseup_multiply);
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
+  assert(dstlen >= srclen * cs->caseup_multiply);
+  assert(src != dst || cs->caseup_multiply == 1);
   return my_casefold_ujis(cs, src, srclen, dst, dstlen, cs->to_upper, 1);
 }
 #endif /* defined(HAVE_CHARSET_ujis) || defined(HAVE_CHARSET_eucjpms) */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 7dec9609352e..f3152f41967d 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -48,7 +48,7 @@ int my_valid_mbcharlen_utf8mb3(const uchar *s, const uchar *e)
 {
   uchar c;
 
-  DBUG_ASSERT(s < e);
+  assert(s < e);
   c= s[0];
   if (c < 0x80)
     return 1;
@@ -67,7 +67,7 @@ int my_valid_mbcharlen_utf8mb3(const uchar *s, const uchar *e)
     return 2;
   }
 
-  DBUG_ASSERT(c < 0xf0);
+  assert(c < 0xf0);
   if (s+3 > e) /* We need 3 characters */
     return MY_CS_TOOSMALL3;
 
@@ -5067,7 +5067,7 @@ my_strxfrm_pad_nweights_unicode(uchar *str,
   const uchar *const str0 = str;
   const uchar *const weightend = str + (nweights*2);
   const uchar *const end = (weightend < strend) ? weightend : strend;
-  DBUG_ASSERT(str && str <= strend);
+  assert(str && str <= strend);
 
   while (str < end-3)
   {
@@ -5107,7 +5107,7 @@ static size_t
 my_strxfrm_pad_unicode(uchar *str, const uchar *const strend)
 {
   const uchar *const str0 = str;
-  DBUG_ASSERT(str && str <= strend); 
+  assert(str && str <= strend); 
 
   while (str < strend-3)
   {
@@ -5150,7 +5150,7 @@ my_strnxfrm_unicode(const CHARSET_INFO *cs,
   const uchar *const se= src + srclen;
   const MY_UNICASE_INFO *uni_plane= (cs->state & MY_CS_BINSORT) ?
                                      NULL : cs->caseinfo;
-  DBUG_ASSERT(src);
+  assert(src);
 
   for (; dst < de && nweights; nweights--)
   {
@@ -5191,8 +5191,8 @@ my_strnxfrm_unicode_full_bin(const CHARSET_INFO *cs,
   const uchar *const de= dst + dstlen;
   const uchar *const se= src + srclen;
 
-  DBUG_ASSERT(src);
-  DBUG_ASSERT(cs->state & MY_CS_BINSORT);
+  assert(src);
+  assert(cs->state & MY_CS_BINSORT);
 
   for ( ; dst < de && nweights; nweights--)
   {
@@ -5521,7 +5521,7 @@ my_caseup_utf8(const CHARSET_INFO *cs, char *src, size_t srclen,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
+  assert(src != dst || cs->caseup_multiply == 1);
 
   while ((src < srcend) &&
          (srcres= my_utf8_uni(cs, &wc, (uchar *) src, (uchar*) srcend)) > 0)
@@ -5577,7 +5577,7 @@ static size_t my_caseup_str_utf8(const CHARSET_INFO *cs, char *src)
   int srcres, dstres;
   char *dst= src, *dst0= src;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(cs->caseup_multiply == 1);
+  assert(cs->caseup_multiply == 1);
 
   while (*src &&
          (srcres= my_utf8_uni_no_range(cs, &wc, (uchar *) src)) > 0)
@@ -5600,7 +5600,7 @@ static size_t my_casedn_utf8(const CHARSET_INFO *cs, char *src, size_t srclen,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
+  assert(src != dst || cs->casedn_multiply == 1);
 
   while ((src < srcend) &&
          (srcres= my_utf8_uni(cs, &wc, (uchar*) src, (uchar*)srcend)) > 0)
@@ -5621,7 +5621,7 @@ static size_t my_casedn_str_utf8(const CHARSET_INFO *cs, char *src)
   int srcres, dstres;
   char *dst= src, *dst0= src;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(cs->casedn_multiply == 1);
+  assert(cs->casedn_multiply == 1);
 
   while (*src &&
          (srcres= my_utf8_uni_no_range(cs, &wc, (uchar *) src)) > 0)
@@ -8080,7 +8080,7 @@ my_caseup_utf8mb4(const CHARSET_INFO *cs, char *src, size_t srclen,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src != dst || cs->caseup_multiply == 1);
+  assert(src != dst || cs->caseup_multiply == 1);
 
   while ((src < srcend) &&
          (srcres= my_mb_wc_utf8mb4(cs, &wc,
@@ -8158,7 +8158,7 @@ my_caseup_str_utf8mb4(const CHARSET_INFO *cs, char *src)
   int srcres, dstres;
   char *dst= src, *dst0= src;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(cs->caseup_multiply == 1);
+  assert(cs->caseup_multiply == 1);
 
   while (*src &&
          (srcres= my_mb_wc_utf8mb4_no_range(cs, &wc, (uchar *) src)) > 0)
@@ -8183,7 +8183,7 @@ my_casedn_utf8mb4(const CHARSET_INFO *cs,
   int srcres, dstres;
   char *srcend= src + srclen, *dstend= dst + dstlen, *dst0= dst;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(src != dst || cs->casedn_multiply == 1);
+  assert(src != dst || cs->casedn_multiply == 1);
 
   while ((src < srcend) &&
          (srcres= my_mb_wc_utf8mb4(cs, &wc,
@@ -8206,7 +8206,7 @@ my_casedn_str_utf8mb4(const CHARSET_INFO *cs, char *src)
   int srcres, dstres;
   char *dst= src, *dst0= src;
   const MY_UNICASE_INFO *uni_plane= cs->caseinfo;
-  DBUG_ASSERT(cs->casedn_multiply == 1);
+  assert(cs->casedn_multiply == 1);
 
   while (*src &&
          (srcres= my_mb_wc_utf8mb4_no_range(cs, &wc, (uchar *) src)) > 0)
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 1a6b571310b2..79d4d6c21866 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/ctype.c b/strings/ctype.c
index f5401c04966b..e420172b9c42 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights
  * reserved.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -449,7 +461,7 @@ tailoring_append_abbreviation(MY_XML_PARSER *st,
 
   for ( ; (clen= scan_one_character(attr, attrend, &wc)) > 0; attr+= clen)
   {
-    DBUG_ASSERT(attr < attrend);
+    assert(attr < attrend);
     if (tailoring_append(st, fmt, clen, attr) != MY_XML_OK)
       return MY_XML_ERROR;
   }
@@ -1073,7 +1085,7 @@ my_convert(char *to, size_t to_length, const CHARSET_INFO *to_cs,
     }
   }
 
-  DBUG_ASSERT(FALSE); // Should never get to here
+  assert(FALSE); // Should never get to here
   return 0;           // Make compiler happy
 }
 
@@ -1097,7 +1109,7 @@ my_mbcharlen_ptr(const CHARSET_INFO *cs, const char *s, const char *e)
     len= my_mbcharlen_2(cs, (uchar) *s, (uchar) *(s + 1));
     /* It could be either a valid multi-byte GB18030 code, or invalid
     gb18030 code if return value is 0 */
-    DBUG_ASSERT(len == 0 || len == 2 || len == 4);
+    assert(len == 0 || len == 2 || len == 4);
   }
 
   return len;
diff --git a/strings/decimal.c b/strings/decimal.c
index 0ed286d09bc3..c61d75eaf1fa 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -136,7 +148,7 @@ static const dec1 frac_max[DIG_PER_DEC1-1]={
   999900000, 999990000, 999999000,
   999999900, 999999990 };
 
-#define sanity(d) DBUG_ASSERT((d)->len >0)
+#define sanity(d) assert((d)->len >0)
 
 #define FIX_INTG_FRAC_ERROR(len, intg1, frac1, error)                   \
         do                                                              \
@@ -163,7 +175,7 @@ static const dec1 frac_max[DIG_PER_DEC1-1]={
         do                                                              \
         {                                                               \
           dec1 a=(from1)+(from2)+(carry);                               \
-          DBUG_ASSERT((carry) <= 1);                                    \
+          assert((carry) <= 1);                                         \
           if (((carry)= a >= DIG_BASE)) /* no division here! */         \
             a-=DIG_BASE;                                                \
           (to)=a;                                                       \
@@ -235,7 +247,7 @@ static inline int count_leading_zeroes(int i, dec1 val)
   case 2: if (val >= 100) break; ++ret;  // Fall through.
   case 1: if (val >= 10) break; ++ret;  // Fall through.
   case 0: if (val >= 1) break; ++ret;  // Fall through.
-  default: { DBUG_ASSERT(FALSE); }
+  default: { assert(FALSE); }
   }
   return ret;
 }
@@ -268,7 +280,7 @@ static inline int count_trailing_zeroes(int i, dec1 val)
   case 7: if ((val % 10000000) != 0) break; ++ret;  // Fall through.
   case 8: if ((val % 100000000) != 0) break; ++ret;  // Fall through.
   case 9: if ((val % 1000000000) != 0) break; ++ret;  // Fall through.
-  default: { DBUG_ASSERT(FALSE); }
+  default: { assert(FALSE); }
   }
   return ret;
 }
@@ -288,7 +300,7 @@ void max_decimal(int precision, int frac, decimal_t *to)
 {
   int intpart;
   dec1 *buf= to->buf;
-  DBUG_ASSERT(precision && precision >= frac);
+  assert(precision && precision >= frac);
 
   to->sign= 0;
   if ((intpart= to->intg= (precision - frac)))
@@ -325,7 +337,7 @@ static dec1 *remove_leading_zeroes(const decimal_t *from, int *intg_result)
   if (intg > 0)
   {
     intg-= count_leading_zeroes((intg - 1) % DIG_PER_DEC1, *buf0);
-    DBUG_ASSERT(intg > 0);
+    assert(intg > 0);
   }
   else
     intg=0;
@@ -401,7 +413,7 @@ int decimal2string(const decimal_t *from, char *to, int *to_len,
   char *s=to;
   dec1 *buf, *buf0=from->buf, tmp;
 
-  DBUG_ASSERT(*to_len >= 2+from->sign);
+  assert(*to_len >= 2+from->sign);
 
   /* removing leading zeroes */
   buf0= remove_leading_zeroes(from, &intg);
@@ -589,8 +601,8 @@ void do_mini_left_shift(decimal_t *dec, int shift, int beg, int last)
   dec1 *from= dec->buf + ROUND_UP(beg + 1) - 1;
   dec1 *end= dec->buf + ROUND_UP(last) - 1;
   int c_shift= DIG_PER_DEC1 - shift;
-  DBUG_ASSERT(from >= dec->buf);
-  DBUG_ASSERT(end < dec->buf + dec->len);
+  assert(from >= dec->buf);
+  assert(end < dec->buf + dec->len);
   if (beg % DIG_PER_DEC1 < shift)
     *(from - 1)= (*from) / powers10[c_shift];
   for(; from < end; from++)
@@ -619,8 +631,8 @@ void do_mini_right_shift(decimal_t *dec, int shift, int beg, int last)
   dec1 *from= dec->buf + ROUND_UP(last) - 1;
   dec1 *end= dec->buf + ROUND_UP(beg + 1) - 1;
   int c_shift= DIG_PER_DEC1 - shift;
-  DBUG_ASSERT(from < dec->buf + dec->len);
-  DBUG_ASSERT(end >= dec->buf);
+  assert(from < dec->buf + dec->len);
+  assert(end >= dec->buf);
   if (DIG_PER_DEC1 - ((last - 1) % DIG_PER_DEC1 + 1) < shift)
     *(from + 1)= (*from % powers10[shift]) * powers10[c_shift];
   for(; from > end; from--)
@@ -728,7 +740,7 @@ int decimal_shift(decimal_t *dec, int shift)
         result
       */
       do_left= l_mini_shift <= beg;
-      DBUG_ASSERT(do_left || (dec->len * DIG_PER_DEC1 - end) >= r_mini_shift);
+      assert(do_left || (dec->len * DIG_PER_DEC1 - end) >= r_mini_shift);
     }
     else
     {
@@ -736,7 +748,7 @@ int decimal_shift(decimal_t *dec, int shift)
       l_mini_shift= DIG_PER_DEC1 - r_mini_shift;
       /* see comment above */
       do_left= !((dec->len * DIG_PER_DEC1 - end) >= r_mini_shift);
-      DBUG_ASSERT(!do_left || l_mini_shift <= beg);
+      assert(!do_left || l_mini_shift <= beg);
     }
     if (do_left)
     {
@@ -776,8 +788,8 @@ int decimal_shift(decimal_t *dec, int shift)
       d_shift= new_front / DIG_PER_DEC1;
       to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift);
       barier= dec->buf + (ROUND_UP(end) - 1 - d_shift);
-      DBUG_ASSERT(to >= dec->buf);
-      DBUG_ASSERT(barier + d_shift < dec->buf + dec->len);
+      assert(to >= dec->buf);
+      assert(barier + d_shift < dec->buf + dec->len);
       for(; to <= barier; to++)
         *to= *(to + d_shift);
       for(barier+= d_shift; to <= barier; to++)
@@ -790,8 +802,8 @@ int decimal_shift(decimal_t *dec, int shift)
       d_shift= (1 - new_front) / DIG_PER_DEC1;
       to= dec->buf + ROUND_UP(end) - 1 + d_shift;
       barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift;
-      DBUG_ASSERT(to < dec->buf + dec->len);
-      DBUG_ASSERT(barier - d_shift >= dec->buf);
+      assert(to < dec->buf + dec->len);
+      assert(barier - d_shift >= dec->buf);
       for(; to >= barier; to--)
         *to= *(to - d_shift);
       for(barier-= d_shift; to >= barier; to--)
@@ -810,7 +822,7 @@ int decimal_shift(decimal_t *dec, int shift)
   */
   beg= ROUND_UP(beg + 1) - 1;
   end= ROUND_UP(end) - 1;
-  DBUG_ASSERT(new_point >= 0);
+  assert(new_point >= 0);
   
   /* We don't want negative new_point below */
   if (new_point != 0)
@@ -1408,7 +1420,7 @@ int decimal2bin(decimal_t *from, uchar *to, int precision, int frac)
       case 2: mi_int2store(to, x); break;
       case 3: mi_int3store(to, x); break;
       case 4: mi_int4store(to, x); break;
-      default: DBUG_ASSERT(0);
+    default: assert(0);
     }
     to+=i;
   }
@@ -1417,7 +1429,7 @@ int decimal2bin(decimal_t *from, uchar *to, int precision, int frac)
   for (stop1=buf1+intg1+frac1; buf1 < stop1; to+=sizeof(dec1))
   {
     dec1 x=*buf1++ ^ mask;
-    DBUG_ASSERT(sizeof(dec1) == 4);
+    assert(sizeof(dec1) == 4);
     mi_int4store(to, x);
   }
 
@@ -1436,7 +1448,7 @@ int decimal2bin(decimal_t *from, uchar *to, int precision, int frac)
       case 2: mi_int2store(to, x); break;
       case 3: mi_int3store(to, x); break;
       case 4: mi_int4store(to, x); break;
-      default: DBUG_ASSERT(0);
+    default: assert(0);
     }
     to+=i;
   }
@@ -1450,7 +1462,7 @@ int decimal2bin(decimal_t *from, uchar *to, int precision, int frac)
   orig_to[0]^= 0x80;
 
   /* Check that we have written the whole decimal and nothing more */
-  DBUG_ASSERT(to == orig_to + orig_fsize0 + orig_isize0);
+  assert(to == orig_to + orig_fsize0 + orig_isize0);
   return error;
 }
 
@@ -1518,7 +1530,7 @@ int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale)
       case 2: x=mi_sint2korr(from); break;
       case 3: x=mi_sint3korr(from); break;
       case 4: x=mi_sint4korr(from); break;
-      default: DBUG_ASSERT(0);
+    default: assert(0);
     }
     from+=i;
     *buf=x ^ mask;
@@ -1531,7 +1543,7 @@ int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale)
   }
   for (stop=from+intg0*sizeof(dec1); from < stop; from+=sizeof(dec1))
   {
-    DBUG_ASSERT(sizeof(dec1) == 4);
+    assert(sizeof(dec1) == 4);
     *buf=mi_sint4korr(from) ^ mask;
     if (((uint32)*buf) > DIG_MAX)
       goto err;
@@ -1540,10 +1552,10 @@ int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale)
     else
       to->intg-=DIG_PER_DEC1;
   }
-  DBUG_ASSERT(to->intg >=0);
+  assert(to->intg >=0);
   for (stop=from+frac0*sizeof(dec1); from < stop; from+=sizeof(dec1))
   {
-    DBUG_ASSERT(sizeof(dec1) == 4);
+    assert(sizeof(dec1) == 4);
     *buf=mi_sint4korr(from) ^ mask;
     if (((uint32)*buf) > DIG_MAX)
       goto err;
@@ -1559,7 +1571,7 @@ int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale)
       case 2: x=mi_sint2korr(from); break;
       case 3: x=mi_sint3korr(from); break;
       case 4: x=mi_sint4korr(from); break;
-      default: DBUG_ASSERT(0);
+    default: assert(0);
     }
     *buf=(x ^ mask) * powers10[DIG_PER_DEC1 - frac0x];
     if (((uint32)*buf) > DIG_MAX)
@@ -1590,7 +1602,7 @@ int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale)
 
 int decimal_size(int precision, int scale)
 {
-  DBUG_ASSERT(scale >= 0 && precision > 0 && scale <= precision);
+  assert(scale >= 0 && precision > 0 && scale <= precision);
   return ROUND_UP(precision-scale)+ROUND_UP(scale);
 }
 
@@ -1607,11 +1619,11 @@ int decimal_bin_size(int precision, int scale)
       intg0=intg/DIG_PER_DEC1, frac0=scale/DIG_PER_DEC1,
       intg0x=intg-intg0*DIG_PER_DEC1, frac0x=scale-frac0*DIG_PER_DEC1;
 
-  DBUG_ASSERT(scale >= 0 && precision > 0 && scale <= precision);
-  DBUG_ASSERT(intg0x >= 0);
-  DBUG_ASSERT(intg0x <= DIG_PER_DEC1);
-  DBUG_ASSERT(frac0x >= 0);
-  DBUG_ASSERT(frac0x <= DIG_PER_DEC1);
+  assert(scale >= 0 && precision > 0 && scale <= precision);
+  assert(intg0x >= 0);
+  assert(intg0x <= DIG_PER_DEC1);
+  assert(frac0x >= 0);
+  assert(frac0x <= DIG_PER_DEC1);
   return intg0*sizeof(dec1)+dig2bytes[intg0x]+
          frac0*sizeof(dec1)+dig2bytes[frac0x];
 }
@@ -1653,14 +1665,14 @@ decimal_round(const decimal_t *from, decimal_t *to, int scale,
   case CEILING:         round_digit= from->sign ? 10 : 0; break;
   case FLOOR:           round_digit= from->sign ? 0 : 10; break;
   case TRUNCATE:        round_digit=10; break;
-  default: DBUG_ASSERT(0);
+  default: assert(0);
   }
 
   /*
     For my_decimal we always use len == DECIMAL_BUFF_LENGTH == 9
     For internal testing here (ifdef MAIN) we always use len == 100/4
    */
-  DBUG_ASSERT(from->len == to->len);
+  assert(from->len == to->len);
 
   if (unlikely(frac0+intg0 > len))
   {
@@ -1680,8 +1692,8 @@ decimal_round(const decimal_t *from, decimal_t *to, int scale,
     dec1 *p0= buf0 + intg0 + MY_MAX(frac1, frac0);
     dec1 *p1= buf1 + intg0 + MY_MAX(frac1, frac0);
 
-    DBUG_ASSERT(p0 - buf0 <= len);
-    DBUG_ASSERT(p1 - buf1 <= len);
+    assert(p0 - buf0 <= len);
+    assert(p1 - buf1 <= len);
 
     while (buf0 < p0)
       *(--p1) = *(--p0);
@@ -1708,7 +1720,7 @@ decimal_round(const decimal_t *from, decimal_t *to, int scale,
   if (scale == frac0*DIG_PER_DEC1)
   {
     int do_inc= FALSE;
-    DBUG_ASSERT(frac0+intg0 >= 0);
+    assert(frac0+intg0 >= 0);
     switch (round_digit) {
     case 0:
     {
@@ -1750,7 +1762,7 @@ decimal_round(const decimal_t *from, decimal_t *to, int scale,
   {
     /* TODO - fix this code as it won't work for CEILING mode */
     int pos=frac0*DIG_PER_DEC1-scale-1;
-    DBUG_ASSERT(frac0+intg0 > 0);
+    assert(frac0+intg0 > 0);
     x=*buf1 / powers10[pos];
     y=x % 10;
     if (y > round_digit ||
@@ -1836,7 +1848,7 @@ decimal_round(const decimal_t *from, decimal_t *to, int scale,
     scale=0;
 
 done:
-  DBUG_ASSERT(to->intg <= (len * DIG_PER_DEC1));
+  assert(to->intg <= (len * DIG_PER_DEC1));
   to->frac=scale;
   return error;
 }
@@ -1878,7 +1890,7 @@ int decimal_result_size(decimal_t *from1, decimal_t *from2, char op, int param)
            ROUND_UP(from1->frac)+ROUND_UP(from2->frac);
   case '/':
     return ROUND_UP(from1->intg+from2->intg+1+from1->frac+from2->frac+param);
-  default: DBUG_ASSERT(0);
+  default: assert(0);
   }
   return -1; /* shut up the warning */
 }
@@ -1958,7 +1970,7 @@ static int do_add(const decimal_t *from1, const decimal_t *from2, decimal_t *to)
 
   if (unlikely(carry))
     *--buf0=1;
-  DBUG_ASSERT(buf0 == to->buf || buf0 == to->buf+1);
+  assert(buf0 == to->buf || buf0 == to->buf+1);
 
   return error;
 }
@@ -2127,8 +2139,8 @@ int decimal_cmp(const decimal_t *from1, const decimal_t *from2)
     return do_sub(from1, from2, 0);
 
   // Reject negative zero, cfr. internal_str2dec()
-  DBUG_ASSERT(!(decimal_is_zero(from1) && from1->sign));
-  DBUG_ASSERT(!(decimal_is_zero(from2) && from2->sign));
+  assert(!(decimal_is_zero(from1) && from1->sign));
+  assert(!(decimal_is_zero(from2) && from2->sign));
 
   return from1->sign > from2->sign ? -1 : 1;
 }
@@ -2249,7 +2261,7 @@ int decimal_mul(const decimal_t *from1, const decimal_t *from2, decimal_t *to)
   {
     dec1 *buf= to->buf;
     dec1 *end= to->buf + intg0 + frac0;
-    DBUG_ASSERT(buf != end);
+    assert(buf != end);
     for (;;)
     {
       if (*buf)
@@ -2336,7 +2348,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
     these remaining zeroes are removed here
    */
   prec2-= count_leading_zeroes((prec2 - 1) % DIG_PER_DEC1, *buf2);
-  DBUG_ASSERT(prec2 > 0);
+  assert(prec2 > 0);
 
   /*
    Do the same for the first number. Remove the leading zeroes.
@@ -2356,7 +2368,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
     return E_DEC_OK;
   }
   prec1-= count_leading_zeroes((prec1-1) % DIG_PER_DEC1, *buf1);
-  DBUG_ASSERT(prec1 > 0);
+  assert(prec1 > 0);
 
   /* let's fix scale_incr, taking into account frac1,frac2 increase */
   if ((scale_incr-= frac1 - from1->frac + frac2 - from2->frac) < 0)
@@ -2464,13 +2476,13 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
           guess--;
         if (unlikely(start2[1]*guess > (x-guess*start2[0])*DIG_BASE+y))
           guess--;
-        DBUG_ASSERT(start2[1]*guess <= (x-guess*start2[0])*DIG_BASE+y);
+        assert(start2[1]*guess <= (x-guess*start2[0])*DIG_BASE+y);
       }
 
       /* D4: multiply and subtract */
       buf2=stop2;
       buf1=start1+len2;
-      DBUG_ASSERT(buf1 < stop1);
+      assert(buf1 < stop1);
       for (carry=0; buf2 > start2; buf1--)
       {
         dec1 hi, lo;
@@ -2497,7 +2509,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
     }
     if (likely(div_mod))
     {
-      DBUG_ASSERT(buf0 < to->buf + to->len);
+      assert(buf0 < to->buf + to->len);
       *buf0=(dec1)guess;
     }
     dcarry= *start1;
@@ -2555,7 +2567,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
         error=E_DEC_OVERFLOW;
         goto done;
       }
-      DBUG_ASSERT(intg0 <= ROUND_UP(from2->intg));
+      assert(intg0 <= ROUND_UP(from2->intg));
       stop1=start1+frac0+intg0;
       to->intg= MY_MIN(intg0 * DIG_PER_DEC1, from2->intg);
     }
@@ -2566,7 +2578,7 @@ static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
       to->frac=frac0*DIG_PER_DEC1;
         error=E_DEC_TRUNCATED;
     }
-    DBUG_ASSERT(buf0 + (stop1 - start1) <= to->buf + to->len);
+    assert(buf0 + (stop1 - start1) <= to->buf + to->len);
     while (start1 < stop1)
         *buf0++=*start1++;
   }
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index 3354bd1a1883..de5444a5e154 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,8 +23,8 @@
 /* Prints case-convert and sort-convert tabell on stdout. This is used to
    make _ctype.c easyer */
 
-#ifdef DBUG_OFF
-#undef DBUG_OFF
+#ifdef NDEBUG
+#undef NDEBUG
 #endif
 
 #include <my_global.h>
diff --git a/strings/dtoa.c b/strings/dtoa.c
index 42a9f0b3101f..62e01749594c 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -94,7 +94,7 @@ size_t my_fcvt(double x, int precision, char *to, my_bool *error)
   int decpt, sign, len, i;
   char *res, *src, *end, *dst= to;
   char buf[DTOA_BUFF_SIZE];
-  DBUG_ASSERT(precision >= 0 && precision < NOT_FIXED_DEC && to != NULL);
+  assert(precision >= 0 && precision < NOT_FIXED_DEC && to != NULL);
   
   res= dtoa(x, 5, precision, &decpt, &sign, &end, buf, sizeof(buf));
 
@@ -219,7 +219,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
   char *res, *src, *end, *dst= to, *dend= dst + width;
   char buf[DTOA_BUFF_SIZE];
   my_bool have_space, force_e_format;
-  DBUG_ASSERT(width > 0 && to != NULL);
+  assert(width > 0 && to != NULL);
   
   /* We want to remove '-' from equations early */
   if (x < 0.)
@@ -465,9 +465,9 @@ double my_strtod(const char *str, char **end, int *error)
 {
   char buf[DTOA_BUFF_SIZE];
   double res;
-  DBUG_ASSERT(end != NULL && ((str != NULL && *end != NULL) ||
-                              (str == NULL && *end == NULL)) &&
-              error != NULL);
+  assert(end != NULL && ((str != NULL && *end != NULL) ||
+                         (str == NULL && *end == NULL)) &&
+         error != NULL);
 
   res= my_strtod_int(str, end, error, buf, sizeof(buf));
   return (*error == 0) ? res : (res < 0 ? -DBL_MAX : DBL_MAX);
@@ -662,7 +662,7 @@ typedef struct Stack_alloc
 static Bigint *Balloc(int k, Stack_alloc *alloc)
 {
   Bigint *rv;
-  DBUG_ASSERT(k <= Kmax);
+  assert(k <= Kmax);
   if (k <= Kmax &&  alloc->freelist[k])
   {
     rv= alloc->freelist[k];
diff --git a/strings/dump_map.c b/strings/dump_map.c
index 4c1d0074c158..02e2a2d4b4b0 100644
--- a/strings/dump_map.c
+++ b/strings/dump_map.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/int2str.c b/strings/int2str.c
index afb89e25e004..d7e8ff9310e1 100644
--- a/strings/int2str.c
+++ b/strings/int2str.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/is_prefix.c b/strings/is_prefix.c
index 885ed3d42062..0a8960846c13 100644
--- a/strings/is_prefix.c
+++ b/strings/is_prefix.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2006 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/llstr.c b/strings/llstr.c
index 5d904af59d10..13f43e53d981 100644
--- a/strings/llstr.c
+++ b/strings/llstr.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2004, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/longlong2str.c b/strings/longlong2str.c
index e35bbe1a5067..2b46f210783c 100644
--- a/strings/longlong2str.c
+++ b/strings/longlong2str.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2004, 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/my_stpmov.c b/strings/my_stpmov.c
index 0259533ccdc9..609d45a686c5 100644
--- a/strings/my_stpmov.c
+++ b/strings/my_stpmov.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/my_stpnmov.c b/strings/my_stpnmov.c
index a14e692ac1ba..b9f14f79fb44 100644
--- a/strings/my_stpnmov.c
+++ b/strings/my_stpnmov.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/my_strchr.c b/strings/my_strchr.c
index bbfb7b488f42..544f5f6531b5 100644
--- a/strings/my_strchr.c
+++ b/strings/my_strchr.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index 1fb4f0c23351..a47595317b0c 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 4da96cb38163..bd1a9ed3880e 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -210,7 +222,7 @@ static char *process_str_arg(const CHARSET_INFO *cs, char *to, char *end,
 
 static char *process_bin_arg(char *to, char *end, size_t width, char *par)
 {
-  DBUG_ASSERT(to <= end);
+  assert(to <= end);
   if (to + width + 1 > end)
     width= end - to - 1;  /* sign doesn't matter */
   memmove(to, par, width);
@@ -270,7 +282,7 @@ static char *process_int_arg(char *to, char *end, size_t length,
   }
   else
   {
-    DBUG_ASSERT(arg_type == 'X' || arg_type =='x');
+    assert(arg_type == 'X' || arg_type =='x');
     store_end= ll2str(par, store_start, 16, (arg_type == 'X'));
   }
 
@@ -341,7 +353,7 @@ static char *process_args(const CHARSET_INFO *cs, char *to, char *end,
     fmt++;
     fmt= get_length(fmt, &print_arr[idx].length, &print_arr[idx].flags);
     print_arr[idx].length--;    
-    DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
+    assert(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
     args_arr[print_arr[idx].length].arg_type= 'd';
     args_arr[print_arr[idx].length].have_longlong= 0;
     print_arr[idx].flags|= LENGTH_ARG;
@@ -360,7 +372,7 @@ static char *process_args(const CHARSET_INFO *cs, char *to, char *end,
       fmt++;
       fmt= get_width(fmt, &print_arr[idx].width);
       print_arr[idx].width--;
-      DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
+      assert(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
       args_arr[print_arr[idx].width].arg_type= 'd';
       args_arr[print_arr[idx].width].have_longlong= 0;
       print_arr[idx].flags|= WIDTH_ARG;
@@ -418,7 +430,7 @@ static char *process_args(const CHARSET_INFO *cs, char *to, char *end,
         args_arr[i].longlong_arg= va_arg(ap, int);
         break;
       default:
-        DBUG_ASSERT(0);
+        assert(0);
       }
     }
     /* Print result string */
@@ -497,20 +509,20 @@ static char *process_args(const CHARSET_INFO *cs, char *to, char *end,
         length++;
       to= my_stpnmov(to, print_arr[i].begin, length);
     }
-    DBUG_ASSERT(to <= end);
+    assert(to <= end);
     *to='\0';				/* End of errmessage */
     return to;
   }
   else
   {
     /* Process next positional argument*/
-    DBUG_ASSERT(*fmt == '%');
+    assert(*fmt == '%');
     print_arr[idx].end= fmt - 1;
     idx++;
     fmt++;
     arg_index= 0;
     fmt= get_width(fmt, &arg_index);
-    DBUG_ASSERT(*fmt == '$');
+    assert(*fmt == '$');
     fmt++;
     arg_count= MY_MAX(arg_count, arg_index);
     goto start;
@@ -652,7 +664,7 @@ size_t my_vsnprintf_ex(const CHARSET_INFO *cs, char *to, size_t n,
       break;
     *to++='%';				/* % used as % or unknown code */
   }
-  DBUG_ASSERT(to <= end);
+  assert(to <= end);
   *to='\0';				/* End of errmessage */
   return (size_t) (to - start);
 }
diff --git a/strings/str2int.c b/strings/str2int.c
index 44fe8367bff6..f12e51530c02 100644
--- a/strings/str2int.c
+++ b/strings/str2int.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -66,7 +78,7 @@ char *str2int(const char *src, int radix, long int lower,
 
   /*  Check that the radix is in the range 2..36  */
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   if (radix < 2 || radix > 36) {
     errno=EDOM;
     return NullS;
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
index 9c692f8b3650..0825a79cfcb4 100644
--- a/strings/str_alloc.c
+++ b/strings/str_alloc.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2005, 2006 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strappend.c b/strings/strappend.c
index edafdf8daadd..7a117e9702b0 100644
--- a/strings/strappend.c
+++ b/strings/strappend.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strcend.c b/strings/strcend.c
index 4becf9bc32f4..1e4d26a6c837 100644
--- a/strings/strcend.c
+++ b/strings/strcend.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strcont.c b/strings/strcont.c
index 554d89c5ec96..2a4a0ae34013 100644
--- a/strings/strcont.c
+++ b/strings/strcont.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strend.c b/strings/strend.c
index d29048a57fc7..efb4574a8d68 100644
--- a/strings/strend.c
+++ b/strings/strend.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/strings/strfill.c b/strings/strfill.c
index 9fbb0c2e0199..c4ac3975c0e2 100644
--- a/strings/strfill.c
+++ b/strings/strfill.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strmake.c b/strings/strmake.c
index 605d05a3954c..93c97e9fe4e9 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2003, 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strnlen.c b/strings/strnlen.c
index ab2bf42b039d..a17325d04597 100644
--- a/strings/strnlen.c
+++ b/strings/strnlen.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000, 2001, 2006, 2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/strxmov.c b/strings/strxmov.c
index de4e2fa60af7..d858b626c03c 100644
--- a/strings/strxmov.c
+++ b/strings/strxmov.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000-2002, 2006 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
    
    This library is free software; you can redistribute it and/or
diff --git a/strings/strxnmov.c b/strings/strxnmov.c
index 5e70b54902ab..b3cd893f718d 100644
--- a/strings/strxnmov.c
+++ b/strings/strxnmov.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000-2002, 2005-2007 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
    
    This library is free software; you can redistribute it and/or
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index 651d6b4971a4..3d02b941d8b1 100644
--- a/strings/t_ctype.h
+++ b/strings/t_ctype.h
@@ -1,14 +1,26 @@
-/* Copyright (c) 2000, 2001, 2003 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/uca-dump.c b/strings/uca-dump.c
index 96ecfceb43c2..120c2cb7728c 100644
--- a/strings/uca-dump.c
+++ b/strings/uca-dump.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/uctypedump.c b/strings/uctypedump.c
index 3e902dc9701b..e1cb0b94f51f 100644
--- a/strings/uctypedump.c
+++ b/strings/uctypedump.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/utr11-dump.c b/strings/utr11-dump.c
index 54c1de7b7b81..a7c4be03e611 100644
--- a/strings/utr11-dump.c
+++ b/strings/utr11-dump.c
@@ -1,14 +1,21 @@
-/* Copyright (c) 2004, 2006 MySQL AB
+/* Copyright (c) 2004, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/strings/xml.c b/strings/xml.c
index 07359f587e99..ee697a5b423c 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index fb055d766f86..8bcd2fbe1f49 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/support-files/MacOSX/Description.plist.sh b/support-files/MacOSX/Description.plist.sh
index 1c4ce15b5c87..a053c84d2dad 100644
--- a/support-files/MacOSX/Description.plist.sh
+++ b/support-files/MacOSX/Description.plist.sh
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-   Copyright (C) 2003 MySQL AB
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh
index 6e65892de1b4..14ac7b712c3a 100644
--- a/support-files/MacOSX/Info.plist.sh
+++ b/support-files/MacOSX/Info.plist.sh
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-   Copyright (C) 2003, 2008 MySQL AB
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/MacOSX/MySQLCOM b/support-files/MacOSX/MySQLCOM
index 47502eb9169b..2660abd75a36 100755
--- a/support-files/MacOSX/MySQLCOM
+++ b/support-files/MacOSX/MySQLCOM
@@ -1,17 +1,24 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2004 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/support-files/MacOSX/StartupItem.Description.plist b/support-files/MacOSX/StartupItem.Description.plist
index 4c26dc8fcef4..fa6a798dcf68 100644
--- a/support-files/MacOSX/StartupItem.Description.plist
+++ b/support-files/MacOSX/StartupItem.Description.plist
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-   Copyright (C) 2003, 2004 MySQL AB
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/MacOSX/StartupItem.Info.plist b/support-files/MacOSX/StartupItem.Info.plist
index d78333395ba5..2cda0d7443e2 100644
--- a/support-files/MacOSX/StartupItem.Info.plist
+++ b/support-files/MacOSX/StartupItem.Info.plist
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-   Copyright (C) 2003 MySQL AB
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/MacOSX/StartupItem.postinstall b/support-files/MacOSX/StartupItem.postinstall
index 7ae9a836fe6f..2fc08af300f1 100755
--- a/support-files/MacOSX/StartupItem.postinstall
+++ b/support-files/MacOSX/StartupItem.postinstall
@@ -1,17 +1,24 @@
 #!/bin/sh
 
-# Copyright (C) 2003 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/support-files/MacOSX/StartupParameters.plist.sh b/support-files/MacOSX/StartupParameters.plist.sh
index c6edb2be06e9..3cef512b2b0a 100644
--- a/support-files/MacOSX/StartupParameters.plist.sh
+++ b/support-files/MacOSX/StartupParameters.plist.sh
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-   Copyright (C) 2003 MySQL AB
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/MacOSX/mwar-wrapper b/support-files/MacOSX/mwar-wrapper
index c493ef478951..ed678f4e8866 100755
--- a/support-files/MacOSX/mwar-wrapper
+++ b/support-files/MacOSX/mwar-wrapper
@@ -1,17 +1,24 @@
 #!/bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/support-files/MacOSX/mwcc-wrapper b/support-files/MacOSX/mwcc-wrapper
index 8b5f1340d2c7..a3d226a567eb 100755
--- a/support-files/MacOSX/mwcc-wrapper
+++ b/support-files/MacOSX/mwcc-wrapper
@@ -1,17 +1,24 @@
 #!/bin/sh
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/support-files/MacOSX/postflight.sh b/support-files/MacOSX/postflight.sh
index 1377fdad3e22..cf1ddd3243bc 100644
--- a/support-files/MacOSX/postflight.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 #
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/support-files/MacOSX/preflight.sh b/support-files/MacOSX/preflight.sh
index 52f18a549674..b80fd64f7202 100644
--- a/support-files/MacOSX/preflight.sh
+++ b/support-files/MacOSX/preflight.sh
@@ -1,17 +1,23 @@
 #!/bin/sh
 
-# Copyright (C) 2003, 2005 MySQL AB
+# Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; version 2
-# of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
diff --git a/support-files/build-tags b/support-files/build-tags
index c37485e32f9a..a12759d71b5f 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -1,12 +1,48 @@
-#! /bin/sh
+#! /bin/bash
 
-rm -f TAGS
+# Copyright (c) 2002, 2023, Oracle and/or its affiliates.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+tagstyle=${1:-etags}
+
+common_opts="--langmap=C++:+.ic,YACC:+.yy -I MY_ATTRIBUTE+"
+case $tagstyle in
+    "etags") tagfile=TAGS
+             tagopt="-e $common_opts"
+             ;;
+    "ctags") tagfile=tags
+             tagopt="--fields=+l $common_opts"
+             ;;
+    *) echo "$0 [etags|ctags]"
+       exit 1
+       ;;
+esac
+
+rm -f $tagfile
 filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$'
 
 list="find . -type f"
 git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
-$list |grep $filter |while read f; 
-do
-	 etags -o TAGS --append $f
-done
+ctags $tagopt -o $tagfile $( $list | grep $filter )
+
+echo "wrote file `pwd`/$tagfile"
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 1affc13f8589..5435d0968ba1 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -1,13 +1,20 @@
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/locktime.d b/support-files/dtrace/locktime.d
index 142c9af8f32c..e465c6668010 100644
--- a/support-files/dtrace/locktime.d
+++ b/support-files/dtrace/locktime.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s                                                                                                            
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-execandqc.d b/support-files/dtrace/query-execandqc.d
index eaf77470b893..4abbc96872d8 100644
--- a/support-files/dtrace/query-execandqc.d
+++ b/support-files/dtrace/query-execandqc.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-filesort-time.d b/support-files/dtrace/query-filesort-time.d
index 1ab8ca7ccbef..ecc58d9b709d 100644
--- a/support-files/dtrace/query-filesort-time.d
+++ b/support-files/dtrace/query-filesort-time.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-network-time.d b/support-files/dtrace/query-network-time.d
index ba8b10ae4d07..9c0c4a1cf059 100644
--- a/support-files/dtrace/query-network-time.d
+++ b/support-files/dtrace/query-network-time.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-parse-time.d b/support-files/dtrace/query-parse-time.d
index 2893cab54f71..dd5659c4d583 100644
--- a/support-files/dtrace/query-parse-time.d
+++ b/support-files/dtrace/query-parse-time.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-rowops.d b/support-files/dtrace/query-rowops.d
index cff80d0487af..8ef1abec9e69 100644
--- a/support-files/dtrace/query-rowops.d
+++ b/support-files/dtrace/query-rowops.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/query-time.d b/support-files/dtrace/query-time.d
index fd6b28f9316e..59f6e07622cb 100644
--- a/support-files/dtrace/query-time.d
+++ b/support-files/dtrace/query-time.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/statement-time.d b/support-files/dtrace/statement-time.d
index 4c2cd1ec35b3..e86047f59397 100644
--- a/support-files/dtrace/statement-time.d
+++ b/support-files/dtrace/statement-time.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/dtrace/statement-type-aggregate.d b/support-files/dtrace/statement-type-aggregate.d
index 96ba7be2f633..8341aec72a05 100644
--- a/support-files/dtrace/statement-type-aggregate.d
+++ b/support-files/dtrace/statement-type-aggregate.d
@@ -1,15 +1,22 @@
 #!/usr/sbin/dtrace -s
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/support-files/mysql.m4 b/support-files/mysql.m4
index 371700a9c084..4a4a4dfaf9ec 100644
--- a/support-files/mysql.m4
+++ b/support-files/mysql.m4
@@ -1,14 +1,21 @@
-# Copyright (C) 2007 MySQL AB
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 # Use is subject to license terms
 # 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc., 51
diff --git a/testclients/CMakeLists.txt b/testclients/CMakeLists.txt
index 55fa0e7a6ccb..efe38f076b43 100644
--- a/testclients/CMakeLists.txt
+++ b/testclients/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/testclients/bug25714.c b/testclients/bug25714.c
index 8d02c26c4363..4815ac2c3e00 100644
--- a/testclients/bug25714.c
+++ b/testclients/bug25714.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -22,7 +29,7 @@
 int main (int argc, char **argv)
 {
   MYSQL conn;
-  int OK;
+  int OK MY_ATTRIBUTE((unused));
 
   const char* query4= "INSERT INTO federated.t1 SET Value=54";
   const char* query5= "INSERT INTO federated.t1 SET Value=55";
diff --git a/testclients/mysql_client_fw.c b/testclients/mysql_client_fw.c
index 34e20c6dfbc7..c9c573aa14b2 100644
--- a/testclients/mysql_client_fw.c
+++ b/testclients/mysql_client_fw.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1271,7 +1278,7 @@ static void usage(void)
  my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
  puts("By Monty, Venu, Kent and others\n");
  printf("\
-Copyright (C) 2002-2004 MySQL AB\n\
+Copyright (c) 2002, 2023, Oracle and/or its affiliates.\n\
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
 and you are welcome to modify and redistribute it under the GPL license\n");
  printf("Usage: %s [OPTIONS] [TESTNAME1 TESTNAME2...]\n", my_progname);
diff --git a/testclients/mysql_client_test.c b/testclients/mysql_client_test.c
index af880c626073..08b4163078f3 100644
--- a/testclients/mysql_client_test.c
+++ b/testclients/mysql_client_test.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -13420,7 +13427,7 @@ static void test_bug9520()
 
   if (!opt_silent)
     printf("Fetched %d rows\n", row_count);
-  DBUG_ASSERT(row_count == 3);
+  assert(row_count == 3);
 
   mysql_stmt_close(stmt);
 
@@ -18138,9 +18145,9 @@ static void test_bug40365(void)
     if (!opt_silent)
       fprintf(stdout, "\ntime[%d]: %02d-%02d-%02d ",
               i, tm[i].year, tm[i].month, tm[i].day);
-      DIE_UNLESS(tm[i].year == 0);
-      DIE_UNLESS(tm[i].month == 0);
-      DIE_UNLESS(tm[i].day == 0);
+    DIE_UNLESS(tm[i].year == 0);
+    DIE_UNLESS(tm[i].month == 0);
+    DIE_UNLESS(tm[i].day == 0);
   }
   mysql_stmt_close(stmt);
   rc= mysql_commit(mysql);
@@ -18873,7 +18880,7 @@ static void test_bug49972()
 
     rc= mysql_stmt_fetch(stmt);
     rc= mysql_stmt_fetch(stmt);
-    DBUG_ASSERT(rc == MYSQL_NO_DATA);
+    assert(rc == MYSQL_NO_DATA);
 
     mysql_stmt_next_result(stmt);
     mysql_stmt_fetch(stmt);
@@ -18901,7 +18908,7 @@ static void test_bug49972()
 
     rc= mysql_stmt_fetch(stmt);
     rc= mysql_stmt_fetch(stmt);
-    DBUG_ASSERT(rc == MYSQL_NO_DATA);
+    assert(rc == MYSQL_NO_DATA);
 
     mysql_stmt_next_result(stmt);
     mysql_stmt_fetch(stmt);
@@ -20943,6 +20950,240 @@ static void test_bug19894382()
   mysql_stmt_close(stmt1);
 }
 
+static void test_bug25701141()
+{
+  MYSQL_STMT *stmt;
+  int rc;
+  MYSQL_BIND my_bind[2];
+  char query[MAX_TEST_QUERY_LENGTH];
+  const char* input1= "abcdefgh";
+  const char* input2=  "mnopqrst";
+  const ulong type = CURSOR_TYPE_READ_ONLY;
+
+  myheader("test_bug25701141");
+
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "CREATE TABLE t1( "
+      "id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,"
+      "serial CHAR(10) NOT NULL,"
+      "pretty CHAR(20) DEFAULT NULL,"
+      "CONSTRAINT UNIQUE KEY unique_serial (serial) USING HASH,"
+      "INDEX pretty_index USING HASH (pretty)"
+      ") ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin");
+  myquery(rc);
+
+  my_stpcpy(query, "INSERT IGNORE INTO t1 SET `serial`=?, `pretty`=?");
+  stmt= mysql_simple_prepare(mysql, query);
+  check_stmt(stmt);
+
+  memset(my_bind, 0, sizeof(my_bind));
+  my_bind[0].buffer_type = MYSQL_TYPE_STRING;
+  my_bind[0].buffer = (char*)input1;
+  my_bind[0].buffer_length = (ulong)strlen(input1);
+
+  my_bind[1].buffer_type = MYSQL_TYPE_STRING;
+  my_bind[1].buffer = (char*)input2;
+  my_bind[1].buffer_length = (ulong)strlen(input2);
+
+  rc= mysql_stmt_bind_param(stmt, my_bind);
+  check_execute(stmt, rc);
+  mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, &type);
+
+  /* Execute */
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+  mysql_stmt_close(stmt);
+
+  myquery(mysql_query(mysql, "DROP TABLE t1"));
+}
+
+static void test_bug27443252()
+{
+  MYSQL_STMT *stmt;
+  MYSQL_BIND my_bind[1];
+  int rc;
+  int32 a;
+  int row_count=0;
+  int column_count=0;
+  MYSQL_RES *metadata = NULL;
+
+  myheader("test_bug27443252");
+
+  rc= mysql_query(mysql, "drop procedure if exists p1");
+  myquery(rc);
+  rc= mysql_query(mysql, "drop table if exists p1");
+  myquery(rc);
+  rc= mysql_query(mysql, "create table t1 (id int)");
+  myquery(rc);
+  rc= mysql_query(mysql, "create procedure p1() begin select * from t1; end");
+  myquery(rc);
+
+  /* Case 1 - Procedure call with empty result set */
+  stmt= open_cursor("call p1");
+  /* This should not result in hang */
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  metadata = mysql_stmt_result_metadata(stmt);
+  if (metadata)
+  {
+    column_count = mysql_num_fields(metadata);
+    DIE_UNLESS(column_count == 1);
+  }
+
+  memset(my_bind, 0, sizeof(my_bind));
+  my_bind[0].buffer_type= MYSQL_TYPE_LONG;
+  my_bind[0].buffer= (void*)&a;
+  my_bind[0].buffer_length= (ulong)sizeof(a);
+  rc= mysql_stmt_bind_result(stmt, my_bind);
+  check_execute(stmt, rc);
+
+  while (!mysql_stmt_fetch(stmt))
+    row_count++;
+  DIE_UNLESS(row_count == 0);
+
+  rc = mysql_stmt_next_result(stmt);
+  check_execute(stmt, rc);
+  rc= mysql_stmt_free_result(stmt);
+  check_execute(stmt, rc);
+  mysql_free_result(metadata);
+  mysql_stmt_close(stmt);
+
+  /* Case 2 - SELECT with empty result set */
+  row_count= 0;
+  stmt= open_cursor("select * from t1");
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  memset(my_bind, 0, sizeof(my_bind));
+  my_bind[0].buffer_type= MYSQL_TYPE_LONG;
+  my_bind[0].buffer= (void*)&a;
+  my_bind[0].buffer_length= (ulong)sizeof(a);
+
+  rc= mysql_stmt_bind_result(stmt, my_bind);
+  check_execute(stmt, rc);
+
+  while (!mysql_stmt_fetch(stmt))
+    row_count++;
+  DIE_UNLESS(row_count == 0);
+  mysql_stmt_close(stmt);
+
+  /* Case 3 - Procedure call with non-empty result set */
+  rc= mysql_query(mysql, "insert into t1 (id) values "
+                          " (1), (2), (3)");
+  myquery(rc);
+  row_count= 0;
+  stmt= open_cursor("call p1");
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  memset(my_bind, 0, sizeof(my_bind));
+  my_bind[0].buffer_type= MYSQL_TYPE_LONG;
+  my_bind[0].buffer= (void*)&a;
+  my_bind[0].buffer_length= (ulong)sizeof(a);
+  rc= mysql_stmt_bind_result(stmt, my_bind);
+  check_execute(stmt, rc);
+
+  while (!mysql_stmt_fetch(stmt))
+    row_count++;
+  DIE_UNLESS(row_count == 3);
+
+  rc = mysql_stmt_next_result(stmt);
+  check_execute(stmt, rc);
+  rc= mysql_stmt_free_result(stmt);
+  check_execute(stmt, rc);
+  mysql_stmt_close(stmt);
+
+  /* Case 4 - SELECT with Non-empty result set */
+  row_count= 0;
+  stmt= open_cursor("select * from t1");
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  memset(my_bind, 0, sizeof(my_bind));
+  my_bind[0].buffer_type= MYSQL_TYPE_LONG;
+  my_bind[0].buffer= (void*)&a;
+  my_bind[0].buffer_length= (ulong)sizeof(a);
+  rc= mysql_stmt_bind_result(stmt, my_bind);
+  check_execute(stmt, rc);
+
+  while (!mysql_stmt_fetch(stmt))
+    row_count++;
+  DIE_UNLESS(row_count == 3);
+
+  rc= mysql_stmt_free_result(stmt);
+  check_execute(stmt, rc);
+  mysql_stmt_close(stmt);
+
+  /* Cleanup */
+  rc= mysql_query(mysql, "drop table t1");
+  myquery(rc);
+  rc= mysql_query(mysql, "drop procedure p1");
+  myquery(rc);
+}
+
+
+static void test_bug32391415()
+{
+  MYSQL *lmysql;
+  MYSQL_ROW row;
+  MYSQL_RES *res;
+  int rc;
+
+  myheader("test_bug32391415");
+
+  lmysql= mysql_client_init(NULL);
+  DIE_UNLESS(lmysql != NULL);
+
+  lmysql= mysql_real_connect(lmysql, opt_host, opt_user,
+                         opt_password, current_db, opt_port,
+                         opt_unix_socket, 0);
+  DIE_UNLESS(lmysql != 0);
+  if (!opt_silent)
+    fprintf(stdout, "Established a test connection\n");
+
+  rc= mysql_query(lmysql, "CREATE USER b32391415@localhost");
+  myquery2(lmysql, rc);
+  rc= mysql_query(lmysql, "GRANT ALL PRIVILEGES ON *.* TO b32391415@localhost");
+  myquery2(lmysql, rc);
+
+  if (!opt_silent)
+    fprintf(stdout, "Created the user\n");
+
+  /* put in an attr */
+  rc= mysql_options4(lmysql, MYSQL_OPT_CONNECT_ATTR_ADD,
+                     "key1", "value1");
+  DIE_UNLESS(rc == 0);
+
+  rc= mysql_change_user(lmysql, "b32391415", NULL, NULL);
+  myquery2(lmysql, rc);
+
+  /* success: the query attribute should be present */
+  rc= mysql_query(lmysql,
+                  "SELECT ATTR_NAME, ATTR_VALUE "
+                  " FROM performance_schema.session_account_connect_attrs"
+                  " WHERE ATTR_NAME IN ('key1') AND"
+                  "  PROCESSLIST_ID = CONNECTION_ID() ORDER BY ATTR_NAME");
+  myquery2(lmysql,rc);
+  res = mysql_use_result(lmysql);
+  DIE_UNLESS(res);
+
+  row= mysql_fetch_row(res);
+  DIE_UNLESS(row);
+  DIE_UNLESS(0 == strcmp(row[0], "key1"));
+  DIE_UNLESS(0 == strcmp(row[1], "value1"));
+  if (!opt_silent)
+    fprintf(stdout, "Checked the query attribute\n");
+
+  mysql_free_result(res);
+
+  mysql_close(lmysql);
+
+  rc= mysql_query(mysql, "DROP USER b32391415@localhost");
+  myquery2(mysql, rc);
+}
 
 static struct my_tests_st my_tests[]= {
   { "disable_query_logs", disable_query_logs },
@@ -21235,6 +21476,9 @@ static struct my_tests_st my_tests[]= {
   { "test_bug22559575", test_bug22559575 },
   { "test_bug19894382", test_bug19894382 },
   { "test_bug22028117", test_bug22028117 },
+  { "test_bug25701141", test_bug25701141 },
+  { "test_bug27443252", test_bug27443252 },
+  { "test_bug32391415", test_bug32391415 },
   { 0, 0 }
 };
 
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 678e020f2bdd..ef61d1d0d681 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. 
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/unittest/examples/CMakeLists.txt b/unittest/examples/CMakeLists.txt
index 8b26f34bbbb2..d540e0768edc 100644
--- a/unittest/examples/CMakeLists.txt
+++ b/unittest/examples/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -16,7 +23,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${CMAKE_SOURCE_DIR}/unittest/mytap)
 
 # We omit core-t here, since it will always fail.
diff --git a/unittest/examples/core-t.c b/unittest/examples/core-t.c
index 25aac123d496..c173247c3820 100644
--- a/unittest/examples/core-t.c
+++ b/unittest/examples/core-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/examples/no_plan-t.c b/unittest/examples/no_plan-t.c
index 9aeb5c7666ae..b3ba8dfde26f 100644
--- a/unittest/examples/no_plan-t.c
+++ b/unittest/examples/no_plan-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/examples/simple-t.c b/unittest/examples/simple-t.c
index b3ead293289e..fe35a24fade5 100644
--- a/unittest/examples/simple-t.c
+++ b/unittest/examples/simple-t.c
@@ -1,14 +1,21 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
    Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/examples/skip-t.c b/unittest/examples/skip-t.c
index aa105385c173..a4fee4155575 100644
--- a/unittest/examples/skip-t.c
+++ b/unittest/examples/skip-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/examples/skip_all-t.c b/unittest/examples/skip_all-t.c
index 940d9f0186fd..6474e42ce4aa 100644
--- a/unittest/examples/skip_all-t.c
+++ b/unittest/examples/skip_all-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/examples/todo-t.c b/unittest/examples/todo-t.c
index 53aaa1c28137..09adff8638fc 100644
--- a/unittest/examples/todo-t.c
+++ b/unittest/examples/todo-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt
index d60bbba57db8..d630d8e90023 100644
--- a/unittest/gunit/CMakeLists.txt
+++ b/unittest/gunit/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -27,16 +34,6 @@
 # Either way: we will unpack the zip, compile gmock-all.cc and gtest-all.cc
 # and link them into the executables.
 
-# Disable googletest for Solaris Studio < 12.4 since it doesn't compile.
-IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-  IF(${CC_MINOR_VERSION} LESS 13)
-    MESSAGE(WARNING "Googletest requires Solaris Studio 12.4 or newer.")
-    UNSET(GMOCK_FOUND)
-    UNSET(GMOCK_FOUND CACHE)
-    RETURN()
-  ENDIF()
-ENDIF()
-
 # Default location for where to download and build gmock/gtest.
 IF(NOT DOWNLOAD_ROOT)
   SET(DOWNLOAD_ROOT ${CMAKE_SOURCE_DIR}/source_downloads)
@@ -55,6 +52,7 @@ IF(LOCAL_GMOCK_ZIP
 ENDIF()
 
 IF (WITH_GMOCK)
+  FILE(TO_CMAKE_PATH "${WITH_GMOCK}" WITH_GMOCK)
   ## Did we get a full path name, including file name?
   IF (${WITH_GMOCK} MATCHES ".*\\.zip")
     GET_FILENAME_COMPONENT(GMOCK_DIR ${WITH_GMOCK} PATH)
@@ -191,39 +189,26 @@ SET(GMOCK_INCLUDE_DIRS
   CACHE INTERNAL "")
 
 # Build gmock/gtest libraries.
-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(SYSTEM
   ${GMOCK_SOURCE_DIR}
   ${GMOCK_SOURCE_DIR}/include
   ${GTEST_SOURCE_DIR}
   ${GTEST_SOURCE_DIR}/include
 )
 
-# Turn off some warning flags when compiling GUnit
-MY_CHECK_CXX_COMPILER_FLAG("-Wno-unused-local-typedefs" HAVE_NO_UNUSED_TYPEDEFS)
-IF(HAVE_NO_UNUSED_TYPEDEFS)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
-ENDIF()
-MY_CHECK_CXX_COMPILER_FLAG("-Wno-missing-field-initializers"
-                           HAVE_NO_MISSING_FIELD_INITIALIZERS)
-IF(HAVE_NO_MISSING_FIELD_INITIALIZERS)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
-ENDIF()
+# Some tests require Boost.
+INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 
 MY_CHECK_CXX_COMPILER_FLAG("-fno-builtin-memcmp" HAVE_NO_BUILTIN_MEMCMP)
-MY_CHECK_CXX_COMPILER_FLAG("-Wempty-body" HAVE_EMPTY_BODY)
+MY_CHECK_CXX_COMPILER_FLAG("-Wformat-overflow" HAVE_FORMAT_OVERFLOW)
 
 ADD_LIBRARY(gmock STATIC ${GMOCK_SOURCE_DIR}/src/gmock-all.cc)
 ADD_LIBRARY(gtest STATIC ${GTEST_SOURCE_DIR}/src/gtest-all.cc)
 SET(GTEST_LIBRARIES gmock gtest)
 
-IF (WITH_SSL STREQUAL "bundled")
-  ADD_SUBDIRECTORY(yassl)
-ENDIF()
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/libbinlogevents/include
-  ${ZLIB_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/regex
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/sql/auth
@@ -285,6 +270,7 @@ SET(TESTS
   my_murmur3
   my_qsort_vs_stdsort
   my_regex
+  my_snprintf
   my_thread
   mysys_base64
   mysys_lf
@@ -321,10 +307,6 @@ IF (UNIX)
   LIST(APPEND TESTS path auth_utils)
 ENDIF()
 
-IF(WIN32)
-  LIST(APPEND TESTS win_tests)
-ENDIF()
-
 # Add tests (link them with gunit/gmock libraries and the server libraries) 
 SET(SERVER_TESTS
   copy_info
@@ -340,6 +322,7 @@ SET(SERVER_TESTS
   item_filter
   item_func_case
   item_func_now_local
+  item_func_rlike
   item_timefunc
   item_like
   join_tab_sort
@@ -348,6 +331,7 @@ SET(SERVER_TESTS
   json_path
   locking_service
   log_throttle
+  log_timestamp
   make_sortkey
   mdl_sync
   my_decimal
@@ -369,6 +353,10 @@ SET(SERVER_TESTS
   initialize_password
 )
 
+IF(WIN32)
+  LIST(APPEND SERVER_TESTS win_tests)
+ENDIF()
+
 ## Merging tests into fewer executables saves *a lot* of
 ## link time and disk space ...
 OPTION(MERGE_UNITTESTS "Merge tests into one executable" ON)
@@ -385,10 +373,6 @@ IF (MERGE_UNITTESTS)
       COMPILE_FLAGS "-Wno-empty-body"
     )
   ENDIF()
-  ADD_COMPILE_FLAGS(
-    ${MERGE_SMALL_TESTS}
-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-  )
   # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
   IF(WIN32)
     ADD_COMPILE_FLAGS(
@@ -396,6 +380,13 @@ IF (MERGE_UNITTESTS)
       COMPILE_FLAGS "/bigobj")
   ENDIF()
 
+  # Suppress -Wformat-overflow= for my_safe_snprintf(" %s ", nullptr)
+  IF(HAVE_FORMAT_OVERFLOW)
+    ADD_COMPILE_FLAGS(
+      ${MERGE_LARGE_TESTS}
+      COMPILE_FLAGS "-Wno-format-overflow")
+  ENDIF()
+
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
   FILE(WRITE ${MERGE_LARGE_TESTS} "// Merging large unit tests\n")
@@ -467,14 +458,13 @@ ENDIF(MERGE_UNITTESTS)
       COMPILE_FLAGS "-Wno-empty-body"
   )
   ENDIF()
-  ADD_COMPILE_FLAGS(
-    bounded_queue-t.cc
-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-  )
-  ADD_COMPILE_FLAGS(
-    pump_object_filter-t.cc
-    COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR}
-  )
+
+  # Suppress -Wformat-overflow= for my_safe_snprintf(" %s ", nullptr)
+  IF(HAVE_FORMAT_OVERFLOW)
+    ADD_COMPILE_FLAGS(
+      segfault-t.cc
+      COMPILE_FLAGS "-Wno-format-overflow")
+  ENDIF()
 
   FOREACH(test ${SERVER_TESTS})
     SET(SRC_FILES ${test}-t.cc)
@@ -507,8 +497,6 @@ ENDIF(MERGE_UNITTESTS)
     ENDIF()
   ENDFOREACH()
 
-## Most executables depend on libeay32.dll (through mysys_ssl).
-COPY_OPENSSL_DLLS(copy_openssl_gunit)
-
 ADD_SUBDIRECTORY(innodb)
 ADD_SUBDIRECTORY(keyring)
+ADD_SUBDIRECTORY(locks)
diff --git a/unittest/gunit/alignment-t.cc b/unittest/gunit/alignment-t.cc
index 0464f8dc306d..844cfbc96d26 100644
--- a/unittest/gunit/alignment-t.cc
+++ b/unittest/gunit/alignment-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/auth_utils-t.cc b/unittest/gunit/auth_utils-t.cc
index 88a70eea9749..b9f1c3d9843d 100644
--- a/unittest/gunit/auth_utils-t.cc
+++ b/unittest/gunit/auth_utils-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/bitmap-t.cc b/unittest/gunit/bitmap-t.cc
index 7e94860f7562..94a5c6b5bcb3 100644
--- a/unittest/gunit/bitmap-t.cc
+++ b/unittest/gunit/bitmap-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/bounded_queue-t.cc b/unittest/gunit/bounded_queue-t.cc
index c4652e23fff7..75d8406263c7 100644
--- a/unittest/gunit/bounded_queue-t.cc
+++ b/unittest/gunit/bounded_queue-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -182,9 +189,9 @@ class BoundedQueueTest : public ::testing::Test
 // Google Test recommends DeathTest suffix for classes used in death tests.
 typedef BoundedQueueTest BoundedQueueDeathTest;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 /*
-  Verifies that we DBUG_ASSERT if trying to push to an un-initialized queue.
+  Verifies that we assert if trying to push to an un-initialized queue.
  */
 TEST_F(BoundedQueueDeathTest, DieIfNotInitialized)
 {
@@ -195,8 +202,8 @@ TEST_F(BoundedQueueDeathTest, DieIfNotInitialized)
 }
 
 /*
-  Verifies that popping an empty queue hits a DBUG_ASSERT.
- */
+  Verifies that popping an empty queue hits a assert.
+*/
 TEST_F(BoundedQueueDeathTest, DieIfPoppingEmptyQueue)
 {
   EXPECT_EQ(0, m_queue.init(0, true, test_key_compare,
@@ -205,7 +212,7 @@ TEST_F(BoundedQueueDeathTest, DieIfPoppingEmptyQueue)
   EXPECT_DEATH_IF_SUPPORTED(m_queue.pop(),
                             ".*Assertion .*elements > 0.*");
 }
-#endif  // !defined(DBUG_OFF)
+#endif  // !defined(NDEBUG)
 
 
 /*
diff --git a/unittest/gunit/bounded_queue_boost.cc b/unittest/gunit/bounded_queue_boost.cc
index 7ca4c1906f75..62442f66863b 100644
--- a/unittest/gunit/bounded_queue_boost.cc
+++ b/unittest/gunit/bounded_queue_boost.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -119,7 +126,7 @@ template<typename Element_type,
 void Bounded_queue_boost<Element_type, Key_type, Key_generator, Key_compare>
   ::push(Element_type element)
 {
-  DBUG_ASSERT(pimpl != NULL);
+  assert(pimpl != NULL);
   if (m_num_elements == m_max_elements)
   {
     const heap_data<Key_type, Key_compare> &pq_top= pimpl->m_queue.top();
diff --git a/unittest/gunit/bounded_queue_boost.h b/unittest/gunit/bounded_queue_boost.h
index 8a4c1abe4925..eb50205be4ca 100644
--- a/unittest/gunit/bounded_queue_boost.h
+++ b/unittest/gunit/bounded_queue_boost.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/bounded_queue_c.h b/unittest/gunit/bounded_queue_c.h
index e839dce38beb..114bb98eead4 100644
--- a/unittest/gunit/bounded_queue_c.h
+++ b/unittest/gunit/bounded_queue_c.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -115,7 +122,7 @@ class Bounded_QUEUE
     // Don't return the extra element to the client code.
     if (queue_is_full((&m_queue)))
       queue_remove(&m_queue, 0);
-    DBUG_ASSERT(m_queue.elements > 0);
+    assert(m_queue.elements > 0);
     if (m_queue.elements == 0)
       return NULL;
     return reinterpret_cast<Key_type*>(queue_remove(&m_queue, 0));
@@ -147,7 +154,7 @@ int Bounded_QUEUE<Element_type, Key_type, Key_generator>
          Key_generator *sort_param,
          Key_type *sort_keys)
 {
-  DBUG_ASSERT(sort_keys != NULL);
+  assert(sort_keys != NULL);
 
   m_sort_keys=      sort_keys;
   m_compare_length= sort_param->compare_length();
@@ -175,7 +182,7 @@ template<typename Element_type, typename Key_type, typename Key_generator>
 void Bounded_QUEUE<Element_type, Key_type, Key_generator>
   ::push(Element_type element)
 {
-  DBUG_ASSERT(is_initialized());
+  assert(is_initialized());
   if (queue_is_full((&m_queue)))
   {
     // Replace top element with new key, and re-order the queue.
diff --git a/unittest/gunit/bounded_queue_std.h b/unittest/gunit/bounded_queue_std.h
index 507de2147dbf..0042b109f43c 100644
--- a/unittest/gunit/bounded_queue_std.h
+++ b/unittest/gunit/bounded_queue_std.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/bounds_checked_array-t.cc b/unittest/gunit/bounds_checked_array-t.cc
index 730520ea32b0..8de491dc6e3e 100644
--- a/unittest/gunit/bounds_checked_array-t.cc
+++ b/unittest/gunit/bounds_checked_array-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -71,7 +78,7 @@ TEST_F(BoundsCheckedArray, Empty)
   EXPECT_EQ(pi, int_array.array());
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 
 // Google Test recommends DeathTest suffix for classes used in death tests.
 typedef BoundsCheckedArray BoundsCheckedArrayDeathTest;
@@ -119,7 +126,7 @@ TEST_F(BoundsCheckedArrayDeathTest, BoundsCheckResizeAssign)
                             ".*Assertion .*n < m_size.*");
 }
 
-#endif  // !defined(DBUG_OFF)
+#endif  // !defined(NDEBUG)
 
 TEST_F(BoundsCheckedArray, Indexing)
 {
diff --git a/unittest/gunit/byteorder-t.cc b/unittest/gunit/byteorder-t.cc
index c45e0ff292bf..6d39ca06666b 100644
--- a/unittest/gunit/byteorder-t.cc
+++ b/unittest/gunit/byteorder-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/calloc-t.cc b/unittest/gunit/calloc-t.cc
index 4525505d56a1..9a5178acce3c 100644
--- a/unittest/gunit/calloc-t.cc
+++ b/unittest/gunit/calloc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -26,7 +33,7 @@ namespace calloc_unittest {
   Set num_iterations to a reasonable value (e.g. 200000), build release
   and run with 'calloc-t --disable-tap-output' to see the time taken.
 */
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // There is no point in benchmarking anything in debug mode.
 static int num_iterations= 2;
 #else
diff --git a/unittest/gunit/copy_info-t.cc b/unittest/gunit/copy_info-t.cc
index fc1c0587d391..3a8658a4b0fd 100644
--- a/unittest/gunit/copy_info-t.cc
+++ b/unittest/gunit/copy_info-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/cost_estimate-t.cc b/unittest/gunit/cost_estimate-t.cc
index c626e3110c3f..7764330406c8 100644
--- a/unittest/gunit/cost_estimate-t.cc
+++ b/unittest/gunit/cost_estimate-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/create_field-t.cc b/unittest/gunit/create_field-t.cc
index c72ee4655e68..3d803d730ad7 100644
--- a/unittest/gunit/create_field-t.cc
+++ b/unittest/gunit/create_field-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/dbug-t.cc b/unittest/gunit/dbug-t.cc
index 5be08712c129..69ab544c5f8e 100644
--- a/unittest/gunit/dbug-t.cc
+++ b/unittest/gunit/dbug-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -27,7 +34,7 @@ using thread::Thread;
 
 namespace dbug_unittest {
 
-#if defined(DBUG_OFF)
+#if defined(NDEBUG)
 TEST(DebugTest, NoSuicide)
 {
   DBUG_SUICIDE();
@@ -41,7 +48,7 @@ TEST(DebugDeathTest, Suicide)
 #endif
 
 
-#if !defined(DBUG_OFF) && !defined(_WIN32)
+#if !defined(NDEBUG) && !defined(_WIN32)
 class DbugGcovThread : public Thread
 {
 public:
@@ -74,7 +81,7 @@ TEST(DebugFlushGcov, FlushGcovParallel)
 #endif
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 TEST(DebugPrintTest, PrintEval)
 {
   int y= 0;
@@ -169,5 +176,5 @@ TEST(DebugSetTest, DebugKeywordsTest)
   EXPECT_STREQ("d,keyword1,keyword2,keyword3",buf);
   DBUG_SET("");
 }
-#endif /* DBUG_OFF */
+#endif /* NDEBUG */
 }
diff --git a/unittest/gunit/debug_sync-t.cc b/unittest/gunit/debug_sync-t.cc
index 0ad40c155d38..1cc83429a8df 100644
--- a/unittest/gunit/debug_sync-t.cc
+++ b/unittest/gunit/debug_sync-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/decimal-t.cc b/unittest/gunit/decimal-t.cc
index fb0e5e0a0811..5fdd28aeac87 100644
--- a/unittest/gunit/decimal-t.cc
+++ b/unittest/gunit/decimal-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -214,7 +221,7 @@ void do_test_d2f(const char *s, int ex)
 void do_test_d2b2d(const char *str, int p, int s, const char *orig, int ex)
 {
   char s1[100];
-  char s2[100];
+  char s2[100 * 2];
   uchar buf[100];
   char *end;
   int res, i, size=decimal_bin_size(p, s);
@@ -247,7 +254,7 @@ void do_test_f2d(double from, int ex)
 void do_test_ull2d(ulonglong from, const char *orig, int ex)
 {
   char s[100];
-  char s1[100];
+  char s1[100 * 2];
   int res;
 
   res=ulonglong2decimal(from, &a);
@@ -259,7 +266,7 @@ void do_test_ull2d(ulonglong from, const char *orig, int ex)
 void do_test_ll2d(longlong from, const char *orig, int ex)
 {
   char s[100];
-  char s1[100];
+  char s1[100 * 2];
   int res;
 
   res=longlong2decimal(from, &a);
@@ -271,7 +278,7 @@ void do_test_ll2d(longlong from, const char *orig, int ex)
 void do_test_d2ull(const char *s, const char *orig, int ex)
 {
   char s1[100], *end;
-  char s2[100];
+  char s2[100 * 2];
   ulonglong x;
   int res;
 
@@ -291,7 +298,7 @@ void do_test_d2ull(const char *s, const char *orig, int ex)
 void do_test_d2ll(const char *s, const char *orig, int ex)
 {
   char s1[100], *end;
-  char s2[100];
+  char s2[100 * 2];
   longlong x;
   int res;
 
diff --git a/unittest/gunit/dynarray-t.cc b/unittest/gunit/dynarray-t.cc
index 6dd74aa51a8e..a59458b00d98 100644
--- a/unittest/gunit/dynarray-t.cc
+++ b/unittest/gunit/dynarray-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -91,13 +98,7 @@ static inline std::ostream &operator<<(std::ostream &s, const Key_use &v)
 namespace dynarray_unittest {
 
 // We still want to unit-test this, to compare performance.
-#undef my_init_dynamic_array
-extern "C" 
-my_bool my_init_dynamic_array(DYNAMIC_ARRAY *array,
-                              PSI_memory_key key,
-                              uint element_size,
-                              void *init_buffer, uint init_alloc,
-                              uint alloc_increment);
+
 /*
   Cut'n paste this function from sql_select.cc,
   to avoid linking in the entire server for this unit test.
@@ -464,9 +465,9 @@ TEST_F(MemRootTest, ResizeGrow)
 
 TEST_F(MemRootTest, ResizeShrink)
 {
+  size_t counter= 0;
   Mem_root_array<DestroyCounter, false> array(m_mem_root_p);
   array.reserve(100);
-  size_t counter= 0;
   DestroyCounter foo(&counter);
   array.resize(10, foo);
   EXPECT_EQ(0U, counter);
diff --git a/unittest/gunit/explain_filename-t.cc b/unittest/gunit/explain_filename-t.cc
index e7b44221227e..63bae4d10b16 100644
--- a/unittest/gunit/explain_filename-t.cc
+++ b/unittest/gunit/explain_filename-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/fake_costmodel.cc b/unittest/gunit/fake_costmodel.cc
index b1eec20cd988..f376776c6d4b 100644
--- a/unittest/gunit/fake_costmodel.cc
+++ b/unittest/gunit/fake_costmodel.cc
@@ -2,16 +2,23 @@
 #define FAKE_COSTMODEL_CC_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -37,7 +44,7 @@ const SE_cost_constants
 *Cost_model_constants::get_se_cost_constants(const TABLE *table) const
 {
   // This is only implemented in order to link the unit tests
-  DBUG_ASSERT(false);
+  assert(false);
   return NULL;
 }
 /* purecov: end */
@@ -48,7 +55,7 @@ cost_constant_error SE_cost_constants::set(const LEX_CSTRING &name,
                                            bool default_value)
 {
   // This is only implemented in order to link the unit tests
-  DBUG_ASSERT(false);
+  assert(false);
   return COST_CONSTANT_OK;
 }
 /* purecov: end */
@@ -57,7 +64,7 @@ cost_constant_error SE_cost_constants::set(const LEX_CSTRING &name,
 Cost_model_se_info::~Cost_model_se_info()
 {
   // This is only implemented in order to link the unit tests
-  DBUG_ASSERT(false);
+  assert(false);
 }
 /* purecov: end */
 
@@ -65,7 +72,7 @@ Cost_model_se_info::~Cost_model_se_info()
 Cost_model_constants::~Cost_model_constants()
 {
   // This is only implemented in order to link the unit tests
-  DBUG_ASSERT(false);
+  assert(false);
 }
 /* purecov: end */
 
@@ -74,7 +81,7 @@ uint Cost_model_constants::find_handler_slot_from_name(THD *thd,
                                            const LEX_CSTRING &name) const
 {
   // This is only implemented in order to link the unit tests
-  DBUG_ASSERT(false);
+  assert(false);
   return 0;
 }
 /* purecov: end */
diff --git a/unittest/gunit/fake_costmodel.h b/unittest/gunit/fake_costmodel.h
index 24717d79b167..1d733eee20e7 100644
--- a/unittest/gunit/fake_costmodel.h
+++ b/unittest/gunit/fake_costmodel.h
@@ -2,16 +2,23 @@
 #define FAKE_COSTMODEL_INCLUDED
 
 /*
-   Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -32,7 +39,7 @@ class Fake_Cost_model_server : public Cost_model_server
   {
     // Create default values for server cost constants
     m_server_cost_constants= new Server_cost_constants();
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     m_initialized= true;
 #endif
   }
@@ -57,7 +64,7 @@ class Fake_Cost_model_table : public Cost_model_table
     // Allocate cost constants for operations on tables
     m_se_cost_constants= new SE_cost_constants();
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
     m_initialized= true;
 #endif
   }
diff --git a/unittest/gunit/fake_key.h b/unittest/gunit/fake_key.h
index a28ac2163697..a0cc9afc21a6 100644
--- a/unittest/gunit/fake_key.h
+++ b/unittest/gunit/fake_key.h
@@ -2,16 +2,23 @@
 #define FAKE_KEY_INCLUDED
 
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -46,7 +53,7 @@ class Fake_KEY : public KEY
 
   Fake_KEY(unsigned int key_parts_arg, bool unique)
   {
-    DBUG_ASSERT(key_parts_arg > 0);
+    assert(key_parts_arg > 0);
 
     flags= 0;
     if (unique)
diff --git a/unittest/gunit/fake_range_opt_param.h b/unittest/gunit/fake_range_opt_param.h
index 13aed9a5ef24..073f7adf5a30 100644
--- a/unittest/gunit/fake_range_opt_param.h
+++ b/unittest/gunit/fake_range_opt_param.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/fake_table.cc b/unittest/gunit/fake_table.cc
index 29a75cfc1c27..6761f5a082d5 100644
--- a/unittest/gunit/fake_table.cc
+++ b/unittest/gunit/fake_table.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/fake_table.h b/unittest/gunit/fake_table.h
index 85dd10fe45b9..8488a7b55053 100644
--- a/unittest/gunit/fake_table.h
+++ b/unittest/gunit/fake_table.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -103,8 +110,6 @@ class Fake_TABLE: public TABLE
 
   void initialize()
   {
-    TABLE *as_table= static_cast<TABLE*>(this);
-    memset(as_table, 0, sizeof(*as_table));
     s= &table_share;
     in_use= current_thd;
     null_row= '\0';
@@ -192,7 +197,7 @@ class Fake_TABLE: public TABLE
     table_share(column_count),
     mock_handler(&fake_handlerton, &table_share)
   {
-    DBUG_ASSERT(static_cast<size_t>(column_count) <= sizeof(int) * 8);
+    assert(static_cast<size_t>(column_count) <= sizeof(int) * 8);
     initialize();
     for (int i= 0; i < column_count; ++i)
     {
diff --git a/unittest/gunit/field-t.cc b/unittest/gunit/field-t.cc
index 9f3911fedaa0..94529db44819 100644
--- a/unittest/gunit/field-t.cc
+++ b/unittest/gunit/field-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_date-t.cc b/unittest/gunit/field_date-t.cc
index 688dba90aea0..66bd8d2e8256 100644
--- a/unittest/gunit/field_date-t.cc
+++ b/unittest/gunit/field_date-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_datetime-t.cc b/unittest/gunit/field_datetime-t.cc
index 38680c67fbd3..f05afb893909 100644
--- a/unittest/gunit/field_datetime-t.cc
+++ b/unittest/gunit/field_datetime-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_long-t.cc b/unittest/gunit/field_long-t.cc
index 066b36712fd2..73d28ac2b771 100644
--- a/unittest/gunit/field_long-t.cc
+++ b/unittest/gunit/field_long-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_newdecimal-t.cc b/unittest/gunit/field_newdecimal-t.cc
index e54830364ad2..c23e5180bc6e 100644
--- a/unittest/gunit/field_newdecimal-t.cc
+++ b/unittest/gunit/field_newdecimal-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_temporal_utils.h b/unittest/gunit/field_temporal_utils.h
index 1bf55dee23ff..89bf03be7c53 100644
--- a/unittest/gunit/field_temporal_utils.h
+++ b/unittest/gunit/field_temporal_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/field_timestamp-t.cc b/unittest/gunit/field_timestamp-t.cc
index 79b105c12ab5..3601347a030f 100644
--- a/unittest/gunit/field_timestamp-t.cc
+++ b/unittest/gunit/field_timestamp-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/filesort_buffer-t.cc b/unittest/gunit/filesort_buffer-t.cc
index b605abfec614..3ed8bc2ce728 100644
--- a/unittest/gunit/filesort_buffer-t.cc
+++ b/unittest/gunit/filesort_buffer-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/filesort_compare-t.cc b/unittest/gunit/filesort_compare-t.cc
index 253c4cfad595..38ac46933eba 100644
--- a/unittest/gunit/filesort_compare-t.cc
+++ b/unittest/gunit/filesort_compare-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/get_diagnostics-t.cc b/unittest/gunit/get_diagnostics-t.cc
index 9f2dce348338..abfdb72f6970 100644
--- a/unittest/gunit/get_diagnostics-t.cc
+++ b/unittest/gunit/get_diagnostics-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -144,11 +151,11 @@ TEST_F(GetDiagnosticsTest, Cmd)
 }
 
 
-// Verifies death with a DBUG_ASSERT if target item is not settable.
+// Verifies death with a assert if target item is not settable.
 // Google Test recommends DeathTest suffix for classes used in death tests.
 typedef GetDiagnosticsTest GetDiagnosticsTestDeathTest;
 
-#if GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 TEST_F(GetDiagnosticsTestDeathTest, DieWhenUnsettableItem)
 {
   Item *var;
@@ -172,7 +179,7 @@ TEST_F(GetDiagnosticsTestDeathTest, DieWhenUnsettableItem)
 
   EXPECT_DEATH(cmd->execute(thd()), ".*Assertion.*srp.*");
 }
-#endif  // GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 
 class MockDiagInfoError : public Diagnostics_information
@@ -469,14 +476,14 @@ TEST_F(GetDiagnosticsTest, PushPopDiagnosticsArea)
 
 
 // Pop when there is just one diagnostics area = assert
-#if GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 TEST_F(GetDiagnosticsTestDeathTest, DiePopDiagnosticsArea)
 {
   ::testing::FLAGS_gtest_death_test_style= "threadsafe";
 
   EXPECT_DEATH(thd()->pop_diagnostics_area(), ".*Assertion.*m_stacked_da*");
 }
-#endif  // GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 
 // Pushed diagnostics area should initially contain copy of conditions
diff --git a/unittest/gunit/gis_algos-t.cc b/unittest/gunit/gis_algos-t.cc
index beccc4b6cbc7..e894695f4970 100644
--- a/unittest/gunit/gis_algos-t.cc
+++ b/unittest/gunit/gis_algos-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -65,7 +72,7 @@ void SetRingOrderTest::set_order_and_compare(const std::string &s1,
 
   Gis_polygon_ring *ringp= static_cast<Gis_polygon_ring *>
     (geometry_from_text(wkt, &str, &buffer));
-  DBUG_ASSERT(ringp->get_geotype() == Geometry::wkb_linestring);
+  assert(ringp->get_geotype() == Geometry::wkb_linestring);
   Gis_polygon_ring ring(ringp->get_ptr(),
                         ringp->get_nbytes(), my_flags, 0U);
   EXPECT_EQ(ring.set_ring_order(want_ccw), false);
@@ -73,7 +80,7 @@ void SetRingOrderTest::set_order_and_compare(const std::string &s1,
 
   ringp= static_cast<Gis_polygon_ring *>(geometry_from_text(wkt2, &str2,
                                                             &buffer2));
-  DBUG_ASSERT(ringp->get_geotype() == Geometry::wkb_linestring);
+  assert(ringp->get_geotype() == Geometry::wkb_linestring);
   Gis_polygon_ring ring2(ringp->get_ptr(),
                          ringp->get_nbytes(), my_flags, 0U);
   EXPECT_EQ(ring2.set_ring_order(want_ccw), false);
@@ -154,7 +161,7 @@ TEST_F(SetRingOrderTest, RingDegradedToPointTest)
 
   Gis_polygon_ring *ringp= static_cast<Gis_polygon_ring *>
     (geometry_from_text(wkt, &str, &buffer));
-  DBUG_ASSERT(ringp->get_geotype() == Geometry::wkb_linestring);
+  assert(ringp->get_geotype() == Geometry::wkb_linestring);
   Gis_polygon_ring ring(ringp->get_ptr(),
                         ringp->get_nbytes(), my_flags, 0U);
   EXPECT_EQ(ring.set_ring_order(true/*CCW*/), true);
@@ -252,10 +259,6 @@ TEST_F(GeometryManipulationTest, PolygonManipulationTest)
                      ls0->get_flags(), ls0->get_srid());
   Gis_line_string ls00(*ls0);
 
-  ls= ls;
-  ls00= ls00;
-  plgn= plgn;
-
   Geometry_buffer buffer3;
   String wkt3, str3;
 
diff --git a/unittest/gunit/gunit_test_main.cc b/unittest/gunit/gunit_test_main.cc
index 197f1a05a397..ef69a67f9da2 100644
--- a/unittest/gunit/gunit_test_main.cc
+++ b/unittest/gunit/gunit_test_main.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/gunit_test_main_server.cc b/unittest/gunit/gunit_test_main_server.cc
index d05f70505029..3d0680566448 100644
--- a/unittest/gunit/gunit_test_main_server.cc
+++ b/unittest/gunit/gunit_test_main_server.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/handler-t.cc b/unittest/gunit/handler-t.cc
index e7e2af454376..85fa0b09f30a 100644
--- a/unittest/gunit/handler-t.cc
+++ b/unittest/gunit/handler-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/handler-t.h b/unittest/gunit/handler-t.h
index de00d570edcd..ca56b1130256 100644
--- a/unittest/gunit/handler-t.h
+++ b/unittest/gunit/handler-t.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/initialize_password-t.cc b/unittest/gunit/initialize_password-t.cc
index 7e213ed50fdb..642931fa909f 100644
--- a/unittest/gunit/initialize_password-t.cc
+++ b/unittest/gunit/initialize_password-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/CMakeLists.txt b/unittest/gunit/innodb/CMakeLists.txt
index 0cdd0ad1a09e..e24338e82ff4 100644
--- a/unittest/gunit/innodb/CMakeLists.txt
+++ b/unittest/gunit/innodb/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/example-t.cc b/unittest/gunit/innodb/example-t.cc
index 88fdab5c3335..44ef96a25833 100644
--- a/unittest/gunit/innodb/example-t.cc
+++ b/unittest/gunit/innodb/example-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/ha_innodb-t.cc b/unittest/gunit/innodb/ha_innodb-t.cc
index 1daa66fbe08b..219bec1c95e8 100644
--- a/unittest/gunit/innodb/ha_innodb-t.cc
+++ b/unittest/gunit/innodb/ha_innodb-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/mem0mem-t.cc b/unittest/gunit/innodb/mem0mem-t.cc
index 76fc41feff6c..c7cc07f49485 100644
--- a/unittest/gunit/innodb/mem0mem-t.cc
+++ b/unittest/gunit/innodb/mem0mem-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -21,6 +28,7 @@
 #include "univ.i"
 
 #include "mem0mem.h"
+#include "os0event.h"
 #include "srv0conc.h"
 #include "srv0srv.h"
 
@@ -37,6 +45,7 @@ class mem0mem : public ::testing::Test {
 	SetUpTestCase()
 	{
 		srv_max_n_threads = srv_sync_array_size + 1;
+		os_event_global_init();
 		sync_check_init();
 	}
 	static
@@ -44,6 +53,7 @@ class mem0mem : public ::testing::Test {
 	TearDownTestCase()
 	{
 		sync_check_close();
+		os_event_global_destroy();
 	}
 };
 
diff --git a/unittest/gunit/innodb/printf-t.cc b/unittest/gunit/innodb/printf-t.cc
index 9167792f0d0e..3588b5f28c3b 100644
--- a/unittest/gunit/innodb/printf-t.cc
+++ b/unittest/gunit/innodb/printf-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/ut0crc32-t.cc b/unittest/gunit/innodb/ut0crc32-t.cc
index 0e13081e6d89..02e52ee38cfe 100644
--- a/unittest/gunit/innodb/ut0crc32-t.cc
+++ b/unittest/gunit/innodb/ut0crc32-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/ut0mem-t.cc b/unittest/gunit/innodb/ut0mem-t.cc
index b294c7b37d28..c57c3f61a49b 100644
--- a/unittest/gunit/innodb/ut0mem-t.cc
+++ b/unittest/gunit/innodb/ut0mem-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/innodb/ut0new-t.cc b/unittest/gunit/innodb/ut0new-t.cc
index edf59217e11f..a1ec4bf12043 100644
--- a/unittest/gunit/innodb/ut0new-t.cc
+++ b/unittest/gunit/innodb/ut0new-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/inplace_vector-t.cc b/unittest/gunit/inplace_vector-t.cc
index b4cd5a5a8179..9050f9bfbfe5 100644
--- a/unittest/gunit/inplace_vector-t.cc
+++ b/unittest/gunit/inplace_vector-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -42,7 +49,7 @@ TEST_F(InplaceVectorTest, Empty)
   EXPECT_EQ(0U, int_10.size());
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // Google Test recommends DeathTest suffix for classes used in death tests.
 typedef InplaceVectorTest InplaceVectorDeathTest;
 
@@ -74,7 +81,7 @@ TEST_F(InplaceVectorDeathTest, EmptyBackWrite)
 }
 
 
-#endif // DBUG_OFF
+#endif // NDEBUG
 
 TEST_F(InplaceVectorTest, Insert5)
 {
diff --git a/unittest/gunit/insert_delayed-t.cc b/unittest/gunit/insert_delayed-t.cc
index b5a7bab569b4..4a6a0ac30d15 100644
--- a/unittest/gunit/insert_delayed-t.cc
+++ b/unittest/gunit/insert_delayed-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/item-t.cc b/unittest/gunit/item-t.cc
index b7c7ca2f458a..51c9d9bbf045 100644
--- a/unittest/gunit/item-t.cc
+++ b/unittest/gunit/item-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -355,7 +362,7 @@ TEST_F(ItemTest, ItemEqual)
                    new Item_field(&mft));
   
   EXPECT_FALSE(item_equal->fix_fields(thd(), NULL));
-  EXPECT_EQ(0, item_equal->val_int());
+  EXPECT_EQ(1, item_equal->val_int());
 }
 
 
@@ -589,7 +596,7 @@ TEST_F(ItemTest, OutOfMemory)
   EXPECT_NE(null_item, item);
   delete null_item;
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   // Setting debug flags triggers enter/exit trace, so redirect to /dev/null.
   DBUG_SET("o," IF_WIN("NUL", "/dev/null"));
 
diff --git a/unittest/gunit/item_filter-t.cc b/unittest/gunit/item_filter-t.cc
index 4e1c2f46eedc..ebe6ad824dd5 100644
--- a/unittest/gunit/item_filter-t.cc
+++ b/unittest/gunit/item_filter-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -273,7 +280,7 @@ Item_func* ItemFilterTest::create_item(Item_func::Functype type,
     }
   default:
     result= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
     return result;
   }
   Item *itm= static_cast<Item*>(result);
diff --git a/unittest/gunit/item_func_case-t.cc b/unittest/gunit/item_func_case-t.cc
index 473e2a7470f6..5fe2a3eb047c 100644
--- a/unittest/gunit/item_func_case-t.cc
+++ b/unittest/gunit/item_func_case-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/item_func_now_local-t.cc b/unittest/gunit/item_func_now_local-t.cc
index 451aa3be7024..3e5970b531ca 100644
--- a/unittest/gunit/item_func_now_local-t.cc
+++ b/unittest/gunit/item_func_now_local-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/item_func_rlike-t.cc b/unittest/gunit/item_func_rlike-t.cc
new file mode 100644
index 000000000000..d41f8fad7065
--- /dev/null
+++ b/unittest/gunit/item_func_rlike-t.cc
@@ -0,0 +1,190 @@
+/* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include "my_config.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <string>
+
+#include "item.h"
+#include "item_cmpfunc.h"
+#include "sql_class.h"
+#include "test_utils.h"
+
+namespace item_func_regex_unittest {
+
+using my_testing::Server_initializer;
+
+static const char *substrings[2] = {
+    "Folder=RootObject="
+    "Operating System-WinWinServerLocalAdminis-trator1-ABCDEFGHI01-adminimm",
+    "tasktype=ReconcileTask"};
+
+static const char *wild_like = "%";
+static const char *wild_rlike = ".*";
+static const char escape[] = "\\";
+
+static std::string make_like_pattern() {
+  return std::string(wild_like) + substrings[0] + wild_like + substrings[1] +
+         wild_like;
+}
+
+static std::string make_rlike_pattern() {
+  return std::string(wild_rlike) + substrings[0] + wild_rlike + substrings[1] +
+         wild_rlike;
+}
+
+static std::string make_matched_string() {
+  return std::string("hello") + substrings[0] + "42" + substrings[1] +
+         "goodbye";
+}
+
+CHARSET_INFO *init_collation(const char *name) {
+  MY_CHARSET_LOADER loader;
+  my_charset_loader_init_mysys(&loader);
+  return my_collation_get_by_name(&loader, name, MYF(0));
+}
+
+Item_string *make_string_item(std::string *str) {
+  CHARSET_INFO *cs = init_collation("ascii_general_ci");
+  return new Item_string(str->c_str(), str->length(), cs);
+}
+
+class LikeVSRlikeTest : public ::testing::Test {
+protected:
+  virtual void SetUp() {
+    initializer.SetUp();
+
+    dummy_string = "this is a dummy string";
+    like_pattern = make_like_pattern();
+    rlike_pattern = make_rlike_pattern();
+    match_string = make_matched_string();
+
+    dummy_subject_item = make_string_item(&dummy_string);
+    match_subject_item = make_string_item(&match_string);
+    like_pattern_item = make_string_item(&like_pattern);
+    rlike_pattern_item = make_string_item(&rlike_pattern);
+    it_escape = new Item_string(STRING_WITH_LEN(escape), &my_charset_latin1);
+  }
+  virtual void TearDown() { initializer.TearDown(); }
+
+  THD *thd() { return initializer.thd(); }
+
+  std::string dummy_string;
+  std::string like_pattern;
+  std::string rlike_pattern;
+  std::string match_string;
+
+  Server_initializer initializer;
+  Item_string *dummy_subject_item;
+  Item_string *match_subject_item;
+  Item_string *like_pattern_item;
+  Item_string *rlike_pattern_item;
+  Item_string *it_escape;
+};
+
+// "dummy text"    LIKE "pattern with three %"
+// "matching text" LIKE "pattern with three %"
+TEST_F(LikeVSRlikeTest, SimpleLike) {
+  Item_func_like *like_item = new Item_func_like(
+      dummy_subject_item, like_pattern_item, it_escape, false);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  EXPECT_EQ(0, like_item->val_int());
+
+  like_item = new Item_func_like(match_subject_item, like_pattern_item,
+                                 it_escape, false);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  EXPECT_EQ(1, like_item->val_int());
+}
+
+// "dummy text"    REGEXP "pattern with three .*"
+// "matching text" REGEXP "pattern with three .*"
+TEST_F(LikeVSRlikeTest, SimpleRLike) {
+  POS pos;
+  Item *like_item =
+      new Item_func_regex(pos, dummy_subject_item, rlike_pattern_item);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  EXPECT_EQ(0, like_item->val_int());
+  like_item->cleanup();
+
+  like_item = new Item_func_regex(pos, match_subject_item, rlike_pattern_item);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  EXPECT_EQ(1, like_item->val_int());
+  like_item->cleanup();
+}
+
+/*
+  To benchmark:
+  make item_func_rlike-t
+  ./unittest/gunit/item_func_rlike-t --disable-tap-output
+
+  googletest reports total time in milliseconds,
+  and we do num_iterations = 1000000;
+  so translation to ns/iter is trivial.
+ */
+
+// Do each algorithm this many times. Increase value for benchmarking!
+// static const size_t num_iterations = 1000000;
+static const size_t num_iterations = 1;
+
+TEST_F(LikeVSRlikeTest, BM_LikeNoMatch) {
+  Item_func_like *like_item = new Item_func_like(
+      dummy_subject_item, like_pattern_item, it_escape, false);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  for (size_t i = 0; i < num_iterations; ++i) {
+    EXPECT_EQ(0, like_item->val_int());
+  }
+}
+
+TEST_F(LikeVSRlikeTest, BM_LikeWithMatch) {
+  Item_func_like *like_item = new Item_func_like(
+      match_subject_item, like_pattern_item, it_escape, false);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  for (size_t i = 0; i < num_iterations; ++i) {
+    EXPECT_EQ(1, like_item->val_int());
+  }
+}
+
+TEST_F(LikeVSRlikeTest, BM_RlikeNoMatch) {
+  POS pos;
+  Item *like_item =
+      new Item_func_regex(pos, dummy_subject_item, rlike_pattern_item);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  for (size_t i = 0; i < num_iterations; ++i) {
+    EXPECT_EQ(0, like_item->val_int());
+  }
+  like_item->cleanup();
+}
+
+TEST_F(LikeVSRlikeTest, BM_RlikeWithMatch) {
+  POS pos;
+  Item *like_item =
+      new Item_func_regex(pos, match_subject_item, rlike_pattern_item);
+  EXPECT_EQ(0, like_item->fix_fields(thd(), NULL));
+  for (size_t i = 0; i < num_iterations; ++i) {
+    EXPECT_EQ(1, like_item->val_int());
+  }
+  like_item->cleanup();
+}
+
+} // namespace item_func_regex_unittest
diff --git a/unittest/gunit/item_like-t.cc b/unittest/gunit/item_like-t.cc
index a3eea61ef9e0..86e36ff02a4f 100644
--- a/unittest/gunit/item_like-t.cc
+++ b/unittest/gunit/item_like-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/item_param-t.cc b/unittest/gunit/item_param-t.cc
index 07c907ce4c80..73b0e2bcef69 100644
--- a/unittest/gunit/item_param-t.cc
+++ b/unittest/gunit/item_param-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/item_timefunc-t.cc b/unittest/gunit/item_timefunc-t.cc
index d6fba8c93f57..7008b5ae48ba 100644
--- a/unittest/gunit/item_timefunc-t.cc
+++ b/unittest/gunit/item_timefunc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/join_tab_sort-t.cc b/unittest/gunit/join_tab_sort-t.cc
index 5cdfadf7e46c..71cc9c2c5050 100644
--- a/unittest/gunit/join_tab_sort-t.cc
+++ b/unittest/gunit/join_tab_sort-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/json_binary-t.cc b/unittest/gunit/json_binary-t.cc
index 855d95d76d29..76ee241ce57f 100644
--- a/unittest/gunit/json_binary-t.cc
+++ b/unittest/gunit/json_binary-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/json_dom-t.cc b/unittest/gunit/json_dom-t.cc
index 265f6fb4b0f6..25ceb0f0eb33 100644
--- a/unittest/gunit/json_dom-t.cc
+++ b/unittest/gunit/json_dom-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -251,7 +258,11 @@ TEST_F(JsonDomTest, BasicTest)
   std::auto_ptr<const Json_dom> c(a.clone());
   EXPECT_EQ(std::string("[null, false, true]"), format(a));
   EXPECT_EQ(std::string("[null, false, true]"), format(c.get()));
+}
 
+TEST_F(JsonDomTest, BasicTestTwo)
+{
+  Json_array a;
   /* DATETIME scalar */
   MYSQL_TIME dt;
   std::memset(&dt, 0, sizeof dt);
@@ -359,7 +370,7 @@ TEST_F(JsonDomTest, BasicTest)
   EXPECT_TRUE(dom.get() != NULL);
   const Json_object *obj= down_cast<const Json_object *>(dom.get());
   EXPECT_EQ(8U, obj->cardinality());
-  idx= 0;
+  int idx= 0;
 
   for (Json_object::const_iterator it= obj->begin(); it != obj->end(); ++it)
   {
diff --git a/unittest/gunit/json_path-t.cc b/unittest/gunit/json_path-t.cc
index 7c620508aa79..9a1526b7f9cf 100644
--- a/unittest/gunit/json_path-t.cc
+++ b/unittest/gunit/json_path-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/key-t.cc b/unittest/gunit/key-t.cc
index 21f508dbb561..09ce9272af97 100644
--- a/unittest/gunit/key-t.cc
+++ b/unittest/gunit/key-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/keyring/CMakeLists.txt b/unittest/gunit/keyring/CMakeLists.txt
index d2b818552736..a930c3c56dd6 100644
--- a/unittest/gunit/keyring/CMakeLists.txt
+++ b/unittest/gunit/keyring/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -18,7 +25,7 @@ IF(NOT GMOCK_FOUND)
   RETURN()
 ENDIF()
 
-INCLUDE_DIRECTORIES(${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 
 INCLUDE_DIRECTORIES(
   ${GMOCK_INCLUDE_DIRS}
diff --git a/unittest/gunit/keyring/buffered_file_io-t.cc b/unittest/gunit/keyring/buffered_file_io-t.cc
index fdebccb2583f..0846da9836d8 100644
--- a/unittest/gunit/keyring/buffered_file_io-t.cc
+++ b/unittest/gunit/keyring/buffered_file_io-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/keyring/file_io-t.cc b/unittest/gunit/keyring/file_io-t.cc
index d729a5c19527..e38385a08ef0 100644
--- a/unittest/gunit/keyring/file_io-t.cc
+++ b/unittest/gunit/keyring/file_io-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/keyring/keyring-api-t.cc b/unittest/gunit/keyring/keyring-api-t.cc
index eeba96322265..290673f4c3e8 100644
--- a/unittest/gunit/keyring/keyring-api-t.cc
+++ b/unittest/gunit/keyring/keyring-api-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/keyring/keys_container-t.cc b/unittest/gunit/keyring/keys_container-t.cc
index 9b3e5aa9fa6e..809757824938 100644
--- a/unittest/gunit/keyring/keys_container-t.cc
+++ b/unittest/gunit/keyring/keys_container-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/keyring/mock_logger.h b/unittest/gunit/keyring/mock_logger.h
index aba965de5cbb..a58d99ac5d2e 100644
--- a/unittest/gunit/keyring/mock_logger.h
+++ b/unittest/gunit/keyring/mock_logger.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/like_range-t.cc b/unittest/gunit/like_range-t.cc
index ae7883666f68..191789d4bdf6 100644
--- a/unittest/gunit/like_range-t.cc
+++ b/unittest/gunit/like_range-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/locking_service-t.cc b/unittest/gunit/locking_service-t.cc
index 9c262ffd6a0a..61e69fb22c20 100644
--- a/unittest/gunit/locking_service-t.cc
+++ b/unittest/gunit/locking_service-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/locks/CMakeLists.txt b/unittest/gunit/locks/CMakeLists.txt
new file mode 100644
index 000000000000..3c87866d601c
--- /dev/null
+++ b/unittest/gunit/locks/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+IF(HAS_WARN_FLAG)
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+ENDIF()
+
+INCLUDE_DIRECTORIES(SYSTEM
+  ${GMOCK_INCLUDE_DIRS}
+)
+
+# Add tests
+SET(TESTS
+  shared_spin_lock)
+
+FOREACH(test ${TESTS})
+  ADD_EXECUTABLE(${test}-t ${test}-t.cc)
+  TARGET_LINK_LIBRARIES(${test}-t mysys gunit_small sqlgunitlib)
+ENDFOREACH()
diff --git a/unittest/gunit/locks/shared_spin_lock-t.cc b/unittest/gunit/locks/shared_spin_lock-t.cc
new file mode 100644
index 000000000000..f0b2a1059157
--- /dev/null
+++ b/unittest/gunit/locks/shared_spin_lock-t.cc
@@ -0,0 +1,91 @@
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "locks/shared_spin_lock.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace lock
+{
+namespace unittests
+{
+class Shared_spin_lock_test : public ::testing::Test
+{
+ protected:
+  Shared_spin_lock_test() {}
+  virtual void SetUp() {}
+  virtual void TearDown() {}
+};
+
+TEST_F(Shared_spin_lock_test, Lock_unlock_test)
+{
+  lock::Shared_spin_lock lock1;
+  lock::Shared_spin_lock lock2;
+
+  EXPECT_EQ(lock1.acquire_exclusive().is_exclusive_acquisition(),
+            true);  // Successfully acquired in exclusive mode
+  EXPECT_EQ(lock2.acquire_shared().is_shared_acquisition(),
+            true);  // Successfully acquired in shared mode
+
+  EXPECT_EQ(lock1.try_shared().is_shared_acquisition(),
+            false);  // Trying to acquire shared access fails
+  EXPECT_EQ(lock2.try_exclusive().is_exclusive_acquisition(),
+            false);  // Trying to acquire exclusive access fails
+  EXPECT_EQ(lock2.try_shared().is_shared_acquisition(),
+            true);  // Trying to acquire shared access succeeds
+
+  EXPECT_EQ(lock1.release_exclusive().is_exclusive_acquisition(),
+            false);  // Release and test that acquisition isn't kept
+  EXPECT_EQ(lock2.release_shared().release_shared().is_shared_acquisition(),
+            false);  // Release and test that acquisition isn't kept
+}
+
+TEST_F(Shared_spin_lock_test, Sentry_class_test)
+{
+  lock::Shared_spin_lock lock1;
+
+  {
+    lock::Shared_spin_lock::Guard sentry(
+        lock1, lock::Shared_spin_lock::SL_EXCLUSIVE, true /* try and exit*/);
+    EXPECT_EQ(sentry->is_exclusive_acquisition(),
+              true);  // Successfully acquired in exclusive mode
+  }
+  EXPECT_EQ(
+      lock1.is_exclusive_acquisition(),
+      false);  // Successfully released the locked upon exiting the code block
+  {
+    lock::Shared_spin_lock::Guard sentry2(
+        lock1, lock::Shared_spin_lock::SL_NO_ACQUISITION);
+    sentry2.acquire(lock::Shared_spin_lock::SL_SHARED, true /* try and exit*/
+    );
+    EXPECT_EQ((*sentry2).is_shared_acquisition(),
+              true);  // Successfully acquired in shared mode
+  }
+  EXPECT_EQ(
+      lock1.is_shared_acquisition(),
+      false);  // Successfully released the locked upon exiting the code block
+}  // namespace unittests
+
+}  // namespace unittests
+}  // namespace lock
diff --git a/unittest/gunit/log_throttle-t.cc b/unittest/gunit/log_throttle-t.cc
index c6ba03c37245..d4e5da711f27 100644
--- a/unittest/gunit/log_throttle-t.cc
+++ b/unittest/gunit/log_throttle-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/log_timestamp-t.cc b/unittest/gunit/log_timestamp-t.cc
new file mode 100644
index 000000000000..a59a2b708a31
--- /dev/null
+++ b/unittest/gunit/log_timestamp-t.cc
@@ -0,0 +1,138 @@
+/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+// First include (the generated) my_config.h, to get correct platform defines,
+// then gtest.h (before any other MySQL headers), to avoid min() macros etc ...
+
+#ifdef _WIN32_WINNT
+#if (_WIN32_WINNT < 0x0602)
+#undef _WIN32_WINNT
+// We need at least _WIN32_WINNT_WIN8 i.e. 0x0602 for
+// EnumDynamicTimeZoneInformation
+#define _WIN32_WINNT 0x0602
+#endif // (_WIN32_WINNT < 0x0602)
+#endif // _WIN32_WINNT
+
+#include "my_config.h"
+#include "test_utils.h"
+#include <gtest/gtest.h>
+#include <stdlib.h>
+
+#include "../sql/log.h"
+
+// CET: 32 bytes
+//   date (10), 'T', time (8), '.', microseconds (6), timezone offset (6)
+#define LEN_MS_CET 32
+
+// UTC: 27 bytes
+//   date (10), 'T', time (8), '.', microseconds (6), 'Z'
+#define LEN_MS_UTC 27
+
+// we use micro-seconds since the epoch
+#define MICRO_FAC ((ulonglong)1000000L)
+
+namespace log_timestamp_unittest
+{
+
+using my_testing::Server_initializer;
+
+class LogTimestampTest : public ::testing::Test
+{
+protected:
+  virtual void SetUp() { initializer.SetUp(); }
+  virtual void TearDown() { initializer.TearDown(); }
+
+  THD *thd() { return initializer.thd(); }
+
+  Server_initializer initializer;
+};
+
+/*
+  Test basic functionality - throttling, eligibility, printing of summary of
+                             Slow_log_throttle.
+*/
+TEST_F(LogTimestampTest, iso8601)
+{
+  char time_buff[iso8601_size];
+#ifdef WIN32
+  DYNAMIC_TIME_ZONE_INFORMATION original_dti = {};
+  DWORD original_dti_result = GetDynamicTimeZoneInformation(&original_dti);
+  EXPECT_NE(original_dti_result, TIME_ZONE_ID_INVALID);
+
+  if (original_dti.DaylightDate.wMonth == 0)
+  {
+    /*
+      Current system time zone does not support Daylight savings. If the Windows
+      system time zone has no daylight saving, then attempting to set TZ to a
+      timezone that does have daylight saving will result in localtime_r
+      producing inaccurate results. Skipping the test.
+      Bug#34380460 will be tracking this issue.
+    */
+    return;
+  }
+  char tz[] = "TZ=CET-1CES";
+#else
+  char tz[] = "TZ=CET";
+#endif
+  int time_buff_len;
+
+  EXPECT_EQ(((iso8601_size)-1), LEN_MS_CET);
+  EXPECT_EQ(((LEN_MS_CET)-5), LEN_MS_UTC);
+
+  // set up timezone (central european time)
+  putenv(tz);
+  EXPECT_STREQ(&(tz[3]), getenv("TZ"));
+  tzset();
+
+  /// 1970/01/01 .000001  (1)
+
+  // UTC (winter)
+  opt_log_timestamps = 0; // UTC Timestamp
+  time_buff_len = make_iso8601_timestamp(time_buff, 1);
+  EXPECT_EQ(LEN_MS_UTC, time_buff_len);
+  EXPECT_STREQ("1970-01-01T00:00:00.000001Z", time_buff);
+
+  // CET (winter) +1h
+  opt_log_timestamps = 1; // System Timestamp
+  time_buff_len = make_iso8601_timestamp(time_buff, 1);
+  EXPECT_EQ(LEN_MS_CET, time_buff_len);
+  EXPECT_STREQ("1970-01-01T01:00:00.000001+01:00", time_buff);
+
+  /// 2011-07-07  (1309996800)
+
+  // UTC (summer)
+  opt_log_timestamps = 0;
+  time_buff_len = make_iso8601_timestamp(time_buff, MICRO_FAC * 1309996800);
+  EXPECT_EQ(LEN_MS_UTC, time_buff_len);
+  EXPECT_STREQ("2011-07-07T00:00:00.000000Z", time_buff);
+
+  // CET (summer) +2h
+  opt_log_timestamps = 1;
+  time_buff_len = make_iso8601_timestamp(time_buff, MICRO_FAC * 1309996800);
+  EXPECT_EQ(LEN_MS_CET, time_buff_len);
+  EXPECT_STREQ("2011-07-07T02:00:00.000000+02:00", time_buff);
+
+  /// 1987-06-05 04:03:02.123456
+
+  // UTC
+  opt_log_timestamps = 0;
+  time_buff_len = make_iso8601_timestamp(
+      time_buff, (MICRO_FAC * 549864182) + 123456);
+  EXPECT_EQ(LEN_MS_UTC, time_buff_len);
+  EXPECT_STREQ("1987-06-05T04:03:02.123456Z", time_buff);
+}
+// End of Error_log_timestamp test cases.
+
+}  // namespace log_timestamp_unittest
diff --git a/unittest/gunit/make_sortkey-t.cc b/unittest/gunit/make_sortkey-t.cc
index 795571ca74c7..43e7400a55f7 100644
--- a/unittest/gunit/make_sortkey-t.cc
+++ b/unittest/gunit/make_sortkey-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mdl-t.cc b/unittest/gunit/mdl-t.cc
index fdbcc6e11f4a..d751df966d51 100644
--- a/unittest/gunit/mdl-t.cc
+++ b/unittest/gunit/mdl-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -258,9 +265,9 @@ typedef MDLTest MDLDeathTest;
 
 
 /*
-  Verifies that we die with a DBUG_ASSERT if we destry a non-empty MDL_context.
+  Verifies that we die with a assert if we destry a non-empty MDL_context.
  */
-#if GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 TEST_F(MDLDeathTest, DieWhenMTicketsNonempty)
 {
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -273,7 +280,7 @@ TEST_F(MDLDeathTest, DieWhenMTicketsNonempty)
                ".*Assertion.*MDL_TRANSACTION.*is_empty.*");
   m_mdl_context.release_transactional_locks();
 }
-#endif  // GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 
 
@@ -4217,8 +4224,8 @@ TEST_F(MDLHtonNotifyTest, NotifyLockTypes)
   EXPECT_EQ(1U, post_release_count());
 
   // There are no other lock types!
-  DBUG_ASSERT(static_cast<uint>(MDL_EXCLUSIVE) + 1 ==
-              static_cast<uint>(MDL_TYPE_END));
+  assert(static_cast<uint>(MDL_EXCLUSIVE) + 1 ==
+         static_cast<uint>(MDL_TYPE_END));
 }
 
 
@@ -4579,11 +4586,11 @@ typedef MDLKeyTest MDLKeyDeathTest;
 
 
 /*
-  Verifies that debug build dies with a DBUG_ASSERT if we try to construct
+  Verifies that debug build dies with a assert if we try to construct
   MDL_key with too long database or object names.
 */
 
-#if GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 TEST_F(MDLKeyDeathTest, DieWhenNamesAreTooLong)
 {
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -4608,7 +4615,7 @@ TEST_F(MDLKeyDeathTest, DieWhenNamesAreTooLong)
                ".*Assertion.*strlen.*");
 
 }
-#endif  // GTEST_HAS_DEATH_TEST && !defined(DBUG_OFF)
+#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 
 /*
@@ -4617,7 +4624,7 @@ TEST_F(MDLKeyDeathTest, DieWhenNamesAreTooLong)
   truncated.
 */
 
-#if defined(DBUG_OFF)
+#if defined(NDEBUG)
 TEST_F(MDLKeyTest, TruncateTooLongNames)
 {
   /* We need a name which is longer than NAME_LEN = 64*3 = 192.*/
@@ -4637,7 +4644,7 @@ TEST_F(MDLKeyTest, TruncateTooLongNames)
   EXPECT_LE(strlen(name), (uint)NAME_LEN);
   EXPECT_TRUE(strncmp(name, too_long_name, NAME_LEN) == 0);
 }
-#endif  // defined(DBUG_OFF)
+#endif  // defined(NDEBUG)
 
 
 }  // namespace
diff --git a/unittest/gunit/mdl_sync-t.cc b/unittest/gunit/mdl_sync-t.cc
index d5ffe613d5c9..62da96ac1777 100644
--- a/unittest/gunit/mdl_sync-t.cc
+++ b/unittest/gunit/mdl_sync-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mock_create_field.h b/unittest/gunit/mock_create_field.h
index 2ca50884ae51..281262d94570 100644
--- a/unittest/gunit/mock_create_field.h
+++ b/unittest/gunit/mock_create_field.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -29,8 +36,8 @@ class Mock_create_field : public Create_field
       Only TIMESTAMP is implemented for now.
       Other types would need different parameters (fld_length, etc).
     */
-    DBUG_ASSERT(field_type == MYSQL_TYPE_TIMESTAMP ||
-                field_type == MYSQL_TYPE_TIMESTAMP2);
+    assert(field_type == MYSQL_TYPE_TIMESTAMP ||
+           field_type == MYSQL_TYPE_TIMESTAMP2);
     init(NULL, // THD *thd
          NULL, // char *fld_name
          field_type,
diff --git a/unittest/gunit/mock_field_datetime.h b/unittest/gunit/mock_field_datetime.h
index 76e61ace4f1e..c8f6b24feeeb 100644
--- a/unittest/gunit/mock_field_datetime.h
+++ b/unittest/gunit/mock_field_datetime.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/mock_field_long.h b/unittest/gunit/mock_field_long.h
index d64eb01c327c..3ddb36bf0709 100644
--- a/unittest/gunit/mock_field_long.h
+++ b/unittest/gunit/mock_field_long.h
@@ -1,20 +1,28 @@
 #ifndef MOCK_FIELD_LONG_INCLUDED
 #define MOCK_FIELD_LONG_INCLUDED
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
+#include "m_string.h"
 #include "field.h"
 
 /*
@@ -37,7 +45,7 @@ class Mock_field_long : public Field_long
     table_name= &table_name_buf;
     if (name)
     {
-      strncpy(m_name, name, 1024);
+      my_snprintf(m_name, sizeof(m_name), "%.1023s", name);
       field_name= m_name;
     }
   }
diff --git a/unittest/gunit/mock_field_timestamp.h b/unittest/gunit/mock_field_timestamp.h
index 3b280bcdfe07..2f35eadd52ab 100644
--- a/unittest/gunit/mock_field_timestamp.h
+++ b/unittest/gunit/mock_field_timestamp.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mock_field_timestampf.h b/unittest/gunit/mock_field_timestampf.h
index a89ac64ace61..df4154db45d3 100644
--- a/unittest/gunit/mock_field_timestampf.h
+++ b/unittest/gunit/mock_field_timestampf.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_alloc-t.cc b/unittest/gunit/my_alloc-t.cc
index d62b01ae1954..bd29b8b4cf58 100644
--- a/unittest/gunit/my_alloc-t.cc
+++ b/unittest/gunit/my_alloc-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/my_bitmap-t.cc b/unittest/gunit/my_bitmap-t.cc
index 8d6ad6db3730..6bfcc9242b6c 100644
--- a/unittest/gunit/my_bitmap-t.cc
+++ b/unittest/gunit/my_bitmap-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_decimal-t.cc b/unittest/gunit/my_decimal-t.cc
index be2f5d1f6f0a..3f34b8049fc6 100644
--- a/unittest/gunit/my_decimal-t.cc
+++ b/unittest/gunit/my_decimal-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_error-t.cc b/unittest/gunit/my_error-t.cc
index da754191360d..6c05ab936e10 100644
--- a/unittest/gunit/my_error-t.cc
+++ b/unittest/gunit/my_error-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_fileutils-t.cc b/unittest/gunit/my_fileutils-t.cc
index 682f248371a8..7d61a48ebec4 100644
--- a/unittest/gunit/my_fileutils-t.cc
+++ b/unittest/gunit/my_fileutils-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_murmur3-t.cc b/unittest/gunit/my_murmur3-t.cc
index cb224fff8f40..424b3ebc314b 100644
--- a/unittest/gunit/my_murmur3-t.cc
+++ b/unittest/gunit/my_murmur3-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_qsort_vs_stdsort-t.cc b/unittest/gunit/my_qsort_vs_stdsort-t.cc
index 0dd2dfd2c86a..ba184e641399 100644
--- a/unittest/gunit/my_qsort_vs_stdsort-t.cc
+++ b/unittest/gunit/my_qsort_vs_stdsort-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -30,7 +37,7 @@ static int cmp_double(void *cmp_arg, double *a,double *b)
 
 #if defined(GTEST_HAS_PARAM_TEST)
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // There is no point in benchmarking anything in debug mode.
 const size_t num_iterations= 1ULL;
 #else
diff --git a/unittest/gunit/my_regex-t.cc b/unittest/gunit/my_regex-t.cc
index caae9dff3db2..e902013dea1e 100644
--- a/unittest/gunit/my_regex-t.cc
+++ b/unittest/gunit/my_regex-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_snprintf-t.cc b/unittest/gunit/my_snprintf-t.cc
new file mode 100644
index 000000000000..844d998c9e76
--- /dev/null
+++ b/unittest/gunit/my_snprintf-t.cc
@@ -0,0 +1,120 @@
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates. 
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+#include "my_config.h"
+#include <gtest/gtest.h>
+#include <string>
+
+#include "m_string.h"
+#include "mysql_com.h"
+
+namespace my_snprintf_unittest {
+
+using std::string;
+
+string sss= string(2 * MYSQL_ERRMSG_SIZE, 'a');
+
+class SnPrintfTest : public ::testing::Test
+{
+public:
+  virtual void SetUp()
+  {
+    compile_time_assert(MYSQL_ERRMSG_SIZE == 512);
+    memset(m_errmsg_buf, 'x', sizeof(m_errmsg_buf));
+  }
+
+  char m_errmsg_buf[MYSQL_ERRMSG_SIZE * 2];
+};
+
+TEST_F(SnPrintfTest, FixedPrecisionOne)
+{
+  EXPECT_EQ(1, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                           "%.1s", sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[1]);
+  EXPECT_EQ('x', m_errmsg_buf[2]);
+}
+
+TEST_F(SnPrintfTest, FixedPrecisionTwo)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.511s", sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+TEST_F(SnPrintfTest, FixedPrecisionThree)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.512s", sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+TEST_F(SnPrintfTest, FixedPrecisionFour)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.1000s", sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+TEST_F(SnPrintfTest, DynamicPrecisionOne)
+{
+  EXPECT_EQ(1, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                           "%.*s", 1, sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[1]);
+  EXPECT_EQ('x', m_errmsg_buf[2]);
+}
+
+TEST_F(SnPrintfTest, DynamicPrecisionTwo)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.*s", 511, sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+TEST_F(SnPrintfTest, DynamicPrecisionThree)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.*s", 512, sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+TEST_F(SnPrintfTest, DynamicPrecisionFour)
+{
+  EXPECT_EQ(511, my_snprintf(m_errmsg_buf, MYSQL_ERRMSG_SIZE,
+                             "%.*s", 1000, sss.data()));
+  EXPECT_EQ('a', m_errmsg_buf[0]);
+  EXPECT_EQ('\0', m_errmsg_buf[511]);
+  EXPECT_EQ('x', m_errmsg_buf[512]);
+}
+
+} // namespace
diff --git a/unittest/gunit/my_thread-t.cc b/unittest/gunit/my_thread-t.cc
index eaabd99f1943..090ebfd5a303 100644
--- a/unittest/gunit/my_thread-t.cc
+++ b/unittest/gunit/my_thread-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/my_timer-t.cc b/unittest/gunit/my_timer-t.cc
index 784a0b44b668..b7026cb0debe 100644
--- a/unittest/gunit/my_timer-t.cc
+++ b/unittest/gunit/my_timer-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_base64-t.cc b/unittest/gunit/mysys_base64-t.cc
index cd8dc1f8e32f..fcdaa9892135 100644
--- a/unittest/gunit/mysys_base64-t.cc
+++ b/unittest/gunit/mysys_base64-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_lf-t.cc b/unittest/gunit/mysys_lf-t.cc
index b7b7ac36f3f0..9e9ccafa941f 100644
--- a/unittest/gunit/mysys_lf-t.cc
+++ b/unittest/gunit/mysys_lf-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_atomic-t.cc b/unittest/gunit/mysys_my_atomic-t.cc
index 13d70a1bbde2..214a0d3d9ae3 100644
--- a/unittest/gunit/mysys_my_atomic-t.cc
+++ b/unittest/gunit/mysys_my_atomic-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_b_vprintf-t.cc b/unittest/gunit/mysys_my_b_vprintf-t.cc
index 10a3dc9bc20e..bc11e2b28cac 100644
--- a/unittest/gunit/mysys_my_b_vprintf-t.cc
+++ b/unittest/gunit/mysys_my_b_vprintf-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_freopen-t.cc b/unittest/gunit/mysys_my_freopen-t.cc
index 85342337e835..09468024e408 100644
--- a/unittest/gunit/mysys_my_freopen-t.cc
+++ b/unittest/gunit/mysys_my_freopen-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_loadpath-t.cc b/unittest/gunit/mysys_my_loadpath-t.cc
index ee63adef9ad4..a9369d700d92 100644
--- a/unittest/gunit/mysys_my_loadpath-t.cc
+++ b/unittest/gunit/mysys_my_loadpath-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_malloc-t.cc b/unittest/gunit/mysys_my_malloc-t.cc
index 2f76d3441b0a..42c709842733 100644
--- a/unittest/gunit/mysys_my_malloc-t.cc
+++ b/unittest/gunit/mysys_my_malloc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_pwrite-t.cc b/unittest/gunit/mysys_my_pwrite-t.cc
index 056a306a8c3c..9c8b22b611c2 100644
--- a/unittest/gunit/mysys_my_pwrite-t.cc
+++ b/unittest/gunit/mysys_my_pwrite-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_rdtsc-t.cc b/unittest/gunit/mysys_my_rdtsc-t.cc
index 6d3460eca8fa..cdf63afb1956 100644
--- a/unittest/gunit/mysys_my_rdtsc-t.cc
+++ b/unittest/gunit/mysys_my_rdtsc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_symlink-t.cc b/unittest/gunit/mysys_my_symlink-t.cc
index 541738c91910..40aa5c98d124 100644
--- a/unittest/gunit/mysys_my_symlink-t.cc
+++ b/unittest/gunit/mysys_my_symlink-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_vsnprintf-t.cc b/unittest/gunit/mysys_my_vsnprintf-t.cc
index 09c7a37787e7..ec30d3f250a6 100644
--- a/unittest/gunit/mysys_my_vsnprintf-t.cc
+++ b/unittest/gunit/mysys_my_vsnprintf-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/mysys_my_write-t.cc b/unittest/gunit/mysys_my_write-t.cc
index ff5bcf8b12ef..5082d6354589 100644
--- a/unittest/gunit/mysys_my_write-t.cc
+++ b/unittest/gunit/mysys_my_write-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/nullable-t.cc b/unittest/gunit/nullable-t.cc
index bce3acae6fa9..ad9ed4d8f2ca 100644
--- a/unittest/gunit/nullable-t.cc
+++ b/unittest/gunit/nullable-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/opt_costconstants-t.cc b/unittest/gunit/opt_costconstants-t.cc
index 03a8c09b373c..e8d4a8d81c29 100644
--- a/unittest/gunit/opt_costconstants-t.cc
+++ b/unittest/gunit/opt_costconstants-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/opt_costmodel-t.cc b/unittest/gunit/opt_costmodel-t.cc
index c956005903d7..4fcaf58649aa 100644
--- a/unittest/gunit/opt_costmodel-t.cc
+++ b/unittest/gunit/opt_costmodel-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/opt_guessrecperkey-t.cc b/unittest/gunit/opt_guessrecperkey-t.cc
index 596bd6714982..ba12ba6d024b 100644
--- a/unittest/gunit/opt_guessrecperkey-t.cc
+++ b/unittest/gunit/opt_guessrecperkey-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/opt_range-t.cc b/unittest/gunit/opt_range-t.cc
index 390e3776305e..20d5af61c36e 100644
--- a/unittest/gunit/opt_range-t.cc
+++ b/unittest/gunit/opt_range-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -328,7 +335,7 @@ Item_func* OptRangeTest::create_item(Item_func::Functype type,
     break;
   default:
     result= NULL;
-    DBUG_ASSERT(false);
+    assert(false);
     return result;
   }
   Item *itm= static_cast<Item*>(result);
@@ -1942,7 +1949,7 @@ TEST_F(OptRangeTest, IncrementUseCount2)
 TEST_F(OptRangeTest, CombineAlways)
 {
   // Gets decremented in key_or() before being compared > 0, triggering
-  // a DBUG_ASSERT in SEL_ARG::SEL_ARG(Type) unless the ALWAYS type is
+  // a assert in SEL_ARG::SEL_ARG(Type) unless the ALWAYS type is
   // handled.
   static const int INITIAL_USE_COUNT= 3;
 
@@ -1990,7 +1997,7 @@ TEST_F(OptRangeTest, CombineAlways2)
       next_key_part= NULL;
       make_root();
       // Gets decremented in key_or() before being compared > 0, triggering
-      // a DBUG_ASSERT in SEL_ARG::SEL_ARG(Type) unless the ALWAYS type is
+      // a assert in SEL_ARG::SEL_ARG(Type) unless the ALWAYS type is
       // handled.
       use_count= 3;
     }
@@ -2059,6 +2066,25 @@ TEST_F(OptRangeTest, AppendRange)
   EXPECT_STREQ("42 < my_field < 42", out.c_ptr());
 }
 
+TEST_F(OptRangeTest, CloneSpatialKey) {
+  Fake_RANGE_OPT_PARAM param(thd(), &m_alloc, 2, false);
+  Mock_SEL_ARG key1(SEL_ARG::KEY_RANGE, 2, 0);
+  Mock_SEL_ARG key2(SEL_ARG::MAYBE_KEY, 1, 0);
+  // dummy field
+  Mock_field_long field1("geom1");
+  key1.field = &field1;
+  key1.left = &null_element;
+  key1.next_key_part = NULL;
+  key1.min_flag |= GEOM_FLAG;
+  key1.rkey_func_flag = HA_READ_MBR_CONTAIN;
+  // check if tree is cloned along with gis flag.
+  SEL_ARG *cloned_key1 = key_and(&param, &key1, &key2, CLONE_KEY2_MAYBE);
+  EXPECT_NE(cloned_key1, &key1);
+  EXPECT_EQ(cloned_key1->rkey_func_flag, key1.rkey_func_flag);
+  key1.use_count = 0;
+  key2.use_count = 0;
+}
+
 }
 
 #undef create_tree
diff --git a/unittest/gunit/opt_recperkey-t.cc b/unittest/gunit/opt_recperkey-t.cc
index 08b8ea119e28..050a8b6907d5 100644
--- a/unittest/gunit/opt_recperkey-t.cc
+++ b/unittest/gunit/opt_recperkey-t.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/opt_ref-t.cc b/unittest/gunit/opt_ref-t.cc
index 1223d77fca4e..f2822994410d 100644
--- a/unittest/gunit/opt_ref-t.cc
+++ b/unittest/gunit/opt_ref-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/opt_trace-t.cc b/unittest/gunit/opt_trace-t.cc
index 5598aa7adb38..e00d87c36f28 100644
--- a/unittest/gunit/opt_trace-t.cc
+++ b/unittest/gunit/opt_trace-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -701,7 +708,7 @@ void open_object(uint count, Opt_trace_context *trace, bool simulate_oom)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 /// Test reaction to out-of-memory condition in trace buffer
 TEST_F(TraceContentTest, OOMinBuffer)
@@ -792,7 +799,7 @@ TEST_F(TraceContentTest, OOMinPurge)
   EXPECT_FALSE(oom);
 }
 
-#endif // !DBUG_OFF
+#endif // !NDEBUG
 
 
 /** Test filtering by feature */
diff --git a/unittest/gunit/parsertest.h b/unittest/gunit/parsertest.h
index 6fecfe6ed5b6..de7943617059 100644
--- a/unittest/gunit/parsertest.h
+++ b/unittest/gunit/parsertest.h
@@ -1,15 +1,22 @@
 #ifndef PARSERTEST_INCLUDED
 #define PARSERTEST_INCLUDED
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
diff --git a/unittest/gunit/partitioned_rwlock-t.cc b/unittest/gunit/partitioned_rwlock-t.cc
index 772f8a75e26a..dcd4222d41a7 100644
--- a/unittest/gunit/partitioned_rwlock-t.cc
+++ b/unittest/gunit/partitioned_rwlock-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/path-t.cc b/unittest/gunit/path-t.cc
index 153f72b04140..5391515b9665 100644
--- a/unittest/gunit/path-t.cc
+++ b/unittest/gunit/path-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/prealloced_array-t.cc b/unittest/gunit/prealloced_array-t.cc
index 5ff8217308a6..559d0c8c03ce 100644
--- a/unittest/gunit/prealloced_array-t.cc
+++ b/unittest/gunit/prealloced_array-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -44,7 +51,7 @@ TEST_F(PreallocedArrayTest, Empty)
   EXPECT_EQ(0U, int_10.size());
 }
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // Google Test recommends DeathTest suffix for classes used in death tests.
 typedef PreallocedArrayTest PreallocedArrayDeathTest;
 
@@ -84,7 +91,7 @@ TEST_F(PreallocedArrayDeathTest, EmptyErase)
                             ".*Assertion .*ix < size.*");
 }
 
-#endif // DBUG_OFF
+#endif // NDEBUG
 
 TEST_F(PreallocedArrayTest, Insert5)
 {
diff --git a/unittest/gunit/priority_queue-t.cc b/unittest/gunit/priority_queue-t.cc
index 76494cb5003a..78e7ea9ea1e7 100644
--- a/unittest/gunit/priority_queue-t.cc
+++ b/unittest/gunit/priority_queue-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -1033,5 +1040,25 @@ TEST_F(PriorityQueueTest, RandomIntegerGenerator)
   test_min_k_elements(many_keys.begin(), many_keys.end(), 20);
 }
 
+/**
+  Bug#30301356 - SOME EVENTS ARE DELAYED AFTER DROPPING EVENT
+
+  Test that ensures heap property is not violated if we remove an
+  element from an interior node. In the below test, we remove the
+  element 90 at index 6 in the array. After 90 is removed, the
+  parent node's of the deleted node violates the heap property.
+  In order to restore the heap property, we need to move up the
+  heap until we reach a node which satisfies the heap property or
+  the root. Without the fix, we adjust the heap downwards.
+*/
+
+TEST_F(PriorityQueueTest, TestElementRemove) {
+  Priority_queue<int, std::vector<int>, My_greater> pq;
+
+  int keys[11] = {60, 65, 84, 75, 80, 85, 90, 95, 100, 105, 82};
+  pq = Priority_queue<int, std::vector<int>, My_greater>(keys, keys + 11);
+  pq.remove(6);
+  EXPECT_TRUE(pq.is_valid());
+}
 
 }
diff --git a/unittest/gunit/pump_object_filter-t.cc b/unittest/gunit/pump_object_filter-t.cc
index 9567a7ddfc25..cfb2f052426c 100644
--- a/unittest/gunit/pump_object_filter-t.cc
+++ b/unittest/gunit/pump_object_filter-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/rpl_group_set-t.cc b/unittest/gunit/rpl_group_set-t.cc
index 912c4c958f99..ba72ad1462ea 100644
--- a/unittest/gunit/rpl_group_set-t.cc
+++ b/unittest/gunit/rpl_group_set-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -661,14 +668,14 @@ TEST_F(GroupTest, Group_containers)
       {
         printf("======== stage=%d combination=%d ========\n",
                stage_i, combination_i);
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         printf("group log state:\n");
         group_log_state.print();
         printf("trx cache:\n");
         trx_cache.print(sid_maps[0]);
         printf("stmt cache:\n");
         stmt_cache.print(sid_maps[0]);
-#endif // ifdef DBUG_OFF
+#endif // ifdef NDEBUG
       }
       
       Gtid_set ended_groups(sid_maps[0]);
@@ -804,13 +811,13 @@ TEST_F(GroupTest, Group_containers)
           }
         }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
         if (verbose)
         {
           printf("stmt_cache:\n");
           stmt_cache.print(sid_maps[0]);
         }
-#endif // ifndef DBUG_OFF
+#endif // ifndef NDEBUG
         if (!stmt_cache.is_empty())
           gtid_flush_group_cache(thd, &lock,
                                  &group_log_state, NULL/*group log*/,
@@ -827,7 +834,7 @@ TEST_F(GroupTest, Group_containers)
           // execute a COMMIT statement
           thd->variables.gtid_has_ongoing_super_group= 0;
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
           if (verbose)
           {
             printf("trx_cache:\n");
@@ -836,7 +843,7 @@ TEST_F(GroupTest, Group_containers)
                    trx_cache.is_empty(), trx_cache.get_n_subgroups(),
                    trx_contains_logged_subgroup);
           }
-#endif // ifndef DBUG_OFF
+#endif // ifndef NDEBUG
 
           if (!trx_cache.is_empty())
             gtid_flush_group_cache(thd, &lock, 
diff --git a/unittest/gunit/security_context-t.cc b/unittest/gunit/security_context-t.cc
index 2ea27cdb3dfd..2c3b3b4468d2 100644
--- a/unittest/gunit/security_context-t.cc
+++ b/unittest/gunit/security_context-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/segfault-t.cc b/unittest/gunit/segfault-t.cc
index 9b1cbedd6ee9..219907c4976f 100644
--- a/unittest/gunit/segfault-t.cc
+++ b/unittest/gunit/segfault-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -61,10 +68,16 @@ TEST_F(FatalSignalDeathTest, Segfault)
    gtest library instead.
   */
   EXPECT_DEATH_IF_SUPPORTED(*pint= 42, "");
-#elif defined(__SANITIZE_ADDRESS__)
+#elif defined(HAVE_ASAN)
   /* gcc 4.8.1 with '-fsanitize=address -O1' */
   /* Newer versions of ASAN give other error message, disable it */
   // EXPECT_DEATH_IF_SUPPORTED(*pint= 42, ".*ASAN:SIGSEGV.*");
+#elif defined(__APPLE__) && defined(__aarch64__) && defined(NDEBUG)
+  // Disable also in non-debug mode on MacOS 11 arm, with -O1 or above, we get
+  // Result: died but not with expected error.
+  // Expected: contains regular expression ".* UTC - mysqld got signal .*"
+  // Actual msg:
+  // We do get: "Trace/BPT trap: 5" but not as part of the matcher input in
 #else
   int *pint= NULL;
   /*
diff --git a/unittest/gunit/select_lex_visitor-t.cc b/unittest/gunit/select_lex_visitor-t.cc
index 11853a07f181..7ec6143777a6 100644
--- a/unittest/gunit/select_lex_visitor-t.cc
+++ b/unittest/gunit/select_lex_visitor-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/skip_trailing.cc b/unittest/gunit/skip_trailing.cc
index 4751a0deb1b1..277f37c38c34 100644
--- a/unittest/gunit/skip_trailing.cc
+++ b/unittest/gunit/skip_trailing.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -38,7 +45,7 @@ const uchar *skip_trailing_orig(const uchar *ptr,size_t len)
     const uchar *start_words= (const uchar *)(intptr)
        ((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
-    DBUG_ASSERT(((ulonglong)(intptr)ptr) >= SIZEOF_INT);
+    assert(((ulonglong)(intptr)ptr) >= SIZEOF_INT);
     if (end_words > ptr)
     {
       while (end > end_words && end[-1] == 0x20)
@@ -83,7 +90,7 @@ const uchar *skip_trailing_4byte(const uchar *ptr, size_t len)
     const uchar *start_words= (const uchar *)(intptr)
       ((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
 
-    DBUG_ASSERT(end_words > ptr);
+    assert(end_words > ptr);
     {
       while (end > end_words && end[-1] == 0x20)
         end--;
@@ -110,7 +117,7 @@ const uchar *skip_trailing_8byte(const uchar *ptr, size_t len)
     const uchar *start_words= (const uchar *)(longlong)
        ((((ulonglong)(longlong)ptr) + 8 - 1) / 8 * 8);
 
-    DBUG_ASSERT(end_words > ptr);
+    assert(end_words > ptr);
     {
       while (end > end_words && end[-1] == 0x20)
         end--;
diff --git a/unittest/gunit/skip_trailing.h b/unittest/gunit/skip_trailing.h
index 74826d95f61b..83083bdbb9ab 100644
--- a/unittest/gunit/skip_trailing.h
+++ b/unittest/gunit/skip_trailing.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/sql_list-t.cc b/unittest/gunit/sql_list-t.cc
index 1bf21b0ecf6a..fbaf1c942637 100644
--- a/unittest/gunit/sql_list-t.cc
+++ b/unittest/gunit/sql_list-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/sql_plist-t.cc b/unittest/gunit/sql_plist-t.cc
index 8c38a800924d..7db345475ec3 100644
--- a/unittest/gunit/sql_plist-t.cc
+++ b/unittest/gunit/sql_plist-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/sql_string-t.cc b/unittest/gunit/sql_string-t.cc
index 9cb5a240467f..d8577045843c 100644
--- a/unittest/gunit/sql_string-t.cc
+++ b/unittest/gunit/sql_string-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/sql_table-t.cc b/unittest/gunit/sql_table-t.cc
index 84e28fcac0ef..3b8666a2b834 100644
--- a/unittest/gunit/sql_table-t.cc
+++ b/unittest/gunit/sql_table-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -137,7 +144,7 @@ TEST_F(SqlTableTest, FileNameToTableName)
   name_length= filename_to_tablename(test_filename,
                                      test_tablename,
                                      sizeof(test_tablename)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                                      , true
 #endif
                                      );
@@ -147,7 +154,7 @@ TEST_F(SqlTableTest, FileNameToTableName)
   name_length= filename_to_tablename(foo.str,
                                      test_tablename,
                                      sizeof(test_tablename)
-#ifndef DBUG_OFF
+#ifndef NDEBUG
                                      , true
 #endif
                                      );
diff --git a/unittest/gunit/stl_alloc-t.cc b/unittest/gunit/stl_alloc-t.cc
index 93eed38da59c..0aa906303c43 100644
--- a/unittest/gunit/stl_alloc-t.cc
+++ b/unittest/gunit/stl_alloc-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -147,7 +154,7 @@ TYPED_TEST(STLAllocTestInt, SimpleList)
 }
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 TYPED_TEST(STLAllocTestInt, OutOfMemory)
 {
   vector<int, TypeParam> v1(this->allocator);
diff --git a/unittest/gunit/string-tests.cc b/unittest/gunit/string-tests.cc
index a6dbedbdb1c5..686ea9a93322 100644
--- a/unittest/gunit/string-tests.cc
+++ b/unittest/gunit/string-tests.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -51,7 +58,7 @@ TEST(StringDeathTest, AppendEmptyString)
   tbl_name.append('.');
   tbl_name.append(String(table_name, system_charset_info));
   // We now have eight characters, c_ptr() is not safe.
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   EXPECT_DEATH_IF_SUPPORTED(tbl_name.c_ptr(), ".*m_alloced_length >= .*");
 #endif
   EXPECT_STREQ("aaaaaaa.", tbl_name.c_ptr_safe());
diff --git a/unittest/gunit/strings_skip_trailing-t.cc b/unittest/gunit/strings_skip_trailing-t.cc
index b94b20317302..dd4ea130137f 100644
--- a/unittest/gunit/strings_skip_trailing-t.cc
+++ b/unittest/gunit/strings_skip_trailing-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -39,7 +46,7 @@ namespace skip_trailing_space_unittest {
 
 #if defined(GTEST_HAS_PARAM_TEST)
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // There is no point in benchmarking anything in debug mode.
 const size_t num_iterations= 1ULL;
 #else
diff --git a/unittest/gunit/strings_strnxfrm-t.cc b/unittest/gunit/strings_strnxfrm-t.cc
index b60af503cbd7..b0a0daabc9c3 100644
--- a/unittest/gunit/strings_strnxfrm-t.cc
+++ b/unittest/gunit/strings_strnxfrm-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -49,7 +56,7 @@ namespace strnxfrm_unittest {
 
 #if defined(GTEST_HAS_PARAM_TEST)
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 // There is no point in benchmarking anything in debug mode.
 const size_t num_iterations= 1ULL;
 #else
diff --git a/unittest/gunit/strings_utf8-t.cc b/unittest/gunit/strings_utf8-t.cc
index 3d9bca1d6a26..2848ed8a33d6 100644
--- a/unittest/gunit/strings_utf8-t.cc
+++ b/unittest/gunit/strings_utf8-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -178,7 +185,7 @@ TEST_F(StringsUTF8Test, MyWellFormedLenUtf8)
 
 TEST_F(StringsUTF8Test, MyIsmbcharUtf8)
 {
-  char utf8_src[8];
+  char utf8_src[8] = { 0 };
 
   /* valid utf8 charaters, testing for boundry values */
   utf8_src[0]= '\x00';
@@ -355,7 +362,7 @@ TEST_F(StringsUTF8mb4Test, MyWellFormedLenUtf8mb4)
 
 TEST_F(StringsUTF8mb4Test, MyIsmbcharUtf8mb4)
 {
-  char utf8_src[8];
+  char utf8_src[8] = { 0 };
 
   /* valid utf8mb4 charaters, testing for boundry values */
   utf8_src[0]= '\x00';
diff --git a/unittest/gunit/strnxfrm.cc b/unittest/gunit/strnxfrm.cc
index 28b324c21e0a..b23b566330dc 100644
--- a/unittest/gunit/strnxfrm.cc
+++ b/unittest/gunit/strnxfrm.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/strnxfrm.h b/unittest/gunit/strnxfrm.h
index 6fc74f689e33..ae1230ec1b5b 100644
--- a/unittest/gunit/strnxfrm.h
+++ b/unittest/gunit/strnxfrm.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/strtoll-t.cc b/unittest/gunit/strtoll-t.cc
index df5b70ed3b0e..717d3910eae5 100644
--- a/unittest/gunit/strtoll-t.cc
+++ b/unittest/gunit/strtoll-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/table_cache-t.cc b/unittest/gunit/table_cache-t.cc
index 72f2f1936438..aa1139b1624f 100644
--- a/unittest/gunit/table_cache-t.cc
+++ b/unittest/gunit/table_cache-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
@@ -133,7 +140,6 @@ class Mock_share : public TABLE_SHARE
 public:
   Mock_share(const char *key)
   {
-    memset((TABLE_SHARE *)this, 0, sizeof(TABLE_SHARE));
     /*
       Both table_cache_key and cache_element array are used by
       Table_cache code.
@@ -162,7 +168,7 @@ class Mock_share : public TABLE_SHARE
   {
     TABLE *result= (TABLE *)my_malloc(PSI_NOT_INSTRUMENTED, sizeof(TABLE), MYF(0));
 
-    memset(result, 0, sizeof(TABLE));
+    ::new(result) TABLE;
     result->s= this;
     // We create TABLE which is already marked as used
     result->in_use= thd;
@@ -813,7 +819,7 @@ TEST_F(TableCacheDoubleCacheDeathTest, ManagerFreeTable)
   // There should be assert failure since we are trying
   // to free all tables for share_1, while some tables
   // are in use.
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   EXPECT_DEATH_IF_SUPPORTED(table_cache_manager.free_table(thd_1,
                                                            TDC_RT_REMOVE_ALL,
                                                            &share_1),
@@ -847,7 +853,7 @@ TEST_F(TableCacheDoubleCacheDeathTest, ManagerFreeTable)
   // There should be assert failure since we are trying
   // to free all not own TABLEs for share_1, while thd_2
   // has a TABLE object for it in used
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   EXPECT_DEATH_IF_SUPPORTED(table_cache_manager.free_table(thd_1,
                                                            TDC_RT_REMOVE_NOT_OWN,
                                                            &share_1),
diff --git a/unittest/gunit/tap_event_listener.cc b/unittest/gunit/tap_event_listener.cc
index b3faf081313c..333c1744759a 100644
--- a/unittest/gunit/tap_event_listener.cc
+++ b/unittest/gunit/tap_event_listener.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/tc_log_mmap-t.cc b/unittest/gunit/tc_log_mmap-t.cc
index c97ee7cb0f7b..415b22c9e29f 100644
--- a/unittest/gunit/tc_log_mmap-t.cc
+++ b/unittest/gunit/tc_log_mmap-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/test_mdl_context_owner.h b/unittest/gunit/test_mdl_context_owner.h
index 6e43c36cc292..d50c3f4142d1 100644
--- a/unittest/gunit/test_mdl_context_owner.h
+++ b/unittest/gunit/test_mdl_context_owner.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/test_utils.cc b/unittest/gunit/test_utils.cc
index d83dcf50efa2..4526f95d3394 100644
--- a/unittest/gunit/test_utils.cc
+++ b/unittest/gunit/test_utils.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -18,10 +25,28 @@
 #include <gtest/gtest.h>
 
 #include "test_utils.h"
-#include "rpl_handler.h"                        // delegates_init()
+
+#include "binlog.h"
+#include "conn_handler/connection_handler_manager.h"
+#include "debug_sync.h"
+#include "derror.h"
+#include "item_create.h"
+#include "item_func.h"
+#include "keycache.h"
+#include "keycaches.h"
+#include "log.h"                                // query_logger
+#include "my_sys.h"
+#include "mysqld.h"
 #include "mysqld_thd_manager.h"                 // Global_THD_manager
 #include "opt_costconstantcache.h"              // optimizer cost constant cache
-#include "log.h"                                // query_logger
+#include "my_regex.h"
+#include "rpl_handler.h"                        // delegates_init()
+#include "rpl_filter.h"
+#include "sql_db.h"
+#include "sql_common.h"
+#include "sql_locale.h"
+#include "sql_plugin.h"
+#include "sql_show.h"
 
 namespace my_testing {
 
@@ -43,8 +68,8 @@ extern "C" void test_error_handler_hook(uint err, const char *str, myf MyFlags)
 
 void setup_server_for_unit_tests()
 {
-  static char *my_name= strdup(my_progname);
-  char *argv[] = { my_name,
+  std::string my_name(my_progname);
+  char *argv[] = { const_cast<char*>(my_name.c_str()),
                    const_cast<char*>("--secure-file-priv=NULL"),
                    const_cast<char*>("--early_plugin_load=\"\""),
                    const_cast<char*>("--log_syslog=0"),
@@ -68,12 +93,37 @@ void setup_server_for_unit_tests()
 
 void teardown_server_for_unit_tests()
 {
+  flush_error_log_messages();
+  mysql_bin_log.cleanup();
+  my_dboptions_cache_free();
+  ignore_db_dirs_free();
   sys_var_end();
   delegates_destroy();
   transaction_cache_free();
   gtid_server_cleanup();
   query_logger.cleanup();
+  item_func_sleep_free();
+  item_create_cleanup();
   delete_optimizer_cost_module();
+  key_caches.delete_elements((void (*)(const char*, uchar*)) free_key_cache);
+  multi_keycache_free();
+  free_tmpdir(&mysql_tmpdir_list);
+  bitmap_free(&temp_pool);
+  delete binlog_filter;
+  delete rpl_filter;
+  my_regex_end();
+#if defined(ENABLED_DEBUG_SYNC)
+  /* End the debug sync facility. See debug_sync.cc. */
+  debug_sync_end();
+#endif /* defined(ENABLED_DEBUG_SYNC) */
+  cleanup_errmsgs();
+  Connection_handler_manager::destroy_instance();
+  mysql_client_plugin_deinit();
+  free_list(opt_early_plugin_load_list_ptr);
+  free_list(opt_plugin_load_list_ptr);
+  deinit_errmessage(); // finish server errs
+  Global_THD_manager::destroy_instance();
+  my_end(0);
 }
 
 void Server_initializer::set_expected_error(uint val)
diff --git a/unittest/gunit/test_utils.h b/unittest/gunit/test_utils.h
index 1c07b026a6d7..e7fb6e3e1b11 100644
--- a/unittest/gunit/test_utils.h
+++ b/unittest/gunit/test_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/thd_manager-t.cc b/unittest/gunit/thd_manager-t.cc
index f16e5a596f11..0448fac85c77 100644
--- a/unittest/gunit/thd_manager-t.cc
+++ b/unittest/gunit/thd_manager-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -285,7 +292,7 @@ TEST_F(ThreadManagerTest, ThreadID)
 }
 
 
-#if !defined(DBUG_OFF)
+#if !defined(NDEBUG)
 TEST_F(ThreadManagerTest, ThreadIDDeathTest)
 {
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
diff --git a/unittest/gunit/thr_template.cc b/unittest/gunit/thr_template.cc
index 4b53f46f0236..e1d6ba033b73 100644
--- a/unittest/gunit/thr_template.cc
+++ b/unittest/gunit/thr_template.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/thread_utils-t.cc b/unittest/gunit/thread_utils-t.cc
index 166f0d4deb12..0235897936d9 100644
--- a/unittest/gunit/thread_utils-t.cc
+++ b/unittest/gunit/thread_utils-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/thread_utils.cc b/unittest/gunit/thread_utils.cc
index 676ab687828a..0ba42ff14988 100644
--- a/unittest/gunit/thread_utils.cc
+++ b/unittest/gunit/thread_utils.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/thread_utils.h b/unittest/gunit/thread_utils.h
index 157c3b956473..4aa3d5e92133 100644
--- a/unittest/gunit/thread_utils.h
+++ b/unittest/gunit/thread_utils.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/timespec-t.cc b/unittest/gunit/timespec-t.cc
index 883ba41df3d5..79d90a1b64cd 100644
--- a/unittest/gunit/timespec-t.cc
+++ b/unittest/gunit/timespec-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/unique-t.cc b/unittest/gunit/unique-t.cc
index 65cc62874ccf..f1adab2f063f 100644
--- a/unittest/gunit/unique-t.cc
+++ b/unittest/gunit/unique-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/gunit/win_tests-t.cc b/unittest/gunit/win_tests-t.cc
index 799ef15ac58a..e8d7c66d41a8 100644
--- a/unittest/gunit/win_tests-t.cc
+++ b/unittest/gunit/win_tests-t.cc
@@ -1,13 +1,20 @@
-/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -16,26 +23,38 @@
 // First include (the generated) my_config.h, to get correct platform defines.
 #include "my_config.h"
 #include <gtest/gtest.h>
+#include "test_utils.h"
 
 #include "my_global.h"
 #include "named_pipe.h"
 #include "log.h"
 #include "my_thread.h"
-
-
-// Mock logger function sql_print_error(), to avoid log.cc linkage
-void sql_print_error(const char *format, ...) 
-{
-}
+#include <sddl.h>
 
 namespace win_unittest {
+using my_testing::Server_initializer;
+using my_testing::Mock_error_handler;
 
 class NamedPipeTest : public ::testing::Test
 {
 protected:
+  static void SetUpTestCase()
+  {
+    m_old_error_handler_hook = error_handler_hook;
+    // Make sure my_error() ends up calling my_message_sql so that
+    // Mock_error_handler is actually triggered.
+    error_handler_hook = my_message_sql;
+  }
+
+  static void TearDownTestCase()
+  {
+    error_handler_hook = m_old_error_handler_hook;
+  }
 
   virtual void SetUp()
   {
+    m_initializer.SetUp();
+
     char pipe_rand_name[256];
 
     m_pipe_handle= INVALID_HANDLE_VALUE;
@@ -60,14 +79,18 @@ class NamedPipeTest : public ::testing::Test
     {
       EXPECT_TRUE(CloseHandle(m_pipe_handle));
     }
+    m_initializer.TearDown();
   }
 
-  SECURITY_ATTRIBUTES m_sec_attr;
-  SECURITY_DESCRIPTOR m_sec_descr;
+  SECURITY_ATTRIBUTES *mp_sec_attr;
   char                m_pipe_name[256];
   HANDLE              m_pipe_handle;
   std::string         m_name;
+  Server_initializer  m_initializer;
+
+  static void(*m_old_error_handler_hook)(uint, const char *, myf);
 };
+void(*NamedPipeTest::m_old_error_handler_hook)(uint, const char *, myf);
 
 
 // Basic test: create a named pipe.
@@ -75,8 +98,7 @@ TEST_F(NamedPipeTest, CreatePipe)
 {
   char exp_pipe_name[256];
 
-  m_pipe_handle= create_server_named_pipe(&m_sec_attr,
-                                          &m_sec_descr,
+  m_pipe_handle= create_server_named_pipe(&mp_sec_attr,
                                           1024,
                                           m_name.c_str(),
                                           m_pipe_name,
@@ -93,16 +115,16 @@ TEST_F(NamedPipeTest, CreatePipe)
 // Verify that we fail if we try to create the same named pipe twice.
 TEST_F(NamedPipeTest, CreatePipeTwice)
 {
-  m_pipe_handle= create_server_named_pipe(&m_sec_attr,
-                                          &m_sec_descr,
+  m_pipe_handle= create_server_named_pipe(&mp_sec_attr,
                                           1024,
                                           m_name.c_str(),
                                           m_pipe_name,
                                           sizeof(m_pipe_name));
   EXPECT_NE(INVALID_HANDLE_VALUE, m_pipe_handle);
 
-  HANDLE handle= create_server_named_pipe(&m_sec_attr,
-                                          &m_sec_descr,
+  Mock_error_handler error_handler(m_initializer.thd(),
+                                   ER_CANT_START_SERVER_NAMED_PIPE);
+  HANDLE handle= create_server_named_pipe(&mp_sec_attr,
                                           1024,
                                           m_name.c_str(),
                                           m_pipe_name,
@@ -110,4 +132,51 @@ TEST_F(NamedPipeTest, CreatePipeTwice)
   EXPECT_EQ(INVALID_HANDLE_VALUE, handle);
 }
 
+// Verify that a warning is written to the error log when using
+// "*everyone* as the full access group name.
+TEST_F(NamedPipeTest, CreatePipeForEveryone)
+{
+  Mock_error_handler error_handler(m_initializer.thd(),
+                                   WARN_NAMED_PIPE_ACCESS_EVERYONE);
+  m_pipe_handle = create_server_named_pipe(&mp_sec_attr,
+                                           1024,
+                                           m_name.c_str(),
+                                           m_pipe_name,
+                                           sizeof(m_pipe_name),
+                                           "*everyone*");
+  EXPECT_NE(INVALID_HANDLE_VALUE, m_pipe_handle);
+}
+
+// Verify that a warning is written to the error log when using
+// the group name corresponding to the built in Windows group
+// with SID S-1-1-0  (i.e. "everyone" on English systems)
+TEST_F(NamedPipeTest, CreatePipeForEveryoneSid)
+{
+  PSID everyone_SID;
+  EXPECT_TRUE(ConvertStringSidToSid("S-1-1-0", &everyone_SID));
+  const DWORD max_name_len = 256;
+  char everyone_name[max_name_len];
+  DWORD everyone_name_size = max_name_len;
+  char domain_name[max_name_len];
+  DWORD domain_name_size = max_name_len;
+  SID_NAME_USE name_use;
+
+  EXPECT_TRUE(LookupAccountSid(NULL, everyone_SID, everyone_name, &everyone_name_size,
+                               domain_name, &domain_name_size, &name_use));
+  // The "S-1-1-0" SID is well known, so we expect the domain_name to empty and
+  // the name_use to be SidTypeWellKnownGroup
+  EXPECT_EQ(domain_name_size, 0);
+  EXPECT_EQ(name_use, SidTypeWellKnownGroup);
+
+  Mock_error_handler error_handler(m_initializer.thd(),
+                                   WARN_NAMED_PIPE_ACCESS_EVERYONE);
+  m_pipe_handle = create_server_named_pipe(&mp_sec_attr,
+                                           1024,
+                                           m_name.c_str(),
+                                           m_pipe_name,
+                                           sizeof(m_pipe_name),
+                                           everyone_name);
+  EXPECT_NE(INVALID_HANDLE_VALUE, m_pipe_handle);
+}
+
 }
diff --git a/unittest/gunit/yassl/CMakeLists.txt b/unittest/gunit/yassl/CMakeLists.txt
deleted file mode 100644
index 97bca690cb76..000000000000
--- a/unittest/gunit/yassl/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-INCLUDE_DIRECTORIES(
-  ${GTEST_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/include
-  ${CMAKE_SOURCE_DIR}/unittest/gunit
-  ${CMAKE_SOURCE_DIR}/extra/yassl/include
-  ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
-  ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL
-)
-
-ADD_DEFINITIONS(${SSL_DEFINES})
-
-## Do not treat warnings as error for yassl code
-STRING(REGEX REPLACE "-Werror( |$)" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-ADD_EXECUTABLE(yassl-t yassl-t.cc)
-TARGET_LINK_LIBRARIES(yassl-t gunit_small sqlgunitlib strings dbug regex)
-IF(WITH_PERFSCHEMA_STORAGE_ENGINE)
-  TARGET_LINK_LIBRARIES(yassl-t perfschema pfs_server_stubs)
-ENDIF()
-TARGET_LINK_LIBRARIES(yassl-t ${LIBSOCKET})
-ADD_TEST(yassl yassl-t)
diff --git a/unittest/gunit/yassl/yassl-t.cc b/unittest/gunit/yassl/yassl-t.cc
deleted file mode 100644
index 767c6e271ed0..000000000000
--- a/unittest/gunit/yassl/yassl-t.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-// First include (the generated) my_config.h, to get correct platform defines.
-#include "my_config.h"
-#include <gtest/gtest.h>
-
-#ifdef _WIN32
-#include<Windows.h>
-#else
-#include <pthread.h>
-#endif
-
-#include "runtime.hpp"
-#include "yassl_int.hpp"
-
-#include "thread_utils.h"
-
-namespace {
-
-using thread::Notification;
-using thread::Thread;
-
-class Yassl_thread : public Thread
-{
-public:
-  Yassl_thread(Notification *go, Notification *done)
-    : m_sessions_instance(NULL), m_go(go), m_done(done)
-  {}
-  virtual void run()
-  {
-    // Wait until my creator tells me to go.
-    m_go->wait_for_notification();
-    yaSSL::Sessions &sessions= yaSSL::GetSessions();
-    m_sessions_instance= &sessions;
-    // Tell my creator I'm done.
-    m_done->notify();
-  }
-  yaSSL::Sessions *m_sessions_instance;
-private:
-  Notification *m_go;
-  Notification *m_done;
-};
-
-
-/**
-  Verify that yaSSL::sessionsInstance is indeed a singleton.
-  If any of the EXPECT_EQ below reports an error, it is not.
-  We can also run 'valgrind ./yassl-t'. If there are errors,
-  valgrind will report a multiple of
-     sizeof(yaSSL::Sessions) == 80
-  bytes lost.
- */
-TEST(YasslTest, ManySessions)
-{
-  Notification go[5];
-  Notification done[5];
-  Yassl_thread t0(&go[0], &done[0]);
-  Yassl_thread t1(&go[1], &done[1]);
-  Yassl_thread t2(&go[2], &done[2]);
-  Yassl_thread t3(&go[3], &done[3]);
-  Yassl_thread t4(&go[4], &done[4]);
-
-  t0.start();
-  t1.start();
-  t2.start();
-  t3.start();
-  t4.start();
-
-  for (int ix= 0; ix < 5; ++ix)
-    go[ix].notify();
-
-  for (int ix= 0; ix < 5; ++ix)
-    done[ix].wait_for_notification();
-
-  // These are most likely to fail unless we use pthread_once.
-  EXPECT_EQ(t0.m_sessions_instance, t1.m_sessions_instance);
-  EXPECT_EQ(t0.m_sessions_instance, t2.m_sessions_instance);
-  EXPECT_EQ(t0.m_sessions_instance, t3.m_sessions_instance);
-  EXPECT_EQ(t0.m_sessions_instance, t4.m_sessions_instance);
-
-  // These rarely fail. If they do, we have more than two instances.
-  EXPECT_EQ(t1.m_sessions_instance, t2.m_sessions_instance);
-  EXPECT_EQ(t1.m_sessions_instance, t3.m_sessions_instance);
-  EXPECT_EQ(t1.m_sessions_instance, t4.m_sessions_instance);
-
-  EXPECT_EQ(t2.m_sessions_instance, t3.m_sessions_instance);
-  EXPECT_EQ(t2.m_sessions_instance, t4.m_sessions_instance);
-
-  EXPECT_EQ(t3.m_sessions_instance, t4.m_sessions_instance);
-
-  t0.join();
-  t1.join();
-  t2.join();
-  t3.join();
-  t4.join();
-  yaSSL_CleanUp();
-}
-
-}
diff --git a/unittest/mytap/CMakeLists.txt b/unittest/mytap/CMakeLists.txt
index 146e08fb8b66..f021c70b9e9d 100644
--- a/unittest/mytap/CMakeLists.txt
+++ b/unittest/mytap/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/unittest/mytap/t/CMakeLists.txt b/unittest/mytap/t/CMakeLists.txt
index f414bd9e0c99..98acf38f805b 100644
--- a/unittest/mytap/t/CMakeLists.txt
+++ b/unittest/mytap/t/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. 
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates. 
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/unittest/mytap/t/basic-t.c b/unittest/mytap/t/basic-t.c
index dcb13b20f111..e67d6199ce5c 100644
--- a/unittest/mytap/t/basic-t.c
+++ b/unittest/mytap/t/basic-t.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c
index 6313293bfba8..bc245a3f5541 100644
--- a/unittest/mytap/tap.c
+++ b/unittest/mytap/tap.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/unittest/mytap/tap.h b/unittest/mytap/tap.h
index 979479bad627..503047b0a48c 100644
--- a/unittest/mytap/tap.h
+++ b/unittest/mytap/tap.h
@@ -1,13 +1,20 @@
-/* Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. 
+/* Copyright (c) 2006, 2023, Oracle and/or its affiliates. 
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index 903b91709dc5..1b60e2671af4 100644
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -1,14 +1,21 @@
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
+# GNU General Public License, version 2.0, for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -24,6 +31,10 @@ SET(VIO_SOURCES
   viosslfactories.c
 )
 
+DOWNGRADE_OPENSSL3_DEPRECATION_WARNINGS(
+  viossl.c
+  viosslfactories.c)
+
 IF(WIN32)
   LIST(APPEND VIO_SOURCES
     viopipe.c
@@ -33,7 +44,3 @@ ENDIF()
 
 ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
 TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/vio/docs/COPYING.openssl b/vio/docs/COPYING.openssl
index b9e18d5e7bf3..2fc7d5c85b5f 100644
--- a/vio/docs/COPYING.openssl
+++ b/vio/docs/COPYING.openssl
@@ -1,3 +1,26 @@
+/*
+   Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
   LICENSE ISSUES
   ==============
diff --git a/vio/test-ssl.c b/vio/test-ssl.c
index c99f5071055b..e12c40410869 100644
--- a/vio/test-ssl.c
+++ b/vio/test-ssl.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,7 +35,7 @@
 const char *VER="0.2";
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 const char *default_dbug_option="d:t:O,-";
 #endif
 
diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c
index bb67723c13c9..c19cfca80018 100644
--- a/vio/test-sslclient.c
+++ b/vio/test-sslclient.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,7 +35,7 @@
 const char *VER="0.2";
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 const char *default_dbug_option="d:t:O,-";
 #endif
 
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index 6044ac7ee0ee..7ab55d453bbb 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,7 +35,7 @@
 const char *VER="0.2";
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 const char *default_dbug_option="d:t:O,-";
 #endif
 
diff --git a/vio/vio.c b/vio/vio.c
index 1be154034a86..fa1cd17b4ed5 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -210,7 +222,7 @@ my_bool vio_reset(Vio* vio, enum enum_vio_type type,
   DBUG_ENTER("vio_reset");
 
   /* The only supported rebind is from a socket-based transport type. */
-  DBUG_ASSERT(vio->type == VIO_TYPE_TCPIP || vio->type == VIO_TYPE_SOCKET);
+  assert(vio->type == VIO_TYPE_TCPIP || vio->type == VIO_TYPE_SOCKET);
 
   vio_init(&new_vio, type, sd, flags);
 
@@ -409,9 +421,7 @@ void vio_delete(Vio* vio)
 */
 void vio_end(void)
 {
-#if defined(HAVE_YASSL)
-  yaSSL_CleanUp();
-#elif defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL)
   vio_ssl_end();
 #endif
 }
diff --git a/vio/vio_priv.h b/vio/vio_priv.h
index 11eadbb930d4..f2e5343b4687 100644
--- a/vio/vio_priv.h
+++ b/vio/vio_priv.h
@@ -1,13 +1,25 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/vio/viopipe.c b/vio/viopipe.c
index c2145ccb0dc1..be3d2fa7ae75 100644
--- a/vio/viopipe.c
+++ b/vio/viopipe.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -101,13 +108,16 @@ my_bool vio_is_connected_pipe(Vio *vio)
 
 int vio_shutdown_pipe(Vio *vio)
 {
-  BOOL ret;
+  BOOL ret= FALSE;
   DBUG_ENTER("vio_shutdown_pipe");
 
-  CancelIo(vio->hPipe);
-  CloseHandle(vio->overlapped.hEvent);
-  DisconnectNamedPipe(vio->hPipe);
-  ret= CloseHandle(vio->hPipe);
+  if (vio->inactive == FALSE)
+  {
+    CancelIo(vio->hPipe);
+    CloseHandle(vio->overlapped.hEvent);
+    DisconnectNamedPipe(vio->hPipe);
+    ret= CloseHandle(vio->hPipe);
+  }
 
   vio->inactive= TRUE;
   vio->hPipe= NULL;
diff --git a/vio/vioshm.c b/vio/vioshm.c
index 9bc3976ac2a7..af4224ee7f01 100644
--- a/vio/vioshm.c
+++ b/vio/vioshm.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/vio/viosocket.c b/vio/viosocket.c
index ee5929219bac..d65d67441a16 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -1,15 +1,26 @@
 /*
-   Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2023, Oracle and/or its affiliates.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -65,7 +76,7 @@ int vio_socket_io_wait(Vio *vio, enum enum_vio_io_event event)
 {
   int timeout, ret;
 
-  DBUG_ASSERT(event == VIO_IO_EVENT_READ || event == VIO_IO_EVENT_WRITE);
+  assert(event == VIO_IO_EVENT_READ || event == VIO_IO_EVENT_WRITE);
 
   /* Choose an appropriate timeout. */
   if (event == VIO_IO_EVENT_READ)
@@ -114,7 +125,7 @@ size_t vio_read(Vio *vio, uchar *buf, size_t size)
   DBUG_ENTER("vio_read");
 
   /* Ensure nobody uses vio_read_buff and vio_read simultaneously. */
-  DBUG_ASSERT(vio->read_end == vio->read_pos);
+  assert(vio->read_end == vio->read_pos);
 
   /* If timeout is enabled, do not block if data is unavailable. */
   if (vio->read_timeout >= 0)
@@ -220,8 +231,8 @@ static int vio_set_blocking(Vio *vio, my_bool status)
   DBUG_ENTER("vio_set_blocking");
 
 #ifdef _WIN32
-  DBUG_ASSERT(vio->type != VIO_TYPE_NAMEDPIPE);
-  DBUG_ASSERT(vio->type != VIO_TYPE_SHARED_MEMORY);
+  assert(vio->type != VIO_TYPE_NAMEDPIPE);
+  assert(vio->type != VIO_TYPE_SHARED_MEMORY);
   {
     int ret;
     u_long arg= status ? 0 : 1;
@@ -278,8 +289,8 @@ int vio_socket_timeout(Vio *vio,
 
       Assert that the VIO timeout is either positive or set to infinite.
     */
-    DBUG_ASSERT(which || vio->read_timeout);
-    DBUG_ASSERT(!which || vio->write_timeout);
+    assert(which || vio->read_timeout);
+    assert(!which || vio->write_timeout);
 
     if (which)
     {
@@ -416,11 +427,11 @@ int vio_shutdown(Vio * vio)
 
  if (vio->inactive == FALSE)
   {
-    DBUG_ASSERT(vio->type ==  VIO_TYPE_TCPIP ||
-      vio->type == VIO_TYPE_SOCKET ||
-      vio->type == VIO_TYPE_SSL);
+    assert(vio->type ==  VIO_TYPE_TCPIP ||
+           vio->type == VIO_TYPE_SOCKET ||
+           vio->type == VIO_TYPE_SSL);
 
-    DBUG_ASSERT(mysql_socket_getfd(vio->mysql_socket) >= 0);
+    assert(mysql_socket_getfd(vio->mysql_socket) >= 0);
     if (mysql_socket_shutdown(vio->mysql_socket, SHUT_RDWR))
       r= -1;
     if (mysql_socket_close(vio->mysql_socket))
@@ -744,7 +755,7 @@ static my_bool socket_peek_read(Vio *vio, uint *bytes)
 int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
 {
   int ret;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   short revents= 0;
 #endif
   struct pollfd pfd;
@@ -764,14 +775,14 @@ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
   {
   case VIO_IO_EVENT_READ:
     pfd.events= MY_POLL_SET_IN;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     revents= MY_POLL_SET_IN | MY_POLL_SET_ERR | POLLRDHUP;
 #endif
     break;
   case VIO_IO_EVENT_WRITE:
   case VIO_IO_EVENT_CONNECT:
     pfd.events= MY_POLL_SET_OUT;
-#ifndef DBUG_OFF
+#ifndef NDEBUG
     revents= MY_POLL_SET_OUT | MY_POLL_SET_ERR;
 #endif
     break;
@@ -797,7 +808,7 @@ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
     break;
   default:
     /* Ensure that the requested I/O event has completed. */
-    DBUG_ASSERT(pfd.revents & revents);
+    assert(pfd.revents & revents);
     break;
   }
 
@@ -891,7 +902,7 @@ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
   ret|= MY_TEST(FD_ISSET(fd, &exceptfds));
 
   /* Not a timeout, ensure that a condition was met. */
-  DBUG_ASSERT(ret);
+  assert(ret);
 
   DBUG_RETURN(ret);
 }
@@ -919,7 +930,7 @@ vio_socket_connect(Vio *vio, struct sockaddr *addr, socklen_t len, int timeout)
   DBUG_ENTER("vio_socket_connect");
 
   /* Only for socket-based transport types. */
-  DBUG_ASSERT(vio->type == VIO_TYPE_SOCKET || vio->type == VIO_TYPE_TCPIP);
+  assert(vio->type == VIO_TYPE_SOCKET || vio->type == VIO_TYPE_TCPIP);
 
   /* If timeout is not infinite, set socket to non-blocking mode. */
   if ((timeout > -1) && vio_set_blocking(vio, FALSE))
@@ -1035,7 +1046,7 @@ my_bool vio_is_connected(Vio *vio)
   DBUG_RETURN(bytes ? TRUE : FALSE);
 }
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 /**
   Number of bytes in the read or socket buffer
@@ -1061,11 +1072,6 @@ ssize_t vio_pending(Vio *vio)
       return -1;
   }
 
-  /*
-    SSL not checked due to a yaSSL bug in SSL_pending that
-    causes it to attempt to read from the socket.
-  */
-
   return (ssize_t) bytes;
 }
 
diff --git a/vio/viossl.c b/vio/viossl.c
index 5622cb7ee92f..2abf9f24de5d 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -24,7 +36,7 @@
 
 #ifdef HAVE_OPENSSL
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 
 static void
 report_errors(SSL* ssl)
@@ -142,14 +154,12 @@ static my_bool ssl_should_retry(Vio *vio, int ret,
     *event= VIO_IO_EVENT_WRITE;
     break;
   default:
-#ifndef DBUG_OFF  /* Debug build */
+#ifndef NDEBUG  /* Debug build */
     /* Note: the OpenSSL error queue gets cleared in report_errors(). */
     report_errors(ssl);
 #else             /* Release build */
-# ifndef HAVE_YASSL
     /* OpenSSL: clear the error queue. */
     ERR_clear_error();
-# endif
 #endif
     should_retry= FALSE;
     ssl_set_sys_error(ssl_error);
@@ -174,18 +184,16 @@ size_t vio_ssl_read(Vio *vio, uchar *buf, size_t size)
   {
     enum enum_vio_io_event event;
 
-#ifndef HAVE_YASSL
     /*
       OpenSSL: check that the SSL thread's error queue is cleared. Otherwise
       SSL_read() returns an error from the error queue, when SSL_read() failed
       because it would block.
     */
-    DBUG_ASSERT(ERR_peek_error() == 0);
-#endif
+    assert(ERR_peek_error() == 0);
 
     ret= SSL_read(ssl, buf, (int)size);
 
-    if (ret >= 0)
+    if (ret > 0)
       break;
 
     /* Process the SSL I/O error. */
@@ -213,18 +221,16 @@ size_t vio_ssl_write(Vio *vio, const uchar *buf, size_t size)
   {
     enum enum_vio_io_event event;
 
-#ifndef HAVE_YASSL
     /*
       OpenSSL: check that the SSL thread's error queue is cleared. Otherwise
       SSL_write() returns an error from the error queue, when SSL_write() failed
       because it would block.
     */
-    DBUG_ASSERT(ERR_peek_error() == 0);
-#endif
+    assert(ERR_peek_error() == 0);
 
     ret= SSL_write(ssl, buf, (int)size);
 
-    if (ret >= 0)
+    if (ret > 0)
       break;
 
     /* Process the SSL I/O error. */
@@ -239,23 +245,6 @@ size_t vio_ssl_write(Vio *vio, const uchar *buf, size_t size)
   DBUG_RETURN(ret < 0 ? -1 : ret);
 }
 
-#ifdef HAVE_YASSL
-
-/* Emulate a blocking recv() call with vio_read(). */
-static long yassl_recv(void *ptr, void *buf, size_t len)
-{
-  return (long)vio_read(ptr, buf, len);
-}
-
-
-/* Emulate a blocking send() call with vio_write(). */
-static long yassl_send(void *ptr, const void *buf, size_t len)
-{
-  return (long)vio_write(ptr, buf, len);
-}
-
-#endif
-
 int vio_ssl_shutdown(Vio *vio)
 {
   int r= 0;
@@ -288,6 +277,7 @@ int vio_ssl_shutdown(Vio *vio)
     default: /* Shutdown failed */
       DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
                                SSL_get_error(ssl, r)));
+      ERR_clear_error();
       break;
     }
   }
@@ -309,9 +299,9 @@ void vio_ssl_delete(Vio *vio)
     vio->ssl_arg= 0;
   }
 
-#ifndef HAVE_YASSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
   ERR_remove_thread_state(0);
-#endif
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
 
   vio_delete(vio);
 }
@@ -345,14 +335,12 @@ static int ssl_handshake_loop(Vio *vio, SSL *ssl,
   {
     enum enum_vio_io_event event;
 
-#ifndef HAVE_YASSL
     /*
       OpenSSL: check that the SSL thread's error queue is cleared. Otherwise
       SSL-handshake-function returns an error from the error queue, when the
       function failed because it would block.
     */
-    DBUG_ASSERT(ERR_peek_error() == 0);
-#endif
+    assert(ERR_peek_error() == 0);
 
     ret= func(ssl);
 
@@ -374,7 +362,8 @@ static int ssl_handshake_loop(Vio *vio, SSL *ssl,
 }
 
 
-static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
+static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
+                  long timeout MY_ATTRIBUTE((unused)),
                   ssl_handshake_func_t func,
                   unsigned long *ssl_errno_holder)
 {
@@ -383,7 +372,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
   my_socket sd= mysql_socket_getfd(vio->mysql_socket);
 
   /* Declared here to make compiler happy */
-#if !defined(HAVE_YASSL) && !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   int j, n;
 #endif
 
@@ -399,15 +388,14 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
   }
   DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
   SSL_clear(ssl);
-  SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
   SSL_set_fd(ssl, sd);
-#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
+#if defined(SSL_OP_NO_COMPRESSION)
   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
 #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
   sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
 #endif
 
-#if !defined(HAVE_YASSL) && !defined(DBUG_OFF)
+#if !defined(NDEBUG)
   {
     STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
     ssl_comp_methods = SSL_COMP_get_compression_methods();
@@ -419,24 +407,15 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
       for (j = 0; j < n; j++)
       {
         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+        DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
       }
   }
 #endif
-
-  /*
-    Since yaSSL does not support non-blocking send operations, use
-    special transport functions that properly handles non-blocking
-    sockets. These functions emulate the behavior of blocking I/O
-    operations by waiting for I/O to become available.
-  */
-#ifdef HAVE_YASSL
-  /* Set first argument of the transport functions. */
-  yaSSL_transport_set_ptr(ssl, vio);
-  /* Set functions to use in order to send and receive data. */
-  yaSSL_transport_set_recv_function(ssl, yassl_recv);
-  yaSSL_transport_set_send_function(ssl, yassl_send);
-#endif
+  ERR_clear_error();
 
   if ((r= ssl_handshake_loop(vio, ssl, func, ssl_errno_holder)) < 1)
   {
@@ -453,7 +432,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
   if (vio_reset(vio, VIO_TYPE_SSL, SSL_get_fd(ssl), ssl, 0))
     DBUG_RETURN(1);
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
   {
     /* Print some info about the peer */
     X509 *cert;
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index da5449aefdbd..ba67b8cc8185 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -1,34 +1,38 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "vio_priv.h"
+#include "my_openssl.h"
 
 #ifdef HAVE_OPENSSL
 
 #define TLS_VERSION_OPTION_SIZE 256
 #define SSL_CIPHER_LIST_SIZE 4096
 
-#ifdef HAVE_YASSL
-static const char tls_ciphers_list[]="DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:"
-                                     "AES128-RMD:DES-CBC3-RMD:DHE-RSA-AES256-RMD:"
-                                     "DHE-RSA-AES128-RMD:DHE-RSA-DES-CBC3-RMD:"
-                                     "AES256-SHA:RC4-SHA:RC4-MD5:DES-CBC3-SHA:"
-                                     "DES-CBC-SHA:EDH-RSA-DES-CBC3-SHA:"
-                                     "EDH-RSA-DES-CBC-SHA:AES128-SHA:AES256-RMD";
-static const char tls_cipher_blocked[]= "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!RC2:!RC4:!PSK:";
-#else
 static const char tls_ciphers_list[]="ECDHE-ECDSA-AES128-GCM-SHA256:"
                                      "ECDHE-ECDSA-AES256-GCM-SHA384:"
                                      "ECDHE-RSA-AES128-GCM-SHA256:"
@@ -69,7 +73,6 @@ static const char tls_cipher_blocked[]= "!aNULL:!eNULL:!EXPORT:!LOW:!MD5:!DES:!R
                                         "!DHE-DSS-DES-CBC3-SHA:!DHE-RSA-DES-CBC3-SHA:"
                                         "!ECDH-RSA-DES-CBC3-SHA:!ECDH-ECDSA-DES-CBC3-SHA:"
                                         "!ECDHE-RSA-DES-CBC3-SHA:!ECDHE-ECDSA-DES-CBC3-SHA:";
-#endif
 
 static my_bool     ssl_initialized         = FALSE;
 
@@ -121,13 +124,21 @@ static DH *get_dh2048(void)
   DH *dh;
   if ((dh=DH_new()))
   {
-    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-    if (! dh->p || ! dh->g)
-    {
+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
+    if (!p || !g
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        || !DH_set0_pqg(dh, p, NULL, g)
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+    ) {
+      /* DH_free() will free 'p' and 'g' at once. */
       DH_free(dh);
-      dh=0;
+      return NULL;
     }
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    dh->p= p;
+    dh->g= g;
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   }
   return(dh);
 }
@@ -145,7 +156,7 @@ report_errors()
 
   while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
   {
-#ifndef DBUG_OFF				/* Avoid warning */
+#ifndef NDEBUG				/* Avoid warning */
     char buf[200];
     DBUG_PRINT("error", ("OpenSSL: %s:%s:%d:%s\n", ERR_error_string(l,buf),
 			 file,line,(flags & ERR_TXT_STRING) ? data : "")) ;
@@ -172,7 +183,7 @@ ssl_error_string[] =
 const char*
 sslGetErrString(enum enum_ssl_init_error e)
 {
-  DBUG_ASSERT(SSL_INITERR_NOERROR < e && e < SSL_INITERR_LASTERR);
+  assert(SSL_INITERR_NOERROR < e && e < SSL_INITERR_LASTERR);
   return ssl_error_string[e];
 }
 
@@ -228,7 +239,11 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file,
   DBUG_RETURN(0);
 }
 
-#ifndef HAVE_YASSL
+/*
+  OpenSSL 1.1 supports native platform threads,
+  so we don't need the following callback functions.
+*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 /* OpenSSL specific */
 
 #ifdef HAVE_PSI_INTERFACE
@@ -390,43 +405,48 @@ static void deinit_lock_callback_functions()
   set_lock_callback_functions(FALSE);
 }
 
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+
 void vio_ssl_end()
 {
-  int i= 0;
-
   if (ssl_initialized) {
-    ERR_remove_state(0);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    int i;
+
+    ERR_remove_thread_state(0);
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
     ERR_free_strings();
     EVP_cleanup();
 
     CRYPTO_cleanup_all_ex_data();
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     deinit_lock_callback_functions();
 
-    for (; i < CRYPTO_num_locks(); ++i)
+    for (i= 0; i < CRYPTO_num_locks(); ++i)
       mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
     OPENSSL_free(openssl_stdlocks);
 
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
     ssl_initialized= FALSE;
   }
 }
 
-#endif //OpenSSL specific
-
 void ssl_start()
 {
   if (!ssl_initialized)
   {
     ssl_initialized= TRUE;
 
-    SSL_library_init();
+    mysql_OPENSSL_init();
+
     OpenSSL_add_all_algorithms();
     SSL_load_error_strings();
 
-#ifndef HAVE_YASSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     init_ssl_locks();
     init_lock_callback_functions();
-#endif
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   }
 }
 
@@ -434,19 +454,11 @@ long process_tls_version(const char *tls_version)
 {
   const char *separator= ",";
   char *token, *lasts= NULL;
-#ifndef HAVE_YASSL
   unsigned int tls_versions_count= 3;
   const char *tls_version_name_list[3]= {"TLSv1", "TLSv1.1", "TLSv1.2"};
   const char ctx_flag_default[]= "TLSv1,TLSv1.1,TLSv1.2";
   const long tls_ctx_list[3]= {SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2};
   long tls_ctx_flag= SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2;
-#else
-  unsigned int tls_versions_count= 2;
-  const char *tls_version_name_list[2]= {"TLSv1", "TLSv1.1"};
-  const long tls_ctx_list[2]= {SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1};
-  const char ctx_flag_default[]= "TLSv1,TLSv1.1";
-  long tls_ctx_flag= SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1;
-#endif
   unsigned int index= 0;
   char tls_version_option[TLS_VERSION_OPTION_SIZE]= "";
   int tls_found= 0;
@@ -489,7 +501,12 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
 {
   DH *dh;
   struct st_VioSSLFd *ssl_fd;
-  long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+  /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */
+  long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3
+#ifdef HAVE_TLSv13
+                        | SSL_OP_NO_TLSv1_3
+#endif /* HAVE_TLSv13 */
+                        ;
   int ret_set_cipherlist= 0;
   char cipher_list[SSL_CIPHER_LIST_SIZE]= {0};
   DBUG_ENTER("new_VioSSLFd");
@@ -518,11 +535,11 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
                     SSL_OP_NO_SSLv3 |
                     SSL_OP_NO_TLSv1 |
                     SSL_OP_NO_TLSv1_1
-#ifndef HAVE_YASSL
                     | SSL_OP_NO_TLSv1_2
-
-
-#endif
+#ifdef HAVE_TLSv13
+                    | SSL_OP_NO_TLSv1_3
+#endif /* HAVE_TLSv13 */
+                    | SSL_OP_NO_TICKET
                    );
   if (!(ssl_fd= ((struct st_VioSSLFd*)
                  my_malloc(key_memory_vio_ssl_fd,
@@ -542,16 +559,38 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
 
   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
 
+#ifdef HAVE_TLSv13
+  /*
+    MySQL 5.7 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
+  */
+  if (0 == SSL_CTX_set_ciphersuites(ssl_fd->ssl_context, ""))
+  {
+    *error = SSL_INITERR_CIPHERS;
+    DBUG_PRINT("error", ("%s", sslGetErrString(*error)));
+    report_errors();
+    SSL_CTX_free(ssl_fd->ssl_context);
+    my_free(ssl_fd);
+    DBUG_RETURN(0);
+  }
+#endif /* HAVE_TLSv13 */
+
   /*
-    Set the ciphers that can be used
+    We explicitly prohibit weak ciphers.
     NOTE: SSL_CTX_set_cipher_list will return 0 if
     none of the provided ciphers could be selected
   */
-  strcat(cipher_list, tls_cipher_blocked);
-  if (cipher)
-    strcat(cipher_list, cipher);
-  else
-    strcat(cipher_list, tls_ciphers_list);
+  strncpy(cipher_list, tls_cipher_blocked, SSL_CIPHER_LIST_SIZE - 1);
+
+  /*
+    If ciphers are specified explicitly by caller, use them.
+    Otherwise, fallback to the default list.
+
+    In either case, we make sure we stay within the valid bounds.
+    Note that we have already consumed tls_cipher_blocked
+    worth of space.
+  */
+  strncat(cipher_list, cipher == 0 ? tls_ciphers_list : cipher,
+          SSL_CIPHER_LIST_SIZE - strlen(cipher_list) - 1);
 
   if (ret_set_cipherlist == SSL_CTX_set_cipher_list(ssl_fd->ssl_context, cipher_list))
   {
@@ -594,10 +633,6 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
 
   if (crl_file || crl_path)
   {
-#ifdef HAVE_YASSL
-    DBUG_PRINT("warning", ("yaSSL doesn't support CRL"));
-    DBUG_ASSERT(0);
-#else
     X509_STORE *store= SSL_CTX_get_cert_store(ssl_fd->ssl_context);
     /* Load crls from the trusted ca */
     if (X509_STORE_load_locations(store, crl_file, crl_path) == 0 ||
@@ -613,7 +648,6 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
       my_free(ssl_fd);
       DBUG_RETURN(0);
     }
-#endif
   }
 
   if (vio_set_cert_stuff(ssl_fd->ssl_context, cert_file, key_file, error))
diff --git a/vio/viotest-ssl.c b/vio/viotest-ssl.c
index 51d171d6923a..1cd542c37fa1 100644
--- a/vio/viotest-ssl.c
+++ b/vio/viotest-ssl.c
@@ -1,13 +1,20 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
@@ -28,7 +35,7 @@
 const char *VER="0.2";
 
 
-#ifndef DBUG_OFF
+#ifndef NDEBUG
 const char *default_dbug_option="d:t:O,/tmp/viotest-ssl.trace";
 #endif
 
diff --git a/vio/viotest-sslconnect.cc b/vio/viotest-sslconnect.cc
index 18e558159fad..d655893e0d3a 100644
--- a/vio/viotest-sslconnect.cc
+++ b/vio/viotest-sslconnect.cc
@@ -1,14 +1,21 @@
-/* Copyright (c) 2000 MySQL AB
+/* Copyright (c) 2000, 2023, Oracle and/or its affiliates.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/vio/viotest.cc b/vio/viotest.cc
index 7736e3fd5de3..3fa75e7abbba 100644
--- a/vio/viotest.cc
+++ b/vio/viotest.cc
@@ -1,14 +1,21 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
+   it under the terms of the GNU General Public License, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU General Public License, version 2.0, for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
diff --git a/win/create_def_file.js b/win/create_def_file.js
index db34ae5caa23..6866ac141cd6 100644
--- a/win/create_def_file.js
+++ b/win/create_def_file.js
@@ -1,17 +1,24 @@
 // create_def_file.js
 //
-// Copyright (c) 2009 Sun Microsystems, Inc.
+// Copyright (c) 2009, 2023, Oracle and/or its affiliates.
 // Use is subject to license terms.
 // 
 // This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-// 
+// it under the terms of the GNU General Public License, version 2.0,
+// as published by the Free Software Foundation.
+//
+// This program is also distributed with certain software (including
+// but not limited to OpenSSL) that is licensed under separate terms,
+// as designated in a particular file or component or in included license
+// documentation.  The authors of MySQL hereby grant you an additional
+// permission to link the program and your derivative works with the
+// separately licensed software that they have included with MySQL.
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
+// GNU General Public License, version 2.0, for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
deleted file mode 100644
index 405d7e8c5df9..000000000000
--- a/zlib/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/zlib
-)
-SET(ZLIB_SOURCES
-  adler32.c
-  compress.c
-  crc32.c
-  deflate.c
-  gzio.c
-  infback.c
-  inffast.c
-  inflate.c
-  inftrees.c
-  trees.c
-  uncompr.c
-  zutil.c
-)
-
-ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
-
-IF(MSVC)
-   INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
-ENDIF()
diff --git a/zlib/ChangeLog b/zlib/ChangeLog
deleted file mode 100644
index 7f6869d3235e..000000000000
--- a/zlib/ChangeLog
+++ /dev/null
@@ -1,855 +0,0 @@
-
-                ChangeLog file for zlib
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-  compile
-- Fix some spelling errors in comments [Betts]
-- Correct inflateInit2() error return documentation in zlib.h
-- Added zran.c example of compressed data random access to examples
-  directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-- Add cast in trees.c t avoid a warning [Oberhumer]
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-- Update make_vms.com [Zinser]
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
-  discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX [Smith]
-- Add error return to gzread() for format or i/o error [Levin]
-- Use malloc.h for OS/2 [Necasek]
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c [Vollant]
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() [Heiner]
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h [Donais]
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip [Vollant]
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-- Add casts in crc32.c to avoid warnings [Oberhumer]
-- Add contrib/masmx64 [Vollant]
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-  avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments [Chang]
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com [Coghlan], update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure [Gilbert]
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-  and in contrib/inflate86/inffast.S [Truta, Anderson]
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-- Update projects/README.projects and projects/visualc6 [Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification [Peterson]
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-- Add contrib/dotzlib [Ravn]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update contrib/minizip [Vollant]
-- Move contrib/visual-basic.txt to old/ [Truta]
-- Fix assembler builds in projects/visualc6/ [Truta]
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-- Don't declare strerror() under VMS [Mozilla]
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada [Anisimkov]
-- Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
-- Fix gzio.c to not return error on empty files [Brown]
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
-  contrib/pascal/zlibpas.pas [Truta]
-- Update mkasm.bat in contrib/masmx86 [Truta]
-- Update contrib/untgz [Truta]
-- Add projects/README.projects [Truta]
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-- Add OS/2 to exe builds in configure [Poltorak]
-- Remove err dummy parameter in zlib.h [Kientzle]
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
-  dynamic blocks with only literals and no distance codes --
-  Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-- Support shared libraries on Hurd and KFreeBSD [Brown]
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
-    - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt [Truta]
-- Delete Turbo C comment in README [Truta]
-- Improve some indentation in zconf.h [Truta]
-- Fix infinite loop on bad input in configure script [Church]
-- Fix gzeof() for concatenated gzip files [Johnson]
-- Add example to contrib/visual-basic.txt [Michael B.]
-- Add -p to mkdir's in Makefile.in [vda]
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support [Monnerat]
-- Add a little Cygwin support [Wilson]
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # [Beebe]
-- Update contrib/untgz to 0.2 with various fixes [Truta]
-- Add build support for Amiga [Nikl]
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 [Vollant]
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-- Update POSTINC comment for 68060 [Nikl]
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-- Add pragma for fdopen on MVS [van Burik]
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
-    - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL [Truta]
-- INDEX update: add qnx entry, remove aix entry [Truta]
-- Install zlib.3 into mandir [Wilson]
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-- Update msdos and win32 scripts and makefiles [Truta]
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-- Add contrib/ada [Anisimkov]
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-- Add contrib/masm686 [Truta]
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-  [Truta, Vollant]
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-  and fix some method prototypes [Truta]
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-  [Truta]
-- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-- Fix file time handling in contrib/untgz; update makefiles [Truta]
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-  [Vollant]
-- Remove contrib/vstudio/vc15_16 [Vollant]
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-- Update README.contrib [Truta]
-- Invert the assignment order of match_head and s->prev[...] in
-  INSERT_STRING [Truta]
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-  [Truta]
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-- Fix prototype of syncsearch in inflate.c [Truta]
-- Introduce ASMINF macro to be enabled when using an ASM implementation
-  of inflate_fast [Truta]
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-- Modify test_gzio in example.c to take a single file name as a
-  parameter [Truta]
-- Exit the example.c program if gzopen fails [Truta]
-- Add type casts around strlen in example.c [Truta]
-- Remove casting to sizeof in minigzip.c; give a proper type
-  to the variable compared with SUFFIX_LEN [Truta]
-- Update definitions of STDC and STDC99 in zconf.h [Truta]
-- Synchronize zconf.h with the new Windows DLL interface [Truta]
-- Use SYS16BIT instead of __32BIT__ to distinguish between
-  16- and 32-bit platforms [Truta]
-- Use far memory allocators in small 16-bit memory models for
-  Turbo C [Truta]
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-  zlibCompileFlags [Truta]
-- Cygwin has vsnprintf [Wilson]
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation [Vollant]
-- Update contrib/minizip and contrib/vstudio [Vollant]
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h [Anisimkov]
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory [Bakker]
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
-  library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
-  special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines [Truta]
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments [Mai]
-- Remove #define ZLIB_DLL in zconf.h [Vollant]
-- Add zlib.3 [Rodgers]
-- Update RFC URL in deflate.c and algorithm.txt [Mai]
-- Add zlib_dll_FAQ.txt to contrib [Truta]
-- Add UL to some constants [Truta]
-- Update minizip and vstudio [Vollant]
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib [Schwardt]
-- Replace rewind() with fseek() for WinCE [Truta]
-- Improve setting of zlib format compression level flags
-    - Report 0 for huffman and rle strategies and for level == 0 or 1
-    - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time [Truta]
-- Allow TOO_FAR check to be turned off at compile time [Truta]
-- Add gzclearerr() function [Souza]
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding [Truta]
-    - When Z_RLE requested, restrict matches to distance one
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h [Vollant]
-    - Refine detection of Turbo C need for dummy returns
-    - Refine ZLIB_DLL compilation
-    - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
-  write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 [Anderson]
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-- Add msdos and win32 directories with makefiles [Truta]
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
-    - About 20% faster
-    - Does not allocate 32K window unless and until needed
-    - Automatically detects and decompresses gzip streams
-    - Raw inflate no longer needs an extra dummy byte at end
-    - Added inflateBack functions using a callback interface--even faster
-      than inflate, useful for file utilities (gzip, zip)
-    - Added inflateCopy() function to record state for random access on
-      externally generated deflate streams (e.g. in gzip files)
-    - More readable code (I hope)
-- New and improved crc32()
-    - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-  and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
-  return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-  is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
-    - Document raw deflate and inflate
-    - Update RFCs URL
-    - Point out that zlib and gzip formats are different
-    - Note that Z_BUF_ERROR is not fatal
-    - Document string limit for gzprintf() and possible buffer overflow
-    - Note requirement on avail_out when flushing
-    - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
-  This creates a security problem described in
-  http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
-  less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
-  of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean"  (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
-  . zutil.c, zutil.h: added "const" for zmem*
-  . Make_vms.com: fixed some typos
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-  . msdos/Makefile.*: use model-dependent name for the built zlib library
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-  See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
-  completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-  compression ratio on some files. This also allows inlining _tr_tally for
-  matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-  on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
-  them at run time (thanks to Ken Raeburn for this suggestion). To create
-  trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
-  Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
-  (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
-  inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
-   contrib/asm386/ by Gilles Vollant <info@winimage.com>
-        386 asm code replacing longest_match().
-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge L�vset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-        How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-  level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
-  (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"[0] (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-  bit, so the decompressor could decompress all the correct data but went
-  on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-  small and medium models; this makes the library incompatible with previous
-  versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
-  avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
-  and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-     (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
-  not completely flushed in rare occasions).
-- default window size is same for compression and decompression
-  (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
-  typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
-  was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
-  pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-  is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-  (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
-  TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-  not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-  if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
-  user-provided history buffer. This is supported only in deflateInit2
-  and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()
diff --git a/zlib/FAQ b/zlib/FAQ
deleted file mode 100644
index 441d910daa18..000000000000
--- a/zlib/FAQ
+++ /dev/null
@@ -1,339 +0,0 @@
-
-                Frequently Asked Questions about zlib
-
-
-If your question is not there, please check the zlib home page
-http://www.zlib.org which may have more recent information.
-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
-
-
- 1. Is zlib Y2K-compliant?
-
-    Yes. zlib doesn't handle dates.
-
- 2. Where can I get a Windows DLL version?
-
-    The zlib sources can be compiled without change to produce a DLL.
-    See the file win32/DLL_FAQ.txt in the zlib distribution.
-    Pointers to the precompiled DLL are found in the zlib web site at
-    http://www.zlib.org.
-
- 3. Where can I get a Visual Basic interface to zlib?
-
-    See
-        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
-        * contrib/visual-basic.txt in the zlib distribution
-        * win32/DLL_FAQ.txt in the zlib distribution
-
- 4. compress() returns Z_BUF_ERROR.
-
-    Make sure that before the call of compress, the length of the compressed
-    buffer is equal to the total size of the compressed buffer and not
-    zero. For Visual Basic, check that this parameter is passed by reference
-    ("as any"), not by value ("as long").
-
- 5. deflate() or inflate() returns Z_BUF_ERROR.
-
-    Before making the call, make sure that avail_in and avail_out are not
-    zero. When setting the parameter flush equal to Z_FINISH, also make sure
-    that avail_out is big enough to allow processing all pending input.
-    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or
-    inflate() can be made with more input or output space. A Z_BUF_ERROR
-    may in fact be unavoidable depending on how the functions are used, since
-    it is not possible to tell whether or not there is more output pending
-    when strm.avail_out returns with zero.
-
- 6. Where's the zlib documentation (man pages, etc.)?
-
-    It's in zlib.h for the moment, and Francis S. Lin has converted it to a
-    web page zlib.html. Volunteers to transform this to Unix-style man pages,
-    please contact us (zlib@gzip.org). Examples of zlib usage are in the files
-    example.c and minigzip.c.
-
- 7. Why don't you use GNU autoconf or libtool or ...?
-
-    Because we would like to keep zlib as a very small and simple
-    package. zlib is rather portable and doesn't need much configuration.
-
- 8. I found a bug in zlib.
-
-    Most of the time, such problems are due to an incorrect usage of
-    zlib. Please try to reproduce the problem with a small program and send
-    the corresponding source to us at zlib@gzip.org . Do not send
-    multi-megabyte data files without prior agreement.
-
- 9. Why do I get "undefined reference to gzputc"?
-
-    If "make test" produces something like
-
-       example.o(.text+0x154): undefined reference to `gzputc'
-
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
-    /usr/X11R6/lib. Remove any old versions, then do "make install".
-
-10. I need a Delphi interface to zlib.
-
-    See the contrib/delphi directory in the zlib distribution.
-
-11. Can zlib handle .zip archives?
-
-    Not by itself, no.  See the directory contrib/minizip in the zlib
-    distribution.
-
-12. Can zlib handle .Z files?
-
-    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt
-    the code of uncompress on your own.
-
-13. How can I make a Unix shared library?
-
-    make clean
-    ./configure -s
-    make
-
-14. How do I install a shared zlib library on Unix?
-
-    After the above, then:
-
-    make install
-
-    However, many flavors of Unix come with a shared zlib already installed.
-    Before going to the trouble of compiling a shared version of zlib and
-    trying to install it, you may want to check if it's already there! If you
-    can #include <zlib.h>, it's there. The -lz option will probably link to it.
-
-15. I have a question about OttoPDF.
-
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site: Joel Hainley, jhainley@myndkryme.com.
-
-16. Can zlib decode Flate data in an Adobe PDF file?
-
-    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
-    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
-
-17. Why am I getting this "register_frame_info not found" error on Solaris?
-
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
-    generates an error such as:
-
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
-        symbol __register_frame_info: referenced symbol not found
-
-    The symbol __register_frame_info is not part of zlib, it is generated by
-    the C compiler (cc or gcc). You must recompile applications using zlib
-    which have this problem. This problem is specific to Solaris. See
-    http://www.sunfreeware.com for Solaris versions of zlib and applications
-    using zlib.
-
-18. Why does gzip give an error on a file I make with compress/deflate?
-
-    The compress and deflate functions produce data in the zlib format, which
-    is different and incompatible with the gzip format. The gz* functions in
-    zlib on the other hand use the gzip format. Both the zlib and gzip
-    formats use the same compressed data format internally, but have different
-    headers and trailers around the compressed data.
-
-19. Ok, so why are there two different formats?
-
-    The gzip format was designed to retain the directory information about
-    a single file, such as the name and last modification date. The zlib
-    format on the other hand was designed for in-memory and communication
-    channel applications, and has a much more compact header and trailer and
-    uses a faster integrity check than gzip.
-
-20. Well that's nice, but how do I make a gzip file in memory?
-
-    You can request that deflate write the gzip format instead of the zlib
-    format using deflateInit2(). You can also request that inflate decode
-    the gzip format using inflateInit2(). Read zlib.h for more details.
-
-21. Is zlib thread-safe?
-
-    Yes. However any library routines that zlib uses and any application-
-    provided memory allocation routines must also be thread-safe. zlib's gz*
-    functions use stdio library routines, and most of zlib's functions use the
-    library memory allocation routines by default. zlib's Init functions allow
-    for the application to provide custom memory allocation routines.
-
-    Of course, you should only operate on any given zlib or gzip stream from a
-    single thread at a time.
-
-22. Can I use zlib in my commercial application?
-
-    Yes. Please read the license in zlib.h.
-
-23. Is zlib under the GNU license?
-
-    No. Please read the license in zlib.h.
-
-24. The license says that altered source versions must be "plainly marked". So
-    what exactly do I need to do to meet that requirement?
-
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In
-    particular, the final version number needs to be changed to "f", and an
-    identification string should be appended to ZLIB_VERSION. Version numbers
-    x.x.x.f are reserved for modifications to zlib by others than the zlib
-    maintainers. For example, if the version of the base zlib you are altering
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also
-    update the version strings in deflate.c and inftrees.c.
-
-    For altered source distributions, you should also note the origin and
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along
-    with the dates of the alterations. The origin should include at least your
-    name (or your company's name), and an email address to contact for help or
-    issues with the library.
-
-    Note that distributing a compiled zlib library along with zlib.h and
-    zconf.h is also a source distribution, and so you should change
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
-    in zlib.h as you would for a full source distribution.
-
-25. Will zlib work on a big-endian or little-endian architecture, and can I
-    exchange compressed data between them?
-
-    Yes and yes.
-
-26. Will zlib work on a 64-bit machine?
-
-    It should. It has been tested on 64-bit machines, and has no dependence
-    on any data types being limited to 32-bits in length. If you have any
-    difficulties, please provide a complete problem report to zlib@gzip.org
-
-27. Will zlib decompress data from the PKWare Data Compression Library?
-
-    No. The PKWare DCL uses a completely different compressed data format
-    than does PKZIP and zlib. However, you can look in zlib's contrib/blast
-    directory for a possible solution to your problem.
-
-28. Can I access data randomly in a compressed stream?
-
-    No, not without some preparation. If when compressing you periodically
-    use Z_FULL_FLUSH, carefully write all the pending data at those points,
-    and keep an index of those locations, then you can start decompression
-    at those points. You have to be careful to not use Z_FULL_FLUSH too
-    often, since it can significantly degrade compression.
-
-29. Does zlib work on MVS, OS/390, CICS, etc.?
-
-    We don't know for sure. We have heard occasional reports of success on
-    these systems. If you do use it on one of these, please provide us with
-    a report, instructions, and patches that we can reference when we get
-    these questions. Thanks.
-
-30. Is there some simpler, easier to read version of inflate I can look at
-    to understand the deflate format?
-
-    First off, you should read RFC 1951. Second, yes. Look in zlib's
-    contrib/puff directory.
-
-31. Does zlib infringe on any patents?
-
-    As far as we know, no. In fact, that was originally the whole point behind
-    zlib. Look here for some more information:
-
-    http://www.gzip.org/#faq11
-
-32. Can zlib work with greater than 4 GB of data?
-
-    Yes. inflate() and deflate() will process any amount of data correctly.
-    Each call of inflate() or deflate() is limited to input and output chunks
-    of the maximum value that can be stored in the compiler's "unsigned int"
-    type, but there is no limit to the number of chunks. Note however that the
-    strm.total_in and strm_total_out counters may be limited to 4 GB. These
-    counters are provided as a convenience and are not used internally by
-    inflate() or deflate(). The application can easily set up its own counters
-    updated after each call of inflate() or deflate() to count beyond 4 GB.
-    compress() and uncompress() may be limited to 4 GB, since they operate in a
-    single call. gzseek() and gztell() may be limited to 4 GB depending on how
-    zlib is compiled. See the zlibCompileFlags() function in zlib.h.
-
-    The word "may" appears several times above since there is a 4 GB limit
-    only if the compiler's "long" type is 32 bits. If the compiler's "long"
-    type is 64 bits, then the limit is 16 exabytes.
-
-33. Does zlib have any security vulnerabilities?
-
-    The only one that we are aware of is potentially in gzprintf(). If zlib
-    is compiled to use sprintf() or vsprintf(), then there is no protection
-    against a buffer overflow of a 4K string space, other than the caller of
-    gzprintf() assuring that the output will not exceed 4K. On the other
-    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should
-    normally be the case, then there is no vulnerability. The ./configure
-    script will display warnings if an insecure variation of sprintf() will
-    be used by gzprintf(). Also the zlibCompileFlags() function will return
-    information on what variant of sprintf() is used by gzprintf().
-
-    If you don't have snprintf() or vsnprintf() and would like one, you can
-    find a portable implementation here:
-
-        http://www.ijs.si/software/snprintf/
-
-    Note that you should be using the most recent version of zlib. Versions
-    1.1.3 and before were subject to a double-free vulnerability.
-
-34. Is there a Java version of zlib?
-
-    Probably what you want is to use zlib in Java. zlib is already included
-    as part of the Java SDK in the java.util.zip package. If you really want
-    a version of zlib written in the Java language, look on the zlib home
-    page for links: http://www.zlib.org/
-
-35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pedantic. Can't you guys write proper code?
-
-    Many years ago, we gave up attempting to avoid warnings on every compiler
-    in the universe. It just got to be a waste of time, and some compilers
-    were downright silly. So now, we simply make sure that the code always
-    works.
-
-36. Valgrind (or some similar memory access checker) says that deflate is
-    performing a conditional jump that depends on an uninitialized value.
-    Isn't that a bug?
-
-    No.  That is intentional for performance reasons, and the output of
-    deflate is not affected.  This only started showing up recently since
-    zlib 1.2.x uses malloc() by default for allocations, whereas earlier
-    versions used calloc(), which zeros out the allocated memory.
-
-37. Will zlib read the (insert any ancient or arcane format here) compressed
-    data format?
-
-    Probably not. Look in the comp.compression FAQ for pointers to various
-    formats and associated software.
-
-38. How can I encrypt/decrypt zip files with zlib?
-
-    zlib doesn't support encryption. The original PKZIP encryption is very weak
-    and can be broken with freely available programs. To get strong encryption,
-    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
-    For PKZIP compatible "encryption", look at http://www.info-zip.org/
-
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
-
-    "gzip" is the gzip format, and "deflate" is the zlib format. They should
-    probably have called the second one "zlib" instead to avoid confusion
-    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616
-    correctly points to the zlib specification in RFC 1950 for the "deflate"
-    transfer encoding, there have been reports of servers and browsers that
-    incorrectly produce or expect raw deflate data per the deflate
-    specficiation in RFC 1951, most notably Microsoft. So even though the
-    "deflate" transfer encoding using the zlib format would be the more
-    efficient approach (and in fact exactly what the zlib format was designed
-    for), using the "gzip" transfer encoding is probably more reliable due to
-    an unfortunate choice of name on the part of the HTTP 1.1 authors.
-
-    Bottom line: use the gzip format for HTTP 1.1 encoding.
-
-40. Does zlib support the new "Deflate64" format introduced by PKWare?
-
-    No. PKWare has apparently decided to keep that format proprietary, since
-    they have not documented it as they have previous compression formats.
-    In any case, the compression improvements are so modest compared to other
-    more modern approaches, that it's not worth the effort to implement.
-
-41. Can you please sign these lengthy legal documents and fax them back to us
-    so that we can use your software in our product?
-
-    No. Go away. Shoo.
diff --git a/zlib/INDEX b/zlib/INDEX
deleted file mode 100644
index 0587e5902bd1..000000000000
--- a/zlib/INDEX
+++ /dev/null
@@ -1,51 +0,0 @@
-ChangeLog       history of changes
-FAQ             Frequently Asked Questions about zlib
-INDEX           this file
-Makefile        makefile for Unix (generated by configure)
-Makefile.in     makefile for Unix (template for configure)
-README          guess what
-algorithm.txt   description of the (de)compression algorithm
-configure       configure script for Unix
-zconf.in.h      template for zconf.h (used by configure)
-
-amiga/          makefiles for Amiga SAS C
-as400/          makefiles for IBM AS/400
-msdos/          makefiles for MSDOS
-old/            makefiles for various architectures and zlib documentation
-                files that have not yet been updated for zlib 1.2.x
-projects/       projects for various Integrated Development Environments
-qnx/            makefiles for QNX
-win32/          makefiles for Windows
-
-                zlib public header files (must be kept):
-zconf.h
-zlib.h
-
-                private source files used to build the zlib library:
-adler32.c
-compress.c
-crc32.c
-crc32.h
-deflate.c
-deflate.h
-gzio.c
-infback.c
-inffast.c
-inffast.h
-inffixed.h
-inflate.c
-inflate.h
-inftrees.c
-inftrees.h
-trees.c
-trees.h
-uncompr.c
-zutil.c
-zutil.h
-
-                source files for sample programs:
-example.c
-minigzip.c
-
-                unsupported contribution by third parties
-See contrib/README.contrib
diff --git a/zlib/README b/zlib/README
deleted file mode 100644
index 758cc50020df..000000000000
--- a/zlib/README
+++ /dev/null
@@ -1,125 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.3 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format). These documents are also available in other
-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
-of the library is given in the file example.c which also tests that the library
-is working correctly. Another example is given in the file minigzip.c. The
-compression library itself is composed of all source files except example.c and
-minigzip.c.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile. In short "make test; make install" should work for most
-machines. For Unix: "./configure; make test; make install". For MSDOS, use one
-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version. The zlib home page is
-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
-please check this site to verify that you have the latest version of zlib;
-otherwise get the latest version and check whether the problem still exists or
-not.
-
-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
-for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
-issue of  Dr. Dobb's Journal; a copy of the article is available in
-http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-
-The changes made in version 1.2.3 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory "contrib".
-
-A Java implementation of zlib is available in the Java Development Kit
-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
-See the zlib home page http://www.zlib.org for details.
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
-CPAN (Comprehensive Perl Archive Network) sites
-http://www.cpan.org/modules/by-module/Compress/
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html
-
-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-- When building a shared, i.e. dynamic library on Mac OS X, the library must be
-  installed before testing (do "make install" before "make test"), since the
-  library location is specified in the library.
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz. The deflate
-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
-  people who reported problems and suggested various improvements in zlib;
-  they are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2004 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not*
-receiving lengthy legal documents to sign. The sources are provided
-for free but without warranty of any kind.  The library has been
-entirely written by Jean-loup Gailly and Mark Adler; it does not
-include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include
-in the file ChangeLog history information documenting your changes. Please
-read the FAQ for more information on the distribution of modified source
-versions.
diff --git a/zlib/README.MySQL b/zlib/README.MySQL
deleted file mode 100644
index c17d3eeb6f99..000000000000
--- a/zlib/README.MySQL
+++ /dev/null
@@ -1,16 +0,0 @@
-This an incomplete version of the zlib library -- it excludes some of the
-platform-specific project files, contributed code, and examples from the
-original zlib distribution. You can find the original distribution at
-
-  http://www.gzip.org/zlib/ 
-  or
-  http://www.zlib.net/
-
-Revision history:
-
-20.01.2006. The following files were changed as part of #15787 fix:
- makefile.am
- gzio.c
- zconf.h
- README.mysql
-
diff --git a/zlib/adler32.c b/zlib/adler32.c
deleted file mode 100644
index 007ba26277c8..000000000000
--- a/zlib/adler32.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#define BASE 65521UL    /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware */
-#ifdef NO_DIVIDE
-#  define MOD(a) \
-    do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD4(a) \
-    do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 > BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
diff --git a/zlib/algorithm.txt b/zlib/algorithm.txt
deleted file mode 100644
index b022dde312a1..000000000000
--- a/zlib/algorithm.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-1. Compression algorithm (deflate)
-
-The deflation algorithm used by gzip (also zip and zlib) is a variation of
-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
-the input data.  The second occurrence of a string is replaced by a
-pointer to the previous string, in the form of a pair (distance,
-length).  Distances are limited to 32K bytes, and lengths are limited
-to 258 bytes. When a string does not occur anywhere in the previous
-32K bytes, it is emitted as a sequence of literal bytes.  (In this
-description, `string' must be taken as an arbitrary sequence of bytes,
-and is not restricted to printable characters.)
-
-Literals or match lengths are compressed with one Huffman tree, and
-match distances are compressed with another tree. The trees are stored
-in a compact form at the start of each block. The blocks can have any
-size (except that the compressed data for one block must fit in
-available memory). A block is terminated when deflate() determines that
-it would be useful to start another block with fresh trees. (This is
-somewhat similar to the behavior of LZW-based _compress_.)
-
-Duplicated strings are found using a hash table. All input strings of
-length 3 are inserted in the hash table. A hash index is computed for
-the next 3 bytes. If the hash chain for this index is not empty, all
-strings in the chain are compared with the current input string, and
-the longest match is selected.
-
-The hash chains are searched starting with the most recent strings, to
-favor small distances and thus take advantage of the Huffman encoding.
-The hash chains are singly linked. There are no deletions from the
-hash chains, the algorithm simply discards matches that are too old.
-
-To avoid a worst-case situation, very long hash chains are arbitrarily
-truncated at a certain length, determined by a runtime option (level
-parameter of deflateInit). So deflate() does not always find the longest
-possible match but generally finds a match which is long enough.
-
-deflate() also defers the selection of matches with a lazy evaluation
-mechanism. After a match of length N has been found, deflate() searches for
-a longer match at the next input byte. If a longer match is found, the
-previous match is truncated to a length of one (thus producing a single
-literal byte) and the process of lazy evaluation begins again. Otherwise,
-the original match is kept, and the next match search is attempted only N
-steps later.
-
-The lazy match evaluation is also subject to a runtime parameter. If
-the current match is long enough, deflate() reduces the search for a longer
-match, thus speeding up the whole process. If compression ratio is more
-important than speed, deflate() attempts a complete second search even if
-the first match is already long enough.
-
-The lazy match evaluation is not performed for the fastest compression
-modes (level parameter 1 to 3). For these fast modes, new strings
-are inserted in the hash table only when no match was found, or
-when the match is not too long. This degrades the compression ratio
-but saves time since there are both fewer insertions and fewer searches.
-
-
-2. Decompression algorithm (inflate)
-
-2.1 Introduction
-
-The key question is how to represent a Huffman code (or any prefix code) so
-that you can decode fast.  The most important characteristic is that shorter
-codes are much more common than longer codes, so pay attention to decoding the
-short codes fast, and let the long codes take longer to decode.
-
-inflate() sets up a first level table that covers some number of bits of
-input less than the length of longest code.  It gets that many bits from the
-stream, and looks it up in the table.  The table will tell if the next
-code is that many bits or less and how many, and if it is, it will tell
-the value, else it will point to the next level table for which inflate()
-grabs more bits and tries to decode a longer code.
-
-How many bits to make the first lookup is a tradeoff between the time it
-takes to decode and the time it takes to build the table.  If building the
-table took no time (and if you had infinite memory), then there would only
-be a first level table to cover all the way to the longest code.  However,
-building the table ends up taking a lot longer for more bits since short
-codes are replicated many times in such a table.  What inflate() does is
-simply to make the number of bits in the first table a variable, and  then
-to set that variable for the maximum speed.
-
-For inflate, which has 286 possible codes for the literal/length tree, the size
-of the first table is nine bits.  Also the distance trees have 30 possible
-values, and the size of the first table is six bits.  Note that for each of
-those cases, the table ended up one bit longer than the ``average'' code
-length, i.e. the code length of an approximately flat code which would be a
-little more than eight bits for 286 symbols and a little less than five bits
-for 30 symbols.
-
-
-2.2 More details on the inflate table lookup
-
-Ok, you want to know what this cleverly obfuscated inflate tree actually
-looks like.  You are correct that it's not a Huffman tree.  It is simply a
-lookup table for the first, let's say, nine bits of a Huffman symbol.  The
-symbol could be as short as one bit or as long as 15 bits.  If a particular
-symbol is shorter than nine bits, then that symbol's translation is duplicated
-in all those entries that start with that symbol's bits.  For example, if the
-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a
-symbol is nine bits long, it appears in the table once.
-
-If the symbol is longer than nine bits, then that entry in the table points
-to another similar table for the remaining bits.  Again, there are duplicated
-entries as needed.  The idea is that most of the time the symbol will be short
-and there will only be one table look up.  (That's whole idea behind data
-compression in the first place.)  For the less frequent long symbols, there
-will be two lookups.  If you had a compression method with really long
-symbols, you could have as many levels of lookups as is efficient.  For
-inflate, two is enough.
-
-So a table entry either points to another table (in which case nine bits in
-the above example are gobbled), or it contains the translation for the symbol
-and the number of bits to gobble.  Then you start again with the next
-ungobbled bit.
-
-You may wonder: why not just have one lookup table for how ever many bits the
-longest symbol is?  The reason is that if you do that, you end up spending
-more time filling in duplicate symbol entries than you do actually decoding.
-At least for deflate's output that generates new trees every several 10's of
-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code
-would take too long if you're only decoding several thousand symbols.  At the
-other extreme, you could make a new table for every bit in the code.  In fact,
-that's essentially a Huffman tree.  But then you spend two much time
-traversing the tree while decoding, even for short symbols.
-
-So the number of bits for the first lookup table is a trade of the time to
-fill out the table vs. the time spent looking at the second level and above of
-the table.
-
-Here is an example, scaled down:
-
-The code being decoded, with 10 symbols, from 1 to 6 bits long:
-
-A: 0
-B: 10
-C: 1100
-D: 11010
-E: 11011
-F: 11100
-G: 11101
-H: 11110
-I: 111110
-J: 111111
-
-Let's make the first table three bits long (eight entries):
-
-000: A,1
-001: A,1
-010: A,1
-011: A,1
-100: B,2
-101: B,2
-110: -> table X (gobble 3 bits)
-111: -> table Y (gobble 3 bits)
-
-Each entry is what the bits decode as and how many bits that is, i.e. how
-many bits to gobble.  Or the entry points to another table, with the number of
-bits to gobble implicit in the size of the table.
-
-Table X is two bits long since the longest code starting with 110 is five bits
-long:
-
-00: C,1
-01: C,1
-10: D,2
-11: E,2
-
-Table Y is three bits long since the longest code starting with 111 is six
-bits long:
-
-000: F,2
-001: F,2
-010: G,2
-011: G,2
-100: H,2
-101: H,2
-110: I,3
-111: J,3
-
-So what we have here are three tables with a total of 20 entries that had to
-be constructed.  That's compared to 64 entries for a single table.  Or
-compared to 16 entries for a Huffman tree (six two entry tables and one four
-entry table).  Assuming that the code ideally represents the probability of
-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
-to one lookup for the single table, or 1.66 lookups per symbol for the
-Huffman tree.
-
-There, I think that gives you a picture of what's going on.  For inflate, the
-meaning of a particular symbol is often more than just a letter.  It can be a
-byte (a "literal"), or it can be either a length or a distance which
-indicates a base value and a number of bits to fetch after the code that is
-added to the base value.  Or it might be the special end-of-block code.  The
-data structures created in inftrees.c try to encode all that information
-compactly in the tables.
-
-
-Jean-loup Gailly        Mark Adler
-jloup@gzip.org          madler@alumni.caltech.edu
-
-
-References:
-
-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
-pp. 337-343.
-
-``DEFLATE Compressed Data Format Specification'' available in
-http://www.ietf.org/rfc/rfc1951.txt
diff --git a/zlib/compress.c b/zlib/compress.c
deleted file mode 100644
index df04f0148e6d..000000000000
--- a/zlib/compress.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
-}
diff --git a/zlib/crc32.c b/zlib/crc32.c
deleted file mode 100644
index 5bbf9c6d4b85..000000000000
--- a/zlib/crc32.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-#define local static
-
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#ifdef BYFOUR
-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    unsigned long c;
-    int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const unsigned long FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const unsigned long FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    u4 c;
-    const u4 FAR *buf4;
-
-    c = (u4)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    u4 c;
-    const u4 FAR *buf4;
-
-    c = REV((u4)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    buf4--;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf4++;
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(REV(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case */
-    if (len2 == 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
diff --git a/zlib/crc32.h b/zlib/crc32.h
deleted file mode 100644
index 8053b6117c02..000000000000
--- a/zlib/crc32.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const unsigned long FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
diff --git a/zlib/deflate.c b/zlib/deflate.c
deleted file mode 100644
index b00bdca88894..000000000000
--- a/zlib/deflate.c
+++ /dev/null
@@ -1,1736 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifndef FASTEST
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-#endif
-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
-        return Z_STREAM_ERROR;
-
-    s = strm->state;
-    if (s->wrap)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-        length = MAX_DIST(s);
-        dictionary += dictLength - length; /* use the tail of the dictionary */
-    }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
-
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
-    }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-    lm_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if (func != configuration_table[level].func && strm->total_in != 0) {
-        /* Flush the last buffer: */
-        err = deflate(strm, Z_PARTIAL_FLUSH);
-    }
-    if (s->level != level) {
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds
- * for every combination of windowBits and memLevel, as well as wrap.
- * But even the conservative upper bound of about 14% expansion does not
- * seem onerous for output buffer allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong destLen;
-
-    /* conservative upper bound */
-    destLen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
-
-    /* if can't get parameters, return conservative bound */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return destLen;
-
-    /* if not default parameters, return conservative bound */
-    s = strm->state;
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return destLen;
-
-    /* default settings: return tight bound for that case */
-    return compressBound(sourceLen);
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len = strm->state->pending;
-
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
-    strm->next_out  += len;
-    strm->state->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_FINISH || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            strm->adler = crc32(0L, Z_NULL, 0);
-            put_byte(s, 31);
-            put_byte(s, 139);
-            put_byte(s, 8);
-            if (s->gzhead == NULL) {
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, OS_CODE);
-                s->status = BUSY_STATE;
-            }
-            else {
-                put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
-                        );
-                put_byte(s, (Byte)(s->gzhead->time & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != NULL) {
-                    put_byte(s, s->gzhead->extra_len & 0xff);
-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-                }
-                if (s->gzhead->hcrc)
-                    strm->adler = crc32(strm->adler, s->pending_buf,
-                                        s->pending);
-                s->gzindex = 0;
-                s->status = EXTRA_STATE;
-            }
-        }
-        else
-#endif
-        {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-            uInt level_flags;
-
-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-                level_flags = 0;
-            else if (s->level < 6)
-                level_flags = 1;
-            else if (s->level == 6)
-                level_flags = 2;
-            else
-                level_flags = 3;
-            header |= (level_flags << 6);
-            if (s->strstart != 0) header |= PRESET_DICT;
-            header += 31 - (header % 31);
-
-            s->status = BUSY_STATE;
-            putShortMSB(s, header);
-
-            /* Save the adler32 of the preset dictionary: */
-            if (s->strstart != 0) {
-                putShortMSB(s, (uInt)(strm->adler >> 16));
-                putShortMSB(s, (uInt)(strm->adler & 0xffff));
-            }
-            strm->adler = adler32(0L, Z_NULL, 0);
-        }
-    }
-#ifdef GZIP
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
-                }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
-            }
-        }
-        else
-            s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
-        }
-        else
-            s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
-        }
-        else
-            s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size)
-                flush_pending(strm);
-            if (s->pending + 2 <= s->pending_buf_size) {
-                put_byte(s, (Byte)(strm->adler & 0xff));
-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-                strm->adler = crc32(0L, Z_NULL, 0);
-                s->status = BUSY_STATE;
-            }
-        }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy(dest, source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
-    }
-#endif
-    zmemcpy(buf, strm->next_in, len);
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    Bytef *scan = s->window + s->strstart; /* current string */
-    Bytef *match;                       /* matched string */
-    int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    ush scan_start = *(ushf*)scan;
-    ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    Byte scan_end1  = scan[best_len-1];
-    Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-#endif /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for level == 1 or strategy == Z_RLE only
- */
-local uInt longest_match_fast(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    Bytef *scan = s->window + s->strstart; /* current string */
-    Bytef *match;                       /* matched string */
-    int len;                           /* length of current match */
-    Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    unsigned n, m;
-    Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            /* %%% avoid this when Z_RLE */
-            n = s->hash_size;
-            p = &s->head[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-                /* If n is not on any hash chain, prev[n] is garbage but
-                 * its value will never be used.
-                 */
-            } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) return;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (eof)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-        }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-        }
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL; /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-#ifdef FASTEST
-            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#else
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#endif
-            /* longest_match() or longest_match_fast() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL;    /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-            /* longest_match() or longest_match_fast() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif /* FASTEST */
-
-#if 0
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;         /* set if current block must be flushed */
-    uInt run;           /* length of run */
-    uInt max;           /* maximum length of run */
-    uInt prev;          /* byte at distance one to match */
-    Bytef *scan;        /* scan for end of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
-         */
-        if (s->lookahead < MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        run = 0;
-        if (s->strstart > 0) {      /* if there is a previous byte, that is */
-            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
-            scan = s->window + s->strstart - 1;
-            prev = *scan++;
-            do {
-                if (*scan++ != prev)
-                    break;
-            } while (++run < max);
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (run >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, run);
-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
-            s->lookahead -= run;
-            s->strstart += run;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif
diff --git a/zlib/gzio.c b/zlib/gzio.c
deleted file mode 100644
index ed4e77ca7e9d..000000000000
--- a/zlib/gzio.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
- */
-
-/* @(#) $Id$ */
-
-/* Need to be included "early" to control other headers */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-
-#include "zutil.h"
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#ifndef NO_DUMMY_DECL
-struct internal_state {int dummy;}; /* for buggy compilers */
-#endif
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-#  define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#ifdef __MVS__
-#  pragma map (fdopen , "\174\174FDOPEN")
-   FILE *fdopen(int, const char *);
-#endif
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    z_off_t  start;   /* start of compressed data in file (header skipped) */
-    z_off_t  in;      /* bytes into deflate or inflate */
-    z_off_t  out;     /* bytes out of deflate or inflate */
-    int      back;    /* one character push-back */
-    int      last;    /* true if push-back is last character */
-} gz_stream;
-
-
-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local int do_flush        OF((gzFile file, int flush));
-local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (path, mode, fd)
-    const char *path;
-    const char *mode;
-    int  fd;
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    s->stream.zalloc = (alloc_func)0;
-    s->stream.zfree = (free_func)0;
-    s->stream.opaque = (voidpf)0;
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->file = NULL;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->in = 0;
-    s->out = 0;
-    s->back = EOF;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-
-    s->path = (char*)ALLOC(strlen(path)+1);
-    if (s->path == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    strcpy(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r') s->mode = 'r';
-        if (*p == 'w' || *p == 'a') s->mode = 'w';
-        if (*p >= '0' && *p <= '9') {
-            level = *p - '0';
-        } else if (*p == 'f') {
-          strategy = Z_FILTERED;
-        } else if (*p == 'h') {
-          strategy = Z_HUFFMAN_ONLY;
-        } else if (*p == 'R') {
-          strategy = Z_RLE;
-        } else {
-            *m++ = *p; /* copy the mode */
-        }
-    } while (*p++ && m != fmode + sizeof(fmode));
-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        err = Z_STREAM_ERROR;
-#else
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    } else {
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-         * present after the compressed stream.
-         */
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-    if (s->file == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    if (s->mode == 'w') {
-        /* Write a very simple .gz header:
-         */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-        s->start = 10L;
-        /* We use 10L instead of ftell(s->file) to because ftell causes an
-         * fflush on some systems. This version of the library doesn't use
-         * start anyway in write mode, so this initialization is not
-         * necessary.
-         */
-    } else {
-        check_header(s); /* skip the .gz header */
-        s->start = ftell(s->file) - s->stream.avail_in;
-    }
-
-    return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT gzopen (path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-gzFile ZEXPORT gzdopen (fd, mode)
-    int fd;
-    const char *mode;
-{
-    char name[46];      /* allow for up to 128-bit integers */
-
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-    return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int ZEXPORT gzsetparams (file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
-
-        s->stream.next_out = s->outbuf;
-        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-            s->z_err = Z_ERRNO;
-        }
-        s->stream.avail_out = Z_BUFSIZE;
-    }
-
-    return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(s)
-    gz_stream *s;
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-        errno = 0;
-        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-        if (s->stream.avail_in == 0) {
-            s->z_eof = 1;
-            if (ferror(s->file)) s->z_err = Z_ERRNO;
-            return EOF;
-        }
-        s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(s)
-    gz_stream *s;
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Assure two bytes in the buffer so we can peek ahead -- handle case
-       where first byte of header is at the end of the buffer after the last
-       gzip segment */
-    len = s->stream.avail_in;
-    if (len < 2) {
-        if (len) s->inbuf[0] = s->stream.next_in[0];
-        errno = 0;
-        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
-        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
-        s->stream.avail_in += len;
-        s->stream.next_in = s->inbuf;
-        if (s->stream.avail_in < 2) {
-            s->transparent = s->stream.avail_in;
-            return;
-        }
-    }
-
-    /* Peek ahead to check the gzip magic header */
-    if (s->stream.next_in[0] != gz_magic[0] ||
-        s->stream.next_in[1] != gz_magic[1]) {
-        s->transparent = 1;
-        return;
-    }
-    s->stream.avail_in -= 2;
-    s->stream.next_in += 2;
-
-    /* Check the rest of the gzip header */
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-        s->z_err = Z_DATA_ERROR;
-        return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-        len  =  (uInt)get_byte(s);
-        len += ((uInt)get_byte(s))<<8;
-        /* len is garbage if EOF but the loop below will quit anyway */
-        while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-        for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-        if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-            err = Z_STREAM_ERROR;
-#else
-            err = deflateEnd(&(s->stream));
-#endif
-        } else if (s->mode == 'r') {
-            err = inflateEnd(&(s->stream));
-        }
-    }
-    if (s->file != NULL && fclose(s->file)) {
-#ifdef ESPIPE
-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-            err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT gzread (file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    next_out = (Byte*)buf;
-    s->stream.next_out = (Bytef*)buf;
-    s->stream.avail_out = len;
-
-    if (s->stream.avail_out && s->back != EOF) {
-        *next_out++ = s->back;
-        s->stream.next_out++;
-        s->stream.avail_out--;
-        s->back = EOF;
-        s->out++;
-        start++;
-        if (s->last) {
-            s->z_err = Z_STREAM_END;
-            return 1;
-        }
-    }
-
-    while (s->stream.avail_out != 0) {
-
-        if (s->transparent) {
-            /* Copy first the lookahead bytes: */
-            uInt n = s->stream.avail_in;
-            if (n > s->stream.avail_out) n = s->stream.avail_out;
-            if (n > 0) {
-                zmemcpy(s->stream.next_out, s->stream.next_in, n);
-                next_out += n;
-                s->stream.next_out = next_out;
-                s->stream.next_in   += n;
-                s->stream.avail_out -= n;
-                s->stream.avail_in  -= n;
-            }
-            if (s->stream.avail_out > 0) {
-                s->stream.avail_out -=
-                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
-            }
-            len -= s->stream.avail_out;
-            s->in  += len;
-            s->out += len;
-            if (len == 0) s->z_eof = 1;
-            return (int)len;
-        }
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-
-            errno = 0;
-            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-                if (ferror(s->file)) {
-                    s->z_err = Z_ERRNO;
-                    break;
-                }
-            }
-            s->stream.next_in = s->inbuf;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-
-        if (s->z_err == Z_STREAM_END) {
-            /* Check CRC and original size */
-            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-            start = s->stream.next_out;
-
-            if (getLong(s) != s->crc) {
-                s->z_err = Z_DATA_ERROR;
-            } else {
-                (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may be
-                 * different from s->out in case of concatenated .gz files.
-                 * Check for such files:
-                 */
-                check_header(s);
-                if (s->z_err == Z_OK) {
-                    inflateReset(&(s->stream));
-                    s->crc = crc32(0L, Z_NULL, 0);
-                }
-            }
-        }
-        if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    if (len == s->stream.avail_out &&
-        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
-        return -1;
-    return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    unsigned char c;
-
-    return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Push one byte back onto the stream.
-*/
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
-    s->back = c;
-    s->out--;
-    s->last = (s->z_err == Z_STREAM_END);
-    if (s->last) s->z_err = Z_OK;
-    s->z_eof = 0;
-    return c;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-    *buf = '\0';
-    return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_GZCOMPRESS
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT gzwrite (file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = (Bytef*)buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-        if (s->z_err != Z_OK) break;
-    }
-    s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-    return (int)(len - s->stream.avail_in);
-}
-
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-    va_start(va, format);
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf(buf, format, va);
-    va_end(va);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = vsprintf(buf, format, va);
-    va_end(va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-    len = strlen(buf);
-#  else
-    len = vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-#  endif
-#endif
-    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(buf);
-#  else
-    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, len);
-}
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int ZEXPORT gzputs(file, s)
-    gzFile file;
-    const char *s;
-{
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (file, flush)
-    gzFile file;
-    int flush;
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), flush);
-        s->out -= s->stream.avail_out;
-
-        /* Ignore the second of two consecutive flushes: */
-        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer:
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
-
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int ZEXPORT gzflush (file, flush)
-     gzFile file;
-     int flush;
-{
-    gz_stream *s = (gz_stream*)file;
-    int err = do_flush (file, flush);
-
-    if (err) return err;
-    fflush(s->file);
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_GZCOMPRESS */
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t ZEXPORT gzseek (file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || whence == SEEK_END ||
-        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-        return -1L;
-    }
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return -1L;
-#else
-        if (whence == SEEK_SET) {
-            offset -= s->in;
-        }
-        if (offset < 0) return -1L;
-
-        /* At this point, offset is the number of zero bytes to write. */
-        if (s->inbuf == Z_NULL) {
-            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-            if (s->inbuf == Z_NULL) return -1L;
-            zmemzero(s->inbuf, Z_BUFSIZE);
-        }
-        while (offset > 0)  {
-            uInt size = Z_BUFSIZE;
-            if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-            size = gzwrite(file, s->inbuf, size);
-            if (size == 0) return -1L;
-
-            offset -= size;
-        }
-        return s->in;
-#endif
-    }
-    /* Rest of function is for reading only */
-
-    /* compute absolute position */
-    if (whence == SEEK_CUR) {
-        offset += s->out;
-    }
-    if (offset < 0) return -1L;
-
-    if (s->transparent) {
-        /* map to fseek */
-        s->back = EOF;
-        s->stream.avail_in = 0;
-        s->stream.next_in = s->inbuf;
-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-        s->in = s->out = offset;
-        return offset;
-    }
-
-    /* For a negative seek, rewind and use positive seek */
-    if (offset >= s->out) {
-        offset -= s->out;
-    } else if (gzrewind(file) < 0) {
-        return -1L;
-    }
-    /* offset is now the number of bytes to skip. */
-
-    if (offset != 0 && s->outbuf == Z_NULL) {
-        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-        if (s->outbuf == Z_NULL) return -1L;
-    }
-    if (offset && s->back != EOF) {
-        s->back = EOF;
-        s->out++;
-        offset--;
-        if (s->last) s->z_err = Z_STREAM_END;
-    }
-    while (offset > 0)  {
-        int size = Z_BUFSIZE;
-        if (offset < Z_BUFSIZE) size = (int)offset;
-
-        size = gzread(file, s->outbuf, (uInt)size);
-        if (size <= 0) return -1L;
-        offset -= size;
-    }
-    return s->out;
-}
-
-/* ===========================================================================
-     Rewinds input file.
-*/
-int ZEXPORT gzrewind (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return -1;
-
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->back = EOF;
-    s->stream.avail_in = 0;
-    s->stream.next_in = s->inbuf;
-    s->crc = crc32(0L, Z_NULL, 0);
-    if (!s->transparent) (void)inflateReset(&s->stream);
-    s->in = 0;
-    s->out = 0;
-    return fseek(s->file, s->start, SEEK_SET);
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t ZEXPORT gztell (file)
-    gzFile file;
-{
-    return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-int ZEXPORT gzeof (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    /* With concatenated compressed files that can have embedded
-     * crc trailers, z_eof is no longer the only/best indicator of EOF
-     * on a gz_stream. Handle end-of-stream error explicitly here.
-     */
-    if (s == NULL || s->mode != 'r') return 0;
-    if (s->z_eof) return 1;
-    return s->z_err == Z_STREAM_END;
-}
-
-/* ===========================================================================
-     Returns 1 if reading and doing so transparently, otherwise zero.
-*/
-int ZEXPORT gzdirect (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return 0;
-    return s->transparent;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (file, x)
-    FILE *file;
-    uLong x;
-{
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (s)
-    gz_stream *s;
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int ZEXPORT gzclose (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return Z_STREAM_ERROR;
-#else
-        if (do_flush (file, Z_FINISH) != Z_OK)
-            return destroy((gz_stream*)file);
-
-        putLong (s->file, s->crc);
-        putLong (s->file, (uLong)(s->in & 0xffffffff));
-#endif
-    }
-    return destroy((gz_stream*)file);
-}
-
-#ifdef STDC
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-/* ===========================================================================
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char * ZEXPORT gzerror (file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    char *m;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) {
-        *errnum = Z_STREAM_ERROR;
-        return (const char*)ERR_MSG(Z_STREAM_ERROR);
-    }
-    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (const char*)"";
-
-    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-    TRYFREE(s->msg);
-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
-    strcpy(s->msg, s->path);
-    strcat(s->msg, ": ");
-    strcat(s->msg, m);
-    return (const char*)s->msg;
-}
-
-/* ===========================================================================
-     Clear the error and end-of-file flags, and do the same for the real file.
-*/
-void ZEXPORT gzclearerr (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return;
-    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
-    s->z_eof = 0;
-    clearerr(s->file);
-}
diff --git a/zlib/inffast.c b/zlib/inffast.c
deleted file mode 100644
index bbee92ed1e6b..000000000000
--- a/zlib/inffast.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
-#else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code this;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    write = state->write;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-        }
-        this = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(this.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(this.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", this.val));
-            PUP(out) = (unsigned char)(this.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(this.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-            }
-            this = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(this.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(this.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(this.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-                    from = window - OFF;
-                    if (write == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (write < op) {      /* wrap around window */
-                        from += wsize + write - op;
-                        op -= write;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = window - OFF;
-                            if (write < len) {  /* some from start of window */
-                                op = write;
-                                len -= op;
-                                do {
-                                    PUP(out) = PUP(from);
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += write - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    }
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                this = dcode[this.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            this = lcode[this.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and write == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff --git a/zlib/inffast.h b/zlib/inffast.h
deleted file mode 100644
index 1e88d2d97b56..000000000000
--- a/zlib/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/zlib/inflate.c b/zlib/inflate.c
deleted file mode 100644
index 50830e2f7625..000000000000
--- a/zlib/inflate.c
+++ /dev/null
@@ -1,1380 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common write == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
-                              unsigned len));
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->write = 0;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    if (windowBits < 0) {
-        state->wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        state->wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48) windowBits &= 15;
-#endif
-    }
-    if (windowBits < 8 || windowBits > 15) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-        return Z_STREAM_ERROR;
-    }
-    state->wbits = (unsigned)windowBits;
-    state->window = Z_NULL;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, out)
-z_streamp strm;
-unsigned out;
-{
-    struct inflate_state FAR *state;
-    unsigned copy, dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->write = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-        state->write = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->write;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
-            state->write = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->write += dist;
-            if (state->write == state->wsize) state->write = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* XXXMYSQL: To assert that put is never used uninitialized */
-#ifdef DEBUG
-    put = NULL;
-#endif /* DEBUG */
-
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if (state->flags & 0x0200) CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if (state->flags & 0x0200)
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                /* XXXMYSQL: Assert that put is not uninitialized */
-                Assert ( put != NULL, "put is uninitialized" );
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
-                }
-                else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* build code tables */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                break;
-            }
-            for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
-            if ((int)(this.op) == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
-                state->mode = LIT;
-                break;
-            }
-            if (this.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)this.val;
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            if (state->offset > state->whave + out - left) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->write) {
-                    copy -= state->write;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->write - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                /* XXXMYSQL: Assert that put is not uninitialized */
-                Assert ( put != NULL, "put is uninitialized" );
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if (out) {
-                    /* XXXMYSQL: Assert that put is not uninitialized */
-                    Assert ( put != NULL, "put is uninitialized" );
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                }
-                out = left;
-                if ((
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     REVERSE(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if (state->wrap && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long id;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary id */
-    if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
diff --git a/zlib/inftrees.h b/zlib/inftrees.h
deleted file mode 100644
index b1104c87e769..000000000000
--- a/zlib/inftrees.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1444 code structures (852 for length/literals
-   and 592 for distances, the latter actually the result of an
-   exhaustive search).  The true maximum is not known, but the value
-   below is more than safe. */
-#define ENOUGH 2048
-#define MAXD 592
-
-/* Type of code to build for inftable() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/zlib/uncompr.c b/zlib/uncompr.c
deleted file mode 100644
index b59e3d0defb2..000000000000
--- a/zlib/uncompr.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
-        return err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
diff --git a/zlib/zconf.h b/zlib/zconf.h
deleted file mode 100644
index 7dbeb3be43c6..000000000000
--- a/zlib/zconf.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && defined(OS2)
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/zlib/zlib.3 b/zlib/zlib.3
deleted file mode 100644
index 90b8162870fd..000000000000
--- a/zlib/zlib.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.TH ZLIB 3 "18 July 2005"
-.SH NAME
-zlib \- compression/decompression library
-.SH SYNOPSIS
-[see
-.I zlib.h
-for full description]
-.SH DESCRIPTION
-The
-.I zlib
-library is a general purpose data compression library.
-The code is thread safe.
-It provides in-memory compression and decompression functions,
-including integrity checks of the uncompressed data.
-This version of the library supports only one compression method (deflation)
-but other algorithms will be added later
-and will have the same stream interface.
-.LP
-Compression can be done in a single step if the buffers are large enough
-(for example if an input file is mmap'ed),
-or can be done by repeated calls of the compression function.
-In the latter case,
-the application must provide more input and/or consume the output
-(providing more output space) before each call.
-.LP
-The library also supports reading and writing files in
-.IR gzip (1)
-(.gz) format
-with an interface similar to that of stdio.
-.LP
-The library does not install any signal handler.
-The decoder checks the consistency of the compressed data,
-so the library should never crash even in case of corrupted input.
-.LP
-All functions of the compression library are documented in the file
-.IR zlib.h .
-The distribution source includes examples of use of the library
-in the files
-.I example.c
-and
-.IR minigzip.c .
-.LP
-Changes to this version are documented in the file
-.I ChangeLog
-that accompanies the source,
-and are concerned primarily with bug fixes and portability enhancements.
-.LP
-A Java implementation of
-.I zlib
-is available in the Java Development Kit 1.1:
-.IP
-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
-.LP
-A Perl interface to
-.IR zlib ,
-written by Paul Marquess (pmqs@cpan.org),
-is available at CPAN (Comprehensive Perl Archive Network) sites,
-including:
-.IP
-http://www.cpan.org/modules/by-module/Compress/
-.LP
-A Python interface to
-.IR zlib ,
-written by A.M. Kuchling (amk@magnet.com),
-is available in Python 1.5 and later versions:
-.IP
-http://www.python.org/doc/lib/module-zlib.html
-.LP
-A
-.I zlib
-binding for
-.IR tcl (1),
-written by Andreas Kupries (a.kupries@westend.com),
-is availlable at:
-.IP
-http://www.westend.com/~kupries/doc/trf/man/man.html
-.LP
-An experimental package to read and write files in .zip format,
-written on top of
-.I zlib
-by Gilles Vollant (info@winimage.com),
-is available at:
-.IP
-http://www.winimage.com/zLibDll/unzip.html
-and also in the
-.I contrib/minizip
-directory of the main
-.I zlib
-web site.
-.SH "SEE ALSO"
-The
-.I zlib
-web site can be found at either of these locations:
-.IP
-http://www.zlib.org
-.br
-http://www.gzip.org/zlib/
-.LP
-The data format used by the zlib library is described by RFC
-(Request for Comments) 1950 to 1952 in the files:
-.IP
-http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format)
-.br
-http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format)
-.br
-http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format)
-.LP
-These documents are also available in other formats from:
-.IP
-ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-.LP
-Mark Nelson (markn@ieee.org) wrote an article about
-.I zlib
-for the Jan. 1997 issue of  Dr. Dobb's Journal;
-a copy of the article is available at:
-.IP
-http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-.SH "REPORTING PROBLEMS"
-Before reporting a problem,
-please check the
-.I zlib
-web site to verify that you have the latest version of
-.IR zlib ;
-otherwise,
-obtain the latest version and see if the problem still exists.
-Please read the
-.I zlib
-FAQ at:
-.IP
-http://www.gzip.org/zlib/zlib_faq.html
-.LP
-before asking for help.
-Send questions and/or comments to zlib@gzip.org,
-or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
-.SH AUTHORS
-Version 1.2.3
-Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)
-and Mark Adler (madler@alumni.caltech.edu).
-.LP
-This software is provided "as-is,"
-without any express or implied warranty.
-In no event will the authors be held liable for any damages
-arising from the use of this software.
-See the distribution directory with respect to requirements
-governing redistribution.
-The deflate format used by
-.I zlib
-was defined by Phil Katz.
-The deflate and
-.I zlib
-specifications were written by L. Peter Deutsch.
-Thanks to all the people who reported problems and suggested various
-improvements in
-.IR zlib ;
-who are too numerous to cite here.
-.LP
-UNIX manual page by R. P. C. Rodgers,
-U.S. National Library of Medicine (rodgers@nlm.nih.gov).
-.\" end of man page
diff --git a/zlib/zlib.h b/zlib/zlib.h
deleted file mode 100644
index 022817927ce3..000000000000
--- a/zlib/zlib.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/zlib/zutil.c b/zlib/zutil.c
deleted file mode 100644
index fc886094b0d1..000000000000
--- a/zlib/zutil.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
-const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch (sizeof(uInt)) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch (sizeof(uLong)) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch (sizeof(voidpf)) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch (sizeof(z_off_t)) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#ifdef STDC
-#  ifdef NO_vsnprintf
-        flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#else
-        flags += 1L << 24;
-#  ifdef NO_snprintf
-        flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int z_verbose = verbose;
-
-void z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void  zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
diff --git a/zlib/zutil.h b/zlib/zutil.h
deleted file mode 100644
index 8b4842ad8f55..000000000000
--- a/zlib/zutil.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#ifdef STDC
-#  ifndef _WIN32_WCE
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-#   ifdef _WIN32_WCE
-      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-       * errno.  We define it as a global variable to simplify porting.
-       * Its value is always 0 and should not be used.  We rename it to
-       * avoid conflict with other libraries that use the same workaround.
-       */
-#     define errno z_errno
-#   endif
-    extern int errno;
-#else
-#  ifndef _WIN32_WCE
-#    include <errno.h>
-#  endif
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#  ifdef M_I86
-     #include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  ifndef fdopen
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#  endif
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#ifdef WIN32
-#  define OS_CODE  0x0b
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */